5516 files changed, 739540 insertions, 12472 deletions

diff --git a/ChangeLog b/ChangeLog
index b78bfdffc78..1063a4569b7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,205 @@
+
+Tue Aug 20 15:15:52 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* configure.in: patch by noa@metamatrix.se (Daniel Resare)
+	to error out if bison is missing.
+
+2002-08-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* configure.in: don't link against libdl on windoze.
+
+2002-08-12  Dick Porter  <dick@ximian.com>
+
+	* mono.pc.in: Add $includedir to Cflags
+
+Fri Jul 19 18:38:38 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* configure.in, Makefile.am, mono.pc.in: add a mono.pc file for use
+	with pkg-config.
+	* */Makefile.am: makefile overhaul to create a shared libmono library.
+	* */*.h: do not include config.h in headers that should be installed.
+
+2002-07-12  Dick Porter  <dick@ximian.com>
+
+	* acconfig.h:
+	* configure.in: Check the size of sockaddr_un.sun_path
+
+2002-06-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* man/Makefile.am (man_MANS): Added new man page
+
+	* man/mono-config.5: New manual page describing the mono-config
+	file format. 
+
+2002-06-10  Jaroslaw Kowalski <jarek@atm.com.pl>
+
+	* configure.in: added checks for MSG_NOSIGNAL
+
+2002-05-30  Daniel Morgan <danmorg@sc.rr.com>
+
+	* doc/ado-net: update the ado-net web page on go-mono.com
+	input parameters support, beginnings of Mono.Data.MySQL 
+	and System.Data.OleDb, updated the sample source code,
+	and output from a PostgresTest
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	* mono.1: Documented the "--debug-args" debugging arguments.
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	* mono.1: Updated to reflect my latest changes and beautified this a bit.
+	(FIXME: There are still command line argument which aren't documented here.)
+
+2002-05-19  Daniel Morgan <danmorg@sc.rr.com>
+
+	* doc/ado-net: updated page to include C# code snippets using
+	System.Data.  Update status: handle reading NULL values, DataSet/DataAdapter
+	works, executing/reading multiple results, and stored procedures.
+	And other tweaks about the providers.  
+
+2002-05-19  Martin Baulig  <martin@gnome.org>
+
+	* mono/Makefile.am (SUBDIRS): Added `os', it's referenced by
+	interpreter/Makefile.am.
+
+Wed May 15 12:22:09 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* configure.in: search for pthread functions also in libc_r (patch
+	from Garrett Rooney <rooneg@electricjellyfish.net>).
+
+2002-05-11  Daniel Morgan <danmorg@sc.rr.com>
+
+	* doc/ado-net: added instructions for installing PostgreSQL on Linux
+	and for using nant to re-compile just the System.Data.dll assembly
+	on Windows.
+
+2002-05-10  Rodrigo Moya <rodrigo@ximian.com>
+
+	* doc/ado-net: added instructions for compiling System.Data.dll
+	(a subset of) on Linux.
+
+2002-05-10  Daniel Morgan <danmorg@sc.rr.com>
+
+	* doc/ado-net: added links
+
+2002-05-09  Dick Porter  <dick@ximian.com>
+
+	* configure.in: Set CPPFLAGS not CFLAGS (bug 23767)
+
+2002-05-05  Daniel Morgan <danmorg@sc.rr.com>
+
+	* doc/ado-net: correct formatting
+	* doc/index: added credit i forgot to add
+
+2002-05-05  Daniel Morgan <danmorg@sc.rr.com>
+
+	* doc/ado-net: i did not format it correctly earlier, i 
+	tried added various tags where appropriate.
+	
+	* doc/index: added news item for May 5, 2002 - ado.net able
+	to retrieve data now
+
+2002-05-05  Daniel Morgan <danmorg@sc.rr.com>
+
+	* doc/ado-net: updated the current status which
+	I kept forgetting to do.
+
+2002-05-05  Daniel Morgan <danmorg@sc.rr.com>
+
+	* doc/ado-net: updated to includes an example for
+	running ipc-daemon as a	Windows service.  Thanks
+	to gonzalo.
+
+2002-05-05  Daniel Morgan <danmorg@sc.rr.com>
+
+	* doc/ado-net: updated to include installation of
+	PostgreSQL DBMS under cygwin.  It is a TODO for Linux though.
+	Also included notes on running the System.Data/Test/PostgresTest.cs
+	that should work on a lot of Mono installations that have
+	PostgreSQL installed.  If not please let me, rodrigo, or gonzalo
+	know.
+
+2002-05-01  Rodrigo Moya <rodrigo@ximian.com>
+
+	* doc/ado-net: updated a little bit.
+
+2002-04-30  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* configure.in: Added checks for timezone stuff.
+
+2002-04-30  Dick Porter  <dick@ximian.com>
+
+	* acconfig.h:
+	* configure.in: Added option to disable using shared memory for
+	handles
+
+2002-04-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* configure.in: fix for conditional "THREADS_PTHREAD" was never 
+	defined problem under cygwin with latest version of automake and
+	autoconf. Patch from Jeroen Janssen <japj@darius.demon.nl>.
+
+2002-04-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* configure.in: removed -Wshadow from CFLAGS.
+
+2002-04-12  Rodrigo Moya <rodrigo@ximian.com>
+
+	* status/maintainers.xml: added danmorg and myself for System.Data.*
+	classes.
+
+	* status/class.xml: added System.Data.* classes.
+
+2002-04-08  Dick Porter  <dick@ximian.com>
+
+	* configure.in: Set -mno-cygwin here rather than in the build script
+
+2002-04-05  Dietmar Maurer  <dietmar@ximian.com>
+
+	* mono/tests/remoting2.cs: new test for async invoke of proxy calls
+
+2002-03-29  Martin Baulig  <martin@gnome.org>
+
+	* doc/jit-debug, docs/jit-debug-sample, docs/jit-debug-sample2:
+	New files, added documentation for the debugging code.
+
+	* doc/web/commands: Added the debugging pages.
+
+	* docs/jit-debug: Removed, this is now on the web site.
+
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* man/mcs.1: Documented the new --debug option and added a section
+	about debugging support.
+
+	* man/mono.1: Documented the new --dwarf and --dwarf-plus options.
+
+2002-03-21  Martin Baulig  <martin@gnome.org>
+
+	* configure.in: Added check for <elf.h>.
+
+2002-03-18  Dick Porter  <dick@ximian.com>
+
+	* configure.in: Only look for libgc on the system.  Default to not
+	using GC at all, because it doesn't work with the jit.
+
+2002-03-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* configure.in: Add support for building the included boehm GC.
+
+Thu Mar 7 17:19:44 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* configure.in: detect Boehm GC libs and add --with-gc switch.
+	Boehm GC needs to be explicitly enabled since the JIT currently fails
+	in some cases with it.
+
+2002-02-27  Dietmar Maurer  <dietmar@ximian.com>
+
+	* mono/tests/fib.cs: it is now possible to pass a repeat count as
+	command line argument, for example fib.exe 20 runs the test 20
+	times. 
+
 2002-02-25  Sergey Chaban  <serge@wildwestsoftware.com>
 	* configure.in: added support for ARM target arch.
 	Uncommented and modified arm-*-linux* target,
diff --git a/Makefile.am b/Makefile.am
index f73b0f64d1e..b361222021e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,2 +1,9 @@
 AUTOMAKE_OPTIONS = foreign
-SUBDIRS = mono doc runtime scripts man
+
+SUBDIRS = mono doc docs runtime scripts man data
+
+EXTRA_DIST= mono.pc.in mono.spec.in
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA= mono.pc
+DISTCLEANFILES= mono.pc
diff --git a/NEWS b/NEWS
index a0597920702..ceed0c959bd 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,716 @@
+	* Sergey Chaban added thread-safe support to
+	  System.Collections.SortedList.
+	
+	* Fixes to the compiler by Andrew Birkett.
+	
+	* Tim Coleman contributed the OleDb provider for System.Data and started
+	  work on System.Web.Services.
+	
+	* Radek fixed a lot of problems on the PPC side. [*]
+	
+	* Miguel and Martin committed the new type lookup system.
+	
+	* Dietmar rewrote the marshalling code. [*]
+	
+	* Peter Williams and Martin contributed the new Makefiles, with help
+	from Alp Toker as well.
+	
+* Contributors to this release:
+
+	* Non-Ximian developers: Nick Drochak, Martin Baulig, Tim
+	  Coleman, Mike Kestner, Alp Toker, Jonathan Pryor, Jaime
+	  Anguiano, Piers Haken, Rafael Teixeira, Mark Crichton,
+	  Sergey Chabon, Ajay Kumar Dwivedi, Andrew Birkett, Dennis
+	  Hayes (SWF), Adam Treat, Johannes Roith and Lawrence Pit.
+
+	* Ximian developers: Duncan, Ravi, Dick, Dietmar, Paolo,
+	  Gonzalo, Rachel, Radek, Rodrigo, Jeff, Peter Williams and
+	  Miguel.
+
+Special thanks to Duncan for helping me put this release together.
+
+Hello!
+
+	A new version of Mono (0.12), is out.
+
+	Mono is an open source implementation of the Microsoft.NET
+	Framework, and ships with a C# compiler, a runtime engine
+	(with a JIT on x86 cpus) and a set of class libraries.
+
+	Mono is know to work on a number of platforms:
+	x86/Linux, x86/Windows, x86/FreeBSD; sparc/solaris;
+	linuxppc/linux; strongarm/linux.
+
+	There have been many changes since the last release of Mono in
+	late April, thanks to Duncan for assembling the list of new
+	features, any omissions are my fault.
+
+Changes since 0.11:
+
+	It is hard to keep track of the changes, as there are 1632
+	patches that were posted to the mailing list.  One third of
+	the total number of patches since we opened mono-patches
+	list.  I am sure I missed some stuff and probably missed some
+	contributors.  I apologize in advance.
+
+	Runtime:
+
+		Paolo: New Reflection.Emit generation code generates
+		code that can be executed in Windows.  Now binaries
+		generated by Mono/MCS will run on Windows.
+
+		Paolo got Activator.CreateInstance to work.
+
+		Sergey's CPU-optimization for CPBLK.
+
+		Many many bug fixes to the runtime from Dick, Dan
+		Lewis, Dietmar, Gonzalo, Martin, Paolo, Radek and Sergey,
+
+	Compiler:
+
+		Many bug fixes: The compiler can now compile Gtk#,
+		Vorbis#, System.Data assembly and System.Xml assembly
+		which previously did not work (Dietmar, Miguel, Paolo,
+		Piers, Ravi, Miguel).  Thanks to all the bug
+		reporters.
+
+	Class Libraries:
+
+		Mike started work on System.Xml.XPath
+
+		Christian, Dennis, Daniel and friends got more stubs
+		for System.Windows.Forms in.
+
+		Ajay revamped System.Xml.Schema.  And Jason and Duncan
+		updated System.Xml
+
+		Daniel also checked in a working CodeDOM
+		implementation and a C# provider.
+
+		Many bug fixes by everyone.  Thanks to Daniel, Duncan,
+		Jonathan, Lawrence, Martin Mike, Nick and Piers.  I am
+		missing a lot of contributors that should be listed.
+
+	ASP.NET support
+
+		A lot of work from Gonzalo allows some small and
+		modest ASP.NET applications to run (you still need the
+		unreleased XSP code though).
+
+	System.Data:
+
+		Integrated the MySQL provider from Brad Merryl.
+
+		Lots of work by Dan, Rodrigo, Tim.
+
+	Microsoft.VisualBasic runtime support
+
+		Rafael and Chris have been working on the VisualBasic
+		runtime support DLLs
+
+Hello everyone!
+
+	Mono 0.11 is out!
+
+	This new version has new features:
+
+	* Massive:
+
+		* Ultrich Kunitz implemented the whole calendar set of
+		  classes.  Yes, thats right.  The whole thing, with a
+		  complete test suite.  Thanks Ultrich!
+
+	* JIT/runtime features:
+
+		* Martin's debugging framework is included (see web
+		  site for details on how to use it). (Martin)
+
+		* Transparent Proxy has been implemented for the
+		  runtime (lets you run/debug/hack on remoting for Mono) (Dietmar)
+
+		* Inline and constant folding/propagation support
+		  in the JIT engine (Dietmar)
+
+		* Profiling support for the JIT engine (--profile).
+
+	* Cool runtime hacks, that made our compiler twice as fast:
+
+		* New string rewrite: faster, speedier, leaner, cooler!
+
+		  Paolo had been talking about a new string rewrite,
+		  and super hacker Patrik Torstensson started the
+		  implementation, Dietmar then switched the object
+		  layout and the Mono team helped iron out a few of
+		  the details.
+
+		* New array reprensetation: Dan Lewis contributed a new
+		  faster and smaller array implementation.
+
+		* Improved Reflection.Emit: Paolo improved our
+		  reflection emit code.
+
+	* ADO.NET
+
+		* Daniel Morgan, Rodrigo Moya have some pieces of the
+		  Sql classes ready to run.  he first signs of life
+		  this week (we can connect, insert rows; do transactions:
+		  commit/rollback; SQL errors and exceptions work).
+
+	* Http Runtime
+
+		* The HTTP runtime (to be used by our ASP.NET implementation)
+		  was contributed by Patrik Torstensson.  Patrik not only
+		  contributed a massive ammount of classes, but he immediately
+		  went on to implement ThreadPools and then helped out with the
+		  new String rewrite.
+
+	* XML improvements:
+
+		* Kral Ferch and Duncan Mak contributed more
+		  improvements to the XML implementation.
+
+		* Work on Xml Serialization from John Donagher.
+	
+	* Documentation:
+
+		* MonoDoc ships for the first time!
+		  (John Barnette, Adam Treat and John Sohn)
+
+		* New documentation stubs ready to be filled, and translated
+		  included (thanks to our doc team!)
+
+	* General fixes:
+
+		* Piers Haken fixed many of our attributes and many
+		  little problems that were exposed by his CorCompare tool
+
+		* Many Mono C# compiler bug fixes.
+
+	* Other improvements:
+
+		* NUnit works on Linux! (Patrik Torstensson)
+
+		* More NUnit tests (Nick Drochak)
+
+		* Windows.Forms progress: Dennis Hayes and Christian
+		  Meyer have been contributing stubs for the
+		  Windows.Forms work.
+
+		* Full Parse implementations and bug fixing by Gonzalo
+
+		* Dan Lewis contributed some missing classes for the
+		  Regexp implementation.
+
+		* Jonathan's trace classes
+
+* This Month's Mono is brought to you by:
+
+	Adam Treat, Chris Podugriel, Christian Meyer, Daniel Lewis,
+	Daniel Morgan, Dennis Hayes, Dick Porter, Dietmar Maurer,
+	Duncan Mak, Guarav Vaish, Gonzalo Paniagua, Jaime Anguiano,
+	Jason Diamond, Joe Shaw, John Barnette, John Donagher, John
+	Sohn, Jonathan Pryor, Kral Ferch, Martin Baulig, Miguel de
+	Icaza, Mike Kestner, Nick Drochak, Paolo Molaro, Patrik
+	Tostensson, Piers Haken, Ravi Pratap, Rodrigo Moya, Sergey
+	Chanben, Ultrich Kunitz, Wictor Wilen.
+
+	I know that I missed some features, there is a lot of work
+	that happens in a month.  I apologize in advance for any
+	features I omited by accident.  
+
+	Special thanks go to Duncan for helping out with all those
+	little details in the project.  And also Nick who has been
+	keeping us in good shape by maintaining and helping new
+	contributors provide more test suites.
+
+* Reporting bugs
+
+	If you find a bug in Mono, please file a bug here:
+
+		http://bugzilla.ximian.com
+
+	That way we wont loose your bug report, and will be able to
+	follow up properly with it.  Also try to provide simple test
+	cases whenever possible and try as hard as possible to
+	identify the root of a problem (compiler, runtime, class
+	libraries).
+
+* Forum
+
+	The mono-list-request@ximian.com mailing list is open for
+	those of you who want to discuss the future of Mono.
+
+Hello everyone!  
+
+  	Mono "Self Hosting" 0.10 is out!  (Alex insisted I used the
+	<blink> tag for "Self Hosting", but was dissapointed when he
+	realized most mailers dont support this).
+
+	Too many things have happened since the the 0.9 release,
+	almost an entire month.  The big news is that we are shipping
+	a the self-hosting Mono C# compiler.  This has been tested on
+	Linux/x86 only.
+
+	Also, we delayed the release for one reason or other, but it
+	turns out that as a extra bonus, Paolo fixed the last
+	outstanding bug in the JIT engine, so the compiler now runs in
+	the JIT engine instead of the interpreter.
+
+	The mono-0.10 release includes the libraries required to run
+	the compiler as well as assorted .NET programs [1].
+
+* What is new
+
+	There is so much stuff in this release that is hard to keep
+	track of it.  
+
+	Jason, Kral and Duncan have done an amazing job with
+	System.Xml, up to the point that it is even being used by
+	gtk-sharp's code generator (and it all comes with great test
+	suites to verify that it works!).  Ajay's XmlSchema code is
+	also shipped.
+
+	Martin worked on our debugging infrastructure (the JIT can
+	load dwarf files, and our class libraries now generate dwarf
+	debugging info;  we are in the process of adding this to the
+	compiler, the patch did not make it to this release though).
+
+	For the first time the System.Web assembly has built without
+	all the excludes, so you can get your hands on Gaurav and
+	Lee's massive code base.
+
+	Lots of new tests to the runtime, class libraries and compiler
+	are included.  As always, big thanks go to Nick for continued
+	guidance to new developers, and writing new tests.
+
+	Dan removed the System.PAL dependency, we now have moved to an
+	internalcall setup for all the System.IO calls, and dropped
+	the MonoWrapper shared library.
+
+	Porting wise: Sergey's StrongARM port is included now; Jeff's
+	SPARC port and Radek's PowerPC port have been updated to
+	reflect the new changes in the engine.
+
+	Runtime wise: Dietmar also got us asyncronous delegates
+	implemented.  Dick continues his work on our foundation
+	classes, and has resumed his work on the IO layer.  
+
+	Paolo is the hero behind self hosting on Linux.  Send your
+	congrats (and wine) to him.
+
+	And without the help from Mike, Duco, David, Piers, Nick,
+	Sergey, Mark, Jonathan, John, Adam and Dennis this release
+	would have not been possible.
+
+	This release is mostly ECMA compatible.  I did not expect this
+	to happen so soon.  I am very grateful to everyone who has
+	made this happen
+
+* The goods
+
+	The runtime sources and binaries to the compiler/libraries:
+
+		http://www.go-mono.com/archive/mono-0.10.tar.gz
+
+	The class and compiler sources:
+
+		http://www.go-mono.com/archive/mcs-0.10.tar.gz
+
+* Requirements:
+
+	You still need glib-2, and pkg-config.  If you plan on
+	compiling large applications, getting the Boehm GC is a plus
+	(we will integrate this in a future version, for now it is an
+	external requirement).
+
+	Boehm GC is available in packaged format for Debian and Red
+	Hat systems.
+
+* To compile on Linux
+
+	Do your regular chores with mono-0.10.tar.gz, you know the
+	drill.  In the end, after you reach the `make install' phase,
+	now you can do some cool stuff.
+
+	If you want to compile the compiler (just to try it out),
+	untar the sources to the compiler (mcs-0.10.tar.gz) and do
+	manually:
+	
+		cd mcs-0.10
+		(cd jay; make)
+		(cd mcs; make monomcs)
+
+	Now you will end up with a nice mcs4.exe in the mcs/mcs
+	directory, that is the compiler.  If you want to use that,
+	replace the mcs.exe we distribute with the mcs4.exe you got.
+
+* Gadgets
+
+	Man pages for mcs, mono and mint are included for your
+	enjoyment.  
+
+	Particularly of interest is `mint --profile' which is awesome
+	to profile your application, the output is very useful.
+
+	Also, if you want to impress your friends, you might want to
+	run the JIT with the `-d' flag, that shows you how the JITer
+	compiles the code (and shows the basic blocks and the forst of
+	trees as it goes).
+
+* Next steps
+
+	More classes are missing.  These are required so we can run
+	nant and nunit natively.  Once we achieve that, we will be
+	able to ship a complete environment that compiles on Linux.
+	
+	Currently our makefiles still use csc, as we still need
+	nunit/nant to work.
+
+[1] Of course, .NET programs that try to use classes we have not yet
+implemented, will be left wondering `why did this happen to me?'.  
+
+Hello!
+
+	I have just uploaded Mono 0.9 to the web server, you can get
+	the goodies here:
+
+		http://www.go-mono.com/archive/mono-0.9.tar.gz
+		http://www.go-mono.com/archive/mcs-0.9.tar.gz
+
+	mono-0.9.tar.gz contains the source code to the runtime (JIT
+	and interpreter) as well as a pre-compiled version of the
+	compiler (mcs.exe) and the class libraries.
+
+	To compile the compiler and the class libraries, you still
+	need Windows with the .NET SDK, as our runtime can not host
+	the compiler completely yet.
+
+* Improved Build System
+
+	You can check http://www.go-mono.com/download.html for the
+	new and fresh compilation instructions.  Same requirements as
+	the last version (pkg-config, glib 1.3.xx need to be
+	installed). 
+
+* What is new:
+
+	Compiler can compile about 75% of our regression test suite
+	on Linux.  Most of this work is on the class libraries and
+	Paolo has been the magician behind the work here.
+
+	JIT can run the compiler now (Dietmar)
+	
+	Mint works on Windows now (Dick).
+
+	Application Domains have been implemented (Dietmar)
+
+		* Two modes of operation are available, depending on
+		  your needs: share code, or maximize speed (does not
+		  share code).  This is described by the the
+		  LoaderOptimization enumeration in .NET.
+
+	Corlib no longer has references to mscorlib (Daniel Lewis)
+
+	Ports:
+		PowerPC has been updated (Radek Doulik)
+		New SPARC port (Jeffrey Stedfast)
+
+	Documentation system:
+		Adam Treat has been working on finishing the Doctools
+		to maintain the Mono class library documentation.  We
+		still need a GUI editor though.
+
+	Tracking progress:
+		Nick's new tools to track progress are included in
+		this release.
+
+	Many new more regression tests for the class library
+		(David Brandt, Mark Crichton, Nick Drochak, Bob Doan,
+		 Duco Fijma).
+
+	Lots of new code:
+		Gaurav Vaish (the hacking god behind System.Web),
+		Chris Podugriel (System.Data) and Mark Crichton (Crypto)
+
+	Runtime:
+		Socket layer is finished (Dick Porter)
+
+	Compiler has full support for unsafe code now (Miguel)
+		Still a few things missing: constant folding is not 
+		finished everywhere and access permissions are not
+		enforced yet.
+	
+	Many many many bug fixes everywhere from everyone on the team:
+
+		Paolo Molaro, Daniel Lewis, Daniel Stodden, Dietmar
+		Maurer, Jeff Stedfast, Nick Drochak, Duco Fijma, Ravi Pratap,
+		Dick Porter, Duncan Mak, Jeff Stedfast and Miguel de Icaza.
+
+	I am sorry if I left a major component out of the
+	announcement, this were some intense 11 days of work.
+
+* What is obviously missing
+
+	Currently our System.Reflection.Emit is lacking array and
+	pointer support, which is why many programs still do not
+	compile, but this should be taken care of next week.
+
+* How can you help
+
+	There are many ways to help the project, check the details
+	documentation in:
+
+		http://www.go-mono.com/contributing.html
+
+	You might also want to stop by our IRC channel on
+	irc.gnome.org, channel #mono if you are interested in
+	contributing.
+
+Have a happy weekend!
+Miguel.
+
+Hey guys!
+
+   Mono 0.7 has been released. 
+
+   It has been a long time since the last release of Mono (almost
+three weeks).  We have made an incredible ammount of work in the past
+three weeks.  
+
+* Highlights of this release:
+
+	* The monoburg: BURS-instruction selector implemented (for our
+	  portable JIT engine).
+
+	* JIT engine works for very simple programs (Fibonacci works
+	  for instance).  It is about 30% faster running than the
+	  equivalent code compiled with Kaffe.
+
+	  The interesting part is that this was accomplished with the
+	  a minimum register allocator, and very simple monoburg
+	  rules, so there is a *lot* of room to improve here.
+
+	* The Interpreter has madured a lot.  Value Types are fully
+	  supported now;  We dropped the FFI dependency, as we now
+	  have our own code generator.
+
+	* The runtime has been expanded and extended as to support
+	  real file I/O (including console I/O).  So Hello World works
+	  in there. 
+
+	* The compiler can generate code for most statements now; It
+	  also performs semantic analysis on most expressions.
+	  Creation of new objects is supported, access to parameters,
+	  fields and local variables works.  Method invocation works.
+	  Implicit type conversions, assignments and much more.
+
+	  Operator overloading is implemented, but broken on this
+	  release, hopefully this will be fixed soon.
+
+	  Delegates and Attributes are now declared and passed around,
+	  but no code generation for those exist yet.
+
+	* More classes (look for details).  Sergey and Paolo have been
+	  working on various classes in System.Reflection.Emit to get
+	  the compiler self-hosting.
+
+	* NUnit is now part of the distribution, so it should be
+	  trivial to write test cases (and if you want to help out,
+	  this is one way to do it, we really need more tests cases).
+
+    I am going to try to switch to Nick's JB for C# this week or next
+week.  But the excitement of having the compiler deal with real C#
+programs is too much to be contained, and I can not keep my hands of
+the code generation in the compiler.
+
+* Availability:
+
+	  http://www.go-mono.com/archive/mono-0.7.tar.gz
+	  http://www.go-mono.com/archive/mcs-0.7.tar.gz
+
+* Details
+
+  Class Library Changes:
+
+  Many enumerations have been revamped to have the same value
+definitions as those in .NET as those cause problems.  They were also
+missing the [Flags] attributes, so we got that right too. 
+
+    * System
+	  SerializableAttribute impl			 (Miguel)
+	  String updates                                 (Jeff)
+	  System.Char					 (Ravi)
+
+    * System.Configuration
+	  ConfigurationSettings impl                     (Christopher Podurgiel)
+	  SingleTagSectionHandler impl                   (Christopher Podurgiel)
+	  DictionarySectionHandler impl                  (Christopher Podurgiel)
+
+    * System.Collections.Specialized
+	  NameObjectCollectionBase impl			 (Nick Drochak)
+
+    * System.Diagnostics
+	  StackFrame stubs				 (alexk)
+	  StackTrace stubs				 (alexk)
+
+    * System.IO
+	  File stubs                                     (Jim Richardson)
+	  IOException impl                               (Paolo)	
+	  StreamWriter impl				 (Dietmar)
+	  StreamReader stubs				 (Dietmar)
+
+    * System.Net
+	  ConnectionModes				 (Miguel)
+	  ProxyUseType					 (Miguel)
+	  WebStatus					 (Miguel)
+
+    * System.Reflection
+	  Assembly (stubs)				 (Paolo)
+	  MethodBase					 (Paolo)
+	  MethodInfo					 (Paolo)
+
+    * System.Reflection.Emit
+	  EventToken					 (Sergey)
+	  FieldToken					 (Sergey)
+	  FlowControl					 (Sergey)
+	  ILGenerator (stubbed)				 (Paolo)
+	  Label 					 (Paolo)
+	  MethodToken					 (Sergey)
+	  OpCode.cs					 (Sergey)
+	  OpCodeType					 (Sergey)
+	  OpCodes.cs					 (Sergey)
+	  OperandType					 (Sergey)
+	  PEFileKinds					 (Paolo)
+	  PackingSize					 (Sergey)
+	  ParameterToken				 (Sergey)
+	  PropertyToken					 (Sergey)
+	  SignatureToken				 (Sergey)
+	  StackBehaviour				 (Sergey)
+	  StringToken					 (Sergey)
+	  TypeToken					 (Sergey)
+
+    * System.Threading
+
+	  Most classes stubbed out by Dick Porter        (Dick)
+
+    * System.Web
+	  HttpWorkerRequest stubs			 (Bob Smith)
+
+    * System.Web.Hosting				 (Bob Smith)
+	  AppDomainFactory stubs			 (Bob Smith)
+	  ApplicationHost stubs				 (Bob Smith)
+	  IAppDomainFactory stubs			 (Bob Smith)
+	  IISAPIRuntime	stubs				 (Bob Smith)
+	  ISAPIRuntime stubs				 (Bob Smith)
+	  SimpleWorkerRequest stubs			 (Bob Smith)
+
+    * System.Web.UI
+	  LiteralControl implemented                     (Bob Smith)
+	  HtmlContainerControl bugfixes                  (Bob Smith)
+	  BuildMethod 
+	  BuildTemplateMethod 
+	  HtmlTextWriterAttribute 
+	  HtmlTextWriterStyle 
+	  HtmlTextWriterTag 
+	  IAttributeAccessor 
+	  IDataBindingsAccessor 
+	  INamingContainer 
+	  IParserAccessor 
+	  IPostBackDataHandler 
+	  IPostBackEventHandler 
+	  IStateManager 
+	  ITagNameToTypeMapper 
+	  ITemplate 
+	  IValidator 
+	  ImageClickEventHandler 
+	  OutputCacheLocation 
+	  PersistanceMode 
+	  StateItem 
+
+    * System.Web.UI.HtmlControls
+	  HtmlAnchor impl				 (Leen Teolen)
+	  HtmlTextArea impl				 (Leen Teolen)
+
+    * System.Web.UI.WebControls
+	  WebControl.cs                                  (Gaurav Vaish)
+
+    * System.XML
+	  Lots of enumerations				 (Miguel)
+	  (will add later)
+
+    * Add loads of enumerations throughout 		 (Sergey)
+      (will add later)
+
+Compiler Changes:
+
+    * Assignment					 (Miguel)
+
+    * expression semantic analysis			 (Miguel)
+
+    * constructor creation, chaining			 (Miguel)
+
+    * Unified error reporting                            (Ravi)
+
+    * initial attribute support				 (Ravi)
+
+    * calling convention support                         (Miguel)
+
+    * loop construct code generation                     (Miguel)
+
+    * conditional statement code generation		 (Miguel)
+
+    * indexer declarations				 (Ravi)
+
+    * event declarations				 (Ravi)
+
+    * try/catch parsing fixed				 (Ravi)
+
+    * initial delegate support				 (Ravi)
+
+    * operator overload                                  (Ravi)
+
+Tools Changes:
+
+    * Add NUnit windows binaries to distribution	 (Nick Drochak, Miguel)
+
+Runtime Changes:
+
+    * First JIT implementation                           (Dietmar, Paolo)
+
+    * value type size calculation                        (Dietmar)
+
+    * full value type support                            (Paolo)
+
+    * frequently used types cache                        (Paolo)
+
+    * FileStream support				 (Paolo)
+
+    * Console input/output support			 (Dietmar)
+
+    * print arguments and exception name in stack trace  (Paolo)
+
+    * beginnings of virtual call support                 (Paolo)
+
+    * reimplement pinvoke support			 (Dietmar)
+
+    * remove libffi dependency				 (Dietmar)
+
+    * IBURG code generator implementation		 (Dietmar)
+
+    * new opcodes implemented: starg.s, ldobj, isinst,   (Paolo, Miguel)
+      ldarg, starg, ldloc, ldloca, stloc, initobj, 
+      cpblk, sizeof, conv.i, conv.i1, conv.i2, conv.i4, 
+      conv.i8, conv.u1, conv.u2, conv.u4, conv.r4, 
+      conv.r8, ldelema, ceq, cgt, clt.
+
+* This list
+
+    Parts of this list of features were compiled by Alex by following
+the CVS mailing list.  My deepest thanks to Alex for helping me out
+with this.  I want to apologize for the missing features that I did
+not document here, Mono is moving too fast to keep track of all the
+changes. 
+
 2002-Feb-11 Miguel de Icaza  <miguel@ximian.com>
 
 	New release, functional x86-JIT, x86 interpreter, ppc interpreter 
diff --git a/README b/README
index 95e4b3806a1..07c2df049af 100644
--- a/README
+++ b/README
@@ -8,17 +8,40 @@ Installation:
 
 		http://www.go-mono.com/download.html
 
-A directory roadmap:
+* Using Mono
+
+	Once you have installed the software, you can run a few programs:
+
+	* runtime engine
+
+		mono program.exe
+	  or
+		mint program.exe
+
+	* C# compiler
+
+		mcs program.cs
+
+	* CIL Disassembler
+
+		monodis program.exe
+
+	See the man pages for mono(1), mint(1), monodis(1) and mcs(2)
+	for further details.
+
+* A directory roadmap:
 
 	doc/
 		Contains documentation and the web site contents.
 
 	mono/
-		The core of the executable.
+		The core of the Mono Runtime.
 
 		metadata/
-			The library to deal with executables and libraries for
-			.NET
+			The object system and metadata reader.
+
+		jit/
+			The Just in Time Compiler.
 
 		dis/
 			CIL executable Disassembler
@@ -26,6 +49,10 @@ A directory roadmap:
 		cli/
 			Common code for the JIT and the interpreter.
 
+		io-layer/
+			The I/O layer and system abstraction for 
+			emulating the .NET IO model.
+
 		cil/
 			Common Intermediate Representation, XML
 			definition of the CIL bytecodes.
@@ -33,20 +60,7 @@ A directory roadmap:
 		interp/
 			Interpreter for CLI executables.
 
-* Using Mono
-
-	Once you have installed the software, you can run a few programs:
-
-		monodis program.exe
-
-	That will dump the bytecodes for program.exe.  Monodis support
-	a number of options that dumps various metadata tables
-	(chapter 23 of the Partition III).
-
-	You can try the interpreter like this:
-
-		mint program.exe
-
-
+		arch/
+			Architecture specific portions.
 
 
diff --git a/acconfig.h b/acconfig.h
index 196b6020f02..78432fc32a8 100644
--- a/acconfig.h
+++ b/acconfig.h
@@ -1,5 +1,6 @@
 #undef HAVE_INET_PTON
 #undef HAVE_INET_ATON
+#undef HAVE_MSG_NOSIGNAL
 #undef HAVE_SOL_IP
 #undef HAVE_SOL_TCP
 #undef HAVE_IP_PKTINFO
@@ -12,3 +13,8 @@
 #undef HAVE_NEW_ICONV
 #undef NAME_DEV_RANDOM
 #undef HAVE_CRYPT_RNG
+#undef HAVE_BOEHM_GC
+#undef DISABLE_SHARED_HANDLES
+#undef HAVE_TIMEZONE
+#undef HAVE_TM_GMTOFF
+#undef MONO_SIZEOF_SUNPATH
diff --git a/config.h.in b/config.h.in
index b3f3a8d60c1..b412155c227 100644
--- a/config.h.in
+++ b/config.h.in
@@ -3,12 +3,46 @@
 /* Define if you have the ANSI C header files.  */
 #undef STDC_HEADERS
 
+#undef HAVE_INET_PTON
+#undef HAVE_INET_ATON
+#undef HAVE_SOL_IP
+#undef HAVE_SOL_TCP
+#undef HAVE_IP_PKTINFO
+#undef HAVE_STRUCT_IP_MREQN
+#undef HAVE_PTHREAD
+#undef HAVE_PTHREAD_MUTEX_TIMEDLOCK
+#undef USE_MONO_MUTEX
+#undef HAVE_LARGE_FILE_SUPPORT
+#undef PLATFORM_WIN32
+#undef HAVE_NEW_ICONV
+#undef NAME_DEV_RANDOM
+#undef HAVE_CRYPT_RNG
+#undef HAVE_BOEHM_GC
+
 /* The number of bytes in a void *.  */
 #undef SIZEOF_VOID_P
 
+/* Define if you have the inet_aton function.  */
+#undef HAVE_INET_ATON
+
+/* Define if you have the inet_pton function.  */
+#undef HAVE_INET_PTON
+
 /* Define if you have the <dlfcn.h> header file.  */
 #undef HAVE_DLFCN_H
 
+/* Define if you have the <netdb.h> header file.  */
+#undef HAVE_NETDB_H
+
+/* Define if you have the <sys/filio.h> header file.  */
+#undef HAVE_SYS_FILIO_H
+
+/* Define if you have the <sys/sockio.h> header file.  */
+#undef HAVE_SYS_SOCKIO_H
+
+/* Define if you have the <utime.h> header file.  */
+#undef HAVE_UTIME_H
+
 /* Name of package */
 #undef PACKAGE
 
diff --git a/configure.in b/configure.in
index f8782861497..8a9879e75ba 100644
--- a/configure.in
+++ b/configure.in
@@ -1,15 +1,39 @@
-
 AC_INIT(README)
 AC_CANONICAL_SYSTEM
 AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(mono, 0.9)
+AM_INIT_AUTOMAKE(mono, 0.14)
 AM_MAINTAINER_MODE
 
+dnl ****************************************
+dnl *** Check if we're building on win32 ***
+dnl ****************************************
+AC_MSG_CHECKING([if building for some Win32 platform])
+case "$host" in
+	*-*-mingw*|*-*-cygwin*)
+		platform_win32=yes
+		AC_DEFINE(PLATFORM_WIN32)
+		CC="gcc -mno-cygwin"
+		libdl=
+		;;
+	*)
+		platform_win32=no
+		libdl="-ldl"
+		;;
+esac
+AC_MSG_RESULT($platform_win32)
+AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
+
 AC_CHECK_TOOL(CC, gcc, gcc)
 AC_PROG_CC
 AM_PROG_CC_STDC
 AC_PROG_INSTALL
 
+AC_CHECK_PROG(BISON, bison,yes,no)
+if test "x$BISON" = "xno";
+then
+	AC_MSG_ERROR([You need to install bison])
+fi
+
 dnl may require a specific autoconf version
 dnl AC_PROG_CC_FOR_BUILD
 dnl CC_FOR_BUILD not automatically detected
@@ -30,10 +54,16 @@ AM_PROG_LIBTOOL
 
 AC_CHECK_HEADERS(sys/filio.h sys/sockio.h netdb.h utime.h)
 
+AC_CHECK_HEADERS(iconv.h)
+AC_CHECK_HEADERS(giconv.h)
+
+# for mono/metadata/debug-symfile.c
+AC_CHECK_HEADERS(elf.h)
+
 # not 64 bit clean in cross-compile
 AC_CHECK_SIZEOF(void *, 4)
 
-CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations'
+CFLAGS='-g -Wall -Wunused -Wmissing-prototypes -Wmissing-declarations -Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs -Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings'
 
 AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
 if test "x$PKG_CONFIG" = "xno"; then
@@ -75,21 +105,37 @@ AC_SUBST(GLIB_LIBS)
 AC_SUBST(GMODULE_CFLAGS)
 AC_SUBST(GMODULE_LIBS)
 
-dnl ****************************************
-dnl *** Check if we're building on win32 ***
-dnl ****************************************
-AC_MSG_CHECKING([if building for some Win32 platform])
-case "$host" in
-	*-*-mingw*|*-*-cygwin*)
-		platform_win32=yes
-		AC_DEFINE(PLATFORM_WIN32)
+AC_CHECK_LIB(gc, GC_malloc, found_boehm="yes",,$libdl)
+gc=auto
+AC_ARG_WITH(gc, [  --with-gc=boehm,none],[gc=$with_gc])
+
+case "x$gc" in
+	xboehm|xyes)
+		if test "x$found_boehm" != "xyes"; then
+			AC_MSG_ERROR("GC requested but libgc not found!")
+		fi
+
+		AC_DEFINE(HAVE_BOEHM_GC)
+		AC_SUBST(HAVE_BOEHM_GC)
+		LIBS="$LIBS -lgc $libdl"
+		;;
+	xnone)
+		AC_MSG_WARN("Compiling mono without GC.")
 		;;
 	*)
-		platform_win32=no
+dnl When the JIT works with libgc, use this chunk.
+dnl		# If libgc was found, use it.  Otherwise just warn.
+		if test "x$found_boehm" != "xyes"; then
+			AC_MSG_WARN("Compiling mono without GC.")
+		else
+			AC_DEFINE(HAVE_BOEHM_GC)
+			AC_SUBST(HAVE_BOEHM_GC)
+			LIBS="$LIBS -lgc $libdl"
+			gc="boehm"
+		fi
+dnl		AC_MSG_WARN("Compiling mono without GC.")
 		;;
 esac
-AC_MSG_RESULT($platform_win32)
-AM_CONDITIONAL(PLATFORM_WIN32, test x$platform_win32 = xyes)
 
 if test x$platform_win32 = xno; then
 	dnl ******************************************************************
@@ -99,7 +145,7 @@ if test x$platform_win32 = xno; then
 	
 	# Check that off_t can represent 2**63 - 1 correctly, working around
 	# potential compiler bugs.  Defines LARGE_FILE_SUPPORT, adds $1 to
-	# CFLAGS and sets $large_offt to yes if the test succeeds
+	# CPPFLAGS and sets $large_offt to yes if the test succeeds
 	large_offt=no
 	AC_DEFUN(LARGE_FILES, [
 		large_CPPFLAGS=$CPPFLAGS
@@ -121,7 +167,7 @@ if test x$platform_win32 = xno; then
 		], [
 			AC_MSG_RESULT(ok)
 			AC_DEFINE(HAVE_LARGE_FILE_SUPPORT)
-			CFLAGS="$CFLAGS $1"
+			large_CPPFLAGS="$large_CPPFLAGS $1"
 			large_offt=yes
 		], [
 			AC_MSG_RESULT(no)
@@ -144,6 +190,21 @@ if test x$platform_win32 = xno; then
 	dnl *****************************
 	AC_CHECK_LIB(socket, socket, LIBS="$LIBS -lsocket")
 
+	dnl *******************************
+	dnl *** Checks for MSG_NOSIGNAL ***
+	dnl *******************************
+	AC_MSG_CHECKING(for MSG_NOSIGNAL)
+	AC_TRY_COMPILE([#include <sys/socket.h>], [
+		int f = MSG_NOSIGNAL;
+	], [
+		# Yes, we have it...
+		AC_MSG_RESULT(yes)
+		AC_DEFINE(HAVE_MSG_NOSIGNAL)
+	], [
+		# We'll have to use signals
+		AC_MSG_RESULT(no)
+	])
+
 	dnl *****************************
 	dnl *** Checks for SOL_IP     ***
 	dnl *****************************
@@ -211,10 +272,33 @@ if test x$platform_win32 = xno; then
 
 	AC_CHECK_FUNCS(inet_pton inet_aton)
 
+	dnl ***********************************************
+	dnl *** Checks for size of sockaddr_un.sun_path ***
+	dnl ***********************************************
+	# AC_CHECK_SIZEOF can't cope with struct members :-(
+	AC_MSG_CHECKING(size of sockaddr_un.sun_path)
+	AC_CACHE_VAL(cv_mono_sizeof_sunpath,
+		[AC_TRY_RUN([
+			#include <stdio.h>
+			#include <sys/un.h>
+
+			int main(void) {
+				struct sockaddr_un sock_un;
+				FILE *f=fopen("conftestval", "w");
+				if(!f) exit(1);
+				fprintf(f, "%d\n", sizeof(sock_un.sun_path));
+				exit(0);
+			}
+		], cv_mono_sizeof_sunpath=`cat conftestval`,
+		   cv_mono_sizeof_sunpath=0,
+		   cv_mono_sizeof_sunpath=0)])dnl
+	AC_MSG_RESULT($cv_mono_sizeof_sunpath)
+	AC_DEFINE_UNQUOTED(MONO_SIZEOF_SUNPATH, $cv_mono_sizeof_sunpath)
+
 	dnl *****************************
 	dnl *** Checks for libpthread ***
 	dnl *****************************
-	AC_SEARCH_LIBS(pthread_create, pthread, [
+	AC_SEARCH_LIBS(pthread_create, pthread c_r, [
 		AM_CONDITIONAL(THREADS_PTHREAD, true)
 		AC_DEFINE(HAVE_PTHREAD)
 
@@ -253,7 +337,7 @@ if test x$platform_win32 = xno; then
 			])
 		])
 		CPPFLAGS=$orig_CPPFLAGS
-		CFLAGS="$CFLAGS $pthread_CFLAGS"
+		CPPFLAGS="$CPPFLAGS $pthread_CFLAGS"
 
 		# Need PTHREAD_MUTEX_RECURSIVE
 		pthread_CFLAGS=""
@@ -289,7 +373,7 @@ if test x$platform_win32 = xno; then
 			])
 		])
 		CPPFLAGS=$orig_CPPFLAGS
-		CFLAGS="$CFLAGS $pthread_CFLAGS"
+		CPPFLAGS="$CPPFLAGS $pthread_CFLAGS"
 	], [
 		AC_MSG_ERROR([libpthread is required on non-win32 hosts])
 	])
@@ -298,7 +382,34 @@ if test x$platform_win32 = xno; then
 	dnl *** Checks for semaphore lib ***
 	dnl ********************************
 	AC_CHECK_LIB(rt, sem_init, LIBS="$LIBS -lrt")
+
+	dnl ********************************
+	dnl *** Checks for timezone stuff **
+	dnl ********************************
+	AC_CACHE_CHECK(for timezone variable, ac_cv_var_timezone,
+		AC_TRY_COMPILE([
+			#include <time.h>
+		], [
+			timezone = 1;
+		], ac_cv_var_timezone=yes, ac_cv_var_timezone=no))
+	if test $ac_cv_var_timezone = yes; then
+		AC_DEFINE(HAVE_TIMEZONE)
+	else
+		AC_CACHE_CHECK(for tm_gmtoff in struct tm, ac_cv_struct_tm_gmtoff,
+			AC_TRY_COMPILE([
+				#include <time.h>
+				], [
+				struct tm tm;
+				tm.tm_gmtoff = 1;
+				], ac_cv_struct_tm_gmtoff=yes, ac_cv_struct_tm_gmtoff=no))
+		if test $ac_cv_struct_tm_gmtoff = yes; then
+			AC_DEFINE(HAVE_TM_GMTOFF)
+		else
+			AC_ERROR(unable to find a way to determine timezone)
+		fi
+	fi
 else
+	AM_CONDITIONAL(THREADS_PTHREAD, false)
 	# This is a kludge, we really ought to test for libws2_32, but
 	# I can't make AC_CHECK_LIB link (the symbols seem to be mangled
 	# with @num suffixes)
@@ -392,6 +503,14 @@ else
 fi
 fi
 
+AC_MSG_CHECKING([if inter-process shared handles are requested])
+AC_ARG_ENABLE(shared-handles, [  --disable-shared-handles disable inter-process shared handles], try_shared_handles=$enableval, try_shared_handles=yes)
+AC_MSG_RESULT($try_shared_handles)
+if test "x$try_shared_handles" != "xyes"; then
+	AC_DEFINE(DISABLE_SHARED_HANDLES)
+	AC_SUBST(DISABLE_SHARED_HANDLES)
+fi
+
 TARGET="unknown"
 ACCESS_UNALIGNED="yes"
 
@@ -402,11 +521,11 @@ sparc*-*-*) TARGET=SPARC; arch_target=sparc; ACCESS_UNALIGNED="no";;
 #alpha*-*-linux* | alpha*-*-osf*) TARGET=ALPHA; ACCESS_UNALIGNED="no";;
 #m68k-*-linux*) TARGET=M68K;;
 powerpc-*-linux* | powerpc-*-sysv*) TARGET=POWERPC; arch_target=ppc;;
-arm-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";;
+arm-*-linux-* | armv4l-*-linux-*) TARGET=ARM; arch_target=arm; ACCESS_UNALIGNED="no";;
 esac
 
 if test ${TARGET} = unknown; then
-	CFLAGS="$CFLAGS -DNO_PORT"
+	CPPFLAGS="$CPPFLAGS -DNO_PORT"
 	AC_MSG_WARN("mono has not been ported to $host: some things may not work.")
 fi
 
@@ -425,27 +544,43 @@ AM_CONDITIONAL(ARM, test x$TARGET = xARM)
 
 AC_SUBST(arch_target)
 AC_SUBST(CFLAGS)
+AC_SUBST(CPPFLAGS)
 
 AC_OUTPUT([
 Makefile
+mono.pc
 mono/Makefile
+mono/utils/Makefile
 mono/metadata/Makefile
 mono/dis/Makefile
 mono/cil/Makefile
 mono/arch/Makefile
+mono/os/Makefile
+mono/os/win32/Makefile
+mono/os/unix/Makefile
 mono/arch/x86/Makefile
 mono/arch/ppc/Makefile
 mono/arch/sparc/Makefile
 mono/arch/arm/Makefile
 mono/interpreter/Makefile
 mono/tests/Makefile
-mono/wrapper/Makefile
+mono/benchmark/Makefile
 mono/monoburg/Makefile
 mono/monograph/Makefile
 mono/jit/Makefile
 mono/io-layer/Makefile
+mono/handles/Makefile
 runtime/Makefile
 scripts/Makefile
 man/Makefile
 doc/Makefile
+docs/Makefile
+data/Makefile
+mono.spec
 ])
+
+echo "
+
+	GC:	$gc
+
+"
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 00000000000..eb75fca0a28
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,9 @@
+monodir = $(sysconfdir)/mono
+
+EXTRA_DIST = config.in
+
+mono_DATA = config
+
+config: config.in Makefile
+	sed -e 's^\@LIBC\@^libc.so.6^g' < $(srcdir)/config.in > config.tmp \
+	&& mv config.tmp config
diff --git a/data/config.in b/data/config.in
new file mode 100644
index 00000000000..960d93de28e
--- /dev/null
+++ b/data/config.in
@@ -0,0 +1,4 @@
+<configuration>
+	<dllmap dll="cygwin1.dll" target="@LIBC@" />
+	<dllmap dll="libc" target="@LIBC@" />
+</configuration>
diff --git a/doc/Makefile.am b/doc/Makefile.am
index c1d6961f719..8ef4e422c5d 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,7 +1,7 @@
 WEB_FILES=  \
-	c-sharp class-library contact contributing documentation download \
+	ado-net c-sharp class-library contact contributing documentation download \
 	faq gcc-frontend ideas index  passport rationale resources \
-	roadmap runtime status team testing thanks tools porting anoncvs
+	roadmap runtime status team testing thanks tools porting anoncvs monodoc-xml winforms
 
 OTHERS= pending resources-pending todo mono-build.sh mono-build-w32.sh
 
@@ -15,13 +15,18 @@ all-docs: $(WEB_FILES)
 class-status: class-status.in pending-classes Makefile.am
 	cat class-status.in pending-classes > class-status
 
-pending-classes: pending-classes.in Makefile.am
-	echo "This is a list of pending classes, and links to their documentation on MSDN.Microsoft.com<p><p>" > pending-classes
-	for i in `cat pending-classes.in`; do x=`echo $$i | sed s/\\\.//g`; link=`echo http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrf@@@ClassTopic.asp | sed "s/@@@/$$x/"`; echo "	<a href=\"$$link\">$$i</a><br>" >> pending-classes; done
+pending-classes:
 
+#pending-classes: pending-classes.in Makefile.am
+#	echo "This is a list of pending classes, and links to their documentation on MSDN.Microsoft.com<p><p>" > pending-classes
+#	for i in `cat pending-classes.in`; do x=`echo $$i | sed s/\\\.//g`; link=`echo http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrf@@@ClassTopic.asp | sed "s/@@@/$$x/"`; echo "	<a href=\"$$link\">$$i</a><br>" >> pending-classes; done
 
-webit: class-status
+
+webit: dummy
 	(cd web; make && make push)
 
 push-notes:
 	scp release-notes/mono* www@www:/web/cvsmodules/mono/archive
+
+dummy:
+
diff --git a/doc/ado-net b/doc/ado-net
new file mode 100644
index 00000000000..876ca9c7164
--- /dev/null
+++ b/doc/ado-net
@@ -0,0 +1,801 @@
+* ADO.NET
+
+	The coordinator for the ADO.NET implementation is <a
+	href="mailto:rodrigo@ximian.com">Rodrigo Moya</a>, with
+	the collaboration of <a href="mailto:danmorg@sc.rr.com">Daniel
+	Morgan</a> and <a href="mailto:tim@timcoleman.com">Tim Coleman</a>.
+	
+
+* Action plan
+
+	The current plan to implement ADO.NET is as follows:
+
+	<b>Step 1:</b> Initial <a href="http://msdn.microsoft.com/library/en-us/cpref/html/frlrfsystemdatasqlclient.asp?frame=true">System.Data.SqlClient</a> Provider:
+
+	<ul>
+		* Initial implementation of System.Data.SqlClient is based on
+		  the <a href="http://www.postgresql.org/idocs/">PostgreSQL C API</a> which is a
+		  client API to the PostgreSQL DBMS.  PostgreSQL was chosen so we could quickly
+		  create and test the System.Data classes.
+		  
+		* Once the <a href="http://msdn.microsoft.com/library/en-us/cpref/html/frlrfsystemdatasqlclient.asp?frame=true">System.Data.SqlClient</a>
+		  code is functional and is usable by other people, we willl move it to
+		  Mono.Data.PostgreSQL, and will convert the existing
+		  System.Data.SqlClient to be just a wrapper around
+		  Mono.Data.PostgreSQL.  
+
+	</ul>
+
+	<b>Step 2:</b> <a href="http://msdn.microsoft.com/library/en-us/cpref/html/frlrfSystemDataOleDb.asp?frame=true">System.Data.OleDb</a> Provider:
+		
+	<ul>
+		* <p>On Unix systems: System.Data.OleDb uses the
+		<a href="http://www.gnome-db.org/">LibGDA</a>
+		 engine. 
+
+		  <p>LibGDA is a data access engine like ADO/OLE-DB, but for Unix.  The 
+		  GDA in libGDA stands for GNU/GNOME Data Access, but it does not require GNOME.
+		  It only requires glib2 and libxml2.  LibGDA is used by 
+		  libgnomedb, GNOME-DB, and gaSQL.
+		  
+		  <p>There is work under way to get libgda working under 
+		  Windows using Cygwin by the GNOME-DB developers.
+		  
+		  <p>LibGDA has providers for MySQL, PostgreSQL, XML, ODBC,
+		  Oracle, Interbase, Sybase/SQL server (via FreeTDS), IBM DB2,
+		  SQLite and MDB Tools
+		  (MS Access support).
+
+		* On Windows systems: System.Data.OleDb will use libgda as well,
+		  if we can get it working, or OLE-DB as
+		  its engine.
+	</ul>
+
+	<b>Step 3:</b> <a href="http://msdn.microsoft.com/library/en-us/cpref/html/frlrfsystemdatasqlclient.asp?frame=true">System.Data.SqlClient</a> Provider:
+
+	<ul>
+		* <p>System.Data.SqlClient will then become a managed
+		  provider for Microsoft SQL Server, both on Windows and
+		  Linux, to be compatible with applications written
+		  for the Microsoft .NET Development Framework.
+		  
+		  <p>Once Step 1 has been completed and the PostgreSQL
+		  provider support has been moved to its own place at 
+		  Mono.Data.PostgreSQL, we will use 
+		  <a href="http://www.freetds.org/">FreeTDS</a> as the basis
+		  for providing access to Microsoft SQL Server databases.
+		  
+		  <P>FreeTDS is a C API for Unix and Windows that implements 
+		  the TDS (Tabular Data Stream) protocol used in accessing 
+		  Microsoft SQL Server and Sybase databases.  A .NET Data Provider could be
+		  created for Sybase databases as well, but this would be put in Mono.Data.Sybase.
+	</ul>
+
+	<b>Step 4:</b> <a href="http://msdn.microsoft.com/downloads/sample.asp?url=/MSDN-FILES/027/001/668/msdncompositedoc.xml&frame=true">System.Data.Odbc</a> Provider:
+	
+	<ul>
+		* We will create a .NET Managaed Provider for ODBC
+		  in System.Data.Odbc for those using ODBC.
+		  On Unix and Windows, <a href="http://www.unixodbc.org/">unixODBC</a> mabye used.
+		  iODBC is an alternative to using unixODBC.
+		  
+		  <p>unixODBC works on Unix and Windows.  Well, I have not actually 
+		  used it on Cygwin, but it does build and install without problems.  
+		  
+		  <p>unixODBC has providers for:
+		  Oracle, Microsoft SQL Server and Sybase via FreeTDS, 
+		  MySQL, PostgreSQL, Informix, IBM DB2 (Universal Database), 
+		  Interbase, miniSQL (mSQL), AdabasD, Empress, YARD SQL, and others.
+		  
+	</ul>
+
+	<b>Step 5:</b> Other System.Data providers:
+
+	<ul>
+		* <p>The idea in Microsoft .NET System.Data is to have
+		  a managed provider for each supported DBMS.  System.Data.SqlClient
+		  for Microsoft SQL Server.  
+		  System.Data.OracleClient for Oracle 8i and 9i.
+
+		  <p>We will need to have Mono.Data.MySQL, Mono.Data.PostgreSQL,
+		  Mono.Data.DB2, and Mono.Data.miniSQL. Others,
+		  of course, are welcomed.
+		  		  
+		  <p>System.Data has been designed so 
+		  non-database providers can be created too.		  
+	</ul>
+	
+* Current Status
+
+	<p>We are working on Steps 1, 2, and 5.  We have only just begun on
+	steps 2 and 5 though.  We still have tons and tons of stuff to do.
+	If you have any ideas, let us know.
+	
+	<p>For Step 1, the PostgreSQL is starting to come together - it 
+	still needs a lot of work.
+	
+	<p>For Step 2, Rodrigo Moya has been working on System.Data.OleDb which uses libgda
+	which is an OLE-DB/ADO data access for Unix.  The C-Sharp bindings to libgda
+	currently work - meaning they can compile, run, and you can connect to a
+	PostgreSQL database via libgda via the C-Sharp bindings to libgda.  Basic
+	functionality (execution of commands, data retrieval, transactions, etc) are
+	now working. Current focus is on filling up the missing pieces (Data adapters
+	mainly).
+	
+	<p>For Step 3, we need someone to start the FreeTDS .NET Data Provider so
+	we can have data access to Microsoft SQL Server and Sybase databases, or either
+	add the support in libgda.
+	
+	<p>For Step 4, we need someone to start the unixODBC .NET Data Provider, or add
+	the support in libgda.
+	
+	<p>For Step 5, we have just begun creating a Mono.Data .NET Provider - a MySQL
+	.NET Provider that uses the MySQL C Client Library.  This provider is 
+	found in Mono.Data.MySql.  We can currently connect and do a SQL INSERT and insert
+	a row into a MySQL database.  However, it currently only works on Cygwin because
+	the MySQL client library libmySQL.dll is different 
+	from the library on Linux libmysqlclient.dll.  Another problem, mysql thread functions
+	do not load for some reason.  Also, the provider only runs if you use "mint" (the Mono
+	runtime interpreter).  It does not work on "mono" (the Mono Just-In-Time compiler).
+	The C# Bindings to MySQL are thanks to Brad Meril.
+		
+	<p>We are able to do simple CREATE TABLE, DROP TABLE, UPDATE, INSERT, and
+	DELETE SQL commands using the ExecuteNonQuery method in SqlCommand.  
+	
+	<p>We can execute multiple queries and do a NextResult() in SqlDataReader()
+	to get the next result set.  
+	
+	<p>We are also able to do simple aggregate functions, 
+	ie, count(), sum(), min(), and max() 
+	in a simple SELECT SQL query using the ExecuteScalar() now.  
+	
+	<p>We are also able to retrieve data with a simple SELECT SQL query 
+	using ExecuteReader() which returns a SqlDataReader.  We are able to
+	use GetSchemaTable() to get the meta data about the table columns.  
+	We are able	to Read() to get each row from the result set.  
+	
+	<p>Here is a sample of code that is based on PostgresTest.cs and
+	TestSqlDataReader.cs tests:
+<pre>
+ 
+ static void SelectData (IDbConnection cnc) {
+	
+	IDbCommand selectCommand = cnc.CreateCommand();
+	IDataReader reader;
+
+	selectCommand.CommandType = CommandType.Text;
+	selectCommand.CommandText = 
+		"select * from pg_user;" + 

+		"select * from pg_tables;" + 

+		"select * from pg_database";

+
+	reader = selectCommand.ExecuteReader ();
+
+	do {

+		// get the DataTable that holds

+		// the schema

+		DataTable dt = rdr.GetSchemaTable();

+

+		if(rdr.RecordsAffected != -1) {

+			// Results for 

+			// SQL INSERT, UPDATE, DELETE Commands 

+			// have RecordsAffected >= 0

+			Console.WriteLine("Result is from a SQL Command (INSERT,UPDATE,DELETE).  Records Affected: " + rdr.RecordsAffected);

+		}

+		else if (dt == null)

+				Console.WriteLine("Result is from a SQL Command not (INSERT,UPDATE,DELETE).   Records Affected: " + rdr.RecordsAffected);

+		else {

+			// Results for

+			// SQL not INSERT, UPDATE, nor DELETE

+			// have RecordsAffected = -1

+			Console.WriteLine("Result is from a SQL SELECT Query.  Records Affected: " + rdr.RecordsAffected);

+		

+			// Results for a SQL Command (CREATE TABLE, SET, etc)

+			// will have a null reference returned from GetSchemaTable()

+			// 

+			// Results for a SQL SELECT Query

+			// will have a DataTable returned from GetSchemaTable()

+

+			results++;

+			Console.WriteLine("Result Set " + results + "...");

+                        			

+			// number of columns in the table

+			Console.WriteLine("   Total Columns: " +

+				dt.Columns.Count);

+

+			// display the schema

+			foreach (DataRow schemaRow in dt.Rows) {

+				foreach (DataColumn schemaCol in dt.Columns)

+					Console.WriteLine(schemaCol.ColumnName + 

+						" = " + 

+						schemaRow[schemaCol]);

+				Console.WriteLine();

+			}

+

+			int nRows = 0;

+			string output, metadataValue, dataValue;

+			// Read and display the rows

+			Console.WriteLine("Gonna do a Read() now...");

+			while(rdr.Read()) {

+				Console.WriteLine("   Row " + nRows + ": ");

+					

+				for(c = 0; c < rdr.FieldCount; c++) {

+					// column meta data 

+					DataRow dr = dt.Rows[c];

+					metadataValue = 

+						"    Col " + 

+						c + ": " + 

+						dr["ColumnName"];

+						

+					// column data

+					if(rdr.IsDBNull(c) == true)

+						dataValue = " is NULL";

+					else

+						dataValue = 

+							": " + 

+							rdr.GetValue(c);

+				

+					// display column meta data and data

+					output = metadataValue + dataValue;					

+					Console.WriteLine(output);

+				}

+				nRows++;

+			}

+			Console.WriteLine("   Total Rows: " + 

+				nRows);

+		}	

+	} while(rdr.NextResult());

+	Console.WriteLine("Total Result sets: " + results);

+			

+	rdr.Close();

+ }
+
+</pre>
+	
+	<p>We are able to get 
+	String data (char, character, text, varchar), Int16 (smallint),
+	Int32 (integer), Int64 (bigint), DateTime (time, date, timestamp),
+	Boolean (boolean), Single (float), and Double (double).
+	More data types will come later.  Note, the types that do work still 
+	need thorough testing.
+	
+	<p>Rows that are returned which contain columns that are NULL are handled now. 
+	The SqlDataReader method IsDBNull() needs to be called to determine 
+	if a field IS NULL before trying to read data from that field.
+	
+	<p>Calling PostgreSQL stored procedures works.  It does not work perfectly.  It may not
+	even work to specification - yet.  If you want to test it yourself, look at
+	TestSqlDataReader.cs or PostgresTest.cs in
+	mcs/class/System.Data/Test.  
+	
+	<p>Below, I have some sample code you can
+	use to call a PostgreSQL stored procedure named "version".  This stored
+	procedure returns a string containing the PostgreSQL server version.  Notice
+	the CommandType is StoredProcedure and the method ExecuteScalar() is called.
+	
+	<p>ExecuteScalar() is a lightweight method in class SqlCommand that only returns
+	one row and one column as one object - even if there is more than row or column.
+	
+<pre>
+ static string GetDatabaseServerVersion (SqlConnection cnc) 
+ {			 
+	SqlCommand cmd = cnc.CreateCommand ();
+	string data;
+
+	cmd.CommandType = CommandType.StoredProcedure;
+	cmd.CommandText = "version";
+							
+	data = (string) cmd.ExecuteScalar ();
+
+	return data;
+ }
+</pre>
+			
+	<p>We have the beginnings of Parameters support PostgreSQL.  Only
+	Input Parameters are currently supported.  Output, Input/Output,
+	and Return parameters still need to be done.
+	
+	<p>A lot of functionality in System.Data is missing, but the 
+	infrastructure is starting to come together.
+	
+	<p>A lot of Exceptions need to be thrown for various exceptions.  However,
+	SqlException, SqlErrorCollection, and SqlError have been partially
+	implemented.
+	
+	<p>Tim Coleman and Rodrigo Moya got the beginnings of the
+	SqlDataAdapter/DataSet/DataTable/DataRow to work.  Currently, 
+	the SqlDataAdapter can Fill() relational data into a DataTable in a DataSet.
+	See the test mcs/class/System.Data/Test/TestSqlDataAdapter.cs to see it in action.
+	Below, I show a snippets from the test:
+	
+<pre>
+ string connectionString;
+ string sqlQuery;
+ SqlDataAdapter adapter;
+ DataSet dataSet = null;
+
+ connectionString =
+	"host=localhost;" +
+	"dbname=test;" +
+	"user=postgres";
+						
+ sqlQuery = "select * from pg_tables";
+
+ adapter = new SqlDataAdapter (sqlQuery, 
+			connectionString);
+ 				
+ dataSet = new DataSet ();
+
+ adapter.Fill (dataSet);
+			
+ if (dataSet != null) {
+	foreach (DataRow row in dataSet.Tables["Table"].Rows)
+		Console.WriteLine("tablename: " + row["tablename"]);
+ }
+</pre>	
+	
+	<p>We do need help on the DataSet/DataAdaptor/DataTable/DataRelation/XML 
+	functionality so we	can integrate with 
+	the ASP.NET controls and Windows.Forms controls by allowing the controls to bind 
+	to a data source.  Gonzalo, Gaurav, Leen, Patrik, Duncan, and others are 
+	working very hard on the ASP.NET support. If you want to help, 
+	contact <a href="mailto:gonzalo@ximian.com">Gonzalo Paniagua Javier</a>
+	
+	<P>Need to add XML support in System.Data.  This involves working on
+	the classes: DataSet and XmlDataDocument and the ExecuteXmlReader() in SqlCommand.
+	
+	<p>The System.Data.dll gets built with the rest of the class library.
+	To compile the System.Data.dll assembly separately, you need:
+
+	<b>On Unix</b>
+
+	<ul>
+		* update your mono sources. Be sure you have latest mcs.exe
+		  and .dll's, since there have been many fixes needed for
+		  compilation on Linux.
+
+		* compile System.Data.dll:
+<pre>
+ cd mcs/class/System.Data<br>
+ mcs --target library -o System.Data.dll @list
+</pre>
+	</ul>
+
+	<b>On Windows</b>
+
+	<ul>
+		* update your mono sources. Be sure you have latest mcs.exe
+		  and .dll's.  You can use the same method as Linux, 
+		  or you can use NAnt.
+
+		* To use NAnt:
+
+<pre>
+ cd mcs/class/System.Data
+ ../../nant/NAnt.exe
+</pre>
+			
+			This will automatically copy the System.Data.dll to Test.
+			If you need to do a clean for the System.Data.dll assembly,<br><br>
+
+<pre>			
+ cd mcs/class/System.Data
+ ../../nant/NAnt.exe clean
+</pre>
+	</ul>
+
+* Testing
+
+	<p>In order to test System.Data.SqlClient, you will need to have
+	access to a remote PostgreSQL DBMS, or you will have to install 
+	one locally.  PostgreSQL is the DBMS used for the initial 
+	implementation of System.Data.SqlClient.
+		
+	<p>Why?  Because it is free software, has a client 
+	library that is easy to use, PostgreSQL is easy to install on
+	Unix and Windows (using the Cygwin install program), not difficult to setup after
+	installation, and it runs under: Linux, 
+	Windows (via cygwin and ipc-daemon), Unix, and
+	others.  This allowed us to create the
+	System.Data functionality in Mono much quicker.
+		
+	<p>If you plan on using a remote PostgreSQL DBMS Server,
+	than you will need to have the PostgreSQL client software on your
+	local computer that includes libpq.so (pq.dll on Windows).
+	
+	<p>The System.Data tests use this connection string to connect
+	to the PostgreSQL database named "test" at host "localhost" as
+	user "postgres".
+
+<pre>
+"host=localhost;dbname=test;user=postgres"
+</pre>
+		
+	<p>Installation instructions for PostgreSQL DBMS:
+
+	<b>On Unix</b>
+
+	<ul>
+		* Read the PostgreSQL Installation Instructions 
+		at \usr\doc\postgresql-x.x.x\html\installation.html
+		
+		* Depending on your Unix system, 
+		PostgreSQL maybe already installed, a database user 'postgres' created, 
+		a linux user 'postgres' created and initdb ran.  Or maybe not.
+
+<pre>
+ su

+ adduser postgres

+ mkdir /usr/local/pgsql/data

+ chown postgres /usr/local/pgsql/data

+ su - postgres

+ initdb -D /usr/local/pgsql/data

+ postmaster -i -D /usr/local/pgsql/data

+ createdb test

+ psql test
+</pre>
+	
+		* Make sure you have a database user named postgres.  It is best to install
+		the PostgreSQL DBMS under linux user postgres.  When you run the postmaster,
+		run it under the user postgres as well.  If this was not done, then you
+		will need to create a user named postgres for the System.Data tests.
+
+		* If you already installed PostgeSQL and you do not have a database
+		user named postgres, then you can create user postgres using psql:
+		
+<pre>		
+psql test
+create user postgres with password 'fun2db';
+</pre>
+				
+		* The postmaster must be run with -i option.
+		
+		* In the /usr/local/pgsql/data/pg_hba.conf file, you need
+		to have the AUTH_TYPE set to md5.  You can read more on this at
+		/usr/doc/postgresql-7.2.1/html/client-authentication.html 
+		or wherever your
+		PostgreSQL html docs are located.  See the 2nd line below,
+		host 127.0.0.1 has an AUTH_TYPE md5 in pg_hba.conf.
+		
+<pre>
+ # TYPE     DATABASE    IP_ADDRESS    MASK               AUTH_TYPE
+
+ local      all                                          trust
+ host       all         127.0.0.1     255.255.255.255    md5
+</pre>
+
+	* If you can not find your PostgreSQL documentation locally or you 
+	did not install it, then you 
+	can get it <a href="http://www.postgresql.org/idocs/">here</a>.
+
+	</ul>
+
+	<b>On Windows</b>
+
+	<ul>
+		* Use the <a href="http://www.cygwin.com/">Cygwin</a> installer to 
+		  install the PostgreSQL DBMS.  It is
+		  found in the database category.
+		  
+		* <p>Read the file postgres-x.x.README at /usr/doc/Cygwin and read 
+		  the requirements to install PostgreSQL.  Those requirements
+		  are included with cygwin except cygipc.  A default installtion
+		  of cygwin does not install everything you will need, so on the 
+		  safe side, just include everything when installing cygwin.
+		
+		* <p>The -x.x in postgres-x.x is the version of your PostgreSQL DBMS.
+		
+		* <p>Once Cygwin has installed the PostgreSQL DBMS on your computer,
+		  read the file FAQ_MSWIN which is available 
+		  in /usr/doc/postgres-x.x 
+				  
+		* <p>Important notes from this file are:
+		  
+		  <ul>
+				<p><b>2.</b> - Install the latest <a href="http://www.neuro.gatech.edu/users/cwilson/cygutils/OBSOLETE/V1.1/cygipc/index.html">CygIPC</a> package.
+			  			  
+				<p>The cygipc package contains the ipc-daemon you will need 
+				to run before you can
+				run the PostgreSQL DBMS Server daemon (postmaster) or run
+				initdb which initializes the PostgreSQL database.
+			  
+				<p><b>3.</b>  The Cygwin bin directory has to be placed in 
+				the path before the Windows program directories, 
+				for example, C:\cygwin\bin 
+			  
+				<p><b>My own note.</b>  In the Windows control panel, I set
+				the environment variables PATH to my cygwin /usr/local/bin,
+				/usr/bin, and /bin.  I also set my LD_LIBRARY_PATH to 
+				/usr/local/lib and /usr/lib.  For example:
+			  
+				<p>
+<pre>
+PATH=c:\cygwin\usr\local\bin;c:\cygwin\usr\bin;c:\cygwin\bin;
+LD_LIBRARY_PATH=c:\cygwin\usr\local\lib;c:\cygwin\usr\lib;
+</pre>
+							  
+				<p><b>4.</b> Start the ipc-daemon that came with the cygipc 
+				package.  There
+				are two ways to do this: run it from the command line as:
+			  
+				<p>
+<pre>
+ipc-daemon &
+</pre> 			  
+				<p>or you can set it up as a Windows service.  See the 
+				file cygrunsrv.README at /usr/doc/Cygwin on how to do this
+				for ipc-daemon and postmaster.  Note the
+				troubleshooting section at the end of 
+				the cygrunsrv.README file.
+			  
+				<p>To install ipc-daemon as a service, 
+				you just have to run
+			  
+				<p>
+<pre>
+ipc-daemon --install-as-service' (--remove-as-service) 
+</pre>
+			  
+				<p>and then run
+			  
+<pre>
+net start ipc-daemon
+</pre>
+			</ul>
+			  
+			<p>Read the installation.html file 
+			at /usr/doc/postgresql-x.x/html/installation.html
+		
+			<p>You will see in this file that you will need to 
+			run the following commands:
+		  
+			<p>
+<pre>
+mkdir /usr/local/pgsql/data

+initdb -D /usr/local/pgsql/data

+postmaster -D /usr/local/pgsql/data

+createdb test

+psql test  		
+</pre>
+		  
+			<p>When you need to connect to the database, 
+			you will need ipc-daemon and postmaster running.  Start ipc-daemon
+			before any of the command above.  If you restart your computer, you
+			need to start ipc-daemon and postmaster either manually or as a 
+			service.
+		  
+			<p>psql is a command-line PostgreSQL client tool to 
+			enter and run SQL commands and queries.
+		  
+			<p>If there is no database user named postgres, create a user named
+			postgres with the following SQL command in the client tool psql:
+		  
+			<p>
+<pre>
+psql test
+create user postgres with password 'fun2db';
+</pre>
+			<p>The only reason I say this is so you can easily use the System.Data tests
+			without having to change the database, userid, etc.
+	</ul>
+	
+	<p>In the path mcs/class/System.Data/Test
+	there is a PostgreSQL test program named
+	PostgreTest.cs.  Thanks goes to Gonzalo for creating the original
+	PostgreSQL test.
+	
+	<p>To use it to test System.Data, you
+	modify the file to your PostgreSQL database
+	connection requirements:
+
+	<p>
+	<ul>
+		<li><b>dbname</b> database, ie., test</li>
+		<li><b>host</b> hostname of the PostgreSQL DBMS Server to connect to, ie., localhost</li>
+		<li><b>user</b> username, ie., someuser</li>
+		<li><b>password</b> password, ie., mypass1234</li>
+	</ul>
+	
+	<p>The connection string is in OLE-DB connection string format.  Internally,
+	SqlConnection converts this to the PostgreSQL connection string format.
+	
+	<p>
+<pre>
+    OLE-DB: "host=localhost;dbname=test;user=joe;password=smoe"
+PostgreSQL: "host=localhost dbname=test user=joe password=smoe"
+</pre>
+
+	<p>
+	Note that OLE-DB includes the semicolons while PostgreSQL's connection
+	string does not.
+
+	<p>
+    To compile the PostgresTest.cs program, do:
+    
+    <p>
+<pre>
+mcs PostgresTest.cs -r System.Data.dll
+</pre>
+    
+    <p>
+    To run using mint, do:
+    
+    <p>
+<pre>
+mint PostgresTest.exe
+</pre>
+    
+    <p>
+    To run using mono, do:
+<pre>
+mono PostgresTest.exe
+</pre>
+    
+    <p>Below, I show how the output from PostgresTest.  I have omitted a lot
+    of the meta data for the columns except two columns.  The classes
+    used were from System.Data.SqlClient and were used to connect to a
+    PostgreSQL database and retrieve data.
+
+<p>
+<pre>   
+

+danmorg@DANPC ~/mono/mcs/class/System.Data/Test

+$ mcs PostgresTest.cs -r System.Data.dll

+

+danmorg@DANPC ~/mono/mcs/class/System.Data/Test

+$ mono PostgresTest.exe

+        Postgres provider specific tests...

+

+                Drop table:

+Error (don't worry about this one)SqlError:PGRES_FATAL_ERROR ERROR:  table "mono

+_postgres_test" does not exist

+ <Stack Trace>

+

+                Create table with all supported types:

+OK

+                Insert values for all known types:

+OK

+                Update values:

+OK

+                Insert values for all known types:

+OK

+Aggregate: count(*)

+Agg Result: 2

+Aggregate: min(text_value)

+Agg Result: This is a text

+Aggregate: max(int4_value)

+Agg Result: 1048000

+Aggregate: sum(int4_value)

+Agg Result: 1048003

+                Select values from the database:

+Result is from a SELECT SQL Query.  Records Affected: -1

+Result Set 1...

+   Total Columns: 28

+ColumnName = boolean_value

+ColumnOrdinal = 1

+ColumnSize = 1

+NumericPrecision = 0

+NumericScale = 0

+IsUnique = False

+IsKey =

+BaseCatalogName =

+BaseColumnName = boolean_value

+BaseSchemaName =

+BaseTableName =

+DataType = System.Boolean

+AllowDBNull = False

+ProviderType = 16

+IsAliased = False

+IsExpression = False

+IsIdentity = False

+IsAutoIncrement = False

+IsRowVersion = False

+IsHidden = False

+IsLong = False

+IsReadOnly = False

+

+ ...

+

+ ColumnName = null_timestamp_value

+ ColumnOrdinal = 28

+ ColumnSize = 8

+ NumericPrecision = 0

+ NumericScale = 0

+ IsUnique = False

+ IsKey =

+ BaseCatalogName =

+ BaseColumnName = null_timestamp_value

+ BaseSchemaName =

+ BaseTableName =

+ DataType = System.DateTime

+ AllowDBNull = False

+ ProviderType = 1184

+ IsAliased = False

+ IsExpression = False

+ IsIdentity = False

+ IsAutoIncrement = False

+ IsRowVersion = False

+ IsHidden = False

+ IsLong = False

+ IsReadOnly = False

+

+ Gonna do a Read() now...

+   Row 0:

+    Col 0: boolean_value: False

+    Col 1: int2_value: 5

+    Col 2: int4_value: 3

+    Col 3: bigint_value: 9

+    Col 4: float_value: 3.141590

+    Col 5: double_value: 3.14159

+    Col 6: numeric_value: 123456789012.345

+    Col 7: char_value: Mono.Data!

+    Col 8: varchar_value: It was not me!

+    Col 9: text_value: We got data!

+    Col 10: point_value: (1,0)

+    Col 11: time_value: 01/01/1 21:13:14

+    Col 12: date_value: 02/29/2000 00:00:00

+    Col 13: timestamp_value: 02/29/2004 14:00:11

+    Col 14: null_boolean_value is NULL

+    Col 15: null_int2_value is NULL

+    Col 16: null_int4_value is NULL

+    Col 17: null_bigint_value is NULL

+    Col 18: null_float_value is NULL

+    Col 19: null_double_value is NULL

+    Col 20: null_numeric_value is NULL

+    Col 21: null_char_value is NULL

+    Col 22: null_varchar_value is NULL

+    Col 23: null_text_value is NULL

+    Col 24: null_point_value is NULL

+    Col 25: null_time_value is NULL

+    Col 26: null_date_value is NULL

+    Col 27: null_timestamp_value is NULL

+   Row 1:

+    Col 0: boolean_value: True

+    Col 1: int2_value: -22

+    Col 2: int4_value: 1048000

+    Col 3: bigint_value: 123456789012345

+    Col 4: float_value: 3.141590

+    Col 5: double_value: 3.14159

+    Col 6: numeric_value: 123456789012.345

+    Col 7: char_value: This is a char

+    Col 8: varchar_value: This is a varchar

+    Col 9: text_value: This is a text

+    Col 10: point_value: (1,0)

+    Col 11: time_value: 01/01/1 21:13:14

+    Col 12: date_value: 02/29/2000 00:00:00

+    Col 13: timestamp_value: 02/29/2004 14:00:11

+    Col 14: null_boolean_value is NULL

+    Col 15: null_int2_value is NULL

+    Col 16: null_int4_value is NULL

+    Col 17: null_bigint_value is NULL

+    Col 18: null_float_value is NULL

+    Col 19: null_double_value is NULL

+    Col 20: null_numeric_value is NULL

+    Col 21: null_char_value is NULL

+    Col 22: null_varchar_value is NULL

+    Col 23: null_text_value is NULL

+    Col 24: null_point_value is NULL

+    Col 25: null_time_value is NULL

+    Col 26: null_date_value is NULL

+    Col 27: null_timestamp_value is NULL

+   Total Rows Retrieved: 2

+ Total Result sets: 1

+                Call ExecuteReader with a SQL Command. (Not INSERT,UPDATE,DELETE

+ ).

+ Result is from a SQL Command not (INSERT,UPDATE,DELETE).   Records Affected: -1

+ Total Result sets: 0

+                Call ExecuteReader with a SQL Command. (Is INSERT,UPDATE,DELETE)

+ .

+ Result is from a SQL Command (INSERT,UPDATE,DELETE).  Records Affected: 1

+ Total Result sets: 0

+                Calling stored procedure version()

+ Result: PostgreSQL 7.2.1 on i686-pc-cygwin, compiled by GCC 2.95.3-5

+ Database Server Version: PostgreSQL 7.2.1 on i686-pc-cygwin, compiled by GCC 2.9

+ 5.3-5

+ Clean up...

+                Drop table...

+ OK

+ RESULT: 0

+

+</pre>

+

diff --git a/doc/asp-net b/doc/asp-net
new file mode 100755
index 00000000000..5255e69f77d
--- /dev/null
+++ b/doc/asp-net
@@ -0,0 +1,130 @@
+* ASP.NET
+
+	ASP.NET support is divided in two pieces:
+	<ul>
+		* Web Forms (Web Applications infrastructure).
+
+		* Web Services (the SOAP-based rpc system).
+	</ul>
+
+	There is work underway for both systems.  The Web Forms
+	support is more advanced at this point, and various ".aspx"
+	programs can be run using the Mono runtime and the XSP page
+	parser.
+
+	Tim started work on the Web Services.  Although we have a
+	SoapFormatter as part of the remoting infrastructure already
+	(contributed by Jesus), most people will be using the ASP.NET
+	Web Services support.  Work for the supporting class libraries
+	just started recently.
+
+* Web Forms: The pieces
+
+	There are a couple of components to the puzzle:
+
+	<ul>
+		* .aspx page parser (converts .aspx to C# code).
+	
+		* System.Web.HttpRuntime support.
+	
+		* Web controls (System.Web.UI.HtmlControls and
+		  System.Web.UI.WebControls).
+	
+		* Underlying infrastructure for the controls (System.Web.UI).
+	
+		* HttpRuntime.ProcessRequest is the core of the ASP.NET
+		  implementation.
+	</ul>
+
+
+	Gonzalo has been working on an ASP.NET parser that takes .aspx
+	files and generated the code required to run them (the code lives in
+	module `xsp' along with a little web server for testing).
+
+	Most of the runtime support was written by Patrik Torstensson
+	(now at Intel).  This was interesting, because in order to implement
+	some of its features, Patrik had to go into the runtime/JIT engine and
+	he spent a few weeks doing work there.
+
+	The classes for running ASP.NET are being actively written.
+	Gaurav, Leen and Patrik worked in the core of the classes
+	required to run ASP.NET web application as well as a small
+	embeddable web server.
+
+	Duncan got our System.Web assembly to compile.
+
+** HttpRuntime
+
+	Patrik has authored most of the HttpRuntime support (both on
+	the System.Web and on the foundation).
+
+	He is now working on finishing HttpRuntime and a few needed
+	classes.
+
+** XSP
+
+	Currently XSP provides the .aspx compiler to C#.
+	There is also a small web server for testing in module xsp
+	along with a bunch of .aspx pages to test the server.
+
+	The C# code generator is being moved to System.Web.Compilation.
+
+	Gonzalo is in charge of the compiler.
+
+** Controls
+
+	A lot of work has been put in the various classes that
+	implement the controls (UI.HtmlControls and UI.WebControls),
+	but they have been coded mostly in the dark, and without being
+	able to test them in real life: Gaurav and Leen worked very
+	hard on this namespace.
+
+	We can now render all HtmlControls and almost all WebControls.
+	DataGrid and DataList controls are being finisehd by Gaurav.
+	Xml control needs some work on System.Xml related to XSL.
+
+** Extending ASP.NET
+
+	Currently you have to reference in your ASP.NET the control
+	and all of its properties, which works fine if you have a GUI
+	designer, but is harder for people used to develop using text
+	editors.
+
+	Since we have a parser, we could extend this parser to allow
+	people to still use ASP.NET controls, using a simpler syntax.
+	For example people doing blogs and editing their templates
+	over the web probably do not want to use direct ASP.NET but a
+	wrapper around it.
+
+** Roadmap
+
+        1. The Parser.
+
+        2. Get the parser to generate output compatible with ASP.NET.
+
+        3. Run the sample output with the real Microsoft runtime
+           but using our generated page.   
+
+        4. Run the sample with our classes with the .NET runtime.
+
+        5. Run the samples with our classes with the our runtime (without
+	using HttpRuntime).
+
+        6. Finish HttpRuntime.
+	<b>We are here</b>.
+	
+        7. Running our sample code with our classes with our runtime.
+
+** How to Help
+
+        Testing and fixing HtmlControls, WebControls and validators is an
+	easy way to help.
+
+        In the CVS module XSP you can find the aspx to C# page parser,
+        a little web server used for testing and a directory containing
+        sample aspx pages.
+
+        You have some documentation under doc directory and in the README
+        file of each directory. They explain how to test our System.Web.
+        Testing is really easy!
+
diff --git a/doc/books b/doc/books
new file mode 100644
index 00000000000..d5933e79836
--- /dev/null
+++ b/doc/books
@@ -0,0 +1,37 @@
+* C# Books
+
+   A Programmer's Introduction to C# - Second Edition: Eric Gunnerson
+
+* Remoting
+
+   <a href="http://www.dotnetremoting.cc/book/AdvancedDotNetRemoting.asp">
+   Advanced .NET Remoting: Ingo Rammer</a>
+
+* Compiler Implementation
+
+   Compilers - Principles, Techniques, and Tools: Alfred V. Aho, Ravi Sethi,
+   Jeffrey D. Ullman 
+
+   Advanced Compiler Design Implementation: Steven S. Muchnick
+
+   Modern Compiler Implementation in C: Andrew W. Appel
+
+   A Retargetable C Compiler - Design and Implementation: C. Fraser, David
+   Hanson
+
+* Reference Manuals
+
+   <a
+   href="http://developer.intel.com/design/pentium/manuals/24319101.pdf">Intel
+   Architecture Software Developer's Manual, Volume 2 - Instruction Set Reference Manual</a>
+
+   <a
+   href="http://www.caldera.com/developers/devspecs/abi386-4.pdf">System V ABI
+   - i386 Architecture Processor Supplement</a> 
+
+   <a
+   href="http://www.caldera.com/developers/devspecs/mipsabi.pdf">System V ABI -
+   MIPS Processor supplement</a>
+
+   <a href="http://www.sparc.org/standards/V8.pdf">The SPARC Architecture
+   Manual Version 8</a> 
\ No newline at end of file
diff --git a/doc/c-sharp b/doc/c-sharp
index 07c13831039..e81d99b73ba 100644
--- a/doc/c-sharp
+++ b/doc/c-sharp
@@ -2,14 +2,13 @@
 
 	MCS is currently able to compile itself and many more C#
 	programs (there is a test suite included that you can use).
+	It is routinely used to compile Mono, roughly half a million
+	lines of C# code.
 
 	We are in feature completion mode right now.  There are still
 	a couple of areas that are not covered by the Mono compiler, but
-	they are very very few at this point.
-
-	MCS was able to parse itself on April 2001, MCS compiled itself
-	for the first time on December 28 2001.  MCS became self hosting
-	on January 3rd, 2002. 
+	they are very very few at this point (security attributes),
+	you can also browse the MCS <a href="http://bugzilla.ximian.com/buglist.cgi?product=Mono%2FMCS&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&changedin=&chfieldfrom=&chfieldto=Now&chfieldvalue=&short_desc=&short_desc_type=substring&long_desc=&long_desc_type=substring&bug_file_loc=&bug_file_loc_type=substring&keywords=&keywords_type=anywords&op_sys_details=&op_sys_details_type=substring&version_details=&version_details_type=substring&cmdtype=doit&newqueryname=&order=Reuse+same+sort+as+last+time&form_name=query">bugs</a> from Bugzilla.
 
 	A test suite is maintained to track the progress of
 	the compiler and various programs are routinely compiled and
@@ -23,10 +22,9 @@
 
 ** Running MCS
 
-	MCS is written in C# and uses heavily the .NET APIs.  At this point
-	MCS only runs on Windows with the .NET Framework SDK installed.  Work
-	is progressing rapidly in our JIT engine and our class libraries to
-	allow MCS to be ran in non-Windows systems. 
+	MCS is written in C# and uses heavily the .NET APIs.  MCS runs
+	on Linux with the Mono runtime and on Windows with both the
+	.NET runtime and the Mono runtime.
 
 ** Reporting Bugs in MCS
 
@@ -101,33 +99,14 @@
 	able to use this generic CIL optimizer in their projects
 	reducing their time to develop a production compiler. 
 
-<a name="tasks">
-** Current pending tasks
-
-	Simple tasks:
-
-	<ul>
-		* Redo the way we deal with built-in operators.
-	</ul>
+** History
 
-	Larger tasks:
-	<ul>
-
-		* Jay does not work correctly with `error'
-		  productions, making parser errors hard to point.  It
-		  would be best to port the Bison-To-Java compiler to
-		  become Bison-to-C# compiler. 
-		  
-		  Nick Drochak has started a project on SourceForge for this.
-		  You can find the project at: <a href="http://sourceforge.net/projects/jb2csharp/">
-		  http://sourceforge.net/projects/jb2csharp/</a>
-
-		* Semantic Analysis: Return path coverage and
-		  initialization before use coverage are two great
-		  features of C# that help reduce the number of bugs
-		  in applications.  It is one interesting hack.
+	MCS was able to parse itself on April 2001, MCS compiled itself
+	for the first time on December 28 2001.  MCS became self hosting
+	on January 3rd, 2002. 
 
-	</ul>
+	The Mono Runtime and the Mono execution engine were able to make
+	our compiler self hosting on March 12, 2002.
 
 ** Questions and Answers
 
diff --git a/doc/class-status b/doc/class-status
deleted file mode 100644
index df633814269..00000000000
--- a/doc/class-status
+++ /dev/null
@@ -1,394 +0,0 @@
-* Status of the various pieces of the class library
-
-	You can browse the status of the class library and see who has
-	registered to work on what parts of the system.  These list
-	work-in-progress components currently.
-
-	Browse the current <a href="class-status/index.html">status</a>.
-
-	You can also download the XML <a
-	href="class-status/maintainers.xml">maintainers</a> file that
-	contains the actual maintainers list.  
-
-	You can also download the master <a
-	href="class-status/class.xml">Class Status XML</a> file.
-
-* List of not-implemented classes
-
-	These classes are only classes pending from the CORLIB assembly
-	other assemblies are not yet listed.  We are going to be working
-	on an improved status display for pending classes.
-
-	Please bear with us in the meantime.
-This is a list of pending classes, and links to their documentation on MSDN.Microsoft.com<p><p>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfMicrosoftWin32Registry
ClassTopic.asp">Microsoft.Win32.Registry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfMicrosoftWin32RegistryHive
ClassTopic.asp">Microsoft.Win32.RegistryHive
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfMicrosoftWin32RegistryKey
ClassTopic.asp">Microsoft.Win32.RegistryKey
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystem__ComObject
ClassTopic.asp">System.__ComObject
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemActivator
ClassTopic.asp">System.Activator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemArgIterator
ClassTopic.asp">System.ArgIterator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemAssemblyLoadEventHandler
ClassTopic.asp">System.AssemblyLoadEventHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemAsyncCallback
ClassTopic.asp">System.AsyncCallback
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemCrossAppDomainDelegate
ClassTopic.asp">System.CrossAppDomainDelegate
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemEventHandler
ClassTopic.asp">System.EventHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationCompareInfo
ClassTopic.asp">System.Globalization.CompareInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationHebrewCalendar
ClassTopic.asp">System.Globalization.HebrewCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationHijriCalendar
ClassTopic.asp">System.Globalization.HijriCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationJapaneseCalendar
ClassTopic.asp">System.Globalization.JapaneseCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationKoreanCalendar
ClassTopic.asp">System.Globalization.KoreanCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationSortKey
ClassTopic.asp">System.Globalization.SortKey
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationStringInfo
ClassTopic.asp">System.Globalization.StringInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationTaiwanCalendar
ClassTopic.asp">System.Globalization.TaiwanCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationTextElementEnumerator
ClassTopic.asp">System.Globalization.TextElementEnumerator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationTextInfo
ClassTopic.asp">System.Globalization.TextInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationThaiBuddhistCalendar
ClassTopic.asp">System.Globalization.ThaiBuddhistCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemIOEndOfStreamException
ClassTopic.asp">System.IO.EndOfStreamException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemIOIsolatedStorageIsolatedStorageFile
ClassTopic.asp">System.IO.IsolatedStorage.IsolatedStorageFile
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemIOPathTooLongException
ClassTopic.asp">System.IO.PathTooLongException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionEmitMethodRental
ClassTopic.asp">System.Reflection.Emit.MethodRental
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionMemberFilter
ClassTopic.asp">System.Reflection.MemberFilter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionModuleResolveEventHandler
ClassTopic.asp">System.Reflection.ModuleResolveEventHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionPointer
ClassTopic.asp">System.Reflection.Pointer
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionStrongNameKeyPair
ClassTopic.asp">System.Reflection.StrongNameKeyPair
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionTypeFilter
ClassTopic.asp">System.Reflection.TypeFilter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemResolveEventHandler
ClassTopic.asp">System.ResolveEventHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesAccessedThroughPropertyAttribute
ClassTopic.asp">System.Runtime.CompilerServices.AccessedThroughPropertyAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCallConvCdecl
ClassTopic.asp">System.Runtime.CompilerServices.CallConvCdecl
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCallConvFastcall
ClassTopic.asp">System.Runtime.CompilerServices.CallConvFastcall
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCallConvStdcall
ClassTopic.asp">System.Runtime.CompilerServices.CallConvStdcall
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCallConvThiscall
ClassTopic.asp">System.Runtime.CompilerServices.CallConvThiscall
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCompilationRelaxationsAttribute
ClassTopic.asp">System.Runtime.CompilerServices.CompilationRelaxationsAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCompilerGlobalScopeAttribute
ClassTopic.asp">System.Runtime.CompilerServices.CompilerGlobalScopeAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCustomConstantAttribute
ClassTopic.asp">System.Runtime.CompilerServices.CustomConstantAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesDateTimeConstantAttribute
ClassTopic.asp">System.Runtime.CompilerServices.DateTimeConstantAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesDecimalConstantAttribute
ClassTopic.asp">System.Runtime.CompilerServices.DecimalConstantAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesDiscardableAttribute
ClassTopic.asp">System.Runtime.CompilerServices.DiscardableAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesIDispatchConstantAttribute
ClassTopic.asp">System.Runtime.CompilerServices.IDispatchConstantAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesIsVolatile
ClassTopic.asp">System.Runtime.CompilerServices.IsVolatile
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesIUnknownConstantAttribute
ClassTopic.asp">System.Runtime.CompilerServices.IUnknownConstantAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesRequiredAttributeAttribute
ClassTopic.asp">System.Runtime.CompilerServices.RequiredAttributeAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesArrayWithOffset
ClassTopic.asp">System.Runtime.InteropServices.ArrayWithOffset
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesAssemblyRegistrationFlags
ClassTopic.asp">System.Runtime.InteropServices.AssemblyRegistrationFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesAutomationProxyAttribute
ClassTopic.asp">System.Runtime.InteropServices.AutomationProxyAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesBIND_OPTS
ClassTopic.asp">System.Runtime.InteropServices.BIND_OPTS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesBINDPTR
ClassTopic.asp">System.Runtime.InteropServices.BINDPTR
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesCALLCONV
ClassTopic.asp">System.Runtime.InteropServices.CALLCONV
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesClassInterfaceAttribute
ClassTopic.asp">System.Runtime.InteropServices.ClassInterfaceAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesClassInterfaceType
ClassTopic.asp">System.Runtime.InteropServices.ClassInterfaceType
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesCoClassAttribute
ClassTopic.asp">System.Runtime.InteropServices.CoClassAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComAliasNameAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComAliasNameAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComConversionLossAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComConversionLossAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComEventInterfaceAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComEventInterfaceAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesCOMException
ClassTopic.asp">System.Runtime.InteropServices.COMException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComImportAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComImportAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComInterfaceType
ClassTopic.asp">System.Runtime.InteropServices.ComInterfaceType
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComMemberType
ClassTopic.asp">System.Runtime.InteropServices.ComMemberType
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComRegisterFunctionAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComRegisterFunctionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComSourceInterfacesAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComSourceInterfacesAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComUnregisterFunctionAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComUnregisterFunctionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComVisibleAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComVisibleAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesCONNECTDATA
ClassTopic.asp">System.Runtime.InteropServices.CONNECTDATA
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesCurrencyWrapper
ClassTopic.asp">System.Runtime.InteropServices.CurrencyWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesDESCKIND
ClassTopic.asp">System.Runtime.InteropServices.DESCKIND
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesDispatchWrapper
ClassTopic.asp">System.Runtime.InteropServices.DispatchWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesDispIdAttribute
ClassTopic.asp">System.Runtime.InteropServices.DispIdAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesDISPPARAMS
ClassTopic.asp">System.Runtime.InteropServices.DISPPARAMS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesELEMDESC
ClassTopic.asp">System.Runtime.InteropServices.ELEMDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesErrorWrapper
ClassTopic.asp">System.Runtime.InteropServices.ErrorWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesEXCEPINFO
ClassTopic.asp">System.Runtime.InteropServices.EXCEPINFO
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesExpandoIExpando
ClassTopic.asp">System.Runtime.InteropServices.Expando.IExpando
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesExporterEventKind
ClassTopic.asp">System.Runtime.InteropServices.ExporterEventKind
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesExtensibleClassFactory
ClassTopic.asp">System.Runtime.InteropServices.ExtensibleClassFactory
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesFILETIME
ClassTopic.asp">System.Runtime.InteropServices.FILETIME
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesFUNCDESC
ClassTopic.asp">System.Runtime.InteropServices.FUNCDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesFUNCFLAGS
ClassTopic.asp">System.Runtime.InteropServices.FUNCFLAGS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesFUNCKIND
ClassTopic.asp">System.Runtime.InteropServices.FUNCKIND
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesGCHandle
ClassTopic.asp">System.Runtime.InteropServices.GCHandle
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesGuidAttribute
ClassTopic.asp">System.Runtime.InteropServices.GuidAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesHandleRef
ClassTopic.asp">System.Runtime.InteropServices.HandleRef
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesICustomAdapter
ClassTopic.asp">System.Runtime.InteropServices.ICustomAdapter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesICustomFactory
ClassTopic.asp">System.Runtime.InteropServices.ICustomFactory
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesICustomMarshaler
ClassTopic.asp">System.Runtime.InteropServices.ICustomMarshaler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIDispatchImplAttribute
ClassTopic.asp">System.Runtime.InteropServices.IDispatchImplAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIDispatchImplType
ClassTopic.asp">System.Runtime.InteropServices.IDispatchImplType
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIDLDESC
ClassTopic.asp">System.Runtime.InteropServices.IDLDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIDLFLAG
ClassTopic.asp">System.Runtime.InteropServices.IDLFLAG
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIMPLTYPEFLAGS
ClassTopic.asp">System.Runtime.InteropServices.IMPLTYPEFLAGS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesImportedFromTypeLibAttribute
ClassTopic.asp">System.Runtime.InteropServices.ImportedFromTypeLibAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesImporterEventKind
ClassTopic.asp">System.Runtime.InteropServices.ImporterEventKind
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesInterfaceTypeAttribute
ClassTopic.asp">System.Runtime.InteropServices.InterfaceTypeAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesInvalidComObjectException
ClassTopic.asp">System.Runtime.InteropServices.InvalidComObjectException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesInvalidOleVariantTypeException
ClassTopic.asp">System.Runtime.InteropServices.InvalidOleVariantTypeException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesINVOKEKIND
ClassTopic.asp">System.Runtime.InteropServices.INVOKEKIND
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIRegistrationServices
ClassTopic.asp">System.Runtime.InteropServices.IRegistrationServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesITypeLibConverter
ClassTopic.asp">System.Runtime.InteropServices.ITypeLibConverter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesITypeLibExporterNameProvider
ClassTopic.asp">System.Runtime.InteropServices.ITypeLibExporterNameProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesITypeLibExporterNotifySink
ClassTopic.asp">System.Runtime.InteropServices.ITypeLibExporterNotifySink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesITypeLibImporterNotifySink
ClassTopic.asp">System.Runtime.InteropServices.ITypeLibImporterNotifySink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesLCIDConversionAttribute
ClassTopic.asp">System.Runtime.InteropServices.LCIDConversionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesLIBFLAGS
ClassTopic.asp">System.Runtime.InteropServices.LIBFLAGS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesMarshalDirectiveException
ClassTopic.asp">System.Runtime.InteropServices.MarshalDirectiveException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesObjectCreationDelegate
ClassTopic.asp">System.Runtime.InteropServices.ObjectCreationDelegate
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesPARAMDESC
ClassTopic.asp">System.Runtime.InteropServices.PARAMDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesPARAMFLAG
ClassTopic.asp">System.Runtime.InteropServices.PARAMFLAG
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesPreserveSigAttribute
ClassTopic.asp">System.Runtime.InteropServices.PreserveSigAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesPrimaryInteropAssemblyAttribute
ClassTopic.asp">System.Runtime.InteropServices.PrimaryInteropAssemblyAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesProgIdAttribute
ClassTopic.asp">System.Runtime.InteropServices.ProgIdAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesRegistrationServices
ClassTopic.asp">System.Runtime.InteropServices.RegistrationServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesRuntimeEnvironment
ClassTopic.asp">System.Runtime.InteropServices.RuntimeEnvironment
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesSafeArrayRankMismatchException
ClassTopic.asp">System.Runtime.InteropServices.SafeArrayRankMismatchException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesSafeArrayTypeMismatchException
ClassTopic.asp">System.Runtime.InteropServices.SafeArrayTypeMismatchException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesSEHException
ClassTopic.asp">System.Runtime.InteropServices.SEHException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesSTATSTG
ClassTopic.asp">System.Runtime.InteropServices.STATSTG
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesSYSKIND
ClassTopic.asp">System.Runtime.InteropServices.SYSKIND
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTYPEATTR
ClassTopic.asp">System.Runtime.InteropServices.TYPEATTR
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTYPEDESC
ClassTopic.asp">System.Runtime.InteropServices.TYPEDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTYPEFLAGS
ClassTopic.asp">System.Runtime.InteropServices.TYPEFLAGS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTYPEKIND
ClassTopic.asp">System.Runtime.InteropServices.TYPEKIND
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTYPELIBATTR
ClassTopic.asp">System.Runtime.InteropServices.TYPELIBATTR
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibConverter
ClassTopic.asp">System.Runtime.InteropServices.TypeLibConverter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibExporterFlags
ClassTopic.asp">System.Runtime.InteropServices.TypeLibExporterFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibFuncAttribute
ClassTopic.asp">System.Runtime.InteropServices.TypeLibFuncAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibFuncFlags
ClassTopic.asp">System.Runtime.InteropServices.TypeLibFuncFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibImporterFlags
ClassTopic.asp">System.Runtime.InteropServices.TypeLibImporterFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibTypeAttribute
ClassTopic.asp">System.Runtime.InteropServices.TypeLibTypeAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibTypeFlags
ClassTopic.asp">System.Runtime.InteropServices.TypeLibTypeFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibVarAttribute
ClassTopic.asp">System.Runtime.InteropServices.TypeLibVarAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibVarFlags
ClassTopic.asp">System.Runtime.InteropServices.TypeLibVarFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIBindCtx
ClassTopic.asp">System.Runtime.InteropServices.UCOMIBindCtx
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIConnectionPoint
ClassTopic.asp">System.Runtime.InteropServices.UCOMIConnectionPoint
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIConnectionPointContainer
ClassTopic.asp">System.Runtime.InteropServices.UCOMIConnectionPointContainer
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIEnumConnectionPoints
ClassTopic.asp">System.Runtime.InteropServices.UCOMIEnumConnectionPoints
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIEnumConnections
ClassTopic.asp">System.Runtime.InteropServices.UCOMIEnumConnections
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIEnumMoniker
ClassTopic.asp">System.Runtime.InteropServices.UCOMIEnumMoniker
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIEnumString
ClassTopic.asp">System.Runtime.InteropServices.UCOMIEnumString
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIEnumVARIANT
ClassTopic.asp">System.Runtime.InteropServices.UCOMIEnumVARIANT
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIMoniker
ClassTopic.asp">System.Runtime.InteropServices.UCOMIMoniker
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIPersistFile
ClassTopic.asp">System.Runtime.InteropServices.UCOMIPersistFile
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIRunningObjectTable
ClassTopic.asp">System.Runtime.InteropServices.UCOMIRunningObjectTable
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIStream
ClassTopic.asp">System.Runtime.InteropServices.UCOMIStream
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMITypeComp
ClassTopic.asp">System.Runtime.InteropServices.UCOMITypeComp
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMITypeInfo
ClassTopic.asp">System.Runtime.InteropServices.UCOMITypeInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMITypeLib
ClassTopic.asp">System.Runtime.InteropServices.UCOMITypeLib
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUnknownWrapper
ClassTopic.asp">System.Runtime.InteropServices.UnknownWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesVARDESC
ClassTopic.asp">System.Runtime.InteropServices.VARDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesVARFLAGS
ClassTopic.asp">System.Runtime.InteropServices.VARFLAGS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingActivatedClientTypeEntry
ClassTopic.asp">System.Runtime.Remoting.ActivatedClientTypeEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingActivatedServiceTypeEntry
ClassTopic.asp">System.Runtime.Remoting.ActivatedServiceTypeEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingActivationUrlAttribute
ClassTopic.asp">System.Runtime.Remoting.Activation.UrlAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsBaseChannelObjectWithProperties
ClassTopic.asp">System.Runtime.Remoting.Channels.BaseChannelObjectWithProperties
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsBaseChannelSinkWithProperties
ClassTopic.asp">System.Runtime.Remoting.Channels.BaseChannelSinkWithProperties
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsBaseChannelWithProperties
ClassTopic.asp">System.Runtime.Remoting.Channels.BaseChannelWithProperties
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsChannelDataStore
ClassTopic.asp">System.Runtime.Remoting.Channels.ChannelDataStore
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsChannelServices
ClassTopic.asp">System.Runtime.Remoting.Channels.ChannelServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsClientChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.ClientChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannel
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannel
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannelDataStore
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannelDataStore
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannelReceiver
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannelReceiver
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannelReceiverHook
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannelReceiverHook
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannelSender
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannelSender
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannelSinkBase
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannelSinkBase
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientChannelSink
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientChannelSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientChannelSinkProvider
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientChannelSinkProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientFormatterSink
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientFormatterSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientFormatterSinkProvider
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientFormatterSinkProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientResponseChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientResponseChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIServerChannelSink
ClassTopic.asp">System.Runtime.Remoting.Channels.IServerChannelSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIServerChannelSinkProvider
ClassTopic.asp">System.Runtime.Remoting.Channels.IServerChannelSinkProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIServerChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.IServerChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIServerFormatterSinkProvider
ClassTopic.asp">System.Runtime.Remoting.Channels.IServerFormatterSinkProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIServerResponseChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.IServerResponseChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsITransportHeaders
ClassTopic.asp">System.Runtime.Remoting.Channels.ITransportHeaders
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsServerChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.ServerChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsServerProcessing
ClassTopic.asp">System.Runtime.Remoting.Channels.ServerProcessing
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsSinkProviderData
ClassTopic.asp">System.Runtime.Remoting.Channels.SinkProviderData
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsTransportHeaders
ClassTopic.asp">System.Runtime.Remoting.Channels.TransportHeaders
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsContextProperty
ClassTopic.asp">System.Runtime.Remoting.Contexts.ContextProperty
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsCrossContextDelegate
ClassTopic.asp">System.Runtime.Remoting.Contexts.CrossContextDelegate
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContextPropertyActivator
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContextPropertyActivator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContributeClientContextSink
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContributeClientContextSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContributeDynamicSink
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContributeDynamicSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContributeEnvoySink
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContributeEnvoySink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContributeObjectSink
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContributeObjectSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContributeServerContextSink
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContributeServerContextSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingIChannelInfo
ClassTopic.asp">System.Runtime.Remoting.IChannelInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingIEnvoyInfo
ClassTopic.asp">System.Runtime.Remoting.IEnvoyInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingInternalRemotingServices
ClassTopic.asp">System.Runtime.Remoting.InternalRemotingServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingIObjectHandle
ClassTopic.asp">System.Runtime.Remoting.IObjectHandle
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingIRemotingTypeInfo
ClassTopic.asp">System.Runtime.Remoting.IRemotingTypeInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingLifetimeClientSponsor
ClassTopic.asp">System.Runtime.Remoting.Lifetime.ClientSponsor
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingLifetimeILease
ClassTopic.asp">System.Runtime.Remoting.Lifetime.ILease
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingLifetimeISponsor
ClassTopic.asp">System.Runtime.Remoting.Lifetime.ISponsor
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingLifetimeLeaseState
ClassTopic.asp">System.Runtime.Remoting.Lifetime.LeaseState
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingLifetimeLifetimeServices
ClassTopic.asp">System.Runtime.Remoting.Lifetime.LifetimeServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingAsyncResult
ClassTopic.asp">System.Runtime.Remoting.Messaging.AsyncResult
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingCallContext
ClassTopic.asp">System.Runtime.Remoting.Messaging.CallContext
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingConstructionCall
ClassTopic.asp">System.Runtime.Remoting.Messaging.ConstructionCall
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingConstructionResponse
ClassTopic.asp">System.Runtime.Remoting.Messaging.ConstructionResponse
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingHeader
ClassTopic.asp">System.Runtime.Remoting.Messaging.Header
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingHeaderHandler
ClassTopic.asp">System.Runtime.Remoting.Messaging.HeaderHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingILogicalThreadAffinative
ClassTopic.asp">System.Runtime.Remoting.Messaging.ILogicalThreadAffinative
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingIMessageCtrl
ClassTopic.asp">System.Runtime.Remoting.Messaging.IMessageCtrl
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingIMessageSink
ClassTopic.asp">System.Runtime.Remoting.Messaging.IMessageSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingIMethodCallMessage
ClassTopic.asp">System.Runtime.Remoting.Messaging.IMethodCallMessage
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingInternalMessageWrapper
ClassTopic.asp">System.Runtime.Remoting.Messaging.InternalMessageWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingIRemotingFormatter
ClassTopic.asp">System.Runtime.Remoting.Messaging.IRemotingFormatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingLogicalCallContext
ClassTopic.asp">System.Runtime.Remoting.Messaging.LogicalCallContext
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingMessageSurrogateFilter
ClassTopic.asp">System.Runtime.Remoting.Messaging.MessageSurrogateFilter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingMethodCall
ClassTopic.asp">System.Runtime.Remoting.Messaging.MethodCall
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingMethodCallMessageWrapper
ClassTopic.asp">System.Runtime.Remoting.Messaging.MethodCallMessageWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingMethodResponse
ClassTopic.asp">System.Runtime.Remoting.Messaging.MethodResponse
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingMethodReturnMessageWrapper
ClassTopic.asp">System.Runtime.Remoting.Messaging.MethodReturnMessageWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingOneWayAttribute
ClassTopic.asp">System.Runtime.Remoting.Messaging.OneWayAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingRemotingSurrogateSelector
ClassTopic.asp">System.Runtime.Remoting.Messaging.RemotingSurrogateSelector
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingReturnMessage
ClassTopic.asp">System.Runtime.Remoting.Messaging.ReturnMessage
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapAttribute
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapFieldAttribute
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapFieldAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapMethodAttribute
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapMethodAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapOption
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapOption
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapParameterAttribute
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapParameterAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapTypeAttribute
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapTypeAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001ISoapXsd
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.ISoapXsd
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapAnyUri
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapAnyUri
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapBase64Binary
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapBase64Binary
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapDate
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapDate
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapDateTime
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapDateTime
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapDay
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapDay
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapDuration
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapDuration
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapEntities
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapEntities
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapEntity
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapEntity
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapHexBinary
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapHexBinary
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapId
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapId
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapIdref
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapIdref
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapIdrefs
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapIdrefs
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapInteger
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapInteger
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapLanguage
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapLanguage
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapMonth
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapMonth
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapMonthDay
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapMonthDay
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapName
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapName
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNcName
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNcName
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNegativeInteger
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNegativeInteger
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNmtoken
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNmtoken
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNmtokens
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNmtokens
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNonNegativeInteger
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNonNegativeInteger
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNonPositiveInteger
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNonPositiveInteger
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNormalizedString
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNormalizedString
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNotation
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNotation
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapPositiveInteger
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapPositiveInteger
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapQName
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapQName
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapTime
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapTime
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapToken
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapToken
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapYear
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapYear
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapYearMonth
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapYearMonth
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataXmlFieldOrderOption
ClassTopic.asp">System.Runtime.Remoting.Metadata.XmlFieldOrderOption
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingProxiesProxyAttribute
ClassTopic.asp">System.Runtime.Remoting.Proxies.ProxyAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingProxiesRealProxy
ClassTopic.asp">System.Runtime.Remoting.Proxies.RealProxy
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingRemotingConfiguration
ClassTopic.asp">System.Runtime.Remoting.RemotingConfiguration
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingRemotingException
ClassTopic.asp">System.Runtime.Remoting.RemotingException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingRemotingServices
ClassTopic.asp">System.Runtime.Remoting.RemotingServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingRemotingTimeoutException
ClassTopic.asp">System.Runtime.Remoting.RemotingTimeoutException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingServerException
ClassTopic.asp">System.Runtime.Remoting.ServerException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingServicesEnterpriseServicesHelper
ClassTopic.asp">System.Runtime.Remoting.Services.EnterpriseServicesHelper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingServicesITrackingHandler
ClassTopic.asp">System.Runtime.Remoting.Services.ITrackingHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingServicesTrackingServices
ClassTopic.asp">System.Runtime.Remoting.Services.TrackingServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingSoapServices
ClassTopic.asp">System.Runtime.Remoting.SoapServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingTypeEntry
ClassTopic.asp">System.Runtime.Remoting.TypeEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingWellKnownClientTypeEntry
ClassTopic.asp">System.Runtime.Remoting.WellKnownClientTypeEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingWellKnownServiceTypeEntry
ClassTopic.asp">System.Runtime.Remoting.WellKnownServiceTypeEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormatter
ClassTopic.asp">System.Runtime.Serialization.Formatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormatterConverter
ClassTopic.asp">System.Runtime.Serialization.FormatterConverter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersBinaryBinaryFormatter
ClassTopic.asp">System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersInternalRM
ClassTopic.asp">System.Runtime.Serialization.Formatters.InternalRM
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersInternalST
ClassTopic.asp">System.Runtime.Serialization.Formatters.InternalST
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersServerFault
ClassTopic.asp">System.Runtime.Serialization.Formatters.ServerFault
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersSoapFault
ClassTopic.asp">System.Runtime.Serialization.Formatters.SoapFault
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersSoapMessage
ClassTopic.asp">System.Runtime.Serialization.Formatters.SoapMessage
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormatterServices
ClassTopic.asp">System.Runtime.Serialization.FormatterServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationObjectIDGenerator
ClassTopic.asp">System.Runtime.Serialization.ObjectIDGenerator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationObjectManager
ClassTopic.asp">System.Runtime.Serialization.ObjectManager
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationSerializationBinder
ClassTopic.asp">System.Runtime.Serialization.SerializationBinder
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationSerializationEntry
ClassTopic.asp">System.Runtime.Serialization.SerializationEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationSerializationInfoEnumerator
ClassTopic.asp">System.Runtime.Serialization.SerializationInfoEnumerator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationSurrogateSelector
ClassTopic.asp">System.Runtime.Serialization.SurrogateSelector
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityAllowPartiallyTrustedCallersAttribute
ClassTopic.asp">System.Security.AllowPartiallyTrustedCallersAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyCryptoConfig
ClassTopic.asp">System.Security.Cryptography.CryptoConfig
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyDSACryptoServiceProvider
ClassTopic.asp">System.Security.Cryptography.DSACryptoServiceProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyHMACSHA1
ClassTopic.asp">System.Security.Cryptography.HMACSHA1
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyKeyedHashAlgorithm
ClassTopic.asp">System.Security.Cryptography.KeyedHashAlgorithm
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyMACTripleDES
ClassTopic.asp">System.Security.Cryptography.MACTripleDES
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyMaskGenerationMethod
ClassTopic.asp">System.Security.Cryptography.MaskGenerationMethod
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyPasswordDeriveBytes
ClassTopic.asp">System.Security.Cryptography.PasswordDeriveBytes
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyPKCS1MaskGenerationMethod
ClassTopic.asp">System.Security.Cryptography.PKCS1MaskGenerationMethod
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRC2
ClassTopic.asp">System.Security.Cryptography.RC2
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRC2CryptoServiceProvider
ClassTopic.asp">System.Security.Cryptography.RC2CryptoServiceProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRijndael
ClassTopic.asp">System.Security.Cryptography.Rijndael
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRijndaelManaged
ClassTopic.asp">System.Security.Cryptography.RijndaelManaged
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRNGCryptoServiceProvider
ClassTopic.asp">System.Security.Cryptography.RNGCryptoServiceProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSA
ClassTopic.asp">System.Security.Cryptography.RSA
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSACryptoServiceProvider
ClassTopic.asp">System.Security.Cryptography.RSACryptoServiceProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAOAEPKeyExchangeDeformatter
ClassTopic.asp">System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAOAEPKeyExchangeFormatter
ClassTopic.asp">System.Security.Cryptography.RSAOAEPKeyExchangeFormatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAParameters
ClassTopic.asp">System.Security.Cryptography.RSAParameters
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAPKCS1KeyExchangeDeformatter
ClassTopic.asp">System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAPKCS1KeyExchangeFormatter
ClassTopic.asp">System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAPKCS1SignatureDeformatter
ClassTopic.asp">System.Security.Cryptography.RSAPKCS1SignatureDeformatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAPKCS1SignatureFormatter
ClassTopic.asp">System.Security.Cryptography.RSAPKCS1SignatureFormatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographySHA1Managed
ClassTopic.asp">System.Security.Cryptography.SHA1Managed
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographySHA384Managed
ClassTopic.asp">System.Security.Cryptography.SHA384Managed
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographySHA512Managed
ClassTopic.asp">System.Security.Cryptography.SHA512Managed
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyTripleDES
ClassTopic.asp">System.Security.Cryptography.TripleDES
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyTripleDESCryptoServiceProvider
ClassTopic.asp">System.Security.Cryptography.TripleDESCryptoServiceProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityNamedPermissionSet
ClassTopic.asp">System.Security.NamedPermissionSet
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsEnvironmentPermission
ClassTopic.asp">System.Security.Permissions.EnvironmentPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsFileDialogPermission
ClassTopic.asp">System.Security.Permissions.FileDialogPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsFileDialogPermissionAccess
ClassTopic.asp">System.Security.Permissions.FileDialogPermissionAccess
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsIsolatedStorageFilePermission
ClassTopic.asp">System.Security.Permissions.IsolatedStorageFilePermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsIsolatedStoragePermissionAttribute
ClassTopic.asp">System.Security.Permissions.IsolatedStoragePermissionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsPrincipalPermission
ClassTopic.asp">System.Security.Permissions.PrincipalPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsPrincipalPermissionAttribute
ClassTopic.asp">System.Security.Permissions.PrincipalPermissionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsPublisherIdentityPermission
ClassTopic.asp">System.Security.Permissions.PublisherIdentityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsPublisherIdentityPermissionAttribute
ClassTopic.asp">System.Security.Permissions.PublisherIdentityPermissionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsReflectionPermission
ClassTopic.asp">System.Security.Permissions.ReflectionPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsRegistryPermission
ClassTopic.asp">System.Security.Permissions.RegistryPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsSecurityPermission
ClassTopic.asp">System.Security.Permissions.SecurityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsSecurityPermissionAttribute
ClassTopic.asp">System.Security.Permissions.SecurityPermissionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsSiteIdentityPermission
ClassTopic.asp">System.Security.Permissions.SiteIdentityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsStrongNameIdentityPermission
ClassTopic.asp">System.Security.Permissions.StrongNameIdentityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsStrongNamePublicKeyBlob
ClassTopic.asp">System.Security.Permissions.StrongNamePublicKeyBlob
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsUIPermission
ClassTopic.asp">System.Security.Permissions.UIPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsUrlIdentityPermission
ClassTopic.asp">System.Security.Permissions.UrlIdentityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsZoneIdentityPermission
ClassTopic.asp">System.Security.Permissions.ZoneIdentityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyAllMembershipCondition
ClassTopic.asp">System.Security.Policy.AllMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyApplicationDirectory
ClassTopic.asp">System.Security.Policy.ApplicationDirectory
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyApplicationDirectoryMembershipCondition
ClassTopic.asp">System.Security.Policy.ApplicationDirectoryMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyFirstMatchCodeGroup
ClassTopic.asp">System.Security.Policy.FirstMatchCodeGroup
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyHash
ClassTopic.asp">System.Security.Policy.Hash
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyHashMembershipCondition
ClassTopic.asp">System.Security.Policy.HashMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyNetCodeGroup
ClassTopic.asp">System.Security.Policy.NetCodeGroup
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyPermissionRequestEvidence
ClassTopic.asp">System.Security.Policy.PermissionRequestEvidence
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyPolicyStatement
ClassTopic.asp">System.Security.Policy.PolicyStatement
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyPublisher
ClassTopic.asp">System.Security.Policy.Publisher
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyPublisherMembershipCondition
ClassTopic.asp">System.Security.Policy.PublisherMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicySite
ClassTopic.asp">System.Security.Policy.Site
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicySiteMembershipCondition
ClassTopic.asp">System.Security.Policy.SiteMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyStrongName
ClassTopic.asp">System.Security.Policy.StrongName
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyStrongNameMembershipCondition
ClassTopic.asp">System.Security.Policy.StrongNameMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyUnionCodeGroup
ClassTopic.asp">System.Security.Policy.UnionCodeGroup
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyUrl
ClassTopic.asp">System.Security.Policy.Url
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyUrlMembershipCondition
ClassTopic.asp">System.Security.Policy.UrlMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyZone
ClassTopic.asp">System.Security.Policy.Zone
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyZoneMembershipCondition
ClassTopic.asp">System.Security.Policy.ZoneMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPrincipalWindowsIdentity
ClassTopic.asp">System.Security.Principal.WindowsIdentity
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPrincipalWindowsImpersonationContext
ClassTopic.asp">System.Security.Principal.WindowsImpersonationContext
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPrincipalWindowsPrincipal
ClassTopic.asp">System.Security.Principal.WindowsPrincipal
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingCompressedStack
ClassTopic.asp">System.Threading.CompressedStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingIOCompletionCallback
ClassTopic.asp">System.Threading.IOCompletionCallback
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingThreadStart
ClassTopic.asp">System.Threading.ThreadStart
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingTimerCallback
ClassTopic.asp">System.Threading.TimerCallback
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingWaitCallback
ClassTopic.asp">System.Threading.WaitCallback
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingWaitOrTimerCallback
ClassTopic.asp">System.Threading.WaitOrTimerCallback
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemTimeZone
ClassTopic.asp">System.TimeZone
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemTypedReference
ClassTopic.asp">System.TypedReference
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemUnhandledExceptionEventHandler
ClassTopic.asp">System.UnhandledExceptionEventHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemWeakReference
ClassTopic.asp">System.WeakReference
</a><br>
diff --git a/doc/class-status.in b/doc/class-status.in
index 0ecc7f5e637..a66aa18092e 100644
--- a/doc/class-status.in
+++ b/doc/class-status.in
@@ -15,8 +15,12 @@
 
 * List of not-implemented classes
 
-	These classes are only classes pending from the CORLIB assembly
-	other assemblies are not yet listed.  We are going to be working
-	on an improved status display for pending classes.
+	Pick from the list of assemblies in the menu on the left to
+	view the current status of that assembly.
 
-	Please bear with us in the meantime.
+	The tree shows items that are either missing or that have TODO
+	attributes associated with them.
+	You can use the checkboxes to show only missing or only TODO items.
+
+	Clicking on a name will take you to the <a href="http://msdn.microsoft.com/">MSDN documentation</a> for that item.
+	CTRL-Clicking will take you to the <a href="http://cvs.hispalinux.es/cgi-bin/cvsweb/?cvsroot=Mono">mono CVS tree</a>.
diff --git a/doc/classlib-doc b/doc/classlib-doc
index 14fdc9e7191..89849cb6172 100644
--- a/doc/classlib-doc
+++ b/doc/classlib-doc
@@ -2,11 +2,6 @@
 
 ** Summary
 
-	<em>
-	[This documentation is in progress.  Comments to
-	<a href="mailto:jbarn@httcb.net">jbarn@httcb.net</a>.]
-	</em>
-	
 	While using inline XML tags to document classes is certainly
 	convenient, properly verbose documentation quickly overwhelms
 	the code, making the source quite difficult to read.  Furthermore,
diff --git a/doc/contributing b/doc/contributing
index e006f072b79..bf6086f0474 100644
--- a/doc/contributing
+++ b/doc/contributing
@@ -18,8 +18,32 @@
 	something that would help tremendously would be to help with
 	small duties in the project that need to be addressed. 
 
+	You can see what needs to be done in the class libraries <a href="class-status.html">here</a>
+
+* IRC Channel
+
+	Many developers get together on the <b>#mono</b> irc channel
+	on the <b>irc.gnome.org</b> server.  
+
 ** To start contributing
 
+	As a programmer, you can contribute in three different scenarios to Mono:
+
+	<ul>
+		* If you only have Linux/Unix.
+		* If you only have Windows.
+
+		* If you have both Linux and Windows.
+	</ul>
+
+	You might also want to check our <a href="#setup">common
+	setups</a> section that describes some common setups that people
+	use while working on Mono.
+
+*** Contributing to the class library, regression tests or the compiler
+
+	This only requires Windows currently.
+
 	To start developing classes or to contribute to the compiler,
 	you only need Windows and the .NET Framework 1.0 SDK.  Please notice
 	that you do not need Visual Studio (although you can use it if
@@ -42,7 +66,23 @@
 	world that only has a test suite.  
 	
 	To get started writing tests see the <a href="testing.html">Test Suite</a>
-	section.
+	section. <a href="mono-contribution-howto.html">Here</a> there is a good All-In-One introduction to the art of writing tests.
+
+
+*** Contributing to the runtime engine
+
+	This only requires Linux, currently some tasks are easier if you
+	have access to Windows as well.
+
+	Here are a few things you can do:
+	<ul>
+		* Port the runtime to other architectures.
+		* Port the runtime to other operating systems.
+		* Finish the IL code verifier in the runtime.
+		* Hack the JIT, improve the code generator, add new
+		  pattern rules, improve the register allocator.
+		* Implement the debugging interfaaces
+	</ul>
 
 ** Bug reporting
 
@@ -90,7 +130,52 @@
 	  http://www.oreally.com/catalog/dotnetfrmess</a>)
 	</ul>
 
-* Special note
+<a name="setup">
+* Common Setups
+
+	People running both Linux and Windows while contributing to
+	Mono use a number of tricks to increase their productivity.
+
+	Scenarios:
+
+	<ul>
+		* <b>Linux host and Windows host</b>
+
+		  The Windows file system is shared (right click on
+		  your hard drive icon, and select sharing, allow this
+		  to be shared).  
+
+		  The Windows machine has the required build tools
+		  (cygwin, and the .NET framework).  On the Windows
+		  machine, you want to setup the ssh server (run the
+		  ssh-host-config program to configure your ssh) and
+		  run it (from a cygwin terminal, type: /usr/sbin/sshd).
+
+		  From the Linux side, you want to mount the Windows
+		  file system, using something like this:
+
+<tt><pre>
+	mount -t smbfs -o uid=miguel,username="Miguel de Icaza" "//quack/c$" /mnt
+</pre></tt>
+
+		  In the above example, my Linux user name is
+		  `miguel', and this will allow this user to have
+		  read/write access to the share.  
+
+		  The host name is `quack', and the name of the share
+		  is `c$' (that is the C: partition).  
+
+		  The file system is accessible on /mnt.
+
+		  You can perform your cvs update and cvs commits from
+		  the /mnt directory, and run Emacs or your favorite
+		  Linux text editor on the Unix side in this way.
+
+		  Then from another terminal, you can ssh into your
+		  Windows box using ssh, like this: ssh "Miguel de Icaza@quack"
+	</ul>
+
+* Special Note
 
 	If you have looked at Microsoft's implementation of .NET or
 	their shared source code, you may not be able to contribute
diff --git a/doc/documentation b/doc/documentation
index fe3d61a8d25..4ed2e6a6639 100644
--- a/doc/documentation
+++ b/doc/documentation
@@ -32,4 +32,31 @@
 ** Class Library documentation
 
 	We are moving to a new setup for documenting the class libraries, 
-	you can read about it <a href="classlib-doc.html">here</a>
\ No newline at end of file
+	and you can read about it <a href="classlib-doc.html">here</a>.
+
+        A few words of warning and advice for class documentors:
+
+        A well-documented API can ease hours of frustration; as Mono
+        matures, robust and complete class library documentation will
+        become increasingly important.  As you write API documentation,
+        whether it is embedded in source files or in external Monodoc XML,
+        please keep the following in mind:
+
+        Plagarism, even if it's unintentional, is a Bad Thing(TM).
+        Microsoft's .NET Framework Class Library documentation is an
+        excellent resource for understanding the behavior and properties of
+        a type, and a lot of hard work went in to creating this (copyrighted)
+        resource.  Please don't copy from Microsoft's reference when
+        documenting a type.
+
+        To avoid this, I (<a href="mailto:jbarn@httcb.net">jbarn@httcb.net</a>)
+        suggest that you read the complete Microsoft documentation for a type,
+        ponder it for a while, and write the Mono documentation in your own
+        words.  While it's certainly okay to refer to the Microsoft
+        documentation to clarify your understanding of behavior or properties,
+        please don't open the Microsoft docs and refer to them for each member
+        you document.
+
+        There's a lot of domain expertise among the class library contributors;
+        let's put the same personal stamp on the class library documentation
+        that we have on the class libraries themselves.
\ No newline at end of file
diff --git a/doc/download b/doc/download
index 0ee5658636e..08c3c67ec40 100644
--- a/doc/download
+++ b/doc/download
@@ -10,52 +10,67 @@
 	test suite and the class library are in the `mcs' package, we
 	will move this later into `mono' itself. 
 
-	In order to make mcs and the class libraries you will need a computer
-	running Windows with the <strong>GNU make tools</strong> from the 
-	<strong>Cygwin</strong> environment, <strong>Microsoft's .NET Framework
-	SDK</strong>, <strong>GLIB 1.3</strong> and 
-	<strong>pkg-config</strong>.  
+	<b>Note: (Beginners read!)</b> There are a couple of documents you
+	should read before going ahead. You can reach them in the 
+	<a href="http://www.go-mono.org/mono-beginning.html">Resources/Beginning 	section</a>. And the <a href="http://www.go-mono.org/faq.html">FAQ</a> 
+	and the <a href="http://geneura.ugr.es/~jaime/deploy/mono-common-problems.html">
+	Mono Common Problems</a>. Might be useful too. Take the Mono Beginners
+	HOWTO for your system and proceed as it's described there.
+
 
 <a name="sources">
 *** Sources
 
 	Stay up to date on the Mono team's development using the 
 	<a href="http://lists.ximian.com/mailman/listinfo/mono-cvs-list">
-	mono-cvs-list</a> mailing list.
+	mono-cvs-list</a> mailing list.  The CVS source code can also
+	be browsed <a href="http://cvs.hispalinux.es/cgi-bin/cvsweb/?cvsroot=Mono#dirlist">here</a>
 
-<a name="feb-22">
-	<b>Mono 0.9</b>
+<a name="jun-7">
+	<b>Mono 0.13</b>
 
 	New packaged versions of the Mono C# compiler and Mono runtime
-	are now available.  The latest version is 0.9.
+	are now available.  The latest version is 0.13.
 
 	<ul>
-		* <a href="archive/mono-0.9">Mono 0.9 release notes</a>
+		* <a href="archive/mono-0.13">Mono 0.13 release notes</a>
 
-		* <a href="archive/mcs-0.9.tar.gz">mcs-0.9.tar.gz</a>
-		Mono C# compiler
-		* <a href="archive/mono-0.9.tar.gz">mono-0.9.tar.gz</a>
-		Mono runtime
+		* <a href="archive/mcs-0.13.tar.gz">mcs-0.13.tar.gz</a>
+		Mono C# compiler with class library source code.
+
+		* <a href="archive/mono-0.13.tar.gz">mono-0.13.tar.gz</a>
+		Mono runtime.
 	</ul>
-	
+
+* Snapshots	
+
+	Already daily volunteer's made binaries:
+
+	<ul>
+		* <a href="http://www.atoker.com/mono">Debian Linux</a>
+      	 	
+		* <a href="http://noa.tm/mono/">Red Hat (and RPM based systems)</a>
+		* <a href="http://www.superin.formativ.net/mono/mono.htm">Windows</a> (works without cygwin!)
+	</ul>
+
+	<b>Note1:</b> Don't look for the Mono BaseLabs RPMs; they are not providing it
+	anymore.<br> 
+	<b>Note2:</b> You will find that you can get binaries for the gtk-sharp 
+	package too. 
+
 <a name="snapshots">
 	For up to date sources, it is recommended that you use the Mono 
 	source code from either the 
 	<a href="http://www.go-mono.com/snapshots">nightly snapshots</a> or 
 	the <a href="anoncvs.html">Anonymous CVS</a>.  The nightly
 	snapshots are done every night at 10pm EST (Boston Time).
+	The anoncvs mirrors provided by Hispalinux are updated every six
+	hours.
 
 	The nightly snapshots are not guaranteed to build, but most of the 
 	time they should.  They should give you a window to see what we are 
 	up to.
 
-	You can download the GNU make tools and the Cygwin environment from
-	<a href="http://www.cygwin.com">www.cygwin.com</a>.
-
-	You can download Microsoft's .NET Framework SDK from
-	<a href="http://msdn.microsoft.com/downloads">
-	msdn.microsoft.com/downloads</a>.
-
 	There are scripts to help build mono for both Unix and Windows.  Get
 	<a href="mono-build.sh">mono-build.sh</a> for Unix, or <a
 	href="mono-build-w32.sh">mono-build-w32.sh</a> for Windows.
@@ -75,52 +90,65 @@
 	The script requires wget on either platform, and building the
 	software requires make, gcc, automake, autoconf, and libtool.
 	You should install these packages from your distribution or
-	with the cygwin installer.
+	with the cygwin installer. You should also take care of setting
+	the right environment variables as the PKG_CONFIG_FLAGS, etc.
 
 	The script will download required packages from
 	www.go-mono.com and do a cvs checkout of mono in the current
-	directory.  The cvs server chosen defaults to anonymous cvs;
+	directory.  <b>IMPORTANT!:</b> The cvs server chosen defaults to 
+	anonymous cvs;
 	set your CVSROOT environment variable before running the script to
 	select a particular cvs server.
 
+** Mono Regression Test Suite
+
+	You can get binaries for the Mono Regression Test Suite <a
+	href="archive/mono-tests.tar.gz">here</a>
+	
 <a name="install">
 ** Building the software manually
 
-*** Download the required software.
+*** Building on Linux
 
 	<ul>
 
-		* Microsoft's .NET Framework SDK from 
-		  <a href="http://msdn.microsoft.com/downloads">
-		  msdn.microsoft.com/downloads</a>.
+		You can build mono and mcs in Linux but to do that be
+		sure to obtain the corlib.dll and install it before
+		trying to compile. 
 
-		* Cygwin and the GNU Make tools from  
-		  <a href="http://www.cygwin.com">www.cygwin.com</a>.
-		  Some people observed problems with autoconf 2.52. Installing 
-		  autoconf 2.13 helped in those cases.
+		In linux be sure you get <a href="http://www.gtk.org">glib2.0</a> 
+		(>= 2.0.4, 2.0.6 
+		recomended) and <a href="http://www.freedesktop.org/software/pkgconfig">pkg-config</a> 0.80. 
+		Also the corresponding development packages for those as
+		well as the GNU Build Tools (make, autoconf...).
+		Then download the mono packages and compile them.
+		You must start compiling mcs and then mono.
+		Be sure you set all the environment variables before
+		compiling. You can use pkg-config --list-all to see
+		if you forgot to set some of them.
 
-		* Precompiled GLIB 1.3 and pkg-config packages (and
-		  their dependencies) by the <a href="http://www.gimp.org/~tml/gimp/win32//index.html">GIMP for Windows</a> project from
-		  <a href="http://www.go-mono.com/archive/pkgconfig-0.80-tml-20020101.zip">http://www.go-mono.com/archive/pkgconfig-0.80-tml-20020101.zip</a>
-		  <a href="http://www.go-mono.com/archive/glib-1.3.12-20020101.zip">http://www.go-mono.com/archive/glib-1.3.12-20020101.zip</a>
-		  <a href="http://www.go-mono.com/archive/glib-dev-1.3.12-20020101.zip">http://www.go-mono.com/archive/glib-dev-1.3.12-20020101.zip</a>
-		  <a href="http://www.go-mono.com/archive/libiconv-1.7.zip">http://www.go-mono.com/archive/libiconv-1.7.zip</a>
-		  <a href="http://www.go-mono.com/archive/libiconv-dev-1.7.zip">http://www.go-mono.com/archive/libiconv-dev-1.7-20020101.zip</a>
-		  <a href="http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip">http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip</a>
+		Normally you should enter:
+		export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"
+		if your install prefix is /usr/local.
 
-		* Download the Mono source code from the
-		  <a href="#feb-11">packaged versions</a> or
-		  the <a href="http://www.go-mono.com/snapshots">
-		  nightly snapshots</a> or the <a href="anoncvs.html">
-		  Anonymous CVS</a>.  The nightly snapshots are done every 
-		  night at 10pm EST (Boston Time). The nightly snapshots are 
-		  not guaranteed to build, but most of the time they should.
+		If you downloaded the Mono nightly snapshots, untar the 
+		snapshot. 
 
+		Change directories to "<strong>mcs</strong>". 
 
-	</ul>
+		Configure, compile and install: 
+
+		<pre>
+		<strong>./configure
+		make
+		make install</strong></pre>
+
+		Do the same in the "<strong>mono</strong>" directory.	
 
+	
+*** On Windows, to install and work on the compiler and the class libraries:
 
-*** Install Cygwin and the GNU build tools, Microsoft's .NET Framework SDK and the precompiled GLIB 1.3 and pkg-config libraries.
+**** Install Cygwin and the GNU build tools, Microsoft's .NET Framework SDK and the precompiled GLIB 2.0 and pkg-config libraries.
 
 	<ul>
 
@@ -134,29 +162,24 @@
 		  Unzip the precompiled packages listed above.
 
 	</ul>
-
-*** On Windows, to install and work on the compiler and the class libraries:
-
 	<ul>
-
+		
 		* If you downloaded the Mono 
-		  <a href="http://www.go-mono.com/snapshots">nightly snapshot
-		  </a>, untar the snapshot.
+		<a href="http://www.go-mono.com/snapshots">nightly snapshot
+		</a>, untar the snapshot.
 
 		* Change directories to <strong>"mcs"</strong>.
 
 		* Compile:
-
-<pre>
-<strong>make windows</strong>
-</pre>
-
-	</ul>
+		
+		<pre>
+		<strong>make windows</strong>
+		</pre>
 
 *** On Windows, to compile the mono runtime:
 
-	<ul>	
-
+	<ul>
+		
 		* If you downloaded the Mono 
 		  <a href="http://www.go-mono.com/snapshots">nightly snapshot
 		  </a>, untar the snapshot.
@@ -164,44 +187,49 @@
 		* Change directories to <strong>"mono"</strong>.
 
 		* Configure, compile and install:
+		<pre><strong>
+		./configure --prefix=c:/mono
+		make
+		make install
+		</strong></pre>
 
-<pre><strong>
-./configure --prefix=c:/mono
-make
-make install
-</strong></pre>
-		
 	</ul>
 
-*** On Unix, to compile the mono runtime:
+* Software resources, notes and old releases:
 
-	<ul>
-		
-		* Install <a href="http://www.freedesktop.org/software/pkg-config">pkg-config</a>.
-
-		* Install glib 1.3. You can download it
-                  from <a href="ftp://ftp.gtk.org/pub/gtk/v1.3/glib-1.3.12.tar.gz">ftp.gtk.org</a>. Maybe you need
-                  to modify your ACLOCAL_FLAGS for pkg-config, for example if
-                  your install prefix is /usr/local:
-<pre>
-<strong>export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"</strong>
-</pre>
+		The required and additional software can be downloaded here:
 
-		* If you downloaded the Mono 
-		  <a href="http://www.go-mono.com/snapshots">nightly snapshots
-		  </a>, untar the snapshot.
+		* Microsoft's .NET Framework SDK from 
+		  <a href="http://msdn.microsoft.com/downloads">
+		  msdn.microsoft.com/downloads</a>.
+
+		* Cygwin and the GNU Make tools from  
+		  <a href="http://www.cygwin.com">www.cygwin.com</a>.
+		  Some people observed problems with autoconf 2.52. Installing 
+		  autoconf 2.13 helped in those cases.
+
+		* Precompiled GLIB 2.0 and pkg-config packages (and
+		  their dependencies) by the <a href="http://www.gimp.org/~tml/gimp/win32//index.html">GIMP for Windows</a> project from
+		  <a href="http://www.go-mono.com/archive/pkgconfig-0.80-tml-20020101.zip">http://www.go-mono.com/archive/pkgconfig-0.80-tml-20020101.zip</a>
+		  <a href="http://www.go-mono.com/archive/glib-1.3.12-20020101.zip">http://www.go-mono.com/archive/glib-1.3.12-20020101.zip</a>
+		  <a href="http://www.go-mono.com/archive/glib-dev-1.3.12-20020101.zip">http://www.go-mono.com/archive/glib-dev-1.3.12-20020101.zip</a>
+		  <a href="http://www.go-mono.com/archive/libiconv-1.7.zip">http://www.go-mono.com/archive/libiconv-1.7.zip</a>
+		  <a href="http://www.go-mono.com/archive/libiconv-dev-1.7.zip">http://www.go-mono.com/archive/libiconv-dev-1.7-20020101.zip</a>
+		  <a href="http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip">http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip</a>
+
+		* Download the Mono source code from the
+		  <a href="#feb-11">packaged versions</a> or
+		  the <a href="http://www.go-mono.com/snapshots">
+		  nightly snapshots</a> or the <a href="anoncvs.html">
+		  Anonymous CVS</a>.  The nightly snapshots are done every 
+		  night at 10pm EST (Boston Time). The nightly snapshots are 
+		  not guaranteed to build, but most of the time they should.
 
-		* Change directories to <strong>"mono"</strong>.
 
-		* Configure, compile and install:
-<pre><strong>
-./configure
-make
-make install</strong>
-</pre>
 	</ul>
 
-*** Notes on compiling GLIB 1.3 and pkg-config from source:
+
+*** Notes on compiling GLIB 2.0 and pkg-config from source:
 
 
 	<ul>
@@ -232,17 +260,50 @@ make install</strong>
 
  
 		* Download, compile and install the 
-		  <a href="ftp://ftp.gtk.org/pub/gtk/v1.3/glib-1.3.12.tar.gz">
-		  glib 1.3</a> from source.
+		  <a href="ftp://ftp.gtk.org/pub/gtk/v2.0/glib-2.0.6.tar.gz">
+		  glib 2.0</a> from source.
 
 	</ul>
 
 
 <a name="oldreleases">
 
-*** Very old releases.
+*** Old releases.
 
-		<ul>
+	<ul>
+
+	<ul>
+	<a name="apr-24">
+	<b>Mono 0.11; April 24, 2002</b>
+		* <a href="archive/mono-0.11">Mono 0.11 release notes</a>
+
+		* <a href="archive/mcs-0.11.tar.gz">mcs-0.11.tar.gz</a>
+		Mono C# compiler
+		* <a href="archive/mono-0.11.tar.gz">mono-0.11.tar.gz</a>
+		Mono runtime
+	</ul>
+
+	<ul>	
+	<a name="mar-27">
+	<b>Mono 0.10; March 27, 2002</b>
+		* <a href="archive/mono-0.10">Mono 0.10 release notes</a>
+		* <a href="archive/mcs-0.10.tar.gz">mcs-0.10.tar.gz</a>
+		Mono C# compiler
+		* <a href="archive/mono-0.10.tar.gz">mono-0.10.tar.gz</a>
+		Mono runtime
+	</ul>
+	
+	<ul>
+	<a name="feb-22">
+	<b>Mono 0.9; February 22, 2002</b>
+		* <a href="archive/mono-0.9">Mono 0.9 release notes</a>
+
+		* <a href="archive/mcs-0.9.tar.gz">mcs-0.9.tar.gz</a>
+		Mono C# compiler
+		* <a href="archive/mono-0.9.tar.gz">mono-0.9.tar.gz</a>
+		Mono runtime
+	</ul>
+	
 		<a name="feb-11">
 		<b>February 11, 2002</b>
 		* <a href="archive/mcs-0.8.tar.gz">mcs-0.8.tar.gz</a>
diff --git a/doc/faq b/doc/faq
index 02a643fbe99..5613b628fcc 100644
--- a/doc/faq
+++ b/doc/faq
@@ -2,9 +2,12 @@
 <a href="#ximian">The Ximian Role in the Mono project</a><br>
 <a href="#gnome">Mono and GNOME</a><br>
 <a href="#gui">Building GUI applications with Mono</a><br>
+<a href="#winforms">Mono and WinForms</a><br>
 <a href="#msft">Mono and Microsoft</a><br>
 <a href="#pnpproject">Mono and the Portable.NET Project</a><br>
 <a href="#webservices">Web Services</a><br>
+<a href="#asp">Mono and ASP.NET</a><br>
+<a href="#ado">Mono and ADO.NET</a><br>
 <a href="#devel">Development Tools and Issues</a><br>
 <a href="#java">Mono and Java</a><br>
 <a href="#extending">Extending Mono</a><br>
@@ -13,8 +16,13 @@
 <a href="#gcc">Mono and GCC</a><br>
 <a href="#performance">Performance</a><br>
 <a href="#licensing">Licensing</a><br>
+<a href="#patents">Patents</a><br>
 <a href="#etc">Miscellaneous Questions</a><br>
+<a href="#problems">Mono Common Problems</a><br>
 
+A <a
+href="http://www.es.gnome.org/documentacion/articulos/MONO-PUF/MONO-PUF/">spanish
+translation</a> is also available
 
 <a name="basics"></a>
 ** Basics
@@ -22,9 +30,9 @@
 Q: What is Mono exactly?
 
 A: The Mono Project is an open development initiative sponsored by
-   Ximian that is working to develop an open source, Linux-based
+   Ximian that is working to develop an open source, Unix
    version of the Microsoft .NET development platform.  Its objective
-   is to enable Linux developers to build and
+   is to enable Unix developers to build and
    deploy cross-platform .NET Applications.  The project will
    implement various technologies developed by Microsoft that have now
    been submitted to the ECMA for standardization.
@@ -60,7 +68,7 @@ A: Mono contains a number of components useful for building new
    Windows has compilers that target the virtual machine from <a
    href="http://msdn.microsoft.com/net/thirdparty/default.asp#lang">a
    number of languages:</a> Managed C++, Java Script, Eiffel,
-   Component Pascal, APL, Cobol, Oberon, Perl, Python, Scheme,
+   Component Pascal, APL, Cobol, Perl, Python, Scheme,
    Smalltalk, Standard ML, Haskell, Mercury and Oberon.
 
    The CLR and the Common Type System (CTS) enables applications and
@@ -102,19 +110,26 @@ Q: Is Mono usable?
 A: The JIT engine is usable on Intel x86 machines.  An interpreter
    can be used on other non-Intel x86 machines.  
 
-   The class libraries are not yet mature enough to run real applications,
-   but if you are interested in trying out Mono, you can definetly start
-   testing things out as many programs run.
-
-   The C# compiler has made significant progress, it can even compile
-   itself now, but it can not yet be ran with our class libraries as
-   they are missing some features. 
+   The class libraries are mature enough to run some real applications
+   (the compiler for instance, and every day more and more applications
+   are natively developed with Mono).
 
 Q: When will you ship it?
 
-A: It is premature to target a shipdate for the code, but we
-   anticipate that it will be available some time in the middle of
-   2002.
+A: Different parts of Mono will achieve usability at different stages,
+   once we are comfortable with the compiler, we will release "Mono Core",
+   which contains everything needed to develop applications with the base
+   class libraries.  This should be available at some point during 2002.
+
+   Other higher level class libraries (ASP.NET, ADO.NET) will
+   be released when they become stable. 
+
+Q: What major components will you include in Mono?
+
+A: Hopefully everything that Microsoft ships on their Framework
+   (ADO.NET, ASP.NET), and
+   we encourage third party developers to create reusable components that
+   work on both Mono and Windows.
 
 Q: How can I contribute?
 
@@ -131,6 +146,10 @@ A: We are interested in providing the best tools for programmers to
    Project white paper</a>.
    the project.
 
+Q: Miguel said once that Mono was being implemented in COBOL. Is that true?.
+
+A: No. It was a joke.
+
 
 <a name="ximian"></a> 
 
@@ -164,6 +183,13 @@ Q: Will Ximian offer Mono commercially?
 A: When Mono is ready to be shipped Ximian will offer a commercial
    support and services for Mono. 
 
+Q: Does Ximian provide consulting services around Mono?
+
+A: Yes, Ximian does provide consulting services around Mono to
+   make it suitable to your needs.  Porting the runtime engine,
+   customizing it, working on specific classes or tuning the code
+   for your particular needs. 
+
 Q: Will you wait until Mono is finished?
 
 A: Mono will ship on various stages as they mature.  Some people
@@ -218,13 +244,22 @@ Q: But will I be able to build GNOME applications?
 
 A: Yes, we will enable people to write GNOME applications using Mono.
 
+Q: Do you have C# bindings for GNOME?.
+
+A: Yes, we currently bind libgnome, libgnomecanvas, and libgnomeui --
+   although I dare say I have no idea how functional the bindings are
+   outside of what I tested in the sample app. I imagine other libraries 
+   under the GNOME framework will be added on an as-needed (and as-requested) 
+   basis...although a truly good bonobo binding will have to wait on the CORBA 
+   remoting support which has been started recently.
+
 <a name="gui"></a>
 ** GUI applications
 
 Q: Will Mono enable GUI applications to be authored?
 
 A: Yes, you will be able to build GUI applications.  Indeed, that is our
-   main focus.  We will provide both the Windows.Forms API and the Gtk# AP(I.
+   main focus.  We will provide both the Windows.Forms API and the Gtk# API.
 
 Q: What is the difference between Gtk# and System.Windows.Forms?
 
@@ -238,6 +273,75 @@ A: As long as your applications are 100% .NET and do not make use
    of P/Invoke to call Win32 functions, your smart client applications
    will run on Mono platforms.
 
+Q: Where can I learn mora about Gtk#?
+
+A: The following <a href="http://gtk-sharp.sourceforge.net>link</a> sends you to the page of the project.
+
+Q: What can I do with Gtk#?. 
+
+A: Gtk# is becoming very usable and you can create applications and
+   applets like those you see in a GNOME desktop environment. It's 
+   easy to install so it's worth a try. 
+
+Q: How can I compile my HelloWorld.cs which uses Gtk#?.
+
+A: Try: mcs --unsafe -o HelloWorld.exe -r glib-sharp -r pango-sharp -r
+        atk-sharp -r gdk-sharp -r gtk-sharp -r gdk-imaging-sharp
+        HelloWorld.cs
+
+Q: Is there any way how to connect DataAdapter to some GTK# controls?
+
+A: There is a sample file called `DbClient' in gtk-sharp/samples that you
+   might to look at.  It is a sample program in Gtk# that adds/updates/deletes 
+   information on a Postgress database. When we have the new table/tree widgets, 
+   I am sure someone would write an adapter for System.Data (in Gtk2 the 
+   tree/list widgets are written using a view/model, so you only need to write 
+   a model that maps to the database). You can have a look at 
+   gtk-sharp/sample/DbClient, where there is a GTK# application that uses 
+   System.Data. It does not use DataAdapter, but DataReader though.
+
+<a name="winforms"></a>
+** Mono and WinForms
+
+Q: Can you tell me why aren't you implementing WinForms?. 
+
+A: (This is based in an original mail to mono-list written by Miguel de
+   Icaza. You should read it for completion, but the core part is here).
+   
+   First, Windows.Forms is packed with quirks and is not that great of a 
+   toolkit in the first place. Up to the point of the unconfirmed rumor 
+   that Microsoft is working on a replacement for it. 
+
+   Once the runtime is done, we will very likely start contributing to
+   the Gtk# project ourselves, and we will likely start doing feasibility
+   work on getting Mono used by Gnome developers: full gnome apps and
+   extending existing applications.
+
+   Those interested in hacking on Windows.Forms are welcome to do so,
+   but Ximian will not likely look at it in the near future; if there is
+   enough demand, or I can be convinced that Windows.Forms is useful for
+   something Ximian might re-evaluate our resource allocation for this
+   task.
+
+   By doing native ports, we could use the same API on all those systems. 
+   Also, Gtk is mature enough, we know this because we have built an entire
+   desktop (and all sorts of very window system-specific hacks), and we
+   have built a bunch of productivity applications with it. 
+
+Q: What about VCL?.
+
+   Someone mentioned VCL. The only problem with the VCL is that it can
+   only be used for GPL applications (or I guess you could license it from
+   Borland for your app), and would have to be ported from Delphi to C# 
+   (or someone would have to write a CIL compiler for it).
+
+Q: What about doing something like the eclipse project (www.eclipse.org)? 
+
+A: The Eclipse toolkit is not a general purpose toolkit.  It will require a
+   lot of work before it is such a thing.  It is a toolkit used to
+   implement a development environment.
+
+
 <a name="msft"></a>
 ** Mono and Microsoft
 
@@ -335,6 +439,25 @@ A: No, it will not.  Microsoft Office is a Windows application.  To
    learn more about running Windows applications on Intel Unix systems
    refer to <a href="http://www.winehq.com">the Wine Project</a>.
 
+Q: Will I be able to compile a Microsoft VB.NET application and execute 
+   the resultant MSIL file under MONO on Linux without converting to C# 
+   and recompiling?
+
+A: Once we have a complete VisualBasic runtime, yes.
+
+Q: Can mono run the WebMatrix ?
+
+A: No. That requires winforms (we don't have).
+
+Q: Does mono have something like Passport ? (ie PassportIdentity class,somewhere
+   in System.Web ?) . Will mono have a server side Passport/Similar framework
+   for XSP as well as client classes ?
+
+A: Not yet, but the client side API for authentication is not the problem. 
+   We will likely have a lot of other authentication APIs, like the Liberty
+   Aliance APIs. The problem is people on the web provider end that might use 
+   this for authentication.
+
 <a name="pnpproject"></a>
 ** Mono and Portable.NET
 
@@ -342,8 +465,48 @@ Q: What are the differences between Mono and Portable.NET?
 
 A: Most of Mono is being written using C#, with only
    a few parts written in C (The JIT engine, the runtime, the
-   interfaces to the garbage collection system).  The Portable.NET
-   Project is using C for development.
+   interfaces to the garbage collection system).  
+
+   It is easier to describe what is unique about Mono:
+   <ul>
+     <li> A self-hosting C# compiler written in C#, which is clean, easy
+          to maintain.
+
+     <li> A multi-platform runtime engine: both a JIT engine and an
+          interpreter exist.  The JIT engine runs currently on x86
+          systems, while the interpreter works on Sparc, StrongARM and
+          PowerPC systems.  
+
+     <li> Supports Linux, Windows and Solaris at this point.
+
+     <li> The JIT engine is written using a portable instruction
+          selector which not only generates good code (we are told
+          that we are faster than Rotor, but it is hard to tell) but
+          is also the foundation to retarget the JIT engine to other
+          systems.  
+
+          The system employed is described in various compiler
+          books and it is very similar to what is described in the 
+          book that covers LCC, the Ansi C retargetable C compiler.
+
+     <li> The JIT engine supports inlining, constant folding and propagation,
+
+     <li> Full support for remoting in the runtime, but the class 
+          libraries are still behind.
+
+     <li> The C# compiler, the JIT engine and the class libraries are
+          mature enough that the whole system is self-hosting, ie, that
+          it can be fully developed with itself at this point.
+
+     <li> We are not yet done, and there is a lot of work left to be
+          done
+
+     <li> We have a great community of developers, without which Mono
+          would not be possible.
+
+     <li> We will provide an ahead of time compilation mode in the 
+          future.
+   </ul>
 
 <a name="webservices"></a>
 ** Web Services
@@ -392,6 +555,10 @@ Q: Can I serialize my objects to other things other than XML?
 A: Yes, although the serializing tools have not yet been planned, and
 you would probably have to implement them yourself.
 
+Q: Will Mono use ORBit?
+
+A: No. Mono will be using a new implementation of CORBA that isn't still started. 
+
 <a name="devel"></a>
 ** Development Tools and Issues
 
@@ -430,6 +597,172 @@ A: The CIL is better suited to be JITed than JVM byte codes, but you
    can interpret them as trivially as you can interpret JVM byte
    codes. 
 
+Q: Isn't it a little bit confusing to have the name of "XSP" (the same 
+   as in the Apache Project) for the ASP.NET support in Mono?.
+
+A: In Mono, xsp is just the name of the C# code generator for ASP.NET 
+   pages. In the Apache Project, it is a term for the "eXtensible Server 
+   Pages" technology so as they are very different things, they don't 
+   conflict.
+
+Q: What about using something like Jabber instead of the System.Messaging 
+   namespace?.
+
+A: In short, MSMQ is not something like Jabber, but asynchronous messaging 
+   through queues. Usefull queues do more than serialize messages, they are 
+   also platform bridges.
+
+Q: Are you supporting XMLDocument and relatives?.
+
+A: Currently, we aren't implementing them yet. It would require updates to 
+   most of the XmlNode derivatives so it's not a trivial task. We are 
+   currently focusing on getting XPath support working. 
+
+Q: Is there any plan to develop an aspx server for Mono?.
+
+A: The webserver turned out to be very simple compared to the rest of the 
+   work. Gonzalo has got the page generator mostly done (a module called 
+   xsp, who has nothing to do with the XSP term used in the Apache Project).
+   Patrik has done a lot of the work to get the ProcessRequest to work.
+   You can try to help in the final touches to the System.Web classes and
+   writing regression tests for the widgets we have.
+
+Q: Is there any way I can develop the class libraries using linux yet?
+
+A: Yes. Some class libraries can be developed on Linux. Search for
+   Paolo's post (he lists which classes can be compiled fine now).
+
+Q: Is there any way I can install a known working copy of mono in /usr, 
+   and an experimental copy somewhere else, and have both copies use 
+   their own libraries? (I'm still not very good at library paths in 
+   linux)
+
+A: Yes. Just use two installation prefixes.
+
+Q: How should I write tests or a tests suite?
+
+A: If you do a test suite for C#, you might want to keep it 
+   independent of the Mono C# compiler, so that other compiler 
+   implementations can later use it.  
+
+Q: Is the current stage the implementation of mono_create_trampoline
+   function?  Hence the sparc-codegen.h is reasonably complete? Is 
+   mono/arch/x86/* the best reference material for this stuff?
+
+A: sparc-codegen.h is basically complete. We may want to add some
+   convenience macros along the way, but it has all the stuff you need.
+   And yes, or, the ppc/ dir, since the ppc call convention is more similar 
+   to the sparc one than the x86 one. The current issues with the sparc 
+   code are. roughly:
+     1) it needs to handle overflowing the out registers (the additional
+     arguments need to be put on the stack)
+     2) it needs to flush the icache where the generated code is stored
+     3) it needs to implement mono_create_method_pointer to get delegates
+        working
+     4) it needs a couple of updates (mono_method_pointer_get is no longer
+     needed, for example)
+
+Q: Would it be too terrible to have another corlib signed as mscorlib? 
+
+A: We rename corlib to mscorlib also when saving the PE files, in fact, 
+   the runtime can execute program created by mono just fine.  
+
+Q: How do I build corlib under Linux?
+
+A: You can build your own (see the web site on how to get the mcs 
+   project from cvs), but in order to build them using mcs you need a 
+   set of working class libraries. After building the runtime (using
+   mono-build.sh) get them from the nightly build and put them (and
+   mcs.exe) in your mono/install/lib directory. Then you should be able 
+   to do: cd mcs, then: make -f makefile.gnu, then: cp mcs/mcs.exe 
+   class/lib/*.dll ../install/lib Also, you should know that you can 
+   either get your dose of DLLs from MonoCharge, or from 
+   http://primates.ximian.com/~miguel/runtime. MonoCharge is updated 
+   automatically, while the later is only updated when Miguel is around 
+   Once you have the DLLs, you can use `make -f makefile.gnu' as described
+   before to self-host.
+
+Q: Is there a relatively straightforward way to repeat the steps taken 
+   by Paolo to get Mono completely self-hosted on linux?
+
+A: To build the compiler and class libraries in Linux, run:
+   <ul><li>make -f makefile.gnu. To install them, run: </li>
+       <li>make -f makefile.gnu install</li>
+       <li>You can also specify a prefix:</li>
+       <li>make -f makefile.gnu install prefix=/opt</li>
+   </ul>
+   If you want to produce and distribute a monocharge tarball, run:
+   make -f makefile.gnu dist
+   Of course you have to run these in the top level mcs directory.
+
+Q: Is it possible to build a C# file to some sort of intermediate format which 
+   can linked into a final module, like the traditional .c -> .o -> .so path? 
+   
+A: You could do: mcs /target:module file1.cs, mcs /target:module file2.cs, 
+   mcs /target:exe file1.dll file2.dll /out:mybin.exe
+
+Q: Is there any plans for implementing remoting in the near future?, When will 
+   work in System.Runtime.Remoting.dll start?
+
+A: The remoting infrastructure is in place. Some of the channels and 
+   formatters are not.
+
+Q: I'm wondering if there are any plans to start using nant to build the
+   class lib + test lib. i think that every project neeed/should use an
+   automated build process and nant + a couple of tools enables this. is
+   the problem that the compiler can't run nant yet?
+
+A: Maybe well be doing some sort of automated build process + testing when
+   the summer finish.
+
+<a name="asp">
+** Mono and ASP.NET
+
+Q: Is Mono supporting ASP.NET?
+
+A: Yes. The development of the support for ASP.NET comes in various stages, 
+   here is what Gonzalo has been working on: 1. The Parser. 2. Getting the 
+   parser to generate output compatible with ASP.NET. 3. Running the sample 
+   output with the real Microsoft runtime but using our generated page. 4. 
+   Running the sample with our classes with the .NET runtime. 5. Running 
+   our sample code with our classes with our runtime. This is the process 
+   we are following. Currently Gonzalo has reached point 5.
+
+Q: Do I need install cygwin to work on ASP.NET in mono or Linux is enough since 
+   it is self host right now.
+
+A: Linux is enough.
+
+Q: Any plan to make ASP.NET in mono works with Apache in linux?.
+
+A: Yes, we have plans to do so, but we need to wait for Patrik's patches to
+   HttpRuntime. Once that is there, writing a mod_mono should be trivial 
+   (look at mono/samples/embed for a sample embedded application).
+
+<a name="ado">
+** Mono and ADO.NET
+
+Q: What is the status of ADO.NET support?. Could I start migrating 
+   applications from MS.NET to Mono?.
+
+A: You could start right now using the ADO.NET support in mono, of course,
+   if you want to help filling the missing gaps while you develop your app
+   :-) Well, what I mean is that we're not that far to having full ADO.NET
+   support in Mono, and we've got a lot of working things, so if we could
+   get more help, we'd finish it really soon :-)
+
+Q: In developing the data architecture for the application are there and
+   objects I should stay away from in order to insure the smoothest possible
+   transition (minimum code rewrite) to Mono's ADO.NET implementation?  (For
+   example, strongly typed datasets versus untyped datasets, etc...)
+
+A: we are implementing all the classes in Microsoft .NET's System.Data, so
+   you can be sure that things will work the same in Mono as with the MS's
+   implementation. We'll maybe provide extra classes to fix some things
+   we've found missing while developing ADO.NET in Mono, but if you keep
+   using the MS's System.Data classes, things will work out of the box with
+   no changes (or at least that's the plan :-)
+
 <a name="java">
 ** Mono and Java
    
@@ -481,6 +814,24 @@ A: Yes, it is possible.  Here are a few starting point:
           	  be translated into the equivalent "meaning" in CLR-land.
 	</ul>
 
+Q: Could mono become a hybrid cil/java platform?
+
+A: No. It is quite far from the philosophy of the project. The idea of Mono 
+   is, to have only _one_ VM, on which all can run. And if there existing a 
+   binary-converter from Java-.class to IL and if there existing something 
+   like J-Sharp on Mono, you can write programs in Java, which than can run 
+   on Mono. You do not need two bindings (like your example: GTK-Sharp _and_ 
+   Java-Gnome). You need only _one_ of it (GTK-Sharp). Thats the idea of Mono.
+   An other point is, that there are no people, who use OpenSource-JVMs. They 
+   all prefer Suns original. But for Unix there don't exist a .NET-Framework. 
+   So it is possible, that in the future Mono is the standard .NET for unixes.
+
+Q: Do you plan to implement a Javascript compiler?
+
+A: Yes. Eto Demerzal has started a Rhino port to C#.
+   After this is completed, we will begin developing
+   the Javascript compiler.
+
 <a name="extending"></a>
 ** Extending Mono
 
@@ -508,7 +859,20 @@ A: Embracing a good technology is good.  Extending technologies in
 
    If you have innovative ideas, and want to create new classes, we 
    encourage you to make those classes operate correctly well in both
-   Mono and .NET
+   Mono and .NET.
+
+Q: Is there any way I can develop the class libraries using linux yet?
+
+A: Yes. Some class libraries can be developed on Linux. Search for
+   Paolo's post (he lists which classes can be compiled fine now).
+
+Q: Is there any way I can install a known working copy of mono in /usr, 
+   and an experimental copy somewhere else, and have both copies use 
+   their own libraries? (I'm still not very good at library paths in 
+   linux)
+
+A: Yes. Just use two installation prefixes.
+
 
 <a name="portability"></a>
 ** Portability
@@ -519,7 +883,7 @@ A: Currently, we are doing our work on Linux-based systems and
    Windows.  We do not expect many Linux-isms in the code, so it
    should be easy to port Mono to other UNIX variants.   
 
-Q: What about Mono on non X-based systems?
+Q: What about Mono on non Linux-based systems?
 
 A: Our main intention at Ximian is to be able to develop GNOME
    applications with Mono, but if you are interested in providing a
@@ -527,11 +891,27 @@ A: Our main intention at Ximian is to be able to develop GNOME
    MacOS X for example), we would gladly integrate them, as long
    they are under an open source license.  
 
-Q: Will Mono run on Windows?
+Q: What operating systems/CPUs do you support
+
+A: Mono currently runs on Linux, Windows, Solaris and FreeBSD.
+   There is a JIT engine available for x86 processors that can
+   generate code and optimizations tailored for a particular CPU.
+
+   Interpreters exist for the SPARC, PowerPC and StrongARM cpus.
+
+Q: Does Mono run on Windows?
+
+A: Yes.   The Compiler and the runtime both run on Windows.
+
+Q: When will mono and mcs compile on Linux?.
+
+A: That happend a long time ago. Know you can download and compile 
+   them or even install them from already made binary packages for 
+   Windows and for Linux (RPM/DEB).
+
+Q: Will I require Cygwin to run mono?
 
-A: We hope so.  Currently some parts of Mono only run on Windows
-   (the C# compiler is a .NET executable) and other parts have only
-   been compiled on Linux, but work on Windows with Cygwin.
+A: No.  While you'll need it to compile it, it runs without cygwin and does not even require cygwin1.dll
 
 Q: Will Mono depend on GNOME?
 
@@ -540,6 +920,28 @@ A: It will depend only if you are using a particular assembly (for
    in Mono for implementing a `Hello World Enterprise P2P Web
    Service', you will not need any GNOME components.
 
+Q: Is anyone working on porting Mono to IA-64?
+
+A: Nobody is working on such port.
+
+Q: If I were about to start a Mono port to IA-64,would the same lburg code 
+   generator work for IA-64 also? or anything else need to be used for code 
+   generation(as the processor architecture is totally different from IA32)
+
+A: The lburg approach can be use for any processor architecture. But you might
+   think in another better approach.
+
+Q: Do you plan to port Rhino to C#?.
+
+A: Eto Demerzal has started a Rhino port to C#.
+
+Q: Has anyone succeeded in building a Mac version of the C# environment. 
+   If so can you explain how?  
+
+A: You could try to check with the Darwin people, or the Fink people.
+   Mono/C# is self hosting on Linux/PPC which is the hard part, so it
+   should be relatively simple to get it to work on macos
+
 <a name="reuse"></a>
 ** Reusing Existing Code
 
@@ -555,11 +957,53 @@ A: At this time, we are investigating whether we can use elements of
    defined API that splits the JIT from the GC system and the actual
    byte code implementation.
 
+   We are using some pieces of ORP (Their code generation interface)
+   and we use it as a source of inspiration for optimizations.  Paolo
+   and Dietmar consider ORP as being one of the best JIT engines out
+   there (and their research work and papers are very useful if you are
+   interested in JIT technology).
+
 Q: What about using GNU Lightning?
 
-A: We are also researching <a
-   href="http://www.gnu.org/software/lightning/lightning.html">GNU
-   Lightning</a>.
+A: We are not using GNU Lightning.  Our JIT is using an instruction
+   selector based on tree-pattern matching, and a code generation
+   interface that is very tied to the current architecture.
+
+Q: Will I be able to use Microsoft SQL Server 2000 or will I need to switch
+   to a specific Open Source Database. Will I need to recode?
+
+A: There should not be any need to recode.
+
+Q: What do I need to watch out for when programming in VB.NET so that I'm
+   sure to be able to run those apps on Linux?
+
+A: Not making any PInvoke or DLL calls should and not using anything in
+   the Microsoft.* namespaces should suffice. Also do not use any 
+   Methods/Classes marked as "This type/method supports the .NET Framework 
+   infrastructure and is not intended to be used directly from your code." 
+   even if you know what these classes/methods do.
+
+Q: Will built-in reporting be supported for crystal reports? This is a
+   heavily used part of our system.
+
+A: Probably not. Crystal Reports are propriety. Someone may try to emulate
+   the behaviour, but no-one has yet volunteered.
+
+Q: Who about writing to the registry? As I understand it, Linux does not have
+   a counterpart to the registry. Should I avoid relying on that feature?
+
+A: Try to avoid it. Although there would be a emulation for registry in
+   Mono too. GNOME does have a registry like mechanism for configuration. But
+   Even if gnome has a configuration system similar to the registry, the keys 
+   will not be equal, so you will probably end up having to do some runtime 
+   detection, and depending on this load an assembly that has your 
+   platform-specific hacks.
+
+Q: System.Data.SqlClient with FreeTDS, will you port parts of these to C# and 
+   use them?
+
+A: if their license is compatible with mono's, yes, we'd think about porting 
+   them. If not, we'll continue with the plan of using FreeTDS.
 
 <a name="gcc"></a>
 ** Mono and GCC
@@ -637,7 +1081,33 @@ A: We will have to evaluate the licenses for compatibility first,
    but as a general rule, we will accept the code under the same
    terms of the "container" module. 
 
-<a name="etc"></a>
+<a name="patents"></a>
+** Patents
+
+Q: Could patents be used to completely disable Mono (either submarine
+   patents filed now, or changes made by Microsoft specifically to
+   create patent problems)?
+
+A: No.  First, its basic functional capabilities have pre-existed too
+   long to be held up by patents.  The basic components of Mono are
+   technologically equivalent to Sun's Java technology, which has been
+   around for years.  Mono will also implement multi-language and
+   multi-architecture support, but there are previous technologies
+   such as UCSD p-code and ANDF that also support multiple languages
+   using a common intermediate language.  The libraries are similar
+   to other language's libraries, so again, they're too similar to
+   be patentable in large measure.
+
+   However, if Microsoft does patent some technology, then our plan is
+   to either (1) work around it, (2) chop out patented pieces, (3) 
+   find prior art that would render the patent useless.
+ 
+   Not providing a patented capability would weaken the
+   interoperability, but it would still provide the free software /
+   open source software community with good development tools, which
+   is the primary reason for developing Mono.  
+
+<a name="etc"></a> 
 ** Miscellaneous Questions
 
 Q: You say that the CLI allows multiple languages to execute on the
@@ -661,3 +1131,54 @@ Q: Will you support COM?
 A: The runtime will support XPCOM on Unix systems and COM on Windows.
    Most of the code for dynamic trampolines exists already.
 
+Q: Will Ximian offer certifications on Mono or related technologies?. 
+
+A: It's possible. But there is no plan about this. So the short answer is no.
+
+Q: Are there any Boehm's gc binaries?
+
+A: Yes. You can find RPMs <a href="http://java.thn.htu.se/~toor/">here</a>, though
+   if your distribution provides the correct packages, you should use those.
+   The suggested version of the Boehm GC is 6.1.
+
+Q: How can I report a bug?
+
+A: The best thing is to track down the bug and provide a simple test to
+   reproduce the bug. You can then add the bug to 
+   <a href="http://bugzilla.ximian.com/enter_bug.cgi">bugzilla</a> or 
+   simply send it to mono-list@ximian.com. Please provide info about
+   what version of mono you're using and any relevant details to be 
+   able to repoduce the bug. Note that bugs reported on the mailing-list 
+   may be easily forgotten, so it's better to file them in bugzilla.
+
+Q: Does mcs support the same command line options as the MS C# 
+   compiler?
+
+A: The Mono C# compiler now supports the same command line
+   arguments as the Microsoft C# compiler does.
+
+Q: How about getting searchable archives on lists.ximian.com? 
+
+A: You can perform a search on the mono-related mailing lists 
+   <a href="http://www.go-mono.com/mailing-lists.html">here</a>.
+
+Q: When using mono from cvs or from a snapshot, I get an error messaage
+   saying that Mono and the runtime are out of sync. How do I fix that?
+
+A: If you use mono from cvs, you need to be prepared for changes in the
+   runtime internals. This means that you should keep a working setup 
+   before blindling updating (a working setup may just be the last released
+   tarball or a recent binary snapshot).
+   Usually, compiling corlib with mcs before recompiling the C runtime does
+   the right thing (but occasionally you may need to do it the other 
+   way around).
+
+
+
+<a name="problems"></a>
+** Mono Common Problems
+
+   If you are having problems compiling or running Mono software
+   or if you think that you found a bug, etc. Please visit the
+   <a href="http://geneura.ugr.es/~jaime/deploy/mono-common-problems.html">Mono Common Problems</a> document and try there. 
+
diff --git a/doc/hackers b/doc/hackers
new file mode 100644
index 00000000000..cde738b9f86
--- /dev/null
+++ b/doc/hackers
@@ -0,0 +1,23 @@
+* Mono Hackers Hall Of Fame
+
+Without the help, the skills and the time of many passionate developers outside of 
+the Ximian Mono team, Mono would not be where it is today.
+
+Many of them do it for fun, some do it because they really want a nice CLR they 
+can hack on, some do it because they need a working solution to some development 
+issues and mono is the ideal tool for the job. 
+
+Some of them may start contributing because they want a mention in the
+<b>Mono Hackers Hall Of Fame</b>! Whatever the cause, join us in a big<br>
+<h1 align="center">Thank you!</h1>
+
+* Mono Hackers
+
+** Nick Drochak
+
+The first, deserved, entry in the <b>Mono Hackers Hall Of Fame</b> is for
+Nick Drochak, who joined us in the first days of Mono and built the testing 
+infrastructure for the C# assemblies, fixed tons of bugs and even adventured 
+himself in the lands of the C runtime. His work is invaluable for keeping
+Mono on the right track through the daily changes in the codebase.
+
diff --git a/doc/index b/doc/index
index e4e6866b4a0..8d20cee12f2 100644
--- a/doc/index
+++ b/doc/index
@@ -1,14 +1,16 @@
+<link rel="alternate" type="application/rss+xml" title="RSS" href="index.rss"/>
+
 <table>
   <tr>
     <td>
 	<a href="http://www.ximian.com">Ximian</a> announced the
-	launch of the Mono project, an effort to create an Open Source
-	implementation of the .NET Development Framework.  
+	launch of the Mono project, an effort to create an open source
+	implementation of the .NET Development Framework.
 
 	Mono includes: <a href="c-sharp.html">a compiler</a> for the
 	C# language, a <a href="runtime.html">runtime</a> for the
-	Common Language Infrastructure and a set of <a
-	href="class-library.html">class libraries</a>.  
+	Common Language Infrastructure (also refered as the CLR) and a
+	set of <a href="class-library.html">class libraries</a>.  
 
 	You can read our <a href="rationale.html">rationale</a> for
 	this project.  If you have questions about the project, please
@@ -16,8 +18,10 @@
 	Questions</a> or <a href="mailto:mono-list@ximian.com">contact us.</a>
 
 	You might also want to <a href="download.html">Download the
-	source</a> for our work so far.  Or you can grab a <a
-	href="snapshots">snapshot</a> of our current work. 
+	source</a> for our work so far.  Grab a <a
+	href="snapshots">snapshot</a> of our current work, or <a
+	href="http://cvs.hispalinux.es/cgi-bin/cvsweb/?hidenonreadable=1&f=u&logsort=date&sortby=file&hideattic=1&cvsroot=Mono">browse
+	the sources</a>
 
 	You might want to <a
 	href="mailing-lists.html">subscribe</a> to our mono-list
@@ -27,17 +31,18 @@
 	href="mailto:mono-list@ximian.com">mono-list@ximian.com</a>
     </td>
     <td>
-	<table border=1 bgcolor>
-	  <tr>
-	  </tr>
+	<table border=1>
 	  <tr>
 	    <td>
-	      <b><a href="c-sharp.html">Compiler</a></b>
+	      <b><center>Mono Status</center></b>
 	    </td>
 	    <td>
-	      Self hosting on .NET.<br>
-	      Classes need work to run on Mono.
+	      <b><a href="c-sharp.html">C# Compiler</a></b>
 	    </td>
+	    <td>
+	      <b>Self hosting on Linux</b><br>
+	      Self hosting on .NET.
+            </td>
 	  </tr>
 	  <tr>
 	    <td>
@@ -52,8 +57,10 @@
 	      <b>Interpreter</b>
 	    </td>
 	    <td>
-	      Linux/PPC working<br>
-	      In progress: StrongARM, SPARC.
+	      Working:<br>
+	      Linux/x86, Linux/PPC<br>
+	      In progress:<br>
+	      StrongARM, SPARC.
 	    </td>
 	  </tr>
 	  <tr>
@@ -61,7 +68,15 @@
 	      <b><a href="class-status.html">Classes</a></b>
 	    </td>
 	    <td>
-	      Corlib for self hosting mostly done
+	      Corlib is self hosting.
+	    </td>
+	  </tr>
+	  <tr>
+	    <td>
+	      RSS feed:
+	    </td>
+	    <td>
+	      <a href="index.rss"><img src="images/xml.gif"></a>
 	    </td>
 	  </tr>
 	</table>
@@ -69,7 +84,852 @@
   </tr>
 </table>
 
-** Feb 26, 2002
+@item Aug 21th, 2002: Portable.NET encodings integrated into Mono.
+
+	Rhys Weatherley has contributed the Portable.NET encoders to
+	the Mono class libraries.  This is a great step towards
+	cooperation between these projects.  Thanks to Paolo for doing the
+	merger on our side.
+
+	His encoders are more complete than the iconv-based approach
+	that mono used, which was unreliable under certain
+	circumstances.  
+
+@item Aug 20th, 2002: Remoting work, Resources, SPARC checkins, ADO.NET
+
+	Mark Crichton has checked in his patches to get the SPARC port
+	on par with the PPC port.
+
+	Dick has checked-in the resource reader and resource writers
+	to the class libraries, and Dietmar checked in the C# support
+	code for the remoting infrastructure.  
+
+	More work on System.Data: the LibGDA (our OleDB backend) based
+	providers are quickly maturing, and recently they executed
+	their first query.
+
+@item Aug 13th, 2002: MCS news, Gtk# progress, Windows.Forms, ADO.NET
+
+	Martin Baulig has been fixing all the known bugs in the C#
+	compiler and now has moved into improving the compilation
+	speed and the generated code quality of MCS.  Today we got a
+	50% speedup in the bootstrap of MCS going from 24 seconds to 12 seconds. 
+
+	Gtk# has been making a lot of progress, some interesting
+	corner cases are now supported:, you can now create canvas items as
+	well as using the tree widget.  Here is a shot of <a
+	href="images/mocil.png">MonoCIL</a>.
+
+	On the runtime front, focus has been on improving remoting
+	support, exception handling, as well as completing the support
+	for structure marshaling.  
+
+	Patrik is also back in action: the HttpRuntime infrastructure
+	is rapidly improving, and Gonzalo is working into moving XSP
+	into our main class library and providing the missing pieces
+	to integrate with Patrik's code.
+
+	Dennis and his team are working on a WineLib-based
+	implementation of Windows Forms to guarantee that the corner
+	cases of Windows.Forms can be handled, and we are back on track again.
+
+	A lot more work on the ADO.NET and WebServices has also been
+	checked into CVS.
+
+@item Aug 1st, 2002: Mono Hackers Hall of Fame
+
+	The <a href="hackers.html">Mono Hackers Hall Of Fame</a> has been started
+	to show our appreciation to the excellent contributors that made <b>mono::</b>
+	a successful free software project.
+
+	The first, deserved, entry goes to
+	Nick Drochak, who joined us in the first days of Mono and built the testing 
+	infrastructure for the C# assemblies, fixed tons of bugs and even adventured 
+	himself in the lands of the C runtime. His work is invaluable for keeping
+	Mono on the right track through the daily changes in the codebase.
+
+@item Looking for volunteers
+
+	We are looking for volunteers to help complete various pieces
+	of Mono and help move the project forward, we need
+	contributions to:
+
+	<ul>
+		* More tests to the existing class libraries.
+	
+		* Finish existing class libraries, check our <a
+		href="class-status.html">class status</a> pages to see
+		all the missing things.  There are open tasks all over
+		the place: XML, Database access, enterprise services,
+		configuration, ASP.NET, Drawing APIs, and more.
+
+		* Since we have now ASP.NET running, we would like to 
+		create an ASP.NET application to maintain our class
+		library documentation.
+
+		We have some special needs (read them <a
+	 	href="classlib-doc.html">here</a>).     There is a
+		prototype written using Windows.Forms, but we believe
+		it will be faster to have this done using ASP.NET (and
+		it is also a nice way of stress testing it).
+
+		* Support for the VB runtime: we need contributions
+		to make our VB runtime mature enough to host
+		applications compiled with the VB.NET to run with
+		Mono.
+
+		* We need people to help write the documentation: you
+		can start editing our XML files by hand, and once we
+		have the ASP.NET tool, upgrade to that. 
+	</ul> 
+
+@item July 31st, 2002: Flow Analysis
+
+	Martin has checked into CVS the data flow analysis patch for
+	MCS, this means that we now correctly implement definite
+	assignment in the C# language.
+
+@item Jul 31st, 2002: Most ASP.NET controls render, Gtk# structs.
+
+	Gonzalo <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-August/001234.html">posted
+	an update</a> on the ASP.NET widgets that are still pending.  Patrik is back, and he is 
+	working with Gonzalo to streamline the pipeline
+
+	Rachel quietly commited to Gtk-Sharp support for marshaling
+	structures (very important for Gtk#).  This uses extensively
+	the new marshaling code that Dietmar added to the runtime.
+
+	Dietmar is also now sharing more code for P/Invoke using his
+	intermediate representation.  Another step to share more code, and 
+	simplify the porting and maintenance process. 
+
+@item Jul 27th, 2002: NGEN tool for Mono.
+
+	Zoltan <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-July/001117.html">announced</a>
+	the availability of his CIL to C compiler.  This allows your Mono assemblies to be pre-compiled
+	and optimized by GCC in your platform, increasing the speed significantly of your code. 
+
+@item Jul 26th, 2002: Mono 0.13 has been released.
+
+	<b>Mono 0.13 has been released!</b> (details <a
+	href="archive/mono-0.13">here</a>).  Get
+	your sources for the <a
+	href="archive/mono-0.13.tar.gz">runtime</a> and
+	<a href="archive/mcs-0.13.tar.gz">compiler and class libraries</a>.
+	<p>
+	Alp made Debian packages and they are <a
+	href="http://www.atoker.com/mono/">here</a>.  Cristophe made
+	packages for Red Hat and they are <a
+	href="http://mono.baselabs.org/software">here</a>.
+	And Windows packages have been <a href="http://www.superin.formativ.net/mono/mono.htm">contributed</a>
+
+@item Jul 23rd, 2002: Mono Verifier, System.Web.Services, ASP.NET samples.
+
+	Mono now has a verifier.  It is used by the runtime, or you can invoke it manually to 
+	verify an image by using the `pedump' tool.
+
+	Tim Coleman has started work on the System.Web.Services
+	assembly (you can also track the status here on the web page).
+	Contact him if you want to help in this assembly or with the
+	associated web service tools.  
+
+	Various samples for ASP.NET have landed in CVS. 
+
+@item Jul 20th, 2002: Spanish Mono Tutorial.
+
+	A spanish tutorial on using Mono is <a
+	href="http://mono.es.gnome.org/tutoriales/mono-linux/">here</a>.
+	Also the <a
+	href="http://mono.es.gnome.org/tutoriales/mono-puf/">FAQ</a>
+	has been translated as well.
+
+@item Jul 19th, 2002: File handle redirection, Embeddable Mono and Mono Linux compilation.
+
+	Dick's code for file handle redirection is complete and has
+	now landed on the CVS repository.
+
+	The Mono runtime can now be embedded into your application
+	(also known as "CLR hosting").  See the sample in
+	mono/samples/embed.  This allows your application to link with
+	the Mono runtime, then your C code can call into the C#/CIL
+	universe and back.
+
+	Peter Williams and Martin contributed some Makefiles to
+	compile all of Mono on Linux.  Details are <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-July/000916.html">here</a>.
+
+@item Jul 17th, 2002
+
+	The first documentary on Ximian's development team is now
+	available online, from young director <a
+	href="mailto:erik.pukinskis@uconn.edu">Erik Pukinskis</a>: <a
+	href="http://www.ximian.com/devzone/projects/codemonkey.html">"Code
+	Monkey At Work"</a>.
+
+	A Tutorial on getting Mono installed from sources is now <a
+	href="http://www.go-mono.com/mono-beginning/x70.html">online</a>.
+
+	More progress on the ASP.NET front: user defined controls are
+	now being rendered, as well as many of the sample programs
+	from www.asp.net.  Gonzalo's work can be found on module XSP
+	(this implements the .aspx compiler).
+
+	Sergey Chaban has got Gtk# working on Windows, you can see
+	some screenshots: <a href="sshots/Gtksharp-1.jpg">sample apps</a> and
+	<a href="sshots/Gtksharp-2.jpg">running with a russian charset</a>.
+
+@item Jul 16th, 2002
+
+	Paolo today got mono to complete host itself on Linux.  This
+	means that we can now compile the `corlib' using the Mono C#
+	compiler and the Mono runtime.
+
+	Compiling the corlib was rather tricky, because the types that
+	the compiler uses during the compilation process will come
+	from the source code it is compiling.  
+
+	After a few months of work, we have finally fleshed out all
+	the remaining bugs.  Now the next step is to update the makefiles
+	to compile with the Mono tool-chain.
+
+	A recapitulation:
+	<ul>
+		* The Mono C# compiler was able to compile itself on December 28th, 2001.
+		  The resulting image contained errors though.
+
+		* The Mono C# compiler was able to self-compile in on
+		  January 3rd, 2002.  Becoming a self-hosting compiler on Windows.
+
+		* The Mono runtime matured enough by March 12, 2002 that it
+		  was able to bootstrap the Mono C# compiler on Linux using our interpreter.
+		  This means that our development tool was self sufficient.
+
+		* On March 26th, the JIT engine was fixed, so we could use this to
+		  run the compiler on Linux.
+
+		* Martin fixed the remaining bugs in the compiler that stopped it from
+	 	  compiling the `corlib'.  The resuling image still contained errors though.
+
+		* On July 8th, Radek got the PowerPC port to bootstrap
+		  the C# compiler.  This is important, because it exposed
+	  	  various tricky issues in a big-endian system.
+
+		* Today: we can bootstrap the compiler using libraries
+		  and the compiler compiled with itself on Linux.  The process is complete.
+	</ul>
+
+	In the meantime, Dietmar has quietly implemented the remaining
+	pieces of Marshalling in the Mono runtime.   This is very
+	important for the Gtk# guys to move on with their bindings.
+
+	To make things more interesting, he replaced most of the
+	architecture specific code generation for trampolines
+	(delegates, invocations, function and p/invoke trampolines) to
+	use CIL.  This CIL is then compiled on the flight by the JIT
+	Compiler engine.  By doing this, we have reduced the burden to
+	port the JITer to new architectures, and that our trampoline
+	code is cross platform.
+
+@item Jul 9th, 2002
+
+	Ajay was the first to notice <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-July/000641.html">
+	Mono's first birthday</a>.
+
+	In a year, we have achieved plenty:
+	<ul>
+		* 94 contributors with CVS access (84 non-Ximian developers).
+		* A complete CLI implementation:
+		<ul>
+			<li> A fast and performing x86 JIT engine (inlining, constant propagation).
+			<li> An interpreter for other systems (PPC, Sparc, StrongArm).
+		</ul>
+		* A self-hosting C# compiler, which can compile its class libraries.
+		* 37,140 file changes in CVS.
+		* 92,000 lines of C code.
+		* 437,000 lines of C# code (compiler, classes, tests)
+		* A working core for ASP.NET and ADO.NET.
+		* Major subsystems are functional: RegularExpressions,
+		  System.XML, XML.Schema, System.Data, System.Web.
+		* The Gtk# project, which is maturing rapidly.
+	</ul>
+
+	Thanks to everyone who has made Mono possible with their
+	feedback, regression tests, their comments, their help on the mailing
+	list, code contributions, complete classes, bug reporting, the
+	countless hours of bug hunting.  This project would not have
+	been possible without every contribution.  
+
+	It has been a great year for everyone involved in the
+	project.  I think we have built a new and exciting community.
+
+	Now we have a solid foundation to build on, so this next year
+	looks even more exciting: not only because we will see more
+	Mono applications, but we will begin using Mono as an
+	`library' to be linked with applications that want to get
+	scripting-like features; Gtk# is our ticket to create nice
+	GNOME applications; And we will be developing CORBA bindings
+	to integrate with other object systems.
+
+	Also, for those interested in optimizations and tuning, this
+	year we will get to play with more advanced optimizations and
+	all kinds of interesting research ideas for improving Mono
+	code generation.
+
+	A special thanks to the Mono developers at Ximian for managing
+	to survive their manager and a special thanks to our
+	regression test marshal Nick Drochak, who has been hunting
+	down, and fixing code in our class libraries and keeping us on
+	track for so long.
+
+@item Jul 8th, 2002
+
+	Radek today fixed the last bugs to get Mono to self host on
+	Linux/PowerPC.
+
+	Alp Toker has released version 0.5 of <a
+	href="http://www.atoker.com/phonic/">Phonic</a>, a media
+	player for .NET. Phonic makes extensive use of Mono-developed
+	technologies such as Gtk# and csvorbis (Ogg player ported by
+	Mark). Hopefully we will be seeing many more exciting
+	applications like these in the near future.
+
+	Dietmar has been moving a lot of the architecture specific
+	code in the JIT engine to our internal representation.  This
+	means that porting the JIT is simpler now, as there is less
+	architecture-specific code to maintain.  The inliner, constant
+	folder and constant propagation are also done at the
+	architecture independent layer.
+
+	Gonzalo is now running the sample ASP.NET applications on
+	Linux with the Mono runtime.  It still needs polishing though,
+	and help with the various ASP.NET controls would be
+	appreciated.  The ASP.NET community seems more poor than the
+	PHP community, we need to have a few open source controls to
+	do things dynamic rendering (libart+gdk-pixbuf again can do
+	most of the work), charts and components like the kind of
+	thing you see in the PHP universe: to bring nice GPL code to
+	the masses of Windows developers, lure them into the world of
+	Linux.
+
+	Dick has also got us the new Process implementation that
+	implements the Win32 semantics.  Now only redirection is
+	missing.
+
+@item Jul 3rd, 2002
+
+	Listen to Paolo Molaro do a talk on Mono at the WebIT
+	conference in Padova, Italy this coming friday.  Details are
+	<a href="http://www.webbit2001.org/event/eventview/534/">here</a>
+
+	You can also see a trip report from the Gnome in the South trip:
+	<a href="http://primates.ximian.com/~miguel/sur.html">here</a>
+
+	Miguel will be doing a couple of talks at the O'Reilly
+	conference about Mono: status update, progress and developing
+	applications with it.  Details are <a
+	href="http://conferences.oreillynet.com/cs/os2002/view/e_sess/2994">here</a>
+	and <a
+	href="http://conferences.oreillynet.com/cs/os2002/view/e_sess/2996">here</a>
+
+@item Jun 30, 2002
+
+	Martin Baulig fixed the remaining bugs that prevented MCS to
+	compile our corlib.  The compilation was tricky because of the way
+	MCS bootstraps the compile (internally mcs uses the types that are
+	being defined at that point to perform compares).
+
+	Martin and Paolo have been working hard on fixing the
+	remaining issues.  Currently 102 test pass and 15 fail with
+	our resulting corlib.
+
+	Jesus' SoapFormatter classes are now in CVS.
+
+	I have been redoing the type lookup system for MCS.  The
+	interesting bit is that I did most of this work on an airplane
+	using MCS itself.  Which is a good test that the compiler is 
+	now a good development tool.
+
+	Duncan, Mike and Rachel have been hard at work with Gtk#, now
+	there are bindings for the GtkHTML widget (the one used by
+	Evolution's composer).  And Rachel also got the beginning of GNOME
+	bindings, that should simplify application development.
+
+	A big thanks goes to Dennis Hayes for getting the
+	Windows.Forms work together, and commiting so many stubs for Windows.Forms. 
+
+@item Jun 25, 2002
+
+	I am updating the Mono site from the Unesco offices in
+	Uruguay, the <a href="http://www.gnome.org/resources/calendar/roadshow/GNOMEenelSur.html">South-America trip</a>
+	to promote free software is going very well.
+
+	Many news in Mono-land this week so far:
+
+	Mike Kestner got bindings for GtkHTML last night for Gtk#,
+	this is using GtkHTML 2.0.  
+
+	On Monday Piers Haken <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-June/000380.html">contributed</a>
+	the core to support XPath in Mono: most of the w3c spec is
+	implemented (modulo a few pending bits).
+
+	Dick checked in his implementation of the Process classes:
+	process forking and waiting support committed, with some functions to
+	query status.  This was complex as we had to emulate the Win32
+	environment, but this is another step to be fully compatible.
+	This means for example that any process can check on the
+	status of any other process (without the parent/child relationship)
+
+	Of course, those interested
+	in only the Unix semantics can always P/Invoke the Unix calls.
+
+@item Jun 24, 2002
+
+
+        Duncan has written a few sample <a
+	href="http://primates.ximian.com/~duncan/Mono">Gtk# demo
+	applications</a> (<a
+	href="http://primates.ximian.com/~duncan/Mono/img/ImageViewer.png">screen
+	shot</a>, <a
+	href="http://primates.ximian.com/~duncan/Mono/img/ImageBrowser.png">another</a>)
+
+	Rachel also got the beginning of Gnome bindings (<a
+	href="http://primates.ximian.com/~tvgm/gnome-hello.png">screenshot</a>).
+	She also got some <a
+	href="http://primates.ximian.com/~tvgm/gtk-sharp-docs/">documentation</a>
+	up now.
+
+@item Jun 22, 2002
+
+	Mono's ASP.NET has rendered its first page on Linxu for the
+	first time (Gonzalo and Paolo).  
+
+	Also, we are getting close to
+	self hosting.  Paolo posted a <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-June/000345.html">list
+	of pending issues</a> which are now very small.
+
+	Steam is picking up in <a
+	href="http://gtk-sharp.sf.net">Gtk#</a> as the bindings become more
+	complete and small applications are starting to emerge.  Gtk#
+	now compiles completely on Linux.  This uses a lot of the XML
+	libraries, which is nice to see.
+
+@item Jun 20, 2002
+
+	Gonzalo has got the Mono ASP.NET implementation can now render all Html
+	Controls, and 21 out of the 26 Web Controls.  Session tracking is
+	next.  Look in xsp/test for a collection of tests that render with Mono.
+
+	Ajay has been very busy improving and extending the
+	XmlSerialization code.  All fields had to be re-ordered to
+	match the Microsoft implementation.
+
+@item Jun 19, 2002
+
+	You can now download a fresh tarball of the libraries and the MCS 
+	compiler daily from <a href="http://www.atoker.com/mono/">Alp Toker's
+	website</a>.
+      
+	New libgc RPMS for Redhat 7.3 are available on <a href="
+	http://java.thn.htu.se/~toor/">Richard Torkar's site</a>.
+
+@item Jun 10, 2002
+
+	Ajay <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-June/000128.html">announced</a>
+	today that the reading code for XmlSchemas is almost complete.
+
+@item Jun 7, 2002
+
+	<b>Mono 0.12 is out!</b> More classes!  More working code!
+	Better compiler!  Faster runtime!  Less bugs! 
+
+	You can get it <a
+	href="download.html#jun-7">Here</a> (quick links: <a
+	href="archive/mono-0.12.tar.gz">runtime</a> and <a
+	href="archive/mcs-0.12.tar.gz">compiler/classes</a>).
+
+@item Jun 3rd, 2002
+
+	CodeDOM implementation from Daniel Stodden has got C# output support.
+
+@item May 31, 2002
+
+	Gonzalo got the Mono XSP page parser to render its first ASP.NET
+	.aspx file today without using MS System.Web.Hosting classes.
+	It is currently on its infancy.  But very good news, now we need to 
+	upgrade our System.Web runtime to run natively on Linux.
+
+	Sergey's code for architecture and size-specific CPBLK has
+	been checked into CVS.
+
+	Paolo has checked the configuration code for Mono (to map
+	PInvoke dlls to other libraries).
+
+	<a href="ado-net.html">ADO support</a>: Daniel has checked in
+	a modified version of the MySQL data provider from Brad.  And Rodrigo
+	started the OleDB using LibGDA.
+
+@item May 27, 2002
+
+	An <a href="index.rss">RSS feed</a> is now available for the
+	Mono news.  I find it surprising that there are so many tools
+	that process this data.  
+
+	Binaries for <a href="http://www.superin.formativ.net/mono/mono.htm">Windows</a> are
+	now location independent, do not require Cygwin and come with a Wizard.
+
+@item May 26, 2002
+
+	Daniel Morgan checked in his Sql# Cli tool into the
+	System.Data class library.
+
+@item May 24, 2002
+
+	Ajay <a
+	href="http://lists.ximian.com/archives/public/mono-patches/2002-May/003953.html">has
+	checked in</a> a major update to the System.Xml.Schema namespace.
+
+	Gonzalo moved XSP along this week: Added support for
+	templates, columns inside DataGrid, HTML comments, code render
+	and data binding tags, style properties in style tags,
+	ListItem inside list controls, float and double properties.
+
+@item May 22, 2002
+
+	<a href="http://monologo.sourceforge.net/">MonoLogo</a> runs
+	on the Mono runtime.  This <a
+	href="http://monologo.sourceforge.net/gtk.png">screenshot</a> shows
+	MonoLogo running Gtk#.
+
+@item May 21, 2002
+
+	Martin has improved the debugging infrastructure in Mono, now
+	it is possible to get <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-May/005717.html">line
+	number</a> information on stack traces.
+
+@item May 20, 2002
+
+	XSP <a href="asp-net">our ASP.NET</a> .aspx page parser is now
+	available on the AnonCVS servers.  This is part of the ASP.NET
+	support in Mono.  Gonzalo is the developer on charge of it.
+
+	Many updates to the <a href="ado-net.html">ADO.NET
+	implementation</a> from Dan, Tim and Rodrigo.  
+
+	Radek got the Mono C# compiler running on Linux/PPC and
+	compiling most of our regression test suite.
+
+	Lawrence has been working really hard in fixing, improving and
+	polishing the underlying network infrastructure.
+
+	The Rafael and Chris have commited the beginning of the
+	VisualBasic.NET runtime support to CVS.
+
+	Jesus has contributed the beginning of the SoapFormatter
+
+@item May 9, 2002
+
+	Linear register allocator has been deployed in the Mono JIT
+	engine.  Read <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-May/005489.html">about
+	it</a>
+
+@item May 5, 2002
+
+	We are able to retrieve simple data from the database 
+	using our ADO.NET like functionality.  Only string and integer data
+	types are supported right now but more are in the works.
+	
+	You can find more information 
+	at <a href="http://www.go-mono.com/ado-net.html">The Mono ADO-NET Page</a>
+	
+	Thanks goes to Chris, Daniel, Duncan, Gonzalo, Miguel, Rodrigo, Tim, 
+	and others for these bits.
+
+@item May 4th, 2002
+
+	Rodrigo Moya announced <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-May/005366.html">new
+	LibGDA</a>: LibGDA is an ADO-like library for Unix systems.
+	This one removes all the CORBA and GConf dependencies, which
+	should make it easier to use and compile. 
+
+	This is another milestone for our <a
+	href="ado-net.html">ADO.NET implementation plans</a>
+
+	We have a little surprise for everyone tracking the news on tuesday ;-)
+
+@item May 2nd, 2002
+
+	Mark Crichton csvorbis port (C# port of Vorbis player) and
+	Richard Hestilow's <a href="http://monologo.sf.net">MonoLogo compiler</a> are now
+	on the CVS, and you can get them from AnonCVS.
+
+	Dick implemented inter-process sharing of handles as well as
+	simplifying the implementation of WaitForMultipleObjects, now
+	we have a `handles' subsystem in Mono.  This is needed to fully
+	emulate the handle behavior that Win32 exposes, and that the .NET API
+	expose to applications.
+
+	News from the <a
+	href="http://gtk-sharp.sourceforge.net">Gtk#</a> front: <a
+	href="http://gtk-sharp.sourceforge.net/menu.png">Menu
+	support</a>, Mike <a
+	href="http://lists.ximian.com/archives/public/gtk-sharp-list/2002-May/000064.html">tells
+	the story</a>	
+
+@item May 1st, 2002
+
+	Daily packages for <a href="http://www.debian.org">Debian</a> are available
+	<a href="http://www.atoker.com/mono/">here</a>
+
+@item Apr 26, 2002
+
+	Binary packages of Mono 0.11 are available for <a
+	href="http://www.superin.formativ.net/mono/mono.htm">Windows</a>
+	(Thanks to Johannes Roith) and for
+	<a
+	href="http://mono.baselabs.org/index.php/software/">Linux</a> (thanks
+	to BaseLabs).
+
+@item Apr 24, 2002
+
+	<b>Mono 0.11 is out!</b> Mostly performance improvements, bug
+	fixes and more classes are included.
+
+	A new version of the runtime, compiler and class libraries has
+	been packaged for your download pleasure.  Binaries are
+	included.  The <a href="archive/mono-0.11">Release Notes</a>
+	are available.
+
+	You can get it <a
+	href="download.html#apr-24">Here</a> (quick links: <a
+	href="archive/mono-0.11.tar.gz">runtime</a> and <a
+	href="archive/mcs-0.11.tar.gz">compiler/classes</a>).
+
+@item Apr 23, 2002
+
+	SharpDevelop 0.88a <a href="http://www.icsharpcode.net/OpenSource/SD">is out!</a>
+
+	Congratulations to the developers behind SharpDevelop for
+	their new release.
+
+@item Apr 20, 2002
+
+	Some updates from the hacking lines:
+
+	<b>The web:</b> Patrik Torstensson last week contributed the
+	http runtime support and started work on thread pools.  This
+	is part of the ASP.NET support.
+
+	<b>Docs:</b> John Barnette, John Sohn and Adam Treat have been
+	hacking on MonoDoc.
+
+	<b>ADO.NET:</b> Daniel Morgan and Rodrigo Moya have been
+	working on the <a href="ado-net">ADO.NET</a> support, and got
+	the first signs of life this week (we can connect, insert
+	rows; do transactions: commit/rollback; SQL errors and
+	exceptions work).  Check <a
+	href="mailing-lists.html">mono-patches</a> for all the
+	goodies.
+
+	<b>Optimizations:</b> A number of optimizations in the runtime
+	made the compiler twice as fast this week:
+
+	Early this week Patrik started the string
+	rewrite in the runtime.  Today Dietmar finished the
+	constructors and deployed the new layout. 
+
+	Paolo got the JIT engine to generate profiles, which were in
+	turn used to find hot spots in Reflection, which he improved.
+
+	Daniel Lewis (of Regex fame) noticed the performance issues
+	with our current array layout, and contributed a new array
+	representation.
+
+	At the same time Dietmar started the the JIT inline code and
+	implemented constant propagation.  These two optimizations
+	together are very powerful.
+
+	<b>Bug fixing:</b> And of course everyone has been helping out
+	with the bug fixing (Duncan, Gonzalo, Jonathan, Miguel, Nick,
+	Ravi, Sergey)
+
+
+@item Apr 18, 2002
+
+	Dietmar's inlining for the JIT engine just landed into
+	CVS. This is only a first cut and more improvements will come later.
+
+	Patrik, Paolo, Dietmar and Gonzalo have been busy optimizing
+	our class libraries and runtime engine to become faster. Many changes
+	on CVS as well.
+
+@item Apr 11, 2002
+
+	Gtk# 0.1 "ButtonHook" has been <a
+	href="http://lists.ximian.com/archives/public/gtk-sharp-list/2002-April/000048.html">released</a>
+
+	Binaries for the Mono Regression Test Suite are <a
+	href="archive/mono-tests.tar.gz">available</a> for
+	people porting the Mono Runtime to new platforms.
+
+@item Apr 6, 2002
+
+	<a href="http://www.dotnetremoting.cc/book/AdvancedDotNetRemoting.asp">
+	Advanced .NET Remoting</a> from Ingo Rammer is now available. Ingo
+	helped us to implement the proxy support and the book is a valuable
+	resource for anyone interested in remoting.
+
+@item Apr 5, 2002
+
+	Transparent proxy support has been finished, congrats to
+	Dietmar.  Our JIT engine on CVS contains the implementation.
+	This should enable people to test the remoting framework on
+	Mono.
+
+@item Mar 28, 2002
+
+        Debugging information is now generated by the compiler thanks
+        to Martin's work.  The resulting dwarf file can be used to
+        single step C# code in GDB.  A document will be shortly published with
+        the details.
+
+@item Mar 27, 2002
+
+	<b>Mono 0.10 is out!</b> The self hosting release of Mono has
+	been released.
+
+	A new version of the runtime, compiler and class libraries has
+	been packaged for your download pleasure.  Binaries are
+	included.  The <a href="archive/mono-0.10">Release Notes</a>
+	are available.
+
+	You can get it <a
+	href="download.html#mar-27">Here</a> (quick links: <a
+	href="archive/mono-0.10.tar.gz">runtime</a> and <a
+	href="archive/mcs-0.10.tar.gz">compiler/classes</a>).
+
+@item Mar 26, 2002
+
+	Paolo finally fixed the last bug in the JITer that stopped
+	us from using it to run the Mono C# compiler.  Goodies are on
+	CVS.
+
+	<a href="http://gtk-sharp.sourceforge.net">Gtk#</a> runs <a
+	href="http://gtk-sharp.sourceforge.net/gtk-hello-world.png">Hello
+	World</a>.  Mike posted some <a
+	href="http://lists.ximian.com/archives/public/gtk-sharp-list/2002-March/000034.html">details.</a>
+
+
+@item Mar 19, 2002
+
+	Martin has been working on our debugging infrastructure, both
+	on the JIT side of things (adding dward support) as well as on
+	the class libraries (so that MCS can start generating
+	debugging information).
+	
+	Jason and Kral keep working on the System.Xml namespace,
+	allowing Mike to move more to self-hosting his Gtk# code.  
+
+	The System.Web classes are now part of the build (and they are
+	also part of the class status now).  Ajay contributed a large
+	chunk of code to the System.Xml.Schema namespace
+
+	Dan (of regex fame) has been working on internal calls
+	support: moving more code from the old monowrapper to become
+	internal calls.
+
+	Paolo and Dietmar are working steadily on our runtime
+	environment, fixing bugs, adding missing features and allowing
+	us to run the compiler on Linux.
+
+	Remember to post your bug reports.
+
+	The nice class status on the right is brought to you by
+	endless hacking hours from Piers and Nick.  These status
+	report pages have been helping us track down various mistakes
+	in our classes (very useful, check it out for yourself)
+
+@item Mar 12, 2002
+
+        At midnight, in Italy, Paolo got the Mono C# compiler to self
+        host on Linux, the last bug has been squashed to self
+        hostingness.  We have now a fully self hosting compiler in Linux.
+
+        A release will follow up shortly.
+
+@item Mar 9, 2002
+
+	Updated the <a href="class-status.html">class status</a>, now
+	it is possible to use the right-side menu to browse a specific
+	assembly.
+
+@item Mar 7, 2002
+
+	MCS compiles on Linux!   
+
+	Today Paolo got the <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-March/003726.html">MCS
+	compiler compiling itself on Linux</a>
+	completely for the first time!  The resulting image still contains
+	some errors, but the whole compiler process goes now.  Later in the day
+	and a couple of small optimizations and bug fixes, the compile
+	speed was improved in 400%
+
+	We are very close to have a complete self hosting environment now.
+
+	Mono is temporarly using the Bohem GC garbage collector while
+	we deploy the more advanced ORP one. 
+
+@item Mar 5, 2002
+
+	The CVS repository <a href="http://cvs.hispalinux.es/cgi-bin/cvsweb/?hidenonreadable=1&f=u&logsort=date&sortby=file&hideattic=1&cvsroot=Mono">can be browsed</a>
+
+	Jason has got an incredible amount of work on the Xml
+	classes during the weekend, and Gaurav is very close to have
+	the complete System.Web.UI.WebControls namespace implemented.   
+
+	Martin and Duco have been killing bugs by using the recently
+	revamped regression test suite.
+
+	Piers has updated our <a href="class-status.html">class
+	status</a> page again, with even more information available.
+
+	The C# compiler has full constant folding implemented now and Ravi
+	killed bugs of bugs in the <a href="http://bugzilla.ximian.com/buglist.cgi?product=Mono%2FClass+Libraries&product=Mono%2FMCS&product=Mono%2FRuntime&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&changedin=&chfieldfrom=&chfieldto=Now&chfieldvalue=&short_desc=&short_desc_type=substring&long_desc=&long_desc_type=substring&bug_file_loc=&bug_file_loc_type=substring&keywords=&keywords_type=anywords&op_sys_details=&op_sys_details_type=substring&version_details=&version_details_type=substring&cmdtype=doit&order=%27Importance%27&form_name=query">Mono Bug List</a>
+
+@item Mar 1, 2002
+
+	RPMs of Mono 0.9 are available at <a href="http://mono.baselabs.org/#download">mono.baselabs.com</a>
+
+@item Feb 28, 2002
+
+	<a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-February/003464.html">Christophe</a>
+	has setup his <a href="http://mono.baselabs.org">First Steps in Mono</a> web site, which 
+	shows you a step-by-step process on getting Mono running on your system.
+
+	RPMs of Mono 0.9 are available at <a href="http://mono.baselabs.org/index.php/software/">mono.baselabs.org</a>
+
+@item Feb 27, 2002
+
+	New <a href="class-status.html">class status</a> engine that
+	provides detailed information about missing functionality in
+	our class libraries.  Nick built the cormissing tool and Piers
+	did the XSLT and DHTML magic.
+
+	More compiler progress on Linux: our support runtime now
+	enables the compiler to compile `MIS' on Linux (MIS being
+	Dick's Mono sample HTTP server ;-)
+
+@item Feb 26, 2002
 
 	Paolo posted a list of <a
 	href="http://lists.ximian.com/archives/public/mono-list/2002-February/003266.html">ways
@@ -77,17 +937,17 @@
 	<a href="http://lists.ximian.com/archives/public/mono-list/2002-February/003268.html">his</a>
 	suggestions.
 
-** Feb 25, 2002
+@item Feb 25, 2002
 
 	StrongARM port from Sergey Chaban has been checked into CVS.  
 
-** Feb 24, 2002
+@item Feb 24, 2002
 
 	SPARC: 44 out of 74 tests pass now (Jeff)
 
 	Power PC: delegates are working now (Radek)
 
-** Feb 22, 2002
+@item Feb 22, 2002
 
 	<b>Mono 0.9 has been released!</b>
 
@@ -100,14 +960,14 @@
 	href="archive/mono-0.9.tar.gz">runtime</a> and <a
 	href="archive/mcs-0.9.tar.gz">compiler/classes</a>).
 
-** Feb 21, 2002
+@item Feb 21, 2002
 
 	Paolo got our compiler natively to compile 117 of our tests.
 	Self hosting is closer every day.
 
 	Unsafe support is finished in the C# compiler.
 
-** Feb 20, 2002
+@item Feb 20, 2002
 
 	Gaurav got DataGrid and DataGridItemCollection done.
 
@@ -122,11 +982,11 @@
 	use anoncvs.go-mono.com as the hostname for your CVSROOT and
 	you will get one of the machines.
 
-** Feb 19, 2002
+@item Feb 19, 2002
 
 	Do you want to see what <a href="http://people.debian.org/~lupus/mono/">Mono Looks Like?</a>
 
-** Feb 18, 2002
+@item Feb 18, 2002
 
 	Application Domains now support the two LoaderOptimization
 	modes: share code or do not share code, and you can control
@@ -137,7 +997,7 @@
 
 	PowerPC and SPARC ports are moving along (Radek and Jeff)
 
-** Feb 13, 2002
+@item Feb 13, 2002
 
 	Excellent news since the 11th, here is a quick rundown:
 
@@ -150,7 +1010,7 @@
 	Miguel is off to the <a
 	href="http://www.fosdem.org">FOSDEM</a> conference in Brussels.
 
-** Feb 11, 2002
+@item Feb 11, 2002
 
 	<b>Mono 0.8 has been released!</b>
 
@@ -162,7 +1022,7 @@
 	href="archive/mono-0.8.tar.gz">runtime</a> and <a
 	href="archive/mcs-0.8.tar.gz">compiler/classes</a>)
 
-** Feb 11, 2002
+@item Feb 11, 2002
 
 	We would like to welcome all the new developers that have
 	joined the project in the last couple of days.  The classes
@@ -191,19 +1051,19 @@
 	href="http://lists.ximian.com/archives/public/mono-list/2002-February/002944.html">
 	posted a list of pending tasks</a> to enable the compiler to run on Linux
 
-** Feb 10, 2002
+@item Feb 10, 2002
 
 	Mike Kestner has posted an <a
 	href="http://lists.ximian.com/archives/public/gtk-sharp-list/2002-February/000024.html">Update
 	on his Gtk#</a> activities.
 
-** Feb 4, 2002
+@item Feb 4, 2002
 
 	Adam has done <a
 	href="http://lists.ximian.com/archives/public/mono-list/2002-February/002808.html">Qt
 	bindings</a> for .NET.  Adam is cool.
 
-** Jan 29, 2002
+@item Jan 29, 2002
 
 	Dan Lewis has contributed a major missing set of classes to
 	Mono: <a
@@ -215,7 +1075,7 @@
 	was not entirely trivial (supporting Unicode, plus a regex engine which is a super
 	set of the Perl regex engine). 
 
-** Jan 28, 2002
+@item Jan 28, 2002
 
 	The Mono contributors have relicensed the Class Libraries under
 	the terms of the
@@ -237,7 +1097,7 @@
 	<a href="http://www.infoworld.com/articles/hn/xml/02/01/28/020128hnopennet.xml">InfoWorld</a>, 
 	<a href="http://www.newsforge.com/article.pl?sid=02/01/27/2232231">NewsForge</a>.
 
-** Jan 23, 2002
+@item Jan 23, 2002
 
 	New mailing list: <a href="mailto:mono-patches-request@ximian.com">mono-patches@ximian.com</a>.
 	This mailing list will receive automatically the patches that are submitted
@@ -247,7 +1107,7 @@
 	code submitted to CVS to receive patches on e-mail.  It should also
 	expose to everyone the changes that are being done by the team every day.
 
-** Jan 21, 2002
+@item Jan 21, 2002
 
 	Dick has got a simple web server running with Mono (`MIS: Mono
 	Internet Server') that is mostly used to test our IO layer, a
@@ -262,7 +1122,7 @@
 	reports, fixing all known bugs, and finally profiling of the compiler
 	has begun.
 
-** Jan 8, 2002
+@item Jan 8, 2002
 
 	Our compiler has been self-supporting since January 3rd.  In
 	the meantime, we have been busy working on making it run on
@@ -270,7 +1130,7 @@
 	the compiler compiled `console.cs' (a sample Mono program) on
 	Linux.
 
-** Jan 4, 2002
+@item Jan 4, 2002
 
 	Dietmar landed the Unicode support patch.  Class libraries and
 	runtimes are now fully Unicode aware.  The details are <a href=
@@ -281,7 +1141,7 @@
 	compile fib.cs, patches are comming tomorrow once we have
 	ChangeLog entries.   
 
-** Jan 4, 2002
+@item Jan 4, 2002
 
 	Mike Kestner posted an update on Gtk# <a
 	href="http://lists.ximian.com/archives/public/gtk-sharp-list/2002-January/000021.html"><i>New
@@ -290,7 +1150,7 @@
 	Gtk# will be our foundation on which we will be implementing
 	System.Windows.Forms.  
 
-** Jan 3, 2002
+@item Jan 3, 2002
 
 	Mono C# compiler becomes self-sufficient.  We can now continue
 	development of the compiler with itself.  
@@ -303,7 +1163,7 @@
 	href="snapshots">snapshot</a> or getting your sources from our
 	<a href="anoncvs.html">Anonymous CVS server</a>.
 
-** Dec 28, 2001
+@item Dec 28, 2001
 
 	After a lot of work, the C# compiler can compile itself.
 	There are still errors in the generated image, but they are
@@ -311,7 +1171,7 @@
 
 	We will soon have the first non-Microsoft C# implementation!
 
-** Dec 18, 2001
+@item Dec 18, 2001
 
 	JIT: More work on our IO abstraction layer (Dick). 
 
@@ -324,7 +1184,7 @@
 	the outstanding issues.  More bug fixing allows it to compile
 	more programs.
 
-** Dec 14, 2001
+@item Dec 14, 2001
 
 	Dietmar has improved the register allocation and now Mono performs
 	two to three times as fast as it did yesterday.  Amazing.
@@ -332,7 +1192,7 @@
 	The compiler keeps moving along, explicit interface
 	implementation is there.
 
-** Dec 11, 2001
+@item Dec 11, 2001
 
 	The JIT engine can now run all the compiler regression tests as 
 	well as assorted other programs, many more opcodes added
@@ -352,13 +1212,13 @@
 	libraries, it is easy to find spots now since Nick got the
 	`make test' going.
 
-** Dec 1, 2001
+@item Dec 1, 2001
 
 	AnonCVS access to Mono is here (updated every hour).  Thanks
 	to <a href="http://www.hispalinux.es">HispaLinux</a> and Jesus
 	Climent for helping to set this up.
 
-** Nov 30, 2001
+@item Nov 30, 2001
 
 	All tests from the mono runtime work with the JIT engine now
 	(Dietmar).
@@ -368,7 +1228,7 @@
 
 	More work on the Web classes (Gaurav).
 
-** Nov 28, 2001
+@item Nov 28, 2001
 
 	JIT land: Paolo got GDB support into the JIT engine while
 	Dietmar added exceptions support to it.
@@ -381,7 +1241,7 @@
 
 	Dick has almost completed the Mono IO layer.
 
-** Nov 16, 2001
+@item Nov 16, 2001
 
 <blockquote>
 	Mike Kestner has posted an <a
@@ -389,7 +1249,7 @@
 	on Gtk# development.
 </blockquote>
 
-** Nov 14, 2001
+@item Nov 14, 2001
 
 <blockquote>
 	Paolo today got the Mono C# compiler running <a
@@ -424,7 +1284,7 @@
 	replace our interpreter in production.
 </blockquote>
 
-** Nov 12, 2001
+@item Nov 12, 2001
 
 <blockquote>
 	Dietmar got value types working on the JIT engine.  Sean has
@@ -435,7 +1295,7 @@
 	Nick keeps working on improving our class libraries. 
 </blockquote>
 
-** Nov 8, 2001
+@item Nov 8, 2001
 
 <blockquote>
 	Enumerations, array access and attributes for the C# compiler are into the CVS now.
@@ -443,14 +1303,14 @@
 	Full array support is not complete, but moving along.
 </blockquote>
 
-** Nov 5, 2001
+@item Nov 5, 2001
 
 <blockquote>
 	Dietmar's new set of patches to the JIT have 20 out of 33
 	tests running now.
 </blockquote>
 
-** Nov 4, 2001
+@item Nov 4, 2001
 
 <blockquote>
 	Mike Kestner, main Gtk# contributor has posted a very interesting <a
@@ -469,7 +1329,7 @@
 	important piece of the puzzle.
 </blockquote>
 
-** Nov 3, 2001
+@item Nov 3, 2001
 
 <blockquote>
 	Many clean ups have been going into the class library by Nick Drochak. 
@@ -481,7 +1341,7 @@
 	new controls plus improved and bug fixed base classes).
 </blockquote>
 
-** Nov 1, 2001
+@item Nov 1, 2001
 
 <blockquote>
 	Ravi commited the caller-side method selection of methods with
@@ -489,7 +1349,7 @@
 	the array handling support. 
 </blockquote>
 
-** Oct 27, 2001
+@item Oct 27, 2001
 
 <blockquote>
 	Lots of classes for System.Web from Gaurav were commited this
@@ -522,7 +1382,7 @@
 	.defs files to quickly wrap the API.
 </blockquote>
 
-** Oct 18, 2001
+@item Oct 18, 2001
 
 <blockquote>
 	Reworking expressions to support cleanly indexers and
@@ -534,14 +1394,14 @@
 	recent C# compiler progress.
 </blockquote>
 
-** Oct 17, 2001
+@item Oct 17, 2001
 
 <blockquote>
 	Delegate support has been checked into the compiler
 	(definition and invocation); break/continue implemented.
 </blockquote>
 
-** Oct 15, 2001
+@item Oct 15, 2001
 
 <blockquote>
 	JIT engine supports many of the object constructs now (object
@@ -556,7 +1416,7 @@
 	classes.
 </blockquote>
 
-** Oct 5, 2001
+@item Oct 5, 2001
 
 <blockquote>
 	Sergey has released his first version of the <b>ilasm</b>
@@ -569,7 +1429,7 @@
 	eventually.
 </blockquote>
 
-** Oct 4, 2001
+@item Oct 4, 2001
 
 <blockquote>
 	Our System.Reflection.Emit implementation created its first
@@ -582,7 +1442,7 @@
 	basically focusing on completeness now.  
 </blockquote>
 
-** Sep 28, 2001
+@item Sep 28, 2001
 
 <blockquote>
 	<a
@@ -590,7 +1450,7 @@
 	Develop 0.80</a> was released today.
 </blockquote>
 
-** Sep 26, 2001
+@item Sep 26, 2001
 
 <blockquote>
 	More progress: more opcodes are working (Paolo); The compiler
@@ -602,7 +1462,7 @@
 	handled correctly (Miguel).
 </blockquote>
 
-** Sep 21, 2001
+@item Sep 21, 2001
 
 <blockquote>
 	A couple of news-worthy items: Dick got the initial thread
@@ -612,14 +1472,14 @@
 	got i++ working.   All in tonight's snapshot
 </blockquote>
 
-** Sep 19, 2001
+@item Sep 19, 2001
 
 <blockquote>
 	Paolo has written a section on <a href="porting.html">Porting
 	Mono</a> to othre architectures.
 </blockquote>
 
-** Sep 18, 2001
+@item Sep 18, 2001
 
 <blockquote>
 	<A a href="download.html#sep-18">Mono 0.7</a> has been
@@ -628,7 +1488,7 @@
 	0.7 announcement</a> for details
 </blockquote>
 
-** Sep 17, 2001
+@item Sep 17, 2001
 
 <blockquote>
 	Mike Kestner's Gtk# (Gtk-sharp) was checked into the CVS
@@ -639,7 +1499,7 @@
 	Gtk-sharp should be available on the next snapshot set.
 </blockquote>
 
-** Sep 10, 2001
+@item Sep 10, 2001
 
 <blockquote>
 	Dietmar checked in his CIL tree/forest regeneration and most
@@ -647,7 +1507,7 @@
 </blockquote>
 
 
-** Sep 5, 2001
+@item Sep 5, 2001
 
 <blockquote>
 	The MCS compiler <b>can compile the sample Hello World</b>
@@ -657,14 +1517,14 @@
 	August 28)
 </blockquote>
 
-** Sep 4, 2001
+@item Sep 4, 2001
 
 <blockquote>
 	Dietmar checked into CVS the `monoburg' architecture
 	independent instruction selector for the JIT engine.
 </blockquote>
 
-** Aug 28, 2001
+@item Aug 28, 2001
 
 <blockquote>
 	<b>.NET Hello World is working under Mono!</b>  The latest snapshots
@@ -676,7 +1536,7 @@
 	Good work Mono team!
 </blockquote>
 
-** Aug 23, 2001
+@item Aug 23, 2001
 
 <blockquote>
 	Lloyd Dupont has announced his OpenGL bindings for C#, they
@@ -684,7 +1544,7 @@
 	href="http://csgl.sourceforge.net">http://csgl.sourceforge.net</a>
 </blockquote>
 
-** Aug 22, 2001
+@item Aug 22, 2001
 
 <blockquote>
 	New version of the Mono Runtime, Compiler and Classes has been
@@ -693,7 +1553,7 @@
 	href="archive/mono-0.6">0.6 announcement</a>.
 </blockquote>
 	
-** Aug 20, 2001
+@item Aug 20, 2001
 
 <blockquote>
 	A new <a href="contributing.html#compile-service">Compilation
@@ -702,14 +1562,14 @@
 	href="http://msdn.microsoft.com/downloads/default.asp?url=/downloads/sample.asp?url=/msdn-files/027/000/976/msdncompositedoc.xml&frame=true">.NET SDK</a>
 </blockquote>
 
-** Aug 3, 2001
+@item Aug 3, 2001
 
 <blockquote>
 	Daily snapshots of mcs and mono are now available, they will
 	run every night at 10pm Boston time.  
 </blockquote>
 
-** Jul 29, 2001
+@item Jul 29, 2001
 
 <blockquote>
 	Mono Runtime 0.5 has been <a
@@ -717,7 +1577,7 @@
 	href="archive/mono-0.5">release notes</a>
 </blockquote>
 
-** Jul 25, 2001
+@item Jul 25, 2001
 
 <blockquote>
 	The slides for <A href="Presentations/O-Reilly">my
@@ -725,7 +1585,7 @@
 	Open Source Software Convention</a>
 </blockquote>
 
-** Jul 22, 2001
+@item Jul 22, 2001
 
 <blockquote>
 	Another release of the class libraries is out, check the <a
@@ -734,7 +1594,7 @@
 	href="download.html#july-22">here</a>
 </blockquote>
 
-** Jul 19, 2001
+@item Jul 19, 2001
 
 <blockquote>
 	Another release of the class libraries is out, check the <a
@@ -743,7 +1603,7 @@
 	href="download.html#july-19">here</a>
 </blockquote>
 	
-** Jul 17, 2001
+@item Jul 17, 2001
 
 <blockquote>
 	Another release of the class libraries is out, check the <a
@@ -753,12 +1613,12 @@
 
 	Do not forget to check out the updated <a href="faq.html">FAQ</a>.
 
-	Got Sean's new <a href="class-status/index.html">Class
-	Status</a> web pages up.  These are a lot better than mine, and
+	Got Sean's new Class
+	Status web pages up.  These are a lot better than mine, and
 	we are now keeping better track of contributors.
 </blockquote>
 
-** Jul 15, 2001
+@item Jul 15, 2001
 
 <blockquote>
 	Another release of Mono is out, check the <a
@@ -766,7 +1626,7 @@
 	href="download.html#july-15">here</a>.
 </blockquote>
 
-** Jul 14, 2001
+@item Jul 14, 2001
 
 <blockquote>
 	A <a
@@ -775,7 +1635,7 @@
 	runtime, compiler and classes has been made.  Get it <a href="download.html#july-14">here</a>
 </blockquote>
 
-** Jul 12, 2001
+@item Jul 12, 2001
 
 <blockquote>
 	I keep getting questions about my opinion on Passport, even when
@@ -783,13 +1643,13 @@
 	href="passport.html">wrote something.</a>
 </blockquote>
 
-** Jul 9, 2001
+@item Jul 9, 2001
 
 <blockquote>
 	Project launched.
 </blockquote>
 
-** O'Reilly
+@item O'Reilly
 
 <blockquote>
 	Brian posted a story on <a
diff --git a/doc/java b/doc/java
new file mode 100755
index 00000000000..cf1afa1a39e
--- /dev/null
+++ b/doc/java
@@ -0,0 +1,62 @@
+* Java
+
+	It would be interesting to support the Java language as part
+	of the Mono project.  
+
+	You have to think of Java as various pieces: Java the
+	language and Java the virtual machine.  
+
+	It is possible to compile Java to .NET, as shown by the
+	Microsoft J# compiler.   We could then allow the migration of
+	Java applications to the Mono runtime. 
+
+** Native compiler
+
+	Although a native compiler can be built, and probably should be
+	built using an existing compiler, a short term solution is to 
+	build a translator from Java class files to the ECMA CIL images.
+
+	This has the advantage that we can use an existing and tested
+	Java compiler to generate the code, and then we can use an automated
+	code compiler that compiles Java VM bytecodes to CIL bytecodes.
+
+** The translator.
+
+	It would be interesting to write a semantic translator that
+	converts java byte codes into CIL opcodes.  This is possible
+	because the Java byte codes are a subset of the CIL ones.
+
+	A semantic tree needs to be constructed (very much in the
+	spirit of what is done in mono_analize_stack in
+	<tt>mono/mono/jit/jit.c</tt>.  Once such a semantic tree is
+	constructed, we could generate the equivalent Java code.
+
+	This has a number of interesting side effects: people can
+	continue to use their existing Java compilers to compile their
+	code, and a simple tool that converts their .class files into
+	a .NET assembly can be used.
+
+** Libraries
+
+	We could translate the GNU Classpath libraries with the above
+	tools to provide the Java runtime required to host into the
+	Mono runtime.  Some special treatment would be required for
+	core data types like integers, arrays and strings, and of
+	course reuse where possible existing classes from .NET to make
+	them compatible.
+
+** JILC - Java to IL Compiler
+
+	This is an attempt to make the java bytecode available for the
+	.NET environment.
+
+	The project attempts to generate the IL code / bytecode from the
+	compiled java class files. It has reached the stage of code-generation.
+	The issues that needs to be addressed is the mapping of java objects
+	to the IL objects, eg: java.lang.String to System.String.
+
+	Gaurav Vaish and Abhaya Agarwal are currently leading this project.
+	The project is currently hosted at <a href="http://sourceforge.net/projects/jilc">SourceForge.Net</a>.
+	The official home page of the project is 
+	<a href="http://jilc.sourceforge.net">http://jilc.sourceforge.net</a>.
+
diff --git a/doc/jit-debug b/doc/jit-debug
new file mode 100644
index 00000000000..71c4db74420
--- /dev/null
+++ b/doc/jit-debug
@@ -0,0 +1,184 @@
+* How to debug your C# application with the JIT engine 
+
+	To debug a C# application you need to run the JIT in your debugger.
+
+	Before you can do anything useful in a debugger, you need a symbol
+	file which tells your debugger about functions, types, line numbers
+	and such. Unfortunately, this symbol file needs to be recreated each
+	time the JIT compiles a new method since it doesn't know anything
+	about this method (especially not its memory address) before actually
+	compiling it.
+
+	You have two ways of creating a symbol file:
+
+** Letting the JIT dynamically create the symbol file
+
+	This'll give you a symbol file which is suitable for debugging IL byte
+	code - you won't see your C# source code.
+
+	However, this method has the advantage that it works with every assembly,
+	no matter whether it has been compiled with Mono's C# compiler (MCS) or
+	with any other compiler. It's currently the only way to debug
+	<tt>corlib.dll</tt> or any other library which cannot be compiled with
+	our compiler yet.
+
+	All that you need is a dump of the IL bytecode for each assembly (including
+	all assemblies this assembly is referencing). This is done by using the
+	<tt>monodis</tt> utility:
+
+	<pre>
+	monodis /home/export/martin/MONO-LINUX/lib/corlib.dll > corlib.il<br>
+	monodis /home/export/martin/MONO-LINUX/lib/System.dll > System.il<br>
+	monodis /home/export/martin/MONO-LINUX/bin/mcs.exe > mcs.il
+	</pre>
+
+	This is normally done automatically, but you can also disable
+	it and create them by hand.  See the <tt>mono</tt> manual page
+	for details.
+
+	Make sure that all the .il files have the same name as their corresponding
+	assembly and that they're all created in the current directory.
+
+	The JIT supports two different debugging file formats:
+
+	<ul>
+	* STABS: This is a very simple debugging format, but it may be the only one
+	which is supported on your system. It is limited to source files of no more
+	than 65.535 lines and it's type support is also very limited. You should only
+	use this if your debugger doesn't support DWARF 2.
+
+	To generate STABS output, use the <tt>--debug=stabs</tt> command line argument.
+
+
+	* DWARF 2: The DWARF 2 debugging format is a very powerful debugging format
+	which can handle source files of arbitrary size and has a highly sophisticated
+	type support. It's the recommended format unless you need to use STABS because
+	your debugger doesn't support DWARF 2.
+
+	To generate DWARF 2 output, use the <tt>--debug=dwarf</tt> command line argument.
+	</ul>
+
+	You need to regenerate the symbol file each time the JIT compiled a new
+	method and each time you restart the JIT. You cannot reuse your symbol file
+	if you start the JIT a second file, not even if you're running the same
+	application with the same input data a second time.
+
+	Regenerating the symbol file is done by calling the JIT's
+	<tt>mono_debug_make_symbols ()</tt> function from within your debugger and
+	then reloading the symbol files. This function creates a <tt>filename-dwarf.s</tt>
+	(or <tt>filename-stabs.s</tt>) assembler input file in the current directory and
+	an object file in <tt>/tmp/filename.o</tt> - you need to tell your debugger to
+	add this object file as symbol file.
+
+	If you're using the GNU debugger, this is done like this:
+
+	<pre>
+	call mono_debug_make_symbols ()
+	add-symbol-file /tmp/corlib.o
+	add-symbol-file /tmp/mcs.o
+	add-symbol-file /tmp/Mono.CSharp.Debugger.o
+	</pre>
+
+	You can also write a GDB macro like this:
+
+	<pre>
+	define reload
+	  call mono_debug_make_symbols ()
+	  add-symbol-file /tmp/corlib.o
+	  add-symbol-file /tmp/mcs.o
+	  add-symbol-file /tmp/Mono.CSharp.Debugger.o
+	end
+	</pre>
+
+	Then you can just say <tt>reload</tt> to have GDB recreate the symbol file.
+
+	There's also an <a href="jit-debug-sample.html">example debugging session</a> using
+	the GNU debugger.
+
+** Using a symbol file which have been created by the Mono C# compiler
+
+	If you compiled your application with Mono's C# compiler (MCS), you can tell it to
+	create a symbol file which is then processed and rewritten by the JIT engine.
+
+	To do this, you must give MCS the <tt>-g</tt> option:
+
+	<pre>
+	$ mcs -g Foo.cs
+	</pre>
+
+	This creates a <tt>Foo-debug.s</tt> assembler input file.
+
+	To use this in the JIT, you must first copy it to the target machine (the machine
+	where you want to run the JIT to debug your application) and run it through the
+	assembler to produce an object file <tt>Foo-debug.o</tt>. This object file must be
+	in the current directory.
+
+	Then start the JIT in your debugger and give it the <tt>--debug=dwarf-plus</tt> command
+	line argument.
+
+	Each time you call <tt>mono_debug_make_symbols ()</tt> from withing your debugger,
+	the JIT will read this <tt>Foo-debug.o</tt>, fix some machine dependent things like
+	memory addresses etc. in it and write it back to disk.
+
+	If you're using the GNU debugger, you'll want to use a macro like this:
+
+	<pre>
+	define relocate
+	  call mono_debug_make_symbols ()
+	  add-symbol-file /tmp/corlib.o
+	  add-symbol-file mcs-debug.o
+	  add-symbol-file Mono.CSharp.Debugger-debug.o
+	end
+	</pre>
+
+	If there is no <tt>assembly-debug.o</tt> file, but an <tt>assembly.il</tt> one, the
+	JIT will fall back to normal DWARF 2 (in the example above, <tt>corlib.dll</tt> was
+	compiled with Microsoft's compiler and the JIT is thus using DWARF to debug it).
+
+	This debugging method only works if you compiled your assembly with MCS, but it'll
+	allow you to actually debug your C# source code :-)
+
+	Here's an <a href="jit-debug-sample2.html">example debugging session</a> using
+	the GNU debugger.
+
+** Breakpoints and single stepping
+
+	The JIT has a <tt>--break</tt> command line argument to insert a breakpoint at the
+	beginning of this method. It takes a <tt>Namespace.Class:Method</tt> argument which
+	is the method. This argument can be given multiple times.
+
+	However, once your application is stopped in GDB you may want to insert a breakpoint
+	the next time the JIT compiles a method. There's a global variable
+	<tt>mono_debug_insert_breakpoint</tt> which you can modify in your debugger.
+
+	If this variable is set to a non-zero value, the JIT's <tt>arch_compile_method</tt>
+	will insert a breakpoint the next time it is called, ie. at the top of the next
+	method it compiles. If this value has a positive value, it acts as a counter and is
+	decremented after inserting the breakpoint - setting it to a negative value will let
+	the JIT insert the breakpoint each time it compiles a new method.
+
+	There's also global variable <tt>mono_debug_last_breakpoint_address</tt> which always
+	contains the address of the last inserted breakpoint. You may manually override this
+	address with a <tt>nop</tt> instruction to delete the breakpoint.
+
+	For instance, I have a GDB macro called <tt>enter</tt> which I use to enter a method
+	rather than stepping over it:
+
+	<pre>
+	define enter
+	set mono_debug_insert_breakpoint = 1
+	continue
+	set *mono_debug_last_breakpoint_address = 0x90
+	relocate
+	frame
+	</pre>
+
+	Btw. speaking of single stepping - you should use your debuggers <tt>next</tt> command,
+	not its <tt>step</tt> command for single stepping unless you compiled the JIT without
+	debugging support. The reason for this is that the JIT creates machine code which contains
+	calls to JIT methods such as <tt>mono_object_new_wrapper</tt> at places where you don't
+	expect them - so unless the JIT is compiled at least without line numbers, your debugger
+	will enter such methods if you use <tt>step</tt> rather than <tt>next</tt>.
+
+
+
diff --git a/doc/jit-debug-sample b/doc/jit-debug-sample
new file mode 100644
index 00000000000..650d67f8ca9
--- /dev/null
+++ b/doc/jit-debug-sample
@@ -0,0 +1,86 @@
+* A debugging session using a dynamically generated symbol file.
+
+	Let's assume we have the following C# application which we want to debug:
+
+	<pre>
+	using System;
+
+	public class Foo
+	{
+		public struct MyStruct {
+			int a;
+			long b;
+			double c;
+		}
+
+		public static void Main ()
+		{
+			Int32 value = 5;
+			long test = 512;
+
+			MyStruct my_struct;
+			my_struct.a = 5;
+			my_struct.b = test;
+			my_struct.c = 23323.5235;
+		}
+	}
+	</pre>
+
+	First of all, we need to compile it and create the .il files:
+
+	<pre>
+	$ mcs ./Foo.cs
+	$ monodis /home/export/martin/MONO-LINUX/lib/corlib.dll > corlib.il
+	$ monodis Foo.exe > Foo.il
+	</pre>
+
+	Now we can start the JIT in the debugger:
+
+	<pre>
+	$ gdb ~/monocvs/mono/mono/jit/mono
+	(gdb) r --debug=dwarf --break Foo:Main ./Foo.exe
+	Starting program: /home/martin/monocvs/mono/mono/jit/mono --debug=dwarf --break Foo:Main ./Foo.exe
+	0x081e8911 in ?? ()
+	(gdb) call mono_debug_make_symbols ()
+	(gdb) add-symbol-file /tmp/Foo.o
+	Reading symbols from /tmp/Foo.o...done.
+	Current language:  auto; currently c++
+	(gdb) frame
+	#0  Foo.Main () at Foo.il:26
+	26          // method line 2
+	(gdb) n
+	Foo.Main () at Foo.il:38
+	38              IL_0000: ldc.i4.5
+	(gdb) list
+	33              .maxstack 2
+	34              .locals (
+	35                      int32   V_0,
+	36                      int64   V_1,
+	37                      valuetype MyStruct      V_2)
+	38              IL_0000: ldc.i4.5
+	39              IL_0001: stloc.0
+	40              IL_0002: ldc.i4 512
+	41              IL_0007: conv.i8
+	42              IL_0008: stloc.1
+	43              IL_0009: ldloca.s 2
+	44              IL_000b: ldc.i4.5
+	45              IL_000c: stfld  int32 .MyStruct::a
+	46              IL_0011: ldloca.s 2
+	47              IL_0013: ldloc.1
+	48              IL_0014: stfld  int64 .MyStruct::b
+	49              IL_0019: ldloca.s 2
+	50              IL_001b: ldc.r8 23323.5
+	51              IL_0024: stfld  float64 .MyStruct::c
+	52              IL_0029: ret
+	(gdb) until 52
+	Foo.Main () at Foo.il:53
+	53          }
+	(gdb) info locals
+	V_0 = 5
+	V_1 = 512
+	V_2 = {a = 5, b = 512, c = 23323.523499999999}
+	</pre>
+
+	As you see in this example, you need to know IL code to use this debugging method - but
+	it may be the only way to debug a library.
+
diff --git a/doc/jit-debug-sample2 b/doc/jit-debug-sample2
new file mode 100644
index 00000000000..4e4cc31bc4f
--- /dev/null
+++ b/doc/jit-debug-sample2
@@ -0,0 +1,70 @@
+* A debugging session using a symbol file which has been created by MCS.
+
+	Let's assume we have the following C# application which we want to debug:
+
+	<pre>
+	using System;
+
+	public class Foo
+	{
+		public struct MyStruct {
+			int a;
+			long b;
+			double c;
+		}
+
+		public static void Main ()
+		{
+			Int32 value = 5;
+			long test = 512;
+
+			MyStruct my_struct;
+			my_struct.a = 5;
+			my_struct.b = test;
+			my_struct.c = 23323.5235;
+		}
+	}
+	</pre>
+
+	First of all, we need to compile it with MCS, assemble the generated .s file and
+	create the .il files for all referenced assemblies which were not compiled with MCS:
+
+	<pre>
+	$ mcs -g ./Foo.cs
+	$ as -o Foo-debug.o Foo-debug.s
+	$ monodis /home/export/martin/MONO-LINUX/lib/corlib.dll > corlib.il
+	</pre>
+
+	Now we can start the JIT in the debugger:
+
+	<pre>
+	$ gdb ~/monocvs/mono/mono/jit/mono
+	(gdb) r --debug=dwarf-plus --break Foo:Main ./Foo.exe
+	Starting program: /home/martin/monocvs/mono/mono/jit/mono --debug=dwarf-plus --break Foo:Main ./Foo.exe
+	Program received signal SIGTRAP, Trace/breakpoint trap.
+	0x081e8681 in ?? ()
+	(gdb) call mono_debug_make_symbols ()
+	(gdb) add-symbol-file Foo-debug.o
+	(gdb) add-symbol-file /tmp/corlib.o
+`	(gdb) frame
+	#0  Main () at ./Foo.cs:11
+	11              public static void Main ()
+	(gdb) n
+	Main () at ./Foo.cs:13
+	13                      Int32 value = 5;
+	(gdb)
+	14                      long test = 512;
+	(gdb)
+	17                      my_struct.a = 5;
+	(gdb)
+	18                      my_struct.b = test;
+	(gdb)
+	19                      my_struct.c = 23323.5235;
+	(gdb)
+	20              }
+	(gdb) info locals
+	value = 5
+	test = 512
+	my_struct = { a = 5, b = 512, c = 23323.5235 }
+	</pre>
+
diff --git a/doc/languages b/doc/languages
new file mode 100755
index 00000000000..cc135e1ae80
--- /dev/null
+++ b/doc/languages
@@ -0,0 +1,117 @@
+* Compilers for other languages
+
+	Here are some other free compilers for other languages that
+	target .NET and should work with Mono with no problem:
+
+	<ul>
+		* <a href="#ComponentPascal">Component Pascal</a>
+		* <a href="#MonoLogo">MonoLogo</a>
+		* <a href="#Oberon">Oberon</a>
+		* <a href="#Forth">Forth</a>
+	</ul>
+
+	Languages we would like to have supported, with links to resources:
+
+	<ul>
+		* <a href="#JavaScript">Java Script</a>
+		* <a href="java.html">Java</a>
+		* <a href="#c">C</a>
+	</ul>
+
+	Some experimental languages:
+
+	<ul>
+		* <a href="#Tachy">Tachy</a> (scheme-like)
+	</ul>
+
+<a name="MonoLogo">
+** MonoLogo
+
+	An implementation of Logo for Mono (and .NET)
+
+	The <A href="http://monologo.sf.net">Mono Logo</a> compiler is
+	hosted in the <a href="ccvs.html">Mono CVS</a> repository
+	and also available on the <a href="anoncvs.html">AnonCVS</a> mirrors.
+
+<a name="Oberon">
+** Oberon
+
+	This Oberon compiler is written in Oberon.NET (another self
+	hosting compiler).
+
+	The main site <a href="http://www.oberon.ethz.ch/oberon.net/">http://www.oberon.ethz.ch/oberon.net/</a>
+
+	Download:
+	<a href="http://www.oberon.ethz.ch/oberon.net/download/">http://www.oberon.ethz.ch/oberon.net/download/</a>
+
+	Examples:
+	<a href="http://www.oberon.ethz.ch/oberon.net/examples/">http://www.oberon.ethz.ch/oberon.net/examples/</a>
+
+
+	<a href="http://www.superin.formativ.net/mono/oberon/oberon.zip">http://www.superin.formativ.net/mono/oberon/oberon.zip</a>
+
+<a name="ComponentPascal">
+** Component Pascal
+
+	The Component Pascal compiler: <a
+	href="http://www2.fit.qut.edu.au/CompSci/PLAS/ComponentPascal">Home
+	Page</a>, you can <a
+	href="http://www2.fit.qut.edu.au/CompSci/PLAS/ComponentPascal/gpcp1.1.4-netRTM.zip">
+	download it</a>
+	
+<a name="Forth">
+** Delta Forth
+
+   	 The Delta Forth.NET project: <a 
+	 href="www.dataman.ro/dforth">Home
+	 Page</a> and <a href="http://www.dataman.ro/dforth/index.html">more
+	 details here</a>.
+	 
+
+<a name="Tachy">
+** Tachy
+
+	A subset of Scheme language called <a
+	href="http://radio.weblogs.com/0101156/stories/2002/03/19/tachy.html">Tachy</a>
+
+* Missing languages
+
+	Here is a list of a few languages that we would like to see
+	supported.  We will try to maintain a set of links here with 
+	technical information for those interested in porting,
+	implementing or adapting a compiler for any of these
+	languages:
+
+<a name="JavaScript">
+* Java Script
+
+	The Mozilla project has an implementation of JavaScript
+	written in Java called <a
+	href="http://www.mozilla.org/rhino/">Rhino</a>.
+
+	You could port this code from Java to C#.
+
+	Note that since JavaScript allows for evaluation at runtime,
+	the compiler has to be built as a class that can be invoked at
+	runtime.
+
+<a name="c">
+* C
+
+	Ideally GCC could be modified to generate CIL, but it is a 
+	big task.  That would give us various compilers in one pass.
+
+	Rumor is that the next version of the LCC compiler will
+	include an IL backend.  We do not know how extensive the support
+	for integration with .NET will be, but it would be an interesting
+	excercise to add an extension to C to call into .NET code.
+
+	LCC is not an open source compiler, but it is free as long as you
+	do not profit from selling it. 
+
+<a name="Java">
+* Java
+
+	We have a <a href="java.html">separate page</a> for Java.
+
+	
diff --git a/doc/mailing-lists b/doc/mailing-lists
index 22a71135ac1..450aa903281 100644
--- a/doc/mailing-lists
+++ b/doc/mailing-lists
@@ -1,6 +1,10 @@
 * Mailing Lists
 
-	There are a number of mailing lists for Mono
+	Most of the mailing lists are in english, but there is also
+	Mono Hispano that has lists in Spanish.   <a
+	href="http://mono.es.gnome.org/mailman/listinfo/mono-hispano">Mono Hispano list</a>
+
+	There are a number of mailing lists for Mono in English:
 
 	<table>
 	  <tr>
@@ -60,16 +64,6 @@
 	  </tr>
 	  <tr>
 	    <td>
-		<b><a
-	href="http://lists.ximian.com/mailman/listinfo/mono-patches">mono-patches</a></b>
-	    </td>
-	    <td>
-	Track the development of Mono in realtime: receive patches to the Mono repository
-	by email.
-	    </td>
-	  </tr>
-	  <tr>
-	    <td>
 		<b><a href="http://lists.ximian.com/mailman/listinfo/mono-bugs">mono-bugs</a></b>
 	    </td>
 	    <td>
@@ -87,4 +81,122 @@
 	list at Develop.com:</a></b> The guys at Develop Mentor run
 	this general purpose mailing list.
 	</ul>
-	</ul>
\ No newline at end of file
+	</ul>
+
+* Google search of the archives
+
+<!-- Google Search with mods -->
+<center>
+
+<table>
+<tr>
+<td><a href="http://www.google.com/search"><img src="mailing-lists_files/Logo_40wht.gif" border="0" alt="Google" align="middle"></a></td>
+
+<td>
+<table>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face="arial,sans-serif" size="-1"><input type="hidden" name="domains" value="www.go-mono.com;lists.ximian.com"><br><input type="radio" name="sitesearch" value="www.go-mono.com"> Search www.go-mono.com <input type="radio" name="sitesearch" value="lists.ximian.com"> Search lists.ximian.com </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-list">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>list</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-announce-list">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>announce-list</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-bugs">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>bugs</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-gc-list">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>gc-list</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-cvs-list">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>cvs-list</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-patches">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>patches</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+
+</table>
+</tr>
+</table>
+
+</center>
+<!-- /Google Search with mods -->
diff --git a/doc/mono-beginning b/doc/mono-beginning
new file mode 100644
index 00000000000..a0b44ac92d9
--- /dev/null
+++ b/doc/mono-beginning
@@ -0,0 +1,37 @@
+* Mono for beginners
+
+	Hinne Hettema and Jaime Anguiano Olarra are providing us with 
+	nice and complete set of documents (HOWTOs) about how to install,
+	configure, run and test the software developed by the Mono Project.
+
+	You can read them online, get PDF versions or get the XML sources.
+
+
+	HTML Format (read it online)
+
+	For <a href="mono-beginning/t1.html">RPM Linux based systems</a>
+
+	For <a href="http://geneura.ugr.es/~jaime/mono-beginning-windows/t1.html">Microsoft Windows</a>
+
+
+	PDF Format
+
+	For <a href="mono-beginning.pdf">RPM Linux based systems</a>
+
+	For <a href="http://geneura.ugr.es/~jaime/mono-beginning-windows/mono-beginning-windows.pdf">Microsoft Windows</a>
+
+
+
+	XML Source
+
+	For <a href="mono-beginning.xml">RPM Linux based systems</a>
+
+	For <a href="http://geneura.ugr.es/~jaime/mono-beginning-windows/mono-beginning-windows.xml">Microsoft Windows</a>
+
+
+	Currently Hinne is working on a Mono Tools HOWTO. Which will be
+	very useful for the hackers that would like to get in touch with
+	Mono and Jaime is working out a Mono Beginning HOWTO for Debian 
+	users.
+
+
diff --git a/doc/mono-beginning-windows.xml b/doc/mono-beginning-windows.xml
new file mode 100644
index 00000000000..a6f34da77f0
--- /dev/null
+++ b/doc/mono-beginning-windows.xml
@@ -0,0 +1,1065 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>

+

+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" []>

+<article>

+

+  <articleinfo>

+

+    <!-- Use "HOWTO", "mini HOWTO", "FAQ" in title, if appropriate -->

+    <title>Mono Beginners HOWTO for Windows users</title>

+

+   <author>

+       <firstname>Jaime</firstname>

+       <surname>Anguiano Olarra</surname>

+       <affiliation>

+          <address><email>jaime@geneura.ugr.es</email></address>

+       </affiliation>

+     </author>

+

+   <author>

+       <firstname>Hinne</firstname>

+       <surname>Hettema</surname>

+       <affiliation>

+          <address><email>h.hettema@auckland.ac.nz</email></address>

+       </affiliation>

+     </author>

+

+     <pubdate>2002-08</pubdate>

+

+     <!-- Most recent revision goes at the top; list in descending order -->

+     <!-- All dates specified in ISO "YYYY-MM-DD" format -->

+     <revhistory>

+       <revision>

+          <revnumber>0.1</revnumber>

+          <date>2002-08-05</date>

+          <authorinitials>JA</authorinitials>

+          <revremark>First release</revremark>

+       </revision>

+     </revhistory>

+

+     <!-- Provide a good abstract; a couple of sentences is sufficient -->

+     <abstract>

+        <para>

+	 The goal of this document is to guide people through the setup of a Mono

+         framework in a Windows box. Because some people might want to just test

+         Mono a bit and use the compiler, etc, I have made two distinctions, one

+         for the Mono user that only wants to get precompiled binaries and another

+         for the one how wants to build Mono from the CVS and probably contribute

+         to the project actively. Each kind of user has to read the corresponding

+         part of this document. I hope a lot of Windows users will get a nice 

+         approach to the free software world by starting using Mono.

+	</para>

+     </abstract>

+

+  </articleinfo>

+

+<sect1 id="intro">

+<title>Introduction</title>

+

+<para>

+Mono is an open source implementation of the Common Language Infrastructure

+(CLI) specified in ECMA standard 335. It comes with a C# compiler and

+provides an extensible platform to develop and run applications that

+are interoperable with Microsoft .NET.

+</para>

+

+<para>

+Mono is not finished--it is a project still under development. As a

+result, installation and configuration may not be as smooth as you

+will be used to from other Linux or Windows applications. Nevertheless, 

+mono is in a state that will allow you to get it up and running and gain

+experience with it--which is, I would suggest, a very smart thing to do.

+</para>

+

+<para>

+This document is aimed at the mono beginner, and aims to present a complete

+view of a minimal installation, which will allow you to experiment with

+mono to some degree. It also describes some of those experiments. We

+expect that after reading this document you'll go on to do either of

+two things:

+</para>

+<orderedlist>

+<listitem>

+<para>

+Continue to contribute to the mono project in some shape or form. The

+website has some ideas and suggestions under the heading 'Contributing'.

+</para>

+</listitem>

+<listitem>

+<para>

+Continue to write applications that run in mono. 

+</para>

+</listitem>

+</orderedlist>

+

+<para>

+We hope this document will be useful to you in your first steps with mono.

+Happy hacking!

+</para>

+

+<sect2 id="disclaimer"> <title>Disclaimer</title>

+

+<para> 

+No liability for the contents of this document can be accepted.

+Use the concepts, examples and information at your own risk.  There may

+be errors and inaccuracies, that could be damaging to your system.

+Proceed with caution, and although this is highly unlikely, the author(s)

+do not take any responsibility.  

+</para>

+

+<para> 

+All copyrights are held by their by their respective owners,

+unless specifically noted otherwise.  Use of a term in this document

+should not be regarded as affecting the validity of any trademark or

+service mark.  Naming of particular products or brands should not be

+seen as endorsements.  

+</para> 

+</sect2>

+

+<!-- Give credit where credit is due...very important --> 

+<sect2 id="credits"> <title>Credits / Contributors</title>

+

+<para> Credits are due to </para>

+<itemizedlist> 

+<listitem> 

+<para>Hinne Hettema <email>h.hettema@auckland.ac.nz</email> 

+for creating the xml template I used for this document, for 

+reviewing and make an excellent job with the other HOWTO and

+for his feedback. As you can see a lot of his work has been

+included in this document too. 

+</para> 

+</listitem> 

+<listitem>

+<para>

+The Mono Hackers.

+</para>

+</listitem>

+</itemizedlist> 

+</sect2>

+

+<!-- Feedback --> 

+<sect2 id="feedback"> <title>Feedback</title>

+

+<para> 

+Feedback is most certainly welcome for this document. Send your

+additions, comments and criticisms to the following email address:

+<email>mono-docs-list@ximian.com</email>. I am lurking on this list 

+and will maintain this document as required.  

+</para> 

+</sect2>

+</sect1>

+

+<!-- This is the preamble stuff over with the rest of document follows... --> 

+<sect1 id="installation"> 

+<title> Installing Mono</title>

+

+<sect2 id="obtaining"> 

+<title>Obtaining Mono</title> 

+<para> 

+In order to obtain the required software you just need to visit the

+Mono download page at http://www.go-mono.org/download or any of the

+related sites. 

+</para>

+

+<para>

+You'll be able to complete everything in this document if you just install

+the runtime, but taking a look at the compiler package is well worth the

+effort. The compiler is written in C# and is 'self hosting' which means it

+is able to compile itself. 

+</para>

+

+<para>

+This page also lists the current versions of the software 

+mono depends on. Make sure that your system has all the 

+required versions, otherwise mono won't compile.

+</para>

+

+</sect2>

+

+<sect2 id="easyinstall">

+<title>Installing Mono on Windows, the easy way</title>

+<para>

+       Oh. This is a very easy task now. If you just want to take a look at

+       the possibilities of Mono get the Mono installer from the site of

+       Johannes Roith &lt;johannes\@jroith.de&gt;: 

+</para>

+

+<para>

+       http://www.superin.informativ.net/mono/mono.htm. You can get a link in 

+</para>

+<para>

+       the download section of the Mono site too: http://www.go-mono.org/download

+</para>

+<para>

+       Then you just need a Windows machine. Better use 

+       Windows 2000 Professional. </para>

+<para>

+       Once you've got it, run the installer. 

+</para>

+<para>

+       Remember, building your own Mono runtime and compiler from the sources 

+       is strongly recommended. You won't discover the power of Mono until

+       you get it made this way. If you feel hungry about real programming with

+       Mono, proceed like in the next section.

+</para>

+</sect2>

+

+<sect2 id="hardinstall">

+<title>Building Mono under Windows</title>

+<itemizedlist>

+ <listitem>

+   <para>

+    1.- Get Windows 2000 Professional or any Windows System supporting .NET SDK.

+        Avoid using XP and the redistributable version of the SDK (necessary for 

+        WinME, etc).

+   </para>

+ </listitem>

+

+ <listitem>

+    <para>

+    2.- Get the latest Cygwin distribution, be sure you install the GNU Build Tools 

+        packages. Take the openssh package if you plan to contribute to the project.

+        If you feel insecure about the packages you need to install, install all of

+        them, of course, Text, Admin, Games and Web are not necessary at all and you

+        can pass of those. The fitness of your choice will depend of your knowledge 

+        on Linux and/or Cygwin. If in doubt install all. 

+    </para>

+ </listitem>

+

+ <listitem>

+   <para>

+    3.- Install the .NET SDK.

+   </para>

+ </listitem>

+ <listitem>

+   <para>

+    4.- Install Cygwin.

+   </para>

+  </listitem>

+  <listitem>

+   <para>

+    5.- Get http://www.go-mono.org/mono-build-w32.sh and put it into your home 

+        directory in the cygwin setup.

+   </para>

+  </listitem>

+

+  <listitem>

+    <para>

+    6.- Enter your cygwin environment. If you have an account in the mono cvs, then 

+        export the variables as shown in http://www.go-mono.org/ccvs.html

+    </para>

+

+    <programlisting>

+             This means. Enter: export CVSROOT=user@mono-cvs.ximian.com:/cvs/public

+

+             and export CVS_RSH=ssh

+    </programlisting>

+   <para>

+             If you have no account DO NOTHING.

+   </para>

+  </listitem>

+  <listitem>

+   <para>

+    7.- Enter: 

+    <programlisting>

+	export ACLOCAL_FLAGS="-I /usr/local/share/aclocal" 

+        and this: export PKG_CONFIG_PATH="/usr/local/bin"

+    </programlisting>

+	</para>

+   </listitem>

+   <listitem>

+     <para>

+    8.- Run the script (mono-build-w32.sh) 

+     </para>

+   </listitem>

+   <listitem>

+    <para>

+    9.- All should work fine know and you should see it download what necessary and 

+        build mono.

+    </para>

+</listitem>

+</itemizedlist>

+</sect2>

+

+<sect2 id="errors">

+<title>Troubleshooting</title>

+<para>    

+    If you have noticed problems during step 8 and the execution stops because of 

+    errors as I cannot find that or such library or alike, try to: 

+</para>

+

+<itemizedlist>

+<listitem>

+ <para>

+    1.- Create a directory mono-temp for example. 

+ </para>

+ </listitem>

+

+  <listitem>

+  <para>

+    2.- Move and unzip all the zips the mono-build script downloads to /usr/local 

+        to that new directory. Do it one by one, copying the content of the created 

+        subdirectories (include, bin, etc) to their respectives in /usr/local. Take 

+        care, some libraries like libglib... must go into /usr/local/bin and not 

+        into /usr/local/lib.

+   </para>

+  </listitem>

+

+ <listitem>

+   <para>

+    3.- Jump into the /usr/local/mono directory and run ./autogen.sh

+    </para>

+  </listitem>

+

+   <listitem>

+   <para>

+    4.- Then run ./configure and after it: make and finally: make install.

+   </para>

+  </listitem>

+</itemizedlist>

+</sect2>

+</sect1>

+

+<sect1 id="running">

+<title>Running mono</title>

+<sect2 id="basic">

+<title>Basic steps</title>

+<para>

+To work with mono, you first have to create a C# program. Open up 

+your favourite editor, and type in the following code:

+</para>

+<programlisting>

+using System;

+

+class Hello

+{

+public static void Main(String[] args)

+	{

+	Console.WriteLine("mono:: is alive and well...");

+

+	for (int i = 0; i < args.Length; i++)

+		Console.WriteLine("Argument {0} = {1}", i, args[i]);

+	}

+}

+</programlisting>

+

+<para>

+Save the file as hello.cs. To compile this into a working program, 

+type mcs hello.cs. If you get the following:

+</para>

+<programlisting>

+ mcs hello.cs

+RESULT: 0

+</programlisting>

+<para>

+you know the compile worked fine. If you see some strange error

+messages including the word 'parser' somewhere, you made a mistake in

+your program. Fix this up first.

+</para>

+

+<para>

+You are now ready to execute your first mono program.  To execute 

+the code, type

+</para>

+

+<programlisting>

+ mono hello.exe arg1 arg2 arg 3

+</programlisting>

+<para>

+(where we have given some arguments just for fun) and you'll 

+see the following:

+</para>

+

+<programlisting>

+mono:: is alive and well...

+Argument 0 = arg1

+Argument 1 = arg2

+Argument 2 = arg

+Argument 3 = 3

+RESULT: 0

+</programlisting>

+<para>

+As you can see, mono printed the line "mono:: is alive and well" 

+and printed the list of arguments. This completes the creation 

+and execution of your first mono program.

+</para>

+</sect2>

+

+<sect2 id="interpreter">

+<title>Interpreter</title>

+<para>

+But mono will allow you to do more. First of all, mono is the 

+compiled mono execution environment which uses the Just in 

+Time (JIT) compiler. Mono also comes with an interpreted 

+environment, which can be accessed using the command 'mint' 

+as follows

+</para>

+<programlisting>

+ mint hello.exe arg1 arg 2

+mono:: is alive and well...

+Argument 0 = arg1

+Argument 1 = arg

+Argument 2 = 2

+</programlisting>

+<para>

+As you can see, it makes no difference to mono output which 

+environment you use, but what happens under the hood is very 

+different. If you use 'mono' as the command line tool, you 

+call the 'production' execution environment which will read 

+your portable executable (PE) file, and call the just in 

+time (JIT) compiler to compile the PE code down to machine 

+level code (in my case, an x86 architecture) after which 

+it is executed.

+</para>

+<para>

+If you use mint, the JIT is not used, and the PE code is 

+interpreted into x86 instructions for execution. In fact, 

+for our simple 'hello' mint is slightly faster. The point 

+is that the JIT compiler will take some time to compile the 

+code of our program and store it in some location in memory, 

+but the subsequent execution of the code is faster with mono.

+</para>

+

+<para>

+After this simple run of mono, it is time to play with some options. 

+I won't cover these in detail since there are quite a few, and also because

+I assume you downloaded mono to hack it around in the first place. So

+I'll leave some pointers.

+</para>

+

+

+<sect3 id="debugging">

+<title>Debugging</title>

+<para>

+Mono supports a debugging option when you specify the "-d" flag while running

+the runtime. Utilising this flag will get you a significant amount of output,

+and it may be an idea to specify an output file as well. The interesting aspect

+of this file is that it allows you to see to some extent (quite precisely,

+actually) what the JIT compiler is up to.

+</para>

+</sect3>

+

+<sect3 id="statistics">

+<title>Statistics</title>

+<para>

+It is also possible to collect some runtime statistics on your program. These

+will give you some idea of the resource utilisation of your program.

+</para>

+<programlisting>

+ mono --stats hello.exe

+mono:: is alive and well...

+RESULT: 0

+Mono Jit statistics

+Compiled methods:       58

+Methods cache lookup:   15

+Method trampolines:     698

+Basic blocks:           188

+Max basic blocks:       15

+Allocated vars:         238

+Analyze stack repeat:   61

+Compiled CIL code size: 2450

+Native code size:       10167

+Max code size ratio:    7.13 (FileStream::FlushBuffer)

+Biggest method:         1016 (StreamWriter::Write)

+Code reallocs:          27

+Allocated code size:    22073

+Inlineable methods:     17

+Inlined methods:        22

+

+Created object count:   18

+Initialized classes:    127

+Used classes:           37

+Static data size:       288

+VTable data size:       8292

+</programlisting>

+</sect3>

+

+</sect2>

+

+<sect2 id="ILAsm_code" >

+<title>Inspecting IL Assembly code</title>

+<para>

+Mono also provides a small tool that will let you disassemble 

+the executable (.exe) file so you can have a peek 

+under the hood. This tool is monodis, and is run as 

+follows:

+

+</para>

+<programlisting>

+ monodis hello.exe

+.assembly extern mscorlib

+{

+  .ver 0:0:0:0

+}

+.assembly 'hello'

+{

+  .hash algorithm 0x00008004

+  .ver  0:0:0:0

+}

+  .class private auto ansi beforefieldinit Hello

+        extends [mscorlib]System.Object

+  {

+

+    // method line 1

+    .method public hidebysig  specialname  rtspecialname

+           instance default void .ctor()  cil managed

+    {

+        // Method begins at RVA 0x20ec

+        // Code size 7 (0x7)

+        .maxstack 8

+        IL_0000: ldarg.0

+        IL_0001: call instance void System.Object::.ctor()

+        IL_0006: ret

+    } // end of method instance default void .ctor()

+

+    // method line 2

+    .method public static

+           default void Main(string[] args)  cil managed

+    {

+        // Method begins at RVA 0x20f4

+        .entrypoint

+        // Code size 56 (0x38)

+        .maxstack 5

+        .locals init (

+                int32   V_0,

+                int32   V_1)

+        IL_0000: ldstr "mono:: is alive and well..."

+        IL_0005: call void System.Console::WriteLine(string)

+        IL_000a: ldc.i4.0

+        IL_000b: stloc.0

+        IL_000c: ldloc.0

+        IL_000d: ldarg.s 0

+        IL_000f: ldlen

+        IL_0010: clt

+        IL_0012: brfalse IL_0037

+

+        IL_0017: ldstr "Argument {0} = {1}"

+        IL_001c: ldloc.0

+        IL_001d: box [mscorlib]System.Int32

+        IL_0022: ldarg.s 0

+        IL_0024: ldloc.0

+        IL_0025: ldelem.ref

+        IL_0026: call void System.Console::WriteLine(string, object, object)

+        IL_002b: nop

+        IL_002c: ldloc.0

+        IL_002d: ldc.i4.1

+        IL_002e: add

+        IL_002f: stloc.1

+        IL_0030: ldloc.1

+        IL_0031: stloc.0

+        IL_0032: br IL_000c

+

+        IL_0037: ret

+    } // end of method default void Main(string[] args)

+

+  } // end of type Hello

+

+

+</programlisting>

+<para>

+This is the listing of the code of your program in a language 

+called IL assembly, or Common Intermediate Language (CIL). The 

+CIL provides the portability of the mono platform, and ensures 

+that code compiled with Microsoft's .NET framework will work 

+on mono and vice versa. 

+</para>

+</sect2>

+

+<sect2 id="man_pages">

+<title>Man pages</title>

+

+<para>

+Mono has man pages already installed, and generally, typing <command>

+man</command> before the command you wish to execute should help in 

+getting a list of the options. In many cases, it's still up to you

+to figure out what they do.

+</para>

+

+</sect2>

+

+

+</sect1>

+

+

+<sect1 id="problems">

+<title>Problems</title>

+<para> 

+With mono being as new as it is, it is likely that you will have some

+problems with installation. The following are some ideas to help you

+out in a bind:

+</para>

+

+<orderedlist>

+<listitem>

+<para> 

+See the Ximian Bugzilla page to find out if there is a bug

+report about your specific issue.

+</para>

+</listitem>

+

+<listitem>

+<para>Read this document.  If it does not solve your problem, we want to

+know about it. Please send a message to the email address listed for

+feedback at the beginning of the document.</para>

+</listitem>

+

+<listitem>

+

+<para> 

+Visit the mono mailing lists' archives and do a little

+research in there for threads talking about the problem you have.

+</para>

+</listitem>

+

+<listitem>

+<para> 

+If you still cannot correct the problem, send a message to the

+mono list. When you do this, please be as precise as possible--i.e.

+mention the system you are running, the version of mono that you have the 

+problem with, and give any error codes and other output that might appear.

+</para>

+</listitem>

+</orderedlist>

+

+</sect1>

+

+

+<!-- Legal Sections --> <sect1 id="copyright">

+ <title>Copyright and License</title>

+

+ <!-- The LDP recommends, but doesn't require, the GFDL --> <para>

+     This document, <emphasis>Running mono</emphasis>, is copyrighted

+     (c) 2002 by <emphasis>Hinne Hettema</emphasis> and

+     <emphasis>Jaime Anguiano Olarra</emphasis>.  Permission is

+     granted to copy, distribute and/or modify this document under the

+     terms of the GNU Free Documentation License, Version 1.1 or any later

+     version published by the Free Software Foundation; with no Invariant

+     Sections, with no Front-Cover Texts, and with no Back-Cover Texts.

+     A copy of the license is included in the section entitled "GNU Free

+     Documentation License".

+ </para>

+

+<sect2 id="gfdl"> <title>GNU Free Documentation License</title> 

+<!-- GNU Project - Free Software Foundation (FSF) -->

+

+<para>Version 1.1, March 2000</para>

+

+<blockquote> <para>Copyright (C) 2000  Free Software Foundation, Inc.

+59 Temple Place, Suite 330, Boston, MA	02111-1307  USA Everyone is

+permitted to copy and distribute verbatim copies of this license document,

+but changing it is not allowed.</para> </blockquote>

+

+<sect3 id="gfdl-0"> <title>PREAMBLE</title>

+

+<para>The purpose of this License is to make a manual, textbook,

+    or other written document "free" in the sense of freedom: to assure

+    everyone the effective freedom to copy and redistribute it, with

+    or without modifying it, either commercially or noncommercially.

+    Secondarily, this License preserves for the author and publisher

+    a way to get credit for their work, while not being considered

+    responsible for modifications made by others.</para>

+

+<para>This License is a kind of "copyleft", which means that

+    derivative works of the document must themselves be free in the

+    same sense.  It complements the GNU General Public License, which

+    is a copyleft license designed for free software.</para>

+

+<para>We have designed this License in order to use it for manuals

+    for free software, because free software needs free documentation:

+    a free program should come with manuals providing the same freedoms

+    that the software does.  But this License is not limited to software

+    manuals; it can be used for any textual work, regardless of subject

+    matter or whether it is published as a printed book.  We recommend

+    this License principally for works whose purpose is instruction

+    or reference.</para>

+</sect3>

+

+<sect3 id="gfdl-1"> <title>APPLICABILITY AND DEFINITIONS</title>

+

+<para>This License applies to any manual or other work that

+    contains a notice placed by the copyright holder saying it can be

+    distributed under the terms of this License.  The "Document", below,

+    refers to any such manual or work.	Any member of the public is a

+    licensee, and is addressed as "you".</para>

+

+<para>A "Modified Version" of the Document means any work

+    containing the Document or a portion of it, either copied verbatim,

+    or with modifications and/or translated into another language.</para>

+

+<para>A "Secondary Section" is a named appendix or a front-matter

+    section of the Document that deals exclusively with the relationship

+    of the publishers or authors of the Document to the Document's overall

+    subject (or to related matters) and contains nothing that could fall

+    directly within that overall subject.  (For example, if the Document

+    is in part a textbook of mathematics, a Secondary Section may not

+    explain any mathematics.)  The relationship could be a matter of

+    historical connection with the subject or with related matters, or

+    of legal, commercial, philosophical, ethical or political position

+    regarding them.</para>

+

+<para>The "Invariant Sections" are certain Secondary Sections

+    whose titles are designated, as being those of Invariant Sections,

+    in the notice that says that the Document is released under this

+    License.</para>

+

+<para>The "Cover Texts" are certain short passages of text that

+    are listed, as Front-Cover Texts or Back-Cover Texts, in the notice

+    that says that the Document is released under this License.</para>

+

+<para>A "Transparent" copy of the Document means a

+    machine-readable copy, represented in a format whose specification

+    is available to the general public, whose contents can be viewed and

+    edited directly and straightforwardly with generic text editors

+    or (for images composed of pixels) generic paint programs or

+    (for drawings) some widely available drawing editor, and that is

+    suitable for input to text formatters or for automatic translation

+    to a variety of formats suitable for input to text formatters.

+    A copy made in an otherwise Transparent file format whose markup

+    has been designed to thwart or discourage subsequent modification

+    by readers is not Transparent.  A copy that is not "Transparent"

+    is called "Opaque".</para>

+

+<para>Examples of suitable formats for Transparent copies include

+    plain ASCII without markup, Texinfo input format, LaTeX input format,

+    SGML or XML using a publicly available DTD, and standard-conforming

+    simple HTML designed for human modification.  Opaque formats include

+    PostScript, PDF, proprietary formats that can be read and edited

+    only by proprietary word processors, SGML or XML for which the

+    DTD and/or processing tools are not generally available, and the

+    machine-generated HTML produced by some word processors for output

+    purposes only.</para>

+

+<para>The "Title Page" means, for a printed book, the title page

+    itself, plus such following pages as are needed to hold, legibly,

+    the material this License requires to appear in the title page.

+    For works in formats which do not have any title page as such,

+    "Title Page" means the text near the most prominent appearance of the

+    work's title, preceding the beginning of the body of the text.</para>

+</sect3>

+

+<sect3 id="gfdl-2"> <title>VERBATIM COPYING</title>

+

+<para>You may copy and distribute the Document in any medium,

+    either commercially or noncommercially, provided that this License,

+    the copyright notices, and the license notice saying this License

+    applies to the Document are reproduced in all copies, and that

+    you add no other conditions whatsoever to those of this License.

+    You may not use technical measures to obstruct or control the

+    reading or further copying of the copies you make or distribute.

+    However, you may accept compensation in exchange for copies.  If you

+    distribute a large enough number of copies you must also follow the

+    conditions in section 3.</para>

+

+<para>You may also lend copies, under the same conditions stated

+    above, and you may publicly display copies.</para>

+</sect3>

+

+<sect3 id="gfdl-3"> <title>COPYING IN QUANTITY</title>

+

+<para>If you publish printed copies of the Document numbering more

+    than 100, and the Document's license notice requires Cover Texts, you

+    must enclose the copies in covers that carry, clearly and legibly,

+    all these Cover Texts: Front-Cover Texts on the front cover, and

+    Back-Cover Texts on the back cover.  Both covers must also clearly

+    and legibly identify you as the publisher of these copies.	The front

+    cover must present the full title with all words of the title equally

+    prominent and visible.  You may add other material on the covers

+    in addition.  Copying with changes limited to the covers, as long as

+    they preserve the title of the Document and satisfy these conditions,

+    can be treated as verbatim copying in other respects.</para>

+

+<para>If the required texts for either cover are too voluminous to

+    fit legibly, you should put the first ones listed (as many as fit

+    reasonably) on the actual cover, and continue the rest onto adjacent

+    pages.</para>

+

+<para>If you publish or distribute Opaque copies of the Document

+    numbering more than 100, you must either include a machine-readable

+    Transparent copy along with each Opaque copy, or state in or with each

+    Opaque copy a publicly-accessible computer-network location containing

+    a complete Transparent copy of the Document, free of added material,

+    which the general network-using public has access to download

+    anonymously at no charge using public-standard network protocols.

+    If you use the latter option, you must take reasonably prudent steps,

+    when you begin distribution of Opaque copies in quantity, to ensure

+    that this Transparent copy will remain thus accessible at the stated

+    location until at least one year after the last time you distribute

+    an Opaque copy (directly or through your agents or retailers) of

+    that edition to the public.</para>

+

+<para>It is requested, but not required, that you contact the

+    authors of the Document well before redistributing any large number

+    of copies, to give them a chance to provide you with an updated

+    version of the Document.</para>

+</sect3>

+

+<sect3 id="gfdl-4"> <title>MODIFICATIONS</title>

+

+<para>You may copy and distribute a Modified Version of the

+    Document under the conditions of sections 2 and 3 above, provided

+    that you release the Modified Version under precisely this License,

+    with the Modified Version filling the role of the Document, thus

+    licensing distribution and modification of the Modified Version

+    to whoever possesses a copy of it.	In addition, you must do these

+    things in the Modified Version:</para>

+

+<orderedlist numeration="upperalpha"> <listitem><para>Use in the

+Title Page

+      (and on the covers, if any) a title distinct from that of the

+      Document, and from those of previous versions (which should, if

+      there were any, be listed in the History section of the Document).

+      You may use the same title as a previous version if the original

+      publisher of that version gives permission.</para>

+</listitem>

+

+<listitem><para>List on the Title Page,

+      as authors, one or more persons or entities responsible for

+      authorship of the modifications in the Modified Version, together

+      with at least five of the principal authors of the Document (all

+      of its principal authors, if it has less than five).</para>

+</listitem>

+

+<listitem><para>State on the Title page

+      the name of the publisher of the Modified Version, as the

+      publisher.</para>

+</listitem>

+

+<listitem><para>Preserve all the

+      copyright notices of the Document.</para>

+</listitem>

+

+<listitem><para>Add an appropriate

+      copyright notice for your modifications adjacent to the other

+      copyright notices.</para>

+</listitem>

+

+<listitem><para>Include, immediately

+      after the copyright notices, a license notice giving the public

+      permission to use the Modified Version under the terms of this

+      License, in the form shown in the Addendum below.</para>

+</listitem>

+

+<listitem><para>Preserve in that license

+      notice the full lists of Invariant Sections and required Cover

+      Texts given in the Document's license notice.</para>

+</listitem>

+

+<listitem><para>Include an unaltered

+      copy of this License.</para>

+</listitem>

+

+<listitem><para>Preserve the section

+      entitled "History", and its title, and add to it an item stating at

+      least the title, year, new authors, and publisher of the Modified

+      Version as given on the Title Page.  If there is no section entitled

+      "History" in the Document, create one stating the title, year,

+      authors, and publisher of the Document as given on its Title Page,

+      then add an item describing the Modified Version as stated in the

+      previous sentence.</para>

+</listitem>

+

+<listitem><para>Preserve the network

+      location, if any, given in the Document for public access to

+      a Transparent copy of the Document, and likewise the network

+      locations given in the Document for previous versions it was

+      based on.  These may be placed in the "History" section.	You may

+      omit a network location for a work that was published at least four

+      years before the Document itself, or if the original publisher of

+      the version it refers to gives permission.</para>

+</listitem>

+

+<listitem><para>In any section entitled

+      "Acknowledgements" or "Dedications", preserve the section's title,

+      and preserve in the section all the substance and tone of each

+      of the contributor acknowledgements and/or dedications given

+      therein.</para>

+</listitem>

+

+<listitem><para>Preserve all the

+      Invariant Sections of the Document, unaltered in their text and in

+      their titles.  Section numbers or the equivalent are not considered

+      part of the section titles.</para>

+</listitem>

+

+<listitem><para>Delete any section

+      entitled "Endorsements".	Such a section may not be included in

+      the Modified Version.</para>

+</listitem>

+

+<listitem><para>Do not retitle any

+      existing section as "Endorsements" or to conflict in title with

+      any Invariant Section.</para>

+</listitem> </orderedlist> <para>If the Modified Version includes new

+front-matter sections

+    or appendices that qualify as Secondary Sections and contain no

+    material copied from the Document, you may at your option designate

+    some or all of these sections as invariant.  To do this, add their

+    titles to the list of Invariant Sections in the Modified Version's

+    license notice.  These titles must be distinct from any other section

+    titles.</para>

+

+<para>You may add a section entitled "Endorsements", provided it

+    contains nothing but endorsements of your Modified Version by various

+    parties--for example, statements of peer review or that the text has

+    been approved by an organization as the authoritative definition of

+    a standard.</para>

+

+<para>You may add a passage of up to five words as a Front-Cover

+    Text, and a passage of up to 25 words as a Back-Cover Text, to the end

+    of the list of Cover Texts in the Modified Version.  Only one passage

+    of Front-Cover Text and one of Back-Cover Text may be added by (or

+    through arrangements made by) any one entity.  If the Document already

+    includes a cover text for the same cover, previously added by you or

+    by arrangement made by the same entity you are acting on behalf of,

+    you may not add another; but you may replace the old one, on explicit

+    permission from the previous publisher that added the old one.</para>

+

+<para>The author(s) and publisher(s) of the Document do not by

+    this License give permission to use their names for publicity for

+    or to assert or imply endorsement of any Modified Version.</para>

+</sect3>

+

+<sect3 id="gfdl-5"> <title>COMBINING DOCUMENTS</title>

+

+<para>You may combine the Document with other documents released

+    under this License, under the terms defined in section 4 above for

+    modified versions, provided that you include in the combination all of

+    the Invariant Sections of all of the original documents, unmodified,

+    and list them all as Invariant Sections of your combined work in

+    its license notice.</para>

+

+<para>The combined work need only contain one copy of this

+    License, and multiple identical Invariant Sections may be replaced

+    with a single copy.  If there are multiple Invariant Sections with

+    the same name but different contents, make the title of each such

+    section unique by adding at the end of it, in parentheses, the

+    name of the original author or publisher of that section if known,

+    or else a unique number.  Make the same adjustment to the section

+    titles in the list of Invariant Sections in the license notice of

+    the combined work.</para>

+

+<para>In the combination, you must combine any sections entitled

+    "History" in the various original documents, forming one section

+    entitled "History"; likewise combine any sections entitled

+    "Acknowledgements", and any sections entitled "Dedications".

+    You must delete all sections entitled "Endorsements."</para>

+</sect3>

+

+<sect3 id="gfdl-6"> <title>COLLECTIONS OF DOCUMENTS</title>

+

+<para>You may make a collection consisting of the Document and

+    other documents released under this License, and replace the

+    individual copies of this License in the various documents with a

+    single copy that is included in the collection, provided that you

+    follow the rules of this License for verbatim copying of each of

+    the documents in all other respects.</para>

+

+<para>You may extract a single document from such a collection,

+    and distribute it individually under this License, provided you

+    insert a copy of this License into the extracted document, and follow

+    this License in all other respects regarding verbatim copying of

+    that document.</para>

+</sect3>

+

+<sect3 id="gfdl-7"> <title>AGGREGATION WITH INDEPENDENT WORKS</title>

+<para>A compilation of the Document or its derivatives with other

+    separate and independent documents or works, in or on a volume

+    of a storage or distribution medium, does not as a whole count

+    as a Modified Version of the Document, provided no compilation

+    copyright is claimed for the compilation.  Such a compilation is

+    called an "aggregate", and this License does not apply to the other

+    self-contained works thus compiled with the Document, on account

+    of their being thus compiled, if they are not themselves derivative

+    works of the Document.</para>

+

+<para>If the Cover Text requirement of section 3 is applicable to

+    these copies of the Document, then if the Document is less than

+    one quarter of the entire aggregate, the Document's Cover Texts

+    may be placed on covers that surround only the Document within

+    the aggregate.  Otherwise they must appear on covers around the

+    whole aggregate.</para>

+</sect3>

+

+<sect3 id="gfdl-8"> <title>TRANSLATION</title>

+

+<para>Translation is considered a kind of modification, so you may

+    distribute translations of the Document under the terms of section 4.

+    Replacing Invariant Sections with translations requires special

+    permission from their copyright holders, but you may include

+    translations of some or all Invariant Sections in addition to the

+    original versions of these Invariant Sections.  You may include

+    a translation of this License provided that you also include the

+    original English version of this License.  In case of a disagreement

+    between the translation and the original English version of this

+    License, the original English version will prevail.</para>

+</sect3>

+

+<sect3 id="gfdl-9"> <title>TERMINATION</title> <para>You may not copy,

+modify, sublicense, or distribute the

+    Document except as expressly provided for under this License.

+    Any other attempt to copy, modify, sublicense or distribute the

+    Document is void, and will automatically terminate your rights under

+    this License.  However, parties who have received copies, or rights,

+    from you under this License will not have their licenses terminated

+    so long as such parties remain in full compliance.</para>

+</sect3>

+

+<sect3 id="gfdl-10"> <title>FUTURE REVISIONS OF THIS LICENSE</title>

+

+<para>The Free Software Foundation may publish new, revised

+    versions of the GNU Free Documentation License from

+    time to time.  Such new versions will be similar

+    in spirit to the present version, but may differ in

+    detail to address new problems or concerns.  See <ulink

+    url="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</ulink>.</para>

+

+<para>Each version of the License is given a distinguishing

+    version number.  If the Document specifies that a particular

+    numbered version of this License "or any later version" applies

+    to it, you have the option of following the terms and conditions

+    either of that specified version or of any later version that has

+    been published (not as a draft) by the Free Software Foundation.

+    If the Document does not specify a version number of this License,

+    you may choose any version ever published (not as a draft) by the

+    Free Software Foundation.</para>

+</sect3>

+

+<sect3 id="gfdl-11"> <title>How to use this License for your

+documents</title>

+

+<para>To use this License in a document you have written, include

+    a copy of the License in the document and put the following copyright

+    and license notices just after the title page:</para>

+

+<blockquote><para> Copyright (c)  YEAR	YOUR NAME.

+      Permission is granted to copy, distribute and/or modify this

+      document under the terms of the GNU Free Documentation License,

+      Version 1.1 or any later version published by the Free Software

+      Foundation; with the Invariant Sections being LIST THEIR TITLES,

+      with the Front-Cover Texts being LIST, and with the Back-Cover

+      Texts being LIST.  A copy of the license is included in the section

+      entitled "GNU Free Documentation License".

+</para></blockquote>

+

+<para>If you have no Invariant Sections, write "with no Invariant

+    Sections" instead of saying which ones are invariant.  If you

+    have no Front-Cover Texts, write "no Front-Cover Texts" instead of

+    "Front-Cover Texts being LIST"; likewise for Back-Cover Texts.</para>

+

+<para>If your document contains nontrivial examples of program

+    code, we recommend releasing these examples in parallel under your

+    choice of free software license, such as the GNU General Public

+    License, to permit their use in free software.</para>

+</sect3> </sect2> </sect1>

+

+</article>

+

+

+

+

+<!-- This document is dedicated to all my friends and to the Mono hackers.

+ 

+        License

+

+Here goes the GFDL, GNU Free Documentation License. -->

+

diff --git a/doc/mono-beginning.xml b/doc/mono-beginning.xml
new file mode 100644
index 00000000000..6ab1019c225
--- /dev/null
+++ b/doc/mono-beginning.xml
@@ -0,0 +1,1294 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" []>
+<article>
+
+  <articleinfo>
+
+    <!-- Use "HOWTO", "mini HOWTO", "FAQ" in title, if appropriate -->
+    <title>Running Mono</title>
+
+
+    <author>
+       <firstname>Hinne</firstname>
+       <surname>Hettema</surname>
+       <affiliation>
+          <address><email>h.hettema@auckland.ac.nz</email></address>
+       </affiliation>
+     </author>
+    <author>
+       <firstname>Jaime</firstname>
+       <surname>Anguiano Olarra</surname>
+       <affiliation>
+          <address><email>jaime@genuara.ugr.es</email></address>
+       </affiliation>
+     </author>
+
+     <pubdate>2002-06</pubdate>
+
+     <!-- Most recent revision goes at the top; list in descending order -->
+     <!-- All dates specified in ISO "YYYY-MM-DD" format -->
+     <revhistory>
+       <revision>
+          <revnumber>0.1</revnumber>
+          <date>2002-06-20</date>
+          <authorinitials>HH</authorinitials>
+          <revremark>First release</revremark>
+       </revision>
+     </revhistory>
+
+     <!-- Provide a good abstract; a couple of sentences is sufficient -->
+     <abstract>
+        <para>
+	This document describes how to install mono on your Linux system 
+	from the source and describes some simple experiments you can
+	perform with this installation.
+	</para>
+     </abstract>
+
+  </articleinfo>
+
+
+<sect1 id="intro">
+<title>Introduction</title>
+
+<para>
+Mono is an open source implementation of the Common Language Infrastructure
+(CLI) specified in ECMA standard 335. It comes with a C# compiler and
+provides an extensible platform to develop and run applications that
+are interoperable with Microsoft .NET.
+</para>
+
+<para>
+Mono is not finished--it is a project still under development. As a
+result, installation and configuration may not be as smooth as you
+will be used to from other Linux applications. Nevertheless, mono is
+in a state that will allow you to get it up and running and gain
+experience with it--which is, I would suggest, a very smart thing to do.
+</para>
+
+<para>
+This document is limited in the following sense: it describes how to
+download a 'stable' version of mono as a 'tarball' and get it to run on
+your computer. I'm also assuming you run mono on Linux rather than
+on Windows. All the examples have been tested on a 'vanilla' Red Hat 7.3 
+installation.
+</para>
+
+<para>
+There are two items this document will <emphasis>not 
+</emphasis> cover: the first is how to self host the mcs compiler 
+under linux and the second is the graphical user environment 
+which is implemented as GTK#. These two interesting topics 
+are the subject of two more howto's that I'm planning.
+</para>
+
+<para>
+This document is also less useful for two types of people.
+</para> 
+<itemizedlist> 
+<listitem> 
+<para> 
+If you are a very inexperienced linux user and want to know what mono is
+all about, there is an easier way to install mono. Go to mono.baselabs.org
+and download the rpm's ready for installation on your system. This site also
+runs a tutorial that is worth reading.
+</para> 
+</listitem> 
+<listitem> 
+<para> 
+If you are a very experienced user wanting to contribute to the mono code,
+you should probably regularly do a CVS download. At the moment, the mono
+code grows very fast, and the 'stable' releases still appear too slowly.
+</para>
+</listitem>
+
+</itemizedlist>
+
+<para>
+This document is aimed at the mono beginner, and aims to present a complete
+view of a minimal installation, which will allow you to experiment with
+mono to some degree. It also describes some of those experiments. We
+expect that after reading this document you'll go on to do either of
+two things:
+</para>
+<orderedlist>
+<listitem>
+<para>
+Continue to contribute to the mono project in some shape or form. The
+website has some ideas and suggestions under the heading 'Contributing'.
+</para>
+</listitem>
+<listitem>
+<para>
+Continue to write applications that run in mono. 
+</para>
+</listitem>
+</orderedlist>
+
+<para>
+We hope this document will be useful to you in your first steps with mono.
+Happy hacking!
+</para>
+
+<sect2 id="note">
+<title>A note on the development of this document</title>
+<para>
+This document is expected to grow into a full 'running mono howto' over time.
+As of yet, it does not really discuss some of the excellent efforts of others
+to package mono into an rpm or deb and prepare it for easy installation.
+It is our aim to include this in future versions of this document.
+</para>
+</sect2>
+
+<sect2 id="prerequisites">
+<title>Prerequisites</title>
+<para>
+This document assumes you are somewhat familiar with the architecture
+of the Common Language Infrastructure and the C# programming language.
+</para>
+
+<para>
+To compile mono on your system, you will also have to satisfy 
+some dependencies on other software. A list of these are given 
+on the mono download page. Read through this list to see if 
+you've got all components. 
+</para>
+
+<para>
+On a practical note, I had no dependency issues with the 
+installation of mono 0.12 on a 'standard issue' Red Hat 7.3 build.
+</para>
+
+</sect2>
+
+<sect2 id="disclaimer"> <title>Disclaimer</title>
+
+<para> 
+No liability for the contents of this document can be accepted.
+Use the concepts, examples and information at your own risk.  There may
+be errors and inaccuracies, that could be damaging to your system.
+Proceed with caution, and although this is highly unlikely, the author(s)
+do not take any responsibility.  
+</para>
+
+<para> 
+All copyrights are held by their by their respective owners,
+unless specifically noted otherwise.  Use of a term in this document
+should not be regarded as affecting the validity of any trademark or
+service mark.  Naming of particular products or brands should not be
+seen as endorsements.  
+</para> 
+</sect2>
+
+<!-- Give credit where credit is due...very important --> <sect2
+id="credits"> <title>Credits / Contributors</title>
+
+<para> This document was originally created by Jaime Anguiano Olarra,
+but has been extensively rewritten. Credits are due to </para>
+<itemizedlist> 
+<listitem> 
+<para>Jaime Anguiano Olarra <email>jaime@geneura.ugr.es</email> 
+for creating the original version of this document, and in fact 
+the document that got me through installing mono for the first time.
+</para> 
+</listitem> 
+<listitem>
+<para>
+My partner Margaret for support on my more exotic ventures.
+</para>
+</listitem>
+</itemizedlist> 
+</sect2>
+
+<!-- Feedback --> 
+<sect2 id="feedback"> <title>Feedback</title>
+
+<para> 
+Feedback is most certainly welcome for this document. Send your
+additions, comments and criticisms to the following email address:
+<email>mono-docs-list@ximian.com</email>. I am lurking on this list 
+and will maintain this document as required.  
+</para> 
+</sect2>
+</sect1>
+
+<!-- This is the preamble stuff over with the rest of document
+follows... --> 
+<sect1 id="installation"> 
+<title> Installing Mono</title>
+
+<sect2 id="obtaining"> 
+<title>Obtaining Mono</title> 
+<para> 
+There are several ways to get Mono running on your computer. This
+document will discuss only one of those: downloading the source tarball
+and utilising the make utilities to get mono up and running.  There is
+only one mono package to worry about if you are just after a 'base' install
+of mono: the mono runtime. This package, found under the name "mono-x.xx"
+has got a compiled version of the compiler built in.
+</para>
+
+<para>
+You'll be able to complete everything in this document if you just install
+the runtime, but taking a look at the compiler package is well worth the
+effort. The compiler is written in C# and is 'self hosting' which means it
+is able to compile itself. 
+</para>
+
+<para>
+As of this moment, it is my understanding that there are still some issues
+with the 'self hosting' bit of the compiler on linux, although this is 
+expected to work in later versions of mono. If you are just interested in
+finding out how mono will work under linux, I would not worry about the
+self-hosting bit for now. The self-hosting of the compiler will be the
+topic of a future howto.
+</para>
+
+<para> 
+See <ulink url="http://www.go-mono.com/download">the mono download
+site</ulink> for the source of the tarballs.  
+</para>
+
+<para>
+This page also lists the current versions of the software 
+mono depends on. Make sure that your system has all the 
+required versions, otherwise mono won't compile.
+</para>
+
+<para>
+At a minimum for mono 0.12, you'll need to:
+</para>
+
+<itemizedlist>
+<listitem>
+<para>
+download and install
+<ulink url="http//www.freedesktop.org/software/pkgconfig">
+pkg-config</ulink>.
+</para>
+</listitem>
+<listitem>
+<para>
+download and install
+<ulink url="ftp://ftp.gtk.org/pub/gtk/v1.3/glib-1.3.12.tar.gz">
+glib 1.3</ulink>.
+</para>
+</listitem>
+</itemizedlist>
+
+<para> 
+Installing the tarballs is done via GNU autoconf and
+automake. The general upshot of running autoconf and automake is that you
+can type <command>./configure</command> and then <command> make</command>
+to do the build.  
+Typing <command>make install</command> completes the installation of mono
+on your system.
+</para>
+
+<para>
+To build the mono runtime package, unzip the tarball to some useful
+location.  I tend to use <command>/usr/src</command> as the location,
+but you could really do it anywhere. For the install process, it is
+also a good idea to be 'root'.  The installation process will shuttle
+some executables into <command>/usr/local/bin</command> (more about
+that later).
+</para>
+
+<para>
+Unzipping the tarballs will have created two directories in <command>
+/usr/src/</command>, one called something like mono-x.xx and the other 
+mcs-x.xx. The one called 'mono' is the runtime environment, and this contains
+all that is initially needed to run mono and investigate its inner workings.
+</para>
+
+<para>
+To start building the mono runtime, first type <command>./configure</command>.
+You will see an output like this:
+</para>
+<programlisting>
+[root@taurus mono-0.12]# ./configure
+loading cache ./config.cache
+checking host system type... i686-pc-linux-gnu
+checking target system type... i686-pc-linux-gnu
+checking build system type... i686-pc-linux-gnu
+checking for a BSD compatible install... (cached) /usr/bin/install -c
+checking whether build environment is sane... yes
+checking whether make sets ${MAKE}... (cached) yes
+checking for working aclocal... found
+
+
+snip ....
+
+
+checking BASE_DEPENDENCIES_CFLAGS...  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+checking BASE_DEPENDENCIES_LIBS...  -lglib-2.0
+checking for GC_malloc in -lgc... (cached) no
+configure: warning: Compiling mono without GC.
+checking if off_t is 64 bits wide... no
+checking if _FILE_OFFSET_BITS=64 gives 64 bit off_t... ok
+
+snip ...
+
+creating Makefile
+creating mono/Makefile
+creating mono/utils/Makefile
+creating mono/metadata/Makefile
+creating mono/dis/Makefile
+creating mono/cil/Makefile
+creating mono/arch/Makefile
+creating mono/os/Makefile
+creating mono/os/win32/Makefile
+creating mono/os/unix/Makefile
+creating mono/arch/x86/Makefile
+creating mono/arch/ppc/Makefile
+creating mono/arch/sparc/Makefile
+creating mono/arch/arm/Makefile
+creating mono/interpreter/Makefile
+creating mono/tests/Makefile
+creating mono/benchmark/Makefile
+creating mono/monoburg/Makefile
+creating mono/monograph/Makefile
+creating mono/jit/Makefile
+creating mono/io-layer/Makefile
+creating mono/handles/Makefile
+creating runtime/Makefile
+creating scripts/Makefile
+creating man/Makefile
+creating doc/Makefile
+creating docs/Makefile
+creating config.h
+config.h is unchanged
+
+
+        GC:     auto
+
+
+[root@taurus mono-0.12]#
+</programlisting>
+
+
+<para>
+This means that the configure script has now created all the 
+makefiles necessary to complete the build on your system. 
+Note the "GC: auto" at the end of the list of commands. 
+GC stands for "garbage collection" and it
+will be addressed in a later section of this document.
+</para>
+<para>
+You are now ready to start the mono "build" process. To kick 
+this off, you can type <command>make</command> at the 
+command prompt. You'll see something like this:
+</para>
+
+<programlisting>
+[root@taurus mono-0.12]# make
+make  all-recursive
+make[1]: Entering directory `/usr/src/mono-0.12'
+Making all in mono
+make[2]: Entering directory `/usr/src/mono-0.12/mono'
+Making all in utils
+make[3]: Entering directory `/usr/src/mono-0.12/mono/utils'
+gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I/usr/include/glib-2.0 
+-I/usr/lib/glib-2.0/include   -I/usr/include/glib-2.0 
+-I/usr/lib/glib-2.0/include   -I../.. -I../../mono   
+-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE   -g -Wall 
+-Wunused -Wmissing-prototypes -Wmissing-declarations 
+-Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs 
+-Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings 
+-c mono-hash.c
+
+</programlisting>
+<para>
+and this will continue for a while. On my 1 GHz Duron with 256 MB of RAM the 
+total build process takes about three minutes. All the terrible flags after gcc
+have essentially been set by the configure script and there is no need to worry
+about these.
+</para>
+<para>
+To finally install mono, you can type <command>make install</command> 
+to get a working version of mono. This command will copy the 
+scripts that run the executables to a place where the operating system
+will be ale to find them. This location is <command>/usr/local/bin</command>
+on my system. 
+</para>
+
+</sect2>
+
+<sect2 id="garbage_collection">
+<title> Garbage Collection</title>
+<para>
+To make the mint interpreter work with garbage collection, you first need to
+install a garbage collection package on your system. Mono works with
+Boehm Garbage collection, which is found at 
+<ulink url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">
+http://www.hpl.hp.com/personal/Hans_Boehm/gc/
+</ulink>.
+</para>
+
+<para>
+To get garbage collection to work, I downloaded the source tarball 
+into <command>/usr/src/</command> and typed <command>./configure</command>
+followed by <command>make</command> and <command>make install</command>.
+</para>
+
+<para>
+There is one glitch to work around. The header file for the garbage collection
+<command>gc.h</command> is found in the <command>/usr/src/gc6.0/include
+</command> directory (at least on my system). The mono build process will break
+on this location: it is looking for the header file in some other place called
+<command>/usr/include/gc/</command> and won't be able to find the correct
+header file.
+</para>
+
+<para>
+The solution is to build a symbolic link between these two locations as 
+follows
+</para>
+
+<programlisting>
+[root@taurus include]# ln -s /usr/src/gc6.0/include/ /usr/include/gc
+</programlisting>
+
+<para>
+after which you'll be able to list the directory contents as if they were
+in <command>/usr/include</command>
+</para>
+
+<programlisting>
+[root@taurus include]# pwd
+/usr/include
+[root@taurus include]# ls /usr/include/gc
+cord.h                gc_backptr.h  gc_inline.h             javaxfc.h
+ec.h                  gc_cpp.h      gc_local_alloc.h        leak_detector.h
+gc                    gc_gcj.h      gc_mark.h               new_gc_alloc.h
+gc_alloc.h            gc.h          gc_pthread_redirects.h  private
+gc_amiga_redirects.h  gc_inl.h      gc_typed.h              weakpointer.h
+[root@taurus include]#
+</programlisting>
+
+<para>
+To get mono to work with garbage collection, you'll have to rebuild the
+environment. This is done easily by typing <command>make distclean</command>
+to clean up any existing executables.
+</para>
+
+<para>
+Continue the build by typing <command>./configure</command>, and look at
+the last line. It should read:
+</para>
+
+<programlisting>
+
+snip...
+
+creating config.h
+
+
+        GC:     boehm
+
+
+[root@taurus mono-0.12]#
+
+</programlisting>
+
+<para>
+The GC: boehm tells you that garbage collection has been turned on. Now to
+compile the runtime, you type <command>make</command> and <command> make
+install</command> as previously.
+</para>
+
+<para>
+You now have mono working with Garbage Collection.
+</para>
+
+<para>
+Although my experimentation is incomplete as of this time, I have found some
+issues with running Garbage Collection continuously, and my recommendation
+would be to turn it off for now.
+</para>
+
+<para>
+To turn garbage collection off again, you have to go to the <command>/usr/src
+</command> directory where you extracted the tarball. Enter the <command>gc6.0
+</command> directory and type <command>make uninstall</command> to uninstall 
+Garbage Collection. Then in your <command>mono</command> directory, type
+<command>make distclean</command> followed by <command>./configure</command>,
+<command>make</command> and <command>make install</command>.
+</para>
+
+</sect2>
+
+</sect1>
+
+<sect1 id="running">
+<title>Running mono</title>
+<sect2 id="basic">
+<title>Basic steps</title>
+<para>
+To work with mono, you first have to create a C# program. Open up 
+your favourite editor, and type in the following code:
+</para>
+<programlisting>
+using System;
+
+class Hello
+{
+public static void Main(String[] args)
+	{
+	Console.WriteLine("mono:: is alive and well...");
+
+	for (int i = 0; i < args.Length; i++)
+		Console.WriteLine("Argument {0} = {1}", i, args[i]);
+	}
+}
+</programlisting>
+
+<para>
+Save the file as hello.cs. To compile this into a working program, 
+type mcs hello.cs. If you get the following:
+</para>
+<programlisting>
+[hinne@taurus hello]$ mcs hello.cs
+RESULT: 0
+[hinne@taurus hello]$
+</programlisting>
+<para>
+you know the compile worked fine. If you see some strange error
+messages including the word 'parser' somewhere, you made a mistake in
+your program. Fix this up first.
+</para>
+
+<para>
+You are now ready to execute your first mono program.  To execute 
+the code, type
+</para>
+
+<programlisting>
+[hinne@taurus hello]$ mono hello.exe arg1 arg2 arg 3
+</programlisting>
+<para>
+(where we have given some arguments just for fun) and you'll 
+see the following:
+</para>
+
+<programlisting>
+mono:: is alive and well...
+Argument 0 = arg1
+Argument 1 = arg2
+Argument 2 = arg
+Argument 3 = 3
+RESULT: 0
+</programlisting>
+<para>
+As you can see, mono printed the line "mono:: is alive and well" 
+and printed the list of arguments. This completes the creation 
+and execution of your first mono program.
+</para>
+</sect2>
+
+<sect2 id="interpreter">
+<title>Interpreter</title>
+<para>
+But mono will allow you to do more. First of all, mono is the 
+compiled mono execution environment which uses the Just in 
+Time (JIT) compiler. Mono also comes with an interpreted 
+environment, which can be accessed using the command 'mint' 
+as follows
+</para>
+<programlisting>
+[hinne@taurus hello]$ mint hello.exe arg1 arg 2
+mono:: is alive and well...
+Argument 0 = arg1
+Argument 1 = arg
+Argument 2 = 2
+[hinne@taurus hello]$
+</programlisting>
+<para>
+As you can see, it makes no difference to mono output which 
+environment you use, but what happens under the hood is very 
+different. If you use 'mono' as the command line tool, you 
+call the 'production' execution environment which will read 
+your portable executable (PE) file, and call the just in 
+time (JIT) compiler to compile the PE code down to machine 
+level code (in my case, an x86 architecture) after which 
+it is executed.
+</para>
+<para>
+If you use mint, the JIT is not used, and the PE code is 
+interpreted into x86 instructions for execution. In fact, 
+for our simple 'hello' mint is slightly faster. The point 
+is that the JIT compiler will take some time to compile the 
+code of our program and store it in some location in memory, 
+but the subsequent execution of the code is faster with mono.
+</para>
+<para>
+
+You can see what happens below (the thing to look for is the 
+'user' time: 0.1 seconds with mono and 0.06 seconds with mint):
+
+</para>
+<programlisting>
+[hinne@taurus hello]$ time mono hello.exe arg1 arg 2
+mono:: is alive and well...
+Argument 0 = arg1
+Argument 1 = arg
+Argument 2 = 2
+RESULT: 0
+
+real    0m0.575s
+user    0m0.100s
+sys     0m0.010s
+[hinne@taurus hello]$ time mint hello.exe arg1 arg 2
+mono:: is alive and well...
+Argument 0 = arg1
+Argument 1 = arg
+Argument 2 = 2
+
+real    0m0.545s
+user    0m0.060s
+sys     0m0.000s
+[hinne@taurus hello]$
+</programlisting>
+<para>
+After this simple run of mono, it is time to play with some options. 
+I won't cover these in detail since there are quite a few, and also because
+I assume you downloaded mono to hack it around in the first place. So
+I'll leave some pointers.
+</para>
+
+
+<sect3 id="debugging">
+<title>Debugging</title>
+<para>
+Mono supports a debugging option when you specify the "-d" flag while running
+the runtime. Utilising this flag will get you a significant amount of output,
+and it may be an idea to specify an output file as well. The interesting aspect
+of this file is that it allows you to see to some extent (quite precisely,
+actually) what the JIT compiler is up to.
+</para>
+</sect3>
+
+<sect3 id="statistics">
+<title>Statistics</title>
+<para>
+It is also possible to collect some runtime statistics on your program. These
+will give you some idea of the resource utilisation of your program.
+</para>
+<programlisting>
+[hinne@taurus hello]$ mono --stats hello.exe
+mono:: is alive and well...
+RESULT: 0
+Mono Jit statistics
+Compiled methods:       58
+Methods cache lookup:   15
+Method trampolines:     698
+Basic blocks:           188
+Max basic blocks:       15
+Allocated vars:         238
+Analyze stack repeat:   61
+Compiled CIL code size: 2450
+Native code size:       10167
+Max code size ratio:    7.13 (FileStream::FlushBuffer)
+Biggest method:         1016 (StreamWriter::Write)
+Code reallocs:          27
+Allocated code size:    22073
+Inlineable methods:     17
+Inlined methods:        22
+
+Created object count:   18
+Initialized classes:    127
+Used classes:           37
+Static data size:       288
+VTable data size:       8292
+</programlisting>
+</sect3>
+
+</sect2>
+
+<sect2 id="ILAsm_code" >
+<title>Inspecting IL Assembly code</title>
+<para>
+Mono also provides a small tool that will let you disassemble 
+the executable (.exe) file so you can have a peek 
+under the hood. This tool is monodis, and is run as 
+follows:
+
+</para>
+<programlisting>
+[hinne@taurus hello]$ monodis hello.exe
+.assembly extern mscorlib
+{
+  .ver 0:0:0:0
+}
+.assembly 'hello'
+{
+  .hash algorithm 0x00008004
+  .ver  0:0:0:0
+}
+  .class private auto ansi beforefieldinit Hello
+        extends [mscorlib]System.Object
+  {
+
+    // method line 1
+    .method public hidebysig  specialname  rtspecialname
+           instance default void .ctor()  cil managed
+    {
+        // Method begins at RVA 0x20ec
+        // Code size 7 (0x7)
+        .maxstack 8
+        IL_0000: ldarg.0
+        IL_0001: call instance void System.Object::.ctor()
+        IL_0006: ret
+    } // end of method instance default void .ctor()
+
+    // method line 2
+    .method public static
+           default void Main(string[] args)  cil managed
+    {
+        // Method begins at RVA 0x20f4
+        .entrypoint
+        // Code size 56 (0x38)
+        .maxstack 5
+        .locals init (
+                int32   V_0,
+                int32   V_1)
+        IL_0000: ldstr "mono:: is alive and well..."
+        IL_0005: call void System.Console::WriteLine(string)
+        IL_000a: ldc.i4.0
+        IL_000b: stloc.0
+        IL_000c: ldloc.0
+        IL_000d: ldarg.s 0
+        IL_000f: ldlen
+        IL_0010: clt
+        IL_0012: brfalse IL_0037
+
+        IL_0017: ldstr "Argument {0} = {1}"
+        IL_001c: ldloc.0
+        IL_001d: box [mscorlib]System.Int32
+        IL_0022: ldarg.s 0
+        IL_0024: ldloc.0
+        IL_0025: ldelem.ref
+        IL_0026: call void System.Console::WriteLine(string, object, object)
+        IL_002b: nop
+        IL_002c: ldloc.0
+        IL_002d: ldc.i4.1
+        IL_002e: add
+        IL_002f: stloc.1
+        IL_0030: ldloc.1
+        IL_0031: stloc.0
+        IL_0032: br IL_000c
+
+        IL_0037: ret
+    } // end of method default void Main(string[] args)
+
+  } // end of type Hello
+
+[hinne@taurus hello]$
+</programlisting>
+<para>
+This is the listing of the code of your program in a language 
+called IL assembly, or Common Intermediate Language (CIL). The 
+CIL provides the portability of the mono platform, and ensures 
+that code compiled with Microsoft's .NET framework will work 
+on mono and vice versa. 
+</para>
+</sect2>
+
+<sect2 id="man_pages">
+<title>Man pages</title>
+
+<para>
+Mono has man pages already installed, and generally, typing <command>
+man</command> before the command you wish to execute should help in 
+getting a list of the options. In many cases, it's still up to you
+to figure out what they do.
+</para>
+
+</sect2>
+
+
+</sect1>
+
+
+<sect1 id="problems">
+<title>Problems</title>
+<para> 
+With mono being as new as it is, it is likely that you will have some
+problems with installation. The following are some ideas to help you
+out in a bind:
+</para>
+
+<orderedlist>
+<listitem>
+<para> 
+See the Ximian Bugzilla page to find out if there is a bug
+report about your specific issue.
+</para>
+</listitem>
+
+<listitem>
+<para>Read this document.  If it does not solve your problem, we want to
+know about it. Please send a message to the email address listed for
+feedback at the beginning of the document.</para>
+</listitem>
+
+<listitem>
+
+<para> 
+Visit the mono mailing lists' archives and do a little
+research in there for threads talking about the problem you have.
+</para>
+</listitem>
+
+<listitem>
+<para> 
+If you still cannot correct the problem, send a message to the
+mono list. When you do this, please be as precise as possible--i.e.
+mention the system you are running, the version of mono that you have the 
+problem with, and give any error codes and other output that might appear.
+</para>
+</listitem>
+</orderedlist>
+
+</sect1>
+
+<sect1 id="knownproblems">
+<title>Known Problems</title>
+
+<para> mcs fails to compile in Linux.
+To the best of my knowledge, as of yet mcs cannot compile in Linux. 
+Try to install the already made packages from 
+http://mono.baselabs.org/index.php/software. </para>
+</sect1>
+
+<!-- Legal Sections --> <sect1 id="copyright">
+ <title>Copyright and License</title>
+
+ <!-- The LDP recommends, but doesn't require, the GFDL --> <para>
+     This document, <emphasis>Running mono</emphasis>, is copyrighted
+     (c) 2002 by <emphasis>Hinne Hettema</emphasis> and
+     <emphasis>Jaime Anguiano Olarra</emphasis>.  Permission is
+     granted to copy, distribute and/or modify this document under the
+     terms of the GNU Free Documentation License, Version 1.1 or any later
+     version published by the Free Software Foundation; with no Invariant
+     Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+     A copy of the license is included in the section entitled "GNU Free
+     Documentation License".
+ </para>
+
+<sect2 id="gfdl"> <title>GNU Free Documentation License</title> 
+<!-- GNU Project - Free Software Foundation (FSF) -->
+
+<para>Version 1.1, March 2000</para>
+
+<blockquote> <para>Copyright (C) 2000  Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA	02111-1307  USA Everyone is
+permitted to copy and distribute verbatim copies of this license document,
+but changing it is not allowed.</para> </blockquote>
+
+<sect3 id="gfdl-0"> <title>PREAMBLE</title>
+
+<para>The purpose of this License is to make a manual, textbook,
+    or other written document "free" in the sense of freedom: to assure
+    everyone the effective freedom to copy and redistribute it, with
+    or without modifying it, either commercially or noncommercially.
+    Secondarily, this License preserves for the author and publisher
+    a way to get credit for their work, while not being considered
+    responsible for modifications made by others.</para>
+
+<para>This License is a kind of "copyleft", which means that
+    derivative works of the document must themselves be free in the
+    same sense.  It complements the GNU General Public License, which
+    is a copyleft license designed for free software.</para>
+
+<para>We have designed this License in order to use it for manuals
+    for free software, because free software needs free documentation:
+    a free program should come with manuals providing the same freedoms
+    that the software does.  But this License is not limited to software
+    manuals; it can be used for any textual work, regardless of subject
+    matter or whether it is published as a printed book.  We recommend
+    this License principally for works whose purpose is instruction
+    or reference.</para>
+</sect3>
+
+<sect3 id="gfdl-1"> <title>APPLICABILITY AND DEFINITIONS</title>
+
+<para>This License applies to any manual or other work that
+    contains a notice placed by the copyright holder saying it can be
+    distributed under the terms of this License.  The "Document", below,
+    refers to any such manual or work.	Any member of the public is a
+    licensee, and is addressed as "you".</para>
+
+<para>A "Modified Version" of the Document means any work
+    containing the Document or a portion of it, either copied verbatim,
+    or with modifications and/or translated into another language.</para>
+
+<para>A "Secondary Section" is a named appendix or a front-matter
+    section of the Document that deals exclusively with the relationship
+    of the publishers or authors of the Document to the Document's overall
+    subject (or to related matters) and contains nothing that could fall
+    directly within that overall subject.  (For example, if the Document
+    is in part a textbook of mathematics, a Secondary Section may not
+    explain any mathematics.)  The relationship could be a matter of
+    historical connection with the subject or with related matters, or
+    of legal, commercial, philosophical, ethical or political position
+    regarding them.</para>
+
+<para>The "Invariant Sections" are certain Secondary Sections
+    whose titles are designated, as being those of Invariant Sections,
+    in the notice that says that the Document is released under this
+    License.</para>
+
+<para>The "Cover Texts" are certain short passages of text that
+    are listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+    that says that the Document is released under this License.</para>
+
+<para>A "Transparent" copy of the Document means a
+    machine-readable copy, represented in a format whose specification
+    is available to the general public, whose contents can be viewed and
+    edited directly and straightforwardly with generic text editors
+    or (for images composed of pixels) generic paint programs or
+    (for drawings) some widely available drawing editor, and that is
+    suitable for input to text formatters or for automatic translation
+    to a variety of formats suitable for input to text formatters.
+    A copy made in an otherwise Transparent file format whose markup
+    has been designed to thwart or discourage subsequent modification
+    by readers is not Transparent.  A copy that is not "Transparent"
+    is called "Opaque".</para>
+
+<para>Examples of suitable formats for Transparent copies include
+    plain ASCII without markup, Texinfo input format, LaTeX input format,
+    SGML or XML using a publicly available DTD, and standard-conforming
+    simple HTML designed for human modification.  Opaque formats include
+    PostScript, PDF, proprietary formats that can be read and edited
+    only by proprietary word processors, SGML or XML for which the
+    DTD and/or processing tools are not generally available, and the
+    machine-generated HTML produced by some word processors for output
+    purposes only.</para>
+
+<para>The "Title Page" means, for a printed book, the title page
+    itself, plus such following pages as are needed to hold, legibly,
+    the material this License requires to appear in the title page.
+    For works in formats which do not have any title page as such,
+    "Title Page" means the text near the most prominent appearance of the
+    work's title, preceding the beginning of the body of the text.</para>
+</sect3>
+
+<sect3 id="gfdl-2"> <title>VERBATIM COPYING</title>
+
+<para>You may copy and distribute the Document in any medium,
+    either commercially or noncommercially, provided that this License,
+    the copyright notices, and the license notice saying this License
+    applies to the Document are reproduced in all copies, and that
+    you add no other conditions whatsoever to those of this License.
+    You may not use technical measures to obstruct or control the
+    reading or further copying of the copies you make or distribute.
+    However, you may accept compensation in exchange for copies.  If you
+    distribute a large enough number of copies you must also follow the
+    conditions in section 3.</para>
+
+<para>You may also lend copies, under the same conditions stated
+    above, and you may publicly display copies.</para>
+</sect3>
+
+<sect3 id="gfdl-3"> <title>COPYING IN QUANTITY</title>
+
+<para>If you publish printed copies of the Document numbering more
+    than 100, and the Document's license notice requires Cover Texts, you
+    must enclose the copies in covers that carry, clearly and legibly,
+    all these Cover Texts: Front-Cover Texts on the front cover, and
+    Back-Cover Texts on the back cover.  Both covers must also clearly
+    and legibly identify you as the publisher of these copies.	The front
+    cover must present the full title with all words of the title equally
+    prominent and visible.  You may add other material on the covers
+    in addition.  Copying with changes limited to the covers, as long as
+    they preserve the title of the Document and satisfy these conditions,
+    can be treated as verbatim copying in other respects.</para>
+
+<para>If the required texts for either cover are too voluminous to
+    fit legibly, you should put the first ones listed (as many as fit
+    reasonably) on the actual cover, and continue the rest onto adjacent
+    pages.</para>
+
+<para>If you publish or distribute Opaque copies of the Document
+    numbering more than 100, you must either include a machine-readable
+    Transparent copy along with each Opaque copy, or state in or with each
+    Opaque copy a publicly-accessible computer-network location containing
+    a complete Transparent copy of the Document, free of added material,
+    which the general network-using public has access to download
+    anonymously at no charge using public-standard network protocols.
+    If you use the latter option, you must take reasonably prudent steps,
+    when you begin distribution of Opaque copies in quantity, to ensure
+    that this Transparent copy will remain thus accessible at the stated
+    location until at least one year after the last time you distribute
+    an Opaque copy (directly or through your agents or retailers) of
+    that edition to the public.</para>
+
+<para>It is requested, but not required, that you contact the
+    authors of the Document well before redistributing any large number
+    of copies, to give them a chance to provide you with an updated
+    version of the Document.</para>
+</sect3>
+
+<sect3 id="gfdl-4"> <title>MODIFICATIONS</title>
+
+<para>You may copy and distribute a Modified Version of the
+    Document under the conditions of sections 2 and 3 above, provided
+    that you release the Modified Version under precisely this License,
+    with the Modified Version filling the role of the Document, thus
+    licensing distribution and modification of the Modified Version
+    to whoever possesses a copy of it.	In addition, you must do these
+    things in the Modified Version:</para>
+
+<orderedlist numeration="upperalpha"> <listitem><para>Use in the
+Title Page
+      (and on the covers, if any) a title distinct from that of the
+      Document, and from those of previous versions (which should, if
+      there were any, be listed in the History section of the Document).
+      You may use the same title as a previous version if the original
+      publisher of that version gives permission.</para>
+</listitem>
+
+<listitem><para>List on the Title Page,
+      as authors, one or more persons or entities responsible for
+      authorship of the modifications in the Modified Version, together
+      with at least five of the principal authors of the Document (all
+      of its principal authors, if it has less than five).</para>
+</listitem>
+
+<listitem><para>State on the Title page
+      the name of the publisher of the Modified Version, as the
+      publisher.</para>
+</listitem>
+
+<listitem><para>Preserve all the
+      copyright notices of the Document.</para>
+</listitem>
+
+<listitem><para>Add an appropriate
+      copyright notice for your modifications adjacent to the other
+      copyright notices.</para>
+</listitem>
+
+<listitem><para>Include, immediately
+      after the copyright notices, a license notice giving the public
+      permission to use the Modified Version under the terms of this
+      License, in the form shown in the Addendum below.</para>
+</listitem>
+
+<listitem><para>Preserve in that license
+      notice the full lists of Invariant Sections and required Cover
+      Texts given in the Document's license notice.</para>
+</listitem>
+
+<listitem><para>Include an unaltered
+      copy of this License.</para>
+</listitem>
+
+<listitem><para>Preserve the section
+      entitled "History", and its title, and add to it an item stating at
+      least the title, year, new authors, and publisher of the Modified
+      Version as given on the Title Page.  If there is no section entitled
+      "History" in the Document, create one stating the title, year,
+      authors, and publisher of the Document as given on its Title Page,
+      then add an item describing the Modified Version as stated in the
+      previous sentence.</para>
+</listitem>
+
+<listitem><para>Preserve the network
+      location, if any, given in the Document for public access to
+      a Transparent copy of the Document, and likewise the network
+      locations given in the Document for previous versions it was
+      based on.  These may be placed in the "History" section.	You may
+      omit a network location for a work that was published at least four
+      years before the Document itself, or if the original publisher of
+      the version it refers to gives permission.</para>
+</listitem>
+
+<listitem><para>In any section entitled
+      "Acknowledgements" or "Dedications", preserve the section's title,
+      and preserve in the section all the substance and tone of each
+      of the contributor acknowledgements and/or dedications given
+      therein.</para>
+</listitem>
+
+<listitem><para>Preserve all the
+      Invariant Sections of the Document, unaltered in their text and in
+      their titles.  Section numbers or the equivalent are not considered
+      part of the section titles.</para>
+</listitem>
+
+<listitem><para>Delete any section
+      entitled "Endorsements".	Such a section may not be included in
+      the Modified Version.</para>
+</listitem>
+
+<listitem><para>Do not retitle any
+      existing section as "Endorsements" or to conflict in title with
+      any Invariant Section.</para>
+</listitem> </orderedlist> <para>If the Modified Version includes new
+front-matter sections
+    or appendices that qualify as Secondary Sections and contain no
+    material copied from the Document, you may at your option designate
+    some or all of these sections as invariant.  To do this, add their
+    titles to the list of Invariant Sections in the Modified Version's
+    license notice.  These titles must be distinct from any other section
+    titles.</para>
+
+<para>You may add a section entitled "Endorsements", provided it
+    contains nothing but endorsements of your Modified Version by various
+    parties--for example, statements of peer review or that the text has
+    been approved by an organization as the authoritative definition of
+    a standard.</para>
+
+<para>You may add a passage of up to five words as a Front-Cover
+    Text, and a passage of up to 25 words as a Back-Cover Text, to the end
+    of the list of Cover Texts in the Modified Version.  Only one passage
+    of Front-Cover Text and one of Back-Cover Text may be added by (or
+    through arrangements made by) any one entity.  If the Document already
+    includes a cover text for the same cover, previously added by you or
+    by arrangement made by the same entity you are acting on behalf of,
+    you may not add another; but you may replace the old one, on explicit
+    permission from the previous publisher that added the old one.</para>
+
+<para>The author(s) and publisher(s) of the Document do not by
+    this License give permission to use their names for publicity for
+    or to assert or imply endorsement of any Modified Version.</para>
+</sect3>
+
+<sect3 id="gfdl-5"> <title>COMBINING DOCUMENTS</title>
+
+<para>You may combine the Document with other documents released
+    under this License, under the terms defined in section 4 above for
+    modified versions, provided that you include in the combination all of
+    the Invariant Sections of all of the original documents, unmodified,
+    and list them all as Invariant Sections of your combined work in
+    its license notice.</para>
+
+<para>The combined work need only contain one copy of this
+    License, and multiple identical Invariant Sections may be replaced
+    with a single copy.  If there are multiple Invariant Sections with
+    the same name but different contents, make the title of each such
+    section unique by adding at the end of it, in parentheses, the
+    name of the original author or publisher of that section if known,
+    or else a unique number.  Make the same adjustment to the section
+    titles in the list of Invariant Sections in the license notice of
+    the combined work.</para>
+
+<para>In the combination, you must combine any sections entitled
+    "History" in the various original documents, forming one section
+    entitled "History"; likewise combine any sections entitled
+    "Acknowledgements", and any sections entitled "Dedications".
+    You must delete all sections entitled "Endorsements."</para>
+</sect3>
+
+<sect3 id="gfdl-6"> <title>COLLECTIONS OF DOCUMENTS</title>
+
+<para>You may make a collection consisting of the Document and
+    other documents released under this License, and replace the
+    individual copies of this License in the various documents with a
+    single copy that is included in the collection, provided that you
+    follow the rules of this License for verbatim copying of each of
+    the documents in all other respects.</para>
+
+<para>You may extract a single document from such a collection,
+    and distribute it individually under this License, provided you
+    insert a copy of this License into the extracted document, and follow
+    this License in all other respects regarding verbatim copying of
+    that document.</para>
+</sect3>
+
+<sect3 id="gfdl-7"> <title>AGGREGATION WITH INDEPENDENT WORKS</title>
+<para>A compilation of the Document or its derivatives with other
+    separate and independent documents or works, in or on a volume
+    of a storage or distribution medium, does not as a whole count
+    as a Modified Version of the Document, provided no compilation
+    copyright is claimed for the compilation.  Such a compilation is
+    called an "aggregate", and this License does not apply to the other
+    self-contained works thus compiled with the Document, on account
+    of their being thus compiled, if they are not themselves derivative
+    works of the Document.</para>
+
+<para>If the Cover Text requirement of section 3 is applicable to
+    these copies of the Document, then if the Document is less than
+    one quarter of the entire aggregate, the Document's Cover Texts
+    may be placed on covers that surround only the Document within
+    the aggregate.  Otherwise they must appear on covers around the
+    whole aggregate.</para>
+</sect3>
+
+<sect3 id="gfdl-8"> <title>TRANSLATION</title>
+
+<para>Translation is considered a kind of modification, so you may
+    distribute translations of the Document under the terms of section 4.
+    Replacing Invariant Sections with translations requires special
+    permission from their copyright holders, but you may include
+    translations of some or all Invariant Sections in addition to the
+    original versions of these Invariant Sections.  You may include
+    a translation of this License provided that you also include the
+    original English version of this License.  In case of a disagreement
+    between the translation and the original English version of this
+    License, the original English version will prevail.</para>
+</sect3>
+
+<sect3 id="gfdl-9"> <title>TERMINATION</title> <para>You may not copy,
+modify, sublicense, or distribute the
+    Document except as expressly provided for under this License.
+    Any other attempt to copy, modify, sublicense or distribute the
+    Document is void, and will automatically terminate your rights under
+    this License.  However, parties who have received copies, or rights,
+    from you under this License will not have their licenses terminated
+    so long as such parties remain in full compliance.</para>
+</sect3>
+
+<sect3 id="gfdl-10"> <title>FUTURE REVISIONS OF THIS LICENSE</title>
+
+<para>The Free Software Foundation may publish new, revised
+    versions of the GNU Free Documentation License from
+    time to time.  Such new versions will be similar
+    in spirit to the present version, but may differ in
+    detail to address new problems or concerns.  See <ulink
+    url="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</ulink>.</para>
+
+<para>Each version of the License is given a distinguishing
+    version number.  If the Document specifies that a particular
+    numbered version of this License "or any later version" applies
+    to it, you have the option of following the terms and conditions
+    either of that specified version or of any later version that has
+    been published (not as a draft) by the Free Software Foundation.
+    If the Document does not specify a version number of this License,
+    you may choose any version ever published (not as a draft) by the
+    Free Software Foundation.</para>
+</sect3>
+
+<sect3 id="gfdl-11"> <title>How to use this License for your
+documents</title>
+
+<para>To use this License in a document you have written, include
+    a copy of the License in the document and put the following copyright
+    and license notices just after the title page:</para>
+
+<blockquote><para> Copyright (c)  YEAR	YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this
+      document under the terms of the GNU Free Documentation License,
+      Version 1.1 or any later version published by the Free Software
+      Foundation; with the Invariant Sections being LIST THEIR TITLES,
+      with the Front-Cover Texts being LIST, and with the Back-Cover
+      Texts being LIST.  A copy of the license is included in the section
+      entitled "GNU Free Documentation License".
+</para></blockquote>
+
+<para>If you have no Invariant Sections, write "with no Invariant
+    Sections" instead of saying which ones are invariant.  If you
+    have no Front-Cover Texts, write "no Front-Cover Texts" instead of
+    "Front-Cover Texts being LIST"; likewise for Back-Cover Texts.</para>
+
+<para>If your document contains nontrivial examples of program
+    code, we recommend releasing these examples in parallel under your
+    choice of free software license, such as the GNU General Public
+    License, to permit their use in free software.</para>
+</sect3> </sect2> </sect1>
+
+</article>
+
diff --git a/doc/mono-build-w32.sh b/doc/mono-build-w32.sh
index 37e0e708036..28768d97df8 100755
--- a/doc/mono-build-w32.sh
+++ b/doc/mono-build-w32.sh
@@ -42,6 +42,11 @@ fi
 
 cvs checkout mono || exit -1
 
+if [ ! -z "${AUTO_STABLE}" -o -e /usr/autotool/stable ]; then
+    export AUTO_STABLE=${AUTO_STABLE:-/usr/autotool/stable}
+    export AUTO_DEVEL=${AUTO_STABLE}
+fi
+
 # Need to install pkgconfig and set ACLOCAL_FLAGS if there is not a
 # pkgconfig installed already.  Otherwise set PKG_CONFIG_PATH to the
 # glib we're about to install in $here/install.  This script could
@@ -58,7 +63,40 @@ cvs checkout mono || exit -1
 # dont need PKG_CONFIG_PATH (the internal pkgconfig config file
 # $prefix is handled similarly).
 
-if [ ! -f `(cd mono; aclocal --print-ac-dir)`/pkg.m4 ]; then
+function aclocal_scan () {
+    # Quietly ignore the rogue '-I' and other aclocal flags that
+    # aren't actually directories...
+    #
+    # cd into mono/ so that the aclocal wrapper can work out which version
+    # of aclocal to run
+    for i in `(cd mono && aclocal --print-ac-dir)` $ACLOCAL_FLAGS
+    do
+	if [ -f $i/$1 ]; then
+	    return 0
+	fi
+    done
+
+    return 1
+}
+
+function install_package() {
+    zipfile=$1
+    markerfile=$2
+    name=$3
+
+    echo "Installing $name..."
+    if [ ! -f $here/$zipfile ]; then
+	wget http://www.go-mono.com/archive/$zipfile
+    fi
+
+    # Assume that the package is installed correctly if the marker
+    # file is there
+    if [ ! -f $here/install/$markerfile ]; then
+	(cd $here/install || exit -1; unzip -o $here/$zipfile || exit -1) || exit -1
+    fi
+}
+
+if ! aclocal_scan pkg.m4 ; then
     ACLOCAL_FLAGS="-I $here/install/share/aclocal $ACLOCAL_FLAGS"
 fi
 
@@ -68,24 +106,27 @@ export ACLOCAL_FLAGS
 # Grab pkg-config, glib etc
 if [ ! -d $here/install ]; then
     mkdir $here/install || exit -1
-
-    # Fetch and install pkg-config, glib, iconv, intl
-    for i in pkgconfig-0.80-tml-20020101.zip glib-1.3.12-20020101.zip glib-dev-1.3.12-20020101.zip libiconv-1.7.zip libiconv-dev-1.7.zip libintl-0.10.40-20020101.zip
-    do
-	wget http://www.go-mono.org/archive/$i
-	(cd $here/install || exit -1; unzip -o ../$i || exit -1) || exit -1
-    done
 fi
 
+# Fetch and install pkg-config, glib, iconv, intl
+
+install_package pkgconfig-0.80-tml-20020101.zip bin/pkg-config.exe pkgconfig
+install_package glib-1.3.12-20020101.zip lib/libglib-1.3-12.dll glib
+install_package glib-dev-1.3.12-20020101.zip lib/glib-1.3.lib glib-dev
+install_package libiconv-1.7.zip lib/iconv.dll iconv
+install_package libiconv-dev-1.7.zip lib/iconv.lib iconv-dev
+install_package libintl-0.10.40-20020101.zip lib/libintl-1.dll intl
+install_package libgc-dev.zip lib/gc.dll gc-dev
+
 # Needed to find the libiconv bits
-CPPFLAGS="-I$here/install/include"
-LDFLAGS="-L$here/install/lib"
+CPPFLAGS="$CPPFLAGS -I$here/install/include"
+LDFLAGS="$LDFLAGS -L$here/install/lib"
 export CPPFLAGS
 export LDFLAGS
 
 # Make sure we build native w32, not cygwin
-CC="gcc -mno-cygwin"
-export CC
+#CC="gcc -mno-cygwin"
+#export CC
 
 # --prefix is used to set the class library dir in mono, and it needs
 # to be in windows-native form.  It also needs to have '\' turned into
diff --git a/doc/mono-build.sh b/doc/mono-build.sh
index c8c7813f0d5..10878bf2780 100755
--- a/doc/mono-build.sh
+++ b/doc/mono-build.sh
@@ -25,62 +25,120 @@ LD_LIBRARY_PATH=$here/install/lib:$LD_LIBRARY_PATH
 
 # --print-ac-dir was added in 1.2h according to the ChangeLog.  This
 # should mean that any automake new enough for us has it.
-if [ -f `aclocal --print-ac-dir`/pkg.m4 ]; then
+
+function aclocal_scan () {
+    # Quietly ignore the rogue '-I' and other aclocal flags that
+    # aren't actually directories...
+    for i in `aclocal --print-ac-dir` $ACLOCAL_FLAGS
+    do
+	if [ -f $i/$1 ]; then
+	    return 0
+	fi
+    done
+
+    return 1
+}
+
+function pkgconfig_scan () {
+    module=$1
+
+    echo "Finding pkgconfig files for $module..."
+
+    # Should we use locate? or just a list of well-known directories?
+    # locate has the problem of false positives in src dirs
+    for i in /usr/lib/pkgconfig /usr/local/lib/pkgconfig
+    do
+	echo "Looking in $i..."
+	if [ -f $i/${module}.pc ]; then
+	    echo $i
+	    return
+	fi
+    done
+}
+
+function install_package() {
+    tarfile=$1
+    dirname=$2
+    name=$3
+    configure_options=$4
+
+    echo "Installing $name..."
+    if [ ! -f $here/$tarfile ]; then
+	wget http://www.go-mono.org/archive/$tarfile
+    fi
+
+    # Assume that the package built correctly if the dir is there
+    if [ ! -d $here/$dirname ]; then
+	# Build and install package
+	tar xzf $here/$tarfile || exit -1
+	(cd $here/$dirname; ./configure --prefix=$here/install $configure_options || exit -1; make || exit -1; make install || exit -1)
+	success=$?
+	if [ $success -ne 0 ]; then
+	    echo "***** $name build failure. Run rm -rf $here/$dirname to have this script attempt to build $name again next time"
+	    exit -1
+	fi
+    fi
+}
+
+if aclocal_scan pkg.m4 ; then
     install_pkgconfig=no
-    PKG_CONFIG_PATH="$here/install/lib/pkgconfig"
 else
     install_pkgconfig=yes
-    ACLOCAL_FLAGS="-I $here/install/share/aclocal $ACLOCAL_FLAGS"
 fi
 
+if aclocal_scan glib-2.0.m4 ; then
+    install_glib=no
+    if [ $install_pkgconfig = "yes" ]; then
+	# We have to tell the newly-installed pkgconfig about the
+	# system-installed glib
+	PKG_CONFIG_PATH=`pkgconfig_scan glib-2.0`:$PKG_CONFIG_PATH
+    fi
+else
+    install_glib=yes
+    PKG_CONFIG_PATH="$here/install/lib/pkgconfig:$PKG_CONFIG_PATH"
+fi
+
+if [ -f /usr/include/gc/gc.h ]; then
+    install_libgc=no
+else
+    install_libgc=yes
+fi
+
+if [ $install_pkgconfig = "yes" -o $install_glib = "yes" ]; then
+    ACLOCAL_FLAGS="-I $here/install/share/aclocal $ACLOCAL_FLAGS"
+fi
 
 export PATH
 export LD_LIBRARY_PATH
 export ACLOCAL_FLAGS
 export PKG_CONFIG_PATH
 
-# Grab pkg-config-0.8, glib-1.3.12 if necessary
+CPPFLAGS="$CPPFLAGS -I$here/install/include"
+LDFLAGS="$LDFLAGS -L$here/install/lib"
+export CPPFLAGS
+export LDFLAGS
 
-# If any more dependencies are added, it would be worth encapsulating
-# the configure; make; make install part in a shell function
+# Grab pkg-config-0.8, glib-1.3.12 if necessary
 
 if [ $install_pkgconfig = "yes" ]; then
-    echo "Installing pkgconfig..."
-    if [ ! -f $here/pkgconfig-0.8.0.tar.gz ]; then
-	wget --timestamping http://www.go-mono.org/archive/pkgconfig-0.8.0.tar.gz
-    fi
-
-    # Assume that pkgconfig built correctly if the dir is there
-    if [ ! -d $here/pkgconfig-0.8.0 ]; then
-	# Build and install pkg-config
-	tar xzf $here/pkgconfig-0.8.0.tar.gz || exit -1
-	(cd $here/pkgconfig-0.8.0; ./configure --prefix=$here/install || exit -1; make || exit -1; make install || exit -1)
-	success=$?
-	if [ $success -ne 0 ]; then
-	    echo "***** pkgconfig build failure. Run rm -rf $here/pkgconfig-0.8.0 to have this script attempt to build pkgconfig again next time"
-	    exit -1
-	fi
-    fi
+    install_package pkgconfig-0.8.0.tar.gz pkgconfig-0.8.0 pkgconfig ""
 else
     echo "Not installing pkgconfig, you already seem to have it installed"
 fi
 
-
-echo "Installing glib..."
-if [ ! -f $here/glib-1.3.13.tar.gz ]; then
-    wget --timestamping http://www.go-mono.org/archive/glib-1.3.13.tar.gz
+if [ $install_glib = "yes" ]; then
+    install_package glib-1.3.13.tar.gz glib-1.3.13 glib ""
+else
+    echo "Not installing glib, you already seem to have it installed"
 fi
 
-# Assume that glib built correctly if the dir is there
-if [ ! -d $here/glib-1.3.13 ]; then
-    # Build and install glib
-    tar xzf $here/glib-1.3.13.tar.gz || exit -1
-    (cd $here/glib-1.3.13; ./configure --prefix=$here/install || exit -1; make || exit -1; make install || exit -1)
-    success=$?
-    if [ $success -ne 0 ]; then
-	echo "***** glib build failure. Run rm -rf $here/glib-1.3.13 to have this script attempt to build glib again next time"
-	exit -1
-    fi
+if [ $install_libgc = "yes" ]; then
+    LIBS="-ldl" install_package gc6.0.tar.gz gc6.0 libgc "--enable-threads=pthreads"
+    # make install didnt do the headers!
+    mkdir -p $here/install/include/gc
+    cp -r $here/gc6.0/include/* $here/install/include/gc
+else
+    echo "Not installing libgc, you already seem to have it installed"
 fi
 
 # End of build dependencies, now get the latest mono checkout and build that
@@ -100,7 +158,9 @@ if [ ${CVSROOT:0:5} = ":ext:" ]; then
     CVS_RSH=ssh
     export CVS_RSH
 elif [ ${CVSROOT:0:9} = ":pserver:" ]; then
-    if ! grep $CVSROOT ~/.cvspass > /dev/null 2>&1 ; then
+    # Chop off the trailing /mono because cvs 1.11 adds the port number
+    # into the .cvspass line
+    if ! grep ${CVSROOT%:/mono} ~/.cvspass > /dev/null 2>&1 ; then
 	echo "Logging into CVS server.  Anonymous CVS password is probably empty"
 	cvs login
     fi
diff --git a/doc/mono-contribution-howto b/doc/mono-contribution-howto
new file mode 100644
index 00000000000..ea3a4eaae53
--- /dev/null
+++ b/doc/mono-contribution-howto
@@ -0,0 +1,551 @@
+
+			<Mono newbie coders start file>
+	<h1> A little help for mono newbie coders </h1>
+
+
+	For those who are new to Mono and are impatient to contribute
+	with code (uhh... you are brave!!) here is the document you 
+	should read.
+
+	
+	You will see all Mono hackers say the same (great minds have
+	similar way of thinking): First, DO WRITE TESTS!!!. In order
+	to do that:
+	
+	<ul>
+		* Start with the NUnit Tests Guidelines.  In the cvs
+	    	  they are located at: mcs/class/doc/NUnitGuideli...
+
+		* But wait, this is a document for impatient
+	    	  people. So EVERYTHING should be here. Well, it is. 
+	</ul>
+
+
+	<h2> The NUnit Tests Guidelines document </h2>
+
+	Mono NUnit Test Guidelines and Best Practices
+
+	Authors: Nick Drochak  <ndrochak@gol.com>
+	Martin Baulig  <martin@gnome.org>
+	Last Update: 2002-03-02
+	Rev: 0.3
+
+ <b> Purpose </b>
+
+	This document captures all the good ideas people have had 
+	about writing NUnit tests for the mono project. This document 
+	will be useful for anyone who writes or maintains unit tests.
+
+ <b> Other resources </b>
+
+	- mcs/class/README has an explanation of the build process and
+	  how it relates to the tests.
+	- http://nunit.sourceforge.net is the place to find out about 
+	  NUnit
+
+ <b> Getting Started </b>
+
+	If you are new to writing NUnit tests, there is a template 
+	you may use to help get started. The file is:
+
+	mcs/class/doc/TemplateTest.cs
+
+
+	(2.- This is the point two!. This file is just after the end 
+	of the guidelines. Copy/paste it in another buffer. And keep 
+	reading.)
+
+	Save a copy of this file in the appropriate test subdirecty 
+	(see below), and replace all the [text] markers with 
+	appropriate code. Comments in the template are there to guide 
+	you. You should also look at existing tests to see how other 
+	people have written them. 
+
+	mcs/class/corlib/Test/System.Collections/CollectionBaseTest.cs 
+
+	is a small one that might help.
+
+	(3.- You reached the third point. And as expected, it's just 
+	here to tell you that the content of CollectionBaseTest.cs is 
+	after the TemplateTest.cs code at the end of these 
+	guidelines.)
+
+	The directory that will contain your new file depends on the
+	assembly/namespace of the class for which you are creating the
+	tests. Under mcs/class there is a directory for each assembly. 
+	In each assembly there is a Test directory, e.g. 
+	mcs/class/corlib/Test. In the Test directory there are 
+	sub-directories for each namespace in the assembly, e.g. 
+	mcs/class/corlib/Test/Sytem. Put your new test file in the 
+	appropriate sub-directory under Test for the class you are
+	testing.
+
+	Once your test class is complete, you need to add it to the
+	AllTests.cs file in the same directory as your new test. Add a 
+	call to "suite.AddTest()" passing the name of your new test 
+	class's suite property as the parameter.  You will see examples 
+	in the AllTests.cs file, so just copy and paste inside there.
+
+	Once all of that is done, you can do a 'make test' from the top 
+	mcs directory.  Your test class will be automagically included 
+	in the build and the tests will be run along with all the 
+	others.
+
+ <b> Tips </b>
+
+ <b> Provide an unique error message for Assert() </b>
+
+	Include an unique message for each Assert() so that when the 
+	assert fails, it is trivial to locate the failing one. 
+	Otherwise, it may be difficult to determine which part of the 
+	test is failing. A good way to ensure unique messages is to use 
+	something like #A01, #A02 etc.
+
+    	Bad:
+<pre>
+	AssertEquals("array match", compare[0], i1[0]);
+	AssertEquals("array match", compare[1], i1[1]);
+	AssertEquals("array match", compare[2], i1[2]);
+	AssertEquals("array match", compare[3], i1[3]);
+</pre>
+    	Good:
+<pre>
+	AssertEquals("#A01", compare[0], i1[0]);
+	AssertEquals("#A02", compare[1], i1[1]);
+	AssertEquals("#A03", compare[2], i1[2]);
+	AssertEquals("#A04", compare[3], i1[3]);
+</pre>
+	Once you used such a number in an Assert(), don't change it 
+	later on - people might use it it identify the test in bug 
+	reports or in mailing lists.
+
+ <b> Use AssertEquals() to compare things, not Assert(). </b>
+
+	Never compare two values with Assert() - if the test fails, 
+	people have no idea what went wrong while AssertEquals() 
+	reports the failed value.
+
+    	Bad:
+<pre>
+        Assert ("A01", myTicks[0] == t1.Ticks);
+</pre>
+    	Good:
+<pre>
+        AssertEquals ("A01", myTicks[0], t1.Ticks);
+</pre>
+
+ <b> Constructors </b>
+
+	When writing your testcase, please make sure to provide a 
+	constructor which takes no arguments:
+
+<pre>
+        public class DateTimeTest : TestCase
+        {
+
+                public DateTimeTest() : base ("[MonoTests.System.DateTimeTest]") {}
+                public DateTimeTest (string name): base(name) {}
+
+        	public static ITest Suite
+                {
+                        get {
+                                TestSuite suite = new TestSuite ();
+        			return suite;
+        		}
+        	}
+        }
+</pre>
+
+ <b> Namespace </b>
+
+	Please keep the namespace within each test directory
+	consistent - all tests which are referenced in the same
+	AllTests.cs must be in the same namespace. Of course you can
+	use subnamespaces as you like - especially for subdirectories
+	of your testsuite.
+	
+	For instance, if your AllTests.cs is in namespace "MonoTests"
+	and you have a subdirectory called "System", you can put all
+	the tests in that dir into namespace "MonoTests.System".
+
+ <b> Test your test with the microsoft runtime </b>
+
+	If possible, try to run your testsuite with the Microsoft
+	runtime on Windows and make sure all tests in it pass. This is
+	especially important if you're writing a totally new testcase
+	- without this check you can never be sure that your testcase
+	contains no bugs ....
+	
+	Don't worry if you're writing your test on Linux, other people
+	can test it for you on Windows.
+	
+	Sometimes you may discover that a test doesn't show the
+	expected result when run with the Microsoft runtime - either
+	because there is a bug in their runtime or something is
+	misleading or wrong in their documentation. In this case,
+	please put a detailed description of the problem to
+	mcs/class/doc/API-notes and do also report it to the list -
+	we'll forward this to the Microsoft people from time to time
+	to help them fix their documentation and runtime.
+
+<pre>
+-------------------- TemplateTest.cs begins ----------
+
+	// this is a template for making NUnit tests.  Text enclosed 
+	// in square brackets (and the brackets themselves) should be 
+	// replaced by appropiate code.
+
+	// [File Name].cs - NUnit Test Cases for [explain here]
+	//
+	// [Author Name] ([Author email Address])
+	//
+	// (C) [Copyright holder]
+	// 
+
+	// these are the standard namespaces you will need.  You may 
+	// need to add more depending on your tests.
+	using NUnit.Framework;
+	using System;
+
+	// all test namespaces start with "MonoTests."  Append the 
+	// Namespace that contains the class you are testing, e.g. 
+	// MonoTests.System.Collections
+	namespace MonoTests.[Namespace]
+	{
+
+	// the class name should end with "Test" and start with the name 
+	// of the class you are testing, e.g. CollectionBaseTest
+	public class [Class to be tested]Test : TestCase {
+	
+	// there should be two constructors for your class.  The first 
+	// one (without parameters) should set the name to something 
+	// unique.
+	// Of course the name of the method is the same as the name of 
+	// the class
+	public [Constructor]() : base ("[Namespace.Class]") {}
+	public [Constructor](string name) : base(name) {}
+
+	// this method is run before each Test* method is called. You 
+	// can put variable initialization, etc. here that is common to 
+	// each test.
+	// Just leave the method empty if you don't need to use it.
+	protected override void SetUp() {}
+
+	// this method is run after each Test* method is called. You 
+	// can put clean-up code, etc. here.  Whatever needs to be done 
+	// after each test. Just leave the method empty if you don't need 
+	// to use it.
+	protected override void TearDown() {}
+
+	// this property is required.  You need change the parameter for
+	// typeof() below to be your class.
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof([Classname here])); 
+		}
+	}
+
+	// this is just one of probably many test methods in your test 
+	// class. each test method must start with "Test".  All methods 
+	// in your class which start with "Test" will be automagically 
+	// called by the NUnit framework.
+	public void Test[Something] {
+		// inside here you will exercise your class and then 
+		// call Assert()
+	}
+}
+
+---------------------- TemplateTest.cs ends --------------
+
+---------------------- CollectionBaseTest.cs begins ------
+	//
+	// System.Collections.CollectionBase
+	// Test suite for System.Collections.CollectionBase
+	//
+	// Author:
+	//    Nick D. Drochak II
+	//
+	// (C) 2001 Nick D. Drochak II
+	//
+
+
+	using System;
+	using System.Collections;
+	using NUnit.Framework;
+
+	namespace MonoTests.System.Collections
+	{
+
+	public class CollectionBaseTest : TestCase 	
+	{
+		public CollectionBaseTest () : base 
+			("System.Collection.CollectionBase testsuite") 
+			{}
+		public CollectionBaseTest (String name) : base (name) 
+			{}
+
+		// We need a concrete class to test the abstract base 
+		// class
+		public class ConcreteCollection : CollectionBase 
+		{
+			// These fields are used as markers to test 
+			// the On* hooks.
+			public bool onClearFired;
+			public bool onClearCompleteFired;
+
+			public bool onInsertFired;
+			public int onInsertIndex;
+			public bool onInsertCompleteFired;
+			public int onInsertCompleteIndex;
+
+			public bool onRemoveFired;
+			public int onRemoveIndex;
+			public bool onRemoveCompleteFired;
+			public int onRemoveCompleteIndex;
+
+			public bool onSetFired;
+			public int onSetOldValue;
+			public int onSetNewValue;
+			public bool onSetCompleteFired;
+			public int onSetCompleteOldValue;
+			public int onSetCompleteNewValue;
+
+			// This constructor is used to test OnValid()
+			public ConcreteCollection()	
+			{
+				IList listObj;
+				listObj = this;
+				listObj.Add(null);
+			}
+
+			// This constructor puts consecutive integers into the list
+			public ConcreteCollection(int i) {
+				IList listObj;
+				listObj = this;
+
+				int j;
+				for (j = 0; j< i; j++) {
+					listObj.Add(j);
+				}
+			}
+
+			// A helper method to look at a value in the 
+			// list at a specific index
+			public int PeekAt(int index)
+			{
+				IList listObj;
+				listObj = this;
+				return (int) listObj[index];
+			}
+
+			// Mark the flag if this hook is fired
+			protected override void OnClear() {
+				this.onClearFired = true;
+			}
+
+			// Mark the flag if this hook is fired
+			protected override void OnClearComplete() 
+			{
+				this.onClearCompleteFired = true;
+			}
+
+			// Mark the flag, and save the paramter if 
+			// this hook is fired
+			protected override void OnInsert(int index, 
+							object value) 
+			{
+				this.onInsertFired = true;
+				this.onInsertIndex = index;
+			}
+
+			// Mark the flag, and save the paramter if 
+			// this hook is fired
+			protected override void OnInsertComplete(int index, 
+							object value) 
+			{
+				this.onInsertCompleteFired = true;
+				this.onInsertCompleteIndex = index;
+			}
+		
+			// Mark the flag, and save the paramter if this hook 
+			// is fired
+			protected override void OnRemove(int index, 
+							object value) 
+			{
+				this.onRemoveFired = true;
+				this.onRemoveIndex = index;
+			}
+		
+			// Mark the flag, and save the paramter if this hook 
+			// is fired
+			protected override void OnRemoveComplete(int index, 
+								object value) 
+			{
+				this.onRemoveCompleteFired = true;
+				this.onRemoveCompleteIndex = index;
+			}
+		
+			// Mark the flag, and save the paramters if this hook 
+			// is fired
+			protected override void OnSet(int index, object oldValue, 
+								object newValue) 
+			{
+				this.onSetFired = true;
+				this.onSetOldValue = (int) oldValue;
+				this.onSetNewValue = (int) newValue;
+			}
+		
+			// Mark the flag, and save the paramters if this hook 
+			// is fired
+			protected override void OnSetComplete(int index, 
+							object oldValue, 
+							object newValue) 
+			{
+				this.onSetCompleteFired = true;
+				this.onSetCompleteOldValue = (int) oldValue;
+				this.onSetCompleteNewValue = (int) newValue;
+			}
+		}  // public class ConcreteCollection
+
+		public static ITest Suite {
+			get {
+				return new TestSuite 
+					(typeof(CollectionBaseTest));
+			}
+		}
+
+		// Check the count property
+		public void TestCount() {
+			ConcreteCollection myCollection;
+			myCollection = new ConcreteCollection(4);
+			Assert(4 == myCollection.Count);
+		}
+
+	// Make sure GetEnumerator returns an object
+	public void TestGetEnumerator() {
+		ConcreteCollection myCollection;
+		myCollection = new ConcreteCollection(4);
+		Assert(null != myCollection.GetEnumerator());
+	}
+
+	// OnValid disallows nulls
+	public void TestOnValid() {
+		ConcreteCollection myCollection;
+		try {
+			myCollection = new ConcreteCollection();
+		}
+		catch (ArgumentNullException) {
+		}
+	}
+
+	// Test various Insert paths
+	public void TestInsert() {
+		ConcreteCollection myCollection;
+		int numberOfItems;
+		numberOfItems = 3;
+		// The constructor inserts
+		myCollection = new ConcreteCollection(numberOfItems);
+		Assert(myCollection.onInsertFired);
+		Assert(myCollection.onInsertCompleteFired);
+
+		// Using the IList interface, check inserts in the middle
+		IList listObj = myCollection;
+		listObj.Insert(1, 9);
+		Assert(myCollection.onInsertIndex == 1);
+		Assert(myCollection.onInsertCompleteIndex == 1);
+		Assert(myCollection.PeekAt(1) == 9);
+	}
+
+	// Test Clear and it's hooks
+	public void TestClear() 
+	{
+		ConcreteCollection myCollection;
+		int numberOfItems;
+		numberOfItems = 1;
+		myCollection = new ConcreteCollection(numberOfItems);
+		myCollection.Clear();
+		Assert(myCollection.Count == 0);
+		Assert(myCollection.onClearFired);
+		Assert(myCollection.onClearCompleteFired);
+	}
+
+	// Test RemoveAt, other removes and the hooks
+	public void TestRemove() 
+	{
+		ConcreteCollection myCollection;
+		int numberOfItems;
+		numberOfItems = 3;
+		// Set up a test collection
+		myCollection = new ConcreteCollection(numberOfItems);
+
+		// The list is 0-based.  So if we remove the second one
+		myCollection.RemoveAt(1);
+
+		// We should see the original third one in it's place
+		Assert(myCollection.PeekAt(1) == 2);
+		Assert(myCollection.onRemoveFired);
+		Assert(myCollection.onRemoveIndex == 1);
+		Assert(myCollection.onRemoveCompleteFired);
+		Assert(myCollection.onRemoveCompleteIndex == 1);
+		IList listObj = myCollection;
+		listObj.Remove(0);
+		// Confirm parameters are being passed to the hooks
+		Assert(myCollection.onRemoveIndex == 0);
+		Assert(myCollection.onRemoveCompleteIndex == 0);
+	}
+
+	// Test the random access feature
+	public void TestSet() 
+	{
+		ConcreteCollection myCollection;
+		int numberOfItems;
+		numberOfItems = 3;
+		myCollection = new ConcreteCollection(numberOfItems);
+		IList listObj = myCollection;
+		listObj[0] = 99;
+		Assert((int) listObj[0] == 99);
+		Assert(myCollection.onSetFired);
+		Assert(myCollection.onSetCompleteFired);
+		Assert(myCollection.onSetOldValue == 0);
+		Assert(myCollection.onSetCompleteOldValue == 0);
+		Assert(myCollection.onSetNewValue == 99);
+		Assert(myCollection.onSetCompleteNewValue == 99);
+	}
+}
+
+}
+----------------------- CollectionBaseTest.cs ends --------
+
+</pre>
+	<ul>
+		* If you use Emacs, you might want to use the .emacs 
+		  file and the package developed by Brad Merrill 
+		  mailto:zbrad@cybercom.net. It will allow you to 
+		  highlight and indent in C# style in your Emacs
+		  editor. (XEmacs will still work but it'll also 
+		  complain).
+
+		* CSharpDevelop is a GPLed IDE developed by IC#Code. 
+		  Search for it at sourceforge if you are interested 
+		  in it.
+
+		* For those who Java: "A comparison of Microsoft's 
+		  C# programming language to Sun Microsystem's Java 
+		  Programming language" by Dare Obasanjo is a really good 
+		  (very complete) text to read. 
+
+		* Suggest this point and more, now I can't think of 
+		  anything more.
+	</ul>
+
+	Enjoy!!.
+
+	(c) 2002, <a href="mailto:jaime@geneura.ugr.es">Jaime Anguiano Olarra</a>.
+
+	The parts included in this document are property of their 
+	respective authors.
+
+	Note: The identation of the source code has been changed a bit
+	so it could fit better in the website. Anyway, as nothing more
+	changed, the files should work as expected.
+
diff --git a/doc/monodoc-xml b/doc/monodoc-xml
new file mode 100644
index 00000000000..e8a5ffe2c71
--- /dev/null
+++ b/doc/monodoc-xml
@@ -0,0 +1,755 @@
+* MonoDoc XML Tag Reference
+
+** Introduction
+
+<em>
+[This documentation is in progress.  Comments to
+<a href="mailto:jbarn@httcb.net">jbarn@httcb.net</a> and/or
+<a href="mailto:mono-docs-list@ximian.com">mono-docs-list@ximian.com</a>.]
+</em>
+
+MonoDoc XML, our format for multilingual API documentation stored outside of
+source files, is very similar to the output of Microsoft's csc /doc.  Minor
+alterations have been made to ease human parsing and hand-editing, but
+the majority of the tags are identical.  In fact, many of the descriptions
+and examples below are taken from the ECMA C# Language Specification with
+little or no alteration.
+
+This document provides a list of all available MonoDoc XML tags, with
+syntax and examples.  A complete example can be found in
+<a href="#appendix-a">Appendix A</a>, and both a <a href="#">DTD</a> and
+<a href="#">XSD schema</a> will be available very shortly.
+
+** MonoDoc XML Tags
+
+<dl>
+<dt><code><a href="#c">&lt;c&gt;</a></code></dt>
+<dd>Mark short sections of text as code.</dd>
+
+<dt><code><code><a href="#code">&lt;code&gt;</a></code></dt></code>
+<dd>Mark one or more lines as code or output.</dd>
+
+<dt><code><a href="#doc">&lt;doc&gt;</a></dt></code>
+<dd>Root element of documentation XML.</dd>
+
+<dt><code><a href="#event">&lt;event&gt;</a></dt></code>
+<dd>Describe an event.</dd>
+
+<dt><code><a href="#example">&lt;example&gt;</a></dt></code>
+<dd>An example.</dd>
+
+<dt><code><a href="#exception">&lt;exception&gt;</a></dt></code>
+<dd>Specify an exception a method can throw.</dd>
+
+<dt><code><a href="#field">&lt;field&gt;</a></dt></code>
+<dd>Describe a field.</dd>
+
+<dt><code><a href="#list">&lt;list&gt;</a></dt></code>
+<dd>Create a list or table.</dd>
+
+<dt><code><a href="#method">&lt;method&gt;</a></dt></code>
+<dd>Describe a method.</dd>
+
+<dt><code><a href="#para">&lt;para&gt;</a></dt></code>
+<dd>Allow text to be structured in paragraphs.</dd>
+
+<dt><code><a href="#param">&lt;param&gt;</a></dt></code>
+<dd>Specify a parameter for a method.</dd>
+
+<dt><code><a href="#paramref">&lt;paramref&gt;</a></dt></code>
+<dd>Mark a word as a parameter.</dd>
+
+<dt><code><a href="#permission">&lt;permission&gt;</a></dt></code>		
+<dd>Define the access level of a member.</dd>
+
+<dt><code><a href="#property">&lt;property&gt;</a></dt></code>
+<dd>Describe a property.</dd>
+
+<dt><code><a href="#remarks">&lt;remarks&gt;</a></dt></code>
+<dd>Provide verbose information for a type or member.</dd>
+
+<dt><code><a href="#returns">&lt;returns&gt;</a></dt></code>
+<dd>Specify the return value of a method.</dd>
+
+<dt><code><a href="#see">&lt;see&gt;</a></dt></code>
+<dd>Specify a link.</dd>
+
+<dt><code><a href="#seealso">&lt;seealso&gt;</a></dt></code>
+<dd>Specify a 'see also' entry.</dd>
+
+<dt><code><a href="#summary">&lt;summary&gt;</a></dt></code>
+<dd>Provide a brief (usually one sentence) description of a member or type.</dd>
+
+<dt><code><a href="#type">&lt;type&gt;</a></dt></code>
+<dd>Describe a type.</dd>
+</dl>
+
+** Definitions and Examples
+
+*** <a name="c">&lt;c&gt;</a>
+
+This tag can be used to mark short, inline fragments of text that should 
+be considered source code or program output.  User agents should render 
+this tag in a special -- likely monospace -- font.  For larger sections, 
+use <a href="#code"><code>&lt;code&gt;</code></a>.
+
+**** Syntax
+
+<pre>
+&lt;c&gt;code or output text&lt;/c&gt;
+</pre>
+
+**** Example
+
+<pre>   
+&lt;remarks&gt;
+    Class &lt;c&gt;Point&lt;/c&gt; models a point in two-dimensional space.
+&lt;/remarks&gt;
+</pre>
+
+*** <a name="code">&lt;code&gt;</a>
+
+This tag can be used to mark one or more lines of text as source code or 
+program output.  User agents should render this tag in a special (likely 
+monospace) font, and preserve both whitespace and newlines.
+
+**** Syntax
+
+	<code>&lt;code&gt;source or program output&lt;/code&gt;</code>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This method changes the point's location by the given
+    x- and y-offsets.
+    &lt;example lang="C#"&gt;
+        A C# example:
+        &lt;code&gt;
+            Point p = new Point(3, 5);
+            p.Translate(-1, 3);
+            // p == (2, 8);
+        &lt;/code&gt;
+    &lt;/example&gt;
+&lt;/summary&gt;
+</pre>
+
+*** <a name="doc">&lt;doc&gt;</a>
+
+This tag is the root element of the documentation file.  It can contain 
+any number of &lt;type&gt; elements.
+
+**** Syntax
+
+<code>&lt;doc lang="language" assembly="assembly"&gt;typedocs&lt;/doc&gt;</code>
+
+<blockquote>
+<em>lang="language"</em><br />
+The two-letter ISO code that specifies what language the contained
+documentation is written in.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;doc lang="en"&gt;
+    &lt;type name="Graphics.Point"&gt;
+        &lt;!-- ... --&gt;
+    &lt;/type&gt;
+&lt;/doc&gt; 
+</pre>
+
+*** <a name="event">&lt;event&gt;</a>
+
+This tag documents an event.
+
+**** Syntax
+
+<code>&lt;event name="eventname"&gt;documentation&lt;/event&gt;</code>
+
+<blockquote>
+<em>name="eventname"</em><br />
+The name of the event being documented.
+</blockquote>
+		
+**** Example
+
+<pre>
+&lt;event name="Click"&gt;
+    &lt;summary&gt;
+        Occurs when the control is clicked.
+    &lt;/summary&gt;
+    &lt;data&gt;
+        The event handler receives an argument of type EventArgs
+        containing data related to this event.
+    &lt;/data&gt;
+    &lt;remarks&gt;
+        &lt;para&gt;The ControlStyles.StandardClick style must be set 
+        for this event to be raised.&lt;/para&gt;
+        &lt;para&gt;For more information about handling events, see 
+        Consuming Events.&lt;/para&gt;
+    &lt;/remarks&gt;
+&lt;/event&gt;
+</pre>
+
+*** <a name="example">&lt;example&gt;</a>
+
+This tag marks a section of text as an example, and optionally specifies 
+what programming language <code><a href="#code">&lt;code&gt;</a></code> portions of the example are written in.
+
+**** Syntax
+
+<code><example lang="language">example text and code</example></code>
+
+<blockquote>
+<em>lang="language"</em><br />
+(optional) The name of the programming language <code><a href="#code">&lt;code&gt;</a></code> blocks in this example
+use.  This information can be used by user agents to provide
+intelligent access to examples in multiple languages.
+</blockquote>
+
+**** Example
+
+See <code><a href="#code">&lt;code&gt;<a/></code> for an example.
+
+*** <a name="exception">&lt;exception&gt;</a>
+
+This tag provides a way to specify the exceptions a method can throw.
+
+**** Syntax
+
+<code>&lt;exception cref="exception-type"&gt;description&lt;/exception&gt;</code>
+
+<blockquote>
+<em>cref="exception-type"</em><br />
+The name of an exception type.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;exception cref="System.IO.FileNotFoundException"&gt;
+    Thrown when the requested file is not found.
+&lt;/exception&gt;
+</pre>
+
+*** <a name="field">&lt;field&gt;</a>
+
+This tag is used to describe a field.
+
+**** Syntax
+
+<code>&lt;field name="fieldname"&gt;documentation&lt;/field&gt;</code>
+
+<blockquote>
+<em>name="fieldname"</em><br />
+The name of the field being documented.
+</blockquote>
+	
+**** Example
+
+<pre>
+&lt;field name="x"&gt;
+    &lt;summary&gt;
+        Instance variable &lt;c&gt;x&lt;/c&gt; represents the point's 
+	x-coordinate.
+    &lt;/summary&gt;
+&lt;/field&gt;
+</pre>
+
+*** <a name="list">&lt;list&gt;</a>
+
+This tag is used to create a list or table of items.  It may contain a 
+<code>&lt;listheader&gt;</code> block to define the heading row of either a table or 
+definition list.  (When defining a table, only an entry for 'term' in the 
+heading need be supplied.)
+
+Each item in the list is specified with an <code>&lt;item&gt;</code> block.  When creating a 
+definition list, both <code>&lt;term&gt;</code> and <code>&ltdescription&gt;</code> must be specified.  
+However, for a table, bulleted list, or numbered list, only <code>&lt;description&gt;</code>
+need be specified.
+
+**** Syntax
+
+<pre>
+&lt;list type="bullet" | "number" | "table"&gt;
+   &lt;listheader&gt;
+       &lt;term&gt;term&lt;/term&gt;
+       &lt;description&gt;description&lt;/description&gt;
+   &lt;/listheader&gt;
+   &lt;item&gt;
+       &lt;term&gt;term&lt;/term&gt;
+       &lt;description&gt;description&lt;/description&gt;
+   &lt;/item&gt;
+   
+   ...
+  
+&lt;/list&gt;
+</pre>
+	
+<blockquote>
+<em>term</em><br />
+The term to define, whose definition is in <code>&lt;description&gt;</code>.
+<br /><br />	
+<em>description</em><br />
+Either an item in a bullet or numbered list, or the definition of a <code>&lt;term&gt;</code>.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;list type="bullet"&gt;
+    &lt;item&gt;
+        &lt;description&gt;Item 1&lt;/description&gt;
+    &lt;/item&gt;
+    &lt;item&gt;
+        &lt;description&gt;Item 2&lt;/description&gt;
+    &lt;/item&gt;
+&lt;/list&gt;
+</pre>
+
+*** <a name="method">&lt;method&gt;</a>
+
+This tag is the overall containing tag for documenting a method.
+
+**** Syntax
+
+<code>&lt;method name="methodname"&gt;documentation&lt;/method&gt;</code>
+
+**** Example
+
+<pre>
+&lt;method name="op_Equality(Graphics.Point,Graphics.Point)"&gt;
+    &lt;summary&gt;
+        This operator determines whether two points have
+        the same location.
+    &lt;/summary&gt;
+    &lt;param name="p1"&gt;
+        &lt;c&gt;p1&lt;/c&gt; is the first Point to be compared.
+    &lt;/param&gt;
+    &lt;param name="p2"&gt;
+        &lt;c&gt;p2&lt;/c&gt; is the second Point to be compared.
+    &lt;/param&gt;
+    &lt;returns&gt;
+        True if the points have the same location and they
+        have the exact same type; otherwise, false.
+    &lt;/returns&gt;
+    &lt;seealso cref="Equals(System.Object)" /&gt;
+    &lt;seealso cref="op_Inequality(Graphics.Point,Graphics.Point)" /&gt;
+&lt;/method&gt;
+</pre>
+
+*** <a name="para">&lt;para&gt;</a>
+
+
+This tag is for use inside other tags such as <code>&lt;remarks&gt;</code> or <code>&lt;returns&gt;</code>, and 
+allows text to be structured into paragraphs.
+
+**** Syntax
+
+<code>&lt;para&gt;text&lt;/para&gt;</code>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    &lt;para&gt;
+    This is the entry point of the &lt;c&gt;Point&lt;/c&gt; class testing 
+    program.
+    &lt;/para&gt;
+    &lt;para&gt;
+    This program tests each method and operator, and
+    is intended to be run after any non-trivial maintenance has
+    been performed on the &lt;c&gt;Point&lt;/c&gt; class.
+    &lt;/para&gt;
+&lt;/summary&gt;
+</pre>
+
+*** <a name="param">&lt;param&gt;</a>
+
+This tag is used to describe a parameter for a method, constructor, or 
+indexer.
+
+**** Syntax
+
+<code>&lt;param name="name"&gt;description&lt;/param&gt;</code>
+	
+<blockquote>
+<em>name</em><br />
+The name of the parameter.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This is the entry point of the &lt;c&gt;Point&lt;/c&gt; 
+    class.
+&lt;/summary&gt;
+&lt;param name="xor"&gt;&lt;c&gt;xor&lt;/c&gt; is the new x-coordinate.&lt;/param&gt;
+&lt;param name "yor"&gt;&lt;c&gt;yor&lt;/c&gt; is the new y-coordinate.&lt;/param&gt;
+</pre>
+
+*** <a name="paramref">&lt;paramref&gt;</a>
+
+This tag is used to indicate that a word is a parameter.  User agents 
+could use this information for special formatting or hyperlink insertion.
+
+**** Syntax
+
+<code>&lt;paramref name="name" /&gt;</code>
+
+<blockquote>
+<em>name</em><br />
+The name of the parameter.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This constructor initializes the new Point to
+    (&lt;paramref name="xor" /&gt;,&lt;paramref name="yor" /&gt;).
+&lt;/summary&gt;
+&lt;param name="xor"&gt;&lt;c&gt;xor&lt;/c&gt; is the new x-coordinate.&lt;/param&gt;
+&lt;param name "yor"&gt;&lt;c&gt;yor&lt;/c&gt; is the new y-coordinate.&lt;/param&gt;
+</pre>
+
+*** <a name="permission">&lt;permission&gt;</a>
+
+This tag allows the security accessibility of a member to be documented.
+
+**** Syntax
+
+<code>&lt;permission cref="member"&gt;description&lt;/permission&gt;</code>
+
+<blockquote>
+<em>cref="member"</em><br />
+The name of a member.</br>
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;permission cref="System.Security.PermissionSet"&gt;
+    Everyone can access this method.
+&lt;/permission&gt;
+</pre>        
+
+*** <a name="property">&ltproperty&gt;</a>
+
+This tag is the overall containing tag for documenting a property.
+
+**** Syntax
+
+<code>&lt;property name="propertyname"&gt;documentation&lt;/property&gt;</code>
+
+<blockquote>
+<em>name="propertyname"</em><br />
+The name of the property.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;property name="X"&gt;
+    &lt;summary&gt;
+        Gets or sets the point's x-coordinate.
+    &lt;value&gt;
+        The point's x-coordinate.
+    &lt;/value&gt;
+&lt;/property&gt;
+</pre>
+
+
+*** <a name="remarks">&lt;remarks&gt;</a>
+
+This tag contains extended discussion and information about a member or
+a type. <em>[jbarn: This differs from both the ECMA docs and 
+portions of Microsoft's documentation, but seems consistent with both 
+common usage, and, more importantly, NDoc convention.]</em>
+
+**** Syntax
+
+<code>&lt;remarks&gt;description&lt;/remarks&gt;</code>
+	
+**** Example
+
+<pre>
+&lt;type name="Graphics.Point"&gt;
+    &lt;summary&gt;
+        Models a point in a two-dimensional plane.
+    &lt;/summary&gt;
+    &lt;remarks&gt;
+        Herein I might have an extended discussion of
+        the validity of Cartesian coordinate systems,
+        with examples pro and con, and perhaps
+        some code.
+    &lt;/remarks&gt;
+    
+    &lt;!-- ... --&gt;
+&lt;/type&gt;
+</pre>
+
+*** <a name="returns">&lt;returns&gt;</a>
+
+This tag is used to describe the return value of a method.
+
+**** Syntax
+
+<code>&lt;returns&gt;description&lt;/returns&gt;</code>
+
+**** Example
+
+<pre>
+&lt;method name="op_Inequality(Graphics.Point,Graphics.Point)"&gt;
+    &lt;summary&gt;
+        This operator determines whether two points have the
+        same location.
+    &lt;/summary&gt;
+    &lt;param name="p1"&gt;&lt;c&gt;p1&lt;/c&gt; is the first Point to be compared.&lt;/param&gt;
+    &lt;param name="p2"&gt;&lt;c&gt;p2&lt;/c&gt; is the second Point to be compared.&lt;/param&gt;
+    &lt;returns&gt;
+        True if the points do not have the same location and they
+        have the exact same type; otherwise, false.
+    &lt;/returns&gt;
+&lt;/method&gt;
+</pre>
+
+*** <a name="see">&lt;see&gt;</a>
+
+This tag allows a link to be specified within documentation text.  (Use 
+<code>&lt;seealso&gt;</code> to indicate links that should appear in a 'See Also' section.)
+
+**** Syntax
+
+<code>&lt;see cref="destination" /&gt;</code>
+
+<blockquote>
+<em>cref="destination"</em><br />
+A destination, such as a type or a member of a type.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This method changes the point's location to the given
+    coordinates.  This is an asinine way to insert a link,
+    but &lt;see cref="Equals(Object)" /&gt; to understand
+    how points are compared.
+&lt;/summary&gt;
+</pre>	
+
+*** <a name="seealso">&lt;seealso&gt;</a>
+
+This tag allows an entry to be generated for the 'See Also' section.  (Use 
+<code>&lt;see&gt;</code> to specify a link from within text.)
+
+**** Syntax
+
+<code>&lt;seealso cref="destination" /&gt;</code>
+	
+<blockquote>
+<em>cref="destination"</em><br />
+A destination, such as a type or a member of a type.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This method determines whether two Points have the
+    same location.
+&lt;/summary&gt;
+&lt;seealso cref="op_Equality(Graphics.Point,Graphics.Point)" /&gt;
+&lt;seealso cref="op_Inequality(Graphics.Point,Graphics.Point" /&gt;
+</pre>
+
+*** <a name="summary">&lt;summary&gt;</a>
+
+This tag contains a short summary of a member or type, 
+often one sentence. <em>[jbarn: This differs from both the ECMA docs and 
+portions of Microsoft's documentation, but seems consistent with both 
+common usage, and, more importantly, NDoc convention.]</em>
+
+**** Syntax
+
+<code>&lt;summary&gt;description&lt;/summary&gt;</code>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This is the entry point of the &lt;c&gt;Point&lt;/c&gt; class testing
+    program.
+&lt;/summary&gt;
+&lt;remarks&gt;
+    This program tests each method an operator, and is intended
+    to be run after any non-trivial maintenance is performed
+    on the &lt;c&gt;Point&lt;/c&gt; class.
+&lt;/remarks&gt;
+</pre>
+
+*** <a name="type">&lt;type&gt;</a>
+
+This tag is the overall containing tag for documenting a type.
+
+**** Syntax
+
+<code>&lttype name="typename" assembly="assemblyname"&gt;documentation&lt;/type&gt;</code>
+
+<blockquote>
+<em>name="typename"</em><br />
+The name of the type being documented.
+<br /><br />
+<em>assembly="assemblyname"</em><br />
+The assembly this type resides in.  This attribute is not required for nested types.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;type name="Graphics.Point" assembly="Point"&gt;
+    &lt;summary&gt;
+        Models a point in two-dimensional space.
+    &lt;/summary&gt;
+    
+    &lt;!-- members --&gt;
+    
+    &lt;field name="x"&gt;
+        &lt;summary&gt;
+            Represents the point's x-coordinate.
+        &lt;/summary&gt;
+    &lt;/field&gt;
+&lt;/type&gt;
+</pre>
+
+** <a name="appendix-a">Appendix A: Complete Example</a>
+
+<em>[jbarn: Please, please, don't take the human-readable portions of
+this example to be good guidelines for writing your own documentation.
+this XML is intended only to show structure.]</em>
+
+<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;doc lang="en"&gt;
+    &lt;type name="Graphics.Point" assembly="Point"&gt;
+        &lt;summary&gt;
+            Models a point in a two-dimensional plane.
+        &lt;/summary&gt;
+        &lt;remarks&gt;
+            No useful remarks.
+        &lt;/remarks&gt;
+        
+        &lt;!-- fields --&gt;
+        &lt;field name="x"&gt;
+            &lt;summary&gt;
+                Instance variable &lt;c&gt;x&lt;/c&gt; represents the point's x-coordinate.
+            &lt;/summary&gt;
+        &lt;/field&gt;
+        
+        &lt;field name="y"&gt;
+            &lt;summary&gt;
+                Instance variable &lt;c&gt;y&lt;/c&gt; represents the point's y-coordinate.
+            &lt;/summary&gt;
+        &lt;/field&gt;
+        
+        &lt;!-- methods --&gt;
+        &lt;method name="#ctor"&gt;
+            &lt;summary&gt;
+                Initializes the new point to &lt;c&gt;(0,0)&lt;/c&gt;.
+            &lt;/summary&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="#ctor(System.Int32,System.Int32)"&gt;
+            &lt;summary&gt;
+                Initializes the new Point to (&lt;paramref name="xor" /&gt;,&lt;paramref name="yor" /&gt;).
+            &lt;/summary&gt;
+            &lt;param name="xor"&gt;&lt;c&gt;xor&lt;/c&gt; is the new x-coordinate.&lt;/param&gt;
+            &lt;param name="yor"&gt;&lt;c&gt;yor&lt;/c&gt; is the new y-coordinate.&lt;/param&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="Move(System.Int32,System.Int32)"&gt;
+            &lt;summary&gt;
+                This method changes the point's location to the given coordinates.
+            &lt;/summary&gt;
+            &lt;param name="xor"&gt;&lt;c&gt;xor&lt;/c&gt; is the new x-coordinate.&lt;/param&gt;
+            &lt;param name="yor"&gt;&lt;c&gt;yor&lt;/c&gt; is the new y-coordinate.&lt;/param&gt;
+            &lt;seealso cref="Translate(System.Int32,System.Int32)" /&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="Translate(System.Int32,System.Int32)"&gt;
+            &lt;summary&gt;This method changes the point's location by the given x- and y-offsets.&lt;/summary&gt;
+            &lt;remarks&gt;
+                &lt;example lang="C#"&gt;
+                    A C# example:
+                        &lt;code&gt;
+                            Point p = new Point(3, 5);
+                            p.Translate(-1, 3);
+                        &lt;/code&gt;
+                    This code results in &lt;c&gt;p&lt;/c&gt; having the value (2,8).
+                &lt;/example&gt;
+            &lt;/remarks&gt;
+            &lt;param name="xor"&gt;&lt;c&gt;xor&lt;/c&gt; is the relative x-offset.&lt;/param&gt;
+            &lt;param name="yor"&gt;&lt;c&gt;yor&lt;/c&gt; is the relative y-offset.&lt;/param&gt;
+            &lt;seealso cref="Move(System.Int32,System.Int32)" /&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="Equals(System.Object)"&gt;
+            &lt;summary&gt;This method determines whether two points have the same location.&lt;/summary&gt;
+            &lt;param name="o"&gt;&lt;c&gt;o&lt;/c&gt; is the object to be compared to the current object.&lt;/param&gt;
+            &lt;returns&gt;True if the Points have the same location and they have the exact same
+            type; otherwise, false.&lt;/returns&gt;
+            &lt;seealso cref="op_Equality(Graphics.Point,Graphics.Point)" /&gt;
+            &lt;seealso cref="op_Inequality(Graphics.Point,Graphics.Point" /&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="ToString"&gt;
+            &lt;summary&gt;Report a point's location as a string.&lt;/summary&gt;
+            &lt;returns&gt;A string representing a point's location, in the form (x,y), without any
+            leading, trailing, or embedded whitespace.&lt;/returns&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="op_Equality(Graphics.Point,Graphics.Point)"&gt;
+            &lt;summary&gt;This operator determines whether two points have the same location.&lt;/summary&gt;
+            &lt;param name="p1"&gt;&lt;c&gt;p1&lt;/c&gt; is the first Point to be compared.&lt;/param&gt;
+            &lt;param name="p2"&gt;&lt;c&gt;p2&lt;/c&gt; is the second Point to be compared.&lt;/param&gt;
+            &lt;returns&gt;True if the points have the same location and they have the exact same
+            type; otherwise, false.&lt;/returns&gt;
+            &lt;seealso cref="Equals(System.Object)" /&gt;
+            &lt;seealso cref="op_Inequality(Graphics.Point,Graphics.Point)" /&gt;
+        &lt;/method&gt;
+
+        &lt;method name="op_Inequality(Graphics.Point,Graphics.Point)"&gt;
+            &lt;summary&gt;This operator determines whether two points have the same location.&lt;/summary&gt;
+            &lt;param name="p1"&gt;&lt;c&gt;p1&lt;/c&gt; is the first Point to be compared.&lt;/param&gt;
+            &lt;param name="p2"&gt;&lt;c&gt;p2&lt;/c&gt; is the second Point to be compared.&lt;/param&gt;
+            &lt;returns&gt;True if the points do not have the same location and they have the exact same
+            type; otherwise, false.&lt;/returns&gt;
+            &lt;seealso cref="Equals(System.Object)" /&gt;
+            &lt;seealso cref="op_Equality(Graphics.Point,Graphics.Point)" /&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="Main"&gt;
+            &lt;summary&gt;
+                This is the entry point of the Point class testing program.
+            &lt;/summary&gt;
+            &lt;remarks&gt;
+                &lt;para&gt;This program tests each method and operator, and is intended to be run after
+                any non-trivial maintenance has been performed on the Point class.&lt;/para&gt;
+            &lt;/remarks&gt;
+        &lt;/method&gt;
+        
+        &lt;!-- properties --&gt;
+        &lt;property name="X"&gt;
+            &lt;value&gt;Property &lt;c&gt;X&lt;/c&gt; represents the point's x-coordinate.&lt;/value&gt;
+        &lt;/property&gt;
+        
+        &lt;property name="Y"&gt;
+            &lt;value&gt;Property &lt;c&gt;y&lt;/c&gt; represents the point's y-coordinate.&lt;/value&gt;
+        &lt;/property&gt;
+    &lt;/type&gt;
+&lt;/doc&gt;
+</pre>
+
diff --git a/doc/papers b/doc/papers
new file mode 100644
index 00000000000..36a31988e83
--- /dev/null
+++ b/doc/papers
@@ -0,0 +1,96 @@
+* JIT Compiler
+
+  <a
+  href="http://citeseer.nj.nec.com/vitek97efficient.html">
+  Efficient Type Inclusion Tests: Jahn Vitek, R. Nigel Horspool, Andres
+  Krall</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/cytron91efficiently.html">
+  Efficiently Computing Static Single Assignment Form and the Control
+  Dependence Graph: Ron Cytron, Jeanne Ferrante</a> 
+
+  <a
+  href="http://citeseer.nj.nec.com/193349.html">
+  Practical Improvements to the Construction and Destruction of Static Single Assignment Form: Preston Briggs,
+  Keith Cooper, Timothy Harvey, Taylor Simpson</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/krall98efficient.html">
+  Efficient JavaVM Just-in-Time Compilation: Andreas Krall</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/452617.html">Java for
+  Large-Scale Scientific Computations: Andreas Krall, Phillip Thomsich</a> 
+
+  <a
+  href="http://citeseer.nj.nec.com/117522.html">
+  Engineering Simple, Efficient Code Generator Generator: Christopher
+  W. Fraser, David R. Hanson, Todd A. Proebsting</a> 
+
+  <a
+  href="http://citeseer.nj.nec.com/proebsting92code.html">
+  Code Generation Techniques: Todd Alan Proebsting</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/74629.html">Fast,
+  Effective Code Generation in a Just-In-Time Java Compiler: Ali-Reza
+  Adl-Tabatabai Guei-Yuan Lueh, Vishesh M. Parikh, James M. Stichnoth...</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/bodik00abcd.html">
+  ABCD: Eliminating Array-Bounds Checks on Demand: Rastislav Bodik, Rajiv Gupta, Vivek Sarkar</a>
+
+* Register Allocation
+
+  <a
+  href="http://citeseer.nj.nec.com/poletto99linear.html">
+  Linear Scan Register Allocation: Massimiliano Poletto, Vivek Sarkar</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/traub98quality.html">
+  Quality and Speed in Linear-scan Register Allocation: Omri Traub, Glenn
+  Holloway, Michael D. Smith</a> 
+
+* Loop Transformations
+
+  <a
+  href="http://citeseer.nj.nec.com/bacon93compiler.html">
+  Compiler Transformations for High-Performance Computing: David Bacon</a>
+
+* Interpreter
+
+  <a
+  href="http://citeseer.nj.nec.com/470069.html">
+  vmgen-A Generator of Efficient Virtual Machine Interpreters: M. Anton
+  Ertl, David Gregg, Andreas Krall, Bernd Paysan</a>
+
+* Synchronization
+
+  <a
+  href="http://citeseer.nj.nec.com/krall98monitors.html">
+  Monitors and Exceptions - How to implement Java efficiently: Andreas Krall,
+  Mark Probst</a> 
+
+  <a
+  href="http://citeseer.nj.nec.com/bacon98thin.html">
+  Thin Locks: Featherweight Synchronization for Java: David Bacon</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/278639.html">
+  Featherweight Monitors with Bacon Bits: David Bacon</a>
+
+* Garbage Collection
+
+  <a
+  href="http://citeseer.nj.nec.com/wilson92uniprocessor.html">
+  Uniprocessor Garbage Collection Techniques: Paul Wilson</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/41666.html">
+  A Language-Independent Garbage Collector Toolkit: Richard Hudson, Eliot Moss, Amer Diwan, Christopher Weight</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/seligmann95incremental.html">
+  Incremental Collection of Mature Objects: Richard Hudson, Eliot Moss</a>
+
diff --git a/doc/pending-classes.in b/doc/pending-classes.in
new file mode 100644
index 00000000000..1cdb5a4cb36
--- /dev/null
+++ b/doc/pending-classes.in
@@ -0,0 +1,246 @@
+System.Object
+System.Exception
+System.ValueType
+System.Delegate
+System.MulticastDelegate
+System.Enum
+System.Activator
+System.ArgIterator
+System.__ComObject
+System.TypedReference
+System.Security.AllowPartiallyTrustedCallersAttribute
+System.Runtime.Serialization.Formatter
+System.Runtime.Serialization.FormatterConverter
+System.Runtime.Serialization.FormatterServices
+System.Runtime.Serialization.ObjectIDGenerator
+System.Runtime.Serialization.ObjectManager
+System.Reflection.ModuleResolveEventHandler
+System.Reflection.Pointer
+System.Globalization.CompareInfo
+System.Globalization.HebrewCalendar
+System.Globalization.HijriCalendar
+System.Globalization.JapaneseCalendar
+System.Globalization.KoreanCalendar
+System.Globalization.SortKey
+System.Globalization.StringInfo
+System.Globalization.TaiwanCalendar
+System.Globalization.TextElementEnumerator
+System.Globalization.TextInfo
+System.Globalization.ThaiBuddhistCalendar
+System.IO.IsolatedStorage.IsolatedStorageFile
+System.Reflection.Emit.MethodRental
+System.Runtime.CompilerServices.AccessedThroughPropertyAttribute
+System.Runtime.CompilerServices.CallConvCdecl
+System.Runtime.CompilerServices.CallConvStdcall
+System.Runtime.CompilerServices.CallConvThiscall
+System.Runtime.CompilerServices.CallConvFastcall
+System.Runtime.CompilerServices.CustomConstantAttribute
+System.Runtime.CompilerServices.DateTimeConstantAttribute
+System.Runtime.CompilerServices.DiscardableAttribute
+System.Runtime.CompilerServices.DecimalConstantAttribute
+System.Runtime.CompilerServices.CompilationRelaxationsAttribute
+System.Runtime.CompilerServices.CompilerGlobalScopeAttribute
+System.Runtime.CompilerServices.IDispatchConstantAttribute
+System.Runtime.CompilerServices.IsVolatile
+System.Runtime.CompilerServices.IUnknownConstantAttribute
+System.Runtime.CompilerServices.RequiredAttributeAttribute
+System.Runtime.InteropServices.ArrayWithOffset
+System.Runtime.InteropServices.DispIdAttribute
+System.Runtime.InteropServices.ClassInterfaceType
+System.Runtime.InteropServices.ClassInterfaceAttribute
+System.Runtime.InteropServices.ComVisibleAttribute
+System.Runtime.InteropServices.LCIDConversionAttribute
+System.Runtime.InteropServices.ComRegisterFunctionAttribute
+System.Runtime.InteropServices.ComUnregisterFunctionAttribute
+System.Runtime.InteropServices.ProgIdAttribute
+System.Runtime.InteropServices.ImportedFromTypeLibAttribute
+System.Runtime.InteropServices.IDispatchImplType
+System.Runtime.InteropServices.IDispatchImplAttribute
+System.Runtime.InteropServices.ComSourceInterfacesAttribute
+System.Runtime.InteropServices.ComConversionLossAttribute
+System.Runtime.InteropServices.TypeLibTypeFlags
+System.Runtime.InteropServices.TypeLibFuncFlags
+System.Runtime.InteropServices.TypeLibVarFlags
+System.Runtime.InteropServices.TypeLibTypeAttribute
+System.Runtime.InteropServices.TypeLibFuncAttribute
+System.Runtime.InteropServices.TypeLibVarAttribute
+System.Runtime.InteropServices.ComImportAttribute
+System.Runtime.InteropServices.PreserveSigAttribute
+System.Runtime.InteropServices.ComAliasNameAttribute
+System.Runtime.InteropServices.AutomationProxyAttribute
+System.Runtime.InteropServices.PrimaryInteropAssemblyAttribute
+System.Runtime.InteropServices.CoClassAttribute
+System.Runtime.InteropServices.ComEventInterfaceAttribute
+System.Runtime.InteropServices.COMException
+System.Runtime.InteropServices.ComMemberType
+System.Runtime.InteropServices.CurrencyWrapper
+System.Runtime.InteropServices.DispatchWrapper
+System.Runtime.InteropServices.ErrorWrapper
+System.Runtime.InteropServices.ExtensibleClassFactory
+System.Runtime.InteropServices.HandleRef
+System.Runtime.InteropServices.InvalidComObjectException
+System.Runtime.InteropServices.InvalidOleVariantTypeException
+System.Runtime.InteropServices.TypeLibImporterFlags
+System.Runtime.InteropServices.ExporterEventKind
+System.Runtime.InteropServices.ITypeLibExporterNotifySink
+System.Runtime.InteropServices.ITypeLibConverter
+System.Runtime.InteropServices.MarshalDirectiveException
+System.Runtime.InteropServices.ObjectCreationDelegate
+System.Runtime.InteropServices.RuntimeEnvironment
+System.Runtime.InteropServices.RegistrationServices
+System.Runtime.InteropServices.SafeArrayRankMismatchException
+System.Runtime.InteropServices.SafeArrayTypeMismatchException
+System.Runtime.InteropServices.SEHException
+System.Runtime.InteropServices.TypeLibConverter
+System.Runtime.InteropServices.BIND_OPTS
+System.Runtime.InteropServices.UCOMIBindCtx
+System.Runtime.InteropServices.UCOMIConnectionPointContainer
+System.Runtime.InteropServices.UCOMIConnectionPoint
+System.Runtime.InteropServices.UCOMIEnumMoniker
+System.Runtime.InteropServices.CONNECTDATA
+System.Runtime.InteropServices.UCOMIEnumConnections
+System.Runtime.InteropServices.UCOMIEnumConnectionPoints
+System.Runtime.InteropServices.UCOMIEnumString
+System.Runtime.InteropServices.UCOMIEnumVARIANT
+System.Runtime.InteropServices.FILETIME
+System.Runtime.InteropServices.UCOMIMoniker
+System.Runtime.InteropServices.UCOMIPersistFile
+System.Runtime.InteropServices.UCOMIRunningObjectTable
+System.Runtime.InteropServices.STATSTG
+System.Runtime.InteropServices.UCOMIStream
+System.Runtime.InteropServices.DESCKIND
+System.Runtime.InteropServices.BINDPTR
+System.Runtime.InteropServices.UCOMITypeComp
+System.Runtime.InteropServices.TYPEKIND
+System.Runtime.InteropServices.TYPEFLAGS
+System.Runtime.InteropServices.IMPLTYPEFLAGS
+System.Runtime.InteropServices.TYPEATTR
+System.Runtime.InteropServices.FUNCDESC
+System.Runtime.InteropServices.IDLFLAG
+System.Runtime.InteropServices.IDLDESC
+System.Runtime.InteropServices.PARAMFLAG
+System.Runtime.InteropServices.PARAMDESC
+System.Runtime.InteropServices.TYPEDESC
+System.Runtime.InteropServices.ELEMDESC
+System.Runtime.InteropServices.VARDESC
+System.Runtime.InteropServices.DISPPARAMS
+System.Runtime.InteropServices.EXCEPINFO
+System.Runtime.InteropServices.FUNCKIND
+System.Runtime.InteropServices.INVOKEKIND
+System.Runtime.InteropServices.CALLCONV
+System.Runtime.InteropServices.FUNCFLAGS
+System.Runtime.InteropServices.VARFLAGS
+System.Runtime.InteropServices.UCOMITypeInfo
+System.Runtime.InteropServices.SYSKIND
+System.Runtime.InteropServices.LIBFLAGS
+System.Runtime.InteropServices.TYPELIBATTR
+System.Runtime.InteropServices.UCOMITypeLib
+System.Runtime.InteropServices.UnknownWrapper
+System.Runtime.Remoting.IObjectHandle
+System.Runtime.Remoting.IRemotingTypeInfo
+System.Runtime.Remoting.IChannelInfo
+System.Runtime.Remoting.IEnvoyInfo
+System.Runtime.Remoting.RemotingConfiguration
+System.Runtime.Remoting.TypeEntry
+System.Runtime.Remoting.ActivatedClientTypeEntry
+System.Runtime.Remoting.ActivatedServiceTypeEntry
+System.Runtime.Remoting.WellKnownClientTypeEntry
+System.Runtime.Remoting.WellKnownServiceTypeEntry
+System.Runtime.Remoting.RemotingException
+System.Runtime.Remoting.ServerException
+System.Runtime.Remoting.RemotingTimeoutException
+System.Runtime.Remoting.RemotingServices
+System.Runtime.Remoting.InternalRemotingServices
+System.Runtime.Remoting.SoapServices
+System.Runtime.Remoting.Activation.UrlAttribute
+System.Runtime.Remoting.Messaging.IMessageSink
+System.Runtime.Remoting.Messaging.AsyncResult
+System.Runtime.Remoting.Messaging.CallContext
+System.Runtime.Remoting.Messaging.ILogicalThreadAffinative
+System.Runtime.Remoting.Messaging.InternalMessageWrapper
+System.Runtime.Remoting.Messaging.IMethodCallMessage
+System.Runtime.Remoting.Messaging.MethodCallMessageWrapper
+System.Runtime.Remoting.Messaging.HeaderHandler
+System.Runtime.Remoting.Messaging.IMessageCtrl
+System.Runtime.Remoting.Messaging.IRemotingFormatter
+System.Runtime.Remoting.Messaging.ReturnMessage
+System.Runtime.Remoting.Messaging.MethodCall
+System.Runtime.Remoting.Messaging.ConstructionCall
+System.Runtime.Remoting.Messaging.MethodResponse
+System.Runtime.Remoting.Messaging.ConstructionResponse
+System.Runtime.Remoting.Messaging.MethodReturnMessageWrapper
+System.Runtime.Remoting.Messaging.OneWayAttribute
+System.Runtime.Remoting.Messaging.MessageSurrogateFilter
+System.Runtime.Remoting.Messaging.RemotingSurrogateSelector
+System.Runtime.Remoting.Contexts.CrossContextDelegate
+System.Runtime.Remoting.Contexts.ContextProperty
+System.Runtime.Remoting.Contexts.IContextPropertyActivator
+System.Runtime.Remoting.Contexts.IContributeClientContextSink
+System.Runtime.Remoting.Contexts.IContributeDynamicSink
+System.Runtime.Remoting.Contexts.IContributeEnvoySink
+System.Runtime.Remoting.Contexts.IContributeObjectSink
+System.Runtime.Remoting.Contexts.IContributeServerContextSink
+System.Runtime.Serialization.Formatters.InternalRM
+System.Runtime.Serialization.Formatters.InternalST
+System.Runtime.Serialization.Formatters.SoapMessage
+System.Runtime.Serialization.Formatters.SoapFault
+System.Runtime.Serialization.Formatters.ServerFault
+System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+System.Security.Cryptography.CryptoConfig
+System.Security.Cryptography.KeyedHashAlgorithm
+System.Security.Cryptography.HMACSHA1
+System.Security.Cryptography.MACTripleDES
+System.Security.Cryptography.MaskGenerationMethod
+System.Security.Cryptography.PasswordDeriveBytes
+System.Security.Cryptography.PKCS1MaskGenerationMethod
+System.Security.Cryptography.RC2
+System.Security.Cryptography.RC2CryptoServiceProvider
+System.Security.Cryptography.RSACryptoServiceProvider
+System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter
+System.Security.Cryptography.RSAOAEPKeyExchangeFormatter
+System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter
+System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter
+System.Security.Cryptography.RSAPKCS1SignatureDeformatter
+System.Security.Cryptography.RSAPKCS1SignatureFormatter
+System.Security.Cryptography.SHA1Managed
+System.Security.Cryptography.TripleDES
+System.Security.Cryptography.TripleDESCryptoServiceProvider
+System.Security.Permissions.EnvironmentPermission
+System.Security.Permissions.FileDialogPermission
+System.Security.Permissions.IsolatedStorageFilePermission
+System.Security.Permissions.PrincipalPermissionAttribute
+System.Security.Permissions.SecurityPermissionAttribute
+System.Security.Permissions.PublisherIdentityPermissionAttribute
+System.Security.Permissions.PublisherIdentityPermission
+System.Security.Permissions.ReflectionPermission
+System.Security.Permissions.RegistryPermission
+System.Security.Permissions.PrincipalPermission
+System.Security.Permissions.SiteIdentityPermission
+System.Security.Permissions.StrongNameIdentityPermission
+System.Security.Permissions.StrongNamePublicKeyBlob
+System.Security.Permissions.UIPermission
+System.Security.Permissions.UrlIdentityPermission
+System.Security.Permissions.ZoneIdentityPermission
+System.Security.Policy.ApplicationDirectory
+System.Security.Policy.ApplicationDirectoryMembershipCondition
+System.Security.Policy.FirstMatchCodeGroup
+System.Security.Policy.Hash
+System.Security.Policy.HashMembershipCondition
+System.Security.Policy.NetCodeGroup
+System.Security.Policy.PermissionRequestEvidence
+System.Security.Policy.Publisher
+System.Security.Policy.PublisherMembershipCondition
+System.Security.Policy.Site
+System.Security.Policy.SiteMembershipCondition
+System.Security.Policy.StrongName
+System.Security.Policy.StrongNameMembershipCondition
+System.Security.Policy.UnionCodeGroup
+System.Security.Policy.Url
+System.Security.Policy.UrlMembershipCondition
+System.Security.Policy.Zone
+System.Security.Policy.ZoneMembershipCondition
+System.Security.Principal.WindowsIdentity
+System.Security.Principal.WindowsImpersonationContext
+System.Security.Principal.WindowsPrincipal
+System.Threading.CompressedStack
+

diff --git a/doc/plans b/doc/plans
new file mode 100755
index 00000000000..db6f6dde7c8
--- /dev/null
+++ b/doc/plans
@@ -0,0 +1,15 @@
+* Plans
+
+	Here we are tracking some plans to particular pieces of
+	technology that are part of Mono.  
+
+	This is just a repository of information that is handy for
+	contributors.
+
+	Currently you can read our plans for <a
+	href="ado-net.html">ADO.NET</a>, <a
+	href="asp-net">ASP.NET</a>, <a href="java.html">Java</a> and
+	<a href="winforms.html">WinForms</a>.
+
+
+	
diff --git a/doc/ppc b/doc/ppc
new file mode 100644
index 00000000000..56026d4d6b1
--- /dev/null
+++ b/doc/ppc
@@ -0,0 +1,33 @@
+
+* Mono PowerPC Port
+
+** Status
+
+	It passes and compiles the same amount of mono tests as on the x86 architecture.
+
+	mcs is self hosting on Linux/PPC.
+
+*** Interpreter
+
+	Up to date.
+
+*** Jitter
+
+	Start the port
+
+** Documentation
+
+*** PowerPC architecture:
+
+    <A HREF="http://e-www.motorola.com/brdata/PDFDB/docs/MPCFPE32B.pdf">PowerPC Programming environments manual</A><BR>
+    <A HREF="http://e-www.motorola.com/brdata/PDFDB/docs/MPC7410UM.pdf">G4 (7410) User's manual</A>
+
+	There's a very nice introduction to PowerPC assembly language
+	at <a
+	href="http://www-106.ibm.com/developerworks/library/l-ppc/">http://www-106.ibm.com/developerworks/library/l-ppc/</a>.
+
+*** Calling conventions:
+
+    <a href="http://www.esofta.com/softspecs.html">The PowerPC SystemV ABI specification</a>
+
+
diff --git a/doc/projects b/doc/projects
new file mode 100755
index 00000000000..47df1e71098
--- /dev/null
+++ b/doc/projects
@@ -0,0 +1,24 @@
+* Open Projects
+
+	The .NET framework is a good first in terms of a new
+	development foundation, but it falls short of providing
+	higher-level components or building blocks for people to
+	reuse.  
+
+	A few ideas of projects and classes that would be useful to
+	develop applications follows:
+
+** EOG component
+
+** XmlStorageSystem component
+
+* Gtk# related projects
+
+	Gnome Canvas Bindings.  
+
+	Bezier Canvas Item Binding.
+
+* Graphical bindings
+
+	Binding for the Libart library
+
diff --git a/doc/resources b/doc/resources
index 880f682166e..32780ef458a 100644
--- a/doc/resources
+++ b/doc/resources
@@ -104,10 +104,19 @@
 	There are a number of related projects to Mono:
 
 	<ul>
+		
+		* <a
+		  href="http://qtcsharp.sourceforge.net">Qt#:</a> 
+		  C# bindings for the Qt toolkit.
+
 		* <a
 		  href="http://www.icsharpcode.net/OpenSource/SD/default.asp">Sharp
 		  Develop:</a> an IDE for the C# language written in C#.
 
+		* <a
+		  href="http://www.improve-technologies.com/alpha/esharp/">Eclipse
+	 	  Plugin for C#</a>
+
 		* <a 
 		  href="http://janet-js.sourceforge.net/">Janet:</a>
 		  an implemention of ECMAScript (the standarized
@@ -133,11 +142,13 @@
 	          href="http://www.southern-storm.com.au/portable_net.html">Portable.NET:</a>
 		  Another implementation of the CLI and C# compiler.
 
+		* A Free (GFDL) tutorial on C# in Spanish with examples, slides, and extras (under development). Get it <a href="http://geneura.ugr.es/~jaime/csharp/">here</a>. 
+
 	</ul>
 
 ** GNOME Documentation
 
-	Documnetation on GNOME, and the GNOME APIs is available from
+	Documentation on GNOME, and the GNOME APIs is available from
 	the <a href="http://developer.gnome.org">developer</a> site at
 	GNOME:
 
@@ -151,6 +162,34 @@
 		* <A
 	href="http://developer.gnome.org/arch/">Architecture Overview</a>
 	</ul>
-
 	
-	
\ No newline at end of file
+** Assembly Language Manuals online
+
+	<ul>
+		* <a href="http://www.agner.org/assem/#optimize">
+	Pentium optimization tutorial</a> by Agner Fog
+
+		* <a href="http://webster.cs.ucr.edu/">
+	Art of Assembly</a> (x86 only)
+
+		* Documentation for various CPUs
+	(<a href="http://www.mit.edu/afs/sipb/contrib/doc/specs/ic/cpu/">
+	x86, IA64, MIPS, ARM, Alpha</a>)
+
+		* <a href="http://www.heyrick.co.uk/assembler/">
+	ARM Assembler</a> tutorial
+
+		* PowerPC
+	<a href="http://www-3.ibm.com/chips/techlib/techlib.nsf/techdocs/852569B20050FF7785256996007558C6">
+	Compiler Writer's Guide</a>
+
+		* <a href="http://www.lightsoft.co.uk/Fantasm/Beginners/begin1.html">
+	Beginners Guide to PowerPC Assembler</a>
+	</ul>
+
+** Win32
+
+	<ul>
+		* Win32 <a href="http://www.jorgon.freeserve.co.uk/ExceptFrame.htm">
+	Structured Exception Handling (SEH)</a> internals (x86 specific)
+	</ul>
diff --git a/doc/runtime b/doc/runtime
index 0bd5ebc83a6..da16f189387 100644
--- a/doc/runtime
+++ b/doc/runtime
@@ -16,14 +16,8 @@
 		  easy-to-port runtime engine.
 	</ul>
 
-	Currently both runtimes are missing garbage collection.  We
-	are planning on using the ORP GC engine and deploy it by
-	middle January.  
-
-* COM and XPCOM
-
-	We plan on adding support for XPCOM on Unix and COM on Microsoft
-	Windows later in our development process.
+	Currently we are using the Bohem conservative garbage
+	collector, but we working on incorporating the ORP GC engine. 
 
 ** Executing MSIL/CIL images
 
@@ -60,18 +54,38 @@
 	layout the code to support non-IA32 architectures.  Our work
 	will be focused on getting a IA32 version running first.  
 
-	The JIT engine should work on Linux and Win32, although you
+	The JIT engine works on Linux and Win32, although you
 	will need to install the CygWin32 development tools to get a
 	Unix-like compilation environment (mostly we use GNU make in 
 	a few of the makefiles).
 
-** JIT Engine (<b>updated, Dec 18th, 2001</b>)
+** JIT Engine (<b>updated, July 8th, 2002</b>)
 
 	The JIT engine uses a code-generator generator approach for
 	compilation.  Given the properties of CIL byte codes, we can
 	take full advantage of a real instruction selector for our
 	code generator. 
 
+	The JIT engine implements a number of optimizations:
+
+	<ul>
+		* Opcode cost estimates (our architecture allows
+	 	  us to generate different code paths depending
+		  on the target CPU dynamically).
+		  
+		* Inlining.
+
+		* Constant folding.  
+
+		  Although compilers typically do
+		  constant folding, the combination of inlining with
+		  constant folding gives some very good results.
+
+		* Linear scan register allocation.  In the past,
+		  register allocation was our achilles heel, but now 
+		  we have left this problem behind.
+	</ul>
+
 	There are a couple of books that deal with this technique: "A
 	Retargetable C Compiler" and "Advanced Compiler Design and
 	Implementation" are good references.  You can also get a
@@ -88,8 +102,22 @@
 
 	</ul>
 
+** Future plans
+
+	We are evaluating the future directions for the JIT engine:
+	both from our needs (optimizations like inlining, better register allocation,
+	instruction scheduling, and porting to other CPUs).
+
+	We have not yet decided how we will evolve the JIT engine.  We
+	might just upgrade our current architecture, and provide optimizations as
+	an extra layer.
+
 ** Garbage Collection
 
+	Currently we are using the Boehm conservative GC.  Although our plans 
+	are to move to the Intel ORP GC engine, our plans on a next generation
+	dual-JIT engine have to be taken into account.
+
 	We will be using the Intel ORP GC engine as it provides a precise
 	garbage collector engine, similar to what is available on the
 	.NET environment. 
@@ -151,3 +179,21 @@
 
 	Initially we used libffi, but it was fairly slow, so we have
 	reused parts of the JIT work to create efficient PInvoke trampolines. 
+
+** Remoting
+
+	Mono has support for remoting and proxy objects, just like
+	.NET does.  The runtime provides these facilities.
+
+** Porting
+
+	If you are interested in porting the Mono runtime to other
+	platforms, you might find the pre-compiled <a
+	href="archive/mono-tests.tar.gz">Mono regression test
+	suite</a> useful to debug your implementation.
+
+* COM and XPCOM
+
+	We plan on adding support for XPCOM on Unix and COM on Microsoft
+	Windows later in our development process.
+
diff --git a/doc/status b/doc/status
index f175d7b0890..64948ba312f 100644
--- a/doc/status
+++ b/doc/status
@@ -11,7 +11,7 @@
 		* The Mono JIT engine (<b>mono</b>.  The JIT engine is
 	        the real
 		virtual machine that we support.  It is
-		functionaly currently, and we are improving its speed,
+		currently functional, and we are improving its speed,
 		and making it feature complete.
 
 		* A CIL bytecode interpreter (<b>mint</b>).  This
diff --git a/doc/web/commands b/doc/web/commands
index 59f89ec8784..30f03535518 100644
--- a/doc/web/commands
+++ b/doc/web/commands
@@ -4,20 +4,43 @@
 1,Runtime,runtime.html,runtime.src
 1,Classes,class-library.html,class-library.src
 1,Gtk#,http://gtk-sharp.sourceforge.net
-2,Class Status,class-status.html,class-status.src
+1,Class Status,class-status.html,class-status.src,cm/cormissing.css,cm/cormissing.js
+2,corlib,class-status-corlib.html,class-status-corlib.src,cm/cormissing.css,cm/cormissing.js
+2,System,class-status-System.html,class-status-System.src,cm/cormissing.css,cm/cormissing.js
+2,System.Xml,class-status-System.Xml.html,class-status-System.Xml.src,cm/cormissing.css,cm/cormissing.js
+2,System.Data,class-status-System.Data.html,class-status-System.Data.src,cm/cormissing.css,cm/cormissing.js
+2,System.Drawing,class-status-System.Drawing.html,class-status-System.Drawing.src,cm/cormissing.css,cm/cormissing.js
+2,System.Web,class-status-System.Web.html,class-status-System.Web.src,cm/cormissing.css,cm/cormissing.js
+2,System.Web.Services,class-status-System.Web.Services.html,class-status-System.Web.Services.src,cm/cormissing.css,cm/cormissing.js
 1,C# Compiler,c-sharp.html,c-sharp.src
 1,Status,status.html,status.src
 0,Download,download.html,download.src
 1,CVS access,ccvs.html,ccvs.src
 1,AnonCVS access,anoncvs.html,anoncvs.src
 0,Contributing,contributing.html,contributing.src
+1,Hackers,hackers.html,hackers.src
 1,Documentation,documentation.html,documentation.src
 1,Class Docs,classlib-doc.html,classlib-doc.src
+1,Doc format,monodoc-xml.html,monodoc-xml.src
 1,Test Suite,testing.html,testing.src
 1,Tools,tools.html,tools.src
 1,Porting,porting.html,porting.src
+2,PowerPC,ppc.html,ppc.src
+1,HOWTO,mono-contribution-howto.html,mono-contribution-howto.src
+0,Plans,plans.html,plans.src
+1,ADO.NET,ado-net.html,ado-net.src
+1,ASP.NET,asp-net.html,asp-net.src
+1,Java,java.html,java.src
+1,Windows.Forms,winforms.html,winforms.src
 0,Resources,resources.html,resources.src
+1,Beginning,mono-beginning.html,mono-beginning.src
 1,Mailing Lists,mailing-lists.html,mailing-lists.src
 1,Ideas,ideas.html,ideas.src
 1,Passport,passport.html,passport.src
+1,Books,books.html,books.src
+1,Papers,papers.html,papers.src
+1,Languages,languages.html,languages.src
+1,Debugging,jit-debug.html,jit-debug.src
+2,Example 1,jit-debug-sample.html,jit-debug-sample.src
+2,Example 2,jit-debug-sample2.html,jit-debug-sample2.src
 0,Contact,contact.html,contact.src
diff --git a/doc/web/deploy/.cvsignore b/doc/web/deploy/.cvsignore
new file mode 100755
index 00000000000..2d19fc766d9
--- /dev/null
+++ b/doc/web/deploy/.cvsignore
@@ -0,0 +1 @@
+*.html
diff --git a/doc/web/deploy/cm/c.gif b/doc/web/deploy/cm/c.gif
new file mode 100644
index 00000000000..02c347efd0b
--- /dev/null
+++ b/doc/web/deploy/cm/c.gif
diff --git a/doc/web/deploy/cm/cormissing.css b/doc/web/deploy/cm/cormissing.css
new file mode 100644
index 00000000000..1f22da54273
--- /dev/null
+++ b/doc/web/deploy/cm/cormissing.css
@@ -0,0 +1,182 @@
+.y IMG
+{
+	border: 0px;
+	padding: 0px;
+	margin: 0px;
+	margin-right: 4px;
+	vertical-align: middle;
+}
+
+.y, .y_,
+.n, .n_,
+.c, .c_,
+.c, .c_,
+.d, .d_,
+.en, .en_,
+.i, .i_,
+.s, .s_,
+.e, .e_,
+.f, .f_,
+.m, .m_,
+.o, .o_,
+.p, .p_,
+.r, .r_,
+.x, .x_
+{
+	FONT: 10px 'Verdana';
+	margin-left: 20px;
+}
+
+.y_ .n,
+.y_ .n_,
+.n_ .c,
+.n_ .c_,
+.n_ .s,
+.n_ .s_,
+.n_ .d,
+.n_ .d_,
+.n_ .en,
+.n_ .en_,
+.n_ .i,
+.n_ .i_,
+.c_ .c,
+.c_ .c_,
+.c_ .e,
+.c_ .e_,
+.c_ .f,
+.c_ .f_,
+.c_ .m,
+.c_ .m_,
+.c_ .o,
+.c_ .o_,
+.c_ .p,
+.c_ .p_,
+.c_ .r,
+.c_ .r_,
+.c_ .x,
+.c_ .x_,
+.c_ .i,
+.c_ .i_,
+.d_ .c,
+.d_ .c_,
+.d_ .e,
+.d_ .e_,
+.d_ .f,
+.d_ .f_,
+.d_ .m,
+.d_ .m_,
+.d_ .o,
+.d_ .o_,
+.d_ .p,
+.d_ .p_,
+.d_ .r,
+.d_ .r_,
+.d_ .x,
+.d_ .x_,
+.en_ .c,
+.en_ .c_,
+.en_ .e,
+.en_ .e_,
+.en_ .f,
+.en_ .f_,
+.en_ .m,
+.en_ .m_,
+.en_ .o,
+.en_ .o_,
+.en_ .p,
+.en_ .p_,
+.en_ .r,
+.en_ .r_,
+.en_ .x,
+.en_ .x_,
+.i_ .c,
+.i_ .c_,
+.i_ .e,
+.i_ .e_,
+.i_ .f,
+.i_ .f_,
+.i_ .m,
+.i_ .m_,
+.i_ .o,
+.i_ .o_,
+.i_ .p,
+.i_ .p_,
+.i_ .r,
+.i_ .r_,
+.i_ .x,
+.i_ .x_,
+.i_ .i,
+.i_ .i_,
+.s_ .c,
+.s_ .c_,
+.s_ .e,
+.s_ .e_,
+.s_ .f,
+.s_ .f_,
+.s_ .m,
+.s_ .m_,
+.s_ .o,
+.s_ .o_,
+.s_ .p,
+.s_ .p_,
+.s_ .r,
+.s_ .r_,
+.s_ .x,
+.s_ .x_,
+.s_ .i,
+.s_ .i_,
+
+.e_ .r,
+.e_ .r_,
+.e_ .o,
+.e_ .o_,
+.f_ .r,
+.f_ .r_,
+.f_ .o,
+.f_ .o_,
+.m_ .r,
+.m_ .r_,
+.m_ .o,
+.m_ .o_,
+.o_ .r,
+.o_ .r_,
+.o_ .o,
+.o_ .o_,
+.p_ .r,
+.p_ .r_,
+.p_ .o,
+.p_ .o_,
+.r_ .r,
+.r_ .r_,
+.r_ .o,
+.r_ .o_,
+.x_ .r,
+.x_ .r_,
+.x_ .o,
+.x_ .o_
+{
+	display: none;
+}
+
+.t
+{
+	cursor: pointer;
+	margin-right: 8px;
+}
+
+.filter
+{
+	cursor: pointer;
+	vertical-align: middle;
+}
+
+
+.st
+{
+	margin-left: 20px;
+}
+
+.l
+{
+	cursor: pointer;
+}
diff --git a/doc/web/deploy/cm/cormissing.js b/doc/web/deploy/cm/cormissing.js
new file mode 100644
index 00000000000..e6b12ac4fd2
--- /dev/null
+++ b/doc/web/deploy/cm/cormissing.js
@@ -0,0 +1,392 @@
+function toggle (elt)
+{
+	if (elt == null)
+		return;
+
+	var eltLink = elt.firstChild;
+	if (eltLink != null && eltLink.className == 't')	// toggle
+	{
+		var ich = elt.className.indexOf ('_');
+		if (ich < 0)
+		{
+			eltLink.src = 'cm/tp.gif';
+			elt.className += '_';
+		}
+		else
+		{
+			eltLink.src = 'cm/tm.gif';
+			elt.className = elt.className.slice (0, ich);
+		}
+	}
+}
+
+function setView (elt, fView)
+{
+	var eltLink = elt.firstChild;
+	if (eltLink != null && eltLink.className == 't')	// toggle
+	{
+		var ich = elt.className.indexOf ('_');
+		if (ich < 0 && !fView)
+		{
+			eltLink.src = 'cm/tp.gif';
+			elt.className += '_';
+		}
+		else if (ich >= 0 && fView)
+		{
+			eltLink.src = 'cm/tm.gif';
+			elt.className = elt.className.slice (0, ich);
+		}
+	}
+}
+
+function trimSrc (strSrc)
+{
+	return strSrc.slice (strSrc.lastIndexOf ('/') + 1, strSrc.lastIndexOf ('.'));
+}
+
+function getChildrenByTagName (elt, strTag)
+{
+	strTag = strTag.toLowerCase ();
+	var rgChildren = new Array ();
+	var eltChild = elt.firstChild;
+	while (eltChild)
+	{
+		if (eltChild.tagName && eltChild.tagName.toLowerCase () == strTag)
+			rgChildren.push (eltChild);
+		eltChild = eltChild.nextSibling;
+	}
+	return rgChildren;
+}
+
+function viewAll (elt, dictTypes)
+{
+	var fView = false;
+	var rgImages = getChildrenByTagName (elt, 'IMG');
+	var cImages = rgImages.length;
+	for (var iImage = 0; iImage < cImages; iImage++)
+	{
+		var strImage = trimSrc (rgImages [iImage].src);
+		if (dictTypes [strImage])
+		{
+			fView = true;
+			break;
+		}
+	}
+	var rgElts = getChildrenByTagName (elt, 'DIV');
+	var cElts = rgElts.length;
+	if (cElts != 0)
+	{
+		var iElt;
+		for (iElt = 0; iElt < cElts; iElt ++)
+			fView |= viewAll (rgElts [iElt], dictTypes);
+	}
+	elt.style.display = fView ? '' : 'none';
+	return fView;
+}
+
+function getView (elt)
+{
+	var eltLink = elt.firstChild;
+	if (eltLink != null && eltLink.className == 't')	// toggle
+	{
+		var ich = elt.className.indexOf ('_');
+		if (ich < 0)
+			return true;
+	}
+	return false;
+}
+
+function getParentDiv (elt)
+{
+	if (elt)
+	{
+		do
+		{
+			elt = elt.parentNode;
+		}
+		while (elt && elt.tagName != 'DIV');
+	}
+
+	return elt;
+}
+
+function getName (elt)
+{
+	var rgSpans = getChildrenByTagName (elt, 'SPAN');
+	for (var iSpan = 0; iSpan < rgSpans.length; iSpan ++)
+	{
+		var span = rgSpans [iSpan];
+		if (span.className == 'l')	// label
+		{
+			if (span.innerText)
+				return span.innerText;
+			else
+				return span.firstChild.nodeValue;
+		}
+	}
+	return null;
+}
+
+function clickHandler (evt)
+{
+	var elt;
+	if (document.layers)
+		elt = evt.taget;
+	else if (window.event && window.event.srcElement)
+	{
+		elt = window.event.srcElement;
+		evt = window.event;
+	}
+	else if (evt && evt.stopPropagation)
+		elt = evt.target;
+	
+	if (!elt.className && elt.parentNode)
+		elt = elt.parentNode;
+
+	if (elt.className == 'l')	// label
+	{
+		var strClass;
+		var strField;
+		var strNamespace;
+		var strAssembly;
+
+		elt = getParentDiv (elt);
+		var strEltClass = elt.className;
+		if (strEltClass.charAt (strEltClass.length - 1) == '_')
+			strEltClass = strEltClass.slice (0, strEltClass.length - 1);
+
+		if (strEltClass == 'x')	// constructor
+		{
+			strField = 'ctor';
+			elt = getParentDiv (elt);
+		}
+		else
+		if (strEltClass == 'm' ||	// method
+			strEltClass == 'p' ||	// property
+			strEltClass == 'e' ||	// event
+			strEltClass == 'f')	// field
+		{
+			strField = getName (elt).toLowerCase ();
+			var match = strField.match ( /[\.A-Z0-9_]*/i );
+			if (match)
+				strField = match [0];
+			elt = getParentDiv (elt);
+
+		}
+
+		var strEltClass = elt.className;
+		if (strEltClass.charAt (strEltClass.length - 1) == '_')
+			strEltClass = strEltClass.slice (0, strEltClass.length - 1);
+
+		if (strEltClass == 'c' ||	// class
+			strEltClass == 's' ||	// struct
+			strEltClass == 'i' ||	// struct
+			strEltClass == 'd' ||	// delegate
+			strEltClass == 'en')	// enum
+		{
+			strClass = getName (elt);
+			if (strEltClass == 'en')
+				strField = null;
+			elt = getParentDiv (elt);
+		}
+
+		var strEltClass = elt.className;
+		if (strEltClass.charAt (strEltClass.length - 1) == '_')
+			strEltClass = strEltClass.slice (0, strEltClass.length - 1);
+
+		if (strEltClass == 'n')
+		{
+			strNamespace = getName (elt);
+			elt = getParentDiv (elt);
+		}
+
+		var strEltClass = elt.className;
+		if (strEltClass.charAt (strEltClass.length - 1) == '_')
+			strEltClass = strEltClass.slice (0, strEltClass.length - 1);
+
+		if (strEltClass == 'y')
+		{
+			strAssembly = getName (elt);
+		}
+
+		if (evt.ctrlKey)
+		{
+			var strRoot = 'http://cvs.hispalinux.es/cgi-bin/cvsweb/mcs/class/';
+			var strExtra = '?cvsroot=Mono';
+
+			if (strAssembly)
+			{
+				strRoot = strRoot + strAssembly + '/';
+				if (strNamespace)
+				{
+					strRoot = strRoot + strNamespace + '/';
+					if (strClass)
+					{
+						strRoot += strClass + '.cs';
+						strExtra += '&rev=1';
+					}
+				}
+				window.open (strRoot + strExtra, 'CVS');
+			}
+		}
+		else if (strNamespace)
+		{
+			var re = /\./g ;
+			strNamespace = strNamespace.toLowerCase ().replace (re, '');
+			if (strClass)
+				strNamespace += strClass.toLowerCase () + 'class';
+			if (strField)
+				strNamespace += strField;
+			if (strClass || strField)
+				strNamespace += 'topic';
+
+			window.open ('http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrf' + strNamespace + '.asp', 'MSDN');
+		}
+	}
+	else
+	{
+		if (elt.parentNode && elt.parentNode.className == 't')	// toggle
+			elt = elt.parentNode;
+		else if (elt.className != 't')	// toggle
+			return;
+
+		while (elt != null && elt.tagName != 'DIV')
+			elt = elt.parentNode;
+		
+		if (evt.shiftKey)
+		{
+			var rgElts = getChildrenByTagName (elt, 'DIV');
+			var cElts = rgElts.length;
+			if (cElts != 0)
+			{
+				var fView = false;
+				var iElt;
+				for (iElt = 0; iElt < cElts; iElt ++)
+				{
+					if (getView (rgElts [iElt]))
+					{
+						fView = true;
+						break;
+					}
+				}
+				for (iElt = 0; iElt < cElts; iElt ++)
+				{
+					setView (rgElts [iElt], !fView);
+				}
+			}
+		}
+		else if (evt.ctrlKey)
+		{
+			setView (elt, true);
+			var eltParent = getParentDiv (elt);
+			while (eltParent)
+			{
+				var rgSiblings = getChildrenByTagName (eltParent, 'DIV');
+				var cSiblings = rgSiblings.length;
+				for (var iSibling = 0; iSibling < cSiblings; iSibling++)
+				{
+					var eltSibling = rgSiblings [iSibling];
+					if (eltSibling != elt)
+					{
+						setView (eltSibling, false);
+					}
+				}
+				elt = eltParent;
+				eltParent = getParentDiv (elt);
+			}
+		}
+		else
+			toggle (elt);
+	}
+
+	return false;
+}
+
+function filterTree ()
+{
+	var eltMissing = document.getElementById ('missing');
+	var eltTodo = document.getElementById ('todo');
+	var eltExtra = document.getElementById ('extra');
+	var eltErrors = document.getElementById ('errors');
+
+	var dictTypes = new Object ();
+	if (eltMissing.checked)
+		dictTypes ['sm'] = true;
+	if (eltTodo.checked)
+		dictTypes ['st'] = true;
+	if (eltErrors.checked)
+		dictTypes ['se'] = true;
+	if (eltExtra.checked)
+		dictTypes ['sx'] = true;
+//	dictTypes ['sc'] = true;
+
+	viewAll (document.getElementById ('ROOT'), dictTypes);
+}
+
+function selectMissing ()
+{
+	toggleFilter ('missing');
+}
+
+function selectTodo ()
+{
+	toggleFilter ('todo');
+}
+
+function selectExtra ()
+{
+	toggleFilter ('extra');
+}
+
+function selectErrors ()
+{
+	toggleFilter ('errors');
+}
+
+function toggleFilter (strFilter)
+{
+	var eltTodo = document.getElementById ('todo');
+	var eltMissing = document.getElementById ('missing');
+	var eltExtra = document.getElementById ('extra');
+	var eltErrors = document.getElementById ('errors');
+
+	var eltToggle = document.getElementById (strFilter);
+	if (window && window.event && window.event.shiftKey)
+	{
+		eltMissing.checked = eltTodo.checked = eltExtra.checked = eltErrors.checked = false;
+		eltToggle.checked = true;
+	}
+	else
+	if (!eltTodo.checked && !eltMissing.checked && !eltExtra.checked && !eltErrors.checked)
+	{
+		eltMissing.checked = eltTodo.checked = eltExtra.checked = eltErrors.checked = true;
+		eltToggle.checked = false;
+	}
+	filterTree ();
+}
+
+function onLoad ()
+{
+	var eltMissing = document.getElementById ('missing');
+	var eltTodo = document.getElementById ('todo');
+	var eltExtra = document.getElementById ('extra');
+	var eltErrors = document.getElementById ('errors');
+	eltMissing.checked = eltTodo.checked = eltExtra.checked = eltErrors.checked = true;
+}
+
+if (document.layers)
+{
+	document.captureEvents (Event.MOUSEUP);
+	document.onmouseup = clickHandler;
+}
+else if (document.attachEvent)
+{
+	document.attachEvent('onclick', clickHandler);
+}
+else if (document.addEventListener)
+{
+	document.addEventListener('click', clickHandler, false);
+}
+else 
+	document.onclick = clickHandler;
+
diff --git a/doc/web/deploy/cm/d.gif b/doc/web/deploy/cm/d.gif
new file mode 100644
index 00000000000..c9735952f33
--- /dev/null
+++ b/doc/web/deploy/cm/d.gif
diff --git a/doc/web/deploy/cm/e.gif b/doc/web/deploy/cm/e.gif
new file mode 100644
index 00000000000..1137246bfae
--- /dev/null
+++ b/doc/web/deploy/cm/e.gif
diff --git a/doc/web/deploy/cm/en.gif b/doc/web/deploy/cm/en.gif
new file mode 100644
index 00000000000..00026b77300
--- /dev/null
+++ b/doc/web/deploy/cm/en.gif
diff --git a/doc/web/deploy/cm/f.gif b/doc/web/deploy/cm/f.gif
new file mode 100644
index 00000000000..f78a2f53bbc
--- /dev/null
+++ b/doc/web/deploy/cm/f.gif
diff --git a/doc/web/deploy/cm/i.gif b/doc/web/deploy/cm/i.gif
new file mode 100644
index 00000000000..56cd032a565
--- /dev/null
+++ b/doc/web/deploy/cm/i.gif
diff --git a/doc/web/deploy/cm/m.gif b/doc/web/deploy/cm/m.gif
new file mode 100644
index 00000000000..75fe3586d48
--- /dev/null
+++ b/doc/web/deploy/cm/m.gif
diff --git a/doc/web/deploy/cm/n.gif b/doc/web/deploy/cm/n.gif
new file mode 100644
index 00000000000..f6fa746304d
--- /dev/null
+++ b/doc/web/deploy/cm/n.gif
diff --git a/doc/web/deploy/cm/p.gif b/doc/web/deploy/cm/p.gif
new file mode 100644
index 00000000000..b79d0dd7edb
--- /dev/null
+++ b/doc/web/deploy/cm/p.gif
diff --git a/doc/web/deploy/cm/r.gif b/doc/web/deploy/cm/r.gif
new file mode 100644
index 00000000000..a3ef0f38ef0
--- /dev/null
+++ b/doc/web/deploy/cm/r.gif
diff --git a/doc/web/deploy/cm/s.gif b/doc/web/deploy/cm/s.gif
new file mode 100644
index 00000000000..f2fd5c8aee2
--- /dev/null
+++ b/doc/web/deploy/cm/s.gif
diff --git a/doc/web/deploy/cm/sc.gif b/doc/web/deploy/cm/sc.gif
new file mode 100644
index 00000000000..b02afd9b2e0
--- /dev/null
+++ b/doc/web/deploy/cm/sc.gif
diff --git a/doc/web/deploy/cm/se.gif b/doc/web/deploy/cm/se.gif
new file mode 100644
index 00000000000..1c46eaa5887
--- /dev/null
+++ b/doc/web/deploy/cm/se.gif
diff --git a/doc/web/deploy/cm/sm.gif b/doc/web/deploy/cm/sm.gif
new file mode 100644
index 00000000000..0c7194786d5
--- /dev/null
+++ b/doc/web/deploy/cm/sm.gif
diff --git a/doc/web/deploy/cm/st.gif b/doc/web/deploy/cm/st.gif
new file mode 100644
index 00000000000..067582cb398
--- /dev/null
+++ b/doc/web/deploy/cm/st.gif
diff --git a/doc/web/deploy/cm/sx.gif b/doc/web/deploy/cm/sx.gif
new file mode 100644
index 00000000000..2c8ca547929
--- /dev/null
+++ b/doc/web/deploy/cm/sx.gif
diff --git a/doc/web/deploy/cm/tb.gif b/doc/web/deploy/cm/tb.gif
new file mode 100644
index 00000000000..ee68c5a356b
--- /dev/null
+++ b/doc/web/deploy/cm/tb.gif
diff --git a/doc/web/deploy/cm/tm.gif b/doc/web/deploy/cm/tm.gif
new file mode 100644
index 00000000000..3c8f18aecea
--- /dev/null
+++ b/doc/web/deploy/cm/tm.gif
diff --git a/doc/web/deploy/cm/tp.gif b/doc/web/deploy/cm/tp.gif
new file mode 100644
index 00000000000..8b7435361b7
--- /dev/null
+++ b/doc/web/deploy/cm/tp.gif
diff --git a/doc/web/deploy/cm/y.gif b/doc/web/deploy/cm/y.gif
new file mode 100644
index 00000000000..08f00d4ea11
--- /dev/null
+++ b/doc/web/deploy/cm/y.gif
diff --git a/doc/web/deploy/images/bgsquares.gif b/doc/web/deploy/images/bgsquares.gif
new file mode 100644
index 00000000000..864bcd44038
--- /dev/null
+++ b/doc/web/deploy/images/bgsquares.gif
diff --git a/doc/web/deploy/images/bgsquares.png b/doc/web/deploy/images/bgsquares.png
new file mode 100644
index 00000000000..a9e2bb94dbb
--- /dev/null
+++ b/doc/web/deploy/images/bgsquares.png
diff --git a/doc/web/deploy/images/bgsquares.xcf.gz b/doc/web/deploy/images/bgsquares.xcf.gz
new file mode 100644
index 00000000000..200b5805615
--- /dev/null
+++ b/doc/web/deploy/images/bgsquares.xcf.gz
diff --git a/doc/web/deploy/images/mono.gif b/doc/web/deploy/images/mono.gif
new file mode 100644
index 00000000000..298976a07b7
--- /dev/null
+++ b/doc/web/deploy/images/mono.gif
diff --git a/doc/web/deploy/images/mono.png b/doc/web/deploy/images/mono.png
new file mode 100644
index 00000000000..21709009d60
--- /dev/null
+++ b/doc/web/deploy/images/mono.png
diff --git a/doc/web/deploy/images/pixel.gif b/doc/web/deploy/images/pixel.gif
new file mode 100644
index 00000000000..a4f37d7e02e
--- /dev/null
+++ b/doc/web/deploy/images/pixel.gif
diff --git a/doc/web/deploy/images/pixel.png b/doc/web/deploy/images/pixel.png
new file mode 100644
index 00000000000..85cfd14929a
--- /dev/null
+++ b/doc/web/deploy/images/pixel.png
diff --git a/doc/web/htmlify b/doc/web/htmlify
index a2b2706f16e..e4e61961f3b 100644
--- a/doc/web/htmlify
+++ b/doc/web/htmlify
@@ -9,10 +9,17 @@ while (<>){
 		print "<h2>$1</h2>\n";
 	} elsif (/^\*\*\* (.*)$/) {
 		print "<h3>$1</h3>\n";
+	} elsif (/^\*\*\*\* (.*)$/) {
+		print "<h4>$1</h4>\n";
 	} elsif (/^$/) {
 		print "<p>\n";
 	} elsif (/^\t\t\* (.*)$/) {
 		print "<li>$1\n";
+	} elsif (/^\@item (.*)$/){
+	        $name = $link = $1;
+		$link =~ s/ //g;
+	        print "<a name=\"$link\">\n";
+	        print "<h2>$name</h2>\n";
 	} elsif (/^Q: (.*)$/){
 		print "<p><a name=\"q$q\"></a><b>Question $q:</b> $1\n";
 		$q++;
diff --git a/doc/web/images/xml.gif b/doc/web/images/xml.gif
new file mode 100755
index 00000000000..ecb09575418
--- /dev/null
+++ b/doc/web/images/xml.gif
diff --git a/doc/web/makefile b/doc/web/makefile
index 3f181ca5b08..7c30ed303b3 100644
--- a/doc/web/makefile
+++ b/doc/web/makefile
@@ -1,53 +1,130 @@
-# Until we are ready:
-#	../class-library	\
-
-SOURCES=	\
-	../anoncvs		\
-	../contributing  	\
-	../class-status		\
-	../class-library	\
-	../classlib-doc		\
-	../contact		\
-	../c-sharp		\
-	../ccvs			\
-	../documentation	\
-	../download		\
-	../faq			\
-	../gcc-frontend		\
-	../index		\
-	../ideas		\
-	../mailing-lists	\
-	../passport		\
-	../rationale		\
-	../resources		\
-	../roadmap		\
-	../runtime		\
-	../status		\
-	../testing		\
-	../porting		\
-	../tools
+CSCRIPT = $(SYSTEMROOT)/system32/cscript.exe
+CSC=csc
+
+CORCOMPARE=../../../mcs/tools/corcompare
+
+OBJECTS=	\
+	deploy/ado-net.html				\
+	deploy/anoncvs.html				\
+	deploy/asp-net.html				\
+	deploy/books.html				\
+	deploy/contributing.html			\
+	deploy/class-status.html			\
+        deploy/class-status-corlib.html         	\
+        deploy/class-status-System.html         	\
+        deploy/class-status-System.Xml.html     	\
+        deploy/class-status-System.Drawing.html 	\
+        deploy/class-status-System.Data.html    	\
+        deploy/class-status-System.Web.html     	\
+        deploy/class-status-System.Web.Services.html    \
+	deploy/class-library.html			\
+	deploy/classlib-doc.html			\
+	deploy/contact.html				\
+	deploy/c-sharp.html				\
+	deploy/ccvs.html				\
+	deploy/documentation.html			\
+	deploy/download.html				\
+	deploy/faq.html					\
+	deploy/gcc-frontend.html			\
+	deploy/hackers.html				\
+	deploy/index.html				\
+	deploy/ideas.html				\
+	deploy/java.html				\
+	deploy/jit-debug.html				\
+	deploy/jit-debug-sample.html			\
+	deploy/jit-debug-sample2.html			\
+	deploy/languages.html				\
+	deploy/mailing-lists.html			\
+	deploy/mono-beginning.html			\
+	deploy/mono-contribution-howto.html		\
+	deploy/monodoc-xml.html				\
+	deploy/papers.html				\
+	deploy/passport.html				\
+	deploy/plans.html				\
+	deploy/porting.html				\
+	deploy/ppc.html					\
+	deploy/rationale.html				\
+	deploy/resources.html				\
+	deploy/roadmap.html				\
+	deploy/runtime.html				\
+	deploy/status.html				\
+	deploy/testing.html				\
+	deploy/tools.html				\
+	deploy/winforms.html
+
+# deploy/class-status-System.html		\
 
 NON_HTML_SOURCES=	\
 	../mono-build.sh	\
 	../mono-build-w32.sh
 
 
-all:
-	-mkdir site
-	for i in $(SOURCES); do \
-		perl htmlify $$i > `basename $$i`.src; \
-	done;
+all: $(OBJECTS) deploy/index.rss 
+	perl process.pl commands template.html.in deploy
+
+tutorial: mono-beginning.html.stamp mono-beginning.pdf 
+	cp -a mono-beginning mono-beginning.xml mono-beginning.pdf deploy
+
+mono-beginning.html.stamp: mono-beginning.xml
+	db2html mono-beginning.xml
+	touch mono-beginning.html.stamp
+
+mono-beginning.pdf: mono-beginning.xml
+	db2pdf mono-beginning.xml
+
+mono-beginning.xml: ../mono-beginning.xml
+	cp ../mono-beginning.xml .
 
-	perl process.pl commands template.html.in .
+deploy/index.rss: mono-rss.exe ../index
+	./mono-rss.exe ../index deploy/index.rss
+
+mono-rss.exe: mono-rss.cs rss.cs 
+	$(CSC) mono-rss.cs rss.cs
 
 clean:
-	for i in $(SOURCES); do \
-		rm -f `basename $$i`.src `basename $$i`.html; \
-	done;
+	rm -f $(OBJECTS) $(patsubst deploy/%.html,src/%.src, $(OBJECTS)) src/*.xml src/*.html.in ../class-status-* ../class-status
 
 push:
-	scp -P 2200 *.html $(NON_HTML_SOURCES) www@www.ximian.com:/web/cvsmodules/mono
-	echo scp *.html migueldeicaza@mononet.sf.net:/home/groups/m/mo/mononet/htdocs
+	cp -f $(NON_HTML_SOURCES) deploy
+	echo scp -P 2200 -r deploy/* www@www.ximian.com:/web/cvsmodules/mono
+	(cd deploy; rsync --verbose --recursive --checksum --update --rsh='ssh -p 2200' . www@www.ximian.com:/web/cvsmodules/mono )
 
 push2: 
-	scp *.html primates:public_html/xxx
+	scp -r deploy/* primates:public_html/xxx
+
+$(OBJECTS): $(patsubst deploy/%.html,src/%.src, $(OBJECTS))
+
+#.PRECIOUS: $(patsubst deploy/%.html,src/%.src, $(OBJECTS))
+
+
+
+.PRECIOUS: src/%.src
+src/%.src: ../% commands makefile template.html.in
+	perl htmlify $< > $@
+
+
+
+.PRECIOUS: ../class-status-%
+../class-status-%: src/%.html.in ../class-status.in
+	cat ../class-status.in $< > $@
+
+
+.PRECIOUS: src/%.html.in
+src/%.html.in: src/%.xml $(CORCOMPARE)/transform.js $(CORCOMPARE)/cormissing.xsl
+	$(CSCRIPT) /nologo $(CORCOMPARE)/transform.js $< $(CORCOMPARE)/cormissing.xsl > $@
+
+
+
+.PRECIOUS: src/%.xml
+src/%.xml: ../../../mcs/class/lib/%.dll $(CORCOMPARE)/CorCompare.exe
+	$(CORCOMPARE)/CorCompare.exe -x $@ $<
+
+src/corlib.xml: ../../../mcs/class/lib/corlib_cmp.dll $(CORCOMPARE)/CorCompare.exe
+	$(CORCOMPARE)/CorCompare.exe -f corlib -ms mscorlib -x $@ $<
+
+
+../class-status: ../class-status.in
+	cp -f $< $@
+
+make-rss:
+	$(CSC) make-rss.cs -o
diff --git a/doc/web/mono-rss.cs b/doc/web/mono-rss.cs
new file mode 100755
index 00000000000..a4fdd49c365
--- /dev/null
+++ b/doc/web/mono-rss.cs
@@ -0,0 +1,103 @@
+//
+// Generates the Mono RSS feed
+//
+// Miguel de Icaza
+//
+using System;
+using System.IO;
+using System.Xml;
+using RSS;
+
+class X {
+	static RSS.RSS rss;
+	static Channel c;
+	static int item_count;
+
+	static void PopulateRSS (StreamReader input)
+	{
+		string s;
+		
+		while ((s = input.ReadLine ()) != null){
+			if (s.StartsWith ("@item "))
+				break;
+		}
+
+		if (s == null || !s.StartsWith ("@item ")){
+			Console.WriteLine ("Could not find beginning of text to RSS");
+			return;
+		}
+
+		Item i = null;
+		string description = "";
+		do {
+			if (s.StartsWith ("@item ")){
+				if (item_count++ > 25)
+					break;
+
+				if (i != null){
+					i.Description = description;
+					description = "";
+				}
+				
+				string title = s.Substring (6);
+				string link = "http://www.go-mono.com/index.html#";
+				foreach (char ch in title){
+					if (ch != ' ')
+						link += ch;
+				}
+				
+				i = c.NewItem ();
+				i.Title = title;
+				i.Link = link;
+			} else {
+				description += "\n" + (s == "\n" ? "<p>" : s);
+			}
+		} while ((s = input.ReadLine ()) != null);
+
+		if (i != null){
+			i.Description = description;
+		}
+	}
+	
+	static void MakeRSS (string input, string output)
+	{
+		rss = new RSS.RSS ();
+		c = rss.NewChannel ("Mono Project News", "http://www.go-mono.com");
+		
+		c.Title = "Mono Project News";
+		c.Link = "http://www.go-mono.com";
+		c.Description =
+		"News from the Mono project: a portable implementation of the .NET Framework";
+		c.WebMaster = "webmaster@go-mono.com";
+		c.ManagingEditor = "miguel@ximian.com";
+		string t = File.GetLastWriteTime (input).ToString ("r");
+		c.PubDate = t;
+		c.LastBuildDate = t;
+
+		using (FileStream fs = new FileStream (input, FileMode.Open)){
+			using (StreamReader input_stream = new StreamReader (fs)){
+				PopulateRSS (input_stream);
+			}
+		}
+		
+		rss.XmlDocument.Save (output);
+	}
+	
+	static int Main (string [] args)
+	{
+		switch (args.Length){
+		case 0:
+			MakeRSS ("index", "index.rss");
+			break;
+		case 2:
+			MakeRSS (args [0], args [1]);
+			break;
+			
+		default:
+			Console.WriteLine ("Usage is: mono-rss [input output.rss]");
+			return 1;
+		}
+
+		return 0;
+	}
+}
diff --git a/doc/web/process.pl b/doc/web/process.pl
index cc2d9d50e44..9739f9b4384 100755
--- a/doc/web/process.pl
+++ b/doc/web/process.pl
@@ -23,12 +23,10 @@ while (<COMMANDS>) {
   my @command = split /,/;
   if ($command[0] != -1) {
       $menu .= "\t\t";
-      if ($command[0] == 0){
-	  $menu .= "<tr><td valign=\"top\" class=\"navi\"><a class=\"navi\"";
-      } else {
-	  $menu .= "<tr><td valign=\"top\" class=\"subnavi\">&nbsp;&nbsp;&nbsp<a class=\"subnavi\"";
-      }
-      $menu .= "HREF=\"$command[2]\">$command[1]</A></td></tr>\n\n";
+	  $menu .= "<tr><td valign=\"top\" class=\"navi" . $command[0];
+	  $menu .= "\"><a class=\"navi" . $command[0];
+	  $menu .= "\"";
+	  $menu .= "HREF=\"$command[2]\">$command[1]</A></td></tr>\n\n";
   } 
 }
 close COMMANDS;
@@ -50,7 +48,7 @@ while (<COMMANDS>) {
 	  open OUTPUT, ">" . $n || die "Can not create $n";
 	
 	  my $content = "";
-	  open INPUT, $command[3] || die "Can not open $command[3]";
+	  open INPUT, "src/$command[3]" || die "Can not open $command[3]";
 	  while (<INPUT>) {
 	    $content .= $_;
 	  }
@@ -60,14 +58,30 @@ while (<COMMANDS>) {
 	  my $temp;
 	  my $tit;
 	  my $title;
+	  my $css;
+	  my $script;
 	
 	  $tit = $command[1];
+	  $css = $command[4];
+	  $script = $command[5];
+
 	  foreach $line (@template) {
 	    $temp = $line;
 	    $title = "$tit / Mono";
 	    $temp =~ s/#TITLE#/$title/;
 	    $temp =~ s/#CONTENT#/$content/;
 	    $temp =~ s/#MENU#/$menu/;
+	    if ($css) {
+	      $temp =~ s/#CSS#/<LINK rel="stylesheet" type="text\/css" href="$css">/;
+	    } else {
+	      $temp =~ s/#CSS#//;
+	    }
+		
+	    if ($script) {
+	      $temp =~ s/#SCRIPT#/<SCRIPT src="$script"><\/SCRIPT>/;
+	    } else {
+	      $temp =~ s/#SCRIPT#//;
+	    }
 	    print OUTPUT $temp;
 	  }
  }	
diff --git a/doc/web/rss.cs b/doc/web/rss.cs
new file mode 100755
index 00000000000..c8966e51e52
--- /dev/null
+++ b/doc/web/rss.cs
@@ -0,0 +1,262 @@
+//
+// RSS.cs: Some utility classes to generate RSS feeds
+//
+// (C) 2002 Miguel de Icaza (miguel@gnu.org)
+//
+//
+using System;
+using System.Xml;
+using System.IO;
+
+namespace RSS {
+
+	public class Item {
+		XmlDocument doc;
+		XmlNode item;
+		XmlText title, link, description;
+		
+		public Item (XmlDocument doc, XmlNode item)
+		{
+			this.doc = doc;
+			this.item = item;
+		}
+
+		XmlText MakeTextElement (string name)
+		{
+			XmlNode node = doc.CreateElement (name);
+			XmlText text = doc.CreateTextNode ("");
+			
+			item.AppendChild (node);
+			node.AppendChild (text);
+			
+			return text;
+		}
+
+		public string Title {
+			get {
+				if (title == null)
+					return null;
+
+				return title.Value;
+			}
+
+			set {
+				if (title == null)
+					title = MakeTextElement ("title");
+				title.Value = value;
+			}
+		}
+
+		public string Link {
+			get {
+				if (link == null)
+					return null;
+
+				return link.Value;
+			}
+
+			set {
+				if (link == null)
+					link = MakeTextElement ("link");
+				link.Value = value;
+			}
+		}
+
+		public string Description {
+			get {
+				if (description == null)
+					return null;
+
+				return description.Value;
+			}
+
+			set {
+				if (description == null)
+					description = MakeTextElement ("description");
+				description.Value = value;
+			}
+		}
+	}
+	
+	public class Channel {
+		XmlDocument doc;
+		XmlNode channel;
+		XmlText title, link, description, language, pubDate, lastBuildDate;
+		XmlText managingEditor, webMaster;
+		
+		XmlText MakeTextElement (string name)
+		{
+			XmlNode node = doc.CreateElement (name);
+			XmlText text = doc.CreateTextNode ("");
+			
+			channel.AppendChild (node);
+			node.AppendChild (text);
+			
+			return text;
+		}
+		
+		public Channel (XmlDocument doc, XmlNode node)
+		{
+			this.channel = node;
+			this.doc = doc;
+			
+			title = MakeTextElement ("title");
+			link = MakeTextElement ("link");
+			description = MakeTextElement ("description");
+		}
+
+		public Item NewItem ()
+		{
+			XmlNode node = doc.CreateElement ("item");
+			Item item;
+
+			channel.AppendChild (node);
+			item = new Item (doc, node);
+
+			return item;
+		}
+		
+		public string Title {
+			get {
+				return title.Value;
+			}
+			
+			set {
+				title.Value = value;
+			}
+		}
+		
+		public string Link {
+			get {
+				return link.Value;
+			}
+
+			set {
+				link.Value = value;
+			}
+		}
+
+		public string Description {
+			get {
+				return description.Value;
+			}
+
+			set {
+				description.Value = value;
+			}
+		}
+
+#region Optional Values
+		public string ManagingEditor {
+			get {
+				if (managingEditor == null)
+					return null;
+			
+				return managingEditor.Value;
+			}
+
+			set {
+				if (managingEditor == null)
+					managingEditor = MakeTextElement ("managingEditor");
+
+				managingEditor.Value = value;
+			}
+		}
+
+		public string WebMaster {
+			get {
+				if (webMaster == null)
+					return null;
+			
+				return webMaster.Value;
+			}
+
+			set {
+				if (webMaster == null)
+					webMaster = MakeTextElement ("webMaster");
+				webMaster.Value = value;
+			}
+		}
+
+		public string PubDate {
+			get {
+				if (pubDate == null)
+					return null;
+
+				return pubDate.Value;
+			}
+
+			set {
+				if (pubDate == null)
+					pubDate = MakeTextElement ("pubDate");
+				pubDate.Value = value;
+			}
+		}
+
+		public string LastBuildDate {
+			get {
+				if (lastBuildDate == null)
+					return null;
+
+				return lastBuildDate.Value;
+			}
+
+			set {
+				if (lastBuildDate == null)
+					lastBuildDate = MakeTextElement ("lastBuildDate");
+				lastBuildDate.Value = value;
+			}
+		}
+
+		public string Language {
+			get {
+				if (language == null)
+					return null;
+
+				return language.Value;
+			}
+
+			set {
+				if (language == null)
+					language = MakeTextElement ("language");
+				language.Value = value;
+			}
+		}
+#endregion
+	}
+ 
+	class RSS {
+		XmlDocument doc;
+		XmlNode rss;
+		
+		const string rss_base =
+		"<?xml version=\"1.0\"?> <rss version=\"0.92\"></rss>";
+		
+		public RSS ()
+		{
+			doc = new XmlDocument ();
+			
+			doc.LoadXml (rss_base);
+			rss = doc.DocumentElement;
+		}
+		
+		public Channel NewChannel (string title, string url)
+		{
+			XmlNode node = doc.CreateElement ("channel");
+			Channel c;
+			
+			rss.AppendChild (node);
+			c = new Channel (doc, node);
+			
+			return c;
+		}
+		
+		public XmlDocument XmlDocument {
+			get {
+				return doc;
+			}
+		}
+	}
+}
+
+
diff --git a/doc/web/src/.cvsignore b/doc/web/src/.cvsignore
new file mode 100755
index 00000000000..5053fb08904
--- /dev/null
+++ b/doc/web/src/.cvsignore
@@ -0,0 +1 @@
+*.src
diff --git a/doc/web/template.html.in b/doc/web/template.html.in
index 0e1501514c2..16508b36201 100644
--- a/doc/web/template.html.in
+++ b/doc/web/template.html.in
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>#TITLE#</title>
@@ -9,44 +10,54 @@
    body, td, table { font-family: "trebuchet ms", lucida, verdana, helvetica; 
                      font-size: 14px; }
 
-	.navi { font-size: 14px; background: #444444; }
-	.subnavi { font-size: 14px; }
-        .footnote { font-size: 12px; color: #aaaaaa; }
+	.navi0 { font-size: 14px; font-weight: bold; background: #444444; }
+	.navi1 { font-size: 14px; font-weight: bold; left-margin: 10pt}
+	.navi2 { font-size: 10px; font-weight: bold; left-margin: 20pt}
+	.footnote { font-size: 12px; color: #aaaaaa; }
 
-	a.navi { color: #ffffff; text-decoration: none; font-weight: bold; }
-	a.navi:visited { color: #cccccc; }
-	a.navi:hover { color: #ee9900; text-decoration: underline; }
+	a.navi0 { color: #ffffff; text-decoration: none}
+	a.navi0:visited { color: #cccccc; }
+	a.navi0:hover { color: #ee9900; text-decoration: underline; }
 
-	a.subnavi { color: #ffffff; text-decoration: none; font-weight: bold; }
-	a.subnavi:visited { color: #cccccc; }
-	a.subnavi:hover { color: #ee9900; text-decoration: underline; }
+	a.navi1 { color: #ffffff; text-decoration: none; margin-left: 7px;}
+	a.navi1:visited { color: #cccccc; }
+	a.navi1:hover { color: #ee9900; text-decoration: underline; }
+
+	a.navi2 { color: #ffffff; text-decoration: none; margin-left: 20px;}
+	a.navi2:visited { color: #cccccc; }
+	a.navi2:hover { color: #ee9900; text-decoration: underline; }
 
 // -->
 </style>
+#CSS#
+#SCRIPT#
 </head>
 <body bgcolor="#555555" text="#000000">
 
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
-        <td><img src="images/pixel.gif"></td><!-- left border -->
+        <td><img src="images/pixel.gif" alt=""></td><!-- left border -->
         <td colspan="4">
-           <a href="http://www.go-mono.com"><img src="images/mono.gif" border="0"></a></td>
-        <td><img src="images/pixel.gif"></td><!-- right border -->
+           <a href="http://www.go-mono.com"><img src="images/mono.gif"
+        alt="mono-logo" border="0"></a></td>
+        <td><img src="images/pixel.gif" alt=""></td><!-- right border -->
     </tr>
     <tr>
-        <td><img src="images/pixel.gif" width="1" height="1"></td>
-        <td colspan="3" bgcolor="black"><img src="images/pixel.gif" height="2"></td>
-        <td bgcolor="black"><img src="images/pixel.gif" width="1"></td>
-	     <td><img src="images/pixel.gif"></td>
+        <td><img src="images/pixel.gif" width="1" height="1" alt=""></td>
+        <td colspan="3" bgcolor="black"><img src="images/pixel.gif"
+        height="2" alt=""></td>
+        <td bgcolor="black"><img src="images/pixel.gif" width="1" alt=""></td>
+	     <td><img src="images/pixel.gif" alt=""></td>
     </tr>
     <tr>
-        <td width="100"><img src="images/pixel.gif"></td>
+        <td width="100"><img src="images/pixel.gif" alt=""></td>
         <td valign="top">
             <table cellpadding="2" valign="top" cellspacing="0" border="0">
                 #MENU#
             </table>
 	     </td>
-        <td bgcolor="black" width="1"><img src="images/pixel.gif" width="1"></td>
+        <td bgcolor="black" width="1"><img src="images/pixel.gif"
+        width="1" alt=""></td>
         <td bgcolor="white" align="left" width="80%" valign="top">
             <table cellpadding="16">
               <tr><td>
@@ -54,24 +65,26 @@
 	           </td></tr>
             </table>
 	</td>
-        <td bgcolor="black"><img src="images/pixel.gif" width="1"></td>
-        <td width="100"><img src="images/pixel.gif"></td>
+        <td bgcolor="black"><img src="images/pixel.gif" width="1" alt=""></td>
+        <td width="100"><img src="images/pixel.gif" alt=""></td>
     </tr>
     <tr>
         <td colspan="2">
-            <img src="images/pixel.gif"></td>
-        <td colspan="2" bgcolor="black"><img src="images/pixel.gif" height="1"></td>
-        <td bgcolor="black"><img src="images/pixel.gif" width="1"></td>
-        <td><img src="images/pixel.gif"></td>
+            <img src="images/pixel.gif" alt=""></td>
+        <td colspan="2" bgcolor="black"><img src="images/pixel.gif"
+        height="1" alt=""></td>
+        <td bgcolor="black"><img src="images/pixel.gif" width="1" alt=""></td>
+        <td><img src="images/pixel.gif" alt=""></td>
     </tr>
 
-    <td colspan="2"></td>
-    <td colspan="2" align="center">
-	<a class="footnote" href="mailto: webmaster@go-mono.com">webmaster@go-mono.com</a>
-    </td>
-    <td colspan="2"></td>
+    <tr>
+      <td colspan="2"></td>
+      <td colspan="2" align="center">
+	  <a class="footnote" href="mailto:webmaster@go-mono.com">webmaster@go-mono.com</a>
+      </td>
+      <td colspan="2"></td>
     </tr>
-</tr>
+  </tr>
 </table>
 
 </body>
diff --git a/doc/winforms b/doc/winforms
new file mode 100644
index 00000000000..2d8c1e3d79d
--- /dev/null
+++ b/doc/winforms
@@ -0,0 +1,90 @@
+* System.Windows.Forms
+
+	System.Windows.Forms eventually will support multiple
+	toolkits.  Ximian will be delivering a product that will allow
+	for System.Windows.Forms applications to integrate with GNOME
+	through Gtk and MacOS X using Cocoa.
+
+	There are no current plans to support embedded devices, but
+	Gtk/FrameBuffer is an option.  If you have suggestions or
+	recommendations, please let us <a
+	href="mailto:mono-hackers-list@ximian.com">let us know</a>
+
+* Contributing
+
+	Currently Ximian developers are busy making our JIT engine
+	feature complete, and dealing with the low-level details of
+	the Mono runtime.
+
+	If you are interested in contributing, you can start stubbing
+	out classes and providing enumerations.  That will help us
+	significantly when we start working on the actual bindings.  
+
+	Christian Meyer is currently organizing this effort.
+
+* System.Drawing
+
+	Using existing libraries to implement some of the functionality required
+
+	<ul>
+		* gdk-pixbuf is a generic image loader that loads an image
+		  and leaves it into an RGB buffer.  It hides all the details
+		  about what image file format is being loaded.
+
+		* Libart is a general framework for rendering RGB/RGBA
+		  buffers into RGB buffers and rendering postscript-like paths into
+		  RGB/RGBA buffers.
+	</ul>
+
+	We want to use gdk-pixbuf as the image loader for the image
+	classes, and then we need operations to render that into the
+	windowing system (Gtk+, MacOS, etc).  But notice how there is
+	very little dependnecies in Gdk-pixbuf on gtk, and libart has
+	none.
+
+	They are pretty independent from a windowing system
+	(gdk-pixbuf comes with some "helper" routines for rendering
+	data into a pixmap and to load pixmaps into RGB buffers).
+
+	A few things to keep in mind:
+	
+	<ul>
+	
+		* gdk-pixbuf can be used to load images for Gtk+,
+		  MacOS X and Windows, it should be pretty portable,
+		  although we might need in the future to back-port
+		  some new features from Gtk head. 
+
+		* Libart is probably only going to be used with X11,
+		  as the MacOS X provides the same features in Quartz,
+		  and Win32 *probably* has that in GDI+.  If not, we
+		  should use libart in Win32 as well (or for older
+		  Windows systems).
+	</ul>
+
+* Directory Layout
+
+        System.Drawing  (assembly directory)
+                System.Drawing.Blah
+                        Common code for "Blah"
+                        Stubs for "Blah" to ease ports.
+
+                Gtk
+                        System.Drawing.Blah.
+                                Gtk ports of "System.Drawing.Blah"
+                MacOS
+                        System.Drawing.Blah
+                                MacOS ports of "System.Drawing.Blah"
+                Win32
+                        System.Drawing.Blah
+                                Win32 ports of "System.Drawing.Blah"
+
+	Then we use nant targets to include/exclude the right set of
+	files to create the assembly.
+
+* Open questions:
+
+	I believe that the graphics contexts that are used to render
+	can accept either libart-like rendering operations and
+	X11-like rendering operations.  This complicates matters, but
+	I am not sure.  Someone needs to investigate this.
diff --git a/docs/.cvsignore b/docs/.cvsignore
new file mode 100644
index 00000000000..282522db034
--- /dev/null
+++ b/docs/.cvsignore
@@ -0,0 +1,2 @@
+Makefile
+Makefile.in
diff --git a/docs/Makefile.am b/docs/Makefile.am
new file mode 100644
index 00000000000..f78ef9fc779
--- /dev/null
+++ b/docs/Makefile.am
@@ -0,0 +1,3 @@
+EXTRA_DIST = gc-issues  jit-thoughts	object-layout	 unmanaged-calls \
+	exceptions  jit-trampolines	stack-alignment embedded-api
+
diff --git a/docs/embedded-api b/docs/embedded-api
new file mode 100644
index 00000000000..b8fd31d47fc
--- /dev/null
+++ b/docs/embedded-api
@@ -0,0 +1,227 @@
+	
+	   Embedding the Mono runtime, preliminary version
+
+		    Miguel de Icaza, Paolo Molaro.
+
+	This document describes how to embed the Mono runtime in your
+	application, and how to invoke CIL methods from C, and how to
+	invoke C code from CIL.
+
+* Embedding the runtime.
+
+	Embedding the runtime consists of various steps: 
+
+		* Compiling and linking the Mono runtime
+
+		* Initializing the Mono runtime
+
+		* Optionally expose C code to the C#/CIL universe.
+
+	These are discussed in detail next.
+
+** Compiling and Linking
+
+	To embed the runtime, you have to link your code against the
+	Mono runtime libraries.  To do this, you want to pass the
+	flags returned by pkg-config to your compiler:
+
+		pkg-config --cflags --libs mono
+
+	Like this:
+
+		gcc sample.c `pkg-config --cflags --libs mono`
+
+	You can separate the compilation flags from the linking flags, for 
+	instance, you can use the following macros in your makefile:
+
+		CFLAGS=`pkg-config --cflags mono`
+		LDFLAGS=`pkg-config --libs mono`
+
+** Initializing the Mono runtime
+
+	To initialize the runtime, call mono_jit_init, like this:
+
+		MonoDomain *domain;
+
+		domain = mono_jit_init ("domain-name");
+
+	That will return a MonoDomain where your code will be
+	executed.  You can create multiple domains.  Each domain is
+	isolated from the other domains and code in one domain will
+	not interfere with code in other domains.  This is useful if
+	you want to host different applications in your program.  
+
+	Then you can load an assembly containing code into the domain:
+
+		MonoAssembly *assembly;
+
+		assembly = mono_domain_assembly_open ("file.dll");
+		if (!assembly)
+			error ();
+
+	In the above example, the contents of `file.dll' will be
+	loaded into the domain.  This only loads the code, but it will
+	not execute anything yet.  You can replace `file.dll' with
+	another transport file, like `file.exe'
+
+	To start executing code, you must invoke a method in the
+	assembly, or if you have provided a static Main method (an
+	entry point), you can use the convenience function:
+
+		retval = mono_jit_exec (domain, assembly, argc - 1, argv + 1);
+
+	If you want to invoke a different method, look at the
+	`Invoking Methods in the CIL universe' section later on.
+
+** Shutting down the runtime
+
+	To shutdown the Mono runtime, you have to clean up all the
+	domains that were created, use this function:
+
+		mono_jit_cleanup (domain);
+
+* Exposing C code to the CIL universe
+
+	The Mono runtime provides two mechanisms to expose C code to
+	the CIL universe: internal calls and native C code.   Internal
+	calls are tightly integrated with the runtime, and have the
+	least overhead, as they use the same data types that the
+	runtime uses.
+
+	The other option is to use the Platform Invoke (P/Invoke) to
+	call C code from the CIL universe, using the standard P/Invoke
+	mechanisms.
+
+	To register an internal call, use this call in the C code:
+
+	mono_add_internal_call ("Hello::Sample", sample);
+
+	Now, you need to declare this on the C# side:
+
+		using System;
+		using System.Runtime.CompilerServices;
+
+	class Hello {
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		extern static string Sample ();
+	}
+
+	Since this routine returns a string, here is the C definition:
+
+		static MonoString*
+		Sample () 
+		{
+			return mono_string_new (mono_domain_get (), "Hello!");
+		}
+
+	Notice that we have to return a `MonoString', and we use the
+	`mono_string_new' API call to obtain this from a string.
+
+* Invoking Methods in the CIL universe
+
+	Calling a method in the CIL universe from C requires a number of steps:
+
+		* Obtaining the MonoMethod handle to the method.
+
+		* The method invocation.
+
+** Obtaining a MonoMethod
+
+	To get a MonoMethod there are several ways.
+
+	You can get a MonoClass (the structure representing a type)
+	using:
+
+	MonoClass *
+	mono_class_from_name (MonoImage *image, const char* name_space, const char *name);
+
+	and then loop in the returned class method array until you get
+	the one you're looking for. There are examples of such
+	searches as static functions in several C files in
+	metadata/*.c: we need to expose one through the API and remove
+	the duplicates.
+
+	The other, simpler, way is to use the functions in
+	debug-helpers.h: there are examples of their use in monograph,
+	mint and the jit as well.  You basically use a string
+	description of the method, like:
+	
+	        "System.Object:GetHashCode()"
+	
+	and create a MonoMethodDesc out of it with:
+	
+	MonoMethodDesc* mono_method_desc_new (const char *name, gboolean include_namespace);
+	
+	You can then use:
+	
+	MonoMethod*     mono_method_desc_search_in_class (MonoMethodDesc *desc, MonoClass *klass);
+	MonoMethod*     mono_method_desc_search_in_image (MonoMethodDesc *desc, MonoImage *image);
+	
+	to search for the method in a class or in an image.  You would
+	tipically do this just once at the start of the program and
+	store the result for reuse somewhere.
+			
+** Invoking a Method
+
+	There are two functions to call a managed method:
+	
+	MonoObject*
+	mono_runtime_invoke         (MonoMethod *method, void *obj, void **params,
+	                             MonoObject **exc);
+	and
+	MonoObject*
+	mono_runtime_invoke_array   (MonoMethod *method, void *obj, MonoArray *params,
+	                             MonoObject **exc);
+	
+	obj is the 'this' pointer, it should be NULL for static
+	methods, a MonoObject* for object instances and a pointer to
+	the value type for value types.
+
+	The params array contains the arguments to the method with the
+	same convention: MonoObject* pointers for object instances and
+	pointers to the value type otherwise. The _invoke_array
+	variant takes a C# object[] as the params argument (MonoArray
+	*params): in this case the value types are boxed inside the
+	respective reference representation.
+	
+	From unmanaged code you'll usually use the
+	mono_runtime_invoke() variant.
+
+	Note that this function doesn't handle virtual methods for
+	you, it will exec the exact method you pass: we still need to
+	expose a function to lookup the derived class implementation
+	of a virtual method (there are examples of this in the code,
+	though).
+
+	You can pass NULL as the exc argument if you don't want to
+	catch exceptions, otherwise, *exc will be set to the exception
+	thrown, if any.  if an exception is thrown, you can't use the
+	MonoObject* result from the function.
+
+	If the method returns a value type, it is boxed in an object
+	reference.
+	
+	We have plans for providing an additional method that returns
+	an unmanaged->managed thunk like this:
+	
+	void* mono_method_get_unmanaged_thunk (MonoMethod *method);
+	
+	You'll be able to store the returned pointer in a function
+	pointer with the proper signature and call that directly from
+	C:
+	
+	typedef gint32 (*GetHashCode) (MonoObject *obj);
+	
+	GetHashCode func = mono_method_get_unmanaged_thunk (System_Object_GetHashCode_method);
+	
+	gint32 hashvalue = func (myobject);
+	
+	It may not be possible to manage exceptions in that case,
+	though. I need to think more about it.
+
+* Samples
+
+	See the sample programs inmono/sample/embed for examples of
+	embedding the Mono runtime in your application.
+
+
diff --git a/docs/exceptions b/docs/exceptions
index ab0f2dec94a..05f1be03bba 100644
--- a/docs/exceptions
+++ b/docs/exceptions
@@ -1,3 +1,6 @@
+Author: Dietmar Maurer (dietmar@ximian.com)
+(C) 2001 Ximian, Inc.
+
 Exception implementation (jit):
 ===============================
 
@@ -8,8 +11,15 @@ We record the code address (start_address, size) of all methods. That way it is
 possible to map an instruction pointer (IP) to the method information needed
 for unwinding the stack:
 
+We also save a Last Managed Frame (LMF) structure at each call from managed to
+unmanaged code. That way we can recover from exceptions inside unmanaged code.
+
 void handle_exception ((struct sigcontext *ctx, gpointer obj)
 {
+        if (ctx->bp < mono_end_of_stack) {
+	        /* unhandled exception */
+	        abort ();
+	}
 
 	info = mono_jit_info_table_find (mono_jit_info_table, ctx->ip);
 
@@ -21,14 +31,20 @@ void handle_exception ((struct sigcontext *ctx, gpointer obj)
 		execute_all_finally_handler ();
 
 		// restore register, including IP and Frame pointer
-		restore_caller_saved_registers (ji, ctx);
+		ctx = restore_caller_saved_registers_from_ctx (ji, ctx);
 
 		// continue unwinding
 		handle_exception (ctx, obj);
 
 	} else {
 
-		// not implemented 
+	        lmf = get_last_managed_frame ();
+		
+		// restore register, including IP and Frame pointer
+		ctx = restore_caller_saved_registers_from_lmf (ji, lmf);
+		
+		// continue unwinding
+		handle_exception (ctx, obj);
 	}
 }
 
diff --git a/docs/gc-issues b/docs/gc-issues
new file mode 100644
index 00000000000..95062c56244
--- /dev/null
+++ b/docs/gc-issues
@@ -0,0 +1,31 @@
+* GC issues you need to be careful about when hacking on the mono runtime.
+
+mono currently uses the Boehm garbage collection library. This is a conservative
+GC package: this means that the memory is searched for possible memory references
+to chunks allocated with the GC. Not all the memory is searched, but only the memory
+allocated with the GC itself (unless you use the 'atomic' variant of the allocation 
+routines), the stack and global variables. Also, if the last reference to an object 
+is stored in an area of themory that is not searched, the object may be freed resulting 
+in memory corruption ind segfaults.
+
+In particular, memory allocated with system's malloc() is not searched, so you need to be
+careful NOT to store object references in memory allocated with malloc() (unless you are sure
+that the object reference will be live at the same time in some other area under the control 
+of the GC (on the stack or in a global variable, for example). Since g_malloc()
+ultimately calls system malloc() the data structures in GLib are not safe to
+use to store object references.
+
+Occasionally, you'll need to store some object reference from C code: in this case, 
+you must make sure that the store location is searched by the GC. You can safely
+use thread local storage areas, global variables, stack variables. If you need a more 
+complicated data structure, you can use a hash table: MonoGHashTable.
+This hash table has the same interface as GHashTable from GLib, just stick the "mono_"
+prefix in function calls and the "Mono" prefix in the hash table type name.
+This hash table ensures that object references stored in it are tracked by the GC, as long
+as the pointer to the hash is tracked itself.
+
+Other data structures that are allocated with the GC and are safe to use to store pointers
+to GC-allocated memory, are MonoDomain (keeps track of many domain specfic objects)
+and MonoVTable (referenced by MonoDomain: keeps track of the static data of a type
+since that can hold references to objects).
+
diff --git a/docs/internal-calls b/docs/internal-calls
new file mode 100644
index 00000000000..2f3d4abbda0
--- /dev/null
+++ b/docs/internal-calls
@@ -0,0 +1,59 @@
+
+* How to map C# types for use in the C implementation of internal calls
+
+	C# type 	C type
+	char 		gunichar2
+	bool 		MonoBoolean
+	sbyte 		signed char
+	byte 		guchar
+	short 		gint16
+	ushort 		guint16
+	int 		gint32
+	uint 		guint32
+	long 		gint64
+	ulong 		guint64
+	IntPtr/UIntPtr	gpointer
+	object 		MonoObject*
+	string 		MonoString*
+
+For ref and out paramaters you'll use the corresponding pointer type.
+Arrays of any type must be described with a MonoArray* and the elements 
+must be accessed with the mono_array_* macros.
+Any other type that has a matching C structure representation, should use
+a pointer to the struct instead of a generic MonoObject pointer.
+
+Instance methods that are internal calls will receive as first argument
+the instance object, so you must account for it in the C method signature:
+
+	[MethodImplAttribute(MethodImplOptions.InternalCall)]
+	public extern override int GetHashCode ();
+
+becaomes:
+
+	gint32 ves_icall_System_String_GetHashCode (MonoString *this);
+
+
+
+* How to hook internal calls with the runtime
+
+Once you require an internal call in corlib, you need to create a C
+implementation for it and register it in a static table in metadata/icall.c.
+Add an entry in the table like:
+
+	"System.String::GetHashCode", ves_icall_System_String_GetHashCode,
+
+Note that you need to include the full namespace.name of the class.
+If there are overloaded methods, you need also to specify the signature
+of _all_ of them:
+
+	[MethodImplAttribute(MethodImplOptions.InternalCall)]
+	public extern override void DoSomething ();
+	[MethodImplAttribute(MethodImplOptions.InternalCall)]
+	public extern override void DoSomething (bool useful);
+
+should be mapped with:
+
+	"Namespace.ClassName::DoSomething()", ves_icall_Namespace_ClassName_DoSomething,
+	"Namespace.ClassName::DoSomething(bool)", ves_icall_Namespace_ClassName_DoSomething_bool,
+
+
diff --git a/docs/jit-debug b/docs/jit-debug
deleted file mode 100644
index 18652c1596d..00000000000
--- a/docs/jit-debug
+++ /dev/null
@@ -1,47 +0,0 @@
-How to use the debug support in the jit.
-----------------------------------------
-
-You need to run mono inside gdb. The following command line swicthes 
-are available:
-
-	--stabs
-	--debug methodName
-
---stabs will create an assemblyname-stabs.s file for each assembly the
-CLR program uses.  Note that to properly display source code lines,
-you need to disassemble the CLR executables with monodis before running
-mono. Each IL assembly file needs to have the name <assemblyname>.il.
-
---debug methodName will insert a breakpoin at the beginning of
-methodName's code, so that control is trasnfered to the debugger as soon
-as it is entered. You may use this switch multiple times.
-
-So, suppose you use the --debug switch, or hit a segfault inside a
-jitted method.  In a shell you need to compile the stab information
-created with the --stabs option with the assembler:
-
-	as assemblyname-stabs.s -o assemblyname-stabs.o
-
-Now, inside gdb, you can load the debug information with:
-
-	add-symbol-file assemblyname-stabs.o 0
-
-And at this point the debugger should be able to print a correct
-backtrace, you should be able to inspect method parameters and local
-variables, disassemble methods and step through the code.
-
-Note that apparently you can't unload a symbol file from gdb, so you
-need to restart it if you restart the program to debug.
-
-Name mangling.
--------------
-
-Currently CLR methods are exposed as C functions, so, if they are not
-static, their first argument will be called 'this'.
-Method names are mangled in the following way: a long name is created
-concatting namespace, class name and method name. '.' chars are changed
-to underscaore '_'.  To allow for overloading, the address of the
-MonoMethod from wich the method was created is appended to the end of
-the name (i's also handy since you can use the address in gdb to inspect
-the MonoMethod).
-
diff --git a/docs/jit-regalloc b/docs/jit-regalloc
new file mode 100644
index 00000000000..ca54b4564f9
--- /dev/null
+++ b/docs/jit-regalloc
@@ -0,0 +1,64 @@
+Register Allocation
+===================
+
+The current JIT implementation uses a tree matcher to generate code. We use a
+simple algorithm to allocate registers in trees, and limit the number of used
+temporary register to 4 when evaluating trees. So we can use 2 registers for
+global register allocation.  
+
+Register Allocation for Trees
+=============================
+
+We always evaluate trees from left to right. When there are no more registers
+available we need to spill values to memory. Here is the simplified algorithm.
+
+gboolean 
+tree_allocate_regs (tree, exclude_reg)
+{
+	if (!tree_allocate_regs (tree->left, -1))
+	        return FALSE;
+  
+	if (!tree_allocate_regs (tree->right, -1)) {
+	  
+		tree->left->spilled == TRUE;
+
+		free_used_regs (tree->left);
+
+		if (!tree_allocate_regs (tree->right, tree->left->reg))
+			return FALSE;
+	}
+
+	free_used_regs (tree->left);
+	free_used_regs (tree->right);
+
+	/* try to allocate a register (reg != exclude_reg) */
+	if ((tree->reg = next_free_reg (exclude_reg)) != -1)
+	        return TRUE;
+  
+	return FALSE;
+}
+
+The emit routing actually spills the registers:
+
+tree_emit (tree)
+{
+
+	tree_emit (tree->left);
+
+	if (tree->left->spilled)
+		save_reg (tree->left->reg);
+
+	tree_emit (tree->right);
+	
+	if (tree->left->spilled)
+		restore_reg (tree->left->reg);
+
+
+	emit_code (tree);
+}
+
+
+Global Register Allocation
+==========================
+
+TODO.
diff --git a/docs/jit-thoughts b/docs/jit-thoughts
index 90cf4785523..106469dc13e 100644
--- a/docs/jit-thoughts
+++ b/docs/jit-thoughts
@@ -11,48 +11,6 @@ We are designing a JIT compiler, so we have to consider two things:
 The current approach is to keep the JITer as simple as possible, and thus as
 fast as possible. The generated code quality will suffer from that.
 
-Register allocation is first done inside the trees of the forest, and each
-tree can use the full set of registers. We simply split a tree if we get out of
-registers, for example the following tree:
-
-
-              add(R0)
-             /   \
-            /     \
-           a(R0)  add(R1)
-                 /   \
-                /     \
-               b(R1)  add(R2)
-                     /   \
-                    /     \
-                   c(R2)   b(R3)
-
-can be transformed to:
-
-
-       stloc(t1)         add(R0)
-         |              /   \
-         |             /     \
-        add(R0)       a(R0)  add(R1)
-       /   \                /   \
-      /     \              /     \
-     c(R0)   b(R1)        b(R1)  t1(R2)
-
-
-Please notice that the split trees use less registers than the original
-tree. 
-
-Triggering JIT compilation:
-===========================
-
-The current approach is to call functions indirectly. The address to call is
-stored in the MonoMethod structure. For each method we create a trampoline
-function. When called, this function does the JIT compilation and replaces the
-trampoline with the compiled method address.
-
-We should consider using the CACAO approach, they do not use a trampoline at
-all.
-
 Register Allocation:
 ====================
 
@@ -61,15 +19,6 @@ allocation. For example this is needed by call, which return the value always
 in EAX on x86. The current implementation works without such system, due to
 special forest generation.
 
-X86 Register Allocation:
-========================
-
-We can use 8bit or 16bit registers on the x86. If we use that feature we have
-more registers to allocate, which maybe prevents some register spills. We
-currently ignore that ability and always allocate 32 bit registers, because I
-think we would gain very little from that optimisation and it would complicate
-the code.
-
 Different Register Sets:
 ========================
 
@@ -86,11 +35,10 @@ call class methods for ALU operations like add or sub. Sure, this method will
 be be a bit inefficient.
 
 The more performant solution is to allocate two 32bit registers for each 64bit
-value. We add a new non terminal to the monoburg grammar called long_reg. The
+value. We add a new non terminal to the monoburg grammar called "lreg". The
 register allocation routines takes care of this non terminal and allocates two
 32 bit registers for them.
 
-
 Forest generation:
 ==================
 
@@ -102,7 +50,7 @@ LDC.1		(5,1)		[5,0]
 STLOC.0		(5)		[1,0]
 STLOC.1		()		[1,5]
 
-The current forest generation generates: 
+A simple forest generation generates: 
 
 STLOC.0(LDC.1)
 STLOC.1(LDLOC.0)
@@ -157,14 +105,6 @@ STLOC(ADD (LDLOC, LDLOC))
 
 This is what lcc is doing, if I understood 12.8, page 342, 343?
 
-Value Types:
-============
-
-The only CLI instructions which can handle value types are loads and stores,
-either to local variable, to the stack or to array elements. Value types with a
-size smaller than sizeof(int) are handled like any other basic type. For other
-value types we load the base address and emit block copies to store them. 
-
 Possible Optimisations:
 =======================
 
@@ -180,3 +120,6 @@ else for (i = 0; i < N; i++) { check_range (a, i); a [i] = X; }
 
 The "else" is only to keep original semantics (exception handling).
 
+We need loop detection logic in order to implement this (dominator tree).
+
+AFAIK CACAO also implements this.
\ No newline at end of file
diff --git a/docs/jit-trampolines b/docs/jit-trampolines
new file mode 100644
index 00000000000..d8b80b5e2c7
--- /dev/null
+++ b/docs/jit-trampolines
@@ -0,0 +1,52 @@
+Author: Dietmar Maurer (dietmar@ximian.com)
+(C) 2001 Ximian, Inc.
+ 
+Howto trigger JIT compilation
+=============================
+
+The JIT translates CIL code to native code on a per method basis. For example
+if you have this simple program:
+
+public class Test {
+	public static void Main () {		
+		System.Console.WriteLine ("Hello");
+	}
+}
+
+the JIT first compiles the Main function. Unfortunately Main() contains another
+reference to System.Console.WriteLine(), so the JIT also needs the address for
+WriteLine() to generate a call instruction.
+
+The simplest solution would be to JIT compile System.Console.WriteLine()
+to generate that address. But that would mean that we JIT compile half of our
+class library at once, since WriteLine() uses many other classes and function,
+and we have to call the JIT for each of them. Even worse there is the
+possibility of cyclic references, and we would end up in an endless loop.
+
+Thus we need some kind of trampoline function for JIT compilation. Such a
+trampoline first calls the JIT compiler to create native code, and then jumps
+directly into that code. Whenever the JIT needs the address of a function (to
+emit a call instruction) it uses the address of those trampoline functions.
+
+One drawback of this approach is that it requires an additional indirection. We
+always call the trampoline. Inside the trampoline we need to check if the
+method is already compiled or not, and when not compiled we start JIT
+compilation. After that we call the code. This process is quite time consuming
+and shows very bad performance.
+
+The solution is to add some logic to the trampoline function to detect from
+where it is called. It is then possible for the JIT to patch the call
+instruction in the caller, so that it directly calls the JIT compiled code
+next time.
+
+Implementation for x86
+======================
+
+emit-x86.c (arch_create_jit_trampoline): return the JIT trampoline function
+
+emit-x86.c (x86_magic_trampoline): contains the code to detect the caller and
+patch the call instruction.
+
+emit-x86.c (arch_compile_method): JIT compile a method
+
+
diff --git a/docs/mono_handle_d b/docs/mono_handle_d
new file mode 100644
index 00000000000..a8f97b141c3
--- /dev/null
+++ b/docs/mono_handle_d
@@ -0,0 +1,98 @@
+=pod
+
+=head1 Internal design document for the mono_handle_d
+
+This document is designed to hold the design of the mono_handle_d and
+not as an api reference.
+
+=head2 Primary goal and purpose
+
+The mono_handle_d is a process which takes care of the (de)allocation
+of scratch shared memory and handles (of files, threads, mutexes,
+sockets etc. see L<WapiHandleType>) and refcounts of the
+filehandles. It is designed to be run by a user and to be fast, thus
+minimal error checking on input is done and will most likely crash if
+given a faulty package. No effort has been, or should be, made to have
+the daemon talking to machine of different endianness/size of int.
+
+=head2 How to start the daemon
+
+To start the daemon you either run the mono_handle_d executable or try
+to attach to the shared memory segment via L<_wapi_shm_attach> which
+will start a daemon if one does not exist.
+
+=head1 Internal details
+
+The daemon works by opening a socket and listening to clients. These
+clients send packages over the socket complying to L<struct
+WapiHandleRequest>.
+
+=head2 Possible requests
+
+=over
+
+=item WapiHandleRequest_New
+
+Find a handle in the shared memory segment that is free and allocate
+it to the specified type. To destroy use
+L</WapiHandleRequest_Close>. A L<WapiHandleResponse> with
+.type=WapiHandleResponseType_New will be sent back with .u.new.handle
+set to the handle that was allocated. .u.new.type is the type that was
+requested.
+
+=item WapiHandleRequestType_Open
+
+Increase the ref count of an already created handle. A
+L<WapiHandleResponse> with .type=WapiHandleResponseType_Open will be sent
+back with .u.new.handle set to the handle, .u.new.type is set to the
+type of handle this is.
+
+=item WapiHandleRequestType_Close
+
+Decrease the ref count of an already created handle. A
+L<WapiHandleResponse> with .type=WapiHandleResponseType_Close will be
+sent back with .u.close.destroy set to TRUE if ref count for this
+client reached 0.
+
+=item WapiHandleRequestType_Scratch
+
+Allocate a shared memory area of size .u.scratch.length in bytes. A
+L<WapiHandleResponse> with .type=WapiHandleResponseType_Scratch will be
+sent back with .u.scratch.idx set to the index into the shared
+memory's scratch area where to memory begins. (works just like
+malloc(3))
+
+=item WapiHandleRequestType_Scratch
+
+Deallocate a shared memory area, this must have been allocated before
+deallocating. A L<WapiHandleResponse> with
+.type=WapiHandleResponseType_ScratchFree will be sent back (works just
+like free(3))
+
+=back
+
+=head1 Why a daemon
+
+From an email:
+
+Dennis: I just have one question about the daemon... Why does it
+exist? Isn't it better performancewise to just protect the shared area
+with a mutex when allocation a new handle/shared mem segment or
+changing refcnt? It will however be a less resilient to clients that
+crash (the deamon cleans up ref'd handles if socket closes)
+
+Dick: It's precisely because with a mutex the shared memory segment
+can be left in a locked state. Also, it's not so easy to clean up
+shared memory without it (you can't just mark it deleted when creating
+it, because you can't attach any more readers to the same segment
+after that).  I did some minimal performance testing, and I don't
+think the daemon is particularly slow.
+
+
+=head1 Authors
+
+Documentaion: Dennis Haney
+
+Implementation: Dick Porter
+
+=cut
diff --git a/docs/object-layout b/docs/object-layout
index 8135ca2805f..4916751d1e7 100644
--- a/docs/object-layout
+++ b/docs/object-layout
@@ -1,3 +1,6 @@
+Author: Dietmar Maurer (dietmar@ximian.com)
+(C) 2001 Ximian, Inc.
+
 Object and VTable layout
 ========================
 
diff --git a/docs/remoting b/docs/remoting
new file mode 100644
index 00000000000..806e4015286
--- /dev/null
+++ b/docs/remoting
@@ -0,0 +1,26 @@
+Runtime support for Remoting
+============================
+
+The runtime supports a special objects called "TransparentProxy". You can
+create objects of this type by calling GetTransparentProxy() on a "RealProxy"
+object. 
+
+LDFLD/STFLD for transparent proxies
+===================================
+
+Access to fields must be redirected to the remote object. System.Object has
+some special methods for that:
+
+void FieldGetter (string typeName, string fieldName, ref object val);
+		
+void FieldSetter (string typeName, string fieldName, object val);
+
+This methods are never called on actual object. The are only used to pack
+LDFLD/STFLD operations into method call messages, which are then passed to the
+RealProxy::Invoke() method. 
+
+There are two helper methods which can be used by the JIT and the interpreter
+to convert LDFLD/STFLD operations into messages and then call
+RealProxy::Invoke(): mono_store_remote_field() and mono_load_remote_field().
+
+
diff --git a/docs/stack-alignment b/docs/stack-alignment
new file mode 100644
index 00000000000..da995fb288f
--- /dev/null
+++ b/docs/stack-alignment
@@ -0,0 +1,33 @@
+Size and alignment requirements of stack values
+===============================================
+
+P  ... System.IntPtr
+I1 ... System.Int8
+I2 ... System.Int16
+I4 ... System.Int32
+I8 ... System.Int64
+F  ... System.Single
+D  ... System.Double
+LD ... native long double
+
+-----------------------------------------------------------
+ARCH      |   P |  I1 |  I2 |  I4 |  I8 |  F  |   D |  LD | 
+-----------------------------------------------------------
+X86       | 4/4 | 4/4 | 4/4 | 4/4 | 8/4 | 4/4 | 8/4 |12/4 |
+-----------------------------------------------------------
+X86/W32   | 4/4 | 4/4 | 4/4 | 4/4 | 8/4 | 4/4 | 8/4 |12/4 |
+-----------------------------------------------------------
+ARM       | 4/4 | 4/4 | 4/4 | 4/4 | 8/4 | 4/4 | 8/4 | 8/4 |
+-----------------------------------------------------------
+M68K      | 4/4 | 4/4 | 4/4 | 4/4 | 8/4 | 4/4 | 8/4 |12/4 |
+-----------------------------------------------------------
+ALPHA     | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 |
+-----------------------------------------------------------
+SPARC     | 4/4 | 4/4 | 4/4 | 4/4 | 8/8 | 4/4 | 8/8 |16/8 |
+-----------------------------------------------------------
+SPARC64   | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 | 8/8 |16/16|
+-----------------------------------------------------------
+MIPS      | 4/4 | 4/4 | 4/4 | 4/4 | ?/? | 4/4 | 8/8 | 8/8 |
+-----------------------------------------------------------
+          |     |     |     |     |     |     |     |     |
+-----------------------------------------------------------
diff --git a/docs/unmanaged-calls b/docs/unmanaged-calls
new file mode 100644
index 00000000000..7542623166b
--- /dev/null
+++ b/docs/unmanaged-calls
@@ -0,0 +1,135 @@
+Author: Dietmar Maurer (dietmar@ximian.com)
+(C) 2001 Ximian, Inc.
+
+More about PInvoke and Internal calls
+=====================================
+
+1.) What is PInvoke
+
+PInvoke stands for Platform Invoke. It is possible to call functions contained
+in native shared libraries, for example you can declare:
+
+	[DllImport("cygwin1.dll", EntryPoint="puts"]
+	public static extern int puts (string name);
+
+If you then call "puts(...)" it invokes the native "puts" functions in
+"cygwin1.dll". It is also possible to specify several marshalling attributes
+for the arguments, for example you can specify that they puts() function expect
+ts the string in Ansi encoding by setting the CharSet attribute field:
+
+	[DllImport("cygwin1.dll", EntryPoint="puts", CharSet=CharSet.Ansi)]
+	public static extern int puts (string name);
+
+2.) What are internal calls
+
+Some class library functions are implemented in C, because it is either not
+possible to implement them in C# or because of performance gains. Internal
+functions are contained in the mono executable itself. Here is an example form
+our array implementation:
+
+	[MethodImplAttribute(MethodImplOptions.InternalCall)]
+	public extern int GetRank ();
+
+If you call this GetRank() function it invokes
+ves_icall_System_Array_GetRank() inside the mono runtime.
+
+If you write your own runtime environment you can add internal calls with
+mono_add_internal_call(). 
+
+
+2.) Runtime considerations
+
+Invoking native (unmanaged) code has several implications:
+
+- We need to handle exceptions inside unmanaged code. The JIT simply saves some
+  informations at each transition from managed to unmanaged code (in a linked
+  list), called Last Managed Frame (LMF). If an exception occurs the runtime
+  first looks if the exception was inside managed code. If not there must be a
+  LMF entry which contains all necessary information to unwind the stack. 
+
+  Creation of those LMF structure clearly involves some overhead, so calling
+  into unmanaged code is not as cheap as it looks like at first glance. Maybe
+  we can introduce a special attribute to avoid the creation of LMF on internal
+  call methods that cant raise exceptions.
+
+- PInvoke has the possibility to convert argument types. For example Strings
+  are marshalled as Char*. So each String argument is translated into a
+  char*. The encoding is specified in the CharSet of the DllImport attribute.
+  
+
+3.) When/how does the runtime call unmanaged PInvoke code
+
+- LDFTN, CALLI, Delegate::Invoke, Delegate::BeginInvoke: We must generate
+  wrapper code when we load the function with LDFTN, so that all arguments are
+  marshalled in the right format. We also need to save/restore the LMF.
+
+- MethodBase::Invoke (runtime invoke): We need to marshal all arguments in
+  they right format and save/restore the LMF
+
+- CALL: We need to marshal all arguments in they right format and save/restore
+  the LMF
+
+The easiest way to implement this is to always create a wrapper function for
+PInvoke calls, which takes care of argument marshalling and LMF save/restore.
+
+4.) When/how does the runtime call unmanaged internal calls
+
+We don't need to convert any arguments, so we need only take care of the LMF
+structure. 
+
+- LDFTN, CALLI, Delegate::Invoke, Delegate::BeginInvoke: We must generate
+  wrapper code when we load the function with LDFTN which saves/restores the
+  LMF.
+
+- MethodBase::Invoke (runtime invoke): We need to save/restore the LMF.
+
+- CALL: We need to save/restore the LMF.
+
+- CALLVIRT (through the vtable): We must generate wrapper code to save/restore
+  the LMF.
+
+Please notice that we can call internal function with CALLVIRT, i.e. we can
+call those function through a VTable. But we cant know in advance if a vtable
+slot contains an internal call or managed code. So again it is best to generate
+a wrapper functions for internal calls in order to save/restore the LMF.
+
+Unfortunately we need to push all arguments 2 times, because we have to save
+the LMF, and the LMF is currently allocated on the stack. So the stack looks
+like:
+
+    --------------------
+    | method arguments |
+    --------------------
+    | LMF              |
+    --------------------
+    | copied arguments |
+    --------------------
+
+AFAIK this is the way ORP works. Another way is to allocate the LMF not on the
+stack, but then we have additional overhead to allocate/free LMF structures
+(and another call to arch_get_lmf_addr).
+
+Maybe it is possible to avoid this addiotional copy for internal calls by
+including the LMF in the C function signature. Lets say we hav a puts()
+function which is a internal call:
+
+ves_icall_puts (MonoString *string);
+
+If we simply modify that to include the LMF we can avoid to copy all arguments:
+
+ves_icall_puts (MonoLMF lmf, MonoString *string);
+
+But this depends somehow on the calling conventions, and I don't know if that
+works on all plattforms? 
+
+
+5.) What is stored in the LMF
+
+- all caller saved registers (since we can trust unmanaged code)
+- the instruction pointer of the last managed instruction
+- a MonoMethod pointer for the unmanaged function
+- the address of the thread local lfm_addr pointer (to avoid another call to
+  arch_get_lmf_addr when restoring LMF)
+
+The LMF is allocated on the stack, so we also know the stack position for
+stack unwinding. 
diff --git a/man/Makefile.am b/man/Makefile.am
index 5e93a6df773..c5ac9027d77 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,4 +1,4 @@
-man_MANS = mcs.1 mono.1
+man_MANS = mcs.1 mono.1 monostyle.1 mono-config.5
 
 EXTRA_DIST = $(man_MANS)
 
diff --git a/man/mcs.1 b/man/mcs.1
index 2967e1bd926..0d13160e605 100755
--- a/man/mcs.1
+++ b/man/mcs.1
@@ -6,11 +6,18 @@ mcs \- Mono Compiler Suite.
 [option] [source-files]
 .SH DESCRIPTION
 mcs is the Mono C# compiler, an implementation of the ECMA-334
-specification.  You can pass one or more options to drive the
+language specification.  You can pass one or more options to drive the
 compiler, and a set of source files.  Extra options or arguments can
 be provided in a response file.  Response files are referenced by
 prepending the @ symbol to the response file name.
 .PP
+The Mono C# compiler accepts the same options than the Microsoft C#
+compiler does.  Those options can start with a slash or a dash
+(/checked is the same as -checked).  Additionally to this, the
+GNU-like options are supported, those begin with "--".  All
+MCS-specific flags which are not available in the Microsoft C#
+compiler are available only with the GNU-style options. 
+.PP
 C# source files must end with a ".cs" extension.  Compilation of C#
 source code requires all the files that make up a library, module or
 executable to be provided on the command line.  There is no support
@@ -29,13 +36,25 @@ Executables are not bound to a specific CPU or operating system.
 .I \-\-about
 Displays information about the Mono C# compiler
 .TP
-.I \-\-checked
+.I -checked, -checked+
 Sets the default compilation mode to `checked'.  This makes all
 the math operations checked (the default is unchecked).
 .TP
-.I \-\-define SYMBOL
-Defines a symbol named SYMBOL.  This can be tested in the source code
-by the pre-processor.
+.I -checked-
+Sets the default compilation mode to `unchecked'.  This makes all
+the math operations unchecked (this is the default).
+.TP
+.I \-define:SYMLIST, -d:SYMLIST
+Defines the symbol listed by the semi-colon separeted list SYMLIST
+SYMBOL.  This can be tested in the source code by the pre-processor,
+or can be used by methods that have been tagged with the Conditional
+attribute. 
+.TP
+.I \-debug, \-debug+, \-g
+Generate debugging information.  
+.TP
+.I \-debug-
+Do not generate debugging information.
 .TP
 .I \-\-fatal 
 This is used for debugging the compiler.  This makes the error emission
@@ -45,22 +64,28 @@ generate an exception that can be caught by a debugger.
 Generates a stack trace at the time the error is reported, useful for
 debugging the compiler.
 .TP
+.I -lib:PATHLIST
+Each path specified in the comma-separated list will direct the
+compiler to look for libraries in that specified path.
+.TP
 .I \-L PATH
 Directs the compiler to look for libraries in the specified path.
-Multiple paths can be provided.
+Multiple paths can be provided by using the option multiple times.
 .TP
-.I \-\-nostdlib
+.I \-nostdlib, -nostdlib+
 Use this flag if you want to compile the core library.  This makes the
 compiler load its internal types from the assembly being compiled.
 .TP
-.I \-\-nowarn XXX
-Makes the compiler ignore warning XXX.
+.I \-noconfig, \-noconfig+
+Disables the default compiler configuration to be loaded.  The
+compiler by default has references to the system assemblies. 
 .TP
-.I \-o FNAME
-Names the output file to be generated.
+.I \-nowarn:WARNLIST
+Makes the compiler ignore warnings specified in the comma-separeted
+list WARNLIST>
 .TP
-.I \-\-optimize
-Turns on optimizations in the compiler.  
+.I -out:FNAME, -o FNAME
+Names the output file to be generated.
 .TP
 .I \-\-parse
 Used for benchmarking.  The compiler will only parse its input files.
@@ -68,8 +93,22 @@ Used for benchmarking.  The compiler will only parse its input files.
 .I \-\-probe X L
 Probes for the code to generate an error named `X' in line `L'.  This
 is only used by the test suite.
+.TP 
+.I /resource:RESOURCE
+Embeds to the given resource file.
+.TP
+.I /linkresource:RESOURCE 
+Links to the given resource file.
 .TP
-.I \-\-target KIND
+.I \-recurse:PATTERN, --recurse PATTERN
+Does recursive compilation using the specified pattern.  In Unix the
+shell will perform globbing, so you migth want to use it like this:
+.PP
+.nf
+		bash$ mcs -recurse:'*.cs' 
+.fi
+.TP
+.I \-target:KIND, \-t:KIND
 Used to specify the desired target.  The possible values are: exe,
 winexe, library and module.  
 .TP
@@ -77,19 +116,21 @@ winexe, library and module.
 Another debugging flag.  Used to display the times at various points
 in the compilation process.
 .TP
-.I \-\-unsafe
+.I \-unsafe, -unsafe+
 Enables compilation of unsafe code.
 .TP
-.I \-\-werror
+.I \-warnaserror, \-warnaserror+
 Treat warnings as errors.
 .TP
-.I \-\-wlevel LEVEL
+.I \-warn:LEVEL
 Sets the warning level.  0 is the lowest warning level, and 4 is the
 highest.  The default is 2.
 .TP
-.I \-r ASSEMBLY
+.I -r:ASSEMBLY, \-r ASSEMBLY
 Reference the named assembly.  Use this to use classes from the named
-assembly in your program.
+assembly in your program.  The assembly will be loaded from either the
+system directory where all the assemblies live, or from the path
+explicitly given with the -L option.
 .TP
 .I \-v 
 Debugging. Turns on verbose yacc parsing.
@@ -98,19 +139,52 @@ Debugging. Turns on verbose yacc parsing.
 Use this to stop option parsing, and allow option-looking parameters
 to be passed on the command line.
 .PP
+.SH SPECIAL DEFINES
+The 
+.B TRACE
+and
+.B DEBUG
+defines have a special meaning to the compiler.
+.PP
+By default calls to methods and properties in the
+System.Diagnostics.Trace class are not generated unless the TRACE
+symbol is defined (either through a "#define TRACE") in your source
+code, or by using the
+.I "--define TRACE"
+in the command line.
+.PP
+By default calls to methods and properties in the
+System.Diagnostics.Debug class are not generated unless the DEBUG
+symbol is defined (either through a "#define DEBUG") in your source
+code, or by using the
+.I "--define DEBUG"
+in the command line.
+.PP
+Note that the effect of defining TRACE and DEBUG is a global setting,
+even if they are only defined in a single file.
+.PP
+.SH DEBUGGING SUPPORT
+When use the "--debug" or "-g" flag, MCS will create an assembler file
+FILE-debug.s containing debugging information where FILE is the name of
+the generated assembly. You need to run this file through the assembler
+to get a object file FILE-debug.o.  See mono's "--dwarf-plus" argument
+for details on how to use this file.
 .SH NOTES
 During compilation the MCS compiler defines the __MonoCS__ symbol,
 this can be used by pre-processor instructions to compile Mono C#
 compiler specific code.
 .SH AUTHORS
-The Mono C# Compiler was written by Miguel de Icaza and Ravi Pratap at
-Ximian. 
+The Mono C# Compiler was written by Miguel de Icaza, Ravi Pratap and
+Martin Baulig at Ximian.
 .PP
 .SH LICENSE
 The Mono Compiler Suite is released under the terms of the GNU GPL.
 Please read the accompanying `COPYING' file for details.  Alternative
 licenses are available from Ximian.
 .PP
+.SH SEE ALSO
+mono(1), mint(1)
+.PP
 .SH BUGS
 To report bugs in the compiler, you can use `bug-buddy', or you can
 file bug reports in our bug tracking system:
diff --git a/man/mono-config.5 b/man/mono-config.5
new file mode 100644
index 00000000000..1800f42b8d2
--- /dev/null
+++ b/man/mono-config.5
@@ -0,0 +1,36 @@
+.\" 
+.\" mono configuration page.
+.\" (C) Ximian, Inc. 
+.\" Author:
+.\"   Miguel de Icaza (miguel@gnu.org)
+.\"
+.TH Mono "Mono 1.0"
+.SH NAME
+mono-config \- Mono runtime file format configuration
+.SH DESCRIPTION
+The Mono runtime will load configuration data from the
+installation prefix /etc/mono/config file, the ~/.mono/config or from
+the file pointed by the MONO_CONFIG environment variable.
+.PP
+This file controls the behavior of the runtime.
+.PP
+The file contains an XML-like file with various sections, all of them
+contained inside a 
+.B<configuration> 
+section (It actually uses GMarkup
+to parse the file).
+.SH <dllmap> directive
+You use the dllmap directive to map shared libraries referenced by
+P/Invoke in your assemblies to a different shared library.
+.PP
+This is typically used to map Windows libraries to Unix library names.
+.SH EXAMPLES
+The following example maps references to the `cygwin1.dll' shared
+library to the `libc.so.6' file.  
+.nf
+<configuration>
+	<dllmap dll="cygwin1.dll" target="libc.so.6"/>
+</configuration>
+.fi
+.SH SEE ALSO
+.BR mono(1), monodis(1), mint(1)
\ No newline at end of file
diff --git a/man/mono.1 b/man/mono.1
index d407ace685c..01adb15d6ea 100644
--- a/man/mono.1
+++ b/man/mono.1
@@ -1,5 +1,5 @@
 .\" 
-.\" mint manual page.
+.\" mono manual page.
 .\" (C) Ximian, Inc. 
 .\" Author:
 .\"   Miguel de Icaza (miguel@gnu.org)
@@ -11,7 +11,9 @@ mono \- Mono ECMA-CLI Just in Time compiler.
 .PP
 .B mono
 [\-\-help] [\-d] [\-\-debug-asm] [\-\-debug-forest] [\-\-trace-calls]
-[\-\-stabs] [\-\-compile cname] [\-\-ncompile num] [\-\-debug]
+[\-\-compile name] [\-\-ncompile num]  [\-\-noinline] [\-\-profile]
+[\-\-debug=[format]] [\-\-debug-args args] [\-\-break name] [\-\-precompile name]
+[\-\-config filename]
 program.exe [arguments...]
 .SH DESCRIPTION
 The \fImono\fP program is a Just in Time compiler for ECMA CLI byte
@@ -32,6 +34,14 @@ to sharing code.  This results in slower code, but enables code
 sharing across application domains.  The default is to maximize for
 speed, but disallow JITed code sharing across domains.  See
 System.LoaderOptimization for more information
+.TP
+.I "--config filename"
+Load the specified configuration file instead of the default one(s).
+The default files are /etc/mono/config and ~/.mono/config or the file
+specified in the MONO_CONFIG environment variable, if set.
+.TP
+.I "--noinline"
+Disables the code inliner.
 .SH DEBUGGING OPTIONS
 The following options are used to debug, or perfomance test the JIT
 compiler:
@@ -46,24 +56,101 @@ Displays the generated code as methods are invoked.
 Displays the basic blocks and the forest of trees that is 
 created from a stream of CIL opcodes.
 .TP
-.I "--stabs"
-Writes out stabs debug information
-.TP
-.I "--debug method"
-Debugs the method whose name is `method'
-.TP
-.I "--compile"
-Compiles the method on the given class (namespace.name:methodname).
+.I "--compile name"
+Compiles the method on the given class (namespace.name:methodname) or
+all classes in the given image (@imagename).
 .TP
 .I "--ncompile"
 Compiles the method a number of times.  If no argument is specified,
 the method will be compiled a thousand times.
+.SH DEVELOPMENT OPTIONS
+The following options are used to debug a JITed application.  They're
+only useful when running the JIT in a debugger:
+.TP
+.I "--debug=[format]"
+Writes out debug information in the given format or in the default format.
+See DEBUGGING FORMATS for details.
+.TP
+.I "--debug-args args"
+Comma-separated list of additional arguments for the symbol writer.
+See DEBUGGING FORMATS for details.
+.TP
+.I "--break method"
+Inserts a breakpoint before the method whose name is `method'
+(namespace.class:methodname).  Use `Main' as method name to insert a breakpoint on the
+application's main method.
+.TP
+.I "--precompile name"
+Compiles the given class (namespace.name), method (namespace.name:methodname)
+or all classes in the given image (@imagename) before executing the main
+application.
+.TP
+.I "--profile"
+Collect profiling information and dump it at the end of the process.
+.SH DEBUGGING FORMATS
+The following debugging formats are currently supported:
+.TP
+.I "stabs"
+Writes out stabs debug information.
+.TP
+.I "dwarf"
+Writes out dwarf debug information.
+.TP
+.I "dwarf-plus"
+Uses an extended debugging information file which has been generated
+by MCS.  This extended debugging information will allow you to debug
+C# source code rather than IL code.  To use it, just run the JIT in
+your debugger and call "mono_debug_make_symbols" each time the program
+stops.
+.PP
+The "stabs" and "dwarf" formats support the following options:
+.TP
+.I "filename=FILENAME"
+Write debugging information into FILENAME.  This file must be run through
+the assembler to create an object file.
+.TP
+.I "objfile=FILENAME"
+When automatically assembling the symbol file, write the resulting object
+file into FILENAME.
+.TP
+.I "dont_assemble"
+Normally, the symbol file is automatically assembled to an object file
+when you call "mono_debug_make_symbols".  Use this option to disable this
+behaviour.
+.TP
+.I "install_il_files"
+Put the generated *.il files in the same directory than the assembly they
+came from.  The default is to put them into the current working directory.
+.TP
+.I "dont_update_il_files"
+Normally, the *.il files are recreated if their assemblies have changed
+when you call "mono_debug_make_symbols".  Use this option to disable this
+behaviour.
+.TP
+.I "dont_create_il_files"
+Update the *.il files if their assemblies have changed, but only if the
+file already exists.
+.PP
+The "dwarf-plus" format supports the following options:
+.TP
+.I "dont_fallback"
+Don't fallback to normal dwarf2 if the symbol file cannot be found.
+.PP
 .SH FILES
-Assemblies are lodaed from the installation lib directory.  If you set
-`prefix' to /usr, the assemblies will be located in /usr/lib.
+On Unix assemblies are loaded from the installation lib directory.  If you set
+`prefix' to /usr, the assemblies will be located in /usr/lib.  On
+Windows, the assemblies are loaded from the directory where mono and
+mint live.
+.PP
+/etc/mono/config, ~/.mono/config
+.IP
+Mono runtime configuration file.  See the mono-config(5) manual page
+for more information.
 .SH MAILING LISTS
 Visit http://mail.ximian.com/mailman/mono-list for details.
 .SH WEB SITE
 Visit: http://www.go-mono.com for details
 .SH SEE ALSO
-.BR mint(1), monodis(1)
+.BR mcs(1), mint(1), monodis(1), mono-config(5)
+
+
diff --git a/man/monostyle.1 b/man/monostyle.1
new file mode 100644
index 00000000000..feea64a6d8a
--- /dev/null
+++ b/man/monostyle.1
@@ -0,0 +1,43 @@
+.\"
+.\" monostyle manual page.
+.\" (C) Adam Treat (manyoso@yahoo.com)
+.\"
+.TH monostyle 1
+.SH NAME
+monostyle \- Mono's C# code beautifier.
+.SH SYNOPSIS
+.PP
+.B monostyle
+-f file.cs -l <true|false> > output.cs
+.SH DESCRIPTION
+monostyle will parse a C# source code file and correct brace formatting
+reflective of the Mono Project's coding standard. To use: invoke monostyle
+by passing a C# source code file with '-f file.cs' and specify whether to
+use linespacing with '-l <true|false>.  To output to a file just redirect
+with '>'.
+.PP
+Mono's Coding Standard
+.PP
+* The opening brace following a namespace, class, struct, enum, property or
+flow control unit should be at the end of the declaration line.
+.PP
+* The opening brace for a function should be on the line following the function.
+.PP
+* Please use white space around operators and a space between function names
+and their parameters.
+.SH OPTIONS
+.TP
+.I \-\-file
+The csharp source file to parse.
+.TP
+.I \-\-line
+Specifies wether to use line spacing.
+.PP
+.SH AUTHORS
+Adam Treat (manyoso@yahoo.com)
+.PP
+.SH LICENSE
+MonoStyle is released under the terms of the GNU GPL.
+.PP
+.SH SEE ALSO
+mono(1), mint(1)
diff --git a/mcs/AUTHORS b/mcs/AUTHORS
new file mode 100755
index 00000000000..bce371f17b5
--- /dev/null
+++ b/mcs/AUTHORS
@@ -0,0 +1,16 @@
+C# Compiler:
+	Miguel de Icaza (miguel@ximian.com)
+	Ravi Pratap     (ravi@ximian.com)
+
+Class Libraries:
+	Patrik Torstensson <patrik.torstensson@labs2.com>
+	Gaurav Vaish <gvaish@iitk.ac.in>
+	Jeff Stedfast (fejj@ximian.com)
+	Joe Shaw (joe@ximian.com)
+	Miguel de Icaza (miguel@ximian.com)
+	Sean MacIsaac (macisaac@ximian.com)
+	Vladimir Vukicevic (vladimir@ximian.com)
+	Garrett Rooney (rooneg@electricjellyfish.net)
+        Bob Smith (bob@thestuff.net)
+	John Barnette (jbarn@httcb.net)
+	Daniel Morgan <danmorg@sc.rr.com>
diff --git a/mcs/COPYING b/mcs/COPYING
new file mode 100755
index 00000000000..d60c31a97a5
--- /dev/null
+++ b/mcs/COPYING
@@ -0,0 +1,340 @@
+		    GNU GENERAL PUBLIC LICENSE
+		       Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+     59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+			    Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users.  This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it.  (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.)  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+  To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have.  You must make sure that they, too, receive or can get the
+source code.  And you must show them these terms so they know their
+rights.
+
+  We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+  Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software.  If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+  Finally, any free program is threatened constantly by software
+patents.  We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary.  To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+		    GNU GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License.  The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language.  (Hereinafter, translation is included without limitation in
+the term "modification".)  Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+  1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+  2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) You must cause the modified files to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    b) You must cause any work that you distribute or publish, that in
+    whole or in part contains or is derived from the Program or any
+    part thereof, to be licensed as a whole at no charge to all third
+    parties under the terms of this License.
+
+    c) If the modified program normally reads commands interactively
+    when run, you must cause it, when started running for such
+    interactive use in the most ordinary way, to print or display an
+    announcement including an appropriate copyright notice and a
+    notice that there is no warranty (or else, saying that you provide
+    a warranty) and that users may redistribute the program under
+    these conditions, and telling the user how to view a copy of this
+    License.  (Exception: if the Program itself is interactive but
+    does not normally print such an announcement, your work based on
+    the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+    a) Accompany it with the complete corresponding machine-readable
+    source code, which must be distributed under the terms of Sections
+    1 and 2 above on a medium customarily used for software interchange; or,
+
+    b) Accompany it with a written offer, valid for at least three
+    years, to give any third party, for a charge no more than your
+    cost of physically performing source distribution, a complete
+    machine-readable copy of the corresponding source code, to be
+    distributed under the terms of Sections 1 and 2 above on a medium
+    customarily used for software interchange; or,
+
+    c) Accompany it with the information you received as to the offer
+    to distribute corresponding source code.  (This alternative is
+    allowed only for noncommercial distribution and only if you
+    received the program in object code or executable form with such
+    an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it.  For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable.  However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License.  Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+  5. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Program or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+  6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+  7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded.  In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+  9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation.  If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+  10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission.  For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this.  Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+			    NO WARRANTY
+
+  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+		     END OF TERMS AND CONDITIONS
+
+	    How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+    Gnomovision version 69, Copyright (C) year  name of author
+    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+  `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+  <signature of Ty Coon>, 1 April 1989
+  Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs.  If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library.  If this is what you want to do, use the GNU Library General
+Public License instead of this License.
diff --git a/mcs/ChangeLog b/mcs/ChangeLog
new file mode 100644
index 00000000000..2f0607cca9f
--- /dev/null
+++ b/mcs/ChangeLog
@@ -0,0 +1,100 @@
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* class/makefile.gnu: Add class/Mono.CSharp.Debugger to the build.
+
+2002-08-13  Piers Haken <piersh@friskit.com>
+
+	* class/library.make: merge back original makefile.gnu behavior
+	* */makefile.gnu: merge back original makefile.gnu behavior
+
+2002-08-12  Piers Haken <piersh@friskit.com>
+
+	* class/library.make: use 'find' to specify source files, instead of static files
+	* */makefile.gnu: specify include/exclude patterns for source files
+
+2002-08-07  Peter Williams  <peterw@ximian.com>
+
+	* class/library.make (.makefrag): Fix this rule a bit; was using
+	$^ instead of $<
+
+2002-07-29  Peter Williams  <peterw@ximian.com>
+
+	* makefile.gnu: 'make install' wasn't actually working due to $@,
+	fix it.
+
+2002-07-29  Martin Baulig  <martin@gnome.org>
+
+	* makefile.gnu: Don't force people to install.  The default must also
+	be `all' and not `install'.
+
+2002-07-26  Alp Toker  <alp@atoker.com>
+
+	* INSTALL: Wrote a guide to mcs installation.
+	* README: Updated to reflect the new INSTALL guide.
+
+2002-07-23  Alp Toker  <alp@atoker.com>
+
+	* makefile.gnu: Added an install target (which sets permissions and
+	respects prefix) and a dist target which produces a tarball. Also
+	fixed a few other makefile issues.
+
+2002-07-22  Peter Williams  <peterw@ximian.com>
+
+	* class/library.make: Oops, the deps weren't right -- touching a .cs
+	file didn't cause the libraries to be rebuilt.
+	(clean): Robustify this rule a bit.
+
+2002-07-20  Martin Baulig  <martin@gnome.org>
+
+	* class/makefile.gnu: Added System.Data.
+
+2002-07-20  Martin Baulig  <martin@gnome.org>
+
+	* class/library.make: Put $(MONO_PATH_PREFIX) in front of the MONO_PATH.
+
+	* class/*/makefile.gnu: Set MONO_PATH_PREFIX=../lib:
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	* makefile.gnu (DIRS): Added nunit.
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	Added the super-cool set of makefiles from Peter Williams which run on
+	GNU/Linux without NAnt.  I named them `makefile.gnu' and not `GNUmakefile'
+	since this won't break the windows build.
+
+	To compile stuff on GNU/Linux, just do a `make -f makefile.gnu'.
+
+	* mcs-tool, */makefile.gnu, class/library.make: New files.
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	* */makefile (NANT): Use a variable `NANT' so the user can override it with
+	`make NANT=/usr/local/bin/NAnt.exe'.
+
+2002-05-09  Daniel Morgan <danmorg@sc.rr.com>
+
+	* AUTHORS: add me to class libraries list
+
+2002-03-26  Dick Porter  <dick@ximian.com>
+
+	* makefile (linux): Abandon the build if any of the subdir makes fail
+
+2002-03-07  Nick Drochak  <ndrochak@gol.com>

+

+	* makefile: Change order of build so corlib is built before nunit since

+	Nunit needs corlib now.

+

+2002-02-14  Nick Drochak  <ndrochak@gol.com>

+

+	* makefile: Build mcs/doctools too when one does 'make'

+

+2002-01-20 Nick Drochak  <ndrochak@gol.com>

+

+	* on the 'test' target, make sure NUnit is built first before building

+	and running tests

+

+2002-01-20 Nick Drochak  <ndrochak@gol.com>

+

+	* add nunit directory to the list of dirs to build in
diff --git a/mcs/INSTALL b/mcs/INSTALL
new file mode 100644
index 00000000000..83f0273df05
--- /dev/null
+++ b/mcs/INSTALL
@@ -0,0 +1,53 @@
+Basic Installation
+==================
+
+The Mono project has developed mono, an x86-specific CL JIT compiler and
+mint, a portable CLI interpreter. The build process of each of these
+depends on nothing more than a C compiler, glib2 and libgc.
+
+However, to provide a working runtime environment, these programs must
+be supplemented by corlib, a CLR assembly to which they are closely
+tied. This package provides the C# sources for corlib as well as some
+additional assemblies and mcs, the Mono C# compiler.
+
+To build this package, you must already have a C# compiler installed.
+Build instructions for *NIX and Microsoft Windows follow.
+
+Building mcs on *NIX
+====================
+
+mcs provides a set of makefiles which make it easy to build and install
+mcs on *NIX systems like Linux or FreeBSD where mcs is already
+installed.
+
+To build the compiler and class libraries, run:
+
+    make -f makefile.gnu
+
+The libraries will be placed in the directory class/lib/ and the mcs
+compiler executable in mcs/.
+
+To install them, run the following, where prefix identifies where you
+want the files installed:
+
+    make -f makefile.gnu install prefix=/usr/local
+
+If you are tracking Mono's development, you may sometimes need to share
+the compiled libraries with others. If you want to produce an easily
+distributable tarball, run:
+
+    make -f makefile.gnu dist
+
+Building mcs on Windows
+=======================
+
+It is also possible to build mcs on Windows using the Microsoft .NET
+framework. This may be convenient if you do not have access to a working
+mcs setup. To build the compiler and class libraries, run:
+
+    make
+
+The libraries will be placed in the directory class/lib/ and the mcs
+compiler executable in mcs/. They can then be copied to /usr/lib and
+/usr/bin or wherever desired on the target system.
+
diff --git a/mcs/INSTALL.txt b/mcs/INSTALL.txt
new file mode 100644
index 00000000000..83f0273df05
--- /dev/null
+++ b/mcs/INSTALL.txt
@@ -0,0 +1,53 @@
+Basic Installation
+==================
+
+The Mono project has developed mono, an x86-specific CL JIT compiler and
+mint, a portable CLI interpreter. The build process of each of these
+depends on nothing more than a C compiler, glib2 and libgc.
+
+However, to provide a working runtime environment, these programs must
+be supplemented by corlib, a CLR assembly to which they are closely
+tied. This package provides the C# sources for corlib as well as some
+additional assemblies and mcs, the Mono C# compiler.
+
+To build this package, you must already have a C# compiler installed.
+Build instructions for *NIX and Microsoft Windows follow.
+
+Building mcs on *NIX
+====================
+
+mcs provides a set of makefiles which make it easy to build and install
+mcs on *NIX systems like Linux or FreeBSD where mcs is already
+installed.
+
+To build the compiler and class libraries, run:
+
+    make -f makefile.gnu
+
+The libraries will be placed in the directory class/lib/ and the mcs
+compiler executable in mcs/.
+
+To install them, run the following, where prefix identifies where you
+want the files installed:
+
+    make -f makefile.gnu install prefix=/usr/local
+
+If you are tracking Mono's development, you may sometimes need to share
+the compiled libraries with others. If you want to produce an easily
+distributable tarball, run:
+
+    make -f makefile.gnu dist
+
+Building mcs on Windows
+=======================
+
+It is also possible to build mcs on Windows using the Microsoft .NET
+framework. This may be convenient if you do not have access to a working
+mcs setup. To build the compiler and class libraries, run:
+
+    make
+
+The libraries will be placed in the directory class/lib/ and the mcs
+compiler executable in mcs/. They can then be copied to /usr/lib and
+/usr/bin or wherever desired on the target system.
+
diff --git a/mcs/MonoIcon.png b/mcs/MonoIcon.png
new file mode 100644
index 00000000000..c670edb5011
--- /dev/null
+++ b/mcs/MonoIcon.png
diff --git a/mcs/README b/mcs/README
new file mode 100755
index 00000000000..3a0e1c7129e
--- /dev/null
+++ b/mcs/README
@@ -0,0 +1,68 @@
+
+This contains the Mono C# compiler as well as the Mono runtime
+library.
+
+See INSTALL for a guide to building and installing mcs.
+
+Layout:
+
+	class/
+		Class libraries
+
+	errors/
+		Sample programs that should generate errors by the compiler.
+
+	jay/
+		Yacc-based parser generator.
+
+	mcs/
+		The Mono C# compiler
+
+	tests/
+		Sample tests 
+
+Thanks a lot to Sergey Chaban for his help during the development of
+the C# compiler.
+
+LICENSE
+
+The mcs C# compiler and monoresgen are licensed to you under the GPL, version 2.
+The complete text of the GPL is in the 'COPYING' file.
+
+    Copyright (C) 2001-2002  Ximian, Inc.
+
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of version 2 of the GNU General Public License as 
+    published by the Free Software Foundation.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+The class libraries are licensed according to the following license:
+
+    Copyright (C) 2001-2002  Ximian, Inc.
+
+Permission is hereby granted, free of charge, to any person obtaining a
+copy of this software and associated documentation files (the "Software"),
+to deal in the Software without restriction, including without limitation
+the rights to use, copy, modify, merge, publish, distribute, sublicense,
+and/or sell copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included
+in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
+
diff --git a/mcs/class/.cvsignore b/mcs/class/.cvsignore
new file mode 100644
index 00000000000..a65b41774ad
--- /dev/null
+++ b/mcs/class/.cvsignore
@@ -0,0 +1 @@
+lib
diff --git a/mcs/class/I18N/.cvsignore b/mcs/class/I18N/.cvsignore
new file mode 100644
index 00000000000..1d613ca39bc
--- /dev/null
+++ b/mcs/class/I18N/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+.deps
+*.dll
+I18N-handlers.def
diff --git a/mcs/class/I18N/CJK/CP932.cs b/mcs/class/I18N/CJK/CP932.cs
new file mode 100644
index 00000000000..1a3044a412e
--- /dev/null
+++ b/mcs/class/I18N/CJK/CP932.cs
@@ -0,0 +1,849 @@
+/*
+ * CP932.cs - Japanese (Shift-JIS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace I18N.CJK
+{
+
+using System;
+using System.Text;
+using I18N.Common;
+
+public unsafe class CP932 : Encoding
+{
+	// Magic number used by Windows for the Shift-JIS code page.
+	private const int SHIFTJIS_CODE_PAGE = 932;
+
+	// Internal state.
+	private JISConvert convert;
+
+	// Constructor.
+	public CP932() : base(SHIFTJIS_CODE_PAGE)
+			{
+				// Load the JIS conversion tables.
+				convert = JISConvert.Convert;
+			}
+
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount(char[] chars, int index, int count)
+			{
+				// Validate the parameters.
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(index < 0 || index > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", Strings.GetString("ArgRange_Array"));
+				}
+				if(count < 0 || count > (chars.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", Strings.GetString("ArgRange_Array"));
+				}
+
+				// Determine the length of the final output.
+				int length = 0;
+				int ch, value;
+#if __PNET__
+				byte *cjkToJis = convert.cjkToJis;
+				byte *extraToJis = convert.extraToJis;
+#else
+				byte[] cjkToJis = convert.cjkToJis;
+				byte[] extraToJis = convert.extraToJis;
+#endif
+				while(count > 0)
+				{
+					ch = chars[index++];
+					--count;
+					++length;
+					if(ch < 0x0080)
+					{
+						// Character maps to itself.
+						continue;
+					}
+					else if(ch < 0x0100)
+					{
+						// Check for special Latin 1 characters that
+						// can be mapped to double-byte code points.
+						if(ch == 0x00A2 || ch == 0x00A3 || ch == 0x00A7 ||
+						   ch == 0x00A8 || ch == 0x00AC || ch == 0x00B0 ||
+						   ch == 0x00B1 || ch == 0x00B4 || ch == 0x00B6 ||
+						   ch == 0x00D7 || ch == 0x00F7)
+						{
+							++length;
+						}
+					}
+					else if(ch >= 0x0391 && ch <= 0x0451)
+					{
+						// Greek subset characters.
+						++length;
+					}
+					else if(ch >= 0x2010 && ch <= 0x9FA5)
+					{
+						// This range contains the bulk of the CJK set.
+						value = (ch - 0x2010) * 2;
+						value = ((int)(cjkToJis[value])) |
+								(((int)(cjkToJis[value + 1])) << 8);
+						if(value >= 0x0100)
+						{
+							++length;
+						}
+					}
+					else if(ch >= 0xFF01 && ch <= 0xFFEF)
+					{
+						// This range contains extra characters,
+						// including half-width katakana.
+						value = (ch - 0xFF01) * 2;
+						value = ((int)(extraToJis[value])) |
+								(((int)(extraToJis[value + 1])) << 8);
+						if(value >= 0x0100)
+						{
+							++length;
+						}
+					}
+				}
+
+				// Return the length to the caller.
+				return length;
+			}
+
+	// Get the bytes that result from encoding a character buffer.
+	public override int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				// Validate the parameters.
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if(charCount < 0 || charCount > (chars.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", Strings.GetString("ArgRange_Array"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", Strings.GetString("ArgRange_Array"));
+				}
+
+				// Convert the characters into their byte form.
+				int posn = byteIndex;
+				int byteLength = bytes.Length;
+				int ch, value;
+#if __PNET__
+				byte *cjkToJis = convert.cjkToJis;
+				byte *greekToJis = convert.greekToJis;
+				byte *extraToJis = convert.extraToJis;
+#else
+				byte[] cjkToJis = convert.cjkToJis;
+				byte[] greekToJis = convert.greekToJis;
+				byte[] extraToJis = convert.extraToJis;
+#endif
+				while(charCount > 0)
+				{
+					ch = chars[charIndex++];
+					--charCount;
+					if(posn >= byteLength)
+					{
+						throw new ArgumentException
+							(Strings.GetString("Arg_InsufficientSpace"),
+							 "bytes");
+					}
+					if(ch < 0x0080)
+					{
+						// Character maps to itself.
+						bytes[posn++] = (byte)ch;
+						continue;
+					}
+					else if(ch < 0x0100)
+					{
+						// Check for special Latin 1 characters that
+						// can be mapped to double-byte code points.
+						if(ch == 0x00A2 || ch == 0x00A3 || ch == 0x00A7 ||
+						   ch == 0x00A8 || ch == 0x00AC || ch == 0x00B0 ||
+						   ch == 0x00B1 || ch == 0x00B4 || ch == 0x00B6 ||
+						   ch == 0x00D7 || ch == 0x00F7)
+						{
+							if((posn + 1) >= byteLength)
+							{
+								throw new ArgumentException
+									(Strings.GetString
+										("Arg_InsufficientSpace"), "bytes");
+							}
+							switch(ch)
+							{
+								case 0x00A2:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0x91;
+									break;
+
+								case 0x00A3:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0x92;
+									break;
+
+								case 0x00A7:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0x98;
+									break;
+
+								case 0x00A8:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0x4E;
+									break;
+
+								case 0x00AC:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0xCA;
+									break;
+
+								case 0x00B0:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0x8B;
+									break;
+
+								case 0x00B1:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0x7D;
+									break;
+
+								case 0x00B4:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0x4C;
+									break;
+
+								case 0x00B6:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0xF7;
+									break;
+
+								case 0x00D7:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0x7E;
+									break;
+
+								case 0x00F7:
+									bytes[posn++] = (byte)0x81;
+									bytes[posn++] = (byte)0x80;
+									break;
+							}
+						}
+						else if(ch == 0x00A5)
+						{
+							// Yen sign.
+							bytes[posn++] = (byte)0x5C;
+						}
+						else
+						{
+							// Invalid character.
+							bytes[posn++] = (byte)'?';
+						}
+						continue;
+					}
+					else if(ch >= 0x0391 && ch <= 0x0451)
+					{
+						// Greek subset characters.
+						value = (ch - 0x0391) * 2;
+						value = ((int)(greekToJis[value])) |
+								(((int)(greekToJis[value + 1])) << 8);
+					}
+					else if(ch >= 0x2010 && ch <= 0x9FA5)
+					{
+						// This range contains the bulk of the CJK set.
+						value = (ch - 0x2010) * 2;
+						value = ((int)(cjkToJis[value])) |
+								(((int)(cjkToJis[value + 1])) << 8);
+					}
+					else if(ch >= 0xFF01 && ch <= 0xFFEF)
+					{
+						// This range contains extra characters,
+						// including half-width katakana.
+						value = (ch - 0xFF01) * 2;
+						value = ((int)(extraToJis[value])) |
+								(((int)(extraToJis[value + 1])) << 8);
+					}
+					else
+					{
+						// Invalid character.
+						value = 0;
+					}
+					if(value == 0)
+					{
+						bytes[posn++] = (byte)'?';
+					}
+					else if(value < 0x0100)
+					{
+						bytes[posn++] = (byte)value;
+					}
+					else if((posn + 1) >= byteLength)
+					{
+						throw new ArgumentException
+							(Strings.GetString("Arg_InsufficientSpace"),
+							 "bytes");
+					}
+					else if(value < 0x8000)
+					{
+						// JIS X 0208 character.
+						value -= 0x0100;
+						ch = (value / 0xBC);
+						value = (value % 0xBC) + 0x40;
+						if(value >= 0x7F)
+						{
+							++value;
+						}
+						if(ch < (0x9F - 0x80))
+						{
+							bytes[posn++] = (byte)(ch + 0x81);
+						}
+						else
+						{
+							bytes[posn++] = (byte)(ch - (0x9F - 0x80) + 0xE0);
+						}
+						bytes[posn++] = (byte)value;
+					}
+					else
+					{
+						// JIS X 0212 character, which Shift-JIS doesn't
+						// support, but we've already allocated two slots.
+						bytes[posn++] = (byte)'?';
+						bytes[posn++] = (byte)'?';
+					}
+				}
+
+				// Return the final length to the caller.
+				return posn - byteIndex;
+			}
+
+	// Get the number of characters needed to decode a byte buffer.
+	public override int GetCharCount(byte[] bytes, int index, int count)
+			{
+				// Validate the parameters.
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", Strings.GetString("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", Strings.GetString("ArgRange_Array"));
+				}
+
+				// Determine the total length of the converted string.
+				int length = 0;
+				int byteval;
+				while(count > 0)
+				{
+					byteval = bytes[index++];
+					--count;
+					++length;
+					if(byteval < 0x80)
+					{
+						// Ordinary ASCII/Latin1 character, or the
+						// single-byte Yen or overline signs.
+						continue;
+					}
+					else if(byteval >= 0xA1 && byteval <= 0xDF)
+					{
+						// Half-width katakana.
+						continue;
+					}
+					else if(byteval < 0x81 ||
+					        (byteval > 0x9F && byteval < 0xE0) ||
+							byteval > 0xEF)
+					{
+						// Invalid first byte.
+						continue;
+					}
+					if(count == 0)
+					{
+						// Missing second byte.
+						continue;
+					}
+					++index;
+					--count;
+				}
+
+				// Return the total length.
+				return length;
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex)
+			{
+				// Validate the parameters.
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", Strings.GetString("ArgRange_Array"));
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", Strings.GetString("ArgRange_Array"));
+				}
+
+				// Determine the total length of the converted string.
+				int charLength = chars.Length;
+				int posn = charIndex;
+				int length = 0;
+				int byteval, value;
+#if __PNET__
+				byte *table = convert.jisx0208ToUnicode;
+#else
+				byte[] table = convert.jisx0208ToUnicode;
+#endif
+				while(byteCount > 0)
+				{
+					byteval = bytes[byteIndex++];
+					--byteCount;
+					++length;
+					if(posn >= charLength)
+					{
+						throw new ArgumentException
+							(Strings.GetString("Arg_InsufficientSpace"),
+							 "chars");
+					}
+					if(byteval == 0x5C)
+					{
+						// Yen sign.
+						chars[posn++] = '\u00A5';
+						continue;
+					}
+					else if(byteval == 0x7E)
+					{
+						// Overline symbol.
+						chars[posn++] = '\u203E';
+						continue;
+					}
+					else if(byteval < 0x80)
+					{
+						// Ordinary ASCII/Latin1 character.
+						chars[posn++] = (char)byteval;
+						continue;
+					}
+					else if(byteval >= 0xA1 && byteval <= 0xDF)
+					{
+						// Half-width katakana.
+						chars[posn++] = (char)(byteval - 0xA1 + 0xFF61);
+						continue;
+					}
+					else if(byteval >= 0x81 && byteval <= 0x9F)
+					{
+						value = (byteval - 0x81) * 0xBC;
+					}
+					else if(byteval >= 0xE0 && byteval <= 0xEF)
+					{
+						value = (byteval - 0xE0 + (0xA0 - 0x81)) * 0xBC;
+					}
+					else
+					{
+						// Invalid first byte.
+						chars[posn++] = '?';
+						continue;
+					}
+					if(byteCount == 0)
+					{
+						// Missing second byte.
+						chars[posn++] = '?';
+						continue;
+					}
+					byteval = bytes[byteIndex++];
+					--byteCount;
+					if(byteval >= 0x40 && byteval <= 0x7E)
+					{
+						value += (byteval - 0x40);
+					}
+					else if(byteval >= 0x80 && byteval <= 0xFC)
+					{
+						value += (byteval - 0x80 + 0x3F);
+					}
+					else
+					{
+						// Invalid second byte.
+						chars[posn++] = '?';
+						continue;
+					}
+					value *= 2;
+					value = ((int)(table[value])) |
+							(((int)(table[value + 1])) << 8);
+					if(value != 0)
+					{
+						chars[posn++] = (char)value;
+					}
+					else
+					{
+						chars[posn++] = '?';
+					}
+				}
+
+				// Return the total length.
+				return posn - charIndex;
+			}
+
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public override int GetMaxByteCount(int charCount)
+			{
+				if(charCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount",
+						 Strings.GetString("ArgRange_NonNegative"));
+				}
+				return charCount * 2;
+			}
+
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public override int GetMaxCharCount(int byteCount)
+			{
+				if(byteCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount",
+						 Strings.GetString("ArgRange_NonNegative"));
+				}
+				return byteCount;
+			}
+
+	// Get a decoder that handles a rolling Shift-JIS state.
+	public override Decoder GetDecoder()
+			{
+				return new CP932Decoder(convert);
+			}
+
+#if !ECMA_COMPAT
+
+	// Get the mail body name for this encoding.
+	public override String BodyName
+			{
+				get
+				{
+					return "iso-2022-jp";
+				}
+			}
+
+	// Get the human-readable name for this encoding.
+	public override String EncodingName
+			{
+				get
+				{
+					return "Japanese (Shift-JIS)";
+				}
+			}
+
+	// Get the mail agent header name for this encoding.
+	public override String HeaderName
+			{
+				get
+				{
+					return "iso-2022-jp";
+				}
+			}
+
+	// Determine if this encoding can be displayed in a Web browser.
+	public override bool IsBrowserDisplay
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be saved from a Web browser.
+	public override bool IsBrowserSave
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be displayed in a mail/news agent.
+	public override bool IsMailNewsDisplay
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be saved from a mail/news agent.
+	public override bool IsMailNewsSave
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Get the IANA-preferred Web name for this encoding.
+	public override String WebName
+			{
+				get
+				{
+					return "shift_jis";
+				}
+			}
+
+	// Get the Windows code page represented by this object.
+	public override int WindowsCodePage
+			{
+				get
+				{
+					return SHIFTJIS_CODE_PAGE;
+				}
+			}
+
+#endif // !ECMA_COMPAT
+
+	// Decoder that handles a rolling Shift-JIS state.
+	private sealed class CP932Decoder : Decoder
+	{
+		private JISConvert convert;
+		private int lastByte;
+
+		// Constructor.
+		public CP932Decoder(JISConvert convert)
+				{
+					this.convert = convert;
+					this.lastByte = 0;
+				}
+
+		// Override inherited methods.
+		public override int GetCharCount(byte[] bytes, int index, int count)
+				{
+					// Validate the parameters.
+					if(bytes == null)
+					{
+						throw new ArgumentNullException("bytes");
+					}
+					if(index < 0 || index > bytes.Length)
+					{
+						throw new ArgumentOutOfRangeException
+							("index", Strings.GetString("ArgRange_Array"));
+					}
+					if(count < 0 || count > (bytes.Length - index))
+					{
+						throw new ArgumentOutOfRangeException
+							("count", Strings.GetString("ArgRange_Array"));
+					}
+
+					// Determine the total length of the converted string.
+					int length = 0;
+					int byteval;
+					int last = lastByte;
+					while(count > 0)
+					{
+						byteval = bytes[index++];
+						--count;
+						if(last == 0)
+						{
+							if((byteval >= 0x81 && byteval <= 0x9F) ||
+							   (byteval >= 0xE0 && byteval <= 0xEF))
+							{
+								// First byte in a double-byte sequence.
+								last = byteval;
+							}
+							++length;
+						}
+						else
+						{
+							// Second byte in a double-byte sequence.
+							last = 0;
+						}
+					}
+	
+					// Return the total length.
+					return length;
+				}
+		public override int GetChars(byte[] bytes, int byteIndex,
+									 int byteCount, char[] chars,
+									 int charIndex)
+				{
+					// Validate the parameters.
+					if(bytes == null)
+					{
+						throw new ArgumentNullException("bytes");
+					}
+					if(chars == null)
+					{
+						throw new ArgumentNullException("chars");
+					}
+					if(byteIndex < 0 || byteIndex > bytes.Length)
+					{
+						throw new ArgumentOutOfRangeException
+							("byteIndex", Strings.GetString("ArgRange_Array"));
+					}
+					if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+					{
+						throw new ArgumentOutOfRangeException
+							("byteCount", Strings.GetString("ArgRange_Array"));
+					}
+					if(charIndex < 0 || charIndex > chars.Length)
+					{
+						throw new ArgumentOutOfRangeException
+							("charIndex", Strings.GetString("ArgRange_Array"));
+					}
+
+					// Decode the bytes in the buffer.
+					int posn = charIndex;
+					int charLength = chars.Length;
+					int byteval, value;
+					int last = lastByte;
+#if __PNET__
+					byte *table = convert.jisx0208ToUnicode;
+#else
+					byte[] table = convert.jisx0208ToUnicode;
+#endif
+					while(byteCount > 0)
+					{
+						byteval = bytes[byteIndex++];
+						--byteCount;
+						if(last == 0)
+						{
+							if(posn >= charLength)
+							{
+								throw new ArgumentException
+									(Strings.GetString
+										("Arg_InsufficientSpace"), "chars");
+							}
+							if((byteval >= 0x81 && byteval <= 0x9F) ||
+							   (byteval >= 0xE0 && byteval <= 0xEF))
+							{
+								// First byte in a double-byte sequence.
+								last = byteval;
+							}
+							else if(byteval == 0x5C)
+							{
+								// Yen sign.
+								chars[posn++] ='\u00A5';
+							}
+							else if(byteval == 0x7E)
+							{
+								// Overline symbol.
+								chars[posn++] ='\u203E';
+							}
+							else if(byteval < 0x80)
+							{
+								// Ordinary ASCII/Latin1 character.
+								chars[posn++] = (char)byteval;
+							}
+							else if(byteval >= 0xA1 && byteval <= 0xDF)
+							{
+								// Half-width katakana character.
+								chars[posn++] = (char)(byteval - 0xA1 + 0xFF61);
+							}
+							else
+							{
+								// Invalid first byte.
+								chars[posn++] = '?';
+							}
+						}
+						else
+						{
+							// Second byte in a double-byte sequence.
+							if(last >= 0x81 && last <= 0x9F)
+							{
+								value = (last - 0x81) * 0xBC;
+							}
+							else
+							{
+								value = (last - 0xE0 + (0xA0 - 0x81)) * 0xBC;
+							}
+							last = 0;
+							if(byteval >= 0x40 && byteval <= 0x7E)
+							{
+								value += (byteval - 0x40);
+							}
+							else if(byteval >= 0x80 && byteval <= 0xFC)
+							{
+								value += (byteval - 0x80 + 0x3F);
+							}
+							else
+							{
+								// Invalid second byte.
+								chars[posn++] = '?';
+								continue;
+							}
+							value *= 2;
+							value = ((int)(table[value])) |
+									(((int)(table[value + 1])) << 8);
+							if(value != 0)
+							{
+								chars[posn++] = (char)value;
+							}
+							else
+							{
+								chars[posn++] = '?';
+							}
+						}
+					}
+					lastByte = last;
+
+					// Return the final length to the caller.
+					return posn - charIndex;
+				}
+
+	} // class CP932Decoder
+
+}; // class CP932
+
+public class ENCshift_jis : CP932
+{
+	public ENCshift_jis() : base() {}
+
+}; // class ENCshift_jis
+
+}; // namespace I18N.CJK
diff --git a/mcs/class/I18N/CJK/CodeTable.cs b/mcs/class/I18N/CJK/CodeTable.cs
new file mode 100644
index 00000000000..2f766f59cbe
--- /dev/null
+++ b/mcs/class/I18N/CJK/CodeTable.cs
@@ -0,0 +1,143 @@
+/*
+ * CodeTable.cs - Implementation of the "System.Text.CodeTable" class.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace I18N.CJK
+{
+
+using System;
+using System.IO;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using I18N.Common;
+
+// This class assists encoding classes for the large CJK character
+// sets by providing pointer access to table data in the resource
+// section of the current assembly.
+//
+// Code tables are named by their resource (e.g. "jis.table") and
+// contain one or more sections.  Each section has an 8-byte header,
+// consisting of a 32-bit section number and a 32-bit section length.
+// The alignment of the data in the table is not guaranteed.
+
+internal unsafe sealed class CodeTable : IDisposable
+{
+	// Internal state.
+	private Stream stream;
+
+	// Load a code table from the resource section of this assembly.
+	public CodeTable(String name)
+			{
+				stream = (Assembly.GetExecutingAssembly()
+							 .GetManifestResourceStream(name));
+				if(stream == null)
+				{
+					throw new NotSupportedException
+						(String.Format
+							(Strings.GetString("NotSupp_MissingCodeTable"),
+							 name));
+				}
+			}
+
+	// Implement the IDisposable interface.
+	public void Dispose()
+			{
+				if(stream != null)
+				{
+					stream.Close();
+					stream = null;
+				}
+			}
+
+	// Get the starting address for a particular section within
+	// the code table.  This address is guaranteed to persist
+	// after "Dispose" is called.
+#if __PNET__
+	public byte *GetSection(int num)
+#else
+	public byte[] GetSection(int num)
+#endif
+			{
+				// If the table has been disposed, then bail out.
+				if(stream == null)
+				{
+					return null;
+				}
+
+				// Scan through the stream looking for the section.
+				long posn = 0;
+				long length = stream.Length;
+				byte[] header = new byte [8];
+				int sectNum, sectLen;
+				while((posn + 8) <= length)
+				{
+					// Read the next header block.
+					stream.Position = posn;
+					if(stream.Read(header, 0, 8) != 8)
+					{
+						break;
+					}
+
+					// Decode the fields in the header block.
+					sectNum = ((int)(header[0])) |
+							  (((int)(header[1])) << 8) |
+							  (((int)(header[2])) << 16) |
+							  (((int)(header[3])) << 24);
+					sectLen = ((int)(header[4])) |
+							  (((int)(header[5])) << 8) |
+							  (((int)(header[6])) << 16) |
+							  (((int)(header[7])) << 24);
+
+					// Is this the section we are looking for?
+					if(sectNum == num)
+					{
+#if __PNET__
+						return GetAddress(stream, posn + 8);
+#else
+						byte[] buf = new byte [sectLen];
+						if(stream.Read(buf, 0, sectLen) != sectLen)
+						{
+							break;
+						}
+						return buf;
+#endif
+					}
+
+					// Advance to the next section.
+					posn += 8 + sectLen;
+				}
+
+				// We were unable to find the requested section.
+				return null;
+			}
+
+#if __PNET__
+	// Back door access into the engine to get the address of
+	// an offset within a manifest resource stream.
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern private static byte *GetAddress(Stream stream, long position);
+#endif
+
+}; // class CodeTable
+
+}; // namespace I18N.CJK
diff --git a/mcs/class/I18N/CJK/JISConvert.cs b/mcs/class/I18N/CJK/JISConvert.cs
new file mode 100644
index 00000000000..17191f8a15e
--- /dev/null
+++ b/mcs/class/I18N/CJK/JISConvert.cs
@@ -0,0 +1,97 @@
+/*
+ * JISConvert.cs - Implementation of the "System.Text.JISConvert" class.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace I18N.CJK
+{
+
+using System;
+
+// This class assists other encoding classes in converting back
+// and forth between JIS character sets and Unicode.  It uses
+// several large tables to do this, some of which are stored in
+// the resource section of the assembly for efficient access.
+
+internal unsafe sealed class JISConvert
+{
+	// Table identifiers.
+	private const int JISX0208_To_Unicode = 1;
+	private const int JISX0212_To_Unicode = 2;
+	private const int CJK_To_JIS          = 3;
+	private const int Greek_To_JIS        = 4;
+	private const int Extra_To_JIS        = 5;
+
+	// Public access to the conversion tables.
+#if __PNET__
+	public byte *jisx0208ToUnicode;
+	public byte *jisx0212ToUnicode;
+	public byte *cjkToJis;
+	public byte *greekToJis;
+	public byte *extraToJis;
+#else
+	public byte[] jisx0208ToUnicode;
+	public byte[] jisx0212ToUnicode;
+	public byte[] cjkToJis;
+	public byte[] greekToJis;
+	public byte[] extraToJis;
+#endif
+
+	// Constructor.
+	private JISConvert()
+			{
+				// Load the conversion tables.
+				CodeTable table = new CodeTable("jis.table");
+				jisx0208ToUnicode = table.GetSection(JISX0208_To_Unicode);
+				jisx0212ToUnicode = table.GetSection(JISX0212_To_Unicode);
+				cjkToJis = table.GetSection(CJK_To_JIS);
+				greekToJis = table.GetSection(Greek_To_JIS);
+				extraToJis = table.GetSection(Extra_To_JIS);
+				table.Dispose();
+			}
+
+	// The one and only JIS conversion object in the system.
+	private static JISConvert convert;
+
+	// Get the primary JIS conversion object.
+	public static JISConvert Convert
+			{
+				get
+				{
+					lock(typeof(JISConvert))
+					{
+						if(convert != null)
+						{
+							return convert;
+						}
+						else
+						{
+							convert = new JISConvert();
+							return convert;
+						}
+					}
+				}
+			}
+
+}; // class JISConvert
+
+}; // namespace I18N.CJK
diff --git a/mcs/class/I18N/CJK/jis.table b/mcs/class/I18N/CJK/jis.table
new file mode 100644
index 00000000000..80a6f78f46d
--- /dev/null
+++ b/mcs/class/I18N/CJK/jis.table
diff --git a/mcs/class/I18N/CJK/list.unix b/mcs/class/I18N/CJK/list.unix
new file mode 100755
index 00000000000..8713b3ebdf1
--- /dev/null
+++ b/mcs/class/I18N/CJK/list.unix
@@ -0,0 +1,3 @@
+CP932.cs
+CodeTable.cs
+JISConvert.cs
diff --git a/mcs/class/I18N/CJK/makefile.gnu b/mcs/class/I18N/CJK/makefile.gnu
new file mode 100755
index 00000000000..db15822c054
--- /dev/null
+++ b/mcs/class/I18N/CJK/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../../..
+
+LIBRARY = ../../lib/I18N.CJK.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = --unsafe --resource jis.table -r corlib -r mscorlib -r I18N
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=
+
+export MONO_PATH_PREFIX = ../../lib:
+
+include ../../library.make
diff --git a/mcs/class/I18N/Common/ByteEncoding.cs b/mcs/class/I18N/Common/ByteEncoding.cs
new file mode 100644
index 00000000000..07b819df9ac
--- /dev/null
+++ b/mcs/class/I18N/Common/ByteEncoding.cs
@@ -0,0 +1,401 @@
+/*
+ * ByteEncoding.cs - Implementation of the "I18N.Common.ByteEncoding" class.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace I18N.Common
+{
+
+using System;
+using System.Text;
+
+// This class provides an abstract base for encodings that use a single
+// byte per character.  The bulk of the work is done in this class, with
+// subclasses providing implementations of the "ToBytes" methods to perform
+// the char->byte conversion.
+
+public abstract class ByteEncoding : Encoding
+{
+	// Internal state.
+	protected char[] toChars;
+	protected String encodingName;
+	protected String bodyName;
+	protected String headerName;
+	protected String webName;
+	protected bool isBrowserDisplay;
+	protected bool isBrowserSave;
+	protected bool isMailNewsDisplay;
+	protected bool isMailNewsSave;
+	protected int windowsCodePage;
+
+	// Constructor.
+	protected ByteEncoding(int codePage, char[] toChars,
+						   String encodingName, String bodyName,
+						   String headerName, String webName,
+						   bool isBrowserDisplay, bool isBrowserSave,
+						   bool isMailNewsDisplay, bool isMailNewsSave,
+						   int windowsCodePage)
+			: base(codePage)
+			{
+				this.toChars = toChars;
+				this.encodingName = encodingName;
+				this.bodyName = bodyName;
+				this.headerName = headerName;
+				this.webName = webName;
+				this.isBrowserDisplay = isBrowserDisplay;
+				this.isBrowserSave = isBrowserSave;
+				this.isMailNewsDisplay = isMailNewsDisplay;
+				this.isMailNewsSave = isMailNewsSave;
+				this.windowsCodePage = windowsCodePage;
+			}
+
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount(char[] chars, int index, int count)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(index < 0 || index > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", Strings.GetString("ArgRange_Array"));
+				}
+				if(count < 0 || count > (chars.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", Strings.GetString("ArgRange_Array"));
+				}
+				return count;
+			}
+
+	// Convenience wrappers for "GetByteCount".
+	public override int GetByteCount(String s)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				return s.Length;
+			}
+
+	// Convert an array of characters into a byte buffer,
+	// once the parameters have been validated.
+	protected abstract void ToBytes(char[] chars, int charIndex, int charCount,
+									byte[] bytes, int byteIndex);
+
+	// Convert a string into a byte buffer, once the parameters
+	// have been validated.
+	protected abstract void ToBytes(String s, int charIndex, int charCount,
+									byte[] bytes, int byteIndex);
+
+	// Get the bytes that result from encoding a character buffer.
+	public override int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if(charCount < 0 || charCount > (chars.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", Strings.GetString("ArgRange_Array"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if((bytes.Length - byteIndex) < charCount)
+				{
+					throw new ArgumentException
+						(Strings.GetString("Arg_InsufficientSpace"));
+				}
+				ToBytes(chars, charIndex, charCount, bytes, byteIndex);
+				return charCount;
+			}
+
+	// Convenience wrappers for "GetBytes".
+	public override int GetBytes(String s, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > s.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex",
+						 Strings.GetString("ArgRange_StringIndex"));
+				}
+				if(charCount < 0 || charCount > (s.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount",
+						 Strings.GetString("ArgRange_StringRange"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if((bytes.Length - byteIndex) < charCount)
+				{
+					throw new ArgumentException
+						(Strings.GetString("Arg_InsufficientSpace"));
+				}
+				ToBytes(s, charIndex, charCount, bytes, byteIndex);
+				return charCount;
+			}
+
+	// Get the number of characters needed to decode a byte buffer.
+	public override int GetCharCount(byte[] bytes, int index, int count)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", Strings.GetString("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", Strings.GetString("ArgRange_Array"));
+				}
+				return count;
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", Strings.GetString("ArgRange_Array"));
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if((chars.Length - charIndex) < byteCount)
+				{
+					throw new ArgumentException
+						(Strings.GetString("Arg_InsufficientSpace"));
+				}
+				int count = byteCount;
+				char[] cvt = toChars;
+				while(count-- > 0)
+				{
+					chars[charIndex++] = cvt[(int)(bytes[byteIndex++])];
+				}
+				return byteCount;
+			}
+
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public override int GetMaxByteCount(int charCount)
+			{
+				if(charCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount",
+						 Strings.GetString("ArgRange_NonNegative"));
+				}
+				return charCount;
+			}
+
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public override int GetMaxCharCount(int byteCount)
+			{
+				if(byteCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount",
+						 Strings.GetString("ArgRange_NonNegative"));
+				}
+				return byteCount;
+			}
+
+	// Decode a buffer of bytes into a string.
+	public override String GetString(byte[] bytes, int index, int count)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", Strings.GetString("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", Strings.GetString("ArgRange_Array"));
+				}
+				StringBuilder s = new StringBuilder();
+				char[] cvt = toChars;
+				while(count-- > 0)
+				{
+					s.Append(cvt[(int)(bytes[index++])]);
+				}
+				return s.ToString();
+			}
+	public override String GetString(byte[] bytes)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				int count = bytes.Length;
+				int posn = 0;
+				StringBuilder s = new StringBuilder();
+				char[] cvt = toChars;
+				while(count-- > 0)
+				{
+					s.Append(cvt[(int)(bytes[posn])]);
+				}
+				return s.ToString();
+			}
+
+#if !ECMA_COMPAT
+
+	// Get the mail body name for this encoding.
+	public override String BodyName
+			{
+				get
+				{
+					return bodyName;
+				}
+			}
+
+	// Get the human-readable name for this encoding.
+	public override String EncodingName
+			{
+				get
+				{
+					return encodingName;
+				}
+			}
+
+	// Get the mail agent header name for this encoding.
+	public override String HeaderName
+			{
+				get
+				{
+					return headerName;
+				}
+			}
+
+	// Determine if this encoding can be displayed in a Web browser.
+	public override bool IsBrowserDisplay
+			{
+				get
+				{
+					return isBrowserDisplay;
+				}
+			}
+
+	// Determine if this encoding can be saved from a Web browser.
+	public override bool IsBrowserSave
+			{
+				get
+				{
+					return isBrowserSave;
+				}
+			}
+
+	// Determine if this encoding can be displayed in a mail/news agent.
+	public override bool IsMailNewsDisplay
+			{
+				get
+				{
+					return isMailNewsDisplay;
+				}
+			}
+
+	// Determine if this encoding can be saved from a mail/news agent.
+	public override bool IsMailNewsSave
+			{
+				get
+				{
+					return isMailNewsSave;
+				}
+			}
+
+	// Get the IANA-preferred Web name for this encoding.
+	public override String WebName
+			{
+				get
+				{
+					return webName;
+				}
+			}
+
+	// Get the Windows code page represented by this object.
+	public override int WindowsCodePage
+			{
+				get
+				{
+					return windowsCodePage;
+				}
+			}
+
+#endif // !ECMA_COMPAT
+
+}; // class ByteEncoding
+
+}; // namespace I18N.Encoding
diff --git a/mcs/class/I18N/Common/Handlers.cs b/mcs/class/I18N/Common/Handlers.cs
new file mode 100644
index 00000000000..89ede0c69c0
--- /dev/null
+++ b/mcs/class/I18N/Common/Handlers.cs
@@ -0,0 +1,198 @@
+/*
+ * Handlers.cs - Implementation of the "I18N.Common.Handlers" class.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace I18N.Common
+{
+
+using System;
+
+// This class provides an internal list of handlers, for runtime
+// engines that do not implement the altered "GetFile" semantics.
+// The list must be kept up to date manually.
+
+public sealed class Handlers
+{
+    public static readonly String[] List = {
+        "I18N.CJK.CP932",
+        "I18N.CJK.ENCshift_jis",
+        "I18N.MidEast.CP1254",
+        "I18N.MidEast.ENCwindows_1254",
+        "I18N.MidEast.CP1255",
+        "I18N.MidEast.ENCwindows_1255",
+        "I18N.MidEast.CP1256",
+        "I18N.MidEast.ENCwindows_1256",
+        "I18N.MidEast.CP28596",
+        "I18N.MidEast.ENCiso_8859_6",
+        "I18N.MidEast.CP28598",
+        "I18N.MidEast.ENCiso_8859_8",
+        "I18N.MidEast.CP28599",
+        "I18N.MidEast.ENCiso_8859_9",
+        "I18N.MidEast.CP38598",
+        "I18N.MidEast.ENCwindows_38598",
+        "I18N.Other.CP1251",
+        "I18N.Other.ENCwindows_1251",
+        "I18N.Other.CP1257",
+        "I18N.Other.ENCwindows_1257",
+        "I18N.Other.CP1258",
+        "I18N.Other.ENCwindows_1258",
+        "I18N.Other.CP20866",
+        "I18N.Other.ENCkoi8_r",
+        "I18N.Other.CP21866",
+        "I18N.Other.ENCkoi8_u",
+        "I18N.Other.CP28594",
+        "I18N.Other.ENCiso_8859_4",
+        "I18N.Other.CP28595",
+        "I18N.Other.ENCiso_8859_5",
+        "I18N.Other.ISCIIEncoding",
+        "I18N.Other.CP57002",
+        "I18N.Other.CP57003",
+        "I18N.Other.CP57004",
+        "I18N.Other.CP57005",
+        "I18N.Other.CP57006",
+        "I18N.Other.CP57007",
+        "I18N.Other.CP57008",
+        "I18N.Other.CP57009",
+        "I18N.Other.CP57010",
+        "I18N.Other.CP57011",
+        "I18N.Other.ENCx_iscii_de",
+        "I18N.Other.ENCx_iscii_be",
+        "I18N.Other.ENCx_iscii_ta",
+        "I18N.Other.ENCx_iscii_te",
+        "I18N.Other.ENCx_iscii_as",
+        "I18N.Other.ENCx_iscii_or",
+        "I18N.Other.ENCx_iscii_ka",
+        "I18N.Other.ENCx_iscii_ma",
+        "I18N.Other.ENCx_iscii_gu",
+        "I18N.Other.ENCx_iscii_pa",
+        "I18N.Other.CP874",
+        "I18N.Other.ENCwindows_874",
+        "I18N.Rare.CP1026",
+        "I18N.Rare.ENCibm1026",
+        "I18N.Rare.CP1047",
+        "I18N.Rare.ENCibm1047",
+        "I18N.Rare.CP1140",
+        "I18N.Rare.ENCibm01140",
+        "I18N.Rare.CP1141",
+        "I18N.Rare.ENCibm01141",
+        "I18N.Rare.CP1142",
+        "I18N.Rare.ENCibm01142",
+        "I18N.Rare.CP1143",
+        "I18N.Rare.ENCibm01143",
+        "I18N.Rare.CP1144",
+        "I18N.Rare.ENCibm1144",
+        "I18N.Rare.CP1145",
+        "I18N.Rare.ENCibm1145",
+        "I18N.Rare.CP1146",
+        "I18N.Rare.ENCibm1146",
+        "I18N.Rare.CP1147",
+        "I18N.Rare.ENCibm1147",
+        "I18N.Rare.CP1148",
+        "I18N.Rare.ENCibm1148",
+        "I18N.Rare.CP1149",
+        "I18N.Rare.ENCibm1149",
+        "I18N.Rare.CP20273",
+        "I18N.Rare.ENCibm273",
+        "I18N.Rare.CP20277",
+        "I18N.Rare.ENCibm277",
+        "I18N.Rare.CP20278",
+        "I18N.Rare.ENCibm278",
+        "I18N.Rare.CP20280",
+        "I18N.Rare.ENCibm280",
+        "I18N.Rare.CP20284",
+        "I18N.Rare.ENCibm284",
+        "I18N.Rare.CP20285",
+        "I18N.Rare.ENCibm285",
+        "I18N.Rare.CP20290",
+        "I18N.Rare.ENCibm290",
+        "I18N.Rare.CP20297",
+        "I18N.Rare.ENCibm297",
+        "I18N.Rare.CP20420",
+        "I18N.Rare.ENCibm420",
+        "I18N.Rare.CP20424",
+        "I18N.Rare.ENCibm424",
+        "I18N.Rare.CP20871",
+        "I18N.Rare.ENCibm871",
+        "I18N.Rare.CP21025",
+        "I18N.Rare.ENCibm1025",
+        "I18N.Rare.CP37",
+        "I18N.Rare.ENCibm037",
+        "I18N.Rare.CP500",
+        "I18N.Rare.ENCibm500",
+        "I18N.Rare.CP708",
+        "I18N.Rare.ENCasmo_708",
+        "I18N.Rare.CP852",
+        "I18N.Rare.ENCibm852",
+        "I18N.Rare.CP855",
+        "I18N.Rare.ENCibm855",
+        "I18N.Rare.CP857",
+        "I18N.Rare.ENCibm857",
+        "I18N.Rare.CP858",
+        "I18N.Rare.ENCibm00858",
+        "I18N.Rare.CP862",
+        "I18N.Rare.ENCibm862",
+        "I18N.Rare.CP864",
+        "I18N.Rare.ENCibm864",
+        "I18N.Rare.CP866",
+        "I18N.Rare.ENCibm866",
+        "I18N.Rare.CP869",
+        "I18N.Rare.ENCibm869",
+        "I18N.Rare.CP870",
+        "I18N.Rare.ENCibm870",
+        "I18N.Rare.CP875",
+        "I18N.Rare.ENCibm875",
+        "I18N.West.CP10000",
+        "I18N.West.ENCmacintosh",
+        "I18N.West.CP10079",
+        "I18N.West.ENCx_mac_icelandic",
+        "I18N.West.CP1250",
+        "I18N.West.ENCwindows_1250",
+        "I18N.West.CP1252",
+        "I18N.West.ENCwindows_1252",
+        "I18N.West.CP1253",
+        "I18N.West.ENCwindows_1253",
+        "I18N.West.CP28592",
+        "I18N.West.ENCiso_8859_2",
+        "I18N.West.CP28593",
+        "I18N.West.ENCiso_8859_3",
+        "I18N.West.CP28597",
+        "I18N.West.ENCiso_8859_7",
+        "I18N.West.CP28605",
+        "I18N.West.ENCiso_8859_15",
+        "I18N.West.CP437",
+        "I18N.West.ENCibm437",
+        "I18N.West.CP850",
+        "I18N.West.ENCibm850",
+        "I18N.West.CP860",
+        "I18N.West.ENCibm860",
+        "I18N.West.CP861",
+        "I18N.West.ENCibm861",
+        "I18N.West.CP863",
+        "I18N.West.ENCibm863",
+        "I18N.West.CP865",
+        "I18N.West.ENCibm865"
+    };
+
+}; // class Handlers
+
+}; // namespace I18N.Common
diff --git a/mcs/class/I18N/Common/Manager.cs b/mcs/class/I18N/Common/Manager.cs
new file mode 100644
index 00000000000..c09e531bbd0
--- /dev/null
+++ b/mcs/class/I18N/Common/Manager.cs
@@ -0,0 +1,336 @@
+/*
+ * Manager.cs - Implementation of the "I18N.Common.Manager" class.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace I18N.Common
+{
+
+using System;
+using System.IO;
+using System.Text;
+using System.Globalization;
+using System.Collections;
+using System.Reflection;
+using System.Security;
+
+// This class provides the primary entry point into the I18N
+// library.  Users of the library start by getting the value
+// of the "PrimaryManager" property.  They then invoke methods
+// on the manager to obtain further I18N information.
+
+public class Manager
+{
+	// The primary I18N manager.
+	private static Manager manager;
+
+	// Internal state.
+	private Hashtable handlers;		// List of all handler classes.
+	private Hashtable active;		// Currently active handlers.
+	private Hashtable assemblies;	// Currently loaded region assemblies.
+
+	// Constructor.
+	private Manager()
+			{
+				handlers = new Hashtable();
+				active = new Hashtable(16);
+				assemblies = new Hashtable(8);
+				LoadClassList();
+			}
+
+	// Get the primary I18N manager instance.
+	public static Manager PrimaryManager
+			{
+				get
+				{
+					lock(typeof(Manager))
+					{
+						if(manager == null)
+						{
+							manager = new Manager();
+						}
+						return manager;
+					}
+				}
+			}
+
+	// Normalize a name.
+	private static String Normalize(String name)
+			{
+			#if ECMA_COMPAT
+				return (name.ToLower()).Replace('-', '_');
+			#else
+				return (name.ToLower(CultureInfo.InvariantCulture))
+							.Replace('-', '_');
+			#endif
+			}
+
+	// Get an encoding object for a specific code page.
+	// Returns NULL if the code page is not available.
+	public Encoding GetEncoding(int codePage)
+			{
+				return (Instantiate("CP" + codePage.ToString()) as Encoding);
+			}
+
+	// Get an encoding object for a specific Web encoding.
+	// Returns NULL if the encoding is not available.
+	public Encoding GetEncoding(String name)
+			{
+				// Validate the parameter.
+				if(name == null)
+				{
+					return null;
+				}
+
+				// Normalize the encoding name.
+				name = Normalize(name);
+
+				// Try to find a class called "ENCname".
+				return (Instantiate("ENC" + name) as Encoding);
+			}
+
+	// List of hex digits for use by "GetCulture".
+	private const String hex = "0123456789abcdef";
+
+	// Get a specific culture by identifier.  Returns NULL
+	// if the culture information is not available.
+	public CultureInfo GetCulture(int culture, bool useUserOverride)
+			{
+				// Create the hex version of the culture identifier.
+				StringBuilder builder = new StringBuilder();
+				builder.Append(hex[(culture >> 12) & 0x0F]);
+				builder.Append(hex[(culture >> 8) & 0x0F]);
+				builder.Append(hex[(culture >> 4) & 0x0F]);
+				builder.Append(hex[culture & 0x0F]);
+				String name = builder.ToString();
+
+				// Try looking for an override culture handler.
+				if(useUserOverride)
+				{
+					Object obj = Instantiate("CIDO" + name);
+					if(obj != null)
+					{
+						return (obj as CultureInfo);
+					}
+				}
+
+				// Look for the generic non-override culture.
+				return (Instantiate("CID" + name) as CultureInfo);
+			}
+
+	// Get a specific culture by name.  Returns NULL if the
+	// culture informaion is not available.
+	public CultureInfo GetCulture(String name, bool useUserOverride)
+			{
+				// Validate the parameter.
+				if(name == null)
+				{
+					return null;
+				}
+
+				// Normalize the culture name.
+				name = Normalize(name);
+
+				// Try looking for an override culture handler.
+				if(useUserOverride)
+				{
+					Object obj = Instantiate("CNO" + name.ToString());
+					if(obj != null)
+					{
+						return (obj as CultureInfo);
+					}
+				}
+
+				// Look for the generic non-override culture.
+				return (Instantiate("CN" + name.ToString()) as CultureInfo);
+			}
+
+	// Instantiate a handler class.  Returns null if it is not
+	// possible to instantiate the class.
+	internal Object Instantiate(String name)
+			{
+				Object handler;
+				String region;
+				Assembly assembly;
+				Type type;
+
+				lock(this)
+				{
+					// See if we already have an active handler by this name.
+					handler = active[name];
+					if(handler != null)
+					{
+						return handler;
+					}
+
+					// Determine which region assembly handles the class.
+					region = (String)(handlers[name]);
+					if(region == null)
+					{
+						// The class does not exist in any region assembly.
+						return null;
+					}
+
+					// Find the region-specific assembly and load it.
+					assembly = (Assembly)(assemblies[region]);
+					if(assembly == null)
+					{
+						try
+						{
+							assembly = Assembly.Load(region);
+						}
+						catch(SystemException)
+						{
+							assembly = null;
+						}
+						if(assembly == null)
+						{
+							return null;
+						}
+						assemblies[region] = assembly;
+					}
+
+					// Look for the class within the region-specific assembly.
+					type = assembly.GetType(region + "." + name);
+					if(type == null)
+					{
+						return null;
+					}
+
+					// Invoke the constructor, which we assume is public
+					// and has zero arguments.
+					try
+					{
+						handler = type.InvokeMember
+								(String.Empty,
+								 BindingFlags.CreateInstance |
+								 	BindingFlags.Public |
+								 	BindingFlags.NonPublic |
+								 	BindingFlags.Instance,
+								 null, null, null, null, null, null);
+					}
+					catch(MissingMethodException)
+					{
+						// The constructor was not present.
+						return null;
+					}
+					catch(SecurityException)
+					{
+						// The constructor was inaccessible.
+						return null;
+					}
+
+					// Add the handler to the active handlers cache.
+					active.Add(name, handler);
+
+					// Return the handler to the caller.
+					return handler;
+				}
+			}
+
+	// Load the list of classes that are present in all region assemblies.
+	private void LoadClassList()
+			{
+				FileStream stream;
+
+				// Look for "I18N-handlers.def" in the same directory
+				// as this assembly.  Note: this assumes that the
+				// "Assembly.GetFile" method can access files that
+				// aren't explicitly part of the assembly manifest.
+				//
+				// This is necessary because the "I18N-handlers.def"
+				// file is generated after the "i18n" assembly is
+				// compiled and linked.  So it cannot be embedded
+				// directly into the assembly manifest.
+				try
+				{
+					stream = Assembly.GetExecutingAssembly()
+								.GetFile("I18N-handlers.def");
+					if(stream == null)
+					{
+						return;
+					}
+				}
+				catch(FileNotFoundException)
+				{
+					// The file does not exist, or the runtime engine
+					// refuses to implement the necessary semantics.
+					// Fall back to an internal list, which must be
+					// kept up to date manually.
+					LoadInternalClasses();
+					return;
+				}
+
+				// Load the class list from the stream.
+				StreamReader reader = new StreamReader(stream);
+				String line;
+				int posn;
+				while((line = reader.ReadLine()) != null)
+				{
+					// Skip comment lines in the input.
+					if(line.Length == 0 || line[0] == '#')
+					{
+						continue;
+					}
+
+					// Split the line into namespace and name.  We assume
+					// that the line has the form "I18N.<Region>.<Name>".
+					posn = line.LastIndexOf('.');
+					if(posn != -1)
+					{
+						// Add the namespace to the "handlers" hash,
+						// attached to the name of the handler class.
+						String name = line.Substring(posn + 1);
+						if(!handlers.Contains(name))
+						{
+							handlers.Add(name, line.Substring(0, posn));
+						}
+					}
+				}
+				reader.Close();
+			}
+
+	// Load the list of classes from the internal list.
+	private void LoadInternalClasses()
+			{
+				int posn;
+				foreach(String line in Handlers.List)
+				{
+					// Split the line into namespace and name.  We assume
+					// that the line has the form "I18N.<Region>.<Name>".
+					posn = line.LastIndexOf('.');
+					if(posn != -1)
+					{
+						// Add the namespace to the "handlers" hash,
+						// attached to the name of the handler class.
+						String name = line.Substring(posn + 1);
+						if(!handlers.Contains(name))
+						{
+							handlers.Add(name, line.Substring(0, posn));
+						}
+					}
+				}
+			}
+
+}; // class Manager
+
+}; // namespace I18N.Common
diff --git a/mcs/class/I18N/Common/Strings.cs b/mcs/class/I18N/Common/Strings.cs
new file mode 100644
index 00000000000..97be16676f7
--- /dev/null
+++ b/mcs/class/I18N/Common/Strings.cs
@@ -0,0 +1,56 @@
+/*
+ * Strings.cs - Implementation of the "I18N.Common.Strings" class.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace I18N.Common
+{
+
+using System;
+using System.Reflection;
+using System.Resources;
+
+// This class provides string resource support to the rest
+// of the I18N library assemblies.
+
+public sealed class Strings
+{
+	// Cached copy of the resources for this assembly.
+	private static ResourceManager resources = null;
+
+	// Helper for obtaining string resources for this assembly.
+	public static String GetString(String tag)
+			{
+				lock(typeof(Strings))
+				{
+					if(resources == null)
+					{
+						resources = new ResourceManager
+							("I18N", Assembly.GetExecutingAssembly());
+					}
+					return resources.GetString(tag, null);
+				}
+			}
+
+}; // class Strings
+
+}; // namespace I18N.Common
diff --git a/mcs/class/I18N/Common/list.unix b/mcs/class/I18N/Common/list.unix
new file mode 100755
index 00000000000..e7e03344343
--- /dev/null
+++ b/mcs/class/I18N/Common/list.unix
@@ -0,0 +1,4 @@
+ByteEncoding.cs
+Handlers.cs
+Manager.cs
+Strings.cs
diff --git a/mcs/class/I18N/Common/makefile.gnu b/mcs/class/I18N/Common/makefile.gnu
new file mode 100755
index 00000000000..3dd53aaba5a
--- /dev/null
+++ b/mcs/class/I18N/Common/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../../..
+
+LIBRARY = ../../lib/I18N.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib -r mscorlib
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=
+
+export MONO_PATH_PREFIX = ../../lib:
+
+include ../../library.make
diff --git a/mcs/class/I18N/I18N.build b/mcs/class/I18N/I18N.build
new file mode 100644
index 00000000000..1cc07894c1f
--- /dev/null
+++ b/mcs/class/I18N/I18N.build
@@ -0,0 +1,96 @@
+<?xml version="1.0"?>
+<project name="pnetlib I18N" default="build">
+	<property name="debug" value="false"/>
+	<target name="build">
+
+		<!-- Build the primary I18N.dll library -->
+		<csc output="../lib/I18N.dll" target="library" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+			<arg value="/lib:../lib/"/>
+			<arg value="/r:corlib.dll"/>
+
+			<sources>
+				<includes name="Common/*.cs"/>
+			</sources>
+
+			<!--<resources>
+				<file name="../resources/en_US/I18N/I18N.resources"/>
+			</resources>-->
+
+		</csc>
+
+		<!-- Build the I18N.CJK.dll library -->
+		<csc output="../lib/I18N.CJK.dll" target="library" debug="${debug}">
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+			<arg value="/lib:../lib/"/>
+			<arg value="/r:I18N.dll"/>
+			<arg value="/resource:CJK/jis.table"/>
+
+			<sources>
+				<includes name="CJK/*.cs"/>
+			</sources>
+
+			<!--<resources>
+				<file name="CJK/jis.table"/>
+			</resources>-->
+
+
+		</csc>
+
+		<!-- Build the I18N.MidEast.dll library -->
+		<csc output="../lib/I18N.MidEast.dll" target="library" debug="${debug}">
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+			<arg value="/lib:../lib/"/>
+			<arg value="/r:I18N.dll"/>
+
+			<sources>
+				<includes name="MidEast/*.cs"/>
+			</sources>
+
+		</csc>
+
+		<!-- Build the I18N.Other.dll library -->
+		<csc output="../lib/I18N.Other.dll" target="library" debug="${debug}">
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+			<arg value="/lib:../lib/"/>
+			<arg value="/r:I18N.dll"/>
+
+			<sources>
+				<includes name="Other/*.cs"/>
+			</sources>
+
+		</csc>
+
+		<!-- Build the I18N.Rare.dll library -->
+		<csc output="../lib/I18N.Rare.dll" target="library" debug="${debug}">
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+			<arg value="/lib:../lib/"/>
+			<arg value="/r:I18N.dll"/>
+
+			<sources>
+				<includes name="Rare/*.cs"/>
+			</sources>
+
+		</csc>
+
+		<!-- Build the I18N.West.dll library -->
+		<csc output="../lib/I18N.West.dll" target="library" debug="${debug}">
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+			<arg value="/lib:../lib/"/>
+			<arg value="/r:I18N.dll"/>
+
+			<sources>
+				<includes name="West/*.cs"/>
+			</sources>
+
+		</csc>
+
+	</target>
+</project>
diff --git a/mcs/class/I18N/MidEast/CP1254.cs b/mcs/class/I18N/MidEast/CP1254.cs
new file mode 100644
index 00000000000..06700748fc5
--- /dev/null
+++ b/mcs/class/I18N/MidEast/CP1254.cs
@@ -0,0 +1,399 @@
+/*
+ * CP1254.cs - Turkish (Windows) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-5350.ucm".
+
+namespace I18N.MidEast
+{
+
+using System;
+using I18N.Common;
+
+public class CP1254 : ByteEncoding
+{
+	public CP1254()
+		: base(1254, ToChars, "Turkish (Windows)",
+		       "iso-8859-9", "windows-1254", "windows-1254",
+		       true, true, true, true, 1254)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u20AC', '\u0081', '\u201A', '\u0192', 
+		'\u201E', '\u2026', '\u2020', '\u2021', '\u02C6', '\u2030', 
+		'\u0160', '\u2039', '\u0152', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u2018', '\u2019', '\u201C', '\u201D', '\u2022', 
+		'\u2013', '\u2014', '\u02DC', '\u2122', '\u0161', '\u203A', 
+		'\u0153', '\u009D', '\u009E', '\u0178', '\u00A0', '\u00A1', 
+		'\u00A2', '\u00A3', '\u00A4', '\u00A5', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u00AA', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u00AF', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u00B4', '\u00B5', '\u00B6', '\u00B7', '\u00B8', '\u00B9', 
+		'\u00BA', '\u00BB', '\u00BC', '\u00BD', '\u00BE', '\u00BF', 
+		'\u00C0', '\u00C1', '\u00C2', '\u00C3', '\u00C4', '\u00C5', 
+		'\u00C6', '\u00C7', '\u00C8', '\u00C9', '\u00CA', '\u00CB', 
+		'\u00CC', '\u00CD', '\u00CE', '\u00CF', '\u011E', '\u00D1', 
+		'\u00D2', '\u00D3', '\u00D4', '\u00D5', '\u00D6', '\u00D7', 
+		'\u00D8', '\u00D9', '\u00DA', '\u00DB', '\u00DC', '\u0130', 
+		'\u015E', '\u00DF', '\u00E0', '\u00E1', '\u00E2', '\u00E3', 
+		'\u00E4', '\u00E5', '\u00E6', '\u00E7', '\u00E8', '\u00E9', 
+		'\u00EA', '\u00EB', '\u00EC', '\u00ED', '\u00EE', '\u00EF', 
+		'\u011F', '\u00F1', '\u00F2', '\u00F3', '\u00F4', '\u00F5', 
+		'\u00F6', '\u00F7', '\u00F8', '\u00F9', '\u00FA', '\u00FB', 
+		'\u00FC', '\u0131', '\u015F', '\u00FF', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x008D:
+				case 0x008E:
+				case 0x008F:
+				case 0x0090:
+				case 0x009D:
+				case 0x009E:
+				case 0x00A0:
+				case 0x00A1:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AA:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BA:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00BF:
+				case 0x00C0:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C3:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C6:
+				case 0x00C7:
+				case 0x00C8:
+				case 0x00C9:
+				case 0x00CA:
+				case 0x00CB:
+				case 0x00CC:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00CF:
+				case 0x00D1:
+				case 0x00D2:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E3:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EC:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F1:
+				case 0x00F2:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+				case 0x00FF:
+					break;
+				case 0x011E: ch = 0xD0; break;
+				case 0x011F: ch = 0xF0; break;
+				case 0x0130: ch = 0xDD; break;
+				case 0x0131: ch = 0xFD; break;
+				case 0x0152: ch = 0x8C; break;
+				case 0x0153: ch = 0x9C; break;
+				case 0x015E: ch = 0xDE; break;
+				case 0x015F: ch = 0xFE; break;
+				case 0x0160: ch = 0x8A; break;
+				case 0x0161: ch = 0x9A; break;
+				case 0x0178: ch = 0x9F; break;
+				case 0x0192: ch = 0x83; break;
+				case 0x02C6: ch = 0x88; break;
+				case 0x02DC: ch = 0x98; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x008D:
+				case 0x008E:
+				case 0x008F:
+				case 0x0090:
+				case 0x009D:
+				case 0x009E:
+				case 0x00A0:
+				case 0x00A1:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AA:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BA:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00BF:
+				case 0x00C0:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C3:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C6:
+				case 0x00C7:
+				case 0x00C8:
+				case 0x00C9:
+				case 0x00CA:
+				case 0x00CB:
+				case 0x00CC:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00CF:
+				case 0x00D1:
+				case 0x00D2:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E3:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EC:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F1:
+				case 0x00F2:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+				case 0x00FF:
+					break;
+				case 0x011E: ch = 0xD0; break;
+				case 0x011F: ch = 0xF0; break;
+				case 0x0130: ch = 0xDD; break;
+				case 0x0131: ch = 0xFD; break;
+				case 0x0152: ch = 0x8C; break;
+				case 0x0153: ch = 0x9C; break;
+				case 0x015E: ch = 0xDE; break;
+				case 0x015F: ch = 0xFE; break;
+				case 0x0160: ch = 0x8A; break;
+				case 0x0161: ch = 0x9A; break;
+				case 0x0178: ch = 0x9F; break;
+				case 0x0192: ch = 0x83; break;
+				case 0x02C6: ch = 0x88; break;
+				case 0x02DC: ch = 0x98; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1254
+
+public class ENCwindows_1254 : CP1254
+{
+	public ENCwindows_1254() : base() {}
+
+}; // class ENCwindows_1254
+
+}; // namespace I18N.MidEast
diff --git a/mcs/class/I18N/MidEast/CP1255.cs b/mcs/class/I18N/MidEast/CP1255.cs
new file mode 100644
index 00000000000..c732d08dc76
--- /dev/null
+++ b/mcs/class/I18N/MidEast/CP1255.cs
@@ -0,0 +1,393 @@
+/*
+ * CP1255.cs - Hebrew (Windows) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-5351.ucm".
+
+namespace I18N.MidEast
+{
+
+using System;
+using I18N.Common;
+
+public class CP1255 : ByteEncoding
+{
+	public CP1255()
+		: base(1255, ToChars, "Hebrew (Windows)",
+		       "windows-1255", "windows-1255", "windows-1255",
+		       true, true, true, true, 1255)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u20AC', '\u0081', '\u201A', '\u0192', 
+		'\u201E', '\u2026', '\u2020', '\u2021', '\u02C6', '\u2030', 
+		'\u008A', '\u2039', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u2018', '\u2019', '\u201C', '\u201D', '\u2022', 
+		'\u2013', '\u2014', '\u02DC', '\u2122', '\u009A', '\u203A', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u00A1', 
+		'\u00A2', '\u00A3', '\u20AA', '\u00A5', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u00D7', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u00AF', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u00B4', '\u00B5', '\u00B6', '\u00B7', '\u00B8', '\u00B9', 
+		'\u00F7', '\u00BB', '\u00BC', '\u00BD', '\u00BE', '\u00BF', 
+		'\u05B0', '\u05B1', '\u05B2', '\u05B3', '\u05B4', '\u05B5', 
+		'\u05B6', '\u05B7', '\u05B8', '\u05B9', '\u003F', '\u05BB', 
+		'\u05BC', '\u05BD', '\u05BE', '\u05BF', '\u05C0', '\u05C1', 
+		'\u05C2', '\u05C3', '\u05F0', '\u05F1', '\u05F2', '\u05F3', 
+		'\u05F4', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u05D0', '\u05D1', '\u05D2', '\u05D3', 
+		'\u05D4', '\u05D5', '\u05D6', '\u05D7', '\u05D8', '\u05D9', 
+		'\u05DA', '\u05DB', '\u05DC', '\u05DD', '\u05DE', '\u05DF', 
+		'\u05E0', '\u05E1', '\u05E2', '\u05E3', '\u05E4', '\u05E5', 
+		'\u05E6', '\u05E7', '\u05E8', '\u05E9', '\u05EA', '\u003F', 
+		'\u003F', '\u200E', '\u200F', '\u003F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x008A:
+				case 0x008C:
+				case 0x008D:
+				case 0x008E:
+				case 0x008F:
+				case 0x0090:
+				case 0x009A:
+				case 0x009C:
+				case 0x009D:
+				case 0x009E:
+				case 0x009F:
+				case 0x00A0:
+				case 0x00A1:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00BF:
+					break;
+				case 0x00D7: ch = 0xAA; break;
+				case 0x00F7: ch = 0xBA; break;
+				case 0x0192: ch = 0x83; break;
+				case 0x02C6: ch = 0x88; break;
+				case 0x02DC: ch = 0x98; break;
+				case 0x05B0:
+				case 0x05B1:
+				case 0x05B2:
+				case 0x05B3:
+				case 0x05B4:
+				case 0x05B5:
+				case 0x05B6:
+				case 0x05B7:
+				case 0x05B8:
+				case 0x05B9:
+					ch -= 0x04F0;
+					break;
+				case 0x05BB:
+				case 0x05BC:
+				case 0x05BD:
+				case 0x05BE:
+				case 0x05BF:
+				case 0x05C0:
+				case 0x05C1:
+				case 0x05C2:
+				case 0x05C3:
+					ch -= 0x04F0;
+					break;
+				case 0x05D0:
+				case 0x05D1:
+				case 0x05D2:
+				case 0x05D3:
+				case 0x05D4:
+				case 0x05D5:
+				case 0x05D6:
+				case 0x05D7:
+				case 0x05D8:
+				case 0x05D9:
+				case 0x05DA:
+				case 0x05DB:
+				case 0x05DC:
+				case 0x05DD:
+				case 0x05DE:
+				case 0x05DF:
+				case 0x05E0:
+				case 0x05E1:
+				case 0x05E2:
+				case 0x05E3:
+				case 0x05E4:
+				case 0x05E5:
+				case 0x05E6:
+				case 0x05E7:
+				case 0x05E8:
+				case 0x05E9:
+				case 0x05EA:
+					ch -= 0x04F0;
+					break;
+				case 0x05F0:
+				case 0x05F1:
+				case 0x05F2:
+				case 0x05F3:
+				case 0x05F4:
+					ch -= 0x051C;
+					break;
+				case 0x200E: ch = 0xFD; break;
+				case 0x200F: ch = 0xFE; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AA: ch = 0xA4; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x008A:
+				case 0x008C:
+				case 0x008D:
+				case 0x008E:
+				case 0x008F:
+				case 0x0090:
+				case 0x009A:
+				case 0x009C:
+				case 0x009D:
+				case 0x009E:
+				case 0x009F:
+				case 0x00A0:
+				case 0x00A1:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00BF:
+					break;
+				case 0x00D7: ch = 0xAA; break;
+				case 0x00F7: ch = 0xBA; break;
+				case 0x0192: ch = 0x83; break;
+				case 0x02C6: ch = 0x88; break;
+				case 0x02DC: ch = 0x98; break;
+				case 0x05B0:
+				case 0x05B1:
+				case 0x05B2:
+				case 0x05B3:
+				case 0x05B4:
+				case 0x05B5:
+				case 0x05B6:
+				case 0x05B7:
+				case 0x05B8:
+				case 0x05B9:
+					ch -= 0x04F0;
+					break;
+				case 0x05BB:
+				case 0x05BC:
+				case 0x05BD:
+				case 0x05BE:
+				case 0x05BF:
+				case 0x05C0:
+				case 0x05C1:
+				case 0x05C2:
+				case 0x05C3:
+					ch -= 0x04F0;
+					break;
+				case 0x05D0:
+				case 0x05D1:
+				case 0x05D2:
+				case 0x05D3:
+				case 0x05D4:
+				case 0x05D5:
+				case 0x05D6:
+				case 0x05D7:
+				case 0x05D8:
+				case 0x05D9:
+				case 0x05DA:
+				case 0x05DB:
+				case 0x05DC:
+				case 0x05DD:
+				case 0x05DE:
+				case 0x05DF:
+				case 0x05E0:
+				case 0x05E1:
+				case 0x05E2:
+				case 0x05E3:
+				case 0x05E4:
+				case 0x05E5:
+				case 0x05E6:
+				case 0x05E7:
+				case 0x05E8:
+				case 0x05E9:
+				case 0x05EA:
+					ch -= 0x04F0;
+					break;
+				case 0x05F0:
+				case 0x05F1:
+				case 0x05F2:
+				case 0x05F3:
+				case 0x05F4:
+					ch -= 0x051C;
+					break;
+				case 0x200E: ch = 0xFD; break;
+				case 0x200F: ch = 0xFE; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AA: ch = 0xA4; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1255
+
+public class ENCwindows_1255 : CP1255
+{
+	public ENCwindows_1255() : base() {}
+
+}; // class ENCwindows_1255
+
+}; // namespace I18N.MidEast
diff --git a/mcs/class/I18N/MidEast/CP1256.cs b/mcs/class/I18N/MidEast/CP1256.cs
new file mode 100644
index 00000000000..71e5c3288f9
--- /dev/null
+++ b/mcs/class/I18N/MidEast/CP1256.cs
@@ -0,0 +1,771 @@
+/*
+ * CP1256.cs - Arabic (Windows) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-5352.ucm".
+
+namespace I18N.MidEast
+{
+
+using System;
+using I18N.Common;
+
+public class CP1256 : ByteEncoding
+{
+	public CP1256()
+		: base(1256, ToChars, "Arabic (Windows)",
+		       "windows-1256", "windows-1256", "windows-1256",
+		       true, true, true, true, 1256)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u20AC', '\u067E', '\u201A', '\u0192', 
+		'\u201E', '\u2026', '\u2020', '\u2021', '\u02C6', '\u2030', 
+		'\u0679', '\u2039', '\u0152', '\u0686', '\u0698', '\u0688', 
+		'\u06AF', '\u2018', '\u2019', '\u201C', '\u201D', '\u2022', 
+		'\u2013', '\u2014', '\u06A9', '\u2122', '\u0691', '\u203A', 
+		'\u0153', '\u200C', '\u200D', '\u06BA', '\u00A0', '\u060C', 
+		'\u00A2', '\u00A3', '\u00A4', '\u00A5', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u06BE', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u00AF', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u00B4', '\u00B5', '\u00B6', '\u00B7', '\u00B8', '\u00B9', 
+		'\u061B', '\u00BB', '\u00BC', '\u00BD', '\u00BE', '\u061F', 
+		'\u06C1', '\u0621', '\u0622', '\u0623', '\u0624', '\u0625', 
+		'\u0626', '\u0627', '\u0628', '\u0629', '\u062A', '\u062B', 
+		'\u062C', '\u062D', '\u062E', '\u062F', '\u0630', '\u0631', 
+		'\u0632', '\u0633', '\u0634', '\u0635', '\u0636', '\u00D7', 
+		'\u0637', '\u0638', '\u0639', '\u063A', '\u0640', '\u0641', 
+		'\u0642', '\u0643', '\u00E0', '\u0644', '\u00E2', '\u0645', 
+		'\u0646', '\u0647', '\u0648', '\u00E7', '\u00E8', '\u00E9', 
+		'\u00EA', '\u00EB', '\u0649', '\u064A', '\u00EE', '\u00EF', 
+		'\u064B', '\u064C', '\u064D', '\u064E', '\u00F4', '\u064F', 
+		'\u0650', '\u00F7', '\u0651', '\u00F9', '\u0652', '\u00FB', 
+		'\u00FC', '\u200E', '\u200F', '\u06D2', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x00A0:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00D7:
+				case 0x00E0:
+				case 0x00E2:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F4:
+				case 0x00F7:
+				case 0x00F9:
+				case 0x00FB:
+				case 0x00FC:
+					break;
+				case 0x0152: ch = 0x8C; break;
+				case 0x0153: ch = 0x9C; break;
+				case 0x0192: ch = 0x83; break;
+				case 0x02C6: ch = 0x88; break;
+				case 0x060C: ch = 0xA1; break;
+				case 0x061B: ch = 0xBA; break;
+				case 0x061F: ch = 0xBF; break;
+				case 0x0621:
+				case 0x0622:
+				case 0x0623:
+				case 0x0624:
+				case 0x0625:
+				case 0x0626:
+				case 0x0627:
+				case 0x0628:
+				case 0x0629:
+				case 0x062A:
+				case 0x062B:
+				case 0x062C:
+				case 0x062D:
+				case 0x062E:
+				case 0x062F:
+				case 0x0630:
+				case 0x0631:
+				case 0x0632:
+				case 0x0633:
+				case 0x0634:
+				case 0x0635:
+				case 0x0636:
+					ch -= 0x0560;
+					break;
+				case 0x0637:
+				case 0x0638:
+				case 0x0639:
+				case 0x063A:
+					ch -= 0x055F;
+					break;
+				case 0x0640:
+				case 0x0641:
+				case 0x0642:
+				case 0x0643:
+					ch -= 0x0564;
+					break;
+				case 0x0644: ch = 0xE1; break;
+				case 0x0645:
+				case 0x0646:
+				case 0x0647:
+				case 0x0648:
+					ch -= 0x0562;
+					break;
+				case 0x0649: ch = 0xEC; break;
+				case 0x064A: ch = 0xED; break;
+				case 0x064B:
+				case 0x064C:
+				case 0x064D:
+				case 0x064E:
+					ch -= 0x055B;
+					break;
+				case 0x064F: ch = 0xF5; break;
+				case 0x0650: ch = 0xF6; break;
+				case 0x0651: ch = 0xF8; break;
+				case 0x0652: ch = 0xFA; break;
+				case 0x0660:
+				case 0x0661:
+				case 0x0662:
+				case 0x0663:
+				case 0x0664:
+				case 0x0665:
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x0630;
+					break;
+				case 0x066B: ch = 0x2C; break;
+				case 0x066C: ch = 0x2E; break;
+				case 0x0679: ch = 0x8A; break;
+				case 0x067E: ch = 0x81; break;
+				case 0x0686: ch = 0x8D; break;
+				case 0x0688: ch = 0x8F; break;
+				case 0x0691: ch = 0x9A; break;
+				case 0x0698: ch = 0x8E; break;
+				case 0x06A9: ch = 0x98; break;
+				case 0x06AF: ch = 0x90; break;
+				case 0x06BA: ch = 0x9F; break;
+				case 0x06BE: ch = 0xAA; break;
+				case 0x06C1: ch = 0xC0; break;
+				case 0x06D2: ch = 0xFF; break;
+				case 0x06F0:
+				case 0x06F1:
+				case 0x06F2:
+				case 0x06F3:
+				case 0x06F4:
+				case 0x06F5:
+				case 0x06F6:
+				case 0x06F7:
+				case 0x06F8:
+				case 0x06F9:
+					ch -= 0x06C0;
+					break;
+				case 0x200C: ch = 0x9D; break;
+				case 0x200D: ch = 0x9E; break;
+				case 0x200E: ch = 0xFD; break;
+				case 0x200F: ch = 0xFE; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				case 0xFB56: ch = 0x81; break;
+				case 0xFB58: ch = 0x81; break;
+				case 0xFB66: ch = 0x8A; break;
+				case 0xFB68: ch = 0x8A; break;
+				case 0xFB7A: ch = 0x8D; break;
+				case 0xFB7C: ch = 0x8D; break;
+				case 0xFB88: ch = 0x8F; break;
+				case 0xFB8A: ch = 0x8E; break;
+				case 0xFB8C: ch = 0x9A; break;
+				case 0xFB8E: ch = 0x98; break;
+				case 0xFB90: ch = 0x98; break;
+				case 0xFB92: ch = 0x90; break;
+				case 0xFB94: ch = 0x90; break;
+				case 0xFB9E: ch = 0x9F; break;
+				case 0xFBA6: ch = 0xC0; break;
+				case 0xFBA8: ch = 0xC0; break;
+				case 0xFBAA: ch = 0xAA; break;
+				case 0xFBAC: ch = 0xAA; break;
+				case 0xFBAE: ch = 0xFF; break;
+				case 0xFE70: ch = 0xF0; break;
+				case 0xFE71: ch = 0xF0; break;
+				case 0xFE72: ch = 0xF1; break;
+				case 0xFE74: ch = 0xF2; break;
+				case 0xFE76: ch = 0xF3; break;
+				case 0xFE77: ch = 0xF3; break;
+				case 0xFE78: ch = 0xF5; break;
+				case 0xFE79: ch = 0xF5; break;
+				case 0xFE7A: ch = 0xF6; break;
+				case 0xFE7B: ch = 0xF6; break;
+				case 0xFE7C: ch = 0xF8; break;
+				case 0xFE7D: ch = 0xF8; break;
+				case 0xFE7E: ch = 0xFA; break;
+				case 0xFE7F: ch = 0xFA; break;
+				case 0xFE80: ch = 0xC1; break;
+				case 0xFE81: ch = 0xC2; break;
+				case 0xFE82: ch = 0xC2; break;
+				case 0xFE83: ch = 0xC3; break;
+				case 0xFE84: ch = 0xC3; break;
+				case 0xFE85: ch = 0xC4; break;
+				case 0xFE86: ch = 0xC4; break;
+				case 0xFE87: ch = 0xC5; break;
+				case 0xFE88: ch = 0xC5; break;
+				case 0xFE89: ch = 0xC6; break;
+				case 0xFE8A: ch = 0xC6; break;
+				case 0xFE8B: ch = 0xC6; break;
+				case 0xFE8C: ch = 0xC6; break;
+				case 0xFE8D: ch = 0xC7; break;
+				case 0xFE8E: ch = 0xC7; break;
+				case 0xFE8F: ch = 0xC8; break;
+				case 0xFE90: ch = 0xC8; break;
+				case 0xFE91: ch = 0xC8; break;
+				case 0xFE92: ch = 0xC8; break;
+				case 0xFE93: ch = 0xC9; break;
+				case 0xFE94: ch = 0xC9; break;
+				case 0xFE95: ch = 0xCA; break;
+				case 0xFE96: ch = 0xCA; break;
+				case 0xFE97: ch = 0xCA; break;
+				case 0xFE98: ch = 0xCA; break;
+				case 0xFE99: ch = 0xCB; break;
+				case 0xFE9A: ch = 0xCB; break;
+				case 0xFE9B: ch = 0xCB; break;
+				case 0xFE9C: ch = 0xCB; break;
+				case 0xFE9D: ch = 0xCC; break;
+				case 0xFE9E: ch = 0xCC; break;
+				case 0xFE9F: ch = 0xCC; break;
+				case 0xFEA0: ch = 0xCC; break;
+				case 0xFEA1: ch = 0xCD; break;
+				case 0xFEA2: ch = 0xCD; break;
+				case 0xFEA3: ch = 0xCD; break;
+				case 0xFEA4: ch = 0xCD; break;
+				case 0xFEA5: ch = 0xCE; break;
+				case 0xFEA6: ch = 0xCE; break;
+				case 0xFEA7: ch = 0xCE; break;
+				case 0xFEA8: ch = 0xCE; break;
+				case 0xFEA9: ch = 0xCF; break;
+				case 0xFEAA: ch = 0xCF; break;
+				case 0xFEAB: ch = 0xD0; break;
+				case 0xFEAC: ch = 0xD0; break;
+				case 0xFEAD: ch = 0xD1; break;
+				case 0xFEAE: ch = 0xD1; break;
+				case 0xFEAF: ch = 0xD2; break;
+				case 0xFEB0: ch = 0xD2; break;
+				case 0xFEB1: ch = 0xD3; break;
+				case 0xFEB2: ch = 0xD3; break;
+				case 0xFEB3: ch = 0xD3; break;
+				case 0xFEB4: ch = 0xD3; break;
+				case 0xFEB5: ch = 0xD4; break;
+				case 0xFEB6: ch = 0xD4; break;
+				case 0xFEB7: ch = 0xD4; break;
+				case 0xFEB8: ch = 0xD4; break;
+				case 0xFEB9: ch = 0xD5; break;
+				case 0xFEBA: ch = 0xD5; break;
+				case 0xFEBB: ch = 0xD5; break;
+				case 0xFEBC: ch = 0xD5; break;
+				case 0xFEBD: ch = 0xD6; break;
+				case 0xFEBE: ch = 0xD6; break;
+				case 0xFEBF: ch = 0xD6; break;
+				case 0xFEC0: ch = 0xD6; break;
+				case 0xFEC1: ch = 0xD8; break;
+				case 0xFEC2: ch = 0xD8; break;
+				case 0xFEC3: ch = 0xD8; break;
+				case 0xFEC4: ch = 0xD8; break;
+				case 0xFEC5: ch = 0xD9; break;
+				case 0xFEC6: ch = 0xD9; break;
+				case 0xFEC7: ch = 0xD9; break;
+				case 0xFEC8: ch = 0xD9; break;
+				case 0xFEC9: ch = 0xDA; break;
+				case 0xFECA: ch = 0xDA; break;
+				case 0xFECB: ch = 0xDA; break;
+				case 0xFECC: ch = 0xDA; break;
+				case 0xFECD: ch = 0xDB; break;
+				case 0xFECE: ch = 0xDB; break;
+				case 0xFECF: ch = 0xDB; break;
+				case 0xFED0: ch = 0xDB; break;
+				case 0xFED1: ch = 0xDD; break;
+				case 0xFED2: ch = 0xDD; break;
+				case 0xFED3: ch = 0xDD; break;
+				case 0xFED4: ch = 0xDD; break;
+				case 0xFED5: ch = 0xDE; break;
+				case 0xFED6: ch = 0xDE; break;
+				case 0xFED7: ch = 0xDE; break;
+				case 0xFED8: ch = 0xDE; break;
+				case 0xFED9: ch = 0xDF; break;
+				case 0xFEDA: ch = 0xDF; break;
+				case 0xFEDB: ch = 0xDF; break;
+				case 0xFEDC: ch = 0xDF; break;
+				case 0xFEDD: ch = 0xE1; break;
+				case 0xFEDE: ch = 0xE1; break;
+				case 0xFEDF: ch = 0xE1; break;
+				case 0xFEE0: ch = 0xE1; break;
+				case 0xFEE1: ch = 0xE3; break;
+				case 0xFEE2: ch = 0xE3; break;
+				case 0xFEE3: ch = 0xE3; break;
+				case 0xFEE4: ch = 0xE3; break;
+				case 0xFEE5: ch = 0xE4; break;
+				case 0xFEE6: ch = 0xE4; break;
+				case 0xFEE7: ch = 0xE4; break;
+				case 0xFEE8: ch = 0xE4; break;
+				case 0xFEE9: ch = 0xE5; break;
+				case 0xFEEA: ch = 0xE5; break;
+				case 0xFEEB: ch = 0xE5; break;
+				case 0xFEEC: ch = 0xE5; break;
+				case 0xFEED: ch = 0xE6; break;
+				case 0xFEEE: ch = 0xE6; break;
+				case 0xFEEF: ch = 0xEC; break;
+				case 0xFEF0: ch = 0xEC; break;
+				case 0xFEF1: ch = 0xED; break;
+				case 0xFEF2: ch = 0xED; break;
+				case 0xFEF3: ch = 0xED; break;
+				case 0xFEF4: ch = 0xED; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x00A0:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00D7:
+				case 0x00E0:
+				case 0x00E2:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F4:
+				case 0x00F7:
+				case 0x00F9:
+				case 0x00FB:
+				case 0x00FC:
+					break;
+				case 0x0152: ch = 0x8C; break;
+				case 0x0153: ch = 0x9C; break;
+				case 0x0192: ch = 0x83; break;
+				case 0x02C6: ch = 0x88; break;
+				case 0x060C: ch = 0xA1; break;
+				case 0x061B: ch = 0xBA; break;
+				case 0x061F: ch = 0xBF; break;
+				case 0x0621:
+				case 0x0622:
+				case 0x0623:
+				case 0x0624:
+				case 0x0625:
+				case 0x0626:
+				case 0x0627:
+				case 0x0628:
+				case 0x0629:
+				case 0x062A:
+				case 0x062B:
+				case 0x062C:
+				case 0x062D:
+				case 0x062E:
+				case 0x062F:
+				case 0x0630:
+				case 0x0631:
+				case 0x0632:
+				case 0x0633:
+				case 0x0634:
+				case 0x0635:
+				case 0x0636:
+					ch -= 0x0560;
+					break;
+				case 0x0637:
+				case 0x0638:
+				case 0x0639:
+				case 0x063A:
+					ch -= 0x055F;
+					break;
+				case 0x0640:
+				case 0x0641:
+				case 0x0642:
+				case 0x0643:
+					ch -= 0x0564;
+					break;
+				case 0x0644: ch = 0xE1; break;
+				case 0x0645:
+				case 0x0646:
+				case 0x0647:
+				case 0x0648:
+					ch -= 0x0562;
+					break;
+				case 0x0649: ch = 0xEC; break;
+				case 0x064A: ch = 0xED; break;
+				case 0x064B:
+				case 0x064C:
+				case 0x064D:
+				case 0x064E:
+					ch -= 0x055B;
+					break;
+				case 0x064F: ch = 0xF5; break;
+				case 0x0650: ch = 0xF6; break;
+				case 0x0651: ch = 0xF8; break;
+				case 0x0652: ch = 0xFA; break;
+				case 0x0660:
+				case 0x0661:
+				case 0x0662:
+				case 0x0663:
+				case 0x0664:
+				case 0x0665:
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x0630;
+					break;
+				case 0x066B: ch = 0x2C; break;
+				case 0x066C: ch = 0x2E; break;
+				case 0x0679: ch = 0x8A; break;
+				case 0x067E: ch = 0x81; break;
+				case 0x0686: ch = 0x8D; break;
+				case 0x0688: ch = 0x8F; break;
+				case 0x0691: ch = 0x9A; break;
+				case 0x0698: ch = 0x8E; break;
+				case 0x06A9: ch = 0x98; break;
+				case 0x06AF: ch = 0x90; break;
+				case 0x06BA: ch = 0x9F; break;
+				case 0x06BE: ch = 0xAA; break;
+				case 0x06C1: ch = 0xC0; break;
+				case 0x06D2: ch = 0xFF; break;
+				case 0x06F0:
+				case 0x06F1:
+				case 0x06F2:
+				case 0x06F3:
+				case 0x06F4:
+				case 0x06F5:
+				case 0x06F6:
+				case 0x06F7:
+				case 0x06F8:
+				case 0x06F9:
+					ch -= 0x06C0;
+					break;
+				case 0x200C: ch = 0x9D; break;
+				case 0x200D: ch = 0x9E; break;
+				case 0x200E: ch = 0xFD; break;
+				case 0x200F: ch = 0xFE; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				case 0xFB56: ch = 0x81; break;
+				case 0xFB58: ch = 0x81; break;
+				case 0xFB66: ch = 0x8A; break;
+				case 0xFB68: ch = 0x8A; break;
+				case 0xFB7A: ch = 0x8D; break;
+				case 0xFB7C: ch = 0x8D; break;
+				case 0xFB88: ch = 0x8F; break;
+				case 0xFB8A: ch = 0x8E; break;
+				case 0xFB8C: ch = 0x9A; break;
+				case 0xFB8E: ch = 0x98; break;
+				case 0xFB90: ch = 0x98; break;
+				case 0xFB92: ch = 0x90; break;
+				case 0xFB94: ch = 0x90; break;
+				case 0xFB9E: ch = 0x9F; break;
+				case 0xFBA6: ch = 0xC0; break;
+				case 0xFBA8: ch = 0xC0; break;
+				case 0xFBAA: ch = 0xAA; break;
+				case 0xFBAC: ch = 0xAA; break;
+				case 0xFBAE: ch = 0xFF; break;
+				case 0xFE70: ch = 0xF0; break;
+				case 0xFE71: ch = 0xF0; break;
+				case 0xFE72: ch = 0xF1; break;
+				case 0xFE74: ch = 0xF2; break;
+				case 0xFE76: ch = 0xF3; break;
+				case 0xFE77: ch = 0xF3; break;
+				case 0xFE78: ch = 0xF5; break;
+				case 0xFE79: ch = 0xF5; break;
+				case 0xFE7A: ch = 0xF6; break;
+				case 0xFE7B: ch = 0xF6; break;
+				case 0xFE7C: ch = 0xF8; break;
+				case 0xFE7D: ch = 0xF8; break;
+				case 0xFE7E: ch = 0xFA; break;
+				case 0xFE7F: ch = 0xFA; break;
+				case 0xFE80: ch = 0xC1; break;
+				case 0xFE81: ch = 0xC2; break;
+				case 0xFE82: ch = 0xC2; break;
+				case 0xFE83: ch = 0xC3; break;
+				case 0xFE84: ch = 0xC3; break;
+				case 0xFE85: ch = 0xC4; break;
+				case 0xFE86: ch = 0xC4; break;
+				case 0xFE87: ch = 0xC5; break;
+				case 0xFE88: ch = 0xC5; break;
+				case 0xFE89: ch = 0xC6; break;
+				case 0xFE8A: ch = 0xC6; break;
+				case 0xFE8B: ch = 0xC6; break;
+				case 0xFE8C: ch = 0xC6; break;
+				case 0xFE8D: ch = 0xC7; break;
+				case 0xFE8E: ch = 0xC7; break;
+				case 0xFE8F: ch = 0xC8; break;
+				case 0xFE90: ch = 0xC8; break;
+				case 0xFE91: ch = 0xC8; break;
+				case 0xFE92: ch = 0xC8; break;
+				case 0xFE93: ch = 0xC9; break;
+				case 0xFE94: ch = 0xC9; break;
+				case 0xFE95: ch = 0xCA; break;
+				case 0xFE96: ch = 0xCA; break;
+				case 0xFE97: ch = 0xCA; break;
+				case 0xFE98: ch = 0xCA; break;
+				case 0xFE99: ch = 0xCB; break;
+				case 0xFE9A: ch = 0xCB; break;
+				case 0xFE9B: ch = 0xCB; break;
+				case 0xFE9C: ch = 0xCB; break;
+				case 0xFE9D: ch = 0xCC; break;
+				case 0xFE9E: ch = 0xCC; break;
+				case 0xFE9F: ch = 0xCC; break;
+				case 0xFEA0: ch = 0xCC; break;
+				case 0xFEA1: ch = 0xCD; break;
+				case 0xFEA2: ch = 0xCD; break;
+				case 0xFEA3: ch = 0xCD; break;
+				case 0xFEA4: ch = 0xCD; break;
+				case 0xFEA5: ch = 0xCE; break;
+				case 0xFEA6: ch = 0xCE; break;
+				case 0xFEA7: ch = 0xCE; break;
+				case 0xFEA8: ch = 0xCE; break;
+				case 0xFEA9: ch = 0xCF; break;
+				case 0xFEAA: ch = 0xCF; break;
+				case 0xFEAB: ch = 0xD0; break;
+				case 0xFEAC: ch = 0xD0; break;
+				case 0xFEAD: ch = 0xD1; break;
+				case 0xFEAE: ch = 0xD1; break;
+				case 0xFEAF: ch = 0xD2; break;
+				case 0xFEB0: ch = 0xD2; break;
+				case 0xFEB1: ch = 0xD3; break;
+				case 0xFEB2: ch = 0xD3; break;
+				case 0xFEB3: ch = 0xD3; break;
+				case 0xFEB4: ch = 0xD3; break;
+				case 0xFEB5: ch = 0xD4; break;
+				case 0xFEB6: ch = 0xD4; break;
+				case 0xFEB7: ch = 0xD4; break;
+				case 0xFEB8: ch = 0xD4; break;
+				case 0xFEB9: ch = 0xD5; break;
+				case 0xFEBA: ch = 0xD5; break;
+				case 0xFEBB: ch = 0xD5; break;
+				case 0xFEBC: ch = 0xD5; break;
+				case 0xFEBD: ch = 0xD6; break;
+				case 0xFEBE: ch = 0xD6; break;
+				case 0xFEBF: ch = 0xD6; break;
+				case 0xFEC0: ch = 0xD6; break;
+				case 0xFEC1: ch = 0xD8; break;
+				case 0xFEC2: ch = 0xD8; break;
+				case 0xFEC3: ch = 0xD8; break;
+				case 0xFEC4: ch = 0xD8; break;
+				case 0xFEC5: ch = 0xD9; break;
+				case 0xFEC6: ch = 0xD9; break;
+				case 0xFEC7: ch = 0xD9; break;
+				case 0xFEC8: ch = 0xD9; break;
+				case 0xFEC9: ch = 0xDA; break;
+				case 0xFECA: ch = 0xDA; break;
+				case 0xFECB: ch = 0xDA; break;
+				case 0xFECC: ch = 0xDA; break;
+				case 0xFECD: ch = 0xDB; break;
+				case 0xFECE: ch = 0xDB; break;
+				case 0xFECF: ch = 0xDB; break;
+				case 0xFED0: ch = 0xDB; break;
+				case 0xFED1: ch = 0xDD; break;
+				case 0xFED2: ch = 0xDD; break;
+				case 0xFED3: ch = 0xDD; break;
+				case 0xFED4: ch = 0xDD; break;
+				case 0xFED5: ch = 0xDE; break;
+				case 0xFED6: ch = 0xDE; break;
+				case 0xFED7: ch = 0xDE; break;
+				case 0xFED8: ch = 0xDE; break;
+				case 0xFED9: ch = 0xDF; break;
+				case 0xFEDA: ch = 0xDF; break;
+				case 0xFEDB: ch = 0xDF; break;
+				case 0xFEDC: ch = 0xDF; break;
+				case 0xFEDD: ch = 0xE1; break;
+				case 0xFEDE: ch = 0xE1; break;
+				case 0xFEDF: ch = 0xE1; break;
+				case 0xFEE0: ch = 0xE1; break;
+				case 0xFEE1: ch = 0xE3; break;
+				case 0xFEE2: ch = 0xE3; break;
+				case 0xFEE3: ch = 0xE3; break;
+				case 0xFEE4: ch = 0xE3; break;
+				case 0xFEE5: ch = 0xE4; break;
+				case 0xFEE6: ch = 0xE4; break;
+				case 0xFEE7: ch = 0xE4; break;
+				case 0xFEE8: ch = 0xE4; break;
+				case 0xFEE9: ch = 0xE5; break;
+				case 0xFEEA: ch = 0xE5; break;
+				case 0xFEEB: ch = 0xE5; break;
+				case 0xFEEC: ch = 0xE5; break;
+				case 0xFEED: ch = 0xE6; break;
+				case 0xFEEE: ch = 0xE6; break;
+				case 0xFEEF: ch = 0xEC; break;
+				case 0xFEF0: ch = 0xEC; break;
+				case 0xFEF1: ch = 0xED; break;
+				case 0xFEF2: ch = 0xED; break;
+				case 0xFEF3: ch = 0xED; break;
+				case 0xFEF4: ch = 0xED; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1256
+
+public class ENCwindows_1256 : CP1256
+{
+	public ENCwindows_1256() : base() {}
+
+}; // class ENCwindows_1256
+
+}; // namespace I18N.MidEast
diff --git a/mcs/class/I18N/MidEast/CP28596.cs b/mcs/class/I18N/MidEast/CP28596.cs
new file mode 100644
index 00000000000..1ee3db0eb1b
--- /dev/null
+++ b/mcs/class/I18N/MidEast/CP28596.cs
@@ -0,0 +1,545 @@
+/*
+ * CP28596.cs - Arabic (ISO) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1089.ucm".
+
+namespace I18N.MidEast
+{
+
+using System;
+using I18N.Common;
+
+public class CP28596 : ByteEncoding
+{
+	public CP28596()
+		: base(28596, ToChars, "Arabic (ISO)",
+		       "iso-8859-6", "iso-8859-6", "iso-8859-6",
+		       true, true, true, true, 1256)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u003F', 
+		'\u003F', '\u003F', '\u00A4', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u060C', '\u00AD', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u061B', '\u003F', '\u003F', '\u003F', '\u061F', 
+		'\u003F', '\u0621', '\u0622', '\u0623', '\u0624', '\u0625', 
+		'\u0626', '\u0627', '\u0628', '\u0629', '\u062A', '\u062B', 
+		'\u062C', '\u062D', '\u062E', '\u062F', '\u0630', '\u0631', 
+		'\u0632', '\u0633', '\u0634', '\u0635', '\u0636', '\u0637', 
+		'\u0638', '\u0639', '\u063A', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u0640', '\u0641', '\u0642', '\u0643', 
+		'\u0644', '\u0645', '\u0646', '\u0647', '\u0648', '\u0649', 
+		'\u064A', '\u064B', '\u064C', '\u064D', '\u064E', '\u064F', 
+		'\u0650', '\u0651', '\u0652', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A4:
+				case 0x00AD:
+					break;
+				case 0x060C: ch = 0xAC; break;
+				case 0x061B: ch = 0xBB; break;
+				case 0x061F: ch = 0xBF; break;
+				case 0x0621:
+				case 0x0622:
+				case 0x0623:
+				case 0x0624:
+				case 0x0625:
+				case 0x0626:
+				case 0x0627:
+				case 0x0628:
+				case 0x0629:
+				case 0x062A:
+				case 0x062B:
+				case 0x062C:
+				case 0x062D:
+				case 0x062E:
+				case 0x062F:
+				case 0x0630:
+				case 0x0631:
+				case 0x0632:
+				case 0x0633:
+				case 0x0634:
+				case 0x0635:
+				case 0x0636:
+				case 0x0637:
+				case 0x0638:
+				case 0x0639:
+				case 0x063A:
+					ch -= 0x0560;
+					break;
+				case 0x0640:
+				case 0x0641:
+				case 0x0642:
+				case 0x0643:
+				case 0x0644:
+				case 0x0645:
+				case 0x0646:
+				case 0x0647:
+				case 0x0648:
+				case 0x0649:
+				case 0x064A:
+				case 0x064B:
+				case 0x064C:
+				case 0x064D:
+				case 0x064E:
+				case 0x064F:
+				case 0x0650:
+				case 0x0651:
+				case 0x0652:
+					ch -= 0x0560;
+					break;
+				case 0x0660:
+				case 0x0661:
+				case 0x0662:
+				case 0x0663:
+				case 0x0664:
+				case 0x0665:
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x0630;
+					break;
+				case 0x066A: ch = 0x25; break;
+				case 0x066B: ch = 0x2C; break;
+				case 0x066C: ch = 0x2E; break;
+				case 0x066D: ch = 0x2A; break;
+				case 0xFE70: ch = 0xEB; break;
+				case 0xFE71: ch = 0xEB; break;
+				case 0xFE72: ch = 0xEC; break;
+				case 0xFE74: ch = 0xED; break;
+				case 0xFE76: ch = 0xEE; break;
+				case 0xFE77: ch = 0xEE; break;
+				case 0xFE78: ch = 0xEF; break;
+				case 0xFE79: ch = 0xEF; break;
+				case 0xFE7A: ch = 0xF0; break;
+				case 0xFE7B: ch = 0xF0; break;
+				case 0xFE7C: ch = 0xF1; break;
+				case 0xFE7D: ch = 0xF1; break;
+				case 0xFE7E: ch = 0xF2; break;
+				case 0xFE7F: ch = 0xF2; break;
+				case 0xFE80: ch = 0xC1; break;
+				case 0xFE81: ch = 0xC2; break;
+				case 0xFE82: ch = 0xC2; break;
+				case 0xFE83: ch = 0xC3; break;
+				case 0xFE84: ch = 0xC3; break;
+				case 0xFE85: ch = 0xC4; break;
+				case 0xFE86: ch = 0xC4; break;
+				case 0xFE87: ch = 0xC5; break;
+				case 0xFE88: ch = 0xC5; break;
+				case 0xFE89: ch = 0xC6; break;
+				case 0xFE8A: ch = 0xC6; break;
+				case 0xFE8B: ch = 0xC6; break;
+				case 0xFE8C: ch = 0xC6; break;
+				case 0xFE8D: ch = 0xC7; break;
+				case 0xFE8E: ch = 0xC7; break;
+				case 0xFE8F: ch = 0xC8; break;
+				case 0xFE90: ch = 0xC8; break;
+				case 0xFE91: ch = 0xC8; break;
+				case 0xFE92: ch = 0xC8; break;
+				case 0xFE93: ch = 0xC9; break;
+				case 0xFE94: ch = 0xC9; break;
+				case 0xFE95: ch = 0xCA; break;
+				case 0xFE96: ch = 0xCA; break;
+				case 0xFE97: ch = 0xCA; break;
+				case 0xFE98: ch = 0xCA; break;
+				case 0xFE99: ch = 0xCB; break;
+				case 0xFE9A: ch = 0xCB; break;
+				case 0xFE9B: ch = 0xCB; break;
+				case 0xFE9C: ch = 0xCB; break;
+				case 0xFE9D: ch = 0xCC; break;
+				case 0xFE9E: ch = 0xCC; break;
+				case 0xFE9F: ch = 0xCC; break;
+				case 0xFEA0: ch = 0xCC; break;
+				case 0xFEA1: ch = 0xCD; break;
+				case 0xFEA2: ch = 0xCD; break;
+				case 0xFEA3: ch = 0xCD; break;
+				case 0xFEA4: ch = 0xCD; break;
+				case 0xFEA5: ch = 0xCE; break;
+				case 0xFEA6: ch = 0xCE; break;
+				case 0xFEA7: ch = 0xCE; break;
+				case 0xFEA8: ch = 0xCE; break;
+				case 0xFEA9: ch = 0xCF; break;
+				case 0xFEAA: ch = 0xCF; break;
+				case 0xFEAB: ch = 0xD0; break;
+				case 0xFEAC: ch = 0xD0; break;
+				case 0xFEAD: ch = 0xD1; break;
+				case 0xFEAE: ch = 0xD1; break;
+				case 0xFEAF: ch = 0xD2; break;
+				case 0xFEB0: ch = 0xD2; break;
+				case 0xFEB1: ch = 0xD3; break;
+				case 0xFEB2: ch = 0xD3; break;
+				case 0xFEB3: ch = 0xD3; break;
+				case 0xFEB4: ch = 0xD3; break;
+				case 0xFEB5: ch = 0xD4; break;
+				case 0xFEB6: ch = 0xD4; break;
+				case 0xFEB7: ch = 0xD4; break;
+				case 0xFEB8: ch = 0xD4; break;
+				case 0xFEB9: ch = 0xD5; break;
+				case 0xFEBA: ch = 0xD5; break;
+				case 0xFEBB: ch = 0xD5; break;
+				case 0xFEBC: ch = 0xD5; break;
+				case 0xFEBD: ch = 0xD6; break;
+				case 0xFEBE: ch = 0xD6; break;
+				case 0xFEBF: ch = 0xD6; break;
+				case 0xFEC0: ch = 0xD6; break;
+				case 0xFEC1: ch = 0xD7; break;
+				case 0xFEC2: ch = 0xD7; break;
+				case 0xFEC3: ch = 0xD7; break;
+				case 0xFEC4: ch = 0xD7; break;
+				case 0xFEC5: ch = 0xD8; break;
+				case 0xFEC6: ch = 0xD8; break;
+				case 0xFEC7: ch = 0xD8; break;
+				case 0xFEC8: ch = 0xD8; break;
+				case 0xFEC9: ch = 0xD9; break;
+				case 0xFECA: ch = 0xD9; break;
+				case 0xFECB: ch = 0xD9; break;
+				case 0xFECC: ch = 0xD9; break;
+				case 0xFECD: ch = 0xDA; break;
+				case 0xFECE: ch = 0xDA; break;
+				case 0xFECF: ch = 0xDA; break;
+				case 0xFED0: ch = 0xDA; break;
+				case 0xFED1: ch = 0xE1; break;
+				case 0xFED2: ch = 0xE1; break;
+				case 0xFED3: ch = 0xE1; break;
+				case 0xFED4: ch = 0xE1; break;
+				case 0xFED5: ch = 0xE2; break;
+				case 0xFED6: ch = 0xE2; break;
+				case 0xFED7: ch = 0xE2; break;
+				case 0xFED8: ch = 0xE2; break;
+				case 0xFED9: ch = 0xE3; break;
+				case 0xFEDA: ch = 0xE3; break;
+				case 0xFEDB: ch = 0xE3; break;
+				case 0xFEDC: ch = 0xE3; break;
+				case 0xFEDD: ch = 0xE4; break;
+				case 0xFEDE: ch = 0xE4; break;
+				case 0xFEDF: ch = 0xE4; break;
+				case 0xFEE0: ch = 0xE4; break;
+				case 0xFEE1: ch = 0xE5; break;
+				case 0xFEE2: ch = 0xE5; break;
+				case 0xFEE3: ch = 0xE5; break;
+				case 0xFEE4: ch = 0xE5; break;
+				case 0xFEE5: ch = 0xE6; break;
+				case 0xFEE6: ch = 0xE6; break;
+				case 0xFEE7: ch = 0xE6; break;
+				case 0xFEE8: ch = 0xE6; break;
+				case 0xFEE9: ch = 0xE7; break;
+				case 0xFEEA: ch = 0xE7; break;
+				case 0xFEEB: ch = 0xE7; break;
+				case 0xFEEC: ch = 0xE7; break;
+				case 0xFEED: ch = 0xE8; break;
+				case 0xFEEE: ch = 0xE8; break;
+				case 0xFEEF: ch = 0xE9; break;
+				case 0xFEF0: ch = 0xE9; break;
+				case 0xFEF1: ch = 0xEA; break;
+				case 0xFEF2: ch = 0xEA; break;
+				case 0xFEF3: ch = 0xEA; break;
+				case 0xFEF4: ch = 0xEA; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A4:
+				case 0x00AD:
+					break;
+				case 0x060C: ch = 0xAC; break;
+				case 0x061B: ch = 0xBB; break;
+				case 0x061F: ch = 0xBF; break;
+				case 0x0621:
+				case 0x0622:
+				case 0x0623:
+				case 0x0624:
+				case 0x0625:
+				case 0x0626:
+				case 0x0627:
+				case 0x0628:
+				case 0x0629:
+				case 0x062A:
+				case 0x062B:
+				case 0x062C:
+				case 0x062D:
+				case 0x062E:
+				case 0x062F:
+				case 0x0630:
+				case 0x0631:
+				case 0x0632:
+				case 0x0633:
+				case 0x0634:
+				case 0x0635:
+				case 0x0636:
+				case 0x0637:
+				case 0x0638:
+				case 0x0639:
+				case 0x063A:
+					ch -= 0x0560;
+					break;
+				case 0x0640:
+				case 0x0641:
+				case 0x0642:
+				case 0x0643:
+				case 0x0644:
+				case 0x0645:
+				case 0x0646:
+				case 0x0647:
+				case 0x0648:
+				case 0x0649:
+				case 0x064A:
+				case 0x064B:
+				case 0x064C:
+				case 0x064D:
+				case 0x064E:
+				case 0x064F:
+				case 0x0650:
+				case 0x0651:
+				case 0x0652:
+					ch -= 0x0560;
+					break;
+				case 0x0660:
+				case 0x0661:
+				case 0x0662:
+				case 0x0663:
+				case 0x0664:
+				case 0x0665:
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x0630;
+					break;
+				case 0x066A: ch = 0x25; break;
+				case 0x066B: ch = 0x2C; break;
+				case 0x066C: ch = 0x2E; break;
+				case 0x066D: ch = 0x2A; break;
+				case 0xFE70: ch = 0xEB; break;
+				case 0xFE71: ch = 0xEB; break;
+				case 0xFE72: ch = 0xEC; break;
+				case 0xFE74: ch = 0xED; break;
+				case 0xFE76: ch = 0xEE; break;
+				case 0xFE77: ch = 0xEE; break;
+				case 0xFE78: ch = 0xEF; break;
+				case 0xFE79: ch = 0xEF; break;
+				case 0xFE7A: ch = 0xF0; break;
+				case 0xFE7B: ch = 0xF0; break;
+				case 0xFE7C: ch = 0xF1; break;
+				case 0xFE7D: ch = 0xF1; break;
+				case 0xFE7E: ch = 0xF2; break;
+				case 0xFE7F: ch = 0xF2; break;
+				case 0xFE80: ch = 0xC1; break;
+				case 0xFE81: ch = 0xC2; break;
+				case 0xFE82: ch = 0xC2; break;
+				case 0xFE83: ch = 0xC3; break;
+				case 0xFE84: ch = 0xC3; break;
+				case 0xFE85: ch = 0xC4; break;
+				case 0xFE86: ch = 0xC4; break;
+				case 0xFE87: ch = 0xC5; break;
+				case 0xFE88: ch = 0xC5; break;
+				case 0xFE89: ch = 0xC6; break;
+				case 0xFE8A: ch = 0xC6; break;
+				case 0xFE8B: ch = 0xC6; break;
+				case 0xFE8C: ch = 0xC6; break;
+				case 0xFE8D: ch = 0xC7; break;
+				case 0xFE8E: ch = 0xC7; break;
+				case 0xFE8F: ch = 0xC8; break;
+				case 0xFE90: ch = 0xC8; break;
+				case 0xFE91: ch = 0xC8; break;
+				case 0xFE92: ch = 0xC8; break;
+				case 0xFE93: ch = 0xC9; break;
+				case 0xFE94: ch = 0xC9; break;
+				case 0xFE95: ch = 0xCA; break;
+				case 0xFE96: ch = 0xCA; break;
+				case 0xFE97: ch = 0xCA; break;
+				case 0xFE98: ch = 0xCA; break;
+				case 0xFE99: ch = 0xCB; break;
+				case 0xFE9A: ch = 0xCB; break;
+				case 0xFE9B: ch = 0xCB; break;
+				case 0xFE9C: ch = 0xCB; break;
+				case 0xFE9D: ch = 0xCC; break;
+				case 0xFE9E: ch = 0xCC; break;
+				case 0xFE9F: ch = 0xCC; break;
+				case 0xFEA0: ch = 0xCC; break;
+				case 0xFEA1: ch = 0xCD; break;
+				case 0xFEA2: ch = 0xCD; break;
+				case 0xFEA3: ch = 0xCD; break;
+				case 0xFEA4: ch = 0xCD; break;
+				case 0xFEA5: ch = 0xCE; break;
+				case 0xFEA6: ch = 0xCE; break;
+				case 0xFEA7: ch = 0xCE; break;
+				case 0xFEA8: ch = 0xCE; break;
+				case 0xFEA9: ch = 0xCF; break;
+				case 0xFEAA: ch = 0xCF; break;
+				case 0xFEAB: ch = 0xD0; break;
+				case 0xFEAC: ch = 0xD0; break;
+				case 0xFEAD: ch = 0xD1; break;
+				case 0xFEAE: ch = 0xD1; break;
+				case 0xFEAF: ch = 0xD2; break;
+				case 0xFEB0: ch = 0xD2; break;
+				case 0xFEB1: ch = 0xD3; break;
+				case 0xFEB2: ch = 0xD3; break;
+				case 0xFEB3: ch = 0xD3; break;
+				case 0xFEB4: ch = 0xD3; break;
+				case 0xFEB5: ch = 0xD4; break;
+				case 0xFEB6: ch = 0xD4; break;
+				case 0xFEB7: ch = 0xD4; break;
+				case 0xFEB8: ch = 0xD4; break;
+				case 0xFEB9: ch = 0xD5; break;
+				case 0xFEBA: ch = 0xD5; break;
+				case 0xFEBB: ch = 0xD5; break;
+				case 0xFEBC: ch = 0xD5; break;
+				case 0xFEBD: ch = 0xD6; break;
+				case 0xFEBE: ch = 0xD6; break;
+				case 0xFEBF: ch = 0xD6; break;
+				case 0xFEC0: ch = 0xD6; break;
+				case 0xFEC1: ch = 0xD7; break;
+				case 0xFEC2: ch = 0xD7; break;
+				case 0xFEC3: ch = 0xD7; break;
+				case 0xFEC4: ch = 0xD7; break;
+				case 0xFEC5: ch = 0xD8; break;
+				case 0xFEC6: ch = 0xD8; break;
+				case 0xFEC7: ch = 0xD8; break;
+				case 0xFEC8: ch = 0xD8; break;
+				case 0xFEC9: ch = 0xD9; break;
+				case 0xFECA: ch = 0xD9; break;
+				case 0xFECB: ch = 0xD9; break;
+				case 0xFECC: ch = 0xD9; break;
+				case 0xFECD: ch = 0xDA; break;
+				case 0xFECE: ch = 0xDA; break;
+				case 0xFECF: ch = 0xDA; break;
+				case 0xFED0: ch = 0xDA; break;
+				case 0xFED1: ch = 0xE1; break;
+				case 0xFED2: ch = 0xE1; break;
+				case 0xFED3: ch = 0xE1; break;
+				case 0xFED4: ch = 0xE1; break;
+				case 0xFED5: ch = 0xE2; break;
+				case 0xFED6: ch = 0xE2; break;
+				case 0xFED7: ch = 0xE2; break;
+				case 0xFED8: ch = 0xE2; break;
+				case 0xFED9: ch = 0xE3; break;
+				case 0xFEDA: ch = 0xE3; break;
+				case 0xFEDB: ch = 0xE3; break;
+				case 0xFEDC: ch = 0xE3; break;
+				case 0xFEDD: ch = 0xE4; break;
+				case 0xFEDE: ch = 0xE4; break;
+				case 0xFEDF: ch = 0xE4; break;
+				case 0xFEE0: ch = 0xE4; break;
+				case 0xFEE1: ch = 0xE5; break;
+				case 0xFEE2: ch = 0xE5; break;
+				case 0xFEE3: ch = 0xE5; break;
+				case 0xFEE4: ch = 0xE5; break;
+				case 0xFEE5: ch = 0xE6; break;
+				case 0xFEE6: ch = 0xE6; break;
+				case 0xFEE7: ch = 0xE6; break;
+				case 0xFEE8: ch = 0xE6; break;
+				case 0xFEE9: ch = 0xE7; break;
+				case 0xFEEA: ch = 0xE7; break;
+				case 0xFEEB: ch = 0xE7; break;
+				case 0xFEEC: ch = 0xE7; break;
+				case 0xFEED: ch = 0xE8; break;
+				case 0xFEEE: ch = 0xE8; break;
+				case 0xFEEF: ch = 0xE9; break;
+				case 0xFEF0: ch = 0xE9; break;
+				case 0xFEF1: ch = 0xEA; break;
+				case 0xFEF2: ch = 0xEA; break;
+				case 0xFEF3: ch = 0xEA; break;
+				case 0xFEF4: ch = 0xEA; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP28596
+
+public class ENCiso_8859_6 : CP28596
+{
+	public ENCiso_8859_6() : base() {}
+
+}; // class ENCiso_8859_6
+
+}; // namespace I18N.MidEast
diff --git a/mcs/class/I18N/MidEast/CP28598.cs b/mcs/class/I18N/MidEast/CP28598.cs
new file mode 100644
index 00000000000..a2b11fffe89
--- /dev/null
+++ b/mcs/class/I18N/MidEast/CP28598.cs
@@ -0,0 +1,261 @@
+/*
+ * CP28598.cs - Hebrew (ISO) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-916.ucm".
+
+namespace I18N.MidEast
+{
+
+using System;
+using I18N.Common;
+
+public class CP28598 : ByteEncoding
+{
+	public CP28598()
+		: base(28598, ToChars, "Hebrew (ISO)",
+		       "iso-8859-8", "iso-8859-8", "iso-8859-8",
+		       true, true, true, true, 1255)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u003F', 
+		'\u00A2', '\u00A3', '\u00A4', '\u00A5', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u00D7', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u203E', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u00B4', '\u00B5', '\u00B6', '\u2022', '\u00B8', '\u00B9', 
+		'\u00F7', '\u00BB', '\u00BC', '\u00BD', '\u00BE', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u2017', '\u05D0', '\u05D1', '\u05D2', '\u05D3', 
+		'\u05D4', '\u05D5', '\u05D6', '\u05D7', '\u05D8', '\u05D9', 
+		'\u05DA', '\u05DB', '\u05DC', '\u05DD', '\u05DE', '\u05DF', 
+		'\u05E0', '\u05E1', '\u05E2', '\u05E3', '\u05E4', '\u05E5', 
+		'\u05E6', '\u05E7', '\u05E8', '\u05E9', '\u05EA', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+					break;
+				case 0x00D7: ch = 0xAA; break;
+				case 0x00F7: ch = 0xBA; break;
+				case 0x05D0:
+				case 0x05D1:
+				case 0x05D2:
+				case 0x05D3:
+				case 0x05D4:
+				case 0x05D5:
+				case 0x05D6:
+				case 0x05D7:
+				case 0x05D8:
+				case 0x05D9:
+				case 0x05DA:
+				case 0x05DB:
+				case 0x05DC:
+				case 0x05DD:
+				case 0x05DE:
+				case 0x05DF:
+				case 0x05E0:
+				case 0x05E1:
+				case 0x05E2:
+				case 0x05E3:
+				case 0x05E4:
+				case 0x05E5:
+				case 0x05E6:
+				case 0x05E7:
+				case 0x05E8:
+				case 0x05E9:
+				case 0x05EA:
+					ch -= 0x04F0;
+					break;
+				case 0x2017: ch = 0xDF; break;
+				case 0x2022: ch = 0xB7; break;
+				case 0x203E: ch = 0xAF; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+					break;
+				case 0x00D7: ch = 0xAA; break;
+				case 0x00F7: ch = 0xBA; break;
+				case 0x05D0:
+				case 0x05D1:
+				case 0x05D2:
+				case 0x05D3:
+				case 0x05D4:
+				case 0x05D5:
+				case 0x05D6:
+				case 0x05D7:
+				case 0x05D8:
+				case 0x05D9:
+				case 0x05DA:
+				case 0x05DB:
+				case 0x05DC:
+				case 0x05DD:
+				case 0x05DE:
+				case 0x05DF:
+				case 0x05E0:
+				case 0x05E1:
+				case 0x05E2:
+				case 0x05E3:
+				case 0x05E4:
+				case 0x05E5:
+				case 0x05E6:
+				case 0x05E7:
+				case 0x05E8:
+				case 0x05E9:
+				case 0x05EA:
+					ch -= 0x04F0;
+					break;
+				case 0x2017: ch = 0xDF; break;
+				case 0x2022: ch = 0xB7; break;
+				case 0x203E: ch = 0xAF; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP28598
+
+public class ENCiso_8859_8 : CP28598
+{
+	public ENCiso_8859_8() : base() {}
+
+}; // class ENCiso_8859_8
+
+}; // namespace I18N.MidEast
diff --git a/mcs/class/I18N/MidEast/CP28599.cs b/mcs/class/I18N/MidEast/CP28599.cs
new file mode 100644
index 00000000000..ab6b96166d7
--- /dev/null
+++ b/mcs/class/I18N/MidEast/CP28599.cs
@@ -0,0 +1,241 @@
+/*
+ * CP28599.cs - Latin 5 (ISO) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-920.ucm".
+
+namespace I18N.MidEast
+{
+
+using System;
+using I18N.Common;
+
+public class CP28599 : ByteEncoding
+{
+	public CP28599()
+		: base(28599, ToChars, "Latin 5 (ISO)",
+		       "iso-8859-9", "iso-8859-9", "iso-8859-9",
+		       true, true, true, true, 1254)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u00A1', 
+		'\u00A2', '\u00A3', '\u00A4', '\u00A5', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u00AA', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u00AF', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u00B4', '\u00B5', '\u00B6', '\u00B7', '\u00B8', '\u00B9', 
+		'\u00BA', '\u00BB', '\u00BC', '\u00BD', '\u00BE', '\u00BF', 
+		'\u00C0', '\u00C1', '\u00C2', '\u00C3', '\u00C4', '\u00C5', 
+		'\u00C6', '\u00C7', '\u00C8', '\u00C9', '\u00CA', '\u00CB', 
+		'\u00CC', '\u00CD', '\u00CE', '\u00CF', '\u011E', '\u00D1', 
+		'\u00D2', '\u00D3', '\u00D4', '\u00D5', '\u00D6', '\u00D7', 
+		'\u00D8', '\u00D9', '\u00DA', '\u00DB', '\u00DC', '\u0130', 
+		'\u015E', '\u00DF', '\u00E0', '\u00E1', '\u00E2', '\u00E3', 
+		'\u00E4', '\u00E5', '\u00E6', '\u00E7', '\u00E8', '\u00E9', 
+		'\u00EA', '\u00EB', '\u00EC', '\u00ED', '\u00EE', '\u00EF', 
+		'\u011F', '\u00F1', '\u00F2', '\u00F3', '\u00F4', '\u00F5', 
+		'\u00F6', '\u00F7', '\u00F8', '\u00F9', '\u00FA', '\u00FB', 
+		'\u00FC', '\u0131', '\u015F', '\u00FF', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 208) switch(ch)
+			{
+				case 0x00D1:
+				case 0x00D2:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E3:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EC:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F1:
+				case 0x00F2:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+				case 0x00FF:
+					break;
+				case 0x011E: ch = 0xD0; break;
+				case 0x011F: ch = 0xF0; break;
+				case 0x0130: ch = 0xDD; break;
+				case 0x0131: ch = 0xFD; break;
+				case 0x015E: ch = 0xDE; break;
+				case 0x015F: ch = 0xFE; break;
+				case 0x203E: ch = 0xAF; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 208) switch(ch)
+			{
+				case 0x00D1:
+				case 0x00D2:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E3:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EC:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F1:
+				case 0x00F2:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+				case 0x00FF:
+					break;
+				case 0x011E: ch = 0xD0; break;
+				case 0x011F: ch = 0xF0; break;
+				case 0x0130: ch = 0xDD; break;
+				case 0x0131: ch = 0xFD; break;
+				case 0x015E: ch = 0xDE; break;
+				case 0x015F: ch = 0xFE; break;
+				case 0x203E: ch = 0xAF; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP28599
+
+public class ENCiso_8859_9 : CP28599
+{
+	public ENCiso_8859_9() : base() {}
+
+}; // class ENCiso_8859_9
+
+}; // namespace I18N.MidEast
diff --git a/mcs/class/I18N/MidEast/CP38598.cs b/mcs/class/I18N/MidEast/CP38598.cs
new file mode 100644
index 00000000000..c0b8e4de9d7
--- /dev/null
+++ b/mcs/class/I18N/MidEast/CP38598.cs
@@ -0,0 +1,261 @@
+/*
+ * CP38598.cs - Hebrew (ISO Alternative) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-916.ucm".
+
+namespace I18N.MidEast
+{
+
+using System;
+using I18N.Common;
+
+public class CP38598 : ByteEncoding
+{
+	public CP38598()
+		: base(38598, ToChars, "Hebrew (ISO Alternative)",
+		       "iso-8859-8", "windows-38598", "windows-38598",
+		       true, true, true, true, 1255)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u003F', 
+		'\u00A2', '\u00A3', '\u00A4', '\u00A5', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u00D7', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u203E', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u00B4', '\u00B5', '\u00B6', '\u2022', '\u00B8', '\u00B9', 
+		'\u00F7', '\u00BB', '\u00BC', '\u00BD', '\u00BE', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u2017', '\u05D0', '\u05D1', '\u05D2', '\u05D3', 
+		'\u05D4', '\u05D5', '\u05D6', '\u05D7', '\u05D8', '\u05D9', 
+		'\u05DA', '\u05DB', '\u05DC', '\u05DD', '\u05DE', '\u05DF', 
+		'\u05E0', '\u05E1', '\u05E2', '\u05E3', '\u05E4', '\u05E5', 
+		'\u05E6', '\u05E7', '\u05E8', '\u05E9', '\u05EA', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+					break;
+				case 0x00D7: ch = 0xAA; break;
+				case 0x00F7: ch = 0xBA; break;
+				case 0x05D0:
+				case 0x05D1:
+				case 0x05D2:
+				case 0x05D3:
+				case 0x05D4:
+				case 0x05D5:
+				case 0x05D6:
+				case 0x05D7:
+				case 0x05D8:
+				case 0x05D9:
+				case 0x05DA:
+				case 0x05DB:
+				case 0x05DC:
+				case 0x05DD:
+				case 0x05DE:
+				case 0x05DF:
+				case 0x05E0:
+				case 0x05E1:
+				case 0x05E2:
+				case 0x05E3:
+				case 0x05E4:
+				case 0x05E5:
+				case 0x05E6:
+				case 0x05E7:
+				case 0x05E8:
+				case 0x05E9:
+				case 0x05EA:
+					ch -= 0x04F0;
+					break;
+				case 0x2017: ch = 0xDF; break;
+				case 0x2022: ch = 0xB7; break;
+				case 0x203E: ch = 0xAF; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+					break;
+				case 0x00D7: ch = 0xAA; break;
+				case 0x00F7: ch = 0xBA; break;
+				case 0x05D0:
+				case 0x05D1:
+				case 0x05D2:
+				case 0x05D3:
+				case 0x05D4:
+				case 0x05D5:
+				case 0x05D6:
+				case 0x05D7:
+				case 0x05D8:
+				case 0x05D9:
+				case 0x05DA:
+				case 0x05DB:
+				case 0x05DC:
+				case 0x05DD:
+				case 0x05DE:
+				case 0x05DF:
+				case 0x05E0:
+				case 0x05E1:
+				case 0x05E2:
+				case 0x05E3:
+				case 0x05E4:
+				case 0x05E5:
+				case 0x05E6:
+				case 0x05E7:
+				case 0x05E8:
+				case 0x05E9:
+				case 0x05EA:
+					ch -= 0x04F0;
+					break;
+				case 0x2017: ch = 0xDF; break;
+				case 0x2022: ch = 0xB7; break;
+				case 0x203E: ch = 0xAF; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP38598
+
+public class ENCwindows_38598 : CP38598
+{
+	public ENCwindows_38598() : base() {}
+
+}; // class ENCwindows_38598
+
+}; // namespace I18N.MidEast
diff --git a/mcs/class/I18N/MidEast/ibm-1089.ucm b/mcs/class/I18N/MidEast/ibm-1089.ucm
new file mode 100644
index 00000000000..3356cdfa543
--- /dev/null
+++ b/mcs/class/I18N/MidEast/ibm-1089.ucm
@@ -0,0 +1,477 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:47 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00441.RPMAP100 and 044134B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1089"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1089
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A4> \xA4 |0
+<U00AD> \xAD |0
+<U060C> \xAC |0
+<U061B> \xBB |0
+<U061F> \xBF |0
+<U0621> \xC1 |0
+<U0622> \xC2 |0
+<U0623> \xC3 |0
+<U0624> \xC4 |0
+<U0625> \xC5 |0
+<U0626> \xC6 |0
+<U0627> \xC7 |0
+<U0628> \xC8 |0
+<U0629> \xC9 |0
+<U062A> \xCA |0
+<U062B> \xCB |0
+<U062C> \xCC |0
+<U062D> \xCD |0
+<U062E> \xCE |0
+<U062F> \xCF |0
+<U0630> \xD0 |0
+<U0631> \xD1 |0
+<U0632> \xD2 |0
+<U0633> \xD3 |0
+<U0634> \xD4 |0
+<U0635> \xD5 |0
+<U0636> \xD6 |0
+<U0637> \xD7 |0
+<U0638> \xD8 |0
+<U0639> \xD9 |0
+<U063A> \xDA |0
+<U0640> \xE0 |0
+<U0641> \xE1 |0
+<U0642> \xE2 |0
+<U0643> \xE3 |0
+<U0644> \xE4 |0
+<U0645> \xE5 |0
+<U0646> \xE6 |0
+<U0647> \xE7 |0
+<U0648> \xE8 |0
+<U0649> \xE9 |0
+<U064A> \xEA |0
+<U064B> \xEB |0
+<U064C> \xEC |0
+<U064D> \xED |0
+<U064E> \xEE |0
+<U064F> \xEF |0
+<U0650> \xF0 |0
+<U0651> \xF1 |0
+<U0652> \xF2 |0
+<U0660> \x30 |1
+<U0661> \x31 |1
+<U0662> \x32 |1
+<U0663> \x33 |1
+<U0664> \x34 |1
+<U0665> \x35 |1
+<U0666> \x36 |1
+<U0667> \x37 |1
+<U0668> \x38 |1
+<U0669> \x39 |1
+<U066A> \x25 |1
+<U066B> \x2C |1
+<U066C> \x2E |1
+<U066D> \x2A |1
+<UFE70> \xEB |1
+<UFE71> \xEB |1
+<UFE72> \xEC |1
+<UFE74> \xED |1
+<UFE76> \xEE |1
+<UFE77> \xEE |1
+<UFE78> \xEF |1
+<UFE79> \xEF |1
+<UFE7A> \xF0 |1
+<UFE7B> \xF0 |1
+<UFE7C> \xF1 |1
+<UFE7D> \xF1 |1
+<UFE7E> \xF2 |1
+<UFE7F> \xF2 |1
+<UFE80> \xC1 |1
+<UFE81> \xC2 |1
+<UFE82> \xC2 |1
+<UFE83> \xC3 |1
+<UFE84> \xC3 |1
+<UFE85> \xC4 |1
+<UFE86> \xC4 |1
+<UFE87> \xC5 |1
+<UFE88> \xC5 |1
+<UFE89> \xC6 |1
+<UFE8A> \xC6 |1
+<UFE8B> \xC6 |1
+<UFE8C> \xC6 |1
+<UFE8D> \xC7 |1
+<UFE8E> \xC7 |1
+<UFE8F> \xC8 |1
+<UFE90> \xC8 |1
+<UFE91> \xC8 |1
+<UFE92> \xC8 |1
+<UFE93> \xC9 |1
+<UFE94> \xC9 |1
+<UFE95> \xCA |1
+<UFE96> \xCA |1
+<UFE97> \xCA |1
+<UFE98> \xCA |1
+<UFE99> \xCB |1
+<UFE9A> \xCB |1
+<UFE9B> \xCB |1
+<UFE9C> \xCB |1
+<UFE9D> \xCC |1
+<UFE9E> \xCC |1
+<UFE9F> \xCC |1
+<UFEA0> \xCC |1
+<UFEA1> \xCD |1
+<UFEA2> \xCD |1
+<UFEA3> \xCD |1
+<UFEA4> \xCD |1
+<UFEA5> \xCE |1
+<UFEA6> \xCE |1
+<UFEA7> \xCE |1
+<UFEA8> \xCE |1
+<UFEA9> \xCF |1
+<UFEAA> \xCF |1
+<UFEAB> \xD0 |1
+<UFEAC> \xD0 |1
+<UFEAD> \xD1 |1
+<UFEAE> \xD1 |1
+<UFEAF> \xD2 |1
+<UFEB0> \xD2 |1
+<UFEB1> \xD3 |1
+<UFEB2> \xD3 |1
+<UFEB3> \xD3 |1
+<UFEB4> \xD3 |1
+<UFEB5> \xD4 |1
+<UFEB6> \xD4 |1
+<UFEB7> \xD4 |1
+<UFEB8> \xD4 |1
+<UFEB9> \xD5 |1
+<UFEBA> \xD5 |1
+<UFEBB> \xD5 |1
+<UFEBC> \xD5 |1
+<UFEBD> \xD6 |1
+<UFEBE> \xD6 |1
+<UFEBF> \xD6 |1
+<UFEC0> \xD6 |1
+<UFEC1> \xD7 |1
+<UFEC2> \xD7 |1
+<UFEC3> \xD7 |1
+<UFEC4> \xD7 |1
+<UFEC5> \xD8 |1
+<UFEC6> \xD8 |1
+<UFEC7> \xD8 |1
+<UFEC8> \xD8 |1
+<UFEC9> \xD9 |1
+<UFECA> \xD9 |1
+<UFECB> \xD9 |1
+<UFECC> \xD9 |1
+<UFECD> \xDA |1
+<UFECE> \xDA |1
+<UFECF> \xDA |1
+<UFED0> \xDA |1
+<UFED1> \xE1 |1
+<UFED2> \xE1 |1
+<UFED3> \xE1 |1
+<UFED4> \xE1 |1
+<UFED5> \xE2 |1
+<UFED6> \xE2 |1
+<UFED7> \xE2 |1
+<UFED8> \xE2 |1
+<UFED9> \xE3 |1
+<UFEDA> \xE3 |1
+<UFEDB> \xE3 |1
+<UFEDC> \xE3 |1
+<UFEDD> \xE4 |1
+<UFEDE> \xE4 |1
+<UFEDF> \xE4 |1
+<UFEE0> \xE4 |1
+<UFEE1> \xE5 |1
+<UFEE2> \xE5 |1
+<UFEE3> \xE5 |1
+<UFEE4> \xE5 |1
+<UFEE5> \xE6 |1
+<UFEE6> \xE6 |1
+<UFEE7> \xE6 |1
+<UFEE8> \xE6 |1
+<UFEE9> \xE7 |1
+<UFEEA> \xE7 |1
+<UFEEB> \xE7 |1
+<UFEEC> \xE7 |1
+<UFEED> \xE8 |1
+<UFEEE> \xE8 |1
+<UFEEF> \xE9 |1
+<UFEF0> \xE9 |1
+<UFEF1> \xEA |1
+<UFEF2> \xEA |1
+<UFEF3> \xEA |1
+<UFEF4> \xEA |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/MidEast/ibm-5350.ucm b/mcs/class/I18N/MidEast/ibm-5350.ucm
new file mode 100644
index 00000000000..7ee3c6fc82d
--- /dev/null
+++ b/mcs/class/I18N/MidEast/ibm-5350.ucm
@@ -0,0 +1,377 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:45 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B014E6.RPMAP100 and 14E644B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-5350"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-5350
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0081> \x81 |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U00A0> \xA0 |0
+<U00A1> \xA1 |0
+<U00A2> \xA2 |0
+<U00A3> \xA3 |0
+<U00A4> \xA4 |0
+<U00A5> \xA5 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \xA9 |0
+<U00AA> \xAA |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00AF> \xAF |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B4> \xB4 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00B8> \xB8 |0
+<U00B9> \xB9 |0
+<U00BA> \xBA |0
+<U00BB> \xBB |0
+<U00BC> \xBC |0
+<U00BD> \xBD |0
+<U00BE> \xBE |0
+<U00BF> \xBF |0
+<U00C0> \xC0 |0
+<U00C1> \xC1 |0
+<U00C2> \xC2 |0
+<U00C3> \xC3 |0
+<U00C4> \xC4 |0
+<U00C5> \xC5 |0
+<U00C6> \xC6 |0
+<U00C7> \xC7 |0
+<U00C8> \xC8 |0
+<U00C9> \xC9 |0
+<U00CA> \xCA |0
+<U00CB> \xCB |0
+<U00CC> \xCC |0
+<U00CD> \xCD |0
+<U00CE> \xCE |0
+<U00CF> \xCF |0
+<U00D1> \xD1 |0
+<U00D2> \xD2 |0
+<U00D3> \xD3 |0
+<U00D4> \xD4 |0
+<U00D5> \xD5 |0
+<U00D6> \xD6 |0
+<U00D7> \xD7 |0
+<U00D8> \xD8 |0
+<U00D9> \xD9 |0
+<U00DA> \xDA |0
+<U00DB> \xDB |0
+<U00DC> \xDC |0
+<U00DF> \xDF |0
+<U00E0> \xE0 |0
+<U00E1> \xE1 |0
+<U00E2> \xE2 |0
+<U00E3> \xE3 |0
+<U00E4> \xE4 |0
+<U00E5> \xE5 |0
+<U00E6> \xE6 |0
+<U00E7> \xE7 |0
+<U00E8> \xE8 |0
+<U00E9> \xE9 |0
+<U00EA> \xEA |0
+<U00EB> \xEB |0
+<U00EC> \xEC |0
+<U00ED> \xED |0
+<U00EE> \xEE |0
+<U00EF> \xEF |0
+<U00F1> \xF1 |0
+<U00F2> \xF2 |0
+<U00F3> \xF3 |0
+<U00F4> \xF4 |0
+<U00F5> \xF5 |0
+<U00F6> \xF6 |0
+<U00F7> \xF7 |0
+<U00F8> \xF8 |0
+<U00F9> \xF9 |0
+<U00FA> \xFA |0
+<U00FB> \xFB |0
+<U00FC> \xFC |0
+<U00FF> \xFF |0
+<U011E> \xD0 |0
+<U011F> \xF0 |0
+<U0130> \xDD |0
+<U0131> \xFD |0
+<U0152> \x8C |0
+<U0153> \x9C |0
+<U015E> \xDE |0
+<U015F> \xFE |0
+<U0160> \x8A |0
+<U0161> \x9A |0
+<U0178> \x9F |0
+<U0192> \x83 |0
+<U02C6> \x88 |0
+<U02DC> \x98 |0
+<U2013> \x96 |0
+<U2014> \x97 |0
+<U2018> \x91 |0
+<U2019> \x92 |0
+<U201A> \x82 |0
+<U201C> \x93 |0
+<U201D> \x94 |0
+<U201E> \x84 |0
+<U2020> \x86 |0
+<U2021> \x87 |0
+<U2022> \x95 |0
+<U2026> \x85 |0
+<U2030> \x89 |0
+<U2039> \x8B |0
+<U203A> \x9B |0
+<U20AC> \x80 |0
+<U2122> \x99 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/MidEast/ibm-5351.ucm b/mcs/class/I18N/MidEast/ibm-5351.ucm
new file mode 100644
index 00000000000..c341195d357
--- /dev/null
+++ b/mcs/class/I18N/MidEast/ibm-5351.ucm
@@ -0,0 +1,368 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2001, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:45 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B014E7.RPMAP100 and 14E744B0.TPMAP100
+#
+# Patched for jitterbug 792
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-5351"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-5351
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0081> \x81 |0
+<U008A> \x8A |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U009A> \x9A |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A1> \xA1 |0
+<U00A2> \xA2 |0
+<U00A3> \xA3 |0
+<U00A5> \xA5 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \xA9 |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00AF> \xAF |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B4> \xB4 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00B8> \xB8 |0
+<U00B9> \xB9 |0
+<U00BB> \xBB |0
+<U00BC> \xBC |0
+<U00BD> \xBD |0
+<U00BE> \xBE |0
+<U00BF> \xBF |0
+<U00D7> \xAA |0
+<U00F7> \xBA |0
+<U0192> \x83 |0
+<U02C6> \x88 |0
+<U02DC> \x98 |0
+<U05B0> \xC0 |0
+<U05B1> \xC1 |0
+<U05B2> \xC2 |0
+<U05B3> \xC3 |0
+<U05B4> \xC4 |0
+<U05B5> \xC5 |0
+<U05B6> \xC6 |0
+<U05B7> \xC7 |0
+<U05B8> \xC8 |0
+<U05B9> \xC9 |0
+<U05BB> \xCB |0
+<U05BC> \xCC |0
+<U05BD> \xCD |0
+<U05BE> \xCE |0
+<U05BF> \xCF |0
+<U05C0> \xD0 |0
+<U05C1> \xD1 |0
+<U05C2> \xD2 |0
+<U05C3> \xD3 |0
+<U05D0> \xE0 |0
+<U05D1> \xE1 |0
+<U05D2> \xE2 |0
+<U05D3> \xE3 |0
+<U05D4> \xE4 |0
+<U05D5> \xE5 |0
+<U05D6> \xE6 |0
+<U05D7> \xE7 |0
+<U05D8> \xE8 |0
+<U05D9> \xE9 |0
+<U05DA> \xEA |0
+<U05DB> \xEB |0
+<U05DC> \xEC |0
+<U05DD> \xED |0
+<U05DE> \xEE |0
+<U05DF> \xEF |0
+<U05E0> \xF0 |0
+<U05E1> \xF1 |0
+<U05E2> \xF2 |0
+<U05E3> \xF3 |0
+<U05E4> \xF4 |0
+<U05E5> \xF5 |0
+<U05E6> \xF6 |0
+<U05E7> \xF7 |0
+<U05E8> \xF8 |0
+<U05E9> \xF9 |0
+<U05EA> \xFA |0
+<U05F0> \xD4 |0
+<U05F1> \xD5 |0
+<U05F2> \xD6 |0
+<U05F3> \xD7 |0
+<U05F4> \xD8 |0
+<U200E> \xFD |0
+<U200F> \xFE |0
+<U2013> \x96 |0
+<U2014> \x97 |0
+<U2018> \x91 |0
+<U2019> \x92 |0
+<U201A> \x82 |0
+<U201C> \x93 |0
+<U201D> \x94 |0
+<U201E> \x84 |0
+<U2020> \x86 |0
+<U2021> \x87 |0
+<U2022> \x95 |0
+<U2026> \x85 |0
+<U2030> \x89 |0
+<U2039> \x8B |0
+<U203A> \x9B |0
+<U20AA> \xA4 |0
+<U20AC> \x80 |0
+<U2122> \x99 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/MidEast/ibm-5352.ucm b/mcs/class/I18N/MidEast/ibm-5352.ucm
new file mode 100644
index 00000000000..63fa0ab7975
--- /dev/null
+++ b/mcs/class/I18N/MidEast/ibm-5352.ucm
@@ -0,0 +1,551 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2001, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:45 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B014E8.RPMAP100 and 14E844B0.TPMAP100
+#
+# Patched for jitterbug 792
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-5352"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-5352
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U00A0> \xA0 |0
+<U00A2> \xA2 |0
+<U00A3> \xA3 |0
+<U00A4> \xA4 |0
+<U00A5> \xA5 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \xA9 |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00AF> \xAF |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B4> \xB4 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00B8> \xB8 |0
+<U00B9> \xB9 |0
+<U00BB> \xBB |0
+<U00BC> \xBC |0
+<U00BD> \xBD |0
+<U00BE> \xBE |0
+<U00D7> \xD7 |0
+<U00E0> \xE0 |0
+<U00E2> \xE2 |0
+<U00E7> \xE7 |0
+<U00E8> \xE8 |0
+<U00E9> \xE9 |0
+<U00EA> \xEA |0
+<U00EB> \xEB |0
+<U00EE> \xEE |0
+<U00EF> \xEF |0
+<U00F4> \xF4 |0
+<U00F7> \xF7 |0
+<U00F9> \xF9 |0
+<U00FB> \xFB |0
+<U00FC> \xFC |0
+<U0152> \x8C |0
+<U0153> \x9C |0
+<U0192> \x83 |0
+<U02C6> \x88 |0
+<U060C> \xA1 |0
+<U061B> \xBA |0
+<U061F> \xBF |0
+<U0621> \xC1 |0
+<U0622> \xC2 |0
+<U0623> \xC3 |0
+<U0624> \xC4 |0
+<U0625> \xC5 |0
+<U0626> \xC6 |0
+<U0627> \xC7 |0
+<U0628> \xC8 |0
+<U0629> \xC9 |0
+<U062A> \xCA |0
+<U062B> \xCB |0
+<U062C> \xCC |0
+<U062D> \xCD |0
+<U062E> \xCE |0
+<U062F> \xCF |0
+<U0630> \xD0 |0
+<U0631> \xD1 |0
+<U0632> \xD2 |0
+<U0633> \xD3 |0
+<U0634> \xD4 |0
+<U0635> \xD5 |0
+<U0636> \xD6 |0
+<U0637> \xD8 |0
+<U0638> \xD9 |0
+<U0639> \xDA |0
+<U063A> \xDB |0
+<U0640> \xDC |0
+<U0641> \xDD |0
+<U0642> \xDE |0
+<U0643> \xDF |0
+<U0644> \xE1 |0
+<U0645> \xE3 |0
+<U0646> \xE4 |0
+<U0647> \xE5 |0
+<U0648> \xE6 |0
+<U0649> \xEC |0
+<U064A> \xED |0
+<U064B> \xF0 |0
+<U064C> \xF1 |0
+<U064D> \xF2 |0
+<U064E> \xF3 |0
+<U064F> \xF5 |0
+<U0650> \xF6 |0
+<U0651> \xF8 |0
+<U0652> \xFA |0
+<U0660> \x30 |1
+<U0661> \x31 |1
+<U0662> \x32 |1
+<U0663> \x33 |1
+<U0664> \x34 |1
+<U0665> \x35 |1
+<U0666> \x36 |1
+<U0667> \x37 |1
+<U0668> \x38 |1
+<U0669> \x39 |1
+<U066B> \x2C |1
+<U066C> \x2E |1
+<U0679> \x8A |0
+<U067E> \x81 |0
+<U0686> \x8D |0
+<U0688> \x8F |0
+<U0691> \x9A |0
+<U0698> \x8E |0
+<U06A9> \x98 |0
+<U06AF> \x90 |0
+<U06BA> \x9F |0
+<U06BE> \xAA |0
+<U06C1> \xC0 |0
+<U06D2> \xFF |0
+<U06F0> \x30 |1
+<U06F1> \x31 |1
+<U06F2> \x32 |1
+<U06F3> \x33 |1
+<U06F4> \x34 |1
+<U06F5> \x35 |1
+<U06F6> \x36 |1
+<U06F7> \x37 |1
+<U06F8> \x38 |1
+<U06F9> \x39 |1
+<U200C> \x9D |0
+<U200D> \x9E |0
+<U200E> \xFD |0
+<U200F> \xFE |0
+<U2013> \x96 |0
+<U2014> \x97 |0
+<U2018> \x91 |0
+<U2019> \x92 |0
+<U201A> \x82 |0
+<U201C> \x93 |0
+<U201D> \x94 |0
+<U201E> \x84 |0
+<U2020> \x86 |0
+<U2021> \x87 |0
+<U2022> \x95 |0
+<U2026> \x85 |0
+<U2030> \x89 |0
+<U2039> \x8B |0
+<U203A> \x9B |0
+<U20AC> \x80 |0
+<U2122> \x99 |0
+<UFB56> \x81 |1
+<UFB58> \x81 |1
+<UFB66> \x8A |1
+<UFB68> \x8A |1
+<UFB7A> \x8D |1
+<UFB7C> \x8D |1
+<UFB88> \x8F |1
+<UFB8A> \x8E |1
+<UFB8C> \x9A |1
+<UFB8E> \x98 |1
+<UFB90> \x98 |1
+<UFB92> \x90 |1
+<UFB94> \x90 |1
+<UFB9E> \x9F |1
+<UFBA6> \xC0 |1
+<UFBA8> \xC0 |1
+<UFBAA> \xAA |1
+<UFBAC> \xAA |1
+<UFBAE> \xFF |1
+<UFE70> \xF0 |1
+<UFE71> \xF0 |1
+<UFE72> \xF1 |1
+<UFE74> \xF2 |1
+<UFE76> \xF3 |1
+<UFE77> \xF3 |1
+<UFE78> \xF5 |1
+<UFE79> \xF5 |1
+<UFE7A> \xF6 |1
+<UFE7B> \xF6 |1
+<UFE7C> \xF8 |1
+<UFE7D> \xF8 |1
+<UFE7E> \xFA |1
+<UFE7F> \xFA |1
+<UFE80> \xC1 |1
+<UFE81> \xC2 |1
+<UFE82> \xC2 |1
+<UFE83> \xC3 |1
+<UFE84> \xC3 |1
+<UFE85> \xC4 |1
+<UFE86> \xC4 |1
+<UFE87> \xC5 |1
+<UFE88> \xC5 |1
+<UFE89> \xC6 |1
+<UFE8A> \xC6 |1
+<UFE8B> \xC6 |1
+<UFE8C> \xC6 |1
+<UFE8D> \xC7 |1
+<UFE8E> \xC7 |1
+<UFE8F> \xC8 |1
+<UFE90> \xC8 |1
+<UFE91> \xC8 |1
+<UFE92> \xC8 |1
+<UFE93> \xC9 |1
+<UFE94> \xC9 |1
+<UFE95> \xCA |1
+<UFE96> \xCA |1
+<UFE97> \xCA |1
+<UFE98> \xCA |1
+<UFE99> \xCB |1
+<UFE9A> \xCB |1
+<UFE9B> \xCB |1
+<UFE9C> \xCB |1
+<UFE9D> \xCC |1
+<UFE9E> \xCC |1
+<UFE9F> \xCC |1
+<UFEA0> \xCC |1
+<UFEA1> \xCD |1
+<UFEA2> \xCD |1
+<UFEA3> \xCD |1
+<UFEA4> \xCD |1
+<UFEA5> \xCE |1
+<UFEA6> \xCE |1
+<UFEA7> \xCE |1
+<UFEA8> \xCE |1
+<UFEA9> \xCF |1
+<UFEAA> \xCF |1
+<UFEAB> \xD0 |1
+<UFEAC> \xD0 |1
+<UFEAD> \xD1 |1
+<UFEAE> \xD1 |1
+<UFEAF> \xD2 |1
+<UFEB0> \xD2 |1
+<UFEB1> \xD3 |1
+<UFEB2> \xD3 |1
+<UFEB3> \xD3 |1
+<UFEB4> \xD3 |1
+<UFEB5> \xD4 |1
+<UFEB6> \xD4 |1
+<UFEB7> \xD4 |1
+<UFEB8> \xD4 |1
+<UFEB9> \xD5 |1
+<UFEBA> \xD5 |1
+<UFEBB> \xD5 |1
+<UFEBC> \xD5 |1
+<UFEBD> \xD6 |1
+<UFEBE> \xD6 |1
+<UFEBF> \xD6 |1
+<UFEC0> \xD6 |1
+<UFEC1> \xD8 |1
+<UFEC2> \xD8 |1
+<UFEC3> \xD8 |1
+<UFEC4> \xD8 |1
+<UFEC5> \xD9 |1
+<UFEC6> \xD9 |1
+<UFEC7> \xD9 |1
+<UFEC8> \xD9 |1
+<UFEC9> \xDA |1
+<UFECA> \xDA |1
+<UFECB> \xDA |1
+<UFECC> \xDA |1
+<UFECD> \xDB |1
+<UFECE> \xDB |1
+<UFECF> \xDB |1
+<UFED0> \xDB |1
+<UFED1> \xDD |1
+<UFED2> \xDD |1
+<UFED3> \xDD |1
+<UFED4> \xDD |1
+<UFED5> \xDE |1
+<UFED6> \xDE |1
+<UFED7> \xDE |1
+<UFED8> \xDE |1
+<UFED9> \xDF |1
+<UFEDA> \xDF |1
+<UFEDB> \xDF |1
+<UFEDC> \xDF |1
+<UFEDD> \xE1 |1
+<UFEDE> \xE1 |1
+<UFEDF> \xE1 |1
+<UFEE0> \xE1 |1
+<UFEE1> \xE3 |1
+<UFEE2> \xE3 |1
+<UFEE3> \xE3 |1
+<UFEE4> \xE3 |1
+<UFEE5> \xE4 |1
+<UFEE6> \xE4 |1
+<UFEE7> \xE4 |1
+<UFEE8> \xE4 |1
+<UFEE9> \xE5 |1
+<UFEEA> \xE5 |1
+<UFEEB> \xE5 |1
+<UFEEC> \xE5 |1
+<UFEED> \xE6 |1
+<UFEEE> \xE6 |1
+<UFEEF> \xEC |1
+<UFEF0> \xEC |1
+<UFEF1> \xED |1
+<UFEF2> \xED |1
+<UFEF3> \xED |1
+<UFEF4> \xED |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/MidEast/ibm-916.ucm b/mcs/class/I18N/MidEast/ibm-916.ucm
new file mode 100644
index 00000000000..26408070225
--- /dev/null
+++ b/mcs/class/I18N/MidEast/ibm-916.ucm
@@ -0,0 +1,339 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:04 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00394.RPMAP100 and 039434B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-916"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-916
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A2> \xA2 |0
+<U00A3> \xA3 |0
+<U00A4> \xA4 |0
+<U00A5> \xA5 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \xA9 |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B4> \xB4 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B8> \xB8 |0
+<U00B9> \xB9 |0
+<U00BB> \xBB |0
+<U00BC> \xBC |0
+<U00BD> \xBD |0
+<U00BE> \xBE |0
+<U00D7> \xAA |0
+<U00F7> \xBA |0
+<U05D0> \xE0 |0
+<U05D1> \xE1 |0
+<U05D2> \xE2 |0
+<U05D3> \xE3 |0
+<U05D4> \xE4 |0
+<U05D5> \xE5 |0
+<U05D6> \xE6 |0
+<U05D7> \xE7 |0
+<U05D8> \xE8 |0
+<U05D9> \xE9 |0
+<U05DA> \xEA |0
+<U05DB> \xEB |0
+<U05DC> \xEC |0
+<U05DD> \xED |0
+<U05DE> \xEE |0
+<U05DF> \xEF |0
+<U05E0> \xF0 |0
+<U05E1> \xF1 |0
+<U05E2> \xF2 |0
+<U05E3> \xF3 |0
+<U05E4> \xF4 |0
+<U05E5> \xF5 |0
+<U05E6> \xF6 |0
+<U05E7> \xF7 |0
+<U05E8> \xF8 |0
+<U05E9> \xF9 |0
+<U05EA> \xFA |0
+<U2017> \xDF |0
+<U2022> \xB7 |0
+<U203E> \xAF |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/MidEast/ibm-920.ucm b/mcs/class/I18N/MidEast/ibm-920.ucm
new file mode 100644
index 00000000000..c1c01aad48c
--- /dev/null
+++ b/mcs/class/I18N/MidEast/ibm-920.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:04 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00398.RPMAP100 and 039834B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-920"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-920
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A1> \xA1 |0
+<U00A2> \xA2 |0
+<U00A3> \xA3 |0
+<U00A4> \xA4 |0
+<U00A5> \xA5 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \xA9 |0
+<U00AA> \xAA |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00AF> \xAF |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B4> \xB4 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00B8> \xB8 |0
+<U00B9> \xB9 |0
+<U00BA> \xBA |0
+<U00BB> \xBB |0
+<U00BC> \xBC |0
+<U00BD> \xBD |0
+<U00BE> \xBE |0
+<U00BF> \xBF |0
+<U00C0> \xC0 |0
+<U00C1> \xC1 |0
+<U00C2> \xC2 |0
+<U00C3> \xC3 |0
+<U00C4> \xC4 |0
+<U00C5> \xC5 |0
+<U00C6> \xC6 |0
+<U00C7> \xC7 |0
+<U00C8> \xC8 |0
+<U00C9> \xC9 |0
+<U00CA> \xCA |0
+<U00CB> \xCB |0
+<U00CC> \xCC |0
+<U00CD> \xCD |0
+<U00CE> \xCE |0
+<U00CF> \xCF |0
+<U00D1> \xD1 |0
+<U00D2> \xD2 |0
+<U00D3> \xD3 |0
+<U00D4> \xD4 |0
+<U00D5> \xD5 |0
+<U00D6> \xD6 |0
+<U00D7> \xD7 |0
+<U00D8> \xD8 |0
+<U00D9> \xD9 |0
+<U00DA> \xDA |0
+<U00DB> \xDB |0
+<U00DC> \xDC |0
+<U00DF> \xDF |0
+<U00E0> \xE0 |0
+<U00E1> \xE1 |0
+<U00E2> \xE2 |0
+<U00E3> \xE3 |0
+<U00E4> \xE4 |0
+<U00E5> \xE5 |0
+<U00E6> \xE6 |0
+<U00E7> \xE7 |0
+<U00E8> \xE8 |0
+<U00E9> \xE9 |0
+<U00EA> \xEA |0
+<U00EB> \xEB |0
+<U00EC> \xEC |0
+<U00ED> \xED |0
+<U00EE> \xEE |0
+<U00EF> \xEF |0
+<U00F1> \xF1 |0
+<U00F2> \xF2 |0
+<U00F3> \xF3 |0
+<U00F4> \xF4 |0
+<U00F5> \xF5 |0
+<U00F6> \xF6 |0
+<U00F7> \xF7 |0
+<U00F8> \xF8 |0
+<U00F9> \xF9 |0
+<U00FA> \xFA |0
+<U00FB> \xFB |0
+<U00FC> \xFC |0
+<U00FF> \xFF |0
+<U011E> \xD0 |0
+<U011F> \xF0 |0
+<U0130> \xDD |0
+<U0131> \xFD |0
+<U015E> \xDE |0
+<U015F> \xFE |0
+<U203E> \xAF |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/MidEast/list.unix b/mcs/class/I18N/MidEast/list.unix
new file mode 100755
index 00000000000..c50c67355cb
--- /dev/null
+++ b/mcs/class/I18N/MidEast/list.unix
@@ -0,0 +1,7 @@
+CP1254.cs
+CP1255.cs
+CP1256.cs
+CP28596.cs
+CP28598.cs
+CP28599.cs
+CP38598.cs
diff --git a/mcs/class/I18N/MidEast/makefile.gnu b/mcs/class/I18N/MidEast/makefile.gnu
new file mode 100755
index 00000000000..315da214672
--- /dev/null
+++ b/mcs/class/I18N/MidEast/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../../..
+
+LIBRARY = ../../lib/I18N.MidEast.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib -r mscorlib -r I18N
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=
+
+export MONO_PATH_PREFIX = ../../lib:
+
+include ../../library.make
diff --git a/mcs/class/I18N/Other/CP1251.cs b/mcs/class/I18N/Other/CP1251.cs
new file mode 100644
index 00000000000..a160145c4bd
--- /dev/null
+++ b/mcs/class/I18N/Other/CP1251.cs
@@ -0,0 +1,403 @@
+/*
+ * CP1251.cs - Cyrillic (Windows) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-5347.ucm".
+
+namespace I18N.Other
+{
+
+using System;
+using I18N.Common;
+
+public class CP1251 : ByteEncoding
+{
+	public CP1251()
+		: base(1251, ToChars, "Cyrillic (Windows)",
+		       "koi8-r", "windows-1251", "windows-1251",
+		       true, true, true, true, 1251)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0402', '\u0403', '\u201A', '\u0453', 
+		'\u201E', '\u2026', '\u2020', '\u2021', '\u20AC', '\u2030', 
+		'\u0409', '\u2039', '\u040A', '\u040C', '\u040B', '\u040F', 
+		'\u0452', '\u2018', '\u2019', '\u201C', '\u201D', '\u2022', 
+		'\u2013', '\u2014', '\u0098', '\u2122', '\u0459', '\u203A', 
+		'\u045A', '\u045C', '\u045B', '\u045F', '\u00A0', '\u040E', 
+		'\u045E', '\u0408', '\u00A4', '\u0490', '\u00A6', '\u00A7', 
+		'\u0401', '\u00A9', '\u0404', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u0407', '\u00B0', '\u00B1', '\u0406', '\u0456', 
+		'\u0491', '\u00B5', '\u00B6', '\u00B7', '\u0451', '\u2116', 
+		'\u0454', '\u00BB', '\u0458', '\u0405', '\u0455', '\u0457', 
+		'\u0410', '\u0411', '\u0412', '\u0413', '\u0414', '\u0415', 
+		'\u0416', '\u0417', '\u0418', '\u0419', '\u041A', '\u041B', 
+		'\u041C', '\u041D', '\u041E', '\u041F', '\u0420', '\u0421', 
+		'\u0422', '\u0423', '\u0424', '\u0425', '\u0426', '\u0427', 
+		'\u0428', '\u0429', '\u042A', '\u042B', '\u042C', '\u042D', 
+		'\u042E', '\u042F', '\u0430', '\u0431', '\u0432', '\u0433', 
+		'\u0434', '\u0435', '\u0436', '\u0437', '\u0438', '\u0439', 
+		'\u043A', '\u043B', '\u043C', '\u043D', '\u043E', '\u043F', 
+		'\u0440', '\u0441', '\u0442', '\u0443', '\u0444', '\u0445', 
+		'\u0446', '\u0447', '\u0448', '\u0449', '\u044A', '\u044B', 
+		'\u044C', '\u044D', '\u044E', '\u044F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0098:
+				case 0x00A0:
+				case 0x00A4:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00BB:
+					break;
+				case 0x0401: ch = 0xA8; break;
+				case 0x0402: ch = 0x80; break;
+				case 0x0403: ch = 0x81; break;
+				case 0x0404: ch = 0xAA; break;
+				case 0x0405: ch = 0xBD; break;
+				case 0x0406: ch = 0xB2; break;
+				case 0x0407: ch = 0xAF; break;
+				case 0x0408: ch = 0xA3; break;
+				case 0x0409: ch = 0x8A; break;
+				case 0x040A: ch = 0x8C; break;
+				case 0x040B: ch = 0x8E; break;
+				case 0x040C: ch = 0x8D; break;
+				case 0x040E: ch = 0xA1; break;
+				case 0x040F: ch = 0x8F; break;
+				case 0x0410:
+				case 0x0411:
+				case 0x0412:
+				case 0x0413:
+				case 0x0414:
+				case 0x0415:
+				case 0x0416:
+				case 0x0417:
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+				case 0x041D:
+				case 0x041E:
+				case 0x041F:
+				case 0x0420:
+				case 0x0421:
+				case 0x0422:
+				case 0x0423:
+				case 0x0424:
+				case 0x0425:
+				case 0x0426:
+				case 0x0427:
+				case 0x0428:
+				case 0x0429:
+				case 0x042A:
+				case 0x042B:
+				case 0x042C:
+				case 0x042D:
+				case 0x042E:
+				case 0x042F:
+				case 0x0430:
+				case 0x0431:
+				case 0x0432:
+				case 0x0433:
+				case 0x0434:
+				case 0x0435:
+				case 0x0436:
+				case 0x0437:
+				case 0x0438:
+				case 0x0439:
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+				case 0x0444:
+				case 0x0445:
+				case 0x0446:
+				case 0x0447:
+				case 0x0448:
+				case 0x0449:
+				case 0x044A:
+				case 0x044B:
+				case 0x044C:
+				case 0x044D:
+				case 0x044E:
+				case 0x044F:
+					ch -= 0x0350;
+					break;
+				case 0x0451: ch = 0xB8; break;
+				case 0x0452: ch = 0x90; break;
+				case 0x0453: ch = 0x83; break;
+				case 0x0454: ch = 0xBA; break;
+				case 0x0455: ch = 0xBE; break;
+				case 0x0456: ch = 0xB3; break;
+				case 0x0457: ch = 0xBF; break;
+				case 0x0458: ch = 0xBC; break;
+				case 0x0459: ch = 0x9A; break;
+				case 0x045A: ch = 0x9C; break;
+				case 0x045B: ch = 0x9E; break;
+				case 0x045C: ch = 0x9D; break;
+				case 0x045E: ch = 0xA2; break;
+				case 0x045F: ch = 0x9F; break;
+				case 0x0490: ch = 0xA5; break;
+				case 0x0491: ch = 0xB4; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x88; break;
+				case 0x2116: ch = 0xB9; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0098:
+				case 0x00A0:
+				case 0x00A4:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00BB:
+					break;
+				case 0x0401: ch = 0xA8; break;
+				case 0x0402: ch = 0x80; break;
+				case 0x0403: ch = 0x81; break;
+				case 0x0404: ch = 0xAA; break;
+				case 0x0405: ch = 0xBD; break;
+				case 0x0406: ch = 0xB2; break;
+				case 0x0407: ch = 0xAF; break;
+				case 0x0408: ch = 0xA3; break;
+				case 0x0409: ch = 0x8A; break;
+				case 0x040A: ch = 0x8C; break;
+				case 0x040B: ch = 0x8E; break;
+				case 0x040C: ch = 0x8D; break;
+				case 0x040E: ch = 0xA1; break;
+				case 0x040F: ch = 0x8F; break;
+				case 0x0410:
+				case 0x0411:
+				case 0x0412:
+				case 0x0413:
+				case 0x0414:
+				case 0x0415:
+				case 0x0416:
+				case 0x0417:
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+				case 0x041D:
+				case 0x041E:
+				case 0x041F:
+				case 0x0420:
+				case 0x0421:
+				case 0x0422:
+				case 0x0423:
+				case 0x0424:
+				case 0x0425:
+				case 0x0426:
+				case 0x0427:
+				case 0x0428:
+				case 0x0429:
+				case 0x042A:
+				case 0x042B:
+				case 0x042C:
+				case 0x042D:
+				case 0x042E:
+				case 0x042F:
+				case 0x0430:
+				case 0x0431:
+				case 0x0432:
+				case 0x0433:
+				case 0x0434:
+				case 0x0435:
+				case 0x0436:
+				case 0x0437:
+				case 0x0438:
+				case 0x0439:
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+				case 0x0444:
+				case 0x0445:
+				case 0x0446:
+				case 0x0447:
+				case 0x0448:
+				case 0x0449:
+				case 0x044A:
+				case 0x044B:
+				case 0x044C:
+				case 0x044D:
+				case 0x044E:
+				case 0x044F:
+					ch -= 0x0350;
+					break;
+				case 0x0451: ch = 0xB8; break;
+				case 0x0452: ch = 0x90; break;
+				case 0x0453: ch = 0x83; break;
+				case 0x0454: ch = 0xBA; break;
+				case 0x0455: ch = 0xBE; break;
+				case 0x0456: ch = 0xB3; break;
+				case 0x0457: ch = 0xBF; break;
+				case 0x0458: ch = 0xBC; break;
+				case 0x0459: ch = 0x9A; break;
+				case 0x045A: ch = 0x9C; break;
+				case 0x045B: ch = 0x9E; break;
+				case 0x045C: ch = 0x9D; break;
+				case 0x045E: ch = 0xA2; break;
+				case 0x045F: ch = 0x9F; break;
+				case 0x0490: ch = 0xA5; break;
+				case 0x0491: ch = 0xB4; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x88; break;
+				case 0x2116: ch = 0xB9; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1251
+
+public class ENCwindows_1251 : CP1251
+{
+	public ENCwindows_1251() : base() {}
+
+}; // class ENCwindows_1251
+
+}; // namespace I18N.Other
diff --git a/mcs/class/I18N/Other/CP1257.cs b/mcs/class/I18N/Other/CP1257.cs
new file mode 100644
index 00000000000..cac55af6055
--- /dev/null
+++ b/mcs/class/I18N/Other/CP1257.cs
@@ -0,0 +1,395 @@
+/*
+ * CP1257.cs - Baltic (Windows) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-5353.ucm".
+
+namespace I18N.Other
+{
+
+using System;
+using I18N.Common;
+
+public class CP1257 : ByteEncoding
+{
+	public CP1257()
+		: base(1257, ToChars, "Baltic (Windows)",
+		       "iso-8859-4", "windows-1257", "windows-1257",
+		       true, true, true, true, 1257)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u20AC', '\u0081', '\u201A', '\u0083', 
+		'\u201E', '\u2026', '\u2020', '\u2021', '\u0088', '\u2030', 
+		'\u008A', '\u2039', '\u008C', '\u00A8', '\u02C7', '\u00B8', 
+		'\u0090', '\u2018', '\u2019', '\u201C', '\u201D', '\u2022', 
+		'\u2013', '\u2014', '\u0098', '\u2122', '\u009A', '\u203A', 
+		'\u009C', '\u00AF', '\u02DB', '\u009F', '\u00A0', '\u003F', 
+		'\u00A2', '\u00A3', '\u00A4', '\u003F', '\u00A6', '\u00A7', 
+		'\u00D8', '\u00A9', '\u0156', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u00C6', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u00B4', '\u00B5', '\u00B6', '\u00B7', '\u00F8', '\u00B9', 
+		'\u0157', '\u00BB', '\u00BC', '\u00BD', '\u00BE', '\u00E6', 
+		'\u0104', '\u012E', '\u0100', '\u0106', '\u00C4', '\u00C5', 
+		'\u0118', '\u0112', '\u010C', '\u00C9', '\u0179', '\u0116', 
+		'\u0122', '\u0136', '\u012A', '\u013B', '\u0160', '\u0143', 
+		'\u0145', '\u00D3', '\u014C', '\u00D5', '\u00D6', '\u00D7', 
+		'\u0172', '\u0141', '\u015A', '\u016A', '\u00DC', '\u017B', 
+		'\u017D', '\u00DF', '\u0105', '\u012F', '\u0101', '\u0107', 
+		'\u00E4', '\u00E5', '\u0119', '\u0113', '\u010D', '\u00E9', 
+		'\u017A', '\u0117', '\u0123', '\u0137', '\u012B', '\u013C', 
+		'\u0161', '\u0144', '\u0146', '\u00F3', '\u014D', '\u00F5', 
+		'\u00F6', '\u00F7', '\u0173', '\u0142', '\u015B', '\u016B', 
+		'\u00FC', '\u017C', '\u017E', '\u02D9', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x0083:
+				case 0x0088:
+				case 0x008A:
+				case 0x008C:
+				case 0x0090:
+				case 0x0098:
+				case 0x009A:
+				case 0x009C:
+				case 0x009F:
+				case 0x00A0:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B9:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C9:
+				case 0x00D3:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E9:
+				case 0x00F3:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00FC:
+					break;
+				case 0x00A8: ch = 0x8D; break;
+				case 0x00AF: ch = 0x9D; break;
+				case 0x00B8: ch = 0x8F; break;
+				case 0x00C6: ch = 0xAF; break;
+				case 0x00D8: ch = 0xA8; break;
+				case 0x00E6: ch = 0xBF; break;
+				case 0x00F8: ch = 0xB8; break;
+				case 0x0100: ch = 0xC2; break;
+				case 0x0101: ch = 0xE2; break;
+				case 0x0104: ch = 0xC0; break;
+				case 0x0105: ch = 0xE0; break;
+				case 0x0106: ch = 0xC3; break;
+				case 0x0107: ch = 0xE3; break;
+				case 0x010C: ch = 0xC8; break;
+				case 0x010D: ch = 0xE8; break;
+				case 0x0112: ch = 0xC7; break;
+				case 0x0113: ch = 0xE7; break;
+				case 0x0116: ch = 0xCB; break;
+				case 0x0117: ch = 0xEB; break;
+				case 0x0118: ch = 0xC6; break;
+				case 0x0119: ch = 0xE6; break;
+				case 0x0122: ch = 0xCC; break;
+				case 0x0123: ch = 0xEC; break;
+				case 0x012A: ch = 0xCE; break;
+				case 0x012B: ch = 0xEE; break;
+				case 0x012E: ch = 0xC1; break;
+				case 0x012F: ch = 0xE1; break;
+				case 0x0136: ch = 0xCD; break;
+				case 0x0137: ch = 0xED; break;
+				case 0x013B: ch = 0xCF; break;
+				case 0x013C: ch = 0xEF; break;
+				case 0x0141: ch = 0xD9; break;
+				case 0x0142: ch = 0xF9; break;
+				case 0x0143: ch = 0xD1; break;
+				case 0x0144: ch = 0xF1; break;
+				case 0x0145: ch = 0xD2; break;
+				case 0x0146: ch = 0xF2; break;
+				case 0x014C: ch = 0xD4; break;
+				case 0x014D: ch = 0xF4; break;
+				case 0x0156: ch = 0xAA; break;
+				case 0x0157: ch = 0xBA; break;
+				case 0x015A: ch = 0xDA; break;
+				case 0x015B: ch = 0xFA; break;
+				case 0x0160: ch = 0xD0; break;
+				case 0x0161: ch = 0xF0; break;
+				case 0x016A: ch = 0xDB; break;
+				case 0x016B: ch = 0xFB; break;
+				case 0x0172: ch = 0xD8; break;
+				case 0x0173: ch = 0xF8; break;
+				case 0x0179: ch = 0xCA; break;
+				case 0x017A: ch = 0xEA; break;
+				case 0x017B: ch = 0xDD; break;
+				case 0x017C: ch = 0xFD; break;
+				case 0x017D: ch = 0xDE; break;
+				case 0x017E: ch = 0xFE; break;
+				case 0x02C7: ch = 0x8E; break;
+				case 0x02D9: ch = 0xFF; break;
+				case 0x02DB: ch = 0x9E; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x0083:
+				case 0x0088:
+				case 0x008A:
+				case 0x008C:
+				case 0x0090:
+				case 0x0098:
+				case 0x009A:
+				case 0x009C:
+				case 0x009F:
+				case 0x00A0:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B9:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C9:
+				case 0x00D3:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E9:
+				case 0x00F3:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00FC:
+					break;
+				case 0x00A8: ch = 0x8D; break;
+				case 0x00AF: ch = 0x9D; break;
+				case 0x00B8: ch = 0x8F; break;
+				case 0x00C6: ch = 0xAF; break;
+				case 0x00D8: ch = 0xA8; break;
+				case 0x00E6: ch = 0xBF; break;
+				case 0x00F8: ch = 0xB8; break;
+				case 0x0100: ch = 0xC2; break;
+				case 0x0101: ch = 0xE2; break;
+				case 0x0104: ch = 0xC0; break;
+				case 0x0105: ch = 0xE0; break;
+				case 0x0106: ch = 0xC3; break;
+				case 0x0107: ch = 0xE3; break;
+				case 0x010C: ch = 0xC8; break;
+				case 0x010D: ch = 0xE8; break;
+				case 0x0112: ch = 0xC7; break;
+				case 0x0113: ch = 0xE7; break;
+				case 0x0116: ch = 0xCB; break;
+				case 0x0117: ch = 0xEB; break;
+				case 0x0118: ch = 0xC6; break;
+				case 0x0119: ch = 0xE6; break;
+				case 0x0122: ch = 0xCC; break;
+				case 0x0123: ch = 0xEC; break;
+				case 0x012A: ch = 0xCE; break;
+				case 0x012B: ch = 0xEE; break;
+				case 0x012E: ch = 0xC1; break;
+				case 0x012F: ch = 0xE1; break;
+				case 0x0136: ch = 0xCD; break;
+				case 0x0137: ch = 0xED; break;
+				case 0x013B: ch = 0xCF; break;
+				case 0x013C: ch = 0xEF; break;
+				case 0x0141: ch = 0xD9; break;
+				case 0x0142: ch = 0xF9; break;
+				case 0x0143: ch = 0xD1; break;
+				case 0x0144: ch = 0xF1; break;
+				case 0x0145: ch = 0xD2; break;
+				case 0x0146: ch = 0xF2; break;
+				case 0x014C: ch = 0xD4; break;
+				case 0x014D: ch = 0xF4; break;
+				case 0x0156: ch = 0xAA; break;
+				case 0x0157: ch = 0xBA; break;
+				case 0x015A: ch = 0xDA; break;
+				case 0x015B: ch = 0xFA; break;
+				case 0x0160: ch = 0xD0; break;
+				case 0x0161: ch = 0xF0; break;
+				case 0x016A: ch = 0xDB; break;
+				case 0x016B: ch = 0xFB; break;
+				case 0x0172: ch = 0xD8; break;
+				case 0x0173: ch = 0xF8; break;
+				case 0x0179: ch = 0xCA; break;
+				case 0x017A: ch = 0xEA; break;
+				case 0x017B: ch = 0xDD; break;
+				case 0x017C: ch = 0xFD; break;
+				case 0x017D: ch = 0xDE; break;
+				case 0x017E: ch = 0xFE; break;
+				case 0x02C7: ch = 0x8E; break;
+				case 0x02D9: ch = 0xFF; break;
+				case 0x02DB: ch = 0x9E; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1257
+
+public class ENCwindows_1257 : CP1257
+{
+	public ENCwindows_1257() : base() {}
+
+}; // class ENCwindows_1257
+
+}; // namespace I18N.Other
diff --git a/mcs/class/I18N/Other/CP1258.cs b/mcs/class/I18N/Other/CP1258.cs
new file mode 100644
index 00000000000..afd266e44ca
--- /dev/null
+++ b/mcs/class/I18N/Other/CP1258.cs
@@ -0,0 +1,399 @@
+/*
+ * CP1258.cs - Vietnamese (Windows) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-5354.ucm".
+
+namespace I18N.Other
+{
+
+using System;
+using I18N.Common;
+
+public class CP1258 : ByteEncoding
+{
+	public CP1258()
+		: base(1258, ToChars, "Vietnamese (Windows)",
+		       "windows-1258", "windows-1258", "windows-1258",
+		       true, true, true, true, 1258)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u20AC', '\u0081', '\u201A', '\u0192', 
+		'\u201E', '\u2026', '\u2020', '\u2021', '\u02C6', '\u2030', 
+		'\u008A', '\u2039', '\u0152', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u2018', '\u2019', '\u201C', '\u201D', '\u2022', 
+		'\u2013', '\u2014', '\u02DC', '\u2122', '\u009A', '\u203A', 
+		'\u0153', '\u009D', '\u009E', '\u0178', '\u00A0', '\u00A1', 
+		'\u00A2', '\u00A3', '\u00A4', '\u00A5', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u00AA', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u00AF', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u00B4', '\u00B5', '\u00B6', '\u00B7', '\u00B8', '\u00B9', 
+		'\u00BA', '\u00BB', '\u00BC', '\u00BD', '\u00BE', '\u00BF', 
+		'\u00C0', '\u00C1', '\u00C2', '\u0102', '\u00C4', '\u00C5', 
+		'\u00C6', '\u00C7', '\u00C8', '\u00C9', '\u00CA', '\u00CB', 
+		'\u0300', '\u00CD', '\u00CE', '\u00CF', '\u0110', '\u00D1', 
+		'\u0309', '\u00D3', '\u00D4', '\u01A0', '\u00D6', '\u00D7', 
+		'\u00D8', '\u00D9', '\u00DA', '\u00DB', '\u00DC', '\u01AF', 
+		'\u0303', '\u00DF', '\u00E0', '\u00E1', '\u00E2', '\u0103', 
+		'\u00E4', '\u00E5', '\u00E6', '\u00E7', '\u00E8', '\u00E9', 
+		'\u00EA', '\u00EB', '\u0301', '\u00ED', '\u00EE', '\u00EF', 
+		'\u0111', '\u00F1', '\u0323', '\u00F3', '\u00F4', '\u01A1', 
+		'\u00F6', '\u00F7', '\u00F8', '\u00F9', '\u00FA', '\u00FB', 
+		'\u00FC', '\u01B0', '\u20AB', '\u00FF', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x008A:
+				case 0x008D:
+				case 0x008E:
+				case 0x008F:
+				case 0x0090:
+				case 0x009A:
+				case 0x009D:
+				case 0x009E:
+				case 0x00A0:
+				case 0x00A1:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AA:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BA:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00BF:
+				case 0x00C0:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C6:
+				case 0x00C7:
+				case 0x00C8:
+				case 0x00C9:
+				case 0x00CA:
+				case 0x00CB:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00CF:
+				case 0x00D1:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F1:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+				case 0x00FF:
+					break;
+				case 0x0102: ch = 0xC3; break;
+				case 0x0103: ch = 0xE3; break;
+				case 0x0110: ch = 0xD0; break;
+				case 0x0111: ch = 0xF0; break;
+				case 0x0152: ch = 0x8C; break;
+				case 0x0153: ch = 0x9C; break;
+				case 0x0178: ch = 0x9F; break;
+				case 0x0192: ch = 0x83; break;
+				case 0x01A0: ch = 0xD5; break;
+				case 0x01A1: ch = 0xF5; break;
+				case 0x01AF: ch = 0xDD; break;
+				case 0x01B0: ch = 0xFD; break;
+				case 0x02C6: ch = 0x88; break;
+				case 0x02DC: ch = 0x98; break;
+				case 0x0300: ch = 0xCC; break;
+				case 0x0301: ch = 0xEC; break;
+				case 0x0303: ch = 0xDE; break;
+				case 0x0309: ch = 0xD2; break;
+				case 0x0323: ch = 0xF2; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AB: ch = 0xFE; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x008A:
+				case 0x008D:
+				case 0x008E:
+				case 0x008F:
+				case 0x0090:
+				case 0x009A:
+				case 0x009D:
+				case 0x009E:
+				case 0x00A0:
+				case 0x00A1:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AA:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BA:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00BF:
+				case 0x00C0:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C6:
+				case 0x00C7:
+				case 0x00C8:
+				case 0x00C9:
+				case 0x00CA:
+				case 0x00CB:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00CF:
+				case 0x00D1:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F1:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+				case 0x00FF:
+					break;
+				case 0x0102: ch = 0xC3; break;
+				case 0x0103: ch = 0xE3; break;
+				case 0x0110: ch = 0xD0; break;
+				case 0x0111: ch = 0xF0; break;
+				case 0x0152: ch = 0x8C; break;
+				case 0x0153: ch = 0x9C; break;
+				case 0x0178: ch = 0x9F; break;
+				case 0x0192: ch = 0x83; break;
+				case 0x01A0: ch = 0xD5; break;
+				case 0x01A1: ch = 0xF5; break;
+				case 0x01AF: ch = 0xDD; break;
+				case 0x01B0: ch = 0xFD; break;
+				case 0x02C6: ch = 0x88; break;
+				case 0x02DC: ch = 0x98; break;
+				case 0x0300: ch = 0xCC; break;
+				case 0x0301: ch = 0xEC; break;
+				case 0x0303: ch = 0xDE; break;
+				case 0x0309: ch = 0xD2; break;
+				case 0x0323: ch = 0xF2; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AB: ch = 0xFE; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1258
+
+public class ENCwindows_1258 : CP1258
+{
+	public ENCwindows_1258() : base() {}
+
+}; // class ENCwindows_1258
+
+}; // namespace I18N.Other
diff --git a/mcs/class/I18N/Other/CP20866.cs b/mcs/class/I18N/Other/CP20866.cs
new file mode 100644
index 00000000000..f6fe27016dc
--- /dev/null
+++ b/mcs/class/I18N/Other/CP20866.cs
@@ -0,0 +1,429 @@
+/*
+ * CP20866.cs - Cyrillic (KOI8-R) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-878.ucm".
+
+namespace I18N.Other
+{
+
+using System;
+using I18N.Common;
+
+public class CP20866 : ByteEncoding
+{
+	public CP20866()
+		: base(20866, ToChars, "Cyrillic (KOI8-R)",
+		       "koi8-r", "koi8-r", "koi8-r",
+		       true, true, true, true, 1251)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u2500', '\u2502', '\u250C', '\u2510', 
+		'\u2514', '\u2518', '\u251C', '\u2524', '\u252C', '\u2534', 
+		'\u253C', '\u2580', '\u2584', '\u2588', '\u258C', '\u2590', 
+		'\u2591', '\u2592', '\u2593', '\u2320', '\u25A0', '\u2219', 
+		'\u221A', '\u2248', '\u2264', '\u2265', '\u00A0', '\u2321', 
+		'\u00B0', '\u00B2', '\u00B7', '\u00F7', '\u2550', '\u2551', 
+		'\u2552', '\u0451', '\u2553', '\u2554', '\u2555', '\u2556', 
+		'\u2557', '\u2558', '\u2559', '\u255A', '\u255B', '\u255C', 
+		'\u255D', '\u255E', '\u255F', '\u2560', '\u2561', '\u0401', 
+		'\u2562', '\u2563', '\u2564', '\u2565', '\u2566', '\u2567', 
+		'\u2568', '\u2569', '\u256A', '\u256B', '\u256C', '\u00A9', 
+		'\u044E', '\u0430', '\u0431', '\u0446', '\u0434', '\u0435', 
+		'\u0444', '\u0433', '\u0445', '\u0438', '\u0439', '\u043A', 
+		'\u043B', '\u043C', '\u043D', '\u043E', '\u043F', '\u044F', 
+		'\u0440', '\u0441', '\u0442', '\u0443', '\u0436', '\u0432', 
+		'\u044C', '\u044B', '\u0437', '\u0448', '\u044D', '\u0449', 
+		'\u0447', '\u044A', '\u042E', '\u0410', '\u0411', '\u0426', 
+		'\u0414', '\u0415', '\u0424', '\u0413', '\u0425', '\u0418', 
+		'\u0419', '\u041A', '\u041B', '\u041C', '\u041D', '\u041E', 
+		'\u041F', '\u042F', '\u0420', '\u0421', '\u0422', '\u0423', 
+		'\u0416', '\u0412', '\u042C', '\u042B', '\u0417', '\u0428', 
+		'\u042D', '\u0429', '\u0427', '\u042A', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x00A0: ch = 0x9A; break;
+				case 0x00A9: ch = 0xBF; break;
+				case 0x00B0: ch = 0x9C; break;
+				case 0x00B2: ch = 0x9D; break;
+				case 0x00B7: ch = 0x9E; break;
+				case 0x00F7: ch = 0x9F; break;
+				case 0x0401: ch = 0xB3; break;
+				case 0x0410: ch = 0xE1; break;
+				case 0x0411: ch = 0xE2; break;
+				case 0x0412: ch = 0xF7; break;
+				case 0x0413: ch = 0xE7; break;
+				case 0x0414: ch = 0xE4; break;
+				case 0x0415: ch = 0xE5; break;
+				case 0x0416: ch = 0xF6; break;
+				case 0x0417: ch = 0xFA; break;
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+				case 0x041D:
+				case 0x041E:
+				case 0x041F:
+					ch -= 0x032F;
+					break;
+				case 0x0420:
+				case 0x0421:
+				case 0x0422:
+				case 0x0423:
+					ch -= 0x032E;
+					break;
+				case 0x0424: ch = 0xE6; break;
+				case 0x0425: ch = 0xE8; break;
+				case 0x0426: ch = 0xE3; break;
+				case 0x0427: ch = 0xFE; break;
+				case 0x0428: ch = 0xFB; break;
+				case 0x0429: ch = 0xFD; break;
+				case 0x042A: ch = 0xFF; break;
+				case 0x042B: ch = 0xF9; break;
+				case 0x042C: ch = 0xF8; break;
+				case 0x042D: ch = 0xFC; break;
+				case 0x042E: ch = 0xE0; break;
+				case 0x042F: ch = 0xF1; break;
+				case 0x0430: ch = 0xC1; break;
+				case 0x0431: ch = 0xC2; break;
+				case 0x0432: ch = 0xD7; break;
+				case 0x0433: ch = 0xC7; break;
+				case 0x0434: ch = 0xC4; break;
+				case 0x0435: ch = 0xC5; break;
+				case 0x0436: ch = 0xD6; break;
+				case 0x0437: ch = 0xDA; break;
+				case 0x0438:
+				case 0x0439:
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+					ch -= 0x036F;
+					break;
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+					ch -= 0x036E;
+					break;
+				case 0x0444: ch = 0xC6; break;
+				case 0x0445: ch = 0xC8; break;
+				case 0x0446: ch = 0xC3; break;
+				case 0x0447: ch = 0xDE; break;
+				case 0x0448: ch = 0xDB; break;
+				case 0x0449: ch = 0xDD; break;
+				case 0x044A: ch = 0xDF; break;
+				case 0x044B: ch = 0xD9; break;
+				case 0x044C: ch = 0xD8; break;
+				case 0x044D: ch = 0xDC; break;
+				case 0x044E: ch = 0xC0; break;
+				case 0x044F: ch = 0xD1; break;
+				case 0x0451: ch = 0xA3; break;
+				case 0x2219: ch = 0x95; break;
+				case 0x221A: ch = 0x96; break;
+				case 0x2248: ch = 0x97; break;
+				case 0x2264: ch = 0x98; break;
+				case 0x2265: ch = 0x99; break;
+				case 0x2320: ch = 0x93; break;
+				case 0x2321: ch = 0x9B; break;
+				case 0x2500: ch = 0x80; break;
+				case 0x2502: ch = 0x81; break;
+				case 0x250C: ch = 0x82; break;
+				case 0x2510: ch = 0x83; break;
+				case 0x2514: ch = 0x84; break;
+				case 0x2518: ch = 0x85; break;
+				case 0x251C: ch = 0x86; break;
+				case 0x2524: ch = 0x87; break;
+				case 0x252C: ch = 0x88; break;
+				case 0x2534: ch = 0x89; break;
+				case 0x253C: ch = 0x8A; break;
+				case 0x2550: ch = 0xA0; break;
+				case 0x2551: ch = 0xA1; break;
+				case 0x2552: ch = 0xA2; break;
+				case 0x2553:
+				case 0x2554:
+				case 0x2555:
+				case 0x2556:
+				case 0x2557:
+				case 0x2558:
+				case 0x2559:
+				case 0x255A:
+				case 0x255B:
+				case 0x255C:
+				case 0x255D:
+				case 0x255E:
+				case 0x255F:
+				case 0x2560:
+				case 0x2561:
+					ch -= 0x24AF;
+					break;
+				case 0x2562:
+				case 0x2563:
+				case 0x2564:
+				case 0x2565:
+				case 0x2566:
+				case 0x2567:
+				case 0x2568:
+				case 0x2569:
+				case 0x256A:
+				case 0x256B:
+				case 0x256C:
+					ch -= 0x24AE;
+					break;
+				case 0x2580: ch = 0x8B; break;
+				case 0x2584: ch = 0x8C; break;
+				case 0x2588: ch = 0x8D; break;
+				case 0x258C: ch = 0x8E; break;
+				case 0x2590:
+				case 0x2591:
+				case 0x2592:
+				case 0x2593:
+					ch -= 0x2501;
+					break;
+				case 0x25A0: ch = 0x94; break;
+				case 0xFFE8: ch = 0x81; break;
+				case 0xFFED: ch = 0x94; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x00A0: ch = 0x9A; break;
+				case 0x00A9: ch = 0xBF; break;
+				case 0x00B0: ch = 0x9C; break;
+				case 0x00B2: ch = 0x9D; break;
+				case 0x00B7: ch = 0x9E; break;
+				case 0x00F7: ch = 0x9F; break;
+				case 0x0401: ch = 0xB3; break;
+				case 0x0410: ch = 0xE1; break;
+				case 0x0411: ch = 0xE2; break;
+				case 0x0412: ch = 0xF7; break;
+				case 0x0413: ch = 0xE7; break;
+				case 0x0414: ch = 0xE4; break;
+				case 0x0415: ch = 0xE5; break;
+				case 0x0416: ch = 0xF6; break;
+				case 0x0417: ch = 0xFA; break;
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+				case 0x041D:
+				case 0x041E:
+				case 0x041F:
+					ch -= 0x032F;
+					break;
+				case 0x0420:
+				case 0x0421:
+				case 0x0422:
+				case 0x0423:
+					ch -= 0x032E;
+					break;
+				case 0x0424: ch = 0xE6; break;
+				case 0x0425: ch = 0xE8; break;
+				case 0x0426: ch = 0xE3; break;
+				case 0x0427: ch = 0xFE; break;
+				case 0x0428: ch = 0xFB; break;
+				case 0x0429: ch = 0xFD; break;
+				case 0x042A: ch = 0xFF; break;
+				case 0x042B: ch = 0xF9; break;
+				case 0x042C: ch = 0xF8; break;
+				case 0x042D: ch = 0xFC; break;
+				case 0x042E: ch = 0xE0; break;
+				case 0x042F: ch = 0xF1; break;
+				case 0x0430: ch = 0xC1; break;
+				case 0x0431: ch = 0xC2; break;
+				case 0x0432: ch = 0xD7; break;
+				case 0x0433: ch = 0xC7; break;
+				case 0x0434: ch = 0xC4; break;
+				case 0x0435: ch = 0xC5; break;
+				case 0x0436: ch = 0xD6; break;
+				case 0x0437: ch = 0xDA; break;
+				case 0x0438:
+				case 0x0439:
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+					ch -= 0x036F;
+					break;
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+					ch -= 0x036E;
+					break;
+				case 0x0444: ch = 0xC6; break;
+				case 0x0445: ch = 0xC8; break;
+				case 0x0446: ch = 0xC3; break;
+				case 0x0447: ch = 0xDE; break;
+				case 0x0448: ch = 0xDB; break;
+				case 0x0449: ch = 0xDD; break;
+				case 0x044A: ch = 0xDF; break;
+				case 0x044B: ch = 0xD9; break;
+				case 0x044C: ch = 0xD8; break;
+				case 0x044D: ch = 0xDC; break;
+				case 0x044E: ch = 0xC0; break;
+				case 0x044F: ch = 0xD1; break;
+				case 0x0451: ch = 0xA3; break;
+				case 0x2219: ch = 0x95; break;
+				case 0x221A: ch = 0x96; break;
+				case 0x2248: ch = 0x97; break;
+				case 0x2264: ch = 0x98; break;
+				case 0x2265: ch = 0x99; break;
+				case 0x2320: ch = 0x93; break;
+				case 0x2321: ch = 0x9B; break;
+				case 0x2500: ch = 0x80; break;
+				case 0x2502: ch = 0x81; break;
+				case 0x250C: ch = 0x82; break;
+				case 0x2510: ch = 0x83; break;
+				case 0x2514: ch = 0x84; break;
+				case 0x2518: ch = 0x85; break;
+				case 0x251C: ch = 0x86; break;
+				case 0x2524: ch = 0x87; break;
+				case 0x252C: ch = 0x88; break;
+				case 0x2534: ch = 0x89; break;
+				case 0x253C: ch = 0x8A; break;
+				case 0x2550: ch = 0xA0; break;
+				case 0x2551: ch = 0xA1; break;
+				case 0x2552: ch = 0xA2; break;
+				case 0x2553:
+				case 0x2554:
+				case 0x2555:
+				case 0x2556:
+				case 0x2557:
+				case 0x2558:
+				case 0x2559:
+				case 0x255A:
+				case 0x255B:
+				case 0x255C:
+				case 0x255D:
+				case 0x255E:
+				case 0x255F:
+				case 0x2560:
+				case 0x2561:
+					ch -= 0x24AF;
+					break;
+				case 0x2562:
+				case 0x2563:
+				case 0x2564:
+				case 0x2565:
+				case 0x2566:
+				case 0x2567:
+				case 0x2568:
+				case 0x2569:
+				case 0x256A:
+				case 0x256B:
+				case 0x256C:
+					ch -= 0x24AE;
+					break;
+				case 0x2580: ch = 0x8B; break;
+				case 0x2584: ch = 0x8C; break;
+				case 0x2588: ch = 0x8D; break;
+				case 0x258C: ch = 0x8E; break;
+				case 0x2590:
+				case 0x2591:
+				case 0x2592:
+				case 0x2593:
+					ch -= 0x2501;
+					break;
+				case 0x25A0: ch = 0x94; break;
+				case 0xFFE8: ch = 0x81; break;
+				case 0xFFED: ch = 0x94; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20866
+
+public class ENCkoi8_r : CP20866
+{
+	public ENCkoi8_r() : base() {}
+
+}; // class ENCkoi8_r
+
+}; // namespace I18N.Other
diff --git a/mcs/class/I18N/Other/CP21866.cs b/mcs/class/I18N/Other/CP21866.cs
new file mode 100644
index 00000000000..a8caecea347
--- /dev/null
+++ b/mcs/class/I18N/Other/CP21866.cs
@@ -0,0 +1,429 @@
+/*
+ * CP21866.cs - Ukrainian (KOI8-U) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "koi8-u.ucm".
+
+namespace I18N.Other
+{
+
+using System;
+using I18N.Common;
+
+public class CP21866 : ByteEncoding
+{
+	public CP21866()
+		: base(21866, ToChars, "Ukrainian (KOI8-U)",
+		       "koi8-u", "koi8-u", "koi8-u",
+		       true, true, true, true, 1251)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u2500', '\u2502', '\u250C', '\u2510', 
+		'\u2514', '\u2518', '\u251C', '\u2524', '\u252C', '\u2534', 
+		'\u253C', '\u2580', '\u2584', '\u2588', '\u258C', '\u2590', 
+		'\u2591', '\u2592', '\u2593', '\u2320', '\u25A0', '\u2219', 
+		'\u221A', '\u2248', '\u2264', '\u2265', '\u00A0', '\u2321', 
+		'\u00B0', '\u00B2', '\u00B7', '\u00F7', '\u2550', '\u2551', 
+		'\u2552', '\u0451', '\u0454', '\u2554', '\u0456', '\u0457', 
+		'\u2557', '\u2558', '\u2559', '\u255A', '\u255B', '\u0491', 
+		'\u255D', '\u255E', '\u255F', '\u2560', '\u2561', '\u0401', 
+		'\u0404', '\u2563', '\u0406', '\u0407', '\u2566', '\u2567', 
+		'\u2568', '\u2569', '\u256A', '\u0490', '\u256C', '\u00A9', 
+		'\u044E', '\u0430', '\u0431', '\u0446', '\u0434', '\u0435', 
+		'\u0444', '\u0433', '\u0445', '\u0438', '\u0439', '\u043A', 
+		'\u043B', '\u043C', '\u043D', '\u043E', '\u043F', '\u044F', 
+		'\u0440', '\u0441', '\u0442', '\u0443', '\u0436', '\u0432', 
+		'\u044C', '\u044B', '\u0437', '\u0448', '\u044D', '\u0449', 
+		'\u0447', '\u044A', '\u042E', '\u0410', '\u0411', '\u0426', 
+		'\u0414', '\u0415', '\u0424', '\u0413', '\u0425', '\u0418', 
+		'\u0419', '\u041A', '\u041B', '\u041C', '\u041D', '\u041E', 
+		'\u041F', '\u042F', '\u0420', '\u0421', '\u0422', '\u0423', 
+		'\u0416', '\u0412', '\u042C', '\u042B', '\u0417', '\u0428', 
+		'\u042D', '\u0429', '\u0427', '\u042A', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x00A0: ch = 0x9A; break;
+				case 0x00A9: ch = 0xBF; break;
+				case 0x00B0: ch = 0x9C; break;
+				case 0x00B2: ch = 0x9D; break;
+				case 0x00B7: ch = 0x9E; break;
+				case 0x00F7: ch = 0x9F; break;
+				case 0x0401: ch = 0xB3; break;
+				case 0x0404: ch = 0xB4; break;
+				case 0x0406: ch = 0xB6; break;
+				case 0x0407: ch = 0xB7; break;
+				case 0x0410: ch = 0xE1; break;
+				case 0x0411: ch = 0xE2; break;
+				case 0x0412: ch = 0xF7; break;
+				case 0x0413: ch = 0xE7; break;
+				case 0x0414: ch = 0xE4; break;
+				case 0x0415: ch = 0xE5; break;
+				case 0x0416: ch = 0xF6; break;
+				case 0x0417: ch = 0xFA; break;
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+				case 0x041D:
+				case 0x041E:
+				case 0x041F:
+					ch -= 0x032F;
+					break;
+				case 0x0420:
+				case 0x0421:
+				case 0x0422:
+				case 0x0423:
+					ch -= 0x032E;
+					break;
+				case 0x0424: ch = 0xE6; break;
+				case 0x0425: ch = 0xE8; break;
+				case 0x0426: ch = 0xE3; break;
+				case 0x0427: ch = 0xFE; break;
+				case 0x0428: ch = 0xFB; break;
+				case 0x0429: ch = 0xFD; break;
+				case 0x042A: ch = 0xFF; break;
+				case 0x042B: ch = 0xF9; break;
+				case 0x042C: ch = 0xF8; break;
+				case 0x042D: ch = 0xFC; break;
+				case 0x042E: ch = 0xE0; break;
+				case 0x042F: ch = 0xF1; break;
+				case 0x0430: ch = 0xC1; break;
+				case 0x0431: ch = 0xC2; break;
+				case 0x0432: ch = 0xD7; break;
+				case 0x0433: ch = 0xC7; break;
+				case 0x0434: ch = 0xC4; break;
+				case 0x0435: ch = 0xC5; break;
+				case 0x0436: ch = 0xD6; break;
+				case 0x0437: ch = 0xDA; break;
+				case 0x0438:
+				case 0x0439:
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+					ch -= 0x036F;
+					break;
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+					ch -= 0x036E;
+					break;
+				case 0x0444: ch = 0xC6; break;
+				case 0x0445: ch = 0xC8; break;
+				case 0x0446: ch = 0xC3; break;
+				case 0x0447: ch = 0xDE; break;
+				case 0x0448: ch = 0xDB; break;
+				case 0x0449: ch = 0xDD; break;
+				case 0x044A: ch = 0xDF; break;
+				case 0x044B: ch = 0xD9; break;
+				case 0x044C: ch = 0xD8; break;
+				case 0x044D: ch = 0xDC; break;
+				case 0x044E: ch = 0xC0; break;
+				case 0x044F: ch = 0xD1; break;
+				case 0x0451: ch = 0xA3; break;
+				case 0x0454: ch = 0xA4; break;
+				case 0x0456: ch = 0xA6; break;
+				case 0x0457: ch = 0xA7; break;
+				case 0x0490: ch = 0xBD; break;
+				case 0x0491: ch = 0xAD; break;
+				case 0x2219: ch = 0x95; break;
+				case 0x221A: ch = 0x96; break;
+				case 0x2248: ch = 0x97; break;
+				case 0x2264: ch = 0x98; break;
+				case 0x2265: ch = 0x99; break;
+				case 0x2320: ch = 0x93; break;
+				case 0x2321: ch = 0x9B; break;
+				case 0x2500: ch = 0x80; break;
+				case 0x2502: ch = 0x81; break;
+				case 0x250C: ch = 0x82; break;
+				case 0x2510: ch = 0x83; break;
+				case 0x2514: ch = 0x84; break;
+				case 0x2518: ch = 0x85; break;
+				case 0x251C: ch = 0x86; break;
+				case 0x2524: ch = 0x87; break;
+				case 0x252C: ch = 0x88; break;
+				case 0x2534: ch = 0x89; break;
+				case 0x253C: ch = 0x8A; break;
+				case 0x2550: ch = 0xA0; break;
+				case 0x2551: ch = 0xA1; break;
+				case 0x2552: ch = 0xA2; break;
+				case 0x2554: ch = 0xA5; break;
+				case 0x2557:
+				case 0x2558:
+				case 0x2559:
+				case 0x255A:
+				case 0x255B:
+					ch -= 0x24AF;
+					break;
+				case 0x255D:
+				case 0x255E:
+				case 0x255F:
+				case 0x2560:
+				case 0x2561:
+					ch -= 0x24AF;
+					break;
+				case 0x2563: ch = 0xB5; break;
+				case 0x2566:
+				case 0x2567:
+				case 0x2568:
+				case 0x2569:
+				case 0x256A:
+					ch -= 0x24AE;
+					break;
+				case 0x256C: ch = 0xBE; break;
+				case 0x2580: ch = 0x8B; break;
+				case 0x2584: ch = 0x8C; break;
+				case 0x2588: ch = 0x8D; break;
+				case 0x258C: ch = 0x8E; break;
+				case 0x2590:
+				case 0x2591:
+				case 0x2592:
+				case 0x2593:
+					ch -= 0x2501;
+					break;
+				case 0x25A0: ch = 0x94; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x00A0: ch = 0x9A; break;
+				case 0x00A9: ch = 0xBF; break;
+				case 0x00B0: ch = 0x9C; break;
+				case 0x00B2: ch = 0x9D; break;
+				case 0x00B7: ch = 0x9E; break;
+				case 0x00F7: ch = 0x9F; break;
+				case 0x0401: ch = 0xB3; break;
+				case 0x0404: ch = 0xB4; break;
+				case 0x0406: ch = 0xB6; break;
+				case 0x0407: ch = 0xB7; break;
+				case 0x0410: ch = 0xE1; break;
+				case 0x0411: ch = 0xE2; break;
+				case 0x0412: ch = 0xF7; break;
+				case 0x0413: ch = 0xE7; break;
+				case 0x0414: ch = 0xE4; break;
+				case 0x0415: ch = 0xE5; break;
+				case 0x0416: ch = 0xF6; break;
+				case 0x0417: ch = 0xFA; break;
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+				case 0x041D:
+				case 0x041E:
+				case 0x041F:
+					ch -= 0x032F;
+					break;
+				case 0x0420:
+				case 0x0421:
+				case 0x0422:
+				case 0x0423:
+					ch -= 0x032E;
+					break;
+				case 0x0424: ch = 0xE6; break;
+				case 0x0425: ch = 0xE8; break;
+				case 0x0426: ch = 0xE3; break;
+				case 0x0427: ch = 0xFE; break;
+				case 0x0428: ch = 0xFB; break;
+				case 0x0429: ch = 0xFD; break;
+				case 0x042A: ch = 0xFF; break;
+				case 0x042B: ch = 0xF9; break;
+				case 0x042C: ch = 0xF8; break;
+				case 0x042D: ch = 0xFC; break;
+				case 0x042E: ch = 0xE0; break;
+				case 0x042F: ch = 0xF1; break;
+				case 0x0430: ch = 0xC1; break;
+				case 0x0431: ch = 0xC2; break;
+				case 0x0432: ch = 0xD7; break;
+				case 0x0433: ch = 0xC7; break;
+				case 0x0434: ch = 0xC4; break;
+				case 0x0435: ch = 0xC5; break;
+				case 0x0436: ch = 0xD6; break;
+				case 0x0437: ch = 0xDA; break;
+				case 0x0438:
+				case 0x0439:
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+					ch -= 0x036F;
+					break;
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+					ch -= 0x036E;
+					break;
+				case 0x0444: ch = 0xC6; break;
+				case 0x0445: ch = 0xC8; break;
+				case 0x0446: ch = 0xC3; break;
+				case 0x0447: ch = 0xDE; break;
+				case 0x0448: ch = 0xDB; break;
+				case 0x0449: ch = 0xDD; break;
+				case 0x044A: ch = 0xDF; break;
+				case 0x044B: ch = 0xD9; break;
+				case 0x044C: ch = 0xD8; break;
+				case 0x044D: ch = 0xDC; break;
+				case 0x044E: ch = 0xC0; break;
+				case 0x044F: ch = 0xD1; break;
+				case 0x0451: ch = 0xA3; break;
+				case 0x0454: ch = 0xA4; break;
+				case 0x0456: ch = 0xA6; break;
+				case 0x0457: ch = 0xA7; break;
+				case 0x0490: ch = 0xBD; break;
+				case 0x0491: ch = 0xAD; break;
+				case 0x2219: ch = 0x95; break;
+				case 0x221A: ch = 0x96; break;
+				case 0x2248: ch = 0x97; break;
+				case 0x2264: ch = 0x98; break;
+				case 0x2265: ch = 0x99; break;
+				case 0x2320: ch = 0x93; break;
+				case 0x2321: ch = 0x9B; break;
+				case 0x2500: ch = 0x80; break;
+				case 0x2502: ch = 0x81; break;
+				case 0x250C: ch = 0x82; break;
+				case 0x2510: ch = 0x83; break;
+				case 0x2514: ch = 0x84; break;
+				case 0x2518: ch = 0x85; break;
+				case 0x251C: ch = 0x86; break;
+				case 0x2524: ch = 0x87; break;
+				case 0x252C: ch = 0x88; break;
+				case 0x2534: ch = 0x89; break;
+				case 0x253C: ch = 0x8A; break;
+				case 0x2550: ch = 0xA0; break;
+				case 0x2551: ch = 0xA1; break;
+				case 0x2552: ch = 0xA2; break;
+				case 0x2554: ch = 0xA5; break;
+				case 0x2557:
+				case 0x2558:
+				case 0x2559:
+				case 0x255A:
+				case 0x255B:
+					ch -= 0x24AF;
+					break;
+				case 0x255D:
+				case 0x255E:
+				case 0x255F:
+				case 0x2560:
+				case 0x2561:
+					ch -= 0x24AF;
+					break;
+				case 0x2563: ch = 0xB5; break;
+				case 0x2566:
+				case 0x2567:
+				case 0x2568:
+				case 0x2569:
+				case 0x256A:
+					ch -= 0x24AE;
+					break;
+				case 0x256C: ch = 0xBE; break;
+				case 0x2580: ch = 0x8B; break;
+				case 0x2584: ch = 0x8C; break;
+				case 0x2588: ch = 0x8D; break;
+				case 0x258C: ch = 0x8E; break;
+				case 0x2590:
+				case 0x2591:
+				case 0x2592:
+				case 0x2593:
+					ch -= 0x2501;
+					break;
+				case 0x25A0: ch = 0x94; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP21866
+
+public class ENCkoi8_u : CP21866
+{
+	public ENCkoi8_u() : base() {}
+
+}; // class ENCkoi8_u
+
+}; // namespace I18N.Other
diff --git a/mcs/class/I18N/Other/CP28594.cs b/mcs/class/I18N/Other/CP28594.cs
new file mode 100644
index 00000000000..c8ca59fdfad
--- /dev/null
+++ b/mcs/class/I18N/Other/CP28594.cs
@@ -0,0 +1,333 @@
+/*
+ * CP28594.cs - Baltic (ISO) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-914.ucm".
+
+namespace I18N.Other
+{
+
+using System;
+using I18N.Common;
+
+public class CP28594 : ByteEncoding
+{
+	public CP28594()
+		: base(28594, ToChars, "Baltic (ISO)",
+		       "iso-8859-4", "iso-8859-4", "iso-8859-4",
+		       true, true, true, true, 1257)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u0104', 
+		'\u0138', '\u0156', '\u00A4', '\u0128', '\u013B', '\u00A7', 
+		'\u00A8', '\u0160', '\u0112', '\u0122', '\u0166', '\u00AD', 
+		'\u017D', '\u00AF', '\u00B0', '\u0105', '\u02DB', '\u0157', 
+		'\u00B4', '\u0129', '\u013C', '\u02C7', '\u00B8', '\u0161', 
+		'\u0113', '\u0123', '\u0167', '\u014A', '\u017E', '\u014B', 
+		'\u0100', '\u00C1', '\u00C2', '\u00C3', '\u00C4', '\u00C5', 
+		'\u00C6', '\u012E', '\u010C', '\u00C9', '\u0118', '\u00CB', 
+		'\u0116', '\u00CD', '\u00CE', '\u012A', '\u0110', '\u0145', 
+		'\u014C', '\u0136', '\u00D4', '\u00D5', '\u00D6', '\u00D7', 
+		'\u00D8', '\u0172', '\u00DA', '\u00DB', '\u00DC', '\u0168', 
+		'\u016A', '\u00DF', '\u0101', '\u00E1', '\u00E2', '\u00E3', 
+		'\u00E4', '\u00E5', '\u00E6', '\u012F', '\u010D', '\u00E9', 
+		'\u0119', '\u00EB', '\u0117', '\u00ED', '\u00EE', '\u012B', 
+		'\u0111', '\u0146', '\u014D', '\u0137', '\u00F4', '\u00F5', 
+		'\u00F6', '\u00F7', '\u00F8', '\u0173', '\u00FA', '\u00FB', 
+		'\u00FC', '\u0169', '\u016B', '\u02D9', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A4:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00AD:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B4:
+				case 0x00B8:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C3:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C6:
+				case 0x00C9:
+				case 0x00CB:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00D4:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E3:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E9:
+				case 0x00EB:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00F4:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+					break;
+				case 0x0100: ch = 0xC0; break;
+				case 0x0101: ch = 0xE0; break;
+				case 0x0104: ch = 0xA1; break;
+				case 0x0105: ch = 0xB1; break;
+				case 0x010C: ch = 0xC8; break;
+				case 0x010D: ch = 0xE8; break;
+				case 0x0110: ch = 0xD0; break;
+				case 0x0111: ch = 0xF0; break;
+				case 0x0112: ch = 0xAA; break;
+				case 0x0113: ch = 0xBA; break;
+				case 0x0116: ch = 0xCC; break;
+				case 0x0117: ch = 0xEC; break;
+				case 0x0118: ch = 0xCA; break;
+				case 0x0119: ch = 0xEA; break;
+				case 0x0122: ch = 0xAB; break;
+				case 0x0123: ch = 0xBB; break;
+				case 0x0128: ch = 0xA5; break;
+				case 0x0129: ch = 0xB5; break;
+				case 0x012A: ch = 0xCF; break;
+				case 0x012B: ch = 0xEF; break;
+				case 0x012E: ch = 0xC7; break;
+				case 0x012F: ch = 0xE7; break;
+				case 0x0136: ch = 0xD3; break;
+				case 0x0137: ch = 0xF3; break;
+				case 0x0138: ch = 0xA2; break;
+				case 0x013B: ch = 0xA6; break;
+				case 0x013C: ch = 0xB6; break;
+				case 0x0145: ch = 0xD1; break;
+				case 0x0146: ch = 0xF1; break;
+				case 0x014A: ch = 0xBD; break;
+				case 0x014B: ch = 0xBF; break;
+				case 0x014C: ch = 0xD2; break;
+				case 0x014D: ch = 0xF2; break;
+				case 0x0156: ch = 0xA3; break;
+				case 0x0157: ch = 0xB3; break;
+				case 0x0160: ch = 0xA9; break;
+				case 0x0161: ch = 0xB9; break;
+				case 0x0166: ch = 0xAC; break;
+				case 0x0167: ch = 0xBC; break;
+				case 0x0168: ch = 0xDD; break;
+				case 0x0169: ch = 0xFD; break;
+				case 0x016A: ch = 0xDE; break;
+				case 0x016B: ch = 0xFE; break;
+				case 0x0172: ch = 0xD9; break;
+				case 0x0173: ch = 0xF9; break;
+				case 0x017D: ch = 0xAE; break;
+				case 0x017E: ch = 0xBE; break;
+				case 0x02C7: ch = 0xB7; break;
+				case 0x02D9: ch = 0xFF; break;
+				case 0x02DB: ch = 0xB2; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A4:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00AD:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B4:
+				case 0x00B8:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C3:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C6:
+				case 0x00C9:
+				case 0x00CB:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00D4:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E3:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E9:
+				case 0x00EB:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00F4:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+					break;
+				case 0x0100: ch = 0xC0; break;
+				case 0x0101: ch = 0xE0; break;
+				case 0x0104: ch = 0xA1; break;
+				case 0x0105: ch = 0xB1; break;
+				case 0x010C: ch = 0xC8; break;
+				case 0x010D: ch = 0xE8; break;
+				case 0x0110: ch = 0xD0; break;
+				case 0x0111: ch = 0xF0; break;
+				case 0x0112: ch = 0xAA; break;
+				case 0x0113: ch = 0xBA; break;
+				case 0x0116: ch = 0xCC; break;
+				case 0x0117: ch = 0xEC; break;
+				case 0x0118: ch = 0xCA; break;
+				case 0x0119: ch = 0xEA; break;
+				case 0x0122: ch = 0xAB; break;
+				case 0x0123: ch = 0xBB; break;
+				case 0x0128: ch = 0xA5; break;
+				case 0x0129: ch = 0xB5; break;
+				case 0x012A: ch = 0xCF; break;
+				case 0x012B: ch = 0xEF; break;
+				case 0x012E: ch = 0xC7; break;
+				case 0x012F: ch = 0xE7; break;
+				case 0x0136: ch = 0xD3; break;
+				case 0x0137: ch = 0xF3; break;
+				case 0x0138: ch = 0xA2; break;
+				case 0x013B: ch = 0xA6; break;
+				case 0x013C: ch = 0xB6; break;
+				case 0x0145: ch = 0xD1; break;
+				case 0x0146: ch = 0xF1; break;
+				case 0x014A: ch = 0xBD; break;
+				case 0x014B: ch = 0xBF; break;
+				case 0x014C: ch = 0xD2; break;
+				case 0x014D: ch = 0xF2; break;
+				case 0x0156: ch = 0xA3; break;
+				case 0x0157: ch = 0xB3; break;
+				case 0x0160: ch = 0xA9; break;
+				case 0x0161: ch = 0xB9; break;
+				case 0x0166: ch = 0xAC; break;
+				case 0x0167: ch = 0xBC; break;
+				case 0x0168: ch = 0xDD; break;
+				case 0x0169: ch = 0xFD; break;
+				case 0x016A: ch = 0xDE; break;
+				case 0x016B: ch = 0xFE; break;
+				case 0x0172: ch = 0xD9; break;
+				case 0x0173: ch = 0xF9; break;
+				case 0x017D: ch = 0xAE; break;
+				case 0x017E: ch = 0xBE; break;
+				case 0x02C7: ch = 0xB7; break;
+				case 0x02D9: ch = 0xFF; break;
+				case 0x02DB: ch = 0xB2; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP28594
+
+public class ENCiso_8859_4 : CP28594
+{
+	public ENCiso_8859_4() : base() {}
+
+}; // class ENCiso_8859_4
+
+}; // namespace I18N.Other
diff --git a/mcs/class/I18N/Other/CP28595.cs b/mcs/class/I18N/Other/CP28595.cs
new file mode 100644
index 00000000000..6c8abbc37a7
--- /dev/null
+++ b/mcs/class/I18N/Other/CP28595.cs
@@ -0,0 +1,345 @@
+/*
+ * CP28595.cs - Cyrillic (ISO) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-915.ucm".
+
+namespace I18N.Other
+{
+
+using System;
+using I18N.Common;
+
+public class CP28595 : ByteEncoding
+{
+	public CP28595()
+		: base(28595, ToChars, "Cyrillic (ISO)",
+		       "iso-8859-5", "iso-8859-5", "iso-8859-5",
+		       true, true, true, true, 1251)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u0401', 
+		'\u0402', '\u0403', '\u0404', '\u0405', '\u0406', '\u0407', 
+		'\u0408', '\u0409', '\u040A', '\u040B', '\u040C', '\u00AD', 
+		'\u040E', '\u040F', '\u0410', '\u0411', '\u0412', '\u0413', 
+		'\u0414', '\u0415', '\u0416', '\u0417', '\u0418', '\u0419', 
+		'\u041A', '\u041B', '\u041C', '\u041D', '\u041E', '\u041F', 
+		'\u0420', '\u0421', '\u0422', '\u0423', '\u0424', '\u0425', 
+		'\u0426', '\u0427', '\u0428', '\u0429', '\u042A', '\u042B', 
+		'\u042C', '\u042D', '\u042E', '\u042F', '\u0430', '\u0431', 
+		'\u0432', '\u0433', '\u0434', '\u0435', '\u0436', '\u0437', 
+		'\u0438', '\u0439', '\u043A', '\u043B', '\u043C', '\u043D', 
+		'\u043E', '\u043F', '\u0440', '\u0441', '\u0442', '\u0443', 
+		'\u0444', '\u0445', '\u0446', '\u0447', '\u0448', '\u0449', 
+		'\u044A', '\u044B', '\u044C', '\u044D', '\u044E', '\u044F', 
+		'\u2116', '\u0451', '\u0452', '\u0453', '\u0454', '\u0455', 
+		'\u0456', '\u0457', '\u0458', '\u0459', '\u045A', '\u045B', 
+		'\u045C', '\u00A7', '\u045E', '\u045F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00AD:
+					break;
+				case 0x00A7: ch = 0xFD; break;
+				case 0x0401:
+				case 0x0402:
+				case 0x0403:
+				case 0x0404:
+				case 0x0405:
+				case 0x0406:
+				case 0x0407:
+				case 0x0408:
+				case 0x0409:
+				case 0x040A:
+				case 0x040B:
+				case 0x040C:
+					ch -= 0x0360;
+					break;
+				case 0x040E:
+				case 0x040F:
+				case 0x0410:
+				case 0x0411:
+				case 0x0412:
+				case 0x0413:
+				case 0x0414:
+				case 0x0415:
+				case 0x0416:
+				case 0x0417:
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+				case 0x041D:
+				case 0x041E:
+				case 0x041F:
+				case 0x0420:
+				case 0x0421:
+				case 0x0422:
+				case 0x0423:
+				case 0x0424:
+				case 0x0425:
+				case 0x0426:
+				case 0x0427:
+				case 0x0428:
+				case 0x0429:
+				case 0x042A:
+				case 0x042B:
+				case 0x042C:
+				case 0x042D:
+				case 0x042E:
+				case 0x042F:
+				case 0x0430:
+				case 0x0431:
+				case 0x0432:
+				case 0x0433:
+				case 0x0434:
+				case 0x0435:
+				case 0x0436:
+				case 0x0437:
+				case 0x0438:
+				case 0x0439:
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+				case 0x0444:
+				case 0x0445:
+				case 0x0446:
+				case 0x0447:
+				case 0x0448:
+				case 0x0449:
+				case 0x044A:
+				case 0x044B:
+				case 0x044C:
+				case 0x044D:
+				case 0x044E:
+				case 0x044F:
+					ch -= 0x0360;
+					break;
+				case 0x0451:
+				case 0x0452:
+				case 0x0453:
+				case 0x0454:
+				case 0x0455:
+				case 0x0456:
+				case 0x0457:
+				case 0x0458:
+				case 0x0459:
+				case 0x045A:
+				case 0x045B:
+				case 0x045C:
+					ch -= 0x0360;
+					break;
+				case 0x045E: ch = 0xFE; break;
+				case 0x045F: ch = 0xFF; break;
+				case 0x2116: ch = 0xF0; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00AD:
+					break;
+				case 0x00A7: ch = 0xFD; break;
+				case 0x0401:
+				case 0x0402:
+				case 0x0403:
+				case 0x0404:
+				case 0x0405:
+				case 0x0406:
+				case 0x0407:
+				case 0x0408:
+				case 0x0409:
+				case 0x040A:
+				case 0x040B:
+				case 0x040C:
+					ch -= 0x0360;
+					break;
+				case 0x040E:
+				case 0x040F:
+				case 0x0410:
+				case 0x0411:
+				case 0x0412:
+				case 0x0413:
+				case 0x0414:
+				case 0x0415:
+				case 0x0416:
+				case 0x0417:
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+				case 0x041D:
+				case 0x041E:
+				case 0x041F:
+				case 0x0420:
+				case 0x0421:
+				case 0x0422:
+				case 0x0423:
+				case 0x0424:
+				case 0x0425:
+				case 0x0426:
+				case 0x0427:
+				case 0x0428:
+				case 0x0429:
+				case 0x042A:
+				case 0x042B:
+				case 0x042C:
+				case 0x042D:
+				case 0x042E:
+				case 0x042F:
+				case 0x0430:
+				case 0x0431:
+				case 0x0432:
+				case 0x0433:
+				case 0x0434:
+				case 0x0435:
+				case 0x0436:
+				case 0x0437:
+				case 0x0438:
+				case 0x0439:
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+				case 0x0444:
+				case 0x0445:
+				case 0x0446:
+				case 0x0447:
+				case 0x0448:
+				case 0x0449:
+				case 0x044A:
+				case 0x044B:
+				case 0x044C:
+				case 0x044D:
+				case 0x044E:
+				case 0x044F:
+					ch -= 0x0360;
+					break;
+				case 0x0451:
+				case 0x0452:
+				case 0x0453:
+				case 0x0454:
+				case 0x0455:
+				case 0x0456:
+				case 0x0457:
+				case 0x0458:
+				case 0x0459:
+				case 0x045A:
+				case 0x045B:
+				case 0x045C:
+					ch -= 0x0360;
+					break;
+				case 0x045E: ch = 0xFE; break;
+				case 0x045F: ch = 0xFF; break;
+				case 0x2116: ch = 0xF0; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP28595
+
+public class ENCiso_8859_5 : CP28595
+{
+	public ENCiso_8859_5() : base() {}
+
+}; // class ENCiso_8859_5
+
+}; // namespace I18N.Other
diff --git a/mcs/class/I18N/Other/CP57002.cs b/mcs/class/I18N/Other/CP57002.cs
new file mode 100644
index 00000000000..740f392b5c8
--- /dev/null
+++ b/mcs/class/I18N/Other/CP57002.cs
@@ -0,0 +1,496 @@
+/*
+ * CP57002.cs - ISCII code pages 57002-57011.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace I18N.Other
+{
+
+using System;
+using System.Text;
+using I18N.Common;
+
+// This class provides an abstract base for the ISCII encodings,
+// which all have a similar pattern.  Code points 0x00-0x7F are
+// the standard ASCII character set, and code points 0x80-0xFF
+// are a shifted version of the Unicode character set, starting
+// at a fixed offset.
+
+public abstract class ISCIIEncoding : Encoding
+{
+	// Internal state.
+	protected int shift;
+	protected String encodingName;
+	protected String webName;
+
+	// Constructor.
+	protected ISCIIEncoding(int codePage, int shift,
+						    String encodingName, String webName)
+			: base(codePage)
+			{
+				this.shift = shift;
+				this.encodingName = encodingName;
+				this.webName = webName;
+			}
+
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount(char[] chars, int index, int count)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(index < 0 || index > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", Strings.GetString("ArgRange_Array"));
+				}
+				if(count < 0 || count > (chars.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", Strings.GetString("ArgRange_Array"));
+				}
+				return count;
+			}
+
+	// Convenience wrappers for "GetByteCount".
+	public override int GetByteCount(String s)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				return s.Length;
+			}
+
+	// Get the bytes that result from encoding a character buffer.
+	public override int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if(charCount < 0 || charCount > (chars.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", Strings.GetString("ArgRange_Array"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if((bytes.Length - byteIndex) < charCount)
+				{
+					throw new ArgumentException
+						(Strings.GetString("Arg_InsufficientSpace"), "bytes");
+				}
+
+				// Convert the characters into bytes.
+				char ch;
+				int posn = byteIndex;
+				char first = (char)shift;
+				char last = (char)(shift + 0x7F);
+				while(charCount-- > 0)
+				{
+					ch = chars[charIndex++];
+					if(ch < (char)0x0080)
+					{
+						// Regular ASCII subset.
+						bytes[posn++] = (byte)ch;
+					}
+					else if(ch >= first && ch <= last)
+					{
+						// ISCII range that we need to shift.
+						bytes[posn++] = (byte)(ch - first + 0x80);
+					}
+					else if(ch >= '\uFF01' && ch <= '\uFF5E')
+					{
+						// ASCII full-width characters.
+						bytes[posn++] = (byte)(ch - 0xFEE0);
+					}
+					else
+					{
+						bytes[posn++] = (byte)'?';
+					}
+				}
+
+				// Return the final length of the output.
+				return posn - byteIndex;
+			}
+
+	// Convenience wrappers for "GetBytes".
+	public override int GetBytes(String s, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				// Validate the parameters.
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > s.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex",
+						 Strings.GetString("ArgRange_StringIndex"));
+				}
+				if(charCount < 0 || charCount > (s.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount",
+						 Strings.GetString("ArgRange_StringRange"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex",
+						 Strings.GetString("ArgRange_Array"));
+				}
+				if((bytes.Length - byteIndex) < charCount)
+				{
+					throw new ArgumentException
+						(Strings.GetString("Arg_InsufficientSpace"), "bytes");
+				}
+
+				// Convert the characters into bytes.
+				char ch;
+				int posn = byteIndex;
+				char first = (char)shift;
+				char last = (char)(shift + 0x7F);
+				while(charCount-- > 0)
+				{
+					ch = s[charIndex++];
+					if(ch < (char)0x0080)
+					{
+						// Regular ASCII subset.
+						bytes[posn++] = (byte)ch;
+					}
+					else if(ch >= first && ch <= last)
+					{
+						// ISCII range that we need to shift.
+						bytes[posn++] = (byte)(ch - first + 0x80);
+					}
+					else if(ch >= '\uFF01' && ch <= '\uFF5E')
+					{
+						// ASCII full-width characters.
+						bytes[posn++] = (byte)(ch - 0xFEE0);
+					}
+					else
+					{
+						bytes[posn++] = (byte)'?';
+					}
+				}
+
+				// Return the final length of the output.
+				return posn - byteIndex;
+			}
+
+	// Get the number of characters needed to decode a byte buffer.
+	public override int GetCharCount(byte[] bytes, int index, int count)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", Strings.GetString("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", Strings.GetString("ArgRange_Array"));
+				}
+				return count;
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex)
+			{
+				// Validate the parameters.
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", Strings.GetString("ArgRange_Array"));
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", Strings.GetString("ArgRange_Array"));
+				}
+				if((chars.Length - charIndex) < byteCount)
+				{
+					throw new ArgumentException
+						(Strings.GetString("Arg_InsufficientSpace"), "chars");
+				}
+
+				// Convert the bytes into characters.
+				int count = byteCount;
+				int byteval;
+				int shift = this.shift - 0x80;
+				while(count-- > 0)
+				{
+					byteval = (int)(bytes[byteIndex++]);
+					if(byteval < 0x80)
+					{
+						// Ordinary ASCII character.
+						chars[charIndex++] = (char)byteval;
+					}
+					else
+					{
+						// Shift the ISCII character into the Unicode page.
+						chars[charIndex++] = (char)(byteval + shift);
+					}
+				}
+				return byteCount;
+			}
+
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public override int GetMaxByteCount(int charCount)
+			{
+				if(charCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount",
+						 Strings.GetString("ArgRange_NonNegative"));
+				}
+				return charCount;
+			}
+
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public override int GetMaxCharCount(int byteCount)
+			{
+				if(byteCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount",
+						 Strings.GetString("ArgRange_NonNegative"));
+				}
+				return byteCount;
+			}
+
+#if !ECMA_COMPAT
+
+	// Get the mail body name for this encoding.
+	public override String BodyName
+			{
+				get
+				{
+					return webName;
+				}
+			}
+
+	// Get the human-readable name for this encoding.
+	public override String EncodingName
+			{
+				get
+				{
+					return encodingName;
+				}
+			}
+
+	// Get the mail agent header name for this encoding.
+	public override String HeaderName
+			{
+				get
+				{
+					return webName;
+				}
+			}
+
+	// Get the IANA-preferred Web name for this encoding.
+	public override String WebName
+			{
+				get
+				{
+					return webName;
+				}
+			}
+
+#endif // !ECMA_COMPAT
+
+}; // class ISCIIEncoding
+
+// Define the ISCII code pages as subclasses of "ISCIIEncoding".
+
+public class CP57002 : ISCIIEncoding
+{
+	public CP57002() : base(57002, 0x0900, "ISCII Devanagari", "x-iscii-de") {}
+
+}; // class CP57002
+
+public class CP57003 : ISCIIEncoding
+{
+	public CP57003() : base(57003, 0x0980, "ISCII Bengali", "x-iscii-be") {}
+
+}; // class CP57003
+
+public class CP57004 : ISCIIEncoding
+{
+	public CP57004() : base(57004, 0x0B80, "ISCII Tamil", "x-iscii-ta") {}
+
+}; // class CP57004
+
+public class CP57005 : ISCIIEncoding
+{
+	public CP57005() : base(57005, 0x0B80, "ISCII Telugu", "x-iscii-te") {}
+
+}; // class CP57005
+
+public class CP57006 : ISCIIEncoding
+{
+	// Note: Unicode has a "Sinhala" page, but no "Assamese" page.
+	// Until I hear otherwise, I will assume that they are the same
+	// thing with different names - Rhys Weatherley, 16 April 2002.
+	public CP57006() : base(57006, 0x0D80, "ISCII Assamese", "x-iscii-as") {}
+
+}; // class CP57006
+
+public class CP57007 : ISCIIEncoding
+{
+	public CP57007() : base(57007, 0x0B00, "ISCII Oriya", "x-iscii-or") {}
+
+}; // class CP57007
+
+public class CP57008 : ISCIIEncoding
+{
+	public CP57008() : base(57008, 0x0C80, "ISCII Kannada", "x-iscii-ka") {}
+
+}; // class CP57008
+
+public class CP57009 : ISCIIEncoding
+{
+	public CP57009() : base(57009, 0x0D00, "ISCII Malayalam", "x-iscii-ma") {}
+
+}; // class CP57009
+
+public class CP57010 : ISCIIEncoding
+{
+	public CP57010() : base(57010, 0x0A80, "ISCII Gujarati", "x-iscii-gu") {}
+
+}; // class CP57010
+
+public class CP57011 : ISCIIEncoding
+{
+	// Note: Unicode has a "Gurmukhi" page, but no "Punjabi" page.
+	// Other ISCII-related information on the Internet seems to
+	// indicate that they are the same.  Until I hear otherwise,
+	// I will assume that they are the same thing with different
+	// names - Rhys Weatherley, 16 April 2002.
+	public CP57011() : base(57011, 0x0A00, "ISCII Punjabi", "x-iscii-pa") {}
+
+}; // class CP57011
+
+// Define the web encoding name aliases for the above code pages.
+
+public class ENCx_iscii_de : CP57002
+{
+	public ENCx_iscii_de() : base() {}
+
+}; // class ENCx_iscii_de
+
+public class ENCx_iscii_be : CP57003
+{
+	public ENCx_iscii_be() : base() {}
+
+}; // class ENCx_iscii_be
+
+public class ENCx_iscii_ta : CP57004
+{
+	public ENCx_iscii_ta() : base() {}
+
+}; // class ENCx_iscii_ta
+
+public class ENCx_iscii_te : CP57005
+{
+	public ENCx_iscii_te() : base() {}
+
+}; // class ENCx_iscii_te
+
+public class ENCx_iscii_as : CP57006
+{
+	public ENCx_iscii_as() : base() {}
+
+}; // class ENCx_iscii_as
+
+public class ENCx_iscii_or : CP57007
+{
+	public ENCx_iscii_or() : base() {}
+
+}; // class ENCx_iscii_or
+
+public class ENCx_iscii_ka : CP57008
+{
+	public ENCx_iscii_ka() : base() {}
+
+}; // class ENCx_iscii_ka
+
+public class ENCx_iscii_ma : CP57009
+{
+	public ENCx_iscii_ma() : base() {}
+
+}; // class ENCx_iscii_ma
+
+public class ENCx_iscii_gu : CP57010
+{
+	public ENCx_iscii_gu() : base() {}
+
+}; // class ENCx_iscii_gu
+
+public class ENCx_iscii_pa : CP57011
+{
+	public ENCx_iscii_pa() : base() {}
+
+}; // class ENCx_iscii_pa
+
+}; // namespace I18N.Other
diff --git a/mcs/class/I18N/Other/CP874.cs b/mcs/class/I18N/Other/CP874.cs
new file mode 100644
index 00000000000..97b41aa29d8
--- /dev/null
+++ b/mcs/class/I18N/Other/CP874.cs
@@ -0,0 +1,537 @@
+/*
+ * CP874.cs - Thai (Windows) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-874.ucm".
+
+namespace I18N.Other
+{
+
+using System;
+using I18N.Common;
+
+public class CP874 : ByteEncoding
+{
+	public CP874()
+		: base(874, ToChars, "Thai (Windows)",
+		       "windows-874", "windows-874", "windows-874",
+		       true, true, true, true, 874)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u0E48', '\u0E01', 
+		'\u0E02', '\u0E03', '\u0E04', '\u0E05', '\u0E06', '\u0E07', 
+		'\u0E08', '\u0E09', '\u0E0A', '\u0E0B', '\u0E0C', '\u0E0D', 
+		'\u0E0E', '\u0E0F', '\u0E10', '\u0E11', '\u0E12', '\u0E13', 
+		'\u0E14', '\u0E15', '\u0E16', '\u0E17', '\u0E18', '\u0E19', 
+		'\u0E1A', '\u0E1B', '\u0E1C', '\u0E1D', '\u0E1E', '\u0E1F', 
+		'\u0E20', '\u0E21', '\u0E22', '\u0E23', '\u0E24', '\u0E25', 
+		'\u0E26', '\u0E27', '\u0E28', '\u0E29', '\u0E2A', '\u0E2B', 
+		'\u0E2C', '\u0E2D', '\u0E2E', '\u0E2F', '\u0E30', '\u0E31', 
+		'\u0E32', '\u0E33', '\u0E34', '\u0E35', '\u0E36', '\u0E37', 
+		'\u0E38', '\u0E39', '\u0E3A', '\u0E49', '\u0E4A', '\u0E4B', 
+		'\u0E4C', '\u0E3F', '\u0E40', '\u0E41', '\u0E42', '\u0E43', 
+		'\u0E44', '\u0E45', '\u0E46', '\u0E47', '\u0E48', '\u0E49', 
+		'\u0E4A', '\u0E4B', '\u0E4C', '\u0E4D', '\u0E4E', '\u0E4F', 
+		'\u0E50', '\u0E51', '\u0E52', '\u0E53', '\u0E54', '\u0E55', 
+		'\u0E56', '\u0E57', '\u0E58', '\u0E59', '\u0E5A', '\u0E5B', 
+		'\u00A2', '\u00AC', '\u00A6', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A2: ch = 0xFC; break;
+				case 0x00A6: ch = 0xFE; break;
+				case 0x00AC: ch = 0xFD; break;
+				case 0x0E01:
+				case 0x0E02:
+				case 0x0E03:
+				case 0x0E04:
+				case 0x0E05:
+				case 0x0E06:
+				case 0x0E07:
+				case 0x0E08:
+				case 0x0E09:
+				case 0x0E0A:
+				case 0x0E0B:
+				case 0x0E0C:
+				case 0x0E0D:
+				case 0x0E0E:
+				case 0x0E0F:
+				case 0x0E10:
+				case 0x0E11:
+				case 0x0E12:
+				case 0x0E13:
+				case 0x0E14:
+				case 0x0E15:
+				case 0x0E16:
+				case 0x0E17:
+				case 0x0E18:
+				case 0x0E19:
+				case 0x0E1A:
+				case 0x0E1B:
+				case 0x0E1C:
+				case 0x0E1D:
+				case 0x0E1E:
+				case 0x0E1F:
+				case 0x0E20:
+				case 0x0E21:
+				case 0x0E22:
+				case 0x0E23:
+				case 0x0E24:
+				case 0x0E25:
+				case 0x0E26:
+				case 0x0E27:
+				case 0x0E28:
+				case 0x0E29:
+				case 0x0E2A:
+				case 0x0E2B:
+				case 0x0E2C:
+				case 0x0E2D:
+				case 0x0E2E:
+				case 0x0E2F:
+				case 0x0E30:
+				case 0x0E31:
+				case 0x0E32:
+				case 0x0E33:
+				case 0x0E34:
+				case 0x0E35:
+				case 0x0E36:
+				case 0x0E37:
+				case 0x0E38:
+				case 0x0E39:
+				case 0x0E3A:
+					ch -= 0x0D60;
+					break;
+				case 0x0E3F:
+				case 0x0E40:
+				case 0x0E41:
+				case 0x0E42:
+				case 0x0E43:
+				case 0x0E44:
+				case 0x0E45:
+				case 0x0E46:
+				case 0x0E47:
+				case 0x0E48:
+				case 0x0E49:
+				case 0x0E4A:
+				case 0x0E4B:
+				case 0x0E4C:
+				case 0x0E4D:
+				case 0x0E4E:
+				case 0x0E4F:
+				case 0x0E50:
+				case 0x0E51:
+				case 0x0E52:
+				case 0x0E53:
+				case 0x0E54:
+				case 0x0E55:
+				case 0x0E56:
+				case 0x0E57:
+				case 0x0E58:
+				case 0x0E59:
+				case 0x0E5A:
+				case 0x0E5B:
+					ch -= 0x0D60;
+					break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A2: ch = 0xFC; break;
+				case 0x00A6: ch = 0xFE; break;
+				case 0x00AC: ch = 0xFD; break;
+				case 0x0E01:
+				case 0x0E02:
+				case 0x0E03:
+				case 0x0E04:
+				case 0x0E05:
+				case 0x0E06:
+				case 0x0E07:
+				case 0x0E08:
+				case 0x0E09:
+				case 0x0E0A:
+				case 0x0E0B:
+				case 0x0E0C:
+				case 0x0E0D:
+				case 0x0E0E:
+				case 0x0E0F:
+				case 0x0E10:
+				case 0x0E11:
+				case 0x0E12:
+				case 0x0E13:
+				case 0x0E14:
+				case 0x0E15:
+				case 0x0E16:
+				case 0x0E17:
+				case 0x0E18:
+				case 0x0E19:
+				case 0x0E1A:
+				case 0x0E1B:
+				case 0x0E1C:
+				case 0x0E1D:
+				case 0x0E1E:
+				case 0x0E1F:
+				case 0x0E20:
+				case 0x0E21:
+				case 0x0E22:
+				case 0x0E23:
+				case 0x0E24:
+				case 0x0E25:
+				case 0x0E26:
+				case 0x0E27:
+				case 0x0E28:
+				case 0x0E29:
+				case 0x0E2A:
+				case 0x0E2B:
+				case 0x0E2C:
+				case 0x0E2D:
+				case 0x0E2E:
+				case 0x0E2F:
+				case 0x0E30:
+				case 0x0E31:
+				case 0x0E32:
+				case 0x0E33:
+				case 0x0E34:
+				case 0x0E35:
+				case 0x0E36:
+				case 0x0E37:
+				case 0x0E38:
+				case 0x0E39:
+				case 0x0E3A:
+					ch -= 0x0D60;
+					break;
+				case 0x0E3F:
+				case 0x0E40:
+				case 0x0E41:
+				case 0x0E42:
+				case 0x0E43:
+				case 0x0E44:
+				case 0x0E45:
+				case 0x0E46:
+				case 0x0E47:
+				case 0x0E48:
+				case 0x0E49:
+				case 0x0E4A:
+				case 0x0E4B:
+				case 0x0E4C:
+				case 0x0E4D:
+				case 0x0E4E:
+				case 0x0E4F:
+				case 0x0E50:
+				case 0x0E51:
+				case 0x0E52:
+				case 0x0E53:
+				case 0x0E54:
+				case 0x0E55:
+				case 0x0E56:
+				case 0x0E57:
+				case 0x0E58:
+				case 0x0E59:
+				case 0x0E5A:
+				case 0x0E5B:
+					ch -= 0x0D60;
+					break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP874
+
+public class ENCwindows_874 : CP874
+{
+	public ENCwindows_874() : base() {}
+
+}; // class ENCwindows_874
+
+}; // namespace I18N.Other
diff --git a/mcs/class/I18N/Other/ibm-5347.ucm b/mcs/class/I18N/Other/ibm-5347.ucm
new file mode 100644
index 00000000000..fc262e6c0bc
--- /dev/null
+++ b/mcs/class/I18N/Other/ibm-5347.ucm
@@ -0,0 +1,377 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:44 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B014E3.RPMAP100 and 14E344B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-5347"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-5347
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0098> \x98 |0
+<U00A0> \xA0 |0
+<U00A4> \xA4 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A9> \xA9 |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00BB> \xBB |0
+<U0401> \xA8 |0
+<U0402> \x80 |0
+<U0403> \x81 |0
+<U0404> \xAA |0
+<U0405> \xBD |0
+<U0406> \xB2 |0
+<U0407> \xAF |0
+<U0408> \xA3 |0
+<U0409> \x8A |0
+<U040A> \x8C |0
+<U040B> \x8E |0
+<U040C> \x8D |0
+<U040E> \xA1 |0
+<U040F> \x8F |0
+<U0410> \xC0 |0
+<U0411> \xC1 |0
+<U0412> \xC2 |0
+<U0413> \xC3 |0
+<U0414> \xC4 |0
+<U0415> \xC5 |0
+<U0416> \xC6 |0
+<U0417> \xC7 |0
+<U0418> \xC8 |0
+<U0419> \xC9 |0
+<U041A> \xCA |0
+<U041B> \xCB |0
+<U041C> \xCC |0
+<U041D> \xCD |0
+<U041E> \xCE |0
+<U041F> \xCF |0
+<U0420> \xD0 |0
+<U0421> \xD1 |0
+<U0422> \xD2 |0
+<U0423> \xD3 |0
+<U0424> \xD4 |0
+<U0425> \xD5 |0
+<U0426> \xD6 |0
+<U0427> \xD7 |0
+<U0428> \xD8 |0
+<U0429> \xD9 |0
+<U042A> \xDA |0
+<U042B> \xDB |0
+<U042C> \xDC |0
+<U042D> \xDD |0
+<U042E> \xDE |0
+<U042F> \xDF |0
+<U0430> \xE0 |0
+<U0431> \xE1 |0
+<U0432> \xE2 |0
+<U0433> \xE3 |0
+<U0434> \xE4 |0
+<U0435> \xE5 |0
+<U0436> \xE6 |0
+<U0437> \xE7 |0
+<U0438> \xE8 |0
+<U0439> \xE9 |0
+<U043A> \xEA |0
+<U043B> \xEB |0
+<U043C> \xEC |0
+<U043D> \xED |0
+<U043E> \xEE |0
+<U043F> \xEF |0
+<U0440> \xF0 |0
+<U0441> \xF1 |0
+<U0442> \xF2 |0
+<U0443> \xF3 |0
+<U0444> \xF4 |0
+<U0445> \xF5 |0
+<U0446> \xF6 |0
+<U0447> \xF7 |0
+<U0448> \xF8 |0
+<U0449> \xF9 |0
+<U044A> \xFA |0
+<U044B> \xFB |0
+<U044C> \xFC |0
+<U044D> \xFD |0
+<U044E> \xFE |0
+<U044F> \xFF |0
+<U0451> \xB8 |0
+<U0452> \x90 |0
+<U0453> \x83 |0
+<U0454> \xBA |0
+<U0455> \xBE |0
+<U0456> \xB3 |0
+<U0457> \xBF |0
+<U0458> \xBC |0
+<U0459> \x9A |0
+<U045A> \x9C |0
+<U045B> \x9E |0
+<U045C> \x9D |0
+<U045E> \xA2 |0
+<U045F> \x9F |0
+<U0490> \xA5 |0
+<U0491> \xB4 |0
+<U2013> \x96 |0
+<U2014> \x97 |0
+<U2018> \x91 |0
+<U2019> \x92 |0
+<U201A> \x82 |0
+<U201C> \x93 |0
+<U201D> \x94 |0
+<U201E> \x84 |0
+<U2020> \x86 |0
+<U2021> \x87 |0
+<U2022> \x95 |0
+<U2026> \x85 |0
+<U2030> \x89 |0
+<U2039> \x8B |0
+<U203A> \x9B |0
+<U20AC> \x88 |0
+<U2116> \xB9 |0
+<U2122> \x99 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/Other/ibm-5353.ucm b/mcs/class/I18N/Other/ibm-5353.ucm
new file mode 100644
index 00000000000..3afd0182fea
--- /dev/null
+++ b/mcs/class/I18N/Other/ibm-5353.ucm
@@ -0,0 +1,377 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2001, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:45 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B014E9.RPMAP100 and 14E944B0.TPMAP100
+#
+# Patched for jitterbug 792
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-5353"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-5353
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0081> \x81 |0
+<U0083> \x83 |0
+<U0088> \x88 |0
+<U008A> \x8A |0
+<U008C> \x8C |0
+<U0090> \x90 |0
+<U0098> \x98 |0
+<U009A> \x9A |0
+<U009C> \x9C |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A2> \xA2 |0
+<U00A3> \xA3 |0
+<U00A4> \xA4 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \x8D |0
+<U00A9> \xA9 |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00AF> \x9D |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B4> \xB4 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00B8> \x8F |0
+<U00B9> \xB9 |0
+<U00BB> \xBB |0
+<U00BC> \xBC |0
+<U00BD> \xBD |0
+<U00BE> \xBE |0
+<U00C4> \xC4 |0
+<U00C5> \xC5 |0
+<U00C6> \xAF |0
+<U00C9> \xC9 |0
+<U00D3> \xD3 |0
+<U00D5> \xD5 |0
+<U00D6> \xD6 |0
+<U00D7> \xD7 |0
+<U00D8> \xA8 |0
+<U00DC> \xDC |0
+<U00DF> \xDF |0
+<U00E4> \xE4 |0
+<U00E5> \xE5 |0
+<U00E6> \xBF |0
+<U00E9> \xE9 |0
+<U00F3> \xF3 |0
+<U00F5> \xF5 |0
+<U00F6> \xF6 |0
+<U00F7> \xF7 |0
+<U00F8> \xB8 |0
+<U00FC> \xFC |0
+<U0100> \xC2 |0
+<U0101> \xE2 |0
+<U0104> \xC0 |0
+<U0105> \xE0 |0
+<U0106> \xC3 |0
+<U0107> \xE3 |0
+<U010C> \xC8 |0
+<U010D> \xE8 |0
+<U0112> \xC7 |0
+<U0113> \xE7 |0
+<U0116> \xCB |0
+<U0117> \xEB |0
+<U0118> \xC6 |0
+<U0119> \xE6 |0
+<U0122> \xCC |0
+<U0123> \xEC |0
+<U012A> \xCE |0
+<U012B> \xEE |0
+<U012E> \xC1 |0
+<U012F> \xE1 |0
+<U0136> \xCD |0
+<U0137> \xED |0
+<U013B> \xCF |0
+<U013C> \xEF |0
+<U0141> \xD9 |0
+<U0142> \xF9 |0
+<U0143> \xD1 |0
+<U0144> \xF1 |0
+<U0145> \xD2 |0
+<U0146> \xF2 |0
+<U014C> \xD4 |0
+<U014D> \xF4 |0
+<U0156> \xAA |0
+<U0157> \xBA |0
+<U015A> \xDA |0
+<U015B> \xFA |0
+<U0160> \xD0 |0
+<U0161> \xF0 |0
+<U016A> \xDB |0
+<U016B> \xFB |0
+<U0172> \xD8 |0
+<U0173> \xF8 |0
+<U0179> \xCA |0
+<U017A> \xEA |0
+<U017B> \xDD |0
+<U017C> \xFD |0
+<U017D> \xDE |0
+<U017E> \xFE |0
+<U02C7> \x8E |0
+<U02D9> \xFF |0
+<U02DB> \x9E |0
+<U2013> \x96 |0
+<U2014> \x97 |0
+<U2018> \x91 |0
+<U2019> \x92 |0
+<U201A> \x82 |0
+<U201C> \x93 |0
+<U201D> \x94 |0
+<U201E> \x84 |0
+<U2020> \x86 |0
+<U2021> \x87 |0
+<U2022> \x95 |0
+<U2026> \x85 |0
+<U2030> \x89 |0
+<U2039> \x8B |0
+<U203A> \x9B |0
+<U20AC> \x80 |0
+<U2122> \x99 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/Other/ibm-5354.ucm b/mcs/class/I18N/Other/ibm-5354.ucm
new file mode 100644
index 00000000000..3d4bcaa7750
--- /dev/null
+++ b/mcs/class/I18N/Other/ibm-5354.ucm
@@ -0,0 +1,377 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:45 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B014EA.RPMAP100 and 14EA44B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-5354"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-5354
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0081> \x81 |0
+<U008A> \x8A |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U009A> \x9A |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U00A0> \xA0 |0
+<U00A1> \xA1 |0
+<U00A2> \xA2 |0
+<U00A3> \xA3 |0
+<U00A4> \xA4 |0
+<U00A5> \xA5 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \xA9 |0
+<U00AA> \xAA |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00AF> \xAF |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B4> \xB4 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00B8> \xB8 |0
+<U00B9> \xB9 |0
+<U00BA> \xBA |0
+<U00BB> \xBB |0
+<U00BC> \xBC |0
+<U00BD> \xBD |0
+<U00BE> \xBE |0
+<U00BF> \xBF |0
+<U00C0> \xC0 |0
+<U00C1> \xC1 |0
+<U00C2> \xC2 |0
+<U00C4> \xC4 |0
+<U00C5> \xC5 |0
+<U00C6> \xC6 |0
+<U00C7> \xC7 |0
+<U00C8> \xC8 |0
+<U00C9> \xC9 |0
+<U00CA> \xCA |0
+<U00CB> \xCB |0
+<U00CD> \xCD |0
+<U00CE> \xCE |0
+<U00CF> \xCF |0
+<U00D1> \xD1 |0
+<U00D3> \xD3 |0
+<U00D4> \xD4 |0
+<U00D6> \xD6 |0
+<U00D7> \xD7 |0
+<U00D8> \xD8 |0
+<U00D9> \xD9 |0
+<U00DA> \xDA |0
+<U00DB> \xDB |0
+<U00DC> \xDC |0
+<U00DF> \xDF |0
+<U00E0> \xE0 |0
+<U00E1> \xE1 |0
+<U00E2> \xE2 |0
+<U00E4> \xE4 |0
+<U00E5> \xE5 |0
+<U00E6> \xE6 |0
+<U00E7> \xE7 |0
+<U00E8> \xE8 |0
+<U00E9> \xE9 |0
+<U00EA> \xEA |0
+<U00EB> \xEB |0
+<U00ED> \xED |0
+<U00EE> \xEE |0
+<U00EF> \xEF |0
+<U00F1> \xF1 |0
+<U00F3> \xF3 |0
+<U00F4> \xF4 |0
+<U00F6> \xF6 |0
+<U00F7> \xF7 |0
+<U00F8> \xF8 |0
+<U00F9> \xF9 |0
+<U00FA> \xFA |0
+<U00FB> \xFB |0
+<U00FC> \xFC |0
+<U00FF> \xFF |0
+<U0102> \xC3 |0
+<U0103> \xE3 |0
+<U0110> \xD0 |0
+<U0111> \xF0 |0
+<U0152> \x8C |0
+<U0153> \x9C |0
+<U0178> \x9F |0
+<U0192> \x83 |0
+<U01A0> \xD5 |0
+<U01A1> \xF5 |0
+<U01AF> \xDD |0
+<U01B0> \xFD |0
+<U02C6> \x88 |0
+<U02DC> \x98 |0
+<U0300> \xCC |0
+<U0301> \xEC |0
+<U0303> \xDE |0
+<U0309> \xD2 |0
+<U0323> \xF2 |0
+<U2013> \x96 |0
+<U2014> \x97 |0
+<U2018> \x91 |0
+<U2019> \x92 |0
+<U201A> \x82 |0
+<U201C> \x93 |0
+<U201D> \x94 |0
+<U201E> \x84 |0
+<U2020> \x86 |0
+<U2021> \x87 |0
+<U2022> \x95 |0
+<U2026> \x85 |0
+<U2030> \x89 |0
+<U2039> \x8B |0
+<U203A> \x9B |0
+<U20AB> \xFE |0
+<U20AC> \x80 |0
+<U2122> \x99 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/Other/ibm-874.ucm b/mcs/class/I18N/Other/ibm-874.ucm
new file mode 100644
index 00000000000..ecf2d88890f
--- /dev/null
+++ b/mcs/class/I18N/Other/ibm-874.ucm
@@ -0,0 +1,345 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:03 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B0036A.RPMAP100 and 036A34B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-874"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-874
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A2> \xFC |0
+<U00A6> \xFE |0
+<U00AC> \xFD |0
+<U0E01> \xA1 |0
+<U0E02> \xA2 |0
+<U0E03> \xA3 |0
+<U0E04> \xA4 |0
+<U0E05> \xA5 |0
+<U0E06> \xA6 |0
+<U0E07> \xA7 |0
+<U0E08> \xA8 |0
+<U0E09> \xA9 |0
+<U0E0A> \xAA |0
+<U0E0B> \xAB |0
+<U0E0C> \xAC |0
+<U0E0D> \xAD |0
+<U0E0E> \xAE |0
+<U0E0F> \xAF |0
+<U0E10> \xB0 |0
+<U0E11> \xB1 |0
+<U0E12> \xB2 |0
+<U0E13> \xB3 |0
+<U0E14> \xB4 |0
+<U0E15> \xB5 |0
+<U0E16> \xB6 |0
+<U0E17> \xB7 |0
+<U0E18> \xB8 |0
+<U0E19> \xB9 |0
+<U0E1A> \xBA |0
+<U0E1B> \xBB |0
+<U0E1C> \xBC |0
+<U0E1D> \xBD |0
+<U0E1E> \xBE |0
+<U0E1F> \xBF |0
+<U0E20> \xC0 |0
+<U0E21> \xC1 |0
+<U0E22> \xC2 |0
+<U0E23> \xC3 |0
+<U0E24> \xC4 |0
+<U0E25> \xC5 |0
+<U0E26> \xC6 |0
+<U0E27> \xC7 |0
+<U0E28> \xC8 |0
+<U0E29> \xC9 |0
+<U0E2A> \xCA |0
+<U0E2B> \xCB |0
+<U0E2C> \xCC |0
+<U0E2D> \xCD |0
+<U0E2E> \xCE |0
+<U0E2F> \xCF |0
+<U0E30> \xD0 |0
+<U0E31> \xD1 |0
+<U0E32> \xD2 |0
+<U0E33> \xD3 |0
+<U0E34> \xD4 |0
+<U0E35> \xD5 |0
+<U0E36> \xD6 |0
+<U0E37> \xD7 |0
+<U0E38> \xD8 |0
+<U0E39> \xD9 |0
+<U0E3A> \xDA |0
+<U0E3F> \xDF |0
+<U0E40> \xE0 |0
+<U0E41> \xE1 |0
+<U0E42> \xE2 |0
+<U0E43> \xE3 |0
+<U0E44> \xE4 |0
+<U0E45> \xE5 |0
+<U0E46> \xE6 |0
+<U0E47> \xE7 |0
+<U0E48> \xA0 |3
+<U0E48> \xE8 |0
+<U0E49> \xDB |3
+<U0E49> \xE9 |0
+<U0E4A> \xDC |3
+<U0E4A> \xEA |0
+<U0E4B> \xDD |3
+<U0E4B> \xEB |0
+<U0E4C> \xDE |3
+<U0E4C> \xEC |0
+<U0E4D> \xED |0
+<U0E4E> \xEE |0
+<U0E4F> \xEF |0
+<U0E50> \xF0 |0
+<U0E51> \xF1 |0
+<U0E52> \xF2 |0
+<U0E53> \xF3 |0
+<U0E54> \xF4 |0
+<U0E55> \xF5 |0
+<U0E56> \xF6 |0
+<U0E57> \xF7 |0
+<U0E58> \xF8 |0
+<U0E59> \xF9 |0
+<U0E5A> \xFA |0
+<U0E5B> \xFB |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/Other/ibm-878.ucm b/mcs/class/I18N/Other/ibm-878.ucm
new file mode 100644
index 00000000000..e564740a787
--- /dev/null
+++ b/mcs/class/I18N/Other/ibm-878.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:03 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B0036E.RPMAP100 and 036E34B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-878"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-878
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U00A0> \x9A |0
+<U00A9> \xBF |0
+<U00B0> \x9C |0
+<U00B2> \x9D |0
+<U00B7> \x9E |0
+<U00F7> \x9F |0
+<U0401> \xB3 |0
+<U0410> \xE1 |0
+<U0411> \xE2 |0
+<U0412> \xF7 |0
+<U0413> \xE7 |0
+<U0414> \xE4 |0
+<U0415> \xE5 |0
+<U0416> \xF6 |0
+<U0417> \xFA |0
+<U0418> \xE9 |0
+<U0419> \xEA |0
+<U041A> \xEB |0
+<U041B> \xEC |0
+<U041C> \xED |0
+<U041D> \xEE |0
+<U041E> \xEF |0
+<U041F> \xF0 |0
+<U0420> \xF2 |0
+<U0421> \xF3 |0
+<U0422> \xF4 |0
+<U0423> \xF5 |0
+<U0424> \xE6 |0
+<U0425> \xE8 |0
+<U0426> \xE3 |0
+<U0427> \xFE |0
+<U0428> \xFB |0
+<U0429> \xFD |0
+<U042A> \xFF |0
+<U042B> \xF9 |0
+<U042C> \xF8 |0
+<U042D> \xFC |0
+<U042E> \xE0 |0
+<U042F> \xF1 |0
+<U0430> \xC1 |0
+<U0431> \xC2 |0
+<U0432> \xD7 |0
+<U0433> \xC7 |0
+<U0434> \xC4 |0
+<U0435> \xC5 |0
+<U0436> \xD6 |0
+<U0437> \xDA |0
+<U0438> \xC9 |0
+<U0439> \xCA |0
+<U043A> \xCB |0
+<U043B> \xCC |0
+<U043C> \xCD |0
+<U043D> \xCE |0
+<U043E> \xCF |0
+<U043F> \xD0 |0
+<U0440> \xD2 |0
+<U0441> \xD3 |0
+<U0442> \xD4 |0
+<U0443> \xD5 |0
+<U0444> \xC6 |0
+<U0445> \xC8 |0
+<U0446> \xC3 |0
+<U0447> \xDE |0
+<U0448> \xDB |0
+<U0449> \xDD |0
+<U044A> \xDF |0
+<U044B> \xD9 |0
+<U044C> \xD8 |0
+<U044D> \xDC |0
+<U044E> \xC0 |0
+<U044F> \xD1 |0
+<U0451> \xA3 |0
+<U2219> \x95 |0
+<U221A> \x96 |0
+<U2248> \x97 |0
+<U2264> \x98 |0
+<U2265> \x99 |0
+<U2320> \x93 |0
+<U2321> \x9B |0
+<U2500> \x80 |0
+<U2502> \x81 |0
+<U250C> \x82 |0
+<U2510> \x83 |0
+<U2514> \x84 |0
+<U2518> \x85 |0
+<U251C> \x86 |0
+<U2524> \x87 |0
+<U252C> \x88 |0
+<U2534> \x89 |0
+<U253C> \x8A |0
+<U2550> \xA0 |0
+<U2551> \xA1 |0
+<U2552> \xA2 |0
+<U2553> \xA4 |0
+<U2554> \xA5 |0
+<U2555> \xA6 |0
+<U2556> \xA7 |0
+<U2557> \xA8 |0
+<U2558> \xA9 |0
+<U2559> \xAA |0
+<U255A> \xAB |0
+<U255B> \xAC |0
+<U255C> \xAD |0
+<U255D> \xAE |0
+<U255E> \xAF |0
+<U255F> \xB0 |0
+<U2560> \xB1 |0
+<U2561> \xB2 |0
+<U2562> \xB4 |0
+<U2563> \xB5 |0
+<U2564> \xB6 |0
+<U2565> \xB7 |0
+<U2566> \xB8 |0
+<U2567> \xB9 |0
+<U2568> \xBA |0
+<U2569> \xBB |0
+<U256A> \xBC |0
+<U256B> \xBD |0
+<U256C> \xBE |0
+<U2580> \x8B |0
+<U2584> \x8C |0
+<U2588> \x8D |0
+<U258C> \x8E |0
+<U2590> \x8F |0
+<U2591> \x90 |0
+<U2592> \x91 |0
+<U2593> \x92 |0
+<U25A0> \x94 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \x81 |1
+<UFFED> \x94 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Other/ibm-914.ucm b/mcs/class/I18N/Other/ibm-914.ucm
new file mode 100644
index 00000000000..afafc4f22e3
--- /dev/null
+++ b/mcs/class/I18N/Other/ibm-914.ucm
@@ -0,0 +1,377 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:04 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00392.RPMAP100 and 039234B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-914"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-914
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A4> \xA4 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00AD> \xAD |0
+<U00AF> \xAF |0
+<U00B0> \xB0 |0
+<U00B4> \xB4 |0
+<U00B8> \xB8 |0
+<U00C1> \xC1 |0
+<U00C2> \xC2 |0
+<U00C3> \xC3 |0
+<U00C4> \xC4 |0
+<U00C5> \xC5 |0
+<U00C6> \xC6 |0
+<U00C9> \xC9 |0
+<U00CB> \xCB |0
+<U00CD> \xCD |0
+<U00CE> \xCE |0
+<U00D4> \xD4 |0
+<U00D5> \xD5 |0
+<U00D6> \xD6 |0
+<U00D7> \xD7 |0
+<U00D8> \xD8 |0
+<U00DA> \xDA |0
+<U00DB> \xDB |0
+<U00DC> \xDC |0
+<U00DF> \xDF |0
+<U00E1> \xE1 |0
+<U00E2> \xE2 |0
+<U00E3> \xE3 |0
+<U00E4> \xE4 |0
+<U00E5> \xE5 |0
+<U00E6> \xE6 |0
+<U00E9> \xE9 |0
+<U00EB> \xEB |0
+<U00ED> \xED |0
+<U00EE> \xEE |0
+<U00F4> \xF4 |0
+<U00F5> \xF5 |0
+<U00F6> \xF6 |0
+<U00F7> \xF7 |0
+<U00F8> \xF8 |0
+<U00FA> \xFA |0
+<U00FB> \xFB |0
+<U00FC> \xFC |0
+<U0100> \xC0 |0
+<U0101> \xE0 |0
+<U0104> \xA1 |0
+<U0105> \xB1 |0
+<U010C> \xC8 |0
+<U010D> \xE8 |0
+<U0110> \xD0 |0
+<U0111> \xF0 |0
+<U0112> \xAA |0
+<U0113> \xBA |0
+<U0116> \xCC |0
+<U0117> \xEC |0
+<U0118> \xCA |0
+<U0119> \xEA |0
+<U0122> \xAB |0
+<U0123> \xBB |0
+<U0128> \xA5 |0
+<U0129> \xB5 |0
+<U012A> \xCF |0
+<U012B> \xEF |0
+<U012E> \xC7 |0
+<U012F> \xE7 |0
+<U0136> \xD3 |0
+<U0137> \xF3 |0
+<U0138> \xA2 |0
+<U013B> \xA6 |0
+<U013C> \xB6 |0
+<U0145> \xD1 |0
+<U0146> \xF1 |0
+<U014A> \xBD |0
+<U014B> \xBF |0
+<U014C> \xD2 |0
+<U014D> \xF2 |0
+<U0156> \xA3 |0
+<U0157> \xB3 |0
+<U0160> \xA9 |0
+<U0161> \xB9 |0
+<U0166> \xAC |0
+<U0167> \xBC |0
+<U0168> \xDD |0
+<U0169> \xFD |0
+<U016A> \xDE |0
+<U016B> \xFE |0
+<U0172> \xD9 |0
+<U0173> \xF9 |0
+<U017D> \xAE |0
+<U017E> \xBE |0
+<U02C7> \xB7 |0
+<U02D9> \xFF |0
+<U02DB> \xB2 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/Other/ibm-915.ucm b/mcs/class/I18N/Other/ibm-915.ucm
new file mode 100644
index 00000000000..94e83ddceb4
--- /dev/null
+++ b/mcs/class/I18N/Other/ibm-915.ucm
@@ -0,0 +1,377 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:04 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00393.RPMAP100 and 039334B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-915"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-915
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A7> \xFD |0
+<U00AD> \xAD |0
+<U0401> \xA1 |0
+<U0402> \xA2 |0
+<U0403> \xA3 |0
+<U0404> \xA4 |0
+<U0405> \xA5 |0
+<U0406> \xA6 |0
+<U0407> \xA7 |0
+<U0408> \xA8 |0
+<U0409> \xA9 |0
+<U040A> \xAA |0
+<U040B> \xAB |0
+<U040C> \xAC |0
+<U040E> \xAE |0
+<U040F> \xAF |0
+<U0410> \xB0 |0
+<U0411> \xB1 |0
+<U0412> \xB2 |0
+<U0413> \xB3 |0
+<U0414> \xB4 |0
+<U0415> \xB5 |0
+<U0416> \xB6 |0
+<U0417> \xB7 |0
+<U0418> \xB8 |0
+<U0419> \xB9 |0
+<U041A> \xBA |0
+<U041B> \xBB |0
+<U041C> \xBC |0
+<U041D> \xBD |0
+<U041E> \xBE |0
+<U041F> \xBF |0
+<U0420> \xC0 |0
+<U0421> \xC1 |0
+<U0422> \xC2 |0
+<U0423> \xC3 |0
+<U0424> \xC4 |0
+<U0425> \xC5 |0
+<U0426> \xC6 |0
+<U0427> \xC7 |0
+<U0428> \xC8 |0
+<U0429> \xC9 |0
+<U042A> \xCA |0
+<U042B> \xCB |0
+<U042C> \xCC |0
+<U042D> \xCD |0
+<U042E> \xCE |0
+<U042F> \xCF |0
+<U0430> \xD0 |0
+<U0431> \xD1 |0
+<U0432> \xD2 |0
+<U0433> \xD3 |0
+<U0434> \xD4 |0
+<U0435> \xD5 |0
+<U0436> \xD6 |0
+<U0437> \xD7 |0
+<U0438> \xD8 |0
+<U0439> \xD9 |0
+<U043A> \xDA |0
+<U043B> \xDB |0
+<U043C> \xDC |0
+<U043D> \xDD |0
+<U043E> \xDE |0
+<U043F> \xDF |0
+<U0440> \xE0 |0
+<U0441> \xE1 |0
+<U0442> \xE2 |0
+<U0443> \xE3 |0
+<U0444> \xE4 |0
+<U0445> \xE5 |0
+<U0446> \xE6 |0
+<U0447> \xE7 |0
+<U0448> \xE8 |0
+<U0449> \xE9 |0
+<U044A> \xEA |0
+<U044B> \xEB |0
+<U044C> \xEC |0
+<U044D> \xED |0
+<U044E> \xEE |0
+<U044F> \xEF |0
+<U0451> \xF1 |0
+<U0452> \xF2 |0
+<U0453> \xF3 |0
+<U0454> \xF4 |0
+<U0455> \xF5 |0
+<U0456> \xF6 |0
+<U0457> \xF7 |0
+<U0458> \xF8 |0
+<U0459> \xF9 |0
+<U045A> \xFA |0
+<U045B> \xFB |0
+<U045C> \xFC |0
+<U045E> \xFE |0
+<U045F> \xFF |0
+<U2116> \xF0 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/Other/koi8-u.ucm b/mcs/class/I18N/Other/koi8-u.ucm
new file mode 100644
index 00000000000..8ed9c3df14c
--- /dev/null
+++ b/mcs/class/I18N/Other/koi8-u.ucm
@@ -0,0 +1,363 @@
+% This file is a combination of the glibc-2.2.5 charmap for
+% koi8-u, adjusted to IBM's UCM syntax, with extra characters
+% added for full-width Latin 1 -- Rhys Weatherley, 17 April 2002.
+
+<code_set_name> KOI8-U
+<comment_char> %
+<escape_char> /
+% version: 1.1
+%  source: RFC 2319
+%  source: http://www.net.ua/KOI8-U/
+
+CHARMAP
+<U0000>     \x00         |0  NULL (NUL)
+<U0001>     \x01         |0  START OF HEADING (SOH)
+<U0002>     \x02         |0  START OF TEXT (STX)
+<U0003>     \x03         |0  END OF TEXT (ETX)
+<U0004>     \x04         |0  END OF TRANSMISSION (EOT)
+<U0005>     \x05         |0  ENQUIRY (ENQ)
+<U0006>     \x06         |0  ACKNOWLEDGE (ACK)
+<U0007>     \x07         |0  BELL (BEL)
+<U0008>     \x08         |0  BACKSPACE (BS)
+<U0009>     \x09         |0  CHARACTER TABULATION (HT)
+<U000A>     \x0a         |0  LINE FEED (LF)
+<U000B>     \x0b         |0  LINE TABULATION (VT)
+<U000C>     \x0c         |0  FORM FEED (FF)
+<U000D>     \x0d         |0  CARRIAGE RETURN (CR)
+<U000E>     \x0e         |0  SHIFT OUT (SO)
+<U000F>     \x0f         |0  SHIFT IN (SI)
+<U0010>     \x10         |0  DATALINK ESCAPE (DLE)
+<U0011>     \x11         |0  DEVICE CONTROL ONE (DC1)
+<U0012>     \x12         |0  DEVICE CONTROL TWO (DC2)
+<U0013>     \x13         |0  DEVICE CONTROL THREE (DC3)
+<U0014>     \x14         |0  DEVICE CONTROL FOUR (DC4)
+<U0015>     \x15         |0  NEGATIVE ACKNOWLEDGE (NAK)
+<U0016>     \x16         |0  SYNCHRONOUS IDLE (SYN)
+<U0017>     \x17         |0  END OF TRANSMISSION BLOCK (ETB)
+<U0018>     \x18         |0  CANCEL (CAN)
+<U0019>     \x19         |0  END OF MEDIUM (EM)
+<U001A>     \x1a         |0  SUBSTITUTE (SUB)
+<U001B>     \x1b         |0  ESCAPE (ESC)
+<U001C>     \x1c         |0  FILE SEPARATOR (IS4)
+<U001D>     \x1d         |0  GROUP SEPARATOR (IS3)
+<U001E>     \x1e         |0  RECORD SEPARATOR (IS2)
+<U001F>     \x1f         |0  UNIT SEPARATOR (IS1)
+<U0020>     \x20         |0  SPACE
+<U0021>     \x21         |0  EXCLAMATION MARK
+<U0022>     \x22         |0  QUOTATION MARK
+<U0023>     \x23         |0  NUMBER SIGN
+<U0024>     \x24         |0  DOLLAR SIGN
+<U0025>     \x25         |0  PERCENT SIGN
+<U0026>     \x26         |0  AMPERSAND
+<U0027>     \x27         |0  APOSTROPHE
+<U0028>     \x28         |0  LEFT PARENTHESIS
+<U0029>     \x29         |0  RIGHT PARENTHESIS
+<U002A>     \x2a         |0  ASTERISK
+<U002B>     \x2b         |0  PLUS SIGN
+<U002C>     \x2c         |0  COMMA
+<U002D>     \x2d         |0  HYPHEN-MINUS
+<U002E>     \x2e         |0  FULL STOP
+<U002F>     \x2f         |0  SOLIDUS
+<U0030>     \x30         |0  DIGIT ZERO
+<U0031>     \x31         |0  DIGIT ONE
+<U0032>     \x32         |0  DIGIT TWO
+<U0033>     \x33         |0  DIGIT THREE
+<U0034>     \x34         |0  DIGIT FOUR
+<U0035>     \x35         |0  DIGIT FIVE
+<U0036>     \x36         |0  DIGIT SIX
+<U0037>     \x37         |0  DIGIT SEVEN
+<U0038>     \x38         |0  DIGIT EIGHT
+<U0039>     \x39         |0  DIGIT NINE
+<U003A>     \x3a         |0  COLON
+<U003B>     \x3b         |0  SEMICOLON
+<U003C>     \x3c         |0  LESS-THAN SIGN
+<U003D>     \x3d         |0  EQUALS SIGN
+<U003E>     \x3e         |0  GREATER-THAN SIGN
+<U003F>     \x3f         |0  QUESTION MARK
+<U0040>     \x40         |0  COMMERCIAL AT
+<U0041>     \x41         |0  LATIN CAPITAL LETTER A
+<U0042>     \x42         |0  LATIN CAPITAL LETTER B
+<U0043>     \x43         |0  LATIN CAPITAL LETTER C
+<U0044>     \x44         |0  LATIN CAPITAL LETTER D
+<U0045>     \x45         |0  LATIN CAPITAL LETTER E
+<U0046>     \x46         |0  LATIN CAPITAL LETTER F
+<U0047>     \x47         |0  LATIN CAPITAL LETTER G
+<U0048>     \x48         |0  LATIN CAPITAL LETTER H
+<U0049>     \x49         |0  LATIN CAPITAL LETTER I
+<U004A>     \x4a         |0  LATIN CAPITAL LETTER J
+<U004B>     \x4b         |0  LATIN CAPITAL LETTER K
+<U004C>     \x4c         |0  LATIN CAPITAL LETTER L
+<U004D>     \x4d         |0  LATIN CAPITAL LETTER M
+<U004E>     \x4e         |0  LATIN CAPITAL LETTER N
+<U004F>     \x4f         |0  LATIN CAPITAL LETTER O
+<U0050>     \x50         |0  LATIN CAPITAL LETTER P
+<U0051>     \x51         |0  LATIN CAPITAL LETTER Q
+<U0052>     \x52         |0  LATIN CAPITAL LETTER R
+<U0053>     \x53         |0  LATIN CAPITAL LETTER S
+<U0054>     \x54         |0  LATIN CAPITAL LETTER T
+<U0055>     \x55         |0  LATIN CAPITAL LETTER U
+<U0056>     \x56         |0  LATIN CAPITAL LETTER V
+<U0057>     \x57         |0  LATIN CAPITAL LETTER W
+<U0058>     \x58         |0  LATIN CAPITAL LETTER X
+<U0059>     \x59         |0  LATIN CAPITAL LETTER Y
+<U005A>     \x5a         |0  LATIN CAPITAL LETTER Z
+<U005B>     \x5b         |0  LEFT SQUARE BRACKET
+<U005C>     \x5c         |0  REVERSE SOLIDUS
+<U005D>     \x5d         |0  RIGHT SQUARE BRACKET
+<U005E>     \x5e         |0  CIRCUMFLEX ACCENT
+<U005F>     \x5f         |0  LOW LINE
+<U0060>     \x60         |0  GRAVE ACCENT
+<U0061>     \x61         |0  LATIN SMALL LETTER A
+<U0062>     \x62         |0  LATIN SMALL LETTER B
+<U0063>     \x63         |0  LATIN SMALL LETTER C
+<U0064>     \x64         |0  LATIN SMALL LETTER D
+<U0065>     \x65         |0  LATIN SMALL LETTER E
+<U0066>     \x66         |0  LATIN SMALL LETTER F
+<U0067>     \x67         |0  LATIN SMALL LETTER G
+<U0068>     \x68         |0  LATIN SMALL LETTER H
+<U0069>     \x69         |0  LATIN SMALL LETTER I
+<U006A>     \x6a         |0  LATIN SMALL LETTER J
+<U006B>     \x6b         |0  LATIN SMALL LETTER K
+<U006C>     \x6c         |0  LATIN SMALL LETTER L
+<U006D>     \x6d         |0  LATIN SMALL LETTER M
+<U006E>     \x6e         |0  LATIN SMALL LETTER N
+<U006F>     \x6f         |0  LATIN SMALL LETTER O
+<U0070>     \x70         |0  LATIN SMALL LETTER P
+<U0071>     \x71         |0  LATIN SMALL LETTER Q
+<U0072>     \x72         |0  LATIN SMALL LETTER R
+<U0073>     \x73         |0  LATIN SMALL LETTER S
+<U0074>     \x74         |0  LATIN SMALL LETTER T
+<U0075>     \x75         |0  LATIN SMALL LETTER U
+<U0076>     \x76         |0  LATIN SMALL LETTER V
+<U0077>     \x77         |0  LATIN SMALL LETTER W
+<U0078>     \x78         |0  LATIN SMALL LETTER X
+<U0079>     \x79         |0  LATIN SMALL LETTER Y
+<U007A>     \x7a         |0  LATIN SMALL LETTER Z
+<U007B>     \x7b         |0  LEFT CURLY BRACKET
+<U007C>     \x7c         |0  VERTICAL LINE
+<U007D>     \x7d         |0  RIGHT CURLY BRACKET
+<U007E>     \x7e         |0  TILDE
+<U007F>     \x7f         |0  DELETE (DEL)
+<U2500>     \x80         |0  BOX DRAWINGS LIGHT HORIZONTAL
+<U2502>     \x81         |0  BOX DRAWINGS LIGHT VERTICAL
+<U250C>     \x82         |0  BOX DRAWINGS LIGHT DOWN AND RIGHT
+<U2510>     \x83         |0  BOX DRAWINGS LIGHT DOWN AND LEFT
+<U2514>     \x84         |0  BOX DRAWINGS LIGHT UP AND RIGHT
+<U2518>     \x85         |0  BOX DRAWINGS LIGHT UP AND LEFT
+<U251C>     \x86         |0  BOX DRAWINGS LIGHT VERTICAL AND RIGHT
+<U2524>     \x87         |0  BOX DRAWINGS LIGHT VERTICAL AND LEFT
+<U252C>     \x88         |0  BOX DRAWINGS LIGHT DOWN AND HORIZONTAL
+<U2534>     \x89         |0  BOX DRAWINGS LIGHT UP AND HORIZONTAL
+<U253C>     \x8a         |0  BOX DRAWINGS LIGHT VERTICAL AND HORIZONTAL
+<U2580>     \x8b         |0  UPPER HALF BLOCK
+<U2584>     \x8c         |0  LOWER HALF BLOCK
+<U2588>     \x8d         |0  FULL BLOCK
+<U258C>     \x8e         |0  LEFT HALF BLOCK
+<U2590>     \x8f         |0  RIGHT HALF BLOCK
+<U2591>     \x90         |0  LIGHT SHADE
+<U2592>     \x91         |0  MEDIUM SHADE
+<U2593>     \x92         |0  DARK SHADE
+<U2320>     \x93         |0  TOP HALF INTEGRAL
+<U25A0>     \x94         |0  BLACK SQUARE
+<U2219>     \x95         |0  BULLET OPERATOR
+<U221A>     \x96         |0  SQUARE ROOT
+<U2248>     \x97         |0  ALMOST EQUAL TO
+<U2264>     \x98         |0  LESS THAN OR EQUAL TO
+<U2265>     \x99         |0  GREATER THAN OR EQUAL TO
+<U00A0>     \x9a         |0  NO-BREAK SPACE
+<U2321>     \x9b         |0  BOTTOM HALF INTEGRAL
+<U00B0>     \x9c         |0  DEGREE SIGN
+<U00B2>     \x9d         |0  SUPERSCRIPT DIGIT TWO
+<U00B7>     \x9e         |0  MIDDLE DOT
+<U00F7>     \x9f         |0  DIVISION SIGN
+<U2550>     \xa0         |0  BOX DRAWINGS DOUBLE HORIZONTAL
+<U2551>     \xa1         |0  BOX DRAWINGS DOUBLE VERTICAL
+<U2552>     \xa2         |0  BOX DRAWINGS DOWN SINGLE AND RIGHT DOUBLE
+<U0451>     \xa3         |0  CYRILLIC SMALL LETTER IO
+<U0454>     \xa4         |0  CYRILLIC SMALL LETTER UKRAINIAN IE
+<U2554>     \xa5         |0  BOX DRAWINGS DOUBLE DOWN AND RIGHT
+<U0456>     \xa6         |0  CYRILLIC SMALL LETTER BYELORUSSIAN-UKRAINIAN I
+<U0457>     \xa7         |0  CYRILLIC SMALL LETTER YI (Ukrainian)
+<U2557>     \xa8         |0  BOX DRAWINGS DOUBLE DOWN AND LEFT
+<U2558>     \xa9         |0  BOX DRAWINGS UP SINGLE AND RIGHT DOUBLE
+<U2559>     \xaa         |0  BOX DRAWINGS UP DOUBLE AND RIGHT SINGLE
+<U255A>     \xab         |0  BOX DRAWINGS DOUBLE UP AND RIGHT
+<U255B>     \xac         |0  BOX DRAWINGS UP SINGLE AND LEFT DOUBLE
+<U0491>     \xad         |0  CYRILLIC SMALL LETTER GHE WITH UPTURN
+<U255D>     \xae         |0  BOX DRAWINGS  DOUBLE UP AND LEFT
+<U255E>     \xaf         |0  BOX DRAWINGS VERTICAL SINGLE AND RIGHT DOUBLE
+<U255F>     \xb0         |0  BOX DRAWINGS VERTICAL DOUBLE AND RIGHT SINGLE
+<U2560>     \xb1         |0  BOX DRAWINGS DOUBLE VERTICAL AND RIGHT
+<U2561>     \xb2         |0  BOX DRAWINGS VERTICAL SINGLE AND LEFT DOUBLE
+<U0401>     \xb3         |0  CYRILLIC CAPITAL LETTER IO
+<U0404>     \xb4         |0  CYRILLIC CAPITAL LETTER UKRAINIAN IE
+<U2563>     \xb5         |0  DOUBLE VERTICAL AND LEFT
+<U0406>     \xb6         |0  CYRILLIC CAPITAL LETTER BYELORUSSIAN-UKRAINIAN I
+<U0407>     \xb7         |0  CYRILLIC CAPITAL LETTER YI (Ukrainian)
+<U2566>     \xb8         |0  BOX DRAWINGS DOUBLE DOWN AND HORIZONTAL
+<U2567>     \xb9         |0  BOX DRAWINGS UP SINGLE AND HORIZONTAL DOUBLE
+<U2568>     \xba         |0  BOX DRAWINGS UP DOUBLE AND HORIZONTAL SINGLE
+<U2569>     \xbb         |0  BOX DRAWINGS DOUBLE UP AND HORIZONTAL
+<U256A>     \xbc         |0  BOX DRAWINGS VERTICAL SINGLE AND HORIZONTAL DOUBLE
+<U0490>     \xbd         |0  CYRILLIC CAPITAL LETTER GHE WITH UPTURN
+<U256C>     \xbe         |0  BOX DRAWINGS  DOUBLE VERTICAL AND HORIZONTAL
+<U00A9>     \xbf         |0  COPYRIGHT SIGN
+<U044E>     \xc0         |0  CYRILLIC SMALL LETTER YU
+<U0430>     \xc1         |0  CYRILLIC SMALL LETTER A
+<U0431>     \xc2         |0  CYRILLIC SMALL LETTER BE
+<U0446>     \xc3         |0  CYRILLIC SMALL LETTER TSE
+<U0434>     \xc4         |0  CYRILLIC SMALL LETTER DE
+<U0435>     \xc5         |0  CYRILLIC SMALL LETTER IE
+<U0444>     \xc6         |0  CYRILLIC SMALL LETTER EF
+<U0433>     \xc7         |0  CYRILLIC SMALL LETTER GHE
+<U0445>     \xc8         |0  CYRILLIC SMALL LETTER HA
+<U0438>     \xc9         |0  CYRILLIC SMALL LETTER I
+<U0439>     \xca         |0  CYRILLIC SMALL LETTER SHORT I
+<U043A>     \xcb         |0  CYRILLIC SMALL LETTER KA
+<U043B>     \xcc         |0  CYRILLIC SMALL LETTER EL
+<U043C>     \xcd         |0  CYRILLIC SMALL LETTER EM
+<U043D>     \xce         |0  CYRILLIC SMALL LETTER EN
+<U043E>     \xcf         |0  CYRILLIC SMALL LETTER O
+<U043F>     \xd0         |0  CYRILLIC SMALL LETTER PE
+<U044F>     \xd1         |0  CYRILLIC SMALL LETTER YA
+<U0440>     \xd2         |0  CYRILLIC SMALL LETTER ER
+<U0441>     \xd3         |0  CYRILLIC SMALL LETTER ES
+<U0442>     \xd4         |0  CYRILLIC SMALL LETTER TE
+<U0443>     \xd5         |0  CYRILLIC SMALL LETTER U
+<U0436>     \xd6         |0  CYRILLIC SMALL LETTER ZHE
+<U0432>     \xd7         |0  CYRILLIC SMALL LETTER VE
+<U044C>     \xd8         |0  CYRILLIC SMALL LETTER SOFT SIGN
+<U044B>     \xd9         |0  CYRILLIC SMALL LETTER YERU
+<U0437>     \xda         |0  CYRILLIC SMALL LETTER ZE
+<U0448>     \xdb         |0  CYRILLIC SMALL LETTER SHA
+<U044D>     \xdc         |0  CYRILLIC SMALL LETTER E
+<U0449>     \xdd         |0  CYRILLIC SMALL LETTER SHCHA
+<U0447>     \xde         |0  CYRILLIC SMALL LETTER CHE
+<U044A>     \xdf         |0  CYRILLIC SMALL LETTER HARD SIGN
+<U042E>     \xe0         |0  CYRILLIC CAPITAL LETTER YU
+<U0410>     \xe1         |0  CYRILLIC CAPITAL LETTER A
+<U0411>     \xe2         |0  CYRILLIC CAPITAL LETTER BE
+<U0426>     \xe3         |0  CYRILLIC CAPITAL LETTER TSE
+<U0414>     \xe4         |0  CYRILLIC CAPITAL LETTER DE
+<U0415>     \xe5         |0  CYRILLIC CAPITAL LETTER IE
+<U0424>     \xe6         |0  CYRILLIC CAPITAL LETTER EF
+<U0413>     \xe7         |0  CYRILLIC CAPITAL LETTER GHE
+<U0425>     \xe8         |0  CYRILLIC CAPITAL LETTER HA
+<U0418>     \xe9         |0  CYRILLIC CAPITAL LETTER I
+<U0419>     \xea         |0  CYRILLIC CAPITAL LETTER SHORT I
+<U041A>     \xeb         |0  CYRILLIC CAPITAL LETTER KA
+<U041B>     \xec         |0  CYRILLIC CAPITAL LETTER EL
+<U041C>     \xed         |0  CYRILLIC CAPITAL LETTER EM
+<U041D>     \xee         |0  CYRILLIC CAPITAL LETTER EN
+<U041E>     \xef         |0  CYRILLIC CAPITAL LETTER O
+<U041F>     \xf0         |0  CYRILLIC CAPITAL LETTER PE
+<U042F>     \xf1         |0  CYRILLIC CAPITAL LETTER YA
+<U0420>     \xf2         |0  CYRILLIC CAPITAL LETTER ER
+<U0421>     \xf3         |0  CYRILLIC CAPITAL LETTER ES
+<U0422>     \xf4         |0  CYRILLIC CAPITAL LETTER TE
+<U0423>     \xf5         |0  CYRILLIC CAPITAL LETTER U
+<U0416>     \xf6         |0  CYRILLIC CAPITAL LETTER ZHE
+<U0412>     \xf7         |0  CYRILLIC CAPITAL LETTER VE
+<U042C>     \xf8         |0  CYRILLIC CAPITAL LETTER SOFT SIGN
+<U042B>     \xf9         |0  CYRILLIC CAPITAL LETTER YERU
+<U0417>     \xfa         |0  CYRILLIC CAPITAL LETTER ZE
+<U0428>     \xfb         |0  CYRILLIC CAPITAL LETTER SHA
+<U042D>     \xfc         |0  CYRILLIC CAPITAL LETTER E
+<U0429>     \xfd         |0  CYRILLIC CAPITAL LETTER SHCHA
+<U0427>     \xfe         |0  CYRILLIC CAPITAL LETTER CHE
+<U042A>     \xff         |0  CYRILLIC CAPITAL LETTER HARD SIGN
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/Other/list.unix b/mcs/class/I18N/Other/list.unix
new file mode 100755
index 00000000000..ba7d74a68db
--- /dev/null
+++ b/mcs/class/I18N/Other/list.unix
@@ -0,0 +1,9 @@
+CP1251.cs
+CP1257.cs
+CP1258.cs
+CP20866.cs
+CP21866.cs
+CP28594.cs
+CP28595.cs
+CP57002.cs
+CP874.cs
diff --git a/mcs/class/I18N/Other/makefile.gnu b/mcs/class/I18N/Other/makefile.gnu
new file mode 100755
index 00000000000..5909aa0fc7e
--- /dev/null
+++ b/mcs/class/I18N/Other/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../../..
+
+LIBRARY = ../../lib/I18N.Other.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib -r mscorlib -r I18N
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=
+
+export MONO_PATH_PREFIX = ../../lib:
+
+include ../../library.make
diff --git a/mcs/class/I18N/README b/mcs/class/I18N/README
new file mode 100644
index 00000000000..29852983254
--- /dev/null
+++ b/mcs/class/I18N/README
@@ -0,0 +1,158 @@
+
+I18N: Pnetlib Internationalization Framework Libary
+===================================================
+
+Using the library
+-----------------
+
+This library provides plug-in i18n module support for C# base class
+libraries such as pnetlib's "runtime".  The base class library uses
+it as follows:
+
+    - Load the "I18N.dll" assembly using "System.Reflection.Assembly.Load".
+
+    - Obtain the value of the static "PrimaryManager" property within the
+      "I18N.Common.Manager" class using "System.Reflection" facilities.
+
+    - Invoke methods on the manager class to obtain i18n-sensitive
+      objects such as "CultureInfo" and "Encoding" instances.
+
+    - The "I18N.Common.Manager" class loads the requested i18n object
+      and returns it to the base class library, which can then use it
+      in the usual fashion.
+
+A more detailed example is given in a later section.
+
+I18N handlers
+-------------
+
+Because there are so many i18n-sensitive cases to be handled, the culture
+information has been split across several region-specific assemblies:
+
+    I18N.CJK.dll
+    I18N.MidEast.dll
+    I18N.Other.dll
+    I18N.Rare.dll
+    I18N.West.dll
+
+The "I18N.dll" assembly only loads those region-specific assemblies that
+it needs, based on the user's requests.
+
+I18N handlers within these assemblies use the naming convention
+"I18N.<Region>.<Prefix><Value>" where:
+
+    <Region>
+        The region handler.  e.g. "West", "CJK", "India", etc.
+
+    <Prefix>
+        The prefix for the handler type.
+
+    <Value>
+        The identifier value which is supplied by the caller.
+        e.g. a culture identifier, an encoding name, etc.
+
+The following prefixes are supported:
+
+    CP
+        Code page handler.  e.g. "CP1252".
+
+    ENC
+        Web encoding handler.  e.g. "ENCiso_8869_8".
+
+    CID
+        Culture, based on identifier.  e.g. "CID2c01".
+
+    CIDO
+
+        Culture, based on identifier, with user overrides.  e.g. "CIDO2c01".
+        Falls back to the "CID" handler if no override handler.
+
+    CN
+        Culture, based on name.  e.g. "CNar_jo".
+
+    CNO
+        Culture, based on name, with user overrides.  e.g. "CNOar_jo".
+        Falls back to the "CN" handler if no override handler.
+
+Handlers that are based on name will normalize the name to be in all
+lower case, with all instances of '-' replaced with '_'.
+
+The "I18N.dll" assembly knows which region assembly to load from the
+"I18N-handlers.def" file.  This file is automatically generated during
+the build process and contains a list of all I18N handler classes.
+It must reside in the same directory as "I18N.dll".
+
+Example
+-------
+
+As an example of the I18N loading process, we will describe what happens
+when code page 932 is requested:
+
+    - The user's code calls "System.Text.Encoding.GetEncoding(932)".
+
+    - The "Encoding" class loads "I18N.dll" using reflection.
+
+    - The "Encoding" class accesses the "PrimaryManager" property via
+      reflection to get an instance of "I18N.Common.Manager".
+
+    - The "Encoding" class calls the "GetEncoding(int)" method on
+      the "I18N.Common.Manager" instance using reflection.
+
+    - "I18N.Common.Manager" constructs the name of the handler class - "CP932".
+
+    - The file "I18N-handlers.def" is consulted to determine the full
+      namespace and name of the "CP932" class - "I18N.CJK.CP932".
+
+    - The region assembly "I18N.CJK.dll" is loaded using reflection.
+
+    - An instance of the class "I18N.CJK.CP923" in the loaded assembly
+      is constructed and returned to the caller.
+
+The results of previous requests are cached to smooth overall performance
+of the system.
+
+Dependencies
+------------
+
+This section describes the facilities that must be available from the
+base class library to make the I18N framework function.
+
+The framework makes heavy use of facilities from "System.Reflection"
+to load assemblies and to access their contents.
+
+String resources are assumed to be embedded as manifest string resources,
+based on tag names.  The "I18N.Common.Strings" class takes care of the
+resource needs of all of the I18N assemblies.  It relies upon a working
+implementation of "ResourceManager", that can load and process manifest
+string resources.
+
+It is assumed that the base class library contains its own implementation
+of the invariant culture.  i.e. the invariant culture cannot be loaded
+dynamically.
+
+The "I18N.CJK.dll" assembly contains a single "InternalCall" method in
+the "I18N.CJK.CodeTable" class if the "__PNET__" symbol is defined when
+the assembly is compiled.  This gives more efficient access to conversion
+CJK tables when running on the Portable.NET runtime engine.  If the
+"__PNET__" symbol is not defined, then the implementation will fall back
+to a less efficient way of loading the tables.
+
+The method "System.Reflection.Assembly.GetFile(String)" is assumed to
+have slightly different semantics to the .NET Framework SDK.  Normally,
+this method accesses a file that is listed in the assembly manifest.
+We have extended it so that it can also access files in the same directory
+as the assembly, even if not mentioned in the manifest.
+
+The altered semantics is necessary to access the "I18N-handlers.def" file,
+which defines which assembly contains which I18N handler.  This file can
+be altered by third parties to install new handler assemblies.
+
+If the runtime engine does not implement the altered "GetFile" semantics,
+the library will fall back to an internal list that must be maintained
+internally and which cannot be dynamically extended by third parties.
+
+Security considerations
+-----------------------
+
+The "GetAddress" and "GetFile" methods need to be implemented carefully
+to prevent arbitrary applications using them to circumvent system security.
diff --git a/mcs/class/I18N/README.mono b/mcs/class/I18N/README.mono
new file mode 100755
index 00000000000..dcedd9c2264
--- /dev/null
+++ b/mcs/class/I18N/README.mono
@@ -0,0 +1,13 @@
+Note: the I18N assemblies code is imported from the pnetlib sources.
+The code was donated by Rhys Weatherley <rweather@southern-storm.com.au>
+for use in mono.
+_Any_ change and bugfix to these assemblies that is not mono-specific 
+should be also sent to the pnetlib maintainers to keep the sources in 
+sync as much as possible.
+
+The code was initially imported with the command:
+	cvs -d login@mono-cvs.ximian.com:/cvs/public import -m "First import" \
+		mcs/class/I18N SAVANNAH_CVS RHYS_20020821
+
+Please follow the same convention for future imports. Thanks.
+
diff --git a/mcs/class/I18N/Rare/CP1026.cs b/mcs/class/I18N/Rare/CP1026.cs
new file mode 100644
index 00000000000..82dffbbd0ca
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1026.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1026.cs - IBM EBCDIC (Turkish) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1026.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1026 : ByteEncoding
+{
+	public CP1026()
+		: base(1026, ToChars, "IBM EBCDIC (Turkish)",
+		       "ibm1026", "ibm1026", "ibm1026",
+		       false, false, false, false, 1254)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u007B', '\u00F1', '\u00C7', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u011E', '\u0130', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u005B', '\u00D1', '\u015F', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0131', '\u003A', '\u00D6', '\u015E', '\u0027', 
+		'\u003D', '\u00DC', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u007D', '\u0060', '\u00A6', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u00A4', '\u00B5', '\u00F6', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u005D', '\u0024', 
+		'\u0040', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u00E7', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u007E', '\u00F2', '\u00F3', '\u00F5', '\u011F', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u005C', '\u00F9', 
+		'\u00FA', '\u00FF', '\u00FC', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u0023', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u0022', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0xFC; break;
+				case 0x0023: ch = 0xEC; break;
+				case 0x0024: ch = 0xAD; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xAE; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x68; break;
+				case 0x005C: ch = 0xDC; break;
+				case 0x005D: ch = 0xAC; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x8D; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x48; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x8C; break;
+				case 0x007E: ch = 0xCC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x8E; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x4A; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0x7B; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0x7F; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0xC0; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xA1; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xE0; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x011E: ch = 0x5A; break;
+				case 0x011F: ch = 0xD0; break;
+				case 0x0130: ch = 0x5B; break;
+				case 0x0131: ch = 0x79; break;
+				case 0x015E: ch = 0x7C; break;
+				case 0x015F: ch = 0x6A; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0xFC; break;
+				case 0xFF03: ch = 0xEC; break;
+				case 0xFF04: ch = 0xAD; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xAE; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x68; break;
+				case 0xFF3C: ch = 0xDC; break;
+				case 0xFF3D: ch = 0xAC; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x8D; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x48; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x8C; break;
+				case 0xFF5E: ch = 0xCC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0xFC; break;
+				case 0x0023: ch = 0xEC; break;
+				case 0x0024: ch = 0xAD; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xAE; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x68; break;
+				case 0x005C: ch = 0xDC; break;
+				case 0x005D: ch = 0xAC; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x8D; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x48; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x8C; break;
+				case 0x007E: ch = 0xCC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x8E; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x4A; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0x7B; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0x7F; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0xC0; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xA1; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xE0; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x011E: ch = 0x5A; break;
+				case 0x011F: ch = 0xD0; break;
+				case 0x0130: ch = 0x5B; break;
+				case 0x0131: ch = 0x79; break;
+				case 0x015E: ch = 0x7C; break;
+				case 0x015F: ch = 0x6A; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0xFC; break;
+				case 0xFF03: ch = 0xEC; break;
+				case 0xFF04: ch = 0xAD; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xAE; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x68; break;
+				case 0xFF3C: ch = 0xDC; break;
+				case 0xFF3D: ch = 0xAC; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x8D; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x48; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x8C; break;
+				case 0xFF5E: ch = 0xCC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1026
+
+public class ENCibm1026 : CP1026
+{
+	public ENCibm1026() : base() {}
+
+}; // class ENCibm1026
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1047.cs b/mcs/class/I18N/Rare/CP1047.cs
new file mode 100644
index 00000000000..9c6da572a3f
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1047.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1047.cs - IBM EBCDIC (Open Systems Latin 1) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1047.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1047 : ByteEncoding
+{
+	public CP1047()
+		: base(1047, ToChars, "IBM EBCDIC (Open Systems Latin 1)",
+		       "ibm1047", "ibm1047", "ibm1047",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u00A2', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u007C', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u0021', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u00A4', '\u00B5', '\u007E', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u005B', 
+		'\u00DE', '\u00AE', '\u00AC', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00DD', '\u00A8', '\u00AF', '\u005D', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xAD; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBD; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0x4A; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBB; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xB0; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xBA; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xAD; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBD; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xAD; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBD; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0x4A; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBB; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xB0; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xBA; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xAD; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBD; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1047
+
+public class ENCibm1047 : CP1047
+{
+	public ENCibm1047() : base() {}
+
+}; // class ENCibm1047
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1140.cs b/mcs/class/I18N/Rare/CP1140.cs
new file mode 100644
index 00000000000..479c3c39875
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1140.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1140.cs - IBM EBCDIC (US-Canada with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1140.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1140 : ByteEncoding
+{
+	public CP1140()
+		: base(1140, ToChars, "IBM EBCDIC (US-Canada with Euro)",
+		       "IBM01140", "IBM01140", "IBM01140",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u00A2', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u007C', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u0021', '\u0024', '\u002A', '\u0029', '\u003B', '\u00AC', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u20AC', '\u00B5', '\u007E', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u005E', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u005B', '\u005D', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xBA; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBB; break;
+				case 0x005E: ch = 0xB0; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0x4A; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xBA; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBB; break;
+				case 0xFF3E: ch = 0xB0; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xBA; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBB; break;
+				case 0x005E: ch = 0xB0; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0x4A; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xBA; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBB; break;
+				case 0xFF3E: ch = 0xB0; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1140
+
+public class ENCibm01140 : CP1140
+{
+	public ENCibm01140() : base() {}
+
+}; // class ENCibm01140
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1141.cs b/mcs/class/I18N/Rare/CP1141.cs
new file mode 100644
index 00000000000..345b13d5cf9
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1141.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1141.cs - IBM EBCDIC (Germany with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1141.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1141 : ByteEncoding
+{
+	public CP1141()
+		: base(1141, ToChars, "IBM EBCDIC (Germany with Euro)",
+		       "IBM01141", "IBM01141", "IBM01141",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u007B', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u00C4', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u007E', 
+		'\u00DC', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u005B', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00F6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u0023', '\u00A7', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u20AC', '\u00B5', '\u00DF', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u0040', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u00E4', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00A6', '\u00F2', '\u00F3', '\u00F5', '\u00FC', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u007D', '\u00F9', 
+		'\u00FA', '\u00FF', '\u00D6', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u005C', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u005D', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xB5; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x63; break;
+				case 0x005C: ch = 0xEC; break;
+				case 0x005D: ch = 0xFC; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x43; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0xDC; break;
+				case 0x007E: ch = 0x59; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCC; break;
+				case 0x00A7: ch = 0x7C; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x4A; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xE0; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0x5A; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0xA1; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0xC0; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0x6A; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xD0; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xB5; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x63; break;
+				case 0xFF3C: ch = 0xEC; break;
+				case 0xFF3D: ch = 0xFC; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x43; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0xDC; break;
+				case 0xFF5E: ch = 0x59; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xB5; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x63; break;
+				case 0x005C: ch = 0xEC; break;
+				case 0x005D: ch = 0xFC; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x43; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0xDC; break;
+				case 0x007E: ch = 0x59; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCC; break;
+				case 0x00A7: ch = 0x7C; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x4A; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xE0; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0x5A; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0xA1; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0xC0; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0x6A; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xD0; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xB5; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x63; break;
+				case 0xFF3C: ch = 0xEC; break;
+				case 0xFF3D: ch = 0xFC; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x43; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0xDC; break;
+				case 0xFF5E: ch = 0x59; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1141
+
+public class ENCibm01141 : CP1141
+{
+	public ENCibm01141() : base() {}
+
+}; // class ENCibm01141
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1142.cs b/mcs/class/I18N/Rare/CP1142.cs
new file mode 100644
index 00000000000..a6d618e23db
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1142.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1142.cs - IBM EBCDIC (Denmark/Norway with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1142.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1142 : ByteEncoding
+{
+	public CP1142()
+		: base(1142, ToChars, "IBM EBCDIC (Denmark/Norway with Euro)",
+		       "IBM01142", "IBM01142", "IBM01142",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u007D', 
+		'\u00E7', '\u00F1', '\u0023', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u20AC', '\u00C5', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u0024', '\u00C7', '\u00D1', '\u00F8', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00A6', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u00C6', '\u00D8', '\u0027', 
+		'\u003D', '\u0022', '\u0040', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u007B', '\u00B8', '\u005B', '\u005D', '\u00B5', '\u00FC', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u00E6', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u00E5', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u007E', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x4A; break;
+				case 0x0024: ch = 0x67; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x80; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x9E; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x9F; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x9C; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x47; break;
+				case 0x007E: ch = 0xDC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x70; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x5B; break;
+				case 0x00C6: ch = 0x7B; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x7C; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0xD0; break;
+				case 0x00E6: ch = 0xC0; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x6A; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xA1; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x5A; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x4A; break;
+				case 0xFF04: ch = 0x67; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x80; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x9E; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x9F; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x9C; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x47; break;
+				case 0xFF5E: ch = 0xDC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x4A; break;
+				case 0x0024: ch = 0x67; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x80; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x9E; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x9F; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x9C; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x47; break;
+				case 0x007E: ch = 0xDC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x70; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x5B; break;
+				case 0x00C6: ch = 0x7B; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x7C; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0xD0; break;
+				case 0x00E6: ch = 0xC0; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x6A; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xA1; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x5A; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x4A; break;
+				case 0xFF04: ch = 0x67; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x80; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x9E; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x9F; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x9C; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x47; break;
+				case 0xFF5E: ch = 0xDC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1142
+
+public class ENCibm01142 : CP1142
+{
+	public ENCibm01142() : base() {}
+
+}; // class ENCibm01142
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1143.cs b/mcs/class/I18N/Rare/CP1143.cs
new file mode 100644
index 00000000000..26566973b89
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1143.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1143.cs - IBM EBCDIC (Finland/Sweden with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1143.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1143 : ByteEncoding
+{
+	public CP1143()
+		: base(1143, ToChars, "IBM EBCDIC (Finland/Sweden with Euro)",
+		       "IBM01143", "IBM01143", "IBM01143",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u007B', '\u00E0', '\u00E1', '\u00E3', '\u007D', 
+		'\u00E7', '\u00F1', '\u00A7', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u0060', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u20AC', '\u00C5', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u0023', '\u00C0', '\u00C1', 
+		'\u00C3', '\u0024', '\u00C7', '\u00D1', '\u00F6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u005C', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u00E9', '\u003A', '\u00C4', '\u00D6', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u005D', '\u00B5', '\u00FC', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u005B', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u00E4', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00A6', '\u00F2', '\u00F3', '\u00F5', '\u00E5', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u007E', '\u00F9', 
+		'\u00FA', '\u00FF', '\u00C9', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u0040', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x63; break;
+				case 0x0024: ch = 0x67; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xEC; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xB5; break;
+				case 0x005C: ch = 0x71; break;
+				case 0x005D: ch = 0x9F; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x51; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x43; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x47; break;
+				case 0x007E: ch = 0xDC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCC; break;
+				case 0x00A7: ch = 0x4A; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x7B; break;
+				case 0x00C5: ch = 0x5B; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0xE0; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0x7C; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0xC0; break;
+				case 0x00E5: ch = 0xD0; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x79; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0x6A; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xA1; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x5A; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x63; break;
+				case 0xFF04: ch = 0x67; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xEC; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xB5; break;
+				case 0xFF3C: ch = 0x71; break;
+				case 0xFF3D: ch = 0x9F; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x51; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x43; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x47; break;
+				case 0xFF5E: ch = 0xDC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x63; break;
+				case 0x0024: ch = 0x67; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xEC; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xB5; break;
+				case 0x005C: ch = 0x71; break;
+				case 0x005D: ch = 0x9F; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x51; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x43; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x47; break;
+				case 0x007E: ch = 0xDC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCC; break;
+				case 0x00A7: ch = 0x4A; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x7B; break;
+				case 0x00C5: ch = 0x5B; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0xE0; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0x7C; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0xC0; break;
+				case 0x00E5: ch = 0xD0; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x79; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0x6A; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xA1; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x5A; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x63; break;
+				case 0xFF04: ch = 0x67; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xEC; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xB5; break;
+				case 0xFF3C: ch = 0x71; break;
+				case 0xFF3D: ch = 0x9F; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x51; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x43; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x47; break;
+				case 0xFF5E: ch = 0xDC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1143
+
+public class ENCibm01143 : CP1143
+{
+	public ENCibm01143() : base() {}
+
+}; // class ENCibm01143
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1144.cs b/mcs/class/I18N/Rare/CP1144.cs
new file mode 100644
index 00000000000..4debbd934eb
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1144.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1144.cs - IBM EBCDIC (Italy with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1144.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1144 : ByteEncoding
+{
+	public CP1144()
+		: base(1144, ToChars, "IBM EBCDIC (Italy with Euro)",
+		       "ibm1144", "ibm1144", "ibm1144",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u007B', '\u00E1', '\u00E3', '\u00E5', 
+		'\u005C', '\u00F1', '\u00B0', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u005D', '\u00EA', '\u00EB', 
+		'\u007D', '\u00ED', '\u00EE', '\u00EF', '\u007E', '\u00DF', 
+		'\u00E9', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00F2', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u00F9', '\u003A', '\u00A3', '\u00A7', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u005B', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u20AC', '\u00B5', '\u00EC', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u0023', '\u00A5', '\u00B7', 
+		'\u00A9', '\u0040', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u00E0', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00A6', '\u00F3', '\u00F5', '\u00E8', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u0060', 
+		'\u00FA', '\u00FF', '\u00E7', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0xB1; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xB5; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x90; break;
+				case 0x005C: ch = 0x48; break;
+				case 0x005D: ch = 0x51; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0xDD; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x44; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x54; break;
+				case 0x007E: ch = 0x58; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x7B; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCD; break;
+				case 0x00A7: ch = 0x7C; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x4A; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0xC0; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0xE0; break;
+				case 0x00E8: ch = 0xD0; break;
+				case 0x00E9: ch = 0x5A; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0xA1; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0x6A; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0x79; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0xB1; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xB5; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x90; break;
+				case 0xFF3C: ch = 0x48; break;
+				case 0xFF3D: ch = 0x51; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0xDD; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x44; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x54; break;
+				case 0xFF5E: ch = 0x58; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0xB1; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xB5; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x90; break;
+				case 0x005C: ch = 0x48; break;
+				case 0x005D: ch = 0x51; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0xDD; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x44; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x54; break;
+				case 0x007E: ch = 0x58; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x7B; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCD; break;
+				case 0x00A7: ch = 0x7C; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x4A; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0xC0; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0xE0; break;
+				case 0x00E8: ch = 0xD0; break;
+				case 0x00E9: ch = 0x5A; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0xA1; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0x6A; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0x79; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0xB1; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xB5; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x90; break;
+				case 0xFF3C: ch = 0x48; break;
+				case 0xFF3D: ch = 0x51; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0xDD; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x44; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x54; break;
+				case 0xFF5E: ch = 0x58; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1144
+
+public class ENCibm1144 : CP1144
+{
+	public ENCibm1144() : base() {}
+
+}; // class ENCibm1144
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1145.cs b/mcs/class/I18N/Rare/CP1145.cs
new file mode 100644
index 00000000000..d2e01263499
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1145.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1145.cs - IBM EBCDIC (Latin America/Spain with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1145.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1145 : ByteEncoding
+{
+	public CP1145()
+		: base(1145, ToChars, "IBM EBCDIC (Latin America/Spain with Euro)",
+		       "ibm1145", "ibm1145", "ibm1145",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00A6', '\u005B', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u007C', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u005D', '\u0024', '\u002A', '\u0029', '\u003B', '\u00AC', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u0023', '\u00F1', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u00D1', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u20AC', '\u00B5', '\u00A8', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u005E', '\u0021', '\u00AF', '\u007E', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0xBB; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x69; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0xBA; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xBD; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x49; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xA1; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x7B; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x6A; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0xBB; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x69; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0xBA; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xBD; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0xBB; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x69; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0xBA; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xBD; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x49; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xA1; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x7B; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x6A; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0xBB; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x69; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0xBA; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xBD; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1145
+
+public class ENCibm1145 : CP1145
+{
+	public ENCibm1145() : base() {}
+
+}; // class ENCibm1145
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1146.cs b/mcs/class/I18N/Rare/CP1146.cs
new file mode 100644
index 00000000000..a68de00de82
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1146.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1146.cs - IBM EBCDIC (United Kingdom with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1146.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1146 : ByteEncoding
+{
+	public CP1146()
+		: base(1146, ToChars, "IBM EBCDIC (United Kingdom with Euro)",
+		       "ibm1146", "ibm1146", "ibm1146",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u0024', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u007C', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u0021', '\u00A3', '\u002A', '\u0029', '\u003B', '\u00AC', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u20AC', '\u00B5', '\u00AF', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u005B', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u005E', '\u005D', '\u007E', '\u00A8', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x4A; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xB1; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBB; break;
+				case 0x005E: ch = 0xBA; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xBC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x5B; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xA1; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xA1; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x4A; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xB1; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBB; break;
+				case 0xFF3E: ch = 0xBA; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xBC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x4A; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xB1; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBB; break;
+				case 0x005E: ch = 0xBA; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xBC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x5B; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xA1; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xA1; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x4A; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xB1; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBB; break;
+				case 0xFF3E: ch = 0xBA; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xBC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1146
+
+public class ENCibm1146 : CP1146
+{
+	public ENCibm1146() : base() {}
+
+}; // class ENCibm1146
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1147.cs b/mcs/class/I18N/Rare/CP1147.cs
new file mode 100644
index 00000000000..700d07bbc94
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1147.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1147.cs - IBM EBCDIC (France with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1147.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1147 : ByteEncoding
+{
+	public CP1147()
+		: base(1147, ToChars, "IBM EBCDIC (France with Euro)",
+		       "ibm1147", "ibm1147", "ibm1147",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u0040', '\u00E1', '\u00E3', '\u00E5', 
+		'\u005C', '\u00F1', '\u00B0', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u007B', '\u00EA', '\u00EB', 
+		'\u007D', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u00A7', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00F9', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u00B5', '\u003A', '\u00A3', '\u00E0', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u005B', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u20AC', '\u0060', '\u00A8', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u0023', '\u00A5', '\u00B7', 
+		'\u00A9', '\u005D', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u007E', '\u00B4', '\u00D7', 
+		'\u00E9', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u00E8', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00A6', 
+		'\u00FA', '\u00FF', '\u00E7', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0xB1; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x44; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x90; break;
+				case 0x005C: ch = 0x48; break;
+				case 0x005D: ch = 0xB5; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0xA0; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x51; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x54; break;
+				case 0x007E: ch = 0xBD; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x7B; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xDD; break;
+				case 0x00A7: ch = 0x5A; break;
+				case 0x00A8: ch = 0xA1; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x4A; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0x79; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x7C; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0xE0; break;
+				case 0x00E8: ch = 0xD0; break;
+				case 0x00E9: ch = 0xC0; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0x6A; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0xB1; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x44; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x90; break;
+				case 0xFF3C: ch = 0x48; break;
+				case 0xFF3D: ch = 0xB5; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0xA0; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x51; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x54; break;
+				case 0xFF5E: ch = 0xBD; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0xB1; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x44; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x90; break;
+				case 0x005C: ch = 0x48; break;
+				case 0x005D: ch = 0xB5; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0xA0; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x51; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x54; break;
+				case 0x007E: ch = 0xBD; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x7B; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xDD; break;
+				case 0x00A7: ch = 0x5A; break;
+				case 0x00A8: ch = 0xA1; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x4A; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0x79; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x7C; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0xE0; break;
+				case 0x00E8: ch = 0xD0; break;
+				case 0x00E9: ch = 0xC0; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0x6A; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0xB1; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x44; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x90; break;
+				case 0xFF3C: ch = 0x48; break;
+				case 0xFF3D: ch = 0xB5; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0xA0; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x51; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x54; break;
+				case 0xFF5E: ch = 0xBD; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1147
+
+public class ENCibm1147 : CP1147
+{
+	public ENCibm1147() : base() {}
+
+}; // class ENCibm1147
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1148.cs b/mcs/class/I18N/Rare/CP1148.cs
new file mode 100644
index 00000000000..6d911aa295c
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1148.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1148.cs - IBM EBCDIC (International with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1148.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1148 : ByteEncoding
+{
+	public CP1148()
+		: base(1148, ToChars, "IBM EBCDIC (International with Euro)",
+		       "ibm1148", "ibm1148", "ibm1148",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u005B', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u005D', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u20AC', '\u00B5', '\u007E', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1148
+
+public class ENCibm1148 : CP1148
+{
+	public ENCibm1148() : base() {}
+
+}; // class ENCibm1148
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP1149.cs b/mcs/class/I18N/Rare/CP1149.cs
new file mode 100644
index 00000000000..97864e9b9c0
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP1149.cs
@@ -0,0 +1,895 @@
+/*
+ * CP1149.cs - IBM EBCDIC (Icelandic with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1149.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP1149 : ByteEncoding
+{
+	public CP1149()
+		: base(1149, ToChars, "IBM EBCDIC (Icelandic with Euro)",
+		       "ibm1149", "ibm1149", "ibm1149",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u00DE', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u00C6', '\u0024', '\u002A', '\u0029', '\u003B', '\u00D6', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u00F0', '\u003A', '\u0023', '\u00D0', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u0060', '\u00FD', '\u007B', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u007D', '\u00B8', '\u005D', '\u20AC', '\u00B5', '\u00F6', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u0040', '\u00DD', 
+		'\u005B', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u005C', '\u00D7', 
+		'\u00FE', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u007E', '\u00F2', '\u00F3', '\u00F5', '\u00E6', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u00B4', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u005E', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xAC; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xAE; break;
+				case 0x005C: ch = 0xBE; break;
+				case 0x005D: ch = 0x9E; break;
+				case 0x005E: ch = 0xEC; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x8C; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x8E; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x9C; break;
+				case 0x007E: ch = 0xCC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xE0; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x5A; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0x7C; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0x5F; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0x4A; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0xD0; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x79; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xA1; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0xC0; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xAC; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xAE; break;
+				case 0xFF3C: ch = 0xBE; break;
+				case 0xFF3D: ch = 0x9E; break;
+				case 0xFF3E: ch = 0xEC; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x8C; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x8E; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x9C; break;
+				case 0xFF5E: ch = 0xCC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xAC; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xAE; break;
+				case 0x005C: ch = 0xBE; break;
+				case 0x005D: ch = 0x9E; break;
+				case 0x005E: ch = 0xEC; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x8C; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x8E; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x9C; break;
+				case 0x007E: ch = 0xCC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xE0; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x5A; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0x7C; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0x5F; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0x4A; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0xD0; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x79; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xA1; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0xC0; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0x20AC: ch = 0x9F; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xAC; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xAE; break;
+				case 0xFF3C: ch = 0xBE; break;
+				case 0xFF3D: ch = 0x9E; break;
+				case 0xFF3E: ch = 0xEC; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x8C; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x8E; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x9C; break;
+				case 0xFF5E: ch = 0xCC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1149
+
+public class ENCibm1149 : CP1149
+{
+	public ENCibm1149() : base() {}
+
+}; // class ENCibm1149
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20273.cs b/mcs/class/I18N/Rare/CP20273.cs
new file mode 100644
index 00000000000..2590ba7e18d
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20273.cs
@@ -0,0 +1,897 @@
+/*
+ * CP20273.cs - IBM EBCDIC (Germany) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-273.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20273 : ByteEncoding
+{
+	public CP20273()
+		: base(20273, ToChars, "IBM EBCDIC (Germany)",
+		       "IBM273", "IBM273", "IBM273",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u007B', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u00C4', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u007E', 
+		'\u00DC', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u005B', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00F6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u0023', '\u00A7', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u00A4', '\u00B5', '\u00DF', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u0040', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u00E4', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00A6', '\u00F2', '\u00F3', '\u00F5', '\u00FC', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u007D', '\u00F9', 
+		'\u00FA', '\u00FF', '\u00D6', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u005C', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u005D', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xB5; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x63; break;
+				case 0x005C: ch = 0xEC; break;
+				case 0x005D: ch = 0xFC; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x43; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0xDC; break;
+				case 0x007E: ch = 0x59; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCC; break;
+				case 0x00A7: ch = 0x7C; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x4A; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xE0; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0x5A; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0xA1; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0xC0; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0x6A; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xD0; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xB5; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x63; break;
+				case 0xFF3C: ch = 0xEC; break;
+				case 0xFF3D: ch = 0xFC; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x43; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0xDC; break;
+				case 0xFF5E: ch = 0x59; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xB5; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x63; break;
+				case 0x005C: ch = 0xEC; break;
+				case 0x005D: ch = 0xFC; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x43; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0xDC; break;
+				case 0x007E: ch = 0x59; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCC; break;
+				case 0x00A7: ch = 0x7C; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x4A; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xE0; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0x5A; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0xA1; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0xC0; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0x6A; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xD0; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xB5; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x63; break;
+				case 0xFF3C: ch = 0xEC; break;
+				case 0xFF3D: ch = 0xFC; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x43; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0xDC; break;
+				case 0xFF5E: ch = 0x59; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20273
+
+public class ENCibm273 : CP20273
+{
+	public ENCibm273() : base() {}
+
+}; // class ENCibm273
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20277.cs b/mcs/class/I18N/Rare/CP20277.cs
new file mode 100644
index 00000000000..8b0c5e56926
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20277.cs
@@ -0,0 +1,897 @@
+/*
+ * CP20277.cs - IBM EBCDIC (Denmark/Norway) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-277.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20277 : ByteEncoding
+{
+	public CP20277()
+		: base(20277, ToChars, "IBM EBCDIC (Denmark/Norway)",
+		       "IBM277", "IBM277", "IBM277",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u007D', 
+		'\u00E7', '\u00F1', '\u0023', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u00A4', '\u00C5', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u0024', '\u00C7', '\u00D1', '\u00F8', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00A6', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u00C6', '\u00D8', '\u0027', 
+		'\u003D', '\u0022', '\u0040', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u007B', '\u00B8', '\u005B', '\u005D', '\u00B5', '\u00FC', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u00E6', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u00E5', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u007E', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x4A; break;
+				case 0x0024: ch = 0x67; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x80; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x9E; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x9F; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x9C; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x47; break;
+				case 0x007E: ch = 0xDC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x5A; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x70; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x5B; break;
+				case 0x00C6: ch = 0x7B; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x7C; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0xD0; break;
+				case 0x00E6: ch = 0xC0; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x6A; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xA1; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x4A; break;
+				case 0xFF04: ch = 0x67; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x80; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x9E; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x9F; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x9C; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x47; break;
+				case 0xFF5E: ch = 0xDC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x4A; break;
+				case 0x0024: ch = 0x67; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x80; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x9E; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x9F; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x9C; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x47; break;
+				case 0x007E: ch = 0xDC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x5A; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x70; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x5B; break;
+				case 0x00C6: ch = 0x7B; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x7C; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0xD0; break;
+				case 0x00E6: ch = 0xC0; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x6A; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xA1; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x4A; break;
+				case 0xFF04: ch = 0x67; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x80; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x9E; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x9F; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x9C; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x47; break;
+				case 0xFF5E: ch = 0xDC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20277
+
+public class ENCibm277 : CP20277
+{
+	public ENCibm277() : base() {}
+
+}; // class ENCibm277
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20278.cs b/mcs/class/I18N/Rare/CP20278.cs
new file mode 100644
index 00000000000..56f03e2f5aa
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20278.cs
@@ -0,0 +1,897 @@
+/*
+ * CP20278.cs - IBM EBCDIC (Finland/Sweden) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-278.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20278 : ByteEncoding
+{
+	public CP20278()
+		: base(20278, ToChars, "IBM EBCDIC (Finland/Sweden)",
+		       "IBM278", "IBM278", "IBM278",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u007B', '\u00E0', '\u00E1', '\u00E3', '\u007D', 
+		'\u00E7', '\u00F1', '\u00A7', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u0060', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u00A4', '\u00C5', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u0023', '\u00C0', '\u00C1', 
+		'\u00C3', '\u0024', '\u00C7', '\u00D1', '\u00F6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u005C', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u00E9', '\u003A', '\u00C4', '\u00D6', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u005D', '\u00B5', '\u00FC', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u005B', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u00E4', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00A6', '\u00F2', '\u00F3', '\u00F5', '\u00E5', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u007E', '\u00F9', 
+		'\u00FA', '\u00FF', '\u00C9', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u0040', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x63; break;
+				case 0x0024: ch = 0x67; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xEC; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xB5; break;
+				case 0x005C: ch = 0x71; break;
+				case 0x005D: ch = 0x9F; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x51; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x43; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x47; break;
+				case 0x007E: ch = 0xDC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x5A; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCC; break;
+				case 0x00A7: ch = 0x4A; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x7B; break;
+				case 0x00C5: ch = 0x5B; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0xE0; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0x7C; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0xC0; break;
+				case 0x00E5: ch = 0xD0; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x79; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0x6A; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xA1; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x63; break;
+				case 0xFF04: ch = 0x67; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xEC; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xB5; break;
+				case 0xFF3C: ch = 0x71; break;
+				case 0xFF3D: ch = 0x9F; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x51; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x43; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x47; break;
+				case 0xFF5E: ch = 0xDC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x63; break;
+				case 0x0024: ch = 0x67; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xEC; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xB5; break;
+				case 0x005C: ch = 0x71; break;
+				case 0x005D: ch = 0x9F; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x51; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x43; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x47; break;
+				case 0x007E: ch = 0xDC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x5A; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCC; break;
+				case 0x00A7: ch = 0x4A; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x7B; break;
+				case 0x00C5: ch = 0x5B; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0xE0; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0x7C; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0xC0; break;
+				case 0x00E5: ch = 0xD0; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x79; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0x6A; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xA1; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x63; break;
+				case 0xFF04: ch = 0x67; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xEC; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xB5; break;
+				case 0xFF3C: ch = 0x71; break;
+				case 0xFF3D: ch = 0x9F; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x51; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x43; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x47; break;
+				case 0xFF5E: ch = 0xDC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20278
+
+public class ENCibm278 : CP20278
+{
+	public ENCibm278() : base() {}
+
+}; // class ENCibm278
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20280.cs b/mcs/class/I18N/Rare/CP20280.cs
new file mode 100644
index 00000000000..d675956d980
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20280.cs
@@ -0,0 +1,897 @@
+/*
+ * CP20280.cs - IBM EBCDIC (Italy) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-280.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20280 : ByteEncoding
+{
+	public CP20280()
+		: base(20280, ToChars, "IBM EBCDIC (Italy)",
+		       "IBM280", "IBM280", "IBM280",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u007B', '\u00E1', '\u00E3', '\u00E5', 
+		'\u005C', '\u00F1', '\u00B0', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u005D', '\u00EA', '\u00EB', 
+		'\u007D', '\u00ED', '\u00EE', '\u00EF', '\u007E', '\u00DF', 
+		'\u00E9', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00F2', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u00F9', '\u003A', '\u00A3', '\u00A7', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u005B', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u00A4', '\u00B5', '\u00EC', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u0023', '\u00A5', '\u00B7', 
+		'\u00A9', '\u0040', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u00E0', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00A6', '\u00F3', '\u00F5', '\u00E8', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u0060', 
+		'\u00FA', '\u00FF', '\u00E7', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0xB1; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xB5; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x90; break;
+				case 0x005C: ch = 0x48; break;
+				case 0x005D: ch = 0x51; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0xDD; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x44; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x54; break;
+				case 0x007E: ch = 0x58; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x7B; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCD; break;
+				case 0x00A7: ch = 0x7C; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x4A; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0xC0; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0xE0; break;
+				case 0x00E8: ch = 0xD0; break;
+				case 0x00E9: ch = 0x5A; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0xA1; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0x6A; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0x79; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0xB1; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xB5; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x90; break;
+				case 0xFF3C: ch = 0x48; break;
+				case 0xFF3D: ch = 0x51; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0xDD; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x44; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x54; break;
+				case 0xFF5E: ch = 0x58; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0xB1; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xB5; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x90; break;
+				case 0x005C: ch = 0x48; break;
+				case 0x005D: ch = 0x51; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0xDD; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x44; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x54; break;
+				case 0x007E: ch = 0x58; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x7B; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xCD; break;
+				case 0x00A7: ch = 0x7C; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x4A; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0xC0; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0xE0; break;
+				case 0x00E8: ch = 0xD0; break;
+				case 0x00E9: ch = 0x5A; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0xA1; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0x6A; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0x79; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0xB1; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xB5; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x90; break;
+				case 0xFF3C: ch = 0x48; break;
+				case 0xFF3D: ch = 0x51; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0xDD; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x44; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x54; break;
+				case 0xFF5E: ch = 0x58; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20280
+
+public class ENCibm280 : CP20280
+{
+	public ENCibm280() : base() {}
+
+}; // class ENCibm280
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20284.cs b/mcs/class/I18N/Rare/CP20284.cs
new file mode 100644
index 00000000000..df03a5271ea
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20284.cs
@@ -0,0 +1,897 @@
+/*
+ * CP20284.cs - IBM EBCDIC (Latin America/Spain) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-284.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20284 : ByteEncoding
+{
+	public CP20284()
+		: base(20284, ToChars, "IBM EBCDIC (Latin America/Spain)",
+		       "IBM284", "IBM284", "IBM284",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00A6', '\u005B', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u007C', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u005D', '\u0024', '\u002A', '\u0029', '\u003B', '\u00AC', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u0023', '\u00F1', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u00D1', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u00A4', '\u00B5', '\u00A8', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u005E', '\u0021', '\u00AF', '\u007E', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0xBB; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x69; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0xBA; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xBD; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x49; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xA1; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x7B; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x6A; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0xBB; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x69; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0xBA; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xBD; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0xBB; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x69; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0xBA; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xBD; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x49; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xA1; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x7B; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x6A; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0xBB; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x69; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0xBA; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xBD; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20284
+
+public class ENCibm284 : CP20284
+{
+	public ENCibm284() : base() {}
+
+}; // class ENCibm284
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20285.cs b/mcs/class/I18N/Rare/CP20285.cs
new file mode 100644
index 00000000000..20efc688ffb
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20285.cs
@@ -0,0 +1,897 @@
+/*
+ * CP20285.cs - IBM EBCDIC (United Kingdom) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-285.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20285 : ByteEncoding
+{
+	public CP20285()
+		: base(20285, ToChars, "IBM EBCDIC (United Kingdom)",
+		       "IBM285", "IBM285", "IBM285",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u0024', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u007C', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u0021', '\u00A3', '\u002A', '\u0029', '\u003B', '\u00AC', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u00A4', '\u00B5', '\u00AF', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u005B', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u005E', '\u005D', '\u007E', '\u00A8', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x4A; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xB1; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBB; break;
+				case 0x005E: ch = 0xBA; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xBC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x5B; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xA1; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xA1; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x4A; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xB1; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBB; break;
+				case 0xFF3E: ch = 0xBA; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xBC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x4A; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xB1; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBB; break;
+				case 0x005E: ch = 0xBA; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xBC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x5B; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xA1; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xA1; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x4A; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xB1; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBB; break;
+				case 0xFF3E: ch = 0xBA; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xBC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20285
+
+public class ENCibm285 : CP20285
+{
+	public ENCibm285() : base() {}
+
+}; // class ENCibm285
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20290.cs b/mcs/class/I18N/Rare/CP20290.cs
new file mode 100644
index 00000000000..4df3d74ce2b
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20290.cs
@@ -0,0 +1,865 @@
+/*
+ * CP20290.cs - IBM EBCDIC (Japanese Katakana Extended) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-290.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20290 : ByteEncoding
+{
+	public CP20290()
+		: base(20290, ToChars, "IBM EBCDIC (Japanese Katakana Extended)",
+		       "IBM290", "IBM290", "IBM290",
+		       false, false, false, false, 932)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\uFF61', 
+		'\uFF62', '\uFF63', '\uFF64', '\uFF65', '\uFF66', '\uFF67', 
+		'\uFF68', '\uFF69', '\u00A3', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u007C', '\u0026', '\uFF6A', '\uFF6B', '\uFF6C', 
+		'\uFF6D', '\uFF6E', '\uFF6F', '\u003F', '\uFF70', '\u003F', 
+		'\u0021', '\u00A5', '\u002A', '\u0029', '\u003B', '\u00AC', 
+		'\u002D', '\u002F', '\u0061', '\u0062', '\u0063', '\u0064', 
+		'\u0065', '\u0066', '\u0067', '\u0068', '\u003F', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u005B', '\u0069', 
+		'\u006A', '\u006B', '\u006C', '\u006D', '\u006E', '\u006F', 
+		'\u0070', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u005D', '\uFF71', '\uFF72', '\uFF73', 
+		'\uFF74', '\uFF75', '\uFF76', '\uFF77', '\uFF78', '\uFF79', 
+		'\uFF7A', '\u0071', '\uFF7B', '\uFF7C', '\uFF7D', '\uFF7E', 
+		'\uFF7F', '\uFF80', '\uFF81', '\uFF82', '\uFF83', '\uFF84', 
+		'\uFF85', '\uFF86', '\uFF87', '\uFF88', '\uFF89', '\u0072', 
+		'\u003F', '\uFF8A', '\uFF8B', '\uFF8C', '\u007E', '\u203E', 
+		'\uFF8D', '\uFF8E', '\uFF8F', '\uFF90', '\uFF91', '\uFF92', 
+		'\uFF93', '\uFF94', '\uFF95', '\u0073', '\uFF96', '\uFF97', 
+		'\uFF98', '\uFF99', '\u005E', '\u00A2', '\u005C', '\u0074', 
+		'\u0075', '\u0076', '\u0077', '\u0078', '\u0079', '\u007A', 
+		'\uFF9A', '\uFF9B', '\uFF9C', '\uFF9D', '\uFF9E', '\uFF9F', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u0024', '\u003F', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0xE0; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x70; break;
+				case 0x005C: ch = 0xB2; break;
+				case 0x005D: ch = 0x80; break;
+				case 0x005E: ch = 0xB0; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+					ch += 0x0001;
+					break;
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+					ch += 0x0008;
+					break;
+				case 0x0071: ch = 0x8B; break;
+				case 0x0072: ch = 0x9B; break;
+				case 0x0073: ch = 0xAB; break;
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x003F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA0; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A2: ch = 0xB1; break;
+				case 0x00A3: ch = 0x4A; break;
+				case 0x00A5: ch = 0x5B; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x203E: ch = 0xA1; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0xE0; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x70; break;
+				case 0xFF3C: ch = 0xB2; break;
+				case 0xFF3D: ch = 0x80; break;
+				case 0xFF3E: ch = 0xB0; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+					ch -= 0xFEDF;
+					break;
+				case 0xFF49:
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+					ch -= 0xFED8;
+					break;
+				case 0xFF51: ch = 0x8B; break;
+				case 0xFF52: ch = 0x9B; break;
+				case 0xFF53: ch = 0xAB; break;
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEA1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA0; break;
+				case 0xFF61:
+				case 0xFF62:
+				case 0xFF63:
+				case 0xFF64:
+				case 0xFF65:
+				case 0xFF66:
+				case 0xFF67:
+				case 0xFF68:
+				case 0xFF69:
+					ch -= 0xFF20;
+					break;
+				case 0xFF6A:
+				case 0xFF6B:
+				case 0xFF6C:
+				case 0xFF6D:
+				case 0xFF6E:
+				case 0xFF6F:
+					ch -= 0xFF19;
+					break;
+				case 0xFF70: ch = 0x58; break;
+				case 0xFF71:
+				case 0xFF72:
+				case 0xFF73:
+				case 0xFF74:
+				case 0xFF75:
+				case 0xFF76:
+				case 0xFF77:
+				case 0xFF78:
+				case 0xFF79:
+				case 0xFF7A:
+					ch -= 0xFEF0;
+					break;
+				case 0xFF7B:
+				case 0xFF7C:
+				case 0xFF7D:
+				case 0xFF7E:
+				case 0xFF7F:
+				case 0xFF80:
+				case 0xFF81:
+				case 0xFF82:
+				case 0xFF83:
+				case 0xFF84:
+				case 0xFF85:
+				case 0xFF86:
+				case 0xFF87:
+				case 0xFF88:
+				case 0xFF89:
+					ch -= 0xFEEF;
+					break;
+				case 0xFF8A: ch = 0x9D; break;
+				case 0xFF8B: ch = 0x9E; break;
+				case 0xFF8C: ch = 0x9F; break;
+				case 0xFF8D:
+				case 0xFF8E:
+				case 0xFF8F:
+				case 0xFF90:
+				case 0xFF91:
+				case 0xFF92:
+				case 0xFF93:
+				case 0xFF94:
+				case 0xFF95:
+					ch -= 0xFEEB;
+					break;
+				case 0xFF96:
+				case 0xFF97:
+				case 0xFF98:
+				case 0xFF99:
+					ch -= 0xFEEA;
+					break;
+				case 0xFF9A:
+				case 0xFF9B:
+				case 0xFF9C:
+				case 0xFF9D:
+				case 0xFF9E:
+				case 0xFF9F:
+					ch -= 0xFEE0;
+					break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0xE0; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x70; break;
+				case 0x005C: ch = 0xB2; break;
+				case 0x005D: ch = 0x80; break;
+				case 0x005E: ch = 0xB0; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+					ch += 0x0001;
+					break;
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+					ch += 0x0008;
+					break;
+				case 0x0071: ch = 0x8B; break;
+				case 0x0072: ch = 0x9B; break;
+				case 0x0073: ch = 0xAB; break;
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x003F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA0; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A2: ch = 0xB1; break;
+				case 0x00A3: ch = 0x4A; break;
+				case 0x00A5: ch = 0x5B; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x203E: ch = 0xA1; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0xE0; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x70; break;
+				case 0xFF3C: ch = 0xB2; break;
+				case 0xFF3D: ch = 0x80; break;
+				case 0xFF3E: ch = 0xB0; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+					ch -= 0xFEDF;
+					break;
+				case 0xFF49:
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+					ch -= 0xFED8;
+					break;
+				case 0xFF51: ch = 0x8B; break;
+				case 0xFF52: ch = 0x9B; break;
+				case 0xFF53: ch = 0xAB; break;
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEA1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA0; break;
+				case 0xFF61:
+				case 0xFF62:
+				case 0xFF63:
+				case 0xFF64:
+				case 0xFF65:
+				case 0xFF66:
+				case 0xFF67:
+				case 0xFF68:
+				case 0xFF69:
+					ch -= 0xFF20;
+					break;
+				case 0xFF6A:
+				case 0xFF6B:
+				case 0xFF6C:
+				case 0xFF6D:
+				case 0xFF6E:
+				case 0xFF6F:
+					ch -= 0xFF19;
+					break;
+				case 0xFF70: ch = 0x58; break;
+				case 0xFF71:
+				case 0xFF72:
+				case 0xFF73:
+				case 0xFF74:
+				case 0xFF75:
+				case 0xFF76:
+				case 0xFF77:
+				case 0xFF78:
+				case 0xFF79:
+				case 0xFF7A:
+					ch -= 0xFEF0;
+					break;
+				case 0xFF7B:
+				case 0xFF7C:
+				case 0xFF7D:
+				case 0xFF7E:
+				case 0xFF7F:
+				case 0xFF80:
+				case 0xFF81:
+				case 0xFF82:
+				case 0xFF83:
+				case 0xFF84:
+				case 0xFF85:
+				case 0xFF86:
+				case 0xFF87:
+				case 0xFF88:
+				case 0xFF89:
+					ch -= 0xFEEF;
+					break;
+				case 0xFF8A: ch = 0x9D; break;
+				case 0xFF8B: ch = 0x9E; break;
+				case 0xFF8C: ch = 0x9F; break;
+				case 0xFF8D:
+				case 0xFF8E:
+				case 0xFF8F:
+				case 0xFF90:
+				case 0xFF91:
+				case 0xFF92:
+				case 0xFF93:
+				case 0xFF94:
+				case 0xFF95:
+					ch -= 0xFEEB;
+					break;
+				case 0xFF96:
+				case 0xFF97:
+				case 0xFF98:
+				case 0xFF99:
+					ch -= 0xFEEA;
+					break;
+				case 0xFF9A:
+				case 0xFF9B:
+				case 0xFF9C:
+				case 0xFF9D:
+				case 0xFF9E:
+				case 0xFF9F:
+					ch -= 0xFEE0;
+					break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20290
+
+public class ENCibm290 : CP20290
+{
+	public ENCibm290() : base() {}
+
+}; // class ENCibm290
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20297.cs b/mcs/class/I18N/Rare/CP20297.cs
new file mode 100644
index 00000000000..439aeefbd4a
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20297.cs
@@ -0,0 +1,897 @@
+/*
+ * CP20297.cs - IBM EBCDIC (France) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-297.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20297 : ByteEncoding
+{
+	public CP20297()
+		: base(20297, ToChars, "IBM EBCDIC (France)",
+		       "IBM297", "IBM297", "IBM297",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u0040', '\u00E1', '\u00E3', '\u00E5', 
+		'\u005C', '\u00F1', '\u00B0', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u007B', '\u00EA', '\u00EB', 
+		'\u007D', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u00A7', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00F9', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u00B5', '\u003A', '\u00A3', '\u00E0', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u005B', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u00A4', '\u0060', '\u00A8', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u0023', '\u00A5', '\u00B7', 
+		'\u00A9', '\u005D', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u007E', '\u00B4', '\u00D7', 
+		'\u00E9', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u00E8', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00A6', 
+		'\u00FA', '\u00FF', '\u00E7', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0xB1; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x44; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x90; break;
+				case 0x005C: ch = 0x48; break;
+				case 0x005D: ch = 0xB5; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0xA0; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x51; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x54; break;
+				case 0x007E: ch = 0xBD; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x7B; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xDD; break;
+				case 0x00A7: ch = 0x5A; break;
+				case 0x00A8: ch = 0xA1; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x4A; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0x79; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x7C; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0xE0; break;
+				case 0x00E8: ch = 0xD0; break;
+				case 0x00E9: ch = 0xC0; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0x6A; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0xB1; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x44; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x90; break;
+				case 0xFF3C: ch = 0x48; break;
+				case 0xFF3D: ch = 0xB5; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0xA0; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x51; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x54; break;
+				case 0xFF5E: ch = 0xBD; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0xB1; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x44; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x90; break;
+				case 0x005C: ch = 0x48; break;
+				case 0x005D: ch = 0xB5; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0xA0; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x51; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x54; break;
+				case 0x007E: ch = 0xBD; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0x7B; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0xDD; break;
+				case 0x00A7: ch = 0x5A; break;
+				case 0x00A8: ch = 0xA1; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x4A; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0x79; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x7C; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0xE0; break;
+				case 0x00E8: ch = 0xD0; break;
+				case 0x00E9: ch = 0xC0; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0x6A; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0xB1; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x44; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x90; break;
+				case 0xFF3C: ch = 0x48; break;
+				case 0xFF3D: ch = 0xB5; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0xA0; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x51; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x54; break;
+				case 0xFF5E: ch = 0xBD; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20297
+
+public class ENCibm297 : CP20297
+{
+	public ENCibm297() : base() {}
+
+}; // class ENCibm297
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20420.cs b/mcs/class/I18N/Rare/CP20420.cs
new file mode 100644
index 00000000000..ee601514f32
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20420.cs
@@ -0,0 +1,1073 @@
+/*
+ * CP20420.cs - IBM EBCDIC (Arabic) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-420.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20420 : ByteEncoding
+{
+	public CP20420()
+		: base(20420, ToChars, "IBM EBCDIC (Arabic)",
+		       "IBM420", "IBM420", "IBM420",
+		       false, false, false, false, 1256)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u0651', '\uFE7D', '\u0640', '\u200B', '\u0621', '\u0622', 
+		'\uFE82', '\u0623', '\u00A2', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u007C', '\u0026', '\uFE84', '\u0624', '\u003F', 
+		'\u003F', '\u0626', '\u0627', '\uFE8E', '\u0628', '\uFE91', 
+		'\u0021', '\u0024', '\u002A', '\u0029', '\u003B', '\u00AC', 
+		'\u002D', '\u002F', '\u0629', '\u062A', '\uFE97', '\u062B', 
+		'\uFE9B', '\u062C', '\uFE9F', '\u062D', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\uFEA3', '\u062E', 
+		'\uFEA7', '\u062F', '\u0630', '\u0631', '\u0632', '\u0633', 
+		'\uFEB3', '\u060C', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u0634', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\uFEB7', '\u0635', '\uFEBB', '\u0636', '\uFEBF', '\u0637', 
+		'\u0638', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u0639', '\uFECA', 
+		'\uFECB', '\uFECC', '\u063A', '\uFECE', '\uFECF', '\u00F7', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\uFED0', '\u0641', '\uFED3', '\u0642', 
+		'\uFED7', '\u0643', '\uFEDB', '\u0644', '\uFEF5', '\uFEF6', 
+		'\uFEF7', '\uFEF8', '\u003F', '\u003F', '\uFEFB', '\uFEFC', 
+		'\uFEDF', '\u0645', '\uFEE3', '\u0646', '\uFEE7', '\u0647', 
+		'\u061B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\uFEEB', 
+		'\u003F', '\uFEEC', '\u003F', '\u0648', '\u061F', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u0649', '\uFEF0', '\u064A', '\uFEF2', 
+		'\uFEF3', '\u0660', '\u00D7', '\u003F', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u0661', '\u0662', '\u003F', '\u0663', '\u0664', '\u0665', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003F', '\u0666', 
+		'\u0667', '\u0668', '\u0669', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A2: ch = 0x4A; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00D7: ch = 0xE0; break;
+				case 0x00F7: ch = 0xA1; break;
+				case 0x060C: ch = 0x79; break;
+				case 0x061B: ch = 0xC0; break;
+				case 0x061F: ch = 0xD0; break;
+				case 0x0621: ch = 0x46; break;
+				case 0x0622: ch = 0x47; break;
+				case 0x0623: ch = 0x49; break;
+				case 0x0624: ch = 0x52; break;
+				case 0x0625: ch = 0x56; break;
+				case 0x0626: ch = 0x55; break;
+				case 0x0627: ch = 0x56; break;
+				case 0x0628: ch = 0x58; break;
+				case 0x0629: ch = 0x62; break;
+				case 0x062A: ch = 0x63; break;
+				case 0x062B: ch = 0x65; break;
+				case 0x062C: ch = 0x67; break;
+				case 0x062D: ch = 0x69; break;
+				case 0x062E: ch = 0x71; break;
+				case 0x062F:
+				case 0x0630:
+				case 0x0631:
+				case 0x0632:
+				case 0x0633:
+					ch -= 0x05BC;
+					break;
+				case 0x0634: ch = 0x80; break;
+				case 0x0635: ch = 0x8B; break;
+				case 0x0636: ch = 0x8D; break;
+				case 0x0637: ch = 0x8F; break;
+				case 0x0638: ch = 0x90; break;
+				case 0x0639: ch = 0x9A; break;
+				case 0x063A: ch = 0x9E; break;
+				case 0x0640: ch = 0x44; break;
+				case 0x0641: ch = 0xAB; break;
+				case 0x0642: ch = 0xAD; break;
+				case 0x0643: ch = 0xAF; break;
+				case 0x0644: ch = 0xB1; break;
+				case 0x0645: ch = 0xBB; break;
+				case 0x0646: ch = 0xBD; break;
+				case 0x0647: ch = 0xBF; break;
+				case 0x0648: ch = 0xCF; break;
+				case 0x0649: ch = 0xDA; break;
+				case 0x064A: ch = 0xDC; break;
+				case 0x0651: ch = 0x42; break;
+				case 0x0660: ch = 0xDF; break;
+				case 0x0661: ch = 0xEA; break;
+				case 0x0662: ch = 0xEB; break;
+				case 0x0663: ch = 0xED; break;
+				case 0x0664: ch = 0xEE; break;
+				case 0x0665: ch = 0xEF; break;
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x056B;
+					break;
+				case 0x066A: ch = 0x6C; break;
+				case 0x066B: ch = 0x6B; break;
+				case 0x066C: ch = 0x4B; break;
+				case 0x066D: ch = 0x5C; break;
+				case 0x200B: ch = 0x45; break;
+				case 0xFE7C: ch = 0x42; break;
+				case 0xFE7D: ch = 0x43; break;
+				case 0xFE80:
+				case 0xFE81:
+				case 0xFE82:
+				case 0xFE83:
+					ch -= 0xFE3A;
+					break;
+				case 0xFE84: ch = 0x51; break;
+				case 0xFE85: ch = 0x52; break;
+				case 0xFE86: ch = 0x52; break;
+				case 0xFE87: ch = 0x56; break;
+				case 0xFE88: ch = 0x57; break;
+				case 0xFE8B: ch = 0x55; break;
+				case 0xFE8C:
+				case 0xFE8D:
+				case 0xFE8E:
+				case 0xFE8F:
+					ch -= 0xFE37;
+					break;
+				case 0xFE90: ch = 0x58; break;
+				case 0xFE91: ch = 0x59; break;
+				case 0xFE92: ch = 0x59; break;
+				case 0xFE93: ch = 0x62; break;
+				case 0xFE94: ch = 0x62; break;
+				case 0xFE95: ch = 0x63; break;
+				case 0xFE96: ch = 0x63; break;
+				case 0xFE97: ch = 0x64; break;
+				case 0xFE98: ch = 0x64; break;
+				case 0xFE99: ch = 0x65; break;
+				case 0xFE9A: ch = 0x65; break;
+				case 0xFE9B: ch = 0x66; break;
+				case 0xFE9C: ch = 0x66; break;
+				case 0xFE9D: ch = 0x67; break;
+				case 0xFE9E: ch = 0x67; break;
+				case 0xFE9F: ch = 0x68; break;
+				case 0xFEA0: ch = 0x68; break;
+				case 0xFEA1: ch = 0x69; break;
+				case 0xFEA2: ch = 0x69; break;
+				case 0xFEA3: ch = 0x70; break;
+				case 0xFEA4: ch = 0x70; break;
+				case 0xFEA5: ch = 0x71; break;
+				case 0xFEA6: ch = 0x71; break;
+				case 0xFEA7: ch = 0x72; break;
+				case 0xFEA8: ch = 0x72; break;
+				case 0xFEA9: ch = 0x73; break;
+				case 0xFEAA: ch = 0x73; break;
+				case 0xFEAB: ch = 0x74; break;
+				case 0xFEAC: ch = 0x74; break;
+				case 0xFEAD: ch = 0x75; break;
+				case 0xFEAE: ch = 0x75; break;
+				case 0xFEAF: ch = 0x76; break;
+				case 0xFEB0: ch = 0x76; break;
+				case 0xFEB1: ch = 0x77; break;
+				case 0xFEB2: ch = 0x77; break;
+				case 0xFEB3: ch = 0x78; break;
+				case 0xFEB4: ch = 0x78; break;
+				case 0xFEB5: ch = 0x80; break;
+				case 0xFEB6: ch = 0x80; break;
+				case 0xFEB7: ch = 0x8A; break;
+				case 0xFEB8: ch = 0x8A; break;
+				case 0xFEB9: ch = 0x8B; break;
+				case 0xFEBA: ch = 0x8B; break;
+				case 0xFEBB: ch = 0x8C; break;
+				case 0xFEBC: ch = 0x8C; break;
+				case 0xFEBD: ch = 0x8D; break;
+				case 0xFEBE: ch = 0x8D; break;
+				case 0xFEBF: ch = 0x8E; break;
+				case 0xFEC0: ch = 0x8E; break;
+				case 0xFEC1: ch = 0x8F; break;
+				case 0xFEC2: ch = 0x8F; break;
+				case 0xFEC3: ch = 0x8F; break;
+				case 0xFEC4: ch = 0x8F; break;
+				case 0xFEC5: ch = 0x90; break;
+				case 0xFEC6: ch = 0x90; break;
+				case 0xFEC7: ch = 0x90; break;
+				case 0xFEC8: ch = 0x90; break;
+				case 0xFEC9:
+				case 0xFECA:
+				case 0xFECB:
+				case 0xFECC:
+				case 0xFECD:
+				case 0xFECE:
+				case 0xFECF:
+					ch -= 0xFE2F;
+					break;
+				case 0xFED0: ch = 0xAA; break;
+				case 0xFED1: ch = 0xAB; break;
+				case 0xFED2: ch = 0xAB; break;
+				case 0xFED3: ch = 0xAC; break;
+				case 0xFED4: ch = 0xAC; break;
+				case 0xFED5: ch = 0xAD; break;
+				case 0xFED6: ch = 0xAD; break;
+				case 0xFED7: ch = 0xAE; break;
+				case 0xFED8: ch = 0xAE; break;
+				case 0xFED9: ch = 0xAF; break;
+				case 0xFEDA: ch = 0xAF; break;
+				case 0xFEDB: ch = 0xB0; break;
+				case 0xFEDC: ch = 0xB0; break;
+				case 0xFEDD: ch = 0xB1; break;
+				case 0xFEDE: ch = 0xB1; break;
+				case 0xFEDF: ch = 0xBA; break;
+				case 0xFEE0: ch = 0xBA; break;
+				case 0xFEE1: ch = 0xBB; break;
+				case 0xFEE2: ch = 0xBB; break;
+				case 0xFEE3: ch = 0xBC; break;
+				case 0xFEE4: ch = 0xBC; break;
+				case 0xFEE5: ch = 0xBD; break;
+				case 0xFEE6: ch = 0xBD; break;
+				case 0xFEE7: ch = 0xBE; break;
+				case 0xFEE8: ch = 0xBE; break;
+				case 0xFEE9: ch = 0xBF; break;
+				case 0xFEEA: ch = 0xBF; break;
+				case 0xFEEB: ch = 0xCB; break;
+				case 0xFEEC: ch = 0xCD; break;
+				case 0xFEED: ch = 0xCF; break;
+				case 0xFEEE: ch = 0xCF; break;
+				case 0xFEEF:
+				case 0xFEF0:
+				case 0xFEF1:
+				case 0xFEF2:
+				case 0xFEF3:
+					ch -= 0xFE15;
+					break;
+				case 0xFEF4: ch = 0xDE; break;
+				case 0xFEF5:
+				case 0xFEF6:
+				case 0xFEF7:
+				case 0xFEF8:
+					ch -= 0xFE43;
+					break;
+				case 0xFEF9: ch = 0xB8; break;
+				case 0xFEFA: ch = 0xB9; break;
+				case 0xFEFB: ch = 0xB8; break;
+				case 0xFEFC: ch = 0xB9; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5C: ch = 0x4F; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A2: ch = 0x4A; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00D7: ch = 0xE0; break;
+				case 0x00F7: ch = 0xA1; break;
+				case 0x060C: ch = 0x79; break;
+				case 0x061B: ch = 0xC0; break;
+				case 0x061F: ch = 0xD0; break;
+				case 0x0621: ch = 0x46; break;
+				case 0x0622: ch = 0x47; break;
+				case 0x0623: ch = 0x49; break;
+				case 0x0624: ch = 0x52; break;
+				case 0x0625: ch = 0x56; break;
+				case 0x0626: ch = 0x55; break;
+				case 0x0627: ch = 0x56; break;
+				case 0x0628: ch = 0x58; break;
+				case 0x0629: ch = 0x62; break;
+				case 0x062A: ch = 0x63; break;
+				case 0x062B: ch = 0x65; break;
+				case 0x062C: ch = 0x67; break;
+				case 0x062D: ch = 0x69; break;
+				case 0x062E: ch = 0x71; break;
+				case 0x062F:
+				case 0x0630:
+				case 0x0631:
+				case 0x0632:
+				case 0x0633:
+					ch -= 0x05BC;
+					break;
+				case 0x0634: ch = 0x80; break;
+				case 0x0635: ch = 0x8B; break;
+				case 0x0636: ch = 0x8D; break;
+				case 0x0637: ch = 0x8F; break;
+				case 0x0638: ch = 0x90; break;
+				case 0x0639: ch = 0x9A; break;
+				case 0x063A: ch = 0x9E; break;
+				case 0x0640: ch = 0x44; break;
+				case 0x0641: ch = 0xAB; break;
+				case 0x0642: ch = 0xAD; break;
+				case 0x0643: ch = 0xAF; break;
+				case 0x0644: ch = 0xB1; break;
+				case 0x0645: ch = 0xBB; break;
+				case 0x0646: ch = 0xBD; break;
+				case 0x0647: ch = 0xBF; break;
+				case 0x0648: ch = 0xCF; break;
+				case 0x0649: ch = 0xDA; break;
+				case 0x064A: ch = 0xDC; break;
+				case 0x0651: ch = 0x42; break;
+				case 0x0660: ch = 0xDF; break;
+				case 0x0661: ch = 0xEA; break;
+				case 0x0662: ch = 0xEB; break;
+				case 0x0663: ch = 0xED; break;
+				case 0x0664: ch = 0xEE; break;
+				case 0x0665: ch = 0xEF; break;
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x056B;
+					break;
+				case 0x066A: ch = 0x6C; break;
+				case 0x066B: ch = 0x6B; break;
+				case 0x066C: ch = 0x4B; break;
+				case 0x066D: ch = 0x5C; break;
+				case 0x200B: ch = 0x45; break;
+				case 0xFE7C: ch = 0x42; break;
+				case 0xFE7D: ch = 0x43; break;
+				case 0xFE80:
+				case 0xFE81:
+				case 0xFE82:
+				case 0xFE83:
+					ch -= 0xFE3A;
+					break;
+				case 0xFE84: ch = 0x51; break;
+				case 0xFE85: ch = 0x52; break;
+				case 0xFE86: ch = 0x52; break;
+				case 0xFE87: ch = 0x56; break;
+				case 0xFE88: ch = 0x57; break;
+				case 0xFE8B: ch = 0x55; break;
+				case 0xFE8C:
+				case 0xFE8D:
+				case 0xFE8E:
+				case 0xFE8F:
+					ch -= 0xFE37;
+					break;
+				case 0xFE90: ch = 0x58; break;
+				case 0xFE91: ch = 0x59; break;
+				case 0xFE92: ch = 0x59; break;
+				case 0xFE93: ch = 0x62; break;
+				case 0xFE94: ch = 0x62; break;
+				case 0xFE95: ch = 0x63; break;
+				case 0xFE96: ch = 0x63; break;
+				case 0xFE97: ch = 0x64; break;
+				case 0xFE98: ch = 0x64; break;
+				case 0xFE99: ch = 0x65; break;
+				case 0xFE9A: ch = 0x65; break;
+				case 0xFE9B: ch = 0x66; break;
+				case 0xFE9C: ch = 0x66; break;
+				case 0xFE9D: ch = 0x67; break;
+				case 0xFE9E: ch = 0x67; break;
+				case 0xFE9F: ch = 0x68; break;
+				case 0xFEA0: ch = 0x68; break;
+				case 0xFEA1: ch = 0x69; break;
+				case 0xFEA2: ch = 0x69; break;
+				case 0xFEA3: ch = 0x70; break;
+				case 0xFEA4: ch = 0x70; break;
+				case 0xFEA5: ch = 0x71; break;
+				case 0xFEA6: ch = 0x71; break;
+				case 0xFEA7: ch = 0x72; break;
+				case 0xFEA8: ch = 0x72; break;
+				case 0xFEA9: ch = 0x73; break;
+				case 0xFEAA: ch = 0x73; break;
+				case 0xFEAB: ch = 0x74; break;
+				case 0xFEAC: ch = 0x74; break;
+				case 0xFEAD: ch = 0x75; break;
+				case 0xFEAE: ch = 0x75; break;
+				case 0xFEAF: ch = 0x76; break;
+				case 0xFEB0: ch = 0x76; break;
+				case 0xFEB1: ch = 0x77; break;
+				case 0xFEB2: ch = 0x77; break;
+				case 0xFEB3: ch = 0x78; break;
+				case 0xFEB4: ch = 0x78; break;
+				case 0xFEB5: ch = 0x80; break;
+				case 0xFEB6: ch = 0x80; break;
+				case 0xFEB7: ch = 0x8A; break;
+				case 0xFEB8: ch = 0x8A; break;
+				case 0xFEB9: ch = 0x8B; break;
+				case 0xFEBA: ch = 0x8B; break;
+				case 0xFEBB: ch = 0x8C; break;
+				case 0xFEBC: ch = 0x8C; break;
+				case 0xFEBD: ch = 0x8D; break;
+				case 0xFEBE: ch = 0x8D; break;
+				case 0xFEBF: ch = 0x8E; break;
+				case 0xFEC0: ch = 0x8E; break;
+				case 0xFEC1: ch = 0x8F; break;
+				case 0xFEC2: ch = 0x8F; break;
+				case 0xFEC3: ch = 0x8F; break;
+				case 0xFEC4: ch = 0x8F; break;
+				case 0xFEC5: ch = 0x90; break;
+				case 0xFEC6: ch = 0x90; break;
+				case 0xFEC7: ch = 0x90; break;
+				case 0xFEC8: ch = 0x90; break;
+				case 0xFEC9:
+				case 0xFECA:
+				case 0xFECB:
+				case 0xFECC:
+				case 0xFECD:
+				case 0xFECE:
+				case 0xFECF:
+					ch -= 0xFE2F;
+					break;
+				case 0xFED0: ch = 0xAA; break;
+				case 0xFED1: ch = 0xAB; break;
+				case 0xFED2: ch = 0xAB; break;
+				case 0xFED3: ch = 0xAC; break;
+				case 0xFED4: ch = 0xAC; break;
+				case 0xFED5: ch = 0xAD; break;
+				case 0xFED6: ch = 0xAD; break;
+				case 0xFED7: ch = 0xAE; break;
+				case 0xFED8: ch = 0xAE; break;
+				case 0xFED9: ch = 0xAF; break;
+				case 0xFEDA: ch = 0xAF; break;
+				case 0xFEDB: ch = 0xB0; break;
+				case 0xFEDC: ch = 0xB0; break;
+				case 0xFEDD: ch = 0xB1; break;
+				case 0xFEDE: ch = 0xB1; break;
+				case 0xFEDF: ch = 0xBA; break;
+				case 0xFEE0: ch = 0xBA; break;
+				case 0xFEE1: ch = 0xBB; break;
+				case 0xFEE2: ch = 0xBB; break;
+				case 0xFEE3: ch = 0xBC; break;
+				case 0xFEE4: ch = 0xBC; break;
+				case 0xFEE5: ch = 0xBD; break;
+				case 0xFEE6: ch = 0xBD; break;
+				case 0xFEE7: ch = 0xBE; break;
+				case 0xFEE8: ch = 0xBE; break;
+				case 0xFEE9: ch = 0xBF; break;
+				case 0xFEEA: ch = 0xBF; break;
+				case 0xFEEB: ch = 0xCB; break;
+				case 0xFEEC: ch = 0xCD; break;
+				case 0xFEED: ch = 0xCF; break;
+				case 0xFEEE: ch = 0xCF; break;
+				case 0xFEEF:
+				case 0xFEF0:
+				case 0xFEF1:
+				case 0xFEF2:
+				case 0xFEF3:
+					ch -= 0xFE15;
+					break;
+				case 0xFEF4: ch = 0xDE; break;
+				case 0xFEF5:
+				case 0xFEF6:
+				case 0xFEF7:
+				case 0xFEF8:
+					ch -= 0xFE43;
+					break;
+				case 0xFEF9: ch = 0xB8; break;
+				case 0xFEFA: ch = 0xB9; break;
+				case 0xFEFB: ch = 0xB8; break;
+				case 0xFEFC: ch = 0xB9; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5C: ch = 0x4F; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20420
+
+public class ENCibm420 : CP20420
+{
+	public ENCibm420() : base() {}
+
+}; // class ENCibm420
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20424.cs b/mcs/class/I18N/Rare/CP20424.cs
new file mode 100644
index 00000000000..224cd0da02a
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20424.cs
@@ -0,0 +1,829 @@
+/*
+ * CP20424.cs - IBM EBCDIC (Hebrew) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-424.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20424 : ByteEncoding
+{
+	public CP20424()
+		: base(20424, ToChars, "IBM EBCDIC (Hebrew)",
+		       "IBM424", "IBM424", "IBM424",
+		       false, false, false, false, 1255)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u05D0', 
+		'\u05D1', '\u05D2', '\u05D3', '\u05D4', '\u05D5', '\u05D6', 
+		'\u05D7', '\u05D8', '\u00A2', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u007C', '\u0026', '\u05D9', '\u05DA', '\u05DB', 
+		'\u05DC', '\u05DD', '\u05DE', '\u05DF', '\u05E0', '\u05E1', 
+		'\u0021', '\u0024', '\u002A', '\u0029', '\u003B', '\u00AC', 
+		'\u002D', '\u002F', '\u05E2', '\u05E3', '\u05E4', '\u05E5', 
+		'\u05E6', '\u05E7', '\u05E8', '\u05E9', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u003F', '\u05EA', 
+		'\u003F', '\u003F', '\u00A0', '\u003F', '\u003F', '\u003F', 
+		'\u2017', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u003F', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u003F', '\u003F', '\u003F', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u003F', '\u003F', 
+		'\u003F', '\u00B8', '\u003F', '\u00A4', '\u00B5', '\u007E', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u00AE', '\u005E', '\u00A3', '\u00A5', '\u2022', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u005B', '\u005D', '\u203E', '\u00A8', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xBA; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBB; break;
+				case 0x005E: ch = 0xB0; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x74; break;
+				case 0x00A2: ch = 0x4A; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x05D0:
+				case 0x05D1:
+				case 0x05D2:
+				case 0x05D3:
+				case 0x05D4:
+				case 0x05D5:
+				case 0x05D6:
+				case 0x05D7:
+				case 0x05D8:
+					ch -= 0x058F;
+					break;
+				case 0x05D9:
+				case 0x05DA:
+				case 0x05DB:
+				case 0x05DC:
+				case 0x05DD:
+				case 0x05DE:
+				case 0x05DF:
+				case 0x05E0:
+				case 0x05E1:
+					ch -= 0x0588;
+					break;
+				case 0x05E2:
+				case 0x05E3:
+				case 0x05E4:
+				case 0x05E5:
+				case 0x05E6:
+				case 0x05E7:
+				case 0x05E8:
+				case 0x05E9:
+					ch -= 0x0580;
+					break;
+				case 0x05EA: ch = 0x71; break;
+				case 0x2017: ch = 0x78; break;
+				case 0x2022: ch = 0xB3; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xBA; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBB; break;
+				case 0xFF3E: ch = 0xB0; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xBA; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBB; break;
+				case 0x005E: ch = 0xB0; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x74; break;
+				case 0x00A2: ch = 0x4A; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x05D0:
+				case 0x05D1:
+				case 0x05D2:
+				case 0x05D3:
+				case 0x05D4:
+				case 0x05D5:
+				case 0x05D6:
+				case 0x05D7:
+				case 0x05D8:
+					ch -= 0x058F;
+					break;
+				case 0x05D9:
+				case 0x05DA:
+				case 0x05DB:
+				case 0x05DC:
+				case 0x05DD:
+				case 0x05DE:
+				case 0x05DF:
+				case 0x05E0:
+				case 0x05E1:
+					ch -= 0x0588;
+					break;
+				case 0x05E2:
+				case 0x05E3:
+				case 0x05E4:
+				case 0x05E5:
+				case 0x05E6:
+				case 0x05E7:
+				case 0x05E8:
+				case 0x05E9:
+					ch -= 0x0580;
+					break;
+				case 0x05EA: ch = 0x71; break;
+				case 0x2017: ch = 0x78; break;
+				case 0x2022: ch = 0xB3; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xBA; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBB; break;
+				case 0xFF3E: ch = 0xB0; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20424
+
+public class ENCibm424 : CP20424
+{
+	public ENCibm424() : base() {}
+
+}; // class ENCibm424
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP20871.cs b/mcs/class/I18N/Rare/CP20871.cs
new file mode 100644
index 00000000000..fdb11807505
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP20871.cs
@@ -0,0 +1,897 @@
+/*
+ * CP20871.cs - IBM EBCDIC (Icelandic) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-871.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP20871 : ByteEncoding
+{
+	public CP20871()
+		: base(20871, ToChars, "IBM EBCDIC (Icelandic)",
+		       "IBM871", "IBM871", "IBM871",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u00DE', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u00C6', '\u0024', '\u002A', '\u0029', '\u003B', '\u00D6', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u00F0', '\u003A', '\u0023', '\u00D0', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u0060', '\u00FD', '\u007B', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u007D', '\u00B8', '\u005D', '\u00A4', '\u00B5', '\u00F6', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u0040', '\u00DD', 
+		'\u005B', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u005C', '\u00D7', 
+		'\u00FE', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u007E', '\u00F2', '\u00F3', '\u00F5', '\u00E6', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u00B4', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u005E', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xAC; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xAE; break;
+				case 0x005C: ch = 0xBE; break;
+				case 0x005D: ch = 0x9E; break;
+				case 0x005E: ch = 0xEC; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x8C; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x8E; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x9C; break;
+				case 0x007E: ch = 0xCC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xE0; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x5A; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0x7C; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0x5F; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0x4A; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0xD0; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x79; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xA1; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0xC0; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0x7C; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xAC; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xAE; break;
+				case 0xFF3C: ch = 0xBE; break;
+				case 0xFF3D: ch = 0x9E; break;
+				case 0xFF3E: ch = 0xEC; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x8C; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x8E; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x9C; break;
+				case 0xFF5E: ch = 0xCC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0xAC; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xAE; break;
+				case 0x005C: ch = 0xBE; break;
+				case 0x005D: ch = 0x9E; break;
+				case 0x005E: ch = 0xEC; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x8C; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0x8E; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0x9C; break;
+				case 0x007E: ch = 0xCC; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xE0; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x5A; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0x7C; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0x5F; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0x4A; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0xD0; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x79; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xA1; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0xC0; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0x7C; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0xAC; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xAE; break;
+				case 0xFF3C: ch = 0xBE; break;
+				case 0xFF3D: ch = 0x9E; break;
+				case 0xFF3E: ch = 0xEC; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x8C; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0x8E; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0x9C; break;
+				case 0xFF5E: ch = 0xCC; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP20871
+
+public class ENCibm871 : CP20871
+{
+	public ENCibm871() : base() {}
+
+}; // class ENCibm871
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP21025.cs b/mcs/class/I18N/Rare/CP21025.cs
new file mode 100644
index 00000000000..8285d1ba3a4
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP21025.cs
@@ -0,0 +1,917 @@
+/*
+ * CP21025.cs - IBM EBCDIC (Cyrillic - Serbian, Bulgarian) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1025.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP21025 : ByteEncoding
+{
+	public CP21025()
+		: base(21025, ToChars, "IBM EBCDIC (Cyrillic - Serbian, Bulgarian)",
+		       "IBM1025", "IBM1025", "IBM1025",
+		       false, false, false, false, 1257)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u0452', '\u0453', '\u0451', '\u0454', '\u0455', '\u0456', 
+		'\u0457', '\u0458', '\u005B', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u0459', '\u045A', '\u045B', 
+		'\u045C', '\u045E', '\u045F', '\u042A', '\u2116', '\u0402', 
+		'\u005D', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u0403', '\u0401', '\u0404', '\u0405', 
+		'\u0406', '\u0407', '\u0408', '\u0409', '\u007C', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u040A', '\u040B', 
+		'\u040C', '\u00AD', '\u040E', '\u040F', '\u044E', '\u0430', 
+		'\u0431', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u0446', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u0434', '\u0435', '\u0444', '\u0433', '\u0445', '\u0438', 
+		'\u0439', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u043A', '\u043B', 
+		'\u043C', '\u043D', '\u043E', '\u043F', '\u044F', '\u007E', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u0440', '\u0441', '\u0442', '\u0443', 
+		'\u0436', '\u0432', '\u044C', '\u044B', '\u0437', '\u0448', 
+		'\u044D', '\u0449', '\u0447', '\u044A', '\u042E', '\u0410', 
+		'\u0411', '\u0426', '\u0414', '\u0415', '\u0424', '\u0413', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u0425', '\u0418', 
+		'\u0419', '\u041A', '\u041B', '\u041C', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u041D', '\u041E', '\u041F', '\u042F', 
+		'\u0420', '\u0421', '\u005C', '\u00A7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u0422', '\u0423', '\u0416', '\u0412', '\u042C', '\u042B', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u0417', '\u0428', 
+		'\u042D', '\u0429', '\u0427', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x6A; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A7: ch = 0xE1; break;
+				case 0x00AD: ch = 0x73; break;
+				case 0x0401: ch = 0x63; break;
+				case 0x0402: ch = 0x59; break;
+				case 0x0403: ch = 0x62; break;
+				case 0x0404:
+				case 0x0405:
+				case 0x0406:
+				case 0x0407:
+				case 0x0408:
+				case 0x0409:
+					ch -= 0x03A0;
+					break;
+				case 0x040A: ch = 0x70; break;
+				case 0x040B: ch = 0x71; break;
+				case 0x040C: ch = 0x72; break;
+				case 0x040E: ch = 0x74; break;
+				case 0x040F: ch = 0x75; break;
+				case 0x0410: ch = 0xB9; break;
+				case 0x0411: ch = 0xBA; break;
+				case 0x0412: ch = 0xED; break;
+				case 0x0413: ch = 0xBF; break;
+				case 0x0414: ch = 0xBC; break;
+				case 0x0415: ch = 0xBD; break;
+				case 0x0416: ch = 0xEC; break;
+				case 0x0417: ch = 0xFA; break;
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+					ch -= 0x034D;
+					break;
+				case 0x041D: ch = 0xDA; break;
+				case 0x041E: ch = 0xDB; break;
+				case 0x041F: ch = 0xDC; break;
+				case 0x0420: ch = 0xDE; break;
+				case 0x0421: ch = 0xDF; break;
+				case 0x0422: ch = 0xEA; break;
+				case 0x0423: ch = 0xEB; break;
+				case 0x0424: ch = 0xBE; break;
+				case 0x0425: ch = 0xCA; break;
+				case 0x0426: ch = 0xBB; break;
+				case 0x0427: ch = 0xFE; break;
+				case 0x0428: ch = 0xFB; break;
+				case 0x0429: ch = 0xFD; break;
+				case 0x042A: ch = 0x57; break;
+				case 0x042B: ch = 0xEF; break;
+				case 0x042C: ch = 0xEE; break;
+				case 0x042D: ch = 0xFC; break;
+				case 0x042E: ch = 0xB8; break;
+				case 0x042F: ch = 0xDD; break;
+				case 0x0430: ch = 0x77; break;
+				case 0x0431: ch = 0x78; break;
+				case 0x0432: ch = 0xAF; break;
+				case 0x0433: ch = 0x8D; break;
+				case 0x0434: ch = 0x8A; break;
+				case 0x0435: ch = 0x8B; break;
+				case 0x0436: ch = 0xAE; break;
+				case 0x0437: ch = 0xB2; break;
+				case 0x0438: ch = 0x8F; break;
+				case 0x0439: ch = 0x90; break;
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+					ch -= 0x03A0;
+					break;
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+					ch -= 0x0396;
+					break;
+				case 0x0444: ch = 0x8C; break;
+				case 0x0445: ch = 0x8E; break;
+				case 0x0446: ch = 0x80; break;
+				case 0x0447: ch = 0xB6; break;
+				case 0x0448: ch = 0xB3; break;
+				case 0x0449: ch = 0xB5; break;
+				case 0x044A: ch = 0xB7; break;
+				case 0x044B: ch = 0xB1; break;
+				case 0x044C: ch = 0xB0; break;
+				case 0x044D: ch = 0xB4; break;
+				case 0x044E: ch = 0x76; break;
+				case 0x044F: ch = 0xA0; break;
+				case 0x0451: ch = 0x44; break;
+				case 0x0452: ch = 0x42; break;
+				case 0x0453: ch = 0x43; break;
+				case 0x0454:
+				case 0x0455:
+				case 0x0456:
+				case 0x0457:
+				case 0x0458:
+					ch -= 0x040F;
+					break;
+				case 0x0459:
+				case 0x045A:
+				case 0x045B:
+				case 0x045C:
+					ch -= 0x0408;
+					break;
+				case 0x045E: ch = 0x55; break;
+				case 0x045F: ch = 0x56; break;
+				case 0x2116: ch = 0x58; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x6A; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x6A; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A7: ch = 0xE1; break;
+				case 0x00AD: ch = 0x73; break;
+				case 0x0401: ch = 0x63; break;
+				case 0x0402: ch = 0x59; break;
+				case 0x0403: ch = 0x62; break;
+				case 0x0404:
+				case 0x0405:
+				case 0x0406:
+				case 0x0407:
+				case 0x0408:
+				case 0x0409:
+					ch -= 0x03A0;
+					break;
+				case 0x040A: ch = 0x70; break;
+				case 0x040B: ch = 0x71; break;
+				case 0x040C: ch = 0x72; break;
+				case 0x040E: ch = 0x74; break;
+				case 0x040F: ch = 0x75; break;
+				case 0x0410: ch = 0xB9; break;
+				case 0x0411: ch = 0xBA; break;
+				case 0x0412: ch = 0xED; break;
+				case 0x0413: ch = 0xBF; break;
+				case 0x0414: ch = 0xBC; break;
+				case 0x0415: ch = 0xBD; break;
+				case 0x0416: ch = 0xEC; break;
+				case 0x0417: ch = 0xFA; break;
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+					ch -= 0x034D;
+					break;
+				case 0x041D: ch = 0xDA; break;
+				case 0x041E: ch = 0xDB; break;
+				case 0x041F: ch = 0xDC; break;
+				case 0x0420: ch = 0xDE; break;
+				case 0x0421: ch = 0xDF; break;
+				case 0x0422: ch = 0xEA; break;
+				case 0x0423: ch = 0xEB; break;
+				case 0x0424: ch = 0xBE; break;
+				case 0x0425: ch = 0xCA; break;
+				case 0x0426: ch = 0xBB; break;
+				case 0x0427: ch = 0xFE; break;
+				case 0x0428: ch = 0xFB; break;
+				case 0x0429: ch = 0xFD; break;
+				case 0x042A: ch = 0x57; break;
+				case 0x042B: ch = 0xEF; break;
+				case 0x042C: ch = 0xEE; break;
+				case 0x042D: ch = 0xFC; break;
+				case 0x042E: ch = 0xB8; break;
+				case 0x042F: ch = 0xDD; break;
+				case 0x0430: ch = 0x77; break;
+				case 0x0431: ch = 0x78; break;
+				case 0x0432: ch = 0xAF; break;
+				case 0x0433: ch = 0x8D; break;
+				case 0x0434: ch = 0x8A; break;
+				case 0x0435: ch = 0x8B; break;
+				case 0x0436: ch = 0xAE; break;
+				case 0x0437: ch = 0xB2; break;
+				case 0x0438: ch = 0x8F; break;
+				case 0x0439: ch = 0x90; break;
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+					ch -= 0x03A0;
+					break;
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+					ch -= 0x0396;
+					break;
+				case 0x0444: ch = 0x8C; break;
+				case 0x0445: ch = 0x8E; break;
+				case 0x0446: ch = 0x80; break;
+				case 0x0447: ch = 0xB6; break;
+				case 0x0448: ch = 0xB3; break;
+				case 0x0449: ch = 0xB5; break;
+				case 0x044A: ch = 0xB7; break;
+				case 0x044B: ch = 0xB1; break;
+				case 0x044C: ch = 0xB0; break;
+				case 0x044D: ch = 0xB4; break;
+				case 0x044E: ch = 0x76; break;
+				case 0x044F: ch = 0xA0; break;
+				case 0x0451: ch = 0x44; break;
+				case 0x0452: ch = 0x42; break;
+				case 0x0453: ch = 0x43; break;
+				case 0x0454:
+				case 0x0455:
+				case 0x0456:
+				case 0x0457:
+				case 0x0458:
+					ch -= 0x040F;
+					break;
+				case 0x0459:
+				case 0x045A:
+				case 0x045B:
+				case 0x045C:
+					ch -= 0x0408;
+					break;
+				case 0x045E: ch = 0x55; break;
+				case 0x045F: ch = 0x56; break;
+				case 0x2116: ch = 0x58; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x6A; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP21025
+
+public class ENCibm1025 : CP21025
+{
+	public ENCibm1025() : base() {}
+
+}; // class ENCibm1025
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP37.cs b/mcs/class/I18N/Rare/CP37.cs
new file mode 100644
index 00000000000..e7c7da24d5b
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP37.cs
@@ -0,0 +1,897 @@
+/*
+ * CP37.cs - IBM EBCDIC (US-Canada) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-37.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP37 : ByteEncoding
+{
+	public CP37()
+		: base(37, ToChars, "IBM EBCDIC (US-Canada)",
+		       "IBM037", "IBM037", "IBM037",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u00A2', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u007C', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u0021', '\u0024', '\u002A', '\u0029', '\u003B', '\u00AC', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u00A4', '\u00B5', '\u007E', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u005E', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u005B', '\u005D', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xBA; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBB; break;
+				case 0x005E: ch = 0xB0; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0x4A; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xBA; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBB; break;
+				case 0xFF3E: ch = 0xB0; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x5A; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0xBA; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0xBB; break;
+				case 0x005E: ch = 0xB0; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x4F; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0x4A; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0x5F; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x5A; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0xBA; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0xBB; break;
+				case 0xFF3E: ch = 0xB0; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x4F; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP37
+
+public class ENCibm037 : CP37
+{
+	public ENCibm037() : base() {}
+
+}; // class ENCibm037
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP500.cs b/mcs/class/I18N/Rare/CP500.cs
new file mode 100644
index 00000000000..631ba6c71f8
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP500.cs
@@ -0,0 +1,897 @@
+/*
+ * CP500.cs - IBM EBCDIC (International) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-500.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP500 : ByteEncoding
+{
+	public CP500()
+		: base(500, ToChars, "IBM EBCDIC (International)",
+		       "IBM500", "IBM500", "IBM500",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u00E0', '\u00E1', '\u00E3', '\u00E5', 
+		'\u00E7', '\u00F1', '\u005B', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u00E9', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00ED', '\u00EE', '\u00EF', '\u00EC', '\u00DF', 
+		'\u005D', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u00C0', '\u00C1', 
+		'\u00C3', '\u00C5', '\u00C7', '\u00D1', '\u00A6', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00F8', '\u00C9', 
+		'\u00CA', '\u00CB', '\u00C8', '\u00CD', '\u00CE', '\u00CF', 
+		'\u00CC', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u00D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u00AB', '\u00BB', '\u00F0', '\u00FD', '\u00FE', '\u00B1', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u00AA', '\u00BA', 
+		'\u00E6', '\u00B8', '\u00C6', '\u00A4', '\u00B5', '\u007E', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u00A1', '\u00BF', '\u00D0', '\u00DD', 
+		'\u00DE', '\u00AE', '\u00A2', '\u00A3', '\u00A5', '\u00B7', 
+		'\u00A9', '\u00A7', '\u00B6', '\u00BC', '\u00BD', '\u00BE', 
+		'\u00AC', '\u007C', '\u00AF', '\u00A8', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u00F2', '\u00F3', '\u00F5', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B9', '\u00FB', '\u00FC', '\u00F9', 
+		'\u00FA', '\u00FF', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00D4', '\u00D6', '\u00D2', '\u00D3', '\u00D5', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00DB', 
+		'\u00DC', '\u00D9', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x00B6:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0xBB; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A1: ch = 0xAA; break;
+				case 0x00A2: ch = 0xB0; break;
+				case 0x00A3: ch = 0xB1; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A5: ch = 0xB2; break;
+				case 0x00A6: ch = 0x6A; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00A9: ch = 0xB4; break;
+				case 0x00AA: ch = 0x9A; break;
+				case 0x00AB: ch = 0x8A; break;
+				case 0x00AC: ch = 0xBA; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00AE: ch = 0xAF; break;
+				case 0x00AF: ch = 0xBC; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0x8F; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B5: ch = 0xA0; break;
+				case 0x00B7: ch = 0xB3; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00B9: ch = 0xDA; break;
+				case 0x00BA: ch = 0x9B; break;
+				case 0x00BB: ch = 0x8B; break;
+				case 0x00BC: ch = 0xB7; break;
+				case 0x00BD: ch = 0xB8; break;
+				case 0x00BE: ch = 0xB9; break;
+				case 0x00BF: ch = 0xAB; break;
+				case 0x00C0: ch = 0x64; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C3: ch = 0x66; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C5: ch = 0x67; break;
+				case 0x00C6: ch = 0x9E; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C8: ch = 0x74; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CA: ch = 0x72; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CC: ch = 0x78; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00CF: ch = 0x77; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D1: ch = 0x69; break;
+				case 0x00D2: ch = 0xED; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D5: ch = 0xEF; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00D8: ch = 0x80; break;
+				case 0x00D9: ch = 0xFD; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DB: ch = 0xFB; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DE: ch = 0xAE; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E0: ch = 0x44; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E3: ch = 0x46; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E5: ch = 0x47; break;
+				case 0x00E6: ch = 0x9C; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E8: ch = 0x54; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EA: ch = 0x52; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00EC: ch = 0x58; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00EF: ch = 0x57; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F1: ch = 0x49; break;
+				case 0x00F2: ch = 0xCD; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F5: ch = 0xCF; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00F8: ch = 0x70; break;
+				case 0x00F9: ch = 0xDD; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FB: ch = 0xDB; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x00FE: ch = 0x8E; break;
+				case 0x00FF: ch = 0xDF; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x203E: ch = 0xBC; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0xBB; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP500
+
+public class ENCibm500 : CP500
+{
+	public ENCibm500() : base() {}
+
+}; // class ENCibm500
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP708.cs b/mcs/class/I18N/Rare/CP708.cs
new file mode 100644
index 00000000000..8bd621acc24
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP708.cs
@@ -0,0 +1,545 @@
+/*
+ * CP708.cs - Arabic (ASMO 708) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1089.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP708 : ByteEncoding
+{
+	public CP708()
+		: base(708, ToChars, "Arabic (ASMO 708)",
+		       "iso-8859-6", "asmo-708", "asmo-708",
+		       false, false, false, false, 1256)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u003F', 
+		'\u003F', '\u003F', '\u00A4', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u060C', '\u00AD', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u061B', '\u003F', '\u003F', '\u003F', '\u061F', 
+		'\u003F', '\u0621', '\u0622', '\u0623', '\u0624', '\u0625', 
+		'\u0626', '\u0627', '\u0628', '\u0629', '\u062A', '\u062B', 
+		'\u062C', '\u062D', '\u062E', '\u062F', '\u0630', '\u0631', 
+		'\u0632', '\u0633', '\u0634', '\u0635', '\u0636', '\u0637', 
+		'\u0638', '\u0639', '\u063A', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u0640', '\u0641', '\u0642', '\u0643', 
+		'\u0644', '\u0645', '\u0646', '\u0647', '\u0648', '\u0649', 
+		'\u064A', '\u064B', '\u064C', '\u064D', '\u064E', '\u064F', 
+		'\u0650', '\u0651', '\u0652', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u003F', '\u003F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A4:
+				case 0x00AD:
+					break;
+				case 0x060C: ch = 0xAC; break;
+				case 0x061B: ch = 0xBB; break;
+				case 0x061F: ch = 0xBF; break;
+				case 0x0621:
+				case 0x0622:
+				case 0x0623:
+				case 0x0624:
+				case 0x0625:
+				case 0x0626:
+				case 0x0627:
+				case 0x0628:
+				case 0x0629:
+				case 0x062A:
+				case 0x062B:
+				case 0x062C:
+				case 0x062D:
+				case 0x062E:
+				case 0x062F:
+				case 0x0630:
+				case 0x0631:
+				case 0x0632:
+				case 0x0633:
+				case 0x0634:
+				case 0x0635:
+				case 0x0636:
+				case 0x0637:
+				case 0x0638:
+				case 0x0639:
+				case 0x063A:
+					ch -= 0x0560;
+					break;
+				case 0x0640:
+				case 0x0641:
+				case 0x0642:
+				case 0x0643:
+				case 0x0644:
+				case 0x0645:
+				case 0x0646:
+				case 0x0647:
+				case 0x0648:
+				case 0x0649:
+				case 0x064A:
+				case 0x064B:
+				case 0x064C:
+				case 0x064D:
+				case 0x064E:
+				case 0x064F:
+				case 0x0650:
+				case 0x0651:
+				case 0x0652:
+					ch -= 0x0560;
+					break;
+				case 0x0660:
+				case 0x0661:
+				case 0x0662:
+				case 0x0663:
+				case 0x0664:
+				case 0x0665:
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x0630;
+					break;
+				case 0x066A: ch = 0x25; break;
+				case 0x066B: ch = 0x2C; break;
+				case 0x066C: ch = 0x2E; break;
+				case 0x066D: ch = 0x2A; break;
+				case 0xFE70: ch = 0xEB; break;
+				case 0xFE71: ch = 0xEB; break;
+				case 0xFE72: ch = 0xEC; break;
+				case 0xFE74: ch = 0xED; break;
+				case 0xFE76: ch = 0xEE; break;
+				case 0xFE77: ch = 0xEE; break;
+				case 0xFE78: ch = 0xEF; break;
+				case 0xFE79: ch = 0xEF; break;
+				case 0xFE7A: ch = 0xF0; break;
+				case 0xFE7B: ch = 0xF0; break;
+				case 0xFE7C: ch = 0xF1; break;
+				case 0xFE7D: ch = 0xF1; break;
+				case 0xFE7E: ch = 0xF2; break;
+				case 0xFE7F: ch = 0xF2; break;
+				case 0xFE80: ch = 0xC1; break;
+				case 0xFE81: ch = 0xC2; break;
+				case 0xFE82: ch = 0xC2; break;
+				case 0xFE83: ch = 0xC3; break;
+				case 0xFE84: ch = 0xC3; break;
+				case 0xFE85: ch = 0xC4; break;
+				case 0xFE86: ch = 0xC4; break;
+				case 0xFE87: ch = 0xC5; break;
+				case 0xFE88: ch = 0xC5; break;
+				case 0xFE89: ch = 0xC6; break;
+				case 0xFE8A: ch = 0xC6; break;
+				case 0xFE8B: ch = 0xC6; break;
+				case 0xFE8C: ch = 0xC6; break;
+				case 0xFE8D: ch = 0xC7; break;
+				case 0xFE8E: ch = 0xC7; break;
+				case 0xFE8F: ch = 0xC8; break;
+				case 0xFE90: ch = 0xC8; break;
+				case 0xFE91: ch = 0xC8; break;
+				case 0xFE92: ch = 0xC8; break;
+				case 0xFE93: ch = 0xC9; break;
+				case 0xFE94: ch = 0xC9; break;
+				case 0xFE95: ch = 0xCA; break;
+				case 0xFE96: ch = 0xCA; break;
+				case 0xFE97: ch = 0xCA; break;
+				case 0xFE98: ch = 0xCA; break;
+				case 0xFE99: ch = 0xCB; break;
+				case 0xFE9A: ch = 0xCB; break;
+				case 0xFE9B: ch = 0xCB; break;
+				case 0xFE9C: ch = 0xCB; break;
+				case 0xFE9D: ch = 0xCC; break;
+				case 0xFE9E: ch = 0xCC; break;
+				case 0xFE9F: ch = 0xCC; break;
+				case 0xFEA0: ch = 0xCC; break;
+				case 0xFEA1: ch = 0xCD; break;
+				case 0xFEA2: ch = 0xCD; break;
+				case 0xFEA3: ch = 0xCD; break;
+				case 0xFEA4: ch = 0xCD; break;
+				case 0xFEA5: ch = 0xCE; break;
+				case 0xFEA6: ch = 0xCE; break;
+				case 0xFEA7: ch = 0xCE; break;
+				case 0xFEA8: ch = 0xCE; break;
+				case 0xFEA9: ch = 0xCF; break;
+				case 0xFEAA: ch = 0xCF; break;
+				case 0xFEAB: ch = 0xD0; break;
+				case 0xFEAC: ch = 0xD0; break;
+				case 0xFEAD: ch = 0xD1; break;
+				case 0xFEAE: ch = 0xD1; break;
+				case 0xFEAF: ch = 0xD2; break;
+				case 0xFEB0: ch = 0xD2; break;
+				case 0xFEB1: ch = 0xD3; break;
+				case 0xFEB2: ch = 0xD3; break;
+				case 0xFEB3: ch = 0xD3; break;
+				case 0xFEB4: ch = 0xD3; break;
+				case 0xFEB5: ch = 0xD4; break;
+				case 0xFEB6: ch = 0xD4; break;
+				case 0xFEB7: ch = 0xD4; break;
+				case 0xFEB8: ch = 0xD4; break;
+				case 0xFEB9: ch = 0xD5; break;
+				case 0xFEBA: ch = 0xD5; break;
+				case 0xFEBB: ch = 0xD5; break;
+				case 0xFEBC: ch = 0xD5; break;
+				case 0xFEBD: ch = 0xD6; break;
+				case 0xFEBE: ch = 0xD6; break;
+				case 0xFEBF: ch = 0xD6; break;
+				case 0xFEC0: ch = 0xD6; break;
+				case 0xFEC1: ch = 0xD7; break;
+				case 0xFEC2: ch = 0xD7; break;
+				case 0xFEC3: ch = 0xD7; break;
+				case 0xFEC4: ch = 0xD7; break;
+				case 0xFEC5: ch = 0xD8; break;
+				case 0xFEC6: ch = 0xD8; break;
+				case 0xFEC7: ch = 0xD8; break;
+				case 0xFEC8: ch = 0xD8; break;
+				case 0xFEC9: ch = 0xD9; break;
+				case 0xFECA: ch = 0xD9; break;
+				case 0xFECB: ch = 0xD9; break;
+				case 0xFECC: ch = 0xD9; break;
+				case 0xFECD: ch = 0xDA; break;
+				case 0xFECE: ch = 0xDA; break;
+				case 0xFECF: ch = 0xDA; break;
+				case 0xFED0: ch = 0xDA; break;
+				case 0xFED1: ch = 0xE1; break;
+				case 0xFED2: ch = 0xE1; break;
+				case 0xFED3: ch = 0xE1; break;
+				case 0xFED4: ch = 0xE1; break;
+				case 0xFED5: ch = 0xE2; break;
+				case 0xFED6: ch = 0xE2; break;
+				case 0xFED7: ch = 0xE2; break;
+				case 0xFED8: ch = 0xE2; break;
+				case 0xFED9: ch = 0xE3; break;
+				case 0xFEDA: ch = 0xE3; break;
+				case 0xFEDB: ch = 0xE3; break;
+				case 0xFEDC: ch = 0xE3; break;
+				case 0xFEDD: ch = 0xE4; break;
+				case 0xFEDE: ch = 0xE4; break;
+				case 0xFEDF: ch = 0xE4; break;
+				case 0xFEE0: ch = 0xE4; break;
+				case 0xFEE1: ch = 0xE5; break;
+				case 0xFEE2: ch = 0xE5; break;
+				case 0xFEE3: ch = 0xE5; break;
+				case 0xFEE4: ch = 0xE5; break;
+				case 0xFEE5: ch = 0xE6; break;
+				case 0xFEE6: ch = 0xE6; break;
+				case 0xFEE7: ch = 0xE6; break;
+				case 0xFEE8: ch = 0xE6; break;
+				case 0xFEE9: ch = 0xE7; break;
+				case 0xFEEA: ch = 0xE7; break;
+				case 0xFEEB: ch = 0xE7; break;
+				case 0xFEEC: ch = 0xE7; break;
+				case 0xFEED: ch = 0xE8; break;
+				case 0xFEEE: ch = 0xE8; break;
+				case 0xFEEF: ch = 0xE9; break;
+				case 0xFEF0: ch = 0xE9; break;
+				case 0xFEF1: ch = 0xEA; break;
+				case 0xFEF2: ch = 0xEA; break;
+				case 0xFEF3: ch = 0xEA; break;
+				case 0xFEF4: ch = 0xEA; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A4:
+				case 0x00AD:
+					break;
+				case 0x060C: ch = 0xAC; break;
+				case 0x061B: ch = 0xBB; break;
+				case 0x061F: ch = 0xBF; break;
+				case 0x0621:
+				case 0x0622:
+				case 0x0623:
+				case 0x0624:
+				case 0x0625:
+				case 0x0626:
+				case 0x0627:
+				case 0x0628:
+				case 0x0629:
+				case 0x062A:
+				case 0x062B:
+				case 0x062C:
+				case 0x062D:
+				case 0x062E:
+				case 0x062F:
+				case 0x0630:
+				case 0x0631:
+				case 0x0632:
+				case 0x0633:
+				case 0x0634:
+				case 0x0635:
+				case 0x0636:
+				case 0x0637:
+				case 0x0638:
+				case 0x0639:
+				case 0x063A:
+					ch -= 0x0560;
+					break;
+				case 0x0640:
+				case 0x0641:
+				case 0x0642:
+				case 0x0643:
+				case 0x0644:
+				case 0x0645:
+				case 0x0646:
+				case 0x0647:
+				case 0x0648:
+				case 0x0649:
+				case 0x064A:
+				case 0x064B:
+				case 0x064C:
+				case 0x064D:
+				case 0x064E:
+				case 0x064F:
+				case 0x0650:
+				case 0x0651:
+				case 0x0652:
+					ch -= 0x0560;
+					break;
+				case 0x0660:
+				case 0x0661:
+				case 0x0662:
+				case 0x0663:
+				case 0x0664:
+				case 0x0665:
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x0630;
+					break;
+				case 0x066A: ch = 0x25; break;
+				case 0x066B: ch = 0x2C; break;
+				case 0x066C: ch = 0x2E; break;
+				case 0x066D: ch = 0x2A; break;
+				case 0xFE70: ch = 0xEB; break;
+				case 0xFE71: ch = 0xEB; break;
+				case 0xFE72: ch = 0xEC; break;
+				case 0xFE74: ch = 0xED; break;
+				case 0xFE76: ch = 0xEE; break;
+				case 0xFE77: ch = 0xEE; break;
+				case 0xFE78: ch = 0xEF; break;
+				case 0xFE79: ch = 0xEF; break;
+				case 0xFE7A: ch = 0xF0; break;
+				case 0xFE7B: ch = 0xF0; break;
+				case 0xFE7C: ch = 0xF1; break;
+				case 0xFE7D: ch = 0xF1; break;
+				case 0xFE7E: ch = 0xF2; break;
+				case 0xFE7F: ch = 0xF2; break;
+				case 0xFE80: ch = 0xC1; break;
+				case 0xFE81: ch = 0xC2; break;
+				case 0xFE82: ch = 0xC2; break;
+				case 0xFE83: ch = 0xC3; break;
+				case 0xFE84: ch = 0xC3; break;
+				case 0xFE85: ch = 0xC4; break;
+				case 0xFE86: ch = 0xC4; break;
+				case 0xFE87: ch = 0xC5; break;
+				case 0xFE88: ch = 0xC5; break;
+				case 0xFE89: ch = 0xC6; break;
+				case 0xFE8A: ch = 0xC6; break;
+				case 0xFE8B: ch = 0xC6; break;
+				case 0xFE8C: ch = 0xC6; break;
+				case 0xFE8D: ch = 0xC7; break;
+				case 0xFE8E: ch = 0xC7; break;
+				case 0xFE8F: ch = 0xC8; break;
+				case 0xFE90: ch = 0xC8; break;
+				case 0xFE91: ch = 0xC8; break;
+				case 0xFE92: ch = 0xC8; break;
+				case 0xFE93: ch = 0xC9; break;
+				case 0xFE94: ch = 0xC9; break;
+				case 0xFE95: ch = 0xCA; break;
+				case 0xFE96: ch = 0xCA; break;
+				case 0xFE97: ch = 0xCA; break;
+				case 0xFE98: ch = 0xCA; break;
+				case 0xFE99: ch = 0xCB; break;
+				case 0xFE9A: ch = 0xCB; break;
+				case 0xFE9B: ch = 0xCB; break;
+				case 0xFE9C: ch = 0xCB; break;
+				case 0xFE9D: ch = 0xCC; break;
+				case 0xFE9E: ch = 0xCC; break;
+				case 0xFE9F: ch = 0xCC; break;
+				case 0xFEA0: ch = 0xCC; break;
+				case 0xFEA1: ch = 0xCD; break;
+				case 0xFEA2: ch = 0xCD; break;
+				case 0xFEA3: ch = 0xCD; break;
+				case 0xFEA4: ch = 0xCD; break;
+				case 0xFEA5: ch = 0xCE; break;
+				case 0xFEA6: ch = 0xCE; break;
+				case 0xFEA7: ch = 0xCE; break;
+				case 0xFEA8: ch = 0xCE; break;
+				case 0xFEA9: ch = 0xCF; break;
+				case 0xFEAA: ch = 0xCF; break;
+				case 0xFEAB: ch = 0xD0; break;
+				case 0xFEAC: ch = 0xD0; break;
+				case 0xFEAD: ch = 0xD1; break;
+				case 0xFEAE: ch = 0xD1; break;
+				case 0xFEAF: ch = 0xD2; break;
+				case 0xFEB0: ch = 0xD2; break;
+				case 0xFEB1: ch = 0xD3; break;
+				case 0xFEB2: ch = 0xD3; break;
+				case 0xFEB3: ch = 0xD3; break;
+				case 0xFEB4: ch = 0xD3; break;
+				case 0xFEB5: ch = 0xD4; break;
+				case 0xFEB6: ch = 0xD4; break;
+				case 0xFEB7: ch = 0xD4; break;
+				case 0xFEB8: ch = 0xD4; break;
+				case 0xFEB9: ch = 0xD5; break;
+				case 0xFEBA: ch = 0xD5; break;
+				case 0xFEBB: ch = 0xD5; break;
+				case 0xFEBC: ch = 0xD5; break;
+				case 0xFEBD: ch = 0xD6; break;
+				case 0xFEBE: ch = 0xD6; break;
+				case 0xFEBF: ch = 0xD6; break;
+				case 0xFEC0: ch = 0xD6; break;
+				case 0xFEC1: ch = 0xD7; break;
+				case 0xFEC2: ch = 0xD7; break;
+				case 0xFEC3: ch = 0xD7; break;
+				case 0xFEC4: ch = 0xD7; break;
+				case 0xFEC5: ch = 0xD8; break;
+				case 0xFEC6: ch = 0xD8; break;
+				case 0xFEC7: ch = 0xD8; break;
+				case 0xFEC8: ch = 0xD8; break;
+				case 0xFEC9: ch = 0xD9; break;
+				case 0xFECA: ch = 0xD9; break;
+				case 0xFECB: ch = 0xD9; break;
+				case 0xFECC: ch = 0xD9; break;
+				case 0xFECD: ch = 0xDA; break;
+				case 0xFECE: ch = 0xDA; break;
+				case 0xFECF: ch = 0xDA; break;
+				case 0xFED0: ch = 0xDA; break;
+				case 0xFED1: ch = 0xE1; break;
+				case 0xFED2: ch = 0xE1; break;
+				case 0xFED3: ch = 0xE1; break;
+				case 0xFED4: ch = 0xE1; break;
+				case 0xFED5: ch = 0xE2; break;
+				case 0xFED6: ch = 0xE2; break;
+				case 0xFED7: ch = 0xE2; break;
+				case 0xFED8: ch = 0xE2; break;
+				case 0xFED9: ch = 0xE3; break;
+				case 0xFEDA: ch = 0xE3; break;
+				case 0xFEDB: ch = 0xE3; break;
+				case 0xFEDC: ch = 0xE3; break;
+				case 0xFEDD: ch = 0xE4; break;
+				case 0xFEDE: ch = 0xE4; break;
+				case 0xFEDF: ch = 0xE4; break;
+				case 0xFEE0: ch = 0xE4; break;
+				case 0xFEE1: ch = 0xE5; break;
+				case 0xFEE2: ch = 0xE5; break;
+				case 0xFEE3: ch = 0xE5; break;
+				case 0xFEE4: ch = 0xE5; break;
+				case 0xFEE5: ch = 0xE6; break;
+				case 0xFEE6: ch = 0xE6; break;
+				case 0xFEE7: ch = 0xE6; break;
+				case 0xFEE8: ch = 0xE6; break;
+				case 0xFEE9: ch = 0xE7; break;
+				case 0xFEEA: ch = 0xE7; break;
+				case 0xFEEB: ch = 0xE7; break;
+				case 0xFEEC: ch = 0xE7; break;
+				case 0xFEED: ch = 0xE8; break;
+				case 0xFEEE: ch = 0xE8; break;
+				case 0xFEEF: ch = 0xE9; break;
+				case 0xFEF0: ch = 0xE9; break;
+				case 0xFEF1: ch = 0xEA; break;
+				case 0xFEF2: ch = 0xEA; break;
+				case 0xFEF3: ch = 0xEA; break;
+				case 0xFEF4: ch = 0xEA; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP708
+
+public class ENCasmo_708 : CP708
+{
+	public ENCasmo_708() : base() {}
+
+}; // class ENCasmo_708
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP852.cs b/mcs/class/I18N/Rare/CP852.cs
new file mode 100644
index 00000000000..7f768b3a6f1
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP852.cs
@@ -0,0 +1,679 @@
+/*
+ * CP852.cs - Central European (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-852.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP852 : ByteEncoding
+{
+	public CP852()
+		: base(852, ToChars, "Central European (DOS)",
+		       "ibm852", "ibm852", "ibm852",
+		       false, false, false, false, 1250)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u00C7', '\u00FC', '\u00E9', '\u00E2', 
+		'\u00E4', '\u016F', '\u0107', '\u00E7', '\u0142', '\u00EB', 
+		'\u0150', '\u0151', '\u00EE', '\u0179', '\u00C4', '\u0106', 
+		'\u00C9', '\u0139', '\u013A', '\u00F4', '\u00F6', '\u013D', 
+		'\u013E', '\u015A', '\u015B', '\u00D6', '\u00DC', '\u0164', 
+		'\u0165', '\u0141', '\u00D7', '\u010D', '\u00E1', '\u00ED', 
+		'\u00F3', '\u00FA', '\u0104', '\u0105', '\u017D', '\u017E', 
+		'\u0118', '\u0119', '\u003F', '\u017A', '\u010C', '\u015F', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u00C1', '\u00C2', '\u011A', '\u015E', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u017B', '\u017C', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u0102', '\u0103', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u00A4', '\u0111', '\u0110', 
+		'\u010E', '\u00CB', '\u010F', '\u0147', '\u00CD', '\u00CE', 
+		'\u011B', '\u2518', '\u250C', '\u2588', '\u2584', '\u0162', 
+		'\u016E', '\u2580', '\u00D3', '\u00DF', '\u00D4', '\u0143', 
+		'\u0144', '\u0148', '\u0160', '\u0161', '\u0154', '\u00DA', 
+		'\u0155', '\u0170', '\u00FD', '\u00DD', '\u0163', '\u00B4', 
+		'\u00AD', '\u02DD', '\u02DB', '\u02C7', '\u02D8', '\u00A7', 
+		'\u00F7', '\u00B8', '\u00B0', '\u00A8', '\u02D9', '\u0171', 
+		'\u0158', '\u0159', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A4: ch = 0xCF; break;
+				case 0x00A7: ch = 0xF5; break;
+				case 0x00A8: ch = 0xF9; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B4: ch = 0xEF; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B8: ch = 0xF7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00C1: ch = 0xB5; break;
+				case 0x00C2: ch = 0xB6; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CB: ch = 0xD3; break;
+				case 0x00CD: ch = 0xD6; break;
+				case 0x00CE: ch = 0xD7; break;
+				case 0x00D0: ch = 0xD1; break;
+				case 0x00D3: ch = 0xE0; break;
+				case 0x00D4: ch = 0xE2; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D7: ch = 0x9E; break;
+				case 0x00DA: ch = 0xE9; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DD: ch = 0xED; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FD: ch = 0xEC; break;
+				case 0x0102: ch = 0xC6; break;
+				case 0x0103: ch = 0xC7; break;
+				case 0x0104: ch = 0xA4; break;
+				case 0x0105: ch = 0xA5; break;
+				case 0x0106: ch = 0x8F; break;
+				case 0x0107: ch = 0x86; break;
+				case 0x010C: ch = 0xAC; break;
+				case 0x010D: ch = 0x9F; break;
+				case 0x010E: ch = 0xD2; break;
+				case 0x010F: ch = 0xD4; break;
+				case 0x0110: ch = 0xD1; break;
+				case 0x0111: ch = 0xD0; break;
+				case 0x0118: ch = 0xA8; break;
+				case 0x0119: ch = 0xA9; break;
+				case 0x011A: ch = 0xB7; break;
+				case 0x011B: ch = 0xD8; break;
+				case 0x0139: ch = 0x91; break;
+				case 0x013A: ch = 0x92; break;
+				case 0x013D: ch = 0x95; break;
+				case 0x013E: ch = 0x96; break;
+				case 0x0141: ch = 0x9D; break;
+				case 0x0142: ch = 0x88; break;
+				case 0x0143: ch = 0xE3; break;
+				case 0x0144: ch = 0xE4; break;
+				case 0x0147: ch = 0xD5; break;
+				case 0x0148: ch = 0xE5; break;
+				case 0x0150: ch = 0x8A; break;
+				case 0x0151: ch = 0x8B; break;
+				case 0x0154: ch = 0xE8; break;
+				case 0x0155: ch = 0xEA; break;
+				case 0x0158: ch = 0xFC; break;
+				case 0x0159: ch = 0xFD; break;
+				case 0x015A: ch = 0x97; break;
+				case 0x015B: ch = 0x98; break;
+				case 0x015E: ch = 0xB8; break;
+				case 0x015F: ch = 0xAD; break;
+				case 0x0160: ch = 0xE6; break;
+				case 0x0161: ch = 0xE7; break;
+				case 0x0162: ch = 0xDD; break;
+				case 0x0163: ch = 0xEE; break;
+				case 0x0164: ch = 0x9B; break;
+				case 0x0165: ch = 0x9C; break;
+				case 0x016E: ch = 0xDE; break;
+				case 0x016F: ch = 0x85; break;
+				case 0x0170: ch = 0xEB; break;
+				case 0x0171: ch = 0xFB; break;
+				case 0x0179: ch = 0x8D; break;
+				case 0x017A: ch = 0xAB; break;
+				case 0x017B: ch = 0xBD; break;
+				case 0x017C: ch = 0xBE; break;
+				case 0x017D: ch = 0xA6; break;
+				case 0x017E: ch = 0xA7; break;
+				case 0x02C7: ch = 0xF3; break;
+				case 0x02D8: ch = 0xF4; break;
+				case 0x02D9: ch = 0xFA; break;
+				case 0x02DB: ch = 0xF2; break;
+				case 0x02DD: ch = 0xF1; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266C: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A4: ch = 0xCF; break;
+				case 0x00A7: ch = 0xF5; break;
+				case 0x00A8: ch = 0xF9; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B4: ch = 0xEF; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B8: ch = 0xF7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00C1: ch = 0xB5; break;
+				case 0x00C2: ch = 0xB6; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CB: ch = 0xD3; break;
+				case 0x00CD: ch = 0xD6; break;
+				case 0x00CE: ch = 0xD7; break;
+				case 0x00D0: ch = 0xD1; break;
+				case 0x00D3: ch = 0xE0; break;
+				case 0x00D4: ch = 0xE2; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D7: ch = 0x9E; break;
+				case 0x00DA: ch = 0xE9; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DD: ch = 0xED; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FD: ch = 0xEC; break;
+				case 0x0102: ch = 0xC6; break;
+				case 0x0103: ch = 0xC7; break;
+				case 0x0104: ch = 0xA4; break;
+				case 0x0105: ch = 0xA5; break;
+				case 0x0106: ch = 0x8F; break;
+				case 0x0107: ch = 0x86; break;
+				case 0x010C: ch = 0xAC; break;
+				case 0x010D: ch = 0x9F; break;
+				case 0x010E: ch = 0xD2; break;
+				case 0x010F: ch = 0xD4; break;
+				case 0x0110: ch = 0xD1; break;
+				case 0x0111: ch = 0xD0; break;
+				case 0x0118: ch = 0xA8; break;
+				case 0x0119: ch = 0xA9; break;
+				case 0x011A: ch = 0xB7; break;
+				case 0x011B: ch = 0xD8; break;
+				case 0x0139: ch = 0x91; break;
+				case 0x013A: ch = 0x92; break;
+				case 0x013D: ch = 0x95; break;
+				case 0x013E: ch = 0x96; break;
+				case 0x0141: ch = 0x9D; break;
+				case 0x0142: ch = 0x88; break;
+				case 0x0143: ch = 0xE3; break;
+				case 0x0144: ch = 0xE4; break;
+				case 0x0147: ch = 0xD5; break;
+				case 0x0148: ch = 0xE5; break;
+				case 0x0150: ch = 0x8A; break;
+				case 0x0151: ch = 0x8B; break;
+				case 0x0154: ch = 0xE8; break;
+				case 0x0155: ch = 0xEA; break;
+				case 0x0158: ch = 0xFC; break;
+				case 0x0159: ch = 0xFD; break;
+				case 0x015A: ch = 0x97; break;
+				case 0x015B: ch = 0x98; break;
+				case 0x015E: ch = 0xB8; break;
+				case 0x015F: ch = 0xAD; break;
+				case 0x0160: ch = 0xE6; break;
+				case 0x0161: ch = 0xE7; break;
+				case 0x0162: ch = 0xDD; break;
+				case 0x0163: ch = 0xEE; break;
+				case 0x0164: ch = 0x9B; break;
+				case 0x0165: ch = 0x9C; break;
+				case 0x016E: ch = 0xDE; break;
+				case 0x016F: ch = 0x85; break;
+				case 0x0170: ch = 0xEB; break;
+				case 0x0171: ch = 0xFB; break;
+				case 0x0179: ch = 0x8D; break;
+				case 0x017A: ch = 0xAB; break;
+				case 0x017B: ch = 0xBD; break;
+				case 0x017C: ch = 0xBE; break;
+				case 0x017D: ch = 0xA6; break;
+				case 0x017E: ch = 0xA7; break;
+				case 0x02C7: ch = 0xF3; break;
+				case 0x02D8: ch = 0xF4; break;
+				case 0x02D9: ch = 0xFA; break;
+				case 0x02DB: ch = 0xF2; break;
+				case 0x02DD: ch = 0xF1; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266C: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP852
+
+public class ENCibm852 : CP852
+{
+	public ENCibm852() : base() {}
+
+}; // class ENCibm852
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP855.cs b/mcs/class/I18N/Rare/CP855.cs
new file mode 100644
index 00000000000..665ece07051
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP855.cs
@@ -0,0 +1,679 @@
+/*
+ * CP855.cs - Cyrillic (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-855.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP855 : ByteEncoding
+{
+	public CP855()
+		: base(855, ToChars, "Cyrillic (DOS)",
+		       "ibm855", "ibm855", "ibm855",
+		       false, false, false, false, 1251)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u0452', '\u0402', '\u0453', '\u0403', 
+		'\u0451', '\u0401', '\u0454', '\u0404', '\u0455', '\u0405', 
+		'\u0456', '\u0406', '\u0457', '\u0407', '\u0458', '\u0408', 
+		'\u0459', '\u0409', '\u045A', '\u040A', '\u045B', '\u040B', 
+		'\u045C', '\u040C', '\u045E', '\u040E', '\u045F', '\u040F', 
+		'\u044E', '\u042E', '\u044A', '\u042A', '\u0430', '\u0410', 
+		'\u0431', '\u0411', '\u0446', '\u0426', '\u0434', '\u0414', 
+		'\u0435', '\u0415', '\u0444', '\u0424', '\u0433', '\u0413', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u0445', '\u0425', '\u0438', '\u0418', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u0439', '\u0419', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u043A', '\u041A', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u00A4', '\u043B', '\u041B', 
+		'\u043C', '\u041C', '\u043D', '\u041D', '\u043E', '\u041E', 
+		'\u043F', '\u2518', '\u250C', '\u2588', '\u2584', '\u041F', 
+		'\u044F', '\u2580', '\u042F', '\u0440', '\u0420', '\u0441', 
+		'\u0421', '\u0442', '\u0422', '\u0443', '\u0423', '\u0436', 
+		'\u0416', '\u0432', '\u0412', '\u044C', '\u042C', '\u2116', 
+		'\u00AD', '\u044B', '\u042B', '\u0437', '\u0417', '\u0448', 
+		'\u0428', '\u044D', '\u042D', '\u0449', '\u0429', '\u0447', 
+		'\u0427', '\u00A7', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A4: ch = 0xCF; break;
+				case 0x00A7: ch = 0xFD; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x0401: ch = 0x85; break;
+				case 0x0402: ch = 0x81; break;
+				case 0x0403: ch = 0x83; break;
+				case 0x0404: ch = 0x87; break;
+				case 0x0405: ch = 0x89; break;
+				case 0x0406: ch = 0x8B; break;
+				case 0x0407: ch = 0x8D; break;
+				case 0x0408: ch = 0x8F; break;
+				case 0x0409: ch = 0x91; break;
+				case 0x040A: ch = 0x93; break;
+				case 0x040B: ch = 0x95; break;
+				case 0x040C: ch = 0x97; break;
+				case 0x040E: ch = 0x99; break;
+				case 0x040F: ch = 0x9B; break;
+				case 0x0410: ch = 0xA1; break;
+				case 0x0411: ch = 0xA3; break;
+				case 0x0412: ch = 0xEC; break;
+				case 0x0413: ch = 0xAD; break;
+				case 0x0414: ch = 0xA7; break;
+				case 0x0415: ch = 0xA9; break;
+				case 0x0416: ch = 0xEA; break;
+				case 0x0417: ch = 0xF4; break;
+				case 0x0418: ch = 0xB8; break;
+				case 0x0419: ch = 0xBE; break;
+				case 0x041A: ch = 0xC7; break;
+				case 0x041B: ch = 0xD1; break;
+				case 0x041C: ch = 0xD3; break;
+				case 0x041D: ch = 0xD5; break;
+				case 0x041E: ch = 0xD7; break;
+				case 0x041F: ch = 0xDD; break;
+				case 0x0420: ch = 0xE2; break;
+				case 0x0421: ch = 0xE4; break;
+				case 0x0422: ch = 0xE6; break;
+				case 0x0423: ch = 0xE8; break;
+				case 0x0424: ch = 0xAB; break;
+				case 0x0425: ch = 0xB6; break;
+				case 0x0426: ch = 0xA5; break;
+				case 0x0427: ch = 0xFC; break;
+				case 0x0428: ch = 0xF6; break;
+				case 0x0429: ch = 0xFA; break;
+				case 0x042A: ch = 0x9F; break;
+				case 0x042B: ch = 0xF2; break;
+				case 0x042C: ch = 0xEE; break;
+				case 0x042D: ch = 0xF8; break;
+				case 0x042E: ch = 0x9D; break;
+				case 0x042F: ch = 0xE0; break;
+				case 0x0430: ch = 0xA0; break;
+				case 0x0431: ch = 0xA2; break;
+				case 0x0432: ch = 0xEB; break;
+				case 0x0433: ch = 0xAC; break;
+				case 0x0434: ch = 0xA6; break;
+				case 0x0435: ch = 0xA8; break;
+				case 0x0436: ch = 0xE9; break;
+				case 0x0437: ch = 0xF3; break;
+				case 0x0438: ch = 0xB7; break;
+				case 0x0439: ch = 0xBD; break;
+				case 0x043A: ch = 0xC6; break;
+				case 0x043B: ch = 0xD0; break;
+				case 0x043C: ch = 0xD2; break;
+				case 0x043D: ch = 0xD4; break;
+				case 0x043E: ch = 0xD6; break;
+				case 0x043F: ch = 0xD8; break;
+				case 0x0440: ch = 0xE1; break;
+				case 0x0441: ch = 0xE3; break;
+				case 0x0442: ch = 0xE5; break;
+				case 0x0443: ch = 0xE7; break;
+				case 0x0444: ch = 0xAA; break;
+				case 0x0445: ch = 0xB5; break;
+				case 0x0446: ch = 0xA4; break;
+				case 0x0447: ch = 0xFB; break;
+				case 0x0448: ch = 0xF5; break;
+				case 0x0449: ch = 0xF9; break;
+				case 0x044A: ch = 0x9E; break;
+				case 0x044B: ch = 0xF1; break;
+				case 0x044C: ch = 0xED; break;
+				case 0x044D: ch = 0xF7; break;
+				case 0x044E: ch = 0x9C; break;
+				case 0x044F: ch = 0xDE; break;
+				case 0x0451: ch = 0x84; break;
+				case 0x0452: ch = 0x80; break;
+				case 0x0453: ch = 0x82; break;
+				case 0x0454: ch = 0x86; break;
+				case 0x0455: ch = 0x88; break;
+				case 0x0456: ch = 0x8A; break;
+				case 0x0457: ch = 0x8C; break;
+				case 0x0458: ch = 0x8E; break;
+				case 0x0459: ch = 0x90; break;
+				case 0x045A: ch = 0x92; break;
+				case 0x045B: ch = 0x94; break;
+				case 0x045C: ch = 0x96; break;
+				case 0x045E: ch = 0x98; break;
+				case 0x045F: ch = 0x9A; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2116: ch = 0xEF; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A4: ch = 0xCF; break;
+				case 0x00A7: ch = 0xFD; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x0401: ch = 0x85; break;
+				case 0x0402: ch = 0x81; break;
+				case 0x0403: ch = 0x83; break;
+				case 0x0404: ch = 0x87; break;
+				case 0x0405: ch = 0x89; break;
+				case 0x0406: ch = 0x8B; break;
+				case 0x0407: ch = 0x8D; break;
+				case 0x0408: ch = 0x8F; break;
+				case 0x0409: ch = 0x91; break;
+				case 0x040A: ch = 0x93; break;
+				case 0x040B: ch = 0x95; break;
+				case 0x040C: ch = 0x97; break;
+				case 0x040E: ch = 0x99; break;
+				case 0x040F: ch = 0x9B; break;
+				case 0x0410: ch = 0xA1; break;
+				case 0x0411: ch = 0xA3; break;
+				case 0x0412: ch = 0xEC; break;
+				case 0x0413: ch = 0xAD; break;
+				case 0x0414: ch = 0xA7; break;
+				case 0x0415: ch = 0xA9; break;
+				case 0x0416: ch = 0xEA; break;
+				case 0x0417: ch = 0xF4; break;
+				case 0x0418: ch = 0xB8; break;
+				case 0x0419: ch = 0xBE; break;
+				case 0x041A: ch = 0xC7; break;
+				case 0x041B: ch = 0xD1; break;
+				case 0x041C: ch = 0xD3; break;
+				case 0x041D: ch = 0xD5; break;
+				case 0x041E: ch = 0xD7; break;
+				case 0x041F: ch = 0xDD; break;
+				case 0x0420: ch = 0xE2; break;
+				case 0x0421: ch = 0xE4; break;
+				case 0x0422: ch = 0xE6; break;
+				case 0x0423: ch = 0xE8; break;
+				case 0x0424: ch = 0xAB; break;
+				case 0x0425: ch = 0xB6; break;
+				case 0x0426: ch = 0xA5; break;
+				case 0x0427: ch = 0xFC; break;
+				case 0x0428: ch = 0xF6; break;
+				case 0x0429: ch = 0xFA; break;
+				case 0x042A: ch = 0x9F; break;
+				case 0x042B: ch = 0xF2; break;
+				case 0x042C: ch = 0xEE; break;
+				case 0x042D: ch = 0xF8; break;
+				case 0x042E: ch = 0x9D; break;
+				case 0x042F: ch = 0xE0; break;
+				case 0x0430: ch = 0xA0; break;
+				case 0x0431: ch = 0xA2; break;
+				case 0x0432: ch = 0xEB; break;
+				case 0x0433: ch = 0xAC; break;
+				case 0x0434: ch = 0xA6; break;
+				case 0x0435: ch = 0xA8; break;
+				case 0x0436: ch = 0xE9; break;
+				case 0x0437: ch = 0xF3; break;
+				case 0x0438: ch = 0xB7; break;
+				case 0x0439: ch = 0xBD; break;
+				case 0x043A: ch = 0xC6; break;
+				case 0x043B: ch = 0xD0; break;
+				case 0x043C: ch = 0xD2; break;
+				case 0x043D: ch = 0xD4; break;
+				case 0x043E: ch = 0xD6; break;
+				case 0x043F: ch = 0xD8; break;
+				case 0x0440: ch = 0xE1; break;
+				case 0x0441: ch = 0xE3; break;
+				case 0x0442: ch = 0xE5; break;
+				case 0x0443: ch = 0xE7; break;
+				case 0x0444: ch = 0xAA; break;
+				case 0x0445: ch = 0xB5; break;
+				case 0x0446: ch = 0xA4; break;
+				case 0x0447: ch = 0xFB; break;
+				case 0x0448: ch = 0xF5; break;
+				case 0x0449: ch = 0xF9; break;
+				case 0x044A: ch = 0x9E; break;
+				case 0x044B: ch = 0xF1; break;
+				case 0x044C: ch = 0xED; break;
+				case 0x044D: ch = 0xF7; break;
+				case 0x044E: ch = 0x9C; break;
+				case 0x044F: ch = 0xDE; break;
+				case 0x0451: ch = 0x84; break;
+				case 0x0452: ch = 0x80; break;
+				case 0x0453: ch = 0x82; break;
+				case 0x0454: ch = 0x86; break;
+				case 0x0455: ch = 0x88; break;
+				case 0x0456: ch = 0x8A; break;
+				case 0x0457: ch = 0x8C; break;
+				case 0x0458: ch = 0x8E; break;
+				case 0x0459: ch = 0x90; break;
+				case 0x045A: ch = 0x92; break;
+				case 0x045B: ch = 0x94; break;
+				case 0x045C: ch = 0x96; break;
+				case 0x045E: ch = 0x98; break;
+				case 0x045F: ch = 0x9A; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2116: ch = 0xEF; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP855
+
+public class ENCibm855 : CP855
+{
+	public ENCibm855() : base() {}
+
+}; // class ENCibm855
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP857.cs b/mcs/class/I18N/Rare/CP857.cs
new file mode 100644
index 00000000000..9d2b85e0708
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP857.cs
@@ -0,0 +1,673 @@
+/*
+ * CP857.cs - Turkish (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-857.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP857 : ByteEncoding
+{
+	public CP857()
+		: base(857, ToChars, "Turkish (DOS)",
+		       "ibm857", "ibm857", "ibm857",
+		       false, false, false, false, 1254)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u00C7', '\u00FC', '\u00E9', '\u00E2', 
+		'\u00E4', '\u00E0', '\u00E5', '\u00E7', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00EF', '\u00EE', '\u0131', '\u00C4', '\u00C5', 
+		'\u00C9', '\u00E6', '\u00C6', '\u00F4', '\u00F6', '\u00F2', 
+		'\u00FB', '\u00F9', '\u0130', '\u00D6', '\u00DC', '\u00F8', 
+		'\u00A3', '\u00D8', '\u015E', '\u015F', '\u00E1', '\u00ED', 
+		'\u00F3', '\u00FA', '\u00F1', '\u00D1', '\u011E', '\u011F', 
+		'\u00BF', '\u00AE', '\u00AC', '\u00BD', '\u00BC', '\u00A1', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u00C1', '\u00C2', '\u00C0', '\u00A9', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u00A2', '\u00A5', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u00E3', '\u00C3', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u00A4', '\u00BA', '\u00AA', 
+		'\u00CA', '\u00CB', '\u00C8', '\u003F', '\u00CD', '\u00CE', 
+		'\u00CF', '\u2518', '\u250C', '\u2588', '\u2584', '\u00A6', 
+		'\u00CC', '\u2580', '\u00D3', '\u00DF', '\u00D4', '\u00D2', 
+		'\u00F5', '\u00D5', '\u00B5', '\u003F', '\u00D7', '\u00DA', 
+		'\u00DB', '\u00D9', '\u00EC', '\u00FF', '\u00AF', '\u00B4', 
+		'\u00AD', '\u00B1', '\u003F', '\u00BE', '\u00B6', '\u00A7', 
+		'\u00F7', '\u00B8', '\u00B0', '\u00A8', '\u00B7', '\u00B9', 
+		'\u00B3', '\u00B2', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+				case 0x00EC:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0xBD; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A4: ch = 0xCF; break;
+				case 0x00A5: ch = 0xBE; break;
+				case 0x00A6: ch = 0xDD; break;
+				case 0x00A7: ch = 0xF5; break;
+				case 0x00A8: ch = 0xF9; break;
+				case 0x00A9: ch = 0xB8; break;
+				case 0x00AA: ch = 0xD1; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00AE: ch = 0xA9; break;
+				case 0x00AF: ch = 0xEE; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B3: ch = 0xFC; break;
+				case 0x00B4: ch = 0xEF; break;
+				case 0x00B5: ch = 0xE6; break;
+				case 0x00B6: ch = 0xF4; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00B8: ch = 0xF7; break;
+				case 0x00B9: ch = 0xFB; break;
+				case 0x00BA: ch = 0xD0; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BE: ch = 0xF3; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C0: ch = 0xB7; break;
+				case 0x00C1: ch = 0xB5; break;
+				case 0x00C2: ch = 0xB6; break;
+				case 0x00C3: ch = 0xC7; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C8: ch = 0xD4; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CA: ch = 0xD2; break;
+				case 0x00CB: ch = 0xD3; break;
+				case 0x00CC: ch = 0xDE; break;
+				case 0x00CD: ch = 0xD6; break;
+				case 0x00CE: ch = 0xD7; break;
+				case 0x00CF: ch = 0xD8; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D2: ch = 0xE3; break;
+				case 0x00D3: ch = 0xE0; break;
+				case 0x00D4: ch = 0xE2; break;
+				case 0x00D5: ch = 0xE5; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D7: ch = 0xE8; break;
+				case 0x00D8: ch = 0x9D; break;
+				case 0x00D9: ch = 0xEB; break;
+				case 0x00DA: ch = 0xE9; break;
+				case 0x00DB: ch = 0xEA; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E3: ch = 0xC6; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F5: ch = 0xE4; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F8: ch = 0x9B; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FF: ch = 0xED; break;
+				case 0x011E: ch = 0xA6; break;
+				case 0x011F: ch = 0xA7; break;
+				case 0x0130: ch = 0x98; break;
+				case 0x0131: ch = 0x8D; break;
+				case 0x015E: ch = 0x9E; break;
+				case 0x015F: ch = 0x9F; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x203E: ch = 0xEE; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+				case 0x00EC:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0xBD; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A4: ch = 0xCF; break;
+				case 0x00A5: ch = 0xBE; break;
+				case 0x00A6: ch = 0xDD; break;
+				case 0x00A7: ch = 0xF5; break;
+				case 0x00A8: ch = 0xF9; break;
+				case 0x00A9: ch = 0xB8; break;
+				case 0x00AA: ch = 0xD1; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00AE: ch = 0xA9; break;
+				case 0x00AF: ch = 0xEE; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B3: ch = 0xFC; break;
+				case 0x00B4: ch = 0xEF; break;
+				case 0x00B5: ch = 0xE6; break;
+				case 0x00B6: ch = 0xF4; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00B8: ch = 0xF7; break;
+				case 0x00B9: ch = 0xFB; break;
+				case 0x00BA: ch = 0xD0; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BE: ch = 0xF3; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C0: ch = 0xB7; break;
+				case 0x00C1: ch = 0xB5; break;
+				case 0x00C2: ch = 0xB6; break;
+				case 0x00C3: ch = 0xC7; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C8: ch = 0xD4; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CA: ch = 0xD2; break;
+				case 0x00CB: ch = 0xD3; break;
+				case 0x00CC: ch = 0xDE; break;
+				case 0x00CD: ch = 0xD6; break;
+				case 0x00CE: ch = 0xD7; break;
+				case 0x00CF: ch = 0xD8; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D2: ch = 0xE3; break;
+				case 0x00D3: ch = 0xE0; break;
+				case 0x00D4: ch = 0xE2; break;
+				case 0x00D5: ch = 0xE5; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D7: ch = 0xE8; break;
+				case 0x00D8: ch = 0x9D; break;
+				case 0x00D9: ch = 0xEB; break;
+				case 0x00DA: ch = 0xE9; break;
+				case 0x00DB: ch = 0xEA; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E3: ch = 0xC6; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F5: ch = 0xE4; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F8: ch = 0x9B; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FF: ch = 0xED; break;
+				case 0x011E: ch = 0xA6; break;
+				case 0x011F: ch = 0xA7; break;
+				case 0x0130: ch = 0x98; break;
+				case 0x0131: ch = 0x8D; break;
+				case 0x015E: ch = 0x9E; break;
+				case 0x015F: ch = 0x9F; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x203E: ch = 0xEE; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP857
+
+public class ENCibm857 : CP857
+{
+	public ENCibm857() : base() {}
+
+}; // class ENCibm857
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP858.cs b/mcs/class/I18N/Rare/CP858.cs
new file mode 100644
index 00000000000..3ad8fc85a42
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP858.cs
@@ -0,0 +1,679 @@
+/*
+ * CP858.cs - Western European (DOS with Euro) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-858.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP858 : ByteEncoding
+{
+	public CP858()
+		: base(858, ToChars, "Western European (DOS with Euro)",
+		       "IBM00858", "IBM00858", "IBM00858",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u00C7', '\u00FC', '\u00E9', '\u00E2', 
+		'\u00E4', '\u00E0', '\u00E5', '\u00E7', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00EF', '\u00EE', '\u00EC', '\u00C4', '\u00C5', 
+		'\u00C9', '\u00E6', '\u00C6', '\u00F4', '\u00F6', '\u00F2', 
+		'\u00FB', '\u00F9', '\u00FF', '\u00D6', '\u00DC', '\u00F8', 
+		'\u00A3', '\u00D8', '\u00D7', '\u0192', '\u00E1', '\u00ED', 
+		'\u00F3', '\u00FA', '\u00F1', '\u00D1', '\u00AA', '\u00BA', 
+		'\u00BF', '\u00AE', '\u00AC', '\u00BD', '\u00BC', '\u00A1', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u00C1', '\u00C2', '\u00C0', '\u00A9', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u00A2', '\u00A5', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u00E3', '\u00C3', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u00A4', '\u00F0', '\u00D0', 
+		'\u00CA', '\u00CB', '\u00C8', '\u20AC', '\u00CD', '\u00CE', 
+		'\u00CF', '\u2518', '\u250C', '\u2588', '\u2584', '\u00A6', 
+		'\u00CC', '\u2580', '\u00D3', '\u00DF', '\u00D4', '\u00D2', 
+		'\u00F5', '\u00D5', '\u00B5', '\u00FE', '\u00DE', '\u00DA', 
+		'\u00DB', '\u00D9', '\u00FD', '\u00DD', '\u00AF', '\u00B4', 
+		'\u00AD', '\u00B1', '\u2017', '\u00BE', '\u00B6', '\u00A7', 
+		'\u00F7', '\u00B8', '\u00B0', '\u00A8', '\u00B7', '\u00B9', 
+		'\u00B3', '\u00B2', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0xBD; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A4: ch = 0xCF; break;
+				case 0x00A5: ch = 0xBE; break;
+				case 0x00A6: ch = 0xDD; break;
+				case 0x00A7: ch = 0xF5; break;
+				case 0x00A8: ch = 0xF9; break;
+				case 0x00A9: ch = 0xB8; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00AE: ch = 0xA9; break;
+				case 0x00AF: ch = 0xEE; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B3: ch = 0xFC; break;
+				case 0x00B4: ch = 0xEF; break;
+				case 0x00B5: ch = 0xE6; break;
+				case 0x00B6: ch = 0xF4; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00B8: ch = 0xF7; break;
+				case 0x00B9: ch = 0xFB; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BE: ch = 0xF3; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C0: ch = 0xB7; break;
+				case 0x00C1: ch = 0xB5; break;
+				case 0x00C2: ch = 0xB6; break;
+				case 0x00C3: ch = 0xC7; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C8: ch = 0xD4; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CA: ch = 0xD2; break;
+				case 0x00CB: ch = 0xD3; break;
+				case 0x00CC: ch = 0xDE; break;
+				case 0x00CD: ch = 0xD6; break;
+				case 0x00CE: ch = 0xD7; break;
+				case 0x00CF: ch = 0xD8; break;
+				case 0x00D0: ch = 0xD1; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D2: ch = 0xE3; break;
+				case 0x00D3: ch = 0xE0; break;
+				case 0x00D4: ch = 0xE2; break;
+				case 0x00D5: ch = 0xE5; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D7: ch = 0x9E; break;
+				case 0x00D8: ch = 0x9D; break;
+				case 0x00D9: ch = 0xEB; break;
+				case 0x00DA: ch = 0xE9; break;
+				case 0x00DB: ch = 0xEA; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DD: ch = 0xED; break;
+				case 0x00DE: ch = 0xE8; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E3: ch = 0xC6; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00EC: ch = 0x8D; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F0: ch = 0xD0; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F5: ch = 0xE4; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F8: ch = 0x9B; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FD: ch = 0xEC; break;
+				case 0x00FE: ch = 0xE7; break;
+				case 0x00FF: ch = 0x98; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x2017: ch = 0xF2; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x203E: ch = 0xEE; break;
+				case 0x20AC: ch = 0xD5; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266C: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0xBD; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A4: ch = 0xCF; break;
+				case 0x00A5: ch = 0xBE; break;
+				case 0x00A6: ch = 0xDD; break;
+				case 0x00A7: ch = 0xF5; break;
+				case 0x00A8: ch = 0xF9; break;
+				case 0x00A9: ch = 0xB8; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00AE: ch = 0xA9; break;
+				case 0x00AF: ch = 0xEE; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B3: ch = 0xFC; break;
+				case 0x00B4: ch = 0xEF; break;
+				case 0x00B5: ch = 0xE6; break;
+				case 0x00B6: ch = 0xF4; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00B8: ch = 0xF7; break;
+				case 0x00B9: ch = 0xFB; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BE: ch = 0xF3; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C0: ch = 0xB7; break;
+				case 0x00C1: ch = 0xB5; break;
+				case 0x00C2: ch = 0xB6; break;
+				case 0x00C3: ch = 0xC7; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C8: ch = 0xD4; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CA: ch = 0xD2; break;
+				case 0x00CB: ch = 0xD3; break;
+				case 0x00CC: ch = 0xDE; break;
+				case 0x00CD: ch = 0xD6; break;
+				case 0x00CE: ch = 0xD7; break;
+				case 0x00CF: ch = 0xD8; break;
+				case 0x00D0: ch = 0xD1; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D2: ch = 0xE3; break;
+				case 0x00D3: ch = 0xE0; break;
+				case 0x00D4: ch = 0xE2; break;
+				case 0x00D5: ch = 0xE5; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D7: ch = 0x9E; break;
+				case 0x00D8: ch = 0x9D; break;
+				case 0x00D9: ch = 0xEB; break;
+				case 0x00DA: ch = 0xE9; break;
+				case 0x00DB: ch = 0xEA; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DD: ch = 0xED; break;
+				case 0x00DE: ch = 0xE8; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E3: ch = 0xC6; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00EC: ch = 0x8D; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F0: ch = 0xD0; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F5: ch = 0xE4; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F8: ch = 0x9B; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FD: ch = 0xEC; break;
+				case 0x00FE: ch = 0xE7; break;
+				case 0x00FF: ch = 0x98; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x2017: ch = 0xF2; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x203E: ch = 0xEE; break;
+				case 0x20AC: ch = 0xD5; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266C: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP858
+
+public class ENCibm00858 : CP858
+{
+	public ENCibm00858() : base() {}
+
+}; // class ENCibm00858
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP862.cs b/mcs/class/I18N/Rare/CP862.cs
new file mode 100644
index 00000000000..182fcb33e45
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP862.cs
@@ -0,0 +1,685 @@
+/*
+ * CP862.cs - Hebrew (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-862.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP862 : ByteEncoding
+{
+	public CP862()
+		: base(862, ToChars, "Hebrew (DOS)",
+		       "ibm862", "ibm861", "ibm862",
+		       false, false, false, false, 1255)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u05D0', '\u05D1', '\u05D2', '\u05D3', 
+		'\u05D4', '\u05D5', '\u05D6', '\u05D7', '\u05D8', '\u05D9', 
+		'\u05DA', '\u05DB', '\u05DC', '\u05DD', '\u05DE', '\u05DF', 
+		'\u05E0', '\u05E1', '\u05E2', '\u05E3', '\u05E4', '\u05E5', 
+		'\u05E6', '\u05E7', '\u05E8', '\u05E9', '\u05EA', '\u00A2', 
+		'\u00A3', '\u00A5', '\u20A7', '\u0192', '\u00E1', '\u00ED', 
+		'\u00F3', '\u00FA', '\u00F1', '\u00D1', '\u00AA', '\u00BA', 
+		'\u00BF', '\u2310', '\u00AC', '\u00BD', '\u00BC', '\u00A1', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u2561', '\u2562', '\u2556', '\u2555', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u255C', '\u255B', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u255E', '\u255F', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564', 
+		'\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B', 
+		'\u256A', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C', 
+		'\u2590', '\u2580', '\u03B1', '\u00DF', '\u0393', '\u03C0', 
+		'\u03A3', '\u03C3', '\u03BC', '\u03C4', '\u03A6', '\u0398', 
+		'\u03A9', '\u03B4', '\u221E', '\u03C6', '\u03B5', '\u2229', 
+		'\u2261', '\u00B1', '\u2265', '\u2264', '\u2320', '\u2321', 
+		'\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', '\u221A', 
+		'\u207F', '\u00B2', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0x9B; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A5: ch = 0x9D; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x05D0:
+				case 0x05D1:
+				case 0x05D2:
+				case 0x05D3:
+				case 0x05D4:
+				case 0x05D5:
+				case 0x05D6:
+				case 0x05D7:
+				case 0x05D8:
+				case 0x05D9:
+				case 0x05DA:
+				case 0x05DB:
+				case 0x05DC:
+				case 0x05DD:
+				case 0x05DE:
+				case 0x05DF:
+				case 0x05E0:
+				case 0x05E1:
+				case 0x05E2:
+				case 0x05E3:
+				case 0x05E4:
+				case 0x05E5:
+				case 0x05E6:
+				case 0x05E7:
+				case 0x05E8:
+				case 0x05E9:
+				case 0x05EA:
+					ch -= 0x0550;
+					break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x20A7: ch = 0x9E; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2310: ch = 0xA9; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0x9B; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A5: ch = 0x9D; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x05D0:
+				case 0x05D1:
+				case 0x05D2:
+				case 0x05D3:
+				case 0x05D4:
+				case 0x05D5:
+				case 0x05D6:
+				case 0x05D7:
+				case 0x05D8:
+				case 0x05D9:
+				case 0x05DA:
+				case 0x05DB:
+				case 0x05DC:
+				case 0x05DD:
+				case 0x05DE:
+				case 0x05DF:
+				case 0x05E0:
+				case 0x05E1:
+				case 0x05E2:
+				case 0x05E3:
+				case 0x05E4:
+				case 0x05E5:
+				case 0x05E6:
+				case 0x05E7:
+				case 0x05E8:
+				case 0x05E9:
+				case 0x05EA:
+					ch -= 0x0550;
+					break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x20A7: ch = 0x9E; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2310: ch = 0xA9; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP862
+
+public class ENCibm862 : CP862
+{
+	public ENCibm862() : base() {}
+
+}; // class ENCibm862
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP864.cs b/mcs/class/I18N/Rare/CP864.cs
new file mode 100644
index 00000000000..0ad86426477
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP864.cs
@@ -0,0 +1,861 @@
+/*
+ * CP864.cs - Arabic (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-864.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP864 : ByteEncoding
+{
+	public CP864()
+		: base(864, ToChars, "Arabic (DOS)",
+		       "ibm864", "ibm864", "ibm864",
+		       false, false, false, false, 1256)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u00B0', '\u00B7', '\u2219', '\u221A', 
+		'\u2592', '\u2500', '\u2502', '\u253C', '\u2524', '\u252C', 
+		'\u251C', '\u2534', '\u2510', '\u250C', '\u2514', '\u2518', 
+		'\u03B2', '\u221E', '\u03C6', '\u00B1', '\u00BD', '\u00BC', 
+		'\u2248', '\u00AB', '\u00BB', '\uFEF7', '\uFEF8', '\u003F', 
+		'\u003F', '\uFEFB', '\uFEFC', '\u200B', '\u00A0', '\u00AD', 
+		'\uFE82', '\u00A3', '\u00A4', '\uFE84', '\u003F', '\u003F', 
+		'\uFE8E', '\uFE8F', '\uFE95', '\uFE99', '\u060C', '\uFE9D', 
+		'\uFEA1', '\uFEA5', '\u0660', '\u0661', '\u0662', '\u0663', 
+		'\u0664', '\u0665', '\u0666', '\u0667', '\u0668', '\u0669', 
+		'\uFED1', '\u061B', '\uFEB1', '\uFEB5', '\uFEB9', '\u061F', 
+		'\u00A2', '\uFE80', '\uFE81', '\uFE83', '\uFE85', '\uFECA', 
+		'\uFE8B', '\uFE8D', '\uFE91', '\uFE93', '\uFE97', '\uFE9B', 
+		'\uFE9F', '\uFEA3', '\uFEA7', '\uFEA9', '\uFEAB', '\uFEAD', 
+		'\uFEAF', '\uFEB3', '\uFEB7', '\uFEBB', '\uFEBF', '\uFEC3', 
+		'\uFEC7', '\uFECB', '\uFECF', '\u00A6', '\u00AC', '\u00F7', 
+		'\u00D7', '\uFEC9', '\u0640', '\uFED3', '\uFED7', '\uFEDB', 
+		'\uFEDF', '\uFEE3', '\uFEE7', '\uFEEB', '\uFEED', '\uFEEF', 
+		'\uFEF3', '\uFEBD', '\uFECC', '\uFECE', '\uFECD', '\uFEE1', 
+		'\uFE7D', '\uFE7C', '\uFEE5', '\uFEE9', '\uFEEC', '\uFEF0', 
+		'\uFEF2', '\uFED0', '\uFED5', '\uFEF5', '\uFEF6', '\uFEDD', 
+		'\uFED9', '\uFEF1', '\u25A0', '\u003F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+				case 0x00A0:
+				case 0x00A3:
+				case 0x00A4:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A2: ch = 0xC0; break;
+				case 0x00A6: ch = 0xDB; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AB: ch = 0x97; break;
+				case 0x00AC: ch = 0xDC; break;
+				case 0x00AD: ch = 0xA1; break;
+				case 0x00B0: ch = 0x80; break;
+				case 0x00B1: ch = 0x93; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0x81; break;
+				case 0x00BB: ch = 0x98; break;
+				case 0x00BC: ch = 0x95; break;
+				case 0x00BD: ch = 0x94; break;
+				case 0x00D7: ch = 0xDE; break;
+				case 0x00F7: ch = 0xDD; break;
+				case 0x03B2: ch = 0x90; break;
+				case 0x03C6: ch = 0x92; break;
+				case 0x060C: ch = 0xAC; break;
+				case 0x061B: ch = 0xBB; break;
+				case 0x061F: ch = 0xBF; break;
+				case 0x0621:
+				case 0x0622:
+				case 0x0623:
+				case 0x0624:
+					ch -= 0x0560;
+					break;
+				case 0x0626:
+				case 0x0627:
+				case 0x0628:
+				case 0x0629:
+				case 0x062A:
+				case 0x062B:
+				case 0x062C:
+				case 0x062D:
+				case 0x062E:
+				case 0x062F:
+				case 0x0630:
+				case 0x0631:
+				case 0x0632:
+				case 0x0633:
+				case 0x0634:
+				case 0x0635:
+				case 0x0636:
+				case 0x0637:
+				case 0x0638:
+				case 0x0639:
+				case 0x063A:
+					ch -= 0x0560;
+					break;
+				case 0x0640:
+				case 0x0641:
+				case 0x0642:
+				case 0x0643:
+				case 0x0644:
+				case 0x0645:
+				case 0x0646:
+				case 0x0647:
+				case 0x0648:
+				case 0x0649:
+					ch -= 0x0560;
+					break;
+				case 0x064A: ch = 0xFD; break;
+				case 0x0651: ch = 0xF1; break;
+				case 0x0660:
+				case 0x0661:
+				case 0x0662:
+				case 0x0663:
+				case 0x0664:
+				case 0x0665:
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x05B0;
+					break;
+				case 0x066A: ch = 0x25; break;
+				case 0x066B: ch = 0x2C; break;
+				case 0x066C: ch = 0x2E; break;
+				case 0x066D: ch = 0x2A; break;
+				case 0x200B: ch = 0x9F; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0x82; break;
+				case 0x221A: ch = 0x83; break;
+				case 0x221E: ch = 0x91; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2248: ch = 0x96; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0x85; break;
+				case 0x2502: ch = 0x86; break;
+				case 0x250C: ch = 0x8D; break;
+				case 0x2510: ch = 0x8C; break;
+				case 0x2514: ch = 0x8E; break;
+				case 0x2518: ch = 0x8F; break;
+				case 0x251C: ch = 0x8A; break;
+				case 0x2524: ch = 0x88; break;
+				case 0x252C: ch = 0x89; break;
+				case 0x2534: ch = 0x8B; break;
+				case 0x253C: ch = 0x87; break;
+				case 0x2550: ch = 0x05; break;
+				case 0x2551: ch = 0x06; break;
+				case 0x2554: ch = 0x0D; break;
+				case 0x2557: ch = 0x0C; break;
+				case 0x255A: ch = 0x0E; break;
+				case 0x255D: ch = 0x0F; break;
+				case 0x2560: ch = 0x0A; break;
+				case 0x2563: ch = 0x08; break;
+				case 0x2566: ch = 0x09; break;
+				case 0x2569: ch = 0x0B; break;
+				case 0x256C: ch = 0x07; break;
+				case 0x2592: ch = 0x84; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263C: ch = 0x04; break;
+				case 0x266A: ch = 0x02; break;
+				case 0x266C: ch = 0x03; break;
+				case 0xFE7C: ch = 0xF1; break;
+				case 0xFE7D: ch = 0xF0; break;
+				case 0xFE80: ch = 0xC1; break;
+				case 0xFE81: ch = 0xC2; break;
+				case 0xFE82: ch = 0xA2; break;
+				case 0xFE83: ch = 0xC3; break;
+				case 0xFE84: ch = 0xA5; break;
+				case 0xFE85: ch = 0xC4; break;
+				case 0xFE86: ch = 0xC4; break;
+				case 0xFE8B: ch = 0xC6; break;
+				case 0xFE8C: ch = 0xC6; break;
+				case 0xFE8D: ch = 0xC7; break;
+				case 0xFE8E: ch = 0xA8; break;
+				case 0xFE8F: ch = 0xA9; break;
+				case 0xFE90: ch = 0xA9; break;
+				case 0xFE91: ch = 0xC8; break;
+				case 0xFE92: ch = 0xC8; break;
+				case 0xFE93: ch = 0xC9; break;
+				case 0xFE94: ch = 0xC9; break;
+				case 0xFE95: ch = 0xAA; break;
+				case 0xFE96: ch = 0xAA; break;
+				case 0xFE97: ch = 0xCA; break;
+				case 0xFE98: ch = 0xCA; break;
+				case 0xFE99: ch = 0xAB; break;
+				case 0xFE9A: ch = 0xAB; break;
+				case 0xFE9B: ch = 0xCB; break;
+				case 0xFE9C: ch = 0xCB; break;
+				case 0xFE9D: ch = 0xAD; break;
+				case 0xFE9E: ch = 0xAD; break;
+				case 0xFE9F: ch = 0xCC; break;
+				case 0xFEA0: ch = 0xCC; break;
+				case 0xFEA1: ch = 0xAE; break;
+				case 0xFEA2: ch = 0xAE; break;
+				case 0xFEA3: ch = 0xCD; break;
+				case 0xFEA4: ch = 0xCD; break;
+				case 0xFEA5: ch = 0xAF; break;
+				case 0xFEA6: ch = 0xAF; break;
+				case 0xFEA7: ch = 0xCE; break;
+				case 0xFEA8: ch = 0xCE; break;
+				case 0xFEA9: ch = 0xCF; break;
+				case 0xFEAA: ch = 0xCF; break;
+				case 0xFEAB: ch = 0xD0; break;
+				case 0xFEAC: ch = 0xD0; break;
+				case 0xFEAD: ch = 0xD1; break;
+				case 0xFEAE: ch = 0xD1; break;
+				case 0xFEAF: ch = 0xD2; break;
+				case 0xFEB0: ch = 0xD2; break;
+				case 0xFEB1: ch = 0xBC; break;
+				case 0xFEB2: ch = 0xBC; break;
+				case 0xFEB3: ch = 0xD3; break;
+				case 0xFEB4: ch = 0xD3; break;
+				case 0xFEB5: ch = 0xBD; break;
+				case 0xFEB6: ch = 0xBD; break;
+				case 0xFEB7: ch = 0xD4; break;
+				case 0xFEB8: ch = 0xD4; break;
+				case 0xFEB9: ch = 0xBE; break;
+				case 0xFEBA: ch = 0xBE; break;
+				case 0xFEBB: ch = 0xD5; break;
+				case 0xFEBC: ch = 0xD5; break;
+				case 0xFEBD: ch = 0xEB; break;
+				case 0xFEBE: ch = 0xEB; break;
+				case 0xFEBF: ch = 0xD6; break;
+				case 0xFEC0: ch = 0xD6; break;
+				case 0xFEC1: ch = 0xD7; break;
+				case 0xFEC2: ch = 0xD7; break;
+				case 0xFEC3: ch = 0xD7; break;
+				case 0xFEC4: ch = 0xD7; break;
+				case 0xFEC5: ch = 0xD8; break;
+				case 0xFEC6: ch = 0xD8; break;
+				case 0xFEC7: ch = 0xD8; break;
+				case 0xFEC8: ch = 0xD8; break;
+				case 0xFEC9: ch = 0xDF; break;
+				case 0xFECA: ch = 0xC5; break;
+				case 0xFECB: ch = 0xD9; break;
+				case 0xFECC: ch = 0xEC; break;
+				case 0xFECD: ch = 0xEE; break;
+				case 0xFECE: ch = 0xED; break;
+				case 0xFECF: ch = 0xDA; break;
+				case 0xFED0: ch = 0xF7; break;
+				case 0xFED1: ch = 0xBA; break;
+				case 0xFED2: ch = 0xBA; break;
+				case 0xFED3: ch = 0xE1; break;
+				case 0xFED4: ch = 0xE1; break;
+				case 0xFED5: ch = 0xF8; break;
+				case 0xFED6: ch = 0xF8; break;
+				case 0xFED7: ch = 0xE2; break;
+				case 0xFED8: ch = 0xE2; break;
+				case 0xFED9: ch = 0xFC; break;
+				case 0xFEDA: ch = 0xFC; break;
+				case 0xFEDB: ch = 0xE3; break;
+				case 0xFEDC: ch = 0xE3; break;
+				case 0xFEDD: ch = 0xFB; break;
+				case 0xFEDE: ch = 0xFB; break;
+				case 0xFEDF: ch = 0xE4; break;
+				case 0xFEE0: ch = 0xE4; break;
+				case 0xFEE1: ch = 0xEF; break;
+				case 0xFEE2: ch = 0xEF; break;
+				case 0xFEE3: ch = 0xE5; break;
+				case 0xFEE4: ch = 0xE5; break;
+				case 0xFEE5: ch = 0xF2; break;
+				case 0xFEE6: ch = 0xF2; break;
+				case 0xFEE7: ch = 0xE6; break;
+				case 0xFEE8: ch = 0xE6; break;
+				case 0xFEE9: ch = 0xF3; break;
+				case 0xFEEA: ch = 0xF3; break;
+				case 0xFEEB: ch = 0xE7; break;
+				case 0xFEEC: ch = 0xF4; break;
+				case 0xFEED: ch = 0xE8; break;
+				case 0xFEEE: ch = 0xE8; break;
+				case 0xFEEF: ch = 0xE9; break;
+				case 0xFEF0: ch = 0xF5; break;
+				case 0xFEF1: ch = 0xFD; break;
+				case 0xFEF2: ch = 0xF6; break;
+				case 0xFEF3: ch = 0xEA; break;
+				case 0xFEF4: ch = 0xEA; break;
+				case 0xFEF5: ch = 0xF9; break;
+				case 0xFEF6: ch = 0xFA; break;
+				case 0xFEF7: ch = 0x99; break;
+				case 0xFEF8: ch = 0x9A; break;
+				case 0xFEFB: ch = 0x9D; break;
+				case 0xFEFC: ch = 0x9E; break;
+				case 0xFFE8: ch = 0x86; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+				case 0x00A0:
+				case 0x00A3:
+				case 0x00A4:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A2: ch = 0xC0; break;
+				case 0x00A6: ch = 0xDB; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AB: ch = 0x97; break;
+				case 0x00AC: ch = 0xDC; break;
+				case 0x00AD: ch = 0xA1; break;
+				case 0x00B0: ch = 0x80; break;
+				case 0x00B1: ch = 0x93; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0x81; break;
+				case 0x00BB: ch = 0x98; break;
+				case 0x00BC: ch = 0x95; break;
+				case 0x00BD: ch = 0x94; break;
+				case 0x00D7: ch = 0xDE; break;
+				case 0x00F7: ch = 0xDD; break;
+				case 0x03B2: ch = 0x90; break;
+				case 0x03C6: ch = 0x92; break;
+				case 0x060C: ch = 0xAC; break;
+				case 0x061B: ch = 0xBB; break;
+				case 0x061F: ch = 0xBF; break;
+				case 0x0621:
+				case 0x0622:
+				case 0x0623:
+				case 0x0624:
+					ch -= 0x0560;
+					break;
+				case 0x0626:
+				case 0x0627:
+				case 0x0628:
+				case 0x0629:
+				case 0x062A:
+				case 0x062B:
+				case 0x062C:
+				case 0x062D:
+				case 0x062E:
+				case 0x062F:
+				case 0x0630:
+				case 0x0631:
+				case 0x0632:
+				case 0x0633:
+				case 0x0634:
+				case 0x0635:
+				case 0x0636:
+				case 0x0637:
+				case 0x0638:
+				case 0x0639:
+				case 0x063A:
+					ch -= 0x0560;
+					break;
+				case 0x0640:
+				case 0x0641:
+				case 0x0642:
+				case 0x0643:
+				case 0x0644:
+				case 0x0645:
+				case 0x0646:
+				case 0x0647:
+				case 0x0648:
+				case 0x0649:
+					ch -= 0x0560;
+					break;
+				case 0x064A: ch = 0xFD; break;
+				case 0x0651: ch = 0xF1; break;
+				case 0x0660:
+				case 0x0661:
+				case 0x0662:
+				case 0x0663:
+				case 0x0664:
+				case 0x0665:
+				case 0x0666:
+				case 0x0667:
+				case 0x0668:
+				case 0x0669:
+					ch -= 0x05B0;
+					break;
+				case 0x066A: ch = 0x25; break;
+				case 0x066B: ch = 0x2C; break;
+				case 0x066C: ch = 0x2E; break;
+				case 0x066D: ch = 0x2A; break;
+				case 0x200B: ch = 0x9F; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0x82; break;
+				case 0x221A: ch = 0x83; break;
+				case 0x221E: ch = 0x91; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2248: ch = 0x96; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0x85; break;
+				case 0x2502: ch = 0x86; break;
+				case 0x250C: ch = 0x8D; break;
+				case 0x2510: ch = 0x8C; break;
+				case 0x2514: ch = 0x8E; break;
+				case 0x2518: ch = 0x8F; break;
+				case 0x251C: ch = 0x8A; break;
+				case 0x2524: ch = 0x88; break;
+				case 0x252C: ch = 0x89; break;
+				case 0x2534: ch = 0x8B; break;
+				case 0x253C: ch = 0x87; break;
+				case 0x2550: ch = 0x05; break;
+				case 0x2551: ch = 0x06; break;
+				case 0x2554: ch = 0x0D; break;
+				case 0x2557: ch = 0x0C; break;
+				case 0x255A: ch = 0x0E; break;
+				case 0x255D: ch = 0x0F; break;
+				case 0x2560: ch = 0x0A; break;
+				case 0x2563: ch = 0x08; break;
+				case 0x2566: ch = 0x09; break;
+				case 0x2569: ch = 0x0B; break;
+				case 0x256C: ch = 0x07; break;
+				case 0x2592: ch = 0x84; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263C: ch = 0x04; break;
+				case 0x266A: ch = 0x02; break;
+				case 0x266C: ch = 0x03; break;
+				case 0xFE7C: ch = 0xF1; break;
+				case 0xFE7D: ch = 0xF0; break;
+				case 0xFE80: ch = 0xC1; break;
+				case 0xFE81: ch = 0xC2; break;
+				case 0xFE82: ch = 0xA2; break;
+				case 0xFE83: ch = 0xC3; break;
+				case 0xFE84: ch = 0xA5; break;
+				case 0xFE85: ch = 0xC4; break;
+				case 0xFE86: ch = 0xC4; break;
+				case 0xFE8B: ch = 0xC6; break;
+				case 0xFE8C: ch = 0xC6; break;
+				case 0xFE8D: ch = 0xC7; break;
+				case 0xFE8E: ch = 0xA8; break;
+				case 0xFE8F: ch = 0xA9; break;
+				case 0xFE90: ch = 0xA9; break;
+				case 0xFE91: ch = 0xC8; break;
+				case 0xFE92: ch = 0xC8; break;
+				case 0xFE93: ch = 0xC9; break;
+				case 0xFE94: ch = 0xC9; break;
+				case 0xFE95: ch = 0xAA; break;
+				case 0xFE96: ch = 0xAA; break;
+				case 0xFE97: ch = 0xCA; break;
+				case 0xFE98: ch = 0xCA; break;
+				case 0xFE99: ch = 0xAB; break;
+				case 0xFE9A: ch = 0xAB; break;
+				case 0xFE9B: ch = 0xCB; break;
+				case 0xFE9C: ch = 0xCB; break;
+				case 0xFE9D: ch = 0xAD; break;
+				case 0xFE9E: ch = 0xAD; break;
+				case 0xFE9F: ch = 0xCC; break;
+				case 0xFEA0: ch = 0xCC; break;
+				case 0xFEA1: ch = 0xAE; break;
+				case 0xFEA2: ch = 0xAE; break;
+				case 0xFEA3: ch = 0xCD; break;
+				case 0xFEA4: ch = 0xCD; break;
+				case 0xFEA5: ch = 0xAF; break;
+				case 0xFEA6: ch = 0xAF; break;
+				case 0xFEA7: ch = 0xCE; break;
+				case 0xFEA8: ch = 0xCE; break;
+				case 0xFEA9: ch = 0xCF; break;
+				case 0xFEAA: ch = 0xCF; break;
+				case 0xFEAB: ch = 0xD0; break;
+				case 0xFEAC: ch = 0xD0; break;
+				case 0xFEAD: ch = 0xD1; break;
+				case 0xFEAE: ch = 0xD1; break;
+				case 0xFEAF: ch = 0xD2; break;
+				case 0xFEB0: ch = 0xD2; break;
+				case 0xFEB1: ch = 0xBC; break;
+				case 0xFEB2: ch = 0xBC; break;
+				case 0xFEB3: ch = 0xD3; break;
+				case 0xFEB4: ch = 0xD3; break;
+				case 0xFEB5: ch = 0xBD; break;
+				case 0xFEB6: ch = 0xBD; break;
+				case 0xFEB7: ch = 0xD4; break;
+				case 0xFEB8: ch = 0xD4; break;
+				case 0xFEB9: ch = 0xBE; break;
+				case 0xFEBA: ch = 0xBE; break;
+				case 0xFEBB: ch = 0xD5; break;
+				case 0xFEBC: ch = 0xD5; break;
+				case 0xFEBD: ch = 0xEB; break;
+				case 0xFEBE: ch = 0xEB; break;
+				case 0xFEBF: ch = 0xD6; break;
+				case 0xFEC0: ch = 0xD6; break;
+				case 0xFEC1: ch = 0xD7; break;
+				case 0xFEC2: ch = 0xD7; break;
+				case 0xFEC3: ch = 0xD7; break;
+				case 0xFEC4: ch = 0xD7; break;
+				case 0xFEC5: ch = 0xD8; break;
+				case 0xFEC6: ch = 0xD8; break;
+				case 0xFEC7: ch = 0xD8; break;
+				case 0xFEC8: ch = 0xD8; break;
+				case 0xFEC9: ch = 0xDF; break;
+				case 0xFECA: ch = 0xC5; break;
+				case 0xFECB: ch = 0xD9; break;
+				case 0xFECC: ch = 0xEC; break;
+				case 0xFECD: ch = 0xEE; break;
+				case 0xFECE: ch = 0xED; break;
+				case 0xFECF: ch = 0xDA; break;
+				case 0xFED0: ch = 0xF7; break;
+				case 0xFED1: ch = 0xBA; break;
+				case 0xFED2: ch = 0xBA; break;
+				case 0xFED3: ch = 0xE1; break;
+				case 0xFED4: ch = 0xE1; break;
+				case 0xFED5: ch = 0xF8; break;
+				case 0xFED6: ch = 0xF8; break;
+				case 0xFED7: ch = 0xE2; break;
+				case 0xFED8: ch = 0xE2; break;
+				case 0xFED9: ch = 0xFC; break;
+				case 0xFEDA: ch = 0xFC; break;
+				case 0xFEDB: ch = 0xE3; break;
+				case 0xFEDC: ch = 0xE3; break;
+				case 0xFEDD: ch = 0xFB; break;
+				case 0xFEDE: ch = 0xFB; break;
+				case 0xFEDF: ch = 0xE4; break;
+				case 0xFEE0: ch = 0xE4; break;
+				case 0xFEE1: ch = 0xEF; break;
+				case 0xFEE2: ch = 0xEF; break;
+				case 0xFEE3: ch = 0xE5; break;
+				case 0xFEE4: ch = 0xE5; break;
+				case 0xFEE5: ch = 0xF2; break;
+				case 0xFEE6: ch = 0xF2; break;
+				case 0xFEE7: ch = 0xE6; break;
+				case 0xFEE8: ch = 0xE6; break;
+				case 0xFEE9: ch = 0xF3; break;
+				case 0xFEEA: ch = 0xF3; break;
+				case 0xFEEB: ch = 0xE7; break;
+				case 0xFEEC: ch = 0xF4; break;
+				case 0xFEED: ch = 0xE8; break;
+				case 0xFEEE: ch = 0xE8; break;
+				case 0xFEEF: ch = 0xE9; break;
+				case 0xFEF0: ch = 0xF5; break;
+				case 0xFEF1: ch = 0xFD; break;
+				case 0xFEF2: ch = 0xF6; break;
+				case 0xFEF3: ch = 0xEA; break;
+				case 0xFEF4: ch = 0xEA; break;
+				case 0xFEF5: ch = 0xF9; break;
+				case 0xFEF6: ch = 0xFA; break;
+				case 0xFEF7: ch = 0x99; break;
+				case 0xFEF8: ch = 0x9A; break;
+				case 0xFEFB: ch = 0x9D; break;
+				case 0xFEFC: ch = 0x9E; break;
+				case 0xFFE8: ch = 0x86; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP864
+
+public class ENCibm864 : CP864
+{
+	public ENCibm864() : base() {}
+
+}; // class ENCibm864
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP866.cs b/mcs/class/I18N/Rare/CP866.cs
new file mode 100644
index 00000000000..a379477bc23
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP866.cs
@@ -0,0 +1,689 @@
+/*
+ * CP866.cs - Russian (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-866.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP866 : ByteEncoding
+{
+	public CP866()
+		: base(866, ToChars, "Russian (DOS)",
+		       "ibm866", "ibm866", "ibm866",
+		       false, false, false, false, 1251)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u0410', '\u0411', '\u0412', '\u0413', 
+		'\u0414', '\u0415', '\u0416', '\u0417', '\u0418', '\u0419', 
+		'\u041A', '\u041B', '\u041C', '\u041D', '\u041E', '\u041F', 
+		'\u0420', '\u0421', '\u0422', '\u0423', '\u0424', '\u0425', 
+		'\u0426', '\u0427', '\u0428', '\u0429', '\u042A', '\u042B', 
+		'\u042C', '\u042D', '\u042E', '\u042F', '\u0430', '\u0431', 
+		'\u0432', '\u0433', '\u0434', '\u0435', '\u0436', '\u0437', 
+		'\u0438', '\u0439', '\u043A', '\u043B', '\u043C', '\u043D', 
+		'\u043E', '\u043F', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u2561', '\u2562', '\u2556', '\u2555', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u255C', '\u255B', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u255E', '\u255F', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564', 
+		'\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B', 
+		'\u256A', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C', 
+		'\u2590', '\u2580', '\u0440', '\u0441', '\u0442', '\u0443', 
+		'\u0444', '\u0445', '\u0446', '\u0447', '\u0448', '\u0449', 
+		'\u044A', '\u044B', '\u044C', '\u044D', '\u044E', '\u044F', 
+		'\u0401', '\u0451', '\u0404', '\u0454', '\u0407', '\u0457', 
+		'\u040E', '\u045E', '\u00B0', '\u2219', '\u00B7', '\u221A', 
+		'\u2116', '\u00A4', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A4: ch = 0xFD; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x0401: ch = 0xF0; break;
+				case 0x0404: ch = 0xF2; break;
+				case 0x0407: ch = 0xF4; break;
+				case 0x040E: ch = 0xF6; break;
+				case 0x0410:
+				case 0x0411:
+				case 0x0412:
+				case 0x0413:
+				case 0x0414:
+				case 0x0415:
+				case 0x0416:
+				case 0x0417:
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+				case 0x041D:
+				case 0x041E:
+				case 0x041F:
+				case 0x0420:
+				case 0x0421:
+				case 0x0422:
+				case 0x0423:
+				case 0x0424:
+				case 0x0425:
+				case 0x0426:
+				case 0x0427:
+				case 0x0428:
+				case 0x0429:
+				case 0x042A:
+				case 0x042B:
+				case 0x042C:
+				case 0x042D:
+				case 0x042E:
+				case 0x042F:
+				case 0x0430:
+				case 0x0431:
+				case 0x0432:
+				case 0x0433:
+				case 0x0434:
+				case 0x0435:
+				case 0x0436:
+				case 0x0437:
+				case 0x0438:
+				case 0x0439:
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+					ch -= 0x0390;
+					break;
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+				case 0x0444:
+				case 0x0445:
+				case 0x0446:
+				case 0x0447:
+				case 0x0448:
+				case 0x0449:
+				case 0x044A:
+				case 0x044B:
+				case 0x044C:
+				case 0x044D:
+				case 0x044E:
+				case 0x044F:
+					ch -= 0x0360;
+					break;
+				case 0x0451: ch = 0xF1; break;
+				case 0x0454: ch = 0xF3; break;
+				case 0x0457: ch = 0xF5; break;
+				case 0x045E: ch = 0xF7; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2116: ch = 0xFC; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A4: ch = 0xFD; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x0401: ch = 0xF0; break;
+				case 0x0404: ch = 0xF2; break;
+				case 0x0407: ch = 0xF4; break;
+				case 0x040E: ch = 0xF6; break;
+				case 0x0410:
+				case 0x0411:
+				case 0x0412:
+				case 0x0413:
+				case 0x0414:
+				case 0x0415:
+				case 0x0416:
+				case 0x0417:
+				case 0x0418:
+				case 0x0419:
+				case 0x041A:
+				case 0x041B:
+				case 0x041C:
+				case 0x041D:
+				case 0x041E:
+				case 0x041F:
+				case 0x0420:
+				case 0x0421:
+				case 0x0422:
+				case 0x0423:
+				case 0x0424:
+				case 0x0425:
+				case 0x0426:
+				case 0x0427:
+				case 0x0428:
+				case 0x0429:
+				case 0x042A:
+				case 0x042B:
+				case 0x042C:
+				case 0x042D:
+				case 0x042E:
+				case 0x042F:
+				case 0x0430:
+				case 0x0431:
+				case 0x0432:
+				case 0x0433:
+				case 0x0434:
+				case 0x0435:
+				case 0x0436:
+				case 0x0437:
+				case 0x0438:
+				case 0x0439:
+				case 0x043A:
+				case 0x043B:
+				case 0x043C:
+				case 0x043D:
+				case 0x043E:
+				case 0x043F:
+					ch -= 0x0390;
+					break;
+				case 0x0440:
+				case 0x0441:
+				case 0x0442:
+				case 0x0443:
+				case 0x0444:
+				case 0x0445:
+				case 0x0446:
+				case 0x0447:
+				case 0x0448:
+				case 0x0449:
+				case 0x044A:
+				case 0x044B:
+				case 0x044C:
+				case 0x044D:
+				case 0x044E:
+				case 0x044F:
+					ch -= 0x0360;
+					break;
+				case 0x0451: ch = 0xF1; break;
+				case 0x0454: ch = 0xF3; break;
+				case 0x0457: ch = 0xF5; break;
+				case 0x045E: ch = 0xF7; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2116: ch = 0xFC; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP866
+
+public class ENCibm866 : CP866
+{
+	public ENCibm866() : base() {}
+
+}; // class ENCibm866
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP869.cs b/mcs/class/I18N/Rare/CP869.cs
new file mode 100644
index 00000000000..443da7c1250
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP869.cs
@@ -0,0 +1,681 @@
+/*
+ * CP869.cs - Greek (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-869.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP869 : ByteEncoding
+{
+	public CP869()
+		: base(869, ToChars, "Greek (DOS)",
+		       "ibm869", "ibm869", "ibm869",
+		       false, false, false, false, 1253)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u003F', '\u003F', '\u003F', '\u003F', 
+		'\u003F', '\u003F', '\u0386', '\u003F', '\u0387', '\u00AC', 
+		'\u00A6', '\u2018', '\u2019', '\u0388', '\u2015', '\u0389', 
+		'\u038A', '\u03AA', '\u038C', '\u003F', '\u003F', '\u038E', 
+		'\u03AB', '\u00A9', '\u038F', '\u00B2', '\u00B3', '\u03AC', 
+		'\u00A3', '\u03AD', '\u03AE', '\u03AF', '\u03CA', '\u0390', 
+		'\u03CC', '\u03CD', '\u0391', '\u0392', '\u0393', '\u0394', 
+		'\u0395', '\u0396', '\u0397', '\u00BD', '\u0398', '\u0399', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u039A', '\u039B', '\u039C', '\u039D', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u039E', '\u039F', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u03A0', '\u03A1', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u03A3', '\u03A4', '\u03A5', 
+		'\u03A6', '\u03A7', '\u03A8', '\u03A9', '\u03B1', '\u03B2', 
+		'\u03B3', '\u2518', '\u250C', '\u2588', '\u2584', '\u03B4', 
+		'\u03B5', '\u2580', '\u03B6', '\u03B7', '\u03B8', '\u03B9', 
+		'\u03BA', '\u03BB', '\u03BC', '\u03BD', '\u03BE', '\u03BF', 
+		'\u03C0', '\u03C1', '\u03C3', '\u03C2', '\u03C4', '\u00B4', 
+		'\u00AD', '\u00B1', '\u03C5', '\u03C6', '\u03C7', '\u00A7', 
+		'\u03C8', '\u0385', '\u00B0', '\u00A8', '\u03C9', '\u03CB', 
+		'\u03B0', '\u03CE', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A6: ch = 0x8A; break;
+				case 0x00A7: ch = 0xF5; break;
+				case 0x00A8: ch = 0xF9; break;
+				case 0x00A9: ch = 0x97; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0x89; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0x99; break;
+				case 0x00B3: ch = 0x9A; break;
+				case 0x00B4: ch = 0xEF; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0x88; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x0385: ch = 0xF7; break;
+				case 0x0386: ch = 0x86; break;
+				case 0x0387: ch = 0x88; break;
+				case 0x0388: ch = 0x8D; break;
+				case 0x0389: ch = 0x8F; break;
+				case 0x038A: ch = 0x90; break;
+				case 0x038C: ch = 0x92; break;
+				case 0x038E: ch = 0x95; break;
+				case 0x038F: ch = 0x98; break;
+				case 0x0390: ch = 0xA1; break;
+				case 0x0391:
+				case 0x0392:
+				case 0x0393:
+				case 0x0394:
+				case 0x0395:
+				case 0x0396:
+				case 0x0397:
+					ch -= 0x02ED;
+					break;
+				case 0x0398: ch = 0xAC; break;
+				case 0x0399: ch = 0xAD; break;
+				case 0x039A:
+				case 0x039B:
+				case 0x039C:
+				case 0x039D:
+					ch -= 0x02E5;
+					break;
+				case 0x039E: ch = 0xBD; break;
+				case 0x039F: ch = 0xBE; break;
+				case 0x03A0: ch = 0xC6; break;
+				case 0x03A1: ch = 0xC7; break;
+				case 0x03A3:
+				case 0x03A4:
+				case 0x03A5:
+				case 0x03A6:
+				case 0x03A7:
+				case 0x03A8:
+				case 0x03A9:
+					ch -= 0x02D4;
+					break;
+				case 0x03AA: ch = 0x91; break;
+				case 0x03AB: ch = 0x96; break;
+				case 0x03AC: ch = 0x9B; break;
+				case 0x03AD: ch = 0x9D; break;
+				case 0x03AE: ch = 0x9E; break;
+				case 0x03AF: ch = 0x9F; break;
+				case 0x03B0: ch = 0xFC; break;
+				case 0x03B1: ch = 0xD6; break;
+				case 0x03B2: ch = 0xD7; break;
+				case 0x03B3: ch = 0xD8; break;
+				case 0x03B4: ch = 0xDD; break;
+				case 0x03B5: ch = 0xDE; break;
+				case 0x03B6:
+				case 0x03B7:
+				case 0x03B8:
+				case 0x03B9:
+				case 0x03BA:
+				case 0x03BB:
+				case 0x03BC:
+				case 0x03BD:
+				case 0x03BE:
+				case 0x03BF:
+				case 0x03C0:
+				case 0x03C1:
+					ch -= 0x02D6;
+					break;
+				case 0x03C2: ch = 0xED; break;
+				case 0x03C3: ch = 0xEC; break;
+				case 0x03C4: ch = 0xEE; break;
+				case 0x03C5: ch = 0xF2; break;
+				case 0x03C6: ch = 0xF3; break;
+				case 0x03C7: ch = 0xF4; break;
+				case 0x03C8: ch = 0xF6; break;
+				case 0x03C9: ch = 0xFA; break;
+				case 0x03CA: ch = 0xA0; break;
+				case 0x03CB: ch = 0xFB; break;
+				case 0x03CC: ch = 0xA2; break;
+				case 0x03CD: ch = 0xA3; break;
+				case 0x03CE: ch = 0xFD; break;
+				case 0x03D5: ch = 0xF3; break;
+				case 0x2015: ch = 0x8E; break;
+				case 0x2018: ch = 0x8B; break;
+				case 0x2019: ch = 0x8C; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A6: ch = 0x8A; break;
+				case 0x00A7: ch = 0xF5; break;
+				case 0x00A8: ch = 0xF9; break;
+				case 0x00A9: ch = 0x97; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0x89; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0x99; break;
+				case 0x00B3: ch = 0x9A; break;
+				case 0x00B4: ch = 0xEF; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0x88; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x0385: ch = 0xF7; break;
+				case 0x0386: ch = 0x86; break;
+				case 0x0387: ch = 0x88; break;
+				case 0x0388: ch = 0x8D; break;
+				case 0x0389: ch = 0x8F; break;
+				case 0x038A: ch = 0x90; break;
+				case 0x038C: ch = 0x92; break;
+				case 0x038E: ch = 0x95; break;
+				case 0x038F: ch = 0x98; break;
+				case 0x0390: ch = 0xA1; break;
+				case 0x0391:
+				case 0x0392:
+				case 0x0393:
+				case 0x0394:
+				case 0x0395:
+				case 0x0396:
+				case 0x0397:
+					ch -= 0x02ED;
+					break;
+				case 0x0398: ch = 0xAC; break;
+				case 0x0399: ch = 0xAD; break;
+				case 0x039A:
+				case 0x039B:
+				case 0x039C:
+				case 0x039D:
+					ch -= 0x02E5;
+					break;
+				case 0x039E: ch = 0xBD; break;
+				case 0x039F: ch = 0xBE; break;
+				case 0x03A0: ch = 0xC6; break;
+				case 0x03A1: ch = 0xC7; break;
+				case 0x03A3:
+				case 0x03A4:
+				case 0x03A5:
+				case 0x03A6:
+				case 0x03A7:
+				case 0x03A8:
+				case 0x03A9:
+					ch -= 0x02D4;
+					break;
+				case 0x03AA: ch = 0x91; break;
+				case 0x03AB: ch = 0x96; break;
+				case 0x03AC: ch = 0x9B; break;
+				case 0x03AD: ch = 0x9D; break;
+				case 0x03AE: ch = 0x9E; break;
+				case 0x03AF: ch = 0x9F; break;
+				case 0x03B0: ch = 0xFC; break;
+				case 0x03B1: ch = 0xD6; break;
+				case 0x03B2: ch = 0xD7; break;
+				case 0x03B3: ch = 0xD8; break;
+				case 0x03B4: ch = 0xDD; break;
+				case 0x03B5: ch = 0xDE; break;
+				case 0x03B6:
+				case 0x03B7:
+				case 0x03B8:
+				case 0x03B9:
+				case 0x03BA:
+				case 0x03BB:
+				case 0x03BC:
+				case 0x03BD:
+				case 0x03BE:
+				case 0x03BF:
+				case 0x03C0:
+				case 0x03C1:
+					ch -= 0x02D6;
+					break;
+				case 0x03C2: ch = 0xED; break;
+				case 0x03C3: ch = 0xEC; break;
+				case 0x03C4: ch = 0xEE; break;
+				case 0x03C5: ch = 0xF2; break;
+				case 0x03C6: ch = 0xF3; break;
+				case 0x03C7: ch = 0xF4; break;
+				case 0x03C8: ch = 0xF6; break;
+				case 0x03C9: ch = 0xFA; break;
+				case 0x03CA: ch = 0xA0; break;
+				case 0x03CB: ch = 0xFB; break;
+				case 0x03CC: ch = 0xA2; break;
+				case 0x03CD: ch = 0xA3; break;
+				case 0x03CE: ch = 0xFD; break;
+				case 0x03D5: ch = 0xF3; break;
+				case 0x2015: ch = 0x8E; break;
+				case 0x2018: ch = 0x8B; break;
+				case 0x2019: ch = 0x8C; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP869
+
+public class ENCibm869 : CP869
+{
+	public ENCibm869() : base() {}
+
+}; // class ENCibm869
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP870.cs b/mcs/class/I18N/Rare/CP870.cs
new file mode 100644
index 00000000000..2bd8a401db4
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP870.cs
@@ -0,0 +1,895 @@
+/*
+ * CP870.cs - IBM EBCDIC (Latin 2) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-870.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP870 : ByteEncoding
+{
+	public CP870()
+		: base(870, ToChars, "IBM EBCDIC (Latin 2)",
+		       "ibm870", "ibm870", "ibm870",
+		       false, false, false, false, 1250)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u00A0', 
+		'\u00E2', '\u00E4', '\u0163', '\u00E1', '\u0103', '\u010D', 
+		'\u00E7', '\u0107', '\u005B', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u00E9', '\u0119', '\u00EB', 
+		'\u016F', '\u00ED', '\u00EE', '\u013E', '\u013A', '\u00DF', 
+		'\u005D', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u00C2', '\u00C4', '\u02DD', '\u00C1', 
+		'\u0102', '\u010C', '\u00C7', '\u0106', '\u007C', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u02C7', '\u00C9', 
+		'\u0118', '\u00CB', '\u016E', '\u00CD', '\u00CE', '\u013D', 
+		'\u0139', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u02D8', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u015B', '\u0148', '\u0111', '\u00FD', '\u0159', '\u015F', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u0142', '\u0144', 
+		'\u0161', '\u00B8', '\u02DB', '\u00A4', '\u0105', '\u007E', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u015A', '\u0147', '\u0110', '\u00DD', 
+		'\u0158', '\u015E', '\u02D9', '\u0104', '\u017C', '\u0162', 
+		'\u017B', '\u00A7', '\u017E', '\u017A', '\u017D', '\u0179', 
+		'\u0141', '\u0143', '\u0160', '\u00A8', '\u00B4', '\u00D7', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u00F4', 
+		'\u00F6', '\u0155', '\u00F3', '\u0151', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u011A', '\u0171', '\u00FC', '\u0165', 
+		'\u00FA', '\u011B', '\u005C', '\u00F7', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u010F', '\u00D4', '\u00D6', '\u0154', '\u00D3', '\u0150', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u010E', '\u0170', 
+		'\u00DC', '\u0164', '\u00DA', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x6A; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x0102: ch = 0x66; break;
+				case 0x0103: ch = 0x46; break;
+				case 0x0104: ch = 0xB1; break;
+				case 0x0105: ch = 0xA0; break;
+				case 0x0106: ch = 0x69; break;
+				case 0x0107: ch = 0x49; break;
+				case 0x010C: ch = 0x67; break;
+				case 0x010D: ch = 0x47; break;
+				case 0x010E: ch = 0xFA; break;
+				case 0x010F: ch = 0xEA; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x0111: ch = 0x8C; break;
+				case 0x0118: ch = 0x72; break;
+				case 0x0119: ch = 0x52; break;
+				case 0x011A: ch = 0xDA; break;
+				case 0x011B: ch = 0xDF; break;
+				case 0x0139: ch = 0x78; break;
+				case 0x013A: ch = 0x58; break;
+				case 0x013D: ch = 0x77; break;
+				case 0x013E: ch = 0x57; break;
+				case 0x0141: ch = 0xBA; break;
+				case 0x0142: ch = 0x9A; break;
+				case 0x0143: ch = 0xBB; break;
+				case 0x0144: ch = 0x9B; break;
+				case 0x0147: ch = 0xAB; break;
+				case 0x0148: ch = 0x8B; break;
+				case 0x0150: ch = 0xEF; break;
+				case 0x0151: ch = 0xCF; break;
+				case 0x0154: ch = 0xED; break;
+				case 0x0155: ch = 0xCD; break;
+				case 0x0158: ch = 0xAE; break;
+				case 0x0159: ch = 0x8E; break;
+				case 0x015A: ch = 0xAA; break;
+				case 0x015B: ch = 0x8A; break;
+				case 0x015E: ch = 0xAF; break;
+				case 0x015F: ch = 0x8F; break;
+				case 0x0160: ch = 0xBC; break;
+				case 0x0161: ch = 0x9C; break;
+				case 0x0162: ch = 0xB3; break;
+				case 0x0163: ch = 0x44; break;
+				case 0x0164: ch = 0xFD; break;
+				case 0x0165: ch = 0xDD; break;
+				case 0x016E: ch = 0x74; break;
+				case 0x016F: ch = 0x54; break;
+				case 0x0170: ch = 0xFB; break;
+				case 0x0171: ch = 0xDB; break;
+				case 0x0179: ch = 0xB9; break;
+				case 0x017A: ch = 0xB7; break;
+				case 0x017B: ch = 0xB4; break;
+				case 0x017C: ch = 0xB2; break;
+				case 0x017D: ch = 0xB8; break;
+				case 0x017E: ch = 0xB6; break;
+				case 0x02C7: ch = 0x70; break;
+				case 0x02D8: ch = 0x80; break;
+				case 0x02D9: ch = 0xB0; break;
+				case 0x02DB: ch = 0x9E; break;
+				case 0x02DD: ch = 0x64; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x6A; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x6A; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x41; break;
+				case 0x00A4: ch = 0x9F; break;
+				case 0x00A7: ch = 0xB5; break;
+				case 0x00A8: ch = 0xBD; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B4: ch = 0xBE; break;
+				case 0x00B8: ch = 0x9D; break;
+				case 0x00C1: ch = 0x65; break;
+				case 0x00C2: ch = 0x62; break;
+				case 0x00C4: ch = 0x63; break;
+				case 0x00C7: ch = 0x68; break;
+				case 0x00C9: ch = 0x71; break;
+				case 0x00CB: ch = 0x73; break;
+				case 0x00CD: ch = 0x75; break;
+				case 0x00CE: ch = 0x76; break;
+				case 0x00D0: ch = 0xAC; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEB; break;
+				case 0x00D6: ch = 0xEC; break;
+				case 0x00D7: ch = 0xBF; break;
+				case 0x00DA: ch = 0xFE; break;
+				case 0x00DC: ch = 0xFC; break;
+				case 0x00DD: ch = 0xAD; break;
+				case 0x00DF: ch = 0x59; break;
+				case 0x00E1: ch = 0x45; break;
+				case 0x00E2: ch = 0x42; break;
+				case 0x00E4: ch = 0x43; break;
+				case 0x00E7: ch = 0x48; break;
+				case 0x00E9: ch = 0x51; break;
+				case 0x00EB: ch = 0x53; break;
+				case 0x00ED: ch = 0x55; break;
+				case 0x00EE: ch = 0x56; break;
+				case 0x00F3: ch = 0xCE; break;
+				case 0x00F4: ch = 0xCB; break;
+				case 0x00F6: ch = 0xCC; break;
+				case 0x00F7: ch = 0xE1; break;
+				case 0x00FA: ch = 0xDE; break;
+				case 0x00FC: ch = 0xDC; break;
+				case 0x00FD: ch = 0x8D; break;
+				case 0x0102: ch = 0x66; break;
+				case 0x0103: ch = 0x46; break;
+				case 0x0104: ch = 0xB1; break;
+				case 0x0105: ch = 0xA0; break;
+				case 0x0106: ch = 0x69; break;
+				case 0x0107: ch = 0x49; break;
+				case 0x010C: ch = 0x67; break;
+				case 0x010D: ch = 0x47; break;
+				case 0x010E: ch = 0xFA; break;
+				case 0x010F: ch = 0xEA; break;
+				case 0x0110: ch = 0xAC; break;
+				case 0x0111: ch = 0x8C; break;
+				case 0x0118: ch = 0x72; break;
+				case 0x0119: ch = 0x52; break;
+				case 0x011A: ch = 0xDA; break;
+				case 0x011B: ch = 0xDF; break;
+				case 0x0139: ch = 0x78; break;
+				case 0x013A: ch = 0x58; break;
+				case 0x013D: ch = 0x77; break;
+				case 0x013E: ch = 0x57; break;
+				case 0x0141: ch = 0xBA; break;
+				case 0x0142: ch = 0x9A; break;
+				case 0x0143: ch = 0xBB; break;
+				case 0x0144: ch = 0x9B; break;
+				case 0x0147: ch = 0xAB; break;
+				case 0x0148: ch = 0x8B; break;
+				case 0x0150: ch = 0xEF; break;
+				case 0x0151: ch = 0xCF; break;
+				case 0x0154: ch = 0xED; break;
+				case 0x0155: ch = 0xCD; break;
+				case 0x0158: ch = 0xAE; break;
+				case 0x0159: ch = 0x8E; break;
+				case 0x015A: ch = 0xAA; break;
+				case 0x015B: ch = 0x8A; break;
+				case 0x015E: ch = 0xAF; break;
+				case 0x015F: ch = 0x8F; break;
+				case 0x0160: ch = 0xBC; break;
+				case 0x0161: ch = 0x9C; break;
+				case 0x0162: ch = 0xB3; break;
+				case 0x0163: ch = 0x44; break;
+				case 0x0164: ch = 0xFD; break;
+				case 0x0165: ch = 0xDD; break;
+				case 0x016E: ch = 0x74; break;
+				case 0x016F: ch = 0x54; break;
+				case 0x0170: ch = 0xFB; break;
+				case 0x0171: ch = 0xDB; break;
+				case 0x0179: ch = 0xB9; break;
+				case 0x017A: ch = 0xB7; break;
+				case 0x017B: ch = 0xB4; break;
+				case 0x017C: ch = 0xB2; break;
+				case 0x017D: ch = 0xB8; break;
+				case 0x017E: ch = 0xB6; break;
+				case 0x02C7: ch = 0x70; break;
+				case 0x02D8: ch = 0x80; break;
+				case 0x02D9: ch = 0xB0; break;
+				case 0x02DB: ch = 0x9E; break;
+				case 0x02DD: ch = 0x64; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x6A; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP870
+
+public class ENCibm870 : CP870
+{
+	public ENCibm870() : base() {}
+
+}; // class ENCibm870
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/CP875.cs b/mcs/class/I18N/Rare/CP875.cs
new file mode 100644
index 00000000000..7b3d7b64045
--- /dev/null
+++ b/mcs/class/I18N/Rare/CP875.cs
@@ -0,0 +1,913 @@
+/*
+ * CP875.cs - IBM EBCDIC (Greek) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-875.ucm".
+
+namespace I18N.Rare
+{
+
+using System;
+using I18N.Common;
+
+public class CP875 : ByteEncoding
+{
+	public CP875()
+		: base(875, ToChars, "IBM EBCDIC (Greek)",
+		       "ibm875", "ibm875", "ibm875",
+		       false, false, false, false, 1253)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u009C', '\u0009', 
+		'\u0086', '\u007F', '\u0097', '\u008D', '\u008E', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u009D', '\u0085', '\u0008', '\u0087', 
+		'\u0018', '\u0019', '\u0092', '\u008F', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u000A', '\u0017', '\u001B', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u0005', '\u0006', '\u0007', 
+		'\u0090', '\u0091', '\u0016', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0004', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u0014', '\u0015', '\u009E', '\u001A', '\u0020', '\u0391', 
+		'\u0392', '\u0393', '\u0394', '\u0395', '\u0396', '\u0397', 
+		'\u0398', '\u0399', '\u005B', '\u002E', '\u003C', '\u0028', 
+		'\u002B', '\u0021', '\u0026', '\u039A', '\u039B', '\u039C', 
+		'\u039D', '\u039E', '\u039F', '\u03A0', '\u03A1', '\u03A3', 
+		'\u005D', '\u0024', '\u002A', '\u0029', '\u003B', '\u005E', 
+		'\u002D', '\u002F', '\u03A4', '\u03A5', '\u03A6', '\u03A7', 
+		'\u03A8', '\u03A9', '\u03AA', '\u03AB', '\u007C', '\u002C', 
+		'\u0025', '\u005F', '\u003E', '\u003F', '\u00A8', '\u0386', 
+		'\u0388', '\u0389', '\u00A0', '\u038A', '\u038C', '\u038E', 
+		'\u038F', '\u0060', '\u003A', '\u0023', '\u0040', '\u0027', 
+		'\u003D', '\u0022', '\u0385', '\u0061', '\u0062', '\u0063', 
+		'\u0064', '\u0065', '\u0066', '\u0067', '\u0068', '\u0069', 
+		'\u03B1', '\u03B2', '\u03B3', '\u03B4', '\u03B5', '\u03B6', 
+		'\u00B0', '\u006A', '\u006B', '\u006C', '\u006D', '\u006E', 
+		'\u006F', '\u0070', '\u0071', '\u0072', '\u03B7', '\u03B8', 
+		'\u03B9', '\u03BA', '\u03BB', '\u03BC', '\u00B4', '\u007E', 
+		'\u0073', '\u0074', '\u0075', '\u0076', '\u0077', '\u0078', 
+		'\u0079', '\u007A', '\u03BD', '\u03BE', '\u03BF', '\u03C0', 
+		'\u03C1', '\u03C3', '\u00A3', '\u03AC', '\u03AD', '\u03AE', 
+		'\u03CA', '\u03AF', '\u03CC', '\u03CD', '\u03CB', '\u03CE', 
+		'\u03C2', '\u03C4', '\u03C5', '\u03C6', '\u03C7', '\u03C8', 
+		'\u007B', '\u0041', '\u0042', '\u0043', '\u0044', '\u0045', 
+		'\u0046', '\u0047', '\u0048', '\u0049', '\u00AD', '\u03C9', 
+		'\u0390', '\u03B0', '\u2018', '\u2015', '\u007D', '\u004A', 
+		'\u004B', '\u004C', '\u004D', '\u004E', '\u004F', '\u0050', 
+		'\u0051', '\u0052', '\u00B1', '\u00BD', '\u003F', '\u0387', 
+		'\u2019', '\u00A6', '\u005C', '\u003F', '\u0053', '\u0054', 
+		'\u0055', '\u0056', '\u0057', '\u0058', '\u0059', '\u005A', 
+		'\u00B2', '\u00A7', '\u003F', '\u003F', '\u00AB', '\u00AC', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u00B3', '\u00A9', 
+		'\u003F', '\u003F', '\u00BB', '\u009F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x6A; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x74; break;
+				case 0x00A3: ch = 0xB0; break;
+				case 0x00A6: ch = 0xDF; break;
+				case 0x00A7: ch = 0xEB; break;
+				case 0x00A8: ch = 0x70; break;
+				case 0x00A9: ch = 0xFB; break;
+				case 0x00AB: ch = 0xEE; break;
+				case 0x00AC: ch = 0xEF; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0xDA; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xA0; break;
+				case 0x00B7: ch = 0xDD; break;
+				case 0x00BB: ch = 0xFE; break;
+				case 0x00BD: ch = 0xDB; break;
+				case 0x0385: ch = 0x80; break;
+				case 0x0386: ch = 0x71; break;
+				case 0x0387: ch = 0xDD; break;
+				case 0x0388: ch = 0x72; break;
+				case 0x0389: ch = 0x73; break;
+				case 0x038A: ch = 0x75; break;
+				case 0x038C: ch = 0x76; break;
+				case 0x038E: ch = 0x77; break;
+				case 0x038F: ch = 0x78; break;
+				case 0x0390: ch = 0xCC; break;
+				case 0x0391:
+				case 0x0392:
+				case 0x0393:
+				case 0x0394:
+				case 0x0395:
+				case 0x0396:
+				case 0x0397:
+				case 0x0398:
+				case 0x0399:
+					ch -= 0x0350;
+					break;
+				case 0x039A:
+				case 0x039B:
+				case 0x039C:
+				case 0x039D:
+				case 0x039E:
+				case 0x039F:
+				case 0x03A0:
+				case 0x03A1:
+					ch -= 0x0349;
+					break;
+				case 0x03A3: ch = 0x59; break;
+				case 0x03A4:
+				case 0x03A5:
+				case 0x03A6:
+				case 0x03A7:
+				case 0x03A8:
+				case 0x03A9:
+				case 0x03AA:
+				case 0x03AB:
+					ch -= 0x0342;
+					break;
+				case 0x03AC: ch = 0xB1; break;
+				case 0x03AD: ch = 0xB2; break;
+				case 0x03AE: ch = 0xB3; break;
+				case 0x03AF: ch = 0xB5; break;
+				case 0x03B0: ch = 0xCD; break;
+				case 0x03B1:
+				case 0x03B2:
+				case 0x03B3:
+				case 0x03B4:
+				case 0x03B5:
+				case 0x03B6:
+					ch -= 0x0327;
+					break;
+				case 0x03B7:
+				case 0x03B8:
+				case 0x03B9:
+				case 0x03BA:
+				case 0x03BB:
+				case 0x03BC:
+					ch -= 0x031D;
+					break;
+				case 0x03BD:
+				case 0x03BE:
+				case 0x03BF:
+				case 0x03C0:
+				case 0x03C1:
+					ch -= 0x0313;
+					break;
+				case 0x03C2: ch = 0xBA; break;
+				case 0x03C3: ch = 0xAF; break;
+				case 0x03C4:
+				case 0x03C5:
+				case 0x03C6:
+				case 0x03C7:
+				case 0x03C8:
+					ch -= 0x0309;
+					break;
+				case 0x03C9: ch = 0xCB; break;
+				case 0x03CA: ch = 0xB4; break;
+				case 0x03CB: ch = 0xB8; break;
+				case 0x03CC: ch = 0xB6; break;
+				case 0x03CD: ch = 0xB7; break;
+				case 0x03CE: ch = 0xB9; break;
+				case 0x03D5: ch = 0xBD; break;
+				case 0x2015: ch = 0xCF; break;
+				case 0x2018: ch = 0xCE; break;
+				case 0x2019: ch = 0xDE; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x6A; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 4) switch(ch)
+			{
+				case 0x000B:
+				case 0x000C:
+				case 0x000D:
+				case 0x000E:
+				case 0x000F:
+				case 0x0010:
+				case 0x0011:
+				case 0x0012:
+				case 0x0013:
+				case 0x0018:
+				case 0x0019:
+				case 0x001C:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+					break;
+				case 0x0004: ch = 0x37; break;
+				case 0x0005: ch = 0x2D; break;
+				case 0x0006: ch = 0x2E; break;
+				case 0x0007: ch = 0x2F; break;
+				case 0x0008: ch = 0x16; break;
+				case 0x0009: ch = 0x05; break;
+				case 0x000A: ch = 0x25; break;
+				case 0x0014: ch = 0x3C; break;
+				case 0x0015: ch = 0x3D; break;
+				case 0x0016: ch = 0x32; break;
+				case 0x0017: ch = 0x26; break;
+				case 0x001A: ch = 0x3F; break;
+				case 0x001B: ch = 0x27; break;
+				case 0x0020: ch = 0x40; break;
+				case 0x0021: ch = 0x4F; break;
+				case 0x0022: ch = 0x7F; break;
+				case 0x0023: ch = 0x7B; break;
+				case 0x0024: ch = 0x5B; break;
+				case 0x0025: ch = 0x6C; break;
+				case 0x0026: ch = 0x50; break;
+				case 0x0027: ch = 0x7D; break;
+				case 0x0028: ch = 0x4D; break;
+				case 0x0029: ch = 0x5D; break;
+				case 0x002A: ch = 0x5C; break;
+				case 0x002B: ch = 0x4E; break;
+				case 0x002C: ch = 0x6B; break;
+				case 0x002D: ch = 0x60; break;
+				case 0x002E: ch = 0x4B; break;
+				case 0x002F: ch = 0x61; break;
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+					ch += 0x00C0;
+					break;
+				case 0x003A: ch = 0x7A; break;
+				case 0x003B: ch = 0x5E; break;
+				case 0x003C: ch = 0x4C; break;
+				case 0x003D: ch = 0x7E; break;
+				case 0x003E: ch = 0x6E; break;
+				case 0x003F: ch = 0x6F; break;
+				case 0x0040: ch = 0x7C; break;
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+					ch += 0x0080;
+					break;
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+					ch += 0x0087;
+					break;
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+					ch += 0x008F;
+					break;
+				case 0x005B: ch = 0x4A; break;
+				case 0x005C: ch = 0xE0; break;
+				case 0x005D: ch = 0x5A; break;
+				case 0x005E: ch = 0x5F; break;
+				case 0x005F: ch = 0x6D; break;
+				case 0x0060: ch = 0x79; break;
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+					ch += 0x0020;
+					break;
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+					ch += 0x0027;
+					break;
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+					ch += 0x002F;
+					break;
+				case 0x007B: ch = 0xC0; break;
+				case 0x007C: ch = 0x6A; break;
+				case 0x007D: ch = 0xD0; break;
+				case 0x007E: ch = 0xA1; break;
+				case 0x007F: ch = 0x07; break;
+				case 0x0080:
+				case 0x0081:
+				case 0x0082:
+				case 0x0083:
+				case 0x0084:
+					ch -= 0x0060;
+					break;
+				case 0x0085: ch = 0x15; break;
+				case 0x0086: ch = 0x06; break;
+				case 0x0087: ch = 0x17; break;
+				case 0x0088:
+				case 0x0089:
+				case 0x008A:
+				case 0x008B:
+				case 0x008C:
+					ch -= 0x0060;
+					break;
+				case 0x008D: ch = 0x09; break;
+				case 0x008E: ch = 0x0A; break;
+				case 0x008F: ch = 0x1B; break;
+				case 0x0090: ch = 0x30; break;
+				case 0x0091: ch = 0x31; break;
+				case 0x0092: ch = 0x1A; break;
+				case 0x0093:
+				case 0x0094:
+				case 0x0095:
+				case 0x0096:
+					ch -= 0x0060;
+					break;
+				case 0x0097: ch = 0x08; break;
+				case 0x0098:
+				case 0x0099:
+				case 0x009A:
+				case 0x009B:
+					ch -= 0x0060;
+					break;
+				case 0x009C: ch = 0x04; break;
+				case 0x009D: ch = 0x14; break;
+				case 0x009E: ch = 0x3E; break;
+				case 0x009F: ch = 0xFF; break;
+				case 0x00A0: ch = 0x74; break;
+				case 0x00A3: ch = 0xB0; break;
+				case 0x00A6: ch = 0xDF; break;
+				case 0x00A7: ch = 0xEB; break;
+				case 0x00A8: ch = 0x70; break;
+				case 0x00A9: ch = 0xFB; break;
+				case 0x00AB: ch = 0xEE; break;
+				case 0x00AC: ch = 0xEF; break;
+				case 0x00AD: ch = 0xCA; break;
+				case 0x00B0: ch = 0x90; break;
+				case 0x00B1: ch = 0xDA; break;
+				case 0x00B2: ch = 0xEA; break;
+				case 0x00B3: ch = 0xFA; break;
+				case 0x00B4: ch = 0xA0; break;
+				case 0x00B7: ch = 0xDD; break;
+				case 0x00BB: ch = 0xFE; break;
+				case 0x00BD: ch = 0xDB; break;
+				case 0x0385: ch = 0x80; break;
+				case 0x0386: ch = 0x71; break;
+				case 0x0387: ch = 0xDD; break;
+				case 0x0388: ch = 0x72; break;
+				case 0x0389: ch = 0x73; break;
+				case 0x038A: ch = 0x75; break;
+				case 0x038C: ch = 0x76; break;
+				case 0x038E: ch = 0x77; break;
+				case 0x038F: ch = 0x78; break;
+				case 0x0390: ch = 0xCC; break;
+				case 0x0391:
+				case 0x0392:
+				case 0x0393:
+				case 0x0394:
+				case 0x0395:
+				case 0x0396:
+				case 0x0397:
+				case 0x0398:
+				case 0x0399:
+					ch -= 0x0350;
+					break;
+				case 0x039A:
+				case 0x039B:
+				case 0x039C:
+				case 0x039D:
+				case 0x039E:
+				case 0x039F:
+				case 0x03A0:
+				case 0x03A1:
+					ch -= 0x0349;
+					break;
+				case 0x03A3: ch = 0x59; break;
+				case 0x03A4:
+				case 0x03A5:
+				case 0x03A6:
+				case 0x03A7:
+				case 0x03A8:
+				case 0x03A9:
+				case 0x03AA:
+				case 0x03AB:
+					ch -= 0x0342;
+					break;
+				case 0x03AC: ch = 0xB1; break;
+				case 0x03AD: ch = 0xB2; break;
+				case 0x03AE: ch = 0xB3; break;
+				case 0x03AF: ch = 0xB5; break;
+				case 0x03B0: ch = 0xCD; break;
+				case 0x03B1:
+				case 0x03B2:
+				case 0x03B3:
+				case 0x03B4:
+				case 0x03B5:
+				case 0x03B6:
+					ch -= 0x0327;
+					break;
+				case 0x03B7:
+				case 0x03B8:
+				case 0x03B9:
+				case 0x03BA:
+				case 0x03BB:
+				case 0x03BC:
+					ch -= 0x031D;
+					break;
+				case 0x03BD:
+				case 0x03BE:
+				case 0x03BF:
+				case 0x03C0:
+				case 0x03C1:
+					ch -= 0x0313;
+					break;
+				case 0x03C2: ch = 0xBA; break;
+				case 0x03C3: ch = 0xAF; break;
+				case 0x03C4:
+				case 0x03C5:
+				case 0x03C6:
+				case 0x03C7:
+				case 0x03C8:
+					ch -= 0x0309;
+					break;
+				case 0x03C9: ch = 0xCB; break;
+				case 0x03CA: ch = 0xB4; break;
+				case 0x03CB: ch = 0xB8; break;
+				case 0x03CC: ch = 0xB6; break;
+				case 0x03CD: ch = 0xB7; break;
+				case 0x03CE: ch = 0xB9; break;
+				case 0x03D5: ch = 0xBD; break;
+				case 0x2015: ch = 0xCF; break;
+				case 0x2018: ch = 0xCE; break;
+				case 0x2019: ch = 0xDE; break;
+				case 0xFF01: ch = 0x4F; break;
+				case 0xFF02: ch = 0x7F; break;
+				case 0xFF03: ch = 0x7B; break;
+				case 0xFF04: ch = 0x5B; break;
+				case 0xFF05: ch = 0x6C; break;
+				case 0xFF06: ch = 0x50; break;
+				case 0xFF07: ch = 0x7D; break;
+				case 0xFF08: ch = 0x4D; break;
+				case 0xFF09: ch = 0x5D; break;
+				case 0xFF0A: ch = 0x5C; break;
+				case 0xFF0B: ch = 0x4E; break;
+				case 0xFF0C: ch = 0x6B; break;
+				case 0xFF0D: ch = 0x60; break;
+				case 0xFF0E: ch = 0x4B; break;
+				case 0xFF0F: ch = 0x61; break;
+				case 0xFF10:
+				case 0xFF11:
+				case 0xFF12:
+				case 0xFF13:
+				case 0xFF14:
+				case 0xFF15:
+				case 0xFF16:
+				case 0xFF17:
+				case 0xFF18:
+				case 0xFF19:
+					ch -= 0xFE20;
+					break;
+				case 0xFF1A: ch = 0x7A; break;
+				case 0xFF1B: ch = 0x5E; break;
+				case 0xFF1C: ch = 0x4C; break;
+				case 0xFF1D: ch = 0x7E; break;
+				case 0xFF1E: ch = 0x6E; break;
+				case 0xFF1F: ch = 0x6F; break;
+				case 0xFF20: ch = 0x7C; break;
+				case 0xFF21:
+				case 0xFF22:
+				case 0xFF23:
+				case 0xFF24:
+				case 0xFF25:
+				case 0xFF26:
+				case 0xFF27:
+				case 0xFF28:
+				case 0xFF29:
+					ch -= 0xFE60;
+					break;
+				case 0xFF2A:
+				case 0xFF2B:
+				case 0xFF2C:
+				case 0xFF2D:
+				case 0xFF2E:
+				case 0xFF2F:
+				case 0xFF30:
+				case 0xFF31:
+				case 0xFF32:
+					ch -= 0xFE59;
+					break;
+				case 0xFF33:
+				case 0xFF34:
+				case 0xFF35:
+				case 0xFF36:
+				case 0xFF37:
+				case 0xFF38:
+				case 0xFF39:
+				case 0xFF3A:
+					ch -= 0xFE51;
+					break;
+				case 0xFF3B: ch = 0x4A; break;
+				case 0xFF3C: ch = 0xE0; break;
+				case 0xFF3D: ch = 0x5A; break;
+				case 0xFF3E: ch = 0x5F; break;
+				case 0xFF3F: ch = 0x6D; break;
+				case 0xFF40: ch = 0x79; break;
+				case 0xFF41:
+				case 0xFF42:
+				case 0xFF43:
+				case 0xFF44:
+				case 0xFF45:
+				case 0xFF46:
+				case 0xFF47:
+				case 0xFF48:
+				case 0xFF49:
+					ch -= 0xFEC0;
+					break;
+				case 0xFF4A:
+				case 0xFF4B:
+				case 0xFF4C:
+				case 0xFF4D:
+				case 0xFF4E:
+				case 0xFF4F:
+				case 0xFF50:
+				case 0xFF51:
+				case 0xFF52:
+					ch -= 0xFEB9;
+					break;
+				case 0xFF53:
+				case 0xFF54:
+				case 0xFF55:
+				case 0xFF56:
+				case 0xFF57:
+				case 0xFF58:
+				case 0xFF59:
+				case 0xFF5A:
+					ch -= 0xFEB1;
+					break;
+				case 0xFF5B: ch = 0xC0; break;
+				case 0xFF5C: ch = 0x6A; break;
+				case 0xFF5D: ch = 0xD0; break;
+				case 0xFF5E: ch = 0xA1; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP875
+
+public class ENCibm875 : CP875
+{
+	public ENCibm875() : base() {}
+
+}; // class ENCibm875
+
+}; // namespace I18N.Rare
diff --git a/mcs/class/I18N/Rare/ibm-1025.ucm b/mcs/class/I18N/Rare/ibm-1025.ucm
new file mode 100644
index 00000000000..8119517f647
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1025.ucm
@@ -0,0 +1,371 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2001, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created by rptp2ucm (compiled on Feb 23 2001)
+# from source files 34B00401.RPMAP100 and 040134B0.TPMAP100
+#
+<code_set_name>               "ibm-1025_P100-2000"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+<icu:charsetFamily>           "EBCDIC"
+<icu:alias>                   "ibm-1025_STD"
+
+CHARMAP
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x4A |0
+<U005C> \xE0 |0
+<U005D> \x5A |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x6A |0
+<U007D> \xD0 |0
+<U007E> \xA1 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A7> \xE1 |0
+<U00AD> \x73 |0
+<U0401> \x63 |0
+<U0402> \x59 |0
+<U0403> \x62 |0
+<U0404> \x64 |0
+<U0405> \x65 |0
+<U0406> \x66 |0
+<U0407> \x67 |0
+<U0408> \x68 |0
+<U0409> \x69 |0
+<U040A> \x70 |0
+<U040B> \x71 |0
+<U040C> \x72 |0
+<U040E> \x74 |0
+<U040F> \x75 |0
+<U0410> \xB9 |0
+<U0411> \xBA |0
+<U0412> \xED |0
+<U0413> \xBF |0
+<U0414> \xBC |0
+<U0415> \xBD |0
+<U0416> \xEC |0
+<U0417> \xFA |0
+<U0418> \xCB |0
+<U0419> \xCC |0
+<U041A> \xCD |0
+<U041B> \xCE |0
+<U041C> \xCF |0
+<U041D> \xDA |0
+<U041E> \xDB |0
+<U041F> \xDC |0
+<U0420> \xDE |0
+<U0421> \xDF |0
+<U0422> \xEA |0
+<U0423> \xEB |0
+<U0424> \xBE |0
+<U0425> \xCA |0
+<U0426> \xBB |0
+<U0427> \xFE |0
+<U0428> \xFB |0
+<U0429> \xFD |0
+<U042A> \x57 |0
+<U042B> \xEF |0
+<U042C> \xEE |0
+<U042D> \xFC |0
+<U042E> \xB8 |0
+<U042F> \xDD |0
+<U0430> \x77 |0
+<U0431> \x78 |0
+<U0432> \xAF |0
+<U0433> \x8D |0
+<U0434> \x8A |0
+<U0435> \x8B |0
+<U0436> \xAE |0
+<U0437> \xB2 |0
+<U0438> \x8F |0
+<U0439> \x90 |0
+<U043A> \x9A |0
+<U043B> \x9B |0
+<U043C> \x9C |0
+<U043D> \x9D |0
+<U043E> \x9E |0
+<U043F> \x9F |0
+<U0440> \xAA |0
+<U0441> \xAB |0
+<U0442> \xAC |0
+<U0443> \xAD |0
+<U0444> \x8C |0
+<U0445> \x8E |0
+<U0446> \x80 |0
+<U0447> \xB6 |0
+<U0448> \xB3 |0
+<U0449> \xB5 |0
+<U044A> \xB7 |0
+<U044B> \xB1 |0
+<U044C> \xB0 |0
+<U044D> \xB4 |0
+<U044E> \x76 |0
+<U044F> \xA0 |0
+<U0451> \x44 |0
+<U0452> \x42 |0
+<U0453> \x43 |0
+<U0454> \x45 |0
+<U0455> \x46 |0
+<U0456> \x47 |0
+<U0457> \x48 |0
+<U0458> \x49 |0
+<U0459> \x51 |0
+<U045A> \x52 |0
+<U045B> \x53 |0
+<U045C> \x54 |0
+<U045E> \x55 |0
+<U045F> \x56 |0
+<U2116> \x58 |0
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x4A |1
+<UFF3C> \xE0 |1
+<UFF3D> \x5A |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x6A |1
+<UFF5D> \xD0 |1
+<UFF5E> \xA1 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1026.ucm b/mcs/class/I18N/Rare/ibm-1026.ucm
new file mode 100644
index 00000000000..d496f0b09c7
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1026.ucm
@@ -0,0 +1,372 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2001, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created by rptp2ucm (compiled on Feb 23 2001)
+# from source files 34B00402.RPMAP100 and 040234B0.TPMAP100
+#
+<code_set_name>               "ibm-1026_P100-2000"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+<icu:charsetFamily>           "EBCDIC"
+<icu:alias>                   "ibm-1026_STD"
+
+CHARMAP
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \xFC |0
+<U0023> \xEC |0
+<U0024> \xAD |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \xAE |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x68 |0
+<U005C> \xDC |0
+<U005D> \xAC |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x8D |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x48 |0
+<U007C> \xBB |0
+<U007D> \x8C |0
+<U007E> \xCC |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \x8E |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x4A |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \x7B |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \x7F |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \xC0 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xA1 |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xE0 |0
+<U00FF> \xDF |0
+<U011E> \x5A |0
+<U011F> \xD0 |0
+<U0130> \x5B |0
+<U0131> \x79 |0
+<U015E> \x7C |0
+<U015F> \x6A |0
+<U203E> \xBC |1
+<UFF01> \x4F |1
+<UFF02> \xFC |1
+<UFF03> \xEC |1
+<UFF04> \xAD |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \xAE |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x68 |1
+<UFF3C> \xDC |1
+<UFF3D> \xAC |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x8D |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x48 |1
+<UFF5C> \xBB |1
+<UFF5D> \x8C |1
+<UFF5E> \xCC |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1047.ucm b/mcs/class/I18N/Rare/ibm-1047.ucm
new file mode 100644
index 00000000000..6a71dff1f8d
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1047.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:47 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00417.RPMAP100 and 041734B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1047"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1047
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x5A |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \xAD |0
+<U005C> \xE0 |0
+<U005D> \xBD |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x4F |0
+<U007D> \xD0 |0
+<U007E> \xA1 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \x4A |0
+<U00A3> \xB1 |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \x6A |0
+<U00A7> \xB5 |0
+<U00A8> \xBB |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xB0 |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xBA |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U203E> \xBC |1
+<UFF01> \x5A |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \xAD |1
+<UFF3C> \xE0 |1
+<UFF3D> \xBD |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x4F |1
+<UFF5D> \xD0 |1
+<UFF5E> \xA1 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1089.ucm b/mcs/class/I18N/Rare/ibm-1089.ucm
new file mode 100644
index 00000000000..3356cdfa543
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1089.ucm
@@ -0,0 +1,477 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:47 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00441.RPMAP100 and 044134B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1089"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1089
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A4> \xA4 |0
+<U00AD> \xAD |0
+<U060C> \xAC |0
+<U061B> \xBB |0
+<U061F> \xBF |0
+<U0621> \xC1 |0
+<U0622> \xC2 |0
+<U0623> \xC3 |0
+<U0624> \xC4 |0
+<U0625> \xC5 |0
+<U0626> \xC6 |0
+<U0627> \xC7 |0
+<U0628> \xC8 |0
+<U0629> \xC9 |0
+<U062A> \xCA |0
+<U062B> \xCB |0
+<U062C> \xCC |0
+<U062D> \xCD |0
+<U062E> \xCE |0
+<U062F> \xCF |0
+<U0630> \xD0 |0
+<U0631> \xD1 |0
+<U0632> \xD2 |0
+<U0633> \xD3 |0
+<U0634> \xD4 |0
+<U0635> \xD5 |0
+<U0636> \xD6 |0
+<U0637> \xD7 |0
+<U0638> \xD8 |0
+<U0639> \xD9 |0
+<U063A> \xDA |0
+<U0640> \xE0 |0
+<U0641> \xE1 |0
+<U0642> \xE2 |0
+<U0643> \xE3 |0
+<U0644> \xE4 |0
+<U0645> \xE5 |0
+<U0646> \xE6 |0
+<U0647> \xE7 |0
+<U0648> \xE8 |0
+<U0649> \xE9 |0
+<U064A> \xEA |0
+<U064B> \xEB |0
+<U064C> \xEC |0
+<U064D> \xED |0
+<U064E> \xEE |0
+<U064F> \xEF |0
+<U0650> \xF0 |0
+<U0651> \xF1 |0
+<U0652> \xF2 |0
+<U0660> \x30 |1
+<U0661> \x31 |1
+<U0662> \x32 |1
+<U0663> \x33 |1
+<U0664> \x34 |1
+<U0665> \x35 |1
+<U0666> \x36 |1
+<U0667> \x37 |1
+<U0668> \x38 |1
+<U0669> \x39 |1
+<U066A> \x25 |1
+<U066B> \x2C |1
+<U066C> \x2E |1
+<U066D> \x2A |1
+<UFE70> \xEB |1
+<UFE71> \xEB |1
+<UFE72> \xEC |1
+<UFE74> \xED |1
+<UFE76> \xEE |1
+<UFE77> \xEE |1
+<UFE78> \xEF |1
+<UFE79> \xEF |1
+<UFE7A> \xF0 |1
+<UFE7B> \xF0 |1
+<UFE7C> \xF1 |1
+<UFE7D> \xF1 |1
+<UFE7E> \xF2 |1
+<UFE7F> \xF2 |1
+<UFE80> \xC1 |1
+<UFE81> \xC2 |1
+<UFE82> \xC2 |1
+<UFE83> \xC3 |1
+<UFE84> \xC3 |1
+<UFE85> \xC4 |1
+<UFE86> \xC4 |1
+<UFE87> \xC5 |1
+<UFE88> \xC5 |1
+<UFE89> \xC6 |1
+<UFE8A> \xC6 |1
+<UFE8B> \xC6 |1
+<UFE8C> \xC6 |1
+<UFE8D> \xC7 |1
+<UFE8E> \xC7 |1
+<UFE8F> \xC8 |1
+<UFE90> \xC8 |1
+<UFE91> \xC8 |1
+<UFE92> \xC8 |1
+<UFE93> \xC9 |1
+<UFE94> \xC9 |1
+<UFE95> \xCA |1
+<UFE96> \xCA |1
+<UFE97> \xCA |1
+<UFE98> \xCA |1
+<UFE99> \xCB |1
+<UFE9A> \xCB |1
+<UFE9B> \xCB |1
+<UFE9C> \xCB |1
+<UFE9D> \xCC |1
+<UFE9E> \xCC |1
+<UFE9F> \xCC |1
+<UFEA0> \xCC |1
+<UFEA1> \xCD |1
+<UFEA2> \xCD |1
+<UFEA3> \xCD |1
+<UFEA4> \xCD |1
+<UFEA5> \xCE |1
+<UFEA6> \xCE |1
+<UFEA7> \xCE |1
+<UFEA8> \xCE |1
+<UFEA9> \xCF |1
+<UFEAA> \xCF |1
+<UFEAB> \xD0 |1
+<UFEAC> \xD0 |1
+<UFEAD> \xD1 |1
+<UFEAE> \xD1 |1
+<UFEAF> \xD2 |1
+<UFEB0> \xD2 |1
+<UFEB1> \xD3 |1
+<UFEB2> \xD3 |1
+<UFEB3> \xD3 |1
+<UFEB4> \xD3 |1
+<UFEB5> \xD4 |1
+<UFEB6> \xD4 |1
+<UFEB7> \xD4 |1
+<UFEB8> \xD4 |1
+<UFEB9> \xD5 |1
+<UFEBA> \xD5 |1
+<UFEBB> \xD5 |1
+<UFEBC> \xD5 |1
+<UFEBD> \xD6 |1
+<UFEBE> \xD6 |1
+<UFEBF> \xD6 |1
+<UFEC0> \xD6 |1
+<UFEC1> \xD7 |1
+<UFEC2> \xD7 |1
+<UFEC3> \xD7 |1
+<UFEC4> \xD7 |1
+<UFEC5> \xD8 |1
+<UFEC6> \xD8 |1
+<UFEC7> \xD8 |1
+<UFEC8> \xD8 |1
+<UFEC9> \xD9 |1
+<UFECA> \xD9 |1
+<UFECB> \xD9 |1
+<UFECC> \xD9 |1
+<UFECD> \xDA |1
+<UFECE> \xDA |1
+<UFECF> \xDA |1
+<UFED0> \xDA |1
+<UFED1> \xE1 |1
+<UFED2> \xE1 |1
+<UFED3> \xE1 |1
+<UFED4> \xE1 |1
+<UFED5> \xE2 |1
+<UFED6> \xE2 |1
+<UFED7> \xE2 |1
+<UFED8> \xE2 |1
+<UFED9> \xE3 |1
+<UFEDA> \xE3 |1
+<UFEDB> \xE3 |1
+<UFEDC> \xE3 |1
+<UFEDD> \xE4 |1
+<UFEDE> \xE4 |1
+<UFEDF> \xE4 |1
+<UFEE0> \xE4 |1
+<UFEE1> \xE5 |1
+<UFEE2> \xE5 |1
+<UFEE3> \xE5 |1
+<UFEE4> \xE5 |1
+<UFEE5> \xE6 |1
+<UFEE6> \xE6 |1
+<UFEE7> \xE6 |1
+<UFEE8> \xE6 |1
+<UFEE9> \xE7 |1
+<UFEEA> \xE7 |1
+<UFEEB> \xE7 |1
+<UFEEC> \xE7 |1
+<UFEED> \xE8 |1
+<UFEEE> \xE8 |1
+<UFEEF> \xE9 |1
+<UFEF0> \xE9 |1
+<UFEF1> \xEA |1
+<UFEF2> \xEA |1
+<UFEF3> \xEA |1
+<UFEF4> \xEA |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1140.ucm b/mcs/class/I18N/Rare/ibm-1140.ucm
new file mode 100644
index 00000000000..973f69dced4
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1140.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:47 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B00474.RPMAP100 and 047444B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1140"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1140
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x5A |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \xBA |0
+<U005C> \xE0 |0
+<U005D> \xBB |0
+<U005E> \xB0 |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x4F |0
+<U007D> \xD0 |0
+<U007E> \xA1 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \x4A |0
+<U00A3> \xB1 |0
+<U00A5> \xB2 |0
+<U00A6> \x6A |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \x5F |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U203E> \xBC |1
+<U20AC> \x9F |0
+<UFF01> \x5A |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \xBA |1
+<UFF3C> \xE0 |1
+<UFF3D> \xBB |1
+<UFF3E> \xB0 |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x4F |1
+<UFF5D> \xD0 |1
+<UFF5E> \xA1 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1141.ucm b/mcs/class/I18N/Rare/ibm-1141.ucm
new file mode 100644
index 00000000000..9672405a6cc
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1141.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:47 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B00475.RPMAP100 and 047544B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1141"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1141
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \xB5 |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x63 |0
+<U005C> \xEC |0
+<U005D> \xFC |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x43 |0
+<U007C> \xBB |0
+<U007D> \xDC |0
+<U007E> \x59 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A5> \xB2 |0
+<U00A6> \xCC |0
+<U00A7> \x7C |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x4A |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xE0 |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \x5A |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \xA1 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \xC0 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \x6A |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xD0 |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U203E> \xBC |1
+<U20AC> \x9F |0
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \xB5 |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x63 |1
+<UFF3C> \xEC |1
+<UFF3D> \xFC |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x43 |1
+<UFF5C> \xBB |1
+<UFF5D> \xDC |1
+<UFF5E> \x59 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1142.ucm b/mcs/class/I18N/Rare/ibm-1142.ucm
new file mode 100644
index 00000000000..577090426d8
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1142.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:48 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B00476.RPMAP100 and 047644B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1142"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1142
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x4A |0
+<U0024> \x67 |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x80 |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x9E |0
+<U005C> \xE0 |0
+<U005D> \x9F |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x9C |0
+<U007C> \xBB |0
+<U007D> \x47 |0
+<U007E> \xDC |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A5> \xB2 |0
+<U00A6> \x70 |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x5B |0
+<U00C6> \x7B |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x7C |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \xD0 |0
+<U00E6> \xC0 |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x6A |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xA1 |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U203E> \xBC |1
+<U20AC> \x5A |0
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x4A |1
+<UFF04> \x67 |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x80 |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x9E |1
+<UFF3C> \xE0 |1
+<UFF3D> \x9F |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x9C |1
+<UFF5C> \xBB |1
+<UFF5D> \x47 |1
+<UFF5E> \xDC |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1143.ucm b/mcs/class/I18N/Rare/ibm-1143.ucm
new file mode 100644
index 00000000000..8df99644ba2
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1143.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:48 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B00477.RPMAP100 and 047744B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1143"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1143
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x63 |0
+<U0024> \x67 |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \xEC |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \xB5 |0
+<U005C> \x71 |0
+<U005D> \x9F |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x51 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x43 |0
+<U007C> \xBB |0
+<U007D> \x47 |0
+<U007E> \xDC |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A5> \xB2 |0
+<U00A6> \xCC |0
+<U00A7> \x4A |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x7B |0
+<U00C5> \x5B |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \xE0 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \x7C |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \xC0 |0
+<U00E5> \xD0 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x79 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \x6A |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xA1 |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U203E> \xBC |1
+<U20AC> \x5A |0
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x63 |1
+<UFF04> \x67 |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \xEC |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \xB5 |1
+<UFF3C> \x71 |1
+<UFF3D> \x9F |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x51 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x43 |1
+<UFF5C> \xBB |1
+<UFF5D> \x47 |1
+<UFF5E> \xDC |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1144.ucm b/mcs/class/I18N/Rare/ibm-1144.ucm
new file mode 100644
index 00000000000..4660f61c8c4
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1144.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:48 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B00478.RPMAP100 and 047844B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1144"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1144
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \xB1 |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \xB5 |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x90 |0
+<U005C> \x48 |0
+<U005D> \x51 |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \xDD |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x44 |0
+<U007C> \xBB |0
+<U007D> \x54 |0
+<U007E> \x58 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \x7B |0
+<U00A5> \xB2 |0
+<U00A6> \xCD |0
+<U00A7> \x7C |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x4A |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \xC0 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \xE0 |0
+<U00E8> \xD0 |0
+<U00E9> \x5A |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \xA1 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \x6A |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \x79 |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U203E> \xBC |1
+<U20AC> \x9F |0
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \xB1 |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \xB5 |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x90 |1
+<UFF3C> \x48 |1
+<UFF3D> \x51 |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \xDD |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x44 |1
+<UFF5C> \xBB |1
+<UFF5D> \x54 |1
+<UFF5E> \x58 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1145.ucm b/mcs/class/I18N/Rare/ibm-1145.ucm
new file mode 100644
index 00000000000..7f60efe219b
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1145.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:48 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B00479.RPMAP100 and 047944B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1145"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1145
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \xBB |0
+<U0022> \x7F |0
+<U0023> \x69 |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x4A |0
+<U005C> \xE0 |0
+<U005D> \x5A |0
+<U005E> \xBA |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x4F |0
+<U007D> \xD0 |0
+<U007E> \xBD |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A5> \xB2 |0
+<U00A6> \x49 |0
+<U00A7> \xB5 |0
+<U00A8> \xA1 |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \x5F |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x7B |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x6A |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U203E> \xBC |1
+<U20AC> \x9F |0
+<UFF01> \xBB |1
+<UFF02> \x7F |1
+<UFF03> \x69 |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x4A |1
+<UFF3C> \xE0 |1
+<UFF3D> \x5A |1
+<UFF3E> \xBA |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x4F |1
+<UFF5D> \xD0 |1
+<UFF5E> \xBD |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1146.ucm b/mcs/class/I18N/Rare/ibm-1146.ucm
new file mode 100644
index 00000000000..5129f581810
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1146.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:48 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B0047A.RPMAP100 and 047A44B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1146"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1146
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x5A |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x4A |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \xB1 |0
+<U005C> \xE0 |0
+<U005D> \xBB |0
+<U005E> \xBA |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x4F |0
+<U007D> \xD0 |0
+<U007E> \xBC |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \x5B |0
+<U00A5> \xB2 |0
+<U00A6> \x6A |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \x5F |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xA1 |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U203E> \xA1 |1
+<U20AC> \x9F |0
+<UFF01> \x5A |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x4A |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \xB1 |1
+<UFF3C> \xE0 |1
+<UFF3D> \xBB |1
+<UFF3E> \xBA |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x4F |1
+<UFF5D> \xD0 |1
+<UFF5E> \xBC |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1147.ucm b/mcs/class/I18N/Rare/ibm-1147.ucm
new file mode 100644
index 00000000000..f4d62bcb64d
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1147.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:48 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B0047B.RPMAP100 and 047B44B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1147"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1147
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \xB1 |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x44 |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x90 |0
+<U005C> \x48 |0
+<U005D> \xB5 |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \xA0 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x51 |0
+<U007C> \xBB |0
+<U007D> \x54 |0
+<U007E> \xBD |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \x7B |0
+<U00A5> \xB2 |0
+<U00A6> \xDD |0
+<U00A7> \x5A |0
+<U00A8> \xA1 |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x4A |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \x79 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x7C |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \xE0 |0
+<U00E8> \xD0 |0
+<U00E9> \xC0 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \x6A |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U203E> \xBC |1
+<U20AC> \x9F |0
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \xB1 |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x44 |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x90 |1
+<UFF3C> \x48 |1
+<UFF3D> \xB5 |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \xA0 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x51 |1
+<UFF5C> \xBB |1
+<UFF5D> \x54 |1
+<UFF5E> \xBD |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1148.ucm b/mcs/class/I18N/Rare/ibm-1148.ucm
new file mode 100644
index 00000000000..1fe5a681571
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1148.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:48 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B0047C.RPMAP100 and 047C44B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1148"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1148
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x4A |0
+<U005C> \xE0 |0
+<U005D> \x5A |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \xBB |0
+<U007D> \xD0 |0
+<U007E> \xA1 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A5> \xB2 |0
+<U00A6> \x6A |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U203E> \xBC |1
+<U20AC> \x9F |0
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x4A |1
+<UFF3C> \xE0 |1
+<UFF3D> \x5A |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \xBB |1
+<UFF5D> \xD0 |1
+<UFF5E> \xA1 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-1149.ucm b/mcs/class/I18N/Rare/ibm-1149.ucm
new file mode 100644
index 00000000000..e97050d2bcb
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-1149.ucm
@@ -0,0 +1,378 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Fri Nov 10 13:07:48 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B0047D.RPMAP100 and 047D44B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1149"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1149
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \xAC |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \xAE |0
+<U005C> \xBE |0
+<U005D> \x9E |0
+<U005E> \xEC |0
+<U005F> \x6D |0
+<U0060> \x8C |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x8E |0
+<U007C> \xBB |0
+<U007D> \x9C |0
+<U007E> \xCC |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A5> \xB2 |0
+<U00A6> \x6A |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xE0 |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x5A |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \x7C |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \x5F |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \x4A |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \xD0 |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x79 |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xA1 |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \xC0 |0
+<U00FF> \xDF |0
+<U203E> \xBC |1
+<U20AC> \x9F |0
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \xAC |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \xAE |1
+<UFF3C> \xBE |1
+<UFF3D> \x9E |1
+<UFF3E> \xEC |1
+<UFF3F> \x6D |1
+<UFF40> \x8C |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x8E |1
+<UFF5C> \xBB |1
+<UFF5D> \x9C |1
+<UFF5E> \xCC |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-273.ucm b/mcs/class/I18N/Rare/ibm-273.ucm
new file mode 100644
index 00000000000..b986677d373
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-273.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:41 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00111.RPMAP100 and 011134B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-273"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-273
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \xB5 |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x63 |0
+<U005C> \xEC |0
+<U005D> \xFC |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x43 |0
+<U007C> \xBB |0
+<U007D> \xDC |0
+<U007E> \x59 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \xCC |0
+<U00A7> \x7C |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x4A |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xE0 |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \x5A |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \xA1 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \xC0 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \x6A |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xD0 |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U0110> \xAC |1
+<U203E> \xBC |1
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \xB5 |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x63 |1
+<UFF3C> \xEC |1
+<UFF3D> \xFC |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x43 |1
+<UFF5C> \xBB |1
+<UFF5D> \xDC |1
+<UFF5E> \x59 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-277.ucm b/mcs/class/I18N/Rare/ibm-277.ucm
new file mode 100644
index 00000000000..7ed1d844af2
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-277.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:41 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00115.RPMAP100 and 011534B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-277"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-277
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x4A |0
+<U0024> \x67 |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x80 |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x9E |0
+<U005C> \xE0 |0
+<U005D> \x9F |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x9C |0
+<U007C> \xBB |0
+<U007D> \x47 |0
+<U007E> \xDC |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A4> \x5A |0
+<U00A5> \xB2 |0
+<U00A6> \x70 |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x5B |0
+<U00C6> \x7B |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x7C |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \xD0 |0
+<U00E6> \xC0 |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x6A |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xA1 |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U0110> \xAC |1
+<U203E> \xBC |1
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x4A |1
+<UFF04> \x67 |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x80 |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x9E |1
+<UFF3C> \xE0 |1
+<UFF3D> \x9F |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x9C |1
+<UFF5C> \xBB |1
+<UFF5D> \x47 |1
+<UFF5E> \xDC |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-278.ucm b/mcs/class/I18N/Rare/ibm-278.ucm
new file mode 100644
index 00000000000..068f0a3f2f0
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-278.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:41 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00116.RPMAP100 and 011634B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-278"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-278
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x63 |0
+<U0024> \x67 |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \xEC |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \xB5 |0
+<U005C> \x71 |0
+<U005D> \x9F |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x51 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x43 |0
+<U007C> \xBB |0
+<U007D> \x47 |0
+<U007E> \xDC |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A4> \x5A |0
+<U00A5> \xB2 |0
+<U00A6> \xCC |0
+<U00A7> \x4A |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x7B |0
+<U00C5> \x5B |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \xE0 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \x7C |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \xC0 |0
+<U00E5> \xD0 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x79 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \x6A |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xA1 |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U0110> \xAC |1
+<U203E> \xBC |1
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x63 |1
+<UFF04> \x67 |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \xEC |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \xB5 |1
+<UFF3C> \x71 |1
+<UFF3D> \x9F |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x51 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x43 |1
+<UFF5C> \xBB |1
+<UFF5D> \x47 |1
+<UFF5E> \xDC |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-280.ucm b/mcs/class/I18N/Rare/ibm-280.ucm
new file mode 100644
index 00000000000..e050f2a558c
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-280.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:41 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00118.RPMAP100 and 011834B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-280"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-280
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \xB1 |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \xB5 |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x90 |0
+<U005C> \x48 |0
+<U005D> \x51 |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \xDD |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x44 |0
+<U007C> \xBB |0
+<U007D> \x54 |0
+<U007E> \x58 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \x7B |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \xCD |0
+<U00A7> \x7C |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x4A |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \xC0 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \xE0 |0
+<U00E8> \xD0 |0
+<U00E9> \x5A |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \xA1 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \x6A |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \x79 |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U0110> \xAC |1
+<U203E> \xBC |1
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \xB1 |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \xB5 |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x90 |1
+<UFF3C> \x48 |1
+<UFF3D> \x51 |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \xDD |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x44 |1
+<UFF5C> \xBB |1
+<UFF5D> \x54 |1
+<UFF5E> \x58 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-284.ucm b/mcs/class/I18N/Rare/ibm-284.ucm
new file mode 100644
index 00000000000..8dcc9642409
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-284.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:41 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B0011C.RPMAP100 and 011C34B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-284"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-284
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \xBB |0
+<U0022> \x7F |0
+<U0023> \x69 |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x4A |0
+<U005C> \xE0 |0
+<U005D> \x5A |0
+<U005E> \xBA |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x4F |0
+<U007D> \xD0 |0
+<U007E> \xBD |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \x49 |0
+<U00A7> \xB5 |0
+<U00A8> \xA1 |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \x5F |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x7B |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x6A |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U0110> \xAC |1
+<U203E> \xBC |1
+<UFF01> \xBB |1
+<UFF02> \x7F |1
+<UFF03> \x69 |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x4A |1
+<UFF3C> \xE0 |1
+<UFF3D> \x5A |1
+<UFF3E> \xBA |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x4F |1
+<UFF5D> \xD0 |1
+<UFF5E> \xBD |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-285.ucm b/mcs/class/I18N/Rare/ibm-285.ucm
new file mode 100644
index 00000000000..bb74537766e
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-285.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:41 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B0011D.RPMAP100 and 011D34B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-285"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-285
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x5A |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x4A |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \xB1 |0
+<U005C> \xE0 |0
+<U005D> \xBB |0
+<U005E> \xBA |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x4F |0
+<U007D> \xD0 |0
+<U007E> \xBC |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \x5B |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \x6A |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \x5F |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xA1 |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U0110> \xAC |1
+<U203E> \xA1 |1
+<UFF01> \x5A |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x4A |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \xB1 |1
+<UFF3C> \xE0 |1
+<UFF3D> \xBB |1
+<UFF3E> \xBA |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x4F |1
+<UFF5D> \xD0 |1
+<UFF5E> \xBC |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-290.ucm b/mcs/class/I18N/Rare/ibm-290.ucm
new file mode 100644
index 00000000000..eb661591191
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-290.ucm
@@ -0,0 +1,349 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:41 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00122.RPMAP100 and 012234B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-290"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-290
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x5A |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \xE0 |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x70 |0
+<U005C> \xB2 |0
+<U005D> \x80 |0
+<U005E> \xB0 |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x62 |0
+<U0062> \x63 |0
+<U0063> \x64 |0
+<U0064> \x65 |0
+<U0065> \x66 |0
+<U0066> \x67 |0
+<U0067> \x68 |0
+<U0068> \x69 |0
+<U0069> \x71 |0
+<U006A> \x72 |0
+<U006B> \x73 |0
+<U006C> \x74 |0
+<U006D> \x75 |0
+<U006E> \x76 |0
+<U006F> \x77 |0
+<U0070> \x78 |0
+<U0071> \x8B |0
+<U0072> \x9B |0
+<U0073> \xAB |0
+<U0074> \xB3 |0
+<U0075> \xB4 |0
+<U0076> \xB5 |0
+<U0077> \xB6 |0
+<U0078> \xB7 |0
+<U0079> \xB8 |0
+<U007A> \xB9 |0
+<U007B> \xC0 |0
+<U007C> \x4F |0
+<U007D> \xD0 |0
+<U007E> \xA0 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A2> \xB1 |0
+<U00A3> \x4A |0
+<U00A5> \x5B |0
+<U00AC> \x5F |0
+<U203E> \xA1 |0
+<UFF01> \x5A |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \xE0 |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x70 |1
+<UFF3C> \xB2 |1
+<UFF3D> \x80 |1
+<UFF3E> \xB0 |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x62 |1
+<UFF42> \x63 |1
+<UFF43> \x64 |1
+<UFF44> \x65 |1
+<UFF45> \x66 |1
+<UFF46> \x67 |1
+<UFF47> \x68 |1
+<UFF48> \x69 |1
+<UFF49> \x71 |1
+<UFF4A> \x72 |1
+<UFF4B> \x73 |1
+<UFF4C> \x74 |1
+<UFF4D> \x75 |1
+<UFF4E> \x76 |1
+<UFF4F> \x77 |1
+<UFF50> \x78 |1
+<UFF51> \x8B |1
+<UFF52> \x9B |1
+<UFF53> \xAB |1
+<UFF54> \xB3 |1
+<UFF55> \xB4 |1
+<UFF56> \xB5 |1
+<UFF57> \xB6 |1
+<UFF58> \xB7 |1
+<UFF59> \xB8 |1
+<UFF5A> \xB9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x4F |1
+<UFF5D> \xD0 |1
+<UFF5E> \xA0 |1
+<UFF61> \x41 |0
+<UFF62> \x42 |0
+<UFF63> \x43 |0
+<UFF64> \x44 |0
+<UFF65> \x45 |0
+<UFF66> \x46 |0
+<UFF67> \x47 |0
+<UFF68> \x48 |0
+<UFF69> \x49 |0
+<UFF6A> \x51 |0
+<UFF6B> \x52 |0
+<UFF6C> \x53 |0
+<UFF6D> \x54 |0
+<UFF6E> \x55 |0
+<UFF6F> \x56 |0
+<UFF70> \x58 |0
+<UFF71> \x81 |0
+<UFF72> \x82 |0
+<UFF73> \x83 |0
+<UFF74> \x84 |0
+<UFF75> \x85 |0
+<UFF76> \x86 |0
+<UFF77> \x87 |0
+<UFF78> \x88 |0
+<UFF79> \x89 |0
+<UFF7A> \x8A |0
+<UFF7B> \x8C |0
+<UFF7C> \x8D |0
+<UFF7D> \x8E |0
+<UFF7E> \x8F |0
+<UFF7F> \x90 |0
+<UFF80> \x91 |0
+<UFF81> \x92 |0
+<UFF82> \x93 |0
+<UFF83> \x94 |0
+<UFF84> \x95 |0
+<UFF85> \x96 |0
+<UFF86> \x97 |0
+<UFF87> \x98 |0
+<UFF88> \x99 |0
+<UFF89> \x9A |0
+<UFF8A> \x9D |0
+<UFF8B> \x9E |0
+<UFF8C> \x9F |0
+<UFF8D> \xA2 |0
+<UFF8E> \xA3 |0
+<UFF8F> \xA4 |0
+<UFF90> \xA5 |0
+<UFF91> \xA6 |0
+<UFF92> \xA7 |0
+<UFF93> \xA8 |0
+<UFF94> \xA9 |0
+<UFF95> \xAA |0
+<UFF96> \xAC |0
+<UFF97> \xAD |0
+<UFF98> \xAE |0
+<UFF99> \xAF |0
+<UFF9A> \xBA |0
+<UFF9B> \xBB |0
+<UFF9C> \xBC |0
+<UFF9D> \xBD |0
+<UFF9E> \xBE |0
+<UFF9F> \xBF |0
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-297.ucm b/mcs/class/I18N/Rare/ibm-297.ucm
new file mode 100644
index 00000000000..f627d5ce517
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-297.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:41 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00129.RPMAP100 and 012934B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-297"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-297
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \xB1 |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x44 |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x90 |0
+<U005C> \x48 |0
+<U005D> \xB5 |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \xA0 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x51 |0
+<U007C> \xBB |0
+<U007D> \x54 |0
+<U007E> \xBD |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \x7B |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \xDD |0
+<U00A7> \x5A |0
+<U00A8> \xA1 |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x4A |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \x79 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x7C |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \xE0 |0
+<U00E8> \xD0 |0
+<U00E9> \xC0 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \x6A |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U0110> \xAC |1
+<U203E> \xBC |1
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \xB1 |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x44 |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x90 |1
+<UFF3C> \x48 |1
+<UFF3D> \xB5 |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \xA0 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x51 |1
+<UFF5C> \xBB |1
+<UFF5D> \x54 |1
+<UFF5E> \xBD |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-37.ucm b/mcs/class/I18N/Rare/ibm-37.ucm
new file mode 100644
index 00000000000..070f03e81f3
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-37.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:41 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00025.RPMAP100 and 002534B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-37"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-37
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x5A |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \xBA |0
+<U005C> \xE0 |0
+<U005D> \xBB |0
+<U005E> \xB0 |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x4F |0
+<U007D> \xD0 |0
+<U007E> \xA1 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \x4A |0
+<U00A3> \xB1 |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \x6A |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \x5F |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U0110> \xAC |1
+<U203E> \xBC |1
+<UFF01> \x5A |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \xBA |1
+<UFF3C> \xE0 |1
+<UFF3D> \xBB |1
+<UFF3E> \xB0 |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x4F |1
+<UFF5D> \xD0 |1
+<UFF5E> \xA1 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-420.ucm b/mcs/class/I18N/Rare/ibm-420.ucm
new file mode 100644
index 00000000000..33b947902ba
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-420.ucm
@@ -0,0 +1,453 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Thu Nov  9 17:44:49 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B001A4.RXMAP110 and 01A434B0.TXMAP110
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-420"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-420
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x5A |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005F> \x6D |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007C> \x4F |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A2> \x4A |0
+<U00A6> \x6A |0
+<U00AC> \x5F |0
+<U00AD> \xCA |0
+<U00D7> \xE0 |0
+<U00F7> \xA1 |0
+<U060C> \x79 |0
+<U061B> \xC0 |0
+<U061F> \xD0 |0
+<U0621> \x46 |0
+<U0622> \x47 |0
+<U0623> \x49 |0
+<U0624> \x52 |0
+<U0625> \x56 |1
+<U0626> \x55 |0
+<U0627> \x56 |0
+<U0628> \x58 |0
+<U0629> \x62 |0
+<U062A> \x63 |0
+<U062B> \x65 |0
+<U062C> \x67 |0
+<U062D> \x69 |0
+<U062E> \x71 |0
+<U062F> \x73 |0
+<U0630> \x74 |0
+<U0631> \x75 |0
+<U0632> \x76 |0
+<U0633> \x77 |0
+<U0634> \x80 |0
+<U0635> \x8B |0
+<U0636> \x8D |0
+<U0637> \x8F |0
+<U0638> \x90 |0
+<U0639> \x9A |0
+<U063A> \x9E |0
+<U0640> \x44 |0
+<U0641> \xAB |0
+<U0642> \xAD |0
+<U0643> \xAF |0
+<U0644> \xB1 |0
+<U0645> \xBB |0
+<U0646> \xBD |0
+<U0647> \xBF |0
+<U0648> \xCF |0
+<U0649> \xDA |0
+<U064A> \xDC |0
+<U0651> \x42 |0
+<U0660> \xDF |0
+<U0661> \xEA |0
+<U0662> \xEB |0
+<U0663> \xED |0
+<U0664> \xEE |0
+<U0665> \xEF |0
+<U0666> \xFB |0
+<U0667> \xFC |0
+<U0668> \xFD |0
+<U0669> \xFE |0
+<U066A> \x6C |1
+<U066B> \x6B |1
+<U066C> \x4B |1
+<U066D> \x5C |1
+<U200B> \x45 |0
+<UFE7C> \x42 |1
+<UFE7D> \x43 |0
+<UFE80> \x46 |1
+<UFE81> \x47 |1
+<UFE82> \x48 |0
+<UFE83> \x49 |1
+<UFE84> \x51 |0
+<UFE85> \x52 |1
+<UFE86> \x52 |1
+<UFE87> \x56 |1
+<UFE88> \x57 |1
+<UFE8B> \x55 |1
+<UFE8C> \x55 |1
+<UFE8D> \x56 |1
+<UFE8E> \x57 |0
+<UFE8F> \x58 |1
+<UFE90> \x58 |1
+<UFE91> \x59 |0
+<UFE92> \x59 |1
+<UFE93> \x62 |1
+<UFE94> \x62 |1
+<UFE95> \x63 |1
+<UFE96> \x63 |1
+<UFE97> \x64 |0
+<UFE98> \x64 |1
+<UFE99> \x65 |1
+<UFE9A> \x65 |1
+<UFE9B> \x66 |0
+<UFE9C> \x66 |1
+<UFE9D> \x67 |1
+<UFE9E> \x67 |1
+<UFE9F> \x68 |0
+<UFEA0> \x68 |1
+<UFEA1> \x69 |1
+<UFEA2> \x69 |1
+<UFEA3> \x70 |0
+<UFEA4> \x70 |1
+<UFEA5> \x71 |1
+<UFEA6> \x71 |1
+<UFEA7> \x72 |0
+<UFEA8> \x72 |1
+<UFEA9> \x73 |1
+<UFEAA> \x73 |1
+<UFEAB> \x74 |1
+<UFEAC> \x74 |1
+<UFEAD> \x75 |1
+<UFEAE> \x75 |1
+<UFEAF> \x76 |1
+<UFEB0> \x76 |1
+<UFEB1> \x77 |1
+<UFEB2> \x77 |1
+<UFEB3> \x78 |0
+<UFEB4> \x78 |1
+<UFEB5> \x80 |1
+<UFEB6> \x80 |1
+<UFEB7> \x8A |0
+<UFEB8> \x8A |1
+<UFEB9> \x8B |1
+<UFEBA> \x8B |1
+<UFEBB> \x8C |0
+<UFEBC> \x8C |1
+<UFEBD> \x8D |1
+<UFEBE> \x8D |1
+<UFEBF> \x8E |0
+<UFEC0> \x8E |1
+<UFEC1> \x8F |1
+<UFEC2> \x8F |1
+<UFEC3> \x8F |1
+<UFEC4> \x8F |1
+<UFEC5> \x90 |1
+<UFEC6> \x90 |1
+<UFEC7> \x90 |1
+<UFEC8> \x90 |1
+<UFEC9> \x9A |1
+<UFECA> \x9B |0
+<UFECB> \x9C |0
+<UFECC> \x9D |0
+<UFECD> \x9E |1
+<UFECE> \x9F |0
+<UFECF> \xA0 |0
+<UFED0> \xAA |0
+<UFED1> \xAB |1
+<UFED2> \xAB |1
+<UFED3> \xAC |0
+<UFED4> \xAC |1
+<UFED5> \xAD |1
+<UFED6> \xAD |1
+<UFED7> \xAE |0
+<UFED8> \xAE |1
+<UFED9> \xAF |1
+<UFEDA> \xAF |1
+<UFEDB> \xB0 |0
+<UFEDC> \xB0 |1
+<UFEDD> \xB1 |1
+<UFEDE> \xB1 |1
+<UFEDF> \xBA |0
+<UFEE0> \xBA |1
+<UFEE1> \xBB |1
+<UFEE2> \xBB |1
+<UFEE3> \xBC |0
+<UFEE4> \xBC |1
+<UFEE5> \xBD |1
+<UFEE6> \xBD |1
+<UFEE7> \xBE |0
+<UFEE8> \xBE |1
+<UFEE9> \xBF |1
+<UFEEA> \xBF |1
+<UFEEB> \xCB |0
+<UFEEC> \xCD |0
+<UFEED> \xCF |1
+<UFEEE> \xCF |1
+<UFEEF> \xDA |1
+<UFEF0> \xDB |0
+<UFEF1> \xDC |1
+<UFEF2> \xDD |0
+<UFEF3> \xDE |0
+<UFEF4> \xDE |1
+<UFEF5> \xB2 |0
+<UFEF6> \xB3 |0
+<UFEF7> \xB4 |0
+<UFEF8> \xB5 |0
+<UFEF9> \xB8 |1
+<UFEFA> \xB9 |1
+<UFEFB> \xB8 |0
+<UFEFC> \xB9 |0
+<UFF01> \x5A |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3F> \x6D |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5C> \x4F |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-424.ucm b/mcs/class/I18N/Rare/ibm-424.ucm
new file mode 100644
index 00000000000..a024e217070
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-424.ucm
@@ -0,0 +1,339 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:42 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B001A8.RPMAP100 and 01A834B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-424"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-424
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x5A |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \xBA |0
+<U005C> \xE0 |0
+<U005D> \xBB |0
+<U005E> \xB0 |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x4F |0
+<U007D> \xD0 |0
+<U007E> \xA1 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x74 |0
+<U00A2> \x4A |0
+<U00A3> \xB1 |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \x6A |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AB> \x8A |0
+<U00AC> \x5F |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00D7> \xBF |0
+<U00F7> \xE1 |0
+<U05D0> \x41 |0
+<U05D1> \x42 |0
+<U05D2> \x43 |0
+<U05D3> \x44 |0
+<U05D4> \x45 |0
+<U05D5> \x46 |0
+<U05D6> \x47 |0
+<U05D7> \x48 |0
+<U05D8> \x49 |0
+<U05D9> \x51 |0
+<U05DA> \x52 |0
+<U05DB> \x53 |0
+<U05DC> \x54 |0
+<U05DD> \x55 |0
+<U05DE> \x56 |0
+<U05DF> \x57 |0
+<U05E0> \x58 |0
+<U05E1> \x59 |0
+<U05E2> \x62 |0
+<U05E3> \x63 |0
+<U05E4> \x64 |0
+<U05E5> \x65 |0
+<U05E6> \x66 |0
+<U05E7> \x67 |0
+<U05E8> \x68 |0
+<U05E9> \x69 |0
+<U05EA> \x71 |0
+<U2017> \x78 |0
+<U2022> \xB3 |0
+<U203E> \xBC |0
+<UFF01> \x5A |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \xBA |1
+<UFF3C> \xE0 |1
+<UFF3D> \xBB |1
+<UFF3E> \xB0 |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x4F |1
+<UFF5D> \xD0 |1
+<UFF5E> \xA1 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-500.ucm b/mcs/class/I18N/Rare/ibm-500.ucm
new file mode 100644
index 00000000000..ef11ec7c2d9
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-500.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:42 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B001F4.RPMAP100 and 01F434B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-500"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-500
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x4A |0
+<U005C> \xE0 |0
+<U005D> \x5A |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \xBB |0
+<U007D> \xD0 |0
+<U007E> \xA1 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \x6A |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xBE |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x9E |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \xAC |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \xAE |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \x9C |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x8C |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \x8E |0
+<U00FF> \xDF |0
+<U0110> \xAC |1
+<U203E> \xBC |1
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x4A |1
+<UFF3C> \xE0 |1
+<UFF3D> \x5A |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \xBB |1
+<UFF5D> \xD0 |1
+<UFF5E> \xA1 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-852.ucm b/mcs/class/I18N/Rare/ibm-852.ucm
new file mode 100644
index 00000000000..5e45addb083
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-852.ucm
@@ -0,0 +1,415 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:42 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00354.RPMAP100 and 035434B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-852"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-852
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A4> \xCF |0
+<U00A7> \xF5 |0
+<U00A8> \xF9 |0
+<U00AB> \xAE |0
+<U00AD> \xF0 |0
+<U00B0> \xF8 |0
+<U00B4> \xEF |0
+<U00B6> \x14 |1
+<U00B8> \xF7 |0
+<U00BB> \xAF |0
+<U00C1> \xB5 |0
+<U00C2> \xB6 |0
+<U00C4> \x8E |0
+<U00C7> \x80 |0
+<U00C9> \x90 |0
+<U00CB> \xD3 |0
+<U00CD> \xD6 |0
+<U00CE> \xD7 |0
+<U00D0> \xD1 |1
+<U00D3> \xE0 |0
+<U00D4> \xE2 |0
+<U00D6> \x99 |0
+<U00D7> \x9E |0
+<U00DA> \xE9 |0
+<U00DC> \x9A |0
+<U00DD> \xED |0
+<U00DF> \xE1 |0
+<U00E1> \xA0 |0
+<U00E2> \x83 |0
+<U00E4> \x84 |0
+<U00E7> \x87 |0
+<U00E9> \x82 |0
+<U00EB> \x89 |0
+<U00ED> \xA1 |0
+<U00EE> \x8C |0
+<U00F3> \xA2 |0
+<U00F4> \x93 |0
+<U00F6> \x94 |0
+<U00F7> \xF6 |0
+<U00FA> \xA3 |0
+<U00FC> \x81 |0
+<U00FD> \xEC |0
+<U0102> \xC6 |0
+<U0103> \xC7 |0
+<U0104> \xA4 |0
+<U0105> \xA5 |0
+<U0106> \x8F |0
+<U0107> \x86 |0
+<U010C> \xAC |0
+<U010D> \x9F |0
+<U010E> \xD2 |0
+<U010F> \xD4 |0
+<U0110> \xD1 |0
+<U0111> \xD0 |0
+<U0118> \xA8 |0
+<U0119> \xA9 |0
+<U011A> \xB7 |0
+<U011B> \xD8 |0
+<U0139> \x91 |0
+<U013A> \x92 |0
+<U013D> \x95 |0
+<U013E> \x96 |0
+<U0141> \x9D |0
+<U0142> \x88 |0
+<U0143> \xE3 |0
+<U0144> \xE4 |0
+<U0147> \xD5 |0
+<U0148> \xE5 |0
+<U0150> \x8A |0
+<U0151> \x8B |0
+<U0154> \xE8 |0
+<U0155> \xEA |0
+<U0158> \xFC |0
+<U0159> \xFD |0
+<U015A> \x97 |0
+<U015B> \x98 |0
+<U015E> \xB8 |0
+<U015F> \xAD |0
+<U0160> \xE6 |0
+<U0161> \xE7 |0
+<U0162> \xDD |0
+<U0163> \xEE |0
+<U0164> \x9B |0
+<U0165> \x9C |0
+<U016E> \xDE |0
+<U016F> \x85 |0
+<U0170> \xEB |0
+<U0171> \xFB |0
+<U0179> \x8D |0
+<U017A> \xAB |0
+<U017B> \xBD |0
+<U017C> \xBE |0
+<U017D> \xA6 |0
+<U017E> \xA7 |0
+<U02C7> \xF3 |0
+<U02D8> \xF4 |0
+<U02D9> \xFA |0
+<U02DB> \xF2 |0
+<U02DD> \xF1 |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U221F> \x1C |1
+<U2302> \x7F |2
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2554> \xC9 |0
+<U2557> \xBB |0
+<U255A> \xC8 |0
+<U255D> \xBC |0
+<U2560> \xCC |0
+<U2563> \xB9 |0
+<U2566> \xCB |0
+<U2569> \xCA |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266C> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-855.ucm b/mcs/class/I18N/Rare/ibm-855.ucm
new file mode 100644
index 00000000000..bc80b19fb31
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-855.ucm
@@ -0,0 +1,415 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:42 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00357.RPMAP100 and 035734B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-855"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-855
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A4> \xCF |0
+<U00A7> \xFD |0
+<U00AB> \xAE |0
+<U00AD> \xF0 |0
+<U00B6> \x14 |1
+<U00BB> \xAF |0
+<U0401> \x85 |0
+<U0402> \x81 |0
+<U0403> \x83 |0
+<U0404> \x87 |0
+<U0405> \x89 |0
+<U0406> \x8B |0
+<U0407> \x8D |0
+<U0408> \x8F |0
+<U0409> \x91 |0
+<U040A> \x93 |0
+<U040B> \x95 |0
+<U040C> \x97 |0
+<U040E> \x99 |0
+<U040F> \x9B |0
+<U0410> \xA1 |0
+<U0411> \xA3 |0
+<U0412> \xEC |0
+<U0413> \xAD |0
+<U0414> \xA7 |0
+<U0415> \xA9 |0
+<U0416> \xEA |0
+<U0417> \xF4 |0
+<U0418> \xB8 |0
+<U0419> \xBE |0
+<U041A> \xC7 |0
+<U041B> \xD1 |0
+<U041C> \xD3 |0
+<U041D> \xD5 |0
+<U041E> \xD7 |0
+<U041F> \xDD |0
+<U0420> \xE2 |0
+<U0421> \xE4 |0
+<U0422> \xE6 |0
+<U0423> \xE8 |0
+<U0424> \xAB |0
+<U0425> \xB6 |0
+<U0426> \xA5 |0
+<U0427> \xFC |0
+<U0428> \xF6 |0
+<U0429> \xFA |0
+<U042A> \x9F |0
+<U042B> \xF2 |0
+<U042C> \xEE |0
+<U042D> \xF8 |0
+<U042E> \x9D |0
+<U042F> \xE0 |0
+<U0430> \xA0 |0
+<U0431> \xA2 |0
+<U0432> \xEB |0
+<U0433> \xAC |0
+<U0434> \xA6 |0
+<U0435> \xA8 |0
+<U0436> \xE9 |0
+<U0437> \xF3 |0
+<U0438> \xB7 |0
+<U0439> \xBD |0
+<U043A> \xC6 |0
+<U043B> \xD0 |0
+<U043C> \xD2 |0
+<U043D> \xD4 |0
+<U043E> \xD6 |0
+<U043F> \xD8 |0
+<U0440> \xE1 |0
+<U0441> \xE3 |0
+<U0442> \xE5 |0
+<U0443> \xE7 |0
+<U0444> \xAA |0
+<U0445> \xB5 |0
+<U0446> \xA4 |0
+<U0447> \xFB |0
+<U0448> \xF5 |0
+<U0449> \xF9 |0
+<U044A> \x9E |0
+<U044B> \xF1 |0
+<U044C> \xED |0
+<U044D> \xF7 |0
+<U044E> \x9C |0
+<U044F> \xDE |0
+<U0451> \x84 |0
+<U0452> \x80 |0
+<U0453> \x82 |0
+<U0454> \x86 |0
+<U0455> \x88 |0
+<U0456> \x8A |0
+<U0457> \x8C |0
+<U0458> \x8E |0
+<U0459> \x90 |0
+<U045A> \x92 |0
+<U045B> \x94 |0
+<U045C> \x96 |0
+<U045E> \x98 |0
+<U045F> \x9A |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U2116> \xEF |0
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U221F> \x1C |1
+<U2302> \x7F |2
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2554> \xC9 |0
+<U2557> \xBB |0
+<U255A> \xC8 |0
+<U255D> \xBC |0
+<U2560> \xCC |0
+<U2563> \xB9 |0
+<U2566> \xCB |0
+<U2569> \xCA |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266B> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-857.ucm b/mcs/class/I18N/Rare/ibm-857.ucm
new file mode 100644
index 00000000000..9d07db99bc8
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-857.ucm
@@ -0,0 +1,412 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:43 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00359.RPMAP100 and 035934B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-857"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-857
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A1> \xAD |0
+<U00A2> \xBD |0
+<U00A3> \x9C |0
+<U00A4> \xCF |0
+<U00A5> \xBE |0
+<U00A6> \xDD |0
+<U00A7> \xF5 |0
+<U00A8> \xF9 |0
+<U00A9> \xB8 |0
+<U00AA> \xD1 |0
+<U00AB> \xAE |0
+<U00AC> \xAA |0
+<U00AD> \xF0 |0
+<U00AE> \xA9 |0
+<U00AF> \xEE |0
+<U00B0> \xF8 |0
+<U00B1> \xF1 |0
+<U00B2> \xFD |0
+<U00B3> \xFC |0
+<U00B4> \xEF |0
+<U00B5> \xE6 |0
+<U00B6> \xF4 |0
+<U00B7> \xFA |0
+<U00B8> \xF7 |0
+<U00B9> \xFB |0
+<U00BA> \xD0 |0
+<U00BB> \xAF |0
+<U00BC> \xAC |0
+<U00BD> \xAB |0
+<U00BE> \xF3 |0
+<U00BF> \xA8 |0
+<U00C0> \xB7 |0
+<U00C1> \xB5 |0
+<U00C2> \xB6 |0
+<U00C3> \xC7 |0
+<U00C4> \x8E |0
+<U00C5> \x8F |0
+<U00C6> \x92 |0
+<U00C7> \x80 |0
+<U00C8> \xD4 |0
+<U00C9> \x90 |0
+<U00CA> \xD2 |0
+<U00CB> \xD3 |0
+<U00CC> \xDE |0
+<U00CD> \xD6 |0
+<U00CE> \xD7 |0
+<U00CF> \xD8 |0
+<U00D1> \xA5 |0
+<U00D2> \xE3 |0
+<U00D3> \xE0 |0
+<U00D4> \xE2 |0
+<U00D5> \xE5 |0
+<U00D6> \x99 |0
+<U00D7> \xE8 |0
+<U00D8> \x9D |0
+<U00D9> \xEB |0
+<U00DA> \xE9 |0
+<U00DB> \xEA |0
+<U00DC> \x9A |0
+<U00DF> \xE1 |0
+<U00E0> \x85 |0
+<U00E1> \xA0 |0
+<U00E2> \x83 |0
+<U00E3> \xC6 |0
+<U00E4> \x84 |0
+<U00E5> \x86 |0
+<U00E6> \x91 |0
+<U00E7> \x87 |0
+<U00E8> \x8A |0
+<U00E9> \x82 |0
+<U00EA> \x88 |0
+<U00EB> \x89 |0
+<U00EC> \xEC |0
+<U00ED> \xA1 |0
+<U00EE> \x8C |0
+<U00EF> \x8B |0
+<U00F1> \xA4 |0
+<U00F2> \x95 |0
+<U00F3> \xA2 |0
+<U00F4> \x93 |0
+<U00F5> \xE4 |0
+<U00F6> \x94 |0
+<U00F7> \xF6 |0
+<U00F8> \x9B |0
+<U00F9> \x97 |0
+<U00FA> \xA3 |0
+<U00FB> \x96 |0
+<U00FC> \x81 |0
+<U00FF> \xED |0
+<U011E> \xA6 |0
+<U011F> \xA7 |0
+<U0130> \x98 |0
+<U0131> \x8D |0
+<U015E> \x9E |0
+<U015F> \x9F |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U203E> \xEE |1
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U221F> \x1C |1
+<U2302> \x7F |2
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2554> \xC9 |0
+<U2557> \xBB |0
+<U255A> \xC8 |0
+<U255D> \xBC |0
+<U2560> \xCC |0
+<U2563> \xB9 |0
+<U2566> \xCB |0
+<U2569> \xCA |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266B> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-858.ucm b/mcs/class/I18N/Rare/ibm-858.ucm
new file mode 100644
index 00000000000..29da17cfb98
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-858.ucm
@@ -0,0 +1,415 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1997-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:43 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B0035A.RPMAP100 and 035A44B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-858"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-858
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A1> \xAD |0
+<U00A2> \xBD |0
+<U00A3> \x9C |0
+<U00A4> \xCF |0
+<U00A5> \xBE |0
+<U00A6> \xDD |0
+<U00A7> \xF5 |0
+<U00A8> \xF9 |0
+<U00A9> \xB8 |0
+<U00AA> \xA6 |0
+<U00AB> \xAE |0
+<U00AC> \xAA |0
+<U00AD> \xF0 |0
+<U00AE> \xA9 |0
+<U00AF> \xEE |0
+<U00B0> \xF8 |0
+<U00B1> \xF1 |0
+<U00B2> \xFD |0
+<U00B3> \xFC |0
+<U00B4> \xEF |0
+<U00B5> \xE6 |0
+<U00B6> \xF4 |0
+<U00B7> \xFA |0
+<U00B8> \xF7 |0
+<U00B9> \xFB |0
+<U00BA> \xA7 |0
+<U00BB> \xAF |0
+<U00BC> \xAC |0
+<U00BD> \xAB |0
+<U00BE> \xF3 |0
+<U00BF> \xA8 |0
+<U00C0> \xB7 |0
+<U00C1> \xB5 |0
+<U00C2> \xB6 |0
+<U00C3> \xC7 |0
+<U00C4> \x8E |0
+<U00C5> \x8F |0
+<U00C6> \x92 |0
+<U00C7> \x80 |0
+<U00C8> \xD4 |0
+<U00C9> \x90 |0
+<U00CA> \xD2 |0
+<U00CB> \xD3 |0
+<U00CC> \xDE |0
+<U00CD> \xD6 |0
+<U00CE> \xD7 |0
+<U00CF> \xD8 |0
+<U00D0> \xD1 |0
+<U00D1> \xA5 |0
+<U00D2> \xE3 |0
+<U00D3> \xE0 |0
+<U00D4> \xE2 |0
+<U00D5> \xE5 |0
+<U00D6> \x99 |0
+<U00D7> \x9E |0
+<U00D8> \x9D |0
+<U00D9> \xEB |0
+<U00DA> \xE9 |0
+<U00DB> \xEA |0
+<U00DC> \x9A |0
+<U00DD> \xED |0
+<U00DE> \xE8 |0
+<U00DF> \xE1 |0
+<U00E0> \x85 |0
+<U00E1> \xA0 |0
+<U00E2> \x83 |0
+<U00E3> \xC6 |0
+<U00E4> \x84 |0
+<U00E5> \x86 |0
+<U00E6> \x91 |0
+<U00E7> \x87 |0
+<U00E8> \x8A |0
+<U00E9> \x82 |0
+<U00EA> \x88 |0
+<U00EB> \x89 |0
+<U00EC> \x8D |0
+<U00ED> \xA1 |0
+<U00EE> \x8C |0
+<U00EF> \x8B |0
+<U00F0> \xD0 |0
+<U00F1> \xA4 |0
+<U00F2> \x95 |0
+<U00F3> \xA2 |0
+<U00F4> \x93 |0
+<U00F5> \xE4 |0
+<U00F6> \x94 |0
+<U00F7> \xF6 |0
+<U00F8> \x9B |0
+<U00F9> \x97 |0
+<U00FA> \xA3 |0
+<U00FB> \x96 |0
+<U00FC> \x81 |0
+<U00FD> \xEC |0
+<U00FE> \xE7 |0
+<U00FF> \x98 |0
+<U0192> \x9F |0
+<U2017> \xF2 |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U203E> \xEE |1
+<U20AC> \xD5 |0
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U221F> \x1C |1
+<U2302> \x7F |2
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2554> \xC9 |0
+<U2557> \xBB |0
+<U255A> \xC8 |0
+<U255D> \xBC |0
+<U2560> \xCC |0
+<U2563> \xB9 |0
+<U2566> \xCB |0
+<U2569> \xCA |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266C> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-862.ucm b/mcs/class/I18N/Rare/ibm-862.ucm
new file mode 100644
index 00000000000..33592b0ff47
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-862.ucm
@@ -0,0 +1,416 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:43 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B0035E.RPMAP100 and 035E34B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-862"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-862
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A1> \xAD |0
+<U00A2> \x9B |0
+<U00A3> \x9C |0
+<U00A5> \x9D |0
+<U00A7> \x15 |1
+<U00AA> \xA6 |0
+<U00AB> \xAE |0
+<U00AC> \xAA |0
+<U00B0> \xF8 |0
+<U00B1> \xF1 |0
+<U00B2> \xFD |0
+<U00B6> \x14 |1
+<U00B7> \xFA |0
+<U00BA> \xA7 |0
+<U00BB> \xAF |0
+<U00BC> \xAC |0
+<U00BD> \xAB |0
+<U00BF> \xA8 |0
+<U00D1> \xA5 |0
+<U00DF> \xE1 |0
+<U00E1> \xA0 |0
+<U00ED> \xA1 |0
+<U00F1> \xA4 |0
+<U00F3> \xA2 |0
+<U00F7> \xF6 |0
+<U00FA> \xA3 |0
+<U0192> \x9F |0
+<U0393> \xE2 |0
+<U0398> \xE9 |0
+<U03A3> \xE4 |0
+<U03A6> \xE8 |0
+<U03A9> \xEA |0
+<U03B1> \xE0 |0
+<U03B4> \xEB |0
+<U03B5> \xEE |0
+<U03BC> \xE6 |0
+<U03C0> \xE3 |0
+<U03C3> \xE5 |0
+<U03C4> \xE7 |0
+<U03C6> \xED |0
+<U05D0> \x80 |0
+<U05D1> \x81 |0
+<U05D2> \x82 |0
+<U05D3> \x83 |0
+<U05D4> \x84 |0
+<U05D5> \x85 |0
+<U05D6> \x86 |0
+<U05D7> \x87 |0
+<U05D8> \x88 |0
+<U05D9> \x89 |0
+<U05DA> \x8A |0
+<U05DB> \x8B |0
+<U05DC> \x8C |0
+<U05DD> \x8D |0
+<U05DE> \x8E |0
+<U05DF> \x8F |0
+<U05E0> \x90 |0
+<U05E1> \x91 |0
+<U05E2> \x92 |0
+<U05E3> \x93 |0
+<U05E4> \x94 |0
+<U05E5> \x95 |0
+<U05E6> \x96 |0
+<U05E7> \x97 |0
+<U05E8> \x98 |0
+<U05E9> \x99 |0
+<U05EA> \x9A |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U207F> \xFC |0
+<U20A7> \x9E |0
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U2219> \xF9 |0
+<U221A> \xFB |0
+<U221E> \xEC |0
+<U221F> \x1C |1
+<U2229> \xEF |0
+<U2248> \xF7 |0
+<U2261> \xF0 |0
+<U2264> \xF3 |0
+<U2265> \xF2 |0
+<U2302> \x7F |2
+<U2310> \xA9 |0
+<U2320> \xF4 |0
+<U2321> \xF5 |0
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2552> \xD5 |0
+<U2553> \xD6 |0
+<U2554> \xC9 |0
+<U2555> \xB8 |0
+<U2556> \xB7 |0
+<U2557> \xBB |0
+<U2558> \xD4 |0
+<U2559> \xD3 |0
+<U255A> \xC8 |0
+<U255B> \xBE |0
+<U255C> \xBD |0
+<U255D> \xBC |0
+<U255E> \xC6 |0
+<U255F> \xC7 |0
+<U2560> \xCC |0
+<U2561> \xB5 |0
+<U2562> \xB6 |0
+<U2563> \xB9 |0
+<U2564> \xD1 |0
+<U2565> \xD2 |0
+<U2566> \xCB |0
+<U2567> \xCF |0
+<U2568> \xD0 |0
+<U2569> \xCA |0
+<U256A> \xD8 |0
+<U256B> \xD7 |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U258C> \xDD |0
+<U2590> \xDE |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266B> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-864.ucm b/mcs/class/I18N/Rare/ibm-864.ucm
new file mode 100644
index 00000000000..3128d1c227d
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-864.ucm
@@ -0,0 +1,498 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Thu Nov  9 17:44:50 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00360.RXMAP110 and 036034B0.TXMAP110
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-864"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-864
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xA0 |0
+<U00A2> \xC0 |0
+<U00A3> \xA3 |0
+<U00A4> \xA4 |0
+<U00A6> \xDB |0
+<U00A7> \x15 |1
+<U00AB> \x97 |0
+<U00AC> \xDC |0
+<U00AD> \xA1 |0
+<U00B0> \x80 |0
+<U00B1> \x93 |0
+<U00B6> \x14 |1
+<U00B7> \x81 |0
+<U00BB> \x98 |0
+<U00BC> \x95 |0
+<U00BD> \x94 |0
+<U00D7> \xDE |0
+<U00F7> \xDD |0
+<U03B2> \x90 |0
+<U03C6> \x92 |0
+<U060C> \xAC |0
+<U061B> \xBB |0
+<U061F> \xBF |0
+<U0621> \xC1 |1
+<U0622> \xC2 |1
+<U0623> \xC3 |1
+<U0624> \xC4 |1
+<U0626> \xC6 |1
+<U0627> \xC7 |1
+<U0628> \xC8 |1
+<U0629> \xC9 |1
+<U062A> \xCA |1
+<U062B> \xCB |1
+<U062C> \xCC |1
+<U062D> \xCD |1
+<U062E> \xCE |1
+<U062F> \xCF |1
+<U0630> \xD0 |1
+<U0631> \xD1 |1
+<U0632> \xD2 |1
+<U0633> \xD3 |1
+<U0634> \xD4 |1
+<U0635> \xD5 |1
+<U0636> \xD6 |1
+<U0637> \xD7 |1
+<U0638> \xD8 |1
+<U0639> \xD9 |1
+<U063A> \xDA |1
+<U0640> \xE0 |0
+<U0641> \xE1 |1
+<U0642> \xE2 |1
+<U0643> \xE3 |1
+<U0644> \xE4 |1
+<U0645> \xE5 |1
+<U0646> \xE6 |1
+<U0647> \xE7 |1
+<U0648> \xE8 |1
+<U0649> \xE9 |1
+<U064A> \xFD |1
+<U0651> \xF1 |1
+<U0660> \xB0 |0
+<U0661> \xB1 |0
+<U0662> \xB2 |0
+<U0663> \xB3 |0
+<U0664> \xB4 |0
+<U0665> \xB5 |0
+<U0666> \xB6 |0
+<U0667> \xB7 |0
+<U0668> \xB8 |0
+<U0669> \xB9 |0
+<U066A> \x25 |1
+<U066B> \x2C |1
+<U066C> \x2E |1
+<U066D> \x2A |1
+<U200B> \x9F |0
+<U203C> \x13 |1
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U2219> \x82 |0
+<U221A> \x83 |0
+<U221E> \x91 |0
+<U221F> \x1C |1
+<U2248> \x96 |0
+<U2302> \x7F |2
+<U2500> \x85 |0
+<U2502> \x86 |0
+<U250C> \x8D |0
+<U2510> \x8C |0
+<U2514> \x8E |0
+<U2518> \x8F |0
+<U251C> \x8A |0
+<U2524> \x88 |0
+<U252C> \x89 |0
+<U2534> \x8B |0
+<U253C> \x87 |0
+<U2550> \x05 |1
+<U2551> \x06 |1
+<U2554> \x0D |1
+<U2557> \x0C |1
+<U255A> \x0E |1
+<U255D> \x0F |1
+<U2560> \x0A |1
+<U2563> \x08 |1
+<U2566> \x09 |1
+<U2569> \x0B |1
+<U256C> \x07 |1
+<U2592> \x84 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U263A> \x01 |1
+<U263C> \x04 |1
+<U266A> \x02 |1
+<U266C> \x03 |1
+<UFE7C> \xF1 |0
+<UFE7D> \xF0 |0
+<UFE80> \xC1 |0
+<UFE81> \xC2 |0
+<UFE82> \xA2 |0
+<UFE83> \xC3 |0
+<UFE84> \xA5 |0
+<UFE85> \xC4 |0
+<UFE86> \xC4 |1
+<UFE8B> \xC6 |0
+<UFE8C> \xC6 |1
+<UFE8D> \xC7 |0
+<UFE8E> \xA8 |0
+<UFE8F> \xA9 |0
+<UFE90> \xA9 |1
+<UFE91> \xC8 |0
+<UFE92> \xC8 |1
+<UFE93> \xC9 |0
+<UFE94> \xC9 |1
+<UFE95> \xAA |0
+<UFE96> \xAA |1
+<UFE97> \xCA |0
+<UFE98> \xCA |1
+<UFE99> \xAB |0
+<UFE9A> \xAB |1
+<UFE9B> \xCB |0
+<UFE9C> \xCB |1
+<UFE9D> \xAD |0
+<UFE9E> \xAD |1
+<UFE9F> \xCC |0
+<UFEA0> \xCC |1
+<UFEA1> \xAE |0
+<UFEA2> \xAE |1
+<UFEA3> \xCD |0
+<UFEA4> \xCD |1
+<UFEA5> \xAF |0
+<UFEA6> \xAF |1
+<UFEA7> \xCE |0
+<UFEA8> \xCE |1
+<UFEA9> \xCF |0
+<UFEAA> \xCF |1
+<UFEAB> \xD0 |0
+<UFEAC> \xD0 |1
+<UFEAD> \xD1 |0
+<UFEAE> \xD1 |1
+<UFEAF> \xD2 |0
+<UFEB0> \xD2 |1
+<UFEB1> \xBC |0
+<UFEB2> \xBC |1
+<UFEB3> \xD3 |0
+<UFEB4> \xD3 |1
+<UFEB5> \xBD |0
+<UFEB6> \xBD |1
+<UFEB7> \xD4 |0
+<UFEB8> \xD4 |1
+<UFEB9> \xBE |0
+<UFEBA> \xBE |1
+<UFEBB> \xD5 |0
+<UFEBC> \xD5 |1
+<UFEBD> \xEB |0
+<UFEBE> \xEB |1
+<UFEBF> \xD6 |0
+<UFEC0> \xD6 |1
+<UFEC1> \xD7 |1
+<UFEC2> \xD7 |1
+<UFEC3> \xD7 |0
+<UFEC4> \xD7 |1
+<UFEC5> \xD8 |1
+<UFEC6> \xD8 |1
+<UFEC7> \xD8 |0
+<UFEC8> \xD8 |1
+<UFEC9> \xDF |0
+<UFECA> \xC5 |0
+<UFECB> \xD9 |0
+<UFECC> \xEC |0
+<UFECD> \xEE |0
+<UFECE> \xED |0
+<UFECF> \xDA |0
+<UFED0> \xF7 |0
+<UFED1> \xBA |0
+<UFED2> \xBA |1
+<UFED3> \xE1 |0
+<UFED4> \xE1 |1
+<UFED5> \xF8 |0
+<UFED6> \xF8 |1
+<UFED7> \xE2 |0
+<UFED8> \xE2 |1
+<UFED9> \xFC |0
+<UFEDA> \xFC |1
+<UFEDB> \xE3 |0
+<UFEDC> \xE3 |1
+<UFEDD> \xFB |0
+<UFEDE> \xFB |1
+<UFEDF> \xE4 |0
+<UFEE0> \xE4 |1
+<UFEE1> \xEF |0
+<UFEE2> \xEF |1
+<UFEE3> \xE5 |0
+<UFEE4> \xE5 |1
+<UFEE5> \xF2 |0
+<UFEE6> \xF2 |1
+<UFEE7> \xE6 |0
+<UFEE8> \xE6 |1
+<UFEE9> \xF3 |0
+<UFEEA> \xF3 |1
+<UFEEB> \xE7 |0
+<UFEEC> \xF4 |0
+<UFEED> \xE8 |0
+<UFEEE> \xE8 |1
+<UFEEF> \xE9 |0
+<UFEF0> \xF5 |0
+<UFEF1> \xFD |0
+<UFEF2> \xF6 |0
+<UFEF3> \xEA |0
+<UFEF4> \xEA |1
+<UFEF5> \xF9 |0
+<UFEF6> \xFA |0
+<UFEF7> \x99 |0
+<UFEF8> \x9A |0
+<UFEFB> \x9D |0
+<UFEFC> \x9E |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \x86 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-866.ucm b/mcs/class/I18N/Rare/ibm-866.ucm
new file mode 100644
index 00000000000..f8c434d4b84
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-866.ucm
@@ -0,0 +1,416 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:03 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00362.RPMAP100 and 036234B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-866"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-866
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A4> \xFD |0
+<U00A7> \x15 |1
+<U00B0> \xF8 |0
+<U00B6> \x14 |1
+<U00B7> \xFA |0
+<U0401> \xF0 |0
+<U0404> \xF2 |0
+<U0407> \xF4 |0
+<U040E> \xF6 |0
+<U0410> \x80 |0
+<U0411> \x81 |0
+<U0412> \x82 |0
+<U0413> \x83 |0
+<U0414> \x84 |0
+<U0415> \x85 |0
+<U0416> \x86 |0
+<U0417> \x87 |0
+<U0418> \x88 |0
+<U0419> \x89 |0
+<U041A> \x8A |0
+<U041B> \x8B |0
+<U041C> \x8C |0
+<U041D> \x8D |0
+<U041E> \x8E |0
+<U041F> \x8F |0
+<U0420> \x90 |0
+<U0421> \x91 |0
+<U0422> \x92 |0
+<U0423> \x93 |0
+<U0424> \x94 |0
+<U0425> \x95 |0
+<U0426> \x96 |0
+<U0427> \x97 |0
+<U0428> \x98 |0
+<U0429> \x99 |0
+<U042A> \x9A |0
+<U042B> \x9B |0
+<U042C> \x9C |0
+<U042D> \x9D |0
+<U042E> \x9E |0
+<U042F> \x9F |0
+<U0430> \xA0 |0
+<U0431> \xA1 |0
+<U0432> \xA2 |0
+<U0433> \xA3 |0
+<U0434> \xA4 |0
+<U0435> \xA5 |0
+<U0436> \xA6 |0
+<U0437> \xA7 |0
+<U0438> \xA8 |0
+<U0439> \xA9 |0
+<U043A> \xAA |0
+<U043B> \xAB |0
+<U043C> \xAC |0
+<U043D> \xAD |0
+<U043E> \xAE |0
+<U043F> \xAF |0
+<U0440> \xE0 |0
+<U0441> \xE1 |0
+<U0442> \xE2 |0
+<U0443> \xE3 |0
+<U0444> \xE4 |0
+<U0445> \xE5 |0
+<U0446> \xE6 |0
+<U0447> \xE7 |0
+<U0448> \xE8 |0
+<U0449> \xE9 |0
+<U044A> \xEA |0
+<U044B> \xEB |0
+<U044C> \xEC |0
+<U044D> \xED |0
+<U044E> \xEE |0
+<U044F> \xEF |0
+<U0451> \xF1 |0
+<U0454> \xF3 |0
+<U0457> \xF5 |0
+<U045E> \xF7 |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U2116> \xFC |0
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U2219> \xF9 |0
+<U221A> \xFB |0
+<U221F> \x1C |1
+<U2302> \x7F |2
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2552> \xD5 |0
+<U2553> \xD6 |0
+<U2554> \xC9 |0
+<U2555> \xB8 |0
+<U2556> \xB7 |0
+<U2557> \xBB |0
+<U2558> \xD4 |0
+<U2559> \xD3 |0
+<U255A> \xC8 |0
+<U255B> \xBE |0
+<U255C> \xBD |0
+<U255D> \xBC |0
+<U255E> \xC6 |0
+<U255F> \xC7 |0
+<U2560> \xCC |0
+<U2561> \xB5 |0
+<U2562> \xB6 |0
+<U2563> \xB9 |0
+<U2564> \xD1 |0
+<U2565> \xD2 |0
+<U2566> \xCB |0
+<U2567> \xCF |0
+<U2568> \xD0 |0
+<U2569> \xCA |0
+<U256A> \xD8 |0
+<U256B> \xD7 |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U258C> \xDD |0
+<U2590> \xDE |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266B> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-869.ucm b/mcs/class/I18N/Rare/ibm-869.ucm
new file mode 100644
index 00000000000..33eb1d8555f
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-869.ucm
@@ -0,0 +1,408 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:03 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00365.RPMAP100 and 036534B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-869"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-869
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A3> \x9C |0
+<U00A6> \x8A |0
+<U00A7> \xF5 |0
+<U00A8> \xF9 |0
+<U00A9> \x97 |0
+<U00AB> \xAE |0
+<U00AC> \x89 |0
+<U00AD> \xF0 |0
+<U00B0> \xF8 |0
+<U00B1> \xF1 |0
+<U00B2> \x99 |0
+<U00B3> \x9A |0
+<U00B4> \xEF |0
+<U00B6> \x14 |1
+<U00B7> \x88 |1
+<U00BB> \xAF |0
+<U00BD> \xAB |0
+<U0385> \xF7 |0
+<U0386> \x86 |0
+<U0387> \x88 |0
+<U0388> \x8D |0
+<U0389> \x8F |0
+<U038A> \x90 |0
+<U038C> \x92 |0
+<U038E> \x95 |0
+<U038F> \x98 |0
+<U0390> \xA1 |0
+<U0391> \xA4 |0
+<U0392> \xA5 |0
+<U0393> \xA6 |0
+<U0394> \xA7 |0
+<U0395> \xA8 |0
+<U0396> \xA9 |0
+<U0397> \xAA |0
+<U0398> \xAC |0
+<U0399> \xAD |0
+<U039A> \xB5 |0
+<U039B> \xB6 |0
+<U039C> \xB7 |0
+<U039D> \xB8 |0
+<U039E> \xBD |0
+<U039F> \xBE |0
+<U03A0> \xC6 |0
+<U03A1> \xC7 |0
+<U03A3> \xCF |0
+<U03A4> \xD0 |0
+<U03A5> \xD1 |0
+<U03A6> \xD2 |0
+<U03A7> \xD3 |0
+<U03A8> \xD4 |0
+<U03A9> \xD5 |0
+<U03AA> \x91 |0
+<U03AB> \x96 |0
+<U03AC> \x9B |0
+<U03AD> \x9D |0
+<U03AE> \x9E |0
+<U03AF> \x9F |0
+<U03B0> \xFC |0
+<U03B1> \xD6 |0
+<U03B2> \xD7 |0
+<U03B3> \xD8 |0
+<U03B4> \xDD |0
+<U03B5> \xDE |0
+<U03B6> \xE0 |0
+<U03B7> \xE1 |0
+<U03B8> \xE2 |0
+<U03B9> \xE3 |0
+<U03BA> \xE4 |0
+<U03BB> \xE5 |0
+<U03BC> \xE6 |0
+<U03BD> \xE7 |0
+<U03BE> \xE8 |0
+<U03BF> \xE9 |0
+<U03C0> \xEA |0
+<U03C1> \xEB |0
+<U03C2> \xED |0
+<U03C3> \xEC |0
+<U03C4> \xEE |0
+<U03C5> \xF2 |0
+<U03C6> \xF3 |0
+<U03C7> \xF4 |0
+<U03C8> \xF6 |0
+<U03C9> \xFA |0
+<U03CA> \xA0 |0
+<U03CB> \xFB |0
+<U03CC> \xA2 |0
+<U03CD> \xA3 |0
+<U03CE> \xFD |0
+<U03D5> \xF3 |1
+<U2015> \x8E |0
+<U2018> \x8B |0
+<U2019> \x8C |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U221F> \x1C |1
+<U2302> \x7F |2
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2554> \xC9 |0
+<U2557> \xBB |0
+<U255A> \xC8 |0
+<U255D> \xBC |0
+<U2560> \xCC |0
+<U2563> \xB9 |0
+<U2566> \xCB |0
+<U2569> \xCA |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266B> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-870.ucm b/mcs/class/I18N/Rare/ibm-870.ucm
new file mode 100644
index 00000000000..53d0fce869e
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-870.ucm
@@ -0,0 +1,372 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2001, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created by rptp2ucm (compiled on Feb 23 2001)
+# from source files 34B00366.RPMAP100 and 036634B0.TPMAP100
+#
+<code_set_name>               "ibm-870_P100-2000"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+<icu:charsetFamily>           "EBCDIC"
+<icu:alias>                   "ibm-870_STD"
+
+CHARMAP
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x4A |0
+<U005C> \xE0 |0
+<U005D> \x5A |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x6A |0
+<U007D> \xD0 |0
+<U007E> \xA1 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A4> \x9F |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00AD> \xCA |0
+<U00B0> \x90 |0
+<U00B4> \xBE |0
+<U00B8> \x9D |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C4> \x63 |0
+<U00C7> \x68 |0
+<U00C9> \x71 |0
+<U00CB> \x73 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00D0> \xAC |1
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D6> \xEC |0
+<U00D7> \xBF |0
+<U00DA> \xFE |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DF> \x59 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E4> \x43 |0
+<U00E7> \x48 |0
+<U00E9> \x51 |0
+<U00EB> \x53 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F6> \xCC |0
+<U00F7> \xE1 |0
+<U00FA> \xDE |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U0102> \x66 |0
+<U0103> \x46 |0
+<U0104> \xB1 |0
+<U0105> \xA0 |0
+<U0106> \x69 |0
+<U0107> \x49 |0
+<U010C> \x67 |0
+<U010D> \x47 |0
+<U010E> \xFA |0
+<U010F> \xEA |0
+<U0110> \xAC |0
+<U0111> \x8C |0
+<U0118> \x72 |0
+<U0119> \x52 |0
+<U011A> \xDA |0
+<U011B> \xDF |0
+<U0139> \x78 |0
+<U013A> \x58 |0
+<U013D> \x77 |0
+<U013E> \x57 |0
+<U0141> \xBA |0
+<U0142> \x9A |0
+<U0143> \xBB |0
+<U0144> \x9B |0
+<U0147> \xAB |0
+<U0148> \x8B |0
+<U0150> \xEF |0
+<U0151> \xCF |0
+<U0154> \xED |0
+<U0155> \xCD |0
+<U0158> \xAE |0
+<U0159> \x8E |0
+<U015A> \xAA |0
+<U015B> \x8A |0
+<U015E> \xAF |0
+<U015F> \x8F |0
+<U0160> \xBC |0
+<U0161> \x9C |0
+<U0162> \xB3 |0
+<U0163> \x44 |0
+<U0164> \xFD |0
+<U0165> \xDD |0
+<U016E> \x74 |0
+<U016F> \x54 |0
+<U0170> \xFB |0
+<U0171> \xDB |0
+<U0179> \xB9 |0
+<U017A> \xB7 |0
+<U017B> \xB4 |0
+<U017C> \xB2 |0
+<U017D> \xB8 |0
+<U017E> \xB6 |0
+<U02C7> \x70 |0
+<U02D8> \x80 |0
+<U02D9> \xB0 |0
+<U02DB> \x9E |0
+<U02DD> \x64 |0
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x4A |1
+<UFF3C> \xE0 |1
+<UFF3D> \x5A |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x6A |1
+<UFF5D> \xD0 |1
+<UFF5E> \xA1 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-871.ucm b/mcs/class/I18N/Rare/ibm-871.ucm
new file mode 100644
index 00000000000..728990ee788
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-871.ucm
@@ -0,0 +1,379 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:03 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00367.RPMAP100 and 036734B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-871"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-871
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \xAC |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \xAE |0
+<U005C> \xBE |0
+<U005D> \x9E |0
+<U005E> \xEC |0
+<U005F> \x6D |0
+<U0060> \x8C |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \x8E |0
+<U007C> \xBB |0
+<U007D> \x9C |0
+<U007E> \xCC |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x41 |0
+<U00A1> \xAA |0
+<U00A2> \xB0 |0
+<U00A3> \xB1 |0
+<U00A4> \x9F |0
+<U00A5> \xB2 |0
+<U00A6> \x6A |0
+<U00A7> \xB5 |0
+<U00A8> \xBD |0
+<U00A9> \xB4 |0
+<U00AA> \x9A |0
+<U00AB> \x8A |0
+<U00AC> \xBA |0
+<U00AD> \xCA |0
+<U00AE> \xAF |0
+<U00AF> \xBC |0
+<U00B0> \x90 |0
+<U00B1> \x8F |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xE0 |0
+<U00B5> \xA0 |0
+<U00B6> \xB6 |0
+<U00B7> \xB3 |0
+<U00B8> \x9D |0
+<U00B9> \xDA |0
+<U00BA> \x9B |0
+<U00BB> \x8B |0
+<U00BC> \xB7 |0
+<U00BD> \xB8 |0
+<U00BE> \xB9 |0
+<U00BF> \xAB |0
+<U00C0> \x64 |0
+<U00C1> \x65 |0
+<U00C2> \x62 |0
+<U00C3> \x66 |0
+<U00C4> \x63 |0
+<U00C5> \x67 |0
+<U00C6> \x5A |0
+<U00C7> \x68 |0
+<U00C8> \x74 |0
+<U00C9> \x71 |0
+<U00CA> \x72 |0
+<U00CB> \x73 |0
+<U00CC> \x78 |0
+<U00CD> \x75 |0
+<U00CE> \x76 |0
+<U00CF> \x77 |0
+<U00D0> \x7C |0
+<U00D1> \x69 |0
+<U00D2> \xED |0
+<U00D3> \xEE |0
+<U00D4> \xEB |0
+<U00D5> \xEF |0
+<U00D6> \x5F |0
+<U00D7> \xBF |0
+<U00D8> \x80 |0
+<U00D9> \xFD |0
+<U00DA> \xFE |0
+<U00DB> \xFB |0
+<U00DC> \xFC |0
+<U00DD> \xAD |0
+<U00DE> \x4A |0
+<U00DF> \x59 |0
+<U00E0> \x44 |0
+<U00E1> \x45 |0
+<U00E2> \x42 |0
+<U00E3> \x46 |0
+<U00E4> \x43 |0
+<U00E5> \x47 |0
+<U00E6> \xD0 |0
+<U00E7> \x48 |0
+<U00E8> \x54 |0
+<U00E9> \x51 |0
+<U00EA> \x52 |0
+<U00EB> \x53 |0
+<U00EC> \x58 |0
+<U00ED> \x55 |0
+<U00EE> \x56 |0
+<U00EF> \x57 |0
+<U00F0> \x79 |0
+<U00F1> \x49 |0
+<U00F2> \xCD |0
+<U00F3> \xCE |0
+<U00F4> \xCB |0
+<U00F5> \xCF |0
+<U00F6> \xA1 |0
+<U00F7> \xE1 |0
+<U00F8> \x70 |0
+<U00F9> \xDD |0
+<U00FA> \xDE |0
+<U00FB> \xDB |0
+<U00FC> \xDC |0
+<U00FD> \x8D |0
+<U00FE> \xC0 |0
+<U00FF> \xDF |0
+<U0110> \x7C |1
+<U203E> \xBC |1
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \xAC |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \xAE |1
+<UFF3C> \xBE |1
+<UFF3D> \x9E |1
+<UFF3E> \xEC |1
+<UFF3F> \x6D |1
+<UFF40> \x8C |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \x8E |1
+<UFF5C> \xBB |1
+<UFF5D> \x9C |1
+<UFF5E> \xCC |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/ibm-875.ucm b/mcs/class/I18N/Rare/ibm-875.ucm
new file mode 100644
index 00000000000..b9ec20a5a59
--- /dev/null
+++ b/mcs/class/I18N/Rare/ibm-875.ucm
@@ -0,0 +1,367 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2001, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created by rptp2ucm (compiled on Feb 23 2001)
+# from source files 34B0036B.RPMAP100 and 036B34B0.TPMAP100
+#
+<code_set_name>               "ibm-875_P100-2000"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x3F
+<icu:charsetFamily>           "EBCDIC"
+<icu:alias>                   "ibm-875_STD"
+
+CHARMAP
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x37 |0
+<U0005> \x2D |0
+<U0006> \x2E |0
+<U0007> \x2F |0
+<U0008> \x16 |0
+<U0009> \x05 |0
+<U000A> \x25 |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x3C |0
+<U0015> \x3D |0
+<U0016> \x32 |0
+<U0017> \x26 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x3F |0
+<U001B> \x27 |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x40 |0
+<U0021> \x4F |0
+<U0022> \x7F |0
+<U0023> \x7B |0
+<U0024> \x5B |0
+<U0025> \x6C |0
+<U0026> \x50 |0
+<U0027> \x7D |0
+<U0028> \x4D |0
+<U0029> \x5D |0
+<U002A> \x5C |0
+<U002B> \x4E |0
+<U002C> \x6B |0
+<U002D> \x60 |0
+<U002E> \x4B |0
+<U002F> \x61 |0
+<U0030> \xF0 |0
+<U0031> \xF1 |0
+<U0032> \xF2 |0
+<U0033> \xF3 |0
+<U0034> \xF4 |0
+<U0035> \xF5 |0
+<U0036> \xF6 |0
+<U0037> \xF7 |0
+<U0038> \xF8 |0
+<U0039> \xF9 |0
+<U003A> \x7A |0
+<U003B> \x5E |0
+<U003C> \x4C |0
+<U003D> \x7E |0
+<U003E> \x6E |0
+<U003F> \x6F |0
+<U0040> \x7C |0
+<U0041> \xC1 |0
+<U0042> \xC2 |0
+<U0043> \xC3 |0
+<U0044> \xC4 |0
+<U0045> \xC5 |0
+<U0046> \xC6 |0
+<U0047> \xC7 |0
+<U0048> \xC8 |0
+<U0049> \xC9 |0
+<U004A> \xD1 |0
+<U004B> \xD2 |0
+<U004C> \xD3 |0
+<U004D> \xD4 |0
+<U004E> \xD5 |0
+<U004F> \xD6 |0
+<U0050> \xD7 |0
+<U0051> \xD8 |0
+<U0052> \xD9 |0
+<U0053> \xE2 |0
+<U0054> \xE3 |0
+<U0055> \xE4 |0
+<U0056> \xE5 |0
+<U0057> \xE6 |0
+<U0058> \xE7 |0
+<U0059> \xE8 |0
+<U005A> \xE9 |0
+<U005B> \x4A |0
+<U005C> \xE0 |0
+<U005D> \x5A |0
+<U005E> \x5F |0
+<U005F> \x6D |0
+<U0060> \x79 |0
+<U0061> \x81 |0
+<U0062> \x82 |0
+<U0063> \x83 |0
+<U0064> \x84 |0
+<U0065> \x85 |0
+<U0066> \x86 |0
+<U0067> \x87 |0
+<U0068> \x88 |0
+<U0069> \x89 |0
+<U006A> \x91 |0
+<U006B> \x92 |0
+<U006C> \x93 |0
+<U006D> \x94 |0
+<U006E> \x95 |0
+<U006F> \x96 |0
+<U0070> \x97 |0
+<U0071> \x98 |0
+<U0072> \x99 |0
+<U0073> \xA2 |0
+<U0074> \xA3 |0
+<U0075> \xA4 |0
+<U0076> \xA5 |0
+<U0077> \xA6 |0
+<U0078> \xA7 |0
+<U0079> \xA8 |0
+<U007A> \xA9 |0
+<U007B> \xC0 |0
+<U007C> \x6A |0
+<U007D> \xD0 |0
+<U007E> \xA1 |0
+<U007F> \x07 |0
+<U0080> \x20 |0
+<U0081> \x21 |0
+<U0082> \x22 |0
+<U0083> \x23 |0
+<U0084> \x24 |0
+<U0085> \x15 |0
+<U0086> \x06 |0
+<U0087> \x17 |0
+<U0088> \x28 |0
+<U0089> \x29 |0
+<U008A> \x2A |0
+<U008B> \x2B |0
+<U008C> \x2C |0
+<U008D> \x09 |0
+<U008E> \x0A |0
+<U008F> \x1B |0
+<U0090> \x30 |0
+<U0091> \x31 |0
+<U0092> \x1A |0
+<U0093> \x33 |0
+<U0094> \x34 |0
+<U0095> \x35 |0
+<U0096> \x36 |0
+<U0097> \x08 |0
+<U0098> \x38 |0
+<U0099> \x39 |0
+<U009A> \x3A |0
+<U009B> \x3B |0
+<U009C> \x04 |0
+<U009D> \x14 |0
+<U009E> \x3E |0
+<U009F> \xFF |0
+<U00A0> \x74 |0
+<U00A3> \xB0 |0
+<U00A6> \xDF |0
+<U00A7> \xEB |0
+<U00A8> \x70 |0
+<U00A9> \xFB |0
+<U00AB> \xEE |0
+<U00AC> \xEF |0
+<U00AD> \xCA |0
+<U00B0> \x90 |0
+<U00B1> \xDA |0
+<U00B2> \xEA |0
+<U00B3> \xFA |0
+<U00B4> \xA0 |0
+<U00B7> \xDD |1
+<U00BB> \xFE |0
+<U00BD> \xDB |0
+<U0385> \x80 |0
+<U0386> \x71 |0
+<U0387> \xDD |0
+<U0388> \x72 |0
+<U0389> \x73 |0
+<U038A> \x75 |0
+<U038C> \x76 |0
+<U038E> \x77 |0
+<U038F> \x78 |0
+<U0390> \xCC |0
+<U0391> \x41 |0
+<U0392> \x42 |0
+<U0393> \x43 |0
+<U0394> \x44 |0
+<U0395> \x45 |0
+<U0396> \x46 |0
+<U0397> \x47 |0
+<U0398> \x48 |0
+<U0399> \x49 |0
+<U039A> \x51 |0
+<U039B> \x52 |0
+<U039C> \x53 |0
+<U039D> \x54 |0
+<U039E> \x55 |0
+<U039F> \x56 |0
+<U03A0> \x57 |0
+<U03A1> \x58 |0
+<U03A3> \x59 |0
+<U03A4> \x62 |0
+<U03A5> \x63 |0
+<U03A6> \x64 |0
+<U03A7> \x65 |0
+<U03A8> \x66 |0
+<U03A9> \x67 |0
+<U03AA> \x68 |0
+<U03AB> \x69 |0
+<U03AC> \xB1 |0
+<U03AD> \xB2 |0
+<U03AE> \xB3 |0
+<U03AF> \xB5 |0
+<U03B0> \xCD |0
+<U03B1> \x8A |0
+<U03B2> \x8B |0
+<U03B3> \x8C |0
+<U03B4> \x8D |0
+<U03B5> \x8E |0
+<U03B6> \x8F |0
+<U03B7> \x9A |0
+<U03B8> \x9B |0
+<U03B9> \x9C |0
+<U03BA> \x9D |0
+<U03BB> \x9E |0
+<U03BC> \x9F |0
+<U03BD> \xAA |0
+<U03BE> \xAB |0
+<U03BF> \xAC |0
+<U03C0> \xAD |0
+<U03C1> \xAE |0
+<U03C2> \xBA |0
+<U03C3> \xAF |0
+<U03C4> \xBB |0
+<U03C5> \xBC |0
+<U03C6> \xBD |0
+<U03C7> \xBE |0
+<U03C8> \xBF |0
+<U03C9> \xCB |0
+<U03CA> \xB4 |0
+<U03CB> \xB8 |0
+<U03CC> \xB6 |0
+<U03CD> \xB7 |0
+<U03CE> \xB9 |0
+<U03D5> \xBD |1
+<U2015> \xCF |0
+<U2018> \xCE |0
+<U2019> \xDE |0
+<UFF01> \x4F |1
+<UFF02> \x7F |1
+<UFF03> \x7B |1
+<UFF04> \x5B |1
+<UFF05> \x6C |1
+<UFF06> \x50 |1
+<UFF07> \x7D |1
+<UFF08> \x4D |1
+<UFF09> \x5D |1
+<UFF0A> \x5C |1
+<UFF0B> \x4E |1
+<UFF0C> \x6B |1
+<UFF0D> \x60 |1
+<UFF0E> \x4B |1
+<UFF0F> \x61 |1
+<UFF10> \xF0 |1
+<UFF11> \xF1 |1
+<UFF12> \xF2 |1
+<UFF13> \xF3 |1
+<UFF14> \xF4 |1
+<UFF15> \xF5 |1
+<UFF16> \xF6 |1
+<UFF17> \xF7 |1
+<UFF18> \xF8 |1
+<UFF19> \xF9 |1
+<UFF1A> \x7A |1
+<UFF1B> \x5E |1
+<UFF1C> \x4C |1
+<UFF1D> \x7E |1
+<UFF1E> \x6E |1
+<UFF1F> \x6F |1
+<UFF20> \x7C |1
+<UFF21> \xC1 |1
+<UFF22> \xC2 |1
+<UFF23> \xC3 |1
+<UFF24> \xC4 |1
+<UFF25> \xC5 |1
+<UFF26> \xC6 |1
+<UFF27> \xC7 |1
+<UFF28> \xC8 |1
+<UFF29> \xC9 |1
+<UFF2A> \xD1 |1
+<UFF2B> \xD2 |1
+<UFF2C> \xD3 |1
+<UFF2D> \xD4 |1
+<UFF2E> \xD5 |1
+<UFF2F> \xD6 |1
+<UFF30> \xD7 |1
+<UFF31> \xD8 |1
+<UFF32> \xD9 |1
+<UFF33> \xE2 |1
+<UFF34> \xE3 |1
+<UFF35> \xE4 |1
+<UFF36> \xE5 |1
+<UFF37> \xE6 |1
+<UFF38> \xE7 |1
+<UFF39> \xE8 |1
+<UFF3A> \xE9 |1
+<UFF3B> \x4A |1
+<UFF3C> \xE0 |1
+<UFF3D> \x5A |1
+<UFF3E> \x5F |1
+<UFF3F> \x6D |1
+<UFF40> \x79 |1
+<UFF41> \x81 |1
+<UFF42> \x82 |1
+<UFF43> \x83 |1
+<UFF44> \x84 |1
+<UFF45> \x85 |1
+<UFF46> \x86 |1
+<UFF47> \x87 |1
+<UFF48> \x88 |1
+<UFF49> \x89 |1
+<UFF4A> \x91 |1
+<UFF4B> \x92 |1
+<UFF4C> \x93 |1
+<UFF4D> \x94 |1
+<UFF4E> \x95 |1
+<UFF4F> \x96 |1
+<UFF50> \x97 |1
+<UFF51> \x98 |1
+<UFF52> \x99 |1
+<UFF53> \xA2 |1
+<UFF54> \xA3 |1
+<UFF55> \xA4 |1
+<UFF56> \xA5 |1
+<UFF57> \xA6 |1
+<UFF58> \xA7 |1
+<UFF59> \xA8 |1
+<UFF5A> \xA9 |1
+<UFF5B> \xC0 |1
+<UFF5C> \x6A |1
+<UFF5D> \xD0 |1
+<UFF5E> \xA1 |1
+END CHARMAP
diff --git a/mcs/class/I18N/Rare/list.unix b/mcs/class/I18N/Rare/list.unix
new file mode 100755
index 00000000000..90b9ffa89ca
--- /dev/null
+++ b/mcs/class/I18N/Rare/list.unix
@@ -0,0 +1,37 @@
+CP866.cs
+CP1026.cs
+CP869.cs
+CP870.cs
+CP875.cs
+CP1047.cs
+CP1140.cs
+CP1141.cs
+CP1142.cs
+CP1143.cs
+CP1144.cs
+CP1145.cs
+CP1146.cs
+CP1147.cs
+CP1148.cs
+CP1149.cs
+CP20273.cs
+CP20277.cs
+CP20278.cs
+CP20280.cs
+CP20284.cs
+CP20285.cs
+CP20290.cs
+CP20297.cs
+CP20420.cs
+CP20424.cs
+CP20871.cs
+CP21025.cs
+CP37.cs
+CP500.cs
+CP708.cs
+CP852.cs
+CP855.cs
+CP857.cs
+CP858.cs
+CP862.cs
+CP864.cs
diff --git a/mcs/class/I18N/Rare/makefile.gnu b/mcs/class/I18N/Rare/makefile.gnu
new file mode 100755
index 00000000000..85442fbc3eb
--- /dev/null
+++ b/mcs/class/I18N/Rare/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../../..
+
+LIBRARY = ../../lib/I18N.Rare.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib -r mscorlib -r I18N
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=
+
+export MONO_PATH_PREFIX = ../../lib:
+
+include ../../library.make
diff --git a/mcs/class/I18N/West/CP10000.cs b/mcs/class/I18N/West/CP10000.cs
new file mode 100644
index 00000000000..3cd1c00b203
--- /dev/null
+++ b/mcs/class/I18N/West/CP10000.cs
@@ -0,0 +1,405 @@
+/*
+ * CP10000.cs - Western European (Mac) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-1275.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP10000 : ByteEncoding
+{
+	public CP10000()
+		: base(10000, ToChars, "Western European (Mac)",
+		       "macintosh", "macintosh", "macintosh",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u00C4', '\u00C5', '\u00C7', '\u00C9', 
+		'\u00D1', '\u00D6', '\u00DC', '\u00E1', '\u00E0', '\u00E2', 
+		'\u00E4', '\u00E3', '\u00E5', '\u00E7', '\u00E9', '\u00E8', 
+		'\u00EA', '\u00EB', '\u00ED', '\u00EC', '\u00EE', '\u00EF', 
+		'\u00F1', '\u00F3', '\u00F2', '\u00F4', '\u00F6', '\u00F5', 
+		'\u00FA', '\u00F9', '\u00FB', '\u00FC', '\u2020', '\u00B0', 
+		'\u00A2', '\u00A3', '\u00A7', '\u2022', '\u00B6', '\u00DF', 
+		'\u00AE', '\u00A9', '\u2122', '\u00B4', '\u00A8', '\u2260', 
+		'\u00C6', '\u00D8', '\u221E', '\u00B1', '\u2264', '\u2265', 
+		'\u00A5', '\u00B5', '\u2202', '\u2211', '\u220F', '\u03C0', 
+		'\u222B', '\u00AA', '\u00BA', '\u2126', '\u00E6', '\u00F8', 
+		'\u00BF', '\u00A1', '\u00AC', '\u221A', '\u0192', '\u2248', 
+		'\u2206', '\u00AB', '\u00BB', '\u2026', '\u00A0', '\u00C0', 
+		'\u00C3', '\u00D5', '\u0152', '\u0153', '\u2013', '\u2014', 
+		'\u201C', '\u201D', '\u2018', '\u2019', '\u00F7', '\u25CA', 
+		'\u00FF', '\u0178', '\u2044', '\u00A4', '\u2039', '\u203A', 
+		'\uFB01', '\uFB02', '\u2021', '\u00B7', '\u201A', '\u201E', 
+		'\u2030', '\u00C2', '\u00CA', '\u00C1', '\u00CB', '\u00C8', 
+		'\u00CD', '\u00CE', '\u00CF', '\u00CC', '\u00D3', '\u00D4', 
+		'\uF8FF', '\u00D2', '\u00DA', '\u00DB', '\u00D9', '\u0131', 
+		'\u02C6', '\u02DC', '\u00AF', '\u02D8', '\u02D9', '\u02DA', 
+		'\u00B8', '\u02DD', '\u02DB', '\u02C7', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A9:
+				case 0x00B1:
+				case 0x00B5:
+					break;
+				case 0x00A0: ch = 0xCA; break;
+				case 0x00A1: ch = 0xC1; break;
+				case 0x00A4: ch = 0xDB; break;
+				case 0x00A5: ch = 0xB4; break;
+				case 0x00A7: ch = 0xA4; break;
+				case 0x00A8: ch = 0xAC; break;
+				case 0x00AA: ch = 0xBB; break;
+				case 0x00AB: ch = 0xC7; break;
+				case 0x00AC: ch = 0xC2; break;
+				case 0x00AE: ch = 0xA8; break;
+				case 0x00AF: ch = 0xF8; break;
+				case 0x00B0: ch = 0xA1; break;
+				case 0x00B4: ch = 0xAB; break;
+				case 0x00B6: ch = 0xA6; break;
+				case 0x00B7: ch = 0xE1; break;
+				case 0x00B8: ch = 0xFC; break;
+				case 0x00BA: ch = 0xBC; break;
+				case 0x00BB: ch = 0xC8; break;
+				case 0x00BF: ch = 0xC0; break;
+				case 0x00C0: ch = 0xCB; break;
+				case 0x00C1: ch = 0xE7; break;
+				case 0x00C2: ch = 0xE5; break;
+				case 0x00C3: ch = 0xCC; break;
+				case 0x00C4: ch = 0x80; break;
+				case 0x00C5: ch = 0x81; break;
+				case 0x00C6: ch = 0xAE; break;
+				case 0x00C7: ch = 0x82; break;
+				case 0x00C8: ch = 0xE9; break;
+				case 0x00C9: ch = 0x83; break;
+				case 0x00CA: ch = 0xE6; break;
+				case 0x00CB: ch = 0xE8; break;
+				case 0x00CC: ch = 0xED; break;
+				case 0x00CD: ch = 0xEA; break;
+				case 0x00CE: ch = 0xEB; break;
+				case 0x00CF: ch = 0xEC; break;
+				case 0x00D1: ch = 0x84; break;
+				case 0x00D2: ch = 0xF1; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEF; break;
+				case 0x00D5: ch = 0xCD; break;
+				case 0x00D6: ch = 0x85; break;
+				case 0x00D8: ch = 0xAF; break;
+				case 0x00D9: ch = 0xF4; break;
+				case 0x00DA: ch = 0xF2; break;
+				case 0x00DB: ch = 0xF3; break;
+				case 0x00DC: ch = 0x86; break;
+				case 0x00DF: ch = 0xA7; break;
+				case 0x00E0: ch = 0x88; break;
+				case 0x00E1: ch = 0x87; break;
+				case 0x00E2: ch = 0x89; break;
+				case 0x00E3: ch = 0x8B; break;
+				case 0x00E4: ch = 0x8A; break;
+				case 0x00E5: ch = 0x8C; break;
+				case 0x00E6: ch = 0xBE; break;
+				case 0x00E7: ch = 0x8D; break;
+				case 0x00E8: ch = 0x8F; break;
+				case 0x00E9: ch = 0x8E; break;
+				case 0x00EA: ch = 0x90; break;
+				case 0x00EB: ch = 0x91; break;
+				case 0x00EC: ch = 0x93; break;
+				case 0x00ED: ch = 0x92; break;
+				case 0x00EE: ch = 0x94; break;
+				case 0x00EF: ch = 0x95; break;
+				case 0x00F1: ch = 0x96; break;
+				case 0x00F2: ch = 0x98; break;
+				case 0x00F3: ch = 0x97; break;
+				case 0x00F4: ch = 0x99; break;
+				case 0x00F5: ch = 0x9B; break;
+				case 0x00F6: ch = 0x9A; break;
+				case 0x00F7: ch = 0xD6; break;
+				case 0x00F8: ch = 0xBF; break;
+				case 0x00F9: ch = 0x9D; break;
+				case 0x00FA: ch = 0x9C; break;
+				case 0x00FB: ch = 0x9E; break;
+				case 0x00FC: ch = 0x9F; break;
+				case 0x00FF: ch = 0xD8; break;
+				case 0x0131: ch = 0xF5; break;
+				case 0x0152: ch = 0xCE; break;
+				case 0x0153: ch = 0xCF; break;
+				case 0x0178: ch = 0xD9; break;
+				case 0x0192: ch = 0xC4; break;
+				case 0x02C6: ch = 0xF6; break;
+				case 0x02C7: ch = 0xFF; break;
+				case 0x02D8: ch = 0xF9; break;
+				case 0x02D9: ch = 0xFA; break;
+				case 0x02DA: ch = 0xFB; break;
+				case 0x02DB: ch = 0xFE; break;
+				case 0x02DC: ch = 0xF7; break;
+				case 0x02DD: ch = 0xFD; break;
+				case 0x03C0: ch = 0xB9; break;
+				case 0x2013: ch = 0xD0; break;
+				case 0x2014: ch = 0xD1; break;
+				case 0x2018: ch = 0xD4; break;
+				case 0x2019: ch = 0xD5; break;
+				case 0x201A: ch = 0xE2; break;
+				case 0x201C: ch = 0xD2; break;
+				case 0x201D: ch = 0xD3; break;
+				case 0x201E: ch = 0xE3; break;
+				case 0x2020: ch = 0xA0; break;
+				case 0x2021: ch = 0xE0; break;
+				case 0x2022: ch = 0xA5; break;
+				case 0x2026: ch = 0xC9; break;
+				case 0x2030: ch = 0xE4; break;
+				case 0x2039: ch = 0xDC; break;
+				case 0x203A: ch = 0xDD; break;
+				case 0x2044: ch = 0xDA; break;
+				case 0x2122: ch = 0xAA; break;
+				case 0x2126: ch = 0xBD; break;
+				case 0x2202: ch = 0xB6; break;
+				case 0x2206: ch = 0xC6; break;
+				case 0x220F: ch = 0xB8; break;
+				case 0x2211: ch = 0xB7; break;
+				case 0x221A: ch = 0xC3; break;
+				case 0x221E: ch = 0xB0; break;
+				case 0x222B: ch = 0xBA; break;
+				case 0x2248: ch = 0xC5; break;
+				case 0x2260: ch = 0xAD; break;
+				case 0x2264: ch = 0xB2; break;
+				case 0x2265: ch = 0xB3; break;
+				case 0x2318: ch = 0x11; break;
+				case 0x25CA: ch = 0xD7; break;
+				case 0x2666: ch = 0x13; break;
+				case 0x2713: ch = 0x12; break;
+				case 0xF8FF: ch = 0xF0; break;
+				case 0xFB01: ch = 0xDE; break;
+				case 0xFB02: ch = 0xDF; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A9:
+				case 0x00B1:
+				case 0x00B5:
+					break;
+				case 0x00A0: ch = 0xCA; break;
+				case 0x00A1: ch = 0xC1; break;
+				case 0x00A4: ch = 0xDB; break;
+				case 0x00A5: ch = 0xB4; break;
+				case 0x00A7: ch = 0xA4; break;
+				case 0x00A8: ch = 0xAC; break;
+				case 0x00AA: ch = 0xBB; break;
+				case 0x00AB: ch = 0xC7; break;
+				case 0x00AC: ch = 0xC2; break;
+				case 0x00AE: ch = 0xA8; break;
+				case 0x00AF: ch = 0xF8; break;
+				case 0x00B0: ch = 0xA1; break;
+				case 0x00B4: ch = 0xAB; break;
+				case 0x00B6: ch = 0xA6; break;
+				case 0x00B7: ch = 0xE1; break;
+				case 0x00B8: ch = 0xFC; break;
+				case 0x00BA: ch = 0xBC; break;
+				case 0x00BB: ch = 0xC8; break;
+				case 0x00BF: ch = 0xC0; break;
+				case 0x00C0: ch = 0xCB; break;
+				case 0x00C1: ch = 0xE7; break;
+				case 0x00C2: ch = 0xE5; break;
+				case 0x00C3: ch = 0xCC; break;
+				case 0x00C4: ch = 0x80; break;
+				case 0x00C5: ch = 0x81; break;
+				case 0x00C6: ch = 0xAE; break;
+				case 0x00C7: ch = 0x82; break;
+				case 0x00C8: ch = 0xE9; break;
+				case 0x00C9: ch = 0x83; break;
+				case 0x00CA: ch = 0xE6; break;
+				case 0x00CB: ch = 0xE8; break;
+				case 0x00CC: ch = 0xED; break;
+				case 0x00CD: ch = 0xEA; break;
+				case 0x00CE: ch = 0xEB; break;
+				case 0x00CF: ch = 0xEC; break;
+				case 0x00D1: ch = 0x84; break;
+				case 0x00D2: ch = 0xF1; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEF; break;
+				case 0x00D5: ch = 0xCD; break;
+				case 0x00D6: ch = 0x85; break;
+				case 0x00D8: ch = 0xAF; break;
+				case 0x00D9: ch = 0xF4; break;
+				case 0x00DA: ch = 0xF2; break;
+				case 0x00DB: ch = 0xF3; break;
+				case 0x00DC: ch = 0x86; break;
+				case 0x00DF: ch = 0xA7; break;
+				case 0x00E0: ch = 0x88; break;
+				case 0x00E1: ch = 0x87; break;
+				case 0x00E2: ch = 0x89; break;
+				case 0x00E3: ch = 0x8B; break;
+				case 0x00E4: ch = 0x8A; break;
+				case 0x00E5: ch = 0x8C; break;
+				case 0x00E6: ch = 0xBE; break;
+				case 0x00E7: ch = 0x8D; break;
+				case 0x00E8: ch = 0x8F; break;
+				case 0x00E9: ch = 0x8E; break;
+				case 0x00EA: ch = 0x90; break;
+				case 0x00EB: ch = 0x91; break;
+				case 0x00EC: ch = 0x93; break;
+				case 0x00ED: ch = 0x92; break;
+				case 0x00EE: ch = 0x94; break;
+				case 0x00EF: ch = 0x95; break;
+				case 0x00F1: ch = 0x96; break;
+				case 0x00F2: ch = 0x98; break;
+				case 0x00F3: ch = 0x97; break;
+				case 0x00F4: ch = 0x99; break;
+				case 0x00F5: ch = 0x9B; break;
+				case 0x00F6: ch = 0x9A; break;
+				case 0x00F7: ch = 0xD6; break;
+				case 0x00F8: ch = 0xBF; break;
+				case 0x00F9: ch = 0x9D; break;
+				case 0x00FA: ch = 0x9C; break;
+				case 0x00FB: ch = 0x9E; break;
+				case 0x00FC: ch = 0x9F; break;
+				case 0x00FF: ch = 0xD8; break;
+				case 0x0131: ch = 0xF5; break;
+				case 0x0152: ch = 0xCE; break;
+				case 0x0153: ch = 0xCF; break;
+				case 0x0178: ch = 0xD9; break;
+				case 0x0192: ch = 0xC4; break;
+				case 0x02C6: ch = 0xF6; break;
+				case 0x02C7: ch = 0xFF; break;
+				case 0x02D8: ch = 0xF9; break;
+				case 0x02D9: ch = 0xFA; break;
+				case 0x02DA: ch = 0xFB; break;
+				case 0x02DB: ch = 0xFE; break;
+				case 0x02DC: ch = 0xF7; break;
+				case 0x02DD: ch = 0xFD; break;
+				case 0x03C0: ch = 0xB9; break;
+				case 0x2013: ch = 0xD0; break;
+				case 0x2014: ch = 0xD1; break;
+				case 0x2018: ch = 0xD4; break;
+				case 0x2019: ch = 0xD5; break;
+				case 0x201A: ch = 0xE2; break;
+				case 0x201C: ch = 0xD2; break;
+				case 0x201D: ch = 0xD3; break;
+				case 0x201E: ch = 0xE3; break;
+				case 0x2020: ch = 0xA0; break;
+				case 0x2021: ch = 0xE0; break;
+				case 0x2022: ch = 0xA5; break;
+				case 0x2026: ch = 0xC9; break;
+				case 0x2030: ch = 0xE4; break;
+				case 0x2039: ch = 0xDC; break;
+				case 0x203A: ch = 0xDD; break;
+				case 0x2044: ch = 0xDA; break;
+				case 0x2122: ch = 0xAA; break;
+				case 0x2126: ch = 0xBD; break;
+				case 0x2202: ch = 0xB6; break;
+				case 0x2206: ch = 0xC6; break;
+				case 0x220F: ch = 0xB8; break;
+				case 0x2211: ch = 0xB7; break;
+				case 0x221A: ch = 0xC3; break;
+				case 0x221E: ch = 0xB0; break;
+				case 0x222B: ch = 0xBA; break;
+				case 0x2248: ch = 0xC5; break;
+				case 0x2260: ch = 0xAD; break;
+				case 0x2264: ch = 0xB2; break;
+				case 0x2265: ch = 0xB3; break;
+				case 0x2318: ch = 0x11; break;
+				case 0x25CA: ch = 0xD7; break;
+				case 0x2666: ch = 0x13; break;
+				case 0x2713: ch = 0x12; break;
+				case 0xF8FF: ch = 0xF0; break;
+				case 0xFB01: ch = 0xDE; break;
+				case 0xFB02: ch = 0xDF; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP10000
+
+public class ENCmacintosh : CP10000
+{
+	public ENCmacintosh() : base() {}
+
+}; // class ENCmacintosh
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP10079.cs b/mcs/class/I18N/West/CP10079.cs
new file mode 100644
index 00000000000..3c2d04e67d5
--- /dev/null
+++ b/mcs/class/I18N/West/CP10079.cs
@@ -0,0 +1,381 @@
+/*
+ * CP10079.cs - Icelandic (Mac) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "mac-is.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP10079 : ByteEncoding
+{
+	public CP10079()
+		: base(10079, ToChars, "Icelandic (Mac)",
+		       "x-mac-icelandic", "x-mac-icelandic", "x-mac-icelandic",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u00C4', '\u00C5', '\u00C7', '\u00C9', 
+		'\u00D1', '\u00D6', '\u00DC', '\u00E1', '\u00E0', '\u00E2', 
+		'\u00E4', '\u00E3', '\u00E5', '\u00E7', '\u00E9', '\u00E8', 
+		'\u00EA', '\u00EB', '\u00ED', '\u00EC', '\u00EE', '\u00EF', 
+		'\u00F1', '\u00F3', '\u00F2', '\u00F4', '\u00F6', '\u00F5', 
+		'\u00FA', '\u00F9', '\u00FB', '\u00FC', '\u2020', '\u00B0', 
+		'\u00A2', '\u00A3', '\u00A7', '\u2022', '\u00B6', '\u00DF', 
+		'\u00AE', '\u00A9', '\u2122', '\u00B4', '\u00A8', '\u2260', 
+		'\u00C6', '\u00D8', '\u221E', '\u00B1', '\u2264', '\u2265', 
+		'\u00A5', '\u00B5', '\u2202', '\u2211', '\u220F', '\u03C0', 
+		'\u222B', '\u00AA', '\u00BA', '\u03A9', '\u00E6', '\u00F8', 
+		'\u00BF', '\u00A1', '\u00AC', '\u221A', '\u0192', '\u2248', 
+		'\u0394', '\u00AB', '\u00BB', '\u2026', '\u00A0', '\u00C0', 
+		'\u00C3', '\u00D5', '\u0152', '\u0153', '\u2014', '\u2013', 
+		'\u201C', '\u201D', '\u2018', '\u2019', '\u00F7', '\u25C6', 
+		'\u00FF', '\u0178', '\u2044', '\u00A4', '\u0110', '\u0111', 
+		'\u00DE', '\u00FE', '\u2021', '\u00B7', '\u201A', '\u201E', 
+		'\u2030', '\u00C2', '\u00CA', '\u00C1', '\u00CB', '\u00C8', 
+		'\u00CD', '\u00CE', '\u00CF', '\u00CC', '\u00D3', '\u00D4', 
+		'\uE01E', '\u00D2', '\u00DA', '\u00DB', '\u00D9', '\u0131', 
+		'\u003F', '\u003F', '\u00AF', '\u02D8', '\u02D9', '\u02DA', 
+		'\u00B8', '\u02DD', '\u02DB', '\u02C7', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A9:
+				case 0x00B1:
+				case 0x00B5:
+				case 0x00DE:
+					break;
+				case 0x00A0: ch = 0xCA; break;
+				case 0x00A1: ch = 0xC1; break;
+				case 0x00A4: ch = 0xDB; break;
+				case 0x00A5: ch = 0xB4; break;
+				case 0x00A7: ch = 0xA4; break;
+				case 0x00A8: ch = 0xAC; break;
+				case 0x00AA: ch = 0xBB; break;
+				case 0x00AB: ch = 0xC7; break;
+				case 0x00AC: ch = 0xC2; break;
+				case 0x00AE: ch = 0xA8; break;
+				case 0x00AF: ch = 0xF8; break;
+				case 0x00B0: ch = 0xA1; break;
+				case 0x00B4: ch = 0xAB; break;
+				case 0x00B6: ch = 0xA6; break;
+				case 0x00B7: ch = 0xE1; break;
+				case 0x00B8: ch = 0xFC; break;
+				case 0x00BA: ch = 0xBC; break;
+				case 0x00BB: ch = 0xC8; break;
+				case 0x00BF: ch = 0xC0; break;
+				case 0x00C0: ch = 0xCB; break;
+				case 0x00C1: ch = 0xE7; break;
+				case 0x00C2: ch = 0xE5; break;
+				case 0x00C3: ch = 0xCC; break;
+				case 0x00C4: ch = 0x80; break;
+				case 0x00C5: ch = 0x81; break;
+				case 0x00C6: ch = 0xAE; break;
+				case 0x00C7: ch = 0x82; break;
+				case 0x00C8: ch = 0xE9; break;
+				case 0x00C9: ch = 0x83; break;
+				case 0x00CA: ch = 0xE6; break;
+				case 0x00CB: ch = 0xE8; break;
+				case 0x00CC: ch = 0xED; break;
+				case 0x00CD: ch = 0xEA; break;
+				case 0x00CE: ch = 0xEB; break;
+				case 0x00CF: ch = 0xEC; break;
+				case 0x00D1: ch = 0x84; break;
+				case 0x00D2: ch = 0xF1; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEF; break;
+				case 0x00D5: ch = 0xCD; break;
+				case 0x00D6: ch = 0x85; break;
+				case 0x00D8: ch = 0xAF; break;
+				case 0x00D9: ch = 0xF4; break;
+				case 0x00DA: ch = 0xF2; break;
+				case 0x00DB: ch = 0xF3; break;
+				case 0x00DC: ch = 0x86; break;
+				case 0x00DF: ch = 0xA7; break;
+				case 0x00E0: ch = 0x88; break;
+				case 0x00E1: ch = 0x87; break;
+				case 0x00E2: ch = 0x89; break;
+				case 0x00E3: ch = 0x8B; break;
+				case 0x00E4: ch = 0x8A; break;
+				case 0x00E5: ch = 0x8C; break;
+				case 0x00E6: ch = 0xBE; break;
+				case 0x00E7: ch = 0x8D; break;
+				case 0x00E8: ch = 0x8F; break;
+				case 0x00E9: ch = 0x8E; break;
+				case 0x00EA: ch = 0x90; break;
+				case 0x00EB: ch = 0x91; break;
+				case 0x00EC: ch = 0x93; break;
+				case 0x00ED: ch = 0x92; break;
+				case 0x00EE: ch = 0x94; break;
+				case 0x00EF: ch = 0x95; break;
+				case 0x00F1: ch = 0x96; break;
+				case 0x00F2: ch = 0x98; break;
+				case 0x00F3: ch = 0x97; break;
+				case 0x00F4: ch = 0x99; break;
+				case 0x00F5: ch = 0x9B; break;
+				case 0x00F6: ch = 0x9A; break;
+				case 0x00F7: ch = 0xD6; break;
+				case 0x00F8: ch = 0xBF; break;
+				case 0x00F9: ch = 0x9D; break;
+				case 0x00FA: ch = 0x9C; break;
+				case 0x00FB: ch = 0x9E; break;
+				case 0x00FC: ch = 0x9F; break;
+				case 0x00FE: ch = 0xDF; break;
+				case 0x00FF: ch = 0xD8; break;
+				case 0x0110: ch = 0xDC; break;
+				case 0x0111: ch = 0xDD; break;
+				case 0x0131: ch = 0xF5; break;
+				case 0x0152: ch = 0xCE; break;
+				case 0x0153: ch = 0xCF; break;
+				case 0x0178: ch = 0xD9; break;
+				case 0x0192: ch = 0xC4; break;
+				case 0x02C7: ch = 0xFF; break;
+				case 0x02D8: ch = 0xF9; break;
+				case 0x02D9: ch = 0xFA; break;
+				case 0x02DA: ch = 0xFB; break;
+				case 0x02DB: ch = 0xFE; break;
+				case 0x02DD: ch = 0xFD; break;
+				case 0x0394: ch = 0xC6; break;
+				case 0x03A9: ch = 0xBD; break;
+				case 0x03C0: ch = 0xB9; break;
+				case 0x2013: ch = 0xD1; break;
+				case 0x2014: ch = 0xD0; break;
+				case 0x2018: ch = 0xD4; break;
+				case 0x2019: ch = 0xD5; break;
+				case 0x201A: ch = 0xE2; break;
+				case 0x201C: ch = 0xD2; break;
+				case 0x201D: ch = 0xD3; break;
+				case 0x201E: ch = 0xE3; break;
+				case 0x2020: ch = 0xA0; break;
+				case 0x2021: ch = 0xE0; break;
+				case 0x2022: ch = 0xA5; break;
+				case 0x2026: ch = 0xC9; break;
+				case 0x2030: ch = 0xE4; break;
+				case 0x2044: ch = 0xDA; break;
+				case 0x2122: ch = 0xAA; break;
+				case 0x2202: ch = 0xB6; break;
+				case 0x220F: ch = 0xB8; break;
+				case 0x2211: ch = 0xB7; break;
+				case 0x221A: ch = 0xC3; break;
+				case 0x221E: ch = 0xB0; break;
+				case 0x222B: ch = 0xBA; break;
+				case 0x2248: ch = 0xC5; break;
+				case 0x2260: ch = 0xAD; break;
+				case 0x2264: ch = 0xB2; break;
+				case 0x2265: ch = 0xB3; break;
+				case 0x25C6: ch = 0xD7; break;
+				case 0xE01E: ch = 0xF0; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A9:
+				case 0x00B1:
+				case 0x00B5:
+				case 0x00DE:
+					break;
+				case 0x00A0: ch = 0xCA; break;
+				case 0x00A1: ch = 0xC1; break;
+				case 0x00A4: ch = 0xDB; break;
+				case 0x00A5: ch = 0xB4; break;
+				case 0x00A7: ch = 0xA4; break;
+				case 0x00A8: ch = 0xAC; break;
+				case 0x00AA: ch = 0xBB; break;
+				case 0x00AB: ch = 0xC7; break;
+				case 0x00AC: ch = 0xC2; break;
+				case 0x00AE: ch = 0xA8; break;
+				case 0x00AF: ch = 0xF8; break;
+				case 0x00B0: ch = 0xA1; break;
+				case 0x00B4: ch = 0xAB; break;
+				case 0x00B6: ch = 0xA6; break;
+				case 0x00B7: ch = 0xE1; break;
+				case 0x00B8: ch = 0xFC; break;
+				case 0x00BA: ch = 0xBC; break;
+				case 0x00BB: ch = 0xC8; break;
+				case 0x00BF: ch = 0xC0; break;
+				case 0x00C0: ch = 0xCB; break;
+				case 0x00C1: ch = 0xE7; break;
+				case 0x00C2: ch = 0xE5; break;
+				case 0x00C3: ch = 0xCC; break;
+				case 0x00C4: ch = 0x80; break;
+				case 0x00C5: ch = 0x81; break;
+				case 0x00C6: ch = 0xAE; break;
+				case 0x00C7: ch = 0x82; break;
+				case 0x00C8: ch = 0xE9; break;
+				case 0x00C9: ch = 0x83; break;
+				case 0x00CA: ch = 0xE6; break;
+				case 0x00CB: ch = 0xE8; break;
+				case 0x00CC: ch = 0xED; break;
+				case 0x00CD: ch = 0xEA; break;
+				case 0x00CE: ch = 0xEB; break;
+				case 0x00CF: ch = 0xEC; break;
+				case 0x00D1: ch = 0x84; break;
+				case 0x00D2: ch = 0xF1; break;
+				case 0x00D3: ch = 0xEE; break;
+				case 0x00D4: ch = 0xEF; break;
+				case 0x00D5: ch = 0xCD; break;
+				case 0x00D6: ch = 0x85; break;
+				case 0x00D8: ch = 0xAF; break;
+				case 0x00D9: ch = 0xF4; break;
+				case 0x00DA: ch = 0xF2; break;
+				case 0x00DB: ch = 0xF3; break;
+				case 0x00DC: ch = 0x86; break;
+				case 0x00DF: ch = 0xA7; break;
+				case 0x00E0: ch = 0x88; break;
+				case 0x00E1: ch = 0x87; break;
+				case 0x00E2: ch = 0x89; break;
+				case 0x00E3: ch = 0x8B; break;
+				case 0x00E4: ch = 0x8A; break;
+				case 0x00E5: ch = 0x8C; break;
+				case 0x00E6: ch = 0xBE; break;
+				case 0x00E7: ch = 0x8D; break;
+				case 0x00E8: ch = 0x8F; break;
+				case 0x00E9: ch = 0x8E; break;
+				case 0x00EA: ch = 0x90; break;
+				case 0x00EB: ch = 0x91; break;
+				case 0x00EC: ch = 0x93; break;
+				case 0x00ED: ch = 0x92; break;
+				case 0x00EE: ch = 0x94; break;
+				case 0x00EF: ch = 0x95; break;
+				case 0x00F1: ch = 0x96; break;
+				case 0x00F2: ch = 0x98; break;
+				case 0x00F3: ch = 0x97; break;
+				case 0x00F4: ch = 0x99; break;
+				case 0x00F5: ch = 0x9B; break;
+				case 0x00F6: ch = 0x9A; break;
+				case 0x00F7: ch = 0xD6; break;
+				case 0x00F8: ch = 0xBF; break;
+				case 0x00F9: ch = 0x9D; break;
+				case 0x00FA: ch = 0x9C; break;
+				case 0x00FB: ch = 0x9E; break;
+				case 0x00FC: ch = 0x9F; break;
+				case 0x00FE: ch = 0xDF; break;
+				case 0x00FF: ch = 0xD8; break;
+				case 0x0110: ch = 0xDC; break;
+				case 0x0111: ch = 0xDD; break;
+				case 0x0131: ch = 0xF5; break;
+				case 0x0152: ch = 0xCE; break;
+				case 0x0153: ch = 0xCF; break;
+				case 0x0178: ch = 0xD9; break;
+				case 0x0192: ch = 0xC4; break;
+				case 0x02C7: ch = 0xFF; break;
+				case 0x02D8: ch = 0xF9; break;
+				case 0x02D9: ch = 0xFA; break;
+				case 0x02DA: ch = 0xFB; break;
+				case 0x02DB: ch = 0xFE; break;
+				case 0x02DD: ch = 0xFD; break;
+				case 0x0394: ch = 0xC6; break;
+				case 0x03A9: ch = 0xBD; break;
+				case 0x03C0: ch = 0xB9; break;
+				case 0x2013: ch = 0xD1; break;
+				case 0x2014: ch = 0xD0; break;
+				case 0x2018: ch = 0xD4; break;
+				case 0x2019: ch = 0xD5; break;
+				case 0x201A: ch = 0xE2; break;
+				case 0x201C: ch = 0xD2; break;
+				case 0x201D: ch = 0xD3; break;
+				case 0x201E: ch = 0xE3; break;
+				case 0x2020: ch = 0xA0; break;
+				case 0x2021: ch = 0xE0; break;
+				case 0x2022: ch = 0xA5; break;
+				case 0x2026: ch = 0xC9; break;
+				case 0x2030: ch = 0xE4; break;
+				case 0x2044: ch = 0xDA; break;
+				case 0x2122: ch = 0xAA; break;
+				case 0x2202: ch = 0xB6; break;
+				case 0x220F: ch = 0xB8; break;
+				case 0x2211: ch = 0xB7; break;
+				case 0x221A: ch = 0xC3; break;
+				case 0x221E: ch = 0xB0; break;
+				case 0x222B: ch = 0xBA; break;
+				case 0x2248: ch = 0xC5; break;
+				case 0x2260: ch = 0xAD; break;
+				case 0x2264: ch = 0xB2; break;
+				case 0x2265: ch = 0xB3; break;
+				case 0x25C6: ch = 0xD7; break;
+				case 0xE01E: ch = 0xF0; break;
+				default: ch = 0x3F; break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP10079
+
+public class ENCx_mac_icelandic : CP10079
+{
+	public ENCx_mac_icelandic() : base() {}
+
+}; // class ENCx_mac_icelandic
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP1250.cs b/mcs/class/I18N/West/CP1250.cs
new file mode 100644
index 00000000000..1cdd1d56f4b
--- /dev/null
+++ b/mcs/class/I18N/West/CP1250.cs
@@ -0,0 +1,399 @@
+/*
+ * CP1250.cs - Central European (Windows) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-5346.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP1250 : ByteEncoding
+{
+	public CP1250()
+		: base(1250, ToChars, "Central European (Windows)",
+		       "iso-8859-2", "windows-1250", "windows-1250",
+		       true, true, true, true, 1250)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u20AC', '\u0081', '\u201A', '\u0083', 
+		'\u201E', '\u2026', '\u2020', '\u2021', '\u0088', '\u2030', 
+		'\u0160', '\u2039', '\u015A', '\u0164', '\u017D', '\u0179', 
+		'\u0090', '\u2018', '\u2019', '\u201C', '\u201D', '\u2022', 
+		'\u2013', '\u2014', '\u0098', '\u2122', '\u0161', '\u203A', 
+		'\u015B', '\u0165', '\u017E', '\u017A', '\u00A0', '\u02C7', 
+		'\u02D8', '\u0141', '\u00A4', '\u0104', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u015E', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u017B', '\u00B0', '\u00B1', '\u02DB', '\u0142', 
+		'\u00B4', '\u00B5', '\u00B6', '\u00B7', '\u00B8', '\u0105', 
+		'\u015F', '\u00BB', '\u013D', '\u02DD', '\u013E', '\u017C', 
+		'\u0154', '\u00C1', '\u00C2', '\u0102', '\u00C4', '\u0139', 
+		'\u0106', '\u00C7', '\u010C', '\u00C9', '\u0118', '\u00CB', 
+		'\u011A', '\u00CD', '\u00CE', '\u010E', '\u0110', '\u0143', 
+		'\u0147', '\u00D3', '\u00D4', '\u0150', '\u00D6', '\u00D7', 
+		'\u0158', '\u016E', '\u00DA', '\u0170', '\u00DC', '\u00DD', 
+		'\u0162', '\u00DF', '\u0155', '\u00E1', '\u00E2', '\u0103', 
+		'\u00E4', '\u013A', '\u0107', '\u00E7', '\u010D', '\u00E9', 
+		'\u0119', '\u00EB', '\u011B', '\u00ED', '\u00EE', '\u010F', 
+		'\u0111', '\u0144', '\u0148', '\u00F3', '\u00F4', '\u0151', 
+		'\u00F6', '\u00F7', '\u0159', '\u016F', '\u00FA', '\u0171', 
+		'\u00FC', '\u00FD', '\u0163', '\u02D9', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x0083:
+				case 0x0088:
+				case 0x0090:
+				case 0x0098:
+				case 0x00A0:
+				case 0x00A4:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00BB:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C4:
+				case 0x00C7:
+				case 0x00C9:
+				case 0x00CB:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00DA:
+				case 0x00DC:
+				case 0x00DD:
+				case 0x00DF:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E4:
+				case 0x00E7:
+				case 0x00E9:
+				case 0x00EB:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00FA:
+				case 0x00FC:
+				case 0x00FD:
+					break;
+				case 0x0102: ch = 0xC3; break;
+				case 0x0103: ch = 0xE3; break;
+				case 0x0104: ch = 0xA5; break;
+				case 0x0105: ch = 0xB9; break;
+				case 0x0106: ch = 0xC6; break;
+				case 0x0107: ch = 0xE6; break;
+				case 0x010C: ch = 0xC8; break;
+				case 0x010D: ch = 0xE8; break;
+				case 0x010E: ch = 0xCF; break;
+				case 0x010F: ch = 0xEF; break;
+				case 0x0110: ch = 0xD0; break;
+				case 0x0111: ch = 0xF0; break;
+				case 0x0118: ch = 0xCA; break;
+				case 0x0119: ch = 0xEA; break;
+				case 0x011A: ch = 0xCC; break;
+				case 0x011B: ch = 0xEC; break;
+				case 0x0139: ch = 0xC5; break;
+				case 0x013A: ch = 0xE5; break;
+				case 0x013D: ch = 0xBC; break;
+				case 0x013E: ch = 0xBE; break;
+				case 0x0141: ch = 0xA3; break;
+				case 0x0142: ch = 0xB3; break;
+				case 0x0143: ch = 0xD1; break;
+				case 0x0144: ch = 0xF1; break;
+				case 0x0147: ch = 0xD2; break;
+				case 0x0148: ch = 0xF2; break;
+				case 0x0150: ch = 0xD5; break;
+				case 0x0151: ch = 0xF5; break;
+				case 0x0154: ch = 0xC0; break;
+				case 0x0155: ch = 0xE0; break;
+				case 0x0158: ch = 0xD8; break;
+				case 0x0159: ch = 0xF8; break;
+				case 0x015A: ch = 0x8C; break;
+				case 0x015B: ch = 0x9C; break;
+				case 0x015E: ch = 0xAA; break;
+				case 0x015F: ch = 0xBA; break;
+				case 0x0160: ch = 0x8A; break;
+				case 0x0161: ch = 0x9A; break;
+				case 0x0162: ch = 0xDE; break;
+				case 0x0163: ch = 0xFE; break;
+				case 0x0164: ch = 0x8D; break;
+				case 0x0165: ch = 0x9D; break;
+				case 0x016E: ch = 0xD9; break;
+				case 0x016F: ch = 0xF9; break;
+				case 0x0170: ch = 0xDB; break;
+				case 0x0171: ch = 0xFB; break;
+				case 0x0179: ch = 0x8F; break;
+				case 0x017A: ch = 0x9F; break;
+				case 0x017B: ch = 0xAF; break;
+				case 0x017C: ch = 0xBF; break;
+				case 0x017D: ch = 0x8E; break;
+				case 0x017E: ch = 0x9E; break;
+				case 0x02C7: ch = 0xA1; break;
+				case 0x02D8: ch = 0xA2; break;
+				case 0x02D9: ch = 0xFF; break;
+				case 0x02DB: ch = 0xB2; break;
+				case 0x02DD: ch = 0xBD; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x0083:
+				case 0x0088:
+				case 0x0090:
+				case 0x0098:
+				case 0x00A0:
+				case 0x00A4:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00BB:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C4:
+				case 0x00C7:
+				case 0x00C9:
+				case 0x00CB:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00DA:
+				case 0x00DC:
+				case 0x00DD:
+				case 0x00DF:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E4:
+				case 0x00E7:
+				case 0x00E9:
+				case 0x00EB:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00FA:
+				case 0x00FC:
+				case 0x00FD:
+					break;
+				case 0x0102: ch = 0xC3; break;
+				case 0x0103: ch = 0xE3; break;
+				case 0x0104: ch = 0xA5; break;
+				case 0x0105: ch = 0xB9; break;
+				case 0x0106: ch = 0xC6; break;
+				case 0x0107: ch = 0xE6; break;
+				case 0x010C: ch = 0xC8; break;
+				case 0x010D: ch = 0xE8; break;
+				case 0x010E: ch = 0xCF; break;
+				case 0x010F: ch = 0xEF; break;
+				case 0x0110: ch = 0xD0; break;
+				case 0x0111: ch = 0xF0; break;
+				case 0x0118: ch = 0xCA; break;
+				case 0x0119: ch = 0xEA; break;
+				case 0x011A: ch = 0xCC; break;
+				case 0x011B: ch = 0xEC; break;
+				case 0x0139: ch = 0xC5; break;
+				case 0x013A: ch = 0xE5; break;
+				case 0x013D: ch = 0xBC; break;
+				case 0x013E: ch = 0xBE; break;
+				case 0x0141: ch = 0xA3; break;
+				case 0x0142: ch = 0xB3; break;
+				case 0x0143: ch = 0xD1; break;
+				case 0x0144: ch = 0xF1; break;
+				case 0x0147: ch = 0xD2; break;
+				case 0x0148: ch = 0xF2; break;
+				case 0x0150: ch = 0xD5; break;
+				case 0x0151: ch = 0xF5; break;
+				case 0x0154: ch = 0xC0; break;
+				case 0x0155: ch = 0xE0; break;
+				case 0x0158: ch = 0xD8; break;
+				case 0x0159: ch = 0xF8; break;
+				case 0x015A: ch = 0x8C; break;
+				case 0x015B: ch = 0x9C; break;
+				case 0x015E: ch = 0xAA; break;
+				case 0x015F: ch = 0xBA; break;
+				case 0x0160: ch = 0x8A; break;
+				case 0x0161: ch = 0x9A; break;
+				case 0x0162: ch = 0xDE; break;
+				case 0x0163: ch = 0xFE; break;
+				case 0x0164: ch = 0x8D; break;
+				case 0x0165: ch = 0x9D; break;
+				case 0x016E: ch = 0xD9; break;
+				case 0x016F: ch = 0xF9; break;
+				case 0x0170: ch = 0xDB; break;
+				case 0x0171: ch = 0xFB; break;
+				case 0x0179: ch = 0x8F; break;
+				case 0x017A: ch = 0x9F; break;
+				case 0x017B: ch = 0xAF; break;
+				case 0x017C: ch = 0xBF; break;
+				case 0x017D: ch = 0x8E; break;
+				case 0x017E: ch = 0x9E; break;
+				case 0x02C7: ch = 0xA1; break;
+				case 0x02D8: ch = 0xA2; break;
+				case 0x02D9: ch = 0xFF; break;
+				case 0x02DB: ch = 0xB2; break;
+				case 0x02DD: ch = 0xBD; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1250
+
+public class ENCwindows_1250 : CP1250
+{
+	public ENCwindows_1250() : base() {}
+
+}; // class ENCwindows_1250
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP1252.cs b/mcs/class/I18N/West/CP1252.cs
new file mode 100644
index 00000000000..291ef914bf4
--- /dev/null
+++ b/mcs/class/I18N/West/CP1252.cs
@@ -0,0 +1,399 @@
+/*
+ * CP1252.cs - Western European (Windows) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-5348.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP1252 : ByteEncoding
+{
+	public CP1252()
+		: base(1252, ToChars, "Western European (Windows)",
+		       "iso-8859-1", "Windows-1252", "Windows-1252",
+		       true, true, true, true, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u20AC', '\u0081', '\u201A', '\u0192', 
+		'\u201E', '\u2026', '\u2020', '\u2021', '\u02C6', '\u2030', 
+		'\u0160', '\u2039', '\u0152', '\u008D', '\u017D', '\u008F', 
+		'\u0090', '\u2018', '\u2019', '\u201C', '\u201D', '\u2022', 
+		'\u2013', '\u2014', '\u02DC', '\u2122', '\u0161', '\u203A', 
+		'\u0153', '\u009D', '\u017E', '\u0178', '\u00A0', '\u00A1', 
+		'\u00A2', '\u00A3', '\u00A4', '\u00A5', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u00AA', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u00AF', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u00B4', '\u00B5', '\u00B6', '\u00B7', '\u00B8', '\u00B9', 
+		'\u00BA', '\u00BB', '\u00BC', '\u00BD', '\u00BE', '\u00BF', 
+		'\u00C0', '\u00C1', '\u00C2', '\u00C3', '\u00C4', '\u00C5', 
+		'\u00C6', '\u00C7', '\u00C8', '\u00C9', '\u00CA', '\u00CB', 
+		'\u00CC', '\u00CD', '\u00CE', '\u00CF', '\u00D0', '\u00D1', 
+		'\u00D2', '\u00D3', '\u00D4', '\u00D5', '\u00D6', '\u00D7', 
+		'\u00D8', '\u00D9', '\u00DA', '\u00DB', '\u00DC', '\u00DD', 
+		'\u00DE', '\u00DF', '\u00E0', '\u00E1', '\u00E2', '\u00E3', 
+		'\u00E4', '\u00E5', '\u00E6', '\u00E7', '\u00E8', '\u00E9', 
+		'\u00EA', '\u00EB', '\u00EC', '\u00ED', '\u00EE', '\u00EF', 
+		'\u00F0', '\u00F1', '\u00F2', '\u00F3', '\u00F4', '\u00F5', 
+		'\u00F6', '\u00F7', '\u00F8', '\u00F9', '\u00FA', '\u00FB', 
+		'\u00FC', '\u00FD', '\u00FE', '\u00FF', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x008D:
+				case 0x008F:
+				case 0x0090:
+				case 0x009D:
+				case 0x00A0:
+				case 0x00A1:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AA:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BA:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00BF:
+				case 0x00C0:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C3:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C6:
+				case 0x00C7:
+				case 0x00C8:
+				case 0x00C9:
+				case 0x00CA:
+				case 0x00CB:
+				case 0x00CC:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00CF:
+				case 0x00D0:
+				case 0x00D1:
+				case 0x00D2:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DD:
+				case 0x00DE:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E3:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EC:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F0:
+				case 0x00F1:
+				case 0x00F2:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+				case 0x00FD:
+				case 0x00FE:
+				case 0x00FF:
+					break;
+				case 0x0152: ch = 0x8C; break;
+				case 0x0153: ch = 0x9C; break;
+				case 0x0160: ch = 0x8A; break;
+				case 0x0161: ch = 0x9A; break;
+				case 0x0178: ch = 0x9F; break;
+				case 0x017D: ch = 0x8E; break;
+				case 0x017E: ch = 0x9E; break;
+				case 0x0192: ch = 0x83; break;
+				case 0x02C6: ch = 0x88; break;
+				case 0x02DC: ch = 0x98; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x008D:
+				case 0x008F:
+				case 0x0090:
+				case 0x009D:
+				case 0x00A0:
+				case 0x00A1:
+				case 0x00A2:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AA:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00B9:
+				case 0x00BA:
+				case 0x00BB:
+				case 0x00BC:
+				case 0x00BD:
+				case 0x00BE:
+				case 0x00BF:
+				case 0x00C0:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C3:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C6:
+				case 0x00C7:
+				case 0x00C8:
+				case 0x00C9:
+				case 0x00CA:
+				case 0x00CB:
+				case 0x00CC:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00CF:
+				case 0x00D0:
+				case 0x00D1:
+				case 0x00D2:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DD:
+				case 0x00DE:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E3:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EC:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F0:
+				case 0x00F1:
+				case 0x00F2:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+				case 0x00FD:
+				case 0x00FE:
+				case 0x00FF:
+					break;
+				case 0x0152: ch = 0x8C; break;
+				case 0x0153: ch = 0x9C; break;
+				case 0x0160: ch = 0x8A; break;
+				case 0x0161: ch = 0x9A; break;
+				case 0x0178: ch = 0x9F; break;
+				case 0x017D: ch = 0x8E; break;
+				case 0x017E: ch = 0x9E; break;
+				case 0x0192: ch = 0x83; break;
+				case 0x02C6: ch = 0x88; break;
+				case 0x02DC: ch = 0x98; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1252
+
+public class ENCwindows_1252 : CP1252
+{
+	public ENCwindows_1252() : base() {}
+
+}; // class ENCwindows_1252
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP1253.cs b/mcs/class/I18N/West/CP1253.cs
new file mode 100644
index 00000000000..70a1d1c0c06
--- /dev/null
+++ b/mcs/class/I18N/West/CP1253.cs
@@ -0,0 +1,405 @@
+/*
+ * CP1253.cs - Greek (Windows) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-5349.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP1253 : ByteEncoding
+{
+	public CP1253()
+		: base(1253, ToChars, "Greek (Windows)",
+		       "iso-8859-7", "windows-1253", "windows-1253",
+		       true, true, true, true, 1253)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u20AC', '\u0081', '\u201A', '\u0192', 
+		'\u201E', '\u2026', '\u2020', '\u2021', '\u0088', '\u2030', 
+		'\u008A', '\u2039', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u2018', '\u2019', '\u201C', '\u201D', '\u2022', 
+		'\u2013', '\u2014', '\u0098', '\u2122', '\u009A', '\u203A', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u0385', 
+		'\u0386', '\u00A3', '\u00A4', '\u00A5', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u00AA', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u2015', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u0384', '\u00B5', '\u00B6', '\u00B7', '\u0388', '\u0389', 
+		'\u038A', '\u00BB', '\u038C', '\u00BD', '\u038E', '\u038F', 
+		'\u0390', '\u0391', '\u0392', '\u0393', '\u0394', '\u0395', 
+		'\u0396', '\u0397', '\u0398', '\u0399', '\u039A', '\u039B', 
+		'\u039C', '\u039D', '\u039E', '\u039F', '\u03A0', '\u03A1', 
+		'\u003F', '\u03A3', '\u03A4', '\u03A5', '\u03A6', '\u03A7', 
+		'\u03A8', '\u03A9', '\u03AA', '\u03AB', '\u03AC', '\u03AD', 
+		'\u03AE', '\u03AF', '\u03B0', '\u03B1', '\u03B2', '\u03B3', 
+		'\u03B4', '\u03B5', '\u03B6', '\u03B7', '\u03B8', '\u03B9', 
+		'\u03BA', '\u03BB', '\u03BC', '\u03BD', '\u03BE', '\u03BF', 
+		'\u03C0', '\u03C1', '\u03C2', '\u03C3', '\u03C4', '\u03C5', 
+		'\u03C6', '\u03C7', '\u03C8', '\u03C9', '\u03CA', '\u03CB', 
+		'\u03CC', '\u03CD', '\u03CE', '\u003F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x0088:
+				case 0x008A:
+				case 0x008C:
+				case 0x008D:
+				case 0x008E:
+				case 0x008F:
+				case 0x0090:
+				case 0x0098:
+				case 0x009A:
+				case 0x009C:
+				case 0x009D:
+				case 0x009E:
+				case 0x009F:
+				case 0x00A0:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AA:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00BB:
+				case 0x00BD:
+					break;
+				case 0x0192: ch = 0x83; break;
+				case 0x0384: ch = 0xB4; break;
+				case 0x0385: ch = 0xA1; break;
+				case 0x0386: ch = 0xA2; break;
+				case 0x0388: ch = 0xB8; break;
+				case 0x0389: ch = 0xB9; break;
+				case 0x038A: ch = 0xBA; break;
+				case 0x038C: ch = 0xBC; break;
+				case 0x038E:
+				case 0x038F:
+				case 0x0390:
+				case 0x0391:
+				case 0x0392:
+				case 0x0393:
+				case 0x0394:
+				case 0x0395:
+				case 0x0396:
+				case 0x0397:
+				case 0x0398:
+				case 0x0399:
+				case 0x039A:
+				case 0x039B:
+				case 0x039C:
+				case 0x039D:
+				case 0x039E:
+				case 0x039F:
+				case 0x03A0:
+				case 0x03A1:
+					ch -= 0x02D0;
+					break;
+				case 0x03A3:
+				case 0x03A4:
+				case 0x03A5:
+				case 0x03A6:
+				case 0x03A7:
+				case 0x03A8:
+				case 0x03A9:
+				case 0x03AA:
+				case 0x03AB:
+				case 0x03AC:
+				case 0x03AD:
+				case 0x03AE:
+				case 0x03AF:
+				case 0x03B0:
+				case 0x03B1:
+				case 0x03B2:
+				case 0x03B3:
+				case 0x03B4:
+				case 0x03B5:
+				case 0x03B6:
+				case 0x03B7:
+				case 0x03B8:
+				case 0x03B9:
+				case 0x03BA:
+				case 0x03BB:
+				case 0x03BC:
+				case 0x03BD:
+				case 0x03BE:
+				case 0x03BF:
+				case 0x03C0:
+				case 0x03C1:
+				case 0x03C2:
+				case 0x03C3:
+				case 0x03C4:
+				case 0x03C5:
+				case 0x03C6:
+				case 0x03C7:
+				case 0x03C8:
+				case 0x03C9:
+				case 0x03CA:
+				case 0x03CB:
+				case 0x03CC:
+				case 0x03CD:
+				case 0x03CE:
+					ch -= 0x02D0;
+					break;
+				case 0x03D5: ch = 0xF6; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2015: ch = 0xAF; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 128) switch(ch)
+			{
+				case 0x0081:
+				case 0x0088:
+				case 0x008A:
+				case 0x008C:
+				case 0x008D:
+				case 0x008E:
+				case 0x008F:
+				case 0x0090:
+				case 0x0098:
+				case 0x009A:
+				case 0x009C:
+				case 0x009D:
+				case 0x009E:
+				case 0x009F:
+				case 0x00A0:
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A5:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AA:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00BB:
+				case 0x00BD:
+					break;
+				case 0x0192: ch = 0x83; break;
+				case 0x0384: ch = 0xB4; break;
+				case 0x0385: ch = 0xA1; break;
+				case 0x0386: ch = 0xA2; break;
+				case 0x0388: ch = 0xB8; break;
+				case 0x0389: ch = 0xB9; break;
+				case 0x038A: ch = 0xBA; break;
+				case 0x038C: ch = 0xBC; break;
+				case 0x038E:
+				case 0x038F:
+				case 0x0390:
+				case 0x0391:
+				case 0x0392:
+				case 0x0393:
+				case 0x0394:
+				case 0x0395:
+				case 0x0396:
+				case 0x0397:
+				case 0x0398:
+				case 0x0399:
+				case 0x039A:
+				case 0x039B:
+				case 0x039C:
+				case 0x039D:
+				case 0x039E:
+				case 0x039F:
+				case 0x03A0:
+				case 0x03A1:
+					ch -= 0x02D0;
+					break;
+				case 0x03A3:
+				case 0x03A4:
+				case 0x03A5:
+				case 0x03A6:
+				case 0x03A7:
+				case 0x03A8:
+				case 0x03A9:
+				case 0x03AA:
+				case 0x03AB:
+				case 0x03AC:
+				case 0x03AD:
+				case 0x03AE:
+				case 0x03AF:
+				case 0x03B0:
+				case 0x03B1:
+				case 0x03B2:
+				case 0x03B3:
+				case 0x03B4:
+				case 0x03B5:
+				case 0x03B6:
+				case 0x03B7:
+				case 0x03B8:
+				case 0x03B9:
+				case 0x03BA:
+				case 0x03BB:
+				case 0x03BC:
+				case 0x03BD:
+				case 0x03BE:
+				case 0x03BF:
+				case 0x03C0:
+				case 0x03C1:
+				case 0x03C2:
+				case 0x03C3:
+				case 0x03C4:
+				case 0x03C5:
+				case 0x03C6:
+				case 0x03C7:
+				case 0x03C8:
+				case 0x03C9:
+				case 0x03CA:
+				case 0x03CB:
+				case 0x03CC:
+				case 0x03CD:
+				case 0x03CE:
+					ch -= 0x02D0;
+					break;
+				case 0x03D5: ch = 0xF6; break;
+				case 0x2013: ch = 0x96; break;
+				case 0x2014: ch = 0x97; break;
+				case 0x2015: ch = 0xAF; break;
+				case 0x2018: ch = 0x91; break;
+				case 0x2019: ch = 0x92; break;
+				case 0x201A: ch = 0x82; break;
+				case 0x201C: ch = 0x93; break;
+				case 0x201D: ch = 0x94; break;
+				case 0x201E: ch = 0x84; break;
+				case 0x2020: ch = 0x86; break;
+				case 0x2021: ch = 0x87; break;
+				case 0x2022: ch = 0x95; break;
+				case 0x2026: ch = 0x85; break;
+				case 0x2030: ch = 0x89; break;
+				case 0x2039: ch = 0x8B; break;
+				case 0x203A: ch = 0x9B; break;
+				case 0x20AC: ch = 0x80; break;
+				case 0x2122: ch = 0x99; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP1253
+
+public class ENCwindows_1253 : CP1253
+{
+	public ENCwindows_1253() : base() {}
+
+}; // class ENCwindows_1253
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP28592.cs b/mcs/class/I18N/West/CP28592.cs
new file mode 100644
index 00000000000..6acf2c6ad1c
--- /dev/null
+++ b/mcs/class/I18N/West/CP28592.cs
@@ -0,0 +1,471 @@
+/*
+ * CP28592.cs - Central European (ISO) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-912.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP28592 : ByteEncoding
+{
+	public CP28592()
+		: base(28592, ToChars, "Central European (ISO)",
+		       "iso-8859-2", "iso-8859-2", "iso-8859-2",
+		       true, true, true, true, 1250)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u0104', 
+		'\u02D8', '\u0141', '\u00A4', '\u013D', '\u015A', '\u00A7', 
+		'\u00A8', '\u0160', '\u015E', '\u0164', '\u0179', '\u00AD', 
+		'\u017D', '\u017B', '\u00B0', '\u0105', '\u02DB', '\u0142', 
+		'\u00B4', '\u013E', '\u015B', '\u02C7', '\u00B8', '\u0161', 
+		'\u015F', '\u0165', '\u017A', '\u02DD', '\u017E', '\u017C', 
+		'\u0154', '\u00C1', '\u00C2', '\u0102', '\u00C4', '\u0139', 
+		'\u0106', '\u00C7', '\u010C', '\u00C9', '\u0118', '\u00CB', 
+		'\u011A', '\u00CD', '\u00CE', '\u010E', '\u0110', '\u0143', 
+		'\u0147', '\u00D3', '\u00D4', '\u0150', '\u00D6', '\u00D7', 
+		'\u0158', '\u016E', '\u00DA', '\u0170', '\u00DC', '\u00DD', 
+		'\u0162', '\u00DF', '\u0155', '\u00E1', '\u00E2', '\u0103', 
+		'\u00E4', '\u013A', '\u0107', '\u00E7', '\u010D', '\u00E9', 
+		'\u0119', '\u00EB', '\u011B', '\u00ED', '\u00EE', '\u010F', 
+		'\u0111', '\u0144', '\u0148', '\u00F3', '\u00F4', '\u0151', 
+		'\u00F6', '\u00F7', '\u0159', '\u016F', '\u00FA', '\u0171', 
+		'\u00FC', '\u00FD', '\u0163', '\u02D9', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A4:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00AD:
+				case 0x00B0:
+				case 0x00B4:
+				case 0x00B8:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C4:
+				case 0x00C7:
+				case 0x00C9:
+				case 0x00CB:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00D0:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00DA:
+				case 0x00DC:
+				case 0x00DD:
+				case 0x00DF:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E4:
+				case 0x00E7:
+				case 0x00E9:
+				case 0x00EB:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00FA:
+				case 0x00FC:
+				case 0x00FD:
+					break;
+				case 0x00A2: ch = 0x8D; break;
+				case 0x00A5: ch = 0x8E; break;
+				case 0x00A9: ch = 0x88; break;
+				case 0x00AE: ch = 0x9F; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x0102: ch = 0xC3; break;
+				case 0x0103: ch = 0xE3; break;
+				case 0x0104: ch = 0xA1; break;
+				case 0x0105: ch = 0xB1; break;
+				case 0x0106: ch = 0xC6; break;
+				case 0x0107: ch = 0xE6; break;
+				case 0x010C: ch = 0xC8; break;
+				case 0x010D: ch = 0xE8; break;
+				case 0x010E: ch = 0xCF; break;
+				case 0x010F: ch = 0xEF; break;
+				case 0x0110: ch = 0xD0; break;
+				case 0x0111: ch = 0xF0; break;
+				case 0x0118: ch = 0xCA; break;
+				case 0x0119: ch = 0xEA; break;
+				case 0x011A: ch = 0xCC; break;
+				case 0x011B: ch = 0xEC; break;
+				case 0x0139: ch = 0xC5; break;
+				case 0x013A: ch = 0xE5; break;
+				case 0x013D: ch = 0xA5; break;
+				case 0x013E: ch = 0xB5; break;
+				case 0x0141: ch = 0xA3; break;
+				case 0x0142: ch = 0xB3; break;
+				case 0x0143: ch = 0xD1; break;
+				case 0x0144: ch = 0xF1; break;
+				case 0x0147: ch = 0xD2; break;
+				case 0x0148: ch = 0xF2; break;
+				case 0x0150: ch = 0xD5; break;
+				case 0x0151: ch = 0xF5; break;
+				case 0x0154: ch = 0xC0; break;
+				case 0x0155: ch = 0xE0; break;
+				case 0x0158: ch = 0xD8; break;
+				case 0x0159: ch = 0xF8; break;
+				case 0x015A: ch = 0xA6; break;
+				case 0x015B: ch = 0xB6; break;
+				case 0x015E: ch = 0xAA; break;
+				case 0x015F: ch = 0xBA; break;
+				case 0x0160: ch = 0xA9; break;
+				case 0x0161: ch = 0xB9; break;
+				case 0x0162: ch = 0xDE; break;
+				case 0x0163: ch = 0xFE; break;
+				case 0x0164: ch = 0xAB; break;
+				case 0x0165: ch = 0xBB; break;
+				case 0x016E: ch = 0xD9; break;
+				case 0x016F: ch = 0xF9; break;
+				case 0x0170: ch = 0xDB; break;
+				case 0x0171: ch = 0xFB; break;
+				case 0x0179: ch = 0xAC; break;
+				case 0x017A: ch = 0xBC; break;
+				case 0x017B: ch = 0xAF; break;
+				case 0x017C: ch = 0xBF; break;
+				case 0x017D: ch = 0xAE; break;
+				case 0x017E: ch = 0xBE; break;
+				case 0x02C7: ch = 0xB7; break;
+				case 0x02D8: ch = 0xA2; break;
+				case 0x02D9: ch = 0xFF; break;
+				case 0x02DB: ch = 0xB2; break;
+				case 0x02DD: ch = 0xBD; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2500: ch = 0x94; break;
+				case 0x2502: ch = 0x83; break;
+				case 0x250C: ch = 0x86; break;
+				case 0x2510: ch = 0x8F; break;
+				case 0x2514: ch = 0x90; break;
+				case 0x2518: ch = 0x85; break;
+				case 0x251C: ch = 0x93; break;
+				case 0x2524: ch = 0x84; break;
+				case 0x252C: ch = 0x92; break;
+				case 0x2534: ch = 0x91; break;
+				case 0x253C: ch = 0x95; break;
+				case 0x2550: ch = 0x9D; break;
+				case 0x2551: ch = 0x8A; break;
+				case 0x2554: ch = 0x99; break;
+				case 0x2557: ch = 0x8B; break;
+				case 0x255A: ch = 0x98; break;
+				case 0x255D: ch = 0x8C; break;
+				case 0x2560: ch = 0x9C; break;
+				case 0x2563: ch = 0x89; break;
+				case 0x2566: ch = 0x9B; break;
+				case 0x2569: ch = 0x9A; break;
+				case 0x256C: ch = 0x9E; break;
+				case 0x2580: ch = 0x97; break;
+				case 0x2584: ch = 0x96; break;
+				case 0x2588: ch = 0x87; break;
+				case 0x2591: ch = 0x80; break;
+				case 0x2592: ch = 0x81; break;
+				case 0x2593: ch = 0x82; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266C: ch = 0x0E; break;
+				case 0xFFE8: ch = 0x83; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A4:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00AD:
+				case 0x00B0:
+				case 0x00B4:
+				case 0x00B8:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C4:
+				case 0x00C7:
+				case 0x00C9:
+				case 0x00CB:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00D0:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00DA:
+				case 0x00DC:
+				case 0x00DD:
+				case 0x00DF:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E4:
+				case 0x00E7:
+				case 0x00E9:
+				case 0x00EB:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00FA:
+				case 0x00FC:
+				case 0x00FD:
+					break;
+				case 0x00A2: ch = 0x8D; break;
+				case 0x00A5: ch = 0x8E; break;
+				case 0x00A9: ch = 0x88; break;
+				case 0x00AE: ch = 0x9F; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x0102: ch = 0xC3; break;
+				case 0x0103: ch = 0xE3; break;
+				case 0x0104: ch = 0xA1; break;
+				case 0x0105: ch = 0xB1; break;
+				case 0x0106: ch = 0xC6; break;
+				case 0x0107: ch = 0xE6; break;
+				case 0x010C: ch = 0xC8; break;
+				case 0x010D: ch = 0xE8; break;
+				case 0x010E: ch = 0xCF; break;
+				case 0x010F: ch = 0xEF; break;
+				case 0x0110: ch = 0xD0; break;
+				case 0x0111: ch = 0xF0; break;
+				case 0x0118: ch = 0xCA; break;
+				case 0x0119: ch = 0xEA; break;
+				case 0x011A: ch = 0xCC; break;
+				case 0x011B: ch = 0xEC; break;
+				case 0x0139: ch = 0xC5; break;
+				case 0x013A: ch = 0xE5; break;
+				case 0x013D: ch = 0xA5; break;
+				case 0x013E: ch = 0xB5; break;
+				case 0x0141: ch = 0xA3; break;
+				case 0x0142: ch = 0xB3; break;
+				case 0x0143: ch = 0xD1; break;
+				case 0x0144: ch = 0xF1; break;
+				case 0x0147: ch = 0xD2; break;
+				case 0x0148: ch = 0xF2; break;
+				case 0x0150: ch = 0xD5; break;
+				case 0x0151: ch = 0xF5; break;
+				case 0x0154: ch = 0xC0; break;
+				case 0x0155: ch = 0xE0; break;
+				case 0x0158: ch = 0xD8; break;
+				case 0x0159: ch = 0xF8; break;
+				case 0x015A: ch = 0xA6; break;
+				case 0x015B: ch = 0xB6; break;
+				case 0x015E: ch = 0xAA; break;
+				case 0x015F: ch = 0xBA; break;
+				case 0x0160: ch = 0xA9; break;
+				case 0x0161: ch = 0xB9; break;
+				case 0x0162: ch = 0xDE; break;
+				case 0x0163: ch = 0xFE; break;
+				case 0x0164: ch = 0xAB; break;
+				case 0x0165: ch = 0xBB; break;
+				case 0x016E: ch = 0xD9; break;
+				case 0x016F: ch = 0xF9; break;
+				case 0x0170: ch = 0xDB; break;
+				case 0x0171: ch = 0xFB; break;
+				case 0x0179: ch = 0xAC; break;
+				case 0x017A: ch = 0xBC; break;
+				case 0x017B: ch = 0xAF; break;
+				case 0x017C: ch = 0xBF; break;
+				case 0x017D: ch = 0xAE; break;
+				case 0x017E: ch = 0xBE; break;
+				case 0x02C7: ch = 0xB7; break;
+				case 0x02D8: ch = 0xA2; break;
+				case 0x02D9: ch = 0xFF; break;
+				case 0x02DB: ch = 0xB2; break;
+				case 0x02DD: ch = 0xBD; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2500: ch = 0x94; break;
+				case 0x2502: ch = 0x83; break;
+				case 0x250C: ch = 0x86; break;
+				case 0x2510: ch = 0x8F; break;
+				case 0x2514: ch = 0x90; break;
+				case 0x2518: ch = 0x85; break;
+				case 0x251C: ch = 0x93; break;
+				case 0x2524: ch = 0x84; break;
+				case 0x252C: ch = 0x92; break;
+				case 0x2534: ch = 0x91; break;
+				case 0x253C: ch = 0x95; break;
+				case 0x2550: ch = 0x9D; break;
+				case 0x2551: ch = 0x8A; break;
+				case 0x2554: ch = 0x99; break;
+				case 0x2557: ch = 0x8B; break;
+				case 0x255A: ch = 0x98; break;
+				case 0x255D: ch = 0x8C; break;
+				case 0x2560: ch = 0x9C; break;
+				case 0x2563: ch = 0x89; break;
+				case 0x2566: ch = 0x9B; break;
+				case 0x2569: ch = 0x9A; break;
+				case 0x256C: ch = 0x9E; break;
+				case 0x2580: ch = 0x97; break;
+				case 0x2584: ch = 0x96; break;
+				case 0x2588: ch = 0x87; break;
+				case 0x2591: ch = 0x80; break;
+				case 0x2592: ch = 0x81; break;
+				case 0x2593: ch = 0x82; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266C: ch = 0x0E; break;
+				case 0xFFE8: ch = 0x83; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP28592
+
+public class ENCiso_8859_2 : CP28592
+{
+	public ENCiso_8859_2() : base() {}
+
+}; // class ENCiso_8859_2
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP28593.cs b/mcs/class/I18N/West/CP28593.cs
new file mode 100644
index 00000000000..93f93e494de
--- /dev/null
+++ b/mcs/class/I18N/West/CP28593.cs
@@ -0,0 +1,319 @@
+/*
+ * CP28593.cs - Latin 3 (ISO) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-913.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP28593 : ByteEncoding
+{
+	public CP28593()
+		: base(28593, ToChars, "Latin 3 (ISO)",
+		       "iso-8859-3", "iso-8859-3", "iso-8859-3",
+		       true, true, true, true, 28593)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u0126', 
+		'\u02D8', '\u00A3', '\u00A4', '\u003F', '\u0124', '\u00A7', 
+		'\u00A8', '\u0130', '\u015E', '\u011E', '\u0134', '\u00AD', 
+		'\u003F', '\u017B', '\u00B0', '\u0127', '\u00B2', '\u00B3', 
+		'\u00B4', '\u00B5', '\u0125', '\u00B7', '\u00B8', '\u0131', 
+		'\u015F', '\u011F', '\u0135', '\u00BD', '\u003F', '\u017C', 
+		'\u00C0', '\u00C1', '\u00C2', '\u003F', '\u00C4', '\u010A', 
+		'\u0108', '\u00C7', '\u00C8', '\u00C9', '\u00CA', '\u00CB', 
+		'\u00CC', '\u00CD', '\u00CE', '\u00CF', '\u003F', '\u00D1', 
+		'\u00D2', '\u00D3', '\u00D4', '\u0120', '\u00D6', '\u00D7', 
+		'\u011C', '\u00D9', '\u00DA', '\u00DB', '\u00DC', '\u016C', 
+		'\u015C', '\u00DF', '\u00E0', '\u00E1', '\u00E2', '\u003F', 
+		'\u00E4', '\u010B', '\u0109', '\u00E7', '\u00E8', '\u00E9', 
+		'\u00EA', '\u00EB', '\u00EC', '\u00ED', '\u00EE', '\u00EF', 
+		'\u003F', '\u00F1', '\u00F2', '\u00F3', '\u00F4', '\u0121', 
+		'\u00F6', '\u00F7', '\u011D', '\u00F9', '\u00FA', '\u00FB', 
+		'\u00FC', '\u016D', '\u015D', '\u02D9', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00AD:
+				case 0x00B0:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00BD:
+				case 0x00C0:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C4:
+				case 0x00C7:
+				case 0x00C8:
+				case 0x00C9:
+				case 0x00CA:
+				case 0x00CB:
+				case 0x00CC:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00CF:
+				case 0x00D1:
+				case 0x00D2:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E4:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EC:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F1:
+				case 0x00F2:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+					break;
+				case 0x0108: ch = 0xC6; break;
+				case 0x0109: ch = 0xE6; break;
+				case 0x010A: ch = 0xC5; break;
+				case 0x010B: ch = 0xE5; break;
+				case 0x011C: ch = 0xD8; break;
+				case 0x011D: ch = 0xF8; break;
+				case 0x011E: ch = 0xAB; break;
+				case 0x011F: ch = 0xBB; break;
+				case 0x0120: ch = 0xD5; break;
+				case 0x0121: ch = 0xF5; break;
+				case 0x0124: ch = 0xA6; break;
+				case 0x0125: ch = 0xB6; break;
+				case 0x0126: ch = 0xA1; break;
+				case 0x0127: ch = 0xB1; break;
+				case 0x0130: ch = 0xA9; break;
+				case 0x0131: ch = 0xB9; break;
+				case 0x0134: ch = 0xAC; break;
+				case 0x0135: ch = 0xBC; break;
+				case 0x015C: ch = 0xDE; break;
+				case 0x015D: ch = 0xFE; break;
+				case 0x015E: ch = 0xAA; break;
+				case 0x015F: ch = 0xBA; break;
+				case 0x016C: ch = 0xDD; break;
+				case 0x016D: ch = 0xFD; break;
+				case 0x017B: ch = 0xAF; break;
+				case 0x017C: ch = 0xBF; break;
+				case 0x02D8: ch = 0xA2; break;
+				case 0x02D9: ch = 0xFF; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A3:
+				case 0x00A4:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00AD:
+				case 0x00B0:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B5:
+				case 0x00B7:
+				case 0x00B8:
+				case 0x00BD:
+				case 0x00C0:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C4:
+				case 0x00C7:
+				case 0x00C8:
+				case 0x00C9:
+				case 0x00CA:
+				case 0x00CB:
+				case 0x00CC:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00CF:
+				case 0x00D1:
+				case 0x00D2:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E4:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EC:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F1:
+				case 0x00F2:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+					break;
+				case 0x0108: ch = 0xC6; break;
+				case 0x0109: ch = 0xE6; break;
+				case 0x010A: ch = 0xC5; break;
+				case 0x010B: ch = 0xE5; break;
+				case 0x011C: ch = 0xD8; break;
+				case 0x011D: ch = 0xF8; break;
+				case 0x011E: ch = 0xAB; break;
+				case 0x011F: ch = 0xBB; break;
+				case 0x0120: ch = 0xD5; break;
+				case 0x0121: ch = 0xF5; break;
+				case 0x0124: ch = 0xA6; break;
+				case 0x0125: ch = 0xB6; break;
+				case 0x0126: ch = 0xA1; break;
+				case 0x0127: ch = 0xB1; break;
+				case 0x0130: ch = 0xA9; break;
+				case 0x0131: ch = 0xB9; break;
+				case 0x0134: ch = 0xAC; break;
+				case 0x0135: ch = 0xBC; break;
+				case 0x015C: ch = 0xDE; break;
+				case 0x015D: ch = 0xFE; break;
+				case 0x015E: ch = 0xAA; break;
+				case 0x015F: ch = 0xBA; break;
+				case 0x016C: ch = 0xDD; break;
+				case 0x016D: ch = 0xFD; break;
+				case 0x017B: ch = 0xAF; break;
+				case 0x017C: ch = 0xBF; break;
+				case 0x02D8: ch = 0xA2; break;
+				case 0x02D9: ch = 0xFF; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP28593
+
+public class ENCiso_8859_3 : CP28593
+{
+	public ENCiso_8859_3() : base() {}
+
+}; // class ENCiso_8859_3
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP28597.cs b/mcs/class/I18N/West/CP28597.cs
new file mode 100644
index 00000000000..b4a25378f03
--- /dev/null
+++ b/mcs/class/I18N/West/CP28597.cs
@@ -0,0 +1,339 @@
+/*
+ * CP28597.cs - Greek (ISO) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-4909.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP28597 : ByteEncoding
+{
+	public CP28597()
+		: base(28597, ToChars, "Greek (ISO)",
+		       "iso-8859-7", "iso-8859-7", "iso-8859-7",
+		       true, true, true, true, 1253)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u2018', 
+		'\u2019', '\u00A3', '\u20AC', '\u003F', '\u00A6', '\u00A7', 
+		'\u00A8', '\u00A9', '\u003F', '\u00AB', '\u00AC', '\u00AD', 
+		'\u003F', '\u2015', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u00B4', '\u0385', '\u0386', '\u0387', '\u0388', '\u0389', 
+		'\u038A', '\u00BB', '\u038C', '\u00BD', '\u038E', '\u038F', 
+		'\u0390', '\u0391', '\u0392', '\u0393', '\u0394', '\u0395', 
+		'\u0396', '\u0397', '\u0398', '\u0399', '\u039A', '\u039B', 
+		'\u039C', '\u039D', '\u039E', '\u039F', '\u03A0', '\u03A1', 
+		'\u003F', '\u03A3', '\u03A4', '\u03A5', '\u03A6', '\u03A7', 
+		'\u03A8', '\u03A9', '\u03AA', '\u03AB', '\u03AC', '\u03AD', 
+		'\u03AE', '\u03AF', '\u03B0', '\u03B1', '\u03B2', '\u03B3', 
+		'\u03B4', '\u03B5', '\u03B6', '\u03B7', '\u03B8', '\u03B9', 
+		'\u03BA', '\u03BB', '\u03BC', '\u03BD', '\u03BE', '\u03BF', 
+		'\u03C0', '\u03C1', '\u03C2', '\u03C3', '\u03C4', '\u03C5', 
+		'\u03C6', '\u03C7', '\u03C8', '\u03C9', '\u03CA', '\u03CB', 
+		'\u03CC', '\u03CD', '\u03CE', '\u003F', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A3:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B7:
+				case 0x00BB:
+				case 0x00BD:
+					break;
+				case 0x0385:
+				case 0x0386:
+				case 0x0387:
+				case 0x0388:
+				case 0x0389:
+				case 0x038A:
+					ch -= 0x02D0;
+					break;
+				case 0x038C: ch = 0xBC; break;
+				case 0x038E:
+				case 0x038F:
+				case 0x0390:
+				case 0x0391:
+				case 0x0392:
+				case 0x0393:
+				case 0x0394:
+				case 0x0395:
+				case 0x0396:
+				case 0x0397:
+				case 0x0398:
+				case 0x0399:
+				case 0x039A:
+				case 0x039B:
+				case 0x039C:
+				case 0x039D:
+				case 0x039E:
+				case 0x039F:
+				case 0x03A0:
+				case 0x03A1:
+					ch -= 0x02D0;
+					break;
+				case 0x03A3:
+				case 0x03A4:
+				case 0x03A5:
+				case 0x03A6:
+				case 0x03A7:
+				case 0x03A8:
+				case 0x03A9:
+				case 0x03AA:
+				case 0x03AB:
+				case 0x03AC:
+				case 0x03AD:
+				case 0x03AE:
+				case 0x03AF:
+				case 0x03B0:
+				case 0x03B1:
+				case 0x03B2:
+				case 0x03B3:
+				case 0x03B4:
+				case 0x03B5:
+				case 0x03B6:
+				case 0x03B7:
+				case 0x03B8:
+				case 0x03B9:
+				case 0x03BA:
+				case 0x03BB:
+				case 0x03BC:
+				case 0x03BD:
+				case 0x03BE:
+				case 0x03BF:
+				case 0x03C0:
+				case 0x03C1:
+				case 0x03C2:
+				case 0x03C3:
+				case 0x03C4:
+				case 0x03C5:
+				case 0x03C6:
+				case 0x03C7:
+				case 0x03C8:
+				case 0x03C9:
+				case 0x03CA:
+				case 0x03CB:
+				case 0x03CC:
+				case 0x03CD:
+				case 0x03CE:
+					ch -= 0x02D0;
+					break;
+				case 0x03D5: ch = 0xF6; break;
+				case 0x2015: ch = 0xAF; break;
+				case 0x2018: ch = 0xA1; break;
+				case 0x2019: ch = 0xA2; break;
+				case 0x20AC: ch = 0xA4; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 161) switch(ch)
+			{
+				case 0x00A3:
+				case 0x00A6:
+				case 0x00A7:
+				case 0x00A8:
+				case 0x00A9:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B4:
+				case 0x00B7:
+				case 0x00BB:
+				case 0x00BD:
+					break;
+				case 0x0385:
+				case 0x0386:
+				case 0x0387:
+				case 0x0388:
+				case 0x0389:
+				case 0x038A:
+					ch -= 0x02D0;
+					break;
+				case 0x038C: ch = 0xBC; break;
+				case 0x038E:
+				case 0x038F:
+				case 0x0390:
+				case 0x0391:
+				case 0x0392:
+				case 0x0393:
+				case 0x0394:
+				case 0x0395:
+				case 0x0396:
+				case 0x0397:
+				case 0x0398:
+				case 0x0399:
+				case 0x039A:
+				case 0x039B:
+				case 0x039C:
+				case 0x039D:
+				case 0x039E:
+				case 0x039F:
+				case 0x03A0:
+				case 0x03A1:
+					ch -= 0x02D0;
+					break;
+				case 0x03A3:
+				case 0x03A4:
+				case 0x03A5:
+				case 0x03A6:
+				case 0x03A7:
+				case 0x03A8:
+				case 0x03A9:
+				case 0x03AA:
+				case 0x03AB:
+				case 0x03AC:
+				case 0x03AD:
+				case 0x03AE:
+				case 0x03AF:
+				case 0x03B0:
+				case 0x03B1:
+				case 0x03B2:
+				case 0x03B3:
+				case 0x03B4:
+				case 0x03B5:
+				case 0x03B6:
+				case 0x03B7:
+				case 0x03B8:
+				case 0x03B9:
+				case 0x03BA:
+				case 0x03BB:
+				case 0x03BC:
+				case 0x03BD:
+				case 0x03BE:
+				case 0x03BF:
+				case 0x03C0:
+				case 0x03C1:
+				case 0x03C2:
+				case 0x03C3:
+				case 0x03C4:
+				case 0x03C5:
+				case 0x03C6:
+				case 0x03C7:
+				case 0x03C8:
+				case 0x03C9:
+				case 0x03CA:
+				case 0x03CB:
+				case 0x03CC:
+				case 0x03CD:
+				case 0x03CE:
+					ch -= 0x02D0;
+					break;
+				case 0x03D5: ch = 0xF6; break;
+				case 0x2015: ch = 0xAF; break;
+				case 0x2018: ch = 0xA1; break;
+				case 0x2019: ch = 0xA2; break;
+				case 0x20AC: ch = 0xA4; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP28597
+
+public class ENCiso_8859_7 : CP28597
+{
+	public ENCiso_8859_7() : base() {}
+
+}; // class ENCiso_8859_7
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP28605.cs b/mcs/class/I18N/West/CP28605.cs
new file mode 100644
index 00000000000..71ab3c9f01d
--- /dev/null
+++ b/mcs/class/I18N/West/CP28605.cs
@@ -0,0 +1,327 @@
+/*
+ * CP28605.cs - Latin 9 (ISO) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-923.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP28605 : ByteEncoding
+{
+	public CP28605()
+		: base(28605, ToChars, "Latin 9 (ISO)",
+		       "iso-8859-15", "iso-8859-15", "iso-8859-15",
+		       false, true, true, true, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001A', '\u001B', '\u001C', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u007F', '\u0080', '\u0081', '\u0082', '\u0083', 
+		'\u0084', '\u0085', '\u0086', '\u0087', '\u0088', '\u0089', 
+		'\u008A', '\u008B', '\u008C', '\u008D', '\u008E', '\u008F', 
+		'\u0090', '\u0091', '\u0092', '\u0093', '\u0094', '\u0095', 
+		'\u0096', '\u0097', '\u0098', '\u0099', '\u009A', '\u009B', 
+		'\u009C', '\u009D', '\u009E', '\u009F', '\u00A0', '\u00A1', 
+		'\u00A2', '\u00A3', '\u20AC', '\u00A5', '\u0160', '\u00A7', 
+		'\u0161', '\u00A9', '\u00AA', '\u00AB', '\u00AC', '\u00AD', 
+		'\u00AE', '\u00AF', '\u00B0', '\u00B1', '\u00B2', '\u00B3', 
+		'\u017D', '\u00B5', '\u00B6', '\u00B7', '\u017E', '\u00B9', 
+		'\u00BA', '\u00BB', '\u0152', '\u0153', '\u0178', '\u00BF', 
+		'\u00C0', '\u00C1', '\u00C2', '\u00C3', '\u00C4', '\u00C5', 
+		'\u00C6', '\u00C7', '\u00C8', '\u00C9', '\u00CA', '\u00CB', 
+		'\u00CC', '\u00CD', '\u00CE', '\u00CF', '\u00D0', '\u00D1', 
+		'\u00D2', '\u00D3', '\u00D4', '\u00D5', '\u00D6', '\u00D7', 
+		'\u00D8', '\u00D9', '\u00DA', '\u00DB', '\u00DC', '\u00DD', 
+		'\u00DE', '\u00DF', '\u00E0', '\u00E1', '\u00E2', '\u00E3', 
+		'\u00E4', '\u00E5', '\u00E6', '\u00E7', '\u00E8', '\u00E9', 
+		'\u00EA', '\u00EB', '\u00EC', '\u00ED', '\u00EE', '\u00EF', 
+		'\u00F0', '\u00F1', '\u00F2', '\u00F3', '\u00F4', '\u00F5', 
+		'\u00F6', '\u00F7', '\u00F8', '\u00F9', '\u00FA', '\u00FB', 
+		'\u00FC', '\u00FD', '\u00FE', '\u00FF', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 164) switch(ch)
+			{
+				case 0x00A5:
+				case 0x00A7:
+				case 0x00A9:
+				case 0x00AA:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B9:
+				case 0x00BA:
+				case 0x00BB:
+				case 0x00BF:
+				case 0x00C0:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C3:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C6:
+				case 0x00C7:
+				case 0x00C8:
+				case 0x00C9:
+				case 0x00CA:
+				case 0x00CB:
+				case 0x00CC:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00CF:
+				case 0x00D0:
+				case 0x00D1:
+				case 0x00D2:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DD:
+				case 0x00DE:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E3:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EC:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F0:
+				case 0x00F1:
+				case 0x00F2:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+				case 0x00FD:
+				case 0x00FE:
+				case 0x00FF:
+					break;
+				case 0x0152: ch = 0xBC; break;
+				case 0x0153: ch = 0xBD; break;
+				case 0x0160: ch = 0xA6; break;
+				case 0x0161: ch = 0xA8; break;
+				case 0x0178: ch = 0xBE; break;
+				case 0x017D: ch = 0xB4; break;
+				case 0x017E: ch = 0xB8; break;
+				case 0x20AC: ch = 0xA4; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 164) switch(ch)
+			{
+				case 0x00A5:
+				case 0x00A7:
+				case 0x00A9:
+				case 0x00AA:
+				case 0x00AB:
+				case 0x00AC:
+				case 0x00AD:
+				case 0x00AE:
+				case 0x00AF:
+				case 0x00B0:
+				case 0x00B1:
+				case 0x00B2:
+				case 0x00B3:
+				case 0x00B5:
+				case 0x00B6:
+				case 0x00B7:
+				case 0x00B9:
+				case 0x00BA:
+				case 0x00BB:
+				case 0x00BF:
+				case 0x00C0:
+				case 0x00C1:
+				case 0x00C2:
+				case 0x00C3:
+				case 0x00C4:
+				case 0x00C5:
+				case 0x00C6:
+				case 0x00C7:
+				case 0x00C8:
+				case 0x00C9:
+				case 0x00CA:
+				case 0x00CB:
+				case 0x00CC:
+				case 0x00CD:
+				case 0x00CE:
+				case 0x00CF:
+				case 0x00D0:
+				case 0x00D1:
+				case 0x00D2:
+				case 0x00D3:
+				case 0x00D4:
+				case 0x00D5:
+				case 0x00D6:
+				case 0x00D7:
+				case 0x00D8:
+				case 0x00D9:
+				case 0x00DA:
+				case 0x00DB:
+				case 0x00DC:
+				case 0x00DD:
+				case 0x00DE:
+				case 0x00DF:
+				case 0x00E0:
+				case 0x00E1:
+				case 0x00E2:
+				case 0x00E3:
+				case 0x00E4:
+				case 0x00E5:
+				case 0x00E6:
+				case 0x00E7:
+				case 0x00E8:
+				case 0x00E9:
+				case 0x00EA:
+				case 0x00EB:
+				case 0x00EC:
+				case 0x00ED:
+				case 0x00EE:
+				case 0x00EF:
+				case 0x00F0:
+				case 0x00F1:
+				case 0x00F2:
+				case 0x00F3:
+				case 0x00F4:
+				case 0x00F5:
+				case 0x00F6:
+				case 0x00F7:
+				case 0x00F8:
+				case 0x00F9:
+				case 0x00FA:
+				case 0x00FB:
+				case 0x00FC:
+				case 0x00FD:
+				case 0x00FE:
+				case 0x00FF:
+					break;
+				case 0x0152: ch = 0xBC; break;
+				case 0x0153: ch = 0xBD; break;
+				case 0x0160: ch = 0xA6; break;
+				case 0x0161: ch = 0xA8; break;
+				case 0x0178: ch = 0xBE; break;
+				case 0x017D: ch = 0xB4; break;
+				case 0x017E: ch = 0xB8; break;
+				case 0x20AC: ch = 0xA4; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP28605
+
+public class ENCiso_8859_15 : CP28605
+{
+	public ENCiso_8859_15() : base() {}
+
+}; // class ENCiso_8859_15
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP437.cs b/mcs/class/I18N/West/CP437.cs
new file mode 100644
index 00000000000..8a67bfd158e
--- /dev/null
+++ b/mcs/class/I18N/West/CP437.cs
@@ -0,0 +1,681 @@
+/*
+ * CP437.cs - OEM United States code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-437.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP437 : ByteEncoding
+{
+	public CP437()
+		: base(437, ToChars, "OEM United States",
+		       "IBM437", "IBM437", "IBM437",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u00C7', '\u00FC', '\u00E9', '\u00E2', 
+		'\u00E4', '\u00E0', '\u00E5', '\u00E7', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00EF', '\u00EE', '\u00EC', '\u00C4', '\u00C5', 
+		'\u00C9', '\u00E6', '\u00C6', '\u00F4', '\u00F6', '\u00F2', 
+		'\u00FB', '\u00F9', '\u00FF', '\u00D6', '\u00DC', '\u00A2', 
+		'\u00A3', '\u00A5', '\u20A7', '\u0192', '\u00E1', '\u00ED', 
+		'\u00F3', '\u00FA', '\u00F1', '\u00D1', '\u00AA', '\u00BA', 
+		'\u00BF', '\u2310', '\u00AC', '\u00BD', '\u00BC', '\u00A1', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u2561', '\u2562', '\u2556', '\u2555', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u255C', '\u255B', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u255E', '\u255F', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564', 
+		'\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B', 
+		'\u256A', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C', 
+		'\u2590', '\u2580', '\u03B1', '\u00DF', '\u0393', '\u03C0', 
+		'\u03A3', '\u03C3', '\u03BC', '\u03C4', '\u03A6', '\u0398', 
+		'\u03A9', '\u03B4', '\u221E', '\u03C6', '\u03B5', '\u2229', 
+		'\u2261', '\u00B1', '\u2265', '\u2264', '\u2320', '\u2321', 
+		'\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', '\u221A', 
+		'\u207F', '\u00B2', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0x9B; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A5: ch = 0x9D; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00EC: ch = 0x8D; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FF: ch = 0x98; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x20A7: ch = 0x9E; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2310: ch = 0xA9; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0x9B; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A5: ch = 0x9D; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00EC: ch = 0x8D; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FF: ch = 0x98; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x20A7: ch = 0x9E; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2310: ch = 0xA9; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP437
+
+public class ENCibm437 : CP437
+{
+	public ENCibm437() : base() {}
+
+}; // class ENCibm437
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP850.cs b/mcs/class/I18N/West/CP850.cs
new file mode 100644
index 00000000000..6d8f744fb00
--- /dev/null
+++ b/mcs/class/I18N/West/CP850.cs
@@ -0,0 +1,681 @@
+/*
+ * CP850.cs - Western European (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-850.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP850 : ByteEncoding
+{
+	public CP850()
+		: base(850, ToChars, "Western European (DOS)",
+		       "ibm850", "ibm850", "ibm850",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u00C7', '\u00FC', '\u00E9', '\u00E2', 
+		'\u00E4', '\u00E0', '\u00E5', '\u00E7', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00EF', '\u00EE', '\u00EC', '\u00C4', '\u00C5', 
+		'\u00C9', '\u00E6', '\u00C6', '\u00F4', '\u00F6', '\u00F2', 
+		'\u00FB', '\u00F9', '\u00FF', '\u00D6', '\u00DC', '\u00F8', 
+		'\u00A3', '\u00D8', '\u00D7', '\u0192', '\u00E1', '\u00ED', 
+		'\u00F3', '\u00FA', '\u00F1', '\u00D1', '\u00AA', '\u00BA', 
+		'\u00BF', '\u00AE', '\u00AC', '\u00BD', '\u00BC', '\u00A1', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u00C1', '\u00C2', '\u00C0', '\u00A9', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u00A2', '\u00A5', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u00E3', '\u00C3', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u00A4', '\u00F0', '\u00D0', 
+		'\u00CA', '\u00CB', '\u00C8', '\u0131', '\u00CD', '\u00CE', 
+		'\u00CF', '\u2518', '\u250C', '\u2588', '\u2584', '\u00A6', 
+		'\u00CC', '\u2580', '\u00D3', '\u00DF', '\u00D4', '\u00D2', 
+		'\u00F5', '\u00D5', '\u00B5', '\u00FE', '\u00DE', '\u00DA', 
+		'\u00DB', '\u00D9', '\u00FD', '\u00DD', '\u00AF', '\u00B4', 
+		'\u00AD', '\u00B1', '\u2017', '\u00BE', '\u00B6', '\u00A7', 
+		'\u00F7', '\u00B8', '\u00B0', '\u00A8', '\u00B7', '\u00B9', 
+		'\u00B3', '\u00B2', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0xBD; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A4: ch = 0xCF; break;
+				case 0x00A5: ch = 0xBE; break;
+				case 0x00A6: ch = 0xDD; break;
+				case 0x00A7: ch = 0xF5; break;
+				case 0x00A8: ch = 0xF9; break;
+				case 0x00A9: ch = 0xB8; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00AE: ch = 0xA9; break;
+				case 0x00AF: ch = 0xEE; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B3: ch = 0xFC; break;
+				case 0x00B4: ch = 0xEF; break;
+				case 0x00B5: ch = 0xE6; break;
+				case 0x00B6: ch = 0xF4; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00B8: ch = 0xF7; break;
+				case 0x00B9: ch = 0xFB; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BE: ch = 0xF3; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C0: ch = 0xB7; break;
+				case 0x00C1: ch = 0xB5; break;
+				case 0x00C2: ch = 0xB6; break;
+				case 0x00C3: ch = 0xC7; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C8: ch = 0xD4; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CA: ch = 0xD2; break;
+				case 0x00CB: ch = 0xD3; break;
+				case 0x00CC: ch = 0xDE; break;
+				case 0x00CD: ch = 0xD6; break;
+				case 0x00CE: ch = 0xD7; break;
+				case 0x00CF: ch = 0xD8; break;
+				case 0x00D0: ch = 0xD1; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D2: ch = 0xE3; break;
+				case 0x00D3: ch = 0xE0; break;
+				case 0x00D4: ch = 0xE2; break;
+				case 0x00D5: ch = 0xE5; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D7: ch = 0x9E; break;
+				case 0x00D8: ch = 0x9D; break;
+				case 0x00D9: ch = 0xEB; break;
+				case 0x00DA: ch = 0xE9; break;
+				case 0x00DB: ch = 0xEA; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DD: ch = 0xED; break;
+				case 0x00DE: ch = 0xE8; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E3: ch = 0xC6; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00EC: ch = 0x8D; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F0: ch = 0xD0; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F5: ch = 0xE4; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F8: ch = 0x9B; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FD: ch = 0xEC; break;
+				case 0x00FE: ch = 0xE7; break;
+				case 0x00FF: ch = 0x98; break;
+				case 0x0110: ch = 0xD1; break;
+				case 0x0131: ch = 0xD5; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x2017: ch = 0xF2; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x203E: ch = 0xEE; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266C: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0xBD; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A4: ch = 0xCF; break;
+				case 0x00A5: ch = 0xBE; break;
+				case 0x00A6: ch = 0xDD; break;
+				case 0x00A7: ch = 0xF5; break;
+				case 0x00A8: ch = 0xF9; break;
+				case 0x00A9: ch = 0xB8; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00AD: ch = 0xF0; break;
+				case 0x00AE: ch = 0xA9; break;
+				case 0x00AF: ch = 0xEE; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B3: ch = 0xFC; break;
+				case 0x00B4: ch = 0xEF; break;
+				case 0x00B5: ch = 0xE6; break;
+				case 0x00B6: ch = 0xF4; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00B8: ch = 0xF7; break;
+				case 0x00B9: ch = 0xFB; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BE: ch = 0xF3; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C0: ch = 0xB7; break;
+				case 0x00C1: ch = 0xB5; break;
+				case 0x00C2: ch = 0xB6; break;
+				case 0x00C3: ch = 0xC7; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C8: ch = 0xD4; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CA: ch = 0xD2; break;
+				case 0x00CB: ch = 0xD3; break;
+				case 0x00CC: ch = 0xDE; break;
+				case 0x00CD: ch = 0xD6; break;
+				case 0x00CE: ch = 0xD7; break;
+				case 0x00CF: ch = 0xD8; break;
+				case 0x00D0: ch = 0xD1; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D2: ch = 0xE3; break;
+				case 0x00D3: ch = 0xE0; break;
+				case 0x00D4: ch = 0xE2; break;
+				case 0x00D5: ch = 0xE5; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D7: ch = 0x9E; break;
+				case 0x00D8: ch = 0x9D; break;
+				case 0x00D9: ch = 0xEB; break;
+				case 0x00DA: ch = 0xE9; break;
+				case 0x00DB: ch = 0xEA; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DD: ch = 0xED; break;
+				case 0x00DE: ch = 0xE8; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E3: ch = 0xC6; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00EC: ch = 0x8D; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F0: ch = 0xD0; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F5: ch = 0xE4; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F8: ch = 0x9B; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FD: ch = 0xEC; break;
+				case 0x00FE: ch = 0xE7; break;
+				case 0x00FF: ch = 0x98; break;
+				case 0x0110: ch = 0xD1; break;
+				case 0x0131: ch = 0xD5; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x2017: ch = 0xF2; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x203E: ch = 0xEE; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266C: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP850
+
+public class ENCibm850 : CP850
+{
+	public ENCibm850() : base() {}
+
+}; // class ENCibm850
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP860.cs b/mcs/class/I18N/West/CP860.cs
new file mode 100644
index 00000000000..ebb0b569de8
--- /dev/null
+++ b/mcs/class/I18N/West/CP860.cs
@@ -0,0 +1,681 @@
+/*
+ * CP860.cs - Portuguese (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-860.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP860 : ByteEncoding
+{
+	public CP860()
+		: base(860, ToChars, "Portuguese (DOS)",
+		       "ibm860", "ibm860", "ibm860",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u00C7', '\u00FC', '\u00E9', '\u00E2', 
+		'\u00E3', '\u00E0', '\u00C1', '\u00E7', '\u00EA', '\u00CA', 
+		'\u00E8', '\u00CD', '\u00D4', '\u00EC', '\u00C3', '\u00C2', 
+		'\u00C9', '\u00C0', '\u00C8', '\u00F4', '\u00F5', '\u00F2', 
+		'\u00DA', '\u00F9', '\u00CC', '\u00D5', '\u00DC', '\u00A2', 
+		'\u00A3', '\u00D9', '\u20A7', '\u00D3', '\u00E1', '\u00ED', 
+		'\u00F3', '\u00FA', '\u00F1', '\u00D1', '\u00AA', '\u00BA', 
+		'\u00BF', '\u00D2', '\u00AC', '\u00BD', '\u00BC', '\u00A1', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u2561', '\u2562', '\u2556', '\u2555', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u255C', '\u255B', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u255E', '\u255F', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564', 
+		'\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B', 
+		'\u256A', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C', 
+		'\u2590', '\u2580', '\u03B1', '\u00DF', '\u0393', '\u03C0', 
+		'\u03A3', '\u03C3', '\u03BC', '\u03C4', '\u03A6', '\u0398', 
+		'\u03A9', '\u03B4', '\u221E', '\u03C6', '\u03B5', '\u2229', 
+		'\u2261', '\u00B1', '\u2265', '\u2264', '\u2320', '\u2321', 
+		'\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', '\u221A', 
+		'\u207F', '\u00B2', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0x9B; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C0: ch = 0x91; break;
+				case 0x00C1: ch = 0x86; break;
+				case 0x00C2: ch = 0x8F; break;
+				case 0x00C3: ch = 0x8E; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C8: ch = 0x92; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CA: ch = 0x89; break;
+				case 0x00CC: ch = 0x98; break;
+				case 0x00CD: ch = 0x8B; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D2: ch = 0xA9; break;
+				case 0x00D3: ch = 0x9F; break;
+				case 0x00D4: ch = 0x8C; break;
+				case 0x00D5: ch = 0x99; break;
+				case 0x00D9: ch = 0x9D; break;
+				case 0x00DA: ch = 0x96; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E3: ch = 0x84; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EC: ch = 0x8D; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F5: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x20A7: ch = 0x9E; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A2: ch = 0x9B; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C0: ch = 0x91; break;
+				case 0x00C1: ch = 0x86; break;
+				case 0x00C2: ch = 0x8F; break;
+				case 0x00C3: ch = 0x8E; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C8: ch = 0x92; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CA: ch = 0x89; break;
+				case 0x00CC: ch = 0x98; break;
+				case 0x00CD: ch = 0x8B; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D2: ch = 0xA9; break;
+				case 0x00D3: ch = 0x9F; break;
+				case 0x00D4: ch = 0x8C; break;
+				case 0x00D5: ch = 0x99; break;
+				case 0x00D9: ch = 0x9D; break;
+				case 0x00DA: ch = 0x96; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E3: ch = 0x84; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EC: ch = 0x8D; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F5: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x20A7: ch = 0x9E; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP860
+
+public class ENCibm860 : CP860
+{
+	public ENCibm860() : base() {}
+
+}; // class ENCibm860
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP861.cs b/mcs/class/I18N/West/CP861.cs
new file mode 100644
index 00000000000..cfb6073c6d6
--- /dev/null
+++ b/mcs/class/I18N/West/CP861.cs
@@ -0,0 +1,681 @@
+/*
+ * CP861.cs - Icelandic (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-861.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP861 : ByteEncoding
+{
+	public CP861()
+		: base(861, ToChars, "Icelandic (DOS)",
+		       "ibm861", "ibm861", "ibm861",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u00C7', '\u00FC', '\u00E9', '\u00E2', 
+		'\u00E4', '\u00E0', '\u00E5', '\u00E7', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00D0', '\u00F0', '\u00DE', '\u00C4', '\u00C5', 
+		'\u00C9', '\u00E6', '\u00C6', '\u00F4', '\u00F6', '\u00FE', 
+		'\u00FB', '\u00DD', '\u00FD', '\u00D6', '\u00DC', '\u00F8', 
+		'\u00A3', '\u00D8', '\u20A7', '\u0192', '\u00E1', '\u00ED', 
+		'\u00F3', '\u00FA', '\u00C1', '\u00CD', '\u00D3', '\u00DA', 
+		'\u00BF', '\u2310', '\u00AC', '\u00BD', '\u00BC', '\u00A1', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u2561', '\u2562', '\u2556', '\u2555', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u255C', '\u255B', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u255E', '\u255F', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564', 
+		'\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B', 
+		'\u256A', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C', 
+		'\u2590', '\u2580', '\u03B1', '\u00DF', '\u0393', '\u03C0', 
+		'\u03A3', '\u03C3', '\u03BC', '\u03C4', '\u03A6', '\u0398', 
+		'\u03A9', '\u03B4', '\u221E', '\u03C6', '\u03B5', '\u2229', 
+		'\u2261', '\u00B1', '\u2265', '\u2264', '\u2320', '\u2321', 
+		'\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', '\u221A', 
+		'\u207F', '\u00B2', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C1: ch = 0xA4; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CD: ch = 0xA5; break;
+				case 0x00D0: ch = 0x8B; break;
+				case 0x00D3: ch = 0xA6; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D8: ch = 0x9D; break;
+				case 0x00DA: ch = 0xA7; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DD: ch = 0x97; break;
+				case 0x00DE: ch = 0x8D; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F8: ch = 0x9B; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FD: ch = 0x98; break;
+				case 0x00FE: ch = 0x95; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x20A7: ch = 0x9E; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2310: ch = 0xA9; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C1: ch = 0xA4; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CD: ch = 0xA5; break;
+				case 0x00D0: ch = 0x8B; break;
+				case 0x00D3: ch = 0xA6; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D8: ch = 0x9D; break;
+				case 0x00DA: ch = 0xA7; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DD: ch = 0x97; break;
+				case 0x00DE: ch = 0x8D; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00F0: ch = 0x8C; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F8: ch = 0x9B; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FD: ch = 0x98; break;
+				case 0x00FE: ch = 0x95; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x20A7: ch = 0x9E; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2310: ch = 0xA9; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP861
+
+public class ENCibm861 : CP861
+{
+	public ENCibm861() : base() {}
+
+}; // class ENCibm861
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP863.cs b/mcs/class/I18N/West/CP863.cs
new file mode 100644
index 00000000000..250dbb50975
--- /dev/null
+++ b/mcs/class/I18N/West/CP863.cs
@@ -0,0 +1,679 @@
+/*
+ * CP863.cs - French Canadian (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-863.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP863 : ByteEncoding
+{
+	public CP863()
+		: base(863, ToChars, "French Canadian (DOS)",
+		       "IBM863", "IBM863", "IBM863",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u00C7', '\u00FC', '\u00E9', '\u00E2', 
+		'\u00C2', '\u00E0', '\u00B6', '\u00E7', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00EF', '\u00EE', '\u2017', '\u00C0', '\u00A7', 
+		'\u00C9', '\u00C8', '\u00CA', '\u00F4', '\u00CB', '\u00CF', 
+		'\u00FB', '\u00F9', '\u00A4', '\u00D4', '\u00DC', '\u00A2', 
+		'\u00A3', '\u00D9', '\u00DB', '\u0192', '\u00A6', '\u00B4', 
+		'\u00F3', '\u00FA', '\u00A8', '\u00B8', '\u00B3', '\u00AF', 
+		'\u00CE', '\u2310', '\u00AC', '\u00BD', '\u00BC', '\u00BE', 
+		'\u00AB', '\u00BB', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u2561', '\u2562', '\u2556', '\u2555', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u255C', '\u255B', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u255E', '\u255F', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564', 
+		'\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B', 
+		'\u256A', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C', 
+		'\u2590', '\u2580', '\u03B1', '\u00DF', '\u0393', '\u03C0', 
+		'\u03A3', '\u03C3', '\u03BC', '\u03C4', '\u03A6', '\u0398', 
+		'\u03A9', '\u03B4', '\u221E', '\u03C6', '\u03B5', '\u2229', 
+		'\u2261', '\u00B1', '\u2265', '\u2264', '\u2320', '\u2321', 
+		'\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', '\u221A', 
+		'\u207F', '\u00B2', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A2: ch = 0x9B; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A4: ch = 0x98; break;
+				case 0x00A6: ch = 0xA0; break;
+				case 0x00A7: ch = 0x8F; break;
+				case 0x00A8: ch = 0xA4; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00AF: ch = 0xA7; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B3: ch = 0xA6; break;
+				case 0x00B4: ch = 0xA1; break;
+				case 0x00B6: ch = 0x86; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00B8: ch = 0xA5; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BE: ch = 0xAD; break;
+				case 0x00C0: ch = 0x8E; break;
+				case 0x00C2: ch = 0x84; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C8: ch = 0x91; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CA: ch = 0x92; break;
+				case 0x00CB: ch = 0x94; break;
+				case 0x00CE: ch = 0xA8; break;
+				case 0x00CF: ch = 0x95; break;
+				case 0x00D4: ch = 0x99; break;
+				case 0x00D9: ch = 0x9D; break;
+				case 0x00DB: ch = 0x9E; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x2017: ch = 0x8D; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x203E: ch = 0xA7; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2310: ch = 0xA9; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A2: ch = 0x9B; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A4: ch = 0x98; break;
+				case 0x00A6: ch = 0xA0; break;
+				case 0x00A7: ch = 0x8F; break;
+				case 0x00A8: ch = 0xA4; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00AF: ch = 0xA7; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B3: ch = 0xA6; break;
+				case 0x00B4: ch = 0xA1; break;
+				case 0x00B6: ch = 0x86; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00B8: ch = 0xA5; break;
+				case 0x00BB: ch = 0xAF; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BE: ch = 0xAD; break;
+				case 0x00C0: ch = 0x8E; break;
+				case 0x00C2: ch = 0x84; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C8: ch = 0x91; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00CA: ch = 0x92; break;
+				case 0x00CB: ch = 0x94; break;
+				case 0x00CE: ch = 0xA8; break;
+				case 0x00CF: ch = 0x95; break;
+				case 0x00D4: ch = 0x99; break;
+				case 0x00D9: ch = 0x9D; break;
+				case 0x00DB: ch = 0x9E; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x2017: ch = 0x8D; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x203E: ch = 0xA7; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2310: ch = 0xA9; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP863
+
+public class ENCibm863 : CP863
+{
+	public ENCibm863() : base() {}
+
+}; // class ENCibm863
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/CP865.cs b/mcs/class/I18N/West/CP865.cs
new file mode 100644
index 00000000000..011d4f164bd
--- /dev/null
+++ b/mcs/class/I18N/West/CP865.cs
@@ -0,0 +1,681 @@
+/*
+ * CP865.cs - Nordic (DOS) code page.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+// Generated from "ibm-865.ucm".
+
+namespace I18N.West
+{
+
+using System;
+using I18N.Common;
+
+public class CP865 : ByteEncoding
+{
+	public CP865()
+		: base(865, ToChars, "Nordic (DOS)",
+		       "IBM863", "IBM865", "IBM865",
+		       false, false, false, false, 1252)
+	{}
+
+	private static readonly char[] ToChars = {
+		'\u0000', '\u0001', '\u0002', '\u0003', '\u0004', '\u0005', 
+		'\u0006', '\u0007', '\u0008', '\u0009', '\u000A', '\u000B', 
+		'\u000C', '\u000D', '\u000E', '\u000F', '\u0010', '\u0011', 
+		'\u0012', '\u0013', '\u0014', '\u0015', '\u0016', '\u0017', 
+		'\u0018', '\u0019', '\u001C', '\u001B', '\u007F', '\u001D', 
+		'\u001E', '\u001F', '\u0020', '\u0021', '\u0022', '\u0023', 
+		'\u0024', '\u0025', '\u0026', '\u0027', '\u0028', '\u0029', 
+		'\u002A', '\u002B', '\u002C', '\u002D', '\u002E', '\u002F', 
+		'\u0030', '\u0031', '\u0032', '\u0033', '\u0034', '\u0035', 
+		'\u0036', '\u0037', '\u0038', '\u0039', '\u003A', '\u003B', 
+		'\u003C', '\u003D', '\u003E', '\u003F', '\u0040', '\u0041', 
+		'\u0042', '\u0043', '\u0044', '\u0045', '\u0046', '\u0047', 
+		'\u0048', '\u0049', '\u004A', '\u004B', '\u004C', '\u004D', 
+		'\u004E', '\u004F', '\u0050', '\u0051', '\u0052', '\u0053', 
+		'\u0054', '\u0055', '\u0056', '\u0057', '\u0058', '\u0059', 
+		'\u005A', '\u005B', '\u005C', '\u005D', '\u005E', '\u005F', 
+		'\u0060', '\u0061', '\u0062', '\u0063', '\u0064', '\u0065', 
+		'\u0066', '\u0067', '\u0068', '\u0069', '\u006A', '\u006B', 
+		'\u006C', '\u006D', '\u006E', '\u006F', '\u0070', '\u0071', 
+		'\u0072', '\u0073', '\u0074', '\u0075', '\u0076', '\u0077', 
+		'\u0078', '\u0079', '\u007A', '\u007B', '\u007C', '\u007D', 
+		'\u007E', '\u001A', '\u00C7', '\u00FC', '\u00E9', '\u00E2', 
+		'\u00E4', '\u00E0', '\u00E5', '\u00E7', '\u00EA', '\u00EB', 
+		'\u00E8', '\u00EF', '\u00EE', '\u00EC', '\u00C4', '\u00C5', 
+		'\u00C9', '\u00E6', '\u00C6', '\u00F4', '\u00F6', '\u00F2', 
+		'\u00FB', '\u00F9', '\u00FF', '\u00D6', '\u00DC', '\u00F8', 
+		'\u00A3', '\u00D8', '\u20A7', '\u0192', '\u00E1', '\u00ED', 
+		'\u00F3', '\u00FA', '\u00F1', '\u00D1', '\u00AA', '\u00BA', 
+		'\u00BF', '\u2310', '\u00AC', '\u00BD', '\u00BC', '\u00A1', 
+		'\u00AB', '\u00A4', '\u2591', '\u2592', '\u2593', '\u2502', 
+		'\u2524', '\u2561', '\u2562', '\u2556', '\u2555', '\u2563', 
+		'\u2551', '\u2557', '\u255D', '\u255C', '\u255B', '\u2510', 
+		'\u2514', '\u2534', '\u252C', '\u251C', '\u2500', '\u253C', 
+		'\u255E', '\u255F', '\u255A', '\u2554', '\u2569', '\u2566', 
+		'\u2560', '\u2550', '\u256C', '\u2567', '\u2568', '\u2564', 
+		'\u2565', '\u2559', '\u2558', '\u2552', '\u2553', '\u256B', 
+		'\u256A', '\u2518', '\u250C', '\u2588', '\u2584', '\u258C', 
+		'\u2590', '\u2580', '\u03B1', '\u00DF', '\u0393', '\u03C0', 
+		'\u03A3', '\u03C3', '\u03BC', '\u03C4', '\u03A6', '\u0398', 
+		'\u03A9', '\u03B4', '\u221E', '\u03C6', '\u03B5', '\u2229', 
+		'\u2261', '\u00B1', '\u2265', '\u2264', '\u2320', '\u2321', 
+		'\u00F7', '\u2248', '\u00B0', '\u2219', '\u00B7', '\u221A', 
+		'\u207F', '\u00B2', '\u25A0', '\u00A0', 
+	};
+
+	protected override void ToBytes(char[] chars, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(chars[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A4: ch = 0xAF; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D8: ch = 0x9D; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00EC: ch = 0x8D; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F8: ch = 0x9B; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FF: ch = 0x98; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x20A7: ch = 0x9E; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2310: ch = 0xA9; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+	protected override void ToBytes(String s, int charIndex, int charCount,
+	                                byte[] bytes, int byteIndex)
+	{
+		int ch;
+		while(charCount > 0)
+		{
+			ch = (int)(s[charIndex++]);
+			if(ch >= 26) switch(ch)
+			{
+				case 0x001B:
+				case 0x001D:
+				case 0x001E:
+				case 0x001F:
+				case 0x0020:
+				case 0x0021:
+				case 0x0022:
+				case 0x0023:
+				case 0x0024:
+				case 0x0025:
+				case 0x0026:
+				case 0x0027:
+				case 0x0028:
+				case 0x0029:
+				case 0x002A:
+				case 0x002B:
+				case 0x002C:
+				case 0x002D:
+				case 0x002E:
+				case 0x002F:
+				case 0x0030:
+				case 0x0031:
+				case 0x0032:
+				case 0x0033:
+				case 0x0034:
+				case 0x0035:
+				case 0x0036:
+				case 0x0037:
+				case 0x0038:
+				case 0x0039:
+				case 0x003A:
+				case 0x003B:
+				case 0x003C:
+				case 0x003D:
+				case 0x003E:
+				case 0x003F:
+				case 0x0040:
+				case 0x0041:
+				case 0x0042:
+				case 0x0043:
+				case 0x0044:
+				case 0x0045:
+				case 0x0046:
+				case 0x0047:
+				case 0x0048:
+				case 0x0049:
+				case 0x004A:
+				case 0x004B:
+				case 0x004C:
+				case 0x004D:
+				case 0x004E:
+				case 0x004F:
+				case 0x0050:
+				case 0x0051:
+				case 0x0052:
+				case 0x0053:
+				case 0x0054:
+				case 0x0055:
+				case 0x0056:
+				case 0x0057:
+				case 0x0058:
+				case 0x0059:
+				case 0x005A:
+				case 0x005B:
+				case 0x005C:
+				case 0x005D:
+				case 0x005E:
+				case 0x005F:
+				case 0x0060:
+				case 0x0061:
+				case 0x0062:
+				case 0x0063:
+				case 0x0064:
+				case 0x0065:
+				case 0x0066:
+				case 0x0067:
+				case 0x0068:
+				case 0x0069:
+				case 0x006A:
+				case 0x006B:
+				case 0x006C:
+				case 0x006D:
+				case 0x006E:
+				case 0x006F:
+				case 0x0070:
+				case 0x0071:
+				case 0x0072:
+				case 0x0073:
+				case 0x0074:
+				case 0x0075:
+				case 0x0076:
+				case 0x0077:
+				case 0x0078:
+				case 0x0079:
+				case 0x007A:
+				case 0x007B:
+				case 0x007C:
+				case 0x007D:
+				case 0x007E:
+					break;
+				case 0x001A: ch = 0x7F; break;
+				case 0x001C: ch = 0x1A; break;
+				case 0x007F: ch = 0x1C; break;
+				case 0x00A0: ch = 0xFF; break;
+				case 0x00A1: ch = 0xAD; break;
+				case 0x00A3: ch = 0x9C; break;
+				case 0x00A4: ch = 0xAF; break;
+				case 0x00A7: ch = 0x15; break;
+				case 0x00AA: ch = 0xA6; break;
+				case 0x00AB: ch = 0xAE; break;
+				case 0x00AC: ch = 0xAA; break;
+				case 0x00B0: ch = 0xF8; break;
+				case 0x00B1: ch = 0xF1; break;
+				case 0x00B2: ch = 0xFD; break;
+				case 0x00B6: ch = 0x14; break;
+				case 0x00B7: ch = 0xFA; break;
+				case 0x00BA: ch = 0xA7; break;
+				case 0x00BC: ch = 0xAC; break;
+				case 0x00BD: ch = 0xAB; break;
+				case 0x00BF: ch = 0xA8; break;
+				case 0x00C4: ch = 0x8E; break;
+				case 0x00C5: ch = 0x8F; break;
+				case 0x00C6: ch = 0x92; break;
+				case 0x00C7: ch = 0x80; break;
+				case 0x00C9: ch = 0x90; break;
+				case 0x00D1: ch = 0xA5; break;
+				case 0x00D6: ch = 0x99; break;
+				case 0x00D8: ch = 0x9D; break;
+				case 0x00DC: ch = 0x9A; break;
+				case 0x00DF: ch = 0xE1; break;
+				case 0x00E0: ch = 0x85; break;
+				case 0x00E1: ch = 0xA0; break;
+				case 0x00E2: ch = 0x83; break;
+				case 0x00E4: ch = 0x84; break;
+				case 0x00E5: ch = 0x86; break;
+				case 0x00E6: ch = 0x91; break;
+				case 0x00E7: ch = 0x87; break;
+				case 0x00E8: ch = 0x8A; break;
+				case 0x00E9: ch = 0x82; break;
+				case 0x00EA: ch = 0x88; break;
+				case 0x00EB: ch = 0x89; break;
+				case 0x00EC: ch = 0x8D; break;
+				case 0x00ED: ch = 0xA1; break;
+				case 0x00EE: ch = 0x8C; break;
+				case 0x00EF: ch = 0x8B; break;
+				case 0x00F1: ch = 0xA4; break;
+				case 0x00F2: ch = 0x95; break;
+				case 0x00F3: ch = 0xA2; break;
+				case 0x00F4: ch = 0x93; break;
+				case 0x00F6: ch = 0x94; break;
+				case 0x00F7: ch = 0xF6; break;
+				case 0x00F8: ch = 0x9B; break;
+				case 0x00F9: ch = 0x97; break;
+				case 0x00FA: ch = 0xA3; break;
+				case 0x00FB: ch = 0x96; break;
+				case 0x00FC: ch = 0x81; break;
+				case 0x00FF: ch = 0x98; break;
+				case 0x0192: ch = 0x9F; break;
+				case 0x0393: ch = 0xE2; break;
+				case 0x0398: ch = 0xE9; break;
+				case 0x03A3: ch = 0xE4; break;
+				case 0x03A6: ch = 0xE8; break;
+				case 0x03A9: ch = 0xEA; break;
+				case 0x03B1: ch = 0xE0; break;
+				case 0x03B4: ch = 0xEB; break;
+				case 0x03B5: ch = 0xEE; break;
+				case 0x03BC: ch = 0xE6; break;
+				case 0x03C0: ch = 0xE3; break;
+				case 0x03C3: ch = 0xE5; break;
+				case 0x03C4: ch = 0xE7; break;
+				case 0x03C6: ch = 0xED; break;
+				case 0x2022: ch = 0x07; break;
+				case 0x203C: ch = 0x13; break;
+				case 0x207F: ch = 0xFC; break;
+				case 0x20A7: ch = 0x9E; break;
+				case 0x2190: ch = 0x1B; break;
+				case 0x2191: ch = 0x18; break;
+				case 0x2192: ch = 0x1A; break;
+				case 0x2193: ch = 0x19; break;
+				case 0x2194: ch = 0x1D; break;
+				case 0x2195: ch = 0x12; break;
+				case 0x21A8: ch = 0x17; break;
+				case 0x2219: ch = 0xF9; break;
+				case 0x221A: ch = 0xFB; break;
+				case 0x221E: ch = 0xEC; break;
+				case 0x221F: ch = 0x1C; break;
+				case 0x2229: ch = 0xEF; break;
+				case 0x2248: ch = 0xF7; break;
+				case 0x2261: ch = 0xF0; break;
+				case 0x2264: ch = 0xF3; break;
+				case 0x2265: ch = 0xF2; break;
+				case 0x2302: ch = 0x7F; break;
+				case 0x2310: ch = 0xA9; break;
+				case 0x2320: ch = 0xF4; break;
+				case 0x2321: ch = 0xF5; break;
+				case 0x2500: ch = 0xC4; break;
+				case 0x2502: ch = 0xB3; break;
+				case 0x250C: ch = 0xDA; break;
+				case 0x2510: ch = 0xBF; break;
+				case 0x2514: ch = 0xC0; break;
+				case 0x2518: ch = 0xD9; break;
+				case 0x251C: ch = 0xC3; break;
+				case 0x2524: ch = 0xB4; break;
+				case 0x252C: ch = 0xC2; break;
+				case 0x2534: ch = 0xC1; break;
+				case 0x253C: ch = 0xC5; break;
+				case 0x2550: ch = 0xCD; break;
+				case 0x2551: ch = 0xBA; break;
+				case 0x2552: ch = 0xD5; break;
+				case 0x2553: ch = 0xD6; break;
+				case 0x2554: ch = 0xC9; break;
+				case 0x2555: ch = 0xB8; break;
+				case 0x2556: ch = 0xB7; break;
+				case 0x2557: ch = 0xBB; break;
+				case 0x2558: ch = 0xD4; break;
+				case 0x2559: ch = 0xD3; break;
+				case 0x255A: ch = 0xC8; break;
+				case 0x255B: ch = 0xBE; break;
+				case 0x255C: ch = 0xBD; break;
+				case 0x255D: ch = 0xBC; break;
+				case 0x255E: ch = 0xC6; break;
+				case 0x255F: ch = 0xC7; break;
+				case 0x2560: ch = 0xCC; break;
+				case 0x2561: ch = 0xB5; break;
+				case 0x2562: ch = 0xB6; break;
+				case 0x2563: ch = 0xB9; break;
+				case 0x2564: ch = 0xD1; break;
+				case 0x2565: ch = 0xD2; break;
+				case 0x2566: ch = 0xCB; break;
+				case 0x2567: ch = 0xCF; break;
+				case 0x2568: ch = 0xD0; break;
+				case 0x2569: ch = 0xCA; break;
+				case 0x256A: ch = 0xD8; break;
+				case 0x256B: ch = 0xD7; break;
+				case 0x256C: ch = 0xCE; break;
+				case 0x2580: ch = 0xDF; break;
+				case 0x2584: ch = 0xDC; break;
+				case 0x2588: ch = 0xDB; break;
+				case 0x258C: ch = 0xDD; break;
+				case 0x2590: ch = 0xDE; break;
+				case 0x2591: ch = 0xB0; break;
+				case 0x2592: ch = 0xB1; break;
+				case 0x2593: ch = 0xB2; break;
+				case 0x25A0: ch = 0xFE; break;
+				case 0x25AC: ch = 0x16; break;
+				case 0x25B2: ch = 0x1E; break;
+				case 0x25BA: ch = 0x10; break;
+				case 0x25BC: ch = 0x1F; break;
+				case 0x25C4: ch = 0x11; break;
+				case 0x25CB: ch = 0x09; break;
+				case 0x25D8: ch = 0x08; break;
+				case 0x25D9: ch = 0x0A; break;
+				case 0x263A: ch = 0x01; break;
+				case 0x263B: ch = 0x02; break;
+				case 0x263C: ch = 0x0F; break;
+				case 0x2640: ch = 0x0C; break;
+				case 0x2642: ch = 0x0B; break;
+				case 0x2660: ch = 0x06; break;
+				case 0x2663: ch = 0x05; break;
+				case 0x2665: ch = 0x03; break;
+				case 0x2666: ch = 0x04; break;
+				case 0x266A: ch = 0x0D; break;
+				case 0x266B: ch = 0x0E; break;
+				case 0xFFE8: ch = 0xB3; break;
+				case 0xFFE9: ch = 0x1B; break;
+				case 0xFFEA: ch = 0x18; break;
+				case 0xFFEB: ch = 0x1A; break;
+				case 0xFFEC: ch = 0x19; break;
+				case 0xFFED: ch = 0xFE; break;
+				case 0xFFEE: ch = 0x09; break;
+				default:
+				{
+					if(ch >= 0xFF01 && ch <= 0xFF5E)
+						ch -= 0xFEE0;
+					else
+						ch = 0x3F;
+				}
+				break;
+			}
+			bytes[byteIndex++] = (byte)ch;
+			--charCount;
+		}
+	}
+
+}; // class CP865
+
+public class ENCibm865 : CP865
+{
+	public ENCibm865() : base() {}
+
+}; // class ENCibm865
+
+}; // namespace I18N.West
diff --git a/mcs/class/I18N/West/ibm-1275.ucm b/mcs/class/I18N/West/ibm-1275.ucm
new file mode 100644
index 00000000000..c6e6d6ec3d3
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-1275.ucm
@@ -0,0 +1,380 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:43 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B004FB.RPMAP100 and 04FB34B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-1275"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-1275
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U00A0> \xCA |0
+<U00A1> \xC1 |0
+<U00A2> \xA2 |0
+<U00A3> \xA3 |0
+<U00A4> \xDB |0
+<U00A5> \xB4 |0
+<U00A7> \xA4 |0
+<U00A8> \xAC |0
+<U00A9> \xA9 |0
+<U00AA> \xBB |0
+<U00AB> \xC7 |0
+<U00AC> \xC2 |0
+<U00AE> \xA8 |0
+<U00AF> \xF8 |0
+<U00B0> \xA1 |0
+<U00B1> \xB1 |0
+<U00B4> \xAB |0
+<U00B5> \xB5 |0
+<U00B6> \xA6 |0
+<U00B7> \xE1 |0
+<U00B8> \xFC |0
+<U00BA> \xBC |0
+<U00BB> \xC8 |0
+<U00BF> \xC0 |0
+<U00C0> \xCB |0
+<U00C1> \xE7 |0
+<U00C2> \xE5 |0
+<U00C3> \xCC |0
+<U00C4> \x80 |0
+<U00C5> \x81 |0
+<U00C6> \xAE |0
+<U00C7> \x82 |0
+<U00C8> \xE9 |0
+<U00C9> \x83 |0
+<U00CA> \xE6 |0
+<U00CB> \xE8 |0
+<U00CC> \xED |0
+<U00CD> \xEA |0
+<U00CE> \xEB |0
+<U00CF> \xEC |0
+<U00D1> \x84 |0
+<U00D2> \xF1 |0
+<U00D3> \xEE |0
+<U00D4> \xEF |0
+<U00D5> \xCD |0
+<U00D6> \x85 |0
+<U00D8> \xAF |0
+<U00D9> \xF4 |0
+<U00DA> \xF2 |0
+<U00DB> \xF3 |0
+<U00DC> \x86 |0
+<U00DF> \xA7 |0
+<U00E0> \x88 |0
+<U00E1> \x87 |0
+<U00E2> \x89 |0
+<U00E3> \x8B |0
+<U00E4> \x8A |0
+<U00E5> \x8C |0
+<U00E6> \xBE |0
+<U00E7> \x8D |0
+<U00E8> \x8F |0
+<U00E9> \x8E |0
+<U00EA> \x90 |0
+<U00EB> \x91 |0
+<U00EC> \x93 |0
+<U00ED> \x92 |0
+<U00EE> \x94 |0
+<U00EF> \x95 |0
+<U00F1> \x96 |0
+<U00F2> \x98 |0
+<U00F3> \x97 |0
+<U00F4> \x99 |0
+<U00F5> \x9B |0
+<U00F6> \x9A |0
+<U00F7> \xD6 |0
+<U00F8> \xBF |0
+<U00F9> \x9D |0
+<U00FA> \x9C |0
+<U00FB> \x9E |0
+<U00FC> \x9F |0
+<U00FF> \xD8 |0
+<U0131> \xF5 |0
+<U0152> \xCE |0
+<U0153> \xCF |0
+<U0178> \xD9 |0
+<U0192> \xC4 |0
+<U02C6> \xF6 |0
+<U02C7> \xFF |0
+<U02D8> \xF9 |0
+<U02D9> \xFA |0
+<U02DA> \xFB |0
+<U02DB> \xFE |0
+<U02DC> \xF7 |0
+<U02DD> \xFD |0
+<U03C0> \xB9 |0
+<U2013> \xD0 |0
+<U2014> \xD1 |0
+<U2018> \xD4 |0
+<U2019> \xD5 |0
+<U201A> \xE2 |0
+<U201C> \xD2 |0
+<U201D> \xD3 |0
+<U201E> \xE3 |0
+<U2020> \xA0 |0
+<U2021> \xE0 |0
+<U2022> \xA5 |0
+<U2026> \xC9 |0
+<U2030> \xE4 |0
+<U2039> \xDC |0
+<U203A> \xDD |0
+<U2044> \xDA |0
+<U2122> \xAA |0
+<U2126> \xBD |0
+<U2202> \xB6 |0
+<U2206> \xC6 |0
+<U220F> \xB8 |0
+<U2211> \xB7 |0
+<U221A> \xC3 |0
+<U221E> \xB0 |0
+<U222B> \xBA |0
+<U2248> \xC5 |0
+<U2260> \xAD |0
+<U2264> \xB2 |0
+<U2265> \xB3 |0
+<U2318> \x11 |1
+<U25CA> \xD7 |0
+<U2666> \x13 |1
+<U2713> \x12 |1
+<UF8FF> \xF0 |0
+<UFB01> \xDE |0
+<UFB02> \xDF |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-437.ucm b/mcs/class/I18N/West/ibm-437.ucm
new file mode 100644
index 00000000000..5d9a2ad5cdd
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-437.ucm
@@ -0,0 +1,416 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:42 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B001B5.RPMAP100 and 01B534B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-437"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-437
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A1> \xAD |0
+<U00A2> \x9B |0
+<U00A3> \x9C |0
+<U00A5> \x9D |0
+<U00A7> \x15 |1
+<U00AA> \xA6 |0
+<U00AB> \xAE |0
+<U00AC> \xAA |0
+<U00B0> \xF8 |0
+<U00B1> \xF1 |0
+<U00B2> \xFD |0
+<U00B6> \x14 |1
+<U00B7> \xFA |0
+<U00BA> \xA7 |0
+<U00BB> \xAF |0
+<U00BC> \xAC |0
+<U00BD> \xAB |0
+<U00BF> \xA8 |0
+<U00C4> \x8E |0
+<U00C5> \x8F |0
+<U00C6> \x92 |0
+<U00C7> \x80 |0
+<U00C9> \x90 |0
+<U00D1> \xA5 |0
+<U00D6> \x99 |0
+<U00DC> \x9A |0
+<U00DF> \xE1 |0
+<U00E0> \x85 |0
+<U00E1> \xA0 |0
+<U00E2> \x83 |0
+<U00E4> \x84 |0
+<U00E5> \x86 |0
+<U00E6> \x91 |0
+<U00E7> \x87 |0
+<U00E8> \x8A |0
+<U00E9> \x82 |0
+<U00EA> \x88 |0
+<U00EB> \x89 |0
+<U00EC> \x8D |0
+<U00ED> \xA1 |0
+<U00EE> \x8C |0
+<U00EF> \x8B |0
+<U00F1> \xA4 |0
+<U00F2> \x95 |0
+<U00F3> \xA2 |0
+<U00F4> \x93 |0
+<U00F6> \x94 |0
+<U00F7> \xF6 |0
+<U00F9> \x97 |0
+<U00FA> \xA3 |0
+<U00FB> \x96 |0
+<U00FC> \x81 |0
+<U00FF> \x98 |0
+<U0192> \x9F |0
+<U0393> \xE2 |0
+<U0398> \xE9 |0
+<U03A3> \xE4 |0
+<U03A6> \xE8 |0
+<U03A9> \xEA |0
+<U03B1> \xE0 |0
+<U03B4> \xEB |0
+<U03B5> \xEE |0
+<U03BC> \xE6 |0
+<U03C0> \xE3 |0
+<U03C3> \xE5 |0
+<U03C4> \xE7 |0
+<U03C6> \xED |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U207F> \xFC |0
+<U20A7> \x9E |0
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U2219> \xF9 |0
+<U221A> \xFB |0
+<U221E> \xEC |0
+<U221F> \x1C |1
+<U2229> \xEF |0
+<U2248> \xF7 |0
+<U2261> \xF0 |0
+<U2264> \xF3 |0
+<U2265> \xF2 |0
+<U2302> \x7F |2
+<U2310> \xA9 |0
+<U2320> \xF4 |0
+<U2321> \xF5 |0
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2552> \xD5 |0
+<U2553> \xD6 |0
+<U2554> \xC9 |0
+<U2555> \xB8 |0
+<U2556> \xB7 |0
+<U2557> \xBB |0
+<U2558> \xD4 |0
+<U2559> \xD3 |0
+<U255A> \xC8 |0
+<U255B> \xBE |0
+<U255C> \xBD |0
+<U255D> \xBC |0
+<U255E> \xC6 |0
+<U255F> \xC7 |0
+<U2560> \xCC |0
+<U2561> \xB5 |0
+<U2562> \xB6 |0
+<U2563> \xB9 |0
+<U2564> \xD1 |0
+<U2565> \xD2 |0
+<U2566> \xCB |0
+<U2567> \xCF |0
+<U2568> \xD0 |0
+<U2569> \xCA |0
+<U256A> \xD8 |0
+<U256B> \xD7 |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U258C> \xDD |0
+<U2590> \xDE |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266B> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-4909.ucm b/mcs/class/I18N/West/ibm-4909.ucm
new file mode 100644
index 00000000000..b1d893ecccc
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-4909.ucm
@@ -0,0 +1,374 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1999-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:44 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B0132D.RPMAP100 and 132D44B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-4909"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-4909
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A3> \xA3 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \xA9 |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B4> \xB4 |0
+<U00B7> \xB7 |1
+<U00BB> \xBB |0
+<U00BD> \xBD |0
+<U0385> \xB5 |0
+<U0386> \xB6 |0
+<U0387> \xB7 |0
+<U0388> \xB8 |0
+<U0389> \xB9 |0
+<U038A> \xBA |0
+<U038C> \xBC |0
+<U038E> \xBE |0
+<U038F> \xBF |0
+<U0390> \xC0 |0
+<U0391> \xC1 |0
+<U0392> \xC2 |0
+<U0393> \xC3 |0
+<U0394> \xC4 |0
+<U0395> \xC5 |0
+<U0396> \xC6 |0
+<U0397> \xC7 |0
+<U0398> \xC8 |0
+<U0399> \xC9 |0
+<U039A> \xCA |0
+<U039B> \xCB |0
+<U039C> \xCC |0
+<U039D> \xCD |0
+<U039E> \xCE |0
+<U039F> \xCF |0
+<U03A0> \xD0 |0
+<U03A1> \xD1 |0
+<U03A3> \xD3 |0
+<U03A4> \xD4 |0
+<U03A5> \xD5 |0
+<U03A6> \xD6 |0
+<U03A7> \xD7 |0
+<U03A8> \xD8 |0
+<U03A9> \xD9 |0
+<U03AA> \xDA |0
+<U03AB> \xDB |0
+<U03AC> \xDC |0
+<U03AD> \xDD |0
+<U03AE> \xDE |0
+<U03AF> \xDF |0
+<U03B0> \xE0 |0
+<U03B1> \xE1 |0
+<U03B2> \xE2 |0
+<U03B3> \xE3 |0
+<U03B4> \xE4 |0
+<U03B5> \xE5 |0
+<U03B6> \xE6 |0
+<U03B7> \xE7 |0
+<U03B8> \xE8 |0
+<U03B9> \xE9 |0
+<U03BA> \xEA |0
+<U03BB> \xEB |0
+<U03BC> \xEC |0
+<U03BD> \xED |0
+<U03BE> \xEE |0
+<U03BF> \xEF |0
+<U03C0> \xF0 |0
+<U03C1> \xF1 |0
+<U03C2> \xF2 |0
+<U03C3> \xF3 |0
+<U03C4> \xF4 |0
+<U03C5> \xF5 |0
+<U03C6> \xF6 |0
+<U03C7> \xF7 |0
+<U03C8> \xF8 |0
+<U03C9> \xF9 |0
+<U03CA> \xFA |0
+<U03CB> \xFB |0
+<U03CC> \xFC |0
+<U03CD> \xFD |0
+<U03CE> \xFE |0
+<U03D5> \xF6 |1
+<U2015> \xAF |0
+<U2018> \xA1 |0
+<U2019> \xA2 |0
+<U20AC> \xA4 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-5346.ucm b/mcs/class/I18N/West/ibm-5346.ucm
new file mode 100644
index 00000000000..d0c0fb6aa55
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-5346.ucm
@@ -0,0 +1,377 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:44 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B014E2.RPMAP100 and 14E244B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-5346"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-5346
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0081> \x81 |0
+<U0083> \x83 |0
+<U0088> \x88 |0
+<U0090> \x90 |0
+<U0098> \x98 |0
+<U00A0> \xA0 |0
+<U00A4> \xA4 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \xA9 |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B4> \xB4 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00B8> \xB8 |0
+<U00BB> \xBB |0
+<U00C1> \xC1 |0
+<U00C2> \xC2 |0
+<U00C4> \xC4 |0
+<U00C7> \xC7 |0
+<U00C9> \xC9 |0
+<U00CB> \xCB |0
+<U00CD> \xCD |0
+<U00CE> \xCE |0
+<U00D3> \xD3 |0
+<U00D4> \xD4 |0
+<U00D6> \xD6 |0
+<U00D7> \xD7 |0
+<U00DA> \xDA |0
+<U00DC> \xDC |0
+<U00DD> \xDD |0
+<U00DF> \xDF |0
+<U00E1> \xE1 |0
+<U00E2> \xE2 |0
+<U00E4> \xE4 |0
+<U00E7> \xE7 |0
+<U00E9> \xE9 |0
+<U00EB> \xEB |0
+<U00ED> \xED |0
+<U00EE> \xEE |0
+<U00F3> \xF3 |0
+<U00F4> \xF4 |0
+<U00F6> \xF6 |0
+<U00F7> \xF7 |0
+<U00FA> \xFA |0
+<U00FC> \xFC |0
+<U00FD> \xFD |0
+<U0102> \xC3 |0
+<U0103> \xE3 |0
+<U0104> \xA5 |0
+<U0105> \xB9 |0
+<U0106> \xC6 |0
+<U0107> \xE6 |0
+<U010C> \xC8 |0
+<U010D> \xE8 |0
+<U010E> \xCF |0
+<U010F> \xEF |0
+<U0110> \xD0 |0
+<U0111> \xF0 |0
+<U0118> \xCA |0
+<U0119> \xEA |0
+<U011A> \xCC |0
+<U011B> \xEC |0
+<U0139> \xC5 |0
+<U013A> \xE5 |0
+<U013D> \xBC |0
+<U013E> \xBE |0
+<U0141> \xA3 |0
+<U0142> \xB3 |0
+<U0143> \xD1 |0
+<U0144> \xF1 |0
+<U0147> \xD2 |0
+<U0148> \xF2 |0
+<U0150> \xD5 |0
+<U0151> \xF5 |0
+<U0154> \xC0 |0
+<U0155> \xE0 |0
+<U0158> \xD8 |0
+<U0159> \xF8 |0
+<U015A> \x8C |0
+<U015B> \x9C |0
+<U015E> \xAA |0
+<U015F> \xBA |0
+<U0160> \x8A |0
+<U0161> \x9A |0
+<U0162> \xDE |0
+<U0163> \xFE |0
+<U0164> \x8D |0
+<U0165> \x9D |0
+<U016E> \xD9 |0
+<U016F> \xF9 |0
+<U0170> \xDB |0
+<U0171> \xFB |0
+<U0179> \x8F |0
+<U017A> \x9F |0
+<U017B> \xAF |0
+<U017C> \xBF |0
+<U017D> \x8E |0
+<U017E> \x9E |0
+<U02C7> \xA1 |0
+<U02D8> \xA2 |0
+<U02D9> \xFF |0
+<U02DB> \xB2 |0
+<U02DD> \xBD |0
+<U2013> \x96 |0
+<U2014> \x97 |0
+<U2018> \x91 |0
+<U2019> \x92 |0
+<U201A> \x82 |0
+<U201C> \x93 |0
+<U201D> \x94 |0
+<U201E> \x84 |0
+<U2020> \x86 |0
+<U2021> \x87 |0
+<U2022> \x95 |0
+<U2026> \x85 |0
+<U2030> \x89 |0
+<U2039> \x8B |0
+<U203A> \x9B |0
+<U20AC> \x80 |0
+<U2122> \x99 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-5348.ucm b/mcs/class/I18N/West/ibm-5348.ucm
new file mode 100644
index 00000000000..6e5f9521527
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-5348.ucm
@@ -0,0 +1,377 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:51:37 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B014E4.RPMAP100 and 14E444B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-5348"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-5348
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0081> \x81 |0
+<U008D> \x8D |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U009D> \x9D |0
+<U00A0> \xA0 |0
+<U00A1> \xA1 |0
+<U00A2> \xA2 |0
+<U00A3> \xA3 |0
+<U00A4> \xA4 |0
+<U00A5> \xA5 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \xA9 |0
+<U00AA> \xAA |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00AF> \xAF |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B4> \xB4 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00B8> \xB8 |0
+<U00B9> \xB9 |0
+<U00BA> \xBA |0
+<U00BB> \xBB |0
+<U00BC> \xBC |0
+<U00BD> \xBD |0
+<U00BE> \xBE |0
+<U00BF> \xBF |0
+<U00C0> \xC0 |0
+<U00C1> \xC1 |0
+<U00C2> \xC2 |0
+<U00C3> \xC3 |0
+<U00C4> \xC4 |0
+<U00C5> \xC5 |0
+<U00C6> \xC6 |0
+<U00C7> \xC7 |0
+<U00C8> \xC8 |0
+<U00C9> \xC9 |0
+<U00CA> \xCA |0
+<U00CB> \xCB |0
+<U00CC> \xCC |0
+<U00CD> \xCD |0
+<U00CE> \xCE |0
+<U00CF> \xCF |0
+<U00D0> \xD0 |0
+<U00D1> \xD1 |0
+<U00D2> \xD2 |0
+<U00D3> \xD3 |0
+<U00D4> \xD4 |0
+<U00D5> \xD5 |0
+<U00D6> \xD6 |0
+<U00D7> \xD7 |0
+<U00D8> \xD8 |0
+<U00D9> \xD9 |0
+<U00DA> \xDA |0
+<U00DB> \xDB |0
+<U00DC> \xDC |0
+<U00DD> \xDD |0
+<U00DE> \xDE |0
+<U00DF> \xDF |0
+<U00E0> \xE0 |0
+<U00E1> \xE1 |0
+<U00E2> \xE2 |0
+<U00E3> \xE3 |0
+<U00E4> \xE4 |0
+<U00E5> \xE5 |0
+<U00E6> \xE6 |0
+<U00E7> \xE7 |0
+<U00E8> \xE8 |0
+<U00E9> \xE9 |0
+<U00EA> \xEA |0
+<U00EB> \xEB |0
+<U00EC> \xEC |0
+<U00ED> \xED |0
+<U00EE> \xEE |0
+<U00EF> \xEF |0
+<U00F0> \xF0 |0
+<U00F1> \xF1 |0
+<U00F2> \xF2 |0
+<U00F3> \xF3 |0
+<U00F4> \xF4 |0
+<U00F5> \xF5 |0
+<U00F6> \xF6 |0
+<U00F7> \xF7 |0
+<U00F8> \xF8 |0
+<U00F9> \xF9 |0
+<U00FA> \xFA |0
+<U00FB> \xFB |0
+<U00FC> \xFC |0
+<U00FD> \xFD |0
+<U00FE> \xFE |0
+<U00FF> \xFF |0
+<U0152> \x8C |0
+<U0153> \x9C |0
+<U0160> \x8A |0
+<U0161> \x9A |0
+<U0178> \x9F |0
+<U017D> \x8E |0
+<U017E> \x9E |0
+<U0192> \x83 |0
+<U02C6> \x88 |0
+<U02DC> \x98 |0
+<U2013> \x96 |0
+<U2014> \x97 |0
+<U2018> \x91 |0
+<U2019> \x92 |0
+<U201A> \x82 |0
+<U201C> \x93 |0
+<U201D> \x94 |0
+<U201E> \x84 |0
+<U2020> \x86 |0
+<U2021> \x87 |0
+<U2022> \x95 |0
+<U2026> \x85 |0
+<U2030> \x89 |0
+<U2039> \x8B |0
+<U203A> \x9B |0
+<U20AC> \x80 |0
+<U2122> \x99 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-5349.ucm b/mcs/class/I18N/West/ibm-5349.ucm
new file mode 100644
index 00000000000..900c9984fdb
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-5349.ucm
@@ -0,0 +1,376 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:44 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B014E5.RPMAP100 and 14E544B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-5349"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-5349
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0081> \x81 |0
+<U0088> \x88 |0
+<U008A> \x8A |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0098> \x98 |0
+<U009A> \x9A |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A3> \xA3 |0
+<U00A4> \xA4 |0
+<U00A5> \xA5 |0
+<U00A6> \xA6 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \xA9 |0
+<U00AA> \xAA |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00BB> \xBB |0
+<U00BD> \xBD |0
+<U0192> \x83 |0
+<U0384> \xB4 |0
+<U0385> \xA1 |0
+<U0386> \xA2 |0
+<U0388> \xB8 |0
+<U0389> \xB9 |0
+<U038A> \xBA |0
+<U038C> \xBC |0
+<U038E> \xBE |0
+<U038F> \xBF |0
+<U0390> \xC0 |0
+<U0391> \xC1 |0
+<U0392> \xC2 |0
+<U0393> \xC3 |0
+<U0394> \xC4 |0
+<U0395> \xC5 |0
+<U0396> \xC6 |0
+<U0397> \xC7 |0
+<U0398> \xC8 |0
+<U0399> \xC9 |0
+<U039A> \xCA |0
+<U039B> \xCB |0
+<U039C> \xCC |0
+<U039D> \xCD |0
+<U039E> \xCE |0
+<U039F> \xCF |0
+<U03A0> \xD0 |0
+<U03A1> \xD1 |0
+<U03A3> \xD3 |0
+<U03A4> \xD4 |0
+<U03A5> \xD5 |0
+<U03A6> \xD6 |0
+<U03A7> \xD7 |0
+<U03A8> \xD8 |0
+<U03A9> \xD9 |0
+<U03AA> \xDA |0
+<U03AB> \xDB |0
+<U03AC> \xDC |0
+<U03AD> \xDD |0
+<U03AE> \xDE |0
+<U03AF> \xDF |0
+<U03B0> \xE0 |0
+<U03B1> \xE1 |0
+<U03B2> \xE2 |0
+<U03B3> \xE3 |0
+<U03B4> \xE4 |0
+<U03B5> \xE5 |0
+<U03B6> \xE6 |0
+<U03B7> \xE7 |0
+<U03B8> \xE8 |0
+<U03B9> \xE9 |0
+<U03BA> \xEA |0
+<U03BB> \xEB |0
+<U03BC> \xEC |0
+<U03BD> \xED |0
+<U03BE> \xEE |0
+<U03BF> \xEF |0
+<U03C0> \xF0 |0
+<U03C1> \xF1 |0
+<U03C2> \xF2 |0
+<U03C3> \xF3 |0
+<U03C4> \xF4 |0
+<U03C5> \xF5 |0
+<U03C6> \xF6 |0
+<U03C7> \xF7 |0
+<U03C8> \xF8 |0
+<U03C9> \xF9 |0
+<U03CA> \xFA |0
+<U03CB> \xFB |0
+<U03CC> \xFC |0
+<U03CD> \xFD |0
+<U03CE> \xFE |0
+<U03D5> \xF6 |1
+<U2013> \x96 |0
+<U2014> \x97 |0
+<U2015> \xAF |0
+<U2018> \x91 |0
+<U2019> \x92 |0
+<U201A> \x82 |0
+<U201C> \x93 |0
+<U201D> \x94 |0
+<U201E> \x84 |0
+<U2020> \x86 |0
+<U2021> \x87 |0
+<U2022> \x95 |0
+<U2026> \x85 |0
+<U2030> \x89 |0
+<U2039> \x8B |0
+<U203A> \x9B |0
+<U20AC> \x80 |0
+<U2122> \x99 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-850.ucm b/mcs/class/I18N/West/ibm-850.ucm
new file mode 100644
index 00000000000..7502e8dca2b
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-850.ucm
@@ -0,0 +1,416 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:42 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00352.RPMAP100 and 035234B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-850"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-850
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A1> \xAD |0
+<U00A2> \xBD |0
+<U00A3> \x9C |0
+<U00A4> \xCF |0
+<U00A5> \xBE |0
+<U00A6> \xDD |0
+<U00A7> \xF5 |0
+<U00A8> \xF9 |0
+<U00A9> \xB8 |0
+<U00AA> \xA6 |0
+<U00AB> \xAE |0
+<U00AC> \xAA |0
+<U00AD> \xF0 |0
+<U00AE> \xA9 |0
+<U00AF> \xEE |0
+<U00B0> \xF8 |0
+<U00B1> \xF1 |0
+<U00B2> \xFD |0
+<U00B3> \xFC |0
+<U00B4> \xEF |0
+<U00B5> \xE6 |0
+<U00B6> \xF4 |0
+<U00B7> \xFA |0
+<U00B8> \xF7 |0
+<U00B9> \xFB |0
+<U00BA> \xA7 |0
+<U00BB> \xAF |0
+<U00BC> \xAC |0
+<U00BD> \xAB |0
+<U00BE> \xF3 |0
+<U00BF> \xA8 |0
+<U00C0> \xB7 |0
+<U00C1> \xB5 |0
+<U00C2> \xB6 |0
+<U00C3> \xC7 |0
+<U00C4> \x8E |0
+<U00C5> \x8F |0
+<U00C6> \x92 |0
+<U00C7> \x80 |0
+<U00C8> \xD4 |0
+<U00C9> \x90 |0
+<U00CA> \xD2 |0
+<U00CB> \xD3 |0
+<U00CC> \xDE |0
+<U00CD> \xD6 |0
+<U00CE> \xD7 |0
+<U00CF> \xD8 |0
+<U00D0> \xD1 |0
+<U00D1> \xA5 |0
+<U00D2> \xE3 |0
+<U00D3> \xE0 |0
+<U00D4> \xE2 |0
+<U00D5> \xE5 |0
+<U00D6> \x99 |0
+<U00D7> \x9E |0
+<U00D8> \x9D |0
+<U00D9> \xEB |0
+<U00DA> \xE9 |0
+<U00DB> \xEA |0
+<U00DC> \x9A |0
+<U00DD> \xED |0
+<U00DE> \xE8 |0
+<U00DF> \xE1 |0
+<U00E0> \x85 |0
+<U00E1> \xA0 |0
+<U00E2> \x83 |0
+<U00E3> \xC6 |0
+<U00E4> \x84 |0
+<U00E5> \x86 |0
+<U00E6> \x91 |0
+<U00E7> \x87 |0
+<U00E8> \x8A |0
+<U00E9> \x82 |0
+<U00EA> \x88 |0
+<U00EB> \x89 |0
+<U00EC> \x8D |0
+<U00ED> \xA1 |0
+<U00EE> \x8C |0
+<U00EF> \x8B |0
+<U00F0> \xD0 |0
+<U00F1> \xA4 |0
+<U00F2> \x95 |0
+<U00F3> \xA2 |0
+<U00F4> \x93 |0
+<U00F5> \xE4 |0
+<U00F6> \x94 |0
+<U00F7> \xF6 |0
+<U00F8> \x9B |0
+<U00F9> \x97 |0
+<U00FA> \xA3 |0
+<U00FB> \x96 |0
+<U00FC> \x81 |0
+<U00FD> \xEC |0
+<U00FE> \xE7 |0
+<U00FF> \x98 |0
+<U0110> \xD1 |1
+<U0131> \xD5 |0
+<U0192> \x9F |0
+<U2017> \xF2 |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U203E> \xEE |1
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U221F> \x1C |1
+<U2302> \x7F |2
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2554> \xC9 |0
+<U2557> \xBB |0
+<U255A> \xC8 |0
+<U255D> \xBC |0
+<U2560> \xCC |0
+<U2563> \xB9 |0
+<U2566> \xCB |0
+<U2569> \xCA |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266C> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-860.ucm b/mcs/class/I18N/West/ibm-860.ucm
new file mode 100644
index 00000000000..05a02cba81f
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-860.ucm
@@ -0,0 +1,416 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:43 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B0035C.RPMAP100 and 035C34B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-860"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-860
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A1> \xAD |0
+<U00A2> \x9B |0
+<U00A3> \x9C |0
+<U00A7> \x15 |1
+<U00AA> \xA6 |0
+<U00AB> \xAE |0
+<U00AC> \xAA |0
+<U00B0> \xF8 |0
+<U00B1> \xF1 |0
+<U00B2> \xFD |0
+<U00B6> \x14 |1
+<U00B7> \xFA |0
+<U00BA> \xA7 |0
+<U00BB> \xAF |0
+<U00BC> \xAC |0
+<U00BD> \xAB |0
+<U00BF> \xA8 |0
+<U00C0> \x91 |0
+<U00C1> \x86 |0
+<U00C2> \x8F |0
+<U00C3> \x8E |0
+<U00C7> \x80 |0
+<U00C8> \x92 |0
+<U00C9> \x90 |0
+<U00CA> \x89 |0
+<U00CC> \x98 |0
+<U00CD> \x8B |0
+<U00D1> \xA5 |0
+<U00D2> \xA9 |0
+<U00D3> \x9F |0
+<U00D4> \x8C |0
+<U00D5> \x99 |0
+<U00D9> \x9D |0
+<U00DA> \x96 |0
+<U00DC> \x9A |0
+<U00DF> \xE1 |0
+<U00E0> \x85 |0
+<U00E1> \xA0 |0
+<U00E2> \x83 |0
+<U00E3> \x84 |0
+<U00E7> \x87 |0
+<U00E8> \x8A |0
+<U00E9> \x82 |0
+<U00EA> \x88 |0
+<U00EC> \x8D |0
+<U00ED> \xA1 |0
+<U00F1> \xA4 |0
+<U00F2> \x95 |0
+<U00F3> \xA2 |0
+<U00F4> \x93 |0
+<U00F5> \x94 |0
+<U00F7> \xF6 |0
+<U00F9> \x97 |0
+<U00FA> \xA3 |0
+<U00FC> \x81 |0
+<U0393> \xE2 |0
+<U0398> \xE9 |0
+<U03A3> \xE4 |0
+<U03A6> \xE8 |0
+<U03A9> \xEA |0
+<U03B1> \xE0 |0
+<U03B4> \xEB |0
+<U03B5> \xEE |0
+<U03BC> \xE6 |0
+<U03C0> \xE3 |0
+<U03C3> \xE5 |0
+<U03C4> \xE7 |0
+<U03C6> \xED |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U207F> \xFC |0
+<U20A7> \x9E |0
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U2219> \xF9 |0
+<U221A> \xFB |0
+<U221E> \xEC |0
+<U221F> \x1C |1
+<U2229> \xEF |0
+<U2248> \xF7 |0
+<U2261> \xF0 |0
+<U2264> \xF3 |0
+<U2265> \xF2 |0
+<U2302> \x7F |2
+<U2320> \xF4 |0
+<U2321> \xF5 |0
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2552> \xD5 |0
+<U2553> \xD6 |0
+<U2554> \xC9 |0
+<U2555> \xB8 |0
+<U2556> \xB7 |0
+<U2557> \xBB |0
+<U2558> \xD4 |0
+<U2559> \xD3 |0
+<U255A> \xC8 |0
+<U255B> \xBE |0
+<U255C> \xBD |0
+<U255D> \xBC |0
+<U255E> \xC6 |0
+<U255F> \xC7 |0
+<U2560> \xCC |0
+<U2561> \xB5 |0
+<U2562> \xB6 |0
+<U2563> \xB9 |0
+<U2564> \xD1 |0
+<U2565> \xD2 |0
+<U2566> \xCB |0
+<U2567> \xCF |0
+<U2568> \xD0 |0
+<U2569> \xCA |0
+<U256A> \xD8 |0
+<U256B> \xD7 |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U258C> \xDD |0
+<U2590> \xDE |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266B> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-861.ucm b/mcs/class/I18N/West/ibm-861.ucm
new file mode 100644
index 00000000000..c93f5074542
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-861.ucm
@@ -0,0 +1,416 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:43 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B0035D.RPMAP100 and 035D34B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-861"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-861
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A1> \xAD |0
+<U00A3> \x9C |0
+<U00A7> \x15 |1
+<U00AB> \xAE |0
+<U00AC> \xAA |0
+<U00B0> \xF8 |0
+<U00B1> \xF1 |0
+<U00B2> \xFD |0
+<U00B6> \x14 |1
+<U00B7> \xFA |0
+<U00BB> \xAF |0
+<U00BC> \xAC |0
+<U00BD> \xAB |0
+<U00BF> \xA8 |0
+<U00C1> \xA4 |0
+<U00C4> \x8E |0
+<U00C5> \x8F |0
+<U00C6> \x92 |0
+<U00C7> \x80 |0
+<U00C9> \x90 |0
+<U00CD> \xA5 |0
+<U00D0> \x8B |0
+<U00D3> \xA6 |0
+<U00D6> \x99 |0
+<U00D8> \x9D |0
+<U00DA> \xA7 |0
+<U00DC> \x9A |0
+<U00DD> \x97 |0
+<U00DE> \x8D |0
+<U00DF> \xE1 |0
+<U00E0> \x85 |0
+<U00E1> \xA0 |0
+<U00E2> \x83 |0
+<U00E4> \x84 |0
+<U00E5> \x86 |0
+<U00E6> \x91 |0
+<U00E7> \x87 |0
+<U00E8> \x8A |0
+<U00E9> \x82 |0
+<U00EA> \x88 |0
+<U00EB> \x89 |0
+<U00ED> \xA1 |0
+<U00F0> \x8C |0
+<U00F3> \xA2 |0
+<U00F4> \x93 |0
+<U00F6> \x94 |0
+<U00F7> \xF6 |0
+<U00F8> \x9B |0
+<U00FA> \xA3 |0
+<U00FB> \x96 |0
+<U00FC> \x81 |0
+<U00FD> \x98 |0
+<U00FE> \x95 |0
+<U0192> \x9F |0
+<U0393> \xE2 |0
+<U0398> \xE9 |0
+<U03A3> \xE4 |0
+<U03A6> \xE8 |0
+<U03A9> \xEA |0
+<U03B1> \xE0 |0
+<U03B4> \xEB |0
+<U03B5> \xEE |0
+<U03BC> \xE6 |0
+<U03C0> \xE3 |0
+<U03C3> \xE5 |0
+<U03C4> \xE7 |0
+<U03C6> \xED |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U207F> \xFC |0
+<U20A7> \x9E |0
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U2219> \xF9 |0
+<U221A> \xFB |0
+<U221E> \xEC |0
+<U221F> \x1C |1
+<U2229> \xEF |0
+<U2248> \xF7 |0
+<U2261> \xF0 |0
+<U2264> \xF3 |0
+<U2265> \xF2 |0
+<U2302> \x7F |2
+<U2310> \xA9 |0
+<U2320> \xF4 |0
+<U2321> \xF5 |0
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2552> \xD5 |0
+<U2553> \xD6 |0
+<U2554> \xC9 |0
+<U2555> \xB8 |0
+<U2556> \xB7 |0
+<U2557> \xBB |0
+<U2558> \xD4 |0
+<U2559> \xD3 |0
+<U255A> \xC8 |0
+<U255B> \xBE |0
+<U255C> \xBD |0
+<U255D> \xBC |0
+<U255E> \xC6 |0
+<U255F> \xC7 |0
+<U2560> \xCC |0
+<U2561> \xB5 |0
+<U2562> \xB6 |0
+<U2563> \xB9 |0
+<U2564> \xD1 |0
+<U2565> \xD2 |0
+<U2566> \xCB |0
+<U2567> \xCF |0
+<U2568> \xD0 |0
+<U2569> \xCA |0
+<U256A> \xD8 |0
+<U256B> \xD7 |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U258C> \xDD |0
+<U2590> \xDE |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266B> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-863.ucm b/mcs/class/I18N/West/ibm-863.ucm
new file mode 100644
index 00000000000..1effe317097
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-863.ucm
@@ -0,0 +1,415 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:43 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B0035F.RPMAP100 and 035F34B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-863"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-863
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A2> \x9B |0
+<U00A3> \x9C |0
+<U00A4> \x98 |0
+<U00A6> \xA0 |0
+<U00A7> \x8F |0
+<U00A8> \xA4 |0
+<U00AB> \xAE |0
+<U00AC> \xAA |0
+<U00AF> \xA7 |0
+<U00B0> \xF8 |0
+<U00B1> \xF1 |0
+<U00B2> \xFD |0
+<U00B3> \xA6 |0
+<U00B4> \xA1 |0
+<U00B6> \x86 |0
+<U00B7> \xFA |0
+<U00B8> \xA5 |0
+<U00BB> \xAF |0
+<U00BC> \xAC |0
+<U00BD> \xAB |0
+<U00BE> \xAD |0
+<U00C0> \x8E |0
+<U00C2> \x84 |0
+<U00C7> \x80 |0
+<U00C8> \x91 |0
+<U00C9> \x90 |0
+<U00CA> \x92 |0
+<U00CB> \x94 |0
+<U00CE> \xA8 |0
+<U00CF> \x95 |0
+<U00D4> \x99 |0
+<U00D9> \x9D |0
+<U00DB> \x9E |0
+<U00DC> \x9A |0
+<U00DF> \xE1 |0
+<U00E0> \x85 |0
+<U00E2> \x83 |0
+<U00E7> \x87 |0
+<U00E8> \x8A |0
+<U00E9> \x82 |0
+<U00EA> \x88 |0
+<U00EB> \x89 |0
+<U00EE> \x8C |0
+<U00EF> \x8B |0
+<U00F3> \xA2 |0
+<U00F4> \x93 |0
+<U00F7> \xF6 |0
+<U00F9> \x97 |0
+<U00FA> \xA3 |0
+<U00FB> \x96 |0
+<U00FC> \x81 |0
+<U0192> \x9F |0
+<U0393> \xE2 |0
+<U0398> \xE9 |0
+<U03A3> \xE4 |0
+<U03A6> \xE8 |0
+<U03A9> \xEA |0
+<U03B1> \xE0 |0
+<U03B4> \xEB |0
+<U03B5> \xEE |0
+<U03BC> \xE6 |0
+<U03C0> \xE3 |0
+<U03C3> \xE5 |0
+<U03C4> \xE7 |0
+<U03C6> \xED |0
+<U2017> \x8D |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U203E> \xA7 |1
+<U207F> \xFC |0
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U2219> \xF9 |0
+<U221A> \xFB |0
+<U221E> \xEC |0
+<U221F> \x1C |1
+<U2229> \xEF |0
+<U2248> \xF7 |0
+<U2261> \xF0 |0
+<U2264> \xF3 |0
+<U2265> \xF2 |0
+<U2302> \x7F |2
+<U2310> \xA9 |0
+<U2320> \xF4 |0
+<U2321> \xF5 |0
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2552> \xD5 |0
+<U2553> \xD6 |0
+<U2554> \xC9 |0
+<U2555> \xB8 |0
+<U2556> \xB7 |0
+<U2557> \xBB |0
+<U2558> \xD4 |0
+<U2559> \xD3 |0
+<U255A> \xC8 |0
+<U255B> \xBE |0
+<U255C> \xBD |0
+<U255D> \xBC |0
+<U255E> \xC6 |0
+<U255F> \xC7 |0
+<U2560> \xCC |0
+<U2561> \xB5 |0
+<U2562> \xB6 |0
+<U2563> \xB9 |0
+<U2564> \xD1 |0
+<U2565> \xD2 |0
+<U2566> \xCB |0
+<U2567> \xCF |0
+<U2568> \xD0 |0
+<U2569> \xCA |0
+<U256A> \xD8 |0
+<U256B> \xD7 |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U258C> \xDD |0
+<U2590> \xDE |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266B> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-865.ucm b/mcs/class/I18N/West/ibm-865.ucm
new file mode 100644
index 00000000000..f1362fbb2bb
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-865.ucm
@@ -0,0 +1,416 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 08:50:43 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00361.RPMAP100 and 036134B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-865"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x7F
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-865
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x7F |0
+<U001B> \x1B |0
+<U001C> \x1A |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x1C |0
+<U00A0> \xFF |0
+<U00A1> \xAD |0
+<U00A3> \x9C |0
+<U00A4> \xAF |0
+<U00A7> \x15 |1
+<U00AA> \xA6 |0
+<U00AB> \xAE |0
+<U00AC> \xAA |0
+<U00B0> \xF8 |0
+<U00B1> \xF1 |0
+<U00B2> \xFD |0
+<U00B6> \x14 |1
+<U00B7> \xFA |0
+<U00BA> \xA7 |0
+<U00BC> \xAC |0
+<U00BD> \xAB |0
+<U00BF> \xA8 |0
+<U00C4> \x8E |0
+<U00C5> \x8F |0
+<U00C6> \x92 |0
+<U00C7> \x80 |0
+<U00C9> \x90 |0
+<U00D1> \xA5 |0
+<U00D6> \x99 |0
+<U00D8> \x9D |0
+<U00DC> \x9A |0
+<U00DF> \xE1 |0
+<U00E0> \x85 |0
+<U00E1> \xA0 |0
+<U00E2> \x83 |0
+<U00E4> \x84 |0
+<U00E5> \x86 |0
+<U00E6> \x91 |0
+<U00E7> \x87 |0
+<U00E8> \x8A |0
+<U00E9> \x82 |0
+<U00EA> \x88 |0
+<U00EB> \x89 |0
+<U00EC> \x8D |0
+<U00ED> \xA1 |0
+<U00EE> \x8C |0
+<U00EF> \x8B |0
+<U00F1> \xA4 |0
+<U00F2> \x95 |0
+<U00F3> \xA2 |0
+<U00F4> \x93 |0
+<U00F6> \x94 |0
+<U00F7> \xF6 |0
+<U00F8> \x9B |0
+<U00F9> \x97 |0
+<U00FA> \xA3 |0
+<U00FB> \x96 |0
+<U00FC> \x81 |0
+<U00FF> \x98 |0
+<U0192> \x9F |0
+<U0393> \xE2 |0
+<U0398> \xE9 |0
+<U03A3> \xE4 |0
+<U03A6> \xE8 |0
+<U03A9> \xEA |0
+<U03B1> \xE0 |0
+<U03B4> \xEB |0
+<U03B5> \xEE |0
+<U03BC> \xE6 |0
+<U03C0> \xE3 |0
+<U03C3> \xE5 |0
+<U03C4> \xE7 |0
+<U03C6> \xED |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U207F> \xFC |0
+<U20A7> \x9E |0
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |1
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U2219> \xF9 |0
+<U221A> \xFB |0
+<U221E> \xEC |0
+<U221F> \x1C |1
+<U2229> \xEF |0
+<U2248> \xF7 |0
+<U2261> \xF0 |0
+<U2264> \xF3 |0
+<U2265> \xF2 |0
+<U2302> \x7F |2
+<U2310> \xA9 |0
+<U2320> \xF4 |0
+<U2321> \xF5 |0
+<U2500> \xC4 |0
+<U2502> \xB3 |0
+<U250C> \xDA |0
+<U2510> \xBF |0
+<U2514> \xC0 |0
+<U2518> \xD9 |0
+<U251C> \xC3 |0
+<U2524> \xB4 |0
+<U252C> \xC2 |0
+<U2534> \xC1 |0
+<U253C> \xC5 |0
+<U2550> \xCD |0
+<U2551> \xBA |0
+<U2552> \xD5 |0
+<U2553> \xD6 |0
+<U2554> \xC9 |0
+<U2555> \xB8 |0
+<U2556> \xB7 |0
+<U2557> \xBB |0
+<U2558> \xD4 |0
+<U2559> \xD3 |0
+<U255A> \xC8 |0
+<U255B> \xBE |0
+<U255C> \xBD |0
+<U255D> \xBC |0
+<U255E> \xC6 |0
+<U255F> \xC7 |0
+<U2560> \xCC |0
+<U2561> \xB5 |0
+<U2562> \xB6 |0
+<U2563> \xB9 |0
+<U2564> \xD1 |0
+<U2565> \xD2 |0
+<U2566> \xCB |0
+<U2567> \xCF |0
+<U2568> \xD0 |0
+<U2569> \xCA |0
+<U256A> \xD8 |0
+<U256B> \xD7 |0
+<U256C> \xCE |0
+<U2580> \xDF |0
+<U2584> \xDC |0
+<U2588> \xDB |0
+<U258C> \xDD |0
+<U2590> \xDE |0
+<U2591> \xB0 |0
+<U2592> \xB1 |0
+<U2593> \xB2 |0
+<U25A0> \xFE |0
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266B> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \xB3 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |1
+<UFFEC> \x19 |1
+<UFFED> \xFE |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-912.ucm b/mcs/class/I18N/West/ibm-912.ucm
new file mode 100644
index 00000000000..bcd31fa1477
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-912.ucm
@@ -0,0 +1,446 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:04 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00390.RPMAP100 and 039034B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-912"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-912
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A2> \x8D |1
+<U00A4> \xA4 |0
+<U00A5> \x8E |1
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00A9> \x88 |1
+<U00AD> \xAD |0
+<U00AE> \x9F |1
+<U00B0> \xB0 |0
+<U00B4> \xB4 |0
+<U00B6> \x14 |1
+<U00B8> \xB8 |0
+<U00C1> \xC1 |0
+<U00C2> \xC2 |0
+<U00C4> \xC4 |0
+<U00C7> \xC7 |0
+<U00C9> \xC9 |0
+<U00CB> \xCB |0
+<U00CD> \xCD |0
+<U00CE> \xCE |0
+<U00D0> \xD0 |1
+<U00D3> \xD3 |0
+<U00D4> \xD4 |0
+<U00D6> \xD6 |0
+<U00D7> \xD7 |0
+<U00DA> \xDA |0
+<U00DC> \xDC |0
+<U00DD> \xDD |0
+<U00DF> \xDF |0
+<U00E1> \xE1 |0
+<U00E2> \xE2 |0
+<U00E4> \xE4 |0
+<U00E7> \xE7 |0
+<U00E9> \xE9 |0
+<U00EB> \xEB |0
+<U00ED> \xED |0
+<U00EE> \xEE |0
+<U00F3> \xF3 |0
+<U00F4> \xF4 |0
+<U00F6> \xF6 |0
+<U00F7> \xF7 |0
+<U00FA> \xFA |0
+<U00FC> \xFC |0
+<U00FD> \xFD |0
+<U0102> \xC3 |0
+<U0103> \xE3 |0
+<U0104> \xA1 |0
+<U0105> \xB1 |0
+<U0106> \xC6 |0
+<U0107> \xE6 |0
+<U010C> \xC8 |0
+<U010D> \xE8 |0
+<U010E> \xCF |0
+<U010F> \xEF |0
+<U0110> \xD0 |0
+<U0111> \xF0 |0
+<U0118> \xCA |0
+<U0119> \xEA |0
+<U011A> \xCC |0
+<U011B> \xEC |0
+<U0139> \xC5 |0
+<U013A> \xE5 |0
+<U013D> \xA5 |0
+<U013E> \xB5 |0
+<U0141> \xA3 |0
+<U0142> \xB3 |0
+<U0143> \xD1 |0
+<U0144> \xF1 |0
+<U0147> \xD2 |0
+<U0148> \xF2 |0
+<U0150> \xD5 |0
+<U0151> \xF5 |0
+<U0154> \xC0 |0
+<U0155> \xE0 |0
+<U0158> \xD8 |0
+<U0159> \xF8 |0
+<U015A> \xA6 |0
+<U015B> \xB6 |0
+<U015E> \xAA |0
+<U015F> \xBA |0
+<U0160> \xA9 |0
+<U0161> \xB9 |0
+<U0162> \xDE |0
+<U0163> \xFE |0
+<U0164> \xAB |0
+<U0165> \xBB |0
+<U016E> \xD9 |0
+<U016F> \xF9 |0
+<U0170> \xDB |0
+<U0171> \xFB |0
+<U0179> \xAC |0
+<U017A> \xBC |0
+<U017B> \xAF |0
+<U017C> \xBF |0
+<U017D> \xAE |0
+<U017E> \xBE |0
+<U02C7> \xB7 |0
+<U02D8> \xA2 |0
+<U02D9> \xFF |0
+<U02DB> \xB2 |0
+<U02DD> \xBD |0
+<U2022> \x07 |1
+<U203C> \x13 |1
+<U2190> \x1B |1
+<U2191> \x18 |1
+<U2192> \x1A |2
+<U2193> \x19 |1
+<U2194> \x1D |1
+<U2195> \x12 |1
+<U21A8> \x17 |1
+<U221F> \x1C |1
+<U2500> \x94 |1
+<U2502> \x83 |1
+<U250C> \x86 |1
+<U2510> \x8F |1
+<U2514> \x90 |1
+<U2518> \x85 |1
+<U251C> \x93 |1
+<U2524> \x84 |1
+<U252C> \x92 |1
+<U2534> \x91 |1
+<U253C> \x95 |1
+<U2550> \x9D |1
+<U2551> \x8A |1
+<U2554> \x99 |1
+<U2557> \x8B |1
+<U255A> \x98 |1
+<U255D> \x8C |1
+<U2560> \x9C |1
+<U2563> \x89 |1
+<U2566> \x9B |1
+<U2569> \x9A |1
+<U256C> \x9E |1
+<U2580> \x97 |1
+<U2584> \x96 |1
+<U2588> \x87 |1
+<U2591> \x80 |1
+<U2592> \x81 |1
+<U2593> \x82 |1
+<U25AC> \x16 |1
+<U25B2> \x1E |1
+<U25BA> \x10 |1
+<U25BC> \x1F |1
+<U25C4> \x11 |1
+<U25CB> \x09 |1
+<U25D8> \x08 |1
+<U25D9> \x0A |1
+<U263A> \x01 |1
+<U263B> \x02 |1
+<U263C> \x0F |1
+<U2640> \x0C |1
+<U2642> \x0B |1
+<U2660> \x06 |1
+<U2663> \x05 |1
+<U2665> \x03 |1
+<U2666> \x04 |1
+<U266A> \x0D |1
+<U266C> \x0E |1
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+<UFFE8> \x83 |1
+<UFFE9> \x1B |1
+<UFFEA> \x18 |1
+<UFFEB> \x1A |2
+<UFFEC> \x19 |1
+<UFFEE> \x09 |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-913.ucm b/mcs/class/I18N/West/ibm-913.ucm
new file mode 100644
index 00000000000..213fbd6c7f8
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-913.ucm
@@ -0,0 +1,370 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1995-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:04 2000
+#
+# File created by dtcocm version 3.00
+# from source files 34B00391.RPMAP100 and 039134B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-913"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-913
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A3> \xA3 |0
+<U00A4> \xA4 |0
+<U00A7> \xA7 |0
+<U00A8> \xA8 |0
+<U00AD> \xAD |0
+<U00B0> \xB0 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B4> \xB4 |0
+<U00B5> \xB5 |0
+<U00B7> \xB7 |0
+<U00B8> \xB8 |0
+<U00BD> \xBD |0
+<U00C0> \xC0 |0
+<U00C1> \xC1 |0
+<U00C2> \xC2 |0
+<U00C4> \xC4 |0
+<U00C7> \xC7 |0
+<U00C8> \xC8 |0
+<U00C9> \xC9 |0
+<U00CA> \xCA |0
+<U00CB> \xCB |0
+<U00CC> \xCC |0
+<U00CD> \xCD |0
+<U00CE> \xCE |0
+<U00CF> \xCF |0
+<U00D1> \xD1 |0
+<U00D2> \xD2 |0
+<U00D3> \xD3 |0
+<U00D4> \xD4 |0
+<U00D6> \xD6 |0
+<U00D7> \xD7 |0
+<U00D9> \xD9 |0
+<U00DA> \xDA |0
+<U00DB> \xDB |0
+<U00DC> \xDC |0
+<U00DF> \xDF |0
+<U00E0> \xE0 |0
+<U00E1> \xE1 |0
+<U00E2> \xE2 |0
+<U00E4> \xE4 |0
+<U00E7> \xE7 |0
+<U00E8> \xE8 |0
+<U00E9> \xE9 |0
+<U00EA> \xEA |0
+<U00EB> \xEB |0
+<U00EC> \xEC |0
+<U00ED> \xED |0
+<U00EE> \xEE |0
+<U00EF> \xEF |0
+<U00F1> \xF1 |0
+<U00F2> \xF2 |0
+<U00F3> \xF3 |0
+<U00F4> \xF4 |0
+<U00F6> \xF6 |0
+<U00F7> \xF7 |0
+<U00F9> \xF9 |0
+<U00FA> \xFA |0
+<U00FB> \xFB |0
+<U00FC> \xFC |0
+<U0108> \xC6 |0
+<U0109> \xE6 |0
+<U010A> \xC5 |0
+<U010B> \xE5 |0
+<U011C> \xD8 |0
+<U011D> \xF8 |0
+<U011E> \xAB |0
+<U011F> \xBB |0
+<U0120> \xD5 |0
+<U0121> \xF5 |0
+<U0124> \xA6 |0
+<U0125> \xB6 |0
+<U0126> \xA1 |0
+<U0127> \xB1 |0
+<U0130> \xA9 |0
+<U0131> \xB9 |0
+<U0134> \xAC |0
+<U0135> \xBC |0
+<U015C> \xDE |0
+<U015D> \xFE |0
+<U015E> \xAA |0
+<U015F> \xBA |0
+<U016C> \xDD |0
+<U016D> \xFD |0
+<U017B> \xAF |0
+<U017C> \xBF |0
+<U02D8> \xA2 |0
+<U02D9> \xFF |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/ibm-923.ucm b/mcs/class/I18N/West/ibm-923.ucm
new file mode 100644
index 00000000000..78cc496293d
--- /dev/null
+++ b/mcs/class/I18N/West/ibm-923.ucm
@@ -0,0 +1,377 @@
+# *******************************************************************************
+# *
+# *   Copyright (C) 1998-2000, International Business Machines
+# *   Corporation and others.  All Rights Reserved.
+# *
+# *******************************************************************************
+#
+# File created on Mon Nov 13 09:28:04 2000
+#
+# File created by dtcocm version 3.00
+# from source files 44B0039B.RPMAP100 and 039B44B0.TPMAP100
+#
+# Table Version : 1.01
+#
+<code_set_name>               "IBM-923"
+<char_name_mask>              "AXXXX"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#ISO 10646      IBM-923
+#_________      _________
+<U0000> \x00 |0
+<U0001> \x01 |0
+<U0002> \x02 |0
+<U0003> \x03 |0
+<U0004> \x04 |0
+<U0005> \x05 |0
+<U0006> \x06 |0
+<U0007> \x07 |0
+<U0008> \x08 |0
+<U0009> \x09 |0
+<U000A> \x0A |0
+<U000B> \x0B |0
+<U000C> \x0C |0
+<U000D> \x0D |0
+<U000E> \x0E |0
+<U000F> \x0F |0
+<U0010> \x10 |0
+<U0011> \x11 |0
+<U0012> \x12 |0
+<U0013> \x13 |0
+<U0014> \x14 |0
+<U0015> \x15 |0
+<U0016> \x16 |0
+<U0017> \x17 |0
+<U0018> \x18 |0
+<U0019> \x19 |0
+<U001A> \x1A |0
+<U001B> \x1B |0
+<U001C> \x1C |0
+<U001D> \x1D |0
+<U001E> \x1E |0
+<U001F> \x1F |0
+<U0020> \x20 |0
+<U0021> \x21 |0
+<U0022> \x22 |0
+<U0023> \x23 |0
+<U0024> \x24 |0
+<U0025> \x25 |0
+<U0026> \x26 |0
+<U0027> \x27 |0
+<U0028> \x28 |0
+<U0029> \x29 |0
+<U002A> \x2A |0
+<U002B> \x2B |0
+<U002C> \x2C |0
+<U002D> \x2D |0
+<U002E> \x2E |0
+<U002F> \x2F |0
+<U0030> \x30 |0
+<U0031> \x31 |0
+<U0032> \x32 |0
+<U0033> \x33 |0
+<U0034> \x34 |0
+<U0035> \x35 |0
+<U0036> \x36 |0
+<U0037> \x37 |0
+<U0038> \x38 |0
+<U0039> \x39 |0
+<U003A> \x3A |0
+<U003B> \x3B |0
+<U003C> \x3C |0
+<U003D> \x3D |0
+<U003E> \x3E |0
+<U003F> \x3F |0
+<U0040> \x40 |0
+<U0041> \x41 |0
+<U0042> \x42 |0
+<U0043> \x43 |0
+<U0044> \x44 |0
+<U0045> \x45 |0
+<U0046> \x46 |0
+<U0047> \x47 |0
+<U0048> \x48 |0
+<U0049> \x49 |0
+<U004A> \x4A |0
+<U004B> \x4B |0
+<U004C> \x4C |0
+<U004D> \x4D |0
+<U004E> \x4E |0
+<U004F> \x4F |0
+<U0050> \x50 |0
+<U0051> \x51 |0
+<U0052> \x52 |0
+<U0053> \x53 |0
+<U0054> \x54 |0
+<U0055> \x55 |0
+<U0056> \x56 |0
+<U0057> \x57 |0
+<U0058> \x58 |0
+<U0059> \x59 |0
+<U005A> \x5A |0
+<U005B> \x5B |0
+<U005C> \x5C |0
+<U005D> \x5D |0
+<U005E> \x5E |0
+<U005F> \x5F |0
+<U0060> \x60 |0
+<U0061> \x61 |0
+<U0062> \x62 |0
+<U0063> \x63 |0
+<U0064> \x64 |0
+<U0065> \x65 |0
+<U0066> \x66 |0
+<U0067> \x67 |0
+<U0068> \x68 |0
+<U0069> \x69 |0
+<U006A> \x6A |0
+<U006B> \x6B |0
+<U006C> \x6C |0
+<U006D> \x6D |0
+<U006E> \x6E |0
+<U006F> \x6F |0
+<U0070> \x70 |0
+<U0071> \x71 |0
+<U0072> \x72 |0
+<U0073> \x73 |0
+<U0074> \x74 |0
+<U0075> \x75 |0
+<U0076> \x76 |0
+<U0077> \x77 |0
+<U0078> \x78 |0
+<U0079> \x79 |0
+<U007A> \x7A |0
+<U007B> \x7B |0
+<U007C> \x7C |0
+<U007D> \x7D |0
+<U007E> \x7E |0
+<U007F> \x7F |0
+<U0080> \x80 |0
+<U0081> \x81 |0
+<U0082> \x82 |0
+<U0083> \x83 |0
+<U0084> \x84 |0
+<U0085> \x85 |0
+<U0086> \x86 |0
+<U0087> \x87 |0
+<U0088> \x88 |0
+<U0089> \x89 |0
+<U008A> \x8A |0
+<U008B> \x8B |0
+<U008C> \x8C |0
+<U008D> \x8D |0
+<U008E> \x8E |0
+<U008F> \x8F |0
+<U0090> \x90 |0
+<U0091> \x91 |0
+<U0092> \x92 |0
+<U0093> \x93 |0
+<U0094> \x94 |0
+<U0095> \x95 |0
+<U0096> \x96 |0
+<U0097> \x97 |0
+<U0098> \x98 |0
+<U0099> \x99 |0
+<U009A> \x9A |0
+<U009B> \x9B |0
+<U009C> \x9C |0
+<U009D> \x9D |0
+<U009E> \x9E |0
+<U009F> \x9F |0
+<U00A0> \xA0 |0
+<U00A1> \xA1 |0
+<U00A2> \xA2 |0
+<U00A3> \xA3 |0
+<U00A5> \xA5 |0
+<U00A7> \xA7 |0
+<U00A9> \xA9 |0
+<U00AA> \xAA |0
+<U00AB> \xAB |0
+<U00AC> \xAC |0
+<U00AD> \xAD |0
+<U00AE> \xAE |0
+<U00AF> \xAF |0
+<U00B0> \xB0 |0
+<U00B1> \xB1 |0
+<U00B2> \xB2 |0
+<U00B3> \xB3 |0
+<U00B5> \xB5 |0
+<U00B6> \xB6 |0
+<U00B7> \xB7 |0
+<U00B9> \xB9 |0
+<U00BA> \xBA |0
+<U00BB> \xBB |0
+<U00BF> \xBF |0
+<U00C0> \xC0 |0
+<U00C1> \xC1 |0
+<U00C2> \xC2 |0
+<U00C3> \xC3 |0
+<U00C4> \xC4 |0
+<U00C5> \xC5 |0
+<U00C6> \xC6 |0
+<U00C7> \xC7 |0
+<U00C8> \xC8 |0
+<U00C9> \xC9 |0
+<U00CA> \xCA |0
+<U00CB> \xCB |0
+<U00CC> \xCC |0
+<U00CD> \xCD |0
+<U00CE> \xCE |0
+<U00CF> \xCF |0
+<U00D0> \xD0 |0
+<U00D1> \xD1 |0
+<U00D2> \xD2 |0
+<U00D3> \xD3 |0
+<U00D4> \xD4 |0
+<U00D5> \xD5 |0
+<U00D6> \xD6 |0
+<U00D7> \xD7 |0
+<U00D8> \xD8 |0
+<U00D9> \xD9 |0
+<U00DA> \xDA |0
+<U00DB> \xDB |0
+<U00DC> \xDC |0
+<U00DD> \xDD |0
+<U00DE> \xDE |0
+<U00DF> \xDF |0
+<U00E0> \xE0 |0
+<U00E1> \xE1 |0
+<U00E2> \xE2 |0
+<U00E3> \xE3 |0
+<U00E4> \xE4 |0
+<U00E5> \xE5 |0
+<U00E6> \xE6 |0
+<U00E7> \xE7 |0
+<U00E8> \xE8 |0
+<U00E9> \xE9 |0
+<U00EA> \xEA |0
+<U00EB> \xEB |0
+<U00EC> \xEC |0
+<U00ED> \xED |0
+<U00EE> \xEE |0
+<U00EF> \xEF |0
+<U00F0> \xF0 |0
+<U00F1> \xF1 |0
+<U00F2> \xF2 |0
+<U00F3> \xF3 |0
+<U00F4> \xF4 |0
+<U00F5> \xF5 |0
+<U00F6> \xF6 |0
+<U00F7> \xF7 |0
+<U00F8> \xF8 |0
+<U00F9> \xF9 |0
+<U00FA> \xFA |0
+<U00FB> \xFB |0
+<U00FC> \xFC |0
+<U00FD> \xFD |0
+<U00FE> \xFE |0
+<U00FF> \xFF |0
+<U0152> \xBC |0
+<U0153> \xBD |0
+<U0160> \xA6 |0
+<U0161> \xA8 |0
+<U0178> \xBE |0
+<U017D> \xB4 |0
+<U017E> \xB8 |0
+<U20AC> \xA4 |0
+<UFF01> \x21 |1
+<UFF02> \x22 |1
+<UFF03> \x23 |1
+<UFF04> \x24 |1
+<UFF05> \x25 |1
+<UFF06> \x26 |1
+<UFF07> \x27 |1
+<UFF08> \x28 |1
+<UFF09> \x29 |1
+<UFF0A> \x2A |1
+<UFF0B> \x2B |1
+<UFF0C> \x2C |1
+<UFF0D> \x2D |1
+<UFF0E> \x2E |1
+<UFF0F> \x2F |1
+<UFF10> \x30 |1
+<UFF11> \x31 |1
+<UFF12> \x32 |1
+<UFF13> \x33 |1
+<UFF14> \x34 |1
+<UFF15> \x35 |1
+<UFF16> \x36 |1
+<UFF17> \x37 |1
+<UFF18> \x38 |1
+<UFF19> \x39 |1
+<UFF1A> \x3A |1
+<UFF1B> \x3B |1
+<UFF1C> \x3C |1
+<UFF1D> \x3D |1
+<UFF1E> \x3E |1
+<UFF1F> \x3F |1
+<UFF20> \x40 |1
+<UFF21> \x41 |1
+<UFF22> \x42 |1
+<UFF23> \x43 |1
+<UFF24> \x44 |1
+<UFF25> \x45 |1
+<UFF26> \x46 |1
+<UFF27> \x47 |1
+<UFF28> \x48 |1
+<UFF29> \x49 |1
+<UFF2A> \x4A |1
+<UFF2B> \x4B |1
+<UFF2C> \x4C |1
+<UFF2D> \x4D |1
+<UFF2E> \x4E |1
+<UFF2F> \x4F |1
+<UFF30> \x50 |1
+<UFF31> \x51 |1
+<UFF32> \x52 |1
+<UFF33> \x53 |1
+<UFF34> \x54 |1
+<UFF35> \x55 |1
+<UFF36> \x56 |1
+<UFF37> \x57 |1
+<UFF38> \x58 |1
+<UFF39> \x59 |1
+<UFF3A> \x5A |1
+<UFF3B> \x5B |1
+<UFF3C> \x5C |1
+<UFF3D> \x5D |1
+<UFF3E> \x5E |1
+<UFF3F> \x5F |1
+<UFF40> \x60 |1
+<UFF41> \x61 |1
+<UFF42> \x62 |1
+<UFF43> \x63 |1
+<UFF44> \x64 |1
+<UFF45> \x65 |1
+<UFF46> \x66 |1
+<UFF47> \x67 |1
+<UFF48> \x68 |1
+<UFF49> \x69 |1
+<UFF4A> \x6A |1
+<UFF4B> \x6B |1
+<UFF4C> \x6C |1
+<UFF4D> \x6D |1
+<UFF4E> \x6E |1
+<UFF4F> \x6F |1
+<UFF50> \x70 |1
+<UFF51> \x71 |1
+<UFF52> \x72 |1
+<UFF53> \x73 |1
+<UFF54> \x74 |1
+<UFF55> \x75 |1
+<UFF56> \x76 |1
+<UFF57> \x77 |1
+<UFF58> \x78 |1
+<UFF59> \x79 |1
+<UFF5A> \x7A |1
+<UFF5B> \x7B |1
+<UFF5C> \x7C |1
+<UFF5D> \x7D |1
+<UFF5E> \x7E |1
+END CHARMAP
diff --git a/mcs/class/I18N/West/list.unix b/mcs/class/I18N/West/list.unix
new file mode 100755
index 00000000000..892d20df39f
--- /dev/null
+++ b/mcs/class/I18N/West/list.unix
@@ -0,0 +1,15 @@
+CP10000.cs
+CP10079.cs
+CP1250.cs
+CP1252.cs
+CP1253.cs
+CP28592.cs
+CP28593.cs
+CP28597.cs
+CP28605.cs
+CP437.cs
+CP850.cs
+CP860.cs
+CP861.cs
+CP863.cs
+CP865.cs
diff --git a/mcs/class/I18N/West/mac-is.ucm b/mcs/class/I18N/West/mac-is.ucm
new file mode 100644
index 00000000000..08d5694066f
--- /dev/null
+++ b/mcs/class/I18N/West/mac-is.ucm
@@ -0,0 +1,290 @@
+#________________________________________________________________________
+#
+# (C) COPYRIGHT International Business Machines Corp. 2001
+#     All Rights Reserved
+#
+#________________________________________________________________________
+#
+# File created on Thu Apr 05 09:38:46 PDT 2001
+#
+# File created by CharConv tool.
+# Platform: Linux redhat2 2.2.12-20 #1 Mon Sep 27 10:40:35 EDT 1999 i686 unkglibc-
+#
+# Table Version : 1.0
+# The 1st column is the Unicode scalar value.
+# The 2nd column is the codepage byte sequence.
+# The 3rd column is the fallback indicator.
+# The fallback indicator can have one of the following values:
+#   |0 for exact 1-1 roundtrip mapping
+#   |1 for the best fallback codepage byte sequence.
+#   |2 for the substitution character
+#   |3 for the best reverse fallback Unicode scaler value
+#
+<code_set_name>               "MAC_IS"
+<mb_cur_max>                  1
+<mb_cur_min>                  1
+<uconv_class>                 "SBCS"
+<subchar>                     \x1A
+#
+CHARMAP
+#
+#
+#UNICODE MAC_IS
+#_______ _________
+<U0000>  \x00 |0
+<U0001>  \x01 |0
+<U0002>  \x02 |0
+<U0003>  \x03 |0
+<U0004>  \x04 |0
+<U0005>  \x05 |0
+<U0006>  \x06 |0
+<U0007>  \x07 |0
+<U0008>  \x08 |0
+<U0009>  \x09 |0
+<U000A>  \x0A |0
+<U000B>  \x0B |0
+<U000C>  \x0C |0
+<U000D>  \x0D |0
+<U000E>  \x0E |0
+<U000F>  \x0F |0
+<U0010>  \x10 |0
+<U0011>  \x11 |0
+<U0012>  \x12 |0
+<U0013>  \x13 |0
+<U0014>  \x14 |0
+<U0015>  \x15 |0
+<U0016>  \x16 |0
+<U0017>  \x17 |0
+<U0018>  \x18 |0
+<U0019>  \x19 |0
+<U001A>  \x1A |0
+<U001B>  \x1B |0
+<U001C>  \x1C |0
+<U001D>  \x1D |0
+<U001E>  \x1E |0
+<U001F>  \x1F |0
+<U0020>  \x20 |0
+<U0021>  \x21 |0
+<U0022>  \x22 |0
+<U0023>  \x23 |0
+<U0024>  \x24 |0
+<U0025>  \x25 |0
+<U0026>  \x26 |0
+<U0027>  \x27 |0
+<U0028>  \x28 |0
+<U0029>  \x29 |0
+<U002A>  \x2A |0
+<U002B>  \x2B |0
+<U002C>  \x2C |0
+<U002D>  \x2D |0
+<U002E>  \x2E |0
+<U002F>  \x2F |0
+<U0030>  \x30 |0
+<U0031>  \x31 |0
+<U0032>  \x32 |0
+<U0033>  \x33 |0
+<U0034>  \x34 |0
+<U0035>  \x35 |0
+<U0036>  \x36 |0
+<U0037>  \x37 |0
+<U0038>  \x38 |0
+<U0039>  \x39 |0
+<U003A>  \x3A |0
+<U003B>  \x3B |0
+<U003C>  \x3C |0
+<U003D>  \x3D |0
+<U003E>  \x3E |0
+<U003F>  \x3F |0
+<U0040>  \x40 |0
+<U0041>  \x41 |0
+<U0042>  \x42 |0
+<U0043>  \x43 |0
+<U0044>  \x44 |0
+<U0045>  \x45 |0
+<U0046>  \x46 |0
+<U0047>  \x47 |0
+<U0048>  \x48 |0
+<U0049>  \x49 |0
+<U004A>  \x4A |0
+<U004B>  \x4B |0
+<U004C>  \x4C |0
+<U004D>  \x4D |0
+<U004E>  \x4E |0
+<U004F>  \x4F |0
+<U0050>  \x50 |0
+<U0051>  \x51 |0
+<U0052>  \x52 |0
+<U0053>  \x53 |0
+<U0054>  \x54 |0
+<U0055>  \x55 |0
+<U0056>  \x56 |0
+<U0057>  \x57 |0
+<U0058>  \x58 |0
+<U0059>  \x59 |0
+<U005A>  \x5A |0
+<U005B>  \x5B |0
+<U005C>  \x5C |0
+<U005D>  \x5D |0
+<U005E>  \x5E |0
+<U005F>  \x5F |0
+<U0060>  \x60 |0
+<U0061>  \x61 |0
+<U0062>  \x62 |0
+<U0063>  \x63 |0
+<U0064>  \x64 |0
+<U0065>  \x65 |0
+<U0066>  \x66 |0
+<U0067>  \x67 |0
+<U0068>  \x68 |0
+<U0069>  \x69 |0
+<U006A>  \x6A |0
+<U006B>  \x6B |0
+<U006C>  \x6C |0
+<U006D>  \x6D |0
+<U006E>  \x6E |0
+<U006F>  \x6F |0
+<U0070>  \x70 |0
+<U0071>  \x71 |0
+<U0072>  \x72 |0
+<U0073>  \x73 |0
+<U0074>  \x74 |0
+<U0075>  \x75 |0
+<U0076>  \x76 |0
+<U0077>  \x77 |0
+<U0078>  \x78 |0
+<U0079>  \x79 |0
+<U007A>  \x7A |0
+<U007B>  \x7B |0
+<U007C>  \x7C |0
+<U007D>  \x7D |0
+<U007E>  \x7E |0
+<U007F>  \x7F |0
+<U00A0>  \xCA |0
+<U00A1>  \xC1 |0
+<U00A2>  \xA2 |0
+<U00A3>  \xA3 |0
+<U00A4>  \xDB |0
+<U00A5>  \xB4 |0
+<U00A7>  \xA4 |0
+<U00A8>  \xAC |0
+<U00A9>  \xA9 |0
+<U00AA>  \xBB |0
+<U00AB>  \xC7 |0
+<U00AC>  \xC2 |0
+<U00AE>  \xA8 |0
+<U00AF>  \xF8 |0
+<U00B0>  \xA1 |0
+<U00B1>  \xB1 |0
+<U00B4>  \xAB |0
+<U00B5>  \xB5 |0
+<U00B6>  \xA6 |0
+<U00B7>  \xE1 |0
+<U00B8>  \xFC |0
+<U00BA>  \xBC |0
+<U00BB>  \xC8 |0
+<U00BF>  \xC0 |0
+<U00C0>  \xCB |0
+<U00C1>  \xE7 |0
+<U00C2>  \xE5 |0
+<U00C3>  \xCC |0
+<U00C4>  \x80 |0
+<U00C5>  \x81 |0
+<U00C6>  \xAE |0
+<U00C7>  \x82 |0
+<U00C8>  \xE9 |0
+<U00C9>  \x83 |0
+<U00CA>  \xE6 |0
+<U00CB>  \xE8 |0
+<U00CC>  \xED |0
+<U00CD>  \xEA |0
+<U00CE>  \xEB |0
+<U00CF>  \xEC |0
+<U00D1>  \x84 |0
+<U00D2>  \xF1 |0
+<U00D3>  \xEE |0
+<U00D4>  \xEF |0
+<U00D5>  \xCD |0
+<U00D6>  \x85 |0
+<U00D8>  \xAF |0
+<U00D9>  \xF4 |0
+<U00DA>  \xF2 |0
+<U00DB>  \xF3 |0
+<U00DC>  \x86 |0
+<U00DE>  \xDE |0
+<U00DF>  \xA7 |0
+<U00E0>  \x88 |0
+<U00E1>  \x87 |0
+<U00E2>  \x89 |0
+<U00E3>  \x8B |0
+<U00E4>  \x8A |0
+<U00E5>  \x8C |0
+<U00E6>  \xBE |0
+<U00E7>  \x8D |0
+<U00E8>  \x8F |0
+<U00E9>  \x8E |0
+<U00EA>  \x90 |0
+<U00EB>  \x91 |0
+<U00EC>  \x93 |0
+<U00ED>  \x92 |0
+<U00EE>  \x94 |0
+<U00EF>  \x95 |0
+<U00F1>  \x96 |0
+<U00F2>  \x98 |0
+<U00F3>  \x97 |0
+<U00F4>  \x99 |0
+<U00F5>  \x9B |0
+<U00F6>  \x9A |0
+<U00F7>  \xD6 |0
+<U00F8>  \xBF |0
+<U00F9>  \x9D |0
+<U00FA>  \x9C |0
+<U00FB>  \x9E |0
+<U00FC>  \x9F |0
+<U00FE>  \xDF |0
+<U00FF>  \xD8 |0
+<U0110>  \xDC |0
+<U0111>  \xDD |0
+<U0131>  \xF5 |0
+<U0152>  \xCE |0
+<U0153>  \xCF |0
+<U0178>  \xD9 |0
+<U0192>  \xC4 |0
+<U02C7>  \xFF |0
+<U02D8>  \xF9 |0
+<U02D9>  \xFA |0
+<U02DA>  \xFB |0
+<U02DB>  \xFE |0
+<U02DD>  \xFD |0
+<U0394>  \xC6 |0
+<U03A9>  \xBD |0
+<U03C0>  \xB9 |0
+<U2013>  \xD1 |0
+<U2014>  \xD0 |0
+<U2018>  \xD4 |0
+<U2019>  \xD5 |0
+<U201A>  \xE2 |0
+<U201C>  \xD2 |0
+<U201D>  \xD3 |0
+<U201E>  \xE3 |0
+<U2020>  \xA0 |0
+<U2021>  \xE0 |0
+<U2022>  \xA5 |0
+<U2026>  \xC9 |0
+<U2030>  \xE4 |0
+<U2044>  \xDA |0
+<U2122>  \xAA |0
+<U2202>  \xB6 |0
+<U220F>  \xB8 |0
+<U2211>  \xB7 |0
+<U221A>  \xC3 |0
+<U221E>  \xB0 |0
+<U222B>  \xBA |0
+<U2248>  \xC5 |0
+<U2260>  \xAD |0
+<U2264>  \xB2 |0
+<U2265>  \xB3 |0
+<U25C6>  \xD7 |0
+<UE01E>  \xF0 |0
+#
+END CHARMAP
+#
diff --git a/mcs/class/I18N/West/makefile.gnu b/mcs/class/I18N/West/makefile.gnu
new file mode 100755
index 00000000000..aa9a29f24d7
--- /dev/null
+++ b/mcs/class/I18N/West/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../../..
+
+LIBRARY = ../../lib/I18N.West.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib -r mscorlib -r I18N
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=
+
+export MONO_PATH_PREFIX = ../../lib:
+
+include ../../library.make
diff --git a/mcs/class/I18N/makefile.gnu b/mcs/class/I18N/makefile.gnu
new file mode 100755
index 00000000000..f9b422a39aa
--- /dev/null
+++ b/mcs/class/I18N/makefile.gnu
@@ -0,0 +1,14 @@
+INSTALL = /usr/bin/install
+prefix = /usr
+
+DIRS =	Common West MidEast CJK Other Rare
+
+default: all
+
+all clean:
+	@for i in $(DIRS) ; do \
+		if [ -d "$$i" ] && [ -f "$$i/makefile.gnu" ] ; then	\
+			(cd $$i && $(MAKE) -f makefile.gnu $@) || exit 1; \
+		fi	\
+	done
+
diff --git a/mcs/class/I18N/mklist.sh b/mcs/class/I18N/mklist.sh
new file mode 100755
index 00000000000..a3b462bd283
--- /dev/null
+++ b/mcs/class/I18N/mklist.sh
@@ -0,0 +1,40 @@
+#! /bin/sh
+#
+# mklist.sh - Make the I18N handler list file "I18N-handlers.def".
+#
+# Copyright (C) 2002  Southern Storm Software, Pty Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+# Process the command-line options.
+ILFIND="$1"
+OUTFILE="$2"
+if test "x$ILFIND" = "x" ; then
+	echo "$0: missing ilfind argument" 1>&2
+	exit 1
+fi
+if test "x$OUTFILE" = "x" ; then
+	echo "$0: missing output file argument" 1>&2
+	exit 1
+fi
+shift
+shift
+
+# Search all region assemblies for interesting classes and
+# write them to the specified output file.
+exec "${ILFIND}" --public-only --sub-string I18N $* | \
+	grep 'class ' | \
+	sed -e '1,$s/^.*: class //g' - | \
+	sed -e '1,$s/^class //g' - >"${OUTFILE}"
diff --git a/mcs/class/I18N/tools/.cvsignore b/mcs/class/I18N/tools/.cvsignore
new file mode 100644
index 00000000000..aaa5d839385
--- /dev/null
+++ b/mcs/class/I18N/tools/.cvsignore
@@ -0,0 +1,2 @@
+ucm2cp
+uni2tab
diff --git a/mcs/class/I18N/tools/cvt.sh b/mcs/class/I18N/tools/cvt.sh
new file mode 100755
index 00000000000..caa71f3d79f
--- /dev/null
+++ b/mcs/class/I18N/tools/cvt.sh
@@ -0,0 +1,547 @@
+#!/bin/sh
+#
+# This script can be used to regenerate the CPnnnn.cs files
+# from the ".ucm" files.  The list of unsupported code pages
+# is at the end of this file.
+#
+# Copyright (C) 2002  Southern Storm Software, Pty Ltd.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+# Make sure that we are in the correct directory to start.
+if test -d ../Rare ; then
+	cd ..
+fi
+
+#if test "x$1" = "x--include-rare" ; then
+	RARE=""
+#else
+#	RARE="--rare"
+#fi
+
+# Compile the "ucm2cp" tool.
+if gcc -o tools/ucm2cp tools/ucm2cp.c ; then
+	:
+else
+	exit 1
+fi
+UCM2CP=tools/ucm2cp
+
+${UCM2CP} --region Rare --page 37 --wpage 1252 \
+	--name 'IBM EBCDIC (US-Canada)' \
+	--webname IBM037 --bodyname IBM037 \
+	--headername IBM037 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-37.ucm >Rare/CP37.cs
+
+${UCM2CP} --region West --page 437 --wpage 1252 \
+	--name 'OEM United States' \
+	--webname IBM437 --bodyname IBM437 \
+	--headername IBM437 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save West/ibm-437.ucm >West/CP437.cs
+
+${UCM2CP} --region Rare --page 500 --wpage 1252 \
+	--name 'IBM EBCDIC (International)' \
+	--webname IBM500 --bodyname IBM500 \
+	--headername IBM500 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-500.ucm >Rare/CP500.cs
+
+${UCM2CP} --region Rare --page 708 --wpage 1256 \
+	--name 'Arabic (ASMO 708)' \
+	--webname asmo-708 --bodyname iso-8859-6 \
+	--headername asmo-708 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1089.ucm >Rare/CP708.cs
+
+${UCM2CP} --region West --page 850 --wpage 1252 \
+	--name 'Western European (DOS)' \
+	--webname ibm850 --bodyname ibm850 \
+	--headername ibm850 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save West/ibm-850.ucm >West/CP850.cs
+
+${UCM2CP} --region Rare --page 852 --wpage 1250 \
+	--name 'Central European (DOS)' \
+	--webname ibm852 --bodyname ibm852 \
+	--headername ibm852 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-852.ucm >Rare/CP852.cs
+
+${UCM2CP} --region Rare --page 855 --wpage 1251 \
+	--name 'Cyrillic (DOS)' \
+	--webname ibm855 --bodyname ibm855 \
+	--headername ibm855 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-855.ucm >Rare/CP855.cs
+
+${UCM2CP} --region Rare --page 857 --wpage 1254 \
+	--name 'Turkish (DOS)' \
+	--webname ibm857 --bodyname ibm857 \
+	--headername ibm857 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-857.ucm >Rare/CP857.cs
+
+${UCM2CP} --region Rare --page 858 --wpage 1252 \
+	--name 'Western European (DOS with Euro)' \
+	--webname IBM00858 --bodyname IBM00858 \
+	--headername IBM00858 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-858.ucm >Rare/CP858.cs
+
+${UCM2CP} --region West --page 860 --wpage 1252 \
+	--name 'Portuguese (DOS)' \
+	--webname ibm860 --bodyname ibm860 \
+	--headername ibm860 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save West/ibm-860.ucm >West/CP860.cs
+
+${UCM2CP} --region West --page 861 --wpage 1252 \
+	--name 'Icelandic (DOS)' \
+	--webname ibm861 --bodyname ibm861 \
+	--headername ibm861 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save West/ibm-861.ucm >West/CP861.cs
+
+${UCM2CP} --region Rare --page 862 --wpage 1255 \
+	--name 'Hebrew (DOS)' \
+	--webname ibm862 --bodyname ibm862 \
+	--headername ibm861 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-862.ucm >Rare/CP862.cs
+
+${UCM2CP} --region West --page 863 --wpage 1252 \
+	--name 'French Canadian (DOS)' \
+	--webname IBM863 --bodyname IBM863 \
+	--headername IBM863 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save West/ibm-863.ucm >West/CP863.cs
+
+${UCM2CP} --region Rare --page 864 --wpage 1256 \
+	--name 'Arabic (DOS)' \
+	--webname ibm864 --bodyname ibm864 \
+	--headername ibm864 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-864.ucm >Rare/CP864.cs
+
+${UCM2CP} --region West --page 865 --wpage 1252 \
+	--name 'Nordic (DOS)' \
+	--webname IBM865 --bodyname IBM863 \
+	--headername IBM865 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save West/ibm-865.ucm >West/CP865.cs
+
+${UCM2CP} --region Rare --page 866 --wpage 1251 \
+	--name 'Russian (DOS)' \
+	--webname ibm866 --bodyname ibm866 \
+	--headername ibm866 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-866.ucm >Rare/CP866.cs
+
+${UCM2CP} --region Rare --page 869 --wpage 1253 \
+	--name 'Greek (DOS)' \
+	--webname ibm869 --bodyname ibm869 \
+	--headername ibm869 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-869.ucm >Rare/CP869.cs
+
+${UCM2CP} --region Rare --page 870 --wpage 1250 \
+	--name 'IBM EBCDIC (Latin 2)' \
+	--webname ibm870 --bodyname ibm870 \
+	--headername ibm870 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-870.ucm >Rare/CP870.cs
+
+${UCM2CP} --region Other --page 874 --wpage 874 \
+	--name 'Thai (Windows)' \
+	--webname windows-874 --bodyname windows-874 \
+	--headername windows-874 Other/ibm-874.ucm >Other/CP874.cs
+
+${UCM2CP} --region Rare --page 875 --wpage 1253 \
+	--name 'IBM EBCDIC (Greek)' \
+	--webname ibm875 --bodyname ibm875 \
+	--headername ibm875 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-875.ucm >Rare/CP875.cs
+
+${UCM2CP} --region Rare --page 1026 --wpage 1254 \
+	--name 'IBM EBCDIC (Turkish)' \
+	--webname ibm1026 --bodyname ibm1026 \
+	--headername ibm1026 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1026.ucm >Rare/CP1026.cs
+
+${UCM2CP} --region Rare --page 1047 --wpage 1252 \
+	--name 'IBM EBCDIC (Open Systems Latin 1)' \
+	--webname ibm1047 --bodyname ibm1047 \
+	--headername ibm1047 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1047.ucm >Rare/CP1047.cs
+
+${UCM2CP} --region Rare --page 1140 --wpage 1252 \
+	--name 'IBM EBCDIC (US-Canada with Euro)' \
+	--webname IBM01140 --bodyname IBM01140 \
+	--headername IBM01140 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1140.ucm >Rare/CP1140.cs
+
+${UCM2CP} --region Rare --page 1141 --wpage 1252 \
+	--name 'IBM EBCDIC (Germany with Euro)' \
+	--webname IBM01141 --bodyname IBM01141 \
+	--headername IBM01141 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1141.ucm >Rare/CP1141.cs
+
+${UCM2CP} --region Rare --page 1142 --wpage 1252 \
+	--name 'IBM EBCDIC (Denmark/Norway with Euro)' \
+	--webname IBM01142 --bodyname IBM01142 \
+	--headername IBM01142 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1142.ucm >Rare/CP1142.cs
+
+${UCM2CP} --region Rare --page 1143 --wpage 1252 \
+	--name 'IBM EBCDIC (Finland/Sweden with Euro)' \
+	--webname IBM01143 --bodyname IBM01143 \
+	--headername IBM01143 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1143.ucm >Rare/CP1143.cs
+
+${UCM2CP} --region Rare --page 1144 --wpage 1252 \
+	--name 'IBM EBCDIC (Italy with Euro)' \
+	--webname ibm1144 --bodyname ibm1144 \
+	--headername ibm1144 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1144.ucm >Rare/CP1144.cs
+
+${UCM2CP} --region Rare --page 1145 --wpage 1252 \
+	--name 'IBM EBCDIC (Latin America/Spain with Euro)' \
+	--webname ibm1145 --bodyname ibm1145 \
+	--headername ibm1145 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1145.ucm >Rare/CP1145.cs
+
+${UCM2CP} --region Rare --page 1146 --wpage 1252 \
+	--name 'IBM EBCDIC (United Kingdom with Euro)' \
+	--webname ibm1146 --bodyname ibm1146 \
+	--headername ibm1146 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1146.ucm >Rare/CP1146.cs
+
+${UCM2CP} --region Rare --page 1147 --wpage 1252 \
+	--name 'IBM EBCDIC (France with Euro)' \
+	--webname ibm1147 --bodyname ibm1147 \
+	--headername ibm1147 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1147.ucm >Rare/CP1147.cs
+
+${UCM2CP} --region Rare --page 1148 --wpage 1252 \
+	--name 'IBM EBCDIC (International with Euro)' \
+	--webname ibm1148 --bodyname ibm1148 \
+	--headername ibm1148 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1148.ucm >Rare/CP1148.cs
+
+${UCM2CP} --region Rare --page 1149 --wpage 1252 \
+	--name 'IBM EBCDIC (Icelandic with Euro)' \
+	--webname ibm1149 --bodyname ibm1149 \
+	--headername ibm1149 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1149.ucm >Rare/CP1149.cs
+
+${UCM2CP} --region West --page 1250 --wpage 1250 \
+	--name 'Central European (Windows)' \
+	--webname windows-1250 --bodyname iso-8859-2 \
+	--headername windows-1250 West/ibm-5346.ucm >West/CP1250.cs
+
+${UCM2CP} --region Other --page 1251 --wpage 1251 \
+	--name 'Cyrillic (Windows)' \
+	--webname windows-1251 --bodyname koi8-r \
+	--headername windows-1251 Other/ibm-5347.ucm >Other/CP1251.cs
+
+${UCM2CP} --region West --page 1252 --wpage 1252 \
+	--name 'Western European (Windows)' \
+	--webname Windows-1252 --bodyname iso-8859-1 \
+	--headername Windows-1252 West/ibm-5348.ucm >West/CP1252.cs
+
+${UCM2CP} --region West --page 1253 --wpage 1253 \
+	--name 'Greek (Windows)' \
+	--webname windows-1253 --bodyname iso-8859-7 \
+	--headername windows-1253 West/ibm-5349.ucm >West/CP1253.cs
+
+${UCM2CP} --region MidEast --page 1254 --wpage 1254 \
+	--name 'Turkish (Windows)' \
+	--webname windows-1254 --bodyname iso-8859-9 \
+	--headername windows-1254 MidEast/ibm-5350.ucm >MidEast/CP1254.cs
+
+${UCM2CP} --region MidEast --page 1255 --wpage 1255 \
+	--name 'Hebrew (Windows)' \
+	--webname windows-1255 --bodyname windows-1255 \
+	--headername windows-1255 MidEast/ibm-5351.ucm >MidEast/CP1255.cs
+
+${UCM2CP} --region MidEast --page 1256 --wpage 1256 \
+	--name 'Arabic (Windows)' \
+	--webname windows-1256 --bodyname windows-1256 \
+	--headername windows-1256 MidEast/ibm-5352.ucm >MidEast/CP1256.cs
+
+${UCM2CP} --region Other --page 1257 --wpage 1257 \
+	--name 'Baltic (Windows)' \
+	--webname windows-1257 --bodyname iso-8859-4 \
+	--headername windows-1257 Other/ibm-5353.ucm >Other/CP1257.cs
+
+${UCM2CP} --region Other --page 1258 --wpage 1258 \
+	--name 'Vietnamese (Windows)' \
+	--webname windows-1258 --bodyname windows-1258 \
+	--headername windows-1258 Other/ibm-5354.ucm >Other/CP1258.cs
+
+${UCM2CP} --region West --page 10000 --wpage 1252 \
+	--name 'Western European (Mac)' \
+	--webname macintosh --bodyname macintosh \
+	--headername macintosh --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save West/ibm-1275.ucm >West/CP10000.cs
+
+${UCM2CP} --region West --page 10079 --wpage 1252 \
+	--name 'Icelandic (Mac)' \
+	--webname x-mac-icelandic --bodyname x-mac-icelandic \
+	--headername x-mac-icelandic --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save West/mac-is.ucm >West/CP10079.cs
+
+${UCM2CP} --region Rare --page 20273 --wpage 1252 \
+	--name 'IBM EBCDIC (Germany)' \
+	--webname IBM273 --bodyname IBM273 \
+	--headername IBM273 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-273.ucm >Rare/CP20273.cs
+
+${UCM2CP} --region Rare --page 20277 --wpage 1252 \
+	--name 'IBM EBCDIC (Denmark/Norway)' \
+	--webname IBM277 --bodyname IBM277 \
+	--headername IBM277 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-277.ucm >Rare/CP20277.cs
+
+${UCM2CP} --region Rare --page 20278 --wpage 1252 \
+	--name 'IBM EBCDIC (Finland/Sweden)' \
+	--webname IBM278 --bodyname IBM278 \
+	--headername IBM278 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-278.ucm >Rare/CP20278.cs
+
+${UCM2CP} --region Rare --page 20280 --wpage 1252 \
+	--name 'IBM EBCDIC (Italy)' \
+	--webname IBM280 --bodyname IBM280 \
+	--headername IBM280 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-280.ucm >Rare/CP20280.cs
+
+${UCM2CP} --region Rare --page 20284 --wpage 1252 \
+	--name 'IBM EBCDIC (Latin America/Spain)' \
+	--webname IBM284 --bodyname IBM284 \
+	--headername IBM284 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-284.ucm >Rare/CP20284.cs
+
+${UCM2CP} --region Rare --page 20285 --wpage 1252 \
+	--name 'IBM EBCDIC (United Kingdom)' \
+	--webname IBM285 --bodyname IBM285 \
+	--headername IBM285 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-285.ucm >Rare/CP20285.cs
+
+${UCM2CP} --region Rare --page 20290 --wpage 932 \
+	--name 'IBM EBCDIC (Japanese Katakana Extended)' \
+	--webname IBM290 --bodyname IBM290 \
+	--headername IBM290 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-290.ucm >Rare/CP20290.cs
+
+${UCM2CP} --region Rare --page 20297 --wpage 1252 \
+	--name 'IBM EBCDIC (France)' \
+	--webname IBM297 --bodyname IBM297 \
+	--headername IBM297 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-297.ucm >Rare/CP20297.cs
+
+${UCM2CP} --region Rare --page 20420 --wpage 1256 \
+	--name 'IBM EBCDIC (Arabic)' \
+	--webname IBM420 --bodyname IBM420 \
+	--headername IBM420 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-420.ucm >Rare/CP20420.cs
+
+${UCM2CP} --region Rare --page 20424 --wpage 1255 \
+	--name 'IBM EBCDIC (Hebrew)' \
+	--webname IBM424 --bodyname IBM424 \
+	--headername IBM424 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-424.ucm >Rare/CP20424.cs
+
+${UCM2CP} --region Other --page 20866 --wpage 1251 \
+	--name 'Cyrillic (KOI8-R)' \
+	--webname koi8-r --bodyname koi8-r \
+	--headername koi8-r Other/ibm-878.ucm >Other/CP20866.cs
+
+${UCM2CP} --region Rare --page 20871 --wpage 1252 \
+	--name 'IBM EBCDIC (Icelandic)' \
+	--webname IBM871 --bodyname IBM871 \
+	--headername IBM871 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-871.ucm >Rare/CP20871.cs
+
+${UCM2CP} --region Rare --page 21025 --wpage 1257 \
+	--name 'IBM EBCDIC (Cyrillic - Serbian, Bulgarian)' \
+	--webname IBM1025 --bodyname IBM1025 \
+	--headername IBM1025 --no-browser-display \
+	--no-browser-save --no-mailnews-display \
+	--no-mailnews-save Rare/ibm-1025.ucm >Rare/CP21025.cs
+
+${UCM2CP} --region Other --page 21866 --wpage 1251 \
+	--name 'Ukrainian (KOI8-U)' \
+	--webname koi8-u --bodyname koi8-u \
+	--headername koi8-u Other/koi8-u.ucm >Other/CP21866.cs
+
+${UCM2CP} --region West --page 28592 --wpage 1250 \
+	--name 'Central European (ISO)' \
+	--webname iso-8859-2 --bodyname iso-8859-2 \
+	--headername iso-8859-2 West/ibm-912.ucm >West/CP28592.cs
+
+${UCM2CP} --region West --page 28593 --wpage 28593 \
+	--name 'Latin 3 (ISO)' \
+	--webname iso-8859-3 --bodyname iso-8859-3 \
+	--headername iso-8859-3 West/ibm-913.ucm >West/CP28593.cs
+
+${UCM2CP} --region Other --page 28594 --wpage 1257 \
+	--name 'Baltic (ISO)' \
+	--webname iso-8859-4 --bodyname iso-8859-4 \
+	--headername iso-8859-4 Other/ibm-914.ucm >Other/CP28594.cs
+
+${UCM2CP} --region Other --page 28595 --wpage 1251 \
+	--name 'Cyrillic (ISO)' \
+	--webname iso-8859-5 --bodyname iso-8859-5 \
+	--headername iso-8859-5 Other/ibm-915.ucm >Other/CP28595.cs
+
+${UCM2CP} --region MidEast --page 28596 --wpage 1256 \
+	--name 'Arabic (ISO)' \
+	--webname iso-8859-6 --bodyname iso-8859-6 \
+	--headername iso-8859-6 MidEast/ibm-1089.ucm >MidEast/CP28596.cs
+
+${UCM2CP} --region West --page 28597 --wpage 1253 \
+	--name 'Greek (ISO)' \
+	--webname iso-8859-7 --bodyname iso-8859-7 \
+	--headername iso-8859-7 West/ibm-4909.ucm >West/CP28597.cs
+
+${UCM2CP} --region MidEast --page 28598 --wpage 1255 \
+	--name 'Hebrew (ISO)' \
+	--webname iso-8859-8 --bodyname iso-8859-8 \
+	--headername iso-8859-8 MidEast/ibm-916.ucm >MidEast/CP28598.cs
+
+${UCM2CP} --region MidEast --page 28599 --wpage 1254 \
+	--name 'Latin 5 (ISO)' \
+	--webname iso-8859-9 --bodyname iso-8859-9 \
+	--headername iso-8859-9 MidEast/ibm-920.ucm >MidEast/CP28599.cs
+
+${UCM2CP} --region West --page 28605 --wpage 1252 \
+	--name 'Latin 9 (ISO)' \
+	--webname iso-8859-15 --bodyname iso-8859-15 \
+	--headername iso-8859-15 --no-browser-display \
+	West/ibm-923.ucm >West/CP28605.cs
+
+${UCM2CP} --region MidEast --page 38598 --wpage 1255 \
+	--name 'Hebrew (ISO Alternative)' \
+	--webname windows-38598 --bodyname iso-8859-8 \
+	--headername windows-38598 MidEast/ibm-916.ucm >MidEast/CP38598.cs
+
+exit 0
+
+# Windows code pages that are handled internally by "Encoding":
+#
+#  1200  Unicode
+#  1201  Unicode (Big-Endian)
+#  20127 US-ASCII
+#  28591 Western European (ISO)
+#  65000 Unicode (UTF-7)
+#  65001 Unicode (UTF-8)
+#
+# Other Windows code pages that aren't done yet:
+#
+#  709   Arabic - ASMO 449+, BCON V4
+#  710   Arabic - Transparent Arabic
+#  720   Arabic - Transparent ASMO
+#  737   OEM - Greek (formerly 437G)
+#  775   OEM - Baltic
+#  936   Chinese Simplified (GB2312)
+#  949   Korean
+#  950   Chinese Traditional (Big5)
+#  1361  Korean (Johab)
+#  10001 MAC - Japanese
+#  10002 MAC - Traditional Chinese (Big5)
+#  10003 MAC - Korean
+#  10004 MAC - Arabic
+#  10005 MAC - Hebrew
+#  10006 MAC - Greek I
+#  10007 MAC - Cyrillic
+#  10008 MAC - Simplified Chinese (GB 2312)
+#  10010 MAC - Romania
+#  10017 MAC - Ukraine
+#  10021 MAC - Thai
+#  10029 MAC - Latin II
+#  10081 MAC - Turkish
+#  10082 MAC - Croatia
+#  12000 Unicode UCS-4 Little-Endian
+#  12001 Unicode UCS-4 Big-Endian
+#  20000 CNS - Taiwan
+#  20001 TCA - Taiwan
+#  20002 Eten - Taiwan
+#  20003 IBM5550 - Taiwan
+#  20004 TeleText - Taiwan
+#  20005 Wang - Taiwan
+#  20105 IA5 IRV International Alphabet No. 5 (7-bit)
+#  20106 IA5 German (7-bit)
+#  20107 IA5 Swedish (7-bit)
+#  20108 IA5 Norwegian (7-bit)
+#  20261 T.61
+#  20269 ISO 6937 Non-Spacing Accent
+#  20423 IBM EBCDIC - Greek
+#  20833 IBM EBCDIC - Korean Extended
+#  20838 IBM EBCDIC - Thai
+#  20880 IBM EBCDIC - Cyrillic (Russian)
+#  20905 IBM EBCDIC - Turkish
+#  20924 IBM EBCDIC - Latin-1/Open System (1047 + Euro symbol)
+#  20932 JIX X 0208-1990 & 0212-1990
+#  20936 Simplified Chinese (GB2312)
+#  21027 Extended Alpha Lowercase
+#  21866 Ukrainian (KOI8-U)
+#  29001 Europa 3
+#  50220 Japanese (JIS)
+#  50221 Japanese (JIS-Allow 1 byte Kana)
+#  50222 Japanese (JIS-Allow 1 byte Kana - SO/SI)
+#  50225 Korean (ISO)
+#  50227 ISO-2022 Simplified Chinese
+#  50229 ISO-2022 Traditional Chinese
+#  50930 Japanese (Katakana) Extended
+#  50931 US/Canada and Japanese
+#  50933 Korean Extended and Korean
+#  50935 Simplified Chinese Extended and Simplified Chinese
+#  50936 Simplified Chinese
+#  50937 US/Canada and Traditional Chinese
+#  50939 Japanese (Latin) Extended and Japanese
+#  51932 Japanese (EUC)
+#  51936 Chinese Simplified (EUC)
+#  51949 Korean (EUC)
+#  51950 Traditional Chinese (EUC)
+#  52936 Chinese Simplified (HZ)
+#  54936 GB 18030-2000 Simplified Chinese
diff --git a/mcs/class/I18N/tools/ucm2cp.c b/mcs/class/I18N/tools/ucm2cp.c
new file mode 100644
index 00000000000..fa43452b078
--- /dev/null
+++ b/mcs/class/I18N/tools/ucm2cp.c
@@ -0,0 +1,599 @@
+/*
+ * ucm2cp.c - Convert IBM ".ucm" files into code page handling classes.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+
+Usage: ucm2cp [options] file
+
+	--region name			I18N region name
+	--page num				Code page number
+	--wpage num				Windows code page number (optional)
+	--name str				Human-readable encoding name
+	--webname str			Web name of the encoding
+	--headername str		Header name of the encoding (optional)
+	--bodyname str			Body name of the encoding (optional)
+	--no-browser-display	Set browser display value to false (optional)
+	--no-browser-save		Set browser save value to false (optional)
+	--no-mailnews-display	Set mail/news display value to false (optional)
+	--no-mailnews-save		Set mail/news save value to false (optional)
+
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/*
+ * Option values.
+ */
+static char *region = 0;
+static int codePage = 0;
+static int windowsCodePage = 0;
+static char *name = 0;
+static char *webName = 0;
+static char *headerName = 0;
+static char *bodyName = 0;
+static int isBrowserDisplay = 1;
+static int isBrowserSave = 1;
+static int isMailNewsDisplay = 1;
+static int isMailNewsSave = 1;
+static const char *filename = 0;
+
+/*
+ * Forward declarations.
+ */
+static void usage(char *progname);
+static void loadCharMaps(FILE *file);
+static void printHeader(void);
+static void printFooter(void);
+static void printByteToChar(void);
+static void printCharToByte(void);
+
+int main(int argc, char *argv[])
+{
+	char *progname = argv[0];
+	FILE *file;
+	int len;
+
+	/* Process the command-line options */
+	while(argc > 1 && argv[1][0] == '-')
+	{
+		if(!strcmp(argv[1], "--page") && argc > 2)
+		{
+			codePage = atoi(argv[2]);
+			++argv;
+			--argc;
+		}
+		else if(!strcmp(argv[1], "--wpage") && argc > 2)
+		{
+			windowsCodePage = atoi(argv[2]);
+			++argv;
+			--argc;
+		}
+		else if(!strcmp(argv[1], "--region") && argc > 2)
+		{
+			region = argv[2];
+			++argv;
+			--argc;
+		}
+		else if(!strcmp(argv[1], "--name") && argc > 2)
+		{
+			name = argv[2];
+			++argv;
+			--argc;
+		}
+		else if(!strcmp(argv[1], "--webname") && argc > 2)
+		{
+			webName = argv[2];
+			++argv;
+			--argc;
+		}
+		else if(!strcmp(argv[1], "--headername") && argc > 2)
+		{
+			headerName = argv[2];
+			++argv;
+			--argc;
+		}
+		else if(!strcmp(argv[1], "--bodyname") && argc > 2)
+		{
+			bodyName = argv[2];
+			++argv;
+			--argc;
+		}
+		else if(!strcmp(argv[1], "--no-browser-display"))
+		{
+			isBrowserDisplay = 0;
+		}
+		else if(!strcmp(argv[1], "--no-browser-save"))
+		{
+			isBrowserSave = 0;
+		}
+		else if(!strcmp(argv[1], "--no-mailnews-display"))
+		{
+			isMailNewsDisplay = 0;
+		}
+		else if(!strcmp(argv[1], "--no-mailnews-save"))
+		{
+			isMailNewsSave = 0;
+		}
+		++argv;
+		--argc;
+	}
+
+	/* Make sure that we have sufficient options */
+	if(!region || !codePage || !name || !webName || argc != 2)
+	{
+		usage(progname);
+		return 1;
+	}
+
+	/* Set defaults for unspecified options */
+	if(!headerName)
+	{
+		headerName = webName;
+	}
+	if(!bodyName)
+	{
+		bodyName = webName;
+	}
+	if(!windowsCodePage)
+	{
+		windowsCodePage = codePage;
+	}
+
+	/* Open the UCM file */
+	file = fopen(argv[1], "r");
+	if(!file)
+	{
+		perror(argv[1]);
+		return 1;
+	}
+	filename = argv[1];
+	len = strlen(filename);
+	while(len > 0 && filename[len - 1] != '/' && filename[len - 1] != '\\')
+	{
+		--len;
+	}
+	filename += len;
+
+	/* Load the character maps from the input file */
+	loadCharMaps(file);
+
+	/* Print the output header */
+	printHeader();
+
+	/* Print the byte->char conversion table */
+	printByteToChar();
+
+	/* Output the char->byte conversion methods */
+	printCharToByte();
+
+	/* Print the output footer */
+	printFooter();
+
+	/* Clean up and exit */
+	fclose(file);
+	return 0;
+}
+
+static void usage(char *progname)
+{
+	fprintf(stderr, "Usage: %s [options] file\n\n", progname);
+	fprintf(stderr, "    --region name         I18N region name\n");
+	fprintf(stderr, "    --page num            Code page number\n");
+	fprintf(stderr, "    --wpage num           Windows code page number (optional)\n");
+	fprintf(stderr, "    --name str            Human-readable encoding name\n");
+	fprintf(stderr, "    --webname str         Web name of the encoding\n");
+	fprintf(stderr, "    --headername str      Header name of the encoding (optional)\n");
+	fprintf(stderr, "    --bodyname str        Body name of the encoding (optional)\n");
+	fprintf(stderr, "    --no-browser-display  Set browser display value to false (optional)\n");
+	fprintf(stderr, "    --no-browser-save     Set browser save value to false (optional)\n");
+	fprintf(stderr, "    --no-mailnews-display Set mail/news display value to false (optional)\n");
+	fprintf(stderr, "    --no-mailnews-save    Set mail/news save value to false (optional)\n");
+}
+
+/*
+ * Map bytes to characters.  The level value is used to determine
+ * which char mapping is the most likely if there is more than one.
+ */
+static unsigned byteToChar[256];
+static int      byteToCharLevel[256];
+
+/*
+ * Map characters to bytes.
+ */
+static int charToByte[65536];
+
+/*
+ * Parse a hexadecimal value.  Returns the length
+ * of the value that was parsed.
+ */
+static int parseHex(const char *buf, unsigned long *value)
+{
+	int len = 0;
+	char ch;
+	*value = 0;
+	while((ch = buf[len]) != '\0')
+	{
+		if(ch >= '0' && ch <= '9')
+		{
+			*value = *value * 16 + (unsigned long)(ch - '0');
+		}
+		else if(ch >= 'A' && ch <= 'F')
+		{
+			*value = *value * 16 + (unsigned long)(ch - 'A' + 10);
+		}
+		else if(ch >= 'a' && ch <= 'f')
+		{
+			*value = *value * 16 + (unsigned long)(ch - 'a' + 10);
+		}
+		else
+		{
+			break;
+		}
+		++len;
+	}
+	return len;
+}
+
+/*
+ * Load the character mapping information from a UCM file.
+ */
+static void loadCharMaps(FILE *file)
+{
+	unsigned long posn;
+	unsigned long byteValue;
+	int level;
+	char buffer[BUFSIZ];
+	const char *buf;
+
+	/* Initialize the mapping tables */
+	for(posn = 0; posn < 256; ++posn)
+	{
+		byteToChar[posn] = (unsigned)'?';
+		byteToCharLevel[posn] = 100;
+	}
+	for(posn = 0; posn < 65536; ++posn)
+	{
+		charToByte[posn] = -1;
+	}
+
+	/* Read the contents of the file */
+	while(fgets(buffer, BUFSIZ, file))
+	{
+		/* Lines of interest begin with "<U" */
+		if(buffer[0] != '<' || buffer[1] != 'U')
+		{
+			continue;
+		}
+
+		/* Parse the fields on the line */
+		buf = buffer + 2;
+		buf += parseHex(buf, &posn);
+		if(posn >= 65536)
+		{
+			continue;
+		}
+		while(*buf != '\0' && *buf != '\\')
+		{
+			++buf;
+		}
+		if(*buf != '\\' || buf[1] != 'x')
+		{
+			continue;
+		}
+		buf += 2;
+		buf += parseHex(buf, &byteValue);
+		if(byteValue >= 256)
+		{
+			continue;
+		}
+		while(*buf != '\0' && *buf != '|')
+		{
+			++buf;
+		}
+		if(*buf != '|')
+		{
+			continue;
+		}
+		level = (int)(buf[1] - '0');
+
+		/* Update the byte->char mapping table */
+		if(level < byteToCharLevel[byteValue])
+		{
+			byteToCharLevel[byteValue] = level;
+			byteToChar[byteValue] = (unsigned)posn;
+		}
+
+		/* Update the char->byte mapping table */
+		charToByte[posn] = (int)byteValue;
+	}
+}
+
+#define	COPYRIGHT_MSG \
+" *\n" \
+" * Copyright (c) 2002  Southern Storm Software, Pty Ltd\n" \
+" *\n" \
+" * Permission is hereby granted, free of charge, to any person obtaining\n" \
+" * a copy of this software and associated documentation files (the \"Software\"),\n" \
+" * to deal in the Software without restriction, including without limitation\n" \
+" * the rights to use, copy, modify, merge, publish, distribute, sublicense,\n" \
+" * and/or sell copies of the Software, and to permit persons to whom the\n" \
+" * Software is furnished to do so, subject to the following conditions:\n" \
+" *\n" \
+" * The above copyright notice and this permission notice shall be included\n" \
+" * in all copies or substantial portions of the Software.\n" \
+" *\n" \
+" * THE SOFTWARE IS PROVIDED \"AS IS\", WITHOUT WARRANTY OF ANY KIND, EXPRESS\n" \
+" * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,\n" \
+" * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL\n" \
+" * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR\n" \
+" * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,\n" \
+" * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR\n" \
+" * OTHER DEALINGS IN THE SOFTWARE.\n" \
+" */\n\n"
+
+/*
+ * Print the header for the current code page definition.
+ */
+static void printHeader(void)
+{
+	printf("/*\n * CP%d.cs - %s code page.\n", codePage, name);
+	fputs(COPYRIGHT_MSG, stdout);
+	printf("// Generated from \"%s\".\n\n", filename);
+	printf("namespace I18N.%s\n{\n\n", region);
+	printf("using System;\n");
+	printf("using I18N.Common;\n\n");
+	printf("public class CP%d : ByteEncoding\n{\n", codePage);
+	printf("\tpublic CP%d()\n", codePage);
+	printf("\t\t: base(%d, ToChars, \"%s\",\n", codePage, name);
+	printf("\t\t       \"%s\", \"%s\", \"%s\",\n",
+	       bodyName, headerName, webName);
+	printf("\t\t       %s, %s, %s, %s, %d)\n",
+		   (isBrowserDisplay ? "true" : "false"),
+		   (isBrowserSave ? "true" : "false"),
+		   (isMailNewsDisplay ? "true" : "false"),
+		   (isMailNewsSave ? "true" : "false"),
+		   windowsCodePage);
+	printf("\t{}\n\n");
+}
+
+/*
+ * Print an encoding name, adjusted to look like a type name.
+ */
+static void printEncodingName(const char *name)
+{
+	while(*name != '\0')
+	{
+		if(*name >= 'A' && *name <= 'Z')
+		{
+			putc(*name - 'A' + 'a', stdout);
+		}
+		else if(*name == '-')
+		{
+			putc('_', stdout);
+		}
+		else
+		{
+			putc(*name, stdout);
+		}
+		++name;
+	}
+}
+
+/*
+ * Print the footer for the current code page definition.
+ */
+static void printFooter(void)
+{
+	printf("}; // class CP%d\n\n", codePage);
+	printf("public class ENC");
+	printEncodingName(webName);
+	printf(" : CP%d\n{\n", codePage);
+	printf("\tpublic ENC");
+	printEncodingName(webName);
+	printf("() : base() {}\n\n");
+	printf("}; // class ENC");
+	printEncodingName(webName);
+	printf("\n\n}; // namespace I18N.%s\n", region);
+}
+
+/*
+ * Print the byte->char conversion table.
+ */
+static void printByteToChar(void)
+{
+	int posn;
+	printf("\tprivate static readonly char[] ToChars = {");
+	for(posn = 0; posn < 256; ++posn)
+	{
+		if((posn % 6) == 0)
+		{
+			printf("\n\t\t");
+		}
+		printf("'\\u%04X', ", byteToChar[posn]);
+	}
+	printf("\n\t};\n\n");
+}
+
+/*
+ * Print a "switch" statement that converts "ch" from
+ * a character value into a byte value.
+ */
+static void printConvertSwitch(void)
+{
+	unsigned long directLimit;
+	unsigned long posn;
+	unsigned long posn2;
+	unsigned long rangeSize;
+	int haveDirect;
+	int haveFullWidth;
+
+	/* Find the limit of direct byte mappings */
+	directLimit = 0;
+	while(directLimit < 256 && charToByte[directLimit] == (int)directLimit)
+	{
+		++directLimit;
+	}
+
+	/* Determine if we have the full-width Latin1 mappings, which
+	   we can optimise in the default case of the switch */
+	haveFullWidth = 1;
+	for(posn = 0xFF01; posn <= 0xFF5E; ++posn)
+	{
+		if((charToByte[posn] - 0x21) != (int)(posn - 0xFF01))
+		{
+			haveFullWidth = 0;
+		}
+	}
+
+	/* Print the switch header.  The "if" is an optimisation
+	   to ignore the common case of direct ASCII mappings */
+	printf("\t\t\tif(ch >= %lu) switch(ch)\n", directLimit);
+	printf("\t\t\t{\n");
+
+	/* Handle all direct byte mappings above the direct limit */
+	haveDirect = 0;
+	for(posn = directLimit; posn < 256; ++posn)
+	{
+		if(charToByte[posn] == (int)posn)
+		{
+			haveDirect = 1;
+			printf("\t\t\t\tcase 0x%04lX:\n", posn);
+		}
+	}
+	if(haveDirect)
+	{
+		printf("\t\t\t\t\tbreak;\n");
+	}
+
+	/* Handle the indirect mappings */
+	for(posn = 0; posn < 65536; ++posn)
+	{
+		if(haveFullWidth && posn >= 0xFF01 && posn <= 0xFF5E)
+		{
+			/* Handle full-width Latin1 conversions later */
+			continue;
+		}
+		if(charToByte[posn] != (int)posn &&
+		   charToByte[posn] != -1)
+		{
+			/* See if we have a run of 4 or more characters that
+			   can be mapped algorithmically to some other range */
+			rangeSize = 1;
+			for(posn2 = posn + 1; posn2 < 65536; ++posn2)
+			{
+				if(charToByte[posn2] == (int)posn2 ||
+				   charToByte[posn2] == -1)
+				{
+					break;
+				}
+				if((charToByte[posn2] - charToByte[posn]) !=
+				   (int)(posn2 - posn))
+				{
+					break;
+				}
+				++rangeSize;
+			}
+			if(rangeSize >= 4)
+			{
+				/* Output a range mapping for the characters */
+				for(posn2 = posn; posn2 < (posn + rangeSize); ++posn2)
+				{
+					printf("\t\t\t\tcase 0x%04lX:\n", posn2);
+				}
+				posn += rangeSize - 1;
+				if(((long)posn) >= (long)(charToByte[posn]))
+				{
+					printf("\t\t\t\t\tch -= 0x%04lX;\n",
+						   (long)(posn - charToByte[posn]));
+				}
+				else
+				{
+					printf("\t\t\t\t\tch += 0x%04lX;\n",
+						   (long)(charToByte[posn] - posn));
+				}
+				printf("\t\t\t\t\tbreak;\n");
+			}
+			else
+			{
+				/* Use a simple non-algorithmic mapping */
+				printf("\t\t\t\tcase 0x%04lX: ch = 0x%02X; break;\n",
+					   posn, (unsigned)(charToByte[posn]));
+			}
+		}
+	}
+
+	/* Print the switch footer */
+	if(!haveFullWidth)
+	{
+		printf("\t\t\t\tdefault: ch = 0x3F; break;\n");
+	}
+	else
+	{
+		printf("\t\t\t\tdefault:\n");
+		printf("\t\t\t\t{\n");
+		printf("\t\t\t\t\tif(ch >= 0xFF01 && ch <= 0xFF5E)\n");
+		printf("\t\t\t\t\t\tch -= 0xFEE0;\n");
+		printf("\t\t\t\t\telse\n");
+		printf("\t\t\t\t\t\tch = 0x3F;\n");
+		printf("\t\t\t\t}\n");
+		printf("\t\t\t\tbreak;\n");
+	}
+	printf("\t\t\t}\n");
+}
+
+/*
+ * Print the char->byte conversion methods.
+ */
+static void printCharToByte(void)
+{
+	/* Print the conversion method for character buffers */
+	printf("\tprotected override void ToBytes(char[] chars, int charIndex, int charCount,\n");
+	printf("\t                                byte[] bytes, int byteIndex)\n");
+	printf("\t{\n");
+	printf("\t\tint ch;\n");
+	printf("\t\twhile(charCount > 0)\n");
+	printf("\t\t{\n");
+	printf("\t\t\tch = (int)(chars[charIndex++]);\n");
+	printConvertSwitch();
+	printf("\t\t\tbytes[byteIndex++] = (byte)ch;\n");
+	printf("\t\t\t--charCount;\n");
+	printf("\t\t}\n");
+	printf("\t}\n\n");
+
+	/* Print the conversion method for string buffers */
+	printf("\tprotected override void ToBytes(String s, int charIndex, int charCount,\n");
+	printf("\t                                byte[] bytes, int byteIndex)\n");
+	printf("\t{\n");
+	printf("\t\tint ch;\n");
+	printf("\t\twhile(charCount > 0)\n");
+	printf("\t\t{\n");
+	printf("\t\t\tch = (int)(s[charIndex++]);\n");
+	printConvertSwitch();
+	printf("\t\t\tbytes[byteIndex++] = (byte)ch;\n");
+	printf("\t\t\t--charCount;\n");
+	printf("\t\t}\n");
+	printf("\t}\n\n");
+}
diff --git a/mcs/class/I18N/tools/uni2tab.c b/mcs/class/I18N/tools/uni2tab.c
new file mode 100644
index 00000000000..5a6e1134b19
--- /dev/null
+++ b/mcs/class/I18N/tools/uni2tab.c
@@ -0,0 +1,411 @@
+/*
+ * uni2tab.c - Convert Unicode data files into CJK conversion tables.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+/*
+
+Usage: uni2tab
+
+Required files from ftp.unicode.org: Unihan.txt, shiftjis.txt
+
+*/
+
+#include <stdio.h>
+#include <string.h>
+#include <stdlib.h>
+
+/*
+ * Forward declarations.
+ */
+static void convertLine(char *buf);
+static void convertSJISLine(char *buf);
+static int createTables(void);
+
+int main(int argc, char *argv[])
+{
+	FILE *file;
+	char buffer[BUFSIZ];
+	int error;
+
+	/* Load the relevant contents from the Unihan.txt file */
+	if((file = fopen("Unihan.txt", "r")) == NULL)
+	{
+		perror("Unihan.txt");
+		return 1;
+	}
+	while(fgets(buffer, sizeof(buffer), file))
+	{
+		if(buffer[0] == 'U' && buffer[1] == '+')
+		{
+			convertLine(buffer + 2);
+		}
+	}
+	fclose(file);
+
+	/* Load the relevant contents from the shiftjis.txt file,
+	   to get mappings for non-CJK characters */
+	if((file = fopen("shiftjis.txt", "r")) == NULL)
+	{
+		perror("shiftjis.txt");
+		return 1;
+	}
+	while(fgets(buffer, sizeof(buffer), file))
+	{
+		if(buffer[0] == '0' && buffer[1] == 'x')
+		{
+			convertSJISLine(buffer + 2);
+		}
+	}
+	fclose(file);
+
+	/* Create the output tables */
+	error = createTables();
+
+	/* Clean up and exit */
+	return error;
+}
+
+/*
+ * Parse a hexadecimal value.  Returns the length
+ * of the value that was parsed.
+ */
+static int parseHex(const char *buf, unsigned long *value)
+{
+	int len = 0;
+	char ch;
+	*value = 0;
+	while((ch = buf[len]) != '\0')
+	{
+		if(ch >= '0' && ch <= '9')
+		{
+			*value = *value * 16 + (unsigned long)(ch - '0');
+		}
+		else if(ch >= 'A' && ch <= 'F')
+		{
+			*value = *value * 16 + (unsigned long)(ch - 'A' + 10);
+		}
+		else if(ch >= 'a' && ch <= 'f')
+		{
+			*value = *value * 16 + (unsigned long)(ch - 'a' + 10);
+		}
+		else
+		{
+			break;
+		}
+		++len;
+	}
+	return len;
+}
+
+/*
+ * Parse "ku" and "ten" values from a buffer.
+ */
+static void parseKuTen(const char *buf, int *ku, int *ten)
+{
+	int value = 0;
+	while(*buf >= '0' && *buf <= '9')
+	{
+		value = value * 10 + (*buf++ - '0');
+	}
+	*ku = value / 100;
+	*ten = value % 100;
+}
+
+/*
+ * Tables.
+ */
+static unsigned short jisx0208ToUnicode[94*94];
+static unsigned short jisx0212ToUnicode[94*94];
+static unsigned short unicodeToJis[65536];
+static unsigned short greekToJis[0x451 - 0x0391 + 1];
+static unsigned short extraToJis[0xFFEF - 0xFF01 + 1];
+static unsigned long  lowJis  = 0xFFFF;
+static unsigned long  highJis = 0x0000;
+
+/*
+ * Process a JIS X 0208 sequence by ku and ten values.
+ */
+static void processJis0208(unsigned long code, int ku, int ten)
+{
+	int offset = (ku - 1) * 94 + (ten - 1);
+	jisx0208ToUnicode[offset] = (unsigned short)code;
+	unicodeToJis[code] = (unsigned short)(offset + 0x0100);
+	if(code < lowJis)
+	{
+		lowJis = code;
+	}
+	if(code > highJis)
+	{
+		highJis = code;
+	}
+}
+
+/*
+ * Process a JIS X 0212 sequence by ku and ten values.
+ */
+static void processJis0212(unsigned long code, int ku, int ten)
+{
+	int offset = (ku - 1) * 94 + (ten - 1);
+	jisx0212ToUnicode[offset] = (unsigned short)code;
+	unicodeToJis[code] = (unsigned short)(offset + 0x8000);
+	if(code < lowJis)
+	{
+		lowJis = code;
+	}
+	if(code > highJis)
+	{
+		highJis = code;
+	}
+}
+
+/*
+ * Convert an input line into table entries.
+ */
+static void convertLine(char *buf)
+{
+	unsigned long code;
+	const char *key;
+	int ku, ten;
+
+	/* Parse the hex name of the Unicode character */
+	buf += parseHex(buf, &code);
+	if(code >= 0x10000)
+	{
+		/* Cannot handle surrogate-based CJK characters yet */
+		return;
+	}
+
+	/* Skip to the key name */
+	while(*buf != '\0' && *buf != 'k')
+	{
+		++buf;
+	}
+	if(*buf == '\0')
+	{
+		return;
+	}
+
+	/* Extract the key name from the buffer */
+	key = buf;
+	while(*buf != '\0' && *buf != ' ' && *buf != '\t')
+	{
+		++buf;
+	}
+	if(*buf == '\0')
+	{
+		return;
+	}
+	*buf++ = '\0';
+
+	/* Skip to the value field */
+	while(*buf != '\0' && (*buf == ' ' || *buf == '\t' ||
+						   *buf == '\r' || *buf == '\n'))
+	{
+		++buf;
+	}
+	if(*buf == '\0')
+	{
+		return;
+	}
+
+	/* Determine what to do based on the key */
+	if(!strcmp(key, "kJis0"))
+	{
+		parseKuTen(buf, &ku, &ten);
+		processJis0208(code, ku, ten);
+	}
+	else if(!strcmp(key, "kJis1"))
+	{
+		parseKuTen(buf, &ku, &ten);
+		processJis0212(code, ku, ten);
+	}
+}
+
+/*
+ * Convert a line from the "shiftjis.txt" file.
+ */
+static void convertSJISLine(char *buf)
+{
+	unsigned long sjis;
+	unsigned long code;
+	int ch1, ch2;
+	int offset;
+
+	/* Read the Shift-JIS code point */
+	buf += parseHex(buf, &sjis);
+	if(sjis < 0x8000)
+	{
+		return;
+	}
+	while(*buf != '\0' && (*buf == ' ' || *buf == '\t' ||
+						   *buf == '\r' || *buf == '\n'))
+	{
+		++buf;
+	}
+	if(*buf != '0' || buf[1] != 'x')
+	{
+		return;
+	}
+	buf += 2;
+
+	/* Read the Unicode code point */
+	buf += parseHex(buf, &code);
+
+	/* Convert the Shift-JIS code point into a JIS kuten value */
+	ch1 = (int)(sjis >> 8);
+	ch2 = (int)(sjis & 0xFF);
+	if(ch1 >= 0x81 && ch1 <= 0x9F)
+	{
+		offset = (ch1 - 0x81) * 0xBC;
+	}
+	else if(ch1 >= 0xE0 && ch1 <= 0xEF)
+	{
+		offset = (ch1 - 0xE0 + (0xA0 - 0x81)) * 0xBC;
+	}
+	else
+	{
+		/* Invalid first byte */
+		return;
+	}
+	if(ch2 >= 0x40 && ch2 <= 0x7E)
+	{
+		offset += (ch2 - 0x40);
+	}
+	else if(ch2 >= 0x80 && ch2 <= 0xFC)
+	{
+		offset += (ch2 - 0x80 + 0x3F);
+	}
+	else
+	{
+		/* Invalid second byte */
+		return;
+	}
+
+	/* Process the kuten value */
+	if(code >= 0x0391 && code <= 0x0451)
+	{
+		/* Greek subset */
+		greekToJis[code - 0x0391] = (unsigned short)(offset + 0x0100);
+	}
+	else if(code >= 0xFF01 && code <= 0xFFEF)
+	{
+		/* Extra subset */
+		extraToJis[code - 0xFF01] = (unsigned short)(offset + 0x0100);
+	}
+	else if(code >= 0x0100 && code < 0x4E00)
+	{
+		/* Non-CJK characters within JIS */
+		processJis0208(code, (offset / 94) + 1, (offset % 94) + 1);
+	}
+}
+
+/*
+ * Write a section header.
+ */
+static void writeSection(FILE *file, unsigned long num, unsigned long size)
+{
+	putc((int)(num & 0xFF), file);
+	putc((int)((num >> 8) & 0xFF), file);
+	putc((int)((num >> 16) & 0xFF), file);
+	putc((int)((num >> 24) & 0xFF), file);
+	putc((int)(size & 0xFF), file);
+	putc((int)((size >> 8) & 0xFF), file);
+	putc((int)((size >> 16) & 0xFF), file);
+	putc((int)((size >> 24) & 0xFF), file);
+}
+
+/*
+ * Write an array of 16-bit data values.
+ */
+static void writeData(FILE *file, unsigned short *data, unsigned long size)
+{
+	while(size > 0)
+	{
+		putc((int)(*data & 0xFF), file);
+		putc((int)((*data >> 8) & 0xFF), file);
+		++data;
+		--size;
+	}
+}
+
+/*
+ * Section numbers for the JIS table.
+ */
+#define	JISX0208_To_Unicode 1
+#define	JISX0212_To_Unicode 2
+#define	CJK_To_JIS          3
+#define	Greek_To_JIS        4
+#define	Extra_To_JIS        5
+
+/*
+ * Write the JIS table file.
+ */
+static void writeJis(FILE *file)
+{
+	unsigned long size;
+
+	/* Write the JIS X 0208 to Unicode conversion table */
+	writeSection(file, JISX0208_To_Unicode, 94 * 94 * 2);
+	writeData(file, jisx0208ToUnicode, 94 * 94);
+
+	/* Write the JIS X 0212 to Unicode conversion table */
+	writeSection(file, JISX0212_To_Unicode, 94 * 94 * 2);
+	writeData(file, jisx0212ToUnicode, 94 * 94);
+
+	/* Write the Unicode to JIS conversion table */
+	size = highJis - lowJis + 1;
+	writeSection(file, CJK_To_JIS, size * 2);
+	writeData(file, unicodeToJis + lowJis, size);
+	printf("JIS: U+%04lX to U+%04lX\n", lowJis, highJis);
+
+	/* Write the Greek to JIS conversion table */
+	writeSection(file, Greek_To_JIS, sizeof(greekToJis));
+	writeData(file, greekToJis, sizeof(greekToJis) / 2);
+
+	/* Write the Extra to JIS conversion table */
+	writeSection(file, Extra_To_JIS, sizeof(extraToJis));
+	writeData(file, extraToJis, sizeof(extraToJis) / 2);
+}
+
+/*
+ * Create all of the tables that we need based on the Unihan.txt file.
+ */
+static int createTables(void)
+{
+	FILE *file;
+
+	/* Create the JIS conversion table */
+	if((file = fopen("jis.table", "wb")) == NULL)
+	{
+		if((file = fopen("jis.table", "wb")) == NULL)
+		{
+			perror("jis.table");
+			return 1;
+		}
+	}
+	writeJis(file);
+	fclose(file);
+
+	/* Done */
+	return 0;
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Changelog b/mcs/class/Microsoft.VisualBasic/Changelog
new file mode 100644
index 00000000000..3e13ab05798
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Changelog
@@ -0,0 +1,21 @@
+2002-08-15  Tim Coleman <tim@timcoleman.com>

+	* list:

+	* makefile.gnu:

+		Added files to allow build on linux.

+

+2002-05-12  Rafael Teixeira <rafaelteixeirabr@hotmail.com>

+

+	* Microsoft.VisualBasic.Strings: Strings.cs - Merged all method implementations provided 

+          by Martin Adoue, with method signatures (specially attributes) provided 

+          by Chris J. Breisch. Some tweaking for the Mid member (two overloads versus third optional parameter).

+

+

+

+2002-05-18  Chris J Breisch <cjbreisch@altavista.net>

+

+	* Microsoft.VisualBasic: *.cs/Test/*.cs - Cleaned up code, added

+	implementations for Collection.cs, Conversion.cs and NUnit Tests

+	for both

+

+

+

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic.build b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic.build
new file mode 100644
index 00000000000..bc0ddd3e961
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic.build
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.dll -->
+
+<project name="System" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<mkdir dir="../lib"/>
+		<csc target="library" output="../lib/Microsoft.VisualBasic.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+			
+			<!-- cor compare dies with these currently -->
+			<!--<arg value="/nostdlib"/>--> 	<!-- don't reference mscorlib -->
+			<!--<arg value="/lib:../lib/"/>-->
+			<!--<arg value="/r:..\lib\corlib.dll"/>-->
+			<!--<arg value="/r:..\lib\System.dll"/>-->
+			<arg value="/r:System.dll"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/>
+			</sources>
+			<references>
+				<!--<includes name="../lib/corlib.dll"/>-->
+				<!--<includes name="../lib/System.dll"/>-->
+			</references>
+		</csc>
+		<copy file="../lib/Microsoft.VisualBasic.dll" tofile="Test/Microsoft.VisualBasic.dll"/>
+	</target>
+
+	<target name="test" depends="build">
+		<nant basedir="Test" target="test"/>
+	</target>
+
+	<target name="clean">
+		<nant basedir="Test" target="clean"/>
+		<delete file="../lib/Microsoft.VisualBasic.dll" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/AppWinStyle.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/AppWinStyle.cs
new file mode 100644
index 00000000000..210ee7d8e4a
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/AppWinStyle.cs
@@ -0,0 +1,18 @@
+//

+// AppWinStyle.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum AppWinStyle : short {

+		Hide = 0,

+		NormalFocus = 1,

+		MinimizedFocus = 2,

+		MaximizedFocus = 3,

+		NormalNoFocus = 4,

+		MinimizedNoFocus = 6

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CallType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CallType.cs
new file mode 100644
index 00000000000..d726be52606
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CallType.cs
@@ -0,0 +1,16 @@
+//

+// CallType.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum CallType : int {

+		Method = 1,

+		Get = 2,

+		Let = 4,

+		Set = 8

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog
new file mode 100644
index 00000000000..9aa67f57abc
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ChangeLog
@@ -0,0 +1,6 @@
+2002-08-15  Tim Coleman <tim@timcoleman.com>

+	* ChangeLog:

+		Added a ChangeLog

+	* Constants.cs:

+		Make these actual constants so mcs will compile them.

+

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Collection.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Collection.cs
new file mode 100644
index 00000000000..29e171b0b38
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Collection.cs
@@ -0,0 +1,314 @@
+//
+// Collection.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+using System;
+using System.Runtime.InteropServices;
+using System.Collections;
+using System.ComponentModel;
+
+
+namespace Microsoft.VisualBasic {
+	sealed public class Collection : ICollection, IList {
+	//
+	// <summary>
+	//		Collection : The BASIC Collection Object
+	//	</summary>
+	//
+	//	<remarks>
+	//	</remarks>
+		// Declarations
+		private Hashtable m_Hashtable = new Hashtable();
+		private ArrayList m_HashIndexers = new ArrayList();
+		internal bool Modified = false;
+
+		private class ColEnumerator: IEnumerator 
+		//
+		// <summary>
+		//		ColEnumerator : This internal class is used
+		//		for enumerating through our Collection
+		//	</summary>
+		//
+		//	<remarks>
+		//	</remarks>
+		{
+			private int Index;
+			private Collection Col;
+			private object Item;
+
+			public ColEnumerator(Collection coll) 
+			{
+				Col = coll;
+				Index = 0;
+				Col.Modified = false;
+			}
+
+			public void Reset() 
+			{
+				if (Col.Modified) 
+				{
+					// FIXME : spec says throw exception, MS doesn't
+					// throw new InvalidOperationException();
+				}
+				Index = 0;
+			}
+
+			public bool MoveNext() 
+			{
+				if (Col.Modified) 
+				{
+					// FIXME : spec says throw exception, MS doesn't
+					// throw new InvalidOperationException();
+				}
+				Index++;
+				try {
+					Item = Col[Index];
+				}
+				catch {
+					// do nothing
+				}
+
+				return Index <= Col.Count;
+			}
+
+			public object Current {
+				get {
+					if (Index == 0) {
+						// FIXME : spec says throw InvalidOperation, 
+						// but MS throws IndexOutOfRange
+						throw new IndexOutOfRangeException();
+						// throw new InvalidOperationException();
+					}
+					else {
+						return Item;
+					}
+				}
+			}
+
+			// The current property on the IEnumerator interface:
+			object IEnumerator.Current {
+				get {
+					return(Current);
+				}
+			}
+		}
+		// Constructors
+		// Properties
+		System.Boolean IList.IsReadOnly {
+			get {return false;}
+		}
+
+		System.Boolean ICollection.IsSynchronized {
+			get {return m_Hashtable.IsSynchronized;}
+		}
+
+		System.Object ICollection.SyncRoot {
+			get {return m_Hashtable.SyncRoot;}
+		}
+
+		System.Boolean IList.IsFixedSize { 
+			get {return false;} 
+		}
+
+		public System.Int32 Count {
+			get {return m_HashIndexers.Count;} 
+		}
+
+		[ReadOnly(true)]
+		[System.Runtime.CompilerServices.IndexerName("Item")] 
+		public System.Object this [System.Int32 Index] {
+			get {
+				try {
+					// Collections are 1-based
+					return m_Hashtable[m_HashIndexers[Index-1]];
+				}
+				catch {
+					throw new IndexOutOfRangeException();
+				}
+			}
+			set {throw new NotImplementedException();} 
+		}
+
+		[System.Runtime.CompilerServices.IndexerName("Item")] 
+		public System.Object this [System.Object Index] 
+		{
+			get	{
+				if (Index is string) {
+					if (m_HashIndexers.IndexOf(Index) < 0) {
+						//	throw new IndexOutOfRangeException();
+						// FIXME : Spec Says IndexOutOfRange...MS throws Argument
+						throw new ArgumentException();
+					}
+					return m_Hashtable[Index];
+				} 
+				else {
+					throw new ArgumentException();
+				}
+			}
+		}
+
+		// Methods
+		System.Int32 IList.IndexOf (System.Object value) 
+		{ 
+			int LastPos = 0;
+			bool Found = false;
+
+			while (!Found) {
+				LastPos = m_HashIndexers.IndexOf(value.GetHashCode(), LastPos);
+				if (LastPos == -1) {
+					Found = true;
+				} else if (m_Hashtable[m_HashIndexers[LastPos]] == value) {
+					Found = true;
+				}
+			}
+			return LastPos;
+		}
+
+		System.Boolean IList.Contains (System.Object value) 
+		{ 
+			return m_Hashtable.ContainsValue(value);
+		}
+
+		void IList.Clear () 
+		{
+			m_Hashtable.Clear();
+			m_HashIndexers.Clear();
+		}
+
+		public void Remove (System.String Key) 
+		{ 
+			int Index;
+			
+			try {
+				Index = m_HashIndexers.IndexOf(Key) + 1;
+				Remove(Index);
+			}
+			catch {
+				throw new ArgumentException();
+			}
+		}
+
+		public void Remove (System.Int32 Index)
+		{ 
+			try {
+				// Collections are 1-based
+				m_Hashtable.Remove(m_HashIndexers[Index-1]);
+				m_HashIndexers.RemoveAt(Index-1);
+				Modified = true;
+			} 
+			catch {
+				throw new IndexOutOfRangeException();
+			}
+		}
+
+		void IList.Remove (System.Object value)	
+		{
+			if (!(value is string)) {
+				throw new ArgumentException();
+			}
+			Remove((string)value);
+		}
+
+		void IList.RemoveAt (System.Int32 index) 
+		{
+			Remove(index);
+		}
+
+		void IList.Insert (System.Int32 index, System.Object value) 
+		{
+			Insert(index, value, value.GetHashCode().ToString());
+		}
+
+		void Insert(System.Int32 index, System.Object value, string Key)
+		{
+			m_HashIndexers.Insert(index -1, Key);
+			m_Hashtable.Add(Key, value);
+			Modified = true;
+		}
+
+		System.Int32 IList.Add (System.Object Item) 
+		{
+			return Add(Item, Item.GetHashCode().ToString());
+		}
+
+		System.Int32 Add(System.Object Item, string Key)
+		{
+			m_Hashtable.Add(Key, Item);
+			Modified = true;
+
+			return m_HashIndexers.Add(Key);
+		}
+
+		private int GetIndexPosition(System.Object Item) 
+		{
+			int Position = int.MinValue;
+
+			if (Item is string) {
+				Position = m_HashIndexers.IndexOf(Item) + 1;
+			} 
+			else if (Item is int) {
+				Position = Convert.ToInt32(Item);
+			}
+			else {
+				throw new InvalidCastException();
+			}
+			if (Position < 0) {
+				throw new ArgumentException();
+			}
+			return Position;
+		}
+
+		public void Add (System.Object Item, 
+			[Optional] [DefaultValue(null)] String Key, 
+			[Optional] [DefaultValue(null)] System.Object Before, 
+			[Optional] [DefaultValue(null)] System.Object After)
+		{
+			int Position = int.MinValue;
+			
+			// check for valid args
+			if (Before != null && After != null) {
+				throw new ArgumentException();
+			}
+			if (Key != null && m_HashIndexers.IndexOf(Key) != -1) {
+				throw new ArgumentException();
+			}
+			if (Before != null) {
+				Position = GetIndexPosition(Before);
+			}
+			if (After != null) {
+				Position = GetIndexPosition(After) + 1;
+			}
+			if (Key == null) {
+				Key = Item.GetHashCode().ToString();
+			}
+
+			if (Position > (m_HashIndexers.Count+1) || Position == int.MinValue) {
+				Add(Item, Key);
+			} 
+			else {
+				Insert(Position, Item, Key);
+			}
+		}
+
+		void ICollection.CopyTo (System.Array array, System.Int32 index) 
+		{
+			System.Array NewArray = 
+				Array.CreateInstance(typeof(System.Object), 
+					m_HashIndexers.Count - index);
+			
+			// Collections are 1-based
+			for (int i = index -1; i < m_HashIndexers.Count; i++) {
+				NewArray.SetValue(m_Hashtable[m_HashIndexers[i]], i - index);
+			}
+		}
+		
+		public IEnumerator GetEnumerator () 
+		{
+			return new ColEnumerator(this);
+		}
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ComClassAttribute.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ComClassAttribute.cs
new file mode 100644
index 00000000000..efd694246b4
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ComClassAttribute.cs
@@ -0,0 +1,35 @@
+//
+// ComClassAttribute.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic {
+	[System.AttributeUsageAttribute(System.AttributeTargets.Class)] 
+	sealed public class ComClassAttribute : System.Attribute {
+		// Declarations
+		// Constructors
+		[MonoTODO]
+		ComClassAttribute(System.String _ClassID) { throw new NotImplementedException (); }
+		[MonoTODO]
+		ComClassAttribute(System.String _ClassID, System.String _InterfaceID) { throw new NotImplementedException (); }
+		[MonoTODO]
+		ComClassAttribute(System.String _ClassID, System.String _InterfaceID, System.String _EventId) { throw new NotImplementedException (); }
+		// Properties
+		[MonoTODO]
+		public System.String EventID { get { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public System.Boolean InterfaceShadows { get { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public System.String ClassID { get { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public System.String InterfaceID { get { throw new NotImplementedException (); } }
+		// Methods
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CompareMethod.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CompareMethod.cs
new file mode 100644
index 00000000000..5b93a2351ef
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/CompareMethod.cs
@@ -0,0 +1,26 @@
+//

+// CompareMethod.cs

+//

+// Author:

+//   Martin Adoue (martin@cwanet.com)

+//

+// (C) 2002 Martin Adoue

+//

+namespace Microsoft.VisualBasic {

+

+	/// <summary>

+	/// The CompareMethod enumeration contains constants used to determine the 

+	/// way strings are compared when using functions such as InStr and StrComp. 

+	/// These constants can be used anywhere in your code.

+	/// </summary>

+	public enum CompareMethod : int {

+		/// <summary>

+		/// Performs a binary comparison

+		/// </summary>

+		Binary = 0,	

+		/// <summary>

+		/// Performs a textual comparison

+		/// </summary>

+		Text = 1	

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Constants.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Constants.cs
new file mode 100644
index 00000000000..7ffb8f73bb8
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Constants.cs
@@ -0,0 +1,136 @@
+//

+// Constants.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+

+using System;

+

+namespace Microsoft.VisualBasic {

+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 

+	sealed public class Constants {

+		// Declarations

+		public const System.Int32 vbObjectError = (System.Int32)(-2147221504);

+		public const System.String vbCrLf = "\n\r";

+		public const System.String vbNewLine = "\n\r";

+		public const System.String vbCr = "\n";

+		public const System.String vbLf = "\r";

+		public const System.String vbBack = "\b";

+		public const System.String vbFormFeed = "\f";

+		public const System.String vbTab = "\t";

+		public const System.String vbVerticalTab = "\v";

+		public const System.String vbNullChar = "\0";

+		public const System.String vbNullString = "";

+

+		public const AppWinStyle vbHide = AppWinStyle.Hide;

+		public const AppWinStyle vbNormalFocus = AppWinStyle.NormalFocus;

+		public const AppWinStyle vbMinimizedFocus = AppWinStyle.MinimizedFocus;

+		public const AppWinStyle vbMaximizedFocus = AppWinStyle.MaximizedFocus;

+		public const AppWinStyle vbNormalNoFocus = AppWinStyle.NormalNoFocus;

+		public const AppWinStyle vbMinimizedNoFocus = AppWinStyle.MinimizedNoFocus;

+

+		public const CallType vbMethod = CallType.Method;

+		public const CallType vbGet = CallType.Get;

+		public const CallType vbLet = CallType.Let;

+		public const CallType vbSet = CallType.Set;

+

+		public const CompareMethod vbBinaryCompare = CompareMethod.Binary;

+		public const CompareMethod vbTextCompare = CompareMethod.Text;

+

+		public const DateFormat vbGeneralDate = DateFormat.GeneralDate;

+		public const DateFormat vbLongDate = DateFormat.LongDate;

+		public const DateFormat vbShortDate = DateFormat.ShortDate;

+		public const DateFormat vbLongTime = DateFormat.LongTime;

+		public const DateFormat vbShortTime = DateFormat.ShortTime;

+

+		public const FirstDayOfWeek vbUseSystemDayOfWeek = FirstDayOfWeek.System;

+		public const FirstDayOfWeek vbSunday = FirstDayOfWeek.Sunday;

+		public const FirstDayOfWeek vbMonday = FirstDayOfWeek.Monday;

+		public const FirstDayOfWeek vbTuesday = FirstDayOfWeek.Tuesday;

+		public const FirstDayOfWeek vbWednesday = FirstDayOfWeek.Wednesday;

+		public const FirstDayOfWeek vbThursday = FirstDayOfWeek.Thursday;

+		public const FirstDayOfWeek vbFriday = FirstDayOfWeek.Friday;

+		public const FirstDayOfWeek vbSaturday = FirstDayOfWeek.Saturday;

+

+		public const FileAttribute vbNormal = FileAttribute.Normal;

+		public const FileAttribute vbReadOnly = FileAttribute.ReadOnly;

+		public const FileAttribute vbHidden = FileAttribute.Hidden;

+		public const FileAttribute vbSystem = FileAttribute.System;

+		public const FileAttribute vbVolume = FileAttribute.Volume;

+		public const FileAttribute vbDirectory = FileAttribute.Directory;

+		public const FileAttribute vbArchive = FileAttribute.Archive;

+

+		public const FirstWeekOfYear vbUseSystem = FirstWeekOfYear.System;

+		public const FirstWeekOfYear vbFirstJan1 = FirstWeekOfYear.Jan1;

+		public const FirstWeekOfYear vbFirstFourDays = FirstWeekOfYear.FirstFourDays;

+		public const FirstWeekOfYear vbFirstFullWeek = FirstWeekOfYear.FirstFullWeek;

+

+		public const VbStrConv vbUpperCase = VbStrConv.UpperCase;

+		public const VbStrConv vbLowerCase = VbStrConv.LowerCase;

+		public const VbStrConv vbProperCase = VbStrConv.ProperCase;

+		public const VbStrConv vbWide = VbStrConv.Wide;

+		public const VbStrConv vbNarrow = VbStrConv.Narrow;

+		public const VbStrConv vbKatakana = VbStrConv.Katakana;

+		public const VbStrConv vbHiragana = VbStrConv.Hiragana;

+		public const VbStrConv vbSimplifiedChinese = VbStrConv.SimplifiedChinese;

+		public const VbStrConv vbTraditionalChinese = VbStrConv.TraditionalChinese;

+		public const VbStrConv vbLinguisticCasing = VbStrConv.LinguisticCasing;

+

+		public const TriState vbUseDefault = TriState.UseDefault;

+		public const TriState vbTrue = TriState.True;

+		public const TriState vbFalse = TriState.False;

+

+		public const VariantType vbEmpty = VariantType.Empty;

+		public const VariantType vbNull = VariantType.Null;

+		public const VariantType vbInteger = VariantType.Integer;

+		public const VariantType vbLong = VariantType.Long;

+		public const VariantType vbSingle = VariantType.Single;

+		public const VariantType vbDouble = VariantType.Double;

+		public const VariantType vbCurrency = VariantType.Currency;

+		public const VariantType vbDate = VariantType.Date;

+		public const VariantType vbString = VariantType.String;

+		public const VariantType vbObject = VariantType.Object;

+		public const VariantType vbBoolean = VariantType.Boolean;

+		public const VariantType vbVariant = VariantType.Variant;

+		public const VariantType vbDecimal = VariantType.Decimal;

+		public const VariantType vbByte = VariantType.Byte;

+		public const VariantType vbUserDefinedType = VariantType.UserDefinedType;

+		public const VariantType vbArray = VariantType.Array;

+

+		public const MsgBoxResult vbOK = MsgBoxResult.OK;

+		public const MsgBoxResult vbCancel = MsgBoxResult.Cancel;

+		public const MsgBoxResult vbAbort = MsgBoxResult.Abort;

+		public const MsgBoxResult vbRetry = MsgBoxResult.Retry;

+		public const MsgBoxResult vbIgnore = MsgBoxResult.Ignore;

+		public const MsgBoxResult vbYes = MsgBoxResult.Yes;

+		public const MsgBoxResult vbNo = MsgBoxResult.No;

+

+		public const MsgBoxStyle vbOKOnly = MsgBoxStyle.OKOnly;

+		public const MsgBoxStyle vbOKCancel = MsgBoxStyle.OKCancel;

+		public const MsgBoxStyle vbAbortRetryIgnore = MsgBoxStyle.AbortRetryIgnore;

+		public const MsgBoxStyle vbYesNoCancel = MsgBoxStyle.YesNoCancel;

+		public const MsgBoxStyle vbYesNo = MsgBoxStyle.YesNo;

+		public const MsgBoxStyle vbRetryCancel = MsgBoxStyle.RetryCancel;

+		public const MsgBoxStyle vbCritical = MsgBoxStyle.Critical;

+		public const MsgBoxStyle vbQuestion = MsgBoxStyle.Question;

+		public const MsgBoxStyle vbExclamation = MsgBoxStyle.Exclamation;

+		public const MsgBoxStyle vbInformation = MsgBoxStyle.Information;

+		public const MsgBoxStyle vbDefaultButton1 = MsgBoxStyle.DefaultButton1;

+		public const MsgBoxStyle vbDefaultButton2 = MsgBoxStyle.DefaultButton2;

+		public const MsgBoxStyle vbDefaultButton3 = MsgBoxStyle.DefaultButton3;

+		public const MsgBoxStyle vbApplicationModal = MsgBoxStyle.ApplicationModal;

+		public const MsgBoxStyle vbSystemModal = MsgBoxStyle.SystemModal;

+		public const MsgBoxStyle vbMsgBoxHelp = MsgBoxStyle.MsgBoxHelp;

+		public const MsgBoxStyle vbMsgBoxRight = MsgBoxStyle.MsgBoxRight;

+		public const MsgBoxStyle vbMsgBoxRtlReading = MsgBoxStyle.MsgBoxRtlReading;

+		public const MsgBoxStyle vbMsgBoxSetForeground = MsgBoxStyle.MsgBoxSetForeground;

+

+		// Constructors

+		// Properties

+		// Methods

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ControlChars.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ControlChars.cs
new file mode 100644
index 00000000000..480e4be1b25
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ControlChars.cs
@@ -0,0 +1,27 @@
+//

+// ControlChars.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	sealed public class ControlChars {

+		// Declarations

+		public const System.String CrLf = "\n\r";

+		public const System.String NewLine = "\n\r";

+		public const System.Char Cr = '\n';

+		public const System.Char Lf = '\r';

+		public const System.Char Back = '\b';

+		public const System.Char FormFeed = '\f';

+		public const System.Char Tab = '\t';

+		public const System.Char VerticalTab = '\v';

+		public const System.Char NullChar = '\0';

+		public const System.Char Quote = '"';

+		// Constructors

+		// Properties

+		// Methods

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Conversion.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Conversion.cs
new file mode 100644
index 00000000000..38308a61605
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Conversion.cs
@@ -0,0 +1,616 @@
+//
+// Conversion.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+using System.Text.RegularExpressions;
+
+namespace Microsoft.VisualBasic {
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class Conversion {
+		//
+		// <summary>
+		//		Collection : The BASIC Collection Object
+		//	</summary>
+		//
+		//	<remarks>
+		//	</remarks>
+		// Declarations
+		private static readonly char[] _HexDigits = {
+			'0', '1', '2', '3', '4', '5', '6', '7', 
+			'8', '9', 'A', 'B', 'C', 'D', 'E', 'F'
+		};
+		private static readonly char[] _OctDigits = {
+			'0', '1', '2', '3', '4', '5', '6', '7'
+		};
+		private static readonly long[] _Maxes = {
+			32767, 2147483647, 9223372036854775807
+		};
+		private enum SizeIndexes {
+			Int16 = 0,
+			Int32 = 1,
+			Int64 = 2
+		};
+
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static string ErrorToString () { 
+			throw new NotImplementedException (); 
+		}
+		[MonoTODO]
+		public static string ErrorToString (
+			System.Int32 ErrorNumber) { 
+			throw new NotImplementedException (); 
+		}
+
+		// Return whether d is +/- Could do this with a macro, 
+		// but this is cleaner
+		private static int Sign(double d) { return d > 0 ? 1 : -1;}
+
+		// try to cast an Object to a string...used in several places
+		private static string CastToString (System.Object Expression) {
+			try {
+				return (string)Expression;
+			}
+			catch {
+				throw new InvalidCastException();
+			}
+		}
+		
+		// Fix on Integer types doesn't do anything
+		public static short Fix (short Number) { return Number; }
+		public static int Fix (int Number) { return Number; }
+		public static long Fix (long Number) { return Number; }
+
+		// Fix on other numberic types = Sign(Number) * Int(Abs(Number))
+		public static double Fix (double Number) { 
+			return Sign(Number) * Int (Math.Abs (Number)); 
+		}
+		public static float Fix (float Number) { 
+			return Sign(Number) * Int (Math.Abs (Number)); 
+		}
+		public static decimal Fix (decimal Number) { 
+			return Sign((double)Number) * Int (Math.Abs (Number)); 
+		}
+
+		// Fix on an Object type is trickier
+		// first we have to cast it to the right type
+		public static System.Object Fix (System.Object Number)
+		{
+			// always start out by throwing an exception 
+			// if Number is null
+			if (Number == null) {
+				throw new ArgumentNullException ("Number", 
+					"Value cannot be null");
+			}
+
+			TypeCode TC = Type.GetTypeCode (Number.GetType ());
+
+			// switch on TypeCode and call appropriate Fix method
+			switch (TC) {
+				case TypeCode.Decimal:
+					return Fix (Convert.ToDecimal (Number));
+				case TypeCode.Double:
+					return Fix (Convert.ToDouble (Number));
+				case TypeCode.Single:
+					return Fix (Convert.ToSingle (Number));
+				case TypeCode.String:
+					return Fix (Double.Parse (
+						CastToString (Number)));
+
+				// for integer types, don't need to do anything
+				case TypeCode.Byte:
+				case TypeCode.Int16:
+				case TypeCode.Int32:
+				case TypeCode.Int64:
+				case TypeCode.SByte:
+				case TypeCode.UInt16:
+				case TypeCode.UInt32:
+				case TypeCode.UInt64:
+					return Number;
+
+				// spec defines Empty as returning 0
+				case TypeCode.Empty:
+					return 0;
+
+				// we can't convert these types
+				case TypeCode.Boolean:
+				case TypeCode.Char:
+				case TypeCode.DateTime:
+				case TypeCode.DBNull:
+				case TypeCode.Object:
+				default:
+					throw new ArgumentException (
+						"Type of argument 'Number' is '"
+						+ Number.GetType().FullName + 
+						"', which is not numeric.");
+			}
+		}
+
+		// Int on Integer types doesn't do anything
+		public static short Int (short Number) { return Number; }
+		public static int Int (int Number) { return Number; }
+		public static long Int (long Number) { return Number; }
+
+		// Int on other numberic types is same thing as "Floor"
+		public static double Int (double Number) { 
+			return (double) Math.Floor(Number); 
+		}
+		public static float Int (float Number) {
+			return (float) Math.Floor(Number); 
+		}
+		public static decimal Int (decimal Number) {
+			return Decimal.Floor(Number); 
+		}
+
+		// doing an Int on an Object is trickier
+		// first we have to cast to the correct type
+		public static System.Object Int (System.Object Number) {
+			// always start out by throwing an exception 
+			// if Number is null
+			if (Number == null) {
+				throw new ArgumentNullException("Number", 
+					"Value cannot be null");
+			}
+
+			TypeCode TC = Type.GetTypeCode (Number.GetType ());
+
+			// switch on TypeCode and call appropriate Int method
+			switch (TC) {
+				case TypeCode.Decimal:
+					return Int (Convert.ToDecimal (Number));
+				case TypeCode.Double:
+					return Int (Convert.ToDouble (Number));
+				case TypeCode.Single:
+					return Int (Convert.ToSingle (Number));
+				case TypeCode.String:
+					return Int (Double.Parse (
+					CastToString(Number)));
+
+				// Int on integer types does nothing
+				case TypeCode.Byte:
+				case TypeCode.Int16:
+				case TypeCode.Int32:
+				case TypeCode.Int64:
+				case TypeCode.SByte:
+				case TypeCode.UInt16:
+				case TypeCode.UInt32:
+				case TypeCode.UInt64:
+					return Number;
+
+				// Spec defines Empty as returning 0
+				case TypeCode.Empty:
+					return 0;
+
+				// otherwise, it's we can't cast to a numeric
+				case TypeCode.Boolean:
+				case TypeCode.Char:
+				case TypeCode.DateTime:
+				case TypeCode.DBNull:
+				case TypeCode.Object:
+				default:
+					throw new ArgumentException (
+					"Type of argument 'Number' is '" + 
+					Number.GetType().FullName + 
+					"', which is not numeric.");			
+			}
+		}
+
+		// we use this internally to get a string 
+		// representation of a number in a specific base
+		private static string ToBase (ulong Number, int Length, 
+			char[] BaseDigits, uint Base) {
+			int i;
+			ulong r;
+			// we use a char array here for performance
+			char [] c = new Char[Length];
+			string s = null;
+			
+			
+			for (i = Length - 1; i >= 0; i--) {
+				r = Number % Base;
+				Number = Number / Base;
+				c[i] = BaseDigits[r];
+				if (Number == 0) {
+					s = new string (c, i, Length - i);
+					break;
+				}
+			}
+			if (s == null) {
+				return new string (c);
+			}
+			else {
+				return s;
+			}
+		}
+
+
+		// convert a number to Hex
+		// a little bit of magic goes on here with negative #'s
+		private static string ToHex(long Number, int Digits, 
+			SizeIndexes Size) {
+			ulong UNumber;
+
+			if (Number < 0) {
+				// we add maxint of the Number's type 
+				// twice and then 2 more...this has the
+				// effect of turning it into a ulong 
+				// that has the same hex representation
+				UNumber = (ulong)((Number + 2) + 
+					_Maxes[(int)Size]) + 
+					(ulong)_Maxes[(int)Size];
+			}
+			else {
+				UNumber = (ulong)Number;
+			}
+			return ToBase(UNumber, Digits, _HexDigits, 16);
+		}
+
+		// call our private function, 
+		// passing it the size of the item to convert
+		public static string Hex (short Number) { 
+			return ToHex(Number, 4, SizeIndexes.Int16); 
+		}
+		public static string Hex (byte Number) { 
+			return ToHex(Number, 2, SizeIndexes.Int16); 
+		}
+		public static string Hex (int Number) { 
+			return ToHex(Number, 8, SizeIndexes.Int32); 
+		}
+		public static string Hex (long Number) { 
+			return ToHex(Number, 16, SizeIndexes.Int64); 
+		}
+
+		// Objects are trickier
+		// first we have to cast to appropriate type
+		public static System.String Hex (System.Object Number) {
+			// always start out by throwing an exception 
+			// if Number is null
+			if (Number == null) {
+				throw new ArgumentNullException ("Number", 
+					"Value cannot be null");
+			}
+
+			TypeCode TC = Type.GetTypeCode (Number.GetType ());
+
+			switch (TC) {
+				// try to parse the string as an Int32, 
+				// then an Int64, if that fails
+				case TypeCode.String:
+					try {
+						return Hex (
+							Int32.Parse (
+							CastToString (Number)));
+					}
+					catch {
+						return Hex (
+							Int64.Parse (
+							CastToString (Number)));
+					}
+
+				// for the int types, 
+				// just call the normal "Hex" for that type
+				case TypeCode.Byte:
+					return Hex ((byte)Number);
+				case TypeCode.Int16:
+					return Hex ((short)Number);
+				case TypeCode.Int32:
+					return Hex ((int)Number);
+				case TypeCode.Int64:
+					return Hex ((long)Number);
+
+				// empty is defined as returning 0
+				case TypeCode.Empty:
+					return "0";
+
+				// we can't do any of these types
+				case TypeCode.Boolean:
+				case TypeCode.Char:
+				case TypeCode.DBNull:
+				case TypeCode.DateTime:
+				case TypeCode.Decimal:
+				case TypeCode.Double:
+				case TypeCode.Object:
+				case TypeCode.SByte:
+				case TypeCode.Single:
+				case TypeCode.UInt16:
+				case TypeCode.UInt32:
+				case TypeCode.UInt64:
+				default:
+					throw new ArgumentException (
+					"Type of argument 'Number' is '" + 
+					Number.GetType().FullName + 
+					"', which is not numeric.");			
+			}
+		}
+		
+		// ToOct works just like ToHex, only in Octal.
+		private static string ToOct(long Number, int Digits, 
+			SizeIndexes Size) {
+			ulong UNumber;
+
+			if (Number < 0) {
+				// for neg numbers add the maxint of 
+				// the appropriate size twice, and then two more
+				// this has the effect of turning it 
+				// into a ulong with the same oct representation
+				UNumber = (ulong)((Number + 2) + 
+					_Maxes[(int)Size]) + 
+					(ulong)(_Maxes[(int)Size]);
+			}
+			else {
+				UNumber = (ulong)Number;
+			}
+			return ToBase (UNumber, Digits, _OctDigits, 8);
+		}
+
+		// call ToOct with appropriate information
+		public static string Oct (short Number) { 
+			return ToOct(Number, 6, SizeIndexes.Int16); 
+		}
+		public static string Oct (byte Number) { 
+			return ToOct(Number, 3, SizeIndexes.Int16); 
+		}
+		public static string Oct (int Number) { 
+			return ToOct(Number, 11, SizeIndexes.Int32); 
+		}
+		public static string Oct (long Number) { 
+			return ToOct(Number, 22, SizeIndexes.Int64); 
+		}
+
+		// Objects are always trickier
+		// first need to cast to appropriate type
+		public static string Oct (System.Object Number) {
+			// first, always throw an exception if Number is null
+			if (Number == null) {
+				throw new ArgumentNullException("Number", 
+					"Value cannot be null");
+			}
+
+			TypeCode TC = Type.GetTypeCode (Number.GetType ());
+
+			switch (TC) {
+				// try to parse a string as an Int32 
+				// and then an Int64
+				case TypeCode.String:
+					try {
+						return Oct (
+							Int32.Parse (
+							CastToString (Number)));
+					}
+					catch {
+						return Oct (
+							Int64.Parse (
+							CastToString (Number)));
+					}
+
+				// integer types just call the appropriate "Oct"
+				case TypeCode.Byte:
+					return Oct ((byte)Number);
+				case TypeCode.Int16:
+					return Oct ((short)Number);
+				case TypeCode.Int32:
+					return Oct ((int)Number);
+				case TypeCode.Int64:
+					return Oct ((long)Number);
+
+				// Empty is defined as returning 0
+				case TypeCode.Empty:
+					return "0";
+
+				// We can't convert these to Octal
+				case TypeCode.Boolean:
+				case TypeCode.Char:
+				case TypeCode.DBNull:
+				case TypeCode.DateTime:
+				case TypeCode.Decimal:
+				case TypeCode.Double:
+				case TypeCode.Object:
+				case TypeCode.SByte:
+				case TypeCode.Single:
+				case TypeCode.UInt16:
+				case TypeCode.UInt32:
+				case TypeCode.UInt64:
+				default:
+					throw new ArgumentException (
+					"Type of argument 'Number' is '" + 
+					Number.GetType().FullName + 
+					"', which is not numeric.");			
+			}
+		}
+
+		// Str is pretty easy now that we have a language 
+		// with a ToString method()
+		public static string Str (System.Object Number) {
+
+			// check for null as always and throw an exception
+			if (Number == null) {
+				throw new ArgumentNullException("Number");
+			}
+
+			switch (Type.GetTypeCode (Number.GetType ())) {
+				// for unsigned types, just call ToString
+				case TypeCode.Byte:
+				case TypeCode.UInt16:
+				case TypeCode.UInt32:
+				case TypeCode.UInt64:
+					return Number.ToString();
+
+				// for signed types, we have to leave a 
+				// space for the missing + sign
+				case TypeCode.Decimal:
+					return ((decimal)Number > 0 ? " " : "")
+						+ Number.ToString();
+				case TypeCode.Double:
+					return ((double)Number > 0 ? " " : "") 
+						+ Number.ToString();
+				case TypeCode.Int16:
+					return ((short)Number > 0 ? " " : "") 
+						+ Number.ToString();
+				case TypeCode.Int32:
+					return ((int)Number > 0 ? " " : "") 
+						+ Number.ToString();
+				case TypeCode.Int64:
+					return ((long)Number > 0 ? " " : "") 
+						+ Number.ToString();
+				case TypeCode.SByte:
+					return ((sbyte)Number > 0 ? " " : "") 
+						+ Number.ToString();
+				case TypeCode.Single:
+					return ((float)Number > 0 ? " " : "") 
+						+ Number.ToString();
+
+				// can't cast anything else to a Number
+				default:
+					throw new InvalidCastException(
+					"Argument 'Number' cannot be converted to a numeric value.");			
+			}
+		}
+
+		// The Val function is pretty bizarre
+		// Val ("&HFF") = 255
+		// Val ("&O377") = 255
+		// Val ("1234 Any Street") = 1234
+		// Val ("     12   45    .   90  7   E    +   0 0 2  ") = 1245.907e+002 = 124590.7
+		public static double Val (string InputStr) {
+			int i;
+			int Base; 
+			int NumChars = 0;
+			char c;
+			int Length = InputStr.Length;
+			char[] Number = new char[Length];
+			bool FoundRadixPrefix = false;
+			Regex NumberReg;
+			Match NumberMatch;
+			
+			Base = 10;
+			Number[0] = '\0';
+
+			// go through string
+			for (i = 0; i < Length; i++) {
+				c = InputStr[i];
+
+				// look for Radix prefix "&"
+				if (i == 0 && c == '&') {
+					FoundRadixPrefix = true;
+				}
+			
+				// look for an H or O following the prefix
+				else if (FoundRadixPrefix && i == 1 && 
+					(char.ToLower(c) == 'h' || 
+					char.ToLower(c) == 'o')) {
+					if (c == 'H') {
+						Base = 16;
+					}
+					else {
+						Base = 8;
+					}
+				}
+
+				// if we didn't find a radix prefix, 
+				// ignore whitespace
+				else if (char.IsWhiteSpace(c) && (Base == 10)) {
+					continue;
+				}
+
+				// mash what's left together
+				else {
+					Number[NumChars++] = c;
+				}
+			}
+
+			// now we have a string to parse
+			switch (Base) {
+				// FIXME : for Octal and Hex, 
+				// Regex is probably overkill
+				// Even for base 10, it might be faster 
+				// to write our own parser
+				case 8:
+					NumberReg = new Regex ("^[0-7]*");
+					NumberMatch = NumberReg.Match (
+					new string(Number, 0, NumChars));
+					break;
+				case 16:
+					NumberReg = new Regex ("^[0-9a-f]*", 
+						RegexOptions.IgnoreCase);
+					NumberMatch = NumberReg.Match (
+					new string(Number, 0, NumChars));
+					break;
+				case 10:
+				default:
+					NumberReg = new Regex (
+					"^[+-]?\\d*\\.?\\d*(e?[+-]?\\d*)", 
+					RegexOptions.IgnoreCase);
+					NumberMatch = NumberReg.Match (
+					new string(Number, 0, NumChars));
+					break;
+				
+
+			}
+
+			// we found a match, try to convert it
+			if (NumberMatch.Success) {
+				try {
+					switch (Base) {
+						case 10:
+							return 
+							Convert.ToDouble (
+							NumberMatch.Value);
+						case 8:
+						case 16:
+							return (double)
+							Convert.ToInt64 (
+							NumberMatch.Value, 
+								Base);
+						default:
+							return (double)0;
+					}
+				} 
+				catch {
+					throw new OverflowException();
+				}
+			}
+			else {
+				return (double)0;
+			}
+		}
+
+		// Val on a char type is pretty simple  '9' = 9, 'a' = exception
+		public static int Val (char Expression) {
+			if (char.IsDigit(Expression)) {
+				return Expression - '0';
+			} 
+			else {
+				throw new ArgumentException();
+			}
+		}
+
+		// if it's an object, and we can't convert 
+		// it to a string, it's an exception
+		public static double Val (System.Object Expression) {
+			// always check for null first
+			if (Expression == null) {
+				throw new ArgumentNullException ("Expression", 
+					"Value cannot be null");
+			}
+
+			try {
+				return Val (CastToString (Expression)); 
+			} 
+			catch {
+				throw new ArgumentException(
+				"Type of argument 'Expression' is '" + 
+				Expression.GetType().FullName + 
+				"', which can nt be converted to numeric.");			
+			}
+		}
+		// Events
+	}
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateAndTime.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateAndTime.cs
new file mode 100644
index 00000000000..6d809db4923
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateAndTime.cs
@@ -0,0 +1,478 @@
+//
+// DateAndTime.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+using System.Runtime.InteropServices;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace Microsoft.VisualBasic 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class DateAndTime {
+		public static string DateString {
+			get { 
+				return DateTime.Today.ToString("MM-dd-yyyy");
+			}
+			
+			set { 
+				string [] formats = { "M-d-yyyy", "M-d-y", "M/d/yyyy", "M/d/y" };

+
+				try {
+					DateTime dtToday = DateTime.ParseExact(value, formats,
+						DateTimeFormatInfo.CurrentInfo,
+						DateTimeStyles.None);
+				
+					Today = dtToday;
+				}
+				catch {
+					throw new InvalidCastException();
+				}
+			} 
+		}
+
+		public static System.DateTime Today {
+			get { return DateTime.Today; }
+			set { 
+				// FIXME: This needs to use some OS specific code
+				//	I've already written it for Windows
+				//	and Unix won't be hard, but need an
+				//	OS object from the compiler
+				//	OS specific code needs to check permissions
+				//	too, and throw an ArgumentOutOfRangeException
+				//	if no permissions
+//				DateTime dtNow = DateTime.Now;
+//
+//				SysTime.LocalTime = new DateTime(value.Year,
+//					value.Month, value.Day, dtNow.Hour,
+//					dtNow.Minute, dtNow.Second, dtNow.Millisecond);
+				throw new NotImplementedException();
+			} 
+		}
+
+		public static double Timer {  
+			get { 
+				DateTime DTNow = DateTime.Now;
+
+				return DTNow.Hour * 3600 + DTNow.Minute * 60 +
+					DTNow.Second + DTNow.Millisecond / 
+					1000D;
+			} 
+		}
+
+		public static System.DateTime Now {
+			get { return DateTime.Now; }
+		}
+
+		public static System.DateTime TimeOfDay {  
+			get { 
+				TimeSpan TSpan = DateTime.Now.TimeOfDay;
+
+				return new DateTime(1, 1, 1, TSpan.Hours, 
+					TSpan.Minutes, TSpan.Seconds, 
+					TSpan.Milliseconds); 
+			}
+			set { 
+				// FIXME: This needs to use some OS specific code
+				//	I've already written it for Windows
+				//	and Unix won't be hard, but need an
+				//	OS object from the compiler
+				//	OS specific code needs to check permissions
+				//	too, and throw an ArgumentOutOfRangeException
+				//	if no permissions
+//				DateTime dtToday = DateTime.Today;
+//
+//				SysTime.LocalTime = new DateTime(dtToday.Year,
+//					dtToday.Month, dtToday.Day, value.Hour, 
+//					value.Minute, value.Second, value.Millisecond);
+				throw new NotImplementedException();
+			} 
+		}
+
+		public static string TimeString {  
+			get { return DateTime.Now.ToString("HH:mm:ss"); } 
+			set { 

+				string format = "HH:mm:ss";

+
+				try {
+					DateTime dtToday = DateTime.ParseExact(value, format,
+						DateTimeFormatInfo.CurrentInfo,
+						DateTimeStyles.None);
+				
+					TimeOfDay = dtToday;
+				}
+				catch {
+					throw new InvalidCastException();
+				} 

+			} 
+		}
+
+		// Methods
+		public static System.DateTime DateAdd (DateInterval Interval, 
+			double Number, System.DateTime DateValue) {
+
+			switch (Interval) {
+				case DateInterval.Year:
+					return DateValue.AddYears((int)Number);
+				case DateInterval.Quarter:
+					return DateValue.AddMonths((int)Number * 3);
+				case DateInterval.Month:
+					return DateValue.AddMonths((int)Number);
+				case DateInterval.WeekOfYear:
+					return DateValue.AddDays(Number * 7);
+				case DateInterval.Day:
+				case DateInterval.DayOfYear:
+				case DateInterval.Weekday:
+					return DateValue.AddDays(Number);
+				case DateInterval.Hour:
+					return DateValue.AddHours(Number);
+				case DateInterval.Minute:
+					return DateValue.AddMinutes(Number);
+				case DateInterval.Second:
+					return DateValue.AddSeconds(Number);
+				default:
+					throw new ArgumentException();
+			}
+		}
+
+		private static DayOfWeek GetDayRule(FirstDayOfWeek StartOfWeek, DayOfWeek DayRule) 
+		{
+			switch (StartOfWeek) {
+				case FirstDayOfWeek.System:
+					return DayRule;
+				case FirstDayOfWeek.Sunday:
+					return DayOfWeek.Sunday;
+				case FirstDayOfWeek.Monday:
+					return DayOfWeek.Monday;
+				case FirstDayOfWeek.Tuesday:
+					return DayOfWeek.Tuesday;
+				case FirstDayOfWeek.Wednesday:
+					return DayOfWeek.Wednesday;
+				case FirstDayOfWeek.Thursday:
+					return DayOfWeek.Thursday;
+				case FirstDayOfWeek.Friday:
+					return DayOfWeek.Friday;
+				case FirstDayOfWeek.Saturday:
+					return DayOfWeek.Saturday;
+				default:
+					throw new ArgumentException();
+			}
+		}
+
+		private static CalendarWeekRule GetWeekRule(FirstWeekOfYear StartOfYear, CalendarWeekRule WeekRule) 
+		{
+			switch (StartOfYear) {
+				case FirstWeekOfYear.System:
+					return WeekRule;
+				case FirstWeekOfYear.FirstFourDays:
+					return CalendarWeekRule.FirstFourDayWeek;
+				case FirstWeekOfYear.FirstFullWeek:
+					return CalendarWeekRule.FirstFullWeek;
+				case FirstWeekOfYear.Jan1:
+					return CalendarWeekRule.FirstDay;
+				default:
+					throw new ArgumentException();
+			}
+		}
+		
+		public static long DateDiff (DateInterval Interval, 
+			System.DateTime Date1, System.DateTime Date2, 
+			[Optional] [DefaultValue(FirstDayOfWeek.Sunday)] 
+			FirstDayOfWeek StartOfWeek, 
+			[Optional] [DefaultValue(FirstWeekOfYear.Jan1)] 
+			FirstWeekOfYear StartOfYear) 
+		{
+			
+			int YearMonths;
+			int YearQuarters;
+			int YearWeeks;
+			CalendarWeekRule WeekRule = CalendarWeekRule.FirstDay;
+			DayOfWeek DayRule = DateTimeFormatInfo.CurrentInfo.FirstDayOfWeek;
+			Calendar CurCalendar = CultureInfo.CurrentCulture.Calendar;
+
+			switch (Interval) {
+				case DateInterval.Year:
+					return Date2.Year - Date1.Year;
+				case DateInterval.Quarter:
+					YearQuarters = (Date2.Year - Date1.Year) * 4;
+					return Date2.Month / 4 - Date1.Month / 4 + YearQuarters;
+				case DateInterval.Month:
+					YearMonths = (Date2.Year - Date1.Year) * 12;
+					return Date2.Month - Date1.Month + YearMonths;
+				case DateInterval.WeekOfYear:
+					YearWeeks = (Date2.Year - Date1.Year) * 53;
+					DayRule = GetDayRule(StartOfWeek, DayRule);
+					WeekRule = GetWeekRule(StartOfYear, WeekRule);
+					return CurCalendar.GetWeekOfYear(Date2,	WeekRule, DayRule) -
+						CurCalendar.GetWeekOfYear(Date1,WeekRule, DayRule) + 
+						YearWeeks;
+				case DateInterval.Weekday:
+					return ((TimeSpan)(Date2.Subtract(Date1))).Days / 7;
+				case DateInterval.DayOfYear:
+				case DateInterval.Day:
+					return ((TimeSpan)(Date2.Subtract(Date1))).Days;
+				case DateInterval.Hour:
+					return ((TimeSpan)(Date2.Subtract(Date1))).Hours;
+				case DateInterval.Minute:
+					return ((TimeSpan)(Date2.Subtract(Date1))).Minutes;
+				case DateInterval.Second:
+					return ((TimeSpan)(Date2.Subtract(Date1))).Seconds;
+				default:
+					throw new ArgumentException();
+			}
+		}
+
+		private static int ConvertWeekDay(DayOfWeek Day, int Offset) 
+		{
+
+			int Weekday = (int)Day + Offset;
+
+			if (Weekday > 7) {
+				Weekday -= 7;
+			}
+
+			switch((DayOfWeek)Weekday) {
+				case DayOfWeek.Sunday:
+					return (int)FirstDayOfWeek.Sunday;
+				case DayOfWeek.Monday:
+					return (int)FirstDayOfWeek.Monday;
+				case DayOfWeek.Tuesday:
+					return (int)FirstDayOfWeek.Tuesday;
+				case DayOfWeek.Wednesday:
+					return (int)FirstDayOfWeek.Wednesday;
+				case DayOfWeek.Thursday:
+					return (int)FirstDayOfWeek.Thursday;
+				case DayOfWeek.Friday:
+					return (int)FirstDayOfWeek.Friday;
+				case DayOfWeek.Saturday:
+					return (int)FirstDayOfWeek.Saturday;
+				default:
+					throw new ArgumentException();
+			}
+
+		}
+
+		public static int DatePart 
+		(
+			Microsoft.VisualBasic.DateInterval Interval, 
+			System.DateTime DateValue, 
+			[Optional] [DefaultValue(FirstDayOfWeek.Sunday)] 
+			FirstDayOfWeek StartOfWeek, 
+			[Optional] [DefaultValue(FirstWeekOfYear.Jan1)] 
+			FirstWeekOfYear StartOfYear) {
+			
+			CalendarWeekRule WeekRule = CalendarWeekRule.FirstDay;
+			DayOfWeek DayRule = DateTimeFormatInfo.CurrentInfo.FirstDayOfWeek;
+			Calendar CurCalendar = CultureInfo.CurrentCulture.Calendar;
+
+			switch (Interval) {
+				case DateInterval.Year:
+					return DateValue.Year;
+				case DateInterval.Quarter:
+					return DateValue.Month / 4 + 1;
+				case DateInterval.Month:
+					return DateValue.Month;
+				case DateInterval.WeekOfYear:
+					DayRule = GetDayRule(StartOfWeek, DayRule);
+					WeekRule = GetWeekRule(StartOfYear, WeekRule);
+					return CurCalendar.GetWeekOfYear(DateValue, WeekRule, DayRule);
+				case DateInterval.Weekday:
+					return ConvertWeekDay(DateValue.DayOfWeek, (int)DayRule);
+				case DateInterval.DayOfYear:
+					return DateValue.DayOfYear;
+				case DateInterval.Day:
+					return DateValue.Day;
+				case DateInterval.Hour:
+					return DateValue.Hour;
+				case DateInterval.Minute:
+					return DateValue.Minute;
+				case DateInterval.Second:
+					return DateValue.Second;
+				default:
+					throw new ArgumentException();
+			}
+		}
+
+		private static DateInterval DateIntervalFromString(string Interval) 
+		{
+			switch (Interval) {
+				case "yyyy":
+					return DateInterval.Year;
+				case "q":
+					return DateInterval.Quarter;
+				case "m":
+					return DateInterval.Month;
+				case "ww":
+					return DateInterval.WeekOfYear;
+				case "w":
+					return DateInterval.Weekday;
+				case "d":
+					return DateInterval.Day;
+				case "y":
+					return DateInterval.DayOfYear;
+				case "h":
+					return DateInterval.Hour;
+				case "n":
+					return DateInterval.Minute;
+				case "s":
+					return DateInterval.Second;
+			default:
+					throw new ArgumentException();
+			}
+		}
+
+		public static System.DateTime DateAdd (string Interval, 
+			double Number, System.Object DateValue) 
+		{
+			if (DateValue == null) {
+				throw new ArgumentNullException("DateValue", "Value can not be null.");
+			}
+			if (!(DateValue is DateTime)) {
+				throw new InvalidCastException();
+			}
+			
+			return DateAdd(DateIntervalFromString(Interval), Number, (DateTime)DateValue);
+		}
+
+		public static System.Int64 DateDiff (string Interval, 
+			System.Object Date1, System.Object Date2, 
+			[Optional] [DefaultValue(FirstDayOfWeek.Sunday)]
+			FirstDayOfWeek StartOfWeek, 
+			[Optional] [DefaultValue(FirstWeekOfYear.Jan1)] 
+			FirstWeekOfYear StartOfYear) 
+		{
+			if (Date1 == null) {
+				throw new ArgumentNullException("Date1", "Value can not be null.");
+			}
+			if (Date2 == null) {
+				throw new ArgumentNullException("Date2", "Value can not be null.");
+			}
+			if (!(Date1 is DateTime)) {
+				throw new InvalidCastException();
+			}
+			if (!(Date2 is DateTime)) {
+				throw new InvalidCastException();
+			}
+			
+			return DateDiff(DateIntervalFromString(Interval), (DateTime)Date1, 
+				(DateTime)Date2, StartOfWeek, StartOfYear);
+			
+		}
+
+		public static System.Int32 DatePart (string Interval, 
+			System.Object DateValue, 
+			[Optional] [DefaultValue(FirstDayOfWeek.Sunday)] 
+			FirstDayOfWeek StartOfWeek, 
+			[Optional] [DefaultValue(FirstWeekOfYear.Jan1)] 
+			FirstWeekOfYear StartOfYear) 
+		{
+			if (DateValue == null) {
+				throw new ArgumentNullException("DateValue", "Value can not be null.");
+			}
+			if (!(DateValue is DateTime)) {
+				throw new InvalidCastException();
+			}
+			
+			
+			return DatePart(DateIntervalFromString(Interval), 
+				(DateTime)DateValue, StartOfWeek, StartOfYear);
+		}
+
+		public static System.DateTime DateSerial (int Year, int Month, int Day) 
+		{
+			return new DateTime(Year, Month, Day); 
+		}
+
+		public static System.DateTime TimeSerial (int Hour, int Minute, int Second) 
+		{
+			return new DateTime(1, 1, 1, Hour, Minute, Second);
+		}
+
+		public static System.DateTime DateValue (string StringDate) 
+		{ 
+			return DateTime.Parse(StringDate);
+		}
+
+		public static System.DateTime TimeValue (string StringTime) 
+		{ 
+			return DateTime.Parse(StringTime);
+		}
+
+		public static int Year (System.DateTime DateValue) 
+		{ 
+			return DateValue.Year;
+		}
+
+		public static int Month (System.DateTime DateValue) 
+		{ 
+			return DateValue.Month;
+		}
+
+		public static int Day (System.DateTime DateValue) 
+		{ 
+			return DateValue.Day;
+		}
+
+		public static int Hour (System.DateTime TimeValue) 
+		{ 
+			return TimeValue.Hour;
+		}
+
+		public static int Minute (System.DateTime TimeValue) 
+		{ 
+			return TimeValue.Minute;
+		}
+
+		public static int Second (System.DateTime TimeValue) 
+		{ 
+			return TimeValue.Second;
+		}
+
+		public static int Weekday (System.DateTime DateValue, 
+			[Optional] [DefaultValue(FirstDayOfWeek.Sunday)] 
+			FirstDayOfWeek StartOfWeek) 
+		{ 
+			return DatePart(DateInterval.Weekday, DateValue, StartOfWeek, FirstWeekOfYear.System);
+		}
+
+		public static System.String MonthName (int Month, 
+			[Optional] [DefaultValue(false)] bool Abbreviate) 
+		{ 
+			if (Month < 1 || Month > 13) {
+				throw new ArgumentException();
+			}
+			if (Abbreviate) {
+				return CultureInfo.CurrentCulture.DateTimeFormat.GetAbbreviatedMonthName(Month);
+			}
+			else {
+				return CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(Month);
+			}
+		}
+		
+		public static System.String WeekdayName (int Weekday, 
+			[Optional] [DefaultValue(false)] System.Boolean Abbreviate, 
+			[Optional] [DefaultValue(FirstDayOfWeek.System)] 
+			FirstDayOfWeek FirstDayOfWeekValue) 
+		{ 
+			if (Weekday < 1 || Weekday > 7) {
+				throw new ArgumentException();
+			}
+			Weekday += (int)FirstDayOfWeekValue;
+			if (Weekday > 7) {
+				Weekday -= 7;
+			}
+			if (Abbreviate) {
+				return CultureInfo.CurrentCulture.DateTimeFormat.GetAbbreviatedDayName((DayOfWeek)Weekday);
+			}
+			else {
+				return CultureInfo.CurrentCulture.DateTimeFormat.GetDayName((DayOfWeek)Weekday);
+			}
+		}
+	}
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateFormat.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateFormat.cs
new file mode 100644
index 00000000000..9ffcd7ebf10
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateFormat.cs
@@ -0,0 +1,37 @@
+//

+// DateFormat.cs

+//

+// Author:

+//   Martin Adoue (martin@cwanet.com)

+//

+// (C) 2002 Martin Adoue

+//

+namespace Microsoft.VisualBasic {

+

+	/// <summary>

+	/// When you call the DateValue function, you can use the following 

+	/// enumeration members in your code in place of the actual values.

+	/// </summary>

+	public enum DateFormat : int {

+		/// <summary>

+		/// For real numbers, displays a date and time. If the number has no fractional part, displays only a date. If the number has no integer part, displays time only. Date and time display is determined by your computer's regional settings.

+		/// </summary>

+		GeneralDate = 0,

+		/// <summary>

+		/// Displays a date using the long-date format specified in your computer's regional settings.

+		/// </summary>

+		LongDate = 1,

+		/// <summary>

+		/// Displays a date using the short-date format specified in your computer's regional settings.

+		/// </summary>

+		ShortDate = 2,	

+		/// <summary>

+		/// Displays a time using the long-time format specified in your computer's regional settings.

+		/// </summary>

+		LongTime = 3,		

+		/// <summary>

+		/// Displays a time using the short-time format specified in your computer's regional settings.

+		/// </summary>

+		ShortTime = 4		

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateInterval.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateInterval.cs
new file mode 100644
index 00000000000..2c86a14733e
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DateInterval.cs
@@ -0,0 +1,22 @@
+//

+// DateInterval.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum DateInterval : int {

+		Year = 0,

+		Quarter = 1,

+		Month = 2,

+		DayOfYear = 3,

+		Day = 4,

+		WeekOfYear = 5,

+		Weekday = 6,

+		Hour = 7,

+		Minute = 8,

+		Second = 9

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DueDate.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DueDate.cs
new file mode 100644
index 00000000000..82bc60f988e
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/DueDate.cs
@@ -0,0 +1,14 @@
+//

+// DueDate.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum DueDate : int {

+		EndOfPeriod = 0,

+		BegOfPeriod = 1

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ErrObject.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ErrObject.cs
new file mode 100644
index 00000000000..8883f938833
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/ErrObject.cs
@@ -0,0 +1,41 @@
+//
+// ErrObject.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic 

+{
+	sealed public class ErrObject {
+		// Declarations
+		// Constructors
+		// Properties
+		[MonoTODO]
+		public System.Int32 HelpContext { get { throw new NotImplementedException (); } set { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public System.Int32 LastDllError {  get { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public System.Int32 Number {  get { throw new NotImplementedException (); } set { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public System.Int32 Erl {  get { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public System.String Source {  get { throw new NotImplementedException (); } set { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public System.String HelpFile {  get { throw new NotImplementedException (); } set { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public System.String Description {  get { throw new NotImplementedException (); } set { throw new NotImplementedException (); } }
+		// Methods
+		[MonoTODO]
+		public System.Exception GetException () { throw new NotImplementedException (); }
+		[MonoTODO]
+		public void Clear () { throw new NotImplementedException (); }
+		[MonoTODO]
+		public void Raise (System.Int32 Number, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(null)] System.Object Source, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(null)] System.Object Description, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(null)] System.Object HelpFile, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(null)] System.Object HelpContext) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileAttribute.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileAttribute.cs
new file mode 100644
index 00000000000..96dc29a3f4e
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileAttribute.cs
@@ -0,0 +1,20 @@
+//

+// FileAttribute.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	[System.FlagsAttribute] 

+	public enum FileAttribute : int {

+		Normal = 0,

+		ReadOnly = 1,

+		Hidden = 2,

+		System = 4,

+		Volume = 8,

+		Directory = 16,

+		Archive = 32

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileSystem.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileSystem.cs
new file mode 100644
index 00000000000..80cc1a297d8
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FileSystem.cs
@@ -0,0 +1,189 @@
+//

+// FileSystem.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//
+
+using System;
+
+namespace Microsoft.VisualBasic 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class FileSystem {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static void ChDir (System.String Path) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void ChDrive (System.Char Drive) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void ChDrive (System.String Drive) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String CurDir () { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String CurDir (System.Char Drive) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String Dir () { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String Dir (System.String Pathname, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] Microsoft.VisualBasic.FileAttribute Attributes) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void MkDir (System.String Path) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void RmDir (System.String Path) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileCopy (System.String Source, System.String Destination) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.DateTime FileDateTime (System.String PathName) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Int64 FileLen (System.String PathName) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static Microsoft.VisualBasic.FileAttribute GetAttr (System.String PathName) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Kill (System.String PathName) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void SetAttr (System.String PathName, Microsoft.VisualBasic.FileAttribute Attributes) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileOpen (System.Int32 FileNumber, System.String FileName, Microsoft.VisualBasic.OpenMode Mode, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] Microsoft.VisualBasic.OpenAccess Access, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] Microsoft.VisualBasic.OpenShare Share, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int32 RecordLength) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileClose (params System.Int32[] FileNumbers) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGetObject (System.Int32 FileNumber, ref System.Object Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.ValueType Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.Array Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(false)] ref System.Boolean ArrayIsDynamic, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(false)] ref System.Boolean StringIsFixedLength) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.Boolean Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.Byte Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.Int16 Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.Int32 Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.Int64 Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.Char Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.Single Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.Double Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.Decimal Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.String Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(false)] ref System.Boolean StringIsFixedLength) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileGet (System.Int32 FileNumber, ref System.DateTime Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] ref System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePutObject (System.Int32 FileNumber, System.Object Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		[System.ObsoleteAttribute("Use FilePutObject to write Object types, or coerce FileNumber and RecordNumber to Integer for writing non-Object types", false)] 
+		public static void FilePut (System.Object FileNumber, System.Object Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Object RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.ValueType Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.Array Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(false)] System.Boolean ArrayIsDynamic, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(false)] System.Boolean StringIsFixedLength) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.Boolean Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.Byte Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.Int16 Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.Int32 Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.Int64 Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.Char Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.Single Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.Double Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.Decimal Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.String Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(false)] System.Boolean StringIsFixedLength) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FilePut (System.Int32 FileNumber, System.DateTime Value, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int64 RecordNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Print (System.Int32 FileNumber, params System.Object[] Output) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void PrintLine (System.Int32 FileNumber, params System.Object[] Output) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.Object Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.Boolean Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.Byte Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.Int16 Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.Int32 Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.Int64 Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.Char Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.Single Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.Double Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.Decimal Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.String Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Input (System.Int32 FileNumber, ref System.DateTime Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Write (System.Int32 FileNumber, params System.Object[] Output) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void WriteLine (System.Int32 FileNumber, params System.Object[] Output) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String InputString (System.Int32 FileNumber, System.Int32 CharCount) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String LineInput (System.Int32 FileNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Lock (System.Int32 FileNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Lock (System.Int32 FileNumber, System.Int64 Record) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Lock (System.Int32 FileNumber, System.Int64 FromRecord, System.Int64 ToRecord) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Unlock (System.Int32 FileNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Unlock (System.Int32 FileNumber, System.Int64 Record) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Unlock (System.Int32 FileNumber, System.Int64 FromRecord, System.Int64 ToRecord) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void FileWidth (System.Int32 FileNumber, System.Int32 RecordWidth) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Int32 FreeFile () { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Seek (System.Int32 FileNumber, System.Int64 Position) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Int64 Seek (System.Int32 FileNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean EOF (System.Int32 FileNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Int64 Loc (System.Int32 FileNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Int64 LOF (System.Int32 FileNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static Microsoft.VisualBasic.TabInfo TAB () { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static Microsoft.VisualBasic.TabInfo TAB (System.Int16 Column) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static Microsoft.VisualBasic.SpcInfo SPC (System.Int16 Count) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static Microsoft.VisualBasic.OpenMode FileAttr (System.Int32 FileNumber) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Reset () { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Rename (System.String OldPath, System.String NewPath) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Financial.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Financial.cs
new file mode 100644
index 00000000000..613c49ea716
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Financial.cs
@@ -0,0 +1,48 @@
+//
+// Financial.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class Financial {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static System.Double DDB (System.Double Cost, System.Double Salvage, System.Double Life, System.Double Period, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(2)] System.Double Factor) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double FV (System.Double Rate, System.Double NPer, System.Double Pmt, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] System.Double PV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] Microsoft.VisualBasic.DueDate Due) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double IPmt (System.Double Rate, System.Double Per, System.Double NPer, System.Double PV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] System.Double FV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] Microsoft.VisualBasic.DueDate Due) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double IRR (ref System.Double[] ValueArray, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0.1)] ref System.Double Guess) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double MIRR (ref System.Double[] ValueArray, ref System.Double FinanceRate, ref System.Double ReinvestRate) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double NPer (System.Double Rate, System.Double Pmt, System.Double PV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] System.Double FV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] Microsoft.VisualBasic.DueDate Due) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double NPV (System.Double Rate, ref System.Double[] ValueArray) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double Pmt (System.Double Rate, System.Double NPer, System.Double PV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] System.Double FV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] Microsoft.VisualBasic.DueDate Due) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double PPmt (System.Double Rate, System.Double Per, System.Double NPer, System.Double PV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] System.Double FV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] Microsoft.VisualBasic.DueDate Due) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double PV (System.Double Rate, System.Double NPer, System.Double Pmt, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] System.Double FV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] Microsoft.VisualBasic.DueDate Due) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double Rate (System.Double NPer, System.Double Pmt, System.Double PV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] System.Double FV, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] Microsoft.VisualBasic.DueDate Due, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0.1)] System.Double Guess) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double SLN (System.Double Cost, System.Double Salvage, System.Double Life) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double SYD (System.Double Cost, System.Double Salvage, System.Double Life, System.Double Period) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstDayOfWeek.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstDayOfWeek.cs
new file mode 100644
index 00000000000..05cf55c0c35
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstDayOfWeek.cs
@@ -0,0 +1,20 @@
+//

+// FirstDayOfWeek.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum FirstDayOfWeek : int {

+		System = 0,

+		Sunday = 1,

+		Monday = 2,

+		Tuesday = 3,

+		Wednesday = 4,

+		Thursday = 5,

+		Friday = 6,

+		Saturday = 7

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstWeekOfYear.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstWeekOfYear.cs
new file mode 100644
index 00000000000..035e5bd5feb
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/FirstWeekOfYear.cs
@@ -0,0 +1,16 @@
+//

+// FirstWeekOfYear.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum FirstWeekOfYear : int {

+		System = 0,

+		Jan1 = 1,

+		FirstFourDays = 2,

+		FirstFullWeek = 3

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Globals.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Globals.cs
new file mode 100644
index 00000000000..2c89b994d4e
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Globals.cs
@@ -0,0 +1,30 @@
+//
+// Globals.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class Globals {
+		// Declarations
+		// Constructors
+		// Properties
+		[MonoTODO]
+		public static System.String ScriptEngine {  get { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public static System.Int32 ScriptEngineMajorVersion {  get { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public static System.Int32 ScriptEngineMinorVersion {  get { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public static System.Int32 ScriptEngineBuildVersion {  get { throw new NotImplementedException (); } }
+		// Methods
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Information.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Information.cs
new file mode 100644
index 00000000000..165fbad52e0
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Information.cs
@@ -0,0 +1,57 @@
+//
+// Information.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class Information {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static Microsoft.VisualBasic.ErrObject Err () { throw new NotImplementedException (); }
+		[MonoTODO]
+		[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+		public static System.Int32 Erl () { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean IsArray (System.Object VarName) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean IsDate (System.Object Expression) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean IsDBNull (System.Object Expression) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean IsNothing (System.Object Expression) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean IsError (System.Object Expression) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean IsReference (System.Object Expression) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean IsNumeric (System.Object Expression) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Int32 LBound (System.Array Array, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(1)] System.Int32 Rank) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Int32 UBound (System.Array Array, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(1)] System.Int32 Rank) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String TypeName (System.Object VarName) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String SystemTypeName (System.String VbName) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String VbTypeName (System.String UrtName) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Int32 QBColor (System.Int32 Color) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Int32 RGB (System.Int32 Red, System.Int32 Green, System.Int32 Blue) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static Microsoft.VisualBasic.VariantType VarType (System.Object VarName) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Interaction.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Interaction.cs
new file mode 100644
index 00000000000..ad17f86ceef
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Interaction.cs
@@ -0,0 +1,39 @@
+//

+// Interaction.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 

+	[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Auto)] 

+	sealed public class Interaction {

+		// Declarations

+		// Constructors

+		// Properties

+		// Methods

+		public static System.Int32 Shell (System.String Pathname, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(2)] Microsoft.VisualBasic.AppWinStyle Style, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(false)] System.Boolean Wait, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int32 Timeout) { return 0;}

+		public static void AppActivate (System.Int32 ProcessId) { }

+		public static void AppActivate (System.String Title) { }

+		public static System.String Command () { return "";}

+		public static System.String Environ (System.Int32 Expression) { return "";}

+		public static System.String Environ (System.String Expression) { return "";}

+		public static void Beep () { }

+		public static System.String InputBox (System.String Prompt, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue("")] System.String Title, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue("")] System.String DefaultResponse, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int32 XPos, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(-1)] System.Int32 YPos) { return "";}

+		public static Microsoft.VisualBasic.MsgBoxResult MsgBox (System.Object Prompt, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(0)] Microsoft.VisualBasic.MsgBoxStyle Buttons, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(null)] System.Object Title) { return 0;}

+		public static System.Object CallByName (System.Object ObjectRef, System.String ProcName, Microsoft.VisualBasic.CallType UseCallType, params System.Object[] Args) { return null;}

+		public static System.Object Choose (System.Double Index, params System.Object[] Choice) { return null;}

+		public static System.Object IIf (System.Boolean Expression, System.Object TruePart, System.Object FalsePart) { return null;}

+		public static System.String Partition (System.Int64 Number, System.Int64 Start, System.Int64 Stop, System.Int64 Interval) { return "";}

+		public static System.Object Switch (params System.Object[] VarExpr) { return null;}

+		public static void DeleteSetting (System.String AppName, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(null)] System.String Section, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(null)] System.String Key) { }

+		public static System.String[,] GetAllSettings (System.String AppName, System.String Section) { return null;}

+		public static System.String GetSetting (System.String AppName, System.String Section, System.String Key, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue("")] System.String Default) { return "";}

+		public static void SaveSetting (System.String AppName, System.String Section, System.String Key, System.String Setting) { }

+		public static System.Object CreateObject (System.String ProgId, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue("")] System.String ServerName) { return null;}

+		public static System.Object GetObject ([System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(null)] System.String PathName, [System.Runtime.InteropServices.Optional] [System.ComponentModel.DefaultValue(null)] System.String Class) { return null;}

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/BooleanType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/BooleanType.cs
new file mode 100644
index 00000000000..d64b642912f
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/BooleanType.cs
@@ -0,0 +1,26 @@
+//
+// BooleanType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class BooleanType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		public static System.Boolean FromString (System.String Value) { return System.Boolean.Parse(Value); }
+		[MonoTODO]
+		public static System.Boolean FromObject (System.Object Value) { throw new NotImplementedException(); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ByteType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ByteType.cs
new file mode 100644
index 00000000000..631a19665c2
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ByteType.cs
@@ -0,0 +1,26 @@
+//
+// ByteType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class ByteType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		public static System.Byte FromString (System.String Value) { return System.Byte.Parse(Value); }
+		[MonoTODO]
+		public static System.Byte FromObject (System.Object Value) { throw new NotImplementedException(); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/CharArrayType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/CharArrayType.cs
new file mode 100644
index 00000000000..0ff4c50c3b5
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/CharArrayType.cs
@@ -0,0 +1,27 @@
+//
+// CharArrayType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	sealed public class CharArrayType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static System.Char[] FromString (System.String Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Char[] FromObject (System.Object Value) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/CharType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/CharType.cs
new file mode 100644
index 00000000000..a493a84f45c
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/CharType.cs
@@ -0,0 +1,27 @@
+//
+// CharType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	sealed public class CharType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static System.Char FromString (System.String Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Char FromObject (System.Object Value) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DateType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DateType.cs
new file mode 100644
index 00000000000..4acff1409e9
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DateType.cs
@@ -0,0 +1,28 @@
+//
+// DateType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	sealed public class DateType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		public static System.DateTime FromString (System.String Value) { return System.DateTime.Parse(Value); }
+		[MonoTODO]
+		public static System.DateTime FromString (System.String Value, System.Globalization.CultureInfo culture) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.DateTime FromObject (System.Object Value) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DecimalType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DecimalType.cs
new file mode 100644
index 00000000000..670f406f42b
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DecimalType.cs
@@ -0,0 +1,34 @@
+//
+// DecimalType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class DecimalType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static System.Decimal FromBoolean (System.Boolean Value) { throw new NotImplementedException (); }
+		public static System.Decimal FromString (System.String Value) { return System.Decimal.Parse(Value); }
+		[MonoTODO]
+		public static System.Decimal FromString (System.String Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Decimal FromObject (System.Object Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Decimal FromObject (System.Object Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Decimal Parse (System.String Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DoubleType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DoubleType.cs
new file mode 100644
index 00000000000..1d0e2b99fa3
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DoubleType.cs
@@ -0,0 +1,33 @@
+//
+// DoubleType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	sealed public class DoubleType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		public static System.Double FromString (System.String Value) { return System.Double.Parse(Value); }
+		[MonoTODO]
+		public static System.Double FromString (System.String Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double FromObject (System.Object Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Double FromObject (System.Object Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		public static System.Double Parse (System.String Value) { return System.Double.Parse(Value); }
+		[MonoTODO]
+		public static System.Double Parse (System.String Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ExceptionUtils.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ExceptionUtils.cs
new file mode 100644
index 00000000000..03442b7382f
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ExceptionUtils.cs
@@ -0,0 +1,20 @@
+//

+// ExceptionUtils.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic.CompilerServices {

+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 

+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 

+	[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Auto)] 

+	sealed public class ExceptionUtils {

+		// Declarations

+		// Constructors

+		// Properties

+		// Methods

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/FlowControl.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/FlowControl.cs
new file mode 100644
index 00000000000..50f5ff3b23f
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/FlowControl.cs
@@ -0,0 +1,41 @@
+//
+// FlowControl.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	sealed public class FlowControl {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static System.Boolean ForNextCheckR4 (System.Single count, System.Single limit, System.Single StepValue) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean ForNextCheckR8 (System.Double count, System.Double limit, System.Double StepValue) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean ForNextCheckDec (System.Decimal count, System.Decimal limit, System.Decimal StepValue) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean ForLoopInitObj (System.Object Counter, System.Object Start, System.Object Limit, System.Object StepValue, ref System.Object LoopForResult, ref System.Object CounterResult) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean ForNextCheckObj (System.Object Counter, System.Object LoopObj, ref System.Object CounterResult) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Collections.IEnumerator ForEachInArr (System.Array ary) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Collections.IEnumerator ForEachInObj (System.Object obj) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean ForEachNextObj (ref System.Object obj, ref System.Collections.IEnumerator enumerator) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void CheckForSyncLockOnValueType (System.Object obj) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/HostServices.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/HostServices.cs
new file mode 100644
index 00000000000..49145ede7e9
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/HostServices.cs
@@ -0,0 +1,24 @@
+//
+// HostServices.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	sealed public class HostServices {
+		// Declarations
+		// Constructors
+		// Properties
+		[MonoTODO]
+		public static Microsoft.VisualBasic.CompilerServices.IVbHost VBHost { get { throw new NotImplementedException (); } set { throw new NotImplementedException (); } }
+		// Methods
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IVbHost.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IVbHost.cs
new file mode 100644
index 00000000000..abff24de804
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IVbHost.cs
@@ -0,0 +1,20 @@
+//

+// IVbHost.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic.CompilerServices {

+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 

+	public interface IVbHost {

+		// Declarations

+		// Constructors

+		// Properties

+		// Methods

+		System.String GetWindowTitle ();

+		// System.Windows.Forms.IWin32Window GetParentWindow ();

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IncompleteInitialization.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IncompleteInitialization.cs
new file mode 100644
index 00000000000..e22ac728bc1
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IncompleteInitialization.cs
@@ -0,0 +1,19 @@
+//

+// IncompleteInitialization.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic.CompilerServices {

+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 

+	[MonoTODO]

+	sealed public class IncompleteInitialization : System.Exception, System.Runtime.Serialization.ISerializable {

+		// Declarations

+		// Constructors

+		// Properties

+		// Methods

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IntegerType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IntegerType.cs
new file mode 100644
index 00000000000..14330f9a368
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IntegerType.cs
@@ -0,0 +1,26 @@
+//
+// IntegerType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	sealed public class IntegerType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		public static System.Int32 FromString (System.String Value) { return System.Int32.Parse(Value); }
+		[MonoTODO]
+		public static System.Int32 FromObject (System.Object Value) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinding.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinding.cs
new file mode 100644
index 00000000000..22ce2f3faf3
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinding.cs
@@ -0,0 +1,51 @@
+//
+// LateBinding.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class LateBinding {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		[System.Diagnostics.DebuggerHiddenAttribute] 
+		[System.Diagnostics.DebuggerStepThroughAttribute] 
+		public static System.Object LateGet (System.Object o, System.Type objType, System.String name, System.Object[] args, System.String[] paramnames, System.Boolean[] CopyBack) { throw new NotImplementedException (); }
+		[MonoTODO]
+		[System.Diagnostics.DebuggerStepThroughAttribute] 
+		[System.Diagnostics.DebuggerHiddenAttribute] 
+		public static void LateSetComplex (System.Object o, System.Type objType, System.String name, System.Object[] args, System.String[] paramnames, System.Boolean OptimisticSet, System.Boolean RValueBase) { throw new NotImplementedException (); }
+		[MonoTODO]
+		[System.Diagnostics.DebuggerStepThroughAttribute] 
+		[System.Diagnostics.DebuggerHiddenAttribute] 
+		public static void LateSet (System.Object o, System.Type objType, System.String name, System.Object[] args, System.String[] paramnames) { throw new NotImplementedException (); }
+		[MonoTODO]
+		[System.Diagnostics.DebuggerStepThroughAttribute] 
+		[System.Diagnostics.DebuggerHiddenAttribute] 
+		public static System.Object LateIndexGet (System.Object o, System.Object[] args, System.String[] paramnames) { throw new NotImplementedException (); }
+		[MonoTODO]
+		[System.Diagnostics.DebuggerHiddenAttribute] 
+		[System.Diagnostics.DebuggerStepThroughAttribute] 
+		public static void LateIndexSetComplex (System.Object o, System.Object[] args, System.String[] paramnames, System.Boolean OptimisticSet, System.Boolean RValueBase) { throw new NotImplementedException (); }
+		[MonoTODO]
+		[System.Diagnostics.DebuggerStepThroughAttribute] 
+		[System.Diagnostics.DebuggerHiddenAttribute] 
+		public static void LateIndexSet (System.Object o, System.Object[] args, System.String[] paramnames) { throw new NotImplementedException (); }
+		[MonoTODO]
+		[System.Diagnostics.DebuggerStepThroughAttribute] 
+		[System.Diagnostics.DebuggerHiddenAttribute] 
+		public static void LateCall (System.Object o, System.Type objType, System.String name, System.Object[] args, System.String[] paramnames, System.Boolean[] CopyBack) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LongType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LongType.cs
new file mode 100644
index 00000000000..e90edd154c6
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LongType.cs
@@ -0,0 +1,26 @@
+//
+// LongType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class LongType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		public static System.Int64 FromString (System.String Value) { return System.Int64.Parse(Value); }
+		[MonoTODO]
+		public static System.Int64 FromObject (System.Object Value) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ObjectType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ObjectType.cs
new file mode 100644
index 00000000000..c709c80f44e
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ObjectType.cs
@@ -0,0 +1,58 @@
+//
+// ObjectType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	sealed public class ObjectType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static System.Int32 ObjTst (System.Object o1, System.Object o2, System.Boolean TextCompare) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object PlusObj (System.Object obj) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object NegObj (System.Object obj) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object NotObj (System.Object obj) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object BitAndObj (System.Object obj1, System.Object obj2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object BitOrObj (System.Object obj1, System.Object obj2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object BitXorObj (System.Object obj1, System.Object obj2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object AddObj (System.Object o1, System.Object o2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object SubObj (System.Object o1, System.Object o2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object MulObj (System.Object o1, System.Object o2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object DivObj (System.Object o1, System.Object o2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object PowObj (System.Object obj1, System.Object obj2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object ModObj (System.Object o1, System.Object o2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object IDivObj (System.Object o1, System.Object o2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object XorObj (System.Object obj1, System.Object obj2) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean LikeObj (System.Object vLeft, System.Object vRight, Microsoft.VisualBasic.CompareMethod CompareOption) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object StrCatObj (System.Object vLeft, System.Object vRight) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object GetObjectValuePrimitive (System.Object o) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/OptionCompareAttribute.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/OptionCompareAttribute.cs
new file mode 100644
index 00000000000..ab0fbca18cb
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/OptionCompareAttribute.cs
@@ -0,0 +1,32 @@
+//

+// OptionCompareAttribute.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//   Martin Adoue (martin@cwanet.com)

+//

+// (C) 2002 Ximian Inc.

+//

+using System;

+using System.ComponentModel;

+using System.Runtime.InteropServices;

+

+namespace Microsoft.VisualBasic.CompilerServices {

+	[MonoTODO]

+	[EditorBrowsable(EditorBrowsableState.Never)] 

+	[AttributeUsage(AttributeTargets.Parameter)] 

+	[StructLayoutAttribute(LayoutKind.Auto)] 

+	sealed public class OptionCompareAttribute : Attribute {

+		// Declarations

+		// Constructors

+		// Properties

+		// Methods

+		// Events

+		public OptionCompareAttribute()

+		{

+			//FIXME: should this do something?

+			throw new NotImplementedException(); 

+		}

+	};

+

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/OptionTextAttribute.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/OptionTextAttribute.cs
new file mode 100644
index 00000000000..97ac0cc262f
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/OptionTextAttribute.cs
@@ -0,0 +1,20 @@
+//

+// OptionTextAttribute.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic.CompilerServices {

+	[System.AttributeUsageAttribute(System.AttributeTargets.Class)] 

+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 

+	[MonoTODO]

+	sealed public class OptionTextAttribute : System.Attribute {

+		// Declarations

+		// Constructors

+		// Properties

+		// Methods

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ProjectData.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ProjectData.cs
new file mode 100644
index 00000000000..d56bbabf583
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ProjectData.cs
@@ -0,0 +1,80 @@
+//

+// ProjectData.cs

+//

+// Authors:

+//   Martin Adoue (martin@cwanet.com)

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Ximian Inc.

+//

+

+using System;

+using System.ComponentModel;

+using System.Runtime.InteropServices;

+

+namespace Microsoft.VisualBasic.CompilerServices

+{

+	/// <summary>

+	/// FIXME: Summary description for ProjectData.

+	/// </summary>

+	

+	[MonoTODO]

+	[EditorBrowsable(EditorBrowsableState.Never)]

+	[StructLayout(LayoutKind.Auto)] 

+	public class ProjectData{

+

+		private static System.Exception projectError;

+		private static int erl;

+

+		/// <summary>

+		/// FIXME: Summary description for ClearProjectError

+		/// </summary>

+		public static void ClearProjectError()

+		{

+			projectError = null;

+			erl = 0;

+		}

+

+		/// <summary>

+		/// FIXME: Summary description for SetProjectError

+		/// </summary>

+		/// <param name="ex">FIXME: Required. Summary description for ex</param>

+		[MonoTODO]

+		public static void SetProjectError(System.Exception ex)

+		{

+			SetProjectError(ex, 0);

+		}

+

+		/// <summary>

+		/// FIXME: Summary description for SetProjectError

+		/// </summary>

+		/// <param name="ex">FIXME: Required. Summary description for ex</param>

+		/// <param name="lErl">FIXME: Required. Summary description for lErl</param>

+		[MonoTODO]

+		public static void SetProjectError(System.Exception ex, int lErl)

+		{

+			projectError = ex;

+			erl = lErl;

+

+		}

+		

+		/*

+		[MonoTODO]

+		public static void EndApp()

+		{

+			//FIXME

+		}

+		*/

+

+		/*

+		[MonoTODO]

+		protected static void Finalize()

+		{

+			//FIXME

+		}

+		*/

+

+		

+

+	}

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ShortType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ShortType.cs
new file mode 100644
index 00000000000..a06e424af7c
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ShortType.cs
@@ -0,0 +1,26 @@
+//
+// ShortType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	sealed public class ShortType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		public static System.Int16 FromString (System.String Value) { return System.Int16.Parse(Value); }
+		[MonoTODO]
+		public static System.Int16 FromObject (System.Object Value) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/SingleType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/SingleType.cs
new file mode 100644
index 00000000000..134db71e4d4
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/SingleType.cs
@@ -0,0 +1,30 @@
+//
+// SingleType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class SingleType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		public static System.Single FromString (System.String Value) { return System.Single.Parse(Value); }
+		[MonoTODO]
+		public static System.Single FromString (System.String Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Single FromObject (System.Object Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Single FromObject (System.Object Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StandardModuleAttribute.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StandardModuleAttribute.cs
new file mode 100644
index 00000000000..0da5cc2b145
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StandardModuleAttribute.cs
@@ -0,0 +1,20 @@
+//

+// StandardModuleAttribute.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic.CompilerServices {

+	[System.AttributeUsageAttribute(System.AttributeTargets.Class)] 

+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 

+	[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Auto)] 

+	sealed public class StandardModuleAttribute : System.Attribute {

+		// Declarations

+		// Constructors

+		// Properties

+		// Methods

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StaticLocalInitFlag.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StaticLocalInitFlag.cs
new file mode 100644
index 00000000000..42fa6300a68
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StaticLocalInitFlag.cs
@@ -0,0 +1,20 @@
+//

+// StaticLocalInitFlag.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic.CompilerServices {

+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 

+	[System.Runtime.InteropServices.StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind.Auto)] 

+	sealed public class StaticLocalInitFlag {

+		// Declarations

+		public System.Int16 State = (System.Int16)(0);

+		// Constructors

+		// Properties

+		// Methods

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StringType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StringType.cs
new file mode 100644
index 00000000000..e4148aba258
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StringType.cs
@@ -0,0 +1,61 @@
+//
+// StringType.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class StringType {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static System.String FromBoolean (System.Boolean Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromByte (System.Byte Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromChar (System.Char Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromShort (System.Int16 Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromInteger (System.Int32 Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromLong (System.Int64 Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromSingle (System.Single Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromDouble (System.Double Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromSingle (System.Single Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromDouble (System.Double Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromDate (System.DateTime Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromDecimal (System.Decimal Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromDecimal (System.Decimal Value, System.Globalization.NumberFormatInfo NumberFormat) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String FromObject (System.Object Value) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Int32 StrCmp (System.String sLeft, System.String sRight, System.Boolean TextCompare) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean StrLike (System.String Source, System.String Pattern, Microsoft.VisualBasic.CompareMethod CompareOption) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean StrLikeBinary (System.String Source, System.String Pattern) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Boolean StrLikeText (System.String Source, System.String Pattern) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void MidStmtStr (ref System.String sDest, ref System.Int32 StartPosition, ref System.Int32 MaxInsertLength, ref System.String sInsert) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/TODOAttribute.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/TODOAttribute.cs
new file mode 100644
index 00000000000..fe572f886c7
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/TODOAttribute.cs
@@ -0,0 +1,39 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All, AllowMultiple=true)]
+	public class MonoTODOAttribute : Attribute {
+
+		private string comment;
+		
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+
+		public string Comment
+		{
+			get { return comment; }
+		}
+	}
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/Utils.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/Utils.cs
new file mode 100644
index 00000000000..6d13fa195a2
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/Utils.cs
@@ -0,0 +1,31 @@
+//
+// Utils.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic.CompilerServices 

+{
+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class Utils {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static void ThrowException (System.Int32 hr) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Object SetCultureInfo (System.Globalization.CultureInfo Culture) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Array CopyArray (System.Array arySrc, System.Array aryDest) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.String MethodToString (System.Reflection.MethodBase Method) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/MsgBoxResult.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/MsgBoxResult.cs
new file mode 100644
index 00000000000..2f2094c748b
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/MsgBoxResult.cs
@@ -0,0 +1,19 @@
+//

+// MsgBoxResult.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum MsgBoxResult : int {

+		OK = 1,

+		Cancel = 2,

+		Abort = 3,

+		Retry = 4,

+		Ignore = 5,

+		Yes = 6,

+		No = 7

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/MsgBoxStyle.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/MsgBoxStyle.cs
new file mode 100644
index 00000000000..91042bcdb93
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/MsgBoxStyle.cs
@@ -0,0 +1,32 @@
+//

+// MsgBoxStyle.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	[System.FlagsAttribute] 

+	public enum MsgBoxStyle : int {

+		ApplicationModal = 0,

+		DefaultButton1 = 0,

+		OKOnly = 0,

+		OKCancel = 1,

+		AbortRetryIgnore = 2,

+		YesNoCancel = 3,

+		YesNo = 4,

+		RetryCancel = 5,

+		Critical = 16,

+		Question = 32,

+		Exclamation = 48,

+		Information = 64,

+		DefaultButton2 = 256,

+		DefaultButton3 = 512,

+		SystemModal = 4096,

+		MsgBoxHelp = 16384,

+		MsgBoxSetForeground = 65536,

+		MsgBoxRight = 524288,

+		MsgBoxRtlReading = 1048576

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenAccess.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenAccess.cs
new file mode 100644
index 00000000000..0db6fd0ccae
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenAccess.cs
@@ -0,0 +1,16 @@
+//

+// OpenAccess.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum OpenAccess : int {

+		Read = 1,

+		Write = 2,

+		ReadWrite = 3,

+		Default = -1

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenMode.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenMode.cs
new file mode 100644
index 00000000000..4374a0bccdc
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenMode.cs
@@ -0,0 +1,17 @@
+//

+// OpenMode.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum OpenMode : int {

+		Input = 1,

+		Output = 2,

+		Random = 4,

+		Append = 8,

+		Binary = 32

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenShare.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenShare.cs
new file mode 100644
index 00000000000..02d828f8188
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/OpenShare.cs
@@ -0,0 +1,17 @@
+//

+// OpenShare.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum OpenShare : int {

+		LockReadWrite = 0,

+		LockWrite = 1,

+		LockRead = 2,

+		Shared = 3,

+		Default = -1

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/SpcInfo.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/SpcInfo.cs
new file mode 100644
index 00000000000..65b3d2bba5c
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/SpcInfo.cs
@@ -0,0 +1,20 @@
+//

+// SpcInfo.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	[System.ComponentModel.EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState.Never)] 

+	[MonoTODO]

+	public struct SpcInfo {

+		// Declarations

+		public System.Int16 Count;

+		// Constructors

+		// Properties

+		// Methods

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Strings.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Strings.cs
new file mode 100644
index 00000000000..838089f4673
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/Strings.cs
@@ -0,0 +1,1110 @@
+//

+// Strings.cs

+//

+// Authors:

+//   Martin Adoue (martin@cwanet.com)

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Ximian Inc.

+//

+

+using System;

+using System.Text;

+using System.ComponentModel;

+

+using System.Runtime.InteropServices;

+using Microsoft.VisualBasic.CompilerServices;

+

+namespace Microsoft.VisualBasic

+{

+	/// <summary>

+	/// The Strings module contains procedures used to perform string operations. 

+	/// </summary>

+

+	[StandardModule] 

+	[StructLayout(LayoutKind.Auto)] 

+	public class Strings

+	{

+		private Strings()

+		{

+			//Do nothing. Nobody should be creating this.

+		}

+

+		

+		/// <summary>

+		/// Returns an Integer value representing the character code corresponding to a character.

+		/// </summary>

+		/// <param name="String">Required. Any valid Char or String expression. If String is a String expression, only the first character of the string is used for input. If String is Nothing or contains no characters, an ArgumentException error occurs.</param>

+		[MonoTODO]

+		public static int Asc(char String) 

+		{

+			//FIXME: Check the docs, it says something about Locales, DBCS, etc.

+			throw new NotImplementedException();

+		}

+		

+

+

+		/// <summary>

+		/// Returns an Integer value representing the character code corresponding to a character.

+		/// </summary>

+		/// <param name="String">Required. Any valid Char or String expression. If String is a String expression, only the first character of the string is used for input. If String is Nothing or contains no characters, an ArgumentException error occurs.</param>

+		[MonoTODO]

+		public static int Asc(string String) 

+		{

+			if ((String == null) || (String.Length != 1))

+				throw new ArgumentException("Length of argument 'String' must be one.", "String");

+

+			//FIXME: Check the docs, it says something about Locales, DBCS, etc.

+			return (int) String.ToCharArray(0, 1)[0];

+			//why? check http://bugzilla.ximian.com/show_bug.cgi?id=23540

+		}

+

+

+		/// <summary>

+		/// Returns an Integer value representing the character code corresponding to a character.

+		/// </summary>

+		/// <param name="String">Required. Any valid Char or String expression. If String is a String expression, only the first character of the string is used for input. If String is Nothing or contains no characters, an ArgumentException error occurs.</param>

+		[MonoTODO("Needs testing")]

+		public static int AscW(char String) 

+		{

+			/*

+			 * AscW returns the Unicode code point for the input character. 

+			 * This can be 0 through 65535. The returned value is independent 

+			 * of the culture and code page settings for the current thread.

+			 */

+

+			return (int) String;

+		}

+		

+		/// <summary>

+		/// Returns an Integer value representing the character code corresponding to a character.

+		/// </summary>

+		/// <param name="String">Required. Any valid Char or String expression. If String is a String expression, only the first character of the string is used for input. If String is Nothing or contains no characters, an ArgumentException error occurs.</param>

+		[MonoTODO("Needs testing")]

+		public static int AscW(string String) 

+		{

+			/*

+			 * AscW returns the Unicode code point for the input character. 

+			 * This can be 0 through 65535. The returned value is independent 

+			 * of the culture and code page settings for the current thread.

+			 */

+			if ((String == null) || (String.Length == 0))

+				throw new ArgumentException("Length of argument 'String' must be at leasr one.", "String");

+			return (int) String.ToCharArray(0, 1)[0];

+

+		}

+

+		/// <summary>

+		/// Returns the character associated with the specified character code.

+		/// </summary>

+		/// <param name="CharCode">Required. An Integer expression representing the code point, or character code, for the character. If CharCode is outside the range -32768 through 65535, an ArgumentException error occurs.</param>

+		[MonoTODO]

+		public static char Chr(int CharCode) 

+		{

+

+			// According to docs (ms-help://MS.VSCC/MS.MSDNVS/vblr7/html/vafctchr.htm)

+			// Chr and ChrW should throw ArgumentException if ((CharCode < -32768) || (CharCode > 65535))

+			// Instead, VB.net throws an OverflowException. I'm following the implementation

+			// instead of the docs. 

+

+			if ((CharCode < -32768) || (CharCode > 65535))

+				throw new OverflowException("Value was either too large or too small for a character.");

+

+			//FIXME: Check the docs, it says something about Locales, DBCS, etc.

+			return System.Convert.ToChar(CharCode);

+		}

+

+		/// <summary>

+		/// Returns the character associated with the specified character code.

+		/// </summary>

+		/// <param name="CharCode">Required. An Integer expression representing the code point, or character code, for the character. If CharCode is outside the range -32768 through 65535, an ArgumentException error occurs.</param>

+		[MonoTODO("Needs testing")]

+		public static char ChrW(int CharCode ) 

+		{

+			/*

+			 * According to docs ()

+			 * Chr and ChrW should throw ArgumentException if ((CharCode < -32768) || (CharCode > 65535))

+			 * Instead, VB.net throws an OverflowException. I'm following the implementation

+			 * instead of the docs

+			 */

+			if ((CharCode < -32768) || (CharCode > 65535))

+				throw new OverflowException("Value was either too large or too small for a character.");

+

+			/*

+			 * ChrW takes CharCode as a Unicode code point. The range is independent of the 

+			 * culture and code page settings for the current thread. Values from -32768 through 

+			 * -1 are treated the same as values in the range +32768 through +65535.

+			 */

+			if (CharCode < 0)

+				CharCode += 0x10000;

+

+			return System.Convert.ToChar(CharCode);

+		}

+

+		/// <summary>

+		/// Returns a zero-based array containing a subset of a String array based on specified filter criteria.

+		/// </summary>

+		/// <param name="Source">Required. One-dimensional array of strings to be searched.</param>

+		/// <param name="Match">Required. String to search for.</param>

+		/// <param name="Include">Optional. Boolean value indicating whether to return substrings that include or exclude Match. If Include is True, the Filter function returns the subset of the array that contains Match as a substring. If Include is False, the Filter function returns the subset of the array that does not contain Match as a substring.</param>

+		/// <param name="Compare">Optional. Numeric value indicating the kind of string comparison to use. See Settings for values.</param>

+		[MonoTODO("Needs testing")]

+		public static string[] Filter(object[] Source, 

+			string Match, 

+			[Optional]

+			[DefaultValue(true)] 

+			bool Include,

+			[OptionCompare] [Optional]

+			[DefaultValue(CompareMethod.Binary)] 

+			CompareMethod Compare)

+		{

+

+			if (Source == null)

+				throw new ArgumentException("Argument 'Source' can not be null.", "Source");

+			if (Source.Rank > 1)

+				throw new ArgumentException("Argument 'Source' can have only one dimension.", "Source");

+

+			string[] strings;

+			strings = new string[Source.Length];

+

+			Source.CopyTo(strings, 0);

+			return Filter(strings, Match, Include, Compare);

+

+		}

+

+		/// <summary>

+		/// Returns a zero-based array containing a subset of a String array based on specified filter criteria.

+		/// </summary>

+		/// <param name="Source">Required. One-dimensional array of strings to be searched.</param>

+		/// <param name="Match">Required. String to search for.</param>

+		/// <param name="Include">Optional. Boolean value indicating whether to return substrings that include or exclude Match. If Include is True, the Filter function returns the subset of the array that contains Match as a substring. If Include is False, the Filter function returns the subset of the array that does not contain Match as a substring.</param>

+		/// <param name="Compare">Optional. Numeric value indicating the kind of string comparison to use. See Settings for values.</param>

+		public static string[] Filter(string[] Source, 

+			string Match, 

+			[Optional]

+			[DefaultValue(true)] 

+			bool Include,

+			[Optional]

+			[DefaultValue(CompareMethod.Binary)] 

+			CompareMethod Compare)

+		{

+

+			if (Source == null)

+				throw new ArgumentException("Argument 'Source' can not be null.", "Source");

+			if (Source.Rank > 1)

+				throw new ArgumentException("Argument 'Source' can have only one dimension.", "Source");

+

+			/*

+			 * Well, I don't like it either. But I figured that two iterations

+			 * on the array would be better than many aloocations. Besides, this

+			 * way I can isolate the special cases.

+			 * I'd love to hear from a different approach.

+			 */

+

+			int count = Source.Length;

+			bool[] matches = new bool[count];

+			int matchesCount = 0;

+

+			for (int i = 0; i < count; i++)

+			{

+				if (InStr(1, Match, Source[i], Compare) != 0)

+				{

+					//found one more

+					matches[i] = true;

+					matchesCount ++;

+				}

+				else

+				{

+					matches[i] = false;

+				}

+			}

+

+			if (matchesCount == 0)

+			{

+				if (Include)

+					return new string[0];

+				else

+					return Source;

+			}

+			else

+			{

+				if (matchesCount == count)

+				{

+					if (Include)

+						return Source;

+					else

+						return new string[0];

+				}

+				else

+				{

+					string[] ret;

+					int j = 0;

+					if (Include)

+						ret = new string [matchesCount];

+					else

+						ret = new string [count - matchesCount];

+

+					for (int i=0; i < count; i++)

+					{

+						if ((matches[i] && Include) || !(matches[i] || Include))

+						{

+							ret[j] = Source[i];

+							j++;

+						}

+					}

+					return ret;

+				}

+			}

+		}

+

+		/// <summary>

+		/// Returns a string formatted according to instructions contained in a format String expression.

+		/// </summary>

+		/// <param name="Expression">Required. Any valid expression.</param>

+		/// <param name="Style">Optional. A valid named or user-defined format String expression. </param>

+		[MonoTODO]

+		public static string Format(object Expression, 

+			[Optional]

+			[DefaultValue("")] 

+			string Style)

+		{

+			//FIXME

+			throw new NotImplementedException();

+		}

+

+

+		/// <summary>

+		/// Returns an expression formatted as a currency value using the currency symbol defined in the system control panel.

+		/// </summary>

+		/// <param name="Expression">Required. Expression to be formatted.</param>

+		/// <param name="NumDigitsAfterDecimal">Optional. Numeric value indicating how many places are displayed to the right of the decimal. Default value is –1, which indicates that the computer's regional settings are used.</param>

+		/// <param name="IncludeLeadingDigit">Optional. Tristate enumeration that indicates whether or not a leading zero is displayed for fractional values. See Settings for values.</param>

+		/// <param name="UseParensForNegativeNumbers">Optional. Tristate enumeration that indicates whether or not to place negative values within parentheses. See Settings for values.</param>

+		/// <param name="GroupDigits">Optional. Tristate enumeration that indicates whether or not numbers are grouped using the group delimiter specified in the computer's regional settings. See Settings for values.</param>

+		[MonoTODO]

+		public static string FormatCurrency(object Expression, 

+			[Optional]

+			[DefaultValue(-1)] 

+			int NumDigitsAfterDecimal, 

+			[Optional]

+			[DefaultValue(TriState.UseDefault)] 

+			TriState IncludeLeadingDigit, 

+			[Optional]

+			[DefaultValue(TriState.UseDefault)] 

+			TriState UseParensForNegativeNumbers, 

+			[Optional]

+			[DefaultValue(TriState.UseDefault)] 

+			TriState GroupDigits)

+		{

+			//FIXME

+			throw new NotImplementedException();

+			//throws InvalidCastException

+			//throws ArgumentException

+		}

+

+		/// <summary>

+		/// Returns an expression formatted as a date or time.

+		/// </summary>

+		/// <param name="Expression">Required. Date expression to be formatted. </param>

+		/// <param name="NamedFormat">Optional. Numeric value that indicates the date or time format used. If omitted, GeneralDate is used.</param>

+		[MonoTODO]

+		public static string FormatDateTime(DateTime Expression, 

+			[Optional]

+			[DefaultValue(DateFormat.GeneralDate)] 

+			DateFormat NamedFormat)

+		{

+			switch(NamedFormat)

+			{

+				case DateFormat.GeneralDate:

+					//FIXME: WTF should I do with it?

+					throw new NotImplementedException(); 	

+				case DateFormat.LongDate:  

+					return Expression.ToLongDateString();

+				case DateFormat.ShortDate:

+					return Expression.ToShortDateString();

+				case DateFormat.LongTime:

+					return Expression.ToLongTimeString();

+				case DateFormat.ShortTime:

+					return Expression.ToShortTimeString();

+				default:

+					throw new ArgumentException("Argument 'NamedFormat' must be a member of DateFormat", "NamedFormat");

+			}

+		}

+

+		/// <summary>

+		/// Returns an expression formatted as a number.

+		/// </summary>

+		/// <param name="Expression">Required. Expression to be formatted.</param>

+		/// <param name="NumDigitsAfterDecimal">Optional. Numeric value indicating how many places are displayed to the right of the decimal. Default value is –1, which indicates that the computer's regional settings are used.</param>

+		/// <param name="IncludeLeadingDigit">Optional. Tristate enumeration that indicates whether or not a leading zero is displayed for fractional values. See Settings for values.</param>

+		/// <param name="UseParensForNegativeNumbers">Optional. Tristate enumeration that indicates whether or not to place negative values within parentheses. See Settings for values.</param>

+		/// <param name="GroupDigits">Optional. Tristate enumeration that indicates whether or not numbers are grouped using the group delimiter specified in the computer's regional settings. See Settings for values.</param>

+		[MonoTODO]

+		public static string FormatNumber(object Expression, 

+			[Optional]

+			[DefaultValue(-1)] 

+			int NumDigitsAfterDecimal, 

+			[Optional]

+			[DefaultValue(TriState.UseDefault)] 

+			TriState IncludeLeadingDigit, 

+			[Optional]

+			[DefaultValue(TriState.UseDefault)] 

+			TriState UseParensForNegativeNumbers, 

+			[Optional]

+			[DefaultValue(TriState.UseDefault)] 

+			TriState GroupDigits)

+		{

+			//FIXME

+			throw new NotImplementedException();

+			//throws InvalidCastException

+		}

+

+		/// <summary>

+		/// Returns an expression formatted as a percentage (that is, multiplied by 100) with a trailing % character.

+		/// </summary>

+		/// <param name="Expression">Required. Expression to be formatted.</param>

+		/// <param name="NumDigitsAfterDecimal">Optional. Numeric value indicating how many places are displayed to the right of the decimal. Default value is –1, which indicates that the computer's regional settings are used.</param>

+		/// <param name="IncludeLeadingDigit">Optional. Tristate enumeration that indicates whether or not a leading zero is displayed for fractional values. See Settings for values.</param>

+		/// <param name="UseParensForNegativeNumbers">Optional. Tristate enumeration that indicates whether or not to place negative values within parentheses. See Settings for values.</param>

+		/// <param name="GroupDigits">Optional. Tristate enumeration that indicates whether or not numbers are grouped using the group delimiter specified in the computer's regional settings. See Settings for values.</param>

+		[MonoTODO]

+		public static string FormatPercent(object Expression, 

+			[Optional]

+			[DefaultValue(-1)] 

+			int NumDigitsAfterDecimal, 

+			[Optional]

+			[DefaultValue(TriState.UseDefault)] 

+			TriState IncludeLeadingDigit, 

+			[Optional]

+			[DefaultValue(TriState.UseDefault)] 

+			TriState UseParensForNegativeNumbers, 

+			[Optional]

+			[DefaultValue(TriState.UseDefault)] 

+			TriState GroupDigits)

+		{

+			//FIXME

+			throw new NotImplementedException();

+			//throws InvalidCastException

+		}

+

+		/// <summary>

+		/// Returns a Char value representing the character from the specified index in the supplied string.

+		/// </summary>

+		/// <param name="Str">Required. Any valid String expression.</param>

+		/// <param name="Index">Required. Integer expression. The (1-based) index of the character in Str to be returned.</param>

+		[MonoTODO("Needs testing")]

+		public static char GetChar(string Str, 

+			int Index)

+		{

+

+			if ((Str == null) || (Str.Length == 0))

+				throw new ArgumentException("Length of argument 'Str' must be greater than zero.", "Sre");

+			if (Index < 1) 

+				throw new ArgumentException("Argument 'Index' must be greater than or equal to 1.", "Index");

+			if (Index > Str.Length)

+				throw new ArgumentException("Argument 'Index' must be less than or equal to the length of argument 'String'.", "Index");

+

+			return Str.ToCharArray(Index -1, 1)[0];

+		}

+

+		

+		/// <summary>

+		/// Returns an integer specifying the start position of the first occurrence of one string within another.

+		/// </summary>

+		/// <param name="Start">Required. Numeric expression that sets the starting position for each search. If omitted, search begins at the first character position. The start index is 1 based.</param>

+		/// <param name="String1">Required. String expression being searched.</param>

+		/// <param name="String2">Required. String expression sought.</param>

+		/// <param name="Compare">Optional. Specifies the type of string comparison. If Compare is omitted, the Option Compare setting determines the type of comparison. Specify a valid LCID (LocaleID) to use locale-specific rules in the comparison. </param>

+		[MonoTODO("Needs testing")]

+		public static int InStr(int Start, 

+			string String1, 

+			string String2, 

+			[OptionCompare]

+			[Optional]

+			[DefaultValue(CompareMethod.Binary)] 

+			CompareMethod Compare)

+		{

+			if (Start < 1)

+				throw new ArgumentException("Argument 'Start' must be non-negative.", "Start");

+

+			/* 

+			 * FIXME: ms-help://MS.VSCC/MS.MSDNVS/vblr7/html/vafctinstr.htm

+			 * If Compare is omitted, the Option Compare setting determines the type of comparison. Specify 

+			 * a valid LCID (LocaleID) to use locale-specific rules in the comparison.

+			 * How do I do this?

+			 */

+

+			/*

+			 * If									InStr returns 

+			 *

+			 * String1 is zero length or Nothing	0 

+			 * String2 is zero length or Nothing	start 

+			 * String2 is not found					0 

+			 * String2 is found within String1		Position where match begins 

+			 * Start > String2						0 

+			 */

+

+			//FIXME: someone with a non US setup should test this.

+

+			switch (Compare)

+			{

+				case CompareMethod.Text:

+					return System.Globalization.CultureInfo.CurrentCulture.CompareInfo.IndexOf(String2, String1, Start - 1) + 1;

+

+				case CompareMethod.Binary:

+					return String2.IndexOf(String1, Start - 1) + 1;

+				default:

+					throw new System.ArgumentException("Argument 'Compare' must be CompareMethod.Binary or CompareMethod.Text.", "Compare");

+			}

+

+

+		}

+

+		/// <summary>

+		/// Returns the position of the first occurrence of one string within another, starting from the right side of the string.

+		/// </summary>

+		/// <param name="StringCheck">Required. String expression being searched.</param>

+		/// <param name="StringMatch">Required. String expression being searched for.</param>

+		/// <param name="Start">Optional. Numeric expression that sets the one-based starting position for each search, starting from the left side of the string. If Start is omitted, –1 is used, which means that the search begins at the last character position. Search then proceeds from right to left.</param>

+		/// <param name="Compare">Optional. Numeric value indicating the kind of comparison to use when evaluating substrings. If omitted, a binary comparison is performed. See Settings for values.</param>

+		[MonoTODO]

+		public static int InStrRev(string StringCheck, 

+			string StringMatch, 

+			string String2, 

+			[Optional]

+			[DefaultValue(-1)] 

+			int Start,

+			[OptionCompare]  

+			[Optional]

+			[DefaultValue(CompareMethod.Binary)] 

+			CompareMethod Compare)

+		{

+			if ((Start == 0) || (Start < -1))

+				throw new ArgumentException("Argument 'Start' must be greater than 0 or equal to -1", "Start");

+ 

+			//FIXME: Use LastIndexOf()

+			throw new NotImplementedException();

+		}

+

+		/// <summary>

+		/// Returns a string created by joining a number of substrings contained in an array.

+		/// </summary>

+		/// <param name="SourceArray">Required. One-dimensional array containing substrings to be joined.</param>

+		/// <param name="Delimiter">Optional. String used to separate the substrings in the returned string. If omitted, the space character (" ") is used. If Delimiter is a zero-length string (""), all items in the list are concatenated with no delimiters.</param>

+		[MonoTODO("Needs testing")]

+		public static string Join(string[] SourceArray, 

+			[Optional]

+			[DefaultValue(" ")] 

+			string Delimiter)

+		{

+			if (SourceArray == null)

+				throw new ArgumentException("Argument 'SourceArray' can not be null.", "SourceArray");

+			if (SourceArray.Rank > 1)

+				throw new ArgumentException("Argument 'SourceArray' can have only one dimension.", "SourceArray");

+

+			return string.Join(Delimiter, SourceArray);

+		}

+		/// <summary>

+		/// Returns a string created by joining a number of substrings contained in an array.

+		/// </summary>

+		/// <param name="SourceArray">Required. One-dimensional array containing substrings to be joined.</param>

+		/// <param name="Delimiter">Optional. String used to separate the substrings in the returned string. If omitted, the space character (" ") is used. If Delimiter is a zero-length string (""), all items in the list are concatenated with no delimiters.</param>

+		[MonoTODO("Needs testing")]

+		public static string Join(object[] SourceArray, 

+			[Optional]

+			[DefaultValue(" ")] 

+			string Delimiter)

+		{

+

+			if (SourceArray == null)

+				throw new ArgumentException("Argument 'SourceArray' can not be null.", "SourceArray");

+			if (SourceArray.Rank > 1)

+				throw new ArgumentException("Argument 'SourceArray' can have only one dimension.", "SourceArray");

+

+			string[] dest;

+			dest = new string[SourceArray.Length];

+

+			SourceArray.CopyTo(dest, 0);

+			return string.Join(Delimiter, dest);

+		}

+

+		/// <summary>

+		/// Returns a string or character converted to lowercase.

+		/// </summary>

+		/// <param name="Value">Required. Any valid String or Char expression.</param>

+		[MonoTODO("Needs testing")]

+		public static char LCase(char Value) 

+		{

+			return char.ToLower(Value);

+		}

+

+		/// <summary>

+		/// Returns a string or character converted to lowercase.

+		/// </summary>

+		/// <param name="Value">Required. Any valid String or Char expression.</param>

+		[MonoTODO("Needs testing")]

+		public static string LCase(string Value) 

+		{

+			if ((Value == null) || (Value.Length == 0))

+				return String.Empty; // VB.net does this.

+

+			return Value.ToLower();

+		}

+

+		

+		/// <summary>

+		/// Returns a string containing a specified number of characters from the left side of a string.

+		/// </summary>

+		/// <param name="Str">Required. String expression from which the leftmost characters are returned.</param>

+		/// <param name="Length">Required. Integer expression. Numeric expression indicating how many characters to return. If 0, a zero-length string ("") is returned. If greater than or equal to the number of characters in Str, the entire string is returned.</param>

+		[MonoTODO]

+		public static string Left(string Str, 

+			int Length) 

+		{

+			if (Length < 0)

+				throw new ArgumentException("Argument 'Length' must be non-negative.", "Length");

+			if ((Str == null) || (Str.Length == 0))

+				return String.Empty; // VB.net does this.

+

+			return Str.Substring(0, Length);

+		}

+

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(bool Expression) 

+		{

+			return 2; //sizeof(bool)

+		}

+

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(byte Expression) 

+		{

+			return 1; //sizeof(byte)

+		}

+		

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(char Expression) 

+		{

+			return 2; //sizeof(char)

+		}

+		

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(double Expression) 

+		{

+			return 8; //sizeof(double)

+		}

+		

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(int Expression) 

+		{

+			return 4; //sizeof(int)

+		}

+		

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(long Expression) 

+		{

+			return 8; //sizeof(long)

+		}

+

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO]

+		public static int Len(object Expression) 

+		{

+			 // FIXME: 

+			 // With user-defined types and Object variables, the Len function returns the size as it will 

+			 // be written to the file. If an Object contains a String, it will return the length of the string. 

+			 // If an Object contains any other type, it will return the size of the object as it will be written 

+			 // to the file.

+			throw new NotImplementedException(); 

+		}

+		

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(short Expression) 

+		{

+			return 2; //sizeof(short)

+		}

+		

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(Single Expression) 

+		{

+			return 4; //sizeof(Single)

+		}

+		

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(string Expression) 

+		{

+			return Expression.Length; //length of the string

+		}

+		

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(DateTime Expression) 

+		{

+			return 8; //sizeof(DateTime)

+		}

+		

+		/// <summary>

+		/// Returns an integer containing either the number of characters in a string or the number of bytes required to store a variable.

+		/// </summary>

+		/// <param name="Expression">Any valid String expression or variable name. If Expression is of type Object, the Len function returns the size as it will be written to the file.</param>

+		[MonoTODO("Needs testing")]

+		public static int Len(decimal Expression) 

+		{

+			return 16; //sizeof(decimal)

+		}

+

+		/// <summary>

+		/// Returns a left-aligned string containing the specified string adjusted to the specified length.

+		/// </summary>

+		/// <param name="Source">Required. String expression. Name of string variable.</param>

+		/// <param name="Length">Required. Integer expression. Length of returned string.</param>

+		[MonoTODO("Needs testing")]

+		public static string LSet(string Source, 

+			int Length) 

+		{

+			if (Length < 0)

+				throw new ArgumentOutOfRangeException("Length", "Length must be must be non-negative.");

+			if (Source == null)

+				Source = String.Empty;

+

+			return Source.PadRight(Length);

+		}

+

+		/// <summary>

+		/// Returns a string containing a copy of a specified string with no leading spaces.

+		/// </summary>

+		/// <param name="Str">Required. Any valid String expression.</param>

+		[MonoTODO("Needs testing")]

+		public static string LTrim(string Str) 

+		{

+			if ((Str == null) || (Str.Length == 0))

+				return String.Empty; // VB.net does this.

+

+			Str.TrimStart(null);

+			return Str;

+		}

+

+		/// <summary>

+		/// Returns a string containing a copy of a specified string with no trailing spaces.

+		/// </summary>

+		/// <param name="Str">Required. Any valid String expression.</param>

+		[MonoTODO("Needs testing")]

+		public static string RTrim(string Str) 

+		{

+			if ((Str == null) || (Str.Length == 0))

+				return String.Empty; // VB.net does this.

+

+			Str.TrimEnd(null);

+			return Str;

+		}

+	

+		/// <summary>

+		/// Returns a string containing a copy of a specified string with no leading or trailing spaces.

+		/// </summary>

+		/// <param name="Str">Required. Any valid String expression.</param>

+		[MonoTODO("Needs testing")]

+		public static string Trim(string Str) 

+		{

+			if ((Str == null) || (Str.Length == 0))

+				return String.Empty; // VB.net does this.

+			

+			Str.Trim();

+			return Str;

+		}

+

+		/// <summary>

+		/// Returns a string containing a specified number of characters from a string.

+		/// </summary>

+		/// <param name="Str">Required. String expression from which characters are returned.</param>

+		/// <param name="Start">Required. Integer expression. Character position in Str at which the part to be taken starts. If Start is greater than the number of characters in Str, the Mid function returns a zero-length string (""). Start is one based.</param>

+		/// <param name="Length">Required Integer expression. Number of characters to return. If there are fewer than Length characters in the text (including the character at position Start), all characters from the start position to the end of the string are returned.</param>

+		[MonoTODO("Verify if this is the correct behaviour for Length==0...[Rafael]")]

+		public static string Mid(string Str, 

+			int Start, 

+			int Length)

+		{

+

+			if (Length < 0)

+				throw new System.ArgumentException("Argument 'Length' must be greater or equal to zero.", "Length");

+			if (Start <= 0)

+				throw new System.ArgumentException("Argument 'Start' must be greater than zero.", "Start");

+			if ((Str == null) || (Str.Length == 0))

+				return String.Empty; // VB.net does this.

+

+			if ((Length == 0) || (Start > Str.Length))

+				return String.Empty;

+

+			if (Length > (Str.Length - Start))

+				Length = (Str.Length - Start) + 1;

+

+			return Str.Substring(Start - 1, Length);

+

+		}

+

+		/// <summary>

+		/// Returns a string containing all characters from a string beyond an start point.

+		/// </summary>

+		/// <param name="Str">Required. String expression from which characters are returned.</param>

+		/// <param name="Start">Required. Integer expression. Character position in Str at which the part to be taken starts. If Start is greater than the number of characters in Str, the Mid function returns a zero-length string (""). Start is one based.</param>

+		[MonoTODO("Needs testing")]

+		public static string Mid (string Str, int Start) 

+		{

+			if (Start <= 0)

+				throw new System.ArgumentException("Argument 'Start' must be greater than zero.", "Start");

+			if ((Str == null) || (Str.Length == 0))

+				return String.Empty; // VB.net does this.

+

+			if (Start > Str.Length)

+				return String.Empty;

+

+			return Str.Substring(Start - 1);

+		}

+

+		/// <summary>

+		/// Returns a string in which a specified substring has been replaced with another substring a specified number of times.

+		/// </summary>

+		/// <param name="Expression">Required. String expression containing substring to replace.</param>

+		/// <param name="Find">Required. Substring being searched for.</param>

+		/// <param name="Replacement">Required. Replacement substring.</param>

+		/// <param name="Start">Optional. Position within Expression where substring search is to begin. If omitted, 1 is assumed.</param>

+		/// <param name="Count">Optional. Number of substring substitutions to perform. If omitted, the default value is –1, which means make all possible substitutions.</param>

+		/// <param name="Compare">Optional. Numeric value indicating the kind of comparison to use when evaluating substrings. See Settings for values.</param>

+		[MonoTODO("Needs testing")]

+		public static string Replace(string Expression, 

+			string Find, 

+			string Replacement, 

+			[Optional]

+			[DefaultValue(1)] 

+			int Start,

+			[Optional]

+			[DefaultValue(-1)] 

+			int Count,

+			[OptionCompare] 

+			[Optional]

+			[DefaultValue(CompareMethod.Binary)] 

+			CompareMethod Compare)

+		{

+

+			if (Count < -1)

+				throw new ArgumentException("Argument 'Count' must be greater than or equal to -1.", "Count");

+			if (Start <= 0)

+				throw new ArgumentException("Argument 'Start' must be greater than zero.", "Start");

+

+			if ((Expression == null) || (Expression.Length == 0))

+				return String.Empty; // VB.net does this.

+			if ((Find == null) || (Find.Length == 0))

+				return Expression; // VB.net does this.

+			if (Replacement == null)

+				Replacement = String.Empty; // VB.net does this.

+

+			return Expression.Replace(Find, Replacement);

+		}

+ 

+		/// <summary>

+		/// Returns a string containing a specified number of characters from the right side of a string.

+		/// </summary>

+		/// <param name="Str">Required. String expression from which the rightmost characters are returned.</param>

+		/// <param name="Length">Required. Integer. Numeric expression indicating how many characters to return. If 0, a zero-length string ("") is returned. If greater than or equal to the number of characters in Str, the entire string is returned.</param>

+		[MonoTODO("Needs testing")]

+		public static string Right(string Str, 

+			int Length) 

+		{

+			if (Length < 0)

+				throw new ArgumentException("Argument 'Length' must be greater or equal to zero.", "Length");

+

+			//FIXME

+			throw new NotImplementedException(); 

+		}

+

+		/// <summary>

+		/// Returns a right-aligned string containing the specified string adjusted to the specified length.

+		/// </summary>

+		/// <param name="Source">Required. String expression. Name of string variable.</param>

+		/// <param name="Length">Required. Integer expression. Length of returned string.</param>

+		[MonoTODO("Needs testing")]

+		public static string RSet(string Source, 

+			int Length) 

+		{

+		

+			if (Source == null)

+				Source = String.Empty;

+			if (Length < 0)

+				throw new ArgumentOutOfRangeException("Length", "Length must be non-negative.");

+

+			return Source.PadLeft(Length);

+		}

+

+		/// <summary>

+		/// Returns a string consisting of the specified number of spaces.

+		/// </summary>

+		/// <param name="Number">Required. Integer expression. The number of spaces you want in the string.</param>

+		[MonoTODO("Needs testing")]

+		public static string Space(int Number) 

+		{

+			if (Number < 0)

+				throw new ArgumentException("Argument 'Number' must be greater or equal to zero.", "Number");

+

+			return new string((char) ' ', Number);

+		}

+

+		/// <summary>

+		/// Returns a zero-based, one-dimensional array containing a specified number of substrings.

+		/// </summary>

+		/// <param name="Expression">Required. String expression containing substrings and delimiters. If Expression is a zero-length string (""), the Split function returns an array with no elements and no data.</param>

+		/// <param name="Delimiter">Optional. Single character used to identify substring limits. If Delimiter is omitted, the space character (" ") is assumed to be the delimiter. If Delimiter is a zero-length string, a single-element array containing the entire Expression string is returned.</param>

+		/// <param name="Limit">Optional. Number of substrings to be returned; the default, –1, indicates that all substrings are returned.</param>

+		/// <param name="Compare">Optional. Numeric value indicating the comparison to use when evaluating substrings. See Settings for values.</param>

+		[MonoTODO]

+		public static string[] Split(string Expression, 

+			[Optional]

+			[DefaultValue(" ")] 

+			string Delimiter,

+			[Optional]

+			[DefaultValue(-1)] 

+			int Limit,

+			[OptionCompare] 

+			[Optional]

+			[DefaultValue(CompareMethod.Binary)] 

+			CompareMethod Compare)

+		{

+

+			

+			if (Expression == null)

+				return new string[0];

+			if ((Delimiter == null) || (Delimiter.Length == 0))

+			{

+				string [] ret = new string[0];

+				ret[0] = Expression;

+				return ret;

+			}

+			if (Limit == 0)

+				Limit = 1; // VB.net does this. I call it a bug.

+

+			/*

+			 * FIXME: VB.net does NOT do this. It simply fails with AritmethicException.

+			 * What should I do?

+			 */

+			if (Limit < -1)

+				throw new ArgumentOutOfRangeException("Limit", "Argument 'Limit' must be -1 or greater than zero.");

+

+			switch (Compare)

+			{

+				case CompareMethod.Binary:

+					return Expression.Split(Delimiter.ToCharArray(0, 1), Limit);

+				case CompareMethod.Text:

+					//FIXME

+					throw new NotImplementedException();

+				default:

+					throw new System.ArgumentException("Argument 'Compare' must be CompareMethod.Binary or CompareMethod.Text.", "Compare");

+			}

+

+			

+		}

+

+		/// <summary>

+		/// Returns -1, 0, or 1, based on the result of a string comparison. 

+		/// </summary>

+		/// <param name="String1">Required. Any valid String expression.</param>

+		/// <param name="String2">Required. Any valid String expression.</param>

+		/// <param name="Compare">Optional. Specifies the type of string comparison. If compare is omitted, the Option Compare setting determines the type of comparison.</param>

+		[MonoTODO("Needs testing")]

+		public static int StrComp(string String1, 

+			string String2,

+			[OptionCompare] 

+			[Optional]

+			[DefaultValue(CompareMethod.Binary)] 

+			CompareMethod Compare)

+		{

+			

+			switch (Compare)

+			{

+				case CompareMethod.Binary:

+					return string.Compare(String1, String2, true);

+				case CompareMethod.Text:

+					//FIXME: someone with a non US setup should test this.

+					return System.Globalization.CultureInfo.CurrentCulture.CompareInfo.Compare(String1, String2);

+				default:

+					throw new System.ArgumentException("Argument 'Compare' must be CompareMethod.Binary or CompareMethod.Text", "Compare");

+			}

+

+		}

+

+		/// <summary>

+		/// Returns a string converted as specified.

+		/// </summary>

+		/// <param name="Str">Required. String expression to be converted.</param>

+		/// <param name="Conversion">Required. VbStrConv member. The enumeration value specifying the type of conversion to perform. </param>

+		/// <param name="LocaleID">Optional. The LocaleID value, if different from the system LocaleID value. (The system LocaleID value is the default.)</param>

+		[MonoTODO("Not impemented")]

+		public static string StrConv (string str, 

+			VbStrConv Conversion, 

+			[Optional]

+			[DefaultValue(0)]

+			int LocaleID)

+		{

+			//FIXME

+			throw new NotImplementedException(); 

+			//throws ArgumentException

+		}

+

+		/// <summary>

+		/// Returns a string or object consisting of the specified character repeated the specified number of times.

+		/// </summary>

+		/// <param name="Number">Required. Integer expression. The length to the string to be returned.</param>

+		/// <param name="Character">Required. Any valid Char, String, or Object expression. Only the first character of the expression will be used. If Character is of type Object, it must contain either a Char or a String value.</param>

+		[MonoTODO("Needs testing")]

+		public static string StrDup(int Number, 

+			char Character)

+		{

+			if (Number < 0)

+				throw new ArgumentException("Argument 'Number' must be non-negative.", "Number");

+

+			return new string(Character, Number);

+		}

+		/// <summary>

+		/// Returns a string or object consisting of the specified character repeated the specified number of times.

+		/// </summary>

+		/// <param name="Number">Required. Integer expression. The length to the string to be returned.</param>

+		/// <param name="Character">Required. Any valid Char, String, or Object expression. Only the first character of the expression will be used. If Character is of type Object, it must contain either a Char or a String value.</param>

+		[MonoTODO("Needs testing")]

+		public static string StrDup(int Number, 

+			string Character)

+		{

+			if (Number < 0)

+				throw new ArgumentException("Argument 'Number' must be greater or equal to zero.", "Number");

+			if ((Character == null) || (Character.Length == 0))

+				throw new ArgumentNullException("Character", "Length of argument 'Character' must be greater than zero.");

+

+			return new string(Character.ToCharArray()[0], Number);

+		}

+

+		/// <summary>

+		/// Returns a string or object consisting of the specified character repeated the specified number of times.

+		/// </summary>

+		/// <param name="Number">Required. Integer expression. The length to the string to be returned.</param>

+		/// <param name="Character">Required. Any valid Char, String, or Object expression. Only the first character of the expression will be used. If Character is of type Object, it must contain either a Char or a String value.</param>

+		[MonoTODO("Needs testing")]

+		public static object StrDup(int Number, 

+			object Character)

+		{

+			if (Number < 0)

+				throw new ArgumentException("Argument 'Number' must be non-negative.", "Number");

+			

+			if (Character is string)

+			{

+				string sCharacter = (string) Character;

+				if ((sCharacter == null) || (sCharacter.Length == 0))

+					throw new ArgumentNullException("Character", "Length of argument 'Character' must be greater than zero.");

+

+				return StrDup(Number, sCharacter);

+			}

+			else

+			{

+				if (Character is char)

+				{

+					return StrDup(Number, (char) Character);

+				}

+				else

+				{

+					// "If Character is of type Object, it must contain either a Char or a String value."

+					throw new ArgumentException("Argument 'Character' is not a valid value.", "Character");

+				}

+			}

+		}

+

+		/// <summary>

+		/// Returns a string in which the character order of a specified string is reversed.

+		/// </summary>

+		/// <param name="Expression">Required. String expression whose characters are to be reversed. If Expression is a zero-length string (""), a zero-length string is returned.</param>

+		public static string StrReverse(string Expression)

+		{

+

+			if (Expression == null)

+				return String.Empty; // "If Expression is a zero-length string (""), a zero-length string is returned."

+

+			int count = Expression.Length;

+

+			if (count == 0)

+				return String.Empty; // "If Expression is a zero-length string (""), a zero-length string is returned."

+

+			/*

+			 * This would be much faster if I had access to the internal array. 

+			 * I'd just reverse the array. Maybe as strings are inmutable in .net (is this true in Mono?)

+			 * it'll be the same. Comments?

+			 */

+			char[] chars = new char[count - 1];

+			chars = Expression.ToCharArray();

+

+			System.Array.Reverse (chars);

+

+			return new string(chars);

+

+		}

+

+		/// <summary>

+		/// Returns a string or character containing the specified string converted to uppercase.

+		/// </summary>

+		/// <param name="Value">Required. Any valid String or Char expression.</param>

+		public static char UCase(char Value) 

+		{

+			return char.ToUpper(Value);

+		}

+

+		/// <summary>

+		/// Returns a string or character containing the specified string converted to uppercase.

+		/// </summary>

+		/// <param name="Value">Required. Any valid String or Char expression.</param>

+		public static string UCase(string Value) 

+		{

+			if ((Value == null) || (Value.Length == 0))

+				return String.Empty; // VB.net does this. 

+

+			return Value.ToUpper();

+		}

+

+

+

+	}

+

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TODOAttribute.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TODOAttribute.cs
new file mode 100644
index 00000000000..a38969af212
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TODOAttribute.cs
@@ -0,0 +1,39 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace Microsoft.VisualBasic {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All, AllowMultiple=true)]
+	public class MonoTODOAttribute : Attribute {
+
+		private string comment;
+		
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+
+		public string Comment
+		{
+			get { return comment; }
+		}
+	}
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TabInfo.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TabInfo.cs
new file mode 100644
index 00000000000..d14dd2f0b03
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TabInfo.cs
@@ -0,0 +1,23 @@
+//

+// TabInfo.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+using System.Runtime.InteropServices;

+using System.ComponentModel;

+

+namespace Microsoft.VisualBasic {

+	[EditorBrowsable(EditorBrowsableState.Never)] 

+	[MonoTODO]

+	public struct TabInfo {

+		// Declarations

+		public System.Int16 Column;

+		// Constructors

+		// Properties

+		// Methods

+		// Events

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TriState.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TriState.cs
new file mode 100644
index 00000000000..9773ea3552e
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/TriState.cs
@@ -0,0 +1,19 @@
+//

+// TriState.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	/// <summary>

+	/// When you call number-formatting functions, you can use the following enumeration 

+	/// members in your code in place of the actual values.

+	/// </summary>

+	public enum TriState : int {

+		False = 0,

+		UseDefault = -2,

+		True = -1

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VBFixedArrayAttribute.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VBFixedArrayAttribute.cs
new file mode 100644
index 00000000000..dbc879b4e2e
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VBFixedArrayAttribute.cs
@@ -0,0 +1,30 @@
+//
+// VBFixedArrayAttribute.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic 

+{
+	[System.AttributeUsageAttribute(System.AttributeTargets.Field)] 
+	sealed public class VBFixedArrayAttribute : System.Attribute {
+		// Declarations
+		// Constructors
+		[MonoTODO]
+		VBFixedArrayAttribute(System.Int32 UpperBound1) { throw new NotImplementedException (); }
+		[MonoTODO]
+		VBFixedArrayAttribute(System.Int32 UpperBound1, System.Int32 UpperBound2) { throw new NotImplementedException (); }
+		// Properties
+		[MonoTODO]
+		public System.Int32 Length { get { throw new NotImplementedException (); } }
+		[MonoTODO]
+		public System.Int32[] Bounds { get { throw new NotImplementedException (); } }
+		// Methods
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VBFixedStringAttribute.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VBFixedStringAttribute.cs
new file mode 100644
index 00000000000..c4de1009ebd
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VBFixedStringAttribute.cs
@@ -0,0 +1,26 @@
+//
+// VBFixedStringAttribute.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic 

+{
+	[System.AttributeUsageAttribute(System.AttributeTargets.Field)] 
+	sealed public class VBFixedStringAttribute : System.Attribute {
+		// Declarations
+		// Constructors
+		[MonoTODO]
+		VBFixedStringAttribute(System.Int32 Length) { throw new NotImplementedException (); }
+		// Properties
+		[MonoTODO]
+		public System.Int32 Length { get { throw new NotImplementedException (); } }
+		// Methods
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VBMath.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VBMath.cs
new file mode 100644
index 00000000000..49be95781b9
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VBMath.cs
@@ -0,0 +1,29 @@
+//
+// VBMath.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net) 
+//
+// (C) 2002 Chris J Breisch
+//
+
+using System;
+
+namespace Microsoft.VisualBasic {
+	[Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute] 
+	sealed public class VBMath {
+		// Declarations
+		// Constructors
+		// Properties
+		// Methods
+		[MonoTODO]
+		public static System.Single Rnd () { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static System.Single Rnd (System.Single Number) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Randomize () { throw new NotImplementedException (); }
+		[MonoTODO]
+		public static void Randomize (System.Double Number) { throw new NotImplementedException (); }
+		// Events
+	};
+}
diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VariantType.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VariantType.cs
new file mode 100644
index 00000000000..7eab4e4c86a
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VariantType.cs
@@ -0,0 +1,32 @@
+//

+// VariantType.cs

+//

+// Author:

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Chris J Breisch

+//

+namespace Microsoft.VisualBasic {

+	public enum VariantType : int {

+		Empty = 0,

+		Null = 1,

+		Short = 2,

+		Integer = 3,

+		Single = 4,

+		Double = 5,

+		Currency = 6,

+		Date = 7,

+		String = 8,

+		Object = 9,

+		Error = 10,

+		Boolean = 11,

+		Variant = 12,

+		DataObject = 13,

+		Decimal = 14,

+		Byte = 17,

+		Char = 18,

+		Long = 20,

+		UserDefinedType = 36,

+		Array = 8192

+	};

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VbStrConv.cs b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VbStrConv.cs
new file mode 100644
index 00000000000..a61d2db79da
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Microsoft.VisualBasic/VbStrConv.cs
@@ -0,0 +1,73 @@
+//

+// VbStrConv.cs

+//

+// Authors:

+//   Martin Adoue (martin@cwanet.com)

+//   Chris J Breisch (cjbreisch@altavista.net)

+//

+// (C) 2002 Ximian Inc.

+//

+

+using System;

+

+namespace Microsoft.VisualBasic

+{

+	/// <summary>

+	/// When you call the StrConv function, you can use the following enumeration 

+	/// members in your code in place of the actual values.

+	/// </summary>

+	[System.FlagsAttribute] 

+	public enum VbStrConv : int {

+		/// <summary>

+		/// Performs no conversion 

+		/// </summary>

+		None = 0,

+		/// <summary>

+		/// Uses linguistic rules for casing, rather than File System (default). Valid with UpperCase and LowerCase only. 

+		/// </summary>

+		LinguisticCasing = 1024,

+		/// <summary>

+		/// Converts the string to uppercase characters. 

+		/// </summary>

+		UpperCase = 1,

+		/// <summary>

+		/// Converts the string to lowercase characters. 

+		/// </summary>

+		LowerCase = 2,

+		/// <summary>

+		/// Converts the first letter of every word in string to uppercase.

+		/// </summary>

+		ProperCase = 3,

+		/// <summary>

+		/// Converts narrow (half-width) characters in the string to wide (full-width) characters. (Applies to Asian locales.)

+		/// </summary>

+		Wide = 4,					//*  

+		/// <summary>

+		/// Converts wide (full-width) characters in the string to narrow (half-width) characters. (Applies to Asian locales.)

+		/// </summary>

+		Narrow = 8,					//*  

+		/// <summary>

+		/// Converts Hiragana characters in the string to Katakana characters. (Applies to Japan only.)

+		/// </summary>

+		Katakana = 16,				//**  

+		/// <summary>

+		/// Converts Katakana characters in the string to Hiragana characters. (Applies to Japan only.)

+		/// </summary>

+		Hiragana = 32,				//** 

+		/// <summary>

+		/// Converts Traditional Chinese characters to Simplified Chinese. (Applies to Asian locales.)

+		/// </summary>

+		SimplifiedChinese =256,		//*  

+		/// <summary>

+		/// Converts Simplified Chinese characters to Traditional Chinese. (Applies to Asian locales.)

+		/// </summary>

+		TraditionalChinese = 512	//*  

+		/*

+		

+		*   Applies to Asian locales.

+		**  Applies to Japan only.

+		

+		*/

+	}

+

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Test/.cvsignore b/mcs/class/Microsoft.VisualBasic/Test/.cvsignore
new file mode 100644
index 00000000000..6a7461313bb
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Test/.cvsignore
@@ -0,0 +1 @@
+*.dll
diff --git a/mcs/class/Microsoft.VisualBasic/Test/AllTests.cs b/mcs/class/Microsoft.VisualBasic/Test/AllTests.cs
new file mode 100644
index 00000000000..ba8e35d1604
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Test/AllTests.cs
@@ -0,0 +1,33 @@
+// MonoTests.AllTests, Microsoft.VisualBasic.dll

+//

+// Author:

+//   Mario Martinez (mariom925@home.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+//

+

+using NUnit.Framework;

+

+namespace MonoTests

+{

+	/// <summary>

+	///   Combines all unit tests for the Microsoft.VisualBasic.dll assembly

+	///   into one test suite.

+	/// </summary>

+	public class AllTests : TestCase

+	{

+		public AllTests(string name) : base(name) {}

+		public AllTests() : base("Microsoft.VisualBasic.AllTests") {}

+

+		public static ITest Suite {

+			get {

+				TestSuite suite = new TestSuite();

+				suite.AddTest (Microsoft.VisualBasic.CollectionTest.Suite);

+				suite.AddTest (Microsoft.VisualBasic.ConversionTest.Suite);

+				suite.AddTest (Microsoft.VisualBasic.DateAndTimeTest.Suite);

+				

+				return suite;

+			}

+		}

+	}

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Test/CollectionTest.cs b/mcs/class/Microsoft.VisualBasic/Test/CollectionTest.cs
new file mode 100644
index 00000000000..457bc821b75
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Test/CollectionTest.cs
@@ -0,0 +1,535 @@
+// Collection.cs - NUnit Test Cases for Microsoft.VisualBasic.Collection

+//

+// Author:

+//   Chris J. Breisch (cjbreisch@altavista.net)

+//

+// (C) Chris J. Breisch

+// 

+

+using NUnit.Framework;

+using System;

+using Microsoft.VisualBasic;

+using System.Collections;

+

+namespace MonoTests.Microsoft.VisualBasic

+{

+

+	public class CollectionTest : TestCase 

+	{

+	

+		public CollectionTest() : base ("Microsoft.VisualBasic.Collection") {}

+		public CollectionTest(string name) : base(name) {}

+

+		protected override void SetUp() {}

+		protected override void TearDown() {}

+

+		public static ITest Suite {

+			get { 

+				return new TestSuite(typeof(CollectionTest)); 

+			}

+		}

+

+		// Test Constructor

+		public void TestNew ()

+		{

+			Collection c;

+

+			c = new Collection();

+

+			AssertNotNull("#N01", c);

+			AssertEquals("#N02", 0, c.Count);

+		}

+

+		// Test Add method with Key == null

+		public void TestAddNoKey ()

+		{

+			Collection c;

+

+			c = new Collection();

+

+			c.Add(typeof(int), null, null, null);

+			c.Add(typeof(double), null, null, null);

+			c.Add(typeof(string), null, null, null);

+			

+			AssertEquals("#ANK01", 3, c.Count);

+

+			// Collection class is 1-based

+			AssertEquals("#ANK02", typeof(string), c[3]);

+

+		}

+

+		// Test Add method with Key specified

+		public void TestAddKey ()

+		{

+			Collection c;

+

+			c = new Collection();

+

+			c.Add("Baseball", "Base", null, null);

+			c.Add("Football", "Foot", null, null);

+			c.Add("Basketball", "Basket", null, null);

+			c.Add("Volleyball", "Volley", null, null);

+

+			AssertEquals("#AK01", 4, c.Count);

+

+			// Collection class is 1-based

+			AssertEquals("#AK02", "Baseball", c[1]);

+			AssertEquals("#AK03", "Volleyball", c["Volley"]);

+

+		}

+

+		// Test Add method with Before specified and Key == null

+		public void TestAddBeforeNoKey ()

+		{

+			Collection c;

+

+			c = new Collection();

+

+			c.Add(typeof(int), null, null, null);

+			c.Add(typeof(double), null, 1, null);

+			c.Add(typeof(string), null, 2, null);

+			c.Add(typeof(object), null, 2, null);

+

+			AssertEquals("#ABNK01", 4, c.Count);

+

+			// Collection class is 1-based

+			AssertEquals("#ABNK02", typeof(int), c[4]);

+			AssertEquals("#ABNK03", typeof(double), c[1]);

+			AssertEquals("#ABNK04", typeof(object), c[2]);

+

+		}

+

+		// Test Add method with Before and Key

+		public void TestAddBeforeKey ()

+		{

+			Collection c;

+

+			c = new Collection();

+

+			c.Add("Baseball", "Base", null, null);

+			c.Add("Football", "Foot", 1, null);

+			c.Add("Basketball", "Basket", 1, null);

+			c.Add("Volleyball", "Volley", 3, null);

+

+			AssertEquals("#ABK01", 4, c.Count);

+			AssertEquals("#ABK02", "Basketball", c[1]);

+			AssertEquals("#ABK03", "Baseball", c[4]);

+			AssertEquals("#ABK04", "Volleyball", c["Volley"]);

+			AssertEquals("#ABK05", "Football", c["Foot"]);

+

+		}

+

+		// Test Add method with After specified and Key == null

+		public void TestAddAfterNoKey ()

+		{

+			Collection c;

+

+			c = new Collection();

+

+			c.Add(typeof(int), null, null, 0);

+			c.Add(typeof(double), null, null, 1);

+			c.Add(typeof(string), null, null, 1);

+			c.Add(typeof(object), null, null, 3);

+

+			AssertEquals("#AANK01", 4, c.Count);

+

+			// Collection class is 1-based

+			AssertEquals("#AANK02", typeof(object), c[4]);

+			AssertEquals("#AANK03", typeof(int), c[1]);

+			AssertEquals("#AANK04", typeof(string), c[2]);

+

+		}

+

+		// Test Add method with After and Key

+		public void TestAddAfterKey ()

+		{

+			Collection c;

+

+			c = new Collection();

+

+			c.Add("Baseball", "Base", null, 0);

+			c.Add("Football", "Foot", null, 1);

+			c.Add("Basketball", "Basket", null, 1);

+			c.Add("Volleyball", "Volley", null, 2);

+

+			AssertEquals("#AAK01", 4, c.Count);

+

+			// Collection class is 1-based

+			AssertEquals("#AAK02", "Baseball", c[1]);

+			AssertEquals("#AAK03", "Football", c[4]);

+			AssertEquals("#AAK04", "Basketball", c["Basket"]);

+			AssertEquals("#AAK05", "Volleyball", c["Volley"]);

+		}

+

+		// Test GetEnumerator method

+		public void TestGetEnumerator ()

+		{

+			Collection c;

+			IEnumerator e;

+			object[] o = new object[4] {typeof(int), 

+				typeof(double), typeof(string), typeof(object)};

+			int i = 0;

+

+			c = new Collection();

+

+			c.Add(typeof(int), null, null, null);

+			c.Add(typeof(double), null, null, null);

+			c.Add(typeof(string), null, null, null);

+			c.Add(typeof(object), null, null, null);

+

+			e = c.GetEnumerator();

+

+			AssertNotNull("#GE01", e);

+

+			while (e.MoveNext()) {

+				AssertEquals("#GE02." + i.ToString(), o[i], e.Current);

+				i++;

+			}

+

+			e.Reset();

+			e.MoveNext();

+

+			AssertEquals("#GE03", o[0], e.Current);

+

+		}

+

+		// Test GetEnumerator method again, this time using foreach

+		public void Testforeach ()

+		{

+			Collection c;

+			object[] o = new object[4] {typeof(int), 

+				typeof(double), typeof(string), typeof(object)};

+			int i = 0;

+			

+			c = new Collection();

+

+			c.Add(typeof(int), null, null, null);

+			c.Add(typeof(double), null, null, null);

+			c.Add(typeof(string), null, null, null);

+			c.Add(typeof(object), null, null, null);

+

+			

+			foreach (object item in c) {

+				AssertEquals("#fe01." + i.ToString(), o[i], item);

+				i++;

+			}

+			

+		}

+

+		// Test Remove method with Index

+		public void TestRemoveNoKey ()

+		{

+			Collection c;

+

+			c = new Collection();

+

+			c.Add(typeof(int), null, null, null);

+			c.Add(typeof(double), null, null, null);

+			c.Add(typeof(string), null, null, null);

+			c.Add(typeof(object), null, null, null);

+

+			AssertEquals("#RNK01", 4, c.Count);

+

+			c.Remove(3);

+

+			AssertEquals("#RNK02", 3, c.Count);

+

+			// Collection class is 1-based

+			AssertEquals("#RNK03", typeof(object), c[3]);

+

+			c.Remove(1);

+

+			AssertEquals("#RNK04", 2, c.Count);

+			AssertEquals("#RNK05", typeof(double), c[1]);

+			AssertEquals("#RNK06", typeof(object), c[2]);

+

+			c.Remove(2);

+

+			AssertEquals("#RNK07", 1, c.Count);

+			AssertEquals("#RNK08", typeof(double), c[1]);

+

+			c.Remove(1);

+

+			AssertEquals("#RNK09", 0, c.Count);

+		

+		}

+

+		// Test Remove method with Key

+		public void TestRemoveKey ()

+		{

+			Collection c;

+

+			c = new Collection();

+

+			c.Add("Baseball", "Base", null, null);

+			c.Add("Football", "Foot", null, null);

+			c.Add("Basketball", "Basket", null, null);

+			c.Add("Volleyball", "Volley", null, null);

+

+			AssertEquals("#RK01", 4, c.Count);

+

+			c.Remove("Foot");

+

+			AssertEquals("#RK02", 3, c.Count);

+			AssertEquals("#RK03", "Basketball", c["Basket"]);

+

+			// Collection class is 1-based

+			AssertEquals("#RK04", "Volleyball", c[3]);

+

+			c.Remove("Base");

+

+			AssertEquals("#RK05", 2, c.Count);

+			AssertEquals("#RK06", "Basketball", c[1]);

+			AssertEquals("#RK07", "Volleyball", c["Volley"]);

+

+			c.Remove(2);

+

+			AssertEquals("#RK08", 1, c.Count);

+			AssertEquals("#RK09", "Basketball", c[1]);

+			AssertEquals("#RK10", "Basketball", c["Basket"]);

+

+			c.Remove(1);

+

+			AssertEquals("#RK11", 0, c.Count);

+		}

+

+		// Test all the Exceptions we're supposed to throw

+		public void TestException ()

+		{

+			Collection c;

+			bool caughtException = false;

+

+			c = new Collection();

+

+			try {

+				// nothing in Collection yet

+				object o = c[0];

+			}

+			catch (Exception e) {

+				AssertEquals("#E01", typeof(IndexOutOfRangeException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E02", true, caughtException);

+                

+			c.Add("Baseball", "Base", null, null);

+			c.Add("Football", "Foot", null, null);

+			c.Add("Basketball", "Basket", null, null);

+			c.Add("Volleyball", "Volley", null, null);

+

+			caughtException = false;

+

+			try {

+				// only 4 elements

+				object o = c[5];

+			}

+			catch (Exception e) {

+				AssertEquals("#E03", typeof(IndexOutOfRangeException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E04", true, caughtException);

+            

+			caughtException = false;

+			

+			try {

+				// Collection class is 1-based

+				object o = c[0];

+			}

+			catch (Exception e) {

+				AssertEquals("#E05", typeof(IndexOutOfRangeException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E06", true, caughtException);

+            

+			caughtException = false;

+			

+			try {

+				// no member with Key == "Kick"

+				object o = c["Kick"];

+			}

+			catch (Exception e) {

+				// FIXME

+				// VB Language Reference says IndexOutOfRangeException 

+				// here, but MS throws ArgumentException

+				// AssertEquals("#E07", typeof(IndexOutOfRangeException), e.GetType());

+				AssertEquals("#E07", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E08", true, caughtException);

+         

+			caughtException = false;

+			

+			try {

+				// Even though Indexer is an object, really it's a string

+				object o = c[typeof(int)];

+			}

+			catch (Exception e) {

+				AssertEquals("#E09", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E10", true, caughtException);

+         

+			caughtException = false;

+			

+			try {

+				// can't specify both Before and After

+				c.Add("Kickball", "Kick", "Volley", "Foot");

+			}

+			catch (Exception e) {

+				AssertEquals("#E11", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E12", true, caughtException);

+         

+			caughtException = false;

+			

+			try {

+				// Key "Foot" already exists

+				c.Add("Kickball", "Foot", null, null);

+			}

+			catch (Exception e) {

+				AssertEquals("#E13", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E14", true, caughtException);

+

+			caughtException = false;

+			

+			try {

+				// Even though Before is object, it's really a string

+				c.Add("Dodgeball", "Dodge", typeof(int), null);

+			}

+			catch (Exception e) {

+				AssertEquals("#E15", typeof(InvalidCastException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E16", true, caughtException);

+        

+			caughtException = false;

+			

+			try {

+				// Even though After is object, it's really a string

+				c.Add("Wallyball", "Wally", null, typeof(int));

+			}

+			catch (Exception e) {

+				AssertEquals("#E17", typeof(InvalidCastException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E18", true, caughtException);

+        

+			caughtException = false;

+			

+			try {

+				// have to pass a legitimate value to remove

+				c.Remove(null);

+			}

+			catch (Exception e) {

+				AssertEquals("#E19", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E20", true, caughtException);

+        

+			caughtException = false;

+			

+			try {

+				// no Key "Golf" exists

+				c.Remove("Golf");

+			}

+			catch (Exception e) {

+				AssertEquals("#E21", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E22", true, caughtException);

+        

+			caughtException = false;

+			

+			try {

+				// no Index 10 exists

+				c.Remove(10);

+			}

+			catch (Exception e) {

+				AssertEquals("#E23", typeof(IndexOutOfRangeException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E24", true, caughtException);

+        

+			caughtException = false;

+			

+			try {

+				IEnumerator e = c.GetEnumerator();

+				

+				// Must MoveNext before Current

+				object item = e.Current;

+			}

+			catch (Exception e) {

+				// FIXME

+				// On-line help says InvalidOperationException here, 

+				// but MS throws IndexOutOfRangeException

+				// AssertEquals("#E25", typeof(InvalidOperationException), e.GetType());

+				AssertEquals("#E25", typeof(IndexOutOfRangeException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#E26", true, caughtException);

+        

+			caughtException = false;

+			

+			try {

+				IEnumerator e = c.GetEnumerator();

+				e.MoveNext();

+

+				c.Add("Paintball", "Paint", null, null);

+

+				// Can't MoveNext if Collection has been modified

+				e.MoveNext();

+			}

+			catch (Exception e) {

+				// FIXME

+				// On-line help says this should throw an error. MS doesn't.

+				AssertEquals("#E27", typeof(InvalidOperationException), e.GetType());

+				caughtException = true;

+			}

+

+			// FIXME

+			// What to do about this?  MS doesn't throw an error

+			// AssertEquals("#E28", true, caughtException);

+			AssertEquals("#E28", false, caughtException);

+        

+			caughtException = false;

+			

+			try {

+				IEnumerator e = c.GetEnumerator();

+				e.MoveNext();

+

+				c.Add("Racketball", "Racket", null, null);

+

+				// Can't Reset if Collection has been modified

+				e.Reset();

+			}

+			catch (Exception e) {

+				// FIXME

+				// On-line help says this should throw an error.  MS doesn't.

+				AssertEquals("#E29", typeof(InvalidOperationException), e.GetType());

+				caughtException = true;

+			}

+

+			// FIXME

+			// What to do about this?  MS doesn't throw an error

+			// AssertEquals("#E30", true, caughtException);

+			AssertEquals("#E30", false, caughtException);

+

+			caughtException = false;

+		}

+	}

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Test/ConversionTest.cs b/mcs/class/Microsoft.VisualBasic/Test/ConversionTest.cs
new file mode 100644
index 00000000000..991e6e82f61
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Test/ConversionTest.cs
@@ -0,0 +1,674 @@
+// Collection.cs - NUnit Test Cases for Microsoft.VisualBasic.Collection

+//

+// Author:

+//   Chris J. Breisch (cjbreisch@altavista.net)

+//

+// (C) Chris J. Breisch

+// 

+

+using NUnit.Framework;

+using System;

+using Microsoft.VisualBasic;

+

+namespace MonoTests.Microsoft.VisualBasic

+{

+

+	public class ConversionTest : TestCase 

+	{

+	

+		public ConversionTest() : base ("Microsoft.VisualBasic.Conversion") {}

+		public ConversionTest(string name) : base(name) {}

+

+		protected override void SetUp() {}

+		protected override void TearDown() {}

+

+		public static ITest Suite {

+			get { 

+				return new TestSuite(typeof(ConversionTest)); 

+			}

+		}

+

+		public void TestErrorToStringEmpty() {

+			// FIXME : Do something here, but write the ErrorToString code first :-)

+		}

+

+		public void TestErrorToStringNumber() {

+			// FIXME : Do something here, but write the ErrorToString code first :-)

+		}

+

+		// Test the Fix function

+		public void TestFix() {

+			System.Single Sng;

+			System.Double Dbl;

+			System.Decimal Dec;

+			System.String S;

+			System.Object O;

+

+			AssertEquals("#F01", System.Int16.MaxValue, Conversion.Fix(System.Int16.MaxValue));

+			AssertEquals("#F02", System.Int16.MinValue, Conversion.Fix(System.Int16.MinValue));

+			AssertEquals("#F03", System.Int32.MaxValue, Conversion.Fix(System.Int32.MaxValue));

+			AssertEquals("#F04", System.Int32.MinValue, Conversion.Fix(System.Int32.MinValue));

+			AssertEquals("#F05", System.Int64.MaxValue, Conversion.Fix(System.Int64.MaxValue));

+			AssertEquals("#F06", System.Int64.MinValue, Conversion.Fix(System.Int64.MinValue));

+			AssertEquals("#F07", (System.Single)Math.Floor(System.Single.MaxValue), Conversion.Fix(System.Single.MaxValue));

+			AssertEquals("#F08", -1 * (System.Single)Math.Floor(-1 * System.Single.MinValue), Conversion.Fix(System.Single.MinValue));

+			AssertEquals("#F09", Math.Floor(System.Double.MaxValue), Conversion.Fix(System.Double.MaxValue));

+			AssertEquals("#F10", -1 * Math.Floor(-1 * System.Double.MinValue), Conversion.Fix(System.Double.MinValue));

+			AssertEquals("#F11", Decimal.Floor(System.Decimal.MaxValue), Conversion.Fix(System.Decimal.MaxValue));

+			AssertEquals("#F12", -1 * Decimal.Floor(-1 * System.Decimal.MinValue), Conversion.Fix(System.Decimal.MinValue));

+

+			Sng = 99.1F;

+

+			AssertEquals("#F13", 99F, Conversion.Fix(Sng));

+

+			Sng = 99.6F;

+

+			AssertEquals("#F14", 99F, Conversion.Fix(Sng));

+

+			Sng = -99.1F;

+

+			AssertEquals("#F15", -99F, Conversion.Fix(Sng));

+

+			Sng = -99.6F;

+

+			AssertEquals("#F16", -99F, Conversion.Fix(Sng));

+

+			Dbl = 99.1;

+

+			AssertEquals("#F17", 99D, Conversion.Fix(Dbl));

+

+			Dbl = 99.6;

+

+			AssertEquals("#F18", 99D, Conversion.Fix(Dbl));

+

+			Dbl = -99.1;

+

+			AssertEquals("#F19", -99D, Conversion.Fix(Dbl));

+

+			Dbl = -99.6;

+

+			AssertEquals("#F20", -99D, Conversion.Fix(Dbl));

+

+			Dec = 99.1M;

+

+			AssertEquals("#F21", 99M, Conversion.Fix(Dec));

+

+			Dec = 99.6M;

+

+			AssertEquals("#F22", 99M, Conversion.Fix(Dec));

+

+			Dec = -99.1M;

+

+			AssertEquals("#F23", -99M, Conversion.Fix(Dec));

+

+			Dec = -99.6M;

+

+			AssertEquals("#F24", -99M, Conversion.Fix(Dec));

+

+			Dbl = 99.1;

+			S = Dbl.ToString();

+

+			AssertEquals("#F25", 99D, Conversion.Fix(S));

+

+			Dbl = 99.6;

+			S = Dbl.ToString();

+

+			AssertEquals("#F26", 99D, Conversion.Fix(S));

+

+			Dbl = -99.1;

+			S = Dbl.ToString();

+

+			AssertEquals("#F27", -99D, Conversion.Fix(S));

+

+			Dbl = -99.6;

+			S = Dbl.ToString();

+

+			AssertEquals("#F28", -99D, Conversion.Fix(S));

+

+			Dbl = 99.1;

+			O = Dbl;

+

+			AssertEquals("#F29", 99D, Conversion.Fix(O));

+

+			Sng = 99.6F;

+			O = Sng;

+

+			AssertEquals("#F30", (System.Object)99F, Conversion.Fix(O));

+

+			Dbl = -99.1;

+			O = Dbl;

+

+			AssertEquals("#F31", -99D, Conversion.Fix(O));

+

+			Dec = -99.6M;

+			O = Dec;

+

+			AssertEquals("#F32", (System.Object)(-99M), Conversion.Fix(O));

+

+			O = typeof(int);

+

+			// test for Exceptions

+			bool caughtException = false;

+			try {

+				Conversion.Fix(O);

+			}

+			catch (Exception e) {

+				AssertEquals("#F33", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#F34", true, caughtException);

+

+			caughtException = false;

+			try {

+				Conversion.Fix(null);

+			}

+			catch (Exception e) {

+				AssertEquals("#F35", typeof(ArgumentNullException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#F36", true, caughtException);

+

+		}

+			

+		// Test the Int function

+		public void TestInt() {

+			System.Single Sng;

+			System.Double Dbl;

+			System.Decimal Dec;

+			System.String S;

+			System.Object O;

+

+			AssertEquals("#I01", System.Int16.MaxValue, Conversion.Int(System.Int16.MaxValue));

+			AssertEquals("#I02", System.Int16.MinValue, Conversion.Int(System.Int16.MinValue));

+			AssertEquals("#I03", System.Int32.MaxValue, Conversion.Int(System.Int32.MaxValue));

+			AssertEquals("#I04", System.Int32.MinValue, Conversion.Int(System.Int32.MinValue));

+			AssertEquals("#I05", System.Int64.MaxValue, Conversion.Int(System.Int64.MaxValue));

+			AssertEquals("#I06", System.Int64.MinValue, Conversion.Int(System.Int64.MinValue));

+			AssertEquals("#I07", (System.Single)Math.Floor(System.Single.MaxValue), Conversion.Int(System.Single.MaxValue));

+			AssertEquals("#I08", (System.Single)Math.Floor(System.Single.MinValue), Conversion.Int(System.Single.MinValue));

+			AssertEquals("#I09", Math.Floor(System.Double.MaxValue), Conversion.Int(System.Double.MaxValue));

+			AssertEquals("#I10", Math.Floor(System.Double.MinValue), Conversion.Int(System.Double.MinValue));

+			AssertEquals("#I11", Decimal.Floor(System.Decimal.MaxValue), Conversion.Int(System.Decimal.MaxValue));

+			AssertEquals("#I12", Decimal.Floor(System.Decimal.MinValue), Conversion.Int(System.Decimal.MinValue));

+

+			Sng = 99.1F;

+

+			AssertEquals("#I13", 99F, Conversion.Int(Sng));

+

+			Sng = 99.6F;

+

+			AssertEquals("#I14", 99F, Conversion.Int(Sng));

+

+			Sng = -99.1F;

+

+			AssertEquals("#I15", -100F, Conversion.Int(Sng));

+

+			Sng = -99.6F;

+

+			AssertEquals("#I16", -100F, Conversion.Int(Sng));

+

+			Dbl = 99.1;

+

+			AssertEquals("#I17", 99D, Conversion.Int(Dbl));

+

+			Dbl = 99.6;

+

+			AssertEquals("#I18", 99D, Conversion.Int(Dbl));

+

+			Dbl = -99.1;

+

+			AssertEquals("#I19", -100D, Conversion.Int(Dbl));

+

+			Dbl = -99.6;

+

+			AssertEquals("#I20", -100D, Conversion.Int(Dbl));

+

+			Dec = 99.1M;

+

+			AssertEquals("#I21", 99M, Conversion.Int(Dec));

+

+			Dec = 99.6M;

+

+			AssertEquals("#I22", 99M, Conversion.Int(Dec));

+

+			Dec = -99.1M;

+

+			AssertEquals("#I23", -100M, Conversion.Int(Dec));

+

+			Dec = -99.6M;

+

+			AssertEquals("#I24", -100M, Conversion.Int(Dec));

+

+			Dbl = 99.1;

+			S = Dbl.ToString();

+

+			AssertEquals("#I25", 99D, Conversion.Int(S));

+

+			Dbl = 99.6;

+			S = Dbl.ToString();

+

+			AssertEquals("#I26", 99D, Conversion.Int(S));

+

+			Dbl = -99.1;

+			S = Dbl.ToString();

+

+			AssertEquals("#I27", -100D, Conversion.Int(S));

+

+			Dbl = -99.6;

+			S = Dbl.ToString();

+

+			AssertEquals("#I28", -100D, Conversion.Int(S));

+

+			Dbl = 99.1;

+			O = Dbl;

+

+			AssertEquals("#I29", 99D, Conversion.Int(O));

+

+			Sng = 99.6F;

+			O = Sng;

+

+			AssertEquals("#I30", 99F, Conversion.Int(O));

+

+			Dbl = -99.1;

+			O = Dbl;

+

+			AssertEquals("#I31", -100D, Conversion.Int(O));

+

+			Dec = -99.6M;

+			O = Dec;

+

+			AssertEquals("#I32", -100M, Conversion.Int(O));

+

+			// test the exceptions it's supposed to throw

+

+			O = typeof(int);

+			bool caughtException = false;

+

+			try {

+				Conversion.Fix(O);

+			}

+			catch (Exception e) {

+				AssertEquals("#I33", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#I34", true, caughtException);

+

+			caughtException = false;

+			try {

+				Conversion.Int(null);

+			}

+			catch (Exception e) {

+				AssertEquals("#I35", typeof(ArgumentNullException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#I36", true, caughtException);

+

+

+		}	

+

+		// test the Hex function

+		public void TestHex() {

+			AssertEquals("#H01", "FF", Conversion.Hex(System.Byte.MaxValue));

+			AssertEquals("#H02", "0", Conversion.Hex(System.Byte.MinValue));

+			AssertEquals("#H03", "7FFF", Conversion.Hex(System.Int16.MaxValue));

+			AssertEquals("#H04", "8000", Conversion.Hex(System.Int16.MinValue));

+			AssertEquals("#H05", "7FFFFFFF", Conversion.Hex(System.Int32.MaxValue));

+			AssertEquals("#H06", "80000000", Conversion.Hex(System.Int32.MinValue));

+			AssertEquals("#H07", "7FFFFFFFFFFFFFFF", Conversion.Hex(System.Int64.MaxValue));

+			AssertEquals("#H08", "8000000000000000", Conversion.Hex(System.Int64.MinValue));

+

+			System.Byte UI8;

+			System.Int16 I16;

+			System.Int32 I32;

+			System.Int64 I64;

+			System.Object O;

+			System.String S;

+

+			UI8 = 15;

+			AssertEquals("#H09", "F", Conversion.Hex(UI8));

+			

+			I16 = System.Byte.MaxValue;

+			AssertEquals("#H10", "FF", Conversion.Hex(I16));

+

+			I16 = (System.Int16)((I16 + 1) * -1);

+			AssertEquals("#H11", "FF00", Conversion.Hex(I16));

+

+			I16 = -2;

+			AssertEquals("#H12", "FFFE", Conversion.Hex(I16));

+

+			I32 = System.UInt16.MaxValue;

+			AssertEquals("#H13", "FFFF", Conversion.Hex(I32));

+

+			I32 = (I32 + 1) * -1;

+			AssertEquals("#H14", "FFFF0000", Conversion.Hex(I32));

+

+			I32 = -2;

+			AssertEquals("#H15", "FFFFFFFE", Conversion.Hex(I32));

+

+			I64 = System.UInt32.MaxValue;

+			AssertEquals("#H16", "FFFFFFFF", Conversion.Hex(I64));

+

+			I64 = (I64 + 1) * -1;

+			AssertEquals("#H17", "FFFFFFFF00000000", Conversion.Hex(I64));

+			

+			I64 = -2;

+			AssertEquals("#H18", "FFFFFFFFFFFFFFFE", Conversion.Hex(I64));

+			

+			I16 = System.Byte.MaxValue;

+			S = I16.ToString();

+			AssertEquals("#H19", "FF", Conversion.Hex(S));

+

+			I16 = (System.Int16)((I16 + 1) * -1);

+			S = I16.ToString();

+			AssertEquals("#H20", "FFFFFF00", Conversion.Hex(S));

+

+			I16 = -1;

+			S = I16.ToString();

+			AssertEquals("#H21", "FFFFFFFF", Conversion.Hex(S));

+

+			I32 = System.UInt16.MaxValue;

+			S = I32.ToString();

+			AssertEquals("#H22", "FFFF", Conversion.Hex(S));

+

+			I32 = (I32 + 1) * -1;

+			S = I32.ToString();

+			AssertEquals("#H23", "FFFF0000", Conversion.Hex(S));

+

+			I32 = -2;

+			S = I32.ToString();

+			AssertEquals("#H24", "FFFFFFFE", Conversion.Hex(S));

+

+			I64 = System.UInt32.MaxValue;

+			S = I64.ToString();

+			AssertEquals("#H25", "FFFFFFFF", Conversion.Hex(S));

+

+			I64 = (I64 + 1) * -1;

+			S = I64.ToString();

+			AssertEquals("#H26", "FFFFFFFF00000000", Conversion.Hex(S));

+			

+			UI8 = System.Byte.MaxValue;

+			O = UI8;

+			AssertEquals("#H27", "FF", Conversion.Hex(O));

+

+			I16 = System.Byte.MaxValue;

+			O = I16;

+			AssertEquals("#H28", "FF", Conversion.Hex(O));

+

+			I16 = (System.Int16)((I16 + 1) * -1);

+			O = I16;

+			AssertEquals("#H29", "FF00", Conversion.Hex(O));

+

+			I16 = -2;

+			O = I16;

+			AssertEquals("#H30", "FFFE", Conversion.Hex(O));

+

+			I32 = System.UInt16.MaxValue;

+			O = I32;

+			AssertEquals("#H31", "FFFF", Conversion.Hex(O));

+

+			I32 = (I32 + 1) * -1;

+			O = I32;

+			AssertEquals("#H32", "FFFF0000", Conversion.Hex(O));

+

+			I32 = -2;

+			O = I32;

+			AssertEquals("#H33", "FFFFFFFE", Conversion.Hex(O));

+

+			I64 = System.UInt32.MaxValue;

+			O = I64;

+			AssertEquals("#H34", "FFFFFFFF", Conversion.Hex(O));

+

+			I64 = (I64 + 1) * -1;

+			O = I64;

+			AssertEquals("#H35", "FFFFFFFF00000000", Conversion.Hex(O));

+

+			I64 = -2;

+			O = I64;

+			// FIXME : MS doesn't pass this test

+			//AssertEquals("#H35", "FFFFFFFFFFFFFFFE", Conversion.Hex(O));

+

+			O = typeof(int);

+

+			bool caughtException = false;

+			try {

+				Conversion.Hex(O);

+			}

+			catch (Exception e) {

+				AssertEquals("#H36", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#H37", true, caughtException);

+

+			caughtException = false;

+

+			try {

+				Conversion.Hex(null);

+			}

+			catch (Exception e) {

+				AssertEquals("#H38", typeof(ArgumentNullException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#H39", true, caughtException);

+		}

+		

+		// test the Oct function

+		public void TestOct() {

+			AssertEquals("#O01", "377", Conversion.Oct(System.Byte.MaxValue));

+			AssertEquals("#O02", "0", Conversion.Oct(System.Byte.MinValue));

+			AssertEquals("#O03", "77777", Conversion.Oct(System.Int16.MaxValue));

+			AssertEquals("#O04", "100000", Conversion.Oct(System.Int16.MinValue));

+			AssertEquals("#O05", "17777777777", Conversion.Oct(System.Int32.MaxValue));

+			AssertEquals("#O06", "20000000000", Conversion.Oct(System.Int32.MinValue));

+			AssertEquals("#O07", "777777777777777777777", Conversion.Oct(System.Int64.MaxValue));

+			//AssertEquals("#O08", "1000000000000000000000", Conversion.Oct(System.Int64.MinValue));

+

+			System.Byte UI8;

+			System.Int16 I16;

+			System.Int32 I32;

+			System.Int64 I64;

+			System.Object O;

+			System.String S;

+

+			UI8 = 15;

+			AssertEquals("#O09", "17", Conversion.Oct(UI8));

+			

+			I16 = System.Byte.MaxValue;

+			AssertEquals("#O10", "377", Conversion.Oct(I16));

+

+			I16 = (System.Int16)((I16 + 1) * -1);

+			AssertEquals("#O11", "177400", Conversion.Oct(I16));

+

+			I16 = -2;

+			AssertEquals("#O12", "177776", Conversion.Oct(I16));

+

+			I32 = System.UInt16.MaxValue;

+			AssertEquals("#O13", "177777", Conversion.Oct(I32));

+

+			I32 = (I32 + 1) * -1;

+			AssertEquals("#O14", "37777600000", Conversion.Oct(I32));

+

+			I32 = -2;

+			AssertEquals("#O15", "37777777776", Conversion.Oct(I32));

+

+			I64 = System.UInt32.MaxValue;

+			AssertEquals("#O16", "37777777777", Conversion.Oct(I64));

+

+			I64 = (I64 + 1) * -1;

+			AssertEquals("#O17", "1777777777740000000000", Conversion.Oct(I64));

+			

+			I64 = -2;

+			AssertEquals("#O18", "1777777777777777777776", Conversion.Oct(I64));

+			

+			I16 = System.Byte.MaxValue;

+			S = I16.ToString();

+			AssertEquals("#O19", "377", Conversion.Oct(S));

+

+			I16 = (System.Int16)((I16 + 1) * -1);

+			S = I16.ToString();

+			AssertEquals("#O20", "37777777400", Conversion.Oct(S));

+

+			I16 = -2;

+			S = I16.ToString();

+			AssertEquals("#O21", "37777777776", Conversion.Oct(S));

+

+			I32 = System.UInt16.MaxValue;

+			S = I32.ToString();

+			AssertEquals("#O22", "177777", Conversion.Oct(S));

+

+			I32 = (I32 + 1) * -1;

+			S = I32.ToString();

+			AssertEquals("#O23", "37777600000", Conversion.Oct(S));

+

+			I32 = -2;

+			S = I32.ToString();

+			AssertEquals("#O24", "37777777776", Conversion.Oct(S));

+

+			I64 = System.UInt32.MaxValue;

+			S = I64.ToString();

+			AssertEquals("#O25", "37777777777", Conversion.Oct(S));

+

+			I64 = (I64 + 1) * -1;

+			S = I64.ToString();

+			AssertEquals("#O26", "1777777777740000000000", Conversion.Oct(S));

+			

+			UI8 = System.Byte.MaxValue;

+			O = UI8;

+			AssertEquals("#O27", "377", Conversion.Oct(O));

+

+			I16 = System.Byte.MaxValue;

+			O = I16;

+			AssertEquals("#O28", "377", Conversion.Oct(O));

+

+			I16 = (System.Int16)((I16 + 1) * -1);

+			O = I16;

+			AssertEquals("#O29", "177400", Conversion.Oct(O));

+

+			I16 = -2;

+			O = I16;

+			AssertEquals("#O29", "177776", Conversion.Oct(O));

+

+			I32 = System.UInt16.MaxValue;

+			O = I32;

+			AssertEquals("#O30", "177777", Conversion.Oct(O));

+

+			I32 = (I32 + 1) * -1;

+			O = I32;

+			AssertEquals("#O31", "37777600000", Conversion.Oct(O));

+

+			I32 = -2;

+			O = I32;

+			AssertEquals("#O32", "37777777776", Conversion.Oct(O));

+

+			I64 = System.UInt32.MaxValue;

+			O = I64;

+			AssertEquals("#O33", "37777777777", Conversion.Oct(O));

+

+			I64 = (I64 + 1) * -1;

+			O = I64;

+			AssertEquals("#O34", "1777777777740000000000", Conversion.Oct(O));

+

+			I64 = -2;

+			O = I64;

+

+			// FIXME: MS doesn't pass this test

+			// AssertEquals("#O35", "1777777777777777777776", Conversion.Oct(O));

+		

+			O = typeof(int);

+

+			bool caughtException = false;

+			try {

+				Conversion.Oct(O);

+			}

+			catch (Exception e) {

+				AssertEquals("#O36", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#O37", true, caughtException);

+			

+			caughtException = false;

+

+			try {

+				Conversion.Oct(null);

+			}

+			catch (Exception e) {

+				AssertEquals("#O38", typeof(ArgumentNullException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#O39", true, caughtException);

+		}

+

+		// test the Str function

+		public void TestStr() {

+			AssertEquals("#S01", "-1", Conversion.Str(-1));

+			AssertEquals("#S02", " 1", Conversion.Str(1));

+

+			bool caughtException = false;

+			Object O = typeof(int);

+

+			try {

+				Conversion.Str(O);

+			}

+			catch (Exception e) {

+				AssertEquals("#S03", typeof(InvalidCastException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#S04", true, caughtException);

+

+			caughtException = false;

+

+			try {

+				Conversion.Str(null);

+			}

+			catch (Exception e) {

+				AssertEquals("#S05", typeof(ArgumentNullException), e.GetType());

+				caughtException = true;

+			}

+		}

+

+		// Test the Val function

+		public void TestVal() {

+			AssertEquals("#V01", 4, Conversion.Val('4'));

+			AssertEquals("#V02", -3542.76, Conversion.Val("    -   3       5   .4   2  7   6E+    0 0 2    "));

+			AssertEquals("#V03", 255D, Conversion.Val("&HFF"));

+			AssertEquals("#V04", 255D, Conversion.Val("&o377"));

+

+			System.Object O = "    -   3       5   .4     7   6E+    0 0 3";

+

+			AssertEquals("#V05", -35476D, Conversion.Val(O));

+

+			bool caughtException;

+

+			caughtException = false;

+

+			try {

+				Conversion.Val("3E+9999999");

+			}

+			catch (Exception e) {

+				AssertEquals("#V06", typeof(OverflowException), e.GetType());

+				caughtException = true;

+			}

+

+			AssertEquals("#V07", true, caughtException);

+

+			caughtException = false;

+

+			try {

+				Conversion.Val(typeof(int));

+			}

+			catch (Exception e) {

+				AssertEquals("#V08", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+			AssertEquals("#V09", true, caughtException);

+		}

+	}

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Test/DateAndTimeTest.cs b/mcs/class/Microsoft.VisualBasic/Test/DateAndTimeTest.cs
new file mode 100644
index 00000000000..63dc4162884
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Test/DateAndTimeTest.cs
@@ -0,0 +1,380 @@
+// Collection.cs - NUnit Test Cases for Microsoft.VisualBasic.Collection

+//

+// Author:

+//   Chris J. Breisch (cjbreisch@altavista.net)

+//

+// (C) Chris J. Breisch

+// 

+

+using NUnit.Framework;

+using System;

+using System.Globalization;
+using Microsoft.VisualBasic;

+

+namespace MonoTests.Microsoft.VisualBasic

+{

+

+	public class DateAndTimeTest : TestCase {

+	

+		public DateAndTimeTest() : base ("Microsoft.VisualBasic.DateAndTime") {}

+		public DateAndTimeTest(string name) : base(name) {}

+

+		protected override void SetUp() {}

+		protected override void TearDown() {}

+

+		public static ITest Suite {

+			get { 

+				return new TestSuite(typeof(DateAndTimeTest)); 

+			}

+		}

+

+		public void TestDateString() {

+			string s = DateAndTime.DateString;

+			DateTime dtNow = DateTime.Today;

+			AssertEquals("#DS01", dtNow.ToShortDateString(), DateTime.Parse(s).ToShortDateString());

+

+			// TODO: Add a test for setting the date string too

+		}

+

+		public void TestToday() {

+			AssertEquals("#TO01", DateTime.Today, DateAndTime.Today);

+

+			// TODO: Add a test for setting Today

+		}

+

+		public void TestTimer() {

+			double secTimer = DateAndTime.Timer;

+			DateTime dtNow = DateTime.Now;

+			double secNow = dtNow.Hour * 3600 + dtNow.Minute * 60 + dtNow.Second + (dtNow.Millisecond + 1) / 1000D;

+			double secTimer2 = DateAndTime.Timer + .001;

+			

+			// waste a little time

+			for (int i = 0; i < int.MaxValue; i++);

+

+			// get another timer

+			double secTimer3 = DateAndTime.Timer;

+			

+			// should be same time within a reasonable tolerance

+			Assert("#TI01", secNow >= secTimer);

+			Assert("#TI02", secTimer2 >= secNow);

+

+			// third timer should be greater than the first

+			Assert("#TI03", secTimer3 > secTimer);

+		}

+

+		public void TestNow() {

+			DateTime dtNow = DateTime.Now;

+			DateTime dtTest = DateAndTime.Now;

+			DateTime dtNow2 = DateTime.Now;

+

+			Assert("#N01", dtTest >= dtNow);

+			Assert("#N02", dtNow2 >= dtTest);

+		}

+

+		public void TestTimeOfDay() {

+			DateTime dtNow = DateTime.Now;

+			TimeSpan tsNow = new TimeSpan(dtNow.Hour, dtNow.Minute, dtNow.Second);

+			DateTime dtTest = DateAndTime.TimeOfDay;

+			TimeSpan tsTest = new TimeSpan(dtTest.Hour, dtTest.Minute, dtTest.Second);

+			DateTime dtNow2 = DateTime.Now;

+			TimeSpan tsNow2 = new TimeSpan(dtNow2.Hour, dtNow2.Minute, dtNow2.Second);

+			

+			Assert("#TOD01", tsTest.Ticks >= tsNow.Ticks);

+			Assert("#TOD02", tsNow2.Ticks >= tsTest.Ticks);

+

+			// TODO: add a test case for setting time of day

+		}

+

+		public void TestTimeString() {

+			DateTime dtNow = DateTime.Now;

+			TimeSpan tsNow = new TimeSpan(dtNow.Hour, dtNow.Minute, dtNow.Second);

+			string s = DateAndTime.TimeString;

+			DateTime dtTest = DateTime.Parse(s);

+			TimeSpan tsTest = new TimeSpan(dtTest.Hour, dtTest.Minute, dtTest.Second);

+			DateTime dtNow2 = DateTime.Now;

+			TimeSpan tsNow2 = new TimeSpan(dtNow2.Hour, dtNow2.Minute, dtNow2.Second);

+			

+			Assert("#TS01", tsTest.Ticks >= tsNow.Ticks);

+			Assert("#TS02", tsNow2.Ticks >= tsTest.Ticks);

+

+			// TODO: add a test case for setting TimeString

+		}

+

+		public void TestDateAdd() {

+			DateTime dtNow = DateTime.Now;

+

+			AssertEquals("#DA01", dtNow.AddYears(1), DateAndTime.DateAdd(DateInterval.Year, 1, dtNow));

+			AssertEquals("#DA02", dtNow.AddYears(-1), DateAndTime.DateAdd("yyyy", -1, dtNow));

+

+

+			bool caughtException = false;

+			

+			try {

+				DateAndTime.DateAdd("foo", 1, dtNow);

+			} 

+			catch (Exception e) {

+				AssertEquals("#DA03", e.GetType(), typeof(ArgumentException));

+				caughtException = true;

+			}

+

+			AssertEquals("#DA04", caughtException, true);

+

+			AssertEquals("#DA05", dtNow.AddMonths(6), DateAndTime.DateAdd(DateInterval.Quarter, 2, dtNow));

+			AssertEquals("#DA06", dtNow.AddMonths(-6), DateAndTime.DateAdd("q", -2, dtNow));

+

+			AssertEquals("#DA07", dtNow.AddMonths(3), DateAndTime.DateAdd(DateInterval.Month, 3, dtNow));

+			AssertEquals("#DA08", dtNow.AddMonths(-3), DateAndTime.DateAdd("m", -3, dtNow));

+

+			AssertEquals("#DA09", dtNow.AddDays(28), DateAndTime.DateAdd(DateInterval.WeekOfYear, 4, dtNow));

+			AssertEquals("#DA10", dtNow.AddDays(-28), DateAndTime.DateAdd("ww", -4, dtNow));

+

+			AssertEquals("#DA11", dtNow.AddDays(5), DateAndTime.DateAdd(DateInterval.Weekday, 5, dtNow));

+			AssertEquals("#DA12", dtNow.AddDays(-5), DateAndTime.DateAdd("w", -5, dtNow));

+

+			AssertEquals("#DA13", dtNow.AddDays(6), DateAndTime.DateAdd(DateInterval.DayOfYear, 6, dtNow));

+			AssertEquals("#DA14", dtNow.AddDays(-6), DateAndTime.DateAdd("y", -6, dtNow));

+

+			AssertEquals("#DA15", dtNow.AddDays(7), DateAndTime.DateAdd(DateInterval.Day, 7, dtNow));

+			AssertEquals("#DA16", dtNow.AddDays(-7), DateAndTime.DateAdd("d", -7, dtNow));

+

+			AssertEquals("#DA17", dtNow.AddHours(8), DateAndTime.DateAdd(DateInterval.Hour, 8, dtNow));

+			AssertEquals("#DA18", dtNow.AddHours(-8), DateAndTime.DateAdd(DateInterval.Hour, -8, dtNow));

+

+			AssertEquals("#DA19", dtNow.AddMinutes(9), DateAndTime.DateAdd(DateInterval.Minute, 9, dtNow));

+			AssertEquals("#DA20", dtNow.AddMinutes(-9), DateAndTime.DateAdd("n", -9, dtNow));

+

+			AssertEquals("#DA21", dtNow.AddSeconds(10), DateAndTime.DateAdd(DateInterval.Second, 10, dtNow));

+			AssertEquals("#DA22", dtNow.AddSeconds(-10), DateAndTime.DateAdd("s", -10, dtNow));

+

+			caughtException = false;

+

+			try {

+				DateAndTime.DateAdd(DateInterval.Year, int.MinValue, dtNow);

+			}

+			catch (Exception e) {

+				caughtException = true;

+				AssertEquals("#DA23", e.GetType(), typeof(Exception));

+			}

+

+			// AssertEquals("#DA24", caughtException, true);

+		}

+

+		public void TestDateDiff () {

+			DateTime dtNow = DateTime.Now;

+			DateTime dtOld = dtNow.AddYears(-1);

+

+			// TODO: Test this better

+			long diff = DateAndTime.DateDiff(DateInterval.Year, dtOld, dtNow, FirstDayOfWeek.System, FirstWeekOfYear.System);

+

+			AssertEquals("#DD01", dtNow, dtOld.AddYears((int)diff));

+

+			DateTime dtJan1 = new DateTime(2002, 1, 1);

+			DateTime dtDec31 = new DateTime(2001, 12, 31);

+

+			diff = DateAndTime.DateDiff(DateInterval.Year, dtDec31, dtJan1, FirstDayOfWeek.System, FirstWeekOfYear.System);

+

+			AssertEquals("#DD02", 1L, diff);

+

+			diff = DateAndTime.DateDiff(DateInterval.Quarter, dtDec31, dtJan1, FirstDayOfWeek.System, FirstWeekOfYear.System);

+

+			AssertEquals("#DD03", 1L, diff);

+

+			diff = DateAndTime.DateDiff(DateInterval.Month, dtDec31, dtJan1, FirstDayOfWeek.System, FirstWeekOfYear.System);

+

+			AssertEquals("#DD04", 1L, diff);

+

+			DateTime dtJan4 = new DateTime(2001, 1, 4);	// This is a Thursday

+			DateTime dtJan9 = new DateTime(2001, 1, 9);	// This is the next Tuesday

+			

+			

+			long WD = DateAndTime.DateDiff(DateInterval.Weekday, dtJan4, dtJan9, FirstDayOfWeek.System, FirstWeekOfYear.System);

+

+			AssertEquals ("#DD05", 0L, WD);

+

+			long WY = DateAndTime.DateDiff(DateInterval.WeekOfYear, dtJan4, dtJan9, FirstDayOfWeek.System, FirstWeekOfYear.System);

+

+			AssertEquals ("#DD06", 1L, WY);

+		}

+

+		public void TestDatePart () {

+			DateTime dtJan4 = new DateTime(2001, 1, 4);

+

+			// TODO: Test this better

+

+			AssertEquals("#DP01", 2001, DateAndTime.DatePart(DateInterval.Year, dtJan4, FirstDayOfWeek.System, FirstWeekOfYear.System));

+			AssertEquals("#DP02", 1, DateAndTime.DatePart(DateInterval.Quarter, dtJan4, FirstDayOfWeek.System, FirstWeekOfYear.System));

+			AssertEquals("#DP03", 1, DateAndTime.DatePart(DateInterval.Month, dtJan4, FirstDayOfWeek.System, FirstWeekOfYear.System));

+			AssertEquals("#DP04", 1, DateAndTime.DatePart(DateInterval.WeekOfYear, dtJan4, FirstDayOfWeek.System, FirstWeekOfYear.FirstFourDays));

+			AssertEquals("#DP05", 53, DateAndTime.DatePart(DateInterval.WeekOfYear, dtJan4, FirstDayOfWeek.System, FirstWeekOfYear.FirstFullWeek));

+			AssertEquals("#DP06", 1, DateAndTime.DatePart(DateInterval.WeekOfYear, dtJan4, FirstDayOfWeek.System, FirstWeekOfYear.Jan1));

+			AssertEquals("#DP07", 1, DateAndTime.DatePart(DateInterval.WeekOfYear, dtJan4, FirstDayOfWeek.System, FirstWeekOfYear.System));

+			AssertEquals("#DP08", 7, DateAndTime.DatePart(DateInterval.Weekday, dtJan4, FirstDayOfWeek.Friday, FirstWeekOfYear.FirstFourDays));

+			AssertEquals("#DP09", 6, DateAndTime.DatePart(DateInterval.Weekday, dtJan4, FirstDayOfWeek.Saturday, FirstWeekOfYear.FirstFourDays));

+			AssertEquals("#DP10", 5, DateAndTime.DatePart(DateInterval.Weekday, dtJan4, FirstDayOfWeek.Sunday, FirstWeekOfYear.FirstFourDays));

+			AssertEquals("#DP11", 4, DateAndTime.DatePart(DateInterval.Weekday, dtJan4, FirstDayOfWeek.Monday, FirstWeekOfYear.FirstFourDays));

+			AssertEquals("#DP12", 3, DateAndTime.DatePart(DateInterval.Weekday, dtJan4, FirstDayOfWeek.Tuesday, FirstWeekOfYear.FirstFourDays));

+			AssertEquals("#DP13", 2, DateAndTime.DatePart(DateInterval.Weekday, dtJan4, FirstDayOfWeek.Wednesday, FirstWeekOfYear.FirstFourDays));

+			AssertEquals("#DP14", 1, DateAndTime.DatePart(DateInterval.Weekday, dtJan4, FirstDayOfWeek.Thursday, FirstWeekOfYear.FirstFourDays));

+			AssertEquals("#DP15", 5, DateAndTime.DatePart(DateInterval.Weekday, dtJan4, FirstDayOfWeek.System, FirstWeekOfYear.FirstFourDays));

+

+

+		}

+

+		public void TestDateSerial () {

+			DateTime dtJan4 = new DateTime(2001, 1, 4);

+			DateTime dtSerial = DateAndTime.DateSerial(2001, 1, 4);

+

+			AssertEquals("#DS01", dtJan4, dtSerial);

+		}

+

+		public void TestTimeSerial () {

+			bool caughtException = false;

+

+			try {

+				DateAndTime.TimeSerial(0, -1440, -1);

+			}

+			catch (Exception e) {

+				AssertEquals("#TS01", e.GetType(), typeof(ArgumentOutOfRangeException));

+				caughtException = true;

+			}

+			AssertEquals("#TS02", true, caughtException);

+

+			AssertEquals("#TS03", new DateTime(1, 1, 1, 1, 1, 1), DateAndTime.TimeSerial(1, 1, 1));

+				

+		}

+

+		public void TestDateValue () {

+			bool caughtException = false;

+

+			try {

+				DateAndTime.DateValue("This is not a date.");

+			}

+			catch (Exception e) {

+				AssertEquals ("#DV01", e.GetType(), typeof(InvalidCastException));

+				caughtException = true;

+			}

+			AssertEquals("#DV02", true, caughtException);

+

+			AssertEquals("#DV03", new DateTime(1969, 2, 12), DateAndTime.DateValue("February 12, 1969"));

+		}

+

+		public void TestTimeValue () {

+			bool caughtException = false;

+

+			try {

+				DateAndTime.TimeValue("This is not a time.");

+			}

+			catch (Exception e) {

+				AssertEquals ("#TV01", e.GetType(), typeof(InvalidCastException));

+				caughtException = true;

+			}

+			AssertEquals("#TV02", true, caughtException);

+

+			AssertEquals("#TV03", new DateTime(1, 1, 1, 16, 35, 17), DateAndTime.TimeValue("4:35:17 PM"));

+		}

+

+		public void TestYear () {

+			DateTime jan1 = new DateTime(2001, 1, 1, 1, 1, 1);

+			AssertEquals("#Y01", jan1.Year, DateAndTime.Year(jan1));

+		}

+

+		public void TestMonth () {

+			DateTime jan1 = new DateTime(2001, 1, 1, 1, 1, 1);

+			AssertEquals("#MO01", jan1.Month, DateAndTime.Month(jan1));

+		}

+		

+		public void TestDay () {

+			DateTime jan1 = new DateTime(2001, 1, 1, 1, 1, 1);

+			AssertEquals("#D01", jan1.Day, DateAndTime.Day(jan1));

+		}

+

+		public void TestHour () {

+			DateTime jan1 = new DateTime(2001, 1, 1, 1, 1, 1);

+			AssertEquals("#H01", jan1.Hour, DateAndTime.Hour(jan1));

+		}

+

+		public void TestMinute () {

+			DateTime jan1 = new DateTime(2001, 1, 1, 1, 1, 1);

+			AssertEquals("#MI01", jan1.Minute, DateAndTime.Minute(jan1));

+		}

+

+		public void TestSecond () {

+			DateTime jan1 = new DateTime(2001, 1, 1, 1, 1, 1);

+			AssertEquals("#S01", jan1.Second, DateAndTime.Second(jan1));

+		}

+

+		public void TestWeekday () {

+			DateTime jan1 = new DateTime(2001, 1, 1, 1, 1, 1);

+			AssertEquals("#W01", (int)jan1.DayOfWeek + 1, DateAndTime.Weekday(jan1, FirstDayOfWeek.System));

+		}

+

+		public void TestMonthName () {

+			DateTime jan1 = new DateTime(2001, 1, 1, 1, 1, 1);

+			AssertEquals("#MN01", CultureInfo.CurrentCulture.DateTimeFormat.GetAbbreviatedMonthName(jan1.Month),

+				DateAndTime.MonthName(jan1.Month, true));

+			AssertEquals("#MN02", CultureInfo.CurrentCulture.DateTimeFormat.GetMonthName(jan1.Month),

+				DateAndTime.MonthName(jan1.Month, false));

+

+			bool caughtException = false;

+

+			try {

+				DateAndTime.MonthName(0, false);

+			}

+			catch (Exception e) {

+				AssertEquals("#MN03", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+			AssertEquals("#MN04", true, caughtException);

+

+			caughtException = false;

+			

+			try {

+				DateAndTime.MonthName(14, false);

+			}

+			catch (Exception e) {

+				AssertEquals("#MN05", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+			AssertEquals("#MN06", true, caughtException);

+

+			//AssertEquals("#MN07", "", DateAndTime.MonthName(13, false));

+		}

+

+		public void TestWeekdayName () {

+			DateTime jan1 = new DateTime(2001, 1, 1, 1, 1, 1);

+			AssertEquals("#WN01", CultureInfo.CurrentCulture.DateTimeFormat.GetAbbreviatedDayName(jan1.DayOfWeek),

+				DateAndTime.WeekdayName((int)jan1.DayOfWeek + 1, true, FirstDayOfWeek.System));

+			AssertEquals("#WN02", CultureInfo.CurrentCulture.DateTimeFormat.GetDayName(jan1.DayOfWeek),

+				DateAndTime.WeekdayName((int)jan1.DayOfWeek + 1, false, FirstDayOfWeek.System));

+

+			bool caughtException = false;

+

+			try {

+				DateAndTime.WeekdayName(0, false, FirstDayOfWeek.System);

+			}

+			catch (Exception e) {

+				AssertEquals("#WN03", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+			AssertEquals("#WN04", true, caughtException);

+

+			caughtException = false;

+			

+			try {

+				DateAndTime.WeekdayName(8, false, FirstDayOfWeek.System);

+			}

+			catch (Exception e) {

+				AssertEquals("#WN05", typeof(ArgumentException), e.GetType());

+				caughtException = true;

+			}

+			AssertEquals("#WN06", true, caughtException);

+

+			AssertEquals("#WN07", "Monday", DateAndTime.WeekdayName((int)jan1.DayOfWeek + 1, false, FirstDayOfWeek.System));

+		}

+

+

+		

+

+

+	}

+}

diff --git a/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic_test.build b/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic_test.build
new file mode 100644
index 00000000000..3e205b08b8f
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/Test/Microsoft.VisualBasic_test.build
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+

+<!-- NAnt build file for System.Data_test.dll -->

+<!-- Target build (default) builds tests -->

+<!-- Target test runs tests -->

+

+<project name="System.Data_test" default="build">

+	<property name="debug" value="false"/>

+	<property name="nunit_home" value="..\..\..\nunit"/>

+

+	<target name="build">

+	</target>

+

+	<target name="assemblies">

+		<csc target="library" output="Microsoft.VisualBasic_test.dll" debug="${debug}">

+			<arg value="/nowarn:1595"/>

+			<sources>

+				<includes name="**/*.cs"/>

+				<excludes name="TheTests.cs"/>

+			</sources>

+			<references basedir="..\..\..\nunit">

+				<includes name="NUnitCore.dll"/>

+			</references>

+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->

+			<!--<arg value="/lib:../../lib/"/>-->

+			

+			<!-- cor compare dies with these currently -->

+			<!--<arg value="/nostdlib"/>--> 	<!-- don't reference mscorlib -->

+			<!--<arg value="/r:corlib.dll"/>-->

+			<arg value="/r:System.dll"/>

+			<arg value="/r:.\Microsoft.VisualBasic.dll"/>

+		</csc>

+

+<!--

+		<csc target="exe" output="RunTests.Microsoft.VisualBasic.exe" debug="${debug}">

+			<sources>

+				<includes name="**/*.cs"/>

+				<excludes name="AllTests.cs"/>

+			</sources>

+			<references basedir="..\..\..\nunit">

+				<includes name="NUnitBase.dll"/>

+			</references>

+			<arg value="/nowarn:1595"/>

+			<arg value="/noconfig"/>

+			<arg value="/r:..\..\lib\corlib.dll"/>

+			<arg value="/r:..\..\lib\System.dll"/>

+			<arg value="/r:..\..\lib\Microsoft.VisualBasic.dll"/>

+		</csc>

+

+-->

+	</target>

+

+	<target name="test" depends="assemblies">

+		<exec program="..\..\..\nunit\NUnitConsole" commandline="MonoTests.AllTests,Microsoft.VisualBasic_test.dll" failonerror="false"/>

+	</target>

+

+	<target name="clean">

+		<delete file="Microsoft.VisualBasic.dll" failonerror="false"/>

+		<delete file="Microsoft.VisualBasic_test.dll" failonerror="false"/>

+		<delete file="corlib.dll" failonerror="false"/>

+		<delete file="System.dll" failonerror="false"/>

+	</target>

+</project>

diff --git a/mcs/class/Microsoft.VisualBasic/list b/mcs/class/Microsoft.VisualBasic/list
new file mode 100644
index 00000000000..a6c1c5261f4
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/list
@@ -0,0 +1,62 @@
+Microsoft.VisualBasic/AppWinStyle.cs
+Microsoft.VisualBasic/CallType.cs
+Microsoft.VisualBasic/Collection.cs
+Microsoft.VisualBasic/ComClassAttribute.cs
+Microsoft.VisualBasic/CompareMethod.cs
+Microsoft.VisualBasic/Constants.cs
+Microsoft.VisualBasic/ControlChars.cs
+Microsoft.VisualBasic/Conversion.cs
+Microsoft.VisualBasic/DateAndTime.cs
+Microsoft.VisualBasic/DateFormat.cs
+Microsoft.VisualBasic/DateInterval.cs
+Microsoft.VisualBasic/DueDate.cs
+Microsoft.VisualBasic/ErrObject.cs
+Microsoft.VisualBasic/FileAttribute.cs
+Microsoft.VisualBasic/FileSystem.cs
+Microsoft.VisualBasic/Financial.cs
+Microsoft.VisualBasic/FirstDayOfWeek.cs
+Microsoft.VisualBasic/FirstWeekOfYear.cs
+Microsoft.VisualBasic/Globals.cs
+Microsoft.VisualBasic/Information.cs
+Microsoft.VisualBasic/Interaction.cs
+Microsoft.VisualBasic/MsgBoxResult.cs
+Microsoft.VisualBasic/MsgBoxStyle.cs
+Microsoft.VisualBasic/OpenAccess.cs
+Microsoft.VisualBasic/OpenMode.cs
+Microsoft.VisualBasic/OpenShare.cs
+Microsoft.VisualBasic/SpcInfo.cs
+Microsoft.VisualBasic/Strings.cs
+Microsoft.VisualBasic/TODOAttribute.cs
+Microsoft.VisualBasic/TabInfo.cs
+Microsoft.VisualBasic/TriState.cs
+Microsoft.VisualBasic/VBFixedArrayAttribute.cs
+Microsoft.VisualBasic/VBFixedStringAttribute.cs
+Microsoft.VisualBasic/VBMath.cs
+Microsoft.VisualBasic/VariantType.cs
+Microsoft.VisualBasic/VbStrConv.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/BooleanType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ByteType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/CharArrayType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/CharType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DateType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DecimalType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/DoubleType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ExceptionUtils.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/FlowControl.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/HostServices.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IVbHost.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IncompleteInitialization.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/IntegerType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LateBinding.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/LongType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ObjectType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/OptionCompareAttribute.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/OptionTextAttribute.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ProjectData.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/ShortType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/SingleType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StandardModuleAttribute.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StaticLocalInitFlag.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/StringType.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/TODOAttribute.cs
+Microsoft.VisualBasic/Microsoft.VisualBasic.CompilerServices/Utils.cs
diff --git a/mcs/class/Microsoft.VisualBasic/makefile.gnu b/mcs/class/Microsoft.VisualBasic/makefile.gnu
new file mode 100644
index 00000000000..499518f1965
--- /dev/null
+++ b/mcs/class/Microsoft.VisualBasic/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../..
+
+LIBRARY = ../lib/Microsoft.VisualBasic.dll
+
+LIB_LIST = list
+LIB_FLAGS = -r corlib -r System
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=./Test*
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/Mono.CSharp.Debugger/AssemblerWriterI386.cs b/mcs/class/Mono.CSharp.Debugger/AssemblerWriterI386.cs
new file mode 100644
index 00000000000..58ce935bdd0
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/AssemblerWriterI386.cs
@@ -0,0 +1,311 @@
+//
+// Mono.CSharp.Debugger/AssemblerWriterI386.cs
+//
+// Author:
+//   Martin Baulig (martin@gnome.org)
+//
+// IAssemblerWriter implementation for the Intel i386.
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.IO;
+	
+namespace Mono.CSharp.Debugger
+{
+	public class AssemblerWriterI386 : IAssemblerWriter
+	{
+		public AssemblerWriterI386 (StreamWriter writer) {
+			this.writer = writer;
+			writer.WriteLine ("#NOAPP");
+		}
+
+		private StreamWriter writer;
+		private static int next_anon_label_idx = 0;
+		private bool in_section = false;
+
+		public void WriteLabel (string label)
+		{
+			writer.WriteLine (".L_" + label + ":");
+		}
+
+		public int GetNextLabelIndex ()
+		{
+			return ++next_anon_label_idx;
+		}
+
+		public int WriteLabel ()
+		{
+			int index = ++next_anon_label_idx;
+
+			WriteLabel (index);
+
+			return index;
+		}
+
+		public void WriteLabel (int index)
+		{
+			char[] output = { '.', 'L', '_', '\0', '\0', '\0', '\0', '\0', '\0',
+					  ':', '\n' };
+
+			unchecked {
+				int value = (int) index;
+				output [3] = hex [(value & 0xf00000) >> 20];
+				output [4] = hex [(value & 0x0f0000) >> 16];
+				output [5] = hex [(value & 0x00f000) >> 12];
+				output [6] = hex [(value & 0x000f00) >>  8];
+				output [7] = hex [(value & 0x0000f0) >>  4];
+				output [8] = hex [(value & 0x00000f)];
+			}
+
+			writer.Write (output, 0, output.Length);
+		}
+
+		private static readonly char[] hex = { '0', '1', '2', '3', '4', '5', '6', '7',
+						       '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+
+		public void WriteUInt8 (bool value)
+		{
+			WriteUInt8 (value ? 1 : 0);
+		}
+
+		public void WriteUInt8 (int value)
+		{
+			char[] output = { '\t', '.', 'b', 'y', 't', 'e', ' ',
+					  '0', 'x', '\0', '\0',
+					  '\n' };
+
+			unchecked {
+				output [9] = hex [(value & 0xf0) >> 4];
+				output [10] = hex [value & 0x0f];
+			}
+
+			writer.Write (output, 0, output.Length);
+		}
+
+		public void WriteInt8 (int value)
+		{
+			char[] output = { '\t', '.', 'b', 'y', 't', 'e', ' ',
+					  '0', 'x', '\0', '\0',
+					  '\n' };
+
+			unchecked {
+				uint uvalue = (uint) value;
+				output [9] = hex [(uvalue & 0xf0) >> 4];
+				output [10] = hex [uvalue & 0x0f];
+			}
+
+			writer.Write (output, 0, output.Length);
+		}
+
+		public void Write2Bytes (int a, int b)
+		{
+			char[] output = { '\t', '.', 'b', 'y', 't', 'e', ' ',
+					  '0', 'x', '\0', '\0', ',', ' ',
+					  '0', 'x', '\0', '\0',
+					  '\n' };
+
+			unchecked {
+				uint ua = (uint) a;
+				uint ub = (uint) b;
+				output [9] = hex [(ua & 0xf0) >> 4];
+				output [10] = hex [ua & 0x0f];
+				output [15] = hex [(ub & 0xf0) >> 4];
+				output [16] = hex [ub & 0x0f];
+			}
+
+			writer.Write (output, 0, output.Length);
+		}
+
+		public void WriteUInt16 (int value)
+		{
+			writer.WriteLine ("\t.word " + value);
+		}
+
+		public void WriteInt16 (int value)
+		{
+			writer.WriteLine ("\t.word " + value);
+		}
+
+		public void WriteUInt32 (int value)
+		{
+			char[] output = { '\t', '.', 'l', 'o', 'n', 'g', ' ',
+					  '0', 'x', '\0', '\0', '\0', '\0', '\0', '\0',
+					  '\0', '\0', '\n' };
+
+			unchecked {
+				output [9] = hex [(value & 0xf0000000) >> 28];
+				output [10] = hex [(value & 0x0f000000) >> 24];
+				output [11] = hex [(value & 0x00f00000) >> 20];
+				output [12] = hex [(value & 0x000f0000) >> 16];
+				output [13] = hex [(value & 0x0000f000) >> 12];
+				output [14] = hex [(value & 0x00000f00) >>  8];
+				output [15] = hex [(value & 0x000000f0) >>  4];
+				output [16] = hex [(value & 0x0000000f)];
+			}
+
+			writer.Write (output, 0, output.Length);
+		}
+
+		public void WriteInt32 (int value)
+		{
+			char[] output = { '\t', '.', 'l', 'o', 'n', 'g', ' ',
+					  '0', 'x', '\0', '\0', '\0', '\0', '\0', '\0',
+					  '\0', '\0', '\n' };
+
+			unchecked {
+				uint uvalue = (uint) value;
+				output [9] = hex [(uvalue & 0xf0000000) >> 28];
+				output [10] = hex [(uvalue & 0x0f000000) >> 24];
+				output [11] = hex [(uvalue & 0x00f00000) >> 20];
+				output [12] = hex [(uvalue & 0x000f0000) >> 16];
+				output [13] = hex [(uvalue & 0x0000f000) >> 12];
+				output [14] = hex [(uvalue & 0x00000f00) >>  8];
+				output [15] = hex [(uvalue & 0x000000f0) >>  4];
+				output [16] = hex [(uvalue & 0x0000000f)];
+			}
+
+			writer.Write (output, 0, output.Length);
+		}
+
+		public void WriteSLeb128 (int value)
+		{
+			writer.WriteLine ("\t.sleb128 " + value);
+		}
+
+		public void WriteULeb128 (int value)
+		{
+			writer.WriteLine ("\t.uleb128 " + value);
+		}
+
+		public void WriteAddress (int value)
+		{
+			if (value == 0)
+				writer.WriteLine ("\t.long 0");
+			else
+				writer.WriteLine ("\t.long " + value);
+		}
+
+		public void WriteString (string value)
+		{
+			writer.WriteLine ("\t.string \"" + value + "\"");
+		}
+
+		public void WriteSectionStart (String section)
+		{
+			if (in_section)
+				throw new Exception ();
+			in_section = true;
+			writer.WriteLine ("\t.section ." + section);
+		}
+
+		public void WriteSectionEnd ()
+		{
+			in_section = false;
+		}
+
+		public void WriteRelativeOffset (int start_label, int end_label)
+		{
+			char[] output = { '\t', '.', 'l', 'o', 'n', 'g', ' ',
+					  '.', 'L', '_', '\0', '\0', '\0', '\0', '\0', '\0',
+					  ' ', '-', ' ',
+					  '.', 'L', '_', '\0', '\0', '\0', '\0', '\0', '\0',
+					  '\n' };
+
+			unchecked {
+				output [10] = hex [(end_label & 0xf00000) >> 20];
+				output [11] = hex [(end_label & 0x0f0000) >> 16];
+				output [12] = hex [(end_label & 0x00f000) >> 12];
+				output [13] = hex [(end_label & 0x000f00) >>  8];
+				output [14] = hex [(end_label & 0x0000f0) >>  4];
+				output [15] = hex [(end_label & 0x00000f)];
+				output [22] = hex [(start_label & 0xf00000) >> 20];
+				output [23] = hex [(start_label & 0x0f0000) >> 16];
+				output [24] = hex [(start_label & 0x00f000) >> 12];
+				output [25] = hex [(start_label & 0x000f00) >>  8];
+				output [26] = hex [(start_label & 0x0000f0) >>  4];
+				output [27] = hex [(start_label & 0x00000f)];
+			}
+
+			writer.Write (output, 0, output.Length);
+		}
+
+		public void WriteShortRelativeOffset (int start_label, int end_label)
+		{
+			char[] output = { '\t', '.', 'b', 'y', 't', 'e', ' ',
+					  '.', 'L', '_', '\0', '\0', '\0', '\0', '\0', '\0',
+					  ' ', '-', ' ',
+					  '.', 'L', '_', '\0', '\0', '\0', '\0', '\0', '\0',
+					  '\n' };
+
+			unchecked {
+				output [10] = hex [(end_label & 0xf00000) >> 20];
+				output [11] = hex [(end_label & 0x0f0000) >> 16];
+				output [12] = hex [(end_label & 0x00f000) >> 12];
+				output [13] = hex [(end_label & 0x000f00) >>  8];
+				output [14] = hex [(end_label & 0x0000f0) >>  4];
+				output [15] = hex [(end_label & 0x00000f)];
+				output [22] = hex [(start_label & 0xf00000) >> 20];
+				output [23] = hex [(start_label & 0x0f0000) >> 16];
+				output [24] = hex [(start_label & 0x00f000) >> 12];
+				output [25] = hex [(start_label & 0x000f00) >>  8];
+				output [26] = hex [(start_label & 0x0000f0) >>  4];
+				output [27] = hex [(start_label & 0x00000f)];
+			}
+
+			writer.Write (output, 0, output.Length);
+		}
+
+		public void WriteAbsoluteOffset (string label)
+		{
+			writer.WriteLine ("\t.long .L_" + label);
+		}
+
+		public void WriteAbsoluteOffset (int index)
+		{
+			char[] output = { '\t', '.', 'l', 'o', 'n', 'g', ' ',
+					  '.', 'L', '_', '\0', '\0', '\0', '\0', '\0', '\0',
+					  '\n' };
+
+			unchecked {
+				output [10] = hex [(index & 0xf00000) >> 20];
+				output [11] = hex [(index & 0x0f0000) >> 16];
+				output [12] = hex [(index & 0x00f000) >> 12];
+				output [13] = hex [(index & 0x000f00) >>  8];
+				output [14] = hex [(index & 0x0000f0) >>  4];
+				output [15] = hex [(index & 0x00000f)];
+			}
+
+			writer.Write (output, 0, output.Length);
+
+		}
+
+		public object StartSubsectionWithSize ()
+		{
+			int start_index = ++next_anon_label_idx;
+			int end_index = ++next_anon_label_idx;
+
+			WriteRelativeOffset (start_index, end_index);
+			WriteLabel (start_index);
+
+			return end_index;
+		}
+
+		public object StartSubsectionWithShortSize ()
+		{
+			int start_index = ++next_anon_label_idx;
+			int end_index = ++next_anon_label_idx;
+
+			WriteShortRelativeOffset (start_index, end_index);
+			WriteLabel (start_index);
+
+			return end_index;
+		}
+
+		public void EndSubsection (object end_index)
+		{
+			WriteLabel ((int) end_index);
+		}
+	}
+}
diff --git a/mcs/class/Mono.CSharp.Debugger/ChangeLog b/mcs/class/Mono.CSharp.Debugger/ChangeLog
new file mode 100644
index 00000000000..ee7aedf40d0
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/ChangeLog
@@ -0,0 +1,261 @@
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* MonoSymbolWriter.cs (MonoSymbolWriter.Initialize): Added
+	assembly name argument.  Since the symbol writer needs to read the
+	final assembly, we need to give it its full pathname.
+
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* makefile.gnu, list.unix: Added.
+
+2002-07-05  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs: Added support for types in referenced assemblies.
+
+2002-07-05  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs: Added support for arrays.
+
+	* gdb-csharp-support.patch: Updated.
+
+2002-06-29  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs (DieInheritance): Make this actually work.
+
+2002-06-29  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs, MonoSymbolWriter.cs: Put all TAG_subprogram's into their
+	corresponding struct/class declarations.
+
+2002-06-28  Martin Baulig  <martin@gnome.org>
+
+	* gdb-csharp-support.patch: Updated.
+
+2002-06-28  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs: Use a TAG_string_type when we're using GNU extensions.
+	Make static struct/class fields actually work.  Provide a TAG_typedef for struct's
+	and classes.
+
+2002-05-30  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter (IMonoSymbolWriter): Added custom `Initialize' method.
+
+	* MonoSymbolWriter.cs (Initialize): The ISymbolWriter's `Initialize' method
+	is no longer supported and throws an exception.
+	(Initialize (string, string[])): New custom initialization function.
+
+	* MonoDwarfFileWriter.cs (DwarfFileWriter): Added `string[] args' argument
+	to the constructor to pass command line arguments.
+
+	* gdb-csharp-support.patch: Updated for GDB 5.2.
+
+2002-05-30  Martin Baulig  <martin@gnome.org>
+
+	* MonoSymbolWriter.cs (MonoSymbolWriter): The constructor now get's the
+	AssemblyBuilder's `methods' array as third argument.
+	(OpenMethod): Use this array to get the method builder rather than using an
+	interncall for it.
+	(get_method_builder): Removed this interncall.
+
+2002-05-25  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs: Finished the type rewrite, put back strings and arrays.
+
+2002-05-24  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter.cs (ISourceMethod): Added `FullName' and `Parameters'.
+	(ITypeHandle): New interface.
+
+	* DwarfFileWriter.cs: Largely reorganized the type writing code.  Types are
+	now represented by ITypeHandle objects which are stored in a per-dwarf-writer
+	hash table.  At the moment, all types still need to be in one compile unit due
+	to lacking support in gdb - but this new type code here already supports this.
+
+	* MonoSymbolWriter.cs: Moved all the subclasses to the top-level and made them
+	public, cleaned up the code, put everything into one compile unit.
+	(DefineLocalVariable): Added a version of this function which takes useful args.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter.cs (IMonoSymbolWriter): Added `Sources' and `Methods'
+	properties.
+
+	* MonoDwarfFileWriter.cs (WriteSymbolTable): New public method.  Moved the
+	code that writes the "mono_line_numbers" section here from the LineNumberEngine.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter.cs (IVariable): Replaced Token with `ISourceMethod Method'.
+
+	* MonoSymbolWriter.cs (MonoSymbolWriter): The constructor now has an additional
+	ModuleBuilder argument.
+	(OpenMethod): Immediately call the `get_method' interncall to get the MethodBase
+	from the token, then store the MethodBase instead of the token.  The token may
+	still change during the metadata library's fixup process.
+	(DoFixups): When the image has been written to disk, call the GetToken () method
+	on all MethodBuilders and all ConstructorBuilders to get the final metadata tokens.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* AssemblerWriterI386.cs: Don't use GNU extensions and produce assembler
+	output which is free of comments and extra whitespaces so that it's suitable
+	for `as -f'.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter.cs (ISourceMethod): Replaced `MethodInfo MethodInfo' with
+	`MethodBase MethodBase' and added `Type ReturnType'.  We're now correctly
+	dealing with constructors and not crashing anymore.
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs: Write a special line number table which can be read
+	in by the metadata library to get line number information in backtraces.
+
+2002-05-06  Martin Baulig  <martin@gnome.org>
+
+	* MonoSymbolWriter.cs (MonoSymbolWriter.Close): Use Assembly.LoadFrom (), not
+	AppDomain.Load () to load the assembly.
+
+2002-04-26  Martin Baulig  <martin@gnome.org>
+
+	* gdb-csharp-support.patch: A patch for GDB (against the latest CVS version)
+	to implement C# support.
+
+	* csharp-lang.c, csharp-lang.h, csharp-mono-lang.c: Copy these into your GDB
+	source directory after applying the patch.
+
+2002-04-26  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs (DieInternalString): Removed.
+
+2002-04-25  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs: Reflect latest MonoString changes.
+
+2002-04-13  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter.cs (ISourceBlock): Added `Blocks' property and `AddBlock'
+	method to support nested blocks.
+
+	* MonoSymbolWriter.cs: Correctly handle nested blocks.
+
+	* MonoDwarfFileWriter.cs (DieMember): Provide info for all fields, not just for
+	public ones; also added DW_AT_accessibility.
+	(DieVariable): Reflected latest debug-symfile.c changes.
+
+2002-04-12  Martin Baulig  <martin@gnome.org>
+
+	* gdb-variable-scopes.patch: A patch for GDB (against the latest CVS version)
+	to implement variable lifetimes.
+
+2002-04-12  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs (DieVariable): Provide info about the variable's
+	lifetime using DW_AT_begin_scope and a new baulig extension DW_AT_end_scope.
+
+2002-03-29  Martin Baulig  <martin@gnome.org>
+
+	* AssemblerWriterI386.cs: Rewrote most of the string output function, do the
+	number->string conversion manually. It's now taking about 15 seconds to write
+	a symbol file for MCS, no longer more than a minute.
+
+	* MonoDwarfFileWriter.cs: Added some profiling code, speeded things up, fixed
+	a few bugs.
+
+2002-03-25  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs (CreateType): Return a `DieType'.
+	(RegisterType): Add the type to the type hash before creating dependency types
+	so we don't get recursion loops.
+	(RegisterPointerType): New func to register a "pointer to type" type.
+	(DieTypeDef, DiePointerType, DieArrayType, DieStringType, DieClassType): New
+	types; added support for strings, arrays and basic support for classes.
+	
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter.cs: Killed all methods in this interface, no longer needed.
+
+	* MonoSymbolWriter.cs (MonoSymbolWriter): The constructor now takes a string
+	argument which is the full pathname of the assembly - you must call Close()
+	after the assembly has been written to disk since the symbol writer needs to
+	load the finished assembly to get its metadata.
+
+	* MonoDwarfFileWriter.cs: Added support for enums and structs.
+	
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* MonoDwarfFileWriter.cs: Added support for method parameters.
+
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter.cs (IMonoSymbolWriter): Removed my custom OpenMethod(),
+	we're now using the ISymbolWriter's method.
+	(IVariable): Added `byte[] Signature' property.
+
+	* MonoSymbolWriter.cs (SetAssembly): New method. This must be called before
+	Close(); the assembly parameter is the already-written assembly, ie. it must
+	contain the full metadata.
+	(OpenMethod): Only take the token argument and set MethodInfo later in DoFixups.
+	(SetMethodSourceRange): You must call this function to tell the symbol writer
+	in which source file the method is defined.
+	(DefineLocal): Store the signature in the local.
+	(DoFixups): Use two new interncalls to set the SourceMethod's MethodInfo field
+	and the LocalVariable's Type field.
+
+2002-03-23  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter.cs (ISourceBlock): New interface.
+	(ILocalVariable): Renamed this interface to IVariable.
+	(IVariable): Added Line, Type, Token.
+	(ILocalVariable, IMethodParameter): New interfaces, derive from IVariable.
+	(ISourceMethod): Added Blocks. Renamed FirstLine and LastLine to Start and End,
+	changed their type to ISourceLine. Removed CodeSize.
+	(ISourceLine): Renamed Line to Row, added Column. Added OffsetType and Offset.
+
+	* MonoDwarfFileWriter.cs (MonoDwarfFileWriter.DieLexicalBlock): New class.
+	(MonoDwarfFileWriter.DieMethodVariable): New class.
+
+	* MonoSymbolWriter.cs (OpenScope, CloseScope): Implemented.
+	Reflected latest IMonoSymbolWriter interface changes.
+
+2002-03-20  Martin Baulig  <martin@gnome.org>
+
+	* IAssemblerWriter.cs: New interface.
+
+	* AssemblerWriterI386.cs: New class.
+
+	* MonoDwarfFileWriter.cs: Use the IAssemblerWriter interface to make this class
+	platform and assembler independent.
+
+2002-03-20  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter.cs (ISourceMethod): Added FirstLine, LastLine, CodeSize and
+	Token properties.
+
+	* MonoDwarfFileWriter.cs: Implemented line number support.
+
+2002-03-19  Martin Baulig  <martin@gnome.org>
+
+	* IMonoSymbolWriter.cs (ISourceFile, ISourceMethod, ISourceLine, ILocalVariable):
+	New interfaces.
+
+	* IMonoSymbolWriter.cs (OpenMethod): Take a System.Reflection.MethodInfo, not
+	a string.
+
+2002-03-19  Martin Baulig  <martin@gnome.org>
+
+	This is an implementation of the System.Diagnostics.SymbolStore.SymbolWriter
+	interface. It's still work in progress and not yet used anywhere.
+
+	There is some preliminary documentation in the source files and some more
+	docu in the README and README.relocation-table files.
+
+	* IMonoSymbolWriter.cs: New file.
+	* MonoDwarfFileWriter.cs: New file.
+	* MonoSymbolDocumentWriter.cs: New file.
+	* MonoSymbolWriter.cs: New file.
+
+	* README, README.relocation-table: Documentation.
+
diff --git a/mcs/class/Mono.CSharp.Debugger/IAssemblerWriter.cs b/mcs/class/Mono.CSharp.Debugger/IAssemblerWriter.cs
new file mode 100644
index 00000000000..169b9fc073e
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/IAssemblerWriter.cs
@@ -0,0 +1,70 @@
+//
+// Mono.CSharp.Debugger/IAssemblerWriter.cs
+//
+// Author:
+//   Martin Baulig (martin@gnome.org)
+//
+// This is a platform and assembler independent assembler output interface.
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Collections;
+using System.IO;
+	
+namespace Mono.CSharp.Debugger
+{
+	public interface IAssemblerWriter
+	{
+		int GetNextLabelIndex ();
+
+		void WriteLabel (int index);
+
+		void WriteLabel (string label);
+
+		int WriteLabel ();
+
+		void WriteUInt8 (bool value);
+
+		void WriteUInt8 (int value);
+
+		void WriteInt8 (int value);
+
+		void Write2Bytes (int a, int b);
+
+		void WriteUInt16 (int value);
+
+		void WriteInt16 (int value);
+
+		void WriteUInt32 (int value);
+
+		void WriteInt32 (int value);
+
+		void WriteSLeb128 (int value);
+
+		void WriteULeb128 (int value);
+
+		void WriteAddress (int value);
+
+		void WriteString (string value);
+
+		void WriteSectionStart (String section);
+
+		void WriteSectionEnd ();
+
+		void WriteRelativeOffset (int start_label, int end_label);
+
+		void WriteShortRelativeOffset (int start_label, int end_label);
+
+		void WriteAbsoluteOffset (int index);
+
+		void WriteAbsoluteOffset (string label);
+
+		object StartSubsectionWithSize ();
+
+		object StartSubsectionWithShortSize ();
+
+		void EndSubsection (object end_index);
+	}
+}
diff --git a/mcs/class/Mono.CSharp.Debugger/IMonoSymbolWriter.cs b/mcs/class/Mono.CSharp.Debugger/IMonoSymbolWriter.cs
new file mode 100644
index 00000000000..d365590cc21
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/IMonoSymbolWriter.cs
@@ -0,0 +1,200 @@
+//
+// System.Diagnostics.SymbolStore/IMonoSymbolWriter.cs
+//
+// Author:
+//   Martin Baulig (martin@gnome.org)
+//
+// This interface is derived from System.Diagnostics.SymbolStore.ISymbolWriter.
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Diagnostics.SymbolStore;
+using System.Collections;
+using System.IO;
+	
+namespace Mono.CSharp.Debugger
+{
+	public interface IMonoSymbolWriter : ISymbolWriter
+	{
+		ISourceMethod[] Methods {
+			get;
+		}
+
+		ISourceFile[] Sources {
+			get;
+		}
+
+		void Initialize (string assembly_filename, string filename, string[] args);
+	}
+
+	public interface ISourceFile
+	{
+		string FileName {
+			get;
+		}
+
+		ISourceMethod[] Methods {
+			get;
+		}
+
+		void AddMethod (ISourceMethod method);
+	}
+
+	public interface ISourceMethod
+	{
+		ISourceLine[] Lines {
+			get;
+		}
+
+		void AddLine (ISourceLine line);
+
+		ISourceBlock[] Blocks {
+			get;
+		}
+
+		ILocalVariable[] Locals {
+			get;
+		}
+
+		void AddLocal (ILocalVariable local);
+
+
+		ISourceLine Start {
+			get;
+		}
+
+		ISourceLine End {
+			get;
+		}
+
+		string FullName {
+			get;
+		}
+
+		int Token {
+			get;
+		}
+
+		Type ReturnType {
+			get;
+		}
+
+		ParameterInfo[] Parameters {
+			get;
+		}
+
+		MethodBase MethodBase {
+			get;
+		}
+
+		ISourceFile SourceFile {
+			get;
+		}
+	}
+
+	public interface ISourceBlock
+	{
+		ISourceMethod SourceMethod {
+			get;
+		}
+
+		ILocalVariable[] Locals {
+			get;
+		}
+
+		void AddLocal (ILocalVariable local);
+
+		ISourceBlock[] Blocks {
+			get;
+		}
+
+		void AddBlock (ISourceBlock block);
+
+		ISourceLine Start {
+			get;
+		}
+
+		ISourceLine End {
+			get;
+		}
+
+		int ID {
+			get;
+		}
+	}
+
+	public enum SourceOffsetType
+	{
+		OFFSET_NONE,
+		OFFSET_IL,
+		OFFSET_LOCAL,
+		OFFSET_PARAMETER
+	}
+
+	public interface ISourceLine
+	{
+		SourceOffsetType OffsetType {
+			get;
+		}
+
+		int Offset {
+			get;
+		}
+
+		int Row {
+			get;
+		}
+
+		int Column {
+			get;
+		}
+	}
+
+	public interface ITypeHandle
+	{
+		string Name {
+			get;
+		}
+
+		Type Type {
+			get;
+		}
+
+		int Token {
+			get;
+		}
+	}
+
+	public interface IVariable
+	{
+		string Name {
+			get;
+		}
+
+		ISourceLine Line {
+			get;
+		}
+
+		ITypeHandle TypeHandle {
+			get;
+		}
+
+		ISourceMethod Method {
+			get;
+		}
+
+		int Index {
+			get;
+		}
+	}
+
+	public interface ILocalVariable : IVariable
+	{ }
+
+	public interface IMethodParameter : IVariable
+	{ }
+}
diff --git a/mcs/class/Mono.CSharp.Debugger/Mono.CSharp.Debugger.build b/mcs/class/Mono.CSharp.Debugger/Mono.CSharp.Debugger.build
new file mode 100644
index 00000000000..04c1931126a
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/Mono.CSharp.Debugger.build
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for Mono.CSharp.Debugger.dll -->
+
+<project name="Mono.CSharp.Debugger" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<csc target="library" output="../lib/Mono.CSharp.Debugger.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/unsafe"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/>
+			</sources>
+			<references>
+				<includes name="../lib/corlib.dll"/>
+			</references>
+		</csc>
+	</target>
+	<target name="clean">
+		<delete file="../lib/Mono.CSharp.Debugger.dll" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/Mono.CSharp.Debugger/MonoDwarfFileWriter.cs b/mcs/class/Mono.CSharp.Debugger/MonoDwarfFileWriter.cs
new file mode 100755
index 00000000000..00f0d1ccf77
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/MonoDwarfFileWriter.cs
@@ -0,0 +1,2822 @@
+//
+// System.Diagnostics.SymbolStore/MonoDwarfWriter.cs
+//
+// Author:
+//   Martin Baulig (martin@gnome.org)
+//
+// This is the default implementation of the System.Diagnostics.SymbolStore.ISymbolWriter
+// interface.
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+using System.Diagnostics.SymbolStore;
+using System.Collections;
+using System.Text;
+using System.IO;
+	
+namespace Mono.CSharp.Debugger
+{
+	public class DwarfFileWriter
+	{
+		protected const string producer_id = "Mono C# Compiler 0.01 03-18-2002";
+
+		protected ArrayList compile_units = new ArrayList ();
+		protected ArrayList line_number_engines = new ArrayList ();
+		protected StreamWriter writer = null;
+		protected IAssemblerWriter aw = null;
+		protected string symbol_file = null;
+
+		public bool timestamps = false;
+		public bool use_gnu_extensions = false;
+
+		// Write a generic file which contains no machine dependant stuff but
+		// only function and type declarations.
+		protected readonly bool DoGeneric = false;
+
+		public readonly TypeHandle void_type;
+		public readonly TypeHandle int_type;
+		public readonly TypeHandle char_type;
+		public readonly TypeHandle array_type;
+		public readonly TypeHandle array_bounds_type;
+		public readonly TypeHandle string_type;
+		public readonly DieCompileUnit DieGlobalCompileUnit;
+
+		//
+		// DwarfFileWriter public interface
+		//
+		public DwarfFileWriter (string symbol_file, string[] args)
+		{
+			foreach (string arg in args) {
+				if (arg.StartsWith ("output="))
+					symbol_file = arg.Substring (7);
+				else if (arg == "timestamp")
+					timestamps = true;
+				else if (arg == "gnu_extensions")
+					use_gnu_extensions = true;
+				else if (arg == "generic")
+					DoGeneric = true;
+				else
+					Console.WriteLine ("Symbol writer warning: Unknown argument: " + arg);
+			}
+
+			this.symbol_file = symbol_file;
+			this.writer = new StreamWriter (symbol_file, false, Encoding.ASCII);
+			this.aw = new AssemblerWriterI386 (this.writer);
+			this.last_time = DateTime.Now;
+
+			CompileUnit compile_unit = new CompileUnit (this, symbol_file);
+			DieGlobalCompileUnit = new DieCompileUnit (compile_unit);
+
+			void_type = RegisterType (typeof (void));
+			RegisterType (typeof (bool));
+			char_type = RegisterType (typeof (char));
+			RegisterType (typeof (SByte));
+			RegisterType (typeof (Byte));
+			RegisterType (typeof (Int16));
+			RegisterType (typeof (UInt16));
+			int_type = RegisterType (typeof (Int32));
+			RegisterType (typeof (UInt32));
+			RegisterType (typeof (Int64));
+			RegisterType (typeof (UInt64));
+			RegisterType (typeof (Single));
+			RegisterType (typeof (Double));
+			if (!use_gnu_extensions) {
+				array_type = RegisterType (typeof (MonoArray));
+				array_bounds_type = RegisterType (typeof (MonoArrayBounds));
+				string_type = RegisterType (typeof (MonoString));
+			}
+		}
+
+		DateTime last_time;
+		void ShowTime (string msg)
+		{
+			DateTime now = DateTime.Now;
+			TimeSpan span = now - last_time;
+			last_time = now;
+
+			Console.WriteLine (
+				"MonoDwarfFileWriter [{0:00}:{1:000}] {2}",
+				(int) span.TotalSeconds, span.Milliseconds, msg);
+		}
+
+		public void CreateTypes ()
+		{
+			types_closed = true;
+		}
+
+		// Writes the final dwarf file.
+		public void Close ()
+		{
+			CreateTypes ();
+
+			if (timestamps)
+				ShowTime ("Emitting compile units");
+
+			foreach (CompileUnit compile_unit in compile_units)
+				compile_unit.Emit ();
+
+			if (timestamps)
+				ShowTime ("Done");
+
+			foreach (LineNumberEngine line_number_engine in line_number_engines)
+				line_number_engine.Emit ();
+
+			if (timestamps)
+				ShowTime ("Done emitting " + LineNumberEngine.count + " line numbers");
+
+			WriteAbbrevDeclarations ();
+			if (timestamps)
+				ShowTime ("Done writing abbrev declarations");
+
+			WriteRelocEntries ();
+			if (timestamps)
+				ShowTime ("Done writing " + reloc_entries.Count + " reloc entries");
+
+			writer.Close ();
+		}
+
+		// Adds a new compile unit to this dwarf file
+		public void AddCompileUnit (CompileUnit compile_unit)
+		{
+			compile_units.Add (compile_unit);
+		}
+
+		// Adds a new line number engine to this dwarf file
+		public void AddLineNumberEngine (LineNumberEngine line_number_engine)
+		{
+			line_number_engines.Add (line_number_engine);
+		}
+
+		public IAssemblerWriter AssemblerWriter {
+			get {
+				return aw;
+			}
+		}
+
+		// This string is written into the generated dwarf file to identify the
+		// producer and version number.
+		public string ProducerID {
+			get {
+				return producer_id;
+			}
+		}
+
+		private Hashtable type_hash = new Hashtable ();
+		private bool types_closed = false;
+
+		public TypeHandle RegisterType (Type type)
+		{
+			if (types_closed)
+				throw new InvalidOperationException ();
+
+			if (type_hash.Contains (type))
+				return (TypeHandle) type_hash [type];
+
+			TypeHandle handle = new TypeHandle (type);
+			type_hash.Add (type, handle);
+
+			if (!use_gnu_extensions) {
+				if (type.IsArray && (type != typeof (Array)))
+					handle.CreateArrayType (RegisterType (type.GetElementType ()));
+				else if (type.Equals (typeof (MonoString)))
+					handle.CreateStringType (char_type);
+			} else {
+				if (type.IsArray & (type != typeof (Array)))
+					handle.ArrayElementType = RegisterType (type.GetElementType ());
+			}
+
+			handle.CreateType (DieGlobalCompileUnit);
+
+			return handle;
+		}
+
+		//
+		// This is used to reference types.
+		//
+
+		public class TypeHandle : ITypeHandle
+		{
+			protected static ArrayList external_types = new ArrayList ();
+
+			protected readonly Type type;
+			protected DieType type_die;
+			protected int token;
+			protected Die pointer_die;
+			protected TypeHandle array_bounds_type;
+			protected TypeHandle array_vector_type;
+			protected TypeHandle array_element_type;
+
+			public TypeHandle (Type type)
+			{
+				this.type = type;
+			}
+
+			public void CreateArrayType (TypeHandle element_type)
+			{
+				this.array_element_type = element_type;
+				this.array_bounds_type = new TypeHandle_ArrayBounds (type.GetArrayRank ());
+				this.array_vector_type = new TypeHandle_ArrayVector (array_element_type);
+			}
+
+			public void CreateStringType (TypeHandle element_type)
+			{
+				this.array_element_type = element_type;
+				this.array_vector_type = new TypeHandle_ArrayVector (element_type);
+			}
+
+			public string Name {
+				get {
+					return type.FullName;
+				}
+			}
+
+			public Type Type {
+				get {
+					return type;
+				}
+			}
+
+			public int Token {
+				get {
+					if ((token == 0) && !type.Equals (typeof (object)))
+						throw new InvalidOperationException ();
+
+					return token;
+				}
+			}
+
+			public DieType TypeDie {
+				get {
+					if (type_die == null)
+						throw new InvalidOperationException ();
+					else
+						return type_die;
+				}
+			}
+
+			public ITypeHandle ArrayBoundsType {
+				get {
+					if (array_bounds_type == null)
+						throw new InvalidOperationException ();
+					else
+						return array_bounds_type;
+				}
+			}
+
+			public ITypeHandle ArrayElementType {
+				get {
+					if (array_element_type == null)
+						throw new InvalidOperationException ();
+					else
+						return array_element_type;
+				}
+				set {
+					array_element_type = (TypeHandle) value;
+				}
+			}
+
+			public ITypeHandle ArrayVectorType {
+				get {
+					if (array_vector_type == null)
+						throw new InvalidOperationException ("FUCK: " + type);
+					else
+						return array_vector_type;
+				}
+			}
+
+			public Die PointerDie {
+				get {
+					return pointer_die;
+				}
+			}
+
+			public static Type[] ExternalTypes {
+				get {
+					Type[] retval = new Type [external_types.Count];
+					external_types.CopyTo (retval, 0);
+					return retval;
+				}
+			}
+
+			public virtual void CreateType (DieCompileUnit parent_die)
+			{
+				if (type_die != null)
+					return;
+
+				if (array_bounds_type != null)
+					array_bounds_type.CreateType (parent_die);
+				if (array_element_type != null)
+					array_element_type.CreateType (parent_die);
+				if (array_vector_type != null)
+					array_vector_type.CreateType (parent_die);
+
+				ITypeHandle void_type = parent_die.Writer.void_type;
+
+				if ((type.IsPrimitive && !type.IsByRef) || (type == typeof (void))) {
+					type_die = new DieBaseType (parent_die, this);
+					return;
+				} else if (type.Equals (typeof (string))) {
+					if (parent_die.Writer.use_gnu_extensions)
+						type_die = new DieMonoStringType (parent_die);
+					else
+						type_die = new DieStringType (parent_die, this);
+					pointer_die = new DieInternalPointer (parent_die, type_die);
+					type_die.CreateType ();
+					return;
+				} else if (type.IsArray && (type != typeof (Array))) {
+					if (parent_die.Writer.use_gnu_extensions)
+						type_die = new DieMonoArrayType (parent_die, this);
+					else
+						type_die = new DieArrayType (parent_die, this);
+					pointer_die = new DieInternalPointer (parent_die, type_die);
+					type_die.CreateType ();
+					return;
+				} else if (type.Equals (typeof (MonoArrayBounds))) {
+					type_die = new DieArrayBoundsType (parent_die, this);
+					pointer_die = new DieInternalPointer (parent_die, type_die);
+					type_die.CreateType ();
+					return;
+				} else if (type.IsPointer || type.IsByRef) {
+					type_die = new DiePointerType (parent_die, type);
+					type_die.CreateType ();
+					return;
+				}
+
+				if (type is TypeBuilder)
+					token = ((TypeBuilder) type).TypeToken.Token;
+				else if (!type.Equals (typeof (object)))
+					token = external_types.Add (type) + 1;
+
+				if (type.IsPointer || type.IsByRef)
+					type_die = new DiePointerType (parent_die, type);
+				else if (type.IsEnum)
+					type_die = new DieEnumType (parent_die, this);
+				else if (type.IsValueType) {
+					type_die = new DieStructureType (parent_die, this);
+					new DieInternalTypeDef (parent_die, type_die, type.FullName);
+				} else if (type.IsClass) {
+					type_die = new DieClassType (parent_die, this);
+					pointer_die = new DieInternalPointer (parent_die, type_die);
+					new DieInternalTypeDef (parent_die, type_die, type.FullName);
+				} else
+					type_die = new DieTypeDef (parent_die, void_type, type.FullName);
+
+				type_die.CreateType ();
+			}
+		}
+
+		public class TypeHandle_ArrayBounds : TypeHandle
+		{
+			private readonly int rank;
+
+			public TypeHandle_ArrayBounds (int rank)
+				: base (typeof (MonoArrayBounds))
+			{
+				this.rank = rank;
+			}
+
+			public override void CreateType (DieCompileUnit parent_die)
+			{
+				ITypeHandle int_type = parent_die.Writer.int_type;
+				ITypeHandle array_bounds_type = parent_die.Writer.array_bounds_type;
+
+				type_die = new DieInternalArray (parent_die, array_bounds_type);
+				new DieSubRangeType (type_die, int_type, 0, rank);
+
+				type_die.CreateType ();
+			}
+		}
+
+		public class TypeHandle_ArrayVector : TypeHandle
+		{
+			TypeHandle element_type;
+
+			public TypeHandle_ArrayVector (TypeHandle element_type)
+				: base (element_type.Type)
+			{
+				this.element_type = element_type;
+			}
+
+			public override void CreateType (DieCompileUnit parent_die)
+			{
+				ITypeHandle int_type = parent_die.Writer.int_type;
+
+				type_die = new DieInternalArray (parent_die, element_type);
+				new DieSubRangeType (type_die, int_type, 0, -1);
+
+				type_die.CreateType ();
+			}
+		}
+
+		//
+		// A compile unit refers to a single C# source file.
+		//
+		public class CompileUnit
+		{
+			protected DwarfFileWriter dw;
+			protected IAssemblerWriter aw;
+			protected string source_file;
+			protected ArrayList dies = new ArrayList ();
+
+			public readonly int ReferenceIndex;
+
+			public CompileUnit (DwarfFileWriter dw, string source_file, Die[] dies)
+			{
+				this.dw = dw;
+				this.aw = dw.AssemblerWriter;
+				this.source_file = source_file;
+				if (dies != null)
+					this.dies.AddRange (dies);
+
+				this.ReferenceIndex = this.aw.GetNextLabelIndex ();
+
+				dw.AddCompileUnit (this);
+			}
+
+			//
+			// Construct a new compile unit for source file @source_file.
+			//
+			// This constructor automatically adds the newly created compile
+			// unit to the DwarfFileWriter's list of compile units.
+			//
+			public CompileUnit (DwarfFileWriter dw, string source_file)
+				: this (dw, source_file, null)
+			{ }
+
+			public string SourceFile {
+				get {
+					return source_file;
+				}
+			}
+
+			public string ProducerID {
+				get {
+					return dw.ProducerID;
+				}
+			}
+
+			public DwarfFileWriter DwarfFileWriter
+			{
+				get {
+					return dw;
+				}
+			}
+
+			// Add a new debugging information entry to this compile unit.
+			public void AddDie (Die die)
+			{
+				dies.Add (die);
+			}
+
+			// Write the whole compile unit to the dwarf file.
+			public void Emit ()
+			{
+				object start_index, end_index;
+
+				dw.WriteSectionStart (Section.DEBUG_INFO);
+
+				aw.WriteLabel (ReferenceIndex);
+
+				start_index = aw.WriteLabel ();
+
+				end_index = aw.StartSubsectionWithSize ();
+				aw.WriteUInt16 (2);
+				aw.WriteAbsoluteOffset ("debug_abbrev_b");
+				if (dw.DoGeneric)
+					aw.WriteUInt8 (4);
+				else {
+					dw.AddRelocEntry (RelocEntryType.TARGET_ADDRESS_SIZE);
+					aw.WriteUInt8 (4);
+				}
+
+				if (dies != null)
+					foreach (Die die in dies)
+						die.Emit ();
+
+				aw.EndSubsection (end_index);
+
+				aw.WriteSectionEnd ();
+			}
+		}
+
+		public class LineNumberEngine
+		{
+			public readonly int ReferenceIndex;
+
+			public readonly int LineBase = 1;
+			public readonly int LineRange = 8;
+
+			protected DwarfFileWriter dw;
+			protected IAssemblerWriter aw;
+
+			public readonly int[] StandardOpcodeSizes = {
+				0, 0, 1, 1, 1, 1, 0, 0, 0, 0
+			};
+
+			public readonly int OpcodeBase;
+
+			public static int count = 0;
+
+			private Hashtable _sources = new Hashtable ();
+			private Hashtable _directories = new Hashtable ();
+			private Hashtable _methods = new Hashtable ();
+
+			private int next_source_id;
+			private int next_directory_id;
+
+			private int next_method_id;
+
+			private enum DW_LNS {
+				LNS_extended_op		= 0,
+				LNS_copy		= 1,
+				LNS_advance_pc		= 2,
+				LNS_advance_line	= 3,
+				LNS_set_file		= 4,
+				LNS_set_column		= 5,
+				LNS_negate_stmt		= 6,
+				LNS_set_basic_block	= 7,
+				LNS_const_add_pc	= 8,
+				LNS_fixed_advance_pc	= 9
+			};
+
+			private enum DW_LNE {
+				LNE_end_sequence	= 1,
+				LNE_set_address		= 2,
+				LNE_define_file		= 3
+			};
+
+			public ISourceFile[] Sources {
+				get {
+					ISourceFile[] retval = new ISourceFile [_sources.Count];
+
+					foreach (ISourceFile source in _sources.Keys)
+						retval [(int) _sources [source] - 1] = source;
+
+					return retval;
+				}
+			}
+
+			public string[] Directories {
+				get {
+					string[] retval = new string [_directories.Count];
+
+					foreach (string directory in _directories.Keys)
+						retval [(int) _directories [directory] - 1] = directory;
+
+					return retval;
+				}
+			}
+
+			public ISourceMethod[] Methods {
+				get {
+					ISourceMethod[] retval = new ISourceMethod [_methods.Count];
+
+					foreach (ISourceMethod method in _methods.Keys) {
+						retval [(int) _methods [method] - 1] = method;
+					}
+
+					return retval;
+				}
+			}
+			
+			public LineNumberEngine (DwarfFileWriter writer)
+			{
+				this.dw = writer;
+				this.aw = writer.AssemblerWriter;
+				this.ReferenceIndex = aw.GetNextLabelIndex ();
+
+				dw.AddLineNumberEngine (this);
+			}
+
+			public int LookupSource (ISourceFile source)
+			{
+				if (_sources.ContainsKey (source))
+					return (int) _sources [source];
+
+				int index = ++next_source_id;
+				_sources.Add (source, index);
+				return index;
+			}
+
+			public int LookupDirectory (string directory)
+			{
+				if (_directories.ContainsKey (directory))
+					return (int) _directories [directory];
+
+				int index = ++next_directory_id;
+				_directories.Add (directory, index);
+				return index;
+			}
+
+			public void AddMethod (ISourceMethod method)
+			{
+				LookupSource (method.SourceFile);
+
+				int index = ++next_method_id;
+				_methods.Add (method, index);
+			}
+
+			private void SetFile (ISourceFile source)
+			{
+				aw.WriteInt8 ((int) DW_LNS.LNS_set_file);
+				aw.WriteULeb128 (LookupSource (source));
+			}
+
+			private int st_line = 1;
+
+			private void SetLine (int line)
+			{
+				aw.WriteInt8 ((int) DW_LNS.LNS_advance_line);
+				aw.WriteSLeb128 (line - st_line);
+				st_line = line;
+			}
+
+			private void SetAddress (int token, int address)
+			{
+				aw.WriteUInt8 (0);
+				object end_index = aw.StartSubsectionWithShortSize ();
+				aw.WriteUInt8 ((int) DW_LNE.LNE_set_address);
+				dw.AddRelocEntry (RelocEntryType.IL_OFFSET, token, address);
+				aw.WriteAddress (0);
+				aw.EndSubsection (end_index);
+			}
+
+			private void SetStartAddress (int token)
+			{
+				aw.WriteUInt8 (0);
+				object end_index = aw.StartSubsectionWithShortSize ();
+				aw.WriteUInt8 ((int) DW_LNE.LNE_set_address);
+				dw.AddRelocEntry (RelocEntryType.METHOD_START_ADDRESS, token);
+				aw.WriteAddress (0);
+				aw.EndSubsection (end_index);
+			}
+
+			private void SetEndAddress (int token)
+			{
+				aw.WriteUInt8 (0);
+				object end_index = aw.StartSubsectionWithShortSize ();
+				aw.WriteUInt8 ((int) DW_LNE.LNE_set_address);
+				dw.AddRelocEntry (RelocEntryType.METHOD_END_ADDRESS, token);
+				aw.WriteAddress (0);
+				aw.EndSubsection (end_index);
+			}
+
+			private void SetBasicBlock ()
+			{
+				aw.WriteUInt8 ((int) DW_LNS.LNS_set_basic_block);
+			}
+
+			private void EndSequence ()
+			{
+				aw.WriteUInt8 (0);
+				aw.WriteUInt8 (1);
+				aw.WriteUInt8 ((int) DW_LNE.LNE_end_sequence);
+
+				st_line = 1;
+			}
+
+			private void Commit ()
+			{
+				aw.WriteUInt8 ((int) DW_LNS.LNS_copy);
+			}
+
+			private void WriteOneLine (int token, int line, int offset)
+			{
+				aw.WriteInt8 ((int) DW_LNS.LNS_advance_line);
+				aw.WriteSLeb128 (line - st_line);
+				aw.WriteUInt8 (0);
+				object end_index = aw.StartSubsectionWithShortSize ();
+				aw.WriteUInt8 ((int) DW_LNE.LNE_set_address);
+				dw.AddRelocEntry (RelocEntryType.IL_OFFSET, token, offset);
+				aw.WriteAddress (0);
+				aw.EndSubsection (end_index);
+
+				aw.Write2Bytes ((int) DW_LNS.LNS_set_basic_block,
+						(int) DW_LNS.LNS_copy);
+
+				st_line = line;
+			}
+
+			public void Emit ()
+			{
+				dw.WriteSectionStart (Section.DEBUG_LINE);
+				aw.WriteLabel (ReferenceIndex);
+				object end_index = aw.StartSubsectionWithSize ();
+
+				aw.WriteUInt16 (2);
+				object start_index = aw.StartSubsectionWithSize ();
+				aw.WriteUInt8 (1);
+				aw.WriteUInt8 (1);
+				aw.WriteInt8 (LineBase);
+				aw.WriteUInt8 (LineRange);
+				aw.WriteUInt8 (StandardOpcodeSizes.Length);
+				for (int i = 1; i < StandardOpcodeSizes.Length; i++)
+					aw.WriteUInt8 (StandardOpcodeSizes [i]);
+
+				foreach (string directory in Directories)
+					aw.WriteString (directory);
+				aw.WriteUInt8 (0);					
+
+				foreach (ISourceFile source in Sources) {
+					aw.WriteString (source.FileName);
+					aw.WriteULeb128 (0);
+					aw.WriteULeb128 (0);
+					aw.WriteULeb128 (0);
+				}
+
+				aw.WriteUInt8 (0);
+
+				aw.EndSubsection (start_index);
+
+				foreach (ISourceMethod method in Methods) {
+					if (method.Start == null || method.Start.Row == 0)
+						continue;
+
+					SetFile (method.SourceFile);
+					SetLine (method.Start.Row);
+					SetStartAddress (method.Token);
+					SetBasicBlock ();
+					Commit ();
+
+					foreach (ISourceLine line in method.Lines) {
+						count++;
+						WriteOneLine (method.Token, line.Row, line.Offset);
+						// SetLine (line.Row);
+						// SetAddress (method.Token, line.Offset);
+						// SetBasicBlock ();
+						// Commit ();
+					}
+
+					SetLine (method.End.Row);
+					SetEndAddress (method.Token);
+					SetBasicBlock ();
+					Commit ();
+
+					EndSequence ();
+				}
+
+				aw.EndSubsection (end_index);
+				aw.WriteSectionEnd ();
+			}
+		}
+
+		// DWARF tag from the DWARF 2 specification.
+		public enum DW_TAG {
+			TAG_array_type		= 0x01,
+			TAG_class_type		= 0x02,
+			TAG_enumeration_type	= 0x04,
+			TAG_formal_parameter	= 0x05,
+			TAG_lexical_block	= 0x0b,
+			TAG_member		= 0x0d,
+			TAG_pointer_type	= 0x0f,
+			TAG_compile_unit	= 0x11,
+			TAG_string_type		= 0x12,
+			TAG_structure_type	= 0x13,
+			TAG_typedef		= 0x16,
+			TAG_inheritance		= 0x1c,
+			TAG_subrange_type	= 0x21,
+			TAG_base_type		= 0x24,
+			TAG_enumerator		= 0x28,
+			TAG_subprogram		= 0x2e,
+			TAG_variable		= 0x34
+		}
+
+		// DWARF attribute from the DWARF 2 specification.
+		public enum DW_AT {
+			AT_location		= 0x02,
+			AT_name			= 0x03,
+			AT_byte_size		= 0x0b,
+			AT_stmt_list		= 0x10,
+			AT_low_pc		= 0x11,
+			AT_high_pc		= 0x12,
+			AT_language		= 0x13,
+			AT_string_length	= 0x19,
+			AT_const_value		= 0x1c,
+			AT_lower_bound		= 0x22,
+			AT_producer		= 0x25,
+			AT_start_scope		= 0x2c,
+			AT_upper_bound		= 0x2f,
+			AT_accessibility	= 0x32,
+			AT_artificial		= 0x34,
+			AT_count		= 0x37,
+			AT_data_member_location	= 0x38,
+			AT_declaration		= 0x3c,
+			AT_encoding		= 0x3e,
+			AT_external		= 0x3f,
+			AT_specification	= 0x47,
+			AT_type			= 0x49,
+			AT_data_location	= 0x50,
+			AT_end_scope		= 0x2121
+		}
+
+		// DWARF form from the DWARF 2 specification.
+		public enum DW_FORM {
+			FORM_addr		= 0x01,
+			FORM_block4		= 0x04,
+			FORM_data4		= 0x06,
+			FORM_string		= 0x08,
+			FORM_data1		= 0x0b,
+			FORM_flag		= 0x0c,
+			FORM_sdata		= 0x0d,
+			FORM_udata		= 0x0f,
+			FORM_ref4		= 0x13
+		}
+
+		public enum DW_LANG {
+			LANG_C_plus_plus	= 0x04,
+			LANG_C_sharp		= 0x9001
+		}
+
+		public enum DW_OP {
+			OP_addr			= 0x03,
+			OP_deref		= 0x06,
+			OP_const1u		= 0x08,
+			OP_const1s		= 0x09,
+			OP_const2u		= 0x0a,
+			OP_const2s		= 0x0b,
+			OP_const4u		= 0x0c,
+			OP_const4s		= 0x0d,
+			OP_const8u		= 0x0e,
+			OP_const8s		= 0x0f,
+			OP_constu		= 0x10,
+			OP_consts		= 0x11,
+			OP_plus			= 0x22,
+			OP_plus_uconst		= 0x23,
+			OP_fbreg		= 0x91,
+		}
+
+		public enum DW_ACCESS {
+			ACCESS_public		= 1,
+			ACCESS_protected	= 2,
+			ACCESS_private		= 3
+		};
+
+		protected enum MRI_string {
+			offset_length		= 0x00,
+			offset_chars		= 0x01
+		}
+
+		protected enum MRI_array {
+			offset_bounds		= 0x00,
+			offset_max_length	= 0x01,
+			offset_vector		= 0x02
+		}
+
+		protected enum MRI_array_bounds {
+			offset_lower		= 0x00,
+			offset_length		= 0x01
+		}
+
+		// Abstract base class for a "debugging information entry" (die).
+		public abstract class Die
+		{
+			protected DwarfFileWriter dw;
+			protected IAssemblerWriter aw;
+			protected ArrayList child_dies = new ArrayList ();
+			public readonly Die Parent;
+
+			protected readonly int abbrev_id;
+			protected readonly AbbrevDeclaration abbrev_decl;
+
+			public readonly int ReferenceIndex;
+
+			//
+			// Create a new die If @parent is not null, add the newly
+			// created die to the parent's list of child dies.
+			//
+			// @abbrev_id is the abbreviation id for this die class.
+			// Derived classes should call the DwarfFileWriter's static
+			// RegisterAbbrevDeclaration function in their static constructor
+			// to get an abbrev id. Once you registered an abbrev entry, it'll
+			// be automatically written to the debug_abbrev section.
+			//
+			public Die (DwarfFileWriter dw, Die parent, int abbrev_id)
+			{
+				this.dw = dw;
+				this.aw = dw.AssemblerWriter;
+				this.Parent = parent;
+				this.abbrev_id = abbrev_id;
+				this.abbrev_decl = GetAbbrevDeclaration (abbrev_id);
+				this.ReferenceIndex = this.aw.GetNextLabelIndex ();
+
+				if (parent != null)
+					parent.AddChildDie (this);
+			}
+
+			public Die (DwarfFileWriter dw, int abbrev_id)
+				: this (dw, null, abbrev_id)
+			{ }
+
+			public Die (Die parent, int abbrev_id)
+				: this (parent.dw, parent, abbrev_id)
+			{ }
+
+			protected void AddChildDie (Die die)
+			{
+				child_dies.Add (die);
+			}
+
+			public override bool Equals (object o)
+			{
+				if (!(o is Die))
+					return false;
+
+				return ((Die) o).ReferenceIndex == ReferenceIndex;
+			}
+
+			public override int GetHashCode ()
+			{
+				return ReferenceIndex;
+			}
+
+			//
+			// Write this die and all its children to the dwarf file.
+			//
+			public virtual void Emit ()
+			{
+				aw.WriteLabel (ReferenceIndex);
+
+				aw.WriteULeb128 (abbrev_id);
+				DoEmit ();
+
+				if (abbrev_decl.HasChildren) {
+					foreach (Die child in child_dies)
+						child.Emit ();
+
+					aw.WriteUInt8 (0);
+				}
+			}
+
+			//
+			// Derived classes must implement this function to actually
+			// write themselves to the dwarf file.
+			//
+			// Note that the abbrev id has already been written in Emit() -
+			// if you don't like this, you must override Emit() as well.
+			//
+			public abstract void DoEmit ();
+
+			//
+			// Gets the compile unit of this die.
+			//
+			public virtual DieCompileUnit GetCompileUnit ()
+			{
+				Die die = this;
+
+				while (die.Parent != null)
+					die = die.Parent;
+
+				if (die is DieCompileUnit)
+					return (DieCompileUnit) die;
+				else
+					return null;
+			}
+
+			public DieCompileUnit DieCompileUnit {
+				get {
+					return GetCompileUnit ();
+				}
+			}
+
+			public DwarfFileWriter Writer {
+				get {
+					return dw;
+				}
+			}
+		}
+
+		// DW_TAG_compile_unit
+		public class DieCompileUnit : Die
+		{
+			private static int my_abbrev_id;
+
+			protected Hashtable types = new Hashtable ();
+			protected Hashtable methods = new Hashtable ();
+			protected Hashtable pointer_types = new Hashtable ();
+
+			static DieCompileUnit ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_producer, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_language, DW_FORM.FORM_udata),
+					new AbbrevEntry (DW_AT.AT_stmt_list, DW_FORM.FORM_ref4)
+				};
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_compile_unit, true, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			public readonly CompileUnit CompileUnit;
+			public readonly bool DoGeneric;
+			public readonly LineNumberEngine LineNumberEngine;
+
+			//
+			// Create a new DW_TAG_compile_unit debugging information entry
+			// and add it to the @compile_unit.
+			//
+			public DieCompileUnit (CompileUnit compile_unit)
+				: base (compile_unit.DwarfFileWriter, my_abbrev_id)
+			{
+				this.CompileUnit = compile_unit;
+				this.DoGeneric = dw.DoGeneric;
+				compile_unit.AddDie (this);
+
+				LineNumberEngine = new LineNumberEngine (dw);
+			}
+
+			public void WriteRelativeDieReference (Die target_die)
+			{
+				if (!this.Equals (target_die.GetCompileUnit ()))
+					throw new ArgumentException ("Target die must be in the same "
+								     + "compile unit");
+
+				aw.WriteRelativeOffset (CompileUnit.ReferenceIndex,
+							target_die.ReferenceIndex);
+			}
+
+			public void WriteTypeReference (ITypeHandle ihandle)
+			{
+				WriteTypeReference (ihandle, true);
+			}
+
+			public void WriteTypeReference (ITypeHandle ihandle, bool use_pointer_die)
+			{
+				if (!(ihandle is TypeHandle))
+					throw new NotSupportedException ();
+
+				TypeHandle handle = (TypeHandle) ihandle;
+
+				if (use_pointer_die && (handle.PointerDie != null))
+					WriteRelativeDieReference (handle.PointerDie);
+				else
+					WriteRelativeDieReference (handle.TypeDie);
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (CompileUnit.SourceFile);
+				aw.WriteString (CompileUnit.ProducerID);
+				if (dw.use_gnu_extensions)
+					aw.WriteULeb128 ((int) DW_LANG.LANG_C_sharp);
+				else
+					aw.WriteULeb128 ((int) DW_LANG.LANG_C_plus_plus);
+				aw.WriteAbsoluteOffset (LineNumberEngine.ReferenceIndex);
+			}
+		}
+
+		// DW_TAG_subprogram
+		public class DieSubProgram : Die
+		{
+			private static int my_abbrev_id_1;
+			private static int my_abbrev_id_2;
+			private static int my_abbrev_id_3;
+			private static int my_abbrev_id_4;
+			private static int my_abbrev_id_5;
+
+			static DieSubProgram ()
+			{
+				// Method without return value
+				AbbrevEntry[] entries_1 = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_external, DW_FORM.FORM_flag),
+					new AbbrevEntry (DW_AT.AT_low_pc, DW_FORM.FORM_addr),
+					new AbbrevEntry (DW_AT.AT_high_pc, DW_FORM.FORM_addr)
+				};
+				// Method with return value
+				AbbrevEntry[] entries_2 = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_external, DW_FORM.FORM_flag),
+					new AbbrevEntry (DW_AT.AT_low_pc, DW_FORM.FORM_addr),
+					new AbbrevEntry (DW_AT.AT_high_pc, DW_FORM.FORM_addr),
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4)
+				};
+				// Method declaration without return value
+				AbbrevEntry[] entries_3 = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_external, DW_FORM.FORM_flag),
+					new AbbrevEntry (DW_AT.AT_declaration, DW_FORM.FORM_flag)
+				};
+				// Method declaration with return value
+				AbbrevEntry[] entries_4 = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_external, DW_FORM.FORM_flag),
+					new AbbrevEntry (DW_AT.AT_declaration, DW_FORM.FORM_flag),
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4)
+				};
+				// Method definition
+				AbbrevEntry[] entries_5 = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_external, DW_FORM.FORM_flag),
+					new AbbrevEntry (DW_AT.AT_specification, DW_FORM.FORM_ref4)
+				};
+
+
+				AbbrevDeclaration decl_1 = new AbbrevDeclaration (
+					DW_TAG.TAG_subprogram, true, entries_1);
+				AbbrevDeclaration decl_2 = new AbbrevDeclaration (
+					DW_TAG.TAG_subprogram, true, entries_2);
+				AbbrevDeclaration decl_3 = new AbbrevDeclaration (
+					DW_TAG.TAG_subprogram, true, entries_3);
+				AbbrevDeclaration decl_4 = new AbbrevDeclaration (
+					DW_TAG.TAG_subprogram, true, entries_4);
+				AbbrevDeclaration decl_5 = new AbbrevDeclaration (
+					DW_TAG.TAG_subprogram, true, entries_5);
+
+				my_abbrev_id_1 = RegisterAbbrevDeclaration (decl_1);
+				my_abbrev_id_2 = RegisterAbbrevDeclaration (decl_2);
+				my_abbrev_id_3 = RegisterAbbrevDeclaration (decl_3);
+				my_abbrev_id_4 = RegisterAbbrevDeclaration (decl_4);
+				my_abbrev_id_5 = RegisterAbbrevDeclaration (decl_5);
+			}
+
+			private static int get_abbrev_id (bool DoGeneric, ISourceMethod method)
+			{
+				if (DoGeneric)
+					if (method.ReturnType == typeof (void))
+						return my_abbrev_id_3;
+					else
+						return my_abbrev_id_4;
+				else
+					if (method.ReturnType == typeof (void))
+						return my_abbrev_id_1;
+					else
+						return my_abbrev_id_2;
+			}
+
+			protected string name;
+			protected Die specification_die;
+			protected ISourceMethod method;
+			protected ITypeHandle retval_type;
+
+			//
+			// Create a new DW_TAG_subprogram debugging information entry
+			// for method @name (which has a void return value) and add it
+			// to the @parent_die
+			//
+			public DieSubProgram (DieCompileUnit parent_die, Die specification_die,
+					      ISourceMethod method)
+				: this (parent_die, method.FullName, method, my_abbrev_id_5)
+			{
+				this.specification_die = specification_die;
+			}
+
+			public DieSubProgram (Die parent_die, ISourceMethod method)
+				: this (parent_die, method.MethodBase.Name, method,
+					get_abbrev_id (false, method))
+			{
+				if (method.ReturnType != typeof (void))
+					retval_type = dw.RegisterType (method.ReturnType);
+
+				DieCompileUnit.LineNumberEngine.AddMethod (method);
+			}
+
+			private DieSubProgram (Die parent_die, string name, ISourceMethod method,
+					       int abbrev_id)
+				: base (parent_die, abbrev_id)
+			{
+				this.name = name;
+				this.method = method;
+
+				if (!method.MethodBase.IsStatic)
+					new DieMethodVariable (this, method);
+
+				foreach (ParameterInfo param in method.Parameters) {
+					MethodParameter mp = new MethodParameter (dw, method, param);
+
+					new DieMethodVariable (this, mp);
+				}
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (name);
+				aw.WriteUInt8 (true);
+				if (specification_die != null) {
+					DieCompileUnit.WriteRelativeDieReference (specification_die);
+					return;
+				}
+
+				if (dw.DoGeneric)
+					aw.WriteUInt8 (true);
+				else {
+					dw.AddRelocEntry (RelocEntryType.METHOD_START_ADDRESS, method.Token);
+					aw.WriteAddress (0);
+					dw.AddRelocEntry (RelocEntryType.METHOD_END_ADDRESS, method.Token);
+					aw.WriteAddress (0);
+				}
+				if (method.ReturnType != typeof (void))
+					DieCompileUnit.WriteTypeReference (retval_type);
+			}
+		}
+
+		// DW_TAG_base_type
+		public class DieBaseType : DieType
+		{
+			private static int my_abbrev_id;
+
+			static DieBaseType ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_encoding, DW_FORM.FORM_data1),
+					new AbbrevEntry (DW_AT.AT_byte_size, DW_FORM.FORM_data1)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_base_type, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			protected Type type;
+			protected string name;
+
+			//
+			// Create a new DW_TAG_base_type debugging information entry
+			//
+			public DieBaseType (DieCompileUnit parent_die, ITypeHandle type)
+				: this (parent_die, type, type.Name)
+			{ }
+
+			public DieBaseType (DieCompileUnit parent_die, ITypeHandle type, string name)
+				: base (parent_die, type, my_abbrev_id)
+			{
+				this.type = type.Type;
+				this.name = name;
+			}
+
+			protected enum DW_ATE {
+				ATE_void		= 0x00,
+				ATE_address		= 0x01,
+				ATE_boolean		= 0x02,
+				ATE_complex_float	= 0x03,
+				ATE_float		= 0x04,
+				ATE_signed		= 0x05,
+				ATE_signed_char		= 0x06,
+				ATE_unsigned		= 0x07,
+				ATE_unsigned_char	= 0x08
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (name);
+				if (type == typeof (void)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_address);
+					aw.WriteUInt8 (0);
+				} else if (type == typeof (bool)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_boolean);
+					aw.WriteUInt8 (1);
+				} else if (type == typeof (char)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_unsigned_char);
+					aw.WriteUInt8 (2);
+				} else if (type == typeof (sbyte)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_signed);
+					aw.WriteUInt8 (1);
+				} else if (type == typeof (byte)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_unsigned);
+					aw.WriteUInt8 (1);
+				} else if (type == typeof (short)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_signed);
+					aw.WriteUInt8 (2);
+				} else if (type == typeof (ushort)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_unsigned);
+					aw.WriteUInt8 (2);
+				} else if (type == typeof (int)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_signed);
+					aw.WriteUInt8 (4);
+				} else if (type == typeof (uint)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_unsigned);
+					aw.WriteUInt8 (4);
+				} else if (type == typeof (long)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_signed);
+					aw.WriteUInt8 (8);
+				} else if (type == typeof (ulong)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_unsigned);
+					aw.WriteUInt8 (8);
+				} else if (type == typeof (float)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_float);
+					aw.WriteUInt8 (4);
+				} else if (type == typeof (double)) {
+					aw.WriteUInt8 ((int) DW_ATE.ATE_float);
+					aw.WriteUInt8 (8);
+				} else
+					throw new ArgumentException ("Not a base type: " + type);
+			}
+		}
+
+		//
+		// Abstract base class for types.
+		//
+
+		public abstract class DieType : Die
+		{
+			private readonly ITypeHandle type_handle;
+
+			public DieType (Die parent_die, Type type, int abbrev_id)
+				: this (parent_die, parent_die.Writer.RegisterType (type), abbrev_id)
+			{ }
+
+			public DieType (Die parent_die, ITypeHandle type_handle, int abbrev_id)
+				: base (parent_die, abbrev_id)
+			{
+				this.type_handle = type_handle;
+			}
+
+			public virtual void CreateType ()
+			{ }
+
+			public ITypeHandle TypeHandle {
+				get {
+					return type_handle;
+				}
+			}
+		}
+
+
+		// DW_TAG_pointer_type
+		public class DiePointerType : DieType
+		{
+			private static int my_abbrev_id;
+
+			static DiePointerType ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_pointer_type, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			public DiePointerType (DieCompileUnit parent_die, Type type)
+				: base (parent_die, parent_die.Writer.RegisterType (type.GetElementType ()),
+					my_abbrev_id)
+			{ }
+
+			public override void DoEmit ()
+			{
+				DieCompileUnit.WriteTypeReference (TypeHandle);
+			}
+		}
+
+		public class DieTypeDef : DieType
+		{
+			private static int my_abbrev_id;
+
+			static DieTypeDef ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_typedef, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			protected string name;
+
+			public DieTypeDef (Die parent_die, ITypeHandle type, string name)
+				: base (parent_die, type, my_abbrev_id)
+			{
+				this.name = name;
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (name);
+				DieCompileUnit.WriteTypeReference (TypeHandle);
+			}
+		}
+
+		public class DieInternalTypeDef : Die
+		{
+			private static int my_abbrev_id;
+
+			static DieInternalTypeDef ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_typedef, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			protected Die type_die;
+			protected string name;
+
+			public DieInternalTypeDef (DieCompileUnit parent_die, Die type_die, string name)
+				: base (parent_die, my_abbrev_id)
+			{
+				this.type_die = type_die;
+				this.name = name;
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (name);
+				DieCompileUnit.WriteRelativeDieReference (type_die);
+			}
+		}
+
+		public class DieInternalPointer : Die
+		{
+			private static int my_abbrev_id;
+
+			static DieInternalPointer ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_pointer_type, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			protected Die type_die;
+
+			public DieInternalPointer (DieCompileUnit parent_die, Die type_die)
+				: base (parent_die, my_abbrev_id)
+			{
+				this.type_die = type_die;
+			}
+
+			public override void DoEmit ()
+			{
+				DieCompileUnit.WriteRelativeDieReference (type_die);
+			}
+		}
+
+		// DW_TAG_enumeration_type
+		public class DieEnumType : DieType
+		{
+			private static int my_abbrev_id;
+
+			static DieEnumType ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_byte_size, DW_FORM.FORM_data1)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_enumeration_type, true, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			public DieEnumType (DieCompileUnit parent_die, ITypeHandle type)
+				: base (parent_die, type, my_abbrev_id)
+			{
+				Array values = Enum.GetValues (type.Type);
+				string[] names = Enum.GetNames (type.Type);
+
+				foreach (object value in values) {
+					int intval;
+					string name = null;
+
+					if (value is int)
+						intval = (int) value;
+					else
+						intval = System.Convert.ToInt32 (value);
+
+					for (int i = 0; i < values.Length; ++i)
+						if (value.Equals (values.GetValue (i))) {
+							name = names [i];
+							break;
+						}
+
+					if (name == null)
+						throw new ArgumentException ();
+
+					new DieEnumerator (this, name, intval);
+				}
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (TypeHandle.Name);
+				dw.AddRelocEntry_TypeSize (TypeHandle);
+				aw.WriteUInt8 (0);
+			}
+		}
+
+		// DW_TAG_enumerator
+		public class DieEnumerator : Die
+		{
+			private static int my_abbrev_id;
+
+			static DieEnumerator ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_const_value, DW_FORM.FORM_data4)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_enumerator, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			protected string name;
+			protected int value;
+
+			public DieEnumerator (DieEnumType parent_die, string name, int value)
+				: base (parent_die, my_abbrev_id)
+			{
+				this.name = name;
+				this.value = value;
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (name);
+				aw.WriteInt32 (value);
+			}
+		}
+
+		// DW_TAG_structure_type
+		public class DieStructureType : DieType
+		{
+			private static int my_abbrev_id;
+
+			static DieStructureType ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_byte_size, DW_FORM.FORM_data1)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_structure_type, true, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			protected DieCompileUnit parent_die;
+			protected readonly Type type;
+			protected string name;
+			protected FieldInfo[] fields;
+			protected ITypeHandle[] field_types;
+			protected Die[] field_dies;
+			protected MethodInfo[] methods;
+			protected Die[] method_dies;
+
+			protected const BindingFlags FieldBindingFlags =
+				BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Instance |
+				BindingFlags.Static | BindingFlags.DeclaredOnly;
+
+			public override void CreateType ()
+			{
+				fields = this.type.GetFields (FieldBindingFlags);
+				field_types = new ITypeHandle [fields.Length];
+				field_dies = new Die [fields.Length];
+
+				int index = 0;
+				for (int i = 0; i < fields.Length; i++) {
+					Type field_type = fields [i].FieldType;
+					field_types [i] = dw.RegisterType (field_type);
+					DW_ACCESS access;
+
+					if (fields [i].IsPublic)
+						access = DW_ACCESS.ACCESS_public;
+					else if (fields [i].IsPrivate)
+						access = DW_ACCESS.ACCESS_private;
+					else
+						access = DW_ACCESS.ACCESS_protected;
+
+					if (fields [i].IsStatic) {
+						field_dies [i] = new DieStaticVariable (this, fields [i].Name,
+											i, field_types [i]);
+						string name = String.Concat (type.FullName, ".",
+									     fields [i].Name);
+						new DieStaticVariableDefinition (parent_die, fields [i].Name,
+										 field_dies [i]);
+					} else
+						field_dies [i] = new DieMember (this, fields [i].Name,
+										index++, field_types [i],
+										access);
+				}
+
+				base.CreateType ();
+			}
+
+			public DieStructureType (DieCompileUnit parent_die, ITypeHandle type)
+				: this (parent_die, type, type.Name, my_abbrev_id)
+			{ }
+
+			protected DieStructureType (DieCompileUnit parent_die, ITypeHandle type,
+						    int abbrev_id)
+				: this (parent_die, type, type.Name, abbrev_id)
+			{ }
+
+			protected DieStructureType (DieCompileUnit parent_die, ITypeHandle type,
+						    string name)
+				: this (parent_die, type, name, my_abbrev_id)
+			{ }
+
+			protected DieStructureType (DieCompileUnit parent_die, ITypeHandle type,
+						    string name, int abbrev_id)
+				: base (parent_die, type, abbrev_id)
+			{
+				this.parent_die = parent_die;
+				this.type = type.Type;
+				this.name = name;
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (name);
+				dw.AddRelocEntry_TypeSize (TypeHandle);
+				aw.WriteUInt8 (0);
+			}
+		}
+
+		public class DieArrayType : DieStructureType
+		{
+			protected new readonly ITypeHandle type;
+			protected ITypeHandle element_type;
+			protected int rank;
+
+			public DieArrayType (DieCompileUnit parent_die, ITypeHandle type)
+				: this (parent_die, type, type.Type.GetArrayRank ())
+			{ }
+
+			private DieArrayType (DieCompileUnit parent_die, ITypeHandle type, int rank)
+				: base (parent_die, parent_die.Writer.array_type, type.Name)
+			{
+				this.type = type;
+				this.rank = rank;
+			}
+
+			public override void CreateType ()
+			{
+				element_type = ((TypeHandle) type).ArrayElementType;
+
+				new DieMember (this, "Bounds",
+					       (int) MRI_array.offset_bounds,
+					       ((TypeHandle) type).ArrayBoundsType);
+
+				new DieMember (this, "MaxLength",
+					       (int) MRI_array.offset_max_length,
+					       dw.int_type);
+
+				new DieMember (this, "Vector",
+					       (int) MRI_array.offset_vector,
+					       ((TypeHandle) type).ArrayVectorType);
+
+				base.CreateType ();
+			}
+		}
+
+		public class DieArrayBoundsType : DieStructureType
+		{
+			public DieArrayBoundsType (DieCompileUnit parent_die, ITypeHandle type)
+				: base (parent_die, type, type.Name)
+			{ }
+
+			public override void CreateType ()
+			{
+				new DieMember (this, "Lower",
+					       (int) MRI_array_bounds.offset_lower,
+					       dw.int_type);
+
+				new DieMember (this, "Length",
+					       (int) MRI_array_bounds.offset_length,
+					       dw.int_type);
+
+				base.CreateType ();
+			}
+		}
+
+		public class DieStringType : DieStructureType
+		{
+			protected new readonly ITypeHandle type;
+
+			public DieStringType (DieCompileUnit parent_die, ITypeHandle type)
+				: base (parent_die, parent_die.Writer.string_type, "MonoString")
+			{
+				this.type = type;
+			}
+
+			public override void CreateType ()
+			{
+				new DieMember (this, "Length",
+					       (int) MRI_string.offset_length,
+					       dw.int_type);
+
+				new DieMember (this, "Chars",
+					       (int) MRI_string.offset_chars,
+					       dw.string_type.ArrayVectorType);
+
+				base.CreateType ();
+			}
+		}
+
+		public class DieMonoStringType : DieType
+		{
+			private static int my_abbrev_id;
+
+			static DieMonoStringType ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_string_length, DW_FORM.FORM_block4),
+					new AbbrevEntry (DW_AT.AT_byte_size, DW_FORM.FORM_data4),
+					new AbbrevEntry (DW_AT.AT_data_location, DW_FORM.FORM_block4)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_string_type, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			public DieMonoStringType (Die parent_die)
+				: base (parent_die, parent_die.Writer.void_type, my_abbrev_id)
+			{ }
+
+			public override void DoEmit ()
+			{
+				object end_index;
+
+				end_index = aw.StartSubsectionWithSize ();
+				dw.AddRelocEntry (RelocEntryType.MONO_STRING_STRING_LENGTH);
+				aw.WriteUInt32 (0);
+				aw.WriteUInt32 (0);
+				aw.EndSubsection (end_index);
+
+				dw.AddRelocEntry (RelocEntryType.MONO_STRING_BYTE_SIZE);
+				aw.WriteUInt32 (0);
+
+				end_index = aw.StartSubsectionWithSize ();
+				dw.AddRelocEntry (RelocEntryType.MONO_STRING_DATA_LOCATION);
+				aw.WriteUInt32 (0);
+				aw.WriteUInt32 (0);
+				aw.EndSubsection (end_index);
+			}
+		}
+
+		protected class DieInternalArray : DieType
+		{
+			private static int my_abbrev_id;
+
+			static DieInternalArray ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_byte_size, DW_FORM.FORM_data1)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_array_type, true, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			public DieInternalArray (Die parent_die, ITypeHandle type)
+				: base (parent_die, type, my_abbrev_id)
+			{ }
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (TypeHandle.Name);
+				DieCompileUnit.WriteTypeReference (TypeHandle);
+				aw.WriteUInt8 (4);
+			}
+		}
+
+		public class DieMonoArrayType : DieType
+		{
+			private static int my_abbrev_id;
+
+			protected readonly ITypeHandle type;
+			protected ITypeHandle element_type;
+			protected int rank;
+
+			static DieMonoArrayType ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_data_location, DW_FORM.FORM_block4)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_array_type, true, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			public DieMonoArrayType (Die parent_die, ITypeHandle type)
+				: this (parent_die, type, type.Type.GetArrayRank ())
+			{ }
+
+			private DieMonoArrayType (Die parent_die, ITypeHandle type, int rank)
+				: base (parent_die, type, my_abbrev_id)
+			{
+				this.type = type;
+				this.rank = rank;
+			}
+
+			public override void CreateType ()
+			{
+				element_type = ((TypeHandle) type).ArrayElementType;
+
+				new DieInternalSubRangeType (this);
+
+				base.CreateType ();
+			}
+
+			public override void DoEmit ()
+			{
+				bool use_ptr_die;
+				if (element_type.Type.Equals (typeof (string)))
+					use_ptr_die = true;
+				else
+					use_ptr_die = false;
+
+				DieCompileUnit.WriteTypeReference (element_type, use_ptr_die);
+
+				object end_index = aw.StartSubsectionWithSize ();
+				dw.AddRelocEntry (RelocEntryType.MONO_ARRAY_DATA_LOCATION);
+				aw.WriteUInt32 (0);
+				aw.WriteUInt32 (0);
+				aw.EndSubsection (end_index);
+			}
+		}
+
+		public class DieInternalSubRangeType : DieType
+		{
+			private static int my_abbrev_id_1;
+			private static int my_abbrev_id_2;
+
+			static DieInternalSubRangeType ()
+			{
+				AbbrevEntry[] entries_1 = {
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_byte_size, DW_FORM.FORM_data4),
+					new AbbrevEntry (DW_AT.AT_count, DW_FORM.FORM_block4)
+				};
+				AbbrevEntry[] entries_2 = {
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_lower_bound, DW_FORM.FORM_block4),
+					new AbbrevEntry (DW_AT.AT_upper_bound, DW_FORM.FORM_block4)
+				};
+
+				AbbrevDeclaration decl_1 = new AbbrevDeclaration (
+					DW_TAG.TAG_subrange_type, false, entries_1);
+				AbbrevDeclaration decl_2 = new AbbrevDeclaration (
+					DW_TAG.TAG_subrange_type, false, entries_2);
+
+				my_abbrev_id_1 = RegisterAbbrevDeclaration (decl_1);
+				my_abbrev_id_2 = RegisterAbbrevDeclaration (decl_2);
+			}
+
+			protected int dimension;
+
+			public DieInternalSubRangeType (Die parent_die)
+				: base (parent_die, parent_die.Writer.int_type, my_abbrev_id_1)
+			{
+				this.dimension = -1;
+			}
+
+			public DieInternalSubRangeType (Die parent_die, int dimension)
+				: base (parent_die, parent_die.Writer.int_type, my_abbrev_id_2)
+			{
+				this.dimension = dimension;
+			}
+
+			public override void DoEmit ()
+			{
+				DieCompileUnit.WriteTypeReference (TypeHandle);
+
+				if (dimension >= 0)
+					throw new NotImplementedException ();
+				else {
+					dw.AddRelocEntry (RelocEntryType.MONO_ARRAY_LENGTH_BYTE_SIZE);
+					aw.WriteUInt32 (0);
+
+					object end_index = aw.StartSubsectionWithSize ();
+					dw.AddRelocEntry (RelocEntryType.MONO_ARRAY_MAX_LENGTH);
+					aw.WriteUInt32 (0);
+					aw.WriteUInt32 (0);
+					aw.EndSubsection (end_index);
+				}
+			}
+		}
+
+		public class DieSubRangeType : DieType
+		{
+			private static int my_abbrev_id;
+
+			static DieSubRangeType ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_lower_bound, DW_FORM.FORM_data4),
+					new AbbrevEntry (DW_AT.AT_upper_bound, DW_FORM.FORM_data4)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_subrange_type, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			protected int lower;
+			protected int upper;
+
+			public DieSubRangeType (Die parent_die, ITypeHandle type, int lower, int upper)
+				: base (parent_die, type, my_abbrev_id)
+			{
+				this.lower = lower;
+				this.upper = upper;
+			}
+
+			public override void DoEmit ()
+			{
+				DieCompileUnit.WriteTypeReference (TypeHandle);
+				aw.WriteInt32 (lower);
+				aw.WriteInt32 (upper);
+			}
+		}
+
+		// DW_TAG_class_type
+		public class DieClassType : DieStructureType
+		{
+			private static int my_abbrev_id;
+
+			static DieClassType ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_byte_size, DW_FORM.FORM_data1),
+					new AbbrevEntry (DW_AT.AT_external, DW_FORM.FORM_flag)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_class_type, true, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			ITypeHandle base_type;
+
+			public DieClassType (DieCompileUnit parent_die, ITypeHandle type_handle)
+				: base (parent_die, type_handle, my_abbrev_id)
+			{
+			}
+
+			public override void CreateType ()
+			{
+				Type baset = TypeHandle.Type.BaseType;
+
+				if ((baset != null) && !baset.Equals (typeof (object)) && !baset.Equals (typeof (System.Array))) {
+					base_type = dw.RegisterType (baset);
+
+					new DieInheritance (this, base_type);
+				}
+
+				base.CreateType ();
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (TypeHandle.Name);
+				dw.AddRelocEntry_TypeSize (TypeHandle);
+				aw.WriteUInt8 (0);
+				aw.WriteUInt8 (true);
+			}
+		}
+
+		// DW_TAG_inheritance
+		public class DieInheritance : DieType
+		{
+			private static int my_abbrev_id;
+
+			static DieInheritance ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_data_member_location, DW_FORM.FORM_block4)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_inheritance, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			public DieInheritance (Die parent_die, ITypeHandle type)
+				: base (parent_die, type, my_abbrev_id)
+			{ }
+
+			public override void DoEmit ()
+			{
+				DieCompileUnit.WriteTypeReference (TypeHandle, false);
+
+				object end_index = aw.StartSubsectionWithSize ();
+				aw.WriteUInt8 ((int) DW_OP.OP_const1u);
+				aw.WriteUInt8 (0);
+				aw.EndSubsection (end_index);
+			}
+		}
+
+		// DW_TAG_member
+		public class DieMember : DieType
+		{
+			private static int my_abbrev_id;
+
+			static DieMember ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_accessibility, DW_FORM.FORM_data1),
+					new AbbrevEntry (DW_AT.AT_data_member_location, DW_FORM.FORM_block4)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_member, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			protected string name;
+			protected int index;
+			protected DW_ACCESS access;
+			protected DieType parent_die;
+
+			public DieMember (DieType parent_die, string name, int index,
+					  ITypeHandle type, DW_ACCESS access)
+				: base (parent_die, type, my_abbrev_id)
+			{
+				this.name = name;
+				this.index = index;
+				this.access = access;
+				this.parent_die = parent_die;
+			}
+
+			public DieMember (DieType parent_die, string name, int index, ITypeHandle type)
+				: this (parent_die, name, index, type,
+					DW_ACCESS.ACCESS_public)
+			{ }
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (name);
+				DieCompileUnit.WriteTypeReference (TypeHandle);
+				aw.WriteUInt8 ((int) access);
+
+				object end_index = aw.StartSubsectionWithSize ();
+				aw.WriteUInt8 ((int) DW_OP.OP_const4u);
+				dw.AddRelocEntry_TypeFieldOffset (parent_die.TypeHandle, index);
+				aw.WriteInt32 (0);
+				aw.EndSubsection (end_index);
+			}
+		}
+
+		// DW_TAG_lexical_block
+		public class DieLexicalBlock : Die
+		{
+			private static int my_abbrev_id;
+
+			static DieLexicalBlock ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_low_pc, DW_FORM.FORM_addr),
+					new AbbrevEntry (DW_AT.AT_high_pc, DW_FORM.FORM_addr)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_lexical_block, true, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			protected ISourceBlock block;
+
+			public DieLexicalBlock (Die parent_die, ISourceBlock block)
+				: base (parent_die, my_abbrev_id)
+			{
+				this.block = block;
+			}
+
+			public override void DoEmit ()
+			{
+				int token = block.SourceMethod.Token;
+				int start_offset = block.Start.Offset;
+				int end_offset = block.End.Offset;
+
+				dw.AddRelocEntry (RelocEntryType.IL_OFFSET, token, start_offset);
+				aw.WriteAddress (0);
+				dw.AddRelocEntry (RelocEntryType.IL_OFFSET, token, end_offset);
+				aw.WriteAddress (0);
+			}
+		}
+
+		public abstract class DieVariable : DieType
+		{
+			private static int my_abbrev_id_this;
+			private static int my_abbrev_id_local;
+			private static int my_abbrev_id_param;
+			private static int my_abbrev_id_static;
+
+			public enum VariableType {
+				VARIABLE_THIS,
+				VARIABLE_PARAMETER,
+				VARIABLE_LOCAL,
+				VARIABLE_STATIC
+			};
+
+			static int get_abbrev_id (VariableType vtype)
+			{
+				switch (vtype) {
+				case VariableType.VARIABLE_THIS:
+					return my_abbrev_id_this;
+				case VariableType.VARIABLE_PARAMETER:
+					return my_abbrev_id_param;
+				case VariableType.VARIABLE_LOCAL:
+					return my_abbrev_id_local;
+				case VariableType.VARIABLE_STATIC:
+					return my_abbrev_id_static;
+				default:
+					throw new ArgumentException ();
+				}
+			}
+
+			static DieVariable ()
+			{
+				AbbrevEntry[] entries_1 = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_external, DW_FORM.FORM_flag),
+					new AbbrevEntry (DW_AT.AT_location, DW_FORM.FORM_block4),
+					new AbbrevEntry (DW_AT.AT_start_scope, DW_FORM.FORM_addr),
+					new AbbrevEntry (DW_AT.AT_end_scope, DW_FORM.FORM_addr)
+				};
+				AbbrevEntry[] entries_2 = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_external, DW_FORM.FORM_flag),
+					new AbbrevEntry (DW_AT.AT_location, DW_FORM.FORM_block4),
+				};
+				AbbrevEntry[] entries_3 = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_artificial, DW_FORM.FORM_flag),
+					new AbbrevEntry (DW_AT.AT_location, DW_FORM.FORM_block4),
+				};
+				AbbrevEntry[] entries_4 = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_type, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_declaration, DW_FORM.FORM_flag),
+					new AbbrevEntry (DW_AT.AT_location, DW_FORM.FORM_block4)
+				};
+
+				AbbrevDeclaration decl_local = new AbbrevDeclaration (
+					DW_TAG.TAG_variable, false, entries_1);
+				AbbrevDeclaration decl_param = new AbbrevDeclaration (
+					DW_TAG.TAG_formal_parameter, false, entries_2);
+				AbbrevDeclaration decl_this = new AbbrevDeclaration (
+					DW_TAG.TAG_formal_parameter, false, entries_3);
+				AbbrevDeclaration decl_static = new AbbrevDeclaration (
+					DW_TAG.TAG_variable, false, entries_4);
+
+				my_abbrev_id_local = RegisterAbbrevDeclaration (decl_local);
+				my_abbrev_id_param = RegisterAbbrevDeclaration (decl_param);
+				my_abbrev_id_this = RegisterAbbrevDeclaration (decl_this);
+				my_abbrev_id_static = RegisterAbbrevDeclaration (decl_static);
+			}
+
+			protected string name;
+			protected ITypeHandle type_handle;
+			protected VariableType vtype;
+
+			public DieVariable (Die parent_die, string name, ITypeHandle handle, VariableType vtype)
+				: base (parent_die, handle, get_abbrev_id (vtype))
+			{
+				this.name = name;
+				this.type_handle = handle;
+				this.vtype = vtype;
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (name);
+				DieCompileUnit.WriteTypeReference (type_handle);
+				switch (vtype) {
+				case VariableType.VARIABLE_LOCAL:
+					aw.WriteUInt8 (false);
+					DoEmitLocation ();
+					DoEmitScope ();
+					break;
+				case VariableType.VARIABLE_PARAMETER:
+					aw.WriteUInt8 (false);
+					DoEmitLocation ();
+					break;
+				case VariableType.VARIABLE_THIS:
+					aw.WriteUInt8 (true);
+					DoEmitLocation ();
+					break;
+				case VariableType.VARIABLE_STATIC:
+					aw.WriteUInt8 (true);
+					DoEmitLocation ();
+					break;
+				}
+			}
+
+			protected abstract void DoEmitLocation ();
+			protected abstract void DoEmitScope ();
+		}
+
+		public class DieMethodVariable : DieVariable
+		{
+			public DieMethodVariable (Die parent_die, ILocalVariable local)
+				: base (parent_die, local.Name, local.TypeHandle,
+					VariableType.VARIABLE_LOCAL)
+			{
+				this.var = local;
+			}
+
+			public DieMethodVariable (Die parent_die, IMethodParameter param)
+				: base (parent_die, param.Name, param.TypeHandle,
+					VariableType.VARIABLE_PARAMETER)
+			{
+				this.var = param;
+			}
+
+			public DieMethodVariable (Die parent_die, ISourceMethod method)
+				: base (parent_die, "this",
+					parent_die.Writer.RegisterType (method.MethodBase.ReflectedType),
+					VariableType.VARIABLE_THIS)
+			{
+				this.method = method;
+			}
+
+			protected IVariable var;
+			protected ISourceMethod method;
+
+			protected override void DoEmitLocation ()
+			{
+				object end_index = aw.StartSubsectionWithSize ();
+				// These relocation entries expect a location description
+				// of exactly 8 bytes.
+				switch (vtype) {
+				case VariableType.VARIABLE_LOCAL:
+					dw.AddRelocEntry (RelocEntryType.LOCAL_VARIABLE,
+							  var.Method.Token, var.Index);
+					break;
+				case VariableType.VARIABLE_PARAMETER:
+					dw.AddRelocEntry (RelocEntryType.METHOD_PARAMETER,
+							  var.Method.Token, var.Index);
+					break;
+				case VariableType.VARIABLE_THIS:
+					dw.AddRelocEntry (RelocEntryType.METHOD_PARAMETER,
+							  method.Token, 0);
+					break;
+				}
+				// This looks a bit strange, but OP_fbreg takes a sleb128
+				// agument and we can't use fields of variable size.
+				aw.WriteUInt8 ((int) DW_OP.OP_fbreg);
+				aw.WriteSLeb128 (0);
+				aw.WriteUInt8 ((int) DW_OP.OP_const4s);
+				aw.WriteInt32 (0);
+				aw.WriteUInt8 ((int) DW_OP.OP_plus);
+				aw.EndSubsection (end_index);
+			}
+
+			protected override void DoEmitScope ()
+			{
+				dw.AddRelocEntry (RelocEntryType.VARIABLE_START_SCOPE,
+						  var.Method.Token, var.Index);
+				aw.WriteAddress (0);
+				dw.AddRelocEntry (RelocEntryType.VARIABLE_END_SCOPE,
+						  var.Method.Token, var.Index);
+				aw.WriteAddress (0);
+			}
+		}
+
+		public class DieStaticVariable : DieVariable
+		{
+			public DieStaticVariable (DieType parent_die, string name, int index,
+						  ITypeHandle type)
+				: base (parent_die, name, type, VariableType.VARIABLE_STATIC)
+			{
+				this.parent_die = parent_die;
+				this.index = index;
+				this.type = type;
+			}
+
+			DieType parent_die;
+			ITypeHandle type;
+			int index;
+
+			protected override void DoEmitLocation ()
+			{
+				object end_index = aw.StartSubsectionWithSize ();
+				aw.WriteUInt8 ((int) DW_OP.OP_addr);
+				dw.AddRelocEntry_TypeStaticFieldOffset (parent_die.TypeHandle, index);
+				aw.WriteAddress (0);
+				aw.EndSubsection (end_index);
+			}
+
+			protected override void DoEmitScope ()
+			{ }
+		}
+
+		public class DieStaticVariableDefinition : Die
+		{
+			private static int my_abbrev_id;
+
+			static DieStaticVariableDefinition ()
+			{
+				AbbrevEntry[] entries = {
+					new AbbrevEntry (DW_AT.AT_name, DW_FORM.FORM_string),
+					new AbbrevEntry (DW_AT.AT_specification, DW_FORM.FORM_ref4),
+					new AbbrevEntry (DW_AT.AT_external, DW_FORM.FORM_flag)
+				};
+
+				AbbrevDeclaration decl = new AbbrevDeclaration (
+					DW_TAG.TAG_variable, false, entries);
+
+				my_abbrev_id = RegisterAbbrevDeclaration (decl);
+			}
+
+			protected Die specification_die;
+			protected string name;
+
+			public DieStaticVariableDefinition (DieCompileUnit parent_die, string name,
+							    Die specification_die)
+				: base (parent_die, my_abbrev_id)
+			{
+				this.name = name;
+				this.specification_die = specification_die;
+			}
+
+			public override void DoEmit ()
+			{
+				aw.WriteString (name);
+				DieCompileUnit.WriteRelativeDieReference (specification_die);
+				aw.WriteUInt8 (true);
+			}
+		}
+
+		protected const int reloc_table_version = 15;
+
+		protected enum Section {
+			DEBUG_INFO		= 0x01,
+			DEBUG_ABBREV		= 0x02,
+			DEBUG_LINE		= 0x03,
+			MONO_RELOC_TABLE	= 0x04,
+			MONO_LINE_NUMBERS	= 0x05,
+			MONO_SYMBOL_TABLE	= 0x06
+		}
+
+		public struct AbbrevEntry {
+			public AbbrevEntry (DW_AT attribute, DW_FORM form)
+			{
+				this._attribute = attribute;
+				this._form = form;
+			}
+
+			private DW_AT _attribute;
+			private DW_FORM _form;
+
+			public DW_AT Attribute {
+				get {
+					return _attribute;
+				}
+			}
+
+			public DW_FORM Form {
+				get {
+					return _form;
+				}
+			}
+		}
+
+		public struct AbbrevDeclaration {
+			public AbbrevDeclaration (DW_TAG tag, bool has_children, AbbrevEntry[] entries)
+			{
+				this._tag = tag;
+				this._has_children = has_children;
+				this._entries = entries;
+			}
+
+			private DW_TAG _tag;
+			private bool _has_children;
+			private AbbrevEntry[] _entries;
+
+			public DW_TAG Tag {
+				get {
+					return _tag;
+				}
+			}
+
+			public bool HasChildren {
+				get {
+					return _has_children;
+				}
+			}
+
+			public AbbrevEntry[] Entries {
+				get {
+					return _entries;
+				}
+			}
+		}
+
+	    
+		protected enum RelocEntryType {
+			NONE,
+			// Size of an address on the target machine
+			TARGET_ADDRESS_SIZE		= 0x01,
+			// Map an IL offset to a machine address
+			IL_OFFSET			= 0x02,
+			// Start address of machine code for this method
+			METHOD_START_ADDRESS		= 0x03,
+			// End address of machine code for this method
+			METHOD_END_ADDRESS		= 0x04,
+			// Stack offset of local variable
+			LOCAL_VARIABLE			= 0x05,
+			// Stack offset of method parameter
+			METHOD_PARAMETER		= 0x06,
+			// Sizeof (type)
+			TYPE_SIZEOF			= 0x07,
+			TYPE_FIELD_OFFSET		= 0x08,
+			MONO_STRING_SIZEOF		= 0x09,
+			MONO_STRING_OFFSET		= 0x0a,
+			MONO_ARRAY_SIZEOF		= 0x0b,
+			MONO_ARRAY_OFFSET		= 0x0c,
+			MONO_ARRAY_BOUNDS_SIZEOF	= 0x0d,
+			MONO_ARRAY_BOUNDS_OFFSET	= 0x0e,
+			VARIABLE_START_SCOPE		= 0x0f,
+			VARIABLE_END_SCOPE		= 0x10,
+			MONO_STRING_FIELDSIZE		= 0x11,
+			MONO_ARRAY_FIELDSIZE		= 0x12,
+			TYPE_FIELD_FIELDSIZE		= 0x13,
+			MONO_STRING_STRING_LENGTH	= 0x14,
+			MONO_STRING_BYTE_SIZE		= 0x15,
+			MONO_STRING_DATA_LOCATION	= 0x16,
+			TYPE_STATIC_FIELD_OFFSET	= 0x17,
+			MONO_ARRAY_DATA_LOCATION	= 0x18,
+			MONO_ARRAY_MAX_LENGTH		= 0x19,
+			MONO_ARRAY_LENGTH_BYTE_SIZE	= 0x1a
+		}
+
+		protected class RelocEntry {
+			public RelocEntry (RelocEntryType type, int token, int original,
+					   Section section, int index)
+			{
+				_type = type;
+				_section = section;
+				_token = token;
+				_original = original;
+				_index = index;
+			}
+
+			public RelocEntryType RelocType {
+				get {
+					return _type;
+				}
+			}
+
+			public Section Section {
+				get {
+					return _section;
+				}
+			}
+
+			public int Index {
+				get {
+					return _index;
+				}
+			}
+
+			public int Token {
+				get {
+					return _token;
+				}
+			}
+
+			public int Original {
+				get {
+					return _original;
+				}
+			}
+
+			private RelocEntryType _type;
+			private Section _section;
+			private int _token;
+			private int _index;
+			private int _original;
+		}
+
+		private Section current_section;
+		private ArrayList reloc_entries = new ArrayList ();
+
+		private static ArrayList abbrev_declarations = new ArrayList ();
+
+		protected string GetSectionName (Section section)
+		{
+			switch (section) {
+			case Section.DEBUG_INFO:
+				return "debug_info";
+			case Section.DEBUG_ABBREV:
+				return "debug_abbrev";
+			case Section.DEBUG_LINE:
+				return "debug_line";
+			case Section.MONO_RELOC_TABLE:
+				return "mono_reloc_table";
+			case Section.MONO_LINE_NUMBERS:
+				return "mono_line_numbers";
+			case Section.MONO_SYMBOL_TABLE:
+				return "mono_symbol_table";
+			default:
+				throw new ArgumentException ();
+			}
+		}
+
+		protected void AddRelocEntry (RelocEntry entry)
+		{
+			reloc_entries.Add (entry);
+		}
+
+		protected void AddRelocEntry (RelocEntryType type, int token, int original,
+					      Section section, int index)
+		{
+			AddRelocEntry (new RelocEntry (type, token, original, section, index));
+		}
+
+		protected void AddRelocEntry (RelocEntryType type, int token, int original)
+		{
+			AddRelocEntry (type, token, original, current_section, aw.WriteLabel ());
+		}
+
+		protected void AddRelocEntry (RelocEntryType type, int token)
+		{
+			AddRelocEntry (type, token, 0);
+		}
+
+		protected void AddRelocEntry (RelocEntryType type)
+		{
+			AddRelocEntry (type, 0);
+		}
+
+		protected void AddRelocEntry (RelocEntryType entry_type, ITypeHandle type)
+		{
+			AddRelocEntry (entry_type, type, 0);
+		}
+
+		protected void AddRelocEntry (RelocEntryType entry_type, ITypeHandle type, int original)
+		{
+			AddRelocEntry (entry_type, type.Token, original);
+		}
+
+		protected void AddRelocEntry_TypeSize (ITypeHandle type)
+		{
+			if (type == string_type)
+				AddRelocEntry (RelocEntryType.MONO_STRING_SIZEOF);
+			else if (type == array_type)
+				AddRelocEntry (RelocEntryType.MONO_ARRAY_SIZEOF);
+			else if (type.Type.Equals (typeof (MonoArrayBounds)))
+				AddRelocEntry (RelocEntryType.MONO_ARRAY_BOUNDS_SIZEOF);
+			else
+				AddRelocEntry (RelocEntryType.TYPE_SIZEOF, type);
+		}
+
+		protected void AddRelocEntry_TypeFieldOffset (ITypeHandle type, int index)
+		{
+			if (type == string_type)
+				AddRelocEntry (RelocEntryType.MONO_STRING_OFFSET, index);
+			else if (type == array_type)
+				AddRelocEntry (RelocEntryType.MONO_ARRAY_OFFSET, index);
+			else if (type.Type.Equals (typeof (MonoArrayBounds)))
+				AddRelocEntry (RelocEntryType.MONO_ARRAY_BOUNDS_OFFSET, index);
+			else
+				AddRelocEntry (RelocEntryType.TYPE_FIELD_OFFSET, type, index);
+		}
+
+		protected void AddRelocEntry_TypeFieldSize (ITypeHandle type, int index)
+		{
+			if (type == string_type)
+				AddRelocEntry (RelocEntryType.MONO_STRING_FIELDSIZE, index);
+			else if (type == array_type)
+				AddRelocEntry (RelocEntryType.MONO_ARRAY_FIELDSIZE, index);
+			else
+				AddRelocEntry (RelocEntryType.TYPE_FIELD_FIELDSIZE, type, index);
+		}
+
+		protected void AddRelocEntry_TypeStaticFieldOffset (ITypeHandle type, int index)
+		{
+			AddRelocEntry (RelocEntryType.TYPE_STATIC_FIELD_OFFSET, type, index);
+		}
+
+		//
+		// Mono relocation table. See the README.relocation-table file in this
+		// directory for a detailed description of the file format.
+		//
+		protected void WriteRelocEntries ()
+		{
+			WriteSectionStart (Section.MONO_RELOC_TABLE);
+			aw.WriteUInt16 (reloc_table_version);
+			aw.WriteUInt8 (0);
+			object end_index = aw.StartSubsectionWithSize ();
+
+			int count = 0;
+
+			foreach (RelocEntry entry in reloc_entries) {
+				count++;
+
+				aw.WriteUInt8 ((int) entry.RelocType);
+				object tmp_index = aw.StartSubsectionWithSize ();
+
+				aw.WriteUInt8 ((int) entry.Section);
+				aw.WriteAbsoluteOffset (entry.Index);
+
+				switch (entry.RelocType) {
+				case RelocEntryType.METHOD_START_ADDRESS:
+				case RelocEntryType.METHOD_END_ADDRESS:
+				case RelocEntryType.TYPE_SIZEOF:
+					aw.WriteUInt32 (entry.Token);
+					break;
+				case RelocEntryType.IL_OFFSET:
+				case RelocEntryType.LOCAL_VARIABLE:
+				case RelocEntryType.METHOD_PARAMETER:
+				case RelocEntryType.TYPE_FIELD_OFFSET:
+				case RelocEntryType.TYPE_STATIC_FIELD_OFFSET:
+				case RelocEntryType.VARIABLE_START_SCOPE:
+				case RelocEntryType.VARIABLE_END_SCOPE:
+				case RelocEntryType.TYPE_FIELD_FIELDSIZE:
+					aw.WriteUInt32 (entry.Token);
+					aw.WriteUInt32 (entry.Original);
+					break;
+				case RelocEntryType.MONO_STRING_SIZEOF:
+				case RelocEntryType.MONO_ARRAY_SIZEOF:
+				case RelocEntryType.MONO_ARRAY_BOUNDS_SIZEOF:
+					break;
+				case RelocEntryType.MONO_STRING_OFFSET:
+				case RelocEntryType.MONO_ARRAY_OFFSET:
+				case RelocEntryType.MONO_ARRAY_BOUNDS_OFFSET:
+				case RelocEntryType.MONO_STRING_FIELDSIZE:
+				case RelocEntryType.MONO_ARRAY_FIELDSIZE:
+					aw.WriteUInt32 (entry.Token);
+					break;
+				}
+
+				aw.EndSubsection (tmp_index);
+			}
+
+			aw.EndSubsection (end_index);
+			aw.WriteSectionEnd ();
+		}
+
+		//
+		// Registers a new abbreviation declaration.
+		//
+		// This function should be called by a static constructor in one of
+		// Die's subclasses.
+		//
+		protected static int RegisterAbbrevDeclaration (AbbrevDeclaration decl)
+		{
+			return abbrev_declarations.Add (decl) + 1;
+		}
+
+		protected static AbbrevDeclaration GetAbbrevDeclaration (int index)
+		{
+			return (AbbrevDeclaration) abbrev_declarations [index - 1];
+		}
+
+		protected void WriteAbbrevDeclarations ()
+		{
+			aw.WriteSectionStart (GetSectionName (Section.DEBUG_ABBREV));
+			aw.WriteLabel ("debug_abbrev_b");
+
+			for (int index = 0; index < abbrev_declarations.Count; index++) {
+				AbbrevDeclaration decl = (AbbrevDeclaration) abbrev_declarations [index];
+
+				aw.WriteULeb128 (index + 1);
+				aw.WriteULeb128 ((int) decl.Tag);
+				aw.WriteUInt8 (decl.HasChildren);
+
+				foreach (AbbrevEntry entry in decl.Entries) {
+					aw.WriteULeb128 ((int) entry.Attribute);
+					aw.WriteULeb128 ((int) entry.Form);
+				}
+
+				aw.WriteUInt8 (0);
+				aw.WriteUInt8 (0);
+			}
+
+			aw.WriteSectionEnd ();
+		}
+
+		protected void WriteSectionStart (Section section)
+		{
+			aw.WriteSectionStart (GetSectionName (section));
+			current_section = section;
+		}
+
+		public void WriteLineNumberTable (IMonoSymbolWriter symwriter)
+		{
+			WriteSectionStart (Section.MONO_LINE_NUMBERS);
+			aw.WriteUInt16 (reloc_table_version);
+
+			Hashtable sources = new Hashtable ();
+
+			foreach (ISourceFile source in symwriter.Sources) {
+				if (sources.ContainsKey (source))
+					continue;
+
+				sources.Add (source, aw.GetNextLabelIndex ());
+			}
+
+			object line_number_end_index = aw.StartSubsectionWithSize ();
+
+			Hashtable method_labels = new Hashtable ();
+
+			foreach (ISourceMethod method in symwriter.Methods) {
+				if (method.Start == null || method.Start.Row == 0)
+					continue;
+
+				int label = aw.GetNextLabelIndex ();
+				aw.WriteUInt32 (method.Token);
+				aw.WriteAbsoluteOffset ((int) sources [method.SourceFile]);
+				aw.WriteUInt32 (method.Start.Row);
+				aw.WriteAbsoluteOffset (label);
+
+				method_labels [method] = label;
+			}
+
+			aw.EndSubsection (line_number_end_index);
+
+			foreach (ISourceMethod method in method_labels.Keys) {
+				aw.WriteLabel ((int) method_labels [method]);
+
+				foreach (ISourceLine line in method.Lines) {
+					aw.WriteUInt32 (line.Row);
+					aw.WriteUInt32 (line.Offset);
+				}
+
+				aw.WriteUInt32 (0);
+				aw.WriteUInt32 (0);
+			}
+
+			foreach (ISourceFile source in sources.Keys) {
+				aw.WriteLabel ((int) sources [source]);
+
+				aw.WriteString (source.FileName);
+			}
+
+			aw.WriteSectionEnd ();
+		}
+
+		public void WriteSymbolTable (IMonoSymbolWriter symwriter)
+		{
+			WriteSectionStart (Section.MONO_SYMBOL_TABLE);
+			aw.WriteUInt16 (reloc_table_version);
+
+			object end_index = aw.StartSubsectionWithSize ();
+
+			Type[] external_types = TypeHandle.ExternalTypes;
+
+			aw.WriteUInt32 (external_types.Length);
+			for (int i = 0; i < external_types.Length; i++) {
+				aw.WriteString (external_types [i].Namespace);
+				aw.WriteString (external_types [i].Name);
+			}
+
+			aw.EndSubsection (end_index);
+
+			aw.WriteSectionEnd ();
+		}
+	}
+
+	internal struct MonoString
+	{ }
+
+	internal struct MonoArrayBounds
+	{ }
+
+	internal struct MonoArray
+	{ }
+}
diff --git a/mcs/class/Mono.CSharp.Debugger/MonoSymbolDocumentWriter.cs b/mcs/class/Mono.CSharp.Debugger/MonoSymbolDocumentWriter.cs
new file mode 100644
index 00000000000..27c4ea48749
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/MonoSymbolDocumentWriter.cs
@@ -0,0 +1,60 @@
+//
+// System.Diagnostics.SymbolStore/MonoSymbolDocumentWriter.cs
+//
+// Author:
+//   Martin Baulig (martin@gnome.org)
+//
+// This is the default implementation of the
+// System.Diagnostics.SymbolStore.ISymbolDocumentWriter interface.
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Diagnostics.SymbolStore;
+using System.IO;
+	
+namespace Mono.CSharp.Debugger
+{
+
+	public class MonoSymbolDocumentWriter : ISymbolDocumentWriter
+	{
+		protected string url;
+
+		//
+		// Constructor
+		//
+		public MonoSymbolDocumentWriter (string url)
+		{
+			this.url = url;
+		}
+
+		public string FileName {
+			get {
+				return url;
+			}
+		}
+
+		//
+		// Interface ISymbolDocumentWriter
+		//
+
+		//
+		// MonoSymbolWriter creates a DWARF 2 debugging file and DWARF operates
+		// on file names, but has no way to include a whole source file in the
+		// symbol file.
+		//
+
+		public void SetCheckSum (Guid algorithmId, byte[] checkSum)
+		{
+			throw new NotSupportedException ();
+		}
+
+		public void SetSource (byte[] source)
+		{
+			throw new NotSupportedException ();
+		}
+	}
+}
diff --git a/mcs/class/Mono.CSharp.Debugger/MonoSymbolWriter.cs b/mcs/class/Mono.CSharp.Debugger/MonoSymbolWriter.cs
new file mode 100755
index 00000000000..db2a175dfc5
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/MonoSymbolWriter.cs
@@ -0,0 +1,812 @@
+//
+// System.Diagnostics.SymbolStore/MonoSymbolWriter.cs
+//
+// Author:
+//   Martin Baulig (martin@gnome.org)
+//
+// This is the default implementation of the System.Diagnostics.SymbolStore.ISymbolWriter
+// interface.
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+using System.Diagnostics.SymbolStore;
+using System.Collections;
+using System.IO;
+	
+namespace Mono.CSharp.Debugger
+{
+	public class SourceFile : ISourceFile
+	{
+		private ArrayList _methods = new ArrayList ();
+		private string _file_name;
+
+		public SourceFile (string filename)
+		{
+			this._file_name = filename;
+		}
+
+		public override string ToString ()
+		{
+			return _file_name;
+		}
+
+		// interface ISourceFile
+
+		public string FileName {
+			get {
+				return _file_name;
+			}
+		}
+
+		public ISourceMethod[] Methods {
+			get {
+				ISourceMethod[] retval = new ISourceMethod [_methods.Count];
+				_methods.CopyTo (retval);
+				return retval;
+			}
+		}
+
+		public void AddMethod (ISourceMethod method)
+		{
+			_methods.Add (method);
+		}
+	}
+
+	public class SourceBlock : ISourceBlock
+	{
+		static private int next_index;
+		private readonly int _index;
+
+		public SourceBlock (ISourceMethod method, ISourceLine start, ISourceLine end)
+		{
+			this._method = method;
+			this._start = start;
+			this._end = end;
+			this._index = ++next_index;
+		}
+
+		internal SourceBlock (ISourceMethod method, int startOffset)
+		{
+			this._method = method;
+			this._start = new SourceLine (startOffset);
+			this._index = ++next_index;
+		}
+
+		public override string ToString ()
+		{
+			return "SourceBlock #" + ID + " (" + Start + " - " + End + ")";
+		}
+
+		private readonly ISourceMethod _method;
+		private ArrayList _blocks = new ArrayList ();
+		internal ISourceLine _start;
+		internal ISourceLine _end;
+
+		private ArrayList _locals = new ArrayList ();
+
+		public ISourceMethod SourceMethod {
+			get {
+				return _method;
+			}
+		}
+
+		public ISourceBlock[] Blocks {
+			get {
+				ISourceBlock[] retval = new ISourceBlock [_blocks.Count];
+				_blocks.CopyTo (retval);
+				return retval;
+			}
+		}
+
+		public void AddBlock (ISourceBlock block)
+		{
+			_blocks.Add (block);
+		}
+
+		public ISourceLine Start {
+			get {
+				return _start;
+			}
+		}
+
+		public ISourceLine End {
+			get {
+				return _end;
+			}
+		}
+
+		public int ID {
+			get {
+				return _index;
+			}
+		}
+
+		public ILocalVariable[] Locals {
+			get {
+				ILocalVariable[] retval = new ILocalVariable [_locals.Count];
+				_locals.CopyTo (retval);
+				return retval;
+			}
+		}
+
+		public void AddLocal (ILocalVariable local)
+		{
+			_locals.Add (local);
+		}
+	}
+
+	public class SourceLine : ISourceLine
+	{
+		public SourceLine (int row, int column)
+			: this (0, row, column)
+		{
+			this._type = SourceOffsetType.OFFSET_NONE;
+		}
+
+		public SourceLine (int offset, int row, int column)
+		{
+			this._offset = offset;
+			this._row = row;
+			this._column = column;
+			this._type = SourceOffsetType.OFFSET_IL;
+		}
+
+		internal SourceLine (int offset)
+			: this (offset, 0, 0)
+		{ }
+
+		public override string ToString ()
+		{
+			return "SourceLine (" + _offset + "@" + _row + ":" + _column + ")";
+		}
+
+		internal SourceOffsetType _type;
+		internal int _offset;
+		internal int _row;
+		internal int _column;
+
+		// interface ISourceLine
+
+		public SourceOffsetType OffsetType {
+			get {
+				return _type;
+			}
+		}
+
+		public int Offset {
+			get {
+				return _offset;
+			}
+		}
+
+		public int Row {
+			get {
+				return _row;
+			}
+		}
+
+		public int Column {
+			get {
+				return _column;
+			}
+		}
+	}
+
+	public class Variable : IVariable
+	{
+		public Variable (string name, ITypeHandle handle, ISourceMethod method, int index)
+			: this (name, handle, method, index, null)
+		{ }
+
+		public Variable (string name, ITypeHandle handle, ISourceMethod method,
+				 int index, ISourceLine line)
+		{
+			this._name = name;
+			this._handle = handle;
+			this._method = method;
+			this._line = line;
+			this._index = index;
+		}
+
+		private readonly string _name;
+		private readonly ITypeHandle _handle;
+		private readonly ISourceMethod _method;
+		private readonly ISourceLine _line;
+		private readonly int _index;
+
+		// interface IVariable
+
+		public string Name {
+			get {
+				return _name;
+			}
+		}
+
+		public ISourceMethod Method {
+			get {
+				return _method;
+			}
+		}
+
+		public int Index {
+			get {
+				return _index;
+			}
+		}
+
+		public ITypeHandle TypeHandle {
+			get {
+				return _handle;
+			}
+		}
+
+		public ISourceLine Line {
+			get {
+				return _line;
+			}
+		}
+	}
+
+	public class LocalVariable : Variable, ILocalVariable
+	{
+		public LocalVariable (string name, ITypeHandle handle, ISourceMethod method,
+				      int index, ISourceLine line)
+			: base (name, handle, method, index, line)
+		{ }
+
+		public override string ToString ()
+		{
+			return "LocalVariable (" + Index + "," + Name + ")";
+		}
+	}
+
+	public class MethodParameter : Variable, IMethodParameter
+	{
+		private static int get_index (ISourceMethod method, ParameterInfo param)
+		{
+			return method.MethodBase.IsStatic ? param.Position - 1 :
+				param.Position;
+		}
+
+		public MethodParameter (DwarfFileWriter writer, ISourceMethod method,
+					ParameterInfo param)
+			: base (param.Name, writer.RegisterType (param.ParameterType),
+				method, get_index (method, param))
+		{
+			this._method = method;
+			this._param = param;
+		}
+
+		private readonly ISourceMethod _method;
+		private readonly ParameterInfo _param;
+	}
+
+	public class SourceMethod : ISourceMethod
+	{
+		private ArrayList _lines = new ArrayList ();
+		private ArrayList _blocks = new ArrayList ();
+		private Hashtable _block_hash = new Hashtable ();
+		private Stack _block_stack = new Stack ();
+
+		internal readonly MethodBase _method_base;
+		internal ISourceFile _source_file;
+		internal int _token;
+
+		private SourceBlock _implicit_block;
+
+		public SourceMethod (MethodBase method_base, ISourceFile source_file)
+			: this (method_base)
+		{
+			this._source_file = source_file;
+		}
+
+		internal SourceMethod (MethodBase method_base)
+		{
+			this._method_base = method_base;
+
+			this._implicit_block = new SourceBlock (this, 0);
+		}
+
+		public void SetSourceRange (ISourceFile sourceFile,
+					    int startLine, int startColumn,
+					    int endLine, int endColumn)
+		{
+			_source_file = sourceFile;
+			_implicit_block._start = new SourceLine (startLine, startColumn);
+			_implicit_block._end = new SourceLine (endLine, endColumn);
+		}
+
+
+		public void StartBlock (ISourceBlock block)
+		{
+			_block_stack.Push (block);
+		}
+
+		public void EndBlock (int endOffset) {
+			SourceBlock block = (SourceBlock) _block_stack.Pop ();
+
+			block._end = new SourceLine (endOffset);
+
+			if (_block_stack.Count > 0) {
+				ISourceBlock parent = (ISourceBlock) _block_stack.Peek ();
+
+				parent.AddBlock (block);
+			} else
+				_blocks.Add (block);
+
+			_block_hash.Add (block.ID, block);
+		}
+
+		public void SetBlockRange (int BlockID, int startOffset, int endOffset)
+		{
+			SourceBlock block = (SourceBlock) _block_hash [BlockID];
+			((SourceLine) block.Start)._offset = startOffset;
+			((SourceLine) block.End)._offset = endOffset;
+		}
+
+		public ISourceBlock CurrentBlock {
+			get {
+				if (_block_stack.Count > 0)
+					return (ISourceBlock) _block_stack.Peek ();
+				else
+					return _implicit_block;
+			}
+		}
+
+		// interface ISourceMethod
+
+		public ISourceLine[] Lines {
+			get {
+				ISourceLine[] retval = new ISourceLine [_lines.Count];
+				_lines.CopyTo (retval);
+				return retval;
+			}
+		}
+
+		public void AddLine (ISourceLine line)
+		{
+			_lines.Add (line);
+		}
+
+		public ISourceBlock[] Blocks {
+			get {
+				ISourceBlock[] retval = new ISourceBlock [_blocks.Count];
+				_blocks.CopyTo (retval);
+				return retval;
+			}
+		}
+
+		public ILocalVariable[] Locals {
+			get {
+				return _implicit_block.Locals;
+			}
+		}
+
+		public void AddLocal (ILocalVariable local)
+		{
+			_implicit_block.AddLocal (local);
+		}
+
+		public MethodBase MethodBase {
+			get {
+				return _method_base;
+			}
+		}
+
+		public string FullName {
+			get {
+				return _method_base.DeclaringType.FullName + "." + _method_base.Name;
+			}
+		}
+
+		public Type ReturnType {
+			get {
+				if (_method_base is MethodInfo)
+					return ((MethodInfo)_method_base).ReturnType;
+				else if (_method_base is ConstructorInfo)
+					return _method_base.DeclaringType;
+				else
+					throw new NotSupportedException ();
+			}
+		}
+
+		public ParameterInfo[] Parameters {
+			get {
+				if (_method_base == null)
+					return new ParameterInfo [0];
+
+				ParameterInfo [] retval = _method_base.GetParameters ();
+				if (retval == null)
+					return new ParameterInfo [0];
+				else
+					return retval;
+			}
+		}
+
+		public ISourceFile SourceFile {
+			get {
+				return _source_file;
+			}
+		}
+
+		public int Token {
+			get {
+				if (_token != 0)
+					return _token;
+				else
+					throw new NotSupportedException ();
+			}
+		}
+
+		public ISourceLine Start {
+			get {
+				return _implicit_block.Start;
+			}
+		}
+
+		public ISourceLine End {
+			get {
+				return _implicit_block.End;
+			}
+		}
+	}
+
+	public class MonoSymbolWriter : IMonoSymbolWriter
+	{
+		protected Assembly assembly;
+		protected ModuleBuilder module_builder;
+		protected ArrayList locals = null;
+		protected ArrayList orphant_methods = null;
+		protected ArrayList methods = null;
+		protected Hashtable sources = null;
+		protected DwarfFileWriter writer = null;
+		private ArrayList mbuilder_array = null;
+
+		public ISourceMethod[] Methods {
+			get {
+				ISourceMethod[] retval = new ISourceMethod [methods.Count];
+				methods.CopyTo (retval);
+				return retval;
+			}
+		}
+
+		public ISourceFile[] Sources {
+			get {
+				ISourceFile[] retval = new ISourceFile [sources.Count];
+				sources.Values.CopyTo (retval, 0);
+				return retval;
+			}
+		}
+
+		public DwarfFileWriter DwarfFileWriter {
+			get {
+				return writer;
+			}
+		}
+
+		protected SourceMethod current_method = null;
+		private string assembly_filename = null;
+
+		//
+		// Interface IMonoSymbolWriter
+		//
+
+		public MonoSymbolWriter (ModuleBuilder mb, string filename, ArrayList mbuilder_array)
+		{
+			this.assembly_filename = filename;
+			this.module_builder = mb;
+			this.methods = new ArrayList ();
+			this.sources = new Hashtable ();
+			this.orphant_methods = new ArrayList ();
+			this.locals = new ArrayList ();
+			this.mbuilder_array = mbuilder_array;
+		}
+
+		public void Close () {
+			if (assembly == null)
+				assembly = Assembly.LoadFrom (assembly_filename);
+
+			DoFixups (assembly);
+
+			CreateDwarfFile (assembly);
+		}
+
+		public void CloseNamespace () {
+		}
+
+		// Create and return a new IMonoSymbolDocumentWriter.
+		public ISymbolDocumentWriter DefineDocument (string url,
+							     Guid language,
+							     Guid languageVendor,
+							     Guid documentType)
+		{
+			return new MonoSymbolDocumentWriter (url);
+		}
+
+		public void DefineField (
+			SymbolToken parent,
+			string name,
+			FieldAttributes attributes,
+			byte[] signature,
+			SymAddressKind addrKind,
+			int addr1,
+			int addr2,
+			int addr3)
+		{
+		}
+
+		public void DefineGlobalVariable (
+			string name,
+			FieldAttributes attributes,
+			byte[] signature,
+			SymAddressKind addrKind,
+			int addr1,
+			int addr2,
+			int addr3)
+		{
+		}
+
+		public void DefineLocalVariable (string name,
+						 FieldAttributes attributes,
+						 byte[] signature,
+						 SymAddressKind addrKind,
+						 int addr1,
+						 int addr2,
+						 int addr3,
+						 int startOffset,
+						 int endOffset)
+		{
+			throw new NotSupportedException ();
+		}
+
+		public void DefineLocalVariable (string name,
+						 LocalBuilder local,
+						 FieldAttributes attributes,
+						 int position,
+						 int startOffset,
+						 int endOffset)
+		{
+			if (current_method == null)
+				return;
+
+			ITypeHandle type = writer.RegisterType (local.LocalType);
+
+			LocalVariable local_info = new LocalVariable (name, type, current_method,
+								      position, null);
+
+			current_method.CurrentBlock.AddLocal (local_info);
+			locals.Add (local_info);
+		}
+
+
+		public void DefineParameter (string name,
+					     ParameterAttributes attributes,
+					     int sequence,
+					     SymAddressKind addrKind,
+					     int addr1,
+					     int addr2,
+					     int addr3)
+		{
+			throw new NotSupportedException ();
+		}
+
+		public void DefineSequencePoints (ISymbolDocumentWriter document,
+						  int[] offsets,
+						  int[] lines,
+						  int[] columns,
+						  int[] endLines,
+						  int[] endColumns)
+		{
+			SourceLine source_line = new SourceLine (offsets [0], lines [0], columns [0]);
+
+			if (current_method != null)
+				current_method.AddLine (source_line);
+		}
+
+		public void Initialize (IntPtr emitter, string filename, bool fFullBuild)
+		{
+			throw new NotSupportedException ();
+		}
+
+		public void Initialize (string assembly_filename, string filename, string[] args)
+		{
+			this.writer = new DwarfFileWriter (filename, args);
+			this.assembly_filename = assembly_filename;
+		}
+
+		public void OpenMethod (SymbolToken symbol_token)
+		{
+			int token = symbol_token.GetToken ();
+
+			if ((token & 0xff000000) != 0x06000000)
+				throw new ArgumentException ();
+
+			int index = (token & 0xffffff) - 1;
+
+			MethodBuilder mb = (MethodBuilder) mbuilder_array [index];
+
+			current_method = new SourceMethod (mb);
+
+			methods.Add (current_method);
+		}
+
+		public void SetMethodSourceRange (ISymbolDocumentWriter startDoc,
+						  int startLine, int startColumn,
+						  ISymbolDocumentWriter endDoc,
+						  int endLine, int endColumn)
+		{
+			if (current_method == null)
+				return;
+
+			if ((startDoc == null) || (endDoc == null))
+				throw new NullReferenceException ();
+
+			if (!(startDoc is MonoSymbolDocumentWriter) || !(endDoc is MonoSymbolDocumentWriter))
+				throw new NotSupportedException ("both startDoc and endDoc must be of type "
+								 + "MonoSymbolDocumentWriter");
+
+			if (!startDoc.Equals (endDoc))
+				throw new NotSupportedException ("startDoc and endDoc must be the same");
+
+			string source_file = ((MonoSymbolDocumentWriter) startDoc).FileName;
+			SourceFile source_info;
+
+			if (sources.ContainsKey (source_file))
+				source_info = (SourceFile) sources [source_file];
+			else {
+				source_info = new SourceFile (source_file);
+				sources.Add (source_file, source_info);
+			}
+
+			current_method.SetSourceRange (source_info, startLine, startColumn,
+						       endLine, endColumn);
+
+			source_info.AddMethod (current_method);
+		}
+
+		public void CloseMethod () {
+			current_method = null;
+		}
+
+		public void OpenNamespace (string name)
+		{
+		}
+
+		public int OpenScope (int startOffset)
+		{
+			if (current_method == null)
+				return 0;
+
+			ISourceBlock block = new SourceBlock (current_method, startOffset);
+			current_method.StartBlock (block);
+
+			return block.ID;
+		}
+
+		public void CloseScope (int endOffset) {
+			if (current_method == null)
+				return;
+
+			current_method.EndBlock (endOffset);
+		}
+
+		public void SetScopeRange (int scopeID, int startOffset, int endOffset)
+		{
+			if (current_method == null)
+				return;
+
+			current_method.SetBlockRange (scopeID, startOffset, endOffset);
+		}
+
+		public void SetSymAttribute (SymbolToken parent, string name, byte[] data)
+		{
+		}
+
+		public void SetUnderlyingWriter (IntPtr underlyingWriter)
+		{
+			throw new NotSupportedException ();
+		}
+
+		public void SetUserEntryPoint (SymbolToken entryMethod)
+		{
+		}
+
+		public void UsingNamespace (string fullName)
+		{
+		}
+
+		//
+		// MonoSymbolWriter implementation
+		//
+		protected void WriteLocal (DwarfFileWriter.Die parent_die, ILocalVariable local)
+		{
+			DwarfFileWriter.DieMethodVariable die;
+
+			die = new DwarfFileWriter.DieMethodVariable (parent_die, local);
+		}
+
+		protected void WriteBlock (DwarfFileWriter.Die parent_die, ISourceBlock block)
+		{
+			DwarfFileWriter.DieLexicalBlock die;
+
+			die = new DwarfFileWriter.DieLexicalBlock (parent_die, block);
+
+			foreach (ILocalVariable local in block.Locals)
+				WriteLocal (die, local);
+
+			foreach (ISourceBlock subblock in block.Blocks)
+				WriteBlock (die, subblock);
+		}
+
+		protected void WriteMethod (ISourceMethod method)
+		{
+			DwarfFileWriter.DieCompileUnit parent_die = writer.DieGlobalCompileUnit;
+			DwarfFileWriter.TypeHandle declaring_type;
+			DwarfFileWriter.DieSubProgram die;
+			DwarfFileWriter.Die defining_die;
+
+			declaring_type = DwarfFileWriter.RegisterType (method.MethodBase.DeclaringType);
+
+			die = new DwarfFileWriter.DieSubProgram (declaring_type.TypeDie, method);
+			defining_die = new DwarfFileWriter.DieSubProgram (parent_die, die, method);
+
+			foreach (ILocalVariable local in method.Locals)
+				WriteLocal (defining_die, local);
+
+			foreach (ISourceBlock block in method.Blocks)
+				WriteBlock (defining_die, block);
+		}
+
+		protected void WriteSource (DwarfFileWriter writer, ISourceFile source)
+		{
+			foreach (ISourceMethod method in source.Methods)
+				WriteMethod (method);
+		}
+
+		protected void DoFixups (Assembly assembly)
+		{
+			foreach (SourceMethod method in methods) {
+				if (method._method_base is MethodBuilder) {
+					MethodBuilder mb = (MethodBuilder) method._method_base;
+					method._token = mb.GetToken ().Token;
+				} else if (method._method_base is ConstructorBuilder) {
+					ConstructorBuilder cb = (ConstructorBuilder) method._method_base;
+					method._token = cb.GetToken ().Token;
+				} else
+					throw new NotSupportedException ();
+
+				if (method.SourceFile == null)
+					orphant_methods.Add (method);
+			}
+		}
+
+		protected void CreateDwarfFile (Assembly assembly)
+		{
+			foreach (ISourceFile source in sources.Values)
+				WriteSource (writer, source);
+
+			if (orphant_methods.Count > 0) {
+				SourceFile source = new SourceFile ("<unknown>");
+
+				foreach (SourceMethod orphant in orphant_methods) {
+					orphant._source_file = source;
+					source.AddMethod (orphant);
+				}
+
+				WriteSource (writer, source);
+			}
+
+			writer.WriteSymbolTable (this);
+
+			writer.WriteLineNumberTable (this);
+
+			writer.Close ();
+		}
+	}
+}
+
diff --git a/mcs/class/Mono.CSharp.Debugger/README b/mcs/class/Mono.CSharp.Debugger/README
new file mode 100644
index 00000000000..4fb2043099f
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/README
@@ -0,0 +1,43 @@
+This is an implementation of the System.Diagnostics.SymbolStore.ISymbolWriter
+interface which writes a dwarf debugging information file.
+
+Unfortunately there are several major problems with this interface and I'm
+unsure how to solve them:
+
+1.) The interface contains a constructor method `Initialize' which has an
+    'IntPtr' emitter argument which seems to be a pointer to the actual
+    symbol writer which resides in a proprietary, undocumented DLL (I spent
+    almost 3 hours browsing the ".NET Framework SDK Documentation" and
+    msdn.microsoft.com - without success.
+
+    A short test showed me that mscorlib doesn't like passing zero, this
+    won't give you the system's default implementation.
+
+    To solve this problem, I created a derived interface IMonoSymbolWriter
+    which contains an additional constructor which only takes the name of
+    the symbol file as argument.
+
+        void Initialize (string filename);
+
+2.) You seem to get an instance of a class implementing this interface by
+    creating a new instance of System.Reflection.Emit.ModuleBuilder (with the
+    `bool createSymbolFile' argument) and then calling GetSymWriter() on
+    the returned object.
+
+    So far so good, but how does this method find out which symbol writer
+    to use ?
+
+3.) According to the documentation, some of the methods of
+    System.Reflection.Emit.ILGenerator and System.Reflection.Emit.LocalBuilder
+    seem to use the symbol writer to emit symbol debugging information.
+
+    But again, how do these objects get the symbol writer ?
+
+Currently, there are two ways to use this assembly:
+
+a.) Fix the problems outlined above and dynamically load this assembly
+    (Mono.CSharp.Debugger.dll) when a new symbol writer is created.
+
+b.) Reference this assembly in your application and manually create the
+    symbol writer using the constructor.
+
diff --git a/mcs/class/Mono.CSharp.Debugger/README.relocation-table b/mcs/class/Mono.CSharp.Debugger/README.relocation-table
new file mode 100644
index 00000000000..f9a875784fa
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/README.relocation-table
@@ -0,0 +1,100 @@
+This is an implementation of the System.Diagnostics.SymbolStore.ISymbolWriter
+interface which writes a symbol file in the dwarf format.
+
+The output is an assembler input file containing dwarf data with an
+additional ELF section called ".mono_reloc_table". This section is
+read by the JIT engine to map IL offsets and such to machine
+addresses.
+
+The mono relocation table contains of
+
+1. A 2-byte unsigned integer containing a version number, currently 2.
+
+2. A 1-byte unsigned integer containing a flag specifying whether the
+   object file containing this section has already been relocated.
+
+   The symbol writer sets this flag to zero, you must change it to 1
+   if you write the relocated file back to disk.
+
+3. A 4-byte unsigned integer containing the total size of the
+   relocation table, but not including the size field itself.
+
+4. One or more relocation entries.
+
+Each entry in the relocation table has the following form:
+
+1. A 1-byte unsigned integer specifying the type of this entry.
+
+2. A 4-byte unsigned integer containing the size of this entry, but
+   not including the size field itself.
+
+3. A 1-byte unsigned integer specifying the ELF section of this entry.
+
+4. A 4-byte unsigned offset from the beginning of the ELF section to
+   the location which needs to be relocated. This is called the target.
+
+5. Optional additional data depending on the type of the entry.
+
+The following entry types are currently defined:
+
+a) TARGET_ADDRESS_SIZE - 0x01
+
+   The target is a 1-byte unsigned integer containing the size in
+   bytes of an address on the target machine.
+
+b) IL_OFFSET - 0x02
+
+   The target is an integer of appropriate size to hold an address on
+   the target machine (the assembler ensures that the object has the
+   correct size) and contains an IL offset from the beginning of the
+   current method which needs to be replaced with the corresponding
+   machine address.
+
+   This entry has a 4-byte unsigned integer argument containing the
+   metadata token of the current method and a 4-byte unsigned integer
+   argument containing the IL offset.
+
+c) METHOD_START_ADDRESS - 0x03
+d) METHOD_END_ADDRESS - 0x04
+
+   The target is an integer of appropriate size to hold an address on
+   the target machine (the assembler ensures that the object has the
+   correct size).
+
+   This entry has a 4-byte unsigned integer argument containing the
+   metadata token of the current method.
+
+To use the generated object file, the JIT must:
+
+* Check whether the file contains a ".mono_reloc_table" section.
+  If not, the file cannot be used (you need to change the address size
+  field in each compilation unit header).
+
+* Check whether the flag field of the relocation table (the 3rd byte
+  of the relocation table) is zero. If it is 1, the file has already
+  been relocated. In this case, it's best to reject the file.
+
+* Set the flag field to 1.
+
+* Process all relocation entries.
+
+* Write the modified file back to disk.
+
+To do the relocation, the JIT can assume that:
+
+1.) All the relevant ELF sections are physically contiguous
+    (a requirement from the DWARF 2 specification).
+
+2.) All relocation targets holding addresses are suitable of holding
+    an address on the target machine.
+
+    This means that you can do something like
+
+	* (void **) ptr = map_to_machine (* (void **) ptr)
+
+3.) There are no other changes needed in the object file - so you can
+    just write it back to disk once you're done with the relocation.
+
+
+Last changed March 19th, 2002
+Martin Baulig <martin@gnome.org>
diff --git a/mcs/class/Mono.CSharp.Debugger/csharp-lang.c b/mcs/class/Mono.CSharp.Debugger/csharp-lang.c
new file mode 100644
index 00000000000..d8c6f91600f
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/csharp-lang.c
@@ -0,0 +1,330 @@
+/* -*- mode: C; c-basic-offset: 2 -*-
+
+   C# language support for Mono.
+   Copyright 2002 Ximian, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "symtab.h"
+#include "gdbtypes.h"
+#include "gdbcore.h"
+#include "expression.h"
+#include "value.h"
+#include "valprint.h"
+#include "demangle.h"
+#include "parser-defs.h"
+#include "language.h"
+#include "symfile.h"
+#include "objfiles.h"
+#include "gdb_string.h"
+#include "csharp-lang.h"
+#include "c-lang.h"
+#include "annotate.h"
+#include <ctype.h>
+
+static void csharp_print_value_fields (struct type *type, char *valaddr, CORE_ADDR address,
+				       struct ui_file *stream, int format, int recurse,
+				       enum val_prettyprint pretty);
+
+/* Print the character C on STREAM as part of the contents of a literal
+   string whose delimiter is QUOTER.  Note that that format for printing
+   characters and strings is language specific. */
+
+void
+csharp_emit_char (int c, struct ui_file *stream, int quoter)
+{
+  switch (c)
+    {
+    case '\\':
+    case '\'':
+      fprintf_filtered (stream, "\\%c", c);
+      break;
+    case '\b':
+      fputs_filtered ("\\b", stream);
+      break;
+    case '\t':
+      fputs_filtered ("\\t", stream);
+      break;
+    case '\n':
+      fputs_filtered ("\\n", stream);
+      break;
+    case '\f':
+      fputs_filtered ("\\f", stream);
+      break;
+    case '\r':
+      fputs_filtered ("\\r", stream);
+      break;
+    default:
+      if (isprint (c))
+	fputc_filtered (c, stream);
+      else
+	fprintf_filtered (stream, "\\u%.4x", (unsigned int) c);
+      break;
+    }
+}
+
+int
+csharp_value_print (struct value *val, struct ui_file *stream, int format,
+		    enum val_prettyprint pretty)
+{
+  struct type *type;
+  CORE_ADDR address;
+  int i;
+  char *name;
+
+  type = VALUE_TYPE (val);
+  address = VALUE_ADDRESS (val) + VALUE_OFFSET (val);
+
+  CHECK_TYPEDEF (type);
+  if (TYPE_CODE (type) == TYPE_CODE_PTR)
+    {
+      struct type *target_type = check_typedef (TYPE_TARGET_TYPE (type));
+      CORE_ADDR addr = unpack_pointer (type, VALUE_CONTENTS (val));
+
+      if ((addr != 0) &&
+	  ((TYPE_CODE (target_type) == TYPE_CODE_CSHARP_STRING) ||
+	   (TYPE_CODE (target_type) == TYPE_CODE_CSHARP_ARRAY) ||
+	   (TYPE_CODE (target_type) == TYPE_CODE_STRUCT) ||
+	   (TYPE_CODE (target_type) == TYPE_CODE_CLASS)))
+	{
+	  struct value *newval = value_at (target_type, addr, VALUE_BFD_SECTION (val));
+	  int retval;
+
+	  retval = val_print (target_type, VALUE_CONTENTS (newval), 0, addr,
+			      stream, format, 1, 0, pretty);
+
+	  release_value (newval);
+
+	  return retval;
+	}
+    }
+
+  return (val_print (type, VALUE_CONTENTS (val), 0, address,
+		     stream, format, 1, 0, pretty));
+}
+
+void
+csharp_print_type (struct type *type, char *varstring, struct ui_file *stream,
+		   int show, int level)
+{
+  int i;
+
+  CHECK_TYPEDEF (type);
+  switch (TYPE_CODE (type))
+    {
+    case TYPE_CODE_CSHARP_STRING:
+      fputs_filtered ("string", stream);
+      return;
+
+    case TYPE_CODE_CSHARP_ARRAY:
+      csharp_print_type (TYPE_TARGET_TYPE (type), varstring, stream, show, level);
+
+      fprintf_filtered (stream, "[");
+      for (i = 1; i < TYPE_CSHARP_ARRAY_ARRAY_RANK (type); i++)
+	fprintf_filtered (stream, ",");
+      fputs_filtered ("]", stream);
+
+      return;
+
+    case TYPE_CODE_PTR:
+      if (level == 0)
+	csharp_print_type (TYPE_TARGET_TYPE (type), varstring, stream,
+			   show, level + 1);
+      else
+	c_print_type (type, varstring, stream, show, level);
+
+      return;
+
+    default:
+      c_print_type (type, varstring, stream, show, level);
+      break;
+    }
+}
+
+/*  Called by various <lang>_val_print routines to print elements of an
+   array in the form "<elem1>, <elem2>, <elem3>, ...".
+
+   (FIXME?)  Assumes array element separator is a comma, which is correct
+   for all languages currently handled.
+   (FIXME?)  Some languages have a notation for repeated array elements,
+   perhaps we should try to use that notation when appropriate.
+ */
+
+void
+csharp_print_array_elements (struct type *type, char *valaddr, CORE_ADDR address,
+			     struct ui_file *stream, int format, int deref_ref,
+			     int recurse, enum val_prettyprint pretty,
+			     unsigned int len, unsigned int i)
+{
+  unsigned int things_printed = 0;
+  struct type *elttype;
+  unsigned eltlen;
+  /* Position of the array element we are examining to see
+     whether it is repeated.  */
+  unsigned int rep1;
+  /* Number of repetitions we have detected so far.  */
+  unsigned int reps;
+
+  elttype = TYPE_TARGET_TYPE (type);
+  eltlen = TYPE_LENGTH (check_typedef (elttype));
+
+  annotate_array_section_begin (i, elttype);
+
+  for (; i < len && things_printed < print_max; i++)
+    {
+      if (i != 0)
+	{
+	  if (prettyprint_arrays)
+	    {
+	      fprintf_filtered (stream, ",\n");
+	      print_spaces_filtered (2 + 2 * recurse, stream);
+	    }
+	  else
+	    {
+	      fprintf_filtered (stream, ", ");
+	    }
+	}
+      wrap_here (n_spaces (2 + 2 * recurse));
+
+      rep1 = i + 1;
+      reps = 1;
+      while ((rep1 < len) &&
+	     !memcmp (valaddr + i * eltlen, valaddr + rep1 * eltlen, eltlen))
+	{
+	  ++reps;
+	  ++rep1;
+	}
+
+      if (reps > repeat_count_threshold)
+	{
+	  val_print (elttype, valaddr + i * eltlen, 0, address + i * eltlen,
+		     stream, format, deref_ref, recurse + 1, pretty);
+	  annotate_elt_rep (reps);
+	  fprintf_filtered (stream, " <repeats %u times>", reps);
+	  annotate_elt_rep_end ();
+
+	  i = rep1 - 1;
+	  things_printed += repeat_count_threshold;
+	}
+      else
+	{
+	  val_print (elttype, valaddr + i * eltlen, 0, address + i * eltlen,
+		     stream, format, deref_ref, recurse + 1, pretty);
+	  annotate_elt ();
+	  things_printed++;
+	}
+    }
+  annotate_array_section_end ();
+  if (i < len)
+    {
+      fprintf_filtered (stream, "...");
+    }
+}
+
+/* Print data of type TYPE located at VALADDR (within GDB), which came from
+   the inferior at address ADDRESS, onto stdio stream STREAM according to
+   FORMAT (a letter or 0 for natural format).  The data at VALADDR is in
+   target byte order.
+
+   If the data are a string pointer, returns the number of string characters
+   printed.
+
+   If DEREF_REF is nonzero, then dereference references, otherwise just print
+   them like pointers.
+
+   The PRETTY parameter controls prettyprinting.  */
+
+int
+csharp_val_print (struct type *type, char *valaddr, int embedded_offset,
+		  CORE_ADDR address, struct ui_file *stream, int format,
+		  int deref_ref, int recurse, enum val_prettyprint pretty)
+{
+  register unsigned int i = 0;	/* Number of characters printed */
+  struct type *target_type;
+  struct value *newval;
+  LONGEST length;
+  CORE_ADDR addr;
+
+  CHECK_TYPEDEF (type);
+  switch (TYPE_CODE (type))
+    {
+    case TYPE_CODE_CSHARP_STRING:
+      addr = address + TYPE_CSHARP_ARRAY_LENGTH_OFFSET (type);
+      length = read_memory_integer (addr, TYPE_CSHARP_ARRAY_LENGTH_BYTESIZE (type));
+
+      addr = address + TYPE_CSHARP_ARRAY_DATA_OFFSET (type);
+
+      return val_print_string (addr, length, 2, stream);
+
+    case TYPE_CODE_CSHARP_ARRAY:
+      target_type = check_typedef (TYPE_TARGET_TYPE (type));
+
+      addr = address + TYPE_CSHARP_ARRAY_LENGTH_OFFSET (type);
+      length = read_memory_integer (addr, TYPE_CSHARP_ARRAY_LENGTH_BYTESIZE (type));
+
+      addr = address + TYPE_CSHARP_ARRAY_DATA_OFFSET (type);
+
+      newval = allocate_repeat_value (target_type, length);
+
+      VALUE_LVAL (newval) = lval_memory;
+      VALUE_ADDRESS (newval) = addr;
+      VALUE_LAZY (newval) = 1;
+
+      fprintf_filtered (stream, "{");
+
+      csharp_print_array_elements (type, VALUE_CONTENTS (newval), addr, stream,
+				   format, deref_ref, recurse, pretty, length, 0);
+
+      fprintf_filtered (stream, "}");
+
+      release_value (newval);
+
+      return 0;
+
+    case TYPE_CODE_PTR:
+      target_type = check_typedef (TYPE_TARGET_TYPE (type));
+      addr = unpack_pointer (type, valaddr);
+
+      if ((addr != 0) && (TYPE_CODE (target_type) == TYPE_CODE_CSHARP_STRING))
+	{
+	  struct value *newval = value_at (target_type, addr, NULL);
+	  int retval;
+
+	  retval = val_print (target_type, VALUE_CONTENTS (newval), 0, addr,
+			      stream, format, 1, 0, pretty);
+
+	  release_value (newval);
+
+	  return retval;
+	}
+      break;
+
+    default:
+      break;
+    }
+
+  return c_val_print (type, valaddr, embedded_offset, address, stream,
+		      format, deref_ref, recurse, pretty);
+}
+
+/* Table mapping opcodes into strings for printing operators
+   and precedences of the operators.  */
+
+const struct op_print csharp_op_print_tab[] =
+{
+  {NULL, 0, 0, 0}
+};
diff --git a/mcs/class/Mono.CSharp.Debugger/csharp-lang.h b/mcs/class/Mono.CSharp.Debugger/csharp-lang.h
new file mode 100644
index 00000000000..27a331065a5
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/csharp-lang.h
@@ -0,0 +1,38 @@
+/* -*- mode: C; c-basic-offset: 2 -*-
+
+   C# language support for Mono.
+   Copyright 2002 Ximian, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#ifndef CSHARP_LANG_H
+#define CSHARP_LANG_H
+
+extern const struct op_print csharp_op_print_tab[];
+
+extern void csharp_emit_char (int c, struct ui_file *stream, int quoter);
+
+extern void csharp_print_type (struct type *type, char *varstring,
+			       struct ui_file *stream, int show, int level);
+
+extern int csharp_val_print (struct type *type, char *valaddr, int embedded_offset,
+			     CORE_ADDR address, struct ui_file *stream, int format,
+			     int deref_ref, int recurse, enum val_prettyprint pretty);
+
+extern int csharp_value_print (struct value *val, struct ui_file *stream, int format,
+			       enum val_prettyprint pretty);
+
+#endif
diff --git a/mcs/class/Mono.CSharp.Debugger/csharp-mono-lang.c b/mcs/class/Mono.CSharp.Debugger/csharp-mono-lang.c
new file mode 100644
index 00000000000..6c7a87573dc
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/csharp-mono-lang.c
@@ -0,0 +1,76 @@
+/* -*- mode: C; c-basic-offset: 2 -*-
+
+   C# language support for Mono.
+   Copyright 2002 Ximian, Inc.
+
+   This program is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This program is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330,
+   Boston, MA 02111-1307, USA.  */
+
+#include "defs.h"
+#include "symtab.h"
+#include "gdbtypes.h"
+#include "expression.h"
+#include "parser-defs.h"
+#include "language.h"
+#include "gdbtypes.h"
+#include "symtab.h"
+#include "symfile.h"
+#include "objfiles.h"
+#include "gdb_string.h"
+#include "value.h"
+#include "csharp-lang.h"
+#include "c-lang.h"
+#include "gdbcore.h"
+#include <ctype.h>
+
+/* Local functions */
+
+extern void _initialize_csharp_mono_language (void);
+
+const struct language_defn csharp_mono_language_defn =
+{
+  "csharp-mono",		/* Language name */
+  language_csharp_mono,
+  c_builtin_types,
+  range_check_off,
+  type_check_off,
+  case_sensitive_on,
+  c_parse,
+  c_error,
+  evaluate_subexp_standard,
+  c_printchar,			/* Print a character constant */
+  c_printstr,			/* Function to print string constant */
+  csharp_emit_char,		/* Function to print a single character */
+  c_create_fundamental_type,	/* Create fundamental type in this language */
+  csharp_print_type,		/* Print a type using appropriate syntax */
+  csharp_val_print,		/* Print a value using appropriate syntax */
+  csharp_value_print,		/* Print a top-level value */
+  {"", "", "", ""},		/* Binary format info */
+  {"0%lo", "0", "o", ""},	/* Octal format info */
+  {"%ld", "", "d", ""},		/* Decimal format info */
+  {"0x%lx", "0x", "x", ""},	/* Hex format info */
+  csharp_op_print_tab,		/* expression operators for printing */
+  0,				/* not c-style arrays */
+  0,				/* String lower bound */
+  &builtin_type_char,		/* Type of string elements */
+  LANG_MAGIC
+};
+
+void
+_initialize_csharp_mono_language (void)
+{
+  add_language (&csharp_mono_language_defn);
+}
+
diff --git a/mcs/class/Mono.CSharp.Debugger/gdb-csharp-support.patch b/mcs/class/Mono.CSharp.Debugger/gdb-csharp-support.patch
new file mode 100644
index 00000000000..2bd705d1d85
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/gdb-csharp-support.patch
@@ -0,0 +1,460 @@
+diff -ru gdb-5.2.orig/gdb/Makefile.in gdb-5.2/gdb/Makefile.in
+--- gdb-5.2.orig/gdb/Makefile.in	Mon Feb 25 19:15:52 2002
++++ gdb-5.2/gdb/Makefile.in	Thu May 30 22:33:31 2002
+@@ -548,7 +548,8 @@
+ 	tui/tui-file.h tui/tui-file.c tui/tui-out.c tui/tui-hooks.c \
+ 	ui-file.h ui-file.c \
+ 	frame.c doublest.c \
+-	gnu-v2-abi.c gnu-v3-abi.c hpacc-abi.c cp-abi.c
++	gnu-v2-abi.c gnu-v3-abi.c hpacc-abi.c cp-abi.c \
++	csharp-lang.c csharp-mono-lang.c
+ 
+ LINTFILES = $(SFILES) $(YYFILES) $(CONFIG_SRCS) init.c
+ 
+@@ -670,7 +671,8 @@
+ 	vx-share/dbgRpcLib.h vx-share/ptrace.h vx-share/vxTypes.h \
+ 	vx-share/vxWorks.h vx-share/wait.h vx-share/xdr_ld.h \
+ 	vx-share/xdr_ptrace.h vx-share/xdr_rdb.h gdbthread.h \
+-	dcache.h remote-utils.h top.h somsolib.h
++	dcache.h remote-utils.h top.h somsolib.h \
++	csharp-lang.h
+ 
+ # Header files that already have srcdir in them, or which are in objdir.
+ 
+@@ -722,7 +724,8 @@
+ 	nlmread.o serial.o mdebugread.o os9kread.o top.o utils.o \
+ 	ui-file.o \
+ 	frame.o doublest.o \
+-	gnu-v2-abi.o gnu-v3-abi.o hpacc-abi.o cp-abi.o
++	gnu-v2-abi.o gnu-v3-abi.o hpacc-abi.o cp-abi.o \
++	csharp-lang.o csharp-mono-lang.o
+ 
+ OBS = $(COMMON_OBS) $(ANNOTATE_OBS)
+ 
+diff -ru gdb-5.2.orig/gdb/defs.h gdb-5.2/gdb/defs.h
+--- gdb-5.2.orig/gdb/defs.h	Mon Mar 25 17:50:20 2002
++++ gdb-5.2/gdb/defs.h	Thu May 30 22:32:57 2002
+@@ -209,7 +209,8 @@
+     language_m2,		/* Modula-2 */
+     language_asm,		/* Assembly language */
+     language_scm,    		/* Scheme / Guile */
+-    language_pascal		/* Pascal */
++    language_pascal,		/* Pascal */
++    language_csharp_mono	/* C# using Mono */
+   };
+ 
+ enum precision_type
+diff -ru gdb-5.2.orig/gdb/dwarf2read.c gdb-5.2/gdb/dwarf2read.c
+--- gdb-5.2.orig/gdb/dwarf2read.c	Thu Feb 28 12:21:16 2002
++++ gdb-5.2/gdb/dwarf2read.c	Fri Jul  5 14:34:25 2002
+@@ -733,7 +733,8 @@
+ static void read_tag_volatile_type (struct die_info *, struct objfile *,
+ 				    const struct comp_unit_head *);
+ 
+-static void read_tag_string_type (struct die_info *, struct objfile *);
++static void read_tag_string_type (struct die_info *, struct objfile *,
++				  const struct comp_unit_head *);
+ 
+ static void read_subroutine_type (struct die_info *, struct objfile *,
+ 				  const struct comp_unit_head *);
+@@ -1520,7 +1521,7 @@
+       read_tag_reference_type (die, objfile, cu_header);
+       break;
+     case DW_TAG_string_type:
+-      read_tag_string_type (die, objfile);
++      read_tag_string_type (die, objfile, cu_header);
+       break;
+     case DW_TAG_base_type:
+       read_base_type (die, objfile);
+@@ -2510,6 +2511,52 @@
+       return;
+     }
+ 
++  if (cu_language == language_csharp_mono)
++    {
++      die->type = create_csharp_array_type (NULL, element_type);
++
++      attr = dwarf_attr (die, DW_AT_data_location);
++      if (attr)
++	{
++	  TYPE_CSHARP_ARRAY_DATA_OFFSET (die->type) =
++	    decode_locdesc (DW_BLOCK (attr), objfile, cu_header);
++	}
++
++      child_die = die->next;
++      while (child_die && child_die->tag)
++	{
++	  if (child_die->tag != DW_TAG_subrange_type)
++	    internal_error (__FILE__, __LINE__,
++			    "read_array_type: invalid C# array type");
++
++	  ++TYPE_CSHARP_ARRAY_ARRAY_RANK (die->type);
++
++	  child_die = sibling_die (child_die);
++	}
++
++      if (TYPE_CSHARP_ARRAY_ARRAY_RANK (die->type) < 2)
++	{
++	  attr = dwarf_attr (die->next, DW_AT_count);
++	  if (attr)
++	    {
++	      TYPE_CSHARP_ARRAY_LENGTH_OFFSET (die->type) =
++		decode_locdesc (DW_BLOCK (attr), objfile, cu_header);
++	    }
++
++	  attr = dwarf_attr (die->next, DW_AT_byte_size);
++	  if (attr)
++	    {
++	      TYPE_CSHARP_ARRAY_LENGTH_BYTESIZE (die->type) = DW_UNSND (attr);
++	    }
++	}
++
++      TYPE_LENGTH (die->type) = max (TYPE_CSHARP_ARRAY_DATA_OFFSET (die->type),
++				     TYPE_CSHARP_ARRAY_LENGTH_OFFSET (die->type)) +
++	      TYPE_CSHARP_ARRAY_LENGTH_BYTESIZE (die->type);
++
++      return;
++    }
++
+   back_to = make_cleanup (null_cleanup, NULL);
+   child_die = die->next;
+   while (child_die && child_die->tag)
+@@ -2766,7 +2813,8 @@
+    attribute to reference it.  */
+ 
+ static void
+-read_tag_string_type (struct die_info *die, struct objfile *objfile)
++read_tag_string_type (struct die_info *die, struct objfile *objfile,
++		      const struct comp_unit_head *cu_header)
+ {
+   struct type *type, *range_type, *index_type, *char_type;
+   struct attribute *attr;
+@@ -2777,6 +2825,34 @@
+       return;
+     }
+ 
++  if (cu_language == language_csharp_mono)
++    {
++      type = create_csharp_string_type (NULL, objfile);
++      TYPE_NAME (type) = obsavestring ("string", 6, &objfile->type_obstack);
++
++      attr = dwarf_attr (die, DW_AT_string_length);
++      if (attr)
++	{
++	  TYPE_CSHARP_ARRAY_LENGTH_OFFSET (type) = decode_locdesc (DW_BLOCK (attr), objfile, cu_header);
++	}
++
++      attr = dwarf_attr (die, DW_AT_byte_size);
++      if (attr)
++	{
++	  TYPE_CSHARP_ARRAY_LENGTH_BYTESIZE (type) = DW_UNSND (attr);
++	}
++
++      attr = dwarf_attr (die, DW_AT_data_location);
++      if (attr)
++	{
++	  TYPE_CSHARP_ARRAY_DATA_OFFSET (type) = decode_locdesc (DW_BLOCK (attr), objfile, cu_header);
++	}
++
++      die->type = type;
++      return;
++    }
++
++
+   attr = dwarf_attr (die, DW_AT_string_length);
+   if (attr)
+     {
+@@ -3822,6 +3898,9 @@
+     case DW_LANG_Java:
+       cu_language = language_java;
+       break;
++    case DW_LANG_CSharp_Mono:
++      cu_language = language_csharp_mono;
++      break;
+     case DW_LANG_Ada83:
+     case DW_LANG_Cobol74:
+     case DW_LANG_Cobol85:
+@@ -4288,6 +4367,19 @@
+ 		add_symbol_to_list (sym, list_in_scope);
+ 	      break;
+ 	    }
++	  attr = dwarf_attr (die, DW_AT_start_scope);
++	  attr2 = dwarf_attr (die, DW_AT_end_scope);
++	  if (attr && attr2)
++	    {
++	      struct range_list *r = (struct range_list *)
++		obstack_alloc (&objfile->type_obstack,
++			       sizeof (struct range_list));
++
++	      r->start = DW_ADDR (attr);
++	      r->end = DW_ADDR (attr2);
++
++	      SYMBOL_RANGES (sym) = r;
++	    }
+ 	  attr = dwarf_attr (die, DW_AT_location);
+ 	  if (attr)
+ 	    {
+@@ -4701,7 +4793,7 @@
+       read_tag_volatile_type (die, objfile, cu_header);
+       break;
+     case DW_TAG_string_type:
+-      read_tag_string_type (die, objfile);
++      read_tag_string_type (die, objfile, cu_header);
+       break;
+     case DW_TAG_typedef:
+       read_typedef (die, objfile, cu_header);
+diff -ru gdb-5.2.orig/gdb/findvar.c gdb-5.2/gdb/findvar.c
+--- gdb-5.2.orig/gdb/findvar.c	Sun Feb 10 03:47:11 2002
++++ gdb-5.2/gdb/findvar.c	Fri May 31 01:14:10 2002
+@@ -411,9 +411,11 @@
+ read_var_value (register struct symbol *var, struct frame_info *frame)
+ {
+   register struct value *v;
++  register struct range_list *r;
+   struct type *type = SYMBOL_TYPE (var);
+   CORE_ADDR addr;
+   register int len;
++  int range_ok = 0;
+ 
+   v = allocate_value (type);
+   VALUE_LVAL (v) = lval_memory;	/* The most likely possibility.  */
+@@ -423,6 +425,23 @@
+ 
+   if (frame == NULL)
+     frame = selected_frame;
++
++  if (!SYMBOL_RANGES (var))
++    range_ok = 1;
++  else
++    {
++      for (r = SYMBOL_RANGES (var); r; r = r->next)
++	{
++	  if (r->start <= frame->pc && r->end >= frame->pc)
++	    {
++	      range_ok = 1;
++	      break;
++	    }
++	}
++    }
++
++  if (!range_ok)
++    return NULL;
+ 
+   switch (SYMBOL_CLASS (var))
+     {
+diff -ru gdb-5.2.orig/gdb/gdbtypes.c gdb-5.2/gdb/gdbtypes.c
+--- gdb-5.2.orig/gdb/gdbtypes.c	Fri Feb  8 18:34:33 2002
++++ gdb-5.2/gdb/gdbtypes.c	Fri Jul  5 14:32:54 2002
+@@ -726,6 +726,26 @@
+   return (result_type);
+ }
+ 
++struct type *
++create_csharp_array_type (struct type *result_type, struct type *element_type)
++{
++  LONGEST low_bound, high_bound;
++
++  if (result_type == NULL)
++    {
++      result_type = alloc_type (TYPE_OBJFILE (element_type));
++    }
++  TYPE_CODE (result_type) = TYPE_CODE_CSHARP_ARRAY;
++  TYPE_TARGET_TYPE (result_type) = element_type;
++
++  CHECK_TYPEDEF (element_type);
++
++  TYPE_CSHARP_ARRAY (result_type) = (struct csharp_array_type *)
++    TYPE_ALLOC (result_type, sizeof (struct csharp_array_type));
++
++  return (result_type);
++}
++
+ /* Create a string type using either a blank type supplied in RESULT_TYPE,
+    or creating a new type.  String types are similar enough to array of
+    char types that we can use create_array_type to build the basic type
+@@ -744,6 +764,18 @@
+ 				   *current_language->string_char_type,
+ 				   range_type);
+   TYPE_CODE (result_type) = TYPE_CODE_STRING;
++  return (result_type);
++}
++
++struct type *
++create_csharp_string_type (struct type *result_type, struct objfile *objfile)
++{
++  result_type = alloc_type (objfile);
++  TYPE_CODE (result_type) = TYPE_CODE_CSHARP_STRING;
++
++  TYPE_CSHARP_ARRAY (result_type) = (struct csharp_array_type *)
++    TYPE_ALLOC (result_type, sizeof (struct csharp_array_type));
++
+   return (result_type);
+ }
+ 
+diff -ru gdb-5.2.orig/gdb/gdbtypes.h gdb-5.2/gdb/gdbtypes.h
+--- gdb-5.2.orig/gdb/gdbtypes.h	Sun Feb  3 23:57:56 2002
++++ gdb-5.2/gdb/gdbtypes.h	Fri Jul  5 00:16:16 2002
+@@ -130,7 +130,10 @@
+ 
+     TYPE_CODE_TYPEDEF,
+     TYPE_CODE_TEMPLATE,		/* C++ template */
+-    TYPE_CODE_TEMPLATE_ARG	/* C++ template arg */
++    TYPE_CODE_TEMPLATE_ARG,	/* C++ template arg */
++
++    TYPE_CODE_CSHARP_STRING,	/* C# string */
++    TYPE_CODE_CSHARP_ARRAY	/* C# array */
+ 
+   };
+ 
+@@ -471,6 +474,10 @@
+ 
+ 	struct cplus_struct_type *cplus_stuff;
+ 
++	/* CSHARP_ARRAY is for TYPE_CODE_CSHARP_ARRAY.  */
++
++	struct csharp_array_type *csharp_array;    
++
+ 	/* FLOATFORMAT is for TYPE_CODE_FLT.  It is a pointer to the
+            floatformat object that describes the floating-point value
+            that resides within the type.  */
+@@ -704,6 +711,20 @@
+      *localtype_ptr;
+   };
+ 
++/* C# language-specific information for TYPE_CODE_CSHARP_STRING and
++ * TYPE_CODE_CSHARP_ARRAY nodes.  */
++
++struct csharp_array_type
++  {
++    unsigned array_rank;
++
++    unsigned length_offset;
++
++    unsigned length_bytesize;
++
++    unsigned data_offset;
++  };
++
+ /* Struct used in computing virtual base list */
+ struct vbase
+   {
+@@ -844,6 +865,14 @@
+   (TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits == NULL ? 0 \
+     : B_TST(TYPE_CPLUS_SPECIFIC(thistype)->virtual_field_bits, (n)))
+ 
++/* C# */
++
++#define TYPE_CSHARP_ARRAY(thistype) (thistype)->type_specific.csharp_array
++#define TYPE_CSHARP_ARRAY_ARRAY_RANK(thistype) TYPE_CSHARP_ARRAY(thistype)->array_rank
++#define TYPE_CSHARP_ARRAY_LENGTH_OFFSET(thistype) TYPE_CSHARP_ARRAY(thistype)->length_offset
++#define TYPE_CSHARP_ARRAY_LENGTH_BYTESIZE(thistype) TYPE_CSHARP_ARRAY(thistype)->length_bytesize
++#define TYPE_CSHARP_ARRAY_DATA_OFFSET(thistype) TYPE_CSHARP_ARRAY(thistype)->data_offset
++
+ #define TYPE_FIELD_STATIC(thistype, n) ((thistype)->fields[n].bitsize < 0)
+ #define TYPE_FIELD_STATIC_HAS_ADDR(thistype, n) ((thistype)->fields[n].bitsize == -2)
+ #define TYPE_FIELD_STATIC_PHYSNAME(thistype, n) FIELD_PHYSNAME(TYPE_FIELD(thistype, n))
+@@ -1100,7 +1129,12 @@
+ extern struct type *create_array_type (struct type *, struct type *,
+ 				       struct type *);
+ 
++extern struct type *create_csharp_array_type (struct type *result_type,
++					      struct type *element_type);
++
+ extern struct type *create_string_type (struct type *, struct type *);
++
++extern struct type *create_csharp_string_type (struct type *, struct objfile *);
+ 
+ extern struct type *create_set_type (struct type *, struct type *);
+ 
+diff -ru gdb-5.2.orig/gdb/language.c gdb-5.2/gdb/language.c
+--- gdb-5.2.orig/gdb/language.c	Wed Feb 13 19:49:30 2002
++++ gdb-5.2/gdb/language.c	Thu May 30 22:32:57 2002
+@@ -865,6 +865,7 @@
+     case language_chill:
+     case language_m2:
+     case language_pascal:
++    case language_csharp_mono:
+       return TYPE_CODE (type) != TYPE_CODE_CHAR ? 0 : 1;
+ 
+     case language_c:
+diff -ru gdb-5.2.orig/gdb/stack.c gdb-5.2/gdb/stack.c
+--- gdb-5.2.orig/gdb/stack.c	Thu Feb 14 08:24:54 2002
++++ gdb-5.2/gdb/stack.c	Fri May 31 01:13:24 2002
+@@ -1173,14 +1173,36 @@
+ 	case LOC_REGISTER:
+ 	case LOC_STATIC:
+ 	case LOC_BASEREG:
+-	  values_printed = 1;
+-	  for (j = 0; j < num_tabs; j++)
+-	    fputs_filtered ("\t", stream);
+-	  fputs_filtered (SYMBOL_SOURCE_NAME (sym), stream);
+-	  fputs_filtered (" = ", stream);
+-	  print_variable_value (sym, fi, stream);
+-	  fprintf_filtered (stream, "\n");
+-	  break;
++	  {
++	    struct range_list *r;
++	    int range_ok = 0;
++
++	    if (!SYMBOL_RANGES (sym))
++	      range_ok = 1;
++	    else
++	      {
++		for (r = SYMBOL_RANGES (sym); r; r = r->next)
++		  {
++		    if (r->start <= fi->pc && r->end >= fi->pc)
++		      {
++			range_ok = 1;
++			break;
++		      }
++		  }
++	      }
++
++	    if (range_ok)
++	      {
++		values_printed = 1;
++		for (j = 0; j < num_tabs; j++)
++		  fputs_filtered ("\t", stream);
++		fputs_filtered (SYMBOL_SOURCE_NAME (sym), stream);
++		fputs_filtered (" = ", stream);
++		print_variable_value (sym, fi, stream);
++		fprintf_filtered (stream, "\n");
++	      }
++	    break;
++	  }
+ 
+ 	default:
+ 	  /* Ignore symbols which are not locals.  */
+diff -ru gdb-5.2.orig/include/elf/ChangeLog gdb-5.2/include/elf/ChangeLog
+--- gdb-5.2.orig/include/elf/ChangeLog	Wed Feb 13 19:14:48 2002
++++ gdb-5.2/include/elf/ChangeLog	Fri May 31 00:25:33 2002
+@@ -1,3 +1,7 @@
++2002-04-12  Martin Baulig  <martin@gnome.org>
++
++	* dwarf2.h (DW_AT_end_scope): Added as GNU extension.
++
+ 2002-02-13  Matt Fredette  <fredette@netbsd.org>
+ 
+ 	* m68k.h (EF_M68000): Define.
+diff -ru gdb-5.2.orig/include/elf/dwarf2.h gdb-5.2/include/elf/dwarf2.h
+--- gdb-5.2.orig/include/elf/dwarf2.h	Tue Jan 29 00:26:53 2002
++++ gdb-5.2/include/elf/dwarf2.h	Fri May 31 00:25:33 2002
+@@ -328,6 +328,8 @@
+     DW_AT_src_coords = 0x2104,
+     DW_AT_body_begin = 0x2105,
+     DW_AT_body_end   = 0x2106,
++    DW_AT_end_scope  = 0x2121,
++    
+     /* VMS Extensions.  */
+     DW_AT_VMS_rtnbeg_pd_address = 0x2201
+   };
+@@ -675,7 +677,8 @@
+     DW_LANG_Ada95 = 0x000d,
+     DW_LANG_Fortran95 = 0x000e,
+     /* MIPS.  */
+-    DW_LANG_Mips_Assembler = 0x8001
++    DW_LANG_Mips_Assembler = 0x8001,
++    DW_LANG_CSharp_Mono = 0x9001
+   };
+ 
+ 
diff --git a/mcs/class/Mono.CSharp.Debugger/gdb-variable-scopes.patch b/mcs/class/Mono.CSharp.Debugger/gdb-variable-scopes.patch
new file mode 100644
index 00000000000..fc9612b0148
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/gdb-variable-scopes.patch
@@ -0,0 +1,175 @@
+Index: include/elf/ChangeLog
+===================================================================
+RCS file: /cvs/src/src/include/elf/ChangeLog,v
+retrieving revision 1.121
+diff -u -u -p -r1.121 ChangeLog
+--- include/elf/ChangeLog	13 Feb 2002 18:14:48 -0000	1.121
++++ include/elf/ChangeLog	12 Apr 2002 19:50:31 -0000
+@@ -1,3 +1,7 @@
++2002-04-12  Martin Baulig  <martin@gnome.org>
++
++	* dwarf2.h (DW_AT_end_scope): Added as GNU extension.
++
+ 2002-02-13  Matt Fredette  <fredette@netbsd.org>
+ 
+ 	* m68k.h (EF_M68000): Define.
+Index: include/elf/dwarf2.h
+===================================================================
+RCS file: /cvs/src/src/include/elf/dwarf2.h,v
+retrieving revision 1.8
+diff -u -u -p -r1.8 dwarf2.h
+--- include/elf/dwarf2.h	28 Jan 2002 23:26:53 -0000	1.8
++++ include/elf/dwarf2.h	12 Apr 2002 19:50:32 -0000
+@@ -328,6 +328,8 @@ enum dwarf_attribute
+     DW_AT_src_coords = 0x2104,
+     DW_AT_body_begin = 0x2105,
+     DW_AT_body_end   = 0x2106,
++    DW_AT_end_scope  = 0x2121,
++    
+     /* VMS Extensions.  */
+     DW_AT_VMS_rtnbeg_pd_address = 0x2201
+   };
+Index: gdb/ChangeLog
+===================================================================
+RCS file: /cvs/src/src/gdb/ChangeLog,v
+retrieving revision 1.2421
+diff -u -u -p -r1.2421 ChangeLog
+--- gdb/ChangeLog	12 Apr 2002 07:37:17 -0000	1.2421
++++ gdb/ChangeLog	12 Apr 2002 19:50:38 -0000
+@@ -1,3 +1,14 @@
++2002-04-12  Martin Baulig  <martin@gnome.org>
++
++	* dwarf2read.c (new_symbol): If DW_AT_start_scope and DW_AT_end_scope
++	are specified, set SYMBOL_RANGES().
++
++	* findvar.c (read_var_value): Check whether the current PC is within
++	the SYMBOL_RANGES(), return NULL if not.
++
++	* stack.c (print_block_frame_locals): Only print vars if the current PC
++	is in their SYMBOL_RANGES().
++
+ 2002-04-12  Kevin Buettner  <kevinb@redhat.com>
+ 
+ 	From Jimi X <jimix@watson.ibm.com>:
+Index: gdb/dwarf2read.c
+===================================================================
+RCS file: /cvs/src/src/gdb/dwarf2read.c,v
+retrieving revision 1.52
+diff -u -u -p -r1.52 dwarf2read.c
+--- gdb/dwarf2read.c	4 Apr 2002 22:26:43 -0000	1.52
++++ gdb/dwarf2read.c	12 Apr 2002 19:50:44 -0000
+@@ -4394,6 +4394,19 @@ new_symbol (struct die_info *die, struct
+ 		add_symbol_to_list (sym, list_in_scope);
+ 	      break;
+ 	    }
++	  attr = dwarf_attr (die, DW_AT_start_scope);
++	  attr2 = dwarf_attr (die, DW_AT_end_scope);
++	  if (attr && attr2)
++	    {
++	      struct range_list *r = (struct range_list *)
++		obstack_alloc (&objfile->type_obstack,
++			       sizeof (struct range_list));
++
++	      r->start = DW_ADDR (attr);
++	      r->end = DW_ADDR (attr2);
++
++	      SYMBOL_RANGES (sym) = r;
++	    }
+ 	  attr = dwarf_attr (die, DW_AT_location);
+ 	  if (attr)
+ 	    {
+Index: gdb/findvar.c
+===================================================================
+RCS file: /cvs/src/src/gdb/findvar.c,v
+retrieving revision 1.31
+diff -u -u -p -r1.31 findvar.c
+--- gdb/findvar.c	9 Apr 2002 03:06:13 -0000	1.31
++++ gdb/findvar.c	12 Apr 2002 19:50:45 -0000
+@@ -417,9 +417,11 @@ struct value *
+ read_var_value (register struct symbol *var, struct frame_info *frame)
+ {
+   register struct value *v;
++  register struct range_list *r;
+   struct type *type = SYMBOL_TYPE (var);
+   CORE_ADDR addr;
+   register int len;
++  int range_ok = 0;
+ 
+   v = allocate_value (type);
+   VALUE_LVAL (v) = lval_memory;	/* The most likely possibility.  */
+@@ -429,6 +431,23 @@ read_var_value (register struct symbol *
+ 
+   if (frame == NULL)
+     frame = selected_frame;
++
++  if (!SYMBOL_RANGES (var))
++    range_ok = 1;
++  else
++    {
++      for (r = SYMBOL_RANGES (var); r; r = r->next)
++	{
++	  if (r->start <= frame->pc && r->end > frame->pc)
++	    {
++	      range_ok = 1;
++	      break;
++	    }
++	}
++    }
++
++  if (!range_ok)
++    return NULL;
+ 
+   switch (SYMBOL_CLASS (var))
+     {
+Index: gdb/stack.c
+===================================================================
+RCS file: /cvs/src/src/gdb/stack.c,v
+retrieving revision 1.33
+diff -u -u -p -r1.33 stack.c
+--- gdb/stack.c	10 Apr 2002 23:32:33 -0000	1.33
++++ gdb/stack.c	12 Apr 2002 19:50:47 -0000
+@@ -1173,14 +1173,36 @@ print_block_frame_locals (struct block *
+ 	case LOC_REGISTER:
+ 	case LOC_STATIC:
+ 	case LOC_BASEREG:
+-	  values_printed = 1;
+-	  for (j = 0; j < num_tabs; j++)
+-	    fputs_filtered ("\t", stream);
+-	  fputs_filtered (SYMBOL_SOURCE_NAME (sym), stream);
+-	  fputs_filtered (" = ", stream);
+-	  print_variable_value (sym, fi, stream);
+-	  fprintf_filtered (stream, "\n");
+-	  break;
++	  {
++	    struct range_list *r;
++	    int range_ok = 0;
++
++	    if (!SYMBOL_RANGES (sym))
++	      range_ok = 1;
++	    else
++	      {
++		for (r = SYMBOL_RANGES (sym); r; r = r->next)
++		  {
++		    if (r->start <= fi->pc && r->end > fi->pc)
++		      {
++			range_ok = 1;
++			break;
++		      }
++		  }
++	      }
++
++	    if (range_ok)
++	      {
++		values_printed = 1;
++		for (j = 0; j < num_tabs; j++)
++		  fputs_filtered ("\t", stream);
++		fputs_filtered (SYMBOL_SOURCE_NAME (sym), stream);
++		fputs_filtered (" = ", stream);
++		print_variable_value (sym, fi, stream);
++		fprintf_filtered (stream, "\n");
++	      }
++	    break;
++	  }
+ 
+ 	default:
+ 	  /* Ignore symbols which are not locals.  */
diff --git a/mcs/class/Mono.CSharp.Debugger/list.unix b/mcs/class/Mono.CSharp.Debugger/list.unix
new file mode 100644
index 00000000000..38ed97402b9
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/list.unix
@@ -0,0 +1,6 @@
+AssemblerWriterI386.cs
+IAssemblerWriter.cs
+IMonoSymbolWriter.cs
+MonoDwarfFileWriter.cs
+MonoSymbolDocumentWriter.cs
+MonoSymbolWriter.cs
diff --git a/mcs/class/Mono.CSharp.Debugger/makefile.gnu b/mcs/class/Mono.CSharp.Debugger/makefile.gnu
new file mode 100644
index 00000000000..97a3f005857
--- /dev/null
+++ b/mcs/class/Mono.CSharp.Debugger/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../..
+
+LIBRARY = ../lib/Mono.CSharp.Debugger.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib
+
+SOURCES_INCLUDE=*.cs
+
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/Mono.Data.MySql/ChangeLog b/mcs/class/Mono.Data.MySql/ChangeLog
new file mode 100644
index 00000000000..9b109532fa6
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/ChangeLog
@@ -0,0 +1,79 @@
+2002-08-13  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Mono.Data.MySql/MySqlCommand.cs: modified
+	rowsRetrieved should be rowsAffected in ExecuteNonQuery
+	because the number is only to show the rows affected
+	by an INSERT, UPDATE, or DELETE; anything else, the
+	number is -1
+	
+	* Mono.Data.MySql/Test.cs: modified
+	enable retrieving the results from a query.  even though
+	this still does not work for some reason, i thought
+	i would enable it so others could see the problem.
+
+2002-05-30  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Mono.Data.MySql.build: modified
+	need to copy Mono.Data.MySql.dll to mcs/class/System.Data/Test
+	so the SqlSharpCli test program can use MySql too
+
+2002-05-30  Daniel Morgan <danmorg@sc.rr.com>
+	
+	* Test/TestMySqlInsert.cs: added test
+	to do an SQL INSERT to insert a row into table.
+	Works on cygwin compiled using mcs and mono and
+	runs on mint, but it fails running on mono.
+	
+	* Mono.Data.MySql/MySqlCommand.cs
+	* Mono.Data.MySql/TODOAttribute.cs
+	* Mono.Data.MySql/MySqlConnection.cs: added
+	
+	* list: added
+	so can build with mcs/mono on linux
+	I only tested it on Cygwin though.
+	To work on linux, the library name in the pinvokes
+	in MySql.cs will need to be changed.
+	
+	* Mono.Data.MySql.build: modified
+	exclude files from build.  also copy Mono.Data.MySql.dll
+	to Mono.Data.MySql so you can build and run Test.cs
+	
+	* Mono.Data.MySql/MySql.cs: modified
+	tweaks to compile under mcs/mono and run under mint or mono.
+	Runs under mint, but not mono. Had to comment out 
+	mysql_thread_begin/mysql_thread_end functions because they refused
+	to load in mono.  Until this is fixed, a memory leak will occur.
+	Can not retrieve field data from MySQL because the PtrToStructure()
+	needs to be implemented in System.Runtime.InteropServices.Marshal class.
+	However, this will be very complicated to do.  So, we connect to
+	MySQL and execute SQL Commands,	but we can not do Queries yet.
+		
+	* Mono.Data.MySql/Test.cs: modified
+	tweaks to test C# bindings with compiling mcs/mono and
+	running on mint and mono.  Runs on mint, but not mono.
+
+2002-05-28  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Mono.Data.MySql
+	* Mono.Data.MySql/Mono.Data.MySql: add directories
+	for the Mono.Data.MySql assembly and namespace.  This
+	will contain the MySql .NET Data Provider which will use
+	C# bindings to libMySQL
+	
+	* Mono.Data.MySql/Test.cs: added file to
+	test the C# bindings to MySQL
+	
+	* Mono.Data.MySql/MySql.cs
+	* Mono.Data.MySql/Field.cs: added files
+	for the beginnings of C# bindings to MySQL
+	
+	* Mono.Data.MySql/makefile: added file
+	to build the MySQL C# bindings on csc/Microsoft.NET
+	
+	These C# bindings to the MySQL libMySQL.dll were created by
+	Brad Merrill <zbrad@cybercom.net> 
+	and can be downloaded from
+	http://www.cybercom.net/~zbrad/DotNet/MySql/
+	and put into the Mono Class Library under the X11/MIT License
+	with Brad Merril's permission.
+
diff --git a/mcs/class/Mono.Data.MySql/Mono.Data.MySql.build b/mcs/class/Mono.Data.MySql/Mono.Data.MySql.build
new file mode 100644
index 00000000000..1ffa819f7d0
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/Mono.Data.MySql.build
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+

+<!-- NAnt build file for Mono.Data.MySql.dll -->

+

+<project name="Mono.Data.MySql" default="build">

+	<property name="debug" value="false"/>

+

+	<target name="build">

+		<csc target="library" output="../lib/Mono.Data.MySql.dll" debug="${debug}">

+			<arg value="/nowarn:1595"/>

+			<arg value="/nowarn:0067"/>

+			<arg value="/nowarn:0109"/>

+			<arg value="/nowarn:0169"/>

+			<arg value="/nowarn:0649"/>

+			<arg value="/unsafe"/>

+			<arg value="/noconfig"/>

+			<arg value="/r:System.dll"/>

+			<arg value="/r:System.Xml.dll"/>

+			<arg value="/r:System.Data.dll"/>

+			<sources>

+				<includes name="**/*.cs"/> 

+				<excludes name="Test/**"/>
+				<excludes name="Mono.Data.MySql/Test.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlClientPermission.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlClientPermissionAttribute.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlCommandBuilder.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlDataAdapter.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlDataReader.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlError.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlErrorCollection.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlException.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlInfoMessageEventArgs.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlInfoMessageEventHandler.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlParameter.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlParameterCollection.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlRowUpdatedEventArgs.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlRowUpdatedEventHandler.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlRowUpdatingEventArgs.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlRowUpdatingEventHandler.cs"/>
+				<excludes name="Mono.Data.MySql/MySqlTransaction.cs"/>
+				

+			</sources>

+			<references>

+				<includes name="../lib/corlib.dll"/>

+				<includes name="../lib/System.dll"/>

+				<includes name="../lib/System.Xml.dll"/>

+				<includes name="../lib/System.Data.dll"/>

+			</references>

+		</csc>

+		<copy file="../lib/System.Data.dll" tofile="Test/System.Data.dll"/>

+		<copy file="../lib/Mono.Data.MySql.dll" tofile="Test/Mono.Data.MySql.dll"/>

+		<copy file="../lib/Mono.Data.MySql.dll" tofile="Mono.Data.MySql/Mono.Data.MySql.dll"/>

+		<copy file="../lib/Mono.Data.MySql.dll" tofile="../System.Data/Test/Mono.Data.MySql.dll"/>

+	</target>

+	<target name="test" depends="build">

+		<nant basedir="Test" target="test"/>

+	</target>

+	<target name="clean">

+		<delete file="../lib/System.Data.dll" failonerror="false"/>

+		<delete file="Test/System.Data.dll" failonerror="false"/>

+		<delete file="../lib/Mono.Data.MySql.dll" failonerror="false"/>

+		<delete file="Test/Mono.Data.MySql.dll" failonerror="false"/>

+

+	</target>

+</project>

diff --git a/mcs/class/Mono.Data.MySql/Mono.Data.MySql/Field.cs b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/Field.cs
new file mode 100644
index 00000000000..518dbfa292d
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/Field.cs
@@ -0,0 +1,66 @@
+// 
+// Field.cs
+//
+// Provide definition for the Field class
+// Part of the C# bindings to MySQL library libMySQL.dll
+//
+// Author:
+//    Brad Merrill <zbrad@cybercom.net>
+//
+// (C)Copyright 2002 Brad Merril
+//
+// http://www.cybercom.net/~zbrad/DotNet/MySql/
+//
+// Mono has gotten permission from Brad Merrill to include in 
+// the Mono Class Library
+// his C# bindings to MySQL under the X11 License
+//
+// Mono can be found at http://www.go-mono.com/
+// The X11/MIT License can be found 
+// at http://www.opensource.org/licenses/mit-license.html
+//
+
+
+namespace Mono.Data.MySql {
+	using System.Runtime.InteropServices;
+
+	///<remarks>
+	///<para>
+	/// MySql P/Invoke implementation test program
+	/// Brad Merrill
+	/// 3-Mar-2002
+	///</para>
+	///<para>
+	/// This structure contains information about a field, such as the
+	/// field's name, type, and size. Its members are described in more
+	/// detail below.  You may obtain the <see cref="Field"/> structures for
+	/// each field by calling
+	/// <see cref="MySql.FetchField"/>
+	/// repeatedly.
+	/// Field values are not part of this structure;
+	/// they are contained in a Row structure.
+	///</para>
+	///</remarks>
+	[StructLayout(LayoutKind.Sequential)]
+	public class Field {
+		///<value>name of column</value>
+		[MarshalAs(UnmanagedType.LPStr)]
+		public string Name;
+		///<value>table of column</value>
+		[MarshalAs(UnmanagedType.LPStr)]
+		public string Table;
+		///<value>default value</value>
+		[MarshalAs(UnmanagedType.LPStr)]
+		public string Def;
+		///<value>type of field</value>
+		public int FieldTypes;
+		///<value>width of column</value>
+		public uint Length;
+		///<value>max width of selected set</value>
+		public uint MaxLength;
+		///<value>div flags</value>
+		public uint Flags;
+		///<value>number of decimals in field</value>
+		public uint Decimals;	
+	}
+}
diff --git a/mcs/class/Mono.Data.MySql/Mono.Data.MySql/MySql.cs b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/MySql.cs
new file mode 100644
index 00000000000..c49be115526
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/MySql.cs
@@ -0,0 +1,270 @@
+// 
+// MySql.cs
+//
+// Provides the core of C# bindings 
+// to the MySQL library libMySQL.dll
+//
+// Author:
+//    Brad Merrill <zbrad@cybercom.net>
+//    Daniel Morgan <danmorg@sc.rr.com>
+//
+// (C)Copyright 2002 Brad Merril
+// (C)Copyright 2002 Daniel Morgan
+//
+// http://www.cybercom.net/~zbrad/DotNet/MySql/
+//
+// Mono has gotten permission from Brad Merrill to include in 
+// the Mono Class Library
+// his C# bindings to MySQL under the X11 License
+//
+// Mono can be found at http://www.go-mono.com/
+// The X11/MIT License can be found 
+// at http://www.opensource.org/licenses/mit-license.html
+//
+
+// Things to do:
+// =============
+// FIXME: mysql_thread_init() and mysql_thread_end()
+//        for some reason can not be loaded from the libMySQL.dll
+//        using Mono.  Until this is fixed, there will be a
+//        resource leak.
+//
+// TODO: method IntPtr PtrToStructure(IntPtr, Type) needs to
+//       be implemented in assembly corlib.dll 
+//       in class System.Runtime.InteropServices.Marshal
+//       which requires also an internal call in the runtime
+//       for it too.
+//       This is so we can retrieve Field data from MySQL.
+//
+// TODO: more functions in the MySQL C Client API
+//       (libmysqlclient.so on linux and libmySQL.dll on cygwin)
+//       need to be added here as C# pinvoke methods.
+//       Other data structures may need to be added as well.
+//
+// TODO: handle the name of the MySQL client library for
+//       different platforms because it is named differently
+//       on each platform.
+//       We maybe using a config file for this.
+//
+
+namespace Mono.Data.MySql {
+	using System;
+	using System.Security;
+	using System.Runtime.InteropServices;
+
+	///<remarks>
+	///<para>
+	/// MySql P/Invoke implementation
+	/// Brad Merrill
+	/// 3-Mar-2002
+	///</para>
+	///<para>
+	/// This is an incomplete implementation of the mysql C api,
+	/// but sufficient to run the Test sample application.
+	///</para>
+	///</remarks>
+	internal sealed class MySql {
+		///<value>protocol version</value>
+		public static readonly uint ProtocolVersion = 10;
+		///<value>server version</value>
+		public static readonly string ServerVersion = "3.23.49";
+		///<value>server suffix</value>
+		public static readonly string ServerSuffix = "";
+		///<value>server version as int</value>
+		public static readonly uint VersionId = 32349;
+		///<value>server port number</value>
+		public static readonly uint Port = 3306;
+		///<value>unix named socket</value>
+		public static readonly string UnixAddr = "/tmp/mysql.sock";
+		///<value>character set</value>
+		public static readonly string CharSet = "latin1";
+
+		///<summary>Gets or initializes a `MySql' structure</summary>
+		///<returns>An initialized `MYSQL*' handle.  IntPtr.Zero if there was insufficient memory to allocate a new object.</returns>
+		[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL", EntryPoint="mysql_init", ExactSpelling=true)]
+		public static extern IntPtr Init(IntPtr db);
+
+		///<summary>Connects to a MySql server</summary>
+		///<returns><paramref name="db"/> value on success, else returns IntPtr.Zero</returns>
+		[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 CharSet=System.Runtime.InteropServices.CharSet.Ansi,
+			 EntryPoint="mysql_connect", ExactSpelling=true)]
+		public static extern IntPtr Connect(IntPtr db,
+			[In] string host, [In] string user, [In] string passwd,
+			[In] string dbname,
+			uint port, [In] string socketName, uint flags
+			);
+
+		///<summary>Selects a database</summary>
+		///<returns>Zero for success.  Non-zero if an error occurred.</returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 CharSet=System.Runtime.InteropServices.CharSet.Ansi,
+			 EntryPoint="mysql_select_db", ExactSpelling=true)]
+		public static extern int SelectDb(IntPtr conn, [In] string db);
+
+		///<summary>Closes a server connection</summary>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL", EntryPoint="mysql_close", ExactSpelling=true)]
+		public static extern void Close(IntPtr db);
+
+		///<summary>Executes a SQL query specified as a string</summary>
+		///<returns>number of rows changed, -1 if zero</returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 CharSet=System.Runtime.InteropServices.CharSet.Ansi,
+			 EntryPoint="mysql_query", ExactSpelling=true)]
+		public static extern int Query(IntPtr conn, [In] string query);
+
+		///<summary>Retrieves a complete result set to the client</summary>
+		///<returns>An IntPtr result structure with the results. IntPtr.Zero if an error occurred.</returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 EntryPoint="mysql_store_result", ExactSpelling=true)]
+		public static extern IntPtr StoreResult(IntPtr conn);
+
+		///<returns>Returns the number of rows in a result set</returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 EntryPoint="mysql_num_rows", ExactSpelling=true)]
+		public static extern int NumRows(IntPtr r);
+
+		///<returns>Returns the number of columns in a result set</returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 EntryPoint="mysql_num_fields", ExactSpelling=true)]
+		public static extern int NumFields(IntPtr r);
+
+		///<returns>Returns an IntPtr to all field structures</returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 EntryPoint="mysql_fetch_field", ExactSpelling=true)]
+		public static extern IntPtr FetchField(IntPtr r);
+
+		///<summary>Retrieves the next row of a result set</summary>
+		///<returns>An IntPtr structure for the next row. IntPtr.Zero if there are no more rows to retrieve or if an error occurred.</returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 EntryPoint="mysql_fetch_row", ExactSpelling=true)]
+		public static extern IntPtr FetchRow(IntPtr r);
+
+		///<summary>Frees the memory allocated for a result set by <see cref="StoreResult"/></summary>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 EntryPoint="mysql_free_result", ExactSpelling=true)]
+		public static extern void FreeResult(IntPtr r);
+
+		///<returns>Returns a string that represents the client library version</returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 CharSet=System.Runtime.InteropServices.CharSet.Ansi,
+			 EntryPoint="mysql_get_client_info", ExactSpelling=true)]
+		public static extern string GetClientInfo();
+
+		///<returns></returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 CharSet=System.Runtime.InteropServices.CharSet.Ansi,
+			 EntryPoint="mysql_get_host_info", ExactSpelling=true)]
+		public static extern string GetHostInfo(IntPtr db);
+
+		///<returns>A string describing the type of connection in use, including the server host name.</returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 CharSet=System.Runtime.InteropServices.CharSet.Ansi,
+			 EntryPoint="mysql_get_server_info", ExactSpelling=true)]
+		public static extern string GetServerInfo(IntPtr db);
+
+		///<returns>A string describing the server status. null if an error occurred.</returns>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 CharSet=System.Runtime.InteropServices.CharSet.Ansi,
+			 EntryPoint="mysql_stat", ExactSpelling=true)]
+		public static extern string Stat(IntPtr db);
+
+		///<summary>
+		/// Returns a result set describing the current server
+		/// threads.  This is the same kind of information as that
+		/// reported by `mysqladmin processlist' or a `SHOW PROCESSLIST'
+		/// query.  You must free the result set with
+		/// <see cref="FreeResult"/>.
+		///</summary> 
+		///<returns>
+		/// A IntPtr result set for success.  IntPtr.Zero if an error
+		/// occurred.
+		///</returns> 
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 EntryPoint="mysql_list_processes", ExactSpelling=true)]
+		public static extern IntPtr ListProcesses(IntPtr db);
+
+		///<summary>
+		///<para>
+		/// Returns a result set consisting of table names in
+		/// the current database that match the simple regular expression
+		/// specified by the <paramref name="wild"/> parameter.
+		/// <paramref name="wild"/>may contain the wild-card characters
+		/// "%" or "_", or may be a null pointer to match all tables.
+		///</para>
+		///<para>
+		/// Calling <see cref="ListTables"/> is similar to executing
+		/// the query "SHOW tables [LIKE wild]".
+		///</para>
+		///<para>
+		/// You must free the result set with <see cref="FreeResult"/>.
+		///</para>
+		///</summary>
+		//[SuppressUnmanagedCodeSecurity]
+		[DllImport("libmySQL",
+			 EntryPoint="mysql_list_tables", ExactSpelling=true)]
+		public static extern IntPtr ListTables(IntPtr db, [In] string wild);
+
+		///<summary>
+		/// For the connection specified by <paramref name="db"/>,
+		/// <see cref="Error"/> returns the
+		/// error message for the most recently invoked API function
+		/// that can succeed or fail.  An empty string ("") is
+		/// returned if no error occurred.
+		///</summary>
+		///<returns>
+		/// A string that describes the error.  An empty string if no error occurred.
+		///</returns>
+		[DllImport("libmySQL",
+			 CharSet=System.Runtime.InteropServices.CharSet.Ansi,
+			 EntryPoint="mysql_error", ExactSpelling=true)]
+		public static extern string Error(IntPtr db);
+
+		///<summary>
+		///<para>
+		/// This function needs to be called before exiting
+		/// to free memory allocated explicitly by
+		/// <see cref="ThreadInit"/> or implicitly by
+		/// <see cref="Init"/>.
+		///</para>
+		///<para>
+		/// Note that this function is NOT invoked automatically by the client
+		/// library!
+		///</para>
+		///</summary>
+		[DllImport("libmySQL",
+			 CharSet=System.Runtime.InteropServices.CharSet.Ansi,
+			 EntryPoint="mysql_thread_end", ExactSpelling=true)]
+		public static extern void ThreadEnd();
+
+		///<summary>
+		///<para>
+		/// This function needs to be called for each created thread
+		/// to initialize thread specific variables.
+		///</para>
+		///<para>
+		/// This is automatically called by <see cref="Init"/>.
+		///</para>
+		///</summary>
+		[DllImport("libmySQL",
+			 CharSet=System.Runtime.InteropServices.CharSet.Ansi,
+			 EntryPoint="mysql_thread_init", ExactSpelling=true)]
+		public static extern void ThreadInit();
+	}
+}
diff --git a/mcs/class/Mono.Data.MySql/Mono.Data.MySql/MySqlCommand.cs b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/MySqlCommand.cs
new file mode 100644
index 00000000000..e7f8a16f63a
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/MySqlCommand.cs
@@ -0,0 +1,335 @@
+//
+// Mono.Data.MySql.MySqlCommand.cs
+//
+// Author:
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Daniel Morgan, 2002
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Xml;
+
+namespace Mono.Data.MySql {
+	// public sealed class MySqlCommand : Component, IDbCommand, ICloneable
+	public sealed class MySqlCommand : IDbCommand {
+
+		#region Fields
+
+		private string sql = "";
+		private int timeout = 30; 
+		// default is 30 seconds 
+		// for command execution
+
+		private MySqlConnection conn = null;
+		//private MySqlTransaction trans = null;
+		private CommandType cmdType = CommandType.Text;
+		private bool designTime = false;
+		//private MySqlParameterCollection parmCollection = new 
+		//	MySqlParameterCollection();
+
+		// MySqlDataReader state data for ExecuteReader()
+		//private MySqlDataReader dataReader = null;
+		private string[] queries = null;
+		private int currentQuery = -1;
+		private CommandBehavior cmdBehavior = CommandBehavior.Default;
+
+		//private ParmUtil parmUtil = null;
+		
+		#endregion // Fields
+
+		#region Constructors
+
+		public MySqlCommand() {
+			sql = "";
+		}
+
+		public MySqlCommand (string cmdText) {
+			sql = cmdText;
+		}
+
+		public MySqlCommand (string cmdText, MySqlConnection connection) {
+			sql = cmdText;
+			conn = connection;
+		}
+
+		/*
+		public MySqlCommand (string cmdText, MySqlConnection connection, 
+			MySqlTransaction transaction) {
+			sql = cmdText;
+			conn = connection;
+			trans = transaction;
+		}
+		*/
+
+		#endregion // Constructors
+
+		#region Methods
+
+		[MonoTODO]
+		public void Cancel () {
+			// FIXME: use non-blocking Exec for this
+			throw new NotImplementedException ();
+		}
+
+		// FIXME: is this the correct way to return a stronger type?
+		[MonoTODO]
+		IDbDataParameter IDbCommand.CreateParameter () {
+			//return CreateParameter ();
+			return null;
+		}
+
+		/*
+		[MonoTODO]
+		public SqlParameter CreateParameter () {
+			return new SqlParameter ();
+		}
+		*/
+
+		[MonoTODO]
+		public int ExecuteNonQuery () {	
+			int rowsAffected = -1;
+			//TODO: need to do this correctly
+			//      this is just something quick
+			//      thrown together to see if we can
+			//      execute a SQL Command
+			Console.WriteLine("Insert SQL:  " + sql);
+			Console.Out.Flush();
+			int rcq = MySql.Query(conn.NativeMySqlInitStruct, sql);
+			if (rcq != 0) {
+				// TODO: throw an exception here?
+				Console.WriteLine("Error: Couldn't execute ["+sql+"] on server.");
+				Console.Out.Flush();
+				Console.WriteLine("MySql Error: " + MySql.Error(conn.NativeMySqlInitStruct));
+				Console.Out.Flush();
+				return 0;
+			}
+			// TODO: need to return the number of rows affected for an INSERT, UPDATE, or DELETE
+			//       otherwise, it is -1
+			return rowsAffected;
+		}
+		
+		[MonoTODO]
+		IDataReader IDbCommand.ExecuteReader () {
+			//return ExecuteReader ();
+			// FIXME: just a quick hack
+			ExecuteNonQuery();
+			return null;
+
+		}
+
+		/*
+		[MonoTODO]
+		public MySqlDataReader ExecuteReader () {
+			return ExecuteReader(CommandBehavior.Default);
+		}
+		*/
+
+		[MonoTODO]
+		IDataReader IDbCommand.ExecuteReader (
+			CommandBehavior behavior) {
+			//return ExecuteReader (behavior);
+			return null;
+		}
+
+		/*
+		[MonoTODO]
+		public MySqlDataReader ExecuteReader (CommandBehavior behavior) {	
+			
+		}
+		*/
+
+		[MonoTODO]
+		public object ExecuteScalar () {
+			// FIXME: just a quick hack
+			ExecuteNonQuery();
+			return null;
+		}
+
+		[MonoTODO]
+		public XmlReader ExecuteXmlReader () {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Prepare () {
+			// FIXME: parameters have to be implemented for this
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public MySqlCommand Clone () {
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+
+		#region Properties
+
+		public string CommandText {
+			get { 
+				return sql; 
+			}
+
+			set { 
+				sql = value; 
+			}
+		}
+
+		public int CommandTimeout {
+			get { 
+				return timeout;  
+			}
+			
+			set {
+				// FIXME: if value < 0, throw
+				// ArgumentException
+				// if (value < 0)
+				//	throw ArgumentException;
+				timeout = value;
+			}
+		}
+
+		public CommandType CommandType	{
+			get {
+				return cmdType;
+			}
+
+			set { 
+				cmdType = value;
+			}
+		}
+
+		// FIXME: for property Connection, is this the correct
+		//        way to handle a return of a stronger type?
+		IDbConnection IDbCommand.Connection {
+			get { 
+				return Connection;
+			}
+
+			set { 
+				// FIXME: throw an InvalidOperationException
+				// if the change was during a 
+				// transaction in progress
+
+				// csc
+				Connection = (MySqlConnection) value; 
+				// mcs
+				// Connection = value; 
+				
+				// FIXME: set Transaction property to null
+			}
+		}
+		
+		public MySqlConnection Connection {
+			get { 
+				// conn defaults to null
+				return conn;
+			}
+
+			set { 
+				// FIXME: throw an InvalidOperationException
+				// if the change was during 
+				// a transaction in progress
+				conn = value; 
+				// FIXME: set Transaction property to null
+			}
+		}
+
+		public bool DesignTimeVisible {
+			get {
+				return designTime;
+			} 
+			
+			set{
+				designTime = value;
+			}
+		}
+
+		// FIXME; for property Parameters, is this the correct
+		//        way to handle a stronger return type?
+		IDataParameterCollection IDbCommand.Parameters	{
+			get { 
+				//return Parameters;
+				return null;
+			}
+		}
+
+		//public SqlParameterCollection Parameters {
+		//	get { 
+		//		return parmCollection;
+		//	}
+		//}
+
+		// FIXME: for property Transaction, is this the correct
+		//        way to handle a return of a stronger type?
+		IDbTransaction IDbCommand.Transaction 	{
+			get { 
+				//return Transaction;
+				return null;
+			}
+
+			set { 
+				// FIXME: error handling - do not allow
+				// setting of transaction if transaction
+				// has already begun
+
+				//Transaction = (MySqlTransaction) value;
+				throw new NotImplementedException();
+			}
+		}
+
+		/*
+		public MySqlTransaction Transaction {
+			get { 
+				return trans; 
+			}
+
+			set { 
+				// FIXME: error handling
+				trans = value; 
+			}
+		}
+		*/	
+
+		[MonoTODO]
+		public UpdateRowSource UpdatedRowSource	{
+			// FIXME: do this once DbDataAdaptor 
+			// and DataRow are done
+			get { 		
+				throw new NotImplementedException (); 
+			}
+			set { 
+				throw new NotImplementedException (); 
+			}
+		}
+
+		#endregion // Properties
+
+		#region Inner Classes
+
+		#endregion // Inner Classes
+
+		#region Destructors
+
+		[MonoTODO]
+		public void Dispose() {
+			// FIXME: need proper way to release resources
+			// Dispose(true);
+		}
+
+		[MonoTODO]
+		~MySqlCommand() {
+			// FIXME: need proper way to release resources
+			// Dispose(false);
+		}
+
+		#endregion //Destructors
+	}
+}
diff --git a/mcs/class/Mono.Data.MySql/Mono.Data.MySql/MySqlConnection.cs b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/MySqlConnection.cs
new file mode 100644
index 00000000000..1d6d2276803
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/MySqlConnection.cs
@@ -0,0 +1,534 @@
+//
+// Mono.Data.MySql.MyConnection.cs
+//
+// Author:
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Daniel Morgan 2002
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace Mono.Data.MySql {
+
+	public sealed class MySqlConnection : Component, IDbConnection,
+		ICloneable	 {
+
+		#region Fields
+
+		private IntPtr mysqlInitStruct = IntPtr.Zero;
+		private IntPtr mysqlConn = IntPtr.Zero;    
+		
+		private string connectionString = "";    
+		private string mysqlConnectionString = ""; 
+		
+		//private MySqlTransaction trans = null;
+		private int connectionTimeout = 15;     
+		// default for 15 seconds
+
+		// MySQL connection string parameters
+		string host = "";
+		string user = "";
+		string passwd = "";
+                string dbname = "";
+		uint port = MySql.Port;
+		string socketName = "";
+		uint flags = 0;
+
+		// connection state
+		private ConnectionState conState = ConnectionState.Closed;
+		
+		// DataReader state
+		//private MySqlDataReader rdr = null;
+		private bool dataReaderOpen = false;
+		// FIXME: if true, throw an exception if SqlConnection 
+		//        is used for anything other than reading
+		//        data using SqlDataReader
+		
+		private string versionString = "Unknown";
+		private bool disposed = false;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		// A lot of the defaults were initialized in the Fields
+		[MonoTODO]
+		public MySqlConnection () {
+
+		}
+	
+		[MonoTODO]
+		public MySqlConnection (String connectionString) {
+			SetConnectionString (connectionString);
+		}
+
+		#endregion // Constructors
+
+		#region Destructors
+	
+		// aka Finalize
+		// [ClassInterface(ClassInterfaceType.AutoDual)]
+		[MonoTODO]
+		~MySqlConnection() {
+			// FIXME: this class need 
+			//        a destructor to release resources
+			//        Also, take a look at Dispose
+			Dispose (false);
+		}
+		
+		#endregion // Destructors
+
+		#region Public Methods
+
+		IDbTransaction IDbConnection.BeginTransaction () {
+			// return BeginTransaction ();
+			return null;
+		}
+
+		//public MySqlTransaction BeginTransaction () {
+		//	return TransactionBegin (); // call private method
+		//}
+
+		IDbTransaction IDbConnection.BeginTransaction (IsolationLevel 
+			il) {
+			//return BeginTransaction (il);
+			return null;
+		}
+
+		//public MySqlTransaction BeginTransaction (IsolationLevel il) {
+		//	return TransactionBegin (il); // call private method
+		//}
+
+		//[MonoTODO]
+		//public MySqlTransaction BeginTransaction(string transactionName) {
+		//	return TransactionBegin (); // call private method
+		//}
+
+		//[MonoTODO]
+		//public MySqlTransaction BeginTransaction(IsolationLevel iso,

+		//	string transactionName) {
+		//	return TransactionBegin (iso); // call private method
+		//}
+
+		[MonoTODO]
+		public void ChangeDatabase (string databaseName) {
+			throw new NotImplementedException ();
+		}
+		
+		object ICloneable.Clone() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Close () {
+			if(dataReaderOpen == true) {
+				// TODO: what do I do if
+				// the user Closes the connection
+				// without closing the Reader first?
+
+			}			
+			CloseDataSource ();
+		}
+
+		IDbCommand IDbConnection.CreateCommand () {
+			return CreateCommand ();
+		}
+
+		public MySqlCommand CreateCommand () {
+			MySqlCommand sqlcmd = new MySqlCommand ("", this);
+
+			return sqlcmd;
+		}
+
+		[MonoTODO]
+		public void Open () {
+			if(dbname.Equals(""))
+				throw new InvalidOperationException(
+					"dbname missing");
+			else if(conState == ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnnectionState is already Open");		
+
+			// FIXME: check to make sure we have 
+			//        everything to connect,
+			//        otherwise, throw an exception
+
+			mysqlInitStruct = MySql.Init(IntPtr.Zero);
+			if (mysqlInitStruct == IntPtr.Zero) {
+				// TODO: throw exception instead
+				Console.WriteLine("MySQL Init failed.");
+				return;
+			}
+
+			
+			// *** this is what it should be ***
+			//mysqlConn = MySql.Connect(mysqlInitStruct, 
+			//	host.Equals("") ? null : host, 
+			//	user.Equals("") ? null : user, 
+			//	passwd.Equals("") ? null : passwd, 
+			//	dbname.Equals("") ? null : dbname, 
+			//	port,
+			//	socketName.Equals("") ? null : socketName,
+			//	flags);
+			//	
+			mysqlConn = MySql.Connect(mysqlInitStruct, 
+				host, 
+				user, 
+				passwd, 
+				dbname, 
+				port,
+				socketName,
+				flags);
+			if (mysqlConn == IntPtr.Zero) {
+				// TODO: throw exception instead
+				Console.WriteLine("MySQL Connect failed, "+MySql.Error(mysqlInitStruct));
+				return;
+			}
+
+			Console.WriteLine("MySql Selecting Database: " + dbname + "...");
+			Console.Out.Flush();
+			int sdb = MySql.SelectDb(mysqlInitStruct, dbname);
+			if (sdb != 0) {
+				Console.WriteLine("Error: Can not select the "+dbname+" database.");
+				Console.Out.Flush();
+				Console.WriteLine("MySql Error: " + MySql.Error(mysqlInitStruct));
+				Console.Out.Flush();
+				return;
+			}
+		
+			// Successfully Connected
+			SetupConnection();
+		}
+
+		#endregion // Public Methods
+
+		#region Protected Methods
+		
+		[MonoTODO]
+		
+		protected override void Dispose(bool disposing) {
+			if(!this.disposed)
+				try {
+					if(disposing) {
+						// release any managed resources
+					}
+					// release any unmanaged resources
+					// close any handles
+										
+					this.disposed = true;
+				}
+				finally {
+					base.Dispose(disposing);
+				}
+		}
+
+		#endregion
+
+		#region Internal Methods
+
+		// Used to prevent MySqlConnection
+		// from doing anything while
+		// MySqlDataReader is open.
+		// Open the Reader. (called from MySqlCommand)
+		/*
+		internal void OpenReader(MySqlDataReader reader) {	
+			if(dataReaderOpen == true) {
+				// TODO: throw exception here?
+				//       because a reader
+				//       is already open
+			}
+			else {
+				rdr = reader;
+				dataReaderOpen = true;
+			}
+		}
+		*/
+
+		// Used to prevent MySqlConnection
+		// from doing anything while
+		// MySqlDataReader is open
+		// Close the Reader (called from MySqlCommand)
+		// if closeConnection true, Close() the connection
+		// this is based on CommandBehavior.CloseConnection
+		internal void CloseReader(bool closeConnection) {
+			if(closeConnection == true)
+				CloseDataSource();
+			else
+				dataReaderOpen = false;
+		}
+
+		#endregion // Internal Methods
+
+		#region Private Methods
+
+		private void SetupConnection() {
+			conState = ConnectionState.Open;
+
+			versionString = GetDatabaseServerVersion();
+
+			// May need to set DateTime format to ISO
+			// "YYYY-MM-DD hh:mi:ss.ms"
+		}
+
+		private string GetDatabaseServerVersion() {
+			//MySqlCommand cmd = new MySqlCommand("select version()",this);
+			//return (string) cmd.ExecuteScalar();
+			return "";
+		}
+
+		private void CloseDataSource () {
+			// FIXME: just a quick hack
+			if(conState == ConnectionState.Open) {
+				/*
+				if(trans != null)
+					if(trans.DoingTransaction == true) {
+						trans.Rollback();
+						// trans.Dispose();
+						trans = null;
+					}
+				*/
+				conState = ConnectionState.Closed;
+				MySql.Close(mysqlInitStruct);
+				// MySql.ThreadEnd();
+				mysqlConn = IntPtr.Zero;
+			}
+		}
+
+		private void SetConnectionString (string connectionString) {
+
+			this.connectionString = connectionString;
+			mysqlConnectionString = ConvertStringToMySql (
+				connectionString);
+		}
+
+		private String ConvertStringToMySql (String 
+			oleDbConnectionString) {
+			StringBuilder mysqlConnection = 
+				new StringBuilder();
+			string result;
+			string[] connectionParameters;
+
+			char[] semicolon = new Char[1];
+			semicolon[0] = ';';
+			
+			// FIXME: what is the max number of value pairs 
+			//        can there be for the OLE DB 
+			//	  connnection string? what about libgda max?
+			//        what about postgres max?
+
+			// FIXME: currently assuming value pairs are like:
+			//        "key1=value1;key2=value2;key3=value3"
+			//        Need to deal with values that have
+			//        single or double quotes.  And error 
+			//        handling of that too.
+			//        "key1=value1;key2='value2';key=\"value3\""
+
+			// FIXME: put the connection parameters 
+			//        from the connection
+			//        string into a 
+			//        Hashtable (System.Collections)
+			//        instead of using private variables 
+			//        to store them
+			connectionParameters = oleDbConnectionString.
+				Split (semicolon);
+			foreach (string sParameter in connectionParameters) {
+				if(sParameter.Length > 0) {
+					BreakConnectionParameter (sParameter);
+					mysqlConnection.
+						Append (sParameter + 
+						" ");
+				}
+			}
+			result = mysqlConnection.ToString ();
+			return result;
+		}
+
+		private bool BreakConnectionParameter (String sParameter) {	
+			bool addParm = true;
+			int index;
+
+			index = sParameter.IndexOf ("=");
+			if (index > 0) {	
+				string parmKey, parmValue;
+
+				// separate string "key=value" to 
+				// string "key" and "value"
+				parmKey = sParameter.Substring (0, index);
+				parmValue = sParameter.Substring (index + 1,
+					sParameter.Length - index - 1);
+
+				/*
+				 * string host
+				 * string user
+				 * string passwd
+				 * string dbname
+				 * unit port
+				 * string socketName
+				 * unit flags (can be multiple)
+				 */ 
+				switch(parmKey.ToLower()) {
+				case "port":
+					port = UInt32.Parse(parmValue);
+					break;
+
+				case "host":
+					// set DataSource property
+					host = parmValue;
+					break;
+
+				case "dbname":
+					// set Database property
+					dbname = parmValue;
+					break;
+
+				case "user":
+					user = parmValue;
+					break;
+
+				case "passwd":
+					passwd = parmValue;
+					break;
+
+				case "socketName":
+					socketName = parmValue;
+					break;
+
+				default:
+					// throw an exception?
+					break;
+				}
+			}
+			return addParm;
+		}
+
+		/*
+		private MySqlTransaction TransactionBegin () {
+			// FIXME: need to keep track of 
+			// transaction in-progress
+			trans = new SqlTransaction ();
+			// using internal methods of SqlTransaction
+			trans.SetConnection (this);
+			trans.Begin();
+
+			return trans;
+		}
+
+		private MySqlTransaction TransactionBegin (IsolationLevel il) {
+			// FIXME: need to keep track of 
+			// transaction in-progress
+			TransactionBegin();
+			trans.SetIsolationLevel (il);
+			
+			return trans;
+		}
+		*/
+
+		#endregion
+
+		#region Public Properties
+
+		[MonoTODO]
+		public ConnectionState State 		{
+			get { 
+				return conState;
+			}
+		}
+
+		public string ConnectionString	{
+			get { 
+				return connectionString;
+			}
+			set { 
+				SetConnectionString (value);
+			}
+		}
+		
+		public int ConnectionTimeout {
+			get { 
+				return connectionTimeout; 
+			}
+		}
+
+		public string Database	{
+			get { 
+				return dbname; 
+			}
+		}
+
+		public string DataSource {
+			get {
+				return host;
+			}
+		}
+
+		public int PacketSize {
+			get { 
+				throw new NotImplementedException ();
+			}
+		}
+
+		public string ServerVersion {
+			get { 
+				return versionString;
+			}
+		}
+
+		#endregion // Public Properties
+
+		#region Internal Properties
+/*
+		// For Mono.Data.MySql classes
+		// to get the current transaction
+		// in progress - if any
+		internal MySqlTransaction Transaction {
+			get {
+				return trans;
+			}
+		}
+*/
+		// For Mono.Data.MySql classes 
+		// to get the unmanaged MySql connection
+		internal IntPtr NativeMySqlConnection {
+			get {
+				return mysqlConn;
+			}
+		}
+
+		// For Mono.Data.MySql classes 
+		// to get the unmanaged MySql connection
+		internal IntPtr NativeMySqlInitStruct {
+			get {
+				return mysqlInitStruct;
+			}
+		}
+
+		// Used to prevent SqlConnection
+		// from doing anything while
+		// SqlDataReader is open
+		internal bool IsReaderOpen {
+			get {
+				return dataReaderOpen;
+			}
+		}
+
+		#endregion // Internal Properties
+
+		#region Events
+/*                
+		public event 
+			MyInfoMessageEventHandler InfoMessage;
+
+		public event 
+			StateChangeEventHandler StateChange;
+*/		
+		#endregion
+
+	}
+}
diff --git a/mcs/class/Mono.Data.MySql/Mono.Data.MySql/TODOAttribute.cs b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/TODOAttribute.cs
new file mode 100644
index 00000000000..22481a86a83
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/TODOAttribute.cs
@@ -0,0 +1,33 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+using System;
+
+namespace Mono.Data.MySql {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All)]
+	internal class MonoTODOAttribute : Attribute {
+
+		string comment;
+
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+	}
+}
diff --git a/mcs/class/Mono.Data.MySql/Mono.Data.MySql/Test.cs b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/Test.cs
new file mode 100644
index 00000000000..ee7c944af99
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/Test.cs
@@ -0,0 +1,259 @@
+// 
+// Test.cs
+//
+// Used to Test the C# bindings to MySQL.  This test
+// is based on the test that comes with MySQL.
+// Part of the C# bindings to MySQL library libMySQL.dll
+//
+// Author:
+//    Brad Merrill <zbrad@cybercom.net>
+//
+// (C)Copyright 2002 Brad Merril
+//
+// http://www.cybercom.net/~zbrad/DotNet/MySql/
+//
+// Mono has gotten permission from Brad Merrill to include in 
+// the Mono Class Library
+// his C# bindings to MySQL under the X11 License
+//
+// Mono can be found at http://www.go-mono.com/
+// The X11/MIT License can be found 
+// at http://www.opensource.org/licenses/mit-license.html
+//
+
+// #define MYSQL_CANDO_QUERY if the runtime can do a query
+// define MYSQL_CANDO_THREADS if the runtime can use mysql_thread_* functions
+#define MYSQL_CANDO_QUERY
+#define MYSQL_CANDO_THREADS
+
+using System;
+using System.Runtime.InteropServices;
+using Mono.Data.MySql;
+
+///<remarks>
+///<para>
+/// MySql P/Invoke implementation test program
+/// Brad Merrill
+/// 3-Mar-2002
+///</para>
+///<para>
+/// This is based on the myTest.c program in the
+/// libmysqltest example directory of the mysql distribution.
+///</para>
+///<para>
+/// I noticed during implementation that the C api libraries are
+/// thread sensitive, in that they store information in the
+/// currently executing thread local storage.  This is
+/// incompatible with the thread pool model in the CLR, in which
+/// you could be executing the same context on different
+/// threads.
+///</para>
+///<para>
+/// A better implementation would be to rewrite the libmysql
+/// layer in managed code, and do all the socket APIs, and mysql
+/// protocol using the .NET Framework APIs.  However, that's a
+/// bit more than a weekend of work.
+///</para>
+///</remarks>
+public class Test {
+	[STAThread]
+	public static int Main() {
+		Console.WriteLine("Test for MySQL C# Bindings started...");
+		Console.Out.Flush();
+        int rcq;
+
+		string myDb = "test";
+		string myStmt = "SELECT * FROM sometable";
+		string insertStmt = "INSERT INTO SOMETABLE (TID,TDESC,AINT) VALUES ('MySQL','Mono.Data',12)";
+
+		Console.WriteLine("MySql Init...");
+		Console.Out.Flush();
+		IntPtr db = MySql.Init(IntPtr.Zero);
+		if (db == IntPtr.Zero) {
+			Console.WriteLine("Error: Init failed.");
+			Console.Out.Flush();
+			return 1;
+		}
+
+		Console.WriteLine("MySql Connection...");
+		Console.Out.Flush();
+		IntPtr conn = MySql.Connect(db, "", "", "", "", MySql.Port,
+			"", (uint)0);
+		//IntPtr conn = MySql.mysql_connect(db, null, null, null, null, MySql.Port,
+		//	null, (uint)0);
+		if (conn == IntPtr.Zero) {
+			Console.WriteLine("Error: Connect failed.");
+			Console.Out.Flush();
+			Console.WriteLine("MySql Error: " + MySql.Error(db));
+			Console.Out.Flush();
+			return 1;
+		}
+
+		Console.WriteLine("MySql Selecting Database: " + myDb + "...");
+		Console.Out.Flush();
+		int sdb = MySql.SelectDb(db, myDb);
+		if (sdb != 0) {
+			Console.WriteLine("Error: Can not select the "+myDb+" database.");
+			Console.Out.Flush();
+			Console.WriteLine("MySql Error: " + MySql.Error(db));
+			Console.Out.Flush();
+			return 1;
+		}
+
+		Console.WriteLine("Insert SQL:  "+insertStmt);
+		Console.Out.Flush();
+		rcq = MySql.Query(db, insertStmt);
+		if (rcq != 0) {
+			Console.WriteLine("Couldn't execute ["+insertStmt+"] on server.");
+			Console.Out.Flush();
+			Console.WriteLine("MySql Error: " + MySql.Error(db));
+			Console.Out.Flush();
+			return 1;
+		}
+		
+#if MYSQL_CANDO_QUERY
+		Console.WriteLine("Query:  "+myStmt);
+		Console.Out.Flush();
+		rcq = MySql.Query(db, myStmt);
+		if (rcq != 0) {
+			Console.WriteLine("?Couldn't execute ["+myStmt+"] on server.");
+			Console.Out.Flush();
+			Console.WriteLine("MySql Error: " + MySql.Error(db));
+			Console.Out.Flush();
+			return 1;
+		}
+		
+		Console.WriteLine("Process Results...");
+		Console.Out.Flush();
+		procResults(db);
+
+		Console.WriteLine("==== Diagnostic info  ====");
+		Console.Out.Flush();
+		Console.WriteLine("Client info: "+MySql.GetClientInfo());
+		Console.WriteLine("Host info: "+MySql.GetHostInfo(db));
+		Console.WriteLine("Server info: "+MySql.GetServerInfo(db));
+		Console.Out.Flush();
+
+		Console.WriteLine("List Processes...");
+		Console.Out.Flush();
+		listProcesses(db);
+		Console.WriteLine("List Tables...");
+		Console.Out.Flush();
+		listTables(db);
+#endif // MYSQL_CANDO_QUERY
+
+		Console.WriteLine("MySql Stat...");
+		Console.Out.Flush();
+		Console.WriteLine(MySql.Stat(db));
+
+		Console.WriteLine("MySql Close...");
+		Console.Out.Flush();
+		MySql.Close(db);
+#if MYSQL_CANDO_THREADS
+		Console.WriteLine("MySql Thread End...");
+		Console.Out.Flush();
+		MySql.ThreadEnd();
+#endif // MYSQL_CANDO_THREADS
+		Console.WriteLine("Exiting...");
+		Console.Out.Flush();
+
+		return 0;
+	}
+
+#if MYSQL_CANDO_QUERY
+	static void procResults(IntPtr db) {
+		IntPtr res = MySql.StoreResult(db);
+		int numRows = MySql.NumRows(res);
+		Console.WriteLine("Number of records found: " + numRows);
+		int numFields = MySql.NumFields(res);
+		string[] fields = new string[numFields];
+		for (int i = 0; i < numFields; i++) {
+			Field fd = (Field) Marshal.PtrToStructure(MySql.FetchField(res), typeof(Field));
+			fields[i] = fd.Name;
+		}
+		IntPtr row;
+		int recCnt = 1;
+		while ((row = MySql.FetchRow(res)) != IntPtr.Zero) {
+			Console.WriteLine("Record #" + recCnt + ":");
+			for (int i = 0, j = 1; i < numFields; i++, j++) {
+				Console.WriteLine(" Going to WriteLine Fld...\n");
+				Console.Out.Flush();
+				Console.WriteLine(" theField[[[" + fields[i] + "]]]\n");
+				Console.Out.Flush();
+				Console.WriteLine(" after theField... \n");
+				Console.Out.Flush();
+				Console.WriteLine("  Fld #"+j+" ("+fields[i]+"): "+rowVal(row, i));
+				Console.Out.Flush();
+			}
+			Console.WriteLine("==============================");
+		}
+		MySql.FreeResult(res);
+	}
+
+	static string rowVal(IntPtr res, int index) {
+		Console.WriteLine("...Marshal.ReadIntPtr() BEFORE...\n");
+		Console.Out.Flush();
+		IntPtr str = Marshal.ReadIntPtr(res, index*IntPtr.Size);
+		Console.WriteLine("...Marshal.ReadIntPtr() AFTER...\n");
+		Console.Out.Flush();
+		if (str == IntPtr.Zero)
+			return "NULL";
+		Console.WriteLine("...Marshal.PtrToStringAnsi() BEFORE...");
+		Console.Out.Flush();
+		string s = Marshal.PtrToStringAnsi(str);
+		Console.WriteLine("...Marshal.PtrToStringAnsi() AFTER...");
+		Console.Out.Flush();
+		return s;
+	}
+
+	static void listProcesses(IntPtr db) {
+		IntPtr res = MySql.ListProcesses(db);
+		if (res == IntPtr.Zero) {
+			Console.WriteLine("Got error "+MySql.Error(db)+" when retreiving processlist");
+			return;
+		}
+		int numRows = MySql.NumRows(res);
+		//    Console.WriteLine("Number of records found: "+i);
+		int numFields = MySql.NumFields(res);
+		string[] fields = new string[numFields];
+		for (int i = 0; i < numFields; i++) {
+			Field fd = (Field) Marshal.PtrToStructure(MySql.FetchField(res), typeof(Field));
+			fields[i] = fd.Name;
+		}
+		IntPtr row;
+		int recCnt = 1;
+		while ((row = MySql.FetchRow(res)) != IntPtr.Zero) {
+			Console.WriteLine("Process #" + recCnt + ":");
+			for (int i = 0, j = 1; i < numFields; i++, j++) {
+				Console.WriteLine("  Fld #"+j+" ("+fields[i]+"): "+rowVal(row, i));
+			}
+			Console.WriteLine("==============================");
+		}
+		MySql.FreeResult(res);
+	}
+
+	static void listTables(IntPtr db) {
+		IntPtr res = MySql.ListTables(db, "%");
+		if (res == IntPtr.Zero)
+			return;
+		int numRows = MySql.NumRows(res);
+		//    Console.WriteLine("Number of records found: "+i);
+		int numFields = MySql.NumFields(res);
+		string[] fields = new string[numFields];
+		for (int i = 0; i < numFields; i++) {
+			Field fd = (Field) Marshal.PtrToStructure(MySql.FetchField(res), typeof(Field));
+			fields[i] = fd.Name;
+		}
+		IntPtr row;
+		int recCnt = 1;
+		while ((row = MySql.FetchRow(res)) != IntPtr.Zero) {
+			Console.WriteLine("Process #" + recCnt + ":");
+			for (int i = 0, j = 1; i < numFields; i++, j++) {
+				Console.WriteLine("  Fld #"+j+" ("+fields[i]+"): "+rowVal(row, i));
+			}
+			Console.WriteLine("==============================");
+		}
+		MySql.FreeResult(res);
+	}
+#endif // MYSQL_CANDO_QUERY
+}
diff --git a/mcs/class/Mono.Data.MySql/Mono.Data.MySql/makefile b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/makefile
new file mode 100644
index 00000000000..78547a30cd3
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/Mono.Data.MySql/makefile
@@ -0,0 +1,20 @@
+

+SRCLIST = MySql.cs Test.cs

+

+.SUFFIXES: .exe .dll .cs .lex .txt

+

+#DEBUG = /debug

+

+.cs.dll:

+	csc $(DEBUG) /t:dll $*.cs

+

+.cs.exe:

+	csc $(DEBUG) /t:exe $*.cs

+

+all : Test.exe MySql.dll

+

+Test.exe : Test.cs MySql.dll

+	csc $(DEBUG) /t:exe /r:MySql.dll Test.cs

+

+MySql.dll : MySql.cs Field.cs

+	csc $(DEBUG) /t:library /doc:MySql.xml MySql.cs Field.cs

diff --git a/mcs/class/Mono.Data.MySql/Test/TestMySqlInsert.cs b/mcs/class/Mono.Data.MySql/Test/TestMySqlInsert.cs
new file mode 100644
index 00000000000..30d6267bf4d
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/Test/TestMySqlInsert.cs
@@ -0,0 +1,103 @@
+//
+// TestSqlInsert.cs
+//
+// To Test MySqlConnection and MySqlCommand by connecting
+// to a MySQL database 
+// and then executing an INSERT SQL statement
+//
+// To use:
+//   change strings to your database, userid, tables, etc...:
+//        connectionString
+//        insertStatement
+//
+// To test:
+//   mcs TestMySqlInsert.cs -r Mono.Data.MySql.dll
+//   mint TestMySqlInsert.exe
+//
+// Author:
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C)Copyright 2002 Daniel Morgan
+//
+
+using System;
+using System.Data;
+using Mono.Data.MySql;
+
+namespace TestMonoDataMysql
+{
+	class TestMySqlInsert
+	{
+		[STAThread]
+		static void Main(string[] args)
+		{
+			MySqlConnection conn;
+			MySqlCommand cmd;
+			//MySqlTransaction trans;
+
+			int rowsAffected;
+
+			String connectionString;
+			String insertStatement;
+			String deleteStatement;
+	
+			connectionString = 
+				"dbname=test";
+
+			insertStatement = 
+				"insert into sometable " +
+				"(tid, tdesc) " +
+				"values ('beer', 'Beer for All!') ";
+
+			deleteStatement = 
+				"delete from sometable " +
+				"where tid = 'beer' ";
+
+			// Connect to a MySQL database
+			Console.WriteLine ("Connect to database...");
+			conn = new MySqlConnection(connectionString);
+			conn.Open();
+
+			// begin transaction
+			//Console.WriteLine ("Begin Transaction...");
+			//trans = conn.BeginTransaction();
+
+			// create SQL DELETE command
+			Console.WriteLine ("Create Command initializing " +
+				"with an DELETE statement...");
+			//cmd = new MySqlCommand (deleteStatement, conn);
+			cmd = new MySqlCommand (deleteStatement, conn);
+
+			// execute the DELETE SQL command
+			Console.WriteLine ("Execute DELETE SQL Command...");
+			rowsAffected = cmd.ExecuteNonQuery();
+			Console.WriteLine ("Rows Affected: " + rowsAffected);
+
+			// change the SQL command to an SQL INSERT Command
+			Console.WriteLine ("Now use INSERT SQL Command...");
+			cmd.CommandText = insertStatement;
+
+			// execute the INSERT SQL command
+			Console.WriteLine ("Execute INSERT SQL Command...");
+			rowsAffected = cmd.ExecuteNonQuery();
+			Console.WriteLine ("Rows Affected: " + rowsAffected);
+
+			// if successfull at INSERT, commit the transaction,
+			// otherwise, do a rollback the transaction using
+			// trans.Rollback();
+			// FIXME: need to have exceptions working in
+			//        Mono.Data.MySql classes before you can do rollback
+			//Console.WriteLine ("Commit transaction...");
+			//trans.Commit();
+
+			// Close connection to database
+			Console.WriteLine ("Close database connection...");
+			conn.Close();
+
+			Console.WriteLine ("Assuming everything " +
+				"was successful.");
+			Console.WriteLine ("Verify data in database to " +
+				"see if row is there.");
+		}
+	}
+}
diff --git a/mcs/class/Mono.Data.MySql/list b/mcs/class/Mono.Data.MySql/list
new file mode 100644
index 00000000000..1434f89e678
--- /dev/null
+++ b/mcs/class/Mono.Data.MySql/list
@@ -0,0 +1,5 @@
+Mono.Data.MySql/Field.cs
+Mono.Data.MySql/MySqlCommand.cs
+Mono.Data.MySql/MySqlConnection.cs
+Mono.Data.MySql/MySql.cs
+Mono.Data.MySql/TODOAttribute.cs
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/ParmUtil.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/ParmUtil.cs
new file mode 100644
index 00000000000..3dabac7853e
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/ParmUtil.cs
@@ -0,0 +1,176 @@
+//

+// ParmUtil.cs - utility to bind variables in a SQL statement to parameters in C# code

+//               This is in the PostgreSQL .NET Data provider in Mono

+//

+// Author: 

+//    Daniel Morgan <danmorg@sc.rr.com>

+//

+// (c)copyright 2002 Daniel Morgan

+//

+

+// comment DEBUG_ParmUtil for production, for debug messages, uncomment

+//#define DEBUG_ParmUtil

+

+using System;

+using System.Data;

+using System.Text;

+

+namespace System.Data.SqlClient {

+

+	enum PostgresBindVariableCharacter {

+		Semicolon,

+		At,

+		QuestionMark

+	}

+

+	public class ParmUtil {

+

+		private string sql = "";

+		private string resultSql = "";

+		private SqlParameterCollection parmsCollection = null;

+		

+		static private PostgresBindVariableCharacter PgbindChar = PostgresBindVariableCharacter.Semicolon;

+		static char bindChar;

+

+		// static constructor

+		static ParmUtil() {

+			switch(PgbindChar) {

+			case PostgresBindVariableCharacter.Semicolon:

+				bindChar = ':';

+				break;

+			case PostgresBindVariableCharacter.At:

+				bindChar = '@';

+				break;

+			case PostgresBindVariableCharacter.QuestionMark:

+				// this doesn't have named parameters,

+				// they must be in order

+				bindChar = '?';

+				break;

+			}

+		}

+				

+		public ParmUtil(string query, SqlParameterCollection parms) {

+			sql = query;

+			parmsCollection = parms;

+		}

+		

+		public string ResultSql {

+			get {

+				return resultSql;

+			}

+		}

+

+		// TODO: currently only works for input variables,

+		//       need to do input/output, output, and return

+		public string ReplaceWithParms() {

+

+			StringBuilder result = new StringBuilder();

+			char[] chars = sql.ToCharArray();

+			bool bStringConstFound = false;

+

+			for(int i = 0; i < chars.Length; i++) {

+				if(chars[i] == '\'') {

+					if(bStringConstFound == true)

+						bStringConstFound = false;

+					else

+						bStringConstFound = true;

+

+					result.Append(chars[i]);

+				}

+				else if(chars[i] == bindChar && 

+					bStringConstFound == false) {

+#if DEBUG_ParmUtil

+					Console.WriteLine("Bind Variable character found...");

+#endif					

+					StringBuilder parm = new StringBuilder();

+					i++;

+					while(i <= chars.Length) {

+						char ch;

+						if(i == chars.Length)

+							ch = ' '; // a space

+						else

+							ch = chars[i];

+

+#if DEBUG_ParmUtil						

+						Console.WriteLine("Is char Letter or digit?");

+#endif						

+						if(Char.IsLetterOrDigit(ch)) {

+#if DEBUG_ParmUtil

+							Console.WriteLine("Char IS letter or digit. " + 

+								"Now, append char to parm StringBuilder");

+#endif

+							parm.Append(ch);

+						}

+						else {

+#if DEBUG_ParmUtil

+                                                        Console.WriteLine("Char is NOT letter or char. " + 

+								"thus we got rest of bind variable name. ");

+								

+							// replace bind variable placeholder 

+							// with data value constant

+							Console.WriteLine("parm StringBuilder to string p...");

+#endif

+							string p = parm.ToString();

+#if DEBUG_ParmUtil

+							Console.WriteLine("calling BindReplace...");

+#endif							

+							bool found = BindReplace(result, p);

+#if DEBUG_ParmUtil

+							Console.WriteLine("    Found = " + found);

+#endif

+							if(found == true)

+								break;

+							else {						

+								// *** Error Handling

+								Console.WriteLine("Error: parameter not found: " + p);

+								return "";

+							}

+						}

+						i++;

+					}

+					i--;

+				}

+				else 

+					result.Append(chars[i]);

+			}

+			

+			resultSql = result.ToString();

+			return resultSql;

+		}

+

+		public bool BindReplace (StringBuilder result, string p) {

+			// bind variable

+			bool found = false;

+

+#if DEBUG_ParmUtil

+			Console.WriteLine("Does the parmsCollection contain the parameter???: " + p);

+#endif

+			if(parmsCollection.Contains(p) == true) {

+				// parameter found

+#if DEBUG_ParmUtil

+				Console.WriteLine("Parameter Found: " + p);

+#endif

+				SqlParameter prm = parmsCollection[p];

+

+#if DEBUG_ParmUtil																	

+				// DEBUG 

+				Console.WriteLine("          Value: " + prm.Value);

+				Console.WriteLine("      Direction: " + prm.Direction);

+#endif

+				// convert object to string and place

+				// into SQL

+				if(prm.Direction == ParameterDirection.Input) {

+					string strObj = PostgresHelper.

+						ObjectToString(prm.DbType, 

+								prm.Value);

+					result.Append(strObj);

+				}

+				else

+					result.Append(bindChar + p);

+

+				found = true;

+			}

+			return found;

+		}

+	}

+}

diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs
new file mode 100644
index 00000000000..20b9e02a6d0
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs
@@ -0,0 +1,78 @@
+//
+// System.Data.SqlClient.SqlClientPermission.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Data.SqlClient {
+
+	public sealed class SqlClientPermission : DBDataPermission {
+		
+		[MonoTODO]
+		public SqlClientPermission() {
+			// FIXME: do constructor
+		}
+
+		[MonoTODO]
+		public SqlClientPermission(PermissionState state) {
+			// FIXME: do constructor
+		}
+
+		[MonoTODO]
+		public SqlClientPermission(PermissionState state,
+			bool allowBlankPassword) { 
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Copy() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void FromXml(SecurityElement 
+					securityElement) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Intersect(IPermission target)  {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsSubsetOf(IPermission target) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override string ToString() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override SecurityElement ToXml() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Union(IPermission target) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		~SqlClientPermission() {
+			// FIXME: destructor to release resources
+		}
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermissionAttribute.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermissionAttribute.cs
new file mode 100644
index 00000000000..149613c5f2e
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlClientPermissionAttribute.cs
@@ -0,0 +1,46 @@
+//
+// System.Data.SqlClient.SqlClientPermissionAttribute.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Data.SqlClient {
+
+	[AttributeUsage(AttributeTargets.Assembly    | 
+			AttributeTargets.Class 	     | 
+			AttributeTargets.Struct      | 
+			AttributeTargets.Constructor |
+			AttributeTargets.Method)]
+	[Serializable]
+	public sealed class SqlClientPermissionAttribute :
+		DBDataPermissionAttribute {
+
+		[MonoTODO]
+		public SqlClientPermissionAttribute(SecurityAction action) : 
+			base(action)
+		{
+			// FIXME: do constructor
+		}
+
+		[MonoTODO]
+		public override IPermission CreatePermission() {
+			throw new NotImplementedException ();
+		}
+
+		//[MonoTODO]
+		//~SqlClientPermissionAttribute() {
+		//	// FIXME: destructor to release resources
+		//}
+	}
+
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlCommand.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlCommand.cs
new file mode 100644
index 00000000000..af2771c3fa2
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlCommand.cs
@@ -0,0 +1,928 @@
+//
+// System.Data.SqlClient.SqlCommand.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc 2002 http://www.ximian.com/
+// (C) Daniel Morgan, 2002
+// (C) Copyright 2002 Tim Coleman
+//
+// Credits:
+//    SQL and concepts were used from libgda 0.8.190 (GNOME Data Access)

+//    http://www.gnome-db.org/

+//    with permission from the authors of the

+//    PostgreSQL provider in libgda:

+//        Michael Lausch <michael@lausch.at>
+//        Rodrigo Moya <rodrigo@gnome-db.org>
+//        Vivien Malerba <malerba@gnome-db.org>
+//        Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+//
+
+// use #define DEBUG_SqlCommand if you want to spew debug messages
+// #define DEBUG_SqlCommand
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Xml;
+
+namespace System.Data.SqlClient {
+	/// <summary>
+	/// Represents a SQL statement that is executed 
+	/// while connected to a SQL database.
+	/// </summary>
+	// public sealed class SqlCommand : Component, IDbCommand, ICloneable
+	public sealed class SqlCommand : IDbCommand {
+
+		#region Fields
+
+		private string sql = "";
+		private int timeout = 30; 
+		// default is 30 seconds 
+		// for command execution
+
+		private SqlConnection conn = null;
+		private SqlTransaction trans = null;
+		private CommandType cmdType = CommandType.Text;
+		private bool designTime = false;
+		private SqlParameterCollection parmCollection = new 
+			SqlParameterCollection();
+
+		// SqlDataReader state data for ExecuteReader()
+		private SqlDataReader dataReader = null;
+		private string[] queries = null;
+		private int currentQuery = -1;
+		private CommandBehavior cmdBehavior = CommandBehavior.Default;
+
+		private ParmUtil parmUtil = null;
+		
+		#endregion // Fields
+
+		#region Constructors
+
+		public SqlCommand() {
+			sql = "";
+		}
+
+		public SqlCommand (string cmdText) {
+			sql = cmdText;
+		}
+
+		public SqlCommand (string cmdText, SqlConnection connection) {
+			sql = cmdText;
+			conn = connection;
+		}
+
+		public SqlCommand (string cmdText, SqlConnection connection, 
+			SqlTransaction transaction) {
+			sql = cmdText;
+			conn = connection;
+			trans = transaction;
+		}
+
+		#endregion // Constructors
+
+		#region Methods
+
+		[MonoTODO]
+		public void Cancel () {
+			// FIXME: use non-blocking Exec for this
+			throw new NotImplementedException ();
+		}
+
+		// FIXME: is this the correct way to return a stronger type?
+		[MonoTODO]
+		IDbDataParameter IDbCommand.CreateParameter () {
+			return CreateParameter ();
+		}
+
+		[MonoTODO]
+		public SqlParameter CreateParameter () {
+			return new SqlParameter ();
+		}
+
+		public int ExecuteNonQuery () {	
+			IntPtr pgResult; // PGresult
+			int rowsAffected = -1;
+			ExecStatusType execStatus;
+			String rowsAffectedString;
+			string query;
+
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnnectionState is not Open");
+
+			query = TweakQuery(sql, cmdType);
+
+			// FIXME: PQexec blocks 
+			// while PQsendQuery is non-blocking
+			// which is better to use?
+			// int PQsendQuery(PGconn *conn,
+			//        const char *query);
+
+			// execute SQL command
+			// uses internal property to get the PGConn IntPtr
+			pgResult = PostgresLibrary.
+				PQexec (conn.PostgresConnection, query);
+
+			execStatus = PostgresLibrary.
+				PQresultStatus (pgResult);
+			
+			if(execStatus == ExecStatusType.PGRES_COMMAND_OK ||
+				execStatus == ExecStatusType.PGRES_TUPLES_OK ) {
+
+				rowsAffectedString = PostgresLibrary.
+					PQcmdTuples (pgResult);
+
+				if(rowsAffectedString != null)
+					if(rowsAffectedString.Equals("") == false)
+						rowsAffected = int.Parse(rowsAffectedString);
+
+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+			}
+			else {
+				String errorMessage;
+				
+				errorMessage = PostgresLibrary.
+					PQresStatus(execStatus);
+
+				errorMessage += " " + PostgresLibrary.

+					PQresultErrorMessage(pgResult);

+

+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+

+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					conn.DataSource, "SqlCommand", 0);

+			}
+			
+			return rowsAffected;
+		}
+		
+		[MonoTODO]
+		IDataReader IDbCommand.ExecuteReader () {
+			return ExecuteReader ();
+		}
+
+		[MonoTODO]
+		public SqlDataReader ExecuteReader () {
+			return ExecuteReader(CommandBehavior.Default);
+		}
+
+		[MonoTODO]
+		IDataReader IDbCommand.ExecuteReader (
+			CommandBehavior behavior) {
+			return ExecuteReader (behavior);
+		}
+
+		[MonoTODO]
+		public SqlDataReader ExecuteReader (CommandBehavior behavior) 
+		{
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnectionState is not Open");
+
+			cmdBehavior = behavior;
+
+			queries = null;
+			currentQuery = -1;
+			dataReader = new SqlDataReader(this);
+
+			queries = sql.Split(new Char[] {';'});			
+
+			dataReader.NextResult();
+					
+			return dataReader;
+		}
+
+		internal SqlResult NextResult() 
+		{
+			SqlResult res = new SqlResult();
+			res.Connection = this.Connection;
+			res.Behavior = cmdBehavior;
+			string statement;
+		
+			currentQuery++;
+
+			res.CurrentQuery = currentQuery;
+
+			if(currentQuery < queries.Length && queries[currentQuery].Equals("") == false) {
+				res.SQL = queries[currentQuery];
+				statement = TweakQuery(queries[currentQuery], cmdType);
+				ExecuteQuery(statement, res);
+				res.ResultReturned = true;
+			}
+			else {
+				res.ResultReturned = false;
+			}
+
+			return res;
+		}
+
+		private string TweakQuery(string query, CommandType commandType) {
+			string statement = "";
+			StringBuilder td;
+
+#if DEBUG_SqlCommand
+			Console.WriteLine("---------[][] TweakQuery() [][]--------");
+			Console.WriteLine("CommandType: " + commandType + " CommandBehavior: " + cmdBehavior);
+			Console.WriteLine("SQL before command type: " + query);
+#endif						
+			// finish building SQL based on CommandType
+			switch(commandType) {
+			case CommandType.Text:
+				statement = query;
+				break;
+			case CommandType.StoredProcedure:
+				statement = 
+					"SELECT " + query + "()";
+				break;
+			case CommandType.TableDirect:
+				// NOTE: this is for the PostgreSQL provider
+				//       and for OleDb, according to the docs,
+				//       an exception is thrown if you try to use
+				//       this with SqlCommand
+				string[] directTables = query.Split(
+					new Char[] {','});	
+										 
+				td = new StringBuilder("SELECT * FROM ");
+				
+				for(int tab = 0; tab < directTables.Length; tab++) {
+					if(tab > 0)
+						td.Append(',');
+					td.Append(directTables[tab]);
+					// FIXME: if multipe tables, how do we
+					//        join? based on Primary/Foreign Keys?
+					//        Otherwise, a Cartesian Product happens
+				}
+				statement = td.ToString();
+				break;
+			default:
+				// FIXME: throw an exception?
+				statement = query;
+				break;
+			}
+#if DEBUG_SqlCommand			
+			Console.WriteLine("SQL after command type: " + statement);
+#endif
+			// TODO: this parameters utility
+			//       currently only support input variables
+			//       need todo output, input/output, and return.
+#if DEBUG_SqlCommand
+			Console.WriteLine("using ParmUtil in TweakQuery()...");
+#endif
+			parmUtil = new ParmUtil(statement, parmCollection);
+#if DEBUG_SqlCommand
+			Console.WriteLine("ReplaceWithParms...");
+#endif
+
+			statement = parmUtil.ReplaceWithParms();
+
+#if DEBUG_SqlCommand
+			Console.WriteLine("SQL after ParmUtil: " + statement);
+#endif	
+			return statement;
+		}
+
+		private void ExecuteQuery (string query, SqlResult res)
+		{			
+			IntPtr pgResult;
+		
+			ExecStatusType execStatus;	
+
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnectionState is not Open");
+
+			// FIXME: PQexec blocks 
+			// while PQsendQuery is non-blocking
+			// which is better to use?
+			// int PQsendQuery(PGconn *conn,
+			//        const char *query);
+
+			// execute SQL command
+			// uses internal property to get the PGConn IntPtr
+			pgResult = PostgresLibrary.
+				PQexec (conn.PostgresConnection, query);
+
+			execStatus = PostgresLibrary.
+				PQresultStatus (pgResult);
+			
+			res.ExecStatus = execStatus;
+
+			if(execStatus == ExecStatusType.PGRES_TUPLES_OK ||
+				execStatus == ExecStatusType.PGRES_COMMAND_OK) {
+
+				res.BuildTableSchema(pgResult);
+			}
+			else {
+				String errorMessage;
+				
+				errorMessage = PostgresLibrary.
+					PQresStatus(execStatus);
+
+				errorMessage += " " + PostgresLibrary.

+					PQresultErrorMessage(pgResult);

+

+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+

+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					conn.DataSource, "SqlCommand", 0);

+			}
+		}
+
+		// since SqlCommand has resources so SqlDataReader
+		// can do Read() and NextResult(), need to free
+		// those resources.  Also, need to allow this SqlCommand
+		// and this SqlConnection to do things again.
+		internal void CloseReader() {
+			dataReader = null;
+			queries = null;
+
+			if((cmdBehavior & CommandBehavior.CloseConnection) == CommandBehavior.CloseConnection) {
+				conn.CloseReader(true);
+			}
+			else {
+				conn.CloseReader(false);
+			}
+		}
+
+		// only meant to be used between SqlConnectioin,
+		// SqlCommand, and SqlDataReader
+		internal void OpenReader(SqlDataReader reader) {
+			conn.OpenReader(reader);
+		}
+
+		/// <summary>

+		/// ExecuteScalar is used to retrieve one object
+		/// from one result set 

+		/// that has one row and one column.

+		/// It is lightweight compared to ExecuteReader.

+		/// </summary>
+		[MonoTODO]
+		public object ExecuteScalar () {
+			IntPtr pgResult; // PGresult
+			ExecStatusType execStatus;	
+			object obj = null; // return
+			int nRow = 0; // first row
+			int nCol = 0; // first column
+			String value;
+			int nRows;
+			int nFields;
+			string query;
+
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnnectionState is not Open");
+
+			query = TweakQuery(sql, cmdType);
+
+			// FIXME: PQexec blocks 
+			// while PQsendQuery is non-blocking
+			// which is better to use?
+			// int PQsendQuery(PGconn *conn,
+			//        const char *query);
+
+			// execute SQL command
+			// uses internal property to get the PGConn IntPtr
+			pgResult = PostgresLibrary.
+				PQexec (conn.PostgresConnection, query);
+
+			execStatus = PostgresLibrary.
+				PQresultStatus (pgResult);
+			if(execStatus == ExecStatusType.PGRES_COMMAND_OK) {
+				// result was a SQL Command 
+
+				// close result set
+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+
+				return null; // return null reference
+			}
+			else if(execStatus == ExecStatusType.PGRES_TUPLES_OK) {
+				// result was a SQL Query
+
+				nRows = PostgresLibrary.
+					PQntuples(pgResult);
+
+				nFields = PostgresLibrary.
+					PQnfields(pgResult);
+
+				if(nRows > 0 && nFields > 0) {
+
+					// get column name
+					//String fieldName;
+					//fieldName = PostgresLibrary.
+					//	PQfname(pgResult, nCol);
+
+					int oid;
+					string sType;
+					DbType dbType;
+					// get PostgreSQL data type (OID)
+					oid = PostgresLibrary.
+						PQftype(pgResult, nCol);
+					sType = PostgresHelper.
+						OidToTypname (oid, conn.Types);
+					dbType = PostgresHelper.
+						TypnameToSqlDbType(sType);
+
+					int definedSize;
+					// get defined size of column
+					definedSize = PostgresLibrary.
+						PQfsize(pgResult, nCol);
+
+					// get data value
+					value = PostgresLibrary.
+						PQgetvalue(
+						pgResult,
+						nRow, nCol);
+
+					int columnIsNull;
+					// is column NULL?
+					columnIsNull = PostgresLibrary.
+						PQgetisnull(pgResult,
+						nRow, nCol);
+
+					int actualLength;
+					// get Actual Length
+					actualLength = PostgresLibrary.
+						PQgetlength(pgResult,
+						nRow, nCol);
+						
+					obj = PostgresHelper.
+						ConvertDbTypeToSystem (
+						dbType,
+						value);
+				}
+
+				// close result set
+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+
+			}
+			else {
+				String errorMessage;
+				
+				errorMessage = PostgresLibrary.
+					PQresStatus(execStatus);
+
+				errorMessage += " " + PostgresLibrary.

+					PQresultErrorMessage(pgResult);

+

+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+

+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					conn.DataSource, "SqlCommand", 0);

+			}
+					
+			return obj;
+		}
+
+		[MonoTODO]
+		public XmlReader ExecuteXmlReader () {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Prepare () {
+			// FIXME: parameters have to be implemented for this
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public SqlCommand Clone () {
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+
+		#region Properties
+
+		public string CommandText {
+			get { 
+				return sql; 
+			}
+
+			set { 
+				sql = value; 
+			}
+		}
+
+		public int CommandTimeout {
+			get { 
+				return timeout;  
+			}
+			
+			set {
+				// FIXME: if value < 0, throw
+				// ArgumentException
+				// if (value < 0)
+				//	throw ArgumentException;
+				timeout = value;
+			}
+		}
+
+		public CommandType CommandType	{
+			get {
+				return cmdType;
+			}
+
+			set { 
+				cmdType = value;
+			}
+		}
+
+		// FIXME: for property Connection, is this the correct
+		//        way to handle a return of a stronger type?
+		IDbConnection IDbCommand.Connection {
+			get { 
+				return Connection;
+			}
+
+			set { 
+				// FIXME: throw an InvalidOperationException
+				// if the change was during a 
+				// transaction in progress
+
+				// csc
+				Connection = (SqlConnection) value; 
+				// mcs
+				// Connection = value; 
+				
+				// FIXME: set Transaction property to null
+			}
+		}
+		
+		public SqlConnection Connection {
+			get { 
+				// conn defaults to null
+				return conn;
+			}
+
+			set { 
+				// FIXME: throw an InvalidOperationException
+				// if the change was during 
+				// a transaction in progress
+				conn = value; 
+				// FIXME: set Transaction property to null
+			}
+		}
+
+		public bool DesignTimeVisible {
+			get {
+				return designTime;
+			} 
+			
+			set{
+				designTime = value;
+			}
+		}
+
+		// FIXME; for property Parameters, is this the correct
+		//        way to handle a stronger return type?
+		IDataParameterCollection IDbCommand.Parameters	{
+			get { 
+				return Parameters;
+			}
+		}
+
+		public SqlParameterCollection Parameters {
+			get { 
+				return parmCollection;
+			}
+		}
+
+		// FIXME: for property Transaction, is this the correct
+		//        way to handle a return of a stronger type?
+		IDbTransaction IDbCommand.Transaction 	{
+			get { 
+				return Transaction;
+			}
+
+			set { 
+				// FIXME: error handling - do not allow
+				// setting of transaction if transaction
+				// has already begun
+
+				// csc
+				Transaction = (SqlTransaction) value;
+				// mcs
+				// Transaction = value; 
+			}
+		}
+
+		public SqlTransaction Transaction {
+			get { 
+				return trans; 
+			}
+
+			set { 
+				// FIXME: error handling
+				trans = value; 
+			}
+		}	
+
+		[MonoTODO]
+		public UpdateRowSource UpdatedRowSource	{
+			// FIXME: do this once DbDataAdaptor 
+			// and DataRow are done
+			get { 		
+				throw new NotImplementedException (); 
+			}
+			set { 
+				throw new NotImplementedException (); 
+			}
+		}
+
+		#endregion // Properties
+
+		#region Inner Classes
+
+		#endregion // Inner Classes
+
+		#region Destructors
+
+		[MonoTODO]
+		public void Dispose() {
+			// FIXME: need proper way to release resources
+			// Dispose(true);
+		}
+
+		[MonoTODO]
+		~SqlCommand() {
+			// FIXME: need proper way to release resources
+			// Dispose(false);
+		}
+
+		#endregion //Destructors
+	}
+
+	// SqlResult is used for passing Result Set data 
+	// from SqlCommand to SqlDataReader
+	internal class SqlResult {
+
+		private DataTable dataTableSchema = null; // only will contain the schema
+		private IntPtr pg_result = IntPtr.Zero; // native PostgreSQL PGresult
+		private int rowCount = 0; 
+		private int fieldCount = 0;
+		private string[] pgtypes = null; // PostgreSQL types (typname)
+		private bool resultReturned = false;
+		private SqlConnection con = null;
+		private int rowsAffected = -1;
+		private ExecStatusType execStatus = ExecStatusType.PGRES_FATAL_ERROR;
+		private int currentQuery = -1;
+		private string sql = "";
+		private CommandBehavior cmdBehavior = CommandBehavior.Default;
+
+		internal CommandBehavior Behavior {
+			get {
+				return cmdBehavior;
+			}
+			set {
+				cmdBehavior = value;
+			}
+		}
+
+		internal string SQL {
+			get {
+				return sql;
+			}
+			set {
+				sql = value;
+			}
+		}
+
+		internal ExecStatusType ExecStatus {
+			get {
+				return execStatus;
+			}
+			set {
+				execStatus = value;
+			}
+		}
+
+		internal int CurrentQuery {
+			get {
+				return currentQuery;
+			}
+
+			set {
+				currentQuery = value;
+			}
+
+		}
+
+		internal SqlConnection Connection {
+			get {
+				return con;
+			}
+
+			set {
+				con = value;
+			}
+		}
+
+		internal int RecordsAffected {
+			get {
+				return rowsAffected;
+			}
+		}
+
+		internal bool ResultReturned {
+			get {
+				return resultReturned;
+			}
+			set {
+				resultReturned = value;
+			}
+		}
+
+		internal DataTable Table {
+			get { 
+				return dataTableSchema;
+			}
+		}
+
+		internal IntPtr PgResult {
+			get {
+				return pg_result;
+			}
+		}
+
+		internal int RowCount {
+			get {
+				return rowCount;
+			}
+		}
+
+		internal int FieldCount {
+			get {
+				return fieldCount;
+			}
+		}
+
+		internal string[] PgTypes {
+			get {
+				return pgtypes;
+			}
+		}
+
+		internal void BuildTableSchema (IntPtr pgResult) {
+			pg_result = pgResult;
+			
+			// need to set IDataReader.RecordsAffected property
+			string rowsAffectedString;
+			rowsAffectedString = PostgresLibrary.
+				PQcmdTuples (pgResult);
+			if(rowsAffectedString != null)
+				if(rowsAffectedString.Equals("") == false)
+					rowsAffected = int.Parse(rowsAffectedString);
+			
+			// Only Results from SQL SELECT Queries 
+			// get a DataTable for schema of the result
+			// otherwise, DataTable is null reference
+			if(execStatus == ExecStatusType.PGRES_TUPLES_OK) {
+
+				dataTableSchema = new DataTable ();
+				dataTableSchema.Columns.Add ("ColumnName", typeof (string));
+				dataTableSchema.Columns.Add ("ColumnOrdinal", typeof (int));
+				dataTableSchema.Columns.Add ("ColumnSize", typeof (int));
+				dataTableSchema.Columns.Add ("NumericPrecision", typeof (int));
+				dataTableSchema.Columns.Add ("NumericScale", typeof (int));
+				dataTableSchema.Columns.Add ("IsUnique", typeof (bool));
+				dataTableSchema.Columns.Add ("IsKey", typeof (bool));
+				DataColumn dc = dataTableSchema.Columns["IsKey"];
+				dc.AllowDBNull = true; // IsKey can have a DBNull
+				dataTableSchema.Columns.Add ("BaseCatalogName", typeof (string));
+				dataTableSchema.Columns.Add ("BaseColumnName", typeof (string));
+				dataTableSchema.Columns.Add ("BaseSchemaName", typeof (string));
+				dataTableSchema.Columns.Add ("BaseTableName", typeof (string));
+				dataTableSchema.Columns.Add ("DataType", typeof(string));
+				dataTableSchema.Columns.Add ("AllowDBNull", typeof (bool));
+				dataTableSchema.Columns.Add ("ProviderType", typeof (int));
+				dataTableSchema.Columns.Add ("IsAliased", typeof (bool));
+				dataTableSchema.Columns.Add ("IsExpression", typeof (bool));
+				dataTableSchema.Columns.Add ("IsIdentity", typeof (bool));
+				dataTableSchema.Columns.Add ("IsAutoIncrement", typeof (bool));
+				dataTableSchema.Columns.Add ("IsRowVersion", typeof (bool));
+				dataTableSchema.Columns.Add ("IsHidden", typeof (bool));
+				dataTableSchema.Columns.Add ("IsLong", typeof (bool));
+				dataTableSchema.Columns.Add ("IsReadOnly", typeof (bool));
+
+				fieldCount = PostgresLibrary.PQnfields (pgResult);
+				rowCount = PostgresLibrary.PQntuples(pgResult);
+				pgtypes = new string[fieldCount];

+

+				// TODO: for CommandBehavior.SingleRow

+				//       use IRow, otherwise, IRowset

+				if(fieldCount > 0)

+					if((cmdBehavior & CommandBehavior.SingleRow) == CommandBehavior.SingleRow)

+						fieldCount = 1;

+
+				// TODO: for CommandBehavior.SchemaInfo
+				if((cmdBehavior & CommandBehavior.SchemaOnly) == CommandBehavior.SchemaOnly)
+					fieldCount = 0;
+
+				// TODO: for CommandBehavior.SingleResult
+				if((cmdBehavior & CommandBehavior.SingleResult) == CommandBehavior.SingleResult)
+					if(currentQuery > 0)
+						fieldCount = 0;
+
+				// TODO: for CommandBehavior.SequentialAccess - used for reading Large OBjects
+				//if((cmdBehavior & CommandBehavior.SequentialAccess) == CommandBehavior.SequentialAccess) {
+				//}
+
+				DataRow schemaRow;
+				int oid;
+				DbType dbType;
+				Type typ;
+						
+				for (int i = 0; i < fieldCount; i += 1 ) {
+					schemaRow = dataTableSchema.NewRow ();
+
+					string columnName = PostgresLibrary.PQfname (pgResult, i);
+
+					schemaRow["ColumnName"] = columnName;
+					schemaRow["ColumnOrdinal"] = i+1;
+					schemaRow["ColumnSize"] = PostgresLibrary.PQfsize (pgResult, i);
+					schemaRow["NumericPrecision"] = 0;
+					schemaRow["NumericScale"] = 0;
+					// TODO: need to get KeyInfo
+					if((cmdBehavior & CommandBehavior.KeyInfo) == CommandBehavior.KeyInfo) {
+						bool IsUnique, IsKey;
+						GetKeyInfo(columnName, out IsUnique, out IsKey);
+					}
+					else {
+						schemaRow["IsUnique"] = false;
+						schemaRow["IsKey"] = DBNull.Value;
+					}
+					schemaRow["BaseCatalogName"] = "";
+					schemaRow["BaseColumnName"] = columnName;
+					schemaRow["BaseSchemaName"] = "";
+					schemaRow["BaseTableName"] = "";
+				
+					// PostgreSQL type to .NET type stuff
+					oid = PostgresLibrary.PQftype (pgResult, i);
+					pgtypes[i] = PostgresHelper.OidToTypname (oid, con.Types);	

+					dbType = PostgresHelper.TypnameToSqlDbType (pgtypes[i]);

+				

+					typ = PostgresHelper.DbTypeToSystemType (dbType);

+					string st = typ.ToString();

+					schemaRow["DataType"] = st;

+
+					schemaRow["AllowDBNull"] = false;
+					schemaRow["ProviderType"] = oid;
+					schemaRow["IsAliased"] = false;
+					schemaRow["IsExpression"] = false;
+					schemaRow["IsIdentity"] = false;
+					schemaRow["IsAutoIncrement"] = false;
+					schemaRow["IsRowVersion"] = false;
+					schemaRow["IsHidden"] = false;
+					schemaRow["IsLong"] = false;
+					schemaRow["IsReadOnly"] = false;
+					schemaRow.AcceptChanges();
+					dataTableSchema.Rows.Add (schemaRow);
+				}
+				
+#if DEBUG_SqlCommand
+				Console.WriteLine("********** DEBUG Table Schema BEGIN ************");
+				foreach (DataRow myRow in dataTableSchema.Rows) {

+					foreach (DataColumn myCol in dataTableSchema.Columns)

+						Console.WriteLine(myCol.ColumnName + " = " + myRow[myCol]);

+					Console.WriteLine();

+				}
+				Console.WriteLine("********** DEBUG Table Schema END ************");
+#endif // DEBUG_SqlCommand
+
+			}
+		}
+
+		// TODO: how do we get the key info if
+		//       we don't have the tableName?
+		private void GetKeyInfo(string columnName, out bool isUnique, out bool isKey) {
+			isUnique = false;
+			isKey = false;
+
+			string sql;
+
+			sql =
+			"SELECT i.indkey, i.indisprimary, i.indisunique " +
+			"FROM pg_class c, pg_class c2, pg_index i " +
+			"WHERE c.relname = ':tableName' AND c.oid = i.indrelid " +
+			"AND i.indexrelid = c2.oid ";
+		}
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlCommandBuilder.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlCommandBuilder.cs
new file mode 100644
index 00000000000..d2b028bc652
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlCommandBuilder.cs
@@ -0,0 +1,103 @@
+//
+// System.Data.SqlClient.SqlCommandBuilder.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.ComponentModel;
+
+namespace System.Data.SqlClient {

+

+	/// <summary>

+	/// Builder of one command

+	/// that will be used in manipulating a table for

+	/// a DataSet that is assoicated with a database.

+	/// </summary>

+	public sealed class SqlCommandBuilder : Component {

+		

+		[MonoTODO]

+		public SqlCommandBuilder() {

+

+		}

+

+		[MonoTODO]

+		public SqlCommandBuilder(SqlDataAdapter adapter) {

+		

+		}

+

+		[MonoTODO]

+		public SqlDataAdapter DataAdapter {

+			get {

+				throw new NotImplementedException ();

+			}

+			

+			set{

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public string QuotePrefix {

+			get {

+				throw new NotImplementedException ();

+			} 

+			

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public string QuoteSuffix {

+			get {

+				throw new NotImplementedException ();

+			}

+			

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public static void DeriveParameters(SqlCommand command) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SqlCommand GetDeleteCommand() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SqlCommand GetInsertCommand() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SqlCommand GetUpdateCommand() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void RefreshSchema() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void Dispose(bool disposing) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		~SqlCommandBuilder() {

+			// FIXME: create destructor - release resources

+		}

+	}

+}

+

diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlConnection.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlConnection.cs
new file mode 100644
index 00000000000..0bd37605cc6
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlConnection.cs
@@ -0,0 +1,722 @@
+//
+// System.Data.SqlClient.SqlConnection.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+// (C) Daniel Morgan 2002
+//
+// Credits:
+//    SQL and concepts were used from libgda 0.8.190 (GNOME Data Access)

+//    http://www.gnome-db.org/

+//    with permission from the authors of the

+//    PostgreSQL provider in libgda:

+//        Michael Lausch <michael@lausch.at>
+//        Rodrigo Moya <rodrigo@gnome-db.org>
+//        Vivien Malerba <malerba@gnome-db.org>
+//        Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+//
+
+// use #define DEBUG_SqlConnection if you want to spew debug messages
+// #define DEBUG_SqlConnection
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace System.Data.SqlClient {
+
+	/// <summary>
+	/// Represents an open connection to a SQL data source
+	/// </summary>
+	public sealed class SqlConnection : Component, IDbConnection,
+		ICloneable	
+	{
+		// FIXME: Need to implement class Component, 

+		// and interfaces: ICloneable and IDisposable	
+
+		#region Fields
+
+		private PostgresTypes types = null;
+		private IntPtr pgConn = IntPtr.Zero;    
+
+		// PGConn (Postgres Connection)
+		private string connectionString = "";    
+		// OLE DB Connection String
+		private string pgConnectionString = ""; 
+		// PostgreSQL Connection String
+		private SqlTransaction trans = null;
+		private int connectionTimeout = 15;     
+		// default for 15 seconds
+		
+		// connection parameters in connection string
+		private string host = "";     
+		// Name of host to connect to
+		private string hostaddr = ""; 
+		// IP address of host to connect to
+		// should be in "n.n.n.n" format
+		private string port = "";     
+		// Port number to connect to at the server host
+		private string dbname = "";   // The database name. 
+		private string user = "";     // User name to connect as. 
+		private string password = "";
+		// Password to be used if the server 
+		// demands password authentication.  		
+		private string options = ""; 
+		// Trace/debug options to be sent to the server. 
+		private string tty = ""; 
+		// A file or tty for optional 
+		// debug output from the backend. 
+		private string requiressl = "";
+		// Set to 1 to require 
+		// SSL connection to the backend. 
+		// Libpq will then refuse to connect 
+		// if the server does not 
+		// support SSL. Set to 0 (default) to 
+		// negotiate with server. 
+
+		// connection state
+		private ConnectionState conState = ConnectionState.Closed;
+		
+		// DataReader state
+		private SqlDataReader rdr = null;
+		private bool dataReaderOpen = false;
+		// FIXME: if true, throw an exception if SqlConnection 
+		//        is used for anything other than reading
+		//        data using SqlDataReader
+		
+		private string versionString = "Unknown";
+
+		private bool disposed = false;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		// A lot of the defaults were initialized in the Fields
+		[MonoTODO]
+		public SqlConnection () {
+
+		}
+	
+		[MonoTODO]
+		public SqlConnection (String connectionString) {
+			SetConnectionString (connectionString);
+		}
+
+		#endregion // Constructors
+
+		#region Destructors
+
+		protected override void Dispose(bool disposing) {
+			if(!this.disposed)
+				try {
+					if(disposing) {
+						// release any managed resources
+					}
+					// release any unmanaged resources
+					// close any handles
+										
+					this.disposed = true;
+				}
+				finally {
+					base.Dispose(disposing);
+				}
+		}
+	
+		// aka Finalize()
+		// [ClassInterface(ClassInterfaceType.AutoDual)]
+		[MonoTODO]
+		~SqlConnection() {
+			Dispose (false);
+		}
+		
+		#endregion // Destructors
+
+		#region Public Methods
+
+		IDbTransaction IDbConnection.BeginTransaction () {
+			return BeginTransaction ();
+		}
+
+		public SqlTransaction BeginTransaction () {
+			return TransactionBegin (); // call private method
+		}
+
+		IDbTransaction IDbConnection.BeginTransaction (IsolationLevel 
+			il) {
+			return BeginTransaction (il);
+		}
+
+		public SqlTransaction BeginTransaction (IsolationLevel il) {
+			return TransactionBegin (il); // call private method
+		}
+
+		// PostgreSQL does not support named transactions/savepoint
+		//            nor nested transactions
+		[Obsolete]
+		public SqlTransaction BeginTransaction(string transactionName) {
+			return TransactionBegin (); // call private method
+		}
+
+		[Obsolete]
+		public SqlTransaction BeginTransaction(IsolationLevel iso,

+			string transactionName) {
+			return TransactionBegin (iso); // call private method
+		}
+
+		[MonoTODO]
+		public void ChangeDatabase (string databaseName) {
+			throw new NotImplementedException ();
+		}
+
+		object ICloneable.Clone() {
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public void Close () {
+			if(dataReaderOpen == true) {
+				// TODO: what do I do if
+				// the user Closes the connection
+				// without closing the Reader first?
+
+			}			
+			CloseDataSource ();
+		}
+
+		IDbCommand IDbConnection.CreateCommand () {
+			return CreateCommand ();
+		}
+
+		public SqlCommand CreateCommand () {
+			SqlCommand sqlcmd = new SqlCommand ("", this);
+
+			return sqlcmd;
+		}
+
+		[MonoTODO]
+		public void Open () {
+			if(dbname.Equals(""))
+				throw new InvalidOperationException(
+					"dbname missing");
+			else if(conState == ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnnectionState is already Open");
+
+			ConnStatusType connStatus;
+
+			// FIXME: check to make sure we have 
+			//        everything to connect,
+			//        otherwise, throw an exception
+
+			pgConn = PostgresLibrary.PQconnectdb 
+				(pgConnectionString);
+
+			// FIXME: should we use PQconnectStart/PQconnectPoll
+			//        instead of PQconnectdb?  
+			// PQconnectdb blocks 
+			// PQconnectStart/PQconnectPoll is non-blocking
+			
+			connStatus = PostgresLibrary.PQstatus (pgConn);
+			if(connStatus == ConnStatusType.CONNECTION_OK) {
+				// Successfully Connected
+				disposed = false;
+				SetupConnection();
+			}
+			else {
+				String errorMessage = PostgresLibrary.
+					PQerrorMessage (pgConn);
+				errorMessage += ": Could not connect to database.";
+
+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					host, "SqlConnection", 0);
+			}
+		}
+
+		#endregion // Public Methods
+
+		#region Internal Methods
+
+		// Used to prevent SqlConnection
+		// from doing anything while
+		// SqlDataReader is open.
+		// Open the Reader. (called from SqlCommand)
+		internal void OpenReader(SqlDataReader reader) 
+		{	
+			if(dataReaderOpen == true) {
+				// TODO: throw exception here?
+				//       because a reader
+				//       is already open
+			}
+			else {
+				rdr = reader;
+				dataReaderOpen = true;
+			}
+		}
+
+		// Used to prevent SqlConnection
+		// from doing anything while
+		// SqlDataReader is open
+		// Close the Reader (called from SqlCommand)
+		// if closeConnection true, Close() the connection
+		// this is based on CommandBehavior.CloseConnection
+		internal void CloseReader(bool closeConnection)
+		{	if(closeConnection == true)
+				CloseDataSource();
+			else
+				dataReaderOpen = false;
+		}
+
+		#endregion // Internal Methods
+
+		#region Private Methods
+
+		private void SetupConnection() {
+			
+			conState = ConnectionState.Open;
+
+			// FIXME: load types into hashtable
+			types = new PostgresTypes(this);
+			types.Load();
+
+			versionString = GetDatabaseServerVersion();
+
+			// set DATE style to YYYY/MM/DD
+			IntPtr pgResult = IntPtr.Zero;
+			pgResult = PostgresLibrary.PQexec (pgConn, "SET DATESTYLE TO 'ISO'");
+			PostgresLibrary.PQclear (pgResult);
+			pgResult = IntPtr.Zero;
+		}
+
+		private string GetDatabaseServerVersion() 
+		{
+			SqlCommand cmd = new SqlCommand("select version()",this);
+			return (string) cmd.ExecuteScalar();
+		}
+
+		private void CloseDataSource () {
+			// FIXME: just a quick hack
+			if(conState == ConnectionState.Open) {
+				if(trans != null)
+					if(trans.DoingTransaction == true) {
+						trans.Rollback();
+						// trans.Dispose();
+						trans = null;
+					}
+
+				conState = ConnectionState.Closed;
+				PostgresLibrary.PQfinish (pgConn);
+				pgConn = IntPtr.Zero;
+			}
+		}
+
+		private void SetConnectionString (string connectionString) {
+			// FIXME: perform error checking on string
+			// while translating string from 
+			// OLE DB format to PostgreSQL 
+			// connection string format
+			//
+			//     OLE DB: "host=localhost;dbname=test;user=joe;password=smoe"
+			// PostgreSQL: "host=localhost dbname=test user=joe password=smoe"
+			//
+			// For OLE DB, you would have the additional 
+			// "provider=postgresql"
+			// OleDbConnection you would be using libgda
+			//
+			// Also, parse the connection string into properties
+
+			// FIXME: if connection is open, you can 
+			//        not set the connection
+			//        string, throw an exception
+
+			this.connectionString = connectionString;
+			pgConnectionString = ConvertStringToPostgres (
+				connectionString);
+
+#if DEBUG_SqlConnection
+			Console.WriteLine(
+				"OLE-DB Connection String    [in]: " +
+				this.ConnectionString);
+			Console.WriteLine(
+				"Postgres Connection String [out]: " +
+				pgConnectionString);
+#endif // DEBUG_SqlConnection
+		}
+
+		private String ConvertStringToPostgres (String 
+			oleDbConnectionString) {
+			StringBuilder postgresConnection = 
+				new StringBuilder();
+			string result;
+			string[] connectionParameters;
+
+			char[] semicolon = new Char[1];
+			semicolon[0] = ';';
+			
+			// FIXME: what is the max number of value pairs 
+			//        can there be for the OLE DB 
+			//	  connnection string? what about libgda max?
+			//        what about postgres max?
+
+			// FIXME: currently assuming value pairs are like:
+			//        "key1=value1;key2=value2;key3=value3"
+			//        Need to deal with values that have
+			//        single or double quotes.  And error 
+			//        handling of that too.
+			//        "key1=value1;key2='value2';key=\"value3\""
+
+			// FIXME: put the connection parameters 
+			//        from the connection
+			//        string into a 
+			//        Hashtable (System.Collections)
+			//        instead of using private variables 
+			//        to store them
+			connectionParameters = oleDbConnectionString.
+				Split (semicolon);
+			foreach (string sParameter in connectionParameters) {
+				if(sParameter.Length > 0) {
+					BreakConnectionParameter (sParameter);
+					postgresConnection.
+						Append (sParameter + 
+						" ");
+				}
+			}
+			result = postgresConnection.ToString ();
+			return result;
+		}
+
+		private bool BreakConnectionParameter (String sParameter) {	
+			bool addParm = true;
+			int index;
+
+			index = sParameter.IndexOf ("=");
+			if (index > 0) {	
+				string parmKey, parmValue;
+
+				// separate string "key=value" to 
+				// string "key" and "value"
+				parmKey = sParameter.Substring (0, index);
+				parmValue = sParameter.Substring (index + 1,
+					sParameter.Length - index - 1);
+
+				switch(parmKey.ToLower()) {
+				case "hostaddr":
+					hostaddr = parmValue;
+					break;
+
+				case "port":
+					port = parmValue;
+					break;
+
+				case "host":
+					// set DataSource property
+					host = parmValue;
+					break;
+
+				case "dbname":
+					// set Database property
+					dbname = parmValue;
+					break;
+
+				case "user":
+					user = parmValue;
+					break;
+
+				case "password":
+					password = parmValue;
+					//	addParm = false;
+					break;
+
+				case "options":
+					options = parmValue;
+					break;
+
+				case "tty":
+					tty = parmValue;
+					break;
+							
+				case "requiressl":
+					requiressl = parmValue;
+					break;
+				}
+			}
+			return addParm;
+		}
+
+		private SqlTransaction TransactionBegin () {
+			// FIXME: need to keep track of 
+			// transaction in-progress
+			trans = new SqlTransaction ();
+			// using internal methods of SqlTransaction
+			trans.SetConnection (this);
+			trans.Begin();
+
+			return trans;
+		}
+
+		private SqlTransaction TransactionBegin (IsolationLevel il) {
+			// FIXME: need to keep track of 
+			// transaction in-progress
+			TransactionBegin();
+			trans.SetIsolationLevel (il);
+			
+			return trans;
+		}
+
+		#endregion
+
+		#region Public Properties
+
+		[MonoTODO]
+		public ConnectionState State 		{
+			get { 
+				return conState;
+			}
+		}
+
+		public string ConnectionString	{
+			get { 
+				return connectionString;
+			}
+			set { 
+				SetConnectionString (value);
+			}
+		}
+		
+		public int ConnectionTimeout {
+			get { 
+				return connectionTimeout; 
+			}
+		}
+
+		public string Database	{
+			get { 
+				return dbname; 
+			}
+		}
+
+		public string DataSource {
+			get {
+				return host;
+			}
+		}
+
+		public int PacketSize {
+			get { 
+				throw new NotImplementedException ();
+			}
+		}
+
+		public string ServerVersion {
+			get { 
+				return versionString;
+			}
+		}
+
+		#endregion // Public Properties
+
+		#region Internal Properties
+
+		// For System.Data.SqlClient classes
+		// to get the current transaction
+		// in progress - if any
+		internal SqlTransaction Transaction {
+			get {
+				return trans;
+			}
+		}
+
+		// For System.Data.SqlClient classes 
+		// to get the unmanaged PostgreSQL connection
+		internal IntPtr PostgresConnection {
+			get {
+				return pgConn;
+			}
+		}
+
+		// For System.Data.SqlClient classes
+		// to get the list PostgreSQL types
+		// so can look up based on OID to
+		// get the .NET System type.
+		internal ArrayList Types {
+			get {
+				return types.List;
+			}
+		}
+
+		// Used to prevent SqlConnection
+		// from doing anything while
+		// SqlDataReader is open
+		internal bool IsReaderOpen {
+			get {
+				return dataReaderOpen;
+			}
+		}
+
+		#endregion // Internal Properties
+
+		#region Events
+                
+		public event 
+		SqlInfoMessageEventHandler InfoMessage;
+
+		public event 
+		StateChangeEventHandler StateChange;
+		
+		#endregion
+
+		#region Inner Classes
+
+		private class PostgresTypes {
+			// TODO: create hashtable for 
+			// PostgreSQL types to .NET types
+			// containing: oid, typname, SqlDbType
+
+			private Hashtable hashTypes;
+			private ArrayList pgTypes;
+			private SqlConnection con;
+
+			// Got this SQL with the permission from 
+			// the authors of libgda
+			private const string SEL_SQL_GetTypes = 
+				"SELECT oid, typname FROM pg_type " +
+				"WHERE typrelid = 0 AND typname !~ '^_' " +
+				" AND  typname not in ('SET', 'cid', " +
+				"'int2vector', 'oidvector', 'regproc', " +
+				"'smgr', 'tid', 'unknown', 'xid') " +
+				"ORDER BY typname";
+
+			internal PostgresTypes(SqlConnection sqlcon) {
+				
+				con = sqlcon;
+				hashTypes = new Hashtable();
+			}
+
+			private void AddPgType(Hashtable types, 

+				string typname, DbType dbType) {

+

+				PostgresType pgType = new PostgresType();

+			

+				pgType.typname = typname;

+				pgType.dbType = dbType;	

+

+				types.Add(pgType.typname, pgType);

+			}

+
+			private void BuildTypes(IntPtr pgResult, 
+				int nRows, int nFields) {
+
+				String value;
+
+				int r;
+				for(r = 0; r < nRows; r++) {
+					PostgresType pgType = 
+						new PostgresType();
+
+					// get data value (oid)
+					value = PostgresLibrary.
+						PQgetvalue(
+							pgResult,
+							r, 0);
+						
+					pgType.oid = Int32.Parse(value);

+

+					// get data value (typname)

+					value = PostgresLibrary.
+						PQgetvalue(
+						pgResult,
+						r, 1);	

+					pgType.typname = String.Copy(value);

+					pgType.dbType = PostgresHelper.

+							TypnameToSqlDbType(

+								pgType.typname);

+

+					pgTypes.Add(pgType);
+				}
+				pgTypes = ArrayList.ReadOnly(pgTypes);
+			}
+
+			internal void Load() {
+				pgTypes = new ArrayList();
+				IntPtr pgResult = IntPtr.Zero; // PGresult
+				
+				if(con.State != ConnectionState.Open)
+					throw new InvalidOperationException(
+						"ConnnectionState is not Open");
+
+				// FIXME: PQexec blocks 
+				// while PQsendQuery is non-blocking
+				// which is better to use?
+				// int PQsendQuery(PGconn *conn,
+				//        const char *query);
+
+				// execute SQL command
+				// uses internal property to get the PGConn IntPtr
+				pgResult = PostgresLibrary.
+					PQexec (con.PostgresConnection, SEL_SQL_GetTypes);
+
+				if(pgResult.Equals(IntPtr.Zero)) {
+					throw new SqlException(0, 0,
+						"No Resultset from PostgreSQL", 0, "",
+						con.DataSource, "SqlConnection", 0);
+				}
+				else {
+					ExecStatusType execStatus;
+
+					execStatus = PostgresLibrary.
+						PQresultStatus (pgResult);
+			
+					if(execStatus == ExecStatusType.PGRES_TUPLES_OK) {
+						int nRows;
+						int nFields;
+
+						nRows = PostgresLibrary.
+							PQntuples(pgResult);
+
+						nFields = PostgresLibrary.
+							PQnfields(pgResult);
+
+						BuildTypes (pgResult, nRows, nFields);
+
+						// close result set
+						PostgresLibrary.PQclear (pgResult);
+						pgResult = IntPtr.Zero;
+					}
+					else {
+						String errorMessage;
+				
+						errorMessage = PostgresLibrary.
+							PQresStatus(execStatus);
+
+						errorMessage += " " + PostgresLibrary.

+							PQresultErrorMessage(pgResult);

+

+						// close result set
+						PostgresLibrary.PQclear (pgResult);
+						pgResult = IntPtr.Zero;
+

+						throw new SqlException(0, 0,
+							errorMessage, 0, "",
+							con.DataSource, "SqlConnection", 0);

+					}
+				}
+			}
+
+			public ArrayList List {
+				get {
+					return pgTypes;
+				}
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlDataAdapter.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlDataAdapter.cs
new file mode 100644
index 00000000000..526f8f36818
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlDataAdapter.cs
@@ -0,0 +1,191 @@
+//
+// System.Data.SqlClient.SqlDataAdapter.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc 2002
+// Copyright (C) 2002 Tim Coleman
+//
+
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Represents a set of command-related properties that are used 
+	/// to fill the DataSet and update a data source, all this 
+	/// from a SQL database.
+	/// </summary>
+	public sealed class SqlDataAdapter : DbDataAdapter, IDbDataAdapter 
+	{
+		#region Fields
+	
+		SqlCommand deleteCommand;
+		SqlCommand insertCommand;
+		SqlCommand selectCommand;
+		SqlCommand updateCommand;
+
+		static readonly object EventRowUpdated = new object(); 
+		static readonly object EventRowUpdating = new object(); 
+
+		#endregion
+
+		#region Constructors
+		
+		public SqlDataAdapter () 	
+			: this (new SqlCommand ())
+		{
+		}
+
+		public SqlDataAdapter (SqlCommand selectCommand) 
+		{
+			DeleteCommand = new SqlCommand ();
+			InsertCommand = new SqlCommand ();
+			SelectCommand = selectCommand;
+			UpdateCommand = new SqlCommand ();
+		}
+
+		public SqlDataAdapter (string selectCommandText, SqlConnection selectConnection) 
+			: this (new SqlCommand (selectCommandText, selectConnection))
+		{ 
+		}
+
+		public SqlDataAdapter (string selectCommandText, string selectConnectionString)
+			: this (selectCommandText, new SqlConnection (selectConnectionString))
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public SqlCommand DeleteCommand {
+			get {
+				return deleteCommand;
+			}
+			set {
+				deleteCommand = value;
+			}
+		}
+
+		public SqlCommand InsertCommand {
+			get {
+				return insertCommand;
+			}
+			set {
+				insertCommand = value;
+			}
+		}
+
+		public SqlCommand SelectCommand {
+			get {
+				return selectCommand;
+			}
+			set {
+				selectCommand = value;
+			}
+		}
+
+		public SqlCommand UpdateCommand {
+			get {
+				return updateCommand;
+			}
+			set {
+				updateCommand = value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.DeleteCommand {
+			get { return DeleteCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				DeleteCommand = (SqlCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.InsertCommand {
+			get { return InsertCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				InsertCommand = (SqlCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.SelectCommand {
+			get { return SelectCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				SelectCommand = (SqlCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.UpdateCommand {
+			get { return UpdateCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				UpdateCommand = (SqlCommand)value;
+			}
+		}
+
+
+		ITableMappingCollection IDataAdapter.TableMappings {
+			get { return TableMappings; }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		protected override RowUpdatedEventArgs CreateRowUpdatedEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+		{
+			return new SqlRowUpdatedEventArgs (dataRow, command, statementType, tableMapping);
+		}
+
+
+		protected override RowUpdatingEventArgs CreateRowUpdatingEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+		{
+			return new SqlRowUpdatingEventArgs (dataRow, command, statementType, tableMapping);
+		}
+
+		protected override void OnRowUpdated (RowUpdatedEventArgs value) 
+		{
+         		SqlRowUpdatedEventHandler handler = (SqlRowUpdatedEventHandler) Events[EventRowUpdated];
+			if ((handler != null) && (value is SqlRowUpdatedEventArgs))
+            			handler(this, (SqlRowUpdatedEventArgs) value);
+		}
+
+		protected override void OnRowUpdating (RowUpdatingEventArgs value) 
+		{
+         		SqlRowUpdatingEventHandler handler = (SqlRowUpdatingEventHandler) Events[EventRowUpdating];
+			if ((handler != null) && (value is SqlRowUpdatingEventArgs))
+            			handler(this, (SqlRowUpdatingEventArgs) value);
+		}
+
+		#endregion // Methods
+
+		#region Events and Delegates
+
+		public event SqlRowUpdatedEventHandler RowUpdated {
+			add { Events.AddHandler (EventRowUpdated, value); }
+			remove { Events.RemoveHandler (EventRowUpdated, value); }
+		}
+
+		public event SqlRowUpdatingEventHandler RowUpdating {
+			add { Events.AddHandler (EventRowUpdating, value); }
+			remove { Events.RemoveHandler (EventRowUpdating, value); }
+		}
+
+		#endregion // Events and Delegates
+
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlDataReader.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlDataReader.cs
new file mode 100644
index 00000000000..28d0e1bc4e7
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlDataReader.cs
@@ -0,0 +1,422 @@
+//
+// System.Data.SqlClient.SqlDataReader.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+// (C) Daniel Morgan 2002
+//
+// Credits:
+//    SQL and concepts were used from libgda 0.8.190 (GNOME Data Access)

+//    http://www.gnome-db.org/

+//    with permission from the authors of the

+//    PostgreSQL provider in libgda:

+//        Michael Lausch <michael@lausch.at>
+//        Rodrigo Moya <rodrigo@gnome-db.org>
+//        Vivien Malerba <malerba@gnome-db.org>
+//        Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+//
+
+// *** uncomment #define to get debug messages, comment for production ***
+//#define DEBUG_SqlDataReader
+
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+
+namespace System.Data.SqlClient {
+	/// <summary>
+	/// Provides a means of reading one or more forward-only streams
+	/// of result sets obtained by executing a command 
+	/// at a SQL database.
+	/// </summary>
+	//public sealed class SqlDataReader : MarshalByRefObject,
+	//	IEnumerable, IDataReader, IDisposable, IDataRecord
+	public sealed class SqlDataReader : IEnumerable, 
+		IDataReader, IDataRecord {
+		#region Fields
+
+		private SqlCommand cmd;
+		private DataTable table = null;
+
+		// columns in a row
+		private object[] fields; // data value in a .NET type
+		private string[] types; // PostgreSQL Type
+		private bool[] isNull; // is NULL?
+		private int[] actualLength; // ActualLength of data
+		private DbType[] dbTypes; // DB data type
+		// actucalLength = -1 is variable-length
+				
+		private bool open = false;
+		IntPtr pgResult; // PGresult
+		private int rows;
+		private int cols;
+
+		private int recordsAffected = -1; // TODO: get this value
+
+		private int currentRow = -1; // no Read() has been done yet
+
+		#endregion // Fields
+
+		#region Constructors
+
+		internal SqlDataReader (SqlCommand sqlCmd) {
+
+			cmd = sqlCmd;
+			open = true;
+			cmd.OpenReader(this);
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		[MonoTODO]
+		public void Close() {
+			open = false;
+			
+			// free SqlDataReader resources in SqlCommand
+			// and allow SqlConnection to be used again
+			cmd.CloseReader();
+
+			// TODO: get parameters from result
+
+			// clear unmanaged PostgreSQL result set
+			PostgresLibrary.PQclear (pgResult);
+			pgResult = IntPtr.Zero;
+		}
+
+		[MonoTODO]
+		public DataTable GetSchemaTable() {
+			return table;
+		}
+
+		[MonoTODO]
+		public bool NextResult() {
+			SqlResult res;
+			currentRow = -1;
+			bool resultReturned;
+			
+			// reset
+			table = null;
+			pgResult = IntPtr.Zero;
+			rows = 0;
+			cols = 0;
+			types = null;
+			recordsAffected = -1;
+
+			res = cmd.NextResult();
+			resultReturned = res.ResultReturned;
+
+			if(resultReturned == true) {
+				table = res.Table;
+				pgResult = res.PgResult;
+				rows = res.RowCount;
+				cols = res.FieldCount;
+				types = res.PgTypes;
+				recordsAffected = res.RecordsAffected;
+			}
+			
+			res = null;
+			return resultReturned;
+		}
+
+		[MonoTODO]
+		public bool Read() {
+			
+			string dataValue;
+			int c = 0;
+			
+			if(currentRow < rows - 1)  {
+				
+				currentRow++;
+			
+				// re-init row
+				fields = new object[cols];
+				//dbTypes = new DbType[cols];
+				actualLength = new int[cols];
+				isNull = new bool[cols];
+			
+				for(c = 0; c < cols; c++) {
+
+					// get data value
+					dataValue = PostgresLibrary.
+						PQgetvalue(
+						pgResult,
+						currentRow, c);
+
+					// is column NULL?
+					//isNull[c] = PostgresLibrary.
+					//	PQgetisnull(pgResult,
+					//	currentRow, c);
+
+					// get Actual Length
+					actualLength[c] = PostgresLibrary.
+						PQgetlength(pgResult,
+						currentRow, c);
+
+					DbType dbType;	
+					dbType = PostgresHelper.
+						TypnameToSqlDbType(types[c]);
+
+					if(dataValue == null) {
+						fields[c] = null;
+						isNull[c] = true;
+					}
+					else if(dataValue.Equals("")) {
+						fields[c] = null;
+						isNull[c] = true;
+					}
+					else {
+						isNull[c] = false;
+						fields[c] = PostgresHelper.
+							ConvertDbTypeToSystem (
+							dbType,
+							dataValue);
+					}
+				}
+				return true;
+			}
+			return false; // EOF
+		}
+
+		[MonoTODO]
+		public byte GetByte(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public long GetBytes(int i, long fieldOffset, 
+			byte[] buffer, int bufferOffset, 
+			int length) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public char GetChar(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public long GetChars(int i, long fieldOffset, 
+			char[] buffer, int bufferOffset, 
+			int length) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public IDataReader GetData(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string GetDataTypeName(int i) {
+			return types[i];
+		}
+
+		[MonoTODO]
+		public DateTime GetDateTime(int i) {
+			return (DateTime) fields[i];
+		}
+
+		[MonoTODO]
+		public decimal GetDecimal(int i) {
+			return (decimal) fields[i];
+		}
+
+		[MonoTODO]
+		public double GetDouble(int i) {
+			return (double) fields[i];
+		}
+
+		[MonoTODO]
+		public Type GetFieldType(int i) {
+
+			DataRow row = table.Rows[i];
+			return Type.GetType((string)row["DataType"]);
+		}
+
+		[MonoTODO]
+		public float GetFloat(int i) {
+			return (float) fields[i];
+		}
+
+		[MonoTODO]
+		public Guid GetGuid(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public short GetInt16(int i) {
+			return (short) fields[i];
+		}
+
+		[MonoTODO]
+		public int GetInt32(int i) {
+			return (int) fields[i];
+		}
+
+		[MonoTODO]
+		public long GetInt64(int i) {
+			return (long) fields[i];
+		}
+
+		[MonoTODO]
+		public string GetName(int i) {
+
+			DataRow row = table.Rows[i];
+			return (string) row["ColumnName"];
+		}
+
+		[MonoTODO]
+		public int GetOrdinal(string name) {
+
+			int i;
+			DataRow row;
+
+			for(i = 0; i < table.Rows.Count; i++) {
+				row = table.Rows[i];
+				if(((string) row["ColumnName"]).Equals(name))
+					return i;
+			}
+
+			for(i = 0; i < table.Rows.Count; i++) {
+				string ta;
+				string n;
+					
+				row = table.Rows[i];
+				ta = ((string) row["ColumnName"]).ToUpper();
+				n = name.ToUpper();
+						
+				if(ta.Equals(n)) {
+					return i;
+				}
+			}
+			
+			throw new MissingFieldException("Missing field: " + name);
+		}
+
+		[MonoTODO]
+		public string GetString(int i) {
+			return (string) fields[i];
+		}
+
+		[MonoTODO]
+		public object GetValue(int i) {
+			return fields[i];
+		}
+
+		[MonoTODO]
+		public int GetValues(object[] values) 
+		{
+			Array.Copy (fields, values, fields.Length);
+			return fields.Length;
+		}
+
+		[MonoTODO]
+		public bool IsDBNull(int i) {
+			return isNull[i];
+		}
+
+		[MonoTODO]
+		public bool GetBoolean(int i) {
+			return (bool) fields[i];
+		}
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator() {
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Public Methods
+
+		#region Destructors
+
+		[MonoTODO]
+		public void Dispose () {
+		}
+
+		//[MonoTODO]
+		//~SqlDataReader() {
+		//}
+
+		#endregion // Destructors
+
+		#region Properties
+
+		public int Depth {
+			[MonoTODO]
+			get { 
+				return 0; // always return zero, unless
+				          // this provider will allow
+				          // nesting of a row
+			}
+		}
+
+		public bool IsClosed {
+			[MonoTODO]
+			get {
+				if(open == false)
+					return true;
+				else
+					return false;
+			}
+		}
+
+		public int RecordsAffected {
+			[MonoTODO]
+			get { 
+				return recordsAffected;
+			}
+		}
+	
+		public int FieldCount {
+			[MonoTODO]
+			get { 
+				return cols;
+			}
+		}
+
+		public object this[string name] {
+			[MonoTODO]
+			get { 
+				int i;
+				DataRow row;
+
+				for(i = 0; i < table.Rows.Count; i++) {
+					row = table.Rows[i];
+					if(row["ColumnName"].Equals(name))
+						return fields[i];
+				}
+
+				for(i = 0; i < table.Rows.Count; i++) {
+					string ta;
+					string n;
+					
+					row = table.Rows[i];
+					ta = ((string) row["ColumnName"]).ToUpper();
+					n = name.ToUpper();
+						
+					if(ta.Equals(n)) {
+						return fields[i];
+					}
+				}
+			
+				throw new MissingFieldException("Missing field: " + name);
+			}
+		}
+
+		public object this[int i] {
+			[MonoTODO]
+			get { 
+				return fields[i];
+			}
+		}
+
+		#endregion // Properties
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlError.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlError.cs
new file mode 100644
index 00000000000..e7c722285a9
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlError.cs
@@ -0,0 +1,155 @@
+//
+// System.Data.SqlClient.SqlError.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+using System;
+using System.Data;
+using System.Runtime.InteropServices;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Describes an error from a SQL database.
+	/// </summary>
+	[MonoTODO]
+	public sealed class SqlError
+	{
+		byte theClass = 0;
+		int lineNumber = 0;
+		string message = "";
+		int number = 0;
+		string procedure = "";
+		string server = "";
+		string source = "";
+		byte state = 0;
+
+		internal SqlError(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			this.theClass = theClass;
+			this.lineNumber = lineNumber;
+			this.message = message;
+			this.number = number;
+			this.procedure = procedure;
+			this.server = server;
+			this.source = source;
+			this.state = state;
+		}
+		
+		#region Properties
+
+		[MonoTODO]
+		/// <summary>
+		/// severity level of the error
+		/// </summary>
+		public byte Class {
+			get { 
+				return theClass;
+			}
+		}
+
+		[MonoTODO]
+		public int LineNumber {
+			get { 
+			   return lineNumber;
+		   }
+		}
+
+		[MonoTODO]
+		public string Message {
+			get { 
+				return message;
+			}
+		}
+		
+		[MonoTODO]
+		public int Number {
+			get { 
+				return number;
+			}
+		}
+
+		[MonoTODO]
+		public string Procedure {
+			get { 
+				return procedure;
+			}
+		}
+
+		[MonoTODO]
+		public string Server {
+			get { 
+				return server;
+			}
+		}
+
+		[MonoTODO]
+		public string Source {
+			get { 
+				return source;
+			}
+		}
+
+		[MonoTODO]
+		public byte State {
+			get { 
+				return state;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public override string ToString ()
+		{
+			String toStr;
+			String stackTrace;
+			stackTrace = " <Stack Trace>";
+			// FIXME: generate the correct SQL error string
+			toStr = "SqlError:" + message + stackTrace;
+			return toStr;
+		}
+
+		internal void SetClass(byte theClass) {
+			this.theClass = theClass;
+		}
+
+		internal void SetLineNumber(int lineNumber) {
+			this.lineNumber = lineNumber;
+		}
+
+		internal void SetMessage(string message) {
+			this.message = message;
+		}
+
+		internal void SetNumber(int number) {
+			this.number = number;
+		}
+
+		internal void SetProcedure(string procedure) {
+			this.procedure = procedure;
+		}
+
+		internal void SetServer(string server) {
+			this.server = server;
+		}
+
+		internal void SetSource(string source) {
+			this.source = source;
+		}
+
+		internal void SetState(byte state) {
+			this.state = state;
+		}
+
+		#endregion
+		
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlErrorCollection.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlErrorCollection.cs
new file mode 100644
index 00000000000..7050d5d08fa
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlErrorCollection.cs
@@ -0,0 +1,114 @@
+//
+// System.Data.SqlClient.SqlError.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+using System;
+using System.Collections;
+using System.Data;
+using System.Runtime.InteropServices;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Describes an error from a SQL database.
+	/// </summary>
+	[MonoTODO]
+	public sealed class SqlErrorCollection : ICollection, IEnumerable
+	{
+		ArrayList errorList = new ArrayList();
+
+		internal SqlErrorCollection() {
+		}
+
+		internal SqlErrorCollection(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			
+			Add (theClass, lineNumber, message,
+				number, procedure,
+				server, source, state);
+		}
+
+		#region Properties
+                
+		[MonoTODO]
+		public int Count {
+			get {	
+				return errorList.Count;
+			}			  
+		}
+
+		[MonoTODO]
+		public void CopyTo(Array array,	int index) {
+			throw new NotImplementedException ();
+		}
+
+		// [MonoTODO]
+		bool ICollection.IsSynchronized {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		// [MonoTODO]
+		object ICollection.SyncRoot {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator() {
+			throw new NotImplementedException ();
+		}
+		
+		// Index property (indexer)
+		// [MonoTODO]
+		public SqlError this[int index] {
+			get {
+				return (SqlError) errorList[index];
+			}
+		}
+
+		#endregion
+
+		#region Methods
+		
+		[MonoTODO]
+		public override string ToString()
+		{
+			throw new NotImplementedException ();
+		}
+		#endregion
+
+		internal void Add(SqlError error) {
+			errorList.Add(error);
+		}
+
+		internal void Add(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			
+			SqlError error = new SqlError(theClass,
+				lineNumber, message,
+				number, procedure,
+				server, source, state);
+			Add(error);
+		}
+
+		#region Destructors
+
+		[MonoTODO]
+		~SqlErrorCollection()
+		{
+			// FIXME: do the destructor - release resources
+		}
+
+		#endregion		
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlException.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlException.cs
new file mode 100644
index 00000000000..e447b599372
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlException.cs
@@ -0,0 +1,204 @@
+//
+// System.Data.SqlClient.SqlException.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc
+//
+using System;
+using System.Data;
+using System.Runtime.Serialization;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Exceptions, as returned by SQL databases.
+	/// </summary>
+	public sealed class SqlException : SystemException
+	{
+		private SqlErrorCollection errors; 
+
+		internal SqlException() 
+			: base("a SQL Exception has occurred") {
+			errors = new SqlErrorCollection();
+		}
+
+		internal SqlException(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) 
+				: base(message) {	
+			
+			errors = new SqlErrorCollection (theClass, 
+				lineNumber, message,
+				number, procedure,
+				server, source, state);
+		}
+
+		#region Properties
+
+		[MonoTODO]
+		public byte Class {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception here?
+				else
+					return errors[0].Class;
+			}
+
+			set { 
+				errors[0].SetClass(value);
+			}
+		}
+
+		[MonoTODO]
+		public SqlErrorCollection Errors {
+			get { 
+				return errors;
+			}
+
+			set { 
+				errors = value;
+			}
+		}
+
+		[MonoTODO]
+		public int LineNumber {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception here?
+				return errors[0].LineNumber;
+			}
+
+			set { 
+				errors[0].SetLineNumber(value);
+			}
+		}
+		
+		[MonoTODO]
+		public override string Message 	{
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else {
+					String msg = "";
+					int i = 0;
+					
+					for(i = 0; i < errors.Count - 1; i++) {
+						msg = msg + errors[i].Message + "\n";
+                                        }
+					msg = msg + errors[i].Message;
+
+					return msg;
+				}
+			}
+		}
+		
+		[MonoTODO]
+		public int Number {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception?
+				else
+					return errors[0].Number;
+			}
+
+			set { 
+				errors[0].SetNumber(value);
+			}
+		}
+		
+		[MonoTODO]
+		public string Procedure {
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else
+					return errors[0].Procedure;
+			}
+
+			set { 
+				errors[0].SetProcedure(value);
+			}
+		}
+
+		[MonoTODO]
+		public string Server {
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else
+					return errors[0].Server;
+			}
+
+			set { 
+				errors[0].SetServer(value);
+			}
+		}
+		
+		[MonoTODO]
+		public override string Source {
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else
+					return errors[0].Source;
+			}
+
+			set { 
+				errors[0].SetSource(value);
+			}
+		}
+
+		[MonoTODO]
+		public byte State {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception?
+				else
+					return errors[0].State;
+			}
+
+			set { 
+				errors[0].SetState(value);
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public override void GetObjectData(SerializationInfo si,
+			StreamingContext context) {
+			// FIXME: to do
+		}
+
+		// [Serializable]
+		// [ClassInterface(ClassInterfaceType.AutoDual)]
+		public override string ToString() {
+			String toStr = "";
+			for (int i = 0; i < errors.Count; i++) {
+				toStr = toStr + errors[i].ToString() + "\n";
+			}
+			return toStr;
+		}
+
+		internal void Add(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			
+			errors.Add (theClass, lineNumber, message,
+				number, procedure,
+				server, source, state);
+		}
+
+		[MonoTODO]
+		~SqlException() {
+			// FIXME: destructor to release resources
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventArgs.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventArgs.cs
new file mode 100644
index 00000000000..df69dff1d35
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventArgs.cs
@@ -0,0 +1,51 @@
+//
+// System.Data.SqlClient.SqlInfoMessageEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public sealed class SqlInfoMessageEventArgs : EventArgs
+	{
+		[MonoTODO]
+		public SqlErrorCollection Errors {
+			get { 
+				throw new NotImplementedException (); 
+			}
+		}	
+
+		[MonoTODO]
+		public string Message 
+		{
+			get { 
+				throw new NotImplementedException (); 
+			}
+		}	
+
+		[MonoTODO]
+		public string Source {
+			get { 
+				throw new NotImplementedException (); 
+			}
+		}
+
+		[MonoTODO]
+		public override string ToString() {
+			// representation of InfoMessage event
+			return "'ToString() for SqlInfoMessageEventArgs Not Implemented'";
+		}
+
+		//[MonoTODO]
+		//~SqlInfoMessageEventArgs() {
+			// FIXME: destructor needs to release resources
+		//}
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventHandler.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventHandler.cs
new file mode 100644
index 00000000000..c9862d61c03
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventHandler.cs
@@ -0,0 +1,19 @@
+//
+// System.Data.SqlClient.SqlInfoMessageEventHandler.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public delegate void 
+	SqlInfoMessageEventHandler (object sender,
+				SqlInfoMessageEventArgs e);
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlParameter.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlParameter.cs
new file mode 100644
index 00000000000..6c05695eafc
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlParameter.cs
@@ -0,0 +1,237 @@
+//
+// System.Data.SqlClient.SqlParameter.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc. 2002
+//
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Represents a parameter to a Command object, and optionally, 
+	/// its mapping to DataSet columns; and is implemented by .NET 
+	/// data providers that access data sources.
+	/// </summary>
+	//public sealed class SqlParameter : MarshalByRefObject,
+	//	IDbDataParameter, IDataParameter, ICloneable
+	public sealed class SqlParameter : IDbDataParameter, IDataParameter
+	{
+		private string parmName;
+		private SqlDbType dbtype;
+		private DbType    theDbType;
+		private object objValue;
+		private int size;
+		private string sourceColumn;
+		private ParameterDirection direction;
+		private bool isNullable;
+		private byte precision;
+		private byte scale;
+		private DataRowVersion sourceVersion;
+		private int offset;
+
+		[MonoTODO]
+		public SqlParameter () {
+		
+		}
+
+		[MonoTODO]
+		public SqlParameter (string parameterName, object value) {
+			this.parmName = parameterName;
+			this.objValue = value;
+		}
+		
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType) {
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+		}
+
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType,
+			int size) {
+
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+			this.size = size;
+		}
+		
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType,
+			int size, string sourceColumn) {
+
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+			this.size = size;
+			this.sourceColumn = sourceColumn;
+		}
+			 
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType,
+			int size, ParameterDirection direction, 
+			bool isNullable, byte precision,
+			byte scale, string sourceColumn,
+			DataRowVersion sourceVersion, object value) {
+			
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+			this.size = size;
+			this.sourceColumn = sourceColumn;
+			this.direction = direction;
+			this.isNullable = isNullable;
+			this.precision = precision;
+			this.scale = scale;
+			this.sourceVersion = sourceVersion;
+			this.objValue = value;
+		}
+
+		[MonoTODO]
+		public DbType DbType {
+			get { 
+				return theDbType;
+			}
+			set { 
+				theDbType = value;
+			}
+		}
+
+		[MonoTODO]
+		public ParameterDirection Direction {
+			get { 
+				return direction;
+			}
+			set { 
+				direction = value;
+			}
+		}
+
+		[MonoTODO]
+		public bool IsNullable	{
+			get { 
+				return isNullable;
+			}
+		}
+
+		[MonoTODO]
+		public int Offset {
+			get {
+				return offset;
+			}
+			
+			set {
+				offset = value;
+			}
+		}
+
+		
+		string IDataParameter.ParameterName {
+			get { 
+				return parmName;
+			}
+
+			set { 
+				parmName = value;
+			}
+		}
+		
+		public string ParameterName {
+			get { 
+				return parmName;
+			}
+
+			set { 
+				parmName = value;
+			}
+		}
+
+		[MonoTODO]
+		public string SourceColumn {
+			get { 
+				return sourceColumn;
+			}
+
+			set { 
+				sourceColumn = value;
+			}
+		}
+
+		[MonoTODO]
+		public DataRowVersion SourceVersion {
+			get { 
+				return sourceVersion;
+			}
+
+			set { 
+				sourceVersion = value;
+			}
+		}
+		
+		[MonoTODO]
+		public SqlDbType SqlDbType {
+			get {
+				return dbtype;
+			}
+			
+			set {
+				dbtype = value;
+			}
+		}
+
+		[MonoTODO]
+		public object Value {
+			get { 
+				return objValue;
+			}
+
+			set { 
+				objValue = value;
+			}
+		}
+
+		[MonoTODO]
+		public byte Precision {
+			get { 
+				return precision;
+			}
+
+			set { 
+				precision = value;
+			}
+		}
+
+		[MonoTODO]
+                public byte Scale {
+			get { 
+				return scale;
+			}
+
+			set { 
+				scale = value;
+			}
+		}
+
+		[MonoTODO]
+                public int Size
+		{
+			get { 
+				return size;
+			}
+
+			set { 
+				size = value;
+			}
+		}
+
+		[MonoTODO]
+		public override string ToString() {
+			return parmName;
+		}
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlParameterCollection.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlParameterCollection.cs
new file mode 100644
index 00000000000..c1778299b86
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlParameterCollection.cs
@@ -0,0 +1,267 @@
+//
+// System.Data.SqlClient.SqlParameterCollection.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Collections;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Collects all parameters relevant to a Command object 
+	/// and their mappings to DataSet columns.
+	/// </summary>
+	// public sealed class SqlParameterCollection : MarshalByRefObject,
+	// IDataParameterCollection, IList, ICollection, IEnumerable
+	public sealed class SqlParameterCollection : IDataParameterCollection,
+		IList
+	{
+		private ArrayList parameterList = new ArrayList();
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator()
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		public int Add(	object value)
+		{
+			// Call the add version that receives a SqlParameter 
+			
+			// Check if value is a SqlParameter.
+			CheckType(value);
+			Add((SqlParameter) value);
+
+			return IndexOf (value);
+		}
+
+		
+		public SqlParameter Add(SqlParameter value)
+		{
+			parameterList.Add(value);
+			return value;
+		}
+
+		
+		public SqlParameter Add(string parameterName, object value)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.Value = value;
+			// TODO: Get the dbtype and Sqldbtype from system type of value.
+			
+			return Add(sqlparam);
+		}
+
+		
+		public SqlParameter Add(string parameterName, SqlDbType sqlDbType)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.ParameterName = parameterName;
+			sqlparam.SqlDbType = sqlDbType;
+			return Add(sqlparam);			
+		}
+
+		
+		public SqlParameter Add(string parameterName,
+			SqlDbType sqlDbType, int size)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.ParameterName = parameterName;
+			sqlparam.SqlDbType = sqlDbType;
+			sqlparam.Size = size;
+			return Add(sqlparam);			
+		}
+
+		
+		public SqlParameter Add(string parameterName,
+			SqlDbType sqlDbType, int size, string sourceColumn)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.ParameterName = parameterName;
+			sqlparam.SqlDbType = sqlDbType;
+			sqlparam.Size = size;
+			sqlparam.SourceColumn = sourceColumn;
+			return Add(sqlparam);			
+		}
+
+		[MonoTODO]
+		public void Clear()
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		public bool Contains(object value)
+		{
+			// Check if value is a SqlParameter
+			CheckType(value);
+			return Contains(((SqlParameter)value).ParameterName);
+		}
+
+
+		[MonoTODO]
+		public bool Contains(string value)
+		{
+			for(int p = 0; p < parameterList.Count; p++) {
+				if(((SqlParameter)parameterList[p]).ParameterName.Equals(value))
+					return true;
+			}
+			return false;
+		}
+
+		[MonoTODO]
+		public void CopyTo(Array array,	int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		public int IndexOf(object value)
+		{
+			// Check if value is a SqlParameter
+			CheckType(value);
+			return IndexOf(((SqlParameter)value).ParameterName);
+		}
+
+		
+		public int IndexOf(string parameterName)
+		{
+			int p = -1;
+
+			for(p = 0; p < parameterList.Count; p++) {
+				if(((SqlParameter)parameterList[p]).ParameterName.Equals(parameterName))
+					return p;
+			}
+			return p;
+		}
+
+		[MonoTODO]
+		public void Insert(int index, object value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Remove(object value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RemoveAt(int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RemoveAt(string parameterName)
+		{
+			throw new NotImplementedException ();
+		}
+	
+		[MonoTODO]
+		public int Count {
+			get {	
+				return parameterList.Count;
+			}			  
+		}
+
+		object IList.this[int index] {
+			[MonoTODO]
+			get { 
+				return (SqlParameter) this[index];
+			}
+			
+			[MonoTODO]
+			set { 
+				this[index] = (SqlParameter) value;
+			}
+		}
+
+		public SqlParameter this[int index] {
+			get {	
+				return (SqlParameter) parameterList[index];
+			}			  
+			
+			set {	
+				parameterList[index] = (SqlParameter) value;
+			}			  
+		}
+
+		object IDataParameterCollection.this[string parameterName] {
+			[MonoTODO]
+			get { 
+				return this[parameterName];
+			}
+			
+			[MonoTODO]
+			set { 
+				CheckType(value);
+				this[parameterName] = (SqlParameter) value;
+			}
+		}
+
+		public SqlParameter this[string parameterName] {
+			get {	
+				for(int p = 0; p < parameterList.Count; p++) {
+					if(parameterName.Equals(((SqlParameter)parameterList[p]).ParameterName))
+						return (SqlParameter) parameterList[p];
+				}
+				throw new IndexOutOfRangeException("The specified name does not exist: " + parameterName);
+			}	  
+			
+			set {	
+				for(int p = 0; p < parameterList.Count; p++) {
+					if(parameterName.Equals(((SqlParameter)parameterList[p]).ParameterName))
+						parameterList[p] = value;
+				}
+				throw new IndexOutOfRangeException("The specified name does not exist: " + parameterName);
+			}			  
+		}
+
+		bool IList.IsFixedSize {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		bool IList.IsReadOnly {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		bool ICollection.IsSynchronized {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		object ICollection.SyncRoot {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+		
+		/// <summary>
+		/// This method checks if the parameter value is of 
+		/// SqlParameter type. If it doesn't, throws an InvalidCastException.
+		/// </summary>
+		private void CheckType(object value)
+		{
+			if(!(value is SqlParameter))
+				throw new InvalidCastException("Only SQLParameter objects can be used.");
+		}
+		
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventArgs.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventArgs.cs
new file mode 100644
index 00000000000..dbc5789aa95
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventArgs.cs
@@ -0,0 +1,37 @@
+//
+// System.Data.SqlClient.SqlRowUpdatedEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient {
+	public sealed class SqlRowUpdatedEventArgs : RowUpdatedEventArgs 
+	{
+		[MonoTODO]
+		public SqlRowUpdatedEventArgs (DataRow row, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+			: base (row, command, statementType, tableMapping)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public new SqlCommand Command {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		~SqlRowUpdatedEventArgs () 
+		{
+			throw new NotImplementedException ();
+		}
+
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventHandler.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventHandler.cs
new file mode 100644
index 00000000000..8cad2f1cbca
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.SqlClient.SqlRowUpdatedEventHandler.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public delegate void SqlRowUpdatedEventHandler(object sender,
+					SqlRowUpdatedEventArgs e);
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventArgs.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventArgs.cs
new file mode 100644
index 00000000000..6194ca1f95d
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventArgs.cs
@@ -0,0 +1,43 @@
+//
+// System.Data.SqlClient.SqlRowUpdatingEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient
+{
+	public sealed class SqlRowUpdatingEventArgs : RowUpdatingEventArgs
+	{
+		[MonoTODO]
+		public SqlRowUpdatingEventArgs (DataRow row, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+			: base (row, command, statementType, tableMapping)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public new SqlCommand Command {
+			get {
+				throw new NotImplementedException ();
+			} 
+			
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		~SqlRowUpdatingEventArgs() 
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventHandler.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventHandler.cs
new file mode 100644
index 00000000000..69c0228534d
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.SqlClient.SqlRowUpdatingEventHandler.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public delegate void SqlRowUpdatingEventHandler(object sender,
+			SqlRowUpdatingEventArgs e);
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlTransaction.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlTransaction.cs
new file mode 100644
index 00000000000..3a485b299c5
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PgSqlTransaction.cs
@@ -0,0 +1,191 @@
+//
+// System.Data.SqlClient.SqlTransaction.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc. 2002
+//
+
+// use #define DEBUG_SqlTransaction if you want to spew debug messages
+// #define DEBUG_SqlTransaction
+
+
+using System;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Represents a transaction to be performed on a SQL database.
+	/// </summary>
+	// public sealed class SqlTransaction : MarshalByRefObject,
+	//	IDbTransaction, IDisposable
+	public sealed class SqlTransaction : IDbTransaction
+	{
+		#region Fields
+
+		private bool doingTransaction = false;
+		private SqlConnection conn = null;
+		private IsolationLevel isolationLevel =	
+			IsolationLevel.ReadCommitted;
+		// There are only two IsolationLevel's for PostgreSQL:
+		//    ReadCommitted and Serializable, 
+		// but ReadCommitted is the default 
+		
+		#endregion
+               
+		#region Public Methods
+
+		[MonoTODO]
+		public void Commit ()
+		{
+			if(doingTransaction == false)
+				throw new InvalidOperationException(
+					"Begin transaction was not " +
+					"done earlier " +
+					"thus PostgreSQL can not " +
+					"Commit transaction.");
+			
+			SqlCommand cmd = new SqlCommand("COMMIT", conn);
+			cmd.ExecuteNonQuery();
+						
+			doingTransaction = false;
+		}		
+
+		[MonoTODO]
+		public void Rollback()
+		{
+			if(doingTransaction == false)
+				throw new InvalidOperationException(
+					"Begin transaction was not " +
+					"done earlier " +
+					"thus PostgreSQL can not " +
+					"Rollback transaction.");
+			
+			SqlCommand cmd = new SqlCommand("ROLLBACK", conn);
+			cmd.ExecuteNonQuery();
+						
+			doingTransaction = false;
+		}
+
+		// For PostgreSQL, Rollback(string) will not be implemented
+		// because PostgreSQL does not support Savepoints
+		[Obsolete]
+		public void Rollback(string transactionName) {
+			// throw new NotImplementedException ();
+			Rollback();
+		}
+
+		// For PostgreSQL, Save(string) will not be implemented
+		// because PostgreSQL does not support Savepoints
+		[Obsolete]
+		public void Save (string savePointName) {
+			// throw new NotImplementedException ();
+		}
+
+		#endregion // Public Methods
+
+		#region Internal Methods to System.Data.dll Assembly
+
+		internal void Begin()
+		{
+			if(doingTransaction == true)
+				throw new InvalidOperationException(
+					"Transaction has begun " +
+					"and PostgreSQL does not " +
+					"support nested transactions.");
+			
+			SqlCommand cmd = new SqlCommand("BEGIN", conn);
+			cmd.ExecuteNonQuery();
+						
+			doingTransaction = true;
+		}
+
+		internal void SetIsolationLevel(IsolationLevel isoLevel)
+		{
+			String sSql = "SET TRANSACTION ISOLATION LEVEL ";
+ 
+			switch (isoLevel) 

+			{
+				case IsolationLevel.ReadCommitted:
+					sSql += "READ COMMITTED";
+					break;
+
+				case IsolationLevel.Serializable:
+					sSql += "SERIALIZABLE";
+					break;
+
+				default:
+					// FIXME: generate exception here
+					// PostgreSQL only supports:
+					//   ReadCommitted or Serializable
+					break;
+			}
+			SqlCommand cmd = new SqlCommand(sSql, conn);
+			cmd.ExecuteNonQuery();
+
+			this.isolationLevel = isoLevel;
+		}
+
+		internal void SetConnection(SqlConnection connection)
+		{
+			this.conn = connection;
+		}
+
+		#endregion // Internal Methods to System.Data.dll Assembly
+
+		#region Properties
+
+		IDbConnection IDbTransaction.Connection	{
+			get { 
+				return Connection; 
+			}
+		}
+
+		public SqlConnection Connection	{
+			get { 
+				return conn; 
+			}
+		}
+
+		public IsolationLevel IsolationLevel {
+			get { 
+				return isolationLevel; 
+			}
+		}
+
+		internal bool DoingTransaction {
+			get {
+				return doingTransaction;
+			}
+		}
+
+		#endregion Properties
+
+		#region Destructors
+
+		// Destructors aka Finalize and Dispose
+
+		[MonoTODO]
+		public void Dispose()
+		{
+			// FIXME: need to properly release resources
+			// Dispose(true);
+		}
+
+		// Destructor 
+		[MonoTODO]
+		// [Serializable]

+		// [ClassInterface(ClassInterfaceType.AutoDual)]
+		~SqlTransaction() {
+			// FIXME: need to properly release resources
+			// Dispose(false);
+		}
+
+		#endregion // Destructors
+
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PostgresLibrary.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PostgresLibrary.cs
new file mode 100644
index 00000000000..493afcd49e2
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PostgresLibrary.cs
@@ -0,0 +1,475 @@
+//
+// System.Data.SqlClient.PostgresLibrary.cs  
+//
+// PInvoke methods to libpq
+// which is PostgreSQL client library
+//
+// May also contain enumerations,
+// data types, or wrapper methods.
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+// *** uncomment #define to get debug messages, comment for production ***
+//#define DEBUG_PostgresLibrary
+
+using System;
+using System.Data;
+using System.Runtime.InteropServices;
+using System.Diagnostics;
+using System.Collections;
+
+namespace System.Data.SqlClient {
+
+	/* IMPORTANT: DO NOT CHANGE ANY OF THESE ENUMS BELOW */
+	
+	internal enum ConnStatusType
+	{
+		CONNECTION_OK,
+		CONNECTION_BAD,
+		CONNECTION_STARTED,
+		CONNECTION_MADE,
+		CONNECTION_AWAITING_RESPONSE,
+		CONNECTION_AUTH_OK,			 
+		CONNECTION_SETENV		
+	} 
+
+	internal enum PostgresPollingStatusType
+	{
+		PGRES_POLLING_FAILED = 0,
+		PGRES_POLLING_READING,
+		PGRES_POLLING_WRITING,
+		PGRES_POLLING_OK,
+		PGRES_POLLING_ACTIVE
+	}
+
+	internal enum ExecStatusType
+	{
+		PGRES_EMPTY_QUERY = 0,
+		PGRES_COMMAND_OK,			
+		PGRES_TUPLES_OK,			
+		PGRES_COPY_OUT,				
+		PGRES_COPY_IN,				
+		PGRES_BAD_RESPONSE,			
+		PGRES_NONFATAL_ERROR,
+		PGRES_FATAL_ERROR
+	}
+
+	sealed internal class PostgresLibrary
+	{
+		#region PInvoke Functions
+
+		// pinvoke prototypes to PostgreSQL client library
+		// pq.dll on windows and libpq.so on linux
+
+		[DllImport("pq")]
+		public static extern IntPtr PQconnectStart (string conninfo);
+		// PGconn *PQconnectStart(const char *conninfo);
+
+		[DllImport("pq")]
+		public static extern PostgresPollingStatusType PQconnectPoll (IntPtr conn);
+		// PostgresPollingStatusType PQconnectPoll(PGconn *conn);	
+
+		[DllImport("pq")]
+		public static extern IntPtr PQconnectdb (string conninfo);
+		// PGconn *PQconnectdb(const char *conninfo);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQsetdbLogin (string pghost, 
+			string pgport, string pgoptions, 
+			string pgtty, string dbName, 
+			string login, string pwd);
+		// PGconn *PQsetdbLogin(const char *pghost, 
+		//		const char *pgport, const char *pgoptions, 
+		//		const char *pgtty, const char *dbName, 
+		//		const char *login, const char *pwd);
+
+		[DllImport("pq")]
+		public static extern void PQfinish (IntPtr conn);
+		// void PQfinish(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQconndefaults ();
+		// PQconninfoOption *PQconndefaults(void);
+
+		[DllImport("pq")]
+		public static extern void PQconninfoFree (IntPtr connOptions);
+		// void PQconninfoFree(PQconninfoOption *connOptions);
+
+		[DllImport("pq")]
+		public static extern int PQresetStart (IntPtr conn);
+		// int PQresetStart(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQresetPoll (IntPtr conn);
+		// PostgresPollingStatusType PQresetPoll(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern void PQreset (IntPtr conn);
+		// void PQreset(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQrequestCancel (IntPtr conn);
+		// int PQrequestCancel(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQdb (IntPtr conn);
+		// char *PQdb(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQuser (IntPtr conn);
+		// char *PQuser(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQpass (IntPtr conn);
+		// char *PQpass(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQhost (IntPtr conn);
+		// char *PQhost(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQport (IntPtr conn);
+		// char *PQport(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQtty (IntPtr conn);
+		// char *PQtty(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQoptions (IntPtr conn);
+		// char *PQoptions(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern ConnStatusType PQstatus (IntPtr conn);
+		// ConnStatusType PQstatus(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQerrorMessage (IntPtr conn);
+		// char *PQerrorMessage(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQsocket (IntPtr conn);
+		// int PQsocket(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQbackendPID (IntPtr conn);
+		// int PQbackendPID(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQclientEncoding (IntPtr conn);
+		// int PQclientEncoding(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQsetClientEncoding (IntPtr conn,
+			string encoding);
+		// int PQsetClientEncoding(PGconn *conn, 
+		//		const char *encoding);
+
+		//FIXME: when loading, causes runtime exception
+		//[DllImport("pq")]
+		//public static extern IntPtr PQgetssl (IntPtr conn);
+		// SSL *PQgetssl(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern void PQtrace (IntPtr conn, 
+			IntPtr debug_port);
+		// void PQtrace(PGconn *conn, 
+		//		FILE *debug_port);
+
+		[DllImport("pq")]
+		public static extern void PQuntrace (IntPtr conn);
+		// void PQuntrace(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQsetNoticeProcessor (IntPtr conn,
+			IntPtr proc, IntPtr arg);
+		// PQnoticeProcessor PQsetNoticeProcessor(PGconn *conn, 
+		//		PQnoticeProcessor proc, void *arg);
+
+		[DllImport("pq")]
+		public static extern int PQescapeString (string to,
+                        string from, int length);
+		// size_t PQescapeString(char *to, 
+                //      const char *from, size_t length);
+
+		[DllImport("pq")]
+		public static extern string PQescapeBytea (string bintext,
+                        int binlen, IntPtr bytealen);
+		// unsigned char *PQescapeBytea(unsigned char *bintext, 
+                //      size_t binlen, size_t *bytealen);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQexec (IntPtr conn,
+                        string query);
+		// PGresult *PQexec(PGconn *conn, 
+                //      const char *query);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQnotifies (IntPtr conn);
+		// PGnotify *PQnotifies(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern void PQfreeNotify (IntPtr notify);
+		// void PQfreeNotify(PGnotify *notify);
+
+		[DllImport("pq")]
+		public static extern int PQsendQuery (IntPtr conn,
+                        string query);
+		// int PQsendQuery(PGconn *conn, 
+                //      const char *query);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQgetResult (IntPtr conn);
+		// PGresult *PQgetResult(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQisBusy (IntPtr conn);
+		// int PQisBusy(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQconsumeInput (IntPtr conn);
+		// int PQconsumeInput(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQgetline (IntPtr conn,
+                        string str, int length);
+		// int PQgetline(PGconn *conn,
+                //      char *string, int length);
+
+		[DllImport("pq")]
+		public static extern int PQputline (IntPtr conn,
+                        string str);
+		// int PQputline(PGconn *conn, 
+                //      const char *string);
+
+		[DllImport("pq")]
+		public static extern int PQgetlineAsync (IntPtr conn,
+                        string buffer, int bufsize);
+		// int PQgetlineAsync(PGconn *conn, char *buffer,
+                //      int bufsize);
+
+		[DllImport("pq")]
+		public static extern int PQputnbytes (IntPtr conn,
+                        string buffer, int nbytes);
+		// int PQputnbytes(PGconn *conn, 
+                //const char *buffer, int nbytes);
+
+		[DllImport("pq")]
+		public static extern int PQendcopy (IntPtr conn);
+		// int PQendcopy(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQsetnonblocking (IntPtr conn,
+                        int arg);
+		// int PQsetnonblocking(PGconn *conn, int arg);
+
+		[DllImport("pq")]
+		public static extern int PQisnonblocking (IntPtr conn);
+		// int PQisnonblocking(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQflush (IntPtr conn);
+		// int PQflush(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQfn (IntPtr conn, int fnid, 
+                        IntPtr result_buf, IntPtr result_len, 
+                        int result_is_int, IntPtr args,
+                        int nargs);
+		// PGresult *PQfn(PGconn *conn, int fnid, 
+                //      int *result_buf, int *result_len, 
+                //      int result_is_int, const PQArgBlock *args,
+                //      int nargs);
+
+		[DllImport("pq")]
+		public static extern ExecStatusType PQresultStatus (IntPtr res);
+		// ExecStatusType PQresultStatus(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQresStatus (ExecStatusType status);
+		// char *PQresStatus(ExecStatusType status);
+
+		[DllImport("pq")]
+		public static extern string PQresultErrorMessage (IntPtr res);
+		// char *PQresultErrorMessage(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQntuples (IntPtr res);
+		// int PQntuples(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQnfields (IntPtr res);
+		// int PQnfields(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQbinaryTuples (IntPtr res);
+		// int PQbinaryTuples(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQfname (IntPtr res,
+                        int field_num);
+		// char *PQfname(const PGresult *res,
+                //      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfnumber (IntPtr res,
+                        string field_name);
+		// int PQfnumber(const PGresult *res, 
+                //      const char *field_name);
+
+		[DllImport("pq")]
+		public static extern int PQftype (IntPtr res,
+                        int field_num);
+		// Oid PQftype(const PGresult *res,
+                //      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfsize (IntPtr res,
+                        int field_num);
+		// int PQfsize(const PGresult *res,
+                //      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfmod (IntPtr res, int field_num);
+		// int PQfmod(const PGresult *res, int field_num);
+
+		[DllImport("pq")]
+		public static extern string PQcmdStatus (IntPtr res);
+		// char *PQcmdStatus(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQoidStatus (IntPtr res);
+		// char *PQoidStatus(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQoidValue (IntPtr res);
+		// Oid PQoidValue(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQcmdTuples (IntPtr res);
+		// char *PQcmdTuples(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQgetvalue (IntPtr res,
+                        int tup_num, int field_num);
+		// char *PQgetvalue(const PGresult *res,
+                //      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQgetlength (IntPtr res,
+                        int tup_num, int field_num);
+		// int PQgetlength(const PGresult *res,
+                //      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQgetisnull (IntPtr res,
+                        int tup_num, int field_num);
+		// int PQgetisnull(const PGresult *res,
+                //      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern void PQclear (IntPtr res);
+		// void PQclear(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQmakeEmptyPGresult (IntPtr conn,
+                        IntPtr status);
+		// PGresult *PQmakeEmptyPGresult(PGconn *conn,
+                //      ExecStatusType status);
+
+		[DllImport("pq")]
+		public static extern void PQprint (IntPtr fout,
+                        IntPtr res, IntPtr ps);
+		// void PQprint(FILE *fout,
+                //      const PGresult *res, const PQprintOpt *ps);
+
+		[DllImport("pq")]
+		public static extern void PQdisplayTuples (IntPtr res,
+                        IntPtr fp, int fillAlign, string fieldSep, 
+                        int printHeader, int quiet);
+		// void PQdisplayTuples(const PGresult *res, 
+                //	FILE *fp, int fillAlign, const char *fieldSep, 
+                //	int printHeader, int quiet);
+
+		[DllImport("pq")]
+		public static extern void PQprintTuples (IntPtr res,
+			IntPtr fout, int printAttName, int terseOutput, 
+			int width);
+		// void PQprintTuples(const PGresult *res,
+		//	FILE *fout, int printAttName, int terseOutput, 
+		//	int width);						
+
+		[DllImport("pq")]
+		public static extern int lo_open (IntPtr conn,
+			int lobjId, int mode);
+		// int lo_open(PGconn *conn,
+		//	Oid lobjId, int mode);
+
+		[DllImport("pq")]
+		public static extern int lo_close (IntPtr conn, int fd);
+		// int lo_close(PGconn *conn, int fd);
+
+		[DllImport("pq")]
+		public static extern int lo_read (IntPtr conn,
+			int fd, string buf, int len);
+		// int lo_read(PGconn *conn,
+		//	int fd, char *buf, size_t len);
+
+		[DllImport("pq")]
+		public static extern int lo_write (IntPtr conn,
+			int fd, string buf, int len);
+		// int lo_write(PGconn *conn,
+		//	int fd, char *buf, size_t len);
+
+		[DllImport("pq")]
+		public static extern int lo_lseek (IntPtr conn,
+			int fd, int offset, int whence);
+		// int lo_lseek(PGconn *conn, 
+		//	int fd, int offset, int whence);
+
+		[DllImport("pq")]
+		public static extern int lo_creat (IntPtr conn,
+			int mode);
+		// Oid lo_creat(PGconn *conn,
+		//	int mode);
+
+		[DllImport("pq")]
+		public static extern int lo_tell (IntPtr conn, int fd);
+		// int lo_tell(PGconn *conn, int fd);
+
+		[DllImport("pq")]
+		public static extern int lo_unlink (IntPtr conn,
+			int lobjId);
+		// int lo_unlink(PGconn *conn,
+		//	Oid lobjId);
+
+		[DllImport("pq")]
+		public static extern int lo_import (IntPtr conn,
+			string filename);
+		// Oid lo_import(PGconn *conn,
+		//	const char *filename);
+
+		[DllImport("pq")]
+		public static extern int lo_export (IntPtr conn,
+			int lobjId, string filename);
+		// int lo_export(PGconn *conn,
+		//	Oid lobjId, const char *filename);
+
+		[DllImport("pq")]
+		public static extern int PQmblen (string s,
+			int encoding);
+		// int PQmblen(const unsigned char *s,
+		//	int encoding);
+
+		[DllImport("pq")]
+		public static extern int PQenv2encoding ();
+		// int PQenv2encoding(void);
+
+		#endregion
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PostgresTypes.cs b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PostgresTypes.cs
new file mode 100644
index 00000000000..6a086a82a42
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/Mono.Data.PostgreSqlClient/PostgresTypes.cs
@@ -0,0 +1,512 @@
+//

+// PostgresTypes.cs - holding methods to convert 

+//                    between PostgreSQL types and .NET types

+//

+// Author:

+//     Daniel Morgan <danmorg@sc.rr.com>

+//

+// (c)copyright 2002 Daniel Morgan

+//

+

+// Note: this might become PostgresType and PostgresTypeCollection

+//       also, the PostgresTypes that exist as an inner internal class

+//       within SqlConnection maybe moved here in the future

+

+using System;

+using System.Collections;

+using System.Data;

+using System.Data.Common;

+using System.Data.SqlClient;

+using System.Text;

+

+namespace System.Data.SqlClient {

+

+	internal struct PostgresType {

+		public int oid;

+		public string typname;

+		public DbType dbType;

+	}

+
+	sealed internal class PostgresHelper {
+
+		// translates the PostgreSQL typname to System.Data.DbType
+		public static DbType TypnameToSqlDbType(string typname) {

+			DbType sqlType;

+			

+			// FIXME: use hashtable here?

+

+			switch(typname) {

+

+			case "abstime":

+				sqlType = DbType.Int32;

+				break;

+

+			case "aclitem":

+				sqlType = DbType.String;

+				break;

+

+			case "bit":

+				sqlType = DbType.String;

+				break;

+

+			case "bool":

+				sqlType = DbType.Boolean;

+				break;

+

+			case "box":

+				sqlType = DbType.String;

+				break;

+

+			case "bpchar":

+				sqlType = DbType.String;

+				break;

+

+			case "bytea":

+				sqlType = DbType.String;

+				break;

+

+			case "char":

+				sqlType = DbType.String;

+				break;

+

+			case "cidr":

+				sqlType = DbType.String;

+				break;

+

+			case "circle":

+				sqlType = DbType.String;

+				break;

+

+			case "date":

+				sqlType = DbType.Date;

+				break;

+

+			case "float4":

+				sqlType = DbType.Single;

+				break;

+

+			case "float8":

+				sqlType = DbType.Double;

+				break;

+

+			case "inet":

+				sqlType = DbType.String;

+				break;

+

+			case "int2":

+				sqlType = DbType.Int16;

+				break;

+

+			case "int4":

+				sqlType = DbType.Int32;

+				break;

+

+			case "int8":

+				sqlType = DbType.Int64;

+				break;

+

+			case "interval":

+				sqlType = DbType.String;

+				break;

+

+			case "line":

+				sqlType = DbType.String;

+				break;

+

+			case "lseg":

+				sqlType = DbType.String;

+				break;

+

+			case "macaddr":

+				sqlType = DbType.String;

+				break;

+

+			case "money":

+				sqlType = DbType.Decimal;

+				break;

+

+			case "name":

+				sqlType = DbType.String;

+				break;

+

+			case "numeric":

+				sqlType = DbType.Decimal;

+				break;

+

+			case "oid":

+				sqlType = DbType.Int32;

+				break;

+

+			case "path":

+				sqlType = DbType.String;

+				break;

+

+			case "point":

+				sqlType = DbType.String;

+				break;

+

+			case "polygon":

+				sqlType = DbType.String;

+				break;

+

+			case "refcursor":

+				sqlType = DbType.String;

+				break;

+

+			case "reltime":

+				sqlType = DbType.String;

+				break;

+

+			case "text":

+				sqlType = DbType.String;

+				break;

+

+			case "time":

+				sqlType = DbType.Time;

+				break;

+

+			case "timestamp":

+				sqlType = DbType.DateTime;

+				break;

+

+			case "timestamptz":

+				sqlType = DbType.DateTime;

+				break;

+

+			case "timetz":

+				sqlType = DbType.DateTime;

+				break;

+

+			case "tinterval":

+				sqlType = DbType.String;

+				break;

+

+			case "varbit":

+				sqlType = DbType.String;

+				break;

+

+			case "varchar":

+				sqlType = DbType.String;

+				break;

+

+			default:

+				sqlType = DbType.String;

+				break;

+			}

+			return sqlType;

+		}

+		

+		// Converts data value from database to .NET System type.

+		public static object ConvertDbTypeToSystem (DbType typ, String value) {
+			object obj = null;
+
+			// FIXME: more types need 
+			//        to be converted 
+			//        from PostgreSQL oid type
+			//        to .NET System.<type>
+
+			// FIXME: need to handle a NULL for each type
+			//       maybe setting obj to System.DBNull.Value ?
+
+			
+			if(value == null) {
+				//Console.WriteLine("ConvertDbTypeToSystemDbType typ: " +
+				//	typ + " value is null");
+				return null;
+			}
+			else if(value.Equals("")) {
+				//Console.WriteLine("ConvertDbTypeToSystemDbType typ: " +
+				//	typ + " value is string empty");
+				return null;
+			}
+			
+			//Console.WriteLine("ConvertDbTypeToSystemDbType typ: " +
+			//	typ + " value: " + value);
+
+			// Date, Time, and DateTime 
+			// are parsed based on ISO format
+			// "YYYY-MM-DD hh:mi:ss.ms"
+
+			switch(typ) {
+			case DbType.String:
+				obj = String.Copy(value); 
+				break;
+			case DbType.Boolean:
+				obj = value.Equals("t");
+				break;
+			case DbType.Int16:

+				obj = Int16.Parse(value);

+				break;

+			case DbType.Int32:

+				obj = Int32.Parse(value);

+				break;

+			case DbType.Int64:

+				obj = Int64.Parse(value);

+				break;

+			case DbType.Decimal:

+				obj = Decimal.Parse(value);

+				break;

+			case DbType.Single:

+				obj = Single.Parse(value);

+				break;

+			case DbType.Double:

+				obj = Double.Parse(value);

+				break;

+			case DbType.Date:

+				String[] sd = value.Split(new Char[] {'-'});

+				obj = new DateTime(

+					Int32.Parse(sd[0]), Int32.Parse(sd[1]), Int32.Parse(sd[2]),

+					0,0,0);

+				break;

+			case DbType.Time:

+				String[] st = value.Split(new Char[] {':'});

+				obj = new DateTime(0001,01,01,

+					Int32.Parse(st[0]),Int32.Parse(st[1]),Int32.Parse(st[2]));

+				break;

+			case DbType.DateTime:

+				Int32 YYYY,MM,DD,hh,mi,ss,ms;

+				YYYY = Int32.Parse(value.Substring(0,4));

+				MM = Int32.Parse(value.Substring(5,2));

+				DD = Int32.Parse(value.Substring(8,2));

+				hh = Int32.Parse(value.Substring(11,2));

+				mi = Int32.Parse(value.Substring(14,2));

+				ss = Int32.Parse(value.Substring(17,2));

+				ms = Int32.Parse(value.Substring(20,2));

+				obj = new DateTime(YYYY,MM,DD,hh,mi,ss,ms);

+				break;

+			default:

+				obj = String.Copy(value);

+				break;

+			}
+
+			return obj;
+		}
+		
+		// Translates System.Data.DbType to System.Type
+		public static Type DbTypeToSystemType (DbType dType) {
+			// FIXME: more types need 
+			//        to be mapped
+			//        from PostgreSQL oid type
+			//        to .NET System.<type>
+
+			Type typ = null;
+
+			switch(dType) {
+			case DbType.String:
+				typ = typeof(String);
+				break;
+			case DbType.Boolean:
+				typ = typeof(Boolean);
+				break;
+			case DbType.Int16: 

+				typ = typeof(Int16);

+				break;

+			case DbType.Int32:

+				typ = typeof(Int32);

+				break;

+			case DbType.Int64:

+				typ = typeof(Int64);

+				break;

+			case DbType.Decimal:

+				typ = typeof(Decimal);

+				break;

+			case DbType.Single:

+				typ = typeof(Single);

+				break;

+			case DbType.Double:

+				typ = typeof(Double);

+				break;

+			case DbType.Date:

+			case DbType.Time:

+			case DbType.DateTime:

+				typ = typeof(DateTime);

+				break;

+			default:

+				typ = typeof(String);

+				break;

+			}
+			return typ;
+		}
+
+		// Find DbType for oid
+		// which requires a look up of PostgresTypes
+		// DbType <-> typname <-> oid
+		public static string OidToTypname (int oid, ArrayList pgTypes) {
+			// FIXME: more types need 
+			//        to be mapped
+			//        from PostgreSQL oid type
+			//        to .NET System.<type>
+			
+			string typname = "text"; // default
+			int i;
+			for(i = 0; i < pgTypes.Count; i++) {
+				PostgresType pt = (PostgresType) pgTypes[i];
+				if(pt.oid == oid) {
+					typname = pt.typname;
+					break; 
+				}
+			}
+
+			return typname;
+		}
+
+		// Convert a .NET System value type (Int32, String, Boolean, etc)
+		// to a string that can be included within a SQL statement.
+		// This is to methods provides the parameters support
+		// for the PostgreSQL .NET Data provider
+		public static string ObjectToString(DbType dbtype, object obj) {

+			

+			// TODO: how do we handle a NULL?

+			//if(isNull == true)

+			//	return "NULL";

+

+			string s;

+

+			// Date, Time, and DateTime are expressed in ISO format

+			// which is "YYYY-MM-DD hh:mm:ss.ms";

+			DateTime dt;

+			StringBuilder sb;

+

+			const string zero = "0";

+

+			switch(dbtype) {

+			case DbType.String:
+				s = "'" + obj + "'";
+				break;
+			case DbType.Boolean:
+				if((bool)obj == true)
+					s = "'t'";
+				else
+					s = "'f'";
+				break;
+			case DbType.Int16:

+				s = obj.ToString();

+				break;

+			case DbType.Int32:

+				s = obj.ToString();

+				break;

+			case DbType.Int64:

+				s = obj.ToString();

+				break;

+			case DbType.Decimal:

+				s = obj.ToString();

+				break;

+			case DbType.Single:

+				s = obj.ToString();

+				break;

+			case DbType.Double:

+				s = obj.ToString();

+				break;

+			case DbType.Date:

+				dt = (DateTime) obj;

+				sb = new StringBuilder();

+				sb.Append('\'');

+				// year

+				if(dt.Year < 10)

+					sb.Append("000" + dt.Year);

+				else if(dt.Year < 100)

+					sb.Append("00" + dt.Year);

+				else if(dt.Year < 1000)

+					sb.Append("0" + dt.Year);

+				else

+					sb.Append(dt.Year);

+				sb.Append("-");

+				// month

+				if(dt.Month < 10)

+					sb.Append(zero + dt.Month);

+				else

+					sb.Append(dt.Month);

+				sb.Append("-");

+				// day

+				if(dt.Day < 10)

+					sb.Append(zero + dt.Day);

+				else

+					sb.Append(dt.Day);

+				sb.Append('\'');

+				s = sb.ToString();

+				break;

+			case DbType.Time:

+				dt = (DateTime) obj;

+				sb = new StringBuilder();

+				sb.Append('\'');

+				// hour

+				if(dt.Hour < 10)

+					sb.Append(zero + dt.Hour);

+				else

+					sb.Append(dt.Hour);

+				sb.Append(":");

+				// minute

+				if(dt.Minute < 10)

+					sb.Append(zero + dt.Minute);

+				else

+					sb.Append(dt.Minute);

+				sb.Append(":");

+				// second

+				if(dt.Second < 10)

+					sb.Append(zero + dt.Second);

+				else

+					sb.Append(dt.Second);

+				sb.Append('\'');

+				s = sb.ToString();

+				break;

+			case DbType.DateTime:

+				dt = (DateTime) obj;

+				sb = new StringBuilder();

+				sb.Append('\'');

+				// year

+				if(dt.Year < 10)

+					sb.Append("000" + dt.Year);

+				else if(dt.Year < 100)

+					sb.Append("00" + dt.Year);

+				else if(dt.Year < 1000)

+					sb.Append("0" + dt.Year);

+				else

+					sb.Append(dt.Year);

+				sb.Append("-");

+				// month

+				if(dt.Month < 10)

+					sb.Append(zero + dt.Month);

+				else

+					sb.Append(dt.Month);

+				sb.Append("-");

+				// day

+				if(dt.Day < 10)

+					sb.Append(zero + dt.Day);

+				else

+					sb.Append(dt.Day);

+				sb.Append(" ");

+				// hour

+				if(dt.Hour < 10)

+					sb.Append(zero + dt.Hour);

+				else

+					sb.Append(dt.Hour);

+				sb.Append(":");

+				// minute

+				if(dt.Minute < 10)

+					sb.Append(zero + dt.Minute);

+				else

+					sb.Append(dt.Minute);

+				sb.Append(":");

+				// second

+				if(dt.Second < 10)

+					sb.Append(zero + dt.Second);

+				else

+					sb.Append(dt.Second);

+				sb.Append(".");

+				// millisecond

+				if(dt.Millisecond < 10)

+					sb.Append(zero + dt.Millisecond);

+				else

+					sb.Append(dt.Millisecond);

+				sb.Append('\'');

+				s = sb.ToString();

+				break;

+			default:

+				// default to DbType.String

+				s = "'" + obj + "'";

+				break;

+			}
+			return s;	
+		}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/ParmUtil.cs b/mcs/class/Mono.Data.PostgreSqlClient/ParmUtil.cs
new file mode 100644
index 00000000000..3dabac7853e
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/ParmUtil.cs
@@ -0,0 +1,176 @@
+//

+// ParmUtil.cs - utility to bind variables in a SQL statement to parameters in C# code

+//               This is in the PostgreSQL .NET Data provider in Mono

+//

+// Author: 

+//    Daniel Morgan <danmorg@sc.rr.com>

+//

+// (c)copyright 2002 Daniel Morgan

+//

+

+// comment DEBUG_ParmUtil for production, for debug messages, uncomment

+//#define DEBUG_ParmUtil

+

+using System;

+using System.Data;

+using System.Text;

+

+namespace System.Data.SqlClient {

+

+	enum PostgresBindVariableCharacter {

+		Semicolon,

+		At,

+		QuestionMark

+	}

+

+	public class ParmUtil {

+

+		private string sql = "";

+		private string resultSql = "";

+		private SqlParameterCollection parmsCollection = null;

+		

+		static private PostgresBindVariableCharacter PgbindChar = PostgresBindVariableCharacter.Semicolon;

+		static char bindChar;

+

+		// static constructor

+		static ParmUtil() {

+			switch(PgbindChar) {

+			case PostgresBindVariableCharacter.Semicolon:

+				bindChar = ':';

+				break;

+			case PostgresBindVariableCharacter.At:

+				bindChar = '@';

+				break;

+			case PostgresBindVariableCharacter.QuestionMark:

+				// this doesn't have named parameters,

+				// they must be in order

+				bindChar = '?';

+				break;

+			}

+		}

+				

+		public ParmUtil(string query, SqlParameterCollection parms) {

+			sql = query;

+			parmsCollection = parms;

+		}

+		

+		public string ResultSql {

+			get {

+				return resultSql;

+			}

+		}

+

+		// TODO: currently only works for input variables,

+		//       need to do input/output, output, and return

+		public string ReplaceWithParms() {

+

+			StringBuilder result = new StringBuilder();

+			char[] chars = sql.ToCharArray();

+			bool bStringConstFound = false;

+

+			for(int i = 0; i < chars.Length; i++) {

+				if(chars[i] == '\'') {

+					if(bStringConstFound == true)

+						bStringConstFound = false;

+					else

+						bStringConstFound = true;

+

+					result.Append(chars[i]);

+				}

+				else if(chars[i] == bindChar && 

+					bStringConstFound == false) {

+#if DEBUG_ParmUtil

+					Console.WriteLine("Bind Variable character found...");

+#endif					

+					StringBuilder parm = new StringBuilder();

+					i++;

+					while(i <= chars.Length) {

+						char ch;

+						if(i == chars.Length)

+							ch = ' '; // a space

+						else

+							ch = chars[i];

+

+#if DEBUG_ParmUtil						

+						Console.WriteLine("Is char Letter or digit?");

+#endif						

+						if(Char.IsLetterOrDigit(ch)) {

+#if DEBUG_ParmUtil

+							Console.WriteLine("Char IS letter or digit. " + 

+								"Now, append char to parm StringBuilder");

+#endif

+							parm.Append(ch);

+						}

+						else {

+#if DEBUG_ParmUtil

+                                                        Console.WriteLine("Char is NOT letter or char. " + 

+								"thus we got rest of bind variable name. ");

+								

+							// replace bind variable placeholder 

+							// with data value constant

+							Console.WriteLine("parm StringBuilder to string p...");

+#endif

+							string p = parm.ToString();

+#if DEBUG_ParmUtil

+							Console.WriteLine("calling BindReplace...");

+#endif							

+							bool found = BindReplace(result, p);

+#if DEBUG_ParmUtil

+							Console.WriteLine("    Found = " + found);

+#endif

+							if(found == true)

+								break;

+							else {						

+								// *** Error Handling

+								Console.WriteLine("Error: parameter not found: " + p);

+								return "";

+							}

+						}

+						i++;

+					}

+					i--;

+				}

+				else 

+					result.Append(chars[i]);

+			}

+			

+			resultSql = result.ToString();

+			return resultSql;

+		}

+

+		public bool BindReplace (StringBuilder result, string p) {

+			// bind variable

+			bool found = false;

+

+#if DEBUG_ParmUtil

+			Console.WriteLine("Does the parmsCollection contain the parameter???: " + p);

+#endif

+			if(parmsCollection.Contains(p) == true) {

+				// parameter found

+#if DEBUG_ParmUtil

+				Console.WriteLine("Parameter Found: " + p);

+#endif

+				SqlParameter prm = parmsCollection[p];

+

+#if DEBUG_ParmUtil																	

+				// DEBUG 

+				Console.WriteLine("          Value: " + prm.Value);

+				Console.WriteLine("      Direction: " + prm.Direction);

+#endif

+				// convert object to string and place

+				// into SQL

+				if(prm.Direction == ParameterDirection.Input) {

+					string strObj = PostgresHelper.

+						ObjectToString(prm.DbType, 

+								prm.Value);

+					result.Append(strObj);

+				}

+				else

+					result.Append(bindChar + p);

+

+				found = true;

+			}

+			return found;

+		}

+	}

+}

diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs
new file mode 100644
index 00000000000..20b9e02a6d0
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlClientPermission.cs
@@ -0,0 +1,78 @@
+//
+// System.Data.SqlClient.SqlClientPermission.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Data.SqlClient {
+
+	public sealed class SqlClientPermission : DBDataPermission {
+		
+		[MonoTODO]
+		public SqlClientPermission() {
+			// FIXME: do constructor
+		}
+
+		[MonoTODO]
+		public SqlClientPermission(PermissionState state) {
+			// FIXME: do constructor
+		}
+
+		[MonoTODO]
+		public SqlClientPermission(PermissionState state,
+			bool allowBlankPassword) { 
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Copy() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void FromXml(SecurityElement 
+					securityElement) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Intersect(IPermission target)  {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsSubsetOf(IPermission target) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override string ToString() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override SecurityElement ToXml() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Union(IPermission target) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		~SqlClientPermission() {
+			// FIXME: destructor to release resources
+		}
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlClientPermissionAttribute.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlClientPermissionAttribute.cs
new file mode 100644
index 00000000000..149613c5f2e
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlClientPermissionAttribute.cs
@@ -0,0 +1,46 @@
+//
+// System.Data.SqlClient.SqlClientPermissionAttribute.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Data.SqlClient {
+
+	[AttributeUsage(AttributeTargets.Assembly    | 
+			AttributeTargets.Class 	     | 
+			AttributeTargets.Struct      | 
+			AttributeTargets.Constructor |
+			AttributeTargets.Method)]
+	[Serializable]
+	public sealed class SqlClientPermissionAttribute :
+		DBDataPermissionAttribute {
+
+		[MonoTODO]
+		public SqlClientPermissionAttribute(SecurityAction action) : 
+			base(action)
+		{
+			// FIXME: do constructor
+		}
+
+		[MonoTODO]
+		public override IPermission CreatePermission() {
+			throw new NotImplementedException ();
+		}
+
+		//[MonoTODO]
+		//~SqlClientPermissionAttribute() {
+		//	// FIXME: destructor to release resources
+		//}
+	}
+
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlCommand.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlCommand.cs
new file mode 100644
index 00000000000..af2771c3fa2
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlCommand.cs
@@ -0,0 +1,928 @@
+//
+// System.Data.SqlClient.SqlCommand.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc 2002 http://www.ximian.com/
+// (C) Daniel Morgan, 2002
+// (C) Copyright 2002 Tim Coleman
+//
+// Credits:
+//    SQL and concepts were used from libgda 0.8.190 (GNOME Data Access)

+//    http://www.gnome-db.org/

+//    with permission from the authors of the

+//    PostgreSQL provider in libgda:

+//        Michael Lausch <michael@lausch.at>
+//        Rodrigo Moya <rodrigo@gnome-db.org>
+//        Vivien Malerba <malerba@gnome-db.org>
+//        Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+//
+
+// use #define DEBUG_SqlCommand if you want to spew debug messages
+// #define DEBUG_SqlCommand
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Xml;
+
+namespace System.Data.SqlClient {
+	/// <summary>
+	/// Represents a SQL statement that is executed 
+	/// while connected to a SQL database.
+	/// </summary>
+	// public sealed class SqlCommand : Component, IDbCommand, ICloneable
+	public sealed class SqlCommand : IDbCommand {
+
+		#region Fields
+
+		private string sql = "";
+		private int timeout = 30; 
+		// default is 30 seconds 
+		// for command execution
+
+		private SqlConnection conn = null;
+		private SqlTransaction trans = null;
+		private CommandType cmdType = CommandType.Text;
+		private bool designTime = false;
+		private SqlParameterCollection parmCollection = new 
+			SqlParameterCollection();
+
+		// SqlDataReader state data for ExecuteReader()
+		private SqlDataReader dataReader = null;
+		private string[] queries = null;
+		private int currentQuery = -1;
+		private CommandBehavior cmdBehavior = CommandBehavior.Default;
+
+		private ParmUtil parmUtil = null;
+		
+		#endregion // Fields
+
+		#region Constructors
+
+		public SqlCommand() {
+			sql = "";
+		}
+
+		public SqlCommand (string cmdText) {
+			sql = cmdText;
+		}
+
+		public SqlCommand (string cmdText, SqlConnection connection) {
+			sql = cmdText;
+			conn = connection;
+		}
+
+		public SqlCommand (string cmdText, SqlConnection connection, 
+			SqlTransaction transaction) {
+			sql = cmdText;
+			conn = connection;
+			trans = transaction;
+		}
+
+		#endregion // Constructors
+
+		#region Methods
+
+		[MonoTODO]
+		public void Cancel () {
+			// FIXME: use non-blocking Exec for this
+			throw new NotImplementedException ();
+		}
+
+		// FIXME: is this the correct way to return a stronger type?
+		[MonoTODO]
+		IDbDataParameter IDbCommand.CreateParameter () {
+			return CreateParameter ();
+		}
+
+		[MonoTODO]
+		public SqlParameter CreateParameter () {
+			return new SqlParameter ();
+		}
+
+		public int ExecuteNonQuery () {	
+			IntPtr pgResult; // PGresult
+			int rowsAffected = -1;
+			ExecStatusType execStatus;
+			String rowsAffectedString;
+			string query;
+
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnnectionState is not Open");
+
+			query = TweakQuery(sql, cmdType);
+
+			// FIXME: PQexec blocks 
+			// while PQsendQuery is non-blocking
+			// which is better to use?
+			// int PQsendQuery(PGconn *conn,
+			//        const char *query);
+
+			// execute SQL command
+			// uses internal property to get the PGConn IntPtr
+			pgResult = PostgresLibrary.
+				PQexec (conn.PostgresConnection, query);
+
+			execStatus = PostgresLibrary.
+				PQresultStatus (pgResult);
+			
+			if(execStatus == ExecStatusType.PGRES_COMMAND_OK ||
+				execStatus == ExecStatusType.PGRES_TUPLES_OK ) {
+
+				rowsAffectedString = PostgresLibrary.
+					PQcmdTuples (pgResult);
+
+				if(rowsAffectedString != null)
+					if(rowsAffectedString.Equals("") == false)
+						rowsAffected = int.Parse(rowsAffectedString);
+
+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+			}
+			else {
+				String errorMessage;
+				
+				errorMessage = PostgresLibrary.
+					PQresStatus(execStatus);
+
+				errorMessage += " " + PostgresLibrary.

+					PQresultErrorMessage(pgResult);

+

+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+

+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					conn.DataSource, "SqlCommand", 0);

+			}
+			
+			return rowsAffected;
+		}
+		
+		[MonoTODO]
+		IDataReader IDbCommand.ExecuteReader () {
+			return ExecuteReader ();
+		}
+
+		[MonoTODO]
+		public SqlDataReader ExecuteReader () {
+			return ExecuteReader(CommandBehavior.Default);
+		}
+
+		[MonoTODO]
+		IDataReader IDbCommand.ExecuteReader (
+			CommandBehavior behavior) {
+			return ExecuteReader (behavior);
+		}
+
+		[MonoTODO]
+		public SqlDataReader ExecuteReader (CommandBehavior behavior) 
+		{
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnectionState is not Open");
+
+			cmdBehavior = behavior;
+
+			queries = null;
+			currentQuery = -1;
+			dataReader = new SqlDataReader(this);
+
+			queries = sql.Split(new Char[] {';'});			
+
+			dataReader.NextResult();
+					
+			return dataReader;
+		}
+
+		internal SqlResult NextResult() 
+		{
+			SqlResult res = new SqlResult();
+			res.Connection = this.Connection;
+			res.Behavior = cmdBehavior;
+			string statement;
+		
+			currentQuery++;
+
+			res.CurrentQuery = currentQuery;
+
+			if(currentQuery < queries.Length && queries[currentQuery].Equals("") == false) {
+				res.SQL = queries[currentQuery];
+				statement = TweakQuery(queries[currentQuery], cmdType);
+				ExecuteQuery(statement, res);
+				res.ResultReturned = true;
+			}
+			else {
+				res.ResultReturned = false;
+			}
+
+			return res;
+		}
+
+		private string TweakQuery(string query, CommandType commandType) {
+			string statement = "";
+			StringBuilder td;
+
+#if DEBUG_SqlCommand
+			Console.WriteLine("---------[][] TweakQuery() [][]--------");
+			Console.WriteLine("CommandType: " + commandType + " CommandBehavior: " + cmdBehavior);
+			Console.WriteLine("SQL before command type: " + query);
+#endif						
+			// finish building SQL based on CommandType
+			switch(commandType) {
+			case CommandType.Text:
+				statement = query;
+				break;
+			case CommandType.StoredProcedure:
+				statement = 
+					"SELECT " + query + "()";
+				break;
+			case CommandType.TableDirect:
+				// NOTE: this is for the PostgreSQL provider
+				//       and for OleDb, according to the docs,
+				//       an exception is thrown if you try to use
+				//       this with SqlCommand
+				string[] directTables = query.Split(
+					new Char[] {','});	
+										 
+				td = new StringBuilder("SELECT * FROM ");
+				
+				for(int tab = 0; tab < directTables.Length; tab++) {
+					if(tab > 0)
+						td.Append(',');
+					td.Append(directTables[tab]);
+					// FIXME: if multipe tables, how do we
+					//        join? based on Primary/Foreign Keys?
+					//        Otherwise, a Cartesian Product happens
+				}
+				statement = td.ToString();
+				break;
+			default:
+				// FIXME: throw an exception?
+				statement = query;
+				break;
+			}
+#if DEBUG_SqlCommand			
+			Console.WriteLine("SQL after command type: " + statement);
+#endif
+			// TODO: this parameters utility
+			//       currently only support input variables
+			//       need todo output, input/output, and return.
+#if DEBUG_SqlCommand
+			Console.WriteLine("using ParmUtil in TweakQuery()...");
+#endif
+			parmUtil = new ParmUtil(statement, parmCollection);
+#if DEBUG_SqlCommand
+			Console.WriteLine("ReplaceWithParms...");
+#endif
+
+			statement = parmUtil.ReplaceWithParms();
+
+#if DEBUG_SqlCommand
+			Console.WriteLine("SQL after ParmUtil: " + statement);
+#endif	
+			return statement;
+		}
+
+		private void ExecuteQuery (string query, SqlResult res)
+		{			
+			IntPtr pgResult;
+		
+			ExecStatusType execStatus;	
+
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnectionState is not Open");
+
+			// FIXME: PQexec blocks 
+			// while PQsendQuery is non-blocking
+			// which is better to use?
+			// int PQsendQuery(PGconn *conn,
+			//        const char *query);
+
+			// execute SQL command
+			// uses internal property to get the PGConn IntPtr
+			pgResult = PostgresLibrary.
+				PQexec (conn.PostgresConnection, query);
+
+			execStatus = PostgresLibrary.
+				PQresultStatus (pgResult);
+			
+			res.ExecStatus = execStatus;
+
+			if(execStatus == ExecStatusType.PGRES_TUPLES_OK ||
+				execStatus == ExecStatusType.PGRES_COMMAND_OK) {
+
+				res.BuildTableSchema(pgResult);
+			}
+			else {
+				String errorMessage;
+				
+				errorMessage = PostgresLibrary.
+					PQresStatus(execStatus);
+
+				errorMessage += " " + PostgresLibrary.

+					PQresultErrorMessage(pgResult);

+

+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+

+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					conn.DataSource, "SqlCommand", 0);

+			}
+		}
+
+		// since SqlCommand has resources so SqlDataReader
+		// can do Read() and NextResult(), need to free
+		// those resources.  Also, need to allow this SqlCommand
+		// and this SqlConnection to do things again.
+		internal void CloseReader() {
+			dataReader = null;
+			queries = null;
+
+			if((cmdBehavior & CommandBehavior.CloseConnection) == CommandBehavior.CloseConnection) {
+				conn.CloseReader(true);
+			}
+			else {
+				conn.CloseReader(false);
+			}
+		}
+
+		// only meant to be used between SqlConnectioin,
+		// SqlCommand, and SqlDataReader
+		internal void OpenReader(SqlDataReader reader) {
+			conn.OpenReader(reader);
+		}
+
+		/// <summary>

+		/// ExecuteScalar is used to retrieve one object
+		/// from one result set 

+		/// that has one row and one column.

+		/// It is lightweight compared to ExecuteReader.

+		/// </summary>
+		[MonoTODO]
+		public object ExecuteScalar () {
+			IntPtr pgResult; // PGresult
+			ExecStatusType execStatus;	
+			object obj = null; // return
+			int nRow = 0; // first row
+			int nCol = 0; // first column
+			String value;
+			int nRows;
+			int nFields;
+			string query;
+
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnnectionState is not Open");
+
+			query = TweakQuery(sql, cmdType);
+
+			// FIXME: PQexec blocks 
+			// while PQsendQuery is non-blocking
+			// which is better to use?
+			// int PQsendQuery(PGconn *conn,
+			//        const char *query);
+
+			// execute SQL command
+			// uses internal property to get the PGConn IntPtr
+			pgResult = PostgresLibrary.
+				PQexec (conn.PostgresConnection, query);
+
+			execStatus = PostgresLibrary.
+				PQresultStatus (pgResult);
+			if(execStatus == ExecStatusType.PGRES_COMMAND_OK) {
+				// result was a SQL Command 
+
+				// close result set
+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+
+				return null; // return null reference
+			}
+			else if(execStatus == ExecStatusType.PGRES_TUPLES_OK) {
+				// result was a SQL Query
+
+				nRows = PostgresLibrary.
+					PQntuples(pgResult);
+
+				nFields = PostgresLibrary.
+					PQnfields(pgResult);
+
+				if(nRows > 0 && nFields > 0) {
+
+					// get column name
+					//String fieldName;
+					//fieldName = PostgresLibrary.
+					//	PQfname(pgResult, nCol);
+
+					int oid;
+					string sType;
+					DbType dbType;
+					// get PostgreSQL data type (OID)
+					oid = PostgresLibrary.
+						PQftype(pgResult, nCol);
+					sType = PostgresHelper.
+						OidToTypname (oid, conn.Types);
+					dbType = PostgresHelper.
+						TypnameToSqlDbType(sType);
+
+					int definedSize;
+					// get defined size of column
+					definedSize = PostgresLibrary.
+						PQfsize(pgResult, nCol);
+
+					// get data value
+					value = PostgresLibrary.
+						PQgetvalue(
+						pgResult,
+						nRow, nCol);
+
+					int columnIsNull;
+					// is column NULL?
+					columnIsNull = PostgresLibrary.
+						PQgetisnull(pgResult,
+						nRow, nCol);
+
+					int actualLength;
+					// get Actual Length
+					actualLength = PostgresLibrary.
+						PQgetlength(pgResult,
+						nRow, nCol);
+						
+					obj = PostgresHelper.
+						ConvertDbTypeToSystem (
+						dbType,
+						value);
+				}
+
+				// close result set
+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+
+			}
+			else {
+				String errorMessage;
+				
+				errorMessage = PostgresLibrary.
+					PQresStatus(execStatus);
+
+				errorMessage += " " + PostgresLibrary.

+					PQresultErrorMessage(pgResult);

+

+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+

+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					conn.DataSource, "SqlCommand", 0);

+			}
+					
+			return obj;
+		}
+
+		[MonoTODO]
+		public XmlReader ExecuteXmlReader () {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Prepare () {
+			// FIXME: parameters have to be implemented for this
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public SqlCommand Clone () {
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+
+		#region Properties
+
+		public string CommandText {
+			get { 
+				return sql; 
+			}
+
+			set { 
+				sql = value; 
+			}
+		}
+
+		public int CommandTimeout {
+			get { 
+				return timeout;  
+			}
+			
+			set {
+				// FIXME: if value < 0, throw
+				// ArgumentException
+				// if (value < 0)
+				//	throw ArgumentException;
+				timeout = value;
+			}
+		}
+
+		public CommandType CommandType	{
+			get {
+				return cmdType;
+			}
+
+			set { 
+				cmdType = value;
+			}
+		}
+
+		// FIXME: for property Connection, is this the correct
+		//        way to handle a return of a stronger type?
+		IDbConnection IDbCommand.Connection {
+			get { 
+				return Connection;
+			}
+
+			set { 
+				// FIXME: throw an InvalidOperationException
+				// if the change was during a 
+				// transaction in progress
+
+				// csc
+				Connection = (SqlConnection) value; 
+				// mcs
+				// Connection = value; 
+				
+				// FIXME: set Transaction property to null
+			}
+		}
+		
+		public SqlConnection Connection {
+			get { 
+				// conn defaults to null
+				return conn;
+			}
+
+			set { 
+				// FIXME: throw an InvalidOperationException
+				// if the change was during 
+				// a transaction in progress
+				conn = value; 
+				// FIXME: set Transaction property to null
+			}
+		}
+
+		public bool DesignTimeVisible {
+			get {
+				return designTime;
+			} 
+			
+			set{
+				designTime = value;
+			}
+		}
+
+		// FIXME; for property Parameters, is this the correct
+		//        way to handle a stronger return type?
+		IDataParameterCollection IDbCommand.Parameters	{
+			get { 
+				return Parameters;
+			}
+		}
+
+		public SqlParameterCollection Parameters {
+			get { 
+				return parmCollection;
+			}
+		}
+
+		// FIXME: for property Transaction, is this the correct
+		//        way to handle a return of a stronger type?
+		IDbTransaction IDbCommand.Transaction 	{
+			get { 
+				return Transaction;
+			}
+
+			set { 
+				// FIXME: error handling - do not allow
+				// setting of transaction if transaction
+				// has already begun
+
+				// csc
+				Transaction = (SqlTransaction) value;
+				// mcs
+				// Transaction = value; 
+			}
+		}
+
+		public SqlTransaction Transaction {
+			get { 
+				return trans; 
+			}
+
+			set { 
+				// FIXME: error handling
+				trans = value; 
+			}
+		}	
+
+		[MonoTODO]
+		public UpdateRowSource UpdatedRowSource	{
+			// FIXME: do this once DbDataAdaptor 
+			// and DataRow are done
+			get { 		
+				throw new NotImplementedException (); 
+			}
+			set { 
+				throw new NotImplementedException (); 
+			}
+		}
+
+		#endregion // Properties
+
+		#region Inner Classes
+
+		#endregion // Inner Classes
+
+		#region Destructors
+
+		[MonoTODO]
+		public void Dispose() {
+			// FIXME: need proper way to release resources
+			// Dispose(true);
+		}
+
+		[MonoTODO]
+		~SqlCommand() {
+			// FIXME: need proper way to release resources
+			// Dispose(false);
+		}
+
+		#endregion //Destructors
+	}
+
+	// SqlResult is used for passing Result Set data 
+	// from SqlCommand to SqlDataReader
+	internal class SqlResult {
+
+		private DataTable dataTableSchema = null; // only will contain the schema
+		private IntPtr pg_result = IntPtr.Zero; // native PostgreSQL PGresult
+		private int rowCount = 0; 
+		private int fieldCount = 0;
+		private string[] pgtypes = null; // PostgreSQL types (typname)
+		private bool resultReturned = false;
+		private SqlConnection con = null;
+		private int rowsAffected = -1;
+		private ExecStatusType execStatus = ExecStatusType.PGRES_FATAL_ERROR;
+		private int currentQuery = -1;
+		private string sql = "";
+		private CommandBehavior cmdBehavior = CommandBehavior.Default;
+
+		internal CommandBehavior Behavior {
+			get {
+				return cmdBehavior;
+			}
+			set {
+				cmdBehavior = value;
+			}
+		}
+
+		internal string SQL {
+			get {
+				return sql;
+			}
+			set {
+				sql = value;
+			}
+		}
+
+		internal ExecStatusType ExecStatus {
+			get {
+				return execStatus;
+			}
+			set {
+				execStatus = value;
+			}
+		}
+
+		internal int CurrentQuery {
+			get {
+				return currentQuery;
+			}
+
+			set {
+				currentQuery = value;
+			}
+
+		}
+
+		internal SqlConnection Connection {
+			get {
+				return con;
+			}
+
+			set {
+				con = value;
+			}
+		}
+
+		internal int RecordsAffected {
+			get {
+				return rowsAffected;
+			}
+		}
+
+		internal bool ResultReturned {
+			get {
+				return resultReturned;
+			}
+			set {
+				resultReturned = value;
+			}
+		}
+
+		internal DataTable Table {
+			get { 
+				return dataTableSchema;
+			}
+		}
+
+		internal IntPtr PgResult {
+			get {
+				return pg_result;
+			}
+		}
+
+		internal int RowCount {
+			get {
+				return rowCount;
+			}
+		}
+
+		internal int FieldCount {
+			get {
+				return fieldCount;
+			}
+		}
+
+		internal string[] PgTypes {
+			get {
+				return pgtypes;
+			}
+		}
+
+		internal void BuildTableSchema (IntPtr pgResult) {
+			pg_result = pgResult;
+			
+			// need to set IDataReader.RecordsAffected property
+			string rowsAffectedString;
+			rowsAffectedString = PostgresLibrary.
+				PQcmdTuples (pgResult);
+			if(rowsAffectedString != null)
+				if(rowsAffectedString.Equals("") == false)
+					rowsAffected = int.Parse(rowsAffectedString);
+			
+			// Only Results from SQL SELECT Queries 
+			// get a DataTable for schema of the result
+			// otherwise, DataTable is null reference
+			if(execStatus == ExecStatusType.PGRES_TUPLES_OK) {
+
+				dataTableSchema = new DataTable ();
+				dataTableSchema.Columns.Add ("ColumnName", typeof (string));
+				dataTableSchema.Columns.Add ("ColumnOrdinal", typeof (int));
+				dataTableSchema.Columns.Add ("ColumnSize", typeof (int));
+				dataTableSchema.Columns.Add ("NumericPrecision", typeof (int));
+				dataTableSchema.Columns.Add ("NumericScale", typeof (int));
+				dataTableSchema.Columns.Add ("IsUnique", typeof (bool));
+				dataTableSchema.Columns.Add ("IsKey", typeof (bool));
+				DataColumn dc = dataTableSchema.Columns["IsKey"];
+				dc.AllowDBNull = true; // IsKey can have a DBNull
+				dataTableSchema.Columns.Add ("BaseCatalogName", typeof (string));
+				dataTableSchema.Columns.Add ("BaseColumnName", typeof (string));
+				dataTableSchema.Columns.Add ("BaseSchemaName", typeof (string));
+				dataTableSchema.Columns.Add ("BaseTableName", typeof (string));
+				dataTableSchema.Columns.Add ("DataType", typeof(string));
+				dataTableSchema.Columns.Add ("AllowDBNull", typeof (bool));
+				dataTableSchema.Columns.Add ("ProviderType", typeof (int));
+				dataTableSchema.Columns.Add ("IsAliased", typeof (bool));
+				dataTableSchema.Columns.Add ("IsExpression", typeof (bool));
+				dataTableSchema.Columns.Add ("IsIdentity", typeof (bool));
+				dataTableSchema.Columns.Add ("IsAutoIncrement", typeof (bool));
+				dataTableSchema.Columns.Add ("IsRowVersion", typeof (bool));
+				dataTableSchema.Columns.Add ("IsHidden", typeof (bool));
+				dataTableSchema.Columns.Add ("IsLong", typeof (bool));
+				dataTableSchema.Columns.Add ("IsReadOnly", typeof (bool));
+
+				fieldCount = PostgresLibrary.PQnfields (pgResult);
+				rowCount = PostgresLibrary.PQntuples(pgResult);
+				pgtypes = new string[fieldCount];

+

+				// TODO: for CommandBehavior.SingleRow

+				//       use IRow, otherwise, IRowset

+				if(fieldCount > 0)

+					if((cmdBehavior & CommandBehavior.SingleRow) == CommandBehavior.SingleRow)

+						fieldCount = 1;

+
+				// TODO: for CommandBehavior.SchemaInfo
+				if((cmdBehavior & CommandBehavior.SchemaOnly) == CommandBehavior.SchemaOnly)
+					fieldCount = 0;
+
+				// TODO: for CommandBehavior.SingleResult
+				if((cmdBehavior & CommandBehavior.SingleResult) == CommandBehavior.SingleResult)
+					if(currentQuery > 0)
+						fieldCount = 0;
+
+				// TODO: for CommandBehavior.SequentialAccess - used for reading Large OBjects
+				//if((cmdBehavior & CommandBehavior.SequentialAccess) == CommandBehavior.SequentialAccess) {
+				//}
+
+				DataRow schemaRow;
+				int oid;
+				DbType dbType;
+				Type typ;
+						
+				for (int i = 0; i < fieldCount; i += 1 ) {
+					schemaRow = dataTableSchema.NewRow ();
+
+					string columnName = PostgresLibrary.PQfname (pgResult, i);
+
+					schemaRow["ColumnName"] = columnName;
+					schemaRow["ColumnOrdinal"] = i+1;
+					schemaRow["ColumnSize"] = PostgresLibrary.PQfsize (pgResult, i);
+					schemaRow["NumericPrecision"] = 0;
+					schemaRow["NumericScale"] = 0;
+					// TODO: need to get KeyInfo
+					if((cmdBehavior & CommandBehavior.KeyInfo) == CommandBehavior.KeyInfo) {
+						bool IsUnique, IsKey;
+						GetKeyInfo(columnName, out IsUnique, out IsKey);
+					}
+					else {
+						schemaRow["IsUnique"] = false;
+						schemaRow["IsKey"] = DBNull.Value;
+					}
+					schemaRow["BaseCatalogName"] = "";
+					schemaRow["BaseColumnName"] = columnName;
+					schemaRow["BaseSchemaName"] = "";
+					schemaRow["BaseTableName"] = "";
+				
+					// PostgreSQL type to .NET type stuff
+					oid = PostgresLibrary.PQftype (pgResult, i);
+					pgtypes[i] = PostgresHelper.OidToTypname (oid, con.Types);	

+					dbType = PostgresHelper.TypnameToSqlDbType (pgtypes[i]);

+				

+					typ = PostgresHelper.DbTypeToSystemType (dbType);

+					string st = typ.ToString();

+					schemaRow["DataType"] = st;

+
+					schemaRow["AllowDBNull"] = false;
+					schemaRow["ProviderType"] = oid;
+					schemaRow["IsAliased"] = false;
+					schemaRow["IsExpression"] = false;
+					schemaRow["IsIdentity"] = false;
+					schemaRow["IsAutoIncrement"] = false;
+					schemaRow["IsRowVersion"] = false;
+					schemaRow["IsHidden"] = false;
+					schemaRow["IsLong"] = false;
+					schemaRow["IsReadOnly"] = false;
+					schemaRow.AcceptChanges();
+					dataTableSchema.Rows.Add (schemaRow);
+				}
+				
+#if DEBUG_SqlCommand
+				Console.WriteLine("********** DEBUG Table Schema BEGIN ************");
+				foreach (DataRow myRow in dataTableSchema.Rows) {

+					foreach (DataColumn myCol in dataTableSchema.Columns)

+						Console.WriteLine(myCol.ColumnName + " = " + myRow[myCol]);

+					Console.WriteLine();

+				}
+				Console.WriteLine("********** DEBUG Table Schema END ************");
+#endif // DEBUG_SqlCommand
+
+			}
+		}
+
+		// TODO: how do we get the key info if
+		//       we don't have the tableName?
+		private void GetKeyInfo(string columnName, out bool isUnique, out bool isKey) {
+			isUnique = false;
+			isKey = false;
+
+			string sql;
+
+			sql =
+			"SELECT i.indkey, i.indisprimary, i.indisunique " +
+			"FROM pg_class c, pg_class c2, pg_index i " +
+			"WHERE c.relname = ':tableName' AND c.oid = i.indrelid " +
+			"AND i.indexrelid = c2.oid ";
+		}
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlCommandBuilder.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlCommandBuilder.cs
new file mode 100644
index 00000000000..d2b028bc652
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlCommandBuilder.cs
@@ -0,0 +1,103 @@
+//
+// System.Data.SqlClient.SqlCommandBuilder.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.ComponentModel;
+
+namespace System.Data.SqlClient {

+

+	/// <summary>

+	/// Builder of one command

+	/// that will be used in manipulating a table for

+	/// a DataSet that is assoicated with a database.

+	/// </summary>

+	public sealed class SqlCommandBuilder : Component {

+		

+		[MonoTODO]

+		public SqlCommandBuilder() {

+

+		}

+

+		[MonoTODO]

+		public SqlCommandBuilder(SqlDataAdapter adapter) {

+		

+		}

+

+		[MonoTODO]

+		public SqlDataAdapter DataAdapter {

+			get {

+				throw new NotImplementedException ();

+			}

+			

+			set{

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public string QuotePrefix {

+			get {

+				throw new NotImplementedException ();

+			} 

+			

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public string QuoteSuffix {

+			get {

+				throw new NotImplementedException ();

+			}

+			

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public static void DeriveParameters(SqlCommand command) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SqlCommand GetDeleteCommand() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SqlCommand GetInsertCommand() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SqlCommand GetUpdateCommand() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void RefreshSchema() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void Dispose(bool disposing) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		~SqlCommandBuilder() {

+			// FIXME: create destructor - release resources

+		}

+	}

+}

+

diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlConnection.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlConnection.cs
new file mode 100644
index 00000000000..0bd37605cc6
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlConnection.cs
@@ -0,0 +1,722 @@
+//
+// System.Data.SqlClient.SqlConnection.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+// (C) Daniel Morgan 2002
+//
+// Credits:
+//    SQL and concepts were used from libgda 0.8.190 (GNOME Data Access)

+//    http://www.gnome-db.org/

+//    with permission from the authors of the

+//    PostgreSQL provider in libgda:

+//        Michael Lausch <michael@lausch.at>
+//        Rodrigo Moya <rodrigo@gnome-db.org>
+//        Vivien Malerba <malerba@gnome-db.org>
+//        Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+//
+
+// use #define DEBUG_SqlConnection if you want to spew debug messages
+// #define DEBUG_SqlConnection
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace System.Data.SqlClient {
+
+	/// <summary>
+	/// Represents an open connection to a SQL data source
+	/// </summary>
+	public sealed class SqlConnection : Component, IDbConnection,
+		ICloneable	
+	{
+		// FIXME: Need to implement class Component, 

+		// and interfaces: ICloneable and IDisposable	
+
+		#region Fields
+
+		private PostgresTypes types = null;
+		private IntPtr pgConn = IntPtr.Zero;    
+
+		// PGConn (Postgres Connection)
+		private string connectionString = "";    
+		// OLE DB Connection String
+		private string pgConnectionString = ""; 
+		// PostgreSQL Connection String
+		private SqlTransaction trans = null;
+		private int connectionTimeout = 15;     
+		// default for 15 seconds
+		
+		// connection parameters in connection string
+		private string host = "";     
+		// Name of host to connect to
+		private string hostaddr = ""; 
+		// IP address of host to connect to
+		// should be in "n.n.n.n" format
+		private string port = "";     
+		// Port number to connect to at the server host
+		private string dbname = "";   // The database name. 
+		private string user = "";     // User name to connect as. 
+		private string password = "";
+		// Password to be used if the server 
+		// demands password authentication.  		
+		private string options = ""; 
+		// Trace/debug options to be sent to the server. 
+		private string tty = ""; 
+		// A file or tty for optional 
+		// debug output from the backend. 
+		private string requiressl = "";
+		// Set to 1 to require 
+		// SSL connection to the backend. 
+		// Libpq will then refuse to connect 
+		// if the server does not 
+		// support SSL. Set to 0 (default) to 
+		// negotiate with server. 
+
+		// connection state
+		private ConnectionState conState = ConnectionState.Closed;
+		
+		// DataReader state
+		private SqlDataReader rdr = null;
+		private bool dataReaderOpen = false;
+		// FIXME: if true, throw an exception if SqlConnection 
+		//        is used for anything other than reading
+		//        data using SqlDataReader
+		
+		private string versionString = "Unknown";
+
+		private bool disposed = false;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		// A lot of the defaults were initialized in the Fields
+		[MonoTODO]
+		public SqlConnection () {
+
+		}
+	
+		[MonoTODO]
+		public SqlConnection (String connectionString) {
+			SetConnectionString (connectionString);
+		}
+
+		#endregion // Constructors
+
+		#region Destructors
+
+		protected override void Dispose(bool disposing) {
+			if(!this.disposed)
+				try {
+					if(disposing) {
+						// release any managed resources
+					}
+					// release any unmanaged resources
+					// close any handles
+										
+					this.disposed = true;
+				}
+				finally {
+					base.Dispose(disposing);
+				}
+		}
+	
+		// aka Finalize()
+		// [ClassInterface(ClassInterfaceType.AutoDual)]
+		[MonoTODO]
+		~SqlConnection() {
+			Dispose (false);
+		}
+		
+		#endregion // Destructors
+
+		#region Public Methods
+
+		IDbTransaction IDbConnection.BeginTransaction () {
+			return BeginTransaction ();
+		}
+
+		public SqlTransaction BeginTransaction () {
+			return TransactionBegin (); // call private method
+		}
+
+		IDbTransaction IDbConnection.BeginTransaction (IsolationLevel 
+			il) {
+			return BeginTransaction (il);
+		}
+
+		public SqlTransaction BeginTransaction (IsolationLevel il) {
+			return TransactionBegin (il); // call private method
+		}
+
+		// PostgreSQL does not support named transactions/savepoint
+		//            nor nested transactions
+		[Obsolete]
+		public SqlTransaction BeginTransaction(string transactionName) {
+			return TransactionBegin (); // call private method
+		}
+
+		[Obsolete]
+		public SqlTransaction BeginTransaction(IsolationLevel iso,

+			string transactionName) {
+			return TransactionBegin (iso); // call private method
+		}
+
+		[MonoTODO]
+		public void ChangeDatabase (string databaseName) {
+			throw new NotImplementedException ();
+		}
+
+		object ICloneable.Clone() {
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public void Close () {
+			if(dataReaderOpen == true) {
+				// TODO: what do I do if
+				// the user Closes the connection
+				// without closing the Reader first?
+
+			}			
+			CloseDataSource ();
+		}
+
+		IDbCommand IDbConnection.CreateCommand () {
+			return CreateCommand ();
+		}
+
+		public SqlCommand CreateCommand () {
+			SqlCommand sqlcmd = new SqlCommand ("", this);
+
+			return sqlcmd;
+		}
+
+		[MonoTODO]
+		public void Open () {
+			if(dbname.Equals(""))
+				throw new InvalidOperationException(
+					"dbname missing");
+			else if(conState == ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnnectionState is already Open");
+
+			ConnStatusType connStatus;
+
+			// FIXME: check to make sure we have 
+			//        everything to connect,
+			//        otherwise, throw an exception
+
+			pgConn = PostgresLibrary.PQconnectdb 
+				(pgConnectionString);
+
+			// FIXME: should we use PQconnectStart/PQconnectPoll
+			//        instead of PQconnectdb?  
+			// PQconnectdb blocks 
+			// PQconnectStart/PQconnectPoll is non-blocking
+			
+			connStatus = PostgresLibrary.PQstatus (pgConn);
+			if(connStatus == ConnStatusType.CONNECTION_OK) {
+				// Successfully Connected
+				disposed = false;
+				SetupConnection();
+			}
+			else {
+				String errorMessage = PostgresLibrary.
+					PQerrorMessage (pgConn);
+				errorMessage += ": Could not connect to database.";
+
+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					host, "SqlConnection", 0);
+			}
+		}
+
+		#endregion // Public Methods
+
+		#region Internal Methods
+
+		// Used to prevent SqlConnection
+		// from doing anything while
+		// SqlDataReader is open.
+		// Open the Reader. (called from SqlCommand)
+		internal void OpenReader(SqlDataReader reader) 
+		{	
+			if(dataReaderOpen == true) {
+				// TODO: throw exception here?
+				//       because a reader
+				//       is already open
+			}
+			else {
+				rdr = reader;
+				dataReaderOpen = true;
+			}
+		}
+
+		// Used to prevent SqlConnection
+		// from doing anything while
+		// SqlDataReader is open
+		// Close the Reader (called from SqlCommand)
+		// if closeConnection true, Close() the connection
+		// this is based on CommandBehavior.CloseConnection
+		internal void CloseReader(bool closeConnection)
+		{	if(closeConnection == true)
+				CloseDataSource();
+			else
+				dataReaderOpen = false;
+		}
+
+		#endregion // Internal Methods
+
+		#region Private Methods
+
+		private void SetupConnection() {
+			
+			conState = ConnectionState.Open;
+
+			// FIXME: load types into hashtable
+			types = new PostgresTypes(this);
+			types.Load();
+
+			versionString = GetDatabaseServerVersion();
+
+			// set DATE style to YYYY/MM/DD
+			IntPtr pgResult = IntPtr.Zero;
+			pgResult = PostgresLibrary.PQexec (pgConn, "SET DATESTYLE TO 'ISO'");
+			PostgresLibrary.PQclear (pgResult);
+			pgResult = IntPtr.Zero;
+		}
+
+		private string GetDatabaseServerVersion() 
+		{
+			SqlCommand cmd = new SqlCommand("select version()",this);
+			return (string) cmd.ExecuteScalar();
+		}
+
+		private void CloseDataSource () {
+			// FIXME: just a quick hack
+			if(conState == ConnectionState.Open) {
+				if(trans != null)
+					if(trans.DoingTransaction == true) {
+						trans.Rollback();
+						// trans.Dispose();
+						trans = null;
+					}
+
+				conState = ConnectionState.Closed;
+				PostgresLibrary.PQfinish (pgConn);
+				pgConn = IntPtr.Zero;
+			}
+		}
+
+		private void SetConnectionString (string connectionString) {
+			// FIXME: perform error checking on string
+			// while translating string from 
+			// OLE DB format to PostgreSQL 
+			// connection string format
+			//
+			//     OLE DB: "host=localhost;dbname=test;user=joe;password=smoe"
+			// PostgreSQL: "host=localhost dbname=test user=joe password=smoe"
+			//
+			// For OLE DB, you would have the additional 
+			// "provider=postgresql"
+			// OleDbConnection you would be using libgda
+			//
+			// Also, parse the connection string into properties
+
+			// FIXME: if connection is open, you can 
+			//        not set the connection
+			//        string, throw an exception
+
+			this.connectionString = connectionString;
+			pgConnectionString = ConvertStringToPostgres (
+				connectionString);
+
+#if DEBUG_SqlConnection
+			Console.WriteLine(
+				"OLE-DB Connection String    [in]: " +
+				this.ConnectionString);
+			Console.WriteLine(
+				"Postgres Connection String [out]: " +
+				pgConnectionString);
+#endif // DEBUG_SqlConnection
+		}
+
+		private String ConvertStringToPostgres (String 
+			oleDbConnectionString) {
+			StringBuilder postgresConnection = 
+				new StringBuilder();
+			string result;
+			string[] connectionParameters;
+
+			char[] semicolon = new Char[1];
+			semicolon[0] = ';';
+			
+			// FIXME: what is the max number of value pairs 
+			//        can there be for the OLE DB 
+			//	  connnection string? what about libgda max?
+			//        what about postgres max?
+
+			// FIXME: currently assuming value pairs are like:
+			//        "key1=value1;key2=value2;key3=value3"
+			//        Need to deal with values that have
+			//        single or double quotes.  And error 
+			//        handling of that too.
+			//        "key1=value1;key2='value2';key=\"value3\""
+
+			// FIXME: put the connection parameters 
+			//        from the connection
+			//        string into a 
+			//        Hashtable (System.Collections)
+			//        instead of using private variables 
+			//        to store them
+			connectionParameters = oleDbConnectionString.
+				Split (semicolon);
+			foreach (string sParameter in connectionParameters) {
+				if(sParameter.Length > 0) {
+					BreakConnectionParameter (sParameter);
+					postgresConnection.
+						Append (sParameter + 
+						" ");
+				}
+			}
+			result = postgresConnection.ToString ();
+			return result;
+		}
+
+		private bool BreakConnectionParameter (String sParameter) {	
+			bool addParm = true;
+			int index;
+
+			index = sParameter.IndexOf ("=");
+			if (index > 0) {	
+				string parmKey, parmValue;
+
+				// separate string "key=value" to 
+				// string "key" and "value"
+				parmKey = sParameter.Substring (0, index);
+				parmValue = sParameter.Substring (index + 1,
+					sParameter.Length - index - 1);
+
+				switch(parmKey.ToLower()) {
+				case "hostaddr":
+					hostaddr = parmValue;
+					break;
+
+				case "port":
+					port = parmValue;
+					break;
+
+				case "host":
+					// set DataSource property
+					host = parmValue;
+					break;
+
+				case "dbname":
+					// set Database property
+					dbname = parmValue;
+					break;
+
+				case "user":
+					user = parmValue;
+					break;
+
+				case "password":
+					password = parmValue;
+					//	addParm = false;
+					break;
+
+				case "options":
+					options = parmValue;
+					break;
+
+				case "tty":
+					tty = parmValue;
+					break;
+							
+				case "requiressl":
+					requiressl = parmValue;
+					break;
+				}
+			}
+			return addParm;
+		}
+
+		private SqlTransaction TransactionBegin () {
+			// FIXME: need to keep track of 
+			// transaction in-progress
+			trans = new SqlTransaction ();
+			// using internal methods of SqlTransaction
+			trans.SetConnection (this);
+			trans.Begin();
+
+			return trans;
+		}
+
+		private SqlTransaction TransactionBegin (IsolationLevel il) {
+			// FIXME: need to keep track of 
+			// transaction in-progress
+			TransactionBegin();
+			trans.SetIsolationLevel (il);
+			
+			return trans;
+		}
+
+		#endregion
+
+		#region Public Properties
+
+		[MonoTODO]
+		public ConnectionState State 		{
+			get { 
+				return conState;
+			}
+		}
+
+		public string ConnectionString	{
+			get { 
+				return connectionString;
+			}
+			set { 
+				SetConnectionString (value);
+			}
+		}
+		
+		public int ConnectionTimeout {
+			get { 
+				return connectionTimeout; 
+			}
+		}
+
+		public string Database	{
+			get { 
+				return dbname; 
+			}
+		}
+
+		public string DataSource {
+			get {
+				return host;
+			}
+		}
+
+		public int PacketSize {
+			get { 
+				throw new NotImplementedException ();
+			}
+		}
+
+		public string ServerVersion {
+			get { 
+				return versionString;
+			}
+		}
+
+		#endregion // Public Properties
+
+		#region Internal Properties
+
+		// For System.Data.SqlClient classes
+		// to get the current transaction
+		// in progress - if any
+		internal SqlTransaction Transaction {
+			get {
+				return trans;
+			}
+		}
+
+		// For System.Data.SqlClient classes 
+		// to get the unmanaged PostgreSQL connection
+		internal IntPtr PostgresConnection {
+			get {
+				return pgConn;
+			}
+		}
+
+		// For System.Data.SqlClient classes
+		// to get the list PostgreSQL types
+		// so can look up based on OID to
+		// get the .NET System type.
+		internal ArrayList Types {
+			get {
+				return types.List;
+			}
+		}
+
+		// Used to prevent SqlConnection
+		// from doing anything while
+		// SqlDataReader is open
+		internal bool IsReaderOpen {
+			get {
+				return dataReaderOpen;
+			}
+		}
+
+		#endregion // Internal Properties
+
+		#region Events
+                
+		public event 
+		SqlInfoMessageEventHandler InfoMessage;
+
+		public event 
+		StateChangeEventHandler StateChange;
+		
+		#endregion
+
+		#region Inner Classes
+
+		private class PostgresTypes {
+			// TODO: create hashtable for 
+			// PostgreSQL types to .NET types
+			// containing: oid, typname, SqlDbType
+
+			private Hashtable hashTypes;
+			private ArrayList pgTypes;
+			private SqlConnection con;
+
+			// Got this SQL with the permission from 
+			// the authors of libgda
+			private const string SEL_SQL_GetTypes = 
+				"SELECT oid, typname FROM pg_type " +
+				"WHERE typrelid = 0 AND typname !~ '^_' " +
+				" AND  typname not in ('SET', 'cid', " +
+				"'int2vector', 'oidvector', 'regproc', " +
+				"'smgr', 'tid', 'unknown', 'xid') " +
+				"ORDER BY typname";
+
+			internal PostgresTypes(SqlConnection sqlcon) {
+				
+				con = sqlcon;
+				hashTypes = new Hashtable();
+			}
+
+			private void AddPgType(Hashtable types, 

+				string typname, DbType dbType) {

+

+				PostgresType pgType = new PostgresType();

+			

+				pgType.typname = typname;

+				pgType.dbType = dbType;	

+

+				types.Add(pgType.typname, pgType);

+			}

+
+			private void BuildTypes(IntPtr pgResult, 
+				int nRows, int nFields) {
+
+				String value;
+
+				int r;
+				for(r = 0; r < nRows; r++) {
+					PostgresType pgType = 
+						new PostgresType();
+
+					// get data value (oid)
+					value = PostgresLibrary.
+						PQgetvalue(
+							pgResult,
+							r, 0);
+						
+					pgType.oid = Int32.Parse(value);

+

+					// get data value (typname)

+					value = PostgresLibrary.
+						PQgetvalue(
+						pgResult,
+						r, 1);	

+					pgType.typname = String.Copy(value);

+					pgType.dbType = PostgresHelper.

+							TypnameToSqlDbType(

+								pgType.typname);

+

+					pgTypes.Add(pgType);
+				}
+				pgTypes = ArrayList.ReadOnly(pgTypes);
+			}
+
+			internal void Load() {
+				pgTypes = new ArrayList();
+				IntPtr pgResult = IntPtr.Zero; // PGresult
+				
+				if(con.State != ConnectionState.Open)
+					throw new InvalidOperationException(
+						"ConnnectionState is not Open");
+
+				// FIXME: PQexec blocks 
+				// while PQsendQuery is non-blocking
+				// which is better to use?
+				// int PQsendQuery(PGconn *conn,
+				//        const char *query);
+
+				// execute SQL command
+				// uses internal property to get the PGConn IntPtr
+				pgResult = PostgresLibrary.
+					PQexec (con.PostgresConnection, SEL_SQL_GetTypes);
+
+				if(pgResult.Equals(IntPtr.Zero)) {
+					throw new SqlException(0, 0,
+						"No Resultset from PostgreSQL", 0, "",
+						con.DataSource, "SqlConnection", 0);
+				}
+				else {
+					ExecStatusType execStatus;
+
+					execStatus = PostgresLibrary.
+						PQresultStatus (pgResult);
+			
+					if(execStatus == ExecStatusType.PGRES_TUPLES_OK) {
+						int nRows;
+						int nFields;
+
+						nRows = PostgresLibrary.
+							PQntuples(pgResult);
+
+						nFields = PostgresLibrary.
+							PQnfields(pgResult);
+
+						BuildTypes (pgResult, nRows, nFields);
+
+						// close result set
+						PostgresLibrary.PQclear (pgResult);
+						pgResult = IntPtr.Zero;
+					}
+					else {
+						String errorMessage;
+				
+						errorMessage = PostgresLibrary.
+							PQresStatus(execStatus);
+
+						errorMessage += " " + PostgresLibrary.

+							PQresultErrorMessage(pgResult);

+

+						// close result set
+						PostgresLibrary.PQclear (pgResult);
+						pgResult = IntPtr.Zero;
+

+						throw new SqlException(0, 0,
+							errorMessage, 0, "",
+							con.DataSource, "SqlConnection", 0);

+					}
+				}
+			}
+
+			public ArrayList List {
+				get {
+					return pgTypes;
+				}
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlDataAdapter.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlDataAdapter.cs
new file mode 100644
index 00000000000..526f8f36818
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlDataAdapter.cs
@@ -0,0 +1,191 @@
+//
+// System.Data.SqlClient.SqlDataAdapter.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc 2002
+// Copyright (C) 2002 Tim Coleman
+//
+
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Represents a set of command-related properties that are used 
+	/// to fill the DataSet and update a data source, all this 
+	/// from a SQL database.
+	/// </summary>
+	public sealed class SqlDataAdapter : DbDataAdapter, IDbDataAdapter 
+	{
+		#region Fields
+	
+		SqlCommand deleteCommand;
+		SqlCommand insertCommand;
+		SqlCommand selectCommand;
+		SqlCommand updateCommand;
+
+		static readonly object EventRowUpdated = new object(); 
+		static readonly object EventRowUpdating = new object(); 
+
+		#endregion
+
+		#region Constructors
+		
+		public SqlDataAdapter () 	
+			: this (new SqlCommand ())
+		{
+		}
+
+		public SqlDataAdapter (SqlCommand selectCommand) 
+		{
+			DeleteCommand = new SqlCommand ();
+			InsertCommand = new SqlCommand ();
+			SelectCommand = selectCommand;
+			UpdateCommand = new SqlCommand ();
+		}
+
+		public SqlDataAdapter (string selectCommandText, SqlConnection selectConnection) 
+			: this (new SqlCommand (selectCommandText, selectConnection))
+		{ 
+		}
+
+		public SqlDataAdapter (string selectCommandText, string selectConnectionString)
+			: this (selectCommandText, new SqlConnection (selectConnectionString))
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public SqlCommand DeleteCommand {
+			get {
+				return deleteCommand;
+			}
+			set {
+				deleteCommand = value;
+			}
+		}
+
+		public SqlCommand InsertCommand {
+			get {
+				return insertCommand;
+			}
+			set {
+				insertCommand = value;
+			}
+		}
+
+		public SqlCommand SelectCommand {
+			get {
+				return selectCommand;
+			}
+			set {
+				selectCommand = value;
+			}
+		}
+
+		public SqlCommand UpdateCommand {
+			get {
+				return updateCommand;
+			}
+			set {
+				updateCommand = value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.DeleteCommand {
+			get { return DeleteCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				DeleteCommand = (SqlCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.InsertCommand {
+			get { return InsertCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				InsertCommand = (SqlCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.SelectCommand {
+			get { return SelectCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				SelectCommand = (SqlCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.UpdateCommand {
+			get { return UpdateCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				UpdateCommand = (SqlCommand)value;
+			}
+		}
+
+
+		ITableMappingCollection IDataAdapter.TableMappings {
+			get { return TableMappings; }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		protected override RowUpdatedEventArgs CreateRowUpdatedEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+		{
+			return new SqlRowUpdatedEventArgs (dataRow, command, statementType, tableMapping);
+		}
+
+
+		protected override RowUpdatingEventArgs CreateRowUpdatingEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+		{
+			return new SqlRowUpdatingEventArgs (dataRow, command, statementType, tableMapping);
+		}
+
+		protected override void OnRowUpdated (RowUpdatedEventArgs value) 
+		{
+         		SqlRowUpdatedEventHandler handler = (SqlRowUpdatedEventHandler) Events[EventRowUpdated];
+			if ((handler != null) && (value is SqlRowUpdatedEventArgs))
+            			handler(this, (SqlRowUpdatedEventArgs) value);
+		}
+
+		protected override void OnRowUpdating (RowUpdatingEventArgs value) 
+		{
+         		SqlRowUpdatingEventHandler handler = (SqlRowUpdatingEventHandler) Events[EventRowUpdating];
+			if ((handler != null) && (value is SqlRowUpdatingEventArgs))
+            			handler(this, (SqlRowUpdatingEventArgs) value);
+		}
+
+		#endregion // Methods
+
+		#region Events and Delegates
+
+		public event SqlRowUpdatedEventHandler RowUpdated {
+			add { Events.AddHandler (EventRowUpdated, value); }
+			remove { Events.RemoveHandler (EventRowUpdated, value); }
+		}
+
+		public event SqlRowUpdatingEventHandler RowUpdating {
+			add { Events.AddHandler (EventRowUpdating, value); }
+			remove { Events.RemoveHandler (EventRowUpdating, value); }
+		}
+
+		#endregion // Events and Delegates
+
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlDataReader.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlDataReader.cs
new file mode 100644
index 00000000000..28d0e1bc4e7
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlDataReader.cs
@@ -0,0 +1,422 @@
+//
+// System.Data.SqlClient.SqlDataReader.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+// (C) Daniel Morgan 2002
+//
+// Credits:
+//    SQL and concepts were used from libgda 0.8.190 (GNOME Data Access)

+//    http://www.gnome-db.org/

+//    with permission from the authors of the

+//    PostgreSQL provider in libgda:

+//        Michael Lausch <michael@lausch.at>
+//        Rodrigo Moya <rodrigo@gnome-db.org>
+//        Vivien Malerba <malerba@gnome-db.org>
+//        Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+//
+
+// *** uncomment #define to get debug messages, comment for production ***
+//#define DEBUG_SqlDataReader
+
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+
+namespace System.Data.SqlClient {
+	/// <summary>
+	/// Provides a means of reading one or more forward-only streams
+	/// of result sets obtained by executing a command 
+	/// at a SQL database.
+	/// </summary>
+	//public sealed class SqlDataReader : MarshalByRefObject,
+	//	IEnumerable, IDataReader, IDisposable, IDataRecord
+	public sealed class SqlDataReader : IEnumerable, 
+		IDataReader, IDataRecord {
+		#region Fields
+
+		private SqlCommand cmd;
+		private DataTable table = null;
+
+		// columns in a row
+		private object[] fields; // data value in a .NET type
+		private string[] types; // PostgreSQL Type
+		private bool[] isNull; // is NULL?
+		private int[] actualLength; // ActualLength of data
+		private DbType[] dbTypes; // DB data type
+		// actucalLength = -1 is variable-length
+				
+		private bool open = false;
+		IntPtr pgResult; // PGresult
+		private int rows;
+		private int cols;
+
+		private int recordsAffected = -1; // TODO: get this value
+
+		private int currentRow = -1; // no Read() has been done yet
+
+		#endregion // Fields
+
+		#region Constructors
+
+		internal SqlDataReader (SqlCommand sqlCmd) {
+
+			cmd = sqlCmd;
+			open = true;
+			cmd.OpenReader(this);
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		[MonoTODO]
+		public void Close() {
+			open = false;
+			
+			// free SqlDataReader resources in SqlCommand
+			// and allow SqlConnection to be used again
+			cmd.CloseReader();
+
+			// TODO: get parameters from result
+
+			// clear unmanaged PostgreSQL result set
+			PostgresLibrary.PQclear (pgResult);
+			pgResult = IntPtr.Zero;
+		}
+
+		[MonoTODO]
+		public DataTable GetSchemaTable() {
+			return table;
+		}
+
+		[MonoTODO]
+		public bool NextResult() {
+			SqlResult res;
+			currentRow = -1;
+			bool resultReturned;
+			
+			// reset
+			table = null;
+			pgResult = IntPtr.Zero;
+			rows = 0;
+			cols = 0;
+			types = null;
+			recordsAffected = -1;
+
+			res = cmd.NextResult();
+			resultReturned = res.ResultReturned;
+
+			if(resultReturned == true) {
+				table = res.Table;
+				pgResult = res.PgResult;
+				rows = res.RowCount;
+				cols = res.FieldCount;
+				types = res.PgTypes;
+				recordsAffected = res.RecordsAffected;
+			}
+			
+			res = null;
+			return resultReturned;
+		}
+
+		[MonoTODO]
+		public bool Read() {
+			
+			string dataValue;
+			int c = 0;
+			
+			if(currentRow < rows - 1)  {
+				
+				currentRow++;
+			
+				// re-init row
+				fields = new object[cols];
+				//dbTypes = new DbType[cols];
+				actualLength = new int[cols];
+				isNull = new bool[cols];
+			
+				for(c = 0; c < cols; c++) {
+
+					// get data value
+					dataValue = PostgresLibrary.
+						PQgetvalue(
+						pgResult,
+						currentRow, c);
+
+					// is column NULL?
+					//isNull[c] = PostgresLibrary.
+					//	PQgetisnull(pgResult,
+					//	currentRow, c);
+
+					// get Actual Length
+					actualLength[c] = PostgresLibrary.
+						PQgetlength(pgResult,
+						currentRow, c);
+
+					DbType dbType;	
+					dbType = PostgresHelper.
+						TypnameToSqlDbType(types[c]);
+
+					if(dataValue == null) {
+						fields[c] = null;
+						isNull[c] = true;
+					}
+					else if(dataValue.Equals("")) {
+						fields[c] = null;
+						isNull[c] = true;
+					}
+					else {
+						isNull[c] = false;
+						fields[c] = PostgresHelper.
+							ConvertDbTypeToSystem (
+							dbType,
+							dataValue);
+					}
+				}
+				return true;
+			}
+			return false; // EOF
+		}
+
+		[MonoTODO]
+		public byte GetByte(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public long GetBytes(int i, long fieldOffset, 
+			byte[] buffer, int bufferOffset, 
+			int length) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public char GetChar(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public long GetChars(int i, long fieldOffset, 
+			char[] buffer, int bufferOffset, 
+			int length) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public IDataReader GetData(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string GetDataTypeName(int i) {
+			return types[i];
+		}
+
+		[MonoTODO]
+		public DateTime GetDateTime(int i) {
+			return (DateTime) fields[i];
+		}
+
+		[MonoTODO]
+		public decimal GetDecimal(int i) {
+			return (decimal) fields[i];
+		}
+
+		[MonoTODO]
+		public double GetDouble(int i) {
+			return (double) fields[i];
+		}
+
+		[MonoTODO]
+		public Type GetFieldType(int i) {
+
+			DataRow row = table.Rows[i];
+			return Type.GetType((string)row["DataType"]);
+		}
+
+		[MonoTODO]
+		public float GetFloat(int i) {
+			return (float) fields[i];
+		}
+
+		[MonoTODO]
+		public Guid GetGuid(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public short GetInt16(int i) {
+			return (short) fields[i];
+		}
+
+		[MonoTODO]
+		public int GetInt32(int i) {
+			return (int) fields[i];
+		}
+
+		[MonoTODO]
+		public long GetInt64(int i) {
+			return (long) fields[i];
+		}
+
+		[MonoTODO]
+		public string GetName(int i) {
+
+			DataRow row = table.Rows[i];
+			return (string) row["ColumnName"];
+		}
+
+		[MonoTODO]
+		public int GetOrdinal(string name) {
+
+			int i;
+			DataRow row;
+
+			for(i = 0; i < table.Rows.Count; i++) {
+				row = table.Rows[i];
+				if(((string) row["ColumnName"]).Equals(name))
+					return i;
+			}
+
+			for(i = 0; i < table.Rows.Count; i++) {
+				string ta;
+				string n;
+					
+				row = table.Rows[i];
+				ta = ((string) row["ColumnName"]).ToUpper();
+				n = name.ToUpper();
+						
+				if(ta.Equals(n)) {
+					return i;
+				}
+			}
+			
+			throw new MissingFieldException("Missing field: " + name);
+		}
+
+		[MonoTODO]
+		public string GetString(int i) {
+			return (string) fields[i];
+		}
+
+		[MonoTODO]
+		public object GetValue(int i) {
+			return fields[i];
+		}
+
+		[MonoTODO]
+		public int GetValues(object[] values) 
+		{
+			Array.Copy (fields, values, fields.Length);
+			return fields.Length;
+		}
+
+		[MonoTODO]
+		public bool IsDBNull(int i) {
+			return isNull[i];
+		}
+
+		[MonoTODO]
+		public bool GetBoolean(int i) {
+			return (bool) fields[i];
+		}
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator() {
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Public Methods
+
+		#region Destructors
+
+		[MonoTODO]
+		public void Dispose () {
+		}
+
+		//[MonoTODO]
+		//~SqlDataReader() {
+		//}
+
+		#endregion // Destructors
+
+		#region Properties
+
+		public int Depth {
+			[MonoTODO]
+			get { 
+				return 0; // always return zero, unless
+				          // this provider will allow
+				          // nesting of a row
+			}
+		}
+
+		public bool IsClosed {
+			[MonoTODO]
+			get {
+				if(open == false)
+					return true;
+				else
+					return false;
+			}
+		}
+
+		public int RecordsAffected {
+			[MonoTODO]
+			get { 
+				return recordsAffected;
+			}
+		}
+	
+		public int FieldCount {
+			[MonoTODO]
+			get { 
+				return cols;
+			}
+		}
+
+		public object this[string name] {
+			[MonoTODO]
+			get { 
+				int i;
+				DataRow row;
+
+				for(i = 0; i < table.Rows.Count; i++) {
+					row = table.Rows[i];
+					if(row["ColumnName"].Equals(name))
+						return fields[i];
+				}
+
+				for(i = 0; i < table.Rows.Count; i++) {
+					string ta;
+					string n;
+					
+					row = table.Rows[i];
+					ta = ((string) row["ColumnName"]).ToUpper();
+					n = name.ToUpper();
+						
+					if(ta.Equals(n)) {
+						return fields[i];
+					}
+				}
+			
+				throw new MissingFieldException("Missing field: " + name);
+			}
+		}
+
+		public object this[int i] {
+			[MonoTODO]
+			get { 
+				return fields[i];
+			}
+		}
+
+		#endregion // Properties
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlError.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlError.cs
new file mode 100644
index 00000000000..e7c722285a9
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlError.cs
@@ -0,0 +1,155 @@
+//
+// System.Data.SqlClient.SqlError.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+using System;
+using System.Data;
+using System.Runtime.InteropServices;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Describes an error from a SQL database.
+	/// </summary>
+	[MonoTODO]
+	public sealed class SqlError
+	{
+		byte theClass = 0;
+		int lineNumber = 0;
+		string message = "";
+		int number = 0;
+		string procedure = "";
+		string server = "";
+		string source = "";
+		byte state = 0;
+
+		internal SqlError(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			this.theClass = theClass;
+			this.lineNumber = lineNumber;
+			this.message = message;
+			this.number = number;
+			this.procedure = procedure;
+			this.server = server;
+			this.source = source;
+			this.state = state;
+		}
+		
+		#region Properties
+
+		[MonoTODO]
+		/// <summary>
+		/// severity level of the error
+		/// </summary>
+		public byte Class {
+			get { 
+				return theClass;
+			}
+		}
+
+		[MonoTODO]
+		public int LineNumber {
+			get { 
+			   return lineNumber;
+		   }
+		}
+
+		[MonoTODO]
+		public string Message {
+			get { 
+				return message;
+			}
+		}
+		
+		[MonoTODO]
+		public int Number {
+			get { 
+				return number;
+			}
+		}
+
+		[MonoTODO]
+		public string Procedure {
+			get { 
+				return procedure;
+			}
+		}
+
+		[MonoTODO]
+		public string Server {
+			get { 
+				return server;
+			}
+		}
+
+		[MonoTODO]
+		public string Source {
+			get { 
+				return source;
+			}
+		}
+
+		[MonoTODO]
+		public byte State {
+			get { 
+				return state;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public override string ToString ()
+		{
+			String toStr;
+			String stackTrace;
+			stackTrace = " <Stack Trace>";
+			// FIXME: generate the correct SQL error string
+			toStr = "SqlError:" + message + stackTrace;
+			return toStr;
+		}
+
+		internal void SetClass(byte theClass) {
+			this.theClass = theClass;
+		}
+
+		internal void SetLineNumber(int lineNumber) {
+			this.lineNumber = lineNumber;
+		}
+
+		internal void SetMessage(string message) {
+			this.message = message;
+		}
+
+		internal void SetNumber(int number) {
+			this.number = number;
+		}
+
+		internal void SetProcedure(string procedure) {
+			this.procedure = procedure;
+		}
+
+		internal void SetServer(string server) {
+			this.server = server;
+		}
+
+		internal void SetSource(string source) {
+			this.source = source;
+		}
+
+		internal void SetState(byte state) {
+			this.state = state;
+		}
+
+		#endregion
+		
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlErrorCollection.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlErrorCollection.cs
new file mode 100644
index 00000000000..7050d5d08fa
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlErrorCollection.cs
@@ -0,0 +1,114 @@
+//
+// System.Data.SqlClient.SqlError.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+using System;
+using System.Collections;
+using System.Data;
+using System.Runtime.InteropServices;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Describes an error from a SQL database.
+	/// </summary>
+	[MonoTODO]
+	public sealed class SqlErrorCollection : ICollection, IEnumerable
+	{
+		ArrayList errorList = new ArrayList();
+
+		internal SqlErrorCollection() {
+		}
+
+		internal SqlErrorCollection(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			
+			Add (theClass, lineNumber, message,
+				number, procedure,
+				server, source, state);
+		}
+
+		#region Properties
+                
+		[MonoTODO]
+		public int Count {
+			get {	
+				return errorList.Count;
+			}			  
+		}
+
+		[MonoTODO]
+		public void CopyTo(Array array,	int index) {
+			throw new NotImplementedException ();
+		}
+
+		// [MonoTODO]
+		bool ICollection.IsSynchronized {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		// [MonoTODO]
+		object ICollection.SyncRoot {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator() {
+			throw new NotImplementedException ();
+		}
+		
+		// Index property (indexer)
+		// [MonoTODO]
+		public SqlError this[int index] {
+			get {
+				return (SqlError) errorList[index];
+			}
+		}
+
+		#endregion
+
+		#region Methods
+		
+		[MonoTODO]
+		public override string ToString()
+		{
+			throw new NotImplementedException ();
+		}
+		#endregion
+
+		internal void Add(SqlError error) {
+			errorList.Add(error);
+		}
+
+		internal void Add(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			
+			SqlError error = new SqlError(theClass,
+				lineNumber, message,
+				number, procedure,
+				server, source, state);
+			Add(error);
+		}
+
+		#region Destructors
+
+		[MonoTODO]
+		~SqlErrorCollection()
+		{
+			// FIXME: do the destructor - release resources
+		}
+
+		#endregion		
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlException.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlException.cs
new file mode 100644
index 00000000000..e447b599372
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlException.cs
@@ -0,0 +1,204 @@
+//
+// System.Data.SqlClient.SqlException.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc
+//
+using System;
+using System.Data;
+using System.Runtime.Serialization;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Exceptions, as returned by SQL databases.
+	/// </summary>
+	public sealed class SqlException : SystemException
+	{
+		private SqlErrorCollection errors; 
+
+		internal SqlException() 
+			: base("a SQL Exception has occurred") {
+			errors = new SqlErrorCollection();
+		}
+
+		internal SqlException(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) 
+				: base(message) {	
+			
+			errors = new SqlErrorCollection (theClass, 
+				lineNumber, message,
+				number, procedure,
+				server, source, state);
+		}
+
+		#region Properties
+
+		[MonoTODO]
+		public byte Class {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception here?
+				else
+					return errors[0].Class;
+			}
+
+			set { 
+				errors[0].SetClass(value);
+			}
+		}
+
+		[MonoTODO]
+		public SqlErrorCollection Errors {
+			get { 
+				return errors;
+			}
+
+			set { 
+				errors = value;
+			}
+		}
+
+		[MonoTODO]
+		public int LineNumber {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception here?
+				return errors[0].LineNumber;
+			}
+
+			set { 
+				errors[0].SetLineNumber(value);
+			}
+		}
+		
+		[MonoTODO]
+		public override string Message 	{
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else {
+					String msg = "";
+					int i = 0;
+					
+					for(i = 0; i < errors.Count - 1; i++) {
+						msg = msg + errors[i].Message + "\n";
+                                        }
+					msg = msg + errors[i].Message;
+
+					return msg;
+				}
+			}
+		}
+		
+		[MonoTODO]
+		public int Number {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception?
+				else
+					return errors[0].Number;
+			}
+
+			set { 
+				errors[0].SetNumber(value);
+			}
+		}
+		
+		[MonoTODO]
+		public string Procedure {
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else
+					return errors[0].Procedure;
+			}
+
+			set { 
+				errors[0].SetProcedure(value);
+			}
+		}
+
+		[MonoTODO]
+		public string Server {
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else
+					return errors[0].Server;
+			}
+
+			set { 
+				errors[0].SetServer(value);
+			}
+		}
+		
+		[MonoTODO]
+		public override string Source {
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else
+					return errors[0].Source;
+			}
+
+			set { 
+				errors[0].SetSource(value);
+			}
+		}
+
+		[MonoTODO]
+		public byte State {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception?
+				else
+					return errors[0].State;
+			}
+
+			set { 
+				errors[0].SetState(value);
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public override void GetObjectData(SerializationInfo si,
+			StreamingContext context) {
+			// FIXME: to do
+		}
+
+		// [Serializable]
+		// [ClassInterface(ClassInterfaceType.AutoDual)]
+		public override string ToString() {
+			String toStr = "";
+			for (int i = 0; i < errors.Count; i++) {
+				toStr = toStr + errors[i].ToString() + "\n";
+			}
+			return toStr;
+		}
+
+		internal void Add(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			
+			errors.Add (theClass, lineNumber, message,
+				number, procedure,
+				server, source, state);
+		}
+
+		[MonoTODO]
+		~SqlException() {
+			// FIXME: destructor to release resources
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventArgs.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventArgs.cs
new file mode 100644
index 00000000000..df69dff1d35
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventArgs.cs
@@ -0,0 +1,51 @@
+//
+// System.Data.SqlClient.SqlInfoMessageEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public sealed class SqlInfoMessageEventArgs : EventArgs
+	{
+		[MonoTODO]
+		public SqlErrorCollection Errors {
+			get { 
+				throw new NotImplementedException (); 
+			}
+		}	
+
+		[MonoTODO]
+		public string Message 
+		{
+			get { 
+				throw new NotImplementedException (); 
+			}
+		}	
+
+		[MonoTODO]
+		public string Source {
+			get { 
+				throw new NotImplementedException (); 
+			}
+		}
+
+		[MonoTODO]
+		public override string ToString() {
+			// representation of InfoMessage event
+			return "'ToString() for SqlInfoMessageEventArgs Not Implemented'";
+		}
+
+		//[MonoTODO]
+		//~SqlInfoMessageEventArgs() {
+			// FIXME: destructor needs to release resources
+		//}
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventHandler.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventHandler.cs
new file mode 100644
index 00000000000..c9862d61c03
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlInfoMessageEventHandler.cs
@@ -0,0 +1,19 @@
+//
+// System.Data.SqlClient.SqlInfoMessageEventHandler.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public delegate void 
+	SqlInfoMessageEventHandler (object sender,
+				SqlInfoMessageEventArgs e);
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlParameter.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlParameter.cs
new file mode 100644
index 00000000000..6c05695eafc
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlParameter.cs
@@ -0,0 +1,237 @@
+//
+// System.Data.SqlClient.SqlParameter.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc. 2002
+//
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Represents a parameter to a Command object, and optionally, 
+	/// its mapping to DataSet columns; and is implemented by .NET 
+	/// data providers that access data sources.
+	/// </summary>
+	//public sealed class SqlParameter : MarshalByRefObject,
+	//	IDbDataParameter, IDataParameter, ICloneable
+	public sealed class SqlParameter : IDbDataParameter, IDataParameter
+	{
+		private string parmName;
+		private SqlDbType dbtype;
+		private DbType    theDbType;
+		private object objValue;
+		private int size;
+		private string sourceColumn;
+		private ParameterDirection direction;
+		private bool isNullable;
+		private byte precision;
+		private byte scale;
+		private DataRowVersion sourceVersion;
+		private int offset;
+
+		[MonoTODO]
+		public SqlParameter () {
+		
+		}
+
+		[MonoTODO]
+		public SqlParameter (string parameterName, object value) {
+			this.parmName = parameterName;
+			this.objValue = value;
+		}
+		
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType) {
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+		}
+
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType,
+			int size) {
+
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+			this.size = size;
+		}
+		
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType,
+			int size, string sourceColumn) {
+
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+			this.size = size;
+			this.sourceColumn = sourceColumn;
+		}
+			 
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType,
+			int size, ParameterDirection direction, 
+			bool isNullable, byte precision,
+			byte scale, string sourceColumn,
+			DataRowVersion sourceVersion, object value) {
+			
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+			this.size = size;
+			this.sourceColumn = sourceColumn;
+			this.direction = direction;
+			this.isNullable = isNullable;
+			this.precision = precision;
+			this.scale = scale;
+			this.sourceVersion = sourceVersion;
+			this.objValue = value;
+		}
+
+		[MonoTODO]
+		public DbType DbType {
+			get { 
+				return theDbType;
+			}
+			set { 
+				theDbType = value;
+			}
+		}
+
+		[MonoTODO]
+		public ParameterDirection Direction {
+			get { 
+				return direction;
+			}
+			set { 
+				direction = value;
+			}
+		}
+
+		[MonoTODO]
+		public bool IsNullable	{
+			get { 
+				return isNullable;
+			}
+		}
+
+		[MonoTODO]
+		public int Offset {
+			get {
+				return offset;
+			}
+			
+			set {
+				offset = value;
+			}
+		}
+
+		
+		string IDataParameter.ParameterName {
+			get { 
+				return parmName;
+			}
+
+			set { 
+				parmName = value;
+			}
+		}
+		
+		public string ParameterName {
+			get { 
+				return parmName;
+			}
+
+			set { 
+				parmName = value;
+			}
+		}
+
+		[MonoTODO]
+		public string SourceColumn {
+			get { 
+				return sourceColumn;
+			}
+
+			set { 
+				sourceColumn = value;
+			}
+		}
+
+		[MonoTODO]
+		public DataRowVersion SourceVersion {
+			get { 
+				return sourceVersion;
+			}
+
+			set { 
+				sourceVersion = value;
+			}
+		}
+		
+		[MonoTODO]
+		public SqlDbType SqlDbType {
+			get {
+				return dbtype;
+			}
+			
+			set {
+				dbtype = value;
+			}
+		}
+
+		[MonoTODO]
+		public object Value {
+			get { 
+				return objValue;
+			}
+
+			set { 
+				objValue = value;
+			}
+		}
+
+		[MonoTODO]
+		public byte Precision {
+			get { 
+				return precision;
+			}
+
+			set { 
+				precision = value;
+			}
+		}
+
+		[MonoTODO]
+                public byte Scale {
+			get { 
+				return scale;
+			}
+
+			set { 
+				scale = value;
+			}
+		}
+
+		[MonoTODO]
+                public int Size
+		{
+			get { 
+				return size;
+			}
+
+			set { 
+				size = value;
+			}
+		}
+
+		[MonoTODO]
+		public override string ToString() {
+			return parmName;
+		}
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlParameterCollection.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlParameterCollection.cs
new file mode 100644
index 00000000000..c1778299b86
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlParameterCollection.cs
@@ -0,0 +1,267 @@
+//
+// System.Data.SqlClient.SqlParameterCollection.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Collections;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Collects all parameters relevant to a Command object 
+	/// and their mappings to DataSet columns.
+	/// </summary>
+	// public sealed class SqlParameterCollection : MarshalByRefObject,
+	// IDataParameterCollection, IList, ICollection, IEnumerable
+	public sealed class SqlParameterCollection : IDataParameterCollection,
+		IList
+	{
+		private ArrayList parameterList = new ArrayList();
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator()
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		public int Add(	object value)
+		{
+			// Call the add version that receives a SqlParameter 
+			
+			// Check if value is a SqlParameter.
+			CheckType(value);
+			Add((SqlParameter) value);
+
+			return IndexOf (value);
+		}
+
+		
+		public SqlParameter Add(SqlParameter value)
+		{
+			parameterList.Add(value);
+			return value;
+		}
+
+		
+		public SqlParameter Add(string parameterName, object value)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.Value = value;
+			// TODO: Get the dbtype and Sqldbtype from system type of value.
+			
+			return Add(sqlparam);
+		}
+
+		
+		public SqlParameter Add(string parameterName, SqlDbType sqlDbType)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.ParameterName = parameterName;
+			sqlparam.SqlDbType = sqlDbType;
+			return Add(sqlparam);			
+		}
+
+		
+		public SqlParameter Add(string parameterName,
+			SqlDbType sqlDbType, int size)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.ParameterName = parameterName;
+			sqlparam.SqlDbType = sqlDbType;
+			sqlparam.Size = size;
+			return Add(sqlparam);			
+		}
+
+		
+		public SqlParameter Add(string parameterName,
+			SqlDbType sqlDbType, int size, string sourceColumn)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.ParameterName = parameterName;
+			sqlparam.SqlDbType = sqlDbType;
+			sqlparam.Size = size;
+			sqlparam.SourceColumn = sourceColumn;
+			return Add(sqlparam);			
+		}
+
+		[MonoTODO]
+		public void Clear()
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		public bool Contains(object value)
+		{
+			// Check if value is a SqlParameter
+			CheckType(value);
+			return Contains(((SqlParameter)value).ParameterName);
+		}
+
+
+		[MonoTODO]
+		public bool Contains(string value)
+		{
+			for(int p = 0; p < parameterList.Count; p++) {
+				if(((SqlParameter)parameterList[p]).ParameterName.Equals(value))
+					return true;
+			}
+			return false;
+		}
+
+		[MonoTODO]
+		public void CopyTo(Array array,	int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		public int IndexOf(object value)
+		{
+			// Check if value is a SqlParameter
+			CheckType(value);
+			return IndexOf(((SqlParameter)value).ParameterName);
+		}
+
+		
+		public int IndexOf(string parameterName)
+		{
+			int p = -1;
+
+			for(p = 0; p < parameterList.Count; p++) {
+				if(((SqlParameter)parameterList[p]).ParameterName.Equals(parameterName))
+					return p;
+			}
+			return p;
+		}
+
+		[MonoTODO]
+		public void Insert(int index, object value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Remove(object value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RemoveAt(int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RemoveAt(string parameterName)
+		{
+			throw new NotImplementedException ();
+		}
+	
+		[MonoTODO]
+		public int Count {
+			get {	
+				return parameterList.Count;
+			}			  
+		}
+
+		object IList.this[int index] {
+			[MonoTODO]
+			get { 
+				return (SqlParameter) this[index];
+			}
+			
+			[MonoTODO]
+			set { 
+				this[index] = (SqlParameter) value;
+			}
+		}
+
+		public SqlParameter this[int index] {
+			get {	
+				return (SqlParameter) parameterList[index];
+			}			  
+			
+			set {	
+				parameterList[index] = (SqlParameter) value;
+			}			  
+		}
+
+		object IDataParameterCollection.this[string parameterName] {
+			[MonoTODO]
+			get { 
+				return this[parameterName];
+			}
+			
+			[MonoTODO]
+			set { 
+				CheckType(value);
+				this[parameterName] = (SqlParameter) value;
+			}
+		}
+
+		public SqlParameter this[string parameterName] {
+			get {	
+				for(int p = 0; p < parameterList.Count; p++) {
+					if(parameterName.Equals(((SqlParameter)parameterList[p]).ParameterName))
+						return (SqlParameter) parameterList[p];
+				}
+				throw new IndexOutOfRangeException("The specified name does not exist: " + parameterName);
+			}	  
+			
+			set {	
+				for(int p = 0; p < parameterList.Count; p++) {
+					if(parameterName.Equals(((SqlParameter)parameterList[p]).ParameterName))
+						parameterList[p] = value;
+				}
+				throw new IndexOutOfRangeException("The specified name does not exist: " + parameterName);
+			}			  
+		}
+
+		bool IList.IsFixedSize {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		bool IList.IsReadOnly {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		bool ICollection.IsSynchronized {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		object ICollection.SyncRoot {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+		
+		/// <summary>
+		/// This method checks if the parameter value is of 
+		/// SqlParameter type. If it doesn't, throws an InvalidCastException.
+		/// </summary>
+		private void CheckType(object value)
+		{
+			if(!(value is SqlParameter))
+				throw new InvalidCastException("Only SQLParameter objects can be used.");
+		}
+		
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventArgs.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventArgs.cs
new file mode 100644
index 00000000000..dbc5789aa95
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventArgs.cs
@@ -0,0 +1,37 @@
+//
+// System.Data.SqlClient.SqlRowUpdatedEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient {
+	public sealed class SqlRowUpdatedEventArgs : RowUpdatedEventArgs 
+	{
+		[MonoTODO]
+		public SqlRowUpdatedEventArgs (DataRow row, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+			: base (row, command, statementType, tableMapping)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public new SqlCommand Command {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		~SqlRowUpdatedEventArgs () 
+		{
+			throw new NotImplementedException ();
+		}
+
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventHandler.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventHandler.cs
new file mode 100644
index 00000000000..8cad2f1cbca
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatedEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.SqlClient.SqlRowUpdatedEventHandler.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public delegate void SqlRowUpdatedEventHandler(object sender,
+					SqlRowUpdatedEventArgs e);
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventArgs.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventArgs.cs
new file mode 100644
index 00000000000..6194ca1f95d
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventArgs.cs
@@ -0,0 +1,43 @@
+//
+// System.Data.SqlClient.SqlRowUpdatingEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient
+{
+	public sealed class SqlRowUpdatingEventArgs : RowUpdatingEventArgs
+	{
+		[MonoTODO]
+		public SqlRowUpdatingEventArgs (DataRow row, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+			: base (row, command, statementType, tableMapping)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public new SqlCommand Command {
+			get {
+				throw new NotImplementedException ();
+			} 
+			
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		~SqlRowUpdatingEventArgs() 
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventHandler.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventHandler.cs
new file mode 100644
index 00000000000..69c0228534d
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlRowUpdatingEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.SqlClient.SqlRowUpdatingEventHandler.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public delegate void SqlRowUpdatingEventHandler(object sender,
+			SqlRowUpdatingEventArgs e);
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PgSqlTransaction.cs b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlTransaction.cs
new file mode 100644
index 00000000000..3a485b299c5
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PgSqlTransaction.cs
@@ -0,0 +1,191 @@
+//
+// System.Data.SqlClient.SqlTransaction.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc. 2002
+//
+
+// use #define DEBUG_SqlTransaction if you want to spew debug messages
+// #define DEBUG_SqlTransaction
+
+
+using System;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Represents a transaction to be performed on a SQL database.
+	/// </summary>
+	// public sealed class SqlTransaction : MarshalByRefObject,
+	//	IDbTransaction, IDisposable
+	public sealed class SqlTransaction : IDbTransaction
+	{
+		#region Fields
+
+		private bool doingTransaction = false;
+		private SqlConnection conn = null;
+		private IsolationLevel isolationLevel =	
+			IsolationLevel.ReadCommitted;
+		// There are only two IsolationLevel's for PostgreSQL:
+		//    ReadCommitted and Serializable, 
+		// but ReadCommitted is the default 
+		
+		#endregion
+               
+		#region Public Methods
+
+		[MonoTODO]
+		public void Commit ()
+		{
+			if(doingTransaction == false)
+				throw new InvalidOperationException(
+					"Begin transaction was not " +
+					"done earlier " +
+					"thus PostgreSQL can not " +
+					"Commit transaction.");
+			
+			SqlCommand cmd = new SqlCommand("COMMIT", conn);
+			cmd.ExecuteNonQuery();
+						
+			doingTransaction = false;
+		}		
+
+		[MonoTODO]
+		public void Rollback()
+		{
+			if(doingTransaction == false)
+				throw new InvalidOperationException(
+					"Begin transaction was not " +
+					"done earlier " +
+					"thus PostgreSQL can not " +
+					"Rollback transaction.");
+			
+			SqlCommand cmd = new SqlCommand("ROLLBACK", conn);
+			cmd.ExecuteNonQuery();
+						
+			doingTransaction = false;
+		}
+
+		// For PostgreSQL, Rollback(string) will not be implemented
+		// because PostgreSQL does not support Savepoints
+		[Obsolete]
+		public void Rollback(string transactionName) {
+			// throw new NotImplementedException ();
+			Rollback();
+		}
+
+		// For PostgreSQL, Save(string) will not be implemented
+		// because PostgreSQL does not support Savepoints
+		[Obsolete]
+		public void Save (string savePointName) {
+			// throw new NotImplementedException ();
+		}
+
+		#endregion // Public Methods
+
+		#region Internal Methods to System.Data.dll Assembly
+
+		internal void Begin()
+		{
+			if(doingTransaction == true)
+				throw new InvalidOperationException(
+					"Transaction has begun " +
+					"and PostgreSQL does not " +
+					"support nested transactions.");
+			
+			SqlCommand cmd = new SqlCommand("BEGIN", conn);
+			cmd.ExecuteNonQuery();
+						
+			doingTransaction = true;
+		}
+
+		internal void SetIsolationLevel(IsolationLevel isoLevel)
+		{
+			String sSql = "SET TRANSACTION ISOLATION LEVEL ";
+ 
+			switch (isoLevel) 

+			{
+				case IsolationLevel.ReadCommitted:
+					sSql += "READ COMMITTED";
+					break;
+
+				case IsolationLevel.Serializable:
+					sSql += "SERIALIZABLE";
+					break;
+
+				default:
+					// FIXME: generate exception here
+					// PostgreSQL only supports:
+					//   ReadCommitted or Serializable
+					break;
+			}
+			SqlCommand cmd = new SqlCommand(sSql, conn);
+			cmd.ExecuteNonQuery();
+
+			this.isolationLevel = isoLevel;
+		}
+
+		internal void SetConnection(SqlConnection connection)
+		{
+			this.conn = connection;
+		}
+
+		#endregion // Internal Methods to System.Data.dll Assembly
+
+		#region Properties
+
+		IDbConnection IDbTransaction.Connection	{
+			get { 
+				return Connection; 
+			}
+		}
+
+		public SqlConnection Connection	{
+			get { 
+				return conn; 
+			}
+		}
+
+		public IsolationLevel IsolationLevel {
+			get { 
+				return isolationLevel; 
+			}
+		}
+
+		internal bool DoingTransaction {
+			get {
+				return doingTransaction;
+			}
+		}
+
+		#endregion Properties
+
+		#region Destructors
+
+		// Destructors aka Finalize and Dispose
+
+		[MonoTODO]
+		public void Dispose()
+		{
+			// FIXME: need to properly release resources
+			// Dispose(true);
+		}
+
+		// Destructor 
+		[MonoTODO]
+		// [Serializable]

+		// [ClassInterface(ClassInterfaceType.AutoDual)]
+		~SqlTransaction() {
+			// FIXME: need to properly release resources
+			// Dispose(false);
+		}
+
+		#endregion // Destructors
+
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PostgresLibrary.cs b/mcs/class/Mono.Data.PostgreSqlClient/PostgresLibrary.cs
new file mode 100644
index 00000000000..493afcd49e2
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PostgresLibrary.cs
@@ -0,0 +1,475 @@
+//
+// System.Data.SqlClient.PostgresLibrary.cs  
+//
+// PInvoke methods to libpq
+// which is PostgreSQL client library
+//
+// May also contain enumerations,
+// data types, or wrapper methods.
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+// *** uncomment #define to get debug messages, comment for production ***
+//#define DEBUG_PostgresLibrary
+
+using System;
+using System.Data;
+using System.Runtime.InteropServices;
+using System.Diagnostics;
+using System.Collections;
+
+namespace System.Data.SqlClient {
+
+	/* IMPORTANT: DO NOT CHANGE ANY OF THESE ENUMS BELOW */
+	
+	internal enum ConnStatusType
+	{
+		CONNECTION_OK,
+		CONNECTION_BAD,
+		CONNECTION_STARTED,
+		CONNECTION_MADE,
+		CONNECTION_AWAITING_RESPONSE,
+		CONNECTION_AUTH_OK,			 
+		CONNECTION_SETENV		
+	} 
+
+	internal enum PostgresPollingStatusType
+	{
+		PGRES_POLLING_FAILED = 0,
+		PGRES_POLLING_READING,
+		PGRES_POLLING_WRITING,
+		PGRES_POLLING_OK,
+		PGRES_POLLING_ACTIVE
+	}
+
+	internal enum ExecStatusType
+	{
+		PGRES_EMPTY_QUERY = 0,
+		PGRES_COMMAND_OK,			
+		PGRES_TUPLES_OK,			
+		PGRES_COPY_OUT,				
+		PGRES_COPY_IN,				
+		PGRES_BAD_RESPONSE,			
+		PGRES_NONFATAL_ERROR,
+		PGRES_FATAL_ERROR
+	}
+
+	sealed internal class PostgresLibrary
+	{
+		#region PInvoke Functions
+
+		// pinvoke prototypes to PostgreSQL client library
+		// pq.dll on windows and libpq.so on linux
+
+		[DllImport("pq")]
+		public static extern IntPtr PQconnectStart (string conninfo);
+		// PGconn *PQconnectStart(const char *conninfo);
+
+		[DllImport("pq")]
+		public static extern PostgresPollingStatusType PQconnectPoll (IntPtr conn);
+		// PostgresPollingStatusType PQconnectPoll(PGconn *conn);	
+
+		[DllImport("pq")]
+		public static extern IntPtr PQconnectdb (string conninfo);
+		// PGconn *PQconnectdb(const char *conninfo);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQsetdbLogin (string pghost, 
+			string pgport, string pgoptions, 
+			string pgtty, string dbName, 
+			string login, string pwd);
+		// PGconn *PQsetdbLogin(const char *pghost, 
+		//		const char *pgport, const char *pgoptions, 
+		//		const char *pgtty, const char *dbName, 
+		//		const char *login, const char *pwd);
+
+		[DllImport("pq")]
+		public static extern void PQfinish (IntPtr conn);
+		// void PQfinish(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQconndefaults ();
+		// PQconninfoOption *PQconndefaults(void);
+
+		[DllImport("pq")]
+		public static extern void PQconninfoFree (IntPtr connOptions);
+		// void PQconninfoFree(PQconninfoOption *connOptions);
+
+		[DllImport("pq")]
+		public static extern int PQresetStart (IntPtr conn);
+		// int PQresetStart(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQresetPoll (IntPtr conn);
+		// PostgresPollingStatusType PQresetPoll(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern void PQreset (IntPtr conn);
+		// void PQreset(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQrequestCancel (IntPtr conn);
+		// int PQrequestCancel(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQdb (IntPtr conn);
+		// char *PQdb(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQuser (IntPtr conn);
+		// char *PQuser(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQpass (IntPtr conn);
+		// char *PQpass(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQhost (IntPtr conn);
+		// char *PQhost(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQport (IntPtr conn);
+		// char *PQport(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQtty (IntPtr conn);
+		// char *PQtty(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQoptions (IntPtr conn);
+		// char *PQoptions(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern ConnStatusType PQstatus (IntPtr conn);
+		// ConnStatusType PQstatus(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQerrorMessage (IntPtr conn);
+		// char *PQerrorMessage(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQsocket (IntPtr conn);
+		// int PQsocket(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQbackendPID (IntPtr conn);
+		// int PQbackendPID(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQclientEncoding (IntPtr conn);
+		// int PQclientEncoding(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQsetClientEncoding (IntPtr conn,
+			string encoding);
+		// int PQsetClientEncoding(PGconn *conn, 
+		//		const char *encoding);
+
+		//FIXME: when loading, causes runtime exception
+		//[DllImport("pq")]
+		//public static extern IntPtr PQgetssl (IntPtr conn);
+		// SSL *PQgetssl(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern void PQtrace (IntPtr conn, 
+			IntPtr debug_port);
+		// void PQtrace(PGconn *conn, 
+		//		FILE *debug_port);
+
+		[DllImport("pq")]
+		public static extern void PQuntrace (IntPtr conn);
+		// void PQuntrace(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQsetNoticeProcessor (IntPtr conn,
+			IntPtr proc, IntPtr arg);
+		// PQnoticeProcessor PQsetNoticeProcessor(PGconn *conn, 
+		//		PQnoticeProcessor proc, void *arg);
+
+		[DllImport("pq")]
+		public static extern int PQescapeString (string to,
+                        string from, int length);
+		// size_t PQescapeString(char *to, 
+                //      const char *from, size_t length);
+
+		[DllImport("pq")]
+		public static extern string PQescapeBytea (string bintext,
+                        int binlen, IntPtr bytealen);
+		// unsigned char *PQescapeBytea(unsigned char *bintext, 
+                //      size_t binlen, size_t *bytealen);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQexec (IntPtr conn,
+                        string query);
+		// PGresult *PQexec(PGconn *conn, 
+                //      const char *query);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQnotifies (IntPtr conn);
+		// PGnotify *PQnotifies(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern void PQfreeNotify (IntPtr notify);
+		// void PQfreeNotify(PGnotify *notify);
+
+		[DllImport("pq")]
+		public static extern int PQsendQuery (IntPtr conn,
+                        string query);
+		// int PQsendQuery(PGconn *conn, 
+                //      const char *query);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQgetResult (IntPtr conn);
+		// PGresult *PQgetResult(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQisBusy (IntPtr conn);
+		// int PQisBusy(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQconsumeInput (IntPtr conn);
+		// int PQconsumeInput(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQgetline (IntPtr conn,
+                        string str, int length);
+		// int PQgetline(PGconn *conn,
+                //      char *string, int length);
+
+		[DllImport("pq")]
+		public static extern int PQputline (IntPtr conn,
+                        string str);
+		// int PQputline(PGconn *conn, 
+                //      const char *string);
+
+		[DllImport("pq")]
+		public static extern int PQgetlineAsync (IntPtr conn,
+                        string buffer, int bufsize);
+		// int PQgetlineAsync(PGconn *conn, char *buffer,
+                //      int bufsize);
+
+		[DllImport("pq")]
+		public static extern int PQputnbytes (IntPtr conn,
+                        string buffer, int nbytes);
+		// int PQputnbytes(PGconn *conn, 
+                //const char *buffer, int nbytes);
+
+		[DllImport("pq")]
+		public static extern int PQendcopy (IntPtr conn);
+		// int PQendcopy(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQsetnonblocking (IntPtr conn,
+                        int arg);
+		// int PQsetnonblocking(PGconn *conn, int arg);
+
+		[DllImport("pq")]
+		public static extern int PQisnonblocking (IntPtr conn);
+		// int PQisnonblocking(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQflush (IntPtr conn);
+		// int PQflush(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQfn (IntPtr conn, int fnid, 
+                        IntPtr result_buf, IntPtr result_len, 
+                        int result_is_int, IntPtr args,
+                        int nargs);
+		// PGresult *PQfn(PGconn *conn, int fnid, 
+                //      int *result_buf, int *result_len, 
+                //      int result_is_int, const PQArgBlock *args,
+                //      int nargs);
+
+		[DllImport("pq")]
+		public static extern ExecStatusType PQresultStatus (IntPtr res);
+		// ExecStatusType PQresultStatus(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQresStatus (ExecStatusType status);
+		// char *PQresStatus(ExecStatusType status);
+
+		[DllImport("pq")]
+		public static extern string PQresultErrorMessage (IntPtr res);
+		// char *PQresultErrorMessage(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQntuples (IntPtr res);
+		// int PQntuples(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQnfields (IntPtr res);
+		// int PQnfields(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQbinaryTuples (IntPtr res);
+		// int PQbinaryTuples(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQfname (IntPtr res,
+                        int field_num);
+		// char *PQfname(const PGresult *res,
+                //      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfnumber (IntPtr res,
+                        string field_name);
+		// int PQfnumber(const PGresult *res, 
+                //      const char *field_name);
+
+		[DllImport("pq")]
+		public static extern int PQftype (IntPtr res,
+                        int field_num);
+		// Oid PQftype(const PGresult *res,
+                //      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfsize (IntPtr res,
+                        int field_num);
+		// int PQfsize(const PGresult *res,
+                //      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfmod (IntPtr res, int field_num);
+		// int PQfmod(const PGresult *res, int field_num);
+
+		[DllImport("pq")]
+		public static extern string PQcmdStatus (IntPtr res);
+		// char *PQcmdStatus(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQoidStatus (IntPtr res);
+		// char *PQoidStatus(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQoidValue (IntPtr res);
+		// Oid PQoidValue(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQcmdTuples (IntPtr res);
+		// char *PQcmdTuples(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQgetvalue (IntPtr res,
+                        int tup_num, int field_num);
+		// char *PQgetvalue(const PGresult *res,
+                //      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQgetlength (IntPtr res,
+                        int tup_num, int field_num);
+		// int PQgetlength(const PGresult *res,
+                //      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQgetisnull (IntPtr res,
+                        int tup_num, int field_num);
+		// int PQgetisnull(const PGresult *res,
+                //      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern void PQclear (IntPtr res);
+		// void PQclear(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQmakeEmptyPGresult (IntPtr conn,
+                        IntPtr status);
+		// PGresult *PQmakeEmptyPGresult(PGconn *conn,
+                //      ExecStatusType status);
+
+		[DllImport("pq")]
+		public static extern void PQprint (IntPtr fout,
+                        IntPtr res, IntPtr ps);
+		// void PQprint(FILE *fout,
+                //      const PGresult *res, const PQprintOpt *ps);
+
+		[DllImport("pq")]
+		public static extern void PQdisplayTuples (IntPtr res,
+                        IntPtr fp, int fillAlign, string fieldSep, 
+                        int printHeader, int quiet);
+		// void PQdisplayTuples(const PGresult *res, 
+                //	FILE *fp, int fillAlign, const char *fieldSep, 
+                //	int printHeader, int quiet);
+
+		[DllImport("pq")]
+		public static extern void PQprintTuples (IntPtr res,
+			IntPtr fout, int printAttName, int terseOutput, 
+			int width);
+		// void PQprintTuples(const PGresult *res,
+		//	FILE *fout, int printAttName, int terseOutput, 
+		//	int width);						
+
+		[DllImport("pq")]
+		public static extern int lo_open (IntPtr conn,
+			int lobjId, int mode);
+		// int lo_open(PGconn *conn,
+		//	Oid lobjId, int mode);
+
+		[DllImport("pq")]
+		public static extern int lo_close (IntPtr conn, int fd);
+		// int lo_close(PGconn *conn, int fd);
+
+		[DllImport("pq")]
+		public static extern int lo_read (IntPtr conn,
+			int fd, string buf, int len);
+		// int lo_read(PGconn *conn,
+		//	int fd, char *buf, size_t len);
+
+		[DllImport("pq")]
+		public static extern int lo_write (IntPtr conn,
+			int fd, string buf, int len);
+		// int lo_write(PGconn *conn,
+		//	int fd, char *buf, size_t len);
+
+		[DllImport("pq")]
+		public static extern int lo_lseek (IntPtr conn,
+			int fd, int offset, int whence);
+		// int lo_lseek(PGconn *conn, 
+		//	int fd, int offset, int whence);
+
+		[DllImport("pq")]
+		public static extern int lo_creat (IntPtr conn,
+			int mode);
+		// Oid lo_creat(PGconn *conn,
+		//	int mode);
+
+		[DllImport("pq")]
+		public static extern int lo_tell (IntPtr conn, int fd);
+		// int lo_tell(PGconn *conn, int fd);
+
+		[DllImport("pq")]
+		public static extern int lo_unlink (IntPtr conn,
+			int lobjId);
+		// int lo_unlink(PGconn *conn,
+		//	Oid lobjId);
+
+		[DllImport("pq")]
+		public static extern int lo_import (IntPtr conn,
+			string filename);
+		// Oid lo_import(PGconn *conn,
+		//	const char *filename);
+
+		[DllImport("pq")]
+		public static extern int lo_export (IntPtr conn,
+			int lobjId, string filename);
+		// int lo_export(PGconn *conn,
+		//	Oid lobjId, const char *filename);
+
+		[DllImport("pq")]
+		public static extern int PQmblen (string s,
+			int encoding);
+		// int PQmblen(const unsigned char *s,
+		//	int encoding);
+
+		[DllImport("pq")]
+		public static extern int PQenv2encoding ();
+		// int PQenv2encoding(void);
+
+		#endregion
+	}
+}
diff --git a/mcs/class/Mono.Data.PostgreSqlClient/PostgresTypes.cs b/mcs/class/Mono.Data.PostgreSqlClient/PostgresTypes.cs
new file mode 100644
index 00000000000..6a086a82a42
--- /dev/null
+++ b/mcs/class/Mono.Data.PostgreSqlClient/PostgresTypes.cs
@@ -0,0 +1,512 @@
+//

+// PostgresTypes.cs - holding methods to convert 

+//                    between PostgreSQL types and .NET types

+//

+// Author:

+//     Daniel Morgan <danmorg@sc.rr.com>

+//

+// (c)copyright 2002 Daniel Morgan

+//

+

+// Note: this might become PostgresType and PostgresTypeCollection

+//       also, the PostgresTypes that exist as an inner internal class

+//       within SqlConnection maybe moved here in the future

+

+using System;

+using System.Collections;

+using System.Data;

+using System.Data.Common;

+using System.Data.SqlClient;

+using System.Text;

+

+namespace System.Data.SqlClient {

+

+	internal struct PostgresType {

+		public int oid;

+		public string typname;

+		public DbType dbType;

+	}

+
+	sealed internal class PostgresHelper {
+
+		// translates the PostgreSQL typname to System.Data.DbType
+		public static DbType TypnameToSqlDbType(string typname) {

+			DbType sqlType;

+			

+			// FIXME: use hashtable here?

+

+			switch(typname) {

+

+			case "abstime":

+				sqlType = DbType.Int32;

+				break;

+

+			case "aclitem":

+				sqlType = DbType.String;

+				break;

+

+			case "bit":

+				sqlType = DbType.String;

+				break;

+

+			case "bool":

+				sqlType = DbType.Boolean;

+				break;

+

+			case "box":

+				sqlType = DbType.String;

+				break;

+

+			case "bpchar":

+				sqlType = DbType.String;

+				break;

+

+			case "bytea":

+				sqlType = DbType.String;

+				break;

+

+			case "char":

+				sqlType = DbType.String;

+				break;

+

+			case "cidr":

+				sqlType = DbType.String;

+				break;

+

+			case "circle":

+				sqlType = DbType.String;

+				break;

+

+			case "date":

+				sqlType = DbType.Date;

+				break;

+

+			case "float4":

+				sqlType = DbType.Single;

+				break;

+

+			case "float8":

+				sqlType = DbType.Double;

+				break;

+

+			case "inet":

+				sqlType = DbType.String;

+				break;

+

+			case "int2":

+				sqlType = DbType.Int16;

+				break;

+

+			case "int4":

+				sqlType = DbType.Int32;

+				break;

+

+			case "int8":

+				sqlType = DbType.Int64;

+				break;

+

+			case "interval":

+				sqlType = DbType.String;

+				break;

+

+			case "line":

+				sqlType = DbType.String;

+				break;

+

+			case "lseg":

+				sqlType = DbType.String;

+				break;

+

+			case "macaddr":

+				sqlType = DbType.String;

+				break;

+

+			case "money":

+				sqlType = DbType.Decimal;

+				break;

+

+			case "name":

+				sqlType = DbType.String;

+				break;

+

+			case "numeric":

+				sqlType = DbType.Decimal;

+				break;

+

+			case "oid":

+				sqlType = DbType.Int32;

+				break;

+

+			case "path":

+				sqlType = DbType.String;

+				break;

+

+			case "point":

+				sqlType = DbType.String;

+				break;

+

+			case "polygon":

+				sqlType = DbType.String;

+				break;

+

+			case "refcursor":

+				sqlType = DbType.String;

+				break;

+

+			case "reltime":

+				sqlType = DbType.String;

+				break;

+

+			case "text":

+				sqlType = DbType.String;

+				break;

+

+			case "time":

+				sqlType = DbType.Time;

+				break;

+

+			case "timestamp":

+				sqlType = DbType.DateTime;

+				break;

+

+			case "timestamptz":

+				sqlType = DbType.DateTime;

+				break;

+

+			case "timetz":

+				sqlType = DbType.DateTime;

+				break;

+

+			case "tinterval":

+				sqlType = DbType.String;

+				break;

+

+			case "varbit":

+				sqlType = DbType.String;

+				break;

+

+			case "varchar":

+				sqlType = DbType.String;

+				break;

+

+			default:

+				sqlType = DbType.String;

+				break;

+			}

+			return sqlType;

+		}

+		

+		// Converts data value from database to .NET System type.

+		public static object ConvertDbTypeToSystem (DbType typ, String value) {
+			object obj = null;
+
+			// FIXME: more types need 
+			//        to be converted 
+			//        from PostgreSQL oid type
+			//        to .NET System.<type>
+
+			// FIXME: need to handle a NULL for each type
+			//       maybe setting obj to System.DBNull.Value ?
+
+			
+			if(value == null) {
+				//Console.WriteLine("ConvertDbTypeToSystemDbType typ: " +
+				//	typ + " value is null");
+				return null;
+			}
+			else if(value.Equals("")) {
+				//Console.WriteLine("ConvertDbTypeToSystemDbType typ: " +
+				//	typ + " value is string empty");
+				return null;
+			}
+			
+			//Console.WriteLine("ConvertDbTypeToSystemDbType typ: " +
+			//	typ + " value: " + value);
+
+			// Date, Time, and DateTime 
+			// are parsed based on ISO format
+			// "YYYY-MM-DD hh:mi:ss.ms"
+
+			switch(typ) {
+			case DbType.String:
+				obj = String.Copy(value); 
+				break;
+			case DbType.Boolean:
+				obj = value.Equals("t");
+				break;
+			case DbType.Int16:

+				obj = Int16.Parse(value);

+				break;

+			case DbType.Int32:

+				obj = Int32.Parse(value);

+				break;

+			case DbType.Int64:

+				obj = Int64.Parse(value);

+				break;

+			case DbType.Decimal:

+				obj = Decimal.Parse(value);

+				break;

+			case DbType.Single:

+				obj = Single.Parse(value);

+				break;

+			case DbType.Double:

+				obj = Double.Parse(value);

+				break;

+			case DbType.Date:

+				String[] sd = value.Split(new Char[] {'-'});

+				obj = new DateTime(

+					Int32.Parse(sd[0]), Int32.Parse(sd[1]), Int32.Parse(sd[2]),

+					0,0,0);

+				break;

+			case DbType.Time:

+				String[] st = value.Split(new Char[] {':'});

+				obj = new DateTime(0001,01,01,

+					Int32.Parse(st[0]),Int32.Parse(st[1]),Int32.Parse(st[2]));

+				break;

+			case DbType.DateTime:

+				Int32 YYYY,MM,DD,hh,mi,ss,ms;

+				YYYY = Int32.Parse(value.Substring(0,4));

+				MM = Int32.Parse(value.Substring(5,2));

+				DD = Int32.Parse(value.Substring(8,2));

+				hh = Int32.Parse(value.Substring(11,2));

+				mi = Int32.Parse(value.Substring(14,2));

+				ss = Int32.Parse(value.Substring(17,2));

+				ms = Int32.Parse(value.Substring(20,2));

+				obj = new DateTime(YYYY,MM,DD,hh,mi,ss,ms);

+				break;

+			default:

+				obj = String.Copy(value);

+				break;

+			}
+
+			return obj;
+		}
+		
+		// Translates System.Data.DbType to System.Type
+		public static Type DbTypeToSystemType (DbType dType) {
+			// FIXME: more types need 
+			//        to be mapped
+			//        from PostgreSQL oid type
+			//        to .NET System.<type>
+
+			Type typ = null;
+
+			switch(dType) {
+			case DbType.String:
+				typ = typeof(String);
+				break;
+			case DbType.Boolean:
+				typ = typeof(Boolean);
+				break;
+			case DbType.Int16: 

+				typ = typeof(Int16);

+				break;

+			case DbType.Int32:

+				typ = typeof(Int32);

+				break;

+			case DbType.Int64:

+				typ = typeof(Int64);

+				break;

+			case DbType.Decimal:

+				typ = typeof(Decimal);

+				break;

+			case DbType.Single:

+				typ = typeof(Single);

+				break;

+			case DbType.Double:

+				typ = typeof(Double);

+				break;

+			case DbType.Date:

+			case DbType.Time:

+			case DbType.DateTime:

+				typ = typeof(DateTime);

+				break;

+			default:

+				typ = typeof(String);

+				break;

+			}
+			return typ;
+		}
+
+		// Find DbType for oid
+		// which requires a look up of PostgresTypes
+		// DbType <-> typname <-> oid
+		public static string OidToTypname (int oid, ArrayList pgTypes) {
+			// FIXME: more types need 
+			//        to be mapped
+			//        from PostgreSQL oid type
+			//        to .NET System.<type>
+			
+			string typname = "text"; // default
+			int i;
+			for(i = 0; i < pgTypes.Count; i++) {
+				PostgresType pt = (PostgresType) pgTypes[i];
+				if(pt.oid == oid) {
+					typname = pt.typname;
+					break; 
+				}
+			}
+
+			return typname;
+		}
+
+		// Convert a .NET System value type (Int32, String, Boolean, etc)
+		// to a string that can be included within a SQL statement.
+		// This is to methods provides the parameters support
+		// for the PostgreSQL .NET Data provider
+		public static string ObjectToString(DbType dbtype, object obj) {

+			

+			// TODO: how do we handle a NULL?

+			//if(isNull == true)

+			//	return "NULL";

+

+			string s;

+

+			// Date, Time, and DateTime are expressed in ISO format

+			// which is "YYYY-MM-DD hh:mm:ss.ms";

+			DateTime dt;

+			StringBuilder sb;

+

+			const string zero = "0";

+

+			switch(dbtype) {

+			case DbType.String:
+				s = "'" + obj + "'";
+				break;
+			case DbType.Boolean:
+				if((bool)obj == true)
+					s = "'t'";
+				else
+					s = "'f'";
+				break;
+			case DbType.Int16:

+				s = obj.ToString();

+				break;

+			case DbType.Int32:

+				s = obj.ToString();

+				break;

+			case DbType.Int64:

+				s = obj.ToString();

+				break;

+			case DbType.Decimal:

+				s = obj.ToString();

+				break;

+			case DbType.Single:

+				s = obj.ToString();

+				break;

+			case DbType.Double:

+				s = obj.ToString();

+				break;

+			case DbType.Date:

+				dt = (DateTime) obj;

+				sb = new StringBuilder();

+				sb.Append('\'');

+				// year

+				if(dt.Year < 10)

+					sb.Append("000" + dt.Year);

+				else if(dt.Year < 100)

+					sb.Append("00" + dt.Year);

+				else if(dt.Year < 1000)

+					sb.Append("0" + dt.Year);

+				else

+					sb.Append(dt.Year);

+				sb.Append("-");

+				// month

+				if(dt.Month < 10)

+					sb.Append(zero + dt.Month);

+				else

+					sb.Append(dt.Month);

+				sb.Append("-");

+				// day

+				if(dt.Day < 10)

+					sb.Append(zero + dt.Day);

+				else

+					sb.Append(dt.Day);

+				sb.Append('\'');

+				s = sb.ToString();

+				break;

+			case DbType.Time:

+				dt = (DateTime) obj;

+				sb = new StringBuilder();

+				sb.Append('\'');

+				// hour

+				if(dt.Hour < 10)

+					sb.Append(zero + dt.Hour);

+				else

+					sb.Append(dt.Hour);

+				sb.Append(":");

+				// minute

+				if(dt.Minute < 10)

+					sb.Append(zero + dt.Minute);

+				else

+					sb.Append(dt.Minute);

+				sb.Append(":");

+				// second

+				if(dt.Second < 10)

+					sb.Append(zero + dt.Second);

+				else

+					sb.Append(dt.Second);

+				sb.Append('\'');

+				s = sb.ToString();

+				break;

+			case DbType.DateTime:

+				dt = (DateTime) obj;

+				sb = new StringBuilder();

+				sb.Append('\'');

+				// year

+				if(dt.Year < 10)

+					sb.Append("000" + dt.Year);

+				else if(dt.Year < 100)

+					sb.Append("00" + dt.Year);

+				else if(dt.Year < 1000)

+					sb.Append("0" + dt.Year);

+				else

+					sb.Append(dt.Year);

+				sb.Append("-");

+				// month

+				if(dt.Month < 10)

+					sb.Append(zero + dt.Month);

+				else

+					sb.Append(dt.Month);

+				sb.Append("-");

+				// day

+				if(dt.Day < 10)

+					sb.Append(zero + dt.Day);

+				else

+					sb.Append(dt.Day);

+				sb.Append(" ");

+				// hour

+				if(dt.Hour < 10)

+					sb.Append(zero + dt.Hour);

+				else

+					sb.Append(dt.Hour);

+				sb.Append(":");

+				// minute

+				if(dt.Minute < 10)

+					sb.Append(zero + dt.Minute);

+				else

+					sb.Append(dt.Minute);

+				sb.Append(":");

+				// second

+				if(dt.Second < 10)

+					sb.Append(zero + dt.Second);

+				else

+					sb.Append(dt.Second);

+				sb.Append(".");

+				// millisecond

+				if(dt.Millisecond < 10)

+					sb.Append(zero + dt.Millisecond);

+				else

+					sb.Append(dt.Millisecond);

+				sb.Append('\'');

+				s = sb.ToString();

+				break;

+			default:

+				// default to DbType.String

+				s = "'" + obj + "'";

+				break;

+			}
+			return s;	
+		}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/Mono.GetOptions/.cvsignore b/mcs/class/Mono.GetOptions/.cvsignore
new file mode 100644
index 00000000000..97274c3c4a6
--- /dev/null
+++ b/mcs/class/Mono.GetOptions/.cvsignore
@@ -0,0 +1,4 @@
+*.pdb
+*.dll
+*.csproj.user
+
diff --git a/mcs/class/Mono.GetOptions/AssemblyInfo.cs b/mcs/class/Mono.GetOptions/AssemblyInfo.cs
new file mode 100644
index 00000000000..e8a5b7d3153
--- /dev/null
+++ b/mcs/class/Mono.GetOptions/AssemblyInfo.cs
@@ -0,0 +1,59 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
+
diff --git a/mcs/class/Mono.GetOptions/Mono.GetOptions.csproj b/mcs/class/Mono.GetOptions/Mono.GetOptions.csproj
new file mode 100644
index 00000000000..695df1ee57b
--- /dev/null
+++ b/mcs/class/Mono.GetOptions/Mono.GetOptions.csproj
@@ -0,0 +1,93 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9466"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{8D3008AB-7C0F-4DBE-A305-752926C366A7}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "Mono.GetOptions"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                RootNamespace = "Mono.GetOptions"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "true"
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.XML"
+                    HintPath = "..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "OptionList.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/mcs/class/Mono.GetOptions/OptionList.cs b/mcs/class/Mono.GetOptions/OptionList.cs
new file mode 100644
index 00000000000..40751e656a7
--- /dev/null
+++ b/mcs/class/Mono.GetOptions/OptionList.cs
@@ -0,0 +1,209 @@
+//
+// OptionList.cs
+//
+// Author: Rafael Teixeira (rafaelteixeirabr@hotmail.com)
+//
+// (C) 2002 Rafael Teixeira
+//
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Reflection;
+
+namespace Mono.GetOptions
+{
+	[AttributeUsage(AttributeTargets.Assembly, AllowMultiple=true)]
+	public class AuthorAttribute : System.Attribute
+	{
+		public string Name;
+		public string SubProject;
+
+		public AuthorAttribute(string Name)
+		{
+			this.Name = Name;
+			this.SubProject = null;
+		}
+
+		public AuthorAttribute(string Name, string SubProject)
+		{
+			this.Name = Name;
+			this.SubProject = SubProject;
+		}
+
+		public override string ToString()
+		{
+			if (SubProject == null)
+				return Name;
+			else
+				return Name + " (" + SubProject + ")"; 
+		}
+	}
+
+	enum OptionParameterType
+	{
+		None,
+		Integer,
+		Decimal, // look XML Schemas for better names
+		String,
+		Symbol,
+		FilePath,
+		FileMask,
+		AssemblyName,
+		AssemblyFileName,
+		AssemblyNameOrFileName
+	}
+		
+	public delegate bool OptionFound(object Value);
+
+	/// <summary>
+	/// Summary description for Class1.
+	/// </summary>
+	public class OptionList
+	{
+		struct OptionDetails
+		{
+			public char ShortForm;
+			public string LongForm;
+			public string ShortDescription;
+			public OptionParameterType ParameterType;
+			public int MinOccurs;
+			public int MaxOccurs; // negative means there is no limit
+			public object DefaultValue;
+			public OptionFound Dispatcher;
+
+		}
+	
+		private string appTitle = "Add a [assembly: AssemblyTitle(\"Here goes the application name\")] to your assembly";
+		private string appCopyright = "Add a [assembly: AssemblyCopyright(\"(c)200n Here goes the copyright holder name\")] to your assembly";
+		private string appDescription = "Add a [assembly: AssemblyDescription(\"Here goes the short description\")] to your assembly";
+		private string[] appAuthors;
+ 
+		public readonly string usageFormat;
+		public readonly string aboutDetails;
+
+		private SortedList list = new SortedList();
+
+		private object[] GetAssemblyAttributes(Type type)
+		{
+			Assembly entry = Assembly.GetEntryAssembly();
+			return entry.GetCustomAttributes(type, false);
+		}
+			
+		private string[] GetAssemblyAttributeStrings(Type type)
+		{
+			object[] result = GetAssemblyAttributes(type);
+			
+			if ((result == null) || (result.Length == 0))
+				return new string[0];
+
+			int i = 0;
+			string[] var = new string[result.Length];
+
+			foreach(object o in result)
+				var[i++] = o.ToString(); 
+
+			return var;
+		}
+
+		private void GetAssemblyAttributeValue(Type type, string propertyName, ref string var)
+		{
+			object[] result = GetAssemblyAttributes(type);
+			
+			if ((result != null) && (result.Length > 0))
+				var = (string)(string)type.InvokeMember(propertyName, BindingFlags.Public | BindingFlags.GetField | BindingFlags.GetProperty | BindingFlags.Instance, null, result[0], new object [] {}); ;
+		}
+
+		public OptionList(string aboutDetails, string usageFormat)
+		{
+			this.aboutDetails = aboutDetails;
+			this.usageFormat = usageFormat;
+
+			GetAssemblyAttributeValue(typeof(AssemblyTitleAttribute), "Title", ref appTitle);
+			GetAssemblyAttributeValue(typeof(AssemblyCopyrightAttribute), "Copyright", ref appCopyright);
+			GetAssemblyAttributeValue(typeof(AssemblyDescriptionAttribute), "Description", ref appDescription);
+			appAuthors = GetAssemblyAttributeStrings(typeof(AuthorAttribute));
+			if (appAuthors.Length == 0)
+			{
+				appAuthors = new String[1];
+				appAuthors[0] = "Add one or more [assembly: Mono.GetOptions.Author(\"Here goes the author name\")] to your assembly";
+			}
+		}
+
+		private void AddGenericOption(
+			char shortForm, 
+			string longForm, 
+			string shortDescription,
+			OptionParameterType parameterType, 
+			int minOccurs, 
+			int maxOccurs, 
+			object defaultValue, 
+			OptionFound dispatcher)
+		{
+			OptionDetails option = new OptionDetails();
+
+			option.ShortForm = shortForm;
+			option.LongForm = longForm;
+			option.ShortDescription = shortDescription;
+			option.ParameterType = parameterType;
+			option.MinOccurs = minOccurs;
+			option.MaxOccurs = maxOccurs;
+			option.DefaultValue = defaultValue;
+			option.Dispatcher = dispatcher;
+
+			if (shortForm == ' ')
+				list.Add(longForm, option);
+			else
+				list.Add(shortForm.ToString(), option);
+		}
+
+		public void AddAbout(char shortForm, string longForm, string shortDescription)
+		{
+			AddGenericOption(shortForm, longForm, shortDescription, OptionParameterType.None, 0, 1, null, new OptionFound(DoAbout));
+		}
+
+		public void AddBooleanSwitch(char shortForm, string longForm, string shortDescription, bool defaultValue, OptionFound switcher)
+		{
+			AddGenericOption(shortForm, longForm, shortDescription, OptionParameterType.None, 0, 1, defaultValue, switcher);
+		}
+
+		public void ShowAbout()
+		{
+			Console.WriteLine(appTitle + " - " + appCopyright); 
+			Console.WriteLine(appDescription); 
+			Console.WriteLine();
+			Console.WriteLine(aboutDetails); 
+			Console.WriteLine();
+			Console.WriteLine("Authors:");
+			foreach(string s in appAuthors)
+				Console.WriteLine ("\t" + s);
+		}
+
+		private bool DoAbout(object nothing)
+		{
+			ShowAbout();
+			return true;
+		}
+
+		public void ShowUsage()
+		{
+			Console.WriteLine(appTitle + " - " + appCopyright); 
+			Console.Write("Usage: ");
+			Console.WriteLine(usageFormat);
+			// TODO: list registered options here
+			foreach (DictionaryEntry option in list)
+				Console.WriteLine(option.Value.ToString());
+		}
+
+		public void ShowUsage(string errorMessage)
+		{
+			Console.WriteLine(errorMessage);
+			ShowUsage();
+		}
+
+		public void ProcessArgs(string[] args)
+		{
+			ShowAbout();
+		}
+	}
+}
diff --git a/mcs/class/README b/mcs/class/README
new file mode 100644
index 00000000000..97382f10b20
--- /dev/null
+++ b/mcs/class/README
@@ -0,0 +1,277 @@
+The class libraries are grouped together in the assemblies they belong.
+
+Each directory here represents an assembly, and inside each directory we
+divide the code based on the namespace they implement.
+
+In addition, each assembly directory contains a Test directory that holds the
+NUnit tests for that assembly. 
+
+The nant build file for an assembly creates two versions of the dll for that
+assembly. One version is a "full" dll.  The full dll contains (almost) all 
+of the classes, regardless of how complete the classes are. The name of this
+dll is the normal name you would expect, like "corlib.dll" or "System.dll".
+These full dll's are created in the /mcs/class/lib directory.
+
+The other dll which is built is a "restricted" dll.  The restricted dll
+omits incomplete classes that would prevent the NUnit testrunner from actually
+running the tests. These restricted dll's are created in the Test directory
+of their respective assembly and named with a "_res" suffix.  So, for example,
+the NUnit-testable dll for corlib is /mcs/class/corlib/Test/corlib_res.dll.
+
+The final dll which is built is the one which houses the actual NUnit tests.
+This dll is built from all of the classes in the Test directory and below, and
+is named with a "_test" suffix. So, for example, the NUnit tests for corlib
+are in /mcs/class/corlib/Test/corlib_test.dll. This dll is also linked with 
+the restricted dll found in the same directory.
+
+
+* Missing implementation bits
+
+	If you implement a class and you are missing implementation bits,
+	please use the attribute [MonoTODO].  This attribute can be used
+	to programatically generate our status web pages:
+
+	[MonoTODO]
+	int MyFunction ()
+	{
+		throw new NotImplementedException ();
+	}
+
+* Tagging buggy code
+
+	If there is a bug in your implementation tag the problem by using
+	the word "FIXME" in the code, together with a description of the 
+	problem.
+
+	Do not use XXX or obscure descriptions, because otherwise people
+	will not be able to understand what you mean.
+
+* Tagging Problematic specs.
+
+	If the documentation and the Microsoft implementation do
+	differ (you wrote a test case to prove this), I suggest that you edit
+	the file `mcs/class/doc/API-notes' so we can keep track of these problems
+	and submit our comments to ECMA or Microsoft and seek clarification.
+
+	Sometimes the documentation might be buggy, and sometimes the implementation
+	might be buggy.  Lets try to identify and pinpoint which one
+	is the correct one.
+
+	Sometimes the specification will be lame (consider Version.ToString (fieldCount)
+	where there is no way of knowing how many fields are available, making the API
+	not only stupid, but leading to unreliable code).
+
+	In those cases, use the keyword "LAMESPEC".
+	
+
+* Coding considerations and style.
+
+	In order to keep the code consistent, please use the following
+	conventions.  From here on `good' and `bad' are used to attribute
+	things that would make the coding style match, or not match.  It is not
+	a judgement call on your coding abilities, but more of a style and 
+	look call.  Please try to follow these guidelines to ensure prettiness.
+
+	Use 8 space tabs for writing your code (hopefully we can keep
+	this consistent).  If you are modifying someone else's code, try
+	to keep the coding style similar.
+
+	Since we are using 8-space tabs, you might want to consider the Linus
+	Torvals trick to reduce code nesting.  Many times in a loop, you will
+	find yourself doing a test, and if the test is true, you will nest.
+	Many times this can be changed.  Example:
+
+
+		for (i = 0; i < 10; i++) {
+			if (something (i)) {
+				do_more ();
+			}
+		}
+
+	This take precious space, instead write it like this:
+
+		for (i = 0; i < 10; i++) {
+			if (!something (i))
+				continue;
+			do_more ();
+		}
+
+	A few guidelines:
+
+		* Use a space before an opening parenthesis when calling
+		  functions, or indexing, like this:
+
+			method (a);
+			b [10];
+
+		* Do not put a space after the opening parenthesis and the 
+		  closing one, ie:
+
+			good: method (a);	array [10];
+
+			bad:  method ( a );	array[ 10 ];
+
+		* Inside a code block, put the opening brace on the same line
+	  	  as the statement:
+
+			good:
+				if (a) {
+					code ();
+					code ();
+				}
+
+			bad:
+				if (a) 
+				{
+					code ();
+					code ();
+				}
+
+		* Avoid using unecessary open/close braces, vertical space
+		  is usually limited:
+
+			good:
+				if (a)
+					code ();
+
+			bad:
+				if (a) {
+					code ();
+				}
+
+		* When defining a method, use the C style for brace placement, 
+		  that means, use a new line for the brace, like this:
+
+			good:
+				void Method ()
+				{
+				}
+
+			bad:
+				void Method () {
+				}
+
+		* Properties and indexers are an exception, keep the
+		  brace on the same line as the property declaration.
+		  Rationale: this makes it visually
+		  simple to distinguish them.
+
+			good:
+				int Property {
+					get {
+						return value;
+					}
+				}
+
+			bad:
+				int Property 
+				{
+					get {
+						return value;
+					}
+				}
+
+		  Notice how the accessor "get" also keeps its brace on the same
+		  line.
+
+		  For very small properties, you can compress things:
+
+			ok:
+				int Property {
+					get { return value; }
+					set { x = value; }
+				}
+
+		* Use white space in expressions liberally, except in the presence
+		  of parenthesis:
+
+			good:
+
+				if (a + 5 > method (blah () + 4))
+
+			bad:
+				if (a+5>method(blah()+4))
+
+		* For any new files, please use a descriptive introduction, like
+		  this:
+
+			//
+			// System.Comment.cs: Handles comments in System files.
+			//
+			// Author:
+			//   Juan Perez (juan@address.com)
+			//
+			// (C) 2002 Address, Inc (http://www.address.com)
+			//
+
+		* If you are modyfing someone else's code, and your contribution
+		  is significant, please add yourself to the Authors list.
+
+		* Switch statements have the case at the same indentation as the
+		  switch:
+
+			switch (x) {
+			case 'a':
+				...
+			case 'b':
+				...
+			}
+
+		* Argument names should use the camel casing for
+		  identifiers, like this:
+
+		 	good:
+				void Method (string myArgument)
+
+			bad:
+				void Method (string lpstrArgument)
+				void Method (string my_string)
+
+	Here are a couple of examples:
+
+class X : Y {
+
+	bool Method (int argument_1, int argument_2)
+	{
+		if (argument_1 == argument_2)
+			throw new Exception (Locale.GetText ("They are equal!");
+
+		if (argument_1 < argument_2) {
+			if (argument_1 * 3 > 4)
+				return true;
+			else
+				return false;
+		}
+
+		//
+		// This sample helps keep your sanity while using 8-spaces for tabs
+		// 
+		VeryLongIdentifierWhichTakesManyArguments (
+			Argument1, Argument2, Argument3,
+			NestedCallHere (
+				MoreNested));
+	}
+
+	bool MyProperty {
+		get {
+			return x;
+		}
+
+		set {
+			x = value;
+		}
+	}
+
+	void AnotherMethod () 
+	{
+		if ((a + 5) != 4) {
+		}
+
+		while (blah) {
+			if (a)
+				continue;
+			b++;
+		}
+	}
+}
+	
\ No newline at end of file
diff --git a/mcs/class/System.Configuration.Install/ChangeLog b/mcs/class/System.Configuration.Install/ChangeLog
new file mode 100644
index 00000000000..f43b628da80
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/ChangeLog
@@ -0,0 +1,9 @@
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* list.unix:
+	* makefile.gnu:
+		Files added to build this on linux.
+
+2002-08-13  Jonathan Pryor <jonpryor@vt.edu>
+	* ChangeLog: Add change log to this directory
+	* System.Configuration.Install.build: Add build file to this directory.
+
diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install.build b/mcs/class/System.Configuration.Install/System.Configuration.Install.build
new file mode 100644
index 00000000000..2305c545320
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/System.Configuration.Install.build
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.Configuration.Install.dll -->
+
+<project name="System.Configuration.install" default="build">
+	<property name="debug" value="true"/>
+
+	<target name="build">
+		<mkdir dir="../lib"/>
+		<csc target="library" output="../lib/System.Configuration.Install.dll" debug="${debug}">
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+			<arg value="/lib:../lib/"/>
+			
+			<!-- cor compare dies with these currently -->
+			<!--arg value="/nostdlib"/--> 	<!-- don't reference mscorlib -->
+			<arg value="/r:corlib.dll"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/>
+			</sources>
+		</csc>
+		<copy file="../lib/System.Configuration.Install.dll" tofile="Test/System.Configuration.Install.dll"/>
+		<nant basedir="Test" target="build"/>
+	</target>
+
+	<target name="test" depends="build">
+		<nant basedir="Test" target="test"/>
+	</target>
+
+	<target name="clean">
+		<nant basedir="Test" target="clean"/>
+		<delete file="../lib/System.dll" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install/ChangeLog b/mcs/class/System.Configuration.Install/System.Configuration.Install/ChangeLog
new file mode 100644
index 00000000000..50dcbb3dabc
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/System.Configuration.Install/ChangeLog
@@ -0,0 +1,8 @@
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* UninstallAction.cs: Changed namespace to
+		proper System.Configuration.Install;
+
+2002-08-13  Jonathan Pryor <jonpryor@vt.edu>
+	* ChangeLog: Add change log to this directory
+	* UninstallAction.cs: Implemented.
+
diff --git a/mcs/class/System.Configuration.Install/System.Configuration.Install/UninstallAction.cs b/mcs/class/System.Configuration.Install/System.Configuration.Install/UninstallAction.cs
new file mode 100644
index 00000000000..9239419e06f
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/System.Configuration.Install/UninstallAction.cs
@@ -0,0 +1,20 @@
+//
+// System.Configuration.Install.UninstallAction.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+
+namespace System.Configuration.Install {
+
+	[Serializable]
+	public enum UninstallAction {
+		NoAction=0x01,
+		Remove=0x00
+	}
+}
+
diff --git a/mcs/class/System.Configuration.Install/Test/.cvsignore b/mcs/class/System.Configuration.Install/Test/.cvsignore
new file mode 100644
index 00000000000..e47122844d5
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/Test/.cvsignore
@@ -0,0 +1,2 @@
+*.dll
+*.pdb
\ No newline at end of file
diff --git a/mcs/class/System.Configuration.Install/Test/AllTests.cs b/mcs/class/System.Configuration.Install/Test/AllTests.cs
new file mode 100644
index 00000000000..8fe40431485
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/Test/AllTests.cs
@@ -0,0 +1,29 @@
+//
+// MonoTests.AllTests.cs
+//
+// Author:
+//      Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests
+{
+        public class AllTests : TestCase
+	{
+                public AllTests (string name) : base (name) {}
+                
+                public static ITest Suite 
+                { 
+                        get {
+                                TestSuite suite =  new TestSuite();
+				suite.AddTest (System.Configuration.Install.AllTests.Suite);
+				return suite;
+                        }
+                }
+        }
+}
+
diff --git a/mcs/class/System.Configuration.Install/Test/ChangeLog b/mcs/class/System.Configuration.Install/Test/ChangeLog
new file mode 100644
index 00000000000..334d62bcf81
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/Test/ChangeLog
@@ -0,0 +1,12 @@
+2002-07-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AllTests.cs: New file.
+	* System.Configuration.Install_test.build: modified randomly until it
+	works.
+
+	Fixes 'make test'.
+
+2002-08-13  Jonathan Pryor <jonpryor@vt.edu>
+	* ChangeLog: Add change log to this directory
+	* System.Configuration.Install_test.build: Add build file to this directory.
+
diff --git a/mcs/class/System.Configuration.Install/Test/System.Configuration.Install/AllTests.cs b/mcs/class/System.Configuration.Install/Test/System.Configuration.Install/AllTests.cs
new file mode 100644
index 00000000000..742b185f6c8
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/Test/System.Configuration.Install/AllTests.cs
@@ -0,0 +1,27 @@
+//
+// MonoTests.System.Configuration.Install.AllTests
+//
+// Authors:
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  (http://www.ximian.com)
+// 
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System.Configuration.Install {
+        public class AllTests : TestCase {
+
+                public AllTests (string name) : base (name) {}
+                
+                public static ITest Suite { 
+                        get 
+                        {
+                                TestSuite suite = new TestSuite();
+				return suite;
+                        }
+                }
+        }
+}
+
diff --git a/mcs/class/System.Configuration.Install/Test/System.Configuration.Install/ChangeLog b/mcs/class/System.Configuration.Install/Test/System.Configuration.Install/ChangeLog
new file mode 100644
index 00000000000..a67be6de96b
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/Test/System.Configuration.Install/ChangeLog
@@ -0,0 +1,5 @@
+2002-07-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AllTests.cs: New file.
+	* ChangeLog: New file.
+
diff --git a/mcs/class/System.Configuration.Install/Test/System.Configuration.Install_test.build b/mcs/class/System.Configuration.Install/Test/System.Configuration.Install_test.build
new file mode 100644
index 00000000000..d92e5e78fb4
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/Test/System.Configuration.Install_test.build
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.Configuration.Install_test.dll -->
+<!-- Target build (default) builds tests -->
+<!-- Target test runs tests -->
+
+<project name="System_test" default="build">
+	<property name="debug" value="true"/>
+	<property name="nunit_home" value="..\..\..\nunit"/>
+
+	<target name="build">
+	</target>
+
+	<target name="assemblies">
+		<csc target="library" output="System.Configuration.Install_test.dll" debug="${debug}">
+			<sources>
+				<includes name="**/*.cs"/>
+			</sources>
+			<references basedir="..\..\..\nunit">
+				<includes name="NUnitCore.dll"/>
+			</references>
+
+			<arg value="/noconfig"/>
+		</csc>
+
+	</target>
+
+	<target name="test" depends="assemblies">
+		<exec program="..\..\..\nunit\NUnitConsole" commandline="MonoTests.AllTests,System.Configuration.Install_test.dll" failonerror="false"/>
+	</target>
+
+	<target name="clean">
+		<delete file="System.Configuration.Install_test.dll" failonerror="false"/>
+		<delete file="System.Configuration.Install_test.pdb" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/System.Configuration.Install/list.unix b/mcs/class/System.Configuration.Install/list.unix
new file mode 100644
index 00000000000..e162d82c0fd
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/list.unix
@@ -0,0 +1 @@
+System.Configuration.Install/UninstallAction.cs
diff --git a/mcs/class/System.Configuration.Install/makefile.gnu b/mcs/class/System.Configuration.Install/makefile.gnu
new file mode 100644
index 00000000000..5400fd35001
--- /dev/null
+++ b/mcs/class/System.Configuration.Install/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../..
+
+LIBRARY = ../lib/System.Configuration.Install.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib 
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=./Test*
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/System.Data/.cvsignore b/mcs/class/System.Data/.cvsignore
new file mode 100644
index 00000000000..0e3f75b9676
--- /dev/null
+++ b/mcs/class/System.Data/.cvsignore
@@ -0,0 +1,6 @@
+.makefrag
+.response
+System.Data.dll
+library-deps.stamp
+Temp
+tmp
diff --git a/mcs/class/System.Data/ChangeLog b/mcs/class/System.Data/ChangeLog
new file mode 100644
index 00000000000..9292cea9562
--- /dev/null
+++ b/mcs/class/System.Data/ChangeLog
@@ -0,0 +1,1727 @@
+2002-08-22  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/SqlParameter.cs: flush
+	
+	* System.Data.SqlClient/SqlParameterCollection.cs: fixes
+	for the Item property, IndexOf, and Contains.
+	
+	* Test/SqlSharpCli.cs: added input parameters support.
+	when a query is executed, if a parameter name matches
+	a SQL# internal variable name, it uses that value for the parameter; otherwise,
+	the user is prompted for the parameter value.  Currently, it only supports 
+	string parameters.
+
+2002-08-21  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/libgda.cs: adapted to changes in libgda (get_vtype
+	and get_type for GdaValue).
+
+	* System.Data.OleDb/OleDbDataReader.cs: adapted to changes in
+	libgda.cs.
+
+2002-08-20  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/OleDbConnection.cs (DataReader): new internal
+	property.
+	(Close): set the dataReader to null.
+
+	* System.Data.OleDb/OleDbDataReader.cs (OleDbDataReader): set the
+	connection's DataReader property to this object.
+	(Close): set it to null here.
+	(Depth, IsDbNull): implemented.
+	(this): implemented the Item property with a string indexer.
+
+	* System.Data.OleDb/OleDbCommand.cs (ExecuteNonQuery, ExecuteReader,
+	ExecuteScalar): do nothing if there's already an open data reader.
+
+	* System.Data.OleDb/libgda.cs: more API functions.
+
+	* System.Data.OleDb/TestOleDb.cs (TestDataReader): close the data
+	reader before continuing.
+
+2002-08-20  Franklin Wise <gracenote@earthlink.net>
+	
+	* System.Data/System.Data.build: added nowarn:0679
+
+	* System.Data/System.DataTable: cleaned up class, added MonoTODO tags
+	setup to begin implementing.  Implemented ctor().
+
+	* Tests: See System.Data\Test\ChangeLog
+	
+
+2002-08-19  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/OleDbSchemaGuid.cs: initialize static members.
+	
+2002-08-19  Franklin Wise <gracenote@earthlink.net>
+	
+	* Tests: See System.Data\Test\ChangeLog
+	
+	* System.Data/UniqueConstraint.cs: More validation.
+	
+	* System.Data/ForeignKeyConstraint.cs: Added more validation rules.
+	Another LAMESPEC tag.  Implemented more of Add/Remove Setup/Cleanup
+	logic.
+	
+	* System.Data/DataTable.cs: Added more MonoTODO tags
+	
+	* class/System.Data/.cvsignore: added tmp & Temp
+
+	* System.Data/Constraint.cs: Changed abstract helpers to virtual and
+	internal.
+
+	* System.Data/ConstraintCollection.cs: Commented out unused line.
+
+2002-08-18  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/OleDbConnection.cs (ChangeDatabase): implemented.
+
+	* System.Data.OleDb/OleDbException.cs (OleDbException): added internal
+	constructor.
+	(ErrorCode, Message, Source, Errors): implemented.
+
+	* System.Data.OleDb/OleDbError.cs: implemented the full class.
+
+	* System.Data.OleDb/libgda.cs: added more libgda functions.
+
+	* System.Data.OleDb/TestOleDb.cs (TestOleDb): display properties for
+	the opened connection.
+
+2002-08-18  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/OleDbConnection.cs (ServerVersion): implemented.
+
+	* System.Data.OleDb/OleDbDataReader.cs (Close): clear the results
+	ArrayList after releasing the items.
+	(GetName, GetDateTime, GetDouble, GetSingle, GetInt16, GetInt32,
+	 GetOrdinal, GetString): implemented.
+	(GetDataTypeName): made it get the type from the data model, not from
+	the current value, which could not have been retrieved yet.
+	(GetValue): call the Get* method corresponding with the data type of
+	the requested column.
+
+	* System.Data.OleDb/libgda.cs: added more libgda functions.
+	(GdaTimestamp, GdaDate, GdaTime): new marshalled structures.
+
+	* System.Data.OleDb/TestOleDb.cs (TestDateReader): display column
+	titles via OleDbDataReader.GetName ().
+	(TestOleDb): create temporary table with a date field.
+	(InsertRow): set current date for the date field.
+
+2002-08-18  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/OleDbDataReader.cs (this[]): made it just call
+	GetValue, which will take care of all the work needed.
+	(Close): implemented basic stuff.
+	(~OleDbDataReader): implemented.
+
+	* System.Data.OleDb/libgda.cs: added more needed functions.
+
+2002-08-16  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/TestOleDb.cs: made it work with a temporary table
+	we create.
+	(TestTransaction): added test for transactions.
+
+2002-08-16  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/libgda.cs: added new needed libgda functions.
+
+	* System.Data.OleDb/OleDbDataReader.cs (GetBoolean): throw exceptions
+	when there are errors.
+	(GetByte, GetChar, GetDataTypeName, GetValue, Read): implemented.
+
+	* System.Data.OleDb/TestOleDb.cs: added more testing code for data
+	readers.
+
+2002-08-15  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/libgda.cs: added new needed libgda functions.
+
+	* System.Data.OleDb/OleDbParameterCollection.cs (GdaParameterList):
+	create an empty GdaParameterList.
+
+	* System.Data.OleDb/OleDbCommand.cs (ExecuteReader): check values
+	for NULL before passing them to Marshal.PtrToStructure, which issues
+	an exception if the value is NULL.
+
+2002-08-15  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data/UniqueConstraint.cs (UniqueConstraint): commented
+	unreachable code to avoid compiler warning.
+
+	* System.Data.OleDb/libgda.cs (GdaList): added new internal class.
+
+	* System.Data.OleDb/OleDbConnection.cs (DataSource): implemented.
+	(OpenReader): removed internal method.
+
+	* System.Data.OleDb/OleDbCommand.cs (ExecuteReader): split correctly
+	the list of returned data models.
+
+2002-08-15  Franklin Wise <gracenote@earthlink.net>
+	
+	* System.Data/Constraint.cs: Added helper virtual functions
+
+	* System.Data/ConstraintCollection.cs: Improved constraint removal,
+	validation.  Removed specific knowledge of subclasses of 
+	Constraint.
+
+	* System.Data/DataColumn.cs: Added static helper function to compare
+	if two DataColumn arrays are the same.
+
+	* System.Data/ForeignKeyConstraint.cs: Continued to flush out.
+
+	* System.Data/UniqueConstraint.cs: Implemented.  Still some constraint
+	validation to do.
+	
+2002-08-13  Franklin Wise <gracenote@earthlink.net>
+
+	* System.Data/DataRow.cs: Added several fixme tags.
+	
+2002-08-13  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.SqlClient/SqlDataAdapter.cs (DeleteCommand,
+	InsertCommand, SelectCommand, UpdateCommand): removed 'new' keyword
+	to avoid compiler warnings.
+
+2002-08-12  Franklin Wise <gracenote@earthlink.net>
+
+	* System.Data/Constraint.cs: Implemented
+
+	* System.Data/UniqueConstraint.cs: GetHashCode() &
+	special case Ctor. Still need to be implemented. LAMESPEC tags
+	added.
+
+	* System.Data/ConstraintCollection.cs: Clear() &
+	AddRange() need to be finished. Several LAMESPEC tags.
+
+	* Allow Constraint collection to be created in DataTable.
+
+	* System.Data/ForeignKeyConstraint: Added a couple of
+	helper functions.
+
+	* System.Data/DataColumnCollection New/Added DataColumns now have
+	Table property set.
+
+2002-08-11  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/libgda.cs: added some GdaValue functions.
+
+	* System.Data.OleDb/OleDbCommand.cs (OpenReader): removed this
+	internal method, since we don't need it.
+	(ExecuteReader): call SetupGdaCommand before executing the command
+	via libgda functions.
+	(ExecuteScalar): implemented.
+
+	* System.Data.OleDb/OleDbDateReader.cs (OleDbDataReader): removed call
+	to OleDbCommand.OpenReader.
+	(GetBoolean): implemented.
+
+2002-08-08  Franklin Wise <gracenote@earthlink.net>
+
+	* System.Data/IDbComand.cs: IDbCommand now inherits IDisposable
+
+	* System.Data/IDbConnection.cs: IDbConnection now inherits IDisposable
+
+	* System.Data.SqlTypes/SqlCompareOptions.cs: Enum now set to correct
+	values.
+
+2002-08-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Data.OleDb/OleDbConnection.cs: little fixes to make it work
+	and don't show a warning in Open.
+
+	* System.Data.OleDb/TestOleDb.cs: added Close.
+
+2002-08-05  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/OleDbConnection.cs (ConnectionString,
+	ConnectionTimeout, ServerVersion, GdaConnection):
+	corrected style.
+	(OleDbConnection): call libgda.gda_init on constructor.
+
+	* System.Data.OleDb/libgda.cs (libgda): removed static constructor,
+	which wasn't been called.
+
+	* System.Data.OleDb/TestOleDb.cs (TestOleDb): updated to really
+	make some tests.
+
+2002-08-04  Rodrigo Moya <rodrigo@ximian.com>
+
+	* list: added missing System.Data.OleDb and
+	System.Data.Common files.
+
+	* System.Data.OleDb/ChangeLog: removed and merged with
+	System.Data's ChangeLog.
+
+	* System.Data.OleDb/OleDbDataAdapter.cs:
+	* System.Data.OleDb/OleDbPermission.cs: compilation fixes.
+
+2002-07-30  Rodrigo Moya <rodrigo@ximian.com>
+
+        * System.Data.OleDb/OleDbDataReader.cs (FieldCount): implemented.
+        (IsClosed, Item, RecordsAffected): implemented some properties.
+
+        * libgda.cs: added GdaDataModel methods.
+
+2002-07-29  Rodrigo Moya <rodrigo@ximian.com>
+
+        * System.Data.OleDb/OleDbDataReader.cs (OleDbDataReader constructor): changed to receive
+        a second argument (ArrayList results).
+        (NextResult): implemented.
+
+        * System.Data.OleDb/OleDbCommand.cs: don't store the ArrayList of results, since we'll
+        pass that to the OleDbDataReader.
+        (OleDbCommand constructor): don't create the ArrayList of results.
+        (GdaResults): removed property.
+        (ExecuteReader): create a temporary ArrayList and pass that to the
+        OleDbDataReader constructor.
+
+2002-07-28  Rodrigo Moya <rodrigo@ximian.com>
+
+        * System.Data.OleDb/OleDbCommand.cs (ExecuteReader):
+        (CreateParameter): implemented IDbCommand methods.
+        (CommandText): don't create many GdaCommand's, only one is needed.
+        (ExecuteNonQuery): set up the internal GDA command object.
+        (ExecuteReader): use correctly the unique GDA command object.
+
+        * System.Data.OleDb/libgda.cs: added new libgda calls.
+
+2002-07-27  Rodrigo Moya <rodrigo@ximian.com>
+
+        * System.Data.OleDb/OleDbConnection.cs (CreateCommand):
+        (BeginTransaction): implemented IDbConnection methods.
+
+2002-07-12  Rodrigo Moya <rodrigo@ximian.com>
+
+	* list: added System.Data.OleDb files to file list.
+
+2002-07-11  Rodrigo Moya <rodrigo@ximian.com>
+
+        * System.Data.OleDb/libgda.cs: added new libgda functions and some enumerations.
+
+        * System.Data.OleDb/OleDbParameter.cs (IsNullable): removed explicit implementation
+        of the set method for this property.
+
+        * System.Data.OleDb/OleDbDataAdapter.cs (MissingMappingAction): implemented.
+        (MissingSchemaAction): implemented.
+
+2002-07-10  Tim Coleman <tim@timcoleman.com>
+	
+        * System.Data.OleDb/OleDbCommandBuilder.cs: Added new methods, properties
+        * System.Data.OleDb/OleDbConnection.cs: Modified constructor
+        * System.Data.OleDb/OleDbError.cs: Added stubbs
+        * System.Data.OleDb/OleDbException.cs: Added stubbs
+        * System.Data.OleDb/OleDbInfoMessageEventArgs.cs: Added stubbs
+        * System.Data.OleDb/OleDbInfoMessageEventHandler.cs: style change
+        * System.Data.OleDb/OleDbParameter.cs: Added conversion from type to OleDbType
+        * System.Data.OleDb/OleDbPermission.cs: Added stubbs
+        * System.Data.OleDb/OleDbSchemaGuid.cs: Added stubbs
+        * System.Data.OleDb/OleDbTransaction.cs: New constructors, changes to methods to
+        support transaction nesting
+        * System.Data.OleDb/libgda.cs: Added my name to this file
+
+2002-07-09  Tim Coleman <tim@timcoleman.com>
+	
+        * System.Data.OleDb/OleDbCommand.cs: Style changes, added new methods
+        * System.Data.OleDb/OleDbConnection.cs: Style changes, added new methods
+        * System.Data.OleDb/OleDbDataAdapter.cs: Implementation
+        * System.Data.OleDb/OleDbDataReader.cs: Added stubbs
+        * System.Data.OleDb/OleDbErrorCollection.cs: Added stubbs, some implementation
+        * System.Data.OleDb/OleDbParameter.cs: Style changes, added new methods
+        * System.Data.OleDb/OleDbParameterCollection.cs: Style changes, added new methods
+        * System.Data.OleDb/OleDbPermissionAttribute.cs: Style changes, added new methods
+        * System.Data.OleDb/OleDbRowUpdatedEventArgs.cs: Added stubbs
+        * System.Data.OleDb/OleDbRowUpdatingEventArgs.cs: Added stubbs
+        * System.Data.OleDb/OleDbTransaction.cs: Style changes, added new methods
+        * System.Data.OleDb/OleDbType.cs: Fixed two typos
+        * System.Data.OleDb/libgda.cs: Style changes, added new methods
+
+2002-07-09  Tim Coleman <tim@timcoleman.com>
+	
+	* System.Data.build: remove restriction on System.Data.OleDb build
+
+2002-06-03  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/OleDbParameterCollection.cs (GetEnumerator, SyncRoot,
+	IsSynchronized): implemented.
+
+2002-06-02  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/OleDbTransaction.cs (Dispose): added missing method.
+
+	* System.Data.OleDb/OleDbCommand.cs (Clone): added missing methods.
+	(Parameters, Transaction, Connection): made these overload
+	IDbCommand's ones.
+
+	* System.Data.OleDb/OleDbParameterCollection.cs (IndexOf, Remove, RemoveAt):
+	call m_list methods, not own ones.
+
+	* System.Data.OleDb/OleDbParameter.cs: more implementation.
+	
+2002-06-02  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/OleDbTransaction.cs (Connection, IsolationLevel, Begin,
+	Commit, Rollback): implemented.
+	(GdaConnection): added new internal property.
+
+	* System.Data.OleDb/OleDbParameter.cs:
+	* System.Data.OleDb/OleDbParameterCollection.cs: implemented some methods and
+	properties.
+
+	* System.Data.OleDb/libgda.cs: added yet more libgda API functions.
+
+2002-06-01  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/libgda.cs: added new libgda API functions.
+
+	* System.Data.OleDb/OleDbConnection.cs (Provider): implemented.
+	(BeginTransaction): made it overload IDbConnection methods.
+	(ChangeDatabase): new stub, needs some work on libgda for being
+	implemented.
+	(Clone): new stub.
+	(Close): implemented.
+	(CreateCommand): implemented.
+	(GetOleDbSchemaTable): new stub, until I understand what to do here.
+	(Open): implemented basic stuff, which is just supporting connection
+	strings that represent a GDA data source name. More to come.
+	(InfoMessage, StateChange): added events.
+
+	* System.Data.OleDb/TestOleDb.cs: test program for System.Data.OleDb.
+
+2002-05-29  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/libgda.cs: added static constructor.
+	(GdaClient): new static property to get the underlying GdaClient
+	object.
+
+	* System.Data.OleDb/OleDbConnection.cs: removed GDA initialization, which belongs to
+	the static 'libgda' class.
+
+2002-05-29  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/libgda.cs: static class for libgda API calls.
+
+	* System.Data.OleDb/OleDbConnection.cs: implemented constructors.
+	(ConnectionString, Connectiontimeout, Database, State):
+	implemented class properties.
+	(BeginTransaction): implemented.
+
+	* System.Data.OleDb/OleDbTransaction.cs: implemented protected constructors.
+
+	* System.Data.OleDb/TestGDA.cs: simple test for libgda API.
+
+2002-05-27  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.OleDb/*: started System.Data.OleDb provider, based on libgda.
+
+2002-06-06  Rodrigo Moya <rodrigo@ximian.com>
+
+	* list: added missing PostgresTypes.cs file.
+
+2002-06-02  Francisco Jr. <fxjrlists@yahoo.com.br>
+
+	* System.Data.SqlClient/SqlParameterCollection.cs: implemented missing
+	methods.
+
+2002-05-30  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/SqlConnection.cs: modifed -
+	start to implement the interfaces properly and
+	properly doing a Close(), Dispose(), and 
+	releasing resources
+	
+	* Test/SqlSharpCli.cs: modified -
+	add support for MySQL in Mono.Data.MySql
+	and OleDb support in System.Data.OleDb.  However,
+	the OleDb support is commented right now.
+	When the program starts up, a shorter help menu should
+	display the most important commands: help and quit
+
+2002-05-28  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.build: exclude System.Data.OleDb files.
+
+2002-05-27  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/SqlCommand.cs: typo
+	should be CommandBehavior.KeyInfo
+	
+	* Test/SqlSharpCli.cs: refactored and added a few more
+	features.
+
+2002-05-27  Tim Coleman <tim@timcoleman.com>
+	* list: update to compile properly (add missing
+	files and switch path delimiter from '\' to '/').
+
+2002-05-26  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data/DataRow.cs
+	* System.Data.Common/DbDataAdapter.cs: fix to
+	get Test/TestSqlDataAdapter.cs to work again
+	
+	* Test/TestSqlDataAdapter.cs: removed comment
+	about SqlDataReader:NextResult() not being implemented; it
+	bas been implemented
+
+2002-05-26  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data/DataRow.cs: modified
+	support setting of DBNull.Value
+	using the Item indexer this[DataColumn]
+	
+	* System.Data.SqlClient/SqlCommand.cs: modified
+	tweaks to show TODO's for other CommandBehavior.
+	Set AllowDBNull column to true for IsKey row 
+	in schema DataTable.
+	
+	* System.Data.SqlClient/SqlConnection.cs: modified
+	if transaction is in progress when a Close() is called,
+	do a transaction Rollback.
+
+2002-05-26  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Test/SqlSharpCli.cs: added file
+	My new toy.  SQL# is a command-line tool to enter
+	SQL	commands and queries using Mono System.Data.
+	It also serves as a test for Mono System.Data.
+	
+	* System.Data.SqlClient/SqlCommand.cs: modified
+	- ExecuteNonQuery(), ExecuteScalar(), and ExecuteReader()
+	should handle the results from SQL Commands and Queries.
+	- Internal class SqlResult should not create schema Table
+	for the result from a SQL Command.  Also, set the RecordsRetrieved
+	property for SqlDataReader.
+	- Closing the SqlDataReader should Close() the SqlConnection for
+	a CommandBehavior.CloseConnection.
+	- Set defaults for SqlResult
+	
+	* System.Data.SqlClient/SqlConnection.cs: modified - 
+	when SqlDataReader is Close()
+	should Close() the SqlConnection for
+	a CommandBehavior.CloseConnection.  Changed internal Property
+	from OpenReader get/set to IsReaderOpen get and created
+	internal methods OpenReader()/CloseReader() for SqlCommand to call.
+	SqlConnection needs to be prevented from doing while SqlDataReader
+	is being used.
+	
+	* System.Data.SqlClient/SqlDataReader.cs: modified -
+	call SqlCommand's OpenReader() internal method.  get
+	RecordsRetrieved from SqlResult.  set/reset default
+	values for SqlDataReader.
+	
+	* Test/PostgresTest.cs
+	* Test/TestExecuteScalar.cs
+	* Test/TestSqlDataReader.cs: modified
+	for the Execute...() methods in SqlCommand
+	to test SQL Queries and Commands
+	
+	* Test/System.Data_test.build: modified
+	exclude new file Test/SqlSharpCli.cs from 
+	test build
+	
+2002-05-24  Tim Coleman <tim@timcoleman.com>
+	* System.Data.Common/DbDataAdapter.cs: remove IDbCommands, except
+	for get accessors.  These should be implemented in derived classes.  See
+	SqlDataAdapter for clues.
+	* System.Data.SqlClient/SqlDataAdapter.cs: implement IDbDataAdapter
+	* System.Data.Common/DataAdapter.cs:
+	* System.Data.Common/DataTableMappingCollection.cs:
+	* System.Data.Common/DataTableMapping.cs:
+	* System.Data.Common/DataColumnMappingCollection.cs:
+	* System.Data.Common/DataColumnMapping.cs:
+	Properly (I hope!) implement all of the appropriate interfaces
+	for these classes.  
+
+
+2002-05-23  Tim Coleman <tim@timcoleman.com>
+	* System.Data.SqlClient/SqlCommand.cs: include
+	the BaseColumnName in the schema table.  Was missed before.
+	* System.Data.Common/DbDataAdapter.cs: Use DataTable
+	mappings so that the DataSet and DataTable are more closely tied.
+	Get schema information from the DataTable using GetSchemaTable ()
+	Various other little fixes
+	* System.Data.Common/DataColumnMappingCollection.cs:
+	* System.Data.Common/DataTableMapping.cs:
+	* System.Data.Common/DataTableMappingCollection.cs: Some
+	implementation, enough to be used by DbDataAdapter.
+
+2002-05-23  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/SqlCommand.cs: set
+	the "ProviderType" to the PostgreSQL type oid
+	
+	* System.Data.SqlClient/SqlDataReader.cs: fix
+	for various properties and methods that 
+	return meta data: Item indexers this[name] and this[index],
+	GetFieldType, GetName, and GetOrdinal.  SqlDataAdapter
+	should work again.
+
+2002-05-22  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data/DataRow.cs: change suggested
+	by tim: in Item indexer, do an EndEdit()
+	
+	* System.Data.SqlClient/SqlCommand.cs: more
+	fixes to SqlResult.  After setting each item in
+	the DataRow, do an AcceptChanges() to commit
+	the changes in the DataRow.  For DataType, use a Type
+	of System.String since System.Type nor System.Object
+	seems to work.
+	
+	* Test/TestSqlDataReader.cs
+	* Test/PostgresTest.cs: updated to to be on
+	the way schema table is suppose to work
+
+2002-05-22  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/SqlCommand.cs: more work on 
+	building the schema table
+
+2002-05-22  Tim Coleman <tim@timcoleman.com>
+	* System.Data.SqlClient/SqlCommand.cs: preliminary work
+	on getting the schema table correctly built.
+
+2002-05-21  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/ParmUtil.cs: added file - to
+	provide utility for conversion of input parameters
+	
+	* System.Data.SqlClient/PostgresTypes.cs: added file - 
+	moved the PostgreHelper class to here.  May eventually
+	move the internal class PostgresTypes that's inside the 
+	SqlConnection to here as well.  
+	Handling of PostgreSQL <-> .NET types need to be though
+	out more. Also, the PostgreHelper has a method to convert
+	from .NET types to a string which can be put into used in
+	an SQL statement to execute against a PostgreSQL database.
+	This is the beginnings of parameters support.  It currently
+	only supports input parameters.  Still need to do output,
+	input/output, and return parameters.
+	
+	* Test/TestSqlParameters.cs: new test to test the input
+	parameters in System.Data.SqlClient against a 
+	PostgreSQL db.
+	
+	* System.Data.SqlClient/PostgresLibrary.cs: moved 
+	PostgresHelper class to file PostgresTypes.cs.  Also 
+	moved struct PostgresType there too.
+	
+	* System.Data.SqlClient/SqlCommand.cs: added input 
+	parameters support
+	
+	* System.Data.SqlClient/SqlParameter.cs: got 
+	SqlParameter to work
+	
+	* System.Data.SqlClient/SqlParameterCollection.cs: got 
+	SqlParameterCollection to work
+	
+	* Test/System.Data_test.build: added files to exclude 
+	from test build
+	
+	* System.Data.SqlClient/SqlConnection.cs: release resources
+	no longer used
+
+2002-05-18  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Xml: added directory for classes with namespace
+	System.Xml to go into the System.Data.dll assembly
+	
+	* System.Xml/XmlDataDocument: added file
+	for stubbed concrete class XmlDataDocument which 
+	inherits from XmlDocument.  Its purpose is to provide
+	a W3C XML DOM Document for relational data and interacting
+	with a DataSet
+
+2002-05-18  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/SqlCommand.cs: handle CommandTypes
+	Text, TableDirect, and StoredProcedure
+	
+	* Test/PostgresTest.cs: changed call to version() 
+	stored procedure to use the CommandType of StoredProcedure
+	
+	* Test/TestSqlDataReader.cs: test all the CommandTypes
+
+2002-05-18  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.build: took out all excluded
+	files except the ones in the Test directory
+	because all files compile now.  It does not
+	mean they all work or have implementations
+	though.
+	
+	* System.Data/DataRelationCollection.cs
+	* System.Data/DataTableRelationCollection.cs
+	* System.Data/InternalDataCollectionBase.cs
+	* System.Data.Common/DbDataPermission.cs
+	* System.Data.SqlClient/SqlInfoMessageEventArgs.cs
+	* System.Data.SqlClient/SqlClientPermission.cs
+	* System.Data.SqlClient/SqlClientPermissionAttribute.cs: changes
+	to get all System.Data* files to compile.
+	
+	* System.Data.SqlClient/SqlCommand.cs: started coding
+	to prevent SqlConnection and SqlCommand from doing
+	anyting while fetching data using SqlDataReader.  Also,
+	started coding to undo this prevention once the 
+	SqlDataReader is closed.
+	
+	* System.Data.SqlClient/SqlConnection.cs: get database server
+	version.  Started coding to prevent connection from 
+	doing anything while fetching data and undo once the reader 
+	is closed.  Include events SqlInfoMessage and StateChange.
+	
+	* System.Data.SqlClient/SqlDataReader.cs: start coding to
+	prevent connection and command from doing anything while
+	fetching data, and undo when closed.
+	
+	* Test/PostgresTest.cs: added test to get ServerVersion
+	property from SqlConnection
+
+2002-05-18  Tim Coleman <tim@timcoleman.com>
+	* System.Data/DataRow.cs: More implementation,
+	as well as boundary checks and small semantic
+	repairs
+
+2002-05-18  Tim Coleman <tim@timcoleman.com>
+	* System.Data/DataRow.cs: Try to reduce memory
+	usage by only creating the original and proposed
+	arrays as required in BeginEdit, and then destroying
+	proposed during EndEdit, and original during AcceptChanges.
+	* System.Data.Common/DbDataAdapter.cs: Make the
+	startRecord and maxRecords parameters work correctly.
+
+2002-05-18  Tim Coleman <tim@timcoleman.com>
+	* System.Data/DataRow.cs: Move the null check in
+	ItemArray set to above the Invalid Cast check, so
+	that we don't get null reference exceptions.
+
+2002-05-17  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/PostgresLibrary.cs: handle
+	data value from database being NULL
+	
+	* System.Data.SqlClient/SqlCommand.cs: for ExecuteReader, 
+	allow multiple result sets.  Added new internal class
+	SqlResult to pass result set data from SqlCommand
+	to SqlDataReader.
+	
+	* System.Data.SqlClient/SqlDataReader.cs: allow
+	multiple result sets.
+	
+	* System.Data.SqlClient/SqlConnection.cs: moved 
+	things around.  Implement IDisposable.
+	
+	* Test/TestSqlDataReader.cs: test for execution
+	of multiple result sets and display the results
+	of these multiple results sets
+	
+	* Test/TestSqlDataAdapter.cs: tweaks
+
+2002-05-17  Tim Coleman <tim@timcoleman.com>
+	* System.Data.Common/DbDataAdapter.cs:
+		- More implementation of Fill methods
+		- Get rid of isDirty flag, because we can just check
+			if the table exists
+		- Do *not* remove DataTables before Filling them
+		- Implicitly open the connection before doing a Fill
+			if it does not exist.
+	* System.Data.SqlClient/SqlDataAdapter.cs:
+		- Minor fixup
+	* System.Data/DataTableCollection.cs:
+		- Add DataSet to internal, undocumented constructor
+		- When a table is created, set its DataSet property
+		- Default table name for creation is "Table1" (see .NET)
+		- Inherit the ArrayList list from InternalDataCollecitonBase
+			and maintain a hashtable between table names and
+			DataTables
+	* System.Data/DataTable.cs:
+		- Add internal dataSet field.  This is used by 
+			DataTableCollection when the DataTable is constructed.
+	* System.Data/DataSet.cs:
+		- Pass a reference to the DataSet when constructing the
+			DataTableCollection.
+
+2002-05-16  Tim Coleman <tim@timcoleman.com>
+        * System.Data.Common/DbDataAdapter.cs:
+                Use table.Rows.Add (itemArray) instead of
+                table.Rows.Add (thisRow) to provide better
+                abstraction.
+        * System.Data/DataRowCollection.cs:
+                Some implementation of this class.
+        * System.Data/InternalDataCollectionBase.cs:
+                Some implementation.  Most notably, this now
+                has an enumerator so we can use foreach (DataRow row in table.Rows)
+                in the test classes.
+        * System.Data/DataTable.cs:
+                Since DataRowCollection now accepts a DataTable in
+                its internal constructor, we must pass one in.
+
+2002-05-16  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Test/TestSqlDataAdapter.cs: added new test 
+	for SqlDataAdapter, DataSet, DataTableCollection, DataTable, 
+	DataRowCollection, and DataRow.  It tests retrieving data
+	based on a SQL SELECT query.  This test is based on Tim Coleman's
+	test he sent to me.
+
+2002-05-16  Tim Coleman <tim@timcoleman.com>
+	* System.Data.Common/DbDataAdapter.cs:
+		Use table.Rows.Add (thisRow) instead of 
+		table.ImportRow (thisRow)
+	* System.Data/DataRowCollection.cs:
+		Construct the ArrayList before using it
+
+2002-05-16  Tim Coleman <tim@timcoleman.com>
+	* System.Data/DataTable.cs:
+		Construct the DataRowCollection in the DataTable
+		constructor.  Otherwise, it's a null reference.
+
+2002-05-16  Tim Coleman <tim@timcoleman.com>
+	* System.Data.SqlClient/SqlDataReader.cs:
+		Modify GetValues to use Array.Copy() to copy
+		the results from fields to values, rather than
+		an assignment, which results in loss of data.
+
+2002-05-16  Tim Coleman <tim@timcoleman.com>
+	* System.Data/DataRow.cs:
+		More implementation and documentation.  It should
+		work more like expected, although there is no way
+		to demonstrate this well yet.  DataTable requires
+		more work.
+
+2002-05-15  Tim Coleman <tim@timcoleman.com>
+        * System.Data/DataRow.cs:
+	                Minor tweaks as I determine exactly how to
+			                implement this class.
+
+
+2002-05-14  Duncan Mak  <duncan@ximian.com>
+
+	* System.Data/DataTable.cs (NewRow): Added missing paren to fix build.
+
+2002-05-14  Tim Coleman
+	* System.Data/DataRow.cs:
+	* System.Data/DataRowBuilder.cs:
+	* System.Data/DataTable.cs:
+		More implementation of these classes.  DataRow
+		can now (possibly) do some useful things.
+		Still not sure what DataRowBuilder is all about,
+		other than passing a DataTable in.
+
+2002-05-14  Tim Coleman
+	* System.Data/DataRowBuilder.cs:
+		Add stubb for this internal class.
+
+2002-05-13  Tim Coleman
+	* System.Data.Common/DbDataAdapter.cs:
+		The maxRecords check was not correct.
+
+2002-05-13  Tim Coleman
+	* System.Data/DataTableCollection.cs:
+		Fix an issue when adding a DataTable and size == 0.
+		Now explicitly checks if size > 0 before doing Array.Copy ()
+	* System.Data.Common/DbDataAdapter.cs:
+		Move closer to a working implementation.
+		Make the IDbCommand fields protected so that they can
+		be inherited.
+	* System.Data.SqlClient/SqlDataAdapter.cs:
+		This should inherit the IDbCommands instead of having its
+		own.  An explicit cast is used to force conversion between
+		IDbCommand and SqlCommand
+
+2002-05-13  Tim Coleman
+	* System.Data.Common/DataTableMappingCollection.cs:
+		Some implementation to allow progress with DbDataAdapter
+
+2002-05-13  Tim Coleman
+	* System.Data.Common/DbDataAdapter.cs:
+		Modify to not break compile.
+
+2002-05-13  Tim Coleman
+	* System.Data.build:
+		include SqlDataAdapter, SqlRowUpdatedEventArgs,
+		SqlRowUpdatingEventArgs, SqlRowUpdatedEventHandler,
+		SqlRowUpdatingEventHandler in the build.
+
+2002-05-13  Tim Coleman
+	* System.Data.Common/DbDataAdapter.cs:
+		More implementation.
+	* System.Data.Common/DataAdapter.cs:
+		Correction of some of the stubbing, as well as a
+		little bit more implementation
+
+2002-05-11  Tim Coleman
+	* System.Data.SqlClient/SqlDataAdapter.cs:
+	* System.Data.Common/DbDataAdapter.cs:
+		Moved methods that weren't supposed to 
+		be in SqlDataAdapter out.  They should be implemented
+		in DbDataAdapter.
+	
+
+2002-05-11  Tim Coleman
+        * System.Data.SqlClient/SqlDataAdapter.cs:
+                some implementation of this class.  Note
+                that none of the functionality has been
+                tested yet, but I felt it should be checked
+                in at this point as it compiles.
+        * System.Data.SqlClient/SqlRowUpdatingEventArgs.cs:
+        * System.Data.SqlClient/SqlRowUpdatedEventArgs.cs:
+                Modified so that they will compile properly.
+                Needed to include SqlDataAdapter in the build.
+
+2002-05-11  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data/DataTable.cs (Clear): implemented.
+	(DataTable): removed repeated code in constructors, and call the
+	basic constructor from the others.
+
+	* System.Data/DataColumn.cs: some tweaks.
+
+	* System.Data/DataRow.cs (RowState): implemented.
+	(CancelEdit): set rowState property back to Unchanged.
+	(RejectChanges): call CancelEdit.
+	(Delete): set rowState to Deleted.
+
+2002-05-11  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.build: added copy of System.Data.dll to Test directory
+	for easy testing.  Also, added clean for it too.
+	
+	* System.Data.SqlClient/PostgresLibrary.cs: changed setting of boolean
+	from PostgreSQL data type to .NET type.
+	
+	* System.Data.SqlClient/SqlDataReader.cs: beginnings
+	handling of a NULL value from the database
+	
+	* Test/PostgresTest.cs: added tests for NULL values retrieved
+	from the database
+	
+	* Test/ReadPostgresData.cs
+	* Test/TestExecuteScalar.cs
+	* Test/TestSqlDataReader.cs
+	* Test/TestSqlException.cs
+	* Test/TestSqlIsolationLevel.cs: updated tests to use databas user
+	"postgres".  These tests may eventually be removed since they
+	are not flexible.
+
+2002-05-10  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.build: removed reference to non-existant
+	TestDataColumn.cs file.
+
+	* System.Data/DataSet.cs: added some implementation.
+
+2002-05-09  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/PostgresLibrary.cs: got
+	PostgreSQL data types time, date, timestamp (DateTime like)
+	mapped to .NET System.DateTime working based 
+	on ISO DateTime formatting "YYYY-MM-DD hh:mi:ss.ms"
+	Also mapped pg type boolean to .net Boolean
+	
+	* SqlClient/SqlConnection.cs: run SQL command to set
+	Date style to ISO
+	
+	* Test/PostgresTest.cs: added test for an UPDATE SQL command,
+	added tests for aggregates min(), max(), sum(), count().  could
+	not get avg() to work due to some formatting error; someone claimed
+	that it was my locale settings.  added tests for SELECT of columns
+	of type boolean, float, double, date, time, and timestamp.  They
+	have not been fully tested, but its a start.
+
+2002-05-09  Tim Coleman <tim@timcoleman.com>
+	* System.Data.SqlTypes/SqlDecimal.cs: Implementations of 
+	addition, subtraction, and multiplication for the
+	SqlDecimal type, as well as modification of some other
+	operations.  More to come on this one.
+
+2002-05-08  Rodrigo Moya <rodrigo@ximian.com>
+
+	* Test/System.Data_test.build: excluded TestDataColumn, which
+	should be replaced with a nunit test.
+
+	* Test/TestDataColumn.cs: added basic test for DataColumn.cs.
+
+2002-05-07  Tim Coleman <tim@timcoleman.com>
+	* SqlBinary.cs:
+	* SqlBoolean.cs:
+	* SqlByte.cs:
+	* SqlDateTime.cs:
+	* SqlDecimal.cs:
+	* SqlDouble.cs:
+	* SqlGuid.cs:
+	* SqlInt16.cs:
+	* SqlInt32.cs:
+	* SqlInt64.cs:
+	* SqlMoney.cs:
+	* SqlSingle.cs:
+	* SqlString.cs:
+		Fix the broken build I made before.  Bad
+		me.
+
+2002-05-07  Tim Coleman <tim@timcoleman.com>
+	* SqlString.cs:
+		Fix a symantic error I made in SqlString
+		Equals where I copied and pasted wrongly
+
+2002-05-07  Tim Coleman <tim@timcoleman.com>
+	* INullable.cs:
+	* SqlBinary.cs:
+	* SqlBoolean.cs:
+	* SqlByte.cs:
+	* SqlCompareOptions.cs:
+	* SqlDateTime.cs:
+	* SqlDecimal.cs:
+	* SqlDouble.cs:
+	* SqlGuid.cs:
+	* SqlInt16.cs:
+	* SqlInt32.cs:
+	* SqlInt64.cs:
+	* SqlMoney.cs:
+	* SqlSingle.cs:
+	* SqlString.cs:
+		Implement CompareTo, Equals, and String conversions 
+		for many types
+
+2002-05-05  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Test/PostgresTest.cs: modified to run completely.  There
+	are many TODOs in System.Data, so not all data types are
+	included in the SELECT SQL query.  Also, I made it to where
+	it would connect 
+	using "host=localhost;dbname=test;user=postgres"
+	instead of my userid and password.  When more types are included,
+	update this test.
+
+2002-05-05  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Test/PostgresTest.cs: added - ported
+	libgda postgres-test.c originally by 
+	Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+	to C#.
+
+2002-05-05  Tim Coleman <tim@timcoleman.com>
+	* System.Data.SqlTypes/SqlBinary.cs:
+	* System.Data.SqlTypes/SqlBoolean.cs:
+	* System.Data.SqlTypes/SqlByte.cs:
+	* System.Data.SqlTypes/SqlDateTime.cs:
+	* System.Data.SqlTypes/SqlDecimal.cs:
+	* System.Data.SqlTypes/SqlDouble.cs:
+	* System.Data.SqlTypes/SqlGuid.cs:
+	* System.Data.SqlTypes/SqlInt16.cs:
+	* System.Data.SqlTypes/SqlInt32.cs:
+	* System.Data.SqlTypes/SqlInt64.cs:
+	* System.Data.SqlTypes/SqlMoney.cs:
+	* System.Data.SqlTypes/SqlSingle.cs:
+	* System.Data.SqlTypes/SqlString.cs:
+		More implementation, and code clean-up for consistency.
+		Also, I had implemented many conversions as explicit
+		that should have been implicit.  This should remove
+		many of the red X's and green pluses from the 
+		System.Data.SqlTypes namespace.
+
+2002-05-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* System.Data/DataSet.cs: Remove [Serializable] attributes from
+	methods, those only apply to structs or classes.
+
+	Stub out ISerializable, ISupportInitialize, and IListSource methods 
+	
+	* System.Data/DataRowView.cs: Stub out interface methods for
+	IEditableObject, ICustomTypeDescriptor and IDataErrorInfo
+
+	* System.Data/DataView.cs: Comment out non-implemented
+	interfaces. 
+
+	* System.Data/DataViewSettingsCollection.cs: Type cast variables
+	to the correct type to make it compile.
+
+	* System.Data/DataViewSettings.cs: remove reference to
+	non-existance type ApplyDefaultSort, it is a boolean.
+	
+
+2002-05-05  Tim Coleman <tim@timcoleman.com>
+        * System.Data.SqlTypes/SqlBinary.cs:
+        * System.Data.SqlTypes/SqlBoolean.cs:
+        * System.Data.SqlTypes/SqlByte.cs:
+        * System.Data.SqlTypes/SqlDecimal.cs:
+        * System.Data.SqlTypes/SqlDouble.cs:
+        * System.Data.SqlTypes/SqlGuid.cs:
+        * System.Data.SqlTypes/SqlInt16.cs:
+        * System.Data.SqlTypes/SqlInt32.cs:
+        * System.Data.SqlTypes/SqlInt64.cs:
+        * System.Data.SqlTypes/SqlMoney.cs:
+        * System.Data.SqlTypes/SqlSingle.cs:
+        * System.Data.SqlTypes/SqlString.cs:
+                Various fixes, including adding the SqlNullValueException
+                when trying to retrieve the value of a null SqlType,
+                and when casting values, a Null of type A converts to a
+                Null of type B.
+
+2002-05-04  Daniel Morgan <danmorg@sc.rr.com>
+	
+	* System.Data.SqlClient/PostgresLibrary.cs
+	* System.Data.SqlClient/SqlCommand.cs
+	* System.Data.SqlClient/SqlConnection.cs
+	* System.Data.SqlClient/SqlDataReader.cs
+	oid should not be hard coded because they
+	can change from one version of PostgreSQL
+	to the next.  Use the typname's instead.
+	The PostgreSQL type data retrieves
+	at database connection time.  Any unimplemented
+	types just default to string.  These were things
+	suggested by Gonzalo.
+	
+	* Test/ReadPostgresData.cs - stuff
+	* Test/TestSqlDataReader.cs - stuff
+	
+	* System.Data.SqlTypes/SqlInt32.cs - added a using
+
+2002-05-03  Tim Coleman <tim@timcoleman.com>
+	* System.Data.build: Fix the build so that test depends on build
+
+2002-05-03  Tim Coleman <tim@timcoleman.com>
+	* System.Data.SqlTypes/SqlByte.cs:
+	* System.Data.SqlTypes/SqlDateTime.cs:
+	* System.Data.SqlTypes/SqlDecimal.cs:
+	* System.Data.SqlTypes/SqlDouble.cs:
+	* System.Data.SqlTypes/SqlGuid.cs:
+	* System.Data.SqlTypes/SqlInt16.cs:
+	* System.Data.SqlTypes/SqlInt64.cs:
+	* System.Data.SqlTypes/SqlMoney.cs:
+	* System.Data.SqlTypes/SqlSingle.cs:
+		These files were mysteriously excluded from the last
+		patch I made and sent to Rodrigo
+	* System.Data.build: include the System.Data.SqlTypes in the build
+
+2002-05-03  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.build: removed comments
+
+	* System.Data.SqlClient/PostgresLibrary.cs: changed
+	the hard-coded PostgreSQL oid type int's to using an
+	enum.  Also, added PostgreSQL bpchar (character) type.
+	
+	* Test/TestSqlDataReader.cs: updated test
+	to include new bpchar PostgreSQL type
+
+2002-05-03  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.SqlTypes/SqlBinary.cs:
+	* System.Data.SqlTypes/SqlBoolean.cs:
+	* System.Data.SqlTypes/SqlInt32.cs:
+	* System.Data.SqlTypes/SqlString.cs: more implementation, by
+	Tim Coleman <tcoleman@opentext.com>.
+
+2002-05-03  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Test/TestExecuteScalar.cs: added test for 
+	method ExecuteScalar in class SqlCommand.
+	
+	* System.Data/DataColumnCollection.cs - it should
+	inherit properties from base InternalDataCollectionBase
+	and use them instead of overriding them, such as, List.
+	
+	* System.Data/DataColumn.cs
+	* System.Data/DataTable.cs: tweaks to retrieve
+	meta data from the database
+	
+	* System.Data.SqlClient/PostgresLibrary.cs -
+	added method OidToType to convert PostgreSQL oid type 
+	to System.Type.  Renamed method OidTypeToSystem
+	to ConvertPgTypeToSystem for converting the data value
+	from a PostgreSQL type to a .NET System type.
+	
+	* System.Data.SqlClient/SqlCommand.cs: implemented
+	method ExecuteReader which returns a SqlDataReader
+	for a light forward only read only result set. 
+	It works on types int4 ==> Int32 and 
+	varchar ==> String.  Other types
+	will come later.
+	
+	* System.Data.SqlClient/SqlConnection.cs: added comment
+	
+	* System.Data.SqlClient/SqlDataReader.cs: implemented
+	class.  It works, but still lots to do.
+	
+	* Test/ReadPostgresData.cs: stuff
+	
+	* Test/TestSqlDataReader.cs: updated test for SqlDataReader
+	to display meta data and the data
+	
+2002-05-03  Duncan Mak  <duncan@ximian.com>
+
+	* TODO: Took out all the Exceptions. They should be all done now.
+
+	* System.Data/ConstraintException.cs: 
+	* System.Data/DBConcurrencyException.cs:
+	* System.Data/DataException.cs: 
+	* System.Data/DeletedRowInaccessibleException.cs: 
+	* System.Data/DuplicateNameException.cs:
+	* System.Data/EvaluateException.cs: 
+	* System.Data/InRowChangingEventException.cs: 
+	* System.Data/InvalidConstraintException.cs: 
+	* System.Data/InvalidExpressionException.cs: 
+	* System.Data/MissingPrimaryKeyException.cs:
+	* System.Data/NoNullAllowedException.cs: 
+	* System.Data/ReadOnlyException.cs: 
+	* System.Data/RowNotInTableException.cs: 
+	* System.Data/StrongTypingException.cs:
+	* System.Data/SyntaxErrorException.cs: 
+	* System.Data/TypeDataSetGeneratorException.cs: 
+	* System.Data/VersionNotFoundException.cs: Added to CVS.
+
+	* System.Data.SqlTypes/SqlNullValueException.cs: 
+	* System.Data.SqlTypes/SqlTruncateException.cs: 
+	* System.Data.SqlTypes/SqlTypeException.cs: Added to CVS.
+
+2002-05-02  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data/DataViewSettingCollection.cs: implemented.
+
+	* System.Data/DataRowView.cs: new stubs.
+
+	* System.Data.SqlTypes/SqlByte.cs:
+	* System.Data.SqlTypes/SqlDateTime.cs:
+	* System.Data.SqlTypes/SqlDecimal.cs:
+	* System.Data.SqlTypes/SqlDouble.cs:
+	* System.Data.SqlTypes/SqlGuid.cs:
+	* System.Data.SqlTypes/SqlInt16.cs:
+	* System.Data.SqlTypes/SqlInt64.cs:
+	* System.Data.SqlTypes/SqlMoney.cs:
+	* System.Data.SqlTypes/SqlSingle.cs: new stubs, contributed
+	by Tim Coleman <tcoleman@opentext.com>
+
+	* System.Data.build: excluded newly-added files.
+
+2002-05-02  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/PostgresLibrary.cs: included new 
+	internal class that will be a helper class in using
+	PostgreSQL.  PostgresLibrary is used for the 
+	pinvoke methods to the PostgreSQL Client
+	native C library libpq while the class PostgresHelper 
+	is used for	wrapper or helper methods.  It currently only
+	has one static method OidTypeToSystem in converting
+	PostgreSQL types to .NET System.<type>s, such as,
+	a PostgreSQL int8 becomes a .NET System.Int64.
+	Only a few types have been added, such as, int2,
+	int4, int8, varchar, text, bool, and char.  Other types
+	will come later.
+	
+	* System.Data.SqlClient/SqlCommand.cs: implemented
+	method ExecuteScalar which allows us to do aggregate
+	functions, such as, count, avg, min, max, and sum.  We
+	also are able to retrieve the result, convert it to the .NET type
+	as an object.  The user of the returned object must explicitly cast.
+	
+	* Test/ReadPostgresData.cs: updated sample
+	to help us learn to retrieve data in System.Data.SqlClient
+	classes
+
+2002-05-01  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.build: added /nowarn: nnnn arguments 
+	so you will not get a ton of warnings.  The warnings
+	being excluded are: 1595, 0067, 0109, 0169, and	0649
+
+2002-05-01  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.build: modified to exclude more 
+	files from the build
+
+2002-05-01  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.SqlClient/SqlClientPermission.cs: added missing
+	'using's.
+
+	* System.Data/MergeFailedEventArgs.cs: new class, contributed
+	by John Dugaw <jdugaw@unizenconsulting.com>.
+
+	* System.Data.build: excluded new files from build.
+
+2002-04-29  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Test/ReadPostgresData.cs: added - Uses the 
+	PostgresLibrary to retrieve a recordset.
+	This is not meant to be used in Production, but as a
+	learning aid in coding 
+	class System.Data.SqlClient.SqlDataReader.
+	This sample does work.
+	
+	* Test/TestSqlDataReader.cs: added - used
+	to test SqlDataReader (does not work yet)
+	Forgot to add to ChangeLog on last commit.
+
+2002-04-28  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data/DataViewSetting.cs: new class.
+	
+2002-04-28  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data/DataViewManager.cs: new class.
+	
+	* System.Data.SqlTypes/INullable.cs: properties for interfaces
+	don't have implementation.
+
+	* System.Data.SqlTypes/SqlInt32.cs:
+	* System.Data.SqlTypes/SqlString.cs:
+	* System.Data.SqlTypes/SqlBoolean.cs: removed destructor, since
+	these are strctures.
+
+	* System.Data.SqlClient/SqlClientPermissionAttribute.cs: added
+	missing 'using's.
+	
+2002-04-28  Rodrigo Moya <rodrigo@ximian.com>
+	
+	* System.Data/DataTableRelationCollection.cs: use 'new' keyword
+	for correctly hiding parent class' members.
+	(AddRange): use 'override' keyword on overriden method.
+	(Clear): likewise.
+	(Contains): likewise.
+	(IndexOf): likewise.
+	(OnCollectionChanged): likewise.
+	(OnCollectionChanging): likewise.
+	(RemoveCore): likewise.
+
+	* System.Data/DataColumnCollection.cs: use 'new' keyword.
+
+	* System.Data/DataSet.cs: added missing 'using's.
+	
+2002-04-28  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data/DataSet.cs:
+	* System.Data/DataTableCollection.cs:
+	* System.Data/DataView.cs: compilation fixes on Linux.
+
+2002-04-28  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data/DataRelation.cs
+	* System.Data/ForeignKeyConstraint.cs
+	* System.Data/UniqueConstraint.cs: added more stubs
+	
+	* System.Data/DataTableRelationCollection.cs: added back to cvs
+	and modified for compile errors.  DataRelationCollection is an
+	abstract class and there must be a class that implements for
+	DataTable/DataSet.  DataTableRelationCollection was changed
+	to an internal class.
+	
+	* System.Data.build: modified - new files added
+	also wanted to include files/classes in the build 
+	so we can get a compilable forward read only result set.
+	It compiles now using csc/nant with warnings, but this 
+	is a start for adding functionality for the result set.  
+	Classes associated with/and DataSet are still excluded.
+	
+	* TODO: modified - updated to do list for System.Data
+	
+	* System.Data/Constraint.cs
+	* System.Data/ConstraintCollection.cs
+	* System.Data/DataRelationCollection.cs
+	* System.Data/DataRow.cs
+	* System.Data/DataRowChangeEventArgs.cs
+	* System.Data/DataRowCollection.cs
+	* System.Data/DataTable.cs
+	* System.Data/DataTableCollection.cs
+	* System.Data/InternalDataCollectionBase.cs
+	* System.Data/PropertyCollection.cs: modified -
+	changes to compile SqlDataReader/DataTable and
+	dependencies
+	
+	* System.Data/IDbCommand.cs
+	* System.Data.SqlClient/SqlCommand.cs: modified -
+	un-commented overloaded methods ExecuteReader 
+	which returns a SqlDataReader
+
+2002-04-28  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data/DataTableCollection.cs: more implementation.
+	(Count): added 'override' keyword, as pointer out by Martin.
+
+	* System.Data.Common/DataColumnMappingCollection.cs (Add, AddRange):
+	only call Array.Copy when there is really stuff to be copied.
+	(CopyTo): don't create the temporary array, it's not needed.
+
+	* System.Data.build: excluded newly added file from build.
+
+2002-04-27  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data/DataTableRelationCollection.cs: removed, it's not
+	on MS SDK documentation.
+
+	* System.Data/DataTableCollection.cs: new class.
+
+2002-04-27  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data/DataRowChangeEventArgs.cs
+	* System.Data/DataRowCollection.cs
+	* System.Data/DataView.cs
+	* System.Data/PropertyCollection.cs: added new stubs
+
+	* System.Data.build: modified - added new files to exclude
+	from build
+	
+	* TODO: modified - removed files from TODO list 
+	that were stubbed above
+	
+	* System.Data/DataColumn.cs
+	* System.Data/DataRow.cs: modified - various tweaks
+	and added internal method SetTable to set the reference
+	to a DataTable
+	
+	* System.Data/DataSet.cs: modified - class was not
+	completely stubbed.
+	
+	* System.Data/DataTable.cs: modified - temporarily commented
+	DataSet and DataView references - trying to compile a SqlDataReader,
+	DataTable, and dependencies for a forward read-only result set.
+	SqlDataAdapter, DataSet, and DataView will come later once we can get
+	a forward read only result set working.
+	
+	* System.Data/IDataRecord.cs: modified - source code lines should
+	not be > 80
+	
+	* System.Data/InternalDataCollectionBase.cs: modified - started 
+	implementing this base class for collection of data rows,
+	columns, tables, relations, and constraints
+	
+	* System.Data.SqlClient/SqlException.cs: modified -
+	call base(message) so a unhandled exception displays
+	the message of a SQL error instead of the 
+	default SystemException message
+	
+	* Test/TestSqlException.cs: modified - 
+	handle the rollback properly for a SqlException on a
+	failure to connect
+
+2002-04-23  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.build: modified - added new
+	files to exclude from build 
+	
+	* System.Data/Constraint.cs
+	* System.Data/ConstraintCollection.cs
+	* System.Data/InternalDataCollectionBase.cs: added -
+	stubs which are needed to build DataTable.cs
+	
+	* TODO: modified - added more classes TODO and
+	added more stuff TODO, such as, create script
+	to create test database monotestdb for testing
+	classes in System.Data
+
+2002-04-23  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.Common/DataAdapter.cs:
+	* System.Data.Common/DataColumnMappingCollection.cs:
+	* System.Data.Common/DataTableMappingCollection.cs:
+	* System.Data.Common/DbDataPermission.cs:
+	* System.Data.Common/DbDataPermissionAttribute.cs: some
+	compilation errors fixed.
+
+2002-04-23  Daniel Morgan <danmorg@sc.rr.com>
+
+	* TODO: modified - added classes TODO, and
+	a poor attempt at System.Data plan
+
+2002-04-23  Daniel Morgan <danmorg@sc.rr.com>
+
+	* ChangeLog: modified - put tabs where they belong
+	
+	* System.Data.SqlClient/SqlDataReader.cs
+	* System.Data/DataColumn.cs: modified - compile errors
+	trying to compile SqlDataAdapter and dependencies
+
+2002-04-23  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlTypes/SqlBoolean.cs
+	* System.Data.SqlTypes/SqlCompareOptions.cs
+	* System.Data.SqlTypes/SqlInt32.cs
+	* System.Data.SqlTypes/SqlString.cs: added - new stubs
+
+	* System.Data/DataTable.cs
+	* System.Data.SqlClient/SqlCommand.cs
+	* System.Data.SqlClient/SqlConnection.cs
+	* System.Data.SqlClient/SqlError.cs
+	* System.Data.SqlClient/SqlTransaction.cs: modified - 
+	misc. tweaks
+
+	* System.Data.SqlClient/SqlException.cs: modified -
+	missing Message on indexer for Message property
+
+2002-04-21  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/SqlCommand.cs: modified - to 
+	compile using mcs.  This problem is
+	returning a stronger type in csc vs. msc
+
+	* System.Data.SqlClient/SqlConnection.cs: modified - msc
+	can not do a using PGconn = IntPtr; and then declare
+	with PGconn pgConn = IntPtr.Zero;
+	Thiw works under csc though.  Had to comment using and
+	changed declaration to IntPtr pgConn = IntPtr.Zero;
+	Also, got rid of compile warnings for hostaddr and port.
+
+	* System.Data.SqlClient/SqlErrorCollection.cs: modified - got
+	rid of compile warnings.  Commented MonoTODO attribute because mcs
+	doesn't seem to work with C# array property indexer (Item)
+	this[int index]
+
+	* System.Data.SqlClient/SqlParameterCollection.cs: modified -
+	commented MonoTODO attribute for indexer for mcs compiling
+
+	* Test/TestSqlIsolationLevel.cs:
+	* Test/TestSqlInsert.cs:
+	* Test/TestSqlException.cs: modified -
+	removed extra ExecuteNonQuery which caused two inserted rows
+
+2002-04-20  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data/StateChangeEventArgs.cs - added
+	needed to compile System.Data.dll with mcs.  
+
+2002-04-20  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.OleDb: added directory - for OleDb database 
+	provider classes
+
+	* System.Data.SqlClient/SqlClientPermission.cs
+	* System.Data.SqlClient/SqlClientPermissionAttribute.cs
+	* System.Data.SqlClient/SqlCommandBuilder.cs
+	* System.Data.SqlClient/SqlInfoMessageEventHandler.cs
+	* System.Data.SqlClient/SqlRowUpdatedEventArgs.cs
+	* System.Data.SqlClient/SqlRowUpdatedEventHandler.cs
+	* System.Data.SqlClient/SqlRowUpdatingEventArgs.cs
+	* System.Data.SqlClient/SqlRowUpdatingEventHandler.cs
+	* Test/TestSqlException.cs
+	* Test/TestSqlIsolationLevel.cs: added - more tests
+
+	* System.Data.build: modified - added new files - excludes these too
+
+	* System.Data.SqlClient/PostgresLibrary.cs - modified - comment
+
+	* System.Data.SqlClient/SqlConnection.cs 
+	* System.Data.SqlClient/SqlCommand.cs
+	* System.Data.SqlClient/SqlTransaction.cs
+	* System.Data.SqlClient/SqlException.cs
+	* System.Data.SqlClient/SqlErrorCollection.cs
+	* System.Data.SqlClient/SqlError.cs: modified - transaction and
+	exception/error handling. SqlConnection(connectionString) 
+	constructor should not automatically connect.
+  
+	* System.Data.SqlClient/SqlDataReader.cs
+	* System.Data.SqlClient/SqlDataAdapter.cs
+	* System.Data.SqlClient/SqlParameter.cs
+	* System.Data.SqlClient/SqlParameterCollection.cs: modified - 
+	added using System.ComponentModel;
+  
+	* Test/TestSqlInsert.cs: modified - to use transaction
+
+2002-04-17  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data/DataRow.cs: new skeletons.
+
+	* System.Data.Common/DataAdapter.cs:
+	* System.Data.Common/DataColumnMapping.cs:
+	* System.Data.Common/DataColumnMappingCollection.cs:
+	* System.Data.Common/DataTableMapping.cs:
+	* System.Data.Common/DataTableMappingCollection.cs:
+	* System.Data.Common/DbDataAdapter.cs:
+	* System.Data.Common/RowUpdatedEventArgs.cs:
+	* System.Data.SqlClient/SqlDataAdapter.cs:
+	* System.Data.SqlClient/SqlInfoMessageEventArgs.cs: compilation
+	fixes for Linux.
+
+	* System.Data.Common/DbDataRecord.cs:
+	* System.Data.Common/DbEnumerator.cs: removed MS implementation
+	internal classes.
+
+2002-04-17  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Test/TestSqlInsert.cs: modified - do
+	  a SQL DELETE before SQL INSERT of row so you can use this
+	  test over and over.
+	
+	* System.Data.SqlClient/SqlTransaction.cs: modified - default
+	  IsolationLevel for PostgreSQL is ReadCommitted.  However,
+	  PostgreSQL allows Serializable as well. 
+      (Thanks to Gonzalo for that!)
+	
+	* System.Data.SqlClient/SqlConnection.cs: modified
+	* System.Data.SqlClient/SqlCommand.cs: modified
+	* System.Data.SqlClient/SqlTransaction.cs: modified - got transactions
+	  working; however, we still need to implement SQL errors
+	  and exceptions to properly handle transactions.  Also, added
+	  status and error message support from the PostgreSQL database.
+	  Currently, this does a Console.WriteLine() to display the
+	  status and error messages, but this is a TODO 
+	  for SQL errors and exceptions.
+	
+	* System.Data/TODOAttribute.cs: added - needed MonoTODO
+      attribute for System.Data.dll assembly 
+
+	* System.Data/IDbCommand.cs: modified - commented
+	  overloaded method ExecuteReader 
+	  so System.Data.SqlClient.SqlCommand can compile
+	  
+	* System.Data/IDbCommand.cs: modified
+	* System.Data/IDbConnection.cs: modified - added using System;
+	* System.Data/IDataParameter.cs
+	
+	* System.Data.build: modified - build classes
+	  in System.Data.SqlClient and exclude others in System.Data
+	
+	* System.Data.SqlClient/PostgresLibrary.cs: modified - change
+	  parameter data type from IntPtr to enum ExecStatusType
+	
+	* ChangeLog: modified - corrected previous entries in log
+
+2002-04-16  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.Common/DataColumnMappingCollection.cs: added basic
+	implementation. Still missing some stuff.
+
+2002-04-16  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/SqlConnection.cs: modified - got 
+      to compile, run, and connect to PostgreSQL database
+      
+	* System.Data.SqlClient/SqlCommand.cs: modified - got 
+      to compile, run, and execute a SQL INSERT command 
+      which successfully inserted a row 
+      into the PostgreSQL database
+
+	* System.Data.SqlClient/SqlTransaction.cs: modified
+	* System.Data.SqlClient/SqlParameter.cs: modified
+	* System.Data.SqlClient/SqlParameterCollection.cs: modified
+	* System.Data.SqlClient/SqlError.cs: modified
+	* System.Data.SqlClient/SqlErrorCollection.cs: modified
+	* System.Data.SqlClient/SqlException.cs: modified
+	* System.Data.SqlClient/PostgresLibrary.cs: modified - to compile
+
+	* System.Data.SqlClient/SqlAdapter: modified
+	* System.Data.SqlClient/SqlReader: modified - add more stubs
+	
+2002-04-16  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Test/TestSqlInsert.cs: added 
+
+2002-04-15  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/SqlInfoMessageEventArgs.cs: added - using in
+	  class SqlConnecition
+	* System.Data.SqlClient/SqlErrorCollection.cs: added
+	* System.Data.SqlClient/SqlErrors.cs: removed - no such class SqlErrors
+
+2002-04-15  Christopher Podurgiel <cpodurgiel@msn.com>
+	
+	* System.Data.IDbDataParameter: Added Interface to IDataParameter.
+	* System.Data.IDbTransaction: Added Interface to IDisposable.
+	* System.Data.IDbCommand: Fixed Capitalization of class name.
+	* System.Data.IDbConnection: Fixed Capitalization of class name.
+
+2002-04-15  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.Common/DbDataPermissionAttribute.cs:
+	* System.Data.Common/DataAdapter.cs:
+	* System.Data.Common/DataColumnMapping.cs:
+	* System.Data.Common/DbDataPermission.cs: added some implementation.
+
+2002-04-15  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.SqlClient/SqlConnection.cs: fixed constructor chaining
+	syntax, as pointed out by Levent Camlibel.
+
+2002-04-14  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.SqlTypes/SqlBinary.cs:
+	* System.Data.SqlTypes/INullable.cs: new skeletons.
+
+2002-04-14  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlClient/PostgresLibrary.cs: new internal class, which
+	contains all calls the the PostgreSQL client library, to be used
+	everywhere in System.Data.SqlClient.
+
+2002-03-30  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.SqlClient/SqlConnection.cs: implemented basic
+	constructors.
+
+	* System.Data.SqlTypes/SqlNullValueException.cs: new skeletons.
+
+2002-03-29  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.Common/DbDataRecord.cs:
+	* System.Data.Common/DbEnumerator.cs:
+	* System.Data.Common/RowUpdatedEventArgs.cs:
+	* System.Data.Common/RowUpdatingEventArgs.cs:
+	* System.Data.Common/DbDataPermissionAttribute.cs: new skeletons.
+
+2002-03-28  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.Common/DataTableMappingCollection.cs:
+	* System.Data.Common/DbDataAdapter.cs:
+	* System.Data.Common/DbDataPermission.cs:
+	* System.Data.Common/DataTableMapping.cs: new skeletons.
+
+	* System.Data.SqlClient/SqlDataAdapter.cs:
+	* System.Data.SqlClient/SqlDataReader.cs:
+	* System.Data.SqlClient/SqlErrors.cs:
+	* System.Data.SqlClient/SqlError.cs:
+	* System.Data.SqlClient/SqlException.cs:
+	* System.Data.SqlClient/SqlParameter.cs:
+	* System.Data.SqlClient/SqlParameterCollection.cs:
+	* System.Data.SqlClient/SqlTransaction.cs:
+	* System.Data.SqlClient/SqlCommand.cs: fixed skeletons.
+
+2002-03-27  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.Common/DataColumnMapping.cs:
+	* System.Data.Common/DataColumnMappingCollection.cs:
+	* System.Data.Common/DataAdapter.cs: created skeletons.
+
+	* System.Data.build: exclude new directories from build.
+
+2002-03-27  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.SqlClient/SqlTransaction.cs: started implementation.
+	
+	* System.Data.SqlClient/SqlConnection.cs (BeginTransaction):
+	implemented (2 methods).
+
+2002-03-24  Duncan Mak  <duncan@ximian.com>
+
+	* System.Data.build: Excluded System.Data.SqlClient from the build.
+	The stubs are incomplete and they are stopping the build.
+
+	* System.Data.SqlClient/SqlCommand.cs: Replaced 'implements' with ':'.
+
+2002-03-24  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.Data.SqlClient/*: added skeletons for the SQL managed
+	provider for ADO.Net, to be based initially in PostgreSQL.
+
+2002-03-15  Christopher Podurgiel <cpodurgiel@msn.com>
+	
+	Changed the Namespace on some Enums from mono.System.Data to System.Data
+
+2002-03-01  Christopher Podurgiel <cpodurgiel@msn.com>
+
+	* DataColumnCollection.cs : When an existing DataColumn is added, will now Assign a 
+		default name if the ColumnName is null.
+	* DataSet.cs : Added
+	* DataTable.cs : Added
+	* DataRelationCollection.cs : Added
+	* DataTableRelationCollection.cs : Added
+	* DataColumn : Added
+
+2002-02-11  Christopher Podurgiel <cpodurgiel@msn.com>
+
+	* DataColumnChangeEventArgs.cs : Added
+	* DataColumnCollection.cs : Added
+
+2002-02-10  Christopher Podurgiel <cpodurgiel@msn.com>
+	
+	* Removed *.cs from System.Data as the correct files are in mcs/class/System.Data/System.Data
+	* Updated all Enums, Interfaces, and Delegates in System.Data
diff --git a/mcs/class/System.Data/System.Data.Common/ChangeLog b/mcs/class/System.Data/System.Data.Common/ChangeLog
new file mode 100755
index 00000000000..f0950b30657
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/ChangeLog
@@ -0,0 +1,10 @@
+2002-05-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* DataTableMapping.cs, DataTableMappingCollection.cs: comment out
+	interfaces we do not implement yet.
+
+	* DbDataAdapter.cs: Stub IEnumerable, comment out interfaces
+	we do not implement yet.
+
+	* DbDataPermissionAttribute.cs: call base constructor.
+
diff --git a/mcs/class/System.Data/System.Data.Common/DataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
new file mode 100644
index 00000000000..2ec749be1c0
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DataAdapter.cs
@@ -0,0 +1,113 @@
+//
+// System.Data.Common.DataAdapter
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc
+// Copyright (C) 2002 Tim Coleman
+//
+
+using System.ComponentModel;
+using System.Data;
+
+namespace System.Data.Common
+{
+	/// <summary>
+	/// Represents a set of data commands and a database connection that are used to fill the DataSet and update the data source.
+	/// </summary>
+	public abstract class DataAdapter : Component, IDataAdapter
+	{
+		#region Fields
+
+		private bool acceptChangesDuringFill;
+		private bool continueUpdateOnError;
+		private MissingMappingAction missingMappingAction;
+		private MissingSchemaAction missingSchemaAction;
+		private DataTableMappingCollection tableMappings;
+
+		#endregion
+
+		#region Constructors
+
+		protected DataAdapter () 
+		{
+			acceptChangesDuringFill = true;
+			continueUpdateOnError = false;
+			missingMappingAction = MissingMappingAction.Passthrough;
+			missingSchemaAction = MissingSchemaAction.Add;
+			tableMappings = new DataTableMappingCollection ();
+		}
+
+		#endregion
+
+		#region Properties
+
+		public bool AcceptChangesDuringFill {
+			get { return acceptChangesDuringFill; }
+			set { acceptChangesDuringFill = value; }
+		}
+
+		public bool ContinueUpdateOnError {
+			get { return continueUpdateOnError; }
+			set { continueUpdateOnError = value; }
+		}
+
+		public MissingMappingAction MissingMappingAction {
+			get { return missingMappingAction; }
+			set { missingMappingAction = value; }
+		}
+
+		public MissingSchemaAction MissingSchemaAction {
+			get { return missingSchemaAction; }
+			set { missingSchemaAction = value; }
+		}
+
+		public DataTableMappingCollection TableMappings {
+			get { return tableMappings; }
+		}
+
+		ITableMappingCollection IDataAdapter.TableMappings {
+			get { return TableMappings; }
+		}
+
+		#endregion
+
+		#region Methods
+		
+
+		[MonoTODO]
+		protected virtual DataAdapter CloneInternals ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected virtual DataTableMappingCollection CreateTableMappings ()
+		{
+			tableMappings = new DataTableMappingCollection ();
+			return tableMappings;
+		}
+
+		[MonoTODO]
+		protected override void Dispose (bool disposing)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public abstract int Fill (DataSet dataSet);
+		public abstract DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType);
+		public abstract IDataParameter[] GetFillParameters ();
+
+		[MonoTODO]
+		protected virtual bool ShouldSerializeTableMappings ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public abstract int Update (DataSet dataSet);
+
+		#endregion
+		
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs
new file mode 100644
index 00000000000..b38f62532ec
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DataColumnMapping.cs
@@ -0,0 +1,64 @@
+//
+// System.Data.Common.DataColumnMapping
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+using System.Data;
+
+namespace System.Data.Common
+{
+	/// <summary>
+	/// Contains a generic column mapping for an object that inherits from DataAdapter. This class cannot be inherited.
+	/// </summary>
+	public sealed class DataColumnMapping : MarshalByRefObject, IColumnMapping, ICloneable
+	{
+		private string srcColumn;
+		private string dsColumn;
+		
+		public DataColumnMapping () {
+			srcColumn = null;
+			dsColumn = null;
+		}
+
+		public DataColumnMapping(string sc, string dc) {
+			srcColumn = sc;
+			dsColumn = dc;
+		}
+
+		[MonoTODO]
+		public DataColumn GetDataColumnBySchemaAction (
+			DataTable dataTable,
+			Type dataType,
+			MissingSchemaAction schemaAction) {
+			throw new NotImplementedException ();
+		}
+
+		public string DataSetColumn {
+			get {
+				return this.dsColumn;
+			}
+			set {
+				this.dsColumn = value;
+			}
+		}
+
+		[MonoTODO]
+		object ICloneable.Clone ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public string SourceColumn {
+			get {
+				return this.srcColumn;
+			}
+			set {
+				this.srcColumn = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs
new file mode 100644
index 00000000000..cf3a7ac7a8f
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DataColumnMappingCollection.cs
@@ -0,0 +1,219 @@
+//
+// System.Data.Common.DataColumnCollection
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+using System;
+using System.Collections;
+using System.Data;
+
+namespace System.Data.Common
+{
+	/// <summary>
+	/// Contains a collection of DataColumnMapping objects. This class cannot be inherited.
+	/// </summary>
+	public sealed class DataColumnMappingCollection : MarshalByRefObject, IColumnMappingCollection , IList, ICollection, IEnumerable
+	{
+		#region Fields
+
+		ArrayList list;
+		Hashtable sourceColumns;
+		Hashtable dataSetColumns;
+
+		#endregion
+
+		#region Constructors 
+
+		public DataColumnMappingCollection () 
+		{
+			list = new ArrayList ();
+			sourceColumns = new Hashtable ();
+			dataSetColumns = new Hashtable ();
+		}
+
+		#endregion
+
+		#region Properties
+
+		public int Count {
+			get { return list.Count; }
+		}
+
+		public DataColumnMapping this[int index] {
+			get { return (DataColumnMapping)(list[index]); }
+			set { 
+				DataColumnMapping mapping = (DataColumnMapping)(list[index]);
+				sourceColumns[mapping] = value;
+				dataSetColumns[mapping] = value;
+				list[index] = value;
+			}
+		}
+
+		public DataColumnMapping this[string sourceColumn] {
+			get { return (DataColumnMapping)(sourceColumns[sourceColumn]); }
+			set { this[list.IndexOf (sourceColumns[sourceColumn])] = value; }
+		}
+
+                object ICollection.SyncRoot {
+                        get { return list.SyncRoot; }
+                }
+
+                bool ICollection.IsSynchronized {
+                        get { return list.IsSynchronized; }
+                }
+
+		object IColumnMappingCollection.this[string sourceColumn] {
+			get { return this[sourceColumn]; }
+			set {
+				if (!(value is DataColumnMapping))
+					throw new ArgumentException ();
+				this[sourceColumn] = (DataColumnMapping)value;
+			}
+		}
+
+                object IList.this[int index] {
+                        get { return this[index]; }
+                        set {
+                                if (!(value is DataColumnMapping))
+                                        throw new ArgumentException ();
+                                this[index] = (DataColumnMapping)value;
+                         }
+                }
+
+                bool IList.IsReadOnly {
+                        get { return false; }
+                }
+
+                bool IList.IsFixedSize {
+                        get { return false; }
+                }
+		
+
+		#endregion
+
+		#region Methods
+
+		public int Add (object value)
+		{
+			if (!(value is DataColumnMapping))
+				throw new InvalidCastException ();
+
+			list.Add (value);
+			sourceColumns[((DataColumnMapping)value).SourceColumn] = value;
+			dataSetColumns[((DataColumnMapping)value).DataSetColumn] = value;
+			return list.IndexOf (value);
+		}
+
+		public DataColumnMapping Add (string sourceColumn, string dataSetColumn)
+		{
+			DataColumnMapping mapping = new DataColumnMapping (sourceColumn, dataSetColumn);
+			Add (mapping);
+			return mapping;
+		}
+
+		public void AddRange (DataColumnMapping[] values) 
+		{
+			foreach (DataColumnMapping mapping in values)
+				Add (mapping);
+		}
+
+		public void Clear () 
+		{
+			list.Clear ();
+		}
+
+		public bool Contains (object value) 
+		{
+			return (list.Contains (value));
+		}
+
+		public bool Contains (string value)
+		{
+			return (sourceColumns.Contains (value));
+		}
+
+		public void CopyTo (Array array, int index) 
+		{
+			((DataColumn[])(list.ToArray())).CopyTo (array, index);
+		}
+
+		public DataColumnMapping GetByDataSetColumn (string value) 
+		{
+			return (DataColumnMapping)(dataSetColumns[value]);
+		}
+
+		public static DataColumnMapping GetColumnMappingBySchemaAction (DataColumnMappingCollection columnMappings, string sourceColumn, MissingMappingAction mappingAction) 
+		{
+			if (columnMappings.Contains (sourceColumn))
+				return columnMappings[sourceColumn];
+
+			if (mappingAction == MissingMappingAction.Ignore)
+				return null;
+
+			if (mappingAction == MissingMappingAction.Error)
+				throw new SystemException ();
+
+			return new DataColumnMapping (sourceColumn, sourceColumn);
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return list.GetEnumerator ();
+		}
+
+		IColumnMapping IColumnMappingCollection.Add (string sourceColumnName, string dataSetColumnName)
+		{
+			return Add (sourceColumnName, dataSetColumnName);
+		}
+
+		IColumnMapping IColumnMappingCollection.GetByDataSetColumn (string dataSetColumnName)
+		{
+			return GetByDataSetColumn (dataSetColumnName);
+		}
+
+		public int IndexOf (object value) 
+		{
+			return list.IndexOf (value);
+		}
+
+		public int IndexOf (string sourceColumn)
+		{
+			return list.IndexOf (sourceColumns[sourceColumn]);
+		}
+
+		public int IndexOfDataSetColumn (string value) 
+		{
+			return list.IndexOf (dataSetColumns[value]);
+		}
+
+		public void Insert (int index, object value) 
+		{
+			list.Insert (index, value);
+			sourceColumns[((DataColumnMapping)value).SourceColumn] = value;
+			dataSetColumns[((DataColumnMapping)value).DataSetColumn] = value;
+		}
+
+		public void Remove (object value) 
+		{
+			sourceColumns.Remove(((DataColumnMapping)value).SourceColumn);
+			dataSetColumns.Remove(((DataColumnMapping)value).DataSetColumn);
+			list.Remove (value);
+		}
+
+		public void RemoveAt (int index) 
+		{
+			Remove (list[index]);
+		}
+
+		public void RemoveAt (string sourceColumn)
+		{
+			RemoveAt (list.IndexOf (sourceColumns[sourceColumn]));
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs b/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs
new file mode 100644
index 00000000000..426406e958d
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DataTableMapping.cs
@@ -0,0 +1,99 @@
+//
+// System.Data.Common.DataTableMapping.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+using System.Data;
+
+namespace System.Data.Common
+{
+	/// <summary>
+	/// Contains a description of a mapped relationship between a source table and a DataTable. This class is used by a DataAdapter when populating a DataSet.
+	/// </summary>
+	public sealed class DataTableMapping : MarshalByRefObject, ITableMapping, ICloneable
+	{
+		#region Fields
+
+		string sourceTable;
+		string dataSetTable;
+		DataColumnMappingCollection columnMappings;
+
+		#endregion
+
+		#region Constructors
+
+		public DataTableMapping () 
+		{
+			dataSetTable = String.Empty;
+			sourceTable = String.Empty;
+			columnMappings = new DataColumnMappingCollection ();
+		}
+
+		public DataTableMapping (string sourceTable, string dataSetTable) 
+			: this ()
+		{
+			this.sourceTable = sourceTable;
+			this.dataSetTable = dataSetTable;
+		}
+		
+		public DataTableMapping (string sourceTable, string dataSetTable, DataColumnMapping[] columnMappings) 
+			: this (sourceTable, dataSetTable)
+		{
+			this.columnMappings.AddRange (columnMappings);
+		}
+
+		#endregion
+
+		#region Properties
+
+		public DataColumnMappingCollection ColumnMappings {
+			get { return columnMappings; }
+		}
+
+		public string DataSetTable {
+			get { return dataSetTable; } 
+			set { dataSetTable = value; }
+		}
+
+		public string SourceTable {
+			get { return sourceTable; }
+			set { sourceTable = value; }
+		}
+
+		IColumnMappingCollection ITableMapping.ColumnMappings {
+			get { return ColumnMappings; }
+		}
+	
+		#endregion
+
+		#region Methods
+
+		public DataColumnMapping GetColumnMappingBySchemaAction (string sourceColumn, MissingMappingAction mappingAction) 
+		{
+			return DataColumnMappingCollection.GetColumnMappingBySchemaAction (columnMappings, sourceColumn, mappingAction);
+		}
+
+		[MonoTODO]
+		public DataTable GetDataTableBySchemaAction (DataSet dataSet, MissingSchemaAction schemaAction) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		object ICloneable.Clone ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override string ToString ()
+		{
+			return SourceTable; 
+		}
+		
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs b/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs
new file mode 100644
index 00000000000..614b979a1b9
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DataTableMappingCollection.cs
@@ -0,0 +1,225 @@
+//
+// System.Data.Common.DataTableMappingCollection.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc
+// Copyright (C) 2002 Tim Coleman
+//
+
+using System;
+using System.Collections;
+
+namespace System.Data.Common
+{
+	/// <summary>
+	/// A collection of DataTableMapping objects. This class cannot be inherited.
+	/// </summary>
+	public sealed class DataTableMappingCollection : MarshalByRefObject, ITableMappingCollection, IList, ICollection, IEnumerable
+	{
+		#region Fields
+
+		ArrayList mappings;
+		Hashtable sourceTables;
+		Hashtable dataSetTables;
+
+		#endregion
+
+		#region Constructors 
+
+		public DataTableMappingCollection() 
+		{
+			mappings = new ArrayList ();
+			sourceTables = new Hashtable ();
+			dataSetTables = new Hashtable ();
+		}
+
+		#endregion
+
+		#region Properties
+
+		public int Count 
+		{
+			get { return mappings.Count; }
+		}
+
+		public DataTableMapping this[int index] {
+			get { return (DataTableMapping)(mappings[index]); }
+			set { 
+				DataTableMapping mapping = (DataTableMapping)(mappings[index]);
+				sourceTables[mapping.SourceTable] = value;
+				dataSetTables[mapping.DataSetTable] = value;
+				mappings[index] = value; 
+			}
+		}
+
+		[MonoTODO]
+		public DataTableMapping this[string sourceTable] {
+			get { return (DataTableMapping)(sourceTables[sourceTable]); }
+			set { this[mappings.IndexOf(sourceTables[sourceTable])] = value; }
+		}
+
+	
+		object IList.this[int index] {
+			get { return (object)(this[index]); }
+			set { 
+				if (!(value is DataTableMapping))
+					throw new ArgumentException (); 
+				this[index] = (DataTableMapping)value;
+			 } 
+		}
+
+		bool IList.IsReadOnly {
+			get { return false; }
+		}
+
+		bool IList.IsFixedSize {
+			get { return false; }
+		}
+
+		object ICollection.SyncRoot {
+			get { return mappings.SyncRoot; }
+		}
+
+		bool ICollection.IsSynchronized {
+			get { return mappings.IsSynchronized; }
+		}
+
+		object ITableMappingCollection.this[string sourceTable] {
+			get { return this[sourceTable]; }
+			set { 
+				if (!(value is DataTableMapping))
+					throw new ArgumentException ();
+				this[sourceTable] = (DataTableMapping)(value);
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public int Add (object value) 
+		{
+			if (!(value is System.Data.Common.DataTableMapping))
+				throw new SystemException ("The object passed in was not a DataTableMapping object.");
+
+			sourceTables[((DataTableMapping)value).SourceTable] = value;	
+			dataSetTables[((DataTableMapping)value).DataSetTable] = value;	
+			return mappings.Add (value);
+		}
+
+		public DataTableMapping Add (string sourceTable, string dataSetTable) 
+		{
+			DataTableMapping mapping = new DataTableMapping (sourceTable, dataSetTable);
+			Add (mapping);
+			return mapping;
+		}
+
+		public void AddRange(DataTableMapping[] values) 
+		{
+			foreach (DataTableMapping dataTableMapping in values)
+				this.Add (dataTableMapping);
+		}
+
+		public void Clear() 
+		{
+			sourceTables.Clear ();
+			dataSetTables.Clear ();
+			mappings.Clear ();
+		}
+
+		public bool Contains (object value) 
+		{
+			return mappings.Contains (value);
+		}
+
+		public bool Contains (string value) 
+		{
+			return sourceTables.Contains (value);
+		}
+
+		[MonoTODO]
+		public void CopyTo(Array array, int index) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		public DataTableMapping GetByDataSetTable (string dataSetTable) 
+		{
+			return (DataTableMapping)(dataSetTables[dataSetTable]);
+		}
+
+		public static DataTableMapping GetTableMappingBySchemaAction (DataTableMappingCollection tableMappings, string sourceTable, string dataSetTable, MissingMappingAction mappingAction) 
+		{
+			if (tableMappings.Contains (sourceTable))
+				return tableMappings[sourceTable];
+			if (mappingAction == MissingMappingAction.Error)
+				throw new InvalidOperationException ();
+			if (mappingAction == MissingMappingAction.Ignore)
+				return null;
+			return new DataTableMapping (sourceTable, dataSetTable);
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return mappings.GetEnumerator ();
+		}
+
+		public int IndexOf (object value) 
+		{
+			return mappings.IndexOf (value);
+		}
+
+		public int IndexOf (string sourceTable) 
+		{
+			return IndexOf (sourceTables[sourceTable]);
+		}
+
+		public int IndexOfDataSetTable (string dataSetTable) 
+		{
+			return IndexOf ((DataTableMapping)(dataSetTables[dataSetTable]));
+		}
+
+		[MonoTODO]
+		public void Insert (int index, object value) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		ITableMapping ITableMappingCollection.Add (string sourceTableName, string dataSetTableName)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		ITableMapping ITableMappingCollection.GetByDataSetTable (string dataSetTableName)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Remove (object value) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RemoveAt (int index) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RemoveAt (string index) 
+		{
+			throw new NotImplementedException ();
+		}
+		
+
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs b/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
new file mode 100644
index 00000000000..a6af3ff84ab
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DbDataAdapter.cs
@@ -0,0 +1,310 @@
+//
+// System.Data.Common.DbDataAdapter.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc
+// Copyright (C) 2002 Tim Coleman
+//
+
+using System.Collections;
+using System.Data;
+
+namespace System.Data.Common
+{
+	/// <summary>
+	/// Aids implementation of the IDbDataAdapter interface. Inheritors of DbDataAdapter  implement a set of functions to provide strong typing, but inherit most of the functionality needed to fully implement a DataAdapter.
+	/// </summary>
+	public abstract class DbDataAdapter : DataAdapter, ICloneable
+	{
+		#region Fields
+
+		public const string DefaultSourceTableName = "Table";
+
+		#endregion
+		
+		#region Constructors
+
+		protected DbDataAdapter() 
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		IDbCommand DeleteCommand {
+			get { return ((IDbDataAdapter)this).DeleteCommand; }
+		}
+
+		IDbCommand InsertCommand {
+			get { return ((IDbDataAdapter)this).InsertCommand; }
+		}
+
+		IDbCommand SelectCommand {
+			get { return ((IDbDataAdapter)this).SelectCommand; }
+		}
+
+
+		IDbCommand UpdateCommand {
+			get { return ((IDbDataAdapter)this).UpdateCommand; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		protected abstract RowUpdatedEventArgs CreateRowUpdatedEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping);
+		protected abstract RowUpdatingEventArgs CreateRowUpdatingEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping);
+
+		[MonoTODO]
+		protected override void Dispose (bool disposing)
+		{
+			throw new NotImplementedException ();
+		}
+
+                public override int Fill (DataSet dataSet)
+                {
+			return Fill (dataSet, DefaultSourceTableName);
+                }
+
+		public int Fill (DataTable dataTable) 
+		{
+			return Fill (dataTable.DataSet, dataTable.TableName);
+		}
+
+		public int Fill (DataSet dataSet, string srcTable) 
+		{
+			return Fill (dataSet, 0, 0, srcTable);
+		}
+
+		protected virtual int Fill (DataTable dataTable, IDataReader dataReader) 
+		{
+			return Fill (dataTable.DataSet, dataTable.TableName, dataReader, 0, 0);
+		}
+
+		protected virtual int Fill (DataTable dataTable, IDbCommand command, CommandBehavior behavior) 
+		{
+			return Fill (dataTable.DataSet, 0, 0, dataTable.TableName, command, behavior);
+		}
+
+		public int Fill (DataSet dataSet, int startRecord, int maxRecords, string srcTable) 
+		{
+			return this.Fill (dataSet, startRecord, maxRecords, srcTable, SelectCommand, CommandBehavior.Default);
+		}
+
+		protected virtual int Fill (DataSet dataSet, string srcTable, IDataReader dataReader, int startRecord, int maxRecords) 
+		{
+			if (startRecord < 0)
+				throw new ArgumentException ("The startRecord parameter was less than 0.");
+			if (maxRecords < 0)
+				throw new ArgumentException ("The maxRecords parameter was less than 0.");
+
+                        DataTable table;
+                        int readCount = 0;
+                        int resultCount = 0;
+
+			string tableName = srcTable;
+			string baseColumnName;
+			string columnName;
+			ArrayList primaryKey;	
+			bool resultsFound;
+			object[] itemArray;
+			DataTableMapping tableMapping;
+
+			DataRow row; // FIXME needed for incorrect operation below.
+
+                        do
+                        {
+				if (dataSet.Tables.Contains (tableName))
+					table = dataSet.Tables[tableName];
+				else
+					table = new DataTable (tableName);
+
+				primaryKey = new ArrayList ();	
+
+				foreach (DataRow schemaRow in dataReader.GetSchemaTable ().Rows)
+				{
+					// generate a unique column name in the dataset table.
+					baseColumnName = (string)(schemaRow["BaseColumnName"]);
+					if (baseColumnName == "")
+						baseColumnName = "Column";
+
+					columnName = baseColumnName;
+
+					for (int i = 1; table.Columns.Contains (columnName); i += 1) 
+						columnName = String.Format ("{0}{1}", baseColumnName, i);
+
+
+					tableMapping = DataTableMappingCollection.GetTableMappingBySchemaAction (TableMappings, tableName, (string)(schemaRow["BaseTableName"]), MissingMappingAction);
+
+					// check to see if the column mapping exists
+					if (tableMapping.ColumnMappings.IndexOfDataSetColumn (baseColumnName) < 0)
+					{
+						if (MissingSchemaAction == MissingSchemaAction.Error)
+							throw new SystemException ();
+
+						table.Columns.Add (columnName, Type.GetType ((string)(schemaRow["DataType"])));
+						tableMapping.ColumnMappings.Add (columnName, baseColumnName);
+
+					}
+				
+					if (!TableMappings.Contains (tableMapping))
+						TableMappings.Add (tableMapping);
+
+					if ((schemaRow["IsKey"]).Equals(DBNull.Value) == false)
+						if ((bool)(schemaRow["IsKey"]))
+							primaryKey.Add (table.Columns[columnName]);	
+				}
+
+				if (MissingSchemaAction == MissingSchemaAction.AddWithKey && primaryKey.Count > 0)
+					table.PrimaryKey = (DataColumn[])(primaryKey.ToArray());
+
+
+				for (int k = 0; k < startRecord; k += 1)
+					dataReader.Read ();
+
+				resultsFound = false;
+
+                                itemArray = new object[dataReader.FieldCount];
+
+                                while (dataReader.Read () && !(maxRecords > 0 && readCount >= maxRecords))
+                                {
+                                        dataReader.GetValues (itemArray);
+					row = table.Rows.Add (itemArray);
+					if (AcceptChangesDuringFill)
+						row.AcceptChanges ();
+
+					/* FIXME
+
+					this is the way it should be done, but LoadDataRow has not been implemented yet.
+
+					table.BeginLoadData ();
+					table.LoadDataRow (itemArray, AcceptChangesDuringFill);
+					table.EndLoadData ();
+					*/
+
+                                        readCount += 1;
+					resultsFound = true;
+                                }
+
+				if (resultsFound)
+				{
+					dataSet.Tables.Add (table);
+                                	tableName = String.Format ("{0}{1}", srcTable, ++resultCount);
+				}
+
+
+				startRecord = 0;
+				maxRecords = 0;
+                        } while (dataReader.NextResult ());
+
+                        dataReader.Close ();
+                        return readCount;
+		}
+
+		protected virtual int Fill (DataSet dataSet, int startRecord, int maxRecords, string srcTable, IDbCommand command, CommandBehavior behavior) 
+		{
+			if (command.Connection.State == ConnectionState.Closed)
+			{
+				command.Connection.Open ();
+				behavior |= CommandBehavior.CloseConnection;
+			}
+		
+			return this.Fill (dataSet, srcTable, command.ExecuteReader (behavior), startRecord, maxRecords);
+		}
+
+		[MonoTODO]
+		public override DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataTable FillSchema (DataTable dataTable, SchemaType schemaType) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType, string srcTable) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected virtual DataTable FillSchema (DataTable dataTable, SchemaType schemaType, IDbCommand command, CommandBehavior behavior) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected virtual DataTable[] FillSchema (DataSet dataSet, SchemaType schemaType, IDbCommand command, string srcTable, CommandBehavior behavior) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IDataParameter[] GetFillParameters () 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		object ICloneable.Clone ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public int Update (DataRow[] dataRows) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override int Update (DataSet ds) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public int Update (DataTable dt) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected virtual int Update (DataRow[] row, DataTableMapping dtm) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public int Update (DataSet ds, string s) 
+		{
+			throw new NotImplementedException ();
+		}
+
+
+
+		[MonoTODO]
+		protected virtual void OnFillError (FillErrorEventArgs value) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected abstract void OnRowUpdated (RowUpdatedEventArgs value);
+		protected abstract void OnRowUpdating (RowUpdatingEventArgs value);
+		
+		#endregion
+		
+		#region Events
+
+		public event FillErrorEventHandler FillError;
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs b/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs
new file mode 100644
index 00000000000..72f92da0d8a
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DbDataPermission.cs
@@ -0,0 +1,83 @@
+//
+// System.Data.Common.DbDataAdapter.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Data.Common
+{
+	/// <summary>
+	/// Provides the capability for a .NET data provider to ensure that a user has a security level adequate for accessing data.
+	/// </summary>
+	public abstract class DBDataPermission : CodeAccessPermission,
+		IUnrestrictedPermission
+	{
+		private bool allowBlankPassword;
+		private PermissionState permissionState;
+
+		protected DBDataPermission () {
+			allowBlankPassword = false;
+			permissionState = PermissionState.None;
+		}
+
+		protected DBDataPermission (PermissionState state) {
+			allowBlankPassword = false;
+			permissionState = state;
+		}
+
+		public DBDataPermission (PermissionState state, bool abp) {
+			allowBlankPassword = abp;
+			permissionState = state;
+		}
+
+		public override IPermission Copy () {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void FromXml (SecurityElement securityElement) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Intersect (IPermission target) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsSubsetOf (IPermission target) {
+			throw new NotImplementedException ();
+		}
+
+		public bool IsUnrestricted () {
+			if (permissionState == PermissionState.Unrestricted)
+				return true;
+			return false;
+		}
+
+		[MonoTODO]
+		public override SecurityElement ToXml () {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Union (IPermission target) {
+			throw new NotImplementedException ();
+		}
+		
+		public bool AllowBlankPassword {
+			get {
+				return allowBlankPassword;
+			}
+			set {
+				allowBlankPassword = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs b/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs
new file mode 100644
index 00000000000..6968ba77ec3
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/DbDataPermissionAttribute.cs
@@ -0,0 +1,36 @@
+//
+// System.Data.Common.DbDataPermissionAttribute.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+using System.Security.Permissions;
+
+namespace System.Data.Common
+{
+	/// <summary>
+	/// Associates a security action with a custom security attribute.
+	/// </summary>
+	public abstract class DBDataPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		private SecurityAction securityAction;
+		private bool allowBlankPassword;
+
+		protected DBDataPermissionAttribute (SecurityAction action) : base (action) {
+			securityAction = action;
+			allowBlankPassword = false;
+		}
+
+		public bool AllowBlankPassword {
+			get {
+				return allowBlankPassword;
+			}
+			set {
+				allowBlankPassword = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.Common/RowUpdatedEventArgs.cs b/mcs/class/System.Data/System.Data.Common/RowUpdatedEventArgs.cs
new file mode 100644
index 00000000000..ab3aebe4451
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/RowUpdatedEventArgs.cs
@@ -0,0 +1,64 @@
+//
+// System.Data.Common.RowUpdatedEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+using System.Data;
+
+namespace System.Data.Common
+{
+	/// <summary>
+	/// Provides data for the RowUpdated event of a .NET data provider.
+	/// </summary>
+	public abstract class RowUpdatedEventArgs : EventArgs
+	{
+		[MonoTODO]
+		protected RowUpdatedEventArgs(DataRow dataRow,
+					      IDbCommand command,
+					      StatementType statementType,
+					      DataTableMapping tableMapping) {
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public IDbCommand Command {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public Exception Errors {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public int RecordsAffected {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public DataRow Row {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public StatementType StatementType {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public UpdateStatus Status {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public DataTableMapping TableMapping {
+			get { throw new NotImplementedException (); }
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.Common/RowUpdatingEventArgs.cs b/mcs/class/System.Data/System.Data.Common/RowUpdatingEventArgs.cs
new file mode 100644
index 00000000000..6d5eae65d84
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.Common/RowUpdatingEventArgs.cs
@@ -0,0 +1,58 @@
+//
+// System.Data.Common.RowUpdatingEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+namespace System.Data.Common
+{
+	/// <summary>
+	/// Provides the data for the RowUpdating event of a .NET data provider.
+	/// </summary>
+	public abstract class RowUpdatingEventArgs : EventArgs
+	{
+		[MonoTODO]
+		protected RowUpdatingEventArgs(DataRow dataRow,
+					       IDbCommand command,
+					       StatementType statementType,
+					       DataTableMapping tableMapping) {
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public IDbCommand Command {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public Exception Errors {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public DataRow Row {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public StatementType StatementType {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public UpdateStatus Status {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public DataTableMapping TableMapping {
+			get { throw new NotImplementedException (); }
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
new file mode 100644
index 00000000000..9285bf3ab2c
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbCommand.cs
@@ -0,0 +1,333 @@
+//
+// System.Data.OleDb.OleDbCommand
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Collections;
+using System.Runtime.InteropServices;
+
+namespace System.Data.OleDb
+{
+	/// <summary>
+	/// Represents an SQL statement or stored procedure to execute against a data source.
+	/// </summary>
+	public sealed class OleDbCommand : Component, ICloneable, IDbCommand
+	{
+		#region Fields
+
+		string commandText;
+		int timeout;
+		CommandType commandType;
+		OleDbConnection connection;
+		OleDbParameterCollection parameters;
+		OleDbTransaction transaction;
+		bool designTimeVisible;
+		OleDbDataReader dataReader;
+		CommandBehavior behavior;
+		IntPtr gdaCommand;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		public OleDbCommand ()
+	        {
+			commandText = String.Empty;
+			timeout = 30; // default timeout per .NET
+			commandType = CommandType.Text;
+			connection = null;
+			parameters = new OleDbParameterCollection ();
+			transaction = null;
+			designTimeVisible = false;
+			dataReader = null;
+			behavior = CommandBehavior.Default;
+			gdaCommand = IntPtr.Zero;
+		}
+
+		public OleDbCommand (string cmdText) : this ()
+		{
+			CommandText = cmdText;
+		}
+
+		public OleDbCommand (string cmdText, OleDbConnection connection)
+			: this (cmdText)
+		{
+			Connection = connection;
+		}
+
+		public OleDbCommand (string cmdText,
+				     OleDbConnection connection,
+				     OleDbTransaction transaction) : this (cmdText, connection)
+		{
+			this.transaction = transaction;
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+	
+		public string CommandText 
+		{
+			get {
+				return commandText;
+			}
+			set { 
+				commandText = value;
+			}
+		}
+
+		public int CommandTimeout {
+			get {
+				return timeout;
+			}
+			set {
+				timeout = value;
+			}
+		}
+
+		public CommandType CommandType { 
+			get {
+				return commandType;
+			}
+			set {
+				commandType = value;
+			}
+		}
+
+		public OleDbConnection Connection { 
+			get {
+				return connection;
+			}
+			set {
+				connection = value;
+			}
+		}
+
+		public bool DesignTimeVisible { 
+			get {
+				return designTimeVisible;
+			}
+			set {
+				designTimeVisible = value;
+			}
+		}
+
+		public OleDbParameterCollection Parameters {
+			get {
+				return parameters;
+			}
+			set {
+				parameters = value;
+			}
+		}
+
+		public OleDbTransaction Transaction {
+			get {
+				return transaction;
+			}
+			set {
+				transaction = value;
+			}
+		}
+
+		public UpdateRowSource UpdatedRowSource { 
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		IDbConnection IDbCommand.Connection {
+			get {
+				return Connection;
+			}
+			set {
+				Connection = (OleDbConnection) value;
+			}
+		}
+
+		IDataParameterCollection IDbCommand.Parameters  {
+			get {
+				return Parameters;
+			}
+		}
+
+		IDbTransaction IDbCommand.Transaction  {
+			get {
+				return Transaction;
+			}
+			set {
+				Transaction = (OleDbTransaction) value;
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public void Cancel () 
+		{
+			throw new NotImplementedException ();
+		}
+
+		public OleDbParameter CreateParameter ()
+		{
+			return new OleDbParameter ();
+		}
+
+		IDbDataParameter IDbCommand.CreateParameter ()
+		{
+			return CreateParameter ();
+		}
+		
+		[MonoTODO]
+		protected override void Dispose (bool disposing)
+		{
+			throw new NotImplementedException ();
+		}
+
+		private void SetupGdaCommand ()
+		{
+			GdaCommandType type;
+			
+			switch (commandType) {
+			case CommandType.TableDirect :
+				type = GdaCommandType.Table;
+				break;
+			case CommandType.StoredProcedure :
+				type = GdaCommandType.Procedure;
+				break;
+			case CommandType.Text :
+			default :
+				type = GdaCommandType.Sql;
+				break;
+			}
+			
+			if (gdaCommand != IntPtr.Zero) {
+				libgda.gda_command_set_text (gdaCommand, commandText);
+				libgda.gda_command_set_command_type (gdaCommand, type);
+			} else {
+				gdaCommand = libgda.gda_command_new (commandText, type, 0);
+			}
+
+			//libgda.gda_command_set_transaction 
+		}
+		
+		public int ExecuteNonQuery ()
+		{
+			if (connection == null)
+				throw new InvalidOperationException ();
+			if (connection.State == ConnectionState.Closed)
+				throw new InvalidOperationException ();
+			// FIXME: a third check is mentioned in .NET docs
+			if (connection.DataReader != null)
+				throw new InvalidOperationException ();
+
+			IntPtr gdaConnection = connection.GdaConnection;
+			IntPtr gdaParameterList = parameters.GdaParameterList;
+
+			SetupGdaCommand ();
+			return libgda.gda_connection_execute_non_query (gdaConnection,
+									(IntPtr) gdaCommand,
+									gdaParameterList);
+		}
+
+		public OleDbDataReader ExecuteReader ()
+		{
+			return ExecuteReader (CommandBehavior.Default);
+		}
+
+		IDataReader IDbCommand.ExecuteReader ()
+		{
+			return ExecuteReader ();
+		}
+
+		public OleDbDataReader ExecuteReader (CommandBehavior behavior)
+		{
+			ArrayList results = new ArrayList ();
+			IntPtr rs_list;
+			GdaList glist_node;
+
+			if (connection.State != ConnectionState.Open)
+				throw new InvalidOperationException ();
+			if (connection.DataReader != null)
+				throw new InvalidOperationException ();
+
+			this.behavior = behavior;
+
+			IntPtr gdaConnection = connection.GdaConnection;
+			IntPtr gdaParameterList = parameters.GdaParameterList;
+
+			/* execute the command */
+			SetupGdaCommand ();
+			rs_list = libgda.gda_connection_execute_command (
+				gdaConnection,
+				gdaCommand,
+				gdaParameterList);
+			if (rs_list != IntPtr.Zero) {
+				glist_node = (GdaList) Marshal.PtrToStructure (rs_list, typeof (GdaList));
+
+				while (glist_node != null) {
+					results.Add (glist_node.data);
+					if (glist_node.next == IntPtr.Zero)
+						break;
+
+					glist_node = (GdaList) Marshal.PtrToStructure (glist_node.next,
+										       typeof (GdaList));
+				}
+				dataReader = new OleDbDataReader (this, results);
+				dataReader.NextResult ();
+			}
+
+			return dataReader;
+		}
+
+		IDataReader IDbCommand.ExecuteReader (CommandBehavior behavior)
+		{
+			return ExecuteReader (behavior);
+		}
+		
+		public object ExecuteScalar ()
+		{
+			if (connection.DataReader != null)
+				throw new InvalidOperationException ();
+			
+			SetupGdaCommand ();
+			OleDbDataReader reader = ExecuteReader ();
+			return reader.GetValue (0);
+		}
+
+		[MonoTODO]
+		object ICloneable.Clone ()
+		{
+			throw new NotImplementedException ();	
+		}
+
+		[MonoTODO]
+		public void Prepare ()
+		{
+			throw new NotImplementedException ();	
+		}
+
+		public void ResetCommandTimeout ()
+		{
+			timeout = 30;
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs
new file mode 100644
index 00000000000..bc430724742
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbCommandBuilder.cs
@@ -0,0 +1,107 @@
+//
+// System.Data.OleDb.OleDbCommandBuilder
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	/// <summary>
+	/// Provides a means of automatically generating single-table commands used to reconcile changes made to a DataSet with the associated database. This class cannot be inherited.
+	/// </summary>
+	public sealed class OleDbCommandBuilder : Component
+	{
+		#region Fields
+
+		OleDbDataAdapter adapter;
+		string quotePrefix;
+		string quoteSuffix;
+
+		#endregion // Fields
+
+		#region Constructors
+		
+		public OleDbCommandBuilder ()
+		{
+			adapter = null;
+			quotePrefix = String.Empty;
+			quoteSuffix = String.Empty;
+		}
+
+		public OleDbCommandBuilder (OleDbDataAdapter adapter) 
+			: this ()
+		{
+			this.adapter = adapter;
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+
+		public OleDbDataAdapter DataAdapter {
+			get { return adapter; }
+			set { adapter = value; }
+		}
+
+		public string QuotePrefix {
+			get { return quotePrefix; }
+			set { quotePrefix = value; }
+		}
+
+		public string QuoteSuffix {
+			get { return quoteSuffix; }
+			set { quoteSuffix = value; }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public static void DeriveParameters (OleDbCommand command) 
+		{
+			throw new NotImplementedException ();		
+		}
+
+		[MonoTODO]
+		protected override void Dispose (bool disposing) 
+		{
+			throw new NotImplementedException ();		
+		}
+
+		[MonoTODO]
+		public OleDbCommand GetDeleteCommand ()
+		{
+			throw new NotImplementedException ();		
+		}
+
+		[MonoTODO]
+		public OleDbCommand GetInsertCommand ()
+		{
+			throw new NotImplementedException ();		
+		}
+
+		[MonoTODO]
+		public OleDbCommand GetUpdatetCommand ()
+		{
+			throw new NotImplementedException ();		
+		}
+
+		[MonoTODO]
+		public void RefreshSchema ()
+		{
+			throw new NotImplementedException ();		
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
new file mode 100644
index 00000000000..7a644f9f097
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbConnection.cs
@@ -0,0 +1,245 @@
+//
+// System.Data.OleDb.OleDbConnection
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbConnection : Component, ICloneable, IDbConnection
+	{
+		#region Fields
+
+		string connectionString;
+		int connectionTimeout;
+		OleDbDataReader dataReader;
+		IntPtr gdaConnection;
+
+		#endregion
+
+		#region Constructors
+		
+		public OleDbConnection ()
+		{
+			libgda.gda_init ("System.Data.OleDb", "1.0", 0, new string [0]);
+			gdaConnection = IntPtr.Zero;
+			connectionTimeout = 15;
+			connectionString = null;
+			dataReader = null;
+		}
+
+		public OleDbConnection (string connectionString) : this ()
+		{
+			this.connectionString = connectionString;
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+
+		public string ConnectionString {
+			get {
+				return connectionString;
+			}
+			set {
+				connectionString = value;
+			}
+		}
+
+		public int ConnectionTimeout {
+			get {
+				return connectionTimeout;
+			}
+		}
+
+		public string Database { 
+			get {
+				if (gdaConnection != IntPtr.Zero
+				    && libgda.gda_connection_is_open (gdaConnection)) {
+					return libgda.gda_connection_get_database (gdaConnection);
+				}
+
+				return null;
+			}
+		}
+
+		public string DataSource {
+			get {
+				if (gdaConnection != IntPtr.Zero
+				    && libgda.gda_connection_is_open (gdaConnection)) {
+					return libgda.gda_connection_get_dsn (gdaConnection);
+				}
+
+				return null;
+			}
+		}
+
+		public string Provider {
+			get {
+				if (gdaConnection != IntPtr.Zero
+				    && libgda.gda_connection_is_open (gdaConnection)) {
+					return libgda.gda_connection_get_provider (gdaConnection);
+				}
+
+				return null;
+			}
+		}
+
+		public string ServerVersion {
+			get {
+				if (gdaConnection != IntPtr.Zero
+				    && libgda.gda_connection_is_open (gdaConnection)) {
+					return libgda.gda_connection_get_server_version (gdaConnection);
+				}
+
+				return null;
+			}
+		}
+
+		public ConnectionState State
+		{
+			get {
+				if (gdaConnection != IntPtr.Zero) {
+					if (libgda.gda_connection_is_open (gdaConnection))
+						return ConnectionState.Open;
+				}
+
+				return ConnectionState.Closed;
+			}
+		}
+
+		internal IntPtr GdaConnection
+		{
+			get {
+				return gdaConnection;
+			}
+		}
+
+		internal OleDbDataReader DataReader
+	        {
+			get {
+				return dataReader;
+			}
+			set {
+				dataReader = value;
+			}
+		}
+		
+		#endregion // Properties
+	
+		#region Methods
+	
+		public OleDbTransaction BeginTransaction ()
+		{
+			if (gdaConnection != IntPtr.Zero)
+				return new OleDbTransaction (this);
+
+			return null;
+		}
+
+		IDbTransaction IDbConnection.BeginTransaction ()
+		{
+			return BeginTransaction ();
+		}
+		
+		public OleDbTransaction BeginTransaction (IsolationLevel level)
+		{
+			if (gdaConnection != IntPtr.Zero)
+				return new OleDbTransaction (this, level);
+
+			return null;
+		}
+
+		IDbTransaction IDbConnection.BeginTransaction (IsolationLevel level)
+		{
+			return BeginTransaction (level);
+		}
+
+		public void ChangeDatabase (string name)
+		{
+			if (gdaConnection == IntPtr.Zero)
+				throw new ArgumentException ();
+			if (State != ConnectionState.Open)
+				throw new InvalidOperationException ();
+
+			if (!libgda.gda_connection_change_database (gdaConnection, name))
+				throw new OleDbException (this);
+		}
+
+		public void Close ()
+		{
+			if (State == ConnectionState.Open) {
+				libgda.gda_connection_close (gdaConnection);
+				gdaConnection = IntPtr.Zero;
+			}
+
+			dataReader = null;
+		}
+
+		public OleDbCommand CreateCommand ()
+		{
+			if (State == ConnectionState.Open &&
+			    DataReader == null)
+				return new OleDbCommand (null, this);
+
+			return null;
+		}
+
+		[MonoTODO]
+		protected override void Dispose (bool disposing)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataTable GetOleDbSchemaTable (Guid schema, object[] restrictions)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		object ICloneable.Clone ()
+		{
+			throw new NotImplementedException();
+		}
+
+		IDbCommand IDbConnection.CreateCommand ()
+		{
+			return CreateCommand ();
+		}
+
+		public void Open ()
+		{
+			if (State == ConnectionState.Open)
+				throw new InvalidOperationException ();
+
+			gdaConnection = libgda.gda_client_open_connection (libgda.GdaClient,
+									   connectionString,
+									   "", "");
+		}
+
+		[MonoTODO]
+		public static void ReleaseObjectPool ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+
+		#region Events and Delegates
+
+		public event OleDbInfoMessageEventHandler InfoMessage;
+		public event StateChangeEventHandler StateChange;
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbDataAdapter.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbDataAdapter.cs
new file mode 100644
index 00000000000..d148b2c8329
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbDataAdapter.cs
@@ -0,0 +1,179 @@
+//
+// System.Data.OleDb.OleDbDataAdapter
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbDataAdapter : DbDataAdapter, IDbDataAdapter
+	{
+		#region Fields
+
+		OleDbCommand deleteCommand;
+		OleDbCommand insertCommand;
+		OleDbCommand selectCommand;
+		OleDbCommand updateCommand;
+		MissingMappingAction missingMappingAction;
+		MissingSchemaAction missingSchemaAction;
+
+		static readonly object EventRowUpdated = new object ();
+		static readonly object EventRowUpdating = new object ();
+
+		#endregion
+
+		#region Constructors
+
+		public OleDbDataAdapter ()
+			: this (new OleDbCommand ())
+		{
+		}
+
+		public OleDbDataAdapter (OleDbCommand selectCommand)
+		{
+			DeleteCommand = new OleDbCommand ();
+			InsertCommand = new OleDbCommand ();
+			SelectCommand = selectCommand;
+			UpdateCommand = new OleDbCommand ();
+		}
+
+		public OleDbDataAdapter (string selectCommandText, OleDbConnection selectConnection)
+			: this (new OleDbCommand (selectCommandText, selectConnection))
+		{
+		}
+
+		public OleDbDataAdapter (string selectCommandText, string selectConnectionString)
+			: this (selectCommandText, new OleDbConnection (selectConnectionString))
+		{
+		}
+
+		#endregion // Fields
+
+		#region Properties
+
+		public OleDbCommand DeleteCommand {
+			get { return deleteCommand; }
+			set { deleteCommand = value; }
+		}
+
+		public OleDbCommand InsertCommand {
+			get { return insertCommand; }
+			set { insertCommand = value; }
+		}
+
+		public OleDbCommand SelectCommand {
+			get { return selectCommand; }
+			set { selectCommand = value; }
+		}
+
+		public OleDbCommand UpdateCommand {
+			get { return updateCommand; }
+			set { updateCommand = value; }
+		}
+
+		IDbCommand IDbDataAdapter.DeleteCommand {
+			get { return DeleteCommand; }
+			set { 
+				if (!(value is OleDbCommand))
+					throw new ArgumentException ();
+				DeleteCommand = (OleDbCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.InsertCommand {
+			get { return InsertCommand; }
+			set { 
+				if (!(value is OleDbCommand))
+					throw new ArgumentException ();
+				InsertCommand = (OleDbCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.SelectCommand {
+			get { return SelectCommand; }
+			set { 
+				if (!(value is OleDbCommand))
+					throw new ArgumentException ();
+				SelectCommand = (OleDbCommand)value;
+			}
+		}
+
+		MissingMappingAction IDataAdapter.MissingMappingAction {
+			get { return missingMappingAction; }
+			set { missingMappingAction = value; }
+		}
+
+		MissingSchemaAction IDataAdapter.MissingSchemaAction {
+			get { return missingSchemaAction; }
+			set { missingSchemaAction = value; }
+		}
+		
+		IDbCommand IDbDataAdapter.UpdateCommand {
+			get { return UpdateCommand; }
+			set { 
+				if (!(value is OleDbCommand))
+					throw new ArgumentException ();
+				UpdateCommand = (OleDbCommand)value;
+			}
+		}
+
+		ITableMappingCollection IDataAdapter.TableMappings {
+			get { return TableMappings; }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		protected override RowUpdatedEventArgs CreateRowUpdatedEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping)
+		{
+			return new OleDbRowUpdatedEventArgs (dataRow, command, statementType, tableMapping);
+		}
+
+		protected override RowUpdatingEventArgs CreateRowUpdatingEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping)
+		{
+			return new OleDbRowUpdatingEventArgs (dataRow, command, statementType, tableMapping);
+		}
+
+		protected override void OnRowUpdated (RowUpdatedEventArgs value)
+		{
+			OleDbRowUpdatedEventHandler handler = (OleDbRowUpdatedEventHandler) Events[EventRowUpdated];
+			if ((handler != null) && (value is OleDbRowUpdatedEventArgs))
+				handler (this, (OleDbRowUpdatedEventArgs) value);
+		}
+
+		protected override void OnRowUpdating (RowUpdatingEventArgs value)
+		{
+			OleDbRowUpdatingEventHandler handler = (OleDbRowUpdatingEventHandler) Events[EventRowUpdated];
+			if ((handler != null) && (value is OleDbRowUpdatingEventArgs))
+				handler (this, (OleDbRowUpdatingEventArgs) value);
+		}
+
+		#endregion // Methods
+
+		#region Events and Delegates
+
+		public event OleDbRowUpdatedEventHandler RowUpdated {
+			add { Events.AddHandler (EventRowUpdated, value); }
+			remove { Events.RemoveHandler (EventRowUpdated, value); }
+		}
+
+		public event OleDbRowUpdatedEventHandler RowUpdating {
+			add { Events.AddHandler (EventRowUpdating, value); }
+			remove { Events.RemoveHandler (EventRowUpdating, value); }
+		}
+
+		#endregion // Events and Delegates
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbDataReader.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbDataReader.cs
new file mode 100644
index 00000000000..70aaf94e3c0
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbDataReader.cs
@@ -0,0 +1,526 @@
+//
+// System.Data.OleDb.OleDbDataReader
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbDataReader : MarshalByRefObject, IDataReader, IDisposable, IDataRecord, IEnumerable
+	{
+		#region Fields
+		
+		private OleDbCommand command;
+		private bool open;
+		private ArrayList gdaResults;
+		private int currentResult;
+		private int currentRow;
+
+		#endregion
+
+		#region Constructors
+
+		internal OleDbDataReader (OleDbCommand command, ArrayList results) 
+		{
+			this.command = command;
+			this.command.Connection.DataReader = this;
+			open = true;
+			if (results != null)
+				gdaResults = results;
+			else
+				gdaResults = new ArrayList ();
+			currentResult = -1;
+			currentRow = -1;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public int Depth {
+			get {
+				return 0; // no nested selects supported
+			}
+		}
+
+		public int FieldCount {
+			get {
+				if (currentResult < 0 ||
+				    currentResult >= gdaResults.Count)
+					return 0;
+
+				return libgda.gda_data_model_get_n_columns (
+					(IntPtr) gdaResults[currentResult]);
+			}
+		}
+
+		public bool IsClosed {
+			get {
+				return !open;
+			}
+		}
+
+		public object this[string name] {
+			get {
+				int pos;
+
+				if (currentResult == -1)
+					throw new InvalidOperationException ();
+
+				pos = libgda.gda_data_model_get_column_position (
+					(IntPtr) gdaResults[currentResult],
+					name);
+				if (pos == -1)
+					throw new IndexOutOfRangeException ();
+
+				return this[pos];
+			}
+		}
+
+		public object this[int index] {
+			get {
+				return (object) GetValue (index);
+			}
+		}
+
+		public int RecordsAffected {
+			get {
+				int total_rows;
+				
+				if (currentResult < 0 ||
+				    currentResult >= gdaResults.Count)
+					return 0;
+
+				total_rows = libgda.gda_data_model_get_n_rows (
+					(IntPtr) gdaResults[currentResult]);
+				if (total_rows > 0) {
+					if (FieldCount > 0) {
+						// It's a SELECT statement
+						return -1;
+					}
+				}
+
+				return FieldCount > 0 ? -1 : total_rows;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public void Close ()
+		{
+			for (int i = 0; i < gdaResults.Count; i++) {
+				IntPtr obj = (IntPtr) gdaResults[i];
+				libgda.FreeObject (obj);
+			}
+
+			gdaResults.Clear ();
+			gdaResults = null;
+			
+			open = false;
+			currentResult = -1;
+			currentRow = -1;
+
+			this.command.Connection.DataReader = null;
+		}
+
+		~OleDbDataReader ()
+		{
+			if (open)
+				Close ();
+		}
+
+		public bool GetBoolean (int ordinal)
+		{
+			IntPtr value;
+
+			if (currentResult == -1)
+				throw new InvalidCastException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new InvalidCastException ();
+			
+			if (libgda.gda_value_get_type (value) != GdaValueType.Boolean)
+				throw new InvalidCastException ();
+			return libgda.gda_value_get_boolean (value);
+		}
+
+		public byte GetByte (int ordinal)
+		{
+			IntPtr value;
+
+			if (currentResult == -1)
+				throw new InvalidCastException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new InvalidCastException ();
+			
+			if (libgda.gda_value_get_type (value) != GdaValueType.Tinyint)
+				throw new InvalidCastException ();
+			return libgda.gda_value_get_tinyint (value);
+		}
+
+		[MonoTODO]
+		public long GetBytes (int ordinal, long dataIndex, byte[] buffer, int bufferIndex, int length)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		public char GetChar (int ordinal)
+		{
+			IntPtr value;
+
+			if (currentResult == -1)
+				throw new InvalidCastException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new InvalidCastException ();
+			
+			if (libgda.gda_value_get_type (value) != GdaValueType.Tinyint)
+				throw new InvalidCastException ();
+			return (char) libgda.gda_value_get_tinyint (value);
+		}
+
+		[MonoTODO]
+		public long GetChars (int ordinal, long dataIndex, char[] buffer, int bufferIndex, int length)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public OleDbDataReader GetData (int ordinal)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public string GetDataTypeName (int index)
+		{
+			IntPtr attrs;
+			GdaValueType type;
+
+			if (currentResult == -1)
+				return "unknown";
+
+			
+			attrs = libgda.gda_data_model_describe_column ((IntPtr) gdaResults[currentResult],
+								       index);
+			if (attrs == IntPtr.Zero)
+				return "unknown";
+
+			type = libgda.gda_field_attributes_get_gdatype (attrs);
+			libgda.gda_field_attributes_free (attrs);
+			
+			return libgda.gda_type_to_string (type);
+		}
+
+		public DateTime GetDateTime (int ordinal)
+		{
+			IntPtr value;
+			DateTime dt;
+
+			if (currentResult == -1)
+				throw new InvalidCastException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new InvalidCastException ();
+			
+			if (libgda.gda_value_get_type (value) == GdaValueType.Date) {
+				GdaDate gdt;
+
+				gdt = (GdaDate) Marshal.PtrToStructure (libgda.gda_value_get_date (value),
+									typeof (GdaDate));
+				return new DateTime ((int) gdt.year, (int) gdt.month, (int) gdt.day);
+			} else if (libgda.gda_value_get_type (value) == GdaValueType.Time) {
+				GdaTime gdt;
+
+				gdt = (GdaTime) Marshal.PtrToStructure (libgda.gda_value_get_time (value),
+									typeof (GdaTime));
+				return new DateTime (0, 0, 0, (int) gdt.hour, (int) gdt.minute, (int) gdt.second, 0);
+			} else if (libgda.gda_value_get_type (value) == GdaValueType.Timestamp) {
+				GdaTimestamp gdt;
+				
+				gdt = (GdaTimestamp) Marshal.PtrToStructure (libgda.gda_value_get_timestamp (value),
+									     typeof (GdaTimestamp));
+
+				return new DateTime ((int) gdt.year, (int) gdt.month, (int) gdt.day,
+						     (int) gdt.hour, (int) gdt.minute, (int) gdt.second,
+						     (int) gdt.fraction);
+			}
+
+			throw new InvalidCastException ();
+		}
+
+		[MonoTODO]
+		public decimal GetDecimal (int ordinal)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public double GetDouble (int ordinal)
+		{
+			IntPtr value;
+
+			if (currentResult == -1)
+				throw new InvalidCastException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new InvalidCastException ();
+			
+			if (libgda.gda_value_get_type (value) != GdaValueType.Double)
+				throw new InvalidCastException ();
+			return libgda.gda_value_get_double (value);
+		}
+
+		[MonoTODO]
+		public Type GetFieldType (int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public float GetFloat (int ordinal)
+		{
+			IntPtr value;
+
+			if (currentResult == -1)
+				throw new InvalidCastException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new InvalidCastException ();
+			
+			if (libgda.gda_value_get_type (value) != GdaValueType.Single)
+				throw new InvalidCastException ();
+			return libgda.gda_value_get_single (value);
+		}
+
+		[MonoTODO]
+		public Guid GetGuid (int ordinal)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public short GetInt16 (int ordinal)
+		{
+			IntPtr value;
+
+			if (currentResult == -1)
+				throw new InvalidCastException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new InvalidCastException ();
+			
+			if (libgda.gda_value_get_type (value) != GdaValueType.Smallint)
+				throw new InvalidCastException ();
+			return (short) libgda.gda_value_get_smallint (value);
+		}
+
+		public int GetInt32 (int ordinal)
+		{
+			IntPtr value;
+
+			if (currentResult == -1)
+				throw new InvalidCastException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new InvalidCastException ();
+			
+			if (libgda.gda_value_get_type (value) != GdaValueType.Integer)
+				throw new InvalidCastException ();
+			return libgda.gda_value_get_integer (value);
+		}
+
+		public long GetInt64 (int ordinal)
+		{
+			IntPtr value;
+
+			if (currentResult == -1)
+				throw new InvalidCastException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new InvalidCastException ();
+			
+			if (libgda.gda_value_get_type (value) != GdaValueType.Bigint)
+				throw new InvalidCastException ();
+			return libgda.gda_value_get_bigint (value);
+		}
+
+		public string GetName (int index)
+		{
+			if (currentResult == -1)
+				return null;
+
+			return libgda.gda_data_model_get_column_title (
+				(IntPtr) gdaResults[currentResult], index);
+		}
+
+		public int GetOrdinal (string name)
+		{
+			if (currentResult == -1)
+				throw new IndexOutOfRangeException ();
+
+			for (int i = 0; i < FieldCount; i++) {
+				if (GetName (i) == name)
+					return i;
+			}
+
+			throw new IndexOutOfRangeException ();
+		}
+
+		public DataTable GetSchemaTable ()
+		{
+			DataTable table = new DataTable ();
+
+			// FIXME: implement
+			return table;
+		}
+
+		public string GetString (int ordinal)
+		{
+			IntPtr value;
+
+			if (currentResult == -1)
+				throw new InvalidCastException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new InvalidCastException ();
+			
+			if (libgda.gda_value_get_type (value) != GdaValueType.String)
+				throw new InvalidCastException ();
+			return libgda.gda_value_get_string (value);
+		}
+
+		[MonoTODO]
+		public TimeSpan GetTimeSpan (int ordinal)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public object GetValue (int ordinal)
+		{
+			IntPtr value;
+			GdaValueType type;
+
+			if (currentResult == -1)
+				throw new IndexOutOfRangeException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new IndexOutOfRangeException ();
+
+			type = libgda.gda_value_get_type (value);
+			switch (type) {
+			case GdaValueType.Bigint : return GetInt64 (ordinal);
+			case GdaValueType.Boolean : return GetBoolean (ordinal);
+			case GdaValueType.Date : return GetDateTime (ordinal);
+			case GdaValueType.Double : return GetDouble (ordinal);
+			case GdaValueType.Integer : return GetInt32 (ordinal);
+			case GdaValueType.Single : return GetFloat (ordinal);
+			case GdaValueType.Smallint : return GetByte (ordinal);
+			case GdaValueType.String : return GetString (ordinal);
+			case GdaValueType.Time : return GetDateTime (ordinal);
+			case GdaValueType.Timestamp : return GetDateTime (ordinal);
+			case GdaValueType.Tinyint : return GetByte (ordinal);
+			}
+
+			return (object) libgda.gda_value_stringify (value);
+		}
+
+		[MonoTODO]
+		public int GetValues (object[] values)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		IDataReader IDataRecord.GetData (int ordinal)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		void IDisposable.Dispose ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public bool IsDBNull (int ordinal)
+		{
+			IntPtr value;
+
+			if (currentResult == -1)
+				throw new IndexOutOfRangeException ();
+
+			value = libgda.gda_data_model_get_value_at ((IntPtr) gdaResults[currentResult],
+								    ordinal, currentRow);
+			if (value == IntPtr.Zero)
+				throw new IndexOutOfRangeException ();
+
+			return libgda.gda_value_is_null (value);
+		}
+
+		public bool NextResult ()
+		{
+			int i = currentResult + 1;
+			if (i >= 0 && i < gdaResults.Count) {
+				currentResult++;
+				return true;
+			}
+
+			return false;
+		}
+
+		public bool Read ()
+		{
+			if (currentResult < 0 ||
+			    currentResult >= gdaResults.Count)
+				return false;
+
+			currentRow++;
+			if (currentRow <
+			    libgda.gda_data_model_get_n_rows ((IntPtr) gdaResults[currentResult]))
+				return true;
+
+			return false;
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbError.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbError.cs
new file mode 100644
index 00000000000..b672820a095
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbError.cs
@@ -0,0 +1,74 @@
+//
+// System.Data.OleDb.OleDbError
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbError
+	{
+		private string errorMessage;
+		private int nativeError;
+		private string errorSource;
+		private string sqlState;
+
+		#region Constructors
+
+		internal OleDbError (string msg, int code, string source, string sql)
+		{
+			errorMessage = msg;
+			nativeError = code;
+			errorSource = source;
+			sqlState = sql;
+		}
+		
+		#endregion // Constructors
+		
+		#region Properties
+
+		public string Message {
+			get {
+				return errorMessage;
+			}
+		}
+
+		public int NativeError {
+			get {
+				return nativeError;
+			}
+		}
+
+		public string Source {
+			get {
+				return errorSource;
+			}
+		}
+
+		public string SqlState {
+			get {
+				return sqlState;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public override string ToString ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs
new file mode 100644
index 00000000000..8768459bc2e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbErrorCollection.cs
@@ -0,0 +1,80 @@
+//
+// System.Data.OleDb.OleDbErrorCollection
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Collections;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbErrorCollection : ICollection, IEnumerable
+	{
+		#region Fields
+
+		ArrayList list;
+	
+		#endregion // Fields
+
+		#region Properties 
+
+		public int Count {
+			get {
+				return list.Count;
+			}
+		}
+
+		public OleDbError this[int index] {
+			get {
+				return (OleDbError) list[index];
+			}
+		}
+
+		object ICollection.SyncRoot {
+			get {
+				return list.SyncRoot;
+			}
+		}
+
+		bool ICollection.IsSynchronized {
+			get {
+				return list.IsSynchronized;
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		internal void Add (OleDbError error)
+		{
+			list.Add ((object) error);
+		}
+		
+		[MonoTODO]
+		public void CopyTo (Array array, int index) 
+		{
+			((OleDbError[])(list.ToArray ())).CopyTo (array, index);
+			throw new NotImplementedException ();
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return list.GetEnumerator ();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			return GetEnumerator ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs
new file mode 100644
index 00000000000..ad66403bd7e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbException.cs
@@ -0,0 +1,123 @@
+//
+// System.Data.OleDb.OleDbException
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+
+namespace System.Data.OleDb
+{
+	[Serializable]
+	public sealed class OleDbException : ExternalException
+	{
+		private OleDbConnection connection;
+		
+		#region Constructors
+
+		internal OleDbException (OleDbConnection cnc)
+		{
+			connection = cnc;
+		}
+		
+		#endregion // Constructors
+		
+		#region Properties
+
+		public override int ErrorCode {	
+			get {
+				GdaList glist;
+				IntPtr errors;
+
+				errors = libgda.gda_connection_get_errors (connection.GdaConnection);
+				if (errors != IntPtr.Zero) {
+					glist = (GdaList) Marshal.PtrToStructure (errors, typeof (GdaList));
+					return (int) libgda.gda_error_get_number (glist.data);
+				}
+
+				return -1;
+			}
+		}
+
+		public OleDbErrorCollection Errors {
+			get {
+				GdaList glist;
+				IntPtr errors;
+				OleDbErrorCollection col = new OleDbErrorCollection ();
+				
+				errors = libgda.gda_connection_get_errors (connection.GdaConnection);
+				if (errors != IntPtr.Zero) {
+					glist = (GdaList) Marshal.PtrToStructure (errors, typeof (GdaList));
+					while (glist != null) {
+						col.Add (new OleDbError (
+								 libgda.gda_error_get_description (glist.data),
+								 (int) libgda.gda_error_get_number (glist.data),
+								 libgda.gda_error_get_source (glist.data),
+								 libgda.gda_error_get_sqlstate (glist.data)));
+						glist = (GdaList) Marshal.PtrToStructure (glist.next,
+											  typeof (GdaList));
+					}
+				}
+
+				return col;
+			}
+		}
+
+		public override string Message {	
+			get {
+				GdaList glist;
+				IntPtr errors;
+				string msg = "";
+
+				errors = libgda.gda_connection_get_errors (connection.GdaConnection);
+				if (errors != IntPtr.Zero) {
+					glist = (GdaList) Marshal.PtrToStructure (errors, typeof (GdaList));
+					while (glist != null) {
+						msg = msg + ";" +  libgda.gda_error_get_description (glist.data);
+						glist = (GdaList) Marshal.PtrToStructure (glist.next,
+											  typeof (GdaList));
+					}
+
+					return msg;
+				}
+
+				return null;
+			}
+		}
+
+		public override string Source {	
+			get {
+				GdaList glist;
+				IntPtr errors;
+
+				errors = libgda.gda_connection_get_errors (connection.GdaConnection);
+				if (errors != IntPtr.Zero) {
+					glist = (GdaList) Marshal.PtrToStructure (errors, typeof (GdaList));
+					return libgda.gda_error_get_source (glist.data);
+				}
+
+				return null;
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public override void GetObjectData (SerializationInfo si, StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventArgs.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventArgs.cs
new file mode 100644
index 00000000000..9c0b5fa89bf
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventArgs.cs
@@ -0,0 +1,53 @@
+//
+// System.Data.OleDb.OleDbInfoMessageEventArgs
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbInfoMessageEventArgs : EventArgs
+	{
+		#region Properties
+
+		public int ErrorCode {
+			[MonoTODO]
+			get { throw new NotImplementedException (); }
+		}
+
+		public OleDbErrorCollection Errors {
+			[MonoTODO]
+			get { throw new NotImplementedException (); }
+		}
+
+		public string Message {
+			[MonoTODO]
+			get { throw new NotImplementedException (); }
+		}
+
+		public string Source {
+			[MonoTODO]
+			get { throw new NotImplementedException (); }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public override string ToString ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventHandler.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventHandler.cs
new file mode 100644
index 00000000000..60fd9c96339
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbInfoMessageEventHandler.cs
@@ -0,0 +1,17 @@
+//
+// System.Data.OleDb.OleDbInfoMessageEventHandler
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	[Serializable]
+	public delegate void OleDbInfoMessageEventHandler (object sender, OleDbInfoMessageEventArgs e);
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbLiteral.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbLiteral.cs
new file mode 100644
index 00000000000..b9b2da42d27
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbLiteral.cs
@@ -0,0 +1,48 @@
+//
+// System.Data.OleDb.OleDbLiteral
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public enum OleDbLiteral {
+		Binary_Literal,
+		Catalog_Name,
+		Catalog_Separator,
+		Char_Literal,
+		Column_Alias,
+		Column_Name,
+		Correlation_Name,
+		Cube_Name,
+		Cursor_Name,
+		Dimension_Name,
+		Escape_Percent_Prefix,
+		Escape_Percent_Suffix,
+		Escape_Underscore_Prefix,
+		Escape_Underscore_Suffix,
+		Hierarchy_Name,
+		Index_Name,
+		Invalid,
+		Level_Name,
+		Like_Percent,
+		Like_Underscore,
+		Member_Name,
+		Procedure_Name,
+		Property_Name,
+		Quote_Prefix,
+		Quote_Suffix,
+		Schema_Name,
+		Schema_Separator,
+		Table_Name,
+		Text_Command,
+		User_Name,
+		View_Name
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs
new file mode 100644
index 00000000000..fc9d2aa4861
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbParameter.cs
@@ -0,0 +1,364 @@
+//
+// System.Data.OleDb.OleDbParameter
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbParameter : MarshalByRefObject, IDbDataParameter, IDataParameter, ICloneable
+	{
+		#region Fields
+
+		string name;
+		object value;
+		int size;
+		bool isNullable;
+		byte precision;
+		byte scale;
+		DataRowVersion sourceVersion;
+		string sourceColumn;
+		ParameterDirection direction;
+		OleDbType oleDbType;
+		DbType dbType;
+
+		IntPtr gdaParameter;
+
+		#endregion
+
+		#region Constructors
+		
+		public OleDbParameter ()
+		{
+			name = String.Empty;
+			value = null;
+			size = 0;
+			isNullable = true;
+			precision = 0;
+			scale = 0;
+			sourceColumn = String.Empty;
+			gdaParameter = IntPtr.Zero;
+		}
+
+		public OleDbParameter (string name, object value) 
+			: this ()
+		{
+			this.name = name;
+			this.value = value;
+			OleDbType = GetOleDbType (value);
+		}
+
+		public OleDbParameter (string name, OleDbType dataType) 
+			: this ()
+		{
+			this.name = name;
+			OleDbType = dataType;
+		}
+
+		public OleDbParameter (string name, OleDbType dataType, int size)
+			: this (name, dataType)
+		{
+			this.size = size;
+		}
+
+		public OleDbParameter (string name, OleDbType dataType, int size, string srcColumn)
+			: this (name, dataType, size)
+		{
+			this.sourceColumn = srcColumn;
+		}
+
+		public OleDbParameter(string name, OleDbType dataType, int size, ParameterDirection direction, bool isNullable, byte precision, byte scale, string srcColumn, DataRowVersion srcVersion, object value)
+			: this (name, dataType, size, srcColumn)
+		{
+			this.direction = direction;
+			this.isNullable = isNullable;
+			this.precision = precision;
+			this.scale = scale;
+			this.sourceVersion = srcVersion;
+			this.value = value;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public DbType DbType {
+			get { return dbType; }
+			set { 
+				dbType = value;
+				oleDbType = DbTypeToOleDbType (value);
+			}
+		}
+		
+		public ParameterDirection Direction {
+			get { return direction; }
+			set { direction = value; }
+		}
+		
+		public bool IsNullable {
+			get { return isNullable; }
+		}
+
+		public OleDbType OleDbType {
+			get { return oleDbType; }
+			set {
+				oleDbType = value;
+				dbType = OleDbTypeToDbType (value);
+			}
+		}
+		
+		public string ParameterName {
+			get { return name; }
+			set { name = value; }
+		}
+
+		public byte Precision {
+			get { return precision; }
+			set { precision = value; }
+		}
+		
+		public byte Scale {
+			get { return scale; }
+			set { scale = value; }
+		}
+		
+		public int Size {
+			get { return size; }
+			set { size = value; }
+		}
+
+		public string SourceColumn {
+			get { return sourceColumn; }
+			set { sourceColumn = value; }
+		}
+		
+		public DataRowVersion SourceVersion {
+			get { return sourceVersion; }
+			set { sourceVersion = value; }
+		}
+		
+		public object Value {
+			get { return value; }
+			set { this.value = value; }
+		}
+
+		#endregion // Properties
+
+		#region Internal Properties
+
+		internal IntPtr GdaParameter {
+			get { return gdaParameter; }
+		}
+
+		#endregion // Internal Properties
+
+		#region Methods
+
+		[MonoTODO]
+		object ICloneable.Clone ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override string ToString ()
+		{
+			return ParameterName;
+		}
+
+		private OleDbType DbTypeToOleDbType (DbType dbType)
+		{
+			switch (dbType) {
+			case DbType.AnsiString :
+				return OleDbType.VarChar;
+			case DbType.AnsiStringFixedLength :
+				return OleDbType.Char;
+			case DbType.Binary :
+				return OleDbType.Binary;
+			case DbType.Boolean :
+				return OleDbType.Boolean;
+			case DbType.Byte :
+				return OleDbType.UnsignedTinyInt;
+			case DbType.Currency :
+				return OleDbType.Currency;
+			case DbType.Date :
+				return OleDbType.Date;
+			case DbType.DateTime :
+				throw new NotImplementedException ();
+			case DbType.Decimal :
+				return OleDbType.Decimal;
+			case DbType.Double :
+				return OleDbType.Double;
+			case DbType.Guid :
+				return OleDbType.Guid;
+			case DbType.Int16 :
+				return OleDbType.SmallInt;
+			case DbType.Int32 :
+				return OleDbType.Integer;
+			case DbType.Int64 :
+				return OleDbType.BigInt;
+			case DbType.Object :
+				return OleDbType.Variant;
+			case DbType.SByte :
+				return OleDbType.TinyInt;
+			case DbType.Single :
+				return OleDbType.Single;
+			case DbType.String :
+				return OleDbType.WChar;
+			case DbType.StringFixedLength :
+				return OleDbType.VarWChar;
+			case DbType.Time :
+				throw new NotImplementedException ();
+			case DbType.UInt16 :
+				return OleDbType.UnsignedSmallInt;
+			case DbType.UInt32 :
+				return OleDbType.UnsignedInt;
+			case DbType.UInt64 :
+				return OleDbType.UnsignedBigInt;
+			case DbType.VarNumeric :
+				return OleDbType.VarNumeric;
+			}
+			return OleDbType.Variant;
+		}
+
+		private DbType OleDbTypeToDbType (OleDbType oleDbType)
+		{
+			switch (oleDbType) {
+			case OleDbType.BigInt :
+				return DbType.Int64;
+			case OleDbType.Binary :
+				return DbType.Binary;
+			case OleDbType.Boolean :
+				return DbType.Boolean;
+			case OleDbType.BSTR :
+				return DbType.AnsiString;
+			case OleDbType.Char :
+				return DbType.AnsiStringFixedLength;
+			case OleDbType.Currency :
+				return DbType.Currency;
+			case OleDbType.Date :
+				return DbType.DateTime;
+			case OleDbType.DBDate :
+				return DbType.DateTime;
+			case OleDbType.DBTime :
+				throw new NotImplementedException ();
+			case OleDbType.DBTimeStamp :
+				return DbType.DateTime;
+			case OleDbType.Decimal :
+				return DbType.Decimal;
+			case OleDbType.Double :
+				return DbType.Double;
+			case OleDbType.Empty :
+				throw new NotImplementedException ();
+			case OleDbType.Error :
+				throw new NotImplementedException ();
+			case OleDbType.Filetime :
+				return DbType.DateTime;
+			case OleDbType.Guid :
+				return DbType.Guid;
+			case OleDbType.IDispatch :
+				return DbType.Object;
+			case OleDbType.Integer :
+				return DbType.Int32;
+			case OleDbType.IUnknown :
+				return DbType.Object;
+			case OleDbType.LongVarBinary :
+				return DbType.Binary;
+			case OleDbType.LongVarChar :
+				return DbType.AnsiString;
+			case OleDbType.LongVarWChar :
+				return DbType.String;
+			case OleDbType.Numeric :
+				return DbType.Decimal;
+			case OleDbType.PropVariant :
+				return DbType.Object;
+			case OleDbType.Single :
+				return DbType.Single;
+			case OleDbType.SmallInt :
+				return DbType.Int16;
+			case OleDbType.TinyInt :
+				return DbType.SByte;
+			case OleDbType.UnsignedBigInt :
+				return DbType.UInt64;
+			case OleDbType.UnsignedInt :
+				return DbType.UInt32;
+			case OleDbType.UnsignedSmallInt :
+				return DbType.UInt16;
+			case OleDbType.UnsignedTinyInt :
+				return DbType.Byte;
+			case OleDbType.VarBinary :
+				return DbType.Binary;
+			case OleDbType.VarChar :
+				return DbType.AnsiString;
+			case OleDbType.Variant :
+				return DbType.Object;
+			case OleDbType.VarNumeric :
+				return DbType.VarNumeric;
+			case OleDbType.VarWChar :
+				return DbType.StringFixedLength;
+			case OleDbType.WChar :
+				return DbType.String;
+			}
+			return DbType.Object;
+		}
+
+		private OleDbType GetOleDbType (object value)
+		{
+			if (value is Guid) return OleDbType.Guid;
+			if (value is TimeSpan) return OleDbType.DBTime;
+
+			switch (Type.GetTypeCode (value.GetType ())) {
+			case TypeCode.Boolean :
+				return OleDbType.Boolean;
+			case TypeCode.Byte :
+				if (value.GetType().IsArray) 
+					return OleDbType.Binary;
+				else 
+					return OleDbType.UnsignedTinyInt;
+			case TypeCode.Char :
+				return OleDbType.Char;
+			case TypeCode.DateTime :
+				return OleDbType.Date;
+			case TypeCode.DBNull :
+				return OleDbType.Empty;
+			case TypeCode.Decimal :
+				return OleDbType.Decimal;
+			case TypeCode.Double :
+				return OleDbType.Double;
+			case TypeCode.Empty :
+				return OleDbType.Empty;
+			case TypeCode.Int16 :
+				return OleDbType.SmallInt;
+			case TypeCode.Int32 :
+				return OleDbType.Integer;
+			case TypeCode.Int64 :
+				return OleDbType.BigInt;
+			case TypeCode.SByte :
+				return OleDbType.TinyInt;
+			case TypeCode.String :
+				return OleDbType.VarChar;
+			case TypeCode.Single :
+				return OleDbType.Single;
+			case TypeCode.UInt64 :
+				return OleDbType.UnsignedBigInt;
+			case TypeCode.UInt32 :
+				return OleDbType.UnsignedInt;
+			case TypeCode.UInt16 :
+				return OleDbType.UnsignedSmallInt;
+			case TypeCode.Object :
+				return OleDbType.Variant;
+			}
+			return OleDbType.IUnknown;
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs
new file mode 100644
index 00000000000..8d09e465c16
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbParameterCollection.cs
@@ -0,0 +1,208 @@
+//
+// System.Data.OleDb.OleDbParameterCollection
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Collections;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbParameterCollection : MarshalByRefObject,
+		IDataParameterCollection, IList, ICollection, IEnumerable
+	{
+		#region Fields
+
+		ArrayList list = new ArrayList ();
+
+		#endregion // Fields
+
+		#region Properties
+
+		public int Count {
+			get { return list.Count; }
+		}
+
+		public OleDbParameter this[int index] {
+			get { return (OleDbParameter) list[index]; }
+			set { list[index] = value; }
+		}
+
+		public OleDbParameter this[string parameterName] {
+			[MonoTODO]
+			get { throw new NotImplementedException (); }
+			[MonoTODO]
+			set { throw new NotImplementedException (); }
+		}
+
+		int ICollection.Count {
+			get { return list.Count; }
+		}
+
+		bool IList.IsFixedSize {
+			get { return false; }
+		}
+		
+		bool IList.IsReadOnly {
+			get { return false; }
+		}
+		
+		bool ICollection.IsSynchronized {
+			get { return list.IsSynchronized; }
+		}
+
+		object ICollection.SyncRoot {
+			get { return list.SyncRoot; }
+		}
+		
+		object IList.this[int index] {
+			get { return list[index]; }
+			set { list[index] = value; }
+		}
+
+		object IDataParameterCollection.this[string name]
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		internal IntPtr GdaParameterList {
+			[MonoTODO]
+			get {
+				IntPtr param_list;
+
+				param_list = libgda.gda_parameter_list_new ();
+				// FIXME: add parameters to list
+				
+				return param_list;
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+
+		public OleDbParameter Add (OleDbParameter parameter)
+		{
+			list.Add (parameter);
+			return parameter;
+		}
+
+		public OleDbParameter Add (string name, object value)
+		{
+			OleDbParameter parameter = new OleDbParameter (name, value);
+			list.Add (parameter);
+			return parameter;
+		}
+
+		public OleDbParameter Add (string name, OleDbType type)
+	        {
+			OleDbParameter parameter = new OleDbParameter (name, type);
+			list.Add (parameter);
+			return parameter;
+		}
+
+		public OleDbParameter Add (string name, OleDbType type, int width)
+		{
+			OleDbParameter parameter = new OleDbParameter (name, type, width);
+			list.Add (parameter);
+			return parameter;
+		}
+
+		public OleDbParameter Add (string name, OleDbType type,
+					   int width, string src_col)
+		{
+			OleDbParameter parameter = new OleDbParameter (name, type, width, src_col);
+			list.Add (parameter);
+			return parameter;
+		}
+
+		int IList.Add (object value)
+		{
+			if (!(value is IDataParameter))
+				throw new InvalidCastException ();
+
+			list.Add (value);
+			return list.IndexOf (value);
+		}
+
+		void IList.Clear ()
+		{
+			list.Clear ();
+		}
+
+		bool IList.Contains (object value)
+		{
+			return list.Contains (value);
+		}
+
+		bool IDataParameterCollection.Contains (string value)
+		{
+			for (int i = 0; i < list.Count; i++) {
+				IDataParameter parameter;
+
+				parameter = (IDataParameter) list[i];
+				if (parameter.ParameterName == value)
+					return true;
+			}
+
+			return false;
+		}
+
+		void ICollection.CopyTo (Array array, int index)
+		{
+			((OleDbParameter[])(list.ToArray ())).CopyTo (array, index);
+		}
+
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			return list.GetEnumerator ();
+		}
+		
+		int IList.IndexOf (object value)
+		{
+			return list.IndexOf (value);
+		}
+
+		int IDataParameterCollection.IndexOf (string name)
+		{
+			return list.IndexOf (((IDataParameterCollection) this)[name]);
+		}
+
+		void IList.Insert (int index, object value)
+	        {
+			list.Insert (index, value);
+		}
+
+		void IList.Remove (object value)
+		{
+			list.Remove (value);
+		}
+
+		void IList.RemoveAt (int index)
+		{
+			list.Remove ((object) list[index]);
+		}
+
+		void IDataParameterCollection.RemoveAt (string name)
+		{
+			list.Remove (((IDataParameterCollection) this)[name]);
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbPermission.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbPermission.cs
new file mode 100644
index 00000000000..2bf95972a5e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbPermission.cs
@@ -0,0 +1,95 @@
+//
+// System.Data.OleDb.OleDbPermission
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Data.OleDb
+{
+	[Serializable]
+	public sealed class OleDbPermission : DBDataPermission
+	{
+		#region Constructors
+
+		[MonoTODO]
+		public OleDbPermission ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public OleDbPermission (PermissionState state)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public OleDbPermission (PermissionState state, bool allowBlankPassword)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+
+		#region Properties
+
+		public string Provider {
+			[MonoTODO]
+			get { throw new NotImplementedException (); }
+			[MonoTODO]
+			set { throw new NotImplementedException (); }
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public override IPermission Copy ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void FromXml (SecurityElement securityElement)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Intersect (IPermission target)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsSubsetOf (IPermission target)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override SecurityElement ToXml ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Union (IPermission target)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbPermissionAttribute.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbPermissionAttribute.cs
new file mode 100644
index 00000000000..1de7a88e6ea
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbPermissionAttribute.cs
@@ -0,0 +1,62 @@
+//
+// System.Data.OleDb.OleDbPermissionAttribute
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Data.OleDb
+{
+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class
+			| AttributeTargets.Struct | AttributeTargets.Constructor |
+			AttributeTargets.Method)]
+	[Serializable]
+	public sealed class OleDbPermissionAttribute : DBDataPermissionAttribute
+	{
+
+		#region Constructors 
+
+		[MonoTODO]
+		OleDbPermissionAttribute (SecurityAction action) 
+			: base (action)
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		[MonoTODO]
+		public string Provider {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException (); 
+			}
+			[MonoTODO]
+			set {
+				throw new NotImplementedException (); 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public override IPermission CreatePermission () 
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatedEventArgs.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatedEventArgs.cs
new file mode 100644
index 00000000000..036e31bfaad
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatedEventArgs.cs
@@ -0,0 +1,46 @@
+//
+// System.Data.OleDb.OleDbRowUpdatedEventArgs
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbRowUpdatedEventArgs : RowUpdatedEventArgs
+	{
+		#region Fields
+		
+		OleDbCommand command;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		[MonoTODO]
+		public OleDbRowUpdatedEventArgs (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping)
+			: base (dataRow, command, statementType, tableMapping)
+
+		{
+			this.command = (OleDbCommand) command;
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+
+		public new OleDbCommand Command {
+			get { return command; }
+		}
+
+		#endregion // Properties
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatedEventHandler.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatedEventHandler.cs
new file mode 100644
index 00000000000..fc911b7c6c6
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatedEventHandler.cs
@@ -0,0 +1,19 @@
+//
+// System.Data.OleDb.OleDbRowUpdatedEventHandler
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	[Serializable]
+	public delegate void OleDbRowUpdatedEventHandler (
+		object sender,
+		OleDbRowUpdatedEventArgs e);
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatingEventArgs.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatingEventArgs.cs
new file mode 100644
index 00000000000..8cf9aedafd2
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatingEventArgs.cs
@@ -0,0 +1,48 @@
+//
+// System.Data.OleDb.OleDbRowUpdatingEventArgs
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbRowUpdatingEventArgs : RowUpdatingEventArgs
+	{
+
+		#region Fields
+
+		OleDbCommand command = null;
+
+		#endregion
+
+		#region Constructors
+
+		[MonoTODO]
+		public OleDbRowUpdatingEventArgs (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping)
+			: base (dataRow, command, statementType, tableMapping)
+
+		{
+			this.command = (OleDbCommand) command;
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+
+		#region Properties
+		
+		public new OleDbCommand Command {
+			get { return command; }
+			set { command = value; }
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatingEventHandler.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatingEventHandler.cs
new file mode 100644
index 00000000000..42e42fcc628
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbRowUpdatingEventHandler.cs
@@ -0,0 +1,19 @@
+//
+// System.Data.OleDb.OleDbRowUpdatingEventHandler
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	[Serializable]
+	public delegate void OleDbRowUpdatingEventHandler (
+		object sender,
+		OleDbRowUpdatingEventArgs e);
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbSchemaGuid.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbSchemaGuid.cs
new file mode 100644
index 00000000000..1250ee96e57
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbSchemaGuid.cs
@@ -0,0 +1,67 @@
+//
+// System.Data.OleDb.OleDbSchemaGuid
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbSchemaGuid
+	{
+		#region Fields
+
+		public static readonly Guid Assertions = new Guid ("df855bea-fb95-4abc-8932-e57e45c7ddae");
+		public static readonly Guid Catalogs = new Guid ("e4a67334-f03c-45af-8b1d-531f99268045");
+		public static readonly Guid Character_Sets = new Guid ("e4533bdb-0b55-48ee-986d-17d07143657d");
+		public static readonly Guid Check_Constraints = new Guid ("fedf7f5d-cfb4-4635-af02-45eb4bb4e8f3");
+		public static readonly Guid Check_Constraints_By_Table = new Guid ("d76547ef-837d-413c-8d76-bab1d7bb014a");
+		public static readonly Guid Collations = new Guid ("5145b85c-c448-4b9e-8929-4c2de31ffa30");
+		public static readonly Guid Columns = new Guid ("86dcd6e2-9a8c-4c6d-bc1c-e0e334c727c9");
+		public static readonly Guid Column_Domain_Usage = new Guid ("058acb5e-eb1d-4b6e-8e98-a7d59a959ff1");
+		public static readonly Guid Column_Privileges = new Guid ("43152796-f3b4-4342-9647-008f1060e352");
+		public static readonly Guid Constraint_Column_Usage = new Guid ("3a39f999-f481-4293-8b9f-af7e91b4ee7d");
+		public static readonly Guid Constraint_Table_Usage = new Guid ("d689719b-24b0-4963-a635-097c480edcd2");
+		public static readonly Guid DbInfoLiterals = new Guid ("7a564da6-f3bc-474b-9e66-71cb47bde5b0");
+		public static readonly Guid Foreign_Keys = new Guid ("d9e547ce-e62d-4200-b849-566bc3dc29de");
+		public static readonly Guid Indexes = new Guid ("69d8523c-96ad-40cb-a89a-ee98d2d6fcec");
+		public static readonly Guid Key_Column_Usage = new Guid ("65423211-805e-4822-8eb4-f4f6d540056e");
+		public static readonly Guid Primary_Keys = new Guid ("c6e5b174-fbd8-4055-b757-8585040e463f");
+		public static readonly Guid Procedures = new Guid ("61f276ad-4f25-4c26-b4ae-8238e06d56db");
+		public static readonly Guid Procedure_Columns = new Guid ("7148080d-e053-4ada-b79a-9a2ff614a3d4");
+		public static readonly Guid Procedure_Parameters = new Guid ("984af700-8fe7-476f-81c2-4b814df67907");
+		public static readonly Guid Provider_Types = new Guid ("0bc2da44-d834-4136-9ff0-3cef477784b9");
+		public static readonly Guid Referential_Constraints = new Guid ("d2eab85e-49a7-462d-aa22-1d97c74178ae");
+		public static readonly Guid Schemata = new Guid ("2fbd7503-0af3-43d2-92c6-51e78b84dd37");
+		public static readonly Guid Sql_Languages = new Guid ("d60a511d-a07f-4e59-aac2-71c25fab5b02");
+		public static readonly Guid Statistics = new Guid ("03ed9f7d-35bc-45fe-993f-ee7a5f29fb74");
+		public static readonly Guid Tables = new Guid ("ceac88ba-240c-4bb4-821e-4a49fc013371");
+		public static readonly Guid Tables_Info = new Guid ("9ff81c59-2b1e-4371-a08b-3a2d373189fa");
+		public static readonly Guid Table_Constraints = new Guid ("62883c55-082d-42cb-bb00-747985ca6047");
+		public static readonly Guid Table_Privileges = new Guid ("1a73f478-8c8e-4ede-b3ec-22ba13ab55a0");
+		public static readonly Guid Table_Statistics = new Guid ("9c944744-cd51-448a-8be4-7095f039d0ef");
+		public static readonly Guid Translations = new Guid ("5578b57e-a682-4f1b-bdb4-f8a14ad6f61e");
+		public static readonly Guid Trustee = new Guid ("521207e2-3a23-42b6-ac78-810a3fce3271");
+		public static readonly Guid Usage_Privileges = new Guid ("f8113a2b-2934-4c67-ab7b-adbe3ab74973");
+		public static readonly Guid Views = new Guid ("9a6345b6-61a0-40fd-9b45-402f3c9c9c3e");
+		public static readonly Guid View_Column_Usage = new Guid ("2c91ef91-02d8-4d38-ae5a-1e826873d6ea");
+		public static readonly Guid View_Table_Usage = new Guid ("7dcb7f53-1045-4fdf-86a1-d3caaf27c7f5");
+
+		#endregion
+
+		#region Constructors
+
+		public OleDbSchemaGuid ()
+		{
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbTransaction.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbTransaction.cs
new file mode 100644
index 00000000000..5a61cb9c6a8
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbTransaction.cs
@@ -0,0 +1,119 @@
+//
+// System.Data.OleDb.OleDbTransaction
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public sealed class OleDbTransaction : MarshalByRefObject, IDbTransaction, IDisposable
+	{
+		#region Fields
+
+		OleDbConnection connection;
+		IsolationLevel isolationLevel;
+		IntPtr gdaTransaction;
+		int depth;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		internal OleDbTransaction (OleDbConnection connection, int depth)
+		{
+			this.connection = connection;
+			isolationLevel = IsolationLevel.ReadCommitted;
+
+			gdaTransaction = libgda.gda_transaction_new (depth.ToString ());
+			libgda.gda_connection_begin_transaction (connection.GdaConnection, gdaTransaction);
+		}
+
+		internal OleDbTransaction (OleDbConnection connection)
+			: this (connection, 1)
+		{
+		}
+
+		internal OleDbTransaction (OleDbConnection connection, int depth, IsolationLevel isolevel) 
+			: this (connection, depth)
+		{
+			isolationLevel = isolevel;
+		}
+
+		internal OleDbTransaction (OleDbConnection connection, IsolationLevel isolevel) 
+			: this (connection, 1, isolevel)
+		{
+		}
+
+
+		#endregion // Constructors
+
+		#region Properties
+
+		public OleDbConnection Connection {
+			get {
+				return connection;
+			}
+		}
+
+		IDbConnection IDbTransaction.Connection {
+			get {
+				return connection;
+			}
+		}
+		
+		public IsolationLevel IsolationLevel {
+			get {
+				return isolationLevel;
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		public OleDbTransaction Begin () 
+		{
+			return new OleDbTransaction (connection, depth + 1);
+		}
+
+		public OleDbTransaction Begin (IsolationLevel isolevel) 
+		{
+			return new OleDbTransaction (connection, depth + 1, isolevel);
+		}
+
+		public void Commit ()
+		{
+			if (!libgda.gda_connection_commit_transaction (connection.GdaConnection,
+								       gdaTransaction))
+				throw new InvalidOperationException ();
+		}
+
+		[MonoTODO]
+		~OleDbTransaction ()
+		{
+		}
+
+		[MonoTODO]
+		void IDisposable.Dispose ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void Rollback ()
+	        {
+			if (!libgda.gda_connection_rollback_transaction (connection.GdaConnection,
+									 gdaTransaction))
+				throw new InvalidOperationException ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/OleDbType.cs b/mcs/class/System.Data/System.Data.OleDb/OleDbType.cs
new file mode 100644
index 00000000000..fcd3ae46efd
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/OleDbType.cs
@@ -0,0 +1,56 @@
+//
+// System.Data.OleDb.OleDbType
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.OleDb
+{
+	public enum OleDbType {
+		BigInt,
+		Binary,
+		Boolean,
+		BSTR,
+		Char,
+		Currency,
+		Date,
+		DBDate,
+		DBTime,
+		DBTimeStamp,
+		Decimal,
+		Double,
+		Empty,
+		Error,
+		Filetime,
+		Guid,
+		IDispatch,
+		Integer,
+		IUnknown,
+		LongVarBinary,
+		LongVarChar,
+		LongVarWChar,
+		Numeric,
+		PropVariant,
+		Single,
+		SmallInt,
+		TinyInt,
+		UnsignedBigInt,
+		UnsignedInt,
+		UnsignedSmallInt,
+		UnsignedTinyInt,
+		VarBinary,
+		VarChar,
+		Variant,
+		VarNumeric,
+		VarWChar,
+		WChar
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/TestGDA.cs b/mcs/class/System.Data/System.Data.OleDb/TestGDA.cs
new file mode 100644
index 00000000000..19eea663949
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/TestGDA.cs
@@ -0,0 +1,32 @@
+using System;
+using System.Data.OleDb;
+
+namespace Mono.Data.GDA.Test
+{
+	public class TestGDA
+	{
+		private IntPtr m_gdaClient = IntPtr.Zero;
+		private IntPtr m_gdaConnection = IntPtr.Zero;
+		
+		static void Main (string[] args)
+		{
+			TestGDA test = new TestGDA ();
+			
+			/* initialization */
+			libgda.gda_init ("TestGDA#", "0.1", args.Length, args);
+			test.m_gdaClient = libgda.gda_client_new ();
+
+			/* open connection */
+			test.m_gdaConnection = libgda.gda_client_open_connection (
+				test.m_gdaClient,
+				"PostgreSQL",
+				"", "");
+			if (test.m_gdaConnection != IntPtr.Zero) {
+				System.Console.Write ("Connection successful!");
+
+				/* close connection */
+				libgda.gda_connection_close (test.m_gdaConnection);
+			}
+		}       
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/TestOleDb.cs b/mcs/class/System.Data/System.Data.OleDb/TestOleDb.cs
new file mode 100644
index 00000000000..4defb7e4f89
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/TestOleDb.cs
@@ -0,0 +1,109 @@
+using System;
+using System.Data.OleDb;
+
+namespace System.Data.OleDb.Test
+{
+	public class TestOleDb
+	{
+		private OleDbConnection m_cnc;
+
+		private TestOleDb ()
+		{
+			OleDbCommand cmd;
+			
+			m_cnc = new OleDbConnection ("PostgreSQL");
+			m_cnc.Open ();
+
+			Console.WriteLine ("Connected to:");
+			Console.WriteLine (" Data Source: " + m_cnc.DataSource);
+			Console.WriteLine (" Database: " + m_cnc.Database);
+			Console.WriteLine (" Connection string: " + m_cnc.ConnectionString);
+			Console.WriteLine (" Provider: " + m_cnc.Provider);
+			Console.WriteLine (" Server version:" + m_cnc.ServerVersion);
+
+			/* create temporary table */
+			Console.WriteLine ("Creating temporary table...");
+			cmd = new OleDbCommand ("CREATE TABLE mono_test_table ( " +
+						" name varchar(25), email varchar(50), date_entered timestamp)",
+						m_cnc);
+			cmd.ExecuteNonQuery ();
+			InsertRow ("Mike Smith", "mike@smiths.com");
+			InsertRow ("Julie Andrews", "julie@hollywood.com");
+			InsertRow ("Michael Jordan", "michael@bulls.com");
+		}
+
+		void InsertRow (string name, string email)
+		{
+			OleDbCommand cmd;
+
+			cmd = new OleDbCommand ("INSERT INTO mono_test_table (name, email, date_entered) VALUES ('" +
+						name + "', '" + email +"', date 'now')", m_cnc);
+			Console.WriteLine ("Executing command '" + cmd.CommandText + "'");
+			cmd.ExecuteNonQuery ();
+
+		}
+		
+		void DisplayRow (OleDbDataReader reader)
+		{
+			for (int i = 0; i < reader.FieldCount; i++) {
+				Console.WriteLine (" " + reader.GetDataTypeName (i) + ": " +
+						   reader.GetValue (i).ToString ());
+			}
+		}
+		
+		void TestDataReader ()
+		{
+			int i = 0;
+			string sql = "SELECT * FROM mono_test_table";
+			
+			Console.WriteLine ("Executing SELECT command...");
+			OleDbCommand cmd = new OleDbCommand (sql, m_cnc);
+			OleDbDataReader reader = cmd.ExecuteReader ();
+
+			Console.WriteLine (" Recordset description:");
+			for (i = 0; i < reader.FieldCount; i++) {
+				Console.WriteLine ("  Field " + i + ": " +
+						   reader.GetName (i) + " (" +
+						   reader.GetDataTypeName (i) + ")");
+			}
+
+			Console.WriteLine ("Reading data...");
+			i = 0;
+			while (reader.Read ()) {
+				Console.WriteLine ("Row " + i + ":");
+				DisplayRow (reader);
+				i++;
+			}
+
+			reader.Close ();
+		}
+
+		void TestTransaction ()
+		{
+			Console.WriteLine ("Starting transaction...");
+			OleDbTransaction xaction = m_cnc.BeginTransaction ();
+
+			Console.WriteLine ("Aborting transaction...");
+			xaction.Rollback ();
+		}
+		
+		void Close ()
+		{
+			OleDbCommand cmd = new OleDbCommand ("DROP TABLE mono_test_table", m_cnc);
+			cmd.ExecuteNonQuery ();
+			m_cnc.Close ();
+		}
+
+		static void Main (string[] args)
+		{
+			try {
+				TestOleDb test = new TestOleDb ();
+				test.TestDataReader ();
+				test.TestTransaction ();
+				test.Close ();
+			} catch (Exception e) {
+				Console.WriteLine ("An error has occured: {0}", e.ToString ());
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.OleDb/libgda.cs b/mcs/class/System.Data/System.Data.OleDb/libgda.cs
new file mode 100644
index 00000000000..873dcf7f9cd
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.OleDb/libgda.cs
@@ -0,0 +1,276 @@
+//
+// System.Data.OleDb.libgda
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Rodrigo Moya, 2002
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+
+namespace System.Data.OleDb
+{
+	internal enum GdaCommandOptions {
+		IgnoreErrors = 1,
+		StopOnErrors = 1 << 1,
+		BadOption = 1 << 2,
+	};
+
+	internal enum GdaCommandType {
+		Sql = 0,
+		Xml = 1,
+		Procedure = 2,
+		Table = 3,
+		Schema = 4,
+		Invalid = 5
+	};
+
+	internal enum GdaValueType {
+		Null = 0,
+		Bigint = 1,
+		Binary = 2,
+		Boolean = 3,
+		Date = 4,
+		Double = 5,
+		GeometricPoint = 6,
+		Integer = 7,
+		List = 8,
+		Numeric = 9,
+		Single = 10,
+		Smallint = 11,
+		String = 12,
+		Time = 13,
+		Timestamp = 14,
+		Tinyint = 15,
+		Type = 16,
+		Unknown = 17
+	};
+
+	[StructLayout(LayoutKind.Sequential)]
+	internal class GdaDate
+	{
+		public short year;
+		public ushort month;
+		public ushort day;
+	}
+
+	[StructLayout(LayoutKind.Sequential)]
+	internal class GdaTime
+	{
+		public ushort hour;
+		public ushort minute;
+		public ushort second;
+		public long timezone;
+	}
+	
+	[StructLayout(LayoutKind.Sequential)]
+	internal class GdaTimestamp
+	{
+		public short year;
+		public ushort month;
+		public ushort day;
+		public ushort hour;
+		public ushort minute;
+		public ushort second;
+		public ulong fraction;
+		public long timezone;
+	}
+	
+	[StructLayout(LayoutKind.Sequential)]
+	internal class GdaList
+	{
+		public IntPtr data;
+		public IntPtr next;
+		public IntPtr prev;
+	}
+	
+	sealed internal class libgda
+	{
+		private static IntPtr gdaClient = IntPtr.Zero;
+
+		public static IntPtr GdaClient
+		{
+			get {
+				if (gdaClient == IntPtr.Zero)
+					gdaClient = gda_client_new ();
+
+				return gdaClient;
+			}
+		}
+
+		[DllImport("gobject-2.0",
+			   EntryPoint="g_object_unref")]
+		public static extern void FreeObject (IntPtr obj);
+
+		[DllImport("gda-2")]
+		public static extern void gda_init (string app_id, string version, int nargs, string[] args);
+
+		[DllImport("gda-2")]
+		public static extern GdaValueType gda_value_get_type (IntPtr value);
+
+		[DllImport("gda-2")]
+		public static extern long gda_value_get_bigint (IntPtr value);
+		
+		[DllImport("gda-2")]
+		public static extern bool gda_value_get_boolean (IntPtr value);
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_value_get_date (IntPtr value);
+		
+		[DllImport("gda-2")]
+		public static extern double gda_value_get_double (IntPtr value);
+
+		[DllImport("gda-2")]
+		public static extern int gda_value_get_integer (IntPtr value);
+		
+		[DllImport("gda-2")]
+		public static extern float gda_value_get_single (IntPtr value);
+		
+		[DllImport("gda-2")]
+		public static extern int gda_value_get_smallint (IntPtr value);
+
+		[DllImport("gda-2")]
+		public static extern string gda_value_get_string (IntPtr value);
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_value_get_time (IntPtr value);
+		
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_value_get_timestamp (IntPtr value);
+		
+		[DllImport("gda-2")]
+		public static extern byte gda_value_get_tinyint (IntPtr value);
+
+		[DllImport("gda-2")]
+		public static extern bool gda_value_is_null (IntPtr value);
+		
+		[DllImport("gda-2")]
+		public static extern string gda_value_stringify (IntPtr value);
+		
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_parameter_list_new ();
+
+		[DllImport("gda-2")]
+		public static extern string gda_type_to_string (GdaValueType type);
+		
+		[DllImport("gda-2")]
+		public static extern int gda_data_model_get_n_rows (IntPtr model);
+
+		[DllImport("gda-2")]
+		public static extern int gda_data_model_get_n_columns (IntPtr model);
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_data_model_get_value_at (IntPtr model, int col, int row);
+
+		[DllImport("gda-2")]
+		public static extern string gda_data_model_get_column_title (IntPtr model, int col);
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_data_model_describe_column (IntPtr model, int col);
+
+		[DllImport("gda-2")]
+		public static extern int gda_data_model_get_column_position (IntPtr model, string name);
+		
+		[DllImport("gda-2")]
+		public static extern void gda_field_attributes_free (IntPtr fa);
+
+		[DllImport("gda-2")]
+		public static extern string gda_field_attributes_get_name (IntPtr fa);
+
+		[DllImport("gda-2")]
+		public static extern GdaValueType gda_field_attributes_get_gdatype (IntPtr fa);
+		
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_client_new ();
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_client_open_connection (IntPtr client, string dsn, string username, string password);
+
+		[DllImport("gda-2")]
+		public static extern bool gda_connection_is_open (IntPtr cnc);
+		
+		[DllImport("gda-2")]
+		public static extern bool gda_connection_close (IntPtr cnc);
+
+		[DllImport("gda-2")]
+		public static extern string gda_connection_get_server_version (IntPtr cnc);
+		
+		[DllImport("gda-2")]
+		public static extern string gda_connection_get_database (IntPtr cnc);
+
+		[DllImport("gda-2")]
+		public static extern string gda_connection_get_dsn (IntPtr cnc);
+
+		[DllImport("gda-2")]
+		public static extern string gda_connection_get_cnc_string (IntPtr cnc);
+
+		[DllImport("gda-2")]
+		public static extern string gda_connection_get_provider (IntPtr cnc);
+
+		[DllImport("gda-2")]
+		public static extern string gda_connection_get_username (IntPtr cnc);
+
+		[DllImport("gda-2")]
+		public static extern string gda_connection_get_password (IntPtr cnc);
+
+		[DllImport("gda-2")]
+		public static extern bool gda_connection_change_database (IntPtr cnc, string name);
+		
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_transaction_new (string name);
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_transaction_get_name (IntPtr xaction);
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_transaction_set_name (IntPtr xaction, string name);
+	
+		[DllImport("gda-2")]
+		public static extern bool gda_connection_begin_transaction (IntPtr cnc, IntPtr xaction);
+
+		[DllImport("gda-2")]
+		public static extern bool gda_connection_commit_transaction (IntPtr cnc, IntPtr xaction);
+
+		[DllImport("gda-2")]
+		public static extern bool gda_connection_rollback_transaction (IntPtr cnc, IntPtr xaction);
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_connection_execute_command (IntPtr cnc, IntPtr cmd, IntPtr parameterList);
+		
+		[DllImport("gda-2")]
+		public static extern int gda_connection_execute_non_query (IntPtr cnc, IntPtr command, IntPtr parameterList);
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_connection_execute_single_command (IntPtr cnc, IntPtr command, IntPtr parameterList);
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_connection_get_errors (IntPtr cnc);
+
+		[DllImport("gda-2")]
+		public static extern IntPtr gda_command_new (string text, GdaCommandType type, GdaCommandOptions options);
+
+		[DllImport("gda-2")]
+		public static extern void gda_command_set_text (IntPtr cmd, string text);
+
+		[DllImport("gda-2")]
+		public static extern void gda_command_set_command_type (IntPtr cmd, GdaCommandType type);
+
+		[DllImport("gda-2")]
+		public static extern string gda_error_get_description (IntPtr error);
+
+		[DllImport("gda-2")]
+		public static extern long gda_error_get_number (IntPtr error);
+
+		[DllImport("gda-2")]
+		public static extern string gda_error_get_source (IntPtr error);
+		
+		[DllImport("gda-2")]
+		public static extern string gda_error_get_sqlstate (IntPtr error);
+		
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/ParmUtil.cs b/mcs/class/System.Data/System.Data.SqlClient/ParmUtil.cs
new file mode 100644
index 00000000000..3dabac7853e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/ParmUtil.cs
@@ -0,0 +1,176 @@
+//

+// ParmUtil.cs - utility to bind variables in a SQL statement to parameters in C# code

+//               This is in the PostgreSQL .NET Data provider in Mono

+//

+// Author: 

+//    Daniel Morgan <danmorg@sc.rr.com>

+//

+// (c)copyright 2002 Daniel Morgan

+//

+

+// comment DEBUG_ParmUtil for production, for debug messages, uncomment

+//#define DEBUG_ParmUtil

+

+using System;

+using System.Data;

+using System.Text;

+

+namespace System.Data.SqlClient {

+

+	enum PostgresBindVariableCharacter {

+		Semicolon,

+		At,

+		QuestionMark

+	}

+

+	public class ParmUtil {

+

+		private string sql = "";

+		private string resultSql = "";

+		private SqlParameterCollection parmsCollection = null;

+		

+		static private PostgresBindVariableCharacter PgbindChar = PostgresBindVariableCharacter.Semicolon;

+		static char bindChar;

+

+		// static constructor

+		static ParmUtil() {

+			switch(PgbindChar) {

+			case PostgresBindVariableCharacter.Semicolon:

+				bindChar = ':';

+				break;

+			case PostgresBindVariableCharacter.At:

+				bindChar = '@';

+				break;

+			case PostgresBindVariableCharacter.QuestionMark:

+				// this doesn't have named parameters,

+				// they must be in order

+				bindChar = '?';

+				break;

+			}

+		}

+				

+		public ParmUtil(string query, SqlParameterCollection parms) {

+			sql = query;

+			parmsCollection = parms;

+		}

+		

+		public string ResultSql {

+			get {

+				return resultSql;

+			}

+		}

+

+		// TODO: currently only works for input variables,

+		//       need to do input/output, output, and return

+		public string ReplaceWithParms() {

+

+			StringBuilder result = new StringBuilder();

+			char[] chars = sql.ToCharArray();

+			bool bStringConstFound = false;

+

+			for(int i = 0; i < chars.Length; i++) {

+				if(chars[i] == '\'') {

+					if(bStringConstFound == true)

+						bStringConstFound = false;

+					else

+						bStringConstFound = true;

+

+					result.Append(chars[i]);

+				}

+				else if(chars[i] == bindChar && 

+					bStringConstFound == false) {

+#if DEBUG_ParmUtil

+					Console.WriteLine("Bind Variable character found...");

+#endif					

+					StringBuilder parm = new StringBuilder();

+					i++;

+					while(i <= chars.Length) {

+						char ch;

+						if(i == chars.Length)

+							ch = ' '; // a space

+						else

+							ch = chars[i];

+

+#if DEBUG_ParmUtil						

+						Console.WriteLine("Is char Letter or digit?");

+#endif						

+						if(Char.IsLetterOrDigit(ch)) {

+#if DEBUG_ParmUtil

+							Console.WriteLine("Char IS letter or digit. " + 

+								"Now, append char to parm StringBuilder");

+#endif

+							parm.Append(ch);

+						}

+						else {

+#if DEBUG_ParmUtil

+                                                        Console.WriteLine("Char is NOT letter or char. " + 

+								"thus we got rest of bind variable name. ");

+								

+							// replace bind variable placeholder 

+							// with data value constant

+							Console.WriteLine("parm StringBuilder to string p...");

+#endif

+							string p = parm.ToString();

+#if DEBUG_ParmUtil

+							Console.WriteLine("calling BindReplace...");

+#endif							

+							bool found = BindReplace(result, p);

+#if DEBUG_ParmUtil

+							Console.WriteLine("    Found = " + found);

+#endif

+							if(found == true)

+								break;

+							else {						

+								// *** Error Handling

+								Console.WriteLine("Error: parameter not found: " + p);

+								return "";

+							}

+						}

+						i++;

+					}

+					i--;

+				}

+				else 

+					result.Append(chars[i]);

+			}

+			

+			resultSql = result.ToString();

+			return resultSql;

+		}

+

+		public bool BindReplace (StringBuilder result, string p) {

+			// bind variable

+			bool found = false;

+

+#if DEBUG_ParmUtil

+			Console.WriteLine("Does the parmsCollection contain the parameter???: " + p);

+#endif

+			if(parmsCollection.Contains(p) == true) {

+				// parameter found

+#if DEBUG_ParmUtil

+				Console.WriteLine("Parameter Found: " + p);

+#endif

+				SqlParameter prm = parmsCollection[p];

+

+#if DEBUG_ParmUtil																	

+				// DEBUG 

+				Console.WriteLine("          Value: " + prm.Value);

+				Console.WriteLine("      Direction: " + prm.Direction);

+#endif

+				// convert object to string and place

+				// into SQL

+				if(prm.Direction == ParameterDirection.Input) {

+					string strObj = PostgresHelper.

+						ObjectToString(prm.DbType, 

+								prm.Value);

+					result.Append(strObj);

+				}

+				else

+					result.Append(bindChar + p);

+

+				found = true;

+			}

+			return found;

+		}

+	}

+}

diff --git a/mcs/class/System.Data/System.Data.SqlClient/PostgresLibrary.cs b/mcs/class/System.Data/System.Data.SqlClient/PostgresLibrary.cs
new file mode 100644
index 00000000000..493afcd49e2
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/PostgresLibrary.cs
@@ -0,0 +1,475 @@
+//
+// System.Data.SqlClient.PostgresLibrary.cs  
+//
+// PInvoke methods to libpq
+// which is PostgreSQL client library
+//
+// May also contain enumerations,
+// data types, or wrapper methods.
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+// *** uncomment #define to get debug messages, comment for production ***
+//#define DEBUG_PostgresLibrary
+
+using System;
+using System.Data;
+using System.Runtime.InteropServices;
+using System.Diagnostics;
+using System.Collections;
+
+namespace System.Data.SqlClient {
+
+	/* IMPORTANT: DO NOT CHANGE ANY OF THESE ENUMS BELOW */
+	
+	internal enum ConnStatusType
+	{
+		CONNECTION_OK,
+		CONNECTION_BAD,
+		CONNECTION_STARTED,
+		CONNECTION_MADE,
+		CONNECTION_AWAITING_RESPONSE,
+		CONNECTION_AUTH_OK,			 
+		CONNECTION_SETENV		
+	} 
+
+	internal enum PostgresPollingStatusType
+	{
+		PGRES_POLLING_FAILED = 0,
+		PGRES_POLLING_READING,
+		PGRES_POLLING_WRITING,
+		PGRES_POLLING_OK,
+		PGRES_POLLING_ACTIVE
+	}
+
+	internal enum ExecStatusType
+	{
+		PGRES_EMPTY_QUERY = 0,
+		PGRES_COMMAND_OK,			
+		PGRES_TUPLES_OK,			
+		PGRES_COPY_OUT,				
+		PGRES_COPY_IN,				
+		PGRES_BAD_RESPONSE,			
+		PGRES_NONFATAL_ERROR,
+		PGRES_FATAL_ERROR
+	}
+
+	sealed internal class PostgresLibrary
+	{
+		#region PInvoke Functions
+
+		// pinvoke prototypes to PostgreSQL client library
+		// pq.dll on windows and libpq.so on linux
+
+		[DllImport("pq")]
+		public static extern IntPtr PQconnectStart (string conninfo);
+		// PGconn *PQconnectStart(const char *conninfo);
+
+		[DllImport("pq")]
+		public static extern PostgresPollingStatusType PQconnectPoll (IntPtr conn);
+		// PostgresPollingStatusType PQconnectPoll(PGconn *conn);	
+
+		[DllImport("pq")]
+		public static extern IntPtr PQconnectdb (string conninfo);
+		// PGconn *PQconnectdb(const char *conninfo);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQsetdbLogin (string pghost, 
+			string pgport, string pgoptions, 
+			string pgtty, string dbName, 
+			string login, string pwd);
+		// PGconn *PQsetdbLogin(const char *pghost, 
+		//		const char *pgport, const char *pgoptions, 
+		//		const char *pgtty, const char *dbName, 
+		//		const char *login, const char *pwd);
+
+		[DllImport("pq")]
+		public static extern void PQfinish (IntPtr conn);
+		// void PQfinish(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQconndefaults ();
+		// PQconninfoOption *PQconndefaults(void);
+
+		[DllImport("pq")]
+		public static extern void PQconninfoFree (IntPtr connOptions);
+		// void PQconninfoFree(PQconninfoOption *connOptions);
+
+		[DllImport("pq")]
+		public static extern int PQresetStart (IntPtr conn);
+		// int PQresetStart(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQresetPoll (IntPtr conn);
+		// PostgresPollingStatusType PQresetPoll(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern void PQreset (IntPtr conn);
+		// void PQreset(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQrequestCancel (IntPtr conn);
+		// int PQrequestCancel(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQdb (IntPtr conn);
+		// char *PQdb(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQuser (IntPtr conn);
+		// char *PQuser(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQpass (IntPtr conn);
+		// char *PQpass(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQhost (IntPtr conn);
+		// char *PQhost(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQport (IntPtr conn);
+		// char *PQport(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQtty (IntPtr conn);
+		// char *PQtty(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQoptions (IntPtr conn);
+		// char *PQoptions(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern ConnStatusType PQstatus (IntPtr conn);
+		// ConnStatusType PQstatus(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern string PQerrorMessage (IntPtr conn);
+		// char *PQerrorMessage(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQsocket (IntPtr conn);
+		// int PQsocket(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQbackendPID (IntPtr conn);
+		// int PQbackendPID(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQclientEncoding (IntPtr conn);
+		// int PQclientEncoding(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQsetClientEncoding (IntPtr conn,
+			string encoding);
+		// int PQsetClientEncoding(PGconn *conn, 
+		//		const char *encoding);
+
+		//FIXME: when loading, causes runtime exception
+		//[DllImport("pq")]
+		//public static extern IntPtr PQgetssl (IntPtr conn);
+		// SSL *PQgetssl(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern void PQtrace (IntPtr conn, 
+			IntPtr debug_port);
+		// void PQtrace(PGconn *conn, 
+		//		FILE *debug_port);
+
+		[DllImport("pq")]
+		public static extern void PQuntrace (IntPtr conn);
+		// void PQuntrace(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQsetNoticeProcessor (IntPtr conn,
+			IntPtr proc, IntPtr arg);
+		// PQnoticeProcessor PQsetNoticeProcessor(PGconn *conn, 
+		//		PQnoticeProcessor proc, void *arg);
+
+		[DllImport("pq")]
+		public static extern int PQescapeString (string to,
+                        string from, int length);
+		// size_t PQescapeString(char *to, 
+                //      const char *from, size_t length);
+
+		[DllImport("pq")]
+		public static extern string PQescapeBytea (string bintext,
+                        int binlen, IntPtr bytealen);
+		// unsigned char *PQescapeBytea(unsigned char *bintext, 
+                //      size_t binlen, size_t *bytealen);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQexec (IntPtr conn,
+                        string query);
+		// PGresult *PQexec(PGconn *conn, 
+                //      const char *query);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQnotifies (IntPtr conn);
+		// PGnotify *PQnotifies(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern void PQfreeNotify (IntPtr notify);
+		// void PQfreeNotify(PGnotify *notify);
+
+		[DllImport("pq")]
+		public static extern int PQsendQuery (IntPtr conn,
+                        string query);
+		// int PQsendQuery(PGconn *conn, 
+                //      const char *query);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQgetResult (IntPtr conn);
+		// PGresult *PQgetResult(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQisBusy (IntPtr conn);
+		// int PQisBusy(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQconsumeInput (IntPtr conn);
+		// int PQconsumeInput(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQgetline (IntPtr conn,
+                        string str, int length);
+		// int PQgetline(PGconn *conn,
+                //      char *string, int length);
+
+		[DllImport("pq")]
+		public static extern int PQputline (IntPtr conn,
+                        string str);
+		// int PQputline(PGconn *conn, 
+                //      const char *string);
+
+		[DllImport("pq")]
+		public static extern int PQgetlineAsync (IntPtr conn,
+                        string buffer, int bufsize);
+		// int PQgetlineAsync(PGconn *conn, char *buffer,
+                //      int bufsize);
+
+		[DllImport("pq")]
+		public static extern int PQputnbytes (IntPtr conn,
+                        string buffer, int nbytes);
+		// int PQputnbytes(PGconn *conn, 
+                //const char *buffer, int nbytes);
+
+		[DllImport("pq")]
+		public static extern int PQendcopy (IntPtr conn);
+		// int PQendcopy(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQsetnonblocking (IntPtr conn,
+                        int arg);
+		// int PQsetnonblocking(PGconn *conn, int arg);
+
+		[DllImport("pq")]
+		public static extern int PQisnonblocking (IntPtr conn);
+		// int PQisnonblocking(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern int PQflush (IntPtr conn);
+		// int PQflush(PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQfn (IntPtr conn, int fnid, 
+                        IntPtr result_buf, IntPtr result_len, 
+                        int result_is_int, IntPtr args,
+                        int nargs);
+		// PGresult *PQfn(PGconn *conn, int fnid, 
+                //      int *result_buf, int *result_len, 
+                //      int result_is_int, const PQArgBlock *args,
+                //      int nargs);
+
+		[DllImport("pq")]
+		public static extern ExecStatusType PQresultStatus (IntPtr res);
+		// ExecStatusType PQresultStatus(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQresStatus (ExecStatusType status);
+		// char *PQresStatus(ExecStatusType status);
+
+		[DllImport("pq")]
+		public static extern string PQresultErrorMessage (IntPtr res);
+		// char *PQresultErrorMessage(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQntuples (IntPtr res);
+		// int PQntuples(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQnfields (IntPtr res);
+		// int PQnfields(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQbinaryTuples (IntPtr res);
+		// int PQbinaryTuples(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQfname (IntPtr res,
+                        int field_num);
+		// char *PQfname(const PGresult *res,
+                //      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfnumber (IntPtr res,
+                        string field_name);
+		// int PQfnumber(const PGresult *res, 
+                //      const char *field_name);
+
+		[DllImport("pq")]
+		public static extern int PQftype (IntPtr res,
+                        int field_num);
+		// Oid PQftype(const PGresult *res,
+                //      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfsize (IntPtr res,
+                        int field_num);
+		// int PQfsize(const PGresult *res,
+                //      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfmod (IntPtr res, int field_num);
+		// int PQfmod(const PGresult *res, int field_num);
+
+		[DllImport("pq")]
+		public static extern string PQcmdStatus (IntPtr res);
+		// char *PQcmdStatus(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQoidStatus (IntPtr res);
+		// char *PQoidStatus(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQoidValue (IntPtr res);
+		// Oid PQoidValue(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQcmdTuples (IntPtr res);
+		// char *PQcmdTuples(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQgetvalue (IntPtr res,
+                        int tup_num, int field_num);
+		// char *PQgetvalue(const PGresult *res,
+                //      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQgetlength (IntPtr res,
+                        int tup_num, int field_num);
+		// int PQgetlength(const PGresult *res,
+                //      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQgetisnull (IntPtr res,
+                        int tup_num, int field_num);
+		// int PQgetisnull(const PGresult *res,
+                //      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern void PQclear (IntPtr res);
+		// void PQclear(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQmakeEmptyPGresult (IntPtr conn,
+                        IntPtr status);
+		// PGresult *PQmakeEmptyPGresult(PGconn *conn,
+                //      ExecStatusType status);
+
+		[DllImport("pq")]
+		public static extern void PQprint (IntPtr fout,
+                        IntPtr res, IntPtr ps);
+		// void PQprint(FILE *fout,
+                //      const PGresult *res, const PQprintOpt *ps);
+
+		[DllImport("pq")]
+		public static extern void PQdisplayTuples (IntPtr res,
+                        IntPtr fp, int fillAlign, string fieldSep, 
+                        int printHeader, int quiet);
+		// void PQdisplayTuples(const PGresult *res, 
+                //	FILE *fp, int fillAlign, const char *fieldSep, 
+                //	int printHeader, int quiet);
+
+		[DllImport("pq")]
+		public static extern void PQprintTuples (IntPtr res,
+			IntPtr fout, int printAttName, int terseOutput, 
+			int width);
+		// void PQprintTuples(const PGresult *res,
+		//	FILE *fout, int printAttName, int terseOutput, 
+		//	int width);						
+
+		[DllImport("pq")]
+		public static extern int lo_open (IntPtr conn,
+			int lobjId, int mode);
+		// int lo_open(PGconn *conn,
+		//	Oid lobjId, int mode);
+
+		[DllImport("pq")]
+		public static extern int lo_close (IntPtr conn, int fd);
+		// int lo_close(PGconn *conn, int fd);
+
+		[DllImport("pq")]
+		public static extern int lo_read (IntPtr conn,
+			int fd, string buf, int len);
+		// int lo_read(PGconn *conn,
+		//	int fd, char *buf, size_t len);
+
+		[DllImport("pq")]
+		public static extern int lo_write (IntPtr conn,
+			int fd, string buf, int len);
+		// int lo_write(PGconn *conn,
+		//	int fd, char *buf, size_t len);
+
+		[DllImport("pq")]
+		public static extern int lo_lseek (IntPtr conn,
+			int fd, int offset, int whence);
+		// int lo_lseek(PGconn *conn, 
+		//	int fd, int offset, int whence);
+
+		[DllImport("pq")]
+		public static extern int lo_creat (IntPtr conn,
+			int mode);
+		// Oid lo_creat(PGconn *conn,
+		//	int mode);
+
+		[DllImport("pq")]
+		public static extern int lo_tell (IntPtr conn, int fd);
+		// int lo_tell(PGconn *conn, int fd);
+
+		[DllImport("pq")]
+		public static extern int lo_unlink (IntPtr conn,
+			int lobjId);
+		// int lo_unlink(PGconn *conn,
+		//	Oid lobjId);
+
+		[DllImport("pq")]
+		public static extern int lo_import (IntPtr conn,
+			string filename);
+		// Oid lo_import(PGconn *conn,
+		//	const char *filename);
+
+		[DllImport("pq")]
+		public static extern int lo_export (IntPtr conn,
+			int lobjId, string filename);
+		// int lo_export(PGconn *conn,
+		//	Oid lobjId, const char *filename);
+
+		[DllImport("pq")]
+		public static extern int PQmblen (string s,
+			int encoding);
+		// int PQmblen(const unsigned char *s,
+		//	int encoding);
+
+		[DllImport("pq")]
+		public static extern int PQenv2encoding ();
+		// int PQenv2encoding(void);
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/PostgresTypes.cs b/mcs/class/System.Data/System.Data.SqlClient/PostgresTypes.cs
new file mode 100644
index 00000000000..6a086a82a42
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/PostgresTypes.cs
@@ -0,0 +1,512 @@
+//

+// PostgresTypes.cs - holding methods to convert 

+//                    between PostgreSQL types and .NET types

+//

+// Author:

+//     Daniel Morgan <danmorg@sc.rr.com>

+//

+// (c)copyright 2002 Daniel Morgan

+//

+

+// Note: this might become PostgresType and PostgresTypeCollection

+//       also, the PostgresTypes that exist as an inner internal class

+//       within SqlConnection maybe moved here in the future

+

+using System;

+using System.Collections;

+using System.Data;

+using System.Data.Common;

+using System.Data.SqlClient;

+using System.Text;

+

+namespace System.Data.SqlClient {

+

+	internal struct PostgresType {

+		public int oid;

+		public string typname;

+		public DbType dbType;

+	}

+
+	sealed internal class PostgresHelper {
+
+		// translates the PostgreSQL typname to System.Data.DbType
+		public static DbType TypnameToSqlDbType(string typname) {

+			DbType sqlType;

+			

+			// FIXME: use hashtable here?

+

+			switch(typname) {

+

+			case "abstime":

+				sqlType = DbType.Int32;

+				break;

+

+			case "aclitem":

+				sqlType = DbType.String;

+				break;

+

+			case "bit":

+				sqlType = DbType.String;

+				break;

+

+			case "bool":

+				sqlType = DbType.Boolean;

+				break;

+

+			case "box":

+				sqlType = DbType.String;

+				break;

+

+			case "bpchar":

+				sqlType = DbType.String;

+				break;

+

+			case "bytea":

+				sqlType = DbType.String;

+				break;

+

+			case "char":

+				sqlType = DbType.String;

+				break;

+

+			case "cidr":

+				sqlType = DbType.String;

+				break;

+

+			case "circle":

+				sqlType = DbType.String;

+				break;

+

+			case "date":

+				sqlType = DbType.Date;

+				break;

+

+			case "float4":

+				sqlType = DbType.Single;

+				break;

+

+			case "float8":

+				sqlType = DbType.Double;

+				break;

+

+			case "inet":

+				sqlType = DbType.String;

+				break;

+

+			case "int2":

+				sqlType = DbType.Int16;

+				break;

+

+			case "int4":

+				sqlType = DbType.Int32;

+				break;

+

+			case "int8":

+				sqlType = DbType.Int64;

+				break;

+

+			case "interval":

+				sqlType = DbType.String;

+				break;

+

+			case "line":

+				sqlType = DbType.String;

+				break;

+

+			case "lseg":

+				sqlType = DbType.String;

+				break;

+

+			case "macaddr":

+				sqlType = DbType.String;

+				break;

+

+			case "money":

+				sqlType = DbType.Decimal;

+				break;

+

+			case "name":

+				sqlType = DbType.String;

+				break;

+

+			case "numeric":

+				sqlType = DbType.Decimal;

+				break;

+

+			case "oid":

+				sqlType = DbType.Int32;

+				break;

+

+			case "path":

+				sqlType = DbType.String;

+				break;

+

+			case "point":

+				sqlType = DbType.String;

+				break;

+

+			case "polygon":

+				sqlType = DbType.String;

+				break;

+

+			case "refcursor":

+				sqlType = DbType.String;

+				break;

+

+			case "reltime":

+				sqlType = DbType.String;

+				break;

+

+			case "text":

+				sqlType = DbType.String;

+				break;

+

+			case "time":

+				sqlType = DbType.Time;

+				break;

+

+			case "timestamp":

+				sqlType = DbType.DateTime;

+				break;

+

+			case "timestamptz":

+				sqlType = DbType.DateTime;

+				break;

+

+			case "timetz":

+				sqlType = DbType.DateTime;

+				break;

+

+			case "tinterval":

+				sqlType = DbType.String;

+				break;

+

+			case "varbit":

+				sqlType = DbType.String;

+				break;

+

+			case "varchar":

+				sqlType = DbType.String;

+				break;

+

+			default:

+				sqlType = DbType.String;

+				break;

+			}

+			return sqlType;

+		}

+		

+		// Converts data value from database to .NET System type.

+		public static object ConvertDbTypeToSystem (DbType typ, String value) {
+			object obj = null;
+
+			// FIXME: more types need 
+			//        to be converted 
+			//        from PostgreSQL oid type
+			//        to .NET System.<type>
+
+			// FIXME: need to handle a NULL for each type
+			//       maybe setting obj to System.DBNull.Value ?
+
+			
+			if(value == null) {
+				//Console.WriteLine("ConvertDbTypeToSystemDbType typ: " +
+				//	typ + " value is null");
+				return null;
+			}
+			else if(value.Equals("")) {
+				//Console.WriteLine("ConvertDbTypeToSystemDbType typ: " +
+				//	typ + " value is string empty");
+				return null;
+			}
+			
+			//Console.WriteLine("ConvertDbTypeToSystemDbType typ: " +
+			//	typ + " value: " + value);
+
+			// Date, Time, and DateTime 
+			// are parsed based on ISO format
+			// "YYYY-MM-DD hh:mi:ss.ms"
+
+			switch(typ) {
+			case DbType.String:
+				obj = String.Copy(value); 
+				break;
+			case DbType.Boolean:
+				obj = value.Equals("t");
+				break;
+			case DbType.Int16:

+				obj = Int16.Parse(value);

+				break;

+			case DbType.Int32:

+				obj = Int32.Parse(value);

+				break;

+			case DbType.Int64:

+				obj = Int64.Parse(value);

+				break;

+			case DbType.Decimal:

+				obj = Decimal.Parse(value);

+				break;

+			case DbType.Single:

+				obj = Single.Parse(value);

+				break;

+			case DbType.Double:

+				obj = Double.Parse(value);

+				break;

+			case DbType.Date:

+				String[] sd = value.Split(new Char[] {'-'});

+				obj = new DateTime(

+					Int32.Parse(sd[0]), Int32.Parse(sd[1]), Int32.Parse(sd[2]),

+					0,0,0);

+				break;

+			case DbType.Time:

+				String[] st = value.Split(new Char[] {':'});

+				obj = new DateTime(0001,01,01,

+					Int32.Parse(st[0]),Int32.Parse(st[1]),Int32.Parse(st[2]));

+				break;

+			case DbType.DateTime:

+				Int32 YYYY,MM,DD,hh,mi,ss,ms;

+				YYYY = Int32.Parse(value.Substring(0,4));

+				MM = Int32.Parse(value.Substring(5,2));

+				DD = Int32.Parse(value.Substring(8,2));

+				hh = Int32.Parse(value.Substring(11,2));

+				mi = Int32.Parse(value.Substring(14,2));

+				ss = Int32.Parse(value.Substring(17,2));

+				ms = Int32.Parse(value.Substring(20,2));

+				obj = new DateTime(YYYY,MM,DD,hh,mi,ss,ms);

+				break;

+			default:

+				obj = String.Copy(value);

+				break;

+			}
+
+			return obj;
+		}
+		
+		// Translates System.Data.DbType to System.Type
+		public static Type DbTypeToSystemType (DbType dType) {
+			// FIXME: more types need 
+			//        to be mapped
+			//        from PostgreSQL oid type
+			//        to .NET System.<type>
+
+			Type typ = null;
+
+			switch(dType) {
+			case DbType.String:
+				typ = typeof(String);
+				break;
+			case DbType.Boolean:
+				typ = typeof(Boolean);
+				break;
+			case DbType.Int16: 

+				typ = typeof(Int16);

+				break;

+			case DbType.Int32:

+				typ = typeof(Int32);

+				break;

+			case DbType.Int64:

+				typ = typeof(Int64);

+				break;

+			case DbType.Decimal:

+				typ = typeof(Decimal);

+				break;

+			case DbType.Single:

+				typ = typeof(Single);

+				break;

+			case DbType.Double:

+				typ = typeof(Double);

+				break;

+			case DbType.Date:

+			case DbType.Time:

+			case DbType.DateTime:

+				typ = typeof(DateTime);

+				break;

+			default:

+				typ = typeof(String);

+				break;

+			}
+			return typ;
+		}
+
+		// Find DbType for oid
+		// which requires a look up of PostgresTypes
+		// DbType <-> typname <-> oid
+		public static string OidToTypname (int oid, ArrayList pgTypes) {
+			// FIXME: more types need 
+			//        to be mapped
+			//        from PostgreSQL oid type
+			//        to .NET System.<type>
+			
+			string typname = "text"; // default
+			int i;
+			for(i = 0; i < pgTypes.Count; i++) {
+				PostgresType pt = (PostgresType) pgTypes[i];
+				if(pt.oid == oid) {
+					typname = pt.typname;
+					break; 
+				}
+			}
+
+			return typname;
+		}
+
+		// Convert a .NET System value type (Int32, String, Boolean, etc)
+		// to a string that can be included within a SQL statement.
+		// This is to methods provides the parameters support
+		// for the PostgreSQL .NET Data provider
+		public static string ObjectToString(DbType dbtype, object obj) {

+			

+			// TODO: how do we handle a NULL?

+			//if(isNull == true)

+			//	return "NULL";

+

+			string s;

+

+			// Date, Time, and DateTime are expressed in ISO format

+			// which is "YYYY-MM-DD hh:mm:ss.ms";

+			DateTime dt;

+			StringBuilder sb;

+

+			const string zero = "0";

+

+			switch(dbtype) {

+			case DbType.String:
+				s = "'" + obj + "'";
+				break;
+			case DbType.Boolean:
+				if((bool)obj == true)
+					s = "'t'";
+				else
+					s = "'f'";
+				break;
+			case DbType.Int16:

+				s = obj.ToString();

+				break;

+			case DbType.Int32:

+				s = obj.ToString();

+				break;

+			case DbType.Int64:

+				s = obj.ToString();

+				break;

+			case DbType.Decimal:

+				s = obj.ToString();

+				break;

+			case DbType.Single:

+				s = obj.ToString();

+				break;

+			case DbType.Double:

+				s = obj.ToString();

+				break;

+			case DbType.Date:

+				dt = (DateTime) obj;

+				sb = new StringBuilder();

+				sb.Append('\'');

+				// year

+				if(dt.Year < 10)

+					sb.Append("000" + dt.Year);

+				else if(dt.Year < 100)

+					sb.Append("00" + dt.Year);

+				else if(dt.Year < 1000)

+					sb.Append("0" + dt.Year);

+				else

+					sb.Append(dt.Year);

+				sb.Append("-");

+				// month

+				if(dt.Month < 10)

+					sb.Append(zero + dt.Month);

+				else

+					sb.Append(dt.Month);

+				sb.Append("-");

+				// day

+				if(dt.Day < 10)

+					sb.Append(zero + dt.Day);

+				else

+					sb.Append(dt.Day);

+				sb.Append('\'');

+				s = sb.ToString();

+				break;

+			case DbType.Time:

+				dt = (DateTime) obj;

+				sb = new StringBuilder();

+				sb.Append('\'');

+				// hour

+				if(dt.Hour < 10)

+					sb.Append(zero + dt.Hour);

+				else

+					sb.Append(dt.Hour);

+				sb.Append(":");

+				// minute

+				if(dt.Minute < 10)

+					sb.Append(zero + dt.Minute);

+				else

+					sb.Append(dt.Minute);

+				sb.Append(":");

+				// second

+				if(dt.Second < 10)

+					sb.Append(zero + dt.Second);

+				else

+					sb.Append(dt.Second);

+				sb.Append('\'');

+				s = sb.ToString();

+				break;

+			case DbType.DateTime:

+				dt = (DateTime) obj;

+				sb = new StringBuilder();

+				sb.Append('\'');

+				// year

+				if(dt.Year < 10)

+					sb.Append("000" + dt.Year);

+				else if(dt.Year < 100)

+					sb.Append("00" + dt.Year);

+				else if(dt.Year < 1000)

+					sb.Append("0" + dt.Year);

+				else

+					sb.Append(dt.Year);

+				sb.Append("-");

+				// month

+				if(dt.Month < 10)

+					sb.Append(zero + dt.Month);

+				else

+					sb.Append(dt.Month);

+				sb.Append("-");

+				// day

+				if(dt.Day < 10)

+					sb.Append(zero + dt.Day);

+				else

+					sb.Append(dt.Day);

+				sb.Append(" ");

+				// hour

+				if(dt.Hour < 10)

+					sb.Append(zero + dt.Hour);

+				else

+					sb.Append(dt.Hour);

+				sb.Append(":");

+				// minute

+				if(dt.Minute < 10)

+					sb.Append(zero + dt.Minute);

+				else

+					sb.Append(dt.Minute);

+				sb.Append(":");

+				// second

+				if(dt.Second < 10)

+					sb.Append(zero + dt.Second);

+				else

+					sb.Append(dt.Second);

+				sb.Append(".");

+				// millisecond

+				if(dt.Millisecond < 10)

+					sb.Append(zero + dt.Millisecond);

+				else

+					sb.Append(dt.Millisecond);

+				sb.Append('\'');

+				s = sb.ToString();

+				break;

+			default:

+				// default to DbType.String

+				s = "'" + obj + "'";

+				break;

+			}
+			return s;	
+		}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs
new file mode 100644
index 00000000000..20b9e02a6d0
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermission.cs
@@ -0,0 +1,78 @@
+//
+// System.Data.SqlClient.SqlClientPermission.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Data.SqlClient {
+
+	public sealed class SqlClientPermission : DBDataPermission {
+		
+		[MonoTODO]
+		public SqlClientPermission() {
+			// FIXME: do constructor
+		}
+
+		[MonoTODO]
+		public SqlClientPermission(PermissionState state) {
+			// FIXME: do constructor
+		}
+
+		[MonoTODO]
+		public SqlClientPermission(PermissionState state,
+			bool allowBlankPassword) { 
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Copy() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void FromXml(SecurityElement 
+					securityElement) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Intersect(IPermission target)  {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsSubsetOf(IPermission target) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override string ToString() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override SecurityElement ToXml() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Union(IPermission target) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		~SqlClientPermission() {
+			// FIXME: destructor to release resources
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermissionAttribute.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermissionAttribute.cs
new file mode 100644
index 00000000000..149613c5f2e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlClientPermissionAttribute.cs
@@ -0,0 +1,46 @@
+//
+// System.Data.SqlClient.SqlClientPermissionAttribute.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Data.SqlClient {
+
+	[AttributeUsage(AttributeTargets.Assembly    | 
+			AttributeTargets.Class 	     | 
+			AttributeTargets.Struct      | 
+			AttributeTargets.Constructor |
+			AttributeTargets.Method)]
+	[Serializable]
+	public sealed class SqlClientPermissionAttribute :
+		DBDataPermissionAttribute {
+
+		[MonoTODO]
+		public SqlClientPermissionAttribute(SecurityAction action) : 
+			base(action)
+		{
+			// FIXME: do constructor
+		}
+
+		[MonoTODO]
+		public override IPermission CreatePermission() {
+			throw new NotImplementedException ();
+		}
+
+		//[MonoTODO]
+		//~SqlClientPermissionAttribute() {
+		//	// FIXME: destructor to release resources
+		//}
+	}
+
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
new file mode 100644
index 00000000000..af2771c3fa2
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlCommand.cs
@@ -0,0 +1,928 @@
+//
+// System.Data.SqlClient.SqlCommand.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc 2002 http://www.ximian.com/
+// (C) Daniel Morgan, 2002
+// (C) Copyright 2002 Tim Coleman
+//
+// Credits:
+//    SQL and concepts were used from libgda 0.8.190 (GNOME Data Access)

+//    http://www.gnome-db.org/

+//    with permission from the authors of the

+//    PostgreSQL provider in libgda:

+//        Michael Lausch <michael@lausch.at>
+//        Rodrigo Moya <rodrigo@gnome-db.org>
+//        Vivien Malerba <malerba@gnome-db.org>
+//        Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+//
+
+// use #define DEBUG_SqlCommand if you want to spew debug messages
+// #define DEBUG_SqlCommand
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Xml;
+
+namespace System.Data.SqlClient {
+	/// <summary>
+	/// Represents a SQL statement that is executed 
+	/// while connected to a SQL database.
+	/// </summary>
+	// public sealed class SqlCommand : Component, IDbCommand, ICloneable
+	public sealed class SqlCommand : IDbCommand {
+
+		#region Fields
+
+		private string sql = "";
+		private int timeout = 30; 
+		// default is 30 seconds 
+		// for command execution
+
+		private SqlConnection conn = null;
+		private SqlTransaction trans = null;
+		private CommandType cmdType = CommandType.Text;
+		private bool designTime = false;
+		private SqlParameterCollection parmCollection = new 
+			SqlParameterCollection();
+
+		// SqlDataReader state data for ExecuteReader()
+		private SqlDataReader dataReader = null;
+		private string[] queries = null;
+		private int currentQuery = -1;
+		private CommandBehavior cmdBehavior = CommandBehavior.Default;
+
+		private ParmUtil parmUtil = null;
+		
+		#endregion // Fields
+
+		#region Constructors
+
+		public SqlCommand() {
+			sql = "";
+		}
+
+		public SqlCommand (string cmdText) {
+			sql = cmdText;
+		}
+
+		public SqlCommand (string cmdText, SqlConnection connection) {
+			sql = cmdText;
+			conn = connection;
+		}
+
+		public SqlCommand (string cmdText, SqlConnection connection, 
+			SqlTransaction transaction) {
+			sql = cmdText;
+			conn = connection;
+			trans = transaction;
+		}
+
+		#endregion // Constructors
+
+		#region Methods
+
+		[MonoTODO]
+		public void Cancel () {
+			// FIXME: use non-blocking Exec for this
+			throw new NotImplementedException ();
+		}
+
+		// FIXME: is this the correct way to return a stronger type?
+		[MonoTODO]
+		IDbDataParameter IDbCommand.CreateParameter () {
+			return CreateParameter ();
+		}
+
+		[MonoTODO]
+		public SqlParameter CreateParameter () {
+			return new SqlParameter ();
+		}
+
+		public int ExecuteNonQuery () {	
+			IntPtr pgResult; // PGresult
+			int rowsAffected = -1;
+			ExecStatusType execStatus;
+			String rowsAffectedString;
+			string query;
+
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnnectionState is not Open");
+
+			query = TweakQuery(sql, cmdType);
+
+			// FIXME: PQexec blocks 
+			// while PQsendQuery is non-blocking
+			// which is better to use?
+			// int PQsendQuery(PGconn *conn,
+			//        const char *query);
+
+			// execute SQL command
+			// uses internal property to get the PGConn IntPtr
+			pgResult = PostgresLibrary.
+				PQexec (conn.PostgresConnection, query);
+
+			execStatus = PostgresLibrary.
+				PQresultStatus (pgResult);
+			
+			if(execStatus == ExecStatusType.PGRES_COMMAND_OK ||
+				execStatus == ExecStatusType.PGRES_TUPLES_OK ) {
+
+				rowsAffectedString = PostgresLibrary.
+					PQcmdTuples (pgResult);
+
+				if(rowsAffectedString != null)
+					if(rowsAffectedString.Equals("") == false)
+						rowsAffected = int.Parse(rowsAffectedString);
+
+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+			}
+			else {
+				String errorMessage;
+				
+				errorMessage = PostgresLibrary.
+					PQresStatus(execStatus);
+
+				errorMessage += " " + PostgresLibrary.

+					PQresultErrorMessage(pgResult);

+

+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+

+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					conn.DataSource, "SqlCommand", 0);

+			}
+			
+			return rowsAffected;
+		}
+		
+		[MonoTODO]
+		IDataReader IDbCommand.ExecuteReader () {
+			return ExecuteReader ();
+		}
+
+		[MonoTODO]
+		public SqlDataReader ExecuteReader () {
+			return ExecuteReader(CommandBehavior.Default);
+		}
+
+		[MonoTODO]
+		IDataReader IDbCommand.ExecuteReader (
+			CommandBehavior behavior) {
+			return ExecuteReader (behavior);
+		}
+
+		[MonoTODO]
+		public SqlDataReader ExecuteReader (CommandBehavior behavior) 
+		{
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnectionState is not Open");
+
+			cmdBehavior = behavior;
+
+			queries = null;
+			currentQuery = -1;
+			dataReader = new SqlDataReader(this);
+
+			queries = sql.Split(new Char[] {';'});			
+
+			dataReader.NextResult();
+					
+			return dataReader;
+		}
+
+		internal SqlResult NextResult() 
+		{
+			SqlResult res = new SqlResult();
+			res.Connection = this.Connection;
+			res.Behavior = cmdBehavior;
+			string statement;
+		
+			currentQuery++;
+
+			res.CurrentQuery = currentQuery;
+
+			if(currentQuery < queries.Length && queries[currentQuery].Equals("") == false) {
+				res.SQL = queries[currentQuery];
+				statement = TweakQuery(queries[currentQuery], cmdType);
+				ExecuteQuery(statement, res);
+				res.ResultReturned = true;
+			}
+			else {
+				res.ResultReturned = false;
+			}
+
+			return res;
+		}
+
+		private string TweakQuery(string query, CommandType commandType) {
+			string statement = "";
+			StringBuilder td;
+
+#if DEBUG_SqlCommand
+			Console.WriteLine("---------[][] TweakQuery() [][]--------");
+			Console.WriteLine("CommandType: " + commandType + " CommandBehavior: " + cmdBehavior);
+			Console.WriteLine("SQL before command type: " + query);
+#endif						
+			// finish building SQL based on CommandType
+			switch(commandType) {
+			case CommandType.Text:
+				statement = query;
+				break;
+			case CommandType.StoredProcedure:
+				statement = 
+					"SELECT " + query + "()";
+				break;
+			case CommandType.TableDirect:
+				// NOTE: this is for the PostgreSQL provider
+				//       and for OleDb, according to the docs,
+				//       an exception is thrown if you try to use
+				//       this with SqlCommand
+				string[] directTables = query.Split(
+					new Char[] {','});	
+										 
+				td = new StringBuilder("SELECT * FROM ");
+				
+				for(int tab = 0; tab < directTables.Length; tab++) {
+					if(tab > 0)
+						td.Append(',');
+					td.Append(directTables[tab]);
+					// FIXME: if multipe tables, how do we
+					//        join? based on Primary/Foreign Keys?
+					//        Otherwise, a Cartesian Product happens
+				}
+				statement = td.ToString();
+				break;
+			default:
+				// FIXME: throw an exception?
+				statement = query;
+				break;
+			}
+#if DEBUG_SqlCommand			
+			Console.WriteLine("SQL after command type: " + statement);
+#endif
+			// TODO: this parameters utility
+			//       currently only support input variables
+			//       need todo output, input/output, and return.
+#if DEBUG_SqlCommand
+			Console.WriteLine("using ParmUtil in TweakQuery()...");
+#endif
+			parmUtil = new ParmUtil(statement, parmCollection);
+#if DEBUG_SqlCommand
+			Console.WriteLine("ReplaceWithParms...");
+#endif
+
+			statement = parmUtil.ReplaceWithParms();
+
+#if DEBUG_SqlCommand
+			Console.WriteLine("SQL after ParmUtil: " + statement);
+#endif	
+			return statement;
+		}
+
+		private void ExecuteQuery (string query, SqlResult res)
+		{			
+			IntPtr pgResult;
+		
+			ExecStatusType execStatus;	
+
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnectionState is not Open");
+
+			// FIXME: PQexec blocks 
+			// while PQsendQuery is non-blocking
+			// which is better to use?
+			// int PQsendQuery(PGconn *conn,
+			//        const char *query);
+
+			// execute SQL command
+			// uses internal property to get the PGConn IntPtr
+			pgResult = PostgresLibrary.
+				PQexec (conn.PostgresConnection, query);
+
+			execStatus = PostgresLibrary.
+				PQresultStatus (pgResult);
+			
+			res.ExecStatus = execStatus;
+
+			if(execStatus == ExecStatusType.PGRES_TUPLES_OK ||
+				execStatus == ExecStatusType.PGRES_COMMAND_OK) {
+
+				res.BuildTableSchema(pgResult);
+			}
+			else {
+				String errorMessage;
+				
+				errorMessage = PostgresLibrary.
+					PQresStatus(execStatus);
+
+				errorMessage += " " + PostgresLibrary.

+					PQresultErrorMessage(pgResult);

+

+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+

+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					conn.DataSource, "SqlCommand", 0);

+			}
+		}
+
+		// since SqlCommand has resources so SqlDataReader
+		// can do Read() and NextResult(), need to free
+		// those resources.  Also, need to allow this SqlCommand
+		// and this SqlConnection to do things again.
+		internal void CloseReader() {
+			dataReader = null;
+			queries = null;
+
+			if((cmdBehavior & CommandBehavior.CloseConnection) == CommandBehavior.CloseConnection) {
+				conn.CloseReader(true);
+			}
+			else {
+				conn.CloseReader(false);
+			}
+		}
+
+		// only meant to be used between SqlConnectioin,
+		// SqlCommand, and SqlDataReader
+		internal void OpenReader(SqlDataReader reader) {
+			conn.OpenReader(reader);
+		}
+
+		/// <summary>

+		/// ExecuteScalar is used to retrieve one object
+		/// from one result set 

+		/// that has one row and one column.

+		/// It is lightweight compared to ExecuteReader.

+		/// </summary>
+		[MonoTODO]
+		public object ExecuteScalar () {
+			IntPtr pgResult; // PGresult
+			ExecStatusType execStatus;	
+			object obj = null; // return
+			int nRow = 0; // first row
+			int nCol = 0; // first column
+			String value;
+			int nRows;
+			int nFields;
+			string query;
+
+			if(conn.State != ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnnectionState is not Open");
+
+			query = TweakQuery(sql, cmdType);
+
+			// FIXME: PQexec blocks 
+			// while PQsendQuery is non-blocking
+			// which is better to use?
+			// int PQsendQuery(PGconn *conn,
+			//        const char *query);
+
+			// execute SQL command
+			// uses internal property to get the PGConn IntPtr
+			pgResult = PostgresLibrary.
+				PQexec (conn.PostgresConnection, query);
+
+			execStatus = PostgresLibrary.
+				PQresultStatus (pgResult);
+			if(execStatus == ExecStatusType.PGRES_COMMAND_OK) {
+				// result was a SQL Command 
+
+				// close result set
+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+
+				return null; // return null reference
+			}
+			else if(execStatus == ExecStatusType.PGRES_TUPLES_OK) {
+				// result was a SQL Query
+
+				nRows = PostgresLibrary.
+					PQntuples(pgResult);
+
+				nFields = PostgresLibrary.
+					PQnfields(pgResult);
+
+				if(nRows > 0 && nFields > 0) {
+
+					// get column name
+					//String fieldName;
+					//fieldName = PostgresLibrary.
+					//	PQfname(pgResult, nCol);
+
+					int oid;
+					string sType;
+					DbType dbType;
+					// get PostgreSQL data type (OID)
+					oid = PostgresLibrary.
+						PQftype(pgResult, nCol);
+					sType = PostgresHelper.
+						OidToTypname (oid, conn.Types);
+					dbType = PostgresHelper.
+						TypnameToSqlDbType(sType);
+
+					int definedSize;
+					// get defined size of column
+					definedSize = PostgresLibrary.
+						PQfsize(pgResult, nCol);
+
+					// get data value
+					value = PostgresLibrary.
+						PQgetvalue(
+						pgResult,
+						nRow, nCol);
+
+					int columnIsNull;
+					// is column NULL?
+					columnIsNull = PostgresLibrary.
+						PQgetisnull(pgResult,
+						nRow, nCol);
+
+					int actualLength;
+					// get Actual Length
+					actualLength = PostgresLibrary.
+						PQgetlength(pgResult,
+						nRow, nCol);
+						
+					obj = PostgresHelper.
+						ConvertDbTypeToSystem (
+						dbType,
+						value);
+				}
+
+				// close result set
+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+
+			}
+			else {
+				String errorMessage;
+				
+				errorMessage = PostgresLibrary.
+					PQresStatus(execStatus);
+
+				errorMessage += " " + PostgresLibrary.

+					PQresultErrorMessage(pgResult);

+

+				PostgresLibrary.PQclear (pgResult);
+				pgResult = IntPtr.Zero;
+

+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					conn.DataSource, "SqlCommand", 0);

+			}
+					
+			return obj;
+		}
+
+		[MonoTODO]
+		public XmlReader ExecuteXmlReader () {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Prepare () {
+			// FIXME: parameters have to be implemented for this
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public SqlCommand Clone () {
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+
+		#region Properties
+
+		public string CommandText {
+			get { 
+				return sql; 
+			}
+
+			set { 
+				sql = value; 
+			}
+		}
+
+		public int CommandTimeout {
+			get { 
+				return timeout;  
+			}
+			
+			set {
+				// FIXME: if value < 0, throw
+				// ArgumentException
+				// if (value < 0)
+				//	throw ArgumentException;
+				timeout = value;
+			}
+		}
+
+		public CommandType CommandType	{
+			get {
+				return cmdType;
+			}
+
+			set { 
+				cmdType = value;
+			}
+		}
+
+		// FIXME: for property Connection, is this the correct
+		//        way to handle a return of a stronger type?
+		IDbConnection IDbCommand.Connection {
+			get { 
+				return Connection;
+			}
+
+			set { 
+				// FIXME: throw an InvalidOperationException
+				// if the change was during a 
+				// transaction in progress
+
+				// csc
+				Connection = (SqlConnection) value; 
+				// mcs
+				// Connection = value; 
+				
+				// FIXME: set Transaction property to null
+			}
+		}
+		
+		public SqlConnection Connection {
+			get { 
+				// conn defaults to null
+				return conn;
+			}
+
+			set { 
+				// FIXME: throw an InvalidOperationException
+				// if the change was during 
+				// a transaction in progress
+				conn = value; 
+				// FIXME: set Transaction property to null
+			}
+		}
+
+		public bool DesignTimeVisible {
+			get {
+				return designTime;
+			} 
+			
+			set{
+				designTime = value;
+			}
+		}
+
+		// FIXME; for property Parameters, is this the correct
+		//        way to handle a stronger return type?
+		IDataParameterCollection IDbCommand.Parameters	{
+			get { 
+				return Parameters;
+			}
+		}
+
+		public SqlParameterCollection Parameters {
+			get { 
+				return parmCollection;
+			}
+		}
+
+		// FIXME: for property Transaction, is this the correct
+		//        way to handle a return of a stronger type?
+		IDbTransaction IDbCommand.Transaction 	{
+			get { 
+				return Transaction;
+			}
+
+			set { 
+				// FIXME: error handling - do not allow
+				// setting of transaction if transaction
+				// has already begun
+
+				// csc
+				Transaction = (SqlTransaction) value;
+				// mcs
+				// Transaction = value; 
+			}
+		}
+
+		public SqlTransaction Transaction {
+			get { 
+				return trans; 
+			}
+
+			set { 
+				// FIXME: error handling
+				trans = value; 
+			}
+		}	
+
+		[MonoTODO]
+		public UpdateRowSource UpdatedRowSource	{
+			// FIXME: do this once DbDataAdaptor 
+			// and DataRow are done
+			get { 		
+				throw new NotImplementedException (); 
+			}
+			set { 
+				throw new NotImplementedException (); 
+			}
+		}
+
+		#endregion // Properties
+
+		#region Inner Classes
+
+		#endregion // Inner Classes
+
+		#region Destructors
+
+		[MonoTODO]
+		public void Dispose() {
+			// FIXME: need proper way to release resources
+			// Dispose(true);
+		}
+
+		[MonoTODO]
+		~SqlCommand() {
+			// FIXME: need proper way to release resources
+			// Dispose(false);
+		}
+
+		#endregion //Destructors
+	}
+
+	// SqlResult is used for passing Result Set data 
+	// from SqlCommand to SqlDataReader
+	internal class SqlResult {
+
+		private DataTable dataTableSchema = null; // only will contain the schema
+		private IntPtr pg_result = IntPtr.Zero; // native PostgreSQL PGresult
+		private int rowCount = 0; 
+		private int fieldCount = 0;
+		private string[] pgtypes = null; // PostgreSQL types (typname)
+		private bool resultReturned = false;
+		private SqlConnection con = null;
+		private int rowsAffected = -1;
+		private ExecStatusType execStatus = ExecStatusType.PGRES_FATAL_ERROR;
+		private int currentQuery = -1;
+		private string sql = "";
+		private CommandBehavior cmdBehavior = CommandBehavior.Default;
+
+		internal CommandBehavior Behavior {
+			get {
+				return cmdBehavior;
+			}
+			set {
+				cmdBehavior = value;
+			}
+		}
+
+		internal string SQL {
+			get {
+				return sql;
+			}
+			set {
+				sql = value;
+			}
+		}
+
+		internal ExecStatusType ExecStatus {
+			get {
+				return execStatus;
+			}
+			set {
+				execStatus = value;
+			}
+		}
+
+		internal int CurrentQuery {
+			get {
+				return currentQuery;
+			}
+
+			set {
+				currentQuery = value;
+			}
+
+		}
+
+		internal SqlConnection Connection {
+			get {
+				return con;
+			}
+
+			set {
+				con = value;
+			}
+		}
+
+		internal int RecordsAffected {
+			get {
+				return rowsAffected;
+			}
+		}
+
+		internal bool ResultReturned {
+			get {
+				return resultReturned;
+			}
+			set {
+				resultReturned = value;
+			}
+		}
+
+		internal DataTable Table {
+			get { 
+				return dataTableSchema;
+			}
+		}
+
+		internal IntPtr PgResult {
+			get {
+				return pg_result;
+			}
+		}
+
+		internal int RowCount {
+			get {
+				return rowCount;
+			}
+		}
+
+		internal int FieldCount {
+			get {
+				return fieldCount;
+			}
+		}
+
+		internal string[] PgTypes {
+			get {
+				return pgtypes;
+			}
+		}
+
+		internal void BuildTableSchema (IntPtr pgResult) {
+			pg_result = pgResult;
+			
+			// need to set IDataReader.RecordsAffected property
+			string rowsAffectedString;
+			rowsAffectedString = PostgresLibrary.
+				PQcmdTuples (pgResult);
+			if(rowsAffectedString != null)
+				if(rowsAffectedString.Equals("") == false)
+					rowsAffected = int.Parse(rowsAffectedString);
+			
+			// Only Results from SQL SELECT Queries 
+			// get a DataTable for schema of the result
+			// otherwise, DataTable is null reference
+			if(execStatus == ExecStatusType.PGRES_TUPLES_OK) {
+
+				dataTableSchema = new DataTable ();
+				dataTableSchema.Columns.Add ("ColumnName", typeof (string));
+				dataTableSchema.Columns.Add ("ColumnOrdinal", typeof (int));
+				dataTableSchema.Columns.Add ("ColumnSize", typeof (int));
+				dataTableSchema.Columns.Add ("NumericPrecision", typeof (int));
+				dataTableSchema.Columns.Add ("NumericScale", typeof (int));
+				dataTableSchema.Columns.Add ("IsUnique", typeof (bool));
+				dataTableSchema.Columns.Add ("IsKey", typeof (bool));
+				DataColumn dc = dataTableSchema.Columns["IsKey"];
+				dc.AllowDBNull = true; // IsKey can have a DBNull
+				dataTableSchema.Columns.Add ("BaseCatalogName", typeof (string));
+				dataTableSchema.Columns.Add ("BaseColumnName", typeof (string));
+				dataTableSchema.Columns.Add ("BaseSchemaName", typeof (string));
+				dataTableSchema.Columns.Add ("BaseTableName", typeof (string));
+				dataTableSchema.Columns.Add ("DataType", typeof(string));
+				dataTableSchema.Columns.Add ("AllowDBNull", typeof (bool));
+				dataTableSchema.Columns.Add ("ProviderType", typeof (int));
+				dataTableSchema.Columns.Add ("IsAliased", typeof (bool));
+				dataTableSchema.Columns.Add ("IsExpression", typeof (bool));
+				dataTableSchema.Columns.Add ("IsIdentity", typeof (bool));
+				dataTableSchema.Columns.Add ("IsAutoIncrement", typeof (bool));
+				dataTableSchema.Columns.Add ("IsRowVersion", typeof (bool));
+				dataTableSchema.Columns.Add ("IsHidden", typeof (bool));
+				dataTableSchema.Columns.Add ("IsLong", typeof (bool));
+				dataTableSchema.Columns.Add ("IsReadOnly", typeof (bool));
+
+				fieldCount = PostgresLibrary.PQnfields (pgResult);
+				rowCount = PostgresLibrary.PQntuples(pgResult);
+				pgtypes = new string[fieldCount];

+

+				// TODO: for CommandBehavior.SingleRow

+				//       use IRow, otherwise, IRowset

+				if(fieldCount > 0)

+					if((cmdBehavior & CommandBehavior.SingleRow) == CommandBehavior.SingleRow)

+						fieldCount = 1;

+
+				// TODO: for CommandBehavior.SchemaInfo
+				if((cmdBehavior & CommandBehavior.SchemaOnly) == CommandBehavior.SchemaOnly)
+					fieldCount = 0;
+
+				// TODO: for CommandBehavior.SingleResult
+				if((cmdBehavior & CommandBehavior.SingleResult) == CommandBehavior.SingleResult)
+					if(currentQuery > 0)
+						fieldCount = 0;
+
+				// TODO: for CommandBehavior.SequentialAccess - used for reading Large OBjects
+				//if((cmdBehavior & CommandBehavior.SequentialAccess) == CommandBehavior.SequentialAccess) {
+				//}
+
+				DataRow schemaRow;
+				int oid;
+				DbType dbType;
+				Type typ;
+						
+				for (int i = 0; i < fieldCount; i += 1 ) {
+					schemaRow = dataTableSchema.NewRow ();
+
+					string columnName = PostgresLibrary.PQfname (pgResult, i);
+
+					schemaRow["ColumnName"] = columnName;
+					schemaRow["ColumnOrdinal"] = i+1;
+					schemaRow["ColumnSize"] = PostgresLibrary.PQfsize (pgResult, i);
+					schemaRow["NumericPrecision"] = 0;
+					schemaRow["NumericScale"] = 0;
+					// TODO: need to get KeyInfo
+					if((cmdBehavior & CommandBehavior.KeyInfo) == CommandBehavior.KeyInfo) {
+						bool IsUnique, IsKey;
+						GetKeyInfo(columnName, out IsUnique, out IsKey);
+					}
+					else {
+						schemaRow["IsUnique"] = false;
+						schemaRow["IsKey"] = DBNull.Value;
+					}
+					schemaRow["BaseCatalogName"] = "";
+					schemaRow["BaseColumnName"] = columnName;
+					schemaRow["BaseSchemaName"] = "";
+					schemaRow["BaseTableName"] = "";
+				
+					// PostgreSQL type to .NET type stuff
+					oid = PostgresLibrary.PQftype (pgResult, i);
+					pgtypes[i] = PostgresHelper.OidToTypname (oid, con.Types);	

+					dbType = PostgresHelper.TypnameToSqlDbType (pgtypes[i]);

+				

+					typ = PostgresHelper.DbTypeToSystemType (dbType);

+					string st = typ.ToString();

+					schemaRow["DataType"] = st;

+
+					schemaRow["AllowDBNull"] = false;
+					schemaRow["ProviderType"] = oid;
+					schemaRow["IsAliased"] = false;
+					schemaRow["IsExpression"] = false;
+					schemaRow["IsIdentity"] = false;
+					schemaRow["IsAutoIncrement"] = false;
+					schemaRow["IsRowVersion"] = false;
+					schemaRow["IsHidden"] = false;
+					schemaRow["IsLong"] = false;
+					schemaRow["IsReadOnly"] = false;
+					schemaRow.AcceptChanges();
+					dataTableSchema.Rows.Add (schemaRow);
+				}
+				
+#if DEBUG_SqlCommand
+				Console.WriteLine("********** DEBUG Table Schema BEGIN ************");
+				foreach (DataRow myRow in dataTableSchema.Rows) {

+					foreach (DataColumn myCol in dataTableSchema.Columns)

+						Console.WriteLine(myCol.ColumnName + " = " + myRow[myCol]);

+					Console.WriteLine();

+				}
+				Console.WriteLine("********** DEBUG Table Schema END ************");
+#endif // DEBUG_SqlCommand
+
+			}
+		}
+
+		// TODO: how do we get the key info if
+		//       we don't have the tableName?
+		private void GetKeyInfo(string columnName, out bool isUnique, out bool isKey) {
+			isUnique = false;
+			isKey = false;
+
+			string sql;
+
+			sql =
+			"SELECT i.indkey, i.indisprimary, i.indisunique " +
+			"FROM pg_class c, pg_class c2, pg_index i " +
+			"WHERE c.relname = ':tableName' AND c.oid = i.indrelid " +
+			"AND i.indexrelid = c2.oid ";
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs
new file mode 100644
index 00000000000..d2b028bc652
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlCommandBuilder.cs
@@ -0,0 +1,103 @@
+//
+// System.Data.SqlClient.SqlCommandBuilder.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.ComponentModel;
+
+namespace System.Data.SqlClient {

+

+	/// <summary>

+	/// Builder of one command

+	/// that will be used in manipulating a table for

+	/// a DataSet that is assoicated with a database.

+	/// </summary>

+	public sealed class SqlCommandBuilder : Component {

+		

+		[MonoTODO]

+		public SqlCommandBuilder() {

+

+		}

+

+		[MonoTODO]

+		public SqlCommandBuilder(SqlDataAdapter adapter) {

+		

+		}

+

+		[MonoTODO]

+		public SqlDataAdapter DataAdapter {

+			get {

+				throw new NotImplementedException ();

+			}

+			

+			set{

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public string QuotePrefix {

+			get {

+				throw new NotImplementedException ();

+			} 

+			

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public string QuoteSuffix {

+			get {

+				throw new NotImplementedException ();

+			}

+			

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public static void DeriveParameters(SqlCommand command) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SqlCommand GetDeleteCommand() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SqlCommand GetInsertCommand() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SqlCommand GetUpdateCommand() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void RefreshSchema() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void Dispose(bool disposing) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		~SqlCommandBuilder() {

+			// FIXME: create destructor - release resources

+		}

+	}

+}

+

diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
new file mode 100644
index 00000000000..0bd37605cc6
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlConnection.cs
@@ -0,0 +1,722 @@
+//
+// System.Data.SqlClient.SqlConnection.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+// (C) Daniel Morgan 2002
+//
+// Credits:
+//    SQL and concepts were used from libgda 0.8.190 (GNOME Data Access)

+//    http://www.gnome-db.org/

+//    with permission from the authors of the

+//    PostgreSQL provider in libgda:

+//        Michael Lausch <michael@lausch.at>
+//        Rodrigo Moya <rodrigo@gnome-db.org>
+//        Vivien Malerba <malerba@gnome-db.org>
+//        Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+//
+
+// use #define DEBUG_SqlConnection if you want to spew debug messages
+// #define DEBUG_SqlConnection
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+using System.Text;
+
+namespace System.Data.SqlClient {
+
+	/// <summary>
+	/// Represents an open connection to a SQL data source
+	/// </summary>
+	public sealed class SqlConnection : Component, IDbConnection,
+		ICloneable	
+	{
+		// FIXME: Need to implement class Component, 

+		// and interfaces: ICloneable and IDisposable	
+
+		#region Fields
+
+		private PostgresTypes types = null;
+		private IntPtr pgConn = IntPtr.Zero;    
+
+		// PGConn (Postgres Connection)
+		private string connectionString = "";    
+		// OLE DB Connection String
+		private string pgConnectionString = ""; 
+		// PostgreSQL Connection String
+		private SqlTransaction trans = null;
+		private int connectionTimeout = 15;     
+		// default for 15 seconds
+		
+		// connection parameters in connection string
+		private string host = "";     
+		// Name of host to connect to
+		private string hostaddr = ""; 
+		// IP address of host to connect to
+		// should be in "n.n.n.n" format
+		private string port = "";     
+		// Port number to connect to at the server host
+		private string dbname = "";   // The database name. 
+		private string user = "";     // User name to connect as. 
+		private string password = "";
+		// Password to be used if the server 
+		// demands password authentication.  		
+		private string options = ""; 
+		// Trace/debug options to be sent to the server. 
+		private string tty = ""; 
+		// A file or tty for optional 
+		// debug output from the backend. 
+		private string requiressl = "";
+		// Set to 1 to require 
+		// SSL connection to the backend. 
+		// Libpq will then refuse to connect 
+		// if the server does not 
+		// support SSL. Set to 0 (default) to 
+		// negotiate with server. 
+
+		// connection state
+		private ConnectionState conState = ConnectionState.Closed;
+		
+		// DataReader state
+		private SqlDataReader rdr = null;
+		private bool dataReaderOpen = false;
+		// FIXME: if true, throw an exception if SqlConnection 
+		//        is used for anything other than reading
+		//        data using SqlDataReader
+		
+		private string versionString = "Unknown";
+
+		private bool disposed = false;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		// A lot of the defaults were initialized in the Fields
+		[MonoTODO]
+		public SqlConnection () {
+
+		}
+	
+		[MonoTODO]
+		public SqlConnection (String connectionString) {
+			SetConnectionString (connectionString);
+		}
+
+		#endregion // Constructors
+
+		#region Destructors
+
+		protected override void Dispose(bool disposing) {
+			if(!this.disposed)
+				try {
+					if(disposing) {
+						// release any managed resources
+					}
+					// release any unmanaged resources
+					// close any handles
+										
+					this.disposed = true;
+				}
+				finally {
+					base.Dispose(disposing);
+				}
+		}
+	
+		// aka Finalize()
+		// [ClassInterface(ClassInterfaceType.AutoDual)]
+		[MonoTODO]
+		~SqlConnection() {
+			Dispose (false);
+		}
+		
+		#endregion // Destructors
+
+		#region Public Methods
+
+		IDbTransaction IDbConnection.BeginTransaction () {
+			return BeginTransaction ();
+		}
+
+		public SqlTransaction BeginTransaction () {
+			return TransactionBegin (); // call private method
+		}
+
+		IDbTransaction IDbConnection.BeginTransaction (IsolationLevel 
+			il) {
+			return BeginTransaction (il);
+		}
+
+		public SqlTransaction BeginTransaction (IsolationLevel il) {
+			return TransactionBegin (il); // call private method
+		}
+
+		// PostgreSQL does not support named transactions/savepoint
+		//            nor nested transactions
+		[Obsolete]
+		public SqlTransaction BeginTransaction(string transactionName) {
+			return TransactionBegin (); // call private method
+		}
+
+		[Obsolete]
+		public SqlTransaction BeginTransaction(IsolationLevel iso,

+			string transactionName) {
+			return TransactionBegin (iso); // call private method
+		}
+
+		[MonoTODO]
+		public void ChangeDatabase (string databaseName) {
+			throw new NotImplementedException ();
+		}
+
+		object ICloneable.Clone() {
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public void Close () {
+			if(dataReaderOpen == true) {
+				// TODO: what do I do if
+				// the user Closes the connection
+				// without closing the Reader first?
+
+			}			
+			CloseDataSource ();
+		}
+
+		IDbCommand IDbConnection.CreateCommand () {
+			return CreateCommand ();
+		}
+
+		public SqlCommand CreateCommand () {
+			SqlCommand sqlcmd = new SqlCommand ("", this);
+
+			return sqlcmd;
+		}
+
+		[MonoTODO]
+		public void Open () {
+			if(dbname.Equals(""))
+				throw new InvalidOperationException(
+					"dbname missing");
+			else if(conState == ConnectionState.Open)
+				throw new InvalidOperationException(
+					"ConnnectionState is already Open");
+
+			ConnStatusType connStatus;
+
+			// FIXME: check to make sure we have 
+			//        everything to connect,
+			//        otherwise, throw an exception
+
+			pgConn = PostgresLibrary.PQconnectdb 
+				(pgConnectionString);
+
+			// FIXME: should we use PQconnectStart/PQconnectPoll
+			//        instead of PQconnectdb?  
+			// PQconnectdb blocks 
+			// PQconnectStart/PQconnectPoll is non-blocking
+			
+			connStatus = PostgresLibrary.PQstatus (pgConn);
+			if(connStatus == ConnStatusType.CONNECTION_OK) {
+				// Successfully Connected
+				disposed = false;
+				SetupConnection();
+			}
+			else {
+				String errorMessage = PostgresLibrary.
+					PQerrorMessage (pgConn);
+				errorMessage += ": Could not connect to database.";
+
+				throw new SqlException(0, 0,
+					errorMessage, 0, "",
+					host, "SqlConnection", 0);
+			}
+		}
+
+		#endregion // Public Methods
+
+		#region Internal Methods
+
+		// Used to prevent SqlConnection
+		// from doing anything while
+		// SqlDataReader is open.
+		// Open the Reader. (called from SqlCommand)
+		internal void OpenReader(SqlDataReader reader) 
+		{	
+			if(dataReaderOpen == true) {
+				// TODO: throw exception here?
+				//       because a reader
+				//       is already open
+			}
+			else {
+				rdr = reader;
+				dataReaderOpen = true;
+			}
+		}
+
+		// Used to prevent SqlConnection
+		// from doing anything while
+		// SqlDataReader is open
+		// Close the Reader (called from SqlCommand)
+		// if closeConnection true, Close() the connection
+		// this is based on CommandBehavior.CloseConnection
+		internal void CloseReader(bool closeConnection)
+		{	if(closeConnection == true)
+				CloseDataSource();
+			else
+				dataReaderOpen = false;
+		}
+
+		#endregion // Internal Methods
+
+		#region Private Methods
+
+		private void SetupConnection() {
+			
+			conState = ConnectionState.Open;
+
+			// FIXME: load types into hashtable
+			types = new PostgresTypes(this);
+			types.Load();
+
+			versionString = GetDatabaseServerVersion();
+
+			// set DATE style to YYYY/MM/DD
+			IntPtr pgResult = IntPtr.Zero;
+			pgResult = PostgresLibrary.PQexec (pgConn, "SET DATESTYLE TO 'ISO'");
+			PostgresLibrary.PQclear (pgResult);
+			pgResult = IntPtr.Zero;
+		}
+
+		private string GetDatabaseServerVersion() 
+		{
+			SqlCommand cmd = new SqlCommand("select version()",this);
+			return (string) cmd.ExecuteScalar();
+		}
+
+		private void CloseDataSource () {
+			// FIXME: just a quick hack
+			if(conState == ConnectionState.Open) {
+				if(trans != null)
+					if(trans.DoingTransaction == true) {
+						trans.Rollback();
+						// trans.Dispose();
+						trans = null;
+					}
+
+				conState = ConnectionState.Closed;
+				PostgresLibrary.PQfinish (pgConn);
+				pgConn = IntPtr.Zero;
+			}
+		}
+
+		private void SetConnectionString (string connectionString) {
+			// FIXME: perform error checking on string
+			// while translating string from 
+			// OLE DB format to PostgreSQL 
+			// connection string format
+			//
+			//     OLE DB: "host=localhost;dbname=test;user=joe;password=smoe"
+			// PostgreSQL: "host=localhost dbname=test user=joe password=smoe"
+			//
+			// For OLE DB, you would have the additional 
+			// "provider=postgresql"
+			// OleDbConnection you would be using libgda
+			//
+			// Also, parse the connection string into properties
+
+			// FIXME: if connection is open, you can 
+			//        not set the connection
+			//        string, throw an exception
+
+			this.connectionString = connectionString;
+			pgConnectionString = ConvertStringToPostgres (
+				connectionString);
+
+#if DEBUG_SqlConnection
+			Console.WriteLine(
+				"OLE-DB Connection String    [in]: " +
+				this.ConnectionString);
+			Console.WriteLine(
+				"Postgres Connection String [out]: " +
+				pgConnectionString);
+#endif // DEBUG_SqlConnection
+		}
+
+		private String ConvertStringToPostgres (String 
+			oleDbConnectionString) {
+			StringBuilder postgresConnection = 
+				new StringBuilder();
+			string result;
+			string[] connectionParameters;
+
+			char[] semicolon = new Char[1];
+			semicolon[0] = ';';
+			
+			// FIXME: what is the max number of value pairs 
+			//        can there be for the OLE DB 
+			//	  connnection string? what about libgda max?
+			//        what about postgres max?
+
+			// FIXME: currently assuming value pairs are like:
+			//        "key1=value1;key2=value2;key3=value3"
+			//        Need to deal with values that have
+			//        single or double quotes.  And error 
+			//        handling of that too.
+			//        "key1=value1;key2='value2';key=\"value3\""
+
+			// FIXME: put the connection parameters 
+			//        from the connection
+			//        string into a 
+			//        Hashtable (System.Collections)
+			//        instead of using private variables 
+			//        to store them
+			connectionParameters = oleDbConnectionString.
+				Split (semicolon);
+			foreach (string sParameter in connectionParameters) {
+				if(sParameter.Length > 0) {
+					BreakConnectionParameter (sParameter);
+					postgresConnection.
+						Append (sParameter + 
+						" ");
+				}
+			}
+			result = postgresConnection.ToString ();
+			return result;
+		}
+
+		private bool BreakConnectionParameter (String sParameter) {	
+			bool addParm = true;
+			int index;
+
+			index = sParameter.IndexOf ("=");
+			if (index > 0) {	
+				string parmKey, parmValue;
+
+				// separate string "key=value" to 
+				// string "key" and "value"
+				parmKey = sParameter.Substring (0, index);
+				parmValue = sParameter.Substring (index + 1,
+					sParameter.Length - index - 1);
+
+				switch(parmKey.ToLower()) {
+				case "hostaddr":
+					hostaddr = parmValue;
+					break;
+
+				case "port":
+					port = parmValue;
+					break;
+
+				case "host":
+					// set DataSource property
+					host = parmValue;
+					break;
+
+				case "dbname":
+					// set Database property
+					dbname = parmValue;
+					break;
+
+				case "user":
+					user = parmValue;
+					break;
+
+				case "password":
+					password = parmValue;
+					//	addParm = false;
+					break;
+
+				case "options":
+					options = parmValue;
+					break;
+
+				case "tty":
+					tty = parmValue;
+					break;
+							
+				case "requiressl":
+					requiressl = parmValue;
+					break;
+				}
+			}
+			return addParm;
+		}
+
+		private SqlTransaction TransactionBegin () {
+			// FIXME: need to keep track of 
+			// transaction in-progress
+			trans = new SqlTransaction ();
+			// using internal methods of SqlTransaction
+			trans.SetConnection (this);
+			trans.Begin();
+
+			return trans;
+		}
+
+		private SqlTransaction TransactionBegin (IsolationLevel il) {
+			// FIXME: need to keep track of 
+			// transaction in-progress
+			TransactionBegin();
+			trans.SetIsolationLevel (il);
+			
+			return trans;
+		}
+
+		#endregion
+
+		#region Public Properties
+
+		[MonoTODO]
+		public ConnectionState State 		{
+			get { 
+				return conState;
+			}
+		}
+
+		public string ConnectionString	{
+			get { 
+				return connectionString;
+			}
+			set { 
+				SetConnectionString (value);
+			}
+		}
+		
+		public int ConnectionTimeout {
+			get { 
+				return connectionTimeout; 
+			}
+		}
+
+		public string Database	{
+			get { 
+				return dbname; 
+			}
+		}
+
+		public string DataSource {
+			get {
+				return host;
+			}
+		}
+
+		public int PacketSize {
+			get { 
+				throw new NotImplementedException ();
+			}
+		}
+
+		public string ServerVersion {
+			get { 
+				return versionString;
+			}
+		}
+
+		#endregion // Public Properties
+
+		#region Internal Properties
+
+		// For System.Data.SqlClient classes
+		// to get the current transaction
+		// in progress - if any
+		internal SqlTransaction Transaction {
+			get {
+				return trans;
+			}
+		}
+
+		// For System.Data.SqlClient classes 
+		// to get the unmanaged PostgreSQL connection
+		internal IntPtr PostgresConnection {
+			get {
+				return pgConn;
+			}
+		}
+
+		// For System.Data.SqlClient classes
+		// to get the list PostgreSQL types
+		// so can look up based on OID to
+		// get the .NET System type.
+		internal ArrayList Types {
+			get {
+				return types.List;
+			}
+		}
+
+		// Used to prevent SqlConnection
+		// from doing anything while
+		// SqlDataReader is open
+		internal bool IsReaderOpen {
+			get {
+				return dataReaderOpen;
+			}
+		}
+
+		#endregion // Internal Properties
+
+		#region Events
+                
+		public event 
+		SqlInfoMessageEventHandler InfoMessage;
+
+		public event 
+		StateChangeEventHandler StateChange;
+		
+		#endregion
+
+		#region Inner Classes
+
+		private class PostgresTypes {
+			// TODO: create hashtable for 
+			// PostgreSQL types to .NET types
+			// containing: oid, typname, SqlDbType
+
+			private Hashtable hashTypes;
+			private ArrayList pgTypes;
+			private SqlConnection con;
+
+			// Got this SQL with the permission from 
+			// the authors of libgda
+			private const string SEL_SQL_GetTypes = 
+				"SELECT oid, typname FROM pg_type " +
+				"WHERE typrelid = 0 AND typname !~ '^_' " +
+				" AND  typname not in ('SET', 'cid', " +
+				"'int2vector', 'oidvector', 'regproc', " +
+				"'smgr', 'tid', 'unknown', 'xid') " +
+				"ORDER BY typname";
+
+			internal PostgresTypes(SqlConnection sqlcon) {
+				
+				con = sqlcon;
+				hashTypes = new Hashtable();
+			}
+
+			private void AddPgType(Hashtable types, 

+				string typname, DbType dbType) {

+

+				PostgresType pgType = new PostgresType();

+			

+				pgType.typname = typname;

+				pgType.dbType = dbType;	

+

+				types.Add(pgType.typname, pgType);

+			}

+
+			private void BuildTypes(IntPtr pgResult, 
+				int nRows, int nFields) {
+
+				String value;
+
+				int r;
+				for(r = 0; r < nRows; r++) {
+					PostgresType pgType = 
+						new PostgresType();
+
+					// get data value (oid)
+					value = PostgresLibrary.
+						PQgetvalue(
+							pgResult,
+							r, 0);
+						
+					pgType.oid = Int32.Parse(value);

+

+					// get data value (typname)

+					value = PostgresLibrary.
+						PQgetvalue(
+						pgResult,
+						r, 1);	

+					pgType.typname = String.Copy(value);

+					pgType.dbType = PostgresHelper.

+							TypnameToSqlDbType(

+								pgType.typname);

+

+					pgTypes.Add(pgType);
+				}
+				pgTypes = ArrayList.ReadOnly(pgTypes);
+			}
+
+			internal void Load() {
+				pgTypes = new ArrayList();
+				IntPtr pgResult = IntPtr.Zero; // PGresult
+				
+				if(con.State != ConnectionState.Open)
+					throw new InvalidOperationException(
+						"ConnnectionState is not Open");
+
+				// FIXME: PQexec blocks 
+				// while PQsendQuery is non-blocking
+				// which is better to use?
+				// int PQsendQuery(PGconn *conn,
+				//        const char *query);
+
+				// execute SQL command
+				// uses internal property to get the PGConn IntPtr
+				pgResult = PostgresLibrary.
+					PQexec (con.PostgresConnection, SEL_SQL_GetTypes);
+
+				if(pgResult.Equals(IntPtr.Zero)) {
+					throw new SqlException(0, 0,
+						"No Resultset from PostgreSQL", 0, "",
+						con.DataSource, "SqlConnection", 0);
+				}
+				else {
+					ExecStatusType execStatus;
+
+					execStatus = PostgresLibrary.
+						PQresultStatus (pgResult);
+			
+					if(execStatus == ExecStatusType.PGRES_TUPLES_OK) {
+						int nRows;
+						int nFields;
+
+						nRows = PostgresLibrary.
+							PQntuples(pgResult);
+
+						nFields = PostgresLibrary.
+							PQnfields(pgResult);
+
+						BuildTypes (pgResult, nRows, nFields);
+
+						// close result set
+						PostgresLibrary.PQclear (pgResult);
+						pgResult = IntPtr.Zero;
+					}
+					else {
+						String errorMessage;
+				
+						errorMessage = PostgresLibrary.
+							PQresStatus(execStatus);
+
+						errorMessage += " " + PostgresLibrary.

+							PQresultErrorMessage(pgResult);

+

+						// close result set
+						PostgresLibrary.PQclear (pgResult);
+						pgResult = IntPtr.Zero;
+

+						throw new SqlException(0, 0,
+							errorMessage, 0, "",
+							con.DataSource, "SqlConnection", 0);

+					}
+				}
+			}
+
+			public ArrayList List {
+				get {
+					return pgTypes;
+				}
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
new file mode 100644
index 00000000000..526f8f36818
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataAdapter.cs
@@ -0,0 +1,191 @@
+//
+// System.Data.SqlClient.SqlDataAdapter.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc 2002
+// Copyright (C) 2002 Tim Coleman
+//
+
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Represents a set of command-related properties that are used 
+	/// to fill the DataSet and update a data source, all this 
+	/// from a SQL database.
+	/// </summary>
+	public sealed class SqlDataAdapter : DbDataAdapter, IDbDataAdapter 
+	{
+		#region Fields
+	
+		SqlCommand deleteCommand;
+		SqlCommand insertCommand;
+		SqlCommand selectCommand;
+		SqlCommand updateCommand;
+
+		static readonly object EventRowUpdated = new object(); 
+		static readonly object EventRowUpdating = new object(); 
+
+		#endregion
+
+		#region Constructors
+		
+		public SqlDataAdapter () 	
+			: this (new SqlCommand ())
+		{
+		}
+
+		public SqlDataAdapter (SqlCommand selectCommand) 
+		{
+			DeleteCommand = new SqlCommand ();
+			InsertCommand = new SqlCommand ();
+			SelectCommand = selectCommand;
+			UpdateCommand = new SqlCommand ();
+		}
+
+		public SqlDataAdapter (string selectCommandText, SqlConnection selectConnection) 
+			: this (new SqlCommand (selectCommandText, selectConnection))
+		{ 
+		}
+
+		public SqlDataAdapter (string selectCommandText, string selectConnectionString)
+			: this (selectCommandText, new SqlConnection (selectConnectionString))
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public SqlCommand DeleteCommand {
+			get {
+				return deleteCommand;
+			}
+			set {
+				deleteCommand = value;
+			}
+		}
+
+		public SqlCommand InsertCommand {
+			get {
+				return insertCommand;
+			}
+			set {
+				insertCommand = value;
+			}
+		}
+
+		public SqlCommand SelectCommand {
+			get {
+				return selectCommand;
+			}
+			set {
+				selectCommand = value;
+			}
+		}
+
+		public SqlCommand UpdateCommand {
+			get {
+				return updateCommand;
+			}
+			set {
+				updateCommand = value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.DeleteCommand {
+			get { return DeleteCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				DeleteCommand = (SqlCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.InsertCommand {
+			get { return InsertCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				InsertCommand = (SqlCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.SelectCommand {
+			get { return SelectCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				SelectCommand = (SqlCommand)value;
+			}
+		}
+
+		IDbCommand IDbDataAdapter.UpdateCommand {
+			get { return UpdateCommand; }
+			set { 
+				if (!(value is SqlCommand)) 
+					throw new ArgumentException ();
+				UpdateCommand = (SqlCommand)value;
+			}
+		}
+
+
+		ITableMappingCollection IDataAdapter.TableMappings {
+			get { return TableMappings; }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		protected override RowUpdatedEventArgs CreateRowUpdatedEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+		{
+			return new SqlRowUpdatedEventArgs (dataRow, command, statementType, tableMapping);
+		}
+
+
+		protected override RowUpdatingEventArgs CreateRowUpdatingEvent (DataRow dataRow, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+		{
+			return new SqlRowUpdatingEventArgs (dataRow, command, statementType, tableMapping);
+		}
+
+		protected override void OnRowUpdated (RowUpdatedEventArgs value) 
+		{
+         		SqlRowUpdatedEventHandler handler = (SqlRowUpdatedEventHandler) Events[EventRowUpdated];
+			if ((handler != null) && (value is SqlRowUpdatedEventArgs))
+            			handler(this, (SqlRowUpdatedEventArgs) value);
+		}
+
+		protected override void OnRowUpdating (RowUpdatingEventArgs value) 
+		{
+         		SqlRowUpdatingEventHandler handler = (SqlRowUpdatingEventHandler) Events[EventRowUpdating];
+			if ((handler != null) && (value is SqlRowUpdatingEventArgs))
+            			handler(this, (SqlRowUpdatingEventArgs) value);
+		}
+
+		#endregion // Methods
+
+		#region Events and Delegates
+
+		public event SqlRowUpdatedEventHandler RowUpdated {
+			add { Events.AddHandler (EventRowUpdated, value); }
+			remove { Events.RemoveHandler (EventRowUpdated, value); }
+		}
+
+		public event SqlRowUpdatingEventHandler RowUpdating {
+			add { Events.AddHandler (EventRowUpdating, value); }
+			remove { Events.RemoveHandler (EventRowUpdating, value); }
+		}
+
+		#endregion // Events and Delegates
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
new file mode 100644
index 00000000000..28d0e1bc4e7
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlDataReader.cs
@@ -0,0 +1,422 @@
+//
+// System.Data.SqlClient.SqlDataReader.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+// (C) Daniel Morgan 2002
+//
+// Credits:
+//    SQL and concepts were used from libgda 0.8.190 (GNOME Data Access)

+//    http://www.gnome-db.org/

+//    with permission from the authors of the

+//    PostgreSQL provider in libgda:

+//        Michael Lausch <michael@lausch.at>
+//        Rodrigo Moya <rodrigo@gnome-db.org>
+//        Vivien Malerba <malerba@gnome-db.org>
+//        Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+//
+
+// *** uncomment #define to get debug messages, comment for production ***
+//#define DEBUG_SqlDataReader
+
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data;
+
+namespace System.Data.SqlClient {
+	/// <summary>
+	/// Provides a means of reading one or more forward-only streams
+	/// of result sets obtained by executing a command 
+	/// at a SQL database.
+	/// </summary>
+	//public sealed class SqlDataReader : MarshalByRefObject,
+	//	IEnumerable, IDataReader, IDisposable, IDataRecord
+	public sealed class SqlDataReader : IEnumerable, 
+		IDataReader, IDataRecord {
+		#region Fields
+
+		private SqlCommand cmd;
+		private DataTable table = null;
+
+		// columns in a row
+		private object[] fields; // data value in a .NET type
+		private string[] types; // PostgreSQL Type
+		private bool[] isNull; // is NULL?
+		private int[] actualLength; // ActualLength of data
+		private DbType[] dbTypes; // DB data type
+		// actucalLength = -1 is variable-length
+				
+		private bool open = false;
+		IntPtr pgResult; // PGresult
+		private int rows;
+		private int cols;
+
+		private int recordsAffected = -1; // TODO: get this value
+
+		private int currentRow = -1; // no Read() has been done yet
+
+		#endregion // Fields
+
+		#region Constructors
+
+		internal SqlDataReader (SqlCommand sqlCmd) {
+
+			cmd = sqlCmd;
+			open = true;
+			cmd.OpenReader(this);
+		}
+
+		#endregion
+
+		#region Public Methods
+
+		[MonoTODO]
+		public void Close() {
+			open = false;
+			
+			// free SqlDataReader resources in SqlCommand
+			// and allow SqlConnection to be used again
+			cmd.CloseReader();
+
+			// TODO: get parameters from result
+
+			// clear unmanaged PostgreSQL result set
+			PostgresLibrary.PQclear (pgResult);
+			pgResult = IntPtr.Zero;
+		}
+
+		[MonoTODO]
+		public DataTable GetSchemaTable() {
+			return table;
+		}
+
+		[MonoTODO]
+		public bool NextResult() {
+			SqlResult res;
+			currentRow = -1;
+			bool resultReturned;
+			
+			// reset
+			table = null;
+			pgResult = IntPtr.Zero;
+			rows = 0;
+			cols = 0;
+			types = null;
+			recordsAffected = -1;
+
+			res = cmd.NextResult();
+			resultReturned = res.ResultReturned;
+
+			if(resultReturned == true) {
+				table = res.Table;
+				pgResult = res.PgResult;
+				rows = res.RowCount;
+				cols = res.FieldCount;
+				types = res.PgTypes;
+				recordsAffected = res.RecordsAffected;
+			}
+			
+			res = null;
+			return resultReturned;
+		}
+
+		[MonoTODO]
+		public bool Read() {
+			
+			string dataValue;
+			int c = 0;
+			
+			if(currentRow < rows - 1)  {
+				
+				currentRow++;
+			
+				// re-init row
+				fields = new object[cols];
+				//dbTypes = new DbType[cols];
+				actualLength = new int[cols];
+				isNull = new bool[cols];
+			
+				for(c = 0; c < cols; c++) {
+
+					// get data value
+					dataValue = PostgresLibrary.
+						PQgetvalue(
+						pgResult,
+						currentRow, c);
+
+					// is column NULL?
+					//isNull[c] = PostgresLibrary.
+					//	PQgetisnull(pgResult,
+					//	currentRow, c);
+
+					// get Actual Length
+					actualLength[c] = PostgresLibrary.
+						PQgetlength(pgResult,
+						currentRow, c);
+
+					DbType dbType;	
+					dbType = PostgresHelper.
+						TypnameToSqlDbType(types[c]);
+
+					if(dataValue == null) {
+						fields[c] = null;
+						isNull[c] = true;
+					}
+					else if(dataValue.Equals("")) {
+						fields[c] = null;
+						isNull[c] = true;
+					}
+					else {
+						isNull[c] = false;
+						fields[c] = PostgresHelper.
+							ConvertDbTypeToSystem (
+							dbType,
+							dataValue);
+					}
+				}
+				return true;
+			}
+			return false; // EOF
+		}
+
+		[MonoTODO]
+		public byte GetByte(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public long GetBytes(int i, long fieldOffset, 
+			byte[] buffer, int bufferOffset, 
+			int length) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public char GetChar(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public long GetChars(int i, long fieldOffset, 
+			char[] buffer, int bufferOffset, 
+			int length) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public IDataReader GetData(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string GetDataTypeName(int i) {
+			return types[i];
+		}
+
+		[MonoTODO]
+		public DateTime GetDateTime(int i) {
+			return (DateTime) fields[i];
+		}
+
+		[MonoTODO]
+		public decimal GetDecimal(int i) {
+			return (decimal) fields[i];
+		}
+
+		[MonoTODO]
+		public double GetDouble(int i) {
+			return (double) fields[i];
+		}
+
+		[MonoTODO]
+		public Type GetFieldType(int i) {
+
+			DataRow row = table.Rows[i];
+			return Type.GetType((string)row["DataType"]);
+		}
+
+		[MonoTODO]
+		public float GetFloat(int i) {
+			return (float) fields[i];
+		}
+
+		[MonoTODO]
+		public Guid GetGuid(int i) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public short GetInt16(int i) {
+			return (short) fields[i];
+		}
+
+		[MonoTODO]
+		public int GetInt32(int i) {
+			return (int) fields[i];
+		}
+
+		[MonoTODO]
+		public long GetInt64(int i) {
+			return (long) fields[i];
+		}
+
+		[MonoTODO]
+		public string GetName(int i) {
+
+			DataRow row = table.Rows[i];
+			return (string) row["ColumnName"];
+		}
+
+		[MonoTODO]
+		public int GetOrdinal(string name) {
+
+			int i;
+			DataRow row;
+
+			for(i = 0; i < table.Rows.Count; i++) {
+				row = table.Rows[i];
+				if(((string) row["ColumnName"]).Equals(name))
+					return i;
+			}
+
+			for(i = 0; i < table.Rows.Count; i++) {
+				string ta;
+				string n;
+					
+				row = table.Rows[i];
+				ta = ((string) row["ColumnName"]).ToUpper();
+				n = name.ToUpper();
+						
+				if(ta.Equals(n)) {
+					return i;
+				}
+			}
+			
+			throw new MissingFieldException("Missing field: " + name);
+		}
+
+		[MonoTODO]
+		public string GetString(int i) {
+			return (string) fields[i];
+		}
+
+		[MonoTODO]
+		public object GetValue(int i) {
+			return fields[i];
+		}
+
+		[MonoTODO]
+		public int GetValues(object[] values) 
+		{
+			Array.Copy (fields, values, fields.Length);
+			return fields.Length;
+		}
+
+		[MonoTODO]
+		public bool IsDBNull(int i) {
+			return isNull[i];
+		}
+
+		[MonoTODO]
+		public bool GetBoolean(int i) {
+			return (bool) fields[i];
+		}
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator() {
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Public Methods
+
+		#region Destructors
+
+		[MonoTODO]
+		public void Dispose () {
+		}
+
+		//[MonoTODO]
+		//~SqlDataReader() {
+		//}
+
+		#endregion // Destructors
+
+		#region Properties
+
+		public int Depth {
+			[MonoTODO]
+			get { 
+				return 0; // always return zero, unless
+				          // this provider will allow
+				          // nesting of a row
+			}
+		}
+
+		public bool IsClosed {
+			[MonoTODO]
+			get {
+				if(open == false)
+					return true;
+				else
+					return false;
+			}
+		}
+
+		public int RecordsAffected {
+			[MonoTODO]
+			get { 
+				return recordsAffected;
+			}
+		}
+	
+		public int FieldCount {
+			[MonoTODO]
+			get { 
+				return cols;
+			}
+		}
+
+		public object this[string name] {
+			[MonoTODO]
+			get { 
+				int i;
+				DataRow row;
+
+				for(i = 0; i < table.Rows.Count; i++) {
+					row = table.Rows[i];
+					if(row["ColumnName"].Equals(name))
+						return fields[i];
+				}
+
+				for(i = 0; i < table.Rows.Count; i++) {
+					string ta;
+					string n;
+					
+					row = table.Rows[i];
+					ta = ((string) row["ColumnName"]).ToUpper();
+					n = name.ToUpper();
+						
+					if(ta.Equals(n)) {
+						return fields[i];
+					}
+				}
+			
+				throw new MissingFieldException("Missing field: " + name);
+			}
+		}
+
+		public object this[int i] {
+			[MonoTODO]
+			get { 
+				return fields[i];
+			}
+		}
+
+		#endregion // Properties
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlError.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlError.cs
new file mode 100644
index 00000000000..e7c722285a9
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlError.cs
@@ -0,0 +1,155 @@
+//
+// System.Data.SqlClient.SqlError.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+using System;
+using System.Data;
+using System.Runtime.InteropServices;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Describes an error from a SQL database.
+	/// </summary>
+	[MonoTODO]
+	public sealed class SqlError
+	{
+		byte theClass = 0;
+		int lineNumber = 0;
+		string message = "";
+		int number = 0;
+		string procedure = "";
+		string server = "";
+		string source = "";
+		byte state = 0;
+
+		internal SqlError(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			this.theClass = theClass;
+			this.lineNumber = lineNumber;
+			this.message = message;
+			this.number = number;
+			this.procedure = procedure;
+			this.server = server;
+			this.source = source;
+			this.state = state;
+		}
+		
+		#region Properties
+
+		[MonoTODO]
+		/// <summary>
+		/// severity level of the error
+		/// </summary>
+		public byte Class {
+			get { 
+				return theClass;
+			}
+		}
+
+		[MonoTODO]
+		public int LineNumber {
+			get { 
+			   return lineNumber;
+		   }
+		}
+
+		[MonoTODO]
+		public string Message {
+			get { 
+				return message;
+			}
+		}
+		
+		[MonoTODO]
+		public int Number {
+			get { 
+				return number;
+			}
+		}
+
+		[MonoTODO]
+		public string Procedure {
+			get { 
+				return procedure;
+			}
+		}
+
+		[MonoTODO]
+		public string Server {
+			get { 
+				return server;
+			}
+		}
+
+		[MonoTODO]
+		public string Source {
+			get { 
+				return source;
+			}
+		}
+
+		[MonoTODO]
+		public byte State {
+			get { 
+				return state;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public override string ToString ()
+		{
+			String toStr;
+			String stackTrace;
+			stackTrace = " <Stack Trace>";
+			// FIXME: generate the correct SQL error string
+			toStr = "SqlError:" + message + stackTrace;
+			return toStr;
+		}
+
+		internal void SetClass(byte theClass) {
+			this.theClass = theClass;
+		}
+
+		internal void SetLineNumber(int lineNumber) {
+			this.lineNumber = lineNumber;
+		}
+
+		internal void SetMessage(string message) {
+			this.message = message;
+		}
+
+		internal void SetNumber(int number) {
+			this.number = number;
+		}
+
+		internal void SetProcedure(string procedure) {
+			this.procedure = procedure;
+		}
+
+		internal void SetServer(string server) {
+			this.server = server;
+		}
+
+		internal void SetSource(string source) {
+			this.source = source;
+		}
+
+		internal void SetState(byte state) {
+			this.state = state;
+		}
+
+		#endregion
+		
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlErrorCollection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlErrorCollection.cs
new file mode 100644
index 00000000000..7050d5d08fa
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlErrorCollection.cs
@@ -0,0 +1,114 @@
+//
+// System.Data.SqlClient.SqlError.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+using System;
+using System.Collections;
+using System.Data;
+using System.Runtime.InteropServices;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Describes an error from a SQL database.
+	/// </summary>
+	[MonoTODO]
+	public sealed class SqlErrorCollection : ICollection, IEnumerable
+	{
+		ArrayList errorList = new ArrayList();
+
+		internal SqlErrorCollection() {
+		}
+
+		internal SqlErrorCollection(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			
+			Add (theClass, lineNumber, message,
+				number, procedure,
+				server, source, state);
+		}
+
+		#region Properties
+                
+		[MonoTODO]
+		public int Count {
+			get {	
+				return errorList.Count;
+			}			  
+		}
+
+		[MonoTODO]
+		public void CopyTo(Array array,	int index) {
+			throw new NotImplementedException ();
+		}
+
+		// [MonoTODO]
+		bool ICollection.IsSynchronized {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		// [MonoTODO]
+		object ICollection.SyncRoot {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator() {
+			throw new NotImplementedException ();
+		}
+		
+		// Index property (indexer)
+		// [MonoTODO]
+		public SqlError this[int index] {
+			get {
+				return (SqlError) errorList[index];
+			}
+		}
+
+		#endregion
+
+		#region Methods
+		
+		[MonoTODO]
+		public override string ToString()
+		{
+			throw new NotImplementedException ();
+		}
+		#endregion
+
+		internal void Add(SqlError error) {
+			errorList.Add(error);
+		}
+
+		internal void Add(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			
+			SqlError error = new SqlError(theClass,
+				lineNumber, message,
+				number, procedure,
+				server, source, state);
+			Add(error);
+		}
+
+		#region Destructors
+
+		[MonoTODO]
+		~SqlErrorCollection()
+		{
+			// FIXME: do the destructor - release resources
+		}
+
+		#endregion		
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlException.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlException.cs
new file mode 100644
index 00000000000..e447b599372
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlException.cs
@@ -0,0 +1,204 @@
+//
+// System.Data.SqlClient.SqlException.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc
+//
+using System;
+using System.Data;
+using System.Runtime.Serialization;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Exceptions, as returned by SQL databases.
+	/// </summary>
+	public sealed class SqlException : SystemException
+	{
+		private SqlErrorCollection errors; 
+
+		internal SqlException() 
+			: base("a SQL Exception has occurred") {
+			errors = new SqlErrorCollection();
+		}
+
+		internal SqlException(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) 
+				: base(message) {	
+			
+			errors = new SqlErrorCollection (theClass, 
+				lineNumber, message,
+				number, procedure,
+				server, source, state);
+		}
+
+		#region Properties
+
+		[MonoTODO]
+		public byte Class {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception here?
+				else
+					return errors[0].Class;
+			}
+
+			set { 
+				errors[0].SetClass(value);
+			}
+		}
+
+		[MonoTODO]
+		public SqlErrorCollection Errors {
+			get { 
+				return errors;
+			}
+
+			set { 
+				errors = value;
+			}
+		}
+
+		[MonoTODO]
+		public int LineNumber {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception here?
+				return errors[0].LineNumber;
+			}
+
+			set { 
+				errors[0].SetLineNumber(value);
+			}
+		}
+		
+		[MonoTODO]
+		public override string Message 	{
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else {
+					String msg = "";
+					int i = 0;
+					
+					for(i = 0; i < errors.Count - 1; i++) {
+						msg = msg + errors[i].Message + "\n";
+                                        }
+					msg = msg + errors[i].Message;
+
+					return msg;
+				}
+			}
+		}
+		
+		[MonoTODO]
+		public int Number {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception?
+				else
+					return errors[0].Number;
+			}
+
+			set { 
+				errors[0].SetNumber(value);
+			}
+		}
+		
+		[MonoTODO]
+		public string Procedure {
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else
+					return errors[0].Procedure;
+			}
+
+			set { 
+				errors[0].SetProcedure(value);
+			}
+		}
+
+		[MonoTODO]
+		public string Server {
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else
+					return errors[0].Server;
+			}
+
+			set { 
+				errors[0].SetServer(value);
+			}
+		}
+		
+		[MonoTODO]
+		public override string Source {
+			get { 
+				if(errors.Count == 0)
+					return ""; // FIXME: throw exception?
+				else
+					return errors[0].Source;
+			}
+
+			set { 
+				errors[0].SetSource(value);
+			}
+		}
+
+		[MonoTODO]
+		public byte State {
+			get { 
+				if(errors.Count == 0)
+					return 0; // FIXME: throw exception?
+				else
+					return errors[0].State;
+			}
+
+			set { 
+				errors[0].SetState(value);
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public override void GetObjectData(SerializationInfo si,
+			StreamingContext context) {
+			// FIXME: to do
+		}
+
+		// [Serializable]
+		// [ClassInterface(ClassInterfaceType.AutoDual)]
+		public override string ToString() {
+			String toStr = "";
+			for (int i = 0; i < errors.Count; i++) {
+				toStr = toStr + errors[i].ToString() + "\n";
+			}
+			return toStr;
+		}
+
+		internal void Add(byte theClass, int lineNumber,
+			string message,	int number, string procedure,
+			string server, string source, byte state) {
+			
+			errors.Add (theClass, lineNumber, message,
+				number, procedure,
+				server, source, state);
+		}
+
+		[MonoTODO]
+		~SqlException() {
+			// FIXME: destructor to release resources
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlInfoMessageEventArgs.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlInfoMessageEventArgs.cs
new file mode 100644
index 00000000000..df69dff1d35
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlInfoMessageEventArgs.cs
@@ -0,0 +1,51 @@
+//
+// System.Data.SqlClient.SqlInfoMessageEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public sealed class SqlInfoMessageEventArgs : EventArgs
+	{
+		[MonoTODO]
+		public SqlErrorCollection Errors {
+			get { 
+				throw new NotImplementedException (); 
+			}
+		}	
+
+		[MonoTODO]
+		public string Message 
+		{
+			get { 
+				throw new NotImplementedException (); 
+			}
+		}	
+
+		[MonoTODO]
+		public string Source {
+			get { 
+				throw new NotImplementedException (); 
+			}
+		}
+
+		[MonoTODO]
+		public override string ToString() {
+			// representation of InfoMessage event
+			return "'ToString() for SqlInfoMessageEventArgs Not Implemented'";
+		}
+
+		//[MonoTODO]
+		//~SqlInfoMessageEventArgs() {
+			// FIXME: destructor needs to release resources
+		//}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlInfoMessageEventHandler.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlInfoMessageEventHandler.cs
new file mode 100644
index 00000000000..c9862d61c03
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlInfoMessageEventHandler.cs
@@ -0,0 +1,19 @@
+//
+// System.Data.SqlClient.SqlInfoMessageEventHandler.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public delegate void 
+	SqlInfoMessageEventHandler (object sender,
+				SqlInfoMessageEventArgs e);
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
new file mode 100644
index 00000000000..6c05695eafc
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlParameter.cs
@@ -0,0 +1,237 @@
+//
+// System.Data.SqlClient.SqlParameter.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc. 2002
+//
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Runtime.InteropServices;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Represents a parameter to a Command object, and optionally, 
+	/// its mapping to DataSet columns; and is implemented by .NET 
+	/// data providers that access data sources.
+	/// </summary>
+	//public sealed class SqlParameter : MarshalByRefObject,
+	//	IDbDataParameter, IDataParameter, ICloneable
+	public sealed class SqlParameter : IDbDataParameter, IDataParameter
+	{
+		private string parmName;
+		private SqlDbType dbtype;
+		private DbType    theDbType;
+		private object objValue;
+		private int size;
+		private string sourceColumn;
+		private ParameterDirection direction;
+		private bool isNullable;
+		private byte precision;
+		private byte scale;
+		private DataRowVersion sourceVersion;
+		private int offset;
+
+		[MonoTODO]
+		public SqlParameter () {
+		
+		}
+
+		[MonoTODO]
+		public SqlParameter (string parameterName, object value) {
+			this.parmName = parameterName;
+			this.objValue = value;
+		}
+		
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType) {
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+		}
+
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType,
+			int size) {
+
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+			this.size = size;
+		}
+		
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType,
+			int size, string sourceColumn) {
+
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+			this.size = size;
+			this.sourceColumn = sourceColumn;
+		}
+			 
+		[MonoTODO]
+		public SqlParameter(string parameterName, SqlDbType dbType,
+			int size, ParameterDirection direction, 
+			bool isNullable, byte precision,
+			byte scale, string sourceColumn,
+			DataRowVersion sourceVersion, object value) {
+			
+			this.parmName = parameterName;
+			this.dbtype = dbType;
+			this.size = size;
+			this.sourceColumn = sourceColumn;
+			this.direction = direction;
+			this.isNullable = isNullable;
+			this.precision = precision;
+			this.scale = scale;
+			this.sourceVersion = sourceVersion;
+			this.objValue = value;
+		}
+
+		[MonoTODO]
+		public DbType DbType {
+			get { 
+				return theDbType;
+			}
+			set { 
+				theDbType = value;
+			}
+		}
+
+		[MonoTODO]
+		public ParameterDirection Direction {
+			get { 
+				return direction;
+			}
+			set { 
+				direction = value;
+			}
+		}
+
+		[MonoTODO]
+		public bool IsNullable	{
+			get { 
+				return isNullable;
+			}
+		}
+
+		[MonoTODO]
+		public int Offset {
+			get {
+				return offset;
+			}
+			
+			set {
+				offset = value;
+			}
+		}
+
+		
+		string IDataParameter.ParameterName {
+			get { 
+				return parmName;
+			}
+
+			set { 
+				parmName = value;
+			}
+		}
+		
+		public string ParameterName {
+			get { 
+				return parmName;
+			}
+
+			set { 
+				parmName = value;
+			}
+		}
+
+		[MonoTODO]
+		public string SourceColumn {
+			get { 
+				return sourceColumn;
+			}
+
+			set { 
+				sourceColumn = value;
+			}
+		}
+
+		[MonoTODO]
+		public DataRowVersion SourceVersion {
+			get { 
+				return sourceVersion;
+			}
+
+			set { 
+				sourceVersion = value;
+			}
+		}
+		
+		[MonoTODO]
+		public SqlDbType SqlDbType {
+			get {
+				return dbtype;
+			}
+			
+			set {
+				dbtype = value;
+			}
+		}
+
+		[MonoTODO]
+		public object Value {
+			get { 
+				return objValue;
+			}
+
+			set { 
+				objValue = value;
+			}
+		}
+
+		[MonoTODO]
+		public byte Precision {
+			get { 
+				return precision;
+			}
+
+			set { 
+				precision = value;
+			}
+		}
+
+		[MonoTODO]
+                public byte Scale {
+			get { 
+				return scale;
+			}
+
+			set { 
+				scale = value;
+			}
+		}
+
+		[MonoTODO]
+                public int Size
+		{
+			get { 
+				return size;
+			}
+
+			set { 
+				size = value;
+			}
+		}
+
+		[MonoTODO]
+		public override string ToString() {
+			return parmName;
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs
new file mode 100644
index 00000000000..c1778299b86
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlParameterCollection.cs
@@ -0,0 +1,267 @@
+//
+// System.Data.SqlClient.SqlParameterCollection.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.ComponentModel;
+using System.Data;
+using System.Data.Common;
+using System.Collections;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Collects all parameters relevant to a Command object 
+	/// and their mappings to DataSet columns.
+	/// </summary>
+	// public sealed class SqlParameterCollection : MarshalByRefObject,
+	// IDataParameterCollection, IList, ICollection, IEnumerable
+	public sealed class SqlParameterCollection : IDataParameterCollection,
+		IList
+	{
+		private ArrayList parameterList = new ArrayList();
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator()
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		public int Add(	object value)
+		{
+			// Call the add version that receives a SqlParameter 
+			
+			// Check if value is a SqlParameter.
+			CheckType(value);
+			Add((SqlParameter) value);
+
+			return IndexOf (value);
+		}
+
+		
+		public SqlParameter Add(SqlParameter value)
+		{
+			parameterList.Add(value);
+			return value;
+		}
+
+		
+		public SqlParameter Add(string parameterName, object value)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.Value = value;
+			// TODO: Get the dbtype and Sqldbtype from system type of value.
+			
+			return Add(sqlparam);
+		}
+
+		
+		public SqlParameter Add(string parameterName, SqlDbType sqlDbType)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.ParameterName = parameterName;
+			sqlparam.SqlDbType = sqlDbType;
+			return Add(sqlparam);			
+		}
+
+		
+		public SqlParameter Add(string parameterName,
+			SqlDbType sqlDbType, int size)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.ParameterName = parameterName;
+			sqlparam.SqlDbType = sqlDbType;
+			sqlparam.Size = size;
+			return Add(sqlparam);			
+		}
+
+		
+		public SqlParameter Add(string parameterName,
+			SqlDbType sqlDbType, int size, string sourceColumn)
+		{
+			SqlParameter sqlparam = new SqlParameter();
+			sqlparam.ParameterName = parameterName;
+			sqlparam.SqlDbType = sqlDbType;
+			sqlparam.Size = size;
+			sqlparam.SourceColumn = sourceColumn;
+			return Add(sqlparam);			
+		}
+
+		[MonoTODO]
+		public void Clear()
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		public bool Contains(object value)
+		{
+			// Check if value is a SqlParameter
+			CheckType(value);
+			return Contains(((SqlParameter)value).ParameterName);
+		}
+
+
+		[MonoTODO]
+		public bool Contains(string value)
+		{
+			for(int p = 0; p < parameterList.Count; p++) {
+				if(((SqlParameter)parameterList[p]).ParameterName.Equals(value))
+					return true;
+			}
+			return false;
+		}
+
+		[MonoTODO]
+		public void CopyTo(Array array,	int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		public int IndexOf(object value)
+		{
+			// Check if value is a SqlParameter
+			CheckType(value);
+			return IndexOf(((SqlParameter)value).ParameterName);
+		}
+
+		
+		public int IndexOf(string parameterName)
+		{
+			int p = -1;
+
+			for(p = 0; p < parameterList.Count; p++) {
+				if(((SqlParameter)parameterList[p]).ParameterName.Equals(parameterName))
+					return p;
+			}
+			return p;
+		}
+
+		[MonoTODO]
+		public void Insert(int index, object value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Remove(object value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RemoveAt(int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RemoveAt(string parameterName)
+		{
+			throw new NotImplementedException ();
+		}
+	
+		[MonoTODO]
+		public int Count {
+			get {	
+				return parameterList.Count;
+			}			  
+		}
+
+		object IList.this[int index] {
+			[MonoTODO]
+			get { 
+				return (SqlParameter) this[index];
+			}
+			
+			[MonoTODO]
+			set { 
+				this[index] = (SqlParameter) value;
+			}
+		}
+
+		public SqlParameter this[int index] {
+			get {	
+				return (SqlParameter) parameterList[index];
+			}			  
+			
+			set {	
+				parameterList[index] = (SqlParameter) value;
+			}			  
+		}
+
+		object IDataParameterCollection.this[string parameterName] {
+			[MonoTODO]
+			get { 
+				return this[parameterName];
+			}
+			
+			[MonoTODO]
+			set { 
+				CheckType(value);
+				this[parameterName] = (SqlParameter) value;
+			}
+		}
+
+		public SqlParameter this[string parameterName] {
+			get {	
+				for(int p = 0; p < parameterList.Count; p++) {
+					if(parameterName.Equals(((SqlParameter)parameterList[p]).ParameterName))
+						return (SqlParameter) parameterList[p];
+				}
+				throw new IndexOutOfRangeException("The specified name does not exist: " + parameterName);
+			}	  
+			
+			set {	
+				for(int p = 0; p < parameterList.Count; p++) {
+					if(parameterName.Equals(((SqlParameter)parameterList[p]).ParameterName))
+						parameterList[p] = value;
+				}
+				throw new IndexOutOfRangeException("The specified name does not exist: " + parameterName);
+			}			  
+		}
+
+		bool IList.IsFixedSize {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		bool IList.IsReadOnly {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		bool ICollection.IsSynchronized {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+
+		object ICollection.SyncRoot {
+			get {	
+				throw new NotImplementedException ();
+			}			  
+		}
+		
+		/// <summary>
+		/// This method checks if the parameter value is of 
+		/// SqlParameter type. If it doesn't, throws an InvalidCastException.
+		/// </summary>
+		private void CheckType(object value)
+		{
+			if(!(value is SqlParameter))
+				throw new InvalidCastException("Only SQLParameter objects can be used.");
+		}
+		
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatedEventArgs.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatedEventArgs.cs
new file mode 100644
index 00000000000..dbc5789aa95
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatedEventArgs.cs
@@ -0,0 +1,37 @@
+//
+// System.Data.SqlClient.SqlRowUpdatedEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient {
+	public sealed class SqlRowUpdatedEventArgs : RowUpdatedEventArgs 
+	{
+		[MonoTODO]
+		public SqlRowUpdatedEventArgs (DataRow row, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+			: base (row, command, statementType, tableMapping)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public new SqlCommand Command {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		~SqlRowUpdatedEventArgs () 
+		{
+			throw new NotImplementedException ();
+		}
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatedEventHandler.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatedEventHandler.cs
new file mode 100644
index 00000000000..8cad2f1cbca
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatedEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.SqlClient.SqlRowUpdatedEventHandler.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public delegate void SqlRowUpdatedEventHandler(object sender,
+					SqlRowUpdatedEventArgs e);
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatingEventArgs.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatingEventArgs.cs
new file mode 100644
index 00000000000..6194ca1f95d
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatingEventArgs.cs
@@ -0,0 +1,43 @@
+//
+// System.Data.SqlClient.SqlRowUpdatingEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient
+{
+	public sealed class SqlRowUpdatingEventArgs : RowUpdatingEventArgs
+	{
+		[MonoTODO]
+		public SqlRowUpdatingEventArgs (DataRow row, IDbCommand command, StatementType statementType, DataTableMapping tableMapping) 
+			: base (row, command, statementType, tableMapping)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public new SqlCommand Command {
+			get {
+				throw new NotImplementedException ();
+			} 
+			
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		~SqlRowUpdatingEventArgs() 
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatingEventHandler.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatingEventHandler.cs
new file mode 100644
index 00000000000..69c0228534d
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlRowUpdatingEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.SqlClient.SqlRowUpdatingEventHandler.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+
+namespace System.Data.SqlClient
+{
+	public delegate void SqlRowUpdatingEventHandler(object sender,
+			SqlRowUpdatingEventArgs e);
+}
diff --git a/mcs/class/System.Data/System.Data.SqlClient/SqlTransaction.cs b/mcs/class/System.Data/System.Data.SqlClient/SqlTransaction.cs
new file mode 100644
index 00000000000..3a485b299c5
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlClient/SqlTransaction.cs
@@ -0,0 +1,191 @@
+//
+// System.Data.SqlClient.SqlTransaction.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc. 2002
+//
+
+// use #define DEBUG_SqlTransaction if you want to spew debug messages
+// #define DEBUG_SqlTransaction
+
+
+using System;
+using System.Data;
+using System.Data.Common;
+
+namespace System.Data.SqlClient
+{
+	/// <summary>
+	/// Represents a transaction to be performed on a SQL database.
+	/// </summary>
+	// public sealed class SqlTransaction : MarshalByRefObject,
+	//	IDbTransaction, IDisposable
+	public sealed class SqlTransaction : IDbTransaction
+	{
+		#region Fields
+
+		private bool doingTransaction = false;
+		private SqlConnection conn = null;
+		private IsolationLevel isolationLevel =	
+			IsolationLevel.ReadCommitted;
+		// There are only two IsolationLevel's for PostgreSQL:
+		//    ReadCommitted and Serializable, 
+		// but ReadCommitted is the default 
+		
+		#endregion
+               
+		#region Public Methods
+
+		[MonoTODO]
+		public void Commit ()
+		{
+			if(doingTransaction == false)
+				throw new InvalidOperationException(
+					"Begin transaction was not " +
+					"done earlier " +
+					"thus PostgreSQL can not " +
+					"Commit transaction.");
+			
+			SqlCommand cmd = new SqlCommand("COMMIT", conn);
+			cmd.ExecuteNonQuery();
+						
+			doingTransaction = false;
+		}		
+
+		[MonoTODO]
+		public void Rollback()
+		{
+			if(doingTransaction == false)
+				throw new InvalidOperationException(
+					"Begin transaction was not " +
+					"done earlier " +
+					"thus PostgreSQL can not " +
+					"Rollback transaction.");
+			
+			SqlCommand cmd = new SqlCommand("ROLLBACK", conn);
+			cmd.ExecuteNonQuery();
+						
+			doingTransaction = false;
+		}
+
+		// For PostgreSQL, Rollback(string) will not be implemented
+		// because PostgreSQL does not support Savepoints
+		[Obsolete]
+		public void Rollback(string transactionName) {
+			// throw new NotImplementedException ();
+			Rollback();
+		}
+
+		// For PostgreSQL, Save(string) will not be implemented
+		// because PostgreSQL does not support Savepoints
+		[Obsolete]
+		public void Save (string savePointName) {
+			// throw new NotImplementedException ();
+		}
+
+		#endregion // Public Methods
+
+		#region Internal Methods to System.Data.dll Assembly
+
+		internal void Begin()
+		{
+			if(doingTransaction == true)
+				throw new InvalidOperationException(
+					"Transaction has begun " +
+					"and PostgreSQL does not " +
+					"support nested transactions.");
+			
+			SqlCommand cmd = new SqlCommand("BEGIN", conn);
+			cmd.ExecuteNonQuery();
+						
+			doingTransaction = true;
+		}
+
+		internal void SetIsolationLevel(IsolationLevel isoLevel)
+		{
+			String sSql = "SET TRANSACTION ISOLATION LEVEL ";
+ 
+			switch (isoLevel) 

+			{
+				case IsolationLevel.ReadCommitted:
+					sSql += "READ COMMITTED";
+					break;
+
+				case IsolationLevel.Serializable:
+					sSql += "SERIALIZABLE";
+					break;
+
+				default:
+					// FIXME: generate exception here
+					// PostgreSQL only supports:
+					//   ReadCommitted or Serializable
+					break;
+			}
+			SqlCommand cmd = new SqlCommand(sSql, conn);
+			cmd.ExecuteNonQuery();
+
+			this.isolationLevel = isoLevel;
+		}
+
+		internal void SetConnection(SqlConnection connection)
+		{
+			this.conn = connection;
+		}
+
+		#endregion // Internal Methods to System.Data.dll Assembly
+
+		#region Properties
+
+		IDbConnection IDbTransaction.Connection	{
+			get { 
+				return Connection; 
+			}
+		}
+
+		public SqlConnection Connection	{
+			get { 
+				return conn; 
+			}
+		}
+
+		public IsolationLevel IsolationLevel {
+			get { 
+				return isolationLevel; 
+			}
+		}
+
+		internal bool DoingTransaction {
+			get {
+				return doingTransaction;
+			}
+		}
+
+		#endregion Properties
+
+		#region Destructors
+
+		// Destructors aka Finalize and Dispose
+
+		[MonoTODO]
+		public void Dispose()
+		{
+			// FIXME: need to properly release resources
+			// Dispose(true);
+		}
+
+		// Destructor 
+		[MonoTODO]
+		// [Serializable]

+		// [ClassInterface(ClassInterfaceType.AutoDual)]
+		~SqlTransaction() {
+			// FIXME: need to properly release resources
+			// Dispose(false);
+		}
+
+		#endregion // Destructors
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/INullable.cs b/mcs/class/System.Data/System.Data.SqlTypes/INullable.cs
new file mode 100644
index 00000000000..cc4b6f9bb8f
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/INullable.cs
@@ -0,0 +1,22 @@
+//
+// System.Data.SqlTypes.INullable
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Data.SqlTypes
+{
+	/// <summary>
+	/// All of the System.Data.SqlTypes objects and structures implement the INullable interface, 
+	/// reflecting the fact that, unlike the corresponding system types, SqlTypes can legally contain the value null.
+	/// </summary>
+	public interface INullable
+	{
+		bool IsNull {
+			get;
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs
new file mode 100644
index 00000000000..47a7b2b43ff
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlBinary.cs
@@ -0,0 +1,232 @@
+//
+// System.Data.SqlTypes.SqlBinary
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc.
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	/// <summary>
+	/// Represents a variable-length stream of binary data to be stored in or retrieved from a database.
+	/// </summary>
+	public struct SqlBinary : INullable, IComparable
+	{
+
+		#region Fields
+
+		byte[] value;
+
+		public static readonly SqlBinary Null;
+
+		#endregion
+
+		#region Constructors
+		
+		public SqlBinary (byte[] value) 
+		{
+			this.value = value;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public bool IsNull {
+			get { return (bool) (this == Null); }
+		}
+
+		public byte this[int index] {
+			get { 
+				if (this.IsNull)
+					throw new SqlNullValueException ("The property contains Null.");
+				else if (index >= this.Length)
+					throw new SqlNullValueException ("The index parameter indicates a position beyond the length of the byte array.");
+				else
+					return value [index]; 
+			}
+		}
+
+		public int Length {
+			get { 
+				if (this.IsNull)
+					throw new SqlNullValueException ("The property contains Null.");
+				else
+					return value.Length;
+			}
+		}
+
+		public byte[] Value 
+		{
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ("The property contains Null.");
+				else 
+					return value; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public int CompareTo (object value) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlBinary Concat (SqlBinary x, SqlBinary y) 
+		{
+			return (x + y);
+		}
+
+		public override bool Equals (object value) 
+		{
+			if (!(value is SqlBinary))
+				return false;
+			else
+				return (bool) (this == (SqlBinary)value);
+		}
+
+		public static SqlBoolean Equals(SqlBinary x, SqlBinary y) 
+		{
+			return (x == y);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode () 
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+
+		#region Operators
+
+		public static SqlBoolean GreaterThan (SqlBinary x, SqlBinary y) 
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlBinary x, SqlBinary y) 
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan (SqlBinary x, SqlBinary y) 
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual (SqlBinary x, SqlBinary y) 
+		{
+			return (x <= y);
+		}
+
+		public static SqlBoolean NotEquals (SqlBinary x, SqlBinary y) 
+		{
+			return (x != y);
+		}
+
+		public SqlGuid ToSqlGuid () 
+		{
+			return new SqlGuid (value);
+		}
+
+		[MonoTODO]
+		public override string ToString () 
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+
+		#region Operators
+
+		[MonoTODO]
+		public static SqlBinary operator + (SqlBinary x, SqlBinary y) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlBoolean operator == (SqlBinary x, SqlBinary y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlBoolean operator > (SqlBinary x, SqlBinary y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlBoolean operator >= (SqlBinary x, SqlBinary y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlBoolean operator != (SqlBinary x, SqlBinary y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlBoolean operator < (SqlBinary x, SqlBinary y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlBoolean operator <= (SqlBinary x, SqlBinary y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				throw new NotImplementedException ();
+		}
+
+		public static explicit operator byte[] (SqlBinary x) 
+		{
+			return x.Value;
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlBinary (SqlGuid x) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static implicit operator SqlBinary (byte[] x) 
+		{
+			return new SqlBinary (x);
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlBoolean.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlBoolean.cs
new file mode 100644
index 00000000000..863d23f0227
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlBoolean.cs
@@ -0,0 +1,377 @@
+//
+// System.Data.SqlTypes.SqlBoolean
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc. 2002
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	/// <summary>
+	/// Represents an integer value that is either 1 or 0 
+	/// to be stored in or retrieved from a database.
+	/// </summary>
+	public struct SqlBoolean : INullable, IComparable 
+	{
+
+		#region Fields
+
+		byte value;
+
+		public static readonly SqlBoolean False = new SqlBoolean (false);
+		public static readonly SqlBoolean Null;
+		public static readonly SqlBoolean One = new SqlBoolean (1);
+		public static readonly SqlBoolean True = new SqlBoolean (true);
+		public static readonly SqlBoolean Zero = new SqlBoolean (0);
+
+		#endregion // Fields
+
+		#region Constructors
+
+		public SqlBoolean (bool value) 
+		{
+			this.value = (byte) (value ? 1 : 0);
+		}
+
+		public SqlBoolean (int value) 
+		{
+			this.value = (byte) (value != 0 ? 1 : 0);
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+
+		public byte ByteValue {
+			get {
+				if (this.IsNull)
+					throw new SqlNullValueException( "The property is set to null.");
+				else
+					return value;
+			}
+		}
+
+		public bool IsFalse {
+			get { 
+				if (this.IsNull) 
+					return false;
+				else 
+					return (value == 0);
+			}
+		}
+
+		public bool IsNull {
+			get { return (bool) (this == Null); }
+		}
+
+		public bool IsTrue {
+			get { 
+				if (this.IsNull) 
+					return false;
+				else 	
+					return (value != 0);
+			}
+		}
+
+		public bool Value {
+			get { 
+				if (this.IsNull)
+					throw new SqlNullValueException( "The property is set to null.");
+				else
+					return this.IsTrue;
+			}
+		}
+
+		#endregion // Properties
+
+		public static SqlBoolean And (SqlBoolean x, SqlBoolean y) 
+		{
+			return (x & y);
+		}
+
+		public int CompareTo (object value) 
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlBoolean))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlBoolean"));
+			else if (((SqlBoolean)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlBoolean)value).ByteValue);
+		}
+
+		public override bool Equals(object value) 
+		{
+			if (!(value is SqlByte))
+				return false;
+			else
+				return (bool) (this == (SqlBoolean)value);
+		}
+
+		public static SqlBoolean Equals(SqlBoolean x, SqlBoolean y) 
+		{
+			return (x == y);
+		}
+
+		public override int GetHashCode() 
+		{
+			return (int)value;
+		}
+
+		public static SqlBoolean NotEquals(SqlBoolean x, SqlBoolean y) 
+		{
+			return (x != y);
+		}
+
+		public static SqlBoolean OnesComplement(SqlBoolean x) 
+		{
+			return ~x;
+		}
+
+		public static SqlBoolean Or(SqlBoolean x, SqlBoolean y) 
+		{
+			return (x | y);
+		}
+
+		public static SqlBoolean Parse(string s) 
+		{
+			return new SqlBoolean (Boolean.Parse (s));
+		}
+
+		public SqlByte ToSqlByte() 
+		{
+			return new SqlByte (value);
+		}
+
+		// **************************************************
+		// Conversion from SqlBoolean to other SqlTypes
+		// **************************************************
+
+		public SqlDecimal ToSqlDecimal() 
+		{
+			return ((SqlDecimal)this);
+		}
+
+		public SqlDouble ToSqlDouble() 
+		{
+			return ((SqlDouble)this);
+		}
+
+		public SqlInt16 ToSqlInt16() 
+		{
+			return ((SqlInt16)this);
+		}
+
+		public SqlInt32 ToSqlInt32() 
+		{
+			return ((SqlInt32)this);
+		}
+
+		public SqlInt64 ToSqlInt64() 
+		{
+			return ((SqlInt64)this);
+		}
+
+		public SqlMoney ToSqlMoney() 
+		{
+			return ((SqlMoney)this);
+		}
+
+		public SqlSingle ToSqlSingle() 
+		{
+			return ((SqlSingle)this);
+		}
+
+		[MonoTODO]
+		public SqlString ToSqlString() 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override string ToString() 
+		{
+			throw new NotImplementedException ();
+		}
+
+		// Bitwise exclusive-OR (XOR)
+		public static SqlBoolean Xor(SqlBoolean x, SqlBoolean y) 
+		{
+			return (x ^ y);
+		}
+
+		// **************************************************
+		// Public Operators
+		// **************************************************
+
+		// Bitwise AND
+		public static SqlBoolean operator & (SqlBoolean x, SqlBoolean y)
+		{
+			return new SqlBoolean (x.Value & y.Value);
+		}
+
+		// Bitwise OR
+		public static SqlBoolean operator | (SqlBoolean x, SqlBoolean y)
+		{
+			return new SqlBoolean (x.Value | y.Value);
+
+		}
+
+		// Compares two instances for equality
+		public static SqlBoolean operator == (SqlBoolean x, SqlBoolean y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value == y.Value);
+		}
+		
+		// Bitwize exclusive-OR (XOR)
+		public static SqlBoolean operator ^ (SqlBoolean x, SqlBoolean y) 
+		{
+			return new SqlBoolean (x.Value ^ y.Value);
+		}
+
+		// test Value of SqlBoolean to determine it is false.
+		public static bool operator false (SqlBoolean x) 
+		{
+			return x.IsFalse;
+		}
+
+		// in-equality
+		public static SqlBoolean operator != (SqlBoolean x, SqlBoolean y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value != y.Value);
+		}
+
+		// Logical NOT
+		public static SqlBoolean operator ! (SqlBoolean x) 
+		{
+			if (x.IsNull)
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (!x.Value);
+		}
+
+		// One's Complement
+		public static SqlBoolean operator ~ (SqlBoolean x) 
+		{
+			return new SqlBoolean (~x.ByteValue);
+		}
+
+		// test to see if value is true
+		public static bool operator true (SqlBoolean x) 
+		{
+			return x.IsTrue;
+		}
+
+		// ****************************************
+		// Type Conversion 
+		// ****************************************
+
+		
+		// SqlBoolean to Boolean
+		public static explicit operator bool (SqlBoolean x) 
+		{
+			return x.Value;
+		}
+
+		
+		// SqlByte to SqlBoolean
+		public static explicit operator SqlBoolean (SqlByte x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlBoolean ((int)x.Value);
+		}
+
+		// SqlDecimal to SqlBoolean
+		public static explicit operator SqlBoolean (SqlDecimal x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlBoolean ((int)x.Value);
+		}
+		
+		// SqlDouble to SqlBoolean
+		public static explicit operator SqlBoolean (SqlDouble x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlBoolean ((int)x.Value);
+		}
+
+		// SqlInt16 to SqlBoolean
+		public static explicit operator SqlBoolean (SqlInt16 x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlBoolean ((int)x.Value);
+		}
+
+		// SqlInt32 to SqlBoolean
+		public static explicit operator SqlBoolean (SqlInt32 x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlBoolean (x.Value);
+		}
+
+		// SqlInt64 to SqlBoolean
+		public static explicit operator SqlBoolean (SqlInt64 x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlBoolean ((int)x.Value);
+		}
+
+		// SqlMoney to SqlBoolean
+		public static explicit operator SqlBoolean (SqlMoney x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlBoolean ((int)x.Value);
+		}
+
+		// SqlSingle to SqlBoolean
+		public static explicit operator SqlBoolean (SqlSingle x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlBoolean ((int)x.Value);
+		}
+
+		// SqlString to SqlBoolean
+		[MonoTODO]
+		public static explicit operator SqlBoolean (SqlString x) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		// Boolean to SqlBoolean
+		public static implicit operator SqlBoolean (bool x) 
+		{
+			return new SqlBoolean (x);
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs
new file mode 100644
index 00000000000..feb5a339931
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlByte.cs
@@ -0,0 +1,390 @@
+//
+// System.Data.SqlTypes.SqlByte
+//
+// Author:
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	public struct SqlByte : INullable, IComparable
+	{
+		#region Fields
+
+		byte value;
+		public static readonly SqlByte MaxValue = new SqlByte (0xff);
+		public static readonly SqlByte MinValue = new SqlByte (0);
+		public static readonly SqlByte Null;
+		public static readonly SqlByte Zero = new SqlByte (0);
+
+		#endregion
+
+		#region Constructors
+
+		public SqlByte (byte value) 
+		{
+			this.value = value;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public bool IsNull {
+			get { return (bool) (this == Null); }
+		}
+
+		public byte Value { 
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ();
+				else 
+					return value; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public static SqlByte Add (SqlByte x, SqlByte y)
+		{
+			return (x + y);
+		}
+
+		public static SqlByte BitwiseAnd (SqlByte x, SqlByte y)
+		{
+			return (x & y);
+		}
+
+		public static SqlByte BitwiseOr (SqlByte x, SqlByte y)
+		{
+			return (x | y);
+		}
+
+		public int CompareTo (object value)
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlByte))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlByte"));
+			else if (((SqlByte)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlByte)value).Value);
+		}
+
+		public static SqlByte Divide (SqlByte x, SqlByte y)
+		{
+			return (x / y);
+		}
+
+		public override bool Equals (object value)
+		{
+			if (!(value is SqlByte))
+				return false;
+			else
+				return (bool) (this == (SqlByte)value);
+		}
+
+		public static SqlBoolean Equals (SqlByte x, SqlByte y)
+		{
+			return (x == y);
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int)value;
+		}
+
+		public static SqlBoolean GreaterThan (SqlByte x, SqlByte y)
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlByte x, SqlByte y)
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan (SqlByte x, SqlByte y)
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual (SqlByte x, SqlByte y)
+		{
+			return (x <= y);
+		}
+
+		public static SqlByte Mod (SqlByte x, SqlByte y)
+		{
+			return (x % y);
+		}
+
+		public static SqlByte Multiply (SqlByte x, SqlByte y)
+		{
+			return (x * y);
+		}
+
+		public static SqlBoolean NotEquals (SqlByte x, SqlByte y)
+		{
+			return (x != y);
+		}
+
+		public static SqlByte OnesComplement (SqlByte x)
+		{
+			return ~x;
+		}
+
+		[MonoTODO]
+		public static SqlByte Parse (string s)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlByte Subtract (SqlByte x, SqlByte y)
+		{
+			return (x - y);
+		}
+
+		public SqlBoolean ToSqlBoolean ()
+		{
+			return ((SqlBoolean)this);
+		}
+		
+		public SqlDecimal ToSqlDecimal ()
+		{
+			return ((SqlDecimal)this);
+		}
+
+		public SqlDouble ToSqlDouble ()
+		{
+			return ((SqlDouble)this);
+		}
+
+		public SqlInt16 ToSqlInt16 ()
+		{
+			return ((SqlInt16)this);
+		}
+
+		public SqlInt32 ToSqlInt32 ()
+		{
+			return ((SqlInt32)this);
+		}
+
+		public SqlInt64 ToSqlInt64 ()
+		{
+			return ((SqlInt64)this);
+		}
+
+		public SqlMoney ToSqlMoney ()
+		{
+			return ((SqlMoney)this);
+		}
+
+		public SqlSingle ToSqlSingle ()
+		{
+			return ((SqlSingle)this);
+		}
+
+		public SqlString ToSqlString ()
+		{
+			return ((SqlString)this);
+		}
+
+		public override string ToString ()
+		{
+			if (this.IsNull)
+				return String.Empty;
+			else
+				return value.ToString ();
+		}
+
+		public static SqlByte Xor (SqlByte x, SqlByte y)
+		{
+			return (x ^ y);
+		}
+
+		public static SqlByte operator + (SqlByte x, SqlByte y)
+		{
+			return new SqlByte ((byte) (x.Value + y.Value));
+		}
+
+		public static SqlByte operator & (SqlByte x, SqlByte y)
+		{
+			return new SqlByte ((byte) (x.Value & y.Value));
+		}
+
+		public static SqlByte operator | (SqlByte x, SqlByte y)
+		{
+			return new SqlByte ((byte) (x.Value | y.Value));
+		}
+
+		public static SqlByte operator / (SqlByte x, SqlByte y)
+		{
+			return new SqlByte ((byte) (x.Value / y.Value));
+		}
+
+		public static SqlBoolean operator == (SqlByte x, SqlByte y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value == y.Value);
+		}
+
+		public static SqlByte operator ^ (SqlByte x, SqlByte y)
+		{
+			return new SqlByte ((byte) (x.Value ^ y.Value));
+		}
+
+		public static SqlBoolean operator > (SqlByte x, SqlByte y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value > y.Value);
+		}
+
+		public static SqlBoolean operator >= (SqlByte x, SqlByte y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value >= y.Value);
+		}
+
+		public static SqlBoolean operator != (SqlByte x, SqlByte y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (!(x.Value == y.Value));
+		}
+
+		public static SqlBoolean operator < (SqlByte x, SqlByte y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value < y.Value);
+		}
+
+		public static SqlBoolean operator <= (SqlByte x, SqlByte y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value <= y.Value);
+		}
+
+		public static SqlByte operator % (SqlByte x, SqlByte y)
+		{
+			return new SqlByte ((byte) (x.Value % y.Value));
+		}
+
+		public static SqlByte operator * (SqlByte x, SqlByte y)
+		{
+			return new SqlByte ((byte) (x.Value * y.Value));
+		}
+
+		public static SqlByte operator ~ (SqlByte x)
+		{
+			return new SqlByte ((byte) ~x.Value);
+		}
+
+		public static SqlByte operator - (SqlByte x, SqlByte y)
+		{
+			return new SqlByte ((byte) (x.Value - y.Value));
+		}
+
+		public static explicit operator SqlByte (SqlBoolean x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlByte (x.ByteValue);
+		}
+
+		public static explicit operator byte (SqlByte x)
+		{
+			return x.Value;
+		}
+
+		public static explicit operator SqlByte (SqlDecimal x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlByte ((byte)x.Value);
+		}
+
+		public static explicit operator SqlByte (SqlDouble x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlByte ((byte)x.Value);
+		}
+
+		public static explicit operator SqlByte (SqlInt16 x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlByte ((byte)x.Value);
+		}
+
+		public static explicit operator SqlByte (SqlInt32 x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlByte ((byte)x.Value);
+		}
+
+		public static explicit operator SqlByte (SqlInt64 x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlByte ((byte)x.Value);
+		}
+
+		public static explicit operator SqlByte (SqlMoney x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlByte ((byte)x.Value);
+		}
+
+		public static explicit operator SqlByte (SqlSingle x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlByte ((byte)x.Value);
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlByte (SqlString x)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static implicit operator SqlByte (byte x)
+		{
+			return new SqlByte (x);
+		}
+		
+		#endregion
+	}
+}
+			
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlCompareOptions.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlCompareOptions.cs
new file mode 100644
index 00000000000..c0ffcb53eb6
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlCompareOptions.cs
@@ -0,0 +1,29 @@
+//
+// System.Data.SqlTypes.SqlCompareOptions.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc. 2002
+//
+
+namespace System.Data.SqlTypes
+{
+	/// <summary>
+	/// Specifies the compare option values for a SqlString structure.
+	/// </summary>
+	[Flags]
+	[Serializable]
+	public enum SqlCompareOptions {
+		BinarySort = 0x8000,
+		IgnoreCase = 0x1,
+		IgnoreKanaType = 0x8,
+		IgnoreNonSpace = 0x2,
+		IgnoreWidth = 0x10,
+		None = 0
+	}
+
+}
+
+
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs
new file mode 100644
index 00000000000..ca53e300153
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlDateTime.cs
@@ -0,0 +1,249 @@
+//
+// System.Data.SqlTypes.SqlDateTime
+//
+// Author:
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	public struct SqlDateTime : INullable, IComparable
+	{
+		#region Fields
+		private DateTime value;
+
+		public static readonly SqlDateTime MaxValue = new SqlDateTime (9999,12,31);
+		public static readonly SqlDateTime MinValue = new SqlDateTime (1753,1,1);
+		public static readonly SqlDateTime Null;
+		public static readonly int SQLTicksPerHour;
+		public static readonly int SQLTicksPerMinute;
+		public static readonly int SQLTicksPerSecond;
+
+		#endregion
+
+		#region Constructors
+
+		public SqlDateTime (DateTime value) 
+		{
+			this.value = value;
+		}
+
+		[MonoTODO]
+		public SqlDateTime (int dayTicks, int timeTicks) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		public SqlDateTime (int year, int month, int day) 
+		{
+			this.value = new DateTime (year, month, day);
+		}
+
+		public SqlDateTime (int year, int month, int day, int hour, int minute, int second) 
+		{
+			this.value = new DateTime (year, month, day, hour, minute, second);
+		}
+
+		[MonoTODO]
+		public SqlDateTime (int year, int month, int day, int hour, int minute, int second, double millisecond) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public SqlDateTime (int year, int month, int day, int hour, int minute, int second, int bilisecond) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+
+		#region Properties
+
+		[MonoTODO]
+		public int DayTicks {
+			get { throw new NotImplementedException (); }
+		}
+
+		public bool IsNull { 
+			get { return (bool) (this == Null); }
+		}
+
+		[MonoTODO]
+		public int TimeTicks {
+			get { throw new NotImplementedException (); }
+		}
+
+		public DateTime Value {
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ("The property contains Null.");
+				else 
+					return value; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public int CompareTo (object value)
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlDateTime))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlDateTime"));
+			else if (((SqlDateTime)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlDateTime)value).Value);
+		}
+
+		public override bool Equals (object value)
+		{
+			if (!(value is SqlDateTime))
+				return false;
+			else
+				return (bool) (this == (SqlDateTime)value);
+		}
+
+		public static SqlBoolean Equals (SqlDateTime x, SqlDateTime y)
+		{
+			return (x == y);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			return 42;
+		}
+
+		public static SqlBoolean GreaterThan (SqlDateTime x, SqlDateTime y)
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlDateTime x, SqlDateTime y)
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan (SqlDateTime x, SqlDateTime y)
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual (SqlDateTime x, SqlDateTime y)
+		{
+			return (x <= y);
+		}
+
+		public static SqlBoolean NotEquals (SqlDateTime x, SqlDateTime y)
+		{
+			return (x != y);
+		}
+
+		[MonoTODO]
+		public static SqlDateTime Parse (string s)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public SqlString ToSqlString ()
+		{
+			return ((SqlString)this);
+		}
+
+		public override string ToString ()
+		{	
+			if (this.IsNull)
+				return String.Empty;
+			else
+				return value.ToString ();
+		}
+	
+		[MonoTODO]	
+		public static SqlDateTime operator + (SqlDateTime x, TimeSpan t)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlBoolean operator == (SqlDateTime x, SqlDateTime y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value == y.Value);
+		}
+
+		public static SqlBoolean operator > (SqlDateTime x, SqlDateTime y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value > y.Value);
+		}
+
+		public static SqlBoolean operator >= (SqlDateTime x, SqlDateTime y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value >= y.Value);
+		}
+
+		public static SqlBoolean operator != (SqlDateTime x, SqlDateTime y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (!(x.Value == y.Value));
+		}
+
+		public static SqlBoolean operator < (SqlDateTime x, SqlDateTime y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value < y.Value);
+		}
+
+		public static SqlBoolean operator <= (SqlDateTime x, SqlDateTime y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value <= y.Value);
+		}
+
+		[MonoTODO]
+		public static SqlDateTime operator - (SqlDateTime x, TimeSpan t)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static explicit operator DateTime (SqlDateTime x)
+		{
+			return x.Value;
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlDateTime (SqlString x)
+		{
+			throw new NotImplementedException();
+		}
+
+		public static implicit operator SqlDateTime (DateTime x)
+		{
+			return new SqlDateTime (x);
+		}
+
+		#endregion
+	}
+}
+			
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs
new file mode 100644
index 00000000000..93017993f35
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlDecimal.cs
@@ -0,0 +1,638 @@
+//
+// System.Data.SqlTypes.SqlDecimal
+//
+// Author:
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	public struct SqlDecimal : INullable, IComparable
+	{
+		#region Fields
+
+		int[] value;
+		byte precision;
+		byte scale;
+		bool positive;
+
+		// borrowed from System.Decimal
+		const int SCALE_SHIFT = 16;
+		const int SIGN_SHIFT = 31;
+		const int RESERVED_SS32_BITS = 0x7F00FFFF;
+
+		public static readonly byte MaxPrecision = 38; 
+		public static readonly byte MaxScale = 28;
+		public static readonly SqlDecimal MaxValue = new SqlDecimal (79228162514264337593543950335.0);
+		public static readonly SqlDecimal MinValue = new SqlDecimal (-79228162514264337593543950335.0);
+		public static readonly SqlDecimal Null;
+
+		#endregion
+
+		#region Constructors
+
+		public SqlDecimal (decimal value) 
+		{
+			int[] binData = Decimal.GetBits (value);
+
+			this.precision = MaxPrecision; // this value seems unclear
+
+			this.scale = (byte)(binData[3] >> SCALE_SHIFT);
+			if (this.scale > MaxScale || (this.scale & RESERVED_SS32_BITS) != 0)
+				throw new ArgumentException(Locale.GetText ("Invalid scale"));
+
+			this.positive = ((binData[3] >> SIGN_SHIFT) > 0);
+			this.value = new int[4];
+			this.value[0] = binData[0];
+			this.value[1] = binData[1];
+			this.value[2] = binData[2];
+			this.value[3] = 0;
+		}
+
+		public SqlDecimal (double value) : this ((decimal)value) { }
+		public SqlDecimal (int value) : this ((decimal)value) { }
+		public SqlDecimal (long value) : this ((decimal)value) { }
+
+		public SqlDecimal (byte bPrecision, byte bScale, bool fPositive, int[] bits) : this (bPrecision, bScale, fPositive, bits[0], bits[1], bits[2], bits[3]) { }
+
+		public SqlDecimal (byte bPrecision, byte bScale, bool fPositive, int data1, int data2, int data3, int data4) 
+		{
+			this.precision = bPrecision;
+			this.scale = bScale;
+			this.positive = fPositive;
+			this.value = new int[4];
+			this.value[0] = data1;
+			this.value[1] = data2;
+			this.value[2] = data3;
+			this.value[3] = data4;
+		}
+
+		#endregion
+
+		#region Properties
+
+		[MonoTODO]
+		public byte[] BinData {
+			get { throw new NotImplementedException (); }
+		}
+
+		public int[] Data { 
+			get { 
+				if (this.IsNull)
+					throw new SqlNullValueException ();
+				else
+					return (value);
+			}
+		}
+
+		public bool IsNull { 
+			get { return (bool) (this == Null); }
+		}
+
+		public bool IsPositive { 
+			get { return positive; }
+		}
+
+		public byte Precision { 
+			get { return precision; }
+		}
+
+		public byte Scale { 
+			get { return scale; }
+		}
+
+		public decimal Value { 
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ();
+				else 
+					if (this.value[3] > 0)
+						throw new OverflowException ();
+					else
+						System.Console.WriteLine( "boo!" );
+						return new decimal (value[0], value[1], value[2], !positive, scale);
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public static SqlDecimal Abs (SqlDecimal n)
+		{
+			throw new NotImplementedException();
+		}
+
+		public static SqlDecimal Add (SqlDecimal x, SqlDecimal y)
+		{
+			return (x + y);
+		}
+
+		[MonoTODO]
+		public static SqlDecimal AdjustScale (SqlDecimal n, int digits, bool fRound)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlDecimal Ceiling (SqlDecimal n)
+		{
+			throw new NotImplementedException();
+		}
+
+		public int CompareTo (object value)
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlDecimal))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlDecimal"));
+			else if (((SqlDecimal)value).IsNull)
+				return 1;
+			else
+				return this.Value.CompareTo (((SqlDecimal)value).Value);
+		}
+
+		[MonoTODO]
+		public static SqlDecimal ConvertToPrecScale (SqlDecimal n, int precision, int scale)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlDecimal Divide (SqlDecimal x, SqlDecimal y)
+		{
+			return (x / y);
+		}
+
+		public override bool Equals (object value)
+		{
+			if (!(value is SqlDecimal))
+				return false;
+			else
+				return (bool) (this == (SqlDecimal)value);
+		}
+
+		public static SqlBoolean Equals (SqlDecimal x, SqlDecimal y)
+		{
+			return (x == y);
+		}
+
+		[MonoTODO]
+		public static SqlDecimal Floor (SqlDecimal n)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int)this.Value;
+		}
+
+		public static SqlBoolean GreaterThan (SqlDecimal x, SqlDecimal y)
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlDecimal x, SqlDecimal y)
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan (SqlDecimal x, SqlDecimal y)
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual (SqlDecimal x, SqlDecimal y)
+		{
+			return (x <= y);
+		}
+
+		public static SqlDecimal Multiply (SqlDecimal x, SqlDecimal y)
+		{
+			return (x * y);
+		}
+
+		public static SqlBoolean NotEquals (SqlDecimal x, SqlDecimal y)
+		{
+			return (x != y);
+		}
+
+		[MonoTODO]
+		public static SqlDecimal Parse (string s)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlDecimal Power (SqlDecimal n, double exp)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlDecimal Round (SqlDecimal n, int position)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlInt32 Sign (SqlDecimal n)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlDecimal Subtract (SqlDecimal x, SqlDecimal y)
+		{
+			return (x - y);
+		}
+
+		public double ToDouble ()
+		{
+			return ((double)this.Value);
+		}
+
+		public SqlBoolean ToSqlBoolean ()
+		{
+			return ((SqlBoolean)this);
+		}
+		
+		public SqlByte ToSqlByte ()
+		{
+			return ((SqlByte)this);
+		}
+
+		public SqlDouble ToSqlDouble ()
+		{
+			return ((SqlDouble)this);
+		}
+
+		public SqlInt16 ToSqlInt16 ()
+		{
+			return ((SqlInt16)this);
+		}
+
+		public SqlInt32 ToSqlInt32 ()
+		{
+			return ((SqlInt32)this);
+		}
+
+		public SqlInt64 ToSqlInt64 ()
+		{
+			return ((SqlInt64)this);
+		}
+
+		public SqlMoney ToSqlMoney ()
+		{
+			return ((SqlMoney)this);
+		}
+
+		public SqlSingle ToSqlSingle ()
+		{
+			return ((SqlSingle)this);
+		}
+
+		public SqlString ToSqlString ()
+		{
+			return ((SqlString)this);
+		}
+
+		public override string ToString ()
+		{
+			if (this.IsNull)
+				return String.Empty;
+			else
+				return value.ToString ();
+		}
+
+		[MonoTODO]
+		public static SqlDecimal Truncate (SqlDecimal n, int position)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlDecimal operator + (SqlDecimal x, SqlDecimal y)
+		{
+			// if one of them is negative, perform subtraction
+			if (x.IsPositive && !y.IsPositive) return x - y;
+			if (y.IsPositive && !x.IsPositive) return y - x;
+		
+			// adjust the scale to the smaller of the two beforehand
+			if (x.Scale > y.Scale)
+				x = SqlDecimal.AdjustScale(x, y.Scale - x.Scale, true);
+			else if (y.Scale > x.Scale)
+				y = SqlDecimal.AdjustScale(y, x.Scale - y.Scale, true);
+
+			// set the precision to the greater of the two
+			byte resultPrecision;
+			if (x.Precision > y.Precision)
+				resultPrecision = x.Precision;
+			else
+				resultPrecision = y.Precision;
+				
+			int[] xData = x.Data;
+			int[] yData = y.Data;
+			int[] resultBits = new int[4];
+
+			ulong res; 
+			ulong carry = 0;
+
+			// add one at a time, and carry the results over to the next
+			for (int i = 0; i < 4; i +=1)
+			{
+				carry = 0;
+				res = (ulong)(xData[i]) + (ulong)(yData[i]) + carry;
+				if (res > Int32.MaxValue)
+				{
+					carry = res - Int32.MaxValue;
+					res = Int32.MaxValue;
+				}
+				resultBits [i] = (int)res;
+			}
+
+			// if we have carry left, then throw an exception
+			if (carry > 0)
+				throw new OverflowException ();
+			else
+				return new SqlDecimal (resultPrecision, x.Scale, x.IsPositive, resultBits);
+		}
+
+		[MonoTODO]
+		public static SqlDecimal operator / (SqlDecimal x, SqlDecimal y)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlBoolean operator == (SqlDecimal x, SqlDecimal y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+
+			if (x.Scale > y.Scale)
+				x = SqlDecimal.AdjustScale(x, y.Scale - x.Scale, true);
+			else if (y.Scale > x.Scale)
+				y = SqlDecimal.AdjustScale(y, x.Scale - y.Scale, true);
+
+			for (int i = 0; i < 4; i += 1)
+			{
+				if (x.Data[i] != y.Data[i])
+					return new SqlBoolean (false);
+			}
+			return new SqlBoolean (true);
+		}
+
+		public static SqlBoolean operator > (SqlDecimal x, SqlDecimal y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+
+			if (x.Scale > y.Scale)
+				x = SqlDecimal.AdjustScale(x, y.Scale - x.Scale, true);
+			else if (y.Scale > x.Scale)
+				y = SqlDecimal.AdjustScale(y, x.Scale - y.Scale, true);
+
+			for (int i = 3; i >= 0; i -= 1)
+			{
+				if (x.Data[i] == 0 && y.Data[i] == 0) 
+					continue;
+				else
+					return new SqlBoolean (x.Data[i] > y.Data[i]);
+			}
+			return new SqlBoolean (false);
+		}
+
+		public static SqlBoolean operator >= (SqlDecimal x, SqlDecimal y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+
+			if (x.Scale > y.Scale)
+				x = SqlDecimal.AdjustScale(x, y.Scale - x.Scale, true);
+			else if (y.Scale > x.Scale)
+				y = SqlDecimal.AdjustScale(y, x.Scale - y.Scale, true);
+
+			for (int i = 3; i >= 0; i -= 1)
+			{
+				if (x.Data[i] == 0 && y.Data[i] == 0) 
+					continue;
+				else
+					return new SqlBoolean (x.Data[i] >= y.Data[i]);
+			}
+			return new SqlBoolean (true);
+		}
+
+		public static SqlBoolean operator != (SqlDecimal x, SqlDecimal y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+
+			if (x.Scale > y.Scale)
+				x = SqlDecimal.AdjustScale(x, y.Scale - x.Scale, true);
+			else if (y.Scale > x.Scale)
+				y = SqlDecimal.AdjustScale(y, x.Scale - y.Scale, true);
+
+			for (int i = 0; i < 4; i += 1)
+			{
+				if (x.Data[i] != y.Data[i])
+					return new SqlBoolean (true);
+			}
+			return new SqlBoolean (false);
+		}
+
+		public static SqlBoolean operator < (SqlDecimal x, SqlDecimal y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+
+			if (x.Scale > y.Scale)
+				x = SqlDecimal.AdjustScale(x, y.Scale - x.Scale, true);
+			else if (y.Scale > x.Scale)
+				y = SqlDecimal.AdjustScale(y, x.Scale - y.Scale, true);
+
+			for (int i = 3; i >= 0; i -= 1)
+			{
+				if (x.Data[i] == 0 && y.Data[i] == 0) 
+					continue;
+
+				return new SqlBoolean (x.Data[i] < y.Data[i]);
+			}
+			return new SqlBoolean (false);
+		}
+
+		public static SqlBoolean operator <= (SqlDecimal x, SqlDecimal y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+
+			if (x.Scale > y.Scale)
+				x = SqlDecimal.AdjustScale(x, y.Scale - x.Scale, true);
+			else if (y.Scale > x.Scale)
+				y = SqlDecimal.AdjustScale(y, x.Scale - y.Scale, true);
+
+			for (int i = 3; i >= 0; i -= 1)
+			{
+				if (x.Data[i] == 0 && y.Data[i] == 0) 
+					continue;
+				else
+					return new SqlBoolean (x.Data[i] <= y.Data[i]);
+			}
+			return new SqlBoolean (true);
+		}
+
+		public static SqlDecimal operator * (SqlDecimal x, SqlDecimal y)
+		{
+			// adjust the scale to the smaller of the two beforehand
+			if (x.Scale > y.Scale)
+				x = SqlDecimal.AdjustScale(x, y.Scale - x.Scale, true);
+			else if (y.Scale > x.Scale)
+				y = SqlDecimal.AdjustScale(y, x.Scale - y.Scale, true);
+
+			// set the precision to the greater of the two
+			byte resultPrecision;
+			if (x.Precision > y.Precision)
+				resultPrecision = x.Precision;
+			else
+				resultPrecision = y.Precision;
+				
+			int[] xData = x.Data;
+			int[] yData = y.Data;
+			int[] resultBits = new int[4];
+
+			ulong res; 
+			ulong carry = 0;
+
+			// multiply one at a time, and carry the results over to the next
+			for (int i = 0; i < 4; i +=1)
+			{
+				carry = 0;
+				res = (ulong)(xData[i]) * (ulong)(yData[i]) + carry;
+				if (res > Int32.MaxValue)
+				{
+					carry = res - Int32.MaxValue;
+					res = Int32.MaxValue;
+				}
+				resultBits [i] = (int)res;
+			}
+
+			// if we have carry left, then throw an exception
+			if (carry > 0)
+				throw new OverflowException ();
+			else
+				return new SqlDecimal (resultPrecision, x.Scale, (x.IsPositive == y.IsPositive), resultBits);
+				
+		}
+
+		public static SqlDecimal operator - (SqlDecimal x, SqlDecimal y)
+		{
+			if (x.IsPositive && !y.IsPositive) return x + y;
+			if (!x.IsPositive && y.IsPositive) return -(x + y);
+			if (!x.IsPositive && !y.IsPositive) return y - x;
+
+			// otherwise, x is positive and y is positive
+			bool resultPositive = (bool)(x > y);
+			int[] yData = y.Data;
+
+			for (int i = 0; i < 4; i += 1) yData[i] = -yData[i];
+
+			SqlDecimal yInverse = new SqlDecimal (y.Precision, y.Scale, y.IsPositive, yData);
+
+			if (resultPositive)
+				return x + yInverse;
+			else
+				return -(x + yInverse);
+		}
+
+		public static SqlDecimal operator - (SqlDecimal n)
+		{
+			return new SqlDecimal (n.Precision, n.Scale, !n.IsPositive, n.Data);
+		}
+
+		public static explicit operator SqlDecimal (SqlBoolean x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDecimal ((decimal)x.ByteValue);
+		}
+
+		public static explicit operator Decimal (SqlDecimal n)
+		{
+			return n.Value;
+		}
+
+		public static explicit operator SqlDecimal (SqlDouble x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDecimal ((decimal)x.Value);
+		}
+
+		public static explicit operator SqlDecimal (SqlSingle x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDecimal ((decimal)x.Value);
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlDecimal (SqlString x)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static implicit operator SqlDecimal (decimal x)
+		{
+			return new SqlDecimal (x);
+		}
+
+		public static implicit operator SqlDecimal (SqlByte x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDecimal ((decimal)x.Value);
+		}
+
+		public static implicit operator SqlDecimal (SqlInt16 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDecimal ((decimal)x.Value);
+		}
+
+		public static implicit operator SqlDecimal (SqlInt32 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDecimal ((decimal)x.Value);
+		}
+
+		public static implicit operator SqlDecimal (SqlInt64 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDecimal ((decimal)x.Value);
+		}
+
+		public static implicit operator SqlDecimal (SqlMoney x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDecimal ((decimal)x.Value);
+		}
+
+		#endregion
+	}
+}
+			
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs
new file mode 100644
index 00000000000..427d13c0e17
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlDouble.cs
@@ -0,0 +1,345 @@
+//
+// System.Data.SqlTypes.SqlDouble
+//
+// Author:
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	public struct SqlDouble : INullable, IComparable
+	{
+		#region Fields
+		double value;
+
+		public static readonly SqlDouble MaxValue = new SqlDouble (1.79E+308);
+		public static readonly SqlDouble MinValue = new SqlDouble (-1.79E+308);
+		public static readonly SqlDouble Null;
+		public static readonly SqlDouble Zero = new SqlDouble (0);
+
+		#endregion
+
+		#region Constructors
+
+		public SqlDouble (double value) 
+		{
+			this.value = value;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public bool IsNull { 
+			get { return (bool) (this == Null); }
+		}
+
+		public double Value { 
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ();
+				else 
+					return value; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public static SqlDouble Add (SqlDouble x, SqlDouble y)
+		{
+			return (x + y);
+		}
+
+		public int CompareTo (object value)
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlDouble))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlDouble"));
+			else if (((SqlDouble)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlDouble)value).Value);
+		}
+
+		public static SqlDouble Divide (SqlDouble x, SqlDouble y)
+		{
+			return (x / y);
+		}
+
+		public override bool Equals (object value)
+		{
+			if (!(value is SqlDouble))
+				return false;
+			else
+				return (bool) (this == (SqlDouble)value);
+		}
+
+		public static SqlBoolean Equals (SqlDouble x, SqlDouble y)
+		{
+			return (x == y);
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int)value;
+		}
+
+		public static SqlBoolean GreaterThan (SqlDouble x, SqlDouble y)
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlDouble x, SqlDouble y)
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan (SqlDouble x, SqlDouble y)
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual (SqlDouble x, SqlDouble y)
+		{
+			return (x <= y);
+		}
+
+		public static SqlDouble Multiply (SqlDouble x, SqlDouble y)
+		{
+			return (x * y);
+		}
+
+		public static SqlBoolean NotEquals (SqlDouble x, SqlDouble y)
+		{
+			return (x != y);
+		}
+
+		[MonoTODO]
+		public static SqlDouble Parse (string s)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlDouble Subtract (SqlDouble x, SqlDouble y)
+		{
+			return (x - y);
+		}
+
+		public SqlBoolean ToSqlBoolean ()
+		{
+			return ((SqlBoolean)this);	
+		}
+		
+		public SqlByte ToSqlByte ()
+		{
+			return ((SqlByte)this);	
+		}
+
+		public SqlDecimal ToSqlDecimal ()
+		{
+			return ((SqlDecimal)this);	
+		}
+
+		public SqlInt16 ToSqlInt16 ()
+		{
+			return ((SqlInt16)this);
+		}
+
+		public SqlInt32 ToSqlInt32 ()
+		{
+			return ((SqlInt32)this);
+		}
+
+		public SqlInt64 ToSqlInt64 ()
+		{
+			return ((SqlInt64)this);
+		}
+
+		public SqlMoney ToSqlMoney ()
+		{
+			return ((SqlMoney)this);
+		}
+
+		public SqlSingle ToSqlSingle ()
+		{
+			return ((SqlSingle)this);
+		}
+
+		public SqlString ToSqlString ()
+		{
+			return ((SqlString)this);
+		}
+
+		public override string ToString ()
+		{
+			if (this.IsNull)
+				return String.Empty;
+			else
+				return value.ToString ();
+		}
+
+		public static SqlDouble operator + (SqlDouble x, SqlDouble y)
+		{
+			return new SqlDouble (x.Value + y.Value);
+		}
+
+		public static SqlDouble operator / (SqlDouble x, SqlDouble y)
+		{
+			return new SqlDouble (x.Value / y.Value);
+		}
+
+		public static SqlBoolean operator == (SqlDouble x, SqlDouble y)
+		{
+			if (x.IsNull || y.IsNull) 	
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value == y.Value);
+		}
+
+		public static SqlBoolean operator > (SqlDouble x, SqlDouble y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value > y.Value);
+		}
+
+		public static SqlBoolean operator >= (SqlDouble x, SqlDouble y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value >= y.Value);
+		}
+
+		public static SqlBoolean operator != (SqlDouble x, SqlDouble y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (!(x.Value == y.Value));
+		}
+
+		public static SqlBoolean operator < (SqlDouble x, SqlDouble y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value < y.Value);
+		}
+
+		public static SqlBoolean operator <= (SqlDouble x, SqlDouble y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value <= y.Value);
+		}
+
+		public static SqlDouble operator * (SqlDouble x, SqlDouble y)
+		{
+			return new SqlDouble (x.Value * y.Value);
+		}
+
+		public static SqlDouble operator - (SqlDouble x, SqlDouble y)
+		{
+			return new SqlDouble (x.Value - y.Value);
+		}
+
+		public static SqlDouble operator - (SqlDouble n)
+		{
+			return new SqlDouble (-(n.Value));
+		}
+
+		public static explicit operator SqlDouble (SqlBoolean x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDouble ((double)x.ByteValue);
+		}
+
+		public static explicit operator double (SqlDouble x)
+		{
+			return x.Value;
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlDouble (SqlString x)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static implicit operator SqlDouble (double x)
+		{
+			return new SqlDouble (x);
+		}
+
+		public static implicit operator SqlDouble (SqlByte x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDouble ((double)x.Value);
+		}
+
+		public static implicit operator SqlDouble (SqlDecimal x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDouble ((double)x.Value);
+		}
+
+		public static implicit operator SqlDouble (SqlInt16 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDouble ((double)x.Value);
+		}
+
+		public static implicit operator SqlDouble (SqlInt32 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDouble ((double)x.Value);
+		}
+
+		public static implicit operator SqlDouble (SqlInt64 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDouble ((double)x.Value);
+		}
+
+		public static implicit operator SqlDouble (SqlMoney x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDouble ((double)x.Value);
+		}
+
+		public static implicit operator SqlDouble (SqlSingle x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlDouble ((double)x.Value);
+		}
+
+		#endregion
+	}
+}
+			
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs
new file mode 100644
index 00000000000..5c020c57127
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlGuid.cs
@@ -0,0 +1,215 @@
+//
+// System.Data.SqlTypes.SqlGuid
+//
+// Author:
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	public struct SqlGuid : INullable, IComparable
+	{
+		#region Fields
+
+		Guid value;
+
+		public static readonly SqlGuid Null;
+
+		#endregion
+
+		#region Constructors
+
+		public SqlGuid (byte[] value) 
+		{
+			this.value = new Guid (value);
+		}
+
+		public SqlGuid (Guid g) 
+		{
+			this.value = g;
+		}
+
+		public SqlGuid (string s) 
+		{
+			this.value = new Guid (s);
+		}
+
+		public SqlGuid (int a, short b, short c, byte d, byte e, byte f, byte g, byte h, byte i, byte j, byte k) 
+		{
+			this.value = new Guid (a, b, c, d, e, f, g, h, i, j, k);
+		}
+
+		#endregion
+
+		#region Properties
+
+		public bool IsNull {
+			get { return (bool) (this == SqlGuid.Null); }
+		}
+
+		public Guid Value { 
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ("The property contains Null.");
+				else 
+					return value; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public int CompareTo (object value)
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlGuid))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlGuid"));
+			else if (((SqlGuid)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlGuid)value).Value);
+		}
+
+		public override bool Equals (object value)
+		{
+			if (!(value is SqlGuid))
+				return false;
+			else
+				return (bool) (this == (SqlGuid)value);
+		}
+
+		public static SqlBoolean Equals (SqlGuid x, SqlGuid y)
+		{
+			return (x == y);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			return 42;
+		}
+
+		public static SqlBoolean GreaterThan (SqlGuid x, SqlGuid y)
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlGuid x, SqlGuid y)
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan (SqlGuid x, SqlGuid y)
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual (SqlGuid x, SqlGuid y)
+		{
+			return (x <= y);
+		}
+
+		public static SqlBoolean NotEquals (SqlGuid x, SqlGuid y)
+		{
+			return (x != y);
+		}
+
+		[MonoTODO]
+		public static SqlGuid Parse (string s)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public byte[] ToByteArray()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public SqlBinary ToSqlBinary ()
+		{
+			return ((SqlBinary)this);
+		}
+
+		public SqlString ToSqlString ()
+		{
+			return ((SqlString)this);
+		}
+
+		public override string ToString ()
+		{
+			if (this.IsNull)
+				return String.Empty;
+			else
+				return value.ToString ();
+		}
+
+		public static SqlBoolean operator == (SqlGuid x, SqlGuid y)
+		{
+			if (x.IsNull || y.IsNull) return SqlBoolean.Null;
+			return new SqlBoolean (x.Value == y.Value);
+		}
+
+		[MonoTODO]
+		public static SqlBoolean operator > (SqlGuid x, SqlGuid y)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlBoolean operator >= (SqlGuid x, SqlGuid y)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlBoolean operator != (SqlGuid x, SqlGuid y)
+		{
+			if (x.IsNull || y.IsNull) return SqlBoolean.Null;
+			return new SqlBoolean (!(x.Value == y.Value));
+		}
+
+		[MonoTODO]
+		public static SqlBoolean operator < (SqlGuid x, SqlGuid y)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static SqlBoolean operator <= (SqlGuid x, SqlGuid y)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlGuid (SqlBinary x)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static explicit operator Guid (SqlGuid x)
+		{
+			return x.Value;
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlGuid (SqlString x)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static implicit operator SqlGuid (Guid x)
+		{
+			return new SqlGuid (x);
+		}
+
+		#endregion
+	}
+}
+			
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlInt16.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt16.cs
new file mode 100644
index 00000000000..725f9d08023
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt16.cs
@@ -0,0 +1,396 @@
+//
+// System.Data.SqlTypes.SqlInt16
+//
+// Author:
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	public struct SqlInt16 : INullable, IComparable
+	{
+		#region Fields
+
+		short value;
+
+		public static readonly SqlInt16 MaxValue = new SqlInt16 (32767);
+		public static readonly SqlInt16 MinValue = new SqlInt16 (-32768);
+		public static readonly SqlInt16 Null;
+		public static readonly SqlInt16 Zero = new SqlInt16 (0);
+
+		#endregion
+
+		#region Constructors
+
+		public SqlInt16 (short value) 
+		{
+			this.value = value;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public bool IsNull { 
+			get { return (bool) (this == Null); }
+		}
+
+		public short Value { 
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ();
+				else 
+					return value; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public static SqlInt16 Add (SqlInt16 x, SqlInt16 y)
+		{
+			return (x + y);
+		}
+
+		public static SqlInt16 BitwiseAnd (SqlInt16 x, SqlInt16 y)
+		{
+			return (x & y);
+		}
+
+		public static SqlInt16 BitwiseOr (SqlInt16 x, SqlInt16 y)
+		{
+			return (x | y);
+		}
+
+		public int CompareTo (object value)
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlInt16))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlInt16"));
+			else if (((SqlInt16)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlInt16)value).Value);
+		}
+
+		public static SqlInt16 Divide (SqlInt16 x, SqlInt16 y)
+		{
+			return (x / y);
+		}
+
+		public override bool Equals (object value)
+		{
+			if (!(value is SqlInt16))
+				return false;
+			else
+				return (bool) (this == (SqlInt16)value);
+		}
+
+		public static SqlBoolean Equals (SqlInt16 x, SqlInt16 y)
+		{
+			return (x == y);
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int)value;
+		}
+
+		public static SqlBoolean GreaterThan (SqlInt16 x, SqlInt16 y)
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlInt16 x, SqlInt16 y)
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan (SqlInt16 x, SqlInt16 y)
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual (SqlInt16 x, SqlInt16 y)
+		{
+			return (x <= y);
+		}
+
+		public static SqlInt16 Mod (SqlInt16 x, SqlInt16 y)
+		{
+			return (x % y);
+		}
+
+		public static SqlInt16 Multiply (SqlInt16 x, SqlInt16 y)
+		{
+			return (x * y);
+		}
+
+		public static SqlBoolean NotEquals (SqlInt16 x, SqlInt16 y)
+		{
+			return (x != y);
+		}
+
+		public static SqlInt16 OnesComplement (SqlInt16 x)
+		{
+			return ~x;
+		}
+
+		[MonoTODO]
+		public static SqlInt16 Parse (string s)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlInt16 Subtract (SqlInt16 x, SqlInt16 y)
+		{
+			return (x - y);
+		}
+
+		public SqlBoolean ToSqlBoolean ()
+		{
+			return ((SqlBoolean)this);
+		}
+		
+		public SqlByte ToSqlByte ()
+		{
+			return ((SqlByte)this);
+		}
+
+		public SqlDecimal ToSqlDecimal ()
+		{
+			return ((SqlDecimal)this);
+		}
+
+		public SqlDouble ToSqlDouble ()
+		{
+			return ((SqlDouble)this);
+		}
+
+		public SqlInt32 ToSqlInt32 ()
+		{
+			return ((SqlInt32)this);
+		}
+
+		public SqlInt64 ToSqlInt64 ()
+		{
+			return ((SqlInt64)this);
+		}
+
+		public SqlMoney ToSqlMoney ()
+		{
+			return ((SqlMoney)this);
+		}
+
+		public SqlSingle ToSqlSingle ()
+		{
+			return ((SqlSingle)this);
+		}
+
+		public SqlString ToSqlString ()
+		{
+			return ((SqlString)this);
+		}
+
+		public override string ToString ()
+		{
+			if (this.IsNull)
+				return String.Empty;
+			else
+				return value.ToString ();
+		}
+
+		public static SqlInt16 Xor (SqlInt16 x, SqlInt16 y)
+		{
+			return (x ^ y);
+		}
+
+		public static SqlInt16 operator + (SqlInt16 x, SqlInt16 y)
+		{
+			return new SqlInt16 ((short) (x.Value + y.Value));
+		}
+
+		public static SqlInt16 operator & (SqlInt16 x, SqlInt16 y)
+		{
+			return new SqlInt16 ((short) (x.value & y.Value));
+		}
+
+		public static SqlInt16 operator | (SqlInt16 x, SqlInt16 y)
+		{
+			return new SqlInt16 ((short) (x | y));
+		}
+
+		public static SqlInt16 operator / (SqlInt16 x, SqlInt16 y)
+		{
+			return new SqlInt16 ((short) (x.Value / y.Value));
+		}
+
+		public static SqlBoolean operator == (SqlInt16 x, SqlInt16 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value == y.Value);
+		}
+
+		public static SqlInt16 operator ^ (SqlInt16 x, SqlInt16 y)
+		{
+			return new SqlInt16 ((short) (x.Value ^ y.Value));
+		}
+
+		public static SqlBoolean operator > (SqlInt16 x, SqlInt16 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value > y.Value);
+		}
+
+		public static SqlBoolean operator >= (SqlInt16 x, SqlInt16 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value >= y.Value);
+		}
+
+		public static SqlBoolean operator != (SqlInt16 x, SqlInt16 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else 
+				return new SqlBoolean (!(x.Value == y.Value));
+		}
+
+		public static SqlBoolean operator < (SqlInt16 x, SqlInt16 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value < y.Value);
+		}
+
+		public static SqlBoolean operator <= (SqlInt16 x, SqlInt16 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value <= y.Value);
+		}
+
+		public static SqlInt16 operator % (SqlInt16 x, SqlInt16 y)
+		{
+			return new SqlInt16 ((short) (x.Value % y.Value));
+		}
+
+		public static SqlInt16 operator * (SqlInt16 x, SqlInt16 y)
+		{
+			return new SqlInt16 ((short) (x.Value * y.Value));
+		}
+
+		public static SqlInt16 operator ~ (SqlInt16 x)
+		{
+			return new SqlInt16 ((short) (~x.Value));
+		}
+
+		public static SqlInt16 operator - (SqlInt16 x, SqlInt16 y)
+		{
+			return new SqlInt16 ((short) (x.Value - y.Value));
+		}
+
+		public static SqlInt16 operator - (SqlInt16 n)
+		{
+			return new SqlInt16 ((short) (-n.Value));
+		}
+
+		public static explicit operator SqlInt16 (SqlBoolean x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlInt16 ((short)x.ByteValue);
+		}
+
+		public static explicit operator SqlInt16 (SqlDecimal x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlInt16 ((short)x.Value);
+		}
+
+		public static explicit operator SqlInt16 (SqlDouble x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlInt16 ((short)x.Value);
+		}
+
+		public static explicit operator short (SqlInt16 x)
+		{
+			return x.Value; 
+		}
+
+		public static explicit operator SqlInt16 (SqlInt32 x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlInt16 ((short)x.Value);
+		}
+
+		public static explicit operator SqlInt16 (SqlInt64 x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlInt16 ((short)x.Value);
+		}
+
+		public static explicit operator SqlInt16 (SqlMoney x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlInt16 ((short)x.Value);
+		}
+
+		public static explicit operator SqlInt16 (SqlSingle x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlInt16 ((short)x.Value);
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlInt16 (SqlString x)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static implicit operator SqlInt16 (short x)
+		{
+			return new SqlInt16 (x);
+		}
+
+		public static implicit operator SqlInt16 (SqlByte x)
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlInt16 ((short)x.Value);
+		}
+
+		#endregion
+	}
+}
+			
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlInt32.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt32.cs
new file mode 100644
index 00000000000..5319eb82774
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt32.cs
@@ -0,0 +1,423 @@
+//
+// System.Data.SqlTypes.SqlInt32
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc. 2002
+// (C) Copyright 2002 Tim Coleman 
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+
+	/// <summary>
+	/// a 32-bit signed integer to be used in reading or writing
+	/// of data from a database
+	/// </summary>
+	public struct SqlInt32 : INullable, IComparable 
+	{
+		#region Fields
+
+		int value;
+
+		public static readonly SqlInt32 MaxValue = new SqlInt32 (2147483647);
+		public static readonly SqlInt32 MinValue = new SqlInt32 (-2147483648);
+		public static readonly SqlInt32 Null;
+		public static readonly SqlInt32 Zero = new SqlInt32 (0);
+
+		#endregion
+
+		#region Constructors
+
+		public SqlInt32(int value) 
+		{
+			this.value = value;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public bool IsNull {
+			get { return (bool) (this == Null); }
+		}
+
+		public int Value {
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ();
+				else 
+					return value; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public static SqlInt32 Add (SqlInt32 x, SqlInt32 y) 
+		{
+			return (x + y);
+		}
+
+		public static SqlInt32 BitwiseAnd(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x & y);
+		}
+		
+		public static SqlInt32 BitwiseOr(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x | y);
+		}
+
+		public int CompareTo(object value) 
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlInt32))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlInt32"));
+			else if (((SqlInt32)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlInt32)value).Value);
+		}
+
+		public static SqlInt32 Divide(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x / y);
+		}
+
+		public override bool Equals(object value) 
+		{
+			if (!(value is SqlInt32))
+				return false;
+			else
+				return (bool) (this == (SqlInt32)value);
+		}
+
+		public static SqlBoolean Equals(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x == y);
+		}
+
+		public override int GetHashCode() 
+		{
+			return value;
+		}
+
+		public static SqlBoolean GreaterThan (SqlInt32 x, SqlInt32 y) 
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlInt32 x, SqlInt32 y) 
+		{
+			return (x >= y);
+		}
+                
+		public static SqlBoolean LessThan(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x <= y);
+		}
+
+		public static SqlInt32 Mod(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x % y);
+		}
+
+		public static SqlInt32 Multiply(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x * y);
+		}
+
+		public static SqlBoolean NotEquals(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x != y);
+		}
+
+		public static SqlInt32 OnesComplement(SqlInt32 x) 
+		{
+			return ~x;
+		}
+
+		public static SqlInt32 Parse(string s) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlInt32 Subtract(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x - y);
+		}
+
+		public SqlBoolean ToSqlBoolean() 
+		{
+			return ((SqlBoolean)this);
+		}
+
+		public SqlByte ToSqlByte() 
+		{
+			return ((SqlByte)this);
+		}
+
+		public SqlDecimal ToSqlDecimal() 
+		{
+			return ((SqlDecimal)this);
+		}
+
+		public SqlDouble ToSqlDouble() 	
+		{
+			return ((SqlDouble)this);
+		}
+
+		public SqlInt16 ToSqlInt16() 
+		{
+			return ((SqlInt16)this);
+		}
+
+		public SqlInt64 ToSqlInt64() 
+		{
+			return ((SqlInt64)this);
+		}
+
+		public SqlMoney ToSqlMoney() 
+		{
+			return ((SqlMoney)this);
+		}
+
+		public SqlSingle ToSqlSingle() 
+		{
+			return ((SqlSingle)this);
+		}
+
+		public SqlString ToSqlString ()
+		{
+			return ((SqlString)this);
+		}
+
+		public override string ToString() 
+		{
+			if (this.IsNull)
+				return String.Empty;
+			else
+				return value.ToString ();
+		}
+
+		public static SqlInt32 Xor(SqlInt32 x, SqlInt32 y) 
+		{
+			return (x ^ y);
+		}
+
+		#endregion
+
+		#region Operators
+
+		// Compute Addition
+		public static SqlInt32 operator + (SqlInt32 x, SqlInt32 y) 
+		{
+			return new SqlInt32 (x.Value + y.Value);
+		}
+
+		// Bitwise AND
+		public static SqlInt32 operator & (SqlInt32 x, SqlInt32 y) 
+		{
+			return new SqlInt32 (x.Value & y.Value);
+		}
+
+		// Bitwise OR
+		public static SqlInt32 operator | (SqlInt32 x, SqlInt32 y) 
+		{
+			return new SqlInt32 (x.Value | y.Value);
+		}
+
+		// Compute Division
+		public static SqlInt32 operator / (SqlInt32 x, SqlInt32 y) 
+		{
+			return new SqlInt32 (x.Value / y.Value);
+		}
+
+		// Compare Equality
+		public static SqlBoolean operator == (SqlInt32 x, SqlInt32 y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value == y.Value);
+		}
+
+		// Bitwise Exclusive-OR (XOR)
+		public static SqlInt32 operator ^ (SqlInt32 x, SqlInt32 y) 
+		{
+			return new SqlInt32 (x.Value ^ y.Value);
+		}
+
+		// > Compare
+		public static SqlBoolean operator >(SqlInt32 x, SqlInt32 y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value > y.Value);
+		}
+
+		// >= Compare
+		public static SqlBoolean operator >= (SqlInt32 x, SqlInt32 y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value >= y.Value);
+		}
+
+		// != Inequality Compare
+		public static SqlBoolean operator != (SqlInt32 x, SqlInt32 y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value != y.Value);
+		}
+		
+		// < Compare
+		public static SqlBoolean operator < (SqlInt32 x, SqlInt32 y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value < y.Value);
+		}
+
+		// <= Compare
+		public static SqlBoolean operator <= (SqlInt32 x, SqlInt32 y) 
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value <= y.Value);
+		}
+
+		// Compute Modulus
+		public static SqlInt32 operator % (SqlInt32 x, SqlInt32 y) 
+		{
+			return new SqlInt32 (x.Value % y.Value);
+		}
+
+		// Compute Multiplication
+		public static SqlInt32 operator * (SqlInt32 x, SqlInt32 y) 
+		{
+			return new SqlInt32 (x.Value * y.Value);
+		}
+
+		// Ones Complement
+		public static SqlInt32 operator ~ (SqlInt32 x) 
+		{
+			return new SqlInt32 (~x.Value);
+		}
+
+		// Subtraction
+		public static SqlInt32 operator - (SqlInt32 x, SqlInt32 y) 
+		{
+			return new SqlInt32 (x.Value - y.Value);
+		}
+
+		// Negates the Value
+		public static SqlInt32 operator - (SqlInt32 x) 
+		{
+			return new SqlInt32 (-x.Value);
+		}
+
+		// Type Conversions
+		public static explicit operator SqlInt32 (SqlBoolean x) 
+		{
+			if (x.IsNull) 
+				return Null;
+			else 
+				return new SqlInt32 ((int)x.ByteValue);
+		}
+
+		public static explicit operator SqlInt32 (SqlDecimal x) 
+		{
+			if (x.IsNull) 
+				return Null;
+			else 
+				return new SqlInt32 ((int)x.Value);
+		}
+
+		public static explicit operator SqlInt32 (SqlDouble x) 
+		{
+			if (x.IsNull) 
+				return Null;
+			else 
+				return new SqlInt32 ((int)x.Value);
+		}
+
+		public static explicit operator int (SqlInt32 x)
+		{
+			return x.Value;
+		}
+
+		public static explicit operator SqlInt32 (SqlInt64 x) 
+		{
+			if (x.IsNull) 
+				return Null;
+			else 
+				return new SqlInt32 ((int)x.Value);
+		}
+
+		public static explicit operator SqlInt32(SqlMoney x) 
+		{
+			if (x.IsNull) 
+				return Null;
+			else 
+				return new SqlInt32 ((int)x.Value);
+		}
+
+		public static explicit operator SqlInt32(SqlSingle x) 
+		{
+			if (x.IsNull) 
+				return Null;
+			else 
+				return new SqlInt32 ((int)x.Value);
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlInt32(SqlString x) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static implicit operator SqlInt32(int x) 
+		{
+			return new SqlInt32 (x);
+		}
+
+		public static implicit operator SqlInt32(SqlByte x) 
+		{
+			if (x.IsNull) 
+				return Null;
+			else 
+				return new SqlInt32 ((int)x.Value);
+		}
+
+		public static implicit operator SqlInt32(SqlInt16 x) 
+		{
+			if (x.IsNull) 
+				return Null;
+			else 
+				return new SqlInt32 ((int)x.Value);
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlInt64.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt64.cs
new file mode 100644
index 00000000000..aea159d17d4
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlInt64.cs
@@ -0,0 +1,398 @@
+//
+// System.Data.SqlTypes.SqlInt64
+//
+// Author:
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	public struct SqlInt64 : INullable, IComparable
+	{
+		#region Fields
+
+		long value;
+		
+		[MonoTODO]
+		public static readonly SqlInt64 MaxValue; // 2^63 - 1
+
+		[MonoTODO]
+		public static readonly SqlInt64 MinValue; // -2^63
+
+		public static readonly SqlInt64 Null;
+		public static readonly SqlInt64 Zero = new SqlInt64 (0);
+
+		#endregion
+
+		#region Constructors
+
+		public SqlInt64 (long value) 
+		{
+			this.value = value;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public bool IsNull { 
+			get { return (bool) (this == Null); }
+		}
+
+		public long Value { 
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ();
+				else 
+					return value; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public static SqlInt64 Add (SqlInt64 x, SqlInt64 y)
+		{
+			return (x + y);
+		}
+
+		public static SqlInt64 BitwiseAnd (SqlInt64 x, SqlInt64 y)
+		{
+			return (x & y);
+		}
+
+		public static SqlInt64 BitwiseOr (SqlInt64 x, SqlInt64 y)
+		{
+			return (x | y);
+		}
+
+		public int CompareTo (object value)
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlInt64))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlInt64"));
+			else if (((SqlInt64)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlInt64)value).Value);
+		}
+
+		public static SqlInt64 Divide (SqlInt64 x, SqlInt64 y)
+		{
+			return (x / y);
+		}
+
+		public override bool Equals (object value)
+		{
+			if (!(value is SqlInt64))
+				return false;
+			else
+				return (bool) (this == (SqlInt64)value);
+		}
+
+		public static SqlBoolean Equals (SqlInt64 x, SqlInt64 y)
+		{
+			return (x == y);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			return (int)value;
+		}
+
+		public static SqlBoolean GreaterThan (SqlInt64 x, SqlInt64 y)
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlInt64 x, SqlInt64 y)
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan (SqlInt64 x, SqlInt64 y)
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual (SqlInt64 x, SqlInt64 y)
+		{
+			return (x <= y);
+		}
+
+		public static SqlInt64 Mod (SqlInt64 x, SqlInt64 y)
+		{
+			return (x % y);
+		}
+
+		public static SqlInt64 Multiply (SqlInt64 x, SqlInt64 y)
+		{
+			return (x * y);
+		}
+
+		public static SqlBoolean NotEquals (SqlInt64 x, SqlInt64 y)
+		{
+			return (x != y);
+		}
+
+		public static SqlInt64 OnesComplement (SqlInt64 x)
+		{
+			return ~x;
+		}
+
+		[MonoTODO]
+		public static SqlInt64 Parse (string s)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlInt64 Subtract (SqlInt64 x, SqlInt64 y)
+		{
+			return (x - y);
+		}
+
+		public SqlBoolean ToSqlBoolean ()
+		{
+			return ((SqlBoolean)this);
+		}
+		
+		public SqlByte ToSqlByte ()
+		{
+			return ((SqlByte)this);
+		}
+
+		public SqlDecimal ToSqlDecimal ()
+		{
+			return ((SqlDecimal)this);
+		}
+
+		public SqlDouble ToSqlDouble ()
+		{
+			return ((SqlDouble)this);
+		}
+
+		public SqlInt16 ToSqlInt16 ()
+		{
+			return ((SqlInt16)this);
+		}
+
+		public SqlInt32 ToSqlInt32 ()
+		{
+			return ((SqlInt32)this);
+		}
+
+		public SqlMoney ToSqlMoney ()
+		{
+			return ((SqlMoney)this);
+		}
+
+		public SqlSingle ToSqlSingle ()
+		{
+			return ((SqlSingle)this);
+		}
+
+		public SqlString ToSqlString ()
+		{
+			return ((SqlString)this);
+		}
+
+		public override string ToString ()
+		{
+			return value.ToString ();
+		}
+
+		public static SqlInt64 Xor (SqlInt64 x, SqlInt64 y)
+		{
+			return (x ^ y);
+		}
+
+		public static SqlInt64 operator + (SqlInt64 x, SqlInt64 y)
+		{
+			return new SqlInt64 (x.Value + y.Value);
+		}
+
+		public static SqlInt64 operator & (SqlInt64 x, SqlInt64 y)
+		{
+			return new SqlInt64 (x.value & y.Value);
+		}
+
+		public static SqlInt64 operator | (SqlInt64 x, SqlInt64 y)
+		{
+			return new SqlInt64 (x.value | y.Value);
+		}
+
+		public static SqlInt64 operator / (SqlInt64 x, SqlInt64 y)
+		{
+			return new SqlInt64 (x.Value / y.Value);
+		}
+
+		public static SqlBoolean operator == (SqlInt64 x, SqlInt64 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value == y.Value);
+		}
+
+		public static SqlInt64 operator ^ (SqlInt64 x, SqlInt64 y)
+		{
+			return new SqlInt64 (x.Value ^ y.Value);
+		}
+
+		public static SqlBoolean operator > (SqlInt64 x, SqlInt64 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value > y.Value);
+		}
+
+		public static SqlBoolean operator >= (SqlInt64 x, SqlInt64 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value >= y.Value);
+		}
+
+		public static SqlBoolean operator != (SqlInt64 x, SqlInt64 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (!(x.Value == y.Value));
+		}
+
+		public static SqlBoolean operator < (SqlInt64 x, SqlInt64 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value < y.Value);
+		}
+
+		public static SqlBoolean operator <= (SqlInt64 x, SqlInt64 y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value <= y.Value);
+		}
+
+		public static SqlInt64 operator % (SqlInt64 x, SqlInt64 y)
+		{
+			return new SqlInt64(x.Value % y.Value);
+		}
+
+		public static SqlInt64 operator * (SqlInt64 x, SqlInt64 y)
+		{
+			return new SqlInt64 (x.Value * y.Value);
+		}
+
+		public static SqlInt64 operator ~ (SqlInt64 x)
+		{
+			return new SqlInt64 (~(x.Value));
+		}
+
+		public static SqlInt64 operator - (SqlInt64 x, SqlInt64 y)
+		{
+			return new SqlInt64 (x.Value - y.Value);
+		}
+
+		public static SqlInt64 operator - (SqlInt64 n)
+		{
+			return new SqlInt64 (-(n.Value));
+		}
+
+		public static explicit operator SqlInt64 (SqlBoolean x)
+		{
+			if (x.IsNull) 
+				return SqlInt64.Null;
+			else
+				return new SqlInt64 ((long)x.ByteValue);
+		}
+
+		public static explicit operator SqlInt64 (SqlDecimal x)
+		{
+			if (x.IsNull) 
+				return SqlInt64.Null;
+			else
+				return new SqlInt64 ((long)x.Value);
+		}
+
+		public static explicit operator SqlInt64 (SqlDouble x)
+		{
+			if (x.IsNull) 
+				return SqlInt64.Null;
+			else
+				return new SqlInt64 ((long)x.Value);
+		}
+
+		public static explicit operator long (SqlInt64 x)
+		{
+			return x.Value;
+		}
+
+		public static explicit operator SqlInt64 (SqlMoney x)
+		{
+			if (x.IsNull) 
+				return SqlInt64.Null;
+			else
+				return new SqlInt64 ((long)x.Value);
+		}
+
+		public static explicit operator SqlInt64 (SqlSingle x)
+		{
+			if (x.IsNull) 
+				return SqlInt64.Null;
+			else
+				return new SqlInt64 ((long)x.Value);
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlInt64 (SqlString x)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static implicit operator SqlInt64 (long x)
+		{
+			return new SqlInt64 (x);
+		}
+
+		public static implicit operator SqlInt64 (SqlByte x)
+		{
+			if (x.IsNull) 
+				return SqlInt64.Null;
+			else
+				return new SqlInt64 ((long)x.Value);
+		}
+
+		public static implicit operator SqlInt64 (SqlInt16 x)
+		{
+			if (x.IsNull) 
+				return SqlInt64.Null;
+			else
+				return new SqlInt64 ((long)x.Value);
+		}
+
+		public static implicit operator SqlInt64 (SqlInt32 x)
+		{
+			if (x.IsNull) 
+				return SqlInt64.Null;
+			else
+				return new SqlInt64 ((long)x.Value);
+		}
+
+		#endregion
+	}
+}
+			
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs
new file mode 100644
index 00000000000..1767ee099db
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlMoney.cs
@@ -0,0 +1,381 @@
+//
+// System.Data.SqlTypes.SqlMoney
+//
+// Author:
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	public struct SqlMoney : INullable, IComparable
+	{
+		#region Fields
+
+		decimal value;
+
+		public static readonly SqlMoney MaxValue = new SqlMoney (922337203685475.5807);
+		public static readonly SqlMoney MinValue = new SqlMoney (-922337203685477.5808);
+		public static readonly SqlMoney Null;
+		public static readonly SqlMoney Zero = new SqlMoney (0);
+
+		#endregion
+
+		#region Constructors
+
+		public SqlMoney (decimal value) 
+		{
+			this.value = value;
+		}
+
+		public SqlMoney (double value) 
+		{
+			this.value = (decimal)value;
+		}
+
+		public SqlMoney (int value) 
+		{
+			this.value = (decimal)value;
+		}
+
+		public SqlMoney (long value) 
+		{
+			this.value = (decimal)value;
+		}
+
+		#endregion
+
+		#region Properties
+
+		[MonoTODO]
+		public bool IsNull { 
+			get { return (bool) (this == Null); }
+		}
+
+		public decimal Value { 
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ();
+				else 
+					return value; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public static SqlMoney Add (SqlMoney x, SqlMoney y)
+		{
+			return (x + y);
+		}
+
+		public int CompareTo (object value)
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlMoney))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlMoney"));
+			else if (((SqlMoney)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlMoney)value).Value);
+		}
+
+		public static SqlMoney Divide (SqlMoney x, SqlMoney y)
+		{
+			return (x / y);
+		}
+
+		public override bool Equals (object value)
+		{
+			if (!(value is SqlMoney))
+				return false;
+			else
+				return (bool) (this == (SqlMoney)value);
+		}
+
+		public static SqlBoolean Equals (SqlMoney x, SqlMoney y)
+		{
+			return (x == y);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			return (int)value;
+		}
+
+		public static SqlBoolean GreaterThan (SqlMoney x, SqlMoney y)
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlMoney x, SqlMoney y)
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan (SqlMoney x, SqlMoney y)
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual (SqlMoney x, SqlMoney y)
+		{
+			return (x <= y);
+		}
+
+		public static SqlMoney Multiply (SqlMoney x, SqlMoney y)
+		{
+			return (x * y);
+		}
+
+		public static SqlBoolean NotEquals (SqlMoney x, SqlMoney y)
+		{
+			return (x != y);
+		}
+
+		[MonoTODO]
+		public static SqlMoney Parse (string s)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlMoney Subtract (SqlMoney x, SqlMoney y)
+		{
+			return (x - y);
+		}
+
+		public decimal ToDecimal ()
+		{
+			return value;
+		}
+
+		public double ToDouble ()
+		{
+			return (double)value;
+		}
+
+		public int ToInt32 ()
+		{
+			return (int)value;
+		}
+
+		public long ToInt64 ()
+		{
+			return (long)value;
+		}
+
+		public SqlBoolean ToSqlBoolean ()
+		{
+			return ((SqlBoolean)this);
+		}
+		
+		public SqlByte ToSqlByte ()
+		{
+			return ((SqlByte)this);
+		}
+
+		public SqlDecimal ToSqlDecimal ()
+		{
+			return ((SqlDecimal)this);
+		}
+
+		public SqlDouble ToSqlDouble ()
+		{
+			return ((SqlDouble)this);
+		}
+
+		public SqlInt16 ToSqlInt16 ()
+		{
+			return ((SqlInt16)this);
+		}
+
+		public SqlInt32 ToSqlInt32 ()
+		{
+			return ((SqlInt32)this);
+		}
+
+		public SqlInt64 ToSqlInt64 ()
+		{
+			return ((SqlInt64)this);
+		}
+
+		public SqlSingle ToSqlSingle ()
+		{
+			return ((SqlSingle)this);
+		}
+
+		public SqlString ToSqlString ()
+		{
+			return ((SqlString)this);
+		}
+
+		public override string ToString ()
+		{
+			if (this.IsNull)
+				return String.Empty;
+			else
+				return value.ToString ();
+		}
+
+		public static SqlMoney operator + (SqlMoney x, SqlMoney y)
+		{
+			return new SqlMoney (x.Value + y.Value);
+		}
+
+		public static SqlMoney operator / (SqlMoney x, SqlMoney y)
+		{
+			return new SqlMoney (x.Value / y.Value);
+		}
+
+		public static SqlBoolean operator == (SqlMoney x, SqlMoney y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value == y.Value);
+		}
+
+		public static SqlBoolean operator > (SqlMoney x, SqlMoney y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value > y.Value);
+		}
+
+		public static SqlBoolean operator >= (SqlMoney x, SqlMoney y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value >= y.Value);
+		}
+
+		public static SqlBoolean operator != (SqlMoney x, SqlMoney y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (!(x.Value == y.Value));
+		}
+
+		public static SqlBoolean operator < (SqlMoney x, SqlMoney y)
+		{
+			if (x.IsNull || y.IsNull) 
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value < y.Value);
+		}
+
+		public static SqlBoolean operator <= (SqlMoney x, SqlMoney y)
+		{
+			if (x.IsNull || y.IsNull) return SqlBoolean.Null;
+			return new SqlBoolean (x.Value <= y.Value);
+		}
+
+		public static SqlMoney operator * (SqlMoney x, SqlMoney y)
+		{
+			return new SqlMoney (x.Value * y.Value);
+		}
+
+		public static SqlMoney operator - (SqlMoney x, SqlMoney y)
+		{
+			return new SqlMoney (x.Value - y.Value);
+		}
+
+		public static SqlMoney operator - (SqlMoney n)
+		{
+			return new SqlMoney (-(n.Value));
+		}
+
+		public static explicit operator SqlMoney (SqlBoolean x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlMoney ((decimal)x.ByteValue);
+		}
+
+		public static explicit operator SqlMoney (SqlDecimal x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlMoney (x.Value);
+		}
+
+		public static explicit operator SqlMoney (SqlDouble x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlMoney ((decimal)x.Value);
+		}
+
+		public static explicit operator decimal (SqlMoney x)
+		{
+			return x.Value;
+		}
+
+		public static explicit operator SqlMoney (SqlSingle x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlMoney ((decimal)x.Value);
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlMoney (SqlString x)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static implicit operator SqlMoney (decimal x)
+		{
+			return new SqlMoney (x);
+		}
+
+		public static implicit operator SqlMoney (SqlByte x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlMoney ((decimal)x.Value);
+		}
+
+		public static implicit operator SqlMoney (SqlInt16 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlMoney ((decimal)x.Value);
+		}
+
+		public static implicit operator SqlMoney (SqlInt32 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlMoney ((decimal)x.Value);
+		}
+
+		public static implicit operator SqlMoney (SqlInt64 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlMoney ((decimal)x.Value);
+		}
+
+		#endregion
+	}
+}
+			
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs
new file mode 100644
index 00000000000..19c3c13ed4d
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlNullValueException.cs
@@ -0,0 +1,27 @@
+//
+// System.Data.SqlNullValueException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data.SqlTypes {
+
+	[Serializable]
+	public class SqlNullValueException : SqlTypeException
+	{
+		public SqlNullValueException ()
+			: base (Locale.GetText ("The value property is null"))
+		{
+		}
+
+		public SqlNullValueException (string message)
+			: base (message)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs
new file mode 100644
index 00000000000..4b5f05537d2
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlSingle.cs
@@ -0,0 +1,332 @@
+//
+// System.Data.SqlTypes.SqlSingle
+//
+// Author:
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	public struct SqlSingle : INullable, IComparable
+	{
+		#region Fields
+
+		float value;
+
+		public static readonly SqlSingle MaxValue = new SqlSingle (3.40E+38);
+		public static readonly SqlSingle MinValue = new SqlSingle (-3.40E+38);
+		public static readonly SqlSingle Null;
+		public static readonly SqlSingle Zero = new SqlSingle (0);
+
+		#endregion
+
+		#region Constructors
+
+		public SqlSingle (double value) 
+		{
+			this.value = (float)value;
+		}
+
+		public SqlSingle (float value) 
+		{
+			this.value = value;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public bool IsNull { 
+			get { return (bool) (this == Null); }
+		}
+
+		public float Value { 
+			get { 
+				if (this.IsNull) 
+					throw new SqlNullValueException ();
+				else 
+					return value; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public static SqlSingle Add (SqlSingle x, SqlSingle y)
+		{
+			return (x + y);
+		}
+
+		public int CompareTo (object value)
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlSingle))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlSingle"));
+			else if (((SqlSingle)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlSingle)value).Value);
+		}
+
+		public static SqlSingle Divide (SqlSingle x, SqlSingle y)
+		{
+			return (x / y);
+		}
+
+		public override bool Equals (object value)
+		{
+			if (!(value is SqlSingle))
+				return false;
+			else
+				return (bool) (this == (SqlSingle)value);
+		}
+
+		public static SqlBoolean Equals (SqlSingle x, SqlSingle y)
+		{
+			return (x == y);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			return (int)value;
+		}
+
+		public static SqlBoolean GreaterThan (SqlSingle x, SqlSingle y)
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual (SqlSingle x, SqlSingle y)
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan (SqlSingle x, SqlSingle y)
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual (SqlSingle x, SqlSingle y)
+		{
+			return (x <= y);
+		}
+
+		public static SqlSingle Multiply (SqlSingle x, SqlSingle y)
+		{
+			return (x * y);
+		}
+
+		public static SqlBoolean NotEquals (SqlSingle x, SqlSingle y)
+		{
+			return (x != y);
+		}
+
+		[MonoTODO]
+		public static SqlSingle Parse (string s)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlSingle Subtract (SqlSingle x, SqlSingle y)
+		{
+			return (x - y);
+		}
+
+		public SqlBoolean ToSqlBoolean ()
+		{
+			return ((SqlBoolean)this);
+		}
+		
+		public SqlByte ToSqlByte ()
+		{
+			return ((SqlByte)this);
+		}
+
+		public SqlDecimal ToSqlDecimal ()
+		{
+			return ((SqlDecimal)this);
+		}
+
+		public SqlDouble ToSqlDouble ()
+		{
+			return ((SqlDouble)this);
+		}
+
+		public SqlInt16 ToSqlInt16 ()
+		{
+			return ((SqlInt16)this);
+		}
+
+		public SqlInt32 ToSqlInt32 ()
+		{
+			return ((SqlInt32)this);
+		}
+
+		public SqlInt64 ToSqlInt64 ()
+		{
+			return ((SqlInt64)this);
+		}
+
+		public SqlMoney ToSqlMoney ()
+		{
+			return ((SqlMoney)this);
+		}
+
+
+		public SqlString ToSqlString ()
+		{
+			return ((SqlString)this);
+		}
+
+		public override string ToString ()
+		{
+			return value.ToString ();
+		}
+
+		public static SqlSingle operator + (SqlSingle x, SqlSingle y)
+		{
+			return new SqlSingle (x.Value + y.Value);
+		}
+
+		public static SqlSingle operator / (SqlSingle x, SqlSingle y)
+		{
+			return new SqlSingle (x.Value / y.Value);
+		}
+
+		public static SqlBoolean operator == (SqlSingle x, SqlSingle y)
+		{
+			if (x.IsNull || y .IsNull) return SqlBoolean.Null;
+			return new SqlBoolean (x.Value == y.Value);
+		}
+
+		public static SqlBoolean operator > (SqlSingle x, SqlSingle y)
+		{
+			if (x.IsNull || y .IsNull) return SqlBoolean.Null;
+			return new SqlBoolean (x.Value > y.Value);
+		}
+
+		public static SqlBoolean operator >= (SqlSingle x, SqlSingle y)
+		{
+			if (x.IsNull || y .IsNull) return SqlBoolean.Null;
+			return new SqlBoolean (x.Value >= y.Value);
+		}
+
+		public static SqlBoolean operator != (SqlSingle x, SqlSingle y)
+		{
+			if (x.IsNull || y .IsNull) return SqlBoolean.Null;
+			return new SqlBoolean (!(x.Value == y.Value));
+		}
+
+		public static SqlBoolean operator < (SqlSingle x, SqlSingle y)
+		{
+			if (x.IsNull || y .IsNull) return SqlBoolean.Null;
+			return new SqlBoolean (x.Value < y.Value);
+		}
+
+		public static SqlBoolean operator <= (SqlSingle x, SqlSingle y)
+		{
+			if (x.IsNull || y .IsNull) return SqlBoolean.Null;
+			return new SqlBoolean (x.Value <= y.Value);
+		}
+
+		public static SqlSingle operator * (SqlSingle x, SqlSingle y)
+		{
+			return new SqlSingle (x.Value * y.Value);
+		}
+
+		public static SqlSingle operator - (SqlSingle x, SqlSingle y)
+		{
+			return new SqlSingle (x.Value - y.Value);
+		}
+
+		public static SqlSingle operator - (SqlSingle n)
+		{
+			return new SqlSingle (-(n.Value));
+		}
+
+		public static explicit operator SqlSingle (SqlBoolean x)
+		{
+			return new SqlSingle((float)x.ByteValue);
+		}
+
+		public static explicit operator SqlSingle (SqlDouble x)
+		{
+			return new SqlSingle((float)x.Value);
+		}
+
+		public static explicit operator float (SqlSingle x)
+		{
+			return x.Value;
+		}
+
+		[MonoTODO]
+		public static explicit operator SqlSingle (SqlString x)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static implicit operator SqlSingle (float x)
+		{
+			return new SqlSingle (x);
+		}
+
+		public static implicit operator SqlSingle (SqlByte x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlSingle((float)x.Value);
+		}
+
+		public static implicit operator SqlSingle (SqlDecimal x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlSingle((float)x.Value);
+		}
+
+		public static implicit operator SqlSingle (SqlInt16 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlSingle((float)x.Value);
+		}
+
+		public static implicit operator SqlSingle (SqlInt32 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlSingle((float)x.Value);
+		}
+
+		public static implicit operator SqlSingle (SqlInt64 x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlSingle((float)x.Value);
+		}
+
+		public static implicit operator SqlSingle (SqlMoney x)
+		{
+			if (x.IsNull) 
+				return Null;
+			else
+				return new SqlSingle((float)x.Value);
+		}
+
+		#endregion
+	}
+}
+			
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
new file mode 100644
index 00000000000..46f5c2f0d92
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlString.cs
@@ -0,0 +1,461 @@
+//
+// System.Data.SqlTypes.SqlString
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc. 2002
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Globalization;
+
+namespace System.Data.SqlTypes
+{
+	/// <summary>
+	/// A variable-length stream of characters 
+	/// to be stored in or retrieved from the database
+	/// </summary>
+	public struct SqlString : INullable, IComparable 
+	{
+
+		#region Fields
+
+		string value;
+
+		public static readonly int BinarySort;
+		public static readonly int IgnoreCase;
+		public static readonly int IgnoreKanaType;
+		public static readonly int IgnoreNonSpace;
+		public static readonly int IgnoreWidth;
+		public static readonly SqlString Null;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		// init with a string data
+		public SqlString (string data) 
+		{
+			this.value = data;
+		}
+
+		// init with a string data and locale id values.
+		[MonoTODO]
+		public SqlString (string data, int lcid) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		// init with locale id, compare options, 
+		// and an array of bytes data
+		[MonoTODO]
+		public SqlString (int lcid, SqlCompareOptions compareOptions, byte[] data) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		// init with string data, locale id, and compare options
+		[MonoTODO]
+		public SqlString (string data, int lcid, SqlCompareOptions compareOptions) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		// init with locale id, compare options, array of bytes data,
+		// and whether unicode is encoded or not
+		[MonoTODO]
+		public SqlString (int lcid, SqlCompareOptions compareOptions, byte[] data, bool fUnicode) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		// init with locale id, compare options, array of bytes data,
+		// starting index in the byte array, 
+		// and number of bytes to copy
+		[MonoTODO]
+		public SqlString (int lcid, SqlCompareOptions compareOptions, byte[] data, int index, int count) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		// init with locale id, compare options, array of bytes data,
+		// starting index in the byte array, number of byte to copy,
+		// and whether unicode is encoded or not
+		[MonoTODO]
+		public SqlString (int lcid, SqlCompareOptions compareOptions, byte[] data, int index, int count, bool fUnicode) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Constructors
+
+
+		#region Public Properties
+
+		public CompareInfo CompareInfo {
+			[MonoTODO]
+			get { throw new NotImplementedException ();
+			}
+		}
+
+		public CultureInfo CultureInfo {
+			[MonoTODO]
+			get { throw new NotImplementedException ();
+			}
+		}
+
+		public bool IsNull {
+			get { return (bool) (this == SqlString.Null); }
+		}
+
+		// geographics location and language (locale id)
+		public int LCID {
+			[MonoTODO]
+			get { throw new NotImplementedException ();
+			}
+		}
+	
+		public SqlCompareOptions SqlCompareOptions {
+			[MonoTODO]
+			get { throw new NotImplementedException ();
+			}
+		}
+
+                public string Value {
+                        get {
+                                if (this.IsNull)
+                                        throw new SqlNullValueException ("The property contains Null.");
+                                else
+                                        return value;
+                        }
+                }
+
+		#endregion // Public Properties
+
+		#region Public Methods
+
+		[MonoTODO]
+		public SqlString Clone() 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static CompareOptions CompareOptionsFromSqlCompareOptions (SqlCompareOptions compareOptions) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		// **********************************
+		// Comparison Methods
+		// **********************************
+
+		public int CompareTo(object value)
+		{
+			if (value == null)
+				return 1;
+			else if (!(value is SqlString))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Data.SqlTypes.SqlString"));
+			else if (((SqlString)value).IsNull)
+				return 1;
+			else
+				return this.value.CompareTo (((SqlString)value).Value);
+		}
+
+		public static SqlString Concat(SqlString x, SqlString y) 
+		{
+			return (x + y);
+		}
+
+		public override bool Equals(object value) 
+		{
+			if (!(value is SqlString))
+				return false;
+			else
+				return (bool) (this == (SqlString)value);
+		}
+
+		public static SqlBoolean Equals(SqlString x, SqlString y) 
+		{
+			return (x == y);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode() 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public byte[] GetNonUnicodeBytes() 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public byte[] GetUnicodeBytes() 
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static SqlBoolean GreaterThan(SqlString x, SqlString y) 
+		{
+			return (x > y);
+		}
+
+		public static SqlBoolean GreaterThanOrEqual(SqlString x, SqlString y) 
+		{
+			return (x >= y);
+		}
+
+		public static SqlBoolean LessThan(SqlString x, SqlString y) 
+		{
+			return (x < y);
+		}
+
+		public static SqlBoolean LessThanOrEqual(SqlString x, SqlString y) 
+		{
+			return (x <= y);
+		}
+
+		public static SqlBoolean NotEquals(SqlString x,	SqlString y) 
+		{
+			return (x != y);
+		}
+
+		// ****************************************
+		// Type Conversions From SqlString To ...
+		// ****************************************
+
+		public SqlBoolean ToSqlBoolean() 
+		{
+			return ((SqlBoolean)this);
+		}
+
+		public SqlByte ToSqlByte() 
+		{
+			return ((SqlByte)this);
+		}
+
+		public SqlDateTime ToSqlDateTime() 
+		{
+			return ((SqlDateTime)this);
+		}
+
+		public SqlDecimal ToSqlDecimal() 
+		{
+			return ((SqlDecimal)this);
+		}
+
+		public SqlDouble ToSqlDouble() 
+		{
+			return ((SqlDouble)this);
+		}
+
+		public SqlGuid ToSqlGuid() 
+		{
+			return ((SqlGuid)this);
+		}
+
+		public SqlInt16 ToSqlInt16() 
+		{
+			return ((SqlInt16)this);
+		}
+
+		public SqlInt32 ToSqlInt32() 
+		{
+			return ((SqlInt32)this);
+		}
+
+		public SqlInt64 ToSqlInt64() 
+		{
+			return ((SqlInt64)this);
+		}
+
+		public SqlMoney ToSqlMoney() 
+		{
+			return ((SqlMoney)this);
+		}
+
+		public SqlSingle ToSqlSingle() 
+		{
+			return ((SqlSingle)this);
+		}
+
+		public override string ToString() 
+		{
+			return ((string)this);
+		}
+
+		// ***********************************
+		// Operators
+		// ***********************************
+
+		// Concatenates
+		public static SqlString operator + (SqlString x, SqlString y) 
+		{
+			return new SqlString (x.Value + y.Value);
+		}
+
+		// Equality
+		public static SqlBoolean operator == (SqlString x, SqlString y) 
+		{
+			if (x.IsNull || y.IsNull)
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value == y.Value);
+		}
+
+		// Greater Than
+		public static SqlBoolean operator > (SqlString x, SqlString y) 
+		{
+			if (x.IsNull || y.IsNull)
+				return SqlBoolean.Null;
+			else
+				throw new NotImplementedException ();
+		}
+
+		// Greater Than Or Equal
+		public static SqlBoolean operator >= (SqlString x, SqlString y) 
+		{
+			if (x.IsNull || y.IsNull)
+				return SqlBoolean.Null;
+			else
+				throw new NotImplementedException ();
+		}
+
+		public static SqlBoolean operator != (SqlString x, SqlString y) 
+		{ 
+			if (x.IsNull || y.IsNull)
+				return SqlBoolean.Null;
+			else
+				return new SqlBoolean (x.Value != y.Value);
+		}
+
+		// Less Than
+		public static SqlBoolean operator < (SqlString x, SqlString y) 
+		{
+			if (x.IsNull || y.IsNull)
+				return SqlBoolean.Null;
+			else
+				throw new NotImplementedException ();
+		}
+
+		// Less Than Or Equal
+		public static SqlBoolean operator <= (SqlString x, SqlString y) 
+		{
+			if (x.IsNull || y.IsNull)
+				return SqlBoolean.Null;
+			else
+				throw new NotImplementedException ();
+		}
+
+		// **************************************
+		// Type Conversions
+		// **************************************
+
+		public static explicit operator SqlString (SqlBoolean x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.ByteValue.ToString ());
+		}
+
+		public static explicit operator SqlString (SqlByte x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.Value.ToString ());
+		}
+
+		public static explicit operator SqlString (SqlDateTime x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.Value.ToString ());
+		}
+
+		public static explicit operator SqlString (SqlDecimal x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.Value.ToString ());
+		}
+
+		public static explicit operator SqlString (SqlDouble x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.Value.ToString ());
+		}
+
+		public static explicit operator SqlString (SqlGuid x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.Value.ToString ());
+		}
+
+		public static explicit operator SqlString (SqlInt16 x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.Value.ToString ());
+		}
+
+		public static explicit operator SqlString (SqlInt32 x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.Value.ToString ());
+		}
+
+		public static explicit operator SqlString (SqlInt64 x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.Value.ToString ());
+		}
+
+		public static explicit operator SqlString (SqlMoney x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.Value.ToString ());
+		}
+
+		public static explicit operator SqlString (SqlSingle x) 
+		{
+			if (x.IsNull)
+				return Null;
+			else
+				return new SqlString (x.Value.ToString ());
+		}
+
+		public static explicit operator string (SqlString x) 
+		{
+			return x.Value;
+		}
+
+		public static implicit operator SqlString (string x) 
+		{
+			return new SqlString (x);
+		}
+
+		#endregion // Public Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlTruncateException.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlTruncateException.cs
new file mode 100644
index 00000000000..067b9195f17
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlTruncateException.cs
@@ -0,0 +1,27 @@
+//
+// System.Data.SqlTruncateException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data.SqlTypes {
+
+	[Serializable]
+	public class SqlTruncateException : SqlTypeException
+	{
+		public SqlTruncateException ()
+			: base (Locale.GetText ("This value is being truncated"))
+		{
+		}
+
+		public SqlTruncateException (string message)
+			: base (message)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.SqlTypes/SqlTypeException.cs b/mcs/class/System.Data/System.Data.SqlTypes/SqlTypeException.cs
new file mode 100644
index 00000000000..6cb4b3f86aa
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.SqlTypes/SqlTypeException.cs
@@ -0,0 +1,27 @@
+//
+// System.Data.SqlTypeException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data.SqlTypes {
+
+	[Serializable]			
+	public class SqlTypeException : SystemException
+	{
+		public SqlTypeException (string message)
+			: base (message)
+		{
+		}
+
+		protected SqlTypeException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data.build b/mcs/class/System.Data/System.Data.build
new file mode 100644
index 00000000000..40dab967dd1
--- /dev/null
+++ b/mcs/class/System.Data/System.Data.build
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.Data.dll -->
+
+<project name="System.Data" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<csc target="library" output="../lib/System.Data.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/nowarn:0067"/>
+			<arg value="/nowarn:0109"/>
+			<arg value="/nowarn:0169"/>
+			<arg value="/nowarn:0679"/>
+			<arg value="/nowarn:0649"/>
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>
+			<arg value="/r:System.dll"/>
+			<arg value="/r:System.Xml.dll"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/>
+			</sources>
+			<references>
+				<includes name="../lib/corlib.dll"/>
+				<includes name="../lib/System.dll"/>
+				<includes name="../lib/System.Xml.dll"/>
+			</references>
+		</csc>
+		<copy file="../lib/System.Data.dll" tofile="Test/System.Data.dll"/>
+	</target>
+	<target name="test" depends="build">
+		<nant basedir="Test" target="test"/>
+	</target>
+	<target name="clean">
+		<delete file="../lib/System.Data.dll" failonerror="false"/>
+		<delete file="Test/System.Data.dll" failonerror="false"/>
+
+	</target>
+</project>
diff --git a/mcs/class/System.Data/System.Data/AcceptRejectRule.cs b/mcs/class/System.Data/System.Data/AcceptRejectRule.cs
new file mode 100644
index 00000000000..c4481175a6c
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/AcceptRejectRule.cs
@@ -0,0 +1,25 @@
+//
+// System.Data.AcceptRejectRule.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	
+	/// <summary>
+	/// Determines the action that occurs when 
+	/// the AcceptChanges or RejectChanges method 
+	/// is invoked on a DataTable with a ForeignKeyConstraint.
+	/// </summary>
+	[Serializable]
+	public enum AcceptRejectRule
+	{
+		Cascade = 1,
+		None = 0
+	}
+
+}
diff --git a/mcs/class/System.Data/System.Data/ChangeLog b/mcs/class/System.Data/System.Data/ChangeLog
new file mode 100644
index 00000000000..e676f3a3eab
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/ChangeLog
@@ -0,0 +1,3 @@
+2002-05-18  Nick Drochak  <ndrochak@gol.com>

+

+	* DataRow.cs: Fix typo.

diff --git a/mcs/class/System.Data/System.Data/CommandBehavior.cs b/mcs/class/System.Data/System.Data/CommandBehavior.cs
new file mode 100644
index 00000000000..918722e1937
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/CommandBehavior.cs
@@ -0,0 +1,30 @@
+//
+// System.Data.CommandBehavior.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+
+	/// <summary>
+	/// Specifies a description of the results and the affect on the database of the query command.
+	/// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values.
+	/// </summary>
+	[Flags]
+	[Serializable]
+	public enum CommandBehavior
+	{
+		Default = 0,
+		SingleResult = 1,
+		SchemaOnly = 2,
+		KeyInfo = 4,
+		SingleRow = 8,
+		SequentialAccess = 16,
+		CloseConnection = 32
+		
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/CommandType.cs b/mcs/class/System.Data/System.Data/CommandType.cs
new file mode 100644
index 00000000000..61bf5be81cb
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/CommandType.cs
@@ -0,0 +1,25 @@
+//
+// System.Data.CommandType.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies how a command string is interpreted.
+	/// </summary>
+	[Serializable]
+	public enum CommandType
+	{
+		Text = 1,
+		StoredProcedure = 4,
+		TableDirect = 512
+		
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/ConnectionState.cs b/mcs/class/System.Data/System.Data/ConnectionState.cs
new file mode 100644
index 00000000000..63f51af0ea8
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/ConnectionState.cs
@@ -0,0 +1,30 @@
+//
+// System.Data.ConnectionState.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+
+	/// <summary>
+	/// Returns the current state of the connection to a data source.
+	/// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values.
+	/// </summary>
+	[Flags]
+	[Serializable]
+	public enum ConnectionState
+	{
+		Closed = 0,
+		Open = 1,
+		Connecting = 2,
+		Executing = 4,
+		Fetching = 8,
+		Broken = 16
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/Constraint.cs b/mcs/class/System.Data/System.Data/Constraint.cs
new file mode 100644
index 00000000000..c8eb6e15868
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/Constraint.cs
@@ -0,0 +1,113 @@
+//
+// System.Data.Constraint.cs
+//
+// Author:
+//	Franklin Wise <gracenote@earthlink.net>
+//	Daniel Morgan
+//   
+//
+// (C) Ximian, Inc. 2002
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+
+namespace System.Data
+{
+	[Serializable]
+	internal delegate void DelegateConstraintNameChange(object sender,
+			string newName);
+	
+	[Serializable]
+	public abstract class Constraint 
+	{
+		internal event DelegateConstraintNameChange 
+					BeforeConstraintNameChange;
+
+		//if constraintName is not set then a name is 
+		//created when it is added to
+		//the ConstraintCollection
+		//it can not be set to null, empty or duplicate
+		//once it has been added to the collection
+		private string _constraintName = null;
+		private PropertyCollection _properties = null;
+
+		//Used for membership checking
+		private ConstraintCollection _constraintCollection;
+
+		protected Constraint() 
+		{
+			_properties = new PropertyCollection();
+		}
+
+		public virtual string ConstraintName {
+			get{
+				return "" + _constraintName;
+			} 
+
+			set{
+				//This should only throw an exception when it
+				//is a member of a ConstraintCollection which
+				//means we should let the ConstraintCollection
+				//handle exceptions when this value changes
+				_onConstraintNameChange(value);
+				_constraintName = value;
+			}
+		}
+
+		public PropertyCollection ExtendedProperties {
+			get {
+				return _properties;
+			}
+		}
+
+		public abstract DataTable Table {
+			get;
+		}
+
+		/// <summary>
+		/// Gets the ConstraintName, if there is one, as a string. 
+		/// </summary>
+		public override string ToString() 
+		{
+			return "" + _constraintName;
+		}
+
+		internal ConstraintCollection ConstraintCollection {
+			get{
+				return _constraintCollection;
+			}
+			set{
+				_constraintCollection = value;
+			}
+		}
+		
+
+		private void _onConstraintNameChange(string newName)
+		{
+			if (null != BeforeConstraintNameChange)
+			{
+				BeforeConstraintNameChange(this, newName);
+			}
+		}
+
+		//call once before adding a constraint to a collection
+		//will throw an exception to prevent the add if a rule is broken
+		internal virtual void AddToConstraintCollectionSetup(
+			ConstraintCollection collection){}
+					
+		//call once before removing a constraint to a collection
+		//can throw an exception to prevent the removal
+		internal virtual void RemoveFromConstraintCollectionCleanup( 
+			ConstraintCollection collection){}
+
+
+		//Call to Validate the constraint
+		//Will throw if constraint is violated
+		internal virtual void AssertConstraint(){}
+		
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/ConstraintCollection.cs b/mcs/class/System.Data/System.Data/ConstraintCollection.cs
new file mode 100644
index 00000000000..20deddf3756
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/ConstraintCollection.cs
@@ -0,0 +1,344 @@
+//
+// System.Data.ConstraintCollection.cs
+//
+// Author:
+//   Franklin Wise <gracenote@earthlink.net>
+//   Daniel Morgan
+//   
+// (C) Ximian, Inc. 2002
+// (C) 2002 Franklin Wise
+// (C) 2002 Daniel Morgan
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	[Serializable]
+	internal delegate void DelegateValidateRemoveConstraint(ConstraintCollection sender,
+			Constraint constraintToRemove, ref bool fail,ref string failReason);
+	
+	/// <summary>
+	/// hold collection of constraints for data table
+	/// </summary>
+	[Serializable]
+	public class ConstraintCollection : InternalDataCollectionBase 
+	{
+		//private bool beginInit = false;
+		
+		public event CollectionChangeEventHandler CollectionChanged;
+		internal event DelegateValidateRemoveConstraint ValidateRemoveConstraint;
+		
+		//Don't allow public instantiation
+		//Will be instantianted from DataTable
+		internal ConstraintCollection(){} 
+
+		public virtual Constraint this[string name] {
+			get {
+				//If the name is not found we just return null
+				int index = IndexOf(name); //case insensitive
+				if (-1 == index) return null;
+				return this[index];
+			}
+		}
+		
+		public virtual Constraint this[int index] {
+			get {
+				if (index < 0 || index >= List.Count)
+					throw new IndexOutOfRangeException();
+				return (Constraint)List[index];
+			}
+		}
+
+		private void _handleBeforeConstraintNameChange(object sender, string newName)
+		{
+			//null or empty
+			if (newName == null || newName == "") 
+				throw new ArgumentException("ConstraintName cannot be set to null or empty " +
+					" after it has been added to a ConstraintCollection.");
+
+			if (_isDuplicateConstraintName(newName,(Constraint)sender))
+				throw new DuplicateNameException("Constraint name already exists.");
+		}
+
+		private bool _isDuplicateConstraintName(string constraintName, Constraint excludeFromComparison) 
+		{	
+			string cmpr = constraintName.ToUpper();
+			foreach (Constraint cst in List) 
+			{
+				//Case insensitive comparision
+				if (  cmpr.CompareTo(cst.ConstraintName.ToUpper()) == 0  &&
+					cst != excludeFromComparison) 
+				{
+					return true;
+				}
+			}
+
+			return false;
+		}
+		
+		//finds an open name slot of ConstraintXX
+		//where XX is a number
+		private string _createNewConstraintName() 
+		{
+			bool loopAgain = false;
+			int index = 1;
+
+			do
+			{	
+				loopAgain = false;
+				foreach (Constraint cst in List) 
+				{
+					//Case insensitive
+					if (cst.ConstraintName.ToUpper().CompareTo("CONSTRAINT" + 
+						index.ToString()) == 0 ) 
+					{
+						loopAgain = true;
+						index++;
+					}
+				}
+			} while (loopAgain);
+
+			return "Constraint" + index.ToString(); 	
+			
+		}
+		
+		
+		// Overloaded Add method (5 of them)
+		// to add Constraint object to the collection
+
+		public void Add(Constraint constraint) 
+		{		
+			//not null
+			if (null == constraint) throw new ArgumentNullException("Can not add null.");
+			
+			//check constraint membership 
+			//can't already exist in this collection or any other
+			if (this == constraint.ConstraintCollection) 
+				throw new ArgumentException("Constraint already belongs to this collection.");
+			if (null != constraint.ConstraintCollection) 
+				throw new ArgumentException("Constraint already belongs to another collection.");
+			
+			//check for duplicate name
+			if (_isDuplicateConstraintName(constraint.ConstraintName,null)  )
+				throw new DuplicateNameException("Constraint name already exists.");
+		
+			//Allow constraint to run validation rules and setup 
+			constraint.AddToConstraintCollectionSetup(this); //may throw if it can't setup
+
+			//Run Constraint to check existing data in table
+			constraint.AssertConstraint();
+
+			//if name is null or empty give it a name
+			if (constraint.ConstraintName == null || 
+				constraint.ConstraintName == "" ) 
+			{ 
+				constraint.ConstraintName = _createNewConstraintName();
+			}
+
+			//Add event handler for ConstraintName change
+			constraint.BeforeConstraintNameChange += new DelegateConstraintNameChange(
+				_handleBeforeConstraintNameChange);
+			
+			constraint.ConstraintCollection = this;
+			List.Add(constraint);
+
+			OnCollectionChanged( new CollectionChangeEventArgs( CollectionChangeAction.Add, this) );
+		}
+
+	
+
+		public virtual Constraint Add(string name, DataColumn column, bool primaryKey) 
+		{
+
+			UniqueConstraint uc = new UniqueConstraint(name, column, primaryKey);
+			Add(uc);
+			 
+			return uc;
+		}
+
+		public virtual Constraint Add(string name, DataColumn primaryKeyColumn,
+			DataColumn foreignKeyColumn) 
+		{
+			ForeignKeyConstraint fc = new ForeignKeyConstraint(name, primaryKeyColumn, 
+					foreignKeyColumn);
+			Add(fc);
+
+			return fc;
+		}
+
+		public virtual Constraint Add(string name, DataColumn[] columns, bool primaryKey) 
+		{
+			UniqueConstraint uc = new UniqueConstraint(name, columns, primaryKey);
+			Add(uc);
+
+			return uc;
+		}
+
+		public virtual Constraint Add(string name, DataColumn[] primaryKeyColumns,
+			DataColumn[] foreignKeyColumns) 
+		{
+			ForeignKeyConstraint fc = new ForeignKeyConstraint(name, primaryKeyColumns, 
+					foreignKeyColumns);
+			Add(fc);
+
+			return fc;
+		}
+
+		[MonoTODO]
+		public void AddRange(Constraint[] constraints) {
+
+			throw new NotImplementedException ();
+		}
+
+		public bool CanRemove(Constraint constraint) 
+		{
+
+			//Rule A UniqueConstraint can't be removed if there is
+			//a foreign key relationship to that column
+
+			//not null 
+			//LAMESPEC: MSFT implementation throws and exception here
+			//spec says nothing about this
+			if (null == constraint) throw new ArgumentNullException("Constraint can't be null.");
+			
+			//LAMESPEC: spec says return false (which makes sense) and throw exception for False case (?).
+			//TODO: I may want to change how this is done
+			//maybe put a CanRemove on the Constraint class
+			//and have the Constraint fire this event
+
+			//discover if there is a related ForeignKey
+			string failReason ="";
+			return _canRemoveConstraint(constraint, ref failReason);
+			
+		}
+
+		[MonoTODO]
+		public void Clear() 
+		{
+			
+			//CanRemove? See Lamespec below.
+
+			//the Constraints have a reference to us
+			//and we listen to name change events 
+			//we should remove these before clearing
+			foreach (Constraint con in List)
+			{
+				con.ConstraintCollection = null;
+				con.BeforeConstraintNameChange -= new DelegateConstraintNameChange(
+				_handleBeforeConstraintNameChange);
+			}
+
+			//LAMESPEC: MSFT implementation allows this
+			//even when a ForeignKeyConstraint exist for a UniqueConstraint
+			//thus violating the CanRemove logic
+			List.Clear(); //Will violate CanRemove rule
+			OnCollectionChanged( new CollectionChangeEventArgs(CollectionChangeAction.Refresh, this) );
+		}
+
+		public bool Contains(string name) 
+		{
+			return (-1 != IndexOf(name));
+		}
+
+		public int IndexOf(Constraint constraint) 
+		{
+			return List.IndexOf(constraint);
+		}
+
+		public virtual int IndexOf(string constraintName) 
+		{
+			//LAMESPEC: Spec doesn't say case insensitive
+			//it should to be consistant with the other 
+			//case insensitive comparisons in this class
+
+			int index = 0;
+			foreach (Constraint con in List)
+			{
+				if (constraintName.ToUpper().CompareTo( con.ConstraintName.ToUpper() ) == 0)
+				{
+					return index;
+				}
+
+				index++;
+			}
+			return -1; //not found
+		}
+
+		public void Remove(Constraint constraint) {
+			//LAMESPEC: spec doesn't document the ArgumentException the
+			//will be thrown if the CanRemove rule is violated
+			
+			//LAMESPEC: spec says an exception will be thrown
+			//if the element is not in the collection. The implementation
+			//doesn't throw an exception. ArrayList.Remove doesn't throw if the
+			//element doesn't exist
+			//ALSO the overloaded remove in the spec doesn't say it throws any exceptions
+
+			//not null
+			if (null == constraint) throw new ArgumentNullException();
+
+			string failReason = "";
+			if (! _canRemoveConstraint(constraint, ref failReason) )
+			{
+				if (failReason != null || failReason != "")	
+					throw new ArgumentException(failReason);
+				else
+					throw new ArgumentException("Can't remove constraint.");		
+			}
+				
+			constraint.RemoveFromConstraintCollectionCleanup(this);
+			List.Remove(constraint);
+			OnCollectionChanged( new CollectionChangeEventArgs(CollectionChangeAction.Remove,this));
+		}
+
+		public void Remove(string name) 
+		{
+			//if doesn't exist fail quietly
+			int index = IndexOf(name);
+			if (-1 == index) return;
+
+			Remove(this[index]);
+		}
+
+		public void RemoveAt(int index) 
+		{
+			if (index < 0 || index + 1 > List.Count)
+				throw new IndexOutOfRangeException("Index out of range, index = " 
+						+ index.ToString() + ".");
+	
+			this[index].RemoveFromConstraintCollectionCleanup(this);
+			List.RemoveAt(index);
+			OnCollectionChanged( new CollectionChangeEventArgs(CollectionChangeAction.Remove,this));
+		}
+
+
+		protected override ArrayList List {
+			get{
+				return base.List;
+			}
+		}
+
+		protected virtual void OnCollectionChanged( CollectionChangeEventArgs ccevent) 
+		{
+			if (null != CollectionChanged)
+			{
+				CollectionChanged(this, ccevent);
+			}
+		}
+
+		private bool _canRemoveConstraint(Constraint constraint, ref string failReason )
+		{
+			bool cancel = false;
+			string tmp = "";
+			if (null != ValidateRemoveConstraint)
+			{
+				ValidateRemoveConstraint(this, constraint, ref cancel, ref tmp);
+			}
+			failReason = tmp;
+			return !cancel;
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/ConstraintException.cs b/mcs/class/System.Data/System.Data/ConstraintException.cs
new file mode 100644
index 00000000000..12293ddd655
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/ConstraintException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.ConstraintException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class ConstraintException : DataException
+	{		
+		public ConstraintException ()
+			: base (Locale.GetText ("This operation violates a constraint"))
+		{
+		}
+
+		public ConstraintException (string message)
+			: base (message)
+		{
+		}
+
+		protected ConstraintException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DBConcurrencyException.cs b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs
new file mode 100644
index 00000000000..5fd78826b48
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DBConcurrencyException.cs
@@ -0,0 +1,40 @@
+//
+// System.Data.DBConcurrencyException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class DBConcurrencyException : SystemException
+	{
+		public DBConcurrencyException (string message)
+			: base (message)
+		{
+		}
+
+		public DBConcurrencyException (string message, Exception innerException)
+			: base (message, innerException)
+		{
+		}
+
+		DataRow row;
+
+		public DataRow Row {
+			get { return row; }
+			set { row = value;} // setting the row has no effect
+		}
+
+		[MonoTODO]
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataColumn.cs b/mcs/class/System.Data/System.Data/DataColumn.cs
new file mode 100644
index 00000000000..0743e70be7f
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataColumn.cs
@@ -0,0 +1,375 @@
+//
+// System.Data.DataColumn.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Chris Podurgiel
+// (C) Ximian, Inc 2002
+//
+
+
+using System;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	internal delegate void DelegateColumnValueChange(DataColumn column,
+			DataRow row, object proposedValue);
+
+	
+	/// <summary>
+	/// Summary description for DataColumn.
+	/// </summary>
+	public class DataColumn : MarshalByValueComponent
+	{		
+		#region Events
+		[MonoTODO]
+		//used for constraint validation
+		//if an exception is fired during this event the change should be canceled
+		internal event DelegateColumnValueChange ValidateColumnValueChange;
+
+		//used for FK Constraint Cascading rules
+		internal event DelegateColumnValueChange ColumnValueChanging;
+		#endregion //Events
+
+		
+		#region Fields
+
+		private bool allowDBNull = true;
+		private bool autoIncrement = false;
+		private long autoIncrementSeed = 0;
+		private long autoIncrementStep = 1;
+		private string caption = null;
+		private MappingType columnMapping = MappingType.Element;
+		private string columnName = null;
+		private Type dataType = null;
+		private object defaultValue = null;
+		private string expression = null;
+		private PropertyCollection extendedProperties = null;
+		private int maxLength = -1;
+		private string nameSpace = null;
+		private int ordinal = -1;
+		private string prefix = null;
+		private bool readOnly = false;
+		private DataTable _table = null;
+		private bool unique = false;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		public DataColumn()
+		{
+		}
+
+		public DataColumn(string columnName): this()
+		{
+			ColumnName = columnName;
+		}
+
+		public DataColumn(string columnName, Type dataType): this(columnName)
+		{
+			if(dataType == null) {
+				throw new ArgumentNullException();
+			}
+			
+			DataType = dataType;
+
+		}
+
+		public DataColumn( string columnName, Type dataType, 
+			string expr): this(columnName, dataType)
+		{
+			Expression = expr;
+		}
+
+		public DataColumn(string columnName, Type dataType, 
+			string expr, MappingType type): this(columnName, dataType, expr)
+		{
+			ColumnMapping = type;
+		}
+		#endregion
+
+		#region Properties
+		
+		public bool AllowDBNull
+		{
+			get {
+				return allowDBNull;
+			}
+			set {
+				allowDBNull = value;
+			}
+		}
+        
+		/// <summary>
+		/// Gets or sets a value indicating whether the column automatically increments the value of the column for new rows added to the table.
+		/// </summary>
+		/// <remarks>
+		///		If the type of this column is not Int16, Int32, or Int64 when this property is set, 
+		///		the DataType property is coerced to Int32. An exception is generated if this is a computed column 
+		///		(that is, the Expression property is set.) The incremented value is used only if the row's value for this column, 
+		///		when added to the columns collection, is equal to the default value.
+		///	</remarks>
+		public bool AutoIncrement
+		{
+			get {
+				return autoIncrement;
+			}
+			set {
+				autoIncrement = value;
+				if(autoIncrement == true)
+				{
+					if(Expression != null)
+					{
+						throw new Exception();
+					}
+					if(Type.GetTypeCode(dataType) != TypeCode.Int16 && 
+					   Type.GetTypeCode(dataType) != TypeCode.Int32 && 
+					   Type.GetTypeCode(dataType) != TypeCode.Int64)
+					{
+						Int32 dtInt = new Int32();
+						dataType = dtInt.GetType();
+					}
+				}
+			}
+		}
+
+		public long AutoIncrementSeed
+		{
+			get {
+				return autoIncrementSeed;
+			}
+			set {
+				autoIncrementSeed = value;
+			}
+		}
+
+		public long AutoIncrementStep
+		{
+			get {
+				return autoIncrementStep;
+			}
+			set {
+				autoIncrementStep = value;
+			}
+		}
+
+		public string Caption 
+		{
+			get {
+				if(caption == null)
+					return columnName;
+				else
+					return caption;
+			}
+			set {
+				caption = value;
+			}
+		}
+
+		public virtual MappingType ColumnMapping
+		{
+			get {
+				return columnMapping;
+			}
+			set {
+				columnMapping = value;
+			}
+		}
+
+		public string ColumnName
+		{
+			get {
+				return columnName;
+			}
+			set {
+				columnName = value;
+			}
+		}
+
+		public Type DataType
+		{
+			get {
+				return dataType;
+			}
+			set {
+				if(AutoIncrement == true && 
+				   Type.GetTypeCode(value) != TypeCode.Int32)
+				{
+					throw new Exception();
+				}
+				dataType = value;
+			}
+		}
+
+		/// <summary>
+		/// 
+		/// </summary>
+		/// <remarks>When AutoIncrement is set to true, there can be no default value.</remarks>
+		public object DefaultValue
+		{
+			get {
+				return defaultValue;
+			}
+			set {
+				defaultValue = value;
+			}
+		}
+
+		public string Expression
+		{
+			get {
+				return expression;
+			}
+			set {
+				expression = value;
+			}
+		}
+
+		public PropertyCollection ExtendedProperties
+		{
+			get {
+				return extendedProperties;
+			}
+		}
+
+		public int MaxLength
+		{
+			get {
+				return maxLength;
+			}
+			set {
+				maxLength = value;
+			}
+		}
+
+		public string Namespace
+		{
+			get {
+				return nameSpace;
+			}
+			set {
+				nameSpace = value;
+			}
+		}
+
+		//Need a good way to set the Ordinal when the column is added to a columnCollection.
+		public int Ordinal
+		{
+			get {
+				return ordinal;
+			}
+		}
+
+		public string Prefix
+		{
+			get {
+				return prefix;
+			}
+			set {
+				prefix = value;
+			}
+		}
+
+		public bool ReadOnly
+		{
+			get {
+				return readOnly;
+			}
+			set {
+				readOnly = value;
+			}
+		}
+	
+		public DataTable Table
+		{
+			get {
+				return _table;
+			}
+		}
+
+		public bool Unique
+		{
+			get {
+				return unique;
+			}
+			set {
+				unique = value;
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		protected internal void CheckNotAllowNull() {
+		}
+
+		[MonoTODO]
+		protected void CheckUnique() {
+		}
+
+		[MonoTODO]
+		protected internal virtual void 
+		OnPropertyChanging (PropertyChangedEventArgs pcevent) {
+		}
+
+		[MonoTODO]
+		protected internal void RaisePropertyChanging(string name) {
+		}
+
+		/// <summary>
+		/// Gets the Expression of the column, if one exists.
+		/// </summary>
+		/// <returns>The Expression value, if the property is set; 
+		/// otherwise, the ColumnName property.</returns>
+		[MonoTODO]
+		public override string ToString()
+		{
+			if (expression != null)
+				return expression;
+			
+			return columnName;
+		}
+
+		[MonoTODO]
+		internal void SetTable(DataTable table) {
+			_table = table; 
+			// FIXME: this will get called by DataTable 
+			// and DataColumnCollection
+		}
+
+		
+		// Returns true if all the same collumns are in columnSet and compareSet
+		internal static bool AreColumnSetsTheSame(DataColumn[] columnSet, DataColumn[] compareSet)
+		{
+			if (null == columnSet && null == compareSet) return true;
+			if (null == columnSet || null == compareSet) return false;
+
+			if (columnSet.Length != compareSet.Length) return false;
+			
+			foreach (DataColumn col in columnSet)
+			{
+				bool matchFound = false;
+				foreach (DataColumn compare in compareSet)
+				{
+					if (col == compare)
+					{
+						matchFound = true;					
+					}
+				}
+				if (! matchFound) return false;
+			}
+			
+			return true;
+		}
+		
+		#endregion // Methods
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataColumnChangeEventArgs.cs b/mcs/class/System.Data/System.Data/DataColumnChangeEventArgs.cs
new file mode 100644
index 00000000000..f79d27eaf1e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataColumnChangeEventArgs.cs
@@ -0,0 +1,80 @@
+//
+// System.Data.DataColumnChangeEventArgs.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Provides data for the ColumnChanging event.
+	/// </summary>
+	public class DataColumnChangeEventArgs : EventArgs
+	{
+		
+		private DataColumn _column = null;
+		private DataRow _row = null;
+		private object _proposedValue = null;
+
+		/// <summary>
+		/// Initializes a new instance of the DataColumnChangeEventArgs class.
+		/// </summary>
+		/// <param name="row"></param>
+		/// <param name="column"></param>
+		/// <param name="value"></param>
+		public DataColumnChangeEventArgs(DataRow row, DataColumn column, object value)
+		{
+			_column = column;
+			_row = row;
+			_proposedValue = value;
+		}
+
+		/// <summary>
+		/// Gets the DataColumn with a changing value.
+		/// </summary>
+		public DataColumn Column 
+		{
+			get
+			{
+				return _column;
+			}
+		}
+
+
+		/// <summary>
+		/// Gets or sets the proposed new value for the column.
+		/// </summary>
+		public object ProposedValue 
+		{
+			get
+			{
+				return _proposedValue;
+			}
+			set
+			{
+				_proposedValue = value;
+			}
+		}
+
+
+		/// <summary>
+		/// Gets the DataRow of the column with a changing value.
+		/// </summary>
+		public DataRow Row 
+		{
+			get
+			{
+				return _row;
+			}
+		}
+
+
+
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataColumnChangeEventHandler.cs b/mcs/class/System.Data/System.Data/DataColumnChangeEventHandler.cs
new file mode 100644
index 00000000000..1932d38f2fe
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataColumnChangeEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.DataColumnChangeEventHandler.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents the method that will handle the the ColumnChanging event.
+	/// </summary>
+	[Serializable]
+	public delegate void DataColumnChangeEventHandler(object sender, DataColumnChangeEventArgs e);
+
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/DataColumnCollection.cs b/mcs/class/System.Data/System.Data/DataColumnCollection.cs
new file mode 100644
index 00000000000..d33d4d364e0
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataColumnCollection.cs
@@ -0,0 +1,416 @@
+//
+// System.Data.DataColumnCollection.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents a collection of DataColumn objects for a DataTable.
+	/// </summary>
+	public class DataColumnCollection : InternalDataCollectionBase
+	{
+		// The defaultNameIndex is used to create a default name for a column if one wasn't given.
+		private int defaultNameIndex;
+
+		//table should be the DataTable this DataColumnCollection belongs to.
+		private DataTable parentTable = null;
+
+		// Internal Constructor.  This Class can only be created from other classes in this assembly.
+		internal DataColumnCollection(DataTable table):base()
+		{
+			defaultNameIndex = 1;
+			parentTable = table;
+		}
+
+
+
+		/// <summary>
+		/// Gets the DataColumn from the collection at the specified index.
+		/// </summary>
+		public virtual DataColumn this[int index]
+		{
+			get
+			{
+				return (DataColumn) base.List[index];
+			}
+		}
+
+		/// <summary>
+		/// Gets the DataColumn from the collection with the specified name.
+		/// </summary>
+		public virtual DataColumn this[string name]
+		{
+			get
+			{
+				foreach (DataColumn column in base.List)
+				{
+					if (column.ColumnName == name)
+					{
+						return column;
+					}
+				}
+
+				return null;
+                
+			}
+		}
+
+
+		/// <summary>
+		/// Gets a list of the DataColumnCollection items.
+		/// </summary>
+		protected override ArrayList List 
+		{
+			get
+			{
+				return base.List;
+			}
+		}
+
+		/// <summary>
+		/// Creates and adds a DataColumn object to the DataColumnCollection.
+		/// </summary>
+		/// <returns></returns>
+		public virtual DataColumn Add()
+		{
+			DataColumn column = new DataColumn("Column" + defaultNameIndex.ToString());
+			CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Add, this);
+			
+			column.SetTable(parentTable);
+			base.List.Add(column);
+			OnCollectionChanged(e);
+			defaultNameIndex++;
+			return column;
+		}
+
+		/// <summary>
+		/// Creates and adds the specified DataColumn object to the DataColumnCollection.
+		/// </summary>
+		/// <param name="column">The DataColumn to add.</param>
+		public void Add(DataColumn column)
+		{
+			if(Contains(column.ColumnName))
+			{
+				throw new DuplicateNameException("A column named " + column.ColumnName + " already belongs to this DataTable.");
+			}
+			else
+			{
+				CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Add, this);
+				
+				column.SetTable( parentTable);
+				base.List.Add(column);
+				OnCollectionChanged(e);
+				return;
+			}
+		}
+
+		/// <summary>
+		/// Creates and adds a DataColumn object with the specified name to the DataColumnCollection.
+		/// </summary>
+		/// <param name="columnName">The name of the column.</param>
+		/// <returns>The newly created DataColumn.</returns>
+		public virtual DataColumn Add(string columnName)
+		{
+			
+			if (columnName == null || columnName == String.Empty)
+			{
+				columnName = "Column" + defaultNameIndex.ToString();
+				defaultNameIndex++;
+			}
+			
+			if(Contains(columnName))
+			{
+				throw new DuplicateNameException("A column named " + columnName + " already belongs to this DataTable.");
+			}
+			else
+			{
+				DataColumn column = new DataColumn(columnName);
+				
+				CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Add, this);
+				column.SetTable(parentTable);
+				base.List.Add(column);
+				OnCollectionChanged(e);
+				return column;
+			}
+		}
+
+		/// <summary>
+		/// Creates and adds a DataColumn object with the specified name and type to the DataColumnCollection.
+		/// </summary>
+		/// <param name="columnName">The ColumnName to use when cretaing the column.</param>
+		/// <param name="type">The DataType of the new column.</param>
+		/// <returns>The newly created DataColumn.</returns>
+		public virtual DataColumn Add(string columnName, Type type)
+		{
+			if (columnName == null || columnName == "")
+			{
+				columnName = "Column" + defaultNameIndex.ToString();
+				defaultNameIndex++;
+			}
+
+			if(Contains(columnName))
+			{
+				throw new DuplicateNameException("A column named " + columnName + " already belongs to this DataTable.");
+			}
+			else
+			{
+				DataColumn column = new DataColumn(columnName, type);
+				CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Add, this);
+				column.SetTable(parentTable);
+				base.List.Add(column);
+				OnCollectionChanged(e);
+				return column;
+			}
+		}
+
+		/// <summary>
+		/// Creates and adds a DataColumn object with the specified name, type, and expression to the DataColumnCollection.
+		/// </summary>
+		/// <param name="columnName">The name to use when creating the column.</param>
+		/// <param name="type">The DataType of the new column.</param>
+		/// <param name="expression">The expression to assign to the Expression property.</param>
+		/// <returns>The newly created DataColumn.</returns>
+		public virtual DataColumn Add(string columnName, Type type,	string expression)
+		{
+			if (columnName == null || columnName == "")
+			{
+				columnName = "Column" + defaultNameIndex.ToString();
+				defaultNameIndex++;
+			}
+			
+			if(Contains(columnName))
+			{
+				throw new DuplicateNameException("A column named " + columnName + " already belongs to this DataTable.");
+			}
+			else
+			{
+				DataColumn column = new DataColumn(columnName, type, expression);
+				CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Add, this);
+				column.SetTable(parentTable);
+				base.List.Add(column);
+				OnCollectionChanged(e);
+				return column;
+			}
+		}
+
+		/// <summary>
+		/// Copies the elements of the specified DataColumn array to the end of the collection.
+		/// </summary>
+		/// <param name="columns">The array of DataColumn objects to add to the collection.</param>
+		public void AddRange(DataColumn[] columns)
+		{
+			foreach (DataColumn column in columns)
+			{
+				Add(column);
+			}
+			return;
+		}
+
+		/// <summary>
+		/// Checks whether a given column can be removed from the collection.
+		/// </summary>
+		/// <param name="column">A DataColumn in the collection.</param>
+		/// <returns>true if the column can be removed; otherwise, false.</returns>
+		public bool CanRemove(DataColumn column)
+		{
+						
+			//Check that the column does not have a null reference.
+			if (column == null)
+			{
+                return false;
+			}
+
+			
+			//Check that the column is part of this collection.
+			if (!Contains(column.ColumnName))
+			{
+				return false;
+			}
+
+
+			
+			//Check if this column is part of a relationship. (this could probably be written better)
+			foreach (DataRelation childRelation in parentTable.ChildRelations)
+			{
+				foreach (DataColumn childColumn in childRelation.ChildColumns)
+				{
+					if (childColumn == column)
+					{
+						return false;
+					}
+				}
+
+				foreach (DataColumn parentColumn in childRelation.ParentColumns)
+				{
+					if (parentColumn == column)
+					{
+						return false;
+					}
+				}
+			}
+
+			//Check if this column is part of a relationship. (this could probably be written better)
+			foreach (DataRelation parentRelation in parentTable.ParentRelations)
+			{
+				foreach (DataColumn childColumn in parentRelation.ChildColumns)
+				{
+					if (childColumn == column)
+					{
+						return false;
+					}
+				}
+
+				foreach (DataColumn parentColumn in parentRelation.ParentColumns)
+				{
+					if (parentColumn == column)
+					{
+						return false;
+					}
+				}
+			}
+
+			
+			//Check if another column's expression depends on this column.
+			
+			foreach (DataColumn dataColumn in List)
+			{
+				if (dataColumn.Expression.ToString().IndexOf(column.ColumnName) > 0)
+				{
+					return false;
+				}
+			}
+			
+
+			return true;
+		}
+
+		/// <summary>
+		/// Clears the collection of any columns.
+		/// </summary>
+		public void Clear()
+		{
+			CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Refresh, this);
+			base.List.Clear();
+			OnCollectionChanged(e);
+			return;
+		}
+
+		/// <summary>
+		/// Checks whether the collection contains a column with the specified name.
+		/// </summary>
+		/// <param name="name">The ColumnName of the column to check for.</param>
+		/// <returns>true if a column exists with this name; otherwise, false.</returns>
+		public bool Contains(string name)
+		{
+			return (IndexOf(name) != -1);
+		}
+
+		/// <summary>
+		/// Gets the index of a column specified by name.
+		/// </summary>
+		/// <param name="column">The name of the column to return.</param>
+		/// <returns>The index of the column specified by column if it is found; otherwise, -1.</returns>
+		public virtual int IndexOf(DataColumn column)
+		{
+			return base.List.IndexOf(column);
+		}
+
+		/// <summary>
+		/// Gets the index of the column with the given name (the name is not case sensitive).
+		/// </summary>
+		/// <param name="columnName">The name of the column to find.</param>
+		/// <returns>The zero-based index of the column with the specified name, or -1 if the column doesn't exist in the collection.</returns>
+		public int IndexOf(string columnName)
+		{
+			
+			DataColumn column = this[columnName];
+			
+			if (column != null)
+			{
+				return IndexOf(column);
+			}
+			else
+			{
+				return -1;
+			}
+		}
+
+		/// <summary>
+		/// Raises the OnCollectionChanged event.
+		/// </summary>
+		/// <param name="ccevent">A CollectionChangeEventArgs that contains the event data.</param>
+		protected virtual void OnCollectionChanged(CollectionChangeEventArgs ccevent)
+		{
+			if (CollectionChanged != null) 
+			{
+				// Invokes the delegate. 
+				CollectionChanged(this, ccevent);
+			}
+		}
+
+		/// <summary>
+		/// Raises the OnCollectionChanging event.
+		/// </summary>
+		/// <param name="ccevent">A CollectionChangeEventArgs that contains the event data.</param>
+		protected internal virtual void OnCollectionChanging(CollectionChangeEventArgs ccevent)
+		{
+			if (CollectionChanged != null) 
+			{
+				// Invokes the delegate. 
+				CollectionChanged(this, ccevent);
+			}
+		}
+
+		/// <summary>
+		/// Removes the specified DataColumn object from the collection.
+		/// </summary>
+		/// <param name="column">The DataColumn to remove.</param>
+		public void Remove(DataColumn column)
+		{
+			CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Remove, this);
+			base.List.Remove(column);
+			OnCollectionChanged(e);
+			return;
+		}
+
+		/// <summary>
+		/// Removes the DataColumn object with the specified name from the collection.
+		/// </summary>
+		/// <param name="name">The name of the column to remove.</param>
+		public void Remove(string name)
+		{
+			DataColumn column = this[name];
+			CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Remove, this);
+			base.List.Remove(column);
+			OnCollectionChanged(e);
+			return;
+		}
+
+		/// <summary>
+		/// Removes the column at the specified index from the collection.
+		/// </summary>
+		/// <param name="index">The index of the column to remove.</param>
+		public void RemoveAt(int index)
+		{
+			CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Remove, this);
+			base.List.RemoveAt(index);
+			OnCollectionChanged(e);
+			return;
+		}
+
+		/// <summary>
+		/// Occurs when the columns collection changes, either by adding or removing a column.
+		/// </summary>
+		public event CollectionChangeEventHandler CollectionChanged;
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataException.cs b/mcs/class/System.Data/System.Data/DataException.cs
new file mode 100644
index 00000000000..3a512de87f0
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataException.cs
@@ -0,0 +1,37 @@
+//
+// System.Data.DataException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class DataException : SystemException
+	{
+		public DataException ()
+			: base (Locale.GetText ("A Data exception has occurred"))
+		{
+		}
+
+		public DataException (string message)
+			: base (message)
+		{
+		}
+
+		protected DataException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+
+		public DataException (string message, Exception innerException)
+			: base (message, innerException)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataRelation.cs b/mcs/class/System.Data/System.Data/DataRelation.cs
new file mode 100644
index 00000000000..bbc1f2eae5a
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRelation.cs
@@ -0,0 +1,165 @@
+//
+// System.Data.DataRelation.cs
+//
+// Author:
+//   Daniel Morgan <danmorg@sc.rr.com>
+//
+// (C) 2002 Daniel Morgan
+// (C) 2002 Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Data
+{
+	/// <summary>
+	/// DataRelation is used for a parent/child relationship 
+	/// between two DataTable objects
+	/// </summary>
+	[Serializable]
+	public class DataRelation {
+
+		#region Constructors
+
+		[MonoTODO]
+		public DataRelation(string relationName,
+			DataColumn parentColumn, DataColumn childColumn) {
+
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataRelation(string relationName,
+			DataColumn[] parentColumns, 
+			DataColumn[] childColumns) {
+
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataRelation(string relationName,
+			DataColumn parentColumn, DataColumn childColumn,
+			bool createConstraints) {
+
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataRelation(string relationName,
+			DataColumn[] parentColumns, DataColumn[] childColumns,
+			bool createConstraints) {
+
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataRelation(string relationName,
+			string parentTableName,	string childTableName,
+			string[] parentColumnNames, string[] childColumnNames,
+			bool nested) {
+
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+
+		public virtual DataColumn[] ChildColumns {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public virtual ForeignKeyConstraint ChildKeyConstraint {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public virtual DataTable ChildTable {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public virtual DataSet DataSet {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public PropertyCollection ExtendedProperties {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public virtual bool Nested {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			} 
+			
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public virtual DataColumn[] ParentColumns {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public virtual UniqueConstraint ParentKeyConstraint {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public virtual DataTable ParentTable {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public virtual string RelationName {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public override string ToString() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected void CheckStateForProperty() {
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataRelationCollection.cs b/mcs/class/System.Data/System.Data/DataRelationCollection.cs
new file mode 100644
index 00000000000..6952e9829ac
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRelationCollection.cs
@@ -0,0 +1,324 @@
+//
+// System.Data.DataRelationCollection.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//   Daniel Morgan <danmorg@sc.rr.com>
+//
+// (C) Chris Podurgiel
+// (C) 2002 Daniel Morgan
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents the collection of DataRelation objects for this DataSet.
+	/// </summary>
+	[Serializable]
+	public abstract class DataRelationCollection : InternalDataCollectionBase
+	{
+		private int defaultNameIndex;
+		private bool inTransition;
+		
+		/// <summary>
+		/// Initializes a new instance of the DataRelationCollection class.
+		/// </summary>
+		internal DataRelationCollection() : base()
+		{
+			defaultNameIndex = 1;
+			inTransition = false;
+		}
+
+		/// <summary>
+		/// Gets the DataRelation object specified by name.
+		/// </summary>
+		public abstract DataRelation this[string name]{get;}
+
+		/// <summary>
+		/// Gets the DataRelation object at the specified index.
+		/// </summary>
+		public abstract DataRelation this[int index]{get;}
+
+		
+		#region Add Methods
+		/// <summary>
+		/// Adds a DataRelation to the DataRelationCollection.
+		/// </summary>
+		/// <param name="relation">The DataRelation to add to the collection.</param>
+		[MonoTODO]
+		public void Add(DataRelation relation)
+		{
+			if(List != null)
+			{
+				//CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Add, this);
+				List.Add(relation);
+				//OnCollectionChanged(e);
+			}
+			return;
+		}
+
+		/// <summary>
+		/// Creates a relation given the parameters and adds it to the collection. The name is defaulted.
+		/// An ArgumentException is generated if this relation already belongs to this collection or belongs to another collection.
+		/// An InvalidConstraintException is generated if the relation can't be created based on the parameters.
+		/// The CollectionChanged event is fired if it succeeds.
+		/// </summary>
+		/// <param name="parentColumn">parent column of relation.</param>
+		/// <param name="childColumn">child column of relation.</param>
+		/// <returns>The created DataRelation.</returns>
+		[MonoTODO]
+		public virtual DataRelation Add(DataColumn parentColumn, DataColumn childColumn)
+		{	
+			
+			if(parentColumn == null)
+			{
+				throw new ArgumentNullException("parentColumn");
+			}
+			else if( childColumn == null)
+			{
+				throw new ArgumentNullException("childColumn");
+			}
+
+			// FIXME: temporarily commented so we can compile
+			/*
+			if(parentColumn.Table.DataSet != childColumn.Table.DataSet)
+			{
+				throw new InvalidConstraintException("my ex");
+			}
+			*/
+			
+			DataRelation dataRelation = new DataRelation("Relation" + defaultNameIndex.ToString(), parentColumn, childColumn);
+			//CollectionChangeEventArgs e = new CollectionChangeEventArgs(CollectionChangeAction.Add, this);
+			List.Add(dataRelation);
+			//OnCollectionChanged(e);
+			defaultNameIndex++;
+			return dataRelation;
+		}
+
+		/// <summary>
+		/// Creates a relation given the parameters and adds it to the collection. The name is defaulted.
+		/// An ArgumentException is generated if this relation already belongs to this collection or belongs to another collection.
+		/// An InvalidConstraintException is generated if the relation can't be created based on the parameters.
+		/// The CollectionChanged event is raised if it succeeds.
+		/// </summary>
+		/// <param name="parentColumns">An array of parent DataColumn objects.</param>
+		/// <param name="childColumns">An array of child DataColumn objects.</param>
+		/// <returns>The created DataRelation.</returns>
+		[MonoTODO]
+		public virtual DataRelation Add(DataColumn[] parentColumns, DataColumn[] childColumns)
+		{
+			DataRelation dataRelation = new DataRelation("Relation" + defaultNameIndex.ToString(), parentColumns, childColumns);
+			List.Add(dataRelation);
+			defaultNameIndex++;
+			return dataRelation;
+		}
+
+		/// <summary>
+		/// Creates a relation given the parameters and adds it to the collection.
+		/// An ArgumentException is generated if this relation already belongs to this collection or belongs to another collection.
+		/// A DuplicateNameException is generated if this collection already has a relation with the same name (case insensitive).
+		/// An InvalidConstraintException is generated if the relation can't be created based on the parameters.
+		/// The CollectionChanged event is raised if it succeeds.
+		/// </summary>
+		/// <param name="name">The name of the relation.</param>
+		/// <param name="parentColumn">parent column of relation.</param>
+		/// <returns>The created DataRelation.</returns>
+		/// <returns></returns>
+		[MonoTODO]
+		public virtual DataRelation Add(string name, DataColumn parentColumn, DataColumn childColumn)
+		{
+			//If no name was supplied, give it a default name.
+			if ((name == null) || (name == ""))
+			{
+				name = "Relation" + defaultNameIndex.ToString();
+				defaultNameIndex++;
+			}
+
+			DataRelation dataRelation = new DataRelation(name, parentColumn, childColumn);
+			List.Add(dataRelation);
+			return dataRelation;
+		}
+
+		/// <summary>
+		/// Creates a DataRelation with the specified name, and arrays of parent and child columns, and adds it to the collection.
+		/// </summary>
+		/// <param name="name">The name of the DataRelation to create.</param>
+		/// <param name="parentColumns">An array of parent DataColumn objects.</param>
+		/// <param name="childColumns">An array of child DataColumn objects.</param>
+		/// <returns>The created DataRelation.</returns>
+		[MonoTODO]
+		public virtual DataRelation Add(string name, DataColumn[] parentColumns, DataColumn[] childColumns)
+		{
+			//If no name was supplied, give it a default name.
+			if ((name == null) || (name == ""))
+			{
+				name = "Relation" + defaultNameIndex.ToString();
+				defaultNameIndex++;
+			}
+
+			DataRelation dataRelation = new DataRelation(name, parentColumns, childColumns);
+			List.Add(dataRelation);
+			return dataRelation;
+		}
+
+		/// <summary>
+		/// Creates a relation given the parameters and adds it to the collection.
+		/// An ArgumentException is generated if this relation already belongs to this collection or belongs to another collection.
+		/// A DuplicateNameException is generated if this collection already has a relation with the same name (case insensitive).
+		/// An InvalidConstraintException is generated if the relation can't be created based on the parameters.
+		/// The CollectionChanged event is raised if it succeeds.
+		/// </summary>
+		/// <param name="name">The name of the relation.</param>
+		/// <param name="parentColumn">parent column of relation.</param>
+		/// <param name="childColumn">child column of relation.</param>
+		/// <param name="createConstraints">true to create constraints; otherwise false. (default is true)</param>
+		/// <returns>The created DataRelation.</returns>
+		[MonoTODO]
+		public virtual DataRelation Add(string name, DataColumn parentColumn, DataColumn childColumn, bool createConstraints)
+		{
+			//If no name was supplied, give it a default name.
+			if ((name == null) || (name == ""))
+			{
+				name = "Relation" + defaultNameIndex.ToString();
+				defaultNameIndex++;
+			}
+
+			DataRelation dataRelation = new DataRelation(name, parentColumn, childColumn, createConstraints);
+			List.Add(dataRelation);
+			return dataRelation;
+		}
+
+		/// <summary>
+		/// Creates a DataRelation with the specified name, arrays of parent and child columns, 
+		/// and value specifying whether to create a constraint, and adds it to the collection.
+		/// </summary>
+		/// <param name="name">The name of the DataRelation to create.</param>
+		/// <param name="parentColumns">An array of parent DataColumn objects.</param>
+		/// <param name="childColumns">An array of child DataColumn objects.</param>
+		/// <param name="createConstraints">true to create a constraint; otherwise false.</param>
+		/// <returns>The created DataRelation.</returns>
+		[MonoTODO]
+		public virtual DataRelation Add(string name, DataColumn[] parentColumns, DataColumn[] childColumns, bool createConstraints)
+		{
+			//If no name was supplied, give it a default name.
+			if ((name == null) || (name == ""))
+			{
+				name = "Relation" + defaultNameIndex.ToString();
+				defaultNameIndex++;
+			}
+
+			DataRelation dataRelation = new DataRelation(name, parentColumns, childColumns, createConstraints);
+			AddCore(dataRelation);
+			List.Add(dataRelation);
+			return dataRelation;
+		}
+		#endregion
+	
+		/// <summary>
+		/// Performs verification on the table.
+		/// </summary>
+		/// <param name="relation">The relation to check.</param>
+		[MonoTODO]
+		protected virtual void AddCore(DataRelation relation)
+		{
+			if (relation == null)
+			{
+				//TODO: Issue a good exception message.
+				throw new ArgumentNullException();
+			}
+			else if(List.IndexOf(relation) != -1)
+			{
+				//TODO: Issue a good exception message.
+				throw new ArgumentException();
+			}
+			else if(List.Contains(relation.RelationName))
+			{
+				//TODO: Issue a good exception message.
+				throw new DuplicateNameException("A Relation named " + relation.RelationName + " already belongs to this DataSet.");
+			}
+		}
+
+		/// <summary>
+		/// Copies the elements of the specified DataRelation array to the end of the collection.
+		/// </summary>
+		/// <param name="relations">The array of DataRelation objects to add to the collection.</param>
+		[MonoTODO]
+		public virtual void AddRange(DataRelation[] relations)
+		{
+			//TODO: Implement
+
+			DataSet dataSet = GetDataSet();
+
+			throw new NotImplementedException ();
+
+			/*
+			foreach(DataRelation dataRelation in relations)
+			{
+				
+			}
+			*/
+
+		}
+
+		[MonoTODO]
+		public virtual bool CanRemove(DataRelation relation)
+		{
+			//TODO: Implement.
+			return false;
+		}
+
+		public virtual void Clear()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual bool Contains(string name)
+		{
+			return false;
+		}
+
+		protected abstract DataSet GetDataSet();
+
+		public virtual int IndexOf(DataRelation relation)
+		{
+			return List.IndexOf(relation);
+		}
+
+		public virtual int IndexOf(string relationName)
+		{
+			return List.IndexOf(this[relationName]);
+		}
+
+		[MonoTODO]
+		protected virtual void OnCollectionChanged(CollectionChangeEventArgs ccevent)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected internal virtual void OnCollectionChanging(CollectionChangeEventArgs ccevent)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RemoveAt(int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected virtual void RemoveCore(DataRelation relation)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public event CollectionChangeEventHandler CollectionChanged;
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataRow.cs b/mcs/class/System.Data/System.Data/DataRow.cs
new file mode 100644
index 00000000000..c170c9ff137
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRow.cs
@@ -0,0 +1,658 @@
+//
+// System.Data.DataRow.cs
+//
+// Author:
+//   Rodrigo Moya <rodrigo@ximian.com>
+//   Daniel Morgan <danmorg@sc.rr.com>
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Ximian, Inc 2002
+// (C) Daniel Morgan 2002
+// Copyright (C) 2002 Tim Coleman
+//
+
+using System;
+using System.Collections;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents a row of data in a DataTable.
+	/// </summary>
+	public class DataRow
+	{
+		#region Fields
+
+		DataTable table;
+
+		object[] original;
+		object[] proposed;
+		object[] current;
+
+		string[] columnErrors;
+		string rowError;
+		DataRowState rowState;
+
+		#endregion
+
+		#region Constructors
+
+		/// <summary>
+		/// This member supports the .NET Framework infrastructure and is not intended to be 
+		/// used directly from your code.
+		/// </summary>
+		protected internal DataRow (DataRowBuilder builder)
+		{
+			table = builder.Table;
+
+			original = null; 
+			proposed = null;
+			current = new object[table.Columns.Count];
+
+			columnErrors = new string[table.Columns.Count];
+			rowError = String.Empty;
+
+			rowState = DataRowState.Unchanged;
+		}
+
+		#endregion
+
+		#region Properties
+
+		/// <summary>
+		/// Gets a value indicating whether there are errors in a row.
+		/// </summary>
+		public bool HasErrors {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the data stored in the column specified by name.
+		/// </summary>
+		public object this[string columnName] {
+			[MonoTODO] //FIXME: will return different values depending on DataRowState
+			get { return this[columnName, DataRowVersion.Current]; }
+			[MonoTODO]
+			set {
+				DataColumn column = table.Columns[columnName];
+				if (column == null) 
+					throw new IndexOutOfRangeException ();
+				this[column] = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the data stored in specified DataColumn
+		/// </summary>
+		public object this[DataColumn column] {
+			[MonoTODO] //FIXME: will return different values depending on DataRowState
+			get { return this[column, DataRowVersion.Current]; } 
+								
+			[MonoTODO]
+			set {
+				bool objIsDBNull = value.Equals(DBNull.Value);
+				if (column == null)
+					throw new ArgumentNullException ();
+				int columnIndex = table.Columns.IndexOf (column);
+				if (columnIndex == -1)
+					throw new ArgumentException ();
+				if(column.DataType != value.GetType ()) {
+					if(objIsDBNull == true && column.AllowDBNull == false)
+						throw new InvalidCastException ();
+					else if(objIsDBNull == false)
+						throw new InvalidCastException ();
+				}
+				if (rowState == DataRowState.Deleted)
+					throw new DeletedRowInaccessibleException ();
+
+				BeginEdit ();  // implicitly called
+				if(objIsDBNull)
+					proposed[columnIndex] = DBNull.Value;
+				else
+					proposed[columnIndex] = value;
+				EndEdit (); // is this the right thing to do?
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the data stored in column specified by index.
+		/// </summary>
+		public object this[int columnIndex] {
+			[MonoTODO] //FIXME: not always supposed to return current
+			get { return this[columnIndex, DataRowVersion.Current]; }
+			[MonoTODO]
+			set {
+				DataColumn column = table.Columns[columnIndex]; //FIXME: will throw
+				if (column == null)  
+					throw new IndexOutOfRangeException ();
+				this[column] = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the specified version of data stored in the named column.
+		/// </summary>
+		public object this[string columnName, DataRowVersion version] {
+			[MonoTODO]
+			get {
+				DataColumn column = table.Columns[columnName]; //FIXME: will throw
+				if (column == null) 
+					throw new IndexOutOfRangeException ();
+				return this[column, version];
+			}
+		}
+
+		/// <summary>
+		/// Gets the specified version of data stored in the specified DataColumn.
+		/// </summary>
+		public object this[DataColumn column, DataRowVersion version] {
+			get {
+				if (column == null)
+					throw new ArgumentNullException ();	
+
+				int columnIndex = table.Columns.IndexOf (column);
+
+				if (columnIndex == -1)
+					throw new ArgumentException ();
+
+				if (version == DataRowVersion.Default)
+					return column.DefaultValue;
+
+				if (!HasVersion (version))
+					throw new VersionNotFoundException ();
+
+				switch (version)
+				{
+					case DataRowVersion.Proposed:
+						return proposed[columnIndex];
+					case DataRowVersion.Current:
+						return current[columnIndex];
+					case DataRowVersion.Original:
+						return original[columnIndex];
+					default:
+						throw new ArgumentException ();
+				}
+			}
+		}
+
+		/// <summary>
+		/// Gets the data stored in the column, specified by index and version of the data to
+		/// retrieve.
+		/// </summary>
+		public object this[int columnIndex, DataRowVersion version] {
+			[MonoTODO]
+			get {
+				DataColumn column = table.Columns[columnIndex]; //FIXME: throws
+				if (column == null) 
+					throw new IndexOutOfRangeException ();
+				return this[column, version];
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets all of the values for this row through an array.
+		/// </summary>
+		[MonoTODO]
+		public object[] ItemArray {
+			get { return current; }
+			set {
+				if (value.Length > table.Columns.Count)
+					throw new ArgumentException ();
+				if (rowState == DataRowState.Deleted)
+					throw new DeletedRowInaccessibleException ();
+
+				for (int i = 0; i < value.Length; i += 1)
+				{
+					if (table.Columns[i].ReadOnly && value[i] != this[i])
+						throw new ReadOnlyException ();
+
+					if (value[i] == null)
+					{
+						if (!table.Columns[i].AllowDBNull)
+							throw new NoNullAllowedException ();
+						continue;
+					}
+						
+					//FIXME: int strings can be converted to ints
+					if (table.Columns[i].DataType != value[i].GetType())
+						throw new InvalidCastException ();
+				}
+
+				//FIXME: BeginEdit() not correct 
+				BeginEdit ();  // implicitly called
+				//FIXME: this isn't correct.  a shorter array can set the first few values
+				//and not touch the rest.  So not all the values will get replaced
+				proposed = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the custom error description for a row.
+		/// </summary>
+		public string RowError {
+			get { return rowError; }
+			set { rowError = value; }
+		}
+
+		/// <summary>
+		/// Gets the current state of the row in regards to its relationship to the
+		/// DataRowCollection.
+		/// </summary>
+		public DataRowState RowState {
+			get { return rowState; }
+		}
+
+		/// <summary>
+		/// Gets the DataTable for which this row has a schema.
+		/// </summary>
+		public DataTable Table {
+			get { return table; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Commits all the changes made to this row since the last time AcceptChanges was
+		/// called.
+		/// </summary>
+		[MonoTODO]
+		public void AcceptChanges () 
+		{
+			this.EndEdit ();
+
+			switch (rowState)
+			{
+				case DataRowState.Added:
+					rowState = DataRowState.Unchanged;
+					break;
+				case DataRowState.Modified:
+					rowState = DataRowState.Unchanged;
+					break;
+				case DataRowState.Deleted:
+					table.Rows.Remove (this); //FIXME: this should occur in end edit
+					break;
+			}
+
+			original = null;
+		}
+
+		/// <summary>
+		/// Begins an edit operation on a DataRow object.
+		/// </summary>
+		[MonoTODO]
+		public void BeginEdit() 
+		{
+			if (rowState == DataRowState.Deleted)
+				throw new DeletedRowInaccessibleException ();
+
+			if (!HasVersion (DataRowVersion.Proposed))
+			{
+				proposed = new object[table.Columns.Count];
+				Array.Copy (current, proposed, table.Columns.Count);
+			}
+			//TODO: Suspend validation
+
+			//FIXME: this doesn't happen on begin edit
+			if (!HasVersion (DataRowVersion.Original))
+			{
+				original = new object[table.Columns.Count];
+				Array.Copy (current, original, table.Columns.Count);
+			}
+		}
+
+		/// <summary>
+		/// Cancels the current edit on the row.
+		/// </summary>
+		[MonoTODO]
+		public void CancelEdit () 
+		{
+			//FIXME: original doesn't get erased on CancelEdit
+			//TODO: Events
+			if (HasVersion (DataRowVersion.Proposed))
+			{
+				original = null;
+				proposed = null;
+				rowState = DataRowState.Unchanged;
+			}
+		}
+
+		/// <summary>
+		/// Clears the errors for the row, including the RowError and errors set with
+		/// SetColumnError.
+		/// </summary>
+		public void ClearErrors () 
+		{
+			rowError = String.Empty;
+			columnErrors = new String[table.Columns.Count];
+		}
+
+		/// <summary>
+		/// Deletes the DataRow.
+		/// </summary>
+		[MonoTODO]
+		public void Delete () 
+		{
+			if (rowState == DataRowState.Deleted)
+				throw new DeletedRowInaccessibleException ();
+
+			//TODO: Events, Constraints
+			rowState = DataRowState.Deleted;
+		}
+
+		/// <summary>
+		/// Ends the edit occurring on the row.
+		/// </summary>
+		[MonoTODO]
+		public void EndEdit () 
+		{
+			if (HasVersion (DataRowVersion.Proposed))
+			{
+				rowState = DataRowState.Modified;
+				//TODO: Validate Constraints, Events
+				Array.Copy (proposed, current, table.Columns.Count);
+				proposed = null;
+			}
+		}
+
+		/// <summary>
+		/// Gets the child rows of this DataRow using the specified DataRelation.
+		/// </summary>
+		[MonoTODO]
+		public DataRow[] GetChildRows (DataRelation relation) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the child rows of a DataRow using the specified RelationName of a
+		/// DataRelation.
+		/// </summary>
+		[MonoTODO]
+		public DataRow[] GetChildRows (string relationName) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the child rows of a DataRow using the specified DataRelation, and
+		/// DataRowVersion.
+		/// </summary>
+		[MonoTODO]
+		public DataRow[] GetChildRows (DataRelation relation, DataRowVersion version) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the child rows of a DataRow using the specified RelationName of a
+		/// DataRelation, and DataRowVersion.
+		/// </summary>
+		[MonoTODO]
+		public DataRow[] GetChildRows (string relationName, DataRowVersion version) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the error description of the specified DataColumn.
+		/// </summary>
+		public string GetColumnError (DataColumn column) 
+		{
+			return GetColumnError (table.Columns.IndexOf(column));
+		}
+
+		/// <summary>
+		/// Gets the error description for the column specified by index.
+		/// </summary>
+		public string GetColumnError (int columnIndex) 
+		{
+			if (columnIndex < 0 || columnIndex >= columnErrors.Length)
+				throw new IndexOutOfRangeException ();
+
+			return columnErrors[columnIndex];
+		}
+
+		/// <summary>
+		/// Gets the error description for the column, specified by name.
+		/// </summary>
+		public string GetColumnError (string columnName) 
+		{
+			return GetColumnError (table.Columns.IndexOf(columnName));
+		}
+
+		/// <summary>
+		/// Gets an array of columns that have errors.
+		/// </summary>
+		public DataColumn[] GetColumnsInError () 
+		{
+			ArrayList dataColumns = new ArrayList ();
+
+			for (int i = 0; i < columnErrors.Length; i += 1)
+			{
+				if (columnErrors[i] != String.Empty)
+					dataColumns.Add (table.Columns[i]);
+			}
+
+			return (DataColumn[])(dataColumns.ToArray ());
+		}
+
+		/// <summary>
+		/// Gets the parent row of a DataRow using the specified DataRelation.
+		/// </summary>
+		[MonoTODO]
+		public DataRow GetParentRow (DataRelation relation) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the parent row of a DataRow using the specified RelationName of a
+		/// DataRelation.
+		/// </summary>
+		[MonoTODO]
+		public DataRow GetParentRow (string relationName) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the parent row of a DataRow using the specified DataRelation, and
+		/// DataRowVersion.
+		/// </summary>
+		[MonoTODO]
+		public DataRow GetParentRow (DataRelation relation, DataRowVersion version) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the parent row of a DataRow using the specified RelationName of a 
+		/// DataRelation, and DataRowVersion.
+		/// </summary>
+		[MonoTODO]
+		public DataRow GetParentRow (string relationName, DataRowVersion version) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the parent rows of a DataRow using the specified DataRelation.
+		/// </summary>
+		[MonoTODO]
+		public DataRow[] GetParentRows (DataRelation relation) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the parent rows of a DataRow using the specified RelationName of a 
+		/// DataRelation.
+		/// </summary>
+		[MonoTODO]
+		public DataRow[] GetParentRows (string relationName) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the parent rows of a DataRow using the specified DataRelation, and
+		/// DataRowVersion.
+		/// </summary>
+		[MonoTODO]
+		public DataRow[] GetParentRows (DataRelation relation, DataRowVersion version) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the parent rows of a DataRow using the specified RelationName of a 
+		/// DataRelation, and DataRowVersion.
+		/// </summary>
+		[MonoTODO]
+		public DataRow[] GetParentRows (string relationName, DataRowVersion version) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether a specified version exists.
+		/// </summary>
+		public bool HasVersion (DataRowVersion version) 
+		{
+			switch (version)
+			{
+				case DataRowVersion.Default:
+					return true;
+				case DataRowVersion.Proposed:
+					return (proposed != null);
+				case DataRowVersion.Current:
+					return (current != null);
+				case DataRowVersion.Original:
+					return (original != null);
+			}
+			return false;
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the specified DataColumn contains a null value.
+		/// </summary>
+		public bool IsNull (DataColumn column) 
+		{
+			return (this[column] == null);
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the column at the specified index contains a null
+		/// value.
+		/// </summary>
+		public bool IsNull (int columnIndex) 
+		{
+			return (this[columnIndex] == null);
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the named column contains a null value.
+		/// </summary>
+		public bool IsNull (string columnName) 
+		{
+			return (this[columnName] == null);
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the specified DataColumn and DataRowVersion
+		/// contains a null value.
+		/// </summary>
+		public bool IsNull (DataColumn column, DataRowVersion version) 
+		{
+			return (this[column, version] == null);
+		}
+
+		/// <summary>
+		/// Rejects all changes made to the row since AcceptChanges was last called.
+		/// </summary>
+		public void RejectChanges () 
+		{
+			// If original is null, then nothing has happened since AcceptChanges
+			// was last called.  We have no "original" to go back to.
+			if (original != null)
+			{
+				Array.Copy (original, current, table.Columns.Count);
+				CancelEdit ();
+				switch (rowState)
+				{
+					case DataRowState.Added:
+						table.Rows.Remove (this);
+						break;
+					case DataRowState.Modified:
+						rowState = DataRowState.Unchanged;
+						break;
+					case DataRowState.Deleted:
+						rowState = DataRowState.Unchanged;
+						break;
+				}
+			}
+		}
+
+		/// <summary>
+		/// Sets the error description for a column specified as a DataColumn.
+		/// </summary>
+		public void SetColumnError (DataColumn column, string error) 
+		{
+			SetColumnError (table.Columns.IndexOf (column), error);
+		}
+
+		/// <summary>
+		/// Sets the error description for a column specified by index.
+		/// </summary>
+		public void SetColumnError (int columnIndex, string error) 
+		{
+			if (columnIndex < 0 || columnIndex >= columnErrors.Length)
+				throw new IndexOutOfRangeException ();
+			columnErrors[columnIndex] = error;
+		}
+
+		/// <summary>
+		/// Sets the error description for a column specified by name.
+		/// </summary>
+		public void SetColumnError (string columnName, string error) 
+		{
+			SetColumnError (table.Columns.IndexOf (columnName), error);
+		}
+
+		/// <summary>
+		/// Sets the value of the specified DataColumn to a null value.
+		/// </summary>
+		[MonoTODO]
+		protected void SetNull (DataColumn column) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Sets the parent row of a DataRow with specified new parent DataRow.
+		/// </summary>
+		[MonoTODO]
+		public void SetParentRow (DataRow parentRow) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Sets the parent row of a DataRow with specified new parent DataRow and
+		/// DataRelation.
+		/// </summary>
+		[MonoTODO]
+		public void SetParentRow (DataRow parentRow, DataRelation relation) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataRowAction.cs b/mcs/class/System.Data/System.Data/DataRowAction.cs
new file mode 100644
index 00000000000..b6423b374ca
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRowAction.cs
@@ -0,0 +1,28 @@
+//
+// System.Data.DataRowAction.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Describes the action taken on a DataRow.
+	/// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values.
+	/// </summary>
+	[Flags]
+	[Serializable]
+	public enum DataRowAction
+	{
+		Nothing = 0,
+		Delete = 1,
+		Change = 2,
+		Rollback = 4,
+		Commit = 8,
+		Add = 16
+	}
+
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/DataRowBuilder.cs b/mcs/class/System.Data/System.Data/DataRowBuilder.cs
new file mode 100644
index 00000000000..37c4621cafb
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRowBuilder.cs
@@ -0,0 +1,52 @@
+//
+// System.Data.DataRowBuilder
+//
+// Author:
+//   Tim Coleman <tim@timcoleman.com>
+//
+// Copyright (C) 2002 Tim Coleman
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// A supporting class that exists solely to support
+	/// DataRow and DataTable
+	/// Implementation of something meaningful will follow.
+	/// Presumably, what that is will become apparent when
+	/// constructing DataTable and DataRow.
+	/// </summary>
+
+	public class DataRowBuilder 
+	{
+		#region Fields
+		
+		DataTable table;
+
+		#endregion
+
+		#region Constructors
+
+		// DataRowBuilder on .NET takes 3 arguments, a
+		// DataTable and two Int32.  For consistency, this
+		// class will also take those arguments.
+
+		protected internal DataRowBuilder (DataTable table, int x, int y)
+		{
+			this.table = table;
+		}
+
+		#endregion
+
+		#region Properties
+
+		protected internal DataTable Table {
+			get { return table; }
+		}
+
+		#endregion
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataRowChangeEventArgs.cs b/mcs/class/System.Data/System.Data/DataRowChangeEventArgs.cs
new file mode 100644
index 00000000000..5466ec822bf
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRowChangeEventArgs.cs
@@ -0,0 +1,41 @@
+//
+// System.Data.DataRowChangeEventArgs.cs
+//
+// Author:
+//   Daniel Morgan <danmorg@sc.rr.com>
+//
+// (C) Ximian, Inc 2002
+//
+
+namespace System.Data
+{
+	/// <summary>

+	/// argument data for events RowChanged, RowChanging, 

+	/// OnRowDeleting, and OnRowDeleted

+	/// </summary>
+	public class DataRowChangeEventArgs : EventArgs {
+
+		[MonoTODO]
+		public DataRowChangeEventArgs(DataRow row,

+			DataRowAction action) {
+
+			throw new NotImplementedException ();
+		}
+
+		public DataRowAction Action {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public DataRow Row {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+	}
+
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/DataRowChangeEventHandler.cs b/mcs/class/System.Data/System.Data/DataRowChangeEventHandler.cs
new file mode 100644
index 00000000000..4959e38f3bf
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRowChangeEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.DataRowChangeEventHandler.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents the method that will handle the RowChanging, RowChanged, RowDeleting, and RowDeleted events of a DataTable.
+	/// </summary>
+	[Serializable]
+	public delegate void DataRowChangeEventHandler(object sender, DataRowChangeEventArgs e);
+
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/DataRowCollection.cs b/mcs/class/System.Data/System.Data/DataRowCollection.cs
new file mode 100644
index 00000000000..a69999ad237
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRowCollection.cs
@@ -0,0 +1,141 @@
+//
+// System.Data.DataRowCollection.cs
+//
+// Author:
+//   Daniel Morgan <danmorg@sc.rr.com>
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Ximian, Inc 2002
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Collection of DataRows in a DataTable
+	/// </summary>
+	[Serializable]
+	public class DataRowCollection : InternalDataCollectionBase 
+	{
+		private DataTable table;
+
+		/// <summary>
+		/// Internal constructor used to build a DataRowCollection.
+		/// </summary>
+		protected internal DataRowCollection (DataTable table) : base ()
+		{
+			this.table = table;
+		}
+
+		/// <summary>
+		/// Gets the row at the specified index.
+		/// </summary>
+		public DataRow this[int index] 
+		{
+			get { return (DataRow) list[index]; }
+		}
+
+		/// <summary>
+		/// This member overrides InternalDataCollectionBase.List
+		/// </summary>
+		protected override ArrayList List 
+		{
+			get { return list; }
+		}		
+
+		/// <summary>
+		/// Adds the specified DataRow to the DataRowCollection object.
+		/// </summary>
+		public void Add (DataRow row) 
+		{
+			list.Add (row);
+		}
+
+		/// <summary>
+		/// Creates a row using specified values and adds it to the DataRowCollection.
+		/// </summary>
+		public virtual DataRow Add (object[] values) 
+		{
+			DataRow row = table.NewRow ();
+			row.ItemArray = values;
+			Add (row);
+			return row;
+		}
+
+		/// <summary>
+		/// Clears the collection of all rows.
+		/// </summary>
+		[MonoTODO]
+		public void Clear () 
+		{
+			list.Clear ();
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the primary key of any row in the collection contains
+		/// the specified value.
+		/// </summary>
+		[MonoTODO]
+		public bool Contains (object key) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the primary key column(s) of any row in the 
+		/// collection contains the values specified in the object array.
+		/// </summary>
+		[MonoTODO]
+		public bool Contains (object[] keys) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the row specified by the primary key value.
+		/// </summary>
+		[MonoTODO]
+		public DataRow Find (object key) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Gets the row containing the specified primary key values.
+		/// </summary>
+		[MonoTODO]
+		public DataRow Find (object[] keys) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// Inserts a new row into the collection at the specified location.
+		/// </summary>
+		public void InsertAt (DataRow row, int pos) 
+		{
+			list.Insert (pos, row);
+		}
+
+		/// <summary>
+		/// Removes the specified DataRow from the collection.
+		/// </summary>
+		public void Remove (DataRow row) 
+		{
+			list.Remove (row);
+		}
+
+		/// <summary>
+		/// Removes the row at the specified index from the collection.
+		/// </summary>
+		public void RemoveAt (int index) 
+		{
+			list.RemoveAt (index);
+		}
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataRowState.cs b/mcs/class/System.Data/System.Data/DataRowState.cs
new file mode 100644
index 00000000000..4e77e406203
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRowState.cs
@@ -0,0 +1,26 @@
+//
+// System.Data.DataRowState.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Gets the state of a DataRow object.
+	/// </summary>
+	[Flags]
+	[Serializable]
+	public enum DataRowState
+	{
+		Detached = 1,
+		Unchanged = 2,
+		Added = 4,
+		Deleted = 8,
+		Modified = 16
+	}
+
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/DataRowVersion.cs b/mcs/class/System.Data/System.Data/DataRowVersion.cs
new file mode 100644
index 00000000000..ad757946bcb
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRowVersion.cs
@@ -0,0 +1,23 @@
+//
+// System.Data.DataRowVersion.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Describes the version of a DataRow.
+	/// </summary>
+	[Serializable]
+	public enum DataRowVersion
+	{
+		Original = 256,
+		Current = 512,
+		Proposed = 1024,
+		Default = 1536
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/DataRowView.cs b/mcs/class/System.Data/System.Data/DataRowView.cs
new file mode 100644
index 00000000000..f5301fdf234
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataRowView.cs
@@ -0,0 +1,197 @@
+//
+// System.Data.DataRowView.cs
+//
+// Author:
+//    Rodrigo Moya <rodrigo@ximian.com>
+//    Miguel de Icaza <miguel@ximian.com>
+//
+// (C) Ximian, Inc 2002
+//
+
+using System.Collections;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents a customized view of a DataRow exposed as a fully featured Windows Forms control.
+	/// </summary>
+	public class DataRowView : ICustomTypeDescriptor, IEditableObject, IDataErrorInfo
+	{
+		[MonoTODO]
+		public void BeginEdit ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void CancelEdit ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataView CreateChildView (DataRelation relation)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataView CreateChildView (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Delete ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void EndEdit ()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		public DataView DataView
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public bool IsEdit {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public bool IsNew {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public string this[string column] {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public string Error {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public object this[int column] {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public DataRow Row {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public DataRowVersion RowVersion {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		//
+		// ICustomTypeDescriptor implementations
+		//
+
+		[MonoTODO]
+		AttributeCollection ICustomTypeDescriptor.GetAttributes  ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		string ICustomTypeDescriptor.GetClassName ()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		string ICustomTypeDescriptor.GetComponentName ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		TypeConverter ICustomTypeDescriptor.GetConverter ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		EventDescriptor ICustomTypeDescriptor.GetDefaultEvent ()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		PropertyDescriptor ICustomTypeDescriptor.GetDefaultProperty ()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		object ICustomTypeDescriptor.GetEditor (Type editorBaseType)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		EventDescriptorCollection ICustomTypeDescriptor.GetEvents ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		EventDescriptorCollection ICustomTypeDescriptor.GetEvents (Attribute [] attributes)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties (Attribute [] attributes)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		object ICustomTypeDescriptor.GetPropertyOwner (PropertyDescriptor pd)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataSet.cs b/mcs/class/System.Data/System.Data/DataSet.cs
new file mode 100644
index 00000000000..eb484562085
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataSet.cs
@@ -0,0 +1,336 @@
+// 
+// System.Data/DataSet.cs
+//
+// Author:
+//   Christopher Podurgiel <cpodurgiel@msn.com>
+//   Daniel Morgan <danmorg@sc.rr.com>
+//   Rodrigo Moya <rodrigo@ximian.com>
+//
+// (C) Ximian, Inc. 2002
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Xml;
+
+namespace System.Data
+{
+	/// <summary>
+	/// an in-memory cache of data 
+	/// </summary>
+	[Serializable]
+	public class DataSet : MarshalByValueComponent, IListSource,
+		ISupportInitialize, ISerializable {
+
+		private string dataSetName;
+		private bool caseSensitive;
+		private bool enforceConstraints;
+		private DataTableCollection tableCollection;
+		// private DataTableRelationCollection relationCollection;
+		private PropertyCollection properties;
+		
+		#region Constructors
+
+		[MonoTODO]
+		public DataSet() {
+			tableCollection = new DataTableCollection (this);
+		}
+
+		[MonoTODO]
+		public DataSet(string name) : this () {
+			dataSetName = name;
+		}
+
+		[MonoTODO]
+		protected DataSet(SerializationInfo info, StreamingContext context) : this () {
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Constructors
+
+		#region Public Properties
+
+		public bool CaseSensitive {
+			get {
+				return caseSensitive;
+			} 
+			set {
+				caseSensitive = value;
+			}
+		}
+
+		public string DataSetName {
+			get {
+				return dataSetName;
+			} 
+			
+			set {
+				dataSetName = value;
+			}
+		}
+
+		public DataViewManager DefaultViewManager {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			} 
+			
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public bool EnforceConstraints {
+			get {
+				return enforceConstraints;
+			} 
+			
+			set {
+				enforceConstraints = value;
+			}
+		}
+
+		public PropertyCollection ExtendedProperties {
+			[MonoTODO]
+			get {
+				return properties;
+			}
+		}
+
+		public bool HasErrors {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public CultureInfo Locale {
+			[MonoTODO]
+			get { 
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public string Namespace {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			} 
+			
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public string Prefix {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			} 
+			
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public DataRelationCollection Relations {
+			[MonoTODO]
+			get{
+				//return relationCollection;
+				throw new NotImplementedException();
+			}
+		}
+
+		public override ISite Site {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			} 
+			
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public DataTableCollection Tables {
+			get {
+				return tableCollection;
+			}
+		}
+
+		#endregion // Public Properties
+
+		#region Public Methods
+
+		public void AcceptChanges()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void Clear()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual DataSet Clone()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public DataSet Copy()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public DataSet GetChanges()
+		{
+			throw new NotImplementedException ();
+		}
+
+		
+		public DataSet GetChanges(DataRowState rowStates)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public string GetXml()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public string GetXmlSchema()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual void RejectChanges()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual void Reset()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXml(Stream stream)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXml(string fileName)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXml(TextWriter writer)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXml(XmlWriter writer)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXml(Stream stream, XmlWriteMode mode)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXml(string fileName, XmlWriteMode mode)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXml(TextWriter writer,	XmlWriteMode mode)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXml(XmlWriter writer, XmlWriteMode mode)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXmlSchema(Stream stream)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXmlSchema(string fileName)
+	        {
+			throw new NotImplementedException ();
+		}
+
+		public void WriteXmlSchema(TextWriter writer)
+		{
+		}
+
+		public void WriteXmlSchema(XmlWriter writer)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Public Methods
+
+		#region Public Events
+
+		public event MergeFailedEventHandler MergeFailed;
+
+		#endregion // Public Events
+
+		#region Destructors
+
+		~DataSet()
+		{
+		}
+
+		#endregion Destructors
+
+		#region IListSource methods
+		IList IListSource.GetList ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		bool IListSource.ContainsListCollection {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+		#endregion IListSource methods
+		
+		#region ISupportInitialize methods
+		void ISupportInitialize.BeginInit ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		void ISupportInitialize.EndInit ()
+		{
+			throw new NotImplementedException ();
+		}
+		#endregion
+
+		#region ISerializable
+		void ISerializable.GetObjectData (SerializationInfo si, StreamingContext sc)
+		{
+			throw new NotImplementedException ();
+		}
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataTable.cs b/mcs/class/System.Data/System.Data/DataTable.cs
new file mode 100644
index 00000000000..518cc26c914
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataTable.cs
@@ -0,0 +1,750 @@
+//
+// System.Data.DataTable.cs
+//
+// Author:
+//   Franklin Wise <gracenote@earthlink.net>
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//   Daniel Morgan <danmorg@sc.rr.com>
+//   Rodrigo Moya <rodrigo@ximian.com>
+//
+// (C) Chris Podurgiel
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents one table of in-memory data.
+	/// </summary>
+	[Serializable]
+	public class DataTable : ISerializable
+                //MarshalByValueComponent, IListSource, ISupportInitialize
+	{
+		internal DataSet dataSet;   
+		
+		private bool _caseSensitive;
+		private DataColumnCollection _columnCollection;
+		private ConstraintCollection _constraintCollection;
+		private DataView _defaultView;
+
+		private string _displayExpression;
+		private PropertyCollection _extendedProperties;
+		private bool _hasErrors;
+		private CultureInfo _locale;
+		private int _minimumCapacity;
+		private string _nameSpace;
+		// FIXME: temporarily commented
+		// private DataTableRelationCollection _childRelations; 
+		// private DataTableRelationCollection _parentRelations;
+		private string _prefix;
+		private DataColumn[] _primaryKey;
+		private DataRowCollection _rows;
+		private ISite _site;
+		private string _tableName;
+		private bool _containsListCollection;
+		private string _encodedTableName;
+		
+		/// <summary>
+		/// Initializes a new instance of the DataTable class with no arguments.
+		/// </summary>
+		
+		public DataTable()
+		{
+			dataSet = null;
+			_columnCollection = new DataColumnCollection(this);
+			_constraintCollection = new ConstraintCollection(); 
+			_extendedProperties = new PropertyCollection();
+			_tableName = "";
+			_nameSpace = null;
+			_caseSensitive = false;  	//default value
+			_displayExpression = null;
+			_primaryKey = null;
+			_site = null;
+			_rows = new DataRowCollection (this);
+			_locale = CultureInfo.CurrentCulture;
+
+			//LAMESPEC: spec says 25 impl does 50
+			_minimumCapacity = 50;
+			
+			// FIXME: temporaily commented DataTableRelationCollection
+			// _childRelations = new DataTableRelationCollection();
+			// _parentRelations = new DataTableRelationCollection();
+
+		
+			_defaultView = new DataView(this);
+		}
+
+		/// <summary>
+		/// Intitalizes a new instance of the DataTable class with the specified table name.
+		/// </summary>
+		
+		public DataTable(string tableName) : this ()
+		{
+			_tableName = tableName;
+		}
+
+		/// <summary>
+		/// Initializes a new instance of the DataTable class with the SerializationInfo and the StreamingContext.
+		/// </summary>
+		
+		[MonoTODO]
+		protected DataTable(SerializationInfo info, StreamingContext context)
+			: this ()
+		{
+			//
+			// TODO: Add constructor logic here
+			//
+		}
+
+		/// <summary>
+		/// Indicates whether string comparisons within the table are case-sensitive.
+		/// </summary>
+		
+		public bool CaseSensitive 
+		{
+			get {
+				return _caseSensitive;
+			}
+			set {
+				_caseSensitive = value;
+			}
+		}
+
+
+		/// <summary>
+		/// Gets the collection of child relations for this DataTable.
+		/// </summary>
+		[MonoTODO]	
+		public DataRelationCollection ChildRelations
+		{
+			get {
+				// FIXME: temporarily commented to compile
+				// return (DataRelationCollection)_childRelations;
+				
+				//We are going to have to Inherit a class from 
+				//DataRelationCollection because DRC is abstract
+				
+				throw new NotImplementedException ();
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of columns that belong to this table.
+		/// </summary>
+
+		public DataColumnCollection Columns
+		{
+			get {
+				return _columnCollection;
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of constraints maintained by this table.
+		/// </summary>
+		
+		public ConstraintCollection Constraints
+		{
+			get {
+				return _constraintCollection;
+			}
+		}
+
+		/// <summary>
+		/// Gets the DataSet that this table belongs to.
+		/// </summary>
+		public DataSet DataSet {
+			get { return dataSet; }
+		}
+
+		
+
+		/// <summary>
+		/// Gets a customized view of the table which may 
+		/// include a filtered view, or a cursor position.
+		/// </summary>
+		[MonoTODO]	
+		public DataView DefaultView
+		{
+			get
+			{
+				return _defaultView;
+			}
+		}
+		
+
+		/// <summary>
+		/// Gets or sets the expression that will return 
+		/// a value used to represent this table in the user interface.
+		/// </summary>
+		
+		public string DisplayExpression 
+		{
+			get {
+				return "" + _displayExpression;
+			}
+			set {
+				_displayExpression = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of customized user information.
+		/// </summary>
+		public PropertyCollection ExtendedProperties
+		{
+			get {
+				return _extendedProperties;
+			}
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether there are errors in 
+		/// any of the_rows in any of the tables of the DataSet to 
+		/// which the table belongs.
+		/// </summary>
+		public bool HasErrors
+		{
+			get {
+				return _hasErrors;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the locale information used to 
+		/// compare strings within the table.
+		/// </summary>
+		public CultureInfo Locale
+		{
+			get {
+				return _locale;
+			}
+			set {
+				_locale = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the initial starting size for this table.
+		/// </summary>
+		public int MinimumCapacity
+		{
+			get {
+				return _minimumCapacity;
+			}
+			set {
+				_minimumCapacity = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the namespace for the XML represenation 
+		/// of the data stored in the DataTable.
+		/// </summary>
+		public string Namespace
+		{
+			get {
+				return "" + _nameSpace;
+			}
+			set {
+				_nameSpace = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of parent relations for 
+		/// this DataTable.
+		/// </summary>
+		[MonoTODO]
+		public DataRelationCollection ParentRelations
+		{
+			get {	
+				// FIXME: temporarily commented to compile
+				// return _parentRelations;
+				throw new NotImplementedException ();
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the namespace for the XML represenation
+		///  of the data stored in the DataTable.
+		/// </summary>
+		public string Prefix
+		{
+			get {
+				return "" + _prefix;
+			}
+			set {
+				_prefix = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets an array of columns that function as 
+		/// primary keys for the data table.
+		/// </summary>
+		[MonoTODO]
+		public DataColumn[] PrimaryKey
+		{
+			get {
+				//TODO: compute PrimaryKey
+				if (null == _primaryKey) return new DataColumn[]{};
+				return _primaryKey;
+			}
+			set {
+				_primaryKey = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets the collection of_rows that belong to this table.
+		/// </summary>
+		
+		public DataRowCollection Rows
+		{
+			get { return _rows; }
+		}
+
+		/// <summary>
+		/// Gets or sets an System.ComponentModel.ISite 
+		/// for the DataTable.
+		/// </summary>
+		
+		public virtual ISite Site
+		{
+			get {
+				return _site;
+			}
+			set {
+				_site = value;
+			}
+		}
+
+		/// <summary>
+		/// Gets or sets the name of the the DataTable.
+		/// </summary>
+		
+		public string TableName
+		{
+			get {
+				return "" + _tableName;
+			}
+			set {
+				_tableName = value;
+			}
+		}
+
+		/* FIXME: implement IListSource
+		public bool IListSource.ContainsListCollection
+		{
+			get {
+				return _containsListCollection;
+			}
+		}
+		*/
+
+		/// <summary>
+		/// Commits all the changes made to this table since the 
+		/// last time AcceptChanges was called.
+		/// </summary>
+		
+		public void AcceptChanges()
+		{
+		}
+
+		/// <summary>
+		/// Begins the initialization of a DataTable that is used 
+		/// on a form or used by another component. The initialization
+		/// occurs at runtime.
+		/// </summary>
+		
+		public void BeginInit()
+		{
+		}
+
+		/// <summary>
+		/// Turns off notifications, index maintenance, and 
+		/// constraints while loading data.
+		/// </summary>
+		
+		public void BeginLoadData()
+		{
+		}
+
+		/// <summary>
+		/// Clears the DataTable of all data.
+		/// </summary>
+		
+		public void Clear()
+		{
+			_rows.Clear ();
+		}
+
+		/// <summary>
+		/// Clones the structure of the DataTable, including
+		///  all DataTable schemas and constraints.
+		/// </summary>
+		
+		[MonoTODO]
+		public virtual DataTable Clone()
+		{
+			//FIXME:
+			return this; //Don't know if this is correct
+		}
+
+		/// <summary>
+		/// Computes the given expression on the current_rows that 
+		/// pass the filter criteria.
+		/// </summary>
+		
+		[MonoTODO]
+		public object Compute(string expression, string filter)
+		{
+			//FIXME: //Do a real compute
+			object obj = "a";
+			return obj;
+		}
+
+		/// <summary>
+		/// Copies both the structure and data for this DataTable.
+		/// </summary>
+		[MonoTODO]	
+		public DataTable Copy()
+		{
+			//FIXME: Do a real copy
+			return this;
+		}
+
+		/// <summary>
+		/// Ends the initialization of a DataTable that is used 
+		/// on a form or used by another component. The 
+		/// initialization occurs at runtime.
+		/// </summary>
+		
+		public void EndInit()
+		{
+		}
+
+		/// <summary>
+		/// Turns on notifications, index maintenance, and 
+		/// constraints after loading data.
+		/// </summary>
+		
+		public void EndLoadData()
+		{
+		}
+
+		/// <summary>
+		/// Gets a copy of the DataTable that contains all
+		///  changes made to it since it was loaded or 
+		///  AcceptChanges was last called.
+		/// </summary>
+		[MonoTODO]
+		public DataTable GetChanges()
+		{
+			//TODO:
+			return this;
+		}
+
+		/// <summary>
+		/// Gets a copy of the DataTable containing all 
+		/// changes made to it since it was last loaded, or 
+		/// since AcceptChanges was called, filtered by DataRowState.
+		/// </summary>
+		[MonoTODO]	
+		public DataTable GetChanges(DataRowState rowStates)
+		{
+			//TODO:
+			return this;
+		}
+
+		/// <summary>
+		/// Gets an array of DataRow objects that contain errors.
+		/// </summary>
+		
+		[MonoTODO]
+		public DataRow[] GetErrors()
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// This member supports the .NET Framework infrastructure
+		/// and is not intended to be used directly from your code.
+		/// </summary>
+		
+		//protected virtual Type GetRowType()
+		//{	
+		//}
+
+		/// <summary>
+		/// This member supports the .NET Framework infrastructure 
+		/// and is not intended to be used directly from your code.
+		/// </summary>
+		
+		/* FIXME: implement IListSource
+		public IList IListSource.GetList()
+		{
+			IList list = null;
+			return list;
+		}
+		*/
+		
+		/// <summary>
+		/// Copies a DataRow into a DataTable, preserving any 
+		/// property settings, as well as original and current values.
+		/// </summary>
+		[MonoTODO]
+		public void ImportRow(DataRow row)
+		{
+		}
+
+		/// <summary>
+		/// This member supports the .NET Framework infrastructure
+		///  and is not intended to be used directly from your code.
+		/// </summary>
+		
+		[MonoTODO]
+		void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+		}
+
+		/// <summary>
+		/// Finds and updates a specific row. If no matching row
+		///  is found, a new row is created using the given values.
+		/// </summary>
+		[MonoTODO]
+		public DataRow LoadDataRow(object[] values, bool fAcceptChanges)
+		{
+			//FIXME: implemente
+			DataRow dataRow = null;
+			return dataRow;
+		}
+
+		/// <summary>
+		/// Creates a new DataRow with the same schema as the table.
+		/// </summary>
+		public DataRow NewRow()
+		{
+			return this.NewRowFromBuilder (new DataRowBuilder (this, 0, 0));
+		}
+
+		/// <summary>
+		/// This member supports the .NET Framework infrastructure
+		///  and is not intended to be used directly from your code.
+		/// </summary>
+		[MonoTODO]
+		protected internal DataRow[] NewRowArray(int size)
+		{
+			DataRow[] dataRows = {null};
+			return dataRows;
+		}
+
+		/// <summary>
+		/// Creates a new row from an existing row.
+		/// </summary>
+		
+		protected virtual DataRow NewRowFromBuilder(DataRowBuilder builder)
+		{
+			return new DataRow (builder);
+		}
+	
+
+		/// <summary>
+		/// Raises the ColumnChanged event.
+		/// </summary>
+		[MonoTODO]
+		protected virtual void OnColumnChanged(DataColumnChangeEventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Raises the ColumnChanging event.
+		/// </summary>
+		
+		[MonoTODO]
+		protected virtual void OnColumnChanging(DataColumnChangeEventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Raises the PropertyChanging event.
+		/// </summary>
+		
+		[MonoTODO]
+		protected internal virtual void OnPropertyChanging(PropertyChangedEventArgs pcevent)
+		{
+		}
+
+		/// <summary>
+		/// Notifies the DataTable that a DataColumn is being removed.
+		/// </summary>
+		
+		[MonoTODO]
+		protected internal virtual void OnRemoveColumn(DataColumn column)
+		{
+		}
+
+		/// <summary>
+		/// Raises the RowChanged event.
+		/// </summary>
+		
+		[MonoTODO]
+		protected virtual void OnRowChanged(DataRowChangeEventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Raises the RowChanging event.
+		/// </summary>
+		
+		[MonoTODO]
+		protected virtual void OnRowChanging(DataRowChangeEventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Raises the RowDeleted event.
+		/// </summary>
+		
+		[MonoTODO]
+		protected virtual void OnRowDeleted(DataRowChangeEventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Raises the RowDeleting event.
+		/// </summary>
+		
+		[MonoTODO]
+		protected virtual void OnRowDeleting(DataRowChangeEventArgs e)
+		{
+		}
+
+		/// <summary>
+		/// Rolls back all changes that have been made to the 
+		/// table since it was loaded, or the last time AcceptChanges
+		///  was called.
+		/// </summary>
+		
+		[MonoTODO]
+		public void RejectChanges()
+		{
+		}
+
+		/// <summary>
+		/// Resets the DataTable to its original state.
+		/// </summary>
+		
+		[MonoTODO]
+		public virtual void Reset()
+		{
+		}
+
+		/// <summary>
+		/// Gets an array of all DataRow objects.
+		/// </summary>
+		
+		[MonoTODO]
+		public DataRow[] Select()
+		{
+			//FIXME:
+			DataRow[] dataRows = {null};
+			return dataRows;
+		}
+
+		/// <summary>
+		/// Gets an array of all DataRow objects that match 
+		/// the filter criteria in order of primary key (or 
+		/// lacking one, order of addition.)
+		/// </summary>
+		
+		[MonoTODO]
+		public DataRow[] Select(string filterExpression)
+		{
+			DataRow[] dataRows = {null};
+			return dataRows;
+		}
+
+		/// <summary>
+		/// Gets an array of all DataRow objects that 
+		/// match the filter criteria, in the the 
+		/// specified sort order.
+		/// </summary>
+		
+		[MonoTODO]
+		public DataRow[] Select(string filterExpression, string sort)
+		{
+			DataRow[] dataRows = {null};
+			return dataRows;
+		}
+
+		/// <summary>
+		/// Gets an array of all DataRow objects that match
+		/// the filter in the order of the sort, that match 
+		/// the specified state.
+		/// </summary>
+		
+		[MonoTODO]
+		public DataRow[] Select(string filterExpression, string sort, DataViewRowState recordStates)
+		{
+			DataRow[] dataRows = {null};
+			return dataRows;
+		}
+
+		/// <summary>
+		/// Gets the TableName and DisplayExpression, if 
+		/// there is one as a concatenated string.
+		/// </summary>
+		
+		[MonoTODO]
+		public override string ToString()
+		{
+			return "";
+		}
+
+		/// <summary>
+		/// Occurs when after a value has been changed for 
+		/// the specified DataColumn in a DataRow.
+		/// </summary>
+		
+		public event DataColumnChangeEventHandler ColumnChanged;
+
+		/// <summary>
+		/// Occurs when a value is being changed for the specified 
+		/// DataColumn in a DataRow.
+		/// </summary>
+		
+		public event DataColumnChangeEventHandler ColumnChanging;
+
+		/// <summary>
+		/// Occurs after a DataRow has been changed successfully.
+		/// </summary>
+		
+		public event DataRowChangeEventHandler RowChanged;
+
+		/// <summary>
+		/// Occurs when a DataRow is changing.
+		/// </summary>
+		
+		public event DataRowChangeEventHandler RowChanging;
+
+		/// <summary>
+		/// Occurs after a row in the table has been deleted.
+		/// </summary>
+		
+		public event DataRowChangeEventHandler RowDeleted;
+
+		/// <summary>
+		/// Occurs before a row in the table is about to be deleted.
+		/// </summary>
+		
+		public event DataRowChangeEventHandler RowDeleting;
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataTableCollection.cs b/mcs/class/System.Data/System.Data/DataTableCollection.cs
new file mode 100644
index 00000000000..646f10f7d4d
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataTableCollection.cs
@@ -0,0 +1,139 @@
+//
+// System.Data.DataTableCollection.cs
+//
+// Authors:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Chris Podurgiel
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents the collection of tables for the DataSet.
+	/// </summary>
+	public class DataTableCollection : InternalDataCollectionBase
+	{
+		DataSet dataSet;
+		const string defaultTableName = "Table1";
+		Hashtable tables;
+
+		#region Constructors 
+
+		// LAMESPEC: This constructor is undocumented
+		protected internal DataTableCollection (DataSet dataSet)
+			: base ()
+		{
+			this.dataSet = dataSet;
+			this.tables = new Hashtable ();
+		}
+		
+		#endregion
+		
+		#region Properties
+
+		public override int Count {
+			get { return list.Count; }
+		}
+
+		public DataTable this[int index] {
+			get { return (DataTable)(list[index]); }
+		}
+
+		public DataTable this[string name] {
+			get { return (DataTable)(tables[name]); }
+		}
+
+		protected override ArrayList List {
+			get { return list; }
+		}
+
+		#endregion
+	
+		#region Methods	
+
+		public virtual DataTable Add () 
+		{
+			return this.Add (defaultTableName);
+		}
+
+		public virtual void Add (DataTable table) 
+		{
+			list.Add (table);
+			table.dataSet = dataSet;
+			tables[table.TableName] = table;
+		}
+
+		public virtual DataTable Add (string name) 
+		{
+			DataTable table = new DataTable (name);
+			this.Add (table);
+			return table;
+		}
+
+		public void AddRange (DataTable[] tables) 
+		{
+			foreach (DataTable table in tables)
+				this.Add (table);
+		}
+
+		[MonoTODO]
+		public bool CanRemove (DataTable table) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void Clear () 
+		{
+			list.Clear ();
+			tables.Clear ();
+		}
+
+		public bool Contains (string name) 
+		{
+			return tables.Contains (name);
+		}
+
+		public virtual int IndexOf (DataTable table) 
+		{
+			return list.IndexOf (table);
+		}
+
+		public virtual int IndexOf (string name) 
+		{
+			return list.IndexOf (tables[name]);
+		}
+
+		public void Remove (DataTable table) 
+		{
+			this.Remove (table.TableName);
+		}
+
+		public void Remove (string name) 
+		{
+			list.Remove (tables[name]);
+			tables.Remove (name);
+		}
+
+		public void RemoveAt (int index) 
+		{
+			tables.Remove (((DataTable)(list[index])).TableName);
+			list.RemoveAt (index);
+		}
+
+		#endregion
+
+		#region Events
+		
+		public event CollectionChangeEventHandler CollectionChanged;
+		public event CollectionChangeEventHandler CollectionChanging;
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataTableRelationCollection.cs b/mcs/class/System.Data/System.Data/DataTableRelationCollection.cs
new file mode 100644
index 00000000000..5f23fc1204f
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataTableRelationCollection.cs
@@ -0,0 +1,122 @@
+//
+// System.Data.DataTableRelationCollection.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Data.Common;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Summary description for DataTableRelationCollection.
+	/// </summary>
+	internal class DataTableRelationCollection : DataRelationCollection
+	{
+		/// <summary>
+		/// Initializes a new instance of the DataRelationCollection class.
+		/// </summary>
+		[MonoTODO]
+		internal DataTableRelationCollection():base()
+		{
+			// TODO: need to the constructor
+		}
+
+		/// <summary>
+		/// Gets the DataRelation object specified by name.
+		/// </summary>
+		[MonoTODO]
+		public override DataRelation this[string name]
+		{
+			get
+			{
+				foreach (DataRelation dataRelation in list)
+				{
+					if (dataRelation.RelationName == name)
+					{
+						return dataRelation;
+					}
+				}
+
+				return null;
+			}
+		}
+
+		/// <summary>
+		/// Gets the DataRelation object at the specified index.
+		/// </summary>
+		[MonoTODO]
+		public override DataRelation this[int index]
+		{
+			get
+			{
+				return (DataRelation)list[index];
+			}
+		}
+
+		/// <summary>
+		/// Copies the elements of the specified DataRelation array to the end of the collection.
+		/// </summary>
+		/// <param name="relations">The array of DataRelation objects to add to the collection.</param>
+		[MonoTODO]
+		public override void AddRange(DataRelation[] relations)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool CanRemove(DataRelation relation)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void Clear()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool Contains(string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected override DataSet GetDataSet()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public override int IndexOf(DataRelation relation)
+		{
+			return list.IndexOf(relation);
+		}
+
+		[MonoTODO]
+		public override int IndexOf(string relationName)
+		{
+			return list.IndexOf(this[relationName]);
+		}
+
+		[MonoTODO]
+		protected override void OnCollectionChanged(CollectionChangeEventArgs ccevent)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected internal override void OnCollectionChanging(CollectionChangeEventArgs ccevent)
+		{
+			throw new NotImplementedException ();
+		}
+		
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataView.cs b/mcs/class/System.Data/System.Data/DataView.cs
new file mode 100644
index 00000000000..6a0a965628e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataView.cs
@@ -0,0 +1,233 @@
+//
+// System.Data.DataView.cs
+//
+// Author:
+//    Daniel Morgan <danmorg@sc.rr.com>
+//
+// (C) Ximian, Inc 2002
+//
+
+using System.Collections;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	/// <summary>
+	/// A DataView is used in the binding of data between
+	/// a DataTable and Windows Forms or Web Forms allowing
+	/// a view of a DataTable for editing, filtering,
+	/// navigation, searching, and sorting.
+	/// </summary>
+	public class DataView : MarshalByValueComponent, //IBindingList,
+	IEnumerable, // ITypedList, IList, ICollection, 
+		ISupportInitialize {
+
+		[MonoTODO]	
+		public DataView() {
+		}
+
+		[MonoTODO]
+		public DataView(DataTable table) {
+		}
+
+		[MonoTODO]
+		public DataView(DataTable table, string RowFilter,
+			string Sort, DataViewRowState RowState) {
+		}
+
+		public bool AllowDelete {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+			}
+		}
+
+		public bool AllowEdit {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+			}
+		}
+
+		public bool AllowNew {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+			}
+		}
+
+		public bool ApplyDefaultSort {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+			}
+		}
+
+		public int Count {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public DataViewManager DataViewManager {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		// Item indexer
+		public DataRowView this[int recordIndex] {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public virtual string RowFilter {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+			}
+		}
+
+		public DataViewRowState RowStateFilter {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+			}
+		}
+
+		public string Sort {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+			}
+		}
+
+		public DataTable Table {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public virtual DataRowView AddNew() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void BeginInit() {
+		}
+
+		[MonoTODO]
+		public void CopyTo(Array array,	int index) {
+		}
+
+		[MonoTODO]
+		public void Delete(int index) {
+		}
+
+		[MonoTODO]
+		public void EndInit() {
+		}
+
+		[MonoTODO]
+		public int Find(object key) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public int Find(object[] key) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataRowView[] FindRows(object key) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public DataRowView[] FindRows(object[] key) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator() {
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public event ListChangedEventHandler ListChanged;
+
+		protected bool IsOpen {
+			[MonoTODO]
+			get {
+			throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		protected void Close() {
+		}
+
+		[MonoTODO]
+		protected virtual void ColumnCollectionChanged(
+			object sender, CollectionChangeEventArgs e) {
+		}
+
+		protected override void Dispose (bool disposing)
+		{
+		}
+
+		[MonoTODO]
+		protected virtual void IndexListChanged(object sender, ListChangedEventArgs e)
+		{
+		}
+
+		[MonoTODO]
+		protected virtual void OnListChanged(ListChangedEventArgs e)
+		{
+		}
+
+		[MonoTODO]
+		protected void Open() {
+		}
+
+	}
+
+}
diff --git a/mcs/class/System.Data/System.Data/DataViewManager.cs b/mcs/class/System.Data/System.Data/DataViewManager.cs
new file mode 100644
index 00000000000..cb4575bb128
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataViewManager.cs
@@ -0,0 +1,76 @@
+//
+// System.Data.DataViewManager
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc. 2002
+//
+
+using System.Collections;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Contains a default DataViewSettingCollection for each DataTable in a DataSet.
+	/// </summary>
+	public class DataViewManager : MarshalByValueComponent
+	// IBindingList, ICollection, IList, ITypedList, IEnumerable
+	{
+		private DataSet dataSet;
+
+		public DataViewManager () {
+			dataSet = null;
+		}
+
+		public DataViewManager (DataSet ds) {
+			dataSet = ds;
+		}
+
+		[MonoTODO]
+		public DataView CreateDataView (DataTable table) {
+			return new DataView (table);
+		}
+
+		protected virtual void OnListChanged (ListChangedEventArgs e) {
+		}
+
+		protected virtual void RelationCollectionChanged (
+			object sender,
+			CollectionChangeEventArgs e) {
+		}
+
+		protected virtual void TableCollectionChanged (object sender,
+							       CollectionChangeEventArgs e) {
+		}
+
+		public DataSet DataSet {
+			get {
+				return dataSet;
+			}
+			set {
+				dataSet = value;
+			}
+		}
+
+		[MonoTODO]
+		public string DataViewSettingCollectionString {
+			get {
+				throw new NotImplementedException ();
+			}
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public DataViewSettingCollection DataViewSettings {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public event ListChangedEventHandler ListChanged;
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataViewRowState.cs b/mcs/class/System.Data/System.Data/DataViewRowState.cs
new file mode 100644
index 00000000000..2768fbe0e0f
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataViewRowState.cs
@@ -0,0 +1,29 @@
+//
+// System.Data.DataViewRowState.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Describes the version of data in a DataRow.
+	/// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values.
+	/// </summary>
+	[Flags]
+	[Serializable]
+	public enum DataViewRowState
+	{
+		None = 0,
+		Unchanged = 2,
+		Added = 4,
+		Deleted = 8,
+		ModifiedCurrent = 16,
+		CurrentRows = 22,
+		ModifiedOriginal = 32,
+		OriginalRows = 42
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/DataViewSetting.cs b/mcs/class/System.Data/System.Data/DataViewSetting.cs
new file mode 100644
index 00000000000..4db37d934fc
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataViewSetting.cs
@@ -0,0 +1,72 @@
+//
+// System.Data.DataViewSetting
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc. 2002
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents the default settings for ApplyDefaultSort, DataViewManager, RowFilter, RowStateFilter, Sort, and Table for DataViews created from the DataViewManager.
+	/// </summary>
+	public class DataViewSetting
+	{
+		private bool defaultSort;
+		private DataViewManager viewManager;
+		private string rowFilter;
+		private DataViewRowState rowStateFilter;
+		private string sortString;
+		
+		public bool ApplyDefaultSort {
+			get {
+				return defaultSort;
+			}
+			set {
+				defaultSort = value;
+			}
+		}
+
+		public DataViewManager DataViewManager {
+			get {
+				return viewManager;
+			}
+		}
+
+		public string RowFilter {
+			get {
+				return rowFilter;
+			}
+			set {
+				rowFilter = value;
+			}
+		}
+
+		public DataViewRowState RowStateFilter {
+			get {
+				return rowStateFilter;
+			}
+			set {
+				rowStateFilter = value;
+			}
+		}
+
+		public string Sort {
+			get {
+				return sortString;
+			}
+			set {
+				sortString = value;
+			}
+		}
+
+		[MonoTODO]
+		public DataTable Table {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DataViewSettingCollection.cs b/mcs/class/System.Data/System.Data/DataViewSettingCollection.cs
new file mode 100755
index 00000000000..c2528878a39
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DataViewSettingCollection.cs
@@ -0,0 +1,87 @@
+//
+// System.Data.DataViewSettingCollection.cs
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Miguel de Icaza (miguel@gnome.org)
+//
+
+using System;
+using System.Collections;
+
+namespace System.Data {
+	/// <summary>
+	/// Contains a read-only collection of DataViewSetting objects for each DataTable in a DataSet.
+	/// </summary>
+	public class DataViewSettingCollection : ICollection, IEnumerable {
+		private ArrayList settingList;
+
+		public void CopyTo (Array ar, int index) {
+			settingList.CopyTo (ar, index);
+		}
+
+		public IEnumerator GetEnumerator () {
+			return settingList.GetEnumerator ();
+		}
+		
+		public virtual int Count {
+			get {
+				return settingList.Count;
+			}
+		}
+
+		public bool IsReadOnly {
+			get {
+				return settingList.IsReadOnly;
+			}
+		}
+
+		public bool IsSynchronized {
+			get {
+				return settingList.IsSynchronized;
+			}
+		}
+
+		public virtual DataViewSetting this [DataTable dt] {
+			get {
+				for (int i = 0; i < settingList.Count; i++) {
+					DataViewSetting dvs = (DataViewSetting) settingList[i];
+					if (dvs.Table == dt)
+						return dvs;
+				}
+				return null;
+			}
+			set {
+				this[dt] = value;
+			}
+		}
+
+		public virtual DataViewSetting this[string name] {
+			get {
+				for (int i = 0; i < settingList.Count; i++) {
+					DataViewSetting dvs = (DataViewSetting) settingList[i];
+					if (dvs.Table.TableName == name)
+						return dvs;
+				}
+				return null;
+			}
+		}
+
+		public virtual DataViewSetting this[int index] {
+			get {
+				return (DataViewSetting) settingList[index];
+			}
+			set {
+				settingList[index] = value;
+			}
+		}
+
+		public object SyncRoot {
+			get {
+				return settingList.SyncRoot;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DbType.cs b/mcs/class/System.Data/System.Data/DbType.cs
new file mode 100644
index 00000000000..9a0cad9a631
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DbType.cs
@@ -0,0 +1,44 @@
+//
+// System.Data.DbType.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Gets the data type of a field, a property, or a Parameter object of a .NET data provider.
+	/// </summary>
+	[Serializable]
+	public enum DbType
+	{
+		AnsiString = 0,
+		Binary = 1,
+		Byte = 2,
+		Boolean = 3,
+		Currency = 4,
+		Date = 5,
+		DateTime = 6,
+		Decimal = 7,
+		Double = 8,
+		Guid = 9,
+		Int16 = 10,
+		Int32 = 11,
+		Int64 = 12,
+		Object = 13,
+		SByte = 14,
+		Single = 15,
+		String = 16,
+		Time = 17,
+		UInt16 = 18,
+		UInt32 = 19,
+		UInt64 = 20,
+		VarNumeric = 21,
+		AnsiStringFixedLength = 22,
+		StringFixedLength = 23
+
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/DeletedRowInaccessibleException.cs b/mcs/class/System.Data/System.Data/DeletedRowInaccessibleException.cs
new file mode 100644
index 00000000000..4088cc700b0
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DeletedRowInaccessibleException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.DeletedRowInaccessibleException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class DeletedRowInaccessibleException : DataException
+	{
+		public DeletedRowInaccessibleException ()
+			: base (Locale.GetText ("This DataRow has been deleted"))
+		{
+		}
+
+		public DeletedRowInaccessibleException (string message)
+			: base (message)
+		{
+		}
+
+		protected DeletedRowInaccessibleException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/DuplicateNameException.cs b/mcs/class/System.Data/System.Data/DuplicateNameException.cs
new file mode 100644
index 00000000000..660840716e3
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/DuplicateNameException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.DuplicateNameException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class DuplicateNameException : DataException
+	{
+		public DuplicateNameException ()
+			: base (Locale.GetText ("There is a database object with the same name"))
+		{
+		}
+
+		public DuplicateNameException (string message)
+			: base (message)
+		{
+		}
+
+		protected DuplicateNameException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/EvaluateException.cs b/mcs/class/System.Data/System.Data/EvaluateException.cs
new file mode 100644
index 00000000000..426742eb90a
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/EvaluateException.cs
@@ -0,0 +1,31 @@
+//
+// System.Data.EvaluateException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+	[Serializable]
+	public class EvaluateException : InvalidExpressionException
+	{
+		public EvaluateException ()
+			: base (Locale.GetText ("This expression cannot be evaluated"))
+		{
+		}
+
+		public EvaluateException (string message)
+			: base (message)
+		{
+		}
+
+		protected EvaluateException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/FillErrorEventArgs.cs b/mcs/class/System.Data/System.Data/FillErrorEventArgs.cs
new file mode 100755
index 00000000000..4950d833916
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/FillErrorEventArgs.cs
@@ -0,0 +1,58 @@
+//
+// System.Data.FillErrorEventArgs.cs
+//
+// Author:
+//   Miguel de Icaza <miguel@ximian.com>
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+
+namespace System.Data
+{
+	public class FillErrorEventArgs : EventArgs {
+		DataTable data_table;
+		object [] values;
+		Exception errors;
+		bool f_continue;
+
+		public FillErrorEventArgs (DataTable dataTable, object [] values)
+		{
+			this.data_table = dataTable;
+			this.values = values;
+		}
+
+		public bool Continue {
+			get {
+				return f_continue;
+			}
+
+			set {
+				f_continue = value;
+			}
+		}
+
+		public DataTable DataTable {
+			get {
+				return data_table;
+			}
+		}
+
+		public Exception Errors {
+			get {
+				return errors;
+			}
+
+			set {
+				errors = value;
+			}
+		}
+
+		public object [] Values {
+			get {
+				return values;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/FillErrorEventHandler.cs b/mcs/class/System.Data/System.Data/FillErrorEventHandler.cs
new file mode 100644
index 00000000000..8f63a935cdb
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/FillErrorEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.FillErrorEventHandler.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents the method that will handle the FillError event.
+	/// </summary>
+	[Serializable]
+	public delegate void FillErrorEventHandler(object sender, FillErrorEventArgs e);
+
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs b/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs
new file mode 100644
index 00000000000..075b1218c30
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/ForeignKeyConstraint.cs
@@ -0,0 +1,347 @@
+//
+// System.Data.ForeignKeyConstraint.cs
+//
+// Author:
+//   Franklin Wise <gracenote@earthlink.net>
+//   Daniel Morgan <danmorg@sc.rr.com>
+//
+// (C) 2002 Franklin Wise
+// (C) 2002 Daniel Morgan
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+
+namespace System.Data
+{
+
+	[Serializable]
+	public class ForeignKeyConstraint : Constraint {
+
+		private UniqueConstraint _parentUniqueConstraint;
+		private DataColumn [] _parentColumns;
+		private DataColumn [] _childColumns;
+		private Rule _deleteRule;
+		private Rule _updateRule;
+		private AcceptRejectRule _acceptRejectRule;
+		
+		#region Constructors
+
+		public ForeignKeyConstraint(DataColumn parentColumn, DataColumn childColumn) 
+		{
+			if (null == parentColumn || null == childColumn) {
+				throw new ArgumentNullException("Neither parentColumn or" +
+					" childColumn can be null.");
+			}
+
+			_foreignKeyConstraint(null, new DataColumn[] {parentColumn},
+					new DataColumn[] {childColumn});
+		}
+
+		public ForeignKeyConstraint(DataColumn[] parentColumns, DataColumn[] childColumns) 
+		{
+			_foreignKeyConstraint(null, parentColumns, childColumns);
+		}
+
+		public ForeignKeyConstraint(string constraintName,
+			DataColumn parentColumn, DataColumn childColumn) 
+		{
+			if (null == parentColumn || null == childColumn) {
+				throw new ArgumentNullException("Neither parentColumn or" +
+					" childColumn can be null.");
+			}
+
+			_foreignKeyConstraint(constraintName, new DataColumn[] {parentColumn},
+					new DataColumn[] {childColumn});
+		}
+
+		public ForeignKeyConstraint(string constraintName,
+			DataColumn[] parentColumns, DataColumn[] childColumns) 
+		{
+			_foreignKeyConstraint(constraintName, parentColumns, childColumns);
+		}
+		
+		//special case
+		[MonoTODO]
+		public ForeignKeyConstraint(string constraintName,
+			string parentTableName,	string[] parentColumnNames,
+			string[] childColumnNames, 
+			AcceptRejectRule acceptRejectRule, Rule deleteRule,
+			Rule updateRule) {
+		}
+
+
+		private void _foreignKeyConstraint(string constraintName, DataColumn[] parentColumns,
+				DataColumn[] childColumns)
+		{
+
+			//Validate 
+			_validateColumns(parentColumns, childColumns);
+
+			//Set Constraint Name
+			base.ConstraintName = constraintName;	
+
+			//Keep reference to columns
+			_parentColumns = parentColumns;
+			_childColumns = childColumns;
+		}
+
+		#endregion // Constructors
+
+		#region Helpers
+
+		private void _validateColumns(DataColumn[] parentColumns, DataColumn[] childColumns)
+		{
+			//not null
+			if (null == parentColumns || null == childColumns) 
+				throw new ArgumentNullException();
+			
+			//at least one element in each array
+			if (parentColumns.Length < 1 || childColumns.Length < 1)
+				throw new ArgumentException("Neither ParentColumns or ChildColumns can't be" +
+						" zero length.");
+				
+			//same size arrays
+			if (parentColumns.Length != childColumns.Length)
+				throw new ArgumentException("Parent columns and child columns must be the same length.");
+			
+
+			DataTable ptable = parentColumns[0].Table;
+			DataTable ctable = childColumns[0].Table;
+	
+			
+			foreach (DataColumn pc in parentColumns)
+			{
+				//not null check
+				if (null == pc.Table) 
+				{
+					throw new ArgumentException("All columns must belong to a table." + 
+							" ColumnName: " + pc.ColumnName + " does not belong to a table.");
+				}
+				
+				//All columns must belong to the same table
+				if (ptable != pc.Table)
+					throw new InvalidConstraintException("Parent columns must all belong to the same table.");
+				
+				foreach (DataColumn cc in childColumns)
+				{
+					//not null
+					if (null == pc.Table) 
+					{
+						throw new ArgumentException("All columns must belong to a table." + 
+							" ColumnName: " + pc.ColumnName + " does not belong to a table.");
+					}
+			
+					//All columns must belong to the same table.
+					if (ctable != cc.Table)
+						throw new InvalidConstraintException("Child columns must all belong to the same table.");
+						
+						
+					//Can't be the same column
+					if (pc == cc)
+						throw new InvalidOperationException("Parent and child columns can't be the same column.");
+
+					if (! pc.DataType.Equals(cc.DataType))
+					{
+						//LAMESPEC: spec says throw InvalidConstraintException
+						//		implementation throws InvalidOperationException
+						throw new InvalidOperationException("Parent column is not type compatible with it's child"
+								+ " column.");
+					}
+				}	
+			}
+			
+			
+			//Same dataset.  If both are null it's ok
+			if (ptable.DataSet != ctable.DataSet)
+			{
+				//LAMESPEC: spec says InvalidConstraintExceptoin
+				//	impl does InvalidOperationException
+				throw new InvalidOperationException("Parent column and child column must belong to" + 
+						" tables that belong to the same DataSet.");
+						
+			}
+
+			
+		}
+		
+
+
+		private void _validateRemoveParentConstraint(ConstraintCollection sender, 
+				Constraint constraint, ref bool cancel, ref string failReason)
+		{
+			//if we hold a reference to the parent then cancel it
+			if (constraint == _parentUniqueConstraint) 
+			{
+				cancel = true;
+				failReason = "Cannot remove UniqueConstraint because the"
+					+ " ForeignKeyConstraint " + this.ConstraintName + " exists.";
+			}
+		}
+		
+		//Checks to see if a related unique constraint exists
+		//if it doesn't then a unique constraint is created.
+		//if a unique constraint can't be created an exception will be thrown
+		private void _ensureUniqueConstraintExists(ConstraintCollection collection,
+				DataColumn [] parentColumns)
+		{
+			//not null
+			if (null == parentColumns) throw new ArgumentNullException(
+					"ParentColumns can't be null");
+
+			UniqueConstraint uc = null;
+
+			//see if unique constraint already exists
+			//if not create unique constraint
+			uc = UniqueConstraint.GetUniqueConstraintForColumnSet(collection, parentColumns);
+
+			if (null == uc)	uc = new UniqueConstraint(parentColumns, false); //could throw
+			
+			//keep reference
+			_parentUniqueConstraint = uc;
+
+			//if this unique constraint is attempted to be removed before us
+			//we can fail the validation
+			collection.ValidateRemoveConstraint += new DelegateValidateRemoveConstraint(
+					_validateRemoveParentConstraint);
+		}
+		
+		
+		#endregion //Helpers
+		
+
+		#region Properites
+
+		public virtual AcceptRejectRule AcceptRejectRule {
+			get {
+				return _acceptRejectRule;
+			}
+			
+			set {
+				_acceptRejectRule = value;
+			}
+		}
+
+		public virtual Rule DeleteRule {
+			get {
+				return _deleteRule;
+			}
+			
+			set {
+				_deleteRule = value;
+			}
+		}
+
+		public virtual Rule UpdateRule {
+			get {
+				return _updateRule;
+			}
+			
+			set {
+				_updateRule = value;
+			}
+		}
+		
+		public virtual DataColumn[] Columns {
+			get {
+				return _childColumns;
+			}
+		}
+
+		public virtual DataColumn[] RelatedColumns {
+			get {	
+				return _parentColumns;
+			}
+		}
+
+		public virtual DataTable RelatedTable {
+			get {
+				if (_parentColumns != null)
+					if (_parentColumns.Length > 0)
+						return _parentColumns[0].Table;
+
+				return null;
+			}
+		}
+
+		public override DataTable Table {
+			get {
+				if (_childColumns != null)
+					if (_childColumns.Length > 0)
+						return _childColumns[0].Table;
+
+				return null;
+			}
+		}
+
+	
+
+		#endregion // Properties
+
+		#region Methods
+
+		public override bool Equals(object key) 
+		{
+			ForeignKeyConstraint fkc = key as ForeignKeyConstraint;
+			if (null == fkc) return false;
+
+			//if the fk constrains the same columns then they are equal
+			if (! DataColumn.AreColumnSetsTheSame( this.RelatedColumns, fkc.RelatedColumns))
+				return false;
+			if (! DataColumn.AreColumnSetsTheSame( this.Columns, fkc.Columns) )
+				return false;
+
+			return true;
+		}
+
+		[MonoTODO]
+		public override int GetHashCode() {
+			throw new NotImplementedException ();
+		}
+
+		internal override void AddToConstraintCollectionSetup(
+				ConstraintCollection collection)
+		{
+
+			//run Ctor rules again
+			_validateColumns(_parentColumns, _childColumns);
+			
+			//we must have a unique constraint on the parent
+			_ensureUniqueConstraintExists(collection, _parentColumns);
+			
+			//Make sure we can create this thing
+			AssertConstraint(); //TODO:if this fails and we created a unique constraint
+						//we should probably roll it back
+			
+		}
+					
+	
+		[MonoTODO]
+		internal override void RemoveFromConstraintCollectionCleanup( 
+				ConstraintCollection collection)
+		{
+			return; //no rules yet		
+		}
+		
+		[MonoTODO]
+		internal override void AssertConstraint()
+		{
+			//Constraint only works if both tables are part of the same dataset
+			
+			//if DataSet ...
+			if (Table == null || RelatedTable == null) return; //TODO: Do we want this
+
+			if (Table.DataSet == null || RelatedTable.DataSet == null) return; //	
+				
+			//TODO:
+			//check for orphaned children
+			//check for...
+			
+		}
+		
+		#endregion // Methods
+	}
+
+}
diff --git a/mcs/class/System.Data/System.Data/IColumnMapping.cs b/mcs/class/System.Data/System.Data/IColumnMapping.cs
new file mode 100644
index 00000000000..2e307763533
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IColumnMapping.cs
@@ -0,0 +1,35 @@
+//
+// System.Data.IColumnMapping.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Associates a data source column with a DataSet column, and is implemented by the DataColumnMapping class, which is used in common by .NET data providers.
+	/// </summary>
+	public interface IColumnMapping
+	{
+		/// <summary>
+		/// Gets or sets the name of the column within the DataSet to map to.
+		/// </summary>
+		string DataSetColumn
+		{
+			get;
+			set;
+		}
+
+		/// <summary>
+		/// Gets or sets the name of the column within the data source to map from. The name is case-sensitive.
+		/// </summary>
+		string SourceColumn
+		{
+			get;
+			set;
+		}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/IColumnMappingCollection.cs b/mcs/class/System.Data/System.Data/IColumnMappingCollection.cs
new file mode 100644
index 00000000000..a23a2ae6056
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IColumnMappingCollection.cs
@@ -0,0 +1,35 @@
+//
+// System.Data.IColumnMappingCollection.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System.Collections;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Contains a collection of ColumnMapping objects, and is implemented by the DataColumnMappingCollection, which is used in common by .NET data providers.
+	/// </summary>
+	public interface IColumnMappingCollection : IList, ICollection, IEnumerable
+	{
+		IColumnMapping Add(string sourceColumnName, string dataSetColumnName);
+
+		bool Contains(string sourceColumnName);
+
+		IColumnMapping GetByDataSetColumn(string dataSetColumnName);
+
+		int IndexOf(string sourceColumnName);
+
+		void RemoveAt(string sourceColumnName);
+		
+		object this[string index]
+		{
+			get;
+			set;
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/IDataAdapter.cs b/mcs/class/System.Data/System.Data/IDataAdapter.cs
new file mode 100644
index 00000000000..be6f09036b0
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDataAdapter.cs
@@ -0,0 +1,33 @@
+//
+// System.Data.IDataAdapter.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Allows an object to implement a DataAdapter, and represents a set of methods and mapping action-related properties used to fill and refresh a DataSet and update a data source.
+	/// </summary>
+	public interface IDataAdapter
+	{
+		int Fill(DataSet dataSet);
+
+		DataTable[] FillSchema(DataSet dataSet, SchemaType schemaType);
+
+		IDataParameter[] GetFillParameters();
+
+		int Update(DataSet dataSet);
+		
+		MissingMappingAction MissingMappingAction{get;set;}
+
+		MissingSchemaAction MissingSchemaAction{get;set;}
+
+		ITableMappingCollection TableMappings{get;}
+
+
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/IDataParameter.cs b/mcs/class/System.Data/System.Data/IDataParameter.cs
new file mode 100644
index 00000000000..3528cb2f246
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDataParameter.cs
@@ -0,0 +1,36 @@
+//
+// System.Data.IDataParameter.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents a parameter to a Command object, and optionally, its mapping to DataSet columns; and is implemented by .NET data providers that access data sources.
+	/// </summary>
+	public interface IDataParameter
+	{
+		
+		DbType DbType{get;set;}
+
+		ParameterDirection Direction{get;set;}
+
+		bool IsNullable{get;}
+
+		string ParameterName{get;set;}
+
+		string SourceColumn{get;set;}
+
+		DataRowVersion SourceVersion {get;set;}
+
+		object Value {get;set;}
+
+
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/IDataParameterCollection.cs b/mcs/class/System.Data/System.Data/IDataParameterCollection.cs
new file mode 100644
index 00000000000..41da8ab9d77
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDataParameterCollection.cs
@@ -0,0 +1,28 @@
+//
+// System.Data.IDataParameterCollection.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+using System.Collections;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Collects all parameters relevant to a Command object and their mappings to DataSet columns, and is implemented by .NET data providers that access data sources.
+	/// </summary>
+	public interface IDataParameterCollection : IList, ICollection, IEnumerable
+	{
+		void RemoveAt(string parameterName);
+		
+		int IndexOf(string parameterName);
+		
+		bool Contains(string parameterName);
+
+		object this[string parameterName]{get; set;}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/IDataReader.cs b/mcs/class/System.Data/System.Data/IDataReader.cs
new file mode 100644
index 00000000000..746d0d72ed6
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDataReader.cs
@@ -0,0 +1,33 @@
+//
+// System.Data.IDataReader.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Provides a means of reading one or more forward-only streams of result sets obtained by executing a command at a data source, and is implemented by .NET data providers that access relational databases.
+	/// </summary>
+	public interface IDataReader  : IDisposable, IDataRecord
+	{
+		void Close();
+		
+		DataTable GetSchemaTable();
+		
+		bool NextResult();
+
+		bool Read();
+
+		int Depth{get;}
+
+		bool IsClosed{get;}
+
+		int RecordsAffected{get;}
+
+
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/IDataRecord.cs b/mcs/class/System.Data/System.Data/IDataRecord.cs
new file mode 100644
index 00000000000..0bb6376da12
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDataRecord.cs
@@ -0,0 +1,71 @@
+//
+// System.Data.IDataRecord.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Provides access to the column values within 
+	/// each row for a DataReader, and is implemented by .NET data 
+	/// providers that access relational databases.
+	/// </summary>
+	public interface IDataRecord
+	{
+		bool GetBoolean(int i);
+
+		byte GetByte(int i);
+
+		long GetBytes(int i, long fieldOffset, byte[] buffer, 
+			int bufferOffset, int length);
+
+		char GetChar(int i);
+
+		long GetChars(int i, long fieldOffset, char[] buffer, 
+			int bufferOffset, int length);
+
+		IDataReader GetData(int i);
+
+		string GetDataTypeName(int i);
+
+		DateTime GetDateTime(int i);
+
+		decimal GetDecimal(int i);
+
+		double GetDouble(int i);
+
+		Type GetFieldType(int i);
+
+		float GetFloat(int i);
+
+		Guid GetGuid(int i);
+
+		short GetInt16(int i);
+
+		int GetInt32(int i);
+
+		long GetInt64(int i);
+
+		string GetName(int i);
+
+		int GetOrdinal(string name);
+
+		string GetString(int i);
+
+		object GetValue(int i);
+
+		int GetValues(object[] values);
+
+		bool IsDBNull(int i);
+
+		int FieldCount{get;}
+
+		object this[string name]{get;}
+		
+		object this[int i]{get;}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/IDbCommand.cs b/mcs/class/System.Data/System.Data/IDbCommand.cs
new file mode 100644
index 00000000000..6242c3fdb6b
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDbCommand.cs
@@ -0,0 +1,47 @@
+//
+// System.Data.IDBCommand.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents a SQL statement that is executed while connected to a data source, and is implemented by .NET data providers that access relational databases.
+	/// </summary>
+	public interface IDbCommand : IDisposable
+	{
+		void Cancel();
+		
+		IDbDataParameter CreateParameter();
+		
+		int ExecuteNonQuery();
+
+		IDataReader ExecuteReader();
+
+		IDataReader ExecuteReader(CommandBehavior behavior);
+
+		object ExecuteScalar();
+
+		void Prepare();
+
+		string CommandText{get; set;}
+
+		int CommandTimeout{get; set;}
+
+		CommandType CommandType{get; set;}
+
+		IDbConnection Connection{get; set;}
+
+		IDataParameterCollection Parameters{get;}
+
+		IDbTransaction Transaction{get; set;}
+
+		UpdateRowSource UpdatedRowSource{get; set;}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/IDbConnection.cs b/mcs/class/System.Data/System.Data/IDbConnection.cs
new file mode 100644
index 00000000000..17f44da8da5
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDbConnection.cs
@@ -0,0 +1,41 @@
+//
+// System.Data.IDBConnection.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents an open connection to a data source, and is implemented by .NET data providers that access relational databases.
+	/// </summary>
+	public interface IDbConnection : IDisposable
+	{
+		IDbTransaction BeginTransaction();
+
+		IDbTransaction BeginTransaction(IsolationLevel il);
+
+		void ChangeDatabase(string databaseName);
+
+		void Close();
+
+		IDbCommand CreateCommand();
+
+		void Open();
+
+
+		string ConnectionString{get; set;}
+
+		int ConnectionTimeout{get;}
+
+		string Database{get;}
+
+		ConnectionState State{get;}
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/IDbDataAdapter.cs b/mcs/class/System.Data/System.Data/IDbDataAdapter.cs
new file mode 100644
index 00000000000..78c1173da09
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDbDataAdapter.cs
@@ -0,0 +1,25 @@
+//
+// System.Data.IDbDataAdapter.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents a set of command-related properties that are used to fill the DataSet and update a data source, and is implemented by .NET data providers that access relational databases.
+	/// </summary>
+	public interface IDbDataAdapter : IDataAdapter
+	{
+		IDbCommand DeleteCommand{get; set;}
+
+		IDbCommand InsertCommand{get; set;}
+
+		IDbCommand SelectCommand{get; set;}
+
+		IDbCommand UpdateCommand{get; set;}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/IDbDataParameter.cs b/mcs/class/System.Data/System.Data/IDbDataParameter.cs
new file mode 100644
index 00000000000..5eeba691179
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDbDataParameter.cs
@@ -0,0 +1,25 @@
+//
+// System.Data.IDbDataParameter.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Used by the Visual Basic .NET Data Designers to represent a parameter to a Command object, and optionally, its mapping to DataSet columns.
+	/// </summary>
+	public interface IDbDataParameter : IDataParameter
+	{
+		byte Precision{get; set;}
+
+		byte Scale{get; set;}
+
+		int Size{get; set;}
+	}	
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/IDbTransaction.cs b/mcs/class/System.Data/System.Data/IDbTransaction.cs
new file mode 100644
index 00000000000..792a78052b0
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IDbTransaction.cs
@@ -0,0 +1,27 @@
+//
+// System.Data.IDbTransaction.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents a transaction to be performed at a data source, and is implemented by .NET data providers that access relational databases.
+	/// </summary>
+	public interface IDbTransaction : IDisposable
+	{
+		void Commit();
+
+		void Rollback();
+		
+		IDbConnection Connection{get;}
+
+		IsolationLevel IsolationLevel{get;}
+	}	
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/ITableMapping.cs b/mcs/class/System.Data/System.Data/ITableMapping.cs
new file mode 100644
index 00000000000..82f5329b083
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/ITableMapping.cs
@@ -0,0 +1,23 @@
+//
+// System.Data.ITableMapping.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Associates a source table with a table in a DataSet, and is implemented by the DataTableMapping class, which is used in common by .NET data providers.
+	/// </summary>
+	public interface ITableMapping
+	{
+		IColumnMappingCollection ColumnMappings{get;}
+
+		string DataSetTable{get; set;}
+
+		string SourceTable{get; set;}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/ITableMappingCollection.cs b/mcs/class/System.Data/System.Data/ITableMappingCollection.cs
new file mode 100644
index 00000000000..5ca052f94ab
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/ITableMappingCollection.cs
@@ -0,0 +1,31 @@
+//
+// System.Data.ITableMappingCollection.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System.Collections;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Contains a collection of TableMapping objects, and is implemented by the DataTableMappingCollection, which is used in common by .NET data providers.
+	/// </summary>
+	public interface ITableMappingCollection : IList, ICollection, IEnumerable
+	{
+		ITableMapping Add(string sourceTableName, string dataSetTableName);
+		
+		bool Contains(string sourceTableName);
+		
+		ITableMapping GetByDataSetTable(string dataSetTableName);
+		
+		int IndexOf(string sourceTableName);
+		
+		void RemoveAt(string sourceTableName);
+		
+		object this[string index]{get; set;}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/InRowChangingEventException.cs b/mcs/class/System.Data/System.Data/InRowChangingEventException.cs
new file mode 100644
index 00000000000..8c7be400702
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/InRowChangingEventException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.InRowChangingEventException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class InRowChangingEventException : DataException
+	{
+		public InRowChangingEventException ()
+			: base (Locale.GetText ("Cannot EndEdit within a RowChanging event"))
+		{
+		}
+
+		public InRowChangingEventException (string message)
+			: base (message)
+		{
+		}
+
+		protected InRowChangingEventException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/InternalDataCollectionBase.cs b/mcs/class/System.Data/System.Data/InternalDataCollectionBase.cs
new file mode 100644
index 00000000000..9434f671759
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/InternalDataCollectionBase.cs
@@ -0,0 +1,118 @@
+//
+// System.Data.InternalDataCollectionBase.cs
+//
+// Base class for:
+//     DataRowCollection
+//     DataColumnCollection
+//     DataTableCollection
+//     DataRelationCollection
+//     DataConstraintCollection
+//
+// Author:
+//   Daniel Morgan <danmorg@sc.rr.com>
+//   Tim Coleman <tim@timcoleman.com>
+//
+// (C) Copyright 2002 Daniel Morgan
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Base class for System.Data collection classes 
+	/// that are used within a DataTable object
+	/// to represent a collection of 
+	/// relations, tables, rows, columns, and constraints
+	/// </summary>
+
+	public class InternalDataCollectionBase : ICollection, IEnumerable 
+	{
+		#region Fields
+
+		protected ArrayList list = null;
+		protected bool readOnly = false;
+		protected bool synchronized = false; 
+
+		#endregion
+
+		#region Constructors
+
+		[MonoTODO]
+		public InternalDataCollectionBase() 
+		{
+			list = new ArrayList();
+		}
+
+		#endregion
+
+		#region Properties
+	
+		/// <summary>
+		/// Gets the total number of elements in a collection.
+		/// </summary>
+		public virtual int Count {
+			get { return list.Count; }
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the InternalDataCollectionBase is read-only.
+		/// </summary>
+		public bool IsReadOnly {
+			get { return readOnly; }
+		}
+
+		/// <summary>
+		/// Gets a value indicating whether the InternalDataCollectionBase is synchronized.
+		/// </summary>
+		public bool IsSynchronized {
+			get { return synchronized; }
+		}
+
+		/// <summary>
+		/// Gets the items of the collection as a list.
+		/// </summary>
+		protected virtual ArrayList List {
+			get { return list; }
+		}
+
+		/// <summary>
+		/// Gets an object that can be used to synchronize the collection.
+		/// </summary>
+		public object SyncRoot {
+			[MonoTODO]
+			get {
+				// FIXME: how do we sync?	
+				throw new NotImplementedException ();
+			}
+		}
+
+
+		#endregion
+
+		#region Methods
+
+		/// <summary>
+		/// Copies all the elements in the current InternalDataCollectionBase to a one-
+		/// dimensional Array, starting at the specified InternalDataCollectionBase index.
+		/// </summary>
+		public void CopyTo(Array ar, int index) 
+		{
+			list.CopyTo (ar, index);
+
+		}
+
+		/// <summary>
+		/// Gets an IEnumerator for the collection.
+		/// </summary>
+		public IEnumerator GetEnumerator() 
+		{
+			return list.GetEnumerator ();
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/InvalidConstraintException.cs b/mcs/class/System.Data/System.Data/InvalidConstraintException.cs
new file mode 100644
index 00000000000..2327b7d2a9e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/InvalidConstraintException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.InvalidConstraintException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]			
+	public class InvalidConstraintException : DataException
+	{
+		public InvalidConstraintException ()
+			: base (Locale.GetText ("Cannot access or create this relation"))
+		{
+		}
+
+		public InvalidConstraintException (string message)
+			: base (message)
+		{
+		}
+
+		protected InvalidConstraintException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/InvalidExpressionException.cs b/mcs/class/System.Data/System.Data/InvalidExpressionException.cs
new file mode 100644
index 00000000000..ac383cba5fe
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/InvalidExpressionException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.InvalidExpressionException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class InvalidExpressionException : DataException
+	{
+		public InvalidExpressionException ()
+			: base (Locale.GetText ("This Expression is invalid"))
+		{
+		}
+
+		public InvalidExpressionException (string message)
+			: base (message)
+		{
+		}
+
+		protected InvalidExpressionException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/IsolationLevel.cs b/mcs/class/System.Data/System.Data/IsolationLevel.cs
new file mode 100644
index 00000000000..3a25ef9cc0e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/IsolationLevel.cs
@@ -0,0 +1,27 @@
+//
+// System.Data.IsolationLevel.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies the transaction locking behavior for the connection.
+	/// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values.
+	/// </summary>
+	[Flags]
+	[Serializable]
+	public enum IsolationLevel
+	{
+		Unspecified = -1,
+		Chaos = 16,
+		ReadUncommitted = 256,
+		ReadCommitted = 4096,
+		RepeatableRead = 65536,
+		Serializable = 1048576
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/Locale.cs b/mcs/class/System.Data/System.Data/Locale.cs
new file mode 100755
index 00000000000..539184dbde4
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/Locale.cs
@@ -0,0 +1,22 @@
+//
+// System.Globalization.Locale.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+
+namespace System.Globalization {
+
+	internal class Locale {
+
+		/// <summary>
+		///   Returns the translated message for the current locale
+		/// </summary>
+		public static string GetText (string msg)
+		{
+			return msg;
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/MappingType.cs b/mcs/class/System.Data/System.Data/MappingType.cs
new file mode 100644
index 00000000000..dbdeb9fc23e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/MappingType.cs
@@ -0,0 +1,26 @@
+//
+// System.Data.MappingType.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies how a DataColumn is mapped.
+	/// </summary>
+	[Serializable]
+	public enum MappingType
+	{
+		Element = 1,
+		Attribute = 2,
+		SimpleContent = 3,
+		Hidden = 4
+		
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/MergeFailedEventArgs.cs b/mcs/class/System.Data/System.Data/MergeFailedEventArgs.cs
new file mode 100644
index 00000000000..9e58aa76928
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/MergeFailedEventArgs.cs
@@ -0,0 +1,38 @@
+//
+// System.Data.MergeFailedEventArgs.cs
+//
+// Author:
+//   Miguel de Icaza <miguel@ximian.com>
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+
+namespace System.Data
+{
+	public class MergeFailedEventArgs : EventArgs {
+		DataTable data_table;
+		string conflict;
+		Exception errors;
+		bool f_continue;
+
+		public MergeFailedEventArgs (DataTable dataTable, string conflict)
+		{
+			this.data_table = dataTable;
+			this.conflict = conflict;
+		}
+
+		public DataTable DataTable {
+			get {
+				return data_table;
+			}
+		}
+
+		public string Conflict {
+			get {
+				return conflict;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/MergeFailedEventHandler.cs b/mcs/class/System.Data/System.Data/MergeFailedEventHandler.cs
new file mode 100644
index 00000000000..3ec7962496a
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/MergeFailedEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.MergeFailedEventHandler.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents the method that will handle the MergeFailed event.
+	/// </summary>
+	[Serializable]
+	public delegate void MergeFailedEventHandler(object sender, MergeFailedEventArgs e);
+
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/MissingMappingAction.cs b/mcs/class/System.Data/System.Data/MissingMappingAction.cs
new file mode 100644
index 00000000000..74ce838d9c9
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/MissingMappingAction.cs
@@ -0,0 +1,24 @@
+//
+// System.Data.MissingMappingAction.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Determines the action that occurs when a mapping is missing from a source table or a source column.
+	/// </summary>
+	[Serializable]
+	public enum MissingMappingAction
+	{
+		Passthrough = 1,
+		Ignore = 2,
+		Error = 3
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/MissingPrimaryKeyException.cs b/mcs/class/System.Data/System.Data/MissingPrimaryKeyException.cs
new file mode 100644
index 00000000000..dcb0b3aca59
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/MissingPrimaryKeyException.cs
@@ -0,0 +1,33 @@
+//
+// System.Data.MissingPrimaryKeyException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+
+	[Serializable]
+	public class MissingPrimaryKeyException : DataException
+	{
+		public MissingPrimaryKeyException ()
+			: base (Locale.GetText ("This table has no primary key"))
+		{
+		}
+
+		public MissingPrimaryKeyException (string message)
+			: base (message)
+		{
+		}
+
+		protected MissingPrimaryKeyException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/MissingSchemaAction.cs b/mcs/class/System.Data/System.Data/MissingSchemaAction.cs
new file mode 100644
index 00000000000..52051457961
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/MissingSchemaAction.cs
@@ -0,0 +1,25 @@
+//
+// System.Data.MissingSchemaAction.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies the action to take when adding data to the DataSet and the required DataTable or DataColumn is missing.
+	/// </summary>
+	[Serializable]
+	public enum MissingSchemaAction
+	{
+		Add = 1,
+		Ignore = 2,
+		Error = 3,
+		AddWithKey = 4
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/NoNullAllowedException.cs b/mcs/class/System.Data/System.Data/NoNullAllowedException.cs
new file mode 100644
index 00000000000..3a5593285d3
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/NoNullAllowedException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.NoNullAllowedException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class NoNullAllowedException : DataException
+	{
+		public NoNullAllowedException ()
+			: base (Locale.GetText ("Cannot insert a NULL value"))
+		{
+		}
+
+		public NoNullAllowedException (string message)
+			: base (message)
+		{
+		}
+
+		protected NoNullAllowedException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/ParameterDirection.cs b/mcs/class/System.Data/System.Data/ParameterDirection.cs
new file mode 100644
index 00000000000..7de26dfc868
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/ParameterDirection.cs
@@ -0,0 +1,25 @@
+//
+// System.Data.ParameterDirection.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies the type of a parameter within a query relative to the DataSet.
+	/// </summary>
+	[Serializable]
+	public enum ParameterDirection
+	{
+		Input = 1,
+		Output = 2,
+		InputOutput = 3,
+		ReturnValue = 6
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/PropertyAttributes.cs b/mcs/class/System.Data/System.Data/PropertyAttributes.cs
new file mode 100644
index 00000000000..6e43646100e
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/PropertyAttributes.cs
@@ -0,0 +1,28 @@
+//
+// System.Data.PropertyAttributes.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies the attributes of a property.
+	/// This enumeration has a FlagsAttribute that allows a bitwise combination of its member values
+	/// </summary>
+	[Flags]
+	[Serializable]
+	public enum PropertyAttributes
+	{
+		NotSupported = 0,
+		Required = 1,
+		Optional = 2,
+		Read = 512,
+		Write = 1024
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/PropertyCollection.cs b/mcs/class/System.Data/System.Data/PropertyCollection.cs
new file mode 100644
index 00000000000..ef720923387
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/PropertyCollection.cs
@@ -0,0 +1,31 @@
+//
+// System.Data.PropertyCollection.cs
+//
+// Author:
+//    Daniel Morgan <danmorg@sc.rr.com>
+//
+// (c) Ximian, Inc. 2002
+//
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+
+namespace System.Data
+{
+	/// <summary>

+	/// a collection of properties that can be added to 

+	/// DataColumn, DataSet, or DataTable.

+	/// The ExtendedProperties property of a 

+	/// DataColumn, DataSet, or DataTable class can

+	/// retrieve a PropertyCollection.

+	/// </summary>
+	public class PropertyCollection : Hashtable {
+		[MonoTODO]
+		public PropertyCollection() {
+		}
+
+		// the only public methods and properties 
+		// are all inherited from Hashtable
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/ReadOnlyException.cs b/mcs/class/System.Data/System.Data/ReadOnlyException.cs
new file mode 100644
index 00000000000..a45f5d22d17
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/ReadOnlyException.cs
@@ -0,0 +1,33 @@
+//
+// System.Data.ReadOnlyException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+
+	[Serializable]
+	public class ReadOnlyException : DataException
+	{
+		public ReadOnlyException ()
+			: base (Locale.GetText ("Cannot change a value in a read-only column"))
+		{
+		}
+
+		public ReadOnlyException (string message)
+			: base (message)
+		{
+		}
+
+		protected ReadOnlyException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/RowNotInTableException.cs b/mcs/class/System.Data/System.Data/RowNotInTableException.cs
new file mode 100644
index 00000000000..9209312d0ca
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/RowNotInTableException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.RowNotInTableException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class RowNotInTableException : DataException
+	{
+		public RowNotInTableException ()
+			: base (Locale.GetText ("This DataRow is not in this DataTable"))
+		{
+		}
+
+		public RowNotInTableException (string message)
+			: base (message)
+		{
+		}
+
+		protected RowNotInTableException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/Rule.cs b/mcs/class/System.Data/System.Data/Rule.cs
new file mode 100644
index 00000000000..e8fc4166f34
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/Rule.cs
@@ -0,0 +1,25 @@
+//
+// System.Data.Rule.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Indicates the action that occurs when a ForeignKeyConstraint is enforced.
+	/// </summary>
+	[Serializable]
+	public enum Rule
+	{
+		None = 0,
+		Cascade = 1,
+		SetNull = 2,
+		SetDefault = 3
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/SchemaType.cs b/mcs/class/System.Data/System.Data/SchemaType.cs
new file mode 100644
index 00000000000..8c0d1dbf904
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/SchemaType.cs
@@ -0,0 +1,23 @@
+//
+// System.Data.SchemaType.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies how to handle existing schema mappings when performing a FillSchema operation.
+	/// </summary>
+	[Serializable]
+	public enum SchemaType
+	{
+		Source = 1,
+		Mapped = 2
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/SqlDbType.cs b/mcs/class/System.Data/System.Data/SqlDbType.cs
new file mode 100644
index 00000000000..9c4afccf5e0
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/SqlDbType.cs
@@ -0,0 +1,45 @@
+//
+// System.Data.SqlDbType.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies SQL Server data types.
+	/// </summary>
+	[Serializable]
+	public enum SqlDbType
+	{
+		BigInt = 0,
+		Binary = 1,
+		Bit = 2,
+		Char = 3,
+		DateTime = 4,
+		Decimal = 5,
+		Float = 6,
+		Image = 7,
+		Int = 8,
+		Money = 9,
+		NChar = 10,
+		NText = 11,
+		NVarChar = 12,
+		Real = 13,
+		UniqueIdentifier = 14,
+		SmallDateTime = 15,
+		SmallInt = 16,
+		SmallMoney = 17,
+		Text = 18,
+		Timestamp = 19,
+		TinyInt = 20,
+		VarBinary = 21,
+		VarChar = 22,
+		Variant = 23
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/StateChangeEventArgs.cs b/mcs/class/System.Data/System.Data/StateChangeEventArgs.cs
new file mode 100644
index 00000000000..c21e4abbc76
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/StateChangeEventArgs.cs
@@ -0,0 +1,43 @@
+//
+// System.Data.SqlRowUpdatingEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+
+namespace System.Data {
+	public sealed class StateChangeEventArgs : EventArgs {
+
+		[MonoTODO]
+		public StateChangeEventArgs(ConnectionState originalState,
+			ConnectionState currentState)	{
+			// FIXME: do me
+		}
+
+		[MonoTODO]
+		public ConnectionState CurrentState {
+			get {
+				// FIXME: do me
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public ConnectionState OriginalState {
+			get {
+				// FIXME: do me
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		~StateChangeEventArgs() {
+			// FIXME: do me
+		}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/StateChangeEventHandler.cs b/mcs/class/System.Data/System.Data/StateChangeEventHandler.cs
new file mode 100644
index 00000000000..29ad7703030
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/StateChangeEventHandler.cs
@@ -0,0 +1,18 @@
+//
+// System.Data.StateChangeEventHandler.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+namespace System.Data
+{
+	/// <summary>
+	/// Represents the method that will handle the StateChange event.
+	/// </summary>
+	[Serializable]
+	public delegate void StateChangeEventHandler(object sender, StateChangeEventArgs e);
+
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/StatementType.cs b/mcs/class/System.Data/System.Data/StatementType.cs
new file mode 100644
index 00000000000..11cc51c1bba
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/StatementType.cs
@@ -0,0 +1,25 @@
+//
+// System.Data.StatementType.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies the type of SQL query to be used by the OleDbRowUpdatedEventArgs, OleDbRowUpdatingEventArgs, SqlRowUpdatedEventArgs, or SqlRowUpdatingEventArgs class.
+	/// </summary>
+	[Serializable]
+	public enum StatementType
+	{
+		Select = 0,
+		Insert = 1,
+		Update = 2,
+		Delete = 3
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/StrongTypingException.cs b/mcs/class/System.Data/System.Data/StrongTypingException.cs
new file mode 100644
index 00000000000..65749b68ac8
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/StrongTypingException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.StrongTypingException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class StrongTypingException : DataException
+	{
+		public StrongTypingException ()
+			: base (Locale.GetText ("Trying to access a DBNull value in a strongly-typed DataSet"))
+		{
+		}
+
+		public StrongTypingException (string message)
+			: base (message)
+		{
+		}
+
+		protected StrongTypingException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/SyntaxErrorException.cs b/mcs/class/System.Data/System.Data/SyntaxErrorException.cs
new file mode 100644
index 00000000000..6f97458d654
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/SyntaxErrorException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.SyntaxErrorException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+	[Serializable]
+	public class SyntaxErrorException : InvalidExpressionException
+	{
+		public SyntaxErrorException ()
+			: base (Locale.GetText ("There is a syntax error in this Expression"))
+		{
+		}
+
+		public SyntaxErrorException (string message)
+			: base (message)
+		{
+		}
+
+		protected SyntaxErrorException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/TODOAttribute.cs b/mcs/class/System.Data/System.Data/TODOAttribute.cs
new file mode 100644
index 00000000000..9aae1ca30bb
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/TODOAttribute.cs
@@ -0,0 +1,33 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+using System;
+
+namespace System.Data {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All)]
+	internal class MonoTODOAttribute : Attribute {
+
+		string comment;
+
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/TypeDataSetGeneratorException.cs b/mcs/class/System.Data/System.Data/TypeDataSetGeneratorException.cs
new file mode 100644
index 00000000000..b46e17c385a
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/TypeDataSetGeneratorException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.TypedDataSetGeneratorException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]
+	public class TypedDataSetGeneratorException : DataException
+	{
+		public TypedDataSetGeneratorException ()
+			: base (Locale.GetText ("There is a name conflict"))
+		{
+		}
+
+		public TypedDataSetGeneratorException (string message)
+			: base (message)
+		{
+		}
+
+		protected TypedDataSetGeneratorException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/UniqueConstraint.cs b/mcs/class/System.Data/System.Data/UniqueConstraint.cs
new file mode 100644
index 00000000000..679ccb4a177
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/UniqueConstraint.cs
@@ -0,0 +1,298 @@
+//
+// System.Data.UniqueConstraint.cs
+//
+// Author:
+//   Franklin Wise <gracenote@earthlink.net>
+//   Daniel Morgan <danmorg@sc.rr.com>
+//   
+// (C) 2002 Franklin Wise
+// (C) 2002 Daniel Morgan
+
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Runtime.InteropServices;
+
+namespace System.Data
+{
+	public class UniqueConstraint : Constraint 
+	{
+		private bool _isPrimaryKey = false;
+		private DataTable _dataTable; //set by ctor except when unique case
+		
+		private DataColumn [] _dataColumns;
+
+		//TODO:provide helpers for this case
+		private string [] _dataColumnNames; //unique case
+		
+
+		#region Constructors
+
+		public UniqueConstraint(DataColumn column) {
+
+			_uniqueConstraint ("", column, false);
+		}
+
+		public UniqueConstraint(DataColumn[] columns) {
+			
+			_uniqueConstraint ("", columns, false);
+		}
+
+		public UniqueConstraint(DataColumn column,
+			bool isPrimaryKey) {
+
+			_uniqueConstraint ("", column, isPrimaryKey);
+		}
+
+		public UniqueConstraint(DataColumn[] columns, bool isPrimaryKey) {
+
+			_uniqueConstraint ("", columns, isPrimaryKey);
+		}
+
+		public UniqueConstraint(string name, DataColumn column) {
+
+			_uniqueConstraint (name, column, false);
+		}
+
+		public UniqueConstraint(string name, DataColumn[] columns) {
+
+			_uniqueConstraint (name, columns, false);
+		}
+
+		public UniqueConstraint(string name, DataColumn column,
+			bool isPrimaryKey) {
+
+			_uniqueConstraint (name, column, isPrimaryKey);
+		}
+
+		public UniqueConstraint(string name,
+			DataColumn[] columns, bool isPrimaryKey) {
+
+			_uniqueConstraint (name, columns, isPrimaryKey);
+		}
+
+		//Special case.  Can only be added to the Collection with AddRange
+		[MonoTODO]
+		public UniqueConstraint(string name,
+			string[] columnNames, bool isPrimaryKey) {
+
+			throw new NotImplementedException(); //need to finish related logic
+			/*
+			base.ConstraintName = name;
+			
+			//set unique
+			//must set unique when added to the collection
+
+			//keep list of names to resolve later
+			_dataColumnNames = columnNames;
+
+			_isPrimaryKey = isPrimaryKey;
+			*/
+		}
+
+		//helper ctor
+		private void _uniqueConstraint(string name, 
+				DataColumn column, bool isPrimaryKey) {
+
+			//validate
+			_validateColumn (column);
+
+			//Set Constraint Name
+			base.ConstraintName = name;
+
+			//set unique
+			column.Unique = true;
+
+			//keep reference 
+			_dataColumns = new DataColumn [] {column};
+			
+			//PK?
+			_isPrimaryKey = isPrimaryKey;
+
+			//Get table reference
+			_dataTable = column.Table;
+		}
+
+		//helpter ctor	
+		public void _uniqueConstraint(string name,
+			DataColumn[] columns, bool isPrimaryKey) {
+
+			//validate
+			_validateColumns (columns, out _dataTable);
+
+			//Set Constraint Name
+			base.ConstraintName = name;
+
+			//set unique
+			_setColumnsUnique (columns);
+
+			//keep reference
+			_dataColumns = columns;
+
+			//PK?
+			_isPrimaryKey = isPrimaryKey;
+
+		}
+		
+		#endregion // Constructors
+
+		#region Helpers
+		private void _setColumnsUnique(DataColumn [] columns) {
+			if (null == columns) return;
+			foreach (DataColumn col in columns) {
+				col.Unique = true;
+			}
+		}
+		
+		private void _validateColumns(DataColumn [] columns)
+		{
+			DataTable table;
+			_validateColumns(columns, out table);
+		}
+		
+		//Validates a collection of columns with the ctor rules
+		private void _validateColumns(DataColumn [] columns, out DataTable table) {
+			table = null;
+
+			//not null
+			if (null == columns) throw new ArgumentNullException();
+			
+			//check that there is at least one column
+			//LAMESPEC: not in spec
+			if (columns.Length < 1)
+				throw new InvalidConstraintException("Must be at least one column.");
+			
+			DataTable compareTable = columns[0].Table;
+			//foreach
+			foreach (DataColumn col in columns){
+			
+				//check individual column rules
+				_validateColumn (col);
+				
+				
+				//check that columns are all from the same table??
+				//LAMESPEC: not in spec
+				if (compareTable != col.Table)
+					throw new InvalidConstraintException("Columns must be from the same table.");
+				
+			}
+
+			table = compareTable;
+		}
+		
+		//validates a column with the ctor rules
+		private void _validateColumn(DataColumn column) {
+	
+			//not null
+			if (null == column) throw new ArgumentNullException();
+			
+			//column must belong to a table
+			//LAMESPEC: not in spec
+			if (null == column.Table) 
+				throw new ArgumentException("Column " + column.ColumnName + " must belong to a table.");
+			
+		}
+
+		internal static UniqueConstraint GetUniqueConstraintForColumnSet(ConstraintCollection collection,
+				DataColumn[] columns)
+		{
+			if (null == columns ) return null;
+			
+			UniqueConstraint uniqueConstraint;
+			IEnumerator enumer = collection.GetEnumerator();
+			while (enumer.MoveNext())
+			{
+				uniqueConstraint = enumer.Current as UniqueConstraint;
+				if (uniqueConstraint != null)
+				{
+					if ( DataColumn.AreColumnSetsTheSame(uniqueConstraint.Columns, columns) )
+					{
+						return uniqueConstraint;
+					}
+				}
+			}
+			return null;
+		}
+			
+		
+			
+		#endregion //Helpers
+
+		#region Properties
+
+		public virtual DataColumn[] Columns {
+			get {
+				return _dataColumns;
+			}
+		}
+
+		public bool IsPrimaryKey {
+			get {
+				return _isPrimaryKey;
+			}
+		}
+
+		public override DataTable Table {
+			get {
+				return _dataTable;
+			}
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		public override bool Equals(object key2) {
+
+			UniqueConstraint cst = key2 as UniqueConstraint;
+			if (null == cst) return false;
+
+			//according to spec if the cols are equal
+			//then two UniqueConstraints are equal
+			return DataColumn.AreColumnSetsTheSame(cst.Columns, this.Columns);	
+
+		}
+
+		[MonoTODO]
+		public override int GetHashCode() {
+			throw new NotImplementedException ();
+		}
+		
+	
+		internal override void AddToConstraintCollectionSetup(
+				ConstraintCollection collection)
+		{
+			//run Ctor rules again
+			_validateColumns(_dataColumns);
+			
+			//make sure a unique constraint doesn't already exists for these columns
+			UniqueConstraint uc = UniqueConstraint.GetUniqueConstraintForColumnSet(collection, this.Columns);	
+			if (null != uc) throw new ArgumentException("Unique constraint already exists for these" +
+					" columns. Existing ConstraintName is " + uc.ConstraintName);
+					
+			AssertConstraint();
+		}
+					
+		
+		internal override void RemoveFromConstraintCollectionCleanup( 
+				ConstraintCollection collection)
+		{
+		}
+
+		[MonoTODO]
+		internal override void AssertConstraint()
+		{
+			
+			if (_dataTable == null) return; //???
+			if (_dataColumns == null) return; //???
+
+			
+			//Unique?	
+			DataTable tbl = _dataTable;
+
+			//TODO: validate no dups	
+
+		}
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/UpdateRowSource.cs b/mcs/class/System.Data/System.Data/UpdateRowSource.cs
new file mode 100644
index 00000000000..6ccf40d5306
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/UpdateRowSource.cs
@@ -0,0 +1,25 @@
+//
+// System.Data.UpdateRowSource.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies how query command results are applied to the row being updated.
+	/// </summary>
+	[Serializable]
+	public enum UpdateRowSource
+	{
+		None = 0,
+		OutputParameters = 1,
+		FirstReturnedRecord = 2,
+		Both = 3
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/UpdateStatus.cs b/mcs/class/System.Data/System.Data/UpdateStatus.cs
new file mode 100644
index 00000000000..f686d6cd1aa
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/UpdateStatus.cs
@@ -0,0 +1,25 @@
+//
+// System.Data.UpdateStatus.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies the action to take with regard to the current and remaining rows during an Update.
+	/// </summary>
+	[Serializable]
+	public enum UpdateStatus
+	{
+		Continue = 0,
+		ErrorsOccurred = 1,
+		SkipCurrentRow = 2,
+		SkipAllRemainingRows = 3
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/VersionNotFoundException.cs b/mcs/class/System.Data/System.Data/VersionNotFoundException.cs
new file mode 100644
index 00000000000..f26a642eb53
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/VersionNotFoundException.cs
@@ -0,0 +1,32 @@
+//
+// System.Data.VersionNotFoundException.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Data {
+
+	[Serializable]			
+	public class VersionNotFoundException : DataException
+	{
+		public VersionNotFoundException ()
+			: base (Locale.GetText ("This DataRow has been deleted"))
+		{
+		}
+
+		public VersionNotFoundException (string message)
+			: base (message)
+		{
+		}
+
+		protected VersionNotFoundException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Data/System.Data/XmlReadMode.cs b/mcs/class/System.Data/System.Data/XmlReadMode.cs
new file mode 100644
index 00000000000..d8db21dbd19
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/XmlReadMode.cs
@@ -0,0 +1,27 @@
+//
+// System.Data.XmlReadMode.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Specifies how to read XML data and a relational schema into a DataSet.
+	/// </summary>
+	[Serializable]
+	public enum XmlReadMode
+	{
+		Auto = 0,
+		ReadSchema = 1,
+		IgnoreSchema = 2,
+		InferSchema = 3,
+		DiffGram = 4,
+		Fragment = 5
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Data/XmlWriteMode.cs b/mcs/class/System.Data/System.Data/XmlWriteMode.cs
new file mode 100644
index 00000000000..f70b9c5850b
--- /dev/null
+++ b/mcs/class/System.Data/System.Data/XmlWriteMode.cs
@@ -0,0 +1,24 @@
+//
+// System.Data.XmlWriteMode.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+
+namespace System.Data
+{
+	/// <summary>
+	/// Use the members of this enumeration when setting the WriteMode parameter of the WriteXml method.
+	/// </summary>
+	[Serializable]
+	public enum XmlWriteMode
+	{
+		WriteSchema = 0,
+		IgnoreSchema = 1,
+		DiffGram = 2
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.Data/System.Xml/XmlDataDocument.cs b/mcs/class/System.Data/System.Xml/XmlDataDocument.cs
new file mode 100644
index 00000000000..8b028c96e7f
--- /dev/null
+++ b/mcs/class/System.Data/System.Xml/XmlDataDocument.cs
@@ -0,0 +1,232 @@
+//
+// mcs/class/System.Data/System.Xml/XmlDataDocument.cs
+//
+// Purpose: Provides a W3C XML DOM Document to interact with
+//          relational data in a DataSet
+//
+// class: XmlDataDocument
+// assembly: System.Data.dll
+// namespace: System.Xml
+//
+// Author:
+//     Daniel Morgan <danmorg@sc.rr.com>
+//
+// (c)copyright 2002 Daniel Morgan
+//
+// XmlDataDocument is included within the Mono Class Library.
+//
+
+using System;
+using System.Data;
+using System.IO;
+using System.Text;
+using System.Xml.XPath;
+
+namespace System.Xml {
+
+	public class XmlDataDocument : XmlDocument {
+
+		#region Fields
+
+		private DataSet dataSet;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		public XmlDataDocument() {
+			dataSet = new DataSet();
+		}
+
+		public XmlDataDocument(DataSet dataset) {
+			this.dataSet = dataset;
+		}
+
+		#endregion // Constructors
+
+		#region Public Properties
+
+		public override string BaseURI {
+			[MonoTODO]
+			get {
+				// TODO: why are we overriding?
+				return base.BaseURI;
+			}
+		}
+
+		public DataSet DataSet {
+			[MonoTODO]
+			get {
+				return dataSet;
+			}
+		}
+
+		// override inheritted method from XmlDocument
+		public override string InnerXml {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException();
+			}
+				 
+			[MonoTODO]
+			set {
+				throw new NotImplementedException();
+			}
+		}
+
+		public override bool IsReadOnly {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException();
+			}
+
+		}
+
+		// Item indexer
+		public override XmlElement this[string name] {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException();
+			}
+		}
+
+		// Item indexer
+		public override XmlElement this[string localname, string ns] {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException();
+			}
+		}
+
+		public override string LocalName {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException();
+			}
+		}
+
+		public override string Name {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException();
+			}
+		}
+
+		public override XmlDocument OwnerDocument {
+			[MonoTODO]
+			get {
+				return null;
+			}
+		}
+
+		#endregion // Public Properties
+
+		#region Public Methods
+
+		[MonoTODO]
+		public override XmlNode CloneNode(bool deep) 
+		{
+			throw new NotImplementedException();
+		}
+
+		#region overloaded CreateElement methods
+
+		[MonoTODO]
+		public new XmlElement CreateElement(string prefix,
+				string localName, string namespaceURI) 
+		{
+			throw new NotImplementedException();
+		}
+
+		[MonoTODO]
+		public new XmlElement CreateElement(string qualifiedName,
+				string namespaceURI) 
+		{
+			throw new NotImplementedException();
+		}
+
+		[MonoTODO]
+		public new XmlElement CreateElement(string name) 
+		{
+			throw new NotImplementedException();
+		}
+
+		#endregion // overloaded CreateElement Methods
+			
+		// will not be supported
+		public override XmlEntityReference CreateEntityReference(string name) 
+		{
+			throw new NotSupportedException();
+		}
+		
+		// will not be supported
+		public override XmlElement GetElementById(string elemId) 
+		{
+			throw new NotSupportedException();
+		}
+
+		// get the XmlElement associated with the DataRow
+		public XmlElement GetElementFromRow(DataRow r) 
+		{
+			throw new NotImplementedException();
+		}
+
+		// get the DataRow associated with the XmlElement
+		[MonoTODO]
+		public DataRow GetRowFromElement(XmlElement e) 

+		{

+			throw new NotImplementedException();

+		}

+

+		#region overload Load methods

+

+		[MonoTODO]

+		public override void Load(Stream inStream) {

+			throw new NotImplementedException();

+		}

+

+		[MonoTODO]

+		public override void Load(string filename) {

+			throw new NotImplementedException();

+		}

+

+		[MonoTODO]

+		public override void Load(TextReader txtReader) {

+			throw new NotImplementedException();

+		}

+

+		[MonoTODO]

+		public override void Load(XmlReader reader) {

+			throw new NotImplementedException();

+		}

+

+		#endregion // overloaded Load methods

+

+		[MonoTODO]

+		public override void WriteContentTo(XmlWriter xw) {

+			throw new NotImplementedException();

+		}

+

+		[MonoTODO]

+		public override void WriteTo(XmlWriter w) {

+			throw new NotImplementedException();

+		}

+
+		#endregion // Public Methods
+
+		#region Protected Methods
+
+		[MonoTODO]
+		protected override XPathNavigator CreateNavigator(XmlNode node) {

+			throw new NotImplementedException();

+		}

+
+		[MonoTODO]
+		public new XPathNavigator CreateNavigator() {

+			throw new NotImplementedException();

+		}

+
+		#endregion // Protected Methods
+
+	}
+}
diff --git a/mcs/class/System.Data/TODO b/mcs/class/System.Data/TODO
new file mode 100644
index 00000000000..acd1a7f4234
--- /dev/null
+++ b/mcs/class/System.Data/TODO
@@ -0,0 +1,134 @@
+System.Data TODO List
+=====================
+
+Update this file as needed...
+
+* To get ExecuteReader() in a SqlCommand object to return 
+  a SqlDataReader object which can Read() data and get a String or
+  Int32 from the database.  Other types can be done later.
+  
+  A class (SqlDataReader) that implements IDataReader/IDataRecord
+  only has one row in memory at a time.
+
+In order to do this, we need to compile and edit these classes:
+	SqlDataReader	DataTable	DataRowCollection		DataRow
+								DataColumnCollection	DataColumn
+								DataConstraintCollection DataConstraint
+								DataRelationCollection	DataRelation
+								DataTableCollection
+	and dependencies...
+
+System.Data.Common classes that need to be implemented:
+ - implement DataAdapter.cs
+ - implement DataColumnMapping.cs
+ - implement DataColumnMappingCollection.cs
+ - implement DataTableMapping.cs
+ - implement DataTableMappingCollection.cs
+ - implement DbDataAdapter.cs
+ - implement DbDataPermission.cs
+ - implement DbDataPermissionAttribute.cs
+ - implement RowUpdatedEventArgs.cs
+ - implement RowUpdatingEventArgs.cs
+
+The following classes implement InternalDataCollectionBase:
+	* DataRowCollection
+	* DataColumnCollection
+	* DataTableCollection
+	* DataRelationCollection - an abstract class used by DataTable and DataSet
+	* ConstraintCollection
+
+DataTableRelationCollection is an internal class that implements DataRelationCollection
+and is used by DataTable for parent/child relations.  Don't know if it will/will not
+be used by DataSet.
+
+Other classes, structs, etc. that are missing:
+	DataRowView
+	DataSysDescriptionAttribute
+	DataViewManager
+	DataViewSetting
+	FillErrorEventArgs
+	MergeFailedEventArgs
+	TypedDataSetGenerator
+ 
+The additional System.Data.SqlTypes classes need to be implemented:
+	SqlByte
+	SqlDataTime
+	SqlDecimal
+	SqlDouble
+	SqlGuid
+	SqlInt16
+	SqlInt64
+	SqlMoney
+	SqlSingle
+
+* provide a standard scheme for storing
+  connection string data
+
+* allow Execute methods in SqlCommand to
+  call a stored procedure
+
+* Create a script for testing System.Data:
+  - calls script to create 
+    a test database named monotestdb
+  - set up nunit for testing System.Data
+  - set up System.Data.Config or some other 
+    file to hold connection strings and other
+    configuration settings for the testing System.Data
+  - any other stuff needed...
+
+* get SqlParameter/SqlParameterCollection
+  working so you can:
+  - for queries/commands that have parameters:
+    o  input 
+    o  output 
+    o  return
+    o  input/output
+  - call a stored procedure with parameters
+ 
+* be able to return a XmlReader from
+  using method ExecuteXmlReader of
+  a SqlCommand object
+
+* get SqlDataAdapter/DataSet working
+
+* Create Library for PInvoking into libgda
+  This will be used by System.Data.OleDb classes
+
+* Begin System.Data.OleDb classes:
+  - OleDbConnection
+  - OleDbCommand
+  - OleDbTransaction
+
+* Do more of the OleDb classes to
+  retrieve a OleDbDataReader object
+  from a query (SELECT FROM):
+  - OleDbDataReader
+  - others...
+
+* Do more OleDb classes for DataSet:
+  - OleDbDataAdapter
+  - others...
+  
+* Security Audit of System.Data
+
+* Create a MySQL ADO.NET Provider
+
+* Create an Oracle ADO.NET Provider
+
+* Create an Interbase ADO.NET Provider
+
+* Create a Sybase ADO.NET Provider (TDS?)
+
+* Create an IBM UDB DB2 ADO.NET Provider
+
+* Create other ADO.NET providers...
+
+Integration
+===========
+
+* get System.Data to work with ASP.NET's
+  System.Web.UI.WebControls.DataGrid
+
+* get System.Data to work with GUI
+  System.Windows.Forms.DataGrid
+
diff --git a/mcs/class/System.Data/Test/.cvsignore b/mcs/class/System.Data/Test/.cvsignore
new file mode 100644
index 00000000000..335c71fd7fa
--- /dev/null
+++ b/mcs/class/System.Data/Test/.cvsignore
@@ -0,0 +1,2 @@
+*.dll
+*.pdb
diff --git a/mcs/class/System.Data/Test/AllTests.cs b/mcs/class/System.Data/Test/AllTests.cs
new file mode 100644
index 00000000000..3d64c22297d
--- /dev/null
+++ b/mcs/class/System.Data/Test/AllTests.cs
@@ -0,0 +1,21 @@
+// Author: Tim Coleman (tim@timcoleman.com)
+// Copyright 2002 Tim Coleman
+
+using System;
+using System.Data;
+using System.Data.SqlTypes;
+using NUnit.Framework;
+
+namespace MonoTests {
+	public class AllTests : TestCase {
+		public AllTests (string name) : base (name) {}
+
+		public static ITest Suite {
+			get {
+				TestSuite suite = new TestSuite ();
+				suite.AddTest (System.Data.SqlTypes.AllTests.Suite);
+				return suite;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/ChangeLog b/mcs/class/System.Data/Test/ChangeLog
new file mode 100644
index 00000000000..fc84bbb21f8
--- /dev/null
+++ b/mcs/class/System.Data/Test/ChangeLog
@@ -0,0 +1,147 @@
+2002-08-20  Franklin Wise <gracenote@earthlink.net>
+	
+	* NewFile: System.Data\DataTableTest.cs
+
+	* AllTests.cs: Added DataTableTest to tests.
+	
+2002-08-19  Franklin Wise <gracenote@earthlink.net>
+	
+	* System.Data\ForeignKeyConstraintTest.cs:  Added more tests.
+
+2002-08-15  Franklin Wise <gracenote@earthlink.net>
+	
+	* AllTests.cs: Added ForeignKeyConstraintTest to active running tests.
+		
+	* NewFile: System.Data\ForeignKeyConstraintTest.cs
+	
+	* System.Data\ConstraintTest: Added new test.
+
+	* System.Data\UniqueConstraintTest:  Added more tests.
+	
+2002-08-14  Daniel Morgan <danmorg@sc.rr.com>
+
+	* SqlSharpCli.cs: modified
+	  - implemented the following commands:
+	    \f FILENAME to read a batch of Sql# commands/queries from file.");
+		\o FILENAME to write out the result of Sql# commands executed to file.");
+		\load FILENAME to load from file SQL commands into SQL buffer.");
+		\save FILENAME to save SQL commands from SQL buffer to file.
+		\print - show what's in the SQL buffer now.
+	  - can save output of result to an html file or text
+	  - entering command "\provider mysql" will dynamically load mysql provider
+	    from its assembly Mono.Data.MySql.dll
+
+2002-08-13  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Test/SqlSharpCli.cs: modified
+	  - removed dependency on Mono.Data.MySql assembly and classes
+	    (if you still want to use Mono.Data.MySql, use \loadextprovider to load it).
+	  - added use of provider System.Data.OleDb classes; however, you must
+	    have a working libgda.
+	  - added dynamic loading of .NET Data Provider's assembly and Connection class
+	    which can be loaded via \loadextprovider
+	  - renamed providers: postgresclient to postgresql, oracleclient to oracle
+	  - add new command \exenonquery to execute non queries
+	  - add new command \exescalar to execute and return one row/one column of data
+	  - added beginnings of internal variables by adding new commands: \set, \unset, and
+	  \variable
+	  - add new command \r to reset (clear) the query buffer
+	  - if quiting, need to close database connection if still open  
+
+2002-08-12  Franklin Wise <gracenote@earthlink.net>
+	* NewFile: Added test for System.Data.UniqueConstraintTest.cs
+
+	* NewFile: Added test for System.Data.ConstraintTest.cs
+
+	* NewFile: Added test for System.Data.ConstraintCollection.cs
+
+	* Added blank test for DataColumnTest so that NUnit won't warn
+	of no tests
+
+	* Updated System.Data.AllTests.cs to include the new tests
+
+2002-05-27  Tim Coleman <tim@timcoleman.com>
+	* TestSqlDataAdapter.cs: remove explicit opening of connection.
+	This should occur implicitly now.
+
+2002-05-23  Daniel Morgan <danmorg@sc.rr.com>
+
+	* TestSqlParameters.cs: read and display the schema columns
+	correctly
+
+2002-05-16  Tim Coleman  <tim@timcoleman.com>
+        * TestSqlDataAdapter.cs: Added the foreach loop to iterate through
+        all of the DataRows in the DataSet table "Table", as the
+        GetEnumerator method of InternalDataCollectionBase has now been
+        implemented.
+
+
+2002/05/17  Nick Drochak <ndrochak@gol.com>
+
+	* System.Data_test.build: Remove RunTests from the default build. We
+	can add this later, but it keeps the build from breaking for now.
+
+	* TestSqlDataAdapter.cs: Fix build breaker.
+
+2002-05-11  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Test/PostgresTest.cs: added call to PostgreSQL stored procedure
+	version() which returns the version of the PostgreSQL DBMS you
+	are connected to.  This works and I did not realize it.  Thanks
+	goes to Gonzalo.
+
+2002-05-11  Daniel Morgan <danmorg@sc.rr.com>
+
+	* AllTests.cs: needed a using for System.Data and System.Data.SqlClient,
+	changed SqlTypes.AllTests.Suite to System.Data.SqlTypes.AllTests.Suite
+	
+	* System.Data/DataColumnTest.cs: changed typeof to DataColumnTest 
+
+2002-05-10  Rodrigo Moya <rodrigo@ximian.com>
+
+        * TestDataColumn.cs: removed.
+
+	* System.Data_test.build: removed reference to TestDataColumn.
+
+	* TheTests.cs: added RunDataColumnTest class.
+	(RunAllTests.AddAllTests): added test for RunDataColumnTest.
+
+        * System.Data/AllTests.cs: test suite for System.Data.
+
+        * System.Data/DataColumnTest.cs: NUnit test for DataColumn.
+
+2002-05-09  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data_test.build: exclude file TestDataColumn.cs
+	test.build files have two places where a file needs to
+	be excluded
+
+2002-05-06  Daniel Morgan <danmorg@sc.rr.com>
+
+	* System.Data.SqlTypes.SqlInt32Test.cs: missing
+	declaration for SqlInt32 z which was a test build blocker
+	
+	* PostgresTest.cs: got rid of warning about missing e
+	
+	* Test/PostgresTest.cs: exclude PostgresTest.cs 
+	from test build
+
+2002-05-05  Tim Coleman <tim@timcoleman.com>
+	* TheTests.cs:
+	* System.Data.SqlTypes/SqlInt32Test.cs:
+		More test cases for System.Data.SqlTypes.SqlInt32
+
+2002-05-03  Tim Coleman <tim@timcoleman.com>
+	* Added ChangeLog to test dir
+	* Added NUnit framework necessary for make test
+	* Added subdirectory for System.Data.SqlTypes
+	* New files:
+		ChangeLog
+		AllTests.cs
+		TheTests.cs
+		System.Data_test.build
+		System.Data.SqlTypes
+		System.Data.SqlTypes/AllTests.cs
+		System.Data.SqlTypes/SqlInt32Test.cs
+
+
diff --git a/mcs/class/System.Data/Test/PostgresTest.cs b/mcs/class/System.Data/Test/PostgresTest.cs
new file mode 100644
index 00000000000..645673185e6
--- /dev/null
+++ b/mcs/class/System.Data/Test/PostgresTest.cs
@@ -0,0 +1,510 @@
+/* PostgresTest.cs - based on the postgres-test.c in libgda
+ * 
+ * Copyright (C) 2002 Gonzalo Paniagua Javier
+ * Copyright (C) 2002 Daniel Morgan
+ *
+ * ORIGINAL AUTHOR:
+ *	Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+ * PORTING FROM C TO C# AUTHOR:
+ *	Daniel Morgan <danmorg@sc.rr.com>
+ *
+ * Permission was given from the original author, Gonzalo Paniagua Javier,
+ * to port and include his original work in Mono.
+ * 
+ * The original work falls under the LGPL, but the port to C# falls
+ * under the X11 license.
+ * 
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License as
+ * published by the Free Software Foundation; either version 2 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public
+ * License along with this program; see the file COPYING.  If not,
+ * write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+using System;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace TestSystemDataSqlClient {
+
+	class PostgresTest {
+
+		// execute SQL CREATE TABLE Command using ExecuteNonQuery()
+		static void CreateTable (IDbConnection cnc) {
+						
+			IDbCommand createCommand = cnc.CreateCommand();
+	
+			createCommand.CommandText = 
+				"create table mono_postgres_test (" +
+				"boolean_value boolean, " +
+				"int2_value smallint, " +
+				"int4_value integer, " +
+				"bigint_value bigint, " +
+				"float_value real, " + 
+				"double_value double precision, " +
+				"numeric_value numeric(15, 3), " +
+				"char_value char(50), " +
+				"varchar_value varchar(20), " +
+				"text_value text, " +
+				"point_value point, " +
+				"time_value time, " +
+				"date_value date, " +
+				"timestamp_value timestamp, " +
+				"null_boolean_value boolean, " +
+				"null_int2_value smallint, " +
+				"null_int4_value integer, " +
+				"null_bigint_value bigint, " +
+				"null_float_value real, " + 
+				"null_double_value double precision, " +
+				"null_numeric_value numeric(15, 3), " +
+				"null_char_value char(50), " +
+				"null_varchar_value varchar(20), " +
+				"null_text_value text, " +
+				"null_point_value point, " +
+				"null_time_value time, " +
+				"null_date_value date, " +
+				"null_timestamp_value timestamp " +
+				")";			
+	
+			createCommand.ExecuteNonQuery ();
+		}
+
+		// execute SQL DROP TABLE Command using ExecuteNonQuery
+		static void DropTable (IDbConnection cnc) {
+				 
+			IDbCommand dropCommand = cnc.CreateCommand ();
+
+			dropCommand.CommandText =
+				"drop table mono_postgres_test";
+							
+			dropCommand.ExecuteNonQuery ();
+		}
+
+		// execute stored procedure using ExecuteScalar()
+		static object CallStoredProcedure (IDbConnection cnc) {
+				 
+			IDbCommand callStoredProcCommand = cnc.CreateCommand ();
+			object data;
+
+			callStoredProcCommand.CommandType = 
+				CommandType.StoredProcedure;
+			callStoredProcCommand.CommandText =
+				"version";
+							
+			data = callStoredProcCommand.ExecuteScalar ();
+
+			return data;
+		}
+
+		// execute SQL INSERT Command using ExecuteNonQuery()
+		static void InsertData (IDbConnection cnc) {		
+
+			IDbCommand insertCommand = cnc.CreateCommand();
+		
+			insertCommand.CommandText =
+				"insert into mono_postgres_test (" +
+				"boolean_value, " +
+				"int2_value, " +
+				"int4_value, " +
+				"bigint_value, " +
+				"float_value, " +
+				"double_value, " +
+				"numeric_value, " +
+				"char_value, " +
+				"varchar_value, " +
+				"text_value, " +
+				"time_value, " +
+				"date_value, " +
+				"timestamp_value, " +
+				"point_value " +
+				") values (" +
+				"'T', " +
+				"-22, " +
+				"1048000, " +
+				"123456789012345, " +
+				"3.141592, " +
+				"3.1415926969696, " +
+				"123456789012.345, " +
+				"'This is a char', " +
+				"'This is a varchar', " +
+				"'This is a text', " +
+				"'21:13:14', " +
+				"'2000-02-29', " +
+				"'2004-02-29 14:00:11.31', " +
+				"'(1,0)' " +
+				")";
+
+			insertCommand.ExecuteNonQuery ();
+		}
+
+		// execute a SQL SELECT Query using ExecuteReader() to retrieve
+		// a IDataReader so we retrieve data
+		static IDataReader SelectData (IDbConnection cnc) {
+	
+			IDbCommand selectCommand = cnc.CreateCommand();
+			IDataReader reader;
+
+			// FIXME: System.Data classes need to handle NULLs
+			//        this would be done by System.DBNull ?
+			// FIXME: System.Data needs to handle more data types
+			/*
+			selectCommand.CommandText = 
+				"select * " +
+				"from mono_postgres_test";
+			*/
+
+			selectCommand.CommandText = 
+				"select " +				
+				"boolean_value, " +
+				"int2_value, " +
+				"int4_value, " +
+				"bigint_value, " +
+				"float_value, " + 
+				"double_value, " +
+				"numeric_value, " +
+				"char_value, " +
+				"varchar_value, " +
+				"text_value, " +
+				"point_value, " +
+				"time_value, " +
+				"date_value, " +
+				"timestamp_value, " +
+				"null_boolean_value, " +
+				"null_int2_value, " +
+				"null_int4_value, " +
+				"null_bigint_value, " +
+				"null_float_value, " + 
+				"null_double_value, " +
+				"null_numeric_value, " +
+				"null_char_value, " +
+				"null_varchar_value, " +
+				"null_text_value, " +
+				"null_point_value, " +
+				"null_time_value, " +
+				"null_date_value, " +
+				"null_timestamp_value " +
+				"from mono_postgres_test";
+
+			reader = selectCommand.ExecuteReader ();
+
+			return reader;
+		}
+
+		// Tests a SQL Command (INSERT, UPDATE, DELETE)
+		// executed via ExecuteReader
+		static IDataReader SelectDataUsingInsertCommand (IDbConnection cnc) {
+	
+			IDbCommand selectCommand = cnc.CreateCommand();
+			IDataReader reader;
+
+			// This is a SQL INSERT Command, not a Query
+			selectCommand.CommandText = 
+				"insert into mono_postgres_test (" +
+				"boolean_value, " +
+				"int2_value, " +
+				"int4_value, " +
+				"bigint_value, " +
+				"float_value, " +
+				"double_value, " +
+				"numeric_value, " +
+				"char_value, " +
+				"varchar_value, " +
+				"text_value, " +
+				"time_value, " +
+				"date_value, " +
+				"timestamp_value, " +
+				"point_value " +
+				") values (" +
+				"'T', " +
+				"-22, " +
+				"1048000, " +
+				"123456789012345, " +
+				"3.141592, " +
+				"3.1415926969696, " +
+				"123456789012.345, " +
+				"'This is a char', " +
+				"'This is a varchar', " +
+				"'This is a text', " +
+				"'21:13:14', " +
+				"'2000-02-29', " +
+				"'2004-02-29 14:00:11.31', " +
+				"'(1,0)' " +
+				")";
+
+			reader = selectCommand.ExecuteReader ();
+
+			return reader;
+		}
+
+		// Tests a SQL Command not (INSERT, UPDATE, DELETE)
+		// executed via ExecuteReader
+		static IDataReader SelectDataUsingCommand (IDbConnection cnc) {
+	
+			IDbCommand selectCommand = cnc.CreateCommand();
+			IDataReader reader;
+
+			// This is a SQL Command, not a Query
+			selectCommand.CommandText = 
+				"SET DATESTYLE TO 'ISO'";
+
+			reader = selectCommand.ExecuteReader ();
+
+			return reader;
+		}
+
+
+		// execute an SQL UPDATE Command using ExecuteNonQuery()
+		static void UpdateData (IDbConnection cnc) {
+	
+			IDbCommand updateCommand = cnc.CreateCommand();		
+		
+			updateCommand.CommandText = 
+				"update mono_postgres_test " +				
+				"set " +
+				"boolean_value = 'F', " +
+				"int2_value    = 5, " +
+				"int4_value    = 3, " +
+				"bigint_value  = 9, " +
+				"char_value    = 'Mono.Data!'   , " +
+				"varchar_value = 'It was not me!', " +
+				"text_value    = 'We got data!'   " +
+				"where int2_value = -22";
+
+			updateCommand.ExecuteNonQuery ();		
+		}
+
+		// used to do a min(), max(), count(), sum(), or avg()
+		// execute SQL SELECT Query using ExecuteScalar
+		static object SelectAggregate (IDbConnection cnc, String agg) {
+	
+			IDbCommand selectCommand = cnc.CreateCommand();
+			object data;
+
+			Console.WriteLine("Aggregate: " + agg);
+
+			selectCommand.CommandType = CommandType.Text;
+			selectCommand.CommandText = 
+				"select " + agg +
+				"from mono_postgres_test";
+
+			data = selectCommand.ExecuteScalar ();
+
+			Console.WriteLine("Agg Result: " + data);
+
+			return data;
+		}
+
+		// used internally by ReadData() to read each result set
+		static void ReadResult(IDataReader rdr, DataTable dt) {
+                        			

+			// number of columns in the table

+			Console.WriteLine("   Total Columns: " +

+				dt.Rows.Count);

+

+			// display the schema

+			foreach (DataRow schemaRow in dt.Rows) {

+				foreach (DataColumn schemaCol in dt.Columns)

+					Console.WriteLine(schemaCol.ColumnName + 

+						" = " + 

+						schemaRow[schemaCol]);

+				Console.WriteLine();

+			}

+

+			int nRows = 0;

+			int c = 0;

+			string output, metadataValue, dataValue;

+			// Read and display the rows

+			Console.WriteLine("Gonna do a Read() now...");

+			while(rdr.Read()) {

+				Console.WriteLine("   Row " + nRows + ": ");

+					

+				for(c = 0; c < rdr.FieldCount; c++) {

+					// column meta data 

+					DataRow dr = dt.Rows[c];

+					metadataValue = 

+						"    Col " + 

+						c + ": " + 

+						dr["ColumnName"];

+						

+					// column data

+					if(rdr.IsDBNull(c) == true)

+						dataValue = " is NULL";

+					else

+						dataValue = 

+							": " + 

+							rdr.GetValue(c);

+					

+					// display column meta data and data

+					output = metadataValue + dataValue;					

+					Console.WriteLine(output);

+				}

+				nRows++;

+			}

+			Console.WriteLine("   Total Rows Retrieved: " + 

+				nRows);	
+		}
+
+		// Used to read data from IDataReader after calling IDbCommand:ExecuteReader()
+		static void ReadData(IDataReader rdr) {
+
+			int results = 0;
+			if(rdr == null) {
+		
+				Console.WriteLine("IDataReader has a Null Reference.");
+			}
+			else {
+				do {

+					DataTable dt = rdr.GetSchemaTable();

+					if(rdr.RecordsAffected != -1) {

+						// Results for 

+						// SQL INSERT, UPDATE, DELETE Commands 

+						// have RecordsAffected >= 0

+						Console.WriteLine("Result is from a SQL Command (INSERT,UPDATE,DELETE).  Records Affected: " + rdr.RecordsAffected);

+					}

+					else if(dt == null)

+						// Results for

+						// SQL Commands not INSERT, UPDATE, nor DELETE

+						// have RecordsAffected == -1

+						// and GetSchemaTable() returns a null reference

+						Console.WriteLine("Result is from a SQL Command not (INSERT,UPDATE,DELETE).   Records Affected: " + rdr.RecordsAffected);

+					else {

+						// Results for

+						// SQL SELECT Queries

+						// have RecordsAffected = -1

+						// and GetSchemaTable() returns a reference to a DataTable

+						Console.WriteLine("Result is from a SELECT SQL Query.  Records Affected: " + rdr.RecordsAffected);

+		

+						results++;

+						Console.WriteLine("Result Set " + results + "...");

+

+						ReadResult(rdr, dt);

+					}

+

+				} while(rdr.NextResult());

+				Console.WriteLine("Total Result sets: " + results);

+			

+				rdr.Close();
+			}
+		}
+		
+		/* Postgres provider tests */
+		static void DoPostgresTest (IDbConnection cnc) {
+
+			IDataReader reader;
+			Object oDataValue;
+
+			Console.WriteLine ("\tPostgres provider specific tests...\n");
+
+			/* Drops the gda_postgres_test table. */
+			Console.WriteLine ("\t\tDrop table: ");
+			try {
+				DropTable (cnc);
+				Console.WriteLine ("OK");
+			}
+			catch (SqlException e) {
+				Console.WriteLine("Error (don't worry about this one)" + e);
+			}
+			
+			try {
+				/* Creates a table with all supported data types */
+				Console.WriteLine ("\t\tCreate table with all supported types: ");
+				CreateTable (cnc);
+				Console.WriteLine ("OK");
+				
+				/* Inserts values */
+				Console.WriteLine ("\t\tInsert values for all known types: ");
+				InsertData (cnc);
+				Console.WriteLine ("OK");
+
+				/* Update values */
+				Console.WriteLine ("\t\tUpdate values: ");
+				UpdateData (cnc);
+				Console.WriteLine ("OK");
+
+				/* Inserts values */
+				Console.WriteLine ("\t\tInsert values for all known types: ");
+				InsertData (cnc);
+				Console.WriteLine ("OK");			
+
+				/* Select aggregates */
+				SelectAggregate (cnc, "count(*)");
+				// FIXME: still having a problem with avg()
+				//        because it returns a decimal.
+				//        It may have something to do
+				//        with culture not being set
+				//        properly.
+				//SelectAggregate (cnc, "avg(int4_value)");
+				SelectAggregate (cnc, "min(text_value)");
+				SelectAggregate (cnc, "max(int4_value)");
+				SelectAggregate (cnc, "sum(int4_value)");
+
+				/* Select values */
+				Console.WriteLine ("\t\tSelect values from the database: ");
+				reader = SelectData (cnc);
+				ReadData(reader);
+
+				/* SQL Command via ExecuteReader/SqlDataReader */
+				/* Command is not INSERT, UPDATE, or DELETE */
+				Console.WriteLine("\t\tCall ExecuteReader with a SQL Command. (Not INSERT,UPDATE,DELETE).");
+				reader = SelectDataUsingCommand(cnc);
+				ReadData(reader);
+
+				/* SQL Command via ExecuteReader/SqlDataReader */
+				/* Command is INSERT, UPDATE, or DELETE */
+				Console.WriteLine("\t\tCall ExecuteReader with a SQL Command. (Is INSERT,UPDATE,DELETE).");
+				reader = SelectDataUsingInsertCommand(cnc);
+				ReadData(reader);
+

+				// Call a Stored Procedure named Version()

+				Console.WriteLine("\t\tCalling stored procedure version()");

+				object obj = CallStoredProcedure(cnc);

+				Console.WriteLine("Result: " + obj);

+

+				Console.WriteLine("Database Server Version: " + 

+					((SqlConnection)cnc).ServerVersion);

+

+				/* Clean up */
+				Console.WriteLine ("Clean up...");
+				Console.WriteLine ("\t\tDrop table...");
+				DropTable (cnc);
+				Console.WriteLine("OK");
+			}
+			catch(Exception e) {
+				Console.WriteLine("Exception caught: " + e);
+			}
+		}
+
+		[STAThread]

+		static void Main(string[] args) {

+			SqlConnection cnc = new SqlConnection ();

+

+			/*

+			string connectionString = 
+				"host=hostname;" +
+				"dbname=database;" +
+				"user=userid;" +
+				"password=password";
+			*/

+

+			string connectionString = 
+				"host=localhost;" +
+				"dbname=test;" +
+				"user=postgres;";
+

+			cnc.ConnectionString =  connectionString;

+

+			cnc.Open();

+			DoPostgresTest(cnc);
+			cnc.Close();
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/ReadPostgresData.cs b/mcs/class/System.Data/Test/ReadPostgresData.cs
new file mode 100644
index 00000000000..c1fc05b0a19
--- /dev/null
+++ b/mcs/class/System.Data/Test/ReadPostgresData.cs
@@ -0,0 +1,585 @@
+//
+// ReadPostgresData.cs
+//
+// Uses the PostgresLibrary to retrieve a recordset.
+// This is not meant to be used in Production, but as a
+// learning aid in coding class System.Data.SqlClient.SqlDataReader.
+//
+// Bits of code were borrowed from libgda.
+//
+// Author:
+//	Daniel Morgan <danmorg@sc.rr.com>
+//
+// (C) 2002 Daniel Morgan
+//
+
+using System;
+using System.Data;
+using System.Runtime.InteropServices;
+using System.Diagnostics;
+
+namespace LearnToCreateSqlDataReader
+{
+	sealed public class PostgresHelper {
+
+		public static object OidTypeToSystem (int oid, string value) {
+			object obj = null;
+
+			Console.WriteLine("===== oid: " + oid + " value: " + value);
+
+			switch(oid) {
+			case 1043: // varchar
+				Console.WriteLine("oid 1023 varchar ==> String found");
+				obj = (object) String.Copy(value); // String
+				break;
+			case 25: // text
+				Console.WriteLine("oid 25 text ==> String found");
+				obj = (object) String.Copy(value); // String
+				break;
+			case 18: // char
+				Console.WriteLine("oid 18 char ==> String found");
+				obj = (object) String.Copy(value); // String
+				break;
+			case 16: // bool
+				Console.WriteLine("oid 16 bool ==> Boolean found");
+				obj = (object) Boolean.Parse(value);
+				break;
+			case 21: // int2

+				Console.WriteLine("oid 21 int2 ==> Int16 found");

+				obj = (object) Int16.Parse(value);

+				break;

+			case 23: // int4

+				Console.WriteLine("oid 23 int4 ==> Int32 found");

+				obj = (object) Int32.Parse(value);

+				break;

+			case 20: // int8

+				Console.WriteLine("oid 20 int8 ==> Int64 found");

+				obj = (object) Int64.Parse(value);

+				break;

+			default:

+				Console.WriteLine("OidTypeToSystem Not Done Yet: oid: " +

+					oid + " Value: " + value);

+				break;

+

+			}
+
+			return obj;
+		}
+
+		public static Type OidToType (int oid) {
+			Type typ = null;
+
+			switch(oid) {
+			case 1043: // varchar
+			case 25: // text
+			case 18: // char
+				typ = typeof(String);
+				break;
+			case 16: // bool
+				typ = typeof(Boolean);
+				break;
+			case 21: // int2

+				typ = typeof(Int16);

+				break;

+			case 23: // int4

+				typ = typeof(Int32);

+				break;

+			case 20: // int8

+				typ = typeof(Int64);

+				break;

+			default:

+				throw new NotImplementedException(

+					"PGNI2: PostgreSQL oid type " + oid +

+					" not mapped to .NET System Type.");

+			}
+			return typ;
+		}
+
+	}
+
+	sealed public class PostgresLibrary {
+
+		public enum ConnStatusType {
+			CONNECTION_OK,
+			CONNECTION_BAD,
+			CONNECTION_STARTED,
+			CONNECTION_MADE,
+			CONNECTION_AWAITING_RESPONSE,
+			CONNECTION_AUTH_OK,			 
+			CONNECTION_SETENV		
+		} 
+
+		public enum PostgresPollingStatusType {
+			PGRES_POLLING_FAILED = 0,
+			PGRES_POLLING_READING,
+			PGRES_POLLING_WRITING,
+			PGRES_POLLING_OK,
+			PGRES_POLLING_ACTIVE
+		}
+
+		public enum ExecStatusType {
+			PGRES_EMPTY_QUERY = 0,
+			PGRES_COMMAND_OK,			
+			PGRES_TUPLES_OK,			
+			PGRES_COPY_OUT,				
+			PGRES_COPY_IN,				
+			PGRES_BAD_RESPONSE,			
+			PGRES_NONFATAL_ERROR,
+			PGRES_FATAL_ERROR
+		}
+
+
+		[DllImport("pq")]
+		public static extern string PQerrorMessage (IntPtr conn);
+		// char *PQerrorMessage(const PGconn *conn);
+
+		[DllImport("pq")]
+		public static extern IntPtr PQconnectdb(String conninfo);
+		// PGconn *PQconnectdb(const char *conninfo)
+
+		[DllImport("pq")]
+		public static extern void PQfinish(IntPtr conn);
+		// void PQfinish(PGconn *conn)
+		
+		[DllImport("pq")]
+		public static extern IntPtr PQexec(IntPtr conn,
+			String query);
+		// PGresult *PQexec(PGconn *conn,	const char *query);
+
+		[DllImport("pq")]
+		public static extern int PQntuples (IntPtr res);
+		// int PQntuples(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQnfields (IntPtr res);
+		// int PQnfields(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern ConnStatusType PQstatus (IntPtr conn);
+		// ConnStatusType PQstatus(const PGconn *conn);
+		[DllImport("pq")]
+		public static extern ExecStatusType PQresultStatus (IntPtr res);
+		// ExecStatusType PQresultStatus(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQresStatus (ExecStatusType status);
+		// char *PQresStatus(ExecStatusType status);
+
+		[DllImport("pq")]
+		public static extern string PQresultErrorMessage (IntPtr res);
+		// char *PQresultErrorMessage(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQbinaryTuples (IntPtr res);
+		// int PQbinaryTuples(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQfname (IntPtr res,
+			int field_num);
+		// char *PQfname(const PGresult *res,
+		//      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfnumber (IntPtr res,
+			string field_name);
+		// int PQfnumber(const PGresult *res, 
+		//      const char *field_name);
+
+
+		[DllImport("pq")]
+		public static extern int PQfmod (IntPtr res, int field_num);
+		// int PQfmod(const PGresult *res, int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQftype (IntPtr res,
+			int field_num);
+		// Oid PQftype(const PGresult *res,
+		//      int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQfsize (IntPtr res,
+			int field_num);
+		// int PQfsize(const PGresult *res,
+		//      int field_num);
+
+		[DllImport("pq")]
+		public static extern string PQcmdStatus (IntPtr res);
+		// char *PQcmdStatus(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQoidStatus (IntPtr res);
+		// char *PQoidStatus(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern int PQoidValue (IntPtr res);
+		// Oid PQoidValue(const PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQcmdTuples (IntPtr res);
+		// char *PQcmdTuples(PGresult *res);
+
+		[DllImport("pq")]
+		public static extern string PQgetvalue (IntPtr res,
+			int tup_num, int field_num);
+		// char *PQgetvalue(const PGresult *res,
+		//      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQgetlength (IntPtr res,
+			int tup_num, int field_num);
+		// int PQgetlength(const PGresult *res,
+		//      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern int PQgetisnull (IntPtr res,
+			int tup_num, int field_num);
+		// int PQgetisnull(const PGresult *res,
+		//      int tup_num, int field_num);
+
+		[DllImport("pq")]
+		public static extern void PQclear (IntPtr res);
+		// void PQclear(PGresult *res);
+
+
+	}
+
+	public class ReadPostgresData
+	{
+
+		static void Test(String sConnInfo) {
+			String errorMessage;
+
+			IntPtr pgConn;
+			PostgresLibrary.ConnStatusType connStatus;
+
+			String sQuery;
+			IntPtr pgResult;
+			
+			sQuery = 
+				"select tid, tdesc, aint4, abpchar " +
+				"from sometable ";
+		
+			pgConn = PostgresLibrary.PQconnectdb (sConnInfo);
+
+			connStatus = PostgresLibrary.PQstatus (pgConn);
+			if(connStatus == 
+				PostgresLibrary.
+				ConnStatusType.CONNECTION_OK) {
+
+				Console.WriteLine("CONNECTION_OK");
+
+				Console.WriteLine("SQL: " + sQuery);
+				pgResult = PostgresLibrary.PQexec(pgConn, sQuery);
+
+				PostgresLibrary.ExecStatusType execStatus;
+			
+				execStatus = PostgresLibrary.
+					PQresultStatus (pgResult);
+
+				if(execStatus == 
+					PostgresLibrary.
+					ExecStatusType.PGRES_TUPLES_OK) 
+				{
+					Console.WriteLine("PGRES_TUPLES_OK");
+					
+					int nRows = PostgresLibrary.
+						PQntuples(pgResult);
+					Console.WriteLine("Rows: " + nRows);
+
+					int nFields = PostgresLibrary.
+						PQnfields(pgResult);
+					Console.WriteLine("Columns: " + nFields);
+
+
+					String fieldName;
+					
+					// get meta data fromm result set (schema)
+					// for each column (field)
+					for(int fieldIndex = 0; 
+						fieldIndex < nFields; 
+						fieldIndex ++) {
+
+						// get column name
+						fieldName = PostgresLibrary.
+							PQfname(pgResult, fieldIndex);
+
+						Console.WriteLine("Field " + 
+							fieldIndex + ": " +
+							fieldName);
+
+						int oid;
+						// get PostgreSQL data type (OID)
+						oid = PostgresLibrary.
+							PQftype(pgResult, fieldIndex);
+
+						Console.WriteLine("Data Type oid: " + oid);
+
+						int definedSize;
+						// get defined size of column
+						definedSize = PostgresLibrary.
+							PQfsize(pgResult, fieldIndex);
+
+						Console.WriteLine("definedSize: " +
+							definedSize);
+					}
+
+					// for each row and column, get the data value
+					for(int row = 0; 
+						row < nRows; 
+						row++) {
+
+						for(int col = 0; 
+							col < nFields; 
+							col++) {
+
+							String value;
+							// get data value
+							value = PostgresLibrary.
+									PQgetvalue(
+										pgResult,
+										row, col);
+
+							Console.WriteLine("Row: " + row +
+									" Col: " + col);
+							Console.WriteLine("Value: " +
+									value);
+
+							int columnIsNull;
+							// is column NULL?
+							columnIsNull = PostgresLibrary.
+								PQgetisnull(pgResult,
+									row, col);
+
+							Console.WriteLine("Data is " + 
+								(columnIsNull == 0 ? "NOT NULL" : "NULL"));
+
+
+							int actualLength;
+							// get Actual Length
+							actualLength = PostgresLibrary.
+								PQgetlength(pgResult,
+									row, col);
+
+							Console.WriteLine("Actual Length: " +
+								actualLength);
+						}
+					}
+
+					// close result set
+					PostgresLibrary.PQclear (pgResult);
+				}
+				else {
+					// display execution error				
+					errorMessage = PostgresLibrary.
+						PQresStatus(execStatus);
+
+					errorMessage += " " + PostgresLibrary.
+						PQresultErrorMessage(pgResult);
+
+					Console.WriteLine(errorMessage);
+				}
+
+				// close database conneciton
+				PostgresLibrary.PQfinish(pgConn);
+
+			}
+			else {
+				errorMessage = PostgresLibrary.
+					PQerrorMessage (pgConn);
+				errorMessage += ": Could not connect to database.";
+				Console.WriteLine(errorMessage);
+			}	
+			
+		}
+
+		public static object ExecuteScalar(string sConnInfo, string sQuery) {
+			object obj = null; // return
+
+			int nRow;
+			int nCol;
+
+			String errorMessage;
+
+			IntPtr pgConn;
+			PostgresLibrary.ConnStatusType connStatus;
+
+			IntPtr pgResult;
+					
+			pgConn = PostgresLibrary.PQconnectdb (sConnInfo);
+
+			connStatus = PostgresLibrary.PQstatus (pgConn);
+			if(connStatus == 
+				PostgresLibrary.
+				ConnStatusType.CONNECTION_OK) {
+
+				Console.WriteLine("CONNECTION_OK");
+
+				pgResult = PostgresLibrary.PQexec(pgConn, sQuery);
+
+				PostgresLibrary.ExecStatusType execStatus;
+
+				execStatus = PostgresLibrary.
+					PQresultStatus (pgResult);
+
+				if(execStatus == 
+					PostgresLibrary.
+					ExecStatusType.PGRES_TUPLES_OK) {
+
+					Console.WriteLine("PGRES_TUPLES_OK");
+					
+					int nRows = PostgresLibrary.
+						PQntuples(pgResult);
+					Console.WriteLine("Rows: " + nRows);
+
+					int nFields = PostgresLibrary.
+						PQnfields(pgResult);
+					Console.WriteLine("Columns: " + nFields);
+					if(nRows > 0 && nFields > 0) {
+						nRow = 0;
+						nCol = 0;
+
+						// get column name
+						String fieldName;
+						fieldName = PostgresLibrary.
+							PQfname(pgResult, nCol);
+
+						Console.WriteLine("Field " + 
+							nCol + ": " +
+							fieldName);
+
+						int oid;
+						
+						// get PostgreSQL data type (OID)
+						oid = PostgresLibrary.
+							PQftype(pgResult, nCol);
+
+						Console.WriteLine("Data Type oid: " + oid);
+
+						int definedSize;
+						// get defined size of column
+						definedSize = PostgresLibrary.
+							PQfsize(pgResult, nCol);
+
+						Console.WriteLine("DefinedSize: " + 
+							definedSize);
+
+						String value;
+						// get data value
+						value = PostgresLibrary.
+							PQgetvalue(
+							pgResult,
+							nRow, nCol);
+                                                
+						Console.WriteLine("Row: " + nRow +
+							" Col: " + nCol);
+						Console.WriteLine("Value: " + value);
+
+						int columnIsNull;
+						// is column NULL?
+						columnIsNull = PostgresLibrary.
+							PQgetisnull(pgResult,
+							nRow, nCol);
+							
+		// isNull = *thevalue != '\0' ? FALSE : PQgetisnull (pg_res, rownum, i);
+
+						Console.WriteLine("Data is " + 
+							(columnIsNull == 0 ? "NOT NULL" : "NULL"));
+
+						int actualLength;
+						// get Actual Length
+						actualLength = PostgresLibrary.
+							PQgetlength(pgResult,
+							nRow, nCol);
+
+						Console.WriteLine("Actual Length: " +
+							actualLength);
+						
+						obj = PostgresHelper.
+							OidTypeToSystem (oid, value);
+					}
+
+					// close result set
+					PostgresLibrary.PQclear (pgResult);
+				}
+				else {
+					// display execution error				
+					errorMessage = PostgresLibrary.
+						PQresStatus(execStatus);
+
+					errorMessage += " " + PostgresLibrary.
+						PQresultErrorMessage(pgResult);
+
+					Console.WriteLine(errorMessage);
+				}
+
+				// close database conneciton
+				PostgresLibrary.PQfinish(pgConn);
+
+			}
+			else {
+				errorMessage = PostgresLibrary.
+					PQerrorMessage (pgConn);
+				errorMessage += ": Could not connect to database.";
+				Console.WriteLine(errorMessage);
+			}
+			
+			return obj;
+		}
+
+		static void TestExecuteScalar(String connString) {
+			String selectStatement;
+
+			try {
+				selectStatement = 
+					"select count(*) " +
+					"from sometable";
+
+				Int64 myCount = (Int64) ExecuteScalar(connString,
+					selectStatement);
+				Console.WriteLine("Count: " + myCount);
+
+				selectStatement = 
+					"select max(tdesc) " +
+					"from sometable";			
+				string myMax = (string) ExecuteScalar(connString,
+					selectStatement);
+				Console.WriteLine("Max: " + myMax);
+			}
+			catch(Exception e) {
+				Console.WriteLine(e);
+			}                        
+			
+		}
+
+		[STAThread]
+		static void Main(string[] args)
+		{
+			// PostgreSQL DBMS Connection String
+			// Notice how the parameters are separated with spaces
+			// An OLE-DB Connection String uses semicolons to
+			// separate parameters.
+			String sConnInfo = 
+				"host=localhost " +
+				"dbname=test " + 
+				"user=postgres";
+
+			Test(sConnInfo);
+
+			TestExecuteScalar(sConnInfo);
+
+			Type t;
+			int oid;
+
+			oid = 1043;
+			t = PostgresHelper.OidToType(oid); // varchar ==> String
+			Console.WriteLine("OidToType varchar oid: " + oid +
+				" ==> t: " + t.ToString());
+
+			oid = 23;
+			t = PostgresHelper.OidToType(oid);  // int4 ==> Int32
+			Console.WriteLine("OidToType int4 oid: " + oid +
+				" ==> t: " + t.ToString());
+
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/SqlSharpCli.cs b/mcs/class/System.Data/Test/SqlSharpCli.cs
new file mode 100644
index 00000000000..87be0b72d8b
--- /dev/null
+++ b/mcs/class/System.Data/Test/SqlSharpCli.cs
@@ -0,0 +1,1214 @@
+//
+// SqlSharpCli.cs - main driver for SqlSharp
+//
+//                    Currently, only working on a command line interface for SqlSharp
+//
+//                    However, once GTK# and System.Windows.Forms are good-to-go,
+//                    I would like to create a SqlSharpGui using this.
+//
+//                    It would be nice if this is included as part of Mono
+//                    extra goodies under Mono.Data.SqlSharp.
+//
+//                    Also, this makes a good Test program for Mono System.Data.
+//                    For more information about Mono::, 
+//                    visit http://www.go-mono.com/
+//
+// To build SqlSharpCli.cs:
+// $ mcs SqlSharpCli.cs -r System.Data.dll
+//
+// To run with mono:
+// $ mono SqlSharpCli.exe
+//
+// To run with mint:
+// $ mint SqlSharpCli.exe
+//
+// To run batch commands and get the output, do something like:
+// $ cat commands.txt | mono SqlSharpCli.exe > results.txt
+//
+// Author:
+//    Daniel Morgan <danmorg@sc.rr.com>
+//
+// (C)Copyright 2002 Daniel Morgan
+//
+
+using System;
+using System.Collections;
+using System.Data;
+using System.Data.Common;
+using System.Data.OleDb;
+using System.Data.SqlClient;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Remoting;
+using System.Text;
+
+namespace Mono.Data.SqlSharp {
+
+	public enum FileFormat {
+		Html,
+		Xml,
+		CommaSeparatedValues,
+		TabSeparated,
+		Normal
+	}
+
+	// SQL Sharp - Command Line Interface
+	public class SqlSharpCli {
+	
+		private IDbConnection conn = null;
+		
+		private string provider = "POSTGRESQL"; // name of internal provider
+		// {OleDb,SqlClient,MySql,Odbc,Oracle,PostgreSql} however, it
+		// can be set to LOADEXTPROVIDER to load an external provider
+		private string providerAssembly = ""; // filename of assembly
+		// for example: "Mono.Data.MySql"
+		private string providerConnectionClass = ""; // Connection class
+		// in the provider assembly that implements the IDbConnection 
+		// interface.  for example: "Mono.Data.MySql.MySqlConnection"
+
+		private StringBuilder build = null; // SQL string to build
+		private string buff = ""; // SQL string buffer
+
+		private string connectionString = 
+			"host=localhost;dbname=test;user=postgres";
+
+		private string inputFilename = "";
+		private string outputFilename = "";
+		private StreamReader inputFilestream = null;
+		private StreamWriter outputFilestream = null;
+
+		private FileFormat outputFileFormat = FileFormat.Html;
+
+		private bool silent = false;
+		private bool showHeader = true;
+
+		private Hashtable internalVariables = new Hashtable();
+		
+		// DisplayResult - used to Read() display a result set
+		//                   called by DisplayData()
+		public void DisplayResult(IDataReader reader, DataTable schemaTable) {
+
+			StringBuilder line = null;
+			StringBuilder hdrUnderline = null;
+			
+			int spacing = 0;
+			int columnSize = 0;
+			int c;
+			
+			char spacingChar = ' '; // a space
+			char underlineChar = '='; // an equal sign
+
+			string dataType; // .NET Type
+			string dataTypeName; // native Database type
+			DataRow row; // schema row
+
+			line = new StringBuilder();
+			hdrUnderline = new StringBuilder();
+
+			OutputLine("Fields in Query Result: " + 
+				reader.FieldCount);
+			OutputLine("");
+			
+			for(c = 0; c < schemaTable.Rows.Count; c++) {
+							
+				DataRow schemaRow = schemaTable.Rows[c];
+				string columnHeader = (string) schemaRow["ColumnName"];
+				int columnHeaderSize = columnHeader.Length;
+				
+				line.Append(columnHeader);
+				hdrUnderline.Append(underlineChar, columnHeaderSize);
+					
+				// spacing
+				columnSize = (int) schemaRow["ColumnSize"];
+				dataType = (string) schemaRow["DataType"];
+				dataTypeName = reader.GetDataTypeName(c);
+				
+				// columnSize correction based on data type
+				if(dataType.Equals("System.Boolean")) {
+					columnSize = 5;
+				}
+				if(provider.Equals("POSTGRESQL"))
+					if(dataTypeName.Equals("text"))				
+						columnSize = 32; // text will be truncated to 32
+
+				if(columnHeaderSize < columnSize) {
+					spacing = columnSize - columnHeaderSize;
+					line.Append(spacingChar, spacing);
+					hdrUnderline.Append(underlineChar, spacing);
+				}
+				line.Append(" ");
+				hdrUnderline.Append(" ");
+			}
+			OutputHeader(line.ToString());
+			line = null;
+			
+			OutputHeader(hdrUnderline.ToString());
+			OutputHeader("");
+			hdrUnderline = null;
+			
+			// DEBUG - need to know the columnSize
+			/*
+			line = new StringBuilder();
+			foreach(DataRow schemaRow in schemaTable.Rows) {
+				columnSize = (int) schemaRow["ColumnSize"];
+				line.Append(columnSize.ToString());
+				line.Append(" ");
+			}		
+			Console.WriteLine(line.ToString());
+			Console.WriteLine();
+			line = null;
+			*/
+								
+			int rows = 0;
+
+			// column data
+			while(reader.Read()) {
+				rows++;
+
+				line = new StringBuilder();
+				for(c = 0; c < reader.FieldCount; c++) {
+					int dataLen = 0;
+					string dataValue;
+					
+					row = schemaTable.Rows[c];
+					string colhdr = (string) row["ColumnName"];
+					columnSize = (int) row["ColumnSize"];
+					dataType = (string) row["DataType"];
+					dataTypeName = reader.GetDataTypeName(c);
+					
+					// certain types need to have the
+					// columnSize adjusted for display
+					// so the column will line up for each
+					// row and match the column header size
+					if(dataType.Equals("System.Boolean")) {
+						columnSize = 5;
+					}
+					if(provider.Equals("POSTGRESQL"))
+						if(dataTypeName.Equals("text"))				
+							columnSize = 32; // text will be truncated to 32
+												
+					if(reader.IsDBNull(c)) {
+						dataValue = "";
+						dataLen = 0;
+					}
+					else {
+						object obj = reader.GetValue(c);						
+							
+						dataValue = obj.ToString();
+						dataLen = dataValue.Length;
+						line.Append(dataValue);
+					}
+					line.Append(" ");
+
+					// spacing
+					spacingChar = ' ';
+					if(dataLen < columnSize) {
+						spacing = columnSize - dataLen;
+						line.Append(spacingChar, spacing);
+					}
+					spacingChar = ' ';
+					if(columnSize < colhdr.Length) {
+						spacing = colhdr.Length - columnSize;
+						line.Append(spacingChar, spacing);
+					}
+						
+				}
+				OutputData(line.ToString());
+				line = null;
+			}
+			OutputLine("\nRows retrieved: " + rows.ToString());
+		}
+		
+		public void OutputDataToHtmlFile(IDataReader rdr, DataTable dt) {
+                        		

+			StringBuilder strHtml = new StringBuilder();

+

+			strHtml.Append("<html> \n <head> <title>");

+			strHtml.Append("Results");

+			strHtml.Append("</title> </head>");

+			strHtml.Append("<body>");

+			strHtml.Append("<h1> Results </h1>");

+			strHtml.Append("<table border=1>");

+		

+			outputFilestream.WriteLine(strHtml.ToString());

+

+			strHtml = null;

+			strHtml = new StringBuilder();

+

+			strHtml.Append("<tr>");

+			foreach (DataRow schemaRow in dt.Rows) {

+				strHtml.Append("<td> <b>");

+				object dataObj = schemaRow["ColumnName"];

+				string sColumnName = dataObj.ToString();

+				strHtml.Append(sColumnName);

+				strHtml.Append("</b> </td>");

+			}

+			strHtml.Append("</tr>");

+			outputFilestream.WriteLine(strHtml.ToString());

+			strHtml = null;

+

+			int col = 0;

+			string dataValue = "";

+			

+			while(rdr.Read()) {

+				strHtml = new StringBuilder();

+

+				strHtml.Append("<tr>");

+				for(col = 0; col < rdr.FieldCount; col++) {

+						

+					// column data

+					if(rdr.IsDBNull(col) == true)

+						dataValue = "NULL";

+					else {

+						object obj = rdr.GetValue(col);

+						dataValue = obj.ToString();

+					}

+					strHtml.Append("<td>");

+					strHtml.Append(dataValue);

+					strHtml.Append("</td>");

+				}

+				strHtml.Append("\t\t</tr>");

+				outputFilestream.WriteLine(strHtml.ToString());

+				strHtml = null;

+			}

+			outputFilestream.WriteLine(" </table> </body> \n </html>");

+			strHtml = null;

+		}
+		
+		// DisplayData - used to display any Result Sets
+		//                 from execution of SQL SELECT Query or Queries
+		//                 called by DisplayData. 
+		//                 ExecuteSql() only calls this function
+		//                 for a Query, it does not get
+		//                 for a Command.
+		public void DisplayData(IDataReader reader) {
+
+			DataTable schemaTable = null;
+			int ResultSet = 0;
+
+			OutputLine("Display any result sets...");
+
+			do {
+				// by Default, SqlDataReader has the 
+				// first Result set if any
+
+				ResultSet++;
+				OutputLine("Display the result set " + ResultSet);
+				
+				schemaTable = reader.GetSchemaTable();
+				
+				if(reader.RecordsAffected >= 0) {
+					// SQL Command (INSERT, UPDATE, or DELETE)
+					// RecordsAffected >= 0
+					Console.WriteLine("SQL Command Records Affected: " + reader.RecordsAffected);
+				}
+				else if(schemaTable == null) {
+					// SQL Command (not INSERT, UPDATE, nor DELETE)
+					// RecordsAffected -1 and DataTable has a null reference
+					Console.WriteLine("SQL Command Executed.");
+				}
+				else {
+					// SQL Query (SELECT)
+					// RecordsAffected -1 and DataTable has a reference
+					OutputQueryResult(reader, schemaTable);
+				}
+
+				// get next result set (if anymore is left)
+			} while(reader.NextResult());
+		}
+
+		public void OutputQueryResult(IDataReader dreader, DataTable dtable) {
+			if(outputFilestream == null) {
+				DisplayResult(dreader, dtable);
+			}
+			else {
+				switch(outputFileFormat) {
+				case FileFormat.Normal:
+					DisplayResult(dreader, dtable);
+					break;
+				case FileFormat.Html:
+					OutputDataToHtmlFile(dreader, dtable);
+					break;
+				default:
+					Console.WriteLine("Error: Output data file format not supported.");
+					break;
+				}
+			}
+		}
+
+		public void BuildParameters(IDbCommand cmd) {
+			ParametersBuilder parmsBuilder = 

+				new ParametersBuilder(cmd, 

+				BindVariableCharacter.Semicolon);

+			

+			Console.WriteLine("GetParms...");

+			parmsBuilder.ParseParameters();

+			IList parms = (IList) cmd.Parameters;

+		

+			Console.WriteLine("Print each parm...");

+			for(int p = 0; p < parms.Count; p++) {

+				string theParmName;

+

+				IDataParameter prm = (IDataParameter) parms[p];

+				theParmName = prm.ParameterName;

+				

+				string inValue = "";

+				bool found;

+				found = GetInternalVariable(theParmName, out inValue);

+				if(found == true) {

+					prm.Value = inValue;

+				}

+				else {

+					Console.Write("Enter Parameter " + (p + 1).ToString() +

+						": " + theParmName + ": ");

+					inValue = Console.ReadLine();

+					prm.Value = inValue;

+				}

+			}
+			parmsBuilder = null;
+		}
+
+		// ExecuteSql - Execute the SQL Command(s) and/or Query(ies)
+		public void ExecuteSql(string sql) {
+			
+			Console.WriteLine("Execute SQL: " + sql);
+
+			IDbCommand cmd = null;
+			IDataReader reader = null;
+
+			cmd = conn.CreateCommand();
+
+			// set command properties
+			cmd.CommandType = CommandType.Text;
+			cmd.CommandText = sql;
+			cmd.Connection = conn;
+
+			BuildParameters(cmd);
+
+			try {
+				reader = cmd.ExecuteReader();
+				DisplayData(reader);
+				reader.Close();
+				reader = null;
+			}
+			catch(Exception e) {
+				Console.WriteLine("Exception Caught Executing SQL: " + e);
+				//if(reader != null) {
+				//	if(reader.IsClosed == false)
+				//		reader.Close();
+				reader = null;
+				//}
+			}
+			finally {
+				// cmd.Dispose();
+				cmd = null;
+			}
+		}
+
+		// ExecuteSql - Execute the SQL Commands (no SELECTs)
+		public void ExecuteSqlNonQuery(string sql) {
+			
+			Console.WriteLine("Execute SQL Non Query: " + sql);
+
+			IDbCommand cmd = null;
+			int rowsAffected = -1;
+			
+			cmd = conn.CreateCommand();
+
+			// set command properties
+			cmd.CommandType = CommandType.Text;
+			cmd.CommandText = sql;
+			cmd.Connection = conn;
+
+			BuildParameters(cmd);
+
+			try {
+				rowsAffected = cmd.ExecuteNonQuery();
+				cmd = null;
+				Console.WriteLine("Rows affected: " + rowsAffected);
+			}
+			catch(Exception e) {
+				Console.WriteLine("Exception Caught Executing SQL: " + e);
+			}
+			finally {
+				// cmd.Dispose();
+				cmd = null;
+			}
+		}
+
+		public void ExecuteSqlScalar(string sql) {
+			Console.WriteLine("Execute SQL Non Query: " + sql);
+
+			IDbCommand cmd = null;
+			string retrievedValue = "";
+			
+			cmd = conn.CreateCommand();
+
+			// set command properties
+			cmd.CommandType = CommandType.Text;
+			cmd.CommandText = sql;
+			cmd.Connection = conn;
+
+			BuildParameters(cmd);
+
+			try {
+				retrievedValue = (string) cmd.ExecuteScalar().ToString();
+				Console.WriteLine("Retrieved value: " + retrievedValue);
+			}
+			catch(Exception e) {
+				Console.WriteLine("Exception Caught Executing SQL: " + e);
+			}
+			finally {
+				// cmd.Dispose();
+				cmd = null;
+			}
+		}
+
+		public void ExecuteSqlXml(string sql) {
+			Console.WriteLine("Error: Not implemented yet.");
+		}
+
+		// like ShowHelp - but only show at the beginning
+		// only the most important commands are shown
+		// like help and quit
+		public void StartupHelp() {
+			Console.WriteLine(@"Type:  \Q to quit");
+			Console.WriteLine(@"       \ConnectionString to set the ConnectionString");
+			Console.WriteLine(@"       \Provider to set the Provider:");
+			Console.WriteLine(@"                 {OleDb,SqlClient,MySql,Odbc,");
+			Console.WriteLine(@"                  Oracle,PostgreSql)");
+			Console.WriteLine(@"       \Open to open the connection");
+			Console.WriteLine(@"       \Close to close the connection");
+			Console.WriteLine(@"       \Execute to execute SQL command(s)/queries(s)");
+			Console.WriteLine(@"       \h to show this help.");
+			Console.WriteLine(@"       \defaults to show default variables.");
+			Console.WriteLine();
+		}
+
+		// ShowHelp - show the help - command a user can enter
+		public void ShowHelp() {
+			Console.WriteLine("");
+			Console.WriteLine(@"Type:  \Q to quit");
+			Console.WriteLine(@"       \ConnectionString to set the ConnectionString");
+			Console.WriteLine(@"       \Provider to set the Provider:");
+			Console.WriteLine(@"                 {OleDb,SqlClient,MySql,Odbc,");
+			Console.WriteLine(@"                  Oracle,PostgreSql}");
+			Console.WriteLine(@"       \Open to open the connection");
+			Console.WriteLine(@"       \Close to close the connection");
+			Console.WriteLine(@"       \Execute to execute SQL command(s)/queries(s)");
+			Console.WriteLine(@"       \exenonquery execute an SQL non query (not a SELECT).");
+			Console.WriteLine(@"       \exescalar execute SQL to get a single row/single column result.");
+			Console.WriteLine(@"       \f FILENAME to read a batch of Sql# commands/queries from.");
+			Console.WriteLine(@"       \o FILENAME to write out the result of commands executed.");
+			Console.WriteLine(@"       \load FILENAME to load from file SQL commands into SQL buffer.");
+			Console.WriteLine(@"       \save FILENAME to save SQL commands from SQL buffer to file.");
+			Console.WriteLine(@"       \h to show this help.");
+			Console.WriteLine(@"       \defaults to show default variables, such as,");
+			Console.WriteLine(@"            Provider and ConnectionString.");
+			Console.WriteLine(@"       \s {TRUE, FALSE} to silent messages.");
+			Console.WriteLine(@"       \r reset (clear) the query buffer.");
+			Console.WriteLine(@"       \set NAME VALUE - set an internal variable.");
+			Console.WriteLine(@"       \unset NAME - remove an internal variable.");
+			Console.WriteLine(@"       \variable NAME - display the value of an internal variable.");
+			Console.WriteLine(@"       \loadprovider CLASS - load the provider");
+			Console.WriteLine(@"            use the complete name of its connection class.");
+			Console.WriteLine(@"       \loadextprovider ASSEMBLY CLASS - load the provider"); 
+			Console.WriteLine(@"            use the complete name of its assembly and");
+			Console.WriteLine(@"            its Connection class.");
+			Console.WriteLine(@"       \print - show what's in the SQL buffer now.");
+			Console.WriteLine();
+		}
+
+		// ShowDefaults - show defaults for connection variables
+		public void ShowDefaults() {
+			Console.WriteLine();
+			Console.WriteLine("The default Provider is " + provider);
+			if(provider.Equals("LOADEXTPROVIDER")) {
+				Console.WriteLine("          Assembly: " + 
+					providerAssembly);
+				Console.WriteLine("  Connection Class: " + 
+					providerConnectionClass);
+			}
+			Console.WriteLine();
+			Console.WriteLine("The default ConnectionString is: ");
+			Console.WriteLine("    \"" + connectionString + "\"");
+			Console.WriteLine();
+		}
+
+		// OpenDataSource - open connection to the data source
+		public void OpenDataSource() {
+			
+			Console.WriteLine("Attempt to Open...");
+
+			try {
+				switch(provider) {
+				case "OLEDB":
+					conn = new OleDbConnection();
+					break;
+				case "POSTGRESQL":
+					conn = new SqlConnection();
+					break;
+				case "LOADEXTPROVIDER":
+					if(LoadExternalProvider() == false)
+						return;
+					break;
+				default:
+					Console.WriteLine("Error: Bad argument or provider not supported.");
+					return;
+				}
+			}
+			catch(Exception e) {
+				Console.WriteLine("Error: Unable to create Connection object. " + e);
+				return;
+			}
+
+			conn.ConnectionString = connectionString;
+			
+			try {
+				conn.Open();
+				if(conn.State == ConnectionState.Open)
+					Console.WriteLine("Open was successfull.");
+			}
+			catch(Exception e) {
+				Console.WriteLine("Exception Caught Opening. " + e);
+				conn = null;
+			}
+		}
+
+		// CloseDataSource - close the connection to the data source
+		public void CloseDataSource() {
+			
+			if(conn != null) {
+				Console.WriteLine("Attempt to Close...");
+				try {
+					conn.Close();
+					Console.WriteLine("Close was successfull.");
+				}
+				catch(Exception e) {
+					Console.WriteLine("Exeception Caught Closing. " + e);
+				}
+				conn = null;
+			}
+		}
+
+		// ChangeProvider - change the provider string variable
+		public void ChangeProvider(string[] parms) {
+
+			if(parms.Length == 2) {
+				string parm = parms[1].ToUpper();
+				switch(parm) {
+				case "ORACLE":
+				case "ODBC":
+					Console.WriteLine("Error: Provider not currently supported.");
+					break;
+				case "MYSQL":
+					string[] extp = new string[3] {
+									      "\\loadextprovider",
+									      "Mono.Data.MySql",
+									      "Mono.Data.MySql.MySqlConnection"};
+					SetupExternalProvider(extp);
+					break;		
+				case "SQLCLIENT":
+					provider = "POSTGRESQL";
+					Console.WriteLine("Warning: Currently, the SqlClient provider is the PostgreSQL provider.");
+					break;
+				case "GDA":
+					provider = "OLEDB";
+					break;
+				case "OLEDB":
+				case "POSTGRESQL":
+					provider = parm;
+					break;
+				default:
+					Console.WriteLine("Error: " + "Bad argument or Provider not supported.");
+					break;
+				}
+				Console.WriteLine("The default Provider is " + provider);
+				if(provider.Equals("LOADEXTPROVIDER")) {
+					Console.WriteLine("          Assembly: " + 
+						providerAssembly);
+					Console.WriteLine("  Connection Class: " + 
+						providerConnectionClass);
+				}
+			}
+			else
+				Console.WriteLine("Error: provider only has one parameter.");
+		}
+
+		// ChangeConnectionString - change the connection string variable
+		public void ChangeConnectionString(string entry) {
+			
+			if(entry.Length > 18)
+				connectionString = entry.Substring(18, entry.Length - 18);
+			else
+				connectionString = "";
+		}
+
+		public void ReadCommandsFromFile(StreamReader inCmds) {
+		}
+
+		public void SetupOutputResultsFile(string[] parms) {

+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters");
+				return;
+			}
+			try {
+				outputFilestream = new StreamWriter(parms[1]);
+			}
+			catch(Exception e) {

+				Console.WriteLine("Error: Unable to setup output results file. " + e);

+				return;

+			}
+		}
+
+		public void SetupInputCommandsFile(string[] parms) {
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters");
+				return;
+			}
+			try {
+				inputFilestream = new StreamReader(parms[1]);
+			}
+			catch(Exception e) {

+				Console.WriteLine("Error: Unable to setup input commmands file. " + e);

+				return;

+			}	
+		}
+
+		public void LoadBufferFromFile(string[] parms) {
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters");
+				return;
+			}
+			string inFilename = parms[1];
+			try {
+				StreamReader sr = new StreamReader( inFilename);

+				StringBuilder buffer = new StringBuilder();

+				string NextLine;

+			

+				while((NextLine = sr.ReadLine()) != null) {

+					buffer.Append(NextLine);

+					buffer.Append("\n");

+				}

+				sr.Close();

+				buff = buffer.ToString();

+				build = null;

+				build = new StringBuilder();

+				build.Append(buff);

+			}

+			catch(Exception e) {

+				Console.WriteLine("Error: Unable to read file into SQL Buffer. " + e);

+			}

+		}
+
+		public void SaveBufferToFile(string[] parms) {
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters");
+				return;
+			}
+			string outFilename = parms[1];
+			try {
+				StreamWriter sw = new StreamWriter(outFilename);

+				sw.WriteLine(buff);

+				sw.Close();
+			}
+			catch(Exception e) {
+				Console.WriteLine("Error: Could not save SQL Buffer to file." + e);
+			}
+		}
+
+		public void SetupSilentMode(string[] parms) {
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters");
+				return;
+			}
+			string parm = parms[1].ToUpper();
+			if(parm.Equals("TRUE"))
+				silent = true;
+			else if(parm.Equals("FALSE"))
+				silent = false;
+			else
+				Console.WriteLine("Error: invalid parameter.");
+		}
+

+		public void SetInternalVariable(string[] parms) {
+			if(parms.Length < 2) {
+				Console.WriteLine("Error: wrong number of parameters.");
+				return;
+			}
+			string parm = parms[1];
+			StringBuilder ps = new StringBuilder();
+			
+			for(int i = 2; i < parms.Length; i++)
+				ps.Append(parms[i]);
+
+			internalVariables[parm] = ps.ToString();
+		}
+
+		public void UnSetInternalVariable(string[] parms) {
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters.");
+				return;
+			}
+			string parm = parms[1];
+
+			try {
+				internalVariables.Remove(parm);
+			}
+			catch(Exception e) {
+				Console.WriteLine("Error: internal variable does not exist.");
+			}
+		}
+
+		public void ShowInternalVariable(string[] parms) {
+			string internalVariableValue = "";
+
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters.");
+				return;
+			}
+						
+			string parm = parms[1];
+
+			if(GetInternalVariable(parm, out internalVariableValue) == true)
+				Console.WriteLine("Internal Variable - Name: " + 
+					parm + "  Value: " + internalVariableValue);
+		}
+
+		public bool GetInternalVariable(string name, out string sValue) {
+			sValue = "";
+			bool valueReturned = false;
+
+			try {
+				if(internalVariables.ContainsKey(name) == true) {
+					sValue = (string) internalVariables[name];
+					valueReturned = true;
+				}
+				else
+					Console.WriteLine("Error: internal variable does not exist.");
+
+			}
+			catch(Exception e) {
+				Console.WriteLine("Error: internal variable does not exist.");
+			}
+			return valueReturned;
+		}
+
+		// to be used for loading .NET Data Providers that exist in
+		// the System.Data assembly, but are not explicitly handling
+		// in SQL#
+		public void LoadProvider(string[] parms) {
+			Console.WriteLine("Error: not implemented yet.");			
+		}
+
+		public void SetupExternalProvider(string[] parms) {
+			if(parms.Length != 3) {
+				Console.WriteLine("Error: Wrong number of parameters.");
+				return;
+			}
+			provider = "LOADEXTPROVIDER";
+			providerAssembly = parms[1];
+			providerConnectionClass = parms[2];
+		}
+
+		public bool LoadExternalProvider() {
+			
+			bool success = false;
+
+			// For example: for the MySQL provider in Mono.Data.MySql
+			//   \LoadExtProvider Mono.Data.MySql Mono.Data.MySql.MySqlConnection
+			//   \ConnectionString dbname=test
+			//   \open
+			//   insert into sometable (tid, tdesc, aint) values ('abc','def',12)
+			//   \exenonquery
+			//   \close
+			//   \quit
+
+			try {
+				Console.WriteLine("Loading external provider...");
+				Console.Out.Flush();
+
+				Assembly ps = Assembly.Load(providerAssembly);
+				Type typ = ps.GetType(providerConnectionClass);
+				conn = (IDbConnection) Activator.CreateInstance(typ);
+				success = true;
+				
+				Console.WriteLine("External provider loaded.");
+				Console.Out.Flush();
+			}
+			catch(FileNotFoundException f) {
+				Console.WriteLine("Error: unable to load the assembly of the provider: " + 
+					providerAssembly);
+			}
+			return success;
+		}
+
+		// used for outputting message, but if silent is set,
+		// don't display
+		public void OutputLine(string line) {
+			if(silent == false)
+				OutputData(line);
+		}
+
+		// used for outputting the header columns of a result
+		public void OutputHeader(string line) {
+			if(showHeader == true)
+				OutputData(line);
+		}
+
+		// OutputData() - used for outputting data
+		//  if an output filename is set, then the data will
+		//  go to a file; otherwise, it will go to the Console.
+		public void OutputData(string line) {
+			if(outputFilestream == null)
+				Console.WriteLine(line);
+			else
+				outputFilestream.WriteLine(line);
+		}
+
+		// HandleCommand - handle SqlSharpCli commands entered
+		public void HandleCommand(string entry) {		
+			string[] parms;
+			
+			parms = entry.Split(new char[1] {' '});
+			string userCmd = parms[0].ToUpper();
+
+			switch(userCmd) {
+			case "\\PROVIDER":
+				ChangeProvider(parms);
+				break;
+			case "\\CONNECTIONSTRING":
+				ChangeConnectionString(entry);
+				break;
+			case "\\LOADPROVIDER":
+				// TODO:
+				//SetupProvider(parms);
+				break;
+			case "\\LOADEXTPROVIDER":
+				SetupExternalProvider(parms);
+				break;
+			case "\\OPEN":
+				OpenDataSource();
+				break;
+			case "\\CLOSE":
+				CloseDataSource();
+				break;
+			case "\\S":
+				SetupSilentMode(parms);
+				break;
+			case "\\E":
+			case "\\EXECUTE":
+				// Execute SQL Commands or Queries
+				if(conn == null)
+					Console.WriteLine("Error: connection is not Open.");
+				else if(conn.State == ConnectionState.Closed)
+					Console.WriteLine("Error: connection is not Open.");
+				else {
+					if(build == null)
+						Console.WriteLine("Error: SQL Buffer is empty.");
+					else {
+						buff = build.ToString();
+						ExecuteSql(buff);
+					}
+					build = null;
+				}
+				break;
+			case "\\EXENONQUERY":
+				if(conn == null)
+					Console.WriteLine("Error: connection is not Open.");
+				else if(conn.State == ConnectionState.Closed)
+					Console.WriteLine("Error: connection is not Open.");
+				else {
+					if(build == null)
+						Console.WriteLine("Error: SQL Buffer is empty.");
+					else {
+						buff = build.ToString();
+						ExecuteSqlNonQuery(buff);
+					}
+					build = null;
+				}
+				break;
+			case "\\EXESCALAR":
+				if(conn == null)
+					Console.WriteLine("Error: connection is not Open.");
+				else if(conn.State == ConnectionState.Closed)
+					Console.WriteLine("Error: connection is not Open.");
+				else {
+					if(build == null)
+						Console.WriteLine("Error: SQL Buffer is empty.");
+					else {
+						buff = build.ToString();
+						ExecuteSqlScalar(buff);
+					}
+					build = null;
+				}
+				break;
+			case "\\F":
+				SetupInputCommandsFile(parms);
+				break;
+			case "\\O":
+				SetupOutputResultsFile(parms);
+				break;
+			case "\\LOAD":
+				// Load file into SQL buffer: \load FILENAME
+				LoadBufferFromFile(parms);
+				break;
+			case "\\SAVE":
+				// Save SQL buffer to file: \save FILENAME
+				SaveBufferToFile(parms);
+				break;
+			case "\\H":
+			case "\\HELP":
+				// Help
+				ShowHelp();
+				break;
+			case "\\DEFAULTS":
+				// show the defaults for provider and connection strings
+				ShowDefaults();
+				break;
+			case "\\Q": 
+			case "\\QUIT":
+				// Quit
+				break;
+			case "\\R": 
+				// reset (clear) the query buffer
+				build = null;
+				break;
+			case "\\SET":
+				// sets internal variable
+				// \set name value
+				SetInternalVariable(parms);
+				break;
+			case "\\UNSET":
+				// deletes internal variable
+				// \unset name
+				UnSetInternalVariable(parms);
+				break;
+			case "\\VARIABLE":
+				ShowInternalVariable(parms);
+				break;
+			case "\\PRINT":
+				if(build == null)
+					Console.WriteLine("SQL Buffer is empty.");
+				else
+					Console.WriteLine("SQL Bufer\n" + buff);
+			default:
+				// Error
+				Console.WriteLine("Error: Unknown user command.");
+				break;
+			}
+		}
+
+		public void DealWithArgs(string[] args) {
+			for(int a = 0; a < args.Length; a++) {
+				if(args[a].Substring(0,1).Equals("-")) {
+					string arg = args[a].ToUpper().Substring(1, args[a].Length - 1);
+					switch(arg) {
+					case "S":
+						silent = true;
+						break;
+					case "F":		
+						if(a + 1 >= args.Length)
+							Console.WriteLine("Error: Missing FILENAME for -f switch");
+						else {
+							inputFilename = args[a + 1];
+							inputFilestream = new StreamReader(inputFilename);
+						}
+						break;
+					case "O":
+						if(a + 1 >= args.Length)
+							Console.WriteLine("Error: Missing FILENAME for -o switch");
+						else {
+							outputFilename = args[a + 1];
+							outputFilestream = new StreamWriter(outputFilename);
+						}
+						break;
+					default:
+						Console.WriteLine("Error: Unknow switch: " + args[a]);
+						break;
+					}
+				}
+			}
+		}
+		
+		public string ReadSqlSharpCommand() {
+			string entry = "";
+
+			if(inputFilestream == null) {
+				Console.Write("\nSQL# ");
+				entry = Console.ReadLine();		
+			}
+			else {
+				try {
+					entry = inputFilestream.ReadLine();
+					if(entry == null) {
+						Console.WriteLine("Executing SQL# Commands from file done.");
+					}
+				}
+				catch(Exception e) {
+					Console.WriteLine("Error: Reading command from file.");
+				}
+				Console.Write("\nSQL# ");
+				entry = Console.ReadLine();
+			}
+			return entry;
+		}
+		
+		public void Run(string[] args) {
+
+			DealWithArgs(args);
+
+			string entry = "";
+			build = null;
+
+			if(silent == false) {
+				Console.WriteLine("Welcome to SQL#. The interactive SQL command-line client ");
+				Console.WriteLine("for Mono.Data.  See http://www.go-mono.com/ for more details.\n");
+						
+				StartupHelp();
+				ShowDefaults();
+			}
+			
+			while(entry.ToUpper().Equals("\\Q") == false &&
+				entry.ToUpper().Equals("\\QUIT") == false) {
+				
+				entry = ReadSqlSharpCommand();			
+				
+				if(entry.Substring(0,1).Equals("\\")) {
+					HandleCommand(entry);
+				}
+				else if(entry.IndexOf(";") >= 0) {
+					// most likely the end of SQL Command or Query found
+					// execute the SQL
+					if(conn == null)
+						Console.WriteLine("Error: connection is not Open.");
+					else if(conn.State == ConnectionState.Closed)
+						Console.WriteLine("Error: connection is not Open.");
+					else {
+						if(build == null) {
+							build = new StringBuilder();
+						}
+						build.Append(entry);
+						build.Append("\n");
+						buff = build.ToString();
+						ExecuteSql(buff);
+						build = null;
+					}
+				}
+				else {
+					// most likely a part of a SQL Command or Query found
+					// append this part of the SQL
+					if(build == null) {
+						build = new StringBuilder();
+					}
+					build.Append(entry + "\n");
+					buff = build.ToString();
+				}
+			}			
+			CloseDataSource();
+			if(outputFilestream != null)
+				outputFilestream.Close();
+		}
+	}
+
+	enum BindVariableCharacter {

+		Semicolon,    // ';'

+		At,           // '@'

+		QuestionMark  // '?'

+	}

+

+	public class ParametersBuilder {

+

+		private BindVariableCharacter bindCharSetting;

+		private char bindChar;

+		private IDataParameterCollection parms;

+		private string sql;

+		private IDbCommand cmd;

+			

+		private void SetBindCharacter() {

+			switch(bindCharSetting) {

+			case BindVariableCharacter.Semicolon:

+				bindChar = ':';

+				break;

+			case BindVariableCharacter.At:

+				bindChar = '@';

+				break;

+			case BindVariableCharacter.QuestionMark:

+				bindChar = '?';

+				break;

+			}

+		}

+

+		public ParametersBuilder(IDbCommand command, BindVariableCharacter bindVarChar) {

+			cmd = command;

+			sql = cmd.CommandText;

+			parms = cmd.Parameters;

+			bindCharSetting = bindVarChar;

+			SetBindCharacter();

+		}	

+

+		public int ParseParameters() {	

+

+			int numParms = 0;

+

+			IDataParameterCollection parms = cmd.Parameters;

+

+			char[] chars = sql.ToCharArray();

+			bool bStringConstFound = false;

+

+			for(int i = 0; i < chars.Length; i++) {

+				if(chars[i] == '\'') {

+					if(bStringConstFound == true)

+						bStringConstFound = false;

+					else

+						bStringConstFound = true;

+				}

+				else if(chars[i] == bindChar && 

+					bStringConstFound == false) {

+					StringBuilder parm = new StringBuilder();

+					i++;

+					while(i <= chars.Length) {

+						char ch;

+						if(i == chars.Length)

+							ch = ' '; // a space

+						else

+							ch = chars[i];

+

+						if(Char.IsLetterOrDigit(ch)) {

+							parm.Append(ch);

+						}

+						else {

+

+							string p = parm.ToString();

+							AddParameter(p);

+							numParms ++;

+							break;

+						}

+						i++;

+					}

+					i--;

+				}			

+			}

+			return numParms;

+		}

+

+		public void AddParameter (string p) {

+			Console.WriteLine("Add Parameter: " + p);

+			if(parms.Contains(p) == false) {

+				IDataParameter prm = cmd.CreateParameter();

+				prm.ParameterName = p;

+				prm.Direction = ParameterDirection.Input;

+				prm.DbType = DbType.String; // default

+				prm.Value = ""; // default

+				cmd.Parameters.Add(prm);

+			}

+		}

+	}
+
+	public class SqlSharpDriver {
+		public static void Main(string[] args) {
+			SqlSharpCli sqlCommandLineEngine = new SqlSharpCli();
+			sqlCommandLineEngine.Run(args);
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/System.Data.SqlTypes/AllTests.cs b/mcs/class/System.Data/Test/System.Data.SqlTypes/AllTests.cs
new file mode 100644
index 00000000000..41df325d247
--- /dev/null
+++ b/mcs/class/System.Data/Test/System.Data.SqlTypes/AllTests.cs
@@ -0,0 +1,27 @@
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Data.SqlTypes
+{
+	/// <summary>
+	///   Combines all unit tests for the System.Data.dll assembly
+	///   into one test suite.
+	/// </summary>
+	public class AllTests : TestCase
+	{
+		public AllTests (string name) : base (name) {}
+
+		public static ITest Suite {
+			get {
+				TestSuite suite =  new TestSuite ();
+				suite.AddTest (new TestSuite (typeof (SqlInt32Test)));
+				return suite;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt32Test.cs b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt32Test.cs
new file mode 100644
index 00000000000..4cd335ce17c
--- /dev/null
+++ b/mcs/class/System.Data/Test/System.Data.SqlTypes/SqlInt32Test.cs
@@ -0,0 +1,413 @@
+// SqlInt32Test.cs - NUnit Test Cases for System.Data.SqlTypes.SqlInt32

+//

+// Tim Coleman (tim@timcoleman.com)

+//

+// (C) Tim Coleman

+// 

+

+using NUnit.Framework;

+using System;

+using System.Data;

+using System.Data.SqlTypes;

+

+namespace MonoTests.System.Data.SqlTypes

+{

+	public class SqlInt32Test : TestCase 

+	{

+		

+		public SqlInt32Test() : base ("System.Data.SqlTypes.SqlInt32") {}

+		public SqlInt32Test(string name) : base(name) {}

+

+		protected override void SetUp() {}

+

+		protected override void TearDown() {}

+

+		public static ITest Suite {

+			get { 

+				return new TestSuite(typeof(SqlInt32)); 

+			}

+		}

+

+		public void TestCreate ()  

+		{

+			SqlInt32 foo = new SqlInt32 (5);

+			AssertEquals ("Test explicit cast to int", (int)foo, 5);

+		}

+

+		public void TestAdd () 

+		{

+			int a = 5;

+			int b = 7;

+			

+			SqlInt32 x;

+			SqlInt32 y;

+			SqlInt32 z;

+

+			x = new SqlInt32 (a);

+			y = new SqlInt32 (b);

+			z = x + y;

+			AssertEquals ("Addition operator does not work correctly", z.Value, a + b);

+			z = SqlInt32.Add (x, y);

+			AssertEquals ("Addition function does not work correctly", z.Value, a + b);

+		}

+

+		public void TestBitwiseAnd () 

+		{

+			int a = 5;

+			int b = 7;

+						

+			SqlInt32 x = new SqlInt32 (a);

+			SqlInt32 y = new SqlInt32 (b);

+			SqlInt32 z = x & y;

+			AssertEquals ("Bitwise And operator does not work correctly", z.Value, a & b);

+			z = SqlInt32.BitwiseAnd (x, y);

+			AssertEquals ("Bitwise And function does not work correctly", z.Value, a & b);

+		}

+

+		public void TestBitwiseOr () 

+		{

+			int a = 5;

+			int b = 7;

+			

+			SqlInt32 x = new SqlInt32 (a);

+			SqlInt32 y = new SqlInt32 (b);

+			SqlInt32 z = x | y;

+			AssertEquals ("Bitwise Or operator does not work correctly", z.Value, a | b);

+			z = SqlInt32.BitwiseOr (x, y);

+			AssertEquals ("Bitwise Or function does not work correctly", z.Value, a | b);

+		}

+

+		public void TestDivide () 

+		{

+			int a = 5;

+			int b = 7;

+			

+			SqlInt32 x = new SqlInt32 (a);

+			SqlInt32 y = new SqlInt32 (b);

+			SqlInt32 z = x / y;

+			AssertEquals ("Division operator does not work correctly", z.Value, a / b);

+			z = SqlInt32.Divide (x, y);

+			AssertEquals ("Division function does not work correctly", z.Value, a / b);

+		}

+		

+		public void TestEquals ()

+		{

+			SqlInt32 x;

+			SqlInt32 y;

+			

+			// Case 1: either is SqlInt32.Null

+			x = SqlInt32.Null;

+			y = new SqlInt32 (5);

+			AssertEquals ("Equality operator didn't return Null when one was Null.", x == y, SqlBoolean.Null);

+			AssertEquals ("Equality function didn't return Null when one was Null.", SqlInt32.Equals (x, y), SqlBoolean.Null);

+

+			// Case 2: both are SqlInt32.Null

+			y = SqlInt32.Null;

+			AssertEquals ("Equality operator didn't return Null when both were Null.", x == y, SqlBoolean.Null);

+			AssertEquals ("Equality function didn't return Null when both were Null.", SqlInt32.Equals (x, y), SqlBoolean.Null);

+

+			// Case 3: both are equal

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (5);

+			AssertEquals ("Equality operator didn't return true when they were equal.", x == y, SqlBoolean.True);

+			AssertEquals ("Equality function didn't return true when they were equal.", SqlInt32.Equals (x, y), SqlBoolean.True);

+

+			// Case 4: inequality

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (6);

+			AssertEquals ("Equality operator didn't return false when they were not equal.", x == y, SqlBoolean.False);

+			AssertEquals ("Equality function didn't return false when they were not equal.", SqlInt32.Equals (x, y), SqlBoolean.False);

+		}

+

+		public void TestGreaterThan ()

+		{

+			SqlInt32 x;

+			SqlInt32 y;

+			

+			// Case 1: either is SqlInt32.Null

+			x = SqlInt32.Null;

+			y = new SqlInt32 (5);

+			AssertEquals ("Greater Than operator didn't return Null when one was Null.", x > y, SqlBoolean.Null);

+			AssertEquals ("Greater Than function didn't return Null when one was Null.", SqlInt32.GreaterThan (x, y), SqlBoolean.Null);

+

+			// Case 2: both are SqlInt32.Null

+			y = SqlInt32.Null;

+			AssertEquals ("Greater Than operator didn't return Null when both were Null.", x > y, SqlBoolean.Null);

+			AssertEquals ("Greater Than function didn't return Null when both were Null.", SqlInt32.GreaterThan (x, y), SqlBoolean.Null);

+

+			// Case 3: x > y

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (4);

+			AssertEquals ("Greater than operator didn't return true when x > y.", x > y, SqlBoolean.True);

+			AssertEquals ("Greater than function didn't return true when x > y.", SqlInt32.GreaterThan (x,y), SqlBoolean.True);

+

+			// Case 4: x < y

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (6);

+			AssertEquals ("Greater than operator didn't return false when x < y.", x > y, SqlBoolean.False);

+			AssertEquals ("Greater than function didn't return false when x < y.", SqlInt32.GreaterThan (x,y), SqlBoolean.False);

+		}

+

+		public void TestGreaterThanOrEqual ()

+		{

+			SqlInt32 x;

+			SqlInt32 y;

+			

+			// Case 1: either is SqlInt32.Null

+			x = SqlInt32.Null;

+			y = new SqlInt32 (5);

+			AssertEquals ("Greater Than Or Equal operator didn't return Null when one was Null.", x >= y, SqlBoolean.Null);

+			AssertEquals ("Greater Than Or Equal function didn't return Null when one was Null.", SqlInt32.GreaterThanOrEqual (x, y), SqlBoolean.Null);

+

+			// Case 2: both are SqlInt32.Null

+			y = SqlInt32.Null;

+			AssertEquals ("Greater Than Or Equal operator didn't return Null when both were Null.", x >= y, SqlBoolean.Null);

+			AssertEquals ("Greater Than Or Equal function didn't return Null when both were Null.", SqlInt32.GreaterThanOrEqual (x, y), SqlBoolean.Null);

+

+			// Case 3: x > y

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (4);

+			AssertEquals ("Greater than or equal operator didn't return true when x > y.", x >= y, SqlBoolean.True);

+			AssertEquals ("Greater than or equal function didn't return true when x > y.", SqlInt32.GreaterThanOrEqual (x,y), SqlBoolean.True);

+

+			// Case 4: x < y

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (6);

+			AssertEquals ("Greater than or equal operator didn't return false when x < y.", x >= y, SqlBoolean.False);

+			AssertEquals ("Greater than or equal function didn't return false when x < y.", SqlInt32.GreaterThanOrEqual (x,y), SqlBoolean.False);

+

+			// Case 5: x == y

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (5);

+			AssertEquals ("Greater than or equal operator didn't return true when x == y.", x >= y, SqlBoolean.True);

+			AssertEquals ("Greater than or equal function didn't return true when x == y.", SqlInt32.GreaterThanOrEqual (x,y), SqlBoolean.True);

+		}

+

+		public void TestLessThan ()

+		{

+			SqlInt32 x;

+			SqlInt32 y;

+			

+			// Case 1: either is SqlInt32.Null

+			x = SqlInt32.Null;

+			y = new SqlInt32 (5);

+			AssertEquals ("Less Than operator didn't return Null when one was Null.", x < y, SqlBoolean.Null);

+			AssertEquals ("Less Than function didn't return Null when one was Null.", SqlInt32.LessThan (x, y), SqlBoolean.Null);

+

+			// Case 2: both are SqlInt32.Null

+			y = SqlInt32.Null;

+			AssertEquals ("Less Than operator didn't return Null when both were Null.", x < y, SqlBoolean.Null);

+			AssertEquals ("Less Than function didn't return Null when both were Null.", SqlInt32.LessThan (x, y), SqlBoolean.Null);

+

+			// Case 3: x > y

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (4);

+			AssertEquals ("Less than operator didn't return false when x > y.", x < y, SqlBoolean.False);

+			AssertEquals ("Less than function didn't return false when x > y.", SqlInt32.LessThan (x,y), SqlBoolean.False);

+

+			// Case 4: x < y

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (6);

+			AssertEquals ("Less than operator didn't return true when x < y.", x < y, SqlBoolean.True);

+			AssertEquals ("Less than function didn't return true when x < y.", SqlInt32.LessThan (x,y), SqlBoolean.True);

+		}

+

+		public void TestLessThanOrEqual ()

+		{

+			SqlInt32 x;

+			SqlInt32 y;

+			

+			// Case 1: either is SqlInt32.Null

+			x = SqlInt32.Null;

+			y = new SqlInt32 (5);

+			AssertEquals ("Less Than Or Equal operator didn't return Null when one was Null.", x <= y, SqlBoolean.Null);

+			AssertEquals ("Less Than Or Equal function didn't return Null when one was Null.", SqlInt32.LessThanOrEqual (x, y), SqlBoolean.Null);

+

+			// Case 2: both are SqlInt32.Null

+			y = SqlInt32.Null;

+			AssertEquals ("Less Than Or Equal operator didn't return Null when both were Null.", x <= y, SqlBoolean.Null);

+			AssertEquals ("Less Than Or Equal function didn't return Null when both were Null.", SqlInt32.LessThanOrEqual (x, y), SqlBoolean.Null);

+

+			// Case 3: x > y

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (4);

+			AssertEquals ("Less than or equal operator didn't return false when x > y.", x <= y, SqlBoolean.False);

+			AssertEquals ("Less than or equal function didn't return false when x > y.", SqlInt32.LessThanOrEqual (x,y), SqlBoolean.False);

+

+			// Case 4: x < y

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (6);

+			AssertEquals ("Less than or equal operator didn't return true when x < y.", x <= y, SqlBoolean.True);

+			AssertEquals ("Less than or equal function didn't return true when x < y.", SqlInt32.LessThanOrEqual (x,y), SqlBoolean.True);

+

+			// Case 5: x == y

+			x = new SqlInt32 (5);

+			y = new SqlInt32 (5);

+			AssertEquals ("Less than or equal operator didn't return true when x == y.", x <= y, SqlBoolean.True);

+			AssertEquals ("Less than or equal function didn't return true when x == y.", SqlInt32.LessThanOrEqual (x,y), SqlBoolean.True);

+		}

+

+		public void TestMod () 

+		{

+			int a = 5;

+			int b = 7;

+			

+			SqlInt32 x = new SqlInt32 (a);

+			SqlInt32 y = new SqlInt32 (b);

+			SqlInt32 z = x % y;

+			AssertEquals ("Modulus operator does not work correctly", z.Value, a % b);

+			z = SqlInt32.Mod (x, y);

+			AssertEquals ("Modulus function does not work correctly", z.Value, a % b);

+		}

+

+		public void TestMultiply () 

+		{

+			int a = 5;

+			int b = 7;

+			

+			SqlInt32 x = new SqlInt32 (a);

+			SqlInt32 y = new SqlInt32 (b);

+			SqlInt32 z = x * y;

+			AssertEquals ("Multiplication operator does not work correctly", z.Value, a * b);

+			z = SqlInt32.Multiply (x, y);

+			AssertEquals ("Multiplication function does not work correctly", z.Value, a * b);

+		}

+

+		public void TestNotEquals () 

+		{

+			SqlInt32 x;

+			SqlInt32 y;

+

+			x = new SqlInt32 (5);

+			y = SqlInt32.Null;

+

+			AssertEquals ("Not Equals operator does not return null when one or both of the parameters is Null.", x != y, SqlBoolean.Null);

+			AssertEquals ("Not Equals function does not return null when one or both of the parameters is Null.", SqlInt32.NotEquals (x, y), SqlBoolean.Null);

+

+			y = new SqlInt32 (5);

+			AssertEquals ("Not Equals operator does not return false when x == y.", x != y, SqlBoolean.False);

+			AssertEquals ("Not Equals function does not return false when x == y.", SqlInt32.NotEquals (x, y), SqlBoolean.False);

+

+			y = new SqlInt32 (6);

+			AssertEquals ("Not Equals operator does not return true when x != y.", x != y, SqlBoolean.True);

+			AssertEquals ("Not Equals function does not return true when x != y.", SqlInt32.NotEquals (x, y), SqlBoolean.True);

+		}

+	

+		public void TestOnesComplement () 

+		{

+			int a = 5;

+			

+			SqlInt32 x = new SqlInt32 (a);

+			SqlInt32 z = ~x;

+			AssertEquals ("Ones Complement operator does not work correctly", z.Value, ~a);

+			z = SqlInt32.OnesComplement (x);

+			AssertEquals ("Ones Complement function does not work correctly", z.Value, ~a);

+		}

+		

+		public void TestIsNullProperty ()

+		{

+			SqlInt32 n = SqlInt32.Null;

+			Assert ("Null is not defined correctly", n.IsNull);

+		}

+	

+		public void TestSubtract () 

+		{

+			int a = 7;

+			int b = 5;

+			

+			SqlInt32 x = new SqlInt32 (a);

+			SqlInt32 y = new SqlInt32 (b);

+			SqlInt32 z = x - y;

+			AssertEquals ("Subtraction operator does not work correctly", z.Value, a - b);

+			z = SqlInt32.Subtract (x, y);

+			AssertEquals ("Subtraction function does not work correctly", z.Value, a - b);

+		}

+

+		public void TestConversionMethods ()

+		{

+			SqlInt32 x;

+

+			// Case 1: SqlInt32.Null -> SqlBoolean == SqlBoolean.Null

+			x = SqlInt32.Null;

+			AssertEquals ("SqlInt32.Null -> SqlBoolean does not yield SqlBoolean.Null.", x.ToSqlBoolean (), SqlBoolean.Null );

+

+			// Case 2: SqlInt32.Zero -> SqlBoolean == False

+			x = SqlInt32.Zero;

+			AssertEquals ("SqlInt32.Zero -> SqlBoolean does not yield SqlBoolean.False.", x.ToSqlBoolean (), SqlBoolean.False );

+		

+			// Case 3: SqlInt32(nonzero) -> SqlBoolean == True

+			x = new SqlInt32 (27);

+			AssertEquals ("SqlInt32 (27) -> SqlBoolean does not yield SqlBoolean.True.", x.ToSqlBoolean (), SqlBoolean.True );

+		

+			// Case 4: SqlInt32.Null -> SqlByte == SqlByte.Null

+			x = SqlInt32.Null;

+			AssertEquals ("SqlInt32.Null -> SqlByte does not yield SqlByte.Null.", x.ToSqlByte (), SqlByte.Null );

+

+			// Case 5: Test non-null conversion to SqlByte

+			x = new SqlInt32 (27);

+			AssertEquals ("SqlInt32 (27) -> SqlByte does not yield a value of 27", x.ToSqlByte ().Value, (byte)27);

+

+			// Case 6: SqlInt32.Null -> SqlDecimal == SqlDecimal.Null

+			x = SqlInt32.Null;

+			AssertEquals ("SqlInt32.Null -> SqlDecimal does not yield SqlDecimal.Null.", x.ToSqlDecimal (), SqlDecimal.Null );

+

+			// Case 7: Test non-null conversion to SqlDecimal

+			x = new SqlInt32 (27);

+			AssertEquals ("SqlInt32 (27) -> SqlDecimal does not yield a value of 27", x.ToSqlDecimal ().Value, (decimal)27);

+

+			// Case 8: SqlInt32.Null -> SqlDouble == SqlDouble.Null

+			x = SqlInt32.Null;

+			AssertEquals ("SqlInt32.Null -> SqlDouble does not yield SqlDouble.Null.", x.ToSqlDouble (), SqlDouble.Null );

+

+			// Case 9: Test non-null conversion to SqlDouble

+			x = new SqlInt32 (27);

+			AssertEquals ("SqlInt32 (27) -> SqlDouble does not yield a value of 27", x.ToSqlDouble ().Value, (double)27);

+

+			// Case 10: SqlInt32.Null -> SqlInt16 == SqlInt16.Null

+			x = SqlInt32.Null;

+			AssertEquals ("SqlInt32.Null -> SqlInt16 does not yield SqlInt16.Null.", x.ToSqlInt16 (), SqlInt16.Null );

+

+			// Case 11: Test non-null conversion to SqlInt16

+			x = new SqlInt32 (27);

+			AssertEquals ("SqlInt32 (27) -> SqlInt16 does not yield a value of 27", x.ToSqlInt16 ().Value, (short)27);

+

+			// Case 12: SqlInt32.Null -> SqlInt64 == SqlInt64.Null

+			x = SqlInt32.Null;

+			AssertEquals ("SqlInt32.Null -> SqlInt64 does not yield SqlInt64.Null.", x.ToSqlInt64 (), SqlInt64.Null );

+

+			// Case 13: Test non-null conversion to SqlInt64

+			x = new SqlInt32 (27);

+			AssertEquals ("SqlInt32 (27) -> SqlInt64 does not yield a value of 27", x.ToSqlInt64 ().Value, (long)27);

+

+			// Case 14: SqlInt32.Null -> SqlMoney == SqlMoney.Null

+			x = SqlInt32.Null;

+			AssertEquals ("SqlInt32.Null -> SqlMoney does not yield SqlMoney.Null.", x.ToSqlMoney (), SqlMoney.Null );

+

+			// Case 15: Test non-null conversion to SqlMoney

+			x = new SqlInt32 (27);

+			AssertEquals ("SqlInt32 (27) -> SqlMoney does not yield a value of 27", x.ToSqlMoney ().Value, (decimal)27);

+

+			// Case 16: SqlInt32.Null -> SqlSingle == SqlSingle.Null

+			x = SqlInt32.Null;

+			AssertEquals ("SqlInt32.Null -> SqlSingle does not yield SqlSingle.Null.", x.ToSqlSingle (), SqlSingle.Null );

+

+			// Case 17: Test non-null conversion to SqlSingle

+			x = new SqlInt32 (27);

+			AssertEquals ("SqlInt32 (27) -> SqlSingle does not yield a value of 27", x.ToSqlSingle ().Value, (float)27);

+		}

+	

+		public void TestXor () 

+		{

+			int a = 5;

+			int b = 7;

+			

+			SqlInt32 x = new SqlInt32 (a);

+			SqlInt32 y = new SqlInt32 (b);

+			SqlInt32 z = x ^ y;

+			AssertEquals ("Xor operator does not work correctly", z.Value, a ^ b);

+			z = SqlInt32.Xor (x, y);

+			AssertEquals ("Xor function does not work correctly", z.Value, a ^ b);

+		}

+			

+	}

+}

diff --git a/mcs/class/System.Data/Test/System.Data/AllTests.cs b/mcs/class/System.Data/Test/System.Data/AllTests.cs
new file mode 100644
index 00000000000..35e6cc43c29
--- /dev/null
+++ b/mcs/class/System.Data/Test/System.Data/AllTests.cs
@@ -0,0 +1,34 @@
+// MonoTests.System.Data.AllTests.cs
+//
+// Author:
+//   Rodrigo Moya <rodrigo@ximian.com>
+//
+// (C) Copyright 2002 Rodrigo Moya
+//
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Data
+{
+	/// <summary>
+	///  Combines all unit tests for the System.Data.dll assembly
+	///   into one test suite.
+	/// </summary>
+	public class AllTests : TestCase
+	{
+		public AllTests (string name) : base (name) { }
+
+		public static ITest Suite {
+			get {
+				TestSuite suite =  new TestSuite ();
+				suite.AddTest (new TestSuite (typeof (DataColumnTest)));
+				suite.AddTest (new TestSuite (typeof (UniqueConstraintTest)));
+				suite.AddTest (new TestSuite (typeof (ConstraintTest)));
+				suite.AddTest (new TestSuite (typeof (ConstraintCollectionTest)));
+				suite.AddTest (new TestSuite (typeof (ForeignKeyConstraintTest)));
+				suite.AddTest (new TestSuite (typeof (DataTableTest)));
+				return suite;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs
new file mode 100644
index 00000000000..71efd493698
--- /dev/null
+++ b/mcs/class/System.Data/Test/System.Data/ConstraintCollectionTest.cs
@@ -0,0 +1,323 @@
+// ConstraintCollection.cs - NUnit Test Cases for testing the ConstraintCollection 
+//	class.
+//	
+//
+// Franklin Wise (gracenote@earthlink.net)
+//
+// (C) Franklin Wise
+// 
+
+
+using NUnit.Framework;
+using System;
+using System.Data;
+
+
+namespace MonoTests.System.Data
+{
+
+
+	public class ConstraintCollectionTest : TestCase 
+	{
+		private DataTable _table;
+		private DataTable _table2;
+		private Constraint _constraint1;
+		private Constraint _constraint2;
+
+		public ConstraintCollectionTest() : base ("MonoTests.System.Data.ConstraintCollectionTest") {}
+		public ConstraintCollectionTest(string name) : base(name) {}
+
+		public void PublicSetup(){SetUp();}
+		protected override void SetUp() 
+		{
+			//Setup DataTable
+			_table = new DataTable("TestTable");
+			_table.Columns.Add("Col1",typeof(int));
+			_table.Columns.Add("Col2",typeof(int));
+			_table.Columns.Add("Col3",typeof(int));
+
+			_table2 = new DataTable("TestTable");
+			_table2.Columns.Add("Col1",typeof(int));
+			_table2.Columns.Add("Col2",typeof(int));
+
+			//Use UniqueConstraint to test Constraint Base Class
+			_constraint1 = new UniqueConstraint(_table.Columns[0],false); 
+			_constraint2 = new UniqueConstraint(_table.Columns[1],false); 
+		}
+
+		protected override void TearDown() {}
+
+		public static ITest Suite 
+		{
+			get 
+			{ 
+				return new TestSuite(typeof(ConstraintCollectionTest)); 
+			}
+		}
+
+		public void TestAdd()
+		{
+			ConstraintCollection col = _table.Constraints;
+			col.Add(_constraint1);
+			col.Add(_constraint2);
+
+			Assertion.AssertEquals("Count doesn't equal added.",2, col.Count);
+		}
+
+		public void TestAddExceptions()
+		{
+			ConstraintCollection col = _table.Constraints;
+			
+			//null
+			try 
+			{
+				col.Add(null);
+				Assertion.Fail("B1: Failed to throw ArgumentNullException.");
+			}
+			catch (ArgumentNullException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch 
+			{
+				Assertion.Fail("A1: Wrong exception type");
+			}
+
+			//duplicate name
+			try 
+			{
+				_constraint1.ConstraintName = "Dog";
+				_constraint2.ConstraintName = "dog"; //case insensitive
+				col.Add(_constraint1);
+				col.Add(_constraint2);
+				Assertion.Fail("Failed to throw Duplicate name exception.");
+			}
+			catch (DuplicateNameException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch (Exception exc)
+			{
+				Assertion.Fail("A2: Wrong exception type. " + exc.ToString());
+			}
+
+			//Constraint Already exists
+			try 
+			{
+				col.Add(_constraint1);
+				Assertion.Fail("B2: Failed to throw ArgumentException.");
+			}
+			catch (ArgumentException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch 
+			{
+				Assertion.Fail("A3: Wrong exception type");
+			}
+		}
+
+		public void TestIndexer()
+		{
+			Constraint c1 = new UniqueConstraint(_table.Columns[0]);
+			Constraint c2 = new UniqueConstraint(_table.Columns[1]);
+
+			c1.ConstraintName = "first";
+			c2.ConstraintName = "second";
+
+
+			_table.Constraints.Add(c1);
+			_table.Constraints.Add(c2);
+
+			Assertion.AssertSame("A1", c1, _table.Constraints[0]); 
+			Assertion.AssertSame("A2", c2, _table.Constraints[1]);
+
+			Assertion.AssertSame("A3", c1, _table.Constraints["first"]);
+			Assertion.AssertSame("A4", c2, _table.Constraints["sEcond"]); //case insensitive
+
+		}
+
+		public void TestIndexOf()
+		{
+			Constraint c1 = new UniqueConstraint(_table.Columns[0]);
+			Constraint c2 = new UniqueConstraint(_table.Columns[1]);
+
+			c1.ConstraintName = "first";
+			c2.ConstraintName = "second";
+
+			_table.Constraints.Add(c1);
+			_table.Constraints.Add(c2);
+
+			Assertion.AssertEquals("A1", 0, _table.Constraints.IndexOf(c1));
+			Assertion.AssertEquals("A2", 1, _table.Constraints.IndexOf(c2));
+			Assertion.AssertEquals("A3", 0, _table.Constraints.IndexOf("first"));
+			Assertion.AssertEquals("A4", 1, _table.Constraints.IndexOf("second"));
+		}
+
+		public void TestContains()
+		{
+			Constraint c1 = new UniqueConstraint(_table.Columns[0]);
+			Constraint c2 = new UniqueConstraint(_table.Columns[1]);
+
+			c1.ConstraintName = "first";
+			c2.ConstraintName = "second";
+
+			_table.Constraints.Add(c1);
+
+			Assertion.Assert("A1", _table.Constraints.Contains(c1.ConstraintName)); //true
+			Assertion.Assert("A2", _table.Constraints.Contains(c2.ConstraintName) == false); //doesn't contain
+		}
+
+		public void TestIndexerFailures()
+		{
+			_table.Constraints.Add(new UniqueConstraint(_table.Columns[0]));
+
+			//This doesn't throw
+			Assertion.AssertNull(_table.Constraints["notInCollection"]);
+			
+			//Index too high
+			try 
+			{
+				Constraint c = _table.Constraints[_table.Constraints.Count];
+				Assertion.Fail("B1: Failed to throw IndexOutOfRangeException.");
+			}
+			catch (IndexOutOfRangeException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch 
+			{
+				Assertion.Fail("A1: Wrong exception type");
+			}
+
+			//Index too low
+			try 
+			{
+				Constraint c = _table.Constraints[-1];
+				Assertion.Fail("B2: Failed to throw IndexOutOfRangeException.");
+			}
+			catch (IndexOutOfRangeException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch 
+			{
+				Assertion.Fail("A2: Wrong exception type");
+			}	
+
+		}
+
+		//TODO: Implementation not ready for this test yet
+//		public void TestAddFkException1()
+//		{
+//			DataSet ds = new DataSet();
+//			ds.Tables.Add(_table);
+//			ds.Tables.Add(_table2);
+//
+//			_table.Rows.Add(new object [] {1});
+//			_table.Rows.Add(new object [] {1});
+//
+//			//FKC: can't create unique constraint because duplicate values already exist
+//			try
+//			{
+//				ForeignKeyConstraint fkc = new ForeignKeyConstraint( _table.Columns[0],
+//											_table2.Columns[0]);
+//				
+//				_table2.Constraints.Add(fkc);	//should throw			
+//				Assertion.Fail("B1: Failed to throw ArgumentException.");
+//			}
+//			catch (ArgumentException) {}
+//			catch (AssertionFailedError exc) {throw exc;}
+//			catch (Exception exc)
+//			{
+//				Assertion.Fail("A1: Wrong Exception type. " + exc.ToString());
+//			}
+//
+//
+//		}
+
+
+		//TODO: Implementation not ready for this test yet
+//		public void TestAddFkException2()
+//		{
+//			//Foreign key rules only work when the tables
+//			//are apart of the dataset
+//			DataSet ds = new DataSet();
+//			ds.Tables.Add(_table);
+//			ds.Tables.Add(_table2);
+//
+//			_table.Rows.Add(new object [] {1});
+//			
+//			// will need a matching parent value in 
+//			// _table
+//			_table2.Rows.Add(new object [] {3}); 
+//								
+//
+//			//FKC: no matching parent value
+//			try
+//			{
+//				ForeignKeyConstraint fkc = new ForeignKeyConstraint( _table.Columns[0],
+//					_table2.Columns[0]);
+//				
+//				_table2.Constraints.Add(fkc);	//should throw			
+//				Assertion.Fail("B1: Failed to throw ArgumentException.");
+//			}
+//			catch (ArgumentException) {}
+//			catch (AssertionFailedError exc) {throw exc;}
+//			catch (Exception exc)
+//			{
+//				Assertion.Fail("A1: Wrong Exception type. " + exc.ToString());
+//			}
+//
+//
+//		}
+
+
+		//TODO: Implementation not ready for this test yet
+//		public void TestAddUniqueExceptions()
+//		{
+//			
+//
+//			//UC: can't create unique constraint because duplicate values already exist
+//			try
+//			{
+//				_table.Rows.Add(new object [] {1});
+//				_table.Rows.Add(new object [] {1});
+//				UniqueConstraint uc = new UniqueConstraint( _table.Columns[0]);
+//				
+//				_table.Constraints.Add(uc);	//should throw			
+//				Assertion.Fail("B1: Failed to throw ArgumentException.");
+//			}
+//			catch (ArgumentException) {}
+//			catch (AssertionFailedError exc) {throw exc;}
+//			catch (Exception exc)
+//			{
+//				Assertion.Fail("A1: Wrong Exception type. " + exc.ToString());
+//			}
+//		}
+
+		public void TestAddRange()
+		{
+		}
+
+		public void TestClear()
+		{
+
+		}
+
+		public void TestCanRemove()
+		{
+
+		}
+
+		public void TestCollectionChanged()
+		{
+
+		}
+
+		public void TestRemoveAt()
+		{
+		}
+
+		public void TestRemove()
+		{
+		}
+
+
+		public void TestRemoveExceptions()
+		{
+
+
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/System.Data/ConstraintTest.cs b/mcs/class/System.Data/Test/System.Data/ConstraintTest.cs
new file mode 100644
index 00000000000..e88883a4314
--- /dev/null
+++ b/mcs/class/System.Data/Test/System.Data/ConstraintTest.cs
@@ -0,0 +1,135 @@
+// ConstraintTest.cs - NUnit Test Cases for testing the abstract class System.Data.Constraint
+// The tests use an inherited class (UniqueConstraint) to test the Constraint class.
+//
+// Franklin Wise <gracenote@earthlink.net>
+//
+// (C) 2002 Franklin Wise
+// 
+
+using NUnit.Framework;
+using System;
+using System.Data;
+
+namespace MonoTests.System.Data
+{
+//	public class MyUniqueConstraint: UniqueConstraint {
+//		public MyUniqueConstraint(DataColumn col, bool pk): base(col,pk){}
+//		string _myval = "";
+//		public override string ConstraintName {
+//			get{
+//				return _myval;
+//				return base.ConstraintName;
+//			}
+//			set{
+//				Console.WriteLine("NameSet = " + value);
+//				base.ConstraintName = value;
+//				_myval = value;
+//			}
+//		}
+//	}
+
+	public class ConstraintTest : TestCase 
+	{
+		private DataTable _table;
+		private Constraint _constraint1;
+		private Constraint _constraint2;
+
+		public ConstraintTest() : base ("MonoTests.System.Data.ConstraintTest") {}
+		public ConstraintTest(string name) : base(name) {}
+
+		public void PublicSetup(){SetUp();}
+		protected override void SetUp() {
+
+			//Setup DataTable
+			_table = new DataTable("TestTable");
+			_table.Columns.Add("Col1",typeof(int));
+			_table.Columns.Add("Col2",typeof(int));
+
+			//Use UniqueConstraint to test Constraint Base Class
+			_constraint1 = new UniqueConstraint(_table.Columns[0],false); 
+			_constraint2 = new UniqueConstraint(_table.Columns[1],false); 
+
+		}  
+		
+
+		protected override void TearDown() {}
+
+		public static ITest Suite {
+			get { 
+				return new TestSuite(typeof(ConstraintTest)); 
+			}
+		}
+
+		public void TestSetConstraintNameNullOrEmptyExceptions() {
+			bool exceptionCaught = false;
+			string name = null;
+
+			_table.Constraints.Add (_constraint1);  
+
+			Console.WriteLine(_constraint1.ConstraintName);
+
+			for (int i = 0; i <= 1; i++) {
+				exceptionCaught = false;
+				if (0 == i) name = null;
+				if (1 == i) name = String.Empty;
+	
+				try {
+				
+					//Next line should throw ArgumentException
+					//Because ConstraintName can't be set to null
+					//or empty while the constraint is part of the
+					//collection
+					_constraint1.ConstraintName = name; 
+				}
+				catch (ArgumentException){ 
+					exceptionCaught = true;
+				}
+				catch {
+					Assertion.Fail("Wrong exception type thrown.");
+				}
+				
+				Assertion.Assert("Failed to throw exception.",
+					true == exceptionCaught);
+			}	
+		}
+
+		public void TestSetConstraintNameDuplicateException() {
+			_constraint1.ConstraintName = "Dog";
+			_constraint2.ConstraintName = "Cat";
+
+			_table.Constraints.Add(_constraint1);
+			_table.Constraints.Add(_constraint2);
+
+			try {
+				//Should throw DuplicateNameException
+				_constraint2.ConstraintName = "Dog";
+			
+				Assertion.Fail("Failed to throw " + 
+					" DuplicateNameException exception.");
+			}	
+			catch (DuplicateNameException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch {
+				Assertion.Fail("Wrong exception type thrown.");
+			}
+		
+		}
+
+		public void TestToString() {
+			_constraint1.ConstraintName = "Test";
+			Assertion.Assert("ToString is the same as constraint name.", _constraint1.ConstraintName.CompareTo( _constraint1.ToString()) == 0);
+			
+			_constraint1.ConstraintName = null;
+			Assertion.AssertNotNull("ToString should return empty.",_constraint1.ToString());
+		}
+
+		public void TestGetExtendedProperties() {
+			PropertyCollection col = _constraint1.ExtendedProperties as
+				PropertyCollection;
+
+			Assertion.AssertNotNull("ExtendedProperties returned null or didn't " +
+				"return the correct type", col);
+		}
+		
+	}
+}
diff --git a/mcs/class/System.Data/Test/System.Data/DataColumnTest.cs b/mcs/class/System.Data/Test/System.Data/DataColumnTest.cs
new file mode 100644
index 00000000000..c6509fcf497
--- /dev/null
+++ b/mcs/class/System.Data/Test/System.Data/DataColumnTest.cs
@@ -0,0 +1,32 @@
+// DataColumnTest.cs - NUnit Test Cases for System.Data.DataColumn
+//
+// Author:
+//   Rodrigo Moya <rodrigo@ximian.com>
+//
+// (C) Copyright 2002 Rodrigo Moya
+//
+
+using NUnit.Framework;
+using System;
+using System.Data;
+
+namespace MonoTests.System.Data
+{
+	public class DataColumnTest : TestCase
+	{
+		public DataColumnTest () : base ("System.Data.DataColumn") {}
+		public DataColumnTest (string name) : base (name) {}
+
+		protected override void SetUp () {}
+
+		protected override void TearDown() {}
+
+		public static ITest Suite {
+			get { 
+				return new TestSuite (typeof (DataColumnTest)); 
+			}
+		}
+
+		public void TestBlank()	{} //Remove me when we add some tests
+	}
+}
diff --git a/mcs/class/System.Data/Test/System.Data/DataTableTest.cs b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
new file mode 100644
index 00000000000..7f5d884dcbb
--- /dev/null
+++ b/mcs/class/System.Data/Test/System.Data/DataTableTest.cs
@@ -0,0 +1,58 @@
+// DataTableTest.cs - NUnit Test Cases for testing the DataTable 
+//
+// Franklin Wise (gracenote@earthlink.net)
+// 
+// (C) Franklin Wise
+// 
+
+using NUnit.Framework;
+using System;
+using System.Data;
+
+namespace MonoTests.System.Data
+{
+
+	public class DataTableTest : TestCase 
+	{
+	
+		public DataTableTest() : base ("MonoTest.System.Data.DataTableTest") {}
+		public DataTableTest(string name) : base(name) {}
+
+		protected override void SetUp() {}
+
+		protected override void TearDown() {}
+
+		public static ITest Suite 
+		{
+			get 
+			{ 
+				return new TestSuite(typeof(DataTableTest)); 
+			}
+		}
+
+		public void TestCtor()
+		{
+			DataTable dt = new DataTable();
+
+			Assertion.AssertEquals("CaseSensitive must be false." ,false,dt.CaseSensitive);
+			Assertion.Assert(dt.Columns != null);
+			//Assertion.Assert(dt.ChildRelations != null);
+			Assertion.Assert(dt.Constraints != null);
+			Assertion.Assert(dt.DataSet == null); 
+			Assertion.Assert(dt.DefaultView != null);
+			Assertion.Assert(dt.DisplayExpression == "");
+			Assertion.Assert(dt.ExtendedProperties != null);
+			Assertion.Assert(dt.HasErrors == false);
+			Assertion.Assert(dt.Locale != null);
+			Assertion.Assert(dt.MinimumCapacity == 50); //LAMESPEC:
+			Assertion.Assert(dt.Namespace == "");
+			//Assertion.Assert(dt.ParentRelations != null);
+			Assertion.Assert(dt.Prefix == "");
+			Assertion.Assert(dt.PrimaryKey != null);
+			Assertion.Assert(dt.Rows != null);
+			Assertion.Assert(dt.Site == null);
+			Assertion.Assert(dt.TableName == "");
+			
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
new file mode 100644
index 00000000000..c16718cf0d0
--- /dev/null
+++ b/mcs/class/System.Data/Test/System.Data/ForeignKeyConstraintTest.cs
@@ -0,0 +1,202 @@
+// ForeignKeyConstraintTest.cs - NUnit Test Cases for [explain here]
+//
+// Franklin Wise (gracenote@earthlink.net)
+//
+// (C) Franklin Wise
+// 
+
+
+using NUnit.Framework;
+using System;
+using System.Data;
+
+namespace MonoTests.System.Data
+{
+
+	public class ForeignKeyConstraintTest : TestCase 
+	{
+		private DataSet _ds;
+
+		//NOTE: fk constraints only work when the table is part of a DataSet
+
+		public ForeignKeyConstraintTest() : base ("MonoTests.System.Data.ForeignKeyConstraintTest") {}
+		public ForeignKeyConstraintTest(string name) : base(name) {}
+
+		protected override void SetUp() 
+		{
+			_ds = new DataSet();
+
+			//Setup DataTable
+			DataTable table;
+			table = new DataTable("TestTable");
+			table.Columns.Add("Col1",typeof(int));
+			table.Columns.Add("Col2",typeof(int));
+			table.Columns.Add("Col3",typeof(int));
+
+			_ds.Tables.Add(table);
+
+			table = new DataTable("TestTable2");
+			table.Columns.Add("Col1",typeof(int));
+			table.Columns.Add("Col2",typeof(int));
+			table.Columns.Add("Col3",typeof(int));
+
+			_ds.Tables.Add(table);
+
+		}
+
+		protected override void TearDown() {}
+
+		public static ITest Suite 
+		{
+			get 
+			{ 
+				return new TestSuite(typeof(ForeignKeyConstraintTest)); 
+			}
+		}
+
+
+		public void TestCtorExceptions ()
+		{
+			ForeignKeyConstraint fkc;
+
+			DataTable localTable = new DataTable();
+			localTable.Columns.Add("Col1",typeof(int));
+			localTable.Columns.Add("Col2",typeof(bool));
+
+			//Null
+			try
+			{
+				fkc = new ForeignKeyConstraint((DataColumn)null,(DataColumn)null);
+				Assertion.Fail("Failed to throw ArgumentNullException.");
+			}
+			catch (ArgumentNullException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch (Exception exc)
+			{
+				Assertion.Fail("A1: Wrong Exception type. " + exc.ToString());
+			}
+
+			//zero length collection
+			try
+			{
+				fkc = new ForeignKeyConstraint(new DataColumn[]{},new DataColumn[]{});
+				Assertion.Fail("B1: Failed to throw ArgumentException.");
+			}
+			catch (ArgumentException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch (Exception exc)
+			{
+				Assertion.Fail("A2: Wrong Exception type. " + exc.ToString());
+			}
+
+			//different datasets
+			try
+			{
+				fkc = new ForeignKeyConstraint(_ds.Tables[0].Columns[0], localTable.Columns[0]);
+				Assertion.Fail("Failed to throw InvalidOperationException.");
+			}
+			catch (InvalidOperationException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch (Exception exc)
+			{
+				Assertion.Fail("A3: Wrong Exception type. " + exc.ToString());
+			}
+
+			//different dataTypes
+			try
+			{
+				fkc = new ForeignKeyConstraint(_ds.Tables[0].Columns[0], localTable.Columns[1]);
+				Assertion.Fail("Failed to throw InvalidOperationException.");
+			}
+			catch (InvalidOperationException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch (Exception exc)
+			{
+				Assertion.Fail("A4: Wrong Exception type. " + exc.ToString());
+			}
+
+
+		}
+		public void TestCtorExceptions2 () 
+		{
+			DataColumn col = new DataColumn("MyCol1",typeof(int));
+
+			ForeignKeyConstraint fkc;
+			
+			//Columns must belong to a Table
+			try 
+			{
+				fkc = new ForeignKeyConstraint(col, _ds.Tables[0].Columns[0]);
+				Assertion.Fail("FTT1: Failed to throw ArgumentException.");
+			}
+			catch (ArgumentException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch (Exception exc)
+			{
+				Assertion.Fail("WET1: Wrong Exception type. " + exc.ToString());
+			}
+
+			//Columns must belong to the same table
+			//InvalidConstraintException
+			
+			DataColumn [] difTable = new DataColumn [] {_ds.Tables[0].Columns[2],
+									   _ds.Tables[1].Columns[0]};
+			try 
+			{
+				fkc = new ForeignKeyConstraint(difTable,new DataColumn[] {
+								 _ds.Tables[0].Columns[1],
+								_ds.Tables[0].Columns[0]});
+					
+				Assertion.Fail("FTT2: Failed to throw InvalidConstraintException.");
+			}
+			catch (InvalidConstraintException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch (Exception exc)
+			{
+				Assertion.Fail("WET2: Wrong Exception type. " + exc.ToString());
+			}
+
+
+			//parent columns and child columns should be the same length
+			//ArgumentException
+			DataColumn [] twoCol = 
+				new DataColumn [] {_ds.Tables[0].Columns[0],_ds.Tables[0].Columns[1]};
+							  
+
+			try 
+			{
+				fkc = new ForeignKeyConstraint(twoCol, 
+					new DataColumn[] { _ds.Tables[0].Columns[0]});
+					
+				Assertion.Fail("FTT3: Failed to throw ArgumentException.");
+			}
+			catch (ArgumentException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch (Exception exc)
+			{
+				Assertion.Fail("WET3: Wrong Exception type. " + exc.ToString());
+			}
+
+			//InvalidOperation: Parent and child are the same column.
+			try 
+			{
+				fkc = new ForeignKeyConstraint( _ds.Tables[0].Columns[0],
+					_ds.Tables[0].Columns[0] );
+					
+				Assertion.Fail("FTT4: Failed to throw InvalidOperationException.");
+			}
+			catch (InvalidOperationException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch (Exception exc)
+			{
+				Assertion.Fail("WET4: Wrong Exception type. " + exc.ToString());
+			}
+
+		}
+
+		public void TestEquals()
+		{
+			//TODO:
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest.cs b/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest.cs
new file mode 100644
index 00000000000..590720d4c7d
--- /dev/null
+++ b/mcs/class/System.Data/Test/System.Data/UniqueConstraintTest.cs
@@ -0,0 +1,181 @@
+// UniqueConstraintTest.cs - NUnit Test Cases for testing the class System.Data.UniqueConstraint
+//
+// Franklin Wise <gracenote@earthlink.net>
+//
+// (C) 2002 Franklin Wise
+// 
+
+using NUnit.Framework;
+using System;
+using System.Data;
+
+namespace MonoTests.System.Data
+{
+	public class UniqueConstraintTest : TestCase 
+	{
+		private DataTable _table;
+
+		public UniqueConstraintTest() : base ("MonoTests.System.Data.UniqueConstraintTest") {}
+		public UniqueConstraintTest(string name) : base(name) {}
+	
+		public void PublicSetup() {this.SetUp();}
+		protected override void SetUp() {
+
+			//Setup DataTable
+			_table = new DataTable("TestTable");
+			_table.Columns.Add("Col1",typeof(int));
+			_table.Columns.Add("Col2",typeof(int));
+			_table.Columns.Add("Col3",typeof(int));
+
+		}  
+
+		protected override void TearDown() {}
+
+		public static ITest Suite {
+			get { 
+				return new TestSuite(typeof(UniqueConstraintTest)); 
+			}
+		}
+
+		public void TestCtorExceptions() {
+			//UniqueConstraint(string name, DataColumn column, bool isPrimaryKey)
+
+			UniqueConstraint cst;
+			
+			//must have DataTable exception
+			try{
+				//Should throw an ArgumentException
+				//Can only add DataColumns that are attached
+				//to a DataTable
+				cst = new UniqueConstraint(new DataColumn(""));
+
+				Assertion.Fail("Failed to throw ArgumentException.");
+			}
+			catch (ArgumentException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch {
+				Assertion.Fail("A1: Wrong Exception type.");
+			}	
+
+			//Null exception
+			try {
+				//Should throw argument null exception
+				cst = new UniqueConstraint((DataColumn)null);
+			}
+			catch (ArgumentNullException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch {
+				Assertion.Fail("A2: Wrong Exception type.");
+			}
+
+			
+			try {
+				//Should throw exception
+				//must have at least one valid column
+				//InvalidConstraintException is thrown by msft ver
+				cst = new UniqueConstraint(new DataColumn [] {});
+
+				Assertion.Fail("B1: Failed to throw InvalidConstraintException.");
+			}
+			catch (InvalidConstraintException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch {
+				Assertion.Fail("A3: Wrong Exception type.");
+			}
+
+			DataTable dt = new DataTable("Table1");
+			dt.Columns.Add("Col1",typeof(int));
+			DataTable dt2 = new DataTable("Table2");
+			dt2.Columns.Add("Col1",typeof(int));
+
+			DataSet ds = new DataSet();
+			ds.Tables.Add(dt);
+			ds.Tables.Add(dt2);
+
+			//columns from two different tables.
+			try {
+				//next line should throw
+				//can't have columns from two different tables
+				cst = new UniqueConstraint(new DataColumn [] { 
+						 dt.Columns[0], dt2.Columns[0]});
+
+				Assertion.Fail("B2: Failed to throw InvalidConstraintException");
+			}
+			catch (InvalidConstraintException) {}
+			catch (AssertionFailedError exc) {throw exc;}
+			catch {
+				Assertion.Fail("A4: Wrong Exception type.");
+			}
+			
+
+			
+		}
+
+
+		public void TestCtor() {
+			
+			UniqueConstraint cst;
+		
+			//Success case
+			try {
+				cst = new UniqueConstraint(_table.Columns[0]);
+			}
+			catch (Exception exc) {
+				Assertion.Fail("A1: Failed to ctor. " + exc.ToString());
+			}
+
+			
+			try {
+				cst = new UniqueConstraint( new DataColumn [] {
+						_table.Columns[0], _table.Columns[1]});
+			}
+			catch (Exception exc) {
+				Assertion.Fail("A2: Failed to ctor. " + exc.ToString());
+			}
+
+			
+			//table is set on ctor
+			cst = new UniqueConstraint(_table.Columns[0]);
+			
+			Assertion.AssertSame("B1", cst.Table, _table);
+
+			//table is set on ctor
+			cst = new UniqueConstraint( new DataColumn [] {
+				      _table.Columns[0], _table.Columns[1]});
+			Assertion.AssertSame ("B2", cst.Table, _table);
+
+			cst = new UniqueConstraint("MyName",_table.Columns[0],true);
+
+			//Test ctor parm set for ConstraintName & IsPrimaryKey
+			Assertion.AssertEquals("ConstraintName not set in ctor.", 
+				"MyName", cst.ConstraintName);
+			Assertion.AssertEquals("IsPrimaryKey not set in ctor.",
+				true, cst.IsPrimaryKey);
+		
+		}
+
+		public void TestEquals() {
+			UniqueConstraint cst = new UniqueConstraint( new DataColumn [] {
+					_table.Columns[0], _table.Columns[1]});
+			UniqueConstraint cst2 = new UniqueConstraint( new DataColumn [] {
+					 _table.Columns[1], _table.Columns[0]});
+
+			UniqueConstraint cst3 = new UniqueConstraint(_table.Columns[0]);
+			UniqueConstraint cst4 = new UniqueConstraint(_table.Columns[2]);
+			
+			//true
+			Assertion.Assert(cst.Equals(cst2) == true);
+			
+			//false
+			Assertion.Assert("A1", cst.Equals(23) == false);
+			Assertion.Assert("A2", cst.Equals(cst3) == false);
+			Assertion.Assert("A3", cst3.Equals(cst) == false);
+			Assertion.Assert("A4", cst.Equals(cst4) == false);
+
+		}
+
+
+	
+		
+	}
+}
diff --git a/mcs/class/System.Data/Test/System.Data_test.build b/mcs/class/System.Data/Test/System.Data_test.build
new file mode 100644
index 00000000000..ce77e02c539
--- /dev/null
+++ b/mcs/class/System.Data/Test/System.Data_test.build
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+

+<!-- NAnt build file for System.Data_test.dll -->

+<!-- Target build (default) builds tests -->

+<!-- Target test runs tests -->

+

+<project name="System.Data_test" default="build">

+	<property name="debug" value="false"/>

+	<property name="nunit_home" value="..\..\..\nunit"/>

+

+	<target name="build">

+	</target>

+

+	<target name="assemblies">

+		<csc target="library" output="System.Data_test.dll" debug="${debug}">

+			<arg value="/nowarn:1595"/>

+			<sources>

+				<includes name="**/*.cs"/>

+				<excludes name="TheTests.cs"/>

+				<excludes name="ReadPostgresData.cs"/>

+				<excludes name="TestExecuteScalar.cs"/>

+				<excludes name="TestSqlDataReader.cs"/>

+				<excludes name="TestSqlException.cs"/>

+				<excludes name="TestSqlInsert.cs"/>

+				<excludes name="TestSqlIsolationLevel.cs"/>

+				<excludes name="TestSqlDataAdapter.cs"/>

+				<excludes name="PostgresTest.cs"/>

+				<excludes name="TestSqlParameters.cs"/>

+				<excludes name="SqlSharpCli.cs"/>

+

+			</sources>

+			<references basedir="..\..\..\nunit">

+				<includes name="NUnitCore.dll"/>

+			</references>

+			<arg value="/r:..\..\lib\System.Data.dll"/>

+		</csc>

+	</target>

+

+	<target name="RunTests">

+		<csc target="exe" output="RunTests.System.Data.exe" debug="${debug}">

+			<sources>

+				<includes name="**/*.cs"/>

+				<excludes name="**/AllTests.cs"/>

+				<excludes name="**/MartinTests.cs"/>

+				<excludes name="ReadPostgresData.cs"/>

+				<excludes name="TestExecuteScalar.cs"/>

+				<excludes name="TestSqlDataReader.cs"/>

+				<excludes name="TestSqlException.cs"/>

+				<excludes name="TestSqlInsert.cs"/>

+				<excludes name="TestSqlIsolationLevel.cs"/>

+				<excludes name="PostgresTest.cs"/>

+				<excludes name="TestSqlDataAdapter.cs"/>

+				<excludes name="TestSqlParameters.cs"/>

+				<excludes name="SqlSharpCli.cs"/>

+

+			</sources>

+			<references basedir="..\..\..\nunit">

+				<includes name="NUnitBase.dll"/>

+			</references>

+			<arg value="/nowarn:1595"/>

+			<arg value="/noconfig"/>

+			<arg value="/r:..\..\lib\System.Data.dll"/>

+		</csc>

+

+	</target>

+

+	<target name="test" depends="assemblies">

+		<exec program="..\..\..\nunit\NUnitConsole" commandline="MonoTests.System.Data.AllTests,System.Data_test.dll" failonerror="false"/>

+	</target>

+

+	<target name="clean">

+		<delete file="System.Data.dll" failonerror="false"/>

+		<delete file="System.Data_test.dll" failonerror="false"/>

+	</target>

+</project>

diff --git a/mcs/class/System.Data/Test/TestExecuteScalar.cs b/mcs/class/System.Data/Test/TestExecuteScalar.cs
new file mode 100644
index 00000000000..e350a3c61c5
--- /dev/null
+++ b/mcs/class/System.Data/Test/TestExecuteScalar.cs
@@ -0,0 +1,149 @@
+//

+// Test/ExecuteScalar.cs

+//

+// Test the ExecuteScalar method in the 

+// System.Data.SqlClient.SqlCommand class

+//

+// ExecuteScalar is meant to be lightweight

+// compared to ExecuteReader and only

+// returns one column and one row as one object.

+//

+// It is meant for SELECT SQL statements that

+// use an aggregate/group by function, such as,

+// count(), sum(), avg(), min(), max(), etc...

+// 

+// The object that is returned you do an

+// explicit cast.  For instance, to retrieve a

+// Count of rows in a PostgreSQL table, you

+// would use "SELECT COUNT(*) FROM SOMETABLE"

+// which returns a number of oid type 20 which is 

+// a PostgreSQL int8 which maps to 

+// the .NET type System.Int64.  You

+// have to explicitly convert this returned object

+// to the type you are expecting, such as, an Int64

+// is returned for a COUNT().

+// would be:

+//      Int64 myCount = (Int64) cmd.ExecuteScalar(selectStatement);

+//

+// Author:

+//	Daniel Morgan <danmorg@sc.rr.com>

+//

+// (C) 2002 Daniel Morgan

+//

+

+using System;

+using System.Data;

+using System.Data.SqlClient;

+

+namespace TestSystemDataSqlClient

+{

+	class TestSqlDataReader

+	{

+

+		static void Test() { 

+			SqlConnection con = null;

+			SqlCommand cmd = null;

+						

+			String connectionString = null;

+			String sql = null;

+

+			connectionString = 
+				"host=localhost;" +
+				"dbname=test;" +
+				"user=postgres";
+			

+			try {

+				string maxStrValue;

+

+				con = new SqlConnection(connectionString);

+				con.Open();

+

+				// test SQL Query for an aggregate count(*)

+				sql = 	"select count(*) " + 

+					"from sometable";

+				cmd = new SqlCommand(sql,con);

+				Console.WriteLine("Executing: " + sql);

+				Int64 rowCount = (Int64) cmd.ExecuteScalar();

+				Console.WriteLine("Row Count: " + rowCount);

+

+				// test SQL Query for an aggregate min(text)

+				sql = 	"select max(tdesc) " + 

+					"from sometable";

+				cmd = new SqlCommand(sql,con);

+				Console.WriteLine("Executing: " + sql);

+				string minValue = (string) cmd.ExecuteScalar();

+				Console.WriteLine("Max Value: " + minValue);

+

+				// test SQL Query for an aggregate max(text)

+				sql = 	"select min(tdesc) " + 

+					"from sometable";

+				cmd = new SqlCommand(sql,con);

+				Console.WriteLine("Executing: " + sql);

+				maxStrValue = (string) cmd.ExecuteScalar();

+				Console.WriteLine("Max Value: " + maxStrValue);

+

+				// test SQL Query for an aggregate max(int)

+				sql = 	"select min(aint4) " + 

+					"from sometable";

+				cmd = new SqlCommand(sql,con);

+				Console.WriteLine("Executing: " + sql);

+				int maxIntValue = (int) cmd.ExecuteScalar();

+				Console.WriteLine("Max Value: " + maxIntValue.ToString());

+

+				// test SQL Query for an aggregate avg(int)

+				sql = 	"select avg(aint4) " + 

+					"from sometable";

+				cmd = new SqlCommand(sql,con);

+				Console.WriteLine("Executing: " + sql);

+				decimal avgDecValue = (decimal) cmd.ExecuteScalar();

+				Console.WriteLine("Max Value: " + avgDecValue.ToString());

+

+				// test SQL Query for an aggregate sum(int)

+				sql = 	"select sum(aint4) " + 

+					"from sometable";

+				cmd = new SqlCommand(sql,con);

+				Console.WriteLine("Executing: " + sql);

+				Int64 summed = (Int64) cmd.ExecuteScalar();

+				Console.WriteLine("Max Value: " + summed);

+

+				// test a SQL Command is (INSERT, UPDATE, DELETE)

+				sql = 	"insert into sometable " +

+					"(tid,tdesc,aint4,atimestamp) " +

+					"values('qqq','www',234,NULL)";

+				cmd = new SqlCommand(sql,con);

+				Console.WriteLine("Executing: " + sql);

+				object objResult1 = cmd.ExecuteScalar();

+				if(objResult1 == null)

+                                        Console.WriteLine("Result is null. (correct)");

+				else

+					Console.WriteLine("Result is not null. (not correct)");

+

+				// test a SQL Command is not (INSERT, UPDATE, DELETE)

+				sql = 	"SET DATESTYLE TO 'ISO'";

+				cmd = new SqlCommand(sql,con);

+				Console.WriteLine("Executing: " + sql);

+				object objResult2 = cmd.ExecuteScalar();

+				if(objResult2 == null)

+					Console.WriteLine("Result is null. (correct)");

+				else

+					Console.WriteLine("Result is not null. (not correct)");

+

+			}

+			catch(Exception e) {

+				Console.WriteLine(e.ToString());

+			}

+			finally {

+				if(con != null)
+					if(con.State == ConnectionState.Open)
+						con.Close();

+			}

+		}

+

+		[STAThread]

+		static void Main(string[] args)

+		{

+			Test();

+		}

+

+	}

+}

diff --git a/mcs/class/System.Data/Test/TestSqlDataAdapter.cs b/mcs/class/System.Data/Test/TestSqlDataAdapter.cs
new file mode 100644
index 00000000000..684bfa83485
--- /dev/null
+++ b/mcs/class/System.Data/Test/TestSqlDataAdapter.cs
@@ -0,0 +1,66 @@
+//
+// TestSqlDataAdapter - tests SqlDataAdapter, DbDataAdapter, DataSet, DataTable,
+//                      DataRow, and DataRowCollection by retrieving data
+//
+// Authors:
+//      Tim Coleman <tim@timcoleman.com>
+//      Daniel Morgan <danmorg@sc.rr.com>
+//
+// (c)copyright 2002 Tim Coleman
+// (c)copyright 2002 Daniel Morgan
+//
+
+using System;
+using System.Collections;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace TestSystemDataSqlClient 
+{
+	public class TestSqlDataAdapter 
+	{
+		public static void Test() 
+		{
+			string connectionString;
+			string sqlQuery;
+			SqlDataAdapter adapter;
+			DataSet dataSet = null;
+
+			connectionString =
+				"host=localhost;" +
+				"dbname=test;" +
+				"user=postgres";
+						
+			sqlQuery = "select * from pg_tables";
+
+			System.Console.WriteLine ("new SqlDataAdapter...");
+			adapter = new SqlDataAdapter (sqlQuery, 
+					connectionString);
+
+			System.Console.WriteLine ("new DataSet...");
+			dataSet = new DataSet ();
+
+			try {
+				System.Console.WriteLine("Fill...");
+				adapter.Fill (dataSet);
+
+			}
+			catch (NotImplementedException e) {
+				Console.WriteLine("Exception Caught: " + e);
+			}		
+			
+			System.Console.WriteLine ("get row...");
+			if (dataSet != null) {
+				foreach (DataRow row in dataSet.Tables["Table"].Rows)
+					Console.WriteLine("tablename: " + row["tablename"]);
+				System.Console.WriteLine("Done.");
+			}
+
+		}
+
+		public static void Main() 
+		{
+			Test();
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/TestSqlDataReader.cs b/mcs/class/System.Data/Test/TestSqlDataReader.cs
new file mode 100644
index 00000000000..17a61189de1
--- /dev/null
+++ b/mcs/class/System.Data/Test/TestSqlDataReader.cs
@@ -0,0 +1,181 @@
+//

+// Test/SqlDataRead.cs

+//

+// Test to do read a simple forward read only record set.

+// Using SqlCommand.ExecuteReader() to return a SqlDataReader

+// which can be used to Read a row

+// and Get a String or Int32.

+//

+// Author:

+//	Daniel Morgan <danmorg@sc.rr.com>

+//

+// (C) 2002 Daniel Morgan

+//

+

+using System;

+using System.Data;

+using System.Data.SqlClient;

+

+namespace TestSystemDataSqlClient {

+	class TestSqlDataReader {

+

+		static void Test(SqlConnection con, string sql, 

+				CommandType cmdType, CommandBehavior behavior,

+				string testDesc) 

+		{ 

+			SqlCommand cmd = null;

+			SqlDataReader rdr = null;

+			

+			int c;

+			int results = 0;

+

+			Console.WriteLine("Test: " + testDesc);

+			Console.WriteLine("[BEGIN SQL]");

+			Console.WriteLine(sql);

+			Console.WriteLine("[END SQL]");

+

+			cmd = new SqlCommand(sql, con);

+			cmd.CommandType = cmdType;

+						

+			Console.WriteLine("ExecuteReader...");

+			rdr = cmd.ExecuteReader(behavior);

+

+			if(rdr == null) {
+		
+				Console.WriteLine("IDataReader has a Null Reference.");
+			}
+			else {
+

+				do {

+					// get the DataTable that holds

+					// the schema

+					DataTable dt = rdr.GetSchemaTable();

+

+					if(rdr.RecordsAffected != -1) {

+						// Results for 

+						// SQL INSERT, UPDATE, DELETE Commands 

+						// have RecordsAffected >= 0

+						Console.WriteLine("Result is from a SQL Command (INSERT,UPDATE,DELETE).  Records Affected: " + rdr.RecordsAffected);

+					}

+					else if (dt == null)

+						Console.WriteLine("Result is from a SQL Command not (INSERT,UPDATE,DELETE).   Records Affected: " + rdr.RecordsAffected);

+					else {

+						// Results for

+						// SQL not INSERT, UPDATE, nor DELETE

+						// have RecordsAffected = -1

+						Console.WriteLine("Result is from a SQL SELECT Query.  Records Affected: " + rdr.RecordsAffected);

+			

+						// Results for a SQL Command (CREATE TABLE, SET, etc)

+						// will have a null reference returned from GetSchemaTable()

+						// 

+						// Results for a SQL SELECT Query

+						// will have a DataTable returned from GetSchemaTable()

+

+						results++;

+						Console.WriteLine("Result Set " + results + "...");

+                        			

+						// number of columns in the table

+						Console.WriteLine("   Total Columns: " +

+							dt.Columns.Count);

+

+						// display the schema

+						foreach (DataRow schemaRow in dt.Rows) {

+							foreach (DataColumn schemaCol in dt.Columns)

+								Console.WriteLine(schemaCol.ColumnName + 

+									" = " + 

+									schemaRow[schemaCol]);

+							Console.WriteLine();

+						}

+

+						int nRows = 0;

+						string output, metadataValue, dataValue;

+						// Read and display the rows

+						Console.WriteLine("Gonna do a Read() now...");

+						while(rdr.Read()) {

+							Console.WriteLine("   Row " + nRows + ": ");

+					

+							for(c = 0; c < rdr.FieldCount; c++) {

+								// column meta data 

+								DataRow dr = dt.Rows[c];

+								metadataValue = 

+									"    Col " + 

+									c + ": " + 

+									dr["ColumnName"];

+						

+								// column data

+								if(rdr.IsDBNull(c) == true)

+									dataValue = " is NULL";

+								else

+									dataValue = 

+										": " + 

+										rdr.GetValue(c);

+					

+								// display column meta data and data

+								output = metadataValue + dataValue;					

+								Console.WriteLine(output);

+							}

+							nRows++;

+						}

+						Console.WriteLine("   Total Rows: " + 

+							nRows);

+					}	

+				} while(rdr.NextResult());

+				Console.WriteLine("Total Result sets: " + results);

+			

+				rdr.Close();

+			}

+					

+		}

+

+		[STAThread]

+		static void Main(string[] args) {

+			String connectionString = null;

+			connectionString = 
+				"host=localhost;" +
+				"dbname=test;" +
+				"user=postgres";
+						

+			SqlConnection con;

+			con = new SqlConnection(connectionString);

+			con.Open();

+

+			string sql;

+

+			// Text - only has one query (single query behavior)

+			sql = "select * from pg_tables";

+			Test(con, sql, CommandType.Text, 

+				CommandBehavior.SingleResult, "Text1");

+

+			// Text - only has one query (default behavior)

+			sql = "select * from pg_tables";

+			Test(con, sql, CommandType.Text, 

+				CommandBehavior.Default, "Text2");

+			

+			// Text - has three queries

+			sql =

+				"select * from pg_user;" + 

+				"select * from pg_tables;" + 

+				"select * from pg_database";

+			Test(con, sql, CommandType.Text, 

+				CommandBehavior.Default, "Text3Queries");

+			

+			// Table Direct

+			sql = "pg_tables";

+			Test(con, sql, CommandType.TableDirect, 

+				CommandBehavior.Default, "TableDirect1");

+

+			// Stored Procedure

+			sql = "version";

+			Test(con, sql, CommandType.StoredProcedure, 

+				CommandBehavior.Default, "SP1");

+

+			// Text - test a SQL Command (default behavior)

+			// Note: this not a SQL Query

+			sql = "SET DATESTYLE TO 'ISO'";

+			Test(con, sql, CommandType.Text, 

+				CommandBehavior.Default, "TextCmd1");

+

+			con.Close();

+		}

+	}

+}

diff --git a/mcs/class/System.Data/Test/TestSqlException.cs b/mcs/class/System.Data/Test/TestSqlException.cs
new file mode 100644
index 00000000000..294a1ddfba3
--- /dev/null
+++ b/mcs/class/System.Data/Test/TestSqlException.cs
@@ -0,0 +1,118 @@
+//
+// TestSqlInsert.cs
+//
+// To Test SqlConnection and SqlCommand by connecting
+// to a PostgreSQL database 
+// and then executing an INSERT SQL statement
+//
+// To use:
+//   change strings to your database, userid, tables, etc...:
+//        connectionString
+//        insertStatement
+//
+// To test:
+//   mcs TestSqlInsert.cs -r System.Data
+//   mint TestSqlInsert.exe
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace TestSystemDataSqlClient
+{
+	class TestSqlInsert
+	{
+		[STAThread]
+		static void Main(string[] args) {
+			SqlConnection conn;
+			SqlCommand cmd;
+			SqlTransaction trans;
+
+			int rowsAffected;
+
+			String connectionString;
+			String insertStatement;
+			String deleteStatement;
+	
+			connectionString = 
+				"host=localhost;" +
+				"dbname=test;" +
+				"user=postgres";
+
+			insertStatement = 
+				"insert into NoSuchTable " +
+				"(tid, tdesc) " +
+				"values ('beer', 'Beer for All!') ";
+
+			deleteStatement = 
+				"delete from sometable " +
+				"where tid = 'beer' ";
+
+			try {
+				// Connect to a PostgreSQL database
+				Console.WriteLine ("Connect to database...");
+				conn = new SqlConnection(connectionString);
+				conn.Open();
+			
+				// begin transaction
+				Console.WriteLine ("Begin Transaction...");
+				trans = conn.BeginTransaction();
+
+				// create SQL DELETE command
+				Console.WriteLine ("Create Command initializing " +
+					"with an DELETE statement...");
+				cmd = new SqlCommand (deleteStatement, conn);
+
+				// execute the DELETE SQL command
+				Console.WriteLine ("Execute DELETE SQL Command...");
+				rowsAffected = cmd.ExecuteNonQuery();
+				Console.WriteLine ("Rows Affected: " + rowsAffected);
+
+				// change the SQL command to an SQL INSERT Command
+				Console.WriteLine ("Now use INSERT SQL Command...");
+				cmd.CommandText = insertStatement;
+
+				// execute the INSERT SQL command
+				Console.WriteLine ("Execute INSERT SQL Command...");
+				rowsAffected = cmd.ExecuteNonQuery();
+				Console.WriteLine ("Rows Affected: " + rowsAffected);
+
+				// if successfull at INSERT, commit the transaction,
+				// otherwise, do a rollback the transaction using
+				// trans.Rollback();
+				Console.WriteLine ("Commit transaction...");
+				trans.Commit();
+
+				// Close connection to database
+				Console.WriteLine ("Close database connection...");
+				conn.Close();
+
+				Console.WriteLine ("Assuming everything " +
+					"was successful.");
+				Console.WriteLine ("Verify data in database to " +
+					"see if row is there.");
+			}
+			catch(SqlException e) {
+				// Display the SQL Errors and Rollback the database
+				Console.WriteLine("SqlException caught: " +
+					e.ToString());
+				if(trans != null) {
+					trans.Rollback();
+					Console.WriteLine("Database has been Rolled back!");
+				}
+			}
+			finally {
+				if(conn != null)
+					if(conn.State == ConnectionState.Open)
+						conn.Close();
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/TestSqlInsert.cs b/mcs/class/System.Data/Test/TestSqlInsert.cs
new file mode 100644
index 00000000000..d8d31348eff
--- /dev/null
+++ b/mcs/class/System.Data/Test/TestSqlInsert.cs
@@ -0,0 +1,105 @@
+//
+// TestSqlInsert.cs
+//
+// To Test SqlConnection and SqlCommand by connecting
+// to a PostgreSQL database 
+// and then executing an INSERT SQL statement
+//
+// To use:
+//   change strings to your database, userid, tables, etc...:
+//        connectionString
+//        insertStatement
+//
+// To test:
+//   mcs TestSqlInsert.cs -r System.Data
+//   mint TestSqlInsert.exe
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace TestSystemDataSqlClient
+{
+	class TestSqlInsert
+	{
+		[STAThread]
+		static void Main(string[] args)
+		{
+			SqlConnection conn;
+			SqlCommand cmd;
+			SqlTransaction trans;
+
+			int rowsAffected;
+
+			String connectionString;
+			String insertStatement;
+			String deleteStatement;
+	
+			connectionString = 
+				"host=localhost;" +
+				"dbname=test;" +
+				"user=postgres";
+
+			insertStatement = 
+				"insert into sometable " +
+				"(tid, tdesc) " +
+				"values ('beer', 'Beer for All!') ";
+
+			deleteStatement = 
+				"delete from sometable " +
+				"where tid = 'beer' ";
+
+			// Connect to a PostgreSQL database
+			Console.WriteLine ("Connect to database...");
+			conn = new SqlConnection(connectionString);
+			conn.Open();
+
+			// begin transaction
+			Console.WriteLine ("Begin Transaction...");
+			trans = conn.BeginTransaction();
+
+			// create SQL DELETE command
+			Console.WriteLine ("Create Command initializing " +
+				"with an DELETE statement...");
+			cmd = new SqlCommand (deleteStatement, conn);
+
+			// execute the DELETE SQL command
+			Console.WriteLine ("Execute DELETE SQL Command...");
+			rowsAffected = cmd.ExecuteNonQuery();
+			Console.WriteLine ("Rows Affected: " + rowsAffected);
+
+			// change the SQL command to an SQL INSERT Command
+			Console.WriteLine ("Now use INSERT SQL Command...");
+			cmd.CommandText = insertStatement;
+
+			// execute the INSERT SQL command
+			Console.WriteLine ("Execute INSERT SQL Command...");
+			rowsAffected = cmd.ExecuteNonQuery();
+			Console.WriteLine ("Rows Affected: " + rowsAffected);
+
+			// if successfull at INSERT, commit the transaction,
+			// otherwise, do a rollback the transaction using
+			// trans.Rollback();
+			// FIXME: need to have exceptions working in
+			//        SqlClient classes before you can do rollback
+			Console.WriteLine ("Commit transaction...");
+			trans.Commit();
+
+			// Close connection to database
+			Console.WriteLine ("Close database connection...");
+			conn.Close();
+
+			Console.WriteLine ("Assuming everything " +
+				"was successful.");
+			Console.WriteLine ("Verify data in database to " +
+				"see if row is there.");
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/TestSqlIsolationLevel.cs b/mcs/class/System.Data/Test/TestSqlIsolationLevel.cs
new file mode 100644
index 00000000000..8f0f2823222
--- /dev/null
+++ b/mcs/class/System.Data/Test/TestSqlIsolationLevel.cs
@@ -0,0 +1,104 @@
+//
+// TestSqlIsolationLevel.
+//
+// To Test Setting Isolation Level of SqlTransaction
+// to a PostgreSQL database 
+//
+// To use:
+//   change strings to your database, userid, tables, etc...:
+//        connectionString
+//        insertStatement
+// 
+// To test:
+//   mcs TestSqlIsolationLevel.cs -r System.Data
+//   mint TestSqlIsolationLevel.exe
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//   Daniel Morgan (danmorg@sc.rr.com)
+//
+// (C) Ximian, Inc 2002
+//
+
+using System;
+using System.Data;
+using System.Data.SqlClient;
+
+namespace TestSystemDataSqlClient
+{
+	class TestSqlInsert
+	{
+		[STAThread]
+		static void Main(string[] args)
+		{
+			SqlConnection conn;
+			SqlCommand cmd;
+			SqlTransaction trans;
+			
+			int rowsAffected;
+
+			String connectionString;
+			String insertStatement;
+			String deleteStatement;
+	
+			connectionString = 
+				"host=localhost;" +
+				"dbname=test;" +
+				"user=postgres";
+
+			insertStatement = 
+				"insert into sometable " +
+				"(tid, tdesc) " +
+				"values ('beer', 'Beer for All!') ";
+
+			deleteStatement = 
+				"delete from sometable " +
+				"where tid = 'beer' ";
+
+			// Connect to a PostgreSQL database
+			Console.WriteLine ("Connect to database...");
+			conn = new SqlConnection(connectionString);
+			conn.Open();
+
+			// begin transaction
+			Console.WriteLine ("Begin Transaction...");
+			trans = conn.BeginTransaction(IsolationLevel.Serializable);
+
+			// create SQL DELETE command
+			Console.WriteLine ("Create Command initializing " +
+				"with an DELETE statement...");
+			cmd = new SqlCommand (deleteStatement, conn);
+
+			// execute the DELETE SQL command
+			Console.WriteLine ("Execute DELETE SQL Command...");
+			rowsAffected = cmd.ExecuteNonQuery();
+			Console.WriteLine ("Rows Affected: " + rowsAffected);
+
+			// change the SQL command to an SQL INSERT Command
+			Console.WriteLine ("Now use INSERT SQL Command...");
+			cmd.CommandText = insertStatement;
+
+			// execute the INSERT SQL command
+			Console.WriteLine ("Execute INSERT SQL Command...");
+			rowsAffected = cmd.ExecuteNonQuery();
+			Console.WriteLine ("Rows Affected: " + rowsAffected);
+
+			// if successfull at INSERT, commit the transaction,
+			// otherwise, do a rollback the transaction using
+			// trans.Rollback();
+			// FIXME: need to have exceptions working in
+			//        SqlClient classes before you can do rollback
+			Console.WriteLine ("Commit transaction...");
+			trans.Commit();
+
+			// Close connection to database
+			Console.WriteLine ("Close database connection...");
+			conn.Close();
+
+			Console.WriteLine ("Assuming everything " +
+				"was successful.");
+			Console.WriteLine ("Verify data in database to " +
+				"see if row is there.");
+		}
+	}
+}
diff --git a/mcs/class/System.Data/Test/TestSqlParameters.cs b/mcs/class/System.Data/Test/TestSqlParameters.cs
new file mode 100644
index 00000000000..50807999592
--- /dev/null
+++ b/mcs/class/System.Data/Test/TestSqlParameters.cs
@@ -0,0 +1,127 @@
+//

+// TestSqlParameters.cs - test parameters for the PostgreSQL .NET Data Provider in Mono

+//                        using *Parameter and *ParameterCollection

+//

+// Note: it currently only tests input parameters.  Output is next on the list.

+//       Then output/input and return parameters.

+//

+// Author: 

+//     Daniel Morgan <danmorg@sc.rr.com>

+//

+// (c)copyright 2002 Daniel Morgan

+//

+

+using System;

+using System.Collections;

+using System.Data;

+using System.Data.SqlClient;

+

+namespace TestSystemDataSqlClient {

+

+	public class TestParameters {

+		public static void Main() {

+			Console.WriteLine("** Start Test...");

+			

+			String connectionString = null;

+			connectionString = 
+				"host=localhost;" +
+				"dbname=test;" +
+				"user=postgres";
+						

+			SqlConnection con;

+			Console.WriteLine("** Creating connection...");

+			con = new SqlConnection(connectionString);

+			Console.WriteLine("** opening connection...");

+			con.Open();

+		

+			string tableName = "pg_type";

+

+			string sql;

+			sql = "SELECT * FROM PG_TABLES WHERE TABLENAME = :inTableName";

+						

+			Console.WriteLine("** Creating command...");

+			SqlCommand cmd = new SqlCommand(sql, con);

+			

+			// add parameter for inTableName

+			Console.WriteLine("** Create parameter...");

+			SqlParameter parm = new SqlParameter("inTableName", SqlDbType.Text);

+			

+			Console.WriteLine("** set dbtype of parameter to string");

+			parm.DbType = DbType.String;

+			

+			Console.WriteLine("** set direction of parameter to input");

+			parm.Direction = ParameterDirection.Input;

+			

+			Console.WriteLine("** set value to the tableName string...");

+			parm.Value = tableName;

+			

+			Console.WriteLine("** add parameter to parameters collection in the command...");

+			cmd.Parameters.Add(parm);

+			

+			SqlDataReader rdr;

+			Console.WriteLine("** ExecuteReader()...");

+			

+			rdr = cmd.ExecuteReader();

+			

+			Console.WriteLine("[][] And now we are going to our results [][]...");

+			int c;

+			int results = 0;

+			do {

+				results++;

+				Console.WriteLine("Result Set " + results + "...");

+

+				// get the DataTable that holds

+				// the schema

+				DataTable dt = rdr.GetSchemaTable();

+                        			

+				// number of columns in the table

+				Console.WriteLine("   Total Columns: " +

+					dt.Columns.Count);

+

+				// display the schema

+				foreach (DataRow schemaRow in dt.Rows) {

+					foreach (DataColumn schemaCol in dt.Columns)

+						Console.WriteLine(schemaCol.ColumnName + 

+							" = " + 

+							schemaRow[schemaCol]);

+					Console.WriteLine();

+				}

+

+				string output, metadataValue, dataValue;

+				int nRows = 0;

+

+				// Read and display the rows

+				while(rdr.Read()) {

+					Console.WriteLine("   Row " + nRows + ": ");

+

+					for(c = 0; c < rdr.FieldCount; c++) {

+						// column meta data 

+						DataRow dr = dt.Rows[c];

+						metadataValue = 

+							"    Col " + 

+							c + ": " + 

+							dr["ColumnName"];

+						

+						// column data

+						if(rdr.IsDBNull(c) == true)

+							dataValue = " is NULL";

+						else

+							dataValue = 

+								": " + 

+								rdr.GetValue(c);

+					

+						// display column meta data and data

+						output = metadataValue + dataValue;					

+						Console.WriteLine(output);

+					}

+					nRows++;

+				}

+				Console.WriteLine("   Total Rows: " + 

+					nRows);

+			} while(rdr.NextResult());

+			Console.WriteLine("Total Result sets: " + results);

+

+			con.Close();

+		}

+	}

+}

diff --git a/mcs/class/System.Data/Test/TheTests.cs b/mcs/class/System.Data/Test/TheTests.cs
new file mode 100644
index 00000000000..c69aedfe873
--- /dev/null
+++ b/mcs/class/System.Data/Test/TheTests.cs
@@ -0,0 +1,78 @@
+// Author: Tim Coleman (tim@timcoleman.com)
+// (C) Copyright 2002 Tim Coleman
+
+
+using NUnit.Framework;
+using System;
+using System.Data;
+using System.Threading;
+using System.Globalization;
+
+namespace MonoTests.System.Data
+{
+	public class RunDataColumnTest : DataColumnTest
+	{
+		protected override void RunTest ()
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
+
+namespace MonoTests.System.Data.SqlTypes
+{
+	public class RunSqlInt32Test : SqlInt32Test
+	{
+		protected override void RunTest ()
+		{
+			TestCreate ();
+
+			// property tests
+
+			TestIsNullProperty ();
+
+			// method tests
+
+			TestAdd ();
+			TestBitwiseAnd ();
+			TestBitwiseOr ();
+			TestDivide ();
+			TestEquals ();
+			TestGreaterThan ();
+			TestGreaterThanOrEqual ();
+			TestLessThan ();
+			TestLessThanOrEqual ();
+			TestMod ();
+			TestMultiply ();
+			TestNotEquals ();
+			TestOnesComplement ();
+			TestSubtract ();
+			TestConversionMethods ();
+			TestXor ();
+		}
+	}
+}
+
+namespace MonoTests
+{
+	public class RunAllTests
+	{
+		public static void AddAllTests (TestSuite suite)
+		{
+			suite.AddTest (new MonoTests.System.Data.RunDataColumnTest ());
+			suite.AddTest (new MonoTests.System.Data.SqlTypes.RunSqlInt32Test ());
+		}
+	}
+}
+
+class MainApp
+{
+	public static void Main ()
+	{
+		TestResult result = new TestResult ();
+		TestSuite suite = new TestSuite ();
+		MonoTests.RunAllTests.AddAllTests (suite);
+		suite.Run (result);
+		MonoTests.MyTestRunner.Print (result);
+	}
+}
diff --git a/mcs/class/System.Data/list b/mcs/class/System.Data/list
new file mode 100755
index 00000000000..22108d8820d
--- /dev/null
+++ b/mcs/class/System.Data/list
@@ -0,0 +1,152 @@
+System.Data/AcceptRejectRule.cs
+System.Data/CommandBehavior.cs
+System.Data/CommandType.cs
+System.Data/ConnectionState.cs
+System.Data/Constraint.cs
+System.Data/ConstraintCollection.cs
+System.Data/ConstraintException.cs
+System.Data/DataColumn.cs
+System.Data/DataColumnChangeEventArgs.cs
+System.Data/DataColumnChangeEventHandler.cs
+System.Data/DataColumnCollection.cs
+System.Data/DataException.cs
+System.Data/DataRelation.cs
+System.Data/DataRelationCollection.cs
+System.Data/DataRow.cs
+System.Data/DataRowAction.cs
+System.Data/DataRowBuilder.cs
+System.Data/DataRowChangeEventArgs.cs
+System.Data/DataRowChangeEventHandler.cs
+System.Data/DataRowCollection.cs
+System.Data/DataRowState.cs
+System.Data/DataRowVersion.cs
+System.Data/DataRowView.cs
+System.Data/DataSet.cs
+System.Data/DataTable.cs
+System.Data/DataTableCollection.cs
+System.Data/DataView.cs
+System.Data/DataViewManager.cs
+System.Data/DataViewRowState.cs
+System.Data/DataViewSetting.cs
+System.Data/DataViewSettingCollection.cs
+System.Data/DBConcurrencyException.cs
+System.Data/DbType.cs
+System.Data/DeletedRowInaccessibleException.cs
+System.Data/DuplicateNameException.cs
+System.Data/EvaluateException.cs
+System.Data/FillErrorEventArgs.cs
+System.Data/FillErrorEventHandler.cs
+System.Data/ForeignKeyConstraint.cs
+System.Data/IColumnMapping.cs
+System.Data/IColumnMappingCollection.cs
+System.Data/IDataAdapter.cs
+System.Data/IDataParameter.cs
+System.Data/IDataParameterCollection.cs
+System.Data/IDataReader.cs
+System.Data/IDataRecord.cs
+System.Data/IDbCommand.cs
+System.Data/IDbConnection.cs
+System.Data/IDbDataAdapter.cs
+System.Data/IDbDataParameter.cs
+System.Data/IDbTransaction.cs
+System.Data/InRowChangingEventException.cs
+System.Data/InternalDataCollectionBase.cs
+System.Data/InvalidConstraintException.cs
+System.Data/InvalidExpressionException.cs
+System.Data/IsolationLevel.cs
+System.Data/ITableMapping.cs
+System.Data/ITableMappingCollection.cs
+System.Data/Locale.cs
+System.Data/MappingType.cs
+System.Data/MergeFailedEventArgs.cs
+System.Data/MergeFailedEventHandler.cs
+System.Data/MissingMappingAction.cs
+System.Data/MissingPrimaryKeyException.cs
+System.Data/MissingSchemaAction.cs
+System.Data/NoNullAllowedException.cs
+System.Data/ParameterDirection.cs
+System.Data/PropertyAttributes.cs
+System.Data/PropertyCollection.cs
+System.Data/ReadOnlyException.cs
+System.Data/RowNotInTableException.cs
+System.Data/Rule.cs
+System.Data/SchemaType.cs
+System.Data/SqlDbType.cs
+System.Data/StateChangeEventArgs.cs
+System.Data/StateChangeEventHandler.cs
+System.Data/StatementType.cs
+System.Data/StrongTypingException.cs
+System.Data/SyntaxErrorException.cs
+System.Data/TODOAttribute.cs
+System.Data/TypeDataSetGeneratorException.cs
+System.Data/UniqueConstraint.cs
+System.Data/UpdateRowSource.cs
+System.Data/UpdateStatus.cs
+System.Data/VersionNotFoundException.cs
+System.Data/XmlReadMode.cs
+System.Data/XmlWriteMode.cs
+System.Data.Common/DataAdapter.cs
+System.Data.Common/DataColumnMapping.cs
+System.Data.Common/DataColumnMappingCollection.cs
+System.Data.Common/DataTableMapping.cs
+System.Data.Common/DataTableMappingCollection.cs
+System.Data.Common/DbDataAdapter.cs
+System.Data.Common/DbDataPermission.cs
+System.Data.Common/DbDataPermissionAttribute.cs
+System.Data.Common/RowUpdatedEventArgs.cs
+System.Data.Common/RowUpdatingEventArgs.cs
+System.Data.OleDb/libgda.cs
+System.Data.OleDb/OleDbCommand.cs
+System.Data.OleDb/OleDbCommandBuilder.cs
+System.Data.OleDb/OleDbConnection.cs
+System.Data.OleDb/OleDbDataAdapter.cs
+System.Data.OleDb/OleDbDataReader.cs
+System.Data.OleDb/OleDbError.cs
+System.Data.OleDb/OleDbErrorCollection.cs
+System.Data.OleDb/OleDbException.cs
+System.Data.OleDb/OleDbInfoMessageEventArgs.cs
+System.Data.OleDb/OleDbInfoMessageEventHandler.cs
+System.Data.OleDb/OleDbLiteral.cs
+System.Data.OleDb/OleDbParameter.cs
+System.Data.OleDb/OleDbParameterCollection.cs
+System.Data.OleDb/OleDbPermission.cs
+System.Data.OleDb/OleDbPermissionAttribute.cs
+System.Data.OleDb/OleDbRowUpdatedEventArgs.cs
+System.Data.OleDb/OleDbRowUpdatedEventHandler.cs
+System.Data.OleDb/OleDbRowUpdatingEventArgs.cs
+System.Data.OleDb/OleDbRowUpdatingEventHandler.cs
+System.Data.OleDb/OleDbSchemaGuid.cs
+System.Data.OleDb/OleDbTransaction.cs
+System.Data.OleDb/OleDbType.cs
+System.Data.SqlClient/ParmUtil.cs
+System.Data.SqlClient/PostgresLibrary.cs
+System.Data.SqlClient/PostgresTypes.cs
+System.Data.SqlClient/SqlCommand.cs
+System.Data.SqlClient/SqlConnection.cs
+System.Data.SqlClient/SqlDataReader.cs
+System.Data.SqlClient/SqlError.cs
+System.Data.SqlClient/SqlErrorCollection.cs
+System.Data.SqlClient/SqlException.cs
+System.Data.SqlClient/SqlInfoMessageEventArgs.cs
+System.Data.SqlClient/SqlInfoMessageEventHandler.cs
+System.Data.SqlClient/SqlParameter.cs
+System.Data.SqlClient/SqlParameterCollection.cs
+System.Data.SqlClient/SqlTransaction.cs
+System.Data.SqlTypes/INullable.cs
+System.Data.SqlTypes/SqlBinary.cs
+System.Data.SqlTypes/SqlBoolean.cs
+System.Data.SqlTypes/SqlByte.cs
+System.Data.SqlTypes/SqlCompareOptions.cs
+System.Data.SqlTypes/SqlDateTime.cs
+System.Data.SqlTypes/SqlDecimal.cs
+System.Data.SqlTypes/SqlDouble.cs
+System.Data.SqlTypes/SqlGuid.cs
+System.Data.SqlTypes/SqlInt16.cs
+System.Data.SqlTypes/SqlInt32.cs
+System.Data.SqlTypes/SqlInt64.cs
+System.Data.SqlTypes/SqlMoney.cs
+System.Data.SqlTypes/SqlNullValueException.cs
+System.Data.SqlTypes/SqlSingle.cs
+System.Data.SqlTypes/SqlString.cs
+System.Data.SqlTypes/SqlTruncateException.cs
+System.Data.SqlTypes/SqlTypeException.cs
diff --git a/mcs/class/System.Data/makefile.gnu b/mcs/class/System.Data/makefile.gnu
new file mode 100644
index 00000000000..7e547e0e5a4
--- /dev/null
+++ b/mcs/class/System.Data/makefile.gnu
@@ -0,0 +1,16 @@
+topdir = ../..
+
+LIBRARY = ../lib/System.Data.dll
+
+LIB_LIST = list
+LIB_FLAGS = -r corlib -r System -r System.Xml
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=\
+	./Test*	\
+	*TestGDA.cs	\
+	./System.Xml*
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/System.Drawing/.cvsignore b/mcs/class/System.Drawing/.cvsignore
new file mode 100644
index 00000000000..3dc011267d6
--- /dev/null
+++ b/mcs/class/System.Drawing/.cvsignore
@@ -0,0 +1,2 @@
+.makefrag
+.response
diff --git a/mcs/class/System.Drawing/ChangeLog b/mcs/class/System.Drawing/ChangeLog
new file mode 100644
index 00000000000..afd4f8cda2b
--- /dev/null
+++ b/mcs/class/System.Drawing/ChangeLog
@@ -0,0 +1,6 @@
+2002-06-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>

+

+	* ChangeLog: new file.

+

+	* System.Drawing.build: added System.dll dependency

+	

diff --git a/mcs/class/System.Drawing/System.Drawing.Design/UITypeEditorEditStyle.cs b/mcs/class/System.Drawing/System.Drawing.Design/UITypeEditorEditStyle.cs
new file mode 100644
index 00000000000..6a571cc7cc4
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Design/UITypeEditorEditStyle.cs
@@ -0,0 +1,15 @@
+//

+// System.Drawing.Design.UITypeEditorEditStyle.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Design

+{

+	public enum  UITypeEditorEditStyle{

+			DropDown=1,

+			Modal=2,

+			None=3

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog b/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog
new file mode 100644
index 00000000000..cf74d68dffe
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/ChangeLog
@@ -0,0 +1,7 @@
+2002-01-06  Ravi Pratap  <ravi@ximian.com>
+
+	* ChangeLog : Add.
+
+	* Matrix.cs : MonoTODO everywhere.
+
+	* TODOAttribute.cs : Add here too.
\ No newline at end of file
diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/Enums.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/Enums.cs
new file mode 100644
index 00000000000..3ba9f61892e
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/Enums.cs
@@ -0,0 +1,258 @@
+//
+// System.Drawing.Drawing2D.Matrix.cs
+//
+// Author:
+//   Stefan Maierhofer <sm@cg.tuwien.ac.at>
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Drawing.Drawing2D
+{
+   
+    public enum CombineMode
+    {
+        Complement,
+        Exclude,
+        Intersect,
+        Replace,
+        Union,
+        Xor
+    }
+    
+    public enum CompositingMode
+    {
+        SourceCopy,
+        SourceOver
+    }
+    
+    public enum CompositingQuality
+    {
+        AssumeLinear,
+        Default,
+        GammaCorrected,
+        HighQuality,
+        HighSpeed,
+        Invalid
+    }
+    
+    public enum CoordinateSpace
+    {
+        Device,
+        Page,
+        World
+    }
+    
+    public enum DashCap
+    {
+        Flat,
+        Round,
+        Triangle
+    }
+    
+    public enum DashStyle
+    {
+        Custom,
+        Dash,
+        DashDot,
+        DashDotDot,
+        Dot,
+        Solid
+    }
+    
+    public enum FillMode
+    {
+        Alternate,
+        Winding
+    }
+    
+    public enum FlushIntention
+    {
+        Flush,
+        Sync
+    }
+    
+    public enum HatchStyle
+    {
+        BackwardDiagonal,
+        Cross,
+        DarkDownwardDiagonal,
+        DarkHorizontal,
+        DarkUpwardDiagonal,
+        DarkVertical,
+        DashedDownwardDiagonal,
+        DashedHorizontal,
+        DashedUpwardDiagonal,
+        DashedVertical,
+        DiagonalBrick,
+        DiagonalCross,
+        Divot,
+        DottedDiamond,
+        DottedGrid,
+        ForwardDiagonal,
+        Horizontal,
+        HorizontalBrick,
+        LargeCheckerBoard,
+        LargeConfetti,
+        LargeGrid,
+        LightDownwardDiagonal,
+        LightHorizontal,
+        LightUpwardDiagonal,
+        LightVertical,
+        Max,
+        Min,
+        NarrowHorizontal,
+        NarrowVertical,
+        OutlinedDiamond,
+        Percent05,
+        Percent10,
+        Percent20,
+        Percent25,
+        Percent30,
+        Percent40,
+        Percent50,
+        Percent60,
+        Percent70,
+        Percent75,
+        Percent80,
+        Percent90,
+        Plaid,
+        Shingle,
+        SmallCheckerBoard,
+        SmallConfetti,
+        SmallGrid,
+        SolidDiamond,
+        Sphere,
+        Trellis,
+        Vertical,
+        Wave,
+        Weave,
+        WideDownwardDiagonal,
+        WideUpwardDiagonal,
+        ZigZag
+    }
+    
+    public enum InterpolationMode
+    {
+        Bicubic,
+        Bilinear,
+        Default,
+        High,
+        HighQualityBicubic,
+        HighQualityBilinear,
+        Invalid,
+        Low,
+        NearestNeighbour
+    }
+    
+    public enum LinearGradientMode
+    {
+        BackwardDiagonal,
+        ForwardDiagonal,
+        Horizontal,
+        Vertical
+    }
+    
+    public enum LineCap
+    {
+        AnchorMask,
+        ArrowAnchor,
+        Custom,
+        DiamondAnchor,
+        Flat,
+        NoAnchor,
+        Round,
+        RoundAnchor,
+        Square,
+        SquareAnchor,
+        Triangle
+    }
+    
+    public enum LineJoin
+    {
+        Bevel,
+        Miter,
+        MiterClipped,
+        Round
+    }
+    
+    public enum MatrixOrder
+    {
+        Append,
+        Prepend
+    }
+    
+    public enum PathPointType
+    {
+        Bezier,
+        Bezier3,
+        CloseSubpath,
+        DashMode,
+        Line,
+        PathMarker,
+        PathTypeMask,
+        Start
+    }
+    
+    public enum PenAlignment
+    {
+        Center,
+        Inset,
+        Left,
+        Outset,
+        Right
+    }
+    
+    public enum PenType
+    {
+        HatchFill,
+        LinearGradient,
+        PathGradient,
+        SolidColor,
+        TextureFill
+    }
+    
+    public enum PixelOffsetMode
+    {
+        Default,
+        Half,
+        HighQuality,
+        HighSpeed,
+        Invalid,
+        None
+    }
+    
+    public enum QualityMode
+    {
+        Default,
+        Hight,
+        Invalid,
+        Low
+    }
+    
+    public enum SmoothingMode
+    {
+        AntiAlias,
+        Default,
+        HighQuality,
+        HighSpeed,
+        Invalid,
+        None
+    }
+    
+    public enum WarpMode
+    {
+        Bilinear,
+        Perspective
+    }
+    
+    public enum WrapMode
+    {
+        Clamp,
+        Tile,
+        TileFlipX,
+        TileFlipXY,
+        TileFlipY
+    }
+    
+}
diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.cs
new file mode 100644
index 00000000000..2163ac94984
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/Matrix.cs
@@ -0,0 +1,453 @@
+//
+// System.Drawing.Drawing2D.Matrix.cs
+//
+// Author:
+//   Stefan Maierhofer <sm@cg.tuwien.ac.at>
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Drawing;
+using System.Runtime.InteropServices;
+
+namespace System.Drawing.Drawing2D
+{
+    public sealed class Matrix : MarshalByRefObject, IDisposable
+    {
+        // initialize to identity
+        private float[] m = {1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f};
+        
+        // constructors
+        public Matrix() { }
+        
+        /* TODO: depends on System.Drawing.Drawing2D.Rectangle
+        public Matrix(Rectangle rect , Point[] plgpts)
+        {
+            // TODO
+        }
+        */
+        
+        /* TODO: depends on System.Drawing.Drawing2D.RectangleF
+        public Matrix(RectangleF rect , PointF[] pa)
+        {
+            // TODO
+        }
+        */
+        public Matrix(float m11, float m12, 
+                      float m21, float m22, 
+                      float dx, float dy)
+        {
+            m[0] = m11; m[1] = m12;
+            m[2] = m21; m[3] = m22;
+            m[4] = dx; m[5] = dy;
+        }
+        
+        // properties
+        public float[] Elements
+        {
+            get { return m; }
+        }
+        
+        public bool IsIdentity
+        {
+            get 
+            {
+                if ( (m[0] == 1.0f) && (m[1] == 0.0f) &&
+                     (m[2] == 0.0f) && (m[3] == 1.0f) &&
+                     (m[4] == 0.0f) && (m[5] == 0.0f) )
+                    return true;
+                else 
+                    return false;
+            }
+        }
+        
+        public bool IsInvertible
+        {
+            get 
+            { 
+                // matrix M is invertible if det(M) != 0
+                float det = m[0] * m[3] - m[2] * m[1];
+                if (det != 0.0f) return true;
+                else return false;
+            }
+        }
+        
+        public float OffsetX
+        {
+            get { return m[4]; }
+        }
+        
+        public float OffsetY
+        {
+            get { return m[5]; }
+        }
+        
+        // methods
+        public Matrix Clone()
+        {
+            return new Matrix(m[0], m[1], m[2], m[3], m[4], m[5]);
+        }
+        
+        public void Dispose() { }
+        
+        public override bool Equals(object obj)
+        {
+            if (obj is Matrix)
+            {
+                float[] a = ((Matrix)obj).Elements;
+                if ( m[0] == a[0] && m[1] == a[1] &&
+                     m[2] == a[2] && m[3] == a[3] &&
+                     m[4] == a[4] && m[5] == a[5] ) 
+                    return true;
+                else 
+                    return false;
+            }
+            else
+            {
+                return false;
+            }
+        }
+        
+        ~Matrix() {}
+        
+        [StructLayout(LayoutKind.Explicit)]
+        internal struct BitConverter 
+        {
+            [FieldOffset(0)] public float f;
+            [FieldOffset(0)] public int i;
+        }
+        
+        public override int GetHashCode()
+        {
+            BitConverter b;
+            // compiler is not smart
+            b.i = 0;
+            int h = 0;
+            for (int i = 0; i < 6; i++) 
+            {
+                b.f = m[i];
+                h ^= b.i >> i;
+            }
+            return h;
+        }
+        
+        public void Invert()
+        {
+            float det = m[0] * m[3] - m[2] * m[1];
+            if (det != 0.0f)    // if invertible
+            {
+                float[] r = 
+                {
+                    m[3] / det, 
+                    -m[1] / det,
+                    -m[2] / det,
+                     m[0] / det,
+                    (-m[3] * m[4] + m[1] * m[5]) / det,
+                    (m[2] * m[4] - m[0] * m[5]) / det
+                };
+                m = r;
+            }
+        }
+        
+        public void Multiply(Matrix matrix)
+        {
+            Multiply(matrix, MatrixOrder.Prepend);
+        }
+        
+        public void Multiply(Matrix matrix, MatrixOrder order)
+        {
+            switch (order)
+            {
+                case MatrixOrder.Prepend:
+                    // this = matrix * this
+                    float[] p = matrix.Elements;
+                    float[] r0 = 
+                    {
+                        p[0] * m[0] + p[1] * m[2],
+                        p[0] * m[1] + p[1] * m[3],
+                        p[2] * m[0] + p[3] * m[2],
+                        p[2] * m[1] + p[3] * m[3],
+                        p[4] * m[0] + p[5] * m[2] + m[4],
+                        p[4] * m[1] + p[5] * m[3] + m[5]
+                    };
+                    m = r0;
+                    break;
+                case MatrixOrder.Append:
+                    // this = this * matrix
+                    float[] a = matrix.Elements;
+                    float[] r1 = 
+                    {
+                        m[0] * a[0] + m[1] * a[2],
+                        m[0] * a[1] + m[1] * a[3],
+                        m[2] * a[0] + m[3] * a[2],
+                        m[2] * a[1] + m[3] * a[3],
+                        m[4] * a[0] + m[5] * a[2] + a[4],
+                        m[4] * a[1] + m[5] * a[3] + a[5]
+                    };
+                    m = r1;
+                    break;
+            }
+        }
+        
+        public void Reset()
+        {
+            m[0] = 1.0f; m[1] = 0.0f;
+            m[2] = 0.0f; m[3] = 1.0f;
+            m[4] = 0.0f; m[5] = 0.0f;
+        }
+        
+        public void Rotate(float angle)
+        {
+            Rotate(angle, MatrixOrder.Prepend);
+        }
+        
+        public void Rotate(float angle, MatrixOrder order)
+        {
+            angle *= (float)(Math.PI / 180.0);  // degrees to randians
+            float cos = (float)Math.Cos(angle);
+            float sin = (float)Math.Sin(angle);
+            switch (order)
+            {
+                case MatrixOrder.Prepend:
+                    // this = rotation * this
+                    float[] r0 = 
+                    {
+                         cos * m[0] + sin * m[2],
+                         cos * m[1] + sin * m[3],
+                        -sin * m[0] + cos * m[2],
+                        -sin * m[1] + cos * m[3],
+                        m[4],
+                        m[5]
+                    };
+                    m = r0;
+                    break;
+                case MatrixOrder.Append:
+                    // this = this * rotation
+                    float[] r1 = 
+                    {
+                        m[0] * cos + m[1] * -sin,
+                        m[0] * sin + m[1] *  cos,
+                        m[2] * cos + m[3] * -sin,
+                        m[2] * sin + m[3] *  cos,
+                        m[4] * cos + m[5] * -sin,
+                        m[4] * sin + m[5] *  cos
+                    };
+                    m = r1;
+                    break;
+            }
+        }
+        
+        public void RotateAt(float angle, PointF point)
+        {
+            RotateAt(angle, point, MatrixOrder.Prepend);
+        }
+        
+        public void RotateAt(float angle, PointF point, MatrixOrder order)
+        {
+            angle *= (float)(Math.PI / 180.0);  // degrees to randians
+            float cos = (float)Math.Cos(angle);
+            float sin = (float)Math.Sin(angle);
+            float e4 = -point.X * cos + point.Y * sin + point.X;
+            float e5 = -point.X * sin - point.Y * cos + point.Y;
+            switch (order)
+            {
+                case MatrixOrder.Prepend:
+                    // this = rotation * this
+                    float[] r0 = 
+                    {
+                        cos * m[0] + sin * m[2],
+                        cos * m[1] + sin * m[3],
+                        -sin * m[0] + cos * m[2],
+                        -sin * m[1] + cos * m[3],
+                        e4 * m[0] + e5 * m[2] + m[4],
+                        e4 * m[1] + e5 * m[3] + m[5]
+                    };
+                    m = r0;
+                    break;
+                case MatrixOrder.Append:
+                    // this = this * rotation
+                    float[] r1 = 
+                    {
+                        m[0] * cos + m[1] * -sin,
+                        m[0] * sin + m[1] * cos,
+                        m[2] * cos + m[3] * -sin,
+                        m[2] * sin + m[3] * cos,
+                        m[4] * cos + m[5] * -sin + e4,
+                        m[4] * sin + m[5] * cos + e5
+                    };
+                    m = r1;
+                    break;
+            }
+        }
+        
+        public void Scale(float scaleX, float scaleY)
+        {
+            Scale(scaleX, scaleY, MatrixOrder.Prepend);
+        }
+        
+        public void Scale(float scaleX, float scaleY, MatrixOrder order)
+        {
+            switch (order)
+            {
+                case MatrixOrder.Prepend:
+                    // this = scale * this
+                    m[0] *= scaleX; m[1] *= scaleX;
+                    m[2] *= scaleY; m[3] *= scaleY;
+                    break;
+                case MatrixOrder.Append:
+                    // this = this * scale
+                    m[0] *= scaleX; m[1] *= scaleY;
+                    m[2] *= scaleX; m[3] *= scaleY;
+                    m[4] *= scaleX; m[5] *= scaleY;
+                    break;
+            }
+        }
+        
+        public void Shear(float shearX, float shearY)
+        {
+            Shear(shearX, shearY, MatrixOrder.Prepend);
+        }
+        
+        // LAMESPEC: quote from beta 2 sdk docs: "[To be supplied!]"
+        //
+        // assuming transformation matrix:
+        //
+        //      (1       shearY  0)
+        //      (shearX  1       0)
+        //      (0       0       1)
+        //
+        public void Shear(float shearX, float shearY, MatrixOrder order)
+        {
+            switch (order)
+            {
+                case MatrixOrder.Prepend:
+                    // this = shear * this
+                    float[] r0 = 
+                    {
+                        m[0] + shearY * m[2],
+                        m[1] + shearY * m[3],
+                        shearX * m[0] + m[2],
+                        shearX * m[1] + m[3],
+                        m[4],
+                        m[5]
+                    };
+                    m = r0;
+                    break;
+                case MatrixOrder.Append:
+                    // this = this * shear
+                    float[] r1 = 
+                    {
+                        m[0] + m[1] * shearX,
+                        m[0] * shearY + m[1],
+                        m[2] + m[3] * shearX,
+                        m[2] * shearY + m[3],
+                        m[4] + m[5] * shearX ,
+                        m[4] * shearY + m[5]
+                    };
+                    m = r1;
+                    break;
+            }
+        }
+        
+        public void TransformPoints(Point[] pts)
+        {
+            for (int i = 0; i < pts.Length; i++)
+            {
+                float x = (float)pts[i].X;
+                float y = (float)pts[i].Y;
+                pts[i].X = (int)(x * m[0] + y * m[2] + m[4]);
+                pts[i].Y = (int)(x * m[1] + y * m[3] + m[5]);
+            }
+        }
+        
+        public void TransformPoints(PointF[] pts)
+        {
+            for (int i = 0; i < pts.Length; i++)
+            {
+                float x = pts[i].X;
+                float y = pts[i].Y;
+                pts[i].X = x * m[0] + y * m[2] + m[4];
+                pts[i].Y = x * m[1] + y * m[3] + m[5];
+            }
+        }
+        
+        public void TransformVectors(Point[] pts)
+        {
+            for (int i = 0; i < pts.Length; i++)
+            {
+                float x = (float)pts[i].X;
+                float y = (float)pts[i].Y;
+                pts[i].X = (int)(x * m[0] + y * m[2]);
+                pts[i].Y = (int)(x * m[1] + y * m[3]);
+            }
+        }
+        
+        public void TransformVectors(PointF[] pts)
+        {
+            for (int i = 0; i < pts.Length; i++)
+            {
+                float x = pts[i].X;
+                float y = pts[i].Y;
+                pts[i].X = x * m[0] + y * m[2];
+                pts[i].Y = x * m[1] + y * m[3];
+            }
+        }
+        
+        public void Translate(float offsetX, float offsetY)
+        {
+            Translate(offsetX, offsetY, MatrixOrder.Prepend);
+        }
+        
+        public void Translate(float offsetX, float offsetY, MatrixOrder order)
+        {
+            switch (order)
+            {
+                case MatrixOrder.Prepend:
+                    // this = translation * this
+                    m[4] = offsetX * m[0] + offsetY * m[2] + m[4];
+                    m[5] = offsetX * m[1] + offsetY * m[3] + m[5];
+                    break;
+                case MatrixOrder.Append:
+                    // this = this * translation
+                    m[4] += offsetX;
+                    m[5] += offsetY;
+                    break;
+            }
+        }
+        
+        // LAMESPEC: quote from beta 2 sdk docs: "[To be supplied!]"
+	[MonoTODO]    
+	public void VectorTransformPoints(Point[] pts)
+        {
+            // TODO
+        }
+        
+        // some simple test (TODO: remove)
+        /*
+        public static void Main()
+        {
+            PointF[] p = {new PointF(1.0f, 2.0f)};
+            Console.WriteLine("(" + p[0].X + " " + p[0].Y + ")");
+            Matrix m = new Matrix();
+            
+            m.Translate(1.0f, 1.0f); 
+            m.Scale(2.0f, 2.0f); 
+            m.Rotate(180.0f);
+            
+            m.TransformPoints(p);
+            Console.WriteLine("(" + p[0].X + " " + p[0].Y + ")");
+            m.Invert();
+            m.TransformPoints(p);
+            Console.WriteLine("(" + p[0].X + " " + p[0].Y + ")");
+            
+            Matrix a = new Matrix(1.0f, 0.0f, 0.0f, 1.0f, 0.0f, 0.0f);
+            Matrix b = new Matrix(2.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f);
+            
+            Console.WriteLine("h(a) = " + a.GetHashCode());
+            Console.WriteLine("h(b) = " + b.GetHashCode());
+        }
+        */
+        
+    }
+}
diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/PenAlignment.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/PenAlignment.cs
new file mode 100755
index 00000000000..e5f49323e96
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/PenAlignment.cs
@@ -0,0 +1,21 @@
+//
+// System.Drawing.Drawing2D.PenAlignment.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System.Drawing {
+
+	public enum PenAlignment {
+		Center = 0,
+		Inset = 1,
+		Outset = 2,
+		Left = 3,
+		Right =4
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing.Drawing2D/TODOAttribute.cs b/mcs/class/System.Drawing/System.Drawing.Drawing2D/TODOAttribute.cs
new file mode 100644
index 00000000000..0920ce8f92d
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Drawing2D/TODOAttribute.cs
@@ -0,0 +1,37 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All, AllowMultiple=true)]
+	public class MonoTODOAttribute : Attribute {
+
+		private string comment;
+		
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+
+		public string Comment
+		{
+			get { return comment; }
+		}
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/BitmapData.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/BitmapData.cs
new file mode 100755
index 00000000000..d072cde7eb0
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/BitmapData.cs
@@ -0,0 +1,79 @@
+//

+// System.Drawing.Imaging.BitmapData.cs

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Drawing.Imaging

+{

+	public sealed class BitmapData {

+		int width, height, stride, reserved;

+		PixelFormat pixel_format;

+		IntPtr address;

+		

+		public int Height {

+			get {

+				return height;

+			}

+

+			set {

+				height = value;

+			}

+		}

+

+		public int Width {

+			get {

+				return width;

+			}

+

+			set {

+				width = value;

+			}

+		}

+

+		public PixelFormat PixelFormat {

+			get {

+				return pixel_format;

+			}

+

+			set {

+				pixel_format = value;

+			}

+		}

+

+		public int Reserved {

+			get {

+				return reserved;

+			}

+

+			set {

+				reserved = value;

+			}

+		}

+

+		public IntPtr Scan0 {

+			get {

+				return address;

+			}

+

+			set {

+				address = value;

+			}

+		}

+

+		public int Stride {

+			get {

+				return stride;

+			}

+

+			set {

+				stride = value;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog b/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog
new file mode 100644
index 00000000000..bbf9f2af2b7
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ChangeLog
@@ -0,0 +1,17 @@
+2002-05-03  Mike Kestner  <mkestner@speakeasy.net>

+

+	* Metafile.cs : Use System.IO. Fix exception typos.

+

+2002-04-27  Christian Meyer  <Christian.Meyer@cs.tum.edu>

+

+	* Metafile.cs: Copyright now holds Ximian.

+

+2002-04-21  Dennis Hayes <dennish@raytek.com>

+

+	* corrected emum values.

+

+2002-04-14  Christian Meyer  <Christian.Meyer@cs.tum.edu>

+

+	* ChangeLog: created.

+	* Metafile.cs: Added. Wrote some ctors. No impl done, yet.

+

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ColorAdjustType.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorAdjustType.cs
new file mode 100644
index 00000000000..d445a9b5afe
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorAdjustType.cs
@@ -0,0 +1,19 @@
+//

+// System.Drawing.Imaging.ColorAdjustType.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging 

+{

+	public enum ColorAdjustType {

+		Any = 6,

+		Bitmap = 1,

+		Brush = 2,

+		Count = 5,

+		Default = 0,

+		Pen = 3,

+		Text = 4

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ColorChannelFlag.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorChannelFlag.cs
new file mode 100644
index 00000000000..82f07834b68
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorChannelFlag.cs
@@ -0,0 +1,17 @@
+//

+// System.Drawing.Imaging.ColorChannelFlag.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging

+{

+	public enum ColorChannelFlag {

+		ColorChannelC = 0,

+		ColorChannelK = 3,

+		ColorChannelLast = 4,

+		ColorChannelM = 1,

+		ColorChannelY = 2

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMapType.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMapType.cs
new file mode 100644
index 00000000000..0943f290da2
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMapType.cs
@@ -0,0 +1,14 @@
+//

+// System.Drawing.Imaging.ColorMapType.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging

+{

+	public enum  ColorMapType{//check

+		Brush = 1,

+		Default = 0

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrixFlag.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrixFlag.cs
new file mode 100644
index 00000000000..f244e02447f
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMatrixFlag.cs
@@ -0,0 +1,15 @@
+//

+// System.Drawing.Imaging.ColorMatrixFlag.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging 

+{

+	public enum  ColorMatrixFlag{

+		AltGrays = 2,

+		Default = 0,

+		SkipGrays = 1

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMode.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMode.cs
new file mode 100644
index 00000000000..91872fa6247
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorMode.cs
@@ -0,0 +1,14 @@
+//

+// System.Drawing.Imaging.ColorMode.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging 

+{

+	public enum ColorMode {

+		Argb32Mode = 0,

+		Argb64Mode = 1

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ColorPalette.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorPalette.cs
new file mode 100755
index 00000000000..24dcf25d444
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ColorPalette.cs
@@ -0,0 +1,44 @@
+//

+// System.Drawing.Imaging.ColorPalette.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com

+//

+

+using System;

+

+namespace System.Drawing.Imaging

+{

+	public sealed class ColorPalette {

+		// 0x1: the color values in the array contain alpha information

+		// 0x2: the color values are grayscale values.

+		// 0x4: the colors in the array are halftone values.

+

+		int flags;

+		Color [] entries;

+

+		//

+		// There is no public constructor, this will be used somewhere in the

+		// drawing code

+		//

+		internal ColorPalette ()

+		{

+			flags = 0;

+			entries = new Color [0];

+		}

+		

+		public Color [] Entries {

+			get {

+				return entries;

+			}

+		}

+

+		public int Flags {

+			get {

+				return flags;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/EmfPlusRecordType.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/EmfPlusRecordType.cs
new file mode 100644
index 00000000000..052604968e7
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/EmfPlusRecordType.cs
@@ -0,0 +1,262 @@
+//

+// System.Drawing.Imaging.EmfPlusRecordType.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging 

+{

+	public enum EmfPlusRecordType {

+		BeginContainer = 16423,

+		BeginContainerNoParams = 16424,

+		Clear = 16393,

+		Comment = 16387,

+		DrawArc = 16402,

+		DrawBeziers = 16409,

+		DrawClosedCurve = 16407,

+		DrawCurve = 16408,

+		DrawDriverString = 16438,

+		DrawEllipse = 16399,

+		DrawImage = 16410,

+		DrawImagePoints = 16411,

+		DrawLines = 16397,

+		DrawPath = 16405,

+		DrawPie = 16401,

+		DrawRects = 16395,

+		DrawString = 16412,

+		EmfAbortPath = 68,

+		EmfAlphaBlend = 114,

+		EmfAngleArc = 41,

+		EmfArcTo = 55,

+		EmfBeginPath = 59,

+		EmfBitBlt = 76,

+		EmfChord = 46,

+		EmfCloseFigure = 61,

+		EmfColorCorrectPalette = 111,

+		EmfColorMatchToTargetW = 121,

+		EmfCreateBrushIndirect = 39,

+		EmfCreateColorSpace = 99,

+		EmfCreateColorSpaceW = 122,

+		EmfCreateDibPatternBrushPt = 94,

+		EmfCreateMonoBrush = 93,

+		EmfCreatePalette = 49,

+		EmfCreatePen = 38,

+		EmfDeleteColorSpace = 101,

+		EmfDeleteObject = 40,

+		EmfDrawEscape = 105,

+		EmfEllipse = 42,

+		EmfEndPath = 60,

+		EmfEof = 14,

+		EmfExcludeClipRect = 29,

+		EmfExtCreateFontIndirect = 82,

+		EmfExtCreatePen = 95,

+		EmfExtEscape = 106,

+		EmfExtFloodFill = 53,

+		EmfExtSelectClipRgn = 75,

+		EmfExtTextOutA = 83,

+		EmfExtTextOutW = 84,

+		EmfFillPath = 62,

+		EmfFillRgn = 71,

+		EmfFlattenPath = 65,

+		EmfForceUfiMapping = 109,

+		EmfFrameRgn = 72,

+		EmfGdiComment = 70,

+		EmfGlsBoundedRecord = 103,

+		EmfGlsRecord = 102,

+		EmfGradientFill = 118,

+		EmfHeader = 1,

+		EmfIntersectClipRect = 30,

+		EmfInvertRgn = 73,

+		EmfLineTo = 54,

+		EmfMaskBlt = 78,

+		EmfMin = 1,

+		EmfModifyWorldTransform = 36,

+		EmfMoveToEx = 27,

+		EmfNamedEscpae = 110,

+		EmfOffsetClipRgn = 26,

+		EmfPaintRgn = 74,

+		EmfPie = 47,

+		EmfPixelFormat = 104,

+		EmfPlgBlt = 79,

+		EmfPlusRecordBase = 16384,

+		EmfPolyBezier = 2,

+		EmfPolyBezier16 = 85,

+		EmfPolyBezierTo = 5,

+		EmfPolyBezierTo16 = 88,

+		EmfPolyDraw = 56,

+		EmfPolyDraw16 = 92,

+		EmfPolygon = 3,

+		EmfPolyPolygon16 = 86,

+		EmfPolyPolyline = 4,

+		EmfPolyline16 = 87,

+		EmfPolyPolygon = 8,

+		EmfPolyPolyline16 = 91,

+		EmfPolyTextOutA = 96,

+		EmfPolyTextOutW = 97,

+		EmfRealizePalette = 52,

+		EmfRectangle = 43,

+		EmfReserved069 = 69,

+		EmfReserved117 = 117,

+		EmfResizePalette = 51,

+		EmfRestoreDC = 34,

+		EmfRoundArc = 45,

+		EmfRoundRect = 44,

+		EmfSaveDC = 33,

+		EmfScaleViewportExtEx = 31,

+		EmfScaleWindowExtEx = 32,

+		EmfSelectClipPath = 67,

+		EmfSelectObject = 37,

+		EmfSelectPalette = 48,

+		EmfSetArcDirection = 57,

+		EmfSetBkColor = 25,

+		EmfSetBkMode = 18,

+		EmfSetBrushOrgEx = 13,

+		EmfSetColorAdjustment = 23,

+		EmfSetColorSpace = 100,

+		EmfSetDIBitsToDevice = 80,

+		EmfSetIcmMode = 98,

+		EmfSetIcmProfileA = 112,

+		EmfSetIcmProfileW = 113,

+		EmfSetLayout = 115,

+		EmfSetLinkedUfis = 119,

+		EmfSetMapMode = 17,

+		EmfSetMapperFlags = 16,

+		EmfSetMetaRgn = 28,

+		EmfSetMiterLimit = 58,

+		EmfSetPaletteEntries = 50,

+		EmfSetPixelV = 15,

+		EmfSetPolyFillMode = 19,

+		EmfSetROP2 = 20,

+		EmfSetStretchBltMode = 21,

+		EmfSetTextAlign = 22,

+		EmfSetTextColor = 24,

+		EmfSetTextJustification =120 ,

+		EmfSetViewportExtEx = 11,

+		EmfSetViewportOrgEx = 12,

+		EmfSetWindowExtEx = 9,

+		EmfSetWindowOrgEx = 10,

+		EmfSetWorldTransform = 35,

+		EmfSmallTextOut = 108,

+		EmfStartDoc = 107,

+		EmfStretchBlt = 77,

+		EmfStretchDIBits = 81,

+		EmfStrokeAndFillPath = 63,

+		EmfStrokePath = 64,

+		EmfTransparentBlt = 116,

+		EmfWidenPath = 66,

+		EndContainer = 16425,

+		EndOfFile = 16386,

+		FillClosedCurve = 16406,

+		FillEllipse = 16398,

+		FillPath = 16404,

+		FillPie = 16400,

+		FillPolygon = 16396,

+		FillRects = 16394,

+		FillRegion = 16403,

+		GetDC = 16388,

+		Header = 16385,

+		Invalid = 16384,

+		Max = 16438,

+		Min = 16385,

+		MultiFormatEnd = 16391,

+		MultiFormatSection = 16390,

+		MultiFormatStart = 16389,

+		MultiplyWorldTransform = 16428,

+		Object = 16392,

+		OffsetClip = 16437,

+		ResetClip = 16433,

+		ResetWorldTransform = 16427,

+		Restore = 16422,

+		RotateWorldTransform = 16431,

+		Save = 16421,

+		ScaleWorldTransform = 16430,

+		SetAntiAliasMode = 16414,

+		SetClipPath = 16435,

+		SetClipRect = 16434,

+		SetClipRegion = 16436,

+		SetCompositingMode = 16419,

+		SetCompositingQuality = 16420,

+		SetInterpolationMode = 16417,

+		SetPageTransform = 16432,

+		SetPixelOffsetMode = 16418,

+		SetRenderingOrigin = 16413,

+		SetTextContrast = 16416,

+		SetTextRenderingHint = 16415,

+		SetWorldTransform = 16426,

+		Total = 16439,

+		TranslateWorldTransform = 16429,

+		WmfAnimatePalette = 66614,

+		WmfArc = 67607,

+		WmfBitBlt = 67874,

+		WmfChord = 67632,

+		WmfCreateBrushIndirect = 66300,

+		WmfCreateFontIndirect = 66299,

+		WmfCreatePalette = 65783,

+		WmfCreatePatternBrush = 66041,

+		WmfCreatePenIndirect = 66298,

+		WmfCreateRegion = 67327,

+		WmfDeleteObject = 66032,

+		WmfDibBitBlt = 67904,

+		WmfDibCreatePatternBrush = 65858,

+		WmfFillRegion = 66088,

+		WmfFloodFill = 66585,

+		WmfFrameRegion = 66601,

+		WmfIntersectClipRect = 66582,

+		WmfInvertRegion = 65834,

+		WmfLineTo = 66067,

+		WmfMoveTo = 66068,

+		WmfOffsetCilpRgn = 66080,

+		WmfOffsetViewportOrg = 66065,

+		WmfOffsetWindowOrg = 66063,

+		WmfPaintRegion = 65835,

+		WmfPatBlt = 67101,

+		WmfPie = 67610,

+		WmfPolygon = 66340,

+		WmfPolyline = 66341,

+		WmfPolyPolygon = 66872,

+		WmfRealizePalette = 65589,

+		WmfRecordBase = 65536,

+		WmfRectangle = 66587,

+		WmfResizePalette = 65849,

+		WmfRestoreDC = 65831,

+		WmfRoundRect = 67100,

+		WmfSaveDC = 65566,

+		WmfScaleViewportExt = 66578,

+		WmfScaleWindowExt = 66576,

+		WmfSelectClipRegion = 65836,

+		WmfSelectObject = 65837,

+		WmfSelectPalette = 66100,

+		WmfSetBkColor = 66049,

+		WmfSetBkMode = 65794,

+		WmfSetDibToDev = 68915,

+		WmfSetLayout = 65865,

+		WmfSetMapMode = 65795,

+		WmfSetMapperFlags = 66097,

+		WmfSetPalEntries = 65591,

+		WmfSetPixel = 66591,

+		WmfSetPolyFillMode = 65798,

+		WmfSetRelAbs = 65797,

+		WmfSetROP2 = 65796,

+		WmfSetStretchBltMode = 65799,

+		WmfSetTextAlign = 65838,

+		WmfSetTextCharExtra = 65800,

+		WmfSetTextColor = 66057,

+		WmfSetTextJustification = 66058,

+		WmfSetViewportExt = 66062,

+		WmfSetViewportOrg = 66061,

+		WmfSetWindowExt = 66060,

+		WmfSetWindowOrg = 66059,

+		WmfStretchBlt = 68387,

+		WmfStretchDib = 69443,

+		WmfTextOut = 66849,

+		EmfPolyLineTo = 6,

+		EmfPolylineTo16 = 89,

+		WmfDibStretchBlt = 68417,

+		WmfEllipse = 66584,

+		WmfEscape = 67110,

+		WmfExcludeClipRect = 66581,

+		WmfExtFloodFill = 66888,

+		WmfExtTextOut = 68146

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/EmfType.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/EmfType.cs
new file mode 100644
index 00000000000..f02a42f4923
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/EmfType.cs
@@ -0,0 +1,15 @@
+//

+// System.Drawing.Imaging.EmfType.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging 

+{

+	public enum EmfType {

+		EmfOnly = 3,

+		EmfPlusDual = 5,

+		EmfPlusOnly = 4

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameterValueType.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameterValueType.cs
new file mode 100644
index 00000000000..6a0071ad20d
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderParameterValueType.cs
@@ -0,0 +1,20 @@
+//

+// System.Drawing.Imaging.EncoderParameterValueType.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging 

+{

+	public enum EncoderParameterValueType {

+		ValueTypeAscii = 2,

+		ValueTypeByte = 1,

+		ValueTypeLong = 4,

+		ValueTypeLongRange = 6,

+		ValueTypeRational = 5,

+		ValueTypeRationalRange = 8,

+		ValueTypeShort = 3,

+		ValueTypeUndefined = 7

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderValue.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderValue.cs
new file mode 100644
index 00000000000..0e51a47031e
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/EncoderValue.cs
@@ -0,0 +1,36 @@
+//

+// System.Drawing.Imaging.EncoderValue.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging 

+{

+	public enum EncoderValue {

+		ColorTypeCMYK = 0,

+		ColorTypeYCCK = 1,

+		CompressionCCITT3 = 3,

+		CompressionCCITT4 = 4,

+		CompressionLZW = 2,

+		CompressionNone = 6,

+		CompressionRle = 5,

+		Flush = 20,

+		FrameDimensionPage = 23,

+		FrameDimensionResolution = 22,

+		FrameDimensionTime = 21,

+		LastFrame = 19,

+		MultiFrame = 18,

+		RenderNonProgressive = 12,

+		RenderProgressive = 11,

+		ScanMethodInterlaced = 7,

+		ScanMethodNonInterlaced = 8,

+		TransformFlipHorizontal = 16,

+		TransformFlipVertical = 17,

+		TransformRotate180 = 14,

+		TransformRotate270 = 15,

+		TransformRotate90 = 13,

+		VersionGif87 = 9,

+		VersionGif89 = 10

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/FrameDimension.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/FrameDimension.cs
new file mode 100644
index 00000000000..cc431619f31
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/FrameDimension.cs
@@ -0,0 +1,59 @@
+// created on 21.02.2002 at 17:06

+//

+// FrameDimension.cs

+//

+// Author: Christian Meyer

+// eMail: Christian.Meyer@cs.tum.edu

+//

+

+namespace System.Drawing.Imaging {

+

+using System;

+

+public sealed class FrameDimension {

+

+	// constructor

+	public FrameDimension (Guid guid) {}

+

+	//properties

+	public Guid Guid {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public static FrameDimension Page {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public static FrameDimension Resolution {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public static FrameDimension Time {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	//methods

+	public override bool Equals (object o) {

+		throw new NotImplementedException ();

+	}

+	

+	public override int GetHashCode () {

+		throw new NotImplementedException ();

+	}

+	

+	public override string ToString() {

+		throw new NotImplementedException ();

+	}

+

+	//destructor

+	~FrameDimension () {}

+}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageCodecFlags.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageCodecFlags.cs
new file mode 100644
index 00000000000..235ebed2fc0
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageCodecFlags.cs
@@ -0,0 +1,21 @@
+//

+// System.Drawing.Imaging.ImageCodecFlags.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging

+{

+	public enum ImageCodecFlags {

+		BlockingDecode = 32,

+		Builtin = 65536,

+		Decoder = 2,

+		Encoder = 1,

+		SeekableEncode = 16,

+		SupportBitmap = 4,

+		SupportVector = 8,

+		System = 131072,

+		User = 262144

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageFlags.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageFlags.cs
new file mode 100644
index 00000000000..61e0ec878a1
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageFlags.cs
@@ -0,0 +1,26 @@
+//

+// System.Drawing.Imaging.ImageFlags.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging

+{

+	public enum ImageFlags {

+		Caching = 131072,

+		ColorSpaceCmyk = 32,

+		ColorSpaceGray = 64,

+		ColorSpaceRgb = 16,

+		ColorSpaceYcbcr = 128,

+		ColorSpaceYcck = 256,

+		HasAlpha = 2,

+		HasRealDpi = 4096,

+		HasRealPixelSize = 8192,

+		HasTranslucent = 4,

+		None = 0,

+		PartiallyScalable = 8,

+		ReadOnly = 65536,

+		Scalable = 1

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/ImageLockMode.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageLockMode.cs
new file mode 100644
index 00000000000..14b720acb2b
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/ImageLockMode.cs
@@ -0,0 +1,16 @@
+//

+// System.Drawing.Imaging.ImageLockMode.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging 

+{

+	public enum ImageLockMode {

+		ReadOnly = 1,

+		ReadWrite = 3,

+		UserInputBuffer = 4,

+		WriteOnly = 2

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/Metafile.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/Metafile.cs
new file mode 100644
index 00000000000..cfacd57e73a
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/Metafile.cs
@@ -0,0 +1,111 @@
+//
+// System.Drawing.Imaging.Metafile.cs
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+// Author: Christian Meyer
+// eMail: Christian.Meyer@cs.tum.edu
+//
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace System.Drawing.Imaging {
+
+	public sealed class Metafile : Image {
+
+		// constructors
+		[MonoTODO]
+		public Metafile (Stream stream) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (string filename) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (IntPtr henhmetafile, bool deleteEmf) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (IntPtr referenceHtc, EmfType emfType) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (IntPtr referenceHtc, Rectangle frameRect) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (IntPtr referenceHtc, RectangleF frameRect) {
+			throw new NotImplementedException ();
+		}
+
+		//[MonoTODO]
+		//public Metafile (IntPtr hmetafile, WmfPlaceableFileHeader wmfHeader) {
+		//	throw new NotImplementedException ();
+		//}
+
+		[MonoTODO]
+		public Metafile (Stream stream, IntPtr referenceHtc) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (String fileName, IntPtr referenceHtc) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (IntPtr referenceHdc, EmfType emfType, string description) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (IntPtr referenceHdc, Rectangle frameRect, MetafileFrameUnit frameUnit) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (IntPtr referenceHdc, RectangleF frameRect, MetafileFrameUnit frameUnit) {
+			throw new NotImplementedException ();
+		}
+
+		//[MonoTODO]
+		//public Metafile (IntPtr hmetafile, WmfPlaceableFileHeader wmfHeader, bool deleteWmf) {
+		//	throw new NotImplementedException ();
+		//}
+
+		[MonoTODO]
+		public Metafile (Stream stream, IntPtr referenceHdc, EmfType type) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (Stream stream, IntPtr referenceHdc, Rectangle frameRect) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (Stream stream, IntPtr referenceHdc, RectangleF frameRect) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (string fileName, IntPtr referenceHdc, EmfType type) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Metafile (string fileName, IntPtr referenceHdc, Rectangle frameRect) {
+			throw new NotImplementedException ();
+		}
+
+		// methods
+		// properties
+	}
+
+}
diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/MetafileFrameUnit.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/MetafileFrameUnit.cs
new file mode 100644
index 00000000000..97d59c6c0c1
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/MetafileFrameUnit.cs
@@ -0,0 +1,18 @@
+//

+// System.Drawing.Imaging.MetafileFrameUnit.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging 

+{

+	public enum MetafileFrameUnit {

+		Document = 5,

+		GdiCompatible = 7,

+		Inch = 4,

+		Millimeter = 6,

+		Pixel = 2,

+		Point = 3

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/PaletteFlags.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/PaletteFlags.cs
new file mode 100644
index 00000000000..007313d0622
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/PaletteFlags.cs
@@ -0,0 +1,15 @@
+//

+// System.Drawing.Imaging.PaletteFlags.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Imaging 

+{

+	public enum PaletteFlags {

+		GrayScale = 2,

+		Halftone = 4,

+		HasAlpha = 1

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Imaging/PixelFormat.cs b/mcs/class/System.Drawing/System.Drawing.Imaging/PixelFormat.cs
new file mode 100644
index 00000000000..abc675c4739
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Imaging/PixelFormat.cs
@@ -0,0 +1,39 @@
+// created on 20.02.2002 at 21:18
+// 
+// Image.cs
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Christian Meyer
+// eMail: Christian.Meyer@cs.tum.edu
+//		Dennis Hayes
+//		dennish@raytek.com
+//
+//
+namespace System.Drawing.Imaging {
+
+	public enum PixelFormat {
+		Alpha = 262144,
+		Canonical = 2097152,
+		DontCare = 0,
+		Extended = 1048576,
+		Format16bppArgb1555 = 397319,
+		Format16bppGrayScale = 1052676,
+		Format16bppRgb555 = 135173,
+		Format16bppRgb565 = 135174,
+		Format1bppIndexed = 196865,
+		Format24bppRgb = 137224,
+		Format32bppArgb = 2498570,
+		Format32bppPArgb = 925707,
+		Format32bppRgb = 139273,
+		Format48bppRgb = 1060876, 
+		Format4bppIndexed = 197634,
+		Format64bppArgb = 3424269,
+		Format64bppPArgb = 1851406,
+		Format8bppIndexed = 198659,
+		Gdi = 131072,
+		Indexed = 65536,
+		Max = 15,
+		PAlpha = 524288,
+		Undefined = 0 //shows up in enumcheck as second "dontcare".
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/Duplex.cs b/mcs/class/System.Drawing/System.Drawing.Printing/Duplex.cs
new file mode 100644
index 00000000000..a158382eea3
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/Duplex.cs
@@ -0,0 +1,16 @@
+//

+// System.Drawing.Duplex.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Printing 

+{

+	public enum Duplex {

+		Default = -1,

+		Horizontal = 3,

+		Simplex = 1,

+		Vertical = 2

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PaperKind.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PaperKind.cs
new file mode 100644
index 00000000000..137a0da4a9b
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PaperKind.cs
@@ -0,0 +1,125 @@
+//

+// System.Drawing.PaperKind.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Printing 

+{

+	public enum PaperKind {

+		A2 = 66,

+		A3 = 8,

+		A3Extra = 63,

+		A3ExtraTransverse = 68,

+		A3Rotated = 76,

+		A3Transverse = 67,

+		A4 = 9,

+		A4Extra = 53,

+		A4Plus = 60,

+		A4Rotated = 77,

+		A4Small = 10,

+		A4Transverse = 55,

+		A5 = 11,

+		A5Extra = 64,

+		A5Rotated = 78,

+		A5Transverse = 61,

+		A6 = 70,

+		A6Rotated = 83,

+		APlus = 57,

+		B4 = 12,

+		B4Envelope = 33,

+		B4JisRotated = 79,

+		B5Extra,

+		B5JisRotated = 80,

+		B5Transverse = 61,

+		B6Envelope = 35,

+		B6Jis = 88,

+		B6JisRotated = 89,

+		BPlus = 58,

+		C3Envelope = 29,

+		C4Envelope = 30,

+		C5Envelope = 34,

+		C65Envelope = 32,

+		CSheet = 24,

+		Custom = 0,

+		DLEnvelope = 27,

+		DSheet = 25,

+		ESheet = 26,

+		Executive = 7,

+		Folio = 14,

+		GermanLegalFanfold = 41,

+		GermanStandardFanfold = 40,

+		InviteEnvelope = 47,

+		IsoB4 = 42,

+		JapaneseDoublePostcard = 69,

+		JapaneseDoublePostcardRotated = 81,

+		JapaneseEnvelopeChouNumber3 = 73,

+		JapaneseEnvelopeChouNumber3Rotated = 86,

+		JapaneseEnvelopeChouNumber4 = 74,

+		JapaneseEnvelopeChouNumber4Rotated = 87,

+		JapaneseEnvelopeKakuNumber2 = 71,

+		JapaneseEnvelopeKakuNumber2Rotated = 84,

+		JapaneseEnvelopeKakuNumber3 = 72,

+		JapaneseEnvelopeKakuNumber3Rotated = 85,

+		JapaneseEnvelopeYouNumber4 = 91,

+		JapaneseEnvelopeYouNumber4Rotated = 92,

+		JapanesePostcard = 43,

+		JapanesePostcardRotated = 81,

+		Ledger = 4,

+		Legal = 5,

+		LegalExtra = 51,

+		Letter = 1,

+		LetterExtra = 50,

+		LetterExtraTransverse = 56,

+		LetterPlus = 59,

+		LetterRotated = 75,

+		LetterSmall = 2,

+		LetterTransverse = 54,

+		MonarchEnvelope = 37,

+		Note = 18,

+		Number10Envelope = 20,

+		Number11Envelope = 21,

+		Number12Envelope = 22,

+		Number14Envelope = 23,

+		Number9Envelope = 19,

+		PersonalEnvelope = 38,

+		Prc16K = 93,

+		Prc16KRotated = 106,

+		Prc32K = 94,

+		Prc32KBig = 95,

+		Prc32KBigRotated = 108,

+		Prc32KRotated = 107,

+		PrcEnvelopeNumber1 = 96,

+		PrcEnvelopeNumber10 = 105,

+		PrcEnvelopeNumber10Rotated = 118,

+		PrcEnvelopeNumber1Rotated = 109,

+		PrcEnvelopeNumber2 = 97,

+		PrcEnvelopeNumber2Rotated = 110,

+		PrcEnvelopeNumber3 = 98,

+		PrcEnvelopeNumber3Rotated = 111,

+		PrcEnvelopeNumber4 = 99,

+		PrcEnvelopeNumber4Rotated = 112,

+		PrcEnvelopeNumber5 = 100,

+		PrcEnvelopeNumber5Rotated = 113,

+		PrcEnvelopeNumber6 = 101,

+		PrcEnvelopeNumber6Rotated = 114,

+		PrcEnvelopeNumber7 = 102,

+		PrcEnvelopeNumber7Rotated = 115,

+		PrcEnvelopeNumber8 = 103,

+		PrcEnvelopeNumber8Rotated = 116,

+		PrcEnvelopeNumber9 = 104,

+		PrcEnvelopeNumber9Rotated = 117,

+		Quarto = 15,

+		Standard10x11 = 45,

+		Standard10x14 = 16,

+		Standard11x17 = 17,

+		Standard12x11 = 90,

+		Standard15x11 = 46,

+		Standard9x11 = 44,

+		Statement = 6,

+		Tabloid = 3,

+		TabloidExtra = 52,

+		USStandardFanfold = 39

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PaperSourceKind.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PaperSourceKind.cs
new file mode 100644
index 00000000000..a8cd9e0e68e
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PaperSourceKind.cs
@@ -0,0 +1,26 @@
+//

+// System.Drawing.PaperSourceKind.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Printing

+{

+	public enum PaperSourceKind {

+		AutomaticFeed = 7,

+		Cassette = 14,

+		Custom = 257,

+		Envelope = 5,

+		FormSource = 15,

+		LargeCapacity = 11,

+		LargeFormat = 10,

+		Lower = 2,

+		Manual = 4,

+		ManualFeed = 6,

+		Middle = 3,

+		SmallFormat = 9,

+		TractorFeed = 8,

+		Upper = 1

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintRange.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintRange.cs
new file mode 100644
index 00000000000..a43f9e8bf88
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintRange.cs
@@ -0,0 +1,15 @@
+//

+// System.Drawing.PrintRange.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Printing 

+{

+	public enum PrintRange {

+		AllPages = 0,

+		Selection = 1,

+		SomePages = 2

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrinterResolutionKind.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrinterResolutionKind.cs
new file mode 100644
index 00000000000..7580938c71a
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrinterResolutionKind.cs
@@ -0,0 +1,17 @@
+//

+// System.Drawing.PrinterResolutionKind.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Printing 

+{

+	public enum PrinterResolutionKind {

+		Custom = 0,

+		Draft = -1,

+		High = -4,

+		Low = -2,

+		Medium = -3

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrinterUnit.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrinterUnit.cs
new file mode 100644
index 00000000000..ae4209301cc
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrinterUnit.cs
@@ -0,0 +1,16 @@
+//

+// System.Drawing.PrinterUnit.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Printing 

+{

+	public enum PrinterUnit {

+		Display = 0,

+		HundredthsOfAMillimeter = 2,

+		TenthsOfAMillimeter = 3,

+		ThousandthsOfAnInch = 1

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Printing/PrintingPermissionLevel.cs b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingPermissionLevel.cs
new file mode 100644
index 00000000000..0f77f63bf6b
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Printing/PrintingPermissionLevel.cs
@@ -0,0 +1,16 @@
+//

+// System.Drawing.PrintingPermissionLevel.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Printing 

+{

+	public enum PrintingPermissionLevel {

+		AllPrinting = 3,

+		DefaultPrinting = 2,

+		NoPrinting = 0,

+		SafePrinting = 1

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Text/GenericFontFamilies.cs b/mcs/class/System.Drawing/System.Drawing.Text/GenericFontFamilies.cs
new file mode 100644
index 00000000000..3b76c6b94b0
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Text/GenericFontFamilies.cs
@@ -0,0 +1,15 @@
+//

+// System.Drawing.GenericFontFamilies.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Text 

+{

+	public enum GenericFontFamilies {

+		Monospace = 2,

+		SansSerif = 1,

+		Serif = 0

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Text/HotkeyPrefix.cs b/mcs/class/System.Drawing/System.Drawing.Text/HotkeyPrefix.cs
new file mode 100644
index 00000000000..df0418debc3
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Text/HotkeyPrefix.cs
@@ -0,0 +1,15 @@
+//

+// System.Drawing.HotkeyPrefix.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Text 

+{

+	public enum HotkeyPrefix {

+		Hide = 2,

+		None = 0,

+		Show = 1

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs b/mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs
new file mode 100644
index 00000000000..5f11cdcbb73
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.Text/TextRenderingHint.cs
@@ -0,0 +1,18 @@
+//

+// System.Drawing.TextRenderingHint.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+using System;

+namespace System.Drawing.Text 

+{

+	public enum TextRenderingHint {

+		AntiAlias = 4,

+		AntiAliasGridFit = 3,

+		ClearTypeGridFit = 5,

+		SingleBitPerPixel = 2,

+		SingleBitPerPixelGridFit = 1,

+		SystemDefault = 0

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing.build b/mcs/class/System.Drawing/System.Drawing.build
new file mode 100644
index 00000000000..729894ec2a4
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing.build
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for SystemDrawing.dll -->
+
+<project name="System" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<csc target="library" output="../lib/System.Drawing.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/unsafe"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/> 
+			</sources>
+			<references>
+				<includes name="../lib/corlib.dll"/>
+				<includes name="../lib/System.dll"/>
+			</references>
+		</csc>
+	</target>
+	<target name="clean">
+		<delete file="../lib/System.Drawing.dll" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/System.Drawing/System.Drawing/Bitmap.cs b/mcs/class/System.Drawing/System.Drawing/Bitmap.cs
new file mode 100755
index 00000000000..f874c056179
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/Bitmap.cs
@@ -0,0 +1,278 @@
+//

+// System.Drawing.Bitmap.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Christian Meyer

+// eMail: Christian.Meyer@cs.tum.edu

+//

+// No implementation has been done yet. I first want to write the method

+// headers of every System.Drawing.

+//

+//Buid warnings. Note add 6 to line numbers for these comments!

+//C:\cygwin\usr\local\mcs\class\System.Drawing\System.Drawing\Bitmap.cs(47,18): warning CS0649: Field 'System.Drawing.RGBQUAD.rgbBlue' is never assigned to, and will always have its default value 0

+//C:\cygwin\usr\local\mcs\class\System.Drawing\System.Drawing\Bitmap.cs(48,18): warning CS0649: Field 'System.Drawing.RGBQUAD.rgbGreen' is never assigned to, and will always have its default value 0

+//C:\cygwin\usr\local\mcs\class\System.Drawing\System.Drawing\Bitmap.cs(49,18): warning CS0649: Field 'System.Drawing.RGBQUAD.rgbRed' is never assigned to, and will always have its default value 0

+//C:\cygwin\usr\local\mcs\class\System.Drawing\System.Drawing\Bitmap.cs(50,18): warning CS0649: Field 'System.Drawing.RGBQUAD.rgbReserved' is never assigned to, and will always have its default value 0

+//C:\cygwin\usr\local\mcs\class\System.Drawing\System.Drawing\Bitmap.cs(54,20): warning CS0649: Field 'System.Drawing.BITMAPINFO.colorpalette' is never assigned to, and will always have its default value null

+// 2002-03-27  Christian Meyer  <Christian.Meyer@cs.tum.edu>

+// I'll have a closer look at it next week.

+//

+using System;

+using System.Drawing;

+using System.Drawing.Imaging;

+using System.IO;

+

+namespace System.Drawing {

+	struct BITMAPFILEHEADER {        // File info header

+		public uint bfType;      // Specifies the type of file. This member must be BM.

+		public uint bfSize;      // Specifies the size of the file, in bytes.

+		public uint bfReserved1; // Reserved; must be set to zero.

+		public uint bfReserved2; // Reserved; must be set to zero.

+		public uint bfOffBits;   // Specifies the byte offset from the BITMAPFILEHEADER

+                                         // structure to the actual bitmap data in the file.

+	}

+	struct BITMAPINFOHEADER {        // bitmap info header

+		public uint   biSize;

+		public int    biWidth;

+		public int    biHeight;

+		public ushort biPlanes;

+		public ushort biBitCount;

+		public uint   biCompression;

+		public uint   biSizeImage;

+		public int    biXPelsPerMeter;

+		public int    biYPelsPerMeter;

+		public uint   biClrUsed;

+		public uint   biClrImportant;

+	}

+

+	struct RGBQUAD {

+		public byte rgbBlue;

+		public byte rgbGreen;

+		public byte rgbRed;

+		public byte rgbReserved;

+	}

+	struct BITMAPINFO {              // bitmap info

+		public BITMAPINFOHEADER bitmapinfoheader;

+		public RGBQUAD[] colorpalette;

+	}

+	// I do not think pinning is needed execpt for when locked

+	// Is layout packed attribute needed here?

+	struct bitmapstruct {

+		//placed in a struct to keep all 3 (4 including the color table) contugious in memory.)

+		public BITMAPFILEHEADER fileheader;     //File info header

+		//bitmapinfo includes the color table

+		public BITMAPINFO       info;           //bitmap info

+		public byte[,]          bits;           //Actual bitmap bits

+	}

+	public sealed class Bitmap : Image {

+		// TODO: add following to an enum  with BI_RLE4 and BI_RLE8

+		const int BI_RGB = 0;                   //? 0 is from example;

+		bitmapstruct bitmap = new bitmapstruct();

+		private void CommonInit (int width, int height) {

+			// Init BITMAPFILEHANDLE

+			// document I am working from says tyoe must allways be "BM",

+			// the example has this set to 19778.

+			// TODO: verify magic number 19778 for "BM" bfType

+			bitmap.fileheader.bfType = 19778;

+			// TODO: is this the correct file size?

+			bitmap.fileheader.bfSize = (uint)

+				//bitmap

+				(width * height * 4)

+				//add color table, 0 for now

+				+ 0

+				// add header

+				+ 60;

+			bitmap.fileheader.bfReserved1 = 0;

+			bitmap.fileheader.bfReserved2 = 0;

+			// bfOffBits is bytes offset between start of bitmap (bimapfileheader)

+			// and start of actual data bits.

+			// Example puts it at 118 including 64 bytes of color table.

+			// I count 124. What is right?

+			// Also I force 32 bit color for first pass, so for now there is no color table (24 bit or greater)

+			// TODO: verify magic number 124 for bfOffBits

+			// TODO: Could also be sizeof(fileheader and bitmapinfo)

+			bitmap.fileheader.bfOffBits = 60; //14 * 4 for ints + 2 * 2 for words.

+

+			// Init BITMAPINFO HEADER

+			// TODO: document on bitmaps shows only 1, 4, 8, 24 as valid pixel depths

+			// TODO; MS's document says 32ppARGB is 32 bits per pixle, the default.

+

+			bitmap.info.bitmapinfoheader.biBitCount = 32;

+			// biclrused is the number of colors in the bitmap that are actualy used

+			// in the bitmap. 0 means all. default to this.

+			// TODO: As far as I know, it is fine to leave this as 0, but

+			// TODO: that it would be better to do an actual count.

+			// TODO: If we open an already created bitmap, we could in a later 

+			// TODO: version store that.

+			bitmap.info.bitmapinfoheader.biClrUsed = 0;

+			// biclrused is the number of colors in the bitmap that are importiant

+			// in the bitmap. 0 means all. default to this.

+			// TODO: As far as I know, it is fine to leave this as 0,

+			// TODO: If we open an already created bitmap, we could in a later 

+			// TODO: version store that.

+			// In a new bitmap, I do not know how we would know which colors are importiant.

+			bitmap.info.bitmapinfoheader.biClrImportant = 0;

+			// Options are BI_RGB for none, BI_RLE8 for 8 bit color ,BI_RLE4 for 4 bit color

+			// Only supprt BI_RGB for now;

+			// TODO: add definition for BI_***

+			// TODO: correctly set biSizeImage before supporting compression.

+			bitmap.info.bitmapinfoheader.biCompression = BI_RGB;

+			bitmap.info.bitmapinfoheader.biHeight = height;

+			bitmap.info.bitmapinfoheader.biWidth = width;

+			// TODO: add support for more planes

+			bitmap.info.bitmapinfoheader.biPlanes = 1;

+			// TODO: replace 40 with a sizeof() call

+			bitmap.info.bitmapinfoheader.biSize = 40;// size of this structure.

+			// TODO: correctly set biSizeImage so compression can be supported.

+			bitmap.info.bitmapinfoheader.biSizeImage = 0; //0 is allowed for BI_RGB (no compression)

+			// The example uses 0 for pels per meter, so do I.

+			// TODO: support pels per meter

+			bitmap.info.bitmapinfoheader.biXPelsPerMeter = 0;

+			bitmap.info.bitmapinfoheader.biYPelsPerMeter = 0;

+			bitmap.bits = new byte[width*4, height];

+		}

+		#region constructors

+		// constructors

+		public Bitmap (int width, int height) {

+			CommonInit (width, height);

+		}

+

+		public Bitmap (int width, int height, Graphics g) {

+			//TODO: Error check X,Y

+			CommonInit (width,height);

+			//TODO: use graphics to set vertial and horzontal resolution.

+			//TODO: that is all the spec requires or desires

+		}

+

+		public Bitmap (int width, int heigth, PixelFormat format) {

+			if ((int)format != BI_RGB) {

+				throw new NotImplementedException ();

+			}

+			CommonInit (width, heigth);

+		}

+

+		public Bitmap (Image origial) {

+			throw new NotImplementedException ();

+			//this.original = original;

+		}

+

+		public Bitmap (Stream stream) {

+			throw new NotImplementedException ();

+			//this.stream = stream;

+		}

+

+		public Bitmap (string filename) {

+			throw new NotImplementedException ();

+			//this.filename = filename;

+		}

+

+		public Bitmap (Image original, Size newSize) {

+			throw new NotImplementedException ();

+			//this.original = original;

+			//this.newSize = newSize;

+		}

+

+		public Bitmap (Stream stream, bool useIcm) {

+			throw new NotImplementedException ();

+			//this.stream = stream;

+			//this.useIcm = useIcm;

+		}

+

+		public Bitmap (string filename, bool useIcm) {

+			throw new NotImplementedException ();

+			//this.filename = filename;

+			//this.useIcm = useIcm;

+		}

+

+		public Bitmap (Type type, string resource) {

+			throw new NotImplementedException ();

+			//this.type = type;

+			//this.resource = resource;

+		}

+

+		public Bitmap (Image original, int width, int heigth) {

+			throw new NotImplementedException ();

+			//this.original = original;

+			//this.width = width;

+			//this.heigth = heigth;

+		}

+

+

+		public Bitmap (int width, int height, int stride,

+			       PixelFormat format, IntPtr scan0) {

+			throw new NotImplementedException ();

+			//this.width = width;

+			//this.heigth = heigth;

+			//this.stride = stride;

+			//this.format = format;

+			//this.scan0 = scan0;

+		}

+		#endregion

+		// methods

+		public Color GetPixel (int x, int y) {

+			//TODO: Error check X,Y

+			return Color.FromArgb (bitmap.bits[x,y], bitmap.bits[x+1,y], bitmap.bits[x+2,y], bitmap.bits[x+3,y]);

+		}

+

+		public void SetPixel (int x, int y, Color color) {

+			//TODO: Error check X,Y

+			bitmap.bits[x, y]     = color.A;

+			bitmap.bits[x + 1, y] = color.R;

+			bitmap.bits[x + 2, y] = color.G;

+			bitmap.bits[x + 2, y] = color.B;

+		}

+

+		public Bitmap Clone (Rectangle rect,PixelFormat format) {

+			throw new NotImplementedException ();

+		}

+		

+		public Bitmap Clone (RectangleF rect, PixelFormat format) {

+			throw new NotImplementedException ();

+		}

+

+		public static Bitmap FromHicon (IntPtr hicon) {

+			throw new NotImplementedException ();

+		}

+

+		public static Bitmap FromResource (IntPtr hinstance,

+		                                   string bitmapName) {

+			throw new NotImplementedException ();

+		}

+

+		public IntPtr GetHbitmap () {

+			throw new NotImplementedException ();

+		}

+

+		public IntPtr GetHbitmap (Color background) {

+			throw new NotImplementedException ();

+		}

+

+		public IntPtr GetHicon () {

+			throw new NotImplementedException ();

+		}

+

+		public BitmapData LockBits (Rectangle rect, ImageLockMode flags,

+		                            PixelFormat format) {

+			throw new NotImplementedException ();

+		}

+

+		public void MakeTransparent () {

+			throw new NotImplementedException ();

+		}

+

+		public void MakeTransparent (Color transparentColor) {

+			throw new NotImplementedException ();

+		}

+

+		public void SetResolution (float xDpi, float yDpi) {

+			throw new NotImplementedException ();

+		}

+

+		public void UnlockBits (BitmapData bitmapdata) {

+			throw new NotImplementedException ();

+		}

+

+		// properties

+		// needs to be done ###FIXME###

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/Brush.cs b/mcs/class/System.Drawing/System.Drawing/Brush.cs
new file mode 100755
index 00000000000..731f2d55408
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/Brush.cs
@@ -0,0 +1,34 @@
+//
+// System.Drawing.Brush.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System.Drawing {
+
+	public abstract class Brush : MarshalByRefObject, ICloneable, IDisposable {
+
+		abstract public object Clone ();
+
+		public void Dispose ()
+		{
+			Dispose (true);
+			System.GC.SuppressFinalize (this);
+		}
+
+		void Dispose (bool disposing)
+		{
+			// Nothing for now.
+		}
+
+		~Brush ()
+		{
+			Dispose (false);
+		}
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing/ChangeLog b/mcs/class/System.Drawing/System.Drawing/ChangeLog
new file mode 100644
index 00000000000..eaf90d20a58
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/ChangeLog
@@ -0,0 +1,85 @@
+2002-07-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ColorTranslator.cs: use Color.Name.
+
+2002-07-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Color.cs: implemented SystemColors and NamedColors properties that
+	are used by ColorConverter, removed public constructor, use
+	SystemColors, and misc. fixes to make it behave as MS (ToString,
+	parsing names, FromKnownColor,...).
+
+	* ColorConverter.cs: use NamedColors and SystemColors from Color when
+	trying to get the color from its name.
+
+	* SystemColors.cs: new file.
+
+2002-07-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Color.cs: changed static properties to use FromArgbNamed. Also
+	modified the program included in comments that get the values for
+	static properties.
+
+	(FromArgbNamed): build named colors.
+	(FromKnownColor): fixed.
+	(FromName): use a hash to look up colors by name.
+	(FillColorNames): create the hash of colors.
+	(Equals): compare values and name.
+	(ToString): improved.
+
+	* ColorTranslator.cs: implemented ToHtml.
+
+2002-06-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Color.cs: added TypeConverter attribute.
+	
+	* ColorConverter.cs: added constructor.
+
+2002-06-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ColorConverter.cs: implemented minimal set of features needed by xsp.
+
+2002-05-03  Mike Kestner <mkestner@speakeasy.net>
+
+	* Bitmap.cs : using System.IO
+	* ColorTranslator.cs : Stubbed off build breakers.
+	* Image.cs : Stub off IDisposable and ICloneable.
+	
+2002-04-27  Christian Meyer  <Christian.Meyer@cs.tum.edu>
+
+	* Bitmap.cs: Ximian is the new copyright holder now.
+	* Image.cs: ditto
+
+2002-04-05  Christian Meyer  <Christian.Meyer@cs.tum.edu>
+
+	* Uppercased several files.
+
+2002-04-05  Christian Meyer  <Christian.Meyer@cs.tum.edu>
+
+	* color.cs: Fixed a typo in GetSaturation ().
+
+2002-02-26  Christian Meyer  <Christian.Meyer@cs.tum.edu>
+
+	* Bitmap.cs: Added method headers.
+
+2002-02-25  Christian Meyer  <Christian.Meyer@cs.tum.edu>
+
+	* Bitmap.cs: Added, no implementation's done, yet.
+
+2001-12-15  Mike Kestner <mkestner@speakeasy.net>
+
+	* Rectangle.cs : Add a doc comment.
+	* RectangleF.cs : New struct implementation.
+
+2001-12-15  Mike Kestner <mkestner@speakeasy.net>
+
+	* Rectangle.cs : New struct implementation.
+
+2001-08-17  Mike Kestner <mkestner@speakeasy.net>
+
+	* PointF.cs, Size.cs, SizeF.cs : New struct implementations.
+
+2001-08-16  Mike Kestner <mkestner@speakeasy.net>
+
+	* Point.cs : New. Implementation of System.Drawing.Point struct.
+
diff --git a/mcs/class/System.Drawing/System.Drawing/Color.cs b/mcs/class/System.Drawing/System.Drawing/Color.cs
new file mode 100644
index 00000000000..94dde354b60
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/Color.cs
@@ -0,0 +1,1453 @@
+//

+// System.Drawing.Color.cs

+//

+// Authors:

+// 	Dennis Hayes (dennish@raytek.com)

+// 	Ben Houston  (ben@exocortex.org)

+// 	Gonzalo Paniagua (gonzalo@ximian.com)

+//

+// (C) 2002 Dennis Hayes

+// (c) 2002 Ximian, Inc. (http://www.ximiam.com)

+//

+// TODO: Are the static/non static functions declared correctly

+

+using System;

+using System.Collections;

+using System.ComponentModel;

+using System.Reflection;

+

+namespace System.Drawing 

+{

+	[TypeConverter(typeof(ColorConverter))]

+	[Serializable]

+	public struct Color

+	{

+		private static Hashtable namedColors;

+		private static Hashtable systemColors;

+		// Private transparancy (A) and R,G,B fields.

+		byte a;

+		byte r;

+		byte g;

+		byte b;

+		private static string creatingColorNames = "creatingColorNames";

+

+		// The specs also indicate that all three of these propities are true

+		// if created with FromKnownColor or FromNamedColor, false otherwise (FromARGB).

+		// Per Microsoft and ECMA specs these varibles are set by which constructor is used, not by their values.

+		bool isknowncolor;

+		bool isnamedcolor;

+		bool issystemcolor;

+		KnownColor knownColor;

+

+		string myname;

+

+		public string Name {

+			get{

+				return myname;

+			}

+		}

+

+		public bool IsKnownColor {

+			get{

+				return isknowncolor;

+			}

+		}

+

+		public bool IsSystemColor {

+			get{

+				return issystemcolor;

+			}

+		}

+

+		public bool IsNamedColor {

+			get{

+				if (!isnamedcolor)

+					return IsKnownColor;

+				return isnamedcolor;

+			}

+		}

+

+

+		public static Color FromArgb (int red, int green, int blue)

+		{

+			return FromArgb (255, red, green, blue);

+		}

+		

+		public static Color FromArgb (int alpha, int red, int green, int blue)

+		{

+			CheckARGBValues (alpha, red, green, blue);

+			Color color = new Color ();

+			color.a = (byte) alpha;

+			color.r = (byte) red;

+			color.g = (byte) green;

+			color.b = (byte) blue;

+			color.myname = String.Empty;

+			return color;

+		}

+

+		private static Color FromArgbNamed (int alpha, int red, int green, int blue, string name)

+		{

+			Color color = FromArgb (alpha, red, green, blue);

+			color.isknowncolor = true;

+			color.isnamedcolor = true;

+			//color.issystemcolor = false; //???

+			color.myname = name;

+			color.knownColor = (KnownColor) Enum.Parse (typeof (KnownColor), name, false);

+			return color;

+		}

+

+		internal static Color FromArgbSystem (int alpha, int red, int green, int blue, string name)

+		{

+			Color color = FromArgbNamed (alpha, red, green, blue, name);

+			color.issystemcolor = true;

+			return color;

+		}

+

+		public int ToArgb()

+		{

+			return a << 24 | r << 16 | g << 8 | b;

+		} 

+

+		public static Color FromArgb (int alpha, Color baseColor)

+		{

+			return FromArgb (alpha, baseColor.r, baseColor.g, baseColor.b);

+		}

+

+		public static Color FromArgb (int argb)

+		{

+			return FromArgb (argb >> 24, (argb >> 16) & 0x0FF, (argb >> 8) & 0x0FF, argb & 0x0FF);

+		}

+

+		public static Color FromKnownColor (KnownColor knownColorToConvert)

+		{

+			Color c = FromName (knownColorToConvert.ToString ());

+			c.knownColor = knownColorToConvert;

+			return c;

+		}

+

+		private static Hashtable GetColorHashtableFromType (Type type)

+		{

+			Hashtable colorHash = new Hashtable (CaseInsensitiveHashCodeProvider.Default,

+							     CaseInsensitiveComparer.Default);

+

+			PropertyInfo [] props = type.GetProperties ();

+			foreach (PropertyInfo prop in props){

+				if (prop.PropertyType != typeof (Color))

+					continue;

+

+				MethodInfo getget = prop.GetGetMethod ();

+				if (getget == null || getget.IsStatic == false)

+					continue;

+

+				colorHash.Add (prop.Name, prop.GetValue (null, null));

+			}

+			return colorHash;

+		}

+

+		private static void FillColorNames ()

+		{

+			if (systemColors != null)

+				return;

+

+			lock (creatingColorNames) {

+				if (systemColors != null)

+					return;

+				

+				Hashtable colorHash = GetColorHashtableFromType (typeof (Color));

+				namedColors = colorHash;

+

+				colorHash = GetColorHashtableFromType (typeof (SystemColors));

+				systemColors = colorHash;

+			}

+		}

+		

+		public static Color FromName (string colorName)

+		{

+			object c = NamedColors [colorName];

+			if (c == null) {

+				c = SystemColors [colorName];

+				if (c == null) {

+					// This is what it returns!

+					Color d = FromArgb (0, 0, 0, 0);

+					d.myname = colorName;

+					d.isnamedcolor = true;

+					c = d;

+				}

+			}

+

+			return (Color) c;

+		}

+

+		internal static Hashtable NamedColors

+		{

+			get {

+				FillColorNames ();

+				return namedColors;

+			}

+		}

+

+		internal static Hashtable SystemColors

+		{

+			get {

+				FillColorNames ();

+				return systemColors;

+			}

+		}

+			

+		// -----------------------

+		// Public Shared Members

+		// -----------------------

+

+		/// <summary>

+		///	Empty Shared Field

+		/// </summary>

+		///

+		/// <remarks>

+		///	An uninitialized Color Structure

+		/// </remarks>

+		

+		public static readonly Color Empty;

+		

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two Color objects. The return value is

+		///	based on the equivalence of the A,R,G,B properties 

+		///	of the two Colors.

+		/// </remarks>

+

+		public static bool operator == (Color colorA, Color colorB)

+		{

+			return ((colorA.a == colorB.a) && (colorA.r == colorB.r)

+			&& (colorA.g == colorB.g) && (colorA.b == colorB.b));

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two Color objects. The return value is

+		///	based on the equivalence of the A,R,G,B properties 

+		///	of the two colors.

+		/// </remarks>

+

+		public static bool operator != (Color colorA, Color colorB)

+		{

+			return ((colorA.a != colorB.a) || (colorA.r != colorB.r)

+			|| (colorA.g != colorB.g) || (colorA.b != colorB.b));

+		}

+		

+		public float GetBrightness (){

+			// Intensity is the normalized sum of the three RGB values.;

+			return ((float)(r + g + b))/(255*3);

+		}

+		public float GetSaturation (){

+			// S = 1 - I * Min(r,g,b)

+			return (255 - 

+				(((float)(r + g +b))/3)*Math.Min(r,Math.Min(g,b))

+				)/255;

+		}

+

+		public float GetHue (){

+			float top = ((float)(2*r-g-b))/(2*255);

+			float bottom = (float)Math.Sqrt(((r-g)*(r-g) + (r-b)*(g-b))/255);

+			return (float)Math.Acos(top/bottom);

+		}

+		

+		// -----------------------

+		// Public Instance Members

+		// -----------------------

+

+		/// <summary>

+		///	ToKnownColor method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Returns the KnownColor enum value for this color, 0 if is not known.

+		/// </remarks>

+		public KnownColor ToKnownColor ()

+		{

+			return knownColor;

+		}

+

+		/// <summary>

+		///	IsEmpty Property

+		/// </summary>

+		///

+		/// <remarks>

+		///	Indicates transparent black. R,G,B = 0; A=0?

+		/// </remarks>

+		

+		public bool IsEmpty 

+		{

+			get {

+				return (a + r + g + b) == 0;

+			}

+		}

+

+		/// <summary>

+		///	A Property

+		/// </summary>

+		///

+		/// <remarks>

+		///	The transparancy of the Color.

+		/// </remarks>

+		

+		public byte A

+		{

+			get {

+				return a;

+			}

+		}

+

+		/// <summary>

+		///	R Property

+		/// </summary>

+		///

+		/// <remarks>

+		///	The red value of the Color.

+		/// </remarks>

+		

+		public byte R

+		{

+			get {

+				return r;

+			}

+		}

+

+		/// <summary>

+		///	G Property

+		/// </summary>

+		///

+		/// <remarks>

+		///	The green value of the Color.

+		/// </remarks>

+		

+		public byte G

+		{

+			get {

+				return g;

+			}

+		}

+

+		/// <summary>

+		///	B Property

+		/// </summary>

+		///

+		/// <remarks>

+		///	The blue value of the Color.

+		/// </remarks>

+		

+		public byte B

+		{

+			get {

+				return b;

+			}

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this Color and another object.

+		/// </remarks>

+		

+		public override bool Equals (object o)

+		{

+			if (!(o is Color))

+				return false;

+

+			Color c = (Color) o;

+			if (c.r == r && c.g == g && c.b == b) {

+				if (myname != null || c.myname != null)

+					return (myname == c.myname);

+				return true;

+			}

+			return false;

+		}

+

+		/// <summary>

+		///	Reference Equals Method

+		///	Is commented out because this is handled by the base class.

+		///	TODO: Is it correct to let the base class handel reference equals

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this Color and another object.

+		/// </remarks>

+		//public bool ReferenceEquals (object o)

+		//{

+		//	if (!(o is Color))return false;

+		//	return (this == (Color) o);

+		//}

+

+

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		

+		public override int GetHashCode ()

+		{

+			return ToArgb().GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the Color as a string in ARGB notation.

+		/// </remarks>

+		

+		public override string ToString ()

+		{

+			if (myname != "")

+				return "Color [" + myname + "]";

+

+			return String.Format ("Color [A={0}, R={1}, G={2}, B={3}]", a, r, g, b);

+		}

+  

+		private static void CheckRGBValues (int red,int green,int blue)

+		{

+			if( (red > 255) || (red < 0))

+				throw new System.ArgumentOutOfRangeException

+					("red",red,"Value must be in the range 0 - 255");

+			if( (green > 255) || (green < 0))

+				throw new System.ArgumentOutOfRangeException

+					("green",green,"Value must be in the range 0 - 255");

+			if( (blue > 255) || (blue < 0))

+				throw new System.ArgumentOutOfRangeException

+					("blue",blue,"Value must be in the range 0 - 255");

+		}

+

+		private static void CheckARGBValues (int alpha,int red,int green,int blue)

+		{

+			if( (alpha > 255) || (alpha < 0))

+				throw new System.ArgumentOutOfRangeException

+					("alpha",alpha,"Value must be in the range 0 - 255");

+			CheckRGBValues(red,green,blue);

+		}

+

+		//Documentation, do not remove!

+		//This is the program that was used to generate the C# source code below.

+		//using System;

+		//using System.Diagnostics;

+		//using System.Drawing;

+		//using System.Reflection;

+		//public class m {

+		//static void Main(string[] args)

+		//{

+		//	Type cType = typeof (Color);

+		//	PropertyInfo [] properties = cType.GetProperties ();

+		//	foreach (PropertyInfo property in properties) {

+		//		MethodInfo method = property.GetGetMethod();

+		//		if (method != null && method.IsStatic && method.ReturnType == cType) {

+		//			Color c = (Color) method.Invoke( null, new object[0] );

+		//			Console.WriteLine("static public Color " + property.Name);

+		//			Console.WriteLine("{\t\n\tget {");

+		//			Console.WriteLine("\t\treturn Color.FromArgbNamed ({0}, {1}, {2}, {3}, \"{4}\");",

+		//						c.A, c.R, c.G, c.B, property.Name);

+		//			Console.WriteLine("\t}");

+		//			Console.WriteLine("}\n");

+		//		}

+		//	}

+		//}

+		//}

+

+		static public Color Transparent

+		{	

+			get {

+				return Color.FromArgbNamed (0, 255, 255, 255, "Transparent");

+			}

+		}

+

+		static public Color AliceBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 240, 248, 255, "AliceBlue");

+			}

+		}

+

+		static public Color AntiqueWhite

+		{	

+			get {

+				return Color.FromArgbNamed (255, 250, 235, 215, "AntiqueWhite");

+			}

+		}

+

+		static public Color Aqua

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 255, 255, "Aqua");

+			}

+		}

+

+		static public Color Aquamarine

+		{	

+			get {

+				return Color.FromArgbNamed (255, 127, 255, 212, "Aquamarine");

+			}

+		}

+

+		static public Color Azure

+		{	

+			get {

+				return Color.FromArgbNamed (255, 240, 255, 255, "Azure");

+			}

+		}

+

+		static public Color Beige

+		{	

+			get {

+				return Color.FromArgbNamed (255, 245, 245, 220, "Beige");

+			}

+		}

+

+		static public Color Bisque

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 228, 196, "Bisque");

+			}

+		}

+

+		static public Color Black

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 0, 0, "Black");

+			}

+		}

+

+		static public Color BlanchedAlmond

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 235, 205, "BlanchedAlmond");

+			}

+		}

+

+		static public Color Blue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 0, 255, "Blue");

+			}

+		}

+

+		static public Color BlueViolet

+		{	

+			get {

+				return Color.FromArgbNamed (255, 138, 43, 226, "BlueViolet");

+			}

+		}

+

+		static public Color Brown

+		{	

+			get {

+				return Color.FromArgbNamed (255, 165, 42, 42, "Brown");

+			}

+		}

+

+		static public Color BurlyWood

+		{	

+			get {

+				return Color.FromArgbNamed (255, 222, 184, 135, "BurlyWood");

+			}

+		}

+

+		static public Color CadetBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 95, 158, 160, "CadetBlue");

+			}

+		}

+

+		static public Color Chartreuse

+		{	

+			get {

+				return Color.FromArgbNamed (255, 127, 255, 0, "Chartreuse");

+			}

+		}

+

+		static public Color Chocolate

+		{	

+			get {

+				return Color.FromArgbNamed (255, 210, 105, 30, "Chocolate");

+			}

+		}

+

+		static public Color Coral

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 127, 80, "Coral");

+			}

+		}

+

+		static public Color CornflowerBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 100, 149, 237, "CornflowerBlue");

+			}

+		}

+

+		static public Color Cornsilk

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 248, 220, "Cornsilk");

+			}

+		}

+

+		static public Color Crimson

+		{	

+			get {

+				return Color.FromArgbNamed (255, 220, 20, 60, "Crimson");

+			}

+		}

+

+		static public Color Cyan

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 255, 255, "Cyan");

+			}

+		}

+

+		static public Color DarkBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 0, 139, "DarkBlue");

+			}

+		}

+

+		static public Color DarkCyan

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 139, 139, "DarkCyan");

+			}

+		}

+

+		static public Color DarkGoldenrod

+		{	

+			get {

+				return Color.FromArgbNamed (255, 184, 134, 11, "DarkGoldenrod");

+			}

+		}

+

+		static public Color DarkGray

+		{	

+			get {

+				return Color.FromArgbNamed (255, 169, 169, 169, "DarkGray");

+			}

+		}

+

+		static public Color DarkGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 100, 0, "DarkGreen");

+			}

+		}

+

+		static public Color DarkKhaki

+		{	

+			get {

+				return Color.FromArgbNamed (255, 189, 183, 107, "DarkKhaki");

+			}

+		}

+

+		static public Color DarkMagenta

+		{	

+			get {

+				return Color.FromArgbNamed (255, 139, 0, 139, "DarkMagenta");

+			}

+		}

+

+		static public Color DarkOliveGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 85, 107, 47, "DarkOliveGreen");

+			}

+		}

+

+		static public Color DarkOrange

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 140, 0, "DarkOrange");

+			}

+		}

+

+		static public Color DarkOrchid

+		{	

+			get {

+				return Color.FromArgbNamed (255, 153, 50, 204, "DarkOrchid");

+			}

+		}

+

+		static public Color DarkRed

+		{	

+			get {

+				return Color.FromArgbNamed (255, 139, 0, 0, "DarkRed");

+			}

+		}

+

+		static public Color DarkSalmon

+		{	

+			get {

+				return Color.FromArgbNamed (255, 233, 150, 122, "DarkSalmon");

+			}

+		}

+

+		static public Color DarkSeaGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 143, 188, 139, "DarkSeaGreen");

+			}

+		}

+

+		static public Color DarkSlateBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 72, 61, 139, "DarkSlateBlue");

+			}

+		}

+

+		static public Color DarkSlateGray

+		{	

+			get {

+				return Color.FromArgbNamed (255, 47, 79, 79, "DarkSlateGray");

+			}

+		}

+

+		static public Color DarkTurquoise

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 206, 209, "DarkTurquoise");

+			}

+		}

+

+		static public Color DarkViolet

+		{	

+			get {

+				return Color.FromArgbNamed (255, 148, 0, 211, "DarkViolet");

+			}

+		}

+

+		static public Color DeepPink

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 20, 147, "DeepPink");

+			}

+		}

+

+		static public Color DeepSkyBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 191, 255, "DeepSkyBlue");

+			}

+		}

+

+		static public Color DimGray

+		{	

+			get {

+				return Color.FromArgbNamed (255, 105, 105, 105, "DimGray");

+			}

+		}

+

+		static public Color DodgerBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 30, 144, 255, "DodgerBlue");

+			}

+		}

+

+		static public Color Firebrick

+		{	

+			get {

+				return Color.FromArgbNamed (255, 178, 34, 34, "Firebrick");

+			}

+		}

+

+		static public Color FloralWhite

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 250, 240, "FloralWhite");

+			}

+		}

+

+		static public Color ForestGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 34, 139, 34, "ForestGreen");

+			}

+		}

+

+		static public Color Fuchsia

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 0, 255, "Fuchsia");

+			}

+		}

+

+		static public Color Gainsboro

+		{	

+			get {

+				return Color.FromArgbNamed (255, 220, 220, 220, "Gainsboro");

+			}

+		}

+

+		static public Color GhostWhite

+		{	

+			get {

+				return Color.FromArgbNamed (255, 248, 248, 255, "GhostWhite");

+			}

+		}

+

+		static public Color Gold

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 215, 0, "Gold");

+			}

+		}

+

+		static public Color Goldenrod

+		{	

+			get {

+				return Color.FromArgbNamed (255, 218, 165, 32, "Goldenrod");

+			}

+		}

+

+		static public Color Gray

+		{	

+			get {

+				return Color.FromArgbNamed (255, 128, 128, 128, "Gray");

+			}

+		}

+

+		static public Color Green

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 128, 0, "Green");

+			}

+		}

+

+		static public Color GreenYellow

+		{	

+			get {

+				return Color.FromArgbNamed (255, 173, 255, 47, "GreenYellow");

+			}

+		}

+

+		static public Color Honeydew

+		{	

+			get {

+				return Color.FromArgbNamed (255, 240, 255, 240, "Honeydew");

+			}

+		}

+

+		static public Color HotPink

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 105, 180, "HotPink");

+			}

+		}

+

+		static public Color IndianRed

+		{	

+			get {

+				return Color.FromArgbNamed (255, 205, 92, 92, "IndianRed");

+			}

+		}

+

+		static public Color Indigo

+		{	

+			get {

+				return Color.FromArgbNamed (255, 75, 0, 130, "Indigo");

+			}

+		}

+

+		static public Color Ivory

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 255, 240, "Ivory");

+			}

+		}

+

+		static public Color Khaki

+		{	

+			get {

+				return Color.FromArgbNamed (255, 240, 230, 140, "Khaki");

+			}

+		}

+

+		static public Color Lavender

+		{	

+			get {

+				return Color.FromArgbNamed (255, 230, 230, 250, "Lavender");

+			}

+		}

+

+		static public Color LavenderBlush

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 240, 245, "LavenderBlush");

+			}

+		}

+

+		static public Color LawnGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 124, 252, 0, "LawnGreen");

+			}

+		}

+

+		static public Color LemonChiffon

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 250, 205, "LemonChiffon");

+			}

+		}

+

+		static public Color LightBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 173, 216, 230, "LightBlue");

+			}

+		}

+

+		static public Color LightCoral

+		{	

+			get {

+				return Color.FromArgbNamed (255, 240, 128, 128, "LightCoral");

+			}

+		}

+

+		static public Color LightCyan

+		{	

+			get {

+				return Color.FromArgbNamed (255, 224, 255, 255, "LightCyan");

+			}

+		}

+

+		static public Color LightGoldenrodYellow

+		{	

+			get {

+				return Color.FromArgbNamed (255, 250, 250, 210, "LightGoldenrodYellow");

+			}

+		}

+

+		static public Color LightGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 144, 238, 144, "LightGreen");

+			}

+		}

+

+		static public Color LightGray

+		{	

+			get {

+				return Color.FromArgbNamed (255, 211, 211, 211, "LightGray");

+			}

+		}

+

+		static public Color LightPink

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 182, 193, "LightPink");

+			}

+		}

+

+		static public Color LightSalmon

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 160, 122, "LightSalmon");

+			}

+		}

+

+		static public Color LightSeaGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 32, 178, 170, "LightSeaGreen");

+			}

+		}

+

+		static public Color LightSkyBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 135, 206, 250, "LightSkyBlue");

+			}

+		}

+

+		static public Color LightSlateGray

+		{	

+			get {

+				return Color.FromArgbNamed (255, 119, 136, 153, "LightSlateGray");

+			}

+		}

+

+		static public Color LightSteelBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 176, 196, 222, "LightSteelBlue");

+			}

+		}

+

+		static public Color LightYellow

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 255, 224, "LightYellow");

+			}

+		}

+

+		static public Color Lime

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 255, 0, "Lime");

+			}

+		}

+

+		static public Color LimeGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 50, 205, 50, "LimeGreen");

+			}

+		}

+

+		static public Color Linen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 250, 240, 230, "Linen");

+			}

+		}

+

+		static public Color Magenta

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 0, 255, "Magenta");

+			}

+		}

+

+		static public Color Maroon

+		{	

+			get {

+				return Color.FromArgbNamed (255, 128, 0, 0, "Maroon");

+			}

+		}

+

+		static public Color MediumAquamarine

+		{	

+			get {

+				return Color.FromArgbNamed (255, 102, 205, 170, "MediumAquamarine");

+			}

+		}

+

+		static public Color MediumBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 0, 205, "MediumBlue");

+			}

+		}

+

+		static public Color MediumOrchid

+		{	

+			get {

+				return Color.FromArgbNamed (255, 186, 85, 211, "MediumOrchid");

+			}

+		}

+

+		static public Color MediumPurple

+		{	

+			get {

+				return Color.FromArgbNamed (255, 147, 112, 219, "MediumPurple");

+			}

+		}

+

+		static public Color MediumSeaGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 60, 179, 113, "MediumSeaGreen");

+			}

+		}

+

+		static public Color MediumSlateBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 123, 104, 238, "MediumSlateBlue");

+			}

+		}

+

+		static public Color MediumSpringGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 250, 154, "MediumSpringGreen");

+			}

+		}

+

+		static public Color MediumTurquoise

+		{	

+			get {

+				return Color.FromArgbNamed (255, 72, 209, 204, "MediumTurquoise");

+			}

+		}

+

+		static public Color MediumVioletRed

+		{	

+			get {

+				return Color.FromArgbNamed (255, 199, 21, 133, "MediumVioletRed");

+			}

+		}

+

+		static public Color MidnightBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 25, 25, 112, "MidnightBlue");

+			}

+		}

+

+		static public Color MintCream

+		{	

+			get {

+				return Color.FromArgbNamed (255, 245, 255, 250, "MintCream");

+			}

+		}

+

+		static public Color MistyRose

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 228, 225, "MistyRose");

+			}

+		}

+

+		static public Color Moccasin

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 228, 181, "Moccasin");

+			}

+		}

+

+		static public Color NavajoWhite

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 222, 173, "NavajoWhite");

+			}

+		}

+

+		static public Color Navy

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 0, 128, "Navy");

+			}

+		}

+

+		static public Color OldLace

+		{	

+			get {

+				return Color.FromArgbNamed (255, 253, 245, 230, "OldLace");

+			}

+		}

+

+		static public Color Olive

+		{	

+			get {

+				return Color.FromArgbNamed (255, 128, 128, 0, "Olive");

+			}

+		}

+

+		static public Color OliveDrab

+		{	

+			get {

+				return Color.FromArgbNamed (255, 107, 142, 35, "OliveDrab");

+			}

+		}

+

+		static public Color Orange

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 165, 0, "Orange");

+			}

+		}

+

+		static public Color OrangeRed

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 69, 0, "OrangeRed");

+			}

+		}

+

+		static public Color Orchid

+		{	

+			get {

+				return Color.FromArgbNamed (255, 218, 112, 214, "Orchid");

+			}

+		}

+

+		static public Color PaleGoldenrod

+		{	

+			get {

+				return Color.FromArgbNamed (255, 238, 232, 170, "PaleGoldenrod");

+			}

+		}

+

+		static public Color PaleGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 152, 251, 152, "PaleGreen");

+			}

+		}

+

+		static public Color PaleTurquoise

+		{	

+			get {

+				return Color.FromArgbNamed (255, 175, 238, 238, "PaleTurquoise");

+			}

+		}

+

+		static public Color PaleVioletRed

+		{	

+			get {

+				return Color.FromArgbNamed (255, 219, 112, 147, "PaleVioletRed");

+			}

+		}

+

+		static public Color PapayaWhip

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 239, 213, "PapayaWhip");

+			}

+		}

+

+		static public Color PeachPuff

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 218, 185, "PeachPuff");

+			}

+		}

+

+		static public Color Peru

+		{	

+			get {

+				return Color.FromArgbNamed (255, 205, 133, 63, "Peru");

+			}

+		}

+

+		static public Color Pink

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 192, 203, "Pink");

+			}

+		}

+

+		static public Color Plum

+		{	

+			get {

+				return Color.FromArgbNamed (255, 221, 160, 221, "Plum");

+			}

+		}

+

+		static public Color PowderBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 176, 224, 230, "PowderBlue");

+			}

+		}

+

+		static public Color Purple

+		{	

+			get {

+				return Color.FromArgbNamed (255, 128, 0, 128, "Purple");

+			}

+		}

+

+		static public Color Red

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 0, 0, "Red");

+			}

+		}

+

+		static public Color RosyBrown

+		{	

+			get {

+				return Color.FromArgbNamed (255, 188, 143, 143, "RosyBrown");

+			}

+		}

+

+		static public Color RoyalBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 65, 105, 225, "RoyalBlue");

+			}

+		}

+

+		static public Color SaddleBrown

+		{	

+			get {

+				return Color.FromArgbNamed (255, 139, 69, 19, "SaddleBrown");

+			}

+		}

+

+		static public Color Salmon

+		{	

+			get {

+				return Color.FromArgbNamed (255, 250, 128, 114, "Salmon");

+			}

+		}

+

+		static public Color SandyBrown

+		{	

+			get {

+				return Color.FromArgbNamed (255, 244, 164, 96, "SandyBrown");

+			}

+		}

+

+		static public Color SeaGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 46, 139, 87, "SeaGreen");

+			}

+		}

+

+		static public Color SeaShell

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 245, 238, "SeaShell");

+			}

+		}

+

+		static public Color Sienna

+		{	

+			get {

+				return Color.FromArgbNamed (255, 160, 82, 45, "Sienna");

+			}

+		}

+

+		static public Color Silver

+		{	

+			get {

+				return Color.FromArgbNamed (255, 192, 192, 192, "Silver");

+			}

+		}

+

+		static public Color SkyBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 135, 206, 235, "SkyBlue");

+			}

+		}

+

+		static public Color SlateBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 106, 90, 205, "SlateBlue");

+			}

+		}

+

+		static public Color SlateGray

+		{	

+			get {

+				return Color.FromArgbNamed (255, 112, 128, 144, "SlateGray");

+			}

+		}

+

+		static public Color Snow

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 250, 250, "Snow");

+			}

+		}

+

+		static public Color SpringGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 255, 127, "SpringGreen");

+			}

+		}

+

+		static public Color SteelBlue

+		{	

+			get {

+				return Color.FromArgbNamed (255, 70, 130, 180, "SteelBlue");

+			}

+		}

+

+		static public Color Tan

+		{	

+			get {

+				return Color.FromArgbNamed (255, 210, 180, 140, "Tan");

+			}

+		}

+

+		static public Color Teal

+		{	

+			get {

+				return Color.FromArgbNamed (255, 0, 128, 128, "Teal");

+			}

+		}

+

+		static public Color Thistle

+		{	

+			get {

+				return Color.FromArgbNamed (255, 216, 191, 216, "Thistle");

+			}

+		}

+

+		static public Color Tomato

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 99, 71, "Tomato");

+			}

+		}

+

+		static public Color Turquoise

+		{	

+			get {

+				return Color.FromArgbNamed (255, 64, 224, 208, "Turquoise");

+			}

+		}

+

+		static public Color Violet

+		{	

+			get {

+				return Color.FromArgbNamed (255, 238, 130, 238, "Violet");

+			}

+		}

+

+		static public Color Wheat

+		{	

+			get {

+				return Color.FromArgbNamed (255, 245, 222, 179, "Wheat");

+			}

+		}

+

+		static public Color White

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 255, 255, "White");

+			}

+		}

+

+		static public Color WhiteSmoke

+		{	

+			get {

+				return Color.FromArgbNamed (255, 245, 245, 245, "WhiteSmoke");

+			}

+		}

+

+		static public Color Yellow

+		{	

+			get {

+				return Color.FromArgbNamed (255, 255, 255, 0, "Yellow");

+			}

+		}

+

+		static public Color YellowGreen

+		{	

+			get {

+				return Color.FromArgbNamed (255, 154, 205, 50, "YellowGreen");

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs b/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
new file mode 100644
index 00000000000..c0d9a8bc7c8
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/ColorConverter.cs
@@ -0,0 +1,87 @@
+//
+// System.Drawing.ColorConverter
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.ComponentModel;
+using System.Globalization;
+
+namespace System.Drawing {
+
+public class ColorConverter : TypeConverter
+{
+	public ColorConverter ()
+	{
+	}
+
+	public override bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
+	{
+		if (sourceType == typeof (string))
+			return true;
+
+		return base.CanConvertFrom(context, sourceType);
+	}
+
+	[MonoTODO]
+	public override bool CanConvertTo (ITypeDescriptorContext context, Type destinationType)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public override object ConvertFrom (ITypeDescriptorContext context,
+					    CultureInfo culture,
+					    object value)
+	{
+		string s = value as string;
+		if (s == null)
+			return base.ConvertFrom (context, culture, value);
+
+		object named = Color.NamedColors [s];
+		if (named != null)
+			return (Color) named;
+
+		named = Color.SystemColors [s];
+		if (named != null)
+			return (Color) named;
+			
+		int i;
+		if (s [0] == '#')
+			i = Int32.Parse (s.Substring (1), NumberStyles.HexNumber);
+		else
+			i = Int32.Parse (s, NumberStyles.Integer);
+
+		int A = (int) (i & 0xFF000000) >> 24;
+		if (A == 0)
+			A = 255;
+		return Color.FromArgb (A, (i & 0x00FF0000) >> 16, (i & 0x00FF00) >> 8, (i & 0x0FF));
+	}
+
+	[MonoTODO]
+	public override object ConvertTo (ITypeDescriptorContext context,
+					  CultureInfo culture,
+					  object value,
+					  Type destinationType)
+	{
+		throw new NotImplementedException ();
+	}
+/*
+ *  StandardValuesCollection is TypeDescriptor.StandardValuesCollection
+ *  TODO: check if the compiler already supports that.
+	public override StandardValuesCollection GetStandardValues (ITypeDescriptorContext context)
+	{
+	}
+*/
+
+	[MonoTODO]
+	public override bool GetStandardValuesSupported (ITypeDescriptorContext context)
+	{
+		// This should return true once GetStandardValues is implemented
+		throw new NotImplementedException ();
+	}
+}
+}
+
diff --git a/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs b/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs
new file mode 100644
index 00000000000..12579d09b40
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/ColorTranslator.cs
@@ -0,0 +1,101 @@
+//

+// System.Drawing.ColorTranslator.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+//

+// Dennis Hayes (dennish@raytek.com)

+// Inital Implimentation 3/25/2002

+// All conversions based on best guess, will improve over time

+// 

+using System;

+namespace System.Drawing {

+	public class ColorTranslator{

+		// From converisons

+		/// <summary>

+		/// 

+		/// </summary>

+		/// <param name="HtmlFromColor"></param>

+		/// <returns></returns>

+		public static Color FromHtml(string HtmlFromColor){

+			// TODO: 

+			// If first char is "#"

+				//convert "#RRGGBB" to int and use Color.FromARGB(int) to create color

+			// else //it is a color name

+			//If there is a single digit at the end of the name, remove it.

+			// Call Color.FromKnownColor(HtmlFromColor)  

+

+			//At least some Html strings match .NET Colors,

+			// so this should work for those colors.

+			// .NET colors, XWindows colors, and WWWC web colors 

+			// are (according to Charles Pretziod) base the same

+			//colors, so many shouold work if any do.

+			//return Color.FromKnownColor(HtmlFromColor);

+			return Color.Empty;

+		}

+		

+		/// <summary>

+		/// 

+		/// </summary>

+		/// <param name="OLEFromColor"></param>

+		/// <returns></returns>

+		public static Color FromOle(int OLEFromColor){

+			//int newcolor;

+			//TODO: swap RB bytes i.e. AARRGGBB to AABBGGRR

+			//return Color.FromArgb(newcolor);

+			return Color.Empty;

+		}

+		

+		/// <summary>

+		/// 

+		/// </summary>

+		/// <param name="Win32FromColor"></param>

+		/// <returns></returns>

+		public static Color FromWin32(int Win32FromColor){

+			//int newcolor;

+			//TODO: swap RB bytes i.e. AARRGGBB to AABBGGRR

+			//return Color.FromArgb(newcolor);

+			return Color.Empty;

+		}

+

+		// To conversions

+		public static string ToHtml (Color c)

+		{

+			if (c.IsEmpty)

+				return "";

+

+			string result;

+

+			if (c.IsNamedColor)

+				result = c.Name;

+			else

+				result = String.Format ("#{0:X2}{1:X2}{2:X2}", c.R, c.G, c.B);

+

+			return result;

+		}

+		/// <summary>

+		/// converts from BGR to RGB

+		/// </summary>

+		/// <param name="OleToColor"></param>

+		/// <returns></returns>

+		public static int ToOle(Color FromColor){

+			// TODO: Swap red and blue(from argb), convert to int(toargb)

+			// Same as ToWin32

+			return (Color.FromArgb(FromColor.B,FromColor.G,FromColor.R)).ToArgb();

+		}

+

+		/// <summary>

+		/// converts from RGB to BGR

+		/// </summary>

+		/// <param name="Win32ToColor"></param>

+		/// <returns></returns>

+		public static int ToWin32(Color FromColor){

+			// TODO: Swap red and blue(from argb), convert to int(toargb)

+			// Same as ToOle

+			return (Color.FromArgb(FromColor.B,FromColor.G,FromColor.R)).ToArgb();

+		}

+	}

+}

+

+

+

+

diff --git a/mcs/class/System.Drawing/System.Drawing/ContentAlignment.cs b/mcs/class/System.Drawing/System.Drawing/ContentAlignment.cs
new file mode 100644
index 00000000000..15f9a600532
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/ContentAlignment.cs
@@ -0,0 +1,22 @@
+//

+// System.Drawing.ContentAlignment.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+

+using System;

+namespace System.Drawing 

+{

+	public enum ContentAlignment {

+		BottomCenter = 1,

+		BottomLeft = 2,

+		BottomRight = 3,

+		MiddleCenter = 4,

+		MiddleLeft = 5,

+		MiddleRight = 6,

+		TopCenter = 7,

+		TopLeft = 8,

+		TopRight = 9

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/FontStyle.cs b/mcs/class/System.Drawing/System.Drawing/FontStyle.cs
new file mode 100644
index 00000000000..002bbb9fa3d
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/FontStyle.cs
@@ -0,0 +1,19 @@
+//

+// System.Drawing.fontStyle.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+

+

+using System;

+namespace System.Drawing 

+{

+	public enum FontStyle {

+		Bold  = 1,

+		Italic = 2,

+		Regular = 3,

+		Strikeout = 4,

+		Underline = 5

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/Graphics.cs b/mcs/class/System.Drawing/System.Drawing/Graphics.cs
new file mode 100755
index 00000000000..b957e69684a
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/Graphics.cs
@@ -0,0 +1,18 @@
+//

+// System.Drawing.Bitmap.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+//

+// Just to get things to compile

+//

+namespace System.Drawing {

+

+	public sealed class Graphics : MarshalByRefObject, IDisposable {

+

+		public void Dispose ()

+		{

+		}

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/GraphicsUnit.cs b/mcs/class/System.Drawing/System.Drawing/GraphicsUnit.cs
new file mode 100644
index 00000000000..a5428c3a603
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/GraphicsUnit.cs
@@ -0,0 +1,20 @@
+//

+// System.Drawing.GraphicsUnit.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+

+using System;

+namespace System.Drawing 

+{

+	public enum GraphicsUnit {

+		Display = 1,

+		Document = 2,

+		Inch = 3,

+		Millimeter = 4,

+		Pixel = 5,

+		Point = 6,

+		World = 7,

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/Image.cs b/mcs/class/System.Drawing/System.Drawing/Image.cs
new file mode 100644
index 00000000000..5f3bd7f3f43
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/Image.cs
@@ -0,0 +1,199 @@
+//

+// System.Drawing.Image.cs

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+// Author: Christian Meyer

+// eMail: Christian.Meyer@cs.tum.edu

+//

+// Many methods are still commented. I'll care about them when all necessary

+// classes are implemented.

+//

+namespace System.Drawing {

+

+using System;

+using System.Runtime.Remoting;

+using System.Runtime.Serialization;

+using System.Drawing.Imaging;

+

+//[Serializable]

+//[ComVisible(true)]

+

+public abstract class Image : MarshalByRefObject /*, ICloneable, IDisposable, ISerializable */ {

+

+	// constructor

+	public Image () {}

+    

+	// public methods

+	// static

+	public static Image FromFile (string filename)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+	

+	public static Image FromFile (string filename, bool useEmbeddedColorManagement)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+	

+	public static Bitmap FromHbitmap (IntPtr hbitmap)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+

+	public static Bitmap FromHbitmap (IntPtr hbitmap, IntPtr hpalette)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+	

+	public static int GetPixelFormatSize (PixelFormat pixfmt)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+

+	public static bool IsAlphaPixelFormat (PixelFormat pixfmt)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+	

+	public static bool IsCanonicalPixelFormat (PixelFormat pixfmt)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+	

+	public static bool IsExtendedPixelFormat (PixelFormat pixfmt)

+    	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+

+	// non-static

+	public RectangleF GetBounds (ref GraphicsUnit pageUnit)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+	

+	//public EncoderParameters GetEncoderParameterList(Guid encoder);

+	//public int GetFrameCount(FrameDimension dimension);

+	//public PropertyItem GetPropertyItem(int propid);

+	/*

+	  public Image GetThumbnailImage(int thumbWidth, int thumbHeight,

+	  Image.GetThumbnailImageAbort callback,

+	  IntPtr callbackData);

+	*/

+	

+	public void RemovePropertyItem (int propid)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+	

+	public void RotateFlip (RotateFlipType rotateFlipType)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+

+	public void Save (string filename)

+	{

+		// Fixme: implement me

+		throw new NotImplementedException ();

+	}

+

+	//public void Save(Stream stream, ImageFormat format);

+	//public void Save(string filename, ImageFormat format);

+	//public void Save(Stream stream, ImageCodecInfo encoder,

+	//                 EncoderParameters encoderParams);

+	//public void Save(string filename, ImageCodecInfo encoder,

+	//                 EncoderParameters encoderParams);

+	//public void SaveAdd(EncoderParameters_ encoderParams);

+	//public void SaveAdd(Image image, EncoderParameters_ encoderParams);

+	//public int SelectActiveFrame(FrameDimension dimension, int frameIndex);

+	//public void SetPropertyItem(PropertyItem propitem);

+

+	// destructor

+	~Image() {}

+

+	// properties

+	public int Flags {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public Guid[] FrameDimensionsList {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public int Height {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public float HorizontalResolution {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public ColorPalette Palette {

+		get {

+			throw new NotImplementedException ();

+		}

+		set {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public SizeF PhysicalDimension {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public PixelFormat PixelFormat {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public int[] PropertyIdList {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	//public PropertyItem[] PropertyItems {get;}

+	//public ImageFormat RawFormat {get;}

+

+	public Size Size {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public float VerticalResolution {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+	public int Width {

+		get {

+			throw new NotImplementedException ();

+		}

+	}

+	

+}

+

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/KnownColor.cs b/mcs/class/System.Drawing/System.Drawing/KnownColor.cs
new file mode 100644
index 00000000000..5a60973509f
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/KnownColor.cs
@@ -0,0 +1,182 @@
+//

+// System.Drawing.Color.cs

+//

+// (C) 2002 Dennis Hayes

+// Author:

+// Dennis Hayes (dennish@raytek.com)

+// Ben Houston  (ben@exocortex.org)

+//

+

+using System;

+namespace System.Drawing 

+{

+	public enum KnownColor {

+		ActiveBorder = 1,

+		ActiveCaption = 2,

+		ActiveCaptionText = 3,

+		AppWorkspace = 4,

+		Control = 5,

+		ControlDark = 6,

+		ControlDarkDark = 7,

+		ControlLight = 8,

+		ControlLightLight = 9,

+		ControlText = 10,

+		Desktop = 11,

+		GrayText = 12,

+		Highlight = 13,

+		HighlightText = 14,

+		HotTrack = 15,

+		InactiveBorder = 16,

+		InactiveCaption = 17,

+		InactiveCaptionText = 18,

+		Info = 19,

+		InfoText = 20,

+		Menu = 21,

+		MenuText = 22,

+		ScrollBar = 23,

+		Window = 24,

+		WindowFrame = 25,

+		WindowText = 26,

+		Transparent = 27,

+		AliceBlue = 28,

+		AntiqueWhite = 29,

+		Aqua = 30,

+		Aquamarine = 31,

+		Azure = 32,

+		Beige = 33,

+		Bisque = 34,

+		Black = 35,

+		BlanchedAlmond = 36,

+		Blue = 37,

+		BlueViolet = 38,

+		Brown = 39,

+		BurlyWood = 40,

+		CadetBlue = 41,

+		Chartreuse = 42,

+		Chocolate = 43,

+		Coral = 44,

+		CornflowerBlue = 45,

+		Cornsilk = 46,

+		Crimson = 47,

+		Cyan = 48,

+		DarkBlue = 49,

+		DarkCyan = 50,

+		DarkGoldenrod = 51,

+		DarkGray = 52,

+		DarkGreen = 53,

+		DarkKhaki = 54,

+		DarkMagenta = 55,

+		DarkOliveGreen = 56,

+		DarkOrange = 57,

+		DarkOrchid = 58,

+		DarkRed = 59,

+		DarkSalmon = 60,

+		DarkSeaGreen = 61,

+		DarkSlateBlue = 62,

+		DarkSlateGray = 63,

+		DarkTurquoise = 64,

+		DarkViolet = 65,

+		DeepPink = 66,

+		DeepSkyBlue = 67,

+		DimGray = 68,

+		DodgerBlue = 69,

+		Firebrick = 70,

+		FloralWhite = 71,

+		ForestGreen = 72,

+		Fuchsia = 73,

+		Gainsboro = 74,

+		GhostWhite = 75,

+		Gold = 76,

+		Goldenrod = 77,

+		Gray = 78,

+		Green = 79,

+		GreenYellow = 80,

+		Honeydew = 81,

+		HotPink = 82,

+		IndianRed = 83,

+		Indigo = 84,

+		Ivory = 85,

+		Khaki = 86,

+		Lavender = 87,

+		LavenderBlush = 88,

+		LawnGreen = 89,

+		LemonChiffon = 90,

+		LightBlue = 91,

+		LightCoral = 92,

+		LightCyan = 93,

+		LightGoldenrodYellow = 94,

+		LightGreen = 95,

+		LightGray = 96,

+		LightPink = 97,

+		LightSalmon = 98,

+		LightSeaGreen = 99,

+		LightSkyBlue = 100,

+		LightSlateGray = 101,

+		LightSteelBlue = 102,

+		LightYellow = 103,

+		Lime = 104,

+		LimeGreen = 105,

+		Linen = 106,

+		Magenta = 107,

+		Maroon = 108,

+		MediumAquamarine = 109,

+		MediumBlue = 110,

+		MediumOrchid = 111,

+		MediumPurple = 112,

+		MediumSeaGreen = 113,

+		MediumSlateBlue = 114,

+		MediumSpringGreen = 115,

+		MediumTurquoise = 116,

+		MediumVioletRed = 117,

+		MidnightBlue = 118,

+		MintCream = 119,

+		MistyRose = 120,

+		Moccasin = 121,

+		NavajoWhite = 122,

+		Navy = 123,

+		OldLace = 124,

+		Olive = 125,

+		OliveDrab = 126,

+		Orange = 127,

+		OrangeRed = 128,

+		Orchid = 129,

+		PaleGoldenrod = 130,

+		PaleGreen = 131,

+		PaleTurquoise = 132,

+		PaleVioletRed = 133,

+		PapayaWhip = 134,

+		PeachPuff = 135,

+		Peru = 136,

+		Pink = 137,

+		Plum = 138,

+		PowderBlue = 139,

+		Purple = 140,

+		Red = 141,

+		RosyBrown = 142,

+		RoyalBlue = 143,

+		SaddleBrown = 144,

+		Salmon = 145,

+		SandyBrown = 146,

+		SeaGreen = 147,

+		SeaShell = 148,

+		Sienna = 149,

+		Silver = 150,

+		SkyBlue = 151,

+		SlateBlue = 152,

+		SlateGray = 153,

+		Snow = 154,

+		SpringGreen = 155,

+		SteelBlue = 156,

+		Tan = 157,

+		Teal = 158,

+		Thistle = 159,

+		Tomato = 160,

+		Turquoise = 161,

+		Violet = 162,

+		Wheat = 163,

+		White = 164,

+		WhiteSmoke = 165,

+		Yellow = 166,

+		YellowGreen = 167

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/Pen.cs b/mcs/class/System.Drawing/System.Drawing/Pen.cs
new file mode 100755
index 00000000000..16c6263b049
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/Pen.cs
@@ -0,0 +1,113 @@
+//
+// System.Drawing.Pen.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Drawing.Drawing2D;
+
+namespace System.Drawing {
+
+	public sealed class Pen : MarshalByRefObject, ICloneable, IDisposable {
+		Brush brush;
+		Color color;
+		float width;
+		PenAlignment alignment;
+		
+		public Pen (Brush brush)
+		{
+			this.brush = brush;
+			width = 1;
+		}
+
+		public Pen (Color color)
+		{
+			this.color = color;
+			width = 1;
+		}
+
+		public Pen (Brush brush, float width)
+		{
+			this.width = width;
+			this.brush = brush;
+		}
+
+		public Pen (Color color, float width)
+		{
+			this.width = width;
+			this.color = color;
+		}
+
+		//
+		// Properties
+		//
+		public PenAlignment Alignment {
+			get {
+				return alignment;
+			}
+
+			set {
+				alignment = value;
+			}
+		}
+
+		public Brush Brush {
+			get {
+				return brush;
+			}
+
+			set {
+				brush = value;
+			}
+		}
+
+		public Color Color {
+			get {
+				return color;
+			}
+
+			set {
+				color = value;
+			}
+		}
+
+		public float Width {
+			get {
+				return width;
+			}
+			set {
+				width = value;
+			}
+		}
+
+		public object Clone ()
+		{
+			Pen p = new Pen (brush, width);
+			
+			p.color = color;
+			p.alignment = alignment;
+
+			return p;
+		}
+
+		public void Dispose ()
+		{
+			Dispose (true);
+			System.GC.SuppressFinalize (this);
+		}
+
+		void Dispose (bool disposing)
+		{
+			// Nothing for now.
+		}
+
+		~Pen ()
+		{
+			Dispose (false);
+		}
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing/Point.cs b/mcs/class/System.Drawing/System.Drawing/Point.cs
new file mode 100644
index 00000000000..fa0db9abc9b
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/Point.cs
@@ -0,0 +1,339 @@
+//
+// System.Drawing.Point.cs
+//
+// Author:
+//   Mike Kestner (mkestner@speakeasy.net)
+//
+// (C) 2001 Mike Kestner
+//
+
+using System;
+
+namespace System.Drawing {
+	
+	public struct Point { 
+		
+		// Private x and y coordinate fields.
+		int cx, cy;
+
+		// -----------------------
+		// Public Shared Members
+		// -----------------------
+
+		/// <summary>
+		///	Empty Shared Field
+		/// </summary>
+		///
+		/// <remarks>
+		///	An uninitialized Point Structure.
+		/// </remarks>
+		
+		public static readonly Point Empty;
+
+		/// <summary>
+		///	Ceiling Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a Point structure from a PointF structure by
+		///	taking the ceiling of the X and Y properties.
+		/// </remarks>
+		
+		public static Point Ceiling (PointF value)
+		{
+			int x, y;
+			checked {
+				x = (int) Math.Ceiling (value.X);
+				y = (int) Math.Ceiling (value.Y);
+			}
+
+			return new Point (x, y);
+		}
+
+		/// <summary>
+		///	Round Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a Point structure from a PointF structure by
+		///	rounding the X and Y properties.
+		/// </remarks>
+		
+		public static Point Round (PointF value)
+		{
+			int x, y;
+			checked {
+				x = (int) Math.Round (value.X);
+				y = (int) Math.Round (value.Y);
+			}
+
+			return new Point (x, y);
+		}
+
+		/// <summary>
+		///	Truncate Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a Point structure from a PointF structure by
+		///	truncating the X and Y properties.
+		/// </remarks>
+		
+		// LAMESPEC: Should this be floor, or a pure cast to int?
+
+		public static Point Truncate (PointF value)
+		{
+			int x, y;
+			checked {
+				x = (int) value.X;
+				y = (int) value.Y;
+			}
+
+			return new Point (x, y);
+		}
+
+		/// <summary>
+		///	Addition Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Translates a Point using the Width and Height
+		///	properties of the given <typeref>Size</typeref>.
+		/// </remarks>
+
+		public static Point operator + (Point pt, Size sz)
+		{
+			return new Point (pt.X + sz.Width, pt.Y + sz.Height);
+		}
+		
+		/// <summary>
+		///	Equality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two Point objects. The return value is
+		///	based on the equivalence of the X and Y properties 
+		///	of the two points.
+		/// </remarks>
+
+		public static bool operator == (Point pt_a, Point pt_b)
+		{
+			return ((pt_a.X == pt_b.X) && (pt_a.Y == pt_b.Y));
+		}
+		
+		/// <summary>
+		///	Inequality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two Point objects. The return value is
+		///	based on the equivalence of the X and Y properties 
+		///	of the two points.
+		/// </remarks>
+
+		public static bool operator != (Point pt_a, Point pt_b)
+		{
+			return ((pt_a.X != pt_b.X) || (pt_a.Y != pt_b.Y));
+		}
+		
+		/// <summary>
+		///	Subtraction Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Translates a Point using the negation of the Width 
+		///	and Height properties of the given Size.
+		/// </remarks>
+
+		public static Point operator - (Point pt, Size sz)
+		{
+			return new Point (pt.X - sz.Width, pt.Y - sz.Height);
+		}
+		
+		/// <summary>
+		///	Point to Size Conversion
+		/// </summary>
+		///
+		/// <remarks>
+		///	Returns a Size based on the Coordinates of a given 
+		///	Point. Requires explicit cast.
+		/// </remarks>
+
+		public static explicit operator Size (Point pt)
+		{
+			return new Size (pt.X, pt.Y);
+		}
+
+		/// <summary>
+		///	Point to PointF Conversion
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a PointF based on the coordinates of a given 
+		///	Point. No explicit cast is required.
+		/// </remarks>
+
+		public static implicit operator PointF (Point pt)
+		{
+			return new PointF (pt.X, pt.Y);
+		}
+
+
+		// -----------------------
+		// Public Constructors
+		// -----------------------
+
+		/// <summary>
+		///	Point Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a Point from an integer which holds the X
+		///	coordinate in the high order 16 bits and the Y
+		///	coordinate in the low order 16 bits.
+		/// </remarks>
+		
+		public Point (int dw)
+		{
+			cx = dw >> 16;
+			cy = dw & 0xffff;
+		}
+
+		/// <summary>
+		///	Point Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a Point from a Size value.
+		/// </remarks>
+		
+		public Point (Size sz)
+		{
+			cx = sz.Width;
+			cy = sz.Height;
+		}
+
+		/// <summary>
+		///	Point Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a Point from a specified x,y coordinate pair.
+		/// </remarks>
+		
+		public Point (int x, int y)
+		{
+			cx = x;
+			cy = y;
+		}
+
+		// -----------------------
+		// Public Instance Members
+		// -----------------------
+
+		/// <summary>
+		///	IsEmpty Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	Indicates if both X and Y are zero.
+		/// </remarks>
+		
+		public bool IsEmpty {
+			get {
+				return ((cx == 0) && (cy == 0));
+			}
+		}
+
+		/// <summary>
+		///	X Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The X coordinate of the Point.
+		/// </remarks>
+		
+		public int X {
+			get {
+				return cx;
+			}
+			set {
+				cx = value;
+			}
+		}
+
+		/// <summary>
+		///	Y Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Y coordinate of the Point.
+		/// </remarks>
+		
+		public int Y {
+			get {
+				return cy;
+			}
+			set {
+				cy = value;
+			}
+		}
+
+		/// <summary>
+		///	Equals Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks equivalence of this Point and another object.
+		/// </remarks>
+		
+		public override bool Equals (object o)
+		{
+			if (!(o is Point))
+				return false;
+
+			return (this == (Point) o);
+		}
+
+		/// <summary>
+		///	GetHashCode Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Calculates a hashing value.
+		/// </remarks>
+		
+		public override int GetHashCode ()
+		{
+			return cx^cy;
+		}
+
+		/// <summary>
+		///	Offset Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Moves the Point a specified distance.
+		/// </remarks>
+
+		public void Offset (int dx, int dy)
+		{
+			cx += dx;
+			cy += dy;
+		}
+		
+		/// <summary>
+		///	ToString Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Formats the Point as a string in coordinate notation.
+		/// </remarks>
+		
+		public override string ToString ()
+		{
+			return String.Format ("[{0},{1}]", cx, cy);
+		}
+
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing/PointF.cs b/mcs/class/System.Drawing/System.Drawing/PointF.cs
new file mode 100644
index 00000000000..42895bdac4a
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/PointF.cs
@@ -0,0 +1,204 @@
+//
+// System.Drawing.PointF.cs
+//
+// Author:
+//   Mike Kestner (mkestner@speakeasy.net)
+//
+// (C) 2001 Mike Kestner
+//
+
+using System;
+
+namespace System.Drawing {
+	
+	public struct PointF { 
+		
+		// Private x and y coordinate fields.
+		float cx, cy;
+
+		// -----------------------
+		// Public Shared Members
+		// -----------------------
+
+		/// <summary>
+		///	Empty Shared Field
+		/// </summary>
+		///
+		/// <remarks>
+		///	An uninitialized PointF Structure.
+		/// </remarks>
+		
+		public static readonly PointF Empty;
+
+		/// <summary>
+		///	Addition Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Translates a PointF using the Width and Height
+		///	properties of the given Size.
+		/// </remarks>
+
+		public static PointF operator + (PointF pt, Size sz)
+		{
+			return new PointF (pt.X + sz.Width, pt.Y + sz.Height);
+		}
+		
+		/// <summary>
+		///	Equality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two PointF objects. The return value is
+		///	based on the equivalence of the X and Y properties 
+		///	of the two points.
+		/// </remarks>
+
+		public static bool operator == (PointF pt_a, PointF pt_b)
+		{
+			return ((pt_a.X == pt_b.X) && (pt_a.Y == pt_b.Y));
+		}
+		
+		/// <summary>
+		///	Inequality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two PointF objects. The return value is
+		///	based on the equivalence of the X and Y properties 
+		///	of the two points.
+		/// </remarks>
+
+		public static bool operator != (PointF pt_a, PointF pt_b)
+		{
+			return ((pt_a.X != pt_b.X) || (pt_a.Y != pt_b.Y));
+		}
+		
+		/// <summary>
+		///	Subtraction Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Translates a PointF using the negation of the Width 
+		///	and Height properties of the given Size.
+		/// </remarks>
+
+		public static PointF operator - (PointF pt, Size sz)
+		{
+			return new PointF (pt.X - sz.Width, pt.Y - sz.Height);
+		}
+		
+		// -----------------------
+		// Public Constructor
+		// -----------------------
+
+		/// <summary>
+		///	PointF Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a PointF from a specified x,y coordinate pair.
+		/// </remarks>
+		
+		public PointF (float x, float y)
+		{
+			cx = x;
+			cy = y;
+		}
+
+		// -----------------------
+		// Public Instance Members
+		// -----------------------
+
+		/// <summary>
+		///	IsEmpty Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	Indicates if both X and Y are zero.
+		/// </remarks>
+		
+		public bool IsEmpty {
+			get {
+				return ((cx == 0.0) && (cy == 0.0));
+			}
+		}
+
+		/// <summary>
+		///	X Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The X coordinate of the PointF.
+		/// </remarks>
+		
+		public float X {
+			get {
+				return cx;
+			}
+			set {
+				cx = value;
+			}
+		}
+
+		/// <summary>
+		///	Y Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Y coordinate of the PointF.
+		/// </remarks>
+		
+		public float Y {
+			get {
+				return cy;
+			}
+			set {
+				cy = value;
+			}
+		}
+
+		/// <summary>
+		///	Equals Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks equivalence of this PointF and another object.
+		/// </remarks>
+		
+		public override bool Equals (object o)
+		{
+			if (!(o is PointF))
+				return false;
+
+			return (this == (PointF) o);
+		}
+
+		/// <summary>
+		///	GetHashCode Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Calculates a hashing value.
+		/// </remarks>
+		
+		public override int GetHashCode ()
+		{
+			return (int) cx ^ (int) cy;
+		}
+
+		/// <summary>
+		///	ToString Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Formats the PointF as a string in coordinate notation.
+		/// </remarks>
+		
+		public override string ToString ()
+		{
+			return String.Format ("[{0},{1}]", cx, cy);
+		}
+
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing/Rectangle.cs b/mcs/class/System.Drawing/System.Drawing/Rectangle.cs
new file mode 100644
index 00000000000..45f28755102
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/Rectangle.cs
@@ -0,0 +1,584 @@
+//
+// System.Drawing.Rectangle.cs
+//
+// Author:
+//   Mike Kestner (mkestner@speakeasy.net)
+//
+// (C) 2001 Mike Kestner
+//
+
+using System;
+
+namespace System.Drawing {
+	
+	public struct Rectangle { 
+		
+		// Private position and size fields.
+		private Point loc;
+		private Size sz;
+
+		/// <summary>
+		///	Empty Shared Field
+		/// </summary>
+		///
+		/// <remarks>
+		///	An uninitialized Rectangle Structure.
+		/// </remarks>
+		
+		public static readonly Rectangle Empty;
+
+		/// <summary>
+		///	Ceiling Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a Rectangle structure from a RectangleF 
+		///	structure by taking the ceiling of the X, Y, Width,
+		///	and Height properties.
+		/// </remarks>
+		
+		public static Rectangle Ceiling (RectangleF value)
+		{
+			int x, y, w, h;
+			checked {
+				x = (int) Math.Ceiling (value.X);
+				y = (int) Math.Ceiling (value.Y);
+				w = (int) Math.Ceiling (value.Width);
+				h = (int) Math.Ceiling (value.Height);
+			}
+
+			return new Rectangle (x, y, w, h);
+		}
+
+		/// <summary>
+		///	FromLTRB Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a Rectangle structure from left, top, right,
+		///	and bottom coordinates.
+		/// </remarks>
+		
+		public static Rectangle FromLTRB (int left, int top,
+						  int right, int bottom)
+		{
+			return new Rectangle (left, top, right - left,
+					      bottom - top);
+		}
+
+		/// <summary>
+		///	Inflate Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a new Rectangle by inflating an existing 
+		///	Rectangle by the specified coordinate values.
+		/// </remarks>
+		
+		public static Rectangle Inflate (Rectangle rect, int x, int y)
+		{
+			Rectangle r = new Rectangle (rect.Location, rect.Size);
+			r.Inflate (x, y);
+			return r;
+		}
+
+		/// <summary>
+		///	Inflate Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Inflates the Rectangle by a specified width and height.
+		/// </remarks>
+		
+		public void Inflate (int width, int height)
+		{
+			Inflate (new Size (width, height));
+		}
+
+		/// <summary>
+		///	Inflate Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Inflates the Rectangle by a specified Size.
+		/// </remarks>
+		
+		public void Inflate (Size sz)
+		{
+			loc -= sz;
+			Size ds = new Size (sz.Width * 2, sz.Height * 2);
+			this.sz += ds;
+		}
+
+		/// <summary>
+		///	Intersect Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a new Rectangle by intersecting 2 existing 
+		///	Rectangles. Returns null if there is no	intersection.
+		/// </remarks>
+		
+		public static Rectangle Intersect (Rectangle r1, Rectangle r2)
+		{
+			Rectangle r = new Rectangle (r1.Location, r1.Size);
+			r.Intersect (r2);
+			return r;
+		}
+
+		/// <summary>
+		///	Intersect Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Replaces the Rectangle with the intersection of itself
+		///	and another Rectangle.
+		/// </remarks>
+		
+		public void Intersect (Rectangle r)
+		{
+			if (!IntersectsWith (r)) {
+				loc = Point.Empty;
+				sz = Size.Empty;
+			}
+
+			X = Math.Max (Left, r.Left);
+			Y = Math.Max (Top, r.Top);
+			Width = Math.Min (Right, r.Right) - X;
+			Height = Math.Min (Bottom, r.Bottom) - Y;
+		}
+
+		/// <summary>
+		///	Round Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a Rectangle structure from a RectangleF by
+		///	rounding the X, Y, Width, and Height properties.
+		/// </remarks>
+		
+		public static Rectangle Round (RectangleF value)
+		{
+			int x, y, w, h;
+			checked {
+				x = (int) Math.Round (value.X);
+				y = (int) Math.Round (value.Y);
+				w = (int) Math.Round (value.Width);
+				h = (int) Math.Round (value.Height);
+			}
+
+			return new Rectangle (x, y, w, h);
+		}
+
+		/// <summary>
+		///	Truncate Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a Rectangle structure from a RectangleF by
+		///	truncating the X, Y, Width, and Height properties.
+		/// </remarks>
+		
+		// LAMESPEC: Should this be floor, or a pure cast to int?
+
+		public static Rectangle Truncate (RectangleF value)
+		{
+			int x, y, w, h;
+			checked {
+				x = (int) value.X;
+				y = (int) value.Y;
+				w = (int) value.Width;
+				h = (int) value.Height;
+			}
+
+			return new Rectangle (x, y, w, h);
+		}
+
+		/// <summary>
+		///	Union Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a new Rectangle from the union of 2 existing 
+		///	Rectangles.
+		/// </remarks>
+		
+		public static Rectangle Union (Rectangle r1, Rectangle r2)
+		{
+			return FromLTRB (Math.Min (r1.Left, r2.Left),
+					 Math.Min (r1.Top, r2.Top),
+					 Math.Max (r1.Right, r2.Right),
+					 Math.Max (r1.Bottom, r2.Bottom));
+		}
+
+		/// <summary>
+		///	Equality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two Rectangle objects. The return value is
+		///	based on the equivalence of the Location and Size 
+		///	properties of the two Rectangles.
+		/// </remarks>
+
+		public static bool operator == (Rectangle r1, Rectangle r2)
+		{
+			return ((r1.Location == r2.Location) && 
+				(r1.Size == r2.Size));
+		}
+		
+		/// <summary>
+		///	Inequality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two Rectangle objects. The return value is
+		///	based on the equivalence of the Location and Size 
+		///	properties of the two Rectangles.
+		/// </remarks>
+
+		public static bool operator != (Rectangle r1, Rectangle r2)
+		{
+			return ((r1.Location != r2.Location) || 
+				(r1.Size != r2.Size));
+		}
+		
+
+		// -----------------------
+		// Public Constructors
+		// -----------------------
+
+		/// <summary>
+		///	Rectangle Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a Rectangle from Point and Size values.
+		/// </remarks>
+		
+		public Rectangle (Point loc, Size sz)
+		{
+			this.loc = loc;
+			this.sz = sz;
+		}
+
+		/// <summary>
+		///	Rectangle Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a Rectangle from a specified x,y location and
+		///	width and height values.
+		/// </remarks>
+		
+		public Rectangle (int x, int y, int width, int height)
+		{
+			loc = new Point (x, y);
+			sz = new Size (width, height);
+		}
+
+
+
+		/// <summary>
+		///	Bottom Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Y coordinate of the bottom edge of the Rectangle.
+		///	Read only.
+		/// </remarks>
+		
+		public int Bottom {
+			get {
+				return Y + Height;
+			}
+		}
+
+		/// <summary>
+		///	Height Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Height of the Rectangle.
+		/// </remarks>
+		
+		public int Height {
+			get {
+				return sz.Height;
+			}
+			set {
+				sz.Height = value;
+			}
+		}
+
+		/// <summary>
+		///	IsEmpty Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	Indicates if the width or height are zero. Read only.
+		/// </remarks>
+		
+		public bool IsEmpty {
+			get {
+				return ((sz.Width == 0) || (sz.Height == 0));
+			}
+		}
+
+		/// <summary>
+		///	Left Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The X coordinate of the left edge of the Rectangle.
+		///	Read only.
+		/// </remarks>
+		
+		public int Left {
+			get {
+				return X;
+			}
+		}
+
+		/// <summary>
+		///	Location Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Location of the top-left corner of the Rectangle.
+		/// </remarks>
+		
+		public Point Location {
+			get {
+				return loc;
+			}
+			set {
+				loc = value;
+			}
+		}
+
+		/// <summary>
+		///	Right Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The X coordinate of the right edge of the Rectangle.
+		///	Read only.
+		/// </remarks>
+		
+		public int Right {
+			get {
+				return X + Width;
+			}
+		}
+
+		/// <summary>
+		///	Size Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Size of the Rectangle.
+		/// </remarks>
+		
+		public Size Size {
+			get {
+				return sz;
+			}
+			set {
+				sz = value;
+			}
+		}
+
+		/// <summary>
+		///	Top Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Y coordinate of the top edge of the Rectangle.
+		///	Read only.
+		/// </remarks>
+		
+		public int Top {
+			get {
+				return Y;
+			}
+		}
+
+		/// <summary>
+		///	Width Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Width of the Rectangle.
+		/// </remarks>
+		
+		public int Width {
+			get {
+				return sz.Width;
+			}
+			set {
+				sz.Width = value;
+			}
+		}
+
+		/// <summary>
+		///	X Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The X coordinate of the Rectangle.
+		/// </remarks>
+		
+		public int X {
+			get {
+				return loc.X;
+			}
+			set {
+				loc.X = value;
+			}
+		}
+
+		/// <summary>
+		///	Y Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Y coordinate of the Rectangle.
+		/// </remarks>
+		
+		public int Y {
+			get {
+				return loc.Y;
+			}
+			set {
+				loc.Y = value;
+			}
+		}
+
+		/// <summary>
+		///	Contains Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks if an x,y coordinate lies within this Rectangle.
+		/// </remarks>
+		
+		public bool Contains (int x, int y)
+		{
+			return ((x >= Left) && (x <= Right) && 
+				(y >= Top) && (y <= Bottom));
+		}
+
+		/// <summary>
+		///	Contains Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks if a Point lies within this Rectangle.
+		/// </remarks>
+		
+		public bool Contains (Point pt)
+		{
+			return Contains (pt.X, pt.Y);
+		}
+
+		/// <summary>
+		///	Contains Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks if a Rectangle lies entirely within this 
+		///	Rectangle.
+		/// </remarks>
+		
+		public bool Contains (Rectangle rect)
+		{
+			return (rect == Intersect (this, rect));
+		}
+
+		/// <summary>
+		///	Equals Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks equivalence of this Rectangle and another object.
+		/// </remarks>
+		
+		public override bool Equals (object o)
+		{
+			if (!(o is Rectangle))
+				return false;
+
+			return (this == (Rectangle) o);
+		}
+
+		/// <summary>
+		///	GetHashCode Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Calculates a hashing value.
+		/// </remarks>
+		
+		public override int GetHashCode ()
+		{
+			return loc.GetHashCode()^sz.GetHashCode();
+		}
+
+		/// <summary>
+		///	IntersectsWith Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks if a Rectangle intersects with this one.
+		/// </remarks>
+		
+		public bool IntersectsWith (Rectangle r)
+		{
+			return !((Left > r.Right) || (Right < r.Left) ||
+			    (Top > r.Bottom) || (Bottom < r.Top));
+		}
+
+		/// <summary>
+		///	Offset Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Moves the Rectangle a specified distance.
+		/// </remarks>
+
+		public void Offset (int dx, int dy)
+		{
+			X += dx;
+			Y += dy;
+		}
+		
+		/// <summary>
+		///	Offset Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Moves the Rectangle a specified distance.
+		/// </remarks>
+
+		public void Offset (Point pt)
+		{
+			loc.Offset(pt.X, pt.Y);
+		}
+		
+		/// <summary>
+		///	ToString Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Formats the Rectangle as a string in (x,y,w,h) notation.
+		/// </remarks>
+		
+		public override string ToString ()
+		{
+			return String.Format ("[{0},{1},{2},{3}]", 
+					      X, Y, Width, Height);
+		}
+
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing/RectangleF.cs b/mcs/class/System.Drawing/System.Drawing/RectangleF.cs
new file mode 100644
index 00000000000..cfe4a7313ed
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/RectangleF.cs
@@ -0,0 +1,531 @@
+//
+// System.Drawing.RectangleF.cs
+//
+// Author:
+//   Mike Kestner (mkestner@speakeasy.net)
+//
+// (C) 2001 Mike Kestner
+//
+
+using System;
+
+namespace System.Drawing {
+	
+	public struct RectangleF { 
+		
+		// Private position and size fields.
+		private PointF loc;
+		private SizeF sz;
+
+		/// <summary>
+		///	Empty Shared Field
+		/// </summary>
+		///
+		/// <remarks>
+		///	An uninitialized RectangleF Structure.
+		/// </remarks>
+		
+		public static readonly RectangleF Empty;
+
+
+		/// <summary>
+		///	FromLTRB Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a RectangleF structure from left, top, right,
+		///	and bottom coordinates.
+		/// </remarks>
+		
+		public static RectangleF FromLTRB (float left, float top,
+						   float right, float bottom)
+		{
+			return new RectangleF (left, top, right - left,
+					       bottom - top);
+		}
+
+		/// <summary>
+		///	Inflate Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a new RectangleF by inflating an existing 
+		///	RectangleF by the specified coordinate values.
+		/// </remarks>
+		
+		public static RectangleF Inflate (RectangleF r, 
+						  float x, float y)
+		{
+			RectangleF ir = new RectangleF (r.Location, r.Size);
+			ir.Inflate (x, y);
+			return ir;
+		}
+
+		/// <summary>
+		///	Inflate Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Inflates the RectangleF by a specified width and height.
+		/// </remarks>
+		
+		public void Inflate (float width, float height)
+		{
+			Inflate (new SizeF (width, height));
+		}
+
+		/// <summary>
+		///	Inflate Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Inflates the RectangleF by a specified Size.
+		/// </remarks>
+		
+		public void Inflate (SizeF sz)
+		{
+			Offset(sz.Width, sz.Height);
+			SizeF ds = new SizeF (sz.Width * 2, sz.Height * 2);
+			this.sz += ds;
+		}
+
+		/// <summary>
+		///	Intersect Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a new RectangleF by intersecting 2 existing 
+		///	RectangleFs. Returns null if there is no intersection.
+		/// </remarks>
+		
+		public static RectangleF Intersect (RectangleF r1, 
+						    RectangleF r2)
+		{
+			RectangleF r = new RectangleF (r1.Location, r1.Size);
+			r.Intersect (r2);
+			return r;
+		}
+
+		/// <summary>
+		///	Intersect Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Replaces the RectangleF with the intersection of itself
+		///	and another RectangleF.
+		/// </remarks>
+		
+		public void Intersect (RectangleF r)
+		{
+			if (!IntersectsWith (r)) {
+				loc = PointF.Empty;
+				sz = SizeF.Empty;
+			}
+
+			X = Math.Max (Left, r.Left);
+			Y = Math.Max (Top, r.Top);
+			Width = Math.Min (Right, r.Right) - X;
+			Height = Math.Min (Bottom, r.Bottom) - Y;
+		}
+
+		/// <summary>
+		///	Union Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a new RectangleF from the union of 2 existing 
+		///	RectangleFs.
+		/// </remarks>
+		
+		public static RectangleF Union (RectangleF r1, RectangleF r2)
+		{
+			return FromLTRB (Math.Min (r1.Left, r2.Left),
+					 Math.Min (r1.Top, r2.Top),
+					 Math.Max (r1.Right, r2.Right),
+					 Math.Max (r1.Bottom, r2.Bottom));
+		}
+
+		/// <summary>
+		///	Equality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two RectangleF objects. The return value is
+		///	based on the equivalence of the Location and Size 
+		///	properties of the two RectangleFs.
+		/// </remarks>
+
+		public static bool operator == (RectangleF r1, RectangleF r2)
+		{
+			return ((r1.Location == r2.Location) && 
+				(r1.Size == r2.Size));
+		}
+		
+		/// <summary>
+		///	Inequality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two RectangleF objects. The return value is
+		///	based on the equivalence of the Location and Size 
+		///	properties of the two RectangleFs.
+		/// </remarks>
+
+		public static bool operator != (RectangleF r1, RectangleF r2)
+		{
+			return ((r1.Location != r2.Location) || 
+				(r1.Size != r2.Size));
+		}
+		
+		/// <summary>
+		///	Rectangle to RectangleF Conversion
+		/// </summary>
+		///
+		/// <remarks>
+		///	Converts a Rectangle object to a RectangleF.
+		/// </remarks>
+
+		public static implicit operator RectangleF (Rectangle r)
+		{
+			return new RectangleF (r.Location, r.Size);
+		}
+		
+
+		// -----------------------
+		// Public Constructors
+		// -----------------------
+
+		/// <summary>
+		///	RectangleF Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a RectangleF from PointF and SizeF values.
+		/// </remarks>
+		
+		public RectangleF (PointF loc, SizeF sz)
+		{
+			this.loc = loc;
+			this.sz = sz;
+		}
+
+		/// <summary>
+		///	RectangleF Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a RectangleF from a specified x,y location and
+		///	width and height values.
+		/// </remarks>
+		
+		public RectangleF (float x, float y, float width, float height)
+		{
+			loc = new PointF (x, y);
+			sz = new SizeF (width, height);
+		}
+
+
+
+		/// <summary>
+		///	Bottom Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Y coordinate of the bottom edge of the RectangleF.
+		///	Read only.
+		/// </remarks>
+		
+		public float Bottom {
+			get {
+				return Y + Height;
+			}
+		}
+
+		/// <summary>
+		///	Height Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Height of the RectangleF.
+		/// </remarks>
+		
+		public float Height {
+			get {
+				return sz.Height;
+			}
+			set {
+				sz.Height = value;
+			}
+		}
+
+		/// <summary>
+		///	IsEmpty Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	Indicates if the width or height are zero. Read only.
+		/// </remarks>
+		
+		public bool IsEmpty {
+			get {
+				return ((sz.Width == 0) || (sz.Height == 0));
+			}
+		}
+
+		/// <summary>
+		///	Left Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The X coordinate of the left edge of the RectangleF.
+		///	Read only.
+		/// </remarks>
+		
+		public float Left {
+			get {
+				return X;
+			}
+		}
+
+		/// <summary>
+		///	Location Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Location of the top-left corner of the RectangleF.
+		/// </remarks>
+		
+		public PointF Location {
+			get {
+				return loc;
+			}
+			set {
+				loc = value;
+			}
+		}
+
+		/// <summary>
+		///	Right Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The X coordinate of the right edge of the RectangleF.
+		///	Read only.
+		/// </remarks>
+		
+		public float Right {
+			get {
+				return X + Width;
+			}
+		}
+
+		/// <summary>
+		///	Size Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Size of the RectangleF.
+		/// </remarks>
+		
+		public SizeF Size {
+			get {
+				return sz;
+			}
+			set {
+				sz = value;
+			}
+		}
+
+		/// <summary>
+		///	Top Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Y coordinate of the top edge of the RectangleF.
+		///	Read only.
+		/// </remarks>
+		
+		public float Top {
+			get {
+				return Y;
+			}
+		}
+
+		/// <summary>
+		///	Width Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Width of the RectangleF.
+		/// </remarks>
+		
+		public float Width {
+			get {
+				return sz.Width;
+			}
+			set {
+				sz.Width = value;
+			}
+		}
+
+		/// <summary>
+		///	X Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The X coordinate of the RectangleF.
+		/// </remarks>
+		
+		public float X {
+			get {
+				return loc.X;
+			}
+			set {
+				loc.X = value;
+			}
+		}
+
+		/// <summary>
+		///	Y Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Y coordinate of the RectangleF.
+		/// </remarks>
+		
+		public float Y {
+			get {
+				return loc.Y;
+			}
+			set {
+				loc.Y = value;
+			}
+		}
+
+		/// <summary>
+		///	Contains Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks if an x,y coordinate lies within this RectangleF.
+		/// </remarks>
+		
+		public bool Contains (float x, float y)
+		{
+			return ((x >= Left) && (x <= Right) && 
+				(y >= Top) && (y <= Bottom));
+		}
+
+		/// <summary>
+		///	Contains Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks if a Point lies within this RectangleF.
+		/// </remarks>
+		
+		public bool Contains (PointF pt)
+		{
+			return Contains (pt.X, pt.Y);
+		}
+
+		/// <summary>
+		///	Contains Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks if a RectangleF lies entirely within this 
+		///	RectangleF.
+		/// </remarks>
+		
+		public bool Contains (RectangleF rect)
+		{
+			return (rect == Intersect (this, rect));
+		}
+
+		/// <summary>
+		///	Equals Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks equivalence of this RectangleF and an object.
+		/// </remarks>
+		
+		public override bool Equals (object o)
+		{
+			if (!(o is RectangleF))
+				return false;
+
+			return (this == (RectangleF) o);
+		}
+
+		/// <summary>
+		///	GetHashCode Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Calculates a hashing value.
+		/// </remarks>
+		
+		public override int GetHashCode ()
+		{
+			return loc.GetHashCode()^sz.GetHashCode();
+		}
+
+		/// <summary>
+		///	IntersectsWith Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks if a RectangleF intersects with this one.
+		/// </remarks>
+
+		public bool IntersectsWith (RectangleF r)
+		{
+			return !((Left > r.Right) || (Right < r.Left) ||
+			    (Top > r.Bottom) || (Bottom < r.Top));
+		}
+
+		/// <summary>
+		///	Offset Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Moves the RectangleF a specified distance.
+		/// </remarks>
+
+		public void Offset (float dx, float dy)
+		{
+			X += dx;
+			Y += dy;
+		}
+		
+		/// <summary>
+		///	Offset Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Moves the RectangleF a specified distance.
+		/// </remarks>
+
+		public void Offset (PointF pt)
+		{
+			Offset(pt.X, pt.Y);
+		}
+		
+		/// <summary>
+		///	ToString Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Formats the RectangleF in (x,y,w,h) notation.
+		/// </remarks>
+		
+		public override string ToString ()
+		{
+			return String.Format ("[{0},{1},{2},{3}]", 
+					      X, Y, Width, Height);
+		}
+
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing/RotateFlipType.cs b/mcs/class/System.Drawing/System.Drawing/RotateFlipType.cs
new file mode 100644
index 00000000000..c50f32b0bc3
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/RotateFlipType.cs
@@ -0,0 +1,29 @@
+//

+// System.Drawing.RotateFlipType .cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+

+using System;

+namespace System.Drawing 

+{

+	public enum RotateFlipType {

+		Rotate180FlipNone = 1,

+		Rotate180FlipX = 2,

+		Rotate180FlipXY = 3,

+		Rotate180FlipY = 4,

+		Rotate270FlipNone = 5,

+		Rotate270FlipX = 6,

+		Rotate270FlipXY = 7,

+		Rotate270FlipY = 8,

+		Rotate90FlipNone = 9,

+		Rotate90FlipX = 10,

+		Rotate90FlipXY = 11,

+		Rotate90FlipY = 12,

+		RotateNoneFlipNone = 13,

+		RotateNoneFlipX = 14,

+		RotateNoneFlipXY = 15,

+		RotateNoneFlipY = 16

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/Size.cs b/mcs/class/System.Drawing/System.Drawing/Size.cs
new file mode 100644
index 00000000000..d5b56d3a453
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/Size.cs
@@ -0,0 +1,309 @@
+//
+// System.Drawing.Size.cs
+//
+// Author:
+//   Mike Kestner (mkestner@speakeasy.net)
+//
+// (C) 2001 Mike Kestner
+//
+
+using System;
+
+namespace System.Drawing {
+	
+	public struct Size { 
+		
+		// Private height and width fields.
+		int wd, ht;
+
+		// -----------------------
+		// Public Shared Members
+		// -----------------------
+
+		/// <summary>
+		///	Empty Shared Field
+		/// </summary>
+		///
+		/// <remarks>
+		///	An uninitialized Size Structure.
+		/// </remarks>
+		
+		public static readonly Size Empty;
+
+		/// <summary>
+		///	Ceiling Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a Size structure from a SizeF structure by
+		///	taking the ceiling of the Width and Height properties.
+		/// </remarks>
+		
+		public static Size Ceiling (SizeF value)
+		{
+			int w, h;
+			checked {
+				w = (int) Math.Ceiling (value.Width);
+				h = (int) Math.Ceiling (value.Height);
+			}
+
+			return new Size (w, h);
+		}
+
+		/// <summary>
+		///	Round Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a Size structure from a SizeF structure by
+		///	rounding the Width and Height properties.
+		/// </remarks>
+		
+		public static Size Round (SizeF value)
+		{
+			int w, h;
+			checked {
+				w = (int) Math.Round (value.Width);
+				h = (int) Math.Round (value.Height);
+			}
+
+			return new Size (w, h);
+		}
+
+		/// <summary>
+		///	Truncate Shared Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Produces a Size structure from a SizeF structure by
+		///	truncating the Width and Height properties.
+		/// </remarks>
+		
+		public static Size Truncate (SizeF value)
+		{
+			int w, h;
+			checked {
+				w = (int) value.Width;
+				h = (int) value.Height;
+			}
+
+			return new Size (w, h);
+		}
+
+		/// <summary>
+		///	Addition Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Addition of two Size structures.
+		/// </remarks>
+
+		public static Size operator + (Size sz1, Size sz2)
+		{
+			return new Size (sz1.Width + sz2.Width, 
+					 sz1.Height + sz2.Height);
+		}
+		
+		/// <summary>
+		///	Equality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two Size objects. The return value is
+		///	based on the equivalence of the Width and Height 
+		///	properties of the two Sizes.
+		/// </remarks>
+
+		public static bool operator == (Size sz_a, Size sz_b)
+		{
+			return ((sz_a.Width == sz_b.Width) && 
+				(sz_a.Height == sz_b.Height));
+		}
+		
+		/// <summary>
+		///	Inequality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two Size objects. The return value is
+		///	based on the equivalence of the Width and Height 
+		///	properties of the two Sizes.
+		/// </remarks>
+
+		public static bool operator != (Size sz_a, Size sz_b)
+		{
+			return ((sz_a.Width != sz_b.Width) || 
+				(sz_a.Height != sz_b.Height));
+		}
+		
+		/// <summary>
+		///	Subtraction Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Subtracts two Size structures.
+		/// </remarks>
+
+		public static Size operator - (Size sz1, Size sz2)
+		{
+			return new Size (sz1.Width - sz2.Width, 
+					 sz1.Height - sz2.Height);
+		}
+		
+		/// <summary>
+		///	Size to Point Conversion
+		/// </summary>
+		///
+		/// <remarks>
+		///	Returns a Point based on the dimensions of a given 
+		///	Size. Requires explicit cast.
+		/// </remarks>
+
+		public static explicit operator Point (Size sz)
+		{
+			return new Point (sz.Width, sz.Height);
+		}
+
+		/// <summary>
+		///	Size to SizeF Conversion
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a SizeF based on the dimensions of a given 
+		///	Size. No explicit cast is required.
+		/// </remarks>
+
+		public static implicit operator SizeF (Size sz)
+		{
+			return new SizeF (sz.Width, sz.Height);
+		}
+
+
+		// -----------------------
+		// Public Constructors
+		// -----------------------
+
+		/// <summary>
+		///	Size Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a Size from a Point value.
+		/// </remarks>
+		
+		public Size (Point pt)
+		{
+			wd = pt.X;
+			ht = pt.Y;
+		}
+
+		/// <summary>
+		///	Size Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a Size from specified dimensions.
+		/// </remarks>
+		
+		public Size (int width, int height)
+		{
+			wd = width;
+			ht = height;
+		}
+
+		// -----------------------
+		// Public Instance Members
+		// -----------------------
+
+		/// <summary>
+		///	IsEmpty Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	Indicates if both Width and Height are zero.
+		/// </remarks>
+		
+		public bool IsEmpty {
+			get {
+				return ((wd == 0) && (ht == 0));
+			}
+		}
+
+		/// <summary>
+		///	Width Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Width coordinate of the Size.
+		/// </remarks>
+		
+		public int Width {
+			get {
+				return wd;
+			}
+			set {
+				wd = value;
+			}
+		}
+
+		/// <summary>
+		///	Height Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Height coordinate of the Size.
+		/// </remarks>
+		
+		public int Height {
+			get {
+				return ht;
+			}
+			set {
+				ht = value;
+			}
+		}
+
+		/// <summary>
+		///	Equals Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks equivalence of this Size and another object.
+		/// </remarks>
+		
+		public override bool Equals (object o)
+		{
+			if (!(o is Size))
+				return false;
+
+			return (this == (Size) o);
+		}
+
+		/// <summary>
+		///	GetHashCode Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Calculates a hashing value.
+		/// </remarks>
+		
+		public override int GetHashCode ()
+		{
+			return wd^ht;
+		}
+
+		/// <summary>
+		///	ToString Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Formats the Size as a string in coordinate notation.
+		/// </remarks>
+		
+		public override string ToString ()
+		{
+			return String.Format ("[{0},{1}]", wd, ht);
+		}
+
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing/SizeF.cs b/mcs/class/System.Drawing/System.Drawing/SizeF.cs
new file mode 100644
index 00000000000..1aa0155c56d
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/SizeF.cs
@@ -0,0 +1,249 @@
+//
+// System.Drawing.SizeF.cs
+//
+// Author:
+//   Mike Kestner (mkestner@speakeasy.net)
+//
+// (C) 2001 Mike Kestner
+//
+
+using System;
+
+namespace System.Drawing {
+	
+	public struct SizeF { 
+		
+		// Private height and width fields.
+		float wd, ht;
+
+		// -----------------------
+		// Public Shared Members
+		// -----------------------
+
+		/// <summary>
+		///	Empty Shared Field
+		/// </summary>
+		///
+		/// <remarks>
+		///	An uninitialized SizeF Structure.
+		/// </remarks>
+		
+		public static readonly SizeF Empty;
+
+		/// <summary>
+		///	Addition Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Addition of two SizeF structures.
+		/// </remarks>
+
+		public static SizeF operator + (SizeF sz1, SizeF sz2)
+		{
+			return new SizeF (sz1.Width + sz2.Width, 
+					  sz1.Height + sz2.Height);
+		}
+		
+		/// <summary>
+		///	Equality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two SizeF objects. The return value is
+		///	based on the equivalence of the Width and Height 
+		///	properties of the two Sizes.
+		/// </remarks>
+
+		public static bool operator == (SizeF sz_a, SizeF sz_b)
+		{
+			return ((sz_a.Width == sz_b.Width) && 
+				(sz_a.Height == sz_b.Height));
+		}
+		
+		/// <summary>
+		///	Inequality Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Compares two SizeF objects. The return value is
+		///	based on the equivalence of the Width and Height 
+		///	properties of the two Sizes.
+		/// </remarks>
+
+		public static bool operator != (SizeF sz_a, SizeF sz_b)
+		{
+			return ((sz_a.Width != sz_b.Width) || 
+				(sz_a.Height != sz_b.Height));
+		}
+		
+		/// <summary>
+		///	Subtraction Operator
+		/// </summary>
+		///
+		/// <remarks>
+		///	Subtracts two SizeF structures.
+		/// </remarks>
+
+		public static SizeF operator - (SizeF sz1, SizeF sz2)
+		{
+			return new SizeF (sz1.Width - sz2.Width, 
+					  sz1.Height - sz2.Height);
+		}
+		
+		/// <summary>
+		///	SizeF to PointF Conversion
+		/// </summary>
+		///
+		/// <remarks>
+		///	Returns a PointF based on the dimensions of a given 
+		///	SizeF. Requires explicit cast.
+		/// </remarks>
+
+		public static explicit operator PointF (SizeF sz)
+		{
+			return new PointF (sz.Width, sz.Height);
+		}
+
+
+		// -----------------------
+		// Public Constructors
+		// -----------------------
+
+		/// <summary>
+		///	SizeF Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a SizeF from a PointF value.
+		/// </remarks>
+		
+		public SizeF (PointF pt)
+		{
+			wd = pt.X;
+			ht = pt.Y;
+		}
+
+		/// <summary>
+		///	SizeF Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a SizeF from an existing SizeF value.
+		/// </remarks>
+		
+		public SizeF (SizeF sz)
+		{
+			wd = sz.Width;
+			ht = sz.Height;
+		}
+
+		/// <summary>
+		///	SizeF Constructor
+		/// </summary>
+		///
+		/// <remarks>
+		///	Creates a SizeF from specified dimensions.
+		/// </remarks>
+		
+		public SizeF (float width, float height)
+		{
+			wd = width;
+			ht = height;
+		}
+
+		// -----------------------
+		// Public Instance Members
+		// -----------------------
+
+		/// <summary>
+		///	IsEmpty Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	Indicates if both Width and Height are zero.
+		/// </remarks>
+		
+		public bool IsEmpty {
+			get {
+				return ((wd == 0.0) && (ht == 0.0));
+			}
+		}
+
+		/// <summary>
+		///	Width Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Width coordinate of the SizeF.
+		/// </remarks>
+		
+		public float Width {
+			get {
+				return wd;
+			}
+			set {
+				wd = value;
+			}
+		}
+
+		/// <summary>
+		///	Height Property
+		/// </summary>
+		///
+		/// <remarks>
+		///	The Height coordinate of the SizeF.
+		/// </remarks>
+		
+		public float Height {
+			get {
+				return ht;
+			}
+			set {
+				ht = value;
+			}
+		}
+
+		/// <summary>
+		///	Equals Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Checks equivalence of this SizeF and another object.
+		/// </remarks>
+		
+		public override bool Equals (object o)
+		{
+			if (!(o is SizeF))
+				return false;
+
+			return (this == (SizeF) o);
+		}
+
+		/// <summary>
+		///	GetHashCode Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Calculates a hashing value.
+		/// </remarks>
+		
+		public override int GetHashCode ()
+		{
+			return (int) wd ^ (int) ht;
+		}
+
+		/// <summary>
+		///	ToString Method
+		/// </summary>
+		///
+		/// <remarks>
+		///	Formats the SizeF as a string in coordinate notation.
+		/// </remarks>
+		
+		public override string ToString ()
+		{
+			return String.Format ("[{0},{1}]", wd, ht);
+		}
+
+	}
+}
diff --git a/mcs/class/System.Drawing/System.Drawing/StringAligment.cs b/mcs/class/System.Drawing/System.Drawing/StringAligment.cs
new file mode 100644
index 00000000000..08539bc6176
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/StringAligment.cs
@@ -0,0 +1,17 @@
+//

+// System.Drawing.StringAligment.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+

+

+using System;

+namespace System.Drawing 

+{

+	public enum StringAligment {

+		Center = 1,

+		Far = 2,

+		Near = 3

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/StringDigitSubstitute.cs b/mcs/class/System.Drawing/System.Drawing/StringDigitSubstitute.cs
new file mode 100644
index 00000000000..377894f26f6
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/StringDigitSubstitute.cs
@@ -0,0 +1,18 @@
+//

+// System.Drawing.StringDigitSubstitute.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+

+

+using System;

+namespace System.Drawing 

+{

+	public enum StringDigitSubstitute {

+		National = 1,

+		None = 2,

+		Traditional = 3,

+		User = 4

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/StringFormatFlags.cs b/mcs/class/System.Drawing/System.Drawing/StringFormatFlags.cs
new file mode 100644
index 00000000000..c323522b838
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/StringFormatFlags.cs
@@ -0,0 +1,23 @@
+//

+// System.Drawing.StringFormatFlags.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+

+

+using System;

+namespace System.Drawing 

+{

+	public enum StringFormatFlags {

+		DirectionRightToLeft = 1,

+		DirectionVertical = 2,

+		DisplayFormatControl = 3,

+		FitBlackBox = 4,

+		LineLimit = 5,

+		MeasureTrailingSpaces = 6,

+		NoClip = 7,

+		NoFontFallback = 8,

+		NoWrap = 9,

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/StringTrimming.cs b/mcs/class/System.Drawing/System.Drawing/StringTrimming.cs
new file mode 100644
index 00000000000..ee4f1bb738a
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/StringTrimming.cs
@@ -0,0 +1,20 @@
+//

+// System.Drawing.StringTrimming.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+

+

+using System;

+namespace System.Drawing 

+{

+	public enum  StringTrimming{

+		Character = 1,

+		EllipsisCharacter = 2,

+		EllipsisPath = 3,

+		EllipsisWord = 4,

+		None = 5,

+		Word = 6

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/StringUnit.cs b/mcs/class/System.Drawing/System.Drawing/StringUnit.cs
new file mode 100644
index 00000000000..82dd42b969d
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/StringUnit.cs
@@ -0,0 +1,22 @@
+//

+// System.Drawing.StringUnit.cs

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+// Author: Dennis Hayes (dennish@raytek.com)

+//

+

+

+using System;

+namespace System.Drawing 

+{

+	public enum  StringUnit{

+		Display = 1,

+		Document = 2,

+		Em = 3,

+		Inch = 3,

+		Millimeter = 4,

+		Pixel = 5,

+		Point = 6,

+		World = 7

+	}

+}

diff --git a/mcs/class/System.Drawing/System.Drawing/SystemColors.cs b/mcs/class/System.Drawing/System.Drawing/SystemColors.cs
new file mode 100644
index 00000000000..5ffc54e9cf0
--- /dev/null
+++ b/mcs/class/System.Drawing/System.Drawing/SystemColors.cs
@@ -0,0 +1,200 @@
+//
+// System.Drawing.SystemColors
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+// 
+// Generated using a slightly modified version of the program listed inside comments
+// in Color.cs
+//
+
+namespace System.Drawing {
+
+	public sealed class SystemColors
+	{
+		static public Color ActiveBorder
+		{	
+			get {
+				return Color.FromArgbSystem (255, 131, 153, 177, "ActiveBorder");
+			}
+		}
+
+		static public Color ActiveCaption
+		{	
+			get {
+				return Color.FromArgbSystem (255, 79, 101, 125, "ActiveCaption");
+			}
+		}
+
+		static public Color ActiveCaptionText
+		{	
+			get {
+				return Color.FromArgbSystem (255, 255, 255, 255, "ActiveCaptionText");
+			}
+		}
+
+		static public Color AppWorkspace
+		{	
+			get {
+				return Color.FromArgbSystem (255, 128, 128, 128, "AppWorkspace");
+			}
+		}
+
+		static public Color Control
+		{	
+			get {
+				return Color.FromArgbSystem (255, 131, 153, 177, "Control");
+			}
+		}
+
+		static public Color ControlDark
+		{	
+			get {
+				return Color.FromArgbSystem (255, 79, 101, 125, "ControlDark");
+			}
+		}
+
+		static public Color ControlDarkDark
+		{	
+			get {
+				return Color.FromArgbSystem (255, 0, 0, 0, "ControlDarkDark");
+			}
+		}
+
+		static public Color ControlLight
+		{	
+			get {
+				return Color.FromArgbSystem (255, 131, 153, 177, "ControlLight");
+			}
+		}
+
+		static public Color ControlLightLight
+		{	
+			get {
+				return Color.FromArgbSystem (255, 193, 204, 217, "ControlLightLight");
+			}
+		}
+
+		static public Color ControlText
+		{	
+			get {
+				return Color.FromArgbSystem (255, 0, 0, 0, "ControlText");
+			}
+		}
+
+		static public Color Desktop
+		{	
+			get {
+				return Color.FromArgbSystem (255, 0, 0, 0, "Desktop");
+			}
+		}
+
+		static public Color GrayText
+		{	
+			get {
+				return Color.FromArgbSystem (255, 79, 101, 125, "GrayText");
+			}
+		}
+
+		static public Color Highlight
+		{	
+			get {
+				return Color.FromArgbSystem (255, 79, 101, 125, "Highlight");
+			}
+		}
+
+		static public Color HighlightText
+		{	
+			get {
+				return Color.FromArgbSystem (255, 255, 255, 255, "HighlightText");
+			}
+		}
+
+		static public Color HotTrack
+		{	
+			get {
+				return Color.FromArgbSystem (255, 0, 0, 255, "HotTrack");
+			}
+		}
+
+		static public Color InactiveBorder
+		{	
+			get {
+				return Color.FromArgbSystem (255, 131, 153, 177, "InactiveBorder");
+			}
+		}
+
+		static public Color InactiveCaption
+		{	
+			get {
+				return Color.FromArgbSystem (255, 128, 128, 128, "InactiveCaption");
+			}
+		}
+
+		static public Color InactiveCaptionText
+		{	
+			get {
+				return Color.FromArgbSystem (255, 193, 204, 217, "InactiveCaptionText");
+			}
+		}
+
+		static public Color Info
+		{	
+			get {
+				return Color.FromArgbSystem (255, 255, 255, 255, "Info");
+			}
+		}
+
+		static public Color InfoText
+		{	
+			get {
+				return Color.FromArgbSystem (255, 0, 0, 0, "InfoText");
+			}
+		}
+
+		static public Color Menu
+		{	
+			get {
+				return Color.FromArgbSystem (255, 131, 153, 177, "Menu");
+			}
+		}
+
+		static public Color MenuText
+		{	
+			get {
+				return Color.FromArgbSystem (255, 0, 0, 0, "MenuText");
+			}
+		}
+
+		static public Color ScrollBar
+		{	
+			get {
+				return Color.FromArgbSystem (255, 193, 204, 217, "ScrollBar");
+			}
+		}
+
+		static public Color Window
+		{	
+			get {
+				return Color.FromArgbSystem (255, 255, 255, 255, "Window");
+			}
+		}
+
+		static public Color WindowFrame
+		{	
+			get {
+				return Color.FromArgbSystem (255, 0, 0, 0, "WindowFrame");
+			}
+		}
+
+		static public Color WindowText
+		{	
+			get {
+				return Color.FromArgbSystem (255, 0, 0, 0, "WindowText");
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog b/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
new file mode 100644
index 00000000000..62c04eb1808
--- /dev/null
+++ b/mcs/class/System.Drawing/Test/System.Drawing/ChangeLog
@@ -0,0 +1,4 @@
+2001-10-31  Mike Kestner <mkestner@speakeasy.net>
+
+	* TestPoint.cs : Tests I've had in my node forever.
+
diff --git a/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs b/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs
new file mode 100644
index 00000000000..01de794dc02
--- /dev/null
+++ b/mcs/class/System.Drawing/Test/System.Drawing/TestPoint.cs
@@ -0,0 +1,159 @@
+// Tests for System.Drawing.Point.cs
+//
+// Author: Mike Kestner (mkestner@speakeasy.net)
+//
+// Copyright (c) 2001 Ximian, Inc.
+
+using NUnit.Framework;
+using System;
+using System.Drawing;
+
+public class PointTest : TestCase {
+	Point pt1_1;
+	Point pt1_0;
+	Point pt0_1;
+
+	protected override void SetUp ()
+	{
+		pt1_1 = new Point (1, 1);
+		pt1_0 = new Point (1, 0);
+		pt0_1 = new Point (0, 1);
+	}
+
+	public PointTest(String name) : base (name) {}
+
+	public static ITest Suite {
+		get {
+			TestSuite suite = new TestSuite ();
+			suite.AddTest (new PointTest ("EqualsTest"));
+			suite.AddTest (new PointTest ("EqualityOpTest"));
+			suite.AddTest (new PointTest ("InequalityOpTest"));
+			suite.AddTest (new PointTest ("CeilingTest"));
+			suite.AddTest (new PointTest ("RoundTest"));
+			suite.AddTest (new PointTest ("TruncateTest"));
+			suite.AddTest (new PointTest ("NullTest"));
+			suite.AddTest (new PointTest ("AdditionTest"));
+			suite.AddTest (new PointTest ("SubtractionTest"));
+			suite.AddTest (new PointTest ("Point2SizeTest"));
+			suite.AddTest (new PointTest ("Point2PointFTest"));
+			suite.AddTest (new PointTest ("ConstructorTest"));
+			suite.AddTest (new PointTest ("PropertyTest"));
+			suite.AddTest (new PointTest ("OffsetTest"));
+			return suite;
+		}
+	}
+
+	public void EqualsTest () 
+	{
+		AssertEquals (pt1_1, pt1_1);
+		AssertEquals (pt1_1, new Point (1, 1));
+		Assert (!pt1_1.Equals (pt1_0));
+		Assert (!pt1_1.Equals (pt0_1));
+		Assert (!pt1_0.Equals (pt0_1));
+	}
+
+	public void EqualityOpTest () 
+	{
+		Assert (pt1_1 == pt1_1);
+		Assert (pt1_1 == new Point (1, 1));
+		Assert (!(pt1_1 == pt1_0));
+		Assert (!(pt1_1 == pt0_1));
+		Assert (!(pt1_0 == pt0_1));
+	}
+
+	public void InequalityOpTest () 
+	{
+		Assert (!(pt1_1 != pt1_1));
+		Assert (!(pt1_1 != new Point (1, 1)));
+		Assert (pt1_1 != pt1_0);
+		Assert (pt1_1 != pt0_1);
+		Assert (pt1_0 != pt0_1);
+	}
+
+	public void CeilingTest () 
+	{
+		PointF ptf = new PointF (0.8f, 0.3f);
+		AssertEquals (pt1_1, Point.Ceiling (ptf));
+	}
+
+	public void RoundTest () 
+	{
+		PointF ptf = new PointF (0.8f, 1.3f);
+		AssertEquals (pt1_1, Point.Round (ptf));
+	}
+
+	public void TruncateTest () 
+	{
+		PointF ptf = new PointF (0.8f, 1.3f);
+		AssertEquals (pt0_1, Point.Truncate (ptf));
+	}
+
+	public void NullTest () 
+	{
+		Point pt = new Point (0, 0);
+		AssertEquals (pt, Point.Empty);
+	}
+
+	public void AdditionTest () 
+	{
+		AssertEquals (pt1_1, pt1_0 + new Size (0, 1));
+		AssertEquals (pt1_1, pt0_1 + new Size (1, 0));
+	}
+
+	public void SubtractionTest () 
+	{
+		AssertEquals (pt1_0, pt1_1 - new Size (0, 1));
+		AssertEquals (pt0_1, pt1_1 - new Size (1, 0));
+	}
+
+	public void Point2SizeTest () 
+	{
+		Size sz1 = new Size (1, 1);
+		Size sz2 = (Size) pt1_1;
+
+		AssertEquals (sz1, sz2);
+	}
+
+	public void Point2PointFTest () 
+	{
+		PointF ptf1 = new PointF (1, 1);
+		PointF ptf2 = pt1_1;
+
+		AssertEquals (ptf1, ptf2);
+	}
+
+	public void ConstructorTest () 
+	{
+		int i = (1 << 16) + 1;
+		Size sz = new Size (1, 1);
+		Point pt_i = new Point (i);
+		Point pt_sz = new Point (sz);
+
+		AssertEquals (pt_i, pt_sz);
+		AssertEquals (pt_i, pt1_1);
+		AssertEquals (pt_sz, pt1_1);
+	}
+
+	public void PropertyTest () 
+	{
+		Point pt = new Point (0, 0);
+
+		Assert (pt.IsEmpty);
+		Assert (!pt1_1.IsEmpty);
+		AssertEquals (1, pt1_0.X);
+		AssertEquals (1, pt0_1.Y);
+	}
+
+	public void OffsetTest () 
+	{
+		Point pt = new Point (0, 0);
+		pt.Offset (0, 1);
+		AssertEquals (pt, pt0_1);
+		pt.Offset (1, 0);
+		AssertEquals (pt, pt1_1);
+		pt.Offset (0, -1);
+		AssertEquals (pt, pt1_0);
+	}
+}
+
+
diff --git a/mcs/class/System.Drawing/list.unix b/mcs/class/System.Drawing/list.unix
new file mode 100755
index 00000000000..063ab5c66e0
--- /dev/null
+++ b/mcs/class/System.Drawing/list.unix
@@ -0,0 +1,60 @@
+-o System.Drawing.dll --target library
+System.Drawing/Point.cs
+System.Drawing/PointF.cs
+System.Drawing/Size.cs
+System.Drawing/SizeF.cs
+System.Drawing/Rectangle.cs
+System.Drawing/RectangleF.cs
+System.Drawing/Brush.cs
+System.Drawing/Pen.cs
+System.Drawing/GraphicsUnit.cs
+System.Drawing/Graphics.cs
+System.Drawing/ColorTranslator.cs
+System.Drawing/Bitmap.cs
+System.Drawing/Image.cs
+System.Drawing/Color.cs
+System.Drawing/ColorConverter.cs
+System.Drawing/KnownColor.cs
+System.Drawing/RotateFlipType.cs
+System.Drawing/StringAligment.cs
+System.Drawing/StringDigitSubstitute.cs
+System.Drawing/StringFormatFlags.cs
+System.Drawing/StringTrimming.cs
+System.Drawing/StringUnit.cs
+System.Drawing/SystemColors.cs
+System.Drawing/ContentAlignment.cs
+System.Drawing/FontStyle.cs
+System.Drawing.Drawing2D/Enums.cs
+System.Drawing.Drawing2D/Matrix.cs
+System.Drawing.Drawing2D/TODOAttribute.cs
+System.Drawing.Drawing2D/PenAlignment.cs
+System.Drawing.Imaging/FrameDimension.cs
+System.Drawing.Imaging/ColorPalette.cs
+System.Drawing.Imaging/PixelFormat.cs
+System.Drawing.Imaging/Metafile.cs
+System.Drawing.Imaging/BitmapData.cs
+System.Drawing.Imaging/ColorAdjustType.cs
+System.Drawing.Imaging/ColorChannelFlag.cs
+System.Drawing.Imaging/ColorMapType.cs
+System.Drawing.Imaging/ColorMatrixFlag.cs
+System.Drawing.Imaging/ColorMode.cs
+System.Drawing.Imaging/EmfPlusRecordType.cs
+System.Drawing.Imaging/EmfType.cs
+System.Drawing.Imaging/EncoderParameterValueType.cs
+System.Drawing.Imaging/EncoderValue.cs
+System.Drawing.Imaging/ImageCodecFlags.cs
+System.Drawing.Imaging/ImageFlags.cs
+System.Drawing.Imaging/ImageLockMode.cs
+System.Drawing.Imaging/MetafileFrameUnit.cs
+System.Drawing.Imaging/PaletteFlags.cs
+System.Drawing.Design/UITypeEditorEditStyle.cs
+System.Drawing.Text/GenericFontFamilies.cs
+System.Drawing.Text/HotkeyPrefix.cs
+System.Drawing.Text/TextRenderingHint.cs
+System.Drawing.Printing/Duplex.cs
+System.Drawing.Printing/PaperKind.cs
+System.Drawing.Printing/PaperSourceKind.cs
+System.Drawing.Printing/PrintRange.cs
+System.Drawing.Printing/PrinterResolutionKind.cs
+System.Drawing.Printing/PrinterUnit.cs
+System.Drawing.Printing/PrintingPermissionLevel.cs
diff --git a/mcs/class/System.Drawing/makefile.gnu b/mcs/class/System.Drawing/makefile.gnu
new file mode 100644
index 00000000000..2df515a9802
--- /dev/null
+++ b/mcs/class/System.Drawing/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../..
+
+LIBRARY = ../lib/System.Drawing.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib -r System
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=./Test*
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/System.EnterpriseServices/ChangeLog b/mcs/class/System.EnterpriseServices/ChangeLog
new file mode 100644
index 00000000000..cc6218af560
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/ChangeLog
@@ -0,0 +1,25 @@
+2002-08-13  Tim Coleman <tim@timcoleman.com>
+	* list: new files added to build
+
+2002-08-08  Tim Coleman <tim@timcoleman.com>
+	* list: new files added to build.
+
+2002-08-07  Tim Coleman <tim@timcoleman.com>
+	* list: new files added to build.
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>
+	* list: new files added to build.
+	* System.EnterpriseServices.CompensatingResourceManager:
+		New directory added
+
+2002-08-03  Tim Coleman <tim@timcoleman.com>
+	* list: new files added to build list.
+
+2002-07-22 Tim Coleman  <tim@timcoleman.com>
+	* makefile.gnu: added to build on linux
+
+2002-07-22 Tim Coleman  <tim@timcoleman.com>
+	* System.EnterpriseServices: New namespace created
+		to provide enum needed by Web Services
+	* System.EnterpriseServices.build: New file
+	* list: New file
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/ChangeLog b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/ChangeLog
new file mode 100644
index 00000000000..6e6e8360001
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/ChangeLog
@@ -0,0 +1,19 @@
+2002-08-13  Tim Coleman <tim@timcoleman.com>
+	* Clerk.cs:
+	* Compensator.cs:
+		New stubs added.
+
+2002-08-07  Tim Coleman <tim@timcoleman.com>
+	* CompensatorOptions.cs:
+	* LogRecordFlags.cs:
+	* TransactionState.cs:
+		Changed enum values to agree with .NET
+	* LogRecord.cs:
+		New stubs added
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>
+	* ChangeLog.cs:
+	* CompensatorOptions.cs:
+	* LogRecordFlags.cs:
+	* TransactionState.cs:
+		New stubs added
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/Clerk.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/Clerk.cs
new file mode 100644
index 00000000000..291ecdd0271
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/Clerk.cs
@@ -0,0 +1,84 @@
+// 

+// System.EnterpriseServices.CompensatingResourceManager.Clerk.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.EnterpriseServices;

+

+namespace System.EnterpriseServices.CompensatingResourceManager {

+	public sealed class Clerk {

+

+		#region Constructors

+		

+		//internal Clerk (CrmLogControl logControl)

+		//{

+		//}

+

+		[MonoTODO]

+		public Clerk (string compensator, string description, CompensatorOptions flags)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public Clerk (Type compensator, string description, CompensatorOptions flags)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public int LogRecordCount {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string TransactionUOW {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		~Clerk ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void ForceLog ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void ForceTransactionToAbort ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void ForgetLogRecord ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void WriteLogRecord (object record)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/Compensator.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/Compensator.cs
new file mode 100644
index 00000000000..0d2a7028b51
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/Compensator.cs
@@ -0,0 +1,93 @@
+// 

+// System.EnterpriseServices.CompensatingResourceManager.Compensator.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.EnterpriseServices;

+

+namespace System.EnterpriseServices.CompensatingResourceManager {

+	public class Compensator : ServicedComponent{

+

+		#region Constructors

+

+		[MonoTODO]

+		public Compensator ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public Clerk Clerk {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public virtual bool AbortRecord (LogRecord rec)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void BeginAbort (bool fRecovery)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void BeginCommit (bool fRecovery)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void BeginPrepare ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void CommitRecord (LogRecord rec)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void EndAbort ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void EndCommit ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual bool EndPrepare ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual bool PrepareRecord (LogRecord rec)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/CompensatorOptions.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/CompensatorOptions.cs
new file mode 100644
index 00000000000..8a2466a8c8a
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/CompensatorOptions.cs
@@ -0,0 +1,22 @@
+// 

+// System.EnterpriseServices.CompensatingResourceManager.CompensatorOptions.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices.CompensatingResourceManager {

+	[Flags]

+	[Serializable]

+	public enum CompensatorOptions {

+		PreparePhase = 0x1,

+		CommitPhase = 0x2,

+		AbortPhase = 0x4,

+		AllPhases =  0x7,

+		FailIfInDoubtsRemain = 0x10

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/LogRecord.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/LogRecord.cs
new file mode 100644
index 00000000000..3344f4ecf72
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/LogRecord.cs
@@ -0,0 +1,69 @@
+// 

+// System.EnterpriseServices.CompensatingResourceManager.LogRecord.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.EnterpriseServices;

+

+namespace System.EnterpriseServices.CompensatingResourceManager {

+

+	public sealed class LogRecord {

+

+		#region Fields

+

+		LogRecordFlags flags;

+		object record;

+		int sequence;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		internal LogRecord ()

+		{

+		}

+

+		[MonoTODO]

+		internal LogRecord (_LogRecord logRecord)

+		{

+			flags = (LogRecordFlags) logRecord.dwCrmFlags;

+			sequence = logRecord.dwSequenceNumber;

+			record = logRecord.blobUserData;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public LogRecordFlags Flags {

+			get { return flags; }

+		}

+

+		public object Record {

+			get { return record; }

+		}

+

+		public int Sequence {

+			get { return sequence; }

+		}

+

+		#endregion // Properties

+	}

+

+	internal struct _LogRecord {

+		

+		#region Fields

+

+		public int dwCrmFlags;

+		public int dwSequenceNumber;

+		public object blobUserData; // FIXME: This is not the correct type

+

+		#endregion // Fields

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/LogRecordFlags.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/LogRecordFlags.cs
new file mode 100644
index 00000000000..57b519e1dfa
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/LogRecordFlags.cs
@@ -0,0 +1,24 @@
+// 

+// System.EnterpriseServices.CompensatingResourceManager.LogRecordFlags.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices.CompensatingResourceManager {

+	[Flags]

+	[Serializable]

+	public enum LogRecordFlags {

+		ForgetTarget = 0x1,

+		WrittenDuringPrepare = 0x2,

+		WrittenDuringCommit = 0x4,

+		WrittenDuringAbort = 0x8,

+		WrittenDurringRecovery = 0x10, // Typo present in .NET

+		WrittenDuringReplay = 0x20,

+		ReplayInProgress = 0x40

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/TransactionState.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/TransactionState.cs
new file mode 100644
index 00000000000..192bab59737
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.CompensatingResourceManager/TransactionState.cs
@@ -0,0 +1,20 @@
+// 

+// System.EnterpriseServices.CompensatingResourceManager.TransactionState.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices.CompensatingResourceManager {

+	[Serializable]

+	public enum TransactionState {

+		Active = 0x0,

+		Committed = 0x1,

+		Aborted = 0x2,

+		Indoubt = 0x3

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices.build b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.build
new file mode 100644
index 00000000000..2aa50111dad
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices.build
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.EnterpriseServices.dll -->
+
+<project name="System" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<mkdir dir="../lib"/>
+		<csc target="library" output="../lib/System.EnterpriseServices.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/nowarn:0169"/>
+			<arg value="/nowarn:0649"/> <!-- always default value -->
+			<arg value="/nowarn:0067"/> <!-- event never used -->
+			<arg value="/nowarn:0679"/> <!-- internal virual -->
+			<arg value="/nowarn:0168"/> <!-- never used variable -->
+			<arg value="/nowarn:0162"/> <!-- unreachable code -->
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>
+			<arg value="/debug"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/>
+			</sources>
+		</csc>
+	</target>
+</project>
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/AccessChecksLevelOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/AccessChecksLevelOption.cs
new file mode 100644
index 00000000000..453db008630
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/AccessChecksLevelOption.cs
@@ -0,0 +1,16 @@
+// 

+// System.EnterpriseServices.AccessChecksLevelOption.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public enum AccessChecksLevelOption {

+		Application,

+		ApplicationComponent

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ActivationOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ActivationOption.cs
new file mode 100644
index 00000000000..8149daaf458
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ActivationOption.cs
@@ -0,0 +1,16 @@
+// 

+// System.EnterpriseServices.ActivationOption.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public enum ActivationOption {

+		Library,

+		Server

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationAccessControlAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationAccessControlAttribute.cs
new file mode 100644
index 00000000000..2c1262457da
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationAccessControlAttribute.cs
@@ -0,0 +1,63 @@
+// 

+// System.EnterpriseServices.ApplicationAccessControlAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Assembly)]

+	public sealed class ApplicationAccessControlAttribute : Attribute {

+

+		#region Fields

+

+		AccessChecksLevelOption accessChecksLevel;

+		AuthenticationOption authentication;

+		ImpersonationLevelOption impersonation;

+		bool val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public ApplicationAccessControlAttribute ()

+		{

+			this.val = false;

+		}

+

+		public ApplicationAccessControlAttribute (bool val)

+		{

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public AccessChecksLevelOption AccessChecksLevel {

+			get { return accessChecksLevel; }

+			set { accessChecksLevel = value; }

+		}

+

+		public AuthenticationOption Authentication {

+			get { return authentication; }

+			set { authentication = value; }

+		}

+

+		public ImpersonationLevelOption Impersonation {

+			get { return impersonation; }

+			set { impersonation = value; }

+		}

+

+		public bool Value {

+			get { return val; }

+			set { val = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationActivationAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationActivationAttribute.cs
new file mode 100644
index 00000000000..38fd3539732
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationActivationAttribute.cs
@@ -0,0 +1,51 @@
+// 

+// System.EnterpriseServices.ApplicationActivationAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Assembly)]

+	public sealed class ApplicationActivationAttribute : Attribute {

+

+		#region Fields

+

+		ActivationOption opt;

+		string soapMailbox;

+		string soapVRoot;	

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public ApplicationActivationAttribute (ActivationOption opt)

+		{

+			this.opt = opt;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string SoapMailbox {	

+			get { return soapMailbox; }

+			set { soapMailbox = value; }

+		}

+

+		public string SoapVRoot {

+			get { return soapVRoot; }

+			set { soapVRoot = value; }

+		}

+

+		public ActivationOption Value {

+			get { return opt; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationIDAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationIDAttribute.cs
new file mode 100644
index 00000000000..332051c1fa2
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationIDAttribute.cs
@@ -0,0 +1,39 @@
+// 

+// System.EnterpriseServices.ApplicationIDAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Assembly)]

+	public sealed class ApplicationIDAttribute : Attribute {

+

+		#region Fields

+

+		Guid guid;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public ApplicationIDAttribute (string guid)

+		{

+			this.guid = new Guid (guid);

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public Guid Value {	

+			get { return guid; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationNameAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationNameAttribute.cs
new file mode 100644
index 00000000000..65700494dce
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationNameAttribute.cs
@@ -0,0 +1,39 @@
+// 

+// System.EnterpriseServices.ApplicationNameAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Assembly)]

+	public sealed class ApplicationNameAttribute : Attribute {

+

+		#region Fields

+

+		string name;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public ApplicationNameAttribute (string name)

+		{

+			this.name = name;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string Value {	

+			get { return name; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationQueuingAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationQueuingAttribute.cs
new file mode 100644
index 00000000000..de0c7911e42
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ApplicationQueuingAttribute.cs
@@ -0,0 +1,54 @@
+// 

+// System.EnterpriseServices.ApplicationQueuingAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Assembly)]

+	public sealed class ApplicationQueuingAttribute : Attribute {

+

+		#region Fields

+

+		bool enabled;

+		int maxListenerThreads;

+		bool queueListenerEnabled;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public ApplicationQueuingAttribute ()

+		{

+			enabled = true;

+			queueListenerEnabled = false;

+			maxListenerThreads = 0;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool Enabled {

+			get { return enabled; }

+			set { enabled = value; }

+		}

+

+		public int MaxListenerThreads {

+			get { return maxListenerThreads; }

+			set { maxListenerThreads = value; }

+		}

+

+		public bool QueueListenerEnabled {

+			get { return queueListenerEnabled; }

+			set { queueListenerEnabled = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/AuthenticationOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/AuthenticationOption.cs
new file mode 100644
index 00000000000..52612f2a5c1
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/AuthenticationOption.cs
@@ -0,0 +1,21 @@
+// 

+// System.EnterpriseServices.AuthenticationOption.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public enum AuthenticationOption {

+		Call,

+		Connect,

+		Default,

+		Integrity,

+		None,

+		Packet,

+		Privacy

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/AutoCompleteAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/AutoCompleteAttribute.cs
new file mode 100644
index 00000000000..033f418f0e0
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/AutoCompleteAttribute.cs
@@ -0,0 +1,44 @@
+// 

+// System.EnterpriseServices.AutoCompleteAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Method)]

+	public sealed class AutoCompleteAttribute : Attribute {

+

+		#region Fields

+

+		bool val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public AutoCompleteAttribute ()

+		{

+			val = true;

+		}

+

+		public AutoCompleteAttribute (bool val)

+		{

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool Value {	

+			get { return val; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/BOID.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/BOID.cs
new file mode 100644
index 00000000000..a1117a3a22e
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/BOID.cs
@@ -0,0 +1,21 @@
+// 

+// System.EnterpriseServices.BOID.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	public struct BOID {

+

+		#region Fields

+

+		public byte[] rgb;

+

+		#endregion // Fields

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/BYOT.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/BYOT.cs
new file mode 100644
index 00000000000..a96c967b5f5
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/BYOT.cs
@@ -0,0 +1,31 @@
+// 

+// System.EnterpriseServices.BYOT.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	public sealed class BYOT {

+

+		#region Methods

+

+		[MonoTODO]

+		public static object CreateWithTipTransaction (string url, Type t)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static object CreateWithTransaction (object transaction, Type t)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/COMTIIntrinsicsAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/COMTIIntrinsicsAttribute.cs
new file mode 100644
index 00000000000..9b862db145a
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/COMTIIntrinsicsAttribute.cs
@@ -0,0 +1,45 @@
+// 

+// System.EnterpriseServices.COMTIIntrinsicsAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class COMTIIntrinsicsAttribute : Attribute {

+

+		#region Fields

+

+		bool val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public COMTIIntrinsicsAttribute ()

+		{

+			this.val = false;

+		}

+

+		public COMTIIntrinsicsAttribute (bool val)

+		{

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool Value {

+			get { return val; }

+			set { val = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ChangeLog b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ChangeLog
new file mode 100644
index 00000000000..8a993302e65
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ChangeLog
@@ -0,0 +1,99 @@
+2002-08-10  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* RegistrationHelper.cs: fixed compilation.
+
+2002-08-09  Tim Coleman <tim@timcoleman.com>
+	* RegistrationHelperTx.cs:
+		Commit the add of RegistrationHelperTx.cs
+
+2002-08-08  Tim Coleman <tim@timcoleman.com>
+        * ISecurityCallContext.cs:
+        * ISecurityCallersColl.cs:
+        * ISecurityIdentityColl.cs:
+        * ISharedProperty.cs:
+        * ISharedPropertyGroup.cs:
+        * RegistrationHelperTx.cs:
+        * ResourcePool.cs:
+        * SecureMethodAttribute.cs:
+        * SecurityCallContext.cs:
+        * SecurityCallers.cs:
+        * SecurityIdentity.cs:
+        * SecurityRoleAttribute.cs:
+        * ServicedComponentException.cs:
+        * SharedProperty.cs:
+        * SharedPropertyGroup.cs:
+        * SharedPropertyGroupManager.cs:
+        * SynchronizationAttribute.cs:
+        * SynchronizationOption.cs:
+        * TransactionAttribute.cs:
+        * TransactionIsolationLevel.cs:
+                New files added.
+        * ContextUtil.cs:
+                New internal constructor added, methods added.
+        * IRemoteDispatch.cs:
+                AutoComplete attributes added to methods
+        * TODOAttribute.cs:
+                Namespace adjusted.
+
+
+2002-08-07  Tim Coleman <tim@timcoleman.com>
+	* RegistrationErrorInfo.cs:
+	* RegistrationException.cs:
+	* RegistrationHelper.cs:
+	* ServicedComponent.cs:
+		New stubs added
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>	
+	* IRegistrationHelper.cs:	
+	* IRemoteDispatch.cs:
+	* IServicedComponentInfo.cs:
+	* ITransaction.cs:
+		Comment out Guid attribute for now
+		because it doesn't build with CSC unless
+		you supply a valid Guid.
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>
+	* DescriptionAttribute.cs:
+	* EventClassAttribute.cs:
+	* EventTrackingEnabledAttribute.cs:
+	* ExceptionClassAttribute.cs:
+	* IISIntrinsicsAttribute.cs:
+	* IRegistrationHelper.cs:
+	* IRemoteDispatch.cs:
+	* IServicedComponentInfo.cs:
+	* ITransaction.cs:
+	* InstallationFlags.cs:
+	* InterfaceQueuingAttribute.cs:
+	* JustInTimeActivationAttribute.cs:
+	* LoadBalancingSupportedAttribute.cs:
+	* MustRunInClientContextAttribute.cs:
+	* ObjectPoolingAttribute.cs:
+	* PrivateComponentAttribute.cs:
+	* PropertyLockMode.cs:
+	* PropertyReleaseMode.cs:
+	* XACTTRANSINFO.cs:
+		New stubs added.
+
+2002-08-03  Tim Coleman <tim@timcoleman.com>
+	* AccessChecksLevelOption.cs:
+	* ActivationOption.cs:
+	* ApplicationAccessControlAttribute.cs:
+	* ApplicationActivationAttribute.cs:
+	* ApplicationIDAttribute.cs:
+	* ApplicationNameAttribute.cs:
+	* ApplicationQueuingAttribute.cs:
+	* AuthenticationOption.cs:
+	* AutoCompleteAttribute.cs:
+	* BOID.cs:
+	* BYOT.cs:
+	* COMTIIntrinsicsAttribute.cs:
+	* ComponentAccessControlAttribute.cs:
+	* ConstructionEnabledAttribute.cs:
+	* ContextUtil.cs:
+	* ImpersonationLevelOption.cs:
+	* TransactionVote.cs:
+		New stubs added
+
+2002-07-22 Tim Coleman  <tim@timcoleman.com>
+	* TransactionOption.cs: New enum added as
+		required by System.Web.Services
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ComponentAccessControlAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ComponentAccessControlAttribute.cs
new file mode 100644
index 00000000000..fa9aa286746
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ComponentAccessControlAttribute.cs
@@ -0,0 +1,45 @@
+// 

+// System.EnterpriseServices.ComponentAccessControlAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class ComponentAccessControlAttribute : Attribute {

+

+		#region Fields

+

+		bool val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public ComponentAccessControlAttribute ()

+		{

+			this.val = false;

+		}

+

+		public ComponentAccessControlAttribute (bool val)

+		{

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool Value {

+			get { return val; }

+			set { val = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ConstructionEnabledAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ConstructionEnabledAttribute.cs
new file mode 100644
index 00000000000..38a4345756c
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ConstructionEnabledAttribute.cs
@@ -0,0 +1,53 @@
+// 

+// System.EnterpriseServices.ConstructionEnabledAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class ConstructionEnabledAttribute : Attribute {

+

+		#region Fields

+

+		string def;

+		bool val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public ConstructionEnabledAttribute ()

+		{

+			def = String.Empty;

+			this.val = false;

+		}

+

+		public ConstructionEnabledAttribute (bool val)

+		{

+			def = String.Empty;

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string Default {

+			get { return def; }

+			set { def = value; }

+		}

+

+		public bool Value {

+			get { return val; }

+			set { val = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ContextUtil.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ContextUtil.cs
new file mode 100644
index 00000000000..70136b421f4
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ContextUtil.cs
@@ -0,0 +1,130 @@
+// 

+// System.EnterpriseServices.ContextUtil.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	public sealed class ContextUtil {

+

+		#region Fields

+

+		static bool deactivateOnReturn;

+		static TransactionVote myTransactionVote;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		internal ContextUtil ()

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public static Guid ActivityId {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+		

+		public static Guid ApplicationId {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public static Guid ApplicationInstanceId {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public static Guid ContextId {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public static bool DeactivateOnReturn {

+			get { return deactivateOnReturn; }

+			set { deactivateOnReturn = value; }

+		}

+

+		public static bool IsInTransaction {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public static bool IsSecurityEnabled {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static TransactionVote MyTransactionVote {

+			get { return myTransactionVote; }

+			set { myTransactionVote = value; }

+		}

+

+		public static Guid PartitionId {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public static object Transaction {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public static Guid TransactionId {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public static void DisableCommit ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static void EnableCommit ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static object GetNamedProperty ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static bool IsCallerInRole ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static void SetAbort ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static void SetComplete ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/DescriptionAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/DescriptionAttribute.cs
new file mode 100644
index 00000000000..11cb04b0196
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/DescriptionAttribute.cs
@@ -0,0 +1,31 @@
+// 

+// System.EnterpriseServices.DescriptionAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Interface)]

+	public sealed class DescriptionAttribute : Attribute {

+

+		#region Fields

+

+		string desc;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public DescriptionAttribute (string desc)

+		{

+			this.desc = desc;

+		}

+

+		#endregion // Constructors

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/EventClassAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/EventClassAttribute.cs
new file mode 100644
index 00000000000..b3d6f464721
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/EventClassAttribute.cs
@@ -0,0 +1,54 @@
+// 

+// System.EnterpriseServices.EventClassAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class EventClassAttribute : Attribute {

+

+		#region Fields

+

+		bool allowInProcSubscribers;

+		bool fireInParallel;

+		string publisherFilter;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public EventClassAttribute ()

+		{

+			allowInProcSubscribers = true;

+			fireInParallel = false;

+			publisherFilter = null;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool AllowInProcSubscribers {

+			get { return allowInProcSubscribers; }

+			set { allowInProcSubscribers = value; }

+		}

+

+		public bool FireInParallel {

+			get { return fireInParallel; }

+			set { fireInParallel = value; }

+		}

+

+		public string PublisherFilter {

+			get { return publisherFilter; }

+			set { publisherFilter = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/EventTrackingEnabledAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/EventTrackingEnabledAttribute.cs
new file mode 100644
index 00000000000..774d534afb9
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/EventTrackingEnabledAttribute.cs
@@ -0,0 +1,44 @@
+// 

+// System.EnterpriseServices.EventTrackingEnabledAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class EventTrackingEnabledAttribute : Attribute {

+

+		#region Fields

+

+		bool val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public EventTrackingEnabledAttribute ()

+		{

+			val = true;

+		}

+

+		public EventTrackingEnabledAttribute (bool val)

+		{

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool Value {

+			get { return val; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ExceptionClassAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ExceptionClassAttribute.cs
new file mode 100644
index 00000000000..fd128f38ce3
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ExceptionClassAttribute.cs
@@ -0,0 +1,39 @@
+// 

+// System.EnterpriseServices.ExceptionClassAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class ExceptionClassAttribute : Attribute {

+

+		#region Fields

+

+		string name;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public ExceptionClassAttribute (string name)

+		{

+			this.name = name;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string Value {

+			get { return name; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IISIntrinsicsAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IISIntrinsicsAttribute.cs
new file mode 100644
index 00000000000..37517855edd
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IISIntrinsicsAttribute.cs
@@ -0,0 +1,44 @@
+// 

+// System.EnterpriseServices.IISIntrinsicsAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class IISIntrinsicsAttribute : Attribute {

+

+		#region Fields

+

+		bool val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public IISIntrinsicsAttribute ()

+		{

+			val = true;

+		}

+

+		public IISIntrinsicsAttribute (bool val)

+		{

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool Value {

+			get { return val; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IRegistrationHelper.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IRegistrationHelper.cs
new file mode 100644
index 00000000000..cd8c014a9ba
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IRegistrationHelper.cs
@@ -0,0 +1,26 @@
+// 

+// System.EnterpriseServices.IRegistrationHelper.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	//[Guid ("")]

+	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]

+	public interface IRegistrationHelper {

+

+		#region Methods

+

+		void InstallAssembly (string assembly, out string application, out string tlb, InstallationFlags installFlags);

+		void UninstallAssembly (string assembly, string application);

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IRemoteDispatch.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IRemoteDispatch.cs
new file mode 100644
index 00000000000..663e8747c79
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IRemoteDispatch.cs
@@ -0,0 +1,27 @@
+// 

+// System.EnterpriseServices.IRemoteDispatch.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	//[Guid ("")]

+	public interface IRemoteDispatch {

+

+		#region Methods

+

+		[AutoComplete]

+		string RemoteDispatchAutoDone (string s);

+

+		[AutoComplete]

+		string RemoteDispatchNotAutoDone (string s);

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISecurityCallContext.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISecurityCallContext.cs
new file mode 100644
index 00000000000..0b5a419caf0
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISecurityCallContext.cs
@@ -0,0 +1,34 @@
+// 

+// System.EnterpriseServices.ISecurityCallContext.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Collections;

+

+namespace System.EnterpriseServices {

+	internal interface ISecurityCallContext {

+

+		#region Properties

+

+		int Count {

+			get;

+		}

+

+		#endregion

+

+		#region Methods

+

+		void GetEnumerator (ref IEnumerator enumerator);

+		object GetItem (string user);

+		bool IsCallerInRole (string role);

+		bool IsSecurityEnabled ();

+		bool IsUserInRole (ref object user, string role);

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISecurityCallersColl.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISecurityCallersColl.cs
new file mode 100644
index 00000000000..abea3422488
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISecurityCallersColl.cs
@@ -0,0 +1,31 @@
+// 

+// System.EnterpriseServices.ISecurityCallersColl.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Collections;

+

+namespace System.EnterpriseServices {

+	internal interface ISecurityCallersColl {

+

+		#region Properties

+

+		int Count {

+			get;

+		}

+

+		#endregion

+

+		#region Methods

+

+		void GetEnumerator (out IEnumerator enumerator);

+		ISecurityIdentityColl GetItem (int idx);

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISecurityIdentityColl.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISecurityIdentityColl.cs
new file mode 100644
index 00000000000..09b5974ab07
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISecurityIdentityColl.cs
@@ -0,0 +1,31 @@
+// 

+// System.EnterpriseServices.ISecurityIdentityColl.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Collections;

+

+namespace System.EnterpriseServices {

+	internal interface ISecurityIdentityColl {

+

+		#region Properties

+

+		int Count {

+			get;

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		void GetEnumerator (out IEnumerator enumerator);

+		SecurityIdentity GetItem (int idx);

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IServicedComponentInfo.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IServicedComponentInfo.cs
new file mode 100644
index 00000000000..cc23e4eb53a
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/IServicedComponentInfo.cs
@@ -0,0 +1,24 @@
+// 

+// System.EnterpriseServices.IServicedComponentInfo.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	//[Guid ("")]

+	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]

+	public interface IServicedComponentInfo {

+

+		#region Methods

+

+		void GetComponentInfo (ref int infoMask, out string[] infoArray);

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISharedProperty.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISharedProperty.cs
new file mode 100644
index 00000000000..ba5d3f03ca6
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISharedProperty.cs
@@ -0,0 +1,24 @@
+// 

+// System.EnterpriseServices.SharedProperty.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	internal interface ISharedProperty {

+

+		#region Properties

+

+		object Value {

+			get;

+			set;

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISharedPropertyGroup.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISharedPropertyGroup.cs
new file mode 100644
index 00000000000..ab8d4e4fb13
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ISharedPropertyGroup.cs
@@ -0,0 +1,24 @@
+// 

+// System.EnterpriseServices.ISharedPropertyGroup.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	internal interface ISharedPropertyGroup {

+

+		#region Methods 

+		

+		ISharedProperty CreateProperty (string name, out bool fExists);

+		ISharedProperty CreatePropertyByPosition (int position, out bool fExists);

+		ISharedProperty Property (string name);

+		ISharedProperty PropertyByPosition (int position);

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ITransaction.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ITransaction.cs
new file mode 100644
index 00000000000..34997509282
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ITransaction.cs
@@ -0,0 +1,26 @@
+// 

+// System.EnterpriseServices.ITransaction.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	//[Guid ("")]

+	[InterfaceType (ComInterfaceType.InterfaceIsIUnknown)]

+	public interface ITransaction {

+

+		#region Methods

+

+		void Abort (ref BOID pboidReason, int fRetaining, int fAsync);

+		void Commit (int fRetaining, int grfTC, int grfRM);

+		void GetTransactionInfo (out XACTTRANSINFO pinfo);

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ImpersonationLevelOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ImpersonationLevelOption.cs
new file mode 100644
index 00000000000..f9a06ddb4f6
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ImpersonationLevelOption.cs
@@ -0,0 +1,19 @@
+// 

+// System.EnterpriseServices.ImpersonationLevelOption.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public enum ImpersonationLevelOption {

+		Anonymous,

+		Default,

+		Delegate,

+		Identify,

+		Impersonate

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InstallationFlags.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InstallationFlags.cs
new file mode 100644
index 00000000000..bd11d1443f4
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InstallationFlags.cs
@@ -0,0 +1,25 @@
+// 

+// System.EnterpriseServices.InstallationFlags.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.EnterpriseServices {

+	[Flags]

+	[Serializable]

+	public enum InstallationFlags {

+		Configure,

+		ConfigureComponentsOnly,

+		CreateTargetApplication,

+		Default,

+		ExpectExistingTypeLib,

+		FindOrCreateTargetApplication,

+		Install,

+		ReconfigureExistingApplication,

+		Register,

+		ReportWarningsToConsole

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InterfaceQueuingAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InterfaceQueuingAttribute.cs
new file mode 100644
index 00000000000..d999c6ebd57
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/InterfaceQueuingAttribute.cs
@@ -0,0 +1,52 @@
+// 

+// System.EnterpriseServices.InterfaceQueuingAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Interface)]

+	public sealed class InterfaceQueuingAttribute : Attribute {

+

+		#region Fields

+

+		bool enabled;

+		string interfaceName;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public InterfaceQueuingAttribute () 

+			: this (true)

+		{

+		}

+

+		public InterfaceQueuingAttribute (bool enabled)

+		{

+			this.enabled = enabled;

+			interfaceName = null;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool Enabled {

+			get { return enabled; }

+			set { enabled = value; }

+		}

+

+		public string Interface {

+			get { return interfaceName; }

+			set { interfaceName = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/JustInTimeActivationAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/JustInTimeActivationAttribute.cs
new file mode 100644
index 00000000000..b5a991a23fb
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/JustInTimeActivationAttribute.cs
@@ -0,0 +1,44 @@
+// 

+// System.EnterpriseServices.JustInTimeActivationAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class JustInTimeActivationAttribute : Attribute {

+

+		#region Fields

+

+		bool val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public JustInTimeActivationAttribute () 

+			: this (true)

+		{

+		}

+

+		public JustInTimeActivationAttribute (bool val)

+		{

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool Value {

+			get { return val; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/LoadBalancingSupportedAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/LoadBalancingSupportedAttribute.cs
new file mode 100644
index 00000000000..1dfefc49d42
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/LoadBalancingSupportedAttribute.cs
@@ -0,0 +1,44 @@
+// 

+// System.EnterpriseServices.LoadBalancingSupportedAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class LoadBalancingSupportedAttribute : Attribute {

+

+		#region Fields

+

+		bool val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public LoadBalancingSupportedAttribute () 

+			: this (true)

+		{

+		}

+

+		public LoadBalancingSupportedAttribute (bool val)

+		{

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool Value {

+			get { return val; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/MustRunInClientContextAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/MustRunInClientContextAttribute.cs
new file mode 100644
index 00000000000..7d1bbdf8ecf
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/MustRunInClientContextAttribute.cs
@@ -0,0 +1,44 @@
+// 

+// System.EnterpriseServices.MustRunInClientContextAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class MustRunInClientContextAttribute : Attribute {

+

+		#region Fields

+

+		bool val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public MustRunInClientContextAttribute () 

+			: this (true)

+		{

+		}

+

+		public MustRunInClientContextAttribute (bool val)

+		{

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool Value {

+			get { return val; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ObjectPoolingAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ObjectPoolingAttribute.cs
new file mode 100644
index 00000000000..3d03f4f8b27
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ObjectPoolingAttribute.cs
@@ -0,0 +1,98 @@
+// 

+// System.EnterpriseServices.ObjectPoolingAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Collections;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class ObjectPoolingAttribute : Attribute {

+

+		#region Fields

+

+		int creationTimeout;

+		bool enabled;

+		int minPoolSize;

+		int maxPoolSize;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public ObjectPoolingAttribute () 

+			: this (true)

+		{

+		}

+

+		public ObjectPoolingAttribute (bool enable)

+		{

+			this.enabled = enable;

+		}

+

+		public ObjectPoolingAttribute (int minPoolSize, int maxPoolSize)

+			: this (true, minPoolSize, maxPoolSize)

+		{

+		}

+

+		public ObjectPoolingAttribute (bool enable, int minPoolSize, int maxPoolSize)

+		{

+			this.enabled = enable;

+			this.minPoolSize = minPoolSize;

+			this.maxPoolSize = maxPoolSize;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public int CreationTimeout {

+			get { return creationTimeout; }

+			set { creationTimeout = value; }

+		}

+

+		public bool Enabled {

+			get { return enabled; }

+			set { enabled = value; }

+		}

+

+		public int MaxPoolSize {

+			get { return maxPoolSize; }

+			set { maxPoolSize = value; }

+		}

+

+		public int MinPoolSize {

+			get { return minPoolSize; }

+			set { minPoolSize = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods 

+

+		[MonoTODO]

+		public bool AfterSaveChanges (Hashtable info)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool Apply (Hashtable info)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool IsValidTarget (string s)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PrivateComponentAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PrivateComponentAttribute.cs
new file mode 100644
index 00000000000..75b455239a9
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PrivateComponentAttribute.cs
@@ -0,0 +1,24 @@
+// 

+// System.EnterpriseServices.PrivateComponentAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class PrivateComponentAttribute : Attribute {

+

+		#region Constructors

+

+		public PrivateComponentAttribute () 

+		{

+		}

+

+		#endregion // Constructors

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PropertyLockMode.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PropertyLockMode.cs
new file mode 100644
index 00000000000..d84f25bb642
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PropertyLockMode.cs
@@ -0,0 +1,20 @@
+// 

+// System.EnterpriseServices.PropertyLockMode.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	[ComVisible (false)]

+	public enum PropertyLockMode {

+		Method,

+		SetGet

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PropertyReleaseMode.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PropertyReleaseMode.cs
new file mode 100644
index 00000000000..23da41d9f62
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/PropertyReleaseMode.cs
@@ -0,0 +1,20 @@
+// 

+// System.EnterpriseServices.PropertyReleaseMode.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	[ComVisible (false)]

+	public enum PropertyReleaseMode {

+		Process,

+		Standard

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationErrorInfo.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationErrorInfo.cs
new file mode 100644
index 00000000000..583ae677431
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationErrorInfo.cs
@@ -0,0 +1,63 @@
+// 

+// System.EnterpriseServices.RegistrationErrorInfo.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public sealed class RegistrationErrorInfo {

+

+		#region Fields

+

+		int errorCode;

+		string errorString;

+		string majorRef;

+		string minorRef;

+		string name;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public RegistrationErrorInfo (string name, string majorRef, string minorRef, int errorCode) 

+		{

+			this.name = name;

+			this.majorRef = majorRef;

+			this.minorRef = minorRef;

+			this.errorCode = errorCode;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public int ErrorCode {

+			get { return errorCode; }

+		}

+

+		public string ErrorString {

+			get { return errorString; }

+		}

+

+		public string MajorRef {

+			get { return majorRef; }

+		}

+

+		public string MinorRef {

+			get { return minorRef; }

+		}

+

+		public string Name {

+			get { return name; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationException.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationException.cs
new file mode 100644
index 00000000000..41518811686
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationException.cs
@@ -0,0 +1,51 @@
+// 

+// System.EnterpriseServices.RegistrationException.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.Serialization;

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public sealed class RegistrationException : SystemException {

+

+		#region Fields

+

+		RegistrationErrorInfo[] errorInfo;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public RegistrationException (string msg)

+			: base (msg)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+			

+		public RegistrationErrorInfo[] ErrorInfo {

+			get { return errorInfo; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public override void GetObjectData (SerializationInfo info, StreamingContext ctx)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelper.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelper.cs
new file mode 100644
index 00000000000..79d0db9b386
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelper.cs
@@ -0,0 +1,54 @@
+// 

+// System.EnterpriseServices.RegistrationHelper.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	//[Guid ("")]

+	public sealed class RegistrationHelper : MarshalByRefObject, IRegistrationHelper {

+

+		#region Constructors

+

+		public RegistrationHelper ()

+		{

+		}

+

+		#endregion

+

+		#region Methods

+

+		public void InstallAssembly (string assembly, out string application, out string tlb, InstallationFlags installFlags)

+		{

+			application = String.Empty;

+			tlb = String.Empty;

+

+			InstallAssembly (assembly, ref application, null, ref tlb, installFlags);

+		}

+

+		[MonoTODO]

+		public void InstallAssembly (string assembly, ref string application, string partition, ref string tlb, InstallationFlags installFlags)

+		{

+			throw new NotImplementedException ();

+		}

+

+		public void UninstallAssembly (string assembly, string application)

+		{

+			UninstallAssembly (assembly, application, null);

+		}

+

+		[MonoTODO]

+		public void UninstallAssembly (string assembly, string application, string partition)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelperTx.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelperTx.cs
new file mode 100644
index 00000000000..a8ac859edca
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/RegistrationHelperTx.cs
@@ -0,0 +1,69 @@
+// 

+// System.EnterpriseServices.RegistrationHelperTx.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	public sealed class RegistrationHelperTx : ServicedComponent {

+

+		#region Constructors

+

+		[MonoTODO]

+		public RegistrationHelperTx ()

+		{

+		}

+

+		#endregion

+

+		#region Methods

+

+		[MonoTODO]

+		protected internal override void Activate ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected internal override void Deactivate ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		public void InstallAssembly (string assembly, ref string application, ref string tlb, InstallationFlags installFlags, object sync)

+		{

+			InstallAssembly (assembly, ref application, null, ref tlb, installFlags, sync);

+		}

+

+		[MonoTODO]

+		public void InstallAssembly (string assembly, ref string application, string partition, ref string tlb, InstallationFlags installFlags, object sync)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool IsInTransaction ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		public void UninstallAssembly (string assembly, string application, object sync)

+		{

+			UninstallAssembly (assembly, application, null, sync);

+		}

+

+		[MonoTODO]

+		public void UninstallAssembly (string assembly, string application, string partition, object sync)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ResourcePool.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ResourcePool.cs
new file mode 100644
index 00000000000..63e9666ca70
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ResourcePool.cs
@@ -0,0 +1,54 @@
+// 

+// System.EnterpriseServices.ResourcePool.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	public sealed class ResourcePool {

+

+		#region Fields

+

+		ResourcePool.TransactionEndDelegate cb;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public ResourcePool (ResourcePool.TransactionEndDelegate cb)

+		{

+			this.cb = cb;

+		}

+

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public object GetResource ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool PutResource (object resource)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+

+		#region Delegates

+

+		public delegate void TransactionEndDelegate (object resource);

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecureMethodAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecureMethodAttribute.cs
new file mode 100644
index 00000000000..5d27bd16c5d
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecureMethodAttribute.cs
@@ -0,0 +1,24 @@
+// 

+// System.EnterpriseServices.SecureMethodAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method)]

+	public sealed class SecureMethodAttribute : Attribute {

+

+		#region Constructors

+

+		public SecureMethodAttribute ()

+		{

+		}

+

+		#endregion // Constructors

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityCallContext.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityCallContext.cs
new file mode 100644
index 00000000000..10d116a7616
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityCallContext.cs
@@ -0,0 +1,86 @@
+// 

+// System.EnterpriseServices.SecurityCallContext.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	public sealed class SecurityCallContext {

+

+		#region Fields

+

+		#endregion // Fields

+

+		#region Constructors

+

+		internal SecurityCallContext ()

+		{

+		}

+

+		internal SecurityCallContext (ISecurityCallContext context)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public SecurityCallers Callers {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public static SecurityCallContext CurrentCall {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public SecurityIdentity DirectCaller {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public bool IsSecurityEnabled {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public int MinAuthenticationLevel {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public int NumCallers {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public SecurityIdentity OriginalCaller {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public bool IsCallerInRole (string role)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool IsUserInRole (string user, string role)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityCallers.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityCallers.cs
new file mode 100644
index 00000000000..ba6f8c7bb53
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityCallers.cs
@@ -0,0 +1,52 @@
+// 

+// System.EnterpriseServices.SecurityCallers.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Collections;

+

+namespace System.EnterpriseServices {

+	public sealed class SecurityCallers : IEnumerable {

+

+		#region Constructors

+

+		internal SecurityCallers ()

+		{

+		}

+

+		internal SecurityCallers (ISecurityCallersColl collection)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public int Count {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public SecurityIdentity this [int idx] {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public IEnumerator GetEnumerator ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityIdentity.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityIdentity.cs
new file mode 100644
index 00000000000..81fab4afec1
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityIdentity.cs
@@ -0,0 +1,54 @@
+// 

+// System.EnterpriseServices.SecurityIdentity.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Collections;

+

+namespace System.EnterpriseServices {

+	public sealed class SecurityIdentity {

+

+		#region Constructors

+

+		[MonoTODO]

+		internal SecurityIdentity ()

+		{

+		}

+

+		[MonoTODO]

+		internal SecurityIdentity (ISecurityIdentityColl collection)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string AccountName {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public AuthenticationOption AuthenticationLevel {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public int AuthenticationService {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public ImpersonationLevelOption ImpersonationLevel {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityRoleAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityRoleAttribute.cs
new file mode 100644
index 00000000000..4a28fd021df
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SecurityRoleAttribute.cs
@@ -0,0 +1,59 @@
+// 

+// System.EnterpriseServices.SecurityRoleAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Method | AttributeTargets.Interface)]

+	public sealed class SecurityRoleAttribute : Attribute {

+

+		#region Fields

+

+		string description;

+		bool everyone;

+		string role;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public SecurityRoleAttribute (string role)

+			: this (role, false)

+		{

+		}

+

+		public SecurityRoleAttribute (string role, bool everyone)

+		{

+			this.description = String.Empty;

+			this.everyone = everyone;

+			this.role = role;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string Description {

+			get { return description; }

+			set { description = value; }

+		}

+

+		public string Role {

+			get { return role; }

+			set { role = value; }

+		}

+

+		public bool SetEveryoneAccess {

+			get { return everyone; }

+			set { everyone = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServicedComponent.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServicedComponent.cs
new file mode 100644
index 00000000000..558e343207b
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServicedComponent.cs
@@ -0,0 +1,88 @@
+// 

+// System.EnterpriseServices.ServicedComponent.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public abstract class ServicedComponent : ContextBoundObject, IDisposable, IRemoteDispatch, IServicedComponentInfo {

+

+		#region Constructors

+

+		public ServicedComponent ()

+		{

+		}

+

+		#endregion

+

+		#region Methods

+

+		[MonoTODO]

+		protected internal virtual void Activate ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected internal virtual bool CanBePooled ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected internal virtual void Construct (string s)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected internal virtual void Deactivate ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Dispose ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void Dispose (bool disposing)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static void DisposeObject (ServicedComponent sc)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		string IRemoteDispatch.RemoteDispatchAutoDone (string s)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		string IRemoteDispatch.RemoteDispatchNotAutoDone (string s)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IServicedComponentInfo.GetComponentInfo (ref int infoMask, out string[] infoArray)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServicedComponentException.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServicedComponentException.cs
new file mode 100644
index 00000000000..582be988add
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/ServicedComponentException.cs
@@ -0,0 +1,35 @@
+// 

+// System.EnterpriseServices.ServicedComponentException.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public sealed class ServicedComponentException : SystemException {

+

+		#region Constructors

+

+		public ServicedComponentException ()

+			: base ()

+		{

+		}

+

+		public ServicedComponentException (string message)

+			: base (message)

+		{

+		}

+

+		public ServicedComponentException (string message, Exception innerException)

+			: base (message, innerException)

+		{

+		}

+

+		#endregion // Constructors

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SharedProperty.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SharedProperty.cs
new file mode 100644
index 00000000000..502e3bcefd2
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SharedProperty.cs
@@ -0,0 +1,41 @@
+// 

+// System.EnterpriseServices.SharedProperty.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	[ComVisible (false)]

+	public sealed class SharedProperty {

+

+		#region Fields

+

+		ISharedProperty property;

+

+		#endregion

+

+		#region Constructors

+

+		internal SharedProperty (ISharedProperty property)

+		{

+			this.property = property;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public object Value {

+			get { return property.Value; }

+			set { property.Value = value; }

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SharedPropertyGroup.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SharedPropertyGroup.cs
new file mode 100644
index 00000000000..18b15e69731
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SharedPropertyGroup.cs
@@ -0,0 +1,56 @@
+// 

+// System.EnterpriseServices.SharedPropertyGroup.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	[ComVisible (false)]

+	public sealed class SharedPropertyGroup {

+

+		#region Fields

+

+		ISharedPropertyGroup propertyGroup;

+

+		#endregion

+

+		#region Constructors

+

+		internal SharedPropertyGroup (ISharedPropertyGroup propertyGroup)

+		{

+			this.propertyGroup = propertyGroup;

+		}

+

+		#endregion // Constructors

+

+		#region Methods

+

+		public SharedProperty CreateProperty (string name, out bool fExists)

+		{

+			return new SharedProperty (propertyGroup.CreateProperty (name, out fExists));

+		}

+

+		public SharedProperty CreatePropertyByPosition (int position, out bool fExists)

+		{

+			return new SharedProperty (propertyGroup.CreatePropertyByPosition (position, out fExists));

+		}

+

+		public SharedProperty Property (string name)

+		{

+			return new SharedProperty (propertyGroup.Property (name));

+		}

+

+		public SharedProperty PropertyByPosition (int position)

+		{

+			return new SharedProperty (propertyGroup.PropertyByPosition (position));

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SharedPropertyGroupManager.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SharedPropertyGroupManager.cs
new file mode 100644
index 00000000000..1125b64846a
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SharedPropertyGroupManager.cs
@@ -0,0 +1,48 @@
+// 

+// System.EnterpriseServices.SharedPropertyGroupManager.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Collections;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	[ComVisible (false)]

+	public sealed class SharedPropertyGroupManager : IEnumerable {

+

+		#region Constructors

+

+		public SharedPropertyGroupManager ()

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public SharedPropertyGroup CreatePropertyGroup (string name, ref PropertyLockMode dwIsoMode, ref PropertyReleaseMode dwRelMode, out bool fExist)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public IEnumerator GetEnumerator ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SharedPropertyGroup Group (string name)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SynchronizationAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SynchronizationAttribute.cs
new file mode 100644
index 00000000000..2add45b81b5
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SynchronizationAttribute.cs
@@ -0,0 +1,44 @@
+// 

+// System.EnterpriseServices.SynchronizationAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class SynchronizationAttribute : Attribute {

+

+		#region Fields

+

+		SynchronizationOption val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public SynchronizationAttribute ()

+			: this (SynchronizationOption.Required)

+		{

+		}

+

+		public SynchronizationAttribute (SynchronizationOption val)

+		{

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public SynchronizationOption Value {

+			get { return val; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SynchronizationOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SynchronizationOption.cs
new file mode 100644
index 00000000000..2186e63875b
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/SynchronizationOption.cs
@@ -0,0 +1,21 @@
+// 

+// System.EnterpriseServices.SynchronizationOption.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public enum SynchronizationOption {

+		Disabled,

+		NotSupported,

+		Required,

+		RequiresNew,

+		Supported

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TODOAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TODOAttribute.cs
new file mode 100755
index 00000000000..d134ddcff7c
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TODOAttribute.cs
@@ -0,0 +1,37 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.EnterpriseServices {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All, AllowMultiple=true)]
+	public class MonoTODOAttribute : Attribute {
+
+		private string comment;
+		
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+
+		public string Comment
+		{
+			get { return comment; }
+		}
+	}
+}
diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionAttribute.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionAttribute.cs
new file mode 100644
index 00000000000..d308b1fa839
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionAttribute.cs
@@ -0,0 +1,58 @@
+// 

+// System.EnterpriseServices.TransactionAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class TransactionAttribute : Attribute {

+

+		#region Fields

+

+		TransactionIsolationLevel isolation;

+		int timeout;

+		TransactionOption val;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public TransactionAttribute ()

+			: this (TransactionOption.Required)

+		{

+		}

+

+		public TransactionAttribute (TransactionOption val)

+		{

+			this.isolation = TransactionIsolationLevel.Serializable;

+			this.timeout = -1;

+			this.val = val;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public TransactionIsolationLevel Isolation {

+			get { return isolation; }

+			set { isolation = value; }

+		}

+

+		public int Timeout {

+			get { return timeout; }

+			set { timeout = value; }

+		}

+

+		public TransactionOption Value {

+			get { return val; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionIsolationLevel.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionIsolationLevel.cs
new file mode 100644
index 00000000000..d350b4e1951
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionIsolationLevel.cs
@@ -0,0 +1,19 @@
+// 

+// System.EnterpriseServices.TransactionIsolationLevel.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public enum TransactionIsolationLevel {

+		Any,

+		ReadCommitted,

+		ReadUncommitted,

+		RepeatableRead,

+		Serializable

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionOption.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionOption.cs
new file mode 100644
index 00000000000..96e104f5fe4
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionOption.cs
@@ -0,0 +1,19 @@
+// 

+// System.EnterpriseServices.TransactionOption.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	public enum TransactionOption {

+		Disabled,

+		NotSupported,

+		Required,

+		RequiresNew,

+		Supported 

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionVote.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionVote.cs
new file mode 100644
index 00000000000..4811fdcd850
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/TransactionVote.cs
@@ -0,0 +1,20 @@
+// 

+// System.EnterpriseServices.TransactionVote.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.EnterpriseServices {

+	[Serializable]

+	[ComVisible (false)]

+	public enum TransactionVote {

+		Abort,

+		Commit

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/System.EnterpriseServices/XACTTRANSINFO.cs b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/XACTTRANSINFO.cs
new file mode 100644
index 00000000000..e0a520b9ebc
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/System.EnterpriseServices/XACTTRANSINFO.cs
@@ -0,0 +1,27 @@
+// 

+// System.EnterpriseServices.XACTTRANSINFO.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.EnterpriseServices {

+	public struct XACTTRANSINFO {

+

+		#region Fields

+

+		public int grfRMSupported;

+		public int grfRMSupportedRetaining;

+		public int grfTCSupported;

+		public int grfTCSupportedRetaining;

+		public int isoFlags;

+		public int isoLevel;

+		public BOID uow;

+

+		#endregion // Fields

+	}

+}

diff --git a/mcs/class/System.EnterpriseServices/list b/mcs/class/System.EnterpriseServices/list
new file mode 100644
index 00000000000..53d2feee847
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/list
@@ -0,0 +1,68 @@
+./System.EnterpriseServices/AccessChecksLevelOption.cs
+./System.EnterpriseServices/ActivationOption.cs
+./System.EnterpriseServices/ApplicationAccessControlAttribute.cs
+./System.EnterpriseServices/ApplicationActivationAttribute.cs
+./System.EnterpriseServices/ApplicationIDAttribute.cs
+./System.EnterpriseServices/ApplicationNameAttribute.cs
+./System.EnterpriseServices/ApplicationQueuingAttribute.cs
+./System.EnterpriseServices/AuthenticationOption.cs
+./System.EnterpriseServices/AutoCompleteAttribute.cs
+./System.EnterpriseServices/BOID.cs
+./System.EnterpriseServices/BYOT.cs
+./System.EnterpriseServices/COMTIIntrinsicsAttribute.cs
+./System.EnterpriseServices/ComponentAccessControlAttribute.cs
+./System.EnterpriseServices/ConstructionEnabledAttribute.cs
+./System.EnterpriseServices/ContextUtil.cs
+./System.EnterpriseServices/DescriptionAttribute.cs
+./System.EnterpriseServices/EventClassAttribute.cs
+./System.EnterpriseServices/EventTrackingEnabledAttribute.cs
+./System.EnterpriseServices/ExceptionClassAttribute.cs
+./System.EnterpriseServices/IISIntrinsicsAttribute.cs
+./System.EnterpriseServices/ImpersonationLevelOption.cs
+./System.EnterpriseServices/InstallationFlags.cs
+./System.EnterpriseServices/InterfaceQueuingAttribute.cs
+./System.EnterpriseServices/IRegistrationHelper.cs
+./System.EnterpriseServices/IRemoteDispatch.cs
+./System.EnterpriseServices/ISecurityCallContext.cs
+./System.EnterpriseServices/ISecurityCallersColl.cs
+./System.EnterpriseServices/ISecurityIdentityColl.cs
+./System.EnterpriseServices/IServicedComponentInfo.cs
+./System.EnterpriseServices/ISharedProperty.cs
+./System.EnterpriseServices/ISharedPropertyGroup.cs
+./System.EnterpriseServices/ITransaction.cs
+./System.EnterpriseServices/JustInTimeActivationAttribute.cs
+./System.EnterpriseServices/LoadBalancingSupportedAttribute.cs
+./System.EnterpriseServices/MustRunInClientContextAttribute.cs
+./System.EnterpriseServices/ObjectPoolingAttribute.cs
+./System.EnterpriseServices/PrivateComponentAttribute.cs
+./System.EnterpriseServices/PropertyLockMode.cs
+./System.EnterpriseServices/PropertyReleaseMode.cs
+./System.EnterpriseServices/RegistrationErrorInfo.cs
+./System.EnterpriseServices/RegistrationException.cs
+./System.EnterpriseServices/RegistrationHelper.cs
+./System.EnterpriseServices/RegistrationHelperTx.cs
+./System.EnterpriseServices/ResourcePool.cs
+./System.EnterpriseServices/SecureMethodAttribute.cs
+./System.EnterpriseServices/SecurityCallContext.cs
+./System.EnterpriseServices/SecurityCallers.cs
+./System.EnterpriseServices/SecurityIdentity.cs
+./System.EnterpriseServices/SecurityRoleAttribute.cs
+./System.EnterpriseServices/ServicedComponent.cs
+./System.EnterpriseServices/ServicedComponentException.cs
+./System.EnterpriseServices/SharedProperty.cs
+./System.EnterpriseServices/SharedPropertyGroup.cs
+./System.EnterpriseServices/SharedPropertyGroupManager.cs
+./System.EnterpriseServices/SynchronizationAttribute.cs
+./System.EnterpriseServices/SynchronizationOption.cs
+./System.EnterpriseServices/TODOAttribute.cs
+./System.EnterpriseServices/TransactionAttribute.cs
+./System.EnterpriseServices/TransactionIsolationLevel.cs
+./System.EnterpriseServices/TransactionOption.cs
+./System.EnterpriseServices/TransactionVote.cs
+./System.EnterpriseServices/XACTTRANSINFO.cs
+./System.EnterpriseServices.CompensatingResourceManager/Clerk.cs
+./System.EnterpriseServices.CompensatingResourceManager/Compensator.cs
+./System.EnterpriseServices.CompensatingResourceManager/CompensatorOptions.cs
+./System.EnterpriseServices.CompensatingResourceManager/LogRecord.cs
+./System.EnterpriseServices.CompensatingResourceManager/LogRecordFlags.cs
+./System.EnterpriseServices.CompensatingResourceManager/TransactionState.cs
diff --git a/mcs/class/System.EnterpriseServices/makefile.gnu b/mcs/class/System.EnterpriseServices/makefile.gnu
new file mode 100644
index 00000000000..8a87d3baa00
--- /dev/null
+++ b/mcs/class/System.EnterpriseServices/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../..
+
+LIBRARY = ../lib/System.EnterpriseServices.dll
+
+LIB_LIST = list
+LIB_FLAGS = -r corlib 
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=./Test*
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/System.Runtime.Remoting/ChangeLog b/mcs/class/System.Runtime.Remoting/ChangeLog
new file mode 100644
index 00000000000..90c32eb2c33
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/ChangeLog
@@ -0,0 +1,3 @@
+2002-08-14  Rodrigo Moya <rodrigo@ximian.com>
+
+	* TcpChannel.cs: new classes.
\ No newline at end of file
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs
new file mode 100644
index 00000000000..e360daf41b4
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs
@@ -0,0 +1,93 @@
+//
+// System.Runtime.Remoting.Channels.Tcp.TcpChannel.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels.Tcp
+{
+	public class TcpChannel : IChannelReceiver, IChannel,
+		IChannelSender
+	{
+		private int tcp_port;
+		
+		public TcpChannel ()
+	        {
+			tcp_port = 0;
+		}
+
+		public TcpChannel (int port)
+		{
+			tcp_port = port;
+		}
+
+		[MonoTODO]
+		public TcpChannel (IDictionary properties,
+				   IClientChannelSinkProvider clientSinkProvider,
+				   IServerChannelSinkProvider serverSinkProvider)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public object ChannelData
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public string ChannelName
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public int ChannelPriority
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public IMessageSink CreateMessageSink (string url,
+						       object remoteChannelData,
+						       out string objectURI)
+	        {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string[] GetUrlsForUri (string objectURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string Parse (string url, out string objectURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void StartListening (object data)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void StopListening (object data)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs
new file mode 100644
index 00000000000..de849894d4d
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs
@@ -0,0 +1,180 @@
+//
+// System.Runtime.Remoting.Channels.Tcp.TcpClientChannel.cs
+//
+// Author: Dietmar Maurer (dietmar@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+using System.Runtime.Remoting.Channels;
+using System.Text.RegularExpressions;
+
+namespace System.Runtime.Remoting.Channels.Tcp
+{
+
+	public class TcpClientTransportSink : IClientChannelSink
+	{
+
+		public TcpClientTransportSink (string url)
+		{
+
+		}
+
+		public IDictionary Properties
+		{
+			get {
+				return null;
+			}
+		}
+
+		public IClientChannelSink NextChannelSink
+		{
+			get {
+				// we are the last one
+				return null;
+			}
+		}
+
+		public void AsyncProcessRequest (IClientChannelSinkStack sinkStack, IMessage msg,
+						 ITransportHeaders headers, Stream stream)
+		{
+			throw new NotImplementedException ();			
+		}
+
+		public void AsyncProcessResponse (IClientResponseChannelSinkStack sinkStack,
+						  object state, ITransportHeaders headers,
+						  Stream stream)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public Stream GetRequestStream (IMessage msg, ITransportHeaders headers)
+		{
+			// no acces to stream?
+			return null;
+		}
+		
+		public void ProcessMessage (IMessage msg,
+					    ITransportHeaders requestHeaders,
+					    Stream requestStream,
+					    out ITransportHeaders responseHeaders,
+					    out Stream responseStream)
+		{
+			throw new NotImplementedException ();
+		}
+			
+	}
+	
+	public class TcpClientTransportSinkProvider : IClientChannelSinkProvider
+	{
+		public TcpClientTransportSinkProvider ()
+		{
+			// what should we do here ?
+		}
+
+		public IClientChannelSinkProvider Next
+		{
+			get {
+				return null;
+			}
+
+			set {
+				// ignore, we are always the last in the chain 
+			}
+		}
+
+		public IClientChannelSink CreateSink (IChannelSender channel, string url,
+						      object remoteChannelData)
+		{
+			return new TcpClientTransportSink (url);
+		}
+	}
+
+	public class TcpClientChannel : IChannelSender, IChannel
+	{
+		int priority = 1;					
+		string name = "tcp";
+		IClientChannelSinkProvider sink_provider;
+		
+		public TcpClientChannel ()
+	        {
+			sink_provider = new BinaryClientFormatterSinkProvider ();
+			sink_provider.Next = new TcpClientTransportSinkProvider ();
+		}
+
+		public TcpClientChannel (IDictionary properties, IClientChannelSinkProvider sinkProvider)
+		{
+			priority = 1;
+			sink_provider = sinkProvider;
+
+			// add the tcp provider at the end of the chain
+			IClientChannelSinkProvider prov = sinkProvider;
+			while (prov.Next != null) prov = prov.Next;
+			prov.Next = new TcpClientTransportSinkProvider ();
+		}
+
+		public TcpClientChannel (string name, IClientChannelSinkProvider sinkProvider)
+		{
+			priority = 1;		
+			this.name = name;
+			sink_provider = sinkProvider;
+
+			// add the tcp provider at the end of the chain
+			IClientChannelSinkProvider prov = sinkProvider;
+			while (prov.Next != null) prov = prov.Next;
+			prov.Next = new TcpClientTransportSinkProvider ();
+		}
+		
+		public string ChannelName
+		{
+			get {
+				return name;
+			}
+		}
+
+		public int ChannelPriority
+		{
+			get {
+				return priority;
+			}
+		}
+
+		public IMessageSink CreateMessageSink (string url,
+						       object remoteChannelData,
+						       out string objectURI)
+	        {
+			if (url == null && remoteChannelData != null) {
+				IChannelDataStore ds = remoteChannelData as IChannelDataStore;
+				if (ds != null)
+					url = ds.ChannelUris [0];
+			}
+			
+			if (Parse (url, out objectURI) == null)
+				return null;
+
+			return (IMessageSink) sink_provider.CreateSink (this, url, remoteChannelData);
+		}
+
+		public string Parse (string url, out string objectURI)
+		{
+			// format: "tcp://host:port/path/to/object"
+			
+			objectURI = null;
+			
+			Match m = Regex.Match (url, "tcp://([^:]+):([0-9]+)(/.*)");
+
+			if (!m.Success)
+				return null;
+			
+			string host = m.Groups[1].Value;
+			string port = m.Groups[2].Value;
+			objectURI = m.Groups[3].Value;
+			
+			return "tcp://" + host + ":" + port;
+		}
+
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSink.cs
new file mode 100644
index 00000000000..a01bb35d14d
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSink.cs
@@ -0,0 +1,115 @@
+//
+// System.Runtime.Remoting.Channels.BinaryClientFormatterSink.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//         Dietmar Maurer (dietmar@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+using System.Runtime.Serialization.Formatters.Binary;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class BinaryClientFormatterSink : IClientFormatterSink,
+		IMessageSink, IClientChannelSink, IChannelSinkBase
+	{
+		IClientChannelSink nextInChain;
+		IRemotingFormatter formatter = new BinaryFormatter ();
+		
+		public BinaryClientFormatterSink (IClientChannelSink nextSink)
+		{
+			nextInChain = nextSink;
+		}
+
+		public IClientChannelSink NextChannelSink
+		{
+			get {
+				return nextInChain;
+			}
+		}
+
+		public IMessageSink NextSink
+		{
+			get {
+				return (IMessageSink) nextInChain;
+			}
+		}
+
+		public IDictionary Properties
+		{
+			get {
+				return null;
+			}
+		}
+
+		[MonoTODO]
+		public IMessageCtrl AsyncProcessMessage (IMessage msg,
+							 IMessageSink replySink)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void AsyncProcessRequest (IClientChannelSinkStack sinkStack,
+						 IMessage msg,
+						 ITransportHeaders headers,
+						 Stream stream)
+	        {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void AsyncProcessResponse (IClientResponseChannelSinkStack sinkStack,
+						  object state,
+						  ITransportHeaders headers,
+						  Stream stream)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public Stream GetRequestStream (IMessage msg,
+						ITransportHeaders headers)
+		{
+			return null;
+		}
+
+		public void ProcessMessage (IMessage msg,
+					    ITransportHeaders requestHeaders,
+					    Stream requestStream,
+					    out ITransportHeaders responseHeaders,
+					    out Stream responseStream)
+		{
+			nextInChain.ProcessMessage (msg, requestHeaders, requestStream,
+						    out responseHeaders, out responseStream);
+		}
+
+		[MonoTODO]
+		public IMessage SyncProcessMessage (IMessage msg)
+		{
+			ITransportHeaders response_headers;
+			Stream response_stream;
+			
+			// fixme: use nextInChain.GetRequestStream() ??
+			//Stream out_stream = new MemoryStream ();
+			Stream out_stream = File.Open ("test.bin", FileMode.Create);
+			
+			// serialize msg to the stream
+			formatter.Serialize (out_stream, msg, null);
+			//formatter.Serialize (out_stream, new Exception ("TEST"), null);
+			
+			out_stream.Close ();
+			throw new NotImplementedException ();
+			
+			ProcessMessage (msg, null, out_stream, out response_headers, out response_stream);
+
+			// deserialize response_stream
+			IMessage result = (IMessage) formatter.Deserialize (response_stream, null);
+
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs
new file mode 100644
index 00000000000..2c2e5e0395e
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs
@@ -0,0 +1,56 @@
+//
+// System.Runtime.Remoting.Channels.BinaryClientFormatterSinkProvider.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class BinaryClientFormatterSinkProvider :
+		IClientFormatterSinkProvider, IClientChannelSinkProvider
+	{
+		IClientChannelSinkProvider next = null;
+
+		// this is not used at the moment ??
+		IDictionary properties;
+		
+		public BinaryClientFormatterSinkProvider ()
+		{
+			properties = new Hashtable ();
+		}
+
+		public BinaryClientFormatterSinkProvider (IDictionary properties,
+							  ICollection providerData)
+	        {
+			this.properties = properties;
+			// fixme: what shall we do with providerData?
+		}
+
+		public IClientChannelSinkProvider Next
+		{
+			get {
+				return next;
+			}
+			
+			set {
+				next = value;
+			}
+		}
+
+		public IClientChannelSink CreateSink (IChannelSender channel,
+						      string url,
+						      object remoteChannelData)
+		{
+			IClientChannelSink next_sink = null;
+
+			if (next != null)
+				next_sink = next.CreateSink (channel, url, remoteChannelData);
+			
+			return new BinaryClientFormatterSink (next_sink);
+		}		
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSink.cs
new file mode 100644
index 00000000000..18190aff71e
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSink.cs
@@ -0,0 +1,69 @@
+//
+// System.Runtime.Remoting.Channels.BinaryServerFormatterSink.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public class BinaryServerFormatterSink : IServerChannelSink, IChannelSinkBase
+	{
+		IServerChannelSink next_sink;
+		
+		[MonoTODO]
+		public BinaryServerFormatterSink (BinaryServerFormatterSink.Protocol protocol,
+						  IServerChannelSink nextSink,
+						  IChannelReceiver receiver)
+		{
+			this.next_sink = nextSink;
+		}
+
+		public IServerChannelSink NextChannelSink {
+			get {
+				return next_sink;
+			}
+		}
+
+		[MonoTODO]
+		public IDictionary Properties {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public void AsyncProcessResponse (IServerResponseChannelSinkStack sinkStack, object state,
+						  IMessage msg, ITransportHeaders headers, Stream stream)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Stream GetResponseStream (IServerResponseChannelSinkStack sinkStack, object state,
+						IMessage msg, ITransportHeaders headers)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public ServerProcessing ProcessMessage (IServerChannelSinkStack sinkStack,
+							IMessage requestMsg, ITransportHeaders requestHeaders, Stream requestStream,
+							out IMessage responseMsg, out ITransportHeaders responseHeaders, out Stream responseStream)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[Serializable]
+		public enum Protocol
+		{
+			Http = 0,
+			Other = 1,
+		}
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs
new file mode 100644
index 00000000000..a4c2c24c80a
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs
@@ -0,0 +1,53 @@
+//
+// System.Runtime.Remoting.Channels.BinaryServerFormatterSinkProvider.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class BinaryServerFormatterSinkProvider :
+		IServerFormatterSinkProvider, IServerChannelSinkProvider
+	{
+		[MonoTODO]
+		public BinaryServerFormatterSinkProvider ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public BinaryServerFormatterSinkProvider (IDictionary properties,
+							  ICollection providerData)
+	        {
+			throw new NotImplementedException ();
+		}
+
+		public IServerChannelSinkProvider Next
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public IServerChannelSink CreateSink (IChannelReceiver channel)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void GetChannelData (IChannelDataStore channelData)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/ChangeLog
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/CommonTransportKeys.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/CommonTransportKeys.cs
new file mode 100644
index 00000000000..efb66588f22
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/CommonTransportKeys.cs
@@ -0,0 +1,21 @@
+//
+// System.Runtime.Remoting.Channels.CommonTransportKeys.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class CommonTransportKeys
+	{
+		public const string ConnectionId = "";
+		public const string IPAddress = "";
+		public const string RequestUri = "";
+		
+		public CommonTransportKeys ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapClientFormatterSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapClientFormatterSink.cs
new file mode 100644
index 00000000000..b0a2cb80f9e
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapClientFormatterSink.cs
@@ -0,0 +1,96 @@
+//
+// System.Runtime.Remoting.Channels.SoapClientFormatterSink.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class SoapClientFormatterSink : IClientFormatterSink,
+		IMessageSink, IClientChannelSink, IChannelSinkBase
+	{
+		private IClientChannelSink nextClientSink;
+		
+		public SoapClientFormatterSink (IClientChannelSink sink)
+		{
+			nextClientSink = sink;
+		}
+
+		public IClientChannelSink NextChannelSink
+		{
+			get {
+				return nextClientSink;
+			}
+		}
+
+		public IMessageSink NextSink
+	        {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public IDictionary Properties
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public IMessageCtrl AsyncProcessMessage (IMessage msg,
+							 IMessageSink replySink)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void AsyncProcessRequest (IClientChannelSinkStack sinkStack,
+						 IMessage msg,
+						 ITransportHeaders headers,
+						 Stream stream)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void AsyncProcessResponse (IClientResponseChannelSinkStack sinkStack,
+						  object state,
+						  ITransportHeaders headers,
+						  Stream stream)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Stream GetRequestStream (IMessage msg,
+						ITransportHeaders headers)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void ProcessMessage (IMessage msg,
+					    ITransportHeaders requestHeaders,
+					    Stream requestStream,
+					    out ITransportHeaders responseHeaders,
+					    out Stream responseStream)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public IMessage SyncProcessMessage (IMessage msg)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSink.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSink.cs
new file mode 100644
index 00000000000..cad836280a2
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSink.cs
@@ -0,0 +1,70 @@
+//
+// System.Runtime.Remoting.Channels.SoapServerFormatterSink.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public class SoapServerFormatterSink : IServerChannelSink, IChannelSinkBase
+	{
+		IServerChannelSink next_sink;
+		
+		[MonoTODO]
+		public SoapServerFormatterSink (SoapServerFormatterSink.Protocol protocol,
+						IServerChannelSink nextSink,
+						IChannelReceiver receiver)
+		{
+			this.next_sink = nextSink;
+		}
+
+		public IServerChannelSink NextChannelSink {
+			get {
+				return next_sink;
+			}
+		}
+
+		[MonoTODO]
+		public IDictionary Properties {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public void AsyncProcessResponse (IServerResponseChannelSinkStack sinkStack, object state,
+						  IMessage msg, ITransportHeaders headers, Stream stream)
+						  
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Stream GetResponseStream (IServerResponseChannelSinkStack sinkStack, object state,
+						IMessage msg, ITransportHeaders headers)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public ServerProcessing ProcessMessage (IServerChannelSinkStack sinkStack,
+							IMessage requestMsg, ITransportHeaders requestHeaders, Stream requestStream,
+							out IMessage responseMsg, out ITransportHeaders responseHeaders, out Stream responseStream)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[Serializable]
+		public enum Protocol
+		{
+			Http = 0,
+			Other = 1,
+		}
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs
new file mode 100644
index 00000000000..0dfa9a3b08d
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs
@@ -0,0 +1,54 @@
+//
+// System.Runtime.Remoting.Channels.SoapServerFormatterSinkProvider.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class SoapServerFormatterSinkProvider :
+		IServerFormatterSinkProvider, IServerChannelSinkProvider
+	{
+		[MonoTODO]
+		public SoapServerFormatterSinkProvider ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public SoapServerFormatterSinkProvider (IDictionary properties,
+							ICollection providerData)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public IServerChannelSinkProvider Next
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public IServerChannelSink CreateSink (IChannelReceiver channel)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void GetChannelData (IChannelDataStore channelData)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.build b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.build
new file mode 100644
index 00000000000..b794acf7f3d
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting.build
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.Runtime.Remoting.dll -->
+
+<project name="System" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<csc target="library" output="../lib/System.Runtime.Remoting.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/unsafe"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/> 
+			</sources>
+			<references>
+				<includes name="../lib/corlib.dll"/>
+				<includes name="../lib/System.dll"/>
+			</references>
+		</csc>
+	</target>
+	<target name="clean">
+		<delete file="../lib/System.Runtime.Remoting.dll" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting/TODOAttribute.cs b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting/TODOAttribute.cs
new file mode 100644
index 00000000000..0920ce8f92d
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/System.Runtime.Remoting/TODOAttribute.cs
@@ -0,0 +1,37 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All, AllowMultiple=true)]
+	public class MonoTODOAttribute : Attribute {
+
+		private string comment;
+		
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+
+		public string Comment
+		{
+			get { return comment; }
+		}
+	}
+}
diff --git a/mcs/class/System.Runtime.Remoting/makefile.gnu b/mcs/class/System.Runtime.Remoting/makefile.gnu
new file mode 100644
index 00000000000..2b48e14dcc4
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../..
+
+LIBRARY = ../lib/System.Runtime.Remoting.dll
+
+LIB_LIST = unix.args
+LIB_FLAGS = -r corlib -r System
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=./Test*
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/System.Runtime.Remoting/unix.args b/mcs/class/System.Runtime.Remoting/unix.args
new file mode 100644
index 00000000000..74ff767af11
--- /dev/null
+++ b/mcs/class/System.Runtime.Remoting/unix.args
@@ -0,0 +1,11 @@
+./System.Runtime.Remoting/TODOAttribute.cs
+./System.Runtime.Remoting.Channels/BinaryClientFormatterSink.cs
+./System.Runtime.Remoting.Channels/BinaryClientFormatterSinkProvider.cs
+./System.Runtime.Remoting.Channels/BinaryServerFormatterSink.cs
+./System.Runtime.Remoting.Channels/BinaryServerFormatterSinkProvider.cs
+./System.Runtime.Remoting.Channels/CommonTransportKeys.cs
+./System.Runtime.Remoting.Channels/SoapClientFormatterSink.cs
+./System.Runtime.Remoting.Channels/SoapServerFormatterSink.cs
+./System.Runtime.Remoting.Channels/SoapServerFormatterSinkProvider.cs
+./System.Runtime.Remoting.Channels.Tcp/TcpChannel.cs
+./System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/ChangeLog b/mcs/class/System.Runtime.Serialization.Formatters.Soap/ChangeLog
new file mode 100644
index 00000000000..e68710bdec0
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/ChangeLog
@@ -0,0 +1,6 @@
+2002-08-15  Tim Coleman <tim@timcoleman.com>
+	* ChangeLog:
+		New changelog added
+	* list:
+	* makefile.gnu:
+		Added so we can build this assembly on linux now.
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/README b/mcs/class/System.Runtime.Serialization.Formatters.Soap/README
new file mode 100755
index 00000000000..d4127cf1289
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/README
@@ -0,0 +1,4 @@
+The SOAP Serialization Formatter is maintained by
+Jesus Suarez <gsus@brujula.net>
+
+Contact him regarding questions about this module.
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/Sample.txt b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Sample.txt
new file mode 100755
index 00000000000..dfa9e52a62b
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/Sample.txt
@@ -0,0 +1,179 @@
+namespace WindowsApplicationProve

+{

+	namespace Cxxx

+	{

+		[Serializable]

+		public struct OtherStruct

+		{

+		  public int FInt;

+		}

+

+		[Serializable]

+		public struct StructSample

+		  {

+			public int  FInt;

+			public char FChar;

+			public  object FObj;			

+		  }

+        [Serializable]

+		public enum EnumSample

+		  {

+			aa,

+			bb,

+		    cc

+		  }

+

+		[Serializable]

+		public delegate int DelegateProve(int i);

+

+		[Serializable]

+		public delegate void OtherDelegate();

+

+		public interface ISample

+		{

+			int FirstMethod(char charParam);

+		}

+

+

+		[Serializable]

+		public class cIntProve: ISample

+		{

+			public long FLongField;

+			public int FirstMethod(char charParam)

+			{

+				return 6;

+			}

+		}

+

+		public delegate string DlgProve(int i);

+

+		[Serializable]

+		public class  cAgregationClass:BaseClass

+		{

+			public Char FCharField;

+			public string FStr;

+			public cSerializableProve Fobj;

+			public ISample Fintf;			

+			//public int[][] FIntList;

+			public string DlgCatcher(int i)

+			{

+				return "Hello"; 

+			}

+    	}

+

+		[Serializable]

+		public class BaseClass

+		  {

+			public int FBaseint;

+			public cIntProve FIntObj;

+		  }

+		[Serializable]

+		public class cXXX

+		{

+			public int FI;

+		}

+

+		[Serializable]

+		public class cSerializableProve

+		{		

+			public object[]          FArrayProve;

+			public object[]          FNullArray;

+			//public ClassProve        FOtherAssObj;

+			public cAgregationClass  FAggField;			

+			//value types

+			public DelegateProve     FDelegateProve;		

+			public event  OtherDelegate FEventField;						

+			public ISample           FInterfaceField;

+			public string            FStrField;

+			private int              FPintField;

+			public int               FIntField;

+			public uint              FUintField;			

+			public short             FShortField;

+			public ushort            FUShortField;

+			public long              FLongField;

+			public ulong             FULongField;

+			public bool              FBoolField;

+			public double            FDoubleField;

+			public decimal           FDecimalField;

+			public char              FCharField;			

+			public StructSample      FStructField;						

+			public EnumSample        FEnumField;	

+		

+			public  cSerializableProve()

+			{		    	

+				InitReferences();

+				InitSimpleTypes();

+				InitStructs();							

+				InitArray();

+			}

+

+			private void InitReferences()

+			{

+				FAggField = new cAgregationClass();

+				FAggField.FCharField = 'a';

+				FAggField.FBaseint = 10;

+				FAggField.Fobj= this;				

+				FAggField.FStr= "Hhhh";

+				FStrField= FAggField.FStr;								

+				FAggField.FIntObj= new cIntProve ();

+				FInterfaceField= FAggField.FIntObj;

+				FAggField.Fintf= FInterfaceField;						        			

+			}

+

+			private void InitSimpleTypes()

+			{

+				FArrayProve= new Object[20];

+				FPintField= 10;

+				FIntField = 6;				

+				FUintField = 6;

+				FShortField = 6;

+				FUShortField = 6;

+				FLongField = 6;

+				FULongField = 6;

+				FDoubleField = 6;

+				FDecimalField = 5;

+				FBoolField = true;

+				FCharField = 'a';

+				FEnumField = EnumSample.aa;

+			}

+

+			private void InitStructs()

+			{

+              FStructField= new StructSample();				 

+			  FStructField.FChar= 'a';

+              FStructField.FInt= 10;

+			  FStructField.FObj= this.FAggField;              

+			}

+

+			private void InitArray()

+			{

+				FArrayProve[0]= new cAgregationClass();

+                ((cAgregationClass)FArrayProve[0]).FStr= "Hello";

+				FArrayProve[1]= new cAgregationClass[2];

+				((cAgregationClass[])FArrayProve[1])[0]= this.FAggField;				

+				FArrayProve[2]= new int[][][]{new int[][]{new int[3], new int[3], new int[3]}, new int[][]{new int[3], new int[3], new int[3]}};

+				/*Fill the integer array*/

+				((int[][][])FArrayProve[2])[1][1][1]= 10;

+				((int[][][])FArrayProve[2])[1][1][2]= 10;

+				((int[][][])FArrayProve[2])[1][1][0]= 10;				

+				FArrayProve[3]= new OtherStruct();				

+				FArrayProve[4]= 6;

+				FArrayProve[5]= true;

+				FArrayProve[6]= 2.5;

+				FArrayProve[7]= EnumSample.bb;

+				FArrayProve[8]= this.FInterfaceField; 	

+				FArrayProve[9]= "Hello";

+				FArrayProve[10]= new UInt32();

+				FArrayProve[11]= new short();

+				FArrayProve[12]= new UInt16();

+				FArrayProve[13]=  new decimal();			

+				FArrayProve[15]= new ulong();

+				FArrayProve[16]= new char();				

+				FArrayProve[18]= null;  

+			}

+

+			public void InitDelegates()

+			{             

+			  FDelegateProve= new DelegateProve(SIntProve);              

+		      FEventField= new OtherDelegate(OtherProve);

+			}
\ No newline at end of file
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.build b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.build
new file mode 100755
index 00000000000..8e6cbad2525
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap.build
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.Runtime.Serialization.Formatters.Soap.dll -->
+
+<project name="System.Runtime.Serialization.Formatters.Soap" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<mkdir dir="../lib"/>
+		<csc target="library" output="../lib/System.Runtime.Serialization.Formatters.Soap.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+			<arg value="/lib:../lib/"/>
+			
+			<!-- cor compare dies with these currently -->
+			<!--arg value="/nostdlib"/--> 	<!-- don't reference mscorlib -->
+			<!--arg value="/r:corlib.dll"/-->
+			<arg value="/r:System.Xml.dll"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+			</sources>
+		</csc>
+		<copy file="../lib/System.Runtime.Serialization.Formatters.Soap.dll" tofile="Test/System.Runtime.Serialization.Formatters.Soap.dll"/>
+		<!--nant basedir="Test" target="build"/-->
+	</target>
+
+	<target name="test" depends="build">
+		<nant basedir="Test" target="test"/>
+	</target>
+
+	<target name="clean">
+		<nant basedir="Test" target="clean"/>
+		<delete file="../lib/System.Runtime.Serialization.Formatters.Soap.dll" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog
new file mode 100644
index 00000000000..2b92835cd3e
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ChangeLog
@@ -0,0 +1,10 @@
+2002-08-15  Tim Coleman <tim@timcoleman.com>
+	* SoapFormatter.cs:
+		That should be IRemotingFormatter, not IRemoteFormatter.
+		Some stubs to make it compile on linux.
+	* TODOAttribute.cs:
+		Added this class to this assembly.
+
+2002-07-23  Duncan Mak  <duncan@ximian.com>
+
+	* SoapFormatter.cs: This implements IFormatter and IRemoteFormatter.
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ObjectDeserializer.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ObjectDeserializer.cs
new file mode 100755
index 00000000000..82ba312160f
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ObjectDeserializer.cs
@@ -0,0 +1,450 @@
+using System;

+using System.IO;

+using System.Xml;

+using System.Reflection;

+using System.Collections;

+

+namespace System.Runtime.Serialization.Formatters.soap

+{	

+	internal class ObjectDeserializer

+	{

+		/**const section**/ 

+		const string cStringType        = "System.String";

+		const string basicassembly      = "mscorlib";

+		const string xmlnsassem         = "http://schemas.microsoft.com/clr/nsassem/";

+		const string xmlns              = "http://schemas.microsoft.com/clr/ns/";				

+		const string cTarget            = "Target";

+		const string cDelegatesClass    = "System.MulticastDelegate";

+		const string cMethodName        = "MethodName";

+		const string cSoapEncArray      = "SOAP-ENC:Array";

+		const string cId                = "id";

+

+		private ArrayList  FObjectList;

+		private int        FObjectNumber;

+		private SoapReader ObjectRdr;

+

+		public XmlDocument FXmlDoc;		

+

+		private int AddObject(object graph, out bool AlreadyExists, int ObjectIndex, out object ResultObject)

+		{

+			AlreadyExists= true;

+			ResultObject= null;			

+			if((FObjectList.Count< ObjectIndex)||(FObjectList[ObjectIndex - 1]==null))//the object not exits

+			{

+				if(FObjectList.Count< ObjectIndex)

+				{

+					int Capacity= FObjectList.Capacity;

+					int Start= FObjectList.Count;

+					for(int i= Start; i<= Capacity; i++)

+					{FObjectList.Add(null);}

+				}

+				if(FObjectList[ObjectIndex - 1]==null)

+				{

+					FObjectList.Insert(ObjectIndex - 1, graph);

+					AlreadyExists= false;				

+					ResultObject= graph;

+					FObjectNumber++;

+				}

+			}		

+			else

+				ResultObject= FObjectList[ObjectIndex - 1];

+			return ObjectIndex;			

+		}

+

+		private string GetAssemblyIndex(string SoapNamespace, string ReferenceName)

+		{						

+			XmlAttributeCollection XmlAttrCollection= FXmlDoc.DocumentElement.Attributes;

+			bool Continue= true;

+			int i= 0;

+			string ItemName= "";

+			while((Continue)&&(i<= XmlAttrCollection.Count - 1))

+			{

+				string AttrValue= XmlAttrCollection.Item(i).Value;				

+				if(AttrValue==SoapNamespace)

+				{

+					ItemName= XmlAttrCollection.Item(i).Name;

+					ItemName= ItemName.Substring(ItemName.IndexOf(":") + 1, ItemName.Length - ItemName.IndexOf(":") - 1);

+					Continue= false;

+				}

+				i++;

+			}

+			return ItemName + ":" + ReferenceName;

+		}

+

+		public void ClearLits()

+		{

+			FObjectList.Clear();

+		}

+

+		public ObjectDeserializer(Stream serializationStream)

+		{

+			FXmlDoc= new XmlDocument();

+			FXmlDoc.Load(serializationStream);

+			FObjectList= new ArrayList();

+			ObjectRdr= new SoapReader();

+			ObjectRdr.FXmlDoc= FXmlDoc;

+		}

+		/**simple types deserialization**/

+		private void DeserialiazeValueType(FieldInfo objectfield, XmlElement ParentElement/*string XmlParentElement*/, object ActualObject/*, string XmlParentElementId*/)

+		{	

+			if((objectfield.FieldType.Assembly.GetName().Name == basicassembly)||(objectfield.FieldType.IsEnum))

+			{

+				string fieldvalue= ObjectRdr.ReadValueTypeFromXml(objectfield.Name, ParentElement);

+				ValueType objvalue= ObjectRdr.GetValueTypeFromString(objectfield.FieldType.UnderlyingSystemType.Name, fieldvalue);

+				objectfield.SetValue(ActualObject, objvalue);            

+			}

+			else //is an struct

+				DeserializeStruct(objectfield, ParentElement, ActualObject, false);	  

+		}

+		/**Structs deserialization**/     

+		private void DeserializeStructValueType(FieldInfo structfield, XmlElement ParentElement/*string XmlParentElement*/, object ActualObject/*, string XmlParentElementId*/, string StructName, object StructObject, bool NestedStruct)

+		{

+			if(structfield.FieldType.Assembly.GetName().Name == basicassembly)

+			{

+				string fieldvalue= ObjectRdr.ReadStructValueFieldFromXml(structfield.Name, ParentElement, StructName, false);

+				ValueType objValue= ObjectRdr.GetValueTypeFromString(structfield.FieldType.UnderlyingSystemType.Name, fieldvalue);

+				structfield.SetValue(StructObject, objValue);			

+			}

+			else //is a nested struct

+			{

+				XmlElement StructElement= (XmlElement)ParentElement.GetElementsByTagName(structfield.Name).Item(0);

+				DeserializeStruct(structfield, StructElement, StructObject, true);

+			}

+		}

+

+		private void DeserializeStructReferenceType(FieldInfo structfield, XmlElement ParentElement, object ActualObject, bool NestedStruct, int FieldIndex)

+		{			

+			DeserializeReferenceType(structfield, ParentElement, ActualObject, FieldIndex);

+		}

+

+		private void DeserializeStruct(FieldInfo objectfield, XmlElement ParentElement, /*, string XmlParentElement*/ object ActualObject/*, string XmlParentElementId*/, bool NestedStruct)

+		{

+			object StructValue= Assembly.Load(objectfield.FieldType.Assembly.GetName().Name).CreateInstance(objectfield.FieldType.FullName);

+			if(StructValue != null)

+			{

+				FieldInfo[] structfields= objectfield.FieldType.GetFields();

+				for(int index= 0; index <= structfields.Length - 1; index++)

+				{

+					if(!structfields[index].IsNotSerialized)

+					{

+						if(structfields[index].FieldType.IsValueType)				  

+							DeserializeStructValueType(structfields[index], ParentElement, ActualObject, objectfield.Name, StructValue, NestedStruct);				  				  

+						else //is a reference type				  

+							DeserializeStructReferenceType(structfields[index], ParentElement, StructValue, NestedStruct, index);

+				  

+					}

+				}	

+				objectfield.SetValue(ActualObject, StructValue);

+			}

+			else

+				objectfield.SetValue(ActualObject, null);

+		}

+       

+		private void DeserializeStruct(ref Array ArrayValue, int ItemIndex, XmlElement ParentElement, object ActualObject, bool NestedStruct)

+		{

+			string XsdType= ((XmlElement)ParentElement.ChildNodes.Item(ItemIndex)).GetAttribute("xsi:type");			

+			string NsName;

+			string AssemblyName= ObjectRdr.GetFullObjectLocation(XsdType, out NsName);

+			object StructValue= Assembly.Load(AssemblyName).CreateInstance(NsName);

+			if(StructValue != null)

+			{

+				FieldInfo[] structfields= StructValue.GetType().GetFields();

+				for(int index= 0; index <= structfields.Length - 1; index++)

+				{

+					if(!structfields[index].IsNotSerialized)

+					{

+						if(structfields[index].FieldType.IsValueType)				  

+							DeserializeStructValueType(structfields[index], ParentElement, ActualObject, "", StructValue, NestedStruct);				  				  

+						else //is a reference type				  

+							DeserializeStructReferenceType(structfields[index], ParentElement, StructValue, NestedStruct, index);

+				  

+					}

+				}	

+				ArrayValue.SetValue(StructValue, ItemIndex);

+			}

+			else

+				ArrayValue.SetValue(null, ItemIndex);

+		}

+

+		/**Reference types deserialization**/

+		private void DeserializeReferenceType(FieldInfo objectfield, XmlElement ParentElement, object ActualObject, int FieldIndex)

+		{

+			XmlElement RefElement= null;

+			ReferenceTypes RefType= ObjectRdr.GetReferenceType(objectfield.Name, ParentElement, ref RefElement);

+			switch(RefType)

+			{

+				case ReferenceTypes.String_Type         :   DeserializeString(objectfield, ParentElement, ActualObject);

+					break;

+				case ReferenceTypes.Object_Type         :   DeserializeInterfacedObjectField(objectfield, ParentElement, ActualObject);

+					break;

+				case ReferenceTypes.Delegate_Type       :   DeserializeDelegates(objectfield, ParentElement, ActualObject);

+					break;

+				case ReferenceTypes.Array_Type          :   DeserializeArray(objectfield, ParentElement, ActualObject);

+					break;

+			}  			

+		}

+		

+		private void DeseralizeArrayItemReferenceType(ref Array ArrayValue, int index, XmlElement ArrayElement, object ActualObject)

+		{

+			XmlElement RefElement= null;

+			ReferenceTypes RefType= ObjectRdr.GetReferenceType(index, ArrayElement, ref RefElement);

+			switch(RefType)

+			{

+				case ReferenceTypes.String_Type         :   DeserializeString(ref ArrayValue, index, ArrayElement, ActualObject);

+					break;

+				case ReferenceTypes.Object_Type         :   DeserializeInterfacedObjectField(ref ArrayValue, index, ArrayElement, ActualObject);

+					break;

+				case ReferenceTypes.Delegate_Type       :   DeserializeDelegates(ref ArrayValue, index, ArrayElement, ActualObject);

+					break;

+				case ReferenceTypes.Array_Type          :   DeserializeArray(ref ArrayValue, index, ArrayElement, ActualObject);

+					break;

+			} 

+		}

+

+		/**Strings deseralization**/

+		private void DeserializeString(ref Array ArrayValue, int ItemIndex, XmlElement ParentElement, object ActualObject)

+		{

+			int ReferenceIndex= ObjectRdr.ReadStringIdFromXml(ItemIndex, ParentElement);//the reference index

+			string StringObj;

+			if(ReferenceIndex == -1)

+				StringObj= null;

+			else

+				StringObj= ObjectRdr.ReadStringTypeFromXml(ItemIndex, ParentElement);

+			object ResultObject;

+			bool AlreadyExist;

+			AddObject(StringObj, out AlreadyExist, ReferenceIndex, out ResultObject);			

+			((Array)ArrayValue).SetValue((string)ResultObject, ItemIndex);

+		}

+		

+		private void DeserializeString(FieldInfo objectfield, XmlElement ParentElement, object ActualObject)

+		{

+			int ReferenceIndex= ObjectRdr.ReadStringIdFromXml(objectfield.Name, ParentElement);//the reference index

+			string StringObj;

+			if(ReferenceIndex == -1)

+				StringObj= null;

+			else

+				StringObj= ObjectRdr.ReadStringTypeFromXml(objectfield.Name, ParentElement);

+			object ResultObject;

+			bool AlreadyExist;

+			AddObject(StringObj, out AlreadyExist, ReferenceIndex, out ResultObject);

+			objectfield.SetValue(ActualObject, (string)ResultObject);

+		}

+		/**interfaces deserialization**/

+		//object's interfaces fields serialization

+		private void DeserializeInterfacedObjectField(FieldInfo objectfield, XmlElement ParentElement, object ActualObject)

+		{          	

+			int ReferenceIndex= ObjectRdr.ReadReferenceIndexFromXml(objectfield.Name, ParentElement);//the reference index           

+			string ReferenceFullName= ObjectRdr.ReadReferenceFullNameFromXml(ReferenceIndex.ToString());//objectfield.FieldType.FullName;

+			if(ReferenceIndex != -1) //not null

+			{		 	

+				object ItemValue= CommonIntObjectDeserialization(ReferenceIndex, ReferenceFullName, ParentElement);

+				objectfield.SetValue(ActualObject, ItemValue);

+			}

+			else

+				objectfield.SetValue(ActualObject, null);

+		}

+	

+		//Array's items interfaces serialization

+		private void DeserializeInterfacedObjectField(ref Array ArrayValue, int ItemIndex, XmlElement ParentElement, object ActualObject)

+		{

+			int ReferenceIndex= ObjectRdr.ReadReferenceIndexFromXml(ItemIndex, ParentElement);//the reference index           

+			string ReferenceFullName= ObjectRdr.ReadReferenceFullNameFromXml(ReferenceIndex.ToString());//objectfield.FieldType.FullName;

+			if(ReferenceIndex != -1) //not null

+			{			 

+				object ItemValue= CommonIntObjectDeserialization(ReferenceIndex, ReferenceFullName, ParentElement);

+				((Array)ArrayValue).SetValue(ItemValue, ItemIndex);

+			}

+			else

+				((Array)ArrayValue).SetValue(null, ItemIndex);

+

+		}

+

+		private object CommonIntObjectDeserialization(int ReferenceIndex, string ReferenceFullName, XmlElement ParentElement)

+		{

+			bool AlreadyExists;	

+			string AssemblyName= ObjectRdr.GetAssemblyNameFromId(ReferenceIndex);//ReadAssemblyNameFromXml(/*objectfield.Name, */ParentElement);

+			object ItemValue= Assembly.Load(AssemblyName).CreateInstance(ReferenceFullName);	  		  			

+			DeserializeObject(ref ItemValue, ReferenceIndex);

+			return ItemValue;

+		}

+		/**Delegates Deserialization**/

+		//object's delegates fields serialization

+		private void DeserializeDelegates(FieldInfo Delegatefield, XmlElement ParentElement, object ActualObject)

+		{

+			int ReferenceIndex= ObjectRdr.ReadReferenceIndexFromXml(Delegatefield.Name, ParentElement);//the reference index           

+			string DelegateElementName= ObjectRdr.GetDelegateElementName(ReferenceIndex);

+			XmlElement CurrentElement= ObjectRdr.GetCurrentElement(DelegateElementName, ReferenceIndex.ToString());

+			if(ReferenceIndex != -1) //not null

+			{					  

+				object DelegateValue= CommonDelegateDeserialization(CurrentElement, Delegatefield.FieldType);

+				Delegatefield.SetValue(ActualObject, DelegateValue);

+			}

+		}

+

+		//Array's delegates items serialization

+		private void DeserializeDelegates(ref Array ArrayValue, int ItemIndex, XmlElement ParentElement, object ActualObject)

+		{

+			int ReferenceIndex= ObjectRdr.ReadReferenceIndexFromXml(ItemIndex, ParentElement);//the reference index           

+			string DelegateElementName= ObjectRdr.GetDelegateElementName(ReferenceIndex);

+			XmlElement CurrentElement= ObjectRdr.GetCurrentElement(DelegateElementName, ReferenceIndex.ToString());

+			if(ReferenceIndex != -1) //not null

+			{	          

+				Type DlgType= ObjectRdr.GetDelegateTypeFromXml(CurrentElement);			  			 

+				object DelegateValue= CommonDelegateDeserialization(CurrentElement, DlgType);

+				((Array)ArrayValue).SetValue(DelegateValue, ItemIndex);

+			}

+		}

+

+		private object CommonDelegateDeserialization(XmlElement CurrentElement, Type DlgType)

+		{

+			int TargetIndex= ObjectRdr.ReadReferenceIndexFromXml(cTarget, CurrentElement);//the reference index 

+			string AssemblyName= ObjectRdr.GetAssemblyNameFromId(TargetIndex);

+			string TargetFullName= ObjectRdr.ReadReferenceFullNameFromXml(TargetIndex.ToString());

+			object Target= Assembly.Load(AssemblyName).CreateInstance(TargetFullName);			

+			DeserializeObject(ref Target, TargetIndex);

+			string MethodName= ObjectRdr.ReadStringTypeFromXml(cMethodName ,CurrentElement);

+			Delegate DelegateValue= MulticastDelegate.CreateDelegate(DlgType, Target, MethodName);

+			return DelegateValue;

+		}

+

+		/**Arrays Deserialization**/

+		//Object's fields desearialization

+		private void DeserializeArray(FieldInfo ArrayField, XmlElement ParentElement, object ActualObject)

+		{

+			int ArrayIndex= ObjectRdr.ReadReferenceIndexFromXml(ArrayField.Name, ParentElement);

+			XmlElement ArrayElement;

+			string ArrayTypeName;

+			Array ArrayValue=  CommonArrayDeserialization(ArrayIndex, out ArrayTypeName, out ArrayElement);

+			object ResultObject;		  

+			bool AlreadyExists;

+			AddObject(ArrayValue, out AlreadyExists, ArrayIndex, out ResultObject);//add the array

+			ArrayField.SetValue(ActualObject, ResultObject);

+			if(!AlreadyExists)			

+				DeserializeArrayItems(ArrayValue, ArrayElement, ActualObject, ArrayTypeName);				

+		}

+		//Array's items deserialization

+		private void DeserializeArray(ref Array ArrayValue, int ItemIndex, XmlElement ParentElement, object ActualObject)

+		{

+			int ArrayIndex= ObjectRdr.ReadReferenceIndexFromXml(ItemIndex, ParentElement);

+			XmlElement ArrayElement;

+			string ArrayTypeName;

+			Array ArrayActualValue= CommonArrayDeserialization(ArrayIndex, out ArrayTypeName, out ArrayElement);

+			((Array)ArrayValue).SetValue(ArrayActualValue, ItemIndex);		  

+			bool AlreadyExists;

+			object ResultObject;

+			AddObject(ArrayActualValue, out AlreadyExists, ArrayIndex, out ResultObject);

+			if(!AlreadyExists)		  

+				DeserializeArrayItems(ArrayActualValue, ArrayElement, ActualObject, ArrayTypeName);			  		  

+		}

+

+

+		private Array CommonArrayDeserialization(int ArrayIndex, out string ArrTypeName, out XmlElement ArrayElement)

+		{

+			ArrayElement= ObjectRdr.GetCurrentElement(cSoapEncArray, ArrayIndex.ToString());

+			string AssemblyName;		

+			string ArrayTypeName= ObjectRdr.ReadArrayTypeFromXml(ArrayElement, out AssemblyName);

+			int StartIndex= ArrayTypeName.LastIndexOf("[");

+			string ArrayLength= ArrayTypeName.Substring(StartIndex + 1, ArrayTypeName.Length - 2 - StartIndex);

+			ArrayTypeName= ArrayTypeName.Substring(0, ArrayTypeName.LastIndexOf("["));

+			Assembly.Load(AssemblyName);

+			Type ArrayType= Type.GetType(ArrayTypeName);

+			ArrTypeName= ArrayType.Name;

+			Array ArrayActualValue= Array.CreateInstance(ArrayType, Convert.ToInt32(ArrayLength));

+			return ArrayActualValue;

+		}

+

+		private void DeserializeArrayItems(Array ArrayValue, XmlElement ArrayElement, object ActualObject, string ArrayTypeName)

+		{

+			bool IsStruct= false;

+			bool IsNull= false;

+			for(int index= 0; index<= ((Array)ArrayValue).Length - 1; index++)

+			{		    

+				bool IsValueType= ObjectRdr.IsArrayItemValueType(ArrayElement, index, ref IsNull, ref IsStruct);

+				if(IsNull)

+					((Array)ArrayValue).SetValue(null, index);

+				else

+					if(IsValueType)

+					DeserializeArrayItemValueType(ref ArrayValue, index, ArrayElement, ArrayTypeName, IsStruct, ActualObject);

+				else //is a reference type

+					DeseralizeArrayItemReferenceType(ref ArrayValue, index, ArrayElement, ActualObject);    

+			}

+		}

+

+		private void DeserializeArrayItemValueType(ref Array ArrayValue, int index, XmlElement ArrayElement, string ItemTypeName, bool IsStruct, object ActualObject)

+		{

+			if(!IsStruct)

+			{

+				ValueType ItemValue= ObjectRdr.ReadArrayItemSimpleTypeFromXml(ArrayElement, index, ItemTypeName);

+				((Array)ArrayValue).SetValue(ItemValue, index);

+			}

+			else

+				DeserializeStruct(ref ArrayValue, index, ArrayElement, ActualObject, false);

+		}

+

+		/**objects desrialization**/

+		private int DeserializeObject(ref object graph, int ObjectIndex)

+		{

+			bool AlreadyExits;			

+			string XmlElemtName= GetAssemblyIndex(GetXmlNamespace(graph.GetType().Namespace, graph.GetType().Assembly.GetName().Name), graph.GetType().Name);					

+			/**this is temporal**/

+			XmlElement ObjectElement= ObjectRdr.GetCurrentElement(XmlElemtName, ObjectIndex.ToString());

+			object ResultObject;

+			ObjectIndex= AddObject(graph, out AlreadyExits, ObjectIndex, out ResultObject);

+			if(!AlreadyExits)//new object

+			{

+				FieldInfo[]objectfields= ResultObject.GetType().GetFields(BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Instance);

+				for(int index= 0; index<= objectfields.Length - 1; index++)

+				{

+					if(!objectfields[index].IsNotSerialized)

+					{

+						if(objectfields[index].FieldType.IsValueType)// the field is a value type

+							DeserialiazeValueType(objectfields[index], ObjectElement, /*XmlElemtName,*/ ResultObject/*, ObjectIndex.ToString()*/);

+						else

+							DeserializeReferenceType(objectfields[index], ObjectElement, ResultObject, index);

+					}

+				}

+			}

+			graph= ResultObject;

+			return ObjectIndex;

+		}

+

+		private string GetMainAssemblyFullNameFromXml(out string AssemblyName)

+		{

+			XmlNode SoapEnvNode= FXmlDoc.DocumentElement.GetElementsByTagName("SOAP-ENV:Body").Item(0);

+			XmlNode MainObjectNode= SoapEnvNode.ChildNodes.Item(0);	

+			int StartIndex= MainObjectNode.Name.IndexOf(":");

+			string ClassName= MainObjectNode.Name.Substring(StartIndex + 1, MainObjectNode.Name.Length - StartIndex - 1);		

+			string AttributeName= FXmlDoc.DocumentElement.Attributes.GetNamedItem("xmlns:" + MainObjectNode.Name.Substring(0, 2)).Value;

+			StartIndex= AttributeName.LastIndexOf("/");

+			AssemblyName= AttributeName.Substring(StartIndex + 1, AttributeName.Length - StartIndex - 1);

+			string TempStr= AttributeName.Substring(0, StartIndex);

+			StartIndex= TempStr.LastIndexOf("/");

+			string ReferenceFullName= TempStr.Substring(StartIndex + 1, TempStr.Length - StartIndex - 1);

+			return ReferenceFullName + "." + ClassName;

+		}

+

+		private object GetMainObjectFromXml()

+		{			

+			string AssName;

+			string ReferenceFullName= GetMainAssemblyFullNameFromXml(out AssName);

+			return Assembly.Load(AssName).CreateInstance(ReferenceFullName);

+		}

+

+		public string GetXmlNamespace(string NamepaceName, string AssemblyName)

+		{

+			string XmlAssNs;

+			if(AssemblyName == basicassembly)			 

+				XmlAssNs= xmlns + NamepaceName;			

+			else

+				XmlAssNs= xmlnsassem + NamepaceName + '/' + AssemblyName;			

+			return XmlAssNs;

+		}

+				      

+		public object Deserialize(Stream serializationStream)

+		{			

+			object MainObject= GetMainObjectFromXml();

+			DeserializeObject(ref MainObject, 1); 

+			return MainObject;

+		}

+	}

+}

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ObjectSerializer.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ObjectSerializer.cs
new file mode 100755
index 00000000000..20882b31432
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/ObjectSerializer.cs
@@ -0,0 +1,374 @@
+/****************************************************/

+/*ObjectSerializer class implementation             */

+/*Author: Jesús M. Rodríguez de la Vega             */

+/*gsus@brujula.net                                  */

+/****************************************************/

+

+using System;

+using System.IO;

+using System.Xml;

+using System.Reflection;

+using System.Collections;

+

+namespace System.Runtime.Serialization.Formatters.soap

+{

+	internal class ObjectSerializer

+	{		

+		/*******const's section******/		

+		const string cStringType       = "System.String";

+		const string startxmlns        = "xmlns:a";

+		const string startdoc          =  "<SOAP-ENV:Envelope " + 

+			"xmlns:xsi= \"http://www.w3.org/2001/XMLSchema-instance\""  + " " + 

+			"xmlns:xsd= \"http://www.w3.org/2001/XMLSchema\""            + " " + 

+			"xmlns:SOAP-ENC= \"http://schemas.xmlsoap.org/soap/encoding/\""  + " " + 

+			"xmlns:SOAP-ENV= \"http://schemas.xmlsoap.org/soap/envelope/\""  + " " + 

+			"SOAP-ENV:encodingStyle= \"http://schemas.xmlsoap.org/soap/encoding/\">" + " " + 

+			"<SOAP-ENV:Body>"    + " " + 

+			"</SOAP-ENV:Body>"   + " " + 

+			"</SOAP-ENV:Envelope>";

+		const string xmlnsassem         = "http://schemas.microsoft.com/clr/nsassem/";

+		const string xmlns              = "http://schemas.microsoft.com/clr/ns/";

+		const string basicassembly      = "mscorlib";

+		/*****Delegates const******/

+		const string cDelegatesClass    = "System.MulticastDelegate";

+		const string cDelegateSerClass  = "DelegateSerializationHolder"; 

+		const string cDelegateType      = "DelegateType";

+		const string cDelegateAssembly  = "DelegateAssembly";

+		const string cTarget            = "Target";

+		const string cTargetTypAssem    = "TargetTypeAssembly";

+		const string cTargetTypName     = "TargetTypeName";

+		const string cMethodName        = "MethodName";

+		const string cDefaultValue      = "_0x00_";

+		/******field's sections******/

+		private Stream FCurrentStream;

+		private ArrayList AssemblyList;  //the assemblies's been serialized		

+		public  ArrayList XmlObjectList; //the list of the xml representation of all objects 			    

+		private ArrayList FObjectList;   //the listof  the object been seralized

+		private SoapWriter ObjectWrt;

+		private string FCurrentXml;// the object's xml representation 

+		/******method's section******/

+		private void AddAssemblyToXml(string assemns)

+		{

+			XmlDocument xmldoc = new XmlDocument();			

+			xmldoc.LoadXml(FCurrentXml);

+			XmlElement RootElemt = xmldoc.DocumentElement;

+			string xmlns = startxmlns + AssemblyList.Count.ToString();

+			XmlAttribute NewAttr= xmldoc.CreateAttribute(xmlns);

+			RootElemt.SetAttributeNode(NewAttr);

+			RootElemt.SetAttribute(xmlns, assemns);

+			FCurrentXml= xmldoc.InnerXml;

+		}

+

+		private int AddAssembly(string assname, string nespname)			

+		{		

+			string XmlAssNs;

+

+			if(assname == basicassembly)			 

+				XmlAssNs= xmlns + nespname;			

+			else

+				XmlAssNs= xmlnsassem + nespname + '/' + assname;

+			int Result= AssemblyList.IndexOf(XmlAssNs);

+			if(Result< 0)	

+			{

+				Result= AssemblyList.Add(XmlAssNs);	 			  

+				AddAssemblyToXml(XmlAssNs);

+			}

+			return Result;

+		}

+

+		private int AddObject(object graph, out bool AlreadyExists)

+		{

+			int index= FObjectList.IndexOf(graph);

+			AlreadyExists= true;

+			if(index < 0)  //is a new object

+			{

+				AlreadyExists= false;

+				index= FObjectList.Add(graph); 

+			}			

+			return index;			

+		}

+

+		private int AddString(object StrObject, out bool AlreadyExists)

+		{

+			int index= FObjectList.IndexOf(StrObject);

+			AlreadyExists= true;

+			if(index < 0)  //is a new object

+			{

+				AlreadyExists= false;

+				index= FObjectList.Add(StrObject); 

+			}

+			return index;

+		}

+		/******Xml Writer Methods******/

+		private void AddObjectTagToXml(object ObjectField, int ParentIndex, string ObjectName)

+		{

+		}

+		private void AddSimpleTagToXml()

+		{

+		}

+		private int AddAssemblytoXml(Type ObjectType)

+		{

+			string assname, nespname;

+			assname  = ObjectType.Assembly.GetName().Name;

+			nespname = ObjectType.Namespace;

+			return AddAssembly(assname, nespname); 

+		}

+		/******Serialization Methods******/

+		private void SerializeEnum(object ActualObject, FieldInfo field, int ObjectIndex)

+		{

+			string FieldName= field.Name;

+			string FieldValue= field.GetValue(ActualObject).ToString();

+			ObjectWrt.WriteValueTypeToXml(FieldName, FieldValue, ObjectIndex);

+		}

+

+		private void SerializeStruct(object StructValue, string FieldName, int ObjectIndex, bool IsArrayItem)

+		{	

+			int AssemblyIndex= AddAssemblytoXml(StructValue.GetType()) + 1;

+			string StructTypeName= StructValue.GetType().Name;

+			ObjectWrt.WriteStructInitTagToXml(FieldName, ObjectIndex, IsArrayItem, AssemblyIndex, StructTypeName);

+			FieldInfo[] fieldtypes = StructValue.GetType().GetFields(BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Instance); //get the fields	

+			for(int index = 0; index<= fieldtypes.Length - 1; index++)

+			{

+				if(!fieldtypes[index].IsNotSerialized)

+				{

+					AssemblyIndex= AddAssemblytoXml(fieldtypes[index].FieldType);

+					if(fieldtypes[index].FieldType.IsValueType)//if the field is a value type					

+						SerializeValueTypes(StructValue, fieldtypes[index], ObjectIndex);

+					else					

+						SerializeReferenceTypes(ObjectIndex, fieldtypes[index].GetValue(StructValue), fieldtypes[index].FieldType, fieldtypes[index].Name);

+					

+				}

+			}

+			ObjectWrt.WriteStructEndTagToXml(FieldName, ObjectIndex);

+		}

+

+		private void SerializeValueTypes(object ActualObject, FieldInfo field, int ObjectIndex) //Serialize the value types

+		{	

+			if(field.FieldType.IsEnum)			  

+				SerializeEnum(ActualObject, field, ObjectIndex);

+			else

+			{	

+				if(field.FieldType.Assembly.GetName().Name == basicassembly)//is a simple field

+				{

+					string FieldName= field.Name;

+					string FieldValue= field.GetValue(ActualObject).ToString();

+					if(FieldValue.ToString().CompareTo("")==0)

+						FieldValue= cDefaultValue;

+					ObjectWrt.WriteValueTypeToXml(FieldName, FieldValue, ObjectIndex); 

+				}

+				else //is a struct field

+				{

+					object StructValue= field.GetValue(ActualObject);

+					SerializeStruct(StructValue, field.Name, ObjectIndex, false);

+				} 

+			} 

+		}	

+	

+		private void SerializeArrayItemValueType(object ArrayItem, int ArrayIndex, int AssemblyIndex, string ArrayItemsType)

+		{

+			if((ArrayItem.GetType().IsEnum)|(ArrayItem.GetType().Assembly.GetName().Name== basicassembly))

+			{

+				int ItemAssemblyIndex= AddAssemblytoXml(ArrayItem.GetType()) + 1;

+				string ItemValue= ArrayItem.ToString();

+				if(ArrayItem.ToString().CompareTo("")==0)

+					ItemValue= cDefaultValue;

+				ObjectWrt.WriteArrayValueItemToXml(ArrayItem.GetType().Name, ItemValue, ArrayIndex, ArrayItemsType, ItemAssemblyIndex); 

+			}

+			else //is an struct

+				SerializeStruct(ArrayItem, "item", ArrayIndex, true);

+		}

+		

+		private void SerializeReferenceTypes(int ObjectIndex, object Instance, Type InstanceType, string InstanceName)

+		{

+			if(InstanceType.IsArray)

+			{

+				Array ArrayField= (Array)Instance;

+				if(ArrayField!= null)

+				{

+					int ArrayIndex= SerializeArray(ArrayField);

+					ObjectWrt.WriteObjectFieldToXml(InstanceName, ObjectIndex, ArrayIndex);

+				}

+				else

+					ObjectWrt.WriteNullObjectFieldToXml(InstanceName, ObjectIndex);

+			}

+			else

+			{

+				if(InstanceType.FullName == cStringType)

+					SerializeString(Instance, ObjectIndex, InstanceName);

+				else

+				{

+					if((InstanceType.BaseType != null)&&(InstanceType.BaseType.ToString() == cDelegatesClass))//is a delegate's field					

+					{

+						if(Instance!= null)

+						{

+							int DlgIndex= SerialializedDelegates(Instance, ObjectIndex);

+							ObjectWrt.WriteObjectFieldToXml(InstanceName, ObjectIndex, DlgIndex);

+						}

+						else

+							ObjectWrt.WriteNullObjectFieldToXml(InstanceName, ObjectIndex);

+					}

+					else

+					{						

+						if((InstanceType.IsClass)||(InstanceType.IsInterface)) //if the field is a class's instance or an interface

+						{							

+							if(Instance != null)

+							{

+								int FieldIndex= SerializeObject(Instance, ObjectIndex);  

+								ObjectWrt.WriteObjectFieldToXml(InstanceName, ObjectIndex, FieldIndex);                   

+							}

+							else 

+								ObjectWrt.WriteNullObjectFieldToXml(InstanceName, ObjectIndex);						

+						}							

+					}

+				}

+			}

+		}

+

+		private int SerializeArray(Array ArrayField)

+		{			

+			int Length= ArrayField.Length;

+			int AssemblyIndex= AddAssemblytoXml(ArrayField.GetType()) + 1;

+			bool AlreadyExist;

+			int ArrayIndex= AddObject(ArrayField, out AlreadyExist) + 1;

+			if(!AlreadyExist)

+			{

+				string ArrayType= ArrayField.GetType().Name;

+				string ArrayItemsType= ArrayField.GetType().Name.Substring(0, ArrayField.GetType().Name.IndexOf("["));

+				string XmlSchemaArrayType= ObjectWrt.GenerateSchemaArrayType(ArrayType, Length, AssemblyIndex);

+				ObjectWrt.WriteArrayToXml(XmlSchemaArrayType, ArrayIndex);

+				object ItemValue;

+				for(int index= 0; index<= Length - 1; index++)

+				{

+					ItemValue= ArrayField.GetValue(index);

+					if(ItemValue== null)

+						ObjectWrt.WriteNullObjectFieldToXml("item", ArrayIndex);

+					else

+					{

+						if(ItemValue.GetType().IsValueType)

+						{

+							SerializeArrayItemValueType(ItemValue, ArrayIndex, AssemblyIndex, ArrayItemsType);   

+						} 

+						else//is a reference type

+						{

+							SerializeReferenceTypes(ArrayIndex, ItemValue, ItemValue.GetType(), "item");

+						}

+					}

+				}

+			}

+			return ArrayIndex;

+		}

+

+		private void SerializeString(object StringObject, int ObjectIndex, string StringName)

+		{

+			bool AlreadyExits;

+			int StringIndex= AddString(StringObject, out AlreadyExits) + 1;

+			if(!AlreadyExits)

+			{

+				ObjectWrt.WriteStringTypeToXml(StringName, StringObject.ToString(), ObjectIndex, StringIndex);

+				XmlObjectList.Add("");

+			}

+			else

+				ObjectWrt.WriteObjectFieldToXml(StringName, ObjectIndex, StringIndex);		  

+		}

+        

+		private void SerializeStringField(string StringName, string StringValue, int ObjectIndex)

+		{

+			bool AlreadyExits;

+			int StringIndex= AddString(StringValue, out AlreadyExits) + 1;

+			if(!AlreadyExits)

+			{

+				ObjectWrt.WriteStringTypeToXml(StringName, StringValue, ObjectIndex, StringIndex);

+				XmlObjectList.Add("");

+			}

+			else

+				ObjectWrt.WriteObjectFieldToXml(StringName, ObjectIndex, StringIndex);		  

+		}

+

+

+		private int SerialializedDelegates(object DelegateObject, int ParentObjectIndex)

+		{

+			bool AlreadyExits;

+			int AssemblyIndex= AddAssembly(basicassembly, "System") + 1;

+			int DelegatesIndex= AddObject(DelegateObject, out AlreadyExits) + 1;

+			if(!AlreadyExits)

+			{

+				MulticastDelegate DelegateObj= (MulticastDelegate)DelegateObject;

+				if(DelegateObj != null)

+				{

+					ObjectWrt.WriteObjectToXml(AssemblyIndex, DelegatesIndex, cDelegateSerClass); //write the delegates's init

+					SerializeStringField(cDelegateType, DelegateObj.GetType().FullName, DelegatesIndex); //the delegate type

+					SerializeStringField(cDelegateAssembly, DelegateObj.GetType().Assembly.FullName, DelegatesIndex); //the delegate assembly				     

+					int FieldIndex= SerializeObject(DelegateObj.Target, DelegatesIndex);   //Serialize the target

+					ObjectWrt.WriteObjectFieldToXml(cTarget, DelegatesIndex, FieldIndex);

+					SerializeStringField(cTargetTypAssem, DelegateObj.Target.GetType().Assembly.FullName, DelegatesIndex);

+					SerializeStringField(cTargetTypName, DelegateObj.Target.GetType().FullName, DelegatesIndex);

+					SerializeStringField(cMethodName, DelegateObj.Method.Name, DelegatesIndex);

+				}

+			}

+			return DelegatesIndex;

+		}

+

+		private int SerializeObject(object graph, int ParentIndex)

+		{			

+			string ClassName;

+			int AssemblyIndex, ObjectIndex;

+			bool AlreadyExits;

+			if(graph.GetType().IsSerializable)

+			{

+				object ActualObject= graph;

+				ObjectIndex= AddObject(ActualObject, out AlreadyExits) + 1;  //add the object to the object's list						

+				if(!AlreadyExits)

+				{

+					AssemblyIndex= AddAssemblytoXml(ActualObject.GetType()) + 1;//add the assembly to the assemblies's list

+					ClassName= graph.GetType().Name; //the class's name

+					ObjectWrt.WriteObjectToXml(AssemblyIndex, ObjectIndex, ClassName); //write the object to the xml list

+					FieldInfo[] fieldtypes = ActualObject.GetType().GetFields(BindingFlags.NonPublic|BindingFlags.Public|BindingFlags.Instance); //get the fields

+					for(int index = 0; index<= fieldtypes.Length - 1; index++)

+					{		

+						if(!fieldtypes[index].IsNotSerialized)

+						{

+							AssemblyIndex= AddAssemblytoXml(fieldtypes[index].FieldType);											

+							if(fieldtypes[index].FieldType.IsValueType)//if the field is a value type					

+								SerializeValueTypes(ActualObject, fieldtypes[index], ObjectIndex);

+							else

+								SerializeReferenceTypes(ObjectIndex, fieldtypes[index].GetValue(ActualObject), fieldtypes[index].FieldType, fieldtypes[index].Name);

+						}

+					}		

+				}

+				return ObjectIndex;

+			}

+			else

+				return -15000;

+		}

+

+		public void BeginWrite() //writes the basic elements of a soap message

+		{

+			FCurrentXml = startdoc;			

+		}

+

+		public ObjectSerializer(Stream store) //assign the current stream

+		{

+			FCurrentStream = store;

+			AssemblyList   = new ArrayList(); //Init the lists

+			XmlObjectList  = new ArrayList();			

+			FObjectList    = new ArrayList();

+			ObjectWrt      = new SoapWriter();

+			ObjectWrt.FXmlObjectList= XmlObjectList;			

+		}

+

+		public void CleatLists()

+		{

+			AssemblyList.Clear();

+			XmlObjectList.Clear();			

+			FObjectList.Clear();			

+			FCurrentXml= "";

+		}

+

+		public void Serialize(object graph)

+		{ 			

+			SerializeObject(graph, 0); 

+			ObjectWrt.WriteObjectListToXml(FCurrentXml, FCurrentStream);                                                                                                                                                              

+			CleatLists();

+		}

+	}

+}

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
new file mode 100755
index 00000000000..4a42bd96cf9
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
@@ -0,0 +1,91 @@
+/****************************************************/

+/*Soapformatter class implementation                */

+/*Author: Jesús M. Rodríguez de la Vega             */

+/*gsus@brujula.net                                  */

+/****************************************************/

+

+using System;

+using System.Reflection;

+using System.Xml;

+using System.IO;

+using System.Runtime.Remoting.Messaging;

+using System.Runtime.Serialization;

+using System.Runtime.Serialization.Formatters;

+

+

+namespace System.Runtime.Serialization.Formatters.soap

+{

+	public class SoapFormatter : IRemotingFormatter, IFormatter

+	{

+		private ObjectSerializer   ObjSerializer;	

+		private ObjectDeserializer ObjDeserializer;

+		/*this is the soapformater's properties               

+		  the Binder, Context and SurrogateSelector properties

+		  have not been declared yet*/

+

+		public FormatterAssemblyStyle AssemblyFormat

+		{

+			get{return AssemblyFormat;}

+			set{AssemblyFormat= value;}

+		}

+

+		[MonoTODO]

+		public SerializationBinder Binder {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		public StreamingContext Context {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		public ISurrogateSelector SurrogateSelector {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+

+		public ISoapMessage TopObject

+		{

+			get{return TopObject;}

+			set{TopObject= value;}

+		}

+

+		public FormatterTypeStyle TypeFormat

+		{

+			get{return TypeFormat;}

+			set{TypeFormat= value;}

+		}

+

+		//the other constructor are not supplied yet

+		public SoapFormatter()

+		{			

+		}

+        		

+		public void Serialize(Stream serializationStream, object graph)

+		{

+			Serialize (serializationStream, graph, null);

+		}

+

+		public void Serialize(Stream serializationStream, object graph, Header[] headers)

+		{

+			ObjSerializer= new ObjectSerializer(serializationStream);

+			ObjSerializer.BeginWrite();

+			ObjSerializer.Serialize(graph);

+		}

+

+		public object Deserialize(Stream serializationStream)

+		{

+			return Deserialize (serializationStream, null);

+		}

+

+		public object Deserialize(Stream serializationStream, HeaderHandler handler)

+		{

+			ObjDeserializer= new ObjectDeserializer(serializationStream);

+			return ObjDeserializer.Deserialize(serializationStream);

+		}

+		

+	}

+}

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapReader.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapReader.cs
new file mode 100755
index 00000000000..28f090a7b5f
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapReader.cs
@@ -0,0 +1,584 @@
+using System;

+using System.Xml;

+using System.Reflection;

+

+namespace System.Runtime.Serialization.Formatters.soap

+{	

+

+	public enum ReferenceTypes {Array_Type, Object_Type, Interface_Type, Delegate_Type, String_Type};

+

+	internal class SoapReader

+	{

+		/******const section******/

+

+		const string cSoapRef           = "href";

+		const string cObjectRef         = "ref-";

+		const string cId                = "id";

+		const string cXsiNull           = "xsi:null";

+		const string basicassembly      = "mscorlib";

+		const string startxmlns         = "xmlns:a";		

+		const string Systemns           = "http://schemas.microsoft.com/clr/ns/System";		

+		const string cDefaultValue      = "_0x00_";

+		/******Array's serialization section******/

+		const string cItem           = "item";

+		const string cSoapEncArray   = "SOAP-ENC:Array";

+		const string cSoapArrayType  = "SOAP-ENC:arrayType"; 

+		const string cXsiType        = "xsi:type";

+		const string cNullObject     = "xsi:null=\"1\"/";

+		/******Delegate's serialization section******/

+		const string cDelegateSerClass  = "DelegateSerializationHolder";

+		const string cDelegateType      = "DelegateType";

+		const string cDelegateAssembly  = "DelegateAssembly";

+		/******fields's section******/		

+		public XmlDocument FXmlDoc;		

+		public XmlElement  DeepElement; //the current Xml Struct Element

+		//public Utils       FUtils;

+

+		public SoapReader()

+		{		

+			//FUtils= new Utils();

+		}

+

+		/**Reference Types reader**/

+		public int ReadObjectIndexFromXml(string ObjectElemt)

+		{

+			XmlNodeList ObjectElement= FXmlDoc.DocumentElement.GetElementsByTagName(ObjectElemt);

+			XmlElement FCurrentElement= (XmlElement)ObjectElement.Item(0);

+			string refid= (FCurrentElement).GetAttribute(cId);

+			int startindex= refid.IndexOf("-");

+			refid= refid.Substring(startindex + 1, refid.Length - startindex - 1);		   

+			return Convert.ToInt32(refid);

+		}		

+

+		private string ReadReferenceFullNameFromXmlNode(XmlNode ReferenceNode)

+		{

+			int StartIndex= ReferenceNode.Name.IndexOf(":");

+			string ClassName= ReferenceNode.Name.Substring(StartIndex + 1, ReferenceNode.Name.Length - StartIndex - 1);		

+			string AttributeName= FXmlDoc.DocumentElement.Attributes.GetNamedItem("xmlns:" + ReferenceNode.Name.Substring(0, StartIndex)).Value;

+			StartIndex= AttributeName.LastIndexOf("/");			

+			string TempStr= AttributeName.Substring(0, StartIndex);

+			StartIndex= TempStr.LastIndexOf("/");

+			string ReferenceFullName= TempStr.Substring(StartIndex + 1, TempStr.Length - StartIndex - 1);

+			return ReferenceFullName + "." + ClassName;			

+		}

+

+		public string ReadReferenceFullNameFromXml(string RefereneId)

+		{

+			string RefId= cObjectRef + RefereneId;

+			XmlNodeList NodeList = FXmlDoc.DocumentElement.GetElementsByTagName("SOAP-ENV:Body").Item(0).ChildNodes;

+			bool Continue= true;

+			int index= 0;

+			string Result= "";

+			while((Continue)&&(index <= NodeList.Count - 1))

+			{

+				XmlElement ActElement= (XmlElement)NodeList.Item(index);

+				if(ActElement.GetAttribute("id")== RefId)//the attributes match

+				{

+					Result= ReadReferenceFullNameFromXmlNode(ActElement);

+					Continue= false;

+				}

+				else

+					index++;

+			}

+			return Result;

+		}

+

+		/**ReadReferenceIndexFromXml**/

+		public int ReadReferenceIndexFromXml(string FieldName, XmlElement ParentElement)

+		{

+			XmlElement FieldElement= (XmlElement)ParentElement.GetElementsByTagName(FieldName).Item(0);		  

+			if(FieldElement.GetAttribute(cXsiNull)== "") //if it is not a null field

+			{

+				string hrefvalue= FieldElement.GetAttribute(cSoapRef);

+				int StartIndex= hrefvalue.IndexOf("-");

+				return Convert.ToInt32(hrefvalue.Substring(StartIndex + 1, hrefvalue.Length - 1 - StartIndex));

+			}

+			else

+				return -1;

+		}

+

+		public int  ReadReferenceIndexFromXml(int ItemIndex, XmlElement ParentElement)

+		{

+			XmlElement FieldElement= (XmlElement)ParentElement.ChildNodes.Item(ItemIndex);

+			if(FieldElement.GetAttribute(cXsiNull)== "") //if it is not a null field

+			{

+				string hrefvalue= FieldElement.GetAttribute(cSoapRef);

+				int StartIndex= hrefvalue.IndexOf("-");

+				return Convert.ToInt32(hrefvalue.Substring(StartIndex + 1, hrefvalue.Length - 1 - StartIndex));

+			}

+			else

+				return -1;

+		}

+

+

+

+		/**String reader**/

+		public int ReadStringIdFromXml(/*string XmlParentElement, */string FieldName,/* string XmlParentElementId, */XmlElement ParentElement)

+		{

+			XmlElement FieldElement= (XmlElement)ParentElement.GetElementsByTagName(FieldName).Item(0);//(XmlElement)GetCurrentElement(XmlParentElement, XmlParentElementId).GetElementsByTagName(FieldName).Item(0);

+			if(FieldElement.GetAttribute(cId)== "")

+				return ReadReferenceIndexFromXml(FieldName, ParentElement);

+			else

+				return ReadFieldIdValueFromXml(FieldName, ParentElement);

+		}

+

+		public int ReadStringIdFromXml(int ItemIndex, XmlElement ParentElement)

+		{

+			XmlElement FieldElement= (XmlElement)ParentElement.ChildNodes.Item(ItemIndex);

+			string StrId= FieldElement.GetAttribute(cId);

+			if(StrId == "")

+				return ReadReferenceIndexFromXml(ItemIndex, ParentElement);

+			else

+				return ReadFieldIdValueFromXml(ItemIndex, ParentElement);

+		}

+		

+		public string ReadStringTypeFromXml(string FieldName, XmlElement ParentElement)

+		{

+			XmlNode XmlField= ParentElement.GetElementsByTagName(FieldName).Item(0);

+			if(XmlField!= null)

+				return XmlField.InnerXml;

+			else

+				return null;

+		}

+

+		public string ReadStringTypeFromXml(int ItemIndex, XmlElement ParentElement)

+		{

+			XmlNode XmlField= ParentElement.ChildNodes.Item(ItemIndex);

+			if(XmlField!= null)

+				return XmlField.InnerXml;

+			else

+				return null;

+		}

+

+		/**Delegates reader**/

+		public string GetDelegateElementName(int DelegateId)

+		{					

+			XmlAttributeCollection XmlAttrCollection= FXmlDoc.DocumentElement.Attributes;

+			bool Continue= true;

+			int i= 0;

+			string ItemName= "";

+			while((Continue)&&(i<= XmlAttrCollection.Count - 1))

+			{

+				string AttrValue= XmlAttrCollection.Item(i).Value;				

+				if(AttrValue == Systemns)

+				{

+					ItemName= XmlAttrCollection.Item(i).Name;

+					ItemName= ItemName.Substring(ItemName.LastIndexOf(":") + 1, ItemName.Length - 1 - ItemName.LastIndexOf(":"));

+					Continue= false;

+				}

+				i++;

+			}

+			return ItemName + ":" + cDelegateSerClass;

+		}

+

+		public Type GetDelegateTypeFromXml(XmlElement ParentElement)

+		{

+			string DelegateAssembly= ParentElement.GetElementsByTagName(cDelegateAssembly).Item(0).InnerXml;

+			DelegateAssembly= DelegateAssembly.Substring(0, DelegateAssembly.IndexOf(","));

+			string DelegateType= ParentElement.GetElementsByTagName(cDelegateType).Item(0).InnerXml;

+			return Assembly.Load(DelegateAssembly).GetType(DelegateType);		   

+		}

+        

+		/**Arrays reader**/

+		public string ReadArrayTypeFromXml(XmlElement ArrayElement, out string AssemblyName)

+		{          

+			string ArrayTypeAttr= ArrayElement.GetAttribute(cSoapArrayType);

+			int StartIndex= ArrayTypeAttr.LastIndexOf(":");

+			string Result;

+			if(ArrayTypeAttr.Substring(0, 4) == "xsd:")	

+			{

+				Result= "System";

+				string CLRType= GetCLRTypeFromXsdType(ArrayTypeAttr.Substring(0, ArrayTypeAttr.IndexOf("[")));

+				StartIndex= ArrayTypeAttr.IndexOf("[");

+				Result= "System." + CLRType + ArrayTypeAttr.Substring(StartIndex, ArrayTypeAttr.Length - StartIndex);

+				AssemblyName= basicassembly;

+			}

+			else

+			{

+				AssemblyName= ReadAssemblyNameFromXml(ArrayTypeAttr);				

+				string NsIndex= ArrayTypeAttr.Substring(1, StartIndex - 1);

+				Result= ReadNamespaceFromXml(NsIndex);				

+				Result= Result +   "." + ArrayTypeAttr.Substring(StartIndex + 1, ArrayTypeAttr.Length - StartIndex - 1);

+			}		  

+			return Result;

+		} 

+        		

+

+		public bool IsArrayItemValueType(XmlElement ParentElement, int ItemIndex, ref bool IsNull, ref bool IsStruct)

+		{

+			XmlElement ArrayItem= (XmlElement)ParentElement.ChildNodes.Item(ItemIndex);		  

+			bool Result= false;

+			if(ArrayItem.GetAttribute(cXsiNull)== "")//is not null

+			{

+				IsNull= false;

+				if((ArrayItem.InnerXml != "")&&(ArrayItem.GetAttribute(cId) == ""))

+				{

+					Result= true; 

+					if(ArrayItem.InnerXml.Substring(0, 1)== "<") //is an atruct

+						IsStruct= true;

+				}

+			}

+			else

+				IsNull= true;				

+			return Result;

+		}

+

+		public ValueType ReadArrayItemSimpleTypeFromXml(XmlElement ParentElement, int ItemIndex, string ItemTypeName)

+		{

+			XmlElement ArrayItem= (XmlElement)ParentElement.ChildNodes.Item(ItemIndex);//at this moment you know that this field is a value type

+			string ItemValue= ArrayItem.InnerXml;

+			string XsiType= ((XmlElement)ArrayItem).GetAttribute(cXsiType);

+			if(XsiType != "")

+				return GetValueTypeFromXsdType(XsiType, ItemValue);

+			else

+				return GetValueTypeFromString(ItemTypeName, ItemValue);

+		}

+

+		public ReferenceTypes GetReferenceType(string FieldName, XmlElement ParentElement, ref XmlElement RefElement)

+		{          

+			XmlElement ArrayItem= (XmlElement)ParentElement.GetElementsByTagName(FieldName).Item(0);

+			RefElement= ArrayItem;

+			ReferenceTypes Result= ReferenceTypes.Object_Type;

+			if(ArrayItem.GetAttribute(cId) != "") //is an string 

+				Result= ReferenceTypes.String_Type;

+			else

+			{

+				string RefIndex= ArrayItem.GetAttribute(cSoapRef);

+				if(RefIndex != "") //is a other reference

+				{		

+					int Id= RefIndex.IndexOf("-");

+					Id= Convert.ToInt32(RefIndex.Substring(Id + 1, RefIndex.Length - 1 - Id));

+					string RefName= GetReferenceNameFromId(Convert.ToInt32(Id), ref RefElement);					

+					if(RefName== cSoapEncArray) //is an array 

+						Result= ReferenceTypes.Array_Type;

+					else

+						if(RefName == "")

+						Result= ReferenceTypes.String_Type;

+					else

+					{

+						if((RefName.IndexOf(cDelegateSerClass) != -1)&&(RefElement.ChildNodes.Item(0).Name== cDelegateType)) //is a delegates

+							Result= ReferenceTypes.Delegate_Type;

+						else

+							Result= ReferenceTypes.Object_Type;

+					}

+				}

+			}        

+			return Result;

+		}

+

+		public ReferenceTypes GetReferenceType(int index, XmlElement ParentElement, ref XmlElement RefElement)

+		{

+			XmlElement ArrayItem= (XmlElement)ParentElement.ChildNodes.Item(index);

+			RefElement= ArrayItem;

+			ReferenceTypes Result= ReferenceTypes.Object_Type;

+			if(ArrayItem.GetAttribute(cId) != "") //is an string 

+				Result= ReferenceTypes.String_Type;

+			else

+			{

+				string RefIndex= ArrayItem.GetAttribute(cSoapRef);

+				if(RefIndex != "") //is a other reference

+				{		

+					int Id= RefIndex.IndexOf("-");

+					Id= Convert.ToInt32(RefIndex.Substring(Id + 1, RefIndex.Length - 1 - Id));

+					string RefName= GetReferenceNameFromId(Convert.ToInt32(Id), ref RefElement);

+					if(RefName== cSoapEncArray) //is an array 

+						Result= ReferenceTypes.Array_Type;

+					else

+						if(RefName == "")

+						Result= ReferenceTypes.String_Type;

+					else

+					{

+						if((RefName.IndexOf(cDelegateSerClass) != -1)&&(RefElement.ChildNodes.Item(0).Name== cDelegateType)) //is a delegates

+							Result= ReferenceTypes.Delegate_Type;

+						else

+							Result= ReferenceTypes.Object_Type;

+					}

+				}

+			}        

+			return Result;

+		}

+

+		public string GetFullObjectLocation(string XsdType, out string NsName)

+		{

+			string AssemblyName= ReadAssemblyNameFromXml(XsdType);

+			int StartIndex= XsdType.LastIndexOf(":");

+			string NsIndex= XsdType.Substring(1, StartIndex - 1);

+			NsName= ReadNamespaceFromXml(NsIndex);

+			NsName= NsName +   "." + XsdType.Substring(StartIndex + 1, XsdType.Length - StartIndex - 1);

+			return AssemblyName; 

+		}

+

+		private ValueType GetValueTypeFromNotSimpleType(string XsdType, string ItemValue)

+		{

+			string NsName;

+			string AssemblyName= GetFullObjectLocation(XsdType, out NsName);		    

+			Type ItemType= Assembly.Load(AssemblyName).GetType(NsName);

+			object Result;

+			if(ItemType.IsEnum)//is an enum

+				Result= Enum.Parse(ItemType, ItemValue);

+			else //is a char

+			{

+				if(ItemValue == cDefaultValue)				

+					Result=  new char();

+				else				 

+					Result= Char.Parse(ItemValue);				

+			}

+			return (ValueType)Result;             

+		}

+

+		private string GetCLRTypeFromXsdType(string XsdType)

+		{

+			string Result= "";

+			switch(XsdType)

+			{				

+				case "xsd:int"          :Result= "Int32";

+					break;

+				case "xsd:short"        :Result= "Int16";

+					break;

+				case "xsd:long"         :Result= "Int64";

+					break;

+				case "xsd:unsignedInt"  :Result= "UInt32";

+					break;

+				case "xsd:unsignedShort":Result= "UInt16";

+					break;

+				case "xsd:unsignedLong" :Result= "UInt64";

+					break;

+				case "xsd:byte"         :Result= "Byte";

+					break;

+				case "xsd:decimal"      :Result= "Decimal";

+					break;

+				case "xsd:double"       :Result= "Double"; 

+					break;				

+				case "xsd:boolean"      :Result= "Boolean";

+					break;

+				case "xsd:dateTime"     :Result= "DateTime";

+					break;

+				case "xsd:string"       :Result= "String";

+					break;

+			}

+			return Result;

+		}

+

+		public ValueType GetValueTypeFromXsdType(string XsdType, string ItemValue)

+		{

+			ValueType Result= null;

+			switch(XsdType)

+			{				

+				case "xsd:int"          : Result= Convert.ToInt32(ItemValue);

+					break;

+				case "xsd:short"        :Result= Convert.ToInt16(ItemValue);

+					break;

+				case "xsd:long"         :Result= Convert.ToInt64(ItemValue);

+					break;

+				case "xsd:unsignedInt"  :Result= Convert.ToUInt32(ItemValue);

+					break;

+				case "xsd:unsignedShort":Result= Convert.ToUInt16(ItemValue);

+					break;

+				case "xsd:unsignedLong" :Result= Convert.ToUInt64(ItemValue);

+					break;

+				case "xsd:byte"         :Result= Convert.ToByte(ItemValue);

+					break;

+				case "xsd:decimal"      :Result= Convert.ToDecimal(ItemValue);

+					break;

+				case "xsd:double"       :Result= Convert.ToDouble(ItemValue); 

+					break;				

+				case "xsd:boolean"      :Result= Convert.ToBoolean(ItemValue);

+					break;

+				case "xsd:dateTime"     :Result= Convert.ToDateTime(ItemValue);

+					break;

+				default                 :Result= GetValueTypeFromNotSimpleType(XsdType, ItemValue);

+					break;

+			}

+			return Result;

+		}

+

+		/**Value types reader**/

+		public string ReadValueTypeFromXml(string FieldName, XmlElement ParentElement/*string ParentElement, string ParentElementId*/)

+		{

+			XmlNode XmlField= ParentElement.GetElementsByTagName(FieldName).Item(0);///*FCurrentElement*/GetCurrentElement(ParentElement, ParentElementId).GetElementsByTagName(FieldName).Item(0); 

+			if(XmlField!= null)

+				return XmlField.InnerXml;

+			else

+				return null;

+		}

+		

+		public ValueType GetValueTypeFromString(string fieldtype, string fieldvalue)

+		{

+			ValueType result= null;

+			switch(fieldtype)

+			{

+				case "Int32"    : result= Convert.ToInt32(fieldvalue);

+					break;

+				case "Int16"    : result= Convert.ToInt16(fieldvalue);

+					break;

+				case "Int64"    : result= Convert.ToInt64(fieldvalue);

+					break;

+				case "UInt32"   : result= Convert.ToUInt32(fieldvalue);

+					break;

+				case "UInt16"   : result= Convert.ToUInt16(fieldvalue);

+					break;

+				case "UInt64"   : result= Convert.ToUInt64(fieldvalue);

+					break;

+				case "Byte"     : result= Convert.ToByte(fieldvalue);

+					break;

+				case "Decimal"  : result= Convert.ToDecimal(fieldvalue);

+					break;

+				case "Double"   : result= Convert.ToDouble(fieldvalue);

+					break;				

+				case "Boolean"  : result= Convert.ToBoolean(fieldvalue);

+					break;

+				case "DateTime" : result= Convert.ToDateTime(fieldvalue);

+					break;

+				case "Char"     : result= Convert.ToChar(fieldvalue);

+					break;

+			}

+			return result;

+		}		

+

+		/**Structs reader**/

+		public string ReadStructValueFieldFromXml(/*string XmlParentElement, */string FieldName, XmlElement ParentElement/*string XmlParentElementId, */, string StructName, bool NestedStruct)

+		{

+			XmlElement FieldElement;		

+			FieldElement= (XmlElement)ParentElement.GetElementsByTagName(FieldName).Item(0);			

+			if(FieldElement != null)

+				return FieldElement.InnerXml;

+			else

+				return null;

+		}

+

+		public void ReadStructParentElementFromXml(string StructName, XmlElement ParentElement, bool NestedStruct)

+		{

+			if(!NestedStruct)//is not a nested struct

+				DeepElement= (XmlElement)ParentElement.GetElementsByTagName(StructName).Item(0);//GetCurrentElement(XmlParentElement, XmlParentElementId).GetElementsByTagName(StructName).Item(0);

+			else			

+				DeepElement= (XmlElement)DeepElement.GetElementsByTagName(StructName).Item(0);

+		}

+

+		/**Assemblies reader**/

+		public string GetAssemblyNameFromId(int id)

+		{		  

+			XmlNodeList ObjList= ((XmlElement)FXmlDoc.DocumentElement.GetElementsByTagName("SOAP-ENV:Body").Item(0)).ChildNodes;

+			bool Continue= true;

+			int index= 0;

+			string AssemblyName= "";

+			while((Continue)&&(index<= ObjList.Count - 1))

+			{

+				string refid= ((XmlElement)ObjList.Item(index)).GetAttribute(cId);			  

+				int StartIndex= refid.IndexOf("-");

+				refid=  refid.Substring(StartIndex + 1, refid.Length - 1 - StartIndex);

+				if(refid== id.ToString())

+				{

+					Continue= false;				  

+					AssemblyName= ReadAssemblyNameFromXml(((XmlElement)ObjList.Item(index)).Name);

+				}

+				else

+					index++;

+			}

+			return AssemblyName;

+		}

+

+		private string GetReferenceNameFromId(int id, ref XmlElement RefElement)

+		{

+			XmlNodeList ObjList= ((XmlElement)FXmlDoc.DocumentElement.GetElementsByTagName("SOAP-ENV:Body").Item(0)).ChildNodes;

+			bool Continue= true;

+			int index= 0;

+			string Result= "";

+			while((Continue)&&(index<= ObjList.Count - 1))

+			{

+				string refid= ((XmlElement)ObjList.Item(index)).GetAttribute(cId);			  

+				int StartIndex= refid.IndexOf("-");

+				refid=  refid.Substring(StartIndex + 1, refid.Length - 1 - StartIndex);

+				if(refid== id.ToString())

+				{

+					Continue= false;				  

+					Result= ((XmlElement)ObjList.Item(index)).Name;

+					RefElement= (XmlElement)ObjList.Item(index);

+				}

+				else

+					index++;

+			}

+			return Result;

+		}

+

+		public string ReadAssemblyNameFromXml(string ParentElementName)

+		{

+			string RefName= ParentElementName.Substring(1, ParentElementName.LastIndexOf(":") - 1);

+			string XmlNamespaceName= startxmlns + RefName;

+			string AttributeName= FXmlDoc.DocumentElement.Attributes.GetNamedItem(XmlNamespaceName).Value;

+			int StartIndex= AttributeName.LastIndexOf("/");

+			string AssemblyName= AttributeName.Substring(StartIndex + 1, AttributeName.Length - StartIndex - 1);

+			if(AssemblyName == "System")

+				AssemblyName= basicassembly;

+			return AssemblyName;

+		}

+

+		/**Namespace reader**/

+		public string ReadNamespaceFromXml(string ReferenceName)

+		{

+			string XmlNamespaceName= startxmlns + ReferenceName; 

+			string AttributeName= FXmlDoc.DocumentElement.Attributes.GetNamedItem(XmlNamespaceName).Value;

+			int StartIndex= AttributeName.LastIndexOf("/");

+			string Result= "";

+			string NsName= AttributeName.Substring(StartIndex + 1, AttributeName.Length - StartIndex - 1);

+			if(NsName == "System")

+				Result= NsName;

+			else

+			{

+				string TmpStr= AttributeName.Substring(0, StartIndex);

+				StartIndex= TmpStr.LastIndexOf("/");

+				Result= TmpStr.Substring(StartIndex + 1, TmpStr.Length - StartIndex - 1);

+			}

+			return Result;

+		  

+		}

+

+		/**Utils**/

+		public XmlElement GetCurrentElement(string ElementName, string ElementId)

+		{

+			string RefId= cObjectRef + ElementId;

+			XmlNodeList NodeList = ((XmlElement)FXmlDoc.DocumentElement.GetElementsByTagName("SOAP-ENV:Body").Item(0)).GetElementsByTagName(ElementName);

+			bool Continue= true;

+			int index= 0;

+			string Result= "";

+			XmlElement ActElement = null;

+			while((Continue)&&(index <= NodeList.Count - 1))

+			{

+				ActElement= (XmlElement)NodeList.Item(index);

+				if(ActElement.GetAttribute("id")== RefId)//the attributes match

+					Continue= false;				

+				else

+					index++;

+			}

+			if(!Continue)

+				return ActElement;

+			else

+				return null;

+		}

+		

+		private int ReadFieldIdValueFromXml(string FieldName, XmlElement ParentElement)

+		{

+			XmlElement FieldElement= (XmlElement)ParentElement.GetElementsByTagName(FieldName).Item(0);//(XmlElement)GetCurrentElement(XmlParentElement, XmlParentElementId).GetElementsByTagName(FieldName).Item(0);

+			if(FieldElement.GetAttribute(cXsiNull)== "") //if it is not a null field

+			{

+				string refvalue= FieldElement.GetAttribute(cId);

+				int StartIndex= refvalue.IndexOf("-");

+				return Convert.ToInt32(refvalue.Substring(StartIndex + 1, refvalue.Length - 1 - StartIndex));

+			}

+			else

+				return -1;

+		}

+

+		private int ReadFieldIdValueFromXml(int ItemIndex, XmlElement ParentElement)

+		{

+			XmlElement FieldElement= (XmlElement)ParentElement.ChildNodes.Item(ItemIndex);

+			if(FieldElement.GetAttribute(cXsiNull)== "") //if it is not a null field

+			{

+				string refvalue= FieldElement.GetAttribute(cId);

+				int StartIndex= refvalue.IndexOf("-");

+				return Convert.ToInt32(refvalue.Substring(StartIndex + 1, refvalue.Length - 1 - StartIndex));

+			}

+			else

+				return -1;

+		}

+	}	

+}

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapWriter.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapWriter.cs
new file mode 100755
index 00000000000..da1009f4514
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/SoapWriter.cs
@@ -0,0 +1,222 @@
+/****************************************************/

+/*SoapWritter class implementation                  */

+/*Author: Jesús M. Rodríguez de la Vega             */

+/*gsus@brujula.net                                  */

+/****************************************************/

+

+using System;

+using System.Text;

+using System.Collections;

+using System.Xml;

+using System.IO;

+

+namespace System.Runtime.Serialization.Formatters.soap

+{

+	

+		internal class SoapWriter

+		{		

+			/******const section******/

+			const string cNullObject     = "xsi:null=\"1\"/";

+			const string cSoapEnv        = "SOAP-ENV:Body";

+			const string cStartTag       = "<";

+			const string cEndTag         = ">";

+			const string cNumber         = "#";

+			const string cEqual          = "=";

+			const string cTwoColon       = ":";

+			const string cAssId          = "a";

+			const string cslash          = "/";	

+			const string cSoapRef        = "href";

+			const string cObjectRef      = "ref-";

+			const string cId             = "id";

+			/******Array's serialization section******/

+			const string cItem           = "item";

+			const string cSoapEncArray   = "SOAP-ENC:Array";

+			const string cSoapArrayType  = "SOAP-ENC:arrayType"; 

+			const string cXsiType        = "xsi:type";

+			/******field's section******/

+			public ArrayList FXmlObjectList;

+			public  int FReferenceNumber;

+			/******method's section******/

+			private string ConcatenateObjectList()

+			{

+				string XmlResult= "";

+				object[] XmlList= FXmlObjectList.ToArray();

+				for(int index= 0; index<= FXmlObjectList.Count - 1; index++)

+					XmlResult= XmlResult + XmlList[index].ToString();

+				return XmlResult;

+			}			 

+

+			private StringBuilder GetXmlObject(int ObjectIndex)

+			{

+				object[] XmlList= FXmlObjectList.ToArray();    

+				string Actstring= XmlList[ObjectIndex - 1].ToString();

+				return new StringBuilder(Actstring);

+			}

+

+			public void WriteObjectToXml(int AssemblyIndex, int ReferenceIndex, string ClassName)

+			{

+				StringBuilder ObjWriter= new StringBuilder();

+				string XmlStartTag= cStartTag + cAssId + AssemblyIndex.ToString() + cTwoColon + ClassName + 

+					' ' + cId + cEqual + '"' + cObjectRef + ReferenceIndex + '"' + cEndTag;   

+				string XmlEndTag= cStartTag + cslash + cAssId + AssemblyIndex.ToString() + cTwoColon + ClassName + cEndTag; 

+				ObjWriter.Append(XmlStartTag);			

+				ObjWriter.Append(XmlEndTag); 

+				FXmlObjectList.Add(ObjWriter.ToString());  

+			}	

+	

+			public void WriteArrayToXml(string XmlSchemaArrayType, int ArrayIndex)

+			{

+				StringBuilder ObjWriter= new StringBuilder();

+				string XmlStartTag= cStartTag + cSoapEncArray + ' ' + cId + cEqual + '"' + 

+					cObjectRef + ArrayIndex + '"' + ' ' + cSoapArrayType +

+					cEqual + XmlSchemaArrayType + cEndTag;

+				string XmlEndTag= cStartTag + cslash + cSoapEncArray + cEndTag;

+				ObjWriter.Append(XmlStartTag);

+				ObjWriter.Append(XmlEndTag);

+				FXmlObjectList.Add(ObjWriter.ToString());

+			}

+

+			public void WriteStringTypeToXml(string StringName, string StringValue, int ParentObjectIndex, int StringIndex)

+			{

+				StringBuilder ObjWriter= GetXmlObject(ParentObjectIndex);

+				string StrFieldStartTag= cStartTag + StringName + ' ' + cId + cEqual + '"' + cObjectRef + StringIndex + '"' + cEndTag;

+				string StrFieldEndTag  = cStartTag + cslash + StringName + cEndTag;

+				int index= ObjWriter.ToString().LastIndexOf(cStartTag);

+				ObjWriter.Insert(index, StrFieldStartTag + StringValue + StrFieldEndTag);  

+				FXmlObjectList.RemoveAt(ParentObjectIndex - 1);

+				FXmlObjectList.Insert(ParentObjectIndex - 1, ObjWriter.ToString());

+			}		

+

+			public void WriteObjectFieldToXml(string FieldName, int ParentObjectIndex, int ObjectIndex)

+			{            

+				StringBuilder ObjWriter= GetXmlObject(ParentObjectIndex);

+				string XmlField= cStartTag + FieldName + ' ' + cSoapRef + cEqual

+					+ '"' + cNumber + cObjectRef + ObjectIndex.ToString() + '"'+ cslash + cEndTag;

+				int index= ObjWriter.ToString().LastIndexOf(cStartTag);

+				ObjWriter.Insert(index, XmlField);

+				FXmlObjectList.RemoveAt(ParentObjectIndex - 1);

+				FXmlObjectList.Insert(ParentObjectIndex - 1, ObjWriter.ToString());

+			}

+

+			public void WriteNullObjectFieldToXml(string FieldName, int ParentObjectIndex)

+			{            

+				StringBuilder ObjWriter= GetXmlObject(ParentObjectIndex);

+				string XmlField= cStartTag + FieldName + ' ' + cNullObject + cEndTag;

+				int index= ObjWriter.ToString().LastIndexOf(cStartTag);

+				ObjWriter.Insert(index, XmlField);

+				FXmlObjectList.RemoveAt(ParentObjectIndex - 1);

+				FXmlObjectList.Insert(ParentObjectIndex - 1, ObjWriter.ToString()); 

+			}

+		

+			public void WriteValueTypeToXml(string FieldName, string FieldValue, int ObjectIndex)

+			{           

+				StringBuilder ObjWriter= GetXmlObject(ObjectIndex);

+				string XmlField= cStartTag + FieldName + cEndTag + FieldValue +

+					cStartTag + cslash + FieldName + cEndTag;

+				int index= ObjWriter.ToString().LastIndexOf(cStartTag);            

+				ObjWriter.Insert(index, XmlField);

+				FXmlObjectList.RemoveAt(ObjectIndex - 1);

+				FXmlObjectList.Insert(ObjectIndex - 1, ObjWriter.ToString());			 

+			}

+

+			public void WriteStructInitTagToXml(string StructName, int ObjectIndex, bool XsiType, int AssemblyIndex, string StructType)

+			{

+				StringBuilder ObjWriter= GetXmlObject(ObjectIndex);

+				string StructInitTag= cStartTag + StructName;

+				if(XsiType)

+					StructInitTag= StructInitTag + ' ' + cXsiType + cEqual + '"' + "a" + AssemblyIndex + cTwoColon + StructType + '"';  

+				StructInitTag= StructInitTag + cEndTag;

+				int index= ObjWriter.ToString().LastIndexOf(cStartTag);            

+				ObjWriter.Insert(index, StructInitTag);

+				FXmlObjectList.RemoveAt(ObjectIndex - 1);

+				FXmlObjectList.Insert(ObjectIndex - 1, ObjWriter.ToString());

+			}

+

+			public void WriteStructEndTagToXml(string StructName, int ObjectIndex)

+			{

+				StringBuilder ObjWriter= GetXmlObject(ObjectIndex);

+				string StructInitTag= cStartTag + cslash + StructName + cEndTag;

+				int index= ObjWriter.ToString().LastIndexOf(cStartTag);            

+				ObjWriter.Insert(index, StructInitTag);

+				FXmlObjectList.RemoveAt(ObjectIndex - 1);

+				FXmlObjectList.Insert(ObjectIndex - 1, ObjWriter.ToString());

+			}

+

+			public void WriteArrayValueItemToXml(string ItemType, string ItemValue, int ArrayIndex, string ArrayItemsType, int AssemblyIndex)

+			{

+				StringBuilder ObjWriter= GetXmlObject(ArrayIndex);

+				string ItemInitTag= cStartTag + cItem;

+				if(ArrayItemsType== "Object")

+				{

+					ItemInitTag= ItemInitTag + ' ' + cXsiType + cEqual + '"' + GenerateXmlSchemaType(ItemType, AssemblyIndex) + '"';

+				}

+				ItemInitTag= ItemInitTag + cEndTag + ItemValue + cStartTag + cslash + cItem + cEndTag;

+				int index= ObjWriter.ToString().LastIndexOf(cStartTag);            

+				ObjWriter.Insert(index, ItemInitTag);

+				FXmlObjectList.RemoveAt(ArrayIndex - 1);

+				FXmlObjectList.Insert(ArrayIndex - 1, ObjWriter.ToString());

+			}

+

+			public void WriteStructTypeToXml(string StructName)

+			{

+			}		

+

+			public void WriteObjectListToXml(string SoapDoc, Stream SoapStream)

+			{

+				string XmlResult= ConcatenateObjectList();

+				XmlDocument XmlDoc= new XmlDocument();

+				XmlDoc.LoadXml(SoapDoc);			

+				XmlNode XNode= XmlDoc.DocumentElement.GetElementsByTagName(cSoapEnv).Item(0);

+				XNode.InnerXml= XmlResult;

+				StreamWriter SoapWrt= new StreamWriter(SoapStream);

+				SoapWrt.Write(XmlDoc.InnerXml);

+				SoapWrt.Close();				

+			}

+

+			public string GenerateSchemaArrayType(string ArrayType, int ArrayLength, int AssemblyIndex)

+			{

+				string StrResult= ArrayType;

+				string ArrayItems= ArrayType.Substring(0, ArrayType.IndexOf("["));

+				string XmlSchType= GenerateXmlSchemaType(ArrayItems, AssemblyIndex);		  

+				StrResult=StrResult.Replace(ArrayItems, XmlSchType);

+				StrResult= StrResult.Insert(StrResult.LastIndexOf(']'), ArrayLength.ToString());		  		  

+				StrResult= '"' + StrResult + '"';

+				return StrResult;

+			}

+

+			public string GenerateXmlSchemaType(string TypeName, int AssemblyIndex)

+			{

+				string XmlSchType;

+				switch(TypeName)

+				{

+					case "Int32"    : XmlSchType= "xsd:int";

+						break;

+					case "Int16"    : XmlSchType= "xsd:short";

+						break;

+					case "Int64"    : XmlSchType= "xsd:long";

+						break;

+					case "UInt32"   : XmlSchType= "xsd:unsignedInt";

+						break;

+					case "UInt16"   : XmlSchType= "xsd:unsignedShort";

+						break;

+					case "UInt64"   : XmlSchType= "xsd:unsignedLong";

+						break;

+					case "Byte"     : XmlSchType= "xsd:byte";

+						break;

+					case "Decimal"  : XmlSchType= "xsd:decimal";

+						break;

+					case "Double"   : XmlSchType= "xsd:double";

+						break;

+					case "String"   : XmlSchType= "xsd:string";

+						break;

+					case "Boolean"     : XmlSchType= "xsd:boolean";

+						break;

+					case "DateTime" : XmlSchType= "xsd:dateTime";

+						break;

+					default         : XmlSchType= "a" + AssemblyIndex + cTwoColon + TypeName;

+						break; 					

+				}

+				return XmlSchType;

+			}

+		}

+}

diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/TODOAttribute.cs b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/TODOAttribute.cs
new file mode 100755
index 00000000000..0b89c8b0a77
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/System.Runtime.Serialization.Formatters.Soap/TODOAttribute.cs
@@ -0,0 +1,37 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Runtime.Serialization.Formatters.Soap {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All, AllowMultiple=true)]
+	public class MonoTODOAttribute : Attribute {
+
+		private string comment;
+		
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+
+		public string Comment
+		{
+			get { return comment; }
+		}
+	}
+}
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/list b/mcs/class/System.Runtime.Serialization.Formatters.Soap/list
new file mode 100644
index 00000000000..1584dbacbfb
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/list
@@ -0,0 +1,6 @@
+System.Runtime.Serialization.Formatters.Soap/ObjectDeserializer.cs
+System.Runtime.Serialization.Formatters.Soap/ObjectSerializer.cs
+System.Runtime.Serialization.Formatters.Soap/SoapFormatter.cs
+System.Runtime.Serialization.Formatters.Soap/SoapReader.cs
+System.Runtime.Serialization.Formatters.Soap/SoapWriter.cs
+System.Runtime.Serialization.Formatters.Soap/TODOAttribute.cs
diff --git a/mcs/class/System.Runtime.Serialization.Formatters.Soap/makefile.gnu b/mcs/class/System.Runtime.Serialization.Formatters.Soap/makefile.gnu
new file mode 100644
index 00000000000..ae3ae199831
--- /dev/null
+++ b/mcs/class/System.Runtime.Serialization.Formatters.Soap/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../..
+
+LIBRARY = ../lib/System.Runtime.Serialization.Formatters.Soap.dll
+
+LIB_LIST = list
+LIB_FLAGS = -r corlib -r System.Xml
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=./Test*
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/System.Web.Services/.cvsignore b/mcs/class/System.Web.Services/.cvsignore
new file mode 100755
index 00000000000..7d6c125a198
--- /dev/null
+++ b/mcs/class/System.Web.Services/.cvsignore
@@ -0,0 +1,7 @@
+*.dll
+*.suo
+*.csproj.user
+bin
+obj
+.makefrag
+.response
diff --git a/mcs/class/System.Web.Services/ChangeLog b/mcs/class/System.Web.Services/ChangeLog
new file mode 100644
index 00000000000..22cd8451a87
--- /dev/null
+++ b/mcs/class/System.Web.Services/ChangeLog
@@ -0,0 +1,45 @@
+2002-08-07  Tim Coleman <tim@timcoleman.com>
+	* System.Web.Services.build:
+		Added "test" target to build.
+		Added "clean" target to build.
+	* Test:
+		New test suites added.
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>
+	* list: Added System.Web.Services.Protocols/ServerProtocol.cs
+
+2002-07-29  Dave Bettin <javabettin@yahoo.com>
+	* list: added new Discovery classes
+	* System.Web.Services.Discovery: added stubs
+	* .cvsignore: added
+	* Mono.System.Web.Services: added VS.net project for assembly
+
+2002-07-25  Tim Coleman <tim@timcoleman.com>
+	* list: add new classes
+
+2002-07-24  Tim Coleman <tim@timcoleman.com>
+	* list:
+		Added System.Web.Services.Description/SoapProtocolReflector.cs
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* makefile.gnu:
+	* list:
+		Modifications to make this library buildable on
+		linux.
+		
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* list: Added new files from System.Web.Services.Protocols
+		and System.Web.Services.Configuration
+
+2002-07-19  Tim Coleman <tim@timcoleman.com>
+	* list: Added
+
+2002-07-19  Tim Coleman <tim@timcoleman.com>
+	* System.Web.Services.build: added
+	* System.Web.Services:
+	* System.Web.Services.Configuration:
+	* System.Web.Services.Description:
+	* System.Web.Services.Discovery:
+	* System.Web.Services.Protocols:
+		New directories added
diff --git a/mcs/class/System.Web.Services/Mono.System.Web.Services.csproj b/mcs/class/System.Web.Services/Mono.System.Web.Services.csproj
new file mode 100755
index 00000000000..bc69dceffd2
--- /dev/null
+++ b/mcs/class/System.Web.Services/Mono.System.Web.Services.csproj
@@ -0,0 +1,869 @@
+<VisualStudioProject>

+    <CSHARP

+        ProjectType = "Local"

+        ProductVersion = "7.0.9466"

+        SchemaVersion = "1.0"

+        ProjectGuid = "{1E24995F-861C-4FCB-BE59-C7B518F02F64}"

+    >

+        <Build>

+            <Settings

+                ApplicationIcon = ""

+                AssemblyKeyContainerName = ""

+                AssemblyName = "System.Web.Services"

+                AssemblyOriginatorKeyFile = ""

+                DefaultClientScript = "JScript"

+                DefaultHTMLPageLayout = "Grid"

+                DefaultTargetSchema = "IE50"

+                DelaySign = "false"

+                OutputType = "Library"

+                RootNamespace = "System.Web.Servces"

+                StartupObject = ""

+            >

+                <Config

+                    Name = "Debug"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "DEBUG;TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "true"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "true"

+                    Optimize = "false"

+                    OutputPath = "bin\Debug\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+                <Config

+                    Name = "Release"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "false"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "false"

+                    Optimize = "true"

+                    OutputPath = "bin\Release\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+            </Settings>

+            <References>

+                <Reference

+                    Name = "System.Web"

+                    AssemblyName = "System.Web"

+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Web.dll"

+                />

+                <Reference

+                    Name = "System.EnterpriseServices"

+                    AssemblyName = "System.EnterpriseServices"

+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.EnterpriseServices.dll"

+                />

+                <Reference

+                    Name = "System"

+                    AssemblyName = "System"

+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"

+                />

+                <Reference

+                    Name = "System.XML"

+                    AssemblyName = "System.Xml"

+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"

+                />

+            </References>

+        </Build>

+        <Files>

+            <Include>

+                <File

+                    RelPath = "ChangeLog"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "list"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "makefile.gnu"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "System.Web.Services.build"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "System.Web.Services\ChangeLog"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "System.Web.Services\TODOAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services\WebMethodAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services\WebService.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services\WebService.resx"

+                    DependentUpon = "WebService.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "System.Web.Services\WebServiceAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services\WebServiceBindingAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services\WebServicesDescriptionAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Configuration\ChangeLog"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "System.Web.Services.Configuration\XmlFormatExtensionAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Configuration\XmlFormatExtensionPointAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Configuration\XmlFormatExtensionPrefixAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\Binding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\BindingCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ChangeLog"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\DocumentableItem.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\FaultBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\FaultBindingCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\HttpAddressBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\HttpBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\HttpOperationBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\HttpUrlEncodedBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\HttpUrlReplacementBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\Import.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ImportCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\InputBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\Message.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MessageBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MessageCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MessagePart.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MessagePartCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MimeContentBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MimeMultipartRelatedBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MimePart.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MimePartCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MimeTextBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MimeTextMatch.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MimeTextMatchCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\MimeXmlBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\Operation.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OperationBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OperationBindingCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OperationCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OperationFault.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OperationFaultCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OperationFlow.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OperationInput.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OperationMessage.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OperationMessageCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OperationOutput.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\OutputBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\Port.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\PortCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\PortType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\PortTypeCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ProtocolImporter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ProtocolReflector.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\Service.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ServiceCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ServiceDescription.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ServiceDescriptionBaseCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ServiceDescriptionCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ServiceDescriptionFormatExtension.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ServiceDescriptionFormatExtensionCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ServiceDescriptionImporter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ServiceDescriptionImportStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ServiceDescriptionImportWarnings.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\ServiceDescriptionReflector.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapAddressBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapBindingStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapBindingUse.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapBodyBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapExtensionImporter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapExtensionReflector.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapFaultBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapHeaderBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapHeaderFaultBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapOperationBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapProtocolImporter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapProtocolReflector.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\SoapTransportImporter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Description\Types.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\ChangeLog"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\ContractReference.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\ContractSearchPattern.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryClientDocumentCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryClientProtocol.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryClientReferenceCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryClientResult.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryClientResultCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryDocument.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryDocumentLinksPattern.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryDocumentReference.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryDocumentSearchPattern.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryExceptionDictionary.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryReference.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryReferenceCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoveryRequestHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DiscoverySearchPattern.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\DynamicDiscoveryDocument.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\ExcludePathInfo.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\SchemaReference.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\SoapBinding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Discovery\XmlSchemaSearchPattern.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\AnyReturnReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\ChangeLog"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\HtmlFormParameterReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\HtmlFormParameterWriter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\HttpGetClientProtocol.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\HttpMethodAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\HttpPostClientProtocol.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\HttpSimpleClientProtocol.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\HttpWebClientProtocol.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\LogicalMethodInfo.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\LogicalMethodTypes.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\MatchAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\MimeFormatter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\MimeParameterReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\MimeParameterWriter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\MimeReturnReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\NopReturnReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\PatternMatcher.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapClientMessage.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapClientMethod.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapDocumentMethodAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapDocumentServiceAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapException.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapExtension.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapExtensionAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapHeader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapHeaderAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapHeaderCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapHeaderDirection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapHeaderException.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapHttpClientProtocol.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapMessage.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapMessageStage.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapParameterStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapRpcMethodAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapRpcServiceAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapServerMessage.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapServerProtocol.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapServiceRoutingStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\SoapUnknownHeader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\TextReturnReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\UrlEncodedParameterWriter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\UrlParameterReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\UrlParameterWriter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\ValueCollectionParameterReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\WebClientAsyncResult.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\WebClientProtocol.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\WebServiceHandlerFactory.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Web.Services.Protocols\XmlReturnReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+            </Include>

+        </Files>

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog
new file mode 100644
index 00000000000..b91825974fc
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/ChangeLog
@@ -0,0 +1,6 @@
+2002-07-21 Tim Coleman  <tim@timcoleman.com>
+	* ChangeLog:
+	* XmlFormatExtensionAttribute.cs:
+	* XmlFormatExtensionPointAttribute.cs:
+	* XmlFormatExtensionPrefixAttribute.cs:
+		New files added
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/XmlFormatExtensionAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/XmlFormatExtensionAttribute.cs
new file mode 100644
index 00000000000..eda21c22cec
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/XmlFormatExtensionAttribute.cs
@@ -0,0 +1,77 @@
+ // 

+// System.Web.Services.Configuration.XmlFormatExtensionAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Configuration {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class XmlFormatExtensionAttribute : Attribute {

+

+		#region Fields

+

+		string elementName;

+		string ns;

+		Type[] extensionPoints;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public XmlFormatExtensionAttribute ()

+		{

+		}

+

+		public XmlFormatExtensionAttribute (string elementName, string ns, Type extensionPoint1)

+			: this (elementName, ns, new Type[1] {extensionPoint1})

+		{

+		}

+

+		public XmlFormatExtensionAttribute (string elementName, string ns, Type[] extensionPoints)

+			: this ()

+		{

+			this.elementName = elementName;

+			this.ns = ns;

+			this.extensionPoints = extensionPoints;

+		}

+

+		public XmlFormatExtensionAttribute (string elementName, string ns, Type extensionPoint1, Type extensionPoint2)

+			: this (elementName, ns, new Type[2] {extensionPoint1, extensionPoint2})

+		{

+		}

+

+		public XmlFormatExtensionAttribute (string elementName, string ns, Type extensionPoint1, Type extensionPoint2, Type extensionPoint3)

+			: this (elementName, ns, new Type[3] {extensionPoint1, extensionPoint2, extensionPoint3})

+		{

+		}

+

+		public XmlFormatExtensionAttribute (string elementName, string ns, Type extensionPoint1, Type extensionPoint2, Type extensionPoint3, Type extensionPoint4)

+			: this (elementName, ns, new Type[4] {extensionPoint1, extensionPoint2, extensionPoint3, extensionPoint4})

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public string ElementName {

+			get { return elementName; }

+			set { elementName = value; }

+		}

+

+		public Type[] ExtensionPoints {

+			get { return extensionPoints; }

+			set { extensionPoints = value; }

+		}

+

+		public string Namespace {

+			get { return ns; }

+			set { ns = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/XmlFormatExtensionPointAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/XmlFormatExtensionPointAttribute.cs
new file mode 100644
index 00000000000..f7cac2e032f
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/XmlFormatExtensionPointAttribute.cs
@@ -0,0 +1,44 @@
+ // 

+// System.Web.Services.Configuration.XmlFormatExtensionPointAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Configuration {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class XmlFormatExtensionPointAttribute : Attribute {

+

+		#region Fields

+

+		bool allowElements;

+		string memberName;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public XmlFormatExtensionPointAttribute (string memberName)

+		{

+			allowElements = false; // FIXME

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool AllowElements {

+			get { return allowElements; }

+			set { allowElements = value; }

+		}

+

+		public string MemberName {	

+			get { return memberName; }

+			set { memberName = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Configuration/XmlFormatExtensionPrefixAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Configuration/XmlFormatExtensionPrefixAttribute.cs
new file mode 100644
index 00000000000..91ed4038e60
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Configuration/XmlFormatExtensionPrefixAttribute.cs
@@ -0,0 +1,50 @@
+ // 

+// System.Web.Services.Configuration.XmlFormatExtensionPrefixAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Configuration {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class XmlFormatExtensionPrefixAttribute : Attribute {

+

+		#region Fields

+

+		string prefix;

+		string ns;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public XmlFormatExtensionPrefixAttribute ()

+		{

+		}

+

+		public XmlFormatExtensionPrefixAttribute (string prefix, string ns)

+			: this ()

+		{

+			this.prefix = prefix;

+			this.ns = ns;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string Prefix {

+			get { return prefix; }

+			set { prefix = value; }

+		}

+

+		public string Namespace {

+			get { return ns; }

+			set { ns = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs
new file mode 100644
index 00000000000..9b7206f596e
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Binding.cs
@@ -0,0 +1,80 @@
+// 

+// System.Web.Services.Description.Binding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPoint ("Extensions")]

+	public sealed class Binding : DocumentableItem {

+

+		#region Fields

+

+		ServiceDescriptionFormatExtensionCollection extensions;

+		string name;

+		OperationBindingCollection operations;

+		ServiceDescription serviceDescription;

+		XmlQualifiedName type;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public Binding ()

+		{

+			extensions = new ServiceDescriptionFormatExtensionCollection (this);

+			name = String.Empty;

+			operations = new OperationBindingCollection (this);

+			serviceDescription = null;

+			type = XmlQualifiedName.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public ServiceDescriptionFormatExtensionCollection Extensions { 	

+			get { return extensions; }

+		}

+

+		[XmlAttribute ("name", DataType = "NCName")]	

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		[XmlElement ("operation")]

+		public OperationBindingCollection Operations {

+			get { return operations; }

+		}

+

+		public ServiceDescription ServiceDescription {

+			get { return serviceDescription; }

+		}

+

+		[XmlAttribute ("type")]	

+		public XmlQualifiedName Type {

+			get { return type; }

+			set { type = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (ServiceDescription serviceDescription)

+		{

+			this.serviceDescription = serviceDescription;

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/BindingCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/BindingCollection.cs
new file mode 100644
index 00000000000..257bda99c6a
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/BindingCollection.cs
@@ -0,0 +1,92 @@
+// 

+// System.Web.Services.Description.BindingCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class BindingCollection : ServiceDescriptionBaseCollection {

+		

+		#region Fields

+

+		ServiceDescription serviceDescription;

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		internal BindingCollection (ServiceDescription serviceDescription) 

+			: base (serviceDescription)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public Binding this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+				return (Binding) List[index]; 

+			}

+                        set { List [index] = value; }

+		}

+

+		public Binding this [string name] {

+			get { return this[IndexOf ((Binding) Table[name])]; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (Binding binding) 

+		{

+			Insert (Count, binding);

+			return (Count - 1);

+		}

+

+		public bool Contains (Binding binding)

+		{

+			return List.Contains (binding);

+		}

+

+		public void CopyTo (Binding[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		protected override string GetKey (object value) 

+		{

+			if (!(value is Binding))

+				throw new InvalidCastException ();

+			return ((Binding) value).Name;

+		}

+

+		public int IndexOf (Binding binding)

+		{

+			return List.IndexOf (binding);

+		}

+

+		public void Insert (int index, Binding binding)

+		{

+			List.Insert (index, binding);

+		}

+	

+		public void Remove (Binding binding)

+		{

+			List.Remove (binding);

+		}

+			

+		protected override void SetParent (object value, object parent)

+		{

+			((Binding) value).SetParent ((ServiceDescription) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
new file mode 100644
index 00000000000..779d19a55c9
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ChangeLog
@@ -0,0 +1,289 @@
+2002-08-20  Tim Coleman <tim@timcoleman.com>
+	* ServiceDescription.cs:
+		Add ServiceDescription.ServiceDescriptionSerializer
+		class.
+	* ServiceDescriptionFormatExtensionCollection.cs:
+		Remove reference to "parent".
+
+2002-08-19  Tim Coleman <tim@timcoleman.com>
+	* BindingCollection.cs:
+		Use base constructor, remove SetParent call
+	* FaultBindingCollection.cs:
+	* ImportCollection.cs:
+	* MessageCollection.cs:
+	* MessagePartCollection.cs:
+	* OperationBindingCollection.cs:
+	* OperationCollection.cs:
+	* OperationFaultCollection.cs:
+	* PortCollection.cs:
+	* PortTypeCollection.cs:
+	* ServiceCollection.cs:
+	* ServiceDescriptionFormatExtensionCollection.cs:
+		Use base constructor
+	* ServiceDescriptionCollection.cs:
+		Use base constructor, Remove SetParent method
+	* ServiceDescriptionBaseCollection.cs:
+		Make parent object private as according to
+		class status page.
+	* OperationMessageCollection.cs:
+		Use base constructor
+		Remove excess break's to avoid compiler warning
+		Remove TODO attribute (confirmed default retval)
+
+2002-08-15  Tim Coleman <tim@timcoleman.com>
+	* FaultBindingCollection.cs:
+	* ImportCollection.cs:
+	* MessageCollection.cs:
+	* MessagePartCollection.cs:
+	* OperationBindingCollection.cs:
+	* OperationCollection.cs:
+	* OperationFaultCollection.cs:
+	* OperationMessageCollection.cs:
+	* PortCollection.cs:
+	* PortTypeCollection.cs:
+	* ServiceCollection.cs:
+	* ServiceDescriptionFormatExtensionCollection.cs:
+		Use parent from ServiceDescriptionBaseCollection
+	* ServiceDescriptionCollection.cs:
+		Use parent from ServiceDescriptionBaseCollection
+		Implement SetParent () method
+	* ServiceDescriptionBaseCollection.cs:
+		Add "parent" object.
+		Add SetParent call to OnSet() and OnInsert ()
+
+2002-08-12  Tim Coleman <tim@timcoleman.com>
+	* Operation.cs:
+		Fix ParameterOrderString in case ParameterOrder is
+		null.
+	* BindingCollection.cs:
+		Remove Table handling on insert/delete/indexer
+		because it is handled in base class.
+	* ServiceDescriptionBaseCollection.cs:
+		Only add an element to the hashtable if its GetKey ()
+		method does not return null. 
+
+2002-08-09  Tim Coleman <tim@timcoleman.com>
+	* BindingCollection.cs: 
+	* ServiceDescriptionCollection.cs: 
+		Implement Set indexer
+	* FaultBindingCollection.cs:
+	* MessageCollection.cs:
+	* MessagePartCollection.cs:
+	* OperationFaultCollection.cs:
+	* PortCollection.cs:
+	* PortTypeCollection.cs:
+	* ServiceCollection.cs:
+		Implement Set indexer, code cleanup
+	* Message.cs:
+		Implement FindPartByName ()
+	* OperationMessageCollection.cs:
+		Alter OnSet () method
+	* ServiceDescriptionBaseCollection.cs:
+		Implement some methods.
+	* ServiceDescriptionFormatExtensionCollection.cs:
+		Implement Find (), FindAll (), OnValidate () methods
+		
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>
+	* ServiceDescription.cs:
+		Add namespace definitions when serializing.
+	* HttpBinding.cs:
+		Change namespace definition (wsdl was spelt wsld)
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>
+	* ServiceDescription.cs:
+		Change the XmlElement name from "type" to "types" for
+		the Types object
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>
+	* ServerProtocol.cs:
+		Add new class as implied by class statuc page.
+		SoapServerProtocol is derived from this.
+	* SoapServerProtocol.cs:
+		Change base class to ServerProtocol.
+	* SoapClientMethod.cs:
+		This class should not be sealed.
+
+2002-08-03  Tim Coleman <tim@timcoleman.com>
+	* SoapProtocolReflector.cs:
+		Removed SoapBinding property and made the class
+		not sealed to agree with class reference page.
+
+2002-08-03  Tim Coleman <tim@timcoleman.com>
+	* ServiceDescriptionBaseCollection.cs:
+		Removed some NotImplementedException()'s so that
+		it runs.
+
+2002-07-26  Tim Coleman <tim@timcoleman.com>
+	* ServiceDescription.cs:
+		Changed the creation of the XmlSerializer after 
+		consulting the System.Xml.Serialization namespace
+		and trying to serialize a document.  Now works somewhat!
+
+2002-07-25  Tim Coleman <tim@timcoleman.com>
+	* OperationMessageCollection.cs:
+		Some implementation of this class after consulting a
+		WSDL reference.  Now validates the inputs.
+
+2002-07-24  Tim Coleman <tim@timcoleman.com>	
+	* ProtocolImporter.cs:
+	* ProtocolReflector.cs:
+		Some implementation of these classes.  MonoTODO's begone!
+	* SoapProtocolImporter.cs:
+		Changed description to literal string "Soap"
+	* SoapProtocolReflector.cs:
+		Added a new class based on guesswork and conjecture.
+
+2002-07-24  Tim Coleman <tim@timcoleman.com>
+	* ServiceDescription.cs:
+		Implement Read/Write methods for serialization/
+		deserialization.
+
+2002-07-23  Tim Coleman <tim@timcoleman.com>
+	* ServiceDescription.cs:
+		Add XmlIgnore attribute to ServiceDescriptions property
+	* OperationFlow.cs:
+	* ServiceDescriptionImportWarnings.cs:
+		Explicitly set values in enumeration to match
+		.NET.
+
+2002-07-22 Tim Coleman <tim@timcoleman.com>	
+	* Binding.cs:
+	* BindingCollection.cs:
+	* DocumentableItem.cs:
+	* FaultBinding.cs:
+	* FaultBindingCollection.cs:
+	* HttpAddressBinding.cs:
+	* HttpBinding.cs:
+	* HttpOperationBinding.cs:
+	* HttpUrlEncodedBinding.cs:
+	* HttpUrlReplacementBinding.cs:
+	* Import.cs:
+	* ImportCollection.cs:
+	* InputBinding.cs:
+	* Message.cs:
+	* MessageBinding.cs:
+	* MessageCollection.cs:
+	* MessagePart.cs:
+	* MessagePartCollection.cs:
+	* MimeContentBinding.cs:
+	* MimeMultipartRelatedBinding.cs:
+	* MimePart.cs:
+	* MimePartCollection.cs:
+	* MimeTextBinding.cs:
+	* MimeTextMatch.cs:
+	* MimeTextMatchCollection.cs:
+	* MimeXmlBinding.cs:
+	* Operation.cs:
+	* OperationBinding.cs:
+	* OperationBindingCollection.cs:
+	* OperationCollection.cs:
+	* OperationFaultCollection.cs:
+	* OperationFlow.cs:
+	* OperationMessage.cs:
+	* OperationMessageCollection.cs:
+	* OutputBinding.cs:
+	* Port.cs:
+	* PortCollection.cs:
+	* PortType.cs:
+	* PortTypeCollection.cs:
+	* ProtocolImporter.cs:
+	* Service.cs:
+	* ServiceCollection.cs:
+	* ServiceDescription.cs:
+	* ServiceDescriptionBaseCollection.cs:
+	* ServiceDescriptionCollection.cs:
+	* ServiceDescriptionFormatExtension.cs:
+	* ServiceDescriptionFormatExtensionCollection.cs:
+	* ServiceDescriptionImportWarnings.cs:
+	* SoapAddressBinding.cs:
+	* SoapBinding.cs:
+	* SoapBindingStyle.cs:
+	* SoapBindingUse.cs:
+	* SoapBodyBinding.cs:
+	* SoapExtensionImporter.cs:
+	* SoapExtensionReflector.cs:
+	* SoapFaultBinding.cs:
+	* SoapHeaderBinding.cs:
+	* SoapHeaderFaultBinding.cs:
+	* SoapOperationBinding.cs:
+	* SoapTransportImporter.cs:
+	* Types.cs:
+		1. Add missing attributes as determined by reflection
+		2. Fix protection levels where appropriate
+		3. Add missing items where appropriate
+		Basically, this was a change to remove all the X's from	
+		the project status page for this namespace :)
+
+2002-07-19 Tim Coleman  <tim@timcoleman.com>	
+	* Binding.cs:
+	* BindingCollection.cs:
+	* ChangeLog:
+	* DocumentableItem.cs:
+	* FaultBinding.cs:
+	* FaultBindingCollection.cs:
+	* HttpAddressBinding.cs:
+	* HttpBinding.cs:
+	* HttpOperationBinding.cs:
+	* HttpUrlEncodedBinding.cs:
+	* HttpUrlReplacementBinding.cs:
+	* Import.cs:
+	* ImportCollection.cs:
+	* InputBinding.cs:
+	* Message.cs:
+	* MessageBinding.cs:
+	* MessageCollection.cs:
+	* MessagePart.cs:
+	* MessagePartCollection.cs:
+	* MimeContentBinding.cs:
+	* MimeMultipartRelatedBinding.cs:
+	* MimePart.cs:
+	* MimePartCollection.cs:
+	* MimeTextBinding.cs:
+	* MimeTextMatch.cs:
+	* MimeTextMatchCollection.cs:
+	* MimeXmlBinding.cs:
+	* Operation.cs:
+	* OperationBinding.cs:
+	* OperationBindingCollection.cs:
+	* OperationCollection.cs:
+	* OperationFault.cs:
+	* OperationFaultCollection.cs:
+	* OperationFlow.cs:
+	* OperationInput.cs:
+	* OperationMessage.cs:
+	* OperationMessageCollection.cs:
+	* OperationOutput.cs:
+	* OutputBinding.cs:
+	* Port.cs:
+	* PortCollection.cs:
+	* PortType.cs:
+	* PortTypeCollection.cs:
+	* ProtocolImporter.cs:
+	* ProtocolReflector.cs:
+	* Service.cs:
+	* ServiceCollection.cs:
+	* ServiceDescription.cs:
+	* ServiceDescriptionBaseCollection.cs:
+	* ServiceDescriptionCollection.cs:
+	* ServiceDescriptionFormatExtension.cs:
+	* ServiceDescriptionFormatExtensionCollection.cs:
+	* ServiceDescriptionImportStyle.cs:
+	* ServiceDescriptionImportWarnings.cs:
+	* ServiceDescriptionImporter.cs:
+	* ServiceDescriptionReflector.cs:
+	* SoapAddressBinding.cs:
+	* SoapBinding.cs:
+	* SoapBindingStyle.cs:
+	* SoapBindingUse.cs:
+	* SoapBodyBinding.cs:
+	* SoapExtensionImporter.cs:
+	* SoapExtensionReflector.cs:
+	* SoapFaultBinding.cs:
+	* SoapHeaderBinding.cs:
+	* SoapHeaderFaultBinding.cs:
+	* SoapOperationBinding.cs:
+	* SoapProtocolImporter.cs:
+	* SoapTransportImporter.cs:
+	* Types.cs:
+		Initial implementation
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/DocumentableItem.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/DocumentableItem.cs
new file mode 100644
index 00000000000..8c4e2a78f3c
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/DocumentableItem.cs
@@ -0,0 +1,42 @@
+// 

+// System.Web.Services.Description.DocumentableItem.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public abstract class DocumentableItem {

+

+		#region Fields

+

+		string documentation;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		protected DocumentableItem ()

+		{

+			documentation = String.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlElement ("documentation")]

+		[DefaultValue ("")]

+		public string Documentation {

+			get { return documentation; }

+			set { documentation = value; }

+		}

+	

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/FaultBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/FaultBinding.cs
new file mode 100644
index 00000000000..423a08060b2
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/FaultBinding.cs
@@ -0,0 +1,52 @@
+// 

+// System.Web.Services.Description.FaultBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPoint ("Extensions")]

+	public sealed class FaultBinding : MessageBinding {

+

+		#region Fields

+

+		ServiceDescriptionFormatExtensionCollection extensions;

+		OperationBinding operationBinding;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public FaultBinding ()

+		{

+			extensions = new ServiceDescriptionFormatExtensionCollection (this);

+			operationBinding = null;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public override ServiceDescriptionFormatExtensionCollection Extensions { 	

+			get { return extensions; }

+		}

+	

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (OperationBinding operationBinding)

+		{

+			this.operationBinding = operationBinding;

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/FaultBindingCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/FaultBindingCollection.cs
new file mode 100644
index 00000000000..fe885c1bd4e
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/FaultBindingCollection.cs
@@ -0,0 +1,87 @@
+// 

+// System.Web.Services.Description.FaultBindingCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class FaultBindingCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+

+		internal FaultBindingCollection (OperationBinding operationBinding) 

+			: base (operationBinding)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public FaultBinding this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+				return (FaultBinding) List[index]; 

+			}

+                        set { List [index] = value; }

+		}

+

+		public FaultBinding this [string name] {

+			get { return this [IndexOf ((FaultBinding) Table[name])]; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (FaultBinding bindingOperationFault) 

+		{

+			Insert (Count, bindingOperationFault);

+			return (Count - 1);

+		}

+

+		public bool Contains (FaultBinding bindingOperationFault)

+		{

+			return List.Contains (bindingOperationFault);

+		}

+

+		public void CopyTo (FaultBinding[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		protected override string GetKey (object value) 

+		{

+			if (!(value is FaultBinding))

+				throw new InvalidCastException ();

+

+			return ((FaultBinding) value).Name;

+		}

+

+		public int IndexOf (FaultBinding bindingOperationFault)

+		{

+			return List.IndexOf (bindingOperationFault);

+		}

+

+		public void Insert (int index, FaultBinding bindingOperationFault)

+		{

+			List.Insert (index, bindingOperationFault);

+		}

+	

+		public void Remove (FaultBinding bindingOperationFault)

+		{

+			List.Remove (bindingOperationFault);

+		}

+			

+		protected override void SetParent (object value, object parent)

+		{

+			((FaultBinding) value).SetParent ((OperationBinding) parent);	

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/HttpAddressBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpAddressBinding.cs
new file mode 100644
index 00000000000..b35eb111bf8
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpAddressBinding.cs
@@ -0,0 +1,42 @@
+// 

+// System.Web.Services.Description.HttpAddressBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization; 

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("address", "http://schemas.xmlsoap.org/wsdl/http/", typeof (Port))]

+	public sealed class HttpAddressBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		string location;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public HttpAddressBinding ()

+		{

+			location = String.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("location")]

+		public string Location { 	

+			get { return location; }

+			set { location = value; }

+		}

+	

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/HttpBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpBinding.cs
new file mode 100644
index 00000000000..fe5adf056a9
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpBinding.cs
@@ -0,0 +1,44 @@
+// 

+// System.Web.Services.Description.HttpBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("binding", "http://schemas.xmlsoap.org/wsdl/http/", typeof (Binding))]

+	[XmlFormatExtensionPrefix ("http", "http://schemas.xmlsoap.org/wsdl/http/")]

+	public sealed class HttpBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		public const string Namespace = "http://schemas.xmlsoap.org/wsdl/http/";

+		string verb;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public HttpBinding ()

+		{

+			verb = String.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("verb", DataType = "NMTOKEN")]

+		public string Verb { 	

+			get { return verb; }

+			set { verb = value; }

+		}

+	

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/HttpOperationBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpOperationBinding.cs
new file mode 100644
index 00000000000..0115dbb0b61
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpOperationBinding.cs
@@ -0,0 +1,42 @@
+// 

+// System.Web.Services.Description.HttpOperationBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("operation", "http://schemas.xmlsoap.org/wsdl/http/", typeof (OperationBinding))]

+	public sealed class HttpOperationBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		string location;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public HttpOperationBinding ()

+		{

+			location = String.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("location")]

+		public string Location { 	

+			get { return location; }

+			set { location = value; }

+		}

+	

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/HttpUrlEncodedBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpUrlEncodedBinding.cs
new file mode 100644
index 00000000000..4ce0e0fe4f9
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpUrlEncodedBinding.cs
@@ -0,0 +1,24 @@
+// 

+// System.Web.Services.Description.HttpUrlEncodedBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("urlEncoded", "http://schemas.xmlsoap.org/wsdl/http/", typeof (InputBinding))]

+	public sealed class HttpUrlEncodedBinding : ServiceDescriptionFormatExtension {

+

+		#region Constructors

+		

+		public HttpUrlEncodedBinding ()

+		{

+		}

+		

+		#endregion // Constructors

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/HttpUrlReplacementBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpUrlReplacementBinding.cs
new file mode 100644
index 00000000000..9414c8cbd46
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/HttpUrlReplacementBinding.cs
@@ -0,0 +1,24 @@
+// 

+// System.Web.Services.Description.HttpUrlReplacementBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("urlReplacement", "http://schemas.xmlsoap.org/wsdl/http/", typeof (InputBinding))]

+	public sealed class HttpUrlReplacementBinding : ServiceDescriptionFormatExtension {

+

+		#region Constructors

+		

+		public HttpUrlReplacementBinding ()

+		{

+		}

+		

+		#endregion // Constructors

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs
new file mode 100644
index 00000000000..8c36325bf19
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Import.cs
@@ -0,0 +1,63 @@
+// 

+// System.Web.Services.Description.Import.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public sealed class Import : DocumentableItem {

+

+		#region Fields

+

+		string location;

+		string ns;

+		ServiceDescription serviceDescription;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public Import ()

+		{

+			location = String.Empty;

+			ns = String.Empty;

+			serviceDescription = null;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("location")]

+		public string Location {

+			get { return location; }

+			set { location = value; }

+		}

+

+		[XmlAttribute ("namespace")]

+		public string Namespace {

+			get { return ns; }

+			set { ns = value; }

+		}

+	

+		public ServiceDescription ServiceDescription {

+			get { return serviceDescription; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (ServiceDescription serviceDescription)

+		{

+			this.serviceDescription = serviceDescription;

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ImportCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ImportCollection.cs
new file mode 100644
index 00000000000..a1cfd6eb14f
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ImportCollection.cs
@@ -0,0 +1,75 @@
+// 

+// System.Web.Services.Description.ImportCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class ImportCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+		

+		internal ImportCollection (ServiceDescription serviceDescription)

+			: base (serviceDescription)

+		{

+		}

+

+		#endregion

+

+		#region Properties

+

+		public Import this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+				return (Import) List[index]; 

+			}

+			set { List [index] = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (Import import) 

+		{

+			Insert (Count, import);

+			return (Count - 1);

+		}

+

+		public bool Contains (Import import)

+		{

+			return List.Contains (import);

+		}

+

+		public void CopyTo (Import[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		public int IndexOf (Import import)

+		{

+			return List.IndexOf (import);

+		}

+

+		public void Insert (int index, Import import)

+		{

+			List.Insert (index, import);

+		}

+	

+		public void Remove (Import import)

+		{

+			List.Remove (import);

+		}

+			

+		protected override void SetParent (object value, object parent)

+		{

+			((Import) value).SetParent ((ServiceDescription) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/InputBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/InputBinding.cs
new file mode 100644
index 00000000000..d8b9483b2b1
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/InputBinding.cs
@@ -0,0 +1,41 @@
+// 

+// System.Web.Services.Description.InputBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPoint ("Extensions")]

+	public sealed class InputBinding : MessageBinding {

+

+		#region Fields

+

+		ServiceDescriptionFormatExtensionCollection extensions;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public InputBinding ()

+		{

+			extensions = new ServiceDescriptionFormatExtensionCollection (this);

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public override ServiceDescriptionFormatExtensionCollection Extensions { 	

+			get { return extensions; }

+		}

+	

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs
new file mode 100644
index 00000000000..3d812ee2c8d
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Message.cs
@@ -0,0 +1,86 @@
+// 

+// System.Web.Services.Description.Message.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+using System.Web.Services;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public sealed class Message : DocumentableItem {

+

+		#region Fields

+

+		string name;

+		MessagePartCollection parts;

+		ServiceDescription serviceDescription;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public Message ()

+		{

+			name = String.Empty;

+			parts = new MessagePartCollection (this);

+			serviceDescription = null;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("name", DataType = "NCName")]

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		[XmlElement ("part")]

+		public MessagePartCollection Parts {

+			get { return parts; }

+		}

+

+		public ServiceDescription ServiceDescription {

+			get { return serviceDescription; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public MessagePart FindPartByName (string partName)

+		{

+			return parts [partName];

+		}

+

+		public MessagePart[] FindPartsByName (string[] partNames) 

+		{

+			ArrayList searchResults = new ArrayList ();

+

+			foreach (string partName in partNames)

+				searchResults.Add (FindPartByName (partName));

+

+			int count = searchResults.Count;

+

+			if (count == 0)

+				throw new ArgumentException ();

+

+			MessagePart[] returnValue = new MessagePart[count];

+			searchResults.CopyTo (returnValue);

+			return returnValue;

+		}

+

+		internal void SetParent (ServiceDescription serviceDescription)

+		{

+			this.serviceDescription = serviceDescription;

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs
new file mode 100644
index 00000000000..6488901d9ff
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MessageBinding.cs
@@ -0,0 +1,51 @@
+// 

+// System.Web.Services.Description.MessageBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public abstract class MessageBinding : DocumentableItem {

+

+		#region Fields

+

+		string name;

+		OperationBinding operationBinding;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		protected MessageBinding ()

+		{

+			name = String.Empty;

+			operationBinding = new OperationBinding ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public abstract ServiceDescriptionFormatExtensionCollection Extensions { 	

+			get;

+		}

+

+		[XmlAttribute ("name", DataType = "NMTOKEN")]	

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+	

+		public OperationBinding OperationBinding {

+			get { return operationBinding; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MessageCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MessageCollection.cs
new file mode 100644
index 00000000000..1ba2bcf0afc
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MessageCollection.cs
@@ -0,0 +1,88 @@
+// 

+// System.Web.Services.Description.MessageCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class MessageCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+		

+		internal MessageCollection (ServiceDescription serviceDescription)

+			: base (serviceDescription)

+		{

+		}

+

+		#endregion

+

+		#region Properties

+

+		public Message this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+

+				return (Message) List [index]; 

+			}

+                        set { List [index] = value; }

+		}

+

+		public Message this [string name] {

+			get { return this [IndexOf ((Message) Table [name])]; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (Message message) 

+		{

+			Insert (Count, message);

+			return (Count - 1);

+		}

+

+		public bool Contains (Message message)

+		{

+			return List.Contains (message);

+		}

+

+		public void CopyTo (Message[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		protected override string GetKey (object value) 

+		{

+			if (!(value is Message))

+				throw new InvalidCastException ();

+

+			return ((Message) value).Name;

+		}

+

+		public int IndexOf (Message message)

+		{

+			return List.IndexOf (message);

+		}

+

+		public void Insert (int index, Message message)

+		{

+			List.Insert (index, message);

+		}

+	

+		public void Remove (Message message)

+		{

+			List.Remove (message);

+		}

+			

+		protected override void SetParent (object value, object parent)

+		{

+			((Message) value).SetParent ((ServiceDescription) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs
new file mode 100644
index 00000000000..8b6923807f3
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePart.cs
@@ -0,0 +1,73 @@
+// 

+// System.Web.Services.Description.MessagePart.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public sealed class MessagePart : DocumentableItem {

+

+		#region Fields

+

+		XmlQualifiedName element;

+		Message message;

+		string name;

+		XmlQualifiedName type;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public MessagePart ()

+		{

+			element = XmlQualifiedName.Empty;

+			message = null;

+			name = String.Empty;

+			type = XmlQualifiedName.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("element")]

+		public XmlQualifiedName Element {

+			get { return element; }

+			set { element = value; }

+		}

+		

+		public Message Message {

+			get { return message; }

+		}

+	

+		[XmlAttribute ("name", DataType = "NMTOKEN")]

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		[XmlAttribute ("type")]

+		public XmlQualifiedName Type {

+			get { return type; }

+			set { type = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (Message message)

+		{

+			this.message = message; 

+		}

+

+		#endregion // Methods

+

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePartCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePartCollection.cs
new file mode 100644
index 00000000000..6f35c6d9ef4
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MessagePartCollection.cs
@@ -0,0 +1,86 @@
+// 

+// System.Web.Services.Description.MessagePartCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class MessagePartCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+

+		internal MessagePartCollection (Message message)

+			: base (message)

+		{

+		}	

+

+		#endregion

+

+		#region Properties

+

+		public MessagePart this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+				return (MessagePart) List[index]; 

+			}

+                        set { List [index] = value; }

+		}

+

+		public MessagePart this [string name] {

+			get { return this [IndexOf ((MessagePart) Table[name])]; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (MessagePart messagePart) 

+		{

+			Insert (Count, messagePart);

+			return (Count - 1);

+		}

+

+		public bool Contains (MessagePart messagePart)

+		{

+			return List.Contains (messagePart);

+		}

+

+		public void CopyTo (MessagePart[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		protected override string GetKey (object value) 

+		{

+			if (!(value is MessagePart))

+				throw new InvalidCastException ();

+			return ((MessagePart) value).Name;

+		}

+

+		public int IndexOf (MessagePart messagePart)

+		{

+			return List.IndexOf (messagePart);

+		}

+

+		public void Insert (int index, MessagePart messagePart)

+		{

+			List.Insert (index, messagePart);

+		}

+	

+		public void Remove (MessagePart messagePart)

+		{

+			List.Remove (messagePart);

+		}

+			

+		protected override void SetParent (object value, object parent)

+		{

+			((MessagePart) value).SetParent ((Message) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MimeContentBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeContentBinding.cs
new file mode 100644
index 00000000000..6c1871f0002
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeContentBinding.cs
@@ -0,0 +1,52 @@
+// 

+// System.Web.Services.Description.MimeContentBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPrefix ("mime", "http://schemas.xmlsoap.org/wsdl/mime/")]

+	[XmlFormatExtension ("content", "http://schemas.xmlsoap.org/wsdl/mime/", typeof (InputBinding), typeof (OutputBinding))]

+	public sealed class MimeContentBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		public const string Namespace = "http://schemas.xmlsoap.org/wsdl/mime/";

+		string part;

+		string type;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public MimeContentBinding ()

+		{

+			part = String.Empty;

+			type = String.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("part", DataType = "NMTOKEN")]	

+		public string Part {

+			get { return part; }

+			set { part = value; }

+		}

+

+		[XmlAttribute ("type")]

+		public string Type {

+			get { return type; }

+			set { type = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MimeMultipartRelatedBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeMultipartRelatedBinding.cs
new file mode 100644
index 00000000000..625638a4e7f
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeMultipartRelatedBinding.cs
@@ -0,0 +1,41 @@
+// 

+// System.Web.Services.Description.MimeMultipartRelatedBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("multipartRelated", "http://schemas.xmlsoap.org/wsdl/mime/", typeof (InputBinding), typeof (OutputBinding))]

+	public sealed class MimeMultipartRelatedBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		MimePartCollection parts;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public MimeMultipartRelatedBinding ()

+		{

+			parts = new MimePartCollection ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlElement ("parts")]	

+		public MimePartCollection Parts {

+			get { return parts; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MimePart.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MimePart.cs
new file mode 100644
index 00000000000..9723912f4a3
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MimePart.cs
@@ -0,0 +1,41 @@
+// 

+// System.Web.Services.Description.MimePart.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPoint ("Extensions")]

+	public sealed class MimePart : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		ServiceDescriptionFormatExtensionCollection extensions;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public MimePart ()

+		{

+			extensions = new ServiceDescriptionFormatExtensionCollection (this);

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]	

+		public ServiceDescriptionFormatExtensionCollection Extensions {

+			get { return extensions; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MimePartCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MimePartCollection.cs
new file mode 100644
index 00000000000..fefe85c9304
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MimePartCollection.cs
@@ -0,0 +1,64 @@
+// 

+// System.Web.Services.Description.MimePartCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+

+namespace System.Web.Services.Description {

+	public sealed class MimePartCollection : CollectionBase {

+

+		#region Properties

+

+		public MimePart this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+

+				return (MimePart) List[index]; 

+			}

+			set { List[index] = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (MimePart mimePart) 

+		{

+			Insert (Count, mimePart);	

+			return (Count - 1);

+		}

+

+		public bool Contains (MimePart mimePart)

+		{

+			return List.Contains (mimePart);

+		}

+

+		public void CopyTo (MimePart[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		public int IndexOf (MimePart mimePart)

+		{

+			return List.IndexOf (mimePart);

+		}

+

+		public void Insert (int index, MimePart mimePart)

+		{

+			List.Insert (index, mimePart);

+		}

+	

+		public void Remove (MimePart mimePart)

+		{

+			List.Remove (mimePart);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MimeTextBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeTextBinding.cs
new file mode 100644
index 00000000000..9ce4fd4945d
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeTextBinding.cs
@@ -0,0 +1,43 @@
+// 

+// System.Web.Services.Description.MimeTextBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("text", "http://microsoft.com/wsdl/mime/textMatching/", typeof (InputBinding), typeof (OutputBinding), typeof (MimePart))]

+	[XmlFormatExtensionPrefix ("tm", "http://microsoft.com/wsdl/mime/textMatching/")]

+	public sealed class MimeTextBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		public const string Namespace = "http://microsoft.com/wsdl/mime/textMatching/";

+		MimeTextMatchCollection matches;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public MimeTextBinding ()

+		{

+			matches = new MimeTextMatchCollection ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlElement ("match", typeof (MimeTextMatch))]	

+		public MimeTextMatchCollection Matches {

+			get { return matches; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MimeTextMatch.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeTextMatch.cs
new file mode 100644
index 00000000000..87c9b20122d
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeTextMatch.cs
@@ -0,0 +1,126 @@
+// 

+// System.Web.Services.Description.MimeTextMatch.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public sealed class MimeTextMatch {

+

+		#region Fields

+

+		int capture;

+		int group;

+		bool ignoreCase;

+		MimeTextMatchCollection matches;

+		string name;

+		string pattern;

+		int repeats;

+		string type;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public MimeTextMatch ()

+		{

+			capture = 0;

+			group = 1;

+			ignoreCase = false;

+			matches = null;

+			name = String.Empty;

+			pattern = String.Empty;

+			repeats = 1;

+			type = String.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[DefaultValue (0)]

+		[XmlAttribute ("capture")]

+		public int Capture {

+			get { return capture; }

+			set {

+				if (value < 0)

+					throw new ArgumentException ();

+				capture = value; 

+			}

+		}

+	

+		[DefaultValue (1)]	

+		[XmlAttribute ("group")]

+		public int Group {

+			get { return group; }

+			set {

+				if (value < 0)

+					throw new ArgumentException ();

+				group = value; 

+			}

+		}

+

+		[XmlAttribute ("ignoreCase")]

+		public bool IgnoreCase {

+			get { return ignoreCase; }

+			set { ignoreCase = value; }

+		}

+

+		[XmlElement ("match")]

+		public MimeTextMatchCollection Matches {

+			get { return matches; }

+		}

+

+		[XmlAttribute ("name")]

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		[XmlAttribute ("pattern")]

+		public string Pattern {

+			get { return pattern; }

+			set { pattern = value; }

+		}

+

+		[XmlIgnore]

+		public int Repeats {

+			get { return repeats; }

+			set {

+				if (value < 0)

+					throw new ArgumentException ();

+				repeats = value; 

+			}

+		}

+

+		[DefaultValue ("1")]

+		[XmlAttribute ("repeats")]

+		public string RepeatsString {

+			get { return Repeats.ToString (); }

+			set { Repeats = Int32.Parse (value); }

+		}

+

+		[XmlAttribute ("type")]

+		public string Type {

+			get { return type; }

+			set { type = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (MimeTextMatchCollection matches) 

+		{

+			this.matches = matches;

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MimeTextMatchCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeTextMatchCollection.cs
new file mode 100644
index 00000000000..59dd634a017
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeTextMatchCollection.cs
@@ -0,0 +1,70 @@
+// 

+// System.Web.Services.Description.MimeTextMatchCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+

+namespace System.Web.Services.Description {

+	public sealed class MimeTextMatchCollection : CollectionBase {

+

+		#region Properties

+

+		public MimeTextMatch this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+

+				return (MimeTextMatch) List [index]; 

+			}

+			set { List[index] = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (MimeTextMatch match) 

+		{

+			Insert (Count, match);

+			return (Count - 1);

+		}

+

+		public bool Contains (MimeTextMatch match)

+		{

+			return List.Contains (match);

+		}

+

+		public void CopyTo (MimeTextMatch[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		public int IndexOf (MimeTextMatch match)

+		{

+			return List.IndexOf (match);

+		}

+

+		public void Insert (int index, MimeTextMatch match)

+		{

+			SetParent (match, this);

+			List.Insert (index, match);

+		}

+	

+		public void Remove (MimeTextMatch match)

+		{

+			List.Remove (match);

+		}

+

+		private void SetParent (object value, object parent)

+		{

+			((MimeTextMatch) value).SetParent ((MimeTextMatchCollection) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/MimeXmlBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeXmlBinding.cs
new file mode 100644
index 00000000000..93859fdaa1f
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/MimeXmlBinding.cs
@@ -0,0 +1,42 @@
+// 

+// System.Web.Services.Description.MimeXmlBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("mimeXml", "http://schemas.xmlsoap.org/wsdl/mime/", typeof (MimePart), typeof (InputBinding), typeof (OutputBinding))]

+	public sealed class MimeXmlBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		string part;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public MimeXmlBinding ()

+		{

+			part = String.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("part", DataType = "NMTOKEN")]

+		public string Part {

+			get { return part; }

+			set { part = value; }

+		}

+		

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs
new file mode 100644
index 00000000000..2823503f126
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Operation.cs
@@ -0,0 +1,96 @@
+// 

+// System.Web.Services.Description.Operation.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public sealed class Operation : DocumentableItem {

+

+		#region Fields

+

+		OperationFaultCollection faults;

+		OperationMessageCollection messages;

+		string name;

+		string[] parameterOrder;

+		PortType portType;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public Operation ()

+		{

+			faults = new OperationFaultCollection (this);

+			messages = new OperationMessageCollection (this);

+			name = String.Empty;

+			parameterOrder = null;

+			portType = null;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlElement ("fault")]

+		public OperationFaultCollection Faults {

+			get { return faults; }

+		}

+

+		[XmlElement ("output", typeof (OperationOutput))]

+		[XmlElement ("input", typeof (OperationInput))]

+		public OperationMessageCollection Messages {

+			get { return messages; }

+		}

+

+		[XmlAttribute ("name", DataType = "NCName")]

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		[XmlIgnore]

+		public string[] ParameterOrder {

+			get { return parameterOrder; }

+			set { parameterOrder = value; }

+		}

+

+		[DefaultValue ("")]

+		[XmlAttribute ("parameterOrder")]

+		public string ParameterOrderString {

+			get { 

+				if (parameterOrder == null)

+					return String.Empty;

+				return String.Join (" ", parameterOrder); 

+			}

+			set { ParameterOrder = value.Split (' '); }

+		}

+

+		public PortType PortType {

+			get { return portType; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public bool IsBoundBy (OperationBinding operationBinding)

+		{

+			return (operationBinding.Name == Name);

+		}

+

+		internal void SetParent (PortType portType)

+		{

+			this.portType = portType;

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs
new file mode 100644
index 00000000000..0bdb5e9579a
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBinding.cs
@@ -0,0 +1,86 @@
+// 

+// System.Web.Services.Description.OperationBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPoint ("Extensions")]

+	public sealed class OperationBinding : DocumentableItem {

+

+		#region Fields

+

+		Binding binding;

+		ServiceDescriptionFormatExtensionCollection extensions;

+		FaultBindingCollection faults;

+		InputBinding input;

+		string name;

+		OutputBinding output;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public OperationBinding ()

+		{

+			extensions = new ServiceDescriptionFormatExtensionCollection (this);

+			faults = new FaultBindingCollection (this);

+			input = null;

+			name = String.Empty;

+			output = null;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+	

+		public Binding Binding {

+			get { return binding; }

+		}

+

+		[XmlIgnore]

+		public ServiceDescriptionFormatExtensionCollection Extensions {

+			get { return extensions; }

+		}

+

+		[XmlElement ("fault")]

+		public FaultBindingCollection Faults {

+			get { return faults; }

+		}

+

+		[XmlElement ("input")]

+		public InputBinding Input {

+			get { return input; }

+			set { input = value; }

+		}

+

+		[XmlAttribute ("name", DataType = "NCName")]

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		[XmlElement ("output")]

+		public OutputBinding Output {

+			get { return output; }

+			set { output= value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (Binding binding) 

+		{

+			this.binding = binding; 

+		} 

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBindingCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBindingCollection.cs
new file mode 100644
index 00000000000..f81a409a6a9
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationBindingCollection.cs
@@ -0,0 +1,75 @@
+// 

+// System.Web.Services.Description.OperationBindingCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class OperationBindingCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+

+		internal OperationBindingCollection (Binding binding)

+			: base (binding)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public OperationBinding this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+				return (OperationBinding) List[index]; 

+			}

+			set { List[index] = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (OperationBinding bindingOperation) 

+		{

+			Insert (Count, bindingOperation);

+			return (Count - 1);

+		}

+

+		public bool Contains (OperationBinding bindingOperation)

+		{

+			return List.Contains (bindingOperation);

+		}

+

+		public void CopyTo (OperationBinding[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		public int IndexOf (OperationBinding bindingOperation)

+		{

+			return List.IndexOf (bindingOperation);

+		}

+

+		public void Insert (int index, OperationBinding bindingOperation)

+		{

+			List.Insert (index, bindingOperation);

+		}

+	

+		public void Remove (OperationBinding bindingOperation)

+		{

+			List.Remove (bindingOperation);

+		}

+

+		protected override void SetParent (object value, object parent)

+		{

+			((OperationBinding) value).SetParent ((Binding) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationCollection.cs
new file mode 100644
index 00000000000..a92cf343db5
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationCollection.cs
@@ -0,0 +1,75 @@
+// 

+// System.Web.Services.Description.OperationCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class OperationCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+

+		internal OperationCollection (PortType portType) 

+			: base (portType)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public Operation this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+				return (Operation) List[index]; 

+			}

+			set { List[index] = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (Operation operation) 

+		{

+			Insert (Count, operation);

+			return (Count - 1);

+		}

+

+		public bool Contains (Operation operation)

+		{

+			return List.Contains (operation);

+		}

+

+		public void CopyTo (Operation[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		public int IndexOf (Operation operation)

+		{

+			return List.IndexOf (operation);

+		}

+

+		public void Insert (int index, Operation operation)

+		{

+			List.Insert (index, operation);

+		}

+	

+		public void Remove (Operation operation)

+		{

+			List.Remove (operation);

+		}

+

+		protected override void SetParent (object value, object parent)

+		{

+			((Operation) value).SetParent ((PortType) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFault.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFault.cs
new file mode 100644
index 00000000000..f4055dbf5a4
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFault.cs
@@ -0,0 +1,15 @@
+// 

+// System.Web.Services.Description.OperationFault.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Description {

+	public sealed class OperationFault : OperationMessage {

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFaultCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFaultCollection.cs
new file mode 100644
index 00000000000..492c1d1caf6
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFaultCollection.cs
@@ -0,0 +1,87 @@
+// 

+// System.Web.Services.Description.OperationFaultCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class OperationFaultCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+

+		internal OperationFaultCollection (Operation operation) 

+			: base (operation)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public OperationFault this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+				return (OperationFault) List[index]; 

+			}

+                        set { List [index] = value; }

+		}

+

+		public OperationFault this [string name] {

+			get { return this [IndexOf ((OperationFault) Table[name])]; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (OperationFault operationFaultMessage) 

+		{

+			Insert (Count, operationFaultMessage);

+			return (Count - 1);

+		}

+

+		public bool Contains (OperationFault operationFaultMessage)

+		{

+			return List.Contains (operationFaultMessage);

+		}

+

+		public void CopyTo (OperationFault[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		protected override string GetKey (object value)

+		{

+			if (!(value is OperationFault))

+				throw new InvalidCastException ();

+

+			return ((OperationFault) value).Name;

+		}

+

+		public int IndexOf (OperationFault operationFaultMessage)

+		{

+			return List.IndexOf (operationFaultMessage);

+		}

+

+		public void Insert (int index, OperationFault operationFaultMessage)

+		{

+			List.Insert (index, operationFaultMessage);

+		}

+	

+		public void Remove (OperationFault operationFaultMessage)

+		{

+			List.Remove (operationFaultMessage);

+		}

+

+		protected override void SetParent (object value, object parent)

+		{

+			((OperationFault) value).SetParent ((Operation) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFlow.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFlow.cs
new file mode 100644
index 00000000000..a3c517aa24b
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationFlow.cs
@@ -0,0 +1,19 @@
+// 

+// System.Web.Services.Description.OperationFlow.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	[Serializable]

+	public enum OperationFlow {

+		None = 0x0,

+		Notification = 0x2,

+		OneWay = 0x1,

+		RequestResponse = 0x3,

+		SolicitResponse = 0x4

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationInput.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationInput.cs
new file mode 100644
index 00000000000..4df8f046678
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationInput.cs
@@ -0,0 +1,16 @@
+// 

+// System.Web.Services.Description.OperationInput.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+using System.Xml;

+

+namespace System.Web.Services.Description {

+	public sealed class OperationInput : OperationMessage {

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs
new file mode 100644
index 00000000000..e24f045131a
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessage.cs
@@ -0,0 +1,65 @@
+// 

+// System.Web.Services.Description.OperationMessage.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public abstract class OperationMessage : DocumentableItem {

+

+		#region Fields

+

+		XmlQualifiedName message;

+		string name;

+		Operation operation;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		protected OperationMessage ()

+		{

+			message = null;

+			name = String.Empty;

+			operation = null;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("message")]

+		public XmlQualifiedName Message {

+			get { return message; }

+			set { message = value; }

+		}

+

+		[XmlAttribute ("name", DataType = "NMTOKEN")]

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		public Operation Operation {

+			get { return operation; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (Operation operation)

+		{

+			this.operation = operation;

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessageCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessageCollection.cs
new file mode 100644
index 00000000000..86aefe85c2e
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationMessageCollection.cs
@@ -0,0 +1,130 @@
+// 

+// System.Web.Services.Description.OperationMessageCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Description {

+	public sealed class OperationMessageCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+

+		internal OperationMessageCollection (Operation operation)

+			: base (operation)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public OperationFlow Flow {

+			get { 

+				switch (Count) {

+				case 1: 

+					if (this[0] is OperationInput)

+						return OperationFlow.OneWay;

+					else

+						return OperationFlow.Notification;

+				case 2:

+					if (this[0] is OperationInput)

+						return OperationFlow.RequestResponse;

+					else

+						return OperationFlow.SolicitResponse;

+				}

+				return OperationFlow.None;

+			}

+		}

+

+		public OperationInput Input {

+			get { 

+				foreach (object message in List)

+					if (message is OperationInput)

+						return (OperationInput) message;

+				return null;

+			}

+		}

+	

+		public OperationMessage this [int index] {

+			get { return (OperationMessage) List[index]; }

+			set { List[index] = value; }

+		}

+

+		public OperationOutput Output {

+			get { 

+				foreach (object message in List)

+					if (message is OperationOutput)

+						return (OperationOutput) message;

+				return null;

+			}

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (OperationMessage operationMessage) 

+		{

+			Insert (Count, operationMessage);

+			return (Count - 1);

+		}

+

+		public bool Contains (OperationMessage operationMessage)

+		{

+			return List.Contains (operationMessage);

+		}

+

+		public void CopyTo (OperationMessage[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		public int IndexOf (OperationMessage operationMessage)

+		{

+			return List.IndexOf (operationMessage);

+		}

+

+		public void Insert (int index, OperationMessage operationMessage)

+		{

+			List.Insert (index, operationMessage);

+		}

+

+		protected override void OnInsert (int index, object value)

+		{

+			if (Count > 2 || value.GetType () == this [0].GetType ())

+				throw new InvalidOperationException ("The operation object can only contain one input and one output message.");

+		}

+

+		protected override void OnSet (int index, object oldValue, object newValue)

+		{

+			if (oldValue.GetType () != newValue.GetType ())

+				throw new InvalidOperationException ("The message types of the old and new value are not the same.");

+			base.OnSet (index, oldValue, newValue);

+		}

+

+		protected override void OnValidate (object value)

+		{

+			if (value == null)

+				throw new NullReferenceException ("The message object is a null reference.");

+			if (!(value is OperationInput || value is OperationOutput))

+				throw new ArgumentException ("The message object is not an input or an output message.");

+		}

+	

+		public void Remove (OperationMessage operationMessage)

+		{

+			List.Remove (operationMessage);

+		}

+

+		protected override void SetParent (object value, object parent)

+		{

+			((OperationMessage) value).SetParent ((Operation) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OperationOutput.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationOutput.cs
new file mode 100644
index 00000000000..7c7ac0f9acc
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OperationOutput.cs
@@ -0,0 +1,13 @@
+// 

+// System.Web.Services.Description.OperationOutput.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class OperationOutput : OperationMessage {

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/OutputBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/OutputBinding.cs
new file mode 100644
index 00000000000..d1dacc2cbd2
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/OutputBinding.cs
@@ -0,0 +1,41 @@
+// 

+// System.Web.Services.Description.OutputBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPoint ("Extensions")]

+	public sealed class OutputBinding : MessageBinding {

+

+		#region Fields

+

+		ServiceDescriptionFormatExtensionCollection extensions;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public OutputBinding ()

+		{

+			extensions = new ServiceDescriptionFormatExtensionCollection (this);

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public override ServiceDescriptionFormatExtensionCollection Extensions { 	

+			get { return extensions; }

+		}

+	

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs
new file mode 100644
index 00000000000..cdd86d9885e
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Port.cs
@@ -0,0 +1,73 @@
+// 

+// System.Web.Services.Description.Port.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPoint ("Extensions")]

+	public sealed class Port : DocumentableItem {

+

+		#region Fields

+

+		XmlQualifiedName binding;

+		ServiceDescriptionFormatExtensionCollection extensions;

+		string name;

+		Service service;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public Port ()

+		{

+			binding = null;

+			extensions = new ServiceDescriptionFormatExtensionCollection (this);

+			name = String.Empty;

+			service = null;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("binding")]

+		public XmlQualifiedName Binding {

+			get { return binding; }

+			set { binding = value; }

+		}

+

+		[XmlIgnore]

+		public ServiceDescriptionFormatExtensionCollection Extensions { 	

+			get { return extensions; }

+		}

+

+		[XmlAttribute ("name", DataType = "NCName")]	

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+	

+		public Service Service {

+			get { return service; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (Service service) 

+		{

+			this.service = service;

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/PortCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/PortCollection.cs
new file mode 100644
index 00000000000..b7061c8430b
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/PortCollection.cs
@@ -0,0 +1,88 @@
+// 

+// System.Web.Services.Description.PortCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class PortCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+

+		internal PortCollection (Service service)

+			: base (service)

+		{

+		}

+

+		#endregion

+

+		#region Properties

+

+		public Port this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+

+				return (Port) List[index]; 

+			}

+                        set { List [index] = value; }

+		}

+

+		public Port this [string name] {

+			get { return this [IndexOf ((Port) Table[name])]; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (Port port) 

+		{

+			Insert (Count, port);

+			return (Count - 1);

+		}

+

+		public bool Contains (Port port)

+		{

+			return List.Contains (port);

+		}

+

+		public void CopyTo (Port[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		protected override string GetKey (object value) 

+		{

+			if (!(value is Port))

+				throw new InvalidCastException ();

+

+			return ((Port) value).Name;

+		}

+

+		public int IndexOf (Port port)

+		{

+			return List.IndexOf (port);

+		}

+

+		public void Insert (int index, Port port)

+		{

+			List.Insert (index, port);

+		}

+	

+		public void Remove (Port port)

+		{

+			List.Remove (port);

+		}

+			

+		protected override void SetParent (object value, object parent)

+		{

+			((Port) value).SetParent ((Service) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs
new file mode 100644
index 00000000000..c5f9205484c
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/PortType.cs
@@ -0,0 +1,62 @@
+// 

+// System.Web.Services.Description.PortType.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public sealed class PortType : DocumentableItem {

+

+		#region Fields

+

+		string name;

+		OperationCollection operations;

+		ServiceDescription serviceDescription;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public PortType ()

+		{

+			name = String.Empty;

+			operations = new OperationCollection (this);

+			serviceDescription = null;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("name", DataType = "NCName")]

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		[XmlElement ("operation")]

+		public OperationCollection Operations {

+			get { return operations; }

+		}

+	

+		public ServiceDescription ServiceDescription {

+			get { return serviceDescription; }

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (ServiceDescription serviceDescription)

+		{

+			this.serviceDescription = serviceDescription;

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/PortTypeCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/PortTypeCollection.cs
new file mode 100644
index 00000000000..427a72e215d
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/PortTypeCollection.cs
@@ -0,0 +1,87 @@
+// 

+// System.Web.Services.Description.PortTypeCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public sealed class PortTypeCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+

+		internal PortTypeCollection (ServiceDescription serviceDescription)

+			: base (serviceDescription)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public PortType this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+

+				return (PortType) List[index]; 

+			}

+                        set { List [index] = value; }

+		}

+

+		public PortType this [string name] {

+			get { return this [IndexOf ((PortType) Table[name])]; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (PortType portType) 

+		{

+			Insert (Count, portType);	

+			return (Count - 1);

+		}

+

+		public bool Contains (PortType portType)

+		{

+			return List.Contains (portType);

+		}

+

+		public void CopyTo (PortType[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		protected override string GetKey (object value) 

+		{

+			if (!(value is PortType))

+				throw new InvalidCastException ();

+			return ((PortType) value).Name;

+		}

+

+		public int IndexOf (PortType portType)

+		{

+			return List.IndexOf (portType);

+		}

+

+		public void Insert (int index, PortType portType)

+		{

+			List.Insert (index, portType);

+		}

+	

+		public void Remove (PortType portType)

+		{

+			List.Remove (portType);

+		}

+			

+		protected override void SetParent (object value, object parent)

+		{

+			((PortType) value).SetParent ((ServiceDescription) parent); 

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolImporter.cs
new file mode 100644
index 00000000000..f37547f788b
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolImporter.cs
@@ -0,0 +1,201 @@
+// 

+// System.Web.Services.Description.ProtocolImporter.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.CodeDom;

+using System.Web.Services;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public abstract class ProtocolImporter {

+

+		#region Fields

+

+		XmlSchemas abstractSchemas;

+		Binding binding;

+		string className;

+		CodeIdentifiers classNames;

+		CodeNamespace codeNamespace;

+		CodeTypeDeclaration codeTypeDeclaration;

+		XmlSchemas concreteSchemas;

+		Message inputMessage;

+		string methodName;

+		Operation operation;

+		OperationBinding operationBinding;

+		Message outputMessage;		

+		Port port;

+		PortType portType;

+		string protocolName;

+		XmlSchemas schemas;

+		Service service;

+		ServiceDescriptionCollection serviceDescriptions;

+		ServiceDescriptionImportStyle style;

+		ServiceDescriptionImportWarnings warnings;	

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		[MonoTODO]	

+		protected ProtocolImporter ()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public XmlSchemas AbstractSchemas {

+			get { return abstractSchemas; }

+		}

+

+		public Binding Binding {

+			get { return binding; }

+		}

+

+		public string ClassName {

+			get { return className; }

+		}

+

+		public CodeIdentifiers ClassNames {

+			get { return classNames; }

+		}

+

+		public CodeNamespace CodeNamespace {

+			get { return codeNamespace; }

+		}

+

+		public CodeTypeDeclaration CodeTypeDeclaration {

+			get { return codeTypeDeclaration; }

+		}

+

+		public XmlSchemas ConcreteSchemas {

+			get { return concreteSchemas; }

+		}

+

+		public Message InputMessage {

+			get { return inputMessage; }

+		}

+

+		public string MethodName {

+			get { return methodName; }

+		}

+

+		public Operation Operation {

+			get { return operation; }

+		}

+

+		public OperationBinding OperationBinding {

+			get { return operationBinding; }

+		}

+

+		public Message OutputMessage {

+			get { return outputMessage; }

+		}

+

+		public Port Port {

+			get { return port; }

+		}

+

+		public PortType PortType {

+			get { return portType; }

+		}

+

+		public abstract string ProtocolName {

+			get; 

+		}

+

+		public XmlSchemas Schemas {

+			get { return schemas; }

+		}

+

+		public Service Service {

+			get { return service; } 

+		}

+

+		public ServiceDescriptionCollection ServiceDescriptions {

+			get { return serviceDescriptions; }

+		}

+

+		public ServiceDescriptionImportStyle Style {

+			get { return style; }

+		}

+

+		public ServiceDescriptionImportWarnings Warnings {

+			get { return warnings; }

+			set { warnings = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public void AddExtensionWarningComments (CodeCommentStatementCollection comments, ServiceDescriptionFormatExtensionCollection extensions) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		protected abstract CodeTypeDeclaration BeginClass ();

+

+		[MonoTODO]

+		protected virtual void BeginNamespace ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void EndClass ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void EndNamespace ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		protected abstract CodeMemberMethod GenerateMethod ();

+		protected abstract bool IsBindingSupported ();

+		protected abstract bool IsOperationFlowSupported (OperationFlow flow);

+		

+		[MonoTODO]

+		public Exception OperationBindingSyntaxException (string text)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public Exception OperationSyntaxException (string text)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void UnsupportedBindingWarning (string text)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void UnsupportedOperationBindingWarning (string text)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void UnsupportedOperationWarning (string text)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolReflector.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolReflector.cs
new file mode 100644
index 00000000000..ad7b209387b
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ProtocolReflector.cs
@@ -0,0 +1,170 @@
+// 

+// System.Web.Services.Description.ProtocolReflector.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+using System.Web.Services.Protocols;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public abstract class ProtocolReflector {

+

+		#region Fields

+

+		Binding binding;

+		string defaultNamespace;

+		MessageCollection headerMessages;

+		Message inputMessage;

+		LogicalMethodInfo method;

+		WebMethodAttribute methodAttribute;

+		LogicalMethodInfo[] methods;

+		Operation operation;

+		OperationBinding operationBinding;

+		Message outputMessage;		

+		Port port;

+		PortType portType;

+		string protocolName;

+		XmlReflectionImporter reflectionImporter;

+		XmlSchemaExporter schemaExporter;

+		XmlSchemas schemas;

+		Service service;

+		ServiceDescription serviceDescription;

+		ServiceDescriptionCollection serviceDescriptions;

+		Type serviceType;

+		string serviceUrl;

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		[MonoTODO]	

+		protected ProtocolReflector ()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public Binding Binding {

+			get { return binding; }

+		}

+

+		public string DefaultNamespace {

+			get { return defaultNamespace; }

+		}

+

+		public MessageCollection HeaderMessages {

+			get { return headerMessages; }

+		}

+

+		public Message InputMessage {

+			get { return inputMessage; }

+		}

+

+		public LogicalMethodInfo Method {

+			get { return method; }

+		}

+

+		public WebMethodAttribute MethodAttribute {

+			get { return methodAttribute; }

+		}

+

+		public LogicalMethodInfo[] Methods {

+			get { return methods; }

+		}

+	

+		public Operation Operation {

+			get { return operation; }

+		}

+

+		public OperationBinding OperationBinding {

+			get { return operationBinding; }

+		}

+

+		public Message OutputMessage {

+			get { return outputMessage; }

+		}

+

+		public Port Port {

+			get { return port; }

+		}

+

+		public PortType PortType {

+			get { return portType; }

+		}

+

+		public abstract string ProtocolName {

+			get; 

+		}

+

+		public XmlReflectionImporter ReflectionImporter {

+			get { return reflectionImporter; }

+		}

+

+		public XmlSchemaExporter SchemaExporter {

+			get { return schemaExporter; }

+		}

+

+		public XmlSchemas Schemas {

+			get { return schemas; }

+		}

+

+		public Service Service {

+			get { return service; }

+		}

+

+		public ServiceDescription ServiceDescription {

+			get { return serviceDescription; }

+		}

+

+		public ServiceDescriptionCollection ServiceDescriptions {

+			get { return serviceDescriptions; }

+		}

+

+		public Type ServiceType {

+			get { return serviceType; }

+		}

+

+		public string ServiceUrl {

+			get { return serviceUrl; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		protected virtual void BeginClass ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void EndClass ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		public ServiceDescription GetServiceDescription (string ns)

+		{

+			return serviceDescriptions [ns];

+		}

+

+		protected abstract bool ReflectMethod ();

+

+		[MonoTODO]

+		protected virtual string ReflectMethodBinding ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs
new file mode 100644
index 00000000000..a214bd0531a
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Service.cs
@@ -0,0 +1,69 @@
+// 

+// System.Web.Services.Description.Service.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public sealed class Service : DocumentableItem {

+

+		#region Fields

+

+		ServiceDescriptionFormatExtensionCollection extensions;

+		string name;

+		PortCollection ports;

+		ServiceDescription serviceDescription;

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		public Service ()

+		{

+			extensions = new ServiceDescriptionFormatExtensionCollection (this);

+			name = String.Empty;

+			ports = new PortCollection (this);

+			serviceDescription = null;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public ServiceDescriptionFormatExtensionCollection Extensions { 	

+			get { return extensions; }

+		}

+

+		[XmlAttribute ("name", DataType = "NCName")]	

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		[XmlElement ("port")]	

+		public PortCollection Ports {

+			get { return ports; }

+		}

+

+		public ServiceDescription ServiceDescription {

+			get { return serviceDescription; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (ServiceDescription serviceDescription) 

+		{

+			this.serviceDescription = serviceDescription;

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceCollection.cs
new file mode 100644
index 00000000000..fa781e6ce8b
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceCollection.cs
@@ -0,0 +1,90 @@
+// 

+// System.Web.Services.Description.ServiceCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Description {

+	public sealed class ServiceCollection : ServiceDescriptionBaseCollection {

+		

+		#region Constructors

+	

+		internal ServiceCollection (ServiceDescription serviceDescription)

+			: base (serviceDescription)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public Service this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+

+				return (Service) List[index]; 

+			}

+			set { List [index] = value; }

+		}

+

+		public Service this [string name] {

+			get { return this [IndexOf ((Service) Table[name])]; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (Service service) 

+		{

+			Insert (Count, service);

+			return (Count - 1);

+		}

+

+		public bool Contains (Service service)

+		{

+			return List.Contains (service);

+		}

+

+		public void CopyTo (Service[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		protected override string GetKey (object value) 

+		{

+			if (!(value is Service))

+				throw new InvalidCastException ();

+

+			return ((Service) value).Name;

+		}

+

+		public int IndexOf (Service service)

+		{

+			return List.IndexOf (service);

+		}

+

+		public void Insert (int index, Service service)

+		{

+			List.Insert (index, service);

+		}

+	

+		public void Remove (Service service)

+		{

+			List.Remove (service);

+		}

+			

+		protected override void SetParent (object value, object parent)

+		{

+			((Service) value).SetParent ((ServiceDescription) parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs
new file mode 100644
index 00000000000..737324c5acd
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescription.cs
@@ -0,0 +1,260 @@
+// 

+// System.Web.Services.Description.ServiceDescription.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Web.Services;

+using System.Web.Services.Configuration;

+using System.Xml;

+using System.Xml.Schema;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPoint ("Extensions")]

+	[XmlRoot ("definitions", Namespace = "http://schemas.xmlsoap.org/wsdl/")]

+	public sealed class ServiceDescription : DocumentableItem {

+

+		#region Fields

+

+		public const string Namespace = "http://schemas.xmlsoap.org/wsdl/";

+

+		BindingCollection bindings;

+		ServiceDescriptionFormatExtensionCollection extensions;

+		ImportCollection imports;

+		MessageCollection messages;

+		string name;

+		PortTypeCollection portTypes;

+		string retrievalUrl;

+		ServiceDescriptionCollection serviceDescriptions;

+		ServiceCollection services;

+		string targetNamespace;

+		Types types;

+		static ServiceDescriptionSerializer serializer;

+		XmlSerializerNamespaces ns;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		static ServiceDescription ()

+		{

+			serializer = new ServiceDescriptionSerializer ();

+		}

+

+		[MonoTODO ("Move namespaces to subtype, use ServiceDescriptionSerializer")]	

+		public ServiceDescription ()

+		{

+			bindings = new BindingCollection (this);

+			extensions = new ServiceDescriptionFormatExtensionCollection (this);

+			imports = new ImportCollection (this);

+			messages = new MessageCollection (this);

+			name = String.Empty;		

+			portTypes = new PortTypeCollection (this);

+

+			serviceDescriptions = null;

+			services = new ServiceCollection (this);

+			targetNamespace = String.Empty;

+			types = null;

+

+			ns = new XmlSerializerNamespaces ();

+			ns.Add ("soap", SoapBinding.Namespace);

+			ns.Add ("s", XmlSchema.Namespace);

+			ns.Add ("http", HttpBinding.Namespace);

+			ns.Add ("mime", MimeContentBinding.Namespace);

+			ns.Add ("tm", MimeTextBinding.Namespace);

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlElement ("binding")]

+		public BindingCollection Bindings {

+			get { return bindings; }

+		}

+

+		[XmlIgnore]

+		public ServiceDescriptionFormatExtensionCollection Extensions { 	

+			get { return extensions; }

+		}

+

+		[XmlElement ("import")]

+		public ImportCollection Imports {

+			get { return imports; }

+		}

+

+		[XmlElement ("message")]

+		public MessageCollection Messages {

+			get { return messages; }

+		}

+

+		[XmlAttribute ("name", DataType = "NMTOKEN")]	

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		[XmlElement ("portType")]	

+		public PortTypeCollection PortTypes {

+			get { return portTypes; }

+		}

+	

+		[XmlIgnore]	

+		public string RetrievalUrl {

+			get { return retrievalUrl; }

+			set { retrievalUrl = value; }

+		}

+	

+		[XmlIgnore]	

+		public static XmlSerializer Serializer {

+			get { return serializer; }

+		}

+

+		[XmlIgnore]

+		public ServiceDescriptionCollection ServiceDescriptions {

+			get { 

+				if (serviceDescriptions == null) 

+					throw new NullReferenceException ();

+				return serviceDescriptions; 

+			}

+		}

+

+		[XmlElement ("service")]

+		public ServiceCollection Services {

+			get { return services; }

+		}

+

+		[XmlAttribute ("targetNamespace")]

+		public string TargetNamespace {

+			get { return targetNamespace; }

+			set { targetNamespace = value; }

+		}

+

+		[XmlElement ("types")]

+		public Types Types {

+			get { return types; }

+			set { types = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public static bool CanRead (XmlReader reader)

+		{

+			return serializer.CanDeserialize (reader);

+		}

+

+		public static ServiceDescription Read (Stream stream)

+		{

+			return (ServiceDescription) serializer.Deserialize (stream);

+		}

+

+		public static ServiceDescription Read (string fileName)

+		{

+			return Read (new FileStream (fileName, FileMode.Open));

+		}

+

+		public static ServiceDescription Read (TextReader textReader)

+		{

+			return (ServiceDescription) serializer.Deserialize (textReader);

+		}

+

+		public static ServiceDescription Read (XmlReader reader)

+		{

+			return (ServiceDescription) serializer.Deserialize (reader);

+		}

+

+		public void Write (Stream stream)

+		{

+

+			serializer.Serialize (stream, this, ns);

+		}

+

+		public void Write (string fileName)

+		{

+			Write (new FileStream (fileName, FileMode.Create));

+		}

+

+		public void Write (TextWriter writer)

+		{

+			serializer.Serialize (writer, this, ns);

+		}

+

+		public void Write (XmlWriter writer)

+		{

+			serializer.Serialize (writer, this, ns);

+		}

+

+		internal void SetParent (ServiceDescriptionCollection serviceDescriptions)

+		{

+			this.serviceDescriptions = serviceDescriptions; 

+		}

+

+		#endregion

+

+		internal class ServiceDescriptionSerializer : XmlSerializer {

+

+			#region Fields

+

+			XmlSerializerNamespaces ns;

+

+			#endregion

+

+			#region Constructors

+

+			[MonoTODO]

+			public ServiceDescriptionSerializer ()

+				: base (typeof (ServiceDescription), ServiceDescription.Namespace)

+			{

+				ns = new XmlSerializerNamespaces ();

+				ns.Add ("soap", SoapBinding.Namespace);

+				ns.Add ("s", XmlSchema.Namespace);

+				ns.Add ("http", HttpBinding.Namespace);

+				ns.Add ("mime", MimeContentBinding.Namespace);

+				ns.Add ("tm", MimeTextBinding.Namespace);

+			}

+

+			#endregion // Constructors

+

+			#region Methods

+

+			[MonoTODO]

+			public override bool CanDeserialize (XmlReader reader)

+			{

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			protected override XmlSerializationReader CreateReader ()

+			{

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			protected override XmlSerializationWriter CreateWriter ()

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			protected override object Deserialize (XmlSerializationReader reader)

+			{

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			protected override void Serialize (object serviceDescription, XmlSerializationWriter writer)

+			{

+				throw new NotImplementedException ();

+			}

+

+			#endregion // Methods

+		}

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionBaseCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionBaseCollection.cs
new file mode 100644
index 00000000000..187bb762c5c
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionBaseCollection.cs
@@ -0,0 +1,80 @@
+// 

+// System.Web.Services.Description.ServiceDescriptionBaseCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+using System.Web.Services;

+

+namespace System.Web.Services.Description {

+	public abstract class ServiceDescriptionBaseCollection : CollectionBase {

+		

+		#region Fields

+

+		Hashtable table = new Hashtable ();

+		object parent;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		internal ServiceDescriptionBaseCollection (object parent)

+		{

+			this.parent = parent;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		protected virtual IDictionary Table {

+			get { return table; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		protected virtual string GetKey (object value) 

+		{

+			return null; 

+		}

+

+		protected override void OnClear ()

+		{

+			Table.Clear ();

+		}

+

+		protected override void OnInsertComplete (int index, object value)

+		{

+			if (GetKey (value) != null)

+				Table [GetKey (value)] = value;

+			SetParent (value, parent);

+		}

+

+		protected override void OnRemove (int index, object value)

+		{

+			if (GetKey (value) != null)

+				Table.Remove (GetKey (value));

+		}

+

+		protected override void OnSet (int index, object oldValue, object newValue)

+		{

+			if (GetKey (oldValue) != null) 

+				Table.Remove (GetKey (oldValue));

+			if (GetKey (newValue) != null)

+				Table [GetKey (newValue)] = newValue;

+			SetParent (newValue, parent);

+		}

+

+		protected virtual void SetParent (object value, object parent)

+		{

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionCollection.cs
new file mode 100644
index 00000000000..d152d5f8167
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionCollection.cs
@@ -0,0 +1,121 @@
+// 

+// System.Web.Services.Description.ServiceDescriptionCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+using System.Xml;

+

+namespace System.Web.Services.Description {

+	public sealed class ServiceDescriptionCollection : ServiceDescriptionBaseCollection {

+

+		#region Constructors

+	

+		public ServiceDescriptionCollection () 

+			: base (null)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public ServiceDescription this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+

+				return (ServiceDescription) List[index]; 

+			}

+			set { List [index] = value; }

+		}

+

+		public ServiceDescription this [string ns] {

+			get { return this[IndexOf ((ServiceDescription) Table[ns])]; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (ServiceDescription serviceDescription) 

+		{

+			Insert (Count, serviceDescription);

+			return (Count - 1);

+		}

+

+		public bool Contains (ServiceDescription serviceDescription)

+		{

+			return List.Contains (serviceDescription);

+		}

+

+		public void CopyTo (ServiceDescription[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		public Binding GetBinding (XmlQualifiedName name)

+		{

+			foreach (object value in List) 

+				foreach (Binding binding in ((ServiceDescription) value).Bindings) 

+					if (binding.Name == name.Name)

+						return binding;

+			throw new Exception ();

+		}

+

+		protected override string GetKey (object value) 

+		{

+			if (!(value is ServiceDescription))

+				throw new InvalidCastException ();

+			return ((ServiceDescription) value).TargetNamespace;

+		}

+

+		public Message GetMessage (XmlQualifiedName name)

+		{

+			foreach (object value in List) 

+				foreach (Message message in ((ServiceDescription) value).Messages) 

+					if (message.Name == name.Name)

+						return message;

+			throw new Exception ();

+		}

+

+		public PortType GetPortType (XmlQualifiedName name)

+		{

+			foreach (object value in List) 

+				foreach (PortType portType in ((ServiceDescription) value).PortTypes) 

+					if (portType.Name == name.Name)

+						return portType;

+			throw new Exception ();

+		}

+

+		public Service GetService (XmlQualifiedName name)

+		{

+			foreach (object value in List) 

+				foreach (Service service in ((ServiceDescription) value).Services) 

+					if (service.Name == name.Name)

+						return service;

+			throw new Exception ();

+		}

+

+		public int IndexOf (ServiceDescription serviceDescription)

+		{

+			return List.IndexOf (serviceDescription);

+		}

+

+		public void Insert (int index, ServiceDescription serviceDescription)

+		{

+			List.Insert (index, serviceDescription);

+		}

+	

+		public void Remove (ServiceDescription serviceDescription)

+		{

+			List.Remove (serviceDescription);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionFormatExtension.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionFormatExtension.cs
new file mode 100644
index 00000000000..e8d51b50b67
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionFormatExtension.cs
@@ -0,0 +1,65 @@
+// 

+// System.Web.Services.Description.ServiceDescriptionFormatExtension.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public abstract class ServiceDescriptionFormatExtension {

+

+		#region Fields

+		

+		bool handled;

+		object parent;

+		bool required;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		protected ServiceDescriptionFormatExtension () 

+		{

+			handled = false;

+			parent = null;

+			required = false;	

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public bool Handled {

+			get { return handled; }

+			set { handled = value; }

+		}

+

+		public object Parent {

+			get { return parent; }

+		}

+

+		[DefaultValue (false)]

+		[XmlAttribute ("required", Namespace = "http://schemas.xmlsoap.org/wsdl/")]

+		public bool Required {	

+			get { return required; }

+			set { required = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		internal void SetParent (object value)

+		{

+			parent = value; 

+		}

+		

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection.cs
new file mode 100644
index 00000000000..6363c90891f
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection.cs
@@ -0,0 +1,154 @@
+// 

+// System.Web.Services.Description.ServiceDescriptionFormatExtensionCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+using System.Web.Services;

+using System.Xml;

+

+namespace System.Web.Services.Description {

+	public sealed class ServiceDescriptionFormatExtensionCollection : ServiceDescriptionBaseCollection {

+		

+		#region Constructors

+	

+		public ServiceDescriptionFormatExtensionCollection (object parent) 

+			: base (parent)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public object this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+

+				return List[index]; 

+			}

+			set { List[index] = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (object extension) 

+		{

+			Insert (Count, extension);

+			return (Count - 1);

+		}

+

+		public bool Contains (object extension)

+		{

+			return List.Contains (extension);

+		}

+

+		public void CopyTo (object[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		public object Find (Type type)

+		{

+			foreach (object value in List)

+				if (value.GetType () == type)

+					return value;

+			return null;

+		}

+

+		public XmlElement Find (string name, string ns)

+		{

+			XmlElement xmlElement;

+			foreach (object value in List) 

+				if (value is XmlElement) {

+					xmlElement = (value as XmlElement);

+					if (xmlElement.Name == name && xmlElement.NamespaceURI == ns)

+						return xmlElement;

+				}

+			return null;

+		}

+

+		public object[] FindAll (Type type)

+		{

+			ArrayList searchResults = new ArrayList ();

+			foreach (object value in List)

+				if (value.GetType () == type)

+					searchResults.Add (value);

+			object[] returnValue = new object [searchResults.Count];

+

+			if (searchResults.Count > 0)

+				searchResults.CopyTo (returnValue);

+

+			return returnValue;

+		}

+

+		public XmlElement[] FindAll (string name, string ns)

+		{

+			ArrayList searchResults = new ArrayList ();

+			XmlElement xmlElement;

+

+			foreach (object value in List)

+				if (value is XmlElement) {

+					xmlElement = (value as XmlElement);

+					if (xmlElement.Name == name && xmlElement.NamespaceURI == ns)

+						searchResults.Add (xmlElement);

+				}

+

+			XmlElement[] returnValue = new XmlElement [searchResults.Count];

+

+			if (searchResults.Count > 0)

+				searchResults.CopyTo (returnValue);

+

+			return returnValue;

+		}

+

+		public int IndexOf (object extension)

+		{

+			return List.IndexOf (extension);

+		}

+

+		public void Insert (int index, object extension)

+		{

+			List.Insert (index, extension);

+		}

+

+		[MonoTODO]

+		public bool IsHandled (object item)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool IsRequired (object item)

+		{

+			throw new NotImplementedException ();

+		}

+	

+		protected override void OnValidate (object value)

+		{

+			if (value == null)

+				throw new ArgumentNullException ();

+			if (!(value is XmlElement || value is ServiceDescriptionFormatExtension))

+				throw new ArgumentException ();

+		}

+	

+		public void Remove (object extension)

+		{

+			List.Remove (extension);

+		}

+			

+		protected override void SetParent (object value, object parent)

+		{

+			((ServiceDescriptionFormatExtension) value).SetParent (parent);

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImportStyle.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImportStyle.cs
new file mode 100644
index 00000000000..5bcb9026908
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImportStyle.cs
@@ -0,0 +1,15 @@
+// 

+// System.Web.Services.Description.ServiceDescriptionImportStyle.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public enum ServiceDescriptionImportStyle {

+		Client,

+		Server

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImportWarnings.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImportWarnings.cs
new file mode 100644
index 00000000000..5e4c329724a
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImportWarnings.cs
@@ -0,0 +1,20 @@
+// 

+// System.Web.Services.Description.ServiceDescriptionImportWarnings.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	[Serializable]

+	public enum ServiceDescriptionImportWarnings {

+		NoCodeGenerated = 0x1,

+		NoMethodsGenerated = 0x20,

+		OptionalExtensionsIgnored = 0x2,

+		RequiredExtensionsIgnored = 0x4,

+		UnsupportedBindingsIgnored = 0x10,

+		UnsupportedOperationsIgnored = 0x8

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs
new file mode 100644
index 00000000000..491fb3a85a8
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionImporter.cs
@@ -0,0 +1,76 @@
+// 

+// System.Web.Services.Description.ServiceDescriptionImporter.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.CodeDom;

+using System.Web.Services;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public class ServiceDescriptionImporter {

+

+		#region Fields

+

+		string protocolName;

+		XmlSchemas schemas;

+		ServiceDescriptionCollection serviceDescriptions;

+		ServiceDescriptionImportStyle style;

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		public ServiceDescriptionImporter ()

+		{

+			protocolName = String.Empty;

+			schemas = new XmlSchemas ();

+			serviceDescriptions = new ServiceDescriptionCollection ();

+			style = ServiceDescriptionImportStyle.Client;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public string ProtocolName {

+			get { return protocolName; }

+			set { protocolName = value; }

+		}

+

+		public XmlSchemas Schemas {

+			get { return schemas; }

+		}

+

+		public ServiceDescriptionCollection ServiceDescriptions {

+			get { return serviceDescriptions; }

+		}

+

+		public ServiceDescriptionImportStyle Style {

+			get { return style; }

+			set { style = value; }

+		}

+	

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public void AddServiceDescription (ServiceDescription serviceDescription, string appSettingUrlKey, string appSettingBaseUrl)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public ServiceDescriptionImportWarnings Import (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionReflector.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionReflector.cs
new file mode 100644
index 00000000000..d270f209823
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/ServiceDescriptionReflector.cs
@@ -0,0 +1,56 @@
+// 

+// System.Web.Services.Description.ServiceDescriptionReflector.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public class ServiceDescriptionReflector {

+

+		#region Fields

+

+		XmlSchemas schemas;

+		ServiceDescriptionCollection serviceDescriptions;

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		public ServiceDescriptionReflector ()

+		{

+			schemas = new XmlSchemas ();

+			serviceDescriptions = new ServiceDescriptionCollection ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public XmlSchemas Schemas {

+			get { return schemas; }

+		}

+

+		public ServiceDescriptionCollection ServiceDescriptions {

+			get { return serviceDescriptions; }

+		}

+

+	

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public void Reflect (Type type, string url)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapAddressBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapAddressBinding.cs
new file mode 100644
index 00000000000..82a3a3dca0e
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapAddressBinding.cs
@@ -0,0 +1,42 @@
+// 

+// System.Web.Services.Description.SoapAddressBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("address", "http://schemas.xmlsoap.org/wsdl/soap/", typeof (Port))]

+	public sealed class SoapAddressBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		string location;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public SoapAddressBinding ()

+		{

+			location = String.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("location")]

+		public string Location { 	

+			get { return location; }

+			set { location = value; }

+		}

+	

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBinding.cs
new file mode 100644
index 00000000000..05f24f0c741
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBinding.cs
@@ -0,0 +1,61 @@
+// 

+// System.Web.Services.Description.SoapBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPrefix ("soap", "http://schemas.xmlsoap.org/wsdl/soap/")]

+	[XmlFormatExtension ("binding", "http://schemas.xmlsoap.org/wsdl/soap/", typeof (Binding))]

+	// FIXME: this won't compile! 

+	// [XmlFormatExtensionPrefix ("soapenc", "http://schemas.xmlsoap.org/soap/encoding/")]

+	public sealed class SoapBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		public const string HttpTransport = "http://schemas.xmlsoap.org/soap/http/";

+		public const string Namespace = "http://schemas.xmlsoap.org/wsdl/soap/";

+

+		SoapBindingStyle style;

+		string transport;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public SoapBinding ()

+		{

+			style = SoapBindingStyle.Document;

+			transport = String.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		// LAMESPEC: .NET says that the default value is SoapBindingStyle.Document but

+		// reflection shows this attribute is SoapBindingStyle.Default

+

+		[DefaultValue (SoapBindingStyle.Default)]

+		[XmlAttribute ("style")]

+		public SoapBindingStyle Style {

+			get { return style; }

+			set { style = value; }

+		}

+

+		[XmlAttribute ("transport")]

+		public string Transport {

+			get { return transport; }

+			set { transport = value; }

+		}

+	

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBindingStyle.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBindingStyle.cs
new file mode 100644
index 00000000000..3812cd8622e
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBindingStyle.cs
@@ -0,0 +1,21 @@
+// 

+// System.Web.Services.Description.SoapBindingStyle.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public enum SoapBindingStyle {

+		[XmlIgnore]

+		Default,

+		[XmlEnum ("document")]

+		Document,

+		[XmlEnum ("rpc")]

+		Rpc

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBindingUse.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBindingUse.cs
new file mode 100644
index 00000000000..d04bd50414f
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBindingUse.cs
@@ -0,0 +1,21 @@
+// 

+// System.Web.Services.Description.SoapBindingUse.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public enum SoapBindingUse {

+		[XmlIgnore]

+		Default,

+		[XmlEnum ("encoded")]

+		Encoded,

+		[XmlEnum ("literal")]

+		Literal

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBodyBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBodyBinding.cs
new file mode 100644
index 00000000000..963f9d2e4de
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapBodyBinding.cs
@@ -0,0 +1,76 @@
+// 

+// System.Web.Services.Description.SoapBodyBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("body", "http://schemas.xmlsoap.org/wsdl/soap/", typeof (InputBinding), typeof (OutputBinding), typeof (MimePart))]

+	public sealed class SoapBodyBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+		

+		string encoding;

+		string ns;

+		string[] parts;

+		SoapBindingUse use;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public SoapBodyBinding ()

+		{

+			encoding = String.Empty;

+			ns = String.Empty;

+			parts = null;

+			use = SoapBindingUse.Default;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[DefaultValue ("")]

+		[XmlAttribute ("encodingStyle")]

+		public string Encoding {

+			get { return encoding; }

+			set { encoding = value; }

+		}

+

+		[DefaultValue ("")]

+		[XmlAttribute ("namespace")]

+		public string Namespace {

+			get { return ns; }

+			set { ns = value; }

+		}

+

+		[XmlIgnore]

+		public string[] Parts {

+			get { return parts; }

+			set { parts = value; }

+		}

+

+		[XmlAttribute ("parts", DataType = "NMTOKENS")]

+		public string PartsString {

+			get { return String.Join (" ", Parts); }

+			set { Parts = value.Split (' '); }

+		}

+

+		[DefaultValue (SoapBindingUse.Default)]

+		[XmlAttribute ("use")]

+		public SoapBindingUse Use {

+			get { return use; }

+			set { use = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapExtensionImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapExtensionImporter.cs
new file mode 100644
index 00000000000..ce33bc68906
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapExtensionImporter.cs
@@ -0,0 +1,44 @@
+// 

+// System.Web.Services.Description.SoapExtensionImporter.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.CodeDom;

+

+namespace System.Web.Services.Description {

+	public abstract class SoapExtensionImporter {

+

+		#region Fields

+

+		SoapProtocolImporter importContext;

+		

+		#endregion // Fields

+

+		#region Constructors

+	

+		protected SoapExtensionImporter ()

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public SoapProtocolImporter ImportContext {

+			get { return importContext; }

+			set { importContext = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public abstract void ImportMethod (CodeAttributeDeclarationCollection metadata);

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapExtensionReflector.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapExtensionReflector.cs
new file mode 100644
index 00000000000..9eb0e34af41
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapExtensionReflector.cs
@@ -0,0 +1,42 @@
+// 

+// System.Web.Services.Description.SoapExtensionReflector.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public abstract class SoapExtensionReflector {

+

+		#region Fields

+

+		ProtocolReflector reflectionContext;

+		

+		#endregion // Fields

+

+		#region Constructors

+	

+		protected SoapExtensionReflector ()

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public ProtocolReflector ReflectionContext {

+			get { return reflectionContext; }

+			set { reflectionContext = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public abstract void ReflectMethod ();

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapFaultBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapFaultBinding.cs
new file mode 100644
index 00000000000..a67e4219de8
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapFaultBinding.cs
@@ -0,0 +1,60 @@
+// 

+// System.Web.Services.Description.SoapFaultBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("fault", "http://schemas.xmlsoap.org/wsdl/soap/", typeof (FaultBinding))]

+	public sealed class SoapFaultBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		string encoding;

+		string ns;

+		SoapBindingUse use;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public SoapFaultBinding ()

+		{

+			encoding = String.Empty;

+			ns = String.Empty;

+			use = SoapBindingUse.Default;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("encodingStyle")]

+		public string Encoding {

+			get { return encoding; }

+			set { encoding = value; }

+		}

+	

+		[XmlAttribute ("namespace")]	

+		public string Namespace {

+			get { return ns; }

+			set { ns = value; }

+		}

+

+		[DefaultValue (SoapBindingUse.Default)]

+		[XmlAttribute ("use")]

+		public SoapBindingUse Use {

+			get { return use; }

+			set { use = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs
new file mode 100644
index 00000000000..74bfd6c90eb
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderBinding.cs
@@ -0,0 +1,89 @@
+// 

+// System.Web.Services.Description.SoapHeaderBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Web.Services;

+using System.Web.Services.Configuration;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("header", "http://schemas.xmlsoap.org/wsdl/soap/", typeof (InputBinding), typeof (OutputBinding))]

+	public sealed class SoapHeaderBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		string encoding;

+		bool mapToProperty;

+		XmlQualifiedName message;

+		string ns;

+		string part;

+		SoapBindingUse use;

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		[MonoTODO]	

+		public SoapHeaderBinding ()

+		{

+			encoding = String.Empty;

+			mapToProperty = false; // FIXME: is this right?

+			message = XmlQualifiedName.Empty;

+			ns = String.Empty;

+			part = String.Empty;

+			use = SoapBindingUse.Default;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[DefaultValue ("")]

+		[XmlAttribute ("encodingStyle")]

+		public string Encoding {

+			get { return encoding; }

+			set { encoding = value; }

+		}

+

+		[XmlIgnore]

+		public bool MapToProperty {	

+			get { return mapToProperty; }

+			set { mapToProperty = value; }

+		}

+

+		[XmlAttribute ("message")]	

+		public XmlQualifiedName Message {

+			get { return message; }

+			set { message = value; }

+		}

+

+		[DefaultValue ("")]	

+		[XmlAttribute ("namespace")]	

+		public string Namespace {

+			get { return ns; }

+			set { ns = value; }

+		}

+

+		[XmlAttribute ("part", DataType = "NMTOKEN")]

+		public string Part {

+			get { return part; }

+			set { part = value; }

+		}

+

+		[DefaultValue (SoapBindingUse.Default)]

+		[XmlAttribute ("use")]

+		public SoapBindingUse Use {

+			get { return use; }

+			set { use = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderFaultBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderFaultBinding.cs
new file mode 100644
index 00000000000..e33bcc685c0
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapHeaderFaultBinding.cs
@@ -0,0 +1,82 @@
+// 

+// System.Web.Services.Description.SoapHeaderFaultBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Web.Services.Configuration;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("headerfault", "http://schemas.xmlsoap.org/wsdl/soap/", typeof (InputBinding), typeof (OutputBinding))]

+	public sealed class SoapHeaderFaultBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		string encoding;

+		bool mapToProperty;

+		XmlQualifiedName message;

+		string ns;

+		string part;

+		SoapBindingUse use;

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		[MonoTODO]	

+		public SoapHeaderFaultBinding ()

+		{

+			encoding = String.Empty;

+			mapToProperty = false; // FIXME: is this right?

+			message = XmlQualifiedName.Empty;

+			ns = String.Empty;

+			part = String.Empty;

+			use = SoapBindingUse.Default;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[DefaultValue ("")]

+		[XmlAttribute ("encodingStyle")]

+		public string Encoding {

+			get { return encoding; }

+			set { encoding = value; }

+		}

+

+		[XmlAttribute ("message")]

+		public XmlQualifiedName Message {

+			get { return message; }

+			set { message = value; }

+		}

+	

+		[DefaultValue ("")]

+		[XmlAttribute ("namespace")]	

+		public string Namespace {

+			get { return ns; }

+			set { ns = value; }

+		}

+

+		[XmlAttribute ("part", DataType = "NMTOKEN")]

+		public string Part {

+			get { return part; }

+			set { part = value; }

+		}

+

+		[DefaultValue (SoapBindingUse.Default)]

+		[XmlAttribute ("use")]

+		public SoapBindingUse Use {

+			get { return use; }

+			set { use = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapOperationBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapOperationBinding.cs
new file mode 100644
index 00000000000..81492c78049
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapOperationBinding.cs
@@ -0,0 +1,56 @@
+// 

+// System.Web.Services.Description.SoapOperationBinding.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Web.Services.Configuration;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtension ("operation", "http://schema.xmlsoap.org/wsdl/soap/", typeof (OperationBinding))]

+	public sealed class SoapOperationBinding : ServiceDescriptionFormatExtension {

+

+		#region Fields

+

+		string soapAction;

+		SoapBindingStyle style;

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		public SoapOperationBinding ()

+		{

+			soapAction = String.Empty;

+			style = SoapBindingStyle.Document;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlAttribute ("soapAction")]

+		public string SoapAction {

+			get { return soapAction; }

+			set { soapAction = value; }

+		}

+

+		// LAMESPEC: .NET Documentation says that the default value for this property is

+		// SoapBindingStyle.Document (see constructor), but reflection shows that this 

+		// attribute value is SoapBindingStyle.Default

+

+		[DefaultValue (SoapBindingStyle.Default)]

+		[XmlAttribute ("style")]

+		public SoapBindingStyle Style {

+			get { return style; }

+			set { style = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs
new file mode 100644
index 00000000000..f9982eeed20
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolImporter.cs
@@ -0,0 +1,111 @@
+// 

+// System.Web.Services.Description.SoapProtocolImporter.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.CodeDom;

+using System.Web.Services;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	public sealed class SoapProtocolImporter : ProtocolImporter {

+

+		#region Fields

+

+		SoapBinding soapBinding;

+		SoapCodeExporter soapExporter;

+		SoapSchemaImporter soapImporter;

+		XmlCodeExporter xmlExporter;

+		XmlSchemaImporter xmlImporter;

+		

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]	

+		public SoapProtocolImporter ()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public override string ProtocolName {

+			get { return "Soap"; }

+		}

+

+		public SoapBinding SoapBinding {

+			get { return soapBinding; }

+		}

+

+		public SoapCodeExporter SoapExporter {

+			get { return soapExporter; }

+		}

+

+		public SoapSchemaImporter SoapImporter {

+			get { return soapImporter; }

+		}

+

+		public XmlCodeExporter XmlExporter {

+			get { return xmlExporter; }

+		}

+

+		public XmlSchemaImporter XmlImporter {

+			get { return xmlImporter; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		protected override CodeTypeDeclaration BeginClass ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void BeginNamespace ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void EndClass ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void EndNamespace ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override CodeMemberMethod GenerateMethod ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override bool IsBindingSupported ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override bool IsOperationFlowSupported (OperationFlow flow)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolReflector.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolReflector.cs
new file mode 100644
index 00000000000..cc7fbe03af7
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapProtocolReflector.cs
@@ -0,0 +1,70 @@
+// 

+// System.Web.Services.Description.SoapProtocolReflector.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+using System.Web.Services.Protocols;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[MonoTODO ("This class is based on conjecture and guesswork.")]

+	internal class SoapProtocolReflector : ProtocolReflector {

+

+		#region Fields

+

+		SoapBinding soapBinding;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public SoapProtocolReflector ()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public override string ProtocolName {

+			get { return "Soap"; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+                [MonoTODO]

+                protected override void BeginClass ()

+                {

+                        throw new NotImplementedException ();

+                }

+

+                [MonoTODO]

+                protected override void EndClass ()

+                {

+                        throw new NotImplementedException ();

+                }

+

+		[MonoTODO]

+		protected override bool ReflectMethod ()

+		{

+			throw new NotImplementedException ();

+		}

+

+                [MonoTODO]

+                protected override string ReflectMethodBinding ()

+                {

+                        throw new NotImplementedException ();

+                }

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/SoapTransportImporter.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapTransportImporter.cs
new file mode 100644
index 00000000000..22d76ed9978
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/SoapTransportImporter.cs
@@ -0,0 +1,44 @@
+// 

+// System.Web.Services.Description.SoapTransportImporter.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Description {

+	public abstract class SoapTransportImporter {

+

+		#region Fields

+

+		SoapProtocolImporter importContext;

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		protected SoapTransportImporter ()

+		{

+			importContext = null;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public SoapProtocolImporter ImportContext {

+			get { return importContext; }

+			set { importContext = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public abstract void ImportClass ();

+		public abstract bool IsSupportedTransport (string transport);

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Description/Types.cs b/mcs/class/System.Web.Services/System.Web.Services.Description/Types.cs
new file mode 100644
index 00000000000..6f19742f9f6
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Description/Types.cs
@@ -0,0 +1,49 @@
+// 

+// System.Web.Services.Description.Types.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Configuration;

+using System.Xml.Schema;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Description {

+	[XmlFormatExtensionPoint ("Extensions")]

+	public sealed class Types : DocumentableItem {

+

+		#region Fields

+

+		ServiceDescriptionFormatExtensionCollection extensions;

+		XmlSchemas schemas;

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		public Types ()

+		{

+			extensions = new ServiceDescriptionFormatExtensionCollection (this);

+			schemas = new XmlSchemas ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public ServiceDescriptionFormatExtensionCollection Extensions { 	

+			get { return extensions; }

+		}

+

+		[XmlElement ("schema", typeof (XmlSchema), Namespace = "http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemas Schemas {

+			get { return schemas; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog
new file mode 100755
index 00000000000..5f4f2cbda07
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ChangeLog
@@ -0,0 +1,61 @@
+2002-08-19  Tim Coleman <tim@timcoleman.com>
+	* DiscoveryClientProtocol.cs:
+		Added ResolveAll () stub.
+	* DiscoveryDocument.cs:
+		Added XmlRoot attribute to class.
+	* DiscoveryClientDocumentCollection.cs:
+	* DiscoveryClientReferenceCollection.cs:
+	* DiscoveryClientResultCollection.cs:
+	* DiscoveryReferenceCollection.cs:
+		Implementation of these classes.
+
+2002-08-04  Dave Bettin <javabettin@yahoo.com>
+		* ContractSearchPattern.cs
+		* DiscoveryClientDocumentCollection.cs
+		* DiscoveryClientProtocol.cs
+		* DiscoveryClientResult.cs
+		* DiscoveryDocument.cs
+		* DiscoveryDocumentLinksPattern.cs
+		* DiscoveryDocumentReference.cs
+		* DiscoveryDocumentSearchPattern.cs
+		* DiscoveryReference.cs
+		* DiscoveryRequestHandler.cs
+		* DiscoverySearchPattern.cs
+		* DynamicDiscoveryDocument.cs
+		* SchemaReference.cs
+		* SoapBinding.cs
+		* XmlSchemaSearchPattern.cs
+			[ Added attributes and some basic implementation]
+			
+2002-08-03  Tim Coleman <tim@timcoleman.com>
+	* DiscoveryDocument.cs:
+		Added XmlIgnore attribute to References property
+	* DiscoveryDocumentReference.cs:
+		Implemented Ref/Url properties and added XmlIgnore
+		attributes.
+
+2002-07-28  Dave Bettin <javabettin@yahoo.com>
+		* ContractReference.cs
+		* ContractSearchPattern.cs
+		* DiscoveryClientDocumentCollection.cs
+		* DiscoveryClientProtocol.cs
+		* DiscoveryClientReferenceCollection.cs
+		* DiscoveryClientResultCollection.cs
+		* DiscoveryClientResult.cs
+		* DiscoveryDocument.cs
+		* DiscoveryDocumentLinksPattern.cs
+		* DiscoveryDocumentReference.cs
+		* DiscoveryDocumentSearchPattern.cs
+		* DiscoveryExceptionDictionary.cs
+		* DiscoveryReferenceCollection.cs
+		* DiscoveryReference.cs
+		* DiscoveryRequestHandler.cs
+		* DiscoverySearchPattern.cs
+		* DynamicDiscoveryDocument.cs
+		* ExcludePathInfo.cs
+		* SchemaReference.cs
+		* SoapBinding.cs
+		* XmlSchemaSearchPattern.cs
+			[ Added stubs]
+
+	
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/ContractReference.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ContractReference.cs
new file mode 100755
index 00000000000..39cfbc54397
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ContractReference.cs
@@ -0,0 +1,107 @@
+// 

+// System.Web.Services.Discovery.ContractReference.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+using System.IO;

+using System.Web.Services.Description;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Discovery {

+

+	[XmlRootAttribute("contractRef", Namespace="https://schemas.xmlsoap.org/disco/scl/", IsNullable=true)]

+	public class ContractReference : DiscoveryReference {

+

+		#region Fields

+		

+		public const string Namespace = "http://schemas.xmlsoap.org/disco/scl/";

+

+		private ServiceDescription contract;

+		private string defaultFilename;

+		private string docRef;

+		private string href;

+		private string url;

+		

+		#endregion // Fields

+		

+		#region Constructors

+

+		[MonoTODO]

+		public ContractReference () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public ContractReference (string href) : this() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public ContractReference (string href, string docRef) : this(href) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public ServiceDescription Contract {

+			get { return contract; }			

+		}

+

+		[XmlIgnore]

+		public override string DefaultFilename {

+			get { return defaultFilename; }

+		}

+		

+		[XmlAttribute("docRef")]

+		public string DocRef {

+			get { return docRef; }

+			set { docRef = value; }

+		}

+		

+		[XmlAttribute("ref")]

+		public string Ref {

+			get { return href; }

+			set { href = value; }

+		}

+		

+		[XmlIgnore]

+		public override string Url {

+			get { return url;}			

+			set { url = value; }

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public override object ReadDocument (Stream stream)

+		{

+			throw new NotImplementedException ();

+		}

+                

+		[MonoTODO]

+                protected internal override void Resolve (string contentType, Stream stream) 

+		{

+			throw new NotImplementedException ();

+		}

+                

+		[MonoTODO]

+                public override void WriteDocument (object document, Stream stream) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/ContractSearchPattern.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ContractSearchPattern.cs
new file mode 100755
index 00000000000..87a5d25a927
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ContractSearchPattern.cs
@@ -0,0 +1,47 @@
+// 

+// System.Web.Services.Protocols.ContractSearchPattern.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+namespace System.Web.Services.Discovery {

+	public sealed class ContractSearchPattern : DiscoverySearchPattern {

+

+		#region Fields

+

+		private string pattern = "*.asmx";

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public ContractSearchPattern () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public override string Pattern {

+			get { return pattern; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public override DiscoveryReference GetDiscoveryReference (string filename)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.cs
new file mode 100755
index 00000000000..3d4e77ee2c4
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientDocumentCollection.cs
@@ -0,0 +1,66 @@
+// 

+// System.Web.Services.Discovery.DiscoveryClientDocumentCollection.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Dave Bettin, 2002

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+

+namespace System.Web.Services.Discovery {

+	public sealed class DiscoveryClientDocumentCollection : DictionaryBase {

+

+		#region Constructors 

+

+		public DiscoveryClientDocumentCollection () 

+			: base ()

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public object this [string url] {

+			get { return InnerHashtable [url]; }

+			set { 

+				if (url == null)

+					throw new ArgumentNullException ();

+				InnerHashtable [url] = value; 

+			}

+		}

+		

+		public ICollection Keys {

+			get { return InnerHashtable.Keys; }

+		}

+		

+		public ICollection Values {

+			get { return InnerHashtable.Values; }

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		public void Add (string url, object value)

+		{

+			InnerHashtable [url] = value;

+		}

+

+		public bool Contains (string url)

+		{

+			return InnerHashtable.Contains (url);

+		}

+		

+		public void Remove (string url)

+		{

+			InnerHashtable.Remove (url);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs
new file mode 100755
index 00000000000..622222c19d8
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientProtocol.cs
@@ -0,0 +1,138 @@
+// 

+// System.Web.Services.Protocols.DiscoveryClientProtocol.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+using System.Collections;

+using System.IO;

+using System.Web.Services.Protocols;

+

+namespace System.Web.Services.Discovery {

+	public class DiscoveryClientProtocol : HttpWebClientProtocol {

+

+		#region Fields

+

+		private IList additionalInformation;

+		private DiscoveryClientDocumentCollection documents;

+		private DiscoveryExceptionDictionary errors;

+		private DiscoveryClientReferenceCollection references;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public DiscoveryClientProtocol () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public IList AdditionalInformation {

+			get { return additionalInformation; }

+		}

+		

+		public DiscoveryClientDocumentCollection Documents {

+			get { return documents; }

+		}

+		

+		public DiscoveryExceptionDictionary Errors {

+			get { return errors; }

+		}

+

+		public DiscoveryClientReferenceCollection References {

+			get { return references; }

+		}		

+		

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public DiscoveryDocument Discover (string url)

+		{

+                        throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public DiscoveryDocument DiscoverAny (string url)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Stream Download (ref string url)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Stream Download (ref string url, ref string contentType)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public DiscoveryClientResultCollection ReadAll (string topLevelFilename)

+		{

+                        throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void ResolveAll ()

+		{

+			throw new NotImplementedException (); 

+		}

+		

+		[MonoTODO]

+		public void ResolveOneLevel ()

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public DiscoveryClientResultCollection WriteAll (string directory, string topLevelFilename)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		#endregion // Methods

+		

+		#region Classes

+		

+		public sealed class DiscoveryClientResultsFile {

+			

+			#region Fields

+			

+			private DiscoveryClientResultCollection results;

+

+			#endregion // Fields

+

+			#region Contructors

+			

+			[MonoTODO]

+			public DiscoveryClientResultsFile () 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			#endregion // Constructors

+			

+			#region Properties

+		

+			public DiscoveryClientResultCollection Results {				

+				get { return results; }

+			}

+			

+			#endregion // Properties

+		}

+		#endregion // Classes

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.cs
new file mode 100755
index 00000000000..a98ec112022
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientReferenceCollection.cs
@@ -0,0 +1,67 @@
+// 

+// System.Web.Services.Protocols.DiscoveryClientReferenceCollection.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Dave Bettin, 2002

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+

+namespace System.Web.Services.Discovery {

+	public sealed class DiscoveryClientReferenceCollection : DictionaryBase {

+

+		#region Constructors

+

+		public DiscoveryClientReferenceCollection () 

+			: base ()

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public DiscoveryReference this [string url] {

+			get { return (DiscoveryReference) InnerHashtable [url]; }

+			set { InnerHashtable [url] = value; }

+		}

+		

+		public ICollection Keys {

+			get { return InnerHashtable.Keys; }

+		}

+		

+		public ICollection Values {

+			get { return InnerHashtable.Values; }

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		public void Add (DiscoveryReference value)

+		{

+			Add (value.Url, value);

+		}

+		

+		public void Add (string url, DiscoveryReference value)

+		{

+			InnerHashtable [url] = value;

+		}

+

+		public bool Contains (string url)

+		{

+			return InnerHashtable.Contains (url);

+		}

+		

+		public void Remove (string url)

+		{

+			InnerHashtable.Remove (url);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientResult.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientResult.cs
new file mode 100755
index 00000000000..77aa4b0cd3a
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientResult.cs
@@ -0,0 +1,62 @@
+// 

+// System.Web.Services.Disocvery.DiscoveryClientResult.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Discovery {

+	public sealed class DiscoveryClientResult {

+	

+		#region Fields

+

+		private string filename;

+		private string referenceTypeName;

+		private string url;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public DiscoveryClientResult () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public DiscoveryClientResult (Type referenceType, string url, string filename) : this() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties	

+	

+		[XmlAttribute("filename")]

+		public string Filename {

+			get { return filename; }

+			set { filename = value; }

+		}

+		

+		[XmlAttribute("referenceType")]

+		public string ReferenceTypeName {

+			get { return referenceTypeName; }

+			set { referenceTypeName = value; }

+		}

+		

+		[XmlAttribute("url")]

+		public string Url {

+			get { return url; }

+			set { url = value; }

+		}

+		

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientResultCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientResultCollection.cs
new file mode 100755
index 00000000000..8f93bb0d24b
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryClientResultCollection.cs
@@ -0,0 +1,62 @@
+// 

+// System.Web.Services.Protocols.DiscoveryClientResultCollection.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Dave Bettin, 2002

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+

+namespace System.Web.Services.Discovery {

+	public sealed class DiscoveryClientResultCollection : CollectionBase {

+

+		#region Constructors

+

+		public DiscoveryClientResultCollection () 

+			: base ()

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public DiscoveryClientResult this [int i] {

+			get { 

+				if (i < 0 || i >= Count)

+					throw new ArgumentOutOfRangeException (); 

+				return (DiscoveryClientResult) InnerList [i]; 

+			}	

+			set { 

+				if (i < 0 || i >= Count)

+					throw new ArgumentOutOfRangeException (); 

+				InnerList [i] = value; 

+			}

+		}				

+		

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (DiscoveryClientResult value)

+		{

+			return InnerList.Add (value);

+		}

+

+		public bool Contains (DiscoveryClientResult value)

+		{

+			return InnerList.Contains (value);

+		}

+		

+		public void Remove (DiscoveryClientResult value)

+		{

+			InnerList.Remove (value);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocument.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocument.cs
new file mode 100755
index 00000000000..35a7010b08f
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocument.cs
@@ -0,0 +1,93 @@
+// 

+// System.Web.Services.Protocols.DiscoveryDocument.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//   Tim Coleman (tim@timcoleman.com)  

+//

+// Copyright (C) Dave Bettin, 2002

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+using System.IO;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Discovery {

+	[XmlRoot ("discovery", Namespace = "http://schemas.xmlsoap.org/disco/")]

+	public sealed class DiscoveryDocument {

+

+		#region Fields

+		

+		public const string Namespace = "http://schema.xmlsoap.org/disco/";

+		

+		#endregion // Fields

+		

+		#region Constructors

+

+		[MonoTODO]

+		public DiscoveryDocument () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+	

+		[XmlIgnore]

+		public IList References {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public static bool CanRead (XmlReader xmlReader)

+		{

+                        throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static DiscoveryDocument Read (Stream stream)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static DiscoveryDocument Read (TextReader textReader)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static DiscoveryDocument Read (XmlReader xmlReader)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Write (Stream stream)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Write (TextWriter textWriter)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Write (XmlWriter xmlWriter)

+		{

+                        throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocumentLinksPattern.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocumentLinksPattern.cs
new file mode 100755
index 00000000000..19621b26d4b
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocumentLinksPattern.cs
@@ -0,0 +1,47 @@
+// 

+// System.Web.Services.Protocols.DiscoveryDocumentLinksPattern.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+namespace System.Web.Services.Discovery {

+	public class DiscoveryDocumentLinksPattern : DiscoverySearchPattern {

+		

+		#region Fields

+		

+		private string pattern = "*.disco";

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public DiscoveryDocumentLinksPattern () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public override string Pattern {

+			get { return pattern; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public override DiscoveryReference GetDiscoveryReference (string filename)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocumentReference.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocumentReference.cs
new file mode 100755
index 00000000000..9d18e39118d
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocumentReference.cs
@@ -0,0 +1,99 @@
+// 

+// System.Web.Services.Discovery.DiscoveryDocumentReference.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Dave Bettin, 2002

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Web.Services.Description;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Discovery {

+

+	[XmlRootAttribute("discoveryRef", Namespace="http://schemas.xmlsoap.org/disco/", IsNullable=true)]

+	public sealed class DiscoveryDocumentReference : DiscoveryReference {

+		

+		#region Fields

+		

+		private DiscoveryDocument document;

+		private string defaultFilename;

+		private string href;

+		private string url;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public DiscoveryDocumentReference () 

+		{

+			href = String.Empty;

+		}

+		

+		public DiscoveryDocumentReference (string href) : this () 

+		{

+			this.href = href;

+		}		

+		

+		#endregion // Constructors

+

+		#region Properties

+		

+		[XmlIgnore]

+		public DiscoveryDocument Document {

+			get { return Document; }

+		}

+		

+		[XmlIgnore]

+		public override string DefaultFilename {

+			get { return defaultFilename; }

+		}

+		

+		[XmlAttribute("ref")]

+		public string Ref {

+			get { return href; }

+			set { href = value; }

+		}

+		

+		[XmlIgnore]

+		public override string Url {

+			get { return url; }

+			set { url = value; }

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public override object ReadDocument (Stream stream)

+		{

+			throw new NotImplementedException ();

+		}

+                

+		[MonoTODO]

+                protected internal override void Resolve (string contentType, Stream stream) 

+		{

+			throw new NotImplementedException ();

+		}

+                

+		[MonoTODO]

+                public void ResolveAll () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+                public override void WriteDocument (object document, Stream stream) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocumentSearchPattern.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocumentSearchPattern.cs
new file mode 100755
index 00000000000..97024add9d2
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryDocumentSearchPattern.cs
@@ -0,0 +1,47 @@
+// 

+// System.Web.Services.Discovery.DiscoveryDocumentSearchPattern.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+namespace System.Web.Services.Discovery {

+	public sealed class DiscoveryDocumentSearchPattern : DiscoverySearchPattern {

+		

+		#region Fields

+

+		private string pattern = "*.vsdisco";

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public DiscoveryDocumentSearchPattern () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public override string Pattern {

+			get { return pattern; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public override DiscoveryReference GetDiscoveryReference (string filename)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryExceptionDictionary.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryExceptionDictionary.cs
new file mode 100755
index 00000000000..5e2cc93237a
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryExceptionDictionary.cs
@@ -0,0 +1,69 @@
+// 

+// System.Web.Services.Protocols.DiscoveryExceptionDictionary.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+using System.Collections;

+

+namespace System.Web.Services.Discovery {

+	public sealed class DiscoveryExceptionDictionary : DictionaryBase {

+

+		#region Constructors

+

+		[MonoTODO]

+		public DiscoveryExceptionDictionary () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public Exception this[string url] {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+			

+			[MonoTODO]

+			set { throw new NotImplementedException (); }

+		}

+		

+		public ICollection Keys {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+		

+		public ICollection Values {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public void Add (string url, Exception value)

+		{

+                        throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool Contains (string url)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Remove (string url)

+		{

+                        throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs
new file mode 100755
index 00000000000..e68d9fa6cf8
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReference.cs
@@ -0,0 +1,77 @@
+// 

+// System.Web.Services.Discovery.DiscoveryReference.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+using System.IO;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Discovery {

+	public abstract class DiscoveryReference {

+		

+		#region Fields

+

+		private string defaultFilename;

+		private DiscoveryClientProtocol clientProtocol;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		protected DiscoveryReference () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public DiscoveryClientProtocol ClientProtocol {

+			get { return clientProtocol; }			

+			set { clientProtocol = value; }

+			

+		}

+		

+		[XmlIgnore]

+		public virtual string DefaultFilename {

+			get { return defaultFilename; }			

+		}

+		

+		[XmlIgnore]

+		public abstract string Url {

+			get;		

+			set;

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		protected static string FilenameFromUrl (string url)

+		{

+                        throw new NotImplementedException ();

+		}

+		

+		public abstract object ReadDocument (Stream stream);

+		

+                [MonoTODO]

+		public void Resolve () 

+		{

+                        throw new NotImplementedException ();

+		}

+                

+                protected internal abstract void Resolve (string contentType, Stream stream);

+                

+                public abstract void WriteDocument (object document, Stream stream);		

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReferenceCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReferenceCollection.cs
new file mode 100755
index 00000000000..ec81f3dadfc
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryReferenceCollection.cs
@@ -0,0 +1,62 @@
+// 

+// System.Web.Services.Protocols.DiscoveryReferenceCollection.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Dave Bettin, 2002

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+

+namespace System.Web.Services.Discovery {

+	public sealed class DiscoveryReferenceCollection : CollectionBase {

+

+		#region Constructors

+

+		public DiscoveryReferenceCollection () 

+			: base ()

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public DiscoveryReference this [int i] {

+			get { 

+				if (i < 0 || i >= Count)

+					throw new ArgumentOutOfRangeException ();

+				return (DiscoveryReference) InnerList [i]; 

+			}

+			set {

+				if (i < 0 || i >= Count)

+					throw new ArgumentOutOfRangeException ();

+				InnerList [i] = value;

+			}

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (DiscoveryReference value)

+		{

+			return InnerList.Add (value);

+		}

+

+		public bool Contains (DiscoveryReference value)

+		{

+			return InnerList.Contains (value);

+		}

+		

+		public void Remove (DiscoveryReference value)

+		{

+			InnerList.Remove (value);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryRequestHandler.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryRequestHandler.cs
new file mode 100755
index 00000000000..564a3b3ae8c
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoveryRequestHandler.cs
@@ -0,0 +1,49 @@
+// 

+// System.Web.Services.Discovery.DiscoveryRequestHandler.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+using System.Web;

+

+namespace System.Web.Services.Discovery {

+	public sealed class DiscoveryRequestHandler : IHttpHandler {

+		

+		#region Fields

+

+		private bool isReusable = true;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public DiscoveryRequestHandler () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool IsReusable {

+			get { return isReusable; }			

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public void ProcessRequest (HttpContext context)

+		{

+                        throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoverySearchPattern.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoverySearchPattern.cs
new file mode 100755
index 00000000000..d2ae0944ea6
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DiscoverySearchPattern.cs
@@ -0,0 +1,33 @@
+// 

+// System.Web.Services.Discovery.DiscoverySearchPattern.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+namespace System.Web.Services.Discovery {

+	public abstract class DiscoverySearchPattern {

+

+		#region Constructors

+

+		protected DiscoverySearchPattern () {}

+	

+		#endregion // Constructors

+

+		#region Properties

+

+		public abstract string Pattern {

+			get;

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public abstract DiscoveryReference GetDiscoveryReference (string filename);

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/DynamicDiscoveryDocument.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DynamicDiscoveryDocument.cs
new file mode 100755
index 00000000000..e16e251d06e
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/DynamicDiscoveryDocument.cs
@@ -0,0 +1,62 @@
+// 

+// System.Web.Services.Discovery.DynamicDiscoveryDocument.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+using System.IO;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Discovery {

+

+	[XmlRootAttribute("dynamicDiscovery", Namespace="urn:schemas-dynamicdiscovery:disco.2000-03-17", IsNullable=true)]

+	public sealed class DynamicDiscoveryDocument {

+

+		#region Fields

+		

+		public const string Namespace = "urn:schemas-dynamicdiscovery:disco.2000-03-17";

+		

+		#endregion // Fields

+		

+		#region Constructors

+

+		[MonoTODO]

+		public DynamicDiscoveryDocument () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+		

+		[XmlElement("exclude", typeof(ExcludePathInfo))]

+		public ExcludePathInfo[] ExcludePaths {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+			[MonoTODO]

+			set { throw new NotImplementedException (); }

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public static DynamicDiscoveryDocument Load (Stream stream)

+		{

+                        throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public	 void Write (Stream stream)

+		{

+                        throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/ExcludePathInfo.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ExcludePathInfo.cs
new file mode 100755
index 00000000000..e86bdd09b4e
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/ExcludePathInfo.cs
@@ -0,0 +1,46 @@
+// 

+// System.Web.Services.Discovery.ExcludePathInfo.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Discovery {

+	public sealed class ExcludePathInfo {

+		

+		#region Fields

+		

+		private string path;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public ExcludePathInfo () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		public ExcludePathInfo (string path) : this() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+		

+		[XmlAttribute("path")]

+		public string Path {

+			get { return path; }

+			set { path = value; }

+		}

+		

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/SchemaReference.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/SchemaReference.cs
new file mode 100755
index 00000000000..e5109ceaa19
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/SchemaReference.cs
@@ -0,0 +1,105 @@
+// 

+// System.Web.Services.Discovery.SchemaReference.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+

+using System.ComponentModel;

+using System.IO;

+using System.Xml.Schema;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Discovery {

+

+	[XmlRootAttribute("schemaRef", Namespace="http://schemas/xmlsoap.org/disco/schema/", IsNullable=true)]

+	public sealed class SchemaReference : DiscoveryReference {

+

+		#region Fields

+		

+		public const string Namespace = "http://schemas/xmlsoap.org/disco/schema/";

+

+		private string defaultFilename;

+		private string href;

+		private string url;

+		private string targetNamespace;

+		private XmlSchema schema;

+		

+		#endregion // Fields

+		

+		#region Constructors

+

+		[MonoTODO]

+		public SchemaReference () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public SchemaReference (string href) : this() 

+		{

+			throw new NotImplementedException ();

+		}		

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public override string DefaultFilename {

+			get { return defaultFilename; }

+		}

+		

+		[XmlAttribute("ref")]

+		public string Ref {

+			get { return href; }

+			set { href = value; }

+		}

+		

+		[XmlIgnore]

+		public override string Url {

+			get { return url; }

+			set { url = value; }

+		}

+		

+		[DefaultValue("")]

+		[XmlAttribute("targetNamespace")]

+		public string TargetNamespace {

+			get { return targetNamespace; }

+			set { targetNamespace = targetNamespace; }

+		}

+

+		[XmlIgnore]

+		public XmlSchema Schema {

+			get { return schema; }

+			

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public override object ReadDocument (Stream stream)

+		{

+			throw new NotImplementedException ();

+		}

+                

+		[MonoTODO]

+                protected internal override void Resolve (string contentType, Stream stream) 

+		{

+			throw new NotImplementedException ();

+		}

+                

+		[MonoTODO]

+                public override void WriteDocument (object document, Stream stream) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/SoapBinding.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/SoapBinding.cs
new file mode 100755
index 00000000000..c91e356e3e6
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/SoapBinding.cs
@@ -0,0 +1,54 @@
+// 

+// System.Web.Services.Discovery.SoapBinding.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Discovery {

+

+	[XmlRootAttribute("soap", Namespace="http://schemas/xmlsoap.org/disco/schema/soap/", IsNullable=true)]

+	public sealed class SoapBinding  {

+

+		#region Fields

+		

+		public const string Namespace = "http://schemas/xmlsoap.org/disco/schema/soap/";

+

+		private string address;

+		private XmlQualifiedName binding;

+		

+		#endregion // Fields

+		

+		#region Constructors

+

+		[MonoTODO]

+		public SoapBinding () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+		

+		[XmlAttribute("address")]

+		public string Address {

+			get { return address; }

+			set { address = value; }

+		}

+		

+		[XmlAttribute("binding")]

+		public XmlQualifiedName Binding {

+			get { return binding; }

+			set { binding = value; }

+		}

+		

+		#endregion // Properties

+

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Discovery/XmlSchemaSearchPattern.cs b/mcs/class/System.Web.Services/System.Web.Services.Discovery/XmlSchemaSearchPattern.cs
new file mode 100755
index 00000000000..f597a6d478a
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Discovery/XmlSchemaSearchPattern.cs
@@ -0,0 +1,47 @@
+// 

+// System.Web.Services.Discovery.XmlSchemaSearchPattern.cs

+//

+// Author:

+//   Dave Bettin (javabettin@yahoo.com)

+//

+// Copyright (C) Dave Bettin, 2002

+//

+

+namespace System.Web.Services.Discovery {

+	public sealed class XmlSchemaSearchPattern : DiscoverySearchPattern {

+		

+		#region Fields

+		

+		private string pattern = "*.xsd";

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO]

+		public XmlSchemaSearchPattern () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public override string Pattern {

+			get { return pattern; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public override DiscoveryReference GetDiscoveryReference (string filename)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/AnyReturnReader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/AnyReturnReader.cs
new file mode 100644
index 00000000000..698e60ea252
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/AnyReturnReader.cs
@@ -0,0 +1,49 @@
+// 

+// System.Web.Services.Protocols.AnyReturnReader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Net;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class AnyReturnReader : MimeReturnReader {

+

+		#region Constructors

+

+		[MonoTODO]

+		public AnyReturnReader () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public override object GetInitializer (LogicalMethodInfo methodInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override void Initialize (object o)

+		{

+			throw new NotImplementedException ();

+		}

+			

+		[MonoTODO]

+		public override object Read (WebResponse response, Stream responseStream)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
new file mode 100644
index 00000000000..86038a4e612
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ChangeLog
@@ -0,0 +1,185 @@
+2002-08-15  Tim Coleman <tim@timcoleman.com>
+	* ServerProtocol.cs:
+	* SoapServerProtocol.cs:
+		Some more implementation.
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>
+        * ServerProtocol.cs:
+                Add new class as implied by class statuc page.
+                SoapServerProtocol is derived from this.
+        * SoapServerProtocol.cs:
+                Change base class to ServerProtocol.  Add some
+		properties shown by class status page.
+        * SoapClientMethod.cs:
+                This class should not be sealed.  Add some
+		fields shown by the class status page.
+
+2002-07-25  Tim Coleman <tim@timcoleman.com>
+	* SoapClientMethod.cs:
+	* SoapServerProtocol.cs:
+		Add new internal classes as discovered.
+	* SoapClientMessage.cs:
+	* SoapMessage.cs:
+	* SoapServerMessage.cs:
+	* WebClientAsyncResult.cs:
+		Add internal constructor, as found on class
+		status page; modify some properties.
+
+2002-07-23  Tim Coleman <tim@timcoleman.com>
+	* SoapException.cs: modified constructors to
+		call base class correctly.
+	* WebClientAsyncResult: some implementation
+
+2002-07-23  Tim Coleman <tim@timcoleman.com>
+	* HttpGetClientProtocol.cs:
+	* HttpPostClientProtocol.cs
+		Implemented the GetWebRequest method
+	* HttpSimpleClientProtocol:
+		Some implementation of the EndInvoke method
+	* HttpWebClientProtocol.cs:
+		Set the UserAgent string appropriately
+		Implemented the GetWebRequest method
+		Implemented the GetWebResponse methods
+	* SoapHttpClientProtocol.cs:
+		Removed unused fields
+		Implemented the GetWebRequest method
+	* SoapMessage.cs:
+		Implemented the EnsureStage method
+	* WebClientProtocol.cs:
+		Added a static constructor to construct the cache
+		Implemented the Abort method
+		Implemented the AddToCache, GetFromCache methods
+		Implemented the GetWebRequest method
+		Implemented the GetWebResponse methods
+
+2002-07-23  Tim Coleman <tim@timcoleman.com>
+	* LogicalMethodTypes.cs:
+	* SoapHeaderDirection.cs:
+	* SoapMessageStage.cs:
+	* SoapParameterStyle.cs:
+	* SoapServiceRoutingStyle.cs:
+		Explicitly define values in enum to match
+		.NET.
+	* SoapMessage.cs: 
+		Removed constructor which should not be present.
+	* SoapException.cs:
+		Made protected fields private as they should
+		be.
+	* SoapHeaderException.cs:
+		Modifications to constructors to propertly
+		call base class constructor
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* SoapHeaderException.cs:
+		Fixed name error in constructor
+	* SoapUnknownHeader.cs:
+		Added reference to System.Xml.Serialization
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* SoapHeaderException.cs:
+		New file added
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>	
+	* AnyReturnReader.cs:
+	* HtmlFormParameterReader.cs :
+	* HtmlFormParameterWriter.cs :
+	* HttpGetClientProtocol.cs :
+	* HttpMethodAttribute.cs :
+	* HttpPostClientProtocol.cs :
+	* HttpSimpleClientProtocol.cs :
+	* HttpWebClientProtocol.cs :
+	* LogicalMethodInfo.cs :
+	* LogicalMethodTypes.cs :
+	* MatchAttribute.cs :
+	* MimeFormatter.cs :
+	* MimeParameterReader.cs :
+	* MimeParameterWriter.cs :
+	* MimeReturnReader.cs :
+	* NopReturnReader.cs :
+	* PatternMatcher.cs :
+	* SoapClientMessage.cs :
+	* SoapDocumentMethodAttribute.cs :
+	* SoapDocumentServiceAttribute.cs :
+	* SoapException.cs :
+	* SoapExtension.cs :
+	* SoapExtensionAttribute.cs :
+	* SoapHeader.cs :
+	* SoapHeaderAttribute.cs :
+	* SoapHeaderCollection.cs :
+	* SoapHeaderDirection.cs :
+	* SoapHttpClientProtocol.cs :
+	* SoapMessage.cs :
+	* SoapMessageStage.cs :
+	* SoapParameterStyle.cs :
+	* SoapRpcMethodAttribute.cs :
+	* SoapRpcServiceAttribute.cs :
+	* SoapServerMessage.cs :
+	* SoapServiceRoutingStyle.cs :
+	* SoapUnknownHeader.cs :
+	* TextReturnReader.cs :
+	* UrlEncodedParameterWriter.cs :
+	* UrlParameterReader.cs :
+	* UrlParameterWriter.cs :
+	* ValueCollectionParameterReader.cs :
+	* WebClientAsyncResult.cs :
+	* WebClientProtocol.cs :
+	* WebServiceHandlerFactory.cs :
+	* XmlReturnReader.cs :
+		Add missing methods and attributes to make as few missing
+		things as possible in this namespace.  This is from the
+		project status page.
+
+2002-07-20 Tim Coleman  <tim@timcoleman.com>
+       * AnyReturnReader.cs:
+       * HtmlFormParameterReader.cs:
+       * HtmlFormParameterWriter.cs:
+       * HttpGetClientProtocol.cs:
+       * HttpMethodAttribute.cs:
+       * HttpPostClientProtocol.cs:
+       * HttpSimpleClientProtocol.cs:
+       * HttpWebClientProtocol.cs:
+       * MatchAttribute.cs:
+       * MimeFormatter.cs:
+       * MimeParameterReader.cs:
+       * MimeParameterWriter.cs:
+       * MimeReturnReader.cs:
+       * NopReturnReader.cs:
+       * PatternMatcher.cs:
+       * SoapClientMessage.cs:
+       * SoapDocumentMethodAttribute.cs:
+       * SoapDocumentServiceAttribute.cs:
+       * SoapException.cs:
+       * SoapExtensionAttribute.cs:
+       * SoapExtension.cs:
+       * SoapHeaderAttribute.cs:
+       * SoapHeaderCollection.cs:
+       * SoapHeader.cs:
+       * SoapHeaderDirection.cs:
+       * SoapHttpClientProtocol.cs:
+       * SoapMessage.cs:
+       * SoapMessageStage.cs:
+       * SoapParameterStyle.cs:
+       * SoapRpcMethodAttribute.cs:
+       * SoapRpcServiceAttribute.cs:
+       * SoapServerMessage.cs:
+       * SoapServiceRoutingStyle.cs:
+       * SoapUnknownHeader.cs:
+       * TextReturnReader.cs:
+       * UrlEncodedParameterWriter.cs:
+       * UrlParameterReader.cs:
+       * UrlParameterWriter.cs:
+       * ValueCollectionParameterReader.cs:
+       * WebClientAsyncResult.cs:
+       * WebClientProtocol.cs:
+       * WebServiceHandlerFactory.cs:
+       * XmlReturnReader.cs:
+               Added new stubbs and some implementation
+       * LogicalMethodTypes.cs:
+               Added [Serializable] attribute which was missing.
+
+2002-07-19 Tim Coleman  <tim@timcoleman.com>
+	* ChangeLog:
+	* LogicalMethodInfo.cs:
+	* LogicalMethodTypes.cs:
+		Add required classes to maek System.Web.Services.Description
+		buildable.
diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HtmlFormParameterReader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HtmlFormParameterReader.cs
new file mode 100644
index 00000000000..883b85f6924
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HtmlFormParameterReader.cs
@@ -0,0 +1,36 @@
+// 

+// System.Web.Services.Protocols.HtmlFormParameterReader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class HtmlFormParameterReader : ValueCollectionParameterReader {

+

+		#region Constructors

+

+		[MonoTODO]

+		public HtmlFormParameterReader () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public override object[] Read (HttpRequest request)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HtmlFormParameterWriter.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HtmlFormParameterWriter.cs
new file mode 100644
index 00000000000..f463a2325d7
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HtmlFormParameterWriter.cs
@@ -0,0 +1,52 @@
+// 

+// System.Web.Services.Protocols.HtmlFormParameterWriter.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Net;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class HtmlFormParameterWriter : UrlEncodedParameterWriter {

+

+		#region Constructors

+

+		[MonoTODO]

+		public HtmlFormParameterWriter () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public override bool UsesWriteRequest {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public override void InitializeRequest (WebRequest request, object[] values)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override void WriteRequest (Stream requestStream, object[] values)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpGetClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpGetClientProtocol.cs
new file mode 100644
index 00000000000..554201746ec
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpGetClientProtocol.cs
@@ -0,0 +1,37 @@
+// 

+// System.Web.Services.Protocols.HttpGetClientProtocol.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Net;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class HttpGetClientProtocol : HttpSimpleClientProtocol {

+

+		#region Constructors

+

+		public HttpGetClientProtocol () 

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		protected override WebRequest GetWebRequest (Uri uri)

+		{

+			if (uri == null)

+				throw new InvalidOperationException ("The uri parameter is null.");

+			if (uri.ToString () == String.Empty)

+				throw new InvalidOperationException ("The uri parameter has a length of zero.");

+			return WebRequest.Create (uri);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpMethodAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpMethodAttribute.cs
new file mode 100644
index 00000000000..824d9d18803
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpMethodAttribute.cs
@@ -0,0 +1,50 @@
+// 

+// System.Web.Services.Protocols.HttpMethodAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	[AttributeUsage (AttributeTargets.Method)]

+	public sealed class HttpMethodAttribute : Attribute {

+

+		#region Fields

+

+		Type parameterFormatter;

+		Type returnFormatter;

+

+		#endregion

+

+		#region Constructors

+

+		public HttpMethodAttribute () 

+		{

+		}

+

+		public HttpMethodAttribute (Type returnFormatter, Type parameterFormatter) 

+			: this ()

+		{

+			this.parameterFormatter = parameterFormatter;

+			this.returnFormatter = returnFormatter;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public Type ParameterFormatter {

+			get { return parameterFormatter; }

+			set { parameterFormatter = value; }

+		}

+

+		public Type ReturnFormatter {

+			get { return returnFormatter; }

+			set { returnFormatter = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpPostClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpPostClientProtocol.cs
new file mode 100644
index 00000000000..ebdc3cdf9a1
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpPostClientProtocol.cs
@@ -0,0 +1,37 @@
+// 

+// System.Web.Services.Protocols.HttpPostClientProtocol.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Net;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class HttpPostClientProtocol : HttpSimpleClientProtocol {

+

+		#region Constructors

+

+		public HttpPostClientProtocol () 

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		protected override WebRequest GetWebRequest (Uri uri)

+		{

+			if (null == uri)

+				throw new InvalidOperationException ("The uri parameter is a null reference.");

+			if (String.Empty == uri.ToString ())

+				throw new InvalidOperationException ("The uri parameter has a length of zero.");

+			return WebRequest.Create (uri);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSimpleClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSimpleClientProtocol.cs
new file mode 100644
index 00000000000..282739ec4c1
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpSimpleClientProtocol.cs
@@ -0,0 +1,53 @@
+// 

+// System.Web.Services.Protocols.HttpSimpleClientProtocol.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public abstract class HttpSimpleClientProtocol : HttpWebClientProtocol {

+

+		#region Fields

+

+		IAsyncResult result;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		protected HttpSimpleClientProtocol () 

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		protected IAsyncResult BeginInvoke (string methodName, string requestUrl, object[] parameters, AsyncCallback callback, object asyncState)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected object EndInvoke (IAsyncResult asyncResult)

+		{

+			if (asyncResult != result)

+				throw new ArgumentException ("asyncResult is not the return value from BeginInvoke");

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected object Invoke (string methodName, string requestUrl, object[] parameters)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpWebClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpWebClientProtocol.cs
new file mode 100644
index 00000000000..a47c7a19694
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/HttpWebClientProtocol.cs
@@ -0,0 +1,104 @@
+// 

+// System.Web.Services.Protocols.HttpWebClientProtocol.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.ComponentModel;

+using System.Net;

+using System.Security.Cryptography.X509Certificates;

+using System.Threading;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public abstract class HttpWebClientProtocol : WebClientProtocol {

+

+		#region Fields

+

+		bool allowAutoRedirect;

+		X509CertificateCollection clientCertificates;

+		CookieContainer cookieContainer;

+		IWebProxy proxy;

+		string userAgent;

+

+		#endregion

+

+		#region Constructors

+

+		protected HttpWebClientProtocol () 

+		{

+			allowAutoRedirect = false;

+			clientCertificates = new X509CertificateCollection ();

+			cookieContainer = null;

+			proxy = null; // FIXME

+			userAgent = String.Format ("Mono Web Services Client Protocol {0}", Environment.Version);

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[DefaultValue (false)]

+		[WebServicesDescription ("Enable automatic handling of server redirects.")]

+		public bool AllowAutoRedirect {

+			get { return allowAutoRedirect; }

+			set { allowAutoRedirect = value; }

+		}

+

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		[WebServicesDescription ("The client certificates that will be sent to the server, if the server requests them.")]

+		public X509CertificateCollection ClientCertificates {

+			get { return clientCertificates; }

+		}

+

+		[DefaultValue (null)]

+		[WebServicesDescription ("A container for all cookies received from servers in the current session.")]

+		public CookieContainer CookieContainer {

+			get { return cookieContainer; }

+			set { cookieContainer = value; }

+		}

+

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public IWebProxy Proxy {

+			get { return proxy; }

+			set { proxy = value; }

+		}

+

+		[WebServicesDescription ("Sets the user agent http header for the request.")]

+		public string UserAgent {

+			get { return userAgent; }

+			set { userAgent = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		protected override WebRequest GetWebRequest (Uri uri)

+		{

+			if (null == uri)

+				throw new InvalidOperationException ("The uri parameter is a null reference.");

+			return WebRequest.Create (uri);

+		}

+

+		protected override WebResponse GetWebResponse (WebRequest request)

+		{

+			return request.GetResponse ();

+		}

+

+		protected override WebResponse GetWebResponse (WebRequest request, IAsyncResult result)

+		{

+                        IAsyncResult ar = request.BeginGetResponse (null, null);

+                        ar.AsyncWaitHandle.WaitOne ();

+                        return request.EndGetResponse (result);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/LogicalMethodInfo.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/LogicalMethodInfo.cs
new file mode 100644
index 00000000000..471b925d6e5
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/LogicalMethodInfo.cs
@@ -0,0 +1,176 @@
+// 

+// System.Web.Services.Protocols.LogicalMethodInfo.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Reflection;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public sealed class LogicalMethodInfo {

+

+		#region Fields

+

+		#endregion // Fields

+

+		#region Constructors

+	

+		public LogicalMethodInfo (MethodInfo methodInfo)

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public ParameterInfo AsyncCallbackParameter {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public ParameterInfo AsyncResultParameter {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public ParameterInfo AsyncStateParameter {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public MethodInfo BeginMethodInfo {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public ICustomAttributeProvider CustomAttributeProvider {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public Type DeclaringType {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public MethodInfo EndMethodInfo {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public ParameterInfo[] InParameters {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public bool IsAsync {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public bool IsVoid {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public MethodInfo MethodInfo {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string Name {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public ParameterInfo[] OutParameters {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public ParameterInfo[] Parameters {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public Type ReturnType {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public ICustomAttributeProvider ReturnTypeCustomAttributeProvider {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public IAsyncResult BeginInvoke (object target, object[] values, AsyncCallback callback, object asyncState)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static LogicalMethodInfo[] Create (MethodInfo[] methodInfos)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static LogicalMethodInfo[] Create (MethodInfo[] methodInfos, LogicalMethodTypes types)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public object[] EndInvoke (object target, IAsyncResult asyncResult)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public object GetCustomAttribute (Type type)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public object[] GetCustomAttributes (Type type)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public object[] Invoke (object target, object[] values)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static bool IsBeginMethod (MethodInfo methodInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static bool IsEndMethod (MethodInfo methodInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override string ToString ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/LogicalMethodTypes.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/LogicalMethodTypes.cs
new file mode 100644
index 00000000000..c2347a4f487
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/LogicalMethodTypes.cs
@@ -0,0 +1,16 @@
+// 

+// System.Web.Services.Protocols.LogicalMethodTypes.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	[Serializable]

+	public enum LogicalMethodTypes {

+		Async = 0x2,

+		Sync = 0x1

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/MatchAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/MatchAttribute.cs
new file mode 100644
index 00000000000..95c985c5900
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/MatchAttribute.cs
@@ -0,0 +1,64 @@
+// 

+// System.Web.Services.Protocols.MatchAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	[AttributeUsage (AttributeTargets.All)]

+	public sealed class MatchAttribute : Attribute {

+

+		#region Fields

+

+		int capture;

+		int group;

+		bool ignoreCase;

+		int maxRepeats;

+		string pattern;

+

+		#endregion

+

+		#region Constructors

+

+		public MatchAttribute (string pattern) 

+		{

+			ignoreCase = false;

+			maxRepeats = -1;

+			this.pattern = pattern;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public int Capture {

+			get { return capture; }

+			set { capture = value; }

+		}

+

+		public int Group {

+			get { return group; }

+			set { group = value; }

+		}

+

+		public bool IgnoreCase {

+			get { return ignoreCase; }

+			set { ignoreCase = value; }

+		}

+

+		public int MaxRepeats {

+			get { return maxRepeats; }

+			set { maxRepeats = value; }

+		}

+

+		public string Pattern {

+			get { return pattern; }

+			set { pattern = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeFormatter.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeFormatter.cs
new file mode 100644
index 00000000000..2bc4e93239b
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeFormatter.cs
@@ -0,0 +1,57 @@
+// 

+// System.Web.Services.Protocols.MimeFormatter.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public abstract class MimeFormatter {

+

+		#region Constructors

+

+		[MonoTODO]

+		protected MimeFormatter () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public static MimeFormatter CreateInstance (Type type, object initializer)

+		{

+			throw new NotImplementedException ();

+		}

+

+		public abstract object GetInitializer (LogicalMethodInfo methodInfo);

+

+		[MonoTODO]

+		public static object GetInitializer (Type type, LogicalMethodInfo methodInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual object[] GetInitializers (LogicalMethodInfo[] methodInfos)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static object[] GetInitializers (Type type, LogicalMethodInfo[] methodInfos)

+		{

+			throw new NotImplementedException ();

+		}

+

+		public abstract void Initialize (object initializer);	

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeParameterReader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeParameterReader.cs
new file mode 100644
index 00000000000..3b9f5a59c74
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeParameterReader.cs
@@ -0,0 +1,29 @@
+// 

+// System.Web.Services.Protocols.MimeParameterReader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web;

+

+namespace System.Web.Services.Protocols {

+	public abstract class MimeParameterReader : MimeFormatter {

+

+		#region Constructors

+

+		protected MimeParameterReader () 

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		public abstract object[] Read (HttpRequest request);

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeParameterWriter.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeParameterWriter.cs
new file mode 100644
index 00000000000..c152c4b3456
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeParameterWriter.cs
@@ -0,0 +1,66 @@
+// 

+// System.Web.Services.Protocols.MimeParameterWriter.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Net;

+using System.Text;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public abstract class MimeParameterWriter : MimeFormatter {

+

+		#region Constructors

+

+		[MonoTODO]

+		protected MimeParameterWriter () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties 

+

+		public virtual Encoding RequestEncoding {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+			[MonoTODO]

+			set { throw new NotImplementedException (); }

+		}

+

+		public virtual bool UsesWriteRequest {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public virtual string GetRequestUrl (string url, object[] parameters)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void InitializeRequest (WebRequest request, object[] values)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void WriteRequest (Stream requestStream, object[] values)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeReturnReader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeReturnReader.cs
new file mode 100644
index 00000000000..29e645554e9
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/MimeReturnReader.cs
@@ -0,0 +1,30 @@
+// 

+// System.Web.Services.Protocols.MimeReturnReader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Net;

+

+namespace System.Web.Services.Protocols {

+	public abstract class MimeReturnReader : MimeFormatter {

+

+		#region Constructors

+

+		protected MimeReturnReader () 

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		public abstract object Read (WebResponse response, Stream responseStream);

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/NopReturnReader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/NopReturnReader.cs
new file mode 100644
index 00000000000..2786fc75ae2
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/NopReturnReader.cs
@@ -0,0 +1,49 @@
+// 

+// System.Web.Services.Protocols.NopReturnReader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Net;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class NopReturnReader : MimeReturnReader {

+

+		#region Constructors

+

+		[MonoTODO]

+		public NopReturnReader () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public override object GetInitializer (LogicalMethodInfo methodInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override void Initialize (object initializer)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override object Read (WebResponse response, Stream responseStream)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/PatternMatcher.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/PatternMatcher.cs
new file mode 100644
index 00000000000..4d60f517285
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/PatternMatcher.cs
@@ -0,0 +1,35 @@
+// 

+// System.Web.Services.Protocols.PatternMatcher.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public sealed class PatternMatcher {

+

+		#region Constructors

+

+		[MonoTODO]

+		public PatternMatcher (Type type) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public object Match (string text)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerProtocol.cs
new file mode 100644
index 00000000000..fd3cc9e6b71
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ServerProtocol.cs
@@ -0,0 +1,61 @@
+// 

+// System.Web.Services.Protocols.ServerProtocol.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	[MonoTODO ("Figure out what thsi class does.")]

+	internal abstract class ServerProtocol {

+

+		#region Constructors

+

+		protected ServerProtocol ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+

+		#region Properties

+

+		public virtual bool IsOneWay {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public virtual LogicalMethodInfo MethodInfo {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion

+

+		#region Methods

+

+		[MonoTODO]

+		public virtual void CreateServerInstance ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void DisposeServerInstance ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void Initialize ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapClientMessage.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapClientMessage.cs
new file mode 100644
index 00000000000..a09077b146f
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapClientMessage.cs
@@ -0,0 +1,78 @@
+// 

+// System.Web.Services.Protocols.SoapClientMessage.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public sealed class SoapClientMessage : SoapMessage {

+

+		#region Fields

+

+		SoapHttpClientProtocol client;

+		SoapClientMethod clientMethod;

+		string url;

+

+		#endregion

+

+		#region Constructors

+		

+		[MonoTODO ("Determine what calls this constructor.")]

+		internal SoapClientMessage (SoapHttpClientProtocol client, SoapClientMethod clientMethod, string url)

+		{

+			this.client = client;

+			this.url = url;

+			this.clientMethod = clientMethod;

+		}

+

+		#endregion 

+

+		#region Properties

+

+		public override string Action {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public SoapHttpClientProtocol Client {

+			get { return client; }

+		}

+

+		public override LogicalMethodInfo MethodInfo {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public override bool OneWay {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public override string Url {

+			get { return url; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		protected override void EnsureInStage ()

+		{

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		protected override void EnsureOutStage ()

+		{

+			throw new NotImplementedException (); 

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapClientMethod.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapClientMethod.cs
new file mode 100644
index 00000000000..9bc959b3997
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapClientMethod.cs
@@ -0,0 +1,27 @@
+// 

+// System.Web.Services.Protocols.SoapClientMethod.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+using System.Web.Services.Description;

+

+namespace System.Web.Services.Protocols {

+	[MonoTODO ("Determine what this class does.")]

+	internal class SoapClientMethod {

+

+		#region Fields

+

+		public string action;

+		public LogicalMethodInfo methodInfo;

+		public bool oneWay;

+		public bool rpc;

+		public SoapBindingUse use;

+

+		#endregion // Fields

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentMethodAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentMethodAttribute.cs
new file mode 100644
index 00000000000..d927eb37acf
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentMethodAttribute.cs
@@ -0,0 +1,102 @@
+// 

+// System.Web.Services.Protocols.SoapDocumentMethodAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Description;

+

+namespace System.Web.Services.Protocols {

+	[AttributeUsage (AttributeTargets.Method)]

+	public sealed class SoapDocumentMethodAttribute : Attribute {

+

+		#region Fields

+

+		string action;

+		string binding;

+		bool oneWay;

+		SoapParameterStyle parameterStyle;

+		string requestElementName;

+		string requestNamespace;

+		string responseElementName;

+		string responseNamespace;

+		SoapBindingUse use;

+

+		#endregion

+

+		#region Constructors

+

+		public SoapDocumentMethodAttribute () 

+		{

+			action = "http://tempuri.org/MethodName"; // FIXME

+			binding = String.Empty; // FIXME

+			oneWay = false;

+			parameterStyle = SoapParameterStyle.Wrapped;

+			requestElementName = String.Empty; // FIXME

+			requestNamespace = "http://tempuri.org/"; 

+			responseElementName = "WebServiceNameResult"; // FIXME

+			responseNamespace = "http://tempuri.org/";

+			use = SoapBindingUse.Literal;

+		}

+

+		public SoapDocumentMethodAttribute (string action)

+			: this ()

+		{

+			this.action = action;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public string Action {

+			get { return action; }

+			set { action = value; }

+		}

+

+		public string Binding {

+			get { return binding; }

+			set { binding = value; }

+		}

+

+		public bool OneWay {

+			get { return oneWay; }

+			set { oneWay = value; }

+		}

+

+		public SoapParameterStyle ParameterStyle {

+			get { return parameterStyle; }

+			set { parameterStyle = value; }

+		}

+

+		public string RequestElementName {

+			get { return requestElementName; }

+			set { requestElementName = value; }

+		}

+

+		public string RequestNamespace {

+			get { return requestNamespace; }

+			set { requestNamespace = value; }

+		}

+

+		public string ResponseElementName {

+			get { return responseElementName; }

+			set { responseElementName = value; }

+		}

+

+		public string ResponseNamespace {

+			get { return responseNamespace; }

+			set { responseNamespace = value; }

+		}

+

+		public SoapBindingUse Use {

+			get { return use; }

+			set { use = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentServiceAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentServiceAttribute.cs
new file mode 100644
index 00000000000..6593a87609e
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapDocumentServiceAttribute.cs
@@ -0,0 +1,67 @@
+// 

+// System.Web.Services.Protocols.SoapDocumentServiceAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services.Description;

+

+namespace System.Web.Services.Protocols {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class SoapDocumentServiceAttribute : Attribute {

+

+		#region Fields

+

+		SoapParameterStyle paramStyle;

+		SoapServiceRoutingStyle routingStyle;

+		SoapBindingUse use;

+

+		#endregion

+

+		#region Constructors

+

+		public SoapDocumentServiceAttribute () 

+		{

+			paramStyle = SoapParameterStyle.Wrapped;

+			routingStyle = SoapServiceRoutingStyle.SoapAction;

+			use = SoapBindingUse.Literal;

+		}

+

+		public SoapDocumentServiceAttribute (SoapBindingUse use) 

+			: this ()

+		{

+			this.use = use;

+		}

+

+		public SoapDocumentServiceAttribute (SoapBindingUse use, SoapParameterStyle paramStyle) 

+			: this ()

+		{

+			this.use = use;

+			this.paramStyle = paramStyle;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public SoapParameterStyle ParameterStyle {

+			get { return paramStyle; }

+			set { paramStyle = value; }

+		}

+

+		public SoapServiceRoutingStyle RoutingStyle {

+			get { return routingStyle; }

+			set { routingStyle = value; }

+		}

+

+		public SoapBindingUse Use {

+			get { return use; }

+			set { use = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapException.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapException.cs
new file mode 100644
index 00000000000..e28c88d06b7
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapException.cs
@@ -0,0 +1,91 @@
+// 

+// System.Web.Services.Protocols.SoapException.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml;

+

+namespace System.Web.Services.Protocols {

+	public class SoapException : SystemException {

+

+		#region Fields

+

+		public static readonly XmlQualifiedName ClientFaultCode = new XmlQualifiedName ("Client", "http://schemas.xmlsoap.org/soap/envelope/");

+		public static readonly XmlQualifiedName DetailElementName = new XmlQualifiedName ("detail");

+		public static readonly XmlQualifiedName MustUnderstandFaultCode = new XmlQualifiedName ("MustUnderstand", "http://schemas.xmlsoap.org/soap/envelope/");

+		public static readonly XmlQualifiedName ServerFaultCode = new XmlQualifiedName ("Server", "http://schemas.xmlsoap.org/soap/envelope/");

+		public static readonly XmlQualifiedName VersionMismatchFaultCode = new XmlQualifiedName ("VersionMismatch", "http://schemas.xmlsoap.org/soap/envelope/");

+

+		string actor;

+		XmlQualifiedName code;

+		XmlNode detail;

+

+		#endregion

+

+		#region Constructors

+

+		public SoapException (string message, XmlQualifiedName code)

+			: base (message)

+		{

+			this.code = code;

+		}

+

+		public SoapException (string message, XmlQualifiedName code, Exception innerException)

+			: base (message, innerException)

+		{

+			this.code = code;

+		}

+

+		public SoapException (string message, XmlQualifiedName code, string actor)

+			: base (message)

+		{

+			this.code = code;

+			this.actor = actor;

+		}

+

+		public SoapException (string message, XmlQualifiedName code, string actor, Exception innerException)

+			: base (message, innerException)

+		{

+			this.code = code;

+			this.actor = actor;

+		}

+

+		public SoapException (string message, XmlQualifiedName code, string actor, XmlNode detail)

+			: base (message)

+		{

+			this.code = code;

+			this.actor = actor;

+			this.detail = detail;

+		}

+

+		public SoapException (string message, XmlQualifiedName code, string actor, XmlNode detail, Exception innerException)

+			: base (message, innerException)

+		{

+			this.code = code;

+			this.actor = actor;

+			this.detail = detail;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string Actor {

+			get { return actor; }

+		}

+

+		public XmlQualifiedName Code {

+			get { return code; }

+		}

+

+		public XmlNode Detail {

+			get { return detail; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs
new file mode 100644
index 00000000000..48f91cd38db
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtension.cs
@@ -0,0 +1,46 @@
+// 

+// System.Web.Services.Protocols.SoapExtension.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+

+namespace System.Web.Services.Protocols {

+	public abstract class SoapExtension {

+

+		#region Fields

+

+		Stream stream;

+

+		#endregion

+

+		#region Constructors

+

+		[MonoTODO]

+		protected SoapExtension ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public virtual Stream ChainStream (Stream stream)

+		{

+			throw new NotImplementedException ();

+		}

+

+		public abstract object GetInitializer (Type serviceType);

+		public abstract object GetInitializer (LogicalMethodInfo methodInfo, SoapExtensionAttribute attribute);

+		public abstract void Initialize (object initializer);

+		public abstract void ProcessMessage (SoapMessage message);

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtensionAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtensionAttribute.cs
new file mode 100644
index 00000000000..c90f6b9bc94
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapExtensionAttribute.cs
@@ -0,0 +1,34 @@
+// 

+// System.Web.Services.Protocols.SoapExtensionAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	public abstract class SoapExtensionAttribute : Attribute {

+

+		#region Constructors

+

+		protected SoapExtensionAttribute () 

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public abstract Type ExtensionType {

+			get;

+		}

+

+		public abstract int Priority {

+			get;

+			set;

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeader.cs
new file mode 100644
index 00000000000..eecfa6b0282
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeader.cs
@@ -0,0 +1,78 @@
+// 

+// System.Web.Services.Protocols.SoapHeader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Protocols {

+	[SoapType (IncludeInSchema = false)]

+	[XmlType (IncludeInSchema = false)]

+	public abstract class SoapHeader {

+

+		#region Fields

+

+		string actor;

+		bool didUnderstand;

+		bool mustUnderstand;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		protected SoapHeader ()

+		{

+			actor = String.Empty; 

+			didUnderstand = false;

+			mustUnderstand = false;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		[DefaultValue ("")]

+		[SoapAttribute ("actor", Namespace = "http://schemas.xmlsoap.org/soap/envelope/")]

+		[XmlAttribute ("actor", Namespace = "http://schemas.xmlsoap.org/soap/envelope/")]

+		public string Actor {	

+			get { return actor; }

+			set { actor = value; }

+		}

+

+		[SoapIgnore]

+		[XmlIgnore]

+		public bool DidUnderstand {

+			get { return didUnderstand; }

+			set { didUnderstand = value; }

+		}

+

+		[DefaultValue ("0")]

+		[SoapAttribute ("mustUnderstand", Namespace = "http://schemas.xmlsoap.org/soap/envelope/")]

+		[XmlAttribute ("mustUnderstand", Namespace = "http://schemas.xmlsoap.org/soap/envelope/")]

+		public string EncodedMustUnderstand {

+			get { return (MustUnderstand ? "1" : "0"); }

+			set {	

+				if (value == "true" || value == "1") 

+					MustUnderstand = true;

+				else if (value == "false" || value == "0")

+					MustUnderstand = false;

+				else

+					throw new ArgumentException ();

+			}

+		}

+

+		[SoapIgnore]

+		[XmlIgnore]

+		public bool MustUnderstand {

+			get { return mustUnderstand; }

+			set { mustUnderstand = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs
new file mode 100644
index 00000000000..f933c62d2d8
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderAttribute.cs
@@ -0,0 +1,52 @@
+// 

+// System.Web.Services.Protocols.SoapHeaderAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	[AttributeUsage (AttributeTargets.Method)]

+	public sealed class SoapHeaderAttribute : Attribute {

+

+		#region Fields

+

+		SoapHeaderDirection direction;

+		string memberName;

+		bool required;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public SoapHeaderAttribute (string memberName) 

+		{

+			direction = SoapHeaderDirection.In;

+			this.memberName = memberName;

+			required = true;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public SoapHeaderDirection Direction {

+			get { return direction; }

+			set { direction = value; }

+		}

+

+		public string MemberName {	

+			get { return memberName; }

+			set { memberName = value; }

+		}

+

+		public bool Required {

+			get { return required; }

+			set { required = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderCollection.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderCollection.cs
new file mode 100644
index 00000000000..017b0346beb
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderCollection.cs
@@ -0,0 +1,69 @@
+// 

+// System.Web.Services.Protocols.SoapHeaderCollection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+

+namespace System.Web.Services.Protocols {

+	public class SoapHeaderCollection : CollectionBase {

+

+		#region Constructors

+

+		public SoapHeaderCollection ()

+		{

+		}

+

+		#endregion

+

+		#region Properties

+

+		public SoapHeader this [int index] {

+			get { return (SoapHeader) List[index]; }

+			set { List[index] = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (SoapHeader header)

+		{

+			Insert (Count, header);

+			return (Count - 1);

+		}

+

+		public bool Contains (SoapHeader header)

+		{

+			return List.Contains (header);

+		}

+

+		public void CopyTo (SoapHeader[] array, int index)

+		{

+			List.CopyTo (array, index);

+		}

+

+		public int IndexOf (SoapHeader header)

+		{

+			return List.IndexOf (header);

+		}

+

+		public void Insert (int index, SoapHeader header)

+		{

+			if (index < 0 || index > Count)

+				throw new ArgumentOutOfRangeException ();

+			List.Insert (index, header);

+		}

+

+		public void Remove (SoapHeader header)

+		{

+			List.Remove (header);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderDirection.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderDirection.cs
new file mode 100644
index 00000000000..14c60ee3119
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderDirection.cs
@@ -0,0 +1,18 @@
+// 

+// System.Web.Services.Protocols.SoapHeaderDirection.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	[Flags]

+	[Serializable]

+	public enum SoapHeaderDirection {

+		In = 0x1,

+		InOut = 0x3,

+		Out = 0x2

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderException.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderException.cs
new file mode 100644
index 00000000000..3e2bde7b2b7
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHeaderException.cs
@@ -0,0 +1,39 @@
+// 

+// System.Web.Services.Protocols.SoapHeaderException.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml;

+

+namespace System.Web.Services.Protocols {

+	public class SoapHeaderException : SoapException {

+

+		#region Constructors

+

+		public SoapHeaderException (string message, XmlQualifiedName code)

+			: base (message, code)

+		{

+		}

+

+		public SoapHeaderException (string message, XmlQualifiedName code, Exception innerException)

+			: base (message, code, innerException)

+		{

+		}

+

+		public SoapHeaderException (string message, XmlQualifiedName code, string actor)

+			: base (message, code, actor)

+		{

+		}

+

+		public SoapHeaderException (string message, XmlQualifiedName code, string actor, Exception innerException)

+			: base (message, code, actor, innerException)

+		{

+		}

+

+		#endregion // Constructors

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHttpClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHttpClientProtocol.cs
new file mode 100644
index 00000000000..2b17b469e70
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapHttpClientProtocol.cs
@@ -0,0 +1,58 @@
+// 

+// System.Web.Services.Protocols.SoapHttpClientProtocol.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Net;

+using System.Web;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class SoapHttpClientProtocol : HttpWebClientProtocol {

+

+		#region Constructors

+

+		public SoapHttpClientProtocol () 

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		protected IAsyncResult BeginInvoke (string methodName, object[] parameters, AsyncCallback callback, object asyncState)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Discover ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected object[] EndInvoke (IAsyncResult asyncResult)

+		{

+			throw new NotImplementedException ();

+		}

+

+		protected override WebRequest GetWebRequest (Uri uri)

+		{

+			return WebRequest.Create (uri);

+		}

+

+		[MonoTODO]

+		protected object[] Invoke (string methodName, object[] parameters)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs
new file mode 100644
index 00000000000..8dea7f5140a
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessage.cs
@@ -0,0 +1,106 @@
+// 

+// System.Web.Services.Protocols.SoapMessage.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public abstract class SoapMessage {

+

+		#region Fields

+

+		string contentType = "text/xml";

+		SoapException exception = null;

+		SoapHeaderCollection headers = null;

+		SoapMessageStage stage;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		internal SoapMessage ()

+		{

+		}

+

+		#endregion

+

+		#region Properties

+

+		public abstract string Action {

+			get;

+		}

+

+		public string ContentType {

+			get { return contentType; }

+			set { contentType = value; }

+		}

+

+		public SoapException Exception {

+			get { return exception; }

+		}

+

+		public SoapHeaderCollection Headers {

+			get { return headers; }

+		}

+

+		public abstract LogicalMethodInfo MethodInfo {

+			get;

+		}

+

+		public abstract bool OneWay {

+			get;

+		}

+

+		public SoapMessageStage Stage {

+			get { return stage; }

+		}

+

+		public Stream Stream {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public abstract string Url {

+			get;

+		}

+

+		#endregion Properties

+

+		#region Methods

+

+		protected abstract void EnsureInStage ();

+		protected abstract void EnsureOutStage ();

+

+		protected void EnsureStage (SoapMessageStage stage) 

+		{

+			if ((((int) stage) & ((int) Stage)) == 0)

+				throw new InvalidOperationException ("The current SoapMessageStage is not the asserted stage or stages.");

+		}

+

+		[MonoTODO]

+		public object GetInParameterValue (int index) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public object GetOutParameterValue (int index) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public object GetReturnValue ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessageStage.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessageStage.cs
new file mode 100644
index 00000000000..c4c4b1c3433
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapMessageStage.cs
@@ -0,0 +1,18 @@
+// 

+// System.Web.Services.Protocols.SoapMessageStage.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	[Serializable]

+	public enum SoapMessageStage {

+		AfterDeserialize = 0x8,

+		AfterSerialize = 0x2,

+		BeforeDeserialize = 0x4,

+		BeforeSerialize = 0x1

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapParameterStyle.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapParameterStyle.cs
new file mode 100644
index 00000000000..e03ced756e9
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapParameterStyle.cs
@@ -0,0 +1,17 @@
+// 

+// System.Web.Services.Protocols.SoapParameterStyle.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	[Serializable]

+	public enum SoapParameterStyle {

+		Default = 0x0,

+		Bare = 0x1,

+		Wrapped = 0x2

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapRpcMethodAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapRpcMethodAttribute.cs
new file mode 100644
index 00000000000..9e375d1c9f4
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapRpcMethodAttribute.cs
@@ -0,0 +1,86 @@
+// 

+// System.Web.Services.Protocols.SoapRpcMethodAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	[AttributeUsage (AttributeTargets.Method)]

+	public sealed class SoapRpcMethodAttribute : Attribute {

+

+		#region Fields

+

+		string action;

+		string binding;

+		bool oneWay;

+		string requestElementName;

+		string requestNamespace;

+		string responseElementName;

+		string responseNamespace;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public SoapRpcMethodAttribute ()

+		{

+			action = "http://tempuri.org/MethodName"; // FIXME

+			binding = ""; // FIXME

+			oneWay = false;

+			requestElementName = ""; // FIXME

+			requestNamespace = "http://tempuri.org/";

+			responseElementName = "WebServiceNameResult"; // FIXME

+			responseNamespace = "http://tempuri.org/";

+		}

+

+		public SoapRpcMethodAttribute (string action)

+			: this ()

+		{

+			this.action = action;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string Action {

+			get { return action; }

+			set { action = value; }

+		}

+

+		public string Binding {

+			get { return binding; }

+			set { binding = value; }

+		}

+

+		public bool OneWay {

+			get { return oneWay; }

+			set { oneWay = value; }

+		}

+

+		public string RequestElementName {

+			get { return requestElementName; }

+			set { requestElementName = value; }

+		}

+

+		public string RequestNamespace {

+			get { return requestNamespace; }

+			set { requestNamespace = value; }

+		}

+

+		public string ResponseElementName {

+			get { return responseElementName; }

+			set { responseElementName = value; }

+		}

+

+		public string ResponseNamespace {

+			get { return responseNamespace; }

+			set { responseNamespace = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapRpcServiceAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapRpcServiceAttribute.cs
new file mode 100644
index 00000000000..aa475f5e1d3
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapRpcServiceAttribute.cs
@@ -0,0 +1,38 @@
+// 

+// System.Web.Services.Protocols.SoapRpcServiceAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class SoapRpcServiceAttribute : Attribute {

+

+		#region Fields

+

+		SoapServiceRoutingStyle routingStyle;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public SoapRpcServiceAttribute ()

+		{

+			routingStyle = SoapServiceRoutingStyle.SoapAction;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public SoapServiceRoutingStyle RoutingStyle {

+			get { return routingStyle; }

+			set { routingStyle = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapServerMessage.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapServerMessage.cs
new file mode 100644
index 00000000000..c36f79802ee
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapServerMessage.cs
@@ -0,0 +1,80 @@
+// 

+// System.Web.Services.Protocols.SoapServerMessage.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public sealed class SoapServerMessage : SoapMessage {

+

+		#region Fields

+

+		string action;

+		LogicalMethodInfo methodInfo;

+		bool oneWay;

+		object server;

+		string url;

+		SoapServerProtocol protocol;

+

+		#endregion

+

+		#region Constructors

+

+		[MonoTODO ("Determine what this constructor does.")]

+		internal SoapServerMessage (SoapServerProtocol protocol)

+		{

+		}

+

+		#endregion

+

+		#region Properties

+

+		public override string Action {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public override LogicalMethodInfo MethodInfo {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public override bool OneWay {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public object Server {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}	

+

+		public override string Url {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		protected override void EnsureInStage ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void EnsureOutStage ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapServerProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapServerProtocol.cs
new file mode 100644
index 00000000000..831bdf54ebd
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapServerProtocol.cs
@@ -0,0 +1,35 @@
+// 

+// System.Web.Services.Protocols.SoapServerProtocol.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	[MonoTODO ("Figure out what thsi class does.")]

+	internal class SoapServerProtocol : ServerProtocol {

+

+		#region Fields

+

+		bool isOneWay;

+

+		#endregion // Fields

+

+		#region Properties

+

+		public override bool IsOneWay {

+			get { return isOneWay; }

+		}

+

+		[MonoTODO]

+		public override LogicalMethodInfo MethodInfo {

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapServiceRoutingStyle.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapServiceRoutingStyle.cs
new file mode 100644
index 00000000000..47a1762d1a6
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapServiceRoutingStyle.cs
@@ -0,0 +1,16 @@
+// 

+// System.Web.Services.Protocols.SoapServiceRoutingStyle.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services.Protocols {

+	[Serializable]

+	public enum SoapServiceRoutingStyle {

+		SoapAction = 0x0,

+		RequestElement = 0x1

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapUnknownHeader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapUnknownHeader.cs
new file mode 100644
index 00000000000..4b46412c1cf
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/SoapUnknownHeader.cs
@@ -0,0 +1,41 @@
+// 

+// System.Web.Services.Protocols.SoapUnknownHeader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Web.Services.Protocols {

+	public sealed class SoapUnknownHeader : SoapHeader {

+

+		#region Fields

+

+		XmlElement element;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public SoapUnknownHeader ()

+		{

+			element = null;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		[XmlIgnore]

+		public XmlElement Element {

+			get { return element; }

+			set { element = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/TextReturnReader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/TextReturnReader.cs
new file mode 100644
index 00000000000..3c42b93ec3f
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/TextReturnReader.cs
@@ -0,0 +1,46 @@
+// 

+// System.Web.Services.Protocols.TextReturnReader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Net;

+

+namespace System.Web.Services.Protocols {

+	public class TextReturnReader : MimeReturnReader {

+

+		#region Constructors

+

+		public TextReturnReader () 

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public override object GetInitializer (LogicalMethodInfo methodInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override void Initialize (object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override object Read (WebResponse response, Stream responseStream)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/UrlEncodedParameterWriter.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/UrlEncodedParameterWriter.cs
new file mode 100644
index 00000000000..2f35bd155b3
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/UrlEncodedParameterWriter.cs
@@ -0,0 +1,66 @@
+// 

+// System.Web.Services.Protocols.UrlEncodedParameterWriter.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Text;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public abstract class UrlEncodedParameterWriter : MimeParameterWriter {

+

+		#region Constructors

+

+		[MonoTODO]

+		protected UrlEncodedParameterWriter () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties 

+

+		public override Encoding RequestEncoding {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+			[MonoTODO]

+			set { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		protected void Encode (TextWriter writer, object[] values)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected void Encode (TextWriter writer, string name, object value)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override object GetInitializer (LogicalMethodInfo methodInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override void Initialize (object initializer)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/UrlParameterReader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/UrlParameterReader.cs
new file mode 100644
index 00000000000..09012b0a353
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/UrlParameterReader.cs
@@ -0,0 +1,36 @@
+// 

+// System.Web.Services.Protocols.UrlParameterReader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class UrlParameterReader : ValueCollectionParameterReader {

+

+		#region Constructors

+

+		[MonoTODO]

+		public UrlParameterReader () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public override object[] Read (HttpRequest request)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/UrlParameterWriter.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/UrlParameterWriter.cs
new file mode 100644
index 00000000000..a5575c97b48
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/UrlParameterWriter.cs
@@ -0,0 +1,35 @@
+// 

+// System.Web.Services.Protocols.UrlParameterWriter.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class UrlParameterWriter : UrlEncodedParameterWriter {

+

+		#region Constructors

+

+		[MonoTODO]

+		public UrlParameterWriter () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public override string GetRequestUrl (string url, object[] parameters)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/ValueCollectionParameterReader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ValueCollectionParameterReader.cs
new file mode 100644
index 00000000000..e01e11f01b0
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/ValueCollectionParameterReader.cs
@@ -0,0 +1,61 @@
+// 

+// System.Web.Services.Protocols.ValueCollectionParameterReader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections.Specialized;

+using System.Reflection;

+using System.Web;

+

+namespace System.Web.Services.Protocols {

+	public abstract class ValueCollectionParameterReader : MimeParameterReader {

+

+		#region Constructors

+

+		[MonoTODO]

+		protected ValueCollectionParameterReader () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public override object GetInitializer (LogicalMethodInfo methodInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override void Initialize (object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static bool IsSupported (LogicalMethodInfo methodInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static bool IsSupported (ParameterInfo paramInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected object[] Read (NameValueCollection collection)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientAsyncResult.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientAsyncResult.cs
new file mode 100644
index 00000000000..0102fb93ce5
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientAsyncResult.cs
@@ -0,0 +1,71 @@
+// 

+// System.Web.Services.Protocols.WebClientAsyncResult.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Net;

+using System.Threading;

+

+namespace System.Web.Services.Protocols {

+	public class WebClientAsyncResult : IAsyncResult {

+

+		#region Fields

+

+		WaitHandle waitHandle;

+

+		WebClientProtocol protocol;

+		WebRequest request;

+		AsyncCallback callback;

+		object asyncState;

+

+		#endregion // Fields

+

+		#region Constructors 

+

+		[MonoTODO ("Figure out what this does.")]

+		internal WebClientAsyncResult (WebClientProtocol protocol, object x, WebRequest request, AsyncCallback callback, object asyncState, int y)

+		{

+			this.protocol = protocol;

+			this.request = request;

+			this.callback = callback; 

+			this.asyncState = asyncState;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public object AsyncState {

+			get { return asyncState; }

+		}

+

+		public WaitHandle AsyncWaitHandle {

+			get { return waitHandle; }

+		}

+

+		public bool CompletedSynchronously {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public bool IsCompleted {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public void Abort ()

+		{

+			request.Abort ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientProtocol.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientProtocol.cs
new file mode 100644
index 00000000000..6a861ee790c
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebClientProtocol.cs
@@ -0,0 +1,140 @@
+// 

+// System.Web.Services.Protocols.WebClientProtocol.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Net;

+using System.Text;

+using System.Threading;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public abstract class WebClientProtocol : Component {

+

+		#region Fields

+

+		string connectionGroupName;

+		ICredentials credentials;

+		bool preAuthenticate;

+		Encoding requestEncoding;

+		int timeout;

+		string url;

+		bool abort;

+		static HybridDictionary cache;

+

+		#endregion

+

+		#region Constructors

+

+		static WebClientProtocol ()

+		{

+			cache = new HybridDictionary ();

+		}

+

+		protected WebClientProtocol () 

+		{

+			connectionGroupName = String.Empty;

+			credentials = null;

+			preAuthenticate = false;

+			requestEncoding = null;

+			timeout = 100000;

+			url = String.Empty;

+			abort = false;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[DefaultValue ("")]

+		public string ConnectionGroupName {

+			get { return connectionGroupName; }

+			set { connectionGroupName = value; }

+		}

+

+		public ICredentials Credentials {

+			get { return credentials; }

+			set { credentials = value; }

+		}

+

+		[DefaultValue (false)]

+		[WebServicesDescription ("Enables pre authentication of the request.")]

+		public bool PreAuthenticate {

+			get { return preAuthenticate; }

+			set { preAuthenticate = value; }

+		}

+

+		[DefaultValue ("")]

+		[RecommendedAsConfigurable (true)]

+		[WebServicesDescription ("The encoding to use for requests.")]

+		public Encoding RequestEncoding {

+			get { return requestEncoding; }

+			set { requestEncoding = value; }

+		}

+

+		[DefaultValue (100000)]

+		[RecommendedAsConfigurable (true)]

+		[WebServicesDescription ("Sets the timeout in milliseconds to be used for synchronous calls.  The default of -1 means infinite.")]

+		public int Timeout {

+			get { return timeout; }

+			set { timeout = value; }

+		}

+

+		[DefaultValue ("")]

+		[RecommendedAsConfigurable (true)]

+		[WebServicesDescription ("The base URL to the server to use for requests.")]

+		public string Url {

+			get { return url; }

+			set { url = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public virtual void Abort ()

+		{

+			abort = true;

+		}

+

+		protected static void AddToCache (Type type, object value)

+		{

+			cache [type] = value;

+		}

+

+		protected static object GetFromCache (Type type)

+		{

+			return cache [type];

+		}

+

+		protected virtual WebRequest GetWebRequest (Uri uri)

+		{

+			return WebRequest.Create (uri);

+		}

+

+		protected virtual WebResponse GetWebResponse (WebRequest request)

+		{

+			if (abort)

+				throw new WebException ("The operation has been aborted.", WebExceptionStatus.RequestCanceled);

+			return request.GetResponse ();

+		}

+

+		protected virtual WebResponse GetWebResponse (WebRequest request, IAsyncResult result)

+		{

+			if (abort)

+				throw new WebException ("The operation has been aborted.", WebExceptionStatus.RequestCanceled);

+

+			IAsyncResult ar = request.BeginGetResponse (null, null);

+			ar.AsyncWaitHandle.WaitOne ();

+			return request.EndGetResponse (result);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandlerFactory.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandlerFactory.cs
new file mode 100644
index 00000000000..9e77e56dcc3
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/WebServiceHandlerFactory.cs
@@ -0,0 +1,41 @@
+// 

+// System.Web.Services.Protocols.WebServiceHandlerFactory.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class WebServiceHandlerFactory : IHttpHandlerFactory {

+

+		#region Constructors

+

+		[MonoTODO]

+		public WebServiceHandlerFactory () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public IHttpHandler GetHandler (HttpContext context, string verb, string url, string filePath)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void ReleaseHandler (IHttpHandler handler)

+		{

+			throw new NotImplementedException ();

+		}

+			

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.Protocols/XmlReturnReader.cs b/mcs/class/System.Web.Services/System.Web.Services.Protocols/XmlReturnReader.cs
new file mode 100644
index 00000000000..adf27eafa98
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.Protocols/XmlReturnReader.cs
@@ -0,0 +1,53 @@
+// 

+// System.Web.Services.Protocols.XmlReturnReader.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.IO;

+using System.Net;

+using System.Web.Services;

+

+namespace System.Web.Services.Protocols {

+	public class XmlReturnReader : MimeReturnReader {

+

+		#region Constructors

+

+		public XmlReturnReader () 

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public override object GetInitializer (LogicalMethodInfo methodInfo)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override object[] GetInitializers (LogicalMethodInfo[] methodInfos)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override void Initialize (object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override object Read (WebResponse response, Stream responseStream)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services.build b/mcs/class/System.Web.Services/System.Web.Services.build
new file mode 100644
index 00000000000..f6d40dbc008
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services.build
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.Web.Services.dll -->
+
+<project name="System" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<mkdir dir="../lib"/>
+		<csc target="library" output="../lib/System.Web.Services.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/nowarn:0169"/>
+			<arg value="/nowarn:0649"/> <!-- always default value -->
+			<arg value="/nowarn:0067"/> <!-- event never used -->
+			<arg value="/nowarn:0679"/> <!-- internal virual -->
+			<arg value="/nowarn:0168"/> <!-- never used variable -->
+			<arg value="/nowarn:0162"/> <!-- unreachable code -->
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>
+			<arg value="/debug"/>
+			<arg value="/r:System.dll"/>
+			<arg value="/r:System.EnterpriseServices.dll"/>
+			<arg value="/r:System.Xml.dll"/>
+			<arg value="/r:System.Web.dll"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/>
+			</sources>
+		</csc>
+	</target>
+	<target name="test" depends="build">
+		<nant basedir="Test" target="test"/>
+	</target>
+	<target name="clean">
+		<nant basedir="Test" target="clean"/>
+		<delete file="../lib/System.Web.Services.dll" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/System.Web.Services/System.Web.Services/ChangeLog b/mcs/class/System.Web.Services/System.Web.Services/ChangeLog
new file mode 100644
index 00000000000..d4b9db79fc3
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services/ChangeLog
@@ -0,0 +1,67 @@
+2002-08-19  Tim Coleman <tim@timcoleman.com>
+	* WebService.cs:
+		Change the attribute on Application to Description
+		instead of WebServicesDescription.2002-08-19  Tim Coleman
+
+2002-08-15  Tim Coleman <tim@timcoleman.com>
+	* WebServicesDescriptionAttribute:
+		Added Description property.  Should've known I spoke
+		too soon about being complete. :-)
+
+2002-08-07  Tim Coleman <tim@timcoleman.com>
+	* WebMethodAttribute.cs:
+		Remove FIXME and reorganize constructors to all
+		call this () with the big constructor.
+	* WebServiceAttribute.cs:
+		Remove FIXME.
+	* WebServiceBindingAttribute.cs:
+		Remove FIXME, and change ns to be String.Empty by
+		default (this is the MS implementation).  Reorganize
+		constructors.
+	* WebServicesDescriptionAttribute.cs:
+		Code reformat.
+	* TODOAttribute.cs:
+		Changed namespace.
+
+		*** This namespace should now be complete. ***
+
+2002-07-23  Tim Coleman <tim@timcoleman.com>
+	* WebService.cs: 
+		Change Description to WebServicesDescription
+	* WebServicesDescriptionAttribute.cs:
+		Add back constructor as MS build doesn't
+		seem to like it missing.  Now calls base()
+		with the string.  Also remove the sealed
+		modifier and change the attribute targets.
+
+2002-07-23  Tim Coleman <tim@timcoleman.com>
+	* WebServicesDescriptionAttribute.cs:
+		Removed the "guts" because they are defined in
+		System.ComponentModel.DescriptionAttribute.
+	* WebService.cs:
+		Added attributes which were missing based on the
+		class status page.  Also added an HttpApplication
+		object and modified the properties to use that
+		object.
+
+2002-07-22 Tim Coleman <tim@timcoleman.com>
+	* WebServicesDescriptionAttribute.cs:
+		Added for build in System.Web.Services.Protocols
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* WebMethodAttribute.cs: 
+		Remove comments around TransactionOption bits
+		because I added that enum.
+	* WebServiceAttribute.cs:
+	* WebServiceBindingAttribute.cs:
+		Added "sealed" to protection level, which I missed
+		before.
+
+2002-07-19 Tim Coleman  <tim@timcoleman.com>
+	* ChangeLog:
+	* TODOAttribute.cs:
+	* WebMethodAttribute.cs:
+	* WebService.cs:
+	* WebServiceAttribute.cs:
+	* WebServiceBindingAttribute.cs:
+		Initial implementation
diff --git a/mcs/class/System.Web.Services/System.Web.Services/TODOAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services/TODOAttribute.cs
new file mode 100644
index 00000000000..88348c96610
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services/TODOAttribute.cs
@@ -0,0 +1,32 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Web.Services {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All)]
+	internal class MonoTODOAttribute : Attribute {
+
+		string comment;
+
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+	}
+}
diff --git a/mcs/class/System.Web.Services/System.Web.Services/WebMethodAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services/WebMethodAttribute.cs
new file mode 100644
index 00000000000..c216715dcec
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services/WebMethodAttribute.cs
@@ -0,0 +1,96 @@
+ // 

+// System.Web.Services.WebMethodAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.EnterpriseServices;

+

+namespace System.Web.Services {

+	[AttributeUsage(AttributeTargets.Method)]

+	public sealed class WebMethodAttribute : Attribute {

+

+		#region Fields

+

+		bool bufferResponse;

+		int cacheDuration;

+		string description;

+		bool enableSession;

+		string messageName;

+		TransactionOption transactionOption;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public WebMethodAttribute ()

+			: this (false, TransactionOption.Disabled, 0, true)

+		{

+		}

+

+		public WebMethodAttribute (bool enableSession)

+			: this (enableSession, TransactionOption.Disabled, 0, true)

+		{

+		}

+

+		public WebMethodAttribute (bool enableSession, TransactionOption transactionOption)

+			: this (enableSession, transactionOption, 0, true)

+		{

+		}

+

+		public WebMethodAttribute (bool enableSession, TransactionOption transactionOption, int cacheDuration)

+			: this (enableSession, transactionOption, cacheDuration, true)

+		{

+		}

+

+		public WebMethodAttribute (bool enableSession, TransactionOption transactionOption, int cacheDuration, bool bufferResponse)

+		{

+			this.bufferResponse = bufferResponse;

+			this.cacheDuration = cacheDuration;

+			this.enableSession = enableSession;

+			this.transactionOption = transactionOption;

+

+			this.description = String.Empty;

+			this.messageName = String.Empty;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool BufferResponse {

+			get { return bufferResponse; }

+			set { bufferResponse = value; }

+		}

+

+		public int CacheDuration {

+			get { return cacheDuration; }

+			set { cacheDuration = value; }

+		}

+

+		public string Description { 

+			get { return description; }

+			set { description = value; }

+		}

+

+		public bool EnableSession {

+			get { return enableSession; }

+			set { enableSession = value; }

+		}

+

+		public string MessageName {

+			get { return messageName; }

+			set { messageName = value; }

+		}

+

+		public TransactionOption TransactionOption {

+			get { return transactionOption; }

+			set { transactionOption = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services/WebService.cs b/mcs/class/System.Web.Services/System.Web.Services/WebService.cs
new file mode 100644
index 00000000000..bd2c5598d63
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services/WebService.cs
@@ -0,0 +1,72 @@
+ // 

+// System.Web.Services.WebService.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+using System.Security.Principal;

+using System.Web;

+using System.Web.SessionState;

+

+namespace System.Web.Services {

+	public class WebService : MarshalByValueComponent {

+

+		#region Fields

+

+		HttpApplication application;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public WebService ()

+		{

+			application = new HttpApplication ();

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		[Browsable (false)]

+		[Description ("The ASP.NET application object for the current request.")]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpApplicationState Application {

+			get { return application.Application; }

+		}

+

+		[Browsable (false)]

+		[WebServicesDescription ("The ASP.NET context object for the current request.")]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpContext Context {

+			get { return application.Context; }

+		}

+

+		[Browsable (false)]

+		[WebServicesDescription ("The ASP.NET utility object for the current request.")]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpServerUtility Server {

+			get { return application.Server; }

+		}

+

+		[Browsable (false)]

+		[WebServicesDescription ("The ASP.NET session object for the current request.")]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpSessionState Session {

+			get { return application.Session; }

+		}

+

+		[Browsable (false)]

+		[WebServicesDescription ("The ASP.NET user object for the current request.  The object is used for authorization.")]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public IPrincipal User {

+			get { return application.User; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services/WebServiceAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services/WebServiceAttribute.cs
new file mode 100644
index 00000000000..eb50b0c6116
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services/WebServiceAttribute.cs
@@ -0,0 +1,54 @@
+ // 

+// System.Web.Services.WebServiceAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services {

+	[AttributeUsage (AttributeTargets.Class)]

+	public sealed class WebServiceAttribute : Attribute {

+

+		#region Fields

+

+		public const string DefaultNamespace = "http://tempuri.org/";

+		string description;

+		string name;

+		string ns;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		

+		public WebServiceAttribute ()

+		{

+			description = String.Empty;

+			name = String.Empty;

+			ns = DefaultNamespace;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public string Description { 	

+			get { return description; }

+			set { description = value; }

+		}

+	

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+	

+		public string Namespace {

+			get { return ns; }

+			set { ns = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services/WebServiceBindingAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services/WebServiceBindingAttribute.cs
new file mode 100644
index 00000000000..6ea242eb3de
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services/WebServiceBindingAttribute.cs
@@ -0,0 +1,67 @@
+ // 

+// System.Web.Services.WebServiceBindingAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web.Services {

+	[AttributeUsage(AttributeTargets.Class)]

+	public sealed class WebServiceBindingAttribute : Attribute {

+

+		#region Fields

+

+		string location;

+		string name;

+		string ns;

+

+		#endregion // Fields

+

+		#region Constructors

+		

+		public WebServiceBindingAttribute ()

+			: this (String.Empty, String.Empty, String.Empty)

+		{

+		}

+

+		public WebServiceBindingAttribute (string name)

+			: this (name, String.Empty, String.Empty)

+		{

+		}

+

+		public WebServiceBindingAttribute (string name, string ns)

+			: this (name, ns, String.Empty)

+		{

+		}

+

+		public WebServiceBindingAttribute (string name, string ns, string location)

+		{

+			this.name = name;

+			this.ns = ns;

+			this.location = location;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public string Location { 	

+			get { return location; }

+			set { location = value; }

+		}

+	

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+	

+		public string Namespace {

+			get { return ns; }

+			set { ns = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/System.Web.Services/WebServicesDescriptionAttribute.cs b/mcs/class/System.Web.Services/System.Web.Services/WebServicesDescriptionAttribute.cs
new file mode 100644
index 00000000000..84905edc486
--- /dev/null
+++ b/mcs/class/System.Web.Services/System.Web.Services/WebServicesDescriptionAttribute.cs
@@ -0,0 +1,33 @@
+// 

+// System.Web.Services.WebServicesDescriptionAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.ComponentModel;

+

+namespace System.Web.Services {

+	[AttributeUsage (AttributeTargets.Property | AttributeTargets.Event)]

+	internal class WebServicesDescriptionAttribute : DescriptionAttribute {

+

+		#region Constructors

+

+		public WebServicesDescriptionAttribute (string description) 

+			: base (description)

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public override string Description {

+			get { return DescriptionValue; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web.Services/Test/AllTests.cs b/mcs/class/System.Web.Services/Test/AllTests.cs
new file mode 100644
index 00000000000..9a3c8081da6
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/AllTests.cs
@@ -0,0 +1,24 @@
+// MonoTests.AllTests, System.Web.Services.dll
+//
+// Author: 
+//     Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+
+using NUnit.Framework;
+
+namespace MonoTests {
+	public class AllTests : TestCase {
+		public AllTests (string name) : base (name) {}
+
+		public static ITest Suite {
+			get {
+				TestSuite suite = new TestSuite ();
+				suite.AddTest (System.Web.Services.AllTests.Suite);
+				suite.AddTest (System.Web.Services.Configuration.AllTests.Suite);
+				suite.AddTest (System.Web.Services.Discovery.AllTests.Suite);
+				return suite;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Web.Services/Test/ChangeLog b/mcs/class/System.Web.Services/Test/ChangeLog
new file mode 100644
index 00000000000..b4524c71d10
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/ChangeLog
@@ -0,0 +1,10 @@
+2002-08-09  Tim Coleman <tim@timcoleman.com>
+	* AllTests.cs:
+		New test suites added.
+
+2002-08-07  Tim Coleman <tim@timcoleman.com>
+	* AllTests.cs:
+	* ChangeLog:
+	* System.Web.Services:
+	* System.Web.Services_test.build:
+		New files and directories added for test suite.
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/AllTests.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/AllTests.cs
new file mode 100644
index 00000000000..f3446f66ed1
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/AllTests.cs
@@ -0,0 +1,22 @@
+// MonoTests.System.Web.Services.Configuration.AllTests, System.Web.Services.dll
+//
+// Author: 
+//     Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Web.Services.Configuration {
+	public class AllTests : TestCase {
+		public AllTests (string name) : base (name) {}
+
+		public static ITest Suite {
+			get {
+				TestSuite suite = new TestSuite ();
+				suite.AddTest (XmlFormatExtensionAttributeTest.Suite);
+				return suite;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/ChangeLog b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/ChangeLog
new file mode 100644
index 00000000000..d5a0ded96ed
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/ChangeLog
@@ -0,0 +1,5 @@
+2002-08-09  Tim Coleman <tim@timcoleman.com>
+	* AllTests.cs:
+	* ChangeLog:
+	* XmlFormatExtensionAttributeTest.cs:
+		New files added for test suite.
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/XmlFormatExtensionAttributeTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/XmlFormatExtensionAttributeTest.cs
new file mode 100644
index 00000000000..f0abcb24ad5
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Configuration/XmlFormatExtensionAttributeTest.cs
@@ -0,0 +1,80 @@
+//
+// MonoTests.System.Web.Services.Configuration.XmlFormatExtensionAttributeTest.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using NUnit.Framework;
+using System;
+using System.Web.Services.Configuration;
+using System.Web.Services.Description;
+
+namespace MonoTests.System.Web.Services.Configuration {
+
+	public class XmlFormatExtensionAttributeTest : TestCase {
+
+		public XmlFormatExtensionAttributeTest () :
+			base ("[MonoTests.System.Web.Services.Configuration.XmlFormatExtensionAttributeTest]") 
+		{
+		}
+
+		public XmlFormatExtensionAttributeTest (string name) :
+			base (name) 
+		{
+		}
+
+		protected override void SetUp ()
+		{
+		}
+
+		protected override void TearDown ()
+		{
+		}
+
+		public static ITest Suite {
+			get { return new TestSuite (typeof (XmlFormatExtensionAttributeTest)); }
+		}
+
+		public void TestConstructors ()
+		{
+			XmlFormatExtensionAttribute attribute;
+
+			attribute = new XmlFormatExtensionAttribute ();
+			AssertEquals (String.Empty, attribute.ElementName);
+			AssertEquals (null, attribute.ExtensionPoints);
+			AssertEquals (String.Empty, attribute.Namespace);
+
+			string elementName = "binding";
+			string ns = "http://schemas.xmlsoap.org/wsdl/http/";
+			Type[] types = new Type[4] {typeof (Binding), typeof (Binding), typeof (Binding), typeof (Binding)};
+
+			attribute = new XmlFormatExtensionAttribute (elementName, ns, types[0]);
+			AssertEquals (elementName, attribute.ElementName);
+			AssertEquals (new Type[1] {types[0]}, attribute.ExtensionPoints);
+			AssertEquals (ns, attribute.Namespace);
+
+			attribute = new XmlFormatExtensionAttribute (elementName, ns, types[0], types[1]);
+			AssertEquals (elementName, attribute.ElementName);
+			AssertEquals (new Type[2] {types[0], types[1]}, attribute.ExtensionPoints);
+			AssertEquals (ns, attribute.Namespace);
+
+			attribute = new XmlFormatExtensionAttribute (elementName, ns, types[0], types[1], types[2]);
+			AssertEquals (elementName, attribute.ElementName);
+			AssertEquals (new Type[3] {types[0], types[1], types[2]}, attribute.ExtensionPoints);
+			AssertEquals (ns, attribute.Namespace);
+
+			attribute = new XmlFormatExtensionAttribute (elementName, ns, types[0], types[1], types[2], types[3]);
+			AssertEquals (elementName, attribute.ElementName);
+			AssertEquals (new Type[4] {types[0], types[1], types[2], types[3]}, attribute.ExtensionPoints);
+			AssertEquals (ns, attribute.Namespace);
+
+			attribute = new XmlFormatExtensionAttribute (elementName, ns, types);
+			AssertEquals (elementName, attribute.ElementName);
+			AssertEquals (types, attribute.ExtensionPoints);
+			AssertEquals (ns, attribute.Namespace);
+		}
+	}
+}
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Discovery/AllTests.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Discovery/AllTests.cs
new file mode 100644
index 00000000000..40f2594a838
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Discovery/AllTests.cs
@@ -0,0 +1,22 @@
+// MonoTests.System.Web.Services.Discovery.AllTests, System.Web.Services.dll
+//
+// Author: 
+//     Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Web.Services.Discovery {
+	public class AllTests : TestCase {
+		public AllTests (string name) : base (name) {}
+
+		public static ITest Suite {
+			get {
+				TestSuite suite = new TestSuite ();
+				suite.AddTest (ContractReferenceTest.Suite);
+				return suite;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Discovery/ChangeLog b/mcs/class/System.Web.Services/Test/System.Web.Services.Discovery/ChangeLog
new file mode 100644
index 00000000000..2f04b932891
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Discovery/ChangeLog
@@ -0,0 +1,5 @@
+2002-08-09  Tim Coleman <tim@timcoleman.com>
+	* AllTests.cs:
+	* ChangeLog:
+	* ContractReferenceTest.cs:
+		New files added for test suite.
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services.Discovery/ContractReferenceTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services.Discovery/ContractReferenceTest.cs
new file mode 100644
index 00000000000..b45b89f7578
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services.Discovery/ContractReferenceTest.cs
@@ -0,0 +1,55 @@
+//
+// MonoTests.System.Web.Services.Discovery.ContractReferenceTest.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using NUnit.Framework;
+using System;
+using System.Web.Services.Discovery;
+
+namespace MonoTests.System.Web.Services.Discovery {
+
+	public class ContractReferenceTest : TestCase {
+
+		public ContractReferenceTest () :
+			base ("[MonoTests.System.Web.Services.Discovery.ContractReferenceTest]") 
+		{
+		}
+
+		public ContractReferenceTest (string name) :
+			base (name) 
+		{
+		}
+
+		protected override void SetUp ()
+		{
+		}
+
+		protected override void TearDown ()
+		{
+		}
+
+		public static ITest Suite {
+			get { return new TestSuite (typeof (ContractReferenceTest)); }
+		}
+
+		public void TestConstructors ()
+		{
+			ContractReference contractReference;
+
+			contractReference = new ContractReference ();
+			AssertEquals (String.Empty, contractReference.DocRef);
+			AssertEquals (String.Empty, contractReference.Ref);
+			AssertEquals (String.Empty, contractReference.Url);
+		}
+
+		public void TestConstants ()
+		{
+			AssertEquals ("http://schemas.xmlsoap.org/disco/scl/", ContractReference.Namespace);
+		}
+	}
+}
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services/AllTests.cs b/mcs/class/System.Web.Services/Test/System.Web.Services/AllTests.cs
new file mode 100644
index 00000000000..625b6e62818
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services/AllTests.cs
@@ -0,0 +1,23 @@
+// MonoTests.System.Web.Services.AllTests, System.Web.Services.dll
+//
+// Author: 
+//     Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Web.Services {
+	public class AllTests : TestCase {
+		public AllTests (string name) : base (name) {}
+
+		public static ITest Suite {
+			get {
+				TestSuite suite = new TestSuite ();
+				suite.AddTest (WebMethodAttributeTest.Suite);
+				suite.AddTest (WebServiceAttributeTest.Suite);
+				return suite;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services/ChangeLog b/mcs/class/System.Web.Services/Test/System.Web.Services/ChangeLog
new file mode 100644
index 00000000000..17f6b9b74fd
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services/ChangeLog
@@ -0,0 +1,6 @@
+2002-08-07  Tim Coleman <tim@timcoleman.com>
+	* AllTests.cs:
+	* ChangeLog:
+	* WebMethodAttributeTest.cs:
+	* WebServiceAttributeTest.cs:
+		New files and directories added for test suite.
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services/WebMethodAttributeTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services/WebMethodAttributeTest.cs
new file mode 100644
index 00000000000..ad9dddad912
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services/WebMethodAttributeTest.cs
@@ -0,0 +1,54 @@
+//
+// MonoTests.System.Web.Services.WebMethodAttributeTest.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using NUnit.Framework;
+using System;
+using System.Web.Services;
+using System.EnterpriseServices;
+
+namespace MonoTests.System.Web.Services {
+
+	public class WebMethodAttributeTest : TestCase {
+
+		public WebMethodAttributeTest () :
+			base ("[MonoTests.System.Web.Services.WebMethodAttributeTest]") 
+		{
+		}
+
+		public WebMethodAttributeTest (string name) :
+			base (name) 
+		{
+		}
+
+		protected override void SetUp ()
+		{
+		}
+
+		protected override void TearDown ()
+		{
+		}
+
+		public static ITest Suite {
+			get { return new TestSuite (typeof (WebMethodAttributeTest)); }
+		}
+
+		public void TestConstructors ()
+		{
+			WebMethodAttribute attribute;
+
+			attribute = new WebMethodAttribute ();
+			AssertEquals (true, attribute.BufferResponse);
+			AssertEquals (0, attribute.CacheDuration);
+			AssertEquals (String.Empty, attribute.Description);
+			AssertEquals (false, attribute.EnableSession);
+			AssertEquals (String.Empty, attribute.MessageName);
+			AssertEquals (TransactionOption.Disabled, attribute.TransactionOption);
+		}
+	}
+}
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services/WebServiceAttributeTest.cs b/mcs/class/System.Web.Services/Test/System.Web.Services/WebServiceAttributeTest.cs
new file mode 100644
index 00000000000..6979fae6214
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services/WebServiceAttributeTest.cs
@@ -0,0 +1,50 @@
+//
+// MonoTests.System.Web.Services.WebServiceAttributeTest.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using NUnit.Framework;
+using System;
+using System.Web.Services;
+
+namespace MonoTests.System.Web.Services {
+
+	public class WebServiceAttributeTest : TestCase {
+
+		public WebServiceAttributeTest () :
+			base ("[MonoTests.System.Web.Services.WebServiceAttributeTest]") 
+		{
+		}
+
+		public WebServiceAttributeTest (string name) :
+			base (name) 
+		{
+		}
+
+		protected override void SetUp ()
+		{
+		}
+
+		protected override void TearDown ()
+		{
+		}
+
+		public static ITest Suite {
+			get { return new TestSuite (typeof (WebServiceAttributeTest)); }
+		}
+
+		public void TestConstructors ()
+		{
+			WebServiceAttribute attribute;
+
+			attribute = new WebServiceAttribute ();
+			AssertEquals (String.Empty, attribute.Description);
+			AssertEquals (String.Empty, attribute.Name);
+			AssertEquals ("http://tempuri.org/", attribute.Namespace);
+		}
+	}
+}
diff --git a/mcs/class/System.Web.Services/Test/System.Web.Services_test.build b/mcs/class/System.Web.Services/Test/System.Web.Services_test.build
new file mode 100644
index 00000000000..caffa2b496d
--- /dev/null
+++ b/mcs/class/System.Web.Services/Test/System.Web.Services_test.build
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+

+<!-- NAnt build file for System.Web.Services_test.dll -->

+<!-- Target build (default) builds tests -->

+<!-- Target test runs tests -->

+

+<project name="System.Web.Services_test" default="build">

+	<property name="debug" value="false"/>

+	<property name="nunit_home" value="..\..\..\nunit"/>

+

+	<target name="build">

+	</target>

+

+	<target name="assemblies">

+		<csc target="library" output="System.Web.Services_test.dll" debug="${debug}">

+			<arg value="/nowarn:1595"/>

+			<sources>

+				<includes name="**/*.cs"/>

+			</sources>

+			<references basedir="..\..\..\nunit">

+				<includes name="NUnitCore.dll"/>

+			</references>

+			<arg value="/r:..\..\lib\System.Web.Services.dll"/>

+		</csc>

+	</target>

+

+	<target name="test" depends="assemblies">

+		<exec program="..\..\..\nunit\NUnitConsole" commandline="MonoTests.System.Web.Services.AllTests,System.Web.Services_test.dll" failonerror="false"/>

+	</target>

+

+	<target name="clean">

+		<delete file="System.Web.Services.dll" failonerror="false"/>

+		<delete file="System.Web.Services_test.dll" failonerror="false"/>

+	</target>

+</project>

diff --git a/mcs/class/System.Web.Services/list b/mcs/class/System.Web.Services/list
new file mode 100644
index 00000000000..a39f20420d2
--- /dev/null
+++ b/mcs/class/System.Web.Services/list
@@ -0,0 +1,149 @@
+System.Web.Services/TODOAttribute.cs
+System.Web.Services/WebMethodAttribute.cs
+System.Web.Services/WebService.cs
+System.Web.Services/WebServiceAttribute.cs
+System.Web.Services/WebServiceBindingAttribute.cs
+System.Web.Services/WebServicesDescriptionAttribute.cs
+System.Web.Services.Configuration/XmlFormatExtensionAttribute.cs
+System.Web.Services.Configuration/XmlFormatExtensionPointAttribute.cs
+System.Web.Services.Configuration/XmlFormatExtensionPrefixAttribute.cs
+System.Web.Services.Description/Binding.cs
+System.Web.Services.Description/BindingCollection.cs
+System.Web.Services.Description/DocumentableItem.cs
+System.Web.Services.Description/FaultBinding.cs
+System.Web.Services.Description/FaultBindingCollection.cs
+System.Web.Services.Description/HttpAddressBinding.cs
+System.Web.Services.Description/HttpBinding.cs
+System.Web.Services.Description/HttpOperationBinding.cs
+System.Web.Services.Description/HttpUrlEncodedBinding.cs
+System.Web.Services.Description/HttpUrlReplacementBinding.cs
+System.Web.Services.Description/Import.cs
+System.Web.Services.Description/ImportCollection.cs
+System.Web.Services.Description/InputBinding.cs
+System.Web.Services.Description/Message.cs
+System.Web.Services.Description/MessageBinding.cs
+System.Web.Services.Description/MessageCollection.cs
+System.Web.Services.Description/MessagePart.cs
+System.Web.Services.Description/MessagePartCollection.cs
+System.Web.Services.Description/MimeContentBinding.cs
+System.Web.Services.Description/MimeMultipartRelatedBinding.cs
+System.Web.Services.Description/MimePart.cs
+System.Web.Services.Description/MimePartCollection.cs
+System.Web.Services.Description/MimeTextBinding.cs
+System.Web.Services.Description/MimeTextMatch.cs
+System.Web.Services.Description/MimeTextMatchCollection.cs
+System.Web.Services.Description/MimeXmlBinding.cs
+System.Web.Services.Description/Operation.cs
+System.Web.Services.Description/OperationBinding.cs
+System.Web.Services.Description/OperationBindingCollection.cs
+System.Web.Services.Description/OperationCollection.cs
+System.Web.Services.Description/OperationFault.cs
+System.Web.Services.Description/OperationFaultCollection.cs
+System.Web.Services.Description/OperationFlow.cs
+System.Web.Services.Description/OperationInput.cs
+System.Web.Services.Description/OperationMessage.cs
+System.Web.Services.Description/OperationMessageCollection.cs
+System.Web.Services.Description/OperationOutput.cs
+System.Web.Services.Description/OutputBinding.cs
+System.Web.Services.Description/Port.cs
+System.Web.Services.Description/PortCollection.cs
+System.Web.Services.Description/PortType.cs
+System.Web.Services.Description/PortTypeCollection.cs
+System.Web.Services.Description/ProtocolImporter.cs
+System.Web.Services.Description/ProtocolReflector.cs
+System.Web.Services.Description/Service.cs
+System.Web.Services.Description/ServiceCollection.cs
+System.Web.Services.Description/ServiceDescription.cs
+System.Web.Services.Description/ServiceDescriptionBaseCollection.cs
+System.Web.Services.Description/ServiceDescriptionCollection.cs
+System.Web.Services.Description/ServiceDescriptionFormatExtension.cs
+System.Web.Services.Description/ServiceDescriptionFormatExtensionCollection.cs
+System.Web.Services.Description/ServiceDescriptionImportStyle.cs
+System.Web.Services.Description/ServiceDescriptionImportWarnings.cs
+System.Web.Services.Description/ServiceDescriptionImporter.cs
+System.Web.Services.Description/ServiceDescriptionReflector.cs
+System.Web.Services.Description/SoapAddressBinding.cs
+System.Web.Services.Description/SoapBinding.cs
+System.Web.Services.Description/SoapBindingStyle.cs
+System.Web.Services.Description/SoapBindingUse.cs
+System.Web.Services.Description/SoapBodyBinding.cs
+System.Web.Services.Description/SoapExtensionImporter.cs
+System.Web.Services.Description/SoapExtensionReflector.cs
+System.Web.Services.Description/SoapFaultBinding.cs
+System.Web.Services.Description/SoapHeaderBinding.cs
+System.Web.Services.Description/SoapOperationBinding.cs
+System.Web.Services.Description/SoapHeaderFaultBinding.cs
+System.Web.Services.Description/SoapProtocolImporter.cs
+System.Web.Services.Description/SoapProtocolReflector.cs
+System.Web.Services.Description/SoapTransportImporter.cs
+System.Web.Services.Description/Types.cs
+System.Web.Services.Protocols/AnyReturnReader.cs
+System.Web.Services.Protocols/HtmlFormParameterReader.cs
+System.Web.Services.Protocols/HtmlFormParameterWriter.cs
+System.Web.Services.Protocols/HttpGetClientProtocol.cs
+System.Web.Services.Protocols/HttpMethodAttribute.cs
+System.Web.Services.Protocols/HttpPostClientProtocol.cs
+System.Web.Services.Protocols/HttpSimpleClientProtocol.cs
+System.Web.Services.Protocols/HttpWebClientProtocol.cs
+System.Web.Services.Protocols/LogicalMethodInfo.cs
+System.Web.Services.Protocols/LogicalMethodTypes.cs
+System.Web.Services.Protocols/MatchAttribute.cs
+System.Web.Services.Protocols/MimeFormatter.cs
+System.Web.Services.Protocols/MimeParameterReader.cs
+System.Web.Services.Protocols/MimeParameterWriter.cs
+System.Web.Services.Protocols/MimeReturnReader.cs
+System.Web.Services.Protocols/NopReturnReader.cs
+System.Web.Services.Protocols/PatternMatcher.cs
+System.Web.Services.Protocols/ServerProtocol.cs
+System.Web.Services.Protocols/SoapClientMessage.cs
+System.Web.Services.Protocols/SoapClientMethod.cs
+System.Web.Services.Protocols/SoapDocumentMethodAttribute.cs
+System.Web.Services.Protocols/SoapDocumentServiceAttribute.cs
+System.Web.Services.Protocols/SoapException.cs
+System.Web.Services.Protocols/SoapExtension.cs
+System.Web.Services.Protocols/SoapExtensionAttribute.cs
+System.Web.Services.Protocols/SoapHeader.cs
+System.Web.Services.Protocols/SoapHeaderAttribute.cs
+System.Web.Services.Protocols/SoapHeaderCollection.cs
+System.Web.Services.Protocols/SoapHeaderDirection.cs
+System.Web.Services.Protocols/SoapHeaderException.cs
+System.Web.Services.Protocols/SoapHttpClientProtocol.cs
+System.Web.Services.Protocols/SoapMessage.cs
+System.Web.Services.Protocols/SoapMessageStage.cs
+System.Web.Services.Protocols/SoapParameterStyle.cs
+System.Web.Services.Protocols/SoapRpcMethodAttribute.cs
+System.Web.Services.Protocols/SoapRpcServiceAttribute.cs
+System.Web.Services.Protocols/SoapServerMessage.cs
+System.Web.Services.Protocols/SoapServerProtocol.cs
+System.Web.Services.Protocols/SoapServiceRoutingStyle.cs
+System.Web.Services.Protocols/SoapUnknownHeader.cs
+System.Web.Services.Protocols/TextReturnReader.cs
+System.Web.Services.Protocols/UrlEncodedParameterWriter.cs
+System.Web.Services.Protocols/UrlParameterReader.cs
+System.Web.Services.Protocols/UrlParameterWriter.cs
+System.Web.Services.Protocols/ValueCollectionParameterReader.cs
+System.Web.Services.Protocols/WebClientAsyncResult.cs
+System.Web.Services.Protocols/WebClientProtocol.cs
+System.Web.Services.Protocols/WebServiceHandlerFactory.cs
+System.Web.Services.Protocols/XmlReturnReader.cs
+System.Web.Services.Discovery/ContractReference.cs
+System.Web.Services.Discovery/ContractSearchPattern.cs
+System.Web.Services.Discovery/DiscoveryClientDocumentCollection.cs
+System.Web.Services.Discovery/DiscoveryClientProtocol.cs
+System.Web.Services.Discovery/DiscoveryClientReferenceCollection.cs
+System.Web.Services.Discovery/DiscoveryClientResultCollection.cs
+System.Web.Services.Discovery/DiscoveryClientResult.cs
+System.Web.Services.Discovery/DiscoveryDocument.cs
+System.Web.Services.Discovery/DiscoveryDocumentLinksPattern.cs
+System.Web.Services.Discovery/DiscoveryDocumentReference.cs
+System.Web.Services.Discovery/DiscoveryDocumentSearchPattern.cs
+System.Web.Services.Discovery/DiscoveryExceptionDictionary.cs
+System.Web.Services.Discovery/DiscoveryReferenceCollection.cs
+System.Web.Services.Discovery/DiscoveryReference.cs
+System.Web.Services.Discovery/DiscoveryRequestHandler.cs
+System.Web.Services.Discovery/DiscoverySearchPattern.cs
+System.Web.Services.Discovery/DynamicDiscoveryDocument.cs
+System.Web.Services.Discovery/ExcludePathInfo.cs
+System.Web.Services.Discovery/SchemaReference.cs
+System.Web.Services.Discovery/SoapBinding.cs
+System.Web.Services.Discovery/XmlSchemaSearchPattern.cs
diff --git a/mcs/class/System.Web.Services/makefile.gnu b/mcs/class/System.Web.Services/makefile.gnu
new file mode 100644
index 00000000000..73481074326
--- /dev/null
+++ b/mcs/class/System.Web.Services/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../..
+
+LIBRARY = ../lib/System.Web.Services.dll
+
+LIB_LIST = list
+LIB_FLAGS = -r corlib -r System.Xml -r System.EnterpriseServices -r System.Web -r System
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=./Test*
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/System.Web/.cvsignore b/mcs/class/System.Web/.cvsignore
new file mode 100644
index 00000000000..37b5b818133
--- /dev/null
+++ b/mcs/class/System.Web/.cvsignore
@@ -0,0 +1,6 @@
+Temp.build
+*.dll
+lib
+makefile
+.makefrag
+.response
diff --git a/mcs/class/System.Web/ChangeLog b/mcs/class/System.Web/ChangeLog
new file mode 100644
index 00000000000..9f00c239f22
--- /dev/null
+++ b/mcs/class/System.Web/ChangeLog
@@ -0,0 +1,132 @@
+2002-08-05  Patrik Torstensson <ptorsten@hotmail.com>
+	* list: 
+		Add System.Web/ApplicationFactory.cs
+		Add System.Web/HttpAsyncResult.cs
+		Add System.Web.Configuration/GlobalizationConfiguration.cs
+		Add System.Web.Configuration/HandlerFactoryConfiguration.cs
+		Add System.Web.Configuration/HandlerFactoryProxy.cs
+		Add System.Web.Configuration/HandlerItem.cs
+		Add System.Web.Configuration/ModuleItem.cs
+		Add System.Web.Configuration/ModulesConfiguration.cs
+
+2002-07-24  Tim Coleman <tim@timcoleman.com>
+	* list: 
+		Add System.Web/ProcessInfo.cs
+		Add System.Web/HttpCompileException.cs
+		Add System.Web/HttpParseException.cs
+		Add System.Web/HttpUnhandledException.cs
+
+2002-07-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* list: added some more files from System.Web.Hosting.
+
+2002-07-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.build: removed some more excludes.
+
+2002-07-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* list: updated. Currently mcs cannot compile System.Web because it
+	cannot find NameObjectCollectionBase.KeysCollection.
+
+	* System.Web.build: don't display unused event nor always default value
+	warnings by now.
+
+2002-06-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* list: updated and reformatted.
+
+2002-06-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.build: added /debug flag. I wanna see line numbers in
+	exceptions thrown.
+	
+2002-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.Security:
+	* System.Web.SessionState: new directories.
+
+2002-05-17  Duncan Mak  <duncan@ximian.com>
+
+	* System.Web.build: Added new arguments: "/noconfig",
+	"/r:System.Drawing.dll" and "/r:System.Xml.dll".
+
+2002-05-10  Duncan Mak  <duncan@ximian.com>
+
+	* System.Web.build: Include the System.Web.UI.HtmlControls namespace.
+
+	* Page.cs:
+	* ValidatorCollection.cs: Stubs to make things compile for
+	now. Added one dummy method (RegisterClientScriptFile) that's used
+	in the existing codebase,  but not in MS docs.
+
+2002-04-26  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Added directory: System.Web.Mail
+	
+2002-04-10  Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* System.Web -- Assembly build.
+	
+	  The basic runtime support is now working, we can now start working
+	  on the runtime flow system (thread pool etc) and also start testing
+	  the parser and control framework. (224 files are compiled)
+
+2002-03-26  Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* System.Web.Security: Removed all files. Will do it later.
+	          May be someone else like to do it for the time being.
+
+2002-03-17  Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* System.Web -- Assembly build.
+	  Another milestone reached. Compiled 195 classes successfully.
+	  Build includes System.Web.UI.WebControls and all the dependencies
+	  for the namespace.
+
+2002-03-05  Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* System.Web.Security: Added directory.
+
+2002-03-04  Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* System.Web.UI.WebContorls: Virtually complete. See
+	  System.Web.UI.WebControls/ChangeLog for a comprehensensive
+	  description of what's left and where. But, don't go for
+	  a build at this stage. There are a few classes left in
+	  System.Web namespace that need to be filled-up, though
+	  I will try to fix up the current state to be able to make
+	  a build.
+
+2001-12-20  Gaurav Vaish <gvaish@iitk.ac.in>
+
+       Did first successful build of System.Web.dll that included
+	 System.Web.UI.WebControls namespace. Though, not updating
+	 the System.Web.build file, since with the changes that
+	 followed, the build again fails :( 
+
+2001-11-30  Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* System.Web.WebUtils: Removed
+	* System.Web.Utils   : Added --- replacement of WebUtils
+
+2001-11-08  Gaurav Vaish <gvaish@iitk.ac.in>
+
+        *  System.Web.WebUtils:  Added directory
+
+2001-08-22  Bob Smith <bob@thestuff.net>
+
+        * Added directory: System.Web.UI.HtmlControls
+        * Added directory: Test
+
+2001-08-17  Bob Smith <bob@thestuff.net>
+
+        * Added directory: System.Web.UI
+
+2001-08-09  Bob Smith <bob@thestuff.net>
+
+        * Added directory: System.Web
+
+2001-07-20	Patrik Torstensson (Patrik.Torstensson@labs2.com)
+
+	* Added directory: System.Web.Caching
diff --git a/mcs/class/System.Web/System.Web.Caching/Cache.cs b/mcs/class/System.Web/System.Web.Caching/Cache.cs
new file mode 100644
index 00000000000..5e331aa43c4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Caching/Cache.cs
@@ -0,0 +1,520 @@
+// 

+// System.Web.Caching

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+// (C) Copyright Patrik Torstensson, 2001

+//

+namespace System.Web.Caching

+{

+	/// <summary>

+	/// Implements a cache for Web applications and other. The difference from the MS.NET implementation is that we

+	/// support to use the Cache object as cache in our applications.

+	/// </summary>

+	/// <remarks>

+	/// The Singleton cache is created per application domain, and it remains valid as long as the application domain remains active. 

+	/// </remarks>

+	/// <example>

+	/// Usage of the singleton cache:

+	/// 

+	/// Cache objManager = Cache.SingletonCache;

+	/// 

+	/// String obj = "tobecached";

+	/// objManager.Add("kalle", obj);

+	/// </example>

+	public class Cache : System.Collections.IEnumerable, System.IDisposable

+	{

+		// Declarations

+

+		// MS.NET Does only have the cache connected to the HttpRuntime and we don't have the HttpRuntime (yet)

+		static Cache	objSingletonCache = new Cache();

+

+		private bool	_boolDisposed;

+

+		// Helper objects

+		private CacheExpires _objExpires;

+		

+		// The data storage 

+		// Todo: Make a specialized storage for the cache entries?

+		// todo: allow system to replace the storage?

+		private System.Collections.Hashtable		_arrEntries;

+		private System.Threading.ReaderWriterLock	_lockEntries;

+

+		static private System.TimeSpan _datetimeOneYear = System.TimeSpan.FromDays(365);

+		

+		// Number of items in the cache

+		private long	_longItems;

+

+		// Constructor

+		public Cache()

+		{

+			_boolDisposed = false;

+			_longItems = 0;

+

+			_lockEntries = new System.Threading.ReaderWriterLock();

+			_arrEntries = new System.Collections.Hashtable();

+			

+			_objExpires = new CacheExpires(this);

+		}

+

+		// Public methods and properties

+

+		// 

+		/// <summary>

+		/// Returns a static version of the cache. In MS.NET the cache is stored in the System.Web.HttpRuntime 

+		///	but we keep it here as a singleton (right now anyway).

+		/// </summary>

+		public static Cache SingletonCache

+		{

+			get 

+			{ 

+				if (objSingletonCache == null)

+				{

+					throw new System.InvalidOperationException();

+				}

+

+				return objSingletonCache;

+			}

+		}

+

+		/// <summary>

+		/// Used in the absoluteExpiration parameter in an Insert method call to indicate the item should never expire. This field is read-only.

+		/// </summary>

+		public static readonly System.DateTime NoAbsoluteExpiration	= System.DateTime.MaxValue;

+		

+		/// <summary>

+		/// Used as the slidingExpiration parameter in an Insert method call to disable sliding expirations. This field is read-only.

+		/// </summary>

+		public static readonly System.TimeSpan NoSlidingExpiration	= System.TimeSpan.Zero;

+

+		/// <summary>

+		/// Internal method to create a enumerator and over all public items in the cache and is used by GetEnumerator method.

+		/// </summary>

+		/// <returns>Returns IDictionaryEnumerator that contains all public items in the cache</returns>

+		private System.Collections.IDictionaryEnumerator CreateEnumerator()

+		{

+			System.Collections.Hashtable objTable;

+

+			_lockEntries.AcquireReaderLock(int.MaxValue);

+			try 

+			{

+				// Create a new hashtable to return as collection of public items

+				objTable = new System.Collections.Hashtable(_arrEntries.Count);

+

+				foreach(System.Collections.DictionaryEntry objEntry in _arrEntries)

+				{

+					if (objEntry.Key != null)

+					{

+						// Check if this is a public entry

+						if (((CacheEntry) objEntry.Value).TestFlag(CacheEntry.Flags.Public))

+						{

+							// Add to the collection

+							objTable.Add(objEntry.Key, ((CacheEntry) objEntry.Value).Item);

+						}

+					}

+				}

+			}

+			finally

+			{

+				_lockEntries.ReleaseReaderLock();

+			}

+

+			return objTable.GetEnumerator();

+		}

+

+		/// <summary>

+		/// Implementation of IEnumerable interface and calls the GetEnumerator that returns

+		/// IDictionaryEnumerator.

+		/// </summary>

+		System.Collections.IEnumerator System.Collections.IEnumerable.GetEnumerator()

+		{

+			return GetEnumerator();

+		}

+

+		/// <summary>

+		/// Virtual override of the IEnumerable.GetEnumerator() method, returns a specialized enumerator.

+		/// </summary>

+		public virtual System.Collections.IDictionaryEnumerator GetEnumerator()

+		{

+			return CreateEnumerator();

+		}

+		

+		/// <summary>

+		/// Touches a object in the cache. Used to update expire time and hit count.

+		/// </summary>

+		/// <param name="strKey">The identifier for the cache item to retrieve.</param>

+		public void Touch(string strKey)

+		{

+			// Just touch the object

+			Get(strKey);

+		}

+

+		/// <summary>

+		/// Adds the specified item to the Cache object with dependencies, expiration and priority policies, and a 

+		/// delegate you can use to notify your application when the inserted item is removed from the Cache.

+		/// </summary>

+		/// <param name="strKey">The cache key used to reference the item.</param>

+		/// <param name="objItem">The item to be added to the cache.</param>

+		/// <param name="objDependency">The file or cache key dependencies for the item. When any dependency changes, the object becomes invalid and is removed from the cache. If there are no dependencies, this paramter contains a null reference.</param>

+		/// <param name="absolutExpiration">The time at which the added object expires and is removed from the cache. </param>

+		/// <param name="slidingExpiration">The interval between the time the added object was last accessed and when that object expires. If this value is the equivalent of 20 minutes, the object expires and is removed from the cache 20 minutes after it is last accessed.</param>

+		/// <param name="enumPriority">The relative cost of the object, as expressed by the CacheItemPriority enumeration. The cache uses this value when it evicts objects; objects with a lower cost are removed from the cache before objects with a higher cost.</param>

+		/// <param name="enumPriorityDecay">The rate at which an object in the cache decays in importance. Objects that decay quickly are more likely to be removed.</param>

+		/// <param name="eventRemoveCallback">A delegate that, if provided, is called when an object is removed from the cache. You can use this to notify applications when their objects are deleted from the cache.</param>

+		/// <returns>The Object item added to the Cache.</returns>

+		public object Add(string strKey, object objItem, CacheDependency objDependency, System.DateTime absolutExpiration, System.TimeSpan slidingExpiration, CacheItemPriority enumPriority, CacheItemPriorityDecay enumPriorityDecay, CacheItemRemovedCallback eventRemoveCallback)

+		{

+			if (_boolDisposed)

+			{

+				throw new System.ObjectDisposedException("System.Web.Cache");

+			}

+

+			if (strKey == null)

+			{

+				throw new System.ArgumentNullException("strKey");

+			}

+

+			if (objItem == null)

+			{

+				throw new System.ArgumentNullException("objItem");

+			}

+

+			if (slidingExpiration > _datetimeOneYear)

+			{

+				throw new System.ArgumentOutOfRangeException("slidingExpiration");

+			}

+

+			CacheEntry objEntry;

+			CacheEntry objNewEntry;

+

+			long longHitRange = 10000;

+

+			// todo: check decay and make up the minHit range

+			

+			objEntry = new CacheEntry(this, strKey, objItem, objDependency, eventRemoveCallback, absolutExpiration, slidingExpiration, longHitRange, true, enumPriority);

+

+			System.Threading.Interlocked.Increment(ref _longItems);

+

+			// If we have any kind of expiration add into the CacheExpires class

+			if (objEntry.HasSlidingExpiration || objEntry.HasAbsoluteExpiration)

+			{

+				// Add it to CacheExpires 

+				_objExpires.Add(objEntry);

+			}

+

+			// Check and get the new item..

+			objNewEntry = UpdateCache(strKey, objEntry, true, CacheItemRemovedReason.Removed);

+

+			if (objNewEntry != null)

+			{

+				// Return added item

+				return objEntry.Item;

+			} 

+			else

+			{

+				return null;

+			}

+		}

+

+		/// <summary>

+		///	Inserts an item into the Cache object with a cache key to reference its location and using default values 

+		///	provided by the CacheItemPriority and CacheItemPriorityDecay enumerations.

+		/// </summary>

+		/// <param name="strKey">The cache key used to reference the item.</param>

+		/// <param name="objItem">The item to be added to the cache.</param>

+		public void Insert(string strKey, object objItem)

+		{

+			Add(strKey, objItem, null, System.DateTime.MaxValue, System.TimeSpan.Zero, CacheItemPriority.Default, CacheItemPriorityDecay.Default, null);

+		}

+

+		/// <summary>

+		/// Inserts an object into the Cache that has file or key dependencies.

+		/// </summary>

+		/// <param name="strKey">The cache key used to reference the item.</param>

+		/// <param name="objItem">The item to be added to the cache.</param>

+		/// <param name="objDependency">The file or cache key dependencies for the item. When any dependency changes, the object becomes invalid and is removed from the cache. If there are no dependencies, this paramter contains a null reference.</param>

+		public void Insert(string strKey, object objItem, CacheDependency objDependency)

+		{

+			Add(strKey, objItem, objDependency, System.DateTime.MaxValue, System.TimeSpan.Zero, CacheItemPriority.Default, CacheItemPriorityDecay.Default, null);

+		}

+

+		/// <summary>

+		/// Inserts an object into the Cache with dependencies and expiration policies.

+		/// </summary>

+		/// <param name="strKey">The cache key used to reference the item.</param>

+		/// <param name="objItem">The item to be added to the cache.</param>

+		/// <param name="objDependency">The file or cache key dependencies for the item. When any dependency changes, the object becomes invalid and is removed from the cache. If there are no dependencies, this paramter contains a null reference.</param>

+		/// <param name="absolutExpiration">The time at which the added object expires and is removed from the cache. </param>

+		/// <param name="slidingExpiration">The interval between the time the added object was last accessed and when that object expires. If this value is the equivalent of 20 minutes, the object expires and is removed from the cache 20 minutes after it is last accessed.</param>

+		public void Insert(string strKey, object objItem, CacheDependency objDependency, System.DateTime absolutExpiration, System.TimeSpan slidingExpiration)

+		{

+			Add(strKey, objItem, objDependency, absolutExpiration, slidingExpiration, CacheItemPriority.Default, CacheItemPriorityDecay.Default, null);

+		}

+		

+		/// <summary>

+		/// Inserts an object into the Cache object with dependencies, expiration and priority policies, and a delegate 

+		/// you can use to notify your application when the inserted item is removed from the Cache.

+		/// </summary>

+		/// <param name="strKey">The cache key used to reference the item.</param>

+		/// <param name="objItem">The item to be added to the cache.</param>

+		/// <param name="objDependency">The file or cache key dependencies for the item. When any dependency changes, the object becomes invalid and is removed from the cache. If there are no dependencies, this paramter contains a null reference.</param>

+		/// <param name="absolutExpiration">The time at which the added object expires and is removed from the cache. </param>

+		/// <param name="slidingExpiration">The interval between the time the added object was last accessed and when that object expires. If this value is the equivalent of 20 minutes, the object expires and is removed from the cache 20 minutes after it is last accessed.</param>

+		/// <param name="enumPriority">The relative cost of the object, as expressed by the CacheItemPriority enumeration. The cache uses this value when it evicts objects; objects with a lower cost are removed from the cache before objects with a higher cost.</param>

+		/// <param name="enumPriorityDecay">The rate at which an object in the cache decays in importance. Objects that decay quickly are more likely to be removed.</param>

+		/// <param name="eventRemoveCallback">A delegate that, if provided, is called when an object is removed from the cache. You can use this to notify applications when their objects are deleted from the cache.</param>

+		public void Insert(string strKey, object objItem, CacheDependency objDependency, System.DateTime absolutExpiration, System.TimeSpan slidingExpiration, CacheItemPriority enumPriority, CacheItemPriorityDecay enumPriorityDecay, CacheItemRemovedCallback eventRemoveCallback)

+		{

+			Add(strKey, objItem, objDependency, absolutExpiration, slidingExpiration, enumPriority, enumPriorityDecay, eventRemoveCallback);

+		}

+

+		/// <summary>

+		/// Removes the specified item from the Cache object.

+		/// </summary>

+		/// <param name="strKey">The cache key for the cache item to remove.</param>

+		/// <returns>The item removed from the Cache. If the value in the key parameter is not found, returns a null reference.</returns>

+		public object Remove(string strKey)

+		{

+			return Remove(strKey, CacheItemRemovedReason.Removed);

+		}

+

+		/// <summary>

+		/// Internal method that updates the cache, decremenents the number of existing items and call close on the cache entry. This method

+		/// is also used from the ExpiresBuckets class to remove an item during GC flush.

+		/// </summary>

+		/// <param name="strKey">The cache key for the cache item to remove.</param>

+		/// <param name="enumReason">Reason why the item is removed.</param>

+		/// <returns>The item removed from the Cache. If the value in the key parameter is not found, returns a null reference.</returns>

+		internal object Remove(string strKey, CacheItemRemovedReason enumReason)

+		{

+			CacheEntry objEntry = UpdateCache(strKey, null, true, enumReason);

+

+			if (objEntry != null)

+			{

+				System.Threading.Interlocked.Decrement(ref _longItems);

+

+				// Close the cache entry (calls the remove delegate)

+				objEntry.Close(enumReason);

+

+				return objEntry.Item;

+			} else

+			{

+				return null;

+			}

+		}

+

+		/// <summary>

+		/// Retrieves the specified item from the Cache object.

+		/// </summary>

+		/// <param name="strKey">The identifier for the cache item to retrieve.</param>

+		/// <returns>The retrieved cache item, or a null reference.</returns>

+		public object Get(string strKey)

+		{

+			CacheEntry objEntry = UpdateCache(strKey, null, false, CacheItemRemovedReason.Expired);

+

+			if (objEntry == null)

+			{

+				return null;

+			} else

+			{

+				return objEntry.Item;

+			}

+		}

+

+		/// <summary>

+		/// Internal method used for removing, updating and adding CacheEntries into the cache.

+		/// </summary>

+		/// <param name="strKey">The identifier for the cache item to modify</param>

+		/// <param name="objEntry">CacheEntry to use for overwrite operation, if this parameter is null and overwrite true the item is going to be removed</param>

+		/// <param name="boolOverwrite">If true the objEntry parameter is used to overwrite the strKey entry</param>

+		/// <param name="enumReason">Reason why an item was removed</param>

+		/// <returns></returns>

+		private CacheEntry UpdateCache(string strKey, CacheEntry objEntry, bool boolOverwrite, CacheItemRemovedReason enumReason)

+		{

+			if (_boolDisposed)

+			{

+				throw new System.ObjectDisposedException("System.Web.Cache", "Can't update item(s) in a disposed cache");

+			}

+

+			if (strKey == null)

+			{

+				throw new System.ArgumentNullException("System.Web.Cache");

+			}

+

+			long ticksNow = System.DateTime.Now.Ticks;

+			long ticksExpires = long.MaxValue;

+

+			bool boolGetItem = false;

+			bool boolExpiried = false;

+			bool boolWrite = false;

+			bool boolRemoved = false;

+

+			// Are we getting the item from the hashtable

+			if (boolOverwrite == false && strKey.Length > 0 && objEntry == null)

+			{

+				boolGetItem = true;

+			}

+

+			// TODO: Optimize this method, move out functionality outside the lock

+			_lockEntries.AcquireReaderLock(int.MaxValue);

+			try 

+			{	

+				if (boolGetItem)

+				{

+					objEntry = (CacheEntry) _arrEntries[strKey];

+					if (objEntry == null)

+					{

+						return null;

+					}

+				}

+

+				if (objEntry != null)

+				{

+					// Check if we have expired

+					if (objEntry.HasSlidingExpiration || objEntry.HasAbsoluteExpiration)

+					{

+						if (objEntry.Expires < ticksNow)

+						{

+							// We have expired, remove the item from the cache

+							boolWrite = true;

+							boolExpiried = true;

+						} 

+					} 

+				}

+

+				// Check if we going to modify the hashtable

+				if (boolWrite || (boolOverwrite && !boolExpiried))

+				{

+					// Upgrade our lock to write

+					System.Threading.LockCookie objCookie = _lockEntries.UpgradeToWriterLock(int.MaxValue);

+					try 

+					{

+						// Check if we going to just modify an existing entry (or add)

+						if (boolOverwrite && objEntry != null)

+						{

+							_arrEntries[strKey] = objEntry;

+						} 

+						else

+						{

+							// We need to remove the item, fetch the item first

+							objEntry = (CacheEntry) _arrEntries[strKey];

+							if (objEntry != null)

+							{

+								_arrEntries.Remove(strKey);

+							}

+

+							boolRemoved = true;

+						}

+					}

+					finally

+					{

+						_lockEntries.DowngradeFromWriterLock(ref objCookie);

+					}

+				}

+

+				// If the entry haven't expired or been removed update the info

+				if (!boolExpiried && !boolRemoved)

+				{

+					// Update that we got a hit

+					objEntry.Hits++;

+					if (objEntry.HasSlidingExpiration)

+					{

+						ticksExpires = ticksNow + objEntry.SlidingExpiration;

+					}

+				}

+			}

+			finally

+			{

+				_lockEntries.ReleaseLock();

+

+			}

+

+			// If the item was removed we need to remove it from the CacheExpired class also

+			if (boolRemoved)

+			{

+				if (objEntry != null)

+				{

+					if (objEntry.HasAbsoluteExpiration || objEntry.HasSlidingExpiration)

+					{

+						_objExpires.Remove(objEntry);

+					}

+				}

+

+				// Return the entry, it's not up to the UpdateCache to call Close on the entry

+				return objEntry;

+			}

+

+			// If we have sliding expiration and we have a correct hit, update the expiration manager

+			if (objEntry.HasSlidingExpiration)

+			{

+				_objExpires.Update(objEntry, ticksExpires);

+			}

+

+			// Return the cache entry

+			return objEntry;

+		}

+

+		/// <summary>

+		/// Gets the number of items stored in the cache.

+		/// </summary>

+		long Count

+		{

+			get 

+			{

+				return _longItems;

+			}

+		}

+

+		/// <summary>

+		/// Gets or sets the cache item at the specified key.

+		/// </summary>

+		public object this[string strKey]

+		{

+			get 

+			{

+				return Get(strKey);

+			}

+

+			set

+			{

+				Insert(strKey, value);

+			}

+		}

+

+		/// <summary>

+		/// Called to close the cache when the AppDomain is closing down or the GC has decided it's time to destroy the object.

+		/// </summary>

+		public void Dispose()

+		{

+			_boolDisposed = true;

+

+			_lockEntries.AcquireReaderLock(int.MaxValue);

+			try 

+			{

+				foreach(System.Collections.DictionaryEntry objEntry in _arrEntries)

+				{

+					if (objEntry.Key != null)

+					{

+						// Check if this is active

+						if ( ((CacheEntry) objEntry.Value).TestFlag(CacheEntry.Flags.Removed) )

+						{

+							try 

+							{

+								((CacheEntry) objEntry.Value).Close(CacheItemRemovedReason.Removed);

+							}

+							catch (System.Exception objException)

+							{

+                                System.Diagnostics.Debug.Fail("System.Web.Cache.Dispose() Exception when closing cache entry", "Message: " + objException.Message + " Stack: " + objException.StackTrace + " Source:" + objException.Source);

+							}

+						}

+					}

+				}

+			}

+			finally

+			{

+				_lockEntries.ReleaseReaderLock();

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Caching/CacheDefinitions.cs b/mcs/class/System.Web/System.Web.Caching/CacheDefinitions.cs
new file mode 100644
index 00000000000..bde614987ae
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Caching/CacheDefinitions.cs
@@ -0,0 +1,53 @@
+// 

+// System.Web.Caching

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+// (C) Copyright Patrik Torstensson, 2001

+//

+namespace System.Web.Caching

+{

+	/// <summary>

+	/// Specifies the relative priority of items stored in the Cache.

+	/// </summary>

+	public enum CacheItemPriority {

+		Low = 1,

+		BelowNormal = 2,

+		Normal = 3,

+		Default = 3,

+		AboveNormal = 4,

+		High = 5,

+		NotRemovable 

+	}

+

+	/// <summary>

+	/// Specifies the rate at which the priority of items stored in the Cache are downgraded when not accessed frequently.

+	/// </summary>

+	public enum CacheItemPriorityDecay { 

+		Default,

+		Fast,

+		Medium,

+		Never,

+		Slow

+	}

+

+	/// <summary>

+	/// Specifies the reason an item was removed from the Cache.

+	/// </summary>

+	public enum CacheItemRemovedReason {

+		Expired = 1,

+		Removed = 2,

+		Underused = 3,

+		DependencyChanged = 4

+	}

+

+	/// <summary>

+	/// Defines a callback method for notifying applications when a cached item is removed from the Cache.

+	/// </summary>

+	/// <param name="key">The index location for the item removed from the cache. </param>

+	/// <param name="value">The Object item removed from the cache. </param>

+	/// <param name="reason">The reason the item was removed from the cache, as specified by the CacheItemRemovedReason enumeration.</param>

+	public delegate void CacheItemRemovedCallback(string key, object value, CacheItemRemovedReason reason);

+

+	}

diff --git a/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs b/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs
new file mode 100644
index 00000000000..68c1a39e623
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Caching/CacheDependency.cs
@@ -0,0 +1,95 @@
+// 

+// System.Web.Caching

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+// (C) Copyright Patrik Torstensson, 2001

+//

+namespace System.Web.Caching

+{

+	/// <summary>

+	/// Class to handle cache dependency, right now this class is only a mookup

+	/// </summary>

+	public sealed class CacheDependency : System.IDisposable

+	{

+		private bool _boolDisposed;

+

+		public CacheDependency() 

+		{

+			_boolDisposed = false;

+		}

+

+		/// <remarks>

+		/// Added by gvaish@iitk.ac.in

+		/// </remarks>

+		[MonoTODO("Constructor")]

+		public CacheDependency(string filename)

+		{

+		}

+		

+		/// <remarks>

+		/// Added by gvaish@iitk.ac.in

+		/// </remarks>

+		[MonoTODO("Constructor")]

+		public CacheDependency(string[] filenames, string[] cachekeys)

+		{

+		}

+

+		public delegate void CacheDependencyCallback(CacheDependency objDependency);

+		

+		public event CacheDependencyCallback Changed;

+

+		public void OnChanged()

+		{

+			if (_boolDisposed)

+			{

+				throw new System.ObjectDisposedException("System.Web.CacheDependency");

+			}

+

+			if (Changed != null)

+			{

+				Changed(this);

+			}

+		}

+

+		public bool IsDisposed

+		{

+			get 

+			{

+				return _boolDisposed;

+			}

+		}

+

+		public bool HasEvents

+		{

+			get 

+			{

+				if (_boolDisposed)

+				{

+					throw new System.ObjectDisposedException("System.Web.CacheDependency");

+				}

+

+				if (Changed != null)

+				{

+					return true;

+				}

+

+				return false;

+			}

+		}

+

+		public void Dispose()

+		{

+			_boolDisposed = true;

+		}

+

+		/// <summary>

+		/// Used in testing.

+		/// </summary>

+		public void Signal()

+		{

+			OnChanged();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Caching/CacheEntry.cs b/mcs/class/System.Web/System.Web.Caching/CacheEntry.cs
new file mode 100644
index 00000000000..0943be5db30
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Caching/CacheEntry.cs
@@ -0,0 +1,363 @@
+// 

+// System.Web.Caching

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+// (C) Copyright Patrik Torstensson, 2001

+//

+namespace System.Web.Caching

+{

+	/// <summary>

+	/// Class responsible for representing a cache entry.

+	/// </summary>

+	public class CacheEntry

+	{

+		/// <summary>

+		/// Defines the status of the current cache entry

+		/// </summary>

+		public enum Flags

+		{

+			Removed	= 0,

+			Public	= 1

+		}

+

+		private CacheItemPriority		_enumPriority;

+        

+		private long	_longHits;

+

+		private byte	_byteExpiresBucket;

+		private int		_intExpiresIndex;

+

+		private	long	_ticksExpires;	

+		private long	_ticksSlidingExpiration;

+

+		private	string	_strKey;

+		private	object	_objItem;

+

+		private long	_longMinHits;

+

+		private Flags	_enumFlags;

+		

+		private CacheDependency		_objDependency;

+		private Cache				_objCache;

+

+		/// <summary>

+		/// Constructs a new cache entry

+		/// </summary>

+		/// <param name="strKey">The cache key used to reference the item.</param>

+		/// <param name="objItem">The item to be added to the cache.</param>

+		/// <param name="objDependency">The file or cache key dependencies for the item. When any dependency changes, the object becomes invalid and is removed from the cache. If there are no dependencies, this paramter contains a null reference.</param>

+		/// <param name="dtExpires">The time at which the added object expires and is removed from the cache. </param>

+		/// <param name="tsSpan">The interval between the time the added object was last accessed and when that object expires. If this value is the equivalent of 20 minutes, the object expires and is removed from the cache 20 minutes after it is last accessed.</param>

+		/// <param name="longMinHits">Used to detect and control if the item should be flushed due to under usage</param>

+		/// <param name="boolPublic">Defines if the item is public or not</param>

+		/// <param name="enumPriority">The relative cost of the object, as expressed by the CacheItemPriority enumeration. The cache uses this value when it evicts objects; objects with a lower cost are removed from the cache before objects with a higher cost.</param>

+		public CacheEntry(	Cache objManager, string strKey, object objItem, CacheDependency objDependency, CacheItemRemovedCallback eventRemove, 

+							System.DateTime dtExpires, System.TimeSpan tsSpan, long longMinHits, bool boolPublic, CacheItemPriority enumPriority )

+		{

+			if (boolPublic)

+			{

+				SetFlag(Flags.Public);

+			}

+

+			_strKey = strKey;

+			_objItem = objItem;

+			_objCache = objManager;

+			

+			_onRemoved += eventRemove;

+

+			_enumPriority = enumPriority;

+

+			_ticksExpires = dtExpires.Ticks;

+

+			_ticksSlidingExpiration = tsSpan.Ticks;

+

+			// If we have a sliding expiration it overrides the absolute expiration (MS behavior)

+			if (tsSpan.Ticks != System.TimeSpan.Zero.Ticks)

+			{

+				_ticksExpires = System.DateTime.Now.AddTicks(_ticksSlidingExpiration).Ticks;

+			}

+			

+			_objDependency = objDependency;

+			if (_objDependency != null)

+			{

+				if (_objDependency.IsDisposed)

+				{

+					throw new System.ObjectDisposedException("System.Web.CacheDependency");

+				}

+

+				// Add the entry to the cache dependency handler (we support multiple entries per handler)

+				_objDependency.Changed += new CacheDependency.CacheDependencyCallback(OnChanged); 

+			}

+

+			_longMinHits = longMinHits;

+		}

+

+		private event CacheItemRemovedCallback _onRemoved;

+

+		public void OnChanged(CacheDependency objDependency)

+		{

+			_objCache.Remove(_strKey, CacheItemRemovedReason.DependencyChanged);

+		}

+

+		/// <summary>

+		/// Cleans up the cache entry, removes the cache dependency and calls the remove delegate.

+		/// </summary>

+		/// <param name="enumReason">The reason why the cache entry are going to be removed</param>

+		public void Close(CacheItemRemovedReason enumReason)

+		{	

+			lock(this)

+			{

+				// Check if the item already is removed

+				if (TestFlag(Flags.Removed))

+				{

+					return;

+				}

+

+				SetFlag(Flags.Removed);

+

+				if (_onRemoved != null)

+				{

+					// Call the delegate to tell that we are now removing the entry

+					try 

+					{

+						_onRemoved(_strKey, _objItem, enumReason);		

+					}

+					catch (System.Exception objException)

+					{

+						System.Diagnostics.Debug.Fail("System.Web.CacheEntry.Close() Exception when calling remove delegate", "Message: " + objException.Message + " Stack: " + objException.StackTrace + " Source:" + objException.Source);

+					}

+				}

+

+				// If we have a dependency, remove the entry

+				if (_objDependency != null)

+				{

+					_objDependency.Changed -= new CacheDependency.CacheDependencyCallback(OnChanged);

+					if (!_objDependency.HasEvents)

+					{

+						_objDependency.Dispose();

+					}

+				}

+			}

+		}

+

+		/// <summary>

+		/// Tests a specific flag is set or not.

+		/// </summary>

+		/// <param name="oFlag">Flag to test agains</param>

+		/// <returns>Returns true if the flag is set.</returns>

+		public bool TestFlag(Flags oFlag)

+		{

+			lock(this) 

+			{

+				if ((_enumFlags & oFlag) != 0)

+				{

+					return true;

+				} 

+

+				return false;

+			}

+		}

+

+		/// <summary>

+		/// Sets a specific flag.

+		/// </summary>

+		/// <param name="oFlag">Flag to set.</param>

+		public void SetFlag(Flags oFlag)

+		{

+			lock (this)

+			{

+				_enumFlags |= oFlag;

+			}

+		}

+

+		/// <summary>

+		/// Returns true if the object has minimum hit usage flushing enabled.

+		/// </summary>

+		public bool HasUsage

+		{

+			get { 

+				if (_longMinHits == System.Int64.MaxValue) 

+				{

+					return false;

+				}

+

+				return true;

+			}

+		}

+

+		/// <summary>

+		/// Returns true if the entry has absolute expiration.

+		/// </summary>

+		public bool HasAbsoluteExpiration

+		{

+			get 

+			{ 

+				if (_ticksExpires == System.DateTime.MaxValue.Ticks) 

+				{

+					return false;

+				}

+

+				return true;

+			}

+		}

+

+		/// <summary>

+		/// Returns true if the entry has sliding expiration enabled.

+		/// </summary>

+		public bool HasSlidingExpiration

+		{

+			get 

+			{ 

+				if (_ticksSlidingExpiration == System.TimeSpan.Zero.Ticks) 

+				{

+					return false;

+				}

+

+				return true;

+			}

+		}

+		

+		/// <summary>

+		/// Gets and sets the current expires bucket the entry is active in.

+		/// </summary>

+		public byte ExpiresBucket

+		{

+			get 

+			{ 

+				lock (this) 

+				{

+					return _byteExpiresBucket; 

+				}

+			}

+			set 

+			{ 

+				lock (this)

+				{

+					_byteExpiresBucket = ExpiresBucket; 

+				}

+			}

+		}

+

+		/// <summary>

+		/// Gets and sets the current index in the expires bucket of the current cache entry.

+		/// </summary>

+		public int ExpiresIndex

+		{

+			get 

+			{ 

+				lock (this)

+				{

+					return _intExpiresIndex; 

+				}

+			}

+			

+			set 

+			{ 

+				lock (this)

+				{

+					_intExpiresIndex = ExpiresIndex; 

+				}

+			}

+		}

+        

+		/// <summary>

+		/// Gets and sets the expiration of the cache entry.

+		/// </summary>

+		public long Expires

+		{

+			get 

+			{ 

+				lock (this)

+				{

+					return _ticksExpires; 

+				}

+			}

+			set 

+			{ 

+				lock (this)

+				{

+					_ticksExpires = Expires; 

+				}

+			}

+		}

+

+		/// <summary>

+		/// Gets the sliding expiration value. The return value is in ticks (since 0/0-01 in 100nanosec)

+		/// </summary>

+		public long SlidingExpiration

+		{

+			get 

+			{ 

+				return _ticksSlidingExpiration; 

+			}

+		}

+

+		/// <summary>

+		/// Returns the current cached item.

+		/// </summary>

+		public object Item

+		{

+			get

+			{

+				return _objItem; 

+			}

+		}

+

+		/// <summary>

+		/// Returns the current cache identifier.

+		/// </summary>

+		public string Key

+		{

+			get 

+			{ 

+				return _strKey; 

+			}

+		}

+

+		/// <summary>

+		/// Gets and sets the current number of hits on the cache entry.

+		/// </summary>

+		public long Hits

+		{

+			// todo: Could be optimized by using interlocked methods..

+			get 

+			{

+				lock (this)

+				{

+					return _longHits; 

+				}

+			}

+			set 

+			{ 

+				lock (this)

+				{

+					_longHits = Hits; 

+				}

+			}

+		}

+

+		/// <summary>

+		/// Returns minimum hits for the usage flushing rutine.

+		/// </summary>

+		public long MinimumHits

+		{

+			get 

+			{ 

+				return _longMinHits; 

+			}

+		}

+

+		/// <summary>

+		/// Returns the priority of the cache entry.

+		/// </summary>

+		public CacheItemPriority Priority

+		{

+			get 

+			{ 

+				return _enumPriority; 

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Caching/CacheExpires.cs b/mcs/class/System.Web/System.Web.Caching/CacheExpires.cs
new file mode 100644
index 00000000000..a58eb5c1e69
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Caching/CacheExpires.cs
@@ -0,0 +1,145 @@
+// 

+// System.Web.Caching

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+// (C) Copyright Patrik Torstensson, 2001

+//

+namespace System.Web.Caching

+{

+	/// <summary>

+	/// Class responsible for handling time based flushing of entries in the cache. The class creates

+	/// and manages 60 buckets each holding every item that expires that minute. The bucket calculated

+	/// for an entry is one minute more than the timeout just to make sure that the item end up in the

+	/// bucket where it should be flushed.

+	/// </summary>

+	public class CacheExpires : System.IDisposable

+	{

+		static int	_intFlush;

+		static long _ticksPerBucket = 600000000;

+		static long _ticksPerCycle = _ticksPerBucket * 60;

+

+		private ExpiresBucket[] _arrBuckets;

+		private System.Threading.Timer _objTimer;

+		private Cache _objManager;

+

+		/// <summary>

+		/// Constructor

+		/// </summary>

+		/// <param name="objManager">The cache manager, used when flushing items in a bucket.</param>

+		public CacheExpires(Cache objManager)

+		{

+			_objManager = objManager;

+			Initialize();

+		}

+

+		/// <summary>

+		/// Initializes the class.

+		/// </summary>

+		private void Initialize()

+		{

+			// Create one bucket per minute

+			_arrBuckets = new ExpiresBucket[60];

+

+			byte bytePos = 0;

+			do 

+			{

+				_arrBuckets[bytePos] = new ExpiresBucket(bytePos, _objManager);

+				bytePos++;

+			} while (bytePos < 60);

+

+			// GC Bucket controller

+			_intFlush = System.DateTime.Now.Minute - 1;

+			_objTimer = new System.Threading.Timer(new System.Threading.TimerCallback(GarbageCleanup), null, 10000, 60000);

+		}

+

+		/// <summary>

+		/// Adds a Cache entry to the correct flush bucket.

+		/// </summary>

+		/// <param name="objEntry">Cache entry to add.</param>

+		public void Add(CacheEntry objEntry)

+		{

+			long ticksNow = System.DateTime.Now.Ticks;

+

+			lock(this) 

+			{

+				// If the entry doesn't have a expires time we assume that the entry is due to expire now.

+				if (objEntry.Expires == 0) 

+				{

+					objEntry.Expires = ticksNow;

+				}

+

+                _arrBuckets[GetHashBucket(objEntry.Expires)].Add(objEntry);

+			}

+		}

+

+		public void Remove(CacheEntry objEntry)

+		{

+			long ticksNow = System.DateTime.Now.Ticks;

+

+			lock(this) 

+			{

+				// If the entry doesn't have a expires time we assume that the entry is due to expire now.

+				if (objEntry.Expires == 0) 

+				{

+					objEntry.Expires = ticksNow;

+				}

+

+				_arrBuckets[GetHashBucket(objEntry.Expires)].Remove(objEntry);

+			}

+		}

+

+		public void Update(CacheEntry objEntry, long ticksExpires)

+		{

+			long ticksNow = System.DateTime.Now.Ticks;

+

+			lock(this) 

+			{

+				// If the entry doesn't have a expires time we assume that the entry is due to expire now.

+				if (objEntry.Expires == 0) 

+				{

+					objEntry.Expires = ticksNow;

+				}

+

+				_arrBuckets[GetHashBucket(objEntry.Expires)].Update(objEntry, ticksExpires);

+			}		

+		}

+

+		public void GarbageCleanup(object State)

+		{

+			ExpiresBucket	objBucket;

+

+			lock(this)

+			{

+				// Do cleanup of the bucket 

+				objBucket = _arrBuckets[(++_intFlush) % 60];

+			}	

+

+			// Flush expired items in the current bucket (defined by _intFlush)

+			objBucket.FlushExpiredItems();

+		}

+

+		private int GetHashBucket(long ticks)

+		{

+			// Get bucket to add expire item into, add one minute to the bucket just to make sure that we get it in the bucket gc

+			return (int) (((((ticks + 60000) % _ticksPerCycle) / _ticksPerBucket) + 1) % 60);

+		}

+

+		/// <summary>

+		/// Called by the cache for cleanup.

+		/// </summary>

+		public void Dispose()

+		{

+			lock(this)

+			{

+				// Cleanup the internal timer

+				if (_objTimer != null)

+				{

+					_objTimer.Dispose();

+					_objTimer = null;

+				}

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Caching/ChangeLog b/mcs/class/System.Web/System.Web.Caching/ChangeLog
new file mode 100644
index 00000000000..c5c581c0072
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Caching/ChangeLog
@@ -0,0 +1,23 @@
+2002-07-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>

+

+	* CacheDefinitions.cs: fixed a couple of enums.

+

+	* CacheDependency.cs: the class is sealed.

+

+2002-06-11  Gonzalo Paniagua Javier <gonzalo@ximian.com>

+

+	* CacheDependency.cs: fixed a couple of typos and don't throw

+	NotImplementedException in constructors.

+

+2001-12-21      Gaurav Vaish <gvaish@iitk.ac.in>

+

+        * CacheDependency.cs:    Some unimplemented methods to make build

+

+2001-07-20	Patrik Torstensson (Patrik.Torstensson@labs2.com)

+

+	* Cache.cs:	Implemented. (90% ready)

+	* CacheDefinitions.cs: Implemented.

+	* CacheDependency.cs: Added. (20% ready)

+	* CacheExpires: Implemented.

+	* CacheEntry.cs: Implemented. (95% ready, going to be changed due to CacheDependecy support)

+	* ExpiresBuckets.cs: Implemented.

diff --git a/mcs/class/System.Web/System.Web.Caching/ExpiresBuckets.cs b/mcs/class/System.Web/System.Web.Caching/ExpiresBuckets.cs
new file mode 100644
index 00000000000..b5b877d455d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Caching/ExpiresBuckets.cs
@@ -0,0 +1,253 @@
+// 

+// System.Web.Caching

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+// (C) Copyright Patrik Torstensson, 2001

+//

+namespace System.Web.Caching

+{

+	/// <summary>

+	/// Responsible for holding a cache entry in the linked list bucket.

+	/// </summary>

+	public struct ExpiresEntry

+	{

+		public CacheEntry	_objEntry;

+		public long			_ticksExpires;

+		public int			_intNext;

+	}

+

+	/// <summary>

+	/// Holds cache entries that has a expiration in a bucket list.

+	/// </summary>

+	public class ExpiresBucket

+	{

+		private static int MIN_ENTRIES = 16;

+		

+		private byte	_byteID;

+		private int		_intSize;

+		private int		_intCount;

+		private	int		_intNext;

+

+		private Cache	_objManager;

+

+		private ExpiresEntry [] _arrEntries;

+

+		/// <summary>

+		/// Constructs a new bucket.

+		/// </summary>

+		/// <param name="bucket">Current bucket ID.</param>

+		/// <param name="objManager">Cache manager reponsible for the item(s) in the expires bucket.</param>

+		public ExpiresBucket(byte bucket, Cache objManager) 

+		{

+			_objManager = objManager;

+			Initialize(bucket);

+		}

+

+		/// <summary>

+		/// Initializes the expires bucket, creates a linked list of MIN_ENTRIES.

+		/// </summary>

+		/// <param name="bucket">Bucket ID.</param>

+		private void Initialize(byte bucket)

+		{

+			_byteID = bucket;

+			_intNext = 0;

+			_intCount = 0;

+

+			_arrEntries = new ExpiresEntry[MIN_ENTRIES];

+			_intSize = MIN_ENTRIES;

+

+			int intPos = 0;

+			do 

+			{

+				_arrEntries[intPos]._intNext = intPos + 1;

+				_arrEntries[intPos]._ticksExpires = System.DateTime.MaxValue.Ticks;

+				

+				intPos++;

+			} while (intPos < _intSize);

+

+			_arrEntries[_intSize - 1]._intNext = -1;

+		}

+

+		/// <summary>

+		/// Expands the bucket linked array list.

+		/// </summary>

+		private void Expand() 

+		{

+			ExpiresEntry [] arrData;

+			int intPos = 0;

+			int intOldSize;

+

+			lock(this)	

+			{

+				intOldSize = _intSize;

+				_intSize *= 2;

+

+				// Create a new array and copy the old data into the new array

+				arrData = new ExpiresEntry[_intSize];

+				do 

+				{

+					arrData[intPos] = _arrEntries[intPos];

+					intPos++;

+				} while (intPos < intOldSize);

+

+				_intNext = intPos;

+

+				// Initialize the "new" positions.

+				do 

+				{

+					arrData[intPos]._intNext = intPos + 1;

+					intPos++;

+				} while (intPos < _intSize);

+

+				arrData[_intSize - 1]._intNext = -1;

+

+				_arrEntries = arrData;

+			}

+		}

+

+		/// <summary>

+		/// Adds a cache entry into the expires bucket.

+		/// </summary>

+		/// <param name="objEntry">Cache Entry object to be added.</param>

+		public void Add(CacheEntry objEntry)

+		{

+			if (_intNext == -1) 

+			{

+				Expand();

+			}

+			

+			lock(this)	

+			{

+				_arrEntries[_intNext]._ticksExpires =  objEntry.Expires;

+				_arrEntries[_intNext]._objEntry = objEntry;

+

+				_intNext = _arrEntries[_intNext]._intNext;

+			

+				_intCount++;

+			}

+		}

+

+		/// <summary>

+		/// Removes a cache entry from the expires bucket.

+		/// </summary>

+		/// <param name="objEntry">Cache entry to be removed.</param>

+		public void Remove(CacheEntry objEntry)

+		{

+			lock(this)

+			{

+				// Check if this is our bucket

+				if (objEntry.ExpiresIndex != _byteID) return;

+				if (objEntry.ExpiresIndex == System.Int32.MaxValue) return;

+				if (_arrEntries.Length < objEntry.ExpiresIndex) return;

+

+				_intCount--;

+

+				_arrEntries[objEntry.ExpiresIndex]._objEntry.ExpiresBucket = byte.MaxValue;

+				_arrEntries[objEntry.ExpiresIndex]._objEntry.ExpiresIndex = int.MaxValue;

+				_arrEntries[objEntry.ExpiresIndex]._objEntry = null;

+				_intNext = _arrEntries[objEntry.ExpiresIndex]._intNext;

+			}			

+		}

+

+		/// <summary>

+		/// Updates a cache entry in the expires bucket, this is called during a hit of an item if the 

+		/// cache item has a sliding expiration. The function is responsible for updating the cache

+		/// entry.

+		/// </summary>

+		/// <param name="objEntry">Cache entry to update.</param>

+		/// <param name="ticksExpires">New expiration value for the cache entry.</param>

+		public void Update(CacheEntry objEntry, long ticksExpires)

+		{

+			lock(this)

+			{

+				// Check if this is our bucket

+				if (objEntry.ExpiresIndex != _byteID) return;

+				if (objEntry.ExpiresIndex == System.Int32.MaxValue) return;

+				if (_arrEntries.Length < objEntry.ExpiresIndex) return;

+

+				_arrEntries[objEntry.ExpiresIndex]._ticksExpires = ticksExpires;

+				_arrEntries[objEntry.ExpiresIndex]._objEntry.Expires = ticksExpires;

+			}

+		}

+

+		/// <summary>

+		/// Flushes all cache entries that has expired and removes them from the cache manager.

+		/// </summary>

+		public void FlushExpiredItems()

+		{

+			ExpiresEntry objEntry;

+			CacheEntry [] arrCacheEntries;

+			

+			int		intCachePos;

+			int		intPos;

+			long	ticksNow;

+	

+			ticksNow = System.DateTime.Now.Ticks;

+

+			intCachePos = 0;

+

+			// Lookup all items that needs to be removed, this is done in a two part

+			// operation to minimize the locking time.

+			lock (this)

+			{

+				arrCacheEntries = new CacheEntry[_intSize];

+

+				intPos = 0;

+				do 

+				{

+					objEntry = _arrEntries[intPos];

+					if (objEntry._objEntry != null)

+					{

+						if (objEntry._ticksExpires < ticksNow)

+						{

+							arrCacheEntries[intCachePos++] = objEntry._objEntry;

+

+							objEntry._objEntry.ExpiresBucket = byte.MaxValue;

+							objEntry._objEntry.ExpiresIndex = int.MaxValue;

+							objEntry._objEntry = null;

+							_intNext = objEntry._intNext;

+						}

+					}

+					

+					intPos++;

+				} while (intPos < _intSize);

+			}

+

+			// If we have any entries to remove, go ahead and call the cache manager remove.

+			if (intCachePos > 0)

+			{

+				intPos = 0;

+				do 

+				{

+					_objManager.Remove(arrCacheEntries[intPos].Key, CacheItemRemovedReason.Expired);

+

+					intPos++;

+				} while (intPos < intCachePos);

+			}

+		}

+

+		/// <summary>

+		/// Returns the current size of the expires bucket.

+		/// </summary>

+		public int Size

+		{

+			get 

+			{ 

+				return _arrEntries.Length;

+			}

+		}

+

+		/// <summary>

+		/// Returns number of items in the bucket.

+		/// </summary>

+		public int Count

+		{

+			get 

+			{

+				return  _intCount;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs b/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
new file mode 100644
index 00000000000..a192e460c7e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Compilation/AspComponentFoundry.cs
@@ -0,0 +1,106 @@
+//

+// System.Web.Compilation.AspComponentFoundry

+//

+// Authors:

+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)

+//

+// (C) 2002 Ximian, Inc (http://www.ximian.com)

+//

+using System;

+using System.Collections;

+using System.IO;

+using System.Reflection;

+

+namespace System.Web.Compilation

+{

+	internal class AspComponentFoundry

+	{

+		private Hashtable foundries;

+

+		public AspComponentFoundry ()

+		{

+			foundries = new Hashtable (CaseInsensitiveHashCodeProvider.Default,

+						   CaseInsensitiveComparer.Default);

+

+			RegisterFoundry ("asp", "System.Web", "System.Web.UI.WebControls");

+		}

+

+		public AspComponent MakeAspComponent (string foundryName, string componentName, Tag tag)

+		{

+			InternalFoundry foundry = foundries [foundryName] as InternalFoundry;

+			if (foundry == null)

+				throw new ApplicationException ("Foundry not found: " + foundryName);

+

+			return new AspComponent (tag, foundry.GetType (componentName));

+		}

+

+		public void RegisterFoundry (string foundryName,

+						string assemblyName,

+						string nameSpace)

+		{

+			InternalFoundry foundry = new InternalFoundry (assemblyName, nameSpace, null);

+			foundries.Add (foundryName, foundry);

+		}

+

+		public void RegisterFoundry (string foundryName,

+						string assemblyName,

+						string nameSpace,

+						string typeName)

+		{

+			InternalFoundry foundry = new InternalFoundry (assemblyName, nameSpace, typeName);

+			foundries.Add (foundryName, foundry);

+		}

+

+		public bool LookupFoundry (string foundryName)

+		{

+			return foundries.Contains (foundryName);

+		}

+

+		class InternalFoundry

+		{

+			string nameSpace;

+			string assemblyName;

+			string typeName;

+			Assembly assembly;

+

+			public InternalFoundry (string assemblyName, string nameSpave, string typeName)

+			{

+				this.assemblyName = assemblyName;

+				this.nameSpace = nameSpace;

+				this.typeName = typeName;

+				assembly = null;

+			}

+

+			public Type GetType (string componentName)

+			{

+				EnsureAssembly ();

+

+				// For ascx files

+				if (typeName != null && 0 == String.Compare (componentName, typeName, true)) {

+					throw new ApplicationException ("Only type '" + typeName + "' allowed.");

+				} else if (typeName != null) {

+					componentName = typeName;

+				}

+

+				return assembly.GetType (nameSpace + "." + componentName, true, true);

+			}

+			

+			private void EnsureAssembly ()

+			{

+				if (assembly != null)

+					return;

+

+				try {

+					assembly = Assembly.LoadFrom (Path.GetFullPath (assemblyName));

+				} catch {

+					assembly = Assembly.LoadWithPartialName (assemblyName);

+				}

+

+				if (assembly == null)

+					throw new ApplicationException ("Assembly not found:" + assemblyName);

+			}

+		}

+

+	}

+}

+

diff --git a/mcs/class/System.Web/System.Web.Compilation/AspElements.cs b/mcs/class/System.Web/System.Web.Compilation/AspElements.cs
new file mode 100644
index 00000000000..71e51ad27ea
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Compilation/AspElements.cs
@@ -0,0 +1,774 @@
+//
+// System.Web.Compilation.AspElements
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Text;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+
+namespace System.Web.Compilation
+{
+	
+	public enum ElementType
+	{
+		TAG,
+		PLAINTEXT
+	}
+
+	public abstract class Element
+	{
+		private ElementType elementType;
+
+		public Element (ElementType type)
+		{
+			elementType = type;
+		}
+		
+		public ElementType GetElementType
+		{
+			get { return elementType; }
+		}
+	} // class Element
+
+	public class PlainText : Element
+	{
+		private StringBuilder text;
+
+		public PlainText () : base (ElementType.PLAINTEXT)
+		{
+			text = new StringBuilder ();
+		}
+
+		public PlainText (StringBuilder text) : base (ElementType.PLAINTEXT)
+		{
+			this.text = text;
+		}
+
+		public PlainText (string text) : this ()
+		{
+			this.text.Append (text);
+		}
+
+		public void Append (string more)
+		{
+			text.Append (more);
+		}
+		
+		public string Text
+		{
+			get { return text.ToString (); }
+		}
+
+		public override string ToString ()
+		{
+			return "PlainText: " + Text;
+		}
+	}
+
+	public enum TagType
+	{
+		DIRECTIVE,
+		HTML,
+		HTMLCONTROL,
+		SERVERCONTROL,
+		INLINEVAR,
+		INLINECODE,
+		CLOSING,
+		SERVEROBJECT,
+		PROPERTYTAG,
+		CODERENDER,
+		DATABINDING,
+		NOTYET
+	}
+
+	/*
+	 * Attributes and values are stored in a couple of ArrayList in Add ().
+	 * When MakeHash () is called, they are converted to a Hashtable. If there are any
+	 * attributes duplicated it throws an ArgumentException.
+	 *
+	 * The [] operator works with the Hashtable if the values are in it, otherwise
+	 * it uses the ArrayList's.
+	 *
+	 * Why? You can have a tag in HTML like <a att="value" att="xxx">, but not in tags
+	 * marked runat=server and Hashtable requires the key to be unique.
+	 * 
+	 */
+	public class TagAttributes
+	{
+		private Hashtable atts_hash;
+		private ArrayList keys;
+		private ArrayList values;
+		private bool got_hashed;
+
+		public TagAttributes ()
+		{
+			got_hashed = false;
+			keys = new ArrayList ();
+			values = new ArrayList ();
+		}
+
+		private void MakeHash ()
+		{
+			atts_hash = new Hashtable (new CaseInsensitiveHashCodeProvider (),
+						   new CaseInsensitiveComparer ());
+			for (int i = 0; i < keys.Count; i++)
+				atts_hash.Add (keys [i], values [i]);
+			got_hashed = true;
+			keys = null;
+			values = null;
+		}
+		
+		public bool IsRunAtServer ()
+		{
+			return got_hashed;
+		}
+
+		public void Add (object key, object value)
+		{
+			if (key != null && value != null &&
+			    0 == String.Compare ((string) key,  "runat", true) &&
+			    0 == String.Compare ((string) value,  "server", true))
+				MakeHash ();
+
+			if (got_hashed)
+				atts_hash.Add (key, value);
+			else {
+				keys.Add (key);
+				values.Add (value);
+			}
+		}
+		
+		public ICollection Keys 
+		{
+			get { return (got_hashed ? atts_hash.Keys : keys); }
+		}
+
+		private int CaseInsensitiveSearch (string key)
+		{
+			// Hope not to have many attributes when the tag is not a server tag...
+			for (int i = 0; i < keys.Count; i++){
+				if (0 == String.Compare ((string) keys [i], key, true))
+					return i;
+			}
+			return -1;
+		}
+		
+		public object this [object key]
+		{
+			get {
+				if (got_hashed)
+					return atts_hash [key];
+
+				int idx = CaseInsensitiveSearch ((string) key);
+				if (idx == -1)
+					return null;
+						
+				return values [idx];
+			}
+
+			set {
+				if (got_hashed)
+					atts_hash [key] = value;
+				else {
+					int idx = CaseInsensitiveSearch ((string) key);
+					keys [idx] = value;
+				}
+			}
+		}
+		
+		public int Count 
+		{
+			get { return (got_hashed ? atts_hash.Count : keys.Count);}
+		}
+
+		public bool IsDataBound (string att)
+		{
+			if (att == null || !got_hashed)
+				return false;
+
+			return (att.StartsWith ("<%#") && att.EndsWith ("%>"));
+		}
+		
+		public override string ToString ()
+		{
+			string ret = "";
+			string value;
+			foreach (string key in Keys){
+				value = (string) this [key];
+				value = value == null ? "" : value;
+				ret += key + "=" + value + " ";
+			}
+
+			return ret;
+		}
+	}
+
+	public class Tag : Element
+	{
+		protected string tag;
+		protected TagType tagType;
+		protected TagAttributes attributes;
+		protected bool self_closing;
+		protected bool hasDefaultID;
+		private static int ctrlNumber = 1;
+
+		internal Tag (Tag other) :
+			this (other.tag, other.attributes, other.self_closing)
+		{
+			this.tagType = other.tagType;
+		}
+
+		public Tag (string tag, TagAttributes attributes, bool self_closing) :
+			  base (ElementType.TAG)
+		{
+			if (tag == null)
+				throw new ArgumentNullException ();
+
+			this.tag = tag;
+			this.attributes = attributes;
+			this.tagType = TagType.NOTYET;
+			this.self_closing = self_closing;
+			this.hasDefaultID = false;
+		}
+		
+		public string TagID
+		{
+			get { return tag; }
+		}
+
+		public TagType TagType
+		{
+			get { return tagType; }
+		}
+
+		public bool SelfClosing
+		{
+			get { return self_closing; }
+		}
+
+		public TagAttributes Attributes
+		{
+			get { return attributes; }
+		}
+
+		public string PlainHtml
+		{
+			get {
+				StringBuilder plain = new StringBuilder ();
+				plain.Append ('<');
+				if (tagType == TagType.CLOSING)
+					plain.Append ('/');
+				plain.Append (tag);
+				if (attributes != null){
+					plain.Append (' ');
+					foreach (string key in attributes.Keys){
+						plain.Append (key);
+						if (attributes [key] != null){
+							plain.Append ("=\"");
+							plain.Append ((string) attributes [key]);
+							plain.Append ("\" ");
+						}
+					}
+				}
+				
+				if (self_closing)
+					plain.Append ('/');
+				plain.Append ('>');
+				return plain.ToString ();
+			}
+		}
+
+		public override string ToString ()
+		{
+			return TagID + " " + Attributes + " " + self_closing;
+		}
+
+		public bool HasDefaultID
+		{
+			get { return hasDefaultID; }
+		}
+		
+		protected void SetNewID ()
+		{
+			if (attributes == null)
+				attributes = new TagAttributes ();
+			attributes.Add ("ID", GetDefaultID ());
+			hasDefaultID = true;
+		}
+
+		public static string GetDefaultID ()
+		{
+			return "_control" + ctrlNumber++;
+		}
+	}
+
+	public class CloseTag : Tag
+	{
+		public CloseTag (string tag) : base (tag, null, false)
+		{
+			tagType = TagType.CLOSING;
+		}
+	}
+
+	public class Directive : Tag
+	{
+		private static Hashtable directivesHash;
+		private static string [] page_atts = {  "AspCompat", "AutoEventWireup ", "Buffer",
+							"ClassName", "ClientTarget", "CodePage",
+							"CompilerOptions", "ContentType", "Culture", "Debug",
+							"Description", "EnableSessionState", "EnableViewState",
+							"EnableViewStateMac", "ErrorPage", "Explicit",
+							"Inherits", "Language", "LCID", "ResponseEncoding",
+							"Src", "SmartNavigation", "Strict", "Trace",
+							"TraceMode", "Transaction", "UICulture",
+							"WarningLevel" };
+
+		private static string [] control_atts = { "AutoEventWireup", "ClassName", "CompilerOptions",
+							  "Debug", "Description", "EnableViewState",
+							  "Explicit", "Inherits", "Language", "Strict", "Src",
+							  "WarningLevel" };
+
+		private static string [] import_atts = { "namespace" };
+		private static string [] implements_atts = { "interface" };
+		private static string [] assembly_atts = { "name", "src" };
+		private static string [] register_atts = { "tagprefix", "tagname", "Namespace",
+							   "Src", "Assembly" };
+
+		private static string [] outputcache_atts = { "Duration", "Location", "VaryByControl", 
+							      "VaryByCustom", "VaryByHeader", "VaryByParam" };
+		private static string [] reference_atts = { "page", "control" };
+
+		static Directive ()
+		{
+			InitHash ();
+		}
+		
+		private static void InitHash ()
+		{
+			CaseInsensitiveHashCodeProvider provider = new CaseInsensitiveHashCodeProvider ();
+			CaseInsensitiveComparer comparer =  new CaseInsensitiveComparer ();
+
+			directivesHash = new Hashtable (provider, comparer); 
+
+			// Use Hashtable 'cause is O(1) in Contains (ArrayList is O(n))
+			Hashtable valid_attributes = new Hashtable (provider, comparer);
+			foreach (string att in page_atts) valid_attributes.Add (att, null);
+			directivesHash.Add ("PAGE", valid_attributes);
+
+			valid_attributes = new Hashtable (provider, comparer);
+			foreach (string att in control_atts) valid_attributes.Add (att, null);
+			directivesHash.Add ("CONTROL", valid_attributes);
+
+			valid_attributes = new Hashtable (provider, comparer);
+			foreach (string att in import_atts) valid_attributes.Add (att, null);
+			directivesHash.Add ("IMPORT", valid_attributes);
+
+			valid_attributes = new Hashtable (provider, comparer);
+			foreach (string att in implements_atts) valid_attributes.Add (att, null);
+			directivesHash.Add ("IMPLEMENTS", valid_attributes);
+
+			valid_attributes = new Hashtable (provider, comparer);
+			foreach (string att in register_atts) valid_attributes.Add (att, null);
+			directivesHash.Add ("REGISTER", valid_attributes);
+
+			valid_attributes = new Hashtable (provider, comparer);
+			foreach (string att in assembly_atts) valid_attributes.Add (att, null);
+			directivesHash.Add ("ASSEMBLY", valid_attributes);
+
+			valid_attributes = new Hashtable (provider, comparer);
+			foreach (string att in outputcache_atts) valid_attributes.Add (att, null);
+			directivesHash.Add ("OUTPUTCACHE", valid_attributes);
+
+			valid_attributes = new Hashtable (provider, comparer);
+			foreach (string att in reference_atts) valid_attributes.Add (att, null);
+			directivesHash.Add ("REFERENCE", valid_attributes);
+		}
+		
+		public Directive (string tag, TagAttributes attributes) :
+		       base (tag, attributes, true)
+		{
+			CheckAttributes ();
+			tagType = TagType.DIRECTIVE;
+		}
+
+		private void CheckAttributes ()
+		{
+			Hashtable atts;
+			if (!(directivesHash [tag] is Hashtable))
+				throw new ApplicationException ("Unknown directive: " + tag);
+
+			atts = (Hashtable) directivesHash [tag];
+			foreach (string att in attributes.Keys){
+				if (!atts.Contains (att))
+					throw new ApplicationException ("Attribute " + att +
+									" not valid for tag " + tag);
+			}
+		}
+
+		public static bool IsDirectiveID (string id)
+		{
+			return directivesHash.Contains (id);
+		}
+		
+		public override string ToString ()
+		{
+			return "Directive: " + tag;
+		}
+	}
+
+	public class ServerObjectTag : Tag
+	{
+		public ServerObjectTag (Tag tag) :
+			base (tag.TagID, tag.Attributes, tag.SelfClosing) 
+		{
+			tagType = TagType.SERVEROBJECT;
+			if (!attributes.IsRunAtServer ())
+				throw new ApplicationException ("<object> without runat=server");
+			
+			if (attributes.Count != 3 || !SelfClosing || ObjectID == null || ObjectClass == null)
+				throw new ApplicationException ("Incorrect syntax: <object id=\"name\" " + 
+								"class=\"full.class.name\" runat=\"server\" />");
+		}
+
+		public string ObjectID
+		{
+			get { return (string) attributes ["id"]; }
+		}
+			
+		public string ObjectClass
+		{
+			get { return (string) attributes ["class"]; }
+		}
+	}
+
+	public class HtmlControlTag : Tag
+	{
+		private Type control_type;
+		private bool is_container;
+
+		private static Hashtable controls;
+		private static Hashtable inputTypes;
+
+		private static void InitHash ()
+		{
+			controls = new Hashtable (new CaseInsensitiveHashCodeProvider (),
+						  new CaseInsensitiveComparer ()); 
+
+			controls.Add ("A", typeof (HtmlAnchor));
+			controls.Add ("BUTTON", typeof (HtmlButton));
+			controls.Add ("FORM", typeof (HtmlForm));
+			controls.Add ("IMG", typeof (HtmlImage));
+			controls.Add ("INPUT", "INPUT");
+			controls.Add ("SELECT", typeof (HtmlSelect));
+			controls.Add ("TABLE", typeof (HtmlTable));
+			controls.Add ("TD", typeof (HtmlTableCell));
+			controls.Add ("TH", typeof (HtmlTableCell));
+			controls.Add ("TR", typeof (HtmlTableRow));
+			controls.Add ("TEXTAREA", typeof (HtmlTextArea));
+
+			inputTypes = new Hashtable (new CaseInsensitiveHashCodeProvider (),
+						    new CaseInsensitiveComparer ());
+
+			inputTypes.Add ("BUTTON", typeof (HtmlInputButton));
+			inputTypes.Add ("SUBMIT", typeof (HtmlInputButton));
+			inputTypes.Add ("RESET", typeof (HtmlInputButton));
+			inputTypes.Add ("CHECKBOX", typeof (HtmlInputCheckBox));
+			inputTypes.Add ("FILE", typeof (HtmlInputFile));
+			inputTypes.Add ("HIDDEN", typeof (HtmlInputHidden));
+			inputTypes.Add ("IMAGE", typeof (HtmlInputImage));
+			inputTypes.Add ("RADIO", typeof (HtmlInputRadioButton));
+			inputTypes.Add ("TEXT", typeof (HtmlInputText));
+			inputTypes.Add ("PASSWORD", typeof (HtmlInputText));
+		}
+		
+		static HtmlControlTag ()
+		{
+			InitHash ();
+		}
+		
+		public HtmlControlTag (string tag, TagAttributes attributes, bool self_closing) : 
+			base (tag, attributes, self_closing) 
+		{
+			SetData ();
+			if (attributes == null || attributes ["ID"] == null)
+				SetNewID ();
+		}
+
+		public HtmlControlTag (Tag source_tag) :
+			this (source_tag.TagID, source_tag.Attributes, source_tag.SelfClosing) 
+		{
+		}
+
+		private void SetData ()
+		{
+			tagType = TagType.HTMLCONTROL; 
+			if (!(controls [tag] is string)){
+				control_type = (Type) controls [tag];
+				if (control_type == null)
+					control_type = typeof (HtmlGenericControl);
+				is_container = (0 != String.Compare (tag, "img", true));
+			} else {
+				string type_value = (string) attributes ["TYPE"];
+				if (type_value== null)
+					throw new ArgumentException ("INPUT tag without TYPE attribute!!!");
+
+				control_type = (Type) inputTypes [type_value];
+				//TODO: what does MS with this one?
+				if (control_type == null)
+					throw new ArgumentException ("Unknown input type -> " + type_value);
+				is_container = false;
+				self_closing = true; // All <input ...> are self-closing
+			}
+		}
+
+		public Type ControlType
+		{
+			get { return control_type; }
+		}
+
+		public string ControlID
+		{
+			get { return (string) attributes ["ID"]; }
+		}
+
+		public bool IsContainer
+		{
+			get { return is_container; }
+		}
+
+		public override string ToString ()
+		{
+			string ret = "HtmlControlTag: " + tag + " Name: " + ControlID + "Type:" +
+				     control_type.ToString () + "\n\tAttributes:\n";
+
+			foreach (string key in attributes.Keys){
+				ret += "\t" + key + "=" + attributes [key];
+			}
+			return ret;
+		}
+	}
+
+	public enum ChildrenKind
+	{
+		NONE,
+		/* 
+		 * Children must be ASP.NET server controls. Literal text is passed as LiteralControl.
+		 * Child controls and text are added using AddParsedSubObject ().
+		 */
+		CONTROLS, 
+		/*
+		 * Children must correspond to properties of the parent control. No literal text allowed.
+		 */
+		PROPERTIES,
+		/*
+		 * Special case used inside <columns>...</columns>
+		 * Only allow DataGridColumn and derived classes.
+		 */
+		DBCOLUMNS,
+		/*
+		 * Special case for list controls (ListBox, DropDownList...)
+		 */
+		LISTITEM,
+		/* For HtmlSelect children. They are <option> tags that must
+		 * be treated as ListItem
+		 */
+		OPTION
+	}
+
+	// TODO: support for ControlBuilderAttribute that may be used in custom controls
+	public class AspComponent : Tag
+	{
+		private Type type;
+		private string alias;
+		private string control_type;
+		private bool is_close_tag;
+		private bool allow_children;
+		private ChildrenKind children_kind;
+		private string defaultPropertyName;
+
+		private ChildrenKind GuessChildrenKind (Type type)
+		{
+			object [] custom_atts = type.GetCustomAttributes (true);
+			foreach (object custom_att in custom_atts){
+				if (custom_att is ParseChildrenAttribute){
+					/* FIXME
+					 * When adding full support for custom controls, we gotta
+					 * bear in mind the pca.DefaultProperty value
+					 */
+					ParseChildrenAttribute pca = custom_att as ParseChildrenAttribute;
+					defaultPropertyName = pca.DefaultProperty;
+					/* this property will be true for all controls derived from
+					 * WebControls. */
+					if (pca.ChildrenAsProperties == false)
+						return ChildrenKind.CONTROLS;
+					else if (defaultPropertyName == "")
+						return ChildrenKind.PROPERTIES;
+					else
+						return ChildrenKind.LISTITEM;
+				}
+			}
+
+			return ChildrenKind.NONE;
+		}
+
+		private static bool GuessAllowChildren (Type type)
+		{
+			PropertyInfo controls = type.GetProperty ("Controls");
+			if (controls == null)
+				return false;
+			MethodInfo getm = controls.GetGetMethod ();
+			object control_instance = Activator.CreateInstance (type);
+			object control_collection = getm.Invoke (control_instance, null);
+			return (!(control_collection is System.Web.UI.EmptyControlCollection));
+		}
+		
+		public AspComponent (Tag input_tag, Type type) :
+			base (input_tag)
+		{
+			tagType = TagType.SERVERCONTROL;
+			this.is_close_tag = input_tag is CloseTag;
+			this.type = type;
+			this.defaultPropertyName = "";
+			this.allow_children = GuessAllowChildren (type);
+			if (input_tag.SelfClosing)
+				this.children_kind = ChildrenKind.NONE;
+			else if (type == typeof (System.Web.UI.WebControls.DataGridColumn) ||
+				 type.IsSubclassOf (typeof (System.Web.UI.WebControls.DataGridColumn)))
+				this.children_kind = ChildrenKind.PROPERTIES;
+			else if (type == typeof (System.Web.UI.WebControls.ListItem))
+				this.children_kind = ChildrenKind.CONTROLS;
+			else
+				this.children_kind = GuessChildrenKind (type);
+
+			int pos = input_tag.TagID.IndexOf (':');
+			alias = tag.Substring (0, pos);
+			control_type = tag.Substring (pos + 1);
+			if (attributes == null || attributes ["ID"] == null)
+				SetNewID ();
+		}
+
+		public Type ComponentType
+		{
+			get { return type; }
+		}
+		
+		public string ControlID
+		{
+			get { return (string) attributes ["ID"]; }
+		}
+
+		public bool IsCloseTag
+		{
+			get { return is_close_tag; }
+		}
+
+		public bool AllowChildren
+		{
+			get { return allow_children; }
+		}
+
+		public ChildrenKind ChildrenKind
+		{
+			get { return children_kind; }	
+		}
+
+		public string DefaultPropertyName
+		{
+			get { return defaultPropertyName; }	
+		}
+			
+			
+		public override string ToString ()
+		{
+			return type.ToString () + " Alias: " + alias + " ID: " + (string) attributes ["id"];
+		}
+	}
+
+	public class PropertyTag : Tag
+	{
+		private Type type;
+		private string name;
+
+		public PropertyTag (Tag tag, Type type, string name)
+			: base (tag)
+		{
+			tagType = TagType.PROPERTYTAG;
+			SetNewID ();
+			this.name = name;
+			this.type = type;
+		}
+
+		public Type PropertyType
+		{
+			get { return type; }
+		}
+
+		public string PropertyID
+		{
+			get { return (string) attributes ["ID"]; }
+		}
+
+		public string PropertyName
+		{
+			get { return name; }
+		}
+	}
+
+	public class CodeRenderTag : Tag
+	{
+		private string code;
+		private bool isVarName;
+
+		public CodeRenderTag (bool isVarName, string code) : base ("", null, false)
+		{
+			tagType = TagType.CODERENDER;
+			this.isVarName = isVarName;
+			this.code = code.Trim ();
+		}
+
+		public string Code
+		{
+			get { return code; }
+		}
+
+		public bool IsVarName
+		{
+			get { return isVarName; }
+		}
+
+		public string AsText
+		{
+			get { return "<%" + (IsVarName ? "=" : "") + Code + "%>"; }
+		}	
+	}
+
+	public class DataBindingTag : Tag
+	{
+		private string data;
+
+		public DataBindingTag (string data) : base ("", null, false)
+		{
+			tagType = TagType.DATABINDING;
+			this.data = data.Trim ();
+		}
+
+		public string Data
+		{
+			get { return data; }
+		}
+
+		public string AsText
+		{
+			get { return "<%#" + Data + "%>"; }
+		}	
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
new file mode 100644
index 00000000000..0affbd98576
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Compilation/AspGenerator.cs
@@ -0,0 +1,1726 @@
+//
+// System.Web.Compilation.AspGenerator
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Collections;
+using System.ComponentModel;
+using System.Drawing;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Web.UI;
+using System.Web.UI.HtmlControls;
+using System.Web.UI.WebControls;
+
+namespace System.Web.Compilation
+{
+
+class ControlStack
+{
+	private Stack controls;
+	private ControlStackData top;
+	private bool space_between_tags;
+	private bool sbt_valid;
+
+	class ControlStackData 
+	{
+		public Type controlType;
+		public string controlID;
+		public string tagID;
+		public ChildrenKind childKind;
+		public string defaultPropertyName;
+		public int childrenNumber;
+		public Type container;
+		public StringBuilder dataBindFunction;
+		public StringBuilder codeRenderFunction;
+		public bool useCodeRender;
+
+		public ControlStackData (Type controlType,
+					 string controlID,
+					 string tagID,
+					 ChildrenKind childKind,
+					 string defaultPropertyName,
+					 Type container)
+		{
+			this.controlType = controlType;
+			this.controlID = controlID;
+			this.tagID = tagID;
+			this.childKind = childKind;
+			this.defaultPropertyName = defaultPropertyName;
+			this.container = container;
+			childrenNumber = 0;
+		}
+
+		public override string ToString ()
+		{
+			return controlType + " " + controlID + " " + tagID + " " + childKind + " " + childrenNumber;
+		}
+	}
+	
+	public ControlStack ()
+	{
+		controls = new Stack ();
+	}
+
+	private Type GetContainerType (Type type)
+	{
+		if (type != typeof (System.Web.UI.Control) &&
+		    !type.IsSubclassOf (typeof (System.Web.UI.Control)))
+			return null;
+		
+		Type container_type;
+		if (type == typeof (System.Web.UI.WebControls.DataList))
+			container_type = typeof (System.Web.UI.WebControls.DataListItem);
+		else if (type == typeof (System.Web.UI.WebControls.DataGrid))
+			container_type = typeof (System.Web.UI.WebControls.DataGridItem);
+		else if (type == typeof (System.Web.UI.WebControls.Repeater))
+			container_type = typeof (System.Web.UI.WebControls.RepeaterItem);
+		else 
+			container_type = type;
+
+		return container_type;
+	}
+
+	public void Push (Type controlType,
+			  string controlID,
+			  string tagID,
+			  ChildrenKind childKind,
+			  string defaultPropertyName)
+	{
+		Type container_type = null;
+		if (controlType != null){
+			AddChild ();
+			container_type = GetContainerType (controlType);
+			if (container_type == null)
+				container_type = this.Container;
+		}
+
+		top = new ControlStackData (controlType,
+					    controlID,
+					    tagID,
+					    childKind,
+					    defaultPropertyName,
+					    container_type);
+		sbt_valid = false;
+		controls.Push (top);
+	}
+
+	public void Pop ()
+	{
+		controls.Pop ();
+		if (controls.Count != 0)
+			top = (ControlStackData) controls.Peek ();
+		sbt_valid = false;
+	}
+
+	public Type PeekType ()
+	{
+		return top.controlType;
+	}
+
+	public string PeekControlID ()
+	{
+		return top.controlID;
+	}
+
+	public string PeekTagID ()
+	{
+		return top.tagID;
+	}
+
+	public ChildrenKind PeekChildKind ()
+	{
+		return top.childKind;
+	}
+
+	public string PeekDefaultPropertyName ()
+	{
+		return top.defaultPropertyName;
+	}
+
+	public void AddChild ()
+	{
+		if (top != null)
+			top.childrenNumber++;
+	}
+
+	public bool HasDataBindFunction ()
+	{
+		if (top.dataBindFunction == null || top.dataBindFunction.Length == 0)
+			return false;
+		return true;
+	}
+	
+	public bool UseCodeRender
+	{
+		get {
+			if (top.codeRenderFunction == null || top.codeRenderFunction.Length == 0)
+				return false;
+			return top.useCodeRender;
+		}
+
+		set { top.useCodeRender= value; }
+	}
+	
+	public bool SpaceBetweenTags
+	{
+		get {
+			if (!sbt_valid){
+				sbt_valid = true;
+				Type type = top.controlType;
+				if (type.Namespace == "System.Web.UI.WebControls")
+					space_between_tags = true;
+				else if (type.IsSubclassOf (typeof (System.Web.UI.WebControls.WebControl)))
+					space_between_tags = true;
+				else if (type == typeof (System.Web.UI.HtmlControls.HtmlSelect))
+					space_between_tags = true;
+				else
+					space_between_tags = false;
+			}
+			return space_between_tags;
+		}
+	}
+	
+	public Type Container
+	{
+		get { return top.container; }
+	}
+	
+	public StringBuilder DataBindFunction
+	{
+		get {
+			if (top.dataBindFunction == null)
+				top.dataBindFunction = new StringBuilder ();
+			return top.dataBindFunction;
+		}
+	}
+
+	public StringBuilder CodeRenderFunction
+	{
+		get {
+			if (top.codeRenderFunction == null)
+				top.codeRenderFunction = new StringBuilder ();
+			return top.codeRenderFunction;
+		}
+	}
+
+	public int ChildIndex
+	{
+		get { return top.childrenNumber - 1; }
+	}
+	
+	public int Count
+	{
+		get { return controls.Count; }
+	}
+
+	public override string ToString ()
+	{
+		return top.ToString () + " " + top.useCodeRender;
+	}
+		
+}
+
+class ArrayListWrapper
+{
+	private ArrayList list;
+	private int index;
+
+	public ArrayListWrapper (ArrayList list)
+	{
+		this.list = list;
+		index = -1;
+	}
+
+	private void CheckIndex ()
+	{
+		if (index == -1 || index == list.Count)
+			throw new InvalidOperationException ();
+	}
+			
+	public object Current
+	{
+		get {
+			CheckIndex ();
+			return list [index];
+		}
+
+		set {
+			CheckIndex ();
+			list [index] = value;
+		}
+	}
+
+	public bool MoveNext ()
+	{
+		if (index < list.Count)
+			index++;
+
+		return index < list.Count;
+	}
+}
+
+public class AspGenerator
+{
+	private object [] parts;
+	private ArrayListWrapper elements;
+	private StringBuilder buildOptions;
+	private StringBuilder prolog;
+	private StringBuilder declarations;
+	private StringBuilder script;
+	private StringBuilder constructor;
+	private StringBuilder init_funcs;
+	private StringBuilder epilog;
+	private StringBuilder current_function;
+	private Stack functions;
+	private ControlStack controls;
+	private bool parse_ok;
+	private bool has_form_tag;
+	private AspComponentFoundry aspFoundry;
+
+	private string classDecl;
+	private string className;
+	private string interfaces;
+	private string parent;
+	private string fullPath;
+	private static string enableSessionStateLiteral =  ", System.Web.SessionState.IRequiresSessionState";
+
+	enum UserControlResult
+	{
+		OK = 0,
+		FileNotFound = 1,
+		XspFailed = 2,
+		CompilationFailed = 3
+	}
+
+	public AspGenerator (string pathToFile, ArrayList elements)
+	{
+		if (elements == null)
+			throw new ArgumentNullException ();
+
+		this.elements = new ArrayListWrapper (elements);
+		string filename = Path.GetFileName (pathToFile);
+		this.className = filename.Replace ('.', '_'); // Overridden by @ Page classname
+		this.className = className.Replace ('-', '_'); 
+		this.className = className.Replace (' ', '_');
+		this.fullPath = Path.GetFullPath (pathToFile);
+		/*
+		if (IsUserControl) {
+			this.parent = "System.Web.UI.UserControl"; // Overriden by @ Control Inherits
+			this.interfaces = "";
+		} else {
+			this.parent = "System.Web.UI.Page"; // Overriden by @ Page Inherits
+			this.interfaces = enableSessionStateLiteral;
+		}
+		//
+		//*/
+		this.has_form_tag = false;
+		Init ();
+	}
+
+	public string BaseType
+	{
+		get {
+			return parent;
+		}
+
+		set {
+			parent = value;
+		}
+	}
+
+	public bool IsUserControl
+	{
+		get {
+			return (BaseType == typeof (UserControl).ToString ());
+		}
+	}
+	
+	public string Interfaces 
+	{
+		get {
+			return interfaces;
+		}
+	}
+
+	public void AddInterface (string iface)
+	{
+		if (interfaces == "") {
+			interfaces = iface;
+		} else {
+			string s = ", " + iface;
+			if (interfaces.IndexOf (s) == -1)
+				interfaces += s;
+		}
+	}
+
+	private AspComponentFoundry Foundry
+	{
+		get {
+			if (aspFoundry == null)
+				aspFoundry = new AspComponentFoundry ();
+
+			return aspFoundry;
+		}
+	}
+
+	private void Init ()
+	{
+		controls = new ControlStack ();
+		controls.Push (typeof (System.Web.UI.Control), "Root", null, ChildrenKind.CONTROLS, null);
+		prolog = new StringBuilder ();
+		declarations = new StringBuilder ();
+		script = new StringBuilder ();
+		constructor = new StringBuilder ();
+		init_funcs = new StringBuilder ();
+		epilog = new StringBuilder ();
+		buildOptions = new StringBuilder ();
+
+		current_function = new StringBuilder ();
+		functions = new Stack ();
+		functions.Push (current_function);
+
+		parts = new Object [7];
+		parts [0] = buildOptions;
+		parts [1] = prolog;
+		parts [2] = declarations;
+		parts [3] = script;
+		parts [4] = constructor;
+		parts [5] = init_funcs;
+		parts [6] = epilog;
+
+		prolog.Append ("namespace ASP {\n" +
+			      "\tusing System;\n" + 
+			      "\tusing System.Collections;\n" + 
+			      "\tusing System.Collections.Specialized;\n" + 
+			      "\tusing System.Configuration;\n" + 
+			      "\tusing System.IO;\n" + 
+			      "\tusing System.Text;\n" + 
+			      "\tusing System.Text.RegularExpressions;\n" + 
+			      "\tusing System.Web;\n" + 
+			      "\tusing System.Web.Caching;\n" + 
+			      "\tusing System.Web.Security;\n" + 
+			      "\tusing System.Web.SessionState;\n" + 
+			      "\tusing System.Web.UI;\n" + 
+			      "\tusing System.Web.UI.WebControls;\n" + 
+			      "\tusing System.Web.UI.HtmlControls;\n");
+
+		declarations.Append ("\t\tprivate static int __autoHandlers;\n");
+
+		current_function.Append ("\t\tprivate void __BuildControlTree (System.Web.UI.Control __ctrl)\n\t\t{\n");
+		if (!IsUserControl)
+			current_function.Append ("\t\t\tSystem.Web.UI.IParserAccessor __parser = " + 
+						 "(System.Web.UI.IParserAccessor) __ctrl;\n\n");
+		else
+			controls.UseCodeRender = true;
+	}
+
+	public StringReader GetCode ()
+	{
+		if (!parse_ok)
+			throw new ApplicationException ("You gotta call ProcessElements () first!");
+
+		StringBuilder code = new StringBuilder ();
+		for (int i = 0; i < parts.Length; i++)
+			code.Append ((StringBuilder) parts [i]);
+
+		return new StringReader (code.ToString ());
+	}
+
+	public void Print ()
+	{
+		if (!parse_ok){
+			Console.WriteLine ("//Warning!!!: Elements not correctly parsed.");
+		}
+
+		Console.Write (GetCode ().ReadToEnd ());
+	}
+
+	// Regex.Escape () make some illegal escape sequences for a C# source.
+	private string Escape (string input)
+	{
+		string output = input.Replace ("\\", "\\\\");
+		output = output.Replace ("\"", "\\\"");
+		output = output.Replace ("\t", "\\t");
+		output = output.Replace ("\r", "\\r");
+		output = output.Replace ("\n", "\\n");
+		output = output.Replace ("\n", "\\n");
+		return output;
+	}
+	
+	private void PageDirective (TagAttributes att)
+	{
+		if (att ["ClassName"] != null){
+			this.className = (string) att ["ClassName"];
+		}
+
+		if (att ["EnableSessionState"] != null){
+			string est = (string) att ["EnableSessionState"];
+			if (0 == String.Compare (est, "false", true))
+				interfaces = interfaces.Replace (enableSessionStateLiteral, "");
+			else if (0 != String.Compare (est, "true", true))
+				throw new ApplicationException ("EnableSessionState in Page directive not set to " +
+								"a correct value: " + est);
+		}
+
+		/*
+		if (att ["Inherits"] != null){
+			parent = (string) att ["Inherits"];
+			string source_file = att ["Src"] as string;
+			if (source_file != null)
+				buildOptions.AppendFormat ("//<compileandreference src=\"{0}\"/>\n", source_file);
+			else
+				buildOptions.AppendFormat ("//<reference dll=\"{0}\"/>\n", parent);
+
+		}
+		*/
+
+		if (att ["CompilerOptions"] != null){
+			string compilerOptions = (string) att ["CompilerOptions"];
+			buildOptions.AppendFormat ("//<compileroptions options=\"{0}\"/>\n", compilerOptions);
+		}
+
+		//FIXME: add support for more attributes.
+	}
+
+	private void RegisterDirective (TagAttributes att)
+	{
+		string tag_prefix = (string) (att ["tagprefix"] == null ?  "" : att ["tagprefix"]);
+		string name_space = (string) (att ["namespace"] == null ?  "" : att ["namespace"]);
+		string assembly_name = (string) (att ["assembly"] == null ?  "" : att ["assembly"]);
+		string tag_name =  (string) (att ["tagname"] == null ?  "" : att ["tagname"]);
+		string src = (string) (att ["src"] == null ?  "" : att ["src"]);
+
+		if (tag_prefix != "" && name_space != "" && assembly_name != ""){
+			if (tag_name != "" || src != "")
+				throw new ApplicationException ("Invalid attributes for @ Register: " +
+								att.ToString ());
+			prolog.AppendFormat ("\tusing {0};\n", name_space);
+			string dll = "output" + Path.DirectorySeparatorChar + assembly_name + ".dll";
+			Foundry.RegisterFoundry (tag_prefix, dll, name_space);
+			buildOptions.AppendFormat ("//<reference dll=\"{0}\"/>\n", dll);
+			return;
+		}
+
+		if (tag_prefix != "" && tag_name != "" && src != ""){
+			if (name_space != "" && assembly_name != "")
+				throw new ApplicationException ("Invalid attributes for @ Register: " +
+								att.ToString ());
+			
+			if (!src.EndsWith (".ascx"))
+				throw new ApplicationException ("Source file extension for controls " + 
+								"must be .ascx");
+
+			string pathToFile = Path.GetDirectoryName (src);
+			if (pathToFile == "") {
+				pathToFile = Path.GetDirectoryName (fullPath);
+			} else if (!Path.IsPathRooted (pathToFile)) {
+				pathToFile = Path.Combine  (Path.GetDirectoryName (fullPath), pathToFile);
+			}
+
+			string srcLocation = pathToFile + Path.DirectorySeparatorChar + Path.GetFileName (src);
+			UserControlData data = GenerateUserControl (srcLocation);
+			switch (data.result) {
+			case UserControlResult.OK:
+				prolog.AppendFormat ("\tusing {0};\n", "ASP");
+				string dll = "output" + Path.DirectorySeparatorChar + data.assemblyName + ".dll";
+				Foundry.RegisterFoundry (tag_prefix, data.assemblyName, "ASP", data.className);
+				buildOptions.AppendFormat ("//<reference dll=\"{0}\"/>\n", data.assemblyName);
+				break;
+			case UserControlResult.FileNotFound:
+				throw new ApplicationException ("File '" + src + "' not found.");
+			case UserControlResult.XspFailed:
+				//TODO
+				throw new NotImplementedException ();
+			case UserControlResult.CompilationFailed:
+				//TODO: should say where the generated .cs file is for the server to
+				//show the source and the compiler error
+				throw new NotImplementedException ();
+			}
+			return;
+		}
+
+		throw new ApplicationException ("Invalid combination of attributes in " +
+						"@ Register: " + att.ToString ());
+	}
+
+	private void ProcessDirective ()
+	{
+		Directive directive = (Directive) elements.Current;
+		TagAttributes att = directive.Attributes;
+		if (att == null)
+			return;
+
+		string id = directive.TagID.ToUpper ();
+		switch (id){
+		case "PAGE":
+		case "CONTROL":
+			if (IsUserControl && id != "CONTROL")
+				throw new ApplicationException ("@Page not allowed if --control specified.");
+			else if (!IsUserControl && id != "PAGE")
+				throw new ApplicationException ("@Control not allowed here.");
+			PageDirective (att);
+			break;
+		case "IMPORT":
+			foreach (string key in att.Keys){
+				if (0 == String.Compare (key, "NAMESPACE", true)){
+					string _using = "using " + (string) att [key] + ";";
+					if (prolog.ToString ().IndexOf (_using) == -1)
+						prolog.AppendFormat ("\tusing {0};\n", (string) att [key]);
+					break;
+				}
+			}
+			break;
+		case "IMPLEMENTS":
+			string iface = (string) att ["interface"];
+			interfaces += ", " + iface;
+			break;
+		case "REGISTER":
+			RegisterDirective (att);
+			break;
+		}
+	}
+
+	private void ProcessPlainText ()
+	{
+		PlainText asis = (PlainText) elements.Current;
+		string trimmed = asis.Text.Trim ();
+		if (trimmed == "" && controls.SpaceBetweenTags == true)
+			return;
+
+		if (trimmed != "" && controls.PeekChildKind () != ChildrenKind.CONTROLS){
+			string tag_id = controls.PeekTagID ();
+			throw new ApplicationException ("Literal content not allowed for " + tag_id);
+		}
+		
+		string escaped_text = Escape (asis.Text);
+		current_function.AppendFormat ("\t\t\t__parser.AddParsedSubObject (" + 
+					       "new System.Web.UI.LiteralControl (\"{0}\"));\n",
+					       escaped_text);
+		StringBuilder codeRenderFunction = controls.CodeRenderFunction;
+		codeRenderFunction.AppendFormat ("\t\t\t__output.Write (\"{0}\");\n", escaped_text);
+	}
+
+	private string EnumValueNameToString (Type enum_type, string value_name)
+	{
+		if (value_name.EndsWith ("*"))
+			throw new ApplicationException ("Invalid property value: '" + value_name + 
+							". It must be a valid " + enum_type.ToString () + " value.");
+
+		MemberInfo [] nested_types = enum_type.FindMembers (MemberTypes.Field, 
+								    BindingFlags.Public | BindingFlags.Static,
+								    Type.FilterNameIgnoreCase,
+								    value_name);
+
+		if (nested_types.Length == 0)
+			throw new ApplicationException ("Value " + value_name + " not found in enumeration " +
+							enum_type.ToString ());
+		if (nested_types.Length > 1)
+			throw new ApplicationException ("Value " + value_name + " found " + 
+							nested_types.Length + " in enumeration " +
+							enum_type.ToString ());
+
+		return enum_type.ToString () + "." + nested_types [0].Name;
+	}
+	
+	private void NewControlFunction (string tag_id,
+					 string control_id,
+					 Type control_type,
+					 ChildrenKind children_kind,
+					 string defaultPropertyName)
+	{
+		ChildrenKind prev_children_kind = controls.PeekChildKind ();
+		if (prev_children_kind == ChildrenKind.NONE || 
+		    prev_children_kind == ChildrenKind.PROPERTIES){
+			string prev_tag_id = controls.PeekTagID ();
+			throw new ApplicationException ("Child controls not allowed for " + prev_tag_id);
+		}
+
+		if (prev_children_kind == ChildrenKind.DBCOLUMNS &&
+		    control_type != typeof (System.Web.UI.WebControls.DataGridColumn) &&
+		    !control_type.IsSubclassOf (typeof (System.Web.UI.WebControls.DataGridColumn)))
+			throw new ApplicationException ("Inside " + controls.PeekTagID () + " only " + 
+							"System.Web.UI.WebControls.DataGridColum " + 
+							"objects are allowed");
+		else if (prev_children_kind == ChildrenKind.LISTITEM &&
+			 control_type != typeof (System.Web.UI.WebControls.ListItem))
+			throw new ApplicationException ("Inside " + controls.PeekTagID () + " only " + 
+							"System.Web.UI.WebControls.ListItem " + 
+							"objects are allowed");
+	
+					
+		StringBuilder func_code = new StringBuilder ();
+		current_function = func_code;
+		if (0 == String.Compare (tag_id, "form", true)){
+			if (has_form_tag)
+				throw new ApplicationException ("Only one form server tag allowed.");
+			has_form_tag = true;
+		}
+
+		controls.Push (control_type, control_id, tag_id, children_kind, defaultPropertyName);
+		bool is_generic = control_type ==  typeof (System.Web.UI.HtmlControls.HtmlGenericControl);
+		functions.Push (current_function);
+		if (control_type != typeof (System.Web.UI.WebControls.ListItem))
+			current_function.AppendFormat ("\t\tprivate System.Web.UI.Control __BuildControl_" +
+							"{0} ()\n\t\t{{\n\t\t\t{1} __ctrl;\n\n\t\t\t__ctrl" +
+							" = new {1} ({2});\n\t\t\tthis.{0} = __ctrl;\n",
+							control_id, control_type,
+							(is_generic? "\"" + tag_id + "\"" : ""));
+		else
+			current_function.AppendFormat ("\t\tprivate void __BuildControl_{0} ()\n\t\t{{" +
+							"\n\t\t\t{1} __ctrl;\n\t\t\t__ctrl = new {1} ();" +
+							"\n\t\t\tthis.{0} = __ctrl;\n",
+							control_id, control_type);
+
+		if (children_kind == ChildrenKind.CONTROLS || children_kind == ChildrenKind.OPTION)
+			current_function.Append ("\t\t\tSystem.Web.UI.IParserAccessor __parser = " + 
+						 "(System.Web.UI.IParserAccessor) __ctrl;\n");
+	}
+	
+	private void DataBoundProperty (string varName, string value)
+	{
+		if (value == "")
+			throw new ApplicationException ("Empty data binding tag.");
+
+		string control_id = controls.PeekControlID ();
+		string control_type_string = controls.PeekType ().ToString ();
+		StringBuilder db_function = controls.DataBindFunction;
+		string container = "System.Web.UI.Control";
+		if (db_function.Length == 0)
+			db_function.AppendFormat ("\t\tpublic void __DataBind_{0} (object sender, " + 
+						  "System.EventArgs e) {{\n" +
+						  "\t\t\t{1} Container;\n" +
+						  "\t\t\t{2} target;\n" +
+						  "\t\t\ttarget = ({2}) sender;\n" +
+						  "\t\t\tContainer = ({1}) target.BindingContainer;\n",
+						  control_id, container, control_type_string);
+
+		/* Removes '<%#' and '%>' */
+		string real_value = value.Remove (0,3);
+		real_value = real_value.Remove (real_value.Length - 2, 2);
+		real_value = real_value.Trim ();
+
+		db_function.AppendFormat ("\t\t\ttarget.{0} = System.Convert.ToString ({1});\n",
+					  varName, real_value);
+	}
+
+	/*
+	 * Returns true if it generates some code for the specified property
+	 */
+	private void AddPropertyCode (Type prop_type, string var_name, string att, bool isDataBound)
+	{
+		/* FIXME: should i check for this or let the compiler fail?
+		 * if (!prop.CanWrite)
+		 *    ....
+		 */
+		if (prop_type == typeof (string)){
+			if (att == null)
+				throw new ApplicationException ("null value for attribute " + var_name );
+
+			if (isDataBound)
+				DataBoundProperty (var_name, att);
+			else
+				current_function.AppendFormat ("\t\t\t__ctrl.{0} = \"{1}\";\n", var_name,
+								Escape (att)); // FIXME: really Escape this?
+				
+		} 
+		else if (prop_type.IsEnum){
+			if (att == null)
+				throw new ApplicationException ("null value for attribute " + var_name );
+
+			string enum_value = EnumValueNameToString (prop_type, att);
+
+			current_function.AppendFormat ("\t\t\t__ctrl.{0} = {1};\n", var_name, enum_value);
+		} 
+		else if (prop_type == typeof (bool)){
+			string value;
+			if (att == null)
+				value = "true"; //FIXME: is this ok for non Style properties?
+			else if (0 == String.Compare (att, "true", true))
+				value = "true";
+			else if (0 == String.Compare (att, "false", true))
+				value = "false";
+			else
+				throw new ApplicationException ("Value '" + att  + "' is not a valid boolean.");
+
+			current_function.AppendFormat ("\t\t\t__ctrl.{0} = {1};\n", var_name, value);
+		}
+		else if (prop_type == typeof (System.Web.UI.WebControls.Unit)){
+			 //FIXME: should use the culture specified in Page
+			try {
+				Unit value = Unit.Parse (att, System.Globalization.CultureInfo.InvariantCulture);
+			} catch (Exception) {
+				throw new ApplicationException ("'" + att + "' cannot be parsed as a unit.");
+			}
+			current_function.AppendFormat ("\t\t\t__ctrl.{0} = " + 
+							"System.Web.UI.WebControls.Unit.Parse (\"{1}\", " + 
+							"System.Globalization.CultureInfo.InvariantCulture);\n", 
+							var_name, att);
+		}
+		else if (prop_type == typeof (System.Web.UI.WebControls.FontUnit)){
+			 //FIXME: should use the culture specified in Page
+			try {
+				FontUnit value = FontUnit.Parse (att, System.Globalization.CultureInfo.InvariantCulture);
+			} catch (Exception) {
+				throw new ApplicationException ("'" + att + "' cannot be parsed as a unit.");
+			}
+			current_function.AppendFormat ("\t\t\t__ctrl.{0} = " + 
+							"System.Web.UI.WebControls.FontUnit.Parse (\"{1}\", " + 
+							"System.Globalization.CultureInfo.InvariantCulture);\n", 
+							var_name, att);
+		}
+		else if (prop_type == typeof (Int16) ||
+			 prop_type == typeof (Int32) ||
+			 prop_type == typeof (Int64)){
+			long value;
+			try {
+				value = Int64.Parse (att); //FIXME: should use the culture specified in Page
+			} catch (Exception){
+				throw new ApplicationException (att + " is not a valid signed number " + 
+								"or is out of range.");
+			}
+
+			current_function.AppendFormat ("\t\t\t__ctrl.{0} = {1};\n", var_name, value);
+		}
+		else if (prop_type == typeof (UInt16) ||
+			 prop_type == typeof (UInt32) ||
+			 prop_type == typeof (UInt64)){
+			ulong value;
+			try {
+				value = UInt64.Parse (att); //FIXME: should use the culture specified in Page
+			} catch (Exception){
+				throw new ApplicationException (att + " is not a valid unsigned number " + 
+								"or is out of range.");
+			}
+
+			current_function.AppendFormat ("\t\t\t__ctrl.{0} = {1};\n", var_name, value);
+		}
+		else if (prop_type == typeof (float)){
+			float value;
+			try {
+				value = Single.Parse (att);
+			} catch (Exception){
+				throw new ApplicationException (att + " is not  avalid float number or " +
+								"is out of range.");
+			}
+
+			current_function.AppendFormat ("\t\t\t__ctrl.{0} = {1};\n", var_name, value);
+		}
+		else if (prop_type == typeof (double)){
+			double value;
+			try {
+				value = Double.Parse (att);
+			} catch (Exception){
+				throw new ApplicationException (att + " is not  avalid double number or " +
+								"is out of range.");
+			}
+
+			current_function.AppendFormat ("\t\t\t__ctrl.{0} = {1};\n", var_name, value);
+		}
+		else if (prop_type == typeof (System.Drawing.Color)){
+			Color c;
+			try {
+				c = (Color) TypeDescriptor.GetConverter (typeof (Color)).ConvertFromString (att);
+			} catch (Exception e){
+				throw new ApplicationException ("Color " + att + " is not a valid color.", e);
+			}
+
+			// Should i also test for IsSystemColor?
+			// Are KnownColor members in System.Drawing.Color?
+			if (c.IsKnownColor){
+				current_function.AppendFormat ("\t\t\t__ctrl.{0} = System.Drawing.Color." +
+							       "{1};\n", var_name, c.Name);
+			}
+			else {
+				current_function.AppendFormat ("\t\t\t__ctrl.{0} = System.Drawing.Color." +
+							       "FromArgb ({1}, {2}, {3}, {4});\n",
+							       var_name, c.A, c.R, c.G, c.B);
+			}
+		}	
+		else {
+			throw new ApplicationException ("Unsupported type in property: " + 
+							prop_type.ToString ());
+		}
+	}
+
+	private bool ProcessProperties (PropertyInfo prop, string id, TagAttributes att)
+	{
+		int hyphen = id.IndexOf ('-');
+
+		if (hyphen == -1 && prop.CanWrite == false)
+			return false;
+
+		bool is_processed = false;
+		bool isDataBound = att.IsDataBound ((string) att [id]);
+		Type type = prop.PropertyType;
+		Type style = typeof (System.Web.UI.WebControls.Style);
+		Type fontinfo = typeof (System.Web.UI.WebControls.FontInfo);
+
+		if (0 == String.Compare (prop.Name, id, true)){
+			AddPropertyCode (type, prop.Name, (string) att [id], isDataBound);
+			is_processed = true;
+		} else if ((type == fontinfo || type == style || type.IsSubclassOf (style)) && hyphen != -1){
+			string prop_field = id.Replace ("-", ".");
+			string [] parts = prop_field.Split (new char [] {'.'});
+			if (parts.Length != 2 || 0 != String.Compare (prop.Name, parts [0], true))
+				return false;
+
+			PropertyInfo [] subprops = type.GetProperties ();
+			foreach (PropertyInfo subprop in subprops){
+				if (0 != String.Compare (subprop.Name, parts [1], true))
+					continue;
+
+				if (subprop.CanWrite == false)
+					return false;
+
+				bool is_bool = subprop.PropertyType == typeof (bool);
+				if (!is_bool && att == null){
+					att [id] = ""; // Font-Size -> Font-Size="" as html
+					return false;
+				}
+
+				string value;
+				if (att == null && is_bool)
+					value = "true"; // Font-Bold <=> Font-Bold="true"
+				else
+					value = (string) att [id];
+
+				AddPropertyCode (subprop.PropertyType,
+						 prop.Name + "." + subprop.Name,
+						 value, isDataBound);
+				is_processed = true;
+			}
+		}
+
+		return is_processed;
+	}
+	
+	private void AddCodeForAttributes (Type type, TagAttributes att)
+	{
+		EventInfo [] ev_info = type.GetEvents ();
+		PropertyInfo [] prop_info = type.GetProperties ();
+		bool is_processed = false;
+		ArrayList processed = new ArrayList ();
+
+		foreach (string id in att.Keys){
+			if (0 == String.Compare (id, "runat", true) || 0 == String.Compare (id, "id", true))
+				continue;
+
+			if (id.Length > 2 && id.Substring (0, 2).ToUpper () == "ON"){
+				string id_as_event = id.Substring (2);
+				foreach (EventInfo ev in ev_info){
+					if (0 == String.Compare (ev.Name, id_as_event, true)){
+						current_function.AppendFormat (
+								"\t\t\t__ctrl.{0} += " + 
+								"new {1} (this.{2});\n", 
+								ev.Name, ev.EventHandlerType, att [id]);
+						is_processed = true;
+						break;
+					}
+				}
+				if (is_processed){
+					is_processed = false;
+					continue;
+				}
+			} 
+
+			foreach (PropertyInfo prop in prop_info){
+				is_processed = ProcessProperties (prop, id, att);
+				if (is_processed)
+					break;
+			}
+
+			if (is_processed){
+				is_processed = false;
+				continue;
+			}
+
+			current_function.AppendFormat ("\t\t\t((System.Web.UI.IAttributeAccessor) __ctrl)." +
+						"SetAttribute (\"{0}\", \"{1}\");\n",
+						id, Escape ((string) att [id]));
+		}
+	}
+	
+	private void AddCodeRenderControl (StringBuilder function, int index)
+	{
+		function.AppendFormat ("\t\t\tparameterContainer.Controls [{0}]." + 
+				       "RenderControl (__output);\n", index);
+	}
+
+	private void AddRenderMethodDelegate (StringBuilder function, string control_id)
+	{
+		function.AppendFormat ("\t\t\t__ctrl.SetRenderMethodDelegate (new System.Web." + 
+				       "UI.RenderMethod (this.__Render_{0}));\n", control_id);
+	}
+
+	private void AddCodeRenderFunction (string codeRender, string control_id)
+	{
+		StringBuilder codeRenderFunction = new StringBuilder ();
+		codeRenderFunction.AppendFormat ("\t\tprivate void __Render_{0} " + 
+						 "(System.Web.UI.HtmlTextWriter __output, " + 
+						 "System.Web.UI.Control parameterContainer)\n" +
+						 "\t\t{{\n", control_id);
+		codeRenderFunction.Append (codeRender);
+		codeRenderFunction.Append ("\t\t}\n\n");
+		init_funcs.Append (codeRenderFunction);
+	}
+
+	private void RemoveLiterals (StringBuilder function)
+	{
+		string no_literals = Regex.Replace (function.ToString (),
+						    @"\t\t\t__parser.AddParsedSubObject \(" + 
+						    @"new System.Web.UI.LiteralControl \(.+\);\n", "");
+		function.Length = 0;
+		function.Append (no_literals);
+	}
+
+	private bool FinishControlFunction (string tag_id)
+	{
+		if (functions.Count == 0)
+			throw new ApplicationException ("Unbalanced open/close tags");
+
+		if (controls.Count == 0)
+			return false;
+
+		string saved_id = controls.PeekTagID ();
+		if (0 != String.Compare (saved_id, tag_id, true))
+			return false;
+
+		StringBuilder old_function = (StringBuilder) functions.Pop ();
+		current_function = (StringBuilder) functions.Peek ();
+
+		string control_id = controls.PeekControlID ();
+		Type control_type = controls.PeekType ();
+
+		bool hasDataBindFunction = controls.HasDataBindFunction ();
+		if (hasDataBindFunction)
+			old_function.AppendFormat ("\t\t\t__ctrl.DataBinding += new System.EventHandler " +
+						   "(this.__DataBind_{0});\n", control_id);
+
+		bool useCodeRender = controls.UseCodeRender;
+		if (useCodeRender)
+			AddRenderMethodDelegate (old_function, control_id);
+		
+		if (control_type == typeof (System.Web.UI.ITemplate)){
+			old_function.Append ("\n\t\t}\n\n");
+			current_function.AppendFormat ("\t\t\t__ctrl.{0} = new System.Web.UI." + 
+						       "CompiledTemplateBuilder (new System.Web.UI." +
+						       "BuildTemplateMethod (this.__BuildControl_{1}));\n",
+						       saved_id, control_id);
+		}
+		else if (control_type == typeof (System.Web.UI.WebControls.DataGridColumnCollection)){
+			old_function.Append ("\n\t\t}\n\n");
+			current_function.AppendFormat ("\t\t\tthis.__BuildControl_{0} (__ctrl.{1});\n",
+							control_id, saved_id);
+		}
+		else if (control_type == typeof (System.Web.UI.WebControls.DataGridColumn) ||
+			 control_type.IsSubclassOf (typeof (System.Web.UI.WebControls.DataGridColumn)) ||
+			 control_type == typeof (System.Web.UI.WebControls.ListItem)){
+			old_function.Append ("\n\t\t}\n\n");
+			string parsed = "";
+			string ctrl_name = "ctrl";
+			if (controls.Container == typeof (System.Web.UI.HtmlControls.HtmlSelect)){
+				parsed = "ParsedSubObject";
+				ctrl_name = "parser";
+			}
+
+			current_function.AppendFormat ("\t\t\tthis.__BuildControl_{0} ();\n" +
+						       "\t\t\t__{1}.Add{2} (this.{0});\n\n",
+						       control_id, ctrl_name, parsed);
+		}
+		else if (controls.PeekChildKind () == ChildrenKind.LISTITEM){
+			old_function.Append ("\n\t\t}\n\n");
+			init_funcs.Append (old_function); // Closes the BuildList function
+			old_function = (StringBuilder) functions.Pop ();
+			current_function = (StringBuilder) functions.Peek ();
+			old_function.AppendFormat ("\n\t\t\tthis.__BuildControl_{0} (__ctrl.{1});\n\t\t\t" +
+						   "return __ctrl;\n\t\t}}\n\n",
+						   control_id, controls.PeekDefaultPropertyName ());
+
+			controls.Pop ();
+			control_id = controls.PeekControlID ();
+			current_function.AppendFormat ("\t\t\tthis.__BuildControl_{0} ();\n\t\t\t__parser." +
+						       "AddParsedSubObject (this.{0});\n\n", control_id);
+		}
+		else {
+			old_function.Append ("\n\t\t\treturn __ctrl;\n\t\t}\n\n");
+			current_function.AppendFormat ("\t\t\tthis.__BuildControl_{0} ();\n\t\t\t__parser." +
+						       "AddParsedSubObject (this.{0});\n\n", control_id);
+		}
+
+		if (useCodeRender)
+			RemoveLiterals (old_function);
+
+		init_funcs.Append (old_function);
+		if (useCodeRender)
+			AddCodeRenderFunction (controls.CodeRenderFunction.ToString (), control_id);
+		
+		if (hasDataBindFunction){
+			StringBuilder db_function = controls.DataBindFunction;
+			db_function.Append ("\t\t}\n\n");
+			init_funcs.Append (db_function);
+		}
+
+		// Avoid getting empty stacks for unbalanced open/close tags
+		if (controls.Count > 1){
+			controls.Pop ();
+			AddCodeRenderControl (controls.CodeRenderFunction, controls.ChildIndex);
+		}
+
+		return true;
+	}
+
+	private void ProcessHtmlControlTag ()
+	{
+		HtmlControlTag html_ctrl = (HtmlControlTag) elements.Current;
+		if (html_ctrl.TagID.ToUpper () == "SCRIPT"){
+			//FIXME: if the is script is to be read from disk, do it!
+			if (html_ctrl.SelfClosing)
+				throw new ApplicationException ("Read script from file not supported yet.");
+
+			if (elements.MoveNext () == false)
+				throw new ApplicationException ("Error after " + html_ctrl.ToString ());
+
+			if (elements.Current is PlainText){
+				script.Append (((PlainText) elements.Current).Text);
+				if (!elements.MoveNext ())
+					throw new ApplicationException ("Error after " +
+									elements.Current.ToString ());
+			}
+
+			if (elements.Current is CloseTag)
+				elements.MoveNext ();
+			return;
+		}
+		
+		Type controlType = html_ctrl.ControlType;
+		declarations.AppendFormat ("\t\tprotected {0} {1};\n", controlType, html_ctrl.ControlID);
+
+		ChildrenKind children_kind;
+		if (0 != String.Compare (html_ctrl.TagID, "select", true))
+			children_kind = html_ctrl.IsContainer ? ChildrenKind.CONTROLS :
+								ChildrenKind.NONE;
+		else
+			children_kind = ChildrenKind.OPTION;
+
+		NewControlFunction (html_ctrl.TagID, html_ctrl.ControlID, controlType, children_kind, null); 
+
+		current_function.AppendFormat ("\t\t\t__ctrl.ID = \"{0}\";\n", html_ctrl.ControlID);
+
+		AddCodeForAttributes (html_ctrl.ControlType, html_ctrl.Attributes);
+
+		if (!html_ctrl.SelfClosing)
+			JustDoIt ();
+		else
+			FinishControlFunction (html_ctrl.TagID);
+	}
+
+	// Closing is performed in FinishControlFunction ()
+	private void NewBuildListFunction (AspComponent component)
+	{
+		string control_id = Tag.GetDefaultID ();
+
+		controls.Push (component.ComponentType,
+			       control_id, 
+			       component.TagID, 
+			       ChildrenKind.LISTITEM, 
+			       component.DefaultPropertyName);
+
+		current_function = new StringBuilder ();
+		functions.Push (current_function);
+		current_function.AppendFormat ("\t\tprivate void __BuildControl_{0} " +
+						"(System.Web.UI.WebControls.ListItemCollection __ctrl)\n" +
+						"\t\t{{\n", control_id);
+	}
+
+	private void ProcessComponent ()
+	{
+		AspComponent component = (AspComponent) elements.Current;
+		Type component_type = component.ComponentType;
+		declarations.AppendFormat ("\t\tprotected {0} {1};\n", component_type, component.ControlID);
+
+		NewControlFunction (component.TagID, component.ControlID, component_type,
+				    component.ChildrenKind, component.DefaultPropertyName); 
+
+		if (component_type.IsSubclassOf (typeof (System.Web.UI.UserControl)))
+			current_function.Append ("\t\t\t__ctrl.InitializeAsUserControl (Page);\n");
+
+		if (component_type.IsSubclassOf (typeof (System.Web.UI.Control)))
+			current_function.AppendFormat ("\t\t\t__ctrl.ID = \"{0}\";\n", component.ControlID);
+
+		AddCodeForAttributes (component.ComponentType, component.Attributes);
+		if (component.ChildrenKind == ChildrenKind.LISTITEM)
+			NewBuildListFunction (component);
+
+		if (!component.SelfClosing)
+			JustDoIt ();
+		else
+			FinishControlFunction (component.TagID);
+	}
+
+	private void ProcessServerObjectTag ()
+	{
+		ServerObjectTag obj = (ServerObjectTag) elements.Current;
+		declarations.AppendFormat ("\t\tprivate {0} cached{1};\n", obj.ObjectClass, obj.ObjectID);
+		constructor.AppendFormat ("\n\t\tprivate {0} {1}\n\t\t{{\n\t\t\tget {{\n\t\t\t\t" + 
+					  "if (this.cached{1} == null)\n\t\t\t\t\tthis.cached{1} = " + 
+					  "new {0} ();\n\t\t\t\treturn cached{1};\n\t\t\t}}\n\t\t}}\n\n",
+					  obj.ObjectClass, obj.ObjectID);
+	}
+
+	// Creates a new function that sets the values of subproperties.
+	private void NewStyleFunction (PropertyTag tag)
+	{
+		current_function = new StringBuilder ();
+
+		string prop_id = tag.PropertyID;
+		Type prop_type = tag.PropertyType;
+		// begin function
+		current_function.AppendFormat ("\t\tprivate void __BuildControl_{0} ({1} __ctrl)\n" +
+						"\t\t{{\n", prop_id, prop_type);
+		
+		// Add property initialization code
+		PropertyInfo [] subprop_info = prop_type.GetProperties ();
+		TagAttributes att = tag.Attributes;
+
+		string subprop_name = null;
+		foreach (string id in att.Keys){
+			if (0 == String.Compare (id, "runat", true) || 0 == String.Compare (id, "id", true))
+				continue;
+
+			bool is_processed = false;
+			foreach (PropertyInfo subprop in subprop_info){
+				is_processed = ProcessProperties (subprop, id, att);
+				if (is_processed){
+					subprop_name = subprop.Name;
+					break;
+				}
+			}
+
+			if (subprop_name == null)
+				throw new ApplicationException ("Property " + tag.TagID + " does not have " + 
+								"a " + id + " subproperty.");
+		}
+
+		// Finish function
+		current_function.Append ("\n\t\t}\n\n");
+		init_funcs.Append (current_function);
+		current_function = (StringBuilder) functions.Peek ();
+		current_function.AppendFormat ("\t\t\tthis.__BuildControl_{0} (__ctrl.{1});\n",
+						prop_id, tag.PropertyName);
+
+		if (!tag.SelfClosing){
+			// Next tag should be the closing tag
+			controls.Push (null, null, null, ChildrenKind.NONE, null);
+			bool closing_tag_found = false;
+			Element elem;
+			while (!closing_tag_found && elements.MoveNext ()){
+				elem = (Element) elements.Current;
+				if (elem is PlainText)
+					ProcessPlainText ();
+				else if (!(elem is CloseTag))
+					throw new ApplicationException ("Tag " + tag.TagID + 
+									" not properly closed.");
+				else
+					closing_tag_found = true;
+			}
+
+			if (!closing_tag_found)
+				throw new ApplicationException ("Tag " + tag.TagID + " not properly closed.");
+
+			controls.Pop ();
+		}
+	}
+
+	// This one just opens the function. Closing is performed in FinishControlFunction ()
+	private void NewTemplateFunction (PropertyTag tag)
+	{
+		/*
+		 * FIXME
+		 * This function does almost the same as NewControlFunction.
+		 * Consider merging.
+		 */
+		string prop_id = tag.PropertyID;
+		Type prop_type = tag.PropertyType;
+		string tag_id = tag.PropertyName; // Real property name used in FinishControlFunction
+
+		controls.Push (prop_type, prop_id, tag_id, ChildrenKind.CONTROLS, null);
+		current_function = new StringBuilder ();
+		functions.Push (current_function);
+		current_function.AppendFormat ("\t\tprivate void __BuildControl_{0} " +
+						"(System.Web.UI.Control __ctrl)\n" +
+						"\t\t{{\n" +
+						"\t\t\tSystem.Web.UI.IParserAccessor __parser " + 
+						"= (System.Web.UI.IParserAccessor) __ctrl;\n" , prop_id);
+	}
+
+	// Closing is performed in FinishControlFunction ()
+	private void NewDBColumnFunction (PropertyTag tag)
+	{
+		/*
+		 * FIXME
+		 * This function also does almost the same as NewControlFunction.
+		 * Consider merging.
+		 */
+		string prop_id = tag.PropertyID;
+		Type prop_type = tag.PropertyType;
+		string tag_id = tag.PropertyName; // Real property name used in FinishControlFunction
+
+		controls.Push (prop_type, prop_id, tag_id, ChildrenKind.DBCOLUMNS, null);
+		current_function = new StringBuilder ();
+		functions.Push (current_function);
+		current_function.AppendFormat ("\t\tprivate void __BuildControl_{0} " +
+						"(System.Web.UI.WebControl.DataGridColumnCollection __ctrl)\n" +
+						"\t\t{{\n", prop_id);
+	}
+
+	private void NewPropertyFunction (PropertyTag tag)
+	{
+		if (tag.PropertyType == typeof (System.Web.UI.WebControls.Style) ||
+		    tag.PropertyType.IsSubclassOf (typeof (System.Web.UI.WebControls.Style)))
+			NewStyleFunction (tag);
+		else if (tag.PropertyType == typeof (System.Web.UI.ITemplate))
+			NewTemplateFunction (tag);
+		else if (tag.PropertyType == typeof (System.Web.UI.WebControls.DataGridColumnCollection))
+			NewDBColumnFunction (tag);
+		else
+			throw new ApplicationException ("Other than Style and ITemplate not supported yet. " + 
+							tag.PropertyType);
+	}
+	
+	private void ProcessHtmlTag ()
+	{
+		Tag tag = (Tag) elements.Current;
+		ChildrenKind child_kind = controls.PeekChildKind ();
+		if (child_kind == ChildrenKind.NONE){
+			string tag_id = controls.PeekTagID ();
+			throw new ApplicationException (tag + " not allowed inside " + tag_id);
+		}
+					
+		if (child_kind == ChildrenKind.OPTION){
+			if (0 != String.Compare (tag.TagID, "option", true))
+				throw new ApplicationException ("Only <option> tags allowed inside <select>.");
+
+			string default_id = Tag.GetDefaultID ();
+			Type type = typeof (System.Web.UI.WebControls.ListItem);
+			declarations.AppendFormat ("\t\tprotected {0} {1};\n", type, default_id);
+			NewControlFunction (tag.TagID, default_id, type, ChildrenKind.CONTROLS, null); 
+			return;
+		}
+
+		if (child_kind == ChildrenKind.CONTROLS){
+			elements.Current = new PlainText (((Tag) elements.Current).PlainHtml);
+			ProcessPlainText ();
+			return;
+		}
+
+		// Now child_kind should be PROPERTIES, so only allow tag_id == property
+		Type control_type = controls.PeekType ();
+		PropertyInfo [] prop_info = control_type.GetProperties ();
+		bool is_processed = false;
+		foreach (PropertyInfo prop in prop_info){
+			if (0 == String.Compare (prop.Name, tag.TagID, true)){
+				PropertyTag prop_tag = new PropertyTag (tag, prop.PropertyType, prop.Name);
+				NewPropertyFunction (prop_tag);
+				is_processed = true;
+				break;
+			}
+		}
+		
+		if (!is_processed){
+			string tag_id = controls.PeekTagID ();
+			throw new ApplicationException (tag.TagID + " is not a property of " + control_type);
+		}
+	}
+
+	private Tag Map (Tag tag)
+	{
+		int pos = tag.TagID.IndexOf (":");
+		if (tag is CloseTag || 
+		    ((tag.Attributes == null || 
+		    !tag.Attributes.IsRunAtServer ()) && pos == -1))
+			return tag;
+
+		if (pos == -1){
+			if (0 == String.Compare (tag.TagID, "object", true))
+				return new ServerObjectTag (tag);
+			return new HtmlControlTag (tag);
+		}
+
+		string foundry_name = tag.TagID.Substring (0, pos);
+		string component_name = tag.TagID.Substring (pos + 1);
+
+		if (Foundry.LookupFoundry (foundry_name) == false)
+			throw new ApplicationException ("Cannot find foundry for alias'" + foundry_name + "'");
+
+		AspComponent component = Foundry.MakeAspComponent (foundry_name, component_name, tag);
+		if (component == null)
+			throw new ApplicationException ("Cannot find component '" + component_name + 
+							"' for alias '" + foundry_name + "'");
+
+		return component;
+	}
+	
+	private void ProcessCloseTag ()
+	{
+		CloseTag close_tag = (CloseTag) elements.Current;
+		if (FinishControlFunction (close_tag.TagID))
+				return;
+
+		elements.Current = new PlainText (close_tag.PlainHtml);
+		ProcessPlainText ();
+	}
+
+	private void ProcessDataBindingLiteral ()
+	{
+		DataBindingTag dataBinding = (DataBindingTag) elements.Current;
+		string actual_value = dataBinding.Data;
+		if (actual_value == "")
+			throw new ApplicationException ("Empty data binding tag.");
+
+		if (controls.PeekChildKind () != ChildrenKind.CONTROLS)
+			throw new ApplicationException ("Data bound content not allowed for " + 
+							controls.PeekTagID ());
+
+		StringBuilder db_function = new StringBuilder ();
+		string control_id = Tag.GetDefaultID ();
+		string control_type_string = "System.Web.UI.DataBoundLiteralControl";
+		declarations.AppendFormat ("\t\tprotected {0} {1};\n", control_type_string, control_id);
+		// Build the control
+		db_function.AppendFormat ("\t\tprivate System.Web.UI.Control __BuildControl_{0} ()\n" +
+					  "\t\t{{\n\t\t\t{1} __ctrl;\n\n" +
+					  "\t\t\t__ctrl = new {1} (0, 1);\n" + 
+					  "\t\t\tthis.{0} = __ctrl;\n" +
+					  "\t\t\t__ctrl.DataBinding += new System.EventHandler " + 
+					  "(this.__DataBind_{0});\n" +
+					  "\t\t\treturn __ctrl;\n"+
+					  "\t\t}}\n\n",
+					  control_id, control_type_string);
+		// DataBinding handler
+		db_function.AppendFormat ("\t\tpublic void __DataBind_{0} (object sender, " + 
+					  "System.EventArgs e) {{\n" +
+					  "\t\t\t{1} Container;\n" +
+					  "\t\t\t{2} target;\n" +
+					  "\t\t\ttarget = ({2}) sender;\n" +
+					  "\t\t\tContainer = ({1}) target.BindingContainer;\n" +
+					  "\t\t\ttarget.SetDataBoundString (0, System.Convert." +
+					  "ToString ({3}));\n" +
+					  "\t\t}}\n\n",
+					  control_id, controls.Container, control_type_string,
+					  actual_value);
+
+		init_funcs.Append (db_function);
+		current_function.AppendFormat ("\t\t\tthis.__BuildControl_{0} ();\n\t\t\t__parser." +
+					       "AddParsedSubObject (this.{0});\n\n", control_id);
+	}
+
+	private void ProcessCodeRenderTag ()
+	{
+		CodeRenderTag code_tag = (CodeRenderTag) elements.Current;
+
+		controls.UseCodeRender = true;
+		if (code_tag.IsVarName)
+			controls.CodeRenderFunction.AppendFormat ("\t\t\t__output.Write ({0});\n",
+								  code_tag.Code);
+		else
+			controls.CodeRenderFunction.AppendFormat ("\t\t\t{0}\n", code_tag.Code);
+	}
+	
+	public void ProcessElements ()
+	{
+		JustDoIt ();
+		End ();
+		parse_ok = true;
+	}
+	
+	private void JustDoIt ()
+	{
+		Element element;
+
+		while (elements.MoveNext ()){
+			element = (Element) elements.Current;
+			if (element is Directive){
+				ProcessDirective ();
+			} else if (element is PlainText){
+				ProcessPlainText ();
+			} else if (element is DataBindingTag){
+				ProcessDataBindingLiteral ();
+			} else if (element is CodeRenderTag){
+				ProcessCodeRenderTag ();
+			} else {
+				elements.Current = Map ((Tag) element);
+				if (elements.Current is HtmlControlTag)
+					ProcessHtmlControlTag ();
+				else if (elements.Current is AspComponent)
+					ProcessComponent ();
+				else if (elements.Current is CloseTag)
+					ProcessCloseTag ();
+				else if (elements.Current is ServerObjectTag)
+					ProcessServerObjectTag ();
+				else if (elements.Current is Tag)
+					ProcessHtmlTag ();
+				else
+					throw new ApplicationException ("This place should not be reached.");
+			}
+		}
+	}
+
+	private void End ()
+	{
+		buildOptions.AppendFormat ("//<class name=\"{0}\"/>\n", className);
+		buildOptions.Append ("\n");
+		classDecl = "\tpublic class " + className + " : " + parent + interfaces + " {\n"; 
+		prolog.Append ("\n" + classDecl);
+		declarations.Append ("\t\tprivate static bool __intialized = false;\n\n");
+		if (!IsUserControl)
+			declarations.Append ("\t\tprivate static ArrayList __fileDependencies;\n\n");
+
+		// adds the constructor
+		constructor.AppendFormat ("\t\tpublic {0} ()\n\t\t{{\n" + 
+					"\t\t\tSystem.Collections.ArrayList dependencies;\n\n" +
+					"\t\t\tif (ASP.{0}.__intialized == false){{\n", className); 
+		if (!IsUserControl) {
+			constructor.AppendFormat ("\t\t\t\tdependencies = new System.Collections.ArrayList ();\n" +
+						"\t\t\t\tdependencies.Add (@\"{1}\");\n" +
+						"\t\t\t\tASP.{0}.__fileDependencies = dependencies;\n",
+						className, fullPath);
+		}
+
+		constructor.AppendFormat ("\t\t\t\tASP.{0}.__intialized = true;\n\t\t\t}}\n\t\t}}\n\n",
+					  className);
+         
+		//FIXME: add AutoHandlers: don't know what for...yet!
+		constructor.AppendFormat (
+			"\t\tprotected override int AutoHandlers\n\t\t{{\n" +
+			"\t\t\tget {{ return ASP.{0}.__autoHandlers; }}\n" +
+			"\t\t\tset {{ ASP.{0}.__autoHandlers = value; }}\n" +
+			"\t\t}}\n\n", className);
+
+		//FIXME: add ApplicationInstance: don't know what for...yet!
+		constructor.Append (
+			"\t\tprotected System.Web.HttpApplication ApplicationInstance\n\t\t{\n" +
+			"\t\t\tget { return (System.Web.HttpApplication) this.Context.ApplicationInstance; }\n" +
+			"\t\t}\n\n");
+		//FIXME: add TemplateSourceDirectory: don't know what for...yet!
+		//FIXME: it should be the path from the root where the file resides
+		constructor.Append (
+			"\t\tpublic override string TemplateSourceDirectory\n\t\t{\n" +
+			"\t\t\tget { return \"/dummypath\"; }\n" +
+			"\t\t}\n\n");
+
+#if MONO
+#else
+		if (!IsUserControl)
+			epilog.Append ("\n\t\tpublic override void VerifyRenderingInServerForm (Control control)\n" +
+					"\t\t{\n\t\t}\n\n");
+#endif
+		epilog.Append ("\n\t\tprotected override void FrameworkInitialize ()\n\t\t{\n" +
+				"\t\t\tthis.__BuildControlTree (this);\n");
+
+		if (!IsUserControl) {
+			epilog.AppendFormat ("\t\t\tthis.FileDependencies = ASP.{0}.__fileDependencies;\n" +
+						"\t\t\tthis.EnableViewStateMac = true;\n", className);
+		}
+		epilog.Append ("\t\t}\n\n");
+
+		if (!IsUserControl) {
+			Random rnd = new Random ();
+			epilog.AppendFormat ("\t\tpublic override int GetTypeHashCode ()\n\t\t{{\n" +
+					     "\t\t\treturn {0};\n" +
+					     "\t\t}}\n", rnd.Next ());
+		}
+
+		epilog.Append ("\t}\n}\n");
+
+		// Closes the currently opened tags
+		StringBuilder old_function = current_function;
+		string control_id;
+		while (functions.Count > 1){
+			old_function.Append ("\n\t\t\treturn __ctrl;\n\t\t}\n\n");
+			init_funcs.Append (old_function);
+			control_id = controls.PeekControlID ();
+			FinishControlFunction (control_id);
+			controls.AddChild ();
+			old_function = (StringBuilder) functions.Pop ();
+			current_function = (StringBuilder) functions.Peek ();
+			controls.Pop ();
+		}
+
+		bool useCodeRender = controls.UseCodeRender;
+		if (useCodeRender){
+			RemoveLiterals (current_function);
+			AddRenderMethodDelegate (current_function, controls.PeekControlID ());
+		}
+		
+		current_function.Append ("\t\t}\n\n");
+		init_funcs.Append (current_function);
+		if (useCodeRender)
+			AddCodeRenderFunction (controls.CodeRenderFunction.ToString (), controls.PeekControlID ());
+
+		functions.Pop ();
+	}
+
+	//
+	// Functions related to compilation of user controls
+	//
+	
+	private static char dirSeparator = Path.DirectorySeparatorChar;
+	struct UserControlData
+	{
+		public UserControlResult result;
+		public string className;
+		public string assemblyName;
+	}
+
+	private static UserControlData GenerateUserControl (string src)
+	{
+		UserControlData data = new UserControlData ();
+		data.result = UserControlResult.OK;
+
+		if (!File.Exists (src)) {
+			data.result = UserControlResult.FileNotFound;
+			return data;
+		}
+
+		string noExt = Path.GetFileNameWithoutExtension (src);
+		string csName = "output" + dirSeparator + "xsp_ctrl_" + noExt + ".cs";
+		if (!Directory.Exists ("output"))
+			Directory.CreateDirectory ("output");
+
+		if (Xsp (src, csName) == false) {
+			data.result = UserControlResult.XspFailed;
+			return data;
+		}
+		
+		StreamReader fileReader = new StreamReader (File.Open (csName, FileMode.Open));
+		data.className = src.Replace ('.', '_');
+#if MONO
+		StringBuilder compilerOptions = new StringBuilder ("-r System.Web -r System.Drawing ");
+		compilerOptions.Append ("--target library ");
+#else
+		StringBuilder compilerOptions = new StringBuilder ("/r:System.Web.dll /r:System.Drawing.dll ");
+		compilerOptions.Append ("/target:library ");
+#endif
+		string line;
+		while ((line = fileReader.ReadLine ()) != null && line != "") {
+			if (line.StartsWith ("//<class ")) {
+				data.className = GetAttributeValue (line, "name");
+			} else if (line.StartsWith ("//<reference ")) {
+				string dllName = GetAttributeValue (line, "dll");
+#if MONO
+				compilerOptions.AppendFormat ("-r {0} ", Path.ChangeExtension (dllName, null));
+#else
+				compilerOptions.AppendFormat ("/r:{0} ", dllName);
+#endif
+			} else if (line.StartsWith ("//<compileroptions ")) {
+				string options = GetAttributeValue (line, "options");
+				compilerOptions.Append (" " + options + " ");
+			} else {
+				Console.Error.WriteLine ("Ignoring build option: {0}", line);
+			}
+		}
+		fileReader.Close ();
+
+		string dll = Path.ChangeExtension (csName, ".dll");
+		data.assemblyName = dll;
+		if (Compile (csName, dll, compilerOptions) == false) {
+			data.result = UserControlResult.CompilationFailed;
+		}
+		
+		return data;
+	}
+
+	private static string GetAttributeValue (string line, string att)
+	{
+		string att_start = att + "=\"";
+		int begin = line.IndexOf (att_start);
+		int end = line.Substring (begin + att_start.Length).IndexOf ('"');
+		if (begin == -1 || end == -1)
+			throw new ApplicationException ("Error in compilation option:\n" + line);
+
+		return line.Substring (begin + att_start.Length, end);
+	}
+		
+	private static bool Xsp (string fileName, string csFileName)
+	{
+#if MONO
+		return RunProcess ("mono", 
+				   "xsp.exe --control " + fileName, 
+				   csFileName,
+				   "output" + dirSeparator + "xsp_ctrl_" + Path.GetFileName (fileName) + 
+				   ".sh");
+#else
+		return RunProcess ("xsp", 
+				   "--control " + fileName, 
+				   csFileName,
+				   "output" + dirSeparator + "xsp_ctrl_" + fileName + ".bat");
+#endif
+	}
+
+	private static bool Compile (string csName, string dllName, StringBuilder compilerOptions)
+	{
+#if MONO
+		compilerOptions.AppendFormat ("-o {0} ", dllName);
+#else
+		compilerOptions.AppendFormat ("/out:{0} ", dllName);
+#endif
+		compilerOptions.Append (csName + " ");
+
+		string cmdline = compilerOptions.ToString ();
+		string noext = Path.GetFileNameWithoutExtension (csName);
+		string output_file = "output" + dirSeparator + "output_from_compilation_" + noext + ".txt";
+		string bat_file = "output" + dirSeparator + "last_compilation_" + noext + ".bat";
+#if MONO
+		return RunProcess ("mcs", cmdline, output_file, bat_file);
+#else
+		return RunProcess ("csc.exe", cmdline, output_file, bat_file);
+#endif
+	}
+
+	private static bool RunProcess (string exe, string arguments, string output_file, string script_file)
+	{
+		Process proc = new Process ();
+#if MONO
+		proc.StartInfo.FileName = "redirector.sh";
+		proc.StartInfo.Arguments = exe + " " + output_file + " " + arguments;
+		proc.Start ();
+		proc.WaitForExit ();
+		int result = proc.ExitCode;
+		proc.Close ();
+
+		StreamWriter bat_output = new StreamWriter (File.Create (script_file));
+		bat_output.Write ("./redirector.sh" + " " + exe + " " + output_file + " " + arguments);
+		bat_output.Close ();
+#else
+		proc.StartInfo.FileName = exe;
+		proc.StartInfo.Arguments = arguments;
+		proc.StartInfo.UseShellExecute = false;
+		proc.StartInfo.RedirectStandardOutput = true;
+		proc.Start ();
+		string poutput = proc.StandardOutput.ReadToEnd();
+		proc.WaitForExit ();
+		int result = proc.ExitCode;
+		proc.Close ();
+
+		StreamWriter cmd_output = new StreamWriter (File.Create (output_file));
+		cmd_output.Write (poutput);
+		cmd_output.Close ();
+		StreamWriter bat_output = new StreamWriter (File.Create (script_file));
+		bat_output.Write (exe + " " + arguments);
+		bat_output.Close ();
+#endif
+
+		return (result == 0);
+	}
+
+}
+
+}
+
diff --git a/mcs/class/System.Web/System.Web.Compilation/AspParser.cs b/mcs/class/System.Web/System.Web.Compilation/AspParser.cs
new file mode 100644
index 00000000000..bf5b0e27810
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Compilation/AspParser.cs
@@ -0,0 +1,240 @@
+//
+// System.Web.Compilation.AspParser
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+
+namespace System.Web.Compilation
+{
+	class AspParser {
+		private AspTokenizer tokenizer;
+		private ArrayList elements; // List of processed elements in the HTML page.
+
+		private void error ()
+		{
+			Console.WriteLine ("Error: " + tokenizer.location);
+			Environment.Exit (-1); //FIXME
+		}
+
+		private void error (string msg)
+		{
+			Console.WriteLine ("Error: "+ msg + "\n" + tokenizer.location);
+			Environment.Exit (-1); //FIXME
+		}
+
+		public AspParser (AspTokenizer tokenizer)
+		{
+			this.tokenizer = tokenizer;
+			elements = new ArrayList ();
+		}
+
+		public AspParser (string filename, Stream input) : 
+			this (new AspTokenizer (filename, input))
+		{
+		}
+
+		public ArrayList Elements
+		{
+			get { return elements; }
+		}
+
+		private bool Eat (int expected_token)
+		{
+			if (tokenizer.get_token () != expected_token) {
+				tokenizer.put_back ();
+				return false;
+			}
+			return true;
+		}
+
+		private void AddPlainText (string newText)
+		{
+			if (elements.Count > 0){
+				Element element = (Element) elements [elements.Count - 1];
+				if (element is PlainText){
+					((PlainText) element).Append (newText);
+					return;
+				}
+			}
+			elements.Add (new PlainText (newText));
+		}
+		
+		public void Parse ()
+		{
+			int token;
+			Element element;
+			Tag tag_element;
+			string tag = "";
+
+			while ((token = tokenizer.get_token ()) != Token.EOF){
+				if (tokenizer.Verbatim){
+					string end_verbatim = "</" + tag + ">";
+					string verbatim_text = GetVerbatim (token, end_verbatim);
+
+					if (verbatim_text == null)
+						error ("Unexpected EOF processing " + tag);
+
+					AddPlainText (verbatim_text);
+					elements.Add (new CloseTag (tag));
+					tokenizer.Verbatim = false;
+				}
+				else if (token == '<'){
+					element = GetTag ();
+					if (element == null)
+						error ();
+					if (!(element is Tag)){
+						AddPlainText (((PlainText) element).Text);
+						continue;
+					}
+
+					elements.Add (element);
+
+					tag_element = element as Tag;
+					tag = tag_element.TagID.ToUpper ();
+					if (!tag_element.SelfClosing && (tag == "SCRIPT" || tag == "PRE"))
+						tokenizer.Verbatim = true;
+				}
+				else {
+					StringBuilder text =  new StringBuilder ();
+					do {
+						text.Append (tokenizer.value);
+						token = tokenizer.get_token ();
+					} while (token != '<' && token != Token.EOF);
+					tokenizer.put_back ();
+					AddPlainText (text.ToString ());
+				}
+			}
+		}
+
+		private Element GetTag ()
+		{
+			int token = tokenizer.get_token ();
+			string id;
+			TagAttributes attributes;
+
+			switch (token){
+			case '%':
+				if (Eat ('@')){
+					id = (Eat (Token.DIRECTIVE) ? tokenizer.value : "Page");
+					attributes = GetAttributes ();
+					if (!Eat ('%') || !Eat ('>'))
+						error ("expecting '%>'");
+
+					return new Directive (id, attributes);
+				}
+
+				bool varname = Eat ('=');
+				bool databinding = !varname && Eat ('#');
+				tokenizer.Verbatim = true;
+				string inside_tags = GetVerbatim (tokenizer.get_token (), "%>");
+				tokenizer.Verbatim = false;
+				if (databinding)
+					return new DataBindingTag (inside_tags);
+				return new CodeRenderTag (varname, inside_tags);
+			case '/':
+				if (!Eat (Token.IDENTIFIER))
+					error ("expecting TAGNAME");
+				id = tokenizer.value;
+				if (!Eat ('>'))
+					error ("expecting '>'");
+				return new CloseTag (id);
+			case '!':
+				bool double_dash = Eat (Token.DOUBLEDASH);
+				if (double_dash)
+					tokenizer.put_back ();
+
+				tokenizer.Verbatim = true;
+				string end = double_dash ? "-->" : ">";
+				string comment = GetVerbatim (tokenizer.get_token (), end);
+				tokenizer.Verbatim = false;
+				if (comment == null)
+					error ("Unfinished HTML comment/DTD");
+
+				return new PlainText ("<!" + comment + end);
+			case Token.IDENTIFIER:
+				id = tokenizer.value;
+				Tag tag = new Tag (id, GetAttributes (), Eat ('/'));
+				if (!Eat ('>'))
+					error ("expecting '>'");
+				return tag;
+			default:
+				return null;
+			}
+		}
+
+		private TagAttributes GetAttributes ()
+		{
+			int token;
+			TagAttributes attributes;
+			string id;
+
+			attributes = new TagAttributes ();
+			while ((token = tokenizer.get_token ())  != Token.EOF){
+				if (token != Token.IDENTIFIER)
+					break;
+				id = tokenizer.value;
+				if (Eat ('=')){
+					if (Eat (Token.ATTVALUE)){
+						attributes.Add (id, tokenizer.value);
+					} else {
+						//TODO: support data binding syntax without quotes
+						error ("expected ATTVALUE");
+						return null;
+					}
+					
+				} else {
+					attributes.Add (id, null);
+				}
+			}
+
+			tokenizer.put_back ();
+			if (attributes.Count == 0)
+				return null;
+
+			return attributes;
+		}
+
+		private string GetVerbatim (int token, string end)
+		{
+			StringBuilder vb_text = new StringBuilder ();
+			int i = 0;
+
+			if (tokenizer.value.Length > 1){
+				// May be we have a put_back token that is not a single character
+				vb_text.Append (tokenizer.value);
+				token = tokenizer.get_token ();
+			}
+
+			while (token != Token.EOF){
+				if (Char.ToUpper ((char) token) == end [i]){
+					if (++i >= end.Length)
+						break;
+					token = tokenizer.get_token ();
+					continue;
+				}
+				else {
+					for (int j = 0; j < i; j++)
+						vb_text.Append (end [j]);
+				}
+
+				i = 0;
+				vb_text.Append ((char) token);
+				token = tokenizer.get_token ();
+			} 
+
+			if (token == Token.EOF)
+				return null;
+
+			return vb_text.ToString ();
+		}
+	}
+
+}
+
diff --git a/mcs/class/System.Web/System.Web.Compilation/AspTokenizer.cs b/mcs/class/System.Web/System.Web.Compilation/AspTokenizer.cs
new file mode 100644
index 00000000000..0b72bef93dd
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Compilation/AspTokenizer.cs
@@ -0,0 +1,215 @@
+//
+// System.Web.Compilation.AspTokenizer
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+
+namespace System.Web.Compilation {
+	
+	class Token
+	{
+		public const int EOF 		= 0;
+		public const int IDENTIFIER 	= 1000;
+		public const int DIRECTIVE  	= 1001;
+		public const int ATTVALUE   	= 1002;
+		public const int TEXT	    	= 1003;
+		public const int DOUBLEDASH 	= 1004;
+		public const int CLOSING 	= 1005;
+	}
+
+	class AspTokenizer {
+		private StreamReader sr;
+		private int current_token;
+		private StringBuilder sb;
+		private int col, line;
+		private bool inTag;
+		private bool hasPutBack;
+		private bool verbatim;
+		private string filename;
+		
+		public AspTokenizer (string filename, Stream stream)
+		{
+			if (filename == null || stream == null)
+				throw new ArgumentNullException ();
+
+			this.sr = new StreamReader (stream);
+			this.filename = filename;
+			sb = new StringBuilder ();
+			col = line = 1;
+			hasPutBack = inTag = false;
+		}
+
+		public bool Verbatim
+		{
+			get { return verbatim; }
+			set { verbatim = value; }
+		}
+
+		public void put_back ()
+		{
+			if (hasPutBack)
+				throw new ApplicationException ("put_back called twice!");
+				
+			hasPutBack = true;
+		}
+		
+		public int get_token ()
+		{
+			if (hasPutBack){
+				hasPutBack = false;
+				return current_token;
+			}
+
+			current_token = NextToken ();
+			return current_token;
+		}
+
+		bool is_identifier_start_character (char c)
+		{
+			return (Char.IsLetter (c) || c == '_' );
+		}
+
+		bool is_identifier_part_character (char c)
+		{
+			return (Char.IsLetterOrDigit (c) || c == '_' || c == '-');
+		}
+
+		private int read_char ()
+		{
+			int c = sr.Read ();
+
+			if (c == '\r' && sr.Peek () == '\n')
+				c = sr.Read ();
+
+			if (c == '\n'){
+				col = 0;
+				line++;
+			}
+			else if (c != -1)
+				col++;
+
+			return c;
+		}
+
+		private int NextToken ()
+		{
+			int c;
+			
+			sb.Length = 0;
+			while ((c = read_char ()) != -1){
+				if (verbatim){
+					inTag = false;
+					sb.Append  ((char) c);
+					return c;
+				}
+
+				if (inTag && (c == '"' || c == '\'')){
+					int previous;
+					int start = c;
+
+					previous = 0;
+					while ((c = sr.Peek ()) != -1) {
+						if (c == start && previous != '\\'){
+							read_char ();
+							break;
+						}
+						sb.Append ((char) read_char ());
+						previous = c;
+					}
+					
+					return Token.ATTVALUE;
+				}
+				
+				if (c == '<'){
+					inTag = true;
+					sb.Append ((char) c);
+					return c;
+				}
+
+				if (c == '>'){
+					inTag = false;
+					sb.Append ((char) c);
+					return c;
+				}
+
+				if (current_token == '<' && "%/!".IndexOf ((char) c) != -1){
+					sb.Append ((char) c);
+					return c;
+				}
+
+				if (inTag && current_token == '%' && "@#=".IndexOf ((char) c) != -1){
+					sb.Append ((char) c);
+					return c;
+				}
+
+				if (inTag && c == '-' && sr.Peek () == '-'){
+					sb.Append ("--");
+					read_char ();
+					return Token.DOUBLEDASH;
+				}
+
+				if (!inTag){
+					sb.Append ((char) c);
+					while ((c = sr.Peek ()) != -1 && c != '<')
+						sb.Append ((char) read_char ());
+
+					return (c != -1 || sb.Length > 0) ? Token.TEXT : Token.EOF;
+				}
+
+				if (inTag && current_token == '=' && !Char.IsWhiteSpace ((char) c)){ 
+					sb.Append ((char) c);
+					while ((c = sr.Peek ()) != -1) {
+						if (Char.IsWhiteSpace ((char) c) || c == '/' || c == '>')
+							break;
+						sb.Append ((char) read_char ());
+					}
+
+					return Token.ATTVALUE;
+				}
+
+				if (inTag && is_identifier_start_character ((char) c)){
+					sb.Append ((char) c);
+					while ((c = sr.Peek ()) != -1) {
+						if (!is_identifier_part_character ((char) c) && c != ':')
+							break;
+						sb.Append ((char) read_char ());
+					}
+
+					if (current_token == '@' && Directive.IsDirectiveID (sb.ToString ()))
+						return Token.DIRECTIVE;
+
+					return Token.IDENTIFIER;
+				}
+
+				if (!Char.IsWhiteSpace ((char) c))
+					return c;
+			}
+
+			return Token.EOF;
+		}
+
+		public string value 
+		{
+			get { return sb.ToString (); }
+		}
+
+		public string location 
+		{
+			get { 
+				string msg = filename;
+				msg += " (" + line + ", " + col + "): " + sb.ToString ();
+				return msg;
+			}
+		}
+
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.Compilation/ChangeLog b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
new file mode 100644
index 00000000000..64ffd0d836e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Compilation/ChangeLog
@@ -0,0 +1,27 @@
+2002-08-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* PageCompiler.cs: fixed compilation.
+
+2002-08-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* PageCompiler.cs: generate C# file using AspGenerator.
+
+2002-08-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AspComponentFoundry.cs: LookupFoundry now returns bool.
+	* AspGenerator.cs: New file.
+
+2002-08-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AspComponentFoundry.cs: New file.
+	* AspElements.cs: renamed Component to Aspcomponent.
+
+2002-08-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AspElements.cs:
+	* AspParser.cs:
+	* AspTokenizer.cs:
+	* ChangeLog:
+	* PageCompiler.cs:
+	* TemplateFactory.cs: first steps to move xsp into System.Web.
+
diff --git a/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
new file mode 100644
index 00000000000..7c990231eba
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Compilation/PageCompiler.cs
@@ -0,0 +1,47 @@
+//
+// System.Web.Compilation.PageCompiler
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.IO;
+using System.Web.UI;
+
+namespace System.Web.Compilation
+{
+	class PageCompiler
+	{
+		private PageParser pageParser;
+
+		internal PageCompiler (PageParser pageParser)
+		{
+			this.pageParser = pageParser;
+		}
+
+		public static Type CompilePageType (PageParser pageParser)
+		{
+			string sourceFile = GenerateSourceFile (pageParser.InputFile);
+			return TemplateFactory.GetTypeFromSource (sourceFile);
+		}
+
+		private static string GenerateSourceFile (string inputFile)
+		{
+			Stream input = File.OpenRead (inputFile);
+			AspParser parser = new AspParser (inputFile, input);
+			parser.Parse ();
+			AspGenerator generator = new AspGenerator (inputFile, parser.Elements);
+			//FIXME: set properties here -> base type, interfaces,...
+			generator.ProcessElements ();
+			string code = generator.GetCode ().ReadToEnd ();
+			//FIXME: should get Tmp dir for this application
+			string csName = Path.GetTempFileName ();
+			StreamWriter output = new StreamWriter (File.OpenWrite (csName));
+			output.Write (code);
+			output.Close ();
+			return csName;
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.Compilation/TemplateFactory.cs b/mcs/class/System.Web/System.Web.Compilation/TemplateFactory.cs
new file mode 100644
index 00000000000..da66429b73a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Compilation/TemplateFactory.cs
@@ -0,0 +1,214 @@
+//

+// System.Web.Compilation.TemplateFactory

+//

+// Authors:

+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)

+//

+// (C) 2002 Ximian, Inc (http://www.ximian.com)

+//

+using System;

+using System.Collections;

+using System.Diagnostics;

+using System.IO;

+using System.Reflection;

+using System.Text;

+using System.Web.UI;

+

+namespace System.Web.Compilation

+{

+	class TemplateFactory

+	{

+		internal class PageBuilder

+		{

+			private StringBuilder cscOptions;

+			private string fileName;

+			private string csFileName;

+			private string className;

+			public static char dirSeparator = Path.DirectorySeparatorChar;

+			private static Hashtable cachedData = new Hashtable ();

+			private static Random rnd_file = new Random ();

+

+			private PageBuilder ()

+			{

+			}

+

+			internal PageBuilder (string fileName)

+			{

+				this.fileName = fileName;

+				csFileName = "xsp_" + Path.GetFileName (fileName).Replace (".aspx", ".cs");

+

+				cscOptions = new StringBuilder ();

+				cscOptions.Append ("--target library ");

+				cscOptions.Append ("-L . ");

+				AddReference ("corlib");

+				AddReference ("System");

+				AddReference ("System.Data");

+				AddReference ("System.Web");

+				AddReference ("System.Drawing");

+			}

+

+			internal Type Build ()

+			{

+				string dll;

+				if (Xsp (fileName, csFileName) == false){

+					Console.WriteLine ("Error running xsp. " + 

+							   "Take a look at the output file.");

+					return null;

+				}

+

+				StreamReader st_file = new StreamReader (File.OpenRead ("output" +

+											dirSeparator +

+											csFileName));

+				

+				StringReader file_content = new StringReader (st_file.ReadToEnd ());

+				st_file.Close ();

+				if (GetBuildOptions (file_content) == false)

+					return null;

+

+				dll = "output" + dirSeparator;

+				dll += rnd_file.Next () + Path.GetFileName (fileName).Replace (".aspx", ".dll");

+				if (Compile (csFileName, dll) == true){

+					Assembly assembly = Assembly.LoadFrom (dll);

+					Type type = assembly.GetType ("ASP." + className);

+					return type;

+				}

+

+				return null;

+			}

+

+			private static bool Xsp (string fileName, string csFileName)

+			{

+				return RunProcess ("mono", 

+						   "xsp.exe " + fileName, 

+						   GeneratedXspFileName (fileName),

+						   "output" + dirSeparator + "xsp_" + Path.GetFileName (fileName) + 

+						   ".sh");

+			}

+

+			private static bool RunProcess (string exe, string arguments, string output_file, string script_file)

+			{

+				Console.WriteLine ("{0} {1}", exe, arguments);

+				Console.WriteLine ("Output goes to {0}", output_file);

+				Console.WriteLine ("Script file is {0}", script_file);

+				Process proc = new Process ();

+

+				proc.StartInfo.FileName = "redirector.sh";

+				proc.StartInfo.Arguments = exe + " " + output_file + " " + arguments;

+				proc.Start ();

+				proc.WaitForExit ();

+				int result = proc.ExitCode;

+				proc.Close ();

+

+				StreamWriter bat_output = new StreamWriter (File.Create (script_file));

+				bat_output.Write ("redirector.sh" + " " + exe + " " + output_file + " " + arguments);

+				bat_output.Close ();

+/*

+ * Use this code when redirection works properly

+ *

+				proc.StartInfo.FileName = exe;

+				proc.StartInfo.Arguments = arguments;

+				proc.StartInfo.UseShellExecute = false;

+				proc.StartInfo.RedirectStandardOutput = true;

+				proc.Start ();

+				string poutput = proc.StandardOutput.ReadToEnd();

+				proc.WaitForExit ();

+				int result = proc.ExitCode;

+				proc.Close ();

+

+				StreamWriter cmd_output = new StreamWriter (File.Create (output_file));

+				cmd_output.Write (poutput);

+				cmd_output.Close ();

+				StreamWriter bat_output = new StreamWriter (File.Create (script_file));

+				bat_output.Write (exe + " " + arguments);

+				bat_output.Close ();

+*/

+

+				return (result == 0);

+			}

+

+			private bool GetBuildOptions (StringReader genCode)

+			{

+				string line;

+				string dll;

+

+				while ((line = genCode.ReadLine ()) != String.Empty) {

+					if (line.StartsWith ("//<class ")){

+						className = GetAttributeValue (line, "name");

+					} else if (line.StartsWith ("//<compileandreference ")) {

+						string src = GetAttributeValue (line, "src");

+						dll = src.Replace (".cs", ".dll"); //FIXME

+						//File.Delete (dll);

+						if (Compile (src, dll) == false){

+							Console.WriteLine ("Error compiling {0}. See the output file.", src);

+							return false;

+						}

+						AddReference (dll.Replace (".dll", ""));

+					} else if (line.StartsWith ("//<reference ")) {

+						dll = GetAttributeValue (line, "dll");

+						AddReference (dll);

+					} else if (line.StartsWith ("//<compileroptions ")) {

+						string options = GetAttributeValue (line, "options");

+						cscOptions.Append (" " + options + " ");

+					} else {

+						Console.WriteLine ("This is the build option line i get:\n" + line);

+						return false;

+					}

+				}

+

+				return true;

+			}

+

+			private void AddReference (string reference)

+			{

+				string arg = String.Format ("/r:{0} ", reference);

+				cscOptions.Append (arg);

+			}

+			

+			private string GetAttributeValue (string line, string att)

+			{

+				string att_start = att + "=\"";

+				int begin = line.IndexOf (att_start);

+				int end = line.Substring (begin + att_start.Length).IndexOf ('"');

+				if (begin == -1 || end == -1)

+					throw new ApplicationException ("Error in reference option:\n" + line);

+

+				return line.Substring (begin + att_start.Length, end);

+			}

+			

+			private bool Compile (string csName, string dllName)

+			{

+				cscOptions.AppendFormat ("/out:{0} ", dllName);

+				cscOptions.Append ("output" + dirSeparator + csName);

+

+				string cmdline = cscOptions.ToString ();

+				string noext = csName.Replace (".cs", "");

+				string output_file = "output" + dirSeparator + "output_from_compilation_" + noext + ".txt";

+				string bat_file = "output" + dirSeparator + "last_compilation_" + noext + ".bat";

+				return RunProcess ("mcs", cmdline, output_file, bat_file);

+			}

+		}

+

+		internal static string CompilationOutputFileName (string fileName)

+		{

+			string name = "xsp_" + Path.GetFileName (fileName).Replace (".aspx", ".txt");

+			return "output" + PageBuilder.dirSeparator + "output_from_compilation_" + name;

+		}

+

+		internal static string GeneratedXspFileName (string fileName)

+		{

+			string name = Path.GetFileName (fileName).Replace (".aspx", ".cs");

+			return "output" + PageBuilder.dirSeparator + "xsp_" + name;

+		}

+

+		private TemplateFactory ()

+		{

+		}

+

+		internal static Type GetTypeFromSource (string fileName)

+		{

+			PageBuilder builder = new PageBuilder (fileName);

+			return builder.Build ();

+		}

+	}

+}

+

diff --git a/mcs/class/System.Web/System.Web.Configuration/AuthenticationMode.cs b/mcs/class/System.Web/System.Web.Configuration/AuthenticationMode.cs
new file mode 100755
index 00000000000..1bc1d9e9a36
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/AuthenticationMode.cs
@@ -0,0 +1,19 @@
+/* System.Web.Configuration
+ * Authors:
+ *   Leen Toelen (toelen@hotmail.com)
+ *  Copyright (C) 2001 Leen Toelen
+*/
+
+namespace System.Web.Configuration {
+
+	/// <summary>
+	/// Defines the AuthenticationMode for a Web Application.
+	/// </summary>
+	public enum AuthenticationMode{
+		Forms, 
+		None,
+		Passport, 
+		Windows
+	}
+
+} //namespace System.Web.Configuration
diff --git a/mcs/class/System.Web/System.Web.Configuration/ChangeLog b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
new file mode 100644
index 00000000000..9af0c413e24
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/ChangeLog
@@ -0,0 +1,13 @@
+2002-08-05  Patrik Torstensson <ptorsten@hotmail.com>
+
+	* HandlerFactoryConfiguration.cs,
+	   HandlerFactoryProxy.cs,
+	   HandlerItem.cs	: New files to emulate HttpHandler configuration
+	   
+	* ModuleItem.cs,
+	   ModulesConfiguration.cs : New files to emulate HttpModule configuration	
+
+2002-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.Configuration/HttpCapabilitiesBase.cs: New file.
+
diff --git a/mcs/class/System.Web/System.Web.Configuration/ClientTargetSectionHandler.cs b/mcs/class/System.Web/System.Web.Configuration/ClientTargetSectionHandler.cs
new file mode 100644
index 00000000000..d30affc8f2d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/ClientTargetSectionHandler.cs
@@ -0,0 +1,44 @@
+/* System.Web.Configuration
+ * Authors:
+ *   Leen Toelen (toelen@hotmail.com)
+ *  Copyright (C) 2001 Leen Toelen
+*/
+using System;
+using System.Configuration;
+
+namespace System.Web.Configuration
+{
+	/// <summary>
+	/// Summary description for ClientTargetSectionHandler.
+	/// </summary>
+	public class ClientTargetSectionHandler: NameValueSectionHandler
+	{
+		/// <summary>
+		///		ClientTargetSectionHandler Constructor
+		/// </summary>
+		public ClientTargetSectionHandler(){}
+
+		/// <summary>
+		///		Gets the name of the key in the key-value pair.
+		/// </summary>
+		protected override string KeyAttributeName
+		{
+			get
+			{
+				return "alias";
+			}
+		}
+
+		/// <summary>
+		///		Gets the value for the key in the key-value pair.
+		/// </summary>
+		protected override string ValueAttributeName
+		{
+			get
+			{
+				return "userAgent";
+			}
+		}
+
+	}
+} //namespace System.Web.Configuration
diff --git a/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs b/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs
new file mode 100755
index 00000000000..ff416bc6ebc
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/FormsAuthPasswordFormat.cs
@@ -0,0 +1,18 @@
+/* System.Web.Configuration
+ * Authors:
+ *   Leen Toelen (toelen@hotmail.com)
+ *  Copyright (C) 2001 Leen Toelen
+*/
+
+namespace System.Web.Configuration {
+
+	/// <summary>
+	/// Defines the password encryption format.
+	/// </summary>
+	public enum FormsAuthPasswordFormat{
+		Clear, 
+		MD5, 
+		SHA1
+	}
+
+} //namespace System.Web.Configuration
diff --git a/mcs/class/System.Web/System.Web.Configuration/FormsProtectionEnum.cs b/mcs/class/System.Web/System.Web.Configuration/FormsProtectionEnum.cs
new file mode 100755
index 00000000000..e94950e067e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/FormsProtectionEnum.cs
@@ -0,0 +1,19 @@
+/* System.Web.Configuration
+ * Authors:
+ *   Leen Toelen (toelen@hotmail.com)
+ *  Copyright (C) 2001 Leen Toelen
+*/
+
+namespace System.Web.Configuration {
+
+	/// <summary>
+	/// Defines the method used for securing web forms.
+	/// </summary>
+	public enum FormsProtectionEnum{
+		All, 
+		Encryption, 
+		None, 
+		Validation
+	}
+
+} //namespace System.Web.Configuration
diff --git a/mcs/class/System.Web/System.Web.Configuration/GlobalizationConfiguration.cs b/mcs/class/System.Web/System.Web.Configuration/GlobalizationConfiguration.cs
new file mode 100644
index 00000000000..f60e6c65b60
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/GlobalizationConfiguration.cs
@@ -0,0 +1,29 @@
+// 
+// System.Web.Configuration.GlobalizationConfiguration
+//
+// Author:
+//   Patrik Torstensson (ptorsten@hotmail.com)
+//
+using System.Globalization;
+
+namespace System.Web.Configuration {
+	[MonoTODO]
+	public class GlobalizationConfiguration {
+		public GlobalizationConfiguration() {
+		}
+
+		[MonoTODO("")]
+		public CultureInfo Culture {
+			get {
+				return null;
+			}
+		}
+
+		[MonoTODO("")]
+		public CultureInfo UICulture {
+			get {
+				return null;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.Configuration/HandlerFactoryConfiguration.cs b/mcs/class/System.Web/System.Web.Configuration/HandlerFactoryConfiguration.cs
new file mode 100644
index 00000000000..18778d111ca
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/HandlerFactoryConfiguration.cs
@@ -0,0 +1,35 @@
+// 
+// System.Web.Configuration.HandlerFactoryConfiguration
+//
+// Author:
+//   Patrik Torstensson (ptorsten@hotmail.com)
+//
+using System.Collections;
+
+namespace System.Web.Configuration {
+	[MonoTODO]
+	public class HandlerFactoryConfiguration {
+		static private ArrayList _items = new ArrayList();
+
+		static public void Add(string rtype, string path, string type) {
+			HandlerItem item = new HandlerItem(rtype, path, type);
+
+			_items.Add(item);
+		}
+
+		static public HandlerItem FindHandler(string type, string path) {
+			int pos = 0;
+			int count = _items.Count;
+
+			for (pos = 0; pos != count; pos++) {
+				if (((HandlerItem) _items[pos]).IsMatch(type, path)) 
+					return (HandlerItem) _items[pos];
+			}
+
+			return null;
+		}
+
+		public HandlerFactoryConfiguration() {
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.Configuration/HandlerFactoryProxy.cs b/mcs/class/System.Web/System.Web.Configuration/HandlerFactoryProxy.cs
new file mode 100644
index 00000000000..e152a35041c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/HandlerFactoryProxy.cs
@@ -0,0 +1,15 @@
+// 
+// System.Web.Configuration.HandlerFactoryProxy
+//
+// Author:
+//   Patrik Torstensson (ptorsten@hotmail.com)
+//
+using System;
+
+namespace System.Web.Configuration {
+	[MonoTODO]
+	public class HandlerFactoryProxy {
+		public HandlerFactoryProxy() {
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.Configuration/HandlerItem.cs b/mcs/class/System.Web/System.Web.Configuration/HandlerItem.cs
new file mode 100644
index 00000000000..527aaf7fc08
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/HandlerItem.cs
@@ -0,0 +1,45 @@
+// 
+// System.Web.Configuration.HandlerItem
+//
+// Author:
+//   Patrik Torstensson (ptorsten@hotmail.com)
+//
+using System;
+
+namespace System.Web.Configuration {
+	public class HandlerItem {
+		private Type _type;
+		private string _typeName;
+		private string _path;
+		private string _requestType;
+
+		public HandlerItem(string requestType, string path, string type) {
+			_typeName = type;
+			_path = path;
+			_requestType = requestType.Replace(" ", "");
+
+			_type = Type.GetType(type, true);
+			if (!typeof(IHttpHandler).IsAssignableFrom(_type)) {
+				if (!typeof(IHttpHandlerFactory).IsAssignableFrom(_type)) {
+					throw new HttpException(HttpRuntime.FormatResourceString("type_not_factory_or_handler"));
+				}
+			}
+		}
+
+		public object Create() {
+			return HttpRuntime.CreateInternalObject(_type);
+		}
+
+		public Type Type {
+			get {
+				return _type;
+			}
+		}
+
+		[MonoTODO()]
+		public bool IsMatch(string type, string path) {
+			// Debugging
+			return true;
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.Configuration/HttpCapabilitiesBase.cs b/mcs/class/System.Web/System.Web.Configuration/HttpCapabilitiesBase.cs
new file mode 100644
index 00000000000..c328d0f300c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/HttpCapabilitiesBase.cs
@@ -0,0 +1,36 @@
+//
+// System.Web.Configuration.HttpCapabilitiesBase
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+namespace System.Web.Configuration {
+	using System;
+	using System.Collections;
+	using System.Web;
+	
+public class HttpCapabilitiesBase
+{
+	protected Hashtable _capabilities;
+
+	public HttpCapabilitiesBase ()
+	{
+		_capabilities = new Hashtable ();
+	}
+
+	public virtual string this [string key]
+	{
+		get { return _capabilities [key] as string; }
+	}
+
+	public static HttpCapabilitiesBase GetConfigCapabilities (string configKey, HttpRequest request)
+	{
+		throw new NotImplementedException ();
+	}
+	
+}
+}
+
diff --git a/mcs/class/System.Web/System.Web.Configuration/ModuleItem.cs b/mcs/class/System.Web/System.Web.Configuration/ModuleItem.cs
new file mode 100644
index 00000000000..1644d8cd9bd
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/ModuleItem.cs
@@ -0,0 +1,40 @@
+// 
+// System.Web.Configuration.ModuleItem
+//
+// Author:
+//   Patrik Torstensson (ptorsten@hotmail.com)
+//
+using System;
+
+namespace System.Web.Configuration {
+	public class ModuleItem {
+		private Type _type;
+		private string _typeName;
+		private string _name;
+
+		public ModuleItem(string name, string type) {
+			_typeName = type;
+			_name = name;
+
+			_type = Type.GetType(type, true);
+			if (!typeof(IHttpModule).IsAssignableFrom(_type))
+				throw new HttpException(HttpRuntime.FormatResourceString("type_not_module"));
+		}
+
+		public IHttpModule Create() {
+			return (IHttpModule) HttpRuntime.CreateInternalObject(_type);
+		}
+
+		public Type Type {
+			get {
+				return _type;
+			}
+		}
+
+		public string ModuleName {
+			get {
+				return _name;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.Configuration/ModulesConfiguration.cs b/mcs/class/System.Web/System.Web.Configuration/ModulesConfiguration.cs
new file mode 100644
index 00000000000..5c9446a02c2
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Configuration/ModulesConfiguration.cs
@@ -0,0 +1,35 @@
+// 
+// System.Web.Configuration.ModulesConfiguration
+//
+// Author:
+//   Patrik Torstensson (ptorsten@hotmail.com)
+//
+using System;
+using System.Collections;
+
+namespace System.Web.Configuration {
+	[MonoTODO]
+	public class ModulesConfiguration {
+		static private ArrayList _items = new ArrayList();
+
+		static public void Add(string name, string type) {
+			ModuleItem item = new ModuleItem(name, type);
+			_items.Add(item);
+		}
+
+		public ModulesConfiguration() {
+		}
+
+		public HttpModuleCollection CreateCollection() {
+			HttpModuleCollection items = new HttpModuleCollection();
+			int pos = 0;
+			int count = _items.Count;
+
+			for (pos = 0; pos != count; pos++) {
+				items.AddModule(((ModuleItem) _items[pos]).ModuleName, ((ModuleItem) _items[pos]).Create());
+			}
+
+			return items;
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.Hosting/AppDomainFactory.cs b/mcs/class/System.Web/System.Web.Hosting/AppDomainFactory.cs
new file mode 100644
index 00000000000..b46e7812906
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/AppDomainFactory.cs
@@ -0,0 +1,122 @@
+//
+// System.Web.Hosting.AppDomainFactory.cs
+//
+// Authors:
+// 	Bob Smith <bob@thestuff.net>
+// 	Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) Bob Smith
+// (c) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+using System;
+using System.Collections;
+using System.IO;
+using System.Security;
+using System.Security.Policy;
+using System.Text;
+
+namespace System.Web.Hosting
+{
+        public sealed class AppDomainFactory : IAppDomainFactory
+	{
+		static int nDomain = 0;
+		static string [] domainData = { ".appDomain",
+						".appId",
+						".appPath",
+						".appVPath",
+						".appName",
+						".domainId"
+						};
+
+                public object Create (string module,
+				      string typeName,
+				      string appId,
+				      string appPath,
+				      string strUrlOfAppOrigin,
+				      int iZone)
+		{
+			appPath = Path.GetFullPath (appPath);
+			if (appPath [appPath.Length - 1] == '\\')
+				appPath += '\\';
+
+			StringBuilder sb = new StringBuilder (appId);
+			sb.Append ('-');
+			lock (domainData){
+				sb.Append (nDomain.ToString ());
+				nDomain++;
+			}
+
+			sb.Append ('-' + DateTime.Now.ToString ());
+			string domainId = sb.ToString ();
+			sb = null;
+
+			int slash = appId.IndexOf ('/');
+			string vPath;
+			if (slash == -1)
+				vPath = "/";
+			else
+				vPath = appId.Substring (slash + 1);
+
+			string appName = (appId.GetHashCode () + appPath.GetHashCode ()).ToString ("x");
+			AppDomainSetup domainSetup = new AppDomainSetup ();
+
+			PopulateDomainBindings (domainId,
+						appId,
+						appName,
+						appPath,
+						vPath,
+						domainSetup,
+						null);
+
+			// May be adding more assemblies and such to Evidence?
+			AppDomain domain = AppDomain.CreateDomain (domainId,
+								   AppDomain.CurrentDomain.Evidence,
+								   domainSetup);
+
+			string [] settings = new string [6];
+			settings [0] = "*";
+			settings [1] = appId;
+			settings [2] = appPath;
+			settings [3] = vPath;
+			settings [4] = appName;
+			settings [5] = domainId;
+			for (int i = 0; i < 6; i++)
+				domain.SetData (domainData [i], settings [i]);
+
+			object o = null;
+			try {
+				o = domain.CreateInstance (module, typeName);
+			} catch {
+				AppDomain.Unload (domain);
+				o = null;
+			}
+
+			return o;
+		}
+
+		internal static void PopulateDomainBindings (string domainId,
+							     string appId,
+							     string appName,
+							     string appPath,
+							     string appVPath,
+							     AppDomainSetup setup,
+							     IDictionary dict)
+		{
+			setup.PrivateBinPath = "bin";
+			setup.PrivateBinPathProbe = "*";
+			setup.ShadowCopyFiles = "true";
+			setup.ApplicationBase = new Uri (appPath, true).ToString ();
+			setup.ApplicationName = appName;
+			setup.ConfigurationFile = "web.config";
+			if (dict != null) {
+				dict.Add (domainData [0], "*");
+				dict.Add (domainData [1], appId);
+				dict.Add (domainData [2], appPath);
+				dict.Add (domainData [3], appVPath);
+				dict.Add (domainData [4], appName);
+				dict.Add (domainData [5], domainId);
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs b/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
new file mode 100644
index 00000000000..e338e3076fe
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/ApplicationHost.cs
@@ -0,0 +1,77 @@
+//
+// System.Web.Hosting.ApplicationHost
+//
+// Authors:
+// 	Patrik Torstensson (Patrik.Torstensson@labs2.com)
+// 	(class signature from Bob Smith <bob@thestuff.net> (C) )
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+using System;
+using System.Collections;
+using System.IO;
+using System.Runtime.Remoting;
+
+namespace System.Web.Hosting
+{
+	public sealed class ApplicationHost
+	{
+		class ConfigInitHelper
+		{
+			public void InitConfig ()
+			{
+			}
+		}
+		
+		public static object CreateApplicationHost (Type hostType,
+							    string virtualDir,
+							    string physicalDir)
+		{
+			if (hostType == null)
+				throw new ArgumentException ("hostType");
+
+			if (virtualDir == null || virtualDir.Length == 0)
+				throw new ArgumentException ("virtualDir");
+			
+			if (physicalDir == null || physicalDir.Length == 0)
+				throw new ArgumentException ("physicalDir");
+
+			if (physicalDir [physicalDir.Length - 1] != Path.DirectorySeparatorChar)
+				physicalDir += Path.DirectorySeparatorChar;
+
+			int nowInt = DateTime.Now.ToString ().GetHashCode ();
+			string nowHash = nowInt.ToString ("x");
+			nowInt += physicalDir.GetHashCode ();
+			string sum = nowInt.ToString ("x");
+			Hashtable hTable = new Hashtable ();
+			AppDomainSetup domainSetup = new AppDomainSetup();
+
+			AppDomainFactory.PopulateDomainBindings (nowHash,
+								 sum,
+								 sum,
+								 physicalDir,
+								 virtualDir,
+								 domainSetup,
+								 hTable);
+			
+			AppDomain domain = AppDomain.CreateDomain (nowHash, null, domainSetup);
+			foreach (string key in hTable.Keys)
+				domain.SetData (key, (string) hTable [key]);
+
+			domain.SetData (".hostingVirtualPath", virtualDir);
+			//domain.SetData(".hostingInstallDir", ?????);
+			InitConfigInNewAppDomain (domain);
+			ObjectHandle o = domain.CreateInstance (hostType.Assembly.FullName,
+								hostType.FullName);
+			return o.Unwrap();
+		}
+
+		private static void InitConfigInNewAppDomain (AppDomain appDomain)
+		{
+			Type t = typeof (ConfigInitHelper);
+			ObjectHandle o = appDomain.CreateInstance (t.Assembly.FullName, t.FullName);
+			ConfigInitHelper helper = (ConfigInitHelper) o.Unwrap();
+			helper.InitConfig ();
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.Hosting/ChangeLog b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
new file mode 100644
index 00000000000..141886aae37
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/ChangeLog
@@ -0,0 +1,31 @@
+2002-08-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ApplicationHost.cs: use Assembly instead of Module.
+
+2002-08-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AppDomainFactory.cs: implemented.
+	* ApplicationHost.cs: implemented.
+	* SimpleWorkerRequest.cs: a few little fixes and reformatted. It's now
+	fully implemented.
+
+2002-07-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AppDomainFactory.cs:
+	* IAppDomainFactory.cs:
+	* IISAPIRuntime.cs:
+	* ISAPIRuntime.cs: make them compile.
+
+2002-04-10  Patrik Torstensson <patrik.torstensson@labs2.com>
+
+        * ApplicationHost.cs: Test implementation to support testing.
+        * SimpleWorkerRequest.cs: Rewrite and a almost full implementation.
+
+2001-08-30  Bob Smith  <bob@thestuff.net>
+
+        * AppDomainFactory.cs: Stubbed.
+        * ApplicationHost.cs: Stubbed.
+        * IAppDomainFactory.cs: Stubbed.
+        * IISAPIRuntime.cs: Stubbed.
+        * ISAPIRuntime.cs: Implemented.
+        * SimpleWorkerRequest.cs: Implemented.
diff --git a/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs b/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs
new file mode 100644
index 00000000000..2067260c4f4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/IAppDomainFactory.cs
@@ -0,0 +1,24 @@
+//
+// System.Web.Hosting.IAppDomainFactory.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+
+namespace System.Web.Hosting
+{
+        public interface IAppDomainFactory
+        {
+                object Create (string module,
+			       string typeName,
+			       string appId,
+			       string appPath,
+			       string strUrlOfAppOrigin,
+			       int iZone);
+        }
+}
+
diff --git a/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs b/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs
new file mode 100644
index 00000000000..cf4d7bf6937
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/IISAPIRuntime.cs
@@ -0,0 +1,21 @@
+//
+// System.Web.Hosting.IISAPIRuntime.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+
+namespace System.Web.Hosting
+{
+        public interface IISAPIRuntime
+        {
+                void DoGCCollect ();
+                int ProcessRequest (IntPtr ecb, int useProcessModel);
+                void StartProcessing ();
+                void StopProcessing ();
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.Hosting/ISAPIRuntime.cs b/mcs/class/System.Web/System.Web.Hosting/ISAPIRuntime.cs
new file mode 100644
index 00000000000..ac43100c95c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/ISAPIRuntime.cs
@@ -0,0 +1,48 @@
+//
+// System.Web.Hosting.ISAPIRuntime.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//   Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) Bob Smith
+// (c) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System;
+
+namespace System.Web.Hosting
+{
+        public sealed class ISAPIRuntime : IISAPIRuntime
+        {
+		[MonoTODO]
+                public ISAPIRuntime ()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+                public void DoGCCollect ()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+                public int ProcessRequest (IntPtr ecb, int iWRType)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+                public void StartProcessing ()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+                public void StopProcessing ()
+		{
+			throw new NotImplementedException ();
+		}
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs b/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs
new file mode 100644
index 00000000000..a8b69276bfe
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Hosting/SimpleWorkerRequest.cs
@@ -0,0 +1,263 @@
+// 
+// System.Web.Hosting
+//
+// Authors:
+// 	Patrik Torstensson (Patrik.Torstensson@labs2.com)
+// 	(class signature from Bob Smith <bob@thestuff.net> (C) )
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+using System;
+using System.IO;
+using System.Text;
+
+namespace System.Web.Hosting
+{
+	[MonoTODO("Implement security demands on the path usage functions (and review)")]
+	public class SimpleWorkerRequest : HttpWorkerRequest
+	{
+		private string _Page;
+		private string _Query;
+		private string _PathInfo;
+		private string _AppVirtualPath;
+		private string _AppPhysicalPath;
+		private string _AppInstallPath;
+		private TextWriter _Output;
+		private bool _HasInstallInfo;
+
+		private SimpleWorkerRequest ()
+		{
+		}
+
+		public SimpleWorkerRequest (string Page, string Query, TextWriter Output)
+		{
+			_Page = Page;
+			ParsePathInfo ();
+
+			_Query = Query;
+			AppDomain current = AppDomain.CurrentDomain;
+			_AppVirtualPath = current.GetData (".appPath").ToString ();
+			_AppInstallPath = current.GetData (".hostingVirtualPath").ToString ();
+			_AppPhysicalPath = CheckAndAddSlash (current.GetData (".hostingInstallDir").ToString ());
+			_Output = Output;
+
+			if (_AppPhysicalPath == null)
+				throw new HttpException ("Invalid app domain");
+
+			_HasInstallInfo = true;
+		}
+
+		public SimpleWorkerRequest (string AppVirtualPath,
+					    string AppPhysicalPath,
+					    string Page,
+					    string Query,
+					    TextWriter Output)
+		{
+			if (AppDomain.CurrentDomain.GetData (".appPath") == null)
+				throw new HttpException ("Invalid app domain");
+
+			_Page = Page;
+			ParsePathInfo ();
+			_Query = Query;
+			_AppVirtualPath = AppVirtualPath;
+			_AppPhysicalPath = CheckAndAddSlash (AppPhysicalPath);
+			_Output = Output;
+			_HasInstallInfo = false;
+		}
+
+		[MonoTODO("Implement security")]
+		public override string MachineInstallDirectory
+		{
+			get {
+				if (_HasInstallInfo)
+					return _AppInstallPath;
+
+				return null;
+			}
+		}
+
+		[MonoTODO("Get config path from Web.Config class")]
+		public override string MachineConfigPath
+		{
+			get {
+				return "MachineConfigPath"; //FIXME
+			}
+		}
+
+		public override void EndOfRequest ()
+		{
+		}
+
+		public override void FlushResponse (bool finalFlush)
+		{
+		}
+
+		public override string GetAppPath ()
+		{
+			return _AppVirtualPath;
+		}
+
+		public override string GetAppPathTranslated ()
+		{
+			return _AppPhysicalPath;
+		}
+
+		public override string GetFilePath ()
+		{
+			return CreatePath (false);
+		}
+
+		public override string GetFilePathTranslated ()
+		{
+			if (Path.DirectorySeparatorChar != '/')
+				return _AppPhysicalPath.Replace ('/', Path.DirectorySeparatorChar);
+
+			return _AppPhysicalPath;
+		}
+
+		public override string GetHttpVerbName ()
+		{
+			return "GET";
+		}
+
+		public override string GetHttpVersion ()
+		{
+			return "HTTP/1.0";
+		}
+
+		public override string GetLocalAddress ()
+		{
+			return "127.0.0.1";
+		}
+
+		public override int GetLocalPort ()
+		{
+			return 80;
+		}
+
+		public override string GetPathInfo ()
+		{
+			return (null != _PathInfo) ? _PathInfo : String.Empty;
+		}
+
+		public override string GetQueryString ()
+		{
+			return _Query;
+		}
+
+		public override string GetRawUrl ()
+		{
+			string path = CreatePath (true);
+			if (null != _Query && _Query.Length > 0)
+				return path + "?" + _Query;
+
+			return path;
+		}
+
+		public override string GetRemoteAddress()
+		{
+			return "127.0.0.1";
+		}
+
+		public override int GetRemotePort()
+		{
+			return 0;
+		}
+
+		public override string GetServerVariable(string name)
+		{
+			return String.Empty;
+		}
+
+		public override string GetUriPath()
+		{
+			return CreatePath (true);
+		}
+
+		public override IntPtr GetUserToken()
+		{
+			return IntPtr.Zero;
+		}
+
+		public override string MapPath (string path)
+		{
+			string sPath = _AppPhysicalPath.Substring (0, _AppPhysicalPath.Length - 1);
+			if (path != null && path.Length > 0 && path [0] != '/')
+				return sPath;
+ 
+			char sep = Path.DirectorySeparatorChar;
+			if (path.StartsWith(_AppVirtualPath)) {
+				if (sep == '/')
+					return sPath + path.Substring (_AppVirtualPath.Length);
+				else
+					return sPath + path.Substring (_AppVirtualPath.Length).Replace ('/', '\\');
+			}
+
+			return null;
+		}
+
+		public override void SendKnownResponseHeader (int index, string value)
+		{
+		}
+
+		public override void SendResponseFromFile (IntPtr handle, long offset, long length)
+		{
+		}
+
+		public override void SendResponseFromFile (string filename, long offset, long length)
+		{
+		}
+
+		public override void SendResponseFromMemory (byte [] data, int length)
+		{
+			_Output.Write (Encoding.Default.GetChars (data, 0, length));
+		}
+
+		public override void SendStatus(int statusCode, string statusDescription)
+		{
+		}
+
+		public override void SendUnknownResponseHeader(string name, string value)
+		{
+		}
+
+		// Create's a path string
+		private string CheckAndAddSlash(string sPath)
+		{
+			if (null == sPath)
+				return null;
+
+			if (!sPath.EndsWith ("" + Path.DirectorySeparatorChar))
+				return sPath + Path.DirectorySeparatorChar;
+
+			return sPath;
+		}
+
+		// Create's a path string
+		private string CreatePath (bool bIncludePathInfo)
+		{
+			string sPath;
+
+			if ("/" == _AppVirtualPath) {
+				sPath = _AppVirtualPath + "/" + _Page;
+			} else {
+				sPath = "/" + _Page;
+			}
+
+			if (bIncludePathInfo && null != _PathInfo)
+				return sPath + _PathInfo;
+
+			return sPath;
+		}
+
+		// Parses out the string after / know as the "path info"
+		private void ParsePathInfo ()
+		{
+			int iPos = _Page.IndexOf("/");
+			if (iPos >= 0) {
+				_PathInfo = _Page.Substring (iPos);
+				_Page = _Page.Substring (0, iPos);
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.Mail/ChangeLog b/mcs/class/System.Web/System.Web.Mail/ChangeLog
new file mode 100644
index 00000000000..22aa7695cac
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Mail/ChangeLog
@@ -0,0 +1,8 @@
+2002-04-26  Lawrence Pit <loz@cable.a2000.nl>
+
+	* MailAttachment.cs: Implemented
+	* MailEncoding.cs: Implemented
+	* MailFormat.cs: Implemented
+	* MailMessage.cs: Implemented
+	* MailPriority.cs: Implemented
+	* SmtpMail.cs: Stubbed
diff --git a/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs b/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs
new file mode 100644
index 00000000000..b0f5dfcc3a7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Mail/MailAttachment.cs
@@ -0,0 +1,44 @@
+//

+// System.Web.Mail.MailAttachment.cs

+//

+// Author:

+//    Lawrence Pit (loz@cable.a2000.nl)

+//

+

+namespace System.Web.Mail

+{

+	public class MailAttachment

+	{

+		private string filename;

+		private MailEncoding encoding;

+		

+		public MailAttachment (string filename) : 

+			this (filename, MailEncoding.Base64) 

+		{

+		}

+		

+		public MailAttachment (string filename, MailEncoding encoding) 

+		{

+			this.filename = filename;

+			this.encoding = encoding;

+			try {

+				System.IO.File.OpenRead (filename).Close ();

+			} catch (Exception) {

+				throw new System.Web.HttpException ("Cannot find file: " + filename);

+			}			

+		}

+		

+		// Properties

+		public string Filename 

+		{

+			get { return filename; } 

+		}

+		

+		public MailEncoding Encoding 

+		{

+			get { return encoding; } 

+		}		

+	

+	}

+	

+} //namespace System.Web.Mail

diff --git a/mcs/class/System.Web/System.Web.Mail/MailEncoding.cs b/mcs/class/System.Web/System.Web.Mail/MailEncoding.cs
new file mode 100644
index 00000000000..16b1b341a91
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Mail/MailEncoding.cs
@@ -0,0 +1,26 @@
+//

+// System.Web.Mail.MailEncoding.cs

+//

+// Author:

+//    Lawrence Pit (loz@cable.a2000.nl)

+//

+

+namespace System.Web.Mail 

+{

+

+	/// <summary>

+	/// </summary>

+	public enum MailEncoding 

+	{

+

+		/// <summary>

+		/// </summary>

+		UUEncode = 0,

+

+		/// <summary>

+		/// </summary>

+		Base64 = 1

+

+	} 

+	

+} //namespace System.Web.Mail

diff --git a/mcs/class/System.Web/System.Web.Mail/MailFormat.cs b/mcs/class/System.Web/System.Web.Mail/MailFormat.cs
new file mode 100644
index 00000000000..e1050d78549
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Mail/MailFormat.cs
@@ -0,0 +1,26 @@
+//

+// System.Web.Mail.MailFormat.cs

+//

+// Author:

+//    Lawrence Pit (loz@cable.a2000.nl)

+//

+

+namespace System.Web.Mail 

+{

+

+	/// <summary>

+	/// </summary>

+	public enum MailFormat 

+	{

+

+		/// <summary>

+		/// </summary>

+		Text = 0,

+	

+		/// <summary>

+		/// </summary>

+		Html = 1

+

+	} 

+	

+} //namespace System.Web.Mail

diff --git a/mcs/class/System.Web/System.Web.Mail/MailMessage.cs b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
new file mode 100644
index 00000000000..11d85b9c04c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Mail/MailMessage.cs
@@ -0,0 +1,106 @@
+//

+// System.Web.Mail.MailMessage.cs

+//

+// Author:

+//    Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+using System.Text;

+

+namespace System.Web.Mail

+{

+	/// <remarks>

+	/// </remarks>

+	public class MailMessage

+	{

+		private ArrayList attachments;

+		private string bcc;

+		private string body;

+		private Encoding bodyEncoding;

+		private MailFormat bodyFormat;

+		private string cc;		

+		private string from;

+		private ListDictionary headers;

+		private MailPriority priority;

+		private string subject;

+		private string to;

+		private string urlContentBase;

+		private string urlContentLocation;

+		

+		// Constructor		

+		public MailMessage ()

+		{

+			attachments = new ArrayList (8);

+			headers = new ListDictionary ();

+		}		

+	

+		// Properties

+		public IList Attachments {

+			get { return (IList) attachments; }

+		}		

+		

+		public string Bcc {

+			get { return bcc; } 

+			set { bcc = value; }

+		}

+	

+		public string Body {

+			get { return body; } 

+			set { body = value; }

+		}

+

+		public Encoding BodyEncoding {

+			get { return bodyEncoding; } 

+			set { bodyEncoding = value; }

+		}

+

+		public MailFormat BodyFormat {

+			get { return bodyFormat; } 

+			set { bodyFormat = value; }

+		}		

+

+		public string Cc {

+			get { return cc; } 

+			set { cc = value; }

+		}

+

+		public string From {

+			get { return from; } 

+			set { from = value; }

+		}

+

+		public IDictionary Headers {

+			get { return (IDictionary) headers; }

+		}

+		

+		public MailPriority Priority {

+			get { return priority; } 

+			set { priority = value; }

+		}

+		

+		public string Subject {

+			get { return subject; } 

+			set { subject = value; }

+		}

+

+		public string To {

+			get { return to; }   

+			set { to = value; }

+		}

+

+		public string UrlContentBase {

+			get { return urlContentBase; } 

+			set { urlContentBase = value; }

+		}

+

+		public string UrlContentLocation {

+			get { return urlContentLocation; } 

+			set { urlContentLocation = value; }

+		}

+

+	}

+	

+} //namespace System.Web.Mail

diff --git a/mcs/class/System.Web/System.Web.Mail/MailPriority.cs b/mcs/class/System.Web/System.Web.Mail/MailPriority.cs
new file mode 100644
index 00000000000..6b6c638edf2
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Mail/MailPriority.cs
@@ -0,0 +1,30 @@
+//

+// System.Web.Mail.MailPriority.cs

+//

+// Author:

+//    Lawrence Pit (loz@cable.a2000.nl)

+//

+

+namespace System.Web.Mail 

+{

+

+	/// <summary>

+	/// </summary>

+	public enum MailPriority 

+	{

+

+		/// <summary>

+		/// </summary>

+		Normal = 0,

+		

+		/// <summary>

+		/// </summary>

+		Low = 1,

+

+		/// <summary>

+		/// </summary>

+		High = 2

+

+	} 

+	

+} //namespace System.Web.Mail

diff --git a/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs b/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
new file mode 100644
index 00000000000..9884191f171
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Mail/SmtpMail.cs
@@ -0,0 +1,75 @@
+//

+// System.Web.Mail.SmtpMail.cs

+//

+// Author:

+//    Lawrence Pit (loz@cable.a2000.nl)

+//

+//

+

+using System;

+using System.Net;

+using System.Reflection;

+

+namespace System.Web.Mail

+{

+	/// <remarks>

+	/// </remarks>

+	public class SmtpMail

+	{

+		private static string smtpServer;

+		

+		// Constructor		

+		private SmtpMail ()

+		{

+			/* empty */

+		}		

+

+		// Properties

+		public static string SmtpServer {

+			get { return smtpServer; } 

+			set { smtpServer = value; }

+		}

+		

+		[MonoTODO]

+		public static void Send (MailMessage message) 

+		{

+			// delegate work to loosly coupled component Mono.Mail

+			

+			// Mono.Mail.Smtp.SmtpSender.Send (smtpServer, message);	

+			

+			// NOTE: Mono.Mail is work in progress, and could be replaced by 

+			// another component. For now:

+			

+			throw new NotImplementedException("Mono.Mail component is work in progress");

+

+			try {

+				// TODO: possibly cache ctor info object..

+				Type stype = Type.GetType ("Mono.Mail.Smtp.SmtpSender");

+				if (stype == null) {

+					throw new Exception ("You must have Mono.Mail installed to send mail.");

+				}

+				Type[] types = new Type[2];

+				types[0] = typeof (string);

+				types[1] = message.GetType ();

+				ConstructorInfo cinfo = 

+					stype.GetConstructor(BindingFlags.Instance | BindingFlags.Public, null,

+						CallingConventions.HasThis, types, null);

+				cinfo.Invoke (new object[] {smtpServer, message});

+			} catch (Exception) {

+				throw new Exception ("Unable to call Mono.Mail.Smtp.SmtpSender");

+			}

+		}

+		

+		public static void Send (string from, string to, string subject, string messageText) 

+		{

+			MailMessage message = new MailMessage ();

+			message.From = from;

+			message.To = to;

+			message.Subject = subject;

+			message.Body = messageText;

+			Send (message);

+		}

+	

+	}

+	

+} //namespace System.Web.Mail

diff --git a/mcs/class/System.Web/System.Web.Security/ChangeLog b/mcs/class/System.Web/System.Web.Security/ChangeLog
new file mode 100644
index 00000000000..1aaf169afc7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Security/ChangeLog
@@ -0,0 +1,4 @@
+2002-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* DefaultAuthenticationEventArgs.cs: added file.
+
diff --git a/mcs/class/System.Web/System.Web.Security/DefaultAuthenticationEventArgs.cs b/mcs/class/System.Web/System.Web.Security/DefaultAuthenticationEventArgs.cs
new file mode 100644
index 00000000000..2031b829d9d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Security/DefaultAuthenticationEventArgs.cs
@@ -0,0 +1,32 @@
+//
+// System.Web.Security.DefaultAuthenticationEventArgs
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+namespace System.Web.Security {
+	using System;
+	using System.Web;
+	
+public sealed class DefaultAuthenticationEventArgs : EventArgs
+{
+	private HttpContext _context;
+
+	public DefaultAuthenticationEventArgs (HttpContext context)
+	{
+		if (context == null)
+			throw new ArgumentNullException ("context");
+
+		_context = context;
+	}
+
+	public HttpContext Context
+	{
+		get { return _context; }
+	}
+}
+}
+
diff --git a/mcs/class/System.Web/System.Web.SessionState/ChangeLog b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
new file mode 100644
index 00000000000..7376c29e799
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.SessionState/ChangeLog
@@ -0,0 +1,34 @@
+2002-08-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpSessionState.cs: IsAbandoned is internal.
+	* SessionDictionary.cs: scope fixes.
+	* SessionStateModule.cs: added events.
+
+2002-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.SessionState/HttpSessionState.cs: 
+	Fixes based on class status page:
+	
+		- Add attributes (DefaultEvent, ParseChildren).
+		- Fix declarations.
+		- Explicitly implement some interfaces (IPostBackDataHandler
+		and IPostBackEventHandler).
+		- Implemented some missing methods.
+
+2002-06-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpSessionState.cs: implemented more methods/properties.
+	* SessionDictionary.cs: New file.
+
+2002-06-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.SessionState/HttpSessionState.cs:
+	* System.Web.SessionState/SessionStateModule.cs: new files with some
+	implementation and the rest stubbed.
+
+2002-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IReadOnlySessionState.cs:
+	* IRequiresSessionState.cs:
+	* SessionStateMode.cs: new files.
+
diff --git a/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.cs b/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.cs
new file mode 100644
index 00000000000..324470a97cc
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.SessionState/HttpSessionState.cs
@@ -0,0 +1,199 @@
+//
+// System.Web.SessionState.HttpSessionState
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Threading;
+
+namespace System.Web.SessionState {
+public sealed class HttpSessionState : ICollection, IEnumerable
+{
+	private NameValueCollection _state; //FIXME: it should be a ManagementNamedValueCollection
+	private string _id;
+	private SessionDictionary _dict;
+	private HttpStaticObjectsCollection _staticObjects;
+	private int _timeout;
+	private bool _newSession;
+	private bool _isCookieless;
+	private SessionStateMode _mode;
+	private bool _isReadonly;
+	private bool _abandoned;
+
+	internal HttpSessionState (string id,
+				   SessionDictionary dict,
+				   HttpStaticObjectsCollection staticObjects,
+				   int timeout,
+				   bool newSession,
+				   bool isCookieless,
+				   SessionStateMode mode,
+				   bool isReadonly)
+	{
+		_id = id;
+		_dict = dict;
+		_staticObjects = staticObjects;
+		_timeout = timeout;
+		_newSession = newSession;
+		_isCookieless = isCookieless;
+		_mode = mode;
+		_isReadonly = isReadonly;
+	}
+
+	// Compatibility with ASP
+	public int CodePage
+	{
+		get { return 0; }
+		set { }
+	}
+
+	public HttpSessionState Contents
+	{
+		get { return this; }
+	}
+
+	public int Count
+	{
+		get { return _state.Count; }
+	}
+
+	internal bool IsAbandoned
+	{
+		get { return _abandoned; }
+	}
+
+	public bool IsCookieless
+	{
+		get { return _isCookieless; }
+	}
+
+	public bool IsNewSession
+	{
+		get { return _newSession; }
+	}
+
+	public bool IsReadOnly
+	{
+		get { return _isReadonly; }
+	}
+
+	public bool IsSynchronized
+	{
+		get { return false; }
+	}
+
+	public object this [string key]
+	{
+		get { return _state [key]; }
+		set { _state [key] = (string) value; }
+	}
+
+	public object this [int index]
+	{
+		get { return _state [index]; }
+		set {
+			string key = _state.Keys [index];
+			_state [key] = (string) value;
+		}
+	}
+
+	public NameObjectCollectionBase.KeysCollection Keys
+	{
+		get { return _state.Keys; }
+	}
+
+	public int LCID
+	{
+		get { return Thread.CurrentThread.CurrentCulture.LCID; }
+		set { Thread.CurrentThread.CurrentCulture = new CultureInfo(value); }
+	}
+
+	public SessionStateMode Mode
+	{
+		get { return _mode; }
+	}
+
+	public string SessionID
+	{
+		get { return _id; }
+	}
+
+	public HttpStaticObjectsCollection StaticObjects
+	{
+		get { return _staticObjects; }
+	}
+
+	public object SyncRoot
+	{
+		get { return this; }
+	}
+
+	public int Timeout
+	{
+		get { return _timeout; }
+		set { _timeout = value; }
+	}
+
+	public void Abandon ()
+	{
+		_abandoned = true;
+	}
+
+	public void Add (string name, object value)
+	{
+		if (_state == null)
+			_state = new NameValueCollection ();
+
+		_state.Add (name, (string) value);
+	}
+
+	public void Clear ()
+	{
+		if (_state != null)
+			_state.Clear ();
+	}
+	
+	public void CopyTo (Array array, int index)
+	{
+		if (_state == null)
+			_state = new NameValueCollection ();
+
+		_state.CopyTo (array, index);
+	}
+
+	public IEnumerator GetEnumerator ()
+	{
+		if (_state == null)
+			_state = new NameValueCollection ();
+
+		return _state.GetEnumerator ();
+	}
+	
+	public void Remove (string name)
+	{
+		if (_state != null)
+			_state.Remove (name);
+	}
+
+	public void RemoveAll ()
+	{
+		if (_state != null)
+			foreach (string key in _state.AllKeys)
+				_state.Remove (key);
+	}
+
+	[MonoTODO("Implement ManagementNameValueCollection")]
+	public void RemoveAt (int index)
+	{
+		throw new NotImplementedException ();
+		//if (_state != null)
+		//	_state.RemoveAt (index);
+	}
+}
+}
+
diff --git a/mcs/class/System.Web/System.Web.SessionState/IReadOnlySessionState.cs b/mcs/class/System.Web/System.Web.SessionState/IReadOnlySessionState.cs
new file mode 100644
index 00000000000..d9eb664a484
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.SessionState/IReadOnlySessionState.cs
@@ -0,0 +1,15 @@
+//
+// System.Web.SessionState.IReadOnlySessionState
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+namespace System.Web.SessionState {
+public interface IReadOnlySessionState : IRequiresSessionState
+{
+}
+}
+
diff --git a/mcs/class/System.Web/System.Web.SessionState/IRequiresSessionState.cs b/mcs/class/System.Web/System.Web.SessionState/IRequiresSessionState.cs
new file mode 100644
index 00000000000..dd9a40b732b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.SessionState/IRequiresSessionState.cs
@@ -0,0 +1,15 @@
+//
+// System.Web.SessionState.IRequiresSessionState
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+namespace System.Web.SessionState {
+public interface IRequiresSessionState
+{
+}
+}
+
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionDictionary.cs b/mcs/class/System.Web/System.Web.SessionState/SessionDictionary.cs
new file mode 100644
index 00000000000..a389125e1dd
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionDictionary.cs
@@ -0,0 +1,93 @@
+//
+// System.Web.SessionState.SessionDictionary
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.IO;
+using System.Collections.Specialized;
+
+namespace System.Web.SessionState {
+internal class SessionDictionary : NameObjectCollectionBase
+{
+	private bool _dirty;
+
+	static SessionDictionary ()
+	{
+	}
+
+	public SessionDictionary ()
+	{
+	}
+
+	void Clear ()
+	{
+		_dirty = true;
+		BaseClear ();
+	}
+
+	[MonoTODO]
+	static SessionDictionary Deserialize (BinaryReader r)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public string GetKey (int index)
+	{
+		return BaseGetKey (index);
+	}
+
+	[MonoTODO]
+	static bool IsInmutable (object o)
+	{
+		throw new NotImplementedException ();
+	}
+
+	void Remove (string s)
+	{
+		BaseRemove (s);
+		_dirty = true;
+	}
+
+	void RemoveAt (int index)
+	{
+		BaseRemoveAt (index);
+		_dirty = true;
+	}
+
+	[MonoTODO]
+	void Serialize(BinaryWriter w)
+	{
+		throw new NotImplementedException ();
+	}
+
+	bool Dirty
+	{
+		get { return _dirty; }
+		set { _dirty = value; }
+	}
+
+	internal object this [string s]
+	{
+		get { return BaseGet (s); }
+		set {
+			BaseSet (s, value);
+			_dirty = true;
+		}
+	}
+
+	public object this [int index]
+	{
+		get { return BaseGet (index); }
+		set {
+			BaseSet (index, value);
+			_dirty = true;
+		}
+	}
+}
+
+}
+
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateMode.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateMode.cs
new file mode 100644
index 00000000000..1a5fcc290c3
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateMode.cs
@@ -0,0 +1,20 @@
+//
+// System.Web.SessionState.SessionStateMode
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+namespace System.Web.SessionState {
+public enum SessionStateMode
+{
+	Off = 0,
+	InProc = 1,
+	StateServer = 2,
+	SQLServer = 3
+}
+
+}
+
diff --git a/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs b/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
new file mode 100644
index 00000000000..05cde3224f4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.SessionState/SessionStateModule.cs
@@ -0,0 +1,35 @@
+//

+// System.Web.SessionState.SesionStateModule

+//

+// Authors:

+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)

+//

+// (C) 2002 Ximian, Inc (http://www.ximian.com)

+//

+using System.Web;

+

+namespace System.Web.SessionState

+{

+	public sealed class SessionStateModule : IHttpModule

+	{

+		public SessionStateModule ()

+		{

+		}

+

+		[MonoTODO()]

+		public void Dispose ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO()]

+		public void Init (HttpApplication app)

+		{

+			throw new NotImplementedException ();

+		}

+

+		public event EventHandler Start;

+		public event EventHandler End;

+	}

+}

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
new file mode 100644
index 00000000000..65325f9c05d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/ChangeLog
@@ -0,0 +1,206 @@
+2002-07-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlControl.cs: the attributes must use ViewState as its StateBag,
+	if not style values are lost between postbacks.
+
+2002-07-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlAnchor.cs:
+	* HtmlButton.cs:
+	* HtmlInputButton.cs:
+	* HtmlInputCheckBox.cs:
+	* HtmlInputHidden.cs:
+	* HtmlInputImage.cs:
+	* HtmlInputText.cs:
+	* HtmlTextArea.cs: Initialize EventHandlerList indexer.
+
+	* HtmlContainerControl.cs: almost rewritten to use a LiteralControl
+	instead of maintaining some flags and strings. Implemented
+	LoadViewState.
+
+	* HtmlControl.cs: fixed constructor and added ViewStateIgnoreCase.
+
+	* HtmlSelect.cs: fixed TrackViewState, SaveViewState, SelectedIndices
+	and Value.
+
+2002-07-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlGenericControl.cs: fixed TagName signature and get/set.
+	* HtmlInputImage.cs: added attribute and fixed signature of ServerClick.
+	* HtmlInputText.cs: added attribute.
+
+2002-07-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlForm.cs: don't render action attribute.
+
+2002-07-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlContainerControl.cs: 
+	(CreateControlCollection): added. All containers must have a non-empty
+	control collection.
+
+2002-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.UI.HtmlControls/HtmlAnchor.cs: 
+	* System.Web.UI.HtmlControls/HtmlButton.cs: 
+	* System.Web.UI.HtmlControls/HtmlControl.cs: 
+	* System.Web.UI.HtmlControls/HtmlForm.cs: 
+	* System.Web.UI.HtmlControls/HtmlGenericControl.cs: 
+	* System.Web.UI.HtmlControls/HtmlInputButton.cs: 
+	* System.Web.UI.HtmlControls/HtmlInputCheckBox.cs: 
+	* System.Web.UI.HtmlControls/HtmlInputControl.cs: 
+	* System.Web.UI.HtmlControls/HtmlInputFile.cs: 
+	* System.Web.UI.HtmlControls/HtmlInputHidden.cs: 
+	* System.Web.UI.HtmlControls/HtmlInputImage.cs: 
+	* System.Web.UI.HtmlControls/HtmlInputRadioButton.cs: 
+	* System.Web.UI.HtmlControls/HtmlInputText.cs: 
+	* System.Web.UI.HtmlControls/HtmlSelect.cs: 
+	* System.Web.UI.HtmlControls/HtmlTable.cs: 
+	* System.Web.UI.HtmlControls/HtmlTableCell.cs: 
+	* System.Web.UI.HtmlControls/HtmlTableRow.cs: 
+	* System.Web.UI.HtmlControls/HtmlTextArea.cs: 
+
+	Fixes based on class status page:
+	
+		- Add attributes (DefaultEvent, ParseChildren).
+		- Fix declarations.
+		- Explicitly implement some interfaces (IPostBackDataHandler
+		and IPostBackEventHandler).
+		- Implemented some missing methods.
+
+2002-06-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlForm.cs:
+	(RenderChildren): use OnFormRender and OnFormPostRender.
+
+2002-06-09  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlSelect.cs:
+	(RenderAttributes): new -> override and fixes stack overflow.
+	(RenderChildren): only 1 option can be selected at any given time
+	except when Multiple property is true.
+	(Multiple): the attribute value is either "true" or "false", not 
+	"multiple".
+
+	* HtmlTable.cs:
+	(Add):
+	(AddAt): allow HtmlTableRow as children, not HtmlTableCell.
+
+	* HtmlTableCell.cs:
+	(RenderEndTag): new -> override.
+
+	* HtmlTableRow.cs:
+	(RenderChildren): fixed another stack overflow.
+	(RenderEndTag): new -> override.
+
+	* HtmlTextArea.cs:
+	(RenderAttributes): new -> override.
+
+
+2002-06-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlInputHidden.cs: fixed constructor.
+
+	* HtmlInputRadioButton.cs:
+	(RenderAttributes): fixed stack overflow.
+
+	(Name):
+	(RenderedName): new -> override.
+
+	(Value): new property. 
+
+	* HtmlInputText.cs:
+	(RenderAttributes): fixed the same kind of stack overflow and make
+	string comparison case insensitive.
+
+2002-06-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlForm.cs: fixed name of Enctype property and render enctype
+	enctype attribute.
+
+	* HtmlInputControl.cs: tag type is "input", not "type".
+
+2002-06-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlControl.cs: Render contents moved to new RenderBeginTag method,
+	defined in MS docs. 
+	
+	* HtmlForm.cs: Render output when no IE browser.
+
+	* HtmlInputButton.cs: added constructor without arguments. Xsp used it, 
+	though now it always use the other .ctor.
+	
+	* HtmlInputControl.cs: cosmetic changes and implemented set_Name.
+
+2002-06-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlButton.cs: RenderAttributes is an override, not new.
+
+	* HtmlContainerControl.cs: use the new Render method in HtmlControl.
+
+	* HtmlControl.cs: added Render method to render the tag and its
+	attributes. Works for container and non-containers.
+
+	* HtmlImage.cs: RenderAttributes don't need to be new. Implemented
+	Height property.
+	
+2002-06-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlContainerControl.cs: some formatting and use HttpUtility.Encode
+	instead of Page.Server to encode InnerText.
+
+2002-06-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlAnchor.cs:
+	(RenderAttributes): new -> override and fixed little bug that made
+	it cause an stack overflow.
+
+	* HtmlContainerControl.cs: reformatted and added tag and attributes 
+	rendering.
+
+	* HtmlGenericControl.cs: removed TagName, which is already in 
+	HtmlControl.
+
+	* HtmlTable.cs:
+	(RenderEndTag): new -> override.
+
+2002-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.UI.HtmlControls/HtmlForm.cs:
+	(RenderAttributes): changed new by override.
+	(Name): allow setting the property.
+
+2002-05-10  Duncan Mak  <duncan@ximian.com>
+
+	* HtmlTableCellCollection.cs (this): Updated the indexer to return
+	the right type, HtmlTableCell instead of HtmlTableRow. 
+
+	* HtmlInputImage.cs (OnServerClick): Commented out parts that
+	won't compile.
+
+	* HtmlForm.cs (RenderAttributes): 
+	(RenderChildren): Commented out code that doesn't compile. 
+
+2002-05-07  Duncan Mak  <duncan@ximian.com>
+
+	* HtmlSelect.cs (TrackViewState): Added 'new' keyword to avoid
+	clashing with the method defined in the parent class.
+	(OnDataBinding): Added missing casts.
+
+	* HtmlForm.cs (Render): Fixed call too SetAttribute, need to cast
+	'this' to IAttributeAccessor before calling interface method.
+	Also renamed some calls to reflect changes in the API.
+
+	* HtmlControl.cs (WriteOnClickAttribute): Made it not static and
+	fixed a typo.
+
+2001-09-03  Leen Toelen  <toelen@hotmail.com>
+
+        * HtmlAnchor.cs: Initial implementation.
+        * HtmlTextArea.cs: Initial implementation.
+
+2001-08-22  Bob Smith  <bob@thestuff.net>
+
+         * HtmlContainerControl.cs: Initial implementation.
+         * HtmlControl.cs: Initial implementation.
+         * HtmlGenericControl.cs: Initial implementation.
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs
new file mode 100644
index 00000000000..67a2b7f76f9
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlAnchor.cs
@@ -0,0 +1,106 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[DefaultEvent("ServerClick")]

+	public class HtmlAnchor : HtmlContainerControl, IPostBackEventHandler{

+		

+		private static readonly object EventServerClick = new object ();

+		

+		static HtmlAnchor(){

+			EventServerClick = new Object();

+		}

+		

+		public HtmlAnchor(): base("a"){}

+		

+		protected override void OnPreRender (EventArgs e)

+		{

+			base.OnPreRender (e);

+		}

+

+		protected virtual void OnServerClick(EventArgs e){

+			EventHandler handler;

+			handler = (EventHandler) Events[EventServerClick];

+			if(handler != null) handler.Invoke(this, e);

+		}

+		

+		protected override void RenderAttributes(HtmlTextWriter writer){

+			if ( Events[EventServerClick] != null){

+				Attributes.Remove("href");

+				base.RenderAttributes(writer);

+				writer.WriteAttribute("href", Page.GetPostBackClientHyperlink(this,String.Empty));

+			}

+			else{

+				PreProcessRelativeReference(writer,"href");

+				base.RenderAttributes(writer);

+			}

+		}

+		

+		void System.Web.UI.IPostBackEventHandler.RaisePostBackEvent(string eventArgument){

+			OnServerClick(EventArgs.Empty);

+		}

+		

+		public event EventHandler ServerClick{

+			add{

+				Events.AddHandler(EventServerClick, value);

+			}

+			remove{

+				Events.RemoveHandler(EventServerClick, value);

+			}

+		}

+		

+		public string HRef{

+			get{

+				string attr = Attributes["href"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["href"] = AttributeToString(value);

+			}

+		}

+		

+		public string Name{

+			get{

+				string attr = Attributes["name"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["name"] = AttributeToString(value);

+			}

+		}

+		

+		public string Target{

+			get{

+				string attr = Attributes["target"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["target"] = AttributeToString(value);

+			}

+		}

+		

+		public string Title{

+			get{

+				string attr = Attributes["title"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["title"] = AttributeToString(value);

+			}

+		}

+		

+	} // class HtmlAnchor

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs
new file mode 100644
index 00000000000..4b507d6d4c4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlButton.cs
@@ -0,0 +1,72 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[DefaultEvent("ServerClick")]

+	public class HtmlButton : HtmlContainerControl, IPostBackEventHandler{

+		

+		private static readonly object EventServerClick = new object ();

+		

+		//Checked

+		static HtmlButton(){

+			EventServerClick = new Object();

+		}

+		//Checked

+		public HtmlButton(): base("button"){}

+		

+		//Checked

+		protected virtual void OnServerClick(EventArgs e){

+			EventHandler handler;

+			handler = (EventHandler) Events[EventServerClick];

+			if(handler != null){

+				handler.Invoke(this, e);

+			}

+		}

+		

+		protected override void RenderAttributes(HtmlTextWriter writer){

+			if (Page != null && Events[EventServerClick] != null){

+				/* Got to figure out how to manage events */

+			}

+			base.RenderAttributes(writer);

+		}

+		

+		void System.Web.UI.IPostBackEventHandler.RaisePostBackEvent(string eventArgument){

+			if (CausesValidation){

+				Page.Validate();

+			}

+			OnServerClick(EventArgs.Empty);

+		}

+		

+		public event EventHandler ServerClick{

+			add{

+				Events.AddHandler(EventServerClick, value);

+			}

+			remove{

+				Events.RemoveHandler(EventServerClick, value);

+			}

+		}

+		

+		public bool CausesValidation{

+			get{

+				object attr = ViewState["CausesValidation"];

+				if (attr != null){

+					return (Boolean) attr;

+				}

+				return true;

+			}

+			set{

+				ViewState["CausesValidation"] = (Boolean) value;

+			}

+		}

+		

+	} // class HtmlButton

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs
new file mode 100644
index 00000000000..b7f4aac2108
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlContainerControl.cs
@@ -0,0 +1,117 @@
+//
+// System.Web.UI.HtmlControls.HtmlContainerControl.cs
+//
+// Authors:
+// 	Bob Smith <bob@thestuff.net>
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) Bob Smith
+// (c) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System;
+using System.Text;
+using System.Web;
+using System.Web.UI;
+
+//LAMESPEC: The dox talk about HttpException but are very ambigious.
+//TODO: Check to see if Render really is overridden instead of a LiteralControl being added. It apears that this is the
+//case due to testing. Anything inside the block is overwritten by the content of this control, so it doesnt apear
+//to do anything with children.
+// a doc references this. add? protected override ControlCollection CreateControlCollection();
+
+//TODO: If Test.InnerText = Test.InnerHtml without ever assigning anything into InnerHtml, you get this:
+// Exception Details: System.Web.HttpException: Cannot get inner content of Message because the contents are not literal.
+//[HttpException (0x80004005): Cannot get inner content of Message because the contents are not literal.]
+//  System.Web.UI.HtmlControls.HtmlContainerControl.get_InnerHtml() +278
+//  ASP.test3_aspx.AnchorBtn_Click(Object Source, EventArgs E) in \\genfs2\www24\bobsmith11\test3.aspx:6
+//  System.Web.UI.HtmlControls.HtmlAnchor.OnServerClick(EventArgs e) +108
+//  System.Web.UI.HtmlControls.HtmlAnchor.System.Web.UI.IPostBackEventHandler.RaisePostBackEvent(String eventArgument) +26
+//  System.Web.UI.Page.RaisePostBackEvent(IPostBackEventHandler sourceControl, String eventArgument) +18
+//  System.Web.UI.Page.RaisePostBackEvent(NameValueCollection postData) +149
+//  System.Web.UI.Page.ProcessRequestMain() +660
+
+
+namespace System.Web.UI.HtmlControls
+{
+	public abstract class HtmlContainerControl : HtmlControl{
+		
+		public HtmlContainerControl () : this ("span") {}
+		
+		public HtmlContainerControl (string tag) : base(tag) {}
+		
+		public virtual string InnerHtml
+		{
+			get {
+				if (Controls.Count == 0)
+					return String.Empty;
+
+				bool is_literal = true;
+				StringBuilder text = new StringBuilder ();
+				foreach (Control ctrl in Controls) {
+					LiteralControl lc = ctrl as LiteralControl;
+					if (lc == null) {
+						is_literal = false;
+						break;
+					}
+					text.Append (lc.Text);
+				}
+					
+				if (!is_literal)
+					throw new HttpException ("There is no literal content!");
+
+				return text.ToString ();
+			}
+
+			set {
+				Controls.Clear ();
+				Controls.Add (new LiteralControl (value));
+				ViewState ["innerhtml"] = value;
+			}
+		}
+		
+		public virtual string InnerText
+		{
+			get {
+				return InnerHtml; //FIXME: decode it
+			}
+
+			set {
+				InnerHtml = value; //FIXME: encode it
+			}
+		}
+		
+		protected override void Render (HtmlTextWriter writer)
+		{
+			RenderBeginTag (writer);
+			RenderChildren (writer);
+			RenderEndTag (writer);
+		}
+
+		protected virtual void RenderEndTag (HtmlTextWriter writer)
+		{
+			writer.WriteEndTag (TagName);
+		}
+
+		protected override void RenderAttributes (HtmlTextWriter writer)
+		{
+			ViewState.Remove ("innerhtml");
+			base.RenderAttributes (writer);
+		}
+
+		protected override ControlCollection CreateControlCollection ()
+		{
+			return new ControlCollection (this);
+		}
+
+		protected override void LoadViewState (object savedState)
+		{
+			if (savedState != null) {
+				base.LoadViewState (savedState);
+				string inner = ViewState ["innerhtml"] as string;
+				if (inner != null)
+					InnerHtml = inner;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs
new file mode 100644
index 00000000000..9bea972173d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlControl.cs
@@ -0,0 +1,121 @@
+//

+// System.Web.UI.HtmlControls.HtmlControl.cs

+//

+// Author

+//   Bob Smith <bob@thestuff.net>

+//

+//

+// (C) Bob Smith

+//

+

+using System;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	

+	public abstract class HtmlControl : Control, IAttributeAccessor

+	{

+		private string _tagName = "span";

+		private AttributeCollection _attributes;

+		private bool _disabled = false;

+		

+		public HtmlControl() : this ("span") {}

+		

+		public HtmlControl(string tag)

+		{

+			_tagName = tag;

+		}

+		

+		protected override ControlCollection CreateControlCollection ()

+		{

+			return new EmptyControlCollection (this);

+		}

+

+		internal static string AttributeToString(int n){

+			if (n != -1)return n.ToString(NumberFormatInfo.InvariantInfo);

+			return null;

+		}

+		

+		internal static string AttributeToString(string s){

+			if (s != null && s.Length != 0) return s;

+			return null;

+		}

+		

+		internal void PreProcessRelativeReference(HtmlTextWriter writer, string attribName){

+			string attr = Attributes[attribName];

+			if (attr != null){

+				if (attr.Length != 0){

+					try{

+						attr = ResolveUrl(attr);

+					}

+					catch (Exception e) {

+						throw new HttpException(attribName + " property had malformed url");

+					}

+					writer.WriteAttribute(attribName, attr);

+					Attributes.Remove(attribName);

+				}

+			}

+		}

+		

+		string System.Web.UI.IAttributeAccessor.GetAttribute(string name){

+			return Attributes[name];

+		}

+		

+		void System.Web.UI.IAttributeAccessor.SetAttribute(string name, string value){

+			Attributes[name] = value;

+		}

+		

+		protected virtual void RenderBeginTag (HtmlTextWriter writer)

+		{

+			writer.WriteBeginTag (TagName);

+			RenderAttributes (writer);

+			writer.Write ('>');

+		}

+

+		protected override void Render (HtmlTextWriter writer)

+		{

+			RenderBeginTag (writer);

+		}

+		

+		protected virtual void RenderAttributes(HtmlTextWriter writer){

+			if (ID != null){

+				writer.WriteAttribute("id",ClientID);

+			}

+			Attributes.Render(writer);

+		}

+		

+		public AttributeCollection Attributes

+		{

+			get { 

+				if (_attributes == null)

+					_attributes = new AttributeCollection (ViewState);

+				return _attributes;

+			}

+		}

+

+		public bool Disabled

+		{

+			get { return _disabled; }

+			set { _disabled = value; }

+		}

+

+		public CssStyleCollection Style

+		{

+			get { return Attributes.CssStyle; }

+		}

+

+		public virtual string TagName

+		{

+			get { return _tagName; }

+		}

+

+		protected override bool ViewStateIgnoresCase 

+		{

+			get {

+				return true;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
new file mode 100644
index 00000000000..2c94435eec8
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlForm.cs
@@ -0,0 +1,163 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	

+	public class HtmlForm : HtmlContainerControl{

+		

+		private static string SmartNavIncludeScriptKey  = "SmartNavIncludeScript";

+		

+		public HtmlForm(): base("form"){}

+				

+		protected override void RenderAttributes(HtmlTextWriter writer){

+			writer.WriteAttribute("name", RenderedName);

+			Attributes.Remove("name");

+			writer.WriteAttribute("method", Method);

+			Attributes.Remove("method");

+			//writer.WriteAttribute("action", Action, true);

+			//Attributes.Remove("action");

+			if (Enctype != null){

+				writer.WriteAttribute ("enctype", Enctype);

+				Attributes.Remove ("enctype");

+			}

+				

+

+//			string clientOnSubmit = Page.ClientOnSubmitEvent;

+// 			if (clientOnSubmit != null && clientOnSubmit.Length > 0){

+// 				if (Attributes["onsubmit"] != null){

+// 					clientOnSubmit = String.Concat(clientOnSubmit,Attributes["onsubmit"]);

+// 					Attributes.Remove("onsubmit");

+// 				}

+// 				writer.WriteAttribute("language","javascript");

+// 				writer.WriteAttribute("onsubmit",clientOnSubmit);

+// 			}

+			if (ID == null){

+				writer.WriteAttribute("id",ClientID);

+			}

+			base.RenderAttributes(writer);

+		}

+		

+		protected override void Render(HtmlTextWriter output){

+			if (Page.SmartNavigation == false){

+				base.Render (output);

+				return;

+			}

+

+			((IAttributeAccessor) this).SetAttribute("_smartNavigation","true");

+			HttpBrowserCapabilities browserCap = Context.Request.Browser;

+			if (browserCap.Browser.ToLower() != "ie" && browserCap.MajorVersion < 5){

+				base.Render(output);

+				return;

+			}

+			output.WriteLine("<IFRAME ID=_hifSmartNav NAME=_hifSmartNav STYLE=display:none ></IFRAME>");

+				

+			if (browserCap.MinorVersion < 0.5 && browserCap.MajorVersion != 5)

+				Page.RegisterClientScriptFile("SmartNavIncludeScript","JScript","SmartNavIE5.js");

+			else if (Page.IsPostBack) Page.RegisterClientScriptFile("SmartNavIncludeScript","JScript","SmartNav.js");

+			base.Render(output);

+		}

+		

+		protected override void RenderChildren (HtmlTextWriter writer)

+		{

+			Page.OnFormRender (writer,ClientID);

+			base.RenderChildren (writer);

+			Page.OnFormPostRender (writer,ClientID);

+		}

+		

+		protected override void OnInit(EventArgs e){

+			base.OnInit(e);

+			Page.RegisterViewStateHandler();

+		}

+		

+		internal string Action{

+			get{

+				string executionFilePath = Context.Request.CurrentExecutionFilePath;

+				string filePath = Context.Request.FilePath;

+				string attr;

+				if (String.ReferenceEquals(executionFilePath, filePath) == true){

+					attr = filePath;

+					int lastSlash = attr.LastIndexOf('/');

+					if (lastSlash >= 0)

+						attr = attr.Substring(lastSlash + 1);

+				}

+				else{

+					attr = System.Web.Utils.UrlUtils.MakeRelative(filePath,executionFilePath);

+				}

+				string queryString = Context.Request.QueryStringRaw;

+				if (queryString != null && queryString.Length > 0)

+					attr = String.Concat(attr, '?', queryString);

+				return attr;

+			}

+		}

+		

+		public string Enctype{

+			get{

+				string attr = Attributes["enctype"];

+				if (attr != null){

+					return attr;

+				}

+				return null;

+			}

+			set{

+				Attributes["enctype"] = AttributeToString(value);

+			}

+		}

+		

+		public string Method{

+			get{

+				string attr = Attributes["method"];

+				if (attr != null){

+					return attr;

+				}

+				return "post";

+			}

+			set{

+				Attributes["method"] = AttributeToString(value);

+			}

+		}

+		

+		public string Target{

+			get{

+				string attr = Attributes["target"];

+				if (attr != null){

+					return attr;

+				}

+				return String.Empty;

+			}

+			set{

+				Attributes["target"] = AttributeToString(value);

+			}

+		}

+		

+		public virtual string Name{

+			get{

+				string attr = Attributes["name"];

+				if (attr != null){

+					return attr;

+				}

+				return String.Empty;

+			}

+			set {

+				Attributes ["Name"] = value;

+			}

+		}

+		

+		internal string RenderedName{

+			get{

+				string attr = Name;

+				if (attr.Length > 0){

+					return attr;

+				}

+				return UniqueID;

+			}

+		}

+		

+	} // class HtmlForm

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs
new file mode 100644
index 00000000000..91cd26ce9bf
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlGenericControl.cs
@@ -0,0 +1,42 @@
+//
+// System.Web.UI.HtmlControls.HtmlGenericControl.cs
+//
+// Authors:
+//   Bob Smith <bob@thestuff.net>
+//   Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) Bob Smith
+// (c) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+	
+using System;
+using System.Web;
+using System.Web.UI;
+
+namespace System.Web.UI.HtmlControls{
+	
+	[ConstructorNeedsTag]
+	public class HtmlGenericControl : HtmlContainerControl {
+		private string tagName;
+
+		public HtmlGenericControl() :
+			this ("span")
+		{
+		}
+		
+		public HtmlGenericControl (string tag) :
+			base ()
+		{
+			if (tag == null)
+				tag = "";
+			tagName = tag;
+		}
+		
+		public new string TagName
+		{
+			get { return tagName; }
+			set { tagName = value; }
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlImage.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlImage.cs
new file mode 100755
index 00000000000..a0ca1f13b3b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlImage.cs
@@ -0,0 +1,103 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.Globalization;

+

+namespace System.Web.UI.HtmlControls{

+	

+	public class HtmlImage : HtmlControl{

+		

+		public HtmlImage(): base("img"){}

+		

+		protected override void RenderAttributes(HtmlTextWriter writer){

+			PreProcessRelativeReference(writer,"src");

+			base.RenderAttributes(writer);

+			writer.Write(" /");

+		}

+		

+		public string Align{

+			get{

+				string attr = Attributes["align"];

+				if (attr != null){

+					return attr;

+				}

+				return String.Empty;

+			}

+			set{

+				Attributes["align"] = AttributeToString(value);

+			}

+		}

+		

+		public string Alt{

+			get{

+				string attr = Attributes["alt"];

+				if (attr != null){

+					return attr;

+				}

+				return String.Empty;

+			}

+			set{

+				Attributes["alt"] = AttributeToString(value);

+			}

+		}

+		

+		public int Border{

+			get{

+				string attr = Attributes["border"];

+				if (attr != null){

+					return Int32.Parse(attr,CultureInfo.InvariantCulture);

+				}

+				return -1;

+			}

+			set{

+				Attributes["border"] = AttributeToString(value);

+			}

+		}

+		

+		public int Height

+		{

+			get {

+				string attr = Attributes ["height"];

+				if (attr != null)

+					return Int32.Parse (attr, CultureInfo.InvariantCulture);

+

+				return -1;

+			}

+

+			set { Attributes["height"] = AttributeToString (value); }

+		}

+

+		public string Src{

+			get{

+				string attr = Attributes["src"];

+				if (attr != null){

+					return attr;

+				}

+				return String.Empty;

+			}

+			set{

+				Attributes["src"] = AttributeToString(value);

+			}

+		}

+		

+		public int Width{

+			get{

+				string attr = Attributes["width"];

+				if (attr != null){

+					return Int32.Parse(attr,CultureInfo.InvariantCulture);

+				}

+				return -1;

+			}

+			set{

+				Attributes["width"] = AttributeToString(value);

+			}

+		}

+		

+	} // class HtmlImage

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs
new file mode 100755
index 00000000000..342e1575a76
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputButton.cs
@@ -0,0 +1,74 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.ComponentModel;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[DefaultEvent("ServerClick")]

+	public class HtmlInputButton : HtmlInputControl, IPostBackEventHandler{

+		

+		private static readonly object EventServerClick = new object ();

+		

+		public HtmlInputButton(): base ("button")

+		{

+		}

+		

+		public HtmlInputButton(string type): base(type){}

+		

+		protected override void OnPreRender (EventArgs e)

+		{

+			base.OnPreRender(e);

+		}

+

+		protected override void RenderAttributes (HtmlTextWriter writer)

+		{

+			base.RenderAttributes (writer);

+		}

+

+		protected virtual void OnServerClick(EventArgs e){

+			EventHandler handler = (EventHandler) Events[EventServerClick];

+			if (handler != null){

+				handler.Invoke(this, e);

+			}

+		}

+		

+		void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)

+		{

+			if(CausesValidation == true){

+				Page.Validate();

+			}

+			OnServerClick(EventArgs.Empty);

+		}

+		

+		public event EventHandler ServerClick{

+			add{

+				Events.AddHandler(EventServerClick, value);

+			}

+			remove{

+				Events.RemoveHandler(EventServerClick, value);

+			}

+		}

+		

+		public bool CausesValidation{

+			get{

+				object causesVal = ViewState["CausesValidation"];

+				if (causesVal != null){

+					return (Boolean) causesVal;

+				}

+				return true;

+			}

+			set{

+				ViewState["CausesValidation"] = (Boolean) value;

+			}

+		}

+		

+	} // end of System.Web.UI.HtmlControls.HtmlInputButton

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs
new file mode 100755
index 00000000000..575b312b16e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputCheckBox.cs
@@ -0,0 +1,80 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[DefaultEvent("ServerChange")]

+	public class HtmlInputCheckBox : HtmlInputControl, IPostBackDataHandler{

+		

+		private static readonly object EventServerChange = new object ();

+		

+		public HtmlInputCheckBox(): base("checkbox"){}

+		

+		bool IPostBackDataHandler.LoadPostData (string postDataKey, 

+							       NameValueCollection postCollection)

+		{

+			string postValue = postCollection [postDataKey];

+			bool postChecked = false;

+			bool retval = false;

+

+			if (postValue != null)

+				postChecked = postValue.Length > 0;

+

+			if (Checked != postChecked){

+				retval = true;

+				Checked = postChecked;

+			}

+

+			return retval;

+		}

+		

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+			OnServerChange (EventArgs.Empty);

+		}

+		

+		protected virtual void OnServerChange(EventArgs e){

+			EventHandler handler = (EventHandler) Events[EventServerChange];

+			if (handler != null) handler.Invoke(this, e);

+		}

+		

+		protected override void OnPreRender(EventArgs e){

+			if (Page != null && !Disabled)

+				Page.RegisterRequiresPostBack(this);

+			if (Events[EventServerChange] != null && !Disabled)

+				ViewState.SetItemDirty("checkbox",false);

+		}

+		

+		public event EventHandler ServerChange{

+			add{

+				Events.AddHandler(EventServerChange, value);

+			}

+			remove{

+				Events.RemoveHandler(EventServerChange, value);

+			}

+		}

+		

+		public bool Checked{

+			get{

+				string attr = Attributes["checked"];

+				if (attr != null)

+					return attr.Equals("checked");

+				return false;

+			}

+			set{

+				Attributes["checked"] = (value == true)? "checked": null;

+			}

+		}

+		

+	} // class HtmlInputCheckBox

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs
new file mode 100755
index 00000000000..aeb0b539a4f
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputControl.cs
@@ -0,0 +1,60 @@
+/*	System.Web.UI.HtmlControls
+*	Authors
+*		Leen Toelen (toelen@hotmail.com)
+*/
+
+using System;
+using System.Web;
+using System.Web.UI;
+using System.Globalization;
+
+namespace System.Web.UI.HtmlControls
+{
+	
+	public abstract class HtmlInputControl : HtmlControl
+	{
+		
+		public HtmlInputControl (string type) : base ("input")
+		{
+			Attributes ["type"] = type;
+		}
+		
+		protected override void RenderAttributes (HtmlTextWriter writer)
+		{
+			writer.WriteAttribute ("name",RenderedName);
+			Attributes.Remove ("name");
+			base.RenderAttributes (writer);
+			writer.Write (" /");
+		}
+		
+		public virtual string Name
+		{
+			get { return UniqueID; }
+			set { ID = value; } // Is this ok?
+		}
+		
+		protected virtual string RenderedName
+		{
+			get { return Name; }
+		}
+
+		public string Type
+		{
+			get {
+				string _type = Attributes ["type"];
+				return ((_type != null) ? _type : String.Empty);
+			}
+		}
+		
+		public virtual string Value
+		{
+			get {
+				string attr = Attributes ["value"];
+				return ((attr != null) ? attr : String.Empty);
+			}
+
+			set { Attributes["value"] = value; }
+		}
+	} // class HtmlInputControl
+} // namespace System.Web.UI.HtmlControls
+
diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputFile.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputFile.cs
new file mode 100755
index 00000000000..acd09293a44
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputFile.cs
@@ -0,0 +1,75 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.Globalization;

+using System.Collections.Specialized;

+

+namespace System.Web.UI.HtmlControls{

+	

+	public class HtmlInputFile : HtmlInputControl, IPostBackDataHandler{

+		

+		public HtmlInputFile():base("file"){}

+		

+		bool IPostBackDataHandler.LoadPostData (string postDataKey,

+						       NameValueCollection postCollection)

+		{

+			string postValue = postCollection [postDataKey];

+			if (postValue != null)

+				Value = postValue;

+			return false;

+		}

+		

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+		}

+		

+		public string Accept{

+			get{

+				string attr = Attributes["accept"];

+				if (attr != null)

+					return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["accept"] = AttributeToString(value);

+			}

+		}

+		

+		public int MaxLength{

+			get{

+				string attr = Attributes["maxlength"];

+				if (attr != null)

+					return Int32.Parse(attr, CultureInfo.InvariantCulture);

+				return -1;

+			}

+			set{

+				Attributes["accept"] = AttributeToString(value);

+			}

+		}

+		

+		public int Size{

+			get{

+				string attr = Attributes["size"];

+				if (attr != null)

+					return Int32.Parse(attr, CultureInfo.InvariantCulture);

+				return -1;

+			}

+			set{

+				Attributes["size"] = AttributeToString(value);

+			}

+		}

+		

+		public HttpPostedFile PostedFile{

+			get{

+				return Context.Request.Files[RenderedName];

+			}

+		}

+		

+	} // class HtmlInputFile

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputHidden.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputHidden.cs
new file mode 100755
index 00000000000..65e4864284d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputHidden.cs
@@ -0,0 +1,60 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[DefaultEvent("ServerChange")]

+	public class HtmlInputHidden : HtmlInputControl, IPostBackDataHandler{

+		

+		private static readonly object EventServerChange = new object ();

+		

+		public HtmlInputHidden () : base ("hidden")

+		{

+		}

+		

+		bool IPostBackDataHandler.LoadPostData (string postDataKey,

+						       NameValueCollection postCollection)

+		{

+			string postValue = postCollection [postDataKey];

+			if (postValue != null)

+				Value = postValue;

+			return false;

+		}

+		

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+			// don't need anything. LoadPostData always returns false.

+		}

+		

+		protected virtual void OnServerChange (EventArgs e)

+		{

+			EventHandler handler = (EventHandler) Events [EventServerChange];

+			if (handler != null) handler.Invoke (this, e);

+		}

+		

+		protected override void OnPreRender(EventArgs e){

+			if (Events[EventServerChange] != null && !Disabled)

+				ViewState.SetItemDirty("value",false);

+		}

+		

+		public event EventHandler ServerChange{

+			add{

+				Events.AddHandler(EventServerChange, value);

+			}

+			remove{

+				Events.RemoveHandler(EventServerChange, value);

+			}

+		}

+		

+	} // class HtmlInputFile

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs
new file mode 100755
index 00000000000..62a5e1fb00c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputImage.cs
@@ -0,0 +1,129 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[DefaultEvent("ServerClick")]

+	public class HtmlInputImage : HtmlInputControl, IPostBackEventHandler, IPostBackDataHandler{

+		

+		private static readonly object EventServerClick = new object ();

+		private int _x, _y;

+		

+		public HtmlInputImage(): base("image"){}

+		

+		protected override void OnPreRender(EventArgs e){

+			if (Page != null && !Disabled){

+				Page.RegisterRequiresPostBack(this);

+			}

+		}

+		

+		protected override void RenderAttributes(HtmlTextWriter writer)

+		{

+			base.RenderAttributes (writer);

+			// Anything else?

+		}

+

+		protected virtual void OnServerClick(ImageClickEventArgs e){

+			ImageClickEventHandler handler = (ImageClickEventHandler) Events[EventServerClick];

+			if (handler != null) handler (this, e);

+		}

+		

+		bool IPostBackDataHandler.LoadPostData (string postDataKey,

+						       NameValueCollection postCollection)

+		{

+			string postX = postCollection[String.Concat(RenderedName,".x")];

+			string postY = postCollection[String.Concat(RenderedName,".y")];

+			if (postX != null && postY != null && postX.Length >= 0 && postY.Length >= 0){

+				_x = Int32.Parse(postX, CultureInfo.InvariantCulture);

+				_y = Int32.Parse(postY, CultureInfo.InvariantCulture);

+				Page.RegisterRequiresRaiseEvent(this);

+			}

+			return false;

+		}

+		

+		void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)

+		{

+			if (CausesValidation)

+				Page.Validate();

+			OnServerClick (new ImageClickEventArgs(_x, _y));

+		}

+		

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+		}

+		

+		public event ImageClickEventHandler ServerClick{

+			add{

+				Events.AddHandler(EventServerClick, value);

+			}

+			remove{

+				Events.RemoveHandler(EventServerClick, value);

+			}

+		}

+		

+		public string Align{

+			get{

+				string attr = Attributes["align"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["align"] = AttributeToString(value);

+			}

+		}

+		

+		public string Alt{

+			get{

+				string attr = Attributes["alt"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["alt"] = AttributeToString(value);

+			}

+		}

+		

+		public int Border{

+			get{

+				string attr = Attributes["border"];

+				if (attr != null) return Int32.Parse(attr,CultureInfo.InvariantCulture);

+				return -1;

+			}

+			set{

+				Attributes["border"] = AttributeToString(value);

+			}

+		}

+		

+		public bool CausesValidation{

+			get{

+				object causesVal = ViewState["CausesValidation"];

+				if (causesVal != null) return (Boolean) causesVal;

+				return true;

+			}

+			set{

+				ViewState["CausesValidation"] = (Boolean) value;

+			}

+		}

+		

+		public string Src{

+			get{

+				string attr = Attributes["src"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["src"] = AttributeToString(value);

+			}

+		}

+	} // class HtmlInputImage

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs
new file mode 100755
index 00000000000..0bc3ee4c97a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputRadioButton.cs
@@ -0,0 +1,129 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[DefaultEvent("ServerChange")]

+	public class HtmlInputRadioButton : HtmlInputControl, IPostBackDataHandler{

+		

+		private static readonly object EventServerChange;

+		

+		public HtmlInputRadioButton(): base("radio"){}

+		

+		protected override void OnPreRender(EventArgs e){

+			if (Page != null && !Disabled){

+				Page.RegisterRequiresPostBack(this);

+			}

+			if (Events[EventServerChange] != null && !Disabled){

+				ViewState.SetItemDirty("checked", false);

+			}

+		}

+		

+		protected virtual void OnServerChange(EventArgs e){

+			EventHandler handler = (EventHandler) Events[EventServerChange];

+			if (handler != null){

+				handler.Invoke(this, e);

+			}

+		}

+		

+		protected override void RenderAttributes(HtmlTextWriter writer){

+			writer.WriteAttribute("value", Value);

+			Attributes.Remove("value");

+			base.RenderAttributes(writer);

+		}

+		

+		bool IPostBackDataHandler.LoadPostData (string postDataKey,

+							NameValueCollection postCollection)

+		{

+			string postValue = postCollection [postDataKey];

+			bool myBool = false;

+			if (postValue != null && postValue.Equals (Value)) {

+				if (!Checked) {

+					Checked = true;

+					myBool = true;

+				}

+			} else {

+				if (Checked) {

+					Checked = false;

+					myBool = false;

+				}

+			}

+			return myBool;

+		}

+		

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+			OnServerChange (EventArgs.Empty);

+		}

+		

+		public event EventHandler ServerChange{

+			add{

+				Events.AddHandler(EventServerChange, value);

+			}

+			remove{

+				Events.RemoveHandler(EventServerChange, value);

+			}

+		}

+		

+		public bool Checked{

+			get{

+				string attr = Attributes["checked"];

+				if (attr != null){

+					return attr.Equals("checked");

+				}

+				return false;

+			}

+			set{

+				if (value != true){

+					Attributes["checked"] = null;

+				}

+				Attributes["checked"] = "checked";

+			}

+		}

+		public override string Name

+		{

+			get {

+				string attr = Attributes ["name"]; // Gotta use "name" to group radio buttons

+				return (attr == null) ? String.Empty : attr;

+			}

+			set { Attributes ["name"] = value; }

+		}

+		

+		protected override string RenderedName{

+			get{

+				string attr = base.RenderedName;

+				string id = UniqueID;

+				int indexOfX = id.LastIndexOf('X');

+				if (indexOfX != 0 && indexOfX >= 0){

+					attr = String.Concat(attr, id.Substring(0,indexOfX+1));

+				}

+				return attr;

+			}

+		}

+

+		public override string Value

+		{

+			get {

+				string v = Attributes ["value"];

+				if (v != null && v != "")

+					return v;

+				v = ID;

+				Attributes ["value"] = v;

+				return v;

+			}

+

+			set { Attributes ["value"] = value; }

+		}

+		

+	} // class HtmlInputRadioButton

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs
new file mode 100755
index 00000000000..345981371db
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlInputText.cs
@@ -0,0 +1,104 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[DefaultEvent("ServerChange")]

+	[ValidationProperty("Value")]

+	public class HtmlInputText : HtmlInputControl, IPostBackDataHandler{

+		

+		private static readonly object EventServerChange = new object ();

+		

+		public HtmlInputText(string type):base(type){}

+		public HtmlInputText():base("text"){}

+		

+		protected override void OnPreRender(EventArgs e){

+			if (Events[EventServerChange] != null && !Disabled){

+				ViewState.SetItemDirty("value",false);

+			}

+		}

+		

+		protected virtual void OnServerChange (EventArgs e)

+		{

+			EventHandler handler = (EventHandler) Events [EventServerChange];

+			if (handler != null) handler (this, e);

+		}

+		

+		protected override void RenderAttributes(HtmlTextWriter writer){

+			//hide value when password box

+			if (String.Compare (Type, "password",true) != 0)

+				ViewState.Remove("value");

+			base.RenderAttributes(writer);

+		}

+		

+		bool IPostBackDataHandler.LoadPostData (string postDataKey,

+							NameValueCollection postCollection)

+		{

+			string currentValue = Value;

+			string[] postedValue = postCollection.GetValues (postDataKey);

+			if (!currentValue.Equals (postedValue)){

+				Value = postedValue [0];

+				return true;

+			}

+			return false;

+		}

+		

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+			OnServerChange (EventArgs.Empty);

+		}

+		

+		public event EventHandler ServerChange{

+			add{

+				Events.AddHandler(EventServerChange, value);

+			}

+			remove{

+				Events.RemoveHandler(EventServerChange, value);

+			}

+		}

+		

+		public int MaxLength{

+			get{

+				string attr = (String) ViewState["maxlength"];

+				if (attr != null) return Int32.Parse(attr, CultureInfo.InvariantCulture);

+				return -1;

+			}

+			set{

+				Attributes["maxlength"] = AttributeToString(value);

+			}

+		}

+		

+		public int Size{

+			get{

+				string attr = (String) ViewState["size"];

+				if (attr != null) return Int32.Parse(attr, CultureInfo.InvariantCulture);

+				return -1;

+			}

+			set{

+				Attributes["size"] = AttributeToString(value);

+			}

+		}

+		

+		public override string Value{

+			get{

+				string attr = Attributes["value"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["value"] = AttributeToString(value);

+			}

+		}

+		

+	} // class HtmlInputText

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs
new file mode 100755
index 00000000000..0b42de9a6aa
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlSelect.cs
@@ -0,0 +1,419 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.Web.UI.WebControls;

+using System.Globalization;

+using System.ComponentModel;

+using System.Collections;

+using System.Collections.Specialized;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[DefaultEvent("ServerChange")]

+	public class HtmlSelect : HtmlContainerControl, IPostBackDataHandler{

+		

+		

+		private int _cachedSelectedIndex;

+		private object _dataSource;

+		private static readonly object EventServerChange = new object ();

+		private ListItemCollection _items;

+		

+		public HtmlSelect():base("select"){

+			_cachedSelectedIndex = -1;

+		}

+		

+		protected override void AddParsedSubObject(object obj){

+			if (obj as ListItem != null) {

+				this.Items.Add((ListItem) obj);

+				return;

+			}

+			throw new HttpException("HtmlSelect cannot have children of Type " + obj.GetType().Name);

+		}

+		

+		protected virtual void ClearSelection()

+		{

+			foreach (ListItem item in Items)

+				item.Selected = false;

+		}

+		

+		protected override ControlCollection CreateControlCollection(){

+			return new EmptyControlCollection(this);

+		}

+		

+		protected override void LoadViewState(object savedState)

+		{

+			if (savedState != null) {

+				Triplet state = (Triplet) savedState;

+				base.LoadViewState (state.First);

+				Items.LoadViewState (state.Second);

+				object indices = state.Third;

+				if (indices != null)

+					Select ((int[]) indices);

+			}

+		}

+		

+		protected override void OnDataBinding(EventArgs e){

+			base.OnDataBinding(e);

+			IEnumerable resolvedDataSource = System.Web.Utils.DataSourceHelper.GetResolvedDataSource(DataSource, DataMember);

+			if ( resolvedDataSource != null){

+				string text = DataTextField;

+				string value = DataValueField;

+				Items.Clear();

+				ICollection rdsCollection = resolvedDataSource as ICollection;

+				if (rdsCollection != null){

+					Items.Capacity = rdsCollection.Count;

+				}

+				bool valid = false;

+				if (text.Length >= 0 && value.Length >= 0)

+					valid = true;

+				ListItem li = new ListItem();

+				IEnumerator current = resolvedDataSource.GetEnumerator();

+				while(current.MoveNext()){

+					if (valid == true){

+						if (text.Length >= 0)

+							li.Text = DataBinder.GetPropertyValue(current, text) as string;

+						if (value.Length >= 0)

+							li.Value = DataBinder.GetPropertyValue(current, value) as string;

+					}

+					else{

+						li.Value = li.Text = current.ToString();

+					}

+				}

+				Items.Add(li);

+			}

+			if ( _cachedSelectedIndex != -1){

+				SelectedIndex = _cachedSelectedIndex;

+				_cachedSelectedIndex = -1;

+			}

+		}

+		

+		protected override void OnPreRender(EventArgs e){

+			if (Page != null && Size >= 0 && !Disabled){

+				Page.RegisterRequiresPostBack(this);

+			}

+		}

+		

+		protected virtual void OnServerChange(EventArgs e){

+			EventHandler handler = (EventHandler) Events[EventServerChange];

+			if (handler != null)

+				handler.Invoke(this,e);

+		}

+		

+		protected override void RenderAttributes(HtmlTextWriter writer){

+			writer.WriteAttribute("name", Name);

+			Attributes.Remove("name");

+			Attributes.Remove("DataValueField");

+			Attributes.Remove("DataTextField");

+			Attributes.Remove("DataMember");

+			base.RenderAttributes(writer);

+		}

+		

+		protected override void RenderChildren(HtmlTextWriter writer){

+			//flush output

+			writer.WriteLine();

+			// increase indent level, improves readability

+			writer.Indent = writer.Indent + 1;

+			if (Items.Count >= 0){

+				// display all options, and set the selected option

+				bool rendered_selected = false;

+				foreach (ListItem option in Items){

+					//write begin tag with attributes

+					writer.WriteBeginTag("option");

+					if (!rendered_selected && option.Selected){

+						writer.WriteAttribute("selected","selected");

+						if (!Multiple)

+							rendered_selected = true;

+					}

+					else if (option.Selected){

+						option.Selected = false;

+					}

+

+					writer.WriteAttribute("value",option.Value,true);

+					option.Attributes.Remove("text");

+					option.Attributes.Remove("value");

+					option.Attributes.Remove("selected");

+					option.Attributes.Render(writer);

+					writer.Write('>');

+					//write the option text

+					HttpUtility.HtmlEncode(option.Text, writer);

+					//close the current option tag

+					writer.WriteEndTag("option");

+					//flush output

+					writer.WriteLine();

+				}

+			}

+			// set the indent level back to normal

+			writer.Indent = writer.Indent - 1;

+		}

+		

+		protected override object SaveViewState ()

+		{

+			object baseViewState = base.SaveViewState ();

+			object itemsViewState = Items.SaveViewState ();

+			object indices = null;

+

+			if (Events[EventServerChange] != null || !Disabled || Visible)

+				indices = SelectedIndices;

+

+			if (indices != null || baseViewState != null || itemsViewState != null)

+				return new Triplet (baseViewState, itemsViewState, indices);

+

+			return null;

+		}

+		

+		protected virtual void Select(int[] selectedIndices){

+			// unselect all options

+			ClearSelection();

+			// iterate through options, and set when selected

+			foreach (int current in selectedIndices){

+				if (current >= 0 && current < Items.Count){

+					Items[current].Selected = true;

+				}

+			}

+		}

+		

+		bool IPostBackDataHandler.LoadPostData (string postDataKey,

+							NameValueCollection postCollection)

+		{

+			//get the posted selectedIndices[]

+			string [] postedValueColl = postCollection.GetValues(postDataKey);

+			bool changed = false;

+			if (postedValueColl != null){

+				if (!Multiple){

+					//single selection

+					//int postedValue = Items.FindIndexByValue(postedValueColl[0]);

+					int postedValue = Items.IndexOf(Items.FindByValue(postedValueColl[0]));

+					if (postedValue != SelectedIndex){

+						//set the SelectedIndex

+						SelectedIndex = postedValue;

+						changed = true;

+					}

+				}

+				else{

+					//multiple selection

+					int postedValueCount = postedValueColl.Length;

+					int[] arr= new int[postedValueCount];

+					//fill an array with the posted Values

+					for (int i = 0; i <= postedValueCount; i++)

+						arr[i] = Items.IndexOf(Items.FindByValue(postedValueColl[i]));

+					//test if everything went fine

+					if( postedValueCount == SelectedIndices.Length)

+						for (int i = 0; i <= postedValueCount; i++)

+							if(arr[i] == SelectedIndices[i])

+								changed = true;

+					else

+						changed = true;

+					//commit the posted Values

+					if(changed)

+						Select(arr);

+				}

+			}

+			else if (SelectedIndex != -1){

+				SelectedIndex = -1;

+				changed = true;

+			}

+			return changed;

+		}

+		

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+			OnServerChange (EventArgs.Empty);

+		}

+		

+		//starts tracking changes to the viewstate

+		protected override void TrackViewState(){

+			base.TrackViewState();

+			Items.TrackViewState();

+		}

+		

+		public event EventHandler ServerChange{

+			add{

+				Events.AddHandler(EventServerChange, value);

+			}

+			remove{

+				Events.RemoveHandler(EventServerChange, value);

+			}

+		}

+		

+		public virtual string DataMember{

+			get{

+				object viewStateDataMember = ViewState["DataMember"];

+				if ( viewStateDataMember != null) return (String) viewStateDataMember;

+				return String.Empty;

+			}

+			set{

+				Attributes["DataMember"] = HtmlControl.AttributeToString(value);

+			}

+		}

+		

+		public virtual object DataSource{

+			get{

+				return _dataSource;

+			}

+			set{

+				if (value != null && value is IListSource){

+					if (value is IEnumerable){

+						_dataSource = value;

+					}

+					else{

+						throw new ArgumentException("Invalid dataSource type");

+					}

+				}

+			}

+		}

+		

+		public virtual string DataTextField{

+			get{

+				string attr = Attributes["DataTextField"];

+				if (attr != null){

+					return attr;

+				}

+				return String.Empty;

+			}

+			set{

+				Attributes["DataTextField"] = AttributeToString(value);

+			}

+		}

+		

+		public virtual string DataValueField{

+			get{

+				string attr = Attributes["DataValueField"];

+				if (attr != null)return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["DataValueField"] = AttributeToString(value);

+			}

+		}

+		

+		public override string InnerHtml{

+			get{

+				throw new NotSupportedException("InnerHtml is not supported by " + this.GetType().Name);

+			}

+			set{

+				throw new NotSupportedException("InnerHtml is not supported by " + this.GetType().Name);

+			}

+		}

+		

+		public override string InnerText{

+			get{

+				throw new NotSupportedException("InnerText is not supported by " + this.GetType().Name);

+			}

+			set{

+				throw new NotSupportedException("InnerText is not supported by " + this.GetType().Name);

+			}

+		}

+		

+		public ListItemCollection Items{

+			get{

+				if (_items == null){

+					_items = new ListItemCollection();

+					if (IsTrackingViewState) _items.TrackViewState();

+				}

+				return _items;

+			}

+		}

+		

+		public bool Multiple{

+			get{

+				string attr = Attributes["multiple"];

+				if (attr != null) return (0 == String.Compare (attr, "true", true));

+				return false;

+			}

+			set{

+				Attributes["multiple"] = value.ToString ();

+			}

+		}

+		

+		public string Name{

+			get{

+				return UniqueID;

+			}

+			set{

+				//LAMESPEC

+				return;

+			}

+		}

+		

+		public virtual int SelectedIndex {

+			get{

+				for (int i=0; i<Items.Count; i++){

+					if (Items[i].Selected == true) return i;

+				}

+				if (Size<=1 && !Multiple){

+					if(Items.Count > 0) Items[0].Selected = true;

+					return 0;

+				}

+				return -1;

+			}

+			set{

+				if(Items.Count == 0){

+					_cachedSelectedIndex = value;

+					return;

+				}

+

+				if (value < -1 || value >= Items.Count) 

+					throw new ArgumentOutOfRangeException();

+

+				ClearSelection();

+				if (value >= 0) 

+					Items[value].Selected = true;

+			}

+		}

+		

+		protected virtual int[] SelectedIndices {

+			get{

+				int[] indices = new int[3];

+				int indicesCount = 0;

+				for(int i=0; i < Items.Count; i++){

+					if (Items[i].Selected){

+						if( indicesCount == (int) indices.Length){

+							int[] temp = new int[indicesCount + indicesCount];

+							indices.CopyTo(temp,0);

+							indices = temp;

+						}

+						indices[indicesCount] = i;

+						indicesCount++;

+					}

+				}

+				int[] arr = new int[indicesCount];

+				System.Array.Copy(indices,0,arr,0,indicesCount);

+				return arr;

+			}

+		}

+		

+		public int Size{

+			get{

+				string attr = Attributes["size"];

+				if (attr != null){

+					return Int32.Parse(attr, CultureInfo.InvariantCulture);;

+				}

+				return -1;

+			}

+			set{

+				Attributes["size"] = AttributeToString(value);

+			}

+		}

+		

+		public string Value {

+			get{

+				int selectedIndex = SelectedIndex;

+				if (selectedIndex >=0 && selectedIndex < Items.Count){

+					return Items[selectedIndex].Value;

+				}

+				return String.Empty;

+			}

+			set{

+				int findValue = Items.IndexOf(Items.FindByValue(value));

+				if (findValue >= 0) SelectedIndex = findValue;

+			}

+		}

+		

+	} // class HtmlSelect

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTable.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTable.cs
new file mode 100755
index 00000000000..9240b7fcc55
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTable.cs
@@ -0,0 +1,172 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.Globalization;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[ParseChildren(true, "Rows")]

+	public class HtmlTable : HtmlContainerControl {

+		private HtmlTableRowCollection _rows;

+		

+		public HtmlTable():base("table"){}

+		

+		protected override ControlCollection CreateControlCollection(){

+			return new HtmlTableRowControlCollection(this);

+		}

+		

+		protected override void RenderChildren(HtmlTextWriter writer){

+			writer.WriteLine();

+			writer.Indent = writer.Indent + 1;

+			base.RenderChildren(writer);

+			writer.Indent = writer.Indent - 1;

+		}

+		

+		protected override void RenderEndTag(HtmlTextWriter writer){

+			base.RenderEndTag(writer);

+			writer.WriteLine();

+		}

+		

+		public string Align {

+			get{

+				string attr = Attributes["align"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["align"] = AttributeToString(value);

+			}

+		}

+		

+		public string BgColor {

+			get{

+				string attr = Attributes["bgcolor"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["bgcolor"] = AttributeToString(value);

+			}

+		}

+		

+		public int Border {

+			get{

+				string attr = Attributes["border"];

+				if (attr != null) return Int32.Parse(attr, CultureInfo.InvariantCulture);

+				return -1;

+			}

+			set{

+				Attributes["border"] = AttributeToString(value);

+			}

+		}

+		

+		public string BorderColor {

+			get{

+				string attr = Attributes["bordercolor"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["bordercolor"] = AttributeToString(value);

+			}

+		}

+		

+		public int CellPadding {

+			get{

+				string attr = Attributes["cellpadding"];

+				if (attr != null) return Int32.Parse(attr, CultureInfo.InvariantCulture);

+				return -1;

+			}

+			set{

+				Attributes["cellpadding"] = AttributeToString(value);

+			}

+		}

+		

+		public int CellSpacing {

+			get{

+				string attr = Attributes["cellspacing"];

+				if (attr != null) return Int32.Parse(attr, CultureInfo.InvariantCulture);

+				return -1;

+			}

+			set{

+				Attributes["cellspacing"] = AttributeToString(value);

+			}

+		}

+		

+		public string Height {

+			get{

+				string attr = Attributes["height"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["height"] = AttributeToString(value);

+			}

+		}

+		

+		public override string InnerHtml {

+			get{

+				throw new NotSupportedException("InnerHtml property not supported by HtmlTable");

+			}

+			set{

+				throw new NotSupportedException("InnerHtml property not supported by HtmlTable");

+			}

+		}

+		

+		public override string InnerText {

+			get{

+				throw new NotSupportedException("InnerText property not supported by HtmlTable");

+			}

+			set{

+				throw new NotSupportedException("InnerText property not supported by HtmlTable");

+			}

+		}

+		

+		public virtual HtmlTableRowCollection Rows {

+			get{

+				if (_rows == null) _rows = new HtmlTableRowCollection(this);

+				return _rows;

+			}

+		}

+		

+		public string Width {

+			get{

+				string attr = Attributes["width"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["width"] = AttributeToString(value);

+			}

+		}

+		

+		protected class HtmlTableRowControlCollection : ControlCollection {

+			

+			internal HtmlTableRowControlCollection(Control owner): base(owner){}

+			

+			public override void Add(Control child){

+				if ((child as HtmlTableRow) != null){

+					base.Add(child);

+				}

+				else{

+					throw new ArgumentException("HtmlTableRow cannot have children of type " + child.GetType().Name);

+				}

+			}

+			

+			public override void AddAt(int index, Control child){

+				if ((child as HtmlTableRow) != null){

+					base.AddAt(index,child);

+				}

+				else{

+					throw new ArgumentException("HtmlTableRow cannot have children of type " + child.GetType().Name);

+				}

+			}

+		} // end of HtmlTableRowControlCollection

+	}

+	// end of System.Web.UI.HtmlControl

+}

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCell.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCell.cs
new file mode 100755
index 00000000000..d07346b35e0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCell.cs
@@ -0,0 +1,130 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.Globalization;

+

+namespace System.Web.UI.HtmlControls{

+	[ConstructorNeedsTag]

+	public class HtmlTableCell : HtmlContainerControl {

+		public HtmlTableCell(): base("td"){}

+		

+		public HtmlTableCell(string tagName): base(tagName){}

+		

+		protected override void RenderEndTag(HtmlTextWriter writer){

+			base.RenderEndTag(writer);

+			writer.WriteLine();

+		}

+		

+		public string Align {

+			get{

+				string attr = Attributes["align"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["align"] = AttributeToString(value);

+			}

+		}

+		

+		public string BgColor {

+			get{

+				string attr = Attributes["bgcolor"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["bgcolor"] = AttributeToString(value);

+			}

+		}

+		

+		public string BorderColor {

+			get{

+				string attr = Attributes["bordercolor"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["bordercolor"] = AttributeToString(value);

+			}

+		}

+		

+		public int ColSpan {

+			get{

+				string attr = Attributes["colspan"];

+				if (attr != null) return Int32.Parse(attr, CultureInfo.InvariantCulture);

+				return -1;

+			}

+			set{

+				Attributes["colspan"] = AttributeToString(value);

+			}

+		}

+		

+		public string Height {

+			get{

+				string attr = Attributes["height"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["height"] = AttributeToString(value);

+			}

+		}

+		

+		public bool NoWrap {

+			get{

+				string attr = Attributes["colspan"];

+				if (attr != null) return attr.Equals("nowrap");

+				return false;

+			}

+			set{

+				if (value == true){

+					Attributes["nowrap"] = "nowrap";

+				}

+				else{

+					Attributes["nowrap"] = null;

+				}

+			}

+		}

+		

+		public int RowSpan {

+			get{

+				string attr = Attributes["rowspan"];

+				if (attr != null) return Int32.Parse(attr, CultureInfo.InvariantCulture);

+				return -1;

+			}

+			set{

+				Attributes["rowspan"] = AttributeToString(value);

+			}

+		}

+		

+		public string VAlign {

+			get{

+				string attr = Attributes["valign"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["valign"] = AttributeToString(value);

+			}

+		}

+		

+		public string Width {

+			get{

+				string attr = Attributes["width"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["width"] = AttributeToString(value);

+			}

+		}

+		

+	}

+	// System.Web.UI.HtmlControls.HtmlTableCell

+	

+}

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCellCollection.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCellCollection.cs
new file mode 100755
index 00000000000..e6926f10eb7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableCellCollection.cs
@@ -0,0 +1,84 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.Collections;

+

+namespace System.Web.UI.HtmlControls{

+	public sealed class HtmlTableCellCollection : ICollection {

+		private HtmlTableRow _owner;

+		

+		internal HtmlTableCellCollection(HtmlTableRow owner){

+			_owner = owner;

+		}

+		

+		public void Add(HtmlTableCell cell){

+			Insert(-1, cell);

+		}

+		

+		public void Clear(){

+			if (_owner.HasControls()) _owner.Controls.Clear();

+		}

+		

+		public void CopyTo(Array array, int index){

+			IEnumerator tablecell = this.GetEnumerator();

+			while(tablecell.MoveNext()){

+				index = index + 1;

+				array.SetValue(tablecell.Current, index);

+			}

+		}

+		

+		public IEnumerator GetEnumerator(){

+			return _owner.Controls.GetEnumerator();

+		}

+		

+		public void Insert(int index, HtmlTableCell cell){

+			_owner.Controls.AddAt(index,cell);

+		}

+		

+		public void Remove(HtmlTableCell cell){

+			_owner.Controls.Remove(cell);

+		}

+		

+		public void RemoveAt(int index){

+			_owner.Controls.RemoveAt(index);

+		}

+		

+		public int Count {

+			get{

+				if (_owner.HasControls()) return _owner.Controls.Count;

+				return 0;

+			}

+		}

+		

+		public bool IsReadOnly {

+			get{

+				return false;

+			}

+		}

+		

+		public bool IsSynchronized {

+			get{

+				return false;

+			}

+		}

+		

+		public HtmlTableCell this[int index] {

+			get{

+				return _owner.Controls[index] as HtmlTableCell;

+			}

+		}

+		

+		public object SyncRoot {

+			get{

+				return null;

+			}

+		}

+		

+	} // end of System.Web.UI.HtmlControls.HtmlTableCellCollection

+	

+}

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRow.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRow.cs
new file mode 100755
index 00000000000..84d6b2c81b9
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRow.cs
@@ -0,0 +1,138 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.HtmlControls{

+	[ParseChildren(true, "Cells")]

+	public class HtmlTableRow : HtmlContainerControl {

+		private HtmlTableCellCollection _cells;

+		public HtmlTableRow():base("tr"){}

+		

+		protected override ControlCollection CreateControlCollection(){

+			return new HtmlTableCellControlCollection(this);

+		}

+		

+		protected override void RenderChildren(HtmlTextWriter writer){

+			writer.WriteLine();

+			writer.Indent = writer.Indent + 1;

+			base.RenderChildren(writer);

+			writer.Indent = writer.Indent - 1;

+		}

+		

+		protected override void RenderEndTag(HtmlTextWriter writer){

+			base.RenderEndTag(writer);

+			writer.WriteLine();

+		}

+		

+		public string Align {

+			get{

+				string attr = Attributes["align"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["align"] = AttributeToString(value);

+			}

+		}

+		

+		public string BgColor {

+			get{

+				string attr = Attributes["bgcolor"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["bgcolor"] = AttributeToString(value);

+			}

+		}

+		

+		public string BorderColor {

+			get{

+				string attr = Attributes["bordercolor"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["bordercolor"] = AttributeToString(value);

+			}

+		}

+		

+		public virtual HtmlTableCellCollection Cells {

+			get{

+				if (_cells == null) _cells = new HtmlTableCellCollection(this);

+				return _cells;

+			}

+		}

+		

+		public string Height {

+			get{

+				string attr = Attributes["height"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["height"] = AttributeToString(value);

+			}

+		}

+		

+		public override string InnerHtml {

+			get{

+				throw new NotSupportedException("InnerHtml is not supported by HtmlTableRow");

+			}

+			set{

+				throw new NotSupportedException("InnerHtml is not supported by HtmlTableRow");

+			}

+		}

+		

+		public override string InnerText {

+			get{

+				throw new NotSupportedException("InnerText is not supported by HtmlTableRow");

+			}

+			set{

+				throw new NotSupportedException("InnerText is not supported by HtmlTableRow");

+			}

+		}

+		

+		public string VAlign {

+			get{

+				string attr = Attributes["valign"];

+				if (attr != null) return attr;

+				return String.Empty;

+			}

+			set{

+				Attributes["valign"] = AttributeToString(value);

+			}

+		}

+		

+		

+		

+		protected class HtmlTableCellControlCollection : ControlCollection {

+			

+			internal HtmlTableCellControlCollection(Control owner): base(owner){}

+			

+			public override void Add(Control child){

+				if (child is HtmlTableCell){

+					base.Add(child);

+				}

+				else{

+					throw new ArgumentException("HtmlTableRow cannot have children of Type " + child.GetType().Name);

+				}

+			}

+			

+			public override void AddAt(int index, Control child){

+				if (child is HtmlTableCell){

+					base.AddAt(index,child);

+				}

+				else{

+					throw new ArgumentException("HtmlTableRow cannot have children of Type " + child.GetType().Name);

+				}

+			}

+		}

+	}  // end of System.Web.UI.HtmlControls.HtmlTableRow+HtmlTableCellControlCollection

+	// end of System.Web.UI.HtmlControls.HtmlTableRow

+}

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRowCollection.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRowCollection.cs
new file mode 100755
index 00000000000..987c8aed674
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTableRowCollection.cs
@@ -0,0 +1,83 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.Collections;

+

+namespace System.Web.UI.HtmlControls{

+	public sealed class HtmlTableRowCollection : ICollection {

+		

+		private HtmlTable _owner;

+		

+		internal HtmlTableRowCollection(HtmlTable owner){

+			_owner = owner;

+		}

+		

+		public void Add(HtmlTableRow row){

+			Insert(-1, row);

+		}

+		

+		public void Clear(){

+			if (_owner.HasControls()) _owner.Controls.Clear();

+		}

+		

+		public void CopyTo(Array array, int index){

+			IEnumerator tablerow = this.GetEnumerator();

+			while (tablerow.MoveNext()){

+				index = index + 1;

+				array.SetValue(tablerow.Current, index);

+			}

+		}

+		

+		public IEnumerator GetEnumerator(){

+			return _owner.Controls.GetEnumerator();

+		}

+		

+		public void Insert(int index, HtmlTableRow row){

+			_owner.Controls.AddAt(index,row);

+		}

+		

+		public void Remove(HtmlTableRow row){

+			_owner.Controls.Remove(row);

+		}

+		

+		public void RemoveAt(int index){

+			_owner.Controls.RemoveAt(index);

+		}

+		

+		public int Count {

+			get{

+				if (_owner.HasControls()) return _owner.Controls.Count;

+				return 0;

+			}

+		}

+		

+		public bool IsReadOnly {

+			get{

+				return false;

+			}

+		}

+		

+		public bool IsSynchronized {

+			get{

+				return false;

+			}

+		}

+		

+		public HtmlTableRow this[int index] {

+			get{

+				return (HtmlTableRow) _owner.Controls[index];

+			}

+		}

+		

+		public object SyncRoot {

+			get{

+				return this;

+			}

+		}

+	}//System.Web.UI.HtmlControls.HtmlTableRowCollection

+}

diff --git a/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs
new file mode 100644
index 00000000000..d38e81aaa00
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.HtmlControls/HtmlTextArea.cs
@@ -0,0 +1,122 @@
+/*	System.Web.UI.HtmlControls

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+using System.Globalization;

+using System.Collections.Specialized;

+

+namespace System.Web.UI.HtmlControls{

+	

+	[DefaultEvent("ServerChange")]

+	public class HtmlTextArea : HtmlContainerControl, IPostBackDataHandler{

+		

+		private static readonly object EventServerChange = new object ();

+		

+		public HtmlTextArea(): base("textarea"){}

+		

+		public int Cols{

+			get{

+				string attr = Attributes["cols"];

+				if (attr != null){

+					return Int32.Parse(attr, CultureInfo.InvariantCulture);

+				}

+				return -1;

+			}

+			set{

+				Attributes["cols"] = AttributeToString(value);

+			}

+		}

+		

+		public int Rows{

+			get{

+				string attr = Attributes["rows"];

+				if (attr != null){

+					return Int32.Parse(attr, CultureInfo.InvariantCulture);;

+				}

+				return -1;

+			}

+			set{

+				Attributes["rows"] = AttributeToString(value);

+			}

+		}

+		

+		public string Value{

+			get{

+				return InnerHtml;

+			}

+			set{

+				InnerHtml = value;

+			}

+		}

+			

+		public virtual string Name{

+			get{

+				if (UniqueID != null){

+					return UniqueID;

+				}

+				return String.Empty;

+			}

+			set{}

+		}

+		

+		public event EventHandler ServerChange{

+			add{

+				Events.AddHandler(EventServerChange, value);

+			}

+			remove{

+				Events.RemoveHandler(EventServerChange, value);

+			}

+		}

+		

+		protected virtual void OnServerChange(EventArgs e){

+			EventHandler handler;

+			handler = (EventHandler) Events[EventServerChange];

+			if(handler != null){

+				handler.Invoke(this, e);

+			}

+		}

+		

+		bool IPostBackDataHandler.LoadPostData (string postDataKey,

+							NameValueCollection postCollection)

+		{

+			string currentValue = Value;

+			string postedValue = postCollection[postDataKey];

+			if (!currentValue.Equals(postedValue) && currentValue != null){

+				Value = HttpUtility.HtmlEncode(postedValue);

+				return true;

+			}

+			return false;

+		}

+		

+		protected override void RenderAttributes(HtmlTextWriter writer){

+			writer.WriteAttribute("name", Name);

+			Attributes.Remove("name");

+			base.RenderAttributes(writer);

+		}

+		

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+			OnServerChange (EventArgs.Empty);

+		}

+		

+		protected override void OnPreRender(EventArgs e){

+			if(Events[EventServerChange]==null || Disabled){

+				ViewState.SetItemDirty("value",false);

+			}

+		}

+		

+		protected override void AddParsedSubObject(object obj){

+			if (obj is LiteralControl || obj is DataBoundLiteralControl)

+				AddParsedSubObject(obj);

+			else

+				throw new NotSupportedException("HtmlTextArea cannot have children of Type " + obj.GetType().Name);

+		}

+		

+	} // class HtmlTextArea

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/.cvsignore b/mcs/class/System.Web/System.Web.UI.WebControls/.cvsignore
new file mode 100644
index 00000000000..13fc1fc7660
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/.cvsignore
@@ -0,0 +1,2 @@
+*.exe
+*.xml
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventArgs.cs
new file mode 100755
index 00000000000..d0e94b87f88
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventArgs.cs
@@ -0,0 +1,92 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     AdCreatedEventArgs

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class AdCreatedEventArgs: EventArgs

+	{

+

+		private IDictionary adProperties;

+		private string      alternateText;

+		private string      imageUrl;

+		private string      navigateUrl;

+

+		public AdCreatedEventArgs(IDictionary adProperties): base()

+		{

+			Initialize();

+			this.adProperties = adProperties;

+			if(adProperties!=null)

+			{

+				imageUrl = (string)adProperties["ImageUrl"];

+				navigateUrl = (string)adProperties["NavigateUrl"];

+				alternateText = (string)adProperties["AlternateText"];

+			}

+		}

+

+		private void Initialize()

+		{

+			alternateText = string.Empty;

+			imageUrl      = string.Empty;

+			navigateUrl   = string.Empty;

+		}

+

+		public IDictionary AdProperties

+		{

+			get

+			{

+				return adProperties;

+			}

+		}

+		

+		public string AlternateText

+		{

+			get

+			{

+				return alternateText;

+			}

+			set

+			{

+				alternateText = value;

+			}

+		}

+		

+		public string ImageUrl

+		{

+			get

+			{

+				return imageUrl;

+			}

+			set

+			{

+				imageUrl = value;

+			}

+		}

+		

+		public string NavigateUrl

+		{

+			get

+			{

+				return navigateUrl;

+			}

+			set

+			{

+				navigateUrl = value;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventHandler.cs
new file mode 100755
index 00000000000..57359aa5b30
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AdCreatedEventHandler.cs
@@ -0,0 +1,17 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Delegate:  AdCreatedEventHandler

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public delegate void AdCreatedEventHandler(object sender, AdCreatedEventArgs e);

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
new file mode 100755
index 00000000000..834d5f4cedf
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/AdRotator.cs
@@ -0,0 +1,364 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     AdRotator

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.IO;

+using System.Collections;

+using System.Collections.Specialized;

+using System.Web;

+using System.Web.Caching;

+using System.Web.UI;

+using System.Xml;

+using System.Web.Utils;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultEvent("AdCreated")]

+	[DefaultProperty("AdvertisementFile")]

+	//TODO: [Designer("??")]

+	[ToolboxData("<{0}:AdRotator runat=\"server\" Height=\"60px\" "

+	             + "Width=\"468\"></{0}:AdRotator>")]

+	public class AdRotator: WebControl

+	{

+

+		private string advertisementFile;

+		private static readonly object AdCreatedEvent = new object();

+

+		// Will be set values during (On)PreRender-ing

+		private string alternateText;

+		private string imageUrl;

+		private string navigateUrl;

+

+		private string fileDirectory;

+

+		class AdRecord

+		{

+			public IDictionary adProps;

+			public int         hits; // or impressions or clicks

+			public string      keyword;

+

+			public AdRecord(IDictionary adProps)

+			{

+				this.adProps = adProps;

+				hits         = 0;

+				keyword      = String.Empty;

+			}

+		}

+

+/*

+ * Loading / Saving data from/to ad file and all the manipulations wrt to the URL...

+ * are incorporated by the following functions.

+ * GetData(string)

+ * LoadAdFile(string)

+ * IsAdMatching(AdRecord)

+ * ResolveAdUrl(string)

+ * SelectAd()

+ * The exact control flow will be detailed. Let me first write the functions

+ */

+

+		private AdRecord[] LoadAdFile(string file)

+		{

+			Stream      fStream;

+			ArrayList   list;

+			XmlReader   reader;

+			XmlDocument document;

+			XmlNode     topNode, innerNode;

+			IDictionary hybridDict = null;

+			AdRecord[]  adsArray = null;

+			try

+			{

+				fStream = new FileStream(file, FileMode.Open, FileAccess.Read, FileShare.Read);

+			} catch(Exception e)

+			{

+				throw new HttpException("AdRotator: Unable to open file");

+			}

+			try

+			{

+				list = new ArrayList();

+				reader = new XmlTextReader(fStream);

+				document = new XmlDocument();

+				document.Load(reader);

+				if(document.DocumentElement!=null)

+				{

+					if(document.DocumentElement.LocalName=="Advertisements")

+					{

+						topNode = document.DocumentElement.FirstChild;

+						while(topNode!=null)

+						{

+							if(topNode.LocalName=="Ad")

+							{

+								innerNode = topNode.FirstChild;

+								while(innerNode!=null)

+								{

+									if(innerNode.NodeType==XmlNodeType.Element)

+									{

+										if(hybridDict==null)

+										{

+											hybridDict = new HybridDictionary();

+										}

+										hybridDict.Add(innerNode.LocalName, innerNode.InnerText);

+									}

+									innerNode = innerNode.NextSibling;

+								}

+								if (hybridDict!=null) {

+									list.Add (hybridDict);

+									hybridDict = null;

+								}

+							}

+							topNode = topNode.NextSibling;

+						}

+					}

+				}

+				if(list.Count>0)

+				{

+					adsArray = new AdRecord[list.Count];

+					for(int i=0; i < list.Count; i++)

+					{

+						adsArray[i] = new AdRecord((IDictionary)list[i]);

+					}

+				}

+			} catch(Exception e)

+			{

+				throw new HttpException("AdRotator_Parse_Error" + file);

+			} finally

+			{

+				fStream.Close();

+			}

+			if(adsArray == null)

+			{

+				throw new HttpException("AdRotator_No_Advertisements_Found");

+			}

+			return adsArray;

+		}

+

+		[MonoTODO("CacheDependency does nothing")]

+		private AdRecord[] GetData(string file)

+		{

+			string physPath = MapPathSecure(file);

+			string AdKey = "AdRotatorCache: " + physPath;

+			fileDirectory = UrlUtils.GetDirectory(UrlUtils.Combine(TemplateSourceDirectory, file));

+			Cache cache = HttpRuntime.Cache;

+			AdRecord[] records = (AdRecord[])cache[AdKey];

+			if(records==null)

+			{

+				records = LoadAdFile(physPath);

+				if(records==null)

+				{

+					return null;

+				}

+				cache.Insert(AdKey, records, new CacheDependency(physPath));

+			}

+			return records;

+		}

+

+		private IDictionary SelectAd()

+		{

+			AdRecord[] records = GetData(AdvertisementFile);

+			if(records!=null && records.Length!=0)

+			{

+				int impressions = 0;

+				for(int i=0 ; i < records.Length; i++)

+				{

+					if(IsAdMatching(records[i]))

+						impressions += records[i].hits;

+				}

+				if(impressions!=0)

+				{

+					int rnd = (new Random()).Next(impressions) + 1;

+					int counter = 0;

+					int index = 0;

+					for(int i=0; i < records.Length; i++)

+					{

+						if(IsAdMatching(records[i]))

+						{

+							if(rnd <= (counter + records[i].hits))

+							{

+								index = i;

+								break;

+							}

+							counter += records[i].hits;

+						}

+					}

+					return records[index].adProps;

+				}

+				//FIXME: the line below added. Where should i init hits to make

+				//impressions not be 0?

+				return records [0].adProps;

+			}

+			return null;

+		}

+

+		private bool IsAdMatching(AdRecord currAd)

+		{

+			if (KeywordFilter != String.Empty)

+				return (0 == String.Compare (currAd.keyword, KeywordFilter, true));

+

+			return true;

+		}

+

+		private string ResolveAdUrl(string relativeUrl)

+		{

+			if(relativeUrl.Length==0 || !UrlUtils.IsRelativeUrl(relativeUrl))

+				return relativeUrl;

+			string fullUrl = String.Empty;

+			if(fileDirectory != null)

+				fullUrl = fileDirectory;

+			if(fullUrl.Length == 0)

+				fullUrl = TemplateSourceDirectory;

+			if(fullUrl.Length == 0)

+				return relativeUrl;

+			return (fullUrl + relativeUrl);

+		}

+

+		[WebCategory("Action")]

+		[WebSysDescription("AdRotator_OnAdCreated")]

+		public event AdCreatedEventHandler AdCreated

+		{

+			add

+			{

+				Events.AddHandler(AdCreatedEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(AdCreatedEvent, value);

+			}

+		}

+

+		public AdRotator(): base()

+		{

+			advertisementFile = string.Empty;

+			fileDirectory     = null;

+		}

+

+		[Bindable(true)]

+		[DefaultValue("")]

+		//[Editor("??")]

+		[WebCategory("Behaviour")]

+		[WebSysDescription("AdRotator_AdvertisementFile")]

+		public string AdvertisementFile

+		{

+			get

+			{

+				return advertisementFile;

+			}

+			set

+			{

+				advertisementFile = value;

+			}

+		}

+

+		public override FontInfo Font

+		{

+			get

+			{

+				return Font;

+			}

+		}

+

+		[Bindable(true)]

+		[DefaultValue("")]

+		[WebCategory("Behaviour")]

+		[WebSysDescription("AdRotator_KeywordFilter")]

+		public string KeywordFilter

+		{

+			get

+			{

+				object o = ViewState["KeywordFilter"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				if(value!=null)

+					ViewState["KeywordFilter"] = value.Trim();

+			}

+		}

+

+		[Bindable(true)]

+		[DefaultValue("")]

+		[TypeConverter(typeof(TargetConverter))]

+		[WebCategory("Behaviour")]

+		[WebSysDescription("AdRotator_Target")]

+		public string Target

+		{

+			get

+			{

+				object o = ViewState["Target"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["Target"] = value;

+			}

+		}

+

+		protected override ControlCollection CreateControlCollection()

+		{

+			return new EmptyControlCollection(this);

+		}

+

+		protected virtual void OnAdCreated(AdCreatedEventArgs e)

+		{

+			if(Events!=null)

+			{

+				AdCreatedEventHandler aceh = (AdCreatedEventHandler)(Events[AdCreatedEvent]);

+				if(aceh!=null)

+					aceh(this, e);

+			}

+		}

+

+		protected override void OnPreRender(EventArgs e)

+		{

+			if(AdvertisementFile!=String.Empty)

+			{

+				AdCreatedEventArgs acea = new AdCreatedEventArgs(SelectAd());

+				imageUrl      = acea.ImageUrl;

+				navigateUrl   = acea.NavigateUrl;

+				alternateText = acea.AlternateText;

+			}

+		}

+

+		protected override void Render(HtmlTextWriter writer)

+		{

+			HyperLink hLink = new HyperLink();

+			Image adImage = new Image();

+			foreach(IEnumerable current in Attributes.Keys)

+			{

+				hLink.Attributes[(string)current] = Attributes[(string)current];

+			}

+			if(ID != null && ID.Length > 0)

+				hLink.ID = ID;

+			hLink.Target    = Target;

+			hLink.AccessKey = AccessKey;

+			hLink.Enabled   = Enabled;

+			hLink.TabIndex  = TabIndex;

+			if (navigateUrl != null && navigateUrl.Length != 0)

+				hLink.NavigateUrl = ResolveAdUrl (navigateUrl);

+			hLink.RenderBeginTag(writer);

+			if(ControlStyleCreated)

+			{

+				adImage.ApplyStyle(ControlStyle);

+			}

+			if(imageUrl!=null && imageUrl.Length > 0)

+				adImage.ImageUrl = ResolveAdUrl(imageUrl);

+			adImage.AlternateText = alternateText;

+			adImage.ToolTip       = ToolTip;

+			adImage.RenderControl(writer);

+			hLink.RenderEndTag(writer);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs
new file mode 100755
index 00000000000..a918280d3e9
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseCompareValidator.cs
@@ -0,0 +1,311 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     BaseCompareValidator

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.Globalization;

+using System.Text;

+using System.Text.RegularExpressions;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	public abstract class BaseCompareValidator: BaseValidator

+	{

+		protected BaseCompareValidator(): base()

+		{

+		}

+

+		public static bool CanConvert(string text, ValidationDataType type)

+		{

+			object o = null;

+			return Convert(text, type, out o);

+		}

+

+		[DefaultValue(ValidationDataType.String)]

+		[WebCategory("Behaviour")]

+		[WebSysDescription("RangeValidator_Type")]

+		public ValidationDataType Type

+		{

+			get

+			{

+				object o = ViewState["Type"];

+				if(o!=null)

+					return (ValidationDataType)o;

+				return ValidationDataType.String;

+			}

+			set

+			{

+				if(!System.Enum.IsDefined(typeof(ValidationDataType), value))

+					throw new ArgumentException();

+				ViewState["Type"] = value;

+			}

+		}

+

+		protected static int CutoffYear

+		{

+			get

+			{

+				return DateTimeFormatInfo.CurrentInfo.Calendar.TwoDigitYearMax;

+			}

+		}

+

+		protected static int GetFullYear(int shortYear)

+		{

+			int century = DateTime.Today.Year - (DateTime.Today.Year % 100);

+			if(century < CutoffYear)

+			{

+				return (shortYear + century);

+			}

+			return (shortYear + century - 100);

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender(writer);

+			if(RenderUplevel)

+			{

+				writer.AddAttribute("type", PropertyConverter.EnumToString(typeof(ValidationDataType), Type));

+				NumberFormatInfo currInfo = NumberFormatInfo.CurrentInfo;

+				if(Type == ValidationDataType.Double)

+				{

+					writer.AddAttribute("decimalchar", currInfo.NumberDecimalSeparator);

+					return;

+				}

+				if(Type == ValidationDataType.Currency)

+				{

+					writer.AddAttribute("decimalchar", currInfo.CurrencyDecimalSeparator);

+					string grpSep = currInfo.CurrencyGroupSeparator;

+					if(grpSep[0] == 0xA0)

+					{

+						grpSep = " ";

+					}

+					writer.AddAttribute("groupchar", grpSep);

+					writer.AddAttribute("digits", currInfo.CurrencyDecimalDigits.ToString(NumberFormatInfo.InvariantInfo));

+					return;

+				}

+				if(Type == ValidationDataType.Date)

+				{

+					writer.AddAttribute("cutoffyear", CutoffYear.ToString());

+					writer.AddAttribute("century", ( DateTime.Today.Year - (DateTime.Today.Year % 100) ).ToString());

+					return;

+				}

+			}

+		}

+

+		protected override bool DetermineRenderUplevel()

+		{

+			if(Type == ValidationDataType.Date && DateTimeFormatInfo.CurrentInfo.Calendar.GetType() != typeof(GregorianCalendar))

+			{

+				return false;

+			}

+			return base.DetermineRenderUplevel();

+		}

+

+		/// <summary>

+		/// Undocumented

+		/// </summary>

+		protected static bool Compare(string leftText, string rightText, ValidationCompareOperator op, ValidationDataType type)

+		{

+			object left = null, right = null;

+			if(!Convert(leftText, type, out left))

+			{

+				return false;

+			}

+			if(op == ValidationCompareOperator.DataTypeCheck)

+			{

+				return true;

+			}

+			if(!Convert(rightText, type, out right))

+			{

+				return true;

+			}

+			int compareResult = 0;

+			switch(type)

+			{

+				case ValidationDataType.String:

+					compareResult = ((String)left).CompareTo(right);

+					break;

+				case ValidationDataType.Integer:

+					compareResult = ((int)left).CompareTo(right);

+					break;

+				case ValidationDataType.Double:

+					compareResult = ((Double)left).CompareTo(right);

+					break;

+				case ValidationDataType.Date:

+					compareResult = ((DateTime)left).CompareTo(right);

+					break;

+				case ValidationDataType.Currency:

+					compareResult = ((Decimal)left).CompareTo(right);

+					break;

+			}

+			switch(op)

+			{

+				case ValidationCompareOperator.Equal:

+					return (compareResult == 0);

+				case ValidationCompareOperator.NotEqual:

+					return (compareResult != 0);

+				case ValidationCompareOperator.GreaterThan:

+					return (compareResult > 0);

+				case ValidationCompareOperator.GreaterThanEqual:

+					return (compareResult >= 0);

+				case ValidationCompareOperator.LessThan:

+					return (compareResult < 0);

+				case ValidationCompareOperator.LessThanEqual:

+					return (compareResult == 0);

+			}

+			return false;

+		}

+

+		/// <summary>

+		/// Undocumented

+		/// </summary>

+		protected static string GetDateElementOrder()

+		{

+			string pattern = DateTimeFormatInfo.CurrentInfo.ShortDatePattern;

+

+			//TODO: What are the various possibilities?

+			// I can think of only y*/M*/d*, d*/M*/y*, M*/d*/y*

+			if(pattern.IndexOf('y') < pattern.IndexOf('M'))

+			{

+				return "ymd";

+			}

+			if(pattern.IndexOf('M') < pattern.IndexOf('d'))

+			{

+				return "mdy";

+			}

+			return "dmy";

+		}

+

+		/// <summary>

+		/// Undocumented

+		/// </summary>

+		protected static bool Convert(string text, ValidationDataType type, out object convertedValue)

+		{

+			convertedValue = null;

+			try

+			{

+				switch(type)

+				{

+					case ValidationDataType.String:	convertedValue = text;

+						break;

+					case ValidationDataType.Integer: convertedValue = Int32.Parse(text, CultureInfo.InvariantCulture);

+						break;

+					case ValidationDataType.Double:

+						Match matchDouble = Regex.Match(text, @"^\s*([-\+])?(\d+)?(\"

+			            + NumberFormatInfo.CurrentInfo.NumberDecimalSeparator

+			            + @"(\d+))?\s*$");

+						if(matchDouble.Success)

+						{

+							string sign     = (matchDouble.Groups[1].Success ? matchDouble.Groups[1].Value : "+");

+							string decPart  = (matchDouble.Groups[2].Success ? matchDouble.Groups[2].Value : "0");

+							string mantissa = (matchDouble.Groups[4].Success ? matchDouble.Groups[4].Value : "0");

+							convertedValue  = Double.Parse(sign + decPart + "." + mantissa, CultureInfo.InvariantCulture);

+						}

+						break;

+					case ValidationDataType.Date:

+						if(DateTimeFormatInfo.CurrentInfo.Calendar.GetType() != typeof(GregorianCalendar))

+						{

+							convertedValue = DateTime.Parse(text);

+							break;

+						}

+						string order = GetDateElementOrder();

+						int date = 0, mth = 0, year = 0;

+						Match  matchDate = Regex.Match(text, @"^\s*((\d{4})|(\d{2}))([\.\/-])(\d{1,2})\4(\d{1,2})\s*$");

+						if(matchDate.Success && order == "ymd")

+						{

+							date = Int32.Parse(matchDate.Groups[6].Value, CultureInfo.InvariantCulture);

+							mth  = Int32.Parse(matchDate.Groups[5].Value, CultureInfo.InvariantCulture);

+							year = Int32.Parse((matchDate.Groups[2].Success ? matchDate.Groups[2].Value : matchDate.Groups[3].Value), CultureInfo.InvariantCulture);

+						} else

+						{

+							matchDate = Regex.Match(text, @"^\s*(\d{1,2})([\.\/-])(\d{1,2})\2((\d{4}|\d{2}))\s*$");

+							if(matchDate.Success)

+							{

+								if(order == "dmy")

+								{

+									date = Int32.Parse(matchDate.Groups[1].Value, CultureInfo.InvariantCulture);

+									mth  = Int32.Parse(matchDate.Groups[3].Value, CultureInfo.InvariantCulture);

+									year = Int32.Parse((matchDate.Groups[5].Success ? matchDate.Groups[5].Value : matchDate.Groups[6].Value), CultureInfo.InvariantCulture);

+								}

+								if(order == "mdy")

+								{

+									date = Int32.Parse(matchDate.Groups[3].Value, CultureInfo.InvariantCulture);

+									mth  = Int32.Parse(matchDate.Groups[1].Value, CultureInfo.InvariantCulture);

+									year = Int32.Parse((matchDate.Groups[5].Success ? matchDate.Groups[5].Value : matchDate.Groups[6].Value), CultureInfo.InvariantCulture);

+								}

+							}

+						}

+						year = (year < 100 ? GetFullYear(year) : year);

+						if(matchDate.Success && date!=0 && mth!=0 && year!=0)

+						{

+							convertedValue = new DateTime(year, mth, date);

+						}

+						break;

+					case  ValidationDataType.Currency:

+						string decSep = NumberFormatInfo.CurrentInfo.CurrencyDecimalSeparator;

+						string grpSep = NumberFormatInfo.CurrentInfo.CurrencyGroupSeparator;

+						int    decDig = NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits;

+						if(grpSep[0] == 0xA0)

+						{

+							grpSep = " ";

+						}

+						string[] patternArray = new string[5];

+						patternArray[0] = "^\\s*([-\\+])?(((\\d+)\\";

+						patternArray[1] = grpSep;

+						patternArray[2] = @")*)(\d+)";

+						if(decDig > 0)

+						{

+							string[] decPattern = new string[5];

+							decPattern[0] = "(\\";

+							decPattern[1] = decSep;

+							decPattern[2] = @"(\d{1,";

+							decPattern[3] = decDig.ToString(NumberFormatInfo.InvariantInfo);

+							decPattern[4] = @"}))";

+							patternArray[3] = String.Concat(decPattern);

+

+						} else

+						{

+							patternArray[3] = String.Empty;

+						}

+						patternArray[4] = @"?\s*$";

+						Match matchCurrency = Regex.Match(text, String.Concat(patternArray));

+						if(matchCurrency.Success)

+						{

+							StringBuilder sb = new StringBuilder();

+							sb.Append(matchCurrency.Groups[1]);

+							CaptureCollection cc = matchCurrency.Groups[4].Captures;

+							foreach(IEnumerable current in cc)

+							{

+								sb.Append((Capture)current);

+							}

+							sb.Append(matchCurrency.Groups[5]);

+							if(decDig > 0)

+							{

+								sb.Append(".");

+								sb.Append(matchCurrency.Groups[7]);

+							}

+							convertedValue = Decimal.Parse(sb.ToString(), CultureInfo.InvariantCulture);

+						}

+						break;

+				}

+			} catch(Exception e)

+			{

+				convertedValue = null;

+			}

+			return (convertedValue != null);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
new file mode 100755
index 00000000000..ba6b6d0b999
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseDataList.cs
@@ -0,0 +1,277 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     BaseDataList

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultEvent("SelectedIndexChanged")]

+	[DefaultProperty("DataSource")]

+	[ParseChildren(true)]

+	[PersistChildren(false)]

+	//TODO: [Designer("??")]

+	public abstract class BaseDataList: WebControl

+	{

+		private  static readonly object SelectedIndexChangedEvent = new object();

+		internal static string          ItemCountViewStateKey     = "_!ItemCount";

+

+		private DataKeyCollection dataKeys;

+		private object            dataSource;

+

+		public BaseDataList() : base()

+		{

+		}

+

+		public static bool IsBindableType(Type type)

+		{

+			if(type.IsPrimitive || type == typeof(string) || type == typeof(DateTime) || type == typeof(Decimal))

+				return true;

+			return false;

+		}

+

+		public override ControlCollection Controls

+		{

+			get

+			{

+				EnsureChildControls();

+				return base.Controls;

+			}

+		}

+

+		public override void DataBind()

+		{

+			OnDataBinding(EventArgs.Empty);

+		}

+

+		[WebCategory("Action")]

+		[WebSysDescription("BaseDataList_OnSelectedIndexChanged")]

+		public event EventHandler SelectedIndexChanged

+		{

+			add

+			{

+				Events.AddHandler(SelectedIndexChangedEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(SelectedIndexChangedEvent, value);

+			}

+		}

+

+		[Bindable(true)]

+		[DefaultValue(-1)]

+		[WebCategory("Layout")]

+		[WebSysDescription("BaseDataList_CellPadding")]

+		public virtual int CellPadding

+		{

+			get

+			{

+				if(!ControlStyleCreated)

+					return -1;

+				return ((TableStyle)ControlStyle).CellPadding;

+			}

+			set

+			{

+				((TableStyle)ControlStyle).CellPadding = value;

+			}

+		}

+

+		[Bindable(true)]

+		[DefaultValue(-1)]

+		[WebCategory("Layout")]

+		[WebSysDescription("BaseDataList_CellSpacing")]

+		public virtual int CellSpacing

+		{

+			get

+			{

+				if(!ControlStyleCreated)

+					return -1;

+				return ((TableStyle)ControlStyle).CellSpacing;

+			}

+			set

+			{

+				((TableStyle)ControlStyle).CellSpacing = value;

+			}

+		}

+

+		[DefaultValue("")]

+		[WebCategory("Data")]

+		[WebSysDescription("BaseDataList_DataKeyField")]

+		public virtual string DataKeyField

+		{

+			get

+			{

+				object o = ViewState["DataKeyField"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataKeyField"] = value;

+			}

+		}

+

+		[Browsable(true)]

+		//[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]

+		[WebSysDescription("BaseDataList_DataKeys")]

+		public DataKeyCollection DataKeys

+		{

+			get

+			{

+				if( dataKeys==null )

+					dataKeys = new DataKeyCollection(DataKeysArray);

+				return dataKeys;

+

+			}

+		}

+

+		[DefaultValue("")]

+		[WebCategory("Data")]

+		[WebSysDescription("BaseDataList_DataMember")]

+		public string DataMember

+		{

+			get

+			{

+				object o = ViewState["DataMember"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataMember"] = value;

+			}

+		}

+

+		[Bindable(true)]

+		//[DefaultValue(null)]

+		//[DesignerSerializationVisibility(DesignerSerializationVisibility.Hidden)]

+		[WebCategory("Data")]

+		[WebSysDescription("BaseDataList_DataSource")]

+		public virtual object DataSource

+		{

+			get

+			{

+				return dataSource;

+			}

+			set

+			{

+				if( (value!=null) && (value is IListSource || value is IEnumerable) )

+				{

+					dataSource = value;

+				} else

+				{

+					throw new ArgumentException(HttpRuntime.FormatResourceString("Invalid_DataSource_Type", ID));

+				}

+			}

+		}

+

+		[Bindable(true)]

+		[DefaultValue(GridLines.Both)]

+		[WebCategory("Appearance")]

+		[WebSysDescription("BaseDataList_GridLines")]

+		public virtual GridLines GridLines

+		{

+			get

+			{

+				if(ControlStyleCreated)

+					return ((TableStyle)ControlStyle).GridLines;

+				return GridLines.Both;

+			}

+			set

+			{

+				((TableStyle)ControlStyle).GridLines = value;

+			}

+		}

+

+		[Bindable(true)]

+		[DefaultValue(HorizontalAlign.NotSet)]

+		[WebCategory("Layout")]

+		[WebSysDescription("BaseDataList_HorizontalAlign")]

+		public virtual HorizontalAlign HorizontalAlign

+		{

+			get

+			{

+				if(ControlStyleCreated)

+					return ((TableStyle)ControlStyle).HorizontalAlign;

+				return HorizontalAlign.NotSet;

+			}

+			set

+			{

+				((TableStyle)ControlStyle).HorizontalAlign = value;

+			}

+		}

+

+		protected ArrayList DataKeysArray

+		{

+			get

+			{

+				object o = ViewState["DataKeys"];

+				if(o == null)

+				{

+					o = new ArrayList();

+					ViewState["DataKeys"] = o;

+				}

+				return (ArrayList)o;

+			}

+		}

+

+		protected override void AddParsedSubObject(object o)

+		{

+			// Preventing literal controls from being added as children.

+		}

+

+		protected override void CreateChildControls()

+		{

+			Controls.Clear();

+			if(ViewState[ItemCountViewStateKey]!=null)

+			{

+				CreateControlHierarchy(true);

+				ClearChildViewState();

+			}

+		}

+

+		protected override void OnDataBinding(EventArgs e)

+		{

+			base.OnDataBinding(e);

+			Controls.Clear();

+			ClearChildViewState();

+			CreateControlHierarchy(true);

+			ChildControlsCreated = true;

+			TrackViewState();

+		}

+

+		protected virtual void OnSelectedIndexChanged(EventArgs e)

+		{

+			if(Events != null)

+			{

+				EventHandler eh = (EventHandler)(Events[SelectedIndexChangedEvent]);

+				if(eh!=null)

+					eh(this, e);

+			}

+		}

+

+		protected override void Render(HtmlTextWriter writer)

+		{

+			PrepareControlHierarchy();

+			base.RenderContents(writer);

+		}

+

+		protected abstract void PrepareControlHierarchy();

+		protected abstract void CreateControlHierarchy(bool useDataSource);

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
new file mode 100755
index 00000000000..4256b2e8b2e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BaseValidator.cs
@@ -0,0 +1,410 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     BaseValidator

+ *

+ * Authors:  Gaurav Vaish, Gonzalo Paniagua Javier

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>, <gonzalo@ximian.com>

+ * Implementation: yes

+ * Status:  80%

+ *

+ * (C) Gaurav Vaish (2001)

+ * (c) 2002 Ximian, Inc. (http://www.ximian.com)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+using System.Drawing;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultProperty("ErrorMessage")]

+	//TODO: [Designer("??")]

+	public abstract class BaseValidator: Label, IValidator

+	{

+		private bool isValid;

+		private bool isPreRenderCalled;

+		private bool isPropertiesChecked;

+		private bool propertiesValid;

+		private bool renderUplevel;

+

+		protected BaseValidator() : base()

+		{

+			isValid = true;

+			ForeColor = Color.Red;

+			propertiesValid = true;

+			isPropertiesChecked = false;

+			renderUplevel = false;

+		}

+

+		public string ControlToValidate

+		{

+			get

+			{

+				object o = ViewState["ControlToValidate"];

+				if(o != null)

+				{

+					return (string)o;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["ControlToValidate"] = value;

+			}

+		}

+

+		public ValidatorDisplay Display

+		{

+			get

+			{

+				object o = ViewState["Display"];

+				if(o != null)

+				{

+					return (ValidatorDisplay)o;

+				}

+				return ValidatorDisplay.Static;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(ValidatorDisplay), value))

+				{

+					throw new ArgumentException();

+				}

+				ViewState["ValidatorDisplay"] = value;

+			}

+		}

+

+		public bool EnableClientScript

+		{

+			get

+			{

+				object o = ViewState["EnableClientScript"];

+				if(o != null)

+				{

+					return (bool)o;

+				}

+				return true;

+			}

+			set

+			{

+				ViewState["EnableClientScript"] = value;

+			}

+		}

+

+		public override bool Enabled

+		{

+			get

+			{

+				return base.Enabled;

+			}

+			set

+			{

+				if (value == false)

+					isValid = true;

+				base.Enabled = value;

+			}

+		}

+

+		public string ErrorMessage

+		{

+			get

+			{

+				object o = ViewState["ErrorMessage"];

+				if(o != null)

+				{

+					return (string)o;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["ErrorMessage"] = value;

+			}

+		}

+

+		public override Color ForeColor

+		{

+			get

+			{

+				return base.ForeColor;

+			}

+			set

+			{

+				base.ForeColor = value;

+			}

+		}

+

+		public bool IsValid

+		{

+			get { return isValid; }

+			set { isValid = value; }

+		}

+

+		public static PropertyDescriptor GetValidationProperty(object component)

+		{

+			System.ComponentModel.AttributeCollection coll = TypeDescriptor.GetAttributes (component);

+			Type type = typeof (ValidationPropertyAttribute);

+			ValidationPropertyAttribute attrib = (ValidationPropertyAttribute) coll [type];

+			if (attrib != null && attrib.Name != null)

+				return (TypeDescriptor.GetProperties (component)) [attrib.Name];

+			return null;

+		}

+

+		public void Validate()

+		{

+			if(!Visible || (Visible && !Enabled))

+			{

+				IsValid = true;

+			}

+			Control ctrl = Parent;

+			while(ctrl != null)

+			{

+				if(!ctrl.Visible)

+				{

+					IsValid = true;

+					return;

+				}

+				ctrl = ctrl.Parent;

+			}

+			isPropertiesChecked = false;

+			if(!PropertiesValid)

+			{

+				IsValid = true;

+				return;

+			}

+			IsValid = EvaluateIsValid();

+		}

+

+		protected bool PropertiesValid

+		{

+			get

+			{

+				if(!isPropertiesChecked)

+				{

+					propertiesValid = ControlPropertiesValid();

+					isPropertiesChecked = true;

+				}

+				return propertiesValid;

+			}

+		}

+

+		protected bool RenderUplevel

+		{

+			get

+			{

+				return renderUplevel;

+			}

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			bool enabled = base.Enabled;

+			if (enabled)

+				Enabled = true;

+

+			base.AddAttributesToRender(writer);

+			if(RenderUplevel)

+			{

+				if(ID == null)

+				{

+					writer.AddAttribute("id", ClientID);

+				}

+				if(ControlToValidate.Length > 0)

+				{

+					writer.AddAttribute("controltovalidate", GetControlRenderID(ControlToValidate));

+				}

+				if(ErrorMessage.Length > 0)

+				{

+					writer.AddAttribute("errormessage", ErrorMessage, true);

+				}

+				if(Display == ValidatorDisplay.Static)

+				{

+					writer.AddAttribute("display", Enum.Format(typeof(ValidatorDisplay), Display, "G").Replace('_','-'));

+					//writer.AddAttribute("display", PropertyConverter.EnumToString(typeof(ValidatorDisplay), Display));

+				}

+				if(!IsValid)

+				{

+					writer.AddAttribute("isvalid", "False");

+				}

+

+				ControlStyle.AddAttributesToRender (writer, this);

+				if(!enabled)

+				{

+					writer.AddAttribute("enabled", "False");

+				}

+			}

+

+			if(enabled)

+			{

+				Enabled = false;

+			}

+		}

+

+		protected void CheckControlValidationProperty(string name, string propertyName)

+		{

+			Control ctrl = NamingContainer.FindControl(name);

+			if(ctrl == null)

+			{

+				throw new HttpException(HttpRuntime.FormatResourceString("Validator_control_not_found",

+				                 name, propertyName/*, ID*/));

+			}

+			PropertyDescriptor pd = GetValidationProperty(ctrl);

+			if(pd == null)

+			{

+				throw new HttpException(HttpRuntime.FormatResourceString("Validator_bad_control_type",

+				                 name, propertyName/*, ID*/));

+			}

+		}

+

+		protected virtual bool ControlPropertiesValid()

+		{

+			if(ControlToValidate.Length == 0)

+			{

+				throw new HttpException(HttpRuntime.FormatResourceString("Validator_control_blank", ID));

+			}

+			CheckControlValidationProperty(ControlToValidate, "ControlToValidate");

+			return true;

+		}

+

+		[MonoTODO]

+		protected virtual bool DetermineRenderUplevel()

+		{

+			Page page = Page;

+			if(page == null || page.Request == null)

+			{

+				return false;

+			}

+

+			if(EnableClientScript)

+			{

+				// By now, return false

+				return false;

+				////throw new NotImplementedException();

+				////TODO: I need to get the (Browser->Dom_version_major >= 4 &&

+				////                         Brower->Ecma_script_version >= 1.2)

+			}

+			return false;

+		}

+

+		protected string GetControlRenderID(string name)

+		{

+			Control ctrl = FindControl(name);

+			if(ctrl != null)

+			{

+				return ctrl.ClientID;

+			}

+			return String.Empty;

+		}

+

+		protected string GetControlValidationValue(string name)

+		{

+			Control ctrl = NamingContainer.FindControl(name);

+			if(ctrl != null)

+			{

+				PropertyDescriptor pd = GetValidationProperty(ctrl);

+				if(pd != null)

+				{

+					object item = pd.GetValue(ctrl);

+					if(item is ListItem)

+					{

+						return ((ListItem)item).Value;

+					}

+					return item.ToString();

+				}

+			}

+			return null;

+		}

+

+		protected override void OnInit(EventArgs e)

+		{

+			base.OnInit(e);

+			Page.Validators.Add(this);

+		}

+

+		protected override void OnPreRender(EventArgs e)

+		{

+			base.OnPreRender(e);

+			isPreRenderCalled   = true;

+			isPropertiesChecked = false;

+			renderUplevel       = DetermineRenderUplevel();

+			if(renderUplevel)

+			{

+				RegisterValidatorCommonScript();

+			}

+		}

+

+		protected override void OnUnload(EventArgs e)

+		{

+			if(Page != null)

+			{

+				Page.Validators.Remove(this);

+			}

+			base.OnUnload(e);

+		}

+

+		[MonoTODO("What_do_I_have_to_do")]

+		protected void RegisterValidatorCommonScript()

+		{

+			// Keep going

+			//throw new NotImplementedException();

+		}

+

+		[MonoTODO("I_have_to_know_javascript_for_this_I_know_it_but_for_ALL_browsers_NO")]

+		protected virtual void RegisterValidatorDeclaration()

+		{

+			throw new NotImplementedException();

+			//TODO: Since I have to access document.<ClientID> and register

+			// as page validator. Now this is Browser dependent :((

+

+			// This does not render anything on Mozilla, and does on IE

+		}

+

+		[MonoTODO("Render_ing_always_left")]

+		protected override void Render (HtmlTextWriter writer)

+		{

+			bool valid;

+

+			if (!Enabled)

+				return;

+

+			if (isPreRenderCalled) {

+				valid = IsValid;

+			} else {

+				isPropertiesChecked = true;

+				propertiesValid     = true;

+				renderUplevel       = false;

+				valid               = true;

+			}

+

+			if (PropertiesValid) {

+				if (Page != null)

+					Page.VerifyRenderingInServerForm (this);

+

+				ValidatorDisplay dis = Display;

+				if (RenderUplevel) {

+					//FIXME: by now, don't do client-side validation

+				}

+				

+				if (!valid) {

+					RenderBeginTag (writer);

+					if (Text.Trim ().Length > 0 || HasControls ()) {

+						RenderContents (writer);

+						RenderEndTag (writer);

+					} else {

+						writer.Write (ErrorMessage);

+					}

+					RenderEndTag (writer);

+					return;

+				}

+			} else {

+				writer.Write ("&nbsp;");

+			}

+		}

+

+		protected abstract bool EvaluateIsValid();

+	}

+}

+

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BorderStyle.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BorderStyle.cs
new file mode 100755
index 00000000000..93c04f1f213
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BorderStyle.cs
@@ -0,0 +1,29 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration: BorderStyle

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status: 100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum BorderStyle

+	{

+		NotSet,

+		None,

+		Dotted,

+		Dashed,

+		Solid,

+		Double,

+		Groove,

+		Ridge,

+		Inset,

+		Outset

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs
new file mode 100755
index 00000000000..13bcb75f8db
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/BoundColumn.cs
@@ -0,0 +1,109 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     BoundColumn

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  60%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class BoundColumn : DataGridColumn

+	{

+		public static readonly string thisExpr = "!";

+		

+		private string dataField;

+		private string dataFormatString;

+		private bool readOnly;

+		

+		private PropertyDescriptor desc;

+

+		public BoundColumn(): base()

+		{

+			//TODO: The start work

+			Initialize();

+		}

+		

+		public override void Initialize()

+		{

+			base.Initialize();

+			dataField        = String.Empty;

+			dataFormatString = String.Empty;

+			readOnly         = false;

+			desc             = null;

+		}

+

+		[MonoTODO]

+		public override void InitializeCell(TableCell cell, int columnIndex, ListItemType itemType)

+		{

+			//TODO: What to do?

+			InitializeCell(cell, columnIndex, itemType);

+//			switch(itemType)

+//			{

+//				case 

+//			}

+			throw new NotImplementedException();

+		}

+		

+		public virtual string DataField

+		{

+			get

+			{

+				return dataField;

+			}

+			set

+			{

+				dataField = value;

+			}

+		}

+		

+		public virtual string DataFormatString

+		{

+			get

+			{

+				return dataFormatString;

+			}

+			set

+			{

+				dataFormatString = value;

+			}

+		}

+		

+		public virtual bool ReadOnly

+		{

+			get

+			{

+				return readOnly;

+			}

+			set

+			{

+				readOnly = value;

+			}

+		}

+		

+		[MonoTODO]

+		protected virtual string FormatDataValue(Object dataValue)

+		{

+			// TODO: How to extract the value from the object?

+			// TODO: Then format the value. Here's a possible solution

+			if(dataFormatString == null || dataFormatString.Equals(String.Empty))

+				return dataValue.ToString();

+			if(dataValue is DateTime)

+				return ((DateTime)dataValue).ToString(dataFormatString);

+			throw new NotImplementedException();

+			// and so on for int, String, double..

+			// something's wrong here. there must be some shorter method!

+			//string val = dataValue.toString(dataFormatString);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs
new file mode 100755
index 00000000000..9410807bae7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Button.cs
@@ -0,0 +1,172 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ * Class:     Button
+ *
+ * Author:  Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status:  100%
+ *
+ * (C) Gaurav Vaish (2001)
+ */
+
+using System;
+using System.ComponentModel;
+using System.Web;
+using System.Web.UI;
+
+namespace System.Web.UI.WebControls
+{
+	[DefaultEvent("Click")]
+	[DefaultProperty("Text")]
+	//TODO: [Designer("??")]
+	//TODO: [DataBindingHandler("??UI.Design.TextDataBindingHandler??")]
+	[ToolboxData("<{0}:Button runat=\"server\" Text=\"Button\"></{0}:Button>")]
+	public class Button : WebControl, IPostBackEventHandler
+	{
+		private static readonly object ClickEvent   = new object();
+		private static readonly object CommandEvent = new object();
+
+		//private EventHandlerList ehList;
+
+		public Button(): base (HtmlTextWriterTag.Input)
+		{
+		}
+
+		public bool CausesValidation
+		{
+			get
+			{
+				Object cv = ViewState["CausesValidation"];
+				if(cv!=null)
+					return (Boolean)cv;
+				return true;
+			}
+			set
+			{
+				ViewState["CausesValidation"] = value;
+			}
+		}
+
+		public string CommandArgument
+		{
+			get
+			{
+				string ca = (string) ViewState["CommandArgument"];
+				if(ca!=null)
+					return ca;
+				return String.Empty;
+			}
+			set
+			{
+				ViewState["CommandArgument"] = value;
+			}
+		}
+
+		public string CommandName
+		{
+			get
+			{
+				string cn = (string)ViewState["CommandName"];
+				if(cn!=null)
+					return cn;
+				return String.Empty;
+			}
+			set
+			{
+				ViewState["CommandName"] = value;
+			}
+		}
+
+		public string Text
+		{
+			get
+			{
+				string text = (string)ViewState["Text"];
+				if(text!=null)
+					return text;
+				return String.Empty;
+			}
+			set
+			{
+				ViewState["Text"] = value;
+			}
+		}
+
+		public event EventHandler Click
+		{
+			add
+			{
+				Events.AddHandler(ClickEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(ClickEvent, value);
+			}
+		}
+
+		public event CommandEventHandler Command
+		{
+			add
+			{
+				Events.AddHandler(CommandEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(CommandEvent, value);
+			}
+		}
+
+		protected virtual void OnClick(EventArgs e)
+		{
+			if(Events != null)
+			{
+				EventHandler eh = (EventHandler)(Events[ClickEvent]);
+				if(eh!= null)
+					eh(this,e);
+			}
+		}
+
+		protected virtual void OnCommand(CommandEventArgs e)
+		{
+			if(Events != null)
+			{
+				CommandEventHandler eh = (CommandEventHandler)(Events[CommandEvent]);
+				if(eh!= null)
+					eh(this,e);
+			}
+			RaiseBubbleEvent(this, e);
+		}
+
+		void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)
+		{
+			if (CausesValidation)
+				Page.Validate ();
+
+			OnClick (EventArgs.Empty);
+			OnCommand (new CommandEventArgs (CommandName, CommandArgument));
+		}
+
+		protected override void AddAttributesToRender (HtmlTextWriter writer)
+		{
+			if (Page != null)
+				Page.VerifyRenderingInServerForm (this);
+
+			writer.AddAttribute (HtmlTextWriterAttribute.Type, "submit");
+			writer.AddAttribute (HtmlTextWriterAttribute.Name, base.UniqueID);
+			writer.AddAttribute (HtmlTextWriterAttribute.Value, Text);
+			if (Page != null && CausesValidation && Page.Validators.Count > 0) {
+				writer.AddAttribute (System.Web.UI.HtmlTextWriterAttribute.Onclick,
+						     Utils.GetClientValidatedEvent (Page));
+				writer.AddAttribute ("language", "javascript");
+			}
+			base.AddAttributesToRender (writer);
+		}
+
+		protected override void RenderContents(HtmlTextWriter writer)
+		{
+			// Preventing base classes to do anything
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ButtonColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonColumn.cs
new file mode 100755
index 00000000000..23db52724d6
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonColumn.cs
@@ -0,0 +1,186 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     ButtonColumn

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class ButtonColumn : DataGridColumn

+	{

+		private PropertyDescriptor textFieldDescriptor;

+		

+		public ButtonColumn(): base()

+		{

+		}

+

+		public override void Initialize()

+		{

+			Initialize();

+			textFieldDescriptor = null;

+		}

+		

+		public override void InitializeCell(TableCell cell, int columnIndex, ListItemType itemType)

+		{

+			InitializeCell(cell, columnIndex, itemType);

+			if(Enum.IsDefined(typeof(ListItemType), itemType) && itemType != ListItemType.Footer)

+			{

+				WebControl toDisplay = null;

+				if(ButtonType == ButtonColumnType.PushButton)

+				{

+					Button b = new Button();

+					b.Text = Text;

+					b.CommandName = CommandName;

+					b.CausesValidation = false;

+					toDisplay = b;

+				} else

+				{

+					LinkButton lb = new LinkButton();

+					lb.Text = Text;

+					lb.CommandName = CommandName;

+					lb.CausesValidation = false;

+					toDisplay = lb;

+				}

+				if(DataTextField.Length > 0)

+				{

+					toDisplay.DataBinding += new EventHandler(OnDataBindButtonColumn);

+				}

+				cell.Controls.Add(toDisplay);

+			}

+		}

+		

+		private void OnDataBindButtonColumn(object sender, EventArgs e)

+		{

+			Control ctrl = (Control)sender;

+			object item = ((DataGridItem)ctrl.NamingContainer).DataItem;

+			if(textFieldDescriptor == null)

+			{

+				textFieldDescriptor = TypeDescriptor.GetProperties(item).Find(DataTextField, true);

+				if(textFieldDescriptor == null && !DesignMode)

+					throw new HttpException(HttpRuntime.FormatResourceString("Field_Not_Found", DataTextField));

+			}

+			string text;

+			if(textFieldDescriptor != null)

+			{

+				text = FormatDataTextValue(textFieldDescriptor.GetValue(item));

+			} else

+			{

+				text = "Sample_DataBound_Text";

+			}

+			if(ctrl is LinkButton)

+			{

+				((LinkButton)ctrl).Text = text;

+			}

+			else

+			{

+				((Button)ctrl).Text = text;

+			}

+		}

+		

+		protected virtual string FormatDataTextValue(object dataTextValue)

+		{

+			string retVal = null;

+			if(dataTextValue != null)

+			{

+				if(DataTextFormatString.Length > 0)

+				{

+					retVal = String.Format((string)dataTextValue, DataTextFormatString);

+				}

+				else

+				{

+					retVal = dataTextValue.ToString();

+				}

+			}

+			return retVal;

+		}

+		

+		public virtual ButtonColumnType ButtonType

+		{

+			get

+			{

+				object o = ViewState["ButtonType"];

+				if(o!=null)

+					return (ButtonColumnType)o;

+				return ButtonColumnType.LinkButton;

+			}

+			set

+			{

+				if(!System.Enum.IsDefined(typeof(ButtonColumnType), value))

+					throw new ArgumentException();

+				ViewState["ButtonType"] = value;

+			}

+		}

+		

+		public virtual string CommandName

+		{

+			get

+			{

+				string cn = (string)ViewState["CommandName"];

+				if(cn!=null)

+					return cn;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["CommandName"] = value;

+			}

+		}

+

+		public virtual string DataTextField

+		{

+			get

+			{

+				string dtf = (string)ViewState["DataTextField"];

+				if(dtf!=null)

+					return dtf;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataTextField"] = value;

+			}

+		}

+

+		public virtual string DataTextFormatString

+		{

+			get

+			{

+				string dtfs = (string)ViewState["DataTextFormatString"];

+				if(dtfs!=null)

+					return dtfs;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataTextFormatString"] = value;

+			}

+		}

+

+		public virtual string Text

+		{

+			get

+			{

+				string text = (string)ViewState["Text"];

+				if(text!=null)

+					return text;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["Text"] = value;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ButtonColumnType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonColumnType.cs
new file mode 100755
index 00000000000..ed59eba315b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ButtonColumnType.cs
@@ -0,0 +1,21 @@
+/**

+ * Namespace:   System.Web.UI.WebControls

+ * Enumeration: ButtonColumnType

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status: 100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum ButtonColumnType

+	{

+		LinkButton,

+		PushButton

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
new file mode 100755
index 00000000000..3abfd1df7c4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Calendar.cs
@@ -0,0 +1,1160 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     Calendar

+ *

+ * Authors:  Gaurav Vaish, Gonzalo Paniagua Javier

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>, <gonzalo@ximian.com>

+ * Implementation: yes

+ * Status:  98%

+ *

+ * (C) Gaurav Vaish (2001)

+ * (c) 2002 Ximian, Inc. (http://www.ximian.com)

+ */

+

+using System;

+using System.IO;

+using System.Collections;

+using System.Globalization;

+using System.Text;

+using System.Web;

+using System.Web.UI;

+using System.Drawing;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultEvent("SelectionChanged")]

+	[DefaultProperty("SelectedDate")]

+	//TODO: [Designer("??")]

+	//[DataBindingHandler("??")]

+	public class Calendar : WebControl, IPostBackEventHandler

+	{

+		//

+		private TableItemStyle          dayHeaderStyle;

+		private TableItemStyle          dayStyle;

+		private TableItemStyle          nextPrevStyle;

+		private TableItemStyle          otherMonthDayStyle;

+		private SelectedDatesCollection selectedDates;

+		private ArrayList               selectedDatesList;

+		private TableItemStyle          selectedDayStyle;

+		private TableItemStyle          selectorStyle;

+		private TableItemStyle          titleStyle;

+		private TableItemStyle          todayDayStyle;

+		private TableItemStyle          weekendDayStyle;

+

+		private static readonly object DayRenderEvent           = new object();

+		private static readonly object SelectionChangedEvent    = new object();

+		private static readonly object VisibleMonthChangedEvent = new object();

+

+		private Color defaultTextColor;

+		private System.Globalization.Calendar globCal;

+		private DateTimeFormatInfo infoCal = DateTimeFormatInfo.CurrentInfo;

+

+		private static int MASK_WEEKEND  = (0x01 << 0);

+		private static int MASK_OMONTH   = (0x01 << 1);

+		private static int MASK_TODAY    = (0x01 << 2);

+		private static int MASK_SELECTED = (0x01 << 3);

+		private static int MASK_DAY      = (0x01 << 4);

+		private static int MASK_UNIQUE = MASK_WEEKEND | MASK_OMONTH | MASK_TODAY | MASK_SELECTED;

+

+		public Calendar(): base()

+		{

+			//TODO: Initialization

+		}

+

+		public int CellPadding

+		{

+			get

+			{

+				object o = ViewState["CellPadding"];

+				if(o!=null)

+					return (int)o;

+				return 2;

+			}

+			set

+			{

+				ViewState["CellPadding"] = value;

+			}

+		}

+

+		public int CellSpacing

+		{

+			get

+			{

+				object o = ViewState["CellSpacing"];

+				if(o!=null)

+					return (int)o;

+				return 0;

+			}

+			set

+			{

+				if(value<-1)

+					throw new ArgumentOutOfRangeException();

+				ViewState["CellSpacing"] = value;

+			}

+		}

+

+		public TableItemStyle DayHeaderStyle

+		{

+			get

+			{

+				if(dayHeaderStyle==null)

+					dayHeaderStyle = new TableItemStyle();

+				if(IsTrackingViewState)

+					dayHeaderStyle.TrackViewState();

+				return dayHeaderStyle;

+			}

+		}

+

+		public DayNameFormat DayNameFormat

+		{

+			get

+			{

+				object o = ViewState["DayNameFormat"];

+				if(o!=null)

+					return (DayNameFormat)o;

+				return DayNameFormat.Short;

+			}

+			set

+			{

+				if(!System.Enum.IsDefined(typeof(DayNameFormat),value))

+					throw new ArgumentException();

+				ViewState["DayNameFormat"] = value;

+			}

+		}

+

+		public TableItemStyle DayStyle

+		{

+			get

+			{

+				if(dayStyle==null)

+					dayStyle = new TableItemStyle();

+				if(IsTrackingViewState)

+					dayStyle.TrackViewState();

+				return dayStyle;

+			}

+		}

+

+		public FirstDayOfWeek FirstDayOfWeek

+		{

+			get

+			{

+				object o = ViewState["FirstDayOfWeek"];

+				if(o!=null)

+					return (FirstDayOfWeek)o;

+				return FirstDayOfWeek.Default;

+			}

+			set

+			{

+				if(!System.Enum.IsDefined(typeof(FirstDayOfWeek), value))

+					throw new ArgumentException();

+				ViewState["FirstDayOfWeek"] = value;

+			}

+		}

+

+		public string NextMonthText

+		{

+			get

+			{

+				object o = ViewState["NextMonthText"];

+				if(o!=null)

+					return (string)o;

+				return "&gt;";

+			}

+			set

+			{

+				ViewState["NextMonthText"] = value;

+			}

+		}

+

+		public NextPrevFormat NextPrevFormat

+		{

+			get

+			{

+				object o = ViewState["NextPrevFormat"];

+				if(o!=null)

+					return (NextPrevFormat)o;

+				return NextPrevFormat.CustomText;

+			}

+			set

+			{

+				if(!System.Enum.IsDefined(typeof(NextPrevFormat), value))

+					throw new ArgumentException();

+				ViewState["NextPrevFormat"] = value;

+			}

+		}

+

+		public TableItemStyle NextPrevStyle

+		{

+			get

+			{

+				if(nextPrevStyle == null)

+					nextPrevStyle = new TableItemStyle();

+				if(IsTrackingViewState)

+					nextPrevStyle.TrackViewState();

+				return nextPrevStyle;

+			}

+		}

+

+		public TableItemStyle OtherMonthDayStyle

+		{

+			get

+			{

+				if(otherMonthDayStyle == null)

+					otherMonthDayStyle = new TableItemStyle();

+				if(IsTrackingViewState)

+					otherMonthDayStyle.TrackViewState();

+				return otherMonthDayStyle;

+			}

+		}

+

+		public string PrevMonthText

+		{

+			get

+			{

+				object o = ViewState["PrevMonthText"];

+				if(o!=null)

+					return (string)o;

+				return "&lt;";

+			}

+			set

+			{

+				ViewState["PrevMonthText"] = value;

+			}

+		}

+

+		public DateTime SelectedDate

+		{

+			get

+			{

+				if(SelectedDates.Count > 0)

+				{

+					return SelectedDates[0];

+				}

+				return DateTime.MinValue;

+			}

+			set

+			{

+				if(value == DateTime.MinValue)

+				{

+					SelectedDates.Clear();

+				} else

+				{

+					SelectedDates.SelectRange(value, value);

+				}

+			}

+		}

+

+		public SelectedDatesCollection SelectedDates

+		{

+			get

+			{

+				if(selectedDates==null)

+				{

+					if(selectedDatesList == null)

+						selectedDatesList = new ArrayList();

+					selectedDates = new SelectedDatesCollection(selectedDatesList);

+				}

+				return selectedDates;

+			}

+		}

+

+		public TableItemStyle SelectedDayStyle

+		{

+			get

+			{

+				if(selectedDayStyle==null)

+					selectedDayStyle = new TableItemStyle();

+				if(IsTrackingViewState)

+					selectedDayStyle.TrackViewState();

+				return selectedDayStyle;

+			}

+		}

+

+		public CalendarSelectionMode SelectionMode

+		{

+			get

+			{

+				object o = ViewState["SelectionMode"];

+				if(o!=null)

+					return (CalendarSelectionMode)o;

+				return CalendarSelectionMode.Day;

+			}

+			set

+			{

+				if(!System.Enum.IsDefined(typeof(CalendarSelectionMode), value))

+					throw new ArgumentException();

+				ViewState["SelectionMode"] = value;

+			}

+		}

+

+		public string SelectMonthText

+		{

+			get

+			{

+				object o = ViewState["SelectMonthText"];

+				if(o!=null)

+					return (string)o;

+				return "&gt;&gt;";

+			}

+			set

+			{

+				ViewState["SelectMonthText"] = value;

+			}

+		}

+

+		public TableItemStyle SelectorStyle

+		{

+			get

+			{

+				if(selectorStyle==null)

+					selectorStyle = new TableItemStyle();

+				return selectorStyle;

+			}

+		}

+

+		public string SelectWeekText

+		{

+			get

+			{

+				object o = ViewState["SelectWeekText"];

+				if(o!=null)

+					return (string)o;

+				return "&gt;";

+			}

+			set

+			{

+				ViewState["SelectWeekText"] = value;

+			}

+		}

+

+		public bool ShowDayHeader

+		{

+			get

+			{

+				object o = ViewState["ShowDayHeader"];

+				if(o!=null)

+					return (bool)o;

+				return true;

+			}

+			set

+			{

+				ViewState["ShowDayHeader"] = value;

+			}

+		}

+

+		public bool ShowGridLines

+		{

+			get

+			{

+				object o = ViewState["ShowGridLines"];

+				if(o!=null)

+					return (bool)o;

+				return false;

+			}

+			set

+			{

+				ViewState["ShowGridLines"] = value;

+			}

+		}

+

+		public bool ShowNextPrevMonth

+		{

+			get

+			{

+				object o = ViewState["ShowNextPrevMonth"];

+				if(o!=null)

+					return (bool)o;

+				return true;

+			}

+			set

+			{

+				ViewState["ShowNextPrevMonth"] = value;

+			}

+		}

+

+		public bool ShowTitle

+		{

+			get

+			{

+				object o = ViewState["ShowTitle"];

+				if(o!=null)

+					return (bool)o;

+				return true;

+			}

+			set

+			{

+				ViewState["ShowTitle"] = value;

+			}

+		}

+

+		public TitleFormat TitleFormat

+		{

+			get

+			{

+				object o = ViewState["TitleFormat"];

+				if(o!=null)

+					return (TitleFormat)o;

+				return TitleFormat.MonthYear;

+			}

+			set

+			{

+				if(!System.Enum.IsDefined(typeof(TitleFormat), value))

+					throw new ArgumentException();

+				ViewState["TitleFormat"] = value;

+			}

+		}

+

+		public TableItemStyle TitleStyle

+		{

+			get

+			{

+				if(titleStyle==null)

+					titleStyle = new TableItemStyle();

+				if(IsTrackingViewState)

+					titleStyle.TrackViewState();

+				return titleStyle;

+			}

+		}

+

+		public TableItemStyle TodayDayStyle

+		{

+			get

+			{

+				if(todayDayStyle==null)

+					todayDayStyle = new TableItemStyle();

+				if(IsTrackingViewState)

+					todayDayStyle.TrackViewState();

+				return todayDayStyle;

+			}

+		}

+

+		public DateTime TodaysDate

+		{

+			get

+			{

+				object o = ViewState["TodaysDate"];

+				if(o!=null)

+					return (DateTime)o;

+				return DateTime.Today;

+			}

+			set

+			{

+				ViewState["TodaysDate"] = value.Date;

+			}

+		}

+

+		public DateTime VisibleDate

+		{

+			get

+			{

+				object o = ViewState["VisibleDate"];

+				if(o!=null)

+					return (DateTime)o;

+				return DateTime.MinValue;

+			}

+			set

+			{

+				ViewState["VisibleDate"] = value.Date;

+			}

+		}

+

+		public TableItemStyle WeekendDayStyle

+		{

+			get

+			{

+				if(weekendDayStyle == null)

+					weekendDayStyle = new TableItemStyle();

+				if(IsTrackingViewState)

+				{

+					weekendDayStyle.TrackViewState();

+				}

+				return weekendDayStyle;

+			}

+		}

+

+		public event DayRenderEventHandler DayRender

+		{

+			add

+			{

+				Events.AddHandler(DayRenderEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(DayRenderEvent, value);

+			}

+		}

+

+		public event EventHandler SelectionChanged

+		{

+			add

+			{

+				Events.AddHandler(SelectionChangedEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(SelectionChangedEvent, value);

+			}

+		}

+

+		public event MonthChangedEventHandler VisibleMonthChanged

+		{

+			add

+			{

+				Events.AddHandler(VisibleMonthChangedEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(VisibleMonthChangedEvent, value);

+			}

+		}

+

+		protected virtual void OnDayRender(TableCell cell, CalendarDay day)

+		{

+			if(Events!=null)

+			{

+				DayRenderEventHandler dreh = (DayRenderEventHandler)(Events[DayRenderEvent]);

+				if(dreh!=null)

+					dreh(this, new DayRenderEventArgs(cell, day));

+			}

+		}

+

+		protected virtual void OnSelectionChanged()

+		{

+			if(Events!=null)

+			{

+				EventHandler eh = (EventHandler)(Events[SelectionChangedEvent]);

+				if(eh!=null)

+					eh(this, new EventArgs());

+			}

+		}

+

+		protected virtual void OnVisibleMonthChanged(DateTime newDate, DateTime prevDate)

+		{

+			if(Events!=null)

+			{

+				MonthChangedEventHandler mceh = (MonthChangedEventHandler)(Events[VisibleMonthChangedEvent]);

+				if(mceh!=null)

+					mceh(this, new MonthChangedEventArgs(newDate, prevDate));

+			}

+		}

+

+		/// <remarks>

+		/// See test6.aspx in Tests directory for verification

+		/// </remarks>

+		void IPostBackEventHandler.RaisePostBackEvent(string eventArgument)

+		{

+			globCal = DateTimeFormatInfo.CurrentInfo.Calendar;

+			DateTime visDate = GetEffectiveVisibleDate();

+			if(eventArgument == "nextMonth")

+			{

+				VisibleDate = globCal.AddMonths(visDate, 1);

+				OnVisibleMonthChanged(VisibleDate, visDate);

+				return;

+			}

+			if(eventArgument == "prevMonth")

+			{

+				VisibleDate = globCal.AddMonths(visDate, -1);

+				OnVisibleMonthChanged(VisibleDate, visDate);

+				return;

+			}

+			if(eventArgument == "selectMonth")

+			{

+				DateTime oldDate = new DateTime(globCal.GetYear(visDate), globCal.GetMonth(visDate), 1, globCal);

+				SelectRangeInternal(oldDate, globCal.AddDays(globCal.AddMonths(oldDate, 1), -1), visDate);

+				return;

+			}

+			if(String.Compare(eventArgument, 0, "selectWeek", 0, "selectWeek".Length)==0)

+			{

+				int week = -1;

+				try

+				{

+					week = Int32.Parse(eventArgument.Substring("selectWeek".Length));

+				} catch(Exception e)

+				{

+				}

+				if(week >= 0 && week <= 5)

+				{

+					DateTime weekStart = globCal.AddDays(GetFirstCalendarDay(visDate), week * 7);

+					SelectRangeInternal(weekStart, globCal.AddDays(weekStart, 6), visDate);

+				}

+				return;

+			}

+			if(String.Compare(eventArgument, 0, "selectDay", 0, "selectDay".Length)==0)

+			{

+				int day = -1;

+				try

+				{

+					day = Int32.Parse(eventArgument.Substring("selectDay".Length));

+				} catch(Exception e)

+				{

+				}

+				if(day >= 0 && day <= 42)

+				{

+					DateTime dayStart = globCal.AddDays(GetFirstCalendarDay(visDate), day);

+					SelectRangeInternal(dayStart, dayStart, visDate);

+				}

+			}

+		}

+

+		protected override void Render(HtmlTextWriter writer)

+		{

+			//TODO: Implement me

+			globCal = DateTimeFormatInfo.CurrentInfo.Calendar;

+			DateTime visDate   = GetEffectiveVisibleDate();

+			DateTime firstDate = GetFirstCalendarDay(visDate);

+

+			bool isEnabled;

+			bool isHtmlTextWriter;

+			//FIXME: when Control.Site works, reactivate this

+			//if (Page == null || Site == null) {

+			//	isEnabled = false;

+			//	isHtmlTextWriter = false;

+			//} else {

+				isEnabled = Enabled;

+				isHtmlTextWriter = (writer.GetType() != typeof(HtmlTextWriter));

+			//}

+			defaultTextColor = ForeColor;

+			if(defaultTextColor == Color.Empty)

+				defaultTextColor = Color.Black;

+

+			Table calTable = new Table ();

+			calTable.ID = ID;

+			calTable.CopyBaseAttributes(this);

+			if(ControlStyleCreated)

+				ApplyStyle(ControlStyle);

+			calTable.Width = Width;

+			calTable.Height = Height;

+			calTable.CellSpacing = CellSpacing;

+			calTable.CellPadding = CellPadding;

+

+			if (ControlStyleCreated &&

+			    ControlStyle.IsSet (WebControls.Style.BORDERWIDTH) &&

+			    BorderWidth != Unit.Empty)

+				calTable.BorderWidth = BorderWidth;

+			else

+				calTable.BorderWidth = Unit.Pixel(1);

+

+			if (ShowGridLines)

+				calTable.GridLines = GridLines.Both;

+			else

+				calTable.GridLines = GridLines.None;

+

+			calTable.RenderBeginTag (writer);

+

+			if (ShowTitle)

+				RenderTitle (writer, visDate, SelectionMode, isEnabled);

+

+			if (ShowDayHeader)

+				RenderHeader (writer, firstDate, SelectionMode, isEnabled, isHtmlTextWriter);

+

+			RenderAllDays (writer, firstDate, visDate, SelectionMode, isEnabled, isHtmlTextWriter);

+

+			calTable.RenderEndTag(writer);

+		}

+

+		protected override ControlCollection CreateControlCollection()

+		{

+			return new EmptyControlCollection(this);

+		}

+

+		protected override void LoadViewState(object savedState)

+		{

+			if(savedState!=null)

+			{

+				if(ViewState["_CalendarSelectedDates"] != null)

+					selectedDates = (SelectedDatesCollection)ViewState["_CalendarSelectedDates"];

+

+				object[] states = (object[]) savedState;

+				if(states[0] != null)

+					base.LoadViewState(states[0]);

+				if(states[1] != null)

+					DayHeaderStyle.LoadViewState(states[1]);

+				if(states[2] != null)

+					DayStyle.LoadViewState(states[2]);

+				if(states[3] != null)

+					NextPrevStyle.LoadViewState(states[3]);

+				if(states[4] != null)

+					OtherMonthDayStyle.LoadViewState(states[4]);

+				if(states[5] != null)

+					SelectedDayStyle.LoadViewState(states[5]);

+				if(states[6] != null)

+					SelectorStyle.LoadViewState(states[6]);

+				if(states[7] != null)

+					TitleStyle.LoadViewState(states[7]);

+				if(states[8] != null)

+					TodayDayStyle.LoadViewState(states[8]);

+				if(states[9] != null)

+					WeekendDayStyle.LoadViewState(states[9]);

+			}

+		}

+

+		protected override object SaveViewState()

+		{

+			ViewState["_CalendarSelectedDates"] = (SelectedDates.Count > 0 ? selectedDates : null);

+			object[] states = new object[11];

+			states[0] = base.SaveViewState();

+			states[1] = (dayHeaderStyle == null ? null : dayHeaderStyle.SaveViewState());

+			states[2] = (dayStyle == null ? null : dayStyle.SaveViewState());

+			states[3] = (nextPrevStyle == null ? null : nextPrevStyle.SaveViewState());

+			states[4] = (otherMonthDayStyle == null ? null : otherMonthDayStyle.SaveViewState());

+			states[5] = (selectedDayStyle == null ? null : selectedDayStyle.SaveViewState());

+			states[6] = (selectorStyle == null ? null : selectorStyle.SaveViewState());

+			states[7] = (titleStyle == null ? null : titleStyle.SaveViewState());

+			states[8] = (todayDayStyle == null ? null : todayDayStyle.SaveViewState());

+			states[9] = (weekendDayStyle == null ? null : weekendDayStyle.SaveViewState());

+			for(int i=0; i < states.Length; i++)

+			{

+				if(states[i]!=null)

+					return states;

+			}

+			return null;

+		}

+

+		protected override void TrackViewState()

+		{

+			base.TrackViewState();

+			if(titleStyle!=null)

+			{

+				titleStyle.TrackViewState();

+			}

+			if(nextPrevStyle!=null)

+			{

+				nextPrevStyle.TrackViewState();

+			}

+			if(dayStyle!=null)

+			{

+				dayStyle.TrackViewState();

+			}

+			if(dayHeaderStyle!=null)

+			{

+				dayHeaderStyle.TrackViewState();

+			}

+			if(todayDayStyle!=null)

+			{

+				todayDayStyle.TrackViewState();

+			}

+			if(weekendDayStyle!=null)

+			{

+				weekendDayStyle.TrackViewState();

+			}

+			if(otherMonthDayStyle!=null)

+			{

+				otherMonthDayStyle.TrackViewState();

+			}

+			if(selectedDayStyle!=null)

+			{

+				selectedDayStyle.TrackViewState();

+			}

+			if(selectorStyle!=null)

+			{

+				selectorStyle.TrackViewState();

+			}

+		}

+

+		private void RenderAllDays (HtmlTextWriter writer,

+					    DateTime firstDay,

+					    DateTime activeDate,

+					    CalendarSelectionMode mode,

+					    bool isActive,

+					    bool isDownLevel)

+		{

+			TableItemStyle weeksStyle;

+			TableCell weeksCell = new TableCell ();

+			TableItemStyle weekendStyle = WeekendDayStyle;

+			TableItemStyle otherMonthStyle = OtherMonthDayStyle;

+			Unit size;

+			bool isWeekMode = (mode == CalendarSelectionMode.DayWeek ||

+					   mode == CalendarSelectionMode.DayWeekMonth);

+

+			if (isWeekMode) {

+				weeksStyle = new TableItemStyle ();

+				weeksStyle.Width = Unit.Percentage (12);

+				weeksStyle.HorizontalAlign = HorizontalAlign.Center;

+				weeksStyle.CopyFrom (SelectorStyle);

+				size = Unit.Percentage (12);

+			} else {

+				size = Unit.Percentage (14);

+			}

+

+			TableItemStyle [] styles = new TableItemStyle [16];

+			int definedStyles = MASK_SELECTED;

+			if (weekendStyle != null && !weekendStyle.IsEmpty)

+				definedStyles |= MASK_WEEKEND;

+			if (otherMonthStyle != null && !otherMonthStyle.IsEmpty)

+				definedStyles |= MASK_OMONTH;

+			if (todayDayStyle != null && !todayDayStyle.IsEmpty)

+				definedStyles |= MASK_TODAY;

+			if (dayStyle != null && !dayStyle.IsEmpty)

+				definedStyles |= MASK_DAY;

+

+			bool isCalendar = GetType () == typeof (Calendar);

+			int month = globCal.GetMonth (activeDate);

+			DateTime currentDay = firstDay;

+			for (int crr = 0; crr < 6; crr++) {

+				writer.Write ("<tr>");

+				if (isWeekMode) {

+					string cellText = GetCalendarLinkText (

+								"selectWeek" + crr.ToString (),

+								SelectWeekText, 

+								weeksCell.ForeColor,

+								isActive);

+

+					weeksCell.Text = cellText;

+					RenderCalendarCell (writer, weeksCell, cellText);

+				}

+

+				for (int weekDay = 0; weekDay < 7; weekDay++) {

+					string dayString = currentDay.Day.ToString ();

+					CalendarDay calDay =

+						new CalendarDay (

+								currentDay,

+								weekDay < 2,

+								currentDay == TodaysDate, 

+								selectedDates.Contains (currentDay),

+								globCal.GetMonth (currentDay) != month,

+								dayString

+								);

+

+

+					int dayStyles = GetMask (calDay) & definedStyles;

+					TableItemStyle currentDayStyle = styles [dayStyles];

+					if (currentDayStyle == null) {

+						currentDayStyle = new TableItemStyle ();

+						if ((dayStyles & MASK_DAY) != 0)

+							currentDayStyle.CopyFrom (DayStyle);

+

+						if ((dayStyles & MASK_WEEKEND) != 0)

+							currentDayStyle.CopyFrom (WeekendDayStyle);

+

+						if ((dayStyles & MASK_TODAY) != 0)

+							currentDayStyle.CopyFrom (TodayDayStyle);

+

+						if ((dayStyles & MASK_OMONTH) != 0)

+							currentDayStyle.CopyFrom (OtherMonthDayStyle);

+

+						if ((dayStyles & MASK_SELECTED) != 0) {

+							currentDayStyle.ForeColor = Color.White;

+							currentDayStyle.BackColor = Color.Silver;

+							currentDayStyle.CopyFrom (SelectedDayStyle);

+						}

+

+						currentDayStyle.Width = size;

+						currentDayStyle.HorizontalAlign = HorizontalAlign.Center;

+					}

+

+					TableCell dayCell = new TableCell ();

+					dayCell.ApplyStyle (currentDayStyle);

+					calDay.IsSelectable = isActive;

+					OnDayRender (dayCell, calDay);

+					if (isActive)

+						dayCell.Text = GetCalendarLinkText (

+									"selectDay" + (crr * 7 + weekDay),

+									dayString,

+									dayCell.ForeColor,

+									true);

+					else

+						dayCell.Text = dayString;

+

+					dayCell.RenderControl (writer);

+

+					currentDay = globCal.AddDays (currentDay, 1);

+				}

+				writer.Write("</tr>");

+			}

+		}

+

+		private int GetMask (CalendarDay day)

+		{

+			int retVal = MASK_DAY;

+			if(day.IsSelected)

+				retVal |= MASK_SELECTED;

+			if(day.IsToday)

+				retVal |= MASK_TODAY;

+			if(day.IsOtherMonth)

+				retVal |= MASK_OMONTH;

+			if(day.IsWeekend)

+				retVal |= MASK_WEEKEND;

+			return retVal;

+		}

+

+		/// <remarks>

+		/// Refers to the second line of the calendar, that contains a link

+		/// to select whole month, and weekdays as defined by DayNameFormat

+		/// </remarks>

+		private void RenderHeader (HtmlTextWriter writer,

+					   DateTime firstDay,

+					   CalendarSelectionMode mode,

+					   bool isActive,

+					   bool isDownLevel)

+		{

+			writer.Write("<tr>");

+			bool isWeekMode = (mode == CalendarSelectionMode.DayWeek ||

+					   mode == CalendarSelectionMode.DayWeekMonth);

+

+			TableCell headerCell = new TableCell ();

+			headerCell.HorizontalAlign = HorizontalAlign.Center;

+			string selMthText = String.Empty;

+			if (isWeekMode) {

+				if (mode == CalendarSelectionMode.DayWeekMonth) {

+					headerCell.ApplyStyle (SelectorStyle);

+					selMthText = GetCalendarLinkText ("selectMonth",

+									  SelectMonthText,

+									  SelectorStyle.ForeColor,

+									  isActive);

+				} else {

+					headerCell.ApplyStyle (DayHeaderStyle);

+					selMthText = String.Empty;

+				}

+				RenderCalendarCell (writer, headerCell, selMthText);

+			}

+

+			TableCell dayHeaderCell = new TableCell ();

+			dayHeaderCell.HorizontalAlign = HorizontalAlign.Center;

+

+			int dayOfWeek = (int) globCal.GetDayOfWeek (firstDay);

+			DateTimeFormatInfo currDTInfo = DateTimeFormatInfo.CurrentInfo;

+			for(int currDay = dayOfWeek; currDay < dayOfWeek + 7; currDay++) {

+				DayOfWeek effDay = (DayOfWeek) Enum.ToObject (typeof (DayOfWeek), currDay % 7);

+				string currDayContent;

+				switch(DayNameFormat) {

+				case DayNameFormat.Full:

+					currDayContent = currDTInfo.GetDayName (effDay);

+					break;

+				case DayNameFormat.FirstLetter:

+					currDayContent = currDTInfo.GetDayName (effDay).Substring (0,1);

+					break;

+				case DayNameFormat.FirstTwoLetters:

+					currDayContent = currDTInfo.GetDayName (effDay).Substring (0,2);

+					break;

+				case DayNameFormat.Short:

+					goto default;

+				default:

+					currDayContent = currDTInfo.GetAbbreviatedDayName (effDay);

+					break;

+				}

+

+				RenderCalendarCell(writer, dayHeaderCell, currDayContent);

+			}

+			writer.Write ("</tr>");

+		}

+

+		private void RenderTitle (HtmlTextWriter writer,

+					  DateTime visibleDate,

+					  CalendarSelectionMode mode,

+					  bool isActive)

+		{

+			writer.Write("<tr>");

+			Table innerTable = new Table ();

+			TableCell titleCell = new TableCell();

+			bool isWeekMode = (mode == CalendarSelectionMode.DayWeek ||

+					   mode == CalendarSelectionMode.DayWeekMonth);

+

+			titleCell.ColumnSpan = (isWeekMode ? 8 : 7);

+			titleCell.BackColor = Color.Silver;

+

+			innerTable.GridLines = GridLines.None;

+			innerTable.Width = Unit.Percentage (100);

+			innerTable.CellSpacing = 0;

+			ApplyTitleStyle (innerTable, titleCell, TitleStyle);

+

+			titleCell.RenderBeginTag (writer);

+			innerTable.RenderBeginTag (writer);

+

+			writer.Write ("<tr>");

+			string prevContent = String.Empty;

+			if (ShowNextPrevMonth) {

+				TableCell prevCell = new TableCell ();

+				prevCell.Width = Unit.Percentage (15);

+				prevCell.HorizontalAlign = HorizontalAlign.Left;

+				if (NextPrevFormat == NextPrevFormat.CustomText) {

+					prevContent = PrevMonthText;

+				} else {

+					int pMthInt = globCal.GetMonth(globCal.AddMonths (visibleDate, -1));

+					if (NextPrevFormat == NextPrevFormat.FullMonth)

+						prevContent = infoCal.GetMonthName (pMthInt);

+					else

+						prevContent = infoCal.GetAbbreviatedMonthName (pMthInt);

+				}

+				prevCell.ApplyStyle (NextPrevStyle);

+				RenderCalendarCell (writer,

+						    prevCell,

+						    GetCalendarLinkText ("prevMonth",

+							    		 prevContent,

+									 NextPrevStyle.ForeColor,

+									 isActive)

+						    );

+			}

+

+			TableCell currCell = new TableCell ();

+			currCell.Width = Unit.Percentage (70);

+			if (TitleStyle.HorizontalAlign == HorizontalAlign.NotSet)

+				currCell.HorizontalAlign = HorizontalAlign.Center;

+			else

+				currCell.HorizontalAlign = TitleStyle.HorizontalAlign;

+

+			currCell.Wrap = TitleStyle.Wrap;

+			string currMonthContent = String.Empty;

+			if (TitleFormat == TitleFormat.Month) {

+				currMonthContent = visibleDate.ToString ("MMMM");

+			} else {

+				string cmcFmt = infoCal.YearMonthPattern;

+				if (cmcFmt.IndexOf (',') >= 0)

+					cmcFmt = "MMMM yyyy";

+

+				currMonthContent = visibleDate.ToString (cmcFmt);

+			}

+

+			RenderCalendarCell (writer, currCell, currMonthContent);

+								 

+			string nextContent = String.Empty;

+			if (ShowNextPrevMonth) {

+				TableCell nextCell = new TableCell ();

+				nextCell.Width = Unit.Percentage(15);

+				nextCell.HorizontalAlign = HorizontalAlign.Left;

+				if (NextPrevFormat == NextPrevFormat.CustomText) {

+					nextContent = NextMonthText;

+				} else {

+					int nMthInt = globCal.GetMonth (globCal.AddMonths (visibleDate, 1));

+					if(NextPrevFormat == NextPrevFormat.FullMonth)

+						nextContent = infoCal.GetMonthName(nMthInt);

+					else

+						nextContent = infoCal.GetAbbreviatedMonthName(nMthInt);

+				}

+				nextCell.ApplyStyle(NextPrevStyle);

+				RenderCalendarCell (writer,

+						    nextCell,

+						    GetCalendarLinkText ("nextMonth",

+									 nextContent,

+									 NextPrevStyle.ForeColor,

+									 isActive)

+						    );

+			}

+

+			writer.Write("</tr>");

+			innerTable.RenderEndTag(writer);

+			titleCell.RenderEndTag(writer);

+

+			writer.Write("</tr>");

+		}

+

+		private void ApplyTitleStyle(Table table, TableCell cell, TableItemStyle style)

+		{

+			if(style.BackColor != Color.Empty)

+			{

+				cell.BackColor = style.BackColor;

+			}

+			if(style.BorderStyle != BorderStyle.NotSet)

+			{

+				cell.BorderStyle = style.BorderStyle;

+			}

+			if(style.BorderColor != Color.Empty)

+			{

+				cell.BorderColor = style.BorderColor;

+			}

+			if(style.BorderWidth != Unit.Empty)

+			{

+				cell.BorderWidth = style.BorderWidth;

+			}

+			if(style.Height != Unit.Empty)

+			{

+				cell.Height = style.Height;

+			}

+			if(style.VerticalAlign != VerticalAlign.NotSet)

+			{

+				cell.VerticalAlign = style.VerticalAlign;

+			}

+

+			if(style.ForeColor != Color.Empty)

+			{

+				table.ForeColor = style.ForeColor;

+			} else if(ForeColor != Color.Empty)

+			{

+				table.ForeColor = ForeColor;

+			}

+

+			table.Font.CopyFrom(style.Font);

+			table.Font.MergeWith(Font);

+		}

+

+		private void RenderCalendarCell (HtmlTextWriter writer, TableCell cell, string text)

+		{

+			cell.RenderBeginTag(writer);

+			writer.Write(text);

+			cell.RenderEndTag(writer);

+		}

+

+		private DateTime GetFirstCalendarDay(DateTime visibleDate)

+		{

+			int fow = (int) FirstDayOfWeek;

+			if (fow == 7)

+				fow = (int) infoCal.FirstDayOfWeek;

+

+			int days = (int) globCal.GetDayOfWeek (visibleDate) - fow;

+			if (days <= 0)

+				days += 7;

+			return globCal.AddDays (visibleDate, -days);

+		}

+

+		private DateTime GetEffectiveVisibleDate()

+		{

+			DateTime dt = VisibleDate;

+			if (VisibleDate == DateTime.MinValue)

+				 dt = TodaysDate;

+			return globCal.AddDays (dt, 1 - globCal.GetDayOfMonth (dt));

+		}

+

+		/// <summary>

+		/// Creates text to be displayed, with all attributes if to be

+		/// shown as a hyperlink

+		/// </summary>

+		private string GetCalendarLinkText (string eventArg,

+						    string text,

+						    Color foreground,

+						    bool isLink)

+		{

+			if (isLink) {

+				StringBuilder dispVal = new StringBuilder ();

+				dispVal.Append ("<a href=\"");

+				dispVal.Append (Page.GetPostBackClientHyperlink (this, eventArg));

+				dispVal.Append ("\" style=\"color: ");

+				if (foreground.IsEmpty) {

+					dispVal.Append (ColorTranslator.ToHtml (defaultTextColor));

+				} else {

+					dispVal.Append (ColorTranslator.ToHtml (foreground));

+				}

+				dispVal.Append ("\">");

+				dispVal.Append (text);

+				dispVal.Append ("</a>");

+				return dispVal.ToString ();

+			}

+			return text;

+		}

+

+		private string GetHtmlForCell (TableCell cell, bool showLinks)

+		{

+			StringWriter sw = new StringWriter ();

+			HtmlTextWriter htw = new HtmlTextWriter (sw);

+			cell.RenderBeginTag (htw);

+			if(showLinks) {

+				htw.Write (GetCalendarLinkText ("{0}", "{1}", cell.ForeColor, showLinks));

+			} else {

+				htw.Write ("{0}");

+			}

+			cell.RenderEndTag (htw);

+			return sw.ToString();

+		}

+

+		internal void SelectRangeInternal (DateTime fromDate, DateTime toDate, DateTime visibleDate)

+		{

+			TimeSpan span = toDate - fromDate;

+			if (SelectedDates.Count != span.Days + 1 || 

+			    SelectedDates [0] != fromDate || 

+			    SelectedDates [SelectedDates.Count - 1] != toDate) {

+				SelectedDates.SelectRange (fromDate, toDate);

+				OnSelectionChanged ();

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CalendarDay.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CalendarDay.cs
new file mode 100644
index 00000000000..bcd835c45e3
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CalendarDay.cs
@@ -0,0 +1,100 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     CalendarDay

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class CalendarDay

+	{

+		private DateTime date;

+		private bool     isWeekend;

+		private bool     isToday;

+		private bool     isSelected;

+		private bool     isOtherMonth;

+		private bool     isSelectable;

+		private string   dayNumberText;

+

+		public CalendarDay(DateTime date, bool isWeekend, bool isToday, bool isSelected, bool isOtherMonth, string dayNumberText)

+		{

+			this.date = date;

+			this.isWeekend = isWeekend;

+			this.isToday = isToday;

+			this.isSelected = isSelected;

+			this.isOtherMonth = isOtherMonth;

+			this.dayNumberText = dayNumberText;

+		}

+

+		public DateTime Date

+		{

+			get

+			{

+				return date;

+			}

+		}

+

+		public string DayNumberText

+		{

+			get

+			{

+				return dayNumberText;

+			}

+		}

+

+		public bool IsOtherMonth

+		{

+			get

+			{

+				return isOtherMonth;

+			}

+		}

+

+		public bool IsSelectable

+		{

+			get

+			{

+				return isSelectable;

+			}

+			set

+			{

+				isSelectable = value;

+			}

+		}

+

+		public bool IsSelected

+		{

+			get

+			{

+				return isSelected;

+			}

+		}

+

+		public bool IsToday

+		{

+			get

+			{

+				return isToday;

+			}

+		}

+

+		public bool IsWeekend

+		{

+			get

+			{

+				return isWeekend;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CalendarSelectionMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CalendarSelectionMode.cs
new file mode 100755
index 00000000000..54dd298f2e4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CalendarSelectionMode.cs
@@ -0,0 +1,23 @@
+/**

+ * Namespace:   System.Web.UI.WebControls

+ * Enumeration: CalendarSelectionMode

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status: 100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum CalendarSelectionMode

+	{

+		None,

+		Day,

+		DayWeek,

+		DayWeekMonth

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
new file mode 100644
index 00000000000..75e72d498e7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ChangeLog
@@ -0,0 +1,806 @@
+2002-08-19      Gaurav Vaish <gvaish_mono@lycos.com>
+
+	* DataGrid.cs                 - AutoCreateColumns: Bug fixes.
+
+2002-08-19      Gaurav Vaish <gvaish_mono@lycos.com>
+
+	* DataGrid.cs                 - AutoCreateColumns: completed, hopefully!
+
+2002-08-19      Gaurav Vaish <gvaish_mono@lycos.com>
+
+	* DataGrid.cs                 - Working on the undocumented protected
+	                      method CreateColumnSet. AutoCreateColumns method
+	                      stubbed. Left CreateControlHierarchy for the time
+	                      being, looks like I'm going insane. ;-)
+
+2002-08-19      Gaurav Vaish <gvaish_mono@lycos.com>
+
+	* Button.cs                   - Steffen's OnCommand bug fix.
+
+2002-08-12      Gaurav Vaish <gvaish_mono@lycos.com>
+
+	* DataGrid.cs                 - Added protected method (skeleton)
+	                                CreateColumnSet(PagedDataSource, bool)
+	                              Still trying to know how will it be used
+	                              and what for...
+
+2002-08-10  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* PagedDataSource.cs: fixed compilation.
+
+2002-08-08      Gaurav Vaish <gvaish_mono@lycos.com>
+
+	* DataGrid.cs                 - Added private method
+	                                CreatePagedDataSource
+	                              - Started work on
+	                                CreateControlHierarchy(bool)
+	* PagedDataSource.cs          - Bug fixed.
+	                                CurrentPageIndex is writable.
+
+2002-08-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* DataGrid.cs: fixed typo.
+	* DataGridPagerStyle.cs: added IsPagerOnTop and IsPagerOnBottom.
+
+2002-08-06      Gaurav Vaish <gvaish_mono@lycos.com>
+
+	* DataGridColumn.cs           - Added internal methods to get the
+	                                various styles (needed in DataGrid.cs)
+	* DataGrid.cs                 - Completed the method
+	                                PrepareControlHierarchy()
+
+2002-08-06      Gaurav Vaish <gvaish_mono@lycos.com>
+
+	* DataGrid.cs                 - Wokring on PrepareControlHierarchy()
+	                              - Added private method
+	                     PrepareControlHierarchyForItem()
+
+2002-08-05      Gaurav Vaish <gvaish_mono@lycos.com>
+
+	* DataGrid.cs                 - Completed method
+	                     OnBubbleEvent(object, EventArgs)
+
+2002-07-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Xml.cs: implemented document/transform load.
+
+2002-07-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Calendar.cs: added myself to the list of authors.
+	* DropDownList.cs: fixed a few properties.
+	* ListControl.cs: fixed SelectedIndex.
+
+2002-07-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Calendar.cs: lots of fixes. Render days.  Still left to persist
+	selected days when changing month.
+
+	* Unit.cs: fixed Percentage and Pixel.
+
+	* WebControl.cs: a few properties are now using ControlStyle instead
+	of ViewState to persist.
+
+2002-07-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* BaseValidator.cs: it works now.
+	* DataGridColumn.cs: added attribute and made it abstract.
+	* RequiredFieldValidator.cs: fixed return value in EvaluateIsValid.
+
+2002-07-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* TextBox.cs: default for Wrap is true.
+	(OnPreRender): don't save Text if there are no listeners on TextChanged.
+
+2002-07-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* DropDownList.cs:
+	(ToolTip): fixed.
+
+	* ListItem.cs:
+	(LoadViewState): fixed.
+
+	* ListItemCollection.cs:
+	(TrackViewState): use items instead of 'this' in foreach.
+
+	* Style.cs:
+	(LoadViewState): more checking of parameters.
+
+	* WebControl.cs: implemented LoadViewState and SaveViewState.
+	
+
+2002-07-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ListItem.cs: there was no code to unset the flags!!!
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* FontUnit.cs: use a hashtable for mapping size name to value.
+	* HyperLink.cs: fixed a bug and a typo.
+	* Unit.cs: some fixes to internal constructor.
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ListControl.cs: fixed a couple of range checks.
+	* WebControl.cs: MS lies! Not all WebControls must be rendered inside
+	an HtmlForm (p.e., Label).
+
+2002-07-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AdRotator.cs:
+	* Button.cs:
+	* Calendar.cs:
+	* CheckBox.cs:
+	* CheckBoxList.cs:
+	* DataList.cs:
+	* DropDownList.cs:
+	* HyperLink.cs:
+	* HyperLinkColumn.cs:
+	* Image.cs:
+	* ImageButton.cs:
+	* Label.cs:
+	* LinkButton.cs:
+	* ListBox.cs:
+	* Panel.cs:
+	* PlaceHolder.cs:
+	* RadioButton.cs:
+	* RadioButtonList.cs:
+	* Table.cs:
+	* TableRow.cs:
+	* TextBox.cs:
+	* WebControl.cs: removed attributes added by mistake (i used
+	GetCustomAttributes (true), d'oh!).
+
+	* DataListItem.cs: implemented RenderItem.
+
+	* Repeater.cs: implemented CreateItem and InitializeItem.
+
+2002-07-08  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* BaseDataList.cs: a couple of fiex and added attributes.
+	* DataGrid.cs: little fixes.
+
+2002-07-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* CheckBoxList.cs:
+	* DataGrid.cs:
+	* DataList.cs:
+	* DropDownList.cs:
+	* ListBox.cs:
+	* PlaceHolder.cs:
+	* RadioButton.cs:
+	* RadioButtonList.cs:
+	* TableRow.cs:
+	* WebControl.cs:
+	* Xml.cs: forgot to add using System.ComponentModel.
+
+	* BaseValidator.cs: use explicitly 
+	System.ComponentModel.AttributeCollection as there is another class
+	with the same name under System.Web.UI.
+
+2002-07-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AdRotator.cs:
+	* Button.cs:
+	* Calendar.cs:
+	* CheckBox.cs:
+	* CheckBoxList.cs:
+	* DataGrid.cs:
+	* DataList.cs:
+	* DropDownList.cs:
+	* HyperLink.cs:
+	* Image.cs:
+	* ImageButton.cs:
+	* Label.cs:
+	* LinkButton.cs:
+	* ListBox.cs:
+	* Panel.cs:
+	* PlaceHolder.cs:
+	* RadioButton.cs:
+	* RadioButtonList.cs:
+	* Table.cs:
+	* TableRow.cs:
+	* TextBox.cs:
+	* WebControl.cs:
+	* Xml.cs: added/fixed all attributes used by xsp.
+
+	* BaseValidator.cs: some fixes.
+
+2002-07-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Table.cs:
+	(AddAttributesToRender): correctly default to border=1.
+
+2002-07-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AdRotator.cs:
+	(LoadAdFile): make the dictionary null after every iteration.
+
+	* LinkButton.cs:
+	* ListControl.cs:
+	* ListItem.cs: fixed warnings.
+
+Mon Jul 1 16:23:15 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Style.cs, TableRow.cs, DataListItem.cs: fix compilation.
+
+2002-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* DataGridColumn.cs:
+	* DataGridPagerStyle.cs:
+	* DataList.cs:
+	* DataListItem.cs:
+	* Image.cs:
+	* LinkButton.cs:
+	* ListControl.cs:
+	* ListItem.cs:
+	* ListItemCollection.cs:
+	* Repeater.cs:
+	* ServerValidateEventArgs.cs:
+	* Style.cs:
+	* TableRow.cs:
+	* WebControl.cs:
+	* Xml.cs: more class status page based changes.
+
+2002-06-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Button.cs:
+	(.ctor): fixed to render the correct tag.
+	(IPostBAckEventHandler.RaisePostBackEvent): fixed.
+
+2002-06-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* WebControl.cs:
+	(AddAttributesToRender): call Page.VerifyRenderingInServerForm. All
+	WebControl derived classes should be rendered inside a HtmlForm.
+
+2002-06-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Repeater.cs: implemented CreateControlHierarchy. Fixed some event
+	processing methods.
+
+2002-06-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* RadioButtonList.cs: implemented IRepeatInfoUser.RenderItem.
+	* RepeatInfo.cs: implemented DoHorizontalRendering.
+
+2002-06-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.UI.WebControls/Repeater.cs:
+	(Controls):
+	(OnDataBinding): fixed stack overflow.
+
+2002-06-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* RadioButtonList.cs: implemented IRepeatInfoUser.RenderItem.
+	* RepeatInfo.cs: implemented DoHorizontalRendering.
+
+2002-06-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* WebControl.cs:
+	(CopyBaseAttributes): copy Attributes and don't throw exception.
+
+2002-06-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ListBox.cs: mono-stylized.
+	(AddAttributesToRender): call parent class method.
+
+2002-06-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Style.cs: fixed IsEmpty and Width.
+
+	* Table.cs: mono-stylized.
+	(TableRowControlCollection.AddAt): fixed.
+	(AddAttributesToRender): fixed.
+	
+	* TableCell.cs: mono-stylized.
+	(.ctor): use PreventAutoID.
+	(AddAttributesToRender): fixed.
+	(AddParsedSubObject): fixed.
+
+	* TableRow.cs: mono-stylized. Added
+	ParseChildren attribute.
+
+	* TableStyle.cs:
+	(get_GridLine): fixed.
+
+2002-06-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Panel.cs: fixed stack overflow.
+	* Unit.cs: use Int32.Parse and Single.Parse instead of Int32Converter
+	and SingleConverter.
+
+2002-06-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* RadioButton.cs: mono-stylized and some little fixes.
+
+	* TextBox.cs: mono-stylized.
+	(MaxLength): fixed typo.
+
+	(AddAttributesToRender): don't render the text between the tags for
+	SingleLine, use value attribute for it. Don't render the text for
+	Password.
+
+	(OnPreRender): don't throw exception and call base.OnPreRender.
+
+	(Render): for MultiLine, render the text between the opening and
+	closing tags encoded as HTML.
+
+2002-06-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ImageButton.cs:
+	(AddAttributesToRender): fixer another stack overflow.
+
+	* WebControl.cs:
+	(TagName): modified to use TagKey instead of tagKey as the property
+	can be overriden.
+
+2002-06-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* LinkButton.cs: mono-stylized.
+	(AddParsedSubObject):
+	(RenderControls): little fixes.
+
+	* WebControl.cs:
+	(AddAttributesToRender): fixed usage of IEnumerator.
+
+2002-06-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Literal.cs: beautified.
+
+2002-06-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Label.cs: beautified and fixed a couple of 'classic' bugs.
+
+	* WebControl.cs: use Span as default tag when no other provided in 
+	constructor. That is what MS renders.
+
+2002-06-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Button.cs:
+	(AddAttributesToRender): fixed (classic) stack overflow.
+
+	* CheckBox.cs: mono-stylized.
+	(AutoPostBack): fixed stack overflow.
+	(Render): fixed alignment issues. Also set the For attribute always
+	for the label.
+
+2002-06-11  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AdRotator.cs: GetData does not work as it should, but now it returns
+	useful data (only the first ad in the file).  Set the NavigateUrl
+	property in the hyperlink if available.
+
+	* HyperLink.cs: fixed constructor and a couple of stack overflows.
+
+	* Image.cs: added an attribute and fixed stack overflow.
+
+	* WebControl.cs:
+	(RenderBeginTag): fixed.
+	(TagName): don't call Enum.IsDefined twice.
+
+2002-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* WebControl.cs: added attributes PersistChildrenAttribute and 
+	ParseChildrenAttribute.
+
+2002-05-24  Duncan Mak  <duncan@ximian.com>
+
+	* DataGridItem.cs (SetItemType): Changed function signature to
+	match 1.0 spec.
+
+	* ListItemCollection.cs (this): Changes the visibility level of
+	the indexer.
+
+	* Repeater.cs (OnItemCommand):
+	(OnItemCreated):
+	(OnItemDataBound): Added necessary casts.
+
+2002-05-07  Duncan Mak  <duncan@ximian.com>
+
+	* Button.cs (AddAttributesToRender): 
+	* ImageButton.cs (AddAttributesToRender): Added a missing argument to the
+	GetClientValidatedEvent method.
+
+2002-03-27      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* Removed extra methods, corrected access modifiers to several
+	  methods.
+
+2002-03-26      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* <SeveralFiles>.cs        - Added some attributes
+	* FontUnitConverter.cs     - Added stubs for GetStandardValues*(..)
+	    methods. Will complete them later. Right now, busy with
+	    the attributes part.
+	* RepeaterItem.cs          - Completed.
+	
+	 Oh God! Mercy! I will die applying attributes. I look at the missing
+	  part in the class-status - daemon! Kyrie eleison!
+
+2002-03-19      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	   Some bug fixes
+
+	* AdRotator.cs             - Added definition for Font.
+	* BaseCompareValidator.cs  - Added definition for Controls.
+	* Calendar.cs              - SelectMonthText definition corrected.
+	* DataList.cs              - Added definition for SeparatorTemplate.
+	* BorderStyle.cs           - Namespace correction. It belongs not to UI,
+	                             but to UI.WebControls.
+
+2002-03-17      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	Finally, I have made it. Today I did a second build for the
+	 System.Web assembly. It compiled 195 classes today.
+	I am waiting eagerly for the runtime to come up so that the objects
+	 may be tested to their last levels. Several of the methods are still
+	 under the tag of "TODO" throwing NotImplementedException. Well, I
+	 hope to remove them soon, but how far is this soon - even I don't
+	 know, though I am happy to make the build a success even before
+	 the vacations to come.
+
+2002-03-07      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	Yesterday and today I tried to do some building of the aseembly,
+	 but was dumped with uncoutably infinite errors. ;-)
+	I have put the copies of the recent errors on my home page, want
+	 to have a look at them? See:
+	  http://mastergaurav.virtualave.net/mono/
+	I don't know what to do with these errors. Oh! The buggy me! How
+	 will I overcome myself. Hopefully, by when my vacations over, I
+	 should have made a repository where the build will not fail.
+
+2002-03-05      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	I am now going to do a build that will include the
+	 System.Web.UI.WebControls namespace. Hoping that I will make it
+	 soon. My exams are coming near and I have to pack up soon.
+
+
+2002-03-04      Gaurav Vaish <gvaish@iitk.ac.in>
+
+Comments:
+	And with this, ie, today's work, all the objects mentioned in the
+	namespace appear in the implementation. But it may not be worth
+	trying to go for a build because of dependence of several of the
+	internal methods that may clash with already available assembly
+	System.Web.
+	
+	Also, the classes lack possible attributes, like those informing
+	about child-controls etc. But I have to first create the attribute
+	classes before I attach the attributes to the classes.
+
+	* CustomValidator.cs          - Completed. In process realized that
+	             I have to complete / rejuvinate BaseValidator class.
+	* BaseValidator.cs            - Complete rejuvination. Completed 80%
+	            of the job. All that is left is Render(HtmlTextWriter),
+	            DetermineRenderUplevel(), RegisterValidatorCommonScript()
+	            RegisterValidatorDeclaration()
+	* DataGridPagerStyle.cs       - Completed. That adds one more missle
+	            in my artillery.
+	* DataKeyCollection.cs        - Completed. Petty small.
+	* Repeater.cs                 - Work started off. This is a quite
+	            heavy class. Hooh!
+	* DataGridItemEventArgs.cs,
+	* DataGridShortCommandEventArgs.cs,
+	* DataListItemEventArgs.cs,
+	* MonthChangedEventArgs.cs,
+	* RepeaterItemEventArgs.cs,
+	* ServerValidateEventArgs.cs,
+	* DataGridPageChangedEventArgs.cs
+	                              - Damn, I marked them "*", while they
+	            did not exist.
+	* Repeater.cs                 - Done all except for an undocumented
+	            method CreateControlHierarchy(bool). Though the method
+	            is quite clear by its name, but it will take some time
+	            for me to come with some material to flush in.
+
+2002-03-03      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* SelectedDatesCollection.cs  - Completed.
+	* PagedDataSource.cs          - Completed. Pathetically nice class.
+	* RegularExpressionValidator.cs
+	                              - Completed. Ridiculously small and
+	            annoyinglyc crazy-driving class, basically the method
+	            EvaluateIsValid().
+	* RangeValidator.cs           - Completed.
+	* DataGridColumn.cs           - Completed.
+	* EditCommandColumn.cs        - All is complete except for the
+	            InitializeCell(TableCell, int, ListItemType) method.
+	* DataListItem.cs             - All done except for a longish method
+	            RenderItem(HtmlTextWriter, bool, bool)
+
+2002-03-02      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* RepeaterItemCollection.cs   - Completed.
+	            I love *Collection classes. I am planning to make a
+	            program that will generate a *Collection class. It's so
+	            simple and the same. ;-)
+	* DataGridColumnCollection.cs - Completed.
+	            ... except probably for *ColumnCollection classes, where
+	            you have to put in some more effort. Still, these class
+	            generation can be automated.
+	* DataListItemCollection.cs   - Completed.
+	            See, how easily, in less than a quarter of a minute, I
+	            completed this class - manually. Copy-Paste/Cut-Replace.
+
+2002-02-21      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* DataGrid.cs                 - Following methods implemented:
+	            TrackViewState(), LoadViewState(object), SaveViewState(),
+	            On* -- The event raisers.
+	            OnBubbleEvent(object, EventArgs) is still incomplete.
+	* DataGridItem.cs             - Initial Implementation
+	* DataGridItemCollection.cs   - Completed.
+
+2002-02-08      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* DataGrid.cs                 - Initial Implementation. Worked
+	            primarily with some properties.
+
+2002-02-07      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* ListBox.cs                  - Completed. Implemented
+	           LoadPostData(string, NameValueCollection)
+	* RequiredFieldValidator.cs   - Completed. Pretty simple class.
+
+2002-02-06      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* ListBox.cs                  - Implemented the following:
+	           RaisePostDataChangedEvent()
+
+2002-02-02      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* ListBox.cs                  - Supports the following properties:
+	           BorderColor, BorderStyle, BorderWidth, Rows, SelectionMode,
+	           ToolTip.
+	          Methods:
+	           AddAttributesToRender(HtmlTextWriter), OnPreRender(EventArgs),
+	           RenderContents(HtmlTextWriter)
+
+
+2002-02-01      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* TargetConverter.cs          - Completed
+	* TemplateColumn.cs           - Completed
+	* DataList.cs                 - Corrected the get-er methods for the
+	         *Style objects. Corrected the get/set-er methods for ViewState
+	           related objects.
+	         Addded support for properties:
+	           GridLines, HeaderStyle, HeaderTemplate, ItemStyle, ItemTemplate,
+	           RepeatColumns, RepeatDirection, RepeatLayout, SelectedIndex,
+	           SelectedItem, SelectedItemStyle, SelectedItemTemplate,
+	           SeparatorStyle, SeparatorItemTemplate.
+	         Events:
+	           CancelCommand, DeleteCommand, EditCommand, ItemCommand,
+	           ItemCreated, ItemDataBound, UpdateCommand.
+	         Methods:
+	           CreateControlStyle(), LoadViewState(object),
+	           SaveViewState(), TrackViewState
+	         Event handlers:
+	           OnBubbleEvent, OnCancelCommand, OnDeleteCommand,
+	           OnEditCommand, OnItemCommand, OnItemCreated,
+	           OnItemDataBound, OnUpdateCommand
+	         Added dummy methods for some undocumented methods:
+	           CreateControlHierarchy(bool), CreateItem(int, ListItemType),
+	           CreateItem(int, ListItemType, bool, object),
+	           PrepareControlHierarchy(), InitializeItem(DataListItem)
+	* ListBox.cs                  - Started working.
+
+
+
+2002-01-31      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* RepeaterInfo.cs             - Initial Implementation. Done all
+	                                except for RepeatDirection.Vertical
+	* TableStyle.cs               - Completed
+
+2002-01-30      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* DropDownList.cs             - Completed
+	* ListItemCollection.cs       - Added method FindByValueInternal to
+	                                assist in the derived classes.
+	                                Discovered bug in FindByValue. Removed
+	* UnitConverter.cs            - Completed
+	* PlaceHolder.cs              - What can be simpler than this?
+	* PlaceHolderControlBuilder.cs
+	                              - Uh! Damn cool one.
+	* RadioButtonList.cs          - Initial Implementation. All is done
+	                                except for the implementation of
+	                                method IRepeatInfoUser.RenderItem(...)
+	* ValidatedControlConverter.cs
+	  ^^^^^^^^^^^^^^^^^^^^^^^^^   - Looks complete. Doubtful though !!
+	* ValidationSummary.cs        - Initial Implementation.
+	* WebColorConverter.cs        - Initial Implementation
+
+2002-01-27      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* FontNamesConverter.cs       - Completed
+	* FontUnitConverter.cs        - Partial Implementation
+	* ListItemControlBuilder.cs   - Completed
+
+2002-01-27      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* TextBox.cs                  - All done except *Render* methods
+	* TextBoxControlBuilder.cs    - Completed
+	* Xml.cs                      - Partial Implementation
+
+2002-01-26      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* RadioButton.cs              - Completed
+	* TextBox.cs                  - Partial Implementation
+
+2002-01-25      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* Panel.cs                    - Completed
+	* TableItemStyle.cs           - Completed
+
+2002-01-18      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* TableCellCollection.cs      - Completed
+	* TableRowCollection.cs       - Completed
+	* TableHeaderCell.cs          - Completed
+	* TableRow.cs                 - Completed
+
+2002-01-09      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* TableCellControlBuilder.cs  - Completed
+	* Table.cs                    - Completed
+	* TableCell.cs                - Completed
+
+2002-01-07      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* CheckBoxList.cs             - Completed
+	* ButtonColumn.cs             - Completed
+	* Button.cs                   - Completed
+
+2001-12-28      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* HyperLink.cs                - Completed
+	* Image.cs                    - Completed
+	* ImageButton.cs              - Completed
+	* Label.cs                    - Completed
+	* LabelControlBuilder.cs      - Completed
+	* LinkButton.cs               - Completed
+	* LinkButtonControlBuilder.cs - Completed
+	* Literal.cs                  - Completed
+	* LieteralControlBuilder.cs   - Completed
+	* FontUnit.cs                 - Completed
+
+
+2001-12-27      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* Calendar.cs                 - Completed the functions of Render*,
+	                                ViewStates (Track/View/Save),
+	                                RaisePostBackEvent.
+	                                Left: RenderAllDays (partially)
+
+2001-12-21      Gaurav Vaish <gvaish@iitk.ac.in>
+
+	* Calendar.cs                 - Added some more functions
+	* Style.cs                    - Completed
+	* ListItem.cs                 - Completed
+	* ListItemCollection.cs       - Completed
+
+  Made the first successful build of System.Web.dll that included
+  System.Web.UI.WebControls!
+
+2001-12-20	Gaurav Vaish <gvaish@iitk.ac.in>
+
+	FontInfo.cs                 - Complete revamp. Completed
+
+2001-12-19	Gaurav Vaish <gvaish@iitk.ac.in>
+
+	ListItemCollection.cs       - Completed
+	ListItem.cs                 - Initial Implementation
+	Style.cs                    - Initial Implementation
+
+  Right now I am in a total mood to do a successful build. Creating so many
+  classes, completing classes in System.Web System.Web.UI namespaces.
+
+2001-12-18	Gaurav Vaish <gvaish@iitk.ac.in>
+
+	TODO                        - Properly added
+	CheckBox.cs                 - Completed
+	BaseDataList.cs             - Completed
+	DayRenderEventArgs.cs       - Completed
+	RepeaterItem.cs             - Initial implementation
+
+2001-12-17	Gaurav Vaish <gvaish@iitk.ac.in>
+
+	BaseCompareValidator.cs     - Completed
+	AdRotator.cs                - Completed
+
+2001-12-15	Gaurav Vaish <gvaish@iitk.ac.in>
+
+	CommandEventArgs.cs         - Completed
+	DataGridCommandEventArgs.cs - Completed
+	RepeaterCommandEventArgs.cs - Completed
+	DataListCommandEventArgs.cs - Completed
+	CompareValidator.cs         - Partial Implementation
+
+2001-12-02	Gaurav Vaish <gvaish@iitk.ac.in>
+
+	CheckBoxList.cs            - Partial Implementation.
+	                             All except "Render"
+
+2001-12-01	Gaurav Vaish <gvaish@iitk.ac.in>
+
+	ListControl.cs             - Completed
+
+2001-11-30	Gaurav Vaish <gvaish@iitk.ac.in>
+
+	CheckBox.cs                - Completed
+	ListControl.cs             - Initial Implementation
+	CheckBoxList.cs            - Started with it, but first needed
+	                             ListControl. Left it.
+
+2001-11-29	Gaurav Vaish <gvaish@iitk.ac.in>
+
+	CalendarDay.cs             - Making a note that this
+	                             has been implemented
+	Calendar.cs                - Making a note that have made some changes.
+	                             Unimplmented functions throw
+	                             NotImplementedException
+	CheckBox.cs                - Can now "Render" and "LoadPostData"
+
+
+2001-11-08	Gaurav Vaish <gvaish@iitk.ac.in>
+	WebControl.cs              - Total Revamp, Partial Implementation
+	AdRotator.cs               - Able to load files
+	AdCreatedEventArgs.cs      - Implemented
+
+2001-11-05	Gaurav Vaish <gvaish@iitk.ac.in>
+	Calendar.cs                - Initial Implementation
+	ButtonColumn.cs            - Initial Implementation
+	Button.cs                  - Initial Implementation
+	BoundColumn.cs             - Initial Implementation
+	BaseCompareValidator.cs    - Minor Changes
+	DataList.cs, BaseValidator.cs, BaseDataList.cs
+	                           - Added more functions, other changes
+	
+2001-10-28	Gaurav Vaish <gvaish@iitk.ac.in>
+	WebControl.cs              - Initial Implementation
+	DataList.cs                - Initial Implementation
+	BaseValidator.cs           - Initial Implementation
+	BaseDataList.cs            - Initial Implementation
+
+2001-10-27	Gaurav Vaish <gvaish@iitk.ac.in>
+
+	AdCreatedEventArgs.cs      - Initial Implementation
+	AdCratedEventHandler.cs    - Implemented
+	AdRotator.cs               - Initial Implementation
+	BorderStyle.cs             - Implemented
+	ButtonColumnStyle.cs       - Implemented
+	CalendarSelectionMode.cs   - Implemented
+	DayNameFormat.cs           - Implemented
+	FirstDayOfWeek             - Implemented
+	FontInfo.cs                - Partial Implementation
+	FontSize.cs                - Implemented
+	GridLines.cs               - Implemented
+	HorizontalAlign.cs         - Implemented
+	HyperLink.cs               - Initial Implementation
+	ImageAlign.cs              - Implemented
+	IRepeatInfoUser.cs         - Implemented
+	ListItemType.cs            - Implemented
+	ListSelectionMode.cs       - Implemented
+	NextPrevFormat.cs          - Implemented
+	PagerMode.cs               - Implemented
+	PagerPosition.cs           - Implemented
+	RepeatDirection.cs         - Implemented
+	RepeatLayout.cs            - Implemented
+	TextAlign.cs               - Implemented
+	TextBoxMode.cs             - Implemented
+	TitleFormat.cs             - Implemented
+	UnitType.cs                - Implemented
+	ValidationCompareOperator.cs
+	                           - Implemented
+	ValidationDataType.cs      - Implemented
+	ValidationSummaryDisplayMode.cs
+	                           - Implemented
+	ValidatorDisplay.cs        - Implemented
+	VerticalAlign.cs           - Implemented
+
+
+
+// File Created 2001-11-13
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs
new file mode 100644
index 00000000000..70931a89d88
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBox.cs
@@ -0,0 +1,215 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ * Class:     CheckBox
+ *
+ * Author:  Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status:  100%
+ *
+ * (C) Gaurav Vaish (2001)
+ * Thanks to Leen Toelen (toelen@hotmail.com)'s classes that helped me
+ * to write the contents of the function LoadPostData(...)
+ */
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Globalization;
+using System.Web;
+using System.Web.UI;
+using System.ComponentModel;
+
+namespace System.Web.UI.WebControls
+{
+	[DefaultEvent("CheckedChanged")]
+	[DefaultProperty("Text")]
+	//[DataBindingHanlder("??")]
+	//[Designer("??")]
+	public class CheckBox : WebControl, IPostBackDataHandler
+	{
+		private static readonly object CheckedChangedEvent = new object();
+		
+		public CheckBox(): base(HtmlTextWriterTag.Input)
+		{
+		}
+		
+		public virtual bool AutoPostBack
+		{
+			get {
+				 object o = ViewState ["AutoPostBack"];
+				 return (o == null) ? false : (bool) o;
+			}
+
+			set { ViewState ["AutoPostBack"] = value; }
+		}
+		
+		public virtual bool Checked
+		{
+			get {
+				object o = ViewState ["Checked"];
+				return (o == null) ? false : (bool) o;
+			}
+
+			set { ViewState ["Checked"] = value; }
+		}
+		
+		public virtual string Text
+		{
+			get {
+				object o = ViewState ["Text"];
+				return (o == null) ? String.Empty : (string) o;
+			}
+
+			set { ViewState ["Text"] = value; }
+		}
+		
+		private bool SaveCheckedViewState
+		{
+			get {
+				if (Events [CheckedChangedEvent] != null){
+					if (!Enabled)
+						return true;
+
+					Type type = GetType ();
+					if (type == typeof (CheckBox))
+						return false;
+
+					if (type == typeof (RadioButton))
+						return false;
+				}
+				return true;
+			}
+		}
+		
+		public virtual TextAlign TextAlign
+		{
+			get {
+				object o = ViewState ["TextAlign"];
+				return (o == null) ? TextAlign.Right : (TextAlign) o;
+			}
+
+			set {
+				if (!System.Enum.IsDefined (typeof (TextAlign), value))
+					throw new ArgumentException ();
+				ViewState ["TextAlign"] = value;
+			}
+		}
+		
+		public event EventHandler CheckedChanged
+		{
+			add { Events.AddHandler (CheckedChangedEvent, value); }
+			remove { Events.RemoveHandler (CheckedChangedEvent, value); }
+		}
+		
+		protected virtual void OnCheckedChanged(EventArgs e)
+		{
+			if(Events != null){
+				EventHandler eh = (EventHandler) (Events [CheckedChangedEvent]);
+				if(eh != null)
+					eh (this, e);
+			}
+		}
+		
+		protected override void OnPreRender(EventArgs e)
+		{
+			if (Page != null && Enabled)
+				Page.RegisterRequiresPostBack (this);
+
+			if (SaveCheckedViewState)
+				ViewState.SetItemDirty ("checked", false);
+		}
+		
+		protected override void Render (HtmlTextWriter writer)
+		{
+			bool hasBeginRendering = false;
+			if(ControlStyleCreated && !ControlStyle.IsEmpty){
+				hasBeginRendering = true;
+				ControlStyle.AddAttributesToRender (writer, this);
+			}
+
+			if (!Enabled){
+				hasBeginRendering = true;
+				writer.AddAttribute (HtmlTextWriterAttribute.Disabled, "disabled");
+			}
+
+			if (ToolTip.Length > 0){
+				hasBeginRendering = true;
+				writer.AddAttribute (HtmlTextWriterAttribute.Title, ToolTip);
+			}
+
+			if (Attributes.Count > 0){
+				string val = Attributes ["value"];
+				Attributes.Remove ("value");
+				if (Attributes.Count > 0){
+					hasBeginRendering = true;
+					Attributes.AddAttributes (writer);
+				}
+
+				if (val != null)
+					Attributes ["value"] = val;
+			}
+
+			if (hasBeginRendering)
+				writer.RenderBeginTag (HtmlTextWriterTag.Span);
+
+			if (Text.Length > 0){
+				TextAlign ta = TextAlign;
+				if(ta == TextAlign.Right)
+					RenderInputTag (writer, ClientID);
+				writer.AddAttribute (HtmlTextWriterAttribute.For, ClientID);
+				writer.RenderBeginTag (HtmlTextWriterTag.Label);
+				writer.Write (Text);
+				writer.RenderEndTag ();
+				if(ta == TextAlign.Left)
+					RenderInputTag (writer, ClientID);
+			}
+			else
+				RenderInputTag (writer, ClientID);
+
+			if (hasBeginRendering)
+				writer.RenderEndTag ();
+		}
+		
+		internal virtual void RenderInputTag (HtmlTextWriter writer, string clientId)
+		{
+			writer.AddAttribute (HtmlTextWriterAttribute.Id, clientId);
+			writer.AddAttribute( HtmlTextWriterAttribute.Type, "checkbox");
+			writer.AddAttribute (HtmlTextWriterAttribute.Name, UniqueID);
+			if (Checked)
+				writer.AddAttribute (HtmlTextWriterAttribute.Checked, "checked");
+
+			if (AutoPostBack){
+				writer.AddAttribute (HtmlTextWriterAttribute.Onclick,
+						     Page.GetPostBackClientEvent (this, String.Empty));
+				writer.AddAttribute ("language", "javascript");
+			}
+
+			if (AccessKey.Length > 0)
+				writer.AddAttribute (HtmlTextWriterAttribute.Accesskey, AccessKey);
+
+			if (TabIndex != 0)
+				writer.AddAttribute (HtmlTextWriterAttribute.Tabindex,
+						     TabIndex.ToString (NumberFormatInfo.InvariantInfo));
+
+			writer.RenderBeginTag (HtmlTextWriterTag.Input);
+			writer.RenderEndTag ();
+		}
+		
+		bool IPostBackDataHandler.LoadPostData (string postDataKey, NameValueCollection postCollection)
+		{
+			string postedVal = postCollection [postDataKey];
+			bool   postChecked = false;
+			if(postedVal != null)
+				postChecked = postedVal.Length > 0;
+			Checked = postChecked;
+			return (postChecked == false);
+		}
+		
+		void IPostBackDataHandler.RaisePostDataChangedEvent()
+		{
+			OnCheckedChanged (EventArgs.Empty);
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs
new file mode 100644
index 00000000000..7c2af02c758
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CheckBoxList.cs
@@ -0,0 +1,252 @@
+/**

+* Namespace: System.Web.UI.WebControls

+* Class:     CheckBoxList

+*

+* Author:  Gaurav Vaish

+* Maintainer: gvaish@iitk.ac.in

+* Contact: <gvaish@iitk.ac.in>

+* Implementation: yes

+* Status:  100%

+*

+* (C) Gaurav Vaish (2001)

+*/

+

+using System;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class CheckBoxList: ListControl, IRepeatInfoUser, INamingContainer, IPostBackDataHandler

+	{

+		CheckBox checkBoxRepeater;

+		bool     isChangeNotified;

+

+		public CheckBoxList()

+		{

+			checkBoxRepeater = new CheckBox();

+			checkBoxRepeater.ID = "0";

+			checkBoxRepeater.EnableViewState = false;

+			checkBoxRepeater.Controls.Add(this);

+			isChangeNotified = false;

+		}

+

+		public virtual int CellPadding

+		{

+			get

+			{

+				return (ControlStyleCreated ? ((TableStyle)ControlStyle).CellPadding : -1);

+			}

+			set

+			{

+				((TableStyle)ControlStyle).CellPadding = value;

+			}

+		}

+

+		public virtual int CellSpacing

+		{

+			get

+			{

+				return (ControlStyleCreated ? ((TableStyle)ControlStyle).CellSpacing : -1);

+			}

+			set

+			{

+				((TableStyle)ControlStyle).CellSpacing = value;

+			}

+		}

+

+		public virtual int RepeatColumns

+		{

+			get

+			{

+				object o = ViewState["RepeatColumns"];

+				if(o!=null)

+					return (int)o;

+				return 0;

+			}

+			set

+			{

+				if(value < 0)

+					throw new ArgumentOutOfRangeException();

+				ViewState["RepeatColumns"] = value;

+			}

+		}

+

+		public virtual RepeatDirection RepeatDirection

+		{

+			get

+			{

+				object o = ViewState["RepeatDirection"];

+				if(o!=null)

+					return (RepeatDirection)o;

+				return RepeatDirection.Vertical;

+			}

+			set

+			{

+				if(!System.Enum.IsDefined(typeof(RepeatDirection),value))

+					throw new ArgumentException();

+				ViewState["RepeatDirection"] = value;

+			}

+		}

+

+		public virtual RepeatLayout RepeatLayout

+		{

+			get

+			{

+				object o = ViewState["RepeatLayout"];

+				if(o!=null)

+					return (RepeatLayout)o;

+				return RepeatLayout.Table;

+			}

+			set

+			{

+				if(!System.Enum.IsDefined(typeof(RepeatLayout), value))

+					throw new ArgumentException();

+				ViewState["RepeatLayout"] = value;

+			}

+		}

+

+		public virtual TextAlign TextAlign

+		{

+			get

+			{

+				object o = ViewState["TextAlign"];

+				if(o!=null)

+					return (TextAlign)o;

+				return TextAlign.Right;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(TextAlign), value))

+					throw new ArgumentException();

+				ViewState["TextAlign"] = value;

+			}

+		}

+

+		protected override Style CreateControlStyle()

+		{

+			return new TableStyle(ViewState);

+		}

+

+		protected override Control FindControl(string id, int pathOffset)

+		{

+			return this;

+		}

+

+		protected override void OnPreRender(EventArgs e)

+		{

+			checkBoxRepeater.AutoPostBack = AutoPostBack;

+			if(Page!=null)

+			{

+				for(int i=0; i < Items.Count; i++)

+				{

+					if(Items[i].Selected)

+					{

+						checkBoxRepeater.ID = i.ToString(NumberFormatInfo.InvariantInfo);

+						Page.RegisterRequiresPostBack(checkBoxRepeater);

+					}

+				}

+			}

+		}

+

+		protected override void Render(HtmlTextWriter writer)

+		{

+			RepeatInfo ri = new RepeatInfo();

+			checkBoxRepeater.TabIndex = TabIndex;

+			bool dirtyFlag = false;

+			short  tTabIndex = TabIndex;

+			Style s = (ControlStyleCreated ? ControlStyle : null);

+			if(TabIndex > 0)

+			{

+				if(!ViewState.IsItemDirty("TabIndex"))

+					dirtyFlag = true;

+				TabIndex = 0;

+			}

+			ri.RepeatColumns = RepeatColumns;

+			ri.RepeatLayout  = RepeatLayout;

+			ri.RepeatDirection = RepeatDirection;

+			ri.RenderRepeater(writer, this, s, this);

+			if(tTabIndex > 0)

+			{

+				TabIndex = tTabIndex;

+			}

+			if(dirtyFlag)

+			{

+				ViewState.SetItemDirty("TabIndex", false);

+			}

+		}

+

+		bool IPostBackDataHandler.LoadPostData(string postDataKey, NameValueCollection postCollection)

+		{

+			int index = Int32.Parse(postDataKey.Substring(UniqueID.Length + 1));

+			if(index >= 0 && index < Items.Count)

+			{

+				bool exists = (postCollection[postDataKey]!=null);

+				if(Items[index].Selected != exists)

+				{

+					Items[index].Selected = exists;

+					if(!isChangeNotified)

+					{

+						isChangeNotified = true;

+						return true;

+					}

+				}

+			}

+			return false;

+		}

+

+		void IPostBackDataHandler.RaisePostDataChangedEvent()

+		{

+			OnSelectedIndexChanged(EventArgs.Empty);

+		}

+

+		bool IRepeatInfoUser.HasFooter

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		bool IRepeatInfoUser.HasHeader

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		bool IRepeatInfoUser.HasSeparators

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		int IRepeatInfoUser.RepeatedItemCount

+		{

+			get

+			{

+				return Items.Count;

+			}

+		}

+

+		Style IRepeatInfoUser.GetItemStyle(ListItemType itemType, int repeatIndex)

+		{

+			return null;

+		}

+

+		void IRepeatInfoUser.RenderItem(ListItemType itemType, int repeatIndex, RepeatInfo repeatInfo, HtmlTextWriter writer)

+		{

+			checkBoxRepeater.ID = repeatIndex.ToString(NumberFormatInfo.InvariantInfo);

+			checkBoxRepeater.Text = Items[repeatIndex].Text;

+			checkBoxRepeater.TextAlign = TextAlign;

+			checkBoxRepeater.Checked = Items[repeatIndex].Selected;

+			checkBoxRepeater.RenderControl(writer);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CommandEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CommandEventArgs.cs
new file mode 100644
index 00000000000..145280eb7e3
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CommandEventArgs.cs
@@ -0,0 +1,50 @@
+/**

+* Namespace: System.Web.UI.WebControls

+* Class:     CommandEventArgs

+*

+* Author:  Gaurav Vaish

+* Maintainer: gvaish@iitk.ac.in

+* Implementation: yes

+* Status:  100%

+*

+* (C) Gaurav Vaish (2001)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class CommandEventArgs : EventArgs

+	{

+		private string cmdName;

+		private object cmdArg;

+		

+		public CommandEventArgs(CommandEventArgs e) : this(e.CommandName, e.CommandArgument)

+		{

+		}

+		

+		public CommandEventArgs(string commandName, object argument)

+		{

+			cmdName = commandName;

+			cmdArg  = argument;

+		}

+		

+		public string CommandName

+		{

+			get

+			{

+				return cmdName;

+			}

+		}

+		

+		public object CommandArgument

+		{

+			get

+			{

+				return cmdArg;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CommandEventHandler.cs
new file mode 100644
index 00000000000..e806b1e952c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CommandEventHandler.cs
@@ -0,0 +1,17 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Delegate:  CommandEventHandler

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public delegate void CommandEventHandler(object sender, CommandEventArgs e);

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
new file mode 100644
index 00000000000..46b4a18198a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CompareValidator.cs
@@ -0,0 +1,89 @@
+/**

+* Namespace: System.Web.UI.WebControls

+* Class:     CompareValidator

+*

+* Author:  Gaurav Vaish

+* Maintainer: gvaish@iitk.ac.in

+* Implementation: yes

+* Status:  80%

+*

+* (C) Gaurav Vaish (2001)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[ToolboxData("<{0}:CompareValidator runat=\"server\""

+	             + "ErrorMessage=\"CompareValidator\"></{0}:CompareValidator>")]

+	public class CompareValidator: BaseCompareValidator

+	{

+		public CompareValidator()

+		{

+			// Intitalize();

+		}

+

+		public string ControlToCompare

+		{

+			get

+			{

+				object o = ViewState["ControlToCompare"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+

+			set

+			{

+				ViewState["ControlToCompare"] = value;

+			}

+		}

+

+		public ValidationCompareOperator Operator

+		{

+			get

+			{

+				object o = ViewState["Operator"];

+				if(o!=null)

+					return (ValidationCompareOperator)o;

+				return ValidationCompareOperator.Equal;

+			}

+			set

+			{

+				if(!System.Enum.IsDefined(typeof(ValidationCompareOperator), value))

+					throw new ArgumentException();

+				ViewState["Operator"] = value;

+			}

+		}

+

+		public string ValueToCompare

+		{

+			get

+			{

+				object o = ViewState["ValueToCompare"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["ValueToCompare"] = value;

+			}

+		}

+

+		[MonoTODO]

+		protected override bool EvaluateIsValid()

+		{

+			string ctrl = GetControlValidationValue(ControlToValidate);

+			throw new NotImplementedException();

+			if(ctrl!=null && ctrl.Length > 0)

+			{

+				//string

+				throw new NotImplementedException();

+			}

+			return true;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/CustomValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/CustomValidator.cs
new file mode 100644
index 00000000000..192cab3bcad
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/CustomValidator.cs
@@ -0,0 +1,113 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     CustomValidator

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultEvent("ServerValidate")]

+	[ToolboxData("<{0}:CustomValidator runat=\"server\""

+	             + "ErrorMessage=\"CustomValidator\">"

+	             + "</{0}:CustomValidator>")]

+	public class CustomValidator : BaseValidator

+	{

+		private static readonly object ServerValidateEvent = new object();

+

+		public CustomValidator()

+		{

+		}

+

+		public string ClientValidationFunction

+		{

+			get

+			{

+				object o = ViewState["ClientValidationFunction"];

+				if(o != null)

+				{

+					return (string)o;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["ClientValidationFunction"] = value;

+			}

+		}

+

+		public event ServerValidateEventHandler ServerValidate

+		{

+			add

+			{

+				Events.AddHandler(ServerValidateEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(ServerValidateEvent, value);

+			}

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender(writer);

+			if(RenderUplevel)

+			{

+				writer.AddAttribute("evaluationfunction", "CustomValidatorEvaluateIsValid");

+				if(ClientValidationFunction.Length > 0)

+				{

+					writer.AddAttribute("clientvalidationfunction", ClientValidationFunction);

+				}

+			}

+		}

+

+		protected override bool ControlPropertiesValid()

+		{

+			if(ControlToValidate.Length > 0)

+			{

+				CheckControlValidationProperty(ControlToValidate, "ControlToValidate");

+			}

+			return true;

+		}

+

+		protected virtual bool OnServerValidate(string value)

+		{

+			if(Events != null)

+			{

+				ServerValidateEventHandler sveh = (ServerValidateEventHandler)(Events[ServerValidateEvent]);

+				if(sveh != null)

+				{

+					ServerValidateEventArgs args = new ServerValidateEventArgs(value, true);

+					sveh(this, args);

+					return args.IsValid;

+				}

+			}

+			return true;

+		}

+

+		protected override bool EvaluateIsValid()

+		{

+			string ctrl = ControlToValidate;

+			if(ctrl.Length > 0)

+			{

+				ctrl = GetControlValidationValue(ctrl);

+				if(ctrl== null || ctrl.Length == 0)

+				{

+					return true;

+				}

+			}

+			return OnServerValidate(ctrl);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
new file mode 100644
index 00000000000..f63a0a72e84
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGrid.cs
@@ -0,0 +1,1152 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ * Class:     DataGrid
+ *
+ * Author:  Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status:  95%
+ *
+ * (C) Gaurav Vaish (2002)
+ */
+
+using System;
+using System.Collections;
+using System.Web;
+using System.Web.UI;
+using System.ComponentModel;
+using System.Reflection;
+
+namespace System.Web.UI.WebControls
+{
+	//TODO: [Designer("??")]
+	//TODO: [Editor("??")]
+	[DefaultEvent("SelectedIndexChanged")]
+	[DefaultProperty("DataSource")]
+	[ParseChildren(true)]
+	[PersistChildren(false)]
+	public class DataGrid : BaseDataList, INamingContainer
+	{
+		public const string CancelCommandName       = "Cancel";
+		public const string DeleteCommandName       = "Delete";
+		public const string EditCommandName         = "Edit";
+		public const string NextPageCommandArgument = "Next";
+		public const string PageCommandName         = "Page";
+		public const string PrevPageCommandArgument = "Prev";
+		public const string SelectCommandName       = "Select";
+		public const string SortCommandName         = "Sort";
+		public const string UpdateCommandName       = "Update";
+
+		private TableItemStyle alternatingItemStyle;
+		private TableItemStyle editItemStyle;
+		private TableItemStyle headerStyle;
+		private TableItemStyle footerStyle;
+		private TableItemStyle itemStyle;
+		private TableItemStyle selectedItemStyle;
+		private DataGridPagerStyle pagerStyle;
+
+		private DataGridColumnCollection columns;
+		private ArrayList                columnsArrayList;
+		private DataGridItemCollection   items;
+		private ArrayList                itemsArrayList;
+		private PagedDataSource          pagedDataSource;
+
+		private ArrayList   autoGenColsArrayList;
+		private IEnumerator storedData;
+		private object      storedDataFirst;
+		private bool        storedDataValid;
+
+		private static readonly object CancelCommandEvent    = new object();
+		private static readonly object DeleteCommandEvent    = new object();
+		private static readonly object EditCommandEvent      = new object();
+		private static readonly object ItemCommandEvent      = new object();
+		private static readonly object ItemCreatedEvent      = new object();
+		private static readonly object ItemDataBoundEvent    = new object();
+		private static readonly object PageIndexChangedEvent = new object();
+		private static readonly object SortCommandEvent      = new object();
+		private static readonly object UpdateCommandEvent    = new object();
+
+		public DataGrid(): base()
+		{
+		}
+
+		public virtual bool AllowCustomPaging
+		{
+			get
+			{
+				object o = ViewState["AllowCustomPaging"];
+				if(o != null)
+					return (bool)o;
+				return false;
+			}
+			set
+			{
+				ViewState["AllowCustomPaging"] = value;
+			}
+		}
+
+		public virtual bool AllowPaging
+		{
+			get
+			{
+				object o = ViewState["AllowPaging"];
+				if(o != null)
+					return (bool)o;
+				return false;
+			}
+			set
+			{
+				ViewState["AllowPaging"] = value;
+			}
+		}
+
+		public virtual bool AllowSorting
+		{
+			get
+			{
+				object o = ViewState["AllowSorting"];
+				if(o != null)
+					return (bool)o;
+				return false;
+			}
+			set
+			{
+				ViewState["AllowSorting"] = value;
+			}
+		}
+
+		public virtual TableItemStyle AlternatingItemStyle
+		{
+			get
+			{
+				if(alternatingItemStyle == null)
+				{
+					alternatingItemStyle = new TableItemStyle();
+				}
+				if(IsTrackingViewState)
+				{
+					alternatingItemStyle.TrackViewState();
+				}
+				return alternatingItemStyle;
+			}
+		}
+
+		public virtual bool AutoGenerateColumns
+		{
+			get
+			{
+				object o = ViewState["AutoGenerateColumns"];
+				if(o != null)
+					return (bool)o;
+				return false;
+			}
+			set
+			{
+				ViewState["AutoGenerateColumns"] = value;
+			}
+		}
+
+		public virtual string BackImageUrl
+		{
+			get
+			{
+				object o = ViewState["BackImageUrl"];
+				if(o != null)
+					return (string)o;
+				return String.Empty;
+			}
+			set
+			{
+				ViewState["BackImageUrl"] = value;
+			}
+		}
+
+		public virtual DataGridColumnCollection Columns
+		{
+			get
+			{
+				if(columns == null)
+				{
+					columnsArrayList = new ArrayList();
+					columns = new DataGridColumnCollection(this, columnsArrayList);
+					if(IsTrackingViewState)
+					{
+						((IStateManager)columns).TrackViewState();
+					}
+				}
+				return columns;
+			}
+		}
+
+		public int CurrentPageIndex
+		{
+			get
+			{
+				object o = ViewState["CurrentPageIndex"];
+				if(o != null)
+					return (int)o;
+				return 0;
+			}
+			set
+			{
+				if(value < 0)
+					throw new ArgumentOutOfRangeException();
+				ViewState["CurrentPageIndex"] = value;
+			}
+		}
+
+		public virtual int EditItemIndex
+		{
+			get
+			{
+				object o = ViewState["EditItemIndex"];
+				if(o != null)
+					return (int)o;
+				return -1;
+			}
+			set
+			{
+				if(value < -1)
+					throw new ArgumentOutOfRangeException();
+				ViewState["EditItemIndex"] = value;
+			}
+		}
+
+		public virtual TableItemStyle EditItemStyle
+		{
+			get
+			{
+				if(editItemStyle == null)
+				{
+					editItemStyle = new TableItemStyle();
+					if(IsTrackingViewState)
+					{
+						editItemStyle.TrackViewState();
+					}
+				}
+				return editItemStyle;
+			}
+		}
+
+		public virtual TableItemStyle FooterStyle
+		{
+			get
+			{
+				if(footerStyle == null)
+				{
+					footerStyle = new TableItemStyle();
+					if(IsTrackingViewState)
+					{
+						footerStyle.TrackViewState();
+					}
+				}
+				return footerStyle;
+			}
+		}
+
+		public virtual TableItemStyle HeaderStyle
+		{
+			get
+			{
+				if(headerStyle == null)
+				{
+					headerStyle = new TableItemStyle();
+					if(IsTrackingViewState)
+					{
+						headerStyle.TrackViewState();
+					}
+				}
+				return headerStyle;
+			}
+		}
+
+		public virtual DataGridItemCollection Items
+		{
+			get
+			{
+				if(items == null)
+				{
+					if(itemsArrayList == null)
+						EnsureChildControls();
+					if(itemsArrayList == null)
+					{
+						itemsArrayList = new ArrayList();
+					}
+					items = new DataGridItemCollection(itemsArrayList);
+				}
+				return items;
+			}
+		}
+
+		public virtual TableItemStyle ItemStyle
+		{
+			get
+			{
+				if(itemStyle == null)
+				{
+					itemStyle = new TableItemStyle();
+					if(IsTrackingViewState)
+					{
+						itemStyle.TrackViewState();
+					}
+				}
+				return itemStyle;
+			}
+		}
+
+		public int PageCount
+		{
+			get
+			{
+				if(pagedDataSource != null)
+				{
+					return pagedDataSource.PageCount;
+				}
+				object o = ViewState["PageCount"];
+				if(o != null)
+					return (int)o;
+				return 0;
+			}
+		}
+
+		public virtual DataGridPagerStyle PagerStyle
+		{
+			get
+			{
+				if(pagerStyle == null)
+				{
+					pagerStyle = new DataGridPagerStyle(this);
+					if(IsTrackingViewState)
+					{
+						pagerStyle.TrackViewState();
+					}
+				}
+				return pagerStyle;
+			}
+		}
+
+		public virtual int PageSize
+		{
+			get
+			{
+				object o = ViewState["PageSize"];
+				if(o != null)
+					return (int)o;
+				return 10;
+			}
+			set
+			{
+				if(value < 1)
+					throw new ArgumentOutOfRangeException();
+				ViewState["PageSize"] = value;
+			}
+		}
+
+		public virtual int SelectedIndex
+		{
+			get
+			{
+				object o = ViewState["SelectedIndex"];
+				if(o != null)
+					return (int)o;
+				return -1;
+			}
+			set
+			{
+				if(value < -1)
+					throw new ArgumentOutOfRangeException();
+				int prevVal = SelectedIndex;
+				ViewState["SelectedIndex"] = value;
+				if(items != null)
+				{
+					if(prevVal !=-1 && prevVal < items.Count)
+					{
+						DataGridItem prev = (DataGridItem)items[prevVal];
+						if(prev.ItemType != ListItemType.EditItem)
+						{
+							ListItemType newType = ListItemType.Item;
+							if( (prevVal % 2) != 0)
+							{
+								newType = ListItemType.AlternatingItem;
+							}
+							prev.SetItemType(newType);
+						}
+					}
+				}
+			}
+		}
+
+		public virtual DataGridItem SelectedItem
+		{
+			get
+			{
+				if(SelectedIndex == -1)
+					return null;
+				return Items[SelectedIndex];
+			}
+		}
+
+		public virtual TableItemStyle SelectedItemStyle
+		{
+			get
+			{
+				if(selectedItemStyle == null)
+				{
+					selectedItemStyle = new TableItemStyle();
+					if(IsTrackingViewState)
+					{
+						selectedItemStyle.TrackViewState();
+					}
+				}
+				return selectedItemStyle;
+			}
+		}
+
+		public virtual bool ShowFooter
+		{
+			get
+			{
+				object o = ViewState["ShowFooter"];
+				if(o != null)
+					return (bool)o;
+				return false;
+			}
+			set
+			{
+				ViewState["ShowFooter"] = value;
+			}
+		}
+
+		public virtual bool ShowHeader
+		{
+			get
+			{
+				object o = ViewState["ShowHeader"];
+				if(o != null)
+					return (bool)o;
+				return false;
+			}
+			set
+			{
+				ViewState["ShowHeader"] = value;
+			}
+		}
+
+		public virtual int VirtualItemCount
+		{
+			get
+			{
+				object o = ViewState["VirtualItemCount"];
+				if(o != null)
+					return (int)o;
+				return 0;
+			}
+			set
+			{
+				if(value < 0)
+					throw new ArgumentOutOfRangeException();
+				ViewState["VirtualItemCount"] = value;
+			}
+		}
+
+		public event DataGridCommandEventHandler CancelCommand
+		{
+			add
+			{
+				Events.AddHandler(CancelCommandEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(CancelCommandEvent, value);
+			}
+		}
+
+		public event DataGridCommandEventHandler DeleteCommand
+		{
+			add
+			{
+				Events.AddHandler(DeleteCommandEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(DeleteCommandEvent, value);
+			}
+		}
+
+		public event DataGridCommandEventHandler EditCommand
+		{
+			add
+			{
+				Events.AddHandler(EditCommandEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(EditCommandEvent, value);
+			}
+		}
+
+		public event DataGridCommandEventHandler ItemCommand
+		{
+			add
+			{
+				Events.AddHandler(ItemCommandEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(ItemCommandEvent, value);
+			}
+		}
+
+		public event DataGridCommandEventHandler ItemCreated
+		{
+			add
+			{
+				Events.AddHandler(ItemCreatedEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(ItemCreatedEvent, value);
+			}
+		}
+
+		public event DataGridCommandEventHandler ItemDataBound
+		{
+			add
+			{
+				Events.AddHandler(ItemDataBoundEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(ItemDataBoundEvent, value);
+			}
+		}
+
+		public event DataGridCommandEventHandler PageIndexChanged
+		{
+			add
+			{
+				Events.AddHandler(PageIndexChangedEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(PageIndexChangedEvent, value);
+			}
+		}
+
+		public event DataGridCommandEventHandler SortCommand
+		{
+			add
+			{
+				Events.AddHandler(SortCommandEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(SortCommandEvent, value);
+			}
+		}
+
+		public event DataGridCommandEventHandler UpdateCommand
+		{
+			add
+			{
+				Events.AddHandler(UpdateCommandEvent, value);
+			}
+			remove
+			{
+				Events.RemoveHandler(UpdateCommandEvent, value);
+			}
+		}
+
+		protected override Style CreateControlStyle()
+		{
+			TableStyle style = new TableStyle(ViewState);
+			style.GridLines = GridLines.Both;
+			style.CellSpacing = 0;
+			return style;
+		}
+
+		protected override void LoadViewState(object savedState)
+		{
+			if(savedState != null)
+			{
+				object[] states = (object[])savedState;
+				if(states != null)
+				{
+					base.LoadViewState(states[0]);
+					if(columns != null)
+						((IStateManager)columns).LoadViewState(states[1]);
+					if(pagerStyle != null)
+						pagerStyle.LoadViewState(states[2]);
+					if(headerStyle != null)
+						headerStyle.LoadViewState(states[3]);
+					if(footerStyle != null)
+						footerStyle.LoadViewState(states[4]);
+					if(itemStyle != null)
+						itemStyle.LoadViewState(states[5]);
+					if(alternatingItemStyle != null)
+						alternatingItemStyle.LoadViewState(states[6]);
+					if(selectedItemStyle != null)
+						selectedItemStyle.LoadViewState(states[7]);
+					if(editItemStyle != null)
+						editItemStyle.LoadViewState(states[8]);
+				}
+			}
+		}
+
+		protected override object SaveViewState()
+		{
+			object[] states = new object[9];
+			states[0] = SaveViewState();
+			states[1] = (columns == null ? null : ((IStateManager)columns).SaveViewState());
+			states[2] = (pagerStyle == null ? null : pagerStyle.SaveViewState());
+			states[3] = (headerStyle == null ? null : headerStyle.SaveViewState());
+			states[4] = (footerStyle == null ? null : footerStyle.SaveViewState());
+			states[5] = (itemStyle == null ? null : itemStyle.SaveViewState());
+			states[6] = (alternatingItemStyle == null ? null : alternatingItemStyle.SaveViewState());
+			states[7] = (selectedItemStyle == null ? null : selectedItemStyle.SaveViewState());
+			states[8] = (editItemStyle == null ? null : editItemStyle.SaveViewState());
+			return states;
+		}
+
+		protected override void TrackViewState()
+		{
+			base.TrackViewState();
+			if(alternatingItemStyle != null)
+			{
+				alternatingItemStyle.TrackViewState();
+			}
+			if(editItemStyle != null)
+			{
+				editItemStyle.TrackViewState();
+			}
+			if(headerStyle != null)
+			{
+				headerStyle.TrackViewState();
+			}
+			if(footerStyle != null)
+			{
+				footerStyle.TrackViewState();
+			}
+			if(itemStyle != null)
+			{
+				itemStyle.TrackViewState();
+			}
+			if(selectedItemStyle != null)
+			{
+				selectedItemStyle.TrackViewState();
+			}
+			if(pagerStyle != null)
+			{
+				pagerStyle.TrackViewState();
+			}
+
+			if(columns != null)
+			{
+				((IStateManager)columns).TrackViewState();
+			}
+		}
+
+		protected override bool OnBubbleEvent(object source, EventArgs e)
+		{
+			bool retVal = false;
+			if(e is DataGridCommandEventArgs)
+			{
+				DataGridCommandEventArgs ea = (DataGridCommandEventArgs)e;
+				retVal = true;
+				OnItemCommand(ea);
+				string cmd = ea.CommandName;
+				if(String.Compare(cmd, "select", true) == 0)
+				{
+					SelectedIndex = ea.Item.ItemIndex;
+					OnSelectedIndexChanged(EventArgs.Empty);
+				} else if(String.Compare(cmd,"page", true) == 0)
+				{
+					int    cIndex = CurrentPageIndex;
+					string cea = (string) ea.CommandArgument;
+					if(String.Compare(cea, "prev", true) == 0)
+					{
+						cIndex--;
+					} else if(String.Compare(cea, "next", true) == 0)
+					{
+						cIndex++;
+					}
+					OnPageIndexChanged(new DataGridPageChangedEventArgs(source, cIndex));
+				} else if(String.Compare(cmd, "sort", true) == 0)
+				{
+					OnSortCommand(new DataGridSortCommandEventArgs(source, ea));
+				} else if(String.Compare(cmd, "edit", true) == 0)
+				{
+					OnEditCommand(ea);
+				} else if(String.Compare(cmd, "update", true) == 0)
+				{
+					OnUpdateCommand(ea);
+				} else if(String.Compare(cmd, "cancel", true) == 0)
+				{
+					OnCancelCommand(ea);
+				} else if(String.Compare(cmd, "delete", true) == 0)
+				{
+					OnDeleteCommand(ea);
+				}
+			}
+			return retVal;
+		}
+
+		protected virtual void OnCancelCommand(DataGridCommandEventArgs e)
+		{
+			if(Events != null)
+			{
+				DataGridCommandEventHandler dceh = (DataGridCommandEventHandler)(Events[CancelCommandEvent]);
+				if(dceh != null)
+					dceh(this, e);
+			}
+		}
+
+		protected virtual void OnDeleteCommand(DataGridCommandEventArgs e)
+		{
+			if(Events != null)
+			{
+				DataGridCommandEventHandler dceh = (DataGridCommandEventHandler)(Events[DeleteCommandEvent]);
+				if(dceh != null)
+					dceh(this, e);
+			}
+		}
+
+		protected virtual void OnEditCommand(DataGridCommandEventArgs e)
+		{
+			if(Events != null)
+			{
+				DataGridCommandEventHandler dceh = (DataGridCommandEventHandler)(Events[EditCommandEvent]);
+				if(dceh != null)
+					dceh(this, e);
+			}
+		}
+
+		protected virtual void OnItemCommand(DataGridCommandEventArgs e)
+		{
+			if(Events != null)
+			{
+				DataGridCommandEventHandler dceh = (DataGridCommandEventHandler)(Events[ItemCommandEvent]);
+				if(dceh != null)
+					dceh(this, e);
+			}
+		}
+
+		protected virtual void OnItemCreated(DataGridItemEventArgs e)
+		{
+			if(Events != null)
+			{
+				DataGridItemEventHandler dceh = (DataGridItemEventHandler)(Events[ItemCreatedEvent]);
+				if(dceh != null)
+					dceh(this, e);
+			}
+		}
+
+		protected virtual void OnItemDataBound(DataGridItemEventArgs e)
+		{
+			if(Events != null)
+			{
+				DataGridItemEventHandler dceh = (DataGridItemEventHandler)(Events[ItemDataBoundEvent]);
+				if(dceh != null)
+					dceh(this, e);
+			}
+		}
+
+		protected virtual void OnPageIndexChanged(DataGridPageChangedEventArgs e)
+		{
+			if(Events != null)
+			{
+				DataGridPageChangedEventHandler dceh = (DataGridPageChangedEventHandler)(Events[PageIndexChangedEvent]);
+				if(dceh != null)
+					dceh(this, e);
+			}
+		}
+
+		protected virtual void OnSortCommand(DataGridSortCommandEventArgs e)
+		{
+			if(Events != null)
+			{
+				DataGridSortCommandEventHandler dceh = (DataGridSortCommandEventHandler)(Events[SortCommandEvent]);
+				if(dceh != null)
+					dceh(this, e);
+			}
+		}
+
+		protected virtual void OnUpdateCommand(DataGridCommandEventArgs e)
+		{
+			if(Events != null)
+			{
+				DataGridCommandEventHandler dceh = (DataGridCommandEventHandler)(Events[UpdateCommandEvent]);
+				if(dceh != null)
+					dceh(this, e);
+			}
+		}
+
+		protected override void PrepareControlHierarchy()
+		{
+			if(Controls.Count > 0)
+			{
+				Table display = (Table)Controls[0];
+				display.CopyBaseAttributes(this);
+				if(ControlStyleCreated)
+				{
+					display.ApplyStyle(ControlStyle);
+				} else
+				{
+					display.GridLines   = GridLines.Both;
+					display.CellSpacing = 0;
+				}
+				TableRowCollection rows = display.Rows;
+				if(rows.Count > 0)
+				{
+					int              nCols = Columns.Count;
+					DataGridColumn[] cols = new DataGridColumn[nCols];
+					Style            deployStyle;
+					int              counter;
+					if(nCols > 0)
+					{
+						Columns.CopyTo(cols, 0);
+					}
+					deployStyle = null;
+					if(alternatingItemStyle != null)
+					{
+						deployStyle = new TableItemStyle();
+						deployStyle.CopyFrom(itemStyle);
+						deployStyle.CopyFrom(alternatingItemStyle);
+					} else
+					{
+						deployStyle = itemStyle;
+					}
+					for(counter = 0; counter < rows.Count; counter++)
+					{
+						PrepareControlHierarchyForItem(cols, (DataGridItem) rows[counter], counter, deployStyle);
+					}
+				}
+			}
+		}
+
+		private void PrepareControlHierarchyForItem(DataGridColumn[] cols, DataGridItem item, int index, Style deployStyle)
+		{
+			switch(item.ItemType)
+			{
+				case ListItemType.Header: if(!ShowHeader)
+				                          {
+				                          	item.Visible = false;
+				                          	break;
+				                          }
+				                          if(headerStyle != null)
+				                          {
+				                          	item.MergeStyle(headerStyle);
+				                          	goto case ListItemType.Separator;
+				                          }
+				                          break;
+				case ListItemType.Footer: if(!ShowFooter)
+				                          {
+				                          	item.Visible = false;
+				                          	break;
+				                          }
+				                          if(footerStyle != null)
+				                          {
+				                          	item.MergeStyle(footerStyle);
+				                          	goto case ListItemType.Separator;
+				                          }
+				                          break;
+				case ListItemType.Item  : item.MergeStyle(itemStyle);
+				                          goto case ListItemType.Separator;
+				case ListItemType.AlternatingItem:
+				                          item.MergeStyle(deployStyle);
+				                          goto case ListItemType.Separator;
+				case ListItemType.SelectedItem:
+				                          Style selStyle = new TableItemStyle();
+				                          if( (item.ItemIndex % 2) == 0)
+				                          {
+				                          	selStyle.CopyFrom(itemStyle);
+				                          } else
+				                          {
+				                          	selStyle.CopyFrom(deployStyle);
+				                          }
+				                          selStyle.CopyFrom(selectedItemStyle);
+				                          item.MergeStyle(selStyle);
+				                          goto case ListItemType.Separator;
+				case ListItemType.EditItem:
+				                          Style edStyle = new TableItemStyle();
+				                          if( (item.ItemIndex % 2) == 0)
+				                          {
+				                          	edStyle.CopyFrom(itemStyle);
+				                          } else
+				                          {
+				                          	edStyle.CopyFrom(deployStyle);
+				                          }
+				                          edStyle.CopyFrom(editItemStyle);
+				                          item.MergeStyle(edStyle);
+				                          goto case ListItemType.Separator;
+				case ListItemType.Pager : if(pagerStyle == null)
+				                          {
+				                          	break;
+				                          }
+				                          if(!pagerStyle.Visible)
+				                          {
+				                          	item.Visible = false;
+				                          }
+				                          if(index == 0)
+				                          {
+				                          	if(!pagerStyle.IsPagerOnTop)
+				                          	{
+				                          		item.Visible = false;
+				                          		break;
+				                          	}
+				                          } else
+				                          {
+				                          	if(!pagerStyle.IsPagerOnBottom)
+				                          	{
+				                          		item.Visible = false;
+				                          		break;
+				                          	}
+				                          }
+				                          item.MergeStyle(pagerStyle);
+				                          goto case ListItemType.Separator;
+				case ListItemType.Separator:
+				                          TableCellCollection cells = item.Cells;
+				                          int cellCount = cells.Count;
+				                          if(cellCount > 0 && item.ItemType != ListItemType.Pager)
+				                          {
+				                          	for(int i = 0; i < cellCount; i++)
+				                          	{
+				                          		Style colStyle = null;
+				                          		if(cols[i].Visible)
+				                          		{
+				                          			switch (item.ItemType)
+				                          			{
+				                          				case ListItemType.Header : colStyle = cols[i].HeaderStyleInternal;
+				                          				                           break;
+				                          				case ListItemType.Footer : colStyle = cols[i].FooterStyleInternal;
+				                          				                           break;
+				                          				default                  : colStyle = cols[i].ItemStyleInternal;
+				                          				                           break;
+				                          			}
+				                          			item.MergeStyle(colStyle);
+				                          		} else
+				                          		{
+				                          			cells[i].Visible = false;
+				                          		}
+				                          	}
+				                          }
+				                          break;
+				default                 : goto case ListItemType.Separator;
+			}
+		}
+
+		[MonoTODO]
+		protected override void CreateControlHierarchy(bool useDataSource)
+		{
+			IEnumerator pageSource;
+			int         itemCount;
+			int         dsItemCount;
+			ArrayList   dataKeys;
+			ArrayList   columns;
+			IEnumerable resolvedDS;
+			ICollection collResolvedDS;
+			int         pageDSCount;
+			int         colCount;
+			DataGridColumn[] cols;
+			Table       deployTable;
+			TableRowCollection deployRows;
+			ListItemType deployType;
+			int         indexCounter;
+			string      dkField;
+			bool        dsUse;
+			bool        pgEnabled;
+			int         editIndex;
+			int         selIndex;
+
+			pagedDataSource = CreatePagedDataSource();
+			pageSource      = null;
+			itemCount       = -1;
+			dsItemCount     = -1;
+			dataKeys        = DataKeysArray;
+			columns         = null;
+			if(itemsArrayList != null)
+			{
+				itemsArrayList.Clear();
+			} else
+			{
+				itemsArrayList = new ArrayList();
+			}
+			if(!useDataSource)
+			{
+				itemCount    = (int) ViewState["_DataGrid_ItemCount"];
+				pageDSCount  = (int) ViewState["_DataGrid_DataSource_Count"];
+				if(itemCount != -1)
+				{
+					if(pagedDataSource.IsCustomPagingEnabled)
+					{
+						// I may need a dummy pagedDS
+					}
+				}
+			} else
+			{
+				//TODO: Use Data Source
+			}
+			throw new NotImplementedException();
+		}
+
+		private PagedDataSource CreatePagedDataSource()
+		{
+			PagedDataSource retVal;
+
+			retVal = new PagedDataSource();
+			retVal.CurrentPageIndex = CurrentPageIndex;
+			retVal.PageSize         = PageSize;
+			retVal.AllowPaging      = AllowPaging;
+			retVal.AllowCustomPaging = AllowCustomPaging;
+			retVal.VirtualCount      = VirtualItemCount;
+
+			return retVal;
+		}
+
+		///<summary>
+		/// UnDocumented method
+		/// </summary>
+		[MonoTODO]
+		protected ArrayList CreateColumnSet(PagedDataSource source, bool useDataSource)
+		{
+			DataGridColumn[] cols = new DataGridColumn[Columns.Count];
+			Columns.CopyTo(cols, 0);
+			ArrayList l_columns = new ArrayList();
+			ArrayList auto_columns = null;
+
+			foreach(DataGridColumn current in cols)
+			{
+				l_columns.Add(current);
+			}
+			if(AutoGenerateColumns)
+			{
+				l_columns = null;
+				if(useDataSource)
+				{
+					auto_columns = AutoCreateCoumns(source);
+					autoGenColsArrayList = auto_columns;
+				} else
+				{
+					auto_columns = autoGenColsArrayList;
+				}
+				if(auto_columns != null)
+				{
+					foreach(object current in auto_columns)
+					{
+						l_columns.Add(current);
+					}
+				}
+			}
+			return l_columns;
+		}
+
+		/// <summary>
+		/// Generates the columns when AutoGenerateColumns is true.
+		/// This method is called by CreateColumnSet when dataSource
+		/// is to be used and columns need to be generated automatically.
+		/// </summary>
+		private ArrayList AutoCreateCoumns(PagedDataSource source)
+		{
+			if(source != null)
+			{
+				ArrayList retVal = new ArrayList();
+				bool      flag   = true;
+				PropertyDescriptorCollection props = source.GetItemProperties(new PropertyDescriptor[0]);
+				Type      prop_type;
+				BoundColumn b_col;
+				if(props == null)
+				{
+					prop_type   = null;
+					PropertyInfo prop_item =  source.DataSource.GetType().GetProperty("Item",
+					          BindingFlags.Instance | BindingFlags.Static |
+					          BindingFlags.Public, null, null,
+					          new Type[] { typeof(int) }, null);
+					if(prop_item != null)
+					{
+						prop_type = prop_item.GetType();
+					}
+					if(prop_type != null && prop_type == typeof(object))
+					{
+						object fitem = null;
+						IEnumerator en = source.GetEnumerator();
+						if(en.MoveNext())
+							fitem = en.Current;
+						else
+							flag = false;
+						if(fitem != null)
+						{
+							prop_type = fitem.GetType();
+						}
+						StoreEnumerator(en, fitem);
+						if(fitem != null && fitem is ICustomTypeDescriptor)
+						{
+							props = TypeDescriptor.GetProperties(fitem);
+						} else if(prop_type != null)
+						{
+							if(IsBindableType(prop_type))
+							{
+								b_col = new BoundColumn();
+								// b_col.TrackViewState();
+								b_col.HeaderText = "Item";
+								b_col.SortExpression = "Item";
+								b_col.DataField  = BoundColumn.thisExpr;
+								//b_col.SetOwner(this);
+								retVal.Add(b_col);
+							} else
+							{
+								props = TypeDescriptor.GetProperties(prop_type);
+							}
+						}
+					}
+				}
+				if(props != null && props.Count > 0)
+				{
+					//IEnumerable p_en = props.GetEnumerator();
+					try
+					{
+						foreach(PropertyDescriptor current in props)
+						{
+							if(IsBindableType(current.PropertyType))
+							{
+								b_col = new BoundColumn();
+								// b_col.TrackViewState();
+								b_col.HeaderText     = current.Name;
+								b_col.SortExpression = current.Name;
+								b_col.DataField      = current.Name;
+								// b_col.IsReadOnly     = current.IsReadOnly;
+								// b_col.SetOwner(this);
+								retVal.Add(b_col);
+							}
+						}
+					} finally
+					{
+						if(props is IDisposable)
+							((IDisposable)props).Dispose();
+					}
+				}
+				if(retVal.Count > 0)
+				{
+					return retVal;
+				}
+				throw new HttpException(HttpRuntime.FormatResourceString("DataGrid_NoAutoGenColumns", ID));
+			}
+			return null;
+		}
+
+		internal void StoreEnumerator(IEnumerator source, object firstItem)
+		{
+			storedData      = source;
+			storedDataFirst = firstItem;
+			storedDataValid = true;
+		}
+
+		internal void OnColumnsChanged()
+		{
+		}
+
+		internal void OnPagerChanged()
+		{
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs
new file mode 100644
index 00000000000..dc3b8b49fdc
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumn.cs
@@ -0,0 +1,403 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ * Class:     DataGridColumn
+ *
+ * Author:  Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status:  100%
+ *
+ * (C) Gaurav Vaish (2002)
+ */
+
+using System;
+using System.Web;
+using System.Web.UI;
+using System.ComponentModel;
+
+namespace System.Web.UI.WebControls
+{
+	[TypeConverter(typeof(ExpandableObjectConverter))]
+	public abstract class DataGridColumn : IStateManager
+	{
+		private StateBag viewState;
+		private bool     marked;
+		private TableItemStyle footerStyle;
+		private TableItemStyle headerStyle;
+		private TableItemStyle itemStyle;
+
+		private DataGrid owner;
+		private bool     designMode;
+
+		public DataGridColumn()
+		{
+			viewState = new StateBag();
+		}
+
+		internal TableItemStyle FooterStyleInternal
+		{
+			get
+			{
+				return footerStyle;
+			}
+		}
+
+		internal TableItemStyle HeaderStyleInternal
+		{
+			get
+			{
+				return headerStyle;
+			}
+		}
+
+		internal TableItemStyle ItemStyleInternal
+		{
+			get
+			{
+				return itemStyle;
+			}
+		}
+
+		public virtual TableItemStyle FooterStyle
+		{
+			get
+			{
+				if(footerStyle == null)
+				{
+					footerStyle = new TableItemStyle();
+					if(IsTrackingViewState)
+					{
+						footerStyle.TrackViewState();
+					}
+				}
+				return footerStyle;
+			}
+		}
+
+		public virtual TableItemStyle HeaderStyle
+		{
+			get
+			{
+				if(headerStyle == null)
+				{
+					headerStyle= new TableItemStyle();
+					if(IsTrackingViewState)
+					{
+						headerStyle.TrackViewState();
+					}
+				}
+				return headerStyle;
+			}
+		}
+
+		public virtual TableItemStyle ItemStyle
+		{
+			get
+			{
+				if(itemStyle == null)
+				{
+					itemStyle = new TableItemStyle();
+					if(IsTrackingViewState)
+					{
+						itemStyle.TrackViewState();
+					}
+				}
+				return itemStyle;
+			}
+		}
+
+		public virtual string FooterText
+		{
+			get
+			{
+				object o = ViewState["FooterText"];
+				if(o != null)
+				{
+					return (string)o;
+				}
+				return String.Empty;
+			}
+			set
+			{
+				ViewState["FooterText"] = value;
+				OnColumnChanged();
+			}
+		}
+
+		public virtual string HeaderImageUrl
+		{
+			get
+			{
+				object o = ViewState["HeaderImageUrl"];
+				if(o != null)
+				{
+					return (string)o;
+				}
+				return String.Empty;
+			}
+			set
+			{
+				ViewState["HeaderImageUrl"] = value;
+				OnColumnChanged();
+			}
+		}
+
+		public virtual string HeaderText
+		{
+			get
+			{
+				object o = ViewState["HeaderText"];
+				if(o != null)
+				{
+					return (string)o;
+				}
+				return String.Empty;
+			}
+			set
+			{
+				ViewState["HeaderText"] = value;
+				OnColumnChanged();
+			}
+		}
+
+		public virtual string SortExpression
+		{
+			get
+			{
+				object o = ViewState["SortExpression"];
+				if(o != null)
+				{
+					return (string)o;
+				}
+				return String.Empty;
+			}
+			set
+			{
+				ViewState["SortExpression"] = value;
+				OnColumnChanged();
+			}
+		}
+
+		public bool Visible
+		{
+			get
+			{
+				object o = ViewState["Visible"];
+				if(o != null)
+				{
+					return (bool)o;
+				}
+				return true;
+			}
+			set
+			{
+				ViewState["Visible"] = value;
+				OnColumnChanged();
+			}
+		}
+
+		public virtual void Initialize()
+		{
+			if(owner != null && owner.Site != null)
+			{
+				designMode = owner.Site.DesignMode;
+			}
+		}
+
+		public virtual void InitializeCell(TableCell cell, int columnIndex, ListItemType itemType)
+		{
+			switch(itemType)
+			{
+				case ListItemType.Header : InitializeCellHeader(cell, columnIndex);
+				                           break;
+				case ListItemType.Footer : InitializeCellFooter(cell, columnIndex);
+				                           break;
+				default                  : return;
+			}
+		}
+
+		private void InitializeCellHeader(TableCell cell, int columnIndex)
+		{
+			WebControl ctrl = null;
+			bool       sort = true;
+			string     sortExpr = "";
+			ImageButton headButton;
+			Image       headImage;
+			LinkButtonInternal link;
+
+			if(owner != null)
+			{
+				sort = owner.AllowSorting;
+			}
+			if(sort)
+			{
+				sortExpr = SortExpression;
+				if(sortExpr.Length == 0)
+				{
+					sort = false;
+				}
+			}
+			if(HeaderImageUrl.Length > 0)
+			{
+				if(sort)
+				{
+					headButton = new ImageButton();
+					headButton.ImageUrl = HeaderImageUrl;
+					headButton.CommandName = "Sort";
+					headButton.CommandArgument = sortExpr;
+					headButton.CausesValidation = false;
+					ctrl = headButton;
+				} else
+				{
+					headImage = new Image();
+					headImage.ImageUrl = HeaderImageUrl;
+					ctrl = headImage;
+				}
+			} else
+			{
+				if(sort)
+				{
+					link = new LinkButtonInternal();
+					link.Text = HeaderText;
+					link.CommandName = "Sort";
+					link.CommandArgument = sortExpr;
+					link.CausesValidation = false;
+					ctrl = link;
+				} else
+				{
+					if(HeaderText.Length > 0)
+					{
+						cell.Text = HeaderText;
+					} else
+					{
+						cell.Text = "&nbsp;";
+					}
+				}
+			}
+			if(ctrl != null)
+			{
+				cell.Controls.Add(ctrl);
+			}
+		}
+
+		private void InitializeCellFooter(TableCell cell, int columnIndex)
+		{
+			cell.Text = (FooterText.Length > 0 ? FooterText : "&nbsp;");
+		}
+
+		public override string ToString()
+		{
+			return String.Empty;
+		}
+
+		protected bool DesignMode
+		{
+			get
+			{
+				return designMode;
+			}
+		}
+
+		protected DataGrid Owner
+		{
+			get
+			{
+				return owner;
+			}
+		}
+
+		protected StateBag ViewState
+		{
+			get
+			{
+				return viewState;
+			}
+		}
+
+		/// <summary>
+		/// Undocumented
+		/// </summary>
+		protected virtual void OnColumnChanged()
+		{
+			if(owner != null)
+			{
+				owner.OnColumnsChanged();
+			}
+		}
+
+		protected virtual object SaveViewState()
+		{
+			object[] states = new object[4];
+			states[0] = ViewState.SaveViewState();
+			states[1] = (footerStyle == null ? null : footerStyle.SaveViewState());
+			states[2] = (headerStyle == null ? null : headerStyle.SaveViewState());
+			states[3] = (itemStyle == null ? null : itemStyle.SaveViewState());
+			return states;
+		}
+
+		protected virtual void LoadViewState(object savedState)
+		{
+			if(savedState!= null)
+			{
+				object[] states = (object[]) savedState;
+				if(states != null)
+				{
+					ViewState.LoadViewState(states[0]);
+					FooterStyle.LoadViewState(states[1]);
+					HeaderStyle.LoadViewState(states[2]);
+					ItemStyle.LoadViewState(states[3]);
+				}
+			}
+		}
+
+		protected virtual void TrackViewState()
+		{
+			marked = true;
+			ViewState.TrackViewState();
+			if(footerStyle != null)
+			{
+				footerStyle.TrackViewState();
+			}
+			if(headerStyle != null)
+			{
+				headerStyle.TrackViewState();
+			}
+			if(itemStyle != null)
+			{
+				itemStyle.TrackViewState();
+			}
+		}
+
+		protected bool IsTrackingViewState
+		{
+			get
+			{
+				return marked;
+			}
+		}
+
+		void IStateManager.LoadViewState(object savedState)
+		{
+			LoadViewState(savedState);
+		}
+
+		object IStateManager.SaveViewState()
+		{
+			return SaveViewState();
+		}
+
+		void IStateManager.TrackViewState()
+		{
+			TrackViewState();
+		}
+
+		bool IStateManager.IsTrackingViewState
+		{
+			get
+			{
+				return IsTrackingViewState;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumnCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumnCollection.cs
new file mode 100644
index 00000000000..3fce0c04af1
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridColumnCollection.cs
@@ -0,0 +1,186 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataGridColumnCollection

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  ??%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class DataGridColumnCollection : ICollection, IEnumerable, IStateManager

+	{

+		private DataGrid  owner;

+		private ArrayList columns;

+		private bool      trackViewState = false;

+

+		public DataGridColumnCollection(DataGrid owner, ArrayList columns)

+		{

+			this.owner   = owner;

+			this.columns = columns;

+		}

+

+		public int Count

+		{

+			get

+			{

+				return columns.Count;

+			}

+		}

+

+		public bool IsReadOnly

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public bool IsSynchronized

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public DataGridColumn this[int index]

+		{

+			get

+			{

+				return (DataGridColumn)(columns[index]);

+			}

+		}

+

+		public object SyncRoot

+		{

+			get

+			{

+				return this;

+			}

+		}

+

+		public void Add(DataGridColumn column)

+		{

+			AddAt(-1, column);

+		}

+

+		public void AddAt(int index, DataGridColumn column)

+		{

+			if(index == -1)

+			{

+				columns.Add(column);

+			} else

+			{

+				columns.Insert(index, column);

+			}

+			//TODO: To put. DataGridColumn class not created!

+			//column->owner = owner;

+			if(trackViewState)

+			{

+				((IStateManager)column).TrackViewState();

+			}

+			OnColumnsChanged();

+		}

+

+		internal void OnColumnsChanged()

+		{

+			if(owner != null)

+			{

+				owner.OnColumnsChanged();

+			}

+		}

+

+		public void Clear()

+		{

+			columns.Clear();

+			OnColumnsChanged();

+		}

+

+		public void CopyTo(Array array, int index)

+		{

+			foreach(DataGridColumn current in this)

+			{

+				array.SetValue(current, index++);

+			}

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			return columns.GetEnumerator();

+		}

+

+		public int IndexOf(DataGridColumn column)

+		{

+			if(column != null)

+			{

+				return columns.IndexOf(column);

+			}

+			return -1;

+		}

+

+		public void Remove(DataGridColumn column)

+		{

+			if(column != null)

+			{

+				RemoveAt(IndexOf(column));

+			}

+		}

+

+		public void RemoveAt(int index)

+		{

+			if(index >= 0 && index < columns.Count)

+			{

+				columns.RemoveAt(index);

+				OnColumnsChanged();

+			}

+			//This exception is not documented, but thrown

+			throw new ArgumentOutOfRangeException("string");

+		}

+

+		object IStateManager.SaveViewState()

+		{

+			ArrayList retVal = new ArrayList(columns.Count);

+			foreach(DataGridColumn current in this)

+			{

+				retVal.Add(((IStateManager)current).SaveViewState());

+			}

+			return retVal;

+		}

+

+		void IStateManager.LoadViewState(object savedState)

+		{

+			if(savedState != null && savedState is ArrayList)

+			{

+				int currentIndex = 0;

+				foreach(DataGridColumn current in (ArrayList)savedState)

+				{

+					((IStateManager)columns[currentIndex ++]).LoadViewState(current);

+				}

+			}

+		}

+

+		void IStateManager.TrackViewState()

+		{

+			trackViewState = true;

+		}

+

+		bool IStateManager.IsTrackingViewState

+		{

+			get

+			{

+				return trackViewState;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridCommandEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridCommandEventArgs.cs
new file mode 100644
index 00000000000..e5850371123
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridCommandEventArgs.cs
@@ -0,0 +1,46 @@
+/**

+* Namespace: System.Web.UI.WebControls

+* Class:     DataGridCommandEventArgs

+*

+* Author:  Gaurav Vaish

+* Maintainer: gvaish@iitk.ac.in

+* Implementation: yes

+* Status:  100%

+*

+* (C) Gaurav Vaish (2001)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class DataGridCommandEventArgs : CommandEventArgs

+	{

+		DataGridItem     dgItem;

+		object           cmdSrc;

+		

+		public DataGridCommandEventArgs(DataGridItem item, object commandSource, CommandEventArgs originalArgs): base(originalArgs)

+		{

+			dgItem = item;

+			cmdSrc = originalArgs;

+		}

+		

+		public object CommandSource

+		{

+			get

+			{

+				return cmdSrc;

+			}

+		}

+		

+		public DataGridItem Item

+		{

+			get

+			{

+				return dgItem;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridCommandEventHandler.cs
new file mode 100644
index 00000000000..bd06eed39f4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridCommandEventHandler.cs
@@ -0,0 +1,17 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Delegate:  DataGridCommandEventHandler

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public delegate void DataGridCommandEventHandler(object sender, DataGridCommandEventArgs e);

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItem.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItem.cs
new file mode 100644
index 00000000000..5833b0f5b3b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItem.cs
@@ -0,0 +1,86 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataGridItem

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class DataGridItem : TableRow, INamingContainer

+	{

+		private int itemIndex;

+		private int dataSetIndex;

+		private ListItemType itemType;

+		private object dataItem;

+

+		public DataGridItem(int itemIndex, int dataSetIndex, ListItemType itemType): base()

+		{

+			this.itemIndex    = itemIndex;

+			this.dataSetIndex = dataSetIndex;

+			this.itemType     = itemType;

+		}

+

+		public virtual object DataItem

+		{

+			get

+			{

+				return dataItem;

+			}

+			set

+			{

+				dataItem = value;

+			}

+		}

+

+		public virtual int DataSetIndex

+		{

+			get

+			{

+				return dataSetIndex;

+			}

+		}

+

+		public virtual int ItemIndex

+		{

+			get

+			{

+				return itemIndex;

+			}

+		}

+

+		public virtual ListItemType ItemType

+		{

+			get

+			{

+				return itemType;

+			}

+		}

+

+		protected override bool OnBubbleEvent(object source, EventArgs e)

+		{

+			if(e is CommandEventArgs)

+			{

+				DataGridCommandEventArgs args = new DataGridCommandEventArgs(this, source, (CommandEventArgs)e);

+				RaiseBubbleEvent(this, args);

+				return true;

+			}

+			return false;

+		}

+

+		protected internal virtual void SetItemType(ListItemType itemType)

+		{

+			this.itemType = itemType;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemCollection.cs
new file mode 100644
index 00000000000..8f73b541336
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemCollection.cs
@@ -0,0 +1,83 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataGridItemCollection

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class DataGridItemCollection : ICollection, IEnumerable

+	{

+		private ArrayList items;

+		

+		public DataGridItemCollection(ArrayList items)

+		{

+			this.items = items;

+		}

+		

+		public int Count

+		{

+			get

+			{

+				return items.Count;

+			}

+		}

+		

+		public bool IsReadOnly

+		{

+			get

+			{

+				return false;

+			}

+		}

+		

+		public bool IsSynchronized

+		{

+			get

+			{

+				return false;

+			}

+		}

+		

+		public DataGridItem this[int index]

+		{

+			get

+			{

+				return (DataGridItem)(items[index]);

+			}

+		}

+		

+		public object SyncRoot

+		{

+			get

+			{

+				return this;

+			}

+		}

+		

+		public void CopyTo(Array array, int index)

+		{

+			foreach(DataGridItem current in this)

+			{

+				array.SetValue(current, index++);

+			}

+		}

+		

+		public IEnumerator GetEnumerator()

+		{

+			return items.GetEnumerator();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemEventArgs.cs
new file mode 100644
index 00000000000..4418b4cf00a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemEventArgs.cs
@@ -0,0 +1,37 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataGridItemEventArgs

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class DataGridItemEventArgs : EventArgs

+	{

+		DataGridItem item;

+		

+		public DataGridItemEventArgs(DataGridItem item)

+		{

+			this.item = item;

+		}

+		

+		public DataGridItem Item

+		{

+			get

+			{

+				return item;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemEventHandler.cs
new file mode 100644
index 00000000000..de0f92cfa30
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridItemEventHandler.cs
@@ -0,0 +1,17 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Delegate:  DataGridItemEventHandler

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public delegate void DataGridItemEventHandler(object sender, DataGridItemEventArgs e);

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPageChangedEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPageChangedEventArgs.cs
new file mode 100644
index 00000000000..d63ac4940f9
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPageChangedEventArgs.cs
@@ -0,0 +1,47 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataGridPageChangedEventArgs

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class DataGridPageChangedEventArgs : EventArgs

+	{

+		private object source;

+		private int    npIndex;

+		

+		public DataGridPageChangedEventArgs(object commandSource, int newPageIndex)

+		{

+			source  = commandSource;

+			npIndex = newPageIndex;

+		}

+		

+		public object CommandSource

+		{

+			get

+			{

+				return source;

+			}

+		}

+		

+		public int NewPageIndex

+		{

+			get

+			{

+				return npIndex;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPageChangedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPageChangedEventHandler.cs
new file mode 100644
index 00000000000..83dfc6d0dde
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPageChangedEventHandler.cs
@@ -0,0 +1,16 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ *
+ * Author: Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact:  <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status: 100%
+ *
+ * (C) Gaurav Vaish (2001)
+ */
+
+namespace System.Web.UI.WebControls
+{
+	public delegate void DataGridPageChangedEventHandler(object sender, DataGridPageChangedEventArgs e);
+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs
new file mode 100644
index 00000000000..5f969b1a0da
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridPagerStyle.cs
@@ -0,0 +1,257 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataGridPagerStyle

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class DataGridPagerStyle : TableItemStyle

+	{

+		DataGrid owner;

+

+		private static int MODE         = (0x01 << 19);

+		private static int NEXT_PG_TEXT = (0x01 << 20);

+		private static int PG_BTN_COUNT = (0x01 << 21);

+		private static int POSITION     = (0x01 << 22);

+		private static int VISIBLE      = (0x01 << 23);

+		private static int PREV_PG_TEXT = (0x01 << 24);

+

+		internal DataGridPagerStyle(DataGrid owner): base()

+		{

+			this.owner = owner;

+		}

+

+		internal bool IsPagerOnTop

+		{

+			get {

+				PagerPosition p = Position;

+				return (p == PagerPosition.Top || p == PagerPosition.TopAndBottom);

+			}

+		}

+		

+		internal bool IsPagerOnBottom

+		{

+			get {

+				PagerPosition p = Position;

+				return (p == PagerPosition.Bottom || p == PagerPosition.TopAndBottom);

+			}

+		}

+		

+		public PagerMode Mode

+		{

+			get

+			{

+				if(IsSet(MODE))

+				{

+					return (PagerMode)ViewState["Mode"];

+				}

+				return PagerMode.NextPrev;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(PagerMode), value))

+				{

+					throw new NotImplementedException();

+				}

+				ViewState["Mode"] = value;

+				Set(MODE);

+			}

+		}

+

+		public string NextPageText

+		{

+			get

+			{

+				if(IsSet(NEXT_PG_TEXT))

+				{

+					return (string)ViewState["NextPageText"];

+				}

+				return "&gt;";

+			}

+			set

+			{

+				ViewState["NextPageText"] = value;

+				Set(NEXT_PG_TEXT);

+			}

+		}

+

+		public string PrevPageText

+		{

+			get

+			{

+				if(IsSet(PREV_PG_TEXT))

+				{

+					return (string)ViewState["PrevPageText"];

+				}

+				return "&lt;";

+			}

+			set

+			{

+				ViewState["PrevPageText"] = value;

+				Set(PREV_PG_TEXT);

+			}

+		}

+

+		public int PageButtonCount

+		{

+			get

+			{

+				if(IsSet(PG_BTN_COUNT))

+				{

+					return (int)ViewState["PageButtonCount"];

+				}

+				return 10;

+			}

+			set

+			{

+				ViewState["PageButtonCount"] = value;

+				Set(PG_BTN_COUNT);

+			}

+		}

+

+		public PagerPosition Position

+		{

+			get

+			{

+				if(IsSet(POSITION))

+				{

+					return (PagerPosition)ViewState["Position"];

+				}

+				return PagerPosition.Bottom;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(PagerPosition), value))

+				{

+					throw new ArgumentException();

+				}

+				ViewState["Position"] = value;

+				Set(POSITION);

+			}

+		}

+

+		public bool Visible

+		{

+			get

+			{

+				if(IsSet(VISIBLE))

+				{

+					return (bool)ViewState["Visible"];

+				}

+				return true;

+			}

+			set

+			{

+				ViewState["Visible"] = value;

+				Set(PG_BTN_COUNT);

+			}

+		}

+

+		public override void CopyFrom(Style s)

+		{

+			if(s != null && !s.IsEmpty && s is DataGridPagerStyle)

+			{

+				base.CopyFrom(s);

+				DataGridPagerStyle from = (DataGridPagerStyle)s;

+				if(from.IsSet(MODE))

+				{

+					Mode = from.Mode;

+				}

+				if(from.IsSet(NEXT_PG_TEXT))

+				{

+					NextPageText = from.NextPageText;

+				}

+				if(from.IsSet(PG_BTN_COUNT))

+				{

+					PageButtonCount = from.PageButtonCount;

+				}

+				if(from.IsSet(POSITION))

+				{

+					Position = from.Position;

+				}

+				if(from.IsSet(VISIBLE))

+				{

+					Visible = from.Visible;

+				}

+				if(from.IsSet(PREV_PG_TEXT))

+				{

+					PrevPageText = from.PrevPageText;

+				}

+			}

+		}

+

+		public override void MergeWith(Style s)

+		{

+			if(s != null && !s.IsEmpty && s is DataGridPagerStyle)

+			{

+				base.MergeWith(s);

+				DataGridPagerStyle with = (DataGridPagerStyle)s;

+				if(with.IsSet(MODE) && !IsSet(MODE))

+				{

+					Mode = with.Mode;

+				}

+				if(with.IsSet(NEXT_PG_TEXT) && !IsSet(NEXT_PG_TEXT))

+				{

+					NextPageText = with.NextPageText;

+				}

+				if(with.IsSet(PG_BTN_COUNT) && !IsSet(PG_BTN_COUNT))

+				{

+					PageButtonCount = with.PageButtonCount;

+				}

+				if(with.IsSet(POSITION) && !IsSet(POSITION))

+				{

+					Position = with.Position;

+				}

+				if(with.IsSet(VISIBLE) && !IsSet(VISIBLE))

+				{

+					Visible = with.Visible;

+				}

+				if(with.IsSet(PREV_PG_TEXT) && !IsSet(PREV_PG_TEXT))

+				{

+					PrevPageText = with.PrevPageText;

+				}

+			}

+		}

+

+		public override void Reset()

+		{

+			if(IsSet(MODE))

+			{

+				ViewState.Remove("Mode");

+			}

+			if(IsSet(NEXT_PG_TEXT))

+			{

+				ViewState.Remove("NextPageText");

+			}

+			if(IsSet(PG_BTN_COUNT))

+			{

+				ViewState.Remove("PageButtonCount");

+			}

+			if(IsSet(POSITION))

+			{

+				ViewState.Remove("Position");

+			}

+			if(IsSet(VISIBLE))

+			{

+				ViewState.Remove("Visible");

+			}

+			if(IsSet(PREV_PG_TEXT))

+			{

+				ViewState.Remove("PrevPageText");

+			}

+			base.Reset();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridSortCommandEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridSortCommandEventArgs.cs
new file mode 100644
index 00000000000..564451fbb7a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridSortCommandEventArgs.cs
@@ -0,0 +1,47 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataGridSortCommandEventArgs

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class DataGridSortCommandEventArgs : EventArgs

+	{

+		private object source;

+		private string sortExpr;

+

+		public DataGridSortCommandEventArgs(object commandSource, DataGridCommandEventArgs dce)

+		{

+			source   = commandSource;

+			sortExpr = (string)dce.CommandArgument;

+		}

+

+		public object CommandSource

+		{

+			get

+			{

+				return source;

+			}

+		}

+

+		public string SortExpression

+		{

+			get

+			{

+				return sortExpr;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataGridSortCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridSortCommandEventHandler.cs
new file mode 100644
index 00000000000..b9a1d2653b7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataGridSortCommandEventHandler.cs
@@ -0,0 +1,16 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ *
+ * Author: Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact:  <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status: 100%
+ *
+ * (C) Gaurav Vaish (2001)
+ */
+
+namespace System.Web.UI.WebControls
+{
+	public delegate void DataGridSortCommandEventHandler(object sender, DataGridSortCommandEventArgs e);
+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataKeyCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataKeyCollection.cs
new file mode 100644
index 00000000000..f4a010ac49b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataKeyCollection.cs
@@ -0,0 +1,83 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataKeyCollection

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class DataKeyCollection : ICollection, IEnumerable

+	{

+		private ArrayList keys;

+

+		public DataKeyCollection(ArrayList keys)

+		{

+			this.keys = keys;

+		}

+

+		public int Count

+		{

+			get

+			{

+				return keys.Count;

+			}

+		}

+

+		public bool IsReadOnly

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public bool IsSynchronized

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public object this[int index]

+		{

+			get

+			{

+				return keys[index];

+			}

+		}

+

+		public object SyncRoot

+		{

+			get

+			{

+				return this;

+			}

+		}

+

+		public void CopyTo(Array array, int index)

+		{

+			foreach(object current in this)

+			{

+				array.SetValue(current, index++);

+			}

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			return keys.GetEnumerator();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
new file mode 100755
index 00000000000..5d331aef02c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataList.cs
@@ -0,0 +1,825 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataList

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  70%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	//TODO: [Designer("??")]

+	//TODO: [Editor("??")]

+	public class DataList: BaseDataList, INamingContainer, IRepeatInfoUser

+	{

+		public const string CancelCommandName = "Cancel";

+		public const string DeleteCommandName = "Delete";

+		public const string EditCommandName   = "Edit";

+		public const string SelectCommandName = "Select";

+		public const string UpdateCommandName = "Update";

+

+		private static readonly object CancelCommandEvent = new object();

+		private static readonly object DeleteCommandEvent = new object();

+		private static readonly object EditCommandEvent   = new object();

+		private static readonly object ItemCommandEvent   = new object();

+		private static readonly object ItemCreatedEvent   = new object();

+		private static readonly object ItemDataBoundEvent = new object();

+		private static readonly object UpdateCommandEvent = new object();

+

+		private TableItemStyle alternatingItemStyle;

+		private TableItemStyle editItemStyle;

+		private TableItemStyle footerStyle;

+		private TableItemStyle headerStyle;

+		private TableItemStyle itemStyle;

+		private TableItemStyle selectedItemStyle;

+		private TableItemStyle separatorStyle;

+

+		private ITemplate alternatingItemTemplate;

+		private ITemplate editItemTemplate;

+		private ITemplate footerTemplate;

+		private ITemplate headerTemplate;

+		private ITemplate itemTemplate;

+		private ITemplate selectedItemTemplate;

+		private ITemplate separatorTemplate;

+		private ITemplate separatorItemTemplate;

+

+		private ArrayList itemsArray;

+		private DataListItemCollection items;

+

+		private bool extractTemplateRows;

+

+		public DataList(): base()

+		{

+		}

+

+		public virtual TableItemStyle AlternatingItemStyle

+		{

+			get

+			{

+				if(alternatingItemStyle == null)

+				{

+					alternatingItemStyle = new TableItemStyle();

+					if(IsTrackingViewState)

+						alternatingItemStyle.TrackViewState();

+				}

+				return alternatingItemStyle;

+			}

+		}

+

+		public virtual ITemplate AlternatingItemTemplate

+		{

+			get

+			{

+				return alternatingItemTemplate;

+			}

+			set

+			{

+				alternatingItemTemplate = value;

+			}

+		}

+

+		public virtual int EditItemIndex

+		{

+			get

+			{

+				object o = ViewState["EditItemIndex"];

+				if(o != null)

+					return (int)o;

+				return -1;

+			}

+			set

+			{

+				ViewState["EditItemIndex"] = value;

+			}

+		}

+

+		public virtual TableItemStyle EditItemStyle

+		{

+			get

+			{

+				if(editItemStyle == null)

+				{

+					editItemStyle = new TableItemStyle();

+					if(IsTrackingViewState)

+						editItemStyle.TrackViewState();

+				}

+				return editItemStyle;

+			}

+		}

+

+		public virtual ITemplate EditItemTemplate

+		{

+			get

+			{

+				return editItemTemplate;

+			}

+			set

+			{

+				editItemTemplate = value;

+			}

+		}

+

+		public virtual bool ExtractTemplateRows

+		{

+			get

+			{

+				object o = ViewState["ExtractTemplateRows"];

+				if(o != null)

+					return (bool)o;

+				return false;

+			}

+			set

+			{

+				ViewState["ExtractTemplateRows"] = value;

+			}

+		}

+

+		public virtual TableItemStyle FooterStyle

+		{

+			get

+			{

+				if(footerStyle == null)

+				{

+					footerStyle = new TableItemStyle();

+					if(IsTrackingViewState)

+						footerStyle.TrackViewState();

+				}

+				return footerStyle;

+			}

+		}

+

+		public virtual ITemplate FooterTemplate

+		{

+			get

+			{

+				return footerTemplate;

+			}

+			set

+			{

+				footerTemplate = value;

+			}

+		}

+

+		public override GridLines GridLines

+		{

+			get

+			{

+				return GridLines;

+			}

+			set

+			{

+				GridLines = value;

+			}

+		}

+

+		public virtual TableItemStyle HeaderStyle

+		{

+			get

+			{

+				if(headerStyle == null)

+				{

+					headerStyle = new TableItemStyle();

+					if(IsTrackingViewState)

+						headerStyle.TrackViewState();

+				}

+				return headerStyle;

+			}

+		}

+

+		public virtual ITemplate HeaderTemplate

+		{

+			get

+			{

+				return headerTemplate;

+			}

+			set

+			{

+				headerTemplate = value;

+			}

+		}

+

+		public virtual DataListItemCollection Items

+		{

+			get

+			{

+				if(items == null)

+				{

+					if(itemsArray == null)

+					{

+						EnsureChildControls();

+						itemsArray = new ArrayList();

+					}

+					items = new DataListItemCollection(itemsArray);

+				}

+				return items;

+			}

+		}

+

+		public virtual TableItemStyle ItemStyle

+		{

+			get

+			{

+				if(itemStyle == null)

+				{

+					itemStyle = new TableItemStyle();

+					if(IsTrackingViewState)

+						itemStyle.TrackViewState();

+				}

+				return itemStyle;

+			}

+		}

+

+		public virtual ITemplate ItemTemplate

+		{

+			get

+			{

+				return itemTemplate;

+			}

+			set

+			{

+				itemTemplate = value;

+			}

+		}

+

+		public virtual int RepeatColumns

+		{

+			get

+			{

+				object o = ViewState["RepeatColumns"];

+				if(o != null)

+					return (int)o;

+				return 0;

+			}

+			set

+			{

+				if(value < 0)

+					throw new ArgumentOutOfRangeException("value");

+				ViewState["RepeatColumns"] = value;

+			}

+		}

+

+		public virtual RepeatDirection RepeatDirection

+		{

+			get

+			{

+				object o = ViewState["RepeatDirection"];

+				if(o != null)

+					return (RepeatDirection)o;

+				return RepeatDirection.Vertical;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(RepeatDirection), value))

+					throw new ArgumentException();

+				ViewState["RepeatDirection"] = value;

+			}

+		}

+

+		public virtual RepeatLayout RepeatLayout

+		{

+			get

+			{

+				object o = ViewState["RepeatLayout"];

+				if(o != null)

+					return (RepeatLayout)o;

+				return RepeatLayout.Table;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(RepeatLayout), value))

+					throw new ArgumentException();

+				ViewState["RepeatLayout"] = value;

+			}

+		}

+

+		public virtual int SelectedIndex

+		{

+			get

+			{

+				object o = ViewState["SelectedIndex"];

+				if(o != null)

+					return (int)o;

+				return -1;

+			}

+			set

+			{

+				//FIXME: Looks like a bug in Microsoft's specs.

+				// Exception is missing in document. I haven't tested the case

+				// But I think exception should follow

+				if(value < -1)

+					throw new ArgumentOutOfRangeException("value");

+				int prevSel = SelectedIndex;

+				ViewState["SelectedIndex"] = value;

+				DataListItem prevSelItem;

+				ListItemType liType;

+				if(itemsArray != null)

+				{

+					if(prevSel >= 0 && prevSel < itemsArray.Count)

+					{

+						prevSelItem = (DataListItem)itemsArray[prevSel];

+						if(prevSelItem.ItemType != ListItemType.EditItem)

+						{

+							liType = ( (prevSel % 2) == 0 ? ListItemType.AlternatingItem : ListItemType.Item );

+							prevSelItem.SetItemType(liType);

+						}

+					}

+					if(value >= 0 && value < itemsArray.Count)

+					{

+						prevSelItem = (DataListItem) itemsArray[value];

+						if(prevSelItem.ItemType != ListItemType.EditItem)

+						{

+							prevSelItem.SetItemType(ListItemType.SelectedItem);

+						}

+					}

+				}

+			}

+		}

+

+		public virtual DataListItem SelectedItem

+		{

+			get

+			{

+				if(SelectedIndex == -1)

+					return null;

+				return Items[SelectedIndex];

+			}

+		}

+

+		public virtual TableItemStyle SelectedItemStyle

+		{

+			get

+			{

+				if(selectedItemStyle == null)

+				{

+					selectedItemStyle = new TableItemStyle();

+					if(IsTrackingViewState)

+						selectedItemStyle.TrackViewState();

+				}

+				return selectedItemStyle;

+			}

+		}

+

+		public virtual ITemplate SelectedItemTemplate

+		{

+			get

+			{

+				return selectedItemTemplate;

+			}

+			set

+			{

+				selectedItemTemplate = value;

+			}

+		}

+

+		public virtual TableItemStyle SeparatorStyle

+		{

+			get

+			{

+				if(separatorStyle == null)

+				{

+					separatorStyle = new TableItemStyle();

+					if(IsTrackingViewState)

+						separatorStyle.TrackViewState();

+				}

+				return separatorStyle;

+			}

+		}

+

+		public virtual ITemplate SeparatorTemplate

+		{

+			get

+			{

+				return separatorTemplate;

+			}

+			set

+			{

+				separatorTemplate = value;

+			}

+		}

+

+		public virtual ITemplate SeparatorItemTemplate

+		{

+			get

+			{

+				return separatorItemTemplate;

+			}

+			set

+			{

+				separatorItemTemplate = value;

+			}

+		}

+

+		public virtual bool ShowHeader

+		{

+			get

+			{

+				object o = ViewState["ShowHeader"];

+				if(o!=null)

+					return (bool)o;

+				return true;

+			}

+			set

+			{

+				ViewState["ShowHeader"] = value;

+			}

+		}

+

+		public virtual bool ShowFooter

+		{

+			get

+			{

+				object o = ViewState["ShowFooter"];

+				if(o!=null)

+					return (bool)o;

+				return true;

+			}

+			set

+			{

+				ViewState["ShowFooter"] = value;

+			}

+		}

+

+		public event DataListCommandEventHandler CancelCommand

+		{

+			add

+			{

+				Events.AddHandler(CancelCommandEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(CancelCommandEvent, value);

+			}

+		}

+

+		public event DataListCommandEventHandler DeleteCommand

+		{

+			add

+			{

+				Events.AddHandler(DeleteCommandEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(DeleteCommandEvent, value);

+			}

+		}

+

+		public event DataListCommandEventHandler EditCommand

+		{

+			add

+			{

+				Events.AddHandler(EditCommandEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(EditCommandEvent, value);

+			}

+		}

+

+		public event DataListCommandEventHandler ItemCommand

+		{

+			add

+			{

+				Events.AddHandler(ItemCommandEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(ItemCommandEvent, value);

+			}

+		}

+

+		public event DataListCommandEventHandler ItemCreated

+		{

+			add

+			{

+				Events.AddHandler(ItemCreatedEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(ItemCreatedEvent, value);

+			}

+		}

+

+		public event DataListCommandEventHandler ItemDataBound

+		{

+			add

+			{

+				Events.AddHandler(ItemDataBoundEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(ItemDataBoundEvent, value);

+			}

+		}

+

+		public event DataListCommandEventHandler UpdateCommand

+		{

+			add

+			{

+				Events.AddHandler(UpdateCommandEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(UpdateCommandEvent, value);

+			}

+		}

+

+		protected override Style CreateControlStyle()

+		{

+			TableStyle retVal = new TableStyle(ViewState);

+			retVal.CellSpacing = 0;

+			return retVal;

+		}

+

+		protected override void LoadViewState(object savedState)

+		{

+			object[] states;

+			if(savedState != null && (states = (object[])savedState) != null)

+			{

+				if(states[0] != null)

+					LoadViewState(states[0]);

+				if(states[1] != null)

+					alternatingItemStyle.LoadViewState(states[1]);

+				if(states[2] != null)

+					editItemStyle.LoadViewState(states[2]);

+				if(states[3] != null)

+					footerStyle.LoadViewState(states[3]);

+				if(states[4] != null)

+					headerStyle.LoadViewState(states[4]);

+				if(states[5] != null)

+					itemStyle.LoadViewState(states[5]);

+				if(states[6] != null)

+					selectedItemStyle.LoadViewState(states[6]);

+				if(states[7] != null)

+					separatorStyle.LoadViewState(states[7]);

+			}

+		}

+		protected override object SaveViewState()

+		{

+			object[] states = new object[8];

+			states[0] = SaveViewState();

+			states[1] = (alternatingItemStyle == null ? null : alternatingItemStyle.SaveViewState());

+			states[2] = (editItemStyle == null        ? null : editItemStyle.SaveViewState());

+			states[3] = (footerStyle == null          ? null : footerStyle.SaveViewState());

+			states[4] = (headerStyle == null          ? null : headerStyle.SaveViewState());

+			states[5] = (itemStyle == null            ? null : itemStyle.SaveViewState());

+			states[6] = (selectedItemStyle == null    ? null : selectedItemStyle.SaveViewState());

+			states[7] = (separatorStyle == null       ? null : separatorStyle.SaveViewState());

+			return states;

+		}

+

+		protected override void TrackViewState()

+		{

+			TrackViewState();

+			if(alternatingItemStyle != null)

+				alternatingItemStyle.TrackViewState();

+			if(editItemStyle != null)

+				editItemStyle.TrackViewState();

+			if(footerStyle != null)

+				footerStyle.TrackViewState();

+			if(headerStyle != null)

+				headerStyle.TrackViewState();

+			if(itemStyle != null)

+				itemStyle.TrackViewState();

+			if(selectedItemStyle != null)

+				selectedItemStyle.TrackViewState();

+			if(separatorStyle != null)

+				separatorStyle.TrackViewState();

+		}

+

+		protected override bool OnBubbleEvent(object source, EventArgs e)

+		{

+			bool retVal = false;

+			if(e is DataListCommandEventArgs)

+			{

+				DataListCommandEventArgs dlcea = (DataListCommandEventArgs)e;

+				OnItemCommand(dlcea);

+				retVal = true;

+				if(String.Compare(dlcea.CommandName, "Cancel") == 0)

+				{

+					OnCancelCommand(dlcea);

+				}

+				if(String.Compare(dlcea.CommandName, "Delete") == 0)

+				{

+					OnDeleteCommand(dlcea);

+				}

+				if(String.Compare(dlcea.CommandName, "Edit") == 0)

+				{

+					OnEditCommand(dlcea);

+				}

+				if(String.Compare(dlcea.CommandName, "Select") == 0)

+				{

+					SelectedIndex = dlcea.Item.ItemIndex;

+					OnSelectedIndexChanged(EventArgs.Empty);

+				}

+				if(String.Compare(dlcea.CommandName, "Update") == 0)

+				{

+					OnUpdateCommand(dlcea);

+				}

+			}

+			return retVal;

+		}

+

+		protected virtual void OnCancelCommand(DataListCommandEventArgs e)

+		{

+			if(Events != null)

+			{

+				DataListCommandEventHandler dlceh = (DataListCommandEventHandler)(Events[CancelCommandEvent]);

+				if(dlceh != null)

+					dlceh(this, e);

+			}

+		}

+

+		protected virtual void OnDeleteCommand(DataListCommandEventArgs e)

+		{

+			if(Events != null)

+			{

+				DataListCommandEventHandler dlceh = (DataListCommandEventHandler)(Events[DeleteCommandEvent]);

+				if(dlceh != null)

+					dlceh(this, e);

+			}

+		}

+

+		protected virtual void OnEditCommand(DataListCommandEventArgs e)

+		{

+			if(Events != null)

+			{

+				DataListCommandEventHandler dlceh = (DataListCommandEventHandler)(Events[EditCommandEvent]);

+				if(dlceh != null)

+					dlceh(this, e);

+			}

+		}

+

+		protected virtual void OnItemCommand(DataListCommandEventArgs e)

+		{

+			if(Events != null)

+			{

+				DataListCommandEventHandler dlceh = (DataListCommandEventHandler)(Events[ItemCommandEvent]);

+				if(dlceh != null)

+					dlceh(this, e);

+			}

+		}

+

+		protected virtual void OnItemCreated(DataListItemEventArgs e)

+		{

+			if(Events != null)

+			{

+				DataListItemEventHandler dlceh = (DataListItemEventHandler)(Events[ItemCreatedEvent]);

+				if(dlceh != null)

+					dlceh(this, e);

+			}

+		}

+

+		protected virtual void OnItemDataBound(DataListItemEventArgs e)

+		{

+			if(Events != null)

+			{

+				DataListItemEventHandler dlceh = (DataListItemEventHandler)(Events[ItemDataBoundEvent]);

+				if(dlceh != null)

+					dlceh(this, e);

+			}

+		}

+

+		protected virtual void OnUpdateCommand(DataListCommandEventArgs e)

+		{

+			if(Events != null)

+			{

+				DataListCommandEventHandler dlceh = (DataListCommandEventHandler)(Events[UpdateCommandEvent]);

+				if(dlceh != null)

+					dlceh(this, e);

+			}

+		}

+

+		[MonoTODO]

+		protected override void RenderContents(HtmlTextWriter writer)

+		{

+			throw new NotImplementedException();

+		}

+

+		[MonoTODO]

+		private DataListItem GetItem(ListItemType itemType, int repeatIndex)

+		{

+			DataListItem retVal = null;

+			switch(itemType)

+			{

+				case ListItemType.Header: retVal = (DataListItem)Controls[0];

+				                          break;

+				case ListItemType.Footer: retVal = (DataListItem)Controls[Controls.Count - 1];

+				                          break;

+				case ListItemType.Item:   goto case ListItemType.EditItem;

+				case ListItemType.AlternatingItem: goto case ListItemType.EditItem;

+				case ListItemType.SelectedItem: goto case ListItemType.EditItem;

+				case ListItemType.EditItem: retVal = (DataListItem)Controls[repeatIndex];

+				                           break;

+				case ListItemType.Separator: int index = 2 * repeatIndex + 1;

+				                             if(headerTemplate != null)

+				                             	index ++;

+				                             retVal = (DataListItem)Controls[index];

+				                             break;

+			}

+			return retVal;

+		}

+

+		/// <summary>

+		/// Undocumented

+		/// </summary>

+		[MonoTODO]

+		protected override void CreateControlHierarchy(bool create)

+		{

+			throw new NotImplementedException();

+		}

+

+		/// <summary>

+		/// Undocumented

+		/// </summary>

+		[MonoTODO]

+		protected virtual DataListItem CreateItem(int itemIndex, ListItemType itemType)

+		{

+			throw new NotImplementedException();

+		}

+

+		[MonoTODO]

+		private DataListItem CreateItem(int itemIndex, ListItemType itemType, bool dataBind, object dataItem)

+		{

+			throw new NotImplementedException();

+		}

+

+		/// <summary>

+		/// Undocumented

+		/// </summary>

+		[MonoTODO]

+		protected override void PrepareControlHierarchy()

+		{

+			throw new NotImplementedException();

+		}

+

+		/// <summary>

+		/// Undocumented

+		/// </summary>

+		[MonoTODO]

+		protected virtual void InitializeItem(DataListItem item)

+		{

+			throw new NotImplementedException();

+		}

+

+		bool IRepeatInfoUser.HasFooter

+		{

+			get

+			{

+				return !(ShowFooter && footerTemplate!=null);

+			}

+		}

+

+		bool IRepeatInfoUser.HasHeader

+		{

+			get

+			{

+				return !(ShowHeader && headerTemplate!=null);

+			}

+		}

+

+		bool IRepeatInfoUser.HasSeparators

+		{

+			get

+			{

+				return (separatorItemTemplate!=null);

+			}

+		}

+

+		int IRepeatInfoUser.RepeatedItemCount

+		{

+			get

+			{

+				if(itemsArray!=null)

+					return itemsArray.Count;

+				return 0;

+			}

+		}

+

+		void IRepeatInfoUser.RenderItem(ListItemType itemType, int repeatIndex, RepeatInfo repeatInfo, HtmlTextWriter writer)

+		{

+			DataListItem item = GetItem(itemType, repeatIndex);

+			if(item!=null)

+			{

+				item.RenderItem(writer, extractTemplateRows, repeatInfo.RepeatLayout == RepeatLayout.Table);

+			}

+		}

+

+		Style IRepeatInfoUser.GetItemStyle(ListItemType itemType, int repeatIndex)

+		{

+			if(GetItem(itemType, repeatIndex)!=null && ControlStyleCreated)

+				return ControlStyle;

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataListCommandEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataListCommandEventArgs.cs
new file mode 100644
index 00000000000..93511a27730
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataListCommandEventArgs.cs
@@ -0,0 +1,46 @@
+/**

+* Namespace: System.Web.UI.WebControls

+* Class:     DataListCommandEventArgs

+*

+* Author:  Gaurav Vaish

+* Maintainer: gvaish@iitk.ac.in

+* Implementation: yes

+* Status:  100%

+*

+* (C) Gaurav Vaish (2001)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class DataListCommandEventArgs: CommandEventArgs

+	{

+		private DataListItem dlItem;

+		private object       cmdSrc;

+		

+		public DataListCommandEventArgs(DataListItem item, object commandSource, CommandEventArgs originalArgs): base(originalArgs)

+		{

+			dlItem = item;

+			cmdSrc = commandSource;

+		}

+		

+		public object CommandSource

+		{

+			get

+			{

+				return cmdSrc;

+			}

+		}

+		

+		public DataListItem Item

+		{

+			get

+			{

+				return dlItem;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataListCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataListCommandEventHandler.cs
new file mode 100644
index 00000000000..59df1b2fe50
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataListCommandEventHandler.cs
@@ -0,0 +1,16 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ *
+ * Author: Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact:  <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status: 100%
+ *
+ * (C) Gaurav Vaish (2001)
+ */
+
+namespace System.Web.UI.WebControls
+{
+	public delegate void DataListCommandEventHandler(object sender, DataListCommandEventArgs e);
+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs
new file mode 100644
index 00000000000..8c820047a8a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItem.cs
@@ -0,0 +1,112 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataListItem

+ *

+ * Authors:  Gaurav Vaish, Gonzalo Paniagua (gonzalo@ximian.com)

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ * (c) 2002 Ximian, Inc. (http://www.ximian.com)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[ToolboxItem(false)]

+	public class DataListItem : WebControl, INamingContainer

+	{

+		int itemIndex;

+		ListItemType itemType;

+		object dataItem;

+

+		public DataListItem(int itemIndex, ListItemType itemType)

+		{

+			this.itemIndex = itemIndex;

+			this.itemType  = itemType;

+		}

+

+		public virtual object DataItem

+		{

+			get

+			{

+				return dataItem;

+			}

+			set

+			{

+				dataItem = value;

+			}

+		}

+

+		public virtual int ItemIndex

+		{

+			get

+			{

+				return itemIndex;

+			}

+		}

+

+		public virtual ListItemType ItemType

+		{

+			get

+			{

+				return itemType;

+			}

+		}

+

+		public virtual void RenderItem (HtmlTextWriter writer, bool extractRows, bool tableLayout)

+		{

+			if (extractRows){

+				Table tbl = null;

+				foreach (Control ctrl in Controls){

+					if (ctrl is Table){

+						tbl = (Table) ctrl;

+						break;

+					}

+				}

+				

+				if (tbl == null)

+					throw new HttpException ("Template table not found!");

+

+				foreach (TableRow row in tbl.Rows)

+					row.RenderControl (writer);

+			} else {

+				if (tableLayout)

+					RenderContents (writer);

+				else

+					RenderControl (writer);

+			}

+

+		}

+

+		protected override Style CreateControlStyle()

+		{

+			return new TableItemStyle();

+		}

+

+		protected override bool OnBubbleEvent(object source, EventArgs e)

+		{

+			if(e is CommandEventArgs)

+			{

+				RaiseBubbleEvent(this, new DataListCommandEventArgs(this, source, (CommandEventArgs)e));

+				return true;

+			}

+			return false;

+		}

+

+		protected internal virtual void SetItemType(ListItemType itemType)

+		{

+			if(Enum.IsDefined(typeof(ListItemType), itemType))

+			{

+				this.itemType = itemType;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemCollection.cs
new file mode 100644
index 00000000000..b98df0906d1
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemCollection.cs
@@ -0,0 +1,83 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataListItemCollection

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class DataListItemCollection : ICollection, IEnumerable

+	{

+		private ArrayList items;

+

+		public DataListItemCollection(ArrayList items)

+		{

+			this.items = items;

+		}

+

+		public int Count

+		{

+			get

+			{

+				return items.Count;

+			}

+		}

+

+		public bool IsReadOnly

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public bool IsSynchronized

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public DataListItem this[int index]

+		{

+			get

+			{

+				return (DataListItem)(items[index]);

+			}

+		}

+

+		public object SyncRoot

+		{

+			get

+			{

+				return this;

+			}

+		}

+

+		public void CopyTo(Array array, int index)

+		{

+			foreach(DataListItem current in this)

+			{

+				array.SetValue(current, index++);

+			}

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			return items.GetEnumerator();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemEventArgs.cs
new file mode 100644
index 00000000000..f9488bea1a6
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemEventArgs.cs
@@ -0,0 +1,37 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DataListItemEventArgs

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class DataListItemEventArgs : EventArgs

+	{

+		private DataListItem item;

+

+		public DataListItemEventArgs(DataListItem item)

+		{

+			this.item = item;

+		}

+		

+		public DataListItem Item

+		{

+			get

+			{

+				return item;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemEventHandler.cs
new file mode 100644
index 00000000000..3310857658d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DataListItemEventHandler.cs
@@ -0,0 +1,16 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ *
+ * Author: Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact:  <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status: 100%
+ *
+ * (C) Gaurav Vaish (2001)
+ */
+
+namespace System.Web.UI.WebControls
+{
+	public delegate void DataListItemEventHandler(object sender, DataListItemEventArgs e);
+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DayNameFormat.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DayNameFormat.cs
new file mode 100755
index 00000000000..39aaffb4b83
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DayNameFormat.cs
@@ -0,0 +1,23 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     DayNameFormat

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum DayNameFormat

+	{

+		Full,

+		Short,

+		FirstLetter,

+		FirstTwoLetters

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DayRenderEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DayRenderEventArgs.cs
new file mode 100644
index 00000000000..a7e50cf9cdd
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DayRenderEventArgs.cs
@@ -0,0 +1,43 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Delegate:  DayRenderEventArgs

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class DayRenderEventArgs

+	{

+		private TableCell   cell;

+		private CalendarDay day;

+		

+		public DayRenderEventArgs(TableCell cell, CalendarDay day)

+		{

+			this.cell = cell;

+			this.day  = day;

+		}

+		

+		public TableCell Cell

+		{

+			get

+			{

+				return cell;

+			}

+		}

+		

+		public CalendarDay Day

+		{

+			get

+			{

+				return day;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DayRenderEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DayRenderEventHandler.cs
new file mode 100644
index 00000000000..1501321ffb9
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DayRenderEventHandler.cs
@@ -0,0 +1,17 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Delegate:  DayRenderEventHandler

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public delegate void DayRenderEventHandler(object sender, DayRenderEventArgs e);

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/DropDownList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/DropDownList.cs
new file mode 100644
index 00000000000..6f05c7eab35
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/DropDownList.cs
@@ -0,0 +1,160 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     DropDownList

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Drawing;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[ValidationProperty("SelectedItem")]

+	public class DropDownList : ListControl, IPostBackDataHandler

+	{

+		public DropDownList(): base()

+		{

+		}

+

+		public override Color BorderColor

+		{

+			get

+			{

+				return base.BorderColor;

+			}

+			set

+			{

+				base.BorderColor = value;

+			}

+		}

+

+		public override BorderStyle BorderStyle

+		{

+			get

+			{

+				return base.BorderStyle;

+			}

+			set

+			{

+				base.BorderStyle = value;

+			}

+		}

+

+		public override Unit BorderWidth

+		{

+			get

+			{

+				return base.BorderWidth;

+			}

+			set

+			{

+				base.BorderWidth = value;

+			}

+		}

+

+		public override int SelectedIndex

+		{

+			get

+			{

+				int index  = base.SelectedIndex;

+				if (index < 0 && Items.Count > 0) {

+					index = 0;

+					Items [0].Selected = true;

+				}

+				return index;

+			}

+			set

+			{

+				base.SelectedIndex = value;

+			}

+		}

+

+		public override string ToolTip

+		{

+			// MS ignores the tooltip for this one

+			get {

+				return String.Empty;

+			}

+			set {

+			}

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			if(Page != null)

+			{

+				Page.VerifyRenderingInServerForm(this);

+			}

+			writer.AddAttribute(HtmlTextWriterAttribute.Name, UniqueID);

+			base.AddAttributesToRender(writer);

+

+			if(AutoPostBack && Page != null)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Onchange, Page.GetPostBackClientEvent(this,""));

+				writer.AddAttribute("language", "javascript");

+			}

+		}

+

+		protected override ControlCollection CreateControlCollection()

+		{

+			return new EmptyControlCollection(this);

+		}

+

+		protected override void RenderContents(HtmlTextWriter writer)

+		{

+			if(Items != null)

+			{

+				bool selected = false;

+				foreach(ListItem current in Items)

+				{

+					writer.WriteBeginTag("option");

+					if(current.Selected)

+					{

+						if(selected)

+						{

+							throw new HttpException(HttpRuntime.FormatResourceString("Cannot_Multiselect_In_DropDownList"));

+						}

+						selected = true;

+						writer.WriteAttribute("selected", "selected", false);

+					}

+					writer.WriteAttribute("value", current.Value, true);

+					writer.Write('>');

+					HttpUtility.HtmlEncode(current.Text, writer);

+					writer.WriteEndTag("option");

+					writer.WriteLine();

+				}

+			}

+		}

+

+		bool IPostBackDataHandler.LoadPostData(string postDataKey, NameValueCollection postCollection)

+		{

+			string[] vals = postCollection.GetValues(postDataKey);

+			if(vals != null)

+			{

+				int index = Items.FindByValueInternal(vals[0]);

+				if(index != SelectedIndex)

+				{

+					SelectedIndex = index;

+					return true;

+				}

+			}

+			return false;

+		}

+

+		void IPostBackDataHandler.RaisePostDataChangedEvent()

+		{

+			OnSelectedIndexChanged(EventArgs.Empty);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/EditCommandColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/EditCommandColumn.cs
new file mode 100644
index 00000000000..7779f07ce11
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/EditCommandColumn.cs
@@ -0,0 +1,109 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     EditCommandColumn

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  95%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class EditCommandColumn : DataGridColumn

+	{

+		public EditCommandColumn(): base()

+		{

+		}

+		

+		public virtual ButtonColumnType ButtonType

+		{

+			get

+			{

+				object o = ViewState["ButtonType"];

+				if(o != null)

+				{

+					return (ButtonColumnType)o;

+				}

+				return ButtonColumnType.LinkButton;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(ButtonColumnType), value))

+				{

+					throw new ArgumentException();

+				}

+				ViewState["ButtonType"] = value;

+				OnColumnChanged();

+			}

+		}

+

+		public virtual string CancelText

+		{

+			get

+			{

+				object o = ViewState["CancelText"];

+				if(o != null)

+				{

+					return (string)o;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["CancelText"] = value;

+				OnColumnChanged();

+			}

+		}

+

+		public virtual string EditText

+		{

+			get

+			{

+				object o = ViewState["EditText"];

+				if(o != null)

+				{

+					return (string)o;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["EditText"] = value;

+				OnColumnChanged();

+			}

+		}

+

+		public virtual string UpdateText

+		{

+			get

+			{

+				object o = ViewState["UpdateText"];

+				if(o != null)

+				{

+					return (string)o;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["UpdateText"] = value;

+				OnColumnChanged();

+			}

+		}

+		

+		[MonoTODO]

+		public override void InitializeCell(TableCell cell, int columnIndex, ListItemType itemType)

+		{

+			base.InitializeCell(cell, columnIndex, itemType);

+			//TODO: I have to read some documents.

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FirstDayOfWeek.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FirstDayOfWeek.cs
new file mode 100755
index 00000000000..3b618c7acbf
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FirstDayOfWeek.cs
@@ -0,0 +1,27 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     FirstDayOfWeek

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum FirstDayOfWeek

+	{

+		Sunday,

+		Monday,

+		Tuesday,

+		Wednesday,

+		Thursday,

+		Friday,

+		Saturday,

+		Default

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FontInfo.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FontInfo.cs
new file mode 100755
index 00000000000..1dcf22b9c7a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FontInfo.cs
@@ -0,0 +1,253 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     FontInfo

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Text;

+using System.Reflection;

+using System.Web;

+using System.Web.UI;

+using System.Drawing;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[TypeConverter(typeof(ExpandableObjectConverter))]

+	public sealed class FontInfo

+	{

+		private Style infoOwner;				

+		

+		internal FontInfo(Style owner)

+		{

+			infoOwner = owner;

+		}

+		

+		/// <summary>

+		/// Default constructor

+		/// <remarks>

+		/// The default constructor is made private to prevent any instances being made.

+		/// </remarks>

+		/// </summary>

+		private FontInfo()

+		{

+		}

+		

+		public bool Bold

+		{

+			get

+			{

+				if(infoOwner.IsSet(Style.FONT_BOLD))

+					return (bool)(infoOwner.ViewState["FontInfoBold"]);

+				return false;

+			}

+			set

+			{

+				infoOwner.ViewState["FontInfoBold"] = value;

+				infoOwner.Set(Style.FONT_BOLD);

+			}

+		}

+		

+		public bool Italic

+		{

+			get

+			{

+				if(infoOwner.IsSet(Style.FONT_ITALIC))

+					return (bool)(infoOwner.ViewState["FontInfoItalic"]);

+				return false;

+			}

+			set

+			{

+				infoOwner.ViewState["FontInfoItalic"] = value;

+				infoOwner.Set(Style.FONT_ITALIC);

+			}

+		}

+		

+		public bool Overline

+		{

+			get

+			{

+				if(infoOwner.IsSet(Style.FONT_OLINE))

+					return (bool)(infoOwner.ViewState["FontInfoOverline"]);

+				return false;

+			}

+			set

+			{

+				infoOwner.ViewState["FontInfoOverline"] = value;

+				infoOwner.Set(Style.FONT_OLINE);

+			}

+		}

+		

+		public bool Strikeout

+		{

+			get

+			{

+				if(infoOwner.IsSet(Style.FONT_STRIKE))

+					return (bool)(infoOwner.ViewState["FontInfoStrikeout"]);

+				return false;

+			}

+			set

+			{

+				infoOwner.ViewState["FontInfoStrikeout"] = value;

+				infoOwner.Set(Style.FONT_STRIKE);

+			}

+		}

+		

+		public bool Underline

+		{

+			get

+			{

+				if(infoOwner.IsSet(Style.FONT_ULINE))

+					return (bool)(infoOwner.ViewState["FontInfoUnderline"]);

+				return false;

+			}

+			set

+			{

+				infoOwner.ViewState["FontInfoUnderline"] = value;

+				infoOwner.Set(Style.FONT_ULINE);

+			}

+		}

+		

+		//TODO: How do I check if the value is negative. FontUnit is struct not enum

+		public FontUnit Size

+		{

+			get

+			{

+				if(infoOwner.IsSet(Style.FONT_SIZE))

+					return (FontUnit)(infoOwner.ViewState["FontInfoSize"]);

+				return FontUnit.Empty;

+			}

+			set

+			{

+				infoOwner.ViewState["FontInfoSize"] = value;

+				infoOwner.Set(Style.FONT_SIZE);

+			}

+		}

+		

+		public string Name

+		{

+			get

+			{

+				if(Names!=null)

+					return Names[0];

+				return String.Empty;

+			}

+			set

+			{

+				if(value == null)

+					throw new ArgumentException();

+				string[] strArray = null;

+				if(value.Length > 0)

+				{

+					strArray = new string[1];

+					strArray[0] = value;

+				}

+				Names = strArray;

+			}

+		}

+		

+		public string[] Names

+		{

+			get

+			{

+				if(infoOwner.IsSet(Style.FONT_NAMES))

+					return (string[])(infoOwner.ViewState["FontInfoNames"]);

+				return (new string[0]);

+			}

+			set

+			{

+				if(value!=null)

+				{

+					infoOwner.ViewState["FontInfoNames"] = value;

+					infoOwner.Set(Style.FONT_NAMES);

+				}

+			}

+		}

+		

+		internal void Reset()

+		{

+			if(infoOwner.IsSet(Style.FONT_NAMES))

+				infoOwner.ViewState.Remove("FontInfoNames");

+			if(infoOwner.IsSet(Style.FONT_BOLD))

+				infoOwner.ViewState.Remove("FontInfoBold");

+			if(infoOwner.IsSet(Style.FONT_ITALIC))

+				infoOwner.ViewState.Remove("FontInfoItalic");

+			if(infoOwner.IsSet(Style.FONT_STRIKE))

+				infoOwner.ViewState.Remove("FontInfoStrikeout");

+			if(infoOwner.IsSet(Style.FONT_OLINE))

+				infoOwner.ViewState.Remove("FontInfoOverline");

+			if(infoOwner.IsSet(Style.FONT_ULINE))

+				infoOwner.ViewState.Remove("FontInfoUnderline");

+			if(infoOwner.IsSet(Style.FONT_SIZE) && infoOwner.Font.Size != FontUnit.Empty)

+				infoOwner.ViewState.Remove("FontInfoSize");

+		}

+		

+		internal Style Owner

+		{

+			get

+			{

+				return infoOwner;

+			}

+		}

+		

+		public void CopyFrom(FontInfo source)

+		{

+			if(source!=null)

+			{

+				if(source.Owner.IsSet(Style.FONT_NAMES))

+					Names = source.Names;

+				if(source.Owner.IsSet(Style.FONT_BOLD))

+					Bold = source.Bold;

+				if(source.Owner.IsSet(Style.FONT_ITALIC))

+					Italic = source.Italic;

+				if(source.Owner.IsSet(Style.FONT_STRIKE))

+					Strikeout = source.Strikeout;

+				if(source.Owner.IsSet(Style.FONT_OLINE))

+					Overline = source.Overline;

+				if(source.Owner.IsSet(Style.FONT_ULINE))

+					Underline = source.Underline;

+				if(source.Owner.IsSet(Style.FONT_SIZE) && source.Size != FontUnit.Empty)

+					Size = source.Size;

+			}

+		}

+		

+		public void MergeWith(FontInfo with)

+		{

+			if(with!=null)

+			{

+				if(with.Owner.IsSet(Style.FONT_NAMES) && !infoOwner.IsSet(Style.FONT_NAMES))

+					Names = with.Names;

+				if(with.Owner.IsSet(Style.FONT_BOLD) && !infoOwner.IsSet(Style.FONT_BOLD))

+					Bold = with.Bold;

+				if(with.Owner.IsSet(Style.FONT_ITALIC) && !infoOwner.IsSet(Style.FONT_ITALIC))

+					Italic = with.Italic;

+				if(with.Owner.IsSet(Style.FONT_STRIKE) && !infoOwner.IsSet(Style.FONT_STRIKE))

+					Strikeout = with.Strikeout;

+				if(with.Owner.IsSet(Style.FONT_OLINE) && !infoOwner.IsSet(Style.FONT_OLINE))

+					Overline = with.Overline;

+				if(with.Owner.IsSet(Style.FONT_ULINE) && !infoOwner.IsSet(Style.FONT_ULINE))

+					Underline = with.Underline;

+				if(with.Owner.IsSet(Style.FONT_SIZE) && with.Size != FontUnit.Empty && !infoOwner.IsSet(Style.FONT_SIZE))

+					Size = with.Size;

+			}

+		}

+		

+		public bool ShouldSerializeNames()

+		{

+			return (Names.Length > 0);

+		}

+		

+		public override string ToString()

+		{

+			return ( (Name.Length > 0) ? (Name.ToString() + ", " + Size.ToString()) : Size.ToString() );

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FontNamesConverter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FontNamesConverter.cs
new file mode 100644
index 00000000000..3a04e327a56
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FontNamesConverter.cs
@@ -0,0 +1,63 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     FontNamesConverter

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Globalization;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class FontNamesConverter : TypeConverter

+	{

+		public FontNamesConverter(): base()

+		{

+		}

+

+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)

+		{

+			return (sourceType == typeof(string));

+		}

+

+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)

+		{

+			if(value is string)

+			{

+				string fontNames = (string)value;

+				if(fontNames.Length == 0)

+				{

+					return (new string[0]);

+				}

+				string[] names = fontNames.Split(new char[] { ','});

+				for(int i=0; i < names.Length; i++)

+				{

+					names[i] = names[i].Trim();

+				}

+		 		return names;

+			}

+			throw GetConvertFromException(value);

+		}

+

+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)

+		{

+			if(destinationType == typeof(string))

+			{

+				if(value == null || ((string[])value) == null)

+					return String.Empty;

+				return String.Join(",", (string[])value);

+			}

+			throw GetConvertToException(value, destinationType);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FontSize.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FontSize.cs
new file mode 100755
index 00000000000..f72e3d455aa
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FontSize.cs
@@ -0,0 +1,30 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     FontSize

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum FontSize

+	{

+		NotSet,

+		AsUnit,

+		Smaller,

+		Larger,

+		XXSmall,

+		XSmall,

+		Small,

+		Medium,

+		Large,

+		XLarge,

+		XXLarge

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
new file mode 100644
index 00000000000..8e3d04cafe1
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FontUnit.cs
@@ -0,0 +1,213 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Struct:    FontUnit

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public struct FontUnit

+	{

+		public static readonly FontUnit Empty   = new FontUnit();

+		public static readonly FontUnit Large   = new FontUnit(FontSize.Large);

+		public static readonly FontUnit Larger  = new FontUnit(FontSize.Larger);

+		public static readonly FontUnit Medium  = new FontUnit(FontSize.Medium);

+		public static readonly FontUnit Small   = new FontUnit(FontSize.Small);

+		public static readonly FontUnit Smaller = new FontUnit(FontSize.Smaller);

+		public static readonly FontUnit XLarge  = new FontUnit(FontSize.XLarge);

+		public static readonly FontUnit XSmall  = new FontUnit(FontSize.XSmall);

+		public static readonly FontUnit XXLarge = new FontUnit(FontSize.XXLarge);

+		public static readonly FontUnit XXSmall = new FontUnit(FontSize.XXSmall);

+

+		private FontSize type;

+		private Unit     val;

+

+		private static Hashtable sizeTable;

+

+		static FontUnit ()

+		{

+			sizeTable = new Hashtable (CaseInsensitiveHashCodeProvider.Default,

+						   CaseInsensitiveComparer.Default);

+			sizeTable.Add ("smaller", 2);

+			sizeTable.Add ("larger", 3);

+			sizeTable.Add ("xx-small", 4);

+			sizeTable.Add ("xxsmall", 4);

+			sizeTable.Add ("x-small", 5);

+			sizeTable.Add ("xsmall", 5);

+			sizeTable.Add ("small", 6);

+			sizeTable.Add ("medium", 7);

+			sizeTable.Add ("large", 8);

+			sizeTable.Add ("xlarge", 9);

+			sizeTable.Add ("x-large", 9);

+			sizeTable.Add ("xxlarge", 10);

+			sizeTable.Add ("xx-large", 10);

+		}

+

+		public FontUnit(FontSize type)

+		{

+			if(!Enum.IsDefined(typeof(FontSize), type))

+				throw new ArgumentException();

+			this.type = type;

+			if(this.type == FontSize.AsUnit)

+			{

+				val = Unit.Point(10);

+			} else

+			{

+				val = Unit.Empty;

+			}

+		}

+

+		public FontUnit(int value)

+		{

+			type = FontSize.AsUnit;

+			val = Unit.Point(value);

+		}

+

+		public FontUnit(string value): this(value, CultureInfo.CurrentCulture)

+		{

+		}

+

+		public FontUnit(Unit value)

+		{

+			if(value.IsEmpty)

+			{

+				type = FontSize.NotSet;

+				val  = Unit.Empty;

+			} else

+			{

+				type = FontSize.AsUnit;

+				val  = value;

+			}

+		}

+

+		public FontUnit(string value, CultureInfo culture)

+		{

+			type = FontSize.NotSet;

+			val  = Unit.Empty;

+			if(value != null && value != String.Empty)

+			{

+				string low = value.ToLower(culture);

+				int size = GetTypeFromString(low);

+				if (size != -1)

+				{

+					type = (FontSize)size;

+				} else {

+					val = new Unit(value, culture, UnitType.Point);

+					type = FontSize.AsUnit;

+				}

+			}

+		}

+

+		private static int GetTypeFromString(string strVal)

+		{

+			if (!(sizeTable.ContainsKey (strVal)))

+					return -1;

+			return (int) sizeTable [strVal];

+		}

+

+		public static FontUnit Parse(string s)

+		{

+			return Parse(s, CultureInfo.CurrentCulture);

+		}

+

+		public static FontUnit Parse(string s, CultureInfo culture)

+		{

+			return new FontUnit(s, culture);

+		}

+

+		public static FontUnit Point(int n)

+		{

+			return new FontUnit(n);

+		}

+

+		public static bool operator ==(FontUnit left, FontUnit right)

+		{

+			return (left.type == right.type && left.val == right.val);

+		}

+

+		public static bool operator !=(FontUnit left, FontUnit right)

+		{

+			return !(left == right);

+		}

+

+		public static implicit operator FontUnit(int n)

+		{

+			return FontUnit.Point(n);

+		}

+

+		public override bool Equals(object obj)

+		{

+			if(obj!= null && obj is FontUnit)

+			{

+				FontUnit that = (FontUnit)obj;

+				return (this.type == that.type && this.val == that.val);

+			}

+			return false;

+		}

+

+		public override int GetHashCode()

+		{

+			return ( (type.GetHashCode() << 2) | val.GetHashCode() );

+		}

+

+		public override string ToString()

+		{

+			return ToString(CultureInfo.CurrentCulture);

+		}

+

+		public string ToString(CultureInfo culture)

+		{

+			if(IsEmpty)

+			{

+				return String.Empty;

+			}

+			//string strRepr = String.Empty;

+			switch(type)

+			{

+				case FontSize.AsUnit:  return val.ToString(culture);

+				case FontSize.XXSmall: return "XX-Small";

+				case FontSize.XSmall:  return "X-Small";

+				case FontSize.XLarge:  return "X-Large";

+				case FontSize.XXLarge: return "XX-Large";

+				default:               return PropertyConverter.EnumToString(typeof(FontSize), type);

+			}

+		}

+

+		public bool IsEmpty

+		{

+			get

+			{

+				return (type == FontSize.NotSet);

+			}

+		}

+

+		public FontSize Type

+		{

+			get

+			{

+				return type;

+			}

+		}

+

+		public Unit Unit

+		{

+			get

+			{

+				return val;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/FontUnitConverter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/FontUnitConverter.cs
new file mode 100644
index 00000000000..7197e219b80
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/FontUnitConverter.cs
@@ -0,0 +1,81 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     FontUnitConverter

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status: 95%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Globalization;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class FontUnitConverter : TypeConverter

+	{

+		public FontUnitConverter(): base()

+		{

+		}

+

+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)

+		{

+			if(sourceType == typeof(string))

+				return true;

+			return base.CanConvertFrom(context, sourceType);

+		}

+

+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)

+		{

+			if(value == null)

+				return null;

+			if(value is string)

+			{

+				string val = ((string)value).Trim();

+				if(val.Length == 0)

+				{

+					return FontUnit.Empty;

+				}

+				return FontUnit.Parse(val, culture);

+			}

+			return base.ConvertFrom(context, culture, value);

+		}

+

+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)

+		{

+			if(value != null && value is FontUnit)

+			{

+				FontUnit val = (FontUnit)value;

+				if(val.Type == FontSize.NotSet)

+				{

+					return String.Empty;

+				}

+				return val.ToString(culture);

+			}

+			return base.ConvertTo(context, culture, value, destinationType);

+		}

+

+		[MonoTODO("GetStandardValues")]

+		public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)

+		{

+			throw new NotImplementedException();

+		}

+

+		public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)

+		{

+			return false;

+		}

+

+		public override bool GetStandardValuesSupported(ITypeDescriptorContext context)

+		{

+			return true;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/GridLines.cs b/mcs/class/System.Web/System.Web.UI.WebControls/GridLines.cs
new file mode 100755
index 00000000000..b013b5a1779
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/GridLines.cs
@@ -0,0 +1,23 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     GridLines

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum GridLines

+	{

+		None,

+		Horizontal,

+		Vertical,

+		Both

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HorizontalAlign.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HorizontalAlign.cs
new file mode 100755
index 00000000000..079e26419c1
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/HorizontalAlign.cs
@@ -0,0 +1,24 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     HorizontalAlign

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum HorizontalAlign

+	{

+		NotSet,

+		Left,

+		Center,

+		Right,

+		Justify

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
new file mode 100755
index 00000000000..e719e645df4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLink.cs
@@ -0,0 +1,158 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     HyperLink

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: gvaish@iitk.ac.in, myscripts_2001@yahoo.com

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultProperty("Text")]

+	//[Designer(??)]

+	[ControlBuilder(typeof(HyperLinkControlBuilder))]

+	//[DataBindingHandler("??")]

+	[ParseChildren(false)]

+	[ToolboxData("<{0}:HyperLink runat=\"server\">HyperLink</{0}:HyperLink>")]

+	public class HyperLink: WebControl

+	{

+		public HyperLink(): base(HtmlTextWriterTag.A)

+		{

+		}

+

+		public virtual string ImageUrl

+		{

+			get

+			{

+				object o = ViewState["ImageUrl"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["ImageUrl"] = value;

+			}

+		}

+

+		public string NavigateUrl

+		{

+			get

+			{

+				object o = ViewState["NavigateUrl"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["NavigateUrl"] = value;

+			}

+		}

+

+		public string Target

+		{

+			get

+			{

+				object o = ViewState["Target"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["Target"] = value;

+			}

+		}

+

+		public virtual string Text

+		{

+			get

+			{

+				object o = ViewState["Text"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["Text"] = value;

+			}

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender(writer);

+			if(NavigateUrl.Length > 0)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Href, NavigateUrl);

+			}

+			if(Target.Length > 0)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Target, Target);

+			}

+		}

+

+		protected override void AddParsedSubObject(object obj)

+		{

+			if(HasControls())

+			{

+				base.AddParsedSubObject(obj);

+				return;

+			}

+			if(obj is LiteralControl)

+			{

+				Text = ((LiteralControl)obj).Text;

+				return;

+			}

+			if(Text.Length > 0)

+			{

+				base.AddParsedSubObject(new LiteralControl (Text));

+				Text = String.Empty;

+			}

+			base.AddParsedSubObject (obj);

+		}

+

+		protected override void LoadViewState(object savedState)

+		{

+			if(savedState != null)

+			{

+				base.LoadViewState(savedState);

+				object o = ViewState["Text"];

+				if(o!=null)

+					Text = (string)o;

+			}

+		}

+

+		protected override void RenderContents(HtmlTextWriter writer)

+		{

+			if(ImageUrl.Length > 0)

+			{

+				Image img = new Image();

+				img.ImageUrl = ResolveUrl(ImageUrl);

+				if(ToolTip.Length > 0)

+					img.ToolTip = ToolTip;

+				if(Text.Length > 0)

+					img.AlternateText = Text;

+				img.RenderControl(writer);

+				return;

+			}

+			if(HasControls())

+			{

+				base.RenderContents(writer);

+				return;

+			}

+			writer.Write(Text);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs
new file mode 100644
index 00000000000..9591388a2e7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkColumn.cs
@@ -0,0 +1,221 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     HyperLinkColumn

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  5%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class HyperLinkColumn: DataGridColumn

+	{

+		PropertyDescriptor textFieldDescriptor;

+		PropertyDescriptor urlFieldDescriptor;

+

+		public HyperLinkColumn(): base()

+		{

+		}

+

+		public virtual string DataNavigateUrlField

+		{

+			get

+			{

+				object o = ViewState["DataNavigateUrlField"];

+				if(o != null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataNavigateUrlField"] = value;

+			}

+		}

+

+		public virtual string DataNavigateUrlFormatString

+		{

+			get

+			{

+				object o = ViewState["DataNavigateUrlFormatString"];

+				if(o != null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataNavigateUrlFormatString"] = value;

+			}

+		}

+

+		public virtual string DataTextField

+		{

+			get

+			{

+				object o = ViewState["DataTextField"];

+				if(o != null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataTextField"] = value;

+			}

+		}

+

+		public virtual string DataTextFormatString

+		{

+			get

+			{

+				object o = ViewState["DataTextFormatString"];

+				if(o != null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataTextFormatString"] = value;

+			}

+		}

+

+		public virtual string NavigateUrl

+		{

+			get

+			{

+				object o = ViewState["NavigateUrl"];

+				if(o != null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["NavigateUrl"] = value;

+			}

+		}

+

+		public virtual string Target

+		{

+			get

+			{

+				object o = ViewState["Target"];

+				if(o != null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["Target"] = value;

+			}

+		}

+

+		public virtual string Text

+		{

+			get

+			{

+				object o = ViewState["Text"];

+				if(o != null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["Text"] = value;

+			}

+		}

+

+		public override void Initialize()

+		{

+			textFieldDescriptor = null;

+			urlFieldDescriptor  = null;

+		}

+

+		public override void InitializeCell(TableCell cell, int columnIndex, ListItemType itemType)

+		{

+			base.InitializeCell(cell, columnIndex, itemType);

+			if(Enum.IsDefined(typeof(ListItemType), itemType) && itemType != ListItemType.Footer)

+			{

+				HyperLink toDisplay = new HyperLink();

+				toDisplay.Text                 = Text;

+				toDisplay.NavigateUrl          = NavigateUrl;

+				toDisplay.Target               = Target;

+				if(DataTextField.Length > 0 || DataNavigateUrlField.Length>0)

+				{

+					toDisplay.DataBinding += new EventHandler(OnDataBindHyperLinkColumn);

+				}

+				cell.Controls.Add(toDisplay);

+			}

+		}

+

+		private void OnDataBindHyperLinkColumn(object sender, EventArgs e)

+		{

+			HyperLink link = (HyperLink)sender;

+			object item    = ((DataGridItem)link.NamingContainer).DataItem;

+			if(textFieldDescriptor == null && urlFieldDescriptor == null)

+			{

+				textFieldDescriptor = TypeDescriptor.GetProperties(item).Find(DataTextField, true);

+				if(textFieldDescriptor == null && !DesignMode)

+					throw new HttpException(HttpRuntime.FormatResourceString("Field_Not_Found", DataTextField));

+				urlFieldDescriptor = TypeDescriptor.GetProperties(item).Find(DataNavigateUrlField, true);

+				if(urlFieldDescriptor == null && !DesignMode)

+					throw new HttpException(HttpRuntime.FormatResourceString("Field_Not_Found", DataNavigateUrlField));

+			}

+

+			if(textFieldDescriptor != null)

+			{

+				link.Text = FormatDataTextValue(textFieldDescriptor.GetValue(item));

+			} else

+			{

+				link.Text = "Sample_DataBound_Text";

+			}

+

+			if(urlFieldDescriptor != null)

+			{

+				link.NavigateUrl = FormatDataNavigateUrlValue(urlFieldDescriptor.GetValue(item));

+			} else

+			{

+				link.NavigateUrl = "url";

+			}

+		}

+

+		protected virtual string FormatDataNavigateUrlValue(object dataUrlValue)

+		{

+			string retVal = String.Empty;

+			if(dataUrlValue != null)

+			{

+				if(DataNavigateUrlFormatString.Length > 0)

+				{

+					retVal = String.Format(DataNavigateUrlFormatString, dataUrlValue);

+				} else

+				{

+					retVal = dataUrlValue.ToString();

+				}

+			}

+			return retVal;

+		}

+

+		protected virtual string FormatDataTextValue(object dataTextValue)

+		{

+			string retVal = String.Empty;

+			if(dataTextValue != null)

+			{

+				if(DataTextFormatString.Length > 0)

+				{

+					retVal = String.Format(DataTextFormatString, dataTextValue);

+				} else

+				{

+					retVal = dataTextValue.ToString();

+				}

+			}

+			return retVal;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkControlBuilder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkControlBuilder.cs
new file mode 100644
index 00000000000..cca04d06622
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/HyperLinkControlBuilder.cs
@@ -0,0 +1,27 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     HyperLinkControlBuilder

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public class HyperLinkControlBuilder : ControlBuilder

+	{

+		public HyperLinkControlBuilder(): base()

+		{

+		}

+		

+		public override bool AllowWhitespaceLiterals()

+		{

+			return false;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/IRepeatInfoUser.cs b/mcs/class/System.Web/System.Web.UI.WebControls/IRepeatInfoUser.cs
new file mode 100755
index 00000000000..47526f80d8e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/IRepeatInfoUser.cs
@@ -0,0 +1,29 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Interface: IRepeatInfoUser

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public interface IRepeatInfoUser

+	{

+		bool HasFooter { get; }

+		bool HasHeader { get; }

+		bool HasSeparators { get; }

+		int  RepeatedItemCount { get; }

+		void RenderItem(ListItemType itemType, int repeatIndex, RepeatInfo repeatInfo, HtmlTextWriter writer);

+		Style GetItemStyle(ListItemType itemType, int repeatIndex);

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
new file mode 100644
index 00000000000..f3182ec9ce4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Image.cs
@@ -0,0 +1,118 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     Image

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultProperty("ImageUrl")]

+	public class Image : WebControl

+	{

+		public Image(): base(HtmlTextWriterTag.Img)

+		{

+		}

+

+		public virtual string AlternateText

+		{

+			get

+			{

+				object o = ViewState["AlternateText"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["AlternateText"] = value;

+			}

+		}

+

+		public override bool Enabled

+		{

+			get

+			{

+				return base.Enabled;

+			}

+			set

+			{

+				base.Enabled = value;

+			}

+		}

+

+		public override FontInfo Font

+		{

+			get

+			{

+				return base.Font;

+			}

+		}

+

+		public virtual ImageAlign ImageAlign

+		{

+			get

+			{

+				object o = ViewState["ImageAlign"];

+				if(o!=null)

+					return (ImageAlign)o;

+				return ImageAlign.NotSet;

+			}

+			set

+			{

+				ViewState["ImageAlign"] = value;

+			}

+		}

+

+		public virtual string ImageUrl

+		{

+			get

+			{

+				object o = ViewState["ImageUrl"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["ImageUrl"] = value;

+			}

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender(writer);

+			if(ImageUrl.Length > 0)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Src, ResolveUrl(ImageUrl));

+			}

+			if(AlternateText.Length > 0)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Alt, AlternateText);

+			}

+			if(BorderWidth.IsEmpty)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Border, "0");

+			}

+			if(ImageAlign != ImageAlign.NotSet)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Align, Enum.Format(typeof(ImageAlign), ImageAlign, "G"));

+			}

+		}

+

+		protected override void RenderContents(HtmlTextWriter writer)

+		{

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs
new file mode 100755
index 00000000000..5a5fa02db58
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ImageAlign.cs
@@ -0,0 +1,29 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     ImageAlign

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum ImageAlign

+	{

+		NotSet,

+		Left,

+		Right,

+		Baseline,

+		Top,

+		Middle,

+		Bottom,

+		AbsBottom,

+		AbsMiddle,

+		TextTop

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs
new file mode 100644
index 00000000000..c318dd3c002
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ImageButton.cs
@@ -0,0 +1,181 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     ImageButton

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultEvent("Click")]

+	public class ImageButton: Image, IPostBackDataHandler, IPostBackEventHandler

+	{

+		private static readonly object ClickEvent   = new object();

+		private static readonly object CommandEvent = new object();

+

+		private int x, y;

+

+		public ImageButton(): base()

+		{

+		}

+

+		public bool CausesValidation

+		{

+			get

+			{

+				object o = ViewState["CausesValidation"];

+				if(o!=null)

+					return (bool)o;

+				return true;

+			}

+			set

+			{

+				ViewState["CausesValidation"] = value;

+			}

+		}

+

+		public string CommandArgument

+		{

+			get

+			{

+				object o = ViewState["CommandArgument"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["CommandArgument"] = value;

+			}

+		}

+

+		public string CommandName

+		{

+			get

+			{

+				object o = ViewState["CommandName"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["CommandName"] = value;

+			}

+		}

+

+		protected override HtmlTextWriterTag TagKey

+		{

+			get

+			{

+				return HtmlTextWriterTag.Input;

+			}

+		}

+

+		public event ImageClickEventHandler Click

+		{

+			add

+			{

+				Events.AddHandler(ClickEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(ClickEvent, value);

+			}

+		}

+

+		public event CommandEventHandler Command

+		{

+			add

+			{

+				Events.AddHandler(CommandEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(CommandEvent, value);

+			}

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			writer.AddAttribute(HtmlTextWriterAttribute.Type, "image");

+			writer.AddAttribute(HtmlTextWriterAttribute.Name, UniqueID);

+			if(Page != null && CausesValidation)

+			{

+				if(Page.Validators.Count > 0)

+				{

+					writer.AddAttribute(HtmlTextWriterAttribute.Onclick, Utils.GetClientValidatedEvent(Page));

+					writer.AddAttribute("language", "javascript");

+				}

+			}

+			base.AddAttributesToRender(writer);

+		}

+

+		protected virtual void OnClick(ImageClickEventArgs e)

+		{

+			if(Events != null)

+			{

+				ImageClickEventHandler iceh = (ImageClickEventHandler)(Events[ClickEvent]);

+				if(iceh != null)

+					iceh(this, e);

+			}

+		}

+

+		protected virtual void OnCommand(CommandEventArgs e)

+		{

+			if(Events != null)

+			{

+				CommandEventHandler ceh = (CommandEventHandler)(Events[CommandEvent]);

+				if(ceh != null)

+					ceh(this, e);

+				RaiseBubbleEvent(this, e);

+			}

+		}

+

+		protected override void OnPreRender(EventArgs e)

+		{

+			if(Page != null)

+			{

+				Page.RegisterRequiresPostBack(this);

+			}

+		}

+

+		bool IPostBackDataHandler.LoadPostData(string postDataKey, NameValueCollection postCollection)

+		{

+			string xCoord = postCollection[UniqueID + ".x"];

+			string yCoord = postCollection[UniqueID + ".y"];

+			if(xCoord != null && yCoord != null && xCoord.Length > 0 && yCoord.Length > 0)

+			{

+				x = Int32.Parse(xCoord);

+				y = Int32.Parse(yCoord);

+				Page.RegisterRequiresRaiseEvent(this);

+			}

+			return false;

+		}

+

+		void IPostBackDataHandler.RaisePostDataChangedEvent()

+		{

+		}

+

+		void IPostBackEventHandler.RaisePostBackEvent(string eventArgument)

+		{

+			if(CausesValidation)

+				Page.Validate();

+			OnClick(new ImageClickEventArgs(x, y));

+			OnCommand(new CommandEventArgs(CommandName, CommandArgument));

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs
new file mode 100644
index 00000000000..f28f6e46db3
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Label.cs
@@ -0,0 +1,86 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     Label

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultProperty("Text")]

+	//[Designer("??")]

+	//Currently mono does not handle Type in attributes

+	//[ControlBuilder(typeof(LabelControlBuilder))] 

+	//[DataBindingHandler("??")]

+	[ParseChildren(false)]

+	[ToolboxData("<{0}:Label runat=\"server\">Label</{0}:Label>")]

+	public class Label : WebControl

+	{

+		public Label (): base ()

+		{

+		}

+

+		internal Label (HtmlTextWriterTag tagKey) : base (tagKey)

+		{

+		}

+

+		public virtual string Text

+		{

+			get {

+				object o = ViewState ["Text"];

+				return (o == null) ? String.Empty : (string) o;

+			}

+

+			set { ViewState ["Text"] = value; }

+		}

+

+		protected override void AddParsedSubObject (object obj)

+		{

+			if(HasControls ()){

+				base.AddParsedSubObject (obj);

+				return;

+			}

+

+			if(obj is LiteralControl){

+				Text = ((LiteralControl) obj).Text;

+				return;

+			}

+

+			if(Text.Length > 0){

+				base.AddParsedSubObject (new LiteralControl (Text));

+				Text = String.Empty;

+			}

+

+			base.AddParsedSubObject (obj);

+		}

+

+		protected override void LoadViewState (object savedState)

+		{

+			if(savedState != null) {

+				base.LoadViewState (savedState);

+				string savedText = ViewState ["Text"] as string;

+				if(savedText != null)

+					Text = savedText;

+			}

+		}

+

+		protected override void RenderContents (HtmlTextWriter writer)

+		{

+			if(HasControls ())

+				base.RenderContents (writer);

+			else

+				writer.Write (Text);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LabelControlBuilder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LabelControlBuilder.cs
new file mode 100644
index 00000000000..5ef512cd092
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/LabelControlBuilder.cs
@@ -0,0 +1,27 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     LabelControlBuilder

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public class LabelControlBuilder : ControlBuilder

+	{

+		public LabelControlBuilder(): base()

+		{

+		}

+		

+		public override bool AllowWhitespaceLiterals()

+		{

+			return false;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs
new file mode 100644
index 00000000000..89d6dea68d9
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButton.cs
@@ -0,0 +1,174 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     LinkButton

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultEvent("Click")]

+	[DefaultProperty("Text")]

+	//[Designer("??")]

+	[ControlBuilder(typeof(LinkButtonControlBuilder))]

+	//[DataBindingHandler("??")]

+	[ParseChildren(false)]

+	[ToolboxData("<{0}:LinkButton runat=\"server\">LinkButton</{0}:LinkButton>")]

+	public class LinkButton : WebControl, IPostBackEventHandler

+	{

+		private static readonly object ClickEvent   = new object();

+		private static readonly object CommandEvent = new object();

+

+		public LinkButton () : base (HtmlTextWriterTag.A)

+		{

+		}

+

+		public bool CausesValidation

+		{

+			get {

+				object o = ViewState ["CausesValidation"];

+				return (o == null) ? true : (bool) o;

+			}

+

+			set { ViewState ["CausesValidation"] = value; }

+		}

+

+		public string CommandArgument

+		{

+			get {

+				object o = ViewState ["CommandArgument"];

+				return (o == null) ? String.Empty : (string) o;

+			}

+

+			set { ViewState ["CommandArgument"] = value; }

+		}

+

+		public string CommandName

+		{

+			get {

+				object o = ViewState ["CommandName"];

+				return (o == null) ? String.Empty : (string) o;

+			}

+

+			set { ViewState ["CommandName"] = value; }

+		}

+

+		public virtual string Text

+		{

+			get {

+				object o = ViewState ["Text"];

+				return (o == null) ? String.Empty : (string) o;

+			}

+

+			set { ViewState ["Text"] = value; }

+		}

+

+		public event EventHandler Click

+		{

+			add { Events.AddHandler(ClickEvent, value); }

+			remove { Events.RemoveHandler(ClickEvent, value); }

+		}

+

+		public event CommandEventHandler Command

+		{

+			add { Events.AddHandler(CommandEvent, value); }

+			remove { Events.RemoveHandler(CommandEvent, value); }

+		}

+

+		protected virtual void OnClick (EventArgs e)

+		{

+			if(Events != null){

+				EventHandler eh = (EventHandler) (Events [ClickEvent]);

+				if (eh != null)

+					eh (this, e);

+			}

+		}

+

+		protected virtual void OnCommand (CommandEventArgs e)

+		{

+			if(Events != null){

+				CommandEventHandler ceh = (CommandEventHandler) (Events [CommandEvent]);

+				if (ceh != null)

+					ceh (this, e);

+			}

+		}

+

+		protected override void OnPreRender (EventArgs e)

+		{

+			base.OnPreRender(e);

+		}

+

+		void IPostBackEventHandler.RaisePostBackEvent (string eventArgument)

+		{

+			if (CausesValidation)

+				Page.Validate ();

+			OnClick (EventArgs.Empty);

+			OnCommand (new CommandEventArgs (CommandName, CommandArgument));

+		}

+

+		protected override void AddAttributesToRender (HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender (writer);

+			if (Enabled && Page != null){

+				if (CausesValidation && Page.Validators.Count > 0){

+					writer.AddAttribute (HtmlTextWriterAttribute.Href,

+							     "javascript:" + 

+							     Utils.GetClientValidatedPostBack (this));

+					return;

+				}

+				writer.AddAttribute (HtmlTextWriterAttribute.Href,

+						     Page.GetPostBackClientHyperlink (this, ""));

+			}

+		}

+

+		protected override void AddParsedSubObject (object obj)

+		{

+			if (HasControls ()){

+				base.AddParsedSubObject (obj);

+				return;

+			}

+

+			if (obj is LiteralControl){

+				Text = ((LiteralControl) obj).Text;

+				return;

+			}

+

+			if (Text.Length > 0){

+				base.AddParsedSubObject (new LiteralControl (Text));

+				Text = String.Empty;

+			}

+

+			base.AddParsedSubObject (obj);

+		}

+

+		protected override void LoadViewState (object savedState)

+		{

+			if (savedState != null){

+				base.LoadViewState (savedState);

+				string savedText = (string) ViewState ["Text"];

+				if (savedText != null)

+					Text = savedText;

+			}

+		}

+

+		protected override void RenderContents (HtmlTextWriter writer)

+		{

+			if (HasControls ()){

+				base.RenderContents (writer);

+				return;

+			}

+			writer.Write (Text);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LinkButtonControlBuilder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButtonControlBuilder.cs
new file mode 100644
index 00000000000..cfb8a69b986
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButtonControlBuilder.cs
@@ -0,0 +1,31 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     LinkButtonControlBuilder

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class LinkButtonControlBuilder : ControlBuilder

+	{

+		public LinkButtonControlBuilder(): base()

+		{

+		}

+		

+		public override bool AllowWhitespaceLiterals()

+		{

+			return false;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LinkButtonInternal.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButtonInternal.cs
new file mode 100644
index 00000000000..215d5efd082
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/LinkButtonInternal.cs
@@ -0,0 +1,55 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     LinkButtonInternal

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Drawing;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	internal class LinkButtonInternal : LinkButton

+	{

+		public LinkButtonInternal() : base()

+		{

+		}

+

+		protected override void Render(HtmlTextWriter writer)

+		{

+			SetForeColor();

+			Render(writer);

+		}

+

+		private void SetForeColor()

+		{

+			if(!ControlStyle.IsSet(System.Web.UI.WebControls.Style.FORECOLOR))

+			{

+				Control ctrl = this;

+				Color   foreCol;

+				int     ctr = 0;

+				//FIXME: this-> LinkButton-> WebControl

+				while(ctr < 2)

+				{

+					ctrl = ctrl.Parent;

+					foreCol = ((WebControl)ctrl).ForeColor;

+					if(foreCol != Color.Empty)

+					{

+						ForeColor = foreCol;

+						return;

+					}

+					ctr++;

+				}

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListBox.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListBox.cs
new file mode 100644
index 00000000000..5548f0da083
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListBox.cs
@@ -0,0 +1,177 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     ListBox

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Drawing;

+using System.Collections;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[ValidationProperty("SelectedItem")]

+	public class ListBox : ListControl, IPostBackDataHandler

+	{

+		public ListBox () : base ()

+		{

+		}

+

+		public override Color BorderColor

+		{

+			get { return base.BorderColor; }

+			set { base.BorderColor = value; }

+		}

+

+		public override BorderStyle BorderStyle

+		{

+			get { return base.BorderStyle; }

+			set { base.BorderStyle = value; }

+		}

+

+		public override Unit BorderWidth

+		{

+			get { return base.BorderWidth; }

+			set { base.BorderWidth = value; }

+		}

+

+		public virtual int Rows

+		{

+			get {

+				object o = ViewState ["Rows"];

+				return (o == null) ? 4 : (int) o;

+			}

+

+			set {

+				if (value < 1 || value > 2000)

+					throw new ArgumentOutOfRangeException ();

+

+				ViewState ["Rows"] = value;

+			}

+		}

+

+		public virtual ListSelectionMode SelectionMode

+		{

+			get

+			{

+				object o = ViewState ["SelectionMode"];

+				return (o == null) ? ListSelectionMode.Single : (ListSelectionMode) o;

+			}

+			set

+			{

+				if (!Enum.IsDefined (typeof (ListSelectionMode), value))

+					throw new ArgumentException ();

+				ViewState ["SelectionMode"] = value;

+			}

+		}

+

+		public override string ToolTip

+		{

+			get { return String.Empty; }

+			set { /* Don't do anything. */ }

+		}

+

+		protected override void AddAttributesToRender (HtmlTextWriter writer)

+		{

+			if (Page != null)

+				Page.VerifyRenderingInServerForm (this);

+

+			writer.AddAttribute (HtmlTextWriterAttribute.Name, UniqueID);

+			base.AddAttributesToRender (writer);

+			writer.AddAttribute (HtmlTextWriterAttribute.Size,

+					     Rows.ToString (NumberFormatInfo.InvariantInfo));

+

+			if (SelectionMode == ListSelectionMode.Multiple)

+				writer.AddAttribute (HtmlTextWriterAttribute.Multiple, "multiple");

+

+			if (AutoPostBack && Page != null){

+				writer.AddAttribute (HtmlTextWriterAttribute.Onchange,

+						     Page.GetPostBackClientEvent (this, ""));

+				writer.AddAttribute ("language", "javascript");

+			}

+		}

+

+		protected override void OnPreRender (EventArgs e)

+		{

+			base.OnPreRender (e);

+			if (Page != null && SelectionMode == ListSelectionMode.Multiple && Enabled)

+				Page.RegisterRequiresPostBack(this);

+		}

+

+		protected override void RenderContents (HtmlTextWriter writer)

+		{

+			bool isMultAllowed = (SelectionMode == ListSelectionMode.Multiple);

+			bool selMade = false;

+			foreach (ListItem current in Items){

+				writer.WriteBeginTag ("option");

+				if (current.Selected){

+					if (!isMultAllowed && selMade)

+						throw new HttpException ("Cannot_MultiSelect_In_Single_Mode");

+					selMade = true;

+					writer.WriteAttribute ("selected", "selected");

+				}

+				writer.WriteAttribute ("value", current.Value, true);

+				writer.Write ('>');

+				writer.Write (HttpUtility.HtmlEncode (current.Text));

+				writer.WriteEndTag ("option");

+				writer.WriteLine ();

+			}

+		}

+

+		bool IPostBackDataHandler.LoadPostData (string postDataKey,

+							NameValueCollection postCollection)

+		{

+			string[] vals = postCollection.GetValues (postDataKey);

+			bool updated = false;

+			ArrayList selected = SelectedIndices;

+			ArrayList final = new ArrayList (vals.Length);

+			if (vals != null){

+				if (SelectionMode == ListSelectionMode.Single){

+					int index = Items.FindByValueInternal (vals [0]);

+					if (SelectedIndex != index){

+						SelectedIndex = index;

+						updated       = true;

+					}

+				} else {

+					foreach (string current in vals)

+						final.Add (Items.FindByValueInternal (current));

+

+					if (selected != null && selected.Count == vals.Length){

+						for (int ctr = 0; ctr < vals.Length; ctr++){

+							if (((int) final [ctr]) != ((int) selected [ctr])){

+								updated = true;

+								break;

+							}

+						}

+					} else {

+						updated = true;

+					}

+				}

+				if (!updated)

+					Select (final);

+			} else {

+				if (SelectedIndex != -1)

+					SelectedIndex = -1;

+				updated = true;

+			}

+			return updated;

+		}

+

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+			OnSelectedIndexChanged (EventArgs.Empty);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs
new file mode 100644
index 00000000000..502c7882e3e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListControl.cs
@@ -0,0 +1,340 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     ListControl

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+using System.Web.Utils;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultEvent("SelectedIndexChanged")]

+	[DefaultProperty("DataSource")]

+	//[Designer("??")]

+	//[DataBindingHandler("??")]

+	[ParseChildren(true, "Items")]

+	public abstract class ListControl: WebControl

+	{

+		private static readonly object SelectedIndexChangedEvent = new object();

+

+		private object             dataSource;

+		private ListItemCollection items;

+

+		private int cachedSelectedIndex = -1;

+

+		public ListControl(): base(HtmlTextWriterTag.Select)

+		{

+		}

+

+		public event EventHandler SelectedIndexChanged

+		{

+			add

+			{

+				Events.AddHandler(SelectedIndexChangedEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(SelectedIndexChangedEvent, value);

+			}

+		}

+

+		public virtual bool AutoPostBack

+		{

+			get

+			{

+				object o = ViewState["AutoPostBack"];

+				if(o!=null)

+					return (bool)o;

+				return false;

+			}

+			set

+			{

+				ViewState["AutoPostBack"] = value;

+			}

+		}

+

+		public virtual string DataMember

+		{

+			get

+			{

+				object o = ViewState["DataMember"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataMember"] = value;

+			}

+		}

+

+		public virtual object DataSource

+		{

+			get

+			{

+				return dataSource;

+			}

+			set

+			{

+				if(value != null)

+				{

+					if(value is IListSource || value is IEnumerable)

+					{

+						dataSource = value;

+						return;

+					}

+				}

+				throw new ArgumentException(HttpRuntime.FormatResourceString(ID, "Invalid DataSource Type"));

+			}

+		}

+

+		public virtual string DataTextField

+		{

+			get

+			{

+				object o = ViewState["DataTextField"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataTextField"] = value;

+			}

+		}

+

+		public virtual string DataTextFormatString

+		{

+			get

+			{

+				object o = ViewState["DataTextFormatString"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataTextFormatString"] = value;

+			}

+		}

+

+		public virtual string DataValueField

+		{

+			get

+			{

+				object o = ViewState["DataValueField"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataValueField"] = value;

+			}

+		}

+

+		public virtual ListItemCollection Items

+		{

+			get

+			{

+				if(items==null)

+				{

+					items = new ListItemCollection();

+					if(IsTrackingViewState)

+					{

+						items.TrackViewState();

+					}

+				}

+				return items;

+			}

+		}

+

+		public virtual int SelectedIndex

+		{

+			get {

+				ListItemCollection items = Items;

+				int last = items.Count;

+				for (int i = 0; i < last; i++) {

+					if (items [i].Selected)

+						return i;

+				}

+				return -1;

+			}

+			set {

+				if (value < -1 || value > Items.Count)

+					throw new ArgumentOutOfRangeException ();

+

+				ClearSelection ();

+				if (value != -1)

+					Items [value].Selected = true;

+			}

+		}

+

+		public virtual ListItem SelectedItem

+		{

+			get

+			{

+				int idx = SelectedIndex;

+				if (idx < 0)

+					return null;

+

+				return Items [idx];

+			}

+		}

+

+		internal virtual ArrayList SelectedIndices

+		{

+			get

+			{

+				ArrayList si = new ArrayList();

+				for(int i=0; i < Items.Count; i++)

+				{

+					if(Items[i].Selected)

+						si.Add(i);

+				}

+				return si;

+			}

+		}

+

+		internal void Select(ArrayList indices)

+		{

+			ClearSelection();

+			foreach(object intObj in indices)

+			{

+				int index = (int)intObj;

+				if(index >= 0 && index < Items.Count)

+					Items[index].Selected = true;

+			}

+		}

+

+		public virtual void ClearSelection()

+		{

+			for(int i=0; i < Items.Count; i++)

+			{

+				Items[i].Selected = false;

+			}

+		}

+

+		protected override void LoadViewState(object savedState)

+		{

+			//Order: BaseClass, Items (Collection), Indices

+			if(savedState != null && savedState is Triplet)

+			{

+				Triplet state = (Triplet)savedState;

+				base.LoadViewState(state.First);

+				Items.LoadViewState(state.Second);

+				object indices = state.Third;

+				if(indices != null)

+				{

+					Select((ArrayList)indices);

+				}

+			}

+		}

+

+		protected override void OnDataBinding(EventArgs e)

+		{

+			base.OnDataBinding(e);

+			IEnumerable resolvedDataSource = DataSourceHelper.GetResolvedDataSource(DataSource, DataMember);

+			if(resolvedDataSource != null)

+			{

+				string dataTextField = DataTextField;

+				string dataValueField = DataValueField;

+				Items.Clear();

+				ICollection rdsCollection = (ICollection)resolvedDataSource;

+				if(rdsCollection != null)

+				{

+					Items.Capacity = rdsCollection.Count;

+				}

+				bool valid = ( (dataTextField.Length >= 0) && (dataValueField.Length >=0) );

+				foreach(IEnumerable current in resolvedDataSource)

+				{

+					ListItem li = new ListItem();

+					if(valid)

+					{

+						if(dataTextField.Length >= 0)

+						{

+							li.Text = DataBinder.GetPropertyValue(current, dataTextField, null);

+						}

+						if(dataValueField.Length >= 0)

+						{

+							li.Value = DataBinder.GetPropertyValue(current, dataValueField, null);

+						}

+					} else

+					{

+						li.Text  = dataTextField.ToString();

+						li.Value = dataValueField.ToString();

+					}

+					Items.Add(li);

+				}

+			}

+			if(cachedSelectedIndex != -1)

+			{

+				SelectedIndex = cachedSelectedIndex;

+				cachedSelectedIndex = -1;

+			}

+		}

+

+		protected virtual void OnSelectedIndexChanged(EventArgs e)

+		{

+			if(Events!=null)

+				{

+					EventHandler eh = (EventHandler)(Events[SelectedIndexChangedEvent]);

+					if(eh!=null)

+						eh(this, e);

+				}

+		}

+

+		protected override void OnPreRender (EventArgs e)

+		{

+			base.OnPreRender(e);

+		}

+

+		protected override object SaveViewState()

+		{

+			//Order: BaseClass, Items (Collection), Indices

+			object vs = base.SaveViewState();

+			object itemSvs = Items.SaveViewState();

+			object indices = null;

+			if(SaveSelectedIndicesViewState)

+				indices = SelectedIndices;

+			if(vs!= null && itemSvs != null && indices != null)

+			{

+				return new Triplet(vs, itemSvs, indices);

+			}

+			return null;

+		}

+

+		protected override void TrackViewState()

+		{

+			base.TrackViewState();

+			Items.TrackViewState();

+		}

+

+		private bool SaveSelectedIndicesViewState

+		{

+			get

+			{

+				if( Events[SelectedIndexChangedEvent] != null && Enabled && Visible)

+				{

+					Type t = GetType();

+					// If I am a derivative, let it take of storing the selected indices.

+					if(t == typeof(DropDownList) || t == typeof(ListBox) || t == typeof(CheckBoxList) || t == typeof(RadioButtonList))

+						return false;

+				}

+				return true;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs
new file mode 100644
index 00000000000..44bbe9cbf1c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListItem.cs
@@ -0,0 +1,241 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     ListItem

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[TypeConverter(typeof(ExpandableObjectConverter))]

+	[ControlBuilder(typeof(ListItemControlBuilder))]

+	public sealed class ListItem : IStateManager, IParserAccessor, IAttributeAccessor

+	{

+		private AttributeCollection attributes;

+		private string              text;

+		private string              val;

+		private bool marked;

+		private bool selected;

+		private bool dirty_t;

+		private bool dirty_v;

+

+		public ListItem(string text, string value)

+		{

+			this.text  = text;

+			this.val   = value;

+			attributes = null;

+		}

+

+		public ListItem(string text): this(text, null)

+		{

+		}

+

+		public ListItem(): this(null, null)

+		{

+		}

+

+		public static ListItem FromString(string text)

+		{

+			return new ListItem(text);

+		}

+

+		public AttributeCollection Attributes

+		{

+			get

+			{

+				if(attributes == null)

+					attributes = new AttributeCollection(new StateBag(true));

+				return attributes;

+			}

+		}

+

+		public bool Selected

+		{

+			get {

+				return selected;

+			}

+

+			set {

+				selected = value;

+			}

+		}

+

+		internal bool Dirty

+		{

+			get {

+				return (dirty_t && dirty_v);

+			}

+

+			set {

+				dirty_t = value;

+				dirty_v = value;

+			}

+		}

+

+		public string Text

+		{

+			get

+			{

+				if(text!=null)

+				{

+					return text;

+				}

+				if(val!=null)

+				{

+					return val;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				text = value;

+				if (IsTrackingViewState)

+					dirty_t = true;

+			}

+		}

+

+		public string Value

+		{

+			get {

+				if (val != null)

+					return val;

+

+				if (text != null)

+					return text;

+

+				return String.Empty;

+			}

+			set

+			{

+				val = value;

+				if(IsTrackingViewState)

+					dirty_v = true;

+			}

+		}

+

+		string IAttributeAccessor.GetAttribute(string key)

+		{

+			return attributes[key];

+		}

+

+		void IAttributeAccessor.SetAttribute(string key, string value)

+		{

+			attributes[key] = value;

+		}

+

+		/// <remarks>

+		/// The data is parsed - object must be of type LiteralControl or DataBoundLiteralControl.

+		/// In latter case, throw an exception telling that the data cannot be bind-ed.

+		/// </remarks>

+		void IParserAccessor.AddParsedSubObject(object obj)

+		{

+			if(obj is LiteralControl)

+			{

+				Text = ((LiteralControl)obj).Text;

+				return;

+			}

+			if(obj is DataBoundLiteralControl)

+			{

+				throw new HttpException(HttpRuntime.FormatResourceString("Control_Cannot_DataBind","ListItem"));

+			}

+			throw new HttpException(HttpRuntime.FormatResourceString("Cannot_Have_Children_Of_Type", "ListItem", obj.GetType().ToString()));

+		}

+

+		bool IsTrackingViewState

+		{

+			get

+			{

+				return marked;

+			}

+		}

+

+		internal void TrackViewState()

+		{

+			marked = true;

+		}

+

+		internal void LoadViewState(object state)

+		{

+			if(state is Pair)

+			{

+				Pair tv = (Pair)state;

+				if(tv.First!=null)

+				{

+					Text = (string)tv.First;

+				}

+				if(tv.Second!=null)

+				{

+					Value = (string)tv.Second;

+				}

+			}

+		}

+

+		internal object SaveViewState()

+		{

+			if (dirty_t && dirty_v)

+				return new Pair(Text, Value);

+

+			if (dirty_t)

+				return new Pair (Text, null);

+

+			if (dirty_v)

+				return new Pair(null, Value);

+

+			return null;

+		}

+

+		public override bool Equals (object o)

+		{

+			ListItem li = o as ListItem;

+			if (li == null)

+				return false;

+

+			return (Text == li.Text && Value == li.Value);

+		}

+

+		public override int GetHashCode ()

+		{

+			return base.GetHashCode ();

+		}

+

+		public override string ToString ()

+		{

+			return Text;

+		}

+

+		bool IStateManager.IsTrackingViewState

+		{

+			get

+			{

+				return IsTrackingViewState;

+			}

+		}

+

+		void IStateManager.TrackViewState()

+		{

+			TrackViewState();

+		}

+

+		object IStateManager.SaveViewState()

+		{

+			return SaveViewState();

+		}

+

+		void IStateManager.LoadViewState(object state)

+		{

+			LoadViewState(state);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListItemCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListItemCollection.cs
new file mode 100644
index 00000000000..9caefa00286
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListItemCollection.cs
@@ -0,0 +1,361 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     ListItemCollection

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+using System.Reflection;

+

+namespace System.Web.UI.WebControls

+{

+	//[DefaultMember("Item")] I need the this[...] thing...

+	//[Editor("??", typeof(Design.WebControls.ListItemCollectionEditor))]

+	public sealed class ListItemCollection : IList, ICollection, IEnumerable, IStateManager

+	{

+		private ArrayList items;

+		private bool      saveAll;

+		private bool      marked;

+

+		public ListItemCollection()

+		{

+			items   = new ArrayList();

+			saveAll = false;

+			marked  = false;

+		}

+

+		public int Capacity

+		{

+			get

+			{

+				return items.Capacity;

+			}

+			set

+			{

+				items.Capacity = value;

+			}

+		}

+

+		public int Count

+		{

+			get

+			{

+				return items.Count;

+			}

+		}

+

+		public bool IsReadOnly

+		{

+			get

+			{

+				return items.IsReadOnly;

+			}

+		}

+

+		public bool IsSynchronized

+		{

+			get

+			{

+				return items.IsSynchronized;

+			}

+		}

+

+		public ListItem this[int index]

+		{

+			get

+			{

+				if(index < 0 || index >= Count)

+					return null;

+				return (ListItem)(items[index]);

+			}		

+		}

+

+		public object SyncRoot

+		{

+			get

+			{

+				return this;

+			}

+		}

+

+		public void Add(ListItem item)

+		{

+			items.Add(item);

+			if(marked)

+				item.Dirty = true;

+		}

+

+		public void Add(string item)

+		{

+			Add(new ListItem(item));

+		}

+

+		public void AddRange(ListItem[] items)

+		{

+			foreach(ListItem item in items)

+			{

+				if(item!=null)

+					Add(item);

+			}

+		}

+

+		public void Clear()

+		{

+			items.Clear();

+			if(marked)

+				saveAll = true;

+		}

+

+		public bool Contains(ListItem item)

+		{

+			return items.Contains(item);

+		}

+

+		public void CopyTo(Array array, int index)

+		{

+			items.CopyTo(array, index);

+		}

+

+		public ListItem FindByText(string text)

+		{

+			int i=-1;

+			foreach(object current in items)

+			{

+				i++;

+				if(((ListItem)current).Text == text)

+					break;

+			}

+			return (i==-1 ? null : (ListItem)items[i]);

+		}

+

+		public ListItem FindByValue(string value)

+		{

+			foreach(ListItem current in items)

+			{

+				if(current.Value == value)

+				{

+					return current;

+				}

+			}

+			return null;

+		}

+

+		internal int FindByValueInternal(string value)

+		{

+			int i = -1;

+			foreach(ListItem current in items)

+			{

+				i++;

+				if(current.Value == value)

+				{

+					return i;

+				}

+			}

+			return -1;

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			return items.GetEnumerator();

+		}

+

+		public int IndexOf(ListItem item)

+		{

+			return items.IndexOf(item);

+		}

+

+		public void Insert(int index, ListItem item)

+		{

+			items.Insert(index, item);

+			if(marked)

+				saveAll = true;

+		}

+

+		public void Insert(int index, string item)

+		{

+			Insert(index, new ListItem(item));

+		}

+

+		public void RemoveAt(int index)

+		{

+			if(index < 0 || index >= items.Count)

+				return;

+			items.RemoveAt(index);

+			if(marked)

+				saveAll = true;

+		}

+

+		public void Remove(ListItem item)

+		{

+			RemoveAt(IndexOf(item));

+		}

+

+		public void Remove(string item)

+		{

+			RemoveAt(IndexOf(ListItem.FromString(item)));

+		}

+

+		internal object SaveViewState()

+		{

+			if(saveAll)

+			{

+				string[] keys = new string[Count];

+				string[] vals = new string[Count];

+				for(int i=0; i < Count; i++)

+				{

+					keys[i] = this[i].Text;

+					vals[i] = this[i].Value;

+				}

+				return new Triplet(Count, keys, vals);

+			}

+			ArrayList indices = new ArrayList();

+			ArrayList states = new ArrayList();

+			object o;

+			for(int i=0; i < Count; i++)

+			{

+				o = this[i].SaveViewState();

+				if(o!=null)

+				{

+					indices.Add(i);

+					states.Add(o);

+				}

+			}

+			if(indices.Count > 0)

+				return new Pair(indices, states);

+			return null;

+		}

+

+		internal void LoadViewState(object savedState)

+		{

+			if(savedState!=null)

+			{

+				if(savedState is Pair)

+				{

+					ArrayList indices = (ArrayList)(((Pair)savedState).First);

+					ArrayList states  = (ArrayList)(((Pair)savedState).Second);

+					for(int i=0; i < indices.Count; i++)

+					{

+						if( (int)indices[i] < Count )

+							this[i].LoadViewState(states[i]);

+						else

+						{

+							ListItem temp = new ListItem();

+							temp.LoadViewState(states[i]);

+							Add(temp);

+						}

+					}

+				}

+				if(savedState is Triplet)

+				{

+					Triplet t = (Triplet)savedState;

+					items = new ArrayList((int)t.First);

+					saveAll = true;

+					string[] text = (string[])t.Second;

+					string[] vals = (string[])t.Third;

+					for(int i=0; i < text.Length; i++)

+						items.Add(new ListItem(text[i], vals[i]));

+				}

+			}

+		}

+

+		internal void TrackViewState()

+		{

+			marked = true;

+			foreach(ListItem current in items)

+				current.TrackViewState();

+		}

+

+		bool IList.IsFixedSize

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		object IList.this[int index]

+		{

+			get

+			{

+				return this[index];

+			}

+			

+			set

+			{

+				if(index >= 0 && index < Count)

+					if(value is ListItem)

+						items[index] = (ListItem) value;

+			}

+		}

+

+		int IList.Add(object item)

+		{

+			int index = (item is ListItem ? items.Add((ListItem)item) : -1);

+			if(index!=-1 && marked)

+				((ListItem)item).Dirty = true;

+			return index;

+		}

+

+		bool IList.Contains(object item)

+		{

+			if(item is ListItem)

+				return Contains((ListItem)item);

+			return false;

+		}

+

+		int IList.IndexOf(object item)

+		{

+			if(item is ListItem)

+				return IndexOf((ListItem)item);

+			return -1;

+		}

+

+		void IList.Insert(int index, object item)

+		{

+			if(item is ListItem)

+				Insert(index, (ListItem)item);

+		}

+

+		void IList.Remove(object item)

+		{

+			if(item is string)

+				Remove((string)item);

+			if(item is ListItem)

+				Remove((ListItem)item);

+		}

+

+		bool IStateManager.IsTrackingViewState

+		{

+			get

+			{

+				return marked;

+			}

+		}

+

+		void IStateManager.LoadViewState(object state)

+		{

+			LoadViewState(state);

+		}

+

+		object IStateManager.SaveViewState()

+		{

+			return SaveViewState();

+		}

+

+		void IStateManager.TrackViewState()

+		{

+			TrackViewState();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListItemControlBuilder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListItemControlBuilder.cs
new file mode 100644
index 00000000000..16c60a196a7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListItemControlBuilder.cs
@@ -0,0 +1,36 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     ListItemControlBuilder

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class ListItemControlBuilder : ControlBuilder

+	{

+		public ListItemControlBuilder(): base()

+		{

+		}

+		

+		public override bool AllowWhitespaceLiterals()

+		{

+			return false;

+		}

+		

+		public override bool HtmlDecodeLiterals()

+		{

+			return true;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListItemType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListItemType.cs
new file mode 100755
index 00000000000..3d45e73693a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListItemType.cs
@@ -0,0 +1,27 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     ListItemType

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum ListItemType

+	{

+		Header,

+		Footer,

+		Item,

+		AlternatingItem,

+		SelectedItem,

+		EditItem,

+		Separator,

+		Pager

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ListSelectionMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ListSelectionMode.cs
new file mode 100755
index 00000000000..f7c7967356c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ListSelectionMode.cs
@@ -0,0 +1,21 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     ListSelectionMode

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum ListSelectionMode

+	{

+		Single,

+		Multiple

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs
new file mode 100644
index 00000000000..a2d4db5cc9e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Literal.cs
@@ -0,0 +1,62 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     Literal

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultProperty("Text")]

+	[ControlBuilder(typeof(LiteralControlBuilder))]

+	//[DataBindingHandler("??")]

+	public class Literal : Control

+	{

+		public Literal () : base ()

+		{

+		}

+

+		public string Text

+		{

+			get {

+				object o = ViewState ["Text"];

+				return (o == null) ? String.Empty : (string) o;

+			}

+

+			set { ViewState ["Text"] = value; }

+		}

+

+		protected override ControlCollection CreateControlCollection ()

+		{

+			return new EmptyControlCollection (this);

+		}

+

+		protected override void AddParsedSubObject (object obj)

+		{

+			if (!(obj is LiteralControl))

+				throw new HttpException (HttpRuntime.FormatResourceString (

+							"Cannot_Have_Children_Of_Type", "Literal",

+							obj.GetType ().Name.ToString ()));

+

+			Text = ((LiteralControl) obj).Text;

+		}

+

+		protected override void Render (HtmlTextWriter writer)

+		{

+			if (Text.Length > 0)

+				writer.Write (Text);

+		}

+	}

+}

+

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/LiteralControlBuilder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/LiteralControlBuilder.cs
new file mode 100644
index 00000000000..75dcb77192a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/LiteralControlBuilder.cs
@@ -0,0 +1,36 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     LiteralControlBuilder

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class LiteralControlBuilder : ControlBuilder

+	{

+		public LiteralControlBuilder(): base()

+		{

+		}

+		

+		public override bool AllowWhitespaceLiterals()

+		{

+			return false;

+		}

+		

+		public override void AppendSubBuilder(ControlBuilder subBuilder)

+		{

+			throw new HttpException(HttpRuntime.FormatResourceString("Control_does_not_allow_children",(typeof(Literal)).ToString()));

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/MonthChangedEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/MonthChangedEventArgs.cs
new file mode 100644
index 00000000000..8de0d910c4b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/MonthChangedEventArgs.cs
@@ -0,0 +1,47 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     MonthChangedEventArgs

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class MonthChangedEventArgs

+	{

+		private DateTime nDate;

+		private DateTime pDate;

+

+		public MonthChangedEventArgs(DateTime newDate, DateTime previousDate)

+		{

+			nDate = newDate;

+			pDate = previousDate;

+		}

+		

+		public DateTime NewDate

+		{

+			get

+			{

+				return nDate;

+			}

+		}

+		

+		public DateTime PreviousDate

+		{

+			get

+			{

+				return pDate;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/MonthChangedEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/MonthChangedEventHandler.cs
new file mode 100644
index 00000000000..99a7a27157e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/MonthChangedEventHandler.cs
@@ -0,0 +1,16 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ *
+ * Author: Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact:  <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status: 100%
+ *
+ * (C) Gaurav Vaish (2001)
+ */
+
+namespace System.Web.UI.WebControls
+{
+	public delegate void MonthChangedEventHandler(object sender, MonthChangedEventArgs e);
+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/NextPrevFormat.cs b/mcs/class/System.Web/System.Web.UI.WebControls/NextPrevFormat.cs
new file mode 100755
index 00000000000..91d6cf3003b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/NextPrevFormat.cs
@@ -0,0 +1,22 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     NextPrevFormat

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum NextPrevFormat

+	{

+		CustomText,

+		ShortMonth,

+		FullMonth

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs
new file mode 100644
index 00000000000..6a4ec131939
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/PagedDataSource.cs
@@ -0,0 +1,475 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     PagedDataSource

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class PagedDataSource : ICollection, IEnumerable, ITypedList

+	{

+		private int  pageSize;

+		private bool allowPaging;

+		private int  currentPageIndex;

+		private bool allowCustomPaging;

+		private int  virtualCount;

+

+		private IEnumerable dataSource;

+

+		public PagedDataSource()

+		{

+			Initialize();

+		}

+

+		private void Initialize()

+		{

+			pageSize          = 10;

+			allowPaging       = false;

+			currentPageIndex  = 0;

+			allowCustomPaging = false;

+			virtualCount      = 0;

+		}

+

+		public bool AllowCustomPaging

+		{

+			get

+			{

+				return allowCustomPaging;

+			}

+			set

+			{

+				allowCustomPaging = value;

+			}

+		}

+

+		public bool AllowPaging

+		{

+			get

+			{

+				return allowPaging;

+			}

+			set

+			{

+				allowPaging = value;

+			}

+		}

+

+		public int Count

+		{

+			get

+			{

+				if(dataSource != null)

+				{

+					if(IsPagingEnabled)

+					{

+						return DataSourceCount;

+					}

+					if(IsCustomPagingEnabled)

+					{

+						return pageSize;

+					}

+					if(IsLastPage)

+					{

+						return (DataSourceCount - FirstIndexInPage);

+					}

+					return pageSize;

+				}

+				return 0;

+			}

+		}

+

+		public int CurrentPageIndex

+		{

+			get

+			{

+				return currentPageIndex;

+			}

+

+			set

+			{

+				currentPageIndex = value;

+			}

+		}

+

+		public IEnumerable DataSource

+		{

+			get

+			{

+				return dataSource;

+			}

+			set

+			{

+				dataSource = value;

+			}

+		}

+

+		public int DataSourceCount

+		{

+			get

+			{

+				if(dataSource != null)

+				{

+					if(IsCustomPagingEnabled)

+					{

+						return virtualCount;

+					}

+					if(dataSource is ICollection)

+					{

+						return ((ICollection)dataSource).Count;

+					}

+					throw new HttpException(HttpRuntime.FormatResourceString("PagedDataSource_Cannot_Get_Count"));

+				}

+				return 0;

+			}

+		}

+

+		public int FirstIndexInPage

+		{

+			get

+			{

+				if(dataSource != null && IsPagingEnabled && IsCustomPagingEnabled)

+				{

+					return (currentPageIndex * pageSize);

+				}

+				return 0;

+			}

+		}

+

+		public bool IsCustomPagingEnabled

+		{

+			get

+			{

+				return (IsPagingEnabled && allowCustomPaging);

+			}

+		}

+

+		public bool IsFirstPage

+		{

+			get

+			{

+				return (!IsPagingEnabled || (CurrentPageIndex == 0));

+			}

+		}

+

+		public bool IsLastPage

+		{

+			get

+			{

+				return (!IsPagingEnabled || (CurrentPageIndex == PageCount));

+			}

+		}

+

+		public bool IsPagingEnabled

+		{

+			get

+			{

+				return (allowPaging && pageSize != 0);

+			}

+		}

+

+		public bool IsReadOnly

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public bool IsSynchronized

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public int PageCount

+		{

+			get

+			{

+				if(dataSource != null)

+				{

+					int total = DataSourceCount;

+					if(!IsPagingEnabled)

+					{

+						return total;

+					}

+					return (total + pageSize - 1)/pageSize;

+				}

+				return 0;

+			}

+		}

+

+		public int PageSize

+		{

+			get

+			{

+				return pageSize;

+			}

+			set

+			{

+				pageSize = value;

+			}

+		}

+

+		public object SyncRoot

+		{

+			get

+			{

+				return this;

+			}

+		}

+

+		public int VirtualCount

+		{

+			get

+			{

+				return virtualCount;

+			}

+			set

+			{

+				virtualCount = value;

+			}

+		}

+

+		public void CopyTo(Array array, int index)

+		{

+			foreach(object current in this)

+			{

+				array.SetValue(array, index++);

+			}

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			int fInd = FirstIndexInPage;

+			int count = -1;

+			if(dataSource is ICollection)

+			{

+				count = Count;

+			}

+

+			if(dataSource is IList)

+			{

+				return (new PrivateListEnumerator((IList)dataSource, fInd, count));

+			}

+			if(dataSource is Array)

+			{

+				return (new PrivateArrayEnumerator((object[])dataSource, fInd, count));

+			}

+			if(dataSource is ICollection)

+			{

+				return (new PrivateICollectionEnumerator((ICollection)dataSource, fInd, count));

+			}

+			if(allowCustomPaging)

+			{

+				return (new PrivateIEnumeratorEnumerator(dataSource.GetEnumerator(), Count));

+			}

+			return dataSource.GetEnumerator();

+		}

+

+		class PrivateIEnumeratorEnumerator : IEnumerator

+		{

+			private int index;

+			private int max;

+

+			private IEnumerator enumerator;

+

+			public PrivateIEnumeratorEnumerator(IEnumerator enumerator, int count)

+			{

+				this.enumerator = enumerator;

+				index = -1;

+				max   = count;

+			}

+

+			public bool MoveNext()

+			{

+				enumerator.MoveNext();

+				index++;

+				return (index < max);

+			}

+

+			public void Reset()

+			{

+				index = -1;

+				enumerator.Reset();

+			}

+

+			public object Current

+			{

+				get

+				{

+					return enumerator.Current;

+				}

+			}

+		}

+

+		class PrivateICollectionEnumerator : IEnumerator

+		{

+			private int index;

+			private int start;

+			private int max;

+

+			private ICollection collection;

+			private IEnumerator collEnum;

+

+			public PrivateICollectionEnumerator(ICollection collection, int start, int count)

+			{

+				this.collection = collection;

+				this.start  = start;

+				index = -1;

+				max = start + count;

+				if(max > collection.Count)

+				{

+					max = collection.Count;

+				}

+			}

+

+			public bool MoveNext()

+			{

+				if(collEnum == null)

+				{

+					int cIndex = 0;

+					collEnum = collection.GetEnumerator();

+					while(cIndex < start)

+					{

+						collEnum.MoveNext();

+					}

+				}

+				collEnum.MoveNext();

+				index++;

+				return (start + index < max);

+			}

+

+			public void Reset()

+			{

+				index = -1;

+				collEnum = null;

+			}

+

+			public object Current

+			{

+				get

+				{

+					return collEnum.Current;

+				}

+			}

+		}

+

+		class PrivateArrayEnumerator : IEnumerator

+		{

+			private int index;

+			private int start;

+			private int max;

+			private object[] values;

+

+			public PrivateArrayEnumerator(object[] values, int start, int count)

+			{

+				this.values = values;

+				this.start  = start;

+				index = -1;

+				max = start + count;

+				if(max > this.values.Length)

+				{

+					max = this.values.Length;

+				}

+			}

+

+			public bool MoveNext()

+			{

+				index++;

+				return (index + start < max);

+			}

+

+			public void Reset()

+			{

+				index = -1;

+			}

+

+			public object Current

+			{

+				get

+				{

+					if(index >= 0)

+					{

+						return values[index + start];

+					}

+					throw new InvalidOperationException("Enumerator_MoveNext_Not_Called");

+				}

+			}

+		}

+

+		class PrivateListEnumerator : IEnumerator

+		{

+			private int   index;

+			private int   start;

+			private int   max;

+			private IList collection;

+

+			public PrivateListEnumerator(IList list, int start, int count)

+			{

+				collection = list;

+				this.start = start;

+				index = -1;

+				max = start + count;

+				if(max > list.Count)

+				{

+					max = list.Count;

+				}

+			}

+

+			public bool MoveNext()

+			{

+				index++;

+				return (index + start < max);

+			}

+

+			public void Reset()

+			{

+				index = -1;

+			}

+

+			public object Current

+			{

+				get

+				{

+					if(index >= 0)

+					{

+						return collection[index + start];

+					}

+					throw new InvalidOperationException("Enumerator_MoveNext_Not_Called");

+				}

+			}

+		}

+

+		public string GetListName(PropertyDescriptor[] listAccessors)

+		{

+			return String.Empty;

+		}

+

+		public PropertyDescriptorCollection GetItemProperties(PropertyDescriptor[] listAccessors)

+		{

+			if(dataSource != null)

+			{

+				if(dataSource is ITypedList)

+				{

+					return ((ITypedList)dataSource).GetItemProperties(listAccessors);

+				}

+			}

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PagerMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PagerMode.cs
new file mode 100755
index 00000000000..5f99cee5773
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/PagerMode.cs
@@ -0,0 +1,21 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     PagerMode

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum PagerMode

+	{

+		NextPrev,

+		NumericPages

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PagerPosition.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PagerPosition.cs
new file mode 100755
index 00000000000..2ad9b466413
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/PagerPosition.cs
@@ -0,0 +1,22 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     PagerPosition

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum PagerPosition

+	{

+		Bottom,

+		Top,

+		TopAndBottom

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs
new file mode 100644
index 00000000000..82c7ea11d37
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Panel.cs
@@ -0,0 +1,97 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     Panel

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	//[Designer("??")]

+	[ParseChildren(false)]

+	[PersistChildren(true)]

+	[ToolboxData("<{0}:Panel runat=\"server\">Panel</{0}:Panel>")]

+	public class Panel: WebControl

+	{

+		public Panel(): base(HtmlTextWriterTag.Div)

+		{

+		}

+

+		public virtual string BackImageUrl

+		{

+			get

+			{

+				object o = ViewState["BackImageUrl"];

+				if(o != null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["BackImageUrl"] = value;

+			}

+		}

+

+		public virtual HorizontalAlign HorizontalAlign

+		{

+			get

+			{

+				object o = ViewState["HorizontalAlign"];

+				if(o != null)

+					return (HorizontalAlign)o;

+				return HorizontalAlign.NotSet;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(HorizontalAlign), value))

+				{

+					throw new ArgumentException();

+				}

+				ViewState["HorizontalAlign"] = value;

+			}

+		}

+

+		public virtual bool Wrap

+		{

+			get

+			{

+				object o = ViewState["Wrap"];

+				if(o != null)

+					return (bool)o;

+				return true;

+			}

+			set

+			{

+				ViewState["Wrap"] = value;

+			}

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender(writer);

+			if(BackImageUrl.Length > 0)

+			{

+				writer.AddStyleAttribute(HtmlTextWriterStyle.BackgroundImage, "url(" + ResolveUrl(BackImageUrl) + ")");

+			}

+			if(HorizontalAlign != HorizontalAlign.NotSet)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Align, TypeDescriptor.GetConverter(typeof(HorizontalAlign)).ConvertToString(HorizontalAlign));

+			}

+			if(Wrap)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Nowrap, "nowrap");

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs
new file mode 100644
index 00000000000..19cc57bfd2e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolder.cs
@@ -0,0 +1,28 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     PlaceHolder

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[ControlBuilder(typeof(PlaceHolderControlBuilder))]

+	public class PlaceHolder : Control

+	{

+		public PlaceHolder(): base()

+		{

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolderControlBuilder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolderControlBuilder.cs
new file mode 100644
index 00000000000..3bbd68c6d22
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/PlaceHolderControlBuilder.cs
@@ -0,0 +1,31 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     PlaceHolderControlBuilder

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class PlaceHolderControlBuilder : ControlBuilder

+	{

+		public PlaceHolderControlBuilder(): base()

+		{

+		}

+		

+		public override bool AllowWhitespaceLiterals()

+		{

+			return false;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RadioButton.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RadioButton.cs
new file mode 100644
index 00000000000..c999695a8aa
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RadioButton.cs
@@ -0,0 +1,125 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     RadioButton

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	//[Designer("??")]

+	public class RadioButton : CheckBox, IPostBackDataHandler

+	{

+		public RadioButton () : base ()

+		{

+		}

+

+		public virtual string GroupName

+		{

+			get {

+				object o = ViewState ["GroupName"];

+				return (o == null) ? String.Empty : (string) o;

+			}

+

+			set { ViewState ["GroupName"] = value; }

+		}

+

+		protected override void OnPreRender (EventArgs e)

+		{

+			base.OnPreRender (e);

+			if (Page != null && Enabled && !Checked)

+				Page.RegisterRequiresPostBack (this);

+

+			if(GroupName.Length == 0)

+				GroupName = UniqueID;

+		}

+

+		internal override void RenderInputTag (HtmlTextWriter writer, string id)

+		{

+			writer.AddAttribute (HtmlTextWriterAttribute.Id, id);

+			writer.AddAttribute (HtmlTextWriterAttribute.Type, "radio");

+			writer.AddAttribute (HtmlTextWriterAttribute.Name, UniqueGroupNamePrivate);

+			writer.AddAttribute (HtmlTextWriterAttribute.Value, ValueAttributePrivate);

+

+			if (Checked)

+				writer.AddAttribute (HtmlTextWriterAttribute.Checked, "checked");

+

+			if (AutoPostBack){

+				writer.AddAttribute (HtmlTextWriterAttribute.Onclick,

+						     Page.GetPostBackClientEvent (this, ""));

+				writer.AddAttribute ("language", "javascript");

+			}

+

+			if (AccessKey.Length > 0)

+				writer.AddAttribute (HtmlTextWriterAttribute.Accesskey, AccessKey);

+

+			if (TabIndex > 0)

+				writer.AddAttribute (HtmlTextWriterAttribute.Tabindex,

+						     TabIndex.ToString (NumberFormatInfo.InvariantInfo));

+

+			writer.RenderBeginTag (System.Web.UI.HtmlTextWriterTag.Input);

+			writer.RenderEndTag ();

+		}

+

+		private string UniqueGroupNamePrivate

+		{

+			get {

+				string retVal = GroupName;

+				int unique = UniqueID.LastIndexOf (':');

+				if (unique >= 0)

+					retVal += UniqueID.Substring (unique + 1);

+

+				return retVal;

+			}

+		}

+

+		private string ValueAttributePrivate

+		{

+			get {

+				string retVal = Attributes ["value"];

+				if (retVal != null)

+					return retVal;

+

+				if (ID != null)

+					return ID;

+

+				return UniqueID;

+			}

+		}

+

+		bool IPostBackDataHandler.LoadPostData (string postDataKey,

+						        NameValueCollection postCollection)

+		{

+			bool _checked = Checked;

+			if (postCollection [UniqueGroupNamePrivate] == ValueAttributePrivate){

+				if (_checked)

+					return false;

+				Checked = true;

+				return true;

+			}

+

+			if (_checked)

+				Checked = false;

+			return true;

+		}

+

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+			OnCheckedChanged (EventArgs.Empty);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs
new file mode 100644
index 00000000000..c1f0ece4094
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RadioButtonList.cs
@@ -0,0 +1,244 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     RadioButtonList

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  95%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[ValidationProperty("SelectedItem")]

+	public class RadioButtonList : ListControl, IRepeatInfoUser, INamingContainer, IPostBackDataHandler

+	{

+		private bool  selectionIndexChanged;

+		private short  tabIndex;

+

+		public RadioButtonList(): base()

+		{

+			selectionIndexChanged = false;

+		}

+

+		public virtual int CellPadding

+		{

+			get

+			{

+				if(ControlStyleCreated)

+				{

+					return (int)(((TableStyle)ControlStyle).CellPadding);

+				}

+				return -1;

+			}

+			set

+			{

+				((TableStyle)ControlStyle).CellPadding = value;

+			}

+		}

+

+		public virtual int CellSpacing

+		{

+			get

+			{

+				if(ControlStyleCreated)

+				{

+					return (int)(((TableStyle)ControlStyle).CellSpacing);

+				}

+				return -1;

+			}

+			set

+			{

+				((TableStyle)ControlStyle).CellSpacing = value;

+			}

+		}

+

+		public virtual int RepeatColumns

+		{

+			get

+			{

+				object o = ViewState["RepeatColumns"];

+				if(o != null)

+					return (int)o;

+				return 0;

+			}

+			set

+			{

+				if(value < 0)

+					throw new ArgumentOutOfRangeException("value");

+				ViewState["RepeatColumns"] = value;

+			}

+		}

+

+		public virtual RepeatDirection RepeatDirection

+		{

+			get

+			{

+				object o = ViewState["RepeatDirection"];

+				if(o != null)

+					return (RepeatDirection)o;

+				return RepeatDirection.Vertical;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(RepeatDirection), value))

+					throw new ArgumentException();

+				ViewState["RepeatDirection"] = value;

+			}

+		}

+

+		public virtual RepeatLayout RepeatLayout

+		{

+			get

+			{

+				object o = ViewState["RepeatLayout"];

+				if(o != null)

+					return (RepeatLayout)o;

+				return RepeatLayout.Table;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(RepeatLayout), value))

+					throw new ArgumentException();

+				ViewState["RepeatLayout"] = value;

+			}

+		}

+

+		public virtual TextAlign TextAlign

+		{

+			get

+			{

+				object o = ViewState["TextAlign"];

+				if(o != null)

+					return (TextAlign)o;

+				return TextAlign.Right;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(TextAlign), value))

+					throw new ArgumentException();

+				ViewState["TextAlign"] = value;

+			}

+		}

+

+		protected override Style CreateControlStyle()

+		{

+			return new TableStyle(ViewState);

+		}

+

+		protected override void Render(HtmlTextWriter writer)

+		{

+			RepeatInfo info = new RepeatInfo();

+			Style cStyle = (ControlStyleCreated ? ControlStyle : null);

+			bool dirty = false;

+			tabIndex = TabIndex;

+			if(tabIndex != 0)

+			{

+				dirty = !ViewState.IsItemDirty("TabIndex");

+				TabIndex = 0;

+			}

+			info.RepeatColumns = RepeatColumns;

+			info.RepeatDirection = RepeatDirection;

+			info.RenderRepeater(writer, this, cStyle, this);

+			if(tabIndex != 0)

+			{

+				TabIndex = tabIndex;

+			}

+			if(dirty)

+			{

+				ViewState.SetItemDirty("TabIndex", false);

+			}

+		}

+

+		bool IPostBackDataHandler.LoadPostData(string postDataKey, NameValueCollection postCollection)

+		{

+			string value = postCollection[postDataKey];

+			for(int i=0; i < Items.Count; i++)

+			{

+				if(Items[i].Value == value)

+				{

+					if(i != SelectedIndex)

+					{

+						SelectedIndex = i;

+					}

+					return true;

+				}

+			}

+			return false;

+		}

+

+		void IPostBackDataHandler.RaisePostDataChangedEvent()

+		{

+			if(selectionIndexChanged)

+				OnSelectedIndexChanged(EventArgs.Empty);

+		}

+

+		Style IRepeatInfoUser.GetItemStyle(System.Web.UI.WebControls.ListItemType itemType, int repeatIndex)

+		{

+			return null;

+		}

+

+		void IRepeatInfoUser.RenderItem (System.Web.UI.WebControls.ListItemType itemType,

+						 int repeatIndex,

+						 RepeatInfo repeatInfo,

+						 HtmlTextWriter writer)

+		{

+			/* Create a new RadioButton as if it was defined in the page and render it */

+			RadioButton button = new RadioButton ();

+			button.GroupName = UniqueID;

+			button.TextAlign = TextAlign;

+			button.AutoPostBack = AutoPostBack;

+			button.ID = ClientID + "_" + repeatIndex.ToString (NumberFormatInfo.InvariantInfo);;

+			object view_state = ViewState ["TabIndex"];

+			if (view_state != null)

+				button.TabIndex = (short) view_state;

+			ListItem current = Items [repeatIndex];

+			button.Text = current.Text;

+			button.Attributes ["value"] = current.Value;

+			button.Checked = current.Selected;

+			button.RenderControl (writer);

+		}

+

+		bool IRepeatInfoUser.HasFooter

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		bool IRepeatInfoUser.HasHeader

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		bool IRepeatInfoUser.HasSeparators

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		int IRepeatInfoUser.RepeatedItemCount

+		{

+			get

+			{

+				return Items.Count;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RangeValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RangeValidator.cs
new file mode 100644
index 00000000000..43a496023b5
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RangeValidator.cs
@@ -0,0 +1,125 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     RangeValidator

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.Xml;

+

+namespace System.Web.UI.WebControls

+{

+	[ToolboxData("<{0}:RangeValidator runat=\"server\" "

+	              + "ErrorMessage=\"RangeValidator\"></{0}:RangeValidator>")]

+	public class RangeValidator : BaseCompareValidator

+	{

+		public RangeValidator(): base()

+		{

+		}

+

+		public string MaximumValue

+		{

+			get

+			{

+				object o = ViewState["MaximumValue"];

+				if(o != null)

+				{

+					return (string)o;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["MaximumValue"] = value;

+			}

+		}

+

+		public string MinimumValue

+		{

+			get

+			{

+				object o = ViewState["MinimumValue"];

+				if(o != null)

+				{

+					return (string)o;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["MinimumValue"] = value;

+			}

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender(writer);

+			if(base.RenderUplevel)

+			{

+				writer.AddAttribute("evaluationfunction", "RangeValidatorEvaluateIsValid");

+				writer.AddAttribute("maximumvalue", MaximumValue);

+				writer.AddAttribute("minimumvalue", MinimumValue);

+			}

+		}

+

+		protected override bool ControlPropertiesValid()

+		{

+			string max = MaximumValue;

+			if(!CanConvert(max, Type))

+			{

+				string[] fmt = new string[4];

+				fmt[0] = max;

+				fmt[1] = "MaximumValue";

+				fmt[2] = ID;

+				fmt[3] = PropertyConverter.EnumToString(typeof(ValidationDataType), Type);

+				throw new HttpException(HttpRuntime.FormatResourceString("Validator_value_bad_type", fmt));

+			}

+			string min = MaximumValue;

+			if(!CanConvert(min, Type))

+			{

+				string[] fmt = new string[4];

+				fmt[0] = min;

+				fmt[1] = "MinimumValue";

+				fmt[2] = ID;

+				fmt[3] = PropertyConverter.EnumToString(typeof(ValidationDataType), Type);

+				throw new HttpException(HttpRuntime.FormatResourceString("Validator_value_bad_type", fmt));

+			}

+

+			if(Compare(max, min, ValidationCompareOperator.GreaterThan, ValidationDataType.Double))

+			{

+				string[] fmt = new string[3];

+				fmt[0] = min;

+				fmt[1] = max;

+				fmt[2] = PropertyConverter.EnumToString(typeof(ValidationDataType), Type);

+				throw new HttpException(HttpRuntime.FormatResourceString("Validator_range_overalap", fmt));

+			}

+			return base.ControlPropertiesValid();

+		}

+

+		protected override bool EvaluateIsValid()

+		{

+			string ctrl = GetControlValidationValue(ControlToValidate);

+			if(ctrl == null || ctrl.Trim().Length == 0)

+			{

+				return true;

+			}

+			bool retVal = Compare(ctrl, MinimumValue, ValidationCompareOperator.GreaterThanEqual,

+			                     ValidationDataType.String);

+			if(!retVal)

+			{

+				retVal = Compare(ctrl, MaximumValue, ValidationCompareOperator.LessThanEqual,

+				                 ValidationDataType.String);

+			}

+			return retVal;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RegularExpressionValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RegularExpressionValidator.cs
new file mode 100644
index 00000000000..961e45def85
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RegularExpressionValidator.cs
@@ -0,0 +1,93 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     RegularExpressionValidator

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.Text.RegularExpressions;

+

+namespace System.Web.UI.WebControls

+{

+	[ToolboxData("<{0}:RegularExpressionValidator runat=\"server\" "

+	              + "ErrorMessage=\"RegularExpressionValidator\">"

+	              + "</{0}:RegularExpressionValidator>")]

+	public class RegularExpressionValidator : BaseValidator

+	{

+		public RegularExpressionValidator(): base()

+		{

+		}

+

+		public string ValidationExpression

+		{

+			get

+			{

+				object o = ViewState["ValidationExpression"];

+				if(o != null)

+				{

+					return (string)o;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				try

+				{

+					Regex.IsMatch("", value);

+				} catch(Exception)

+				{

+					throw new HttpException(HttpRuntime.FormatResourceString("Validator_bad_regex", value));

+				}

+				ViewState["ValidationExpression"] = value;

+			}

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender(writer);

+			if(base.RenderUplevel)

+			{

+				writer.AddAttribute("evaluationfunction", "RegularExpressionValidatorEvaluateIsValid");

+				string exp = ValidationExpression;

+				if(exp.Length > 0)

+				{

+					writer.AddAttribute("validationexpression", exp);

+				}

+			}

+		}

+

+		protected override bool EvaluateIsValid()

+		{

+			string ctrl = GetControlValidationValue(ControlToValidate);

+			bool   retVal = true;

+			if(ctrl == null || ctrl.Trim().Length == 0)

+			{

+				return true;

+			}

+			try

+			{

+				Match match = Regex.Match(ctrl, ValidationExpression);

+				if(match.Success && match.Index > 0 && match.Length == ctrl.Length)

+				{

+					retVal = true;

+				} else

+				{

+					retVal = false;

+				}

+			} catch(Exception)

+			{

+				retVal = true;

+			}

+			return retVal;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeatDirection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeatDirection.cs
new file mode 100755
index 00000000000..fc26596dafc
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RepeatDirection.cs
@@ -0,0 +1,21 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     RepeatDirection

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum RepeatDirection

+	{

+		Horizontal,

+		Vertical

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeatInfo.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeatInfo.cs
new file mode 100644
index 00000000000..79ad32eb23d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RepeatInfo.cs
@@ -0,0 +1,372 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     RepeatInfo

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class RepeatInfo

+	{

+		private bool            outerTableImp;

+		private int             repeatColumns;

+		private RepeatDirection repeatDirection;

+		private RepeatLayout    repeatLayout;

+

+		public RepeatInfo()

+		{

+			outerTableImp   = false;

+			repeatColumns   = 0;

+			repeatDirection = RepeatDirection.Vertical;

+			repeatLayout    = RepeatLayout.Table;

+		}

+

+		public bool OuterTableImplied

+		{

+			get

+			{

+				return outerTableImp;

+			}

+			set

+			{

+				outerTableImp = value;

+			}

+		}

+

+		public int RepeatColumns

+		{

+			get

+			{

+				return repeatColumns;

+			}

+			set

+			{

+				repeatColumns = value;

+			}

+		}

+

+		public RepeatDirection RepeatDirection

+		{

+			get

+			{

+				return repeatDirection;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(RepeatDirection), value))

+					throw new ArgumentException();

+				repeatDirection = value;

+			}

+		}

+

+		public RepeatLayout RepeatLayout

+		{

+			get

+			{

+				return repeatLayout;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(RepeatLayout), value))

+					throw new ArgumentException();

+				repeatLayout = value;

+			}

+		}

+

+		public void RenderRepeater(HtmlTextWriter writer, IRepeatInfoUser user, Style controlStyle, WebControl baseControl)

+		{

+			if(RepeatDirection == RepeatDirection.Vertical)

+			{

+				DoVerticalRendering(writer, user, controlStyle, baseControl);

+			} else

+			{

+				DoHorizontalRendering(writer, user, controlStyle, baseControl);

+			}

+		}

+

+		private void DoVerticalRendering(HtmlTextWriter writer, IRepeatInfoUser user, Style controlStyle, WebControl baseControl)

+		{

+			int total = user.RepeatedItemCount;

+			int colsCount;

+			int rowsCount;

+			if(repeatColumns == 0 || repeatColumns==1)

+			{

+				colsCount = 1;

+				rowsCount = total;

+			} else

+			{

+				colsCount = repeatColumns;

+				rowsCount = (total + repeatColumns - 1) / repeatColumns;

+				if(rowsCount ==0 && total != 0)

+				{

+					rowsCount = 1;

+					colsCount = total;

+				}

+			}

+			WebControl ctrl = null;

+			bool isTable = true;

+			bool hasSeps = user.HasSeparators;

+			if(!outerTableImp)

+			{

+				if(RepeatLayout == RepeatLayout.Table)

+				{

+					ctrl = new Table();

+				} else

+				{

+					ctrl = new WebControl(HtmlTextWriterTag.Span);

+					isTable = false;

+				}

+			}

+

+			if(ctrl != null)

+			{

+				ctrl.ID = baseControl.ClientID;

+				ctrl.CopyBaseAttributes(baseControl);

+				ctrl.ApplyStyle(controlStyle);

+				ctrl.RenderBeginTag(writer);

+			}

+

+			Style itemStyle;

+			int colSpan = 0;

+			if(user.HasHeader)

+			{

+				if(isTable)

+				{

+					writer.RenderBeginTag(HtmlTextWriterTag.Tr);

+					if(rowsCount != 1)

+					{

+						colSpan = rowsCount;

+						if(hasSeps)

+							colSpan += rowsCount;

+						writer.AddAttribute(HtmlTextWriterAttribute.Colspan, colSpan.ToString(NumberFormatInfo.InvariantInfo));

+					}

+					itemStyle = user.GetItemStyle(ListItemType.Header, -1);

+					if(itemStyle != null)

+					{

+						itemStyle.AddAttributesToRender(writer);

+					}

+					writer.RenderBeginTag(HtmlTextWriterTag.Td);

+				}

+				user.RenderItem(ListItemType.Header, -1, this, writer);

+				if(isTable)

+				{

+					writer.RenderEndTag();

+					writer.RenderEndTag();

+				} else

+				{

+					if(!outerTableImp)

+					{

+						writer.WriteFullBeginTag("br");

+					}

+				}

+			}

+

+			int rowIndex = 0;

+			int colIndex = 0;

+			int index = 0;

+			while(rowIndex < rowsCount)

+			{

+				if(isTable)

+					writer.RenderBeginTag(HtmlTextWriterTag.Tr);

+				colIndex = 0;

+				while(colIndex < colsCount)

+				{

+					index = rowIndex + colIndex * rowsCount;

+					if(index < total)

+					{

+						if(isTable)

+						{

+							itemStyle = user.GetItemStyle(ListItemType.Item, index);

+							if(itemStyle != null)

+							{

+								itemStyle.AddAttributesToRender(writer);

+							}

+							writer.RenderBeginTag(HtmlTextWriterTag.Td);

+						}

+						user.RenderItem(ListItemType.Item, index, this, writer);

+						if(isTable)

+							writer.RenderEndTag();

+						if(hasSeps && index != (total - 1))

+						{

+							if(colsCount == 1)

+							{

+								writer.RenderEndTag();

+								writer.RenderBeginTag(HtmlTextWriterTag.Tr);

+							} else

+							{

+								writer.WriteFullBeginTag("br");

+							}

+							if(isTable)

+							{

+								itemStyle = user.GetItemStyle(ListItemType.Separator, index);

+								if(itemStyle != null)

+									itemStyle.AddAttributesToRender(writer);

+								writer.RenderBeginTag(HtmlTextWriterTag.Td);

+							}

+							if(index < total)

+								user.RenderItem(ListItemType.Separator, index, this, writer);

+							if(isTable)

+								writer.RenderEndTag();

+						}

+					}

+					colIndex++;

+				}

+				if(isTable)

+					writer.RenderEndTag();

+				else

+					if(rowIndex != (rowsCount - 1) || (user.HasFooter && !outerTableImp))

+						writer.WriteFullBeginTag("br");

+				rowIndex++;

+			}

+			if(user.HasFooter)

+			{

+				if(isTable)

+				{

+					writer.RenderBeginTag(HtmlTextWriterTag.Tr);

+					if(colsCount != 1)

+					{

+						writer.AddAttribute(HtmlTextWriterAttribute.Colspan, colSpan.ToString(NumberFormatInfo.InvariantInfo));

+					}

+					itemStyle = user.GetItemStyle(ListItemType.Footer, -1);

+					if(itemStyle != null)

+					{

+						itemStyle.AddAttributesToRender(writer);

+					}

+					writer.RenderBeginTag(HtmlTextWriterTag.Td);

+				}

+				user.RenderItem(ListItemType.Footer, -1, this, writer);

+				if(isTable)

+				{

+					writer.RenderEndTag();

+					writer.RenderEndTag();

+				}

+			}

+			if(ctrl != null)

+			{

+				ctrl.RenderEndTag(writer);

+			}

+		}

+

+		private void DoHorizontalRendering (HtmlTextWriter writer,

+						    IRepeatInfoUser user,

+						    Style controlStyle,

+						    WebControl baseControl)

+		{

+			/* Based on DoVerticalRendering */

+			int total = user.RepeatedItemCount;

+			int colsCount = repeatColumns;

+			int rowsCount = 0;

+

+			if (colsCount == 0)

+				colsCount = total;

+			WebControl ctrl = null;

+			bool isTable = true;

+			bool hasSeps = user.HasSeparators;

+			if (!outerTableImp){

+				isTable = (RepeatLayout == RepeatLayout.Table);

+				ctrl = (isTable) ? new Table () : new WebControl (HtmlTextWriterTag.Span);

+				ctrl.ID = baseControl.ClientID;

+				ctrl.CopyBaseAttributes (baseControl);

+				ctrl.ApplyStyle (controlStyle);

+				ctrl.RenderBeginTag (writer);

+			}

+

+			Style itemStyle;

+			int colSpan = 0;

+			if (user.HasHeader){

+				if (isTable){

+					writer.RenderBeginTag (HtmlTextWriterTag.Tr);

+					if (rowsCount != 1){

+						colSpan = rowsCount;

+						if (hasSeps)

+							colSpan += rowsCount;

+						writer.AddAttribute (HtmlTextWriterAttribute.Colspan,

+						     colSpan.ToString (NumberFormatInfo.InvariantInfo));

+					}

+					itemStyle = user.GetItemStyle (ListItemType.Header, -1);

+					if (itemStyle != null)

+						itemStyle.AddAttributesToRender (writer);

+					writer.RenderBeginTag (HtmlTextWriterTag.Td);

+				}

+

+				user.RenderItem (ListItemType.Header, -1, this, writer);

+				

+				if (isTable){

+					writer.RenderEndTag();

+					writer.RenderEndTag();

+				} else if (!outerTableImp)

+						writer.WriteFullBeginTag ("br");

+			}

+

+			for (int index = 0; index < total; index++){

+				if (isTable && index == 0)

+					writer.RenderBeginTag (HtmlTextWriterTag.Tr);

+

+				if (isTable){

+					itemStyle = user.GetItemStyle (ListItemType.Item, index);

+					if (itemStyle != null)

+						itemStyle.AddAttributesToRender(writer);

+					writer.RenderBeginTag(HtmlTextWriterTag.Td);

+				}

+

+				user.RenderItem(ListItemType.Item, index, this, writer);

+				if (isTable)

+					writer.RenderEndTag ();

+

+				if (hasSeps && index != (total - 1)){

+					if (isTable){

+						itemStyle = user.GetItemStyle (ListItemType.Separator, index);

+						if (itemStyle != null)

+							itemStyle.AddAttributesToRender (writer);

+						writer.RenderBeginTag (HtmlTextWriterTag.Td);

+					}

+					user.RenderItem (ListItemType.Separator, index, this, writer);

+					if (isTable)

+						writer.RenderEndTag ();

+				}

+				rowsCount++;

+				if (rowsCount == total || index == (total - 1)) {

+					if (isTable)

+						writer.RenderEndTag ();

+					else if (rowsCount < total)

+						writer.WriteFullBeginTag ("br");

+					rowsCount = 0;

+				}

+			}

+

+			if (user.HasFooter){

+				if (isTable){

+					writer.RenderBeginTag (HtmlTextWriterTag.Tr);

+					if (colsCount != 1)

+						writer.AddAttribute (HtmlTextWriterAttribute.Colspan,

+							colSpan.ToString(NumberFormatInfo.InvariantInfo));

+

+					itemStyle = user.GetItemStyle (ListItemType.Footer, -1);

+					if(itemStyle != null)

+						itemStyle.AddAttributesToRender (writer);

+					writer.RenderBeginTag (HtmlTextWriterTag.Td);

+				}

+				user.RenderItem (ListItemType.Footer, -1, this, writer);

+				if (isTable){

+					writer.RenderEndTag ();

+					writer.RenderEndTag ();

+				}

+			}

+

+			if (ctrl != null)

+				ctrl.RenderEndTag(writer);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeatLayout.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeatLayout.cs
new file mode 100755
index 00000000000..de1e81530e0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RepeatLayout.cs
@@ -0,0 +1,21 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     RepeatLayout

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum RepeatLayout

+	{

+		Table,

+		Flow

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
new file mode 100644
index 00000000000..2137daff18c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Repeater.cs
@@ -0,0 +1,377 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     Repeater

+ *

+ * Author:  Gaurav Vaish, Gonzalo Paniagua (gonzalo@ximian.com)

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ * (c) 2002 Ximian, Inc. (http://www.ximian.com)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+using System.Web.Utils;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultEvent("ItemCommand")]

+	[DefaultProperty("DataSource")]

+	//[Designer("??")]

+	[ParseChildren(true)]

+	[PersistChildren(false)]

+	public class Repeater : Control, INamingContainer

+	{

+		private static readonly object ItemCommandEvent   = new object();

+		private static readonly object ItemCreatedEvent   = new object();

+		private static readonly object ItemDataBoundEvent = new object();

+

+		private static readonly string ITEMCOUNT = "Repeater_Item_Count";

+

+		private ITemplate alternatingItemTemplate;

+		private ITemplate footerTemplate;

+		private ITemplate headerTemplate;

+		private ITemplate itemTemplate;

+		private ITemplate separatorTemplate;

+		private object    dataSource;

+

+		private RepeaterItemCollection items;

+		private ArrayList              itemsArrayList;

+

+		public Repeater(): base()

+		{

+		}

+

+		public event RepeaterCommandEventHandler ItemCommand

+		{

+			add

+			{

+				Events.AddHandler(ItemCommandEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(ItemCommandEvent, value);

+			}

+		}

+

+		public event RepeaterItemEventHandler ItemCreated

+		{

+			add

+			{

+				Events.AddHandler(ItemCreatedEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(ItemCreatedEvent, value);

+			}

+		}

+

+		public event RepeaterItemEventHandler ItemDataBound

+		{

+			add

+			{

+				Events.AddHandler(ItemDataBoundEvent, value);

+			}

+			remove

+			{

+				Events.RemoveHandler(ItemDataBoundEvent, value);

+			}

+		}

+

+		public virtual ITemplate AlternatingItemTemplate

+		{

+			get

+			{

+				return alternatingItemTemplate;

+			}

+			set

+			{

+				alternatingItemTemplate = value;

+			}

+		}

+

+		public override ControlCollection Controls

+		{

+			get

+			{

+				EnsureChildControls();

+				return base.Controls;

+			}

+		}

+

+		public virtual string DataMember

+		{

+			get

+			{

+				object o = ViewState["DataMember"];

+				if(o != null)

+				{

+					return (string)o;

+				}

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["DataMember"] = value;

+			}

+		}

+

+		public virtual object DataSource

+		{

+			get

+			{

+				return dataSource;

+			}

+			set

+			{

+				dataSource = value;

+			}

+		}

+

+		public virtual ITemplate FooterTemplate

+		{

+			get

+			{

+				return footerTemplate;

+			}

+			set

+			{

+				footerTemplate = value;

+			}

+		}

+

+		public virtual ITemplate HeaderTemplate

+		{

+			get

+			{

+				return headerTemplate;

+			}

+			set

+			{

+				headerTemplate = value;

+			}

+		}

+

+		public virtual RepeaterItemCollection Items

+		{

+			get

+			{

+				if(items != null)

+				{

+					if(itemsArrayList != null)

+					{

+						EnsureChildControls();

+					}

+					items = new RepeaterItemCollection(itemsArrayList);

+				}

+				return items;

+			}

+		}

+

+		public virtual ITemplate ItemTemplate

+		{

+			get

+			{

+				return itemTemplate;

+			}

+			set

+			{

+				itemTemplate = value;

+			}

+		}

+

+		public virtual ITemplate SeparatorTemplate

+		{

+			get

+			{

+				return separatorTemplate;

+			}

+			set

+			{

+				separatorTemplate = value;

+			}

+		}

+

+		public override void DataBind()

+		{

+			OnDataBinding(EventArgs.Empty);

+		}

+

+		protected override void CreateChildControls()

+		{

+			Controls.Clear();

+			if(ViewState[ITEMCOUNT] != null)

+			{

+				CreateControlHierarchy(false);

+			} else

+			{

+				itemsArrayList = new ArrayList();

+			}

+			ClearChildViewState();

+		}

+

+		private RepeaterItem CreateItem (int itemIndex,

+				                 ListItemType itemType,

+						 bool dataBind,

+						 object dataItem)

+		{

+			RepeaterItem repeaterItem = new RepeaterItem (itemIndex, itemType);

+			RepeaterItemEventArgs repeaterEventArgs = new RepeaterItemEventArgs (repeaterItem);

+			InstantiateItem (repeaterItem);

+			if (dataBind)

+				repeaterItem.DataItem = dataItem;

+			OnItemCreated (repeaterEventArgs);

+			Controls.Add (repeaterItem);

+			if (dataBind) {

+				repeaterItem.DataBind ();

+				OnItemDataBound (repeaterEventArgs);

+				repeaterItem.DataItem = null;

+			}

+			return repeaterItem;

+		}

+

+		private void InstantiateItem (RepeaterItem item)

+		{

+			ITemplate template;

+			switch (item.ItemType) {

+				case ListItemType.Header:

+					template = this.headerTemplate;

+					break;

+				case ListItemType.Footer:

+					template = this.footerTemplate;

+					break;

+				case ListItemType.Item:

+					template = this.itemTemplate;

+					break;

+				case ListItemType.AlternatingItem:

+					template = this.alternatingItemTemplate;

+					break;

+				case ListItemType.Separator:

+					template = this.separatorTemplate;

+					break;

+				default:

+					throw new HttpException ("Unknown ListItemType: " + item.ItemType);

+			}

+

+			template.InstantiateIn (item);

+		}

+

+		protected virtual void CreateControlHierarchy (bool useDataSource)

+		{

+			ArrayList itemList = new ArrayList ();

+			items = new RepeaterItemCollection (itemList);

+			IEnumerable ds = null;

+			if (useDataSource)

+				ds = DataSourceHelper.GetResolvedDataSource (DataSource, DataMember);

+

+			if (!useDataSource) {

+				int itemCount  = (int) ViewState [ITEMCOUNT];

+				if (itemCount != -1) 

+					ds = new ArrayList (itemCount);

+			}

+

+			if (ds == null)

+				return;

+

+			if (headerTemplate != null)

+				CreateItem (-1, ListItemType.Header, useDataSource, null);

+

+			bool even = true;

+			int index = 0;

+			foreach (object item in ds){

+				if (separatorTemplate != null && index > 0)

+					CreateItem (index - 1, ListItemType.Separator, useDataSource, null);

+

+				RepeaterItem repeaterItem;

+				ListItemType lType;

+				if (!even && alternatingItemTemplate != null)

+					lType = ListItemType.AlternatingItem;

+				else

+					lType = ListItemType.Item;

+					

+				repeaterItem = CreateItem (index, lType, useDataSource, item);

+				itemList.Add (repeaterItem);

+				index++;

+				even = !even;

+			}

+

+			if (footerTemplate != null)

+				CreateItem (-1, ListItemType.Footer, useDataSource, null);

+		}

+

+		protected override bool OnBubbleEvent(object sender, EventArgs e)

+		{

+			bool retVal = false;

+			if(e is RepeaterCommandEventArgs)

+			{

+				OnItemCommand((RepeaterCommandEventArgs)e);

+				retVal = true;

+			}

+			return retVal;

+		}

+

+		protected override void OnDataBinding(EventArgs e)

+		{

+			base.OnDataBinding(e);

+			Controls.Clear();

+			ClearChildViewState();

+			CreateControlHierarchy(true);

+			ChildControlsCreated = true;

+		}

+

+		protected virtual void OnItemCommand(RepeaterCommandEventArgs e)

+		{

+			if(Events != null)

+			{

+				RepeaterCommandEventHandler rceh = (RepeaterCommandEventHandler) 

+									Events [ItemCommandEvent];

+				if(rceh != null)

+				{

+					rceh(this, e);

+				}

+			}

+		}

+

+		protected virtual void OnItemCreated(RepeaterItemEventArgs e)

+		{

+			if(Events != null)

+			{

+				RepeaterItemEventHandler rceh = (RepeaterItemEventHandler) 

+									Events [ItemCreatedEvent];

+				if(rceh != null)

+				{

+					rceh(this, e);

+				}

+			}

+		}

+

+		protected virtual void OnItemDataBound(RepeaterItemEventArgs e)

+		{

+			if(Events != null)

+			{

+				RepeaterItemEventHandler rceh = (RepeaterItemEventHandler)

+									Events [ItemDataBoundEvent];

+				if(rceh != null)

+				{

+					rceh(this, e);

+				}

+			}

+		}

+

+		protected virtual RepeaterItem CreateItem (int itemIndex, ListItemType itemType)

+		{

+			return new RepeaterItem (itemIndex, itemType);

+		}

+

+		protected virtual void InitializeItem (RepeaterItem item)

+		{

+			InstantiateItem (item);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterCommandEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterCommandEventArgs.cs
new file mode 100644
index 00000000000..1d2e5c298ff
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterCommandEventArgs.cs
@@ -0,0 +1,46 @@
+/**

+* Namespace: System.Web.UI.WebControls

+* Class:     RepeaterCommandEventArgs

+*

+* Author:  Gaurav Vaish

+* Maintainer: gvaish@iitk.ac.in

+* Implementation: yes

+* Status:  100%

+*

+* (C) Gaurav Vaish (2001)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class RepeaterCommandEventArgs: CommandEventArgs

+	{

+		private RepeaterItem rItem;

+		private object       cmdSrc;

+

+		public RepeaterCommandEventArgs(RepeaterItem item, object commandSource, CommandEventArgs originalArgs): base(originalArgs)

+		{

+			rItem = item;

+			cmdSrc = commandSource;

+		}

+

+		public object CommandSource

+		{

+			get

+			{

+				return cmdSrc;

+			}

+		}

+		

+		public RepeaterItem Item

+		{

+			get

+			{

+				return rItem;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterCommandEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterCommandEventHandler.cs
new file mode 100644
index 00000000000..1d93d3d8a67
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterCommandEventHandler.cs
@@ -0,0 +1,16 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ *
+ * Author: Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact:  <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status: 100%
+ *
+ * (C) Gaurav Vaish (2001)
+ */
+
+namespace System.Web.UI.WebControls
+{
+	public delegate void RepeaterCommandEventHandler(object sender, RepeaterCommandEventArgs e);
+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItem.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItem.cs
new file mode 100644
index 00000000000..69adc3bb369
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItem.cs
@@ -0,0 +1,72 @@
+/**

+* Namespace: System.Web.UI.WebControls

+* Class:     RepeaterItem

+*

+* Author:  Gaurav Vaish

+* Maintainer: gvaish@iitk.ac.in

+* Implementation: yes

+* Status:  100%

+*

+* (C) Gaurav Vaish (2001)

+*/

+

+using System;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[ToolboxItem(false)]

+	public class RepeaterItem: Control, INamingContainer

+	{

+		private int          itemIndex;

+		private ListItemType itemType;

+		private object       dataItem;

+

+		public RepeaterItem(int itemIndex, ListItemType itemType)

+		{

+			this.itemIndex = itemIndex;

+			this.itemType  = itemType;

+		}

+

+		public virtual object DataItem

+		{

+			get

+			{

+				return dataItem;

+			}

+			set

+			{

+				dataItem = value;

+			}

+		}

+

+		public virtual int ItemIndex

+		{

+			get

+			{

+				return itemIndex;

+			}

+		}

+

+		public virtual ListItemType ItemType

+		{

+			get

+			{

+				return itemType;

+			}

+		}

+

+		protected override bool OnBubbleEvent(object source, EventArgs e)

+		{

+			if(e is CommandEventArgs)

+			{

+				RepeaterCommandEventArgs rcea = new RepeaterCommandEventArgs(this, source, (CommandEventArgs)e);

+				RaiseBubbleEvent(source, rcea);

+				return true;

+			}

+			return false;

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemCollection.cs
new file mode 100644
index 00000000000..a77a5549562
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemCollection.cs
@@ -0,0 +1,83 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     RepeaterItemCollection

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class RepeaterItemCollection : ICollection, IEnumerable

+	{

+		private ArrayList items;

+

+		public RepeaterItemCollection(ArrayList items)

+		{

+			this.items = items;

+		}

+

+		public int Count

+		{

+			get

+			{

+				return items.Count;

+			}

+		}

+

+		public bool IsReadOnly

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public bool IsSynchronized

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public RepeaterItem this[int index]

+		{

+			get

+			{

+				return (RepeaterItem)(items[index]);

+			}

+		}

+

+		public object SyncRoot

+		{

+			get

+			{

+				return this;

+			}

+		}

+

+		public void CopyTo(Array array, int index)

+		{

+			foreach(RepeaterItem current in this)

+			{

+				array.SetValue(current, index++);

+			}

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			return items.GetEnumerator();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemEventArgs.cs
new file mode 100644
index 00000000000..4ccd5dc1269
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemEventArgs.cs
@@ -0,0 +1,37 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     RepeaterItemEventArgs

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class RepeaterItemEventArgs : EventArgs

+	{

+		private RepeaterItem item;

+

+		public RepeaterItemEventArgs(RepeaterItem item)

+		{

+			this.item = item;

+		}

+		

+		public RepeaterItem Item

+		{

+			get

+			{

+				return item;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemEventHandler.cs
new file mode 100644
index 00000000000..73f7913171c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RepeaterItemEventHandler.cs
@@ -0,0 +1,16 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ *
+ * Author: Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact:  <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status: 100%
+ *
+ * (C) Gaurav Vaish (2001)
+ */
+
+namespace System.Web.UI.WebControls
+{
+	public delegate void RepeaterItemEventHandler(object sender, RepeaterItemEventArgs e);
+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/RequiredFieldValidator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/RequiredFieldValidator.cs
new file mode 100644
index 00000000000..907d1ccc7b2
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/RequiredFieldValidator.cs
@@ -0,0 +1,60 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     RequiredFieldValidator

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	[ToolboxData("<{0}:RequiredFieldValidator runat=\"server\" "

+	           + "ErrorMessage=\"RequiredFieldValidator\">"

+	           + "</{0}:RequiredFieldValidator>")]

+	public class RequiredFieldValidator : BaseValidator

+	{

+		public RequiredFieldValidator(): base()

+		{

+		}

+

+		public string InitialValue

+		{

+			get

+			{

+				object o = ViewState["InitialValue"];

+				if(o != null)

+					return (String)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["InitialValue"] = value;

+			}

+		}

+

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender(writer);

+			if(RenderUplevel)

+			{

+				writer.AddAttribute("evaluationfunction", "RequiredFieldValidatorEvaluateIsValid");

+				writer.AddAttribute("initialvalue", InitialValue);

+			}

+		}

+

+		protected override bool EvaluateIsValid()

+		{

+			string val = GetControlValidationValue(ControlToValidate);

+			if(val != null)

+			{

+				return (val.Trim() != InitialValue.Trim());

+			}

+			return true;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/SelectedDatesCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/SelectedDatesCollection.cs
new file mode 100644
index 00000000000..fa3776a70d8
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/SelectedDatesCollection.cs
@@ -0,0 +1,120 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     SelectedDatesCollection

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class SelectedDatesCollection : ICollection, IEnumerable

+	{

+		ArrayList dateList;

+

+		public SelectedDatesCollection(ArrayList dateList)

+		{

+			this.dateList = dateList;

+		}

+

+		public int Count

+		{

+			get

+			{

+				return dateList.Count;

+			}

+		}

+

+		public bool IsReadOnly

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public bool IsSynchronized

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public DateTime this[int index]

+		{

+			get

+			{

+				return (DateTime)(dateList[index]);

+			}

+		}

+

+		public object SyncRoot

+		{

+			get

+			{

+				return this;

+			}

+		}

+

+		public void Add(DateTime date)

+		{

+			dateList.Add(date);

+		}

+

+		public void Clear()

+		{

+			dateList.Clear();

+		}

+

+		public bool Contains(DateTime date)

+		{

+			return dateList.Contains(date);

+		}

+

+		public void CopyTo(Array array, int index)

+		{

+			foreach(DateTime current in this)

+			{

+				array.SetValue(current, index++);

+			}

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			return dateList.GetEnumerator();

+		}

+

+		public void Remove(DateTime date)

+		{

+			dateList.Remove(date);

+		}

+

+		public void SelectRange(DateTime fromDate, DateTime toDate)

+		{

+			dateList.Clear();

+			//FIXME: Probable bug in MS implementation. It SHOULD NOT

+			// clear the list if fromDate > toDate

+			if(fromDate > toDate)

+			{

+				return;

+			}

+			DateTime local = fromDate;

+			do

+			{

+				dateList.Add(local);

+				local = local.AddDays(1);

+			} while(local < toDate);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventArgs.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventArgs.cs
new file mode 100644
index 00000000000..1bfd0aabfd0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventArgs.cs
@@ -0,0 +1,42 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     ServerValidateEventArgs

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class ServerValidateEventArgs : EventArgs

+	{

+		private bool isValid;

+		private string value;

+

+		public ServerValidateEventArgs(string value, bool isValid)

+		{

+			this.value = value;

+			this.isValid = isValid;

+		}

+

+		public bool IsValid

+		{

+			get { return isValid; }

+			set { isValid = value; }

+		}

+

+		public string Value

+		{

+			get { return value; }

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventHandler.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventHandler.cs
new file mode 100644
index 00000000000..b37ffd5f26f
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ServerValidateEventHandler.cs
@@ -0,0 +1,16 @@
+/**
+ * Namespace: System.Web.UI.WebControls
+ *
+ * Author: Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact:  <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status: 100%
+ *
+ * (C) Gaurav Vaish (2001)
+ */
+
+namespace System.Web.UI.WebControls
+{
+	public delegate void ServerValidateEventHandler(object sender, ServerValidateEventArgs e);
+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
new file mode 100644
index 00000000000..3aea32ef075
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Style.cs
@@ -0,0 +1,539 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     Style

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Text;

+using System.Collections;

+using System.Drawing;

+using System.Globalization;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[ToolboxItem(false)]

+	[TypeConverter(typeof(ExpandableObjectConverter))]

+	public class Style : Component , IStateManager

+	{

+		internal static int MARKED      = (0x01 << 0);

+		internal static int BACKCOLOR   = (0x01 << 1);

+		internal static int BORDERCOLOR = (0x01 << 2);

+		internal static int BORDERSTYLE = (0x01 << 3);

+		internal static int BORDERWIDTH = (0x01 << 4);

+		internal static int CSSCLASS    = (0x01 << 5);

+		internal static int FORECOLOR   = (0x01 << 6);

+		internal static int HEIGHT      = (0x01 << 7);

+		internal static int WIDTH       = (0x01 << 8);

+		internal static int FONT_BOLD   = (0x01 << 9);

+		internal static int FONT_ITALIC = (0x01 << 10);

+		internal static int FONT_NAMES  = (0x01 << 11);

+		internal static int FONT_SIZE   = (0x01 << 12);

+		internal static int FONT_STRIKE = (0x01 << 13);

+		internal static int FONT_OLINE  = (0x01 << 14);

+		internal static int FONT_ULINE  = (0x01 << 15);

+

+		internal static string selectionBitString = "_SystemWebUIWebControlsStyle_SBS";

+

+		private StateBag viewState;

+		private int      selectionBits;

+		private bool     selfStateBag;

+

+		private FontInfo font;

+

+		public Style()

+		{

+			Initialize(null);

+			selfStateBag = true;

+		}

+

+		public Style(StateBag bag): base()

+		{

+			Initialize(bag);

+			selfStateBag = false;

+		}

+

+		private void Initialize(StateBag bag)

+		{

+			viewState     = bag;

+			selectionBits = 0x00;

+		}

+

+		protected internal StateBag ViewState

+		{

+			get

+			{

+				if(viewState == null)

+				{

+					viewState = new StateBag(false);

+					if(IsTrackingViewState)

+						viewState.TrackViewState();

+				}

+				return viewState;

+			}

+		}

+

+		internal bool IsSet(int bit)

+		{

+			return ( (selectionBits & bit) != 0x00);

+		}

+

+		internal virtual void Set(int bit)

+		{

+			selectionBits |= bit;

+			if(IsTrackingViewState)

+				selectionBits |= MARKED;

+		}

+

+		public Color BackColor

+		{

+			get

+			{

+				if(IsSet(BACKCOLOR))

+					return (Color)ViewState["BackColor"];

+				return Color.Empty;

+			}

+			set

+			{

+				ViewState["BackColor"] = value;

+				Set(BACKCOLOR);

+			}

+		}

+

+		public Color BorderColor

+		{

+			get

+			{

+				if(IsSet(BORDERCOLOR))

+					return (Color)ViewState["BorderColor"];

+				return Color.Empty;

+			}

+			set

+			{

+				ViewState["BorderColor"] = value;

+				Set(BORDERCOLOR);

+			}

+		}

+

+		public BorderStyle BorderStyle

+		{

+			get

+			{

+				if(IsSet(BORDERSTYLE))

+					return (BorderStyle)ViewState["BorderStyle"];

+				return BorderStyle.NotSet;

+			}

+			set

+			{

+				ViewState["BorderStyle"] = value;

+				Set(BORDERSTYLE);

+			}

+		}

+

+		public Unit BorderWidth

+		{

+			get

+			{

+				if(IsSet(BORDERWIDTH))

+					return (Unit)ViewState["BorderWidth"];

+				return Unit.Empty;

+			}

+			set

+			{

+				ViewState["BorderWidth"] = value;

+				Set(BORDERWIDTH);

+			}

+		}

+

+		public string CssClass

+		{

+			get

+			{

+				if(IsSet(CSSCLASS))

+					return (string)ViewState["CssClass"];

+				return string.Empty;

+			}

+			set

+			{

+				ViewState["CssClass"] = value;

+				Set(CSSCLASS);

+			}

+		}

+

+		public Color ForeColor

+		{

+			get

+			{

+				if(IsSet(FORECOLOR))

+					return (Color)ViewState["ForeColor"];

+				return Color.Empty;

+			}

+			set

+			{

+				ViewState["ForeColor"] = value;

+				Set(FORECOLOR);

+			}

+		}

+

+		public Unit Height

+		{

+			get

+			{

+				if(IsSet(HEIGHT))

+					return (Unit)ViewState["Height"];

+				return Unit.Empty;

+			}

+			set

+			{

+				ViewState["Height"] = value;

+				Set(HEIGHT);

+			}

+		}

+

+		public Unit Width

+		{

+			get

+			{

+				if(IsSet(WIDTH))

+					return (Unit)ViewState["Width"];

+				return Unit.Empty;

+			}

+			set

+			{

+				ViewState["Width"] = value;

+				Set(WIDTH);

+			}

+		}

+

+		public FontInfo Font

+		{

+			get

+			{

+				if(font==null)

+					font = new FontInfo(this);

+				return font;

+			}

+		}

+

+		protected internal virtual bool IsEmpty

+		{

+			get { return (selectionBits == 0); }

+		}

+

+		private void AddColor(HtmlTextWriter writer, HtmlTextWriterStyle style, Color color)

+		{

+			if(!color.IsEmpty)

+				writer.AddStyleAttribute(style, ColorTranslator.ToHtml(color));

+		}

+

+		private static string StringArrayToString(string[] array, char separator)

+		{

+			if(array.Length == 0)

+				return String.Empty;

+			StringBuilder sb = new StringBuilder();

+			for(int i=0; i < array.Length; i++)

+			{

+				if(i==0)

+				{

+					sb.Append(array[0]);

+				} else

+				{

+					sb.Append(separator);

+					sb.Append(array[i]);

+				}

+			}

+			return sb.ToString();

+		}

+

+		public void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			AddAttributesToRender(writer, null);

+		}

+

+		public virtual void AddAttributesToRender(HtmlTextWriter writer, WebControl owner)

+		{

+			if(IsSet(BACKCOLOR))

+			{

+				AddColor(writer, HtmlTextWriterStyle.BackgroundColor, (Color)ViewState["BackColor"]);

+			}

+

+			if(IsSet(BORDERCOLOR))

+			{

+				AddColor(writer, HtmlTextWriterStyle.BorderColor, (Color)ViewState["BorderColor"]);

+			}

+

+			if(IsSet(FORECOLOR))

+			{

+				AddColor(writer, HtmlTextWriterStyle.Color, (Color)ViewState["ForeColor"]);

+			}

+

+			if(IsSet(CSSCLASS))

+			{

+				string cssClass = (string)ViewState["CssClass"];

+				if(cssClass.Length > 0)

+					writer.AddAttribute(HtmlTextWriterAttribute.Class, cssClass);

+			}

+

+			if(!BorderWidth.IsEmpty)

+			{

+				writer.AddStyleAttribute(HtmlTextWriterStyle.BorderWidth, BorderWidth.ToString(CultureInfo.InvariantCulture));

+				if(BorderStyle!=BorderStyle.NotSet)

+				{

+					writer.AddStyleAttribute(HtmlTextWriterStyle.BorderStyle, Enum.Format(typeof(BorderStyle), BorderStyle, "G"));

+				} else

+				{

+					if(BorderWidth.Value != 0.0)

+					{

+						writer.AddStyleAttribute(HtmlTextWriterStyle.BorderStyle, "solid");

+					}

+				}

+			} else

+			{

+				if(BorderStyle!=BorderStyle.NotSet)

+				{

+					writer.AddStyleAttribute(HtmlTextWriterStyle.BorderStyle, Enum.Format(typeof(BorderStyle), BorderStyle, "G"));

+				}

+			}

+

+			if(Font.Names.Length > 0)

+			{

+				writer.AddStyleAttribute(HtmlTextWriterStyle.FontFamily, StringArrayToString(Font.Names,','));

+			}

+

+			if(!Font.Size.IsEmpty)

+			{

+				writer.AddStyleAttribute(HtmlTextWriterStyle.FontSize, Font.Size.ToString(CultureInfo.InvariantCulture));

+			}

+

+			if(Font.Bold)

+			{

+				writer.AddStyleAttribute(HtmlTextWriterStyle.FontWeight, "bold");

+			}

+

+			if(Font.Italic)

+			{

+				writer.AddStyleAttribute(HtmlTextWriterStyle.FontStyle, "italic");

+			}

+

+			string textDecoration = String.Empty;

+			if(Font.Strikeout)

+			{

+				textDecoration += " strikeout";

+			}

+			if(Font.Underline)

+			{

+				textDecoration += " underline";

+			}

+			if(Font.Overline)

+			{

+				textDecoration += " overline";

+			}

+			if(textDecoration.Length > 0)

+			{

+				writer.AddStyleAttribute(HtmlTextWriterStyle.TextDecoration, textDecoration);

+			}

+

+			Unit u = Unit.Empty;

+			if(IsSet(HEIGHT))

+			{

+				u = (Unit)ViewState["Height"];

+				writer.AddStyleAttribute(HtmlTextWriterStyle.Height, u.ToString(CultureInfo.InvariantCulture));

+			}

+			if(IsSet(WIDTH))

+			{

+				u = (Unit)ViewState["Width"];

+				writer.AddStyleAttribute(HtmlTextWriterStyle.Width, u.ToString(CultureInfo.InvariantCulture));

+			}

+		}

+

+		public virtual void CopyFrom(Style source)

+		{

+			if(source!=null && !source.IsEmpty)

+			{

+				Font.CopyFrom(source.Font);

+				if(source.Height!=Unit.Empty)

+				{

+					Height = source.Height;

+				}

+				if(source.Width!=Unit.Empty)

+				{

+					Width = source.Width;

+				}

+				if(source.BorderColor!=Color.Empty)

+				{

+					BorderColor = source.BorderColor;

+				}

+				if(source.BorderWidth!=Unit.Empty)

+				{

+					BorderWidth = source.BorderWidth;

+				}

+				if(source.BorderStyle!=BorderStyle.NotSet)

+				{

+					BorderStyle = source.BorderStyle;

+				}

+				if(source.BackColor!=Color.Empty)

+				{

+					BackColor = source.BackColor;

+				}

+				if(source.CssClass!=String.Empty)

+				{

+					CssClass = source.CssClass;

+				}

+				if(source.ForeColor!=Color.Empty)

+				{

+					ForeColor = source.ForeColor;

+				}

+			}

+		}

+

+		public virtual void MergeWith(Style with)

+		{

+			if(with!=null && !with.IsEmpty)

+			{

+				if(IsEmpty)

+				{

+					CopyFrom(with);

+					return;

+				}

+

+				Font.MergeWith(with.Font);

+				if(!IsSet(HEIGHT) && with.Height!=Unit.Empty)

+				{

+					Height = with.Height;

+				}

+				if(!IsSet(WIDTH) && with.Width!=Unit.Empty)

+				{

+					Width = with.Width;

+				}

+				if(!IsSet(BORDERCOLOR) && with.BorderColor!=Color.Empty)

+				{

+					BorderColor = with.BorderColor;

+				}

+				if(!IsSet(BORDERWIDTH) && with.BorderWidth!=Unit.Empty)

+				{

+					BorderWidth = with.BorderWidth;

+				}

+				if(!IsSet(BORDERSTYLE) && with.BorderStyle!=BorderStyle.NotSet)

+				{

+					BorderStyle = with.BorderStyle;

+				}

+				if(!IsSet(BACKCOLOR) && with.BackColor!=Color.Empty)

+				{

+					BackColor = with.BackColor;

+				}

+				if(!IsSet(CSSCLASS) && with.CssClass!=String.Empty)

+				{

+					CssClass = with.CssClass;

+				}

+				if(!IsSet(FORECOLOR) && with.ForeColor!=Color.Empty)

+				{

+					ForeColor = with.ForeColor;

+				}

+			}

+		}

+

+		public virtual void Reset()

+		{

+			if(IsSet(BACKCOLOR))

+				ViewState.Remove("BackColor");

+			if(IsSet(BORDERCOLOR))

+				ViewState.Remove("BorderColor");

+			if(IsSet(BORDERSTYLE))

+				ViewState.Remove("BorderStyle");

+			if(IsSet(BORDERWIDTH))

+				ViewState.Remove("BorderWidth");

+			if(IsSet(CSSCLASS))

+				ViewState.Remove("CssClass");

+			if(IsSet(FORECOLOR))

+				ViewState.Remove("ForeColor");

+			if(IsSet(HEIGHT))

+				ViewState.Remove("Height");

+			if(IsSet(WIDTH))

+				ViewState.Remove("Width");

+			if(font!=null)

+				font.Reset();

+			selectionBits = 0x00;

+		}

+

+		protected bool IsTrackingViewState

+		{

+			get

+			{

+				return ( (selectionBits & MARKED) != 0x00 );

+			}

+		}

+

+		protected internal virtual void TrackViewState()

+		{

+			if(viewState!=null)

+				ViewState.TrackViewState();

+			Set(MARKED);

+		}

+

+		protected internal virtual object SaveViewState()

+		{

+			if(viewState != null)

+			{

+				if(IsSet(MARKED))

+				{

+					ViewState[selectionBitString] = selectionBits;

+				}

+				if(selfStateBag)

+				{

+					return ViewState.SaveViewState();

+				}

+			}

+			return null;

+		}

+

+		protected internal void LoadViewState(object state)

+		{

+			if (state != null && selfStateBag)

+				ViewState.LoadViewState(state);

+

+			if (viewState != null) {

+				object o = ViewState[selectionBitString];

+				if (o != null)

+					selectionBits = (int) o;

+			}

+		}

+

+		void IStateManager.LoadViewState(object state)

+		{

+			LoadViewState(state);

+		}

+

+		object IStateManager.SaveViewState()

+		{

+			return SaveViewState();

+		}

+

+		void IStateManager.TrackViewState()

+		{

+			TrackViewState();

+		}

+

+		bool IStateManager.IsTrackingViewState

+		{

+			get

+			{

+				return IsTrackingViewState;

+			}

+		}

+

+		public override string ToString()

+		{

+			return String.Empty;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TODO b/mcs/class/System.Web/System.Web.UI.WebControls/TODO
new file mode 100755
index 00000000000..05abe9b822a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TODO
@@ -0,0 +1,156 @@
+All Classes, Interfaces, Structures, Delegates and Enumerations
+
+
+<attributesIssue>
+ Attributes may have to be supplied to the classes. Some of the attributes
+ include DefaultPropertyAttribute, ToolboxItemAttribute, ParseChildrenAttribute
+ (to be added to System.Web.UI) etc. Currently, I have not taken care of these
+ aspects. They are to be handled later on.
+</attributesIssue>
+
+<disposableItemsIssue>
+ I have not taken care of any disposing issues that may be involved. But I think
+ it will not be a problem since I am no where using unmanaged code.
+</disposableItemsIssue>
+
+<legends>
+*: Completed
+&: Work in progress. See <item-name>.cs file for maintainer's name
+</legends>
+
+* AdCreatedEventArgs
+* AdRotator
+* BaseCompareValidator
+* BaseDataList
+& BaseValidator
+& BoundColumn
+* Button
+* ButtonColumn
+& Calendar
+* CalendarDay
+* CheckBox
+* CheckBoxList
+* CommandEventArgs
+& CompareValidator
+* CustomValidator
+& DataGrid
+* DataGridColumn
+* DataGridColumnCollection
+* DataGridCommandEventArgs
+& DataGridItem
+* DataGridItemCollection
+* DataGridItemEventArgs
+* DataGridPageChangedEventArgs
+& DataGridPagerStyle
+* DataGridShortCommandEventArgs
+* DataKeyCollection
+& DataList
+* DataListCommandEventArgs
+& DataListItem
+* DataListItemCollecton
+* DataListItemEventArgs
+* DayRenderEventArgs
+* DropDownList
+& EditCommandColumn
+* FontInfo
+* FontNamesConverter
+& FontUnitConverter
+* HyperLink
+* HyperLinkColumn
+* HyperLinkControlBuilder
+* Image
+* ImageButton
+* Label
+* LabelControlBuilder
+* LinkButton
+* LinkButtonControlBuilder
+* ListBox
+* ListControl
+* ListItem
+* ListItemCollection
+* ListItemControlBuilder
+* Literal
+* LiteralControlBuilder
+* MonthChangedEventArgs
+* PagedDataSource
+* Panel
+* PlaceHolder
+* PlaceHolderControlBuilder
+* RadioButton
+& RadioButtonList
+* RangeValidator
+* RegularExpressionValidator
+& Repeater
+* RepeaterCommandEventArgs
+& RepeaterItem
+* RepeaterItemCollection
+* RepeaterItemEventArgs
+& RepeatInfo
+* RequiredFieldValidator
+* SelectedDatesCollection
+* ServerValidateEventArgs
+* Style
+* Table
+* TableCell
+* TableCellCollection
+* TableCellControlBuilder
+* TableHeaderCell
+* TableItemStyle
+* TableRow
+* TableRowCollection
+* TableStyle
+* TargetConverter
+* TemplateColumn
+& TextBox
+* TextBoxControlBuilder
+* UnitConverter
+* ValidatedControlConverter
+& ValidationSummary
+& WebColorConverter
+& WebControl
+& Xml
+
+* IRepeatInfoUser
+
+* FontUnit
+* Unit
+
+* AdCreatedEventHandler
+* CommandEventHandler
+* DataGridCommandEventHandler
+* DataGridItemEventHandler
+* DataGridPageChangedEventHandler
+* DataGridSortCommandEventHandler
+* DataListCommandEventHandler
+* DataListItemEventHandler
+* DayRenderEventHandler
+* MonthChangedEventHandler
+* RepeaterCommandEventHandler
+* RepeaterItemEventHandler
+* ServerValidateEventHandler
+
+* BorderStyle
+* ButtonColumnType
+* CalendarSelectionMode
+* DayNameFormat
+* FirstDayOfWeek
+* FontSize
+* GridLines
+* HorizontalAlign
+* ImageAlign
+* ListItemType
+* ListSelectionMode
+* NextPrevFormat
+* PagerMode
+* PagerPosition
+* RepeatDirection
+* RepeatLayout
+* TextAlign
+* TextBoxMode
+* TitleFormat
+* UnitType
+* ValidationCompareOperator
+* ValidationDataType
+* ValidationSummaryDisplayMode
+* ValidatorDisplay
+* VerticalAlign
diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs
new file mode 100644
index 00000000000..16d1cf25f18
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Table.cs
@@ -0,0 +1,159 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     Table

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Drawing;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultProperty("Rows")]

+	//[Designer("??")]

+	[ParseChildren(true, "Rows")]

+	public class Table: WebControl

+	{

+		private TableRowCollection rows;

+

+		private class TableRowControlCollection : ControlCollection

+		{

+			public TableRowControlCollection (Control owner) : base (owner)

+			{

+			}

+

+			public override void Add (Control child)

+			{

+				if (!(child is TableRow))

+					throw new ArgumentException (HttpRuntime.FormatResourceString (

+									"Cannot_Have_Children_Of_Type",

+									"Table",

+									child.GetType ().Name.ToString ()));

+				base.Add (child);

+			}

+

+			public override void AddAt(int index, Control child)

+			{

+				if (!(child is TableRow))

+					throw new ArgumentException (HttpRuntime.FormatResourceString (

+									"Cannot_Have_Children_Of_Type",

+									"Table",

+									child.GetType ().Name.ToString ()));

+				base.AddAt (index, child);

+			}

+		}

+

+		public Table () : base (HtmlTextWriterTag.Table)

+		{

+		}

+

+		public virtual string BackImageUrl

+		{

+			get {

+				if (ControlStyleCreated)

+					return ((TableStyle) ControlStyle).BackImageUrl;

+				return String.Empty;

+			}

+

+			set { ((TableStyle) ControlStyle).BackImageUrl = value; }

+		}

+

+		public virtual int CellPadding

+		{

+			get {

+				if (ControlStyleCreated)

+					return ((TableStyle) ControlStyle).CellPadding;

+				return -1;

+			}

+

+			set { ((TableStyle) ControlStyle).CellPadding = value; }

+		}

+

+		public virtual int CellSpacing

+		{

+			get {

+				if (ControlStyleCreated)

+					return ((TableStyle) ControlStyle).CellSpacing;

+				return -1;

+			}

+

+			set { ((TableStyle) ControlStyle).CellSpacing = value; }

+		}

+

+		public virtual GridLines GridLines

+		{

+			get {

+				if (ControlStyleCreated)

+					return ((TableStyle) ControlStyle).GridLines;

+				return GridLines.None;

+			}

+

+			set { ((TableStyle) ControlStyle).GridLines = value; }

+		}

+

+		public virtual HorizontalAlign HorizontalAlign

+		{

+			get {

+				if (ControlStyleCreated)

+					return ((TableStyle) ControlStyle).HorizontalAlign;

+				return HorizontalAlign.NotSet;

+			}

+

+			set { ((TableStyle) ControlStyle).HorizontalAlign = value; }

+		}

+

+		public virtual TableRowCollection Rows

+		{

+			get {

+				if (rows == null)

+					rows = new TableRowCollection (this);

+				return rows;

+			}

+		}

+

+		protected override void AddAttributesToRender (HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender (writer);

+			if(!BorderColor.IsEmpty)

+				writer.AddAttribute (HtmlTextWriterAttribute.Bordercolor,

+						     ColorTranslator.ToHtml (BorderColor));

+

+			Unit bw = BorderWidth;

+			if (GridLines == GridLines.None)

+				bw = Unit.Pixel (0);

+			else if (bw.IsEmpty || bw.Type == UnitType.Pixel)

+				bw = Unit.Pixel(1);

+

+			writer.AddAttribute (HtmlTextWriterAttribute.Border,

+					     ((int) bw.Value).ToString (NumberFormatInfo.InvariantInfo));

+		}

+

+		protected override ControlCollection CreateControlCollection ()

+		{

+			return new TableRowControlCollection (this);

+		}

+

+		protected override Style CreateControlStyle ()

+		{

+			return new TableStyle (ViewState);

+		}

+

+		protected override void RenderContents (HtmlTextWriter writer)

+		{

+			foreach (TableRow current in Rows)

+				 current.RenderControl (writer);

+		}

+	}

+}

+

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableCell.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableCell.cs
new file mode 100644
index 00000000000..cf8c19ae151
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableCell.cs
@@ -0,0 +1,147 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TableCell

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultProperty("Text")]

+	[ToolboxItem(false)]

+	[ControlBuilder(typeof(TableCellControlBuilder))]

+	[ParseChildren(false)]

+	[PersistChildren(true)]

+	public class TableCell: WebControl

+	{

+		public TableCell () : base (HtmlTextWriterTag.Td)

+		{

+			PreventAutoID ();

+		}

+

+		internal TableCell (HtmlTextWriterTag tag) : base (tag)

+		{

+			PreventAutoID ();

+		}

+

+		public virtual int ColumnSpan

+		{

+			get {

+				object o = ViewState ["ColumnSpan"];

+				return (o == null) ? 0 : (int) o;

+			}

+

+			set { ViewState ["ColumnSpan"] = value; }

+		}

+

+		public virtual int RowSpan

+		{

+			get {

+				object o = ViewState ["RowSpan"];

+				return (o == null) ? 0 : (int) o;

+			}

+

+			set { ViewState ["RowSpan"] = value; }

+		}

+

+		public virtual string Text

+		{

+			get {

+				object o = ViewState ["Text"];

+				return (o == null) ? String.Empty : (string) o;

+			}

+

+			set { ViewState ["Text"] = value; }

+		}

+

+		public virtual HorizontalAlign HorizontalAlign

+		{

+			get {

+				if (ControlStyleCreated)

+					return ((TableItemStyle) ControlStyle).HorizontalAlign;

+				return HorizontalAlign.NotSet;

+			}

+			set { ((TableItemStyle) ControlStyle).HorizontalAlign = value; }

+		}

+

+		public virtual VerticalAlign VerticalAlign

+		{

+			get {

+				if (ControlStyleCreated)

+					return ((TableItemStyle) ControlStyle).VerticalAlign;

+				return VerticalAlign.NotSet;

+			}

+

+			set { ((TableItemStyle) ControlStyle).VerticalAlign = value; }

+		}

+

+		public virtual bool Wrap

+		{

+			get {

+				if (ControlStyleCreated)

+					return ((TableItemStyle) ControlStyle).Wrap;

+				return true;

+			}

+			set { ((TableItemStyle) ControlStyle).Wrap = value; }

+		}

+

+		protected override void AddAttributesToRender (HtmlTextWriter writer)

+		{

+			base.AddAttributesToRender (writer);

+			if (ColumnSpan > 0)

+				writer.AddAttribute (HtmlTextWriterAttribute.Colspan,

+						     ColumnSpan.ToString (NumberFormatInfo.InvariantInfo));

+

+			if (RowSpan > 0)

+				writer.AddAttribute (HtmlTextWriterAttribute.Rowspan,

+						     RowSpan.ToString (NumberFormatInfo.InvariantInfo));

+		}

+

+		protected override void AddParsedSubObject (object obj)

+		{

+			if (HasControls ()){

+				base.AddParsedSubObject (obj);

+				return;

+			}

+

+			if (obj is LiteralControl){

+				Text = ((LiteralControl) obj).Text;

+				return;

+			}

+

+			string text = Text;

+			if (text.Length > 0){

+				Text = String.Empty;

+				base.AddParsedSubObject (new LiteralControl (text));

+			}

+

+			base.AddParsedSubObject (obj);

+		}

+

+		protected override Style CreateControlStyle ()

+		{

+			return new TableItemStyle (ViewState);

+		}

+

+		protected override void RenderContents (HtmlTextWriter writer)

+		{

+			if (HasControls ())

+				base.RenderContents (writer);

+			else

+				writer.Write (Text);

+		}

+	}

+}

+

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableCellCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableCellCollection.cs
new file mode 100644
index 00000000000..c3b442b91de
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableCellCollection.cs
@@ -0,0 +1,181 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TableCellCollection

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+using System.ComponentModel;

+

+namespace System.Web.UI.WebControls

+{

+	//[Editor("??")]

+	public sealed class TableCellCollection: IList, ICollection, IEnumerable

+	{

+		private TableRow owner;

+

+		internal TableCellCollection(TableRow owner)

+		{

+			if(owner == null)

+			{

+				throw new ArgumentNullException();

+			}

+			this.owner = owner;

+		}

+

+		public int Count

+		{

+			get

+			{

+				return owner.Controls.Count;

+			}

+		}

+

+		public bool IsReadOnly

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public bool IsSynchronized

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public TableCell this[int index]

+		{

+			get

+			{

+				return (TableCell)owner.Controls[index];

+			}

+		}

+

+		public object SyncRoot

+		{

+			get

+			{

+				return this;

+			}

+		}

+

+		public int Add(TableCell cell)

+		{

+			AddAt(-1, cell);

+			return owner.Controls.Count;

+		}

+

+		public void AddAt(int index, TableCell cell)

+		{

+			owner.Controls.AddAt(index, cell);

+		}

+

+		public void AddRange(TableCell[] cells)

+		{

+			foreach(TableCell cell in cells)

+			{

+				Add(cell);

+			}

+		}

+

+		public void Clear()

+		{

+			if(owner.HasControls())

+			{

+				owner.Controls.Clear();

+			}

+		}

+

+		public void CopyTo(Array array, int index)

+		{

+			foreach(object cell in this)

+			{

+				array.SetValue(cell, index++);

+			}

+		}

+

+		public int GetCellIndex(TableCell cell)

+		{

+			if(!owner.HasControls())

+			{

+				return -1;

+			}

+			return owner.Controls.IndexOf(cell);

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			return owner.Controls.GetEnumerator();

+		}

+

+		public void Remove(TableCell cell)

+		{

+			owner.Controls.Remove(cell);

+		}

+

+		public void RemoveAt(int index)

+		{

+			owner.Controls.RemoveAt(index);

+		}

+

+		int IList.Add(object o)

+		{

+			return Add((TableCell)o);

+		}

+

+		bool IList.Contains(object o)

+		{

+			return owner.Controls.Contains((TableCell)o);

+		}

+

+		int IList.IndexOf(object o)

+		{

+			return owner.Controls.IndexOf((TableCell)o);

+		}

+

+		void IList.Insert(int index, object o)

+		{

+			owner.Controls.AddAt(index, (TableCell)o);

+		}

+

+		void IList.Remove(object o)

+		{

+			owner.Controls.Remove((TableCell)o);

+		}

+

+		bool IList.IsFixedSize

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		object IList.this[int index]

+		{

+			get

+			{

+				return this[index];

+			}

+			set

+			{

+				RemoveAt(index);

+				AddAt(index, (TableCell)value);

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableCellControlBuilder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableCellControlBuilder.cs
new file mode 100644
index 00000000000..6363462fa51
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableCellControlBuilder.cs
@@ -0,0 +1,31 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TableCellControlBuilder

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class TableCellControlBuilder: ControlBuilder

+	{

+		public TableCellControlBuilder(): base()

+		{

+		}

+		

+		public override bool AllowWhitespaceLiterals()

+		{

+			return false;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableHeaderCell.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableHeaderCell.cs
new file mode 100644
index 00000000000..e3ccb0c1a93
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableHeaderCell.cs
@@ -0,0 +1,26 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TableHeaderCell

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class TableHeaderCell: TableCell

+	{

+		public TableHeaderCell(): base(HtmlTextWriterTag.Th)

+		{

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableItemStyle.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableItemStyle.cs
new file mode 100644
index 00000000000..9d848e5f5b0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableItemStyle.cs
@@ -0,0 +1,172 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TableItemStyle

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class TableItemStyle: Style

+	{

+		private static int H_ALIGN = (0x01 << 16);

+		private static int V_ALIGN = (0x01 << 17);

+		private static int WRAP    = (0x01 << 18);

+

+		public TableItemStyle(): base()

+		{

+		}

+

+		public TableItemStyle(StateBag bag): base(bag)

+		{

+		}

+

+		[Bindable(true)]

+		[DefaultValue(HorizontalAlign.NotSet)]

+		[NotifyParentProperty(true)]

+		[WebCategory("Layout")]

+		[WebSysDescription("TableItemStyle_HorizontalAlign")]

+		public virtual HorizontalAlign HorizontalAlign

+		{

+			get

+			{

+				if(IsSet(H_ALIGN))

+					return (HorizontalAlign)ViewState["HorizontalAlign"];

+				return HorizontalAlign.NotSet;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(HorizontalAlign), value))

+				{

+					throw new ArgumentException();

+				}

+				ViewState["HorizontalAlign"] = value;

+				Set(H_ALIGN);

+			}

+		}

+

+		[Bindable(true)]

+		[DefaultValue(VerticalAlign.NotSet)]

+		[NotifyParentProperty(true)]

+		[WebCategory("Layout")]

+		[WebSysDescription("TableItemStyle_VerticalAlign")]

+		public virtual VerticalAlign VerticalAlign

+		{

+			get

+			{

+				if(IsSet(V_ALIGN))

+					return (VerticalAlign)ViewState["VerticalAlign"];

+				return VerticalAlign.NotSet;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(VerticalAlign), value))

+				{

+					throw new ArgumentException();

+				}

+				ViewState["VerticalAlign"] = value;

+				Set(V_ALIGN);

+			}

+		}

+

+		[Bindable(true)]

+		[DefaultValue(VerticalAlign.NotSet)]

+		[NotifyParentProperty(true)]

+		[WebCategory("Layout")]

+		[WebSysDescription("TableItemStyle_Wrap")]

+		public virtual bool Wrap

+		{

+			get

+			{

+				if(IsSet(WRAP))

+					return (bool)ViewState["Wrap"];

+				return true;

+			}

+			set

+			{

+				ViewState["Wrap"] = value;

+			}

+		}

+

+		public override void CopyFrom(Style s)

+		{

+			if(s!=null && s is TableItemStyle && !s.IsEmpty)

+			{

+				base.CopyFrom(s);

+				TableItemStyle from = (TableItemStyle)s;

+				if(from.IsSet(H_ALIGN))

+				{

+					HorizontalAlign = from.HorizontalAlign;

+				}

+				if(from.IsSet(V_ALIGN))

+				{

+					VerticalAlign = from.VerticalAlign;

+				}

+				if(from.IsSet(WRAP))

+				{

+					Wrap = from.Wrap;

+				}

+			}

+		}

+

+		public override void MergeWith(Style s)

+		{

+			if(s!=null && s is TableItemStyle && !s.IsEmpty)

+			{

+				base.MergeWith(s);

+				TableItemStyle with = (TableItemStyle)s;

+				if(with.IsSet(H_ALIGN) && !IsSet(H_ALIGN))

+				{

+					HorizontalAlign = with.HorizontalAlign;

+				}

+				if(with.IsSet(V_ALIGN) && !IsSet(V_ALIGN))

+				{

+					VerticalAlign = with.VerticalAlign;

+				}

+				if(with.IsSet(WRAP) && !IsSet(WRAP))

+				{

+					Wrap = with.Wrap;

+				}

+			}

+		}

+

+		public override void Reset()

+		{

+			if(IsSet(H_ALIGN))

+				ViewState.Remove("HorizontalAlign");

+			if(IsSet(V_ALIGN))

+				ViewState.Remove("VerticalAlign");

+			if(IsSet(WRAP))

+				ViewState.Remove("Wrap");

+			base.Reset();

+		}

+

+		public override void AddAttributesToRender(HtmlTextWriter writer, WebControl owner)

+		{

+			base.AddAttributesToRender(writer, owner);

+			if(!Wrap)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Nowrap, "nowrap");

+			}

+			if(HorizontalAlign != HorizontalAlign.NotSet)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Align, TypeDescriptor.GetConverter(typeof(HorizontalAlign)).ConvertToString(HorizontalAlign));

+			}

+			if(VerticalAlign != VerticalAlign.NotSet)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Valign, TypeDescriptor.GetConverter(typeof(VerticalAlign)).ConvertToString(VerticalAlign));

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
new file mode 100644
index 00000000000..a0a1d82c922
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableRow.cs
@@ -0,0 +1,99 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TableRow

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultProperty("Cells")]

+	[ParseChildren(true, "Cells")]

+	public class TableRow: WebControl

+	{

+		private TableCellCollection cells;

+

+		public TableRow() : base (HtmlTextWriterTag.Tr)

+		{

+			PreventAutoID ();

+		}

+

+		public virtual TableCellCollection Cells

+		{

+			get {

+				if (cells == null)

+					cells = new TableCellCollection (this);

+				return cells;

+			}

+		}

+

+		public virtual HorizontalAlign HorizontalAlign

+		{

+			get {

+				object o = ViewState ["HorizontalAlign"];

+				return (o == null) ? HorizontalAlign.NotSet : (HorizontalAlign) o;

+			}

+

+			set { ViewState ["HorizontalAlign"] = value; }

+		}

+

+		public virtual VerticalAlign VerticalAlign

+		{

+			get {

+				object o = ViewState ["VerticalAlign"];

+				return (o == null) ? VerticalAlign.NotSet : (VerticalAlign) o;

+			}

+

+			set { ViewState ["VerticalAlign"] = value; }

+		}

+

+		protected override Style CreateControlStyle ()

+		{

+			return new TableItemStyle (ViewState);

+		}

+

+		protected override ControlCollection CreateControlCollection ()

+		{

+			return new CellControlCollection (this);

+		}

+

+		protected class CellControlCollection : ControlCollection

+		{

+			internal CellControlCollection (Control owner) : base (owner)

+			{

+			}

+

+			public override void Add (Control child)

+			{

+				if (!(child is TableCell))

+					throw new ArgumentException (HttpRuntime.FormatResourceString (

+								     "Cannot_Have_Children_Of_Type",

+								     "TableRow",

+								     GetType ().Name.ToString ()));

+				base.Add (child);

+			}

+

+			public override void AddAt(int index, Control child)

+			{

+				if (!(child is TableCell))

+					throw new ArgumentException (HttpRuntime.FormatResourceString (

+								     "Cannot_Have_Children_Of_Type",

+								     "TableRow",

+								     GetType ().Name.ToString ()));

+				base.AddAt (index, child);

+			}

+		}

+	}

+}

+

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs
new file mode 100644
index 00000000000..b2db6123249
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableRowCollection.cs
@@ -0,0 +1,179 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TableRowCollection

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Collections;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public sealed class TableRowCollection: IList, ICollection, IEnumerable

+	{

+		Table owner;

+

+		internal TableRowCollection(Table owner)

+		{

+			if(owner == null)

+			{

+				throw new ArgumentNullException();

+			}

+			this.owner = owner;

+		}

+

+		public int Count

+		{

+			get

+			{

+				return owner.Controls.Count;

+			}

+		}

+

+		public bool IsReadOnly

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public bool IsSynchronized

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		public TableRow this[int index]

+		{

+			get

+			{

+				return (TableRow)owner.Controls[index];

+			}

+		}

+

+		public object SyncRoot

+		{

+			get

+			{

+				return this;

+			}

+		}

+

+		public int Add(TableRow row)

+		{

+			AddAt(-1, row);

+			return owner.Controls.Count;

+		}

+

+		public void AddAt(int index, TableRow row)

+		{

+			owner.Controls.AddAt(index, row);

+		}

+

+		public void AddRange(TableRow[] rows)

+		{

+			foreach(TableRow row in rows)

+			{

+				Add(row);

+			}

+		}

+

+		public void Clear()

+		{

+			if(owner.HasControls())

+			{

+				owner.Controls.Clear();

+			}

+		}

+

+		public void CopyTo(Array array, int index)

+		{

+			foreach(object current in this)

+			{

+				array.SetValue(current, index++);

+			}

+		}

+

+		public int GetRowIndex(TableRow row)

+		{

+			if(!owner.HasControls())

+			{

+				return -1;

+			}

+			return owner.Controls.IndexOf(row);

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			return owner.Controls.GetEnumerator();

+		}

+

+		public void Remove(TableRow row)

+		{

+			owner.Controls.Remove(row);

+		}

+

+		public void RemoveAt(int index)

+		{

+			owner.Controls.RemoveAt(index);

+		}

+

+		int IList.Add(object o)

+		{

+			return Add((TableRow)o);

+		}

+

+		bool IList.Contains(object o)

+		{

+			return owner.Controls.Contains((TableRow)o);

+		}

+

+		int IList.IndexOf(object o)

+		{

+			return owner.Controls.IndexOf((TableRow)o);

+		}

+

+		void IList.Insert(int index, object o)

+		{

+			owner.Controls.AddAt(index, (TableRow)o);

+		}

+

+		void IList.Remove(object o)

+		{

+			owner.Controls.Remove((TableRow)o);

+		}

+

+		bool IList.IsFixedSize

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		object IList.this[int index]

+		{

+			get

+			{

+				return this[index];

+			}

+			set

+			{

+				RemoveAt(index);

+				AddAt(index, (TableRow)value);

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TableStyle.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TableStyle.cs
new file mode 100644
index 00000000000..6b1e7cd1415
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TableStyle.cs
@@ -0,0 +1,229 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TableStyle

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class TableStyle : Style

+	{

+		private static int IMAGE_URL = (0x01 << 16);

+		private static int CELL_PADD = (0x01 << 17);

+		private static int CELL_SPAC = (0x01 << 18);

+		private static int GRID_LINE = (0x01 << 19);

+		private static int HOR_ALIGN = (0x01 << 20);

+

+		public TableStyle(): base()

+		{

+		}

+

+		public TableStyle(StateBag bag): base(bag)

+		{

+		}

+

+		public virtual string BackImageUrl

+		{

+			get

+			{

+				if(IsSet(IMAGE_URL))

+					return (string)(ViewState["BackImageUrl"]);

+				return String.Empty;

+			}

+			set

+			{

+				if(value == null)

+					throw new ArgumentNullException("BackImageUrl");

+				ViewState["BackImageUrl"] = value;

+				Set(IMAGE_URL);

+			}

+		}

+

+		public virtual int CellPadding

+		{

+			get

+			{

+				if(IsSet(CELL_PADD))

+					return (int)(ViewState["CellPadding"]);

+				return -1;

+			}

+			set

+			{

+				if(value < -1)

+					throw new ArgumentOutOfRangeException("CellPadding");

+				ViewState["CellPadding"] = value;

+				Set(CELL_PADD);

+			}

+		}

+

+		public virtual int CellSpacing

+		{

+			get

+			{

+				if(IsSet(CELL_SPAC))

+					return (int)(ViewState["CellSpacing"]);

+				return -1;

+			}

+			set

+			{

+				if(value < -1)

+					throw new ArgumentOutOfRangeException("CellSpacing");

+				ViewState["CellSpacing"] = value;

+				Set(CELL_SPAC);

+			}

+		}

+

+		public virtual GridLines GridLines

+		{

+			get

+			{

+				if(IsSet(GRID_LINE))

+					return (GridLines)(ViewState["GridLines"]);

+				return GridLines.None;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(GridLines), value))

+					throw new ArgumentException();

+				ViewState["GridLines"] = value;

+				Set(GRID_LINE);

+			}

+		}

+

+		public virtual HorizontalAlign HorizontalAlign

+		{

+			get

+			{

+				if(IsSet(HOR_ALIGN))

+					return (HorizontalAlign)(ViewState["HorizontalAlign"]);

+				return HorizontalAlign.NotSet;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(HorizontalAlign), value))

+					throw new ArgumentException();

+				ViewState["HorizontalAlign"] = value;

+				Set(HOR_ALIGN);

+			}

+		}

+

+		public override void AddAttributesToRender(HtmlTextWriter writer, WebControl owner)

+		{

+			base.AddAttributesToRender(writer, owner);

+			if(BackImageUrl.Length > 0)

+			{

+				writer.AddStyleAttribute(HtmlTextWriterStyle.BackgroundImage, "url(" + owner.ResolveUrl(BackImageUrl) + ")");

+			}

+			if(CellSpacing >= 0)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Cellspacing, CellSpacing.ToString(NumberFormatInfo.InvariantInfo));

+			}

+			if(CellPadding >= 0)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Cellpadding, CellPadding.ToString(NumberFormatInfo.InvariantInfo));

+			}

+			if(HorizontalAlign != HorizontalAlign.NotSet)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Align, Enum.Format(typeof(HorizontalAlign), HorizontalAlign, "G"));

+			}

+			string gd = "";

+			switch(GridLines)

+			{

+				case GridLines.None:       gd = "";

+				                           break;

+				case GridLines.Horizontal: gd = "cols";

+				                           break;

+				case GridLines.Vertical:   gd = "rows";

+				                           break;

+				case GridLines.Both:       gd = "all";

+				                           break;

+			}

+			writer.AddAttribute(HtmlTextWriterAttribute.Rules, gd);

+		}

+

+		public override void CopyFrom(Style s)

+		{

+			if(s != null && s is TableStyle && !s.IsEmpty)

+			{

+				base.CopyFrom(s);

+				TableStyle from = (TableStyle)s;

+				if(from.IsSet(HOR_ALIGN))

+				{

+					HorizontalAlign = from.HorizontalAlign;

+				}

+				if(from.IsSet(IMAGE_URL))

+				{

+					BackImageUrl = from.BackImageUrl;

+				}

+				if(from.IsSet(CELL_PADD))

+				{

+					CellPadding = from.CellPadding;

+				}

+				if(from.IsSet(CELL_SPAC))

+				{

+					CellSpacing = from.CellSpacing;

+				}

+				if(from.IsSet(GRID_LINE))

+				{

+					GridLines = from.GridLines;

+				}

+			}

+		}

+

+		public override void MergeWith(Style s)

+		{

+			if(s != null && s is TableStyle && !s.IsEmpty)

+			{

+				base.MergeWith(s);

+				TableStyle with = (TableStyle)s;

+				if(with.IsSet(HOR_ALIGN) && IsSet(HOR_ALIGN))

+				{

+					HorizontalAlign = with.HorizontalAlign;

+				}

+				if(with.IsSet(IMAGE_URL) && IsSet(IMAGE_URL))

+				{

+					BackImageUrl = with.BackImageUrl;

+				}

+				if(with.IsSet(CELL_PADD) && IsSet(CELL_PADD))

+				{

+					CellPadding = with.CellPadding;

+				}

+				if(with.IsSet(CELL_SPAC) && IsSet(CELL_SPAC))

+				{

+					CellSpacing = with.CellSpacing;

+				}

+				if(with.IsSet(GRID_LINE) && IsSet(GRID_LINE))

+				{

+					GridLines = with.GridLines;

+				}

+			}

+		}

+

+		public override void Reset()

+		{

+			if(IsSet(IMAGE_URL))

+				ViewState.Remove("BackImageUrl");

+			if(IsSet(HOR_ALIGN))

+				ViewState.Remove("HorizontalAlign");

+			if(IsSet(CELL_PADD))

+				ViewState.Remove("CellPadding");

+			if(IsSet(CELL_SPAC))

+				ViewState.Remove("CellSpacing");

+			if(IsSet(GRID_LINE))

+				ViewState.Remove("GridLines");

+			base.Reset();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TargetConverter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TargetConverter.cs
new file mode 100644
index 00000000000..409dd35a9c0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TargetConverter.cs
@@ -0,0 +1,55 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TargetConverter

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class TargetConverter : StringConverter

+	{

+		private StandardValuesCollection standardValues;

+		private string[] values = {

+			"_parent",

+			"_self",

+			"_blank",

+			"_search",

+			"_top"

+		};

+		

+		public TargetConverter(): base()

+		{

+		}

+		

+		public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)

+		{

+			if(standardValues == null)

+			{

+				standardValues = new StandardValuesCollection(values);

+			}

+			return standardValues;

+		}

+		

+		public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)

+		{

+			return false;

+		}

+		

+		public override bool GetStandardValuesSupported(ITypeDescriptorContext context)

+		{

+			return true;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TemplateColumn.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TemplateColumn.cs
new file mode 100644
index 00000000000..b64b42bde50
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TemplateColumn.cs
@@ -0,0 +1,109 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TemplateColumn

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class TemplateColumn : DataGridColumn

+	{

+		private ITemplate editItemTemplate;

+		private ITemplate footerTemplate;

+		private ITemplate headerTemplate;

+		private ITemplate itemTemplate;

+

+		public TemplateColumn(): base()

+		{

+		}

+

+		public virtual ITemplate EditItemTemplate

+		{

+			get

+			{

+				return editItemTemplate;

+			}

+			set

+			{

+				editItemTemplate = value;

+				OnColumnChanged();

+			}

+		}

+

+		public virtual ITemplate FooterTemplate

+		{

+			get

+			{

+				return footerTemplate;

+			}

+			set

+			{

+				footerTemplate = value;

+				OnColumnChanged();

+			}

+		}

+

+		public virtual ITemplate HeaderTemplate

+		{

+			get

+			{

+				return headerTemplate;

+			}

+			set

+			{

+				headerTemplate = value;

+				OnColumnChanged();

+			}

+		}

+

+		public virtual ITemplate ItemTemplate

+		{

+			get

+			{

+				return itemTemplate;

+			}

+			set

+			{

+				itemTemplate = value;

+				OnColumnChanged();

+			}

+		}

+

+		public override void InitializeCell(TableCell cell, int columnIndex, ListItemType itemType)

+		{

+			base.InitializeCell(cell, columnIndex, itemType);

+			ITemplate toRender = null;

+			switch(itemType)

+			{

+				case ListItemType.Header: toRender = headerTemplate;

+				                          break;

+				case ListItemType.Footer: toRender = footerTemplate;

+				                          break;

+				case ListItemType.Item:   toRender = itemTemplate;

+				                          break;

+				case ListItemType.AlternatingItem: toRender = itemTemplate;

+				                          break;

+				case ListItemType.SelectedItem: toRender = editItemTemplate;

+				                          break;

+				default:                  toRender = editItemTemplate;

+				                          break;

+			}

+			if(toRender != null)

+			{

+				cell.Text = String.Empty;

+				toRender.InstantiateIn(cell);

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TextAlign.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TextAlign.cs
new file mode 100755
index 00000000000..906bb73badd
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TextAlign.cs
@@ -0,0 +1,21 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     TextAlign

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum TextAlign

+	{

+		Left = 1,

+		Right

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs
new file mode 100644
index 00000000000..2e1b5a87795
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TextBox.cs
@@ -0,0 +1,236 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TextBox

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  80%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.Globalization;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultEvent("TextChanged")]

+	[DefaultProperty("Text")]

+	[ParseChildren(false)]

+	[ValidationProperty("Text")]

+	public class TextBox : WebControl, IPostBackDataHandler

+	{

+		private static readonly object TextChangedEvent = new object ();

+

+		public TextBox() : base (HtmlTextWriterTag.Input)

+		{

+		}

+

+		public virtual bool AutoPostBack

+		{

+			get {

+				object o = ViewState ["AutoPostBack"];

+				return (o == null) ? false : (bool) o;

+			}

+

+			set { ViewState ["AutoPostBack"] = value; }

+		}

+

+		public virtual int Columns

+		{

+			get {

+				object o = ViewState ["Columns"];

+				return (o == null) ? 0 : (int) o;

+			}

+

+			set { ViewState ["Columns"] = value; }

+		}

+

+		public virtual int MaxLength

+		{

+			get

+			{

+				object o = ViewState ["MaxLength"];

+				return (o == null) ? 0 : (int) o;

+			}

+

+			set { ViewState ["MaxLength"] = value; }

+		}

+

+		public virtual bool ReadOnly

+		{

+			get

+			{

+				object o = ViewState ["ReadOnly"];

+				return (o == null) ? false : (bool) o;

+			}

+			set { ViewState ["ReadOnly"] = value; }

+		}

+

+		public virtual int Rows

+		{

+			get

+			{

+				object o = ViewState ["Rows"];

+				return (o == null) ? 0 : (int) o;

+			}

+

+			set { ViewState ["Rows"] = value; }

+		}

+

+		public virtual string Text

+		{

+			get {

+				object o = ViewState ["Text"];

+				return (o == null) ? String.Empty : (string) o;

+			}

+

+			set { ViewState ["Text"] = value; }

+		}

+

+		public virtual TextBoxMode TextMode

+		{

+			get {

+				object o = ViewState ["TextMode"];

+				return (o == null) ? TextBoxMode.SingleLine : (TextBoxMode) o;

+			}

+

+			set {

+				if(!Enum.IsDefined (typeof(TextBoxMode), value))

+					throw new ArgumentException ();

+				ViewState ["TextMode"] = value;

+			}

+		}

+

+		public virtual bool Wrap

+		{

+			get {

+				object o = ViewState ["Wrap"];

+				return (o == null) ? true : (bool) o;

+			}

+

+			set { ViewState ["Wrap"] = value; }

+		}

+

+		public event EventHandler TextChanged

+		{

+			add { Events.AddHandler (TextChangedEvent, value); }

+			remove { Events.RemoveHandler (TextChangedEvent, value); }

+		}

+

+		protected override HtmlTextWriterTag TagKey

+		{

+			get {

+				if(TextMode == TextBoxMode.MultiLine)

+					return HtmlTextWriterTag.Textarea;

+				return HtmlTextWriterTag.Input;

+			}

+		}

+

+		protected override void AddAttributesToRender (HtmlTextWriter writer)

+		{

+			if(Page != null)

+				Page.VerifyRenderingInServerForm (this);

+

+			writer.AddAttribute (HtmlTextWriterAttribute.Name, UniqueID);

+			if (TextMode == TextBoxMode.MultiLine){

+				if (Rows > 0)

+					writer.AddAttribute (HtmlTextWriterAttribute.Rows,

+							     Rows.ToString (

+								NumberFormatInfo.InvariantInfo));

+

+				if (Columns > 0)

+					writer.AddAttribute (HtmlTextWriterAttribute.Cols,

+							     Columns.ToString (

+								NumberFormatInfo.InvariantInfo));

+

+				if (!Wrap)

+					writer.AddAttribute(HtmlTextWriterAttribute.Wrap, "off");

+			} else {

+				string mode;

+				if (TextMode == TextBoxMode.Password)

+					mode = "password";

+				else {

+					mode = "text";

+					if (Text.Length > 0)

+						writer.AddAttribute (HtmlTextWriterAttribute.Value, Text);

+				}

+					

+				writer.AddAttribute (HtmlTextWriterAttribute.Type, mode);

+				if (MaxLength > 0)

+					writer.AddAttribute (HtmlTextWriterAttribute.Maxlength,

+							     MaxLength.ToString (NumberFormatInfo.InvariantInfo));

+

+				if (Columns > 0)

+					writer.AddAttribute (HtmlTextWriterAttribute.Size,

+							     Columns.ToString (NumberFormatInfo.InvariantInfo));

+			}

+

+			if (ReadOnly)

+				writer.AddAttribute (HtmlTextWriterAttribute.ReadOnly, "readonly");

+

+			base.AddAttributesToRender (writer);

+

+			if (AutoPostBack && Page != null){

+				writer.AddAttribute (HtmlTextWriterAttribute.Onchange,

+						     Page.GetPostBackClientEvent (this, ""));

+				writer.AddAttribute ("language", "javascript");

+			}

+		}

+

+		protected override void AddParsedSubObject(object obj)

+		{

+			if(!(obj is LiteralControl))

+				throw new HttpException (HttpRuntime.FormatResourceString (

+							"Cannot_Have_Children_Of_Type", "TextBox",

+							GetType ().Name.ToString ()));

+

+			Text = ((LiteralControl) obj).Text;

+		}

+

+		protected override void OnPreRender (EventArgs e)

+		{

+			base.OnPreRender (e);

+			if (Events [TextChangedEvent] == null)

+				ViewState.SetItemDirty ("Text", false);

+		}

+

+		protected virtual void OnTextChanged (EventArgs e)

+		{

+			if(Events != null){

+				EventHandler eh = (EventHandler) (Events [TextChangedEvent]);

+				if(eh != null)

+					eh (this, e);

+			}

+		}

+

+		protected override void Render (HtmlTextWriter writer)

+		{

+			RenderBeginTag(writer);

+			if (TextMode == TextBoxMode.MultiLine)

+				HttpUtility.HtmlEncode (Text, writer);

+			RenderEndTag(writer);

+		}

+

+		bool IPostBackDataHandler.LoadPostData (string postDataKey,

+							NameValueCollection postCollection)

+		{

+			if (postCollection [postDataKey] != Text){

+				Text = postCollection [postDataKey];

+				return true;

+			}

+			return false;

+		}

+

+		void IPostBackDataHandler.RaisePostDataChangedEvent ()

+		{

+			OnTextChanged (EventArgs.Empty);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TextBoxControlBuilder.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TextBoxControlBuilder.cs
new file mode 100644
index 00000000000..7c26db6eaf3
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TextBoxControlBuilder.cs
@@ -0,0 +1,36 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     TextBoxControlBuilder

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class TextBoxControlBuilder : ControlBuilder

+	{

+		public TextBoxControlBuilder(): base()

+		{

+		}

+

+		public override bool AllowWhitespaceLiterals()

+		{

+			return false;

+		}

+

+		public override bool HtmlDecodeLiterals()

+		{

+			return true;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TextBoxMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TextBoxMode.cs
new file mode 100755
index 00000000000..47b903ec0f2
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TextBoxMode.cs
@@ -0,0 +1,22 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     TextBoxMode

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum TextBoxMode

+	{

+		SingleLine,

+		MultiLine,

+		Password

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/TitleFormat.cs b/mcs/class/System.Web/System.Web.UI.WebControls/TitleFormat.cs
new file mode 100755
index 00000000000..3cfb9a42f42
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/TitleFormat.cs
@@ -0,0 +1,21 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     TitleFormat

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum TitleFormat

+	{

+		Month,

+		MonthYear

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Unit.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Unit.cs
new file mode 100644
index 00000000000..bdf07bb6865
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Unit.cs
@@ -0,0 +1,256 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Struct:    Unit

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Globalization;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public struct Unit

+	{

+		public static readonly Unit Empty = new Unit();

+

+		private static int Min = -32768;

+		private static int Max = +32767;

+

+		private UnitType type;

+		private double   val;

+

+		public static Unit Parse(string s)

+		{

+			return new Unit(s);

+		}

+

+		public static Unit Parse(string s, CultureInfo culture)

+		{

+			return new Unit(s, culture);

+		}

+

+		public static Unit Percentage(double n)

+		{

+			return new Unit (n, UnitType.Percentage);

+		}

+

+		public static Unit Pixel(int n)

+		{

+			return new Unit (n, UnitType.Pixel);

+		}

+

+		public static Unit Point(int n)

+		{

+			return new Unit(n, UnitType.Point);

+		}

+

+		public static bool operator ==(Unit left, Unit right)

+		{

+			return (left.type == right.type && left.val == right.val);

+		}

+

+		public static bool operator !=(Unit left, Unit right)

+		{

+			return !(left == right);

+		}

+

+		public static implicit operator Unit(int n)

+		{

+			return new Unit(n);

+		}

+

+		public Unit(double value)

+		{

+			if(value < Min || value > Max)

+			{

+				throw new ArgumentOutOfRangeException();

+			}

+			val = value;

+			type = UnitType.Pixel;

+		}

+

+		public Unit(int value)

+		{

+			if(value < Min || value > Max)

+			{

+				throw new ArgumentOutOfRangeException();

+			}

+			val = value;

+			type = UnitType.Pixel;

+		}

+

+		public Unit(string value): this(value, CultureInfo.CurrentCulture)

+		{

+		}

+

+		public Unit(double value, UnitType type)

+		{

+			if(value < Min || value > Max)

+			{

+				throw new ArgumentOutOfRangeException();

+			}

+			val = value;

+			this.type = type;

+		}

+

+		public Unit(string value, CultureInfo culture): this(value, culture, UnitType.Pixel)

+		{

+		}

+

+		internal Unit(string value, CultureInfo culture, UnitType defType)

+		{

+			string valueTrim;

+			if (value == null || (valueTrim = value.Trim ()).Length == 0) {

+				val = 0;

+				type = UnitType.Pixel;

+				return;

+			}

+

+			if (culture == null)

+				culture = CultureInfo.CurrentCulture;

+

+			string strVal = valueTrim.ToLower ();

+			int length = strVal.Length;

+			char c;

+			int start = -1;

+			for (int i = 0; i < length; i++) {

+				c = strVal [i];

+				if( (c >= '0' && c <= '9') || (c == '-' || c == '.' || c == ',') )

+					start = i;

+			}

+			

+			if (start == -1)

+				throw new ArgumentException("No digits in 'value'");

+			

+			start++;

+			if (start < length) {

+				type = GetTypeFromString (strVal.Substring (start).Trim ());

+				val  = 0;

+			} else {

+				type = defType;

+			}

+

+			try {

+				string numbers = strVal.Substring (0, start);

+				if (type == UnitType.Pixel)

+					val = (double) Int32.Parse (numbers, culture);

+				else

+					val = (double) Single.Parse (numbers, culture);

+			} catch (Exception) {

+				throw new FormatException ("Error parsing " + value);

+			}

+

+			if (val < Min || val > Max)

+				throw new ArgumentOutOfRangeException ();

+		}

+

+		private static UnitType GetTypeFromString(string s)

+		{

+			if(s == null || s.Length == 0)

+				return UnitType.Pixel;

+			s = s.ToLower().Trim();

+			string[] uTypes = {

+				"px",

+				"pt",

+				"pc",

+				"in",

+				"mm",

+				"cm",

+				"%",

+				"em",

+				"ex"

+			};

+			int i = 0;

+			foreach(string cType in uTypes)

+			{

+				if(s == cType)

+					return (UnitType)Enum.ToObject(typeof(UnitType), (i + 1));

+				i++;

+			}

+			return UnitType.Pixel;

+		}

+

+		private string GetStringFromPixel(UnitType ut)

+		{

+			string[] uTypes = {

+				"px",

+				"pt",

+				"pc",

+				"in",

+				"mm",

+				"cm",

+				"%",

+				"em",

+				"ex"

+			};

+			if( !Enum.IsDefined(typeof(UnitType), ut) )

+				return "px";

+			return uTypes[(int)ut - 1];

+		}

+

+		public bool IsEmpty

+		{

+			get

+			{

+				return (type == 0);

+			}

+		}

+

+		public UnitType Type

+		{

+			get

+			{

+				if(IsEmpty)

+					return UnitType.Pixel;

+				return type;

+			}

+		}

+

+		public double Value

+		{

+			get

+			{

+				return val;

+			}

+		}

+

+		public override bool Equals(object obj)

+		{

+			if(obj != null && obj is Unit)

+			{

+				Unit that = (Unit)obj;

+				return ( this.type == that.type && this.val == that.val );

+			}

+			return false;

+		}

+

+		public override int GetHashCode()

+		{

+			return ( (type.GetHashCode() << 2) | (val.GetHashCode()) );

+		}

+

+		public override string ToString()

+		{

+			if(IsEmpty)

+				return String.Empty;

+			return ( val.ToString() + GetStringFromPixel(type) );

+		}

+

+		public string ToString(CultureInfo culture)

+		{

+			if(IsEmpty)

+				return String.Empty;

+			return ( val.ToString(culture) + GetStringFromPixel(type) );

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/UnitConverter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/UnitConverter.cs
new file mode 100644
index 00000000000..b3320bb39ce
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/UnitConverter.cs
@@ -0,0 +1,65 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     UnitConverter

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Globalization;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class UnitConverter : TypeConverter

+	{

+		public UnitConverter(): base()

+		{

+		}

+

+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType)

+		{

+			if(sourceType == typeof(string))

+				return true;

+			return CanConvertFrom(context, sourceType);

+		}

+

+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)

+		{

+			if(value == null)

+				return null;

+			if(value is string)

+			{

+				string val = ((string)value).Trim();

+				if(val.Length == 0)

+				{

+					return Unit.Empty;

+				}

+				return (culture == null ? Unit.Parse(val) : Unit.Parse(val, culture));

+			}

+			return ConvertFrom(context, culture, value);

+		}

+

+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)

+		{

+			if(destinationType == typeof(string))

+			{

+				Unit val = (Unit)value;

+				if(val == Unit.Empty)

+				{

+					return String.Empty;

+				}

+				return val.ToString(culture);

+			}

+			return ConvertTo(context, culture, value, destinationType);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/UnitType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/UnitType.cs
new file mode 100755
index 00000000000..285c1cc7195
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/UnitType.cs
@@ -0,0 +1,28 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     UnitType

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum UnitType

+	{

+		Pixel = 1,

+		Point,

+		Pica,

+		Inch,

+		Mm,

+		Cm,

+		Percentage,

+		Em,

+		Ex

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidatedControlConverter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidatedControlConverter.cs
new file mode 100644
index 00000000000..883154a7429
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ValidatedControlConverter.cs
@@ -0,0 +1,76 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     ValidatedControlConverter

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class ValidatedControlConverter : StringConverter

+	{

+		public ValidatedControlConverter(): base()

+		{

+		}

+

+		private object[] GetValues(IContainer container)

+		{

+			ArrayList values = new ArrayList();

+			IEnumerator ie = container.Components.GetEnumerator();

+			try

+			{

+				foreach(IComponent current in container.Components)

+				{

+					Control ctrl = (Control)current;

+					if(ctrl == null || ctrl.ID == null || ctrl.ID.Length == 0)

+						continue;

+					ValidationPropertyAttribute attrib = (ValidationPropertyAttribute)((TypeDescriptor.GetAttributes(ctrl))[typeof(ValidationPropertyAttribute)]);

+					if(attrib == null || attrib.Name == null)

+						continue;

+					values.Add(String.Copy(ctrl.ID));

+				}

+			}finally

+			{

+				if(ie is IDisposable)

+					((IDisposable)ie).Dispose();

+			}

+			values.Sort();

+			return values.ToArray();

+		}

+

+		public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)

+		{

+			if(context != null && context.Container != null)

+			{

+				object[] values = GetValues(context.Container);

+				if(values != null)

+				{

+					return new StandardValuesCollection(values);

+				}

+			}

+			return null;

+		}

+

+		public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)

+		{

+			return false;

+		}

+

+		public override bool GetStandardValuesSupported(ITypeDescriptorContext context)

+		{

+			return true;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationCompareOperator.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationCompareOperator.cs
new file mode 100755
index 00000000000..a752aa1df5d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationCompareOperator.cs
@@ -0,0 +1,26 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     ValidationCompareOperator

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum ValidationCompareOperator

+	{

+		Equal,

+		NotEqual,

+		GreaterThan,

+		GreaterThanEqual,

+		LessThan,

+		LessThanEqual,

+		DataTypeCheck

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationDataType.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationDataType.cs
new file mode 100755
index 00000000000..227133269e1
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationDataType.cs
@@ -0,0 +1,24 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     ValidationDataType

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum ValidationDataType

+	{

+		String,

+		Integer,

+		Double,

+		Date,

+		Currency

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs
new file mode 100644
index 00000000000..a90ce3f20fe
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummary.cs
@@ -0,0 +1,142 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     ValidationSummary

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  ??%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Drawing;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class ValidationSummary : WebControl

+	{

+		private bool uplevelRender;

+

+		public ValidationSummary(): base(HtmlTextWriterTag.Div)

+		{

+			uplevelRender = false;

+			ForeColor     = Color.Red;

+		}

+

+		public ValidationSummaryDisplayMode DisplayMode

+		{

+			get

+			{

+				object o = ViewState["DisplayMode"];

+				if(o != null)

+					return (ValidationSummaryDisplayMode)o;

+				return ValidationSummaryDisplayMode.BulletList;

+			}

+			set

+			{

+				if(!Enum.IsDefined(typeof(ValidationSummaryDisplayMode), value))

+					throw new ArgumentException();

+				ViewState["DisplayMode"] = value;

+			}

+		}

+

+		public bool EnableClientScript

+		{

+			get

+			{

+				object o = ViewState["EnableClientScript"];

+				if(o != null)

+					return (bool)o;

+				return true;

+			}

+			set

+			{

+				ViewState["EnableClientScript"] = value;

+			}

+		}

+

+		public override Color ForeColor

+		{

+			get

+			{

+				return ForeColor;

+			}

+			set

+			{

+				ForeColor = value;

+			}

+		}

+

+		public bool ShowMessageBox

+		{

+			get

+			{

+				object o = ViewState["ShowMessageBox"];

+				if(o != null)

+					return (bool)o;

+				return false;

+			}

+			set

+			{

+				ViewState["ShowMessageBox"] = value;

+			}

+		}

+

+		public bool ShowSummary

+		{

+			get

+			{

+				object o = ViewState["ShowSummary"];

+				if(o != null)

+					return (bool)o;

+				return true;

+			}

+			set

+			{

+				ViewState["ShowSummary"] = value;

+			}

+		}

+

+		public string HeaderText

+		{

+			get

+			{

+				object o = ViewState["HeaderText"];

+				if(o != null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["HeaderText"] = value;

+			}

+		}

+

+		[MonoTODO("FIXME_See_Comments")]

+		protected override void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			AddAttributesToRender(writer);

+			if(uplevelRender)

+			{

+				//FIXME: This is not the case always. I forgot the case when it is absent.

+				// something to do with the ID's value? or ClienID's value itself?

+				writer.AddAttribute("id", ClientID);

+				if(HeaderText.Length > 0)

+					writer.AddAttribute("headertext", HeaderText, true);

+				if(ShowMessageBox)

+					writer.AddAttribute("showmessagebox", "True");

+				if(!ShowSummary)

+					writer.AddAttribute("showsummary", "False");

+				if(DisplayMode != ValidationSummaryDisplayMode.BulletList)

+				{

+					writer.AddAttribute("displaymode", PropertyConverter.EnumToString(typeof(ValidationSummaryDisplayMode), DisplayMode));

+				}

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummaryDisplayMode.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummaryDisplayMode.cs
new file mode 100755
index 00000000000..c3cf718395c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ValidationSummaryDisplayMode.cs
@@ -0,0 +1,22 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     ValidationSummaryDisplayMode

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum ValidationSummaryDisplayMode

+	{

+		List,

+		BulletList,

+		SingleParagraph

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/ValidatorDisplay.cs b/mcs/class/System.Web/System.Web.UI.WebControls/ValidatorDisplay.cs
new file mode 100755
index 00000000000..48086af18bc
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/ValidatorDisplay.cs
@@ -0,0 +1,22 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     ValidatorDisplay

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum ValidatorDisplay

+	{

+		None,

+		Static,

+		Dynamic

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/VerticalAlign.cs b/mcs/class/System.Web/System.Web.UI.WebControls/VerticalAlign.cs
new file mode 100755
index 00000000000..a115544e98c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/VerticalAlign.cs
@@ -0,0 +1,23 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Enumeration:     VerticalAlign

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.UI.WebControls

+{

+	public enum VerticalAlign

+	{

+		NotSet,

+		Top,

+		Middle,

+		Bottom

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/WebColorConverter.cs b/mcs/class/System.Web/System.Web.UI.WebControls/WebColorConverter.cs
new file mode 100644
index 00000000000..127633c390a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/WebColorConverter.cs
@@ -0,0 +1,57 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     WebColorConverter

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  ??%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Globalization;

+using System.ComponentModel;

+using System.Drawing;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	public class WebColorConverter : ColorConverter

+	{

+		public WebColorConverter(): base()

+		{

+		}

+

+		[MonoTODO("Implement_If_Color_Is_#xxxxxx_OR_A_KnownColor")]

+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value)

+		{

+			if(value is string)

+			{

+				string val = ((string)value).Trim();

+				if(val == String.Empty || val.Length == 0)

+				{

+					return Color.Empty;

+				}

+				if(val[0] == '#')

+				{

+					throw new NotImplementedException();

+				}

+			}

+			return ConvertFrom(context, culture, value);

+		}

+

+		[MonoTODO("Convert_To_For_KnownColor_And_For_#xxxxxx")]

+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)

+		{

+			if(destinationType == null)

+			{

+				throw new ArgumentNullException("destinationType");

+			}

+			throw new NotImplementedException();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
new file mode 100755
index 00000000000..d7a84d0b541
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/WebControl.cs
@@ -0,0 +1,451 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     WebControl

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  40%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.ComponentModel;

+using System.Web;

+using System.Web.UI;

+using System.Drawing;

+using System.Collections.Specialized;

+

+namespace System.Web.UI.WebControls

+{

+	[PersistChildrenAttribute(false)]

+	[ParseChildrenAttribute(true)]

+	public class WebControl : Control, IAttributeAccessor

+	{

+		//TODO: A list of private members may be incomplete

+

+		private HtmlTextWriterTag   tagKey;

+		private string              stringTag;

+		private AttributeCollection attributes;

+		private StateBag            attributeState;

+		private Style               controlStyle;

+		private bool                enabled;

+		private string              tagName;

+

+		// TODO: The constructors definitions

+		protected WebControl () : this (HtmlTextWriterTag.Span)

+		{

+		}

+

+		public WebControl(HtmlTextWriterTag tag): base()

+		{

+			//FIXME: am i right?

+			tagKey = tag;

+			//stringTag = null;

+			Initialize();

+		}

+

+		protected WebControl(string tag): base()

+		{

+			//FIXME: am i right?

+			stringTag = tag;

+			Initialize();

+		}

+

+		private void Initialize()

+		{

+			controlStyle   = null;

+			enabled        = true;

+			tagName        = stringTag;

+			attributeState = null;

+		}

+

+		public virtual string AccessKey

+		{

+			get

+			{

+				object o = ViewState["AccessKey"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["AccessKey"] = value;

+			}

+		}

+

+		[MonoTODO("FIXME_Internal_method_calls")]

+		public AttributeCollection Attributes

+		{

+			get

+			{

+				if(attributes==null)

+				{

+					//FIXME: From where to get StateBag and how? I think this method is OK!

+					if(attributeState == null)

+					{

+						attributeState = new StateBag(true);

+						if(IsTrackingViewState)

+						{

+							attributeState.TrackViewState();

+						}

+					}

+					attributes = new AttributeCollection(attributeState);

+				}

+				return attributes;

+			}

+		}

+

+		public virtual Color BackColor

+		{

+			get {

+				if (!ControlStyleCreated)

+					return Color.Empty;

+				return ControlStyle.BackColor;

+			}

+

+			set {

+				ControlStyle.BackColor = value;

+			}

+		}

+

+		public virtual Color BorderColor

+		{

+			get {

+				if (!ControlStyleCreated)

+					return Color.Empty;

+				return ControlStyle.BorderColor;

+			}

+

+			set {

+				ControlStyle.BorderColor = value;

+			}

+		}

+

+		public virtual BorderStyle BorderStyle

+		{

+			get {

+				if (!ControlStyleCreated)

+					return BorderStyle.NotSet;

+				return ControlStyle.BorderStyle;

+			}

+

+			set {

+				ControlStyle.BorderStyle = value;

+			}

+		}

+

+		public virtual Unit BorderWidth

+		{

+			get {

+				if (!ControlStyleCreated)

+					return Unit.Empty;

+				return ControlStyle.BorderWidth;

+			}

+

+			set {

+				if (value.Value < 0)

+					throw new ArgumentException();

+				ControlStyle.BorderWidth = value;

+			}

+		}

+

+		public Style ControlStyle

+		{

+			get

+			{

+				if(controlStyle == null)

+				{

+					controlStyle = CreateControlStyle();

+					if(IsTrackingViewState)

+					{

+						controlStyle.TrackViewState();

+					}

+					controlStyle.LoadViewState(null);

+				}

+				return controlStyle;

+			}

+		}

+

+		public bool ControlStyleCreated

+		{

+			get

+			{

+				return (controlStyle!=null);

+			}

+		}

+

+		public virtual string CssClass

+		{

+			get

+			{

+				return ControlStyle.CssClass;

+			}

+			set

+			{

+				ControlStyle.CssClass = value;

+			}

+		}

+

+		public virtual bool Enabled

+		{

+			get

+			{

+				return enabled;

+			}

+			set

+			{

+				enabled = value;

+			}

+		}

+

+		public virtual FontInfo Font

+		{

+			get

+			{

+				return ControlStyle.Font;

+			}

+		}

+

+		public virtual Color ForeColor

+		{

+			get {

+				if (!ControlStyleCreated)

+					return Color.Empty;

+				return ControlStyle.ForeColor;

+			}

+

+			set {

+				ControlStyle.ForeColor = value;

+			}

+		}

+

+		public virtual Unit Height

+		{

+			get

+			{

+				return ControlStyle.Height;

+			}

+			set

+			{

+				ControlStyle.Height = value;

+			}

+		}

+

+		public CssStyleCollection Style

+		{

+			get

+			{

+				return Attributes.CssStyle;

+			}

+		}

+

+		public virtual short TabIndex

+		{

+			get

+			{

+				object o = ViewState["TabIndex"];

+				if(o!=null)

+					return (short)o;

+				return 0;

+			}

+			set

+			{

+				if(value < -32768 || value > 32767)

+					throw new ArgumentException();

+				ViewState["TabIndex"] = value;

+			}

+		}

+

+		public virtual string ToolTip

+		{

+			get

+			{

+				object o = ViewState["ToolTip"];

+				if(o!=null)

+					return (string)o;

+				return String.Empty;

+			}

+			set

+			{

+				ViewState["ToolTip"] = value;

+			}

+		}

+

+		public virtual Unit Width

+		{

+			get

+			{

+				return ControlStyle.Width;

+			}

+			set

+			{

+				ControlStyle.Width = value;

+			}

+		}

+

+		public void ApplyStyle(Style s)

+		{

+			if (s != null && !s.IsEmpty)

+				ControlStyle.CopyFrom (s);

+		}

+

+		public void CopyBaseAttributes(WebControl controlSrc)

+		{

+			/*

+			 * AccessKey, Enabled, ToolTip, TabIndex, Attributes

+			*/

+			AccessKey  = controlSrc.AccessKey;

+			Enabled    = controlSrc.Enabled;

+			ToolTip    = controlSrc.ToolTip;

+			TabIndex   = controlSrc.TabIndex;

+			attributes = controlSrc.Attributes;

+			AttributeCollection otherAtt = controlSrc.Attributes;

+			foreach (string key in controlSrc.Attributes.Keys)

+				Attributes [key] = otherAtt [key];

+		}

+

+		public void MergeStyle(Style s)

+		{

+			ControlStyle.MergeWith(s);

+		}

+

+		public virtual void RenderBeginTag(HtmlTextWriter writer)

+		{

+			AddAttributesToRender(writer);

+			writer.RenderBeginTag(TagName);

+		}

+

+		public virtual void RenderEndTag(HtmlTextWriter writer)

+		{

+			writer.RenderEndTag();

+		}

+

+		protected virtual HtmlTextWriterTag TagKey

+		{

+			get

+			{

+				return tagKey;

+			}

+		}

+

+		protected virtual string TagName

+		{

+			get

+			{

+				if(tagName == null && TagKey != 0)

+				{

+					tagName = Enum.Format(typeof(HtmlTextWriterTag), TagKey, "G").ToString();

+				}

+				// What if tagName is null and tagKey 0?

+				return tagName;

+			}

+		}

+

+		protected virtual void AddAttributesToRender(HtmlTextWriter writer)

+		{

+			if(ID!=null)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Id, ClientID);

+			}

+			if(AccessKey.Length>0)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Accesskey, AccessKey);

+			}

+			if(!Enabled)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Disabled, "disabled");

+			}

+			if(ToolTip.Length>0)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Title, ToolTip);

+			}

+			if(TabIndex != 0)

+			{

+				writer.AddAttribute(HtmlTextWriterAttribute.Tabindex, TabIndex.ToString());

+			}

+			if(ControlStyleCreated)

+			{

+				if(!ControlStyle.IsEmpty)

+				{

+					ControlStyle.AddAttributesToRender(writer, this);

+				}

+			}

+			if(attributeState != null){

+				IEnumerator ie = Attributes.Keys.GetEnumerator ();

+				while (ie.MoveNext ()){

+					string key = (string) ie.Current;

+					writer.AddAttribute (key, Attributes [key]);

+				}

+			}

+		}

+

+		protected virtual Style CreateControlStyle()

+		{

+			return new Style(ViewState);

+		}

+

+		protected override void LoadViewState (object savedState)

+		{

+			if (savedState != null) {

+				Triplet saved = (Triplet) savedState;

+				base.LoadViewState (saved.First);

+				if (ControlStyleCreated)

+					ControlStyle.LoadViewState (saved.Second);

+				if (attributeState != null)

+					attributeState.LoadViewState (saved.Third);

+			}

+		}

+

+		protected override void Render(HtmlTextWriter writer)

+		{

+			RenderBeginTag(writer);

+			RenderContents(writer);

+			RenderEndTag(writer);

+		}

+

+		protected virtual void RenderContents(HtmlTextWriter writer)

+		{

+			base.Render(writer);

+		}

+

+		protected override object SaveViewState()

+		{

+			object baseView = base.SaveViewState ();

+			object controlView = null;

+			if (ControlStyleCreated)

+				controlView = ControlStyle.SaveViewState();

+

+			object attrView = null;

+			if (attributeState != null)

+				attrView = attributeState.SaveViewState();

+

+			return new Triplet (baseView, controlView, attrView);

+		}

+

+		protected override void TrackViewState()

+		{

+			base.TrackViewState();

+			if (ControlStyleCreated)

+				ControlStyle.TrackViewState ();

+			if (attributeState != null)

+				attributeState.TrackViewState ();

+		}

+

+		string IAttributeAccessor.GetAttribute(string key)

+		{

+			if(Attributes!=null)

+				return Attributes[key] as string;

+			return null;

+		}

+

+		void IAttributeAccessor.SetAttribute(string key, string value)

+		{

+			Attributes[key] = value;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs b/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs
new file mode 100644
index 00000000000..400d93276b0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI.WebControls/Xml.cs
@@ -0,0 +1,224 @@
+/**

+ * Namespace: System.Web.UI.WebControls

+ * Class:     Xml

+ *

+ * Author:  Gaurav Vaish, Gonzalo Paniagua Javier

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>, <gonzalo@ximian.com>

+ * Implementation: yes

+ * Status:  95%

+ *

+ * (C) Gaurav Vaish (2002)

+ * (c) 2002 Ximian, Inc. (http://www.ximian.com)

+ */

+

+using System;

+using System.ComponentModel;

+using System.IO;

+using System.Xml;

+using System.Xml.Xsl;

+using System.Xml.XPath;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI.WebControls

+{

+	[DefaultProperty("DocumentSource")]

+	[PersistChildren(false)]

+	public class Xml : Control

+	{

+		private XmlDocument      document;

+		private string           documentContent;

+		private string           documentSource;

+		private XslTransform     transform;

+		private XsltArgumentList transformArgumentList;

+		private string           transformSource;

+

+		private XPathDocument xpathDoc;

+

+		private static XslTransform defaultTransform;

+

+		static Xml()

+		{

+			XmlTextReader reader = new XmlTextReader(new StringReader("<xsl:stylesheet version='1.0' " +

+			                                        "xmlns:xsl='http://www.w3.org/1999/XSL/Transform'>" +

+			                                        "<xsl:template match=\"\">" +

+			                                        "<xsl:copy-of select=\".\"/>" +

+			                                        "</xsl:template>" +

+			                                        "</xsl:stylesheet>"));

+			defaultTransform = new XslTransform();

+			defaultTransform.Load(reader);

+		}

+

+		public Xml(): base()

+		{

+		}

+

+		[MonoTODO("security")]

+		private void LoadXmlDoc ()

+		{

+			if (documentContent != null && documentContent.Length > 0) {

+				document = new XmlDocument();

+				document.LoadXml (documentContent);

+				return;

+			}

+

+			if (documentSource != null && documentSource.Length != 0) {

+				document = new XmlDocument();

+				document.Load (documentSource);

+			}

+		}

+

+		public XmlDocument Document

+		{

+			get

+			{

+				if(document == null)

+					LoadXmlDoc();

+				return document;

+			}

+			set

+			{

+				documentSource  = null;

+				documentContent = null;

+				xpathDoc        = null;

+				document        = value;

+			}

+		}

+

+		public string DocumentContent

+		{

+			get

+			{

+				return String.Empty;

+			}

+			set

+			{

+				document        = null;

+				xpathDoc        = null;

+				documentContent = value;

+			}

+		}

+

+		public string DocumentSource

+		{

+			get

+			{

+				if(documentSource != null)

+					return documentSource;

+				return String.Empty;

+			}

+			set

+			{

+				document        = null;

+				documentContent = null;

+				xpathDoc        = null;

+				documentSource  = value;

+			}

+		}

+

+		public XslTransform Transform

+		{

+			get

+			{

+				return transform;

+			}

+			set

+			{

+				transformSource = null;

+				transform       = value;

+			}

+		}

+

+		public string TransformSource

+		{

+			get

+			{

+				if(transformSource != null)

+					return transformSource;

+				return String.Empty;

+			}

+			set

+			{

+				transform       = null;

+				transformSource = value;

+			}

+		}

+

+		public XsltArgumentList TransformArgumentList

+		{

+			get

+			{

+				return transformArgumentList;

+			}

+			set

+			{

+				transformArgumentList = value;

+			}

+		}

+

+		protected override void AddParsedSubObject(object obj)

+		{

+			if(obj is LiteralControl)

+			{

+				DocumentContent = ((LiteralControl)obj).Text;

+				return;

+			}

+			throw new HttpException (HttpRuntime.FormatResourceString (

+							"Cannot_Have_Children_of_Type",

+							"Xml",

+							GetType().Name));

+		}

+

+		[MonoTODO("security")]

+		private void LoadXpathDoc ()

+		{

+			if(documentContent != null && documentContent.Length > 0) {

+				xpathDoc = new XPathDocument (new StringReader (documentContent));

+				return;

+			}

+

+			if (documentSource != null && documentSource.Length != 0) {

+				xpathDoc = new XPathDocument (documentSource);

+				return;

+			}

+		}

+

+		[MonoTODO("security")]

+		private void LoadTransform ()

+		{

+			if (transform != null)

+				return;

+

+			if (transformSource != null && transformSource.Length != 0) {

+				transform = new XslTransform ();

+				transform.Load (transformSource);

+			}

+		}

+

+		protected override void Render(HtmlTextWriter output)

+		{

+			if(document == null)

+			{

+				LoadXpathDoc();

+			}

+

+			LoadTransform();

+			if(document == null || xpathDoc == null)

+			{

+				return;

+			}

+			if(transform == null)

+			{

+				transform = defaultTransform;

+			}

+			if(document != null)

+			{

+				Transform.Transform(document, transformArgumentList, output);

+				return;

+			}

+			Transform.Transform(xpathDoc, transformArgumentList, output);

+		}

+	}

+}

+

diff --git a/mcs/class/System.Web/System.Web.UI/ApplicationFileParser.cs b/mcs/class/System.Web/System.Web.UI/ApplicationFileParser.cs
new file mode 100644
index 00000000000..de9df55763b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ApplicationFileParser.cs
@@ -0,0 +1,46 @@
+//
+// System.Web.UI.ApplicationfileParser
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+	internal sealed class ApplicationFileParser : TemplateParser
+	{
+		[MonoTODO]
+		protected override Type CompileIntoType ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		internal static Type GetCompiledApplicationType (string inputFile, 
+								 HttpContext context,
+								 ref ApplicationFileParser parser)
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected override Type DefaultBaseType
+		{
+			get {
+				return typeof (HttpApplication);
+			}
+		}
+
+		protected override string DefaultDirectiveName
+		{
+			get {
+				return "application";
+			}
+		}
+	}
+
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/AttributeCollection.cs b/mcs/class/System.Web/System.Web.UI/AttributeCollection.cs
new file mode 100755
index 00000000000..be03b6c7ed0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/AttributeCollection.cs
@@ -0,0 +1,82 @@
+//
+// System.Web.UI.AttributeCollection.cs
+//
+// Authors:
+// 	Duncan Mak  (duncan@ximian.com)
+// 	Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com
+//
+
+using System;
+using System.Collections;
+
+namespace System.Web.UI {
+
+	public sealed class AttributeCollection
+	{
+		private StateBag bag;
+		private CssStyleCollection styleCollection;
+		
+		public AttributeCollection (StateBag bag)
+		{
+			this.bag = bag;
+		}
+
+		public int Count {
+			get { return bag.Count; }
+		}
+
+		public CssStyleCollection CssStyle {
+			get {
+				if (styleCollection == null)
+					styleCollection = new CssStyleCollection (bag);
+				return styleCollection;
+			}
+		}
+
+		public string this [string key] {
+			get { return bag [key] as string; }
+
+			set { bag.Add (key, value); }
+		}
+
+		public ICollection Keys {
+			get { return bag.Keys; }
+		}
+
+		public void Add (string key, string value)
+		{
+			if (styleCollection != null && 0 == String.Compare (key, "style", true))
+				styleCollection.FillStyle (value);
+			else
+				bag.Add (key, value);
+		}
+
+		public void AddAttributes (HtmlTextWriter writer)
+		{
+			foreach (string key in bag.Keys) {
+				string value = bag [key] as string;
+				writer.AddAttribute (key, value);
+			}
+		}
+
+		public void Clear ()
+		{
+			bag.Clear ();
+		}
+
+		public void Remove (string key)
+		{
+			bag.Remove (key);
+		}
+
+		public void Render (HtmlTextWriter writer)
+		{
+			foreach (string key in bag.Keys) {
+				string value = bag [key] as string;
+				writer.WriteAttribute (key, value);
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/BaseParser.cs b/mcs/class/System.Web/System.Web.UI/BaseParser.cs
new file mode 100755
index 00000000000..379b5f6c3f5
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/BaseParser.cs
@@ -0,0 +1,73 @@
+//
+// System.Web.UI.BaseParser.cs
+//
+// Authors:
+// 	Duncan Mak  (duncan@ximian.com)
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+using System.IO;
+using System.Web;
+
+namespace System.Web.UI
+{
+	public class BaseParser
+	{
+		private HttpContext context;
+		private string baseDir;
+		private string baseVDir;
+		private string vPath;
+
+		internal string MapPath (string path)
+		{
+			return MapPath (path, true);
+		}
+
+		internal string MapPath (string path, bool allowCrossAppMapping)
+		{
+			return context.Request.MapPath (path, baseVDir, allowCrossAppMapping);
+		}
+
+		internal string PhysicalPath (string path)
+		{
+			if (Path.DirectorySeparatorChar != '/')
+				path = path.Replace ('/', '\\');
+				
+			return Path.GetFullPath (Path.Combine (baseVDir, path));
+		}
+
+		internal HttpContext Context
+		{
+			get {
+				return context;
+			}
+		}
+
+		internal string BaseDir
+		{
+			get {
+				if (baseDir == null)
+					baseDir = MapPath (baseVDir, false);
+
+				return baseDir;
+			}
+		}
+
+		internal string BaseVirtualDir
+		{
+			get {
+				return baseVDir;
+			}
+		}
+
+		internal string CurrentVirtualPath
+		{
+			get {
+				return vPath;
+			}
+		}
+	}
+
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/BuildMethod.cs b/mcs/class/System.Web/System.Web.UI/BuildMethod.cs
new file mode 100644
index 00000000000..d06a4024166
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/BuildMethod.cs
@@ -0,0 +1,16 @@
+//
+// System.Web.UI.BuildMethod.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public delegate Control BuildMethod();
+}
diff --git a/mcs/class/System.Web/System.Web.UI/BuildTemplateMethod.cs b/mcs/class/System.Web/System.Web.UI/BuildTemplateMethod.cs
new file mode 100644
index 00000000000..8d53ce41e2e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/BuildTemplateMethod.cs
@@ -0,0 +1,16 @@
+//
+// System.Web.UI.BuildTemplateMethod.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public delegate void BuildTemplateMethod(Control control);
+}
diff --git a/mcs/class/System.Web/System.Web.UI/ChangeLog b/mcs/class/System.Web/System.Web.UI/ChangeLog
new file mode 100644
index 00000000000..498e4b31662
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ChangeLog
@@ -0,0 +1,474 @@
+2002-08-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* LosFormatter.cs: almost fully implemented.
+
+2002-08-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* CompiledTemplateBuilder.cs: InstantiateIn is virtual.
+	* EmptyControlCollection.cs: throw correct exception.
+	* LosFormatter.cs: stubbed out.
+	* OutputCacheLocation.cs: little fix.
+
+2002-08-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.UI/ApplicationFileParser.cs:
+	* System.Web.UI/BaseParser.cs:
+	* System.Web.UI/PageParser.cs:
+	* System.Web.UI/TemplateControl.cs:
+	* System.Web.UI/TemplateControlParser.cs:
+	* System.Web.UI/TemplateParser.cs: first steps to move xsp into
+	System.Web.
+
+2002-07-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs: request to render postback script can be after form started
+	rendering.
+
+2002-07-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs: added more page events to invoke automagically if some
+	methods are defined.
+
+2002-07-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs:
+	(SaveViewState): save state even when control is not visible.
+	(SaveViewStateRecursive):
+	(LoadViewStateRecursive): made internal.
+
+2002-07-21  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs: improved event raising to allow client postback for a wider
+	variety of actions (clicking an hyperlink, ...).
+
+2002-07-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* UserControl.cs: implemented Load/SaveViewState.
+
+2002-07-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AttributeCollection.cs:
+	(Add): handle 'style' through styleCollection.
+
+	* CssStyleCollection.cs:
+	(fillStyle): renamed to FillStyle and made it internal.
+
+	* Page.cs:
+	(GetViewStateString): fixed, broken after other recent changes.
+	(ProcessPostData): allow a second try for postback data after OnLoad.
+	(ProcessRequest): clear controls collection, removed call to 
+	UnloadRecursive.
+
+2002-07-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs: uncommented Dispose.
+
+	* Page.cs:
+	(DeterminePostBackMode): more checkings.
+	(GetPostBackClientHyperLink): implemented.
+	(GetPostBackEventReference): added some comments with the HTML that MS
+	generates for that.
+	(ProcessRequest): fixed processing order. The page is unloaded after
+	a request and regenerated from view state on subsequents posts.
+
+2002-07-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs: fixed related to ViewState. Added RemovedControl.
+
+	* ControlCollection.cs: notify owner of control removal.
+	
+	* CssStyleCollection.cs: almost rewritten to make it render the style
+	attribute after changes to it.
+
+	* Page.cs: follow the guidelines in 'Control execution lifecycle'.
+	Removed Xml code.
+
+	* StateBag.cs: don't use IDictionary.GetEnumerator on the
+	HybridDictionary: it makes the program give an InvalidCastException at
+	runtime. Why?
+
+2002-07-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs: fire Init and Load events for all children.
+
+2002-07-14  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* UserControl.cs: New file.
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ControlBuilderAttribute.cs: finished implementation.
+
+2002-07-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ConstructorNeedsTagAttribute.cs: the default constructor sets the
+	property to false.
+
+2002-07-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.UI/AttributeCollection.cs: added CssStyleCollection.
+
+	* System.Web.UI/CssStyleCollection.cs: use a StateBag instead of a
+	Hashtable. Added internal .ctor.
+
+	* System.Web.UI/DataBinding.cs: propertyType is a Type. Implemented
+	Equals and GetHashCode.
+
+	* System.Web.UI/DataBoundLiteralControl.cs:
+	(LoadViewState):
+	(SaveViewState): implemented.
+
+	* System.Web.UI/Page.cs: FileDependencies is not public.
+
+	* System.Web.UI/ParseChildrenAttribute.cs: give a value to Default.
+	(GetHashCode):
+	(Equals):
+	(IsDefaultAttribute): implemented.
+
+2002-07-08  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs: fixed Visible property.
+	* Page.cs: fixed GetViewStateString.
+
+2002-07-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.UI/Page.cs:
+	(GetViewStateString): new function to give the server access to the
+	generated view state string.
+	(Validate): d'oh!
+
+2002-07-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs:
+	(SaveViewstateRecursive): implemented.
+	(SaveViewState): fixed.
+	(IParserAccessor.AddParsedSubObject): don't use 'this'.
+
+	* Page.cs: added code to save view state to an xml file.  It's not
+	being used right now.
+
+2002-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.UI/LiteralControl.cs: 
+	Fixes based on class status page:
+	
+		- Add attributes (DefaultEvent, ParseChildren).
+		- Fix declarations.
+		- Explicitly implement some interfaces (IPostBackDataHandler
+		and IPostBackEventHandler).
+		- Implemented some missing methods.
+
+2002-06-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs: reimplemented FindControls.
+
+	* Page.cs:
+	(.ctor): set the page for this control.
+	(IsPostBack): return valid value.
+	(DeterminePostBackMode): finished.
+	(OnFormRender): render __VIEWSTATE (uses GetTypeHashCode()).
+	(ProcessPostData): implemented. Raises change and postback events.
+	(ProcessRequest): changed to support reuse of the instance.
+	(RegisterRequiresPostBack): implemented.
+
+	* ValidatorCollection.cs: implemented all methods.
+
+2002-06-25  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs:
+	* Page.cs: first attemp to save view state.
+
+	* HtmlForm.cs: don't render Action.
+
+2002-06-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs: implemented more properties using information we already
+	have in Context.
+	(OnFormRender):
+	(OnFormPostRender):
+	(VerifyRenderingInServerForm): implemented.
+
+2002-06-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs: changed InvokeEventMethod to use a GetMethod that works with
+	out runtime. Renamed Page_Init and Page_Load.
+
+	After this, we can load a dll and render HTML in linux.
+
+2002-06-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs:
+	(AddedControl): new function that is called whenever a control is
+	added to a collection of controls in a container. It sets the defaults
+	except for Page.
+	
+	* ControlCollection.cs: call AddedControl in Add/AddAt.
+
+	* DataBoundLiteralControl.cs: implemented constructor, Text, Render,
+	SetStaticString and SetDataBoundString.
+
+	* Page.cs: removed SetDefaults.
+
+2002-06-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* CompiledTemplateBuilder.cs: new file. Used in the code generated
+	by xsp.
+
+	* Control.cs:
+	(BindingContainer): implemented.
+	(EnsureChildControls): avoid stack overflow.
+
+	* DataBinder.cs: implemented Eval and PropertyValue.
+
+2002-06-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HtmlTextWriter.cs: fixed style attributes rendering (almost the same
+	bug as in regular attributes).
+
+2002-06-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs: implemented PreventAutoID.
+
+	* Page.cs:
+	(SetDefaults): don't set ID automatically if Control.PreventAutoID has
+	been called.
+
+2002-06-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs:
+	(Validators): if the collection is null, create one.
+	(GetPostBackEventReference 2): don't throw exception.
+	(GetPostBackClientEvent): return a string with containing the method
+	name, the control name and the argument.
+
+2002-06-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs: SetPage is now called SetDefaults and also sets a default 
+	ID for controls that don't have one yet.
+
+2002-06-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs:
+	(GetPostBackClient):
+	(RegisterRequiresPostBack): don't throw NotImplementedException to
+	keep going.
+	(ProcessRequest): set the current page as the Page property for *all*
+	the controls, not just the direct children of the page.
+
+2002-06-11  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs:
+	(MapPathSecure): until security is implemented, return the same path
+	received as argument.
+	(RenderControl): call OnPreRender before rendering the control. So
+	AdRotator can read its configuration file.Is there any other place
+	where this should be done?
+
+	* HtmlTextWriter.cs:
+	(AddAttribute): fixed. Now it really stores attributes.
+	(RenderBeginTag): fixed a couple of bugs (little ones but hard to find).
+
+2002-06-09  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ControlCollection.cs:
+	(AddAt): if index is -1 behave as a plain Add.
+
+2002-06-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs: for each child control to render, assign Control.Page.
+	Probably also needed in HtmlContainerControl derived classes.
+	
+2002-06-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AttributeCollection.cs: don't need a Hastable. StateBag now works 
+	fine and takes care of the details.
+
+	* Control.cs: added HasChildren property.
+
+	* StateBag.cs: fixed a couple of nasty bugs.
+
+2002-06-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs: run OnInit, OnLoad y PreRender before rendering the page.
+	Invoke Page_Init and/or Page_Load if the user supplied them (though 
+	this should depend on AutoEventWireUp attribute of Page directive).
+
+2002-06-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Control.cs: don't throw exception in ControlID. By now, it returns ID.
+
+	* Page.cs: 
+	(ProcessRequest): implemented.
+
+2002-06-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web.UI/Page.cs: finished stubbing out. Implemented some
+	methods.
+
+2002-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Page.cs:
+	(FileDependencies): now is public public.
+	(EnableViewStateMAC): uncommented and made protected. 
+	(GetTypeHashCode): added method.
+	
+2002-05-24  Duncan Mak  <duncan@ximian.com>
+
+	* TemplateControl.cs (SetStringResourcePointer): Fixed typo.
+
+	* StateBag.cs (Item): Changed the visibility level of the this
+	[object] indexer.
+
+	Misc. formatting edits, fixing some bugs introduced by the indentation.
+
+	* DataBinder.cs (Eval)
+	(GetIndexedPropertyValue)
+	(GetPropertyValue): Fixed return types.
+
+2002-05-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* HtmlTextWriter.cs: Use this to change the member instances.
+
+2002-05-17  Duncan Mak  <duncan@ximian.com>
+
+	* AttributeCollection.cs: 
+	* ControlCollection.cs: 
+	* CssStyleCollection.cs: 
+	* DataBindingCollection.cs: 
+	* EmptyControlCollection.cs: Added missing Collection classes.
+
+2002-05-17  Duncan Mak  <duncan@ximian.com>
+
+	* BaseParser.cs:
+	* TemplateParser.cs:  Implemented. BaseParser is weird because
+	there is no documentation on what it does.
+
+	* ControlBuilder.cs:
+	
+	* DataBinder.cs: 
+	* DataBinding.cs: Added. 
+
+	* DataBoundLiteralControl.cs: 
+	* Triplet.cs: Added.
+
+	* RenderMethod.cs: Added this delegate for Control.cs
+
+2002-05-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ValidationPropertyAttribute.cs: a couple of fixes to make it compile.
+
+2002-05-14  Duncan Mak  <duncan@ximian.com>
+
+	* ValidationPropertyAttribute.cs: Added to CVS.
+
+2002-05-10  Duncan Mak  <duncan@ximian.com>
+
+	* ConstructorNeedsTagAttribute.cs: 
+	* ControlBuilderAttribute.cs: 
+	* ImageClickEventArgs.cs: 
+	* ParseChildrenAttribute.cs: 
+	* PartialCachingAttribute.cs: 
+	* PersistChildrenAttribute.cs: 
+	* PersistenceModeAttribute.cs: 
+	* TemplateContainerAttribute.cs: Added to CVS.
+
+	* PersistanceMode.cs: Removed, fixed typo.
+	* PersistenceMode.cs: Replacing above.
+
+	* StateBag.cs (this): Fixed indexer, it takes a string as the
+	index, not an object.
+
+	* ValidatorCollection.cs: Fixed typo, ValidatedCollection to ValidatorCollection. 
+
+	* Page.cs (Validators): return type should be ValidatorCollection,
+	not ValidatedCollection.
+
+	* TagPrefixAttribute.cs: Added to CVS.
+
+2002-05-07  Duncan Mak  <duncan@ximian.com>
+
+	* Utils.cs (GetClientValidatedEvent): Uncommented the 'Page' argument.
+
+2002-03-26   Gaurav Vaish <gvaish@iitk.ac.in>
+
+        * DataBindingHandlerAttribute.cs
+                                   - Completed
+        * ToolboxDataAttribute.cs  - Completed
+
+2002-01-03  Nick Drochak  <ndrochak@gol.com>
+
+	* DesignTimeParseData.cs: initialze static member to avoid compile
+	error
+	* PropertyConverter.cs: remove uneeded exception variables from
+	catch blocks.
+
+2002-01-02  Nick Drochak  <ndrochak@gol.com>
+
+	* DesignTimeParseData.cs: fix header to show correct class name
+
+2001-12-21   Gaurav Vaish <gvaish@iitk.ac.in>
+
+        * StateBag.cs             - Completed
+
+2001-12-19   Gaurav Vaish <gvaish@iitk.ac.in>
+
+        * Pair.cs                 - Small undocumented class. Completed.
+
+2001-12-18   Gaurav Vaish <gvaish@iitk.ac.in>
+
+        * DesignTimeParseData.cs  - Initial implementation
+        * StateBag.cs             - Initial implementation
+
+2001-12-17   Gaurav Vaish <gvaish@iitk.ac.in>
+
+        * PropertyConverter.cs    - Undocumented class. Completed.
+        * Utils.cs                - Undocumented, private class.
+				    Initial implementation
+
+2001-08-28  Bob Smith  <bob@thestuff.net>
+        * Control.cs: Figured out some undocumented API.
+        * Added TODO.
+        * BuildMethod.cs: Initial implementation.
+        * BuildTemplateMethod.cs: Initial implementation.
+        * HtmlTextWriterAttribute.cs: Initial implementation.
+        * HtmlTextWriterStyle.cs: Initial implementation.
+        * HtmlTextWriterTag.cs: Initial implementation.
+        * IAttributeAccessor.cs: Initial implementation.
+        * IDataBindingsAccessor.cs: Initial implementation.
+        * ImageClickEventHandler.cs: Initial implementation.
+        * INamingContainer.cs: Initial implementation.
+        * IParserAccessor.cs: Initial implementation.
+        * IPostBackDataHandler.cs: Initial implementation.
+        * IPostBackEventHandler.cs: Initial implementation.
+        * IStateManager.cs: Initial implementation.
+        * ITagNameToTypeMapper.cs: Initial implementation.
+        * ITemplate.cs: Initial implementation.
+        * IValidator.cs: Initial implementation.
+        * OutputCacheLocation.cs: Initial implementation.
+        * PersistanceMode.cs: Initial implementation.
+        * StateItem.cs: Initial implementation.
+
+2001-08-27  Bob Smith  <bob@thestuff.net>
+
+        * Control.cs: Bug fixes and implementations.
+
+2001-08-24  Bob Smith  <bob@thestuff.net>
+
+        * Control.cs: Bug fixes.
+
+2001-08-23  Bob Smith  <bob@thestuff.net>
+
+        * Control.cs: More implementation. Events reworked for performance.
+
+2001-08-22  Bob Smith  <bob@thestuff.net>
+
+        * LiteralControl.cs: Implemented.
+        * Control.cs: Even more implementation (Events). What a beast.
+
+2001-08-20  Bob Smith  <bob@thestuff.net>
+
+        * Control.cs: More implementation. Not done yet. Shutter.
+
+2001-08-17  Bob Smith  <bob@thestuff.net>
+
+        * Control.cs: Partial implementation.
diff --git a/mcs/class/System.Web/System.Web.UI/CompiledTemplateBuilder.cs b/mcs/class/System.Web/System.Web.UI/CompiledTemplateBuilder.cs
new file mode 100644
index 00000000000..a3ad857a0d3
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/CompiledTemplateBuilder.cs
@@ -0,0 +1,29 @@
+//
+// System.Web.UI.CompiledTemplateBuilder
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+// This is used in the generated C# code from MS and xsp does the same.
+// It just seems to be a container implementing an ITemplate interface.
+
+namespace System.Web.UI {
+
+public class CompiledTemplateBuilder : ITemplate
+{
+	private BuildTemplateMethod templateMethod;
+
+	public CompiledTemplateBuilder (BuildTemplateMethod templateMethod)
+	{
+		this.templateMethod = templateMethod;
+	}
+
+	public virtual void InstantiateIn (Control ctrl)
+	{
+		templateMethod (ctrl);
+	}
+}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/ConstructorNeedsTagAttribute.cs b/mcs/class/System.Web/System.Web.UI/ConstructorNeedsTagAttribute.cs
new file mode 100755
index 00000000000..cacfe8da90a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ConstructorNeedsTagAttribute.cs
@@ -0,0 +1,31 @@
+//
+// System.Web.UI.ConstructorNeedsTagAttribute.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+
+namespace System.Web.UI {
+
+	[AttributeUsage (AttributeTargets.Class)]
+	public sealed class ConstructorNeedsTagAttribute : Attribute
+	{
+		bool needsTag;
+
+		public ConstructorNeedsTagAttribute ()
+		{
+			needsTag = false;
+		}
+
+		public ConstructorNeedsTagAttribute (bool needsTag)
+		{
+			this.needsTag = needsTag;
+		}
+
+		public bool NeedsTag {
+			get { return needsTag; }
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/Control.cs b/mcs/class/System.Web/System.Web.UI/Control.cs
new file mode 100644
index 00000000000..7655e1e31a5
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/Control.cs
@@ -0,0 +1,721 @@
+//

+// System.Web.UI.Control.cs

+//

+// Authors:

+// 	Bob Smith <bob@thestuff.net>

+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)

+//

+// (C) Bob Smith

+// (c) 2002 Ximian, Inc. (http://www.ximian.com)

+//

+

+/*

+ * Maintainer: bob@thestuff.net, gvaish@iitk.ac.in

+ * (C) Bob Smith, Gaurav Vaish

+ */

+

+//notes: view state only tracks changes after OnInit method is executed for the page request. You can read from it at any time, but cant write to it during rendering.

+//even more notes: view state info in trackviewstate method description. read later.

+//Ok, enough notes: what the heck is different between enable view state, and track view state.

+//Well, maybe not. How does the ViewState know when to track changes? Does it look at the property

+//on the owning control, or does it have a method/property of its own that gets called?

+// I think this last question is solved in the Interface for it. Look into this.

+

+//cycle:

+//init is called when control is first created.

+//load view state ic called right after init to populate the view state.

+//loadpostdata is called if ipostbackdatahandler is implemented.

+//load is called when control is loaded into a page

+//raisepostdatachangedevent if ipostbackdatahandler is implemented.

+//raisepostbackevent if ipostbackeventhandler is implemented.

+//prerender is called when the server is about to render its page object

+//SaveViewState is called.

+//Unload then dispose it apears. :)

+

+//Naming Container MUST have some methods. What are they? No clue. Help?

+

+//read this later. http://gotdotnet.com/quickstart/aspplus/

+//This to: http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpguidnf/html/cpconattributesdesign-timesupport.asp

+//http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpguidnf/html/cpcontracefunctionality.asp

+

+// Isnt life grand? :)

+// See the undocumented methods? Gota love um. ;)

+// ASP.test4_aspx.Page_Load(Object Sender, EventArgs e) in \\genfs2\www24\bobsmith11\test4.aspx:6

+// System.Web.UI.Control.OnLoad(EventArgs e) +67

+// System.Web.UI.Control.LoadRecursive() +73

+// System.Web.UI.Page.ProcessRequestMain() +394

+

+// ASP.test4_aspx.Page_Unload(Object Sender, EventArgs e) in \\genfs2\www24\bobsmith11\test4.aspx:6

+// System.EventHandler.Invoke(Object sender, EventArgs e) +0

+// System.Web.UI.Control.OnUnload(EventArgs e) +67

+// System.Web.UI.Control.UnloadRecursive(Boolean dispose) +78

+// System.Web.UI.Page.ProcessRequest() +194

+// System.Web.UI.Page.ProcessRequest(HttpContext context) +18

+// System.Web.CallHandlerExecutionStep.Execute() +179

+// System.Web.HttpApplication.ExecuteStep(IExecutionStep step, Boolean& completedSynchronously) +87

+

+

+// ASP.test4_aspx.Page_Unload(Object Sender, EventArgs e) in \\genfs2\www24\bobsmith11\test4.aspx:6

+// System.Web.UI.Control.OnUnload(EventArgs e) +67

+// System.Web.UI.Control.UnloadRecursive(Boolean dispose) +78

+// System.Web.UI.Page.ProcessRequest()

+

+// ASP.test4_aspx.Page_Kill(Object Sender, EventArgs e) in \\genfs2\www24\bobsmith11\test4.aspx:6

+// System.Web.UI.Control.OnPreRender(EventArgs e) +67

+// System.Web.UI.Control.PreRenderRecursiveInternal() +61

+// System.Web.UI.Page.ProcessRequestMain() +753

+

+// ASP.test4_aspx.OnInit(EventArgs e) in \\genfs2\www24\bobsmith11\test4.aspx:6

+// System.Web.UI.Control.InitRecursive(Control namingContainer) +202

+// System.Web.UI.Page.ProcessRequestMain() +120

+

+// ASP.test4_aspx.SaveViewState() in \\genfs2\www24\bobsmith11\test4.aspx:12

+// System.Web.UI.Control.SaveViewStateRecursive() +51

+// System.Web.UI.Page.SavePageViewState() +174

+// System.Web.UI.Page.ProcessRequestMain() +861

+

+// ASP.test_aspx.LoadViewState(Object t) +28

+// System.Web.UI.Control.LoadViewStateRecursive(Object savedState) +125

+// System.Web.UI.Page.LoadPageViewState() +182

+// System.Web.UI.Page.ProcessRequestMain() +256

+

+using System;

+using System.Collections;

+using System.Web;

+using System.ComponentModel;

+

+namespace System.Web.UI

+{

+        public class Control : IComponent, IDisposable, IParserAccessor, IDataBindingsAccessor

+        {

+                private static readonly object DataBindingEvent = new object();

+                private static readonly object DisposedEvent = new object();

+                private static readonly object InitEvent = new object();

+                private static readonly object LoadEvent = new object();

+                private static readonly object PreRenderEvent = new object();

+                private static readonly object UnloadEvent = new object();

+                private string _userId = null;

+                private string _cachedUserId = null;

+                private string _cachedClientId = null;

+                private ControlCollection _controls = null;

+                private bool _enableViewState = true;

+                private IDictionary _childViewStates = null; //TODO: Not sure datatype. Placeholder guess.

+                private bool _isNamingContainer = false;

+                private Control _namingContainer = null;

+                private Page _page = null;

+                private Control _parent = null;

+                private ISite _site = null;

+                private bool _visible = true;

+                private HttpContext _context = null;

+                private bool _childControlsCreated = false;

+                private StateBag _viewState = null;

+                private bool _trackViewState = false;

+                private EventHandlerList _events = new EventHandlerList();

+                private RenderMethod _renderMethodDelegate = null;

+		private bool autoID = true;

+		private bool creatingControls = false;

+        	

+        	    private DataBindingCollection dataBindings = null;

+

+                public Control()

+                {

+                        if (this is INamingContainer) _isNamingContainer = true;

+                }

+

+		public Control BindingContainer

+		{

+			get {

+				Control container = NamingContainer;

+				if (_isNamingContainer)

+					container = container.BindingContainer;

+				return container;

+			}

+		}

+		

+                public virtual string ClientID //DIT

+                {

+                        get

+                        {

+                                if (_cachedUserId != null && _cachedClientId != null)

+                                        return _cachedClientId;

+                                _cachedUserId = UniqueID.Replace(':', '_');

+                                return _cachedUserId;

+                        }

+                }

+                public virtual ControlCollection Controls //DIT

+                {

+                        get

+                        {

+                                if (_controls == null) _controls = CreateControlCollection();

+                                return _controls;

+                        }

+                }

+                public virtual bool EnableViewState //DIT

+                {

+                        get

+                        {

+                                return _enableViewState;

+                        }

+                        set

+                        {

+                                _enableViewState = value;

+                        }

+                }

+                public virtual string ID

+                {

+                        get //DIT

+                        {

+                                return _userId;

+                        }

+                        set

+                        {

+                                if (value == null || value == "") return;

+                                _userId = value;

+                                _cachedUserId = null;

+                                //TODO: Some Naming Container stuff here I think.

+                        }

+                }

+                public virtual Control NamingContainer //DIT

+                {

+                        get

+                        {

+                                if (_namingContainer == null && _parent != null)

+                                {

+                                        if (_parent._isNamingContainer == false)

+                                                _namingContainer = _parent.NamingContainer;

+                                        else

+                                                _namingContainer = _parent;

+                                }

+                                return _namingContainer;

+                        }

+                }

+                public virtual Page Page //DIT

+                {

+                        get

+                        {

+                                if (_page == null && _parent != null) _page = _parent.Page;

+                                return _page;

+                        }

+                        set

+                        {

+                                _page = value;

+                        }

+                }

+                public virtual Control Parent //DIT

+                {

+                        get

+                        {

+                                return _parent;

+                        }

+                }

+                public ISite Site //DIT

+                {

+                        get

+                        {

+                                return _site;

+                        }

+                        set

+                        {

+                                _site = value;

+                        }

+                }

+                public virtual string TemplateSourceDirectory

+                {

+                        get

+                        {

+                                return Context.Request.ApplicationPath; //TODO: Dont think this is right.

+                        }

+                }

+

+				[MonoTODO]

+                public virtual string UniqueID

+                {

+                        get

+                        {

+                                //TODO: Some Naming container methods here. What are they? Why arnt they declared?

+                                //Note: Nuked the old stuff here. Was total crap. :)

+                                return ID;

+                        }

+                }

+                public virtual bool Visible

+                {

+                        get

+                        {

+				if (_visible == false)

+					return false;

+

+				if (_parent != null)

+					return _parent.Visible;

+

+                                return true;

+                        }

+                        set

+                        {

+                                _visible = value;

+                        }

+                }

+                protected bool ChildControlsCreated //DIT

+                {

+                        get

+                        {

+                                return _childControlsCreated;

+                        }

+                        set

+                        {

+                                if (value == false && _childControlsCreated == true)

+                                        _controls.Clear();

+                                _childControlsCreated = value;

+                        }

+                }

+                protected virtual HttpContext Context //DIT

+                {

+                        get

+                        {

+                                HttpContext context;

+                                if (_context != null)

+                                        return _context;

+                                if (_parent == null)

+                                        return HttpContext.Current;

+                                context = _parent.Context;

+                                if (context != null)

+                                        return context;

+                                return HttpContext.Current;

+                        }

+                }

+                protected EventHandlerList Events //DIT

+                {

+                        get

+                        {

+                                if (_events == null)

+                                {

+                                	_events = new EventHandlerList();

+                                }

+                                return _events;

+                        }

+                }

+                protected bool HasChildViewState //DIT

+                {

+                        get

+                        {

+                                if (_childViewStates == null) return false;

+                                return true;

+                        }

+                }

+                protected bool IsTrackingViewState //DIT

+                {

+                        get

+                        {

+                                return _trackViewState;

+                        }

+                }

+                protected virtual StateBag ViewState

+                {

+                        get

+                        {

+                        	if(_viewState == null)

+	                        	_viewState = new StateBag (ViewStateIgnoresCase);

+

+				if (IsTrackingViewState)

+					_viewState.TrackViewState ();

+

+                        	return _viewState;

+                        }

+                }

+                protected virtual bool ViewStateIgnoresCase

+                {

+                        get {

+                                return false;

+                        }

+                }

+

+		private int defaultNumberID;

+		protected internal virtual void AddedControl (Control control, int index)

+		{

+			/* Ensure the control don't have more than 1 parent */

+			if (control._parent != null)

+				control._parent.Controls.Remove (control);

+

+			control._parent = this;

+			control._page = Page;

+

+			// Without this, DataBoundLiteralControl crashes in OnDataBound event.

+			Control namingContainer = NamingContainer;

+			if (namingContainer != null)

+				control._namingContainer = namingContainer;

+			

+			if (control.AutoID == true && control.ID == null)

+				control.ID = "_ctrl_" + defaultNumberID++;

+		}

+

+                protected virtual void AddParsedSubObject(object obj) //DIT

+                {

+                        Control c = (Control)obj;

+                        if (c != null) Controls.Add(c);

+                }

+                protected void BuildProfileTree(string parentId, bool calcViewState)

+                {

+                        //TODO

+                }

+                protected void ClearChildViewState()

+                {

+                        //TODO

+                        //Not quite sure about this. an example clears children then calls this, so I think

+                        //view state is local to the current object, not children.

+                }

+                protected virtual void CreateChildControls() {} //DIT

+                protected virtual ControlCollection CreateControlCollection() //DIT

+                {

+                        return new ControlCollection(this);

+                }

+

+                protected virtual void EnsureChildControls () //DIT

+                {

+                        if (ChildControlsCreated == false && !creatingControls) {

+				creatingControls = true;

+                                CreateChildControls();

+                                ChildControlsCreated = true;

+				creatingControls = false;

+                        }

+                }

+

+                protected virtual Control FindControl(string id, int pathOffset)

+                {

+                        //TODO: I think there is Naming Container stuff here. Redo.

+                        int i;

+			Control ctrl;

+                        for (i = pathOffset; i < _controls.Count; i++){

+				ctrl = _controls [i];

+				

+                                if (ctrl.ID == id)

+					return ctrl;

+

+				if (ctrl.Controls.Count > 0){

+					Control other = ctrl.FindControl (id);

+					if (other != null)

+						return other;

+				}

+				

+			}

+                        return null;

+                }

+

+                protected virtual void LoadViewState(object savedState)

+                {

+			if (savedState != null)

+				ViewState.LoadViewState (savedState);

+                }

+                

+		[MonoTODO]

+                protected string MapPathSecure(string virtualPath)

+                {

+                        //TODO: Need to read up on security+web.

+			//Return the same path. So AdRotator can read its config file.

+			return virtualPath;

+                }

+                protected virtual bool OnBubbleEvent(object source, EventArgs args) //DIT

+                {

+                        return false;

+                }

+                protected virtual void OnDataBinding(EventArgs e) //DIT

+                {

+                        if (_events != null)

+                        {

+                                EventHandler eh = (EventHandler)(_events[DataBindingEvent]);

+                                if (eh != null) eh(this, e);

+                        }

+                }

+                protected virtual void OnInit(EventArgs e) //DIT

+                {

+                        if (_events != null)

+                        {

+                                EventHandler eh = (EventHandler)(_events[InitEvent]);

+                                if (eh != null) eh(this, e);

+                        }

+                }

+                protected virtual void OnLoad(EventArgs e) //DIT

+                {

+                        if (_events != null)

+                        {

+                                EventHandler eh = (EventHandler)(_events[LoadEvent]);

+                                if (eh != null) eh(this, e);

+                        }

+                }

+                protected virtual void OnPreRender(EventArgs e) //DIT

+                {

+                        if (_events != null)

+                        {

+                                EventHandler eh = (EventHandler)(_events[PreRenderEvent]);

+                                if (eh != null) eh(this, e);

+                        }

+                }

+                protected virtual void OnUnload(EventArgs e) //DIT

+                {

+                        if (_events != null)

+                        {

+                                EventHandler eh = (EventHandler)(_events[UnloadEvent]);

+                                if (eh != null) eh(this, e);

+                        }

+                }

+                

+				[MonoTODO]

+                protected void RaiseBubbleEvent(object source, EventArgs args)

+                {

+                        throw new NotImplementedException();

+                        //return false;

+                }

+                protected virtual void Render(HtmlTextWriter writer) //DIT

+                {

+                        RenderChildren(writer);

+                }

+                protected virtual void RenderChildren(HtmlTextWriter writer) //DIT

+                {

+                        if (_renderMethodDelegate != null)

+                                _renderMethodDelegate(writer, this);

+                        else if (_controls != null)

+                                foreach (Control c in _controls)

+                                        c.RenderControl(writer);

+                }

+		

+                protected virtual object SaveViewState ()

+                {

+			if (_viewState == null)

+				return null;

+

+			return _viewState.SaveViewState ();

+                }

+

+                protected virtual void TrackViewState()

+                {

+			if (_viewState != null)

+				_viewState.TrackViewState ();

+                        _trackViewState = true;

+                }

+                

+                public virtual void Dispose()

+                {

+                        if (_events != null)

+                        {

+                                EventHandler eh = (EventHandler) _events [DisposedEvent];

+                                if (eh != null)

+					eh(this, EventArgs.Empty);

+                        }

+                }

+

+		public bool HasChildren

+		{

+			get { return (_controls != null && _controls.Count > 0); }

+		}

+

+                public event EventHandler DataBinding //DIT

+                {

+                        add

+                        {

+                                Events.AddHandler(DataBindingEvent, value);

+                        }

+                        remove

+                        {

+                                Events.RemoveHandler(DataBindingEvent, value);

+                        }

+                }

+                public event EventHandler Disposed //DIT

+                {

+                        add

+                        {

+                                Events.AddHandler(DisposedEvent, value);

+                        }

+                        remove

+                        {

+                                Events.RemoveHandler(DisposedEvent, value);

+                        }

+                }

+                public event EventHandler Init //DIT

+                {

+                        add

+                        {

+                                Events.AddHandler(InitEvent, value);

+                        }

+                        remove

+                        {

+                                Events.RemoveHandler(InitEvent, value);

+                        }

+                }

+                public event EventHandler Load //DIT

+                {

+                        add

+                        {

+                                Events.AddHandler(LoadEvent, value);

+                        }

+                        remove

+                        {

+                                Events.RemoveHandler(LoadEvent, value);

+                        }

+                }

+                public event EventHandler PreRender //DIT

+                {

+                        add

+                        {

+                                Events.AddHandler(PreRenderEvent, value);

+                        }

+                        remove

+                        {

+                                Events.RemoveHandler(PreRenderEvent, value);

+                        }

+                }

+                public event EventHandler Unload //DIT

+                {

+                        add

+                        {

+                                Events.AddHandler(UnloadEvent, value);

+                        }

+                        remove

+                        {

+                                Events.RemoveHandler(UnloadEvent, value);

+                        }

+                }

+                public virtual void DataBind() //DIT

+                {

+                        OnDataBinding(EventArgs.Empty);

+                        if (_controls != null)

+                                foreach (Control c in _controls)

+                                        c.DataBind();

+                }

+                public virtual Control FindControl(string id) //DIT

+                {

+                        return FindControl(id, 0);

+                }

+                public virtual bool HasControls() //DIT

+                {

+                        if (_controls != null && _controls.Count >0) return true;

+                        return false;

+                }

+                public void RenderControl(HtmlTextWriter writer)

+                {

+                        if (_visible)

+                        {

+                                //TODO: Something about tracing here.

+                                Render(writer);

+                        }

+                }

+                

+                [MonoTODO]

+                public string ResolveUrl(string relativeUrl)

+                {

+                	return relativeUrl;

+                }

+

+                public void SetRenderMethodDelegate(RenderMethod renderMethod) //DIT

+                {

+                        _renderMethodDelegate = renderMethod;

+                }

+

+                protected void LoadRecursive()

+                {

+                        OnLoad(EventArgs.Empty);

+                        if (_controls != null) foreach (Control c in _controls) c.LoadRecursive();

+                }

+

+                protected void UnloadRecursive(Boolean dispose)

+                {

+                        OnUnload(EventArgs.Empty);

+                        if (_controls != null) foreach (Control c in _controls) c.UnloadRecursive(dispose);

+                        if (dispose) Dispose();

+                }

+

+                protected void PreRenderRecursiveInternal()

+                {

+                        OnPreRender(EventArgs.Empty);

+                        if (_controls != null) foreach (Control c in _controls) c.PreRenderRecursiveInternal();

+                }

+

+                protected void InitRecursive(Control namingContainer)

+                {

+                        if (_controls != null) foreach (Control c in _controls) c.InitRecursive(namingContainer);

+                        OnInit(EventArgs.Empty);

+			TrackViewState ();

+                }

+                

+                internal object SaveViewStateRecursive()

+                {

+			if (!EnableViewState)

+				return null;

+

+			ArrayList controlList = null;

+			ArrayList controlStates = null;

+

+			foreach (Control ctrl in Controls){

+				if (controlList == null) {

+					controlList = new ArrayList ();

+					controlStates = new ArrayList ();

+				}

+				controlList.Add (ctrl);

+				controlStates.Add (ctrl.SaveViewStateRecursive ());

+			}

+				

+			return new Triplet (SaveViewState (), controlList, controlStates);

+                }

+                

+		internal void LoadViewStateRecursive (object savedState)

+                {

+			if (!EnableViewState || !Visible || savedState == null)

+				return;

+

+			Triplet savedInfo = (Triplet) savedState;

+			LoadViewState (savedInfo.First);

+

+			ArrayList controlList = savedInfo.Second as ArrayList;

+			if (controlList == null)

+				return;

+			ArrayList controlStates = savedInfo.Third as ArrayList;

+			int nControls = controlList.Count;

+			for (int i = 0; i < nControls; i++) {

+				if (controlStates != null)

+					Controls [i].LoadViewStateRecursive (controlStates [i]);

+			}

+                }

+                

+                void IParserAccessor.AddParsedSubObject(object obj)

+                {

+                	AddParsedSubObject(obj);

+                }

+                

+                DataBindingCollection IDataBindingsAccessor.DataBindings

+                {

+                	get

+                	{

+                		if(dataBindings == null)

+                			dataBindings = new DataBindingCollection();

+                		return dataBindings;

+                	}

+                }

+                

+                bool IDataBindingsAccessor.HasDataBindings

+                {

+                	get

+                	{

+                		return (dataBindings!=null && dataBindings.Count>0);

+                	}

+                }

+                

+		internal bool AutoID

+		{

+			get { return autoID; }

+			set { autoID = value; }

+		}

+

+                internal void PreventAutoID()

+                {

+			AutoID = false;

+                }

+                

+		protected internal virtual void RemovedControl (Control control)

+		{

+			control.UnloadRecursive (false);

+			control._parent = null;

+			control._page = null;

+			control._namingContainer = null;

+		}

+

+                //TODO: I think there are some needed Interface implementations to do here.

+                //TODO: Find api for INamingContainer.

+        }

+}

diff --git a/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs b/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
new file mode 100755
index 00000000000..7acb206a3a3
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ControlBuilder.cs
@@ -0,0 +1,167 @@
+//
+// System.Web.UI.ControlBuilder.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+
+namespace System.Web.UI {
+
+	public class ControlBuilder
+	{
+		TemplateParser parser;
+		ControlBuilder parentBuilder;
+		Type type;	       
+		string tagName;
+		string id;
+		IDictionary attribs;
+		int line;
+		string fileName;
+
+		public ControlBuilder ()
+		{
+		}
+
+
+		internal ControlBuilder (
+			TemplateParser parser, ControlBuilder parentBuilder,
+			Type type, string tagName, string id,
+			IDictionary attribs, int line, string sourceFileName)
+
+		{
+			this.parser = parser;
+			this.parentBuilder = parentBuilder;
+			this.type = type;
+			this.tagName = tagName;
+			this.id = id;
+			this.attribs = attribs;
+			this.line = line;
+			this.fileName = sourceFileName;
+		}
+
+		public Type ControlType {
+			get { return type; }
+		}
+
+		[MonoTODO]
+		public bool FChildrenAsProperties {
+			get { return false; }
+		}
+
+		[MonoTODO]
+		public bool FIsNonParserAccessor {
+			get { return false; }
+		}
+
+		[MonoTODO]
+		public bool HasAspCode {
+			get { return false; }
+		}
+
+		public string ID {
+			get { return id; }
+
+			set { id = value; }
+		}
+
+		[MonoTODO]
+		public bool InDesigner {
+			get { return false; }
+		}
+
+		[MonoTODO]
+		public Type NamingContainerType {
+			get { return null; }
+		}
+
+		protected TemplateParser Parser {
+			get { return parser; }
+		}
+
+		public string TagName {
+			get { return tagName; }
+		}
+
+		[MonoTODO]
+		public virtual bool AllowWhitespaceLiterals ()
+		{
+			return false;
+		}
+
+		[MonoTODO]
+		public virtual void AppendLiteralString (string s)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void AppendSubBuilder (ControlBuilder subBuilder)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void CloseControl ()
+		{
+		}
+
+		[MonoTODO]
+		public static ControlBuilder CreateBuilderFromType (
+			TemplateParser parser, ControlBuilder parentBuilder,
+			Type type, string tagName, string id,
+			IDictionary attribs, int line, string sourceFileName)
+		{
+			return new ControlBuilder (parser, parentBuilder, type,
+						   tagName, id, attribs, line, sourceFileName);
+		}
+
+		[MonoTODO]
+		public virtual Type GetChildControlType (string tagName, IDictionary attribs)
+		{
+			return attribs [tagName] as Type;
+		}
+
+		[MonoTODO]
+		public virtual bool HasBody ()
+		{
+			return false;
+		}
+
+		[MonoTODO]
+		public virtual bool HtmlDecodeLiterals ()
+		{
+			return false;
+		}
+
+		[MonoTODO]
+		public virtual void Init (
+			TemplateParser parser, ControlBuilder parentBuilder,
+			Type type, string tagName, string id, IDictionary attribs)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual bool NeedsTagInnerText ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void OnAppendToParentBuilder ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetTagInnerText (string text)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/ControlBuilderAttribute.cs b/mcs/class/System.Web/System.Web.UI/ControlBuilderAttribute.cs
new file mode 100755
index 00000000000..dfae94c445d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ControlBuilderAttribute.cs
@@ -0,0 +1,47 @@
+//
+// System.Web.UI.ControlBuilderAttribute.cs
+//
+// Authors:
+// 	Duncan Mak  (duncan@ximian.com)
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+
+using System;
+
+namespace System.Web.UI {
+
+	[AttributeUsage (AttributeTargets.Class)]
+	public sealed class ControlBuilderAttribute : Attribute
+	{
+		Type builderType;
+		public static readonly ControlBuilderAttribute Default = new ControlBuilderAttribute (null);
+		
+		public ControlBuilderAttribute (Type builderType)
+		{
+			this.builderType = builderType;
+		}
+
+		public Type BuilderType {
+			get { return builderType; }
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (!(obj is ControlBuilderAttribute))
+				return false;
+			return ((ControlBuilderAttribute) obj).builderType == builderType;
+		}
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+
+		public override bool IsDefaultAttribute ()
+		{
+			return Equals (Default);
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/ControlCollection.cs b/mcs/class/System.Web/System.Web.UI/ControlCollection.cs
new file mode 100755
index 00000000000..4c08bcc70db
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ControlCollection.cs
@@ -0,0 +1,122 @@
+//
+// System.Web.UI.ControlCollection.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+
+namespace System.Web.UI {
+
+	public class ControlCollection : ICollection, IEnumerable
+	{
+		ArrayList list = new ArrayList ();
+		Control owner;
+		
+		public ControlCollection (Control owner)
+		{
+			if (owner == null)
+				throw new ArgumentException ();
+
+			this.owner = owner;
+		}
+
+		public int Count {
+			get { return list.Count; }
+		}
+
+		public bool IsReadOnly {
+			get { return list.IsReadOnly; }
+		}
+
+		public bool  IsSynchronized {
+			get { return list.IsSynchronized; }
+		}
+
+		public virtual Control this [int index] {
+			get { return list [index] as Control; }
+		}
+
+		protected Control Owner {
+			get { return owner; }
+		}
+
+		public object SyncRoot {
+			get { return list.SyncRoot; }
+		}
+
+		public virtual void Add (Control child)
+		{
+			if (child == null)
+				throw new ArgumentNullException ();
+			if (IsReadOnly)
+				throw new HttpException ();
+
+			list.Add (child);
+			owner.AddedControl (child, list.Count - 1);
+		}
+
+		public virtual void AddAt (int index, Control child)
+		{
+			if (child == null) // maybe we should check for ! (child is Control)?
+				throw new ArgumentNullException ();
+			
+			if ((index < -1) || (index > Count))
+				throw new ArgumentOutOfRangeException ();
+
+			if (IsReadOnly)
+				throw new HttpException ();
+
+			if (index == -1){
+				Add (child);
+			} else {
+				list [index] = child;
+				owner.AddedControl (child, index);
+			}
+		}
+
+		public virtual void Clear ()
+		{
+			list.Clear ();
+		}
+
+		public virtual bool Contains (Control c)
+		{
+			return list.Contains (c);
+		}
+
+		public void CopyTo (Array array, int index)
+		{
+			list.CopyTo (array, index);
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return list.GetEnumerator ();
+		}
+
+		public virtual int IndexOf (Control c)
+		{
+			return list.IndexOf (c);
+		}
+
+		public virtual void Remove (Control value)
+		{
+			list.Remove (value);
+			owner.RemovedControl (value);
+		}
+
+		public virtual void RemoveAt (int index)
+		{
+			if (IsReadOnly)
+				throw new HttpException ();
+
+			Control value = (Control) list [index];
+			list.RemoveAt (index);
+			owner.RemovedControl (value);
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/CssStyleCollection.cs b/mcs/class/System.Web/System.Web.UI/CssStyleCollection.cs
new file mode 100755
index 00000000000..8191228681c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/CssStyleCollection.cs
@@ -0,0 +1,106 @@
+//
+// System.Web.UI.CssStyleCollection.cs
+//
+// Authors:
+// 	Duncan Mak  (duncan@ximian.com)
+// 	Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System;
+using System.Collections;
+using System.Text;
+
+namespace System.Web.UI {
+
+	public sealed class CssStyleCollection
+	{
+		private StateBag bag;
+		private StateBag style;
+
+		internal CssStyleCollection (StateBag bag)
+		{
+			this.bag = bag;
+			style = new StateBag ();
+			string st_string = bag ["style"] as string;
+			if (st_string != null)
+				FillStyle (st_string);
+		}
+
+		internal void FillStyle (string s)
+		{
+			int mark = s.IndexOf (':');
+			if (mark == -1)
+				return;
+			string key = s.Substring (0, mark). Trim ();
+			if (mark + 1 > s.Length)
+				return;
+
+			string fullValue = s.Substring (mark + 1);
+			if (fullValue == "")
+				return;
+
+			mark = fullValue.IndexOf (';');
+			string value;
+			if (mark == -1)
+				value = fullValue.Trim ();
+			else
+				value = fullValue.Substring (0, mark).Trim ();
+
+			style.Add (key, value);
+			if (mark + 1 > fullValue.Length)
+				return;
+			FillStyle (fullValue.Substring (mark + 1));
+		}
+
+		private string BagToString ()
+		{
+			StringBuilder sb = new StringBuilder ();
+			foreach (string k in style.Keys)
+				sb.AppendFormat ("{0}: {1}; ", k, style [k]);
+			return sb.ToString ();
+		}
+		
+		public int Count
+		{
+			get { return style.Count; }
+		}
+
+		public string this [string key]
+		{
+			get {
+				return style [key] as string;
+			}
+
+			set {
+				Add (key, value);
+			}
+		}
+
+		public ICollection Keys {
+			get { return style.Keys; }
+		}
+
+		public void Add (string key, string value)
+		{
+			style [key] = value;
+			bag ["style"] = BagToString ();
+		}
+
+		public void Clear ()
+		{
+			bag.Remove ("style");
+			style.Clear ();
+		}
+
+		public void Remove (string key)
+		{
+			if (style [key] != null) {
+				style.Remove (key);
+				bag ["style"] = BagToString ();
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/DataBinder.cs b/mcs/class/System.Web/System.Web.UI/DataBinder.cs
new file mode 100755
index 00000000000..37bb71adf51
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/DataBinder.cs
@@ -0,0 +1,77 @@
+//
+// System.Web.UI.DataBinder.cs
+//
+// Authors:
+// 	Duncan Mak  (duncan@ximian.com)
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System;
+using System.Reflection;
+
+namespace System.Web.UI {
+
+	public sealed class DataBinder
+	{
+		public DataBinder ()
+		{
+		}
+
+		public static object Eval (object container, string expression)
+		{
+			return GetPropertyValue (container, expression);
+		}
+
+		public static string Eval (object container, string expression, string format)
+		{
+			return GetPropertyValue (container, expression, format);
+		}
+
+		[MonoTODO]
+		public static object GetIndexedPropertyValue (object container, string expr)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static string GetIndexedPropertyValue (object container, string expr, string format)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static object GetPropertyValue (object container, string propName)
+		{
+			if (container == null || propName == null)
+				throw new ArgumentException ();
+
+			Type type = container.GetType ();
+			PropertyInfo prop = type.GetProperty (propName);
+			if (prop == null)
+				throw new HttpException ("Property " + propName + " not found in " +
+							 type.ToString ());
+			MethodInfo getm = prop.GetGetMethod ();
+			if (getm == null)
+				throw new HttpException ("Cannot find get accessor for " + propName +
+							 " in " + type.ToString ());
+			
+			return getm.Invoke (container, null);
+		}
+
+		public static string GetPropertyValue (object container, string propName, string format)
+		{
+			object result;
+
+			result = GetPropertyValue (container, propName);
+			if (result == null)
+				return String.Empty;
+
+			if (format == null)
+				return result.ToString ();
+
+			return String.Format (format, result);
+		}		
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/DataBinding.cs b/mcs/class/System.Web/System.Web.UI/DataBinding.cs
new file mode 100755
index 00000000000..cf0c8a07d49
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/DataBinding.cs
@@ -0,0 +1,60 @@
+//
+// System.Web.UI.DataBinding.cs
+//
+// Authors:
+// 	Duncan Mak  (duncan@ximian.com)
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System;
+
+namespace System.Web.UI {
+
+	public sealed class DataBinding
+	{
+		string propertyName;
+		Type propertyType;
+		string expression;
+
+		public DataBinding (string propertyName, Type propertyType,
+				    string expression)
+		{
+			this.propertyName = propertyName;
+			this.propertyType = propertyType;
+			this.expression = expression;
+		}
+
+		public string Expression {
+			get { return expression; }
+			set { expression = value; }
+		}
+
+		public string PropertyName {
+			get { return propertyName; }
+		}
+
+		public Type PropertyType {
+			get { return propertyType; }
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (!(obj is DataBinding))
+				return false;
+			
+			DataBinding o = (DataBinding) obj;
+			return (o.Expression == expression &&
+				o.PropertyName == propertyName &&
+				o.PropertyType == propertyType);
+		}
+
+		public override int GetHashCode ()
+		{
+			return propertyName.GetHashCode () +
+			       (propertyType.GetHashCode () << 1) +
+			       (expression.GetHashCode () << 2) ;
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/DataBindingCollection.cs b/mcs/class/System.Web/System.Web.UI/DataBindingCollection.cs
new file mode 100755
index 00000000000..80e86454612
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/DataBindingCollection.cs
@@ -0,0 +1,92 @@
+//
+// System.Web.UI.DataBindingCollection.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+
+namespace System.Web.UI {
+
+	public sealed class DataBindingCollection : ICollection, IEnumerable
+	{
+		Hashtable list;
+		ArrayList removed;
+		
+		public DataBindingCollection ()
+		{
+			list = new Hashtable ();
+			removed = new ArrayList ();
+		}
+
+		public int Count {
+			get { return list.Count; }
+		}
+
+		public bool IsReadOnly {
+			get { return list.IsReadOnly; }
+		}
+
+		public bool IsSynchronized {
+			get { return list.IsSynchronized; }
+		}
+
+		public DataBinding this [string propertyName] {
+			get { return list [propertyName] as DataBinding; }
+		}
+
+		public string [] RemovedBindings {
+			get { return (string []) removed.ToArray (typeof (string)); }
+		}
+
+		public object SyncRoot {
+			get { return list.SyncRoot; }
+		}
+
+		public void Add (DataBinding binding)
+		{
+			list.Add (binding.PropertyName, binding);
+		}
+
+		public void Clear ()
+		{
+			list.Clear ();
+		}
+
+		public void CopyTo (Array array, int index)
+		{
+			list.CopyTo (array, index);
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return list.GetEnumerator ();
+		}
+
+		public void Remove (DataBinding binding)
+		{
+			string key = binding.PropertyName;
+			Remove (key);
+		}
+
+		public void Remove (string propertyName)
+		{
+			removed.Add (propertyName);
+			list.Remove (propertyName);
+		}
+
+		public void Remove (string propertyName,
+				    bool addToRemovedList)
+		{
+			if (addToRemovedList)
+				removed.Add (String.Empty); // LAMESPEC
+			else
+				removed.Add (propertyName);
+
+			list.Remove (propertyName);
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/DataBindingHandlerAttribute.cs b/mcs/class/System.Web/System.Web.UI/DataBindingHandlerAttribute.cs
new file mode 100644
index 00000000000..65af373bc8c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/DataBindingHandlerAttribute.cs
@@ -0,0 +1,49 @@
+/**

+ * Namespace: System.Web.UI

+ * Class:     DataBindingHandlerAttribute

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Reflection;

+

+namespace System.Web.UI

+{

+	[AttributeUsage(AttributeTargets.Class)]

+	public sealed class DataBindingHandlerAttribute : Attribute

+	{

+		public static readonly DataBindingHandlerAttribute Default;

+

+		private string handlerTypeName;

+

+		public DataBindingHandlerAttribute()

+		{

+			handlerTypeName = String.Empty;

+		}

+

+		public DataBindingHandlerAttribute(string typeName)

+		{

+			handlerTypeName = typeName;

+		}

+

+		public DataBindingHandlerAttribute(Type type)

+		{

+			handlerTypeName = type.AssemblyQualifiedName;

+		}

+

+		public string HandlerTypeName

+		{

+			get

+			{

+				return handlerTypeName;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs b/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs
new file mode 100755
index 00000000000..33374d4a0bc
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/DataBoundLiteralControl.cs
@@ -0,0 +1,80 @@
+//
+// System.Web.UI.DataBoundLiteralCOntrol.cs
+//
+// Authors:
+// 	Duncan Mak  (duncan@ximian.com)
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System;
+using System.Text;
+
+namespace System.Web.UI {
+
+	public sealed class DataBoundLiteralControl : Control
+	{
+		private string [] staticLiterals;
+		private string [] dataBoundLiterals;
+		
+		public DataBoundLiteralControl (int staticLiteralsCount,
+						int dataBoundLiteralCount)
+		{
+			staticLiterals = new string [staticLiteralsCount];
+			dataBoundLiterals = new string [dataBoundLiteralCount];
+			PreventAutoID ();
+		}
+
+		public string Text {
+			get {
+				StringBuilder text = new StringBuilder ();
+				int stLength = staticLiterals.Length;
+				int dbLength = dataBoundLiterals.Length;
+				int max = (stLength > dbLength) ? stLength : dbLength;
+				for (int i = 0; i < max; i++){
+					if (i < stLength)
+						text.Append (staticLiterals [i]);
+					if (i < dbLength)
+						text.Append (dataBoundLiterals [i]);
+				}
+
+				return text.ToString ();
+			}
+		}
+
+		protected override ControlCollection CreateControlCollection ()
+		{
+			return new EmptyControlCollection (this);
+		}
+
+		protected override void LoadViewState (object savedState)
+		{
+			if (savedState != null)
+				dataBoundLiterals = (string []) savedState;
+		}
+
+		protected override void Render (HtmlTextWriter output)
+		{
+			output.Write (Text);
+		}
+
+		protected override object SaveViewState ()
+		{
+			if (dataBoundLiterals.Length == 0)
+				return null;
+			return dataBoundLiterals;
+		}
+
+		public void SetDataBoundString (int index, string s)
+		{
+			dataBoundLiterals [index] = s;
+		}
+
+		public void SetStaticString (int index, string s)
+		{
+			staticLiterals [index] = s;
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/DesignTimeParseData.cs b/mcs/class/System.Web/System.Web.UI/DesignTimeParseData.cs
new file mode 100644
index 00000000000..901e0c4cb91
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/DesignTimeParseData.cs
@@ -0,0 +1,29 @@
+/**

+ * Namespace: System.Web.UI

+ * Class:     DesignTimeParseData

+ * 

+ * Author:  Gaurav Vaish

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  ?%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+

+namespace System.Web.UI

+{

+	public sealed class DesignTimeParseData

+	{

+		private static bool inDesigner = false;

+		

+		internal static bool InDesigner

+		{

+			get

+			{

+				return inDesigner;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI/EmptyControlCollection.cs b/mcs/class/System.Web/System.Web.UI/EmptyControlCollection.cs
new file mode 100755
index 00000000000..9d5a039625e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/EmptyControlCollection.cs
@@ -0,0 +1,30 @@
+//
+// System.Web.UI.EmptyControlCollection.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Web.UI {
+
+	public class EmptyControlCollection : ControlCollection
+	{
+		public EmptyControlCollection (Control owner)
+			: base (owner)
+		{
+		}
+		
+		public override void Add (Control child)
+		{
+			throw new NotSupportedException ("Control " + Owner.ID + " does not allow children");
+		}
+
+		public override void AddAt (int index, Control child)
+		{
+			throw new NotSupportedException ("Control " + Owner.ID + " does not allow children");
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
new file mode 100644
index 00000000000..f78cffc1b6b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/HtmlTextWriter.cs
@@ -0,0 +1,1027 @@
+/*	System.Web.UI

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+using System;

+using System.IO;

+using System.Collections;

+using System.Web;

+using System.Web.UI;

+

+namespace System.Web.UI{

+

+public class HtmlTextWriter : System.IO.TextWriter {

+

+static HtmlTextWriter(){

+	HtmlTextWriter._tagKeyLookupTable = new Hashtable(97);

+	HtmlTextWriter._tagNameLookupArray = new TagInformation[97];

+	HtmlTextWriter.RegisterTag("", HtmlTextWriterTag.Unknown, TagType.Other);

+	HtmlTextWriter.RegisterTag("a", HtmlTextWriterTag.A, TagType.Inline);

+	HtmlTextWriter.RegisterTag("acronym", HtmlTextWriterTag.Acronym, TagType.Inline);

+	HtmlTextWriter.RegisterTag("address", HtmlTextWriterTag.Address, TagType.Other);

+	HtmlTextWriter.RegisterTag("area", HtmlTextWriterTag.Area, TagType.Other);

+	HtmlTextWriter.RegisterTag("b", HtmlTextWriterTag.B, TagType.Inline);

+	HtmlTextWriter.RegisterTag("base", HtmlTextWriterTag.Base, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("basefont", HtmlTextWriterTag.Basefont, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("bdo", HtmlTextWriterTag.Bdo, TagType.Inline);

+	HtmlTextWriter.RegisterTag("bgsound", HtmlTextWriterTag.Bgsound, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("big", HtmlTextWriterTag.Big, TagType.Inline);

+	HtmlTextWriter.RegisterTag("blockquote", HtmlTextWriterTag.Blockquote, TagType.Other);

+	HtmlTextWriter.RegisterTag("body", HtmlTextWriterTag.Body, TagType.Other);

+	HtmlTextWriter.RegisterTag("br", HtmlTextWriterTag.Br, TagType.Other);

+	HtmlTextWriter.RegisterTag("button", HtmlTextWriterTag.Button, TagType.Inline);

+	HtmlTextWriter.RegisterTag("caption", HtmlTextWriterTag.Caption, TagType.Other);

+	HtmlTextWriter.RegisterTag("center", HtmlTextWriterTag.Center, TagType.Other);

+	HtmlTextWriter.RegisterTag("cite", HtmlTextWriterTag.Cite, TagType.Inline);

+	HtmlTextWriter.RegisterTag("code", HtmlTextWriterTag.Code, TagType.Inline);

+	HtmlTextWriter.RegisterTag("col", HtmlTextWriterTag.Col, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("colgroup", HtmlTextWriterTag.Colgroup, TagType.Other);

+	HtmlTextWriter.RegisterTag("del", HtmlTextWriterTag.Del, TagType.Inline);

+	HtmlTextWriter.RegisterTag("dd", HtmlTextWriterTag.Dd, TagType.Inline);

+	HtmlTextWriter.RegisterTag("dfn", HtmlTextWriterTag.Dfn, TagType.Inline);

+	HtmlTextWriter.RegisterTag("dir", HtmlTextWriterTag.Dir, TagType.Other);

+	HtmlTextWriter.RegisterTag("div", HtmlTextWriterTag.Div, TagType.Other);

+	HtmlTextWriter.RegisterTag("dl", HtmlTextWriterTag.Dl, TagType.Other);

+	HtmlTextWriter.RegisterTag("dt", HtmlTextWriterTag.Dt, TagType.Inline);

+	HtmlTextWriter.RegisterTag("em", HtmlTextWriterTag.Em, TagType.Inline);

+	HtmlTextWriter.RegisterTag("embed", HtmlTextWriterTag.Embed, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("fieldset", HtmlTextWriterTag.Fieldset, TagType.Other);

+	HtmlTextWriter.RegisterTag("font", HtmlTextWriterTag.Font, TagType.Inline);

+	HtmlTextWriter.RegisterTag("form", HtmlTextWriterTag.Form, TagType.Other);

+	HtmlTextWriter.RegisterTag("frame", HtmlTextWriterTag.Frame, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("frameset", HtmlTextWriterTag.Frameset, TagType.Other);

+	HtmlTextWriter.RegisterTag("h1", HtmlTextWriterTag.H1, TagType.Other);

+	HtmlTextWriter.RegisterTag("h2", HtmlTextWriterTag.H2, TagType.Other);

+	HtmlTextWriter.RegisterTag("h3", HtmlTextWriterTag.H3, TagType.Other);

+	HtmlTextWriter.RegisterTag("h4", HtmlTextWriterTag.H4, TagType.Other);

+	HtmlTextWriter.RegisterTag("h5", HtmlTextWriterTag.H5, TagType.Other);

+	HtmlTextWriter.RegisterTag("h6", HtmlTextWriterTag.H6, TagType.Other);

+	HtmlTextWriter.RegisterTag("head", HtmlTextWriterTag.Head, TagType.Other);

+	HtmlTextWriter.RegisterTag("hr", HtmlTextWriterTag.Hr, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("html", HtmlTextWriterTag.Html, TagType.Other);

+	HtmlTextWriter.RegisterTag("i", HtmlTextWriterTag.I, TagType.Inline);

+	HtmlTextWriter.RegisterTag("iframe", HtmlTextWriterTag.Iframe, TagType.Other);

+	HtmlTextWriter.RegisterTag("img", HtmlTextWriterTag.Img, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("input", HtmlTextWriterTag.Input, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("ins", HtmlTextWriterTag.Ins, TagType.Inline);

+	HtmlTextWriter.RegisterTag("isindex", HtmlTextWriterTag.Isindex, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("kbd", HtmlTextWriterTag.Kbd, TagType.Inline);

+	HtmlTextWriter.RegisterTag("label", HtmlTextWriterTag.Label, TagType.Inline);

+	HtmlTextWriter.RegisterTag("legend", HtmlTextWriterTag.Legend, TagType.Other);

+	HtmlTextWriter.RegisterTag("li", HtmlTextWriterTag.Li, TagType.Inline);

+	HtmlTextWriter.RegisterTag("link", HtmlTextWriterTag.Link, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("map", HtmlTextWriterTag.Map, TagType.Other);

+	HtmlTextWriter.RegisterTag("marquee", HtmlTextWriterTag.Marquee, TagType.Other);

+	HtmlTextWriter.RegisterTag("menu", HtmlTextWriterTag.Menu, TagType.Other);

+	HtmlTextWriter.RegisterTag("meta", HtmlTextWriterTag.Meta, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("nobr", HtmlTextWriterTag.Nobr, TagType.Inline);

+	HtmlTextWriter.RegisterTag("noframes", HtmlTextWriterTag.Noframes, TagType.Other);

+	HtmlTextWriter.RegisterTag("noscript", HtmlTextWriterTag.Noscript, TagType.Other);

+	HtmlTextWriter.RegisterTag("object", HtmlTextWriterTag.Object, TagType.Other);

+	HtmlTextWriter.RegisterTag("ol", HtmlTextWriterTag.Ol, TagType.Other);

+	HtmlTextWriter.RegisterTag("option", HtmlTextWriterTag.Option, TagType.Other);

+	HtmlTextWriter.RegisterTag("p", HtmlTextWriterTag.P, TagType.Inline);

+	HtmlTextWriter.RegisterTag("param", HtmlTextWriterTag.Param, TagType.Other);

+	HtmlTextWriter.RegisterTag("pre", HtmlTextWriterTag.Pre, TagType.Other);

+	HtmlTextWriter.RegisterTag("q", HtmlTextWriterTag.Q, TagType.Inline);

+	HtmlTextWriter.RegisterTag("rt", HtmlTextWriterTag.Rt, TagType.Other);

+	HtmlTextWriter.RegisterTag("ruby", HtmlTextWriterTag.Ruby, TagType.Other);

+	HtmlTextWriter.RegisterTag("s", HtmlTextWriterTag.S, TagType.Inline);

+	HtmlTextWriter.RegisterTag("samp", HtmlTextWriterTag.Samp, TagType.Inline);

+	HtmlTextWriter.RegisterTag("script", HtmlTextWriterTag.Script, TagType.Other);

+	HtmlTextWriter.RegisterTag("select", HtmlTextWriterTag.Select, TagType.Other);

+	HtmlTextWriter.RegisterTag("small", HtmlTextWriterTag.Small, TagType.Other);

+	HtmlTextWriter.RegisterTag("span", HtmlTextWriterTag.Span, TagType.Inline);

+	HtmlTextWriter.RegisterTag("strike", HtmlTextWriterTag.Strike, TagType.Inline);

+	HtmlTextWriter.RegisterTag("strong", HtmlTextWriterTag.Strong, TagType.Inline);

+	HtmlTextWriter.RegisterTag("style", HtmlTextWriterTag.Style, TagType.Other);

+	HtmlTextWriter.RegisterTag("sub", HtmlTextWriterTag.Sub, TagType.Inline);

+	HtmlTextWriter.RegisterTag("sup", HtmlTextWriterTag.Sup, TagType.Inline);

+	HtmlTextWriter.RegisterTag("table", HtmlTextWriterTag.Table, TagType.Other);

+	HtmlTextWriter.RegisterTag("tbody", HtmlTextWriterTag.Tbody, TagType.Other);

+	HtmlTextWriter.RegisterTag("td", HtmlTextWriterTag.Td, TagType.Inline);

+	HtmlTextWriter.RegisterTag("textarea", HtmlTextWriterTag.Textarea, TagType.Inline);

+	HtmlTextWriter.RegisterTag("tfoot", HtmlTextWriterTag.Tfoot, TagType.Other);

+	HtmlTextWriter.RegisterTag("th", HtmlTextWriterTag.Th, TagType.Inline);

+	HtmlTextWriter.RegisterTag("thead", HtmlTextWriterTag.Thead, TagType.Other);

+	HtmlTextWriter.RegisterTag("title", HtmlTextWriterTag.Title, TagType.Other);

+	HtmlTextWriter.RegisterTag("tr", HtmlTextWriterTag.Tr, TagType.Other);

+	HtmlTextWriter.RegisterTag("tt", HtmlTextWriterTag.Tt, TagType.Inline);

+	HtmlTextWriter.RegisterTag("u", HtmlTextWriterTag.U, TagType.Inline);

+	HtmlTextWriter.RegisterTag("ul", HtmlTextWriterTag.Ul, TagType.Other);

+	HtmlTextWriter.RegisterTag("var", HtmlTextWriterTag.Var, TagType.Inline);

+	HtmlTextWriter.RegisterTag("wbr", HtmlTextWriterTag.Wbr, TagType.NonClosing);

+	HtmlTextWriter.RegisterTag("xml", HtmlTextWriterTag.Xml, TagType.Other);

+

+	HtmlTextWriter._attrKeyLookupTable = new Hashtable(40);

+	HtmlTextWriter._attrNameLookupArray = new AttributeInformation[40];

+	HtmlTextWriter.RegisterAttribute("accesskey", HtmlTextWriterAttribute.Accesskey, true);

+	HtmlTextWriter.RegisterAttribute("align", HtmlTextWriterAttribute.Align, false);

+	HtmlTextWriter.RegisterAttribute("alt", HtmlTextWriterAttribute.Alt, true);

+	HtmlTextWriter.RegisterAttribute("background", HtmlTextWriterAttribute.Background, true);

+	HtmlTextWriter.RegisterAttribute("bgcolor", HtmlTextWriterAttribute.Bgcolor, false);

+	HtmlTextWriter.RegisterAttribute("border", HtmlTextWriterAttribute.Border, false);

+	HtmlTextWriter.RegisterAttribute("bordercolor", HtmlTextWriterAttribute.Bordercolor, false);

+	HtmlTextWriter.RegisterAttribute("cellpadding", HtmlTextWriterAttribute.Cellpadding, false);

+	HtmlTextWriter.RegisterAttribute("cellspacing", HtmlTextWriterAttribute.Cellspacing, false);

+	HtmlTextWriter.RegisterAttribute("checked", HtmlTextWriterAttribute.Checked, false);

+	HtmlTextWriter.RegisterAttribute("class", HtmlTextWriterAttribute.Class, true);

+	HtmlTextWriter.RegisterAttribute("cols", HtmlTextWriterAttribute.Cols, false);

+	HtmlTextWriter.RegisterAttribute("colspan", HtmlTextWriterAttribute.Colspan, false);

+	HtmlTextWriter.RegisterAttribute("disabled", HtmlTextWriterAttribute.Disabled, false);

+	HtmlTextWriter.RegisterAttribute("for", HtmlTextWriterAttribute.For, false);

+	HtmlTextWriter.RegisterAttribute("height", HtmlTextWriterAttribute.Height, false);

+	HtmlTextWriter.RegisterAttribute("href", HtmlTextWriterAttribute.Href, true);

+	HtmlTextWriter.RegisterAttribute("id", HtmlTextWriterAttribute.Id, false);

+	HtmlTextWriter.RegisterAttribute("maxlength", HtmlTextWriterAttribute.Maxlength, false);

+	HtmlTextWriter.RegisterAttribute("multiple", HtmlTextWriterAttribute.Multiple, false);

+	HtmlTextWriter.RegisterAttribute("name", HtmlTextWriterAttribute.Name, false);

+	HtmlTextWriter.RegisterAttribute("nowrap", HtmlTextWriterAttribute.Nowrap, false);

+	HtmlTextWriter.RegisterAttribute("onchange", HtmlTextWriterAttribute.Onchange, true);

+	HtmlTextWriter.RegisterAttribute("onclick", HtmlTextWriterAttribute.Onclick, true);

+	HtmlTextWriter.RegisterAttribute("readonly", HtmlTextWriterAttribute.ReadOnly, false);

+	HtmlTextWriter.RegisterAttribute("rows", HtmlTextWriterAttribute.Rows, false);

+	HtmlTextWriter.RegisterAttribute("rowspan", HtmlTextWriterAttribute.Rowspan, false);

+	HtmlTextWriter.RegisterAttribute("rules", HtmlTextWriterAttribute.Rules, false);

+	HtmlTextWriter.RegisterAttribute("selected", HtmlTextWriterAttribute.Selected, false);

+	HtmlTextWriter.RegisterAttribute("size", HtmlTextWriterAttribute.Size, false);

+	HtmlTextWriter.RegisterAttribute("src", HtmlTextWriterAttribute.Src, true);

+	HtmlTextWriter.RegisterAttribute("style", HtmlTextWriterAttribute.Style, false);

+	HtmlTextWriter.RegisterAttribute("tabindex", HtmlTextWriterAttribute.Tabindex, false);

+	HtmlTextWriter.RegisterAttribute("target", HtmlTextWriterAttribute.Target, false);

+	HtmlTextWriter.RegisterAttribute("title", HtmlTextWriterAttribute.Title, true);

+	HtmlTextWriter.RegisterAttribute("type", HtmlTextWriterAttribute.Type, false);

+	HtmlTextWriter.RegisterAttribute("valign", HtmlTextWriterAttribute.Valign, false);

+	HtmlTextWriter.RegisterAttribute("value", HtmlTextWriterAttribute.Value, true);

+	HtmlTextWriter.RegisterAttribute("width", HtmlTextWriterAttribute.Width, false);

+	HtmlTextWriter.RegisterAttribute("wrap", HtmlTextWriterAttribute.Wrap, false);

+

+	HtmlTextWriter._styleKeyLookupTable = new Hashtable(14);

+	HtmlTextWriter._styleNameLookupArray = new String[14];

+	HtmlTextWriter.RegisterStyle("background-color", HtmlTextWriterStyle.BackgroundColor);

+	HtmlTextWriter.RegisterStyle("background-image", HtmlTextWriterStyle.BackgroundImage);

+	HtmlTextWriter.RegisterStyle("border-collapse", HtmlTextWriterStyle.BorderCollapse);

+	HtmlTextWriter.RegisterStyle("border-color", HtmlTextWriterStyle.BorderColor);

+	HtmlTextWriter.RegisterStyle("border-style", HtmlTextWriterStyle.BorderStyle);

+	HtmlTextWriter.RegisterStyle("border-width", HtmlTextWriterStyle.BorderWidth);

+	HtmlTextWriter.RegisterStyle("color", HtmlTextWriterStyle.Color);

+	HtmlTextWriter.RegisterStyle("font-family", HtmlTextWriterStyle.FontFamily);

+	HtmlTextWriter.RegisterStyle("font-size", HtmlTextWriterStyle.FontSize);

+	HtmlTextWriter.RegisterStyle("font-style", HtmlTextWriterStyle.FontStyle);

+	HtmlTextWriter.RegisterStyle("font-weight", HtmlTextWriterStyle.FontWeight);

+	HtmlTextWriter.RegisterStyle("height", HtmlTextWriterStyle.Height);

+	HtmlTextWriter.RegisterStyle("text-decoration", HtmlTextWriterStyle.TextDecoration);

+	HtmlTextWriter.RegisterStyle("width", HtmlTextWriterStyle.Width);

+}

+

+public HtmlTextWriter(TextWriter writer):this(writer, "	"){}

+

+public HtmlTextWriter(TextWriter writer, string tabString) : base() {

+	this.writer = writer;

+	this.tabString = tabString;

+	indentLevel = 0;

+	tabsPending = false;

+	_httpWriter = writer as HttpWriter;

+	_isDescendant = GetType() == typeof(HtmlTextWriter) == false;

+	_attrList = new RenderAttribute[20];

+	_attrCount = 0;

+	_styleList = new RenderStyle[20];

+	_styleCount = 0;

+	_endTags = new TagStackEntry[16];

+	_endTagCount = 0;

+	_inlineCount = 0;

+}

+

+public virtual void AddAttribute(HtmlTextWriterAttribute key, string value){

+	if ((int) key >= 0 && (int) key < HtmlTextWriter._attrNameLookupArray.Length) {

+		AttributeInformation attrInfo = HtmlTextWriter._attrNameLookupArray[(int) key];

+		AddAttribute(attrInfo.name, value, key, attrInfo.encode);

+	}

+}

+

+public virtual void AddAttribute(HtmlTextWriterAttribute key, string value, bool fEncode){

+	if ((int) key >= 0 && (int) key < HtmlTextWriter._attrNameLookupArray.Length) {

+		AddAttribute(HtmlTextWriter._attrNameLookupArray[(int) key].name, value, key, fEncode);

+	}

+}

+

+public virtual void AddAttribute(string name, string value){

+	HtmlTextWriterAttribute attr = GetAttributeKey(name);

+	value = EncodeAttributeValue(GetAttributeKey(name), value);

+	AddAttribute(name, value, attr);

+}

+

+public virtual void AddAttribute(string name, string value, bool fEndode){

+	value = EncodeAttributeValue(value, fEndode);

+	AddAttribute(name, value, GetAttributeKey(name));

+}

+

+protected virtual void AddAttribute(string name, string value, HtmlTextWriterAttribute key){

+	AddAttribute(name, value, key, false);

+}

+

+private void AddAttribute(string name, string value, HtmlTextWriterAttribute key, bool encode){

+	if (_attrCount >= (int) _attrList.Length) {

+		RenderAttribute[] rAttrArr = new RenderAttribute[_attrList.Length * 2];

+		System.Array.Copy(_attrList, rAttrArr, (int) _attrList.Length);

+		_attrList = rAttrArr;

+	}

+	RenderAttribute rAttr;

+	rAttr.name = name;

+	rAttr.value = value;

+	rAttr.key = key;

+	rAttr.encode = encode;

+	_attrList [_attrCount++] = rAttr;

+}

+

+public virtual void AddStyleAttribute(HtmlTextWriterStyle key, string value){

+	AddStyleAttribute(GetStyleName(key), value, key);

+}

+

+public virtual void AddStyleAttribute(string name, string value){

+	AddStyleAttribute(name, value, GetStyleKey(name));

+}

+

+protected virtual void AddStyleAttribute(string name, string value, HtmlTextWriterStyle key){

+	RenderStyle[] tagRender;

+	RenderStyle beforeTag;

+

+	if (_styleCount >= (int) _styleList.Length) {

+		RenderStyle[] rAttrArr = new RenderStyle[_styleList.Length * 2];

+		System.Array.Copy(_styleList, rAttrArr, (int) _styleList.Length);

+		_styleList = rAttrArr;

+	}

+	RenderStyle rAttr;

+	rAttr.name = name;

+	rAttr.value = value;

+	rAttr.key = key;

+	_styleList [_styleCount++] = rAttr;

+}

+

+public override void Close(){

+	writer.Close();

+}

+

+protected virtual string EncodeAttributeValue(HtmlTextWriterAttribute attrKey, string value){

+	bool valid = true;

+	if (0 <= (int) attrKey && (int) attrKey < HtmlTextWriter._attrNameLookupArray.Length)

+		valid = HtmlTextWriter._attrNameLookupArray[(int) attrKey].encode;

+	return EncodeAttributeValue(value, valid);

+}

+

+protected string EncodeAttributeValue(string value, bool fEncode){

+	if (value == null)

+		return null;

+	if (!(fEncode))

+		return value;

+	return System.Web.HttpUtility.HtmlAttributeEncode(value);

+}

+

+protected string EncodeUrl(string url){

+	if (url.IndexOf(SpaceChar) < 0)

+		return url;

+	System.Text.StringBuilder sb = new System.Text.StringBuilder();

+	for(int i=0; i <= url.Length; i++){

+		char temp = url[i];

+		if (temp != 32)

+			sb.Append(temp);

+		else

+			sb.Append("%20");

+	}

+	return sb.ToString();

+}

+

+protected virtual void FilterAttributes(){

+	int count = 0;

+	for(int i=0; i < _styleCount; i++){

+		RenderStyle rStyle = _styleList[i];

+		if (OnStyleAttributeRender(rStyle.name, rStyle.value, rStyle.key)) {

+			count++;

+		}

+	}

+	_styleCount = count;

+	count = 0;

+	for(int i=0; i <= _attrCount; i++){

+		RenderAttribute rAttr = _attrList[i];

+		if (OnAttributeRender(rAttr.name, rAttr.value, rAttr.key)) {

+			count++;

+		}

+	}

+	_attrCount = count;

+}

+

+public override void Flush(){

+	writer.Flush();

+}

+

+protected HtmlTextWriterAttribute GetAttributeKey(string attrName){

+	if (attrName != null && attrName.Length > 0) {

+		object attr = HtmlTextWriter._attrKeyLookupTable[attrName.ToLower()];

+		if (attr != null)

+			return (HtmlTextWriterAttribute) attr;

+	}

+	return (HtmlTextWriterAttribute) (-1);

+}

+

+protected string GetAttributeName(HtmlTextWriterAttribute attrKey){

+	if ((int) attrKey >= 0 && (int) attrKey < HtmlTextWriter._attrNameLookupArray.Length)

+		return HtmlTextWriter._attrNameLookupArray[(int) attrKey].name;

+	return System.String.Empty;

+}

+

+protected HtmlTextWriterStyle GetStyleKey(string styleName){

+	if (styleName != null && styleName.Length > 0) {

+		object style = HtmlTextWriter._styleKeyLookupTable[styleName.ToLower()];

+		if (style != null)

+			return (HtmlTextWriterStyle) style;

+	}

+	return (HtmlTextWriterStyle) (-1);

+}

+

+protected string GetStyleName(HtmlTextWriterStyle styleKey){

+	if ((int) styleKey >= 0 && (int) styleKey < HtmlTextWriter._styleNameLookupArray.Length)

+		return HtmlTextWriter._styleNameLookupArray[(int) styleKey];

+	return System.String.Empty;

+}

+

+protected virtual HtmlTextWriterTag GetTagKey(string tagName){

+	if (tagName != null && tagName.Length > 0) {

+		object tag = HtmlTextWriter._tagKeyLookupTable[tagName.ToLower()];

+		if (tag != null)

+			return (HtmlTextWriterTag) tag;

+	}

+	return 0;

+}

+

+protected virtual string GetTagName(HtmlTextWriterTag tagKey){

+	if ((int) tagKey >= 0 && (int) tagKey < HtmlTextWriter._tagNameLookupArray.Length)

+		return HtmlTextWriter._tagNameLookupArray[(int) tagKey].name;

+	return System.String.Empty;

+}

+

+protected bool IsAttributeDefined(HtmlTextWriterAttribute key){

+	for (int i=0; i < _attrCount; i++) {

+		if (_attrList[i].key == key)

+			return true;

+	}

+	return false;

+}

+

+protected bool IsAttributeDefined(HtmlTextWriterAttribute key, ref string value){

+	value = null;

+	for (int i=0; i < _attrCount; i++) {

+		if (_attrList[i].key == key) {

+			value = _attrList[i].value;

+			return true;

+		}

+	}

+	return false;

+}

+

+protected bool IsStyleAttributeDefined(HtmlTextWriterStyle key){

+	for (int i= 0; i < _styleCount; i++) {

+		if (_styleList[i].key == key)

+			return true;

+	}

+	return false;

+}

+

+protected bool IsStyleAttributeDefined(HtmlTextWriterStyle key, ref string value){

+	value = null;

+	for( int i=0; i < _styleCount; i++) {

+		if (_styleList[i].key == key) {

+			value = _styleList[i].value;

+			return true;

+		}

+	}

+	return false;

+}

+

+protected virtual bool OnAttributeRender(string name, string value, HtmlTextWriterAttribute key){

+	return true;

+}

+

+protected virtual bool OnStyleAttributeRender(string name, string value, HtmlTextWriterStyle key){

+	return true;

+}

+

+protected virtual bool OnTagRender(string name, HtmlTextWriterTag key){

+	return true;

+}

+

+protected virtual void OutputTabs(){

+	if (tabsPending) {

+		for(int i=0; i <= indentLevel; i++) {

+			writer.Write(tabString);

+		}

+		tabsPending = false;

+	}

+}

+

+protected string PopEndTag(){

+	if (_endTagCount <= 0)

+		throw new InvalidOperationException("A PopEndTag was called without a corresponding PushEndTag");

+	_endTagCount--;

+	TagKey = _endTags[_endTagCount].tagKey;

+	return _endTags[_endTagCount].endTagText;

+}

+

+protected void PushEndTag(string endTag){

+	if (_endTagCount >= (int) _endTags.Length) {

+		TagStackEntry[] temp = new TagStackEntry[(int) _endTags.Length * 2];

+		System.Array.Copy(_endTags, temp, (int) _endTags.Length);

+		_endTags = temp;

+	}

+	_endTags[_endTagCount].tagKey = _tagKey;

+	_endTags[_endTagCount].endTagText = endTag;

+	_endTagCount++;

+}

+

+protected static void RegisterAttribute(string name, HtmlTextWriterAttribute key){

+	HtmlTextWriter.RegisterAttribute(name, key, false);

+}

+

+private static void RegisterAttribute(string name, HtmlTextWriterAttribute key, bool fEncode){

+	name = name.ToLower();

+	HtmlTextWriter._attrKeyLookupTable.Add(name, key);

+	if ((int) key < (int) HtmlTextWriter._attrNameLookupArray.Length)

+		HtmlTextWriter._attrNameLookupArray[(int) key] = new AttributeInformation(name, fEncode);

+}

+

+protected static void RegisterStyle(string name, HtmlTextWriterStyle key){

+	name = name.ToLower();

+	HtmlTextWriter._styleKeyLookupTable.Add(name, key);

+	if ((int) key < (int) HtmlTextWriter._styleNameLookupArray.Length)

+		HtmlTextWriter._styleNameLookupArray[(int) key] = name;

+}

+

+protected static void RegisterTag(string name, HtmlTextWriterTag key){

+	HtmlTextWriter.RegisterTag(name, key, TagType.Other);

+}

+

+private static void RegisterTag(string name, HtmlTextWriterTag key, TagType type){

+	name = name.ToLower();

+	HtmlTextWriter._tagKeyLookupTable.Add(name, key);

+	string fullTag = null;

+	if ((int) type != 1 && (int) key != 0) {

+		fullTag = EndTagLeftChars + name + TagRightChar;

+	}

+	if ((int) key < HtmlTextWriter._tagNameLookupArray.Length)

+		HtmlTextWriter._tagNameLookupArray[(int) key] = new TagInformation(name, type, fullTag);

+}

+

+protected virtual string RenderAfterContent(){

+	return null;

+}

+

+protected virtual string RenderAfterTag(){

+	return null;

+}

+

+protected virtual string RenderBeforeContent(){

+	return null;

+}

+

+protected virtual string RenderBeforeTag(){

+	return null;

+}

+

+public virtual void RenderBeginTag(HtmlTextWriterTag tagKey){

+	TagKey = tagKey;

+	bool tagRendered = true;

+	bool tagRender = true;

+	if (_isDescendant) {

+		tagRender = OnTagRender(_tagName, _tagKey);

+		FilterAttributes();

+		string beforeTag = RenderBeforeTag();

+		if (beforeTag != null) {

+			if (tabsPending)

+				OutputTabs();

+			writer.Write(beforeTag);

+		}

+	}

+	TagInformation currentTag = HtmlTextWriter._tagNameLookupArray[_tagIndex];

+	if (tagRender) {

+		tagRendered = false;

+		if (tabsPending)

+			OutputTabs();

+		writer.Write(TagLeftChar);

+		writer.Write(_tagName);

+		RenderAttribute rAttr;

+		string rAttrValue = null;

+		for (int i=0; i < _attrCount; i++) {

+			rAttr = _attrList[i];

+			if (rAttr.key == HtmlTextWriterAttribute.Style)

+				rAttrValue = rAttr.value;

+			else {

+				writer.Write(SpaceChar);

+				writer.Write(rAttr.name);

+				if (rAttr.value != null) {

+					writer.Write(EqualsChar);

+					writer.Write(DoubleQuoteChar);

+					if (rAttr.encode) {

+						if (_httpWriter == null) {

+							System.Web.HttpUtility.HtmlAttributeEncode(rAttr.value, writer);

+						}

+						else {

+							System.Web.HttpUtility.HtmlAttributeEncode(rAttr.value, (TextWriter) _httpWriter);

+						}

+					}

+					else {

+						writer.Write(rAttr.value);

+					}

+					writer.Write(DoubleQuoteChar);

+				}

+			}

+		}

+		if (_styleCount > 0 || rAttrValue != null) {

+			writer.Write(SpaceChar);

+			writer.Write("style");

+			writer.Write(EqualsChar);

+			writer.Write(DoubleQuoteChar);

+			RenderStyle rStyle;

+			for (int i=0; i < _styleCount; i++) {

+				rStyle = _styleList[i];

+				writer.Write(rStyle.name);

+				writer.Write(StyleEqualsChar);

+				writer.Write(rStyle.value);

+				writer.Write(SemicolonChar);

+			}

+			if (rAttrValue != null)

+				writer.Write(rAttrValue);

+			writer.Write(DoubleQuoteChar);

+		}

+		if (currentTag.tagType == TagType.NonClosing) {

+			writer.Write(SpaceChar);

+			writer.Write(SlashChar);

+			writer.Write(TagRightChar);

+		}

+		else

+			writer.Write(TagRightChar);

+	}

+	string beforeContent = RenderBeforeContent();

+	if (beforeContent != null) {

+		if (tabsPending)

+			OutputTabs();

+		writer.Write(beforeContent);

+	}

+	if (tagRendered) {

+		if (currentTag.tagType == TagType.Inline)

+			_inlineCount++;

+		else {

+			WriteLine();

+			Indent++;

+		}

+		if (currentTag.closingTag == null) {

+			currentTag.closingTag = EndTagLeftChars + _tagName + TagRightChar;

+		}

+	}

+	if (_isDescendant) {

+		string afterContent = RenderAfterContent();

+		if (afterContent != null) {

+			if (currentTag.closingTag != null)

+				currentTag.closingTag = afterContent;

+		}

+		string afterTag = RenderAfterTag();

+		if (afterTag != null) {

+			if (currentTag.closingTag != null)

+				currentTag.closingTag = afterTag;

+		}

+	}

+	PushEndTag(currentTag.closingTag);

+	_attrCount = 0;

+	_styleCount = 0;

+}

+

+public virtual void RenderBeginTag(string tagName){

+	TagName = tagName;

+	RenderBeginTag(_tagKey);

+}

+

+public virtual void RenderEndTag(){

+	string endTagText = PopEndTag();

+	if (endTagText != null) {

+		if (HtmlTextWriter._tagNameLookupArray[_tagIndex].tagType == 0) {

+			_inlineCount--;

+			Write(endTagText);

+		}

+		else{

+			WriteLine();

+			Indent--;

+			Write(endTagText);

+		}

+	}

+}

+

+public override void Write(bool value){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(value);

+}

+

+public override void Write(char value){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(value);

+}

+

+public override void Write(char[] buffer){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(buffer);

+}

+

+public override void Write(char[] buffer, int index, int count){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(buffer, index, count);

+}

+

+public override void Write(double value){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(value);

+}

+

+public override void Write(int value){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(value);

+}

+

+public override void Write(long value){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(value);

+}

+

+public override void Write(object value){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(value);

+}

+

+public override void Write(float value){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(value);

+}

+

+public override void Write(string s){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(s);

+}

+

+public override void Write(string format, object arg0){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(format, arg0);

+}

+

+public override void Write(string format, object arg0, object arg1){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(format, arg0, arg1);

+}

+

+public override void Write(string format, params object[] arg){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(format, arg);

+}

+

+public virtual void WriteAttribute(string name, string value){

+	WriteAttribute(name, value, false);

+}

+

+public virtual void WriteAttribute(string name, string value, bool fEncode){

+	writer.Write(SpaceChar);

+	writer.Write(name);

+	if (value != null) {

+		writer.Write(EqualsChar);

+		writer.Write(DoubleQuoteChar);

+		if (fEncode) {

+			if (_httpWriter == null) {

+				System.Web.HttpUtility.HtmlAttributeEncode(value, writer);

+			}

+			else{

+				System.Web.HttpUtility.HtmlAttributeEncode(value, (TextWriter) _httpWriter);

+			}

+		}

+		else{

+			writer.Write(value);

+		}

+		writer.Write(DoubleQuoteChar);

+	}

+}

+

+public virtual void WriteBeginTag(string tagName){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(TagLeftChar);

+	writer.Write(tagName);

+}

+

+public virtual void WriteEndTag(string tagName){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(TagLeftChar);

+	writer.Write(SlashChar);

+	writer.Write(tagName);

+	writer.Write(TagRightChar);

+}

+

+public virtual void WriteFullBeginTag(string tagName){

+	if (tabsPending)

+		OutputTabs();

+	writer.Write(TagLeftChar);

+	writer.Write(tagName);

+	writer.Write(TagRightChar);

+}

+

+public override void WriteLine(){

+	writer.WriteLine();

+	tabsPending = true;

+}

+

+public override void WriteLine(bool value){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(value);

+	tabsPending = true;

+}

+

+public override void WriteLine(char value){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(value);

+	tabsPending = true;

+}

+

+public override void WriteLine(char[] buffer){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(buffer);

+	tabsPending = true;

+}

+

+public override void WriteLine(char[] buffer, int index, int count){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(buffer, index, count);

+	tabsPending = true;

+}

+

+public override void WriteLine(double value){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(value);

+	tabsPending = true;

+}

+

+public override void WriteLine(int value){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(value);

+	tabsPending = true;

+}

+

+public override void WriteLine(long value){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(value);

+	tabsPending = true;

+}

+

+public override void WriteLine(object value){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(value);

+	tabsPending = true;

+}

+

+public override void WriteLine(float value){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(value);

+	tabsPending = true;

+}

+

+public override void WriteLine(string s){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(s);

+	tabsPending = true;

+}

+

+public override void WriteLine(string format, object arg0){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(format, arg0);

+	tabsPending = true;

+}

+

+public override void WriteLine(string format, object arg0, object arg1){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(format, arg0, arg1);

+	tabsPending = true;

+}

+

+public override void WriteLine(string format, params object[] arg){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(format, arg);

+	tabsPending = true;

+}

+

+[CLSCompliant(false)]

+public override void WriteLine(uint value){

+	if (tabsPending)

+		OutputTabs();

+	writer.WriteLine(value);

+	tabsPending = true;

+}

+

+public void WriteLineNoTabs(string s){

+	writer.WriteLine(s);

+}

+

+public virtual void WriteStyleAttribute(string name, string value){

+	WriteStyleAttribute(name, value, false);

+}

+

+public virtual void WriteStyleAttribute(string name, string value, bool fEncode){

+	writer.Write(name);

+	writer.Write(StyleEqualsChar);

+	if (fEncode) {

+		if (_httpWriter == null) {

+			System.Web.HttpUtility.HtmlAttributeEncode(value, writer);

+		}

+		else{

+			System.Web.HttpUtility.HtmlAttributeEncode(value, (TextWriter) _httpWriter);

+		}

+	}

+	else {

+		writer.Write(value);

+	}

+	writer.Write(SemicolonChar);

+}

+

+public override System.Text.Encoding Encoding { 

+	get{

+		return writer.Encoding;

+	}

+}

+

+public int Indent { 

+	get{

+		return indentLevel;

+	}

+	set{

+		if (value < 0)

+			value = 0;

+		indentLevel = value;

+	}

+}

+

+public TextWriter InnerWriter { 

+	get{

+		return writer;

+	}

+	set{

+		writer = value;

+		_httpWriter = value as HttpWriter;

+	}

+}

+

+public override string NewLine { 

+	get{

+		return writer.NewLine;

+	}

+	set{

+		writer.NewLine = value;

+	}

+}

+

+protected HtmlTextWriterTag TagKey { 

+	get{

+		return _tagKey;

+	}

+	set{

+		_tagIndex = (int) value;

+		if (_tagIndex < 0 || _tagIndex >= (int) HtmlTextWriter._tagNameLookupArray.Length)

+			throw new ArgumentOutOfRangeException("value");

+		_tagKey = value;

+		if (value != 0)

+			_tagName = HtmlTextWriter._tagNameLookupArray[_tagIndex].name;

+	}

+}

+

+protected string TagName { 

+	get{

+		return _tagName;

+	}

+	set{

+		_tagName = value;

+		_tagKey = GetTagKey(_tagName);

+		_tagIndex = (int) _tagKey;

+	}

+}

+

+public const string DefaultTabString = "\t";

+public const char DoubleQuoteChar = '"';

+public const string EndTagLeftChars = "</";

+public const char EqualsChar = '=';

+public const string EqualsDoubleQuoteString = "=\"";

+public const string SelfClosingChars = " /";

+public const string SelfClosingTagEnd = " />";

+public const char SemicolonChar = ';';

+public const char SingleQuoteChar = '\'';

+public const char SlashChar = '/';

+public const char SpaceChar = ' ';

+public const char StyleEqualsChar = ':';

+public const char TagLeftChar = '<';

+public const char TagRightChar = '>';

+

+private int _attrCount;

+private int _endTagCount;

+private int _styleCount;

+private int indentLevel;

+private int _inlineCount;

+private int _tagIndex;

+

+private bool _isDescendant;

+private bool tabsPending;

+

+private HtmlTextWriterTag _tagKey;

+private TextWriter writer;

+private HttpWriter _httpWriter;

+

+private static Hashtable _attrKeyLookupTable;

+private static Hashtable _styleKeyLookupTable;

+private static Hashtable _tagKeyLookupTable;

+

+private string _tagName;

+private string tabString;

+private static string[] _styleNameLookupArray;

+

+private RenderAttribute[] _attrList;

+private static AttributeInformation[] _attrNameLookupArray;

+private static TagInformation[] _tagNameLookupArray;

+private TagStackEntry[] _endTags;

+private RenderStyle[] _styleList;

+

+} //HtmlTextWriter

+

+struct AttributeInformation {

+	public bool encode;

+	public string name;

+

+	public AttributeInformation(string name, bool encode){

+		this.encode = encode;

+		this.name = name;

+	}

+} 

+ 

+struct RenderAttribute {

+	public bool encode;

+	public HtmlTextWriterAttribute key;

+	public string name;

+	public string value;

+} 

+ 

+struct RenderStyle {

+	public HtmlTextWriterStyle key;

+	public string name;

+	public string value;

+} 

+ 

+struct TagInformation {

+	public string closingTag;

+	public string name;

+	public TagType tagType;

+

+	public TagInformation(string name, TagType tagType, string closingTag){

+		this.name = name;

+		this.tagType = tagType;

+		this.closingTag = closingTag;	

+	}

+} 

+ 

+struct TagStackEntry {

+	public string endTagText;

+	public HtmlTextWriterTag tagKey;

+} 

+ 

+enum TagType {

+	Inline,

+	NonClosing,

+	Other

+} 

+

+

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriterAttribute.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriterAttribute.cs
new file mode 100644
index 00000000000..5b82723c5c3
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/HtmlTextWriterAttribute.cs
@@ -0,0 +1,54 @@
+/*	System.Web.UI

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+

+namespace System.Web.UI{

+

+public enum HtmlTextWriterAttribute {

+Accesskey,

+Align,

+Alt,

+Background,

+Bgcolor,

+Border,

+Bordercolor,

+Cellpadding,

+Cellspacing,

+Checked,

+Class,

+Cols,

+Colspan,

+Disabled,

+For,

+Height,

+Href,

+Id,

+Maxlength,

+Multiple,

+Name,

+Nowrap,

+Onchange,

+Onclick,

+ReadOnly,

+Rows,

+Rowspan,

+Rules,

+Selected,

+Size,

+Src,

+Style,

+Tabindex,

+Target,

+Title,

+Type,

+Valign,

+Value,

+Width,

+Wrap,

+} 

+ 

+

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriterStyle.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriterStyle.cs
new file mode 100644
index 00000000000..4955422d668
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/HtmlTextWriterStyle.cs
@@ -0,0 +1,28 @@
+/*	System.Web.UI

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+

+namespace System.Web.UI{

+

+public enum HtmlTextWriterStyle {

+BackgroundColor,

+BackgroundImage,

+BorderCollapse,

+BorderColor,

+BorderStyle,

+BorderWidth,

+Color,

+FontFamily,

+FontSize,

+FontStyle,

+FontWeight,

+Height,

+TextDecoration,

+Width

+} 

+

+

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI/HtmlTextWriterTag.cs b/mcs/class/System.Web/System.Web.UI/HtmlTextWriterTag.cs
new file mode 100644
index 00000000000..f248979246a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/HtmlTextWriterTag.cs
@@ -0,0 +1,111 @@
+/*	System.Web.UI

+*	Authors

+*		Leen Toelen (toelen@hotmail.com)

+*/

+

+

+namespace System.Web.UI{

+

+public enum HtmlTextWriterTag {

+Unknown,

+A,

+Acronym,

+Address,

+Area,

+B,

+Base,

+Basefont,

+Bdo,

+Bgsound,

+Big,

+Blockquote,

+Body,

+Br,

+Button,

+Caption,

+Center,

+Cite,

+Code,

+Col,

+Colgroup,

+Dd,

+Del,

+Dfn,

+Dir,

+Div,

+Dl,

+Dt,

+Em,

+Embed,

+Fieldset,

+Font,

+Form,

+Frame,

+Frameset,

+H1,

+H2,

+H3,

+H4,

+H5,

+H6,

+Head,

+Hr,

+Html,

+I,

+Iframe,

+Img,

+Input,

+Ins,

+Isindex,

+Kbd,

+Label,

+Legend,

+Li,

+Link,

+Map,

+Marquee,

+Menu,

+Meta,

+Nobr,

+Noframes,

+Noscript,

+Object,

+Ol,

+Option,

+P,

+Param,

+Pre,

+Q,

+Rt,

+Ruby,

+S,

+Samp,

+Script,

+Select,

+Small,

+Span,

+Strike,

+Strong,

+Style,

+Sub,

+Sup,

+Table,

+Tbody,

+Td,

+Textarea,

+Tfoot,

+Th,

+Thead,

+Title,

+Tr,

+Tt,

+U,

+Ul,

+Var,

+Wbr,

+Xml

+} 

+  

+

+} // namespace System.Web.UI.HtmlControls

+

diff --git a/mcs/class/System.Web/System.Web.UI/IAttributeAccessor.cs b/mcs/class/System.Web/System.Web.UI/IAttributeAccessor.cs
new file mode 100644
index 00000000000..be0984b2c8b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IAttributeAccessor.cs
@@ -0,0 +1,20 @@
+//
+// System.Web.UI.IAttributeAccessor.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public interface IAttributeAccessor
+        {
+                string GetAttribute(string key);
+                void SetAttribute(string key, string value);
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.UI/IDataBindingsAccessor.cs b/mcs/class/System.Web/System.Web.UI/IDataBindingsAccessor.cs
new file mode 100644
index 00000000000..5ff7f00b2da
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IDataBindingsAccessor.cs
@@ -0,0 +1,20 @@
+//
+// System.Web.UI.IDataBindingsAccessor.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public interface IDataBindingsAccessor
+        {
+                DataBindingCollection DataBindings {get;}
+                bool HasDataBindings {get;}
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.UI/INamingContainer.cs b/mcs/class/System.Web/System.Web.UI/INamingContainer.cs
new file mode 100644
index 00000000000..659c5b60bed
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/INamingContainer.cs
@@ -0,0 +1,18 @@
+//
+// System.Web.UI.INamingContainer.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public interface INamingContainer
+        {
+		}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/IParserAccessor.cs b/mcs/class/System.Web/System.Web.UI/IParserAccessor.cs
new file mode 100644
index 00000000000..cad22017e9d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IParserAccessor.cs
@@ -0,0 +1,19 @@
+//
+// System.Web.UI.IParserAccessor.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public interface IParserAccessor
+        {
+                void AddParsedSubObject(object obj);
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.UI/IPostBackDataHandler.cs b/mcs/class/System.Web/System.Web.UI/IPostBackDataHandler.cs
new file mode 100644
index 00000000000..7d105cb7476
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IPostBackDataHandler.cs
@@ -0,0 +1,21 @@
+//
+// System.Web.UI.IPostBackDataHandler.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+using System.Collections.Specialized;
+
+namespace System.Web.UI
+{
+        public interface IPostBackDataHandler
+        {
+                bool LoadPostData(string postDataKey, NameValueCollection postCollection);
+                void RaisePostDataChangedEvent();
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.UI/IPostBackEventHandler.cs b/mcs/class/System.Web/System.Web.UI/IPostBackEventHandler.cs
new file mode 100644
index 00000000000..daa6f70160c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IPostBackEventHandler.cs
@@ -0,0 +1,19 @@
+//
+// System.Web.UI.IPostBackEventHandler.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public interface IPostBackEventHandler
+        {
+                void RaisePostBackEvent(string eventArgument);
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.UI/IStateManager.cs b/mcs/class/System.Web/System.Web.UI/IStateManager.cs
new file mode 100644
index 00000000000..4bcb6b8deb0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IStateManager.cs
@@ -0,0 +1,22 @@
+//

+// System.Web.UI.IStateManager.cs

+//

+// Author:

+//   Bob Smith <bob@thestuff.net>

+//

+// (C) Bob Smith

+//

+

+using System;

+using System.Web;

+

+namespace System.Web.UI

+{

+        public interface IStateManager

+        {

+                void LoadViewState(object state);

+                object SaveViewState();

+                void TrackViewState();

+        	    bool IsTrackingViewState { get; }

+        }

+}

diff --git a/mcs/class/System.Web/System.Web.UI/ITagNameToTypeMapper.cs b/mcs/class/System.Web/System.Web.UI/ITagNameToTypeMapper.cs
new file mode 100644
index 00000000000..da35c6b0ee8
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ITagNameToTypeMapper.cs
@@ -0,0 +1,20 @@
+//
+// System.Web.UI.ITagNameToTypeMapper.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+using System.Collections;
+
+namespace System.Web.UI
+{
+        public interface ITagNameToTypeMapper
+        {
+                Type GetControlType(string tagName, IDictionary attribs);
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.UI/ITemplate.cs b/mcs/class/System.Web/System.Web.UI/ITemplate.cs
new file mode 100644
index 00000000000..c9981859b37
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ITemplate.cs
@@ -0,0 +1,19 @@
+//
+// System.Web.UI.ITemplate.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public interface ITemplate
+        {
+                void InstantiateIn(Control container);
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.UI/IValidator.cs b/mcs/class/System.Web/System.Web.UI/IValidator.cs
new file mode 100644
index 00000000000..47b418aee39
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/IValidator.cs
@@ -0,0 +1,21 @@
+//
+// System.Web.UI.IValidator.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public interface IValidator
+        {
+                void Validate();
+                string ErrorMessage {get; set;}
+                bool IsValid {get; set;}
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.UI/ImageClickEventArgs.cs b/mcs/class/System.Web/System.Web.UI/ImageClickEventArgs.cs
new file mode 100755
index 00000000000..d2330bb6615
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ImageClickEventArgs.cs
@@ -0,0 +1,25 @@
+//
+// System.Web.UI.ImageClickEventArgs.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Web.UI {
+	public sealed class ImageClickEventArgs : EventArgs
+	{
+		public ImageClickEventArgs (int x, int y)
+		{
+			X = x;
+			Y = y;
+		}
+		
+		public int X;
+		public int Y;
+	}
+}
+
+ 
diff --git a/mcs/class/System.Web/System.Web.UI/ImageClickEventHandler.cs b/mcs/class/System.Web/System.Web.UI/ImageClickEventHandler.cs
new file mode 100644
index 00000000000..2bcc75881df
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ImageClickEventHandler.cs
@@ -0,0 +1,16 @@
+//
+// System.Web.UI.ImageClickEventHandler.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public delegate void ImageClickEventHandler(object sender, ImageClickEventArgs e);
+}
diff --git a/mcs/class/System.Web/System.Web.UI/LiteralControl.cs b/mcs/class/System.Web/System.Web.UI/LiteralControl.cs
new file mode 100644
index 00000000000..7a3ef1d0a7a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/LiteralControl.cs
@@ -0,0 +1,44 @@
+//

+// System.Web.UI.LiteralControl.cs

+//

+// Author:

+//   Bob Smith <bob@thestuff.net>

+//

+// (C) Bob Smith

+//

+

+using System;

+using System.Web;

+

+namespace System.Web.UI

+{

+        public class LiteralControl : Control

+        {

+                private string _text = String.Empty;

+                public LiteralControl() {}

+                public LiteralControl(string text)

+                {

+                        _text = text;

+                }

+                public virtual string Text

+                {

+                        get

+                        {

+                                return _text;

+                        }

+                        set

+                        {

+                                _text = value;

+                        }

+                }

+                protected override void Render(HtmlTextWriter writer)

+                {

+                        writer.Write(_text);

+                }

+

+		protected override ControlCollection CreateControlCollection ()

+		{

+			return new EmptyControlCollection (this);

+		}

+        }

+}

diff --git a/mcs/class/System.Web/System.Web.UI/LosFormatter.cs b/mcs/class/System.Web/System.Web.UI/LosFormatter.cs
new file mode 100644
index 00000000000..56035620faf
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/LosFormatter.cs
@@ -0,0 +1,396 @@
+//
+// System.Web.UI.LosFormatter
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+using System.Collections;
+using System.Drawing;
+using System.IO;
+using System.Text;
+using System.Web.UI;
+
+namespace System.Web.UI
+{
+	public sealed class LosFormatter
+	{
+		delegate void WriteObject (LosFormatter formatter, TextWriter writer, object value);
+		static char [] specialChars = new char [] {'<', '>', ';'};
+
+		const char booleanID = 'o';
+		const char stringID = 's';
+		const char charID = 'c';
+		const char int16ID = 'i';
+		const char int32ID = 'I';
+		const char int64ID = 'l';
+		const char colorID = 'C';
+		const char pairID = 'p';
+		const char tripletID = 't';
+		const char arrayListID = 'L';
+		const char hashtableID = 'h';
+		
+		static Hashtable specialTypes;
+		static Hashtable idToType;
+		
+		static LosFormatter ()
+		{
+			specialTypes = new Hashtable ();
+			specialTypes.Add (typeof (Boolean), new WriteObject (WriteBoolean));
+			specialTypes.Add (typeof (Pair), new WriteObject (WritePair));
+			specialTypes.Add (typeof (Triplet), new WriteObject (WriteTriplet));
+			specialTypes.Add (typeof (Color), new WriteObject (WriteColor));
+			specialTypes.Add (typeof (ArrayList), new WriteObject (WriteArrayList));
+			specialTypes.Add (typeof (Hashtable), new WriteObject (WriteHashtable));
+
+			idToType = new Hashtable ();
+			idToType.Add (typeof (string), stringID);
+			idToType.Add (typeof (char), charID);
+			idToType.Add (typeof (Int16), int16ID);
+			idToType.Add (typeof (Int32), int32ID);
+			idToType.Add (typeof (Int64), int64ID);
+			idToType.Add (typeof (Boolean), booleanID);
+			idToType.Add (typeof (Pair), pairID);
+			idToType.Add (typeof (Triplet), tripletID);
+			idToType.Add (typeof (Color), colorID);
+			idToType.Add (typeof (ArrayList), arrayListID);
+			idToType.Add (typeof (Hashtable), hashtableID);
+		}
+		
+		public object Deserialize (Stream stream)
+		{
+			if (stream == null)
+				throw new ArgumentNullException ("stream");
+
+			return Deserialize (new StreamReader (stream));
+		}
+
+		public object Deserialize (TextReader input)
+		{
+			if (input == null)
+				throw new ArgumentNullException ("input");
+
+			return Deserialize (input.ReadToEnd ());
+		}
+
+		public object Deserialize (string input)
+		{
+			if (input == null)
+				throw new ArgumentNullException ("input");
+
+			string real_input = Encoding.UTF8.GetString (Convert.FromBase64String (input));
+			return DeserializeObject (real_input);
+		}
+
+		private static string UnEscapeSpecialChars (string str)
+		{
+			if (str.IndexOf ('\\') == -1)
+				return str;
+
+			string result = str.Replace ("\\;", ";");
+			result = result.Replace ("\\>", ">");
+			result = result.Replace ("\\<", "<");
+			result = result.Replace ("\\\\", "\\");
+			return result;
+		}
+		
+		private static string GetEnclosedString (string input)
+		{
+			if (input [0] != '<')
+				throw new ArgumentException (input);
+
+			int count = 1;
+			bool escaped = false;
+			StringBuilder result = new StringBuilder ();
+			for (int i = 1; count != 0 && i < input.Length; i++) {
+				char c = input [i];
+				if (escaped)
+					escaped = false;
+				else if (c == '\\')
+					escaped = true;
+				else if (c == '<')
+					count++;
+				else if (c == '>')
+					count--;
+
+				result.Append (c);
+			}
+
+			result.Length--;
+			return result.ToString ();
+		}
+		
+		private static string [] GetStringValues (string input)
+		{
+			if (input == null || input.Length == 0)
+				return new string [0];
+
+			int length = input.Length;
+			bool escaped = false;
+			int opened = 0;
+			ArrayList list = new ArrayList ();
+			StringBuilder builder = new StringBuilder ();
+			for (int i = 0; i < length; i++) {
+				char c = input [i];
+				if (escaped)
+					escaped = false;
+				else if (c == '\\')
+					escaped = true;
+				else if (c == '<')
+					opened++;
+				else if (c == '>')
+					opened--;
+				else if (c == ';' && opened == 0) {
+					list.Add (builder.ToString ());
+					builder = new StringBuilder ();
+					continue;
+				}
+
+				builder.Append (c);
+			}
+
+			list.Add (builder.ToString ());
+
+			string [] result = new string [list.Count];
+			list.CopyTo (result, 0);
+			return result;
+		}
+
+		private object DeserializeObject (string input)
+		{
+			if (input == null || input.Length < 2)
+				return null;
+
+			object obj;
+			string enclosed = GetEnclosedString (input.Substring (1));
+			string [] splitted;
+
+			switch (input [0]) {
+			case booleanID:
+				obj = enclosed.Length == 1;
+				break;
+			case stringID:
+				obj = UnEscapeSpecialChars (enclosed);
+				break;
+			case int16ID:
+				obj = Int16.Parse (enclosed);
+				break;
+			case int32ID:
+				obj = Int32.Parse (enclosed);
+				break;
+			case int64ID:
+				obj = Int64.Parse (enclosed);
+				break;
+			case colorID:
+				obj = Color.FromArgb (Int32.Parse (enclosed));
+				break;
+			case pairID:
+				Pair pair = new Pair ();
+				obj = pair;
+				splitted = GetStringValues (enclosed);
+				if (splitted.Length > 0) {
+					pair.First = DeserializeObject (splitted [0]);
+					if (splitted.Length > 1)
+						pair.Second = DeserializeObject (splitted [1]);
+				}
+				break;
+			case tripletID:
+				Triplet triplet = new Triplet ();
+				obj = triplet;
+				splitted = GetStringValues (enclosed);
+				if (splitted.Length == 0)
+					break;
+				triplet.First = DeserializeObject (splitted [0]);
+				if (splitted.Length < 1)
+					break;
+				triplet.Second = DeserializeObject (splitted [1]);
+				if (splitted.Length < 2)
+					break;
+				triplet.Third = DeserializeObject (splitted [2]);
+				break;
+			case arrayListID:
+				ArrayList list = new ArrayList ();
+				obj = list;
+				splitted = GetStringValues (enclosed);
+				foreach (string s in splitted) {
+					object o = DeserializeObject (s);
+					list.Add (o);
+				}
+				break;
+			case hashtableID:
+				object key;
+				object value;
+				Hashtable hash = new Hashtable ();
+				obj = hash;
+				splitted = GetStringValues (enclosed);
+				int length = splitted.Length;
+				for (int i = 0; i < length; i++) {
+					key = DeserializeObject (splitted [i++]);
+					if (i < length)
+						value = DeserializeObject (splitted [i]);
+					else
+						value = null;
+
+					hash.Add (key, value);
+				}
+				break;
+			default:
+				throw new ArgumentException ("input");
+			}
+
+			return obj;
+		}
+
+		public void Serialize (Stream stream, object value)
+		{
+			if (stream == null)
+				throw new ArgumentNullException ("stream");
+
+			if (value == null)
+				throw new ArgumentNullException ("value");
+
+			StreamWriter writer = new StreamWriter (stream);
+			Serialize (writer, value);
+			writer.Flush ();
+		}
+
+		public void Serialize (TextWriter output, object value)
+		{
+			if (value == null)
+				return;
+
+			if (output == null)
+				throw new ArgumentNullException ("output");
+
+			StringBuilder builder = new StringBuilder ();
+			StringWriter writer = new StringWriter (builder);
+			SerializeObject (writer, value);
+			byte [] bytes = Encoding.UTF8.GetBytes (builder.ToString ());
+			output.Write (Convert.ToBase64String (bytes));
+		}
+
+		private static void WriteBoolean (LosFormatter formatter, TextWriter output, object value)
+		{
+			if (value == null)
+				return;
+			
+			output.Write (booleanID);
+			bool b = (bool) value;
+			output.Write (b ? "<t>" : "<>");
+		}
+		
+		private static void WritePair (LosFormatter formatter, TextWriter output, object value)
+		{
+			if (value == null)
+				return;
+			
+			output.Write (pairID);
+			Pair pair = (Pair) value;
+			output.Write ('<');
+			formatter.SerializeObject (output, pair.First);
+			output.Write (';');
+			formatter.SerializeObject (output, pair.Second);
+			output.Write ('>');
+		}
+
+		private static void WriteTriplet (LosFormatter formatter, TextWriter output, object value)
+		{
+			if (value == null)
+				return;
+			
+			output.Write (tripletID);
+			Triplet triplet = (Triplet) value;
+			output.Write ('<');
+			formatter.SerializeObject (output, triplet.First);
+			output.Write (';');
+			formatter.SerializeObject (output, triplet.Second);
+			output.Write (';');
+			formatter.SerializeObject (output, triplet.Third);
+			output.Write ('>');
+		}
+
+		private static void WriteColor (LosFormatter formatter, TextWriter output, object value)
+		{
+			if (value == null)
+				return;
+			
+			Color c = (Color) value;
+			output.Write (String.Format ("{0}<{1}>", colorID, c.ToArgb ()));
+		}
+
+		private static void WriteArrayList (LosFormatter formatter, TextWriter output, object value)
+		{
+			if (value == null)
+				return;
+			
+			output.Write (arrayListID);
+			output.Write ('<');
+			ArrayList list = (ArrayList) value;
+			for (int i = 0; i < list.Count; i++) {
+				formatter.SerializeObject (output, list [i]);
+				if (i != list.Count - 1)
+					output.Write (';');
+			}
+			output.Write('>');
+		}
+
+		private static void WriteHashtable (LosFormatter formatter, TextWriter output, object value)
+		{
+			if (value == null)
+				return;
+			
+			output.Write (hashtableID);
+			output.Write ('<');
+			Hashtable hash = (Hashtable) value;
+			int i = 0;
+			foreach (DictionaryEntry entry in hash) {
+				formatter.SerializeObject (output, entry.Key);
+				output.Write (';');
+				formatter.SerializeObject (output, entry.Value);
+				if (i != hash.Count - 1)
+					output.Write (';');
+				i++;
+			}
+			output.Write('>');
+		}
+
+		private static string EscapeSpecialChars (string str)
+		{
+			if (str.IndexOfAny (specialChars) == -1)
+				return str;
+
+			string result = str.Replace ("\\", "\\\\");
+			result = result.Replace ("<", "\\<");
+			result = result.Replace (">", "\\>");
+			result = result.Replace (";", "\\;");
+			return result;
+		}
+		
+		private void SerializeObject (TextWriter output, object value)
+		{
+			if (value == null)
+				return;
+
+			Type t = value.GetType ();
+			if (specialTypes.Contains (t)) {
+				WriteObject w = (WriteObject) specialTypes [t];
+				w (this, output, value);
+				return;
+			}
+
+			if (idToType.Contains (t)) {
+				char c = (char) idToType [t];
+				string s = EscapeSpecialChars (value.ToString ());
+				output.Write (String.Format ("{0}<{1}>", c, value.ToString ()));
+				return;
+			}
+
+			//TODO: support more types. Serialize if serializable?
+			throw new NotImplementedException (String.Format ("Type {0} not supported yet.", t));
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/OutputCacheLocation.cs b/mcs/class/System.Web/System.Web.UI/OutputCacheLocation.cs
new file mode 100644
index 00000000000..173654504c0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/OutputCacheLocation.cs
@@ -0,0 +1,23 @@
+//
+// System.Web.UI.OutputCacheLocation.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public enum OutputCacheLocation
+        {
+                Any,
+                Client,
+                Downstream,
+                Server,
+                None
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.UI/Page.cs b/mcs/class/System.Web/System.Web.UI/Page.cs
new file mode 100755
index 00000000000..91ff34bfe8b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/Page.cs
@@ -0,0 +1,682 @@
+//
+// System.Web.UI.Page
+//
+// Authors:
+//	Duncan Mak  (duncan@ximian.com)
+//	Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.IO;
+using System.Reflection;
+using System.Security.Principal;
+using System.Text;
+using System.Web;
+using System.Web.Caching;
+using System.Web.SessionState;
+
+namespace System.Web.UI
+{
+
+public class Page : TemplateControl, IHttpHandler
+{
+	private string _culture;
+	private bool _viewState = true;
+	private bool _viewStateMac = false;
+	private string _errorPage;
+	private ArrayList _fileDependencies;
+	private string _ID;
+	private bool _isValid;
+	private HttpServerUtility _server;
+	private bool _smartNavigation = false;
+	private TraceContext _trace;
+	private bool _traceEnabled;
+	private TraceMode _traceModeValue;
+	private int _transactionMode;
+	private string _UICulture;
+	private HttpContext _context;
+	private ValidatorCollection _validators;
+	private bool renderingForm;
+	private object _savedViewState;
+	private ArrayList _requiresPostBack;
+	private ArrayList requiresPostDataChanged;
+	private ArrayList requiresRaiseEvent;
+	private NameValueCollection secondPostData;
+	private bool requiresPostBackScript = false;
+	private bool postBackScriptRendered = false;
+
+	#region Fields
+	 	protected const string postEventArgumentID = ""; //FIXME
+		protected const string postEventSourceID = "";
+	#endregion
+
+	#region Constructor
+	public Page ()
+	{
+		Page = this;
+	}
+
+	#endregion		
+
+	#region Properties
+
+	public HttpApplicationState Application
+	{
+		get { return _context.Application; }
+	}
+
+	bool AspCompatMode
+	{
+		set { throw new NotImplementedException (); }
+	}
+
+	bool Buffer
+	{
+		set { Response.BufferOutput = value; }
+	}
+
+	public Cache Cache
+	{
+		get { return _context.Cache; }
+	}
+
+	[MonoTODO]
+	public string ClientTarget
+	{
+		get { throw new NotImplementedException (); }
+		set { throw new NotImplementedException (); }
+	}
+
+	[MonoTODO]
+	int CodePage
+	{
+		set { throw new NotImplementedException (); }
+	}
+
+	[MonoTODO]
+	string ContentType
+	{
+		set { throw new NotImplementedException (); }
+	}
+
+	protected override HttpContext Context
+	{
+		get { return _context; }
+	}
+
+	string Culture
+	{
+		set { _culture = value; }
+	}
+
+	public override bool EnableViewState
+	{
+		get { return _viewState; }
+		set { _viewState = value; }
+	}
+
+	protected bool EnableViewStateMac
+	{
+		get { return _viewStateMac; }
+		set { _viewStateMac = value; }
+	}
+
+	public string ErrorPage
+	{
+		get { return _errorPage; }
+		set { _errorPage = value; }
+	}
+
+	ArrayList FileDependencies
+	{
+		set { _fileDependencies = value; }
+	}
+
+	public override string ID
+	{
+		get { return _ID; }
+		set { _ID = value; }
+	}
+
+	public bool IsPostBack
+	{
+		get {
+			return (0 == String.Compare (Request.HttpMethod, "POST", true));
+		}
+	}
+
+	[MonoTODO]
+	public bool IsReusable
+	{
+		get { throw new NotImplementedException (); }
+	}
+
+	public bool IsValid
+	{
+		get { return _isValid; }
+	}
+
+	[MonoTODO]
+	int LCID {
+		set { throw new NotImplementedException (); }
+	}
+
+	public HttpRequest Request
+	{
+		get { return _context.Request; }
+	}
+
+	public HttpResponse Response
+	{
+		get { return _context.Response; }
+	}
+
+	string ResponseEncoding
+	{
+		set { Response.ContentEncoding = Encoding.GetEncoding (value); }
+	}
+
+	public HttpServerUtility Server
+	{
+		get { return _server; }
+	}
+
+	public virtual HttpSessionState Session
+	{
+		get { return _context.Session; }
+	}
+
+	public bool SmartNavigation
+	{
+		get { return _smartNavigation; }
+		set { _smartNavigation = value; }
+	}
+
+	public TraceContext Trace
+	{
+		get { return _trace; }
+	}
+
+	bool TraceEnabled
+	{
+		set { _traceEnabled = value; }
+	}
+
+	TraceMode TraceModeValue
+	{
+		set { _traceModeValue = value; }
+	}
+
+	int TransactionMode
+	{
+		set { _transactionMode = value; }
+	}
+
+	string UICulture
+	{
+		set { _UICulture = value; }
+	}
+
+	public IPrincipal User
+	{
+		get { return _context.User; }
+	}
+
+	public ValidatorCollection Validators
+	{
+		get { 
+			if (_validators == null)
+				_validators = new ValidatorCollection ();
+			return _validators;
+		}
+	}
+
+	public override bool Visible
+	{
+		get { return base.Visible; }
+		set { base.Visible = value; }
+	}
+
+	#endregion
+
+	#region Methods
+
+	[MonoTODO]
+	protected IAsyncResult AspCompatBeginProcessRequest (HttpContext context,
+							     AsyncCallback cb, 
+							     object extraData)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	protected void AspcompatEndProcessRequest (IAsyncResult result)
+	{
+		throw new NotImplementedException ();
+	}
+	
+	protected virtual HtmlTextWriter CreateHtmlTextWriter (TextWriter tw)
+	{
+		return new HtmlTextWriter (tw);
+	}
+
+	[MonoTODO]
+	public void DesignerInitialize ()
+	{
+		throw new NotImplementedException ();
+	}
+
+	protected virtual NameValueCollection DeterminePostBackMode ()
+	{
+		if (_context == null)
+			return null;
+
+		HttpRequest req = _context.Request;
+		if (req == null)
+			return null;
+
+		NameValueCollection coll = null;
+		if (IsPostBack)
+			coll =  _context.Request.Form;
+		else 
+			coll = _context.Request.QueryString;
+
+		if (coll == null || coll ["__VIEWSTATE"] == null)
+			return null;
+		return coll;
+	}
+	
+	[MonoTODO]
+	public string GetPostBackClientEvent (Control control, string argument)
+	{
+		// Don't throw the exception. keep going
+		//throw new NotImplementedException ();
+		StringBuilder result = new StringBuilder ();
+		result.AppendFormat ("GetPostBackClientEvent ('{0}', '{1}')", control.ID, argument);
+		return result.ToString ();
+	}
+
+	public string GetPostBackClientHyperlink (Control control, string argument)
+	{
+		return "javascript:" + GetPostBackEventReference (control, argument);
+	}
+
+	public string GetPostBackEventReference (Control control)
+	{
+		return GetPostBackEventReference (control, "");
+	}
+	
+	public string GetPostBackEventReference (Control control, string argument)
+	{
+		RequiresPostBackScript ();
+		return String.Format ("__doPostBack ('{0}', '{1}')", control.ID, argument);
+	}
+
+	internal void RequiresPostBackScript ()
+	{
+		requiresPostBackScript = true;
+	}
+
+	public virtual int GetTypeHashCode ()
+	{
+		return GetHashCode ();
+	}
+
+	[MonoTODO]
+	protected virtual void InitOutputCache (int duration,
+						string varyByHeader,
+						string varyByCustom,
+						OutputCacheLocation location,
+						string varyByParam)
+	{
+		throw new NotImplementedException ();
+	}
+	
+	[MonoTODO]
+	public bool IsClientScriptBlockRegistered (string key)
+	{
+		throw new NotImplementedException ();
+	}
+	
+	[MonoTODO]
+	public bool IsStartupScriptRegistered (string key)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public string MapPath (string virtualPath)
+	{
+		throw new NotImplementedException ();
+	}
+	
+	private void InvokeEventMethod (string m_name, object sender, EventArgs e)
+	{
+		Type [] types = new Type [] {typeof (object), typeof (EventArgs)};
+		MethodInfo evt_method = GetType ().GetMethod (m_name, types);
+
+		if (evt_method != null){
+			object [] parms = new object [2];
+			parms [0] = sender;
+			parms [1] = e;
+			evt_method.Invoke (this, parms);
+		}
+	}
+
+	private void RenderPostBackScript (HtmlTextWriter writer, string formUniqueID)
+	{
+		writer.WriteLine ("<input type=\"hidden\" name=\"__EVENTTARGET\" value=\"\" />");
+		writer.WriteLine ("<input type=\"hidden\" name=\"__EVENTARGUMENT\" value=\"\" />");
+		writer.WriteLine ();
+		writer.WriteLine ("<script language=\"javascript\">");
+		writer.WriteLine ("<!--");
+		writer.WriteLine ("\tfunction __doPostBack(eventTarget, eventArgument) {");
+		writer.WriteLine ("\t\tvar theform = document.{0};", formUniqueID);
+		writer.WriteLine ("\t\ttheform.__EVENTTARGET.value = eventTarget;");
+		writer.WriteLine ("\t\ttheform.__EVENTARGUMENT.value = eventArgument;");
+		writer.WriteLine ("\t\ttheform.submit();");
+		writer.WriteLine ("\t}");
+		writer.WriteLine ("// -->");
+		writer.WriteLine ("</script>");
+	}
+
+	private bool got_state = false;
+	private int _random;
+	private int queryStringHash;
+	internal void OnFormRender (HtmlTextWriter writer, string formUniqueID)
+	{
+		if (renderingForm)
+			throw new HttpException ("Only 1 HtmlForm is allowed per page.");
+
+		renderingForm = true;
+		writer.WriteLine ();
+		writer.Write ("<input type=\"hidden\" name=\"__VIEWSTATE\" ");
+		writer.WriteLine ("value=\"{0}\" />", GetViewStateString ());
+		if (requiresPostBackScript) {
+			RenderPostBackScript (writer, formUniqueID);
+			postBackScriptRendered = true;
+		}
+	}
+
+	public string GetViewStateString ()
+	{
+		StringBuilder state_string = new StringBuilder ();
+		state_string.AppendFormat ("{0:X}", GetTypeHashCode ());
+		state_string.AppendFormat ("{0:X}", queryStringHash);
+
+		if (!got_state) {
+			Random rnd = new Random ();
+			_random = rnd.Next ();
+			if (_random < 0)
+				_random = -_random;
+			_random++;
+			got_state = true;
+		}
+
+		state_string.AppendFormat ("{0:X}", _random);
+		return state_string.ToString ();
+	}
+
+	internal void OnFormPostRender (HtmlTextWriter writer, string formUniqueID)
+	{
+		if (!postBackScriptRendered && requiresPostBackScript)
+			RenderPostBackScript (writer, formUniqueID);
+
+		renderingForm = false;
+		postBackScriptRendered = false;
+	}
+
+
+	private void _Page_Init (object sender, EventArgs e)
+	{
+		InvokeEventMethod ("Page_Init", sender, e);
+	}
+
+	private void _Page_Load (object sender, EventArgs e)
+	{
+		InvokeEventMethod ("Page_Load", sender, e);
+	}
+
+	private void _Page_DataBind (object sender, EventArgs e)
+	{
+		InvokeEventMethod ("Page_DataBind", sender, e);
+	}
+
+	private void _Page_PreRender (object sender, EventArgs e)
+	{
+		InvokeEventMethod ("Page_PreRender", sender, e);
+	}
+
+	private void _Page_Dispose (object sender, EventArgs e)
+	{
+		InvokeEventMethod ("Page_Dispose", sender, e);
+	}
+
+	private void _Page_Error (object sender, EventArgs e)
+	{
+		InvokeEventMethod ("Page_Error", sender, e);
+	}
+
+	private void ProcessPostData (NameValueCollection data, bool second)
+	{
+		if (data == null)
+			return;
+
+		foreach (string id in data.AllKeys){
+			if (id == "__VIEWSTATE")
+				continue;
+
+			Control ctrl = FindControl (id);
+			if (ctrl != null){
+				IPostBackDataHandler pbdh = ctrl as IPostBackDataHandler;
+				IPostBackEventHandler pbeh = ctrl as IPostBackEventHandler;
+
+				if (pbdh == null) {
+					if (pbeh != null)
+						RegisterRequiresRaiseEvent (pbeh);
+					continue;
+				}
+		
+				if (pbdh.LoadPostData (id, data) == true) {
+					if (requiresPostDataChanged == null)
+						requiresPostDataChanged = new ArrayList ();
+					requiresPostDataChanged.Add (pbdh);
+				}
+			} else if (!second) {
+				if (secondPostData == null)
+					secondPostData = new NameValueCollection ();
+				secondPostData.Add (id, null);
+			}
+		}
+	}
+
+	private bool init_done;
+	public void ProcessRequest (HttpContext context)
+	{
+		if (!init_done){
+			init_done = true;
+			// These should depend on AutoEventWireUp in Page directive. Defaults to true.
+			Init += new EventHandler (_Page_Init);
+			Load += new EventHandler (_Page_Load);
+			DataBinding += new EventHandler (_Page_DataBind);
+			PreRender += new EventHandler (_Page_PreRender);
+			Disposed += new EventHandler (_Page_Dispose);
+			Error += new EventHandler (_Page_Error);
+		}
+		//-- Control execution lifecycle in the docs
+		Controls.Clear ();
+		FrameworkInitialize ();
+		InitRecursive (null);
+		got_state = false;
+		renderingForm = false;	
+		_context = context;
+		queryStringHash = _context.Request.QueryString.GetHashCode ();
+		if (IsPostBack) {
+			LoadPageViewState ();
+			ProcessPostData (DeterminePostBackMode (), false);
+		}
+
+		LoadRecursive ();
+		if (IsPostBack) {
+			ProcessPostData (secondPostData, true);
+			RaiseChangedEvents ();
+			RaisePostBackEvents ();
+		}
+		PreRenderRecursiveInternal ();
+
+		SavePageViewState ();
+		//--
+		StringBuilder sb = new StringBuilder ();
+		StringWriter sr = new StringWriter (sb);
+		HtmlTextWriter output = new HtmlTextWriter (context.Response.Output);
+		RenderControl (output);
+		_context = null;
+	}
+
+	internal void RaisePostBackEvents ()
+	{
+		NameValueCollection postdata = DeterminePostBackMode ();
+		string eventTarget = postdata ["__EVENTTARGET"];
+		if (eventTarget != null && eventTarget.Length > 0) {
+			Control target = FindControl (eventTarget);
+			if (!(target is IPostBackEventHandler))
+				return;
+			string eventArgument = postdata ["__EVENTARGUMENT"];
+			RaisePostBackEvent ((IPostBackEventHandler) target, eventArgument);
+			return;
+		}
+
+		if (requiresRaiseEvent == null)
+			return;
+
+		foreach (Control c in requiresRaiseEvent)
+			RaisePostBackEvent ((IPostBackEventHandler) c, postdata [c.ID]);
+		requiresRaiseEvent.Clear ();
+	}
+
+	internal void RaiseChangedEvents ()
+	{
+		if (requiresPostDataChanged == null)
+			return;
+
+		foreach (IPostBackDataHandler ipdh in requiresPostDataChanged)
+			ipdh.RaisePostDataChangedEvent ();
+		requiresPostDataChanged.Clear ();
+	}
+
+	protected virtual void RaisePostBackEvent (IPostBackEventHandler sourceControl, string eventArgument)
+	{
+		sourceControl.RaisePostBackEvent (eventArgument);
+	}
+	
+	[MonoTODO]
+	public void RegisterArrayDeclaration (string arrayName, string arrayValue)
+	{
+		throw new NotImplementedException ();
+	}
+	
+	[MonoTODO]
+	public virtual void RegisterClientScriptBlock (string key, string script)
+	{
+		throw new NotImplementedException ();
+	}
+	
+	[MonoTODO]
+	public virtual void RegisterHiddenField (string hiddenFieldName, string hiddenFieldInitialValue)
+	{
+		throw new NotImplementedException ();
+	}
+	
+	[MonoTODO]
+	public void RegisterClientScriptFile (string a, string b, string c)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public void RegisterOnSubmitStatement (string key, string script)
+	{
+		throw new NotImplementedException ();
+	}
+	
+	public void RegisterRequiresPostBack (Control control)
+	{
+		if (_requiresPostBack == null)
+			_requiresPostBack = new ArrayList ();
+
+		_requiresPostBack.Add (control);
+	}
+
+	public virtual void RegisterRequiresRaiseEvent (IPostBackEventHandler control)
+	{
+		if (requiresRaiseEvent == null)
+			requiresRaiseEvent = new ArrayList ();
+		requiresRaiseEvent.Add (control);
+	}
+
+	[MonoTODO]
+	public void RegisterViewStateHandler ()
+	{
+		// Do nothing
+	}
+
+	protected virtual void SavePageStateToPersistenceMedium (object viewState)
+	{
+		_savedViewState = viewState;
+	}
+	
+	protected virtual object LoadPageStateFromPersistenceMedium ()
+	{
+		return _savedViewState;
+	}
+
+	internal void LoadPageViewState()
+	{
+		object sState = LoadPageStateFromPersistenceMedium ();
+		if (sState != null) {
+			Pair pair = (Pair) sState;
+			LoadViewStateRecursive (pair.First);
+			_requiresPostBack = pair.Second as ArrayList;
+		}
+	}
+
+	internal void SavePageViewState ()
+	{
+		Pair pair = new Pair ();
+		pair.First = SaveViewStateRecursive ();
+		pair.Second = _requiresPostBack;
+		SavePageStateToPersistenceMedium (pair);
+	}
+
+	public virtual void Validate ()
+	{
+		if (_validators == null || _validators.Count == 0){
+			_isValid = true;
+			return;
+		}
+
+		bool all_valid = true;
+		foreach (IValidator v in _validators){
+			v.Validate ();
+			if (v.IsValid == false)
+				all_valid = false;
+		}
+
+		if (all_valid)
+			_isValid = true;
+	}
+
+	public virtual void VerifyRenderingInServerForm (Control control)
+	{
+		if (!renderingForm)
+			throw new HttpException ("Control '" + control.ClientID + " " + control.GetType () + 
+						 "' must be rendered within a HtmlForm");
+	}
+
+	#endregion
+}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/PageParser.cs b/mcs/class/System.Web/System.Web.UI/PageParser.cs
new file mode 100644
index 00000000000..7e45a7a39eb
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/PageParser.cs
@@ -0,0 +1,45 @@
+//
+// System.Web.UI.PageParser
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Web;
+using System.Web.Compilation;
+
+namespace System.Web.UI
+{
+	public sealed class PageParser : TemplateControlParser
+	{
+		public static IHttpHandler GetCompiledPageInstance (string virtualPath,
+								    string inputFile, 
+								    HttpContext context)
+		{
+			PageParser pp = new PageParser ();
+			return (IHttpHandler) pp.GetCompiledInstance (virtualPath, inputFile, context);
+		}
+
+		protected override Type CompileIntoType ()
+		{
+			return PageCompiler.CompilePageType (this);
+		}
+
+		protected override Type DefaultBaseType
+		{
+			get {
+				return typeof (Page);
+			}
+		}
+
+		protected override string DefaultDirectiveName
+		{
+			get {
+				return "page";
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/Pair.cs b/mcs/class/System.Web/System.Web.UI/Pair.cs
new file mode 100644
index 00000000000..bf13fabdce8
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/Pair.cs
@@ -0,0 +1,36 @@
+/**

+ * Namespace: System.Web.UI

+ * Class:     Pair

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+using System.Collections;

+using System.Collections.Specialized;

+

+namespace System.Web.UI

+{

+	public class Pair

+	{

+		public object First;

+		public object Second;

+		

+		public Pair(object first, object second)

+		{

+			First  = first;

+			Second = second;

+		}

+		

+		public Pair()

+		{

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI/ParseChildrenAttribute.cs b/mcs/class/System.Web/System.Web.UI/ParseChildrenAttribute.cs
new file mode 100755
index 00000000000..95b621a8015
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ParseChildrenAttribute.cs
@@ -0,0 +1,80 @@
+//
+// System.Web.UI.ParseChildrenAttribute.cs
+//
+// Authors:
+// 	Duncan Mak  (duncan@ximian.com)
+// 	Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com
+//
+
+using System;
+
+namespace System.Web.UI {
+
+	[AttributeUsage (AttributeTargets.Class)]
+	public sealed class ParseChildrenAttribute : Attribute
+	{
+		bool childrenAsProperties;
+		string defaultProperty;
+		public static readonly ParseChildrenAttribute Default = new ParseChildrenAttribute ();
+
+		// LAMESPEC
+		public ParseChildrenAttribute ()
+		{
+			childrenAsProperties = false;
+			defaultProperty = "";
+		}
+
+		public ParseChildrenAttribute (bool childrenAsProperties)
+		{
+			this.childrenAsProperties = childrenAsProperties;
+			this.defaultProperty = "";
+		}
+
+		public ParseChildrenAttribute (bool childrenAsProperties,
+					       string defaultProperty)
+		{
+			this.childrenAsProperties = childrenAsProperties;
+			if (childrenAsProperties)
+				this.defaultProperty = defaultProperty;
+		}
+
+		public bool ChildrenAsProperties {
+
+			get { return childrenAsProperties; }
+
+			set { childrenAsProperties = value; }
+		}
+
+		public string DefaultProperty {
+			get { return defaultProperty; }
+
+			set { defaultProperty = value; }
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (!(obj is ParseChildrenAttribute))
+				return false;
+
+			ParseChildrenAttribute o = (ParseChildrenAttribute) obj;
+			if (childrenAsProperties == o.childrenAsProperties){
+				if (childrenAsProperties == false)
+					return true;
+				return (defaultProperty == o.DefaultProperty);
+			}
+			return false;
+		}
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+
+		public override bool IsDefaultAttribute ()
+		{
+			return Equals (Default);
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/PartialCachingAttribute.cs b/mcs/class/System.Web/System.Web.UI/PartialCachingAttribute.cs
new file mode 100755
index 00000000000..be490317e8b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/PartialCachingAttribute.cs
@@ -0,0 +1,51 @@
+//
+// System.Web.UI.PartialCachingAttribute.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Web.UI {
+
+	[AttributeUsage (AttributeTargets.Class)]
+	public sealed class PartialCachingAttribute : Attribute
+	{
+		int duration;
+		string varyByControls;
+		string varyByCustom;
+		string varyByParams;
+		
+		public PartialCachingAttribute (int duration)
+		{
+			this.duration = duration;
+		}
+
+		public PartialCachingAttribute (int duration, string varyByParams,
+						string varyByControls, string varyByCustom)
+		{
+			this.duration = duration;
+			this.varyByParams = varyByParams;
+			this.varyByControls = varyByControls;
+			this.varyByCustom = varyByCustom;
+		}
+
+		public int Duration {
+			get { return duration; }
+		}
+
+		public string VaryByParams {
+			get { return varyByParams; }
+		}
+
+		public string VaryByControls {
+			get { return varyByControls; }
+		}
+
+		public string VaryByCustom {
+			get { return varyByCustom; }
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/PersistChildrenAttribute.cs b/mcs/class/System.Web/System.Web.UI/PersistChildrenAttribute.cs
new file mode 100755
index 00000000000..a38d49c817f
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/PersistChildrenAttribute.cs
@@ -0,0 +1,50 @@
+//
+// System.Web.UI.PersistChildrenAttribute.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Web.UI {
+
+	[AttributeUsage (AttributeTargets.Class)]
+	public sealed class PersistChildrenAttribute : Attribute
+	{
+		bool persist;
+		
+		public PersistChildrenAttribute (bool persist)
+		{
+			this.persist = persist;
+		}
+
+		public static readonly PersistChildrenAttribute Default;
+		public static readonly PersistChildrenAttribute Yes;
+		public static readonly PersistChildrenAttribute No;
+
+		public bool Persist {
+			get { return persist; }
+		}
+
+		[MonoTODO]
+		public override bool Equals (object obj)
+		{
+			return false;
+		}
+
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			return 42;
+		}
+
+		[MonoTODO]
+		public override bool IsDefaultAttribute ()
+		{
+			return false;
+		}
+	}
+}
+	
diff --git a/mcs/class/System.Web/System.Web.UI/PersistenceMode.cs b/mcs/class/System.Web/System.Web.UI/PersistenceMode.cs
new file mode 100755
index 00000000000..e58f2847489
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/PersistenceMode.cs
@@ -0,0 +1,22 @@
+//
+// System.Web.UI.PersistenceMode.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+        public enum PersistenceMode
+        {
+                Attribute = 0,
+		InnerProperty = 1,
+		InnerDefaultProperty = 2,
+                EncodedInnerDefaultProperty = 3,
+        }
+}
diff --git a/mcs/class/System.Web/System.Web.UI/PersistenceModeAttribute.cs b/mcs/class/System.Web/System.Web.UI/PersistenceModeAttribute.cs
new file mode 100755
index 00000000000..1f878f6ef2b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/PersistenceModeAttribute.cs
@@ -0,0 +1,52 @@
+//
+// System.Web.UI.PersistenceModeAttribute.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Web.UI {
+
+	[AttributeUsage (AttributeTargets.Class)]
+	public sealed class PersistenceModeAttribute : Attribute
+	{
+		PersistenceMode mode;
+		
+		public PersistenceModeAttribute (PersistenceMode mode)
+		{
+			this.mode = mode;
+		}
+
+		public static readonly PersistenceModeAttribute Attribute;
+		public static readonly PersistenceModeAttribute Default;
+		public static readonly PersistenceModeAttribute EncodedInnerDefaultProperty;
+		public static readonly PersistenceModeAttribute InnerDefaultProperty;
+		public static readonly PersistenceModeAttribute InnerProperty;
+		
+		public PersistenceMode Mode {
+			get { return mode; }
+		}
+
+		[MonoTODO]
+		public override bool Equals (object obj)
+		{
+			return false;
+		}
+
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			return 42;
+		}
+
+		[MonoTODO]
+		public override bool IsDefaultAttribute ()
+		{
+			return false;
+		}
+	}
+}
+	
diff --git a/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs b/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs
new file mode 100644
index 00000000000..d98e80f912a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/PropertyConverter.cs
@@ -0,0 +1,124 @@
+/**

+ * Namespace: System.Web.UI

+ * Class:     PropertyConverter

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.ComponentModel;

+using System.Globalization;

+using System.Reflection;

+

+namespace System.Web.UI

+{

+	public sealed class PropertyConverter

+	{

+		private static Type[] parseMethodTypes;

+		private static Type[] parseMethodTypesWithSOP;

+

+		static PropertyConverter()

+		{

+			parseMethodTypes = new Type[1];

+			parseMethodTypes[0] = typeof(string);

+			parseMethodTypesWithSOP = new Type[2];

+			parseMethodTypesWithSOP[0] = typeof(string);

+			parseMethodTypesWithSOP[1] = typeof(IServiceProvider);

+		}

+

+		private PropertyConverter()

+		{

+			// Prevent any instance

+		}

+

+		public static object EnumFromString(Type enumType, string enumValue)

+		{

+			object retVal = null;

+			try

+			{

+				retVal = Enum.Parse(enumType, enumValue, true);

+			} catch

+			{

+				retVal = null;

+			}

+			return retVal;

+		}

+

+		public static string EnumToString(Type enumType, object enumValue)

+		{

+			string retVal = Enum.Format(enumType, enumValue, "G");

+			return retVal.Replace('_','-');

+		}

+

+		public static object ObjectFromString(Type objType, MemberInfo propertyInfo, string objValue)

+		{

+			if(objValue == null)

+				return null;

+			if(! (!objType.Equals(typeof(Boolean)) || objValue.Length > 0) )

+			{

+				return null;

+			}

+			if(objType.IsEnum)

+			{

+				return EnumFromString(objType, objValue);

+			}

+			if(objType.Equals(typeof(string)))

+			{

+				return objValue;

+			}

+			PropertyDescriptor pc = null;

+			if(propertyInfo != null)

+			{

+				pc = (TypeDescriptor.GetProperties(propertyInfo.ReflectedType))[propertyInfo.Name];

+			}

+			if(pc != null)

+			{

+				TypeConverter converter = pc.Converter;

+				if(converter!=null && converter.CanConvertFrom(typeof(string)))

+				{

+					return converter.ConvertFromInvariantString(objValue);

+				}

+			}

+			MethodInfo mi = objType.GetMethod("Parse", parseMethodTypesWithSOP);

+			object o = null;

+			if(mi != null)

+			{

+				object[] parameters = new object[2];

+				parameters[0] = objValue;

+				parameters[1] = CultureInfo.InvariantCulture;

+				try

+				{

+					o = Utils.InvokeMethod(mi, null, parameters);

+				} catch

+				{

+				}

+			}

+			if(o == null)

+			{

+				mi = objType.GetMethod("Parse", parseMethodTypes);

+				if(mi!=null)

+				{

+					object[] parameters = new object[1];

+					parameters[0] = objValue;

+					try

+					{

+						o = Utils.InvokeMethod(mi, null, parameters);

+					} catch

+					{

+					}

+				}

+			}

+			if(o == null)

+			{

+				throw new HttpException(/*HttpRuntime.FormatResourceString(*/"Type_not_creatable_from_string"/*, objType.FullName, objValue, propertyInfo.Name)*/);

+			}

+			return o;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI/RenderMethod.cs b/mcs/class/System.Web/System.Web.UI/RenderMethod.cs
new file mode 100755
index 00000000000..8f2db742cdb
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/RenderMethod.cs
@@ -0,0 +1,13 @@
+//
+//
+// System.Web.UI.RenderMethod.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Web.UI {
+
+	public delegate void RenderMethod (HtmlTextWriter output, Control container);
+}
diff --git a/mcs/class/System.Web/System.Web.UI/StateBag.cs b/mcs/class/System.Web/System.Web.UI/StateBag.cs
new file mode 100644
index 00000000000..aa0ed11a532
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/StateBag.cs
@@ -0,0 +1,243 @@
+/**

+ * Namespace: System.Web.UI

+ * Class:     StateBag

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Web;

+using System.Collections;

+using System.Collections.Specialized;

+

+namespace System.Web.UI

+{

+	public sealed class StateBag : IStateManager, IDictionary, ICollection, IEnumerable

+	{

+		private bool ignoreCase;

+		private bool marked;

+		private HybridDictionary bag;

+		

+		public StateBag (bool ignoreCase)

+		{

+			Initialize (ignoreCase);

+		}

+		

+		public StateBag ()

+		{

+			Initialize (false);

+		}

+

+		private void Initialize (bool ignoreCase)

+		{

+			this.ignoreCase = ignoreCase;

+			marked = false;

+			bag = new HybridDictionary (ignoreCase);

+		}

+		

+		public int Count {

+			get { return bag.Count; }

+		}

+

+		

+		public object this [string key] {

+			get {

+				if (key == null || key.Length == 0)

+					throw new ArgumentException (HttpRuntime.FormatResourceString ("Key_Cannot_Be_Null"));

+

+				object val = bag [key];

+

+				if (val is StateItem)

+					return ((StateItem) val).Value;

+

+				return null; // 

+			}

+

+			set { Add (key, value); }

+		}

+

+		object IDictionary.this [object key] {

+			get { return this [(string) key] as object; }

+

+			set { Add ((string) key, value); }

+		}

+		

+		public ICollection Keys {

+			get { return bag.Keys; }

+		}

+		

+		public ICollection Values {

+			get { return bag.Values; }

+		}

+		

+		public StateItem Add (string key, object value)

+		{

+			if (key == null || key.Length == 0)

+				throw new ArgumentException (HttpRuntime.FormatResourceString ("Key_Cannot_Be_Null"));

+

+			StateItem val = bag [key] as StateItem; //don't throw exception when null

+			if(val == null) {

+				if(value != null || marked) {

+					val = new StateItem (value);

+					bag.Add (key, val);

+				}

+			}

+			else if (value == null && !marked)

+				bag.Remove (key);

+			else

+				val.Value = value;

+

+			if (val != null && marked) {

+				val.IsDirty = true;

+			}

+

+			return val;

+		}

+		

+		public void Clear ()

+		{

+			bag.Clear ();

+		}

+		

+		public IDictionaryEnumerator GetEnumerator ()

+		{

+			return bag.GetEnumerator ();

+		}

+		

+		public bool IsItemDirty (string key)

+		{

+			object o = bag [key];

+

+			if (o is StateItem)

+				return ((StateItem) o).IsDirty;

+			

+			return false;

+		}

+		

+		public void Remove (string key)

+		{

+			bag.Remove (key);

+		}

+		

+		/// <summary>

+		/// Undocumented

+		/// </summary>

+		public void SetItemDirty (string key, bool dirty)

+		{

+			if (bag [key] is StateItem)

+				((StateItem) bag [key]).IsDirty = dirty;

+		}

+		

+		internal bool IsTrackingViewState {

+			get { return marked; }

+		}

+		

+		internal void LoadViewState (object state)

+		{

+			if(state!=null) {

+				Pair pair = (Pair) state;

+				ArrayList keyList = (ArrayList) (pair.First);

+				ArrayList valList = (ArrayList) (pair.Second);

+				for(int i = 0; i < keyList.Count; i++)

+					Add ((string) keyList [i], valList [i]);

+			}

+		}

+		

+		internal object SaveViewState ()

+		{

+			if(bag.Count > 0) {

+				ArrayList keyList = null, valList = null;

+

+				foreach (string key in bag.Keys) {

+					StateItem item = (StateItem) bag [key];

+

+					if (item.IsDirty) {

+						if (keyList == null) {

+							keyList = new ArrayList ();

+							valList = new ArrayList ();

+						}

+						

+						keyList.Add (key);

+						valList.Add (item.Value);

+					}

+				}

+

+				if (keyList!=null)

+					return new Pair (keyList, valList);

+			}

+			return null;

+		}

+		

+		internal void TrackViewState()

+		{

+			marked = true;

+		}

+		

+		IEnumerator IEnumerable.GetEnumerator ()

+		{

+			return GetEnumerator ();

+		}

+		

+		void IStateManager.LoadViewState (object savedState)

+		{

+			LoadViewState (savedState);

+		}

+		

+		object IStateManager.SaveViewState ()

+		{

+			return SaveViewState ();

+		}

+		

+		void IStateManager.TrackViewState ()

+		{

+			TrackViewState ();

+		}

+		

+		bool IStateManager.IsTrackingViewState {

+			get { return IsTrackingViewState; }

+		}

+		

+		void ICollection.CopyTo (Array array, int index)

+		{

+			Values.CopyTo (array, index);

+		}

+		

+		bool ICollection.IsSynchronized {

+			get { return false; }

+		}

+		

+		object ICollection.SyncRoot

+		{

+			get { return this; }

+		}

+		

+		void IDictionary.Add (object key, object value)

+		{

+			Add ((string) key, value);

+		}

+		

+		void IDictionary.Remove (object key)

+		{

+			Remove ((string) key);

+		}

+		

+		bool IDictionary.Contains (object key)

+		{

+			return bag.Contains ((string) key);

+		}

+		

+		bool IDictionary.IsFixedSize {

+			get { return false; }

+		}

+		

+		bool IDictionary.IsReadOnly {

+			get { return false; }

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI/StateItem.cs b/mcs/class/System.Web/System.Web.UI/StateItem.cs
new file mode 100644
index 00000000000..81a425bbaac
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/StateItem.cs
@@ -0,0 +1,47 @@
+//

+// System.Web.UI.StateItem.cs

+//

+// Author:

+//   Bob Smith <bob@thestuff.net>

+//

+// (C) Bob Smith

+//

+

+using System;

+using System.Web;

+

+namespace System.Web.UI

+{

+        public sealed class StateItem

+        {

+                private bool _isDirty = false;

+                private object _value = null;

+                public bool IsDirty

+                {

+                        get

+                        {

+                                return _isDirty;

+                        }

+                        set

+                        {

+                                _isDirty = value;

+                        }

+                }

+                public object Value

+                {

+                        get

+                        {

+                                return _value;

+                        }

+                        set

+                        {

+                                _value = value;

+                        }

+                }

+                private StateItem() {}

+                internal StateItem(Object value)

+                {

+                        _value = value;

+                }

+        }

+}

diff --git a/mcs/class/System.Web/System.Web.UI/TODO b/mcs/class/System.Web/System.Web.UI/TODO
new file mode 100644
index 00000000000..de529b87f86
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/TODO
@@ -0,0 +1,42 @@
+AttributeCollection
+BaseParser
+BasePartialCachingControl
+CompiledTemplateBuilder
+ConstructorNeedsTagAttribute
+ControlBuilder
+ControlBuilderAttribute
+ControlCollection
+CssStyleCollection
+DataBinder
+DataBinding
+DataBindingCollection
+DataBindingHandlerAttribute
+DataBoundLiteralControl
+DesignTimeParseData
+DesignTimeTemplateParser
+EmptyControlCollection
+Html32TextWriter
+HtmlTextWriter
+ImageClickEventArgs
+LosFormatter
+Page
+PageParser
+ParseChildrenAttribute
+PartialCachingAttribute
+PartialCachingControl
+PersistChildrenAttribute
+PersistanceModeAttribute
+RootBuilder
+SimpleWebHandlerParser
+StateBag
+StaticPartialCachingControl
+TagPrefixAttribute
+TemplateBuilder
+TemplateContainerAttribute
+TemplateControl
+TemplateControlParser
+ToolboxDataAttribute
+UserControl
+ValidationPropertyAttribute
+ValidatorCollection
+WebServiceProvider
diff --git a/mcs/class/System.Web/System.Web.UI/TagPrefixAttribute.cs b/mcs/class/System.Web/System.Web.UI/TagPrefixAttribute.cs
new file mode 100755
index 00000000000..0dc56d241f5
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/TagPrefixAttribute.cs
@@ -0,0 +1,37 @@
+//
+// System.Web.UI.TagPrefixAttribute.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Web.UI {
+
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class TagPrefixAttribute : Attribute
+	{
+		string namespaceName;
+		string tagPrefix;
+		
+		public TagPrefixAttribute (string namespaceName,
+					   string tagPrefix)
+		{
+			if (namespaceName == null || tagPrefix == null)
+				throw new ArgumentNullException ();
+
+			this.namespaceName = namespaceName;
+			this.tagPrefix = tagPrefix;
+		}
+
+		public string NamespaceName {
+			get { return namespaceName; }
+		}
+
+		public string TagPrefix {
+			get { return tagPrefix; }
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/TemplateContainerAttribute.cs b/mcs/class/System.Web/System.Web.UI/TemplateContainerAttribute.cs
new file mode 100755
index 00000000000..854bcf1419e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/TemplateContainerAttribute.cs
@@ -0,0 +1,27 @@
+//
+// System.Web.UI.TemplateContainerAttribute.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Web.UI {
+
+	[AttributeUsage (AttributeTargets.Property)]
+	public sealed class TemplateContainerAttribute : Attribute
+	{
+		Type containerType;
+		
+		public TemplateContainerAttribute (Type containerType)
+		{
+			this.containerType = containerType;
+		}
+
+		public Type ContainerType {
+			get { return containerType; }
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/TemplateControl.cs b/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
new file mode 100755
index 00000000000..c117fcdcf45
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/TemplateControl.cs
@@ -0,0 +1,156 @@
+//
+// System.Web.UI.TemplateControl.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Web.UI {
+
+	public abstract class TemplateControl : Control, INamingContainer
+	{
+		private object abortTransaction = new object ();
+		private object commitTransaction = new object ();
+		private object error = new object ();
+
+		#region Constructor
+		protected TemplateControl ()
+		{
+			Construct ();
+		}
+
+		#endregion
+
+		#region Properties
+
+		protected virtual int AutoHandlers
+		{
+			get { return 0; }
+			set { }
+		}
+
+		protected virtual bool SupportAutoEvents
+		{
+			get { return true; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		protected virtual void Construct ()
+		{
+		}
+
+		[MonoTODO]
+		protected virtual LiteralControl CreateResourceBasedLiteralControl (int offset,
+										    int size,
+										    bool fAsciiOnly)
+		{
+			return null;
+		}
+
+		protected virtual void FrameworkInitialize ()
+		{
+		}
+
+		[MonoTODO]
+		public Control LoadControl (string virtualPath)
+		{
+			return null;
+		}
+
+		[MonoTODO]
+		public ITemplate LoadTemplate (string virtualPath)
+		{
+			return null;
+		}
+
+		protected virtual void OnAbortTransaction (EventArgs e)
+		{
+			EventHandler eh = (EventHandler) Events [error];
+			if (eh != null)
+				eh.Invoke (this, e);
+		}
+
+		protected virtual void OnCommitTransaction (EventArgs e)
+		{
+			EventHandler eh = (EventHandler) Events [commitTransaction];
+			if (eh != null)
+				eh.Invoke (this, e);
+		}
+
+		protected virtual void OnError (EventArgs e)
+		{
+			EventHandler eh = (EventHandler) Events [abortTransaction];
+			if (eh != null)
+				eh.Invoke (this, e);
+		}
+
+		[MonoTODO]
+		public Control ParseControl (string content)
+		{
+			return null;
+		}
+
+		[MonoTODO]
+		public static object ReadStringResource (Type t)
+		{
+			return null;
+		}
+
+		[MonoTODO]
+		protected void SetStringResourcePointer (object stringResourcePointer,
+							 int maxResourceOffset)
+		{
+		}
+
+		[MonoTODO]
+		protected void WriteUTF8ResourceString (HtmlTextWriter output, int offset,
+							int size, bool fAsciiOnly)
+		{
+		}
+
+		#endregion
+
+		#region Events
+
+		public event EventHandler AbortTransaction
+		{
+			add {
+				Events.AddHandler (abortTransaction, value);
+			}
+
+			remove {
+				Events.RemoveHandler (abortTransaction, value);
+			}
+		}
+
+		public event EventHandler CommitTransaction
+		{
+			add {
+				Events.AddHandler (commitTransaction, value);
+			}
+
+			remove {
+				Events.RemoveHandler (commitTransaction, value);
+			}
+		}
+
+		public event EventHandler Error
+		{
+			add {
+				Events.AddHandler (error, value);
+			}
+
+			remove {
+				Events.RemoveHandler (error, value);
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/TemplateControlParser.cs b/mcs/class/System.Web/System.Web.UI/TemplateControlParser.cs
new file mode 100644
index 00000000000..3a4aac8e8d7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/TemplateControlParser.cs
@@ -0,0 +1,28 @@
+//
+// System.Web.UI.TemplateControlParser
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.IO;
+using System.Web.Compilation;
+
+namespace System.Web.UI
+{
+	public abstract class TemplateControlParser : TemplateParser
+	{
+		internal object GetCompiledInstance (string virtualPath, string inputFile, HttpContext context)
+		{
+			InputFile = Path.Combine (MapPath (virtualPath, false), inputFile);
+			Type type = CompileIntoType ();
+			if (type == null)
+				return null;
+
+			return Activator.CreateInstance (type);
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/TemplateParser.cs b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
new file mode 100755
index 00000000000..816fc4f201e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/TemplateParser.cs
@@ -0,0 +1,46 @@
+//
+// System.Web.UI.TemplateParser
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+using System;
+using System.Web;
+
+namespace System.Web.UI
+{
+	public abstract class TemplateParser : BaseParser
+	{
+		private string inputFile;
+		private string text;
+		private Type baseType;
+
+		protected abstract Type CompileIntoType ();
+
+		protected abstract Type DefaultBaseType { get; }
+
+		protected abstract string DefaultDirectiveName { get; }
+
+		internal string InputFile
+		{
+			get { return inputFile; }
+			set { inputFile = value; }
+		}
+
+		internal string Text
+		{
+			get { return text; }
+			set { text = value; }
+		}
+
+		internal Type BaseType
+		{
+			get { return baseType; }
+			set { baseType = value; }
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/ToolboxDataAttribute.cs b/mcs/class/System.Web/System.Web.UI/ToolboxDataAttribute.cs
new file mode 100644
index 00000000000..88bdd66227f
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ToolboxDataAttribute.cs
@@ -0,0 +1,58 @@
+/**

+ * Namespace: System.Web.UI

+ * Class:     ToolboxDataAttribute

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+

+namespace System.Web.UI

+{

+	[AttributeUsage(AttributeTargets.Class)]

+	public sealed class ToolboxDataAttribute : Attribute

+	{

+		public static readonly ToolboxDataAttribute Default = new ToolboxDataAttribute("");

+

+		private string data;

+

+		public ToolboxDataAttribute(string data)

+		{

+			this.data = data;

+		}

+

+		public string Data

+		{

+			get

+			{

+				return data;

+			}

+		}

+

+		public override bool IsDefaultAttribute()

+		{

+			return Default.Equals(this);

+		}

+

+		public override bool Equals(object obj)

+		{

+			if(obj != null && obj is ToolboxDataAttribute)

+			{

+				ToolboxDataAttribute tda = (ToolboxDataAttribute)obj;

+				return (tda.Data == Data);

+			}

+			return false;

+		}

+

+		public override int GetHashCode()

+		{

+			return base.GetHashCode();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI/Triplet.cs b/mcs/class/System.Web/System.Web.UI/Triplet.cs
new file mode 100755
index 00000000000..28c8546c762
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/Triplet.cs
@@ -0,0 +1,36 @@
+//
+// System.Web.UI.Triplet.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Web.UI {
+
+	public class Triplet
+	{
+		public object First;
+		public object Second;
+		public object Third;
+
+		public Triplet ()
+		{
+		}
+
+		public Triplet (object x, object y)
+		{
+			First = x;
+			Second = y;
+		}
+
+		public Triplet (object x, object y, object z)
+		{
+			First = x;
+			Second = y;
+			Third = z;
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.UI/UserControl.cs b/mcs/class/System.Web/System.Web.UI/UserControl.cs
new file mode 100644
index 00000000000..82732d406d1
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/UserControl.cs
@@ -0,0 +1,188 @@
+//
+// System.Web.UI.UserControl
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Web.Caching;
+using System.Web.SessionState;
+
+namespace System.Web.UI
+{
+	public class UserControl : TemplateControl, IAttributeAccessor
+	{
+		private bool initialized;
+		private AttributeCollection attributes;
+		private StateBag attrBag;
+
+		public UserControl ()
+		{
+			//??
+		}
+
+		public HttpApplicationState Application
+		{
+			get {
+				Page p = Page;
+				if (p == null)
+					return null;
+				return p.Application;
+			}
+		}
+
+		private void EnsureAttributes ()
+		{
+			if (attributes == null) {
+				attrBag = new StateBag (true);
+				if (IsTrackingViewState)
+					attrBag.TrackViewState ();
+				attributes = new AttributeCollection (attrBag);
+			}
+		}
+
+		public AttributeCollection Attributes
+		{
+			get {
+				return attributes;
+			}
+		}
+
+		public Cache Cache
+		{
+			get {
+				Page p = Page;
+				if (p == null)
+					return null;
+				return p.Cache;
+			}
+		}
+
+		public bool IsPostBack
+		{
+			get {
+				Page p = Page;
+				if (p == null)
+					return false;
+				return p.IsPostBack;
+			}
+		}
+
+		public HttpRequest Request
+		{
+			get {
+				Page p = Page;
+				if (p == null)
+					return null;
+				return p.Request;
+			}
+		}
+
+		public HttpResponse Response
+		{
+			get {
+				Page p = Page;
+				if (p == null)
+					return null;
+				return p.Response;
+			}
+		}
+
+		public HttpServerUtility Server
+		{
+			get {
+				Page p = Page;
+				if (p == null)
+					return null;
+				return p.Server;
+			}
+		}
+
+		public HttpSessionState Session
+		{
+			get {
+				Page p = Page;
+				if (p == null)
+					return null;
+				return p.Session;
+			}
+		}
+
+		public TraceContext Trace
+		{
+			get {
+				Page p = Page;
+				if (p == null)
+					return null;
+				return p.Trace;
+			}
+		}
+
+		[MonoTODO]
+		public void DesignerInitialize ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void InitializeAsUserControl (Page page)
+		{
+			if (initialized)
+				return;
+			initialized = true;
+			FrameworkInitialize ();
+		}
+
+		[MonoTODO]
+		public string MapPath (string virtualPath)
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected override void LoadViewState (object savedState)
+		{
+			if (savedState != null) {
+				Pair p = (Pair) savedState;
+				base.LoadViewState (p.First);
+				if (p.Second != null) {
+					EnsureAttributes ();
+					attrBag.LoadViewState (p.Second);
+				}
+			}
+
+		}
+
+		protected override void OnInit (EventArgs e)
+		{
+			if (Page != null)
+				InitializeAsUserControl (Page);
+
+			base.OnInit(e);
+		}
+
+		protected override object SaveViewState ()
+		{
+			object baseState = base.SaveViewState();
+			object attrState = null;
+			if (attributes != null)
+				attrState = attrBag.SaveViewState ();
+			if (baseState == null && attrState == null)
+				return null;
+			return new Pair (baseState, attrState);
+		}
+
+		string IAttributeAccessor.GetAttribute (string name)
+		{
+			if (attributes == null)
+				return null;
+			return attributes [name];
+		}
+		
+		void IAttributeAccessor.SetAttribute (string name, string value)
+		{
+			Attributes [name] = value;
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web.UI/Utils.cs b/mcs/class/System.Web/System.Web.UI/Utils.cs
new file mode 100644
index 00000000000..5efb7a7919a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/Utils.cs
@@ -0,0 +1,46 @@
+/**

+ * Namespace: System.Web.UI

+ * Class:     Utils

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer-> gvaish@iitk.ac.in

+ * Implementation: yes

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  ??%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Reflection;

+

+namespace System.Web.UI

+{

+	internal class Utils

+	{

+		internal static object InvokeMethod(MethodInfo info, object obj, object[] parameters)

+		{

+			object retVal = null;

+			try

+			{

+				retVal = info.Invoke(obj, parameters);

+			} catch(TargetInvocationException tie)

+			{

+				throw tie.InnerException;

+			}

+			return retVal;

+		}

+		

+		internal static string GetClientValidatedEvent(Page page)

+		{

+			return "if (typeof(Page_ClientValidate) == 'function') Page_ClientValidate();";

+		}

+		

+		internal static string GetClientValidatedPostBack(Control control)

+		{

+			return (" { if (typeof(Page_ClientValidate) != 'function' || Page_ClientValidate()) " +

+			        control.Page.GetPostBackEventReference(control) +

+			        " } " );

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.UI/ValidationPropertyAttribute.cs b/mcs/class/System.Web/System.Web.UI/ValidationPropertyAttribute.cs
new file mode 100644
index 00000000000..01281a6f002
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ValidationPropertyAttribute.cs
@@ -0,0 +1,27 @@
+//
+// System.Web.UI.ValidationPropertyAttribute.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Web.UI {
+	[AttributeUsage (AttributeTargets.Class)]
+	public sealed class ValidationPropertyAttribute : Attribute
+	{
+		string name;
+
+		public ValidationPropertyAttribute (string name)
+		{
+			this.name = name;
+		}
+
+		public string Name {
+			get { return name; }
+		}
+	}
+}
+ 
diff --git a/mcs/class/System.Web/System.Web.UI/ValidatorCollection.cs b/mcs/class/System.Web/System.Web.UI/ValidatorCollection.cs
new file mode 100755
index 00000000000..eef684a96ab
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.UI/ValidatorCollection.cs
@@ -0,0 +1,69 @@
+//
+// System.Web.UI.ValidatorCollection.cs
+//
+// Authors:
+// 	Duncan Mak  (duncan@ximian.com)
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+
+using System;
+using System.Collections;
+
+namespace System.Web.UI {
+
+	public sealed class ValidatorCollection : ICollection, IEnumerable
+	{
+		private ArrayList _validators;
+
+		public ValidatorCollection ()
+		{
+			_validators = new ArrayList ();
+		}
+
+		public int Count {
+			get { return _validators.Count; }
+		}
+
+		public bool IsReadOnly {
+			get { return _validators.IsReadOnly; }
+		}
+
+		public bool IsSynchronized {
+			get { return _validators.IsSynchronized; }
+		}
+
+		public IValidator this [int index] {
+			get { return (IValidator) _validators [index]; }
+		}
+
+		public object SyncRoot {
+			get { return this; }
+		}
+
+		public void Add (IValidator validator)
+		{
+			_validators.Add (validator);
+		}
+
+		public bool Contains (IValidator validator)
+		{
+			return _validators.Contains (validator);
+		}
+
+		public void CopyTo (Array array, int index)
+		{
+			_validators.CopyTo (array, index);
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return _validators.GetEnumerator ();
+		}
+
+		public void Remove (IValidator validator)
+		{
+			_validators.Remove (validator);
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web.Utils/.cvsignore b/mcs/class/System.Web/System.Web.Utils/.cvsignore
new file mode 100644
index 00000000000..04bc145deea
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/.cvsignore
@@ -0,0 +1 @@
+_*
diff --git a/mcs/class/System.Web/System.Web.Utils/ApacheVersionInfo.cs b/mcs/class/System.Web/System.Web.Utils/ApacheVersionInfo.cs
new file mode 100644
index 00000000000..b166b32b8d5
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/ApacheVersionInfo.cs
@@ -0,0 +1,31 @@
+/**


+ * Namespace: System.Web.Utils

+ * Class:     ApacheVersionInfo

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  ??%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.Utils

+{

+	/// <summary>

+	/// Versions of the modules related to Apache

+	/// </summary>

+	/// <remarks>

+	/// At present I don't know what modules are to be loaded and how

+	/// </remarks>

+	/// <see>

+	/// System.Web.Utils.IISVersionInfo

+	/// </see>

+	internal class ApacheVersionInfo

+	{

+		public ApacheVersionInfo()

+		{

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/ChangeLog b/mcs/class/System.Web/System.Web.Utils/ChangeLog
new file mode 100644
index 00000000000..e027d138da4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/ChangeLog
@@ -0,0 +1,57 @@
+2002-01-03  Nick Drochak  <ndrochak@gol.com>

+

+	* FileChangesMonitor.cs: remove redundant using statement; use int

+	for MAXLEN; capitalize correctly 'WebHashCodeProvider';

+	fix typo rsLock -> rwLock; Change IsRooted to IsPathRooted;

+	set out parameter value where needed

+	* FilePathParser.cs: qualify method GetPathRoot() with 'Path.'

+	* IISVersionInfo.cs: initialize static member to avoid compile error.

+	* WebEqualComparer.cs: static member defC shouldn't be readonly;

+	the string comparer had some typos (fixed)

+	* WebHashCodeProvider.cs: needed System.Globalization; static member

+	defHcp shouldn't be readonly; remove double equal typo.

+

+2002-01-02  Nick Drochak  <ndrochak@gol.com>

+

+	* FileAction.cs: Use 0x7FFFFFFF as enum value for error.  0xFFFFFFFF

+	is too big for Int32.

+	* FileChangeEventHandler.cs: put missing 'void' return type on delegate

+	FileChangeEventHandler()

+	* FileChangedEventArgs.cs: ditto for FileChangedEvent()

+	* NativeFileChangeEventHandler.cs: ditto for NativeFileChangeEventHandler()

+	* FileChangesMonitor.cs: add needed namespaces and comment out imcomplete

+	code.

+

+2001-12-21      Gaurav Vaish <gvaish@iitk.ac.in>

+

+	* ApacheVersionInfo.cs     - Dummy class, for later use.

+        * FileAction.cs:

+        * FileChangeEventHandler.cs:

+        * FileChangeEventArgs.cs:

+        * FileChangesMonitor.cs:

+        * NativeFileChangeEventHandler.cs

+	                           - To be used in System.Web/Http* classes.

+	                             Initially needed for HttpRuntime

+        * IISVersionInfo.cs        - Some useful methods

+

+

+2001-12-17	Gaurav Vaish <gvaish@iitk.ac.in>

+

+	* UrlUtils.cs              - Added functions Combine and Reduce

+

+2001-12-16  Miguel de Icaza  <miguel@ximian.com>

+

+	* DataSourceHelper.cs, UrlUtils.cs: Set the correct namespace. 

+

+2001-11-30

+		Gaurav Vaish <gvaish@iitk.ac.in>

+	* DataSourceHelper.cs      - Resolving DataSource objects

+

+2001-11-09

+		Gaurav Vaish <gvaish@iitk.ac.in>

+	* UrlUtil.cs               - Some basic functions

+

+2001-11-08

+		Gaurav Vaish <gvaish@iitk.ac.in>

+	* Namespace    - Created the namespace for commonly used,

+	                   otherwise not available functions
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web.Utils/DataSourceHelper.cs b/mcs/class/System.Web/System.Web.Utils/DataSourceHelper.cs
new file mode 100644
index 00000000000..35efcfa749d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/DataSourceHelper.cs
@@ -0,0 +1,72 @@
+/**

+ * Namespace: System.Web.UI.Utils

+ * Class:     DataSourceHelper

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Status:  10%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.ComponentModel;

+

+namespace System.Web.Utils

+{

+	internal class DataSourceHelper

+	{

+		public static IEnumerable GetResolvedDataSource(object source, string member)

+		{

+			if(source==null)

+				return null;

+			if(source is IListSource)

+			{

+				IListSource ils = (IListSource)source;

+				IList       il  = ils.GetList();

+				if(ils.ContainsListCollection)

+				{

+					return il;

+				}

+				if(il is ITypedList)

+				{

+					ITypedList itl = (ITypedList)il;

+					PropertyDescriptorCollection pdc = itl.GetItemProperties(new PropertyDescriptor[0]);

+					PropertyDescriptor pd = null;

+					if(pdc != null)

+					{

+						if(pdc.Count > 0)

+						{

+							if(member != null)

+							{

+								if(member.Length > 0)

+								{

+									pd = pdc.Find(member, true);

+								} else

+								{

+									pd = pdc[0];

+								}

+							}

+						}

+					}

+					if(pd!=null)

+					{

+						object o = pd.GetValue(il[0]);

+						if(o!=null)

+						{

+							if(o is IEnumerable)

+								return (IEnumerable)o;

+						}

+						throw new HttpException("ListSource Empty"); // no data in ListSource object

+					}

+				}

+			} else if(source is IEnumerable)

+			{

+				return (IEnumerable)source;

+			}

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/FileAction.cs b/mcs/class/System.Web/System.Web.Utils/FileAction.cs
new file mode 100644
index 00000000000..7de90d2aead
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/FileAction.cs
@@ -0,0 +1,26 @@
+/**

+ * Namespace: System.Web.Utils

+ * Class:     FileAction

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  ??%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.Utils

+{

+	public enum FileAction

+	{

+		Overwhleming,

+		Added,

+		Removed,

+		Modifiled,

+		RenamedOldName,

+		RenamedNewName,

+		Error = 0x7FFFFFFF

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/FileChangeEventHandler.cs b/mcs/class/System.Web/System.Web.Utils/FileChangeEventHandler.cs
new file mode 100644
index 00000000000..e202fbcb503
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/FileChangeEventHandler.cs
@@ -0,0 +1,17 @@
+/**

+ * Namespace: System.Web.Utils

+ * Class:     FileChangeEventHandler

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.Utils

+{

+	public delegate void FileChangeEventHandler(object sender, int method);

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/FileChangedEventArgs.cs b/mcs/class/System.Web/System.Web.Utils/FileChangedEventArgs.cs
new file mode 100644
index 00000000000..909711dbbe2
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/FileChangedEventArgs.cs
@@ -0,0 +1,43 @@
+/**

+ * Namespace: System.Web.Utils

+ * Class:     FileChangedEventArgs

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  ??%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.Utils

+{

+	internal class FileChangedEventArgs : EventArgs

+	{

+		private string filename;

+		private FileAction action;

+

+		public void FileChangedEvent(FileAction action, string file)

+		{

+			this.action = action;

+			this.filename = file;

+		}

+

+		public string FileName

+		{

+			get

+			{

+				return filename;

+			}

+		}

+

+		public FileAction Action

+		{

+			get

+			{

+				return action;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/FileChangesMonitor.cs b/mcs/class/System.Web/System.Web.Utils/FileChangesMonitor.cs
new file mode 100644
index 00000000000..7d288ca0515
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/FileChangesMonitor.cs
@@ -0,0 +1,62 @@
+/**

+ * 

+ * Namespace: System.Web.Utils

+ * Class:     FileChangesMonitor

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  ??%

+ *

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.IO;

+using System.Web;

+using System.Runtime.InteropServices;

+using System.Collections;

+using System.Threading;

+

+namespace System.Web.Utils

+{

+	internal class FileChangesMonitor

+	{

+		private static string BIN    = "bin";

+		private static string BINDIR = "bin/";

+		private static int MAXLEN = 260;

+		

+		private FileChangeEventHandler       cbRename;

+		private NativeFileChangeEventHandler cbSubDirs;

+		

+		private int       monitoredSubdirs;

+		private string    rootDir;

+		private Hashtable allDirs;

+		private GCHandle  rootcbSubDirs;

+		

+		private ReaderWriterLock rwLock;

+		

+		public FileChangesMonitor()

+		{

+			allDirs = new Hashtable(WebHashCodeProvider.Default, WebEqualComparer.Default);

+			rwLock  = new ReaderWriterLock();

+		}

+		

+		/// <param name="file">Name of the file</param>

+		/// <param name="mTime">Last modification date</param>

+		/// <param name="length">Legnth of the file</param>

+		[MonoTODO]

+		public void GetFileAttributes(string file, out DateTime mTime, long length)

+		{

+			if(!Path.IsPathRooted(file))

+			{

+				throw new HttpException(HttpRuntime.FormatResourceString("Path_must_be_rooted"));

+			}

+			// TODO: finish this

+			mTime = DateTime.Now;

+			throw new NotImplementedException();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/FilePathParser.cs b/mcs/class/System.Web/System.Web.Utils/FilePathParser.cs
new file mode 100644
index 00000000000..25bd7740a98
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/FilePathParser.cs
@@ -0,0 +1,82 @@
+/**

+ * Namespace: System.Web.Utils

+ * Class:     FilePathParser

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  ??%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+using System.IO;

+

+namespace System.Web.Utils

+{

+	internal class FilePathParser

+	{

+		private static char[] pathSeparators = {

+			Path.DirectorySeparatorChar,

+			Path.AltDirectorySeparatorChar

+		};

+		

+		private string dirName;

+		private string fileName;

+		private string shortDirName;

+		private string shortFileName;

+		

+		private bool   exists;

+		

+		[MonoTODO]

+		public FilePathParser(string path, bool isFile, bool getShortNames)

+		{

+			path = path.Trim();

+			if(Path.GetPathRoot(path).Length < path.Length)

+			{

+				path = path.TrimEnd(pathSeparators);

+			}

+			if(!isFile)

+			{

+				dirName = GetBaseDirOrRoot(path);

+			} else

+			{

+				dirName = path;

+			}

+			if(getShortNames)

+			{

+				if(!Directory.Exists(dirName))

+				{

+					dirName = null;

+					return;

+				}

+				shortDirName = GetShortPathName(dirName);

+				if(shortDirName==null)

+				{

+					dirName = null;

+					return;

+				}

+				if(shortDirName == dirName)

+				{

+					shortDirName = null;

+				} else

+				{

+					throw new NotImplementedException();

+				}

+			}

+		}

+		

+		public static string GetBaseDirOrRoot(string file)

+		{

+			string bDir = Path.GetDirectoryName(file);

+			return ( bDir!=null ? bDir : Path.GetPathRoot(file));

+		}

+		

+		[MonoTODO("Native_Call_Required")]

+		public static string GetShortPathName(string path)

+		{

+			//TODO: Native calls required, it's in kernel32.dll for windows

+			throw new NotImplementedException();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/IISVersionInfo.cs b/mcs/class/System.Web/System.Web.Utils/IISVersionInfo.cs
new file mode 100644
index 00000000000..fce89988b12
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/IISVersionInfo.cs
@@ -0,0 +1,110 @@
+/**

+

+ * Namespace: System.Web.Utils

+ * Class:     IISVersionInfo

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  ??%

+

+ *

+

+ * (C) Gaurav Vaish (2001)

+

+ */

+

+

+using System;

+using System.Diagnostics;

+using System.Web;

+using System.Web.Utils;

+

+namespace System.Web.Utils

+{

+	//FIXME: This is highly Windows/IIS specific code. What about Apache related stuff?

+	internal class IISVersionInfo

+	{

+		private static string isapiVersion;

+		private static string mscoreeVersion;

+		private static string systemWebVersion;

+

+		private static readonly object lockObj = null;

+

+		public IISVersionInfo()

+		{

+		}

+		

+		internal static string IsapiVersion

+		{

+			get

+			{

+				if(isapiVersion==null)

+				{

+					lock(lockObj)

+					{

+						// Recheck - another thread may have set the value

+						// before entering lock / exiting previous lock

+						if(isapiVersion==null)

+						{

+							//FIXME: What about Apache? What dll/shared-object to be loaded?

+							isapiVersion = GetLoadedModuleVersion("aspnet_isapi.dll");

+						}

+					}

+				}

+				return isapiVersion;

+			}

+		}

+		

+		internal static string ClrVersion

+		{

+			get

+			{

+				if(mscoreeVersion==null)

+				{

+					lock(lockObj)

+					{

+						if(mscoreeVersion==null)

+						{

+							mscoreeVersion = GetLoadedModuleVersion("mscorlib.dll");

+						}

+					}

+				}

+				return mscoreeVersion;

+			}

+		}

+		

+		internal static string SystemWebVersion

+		{

+			get

+			{

+				if(systemWebVersion == null)

+				{

+					lock(lockObj)

+					{

+						if(systemWebVersion==null)

+						{

+							systemWebVersion = (FileVersionInfo.GetVersionInfo((typeof(HttpRuntime)).Module.FullyQualifiedName)).FileVersion;

+						}

+					}

+				}

+				return systemWebVersion;

+			}

+		}

+				

+		[MonoTODO]

+		internal static string GetLoadedModuleVersion(string modulename)

+		{

+			//TODO: Load the version information from the module

+			// Needs native calls - which ones, since the module will not be .Net aware

+			throw new NotImplementedException();

+		}

+		

+		[MonoTODO]

+		internal static string GetLoadedModuleFilename(string modulename)

+		{

+			throw new NotImplementedException();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/NativeFileChangeEventHandler.cs b/mcs/class/System.Web/System.Web.Utils/NativeFileChangeEventHandler.cs
new file mode 100644
index 00000000000..6047a52688b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/NativeFileChangeEventHandler.cs
@@ -0,0 +1,17 @@
+/**

+ * Namespace: System.Web.Utils

+ * Class:     NativeFileChangeEventHandler

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+namespace System.Web.Utils

+{

+	public delegate void NativeFileChangeEventHandler(object sender, int method);

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/UrlUtils.cs b/mcs/class/System.Web/System.Web.Utils/UrlUtils.cs
new file mode 100644
index 00000000000..5da94a47ac6
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/UrlUtils.cs
@@ -0,0 +1,283 @@
+/**

+ * Namespace: System.Web.UI.Utils

+ * Class:     UrlUtils

+ * 

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Status:  ??%

+ * 

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Collections;

+using System.Text;

+

+namespace System.Web.Utils

+{

+	internal class UrlUtils

+	{

+		/*

+		 * I could not find these functions in the class System.Uri

+		 * Besides, an instance of Uri will not be formed until and unless the address is of

+		 * the form protocol://[user:pass]host[:port]/[fullpath]

+		 * ie, a protocol, and that too without any blanks before,

+		 * is a must which may not be the case here.

+		 * Important: Escaped URL is assumed here. nothing like .aspx?path=/something

+		 * It should be .aspx?path=%2Fsomething

+		 */

+		public static string GetProtocol(string url)

+		{

+			//Taking code from Java Class java.net.URL

+			if(url!=null)

+			{

+				if(url.Length>0)

+				{

+					

+					int i, start = 0, limit;

+					limit = url.Length;

+					char c;

+					bool aRef = false;

+					while( (limit > 0) && (url[limit-1] <= ' '))

+					{

+						limit --;

+					}

+					while( (start < limit) && (url[start] <= ' '))

+					{

+						start++;

+					}

+					if(RegionMatches(true, url, start, "url:", 0, 4))

+					{

+						start += 4;

+					}

+					if(start < url.Length && url[start]=='#')

+					{

+						aRef = true;

+					}

+					for(i = start; !aRef && (i < limit) && ((c=url[i]) != '/'); i++)

+					{

+						if(c==':')

+						{

+							return url.Substring(start, i - start);

+						}

+					}

+				}

+			}

+			return String.Empty;

+		}

+		

+		public static bool IsRelativeUrl(string url)

+		{

+			if(url.IndexOf(':') != -1)

+				return !IsRootUrl(url);

+			return true;

+		}

+

+		public static bool IsRootUrl(string url)

+		{

+			if(url!=null)

+			{

+				if(url.Length>0)

+				{

+					return IsValidProtocol(GetProtocol(url).ToLower());

+				}

+			}

+			return true;

+		}

+		

+		public static bool IsRooted(string path)

+		{

+			if(path!=null && path.Length > 0)

+			{

+				return (path[0]=='/' || path[0]=='\\');

+			}

+			return false;

+		}

+		

+		public static void FailIfPhysicalPath(string path)

+		{

+			if(path!= null && path.Length > 0)

+			{

+				if(path[0]==':' || path.StartsWith(@"\\"))

+					throw new HttpException(HttpRuntime.FormatResourceString("Physical_path_not_allowed", path));

+			}

+		}

+		

+		public static string Combine(string basePath, string relPath)

+		{

+			FailIfPhysicalPath(relPath);

+			if(IsRootUrl(relPath))

+			{

+				if(relPath != null && relPath.Length > 0)

+				{

+					return Reduce(relPath);

+				}

+				return String.Empty;

+			}

+			if(relPath.Length < 3 || relPath[0]!='~' || (relPath[0]!='/' && relPath[0]!='\\'))

+			{

+				if(basePath==null || basePath.Length==1 || basePath[0]=='/')

+					basePath = String.Empty;

+				return Reduce(basePath + "/" + relPath);

+			}

+			string vPath = HttpRuntime.AppDomainAppVirtualPath;

+			if(vPath.Length <= 1)

+				vPath = String.Empty;

+			return Reduce(vPath + "/" + relPath.Substring(2));

+		}

+		

+		public static bool IsValidProtocol(string protocol)

+		{

+			if(protocol.Length < 1)

+				return false;

+			char c = protocol[0];

+			if(!Char.IsLetter(c))

+			{

+				return false;

+			}

+			for(int i=1; i < protocol.Length; i++)

+			{

+				c = protocol[i];

+				if(!Char.IsLetterOrDigit(c) && c!='.' && c!='+' && c!='-')

+				{

+					return false;

+				}

+			}

+			return true;

+		}

+		

+		/*

+		 * MakeRelative("http://www.foo.com/bar1/bar2/file","http://www.foo.com/bar1")

+		 * will return "bar2/file"

+		 * while MakeRelative("http://www.foo.com/bar1/...","http://www.anotherfoo.com")

+		 * return 'null' and so does the call

+		 * MakeRelative("http://www.foo.com/bar1/bar2","http://www.foo.com/bar")

+		 */

+		public static string MakeRelative(string fullUrl, string relativeTo)

+		{

+			if(fullUrl==relativeTo)

+			{

+				return String.Empty;

+			}

+			if(fullUrl.IndexOf(relativeTo)!=0)

+			{

+				return null;

+			}

+			string leftOver = fullUrl.Substring(relativeTo.Length);

+			if(!fullUrl.EndsWith("/") && !leftOver.StartsWith("/"))

+			{

+				return null;

+			}

+			if(leftOver.StartsWith("/"))

+			{

+				leftOver = leftOver.Substring(1);

+			}

+			return leftOver;

+		}

+		

+		/*

+		 * Check JavaDocs for java.lang.String#RegionMatches(bool, int, String, int, int)

+		 * Could not find anything similar in the System.String class

+		 */

+		public static bool RegionMatches(bool ignoreCase, string source, int start, string match, int offset, int len)

+		{

+			if(source!=null || match!=null)

+			{

+				if(source.Length>0 && match.Length>0)

+				{

+					char[] ta = source.ToCharArray();

+					char[] pa = match.ToCharArray();

+					if((offset < 0) || (start < 0) || (start > (source.Length - len)) || (offset > (match.Length - len)))

+					{

+						return false;

+					}

+					while(len-- > 0)

+					{

+						char c1 = ta[start++];

+						char c2 = pa[offset++];

+						if(c1==c2)

+							continue;

+						if(ignoreCase)

+						{

+							if(Char.ToUpper(c1)==Char.ToUpper(c2))

+								continue;

+							// Check for Gregorian Calendar where the above may not hold good

+							if(Char.ToLower(c1)==Char.ToLower(c2))

+								continue;

+						}

+						return false;

+					}

+					return true;

+				}

+			}

+			return false;

+		}

+

+		public static string Reduce(string path)

+		{

+			int len = path.Length;

+			int dotIndex = -1;

+			path = path.Replace('\\','/');

+			while(true)

+			{

+				dotIndex++;

+				dotIndex = path.IndexOf('.', dotIndex);

+				if(dotIndex < 0)

+				{

+					return path;

+				}

+				if(dotIndex != 0 && path[dotIndex -1]=='/')

+					continue;

+				if(dotIndex+1 == len || path[dotIndex+1]=='/')

+					break;

+				if(path[dotIndex+1]=='.')

+					continue;

+				if(dotIndex+2 == len || path[dotIndex+2]=='/')

+					break;

+			}

+			ArrayList list = new ArrayList();

+			StringBuilder sb = new StringBuilder();

+			dotIndex = 0;

+			int temp;

+			do

+			{

+				temp = dotIndex;

+				dotIndex = path.IndexOf('/', temp + 1);

+				if(dotIndex < 0)

+					dotIndex = len;

+				if( (dotIndex - temp) <= 3 && (dotIndex < 1 || path[dotIndex - 1]== '.') && ( (temp+1) >= len || path[temp+1]=='.') )

+				{

+					if(dotIndex - temp == 3)

+						continue;

+					if(list.Count == 0)

+						throw new System.Web.HttpException(System.Web.HttpRuntime.FormatResourceString("Cannot_exit_up_top_directory"));

+					sb.Length = (int) list[list.Count - 1];

+					list.RemoveRange(list.Count - 1, 1);

+					continue;

+				}

+				list.Add(sb.Length);

+				sb.Append(path, temp, dotIndex - temp);

+			} while(dotIndex != len);

+			return sb.ToString();

+		}

+		

+		public static string GetDirectory(string url)

+		{

+			if(url==null)

+			{

+				return null;

+			}

+			if(url.Length==0)

+			{

+				return String.Empty;

+			}

+			url.Replace('\\','/');

+			string baseDir = url.Substring(0, url.LastIndexOf('/'));

+			if(baseDir.Length==0)

+			{

+				baseDir = "/";

+			}

+			return baseDir;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/WebEqualComparer.cs b/mcs/class/System.Web/System.Web.Utils/WebEqualComparer.cs
new file mode 100644
index 00000000000..ee570dd34c6
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/WebEqualComparer.cs
@@ -0,0 +1,107 @@
+/**

+ * Namespace: System.Web.Utils

+ * Class:     WebEqualComparer

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  ??%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.Globalization;

+using System.Collections;

+

+namespace System.Web.Utils

+{

+	public class WebEqualComparer : IComparer

+	{

+		private static IComparer defC;

+

+		public WebEqualComparer()

+		{

+		}

+

+		public static IComparer Default

+		{

+			get

+			{

+				if(defC == null)

+				{

+					defC = new WebEqualComparer();

+				}

+				return defC;

+			}

+		}

+

+		/// <summary>

+		/// To compare two strings

+		/// </summary>

+		/// <remarks>

+		/// Cannot apply String.Compare(..) since I am at web

+		/// </remarks>

+		int IComparer.Compare(object left, object right)

+		{

+			string leftStr, rightStr;

+			leftStr = null;

+			rightStr = null;

+			if(left is string)

+			{

+				leftStr = (string)left;

+			}

+			if(right is string)

+			{

+				rightStr = (string)right;

+			}

+

+			if(leftStr==null || rightStr==null)

+			{

+				throw new ArgumentException();

+			}

+

+			int ll = leftStr.Length;

+			int lr = rightStr.Length;

+			if(ll==0 && lr==0)

+			{

+				return 0;

+			}

+

+			if(ll==0 || lr==0)

+			{

+				return ( (ll > 0) ? 1 : -1);

+			}

+

+			char cl,cr;

+			int i=0;

+			for(i=0; i < leftStr.Length; i++)

+			{

+				if(i==lr)

+				{

+					return 1;

+				}

+				cl = leftStr[i];

+				cr = leftStr[i];

+				if(cl==cr)

+				{

+					continue;

+				}

+				UnicodeCategory ucl = Char.GetUnicodeCategory(cl);

+				UnicodeCategory ucr = Char.GetUnicodeCategory(cr);

+				if(ucl==ucr)

+				{

+					return ( (cl > cr) ? 1 : -1 );

+				}

+				cl = Char.ToLower(cl);

+				cr = Char.ToLower(cr);

+				if(cl!=cr)

+				{

+					return ( (cl > cr) ? 1 : -1);

+				}

+			}

+			return ( (i==lr) ? 0 : -1 );

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.Utils/WebHashCodeProvider.cs b/mcs/class/System.Web/System.Web.Utils/WebHashCodeProvider.cs
new file mode 100644
index 00000000000..a2db4a4577f
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.Utils/WebHashCodeProvider.cs
@@ -0,0 +1,54 @@
+/**

+

+ * Namespace: System.Web.Utils

+ * Class:     WebHashCodeProvider

+ *

+

+ * Author:  Gaurav Vaish

+

+ * Maintainer: gvaish@iitk.ac.in

+

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+

+ * Implementation: yes

+

+ * Status:  ??%

+

+ *

+

+ * (C) Gaurav Vaish (2001)

+

+ */

+

+

+using System.Collections;

+using System.Globalization;

+

+namespace System.Web.Utils

+{

+	public class WebHashCodeProvider : IHashCodeProvider

+	{

+		private static IHashCodeProvider defHcp;

+

+		public WebHashCodeProvider()

+		{

+		}

+		

+		int IHashCodeProvider.GetHashCode(object key)

+		{

+			return Default.GetHashCode(key);

+		}

+

+		public static IHashCodeProvider Default

+		{

+			get

+			{

+				if(defHcp==null)

+				{

+					 defHcp = new CaseInsensitiveHashCodeProvider(CultureInfo.InvariantCulture);

+				}

+				return defHcp;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web.build b/mcs/class/System.Web/System.Web.build
new file mode 100644
index 00000000000..646469ccf5e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web.build
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.Web.dll -->
+
+<project name="System" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<mkdir dir="../lib"/>
+		<csc target="library" output="../lib/System.Web.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/nowarn:0169"/>
+			<arg value="/nowarn:0649"/> <!-- always default value -->
+			<arg value="/nowarn:0067"/> <!-- event never used -->
+			<arg value="/nowarn:0679"/> <!-- internal virual -->
+			<arg value="/nowarn:0168"/> <!-- never used variable -->
+			<arg value="/nowarn:0162"/> <!-- unreachable code -->
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>
+			<arg value="/debug"/>
+			<arg value="/r:System.dll"/>
+			<arg value="/r:System.Drawing.dll"/>
+			<arg value="/r:System.Xml.dll"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/>
+				<!--<excludes name="System.Web.Hosting/ISAPIRuntime.cs"/>-->
+				<!--<excludes name="System.Web.Hosting/IISAPIRuntime.cs"/>-->
+				<!--<excludes name="System.Web.Hosting/IAppDomainFactory.cs"/>-->
+				<!--<excludes name="System.Web.Hosting/AppDomainFactory.cs"/>-->
+				<!--<excludes name="System.Web.UI/**"/>-->
+				<!--<excludes name="System.Web.UI.HtmlControls/**"/>-->
+				<!--<excludes name="System.Web.UI.WebControls/**"/>-->
+			</sources>
+		</csc>
+	</target>
+</project>
diff --git a/mcs/class/System.Web/System.Web/.cvsignore b/mcs/class/System.Web/System.Web/.cvsignore
new file mode 100644
index 00000000000..04bc145deea
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/.cvsignore
@@ -0,0 +1 @@
+_*
diff --git a/mcs/class/System.Web/System.Web/BeginEventHandler.cs b/mcs/class/System.Web/System.Web/BeginEventHandler.cs
new file mode 100644
index 00000000000..c2bd1ac2782
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/BeginEventHandler.cs
@@ -0,0 +1,16 @@
+//
+// System.Web.BeginEventHandler.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+namespace System.Web
+{
+        public delegate IAsyncResult BeginEventHandler(object sender,
+                                                       EventArgs e,
+                                                       AsyncCallback cb,
+                                                       object extraData);
+}
diff --git a/mcs/class/System.Web/System.Web/ChangeLog b/mcs/class/System.Web/System.Web/ChangeLog
new file mode 100644
index 00000000000..6d65b9c5a06
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/ChangeLog
@@ -0,0 +1,298 @@
+2002-08-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpContext.cs: reformatted.
+	* HttpStaticObjectsCollection.cs: implemented GetEnumertor, CopyTo and
+	the indexer.
+
+2002-08-05  Patrik Torstensson <ptorsten@hotmail.com>
+
+	* HttpApplication.cs: Implemented a state machine to allow handling of
+	HttpModules and HttpHandlers. Implementation of async handlers. 
+								 
+	* HttpApplicationFactory.cs: Factory for creating HttpApplication
+	instances, including caching.
+	
+	* HttpRuntime.cs: Usage of the new HttpApplicationFactory to get a
+	application instance to execute requests in and implementation of 
+	request execution (still no request queue). 
+							 
+	* HttpAsyncResult.cs: New file to handle async module results.						
+							 
+	* HttpRequest.cs: Change signature of Dispose
+	* HttpResponse.cs: new internal method allowing filtering to happen
+	during the request flow in the state machine.
+
+2002-07-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpApplication.cs: events were not being initialized.
+
+2002-07-25  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ProcessModelInfo.cs: fixed compilation.
+
+2002-07-25  Tim Coleman <tim@timcoleman.com>
+	* ProcessModelInfo.cs:
+		New class added
+	* HttpParseException.cs:
+	* HttpCompileException.cs:
+	* HttpUnhandledException.cs:
+		Internal constructors added to these
+
+2002-07-24  Tim Coleman <tim@timcoleman.com>
+	* ProcessInfo.cs: 
+		Fix constructor, reference to shutdownreason.
+
+2002-07-24  Tim Coleman <tim@timcoleman.com>
+	* HttpCachePolicy.cs:
+		Added stubbs to this class.
+	* HttpCacheability.cs:
+	* HttpCacheRevalidation.cs:
+	* HttpValidationStatus.cs:
+	* ProcessShutdownReason.cs:
+	* ProcessStatus.cs:
+	* TraceMode.cs:
+		Reorder the enumerations (and in some cases make
+		one-based) in order to agree with the .NET 
+		implementation, based on the class status page.
+	* ProcessInfo.cs:
+		Implementation of this class.
+
+2002-07-23  Tim Coleman <tim@timcoleman.com>
+	* HttpCompileException.cs:
+	* HttpParseException.cs:
+	* HttpUnhandledException.cs:
+		New stubbs created.
+	* HttpApplication.cs:
+	* HttpBrowserCapabilities.cs:
+		Added missing methods stubbs and attributes based
+		on the class status page.  Also reformatted some
+		source for consistency.
+
+2002-07-23  Tim Coleman <tim@timcoleman.com>
+	* HttpUtility.cs: Moved entities hashtable into main
+		class as a static object, so we don't instantiate
+		a new one every time.  Also put the hashtable
+		building into a lock block.
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* HttpUtility.cs: Cleanup of the code, implementation
+		of HtmlDecode/HtmlEncode functions
+
+2002-07-14  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpResponse.cs: quick&dirty hack to make redirection work. Should
+	be out of there once we have SimpleWorkerRequest.
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpUtility.cs: little typo, big headache.
+
+2002-07-10  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpRuntime.cs: don't throw NotImplemented in a couple of methods.
+
+2002-06-30  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Web/HttpResponse.cs: 
+
+	Fixes based on class status page:
+	
+		- Add attributes (DefaultEvent, ParseChildren).
+		- Fix declarations.
+		- Explicitly implement some interfaces (IPostBackDataHandler
+		and IPostBackEventHandler).
+		- Implemented some missing methods.
+
+2002-06-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpContext.cs:
+	(Session): return null instead of throwing an exception.
+
+	* HttpRequest.cs:
+	(HttpMethod): return RequestType if not set.
+	(GetRawContent): return QueryString if we don't have a
+	HttpWorkerRequest.
+
+	* HttpUtility.cs: fixed Decode and Encode.
+
+2002-06-25  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpApplication.cs:
+	* HttpContext.cs: added System.Web.SessionState namespace.
+
+	* HttpSessionState.cs: removed. It is under
+	System.Web.SessionState.
+
+2002-06-10  Duncan Mak  <duncan@ximian.com>
+
+	* HttpBrowserCapabilities.cs (BackgroundSounds): Fixed typo.
+
+2002-06-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpRequest.cs: implemented Browser property.
+
+2002-06-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HttpBrowserCapabilities.cs: stubbed out.
+
+2002-05-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* HttpRuntime.cs: Reformat file.
+
+2002-05-07  Duncan Mak  <duncan@ximian.com>
+
+	* HttpBrowserCapabilities.cs: Added, replacing
+	HttpBrowserCapabilites because of typo.
+
+	* HttpBrowserCapabilites.cs: Removed, replaced by above.
+
+	* HttpRequest.cs (Browser): Fixed typo.
+
+2002-04-12  Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* HttpApplication.cs: Minor updates
+	* HttpApplicationState.cs: Ready.
+	* HttpClientCertificate.cs: Signature updates
+	* HttpValueCollection.cs: ready
+	* HttpStaticObjectsCollection.cs: ready
+	* HttpResponseHeader.cs: made internal only
+	* HttpResponse.cs: Signature updates
+	* HttpPostedFile.cs: ready
+	* HttpCacheVaryByHeaders.cs: ready (except communication to policy)
+	* HttpCacheVaryByParams.cs: ready (except communication to policy)
+	
+	System.Web is now over 60% ready.. 
+
+2002-04-11  Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* HttpException.cs: 95% ready, only windows dependent code left
+	* HttpFileCollection.cs: Finished.
+	* HttpRequest.cs: Minor fixes and fixed signature problems
+	* HttpResponse.cs: Implementation of missing methods and signature problems
+	* HttpResponseHeader.cs: Fixed signature problems
+	* HttpRuntime.cs: Fixed signature problems
+	* HttpServerUtility.cs: Added support for HttpApplication
+	* HttpSessionState.cs: Fixed signature issues
+	* HttpUtility.cs: fixed signature issues
+	* HttpValueCollection.cs: Support for cookie parsing and fixed signature issues
+	* HttpWorkerRequest.cs: Fixed small signature issue
+	* HttpWriter.cs: Fixed signature issue
+	* HttpApplication.cs: Basic implementation
+	* HttpApplicationState.cs: Small fixes to support major change comming up
+	* HttpBrowserCapabilities.cs: Added Type method
+	* HttpClientCertificate.cs: Almost ready, needs to parse certificate.
+	* HttpContext.cs: Fixed signature issues and added last methods.
+	* HttpCookie.cs: Full implementation
+	* HttpCookieCollection.cs: Full implementation
+	* TraceContext.cs: Methods implemented.
+	* HttpPostedFile.cs: Placeholder
+	* HttpStaticObjectsCollection.cs: Placeholder
+	* HttpModuleCollection.cs: Ready, will be used during the major revamp.
+	
+	* Fixed a number of other small signature problems also (class status page)
+	
+	
+2002-04-10  Patrik Torstensson <patrik.torstensson@labs2.com>
+
+    * HttpWorkerRequest.EndOfSendNotification.cs Removed (included in WorkerRequest)
+    * Checkin of all new files (noted in last changenote)
+
+2002-04-10  Patrik Torstensson <patrik.torstensson@labs2.com>
+
+    * HttpContext.cs: First implementation (basic support, few methods left to impl)
+    * HttpException.cs: Partial implementation (basic support)
+    * HttpHelper.cs: Header parse helper, used by runtime (non public)
+    * HttpRequest.cs: Implementation (all methods there, not all fully impl)
+    * HttpRequestStream.cs: Full implementation
+    * HttpResponse.cs: Partial implementation(almost all methods)
+    * HttpResponseHeader.cs: Header helper
+    * HttpResponseStream.cs: Full implementation - Response stream support
+    * HttpResponseStreamProxy.cs: Implementation - filter support
+    * HttpRuntime.cs: Rewrite to support one IHttpModule (use for testing the runtime)
+	* HttpServerUtility.cs: Implemented usage of HttpContext for methods
+	                        and moved encoding functions to HttpUtility.
+
+    * HttpUtility.cs: Added encoding/decoding functions from HttpServerUtility and
+                      added the Attribute encoding functions.
+
+    * HttpValueCollection.cs: Implementation.
+    * HttpWorkerRequest.cs: Rewrite and implementation of all methods (ready)
+    * HttpWriter.cs: Implementation (with filter support)    
+
+    * HttpFileCollection: Added dummy class (placeholder)
+    * HttpApplication.cs: Added dummy class (placeholder)
+    * HttpApplicationState.cs: Added dummy class (placeholder)
+    * HttpBrowserCapabilities.cs: Added dummy class (placeholder)
+    * HtttpCachePolicy.cs: Added dummy class (placeholder)
+    * HttpClientCertificate.cs: Added dummy class (placeholder)
+    * HttpSessionState.cs: Added dummy class (placeholder)
+    * TraceContext.cs: Added dummy class (placeholder)
+    
+
+2002/04/10  Nick Drochak <ndrochak@gol.com>
+
+	* HttpServerUtility.cs: Fix build breaker.
+
+2002-03-28  Wictor Wilén  <wictor@iBizkit.se>
+
+	* HttpServerUtils.cs : Added some more functionality
+	
+2002-03-28  Martin Baulig  <martin@gnome.org>
+
+	* HttpServerUtils.cs (UrlDecode): You cannot implicitly cast a
+	char to a string, use ToString() instead.
+
+2002-03-16  Gaurav Vaish  <gavish@iitk.ac.in>
+
+	* WebCategoryAttribute.cs
+	                       : Added private attribute.
+
+2002-03-16  Gaurav Vaish  <gavish@iitk.ac.in>
+
+	* HttpRuntime.cs       : Stubbed methods for
+	          FormatStringResource(...) in agreement with the various
+	          overloads available at String.Format(...)
+
+2002-01-08  Gaurav Vaish  <gavish@iitk.ac.in>
+
+	* TODOAttribute.cs     : Added, as an internal class to the assembly
+
+2002-01-03  Nick Drochak  <ndrochak@gol.com>
+
+	* HttpRuntime.cs: remove uneeded exception variable from catch and
+	initialize remaining instance members to avoid compile warnings
+
+2002-01-02  Nick Drochak  <ndrochak@gol.com>
+
+	* HttpRuntime.cs: fix spelling error/variable name change.
+
+2001-12-18  Gaurav Vaish <gvaish@iitk.ac.in>
+
+        * HttpRuntime.cs       : Initial implementation
+
+2001-08-29  Bob Smith  <bob@thestuff.net>
+
+        * HttpWorkerRequest.cs: Partial Implementation.
+
+2001-08-16  Bob Smith  <bob@thestuff.net>
+
+         * HttpCookieCollection.cs, HttpCookie.cs: Bug fixes.
+
+2001-08-09  Bob Smith  <bob@thestuff.net>
+
+         * BeginEventHandler.cs: Implemented.
+         * EndEventHandler.cs: Implemented.
+         * HttpCacheability.cs: Implemented.
+         * HttpCacheRevalidation.cs: Implemented.
+         * HttpCacheValidateHandler.cs: Implemented.
+         * HttpCookieCollection.cs: Implemented.
+         * HttpCookie.cs: Implemented.
+         * HttpValidationStatus.cs: Implemented.
+         * HttpWorkerRequest.EndOfSendNotification.cs: Implemented.
+         * IHttpAsyncHandler.cs: Implemented.
+         * IHttpHandler.cs: Implemented.
+         * IHttpHandlerFactory.cs: Implemented.
+         * IHttpModule.cs: Implemented.
+         * ProcessShutdownReason.cs: Implemented.
+         * ProcessStatus.cs: Implemented.
+         * TraceMode.cs: Implemented.
diff --git a/mcs/class/System.Web/System.Web/EndEventHandler.cs b/mcs/class/System.Web/System.Web/EndEventHandler.cs
new file mode 100644
index 00000000000..cd7a51c222a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/EndEventHandler.cs
@@ -0,0 +1,13 @@
+//
+// System.Web.EndEventHandler.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+namespace System.Web
+{
+        public delegate void EndEventHandler(IAsyncResult ar);
+}
diff --git a/mcs/class/System.Web/System.Web/HttpApplication.cs b/mcs/class/System.Web/System.Web/HttpApplication.cs
new file mode 100644
index 00000000000..1d09c093886
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpApplication.cs
@@ -0,0 +1,967 @@
+// 

+// System.Web.HttpApplication

+//

+// Author:

+//   Patrik Torstensson (ptorsten@hotmail.com)

+// 	Tim Coleman (tim@timcoleman.com)

+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)

+//

+using System;

+using System.Collections;

+using System.ComponentModel;

+using System.Threading;

+using System.Security.Principal;

+using System.Runtime.Remoting.Messaging;

+using System.Web;

+using System.Web.Configuration;

+using System.Web.SessionState;

+

+namespace System.Web {

+	[ToolboxItem(true)]

+	[MonoTODO()]

+   public class HttpApplication : IHttpAsyncHandler, IHttpHandler, IComponent, IDisposable {

+

+		#region Event Handlers

+

+		// Async event holders

+		AsyncEvents _acquireRequestStateAsync;

+		AsyncEvents _authenticateRequestAsync;

+		AsyncEvents _endRequestAsync;

+		AsyncEvents _beginRequestAsync;

+		AsyncEvents _authorizeRequestAsync;

+		AsyncEvents _updateRequestCacheAsync;

+		AsyncEvents _resolveRequestCacheAsync;

+		AsyncEvents _releaseRequestStateAsync;

+		AsyncEvents _preRequestHandlerExecuteAsync;

+		AsyncEvents _postRequestHandlerExecuteAsync;

+		

+		// ID objects used to indentify the event

+		static object AcquireRequestStateId = new Object();

+		static object AuthenticateRequestId = new Object();

+		static object EndRequestId = new Object();

+		static object DisposedId = new Object();

+		static object BeginRequestId = new Object();

+		static object AuthorizeRequestId = new Object();

+		static object UpdateRequestCacheId = new Object();

+		static object ResolveRequestCacheId = new Object();

+		static object ReleaseRequestStateId = new Object();

+		static object PreSendRequestContentId = new Object();

+		static object PreRequestHandlerExecuteId = new Object();

+		static object PostRequestHandlerExecuteId = new Object();

+		static object ErrorId = new Object();

+

+		// List of events

+		private EventHandlerList _Events;

+

+		public event EventHandler AcquireRequestState {

+			add			{ Events.AddHandler(AcquireRequestStateId, value); }

+			remove	{ Events.RemoveHandler(AcquireRequestStateId, value); }

+		}

+

+		public event EventHandler AuthenticateRequest {

+			add			{ Events.AddHandler(AuthenticateRequestId, value); }

+			remove	{ Events.RemoveHandler(AuthenticateRequestId, value); }

+		}

+		

+		public event EventHandler AuthorizeRequest {

+			add			{ Events.AddHandler(AuthorizeRequestId, value); }

+			remove	{ Events.RemoveHandler(AuthorizeRequestId, value); }

+		}

+		

+		public event EventHandler BeginRequest {

+			add			{ Events.AddHandler(BeginRequestId, value); }

+			remove	{ Events.RemoveHandler(BeginRequestId, value); }

+		}

+

+		public event EventHandler Disposed {

+			add			{ Events.AddHandler(DisposedId, value); }

+			remove	{ Events.RemoveHandler(DisposedId, value); }

+		}

+

+		public event EventHandler EndRequest {

+			add			{ Events.AddHandler(EndRequestId, value); }

+			remove	{ Events.RemoveHandler(EndRequestId, value); }

+		}

+

+		public event EventHandler Error {

+			add			{ Events.AddHandler(ErrorId, value); }

+			remove	{ Events.RemoveHandler(ErrorId, value); }

+		}

+

+		public event EventHandler PostRequestHandlerExecute {

+			add			{ Events.AddHandler(PostRequestHandlerExecuteId, value); }

+			remove	{ Events.RemoveHandler(PostRequestHandlerExecuteId, value); }

+		}

+

+		public event EventHandler PreRequestHandlerExecute {

+			add			{ Events.AddHandler(PreRequestHandlerExecuteId, value); }

+			remove	{ Events.RemoveHandler(PreRequestHandlerExecuteId, value); }

+		}

+

+		public event EventHandler PreSendRequestContent {

+			add			{ Events.AddHandler(PreSendRequestContentId, value); }

+			remove	{ Events.RemoveHandler(PreSendRequestContentId, value); }

+		}

+

+		public event EventHandler ReleaseRequestState {

+			add			{ Events.AddHandler(ReleaseRequestStateId, value); }

+			remove	{ Events.RemoveHandler(ReleaseRequestStateId, value); }

+		}

+

+		public event EventHandler ResolveRequestCache {

+			add			{ Events.AddHandler(ResolveRequestCacheId, value); }

+			remove	{ Events.RemoveHandler(ResolveRequestCacheId, value); }

+		}

+      

+		public event EventHandler UpdateRequestCache {

+			add			{ Events.AddHandler(UpdateRequestCacheId, value); }

+			remove	{ Events.RemoveHandler(UpdateRequestCacheId, value); }

+		}

+	

+		public void AddOnAcquireRequestStateAsync(BeginEventHandler beg, EndEventHandler end) {

+			if (null == _acquireRequestStateAsync)

+				_acquireRequestStateAsync = new AsyncEvents();

+

+			_acquireRequestStateAsync.Add(beg, end);

+		}

+		

+		public void AddOnAuthenticateRequestAsync(BeginEventHandler beg, EndEventHandler end) {

+			if (null == _authenticateRequestAsync)

+				_authenticateRequestAsync = new AsyncEvents();

+

+			_authenticateRequestAsync.Add(beg, end);

+		}

+		

+		public void AddOnAuthorizeRequestAsync(BeginEventHandler beg, EndEventHandler end) {

+			if (null == _authorizeRequestAsync)

+				_authorizeRequestAsync= new AsyncEvents();

+

+			_authorizeRequestAsync.Add(beg, end);

+		}

+		

+		public void AddOnBeginRequestAsync(BeginEventHandler beg, EndEventHandler end) {

+			if (null == _beginRequestAsync)

+				_beginRequestAsync = new AsyncEvents();

+

+			_beginRequestAsync.Add(beg, end);

+		}

+		

+		public void AddOnEndRequestAsync(BeginEventHandler beg, EndEventHandler end) {

+			if (null == _endRequestAsync)

+				_endRequestAsync = new AsyncEvents();

+

+			_endRequestAsync.Add(beg, end);

+		}

+		

+		public void AddOnPostRequestHandlerExecuteAsync(BeginEventHandler beg, EndEventHandler end) {

+			if (null == _postRequestHandlerExecuteAsync)

+				_postRequestHandlerExecuteAsync = new AsyncEvents();

+

+			_postRequestHandlerExecuteAsync.Add(beg, end);

+		}

+		

+		public void AddOnPreRequestHandlerExecuteAsync(BeginEventHandler beg, EndEventHandler end) {

+			if (null == _preRequestHandlerExecuteAsync)

+				_preRequestHandlerExecuteAsync = new AsyncEvents();

+

+			_preRequestHandlerExecuteAsync.Add(beg, end);

+		}

+		

+		public void AddOnReleaseRequestStateAsync(BeginEventHandler beg, EndEventHandler end) {

+			if (null == _releaseRequestStateAsync)

+				_releaseRequestStateAsync = new AsyncEvents();

+

+			_releaseRequestStateAsync.Add(beg, end);

+		}

+		

+		public void AddOnResolveRequestCacheAsync(BeginEventHandler beg, EndEventHandler end) {

+			if (null == _resolveRequestCacheAsync)

+				_resolveRequestCacheAsync = new AsyncEvents();

+

+			_resolveRequestCacheAsync.Add(beg, end);

+		}

+		

+		public void AddOnUpdateRequestCacheAsync(BeginEventHandler beg, EndEventHandler end) {

+			if (null == _updateRequestCacheAsync)

+				_updateRequestCacheAsync = new AsyncEvents();

+

+			_updateRequestCacheAsync.Add(beg, end);

+		}

+

+		#endregion

+

+		#region State Machine 

+

+		interface IStateHandler {

+			void Execute();

+			

+			bool CompletedSynchronously {

+				get;

+			}

+

+			bool PossibleToTimeout {

+				get;

+			}

+		}

+

+

+		class EventState : IStateHandler {

+			private HttpApplication	_app;

+			private EventHandler		_event;

+

+			public EventState(HttpApplication app, EventHandler evt) {

+				_app = app;

+				_event = evt;

+			}

+

+			public void Execute() {

+				if (null != _event) {

+					_event(_app, EventArgs.Empty);	

+				}

+			}

+			

+			public bool CompletedSynchronously {

+				get {

+					return true;

+				}

+			}

+

+			public bool PossibleToTimeout {

+				get {

+					return true;

+				}

+			}

+		}

+

+		class AsyncEventState : IStateHandler {

+			private HttpApplication		_app;

+			private BeginEventHandler	_begin;

+			private EndEventHandler		_end;

+			private AsyncCallback			_callback;

+			private bool _async;

+

+			public AsyncEventState(HttpApplication app, BeginEventHandler begin, EndEventHandler end) {

+				_async = false;

+				_app = app;

+				_begin = begin;

+				_end = end;

+				_callback = new AsyncCallback(OnAsyncReady);

+			}

+			

+			public void Execute() {

+				_async = true;

+				IAsyncResult ar = _begin(_app, EventArgs.Empty, _callback, null);

+				if (ar.CompletedSynchronously) {

+					_async = false;

+					_end(ar);

+				}

+			}

+			

+			public bool CompletedSynchronously {

+				get {

+					return (!_async);

+				}

+			}

+

+			public bool PossibleToTimeout {

+				get {

+					// We can't cancel a async event

+					return false;

+				}

+			}

+

+			private void OnAsyncReady(IAsyncResult ar) {

+				if (ar.CompletedSynchronously) return;

+

+				Exception error = null;

+

+				try {

+					// Invoke end handler

+					_end(ar);

+				}

+				catch (System.Exception exc) {

+					// Flow this error to the next state (handle during state execution)

+					error = exc;

+				}

+

+				_app._state.ExecuteNextAsync(error);

+			}

+		}

+

+		class AsyncEvents {

+			private ArrayList _events;

+			private class EventRecord {

+				public EventRecord(BeginEventHandler beg, EndEventHandler end) {

+					Begin = beg;

+					End = end;

+				}

+

+				public BeginEventHandler	Begin;

+				public EndEventHandler		End;

+			}

+

+			public AsyncEvents() {

+				_events = new ArrayList();

+			}

+	

+			public void Add(BeginEventHandler begin, EndEventHandler end) {

+				_events.Add(new EventRecord(begin, end));

+			}

+

+			public void GetAsStates(HttpApplication app, ArrayList states) {

+				foreach (object obj in _events) {

+					states.Add(new AsyncEventState(app, ((EventRecord) obj).Begin, ((EventRecord) obj).End));

+				}

+			}

+		}

+

+

+		class ExecuteHandlerState : IStateHandler {

+			private HttpApplication			_app;

+			private AsyncCallback				_callback;

+			private IHttpAsyncHandler		_handler;

+			private bool _async;

+

+			public ExecuteHandlerState(HttpApplication app) {

+				_app = app;

+				_callback = new AsyncCallback(OnAsyncReady);

+			}

+

+			private void OnAsyncReady(IAsyncResult ar) {

+				if (ar.CompletedSynchronously) return;

+

+				Exception error = null;

+

+				try {

+					// Invoke end handler

+					_handler.EndProcessRequest(ar);

+				}

+				catch (System.Exception exc) {

+					// Flow this error to the next state (handle during state execution)

+					error = exc;

+				}

+

+				_app._state.ExecuteNextAsync(error);

+			}

+

+			public void Execute() {

+				IHttpHandler handler = _app.Context.Handler;

+				if (null != handler) {

+					// Check if we can execute async

+					if (handler is IHttpAsyncHandler) {

+						_async = true;

+						_handler = (IHttpAsyncHandler) handler;

+						

+						IAsyncResult ar = _handler.BeginProcessRequest(_app.Context, _callback, null);

+						if (ar.CompletedSynchronously) {

+							_async = false;

+							_handler = null;

+							((IHttpAsyncHandler) handler).EndProcessRequest(ar);

+						}

+					} else {

+						_async = false;

+

+						// Sync handler

+						handler.ProcessRequest(	_app.Context);

+					}

+				}

+			}

+			

+			public bool CompletedSynchronously {

+				get {

+					return (!_async);

+				}

+			}

+

+			public bool PossibleToTimeout {

+				get {

+					if (_app.Context.Handler is IHttpAsyncHandler)

+						return false;

+					//else

+

+					return true;

+				}

+			}

+		}

+

+		class CreateHandlerState : IStateHandler {

+			private HttpApplication _app;

+

+			public CreateHandlerState(HttpApplication app) {

+				_app = app;

+			}

+

+			public void Execute() {

+				_app.Context.Handler = _app.CreateHttpHandler(_app.Context, _app.Request.RequestType, _app.Request.FilePath, _app.Request.PhysicalPath);

+			}

+			

+			public bool CompletedSynchronously {

+				get {

+					return true;

+				}

+			}

+

+			public bool PossibleToTimeout {

+				get {

+					return false;

+				}

+			}

+		}

+

+		class FilterHandlerState : IStateHandler  {

+			private HttpApplication _app;

+

+			public FilterHandlerState(HttpApplication app) {

+				_app = app;

+			}

+

+			public void Execute() {

+				_app.Context.Response.DoFilter();

+			}

+			

+			public bool CompletedSynchronously {

+				get {

+					return true;

+				}

+			}

+

+			public bool PossibleToTimeout {

+				get {

+					return true;

+				}

+			}

+		}

+

+		class StateMachine {

+			private HttpApplication _app;

+			private WaitCallback _asynchandler;

+

+			private IStateHandler [] _handlers;

+			private int	_currentStateIdx;

+			private int _endStateIdx;

+			private int _countSteps;

+			private int _countSyncSteps;

+

+			// Helper to create the states for a normal event

+			private void GetAsStates(object Event, ArrayList states) {

+				// Get list of clients for the sync events

+				Delegate evnt = _app.Events[Event];

+				if (null != evnt) {

+					System.Delegate [] clients = evnt.GetInvocationList();

+					

+					foreach (Delegate client in clients) {

+						states.Add(new EventState(_app, (EventHandler) client));

+					}

+				}

+			}

+

+			internal StateMachine(HttpApplication app) {

+				_app = app;

+			}

+

+			internal void Init() {

+				_asynchandler = new WaitCallback(OnAsyncCallback);

+

+				// Create a arraylist of states to execute

+				ArrayList states = new ArrayList();

+

+				// BeginRequest

+				if (null != _app._beginRequestAsync)

+					_app._beginRequestAsync.GetAsStates(_app, states);

+				GetAsStates(HttpApplication.BeginRequestId, states);

+

+				// AuthenticateRequest

+				if (null != _app._authenticateRequestAsync)

+					_app._authenticateRequestAsync.GetAsStates(_app, states);

+				GetAsStates(HttpApplication.AuthenticateRequestId, states);

+

+				// AuthorizeRequest

+				if (null != _app._authorizeRequestAsync)

+					_app._authorizeRequestAsync.GetAsStates(_app, states);

+				GetAsStates(HttpApplication.AuthorizeRequestId, states);

+

+				// ResolveRequestCache

+				if (null != _app._resolveRequestCacheAsync)

+					_app._resolveRequestCacheAsync.GetAsStates(_app, states);

+				GetAsStates(HttpApplication.ResolveRequestCacheId, states);

+

+				// [A handler (a page corresponding to the request URL) is created at this point.]

+				states.Add(new CreateHandlerState(_app));

+

+				// AcquireRequestState

+				if (null != _app._acquireRequestStateAsync)

+					_app._acquireRequestStateAsync.GetAsStates(_app, states);

+				GetAsStates(HttpApplication.AcquireRequestStateId, states);

+

+				// PreRequestHandlerExecute

+				if (null != _app._preRequestHandlerExecuteAsync)

+					_app._preRequestHandlerExecuteAsync.GetAsStates(_app, states);

+				GetAsStates(HttpApplication.PreRequestHandlerExecuteId, states);

+

+				// [The handler is executed.]

+				states.Add(new ExecuteHandlerState(_app));

+

+				// PostRequestHandlerExecute

+				if (null != _app._postRequestHandlerExecuteAsync)

+					_app._postRequestHandlerExecuteAsync.GetAsStates(_app, states);

+				GetAsStates(HttpApplication.PostRequestHandlerExecuteId, states);

+

+				// ReleaseRequestState

+				if (null != _app._releaseRequestStateAsync)

+					_app._releaseRequestStateAsync.GetAsStates(_app, states);

+				GetAsStates(HttpApplication.ReleaseRequestStateId, states);

+

+				// [Response filters, if any, filter the output.]

+				states.Add(new FilterHandlerState(_app));

+

+				// UpdateRequestCache

+				if (null != _app._updateRequestCacheAsync)

+					_app._updateRequestCacheAsync.GetAsStates(_app, states);

+				GetAsStates(HttpApplication.UpdateRequestCacheId, states);

+

+				// EndRequest

+				if (null != _app._updateRequestCacheAsync)

+					_app._updateRequestCacheAsync.GetAsStates(_app, states);

+				GetAsStates(HttpApplication.EndRequestId, states);

+

+				// Make list ready to execute

+				_handlers = new IStateHandler[states.Count];

+				states.CopyTo(_handlers);

+			}

+

+

+			internal void Reset() {

+				_countSyncSteps = 0;

+				_countSteps = 0;

+				_currentStateIdx = -1;

+				_endStateIdx = _handlers.Length - 1;

+			}

+

+			internal void Start() {

+				Reset();

+				ExecuteNextAsync(null);

+			}

+

+			internal void ExecuteNextAsync(Exception lasterror) {

+				if (!Thread.CurrentThread.IsThreadPoolThread) {

+					ThreadPool.QueueUserWorkItem(_asynchandler, lasterror);

+				} else {

+					ExecuteNext(lasterror);

+				}

+			}

+

+			private void ExecuteNext(Exception lasterror) {

+				bool ready_sync = false;

+				IStateHandler handler;

+

+				lock (_app) {

+					_app.OnStateExecuteEnter();

+					try {

+						do {

+							if (null != lasterror)

+								_app.HandleError(lasterror);

+

+							// Check if request flow is to be stopped

+							if (_app._CompleteRequest)

+								_currentStateIdx = _endStateIdx;

+

+							// Get next state handler

+							if (_currentStateIdx < _endStateIdx) {

+								_currentStateIdx++;

+								handler = _handlers[_currentStateIdx];

+

+								_countSteps++;

+								lasterror = ExecuteState(handler, ref ready_sync);

+								if (ready_sync) 

+									_countSyncSteps++;

+							}

+						} while (ready_sync && _currentStateIdx < _endStateIdx);

+					}

+					finally {

+						_app.OnStateExecuteLeave();

+					}

+				}

+

+				// Finish the request off..

+				if (_currentStateIdx == _endStateIdx) {

+					_app._asyncWebResult.Complete((_countSyncSteps == _countSteps),  null, null);

+					_app.Context.Handler = null;

+					_app.Context.ApplicationInstance = null;

+					_app.RecycleHandlers();

+					_app._asyncWebResult = null;

+

+					HttpApplicationFactory.RecycleInstance(_app);

+				}

+			}

+

+			private void OnAsyncCallback(object obj) {

+				ExecuteNext((Exception) obj);

+			}

+

+			[MonoTODO()]

+			private Exception ExecuteState(IStateHandler state, ref bool readysync) {

+				Exception lasterror = null;

+				try {

+					try {

+						if (state.PossibleToTimeout) {

+							// TODO: Start timeout possible

+							try {

+								state.Execute();	

+							} 

+							finally {

+								// TODO: end timeout possible

+							}

+

+							// Check if we have a timeout and wait for the exception.

+						} else {

+							state.Execute();

+						}

+

+						if (state.CompletedSynchronously)

+							readysync = true;

+						else 

+							readysync = false;

+					} 

+					catch (System.Exception obj) {

+						lasterror = obj;

+					}

+				}

+				catch (System.Threading.ThreadAbortException obj) {

+					obj = obj;

+					// TODO!

+					// handle request timeout and return timeout httpexception

+				}

+

+				return lasterror;

+			}

+		}

+

+		#endregion

+

+		#region Fields

+

+		private StateMachine _state;

+

+		private bool _CompleteRequest;

+		private HttpContext _Context;

+		private Exception _lastError;

+

+		private HttpContext _savedContext;

+		private IPrincipal _savedUser;

+		private HttpAsyncResult _asyncWebResult;

+         

+		private ISite _Site;

+		private HttpModuleCollection _ModuleCollection;

+		private HttpSessionState _Session;

+		private HttpApplicationState _appState;

+

+		private bool _InPreRequestResponseMode;

+		#endregion

+

+		#region Constructor

+      public HttpApplication() {

+      }

+		#endregion

+

+		#region Methods

+		[MonoTODO]

+		private IHttpHandler CreateHttpHandler(HttpContext context, string type, string file, string path) {

+			// TODO: Cache factories

+			return (IHttpHandler) HandlerFactoryConfiguration.FindHandler(type, path).Create();

+		}

+

+		[MonoTODO()]

+		internal void RecycleHandlers() {

+			// TODO: Recycle the created handlers (via factory?)

+		}

+

+		internal void InitModules() {

+			ModulesConfiguration modules;

+

+			modules = (ModulesConfiguration) HttpContext.GetAppConfig("system.web/httpmodules");

+			if (null == modules)

+				throw new HttpException(HttpRuntime.FormatResourceString("missing_modules_config"));

+

+			_ModuleCollection = modules.CreateCollection();

+			if (null != _ModuleCollection) {

+				int pos, count;

+

+				count = _ModuleCollection.Count;

+				for (pos = 0; pos != count; pos++) {

+					((IHttpModule) _ModuleCollection.Get(pos)).Init(this);

+				}

+			}

+		}

+

+		internal void InitCulture() {

+			// TODO: Read culture info from globalization from config

+		}

+

+		internal void OnStateExecuteEnter() {

+			// TODO: Set correct culture for the thread

+			// TODO: Register in timeout manager

+

+			_savedContext = HttpContext.Context;

+			HttpContext.Context = _Context;

+

+			_savedUser = System.Threading.Thread.CurrentPrincipal;

+			System.Threading.Thread.CurrentPrincipal = Context.User;	

+		}

+

+		internal void OnStateExecuteLeave() {

+			// TODO: Restore culture for the thread

+			// TODO: Remove from timeout manager

+

+			HttpContext.Context = _savedContext;

+			if (null != _savedUser)  {

+				System.Threading.Thread.CurrentPrincipal = _savedUser;

+				_savedUser = null;

+			}

+		}

+

+		internal void ClearError() {

+			_lastError = null;

+		}

+

+		internal void HandleError(Exception obj) {

+			EventHandler handler;			

+			bool fire = true;

+

+			if (null != _Context) {

+				if (null != _Context.Error) 

+					fire = false;

+

+				_Context.AddError(obj);

+			} else {

+				if (null != _lastError)

+					fire = false;

+			}

+

+			if (fire) {

+				// Fire OnError event here

+				handler = (EventHandler) Events[HttpApplication.ErrorId];

+				if (null != handler) {

+					try {

+						handler(this, EventArgs.Empty);

+					}

+					catch (Exception excp) {

+						if (null != _Context)

+							_Context.AddError(excp);

+					}

+				}

+			}

+		}

+

+		[MonoTODO]

+		internal void Startup(HttpContext context, HttpApplicationState state) {

+			// TODO: Need to attach methods in global.asax to correct events

+			_Context = context;

+

+			_appState = state;

+			_state = new StateMachine(this);

+

+			// Initialize alll IHttpModule(s)

+			InitModules();

+			

+			// Initialize custom application

+			_InPreRequestResponseMode = true;

+			try {

+				Init();

+			}

+			catch (Exception obj) {

+				HandleError(obj);

+			}

+

+			_InPreRequestResponseMode = false;

+

+			_state.Init();

+		}

+

+		internal void Cleanup() {

+			try {

+				Dispose();

+			}

+			catch (Exception obj) {

+				HandleError(obj);

+			}

+

+			if (null != _ModuleCollection) {

+				int pos;

+				int count = _ModuleCollection.Count;

+

+				for (pos = 0; pos != count; pos++) {

+					((IHttpModule) _ModuleCollection.Get(pos)).Dispose();

+				}

+

+				_ModuleCollection = null;

+			}

+

+			_state = null;

+		}

+

+		public void CompleteRequest() {

+			_CompleteRequest = true;

+		}

+

+		public virtual void Dispose() {

+			_Site = null;

+			EventHandler disposed = (EventHandler) Events[HttpApplication.DisposedId];

+			if (null != disposed) 

+				disposed(this, EventArgs.Empty);

+		}

+

+		public virtual void Init() {

+		}

+		

+		public virtual string GetVaryByCustomString(HttpContext context, string custom) {

+         if (custom.ToLower() == "browser") {

+            return context.Request.Browser.Type;

+         }

+

+         return null;

+      }

+

+      IAsyncResult IHttpAsyncHandler.BeginProcessRequest(HttpContext context, AsyncCallback cb, object extraData) {

+			_Context = context;

+			Context.ApplicationInstance = this;

+			_CompleteRequest = false;

+

+			_asyncWebResult = new HttpAsyncResult(cb, extraData);

+

+			_state.Start();

+

+			return _asyncWebResult;

+      }

+

+		void IHttpAsyncHandler.EndProcessRequest(IAsyncResult result) {

+         HttpAsyncResult ar = (HttpAsyncResult) result;

+

+			if (null != ar.Error) 

+				throw ar.Error;

+      }

+

+      void IHttpHandler.ProcessRequest(HttpContext context) {

+         throw new NotSupportedException(HttpRuntime.FormatResourceString("sync_not_supported"));

+      }

+

+      bool IHttpHandler.IsReusable {

+         get {

+				return true;

+         }

+      }

+		#endregion 		

+

+		#region Properties

+

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpApplicationState Application {

+			get { 

+				return HttpApplicationFactory.ApplicationState;

+			}

+		}

+

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpContext Context {

+			get {

+				return _Context;

+			}

+		}

+

+		public EventHandlerList Events {

+			get {

+				if (null == _Events) {

+					_Events = new EventHandlerList();

+				}

+

+				return _Events;

+			}

+		}

+		

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpModuleCollection Modules {

+			get {

+				if (null == _ModuleCollection) {

+					_ModuleCollection = new HttpModuleCollection();

+				}

+

+				return _ModuleCollection;

+			}

+		}

+

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpRequest Request {

+			get {

+				if (null != _Context && (!_InPreRequestResponseMode)) {

+					return _Context.Request;

+				}

+

+				throw new HttpException("Can't get request object");

+			}

+		}

+

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpResponse Response {

+			get {

+				if (null != _Context && (!_InPreRequestResponseMode)) {

+					return _Context.Response;

+				}

+

+				throw new HttpException("Can't get response object");

+			}

+		}

+

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpServerUtility Server {

+			get {

+				if (null != _Context) {

+					return _Context.Server;

+				}

+

+				return new HttpServerUtility(this);

+			}

+		}

+

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public HttpSessionState Session {

+			get {

+				if (null != _Session) {

+					return _Session;

+				}

+

+				if (null != _Context && null != _Context.Session) {

+					return _Context.Session;

+				}

+

+				throw new HttpException("Failed to get session object");

+			}

+		}

+

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public IPrincipal User {

+			get { 

+				return _Context.User; 

+			}

+		}

+		

+		[Browsable (false)]

+		[DesignerSerializationVisibility (DesignerSerializationVisibility.Hidden)]

+		public ISite Site {

+         get {

+            return _Site;

+         }

+

+         set {

+            _Site = value;

+         }

+      }

+		#endregion Properties

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs b/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs
new file mode 100644
index 00000000000..2cfec2b7a9b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpApplicationFactory.cs
@@ -0,0 +1,189 @@
+// 

+// System.Web.HttpApplicationFactory

+//

+// Author:

+//   Patrik Torstensson (ptorsten@hotmail.com)

+//

+using System;

+using System.Collections;

+using System.IO;

+using System.Web;

+using System.Web.SessionState;

+

+namespace System.Web {

+	/// <summary>

+	/// TODO: We need to compile the global.asax into a type inherited from HttpApplication

+	/// </summary>

+	[MonoTODO]

+	public class HttpApplicationFactory {

+		private string _appFilename;

+		private Type _appType;

+

+		private bool _appInitialized;

+		private bool _appFiredEnd;

+

+		private Stack			_appFreePublicList;

+		private int				_appFreePublicInstances;

+		static private int	_appMaxFreePublicInstances = 32;

+

+		private HttpApplicationState _state;

+

+		static private HttpApplicationFactory s_Factory = new HttpApplicationFactory();

+

+		public HttpApplicationFactory() {

+			_appInitialized = false;

+			_appFiredEnd = false;

+

+			_appFreePublicList = new Stack();

+			_appFreePublicInstances = 0;

+		}

+

+		static private string GetAppFilename(HttpContext context) {

+			return Path.Combine(context.Request.PhysicalApplicationPath, "global.asax");

+		}

+

+		[MonoTODO("CompileApp(HttpContext context)")]

+		private void CompileApp(HttpContext context) {

+			if (File.Exists(_appFilename)) {

+				// Compile the global application file here

+				// Setup filemonitor for all filedepend also.

+

+				// tmp

+				_appType = Type.GetType("System.Web.HttpApplication");

+			} else {

+				_appType = Type.GetType("System.Web.HttpApplication");

+			}

+

+			// TODO: Use reflection to find the Session/Application/Custom Module events

+		}

+

+		[MonoTODO("FireOnAppStart(HttpContext context)")]

+		private void FireOnAppStart(HttpContext context) {

+			// TODO: Fire ProcessRequest (need to have the compile in place first of the app object)

+		}

+

+		[MonoTODO("FireOnAppEnd(HttpContext context)")]

+		private void FireOnAppEnd() {

+			// TODO: Fire ProcessRequest (need to have the compile in place first of the app object)

+		}

+

+		[MonoTODO("FireOnSessionStart")]

+		private void FireOnSessionStart(HttpSessionState state, object source, EventArgs args) {

+		}

+		

+		[MonoTODO("FireOnSessionEnd")]

+		private void FireOnSessionEnd(HttpSessionState state, object source, EventArgs args) {

+		}

+	

+		private void InitializeFactory(HttpContext context) {

+			// TODO: Should we be impersonating here? We are reading a app file.. security issue?

+

+			_appFilename = GetAppFilename(context);

+

+			CompileApp(context);

+			FireOnAppStart(context);

+		}

+

+		private void Dispose() {

+			ArrayList torelease = new ArrayList();

+			lock (_appFreePublicList) {

+				do {

+					torelease.Add(_appFreePublicList.Pop());

+				} while (_appFreePublicList.Count > 0);

+			}

+

+			if (torelease.Count > 0) {

+				foreach (Object obj in torelease) {

+					((HttpApplication) obj).Cleanup();

+				}

+			}

+

+			if (!_appFiredEnd) {

+				lock (this) {

+					if (!_appFiredEnd) {

+						FireOnAppEnd();

+						_appFiredEnd = true;

+					}

+				}

+			}

+		}

+

+		static public IHttpHandler GetInstance(HttpContext context) {

+			if (!s_Factory._appInitialized) {

+				lock (s_Factory) {

+					if (!s_Factory._appInitialized) {

+						s_Factory.InitializeFactory(context);

+						s_Factory._appInitialized = true;

+					}

+				}

+			}

+

+			return s_Factory.GetPublicInstance(context);

+		}

+

+		static public void RecycleInstance(HttpApplication app) {

+			if (!s_Factory._appInitialized)

+				throw new InvalidOperationException("Factory not intialized");

+

+			s_Factory.RecyclePublicInstance(app);

+		}

+

+		private IHttpHandler GetPublicInstance(HttpContext context) {

+			HttpApplication app = null;

+

+			lock (_appFreePublicList) {

+				if (_appFreePublicInstances > 0) {

+					app = (HttpApplication) _appFreePublicList.Pop();

+					_appFreePublicInstances--;

+				}

+			}

+

+			if (app == null) {

+				// Create non-public object

+				app = (HttpApplication) HttpRuntime.CreateInternalObject(_appType);

+

+				// TODO: Attach functions in global.asax to correct modules/app

+				app.Startup(context, HttpApplicationFactory.ApplicationState);

+			}

+

+			return (IHttpHandler) app;

+		}

+

+		public void RecyclePublicInstance(HttpApplication app) {

+			lock (_appFreePublicList) {

+				if (_appFreePublicInstances < _appMaxFreePublicInstances) {

+					_appFreePublicList.Push(app);

+					_appFreePublicInstances++;

+

+					app = null;

+				}

+			}

+			

+			if  (app != null) {

+				app.Cleanup();

+			}

+		}

+

+		static internal HttpApplicationState ApplicationState {

+			get {

+				if (null == s_Factory._state) {

+					s_Factory._state = new HttpApplicationState();

+				}

+

+				return s_Factory._state;

+			}

+		}

+

+		static public void EndApplication() {

+			s_Factory.Dispose();

+		}

+

+		static public void StartSession(HttpSessionState state, object source, EventArgs args) {

+			s_Factory.FireOnSessionStart(state, source, args);

+		}

+

+		static public void EndSession(HttpSessionState state, object source, EventArgs args) {

+			s_Factory.FireOnSessionEnd(state, source, args);

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.Web/System.Web/HttpApplicationState.cs b/mcs/class/System.Web/System.Web/HttpApplicationState.cs
new file mode 100644
index 00000000000..6131f07c776
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpApplicationState.cs
@@ -0,0 +1,232 @@
+// 

+// System.Web.HttpApplicationState

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Threading;

+using System.Web;

+using System.Collections.Specialized;

+

+namespace System.Web {

+

+   [MonoTODO("Performance - Use SWMR lock here")]

+   public sealed class HttpApplicationState : NameObjectCollectionBase {

+      private HttpStaticObjectsCollection _AppObjects;

+      private HttpStaticObjectsCollection _SessionObjects;

+

+      // TODO : Change to ReadWriteLock when ready

+      private Mutex _Lock; 

+

+      private void LockRead() {

+         Monitor.Enter(this);

+      }

+

+      private void LockWrite() {

+         Monitor.Enter(this);

+      }

+

+      private void UnlockRead() {

+         Monitor.Exit(this);

+      }

+

+      private void UnlockWrite() {

+         Monitor.Exit(this);

+      }

+

+      internal HttpApplicationState() {

+         _AppObjects = new HttpStaticObjectsCollection();

+         _SessionObjects = new HttpStaticObjectsCollection();

+         _Lock = new Mutex();

+      }

+

+      internal HttpApplicationState(HttpStaticObjectsCollection AppObj, HttpStaticObjectsCollection SessionObj) {

+         if (null != AppObj) {

+            _AppObjects = AppObj;

+         } else {

+            _AppObjects = new HttpStaticObjectsCollection();

+         }

+

+         if (null != SessionObj) {

+            _SessionObjects = SessionObj;

+         } else {

+            _SessionObjects = new HttpStaticObjectsCollection();

+         }

+         _Lock = new Mutex();

+      }

+

+      public void Add(string name, object value) {

+

+         LockWrite(); 

+         try {

+            BaseAdd(name, value);

+         }

+         finally {

+            UnlockWrite();

+         }

+      }

+

+      public void Clear() {

+

+         LockWrite(); 

+         try {

+            BaseClear();

+         }

+         finally {

+            UnlockWrite();

+         }

+      } 

+

+      public object Get(string name) {

+         object ret = null;

+

+         LockRead(); 

+         try {

+            ret = BaseGet(name);

+         }

+         finally {

+            UnlockRead();

+         }

+

+         return ret;

+      }

+

+      public object Get(int index) {

+         object ret = null;

+         

+         LockRead(); 

+         try {

+            ret = BaseGet(index);

+         }

+         finally {

+            UnlockRead();

+         }

+

+         return ret;

+      }   

+

+      public string GetKey(int index) {

+         string ret = null;

+

+         LockRead(); 

+         try {

+            ret = BaseGetKey(index);

+         }

+         finally {

+            UnlockRead();

+         }

+

+         return ret;

+      }      

+

+      public void Lock() {

+         LockWrite();

+      }

+

+      public void Remove(string name) {

+         LockWrite(); 

+         try {

+            BaseRemove(name);

+         }

+         finally {

+            UnlockWrite();

+         }      

+      }

+

+      public void RemoveAll() {

+         Clear();

+      }

+

+      public void RemoveAt(int index) {

+         LockWrite(); 

+         try {

+            BaseRemoveAt(index);

+         }

+         finally {

+            UnlockWrite();

+         }      

+      }

+

+      public void Set(string name, object value) {

+         LockWrite(); 

+         try {

+            BaseSet(name, value);

+         }

+         finally {

+            UnlockWrite();

+         }      

+      }   

+      

+      public void UnLock() {

+         UnlockWrite();

+      }

+   

+      public string [] AllKeys {

+         get {

+            string [] ret = null;

+

+            LockRead(); 

+            try {

+               ret = BaseGetAllKeys();

+            }

+            finally {

+               UnlockRead();

+            }     

+

+            return ret;

+         }

+      }

+

+      public HttpApplicationState Contents {

+         get {

+            return this;

+         }

+      }

+

+      override public int Count {

+         get {

+            int ret = 0;

+

+            LockRead(); 

+            try {

+               ret = base.Count;

+            }

+            finally {

+               UnlockRead();

+            }     

+

+            return ret;

+         }

+      }   

+

+      public object this[string name] {

+         get {

+            return Get(name);

+         }

+         set {

+            Set(name, value);

+         }

+      }

+

+      public object this[int index] {

+         get {

+            return Get(index);

+         }

+      }

+

+      //  ASP Session based objects

+      internal HttpStaticObjectsCollection SessionObjects {

+         get {

+            return _SessionObjects;

+         }

+      }

+

+      //  ASP App based objects

+      public HttpStaticObjectsCollection StaticObjects {

+         get {

+            return _AppObjects;

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpAsyncResult.cs b/mcs/class/System.Web/System.Web/HttpAsyncResult.cs
new file mode 100644
index 00000000000..e5a0b49b4db
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpAsyncResult.cs
@@ -0,0 +1,73 @@
+// 

+// System.Web.HttpAsyncResult

+//

+// Author:

+//   Patrik Torstensson (ptorsten@hotmail.com)

+//

+using System;

+using System.Threading;

+

+namespace System.Web

+{

+	public class HttpAsyncResult : IAsyncResult

+	{

+		private object _result;

+		private object _asyncState;

+		private AsyncCallback _callback;

+		private Exception _error;

+

+		private bool _ready;

+		private bool _readySync;

+

+		public HttpAsyncResult(AsyncCallback callback, object state) {

+			_callback = callback;

+			_asyncState = state;

+		}

+

+		public void Complete(bool sync, object result, Exception error) {

+			_ready = true;

+			_readySync = sync;

+			_result = result;

+			_error = error;

+			if (null != _callback) {

+				_callback(this);

+			}

+		}

+

+		public Exception Error {

+			get {

+				return null;

+			}

+		}

+

+		public object AsyncState {

+			get {

+				return _asyncState;

+			}

+		}

+

+		public object AsyncObject {

+			get {

+				return null;

+			}

+		}

+

+		public WaitHandle AsyncWaitHandle {

+			get {

+				return null;

+			}

+		}

+

+		public bool CompletedSynchronously {

+			get {

+				return _readySync;

+			}

+		}

+

+		public bool IsCompleted {

+			get {

+				return _ready;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/HttpBrowserCapabilities.cs b/mcs/class/System.Web/System.Web/HttpBrowserCapabilities.cs
new file mode 100755
index 00000000000..a4c095c7f6d
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpBrowserCapabilities.cs
@@ -0,0 +1,143 @@
+// 
+// System.Web.HttpBrowserCapabilities
+//
+// Author:
+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)
+//   Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+using System;
+using System.Web.Configuration;
+
+namespace System.Web {
+public class HttpBrowserCapabilities : HttpCapabilitiesBase
+{
+	public HttpBrowserCapabilities()
+	{
+	}
+
+	public bool ActiveXControls {
+		get { return false; }
+	}
+
+	[MonoTODO()]
+	public bool AOL {
+		get { return false; }
+	}
+
+	[MonoTODO()]
+	public bool BackgroundSounds {
+		get { return false; }
+	}
+
+	[MonoTODO()]
+	public bool Beta {
+		get { return false; }
+	}
+
+	[MonoTODO()]
+	public string Browser {
+		get { return "Not Implemented"; }
+	}
+
+	[MonoTODO()]
+	public bool CDF {
+		get { return false; }
+	}
+
+	[MonoTODO()]
+	public Version ClrVersion {
+		get { return new Version (0, 0); }
+	}
+
+	[MonoTODO()]
+	public bool Cookies {
+		get { return true; }
+	}
+
+	[MonoTODO()]
+	public bool Crawler {
+		get { return false; }
+	}
+
+	[MonoTODO()]
+	public Version EcmaScriptVersion {
+		get { return new Version (0, 0); }
+	}
+
+	[MonoTODO()]
+	public bool Frames {
+		get { return true; }
+	}
+
+	[MonoTODO()]
+	public bool JavaApplets {
+		get { return false; }
+	}
+
+	[MonoTODO()]
+	public bool JavaScript {
+		get { return true; }
+	}
+
+	[MonoTODO()]
+	public int MajorVersion {
+		get { return 0; }
+	}
+
+	[MonoTODO()]
+	public double MinorVersion {
+		get { return 0.0; }
+	}
+
+	[MonoTODO()]
+	public Version MSDomVersion {
+		get { return new Version (0, 0); }
+	}
+
+	[MonoTODO()]
+	public string Platform {
+		get { return "mono::"; }
+	}
+
+	[MonoTODO()]
+	public bool Tables {
+		get { return true; }
+	}
+
+	[MonoTODO()]
+	public Type TagWriter {
+		get { throw new NotImplementedException (); }
+	}
+
+	[MonoTODO()]
+	public string Type {
+		get { return "4"; }
+	}
+
+	[MonoTODO()]
+	public bool VBScript {
+		get { return false; }
+	}
+
+	[MonoTODO()]
+	public string Version {
+		get { return "4.0"; }
+	}
+
+	[MonoTODO()]
+	public Version W3CDomVersion {
+		get { return new Version (0, 0); }
+	}
+
+	[MonoTODO()]
+	public bool Win16 {
+		get { return false; }
+	}
+
+	[MonoTODO()]
+	public bool Win32 {
+		get { return true; }
+	}
+
+}
+}
diff --git a/mcs/class/System.Web/System.Web/HttpCachePolicy.cs b/mcs/class/System.Web/System.Web/HttpCachePolicy.cs
new file mode 100644
index 00000000000..b9e70aea100
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpCachePolicy.cs
@@ -0,0 +1,144 @@
+// 

+// System.Web.HttpCachePolicy

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//   Tim Coleman (tim@timcoleman.com)

+//

+using System;

+

+namespace System.Web {

+	public sealed class HttpCachePolicy {

+

+		#region Fields

+

+		HttpCacheVaryByHeaders varyByHeaders;

+		HttpCacheVaryByParams varyByParams;

+

+		#endregion

+

+		#region Properties

+

+		public HttpCacheVaryByHeaders VaryByHeaders {

+			get { return varyByHeaders; }

+		}

+

+		public HttpCacheVaryByParams VaryByParams {

+			get { return varyByParams; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public void AddValidationCallback (HttpCacheValidateHandler handler, object data)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void AppendCacheExtension (string extension)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetCacheability (HttpCacheability cacheability)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetCacheability (HttpCacheability cacheability, string field)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetETag (string etag)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetETagFromFileDependencies ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetExpires (DateTime date)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetLastModified (DateTime date)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetLastModifiedFromFileDependencies ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetMaxAge (TimeSpan date)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetNoServerCaching ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetNoStore ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetNoTransforms ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetProxyMaxAge (TimeSpan delta)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetRevalidation (HttpCacheRevalidation revalidation)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetSlidingExpiration (bool slide)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetValidUntilExpires (bool validUntilExpires)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void SetVaryByCustom (string custom)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs b/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs
new file mode 100644
index 00000000000..dfe83e605b1
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpCacheRevalidation.cs
@@ -0,0 +1,17 @@
+//
+// System.Web.HttpCacheRevalidation.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+namespace System.Web {
+	[Serializable]
+	public enum HttpCacheRevalidation {
+		AllCaches = 0x1,
+		ProxyCaches,
+		None,
+	}
+}
diff --git a/mcs/class/System.Web/System.Web/HttpCacheValidateHandler.cs b/mcs/class/System.Web/System.Web/HttpCacheValidateHandler.cs
new file mode 100644
index 00000000000..032aea39f6f
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpCacheValidateHandler.cs
@@ -0,0 +1,16 @@
+//
+// System.Web.HttpCacheValidateHandler.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+namespace System.Web
+{
+        public delegate void HttpCacheValidateHandler(
+                                HttpContext context,
+                                object data,
+                                ref HttpValidationStatus validationStatus);
+}
diff --git a/mcs/class/System.Web/System.Web/HttpCacheVaryByHeaders.cs b/mcs/class/System.Web/System.Web/HttpCacheVaryByHeaders.cs
new file mode 100644
index 00000000000..93ee07a0afe
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpCacheVaryByHeaders.cs
@@ -0,0 +1,110 @@
+// 

+// System.Web.HttpCacheVaryByHeaders

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Collections;

+

+namespace System.Web {

+   public sealed class HttpCacheVaryByHeaders {

+      private Hashtable _Items;

+      private bool _Dirty;

+      private bool _Wildcard;

+

+      // TODO: We need internal methods here to communicate with CachePolicy

+

+      internal HttpCacheVaryByHeaders() {

+      }

+

+      public void VaryByUnspecifiedParameters() {

+         _Dirty = true;

+         _Wildcard = true;

+         _Items = null;

+      }

+

+      public bool AcceptTypes {

+         get {

+            return this["Accept"];

+         }

+

+         set {

+            this["Accept"] = value;

+         }

+      }

+

+      public bool this[string header] {

+         get {

+            if (null == header) {

+               throw new ArgumentNullException("header");

+            }

+

+            if (header == "*") {

+               return _Wildcard;

+            }

+

+            if (null != _Items) {

+               return _Items.ContainsKey(header);

+            }

+

+            return false;

+         }

+

+         set {

+            if (null == header) {

+               throw new ArgumentNullException("header");

+            }

+

+            if (!(value)) {

+               return;

+            }

+

+            _Dirty = true;

+

+            if (header == "*") {

+               VaryByUnspecifiedParameters();

+               return;

+            }

+

+            if (!_Wildcard) {

+               if (null == _Items) {

+                  _Items = new Hashtable();

+               }

+

+               _Items[header] = true;

+            }

+         }

+      }

+

+      public bool UserAgent {

+         get {

+            return this["User-Agent"];

+         }

+

+         set {

+            this["User-Agent"] = value;

+         }

+      }

+

+      public bool UserCharSet {

+         get {

+            return this["Accept-Charset"];

+         }

+

+         set {

+            this["Accept-Charset"] = value;

+         }

+      }   

+

+      public bool UserLanguage {

+         get {

+            return this["Accept-Language"];

+         }

+

+         set {

+            this["Accept-Language"] = value;

+         }

+      }   

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpCacheVaryByParams.cs b/mcs/class/System.Web/System.Web/HttpCacheVaryByParams.cs
new file mode 100644
index 00000000000..057ae081d7e
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpCacheVaryByParams.cs
@@ -0,0 +1,81 @@
+// 

+// System.Web.HttpCacheVaryByParams

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Collections;

+

+namespace System.Web {

+   public sealed class HttpCacheVaryByParams {

+      private Hashtable _Items;

+      private bool _IgnoreParams;

+      private bool _Wildcard;

+      private bool _Dirty;

+

+      // TODO: We need internal methods here to communicate with CachePolicy

+

+      internal HttpCacheVaryByParams() {

+      }

+

+      public bool IgnoreParams {

+         get {

+            return _IgnoreParams;

+         }

+

+         set {

+            if (_Wildcard || null != _Items) {

+               return;

+            }

+

+            _Dirty = true;

+            _IgnoreParams = value;

+         }

+      }

+      

+      public bool this[string header] {

+         get {

+            if (null == header) {

+               throw new ArgumentNullException("header");

+            }

+

+            if (header == "*") {

+               return _Wildcard;

+            }

+

+            if (null != _Items) {

+               return _Items.ContainsKey(header);

+            }

+

+            return false;

+         }

+

+         set {

+            if (null == header) {

+               throw new ArgumentNullException("header");

+            }

+

+            if (!(value)) {

+               return;

+            }

+

+            _Dirty = true;

+

+            if (header == "*") {

+               _Wildcard = true;

+               _Items = null;

+               return;

+            }

+

+            if (!_Wildcard) {

+               if (null == _Items) {

+                  _Items = new Hashtable();

+               }

+

+               _Items[header] = true;

+            }

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpCacheability.cs b/mcs/class/System.Web/System.Web/HttpCacheability.cs
new file mode 100644
index 00000000000..448996473c4
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpCacheability.cs
@@ -0,0 +1,18 @@
+//
+// System.Web.HttpCacheability.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+namespace System.Web {
+	[Serializable]
+	public enum HttpCacheability {
+		NoCache = 0x1,
+		Private,
+		Server,
+		Public,
+	}
+}
diff --git a/mcs/class/System.Web/System.Web/HttpClientCertificate.cs b/mcs/class/System.Web/System.Web/HttpClientCertificate.cs
new file mode 100644
index 00000000000..4ffc12c0cd8
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpClientCertificate.cs
@@ -0,0 +1,147 @@
+// 

+// System.Web.HttpClientCertificate

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Web;

+using System.Collections.Specialized;

+

+namespace System.Web {

+   [MonoTODO()]

+   public class HttpClientCertificate : NameValueCollection {

+      private HttpContext _Context;

+      private byte [] _BinaryIssuer;

+      private int _CertEncoding;

+      private byte [] _Certificate;

+      private string _Cookie;

+      private int _Flags;

+      private string _Issuer;      

+      private int _KeySize;

+      private byte [] _PublicKey;

+      private int _SecretKeySize;

+      private string _SerialNumber;

+      private string _ServerIssuer;

+      private string _ServerSubject;

+      private string _Subject;

+

+      private DateTime _ValidFrom;

+      private DateTime _ValidTo;

+

+      [MonoTODO("Decode ceritificate from Server variables.. CGI standard?")]

+      internal HttpClientCertificate(HttpContext Context) {

+         _Context = Context;

+         _Flags = 0;

+      }

+

+      public byte [] BinaryIssuer {

+         get {

+            return _BinaryIssuer;

+         }

+      }

+

+      public int CertEncoding {

+         get {

+            return _CertEncoding;

+         }

+      }

+

+      public byte [] Certificate {

+         get {

+            return _Certificate;

+         }

+      }

+

+      public string Cookie {

+         get {

+            return _Cookie;

+         }

+      }

+

+      public int Flags {

+         get {

+            return _Flags;

+         }

+      }

+

+      [MonoTODO()]

+      public bool IsPresent {

+         get {

+            return false;

+         }

+      }

+

+      public string Issuer {

+         get {

+            return _Issuer;

+         }

+      }

+

+      [MonoTODO()]

+      public bool IsValid {

+         get {

+            return false;

+         }

+      }

+

+      public int KeySize {

+         get {

+            return _KeySize;

+         }

+      }

+

+      public byte [] PublicKey {

+         get {

+            return _PublicKey;

+         }

+      }

+

+      public int SecretKeySize {

+         get {

+            return _SecretKeySize;

+         }

+      }

+

+      public string SerialNumber {

+         get {

+            return _SerialNumber;

+         }

+      }

+

+      public string ServerIssuer {

+         get {

+            return _ServerIssuer;

+         }

+      }

+

+      public string ServerSubject { 

+         get {

+            return _ServerSubject;

+         }

+      }

+

+      public string Subject { 

+         get {

+            return _Subject;

+         }

+      }

+

+      public DateTime ValidFrom {

+         get {

+            return _ValidFrom;

+         }

+      }

+

+      public DateTime ValidUntil {

+         get {

+            return ValidUntil;

+         }

+      }

+

+      [MonoTODO()]

+      public override string Get(string s) {

+         throw new NotImplementedException();

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpCompileException.cs b/mcs/class/System.Web/System.Web/HttpCompileException.cs
new file mode 100644
index 00000000000..d320ea4a631
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpCompileException.cs
@@ -0,0 +1,45 @@
+// 

+// System.Web.HttpCompileException.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.CodeDom.Compiler;

+

+namespace System.Web {

+	public sealed class HttpCompileException : HttpException {

+

+		#region Fields

+

+		CompilerResults results;

+		string sourceCode;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		internal HttpCompileException (CompilerResults results, string sourceCode)

+			: base ()

+		{

+			this.results = results;

+			this.sourceCode = sourceCode;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public CompilerResults Results {

+			get { return results; }

+		}

+

+		public string SourceCode {

+			get { return sourceCode; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/HttpContext.cs b/mcs/class/System.Web/System.Web/HttpContext.cs
new file mode 100644
index 00000000000..a6108672170
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpContext.cs
@@ -0,0 +1,318 @@
+//
+// System.Web.HttpContext
+//
+// Author:
+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)
+//
+using System;
+using System.Collections;
+using System.Security.Principal;
+using System.Web.Caching;
+using System.Web.Configuration;
+using System.Web.SessionState;
+using System.Threading;
+
+namespace System.Web
+{
+	public sealed class HttpContext : IServiceProvider
+	{
+		private Exception []	_arrExceptions;
+
+		private HttpResponse	_oResponse;
+		private HttpRequest _oRequest;
+		private HttpServerUtility _Server;
+		private HttpApplication _oApplication;
+		private HttpWorkerRequest _oWorkerRequest;
+		private IHttpHandler _Handler;
+		private IHttpAsyncHandler _AsyncHandler;
+		private IPrincipal _User;
+
+		private bool _skipauth;
+		private Hashtable		_oItems;
+		private DateTime		_oTimestamp;
+
+		public HttpContext (HttpRequest Request, HttpResponse Response)
+		{
+			Context = this;
+
+			_arrExceptions = null;
+			_oItems = null;
+			_oTimestamp = DateTime.Now;
+			_oRequest = Request;
+			_oResponse = Response;
+		}
+
+		public HttpContext (HttpWorkerRequest WorkerRequest)
+		{
+			Context = this;
+
+			_arrExceptions = null;
+			_oItems = null;
+			_oTimestamp = DateTime.Now;
+			_oRequest = new HttpRequest (WorkerRequest, this);
+			_oResponse = new HttpResponse (WorkerRequest, this);
+			_oWorkerRequest = WorkerRequest;
+		}
+
+		internal HttpWorkerRequest WorkerRequest
+		{
+			get {
+				return _oWorkerRequest;
+			}
+		}
+
+		[MonoTODO("Context - Use System.Remoting.Messaging.CallContext instead of Thread storage")]
+		internal static HttpContext Context
+		{
+			get {
+				return (HttpContext) Thread.GetData (Thread.GetNamedDataSlot ("Context"));
+			}
+
+			set {
+				Thread.SetData (Thread.GetNamedDataSlot ("Context"), value);
+			}
+		}
+
+		public Exception [] AllErrors
+		{
+			get {
+				return _arrExceptions;
+			}
+		}
+
+		public HttpApplicationState Application
+		{
+			get {
+				return HttpApplicationFactory.ApplicationState;
+			}
+		}
+
+		public HttpApplication ApplicationInstance
+		{
+			get {
+				return _oApplication;
+			}
+			set {
+				_oApplication = value;
+			}
+		}
+
+		public Cache Cache
+		{
+			get {
+				return HttpRuntime.Cache;
+			}
+		}
+
+		public static HttpContext Current
+		{
+			get {
+				return Context;
+			}
+		}
+
+		public Exception Error
+		{
+			get {
+				if (_arrExceptions == null || _arrExceptions.Length == 0)
+					return null;
+
+				return _arrExceptions [0];
+			}
+		}
+
+		public IHttpHandler Handler
+		{
+			get {    
+				return _Handler;
+			}
+
+			set {
+				_Handler = value;
+			}
+		}
+
+		internal IHttpAsyncHandler AsyncHandler
+		{
+			get {    
+				return _AsyncHandler;
+			}
+
+			set {
+				_AsyncHandler = value;
+			}
+		}
+
+		[MonoTODO("bool IsCustomErrorEnabled")]
+		public bool IsCustomErrorEnabled
+		{
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO("bool IsDebuggingEnabled")]
+		public bool IsDebuggingEnabled
+		{
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public IDictionary Items
+		{
+			get {
+				if (_oItems == null)
+					_oItems = new Hashtable ();
+
+				return _oItems;
+			}
+		}
+
+		public HttpRequest Request
+		{
+			get {
+				return _oRequest;
+			}
+		}
+
+		public HttpResponse Response
+		{
+			get {
+				return _oResponse;
+			}
+		}
+
+		public HttpServerUtility Server
+		{
+			get {
+				if (null == _Server)
+					_Server = new HttpServerUtility (this);
+
+				return _Server; 
+			}
+		}
+
+		public HttpSessionState Session
+		{
+			get {
+				return (HttpSessionState) Items ["sessionstate"];
+			}
+		}
+
+		public bool SkipAuthorization
+		{
+			get {
+				return _skipauth;
+			}
+
+			set {
+				_skipauth = value;
+			}
+		}
+
+		public DateTime Timestamp
+		{
+			get {
+				return _oTimestamp;
+			}
+		}
+
+		[MonoTODO("TraceContext Trace")]
+		public TraceContext Trace
+		{
+			get {
+				throw new NotImplementedException();
+			}
+		}
+
+		public IPrincipal User
+		{
+			get {
+				return _User;
+			}
+			set {
+				_User = value;
+			}
+		}
+
+		public void AddError (Exception errorInfo)
+		{
+			int iSize = 1;
+
+			if (_arrExceptions != null)
+				iSize += _arrExceptions.Length;
+
+			Exception [] arrNew = new Exception [iSize];
+
+			if (null != _arrExceptions)
+				_arrExceptions.CopyTo (arrNew, 0);
+
+			_arrExceptions = arrNew;
+
+			_arrExceptions [iSize - 1] = errorInfo;
+		}
+
+		public void ClearError ()
+		{
+			_arrExceptions = null;
+		}
+
+		[MonoTODO("GetConfig(string name)")]
+		public object GetConfig (string name)
+		{
+			throw new NotImplementedException();
+		}
+
+		[MonoTODO("GetAppConfig(string name)")]
+		public static object GetAppConfig (string name)
+		{
+			if (null == name)
+				throw new NotImplementedException();
+
+			// This is a temp hack to fix the config stuff
+			if  (name.ToLower() == "system.web/httpmodules") {
+				return new ModulesConfiguration();
+			}
+
+			if (name.ToLower() == "system.web/globalization") {
+				return new System.Web.Configuration.GlobalizationConfiguration();
+			}
+
+			throw new NotImplementedException();
+		}
+
+		object IServiceProvider.GetService (Type service)
+		{
+			if (service == typeof (HttpWorkerRequest)) 
+				return _oWorkerRequest;
+
+			if (service == typeof (HttpRequest))
+				return Request;
+
+			if (service == typeof (HttpResponse))
+				return Response;
+
+			if (service == typeof (HttpApplication))
+				return ApplicationInstance;
+
+			if (service == typeof (HttpApplicationState))
+				return Application;
+
+			if (service == typeof (HttpSessionState))
+				return Session;
+
+			if (service == typeof (HttpServerUtility))
+				return Server;
+
+			return null;
+		}
+
+		[MonoTODO("void RewritePath(string path)")]
+		public void RewritePath (string Path)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
+
diff --git a/mcs/class/System.Web/System.Web/HttpCookie.cs b/mcs/class/System.Web/System.Web/HttpCookie.cs
new file mode 100644
index 00000000000..f53cdc7ce94
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpCookie.cs
@@ -0,0 +1,177 @@
+// 

+// System.Web.HttpCookie

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Text;

+using System.Web;

+using System.Collections.Specialized;

+

+namespace System.Web {

+   public sealed class HttpCookie {

+      private string _Name;

+      private string _Value;

+      private string _Domain;

+      private DateTime _Expires;

+      private bool _ExpiresSet;

+      private string _Path;  

+      private bool _Secure = false;

+      

+      private HttpValueCollection _Values;

+

+      internal HttpCookie() {

+         _Path = "/";

+      }

+

+      public HttpCookie(string name) {

+         _Path = "/";

+         _Name = name;

+      }

+

+      public HttpCookie(string name, string value) {

+         _Name = name;

+         _Value = value;

+      }

+

+      HttpResponseHeader GetCookieHeader() {

+         StringBuilder oSetCookie = new StringBuilder();

+

+         if (null != _Name && _Name.Length > 0) {

+            oSetCookie.Append(_Name);

+            oSetCookie.Append("=");

+         }

+

+         if (null != _Values) {

+            oSetCookie.Append(_Values.ToString(false));

+         } else if (null != _Value) {

+            oSetCookie.Append(_Value);

+         }

+

+         if (null != _Domain && _Domain.Length > 0) {

+            oSetCookie.Append("; domain=");

+            oSetCookie.Append(_Domain);

+         }

+

+         if (null != _Path && Path.Length > 0) {

+            oSetCookie.Append("; path=");

+            oSetCookie.Append(_Path);

+         }

+

+         if (_Secure) {

+            oSetCookie.Append("; secure");

+         }

+

+         return new HttpResponseHeader(HttpWorkerRequest.HeaderSetCookie, oSetCookie.ToString());

+      }

+

+      public string Domain {

+         get {

+            return _Domain;

+         }

+         set {

+            _Domain = value;

+         }

+      }

+

+      public DateTime Expires {

+         get {

+            if (!_ExpiresSet) {

+               return DateTime.MinValue;

+            }

+

+            return _Expires;

+         }

+

+         set {

+            _ExpiresSet = true;

+            _Expires = value;

+         }

+      }

+

+      public bool HasKeys {

+         get {

+            return Values.HasKeys();

+         }

+      }

+

+      public string this[string key] {

+         get {

+            return Values[key];

+         }

+         

+         set {

+            Values[key] = value;

+         }

+      }

+

+      public string Name {

+         get {

+            return _Name;

+         }

+

+         set {

+            _Name = value;

+         }

+      }

+

+      public string Path {

+         get {

+            return _Path;

+         }

+

+         set {

+            _Path = value;

+         }

+      }

+

+      public bool Secure {

+         get {

+            return _Secure;

+         }

+         set {

+            _Secure = value;

+         }

+      }

+

+      public string Value {

+         get {

+            if (null != _Values) {

+               return _Values.ToString(false);

+            }

+            

+            return _Value;

+         }

+         set {

+            if (null != _Values) {

+               _Values.Reset();

+               _Values.Add(null, value);

+               return;

+            }

+

+            _Value = value;

+         }

+      }

+

+      public NameValueCollection Values {

+         get {

+            if (null == _Values) {

+               _Values = new HttpValueCollection();

+               if (null != _Value) {

+                  // Do we have multiple keys

+                  if (_Value.IndexOf("&") >= 0 || _Value.IndexOf("=") >= 0) {

+                     _Values.FillFromCookieString(_Value);

+                  } else {

+                     _Values.Add(null, _Value);

+                  }

+

+                  _Value = null;

+               }

+            }

+

+            return _Values;

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpCookieCollection.cs b/mcs/class/System.Web/System.Web/HttpCookieCollection.cs
new file mode 100644
index 00000000000..e3918e4a4f0
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpCookieCollection.cs
@@ -0,0 +1,139 @@
+// 

+// System.Web.HttpCookieCollection

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//   (First impl Bob Smith <bob@thestuff.net>)

+//

+

+using System;

+using System.Web;

+using System.Collections.Specialized;

+

+namespace System.Web {

+   public sealed class HttpCookieCollection : NameObjectCollectionBase {

+      private HttpCookie [] _AllCookies;

+      private string [] _AllKeys;

+      

+      private HttpResponse _Response;

+

+      internal HttpCookieCollection(HttpResponse Response, bool ReadOnly) : base() {

+         _Response = Response;

+         IsReadOnly = ReadOnly;

+      }

+

+      public HttpCookieCollection() {

+      }

+      

+      public string [] AllKeys {

+         get {

+            if (null == _AllKeys) {

+               _AllKeys = BaseGetAllKeys();

+            }

+

+            return _AllKeys;

+         }

+      }

+      

+      public HttpCookie this[int index] {

+         get {

+            return Get(index);

+         }

+      }

+      

+      public HttpCookie this[string name] {

+         get {

+            return Get(name);

+         }

+      }

+

+      public void Add(HttpCookie cookie) {

+         if (null != _Response) {

+            _Response.GoingToChangeCookieColl();

+         }

+

+         // empy performance cache

+         _AllCookies = null;

+         _AllKeys = null;

+

+         BaseAdd(cookie.Name, cookie);

+

+         if (null != _Response) {

+            _Response.OnCookieAdd(cookie);

+         }

+      }

+

+      public void Clear() {

+         _AllCookies = null;

+         _AllKeys = null;

+         this.BaseClear();

+      }

+

+      public void CopyTo(Array dest, int index) {

+         if (null == _AllCookies) {

+            _AllCookies = new HttpCookie[Count];

+

+            for (int i = 0; i != Count; i++) {

+               _AllCookies[i] = Get(i);

+            }

+         }

+

+         if (null != _AllCookies) {

+            _AllCookies.CopyTo(dest, index);

+         }

+      }

+

+      public HttpCookie Get(int index) {

+         return (HttpCookie) BaseGet(index);

+      }

+

+      public HttpCookie Get(string name) {

+         HttpCookie oRet = (HttpCookie) BaseGet(name);

+         if (null == oRet && _Response != null) {

+            _AllCookies = null;

+            _AllKeys = null;

+

+            _Response.GoingToChangeCookieColl();

+            

+            oRet = new HttpCookie(name);

+            BaseAdd(name, oRet);

+

+            _Response.OnCookieAdd(oRet);

+         }

+

+         return oRet;

+      }

+

+      public string GetKey(int index) {

+         return this.BaseGetKey(index);

+      }

+

+      public void Remove(string name) {

+         if (null != _Response) {

+            _Response.GoingToChangeCookieColl();

+         }

+

+         _AllCookies = null;

+         _AllKeys = null;

+         this.BaseRemove(name);

+         

+         if (null != _Response) {

+            _Response.ChangedCookieColl();

+         }

+      }

+

+      public void Set(HttpCookie cookie) {

+         if (null != _Response) {

+            _Response.GoingToChangeCookieColl();

+         }

+

+         _AllCookies = null;

+         _AllKeys = null;

+         this.BaseSet(cookie.Name, cookie);

+

+         if (null != _Response) {

+            _Response.ChangedCookieColl();

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpException.cs b/mcs/class/System.Web/System.Web/HttpException.cs
new file mode 100644
index 00000000000..594b825baf3
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpException.cs
@@ -0,0 +1,59 @@
+// 

+// System.Web.HttpException

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.Web {

+   [MonoTODO("This class contains a lot of windows specific methods, solve this.. :)")]

+   public class HttpException : ExternalException {

+      private int _HttpCode;

+      private int _HR;

+

+      public HttpException() : base() {

+      }

+

+      public HttpException(string sMessage) : base(sMessage) {

+      }

+

+      public HttpException(string sMessage, Exception InnerException) : base(sMessage, InnerException) {

+      }

+

+      public HttpException(int iHttpCode, string sMessage) : base(sMessage) {

+         _HttpCode = iHttpCode;

+      }

+

+      public HttpException(int iHttpCode, string sMessage, int iHR) : base(sMessage) {

+         _HttpCode = iHttpCode;

+         _HR = iHR;

+      }

+

+      public HttpException(string sMessage, int iHR) : base(sMessage) {

+         _HR = iHR;

+      }

+

+      public HttpException(int iHttpCode, string sMessage, Exception InnerException) : base(sMessage, InnerException) {

+         _HttpCode = iHttpCode;

+      }

+      

+      [MonoTODO("Should get an correct html message depending on error type")]

+      public string GetHtmlErrorMessage() {

+         throw new NotImplementedException();

+      }

+

+      [MonoTODO("Check error type and Set the correct error code")]

+      public int GetHttpCode() {

+         return _HttpCode;

+      }

+

+      [MonoTODO("Get the last error code")]

+      public static HttpException CreateFromLastError(string Message) {

+         return new HttpException(Message);

+      }

+

+

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpFileCollection.cs b/mcs/class/System.Web/System.Web/HttpFileCollection.cs
new file mode 100644
index 00000000000..423a5d4f605
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpFileCollection.cs
@@ -0,0 +1,73 @@
+// 

+// System.Web.HttpFileCollection

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Collections.Specialized;

+

+namespace System.Web {

+   public sealed class HttpFileCollection : NameObjectCollectionBase {

+      private HttpPostedFile [] _AllFiles;

+      private string [] _AllKeys;

+

+      internal HttpFileCollection() : base() {

+      }

+

+      internal void AddFile(string name, HttpPostedFile file) {

+         _AllFiles = null;

+         _AllKeys = null;

+

+         BaseAdd(name, file);

+      }

+

+      public void CopyTo(Array Dest, int index) {

+         if (null == _AllFiles) {

+            _AllFiles = new HttpPostedFile[Count];

+            for (int i = 0; i != Count; i++) {

+               _AllFiles[i] = Get(i);

+            }

+         }

+

+         if (null != _AllFiles) {

+            _AllFiles.CopyTo(Dest, index);

+         }

+      }

+

+      public HttpPostedFile Get(string Name) {

+         return (HttpPostedFile) BaseGet(Name);

+      }

+

+      public HttpPostedFile Get(int index) {

+         return (HttpPostedFile) BaseGet(index);

+      }

+

+      public string GetKey(int index) {

+         return BaseGetKey(index);

+      }

+

+      public string [] AllKeys {

+         get {

+            if (null == _AllKeys) {

+               _AllKeys = BaseGetAllKeys();

+            }

+

+            return _AllKeys;

+         }

+      }

+      

+      public HttpPostedFile this [string name] {

+         get {

+            return Get(name);

+         }

+      }

+

+      public HttpPostedFile this [int index] {

+         get {

+            return Get(index);

+         }

+      }

+   

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpHelper.cs b/mcs/class/System.Web/System.Web/HttpHelper.cs
new file mode 100644
index 00000000000..9798f8b3b4b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpHelper.cs
@@ -0,0 +1,48 @@
+// 

+// System.Web.HttpHelper

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Collections;

+using System.IO;

+

+namespace System.Web {

+   internal class HttpHelper {

+      internal static string [] ParseMultiValueHeader(string header) {

+         if (null == header) {

+            return null;

+         }

+

+         if (header.Length == 0) {

+            return null;

+         }

+

+         // Parse the , chars

+         Stack oValues = new Stack();

+

+         string sValue;

+

+         int iLastPos = -1;

+         int iPos = header.IndexOf(",");

+

+         while (iPos != -1) {

+            sValue = header.Substring(iLastPos + 1, iPos - iLastPos - 1).Trim();

+            iLastPos = iPos;

+

+            iPos = header.IndexOf(",", iPos + 1);

+            oValues.Push(sValue);

+         }

+

+         sValue = header.Substring(iLastPos + 1).Trim();

+         oValues.Push(sValue);

+

+         string [] arrValues = new string[oValues.Count];

+

+         Array.Copy(oValues.ToArray(), 0, arrValues, 0, oValues.Count);

+

+         return arrValues;

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpModuleCollection.cs b/mcs/class/System.Web/System.Web/HttpModuleCollection.cs
new file mode 100644
index 00000000000..c7dc329abc8
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpModuleCollection.cs
@@ -0,0 +1,73 @@
+// 

+// System.Web.HttpModuleCollection

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Collections.Specialized;

+

+namespace System.Web {

+   public sealed class HttpModuleCollection : NameObjectCollectionBase {

+      private IHttpModule [] _Modules;

+      private string [] _Keys;

+

+      internal HttpModuleCollection() : base() {

+      }

+

+      internal void AddModule(string key, IHttpModule m) {

+         _Modules = null;

+         _Keys = null;

+

+         BaseAdd(key, m);

+      }

+

+      public void CopyTo(Array dest, int index) {

+         if (null == _Modules) {

+            _Modules = new IHttpModule[Count];

+

+            for (int i = 0; i != Count; i++) {

+               _Modules[i] = Get(i);

+            }

+         }

+

+         if (null != _Modules) {

+            _Modules.CopyTo(dest, index);

+         }

+      }

+

+      public IHttpModule Get(string key) {

+         return (IHttpModule) BaseGet(key);

+      }

+      

+      public IHttpModule Get(int index) {

+         return (IHttpModule) BaseGet(index);

+      }

+

+      public string GetKey(int index) {

+         return GetKey(index);

+      }

+      

+      public string [] AllKeys {

+         get {

+            if (null == _Keys) {

+               _Keys = BaseGetAllKeys();

+            }

+

+            return _Keys;

+         }

+      }   

+

+      public IHttpModule this [string key] {

+         get {

+            return Get(key);

+         }

+      }

+

+      public IHttpModule this [int index] {

+         get {

+            return Get(index);

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpParseException.cs b/mcs/class/System.Web/System.Web/HttpParseException.cs
new file mode 100644
index 00000000000..9683dc8a835
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpParseException.cs
@@ -0,0 +1,44 @@
+// 

+// System.Web.HttpParseException.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web {

+	public sealed class HttpParseException : HttpException {

+

+		#region Fields

+		

+		string fileName;

+		int line;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		[MonoTODO ("Figure out what to do with this.")]

+		internal HttpParseException (string message, Exception innerException, string sourceCode, string fileName, int line)

+			: base (message, innerException)

+		{

+			this.fileName = fileName;

+			this.line = line;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string FileName {

+			get { return fileName; }

+		}

+

+		public int Line {

+			get { return line; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/HttpPostedFile.cs b/mcs/class/System.Web/System.Web/HttpPostedFile.cs
new file mode 100644
index 00000000000..02c02fc217a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpPostedFile.cs
@@ -0,0 +1,56 @@
+// 

+// System.Web.HttpPostedFile

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.IO;

+

+namespace System.Web {

+   public sealed class HttpPostedFile {

+      private HttpRequestStream _Stream;

+      private string _ContentType;

+      private string _FileName;

+

+      internal HttpPostedFile(string file, string type, HttpRequestStream data) {

+         _Stream = data;

+         _FileName = file;

+         _ContentType = type;

+      }

+

+      public void SaveAs(string filename) {

+         FileStream File = new FileStream(filename, FileMode.Create);

+         if (_Stream.DataLength > 0) {

+            File.Write(_Stream.Data, _Stream.DataOffset, _Stream.DataLength);

+         }

+

+         File.Flush();

+         File.Close();

+      }

+

+      public int ContentLength {

+         get {

+            return _Stream.DataLength;

+         }

+      }

+

+      public string ContentType {

+         get {

+            return _ContentType;

+         }

+      }

+

+      public string FileName {

+         get {

+            return _FileName;

+         }

+      }

+

+      public Stream InputStream {

+         get {

+            return _Stream;

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpRequest.cs b/mcs/class/System.Web/System.Web/HttpRequest.cs
new file mode 100644
index 00000000000..25ff3230bd1
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpRequest.cs
@@ -0,0 +1,843 @@
+// 

+// System.Web.HttpRequest

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+using System.IO;

+using System.Text;

+using System.Web.Configuration;

+

+namespace System.Web {

+	[MonoTODO("Review security in all path access function")]

+	public sealed class HttpRequest {

+		private string []	_arrAcceptTypes;

+		private string []	_arrUserLanguages;

+

+		private byte [] _arrRawContent;

+		private int	_iContentLength;

+

+		private string	_sContentType;

+		private string	_sHttpMethod;

+		private string	_sRawUrl;

+		private string	_sUserAgent;

+		private string	_sUserHostAddress;

+		private string	_sUserHostName;

+		private string	_sPath;

+		private string	_sPathInfo;

+		private string _sFilePath;

+		private string _sPathTranslated;

+		private string _sQueryStringRaw;

+		private string _sRequestType;

+		private string _sRequestRootVirtualDir;

+

+		private Encoding _oContentEncoding;

+

+		private Uri _oUriReferrer;

+		private Uri _oUrl;

+

+		private int	_iTotalBytes;

+

+		private HttpContext	_oContext;

+

+		private HttpWorkerRequest _WorkerRequest;

+		private HttpRequestStream	_oInputStream;

+		private HttpClientCertificate _ClientCert;

+

+		private HttpValueCollection _oServerVariables;

+		private HttpValueCollection _oHeaders;

+		private HttpValueCollection _oQueryString;

+		private HttpValueCollection _oFormData;

+		private HttpValueCollection _oParams;

+

+		private HttpBrowserCapabilities _browser;

+

+		public HttpRequest(string Filename, string Url, string Querystring) {

+			_iContentLength = -1;

+			_iTotalBytes = -1;

+

+			_WorkerRequest = null;

+			_sPathTranslated = Filename;

+			_sRequestType = "GET";

+

+			_oUrl = new Uri(Url);

+			_sPath = _oUrl.AbsolutePath;

+

+			_sQueryStringRaw = Querystring;

+			_oQueryString = new HttpValueCollection(Querystring, true, Encoding.Default);

+		}

+

+		internal HttpRequest(HttpWorkerRequest WorkRequest, HttpContext Context) {

+			_WorkerRequest = WorkRequest;

+			_oContext = Context;

+

+			_iContentLength = -1;

+			_iTotalBytes = -1;

+		}

+

+		static private string MakeServerVariableFromHeader(string header) {

+			return "HTTP_" + header.ToUpper().Replace("-", "_");

+		}

+

+		[MonoTODO("Need to support non-raw mode also..")]

+		private string GetAllHeaders(bool Raw) {

+			StringBuilder oData;

+

+			if (null == _WorkerRequest) {

+				return null;

+			}

+

+			oData = new StringBuilder(512);

+

+			string sHeaderValue;

+			string sHeaderName;

+			int iCount = 0;

+

+			// Add all know headers

+			for (; iCount != 40; iCount++) {

+				sHeaderValue = _WorkerRequest.GetKnownRequestHeader(iCount);

+				if (null != sHeaderValue && sHeaderValue.Length > 0) {

+					sHeaderName = _WorkerRequest.GetKnownRequestHeader(iCount);

+					if (null != sHeaderName && sHeaderName.Length > 0) {

+						oData.Append(sHeaderName);

+						oData.Append(": ");

+						oData.Append(sHeaderValue);

+						oData.Append("\r\n");

+					}

+				}

+			}

+

+			// Get all other headers

+			string [][] arrUnknownHeaders = _WorkerRequest.GetUnknownRequestHeaders();

+			if (null != arrUnknownHeaders) {

+				for (iCount = 0; iCount != arrUnknownHeaders.Length; iCount++) {

+					oData.Append(arrUnknownHeaders[iCount][0]);

+					oData.Append(": ");

+					oData.Append(arrUnknownHeaders[iCount][1]);

+					oData.Append("\r\n");

+				}

+			}

+

+			return oData.ToString();

+		}

+      

+		[MonoTODO("We need to handly 'dynamic' variables like AUTH_USER, that can be changed during runtime... special collection")]

+		private void ParseServerVariables() {

+			if (null == _WorkerRequest) {

+				return;

+			}

+

+			if (_oServerVariables == null) {

+				string sTmp;

+

+				_oServerVariables = new HttpValueCollection();

+				

+				_oServerVariables.Add("ALL_HTTP", GetAllHeaders(false));

+				_oServerVariables.Add("ALL_RAW", GetAllHeaders(true));

+

+				_oServerVariables.Add("APPL_MD_PATH", _WorkerRequest.GetServerVariable("APPL_MD_PATH"));

+				_oServerVariables.Add("AUTH_PASSWORD", _WorkerRequest.GetServerVariable("AUTH_PASSWORD"));

+				_oServerVariables.Add("CERT_COOKIE", _WorkerRequest.GetServerVariable("CERT_COOKIE"));

+				_oServerVariables.Add("CERT_FLAGS", _WorkerRequest.GetServerVariable("CERT_FLAGS"));

+				_oServerVariables.Add("CERT_ISSUER", _WorkerRequest.GetServerVariable("CERT_ISSUER"));

+				_oServerVariables.Add("CERT_KEYSIZE", _WorkerRequest.GetServerVariable("CERT_KEYSIZE"));

+				_oServerVariables.Add("CERT_SECRETKEYSIZE", _WorkerRequest.GetServerVariable("CERT_SECRETKEYSIZE"));

+				_oServerVariables.Add("CERT_SERIALNUMBER", _WorkerRequest.GetServerVariable("CERT_SERIALNUMBER"));

+				_oServerVariables.Add("CERT_SERVER_ISSUER", _WorkerRequest.GetServerVariable("CERT_SERVER_ISSUER"));

+				_oServerVariables.Add("CERT_SERVER_SUBJECT", _WorkerRequest.GetServerVariable("CERT_SERVER_SUBJECT"));

+				_oServerVariables.Add("CERT_SUBJECT", _WorkerRequest.GetServerVariable("CERT_SUBJECT"));

+

+				_oServerVariables.Add("GATEWAY_INTERFACE", _WorkerRequest.GetServerVariable("GATEWAY_INTERFACE"));

+				_oServerVariables.Add("HTTPS", _WorkerRequest.GetServerVariable("HTTPS"));

+				_oServerVariables.Add("HTTPS_KEYSIZE", _WorkerRequest.GetServerVariable("HTTPS_KEYSIZE"));

+				_oServerVariables.Add("HTTPS_SECRETKEYSIZE", _WorkerRequest.GetServerVariable("HTTPS_SECRETKEYSIZE"));

+

+				_oServerVariables.Add("CONTENT_TYPE", ContentType);

+				_oServerVariables.Add("HTTPS_SERVER_ISSUER", _WorkerRequest.GetServerVariable("HTTPS_SERVER_ISSUER"));

+				_oServerVariables.Add("HTTPS_SERVER_SUBJECT", _WorkerRequest.GetServerVariable("HTTPS_SERVER_SUBJECT"));

+				_oServerVariables.Add("INSTANCE_ID", _WorkerRequest.GetServerVariable("INSTANCE_ID"));

+				_oServerVariables.Add("INSTANCE_META_PATH", _WorkerRequest.GetServerVariable("INSTANCE_META_PATH"));

+				_oServerVariables.Add("LOCAL_ADDR", _WorkerRequest.GetLocalAddress());

+				_oServerVariables.Add("REMOTE_ADDR", UserHostAddress);

+				_oServerVariables.Add("REMOTE_HOST", UserHostName);

+				_oServerVariables.Add("REQUEST_METHOD", HttpMethod);

+				_oServerVariables.Add("SERVER_NAME", _WorkerRequest.GetServerName());

+				_oServerVariables.Add("SERVER_PORT", _WorkerRequest.GetLocalPort().ToString());

+				_oServerVariables.Add("SERVER_PROTOCOL", _WorkerRequest.GetHttpVersion());

+				_oServerVariables.Add("SERVER_SOFTWARE", _WorkerRequest.GetServerVariable("SERVER_SOFTWARE"));

+

+				if (_WorkerRequest.IsSecure()) {

+					_oServerVariables.Add("SERVER_PORT_SECURE", "1");

+				} else {

+					_oServerVariables.Add("SERVER_PORT_SECURE", "0");

+				}

+

+				sTmp = _WorkerRequest.GetKnownRequestHeader(HttpWorkerRequest.HeaderContentLength);

+				if (null != sTmp) {

+					_oServerVariables.Add("CONTENT_LENGTH", sTmp);

+				}

+

+				// TODO: Should be dynamic

+				if (null != _oContext.User && _oContext.User.Identity.IsAuthenticated) {

+					_oServerVariables.Add("AUTH_TYPE", _oContext.User.Identity.AuthenticationType);

+					_oServerVariables.Add("AUTH_USER", _oContext.User.Identity.Name);

+				} else {

+					_oServerVariables.Add("AUTH_TYPE", "");

+					_oServerVariables.Add("AUTH_USER", "");

+				}

+

+				_oServerVariables.Add("PATH_INFO", PathInfo);

+				_oServerVariables.Add("PATH_TRANSLATED", PhysicalPath);

+				_oServerVariables.Add("QUERY_STRING", QueryStringRaw);

+				_oServerVariables.Add("SCRIPT_NAME", FilePath);

+				// end dynamic

+            

+				_oServerVariables.MakeReadOnly();

+			}

+		}

+

+		[MonoTODO("Handle Multipart data also, content-encoding check")]

+		private void ParseFormData() {

+			if (_oFormData == null) {

+				byte [] arrData = GetRawContent();

+				_oFormData = new HttpValueCollection(ContentEncoding.GetString(arrData), true, ContentEncoding);

+			}

+		}

+

+		[MonoTODO("void Dispose")]

+		internal void Dispose() {			

+		}

+

+		[MonoTODO("Handle Multipart data, max content length?")]

+		private byte [] GetRawContent() {

+			if (null == _arrRawContent) {

+				if (null == _WorkerRequest) {

+					if (QueryStringRaw == null)

+						return null;

+					char [] q = QueryStringRaw.ToCharArray ();

+					_arrRawContent = new byte [q.Length];

+					for (int i = 0; i < q.Length; i++)

+						_arrRawContent [i] = (byte) q [i];

+					return _arrRawContent;

+				}

+

+				// TODO: Check max length?

+				_arrRawContent = _WorkerRequest.GetPreloadedEntityBody();

+				if (!_WorkerRequest.IsEntireEntityBodyIsPreloaded()) {

+					byte [] arrTemp;

+					byte [] arrBuffer;

+					

+					arrBuffer = new byte[16384];

+					int iLoaded = 16384;

+

+					while (iLoaded == arrBuffer.Length) {

+						iLoaded = _WorkerRequest.ReadEntityBody(arrBuffer, arrBuffer.Length);

+						

+						// Save data

+						arrTemp = new byte[_arrRawContent.Length + iLoaded];

+						

+						Array.Copy(_arrRawContent, 0, arrTemp, 0, _arrRawContent.Length);

+						Array.Copy(arrBuffer, 0, arrTemp, _arrRawContent.Length, iLoaded);

+

+						_arrRawContent = arrTemp;

+					}

+				}

+			} 

+

+			return _arrRawContent;

+		}

+

+		public string [] AcceptTypes {

+			get {

+				if (null == _arrAcceptTypes && null != _WorkerRequest) {

+					_arrAcceptTypes = HttpHelper.ParseMultiValueHeader(_WorkerRequest.GetKnownRequestHeader(HttpWorkerRequest.HeaderAccept));

+				} 

+

+				return _arrAcceptTypes;

+				

+			}

+		}

+

+		public string ApplicationPath {

+			get {

+				if (null != _WorkerRequest) {

+					return _WorkerRequest.GetAppPath();

+				}

+

+				return null;

+			}

+		}

+

+		public HttpBrowserCapabilities Browser {

+			get { return _browser; }

+

+			set { _browser = value; }

+		}

+

+		public HttpClientCertificate ClientCertificate {

+			get {

+				if (null == _ClientCert) {

+					_ClientCert = new HttpClientCertificate(_oContext);

+				}

+

+				return _ClientCert;

+			}

+		}

+

+		[MonoTODO("Get content encoding from Syste.Web.Configuration namespace")]

+		public Encoding ContentEncoding {

+			get {

+				if (_oContentEncoding == null) {

+					// TODO: Get from config what is the default encoding

+					// TODO: Should we get encoding from HttpHeaders? Just get charset from ContentType and the get encoding..

+					_oContentEncoding = Encoding.Default;

+				}

+

+				return _oContentEncoding;

+			}

+

+			set {

+				_oContentEncoding = value;

+			}

+		}

+

+		public int ContentLength {

+			get {

+				if (_iContentLength == -1 && null != _WorkerRequest) {

+					string sLength = _WorkerRequest.GetKnownRequestHeader(HttpWorkerRequest.HeaderContentLength);

+					if (sLength != null) {

+						try {

+							_iContentLength = Int32.Parse(sLength);

+						}

+						catch(Exception) {

+						}

+					} 

+				}

+

+				if (_iContentLength < 0) {

+					_iContentLength = 0;

+				}

+

+				return _iContentLength;

+			}

+		}

+

+		public string ContentType {

+			get {

+				if (null == _sContentType) {

+					if (null != _WorkerRequest) {

+						_sContentType = _WorkerRequest.GetKnownRequestHeader(HttpWorkerRequest.HeaderContentType);

+					}

+

+					if (null == _sContentType) {

+						_sContentType = string.Empty;

+					}

+				}

+

+				return _sContentType;

+			}

+		}

+

+		[MonoTODO()]

+		public HttpCookieCollection Cookies {

+			get {

+				throw new NotImplementedException();

+			}

+		}

+

+		[MonoTODO()]

+		public string CurrentExecutionFilePath {

+			get {

+				throw new NotImplementedException();

+			}

+		}

+

+		public string FilePath {

+			get {

+				if (null == _sFilePath && null != _WorkerRequest) {

+					_sFilePath = _WorkerRequest.GetFilePath();

+				}

+

+				return _sFilePath;

+			}

+		}

+

+		[MonoTODO()]

+		public HttpFileCollection Files {

+			get {

+				throw new NotImplementedException();

+			}

+		}

+

+		[MonoTODO("Use stream filter in the request stream")]

+		public Stream Filter {

+			get {

+				throw new NotImplementedException();

+			}

+

+			set {

+				throw new NotImplementedException();

+			}

+		}

+

+

+		public NameValueCollection Form {

+			get {

+				ParseFormData();

+

+				return (NameValueCollection) _oFormData;

+			}

+		}

+

+		public NameValueCollection Headers {

+			get {

+				if (_oHeaders == null) {

+					_oHeaders = new HttpValueCollection();

+

+					if (null != _WorkerRequest) {

+						string sHeaderValue;

+						string sHeaderName;

+						int iCount = 0;

+

+						// Add all know headers

+						for (; iCount != 40; iCount++) {

+							sHeaderValue = _WorkerRequest.GetKnownRequestHeader(iCount);

+							if (null != sHeaderValue && sHeaderValue.Length > 0) {

+								sHeaderName = _WorkerRequest.GetKnownRequestHeader(iCount);

+								if (null != sHeaderName && sHeaderName.Length > 0) {

+									_oHeaders.Add(sHeaderName, sHeaderValue);

+								}

+							}

+						}

+

+						// Get all other headers

+						string [][] arrUnknownHeaders = _WorkerRequest.GetUnknownRequestHeaders();

+						if (null != arrUnknownHeaders) {

+							for (iCount = 0; iCount != arrUnknownHeaders.Length; iCount++) {

+								_oHeaders.Add(arrUnknownHeaders[iCount][0], arrUnknownHeaders[iCount][1]);

+							}

+						}

+					}

+

+					// Make headers read-only

+					_oHeaders.MakeReadOnly();

+				}

+

+				return (NameValueCollection) _oHeaders;

+			}

+		}

+

+		public string HttpMethod {

+			get {

+				if (null == _sHttpMethod) {

+					if (null != _WorkerRequest) {

+						_sHttpMethod = _WorkerRequest.GetHttpVerbName().ToUpper();

+					}

+               

+					if (_sHttpMethod == null) {

+						if (RequestType != null)

+							_sHttpMethod = RequestType;

+						else

+							_sHttpMethod = "GET";

+					}

+				}

+

+				return _sHttpMethod;

+			}

+		}

+

+		public Stream InputStream {

+			get {

+				if (_oInputStream == null) {

+					byte [] arrInputData = GetRawContent();

+

+					if (null != arrInputData) {

+						_oInputStream = new HttpRequestStream(arrInputData, 0, arrInputData.Length);

+					} else {

+						_oInputStream = new HttpRequestStream(null, 0, 0);

+					}

+				}

+

+				return _oInputStream;

+			} 

+		}

+

+		public bool IsAuthenticated {

+			get {

+				if (_oContext != null && _oContext.User != null && _oContext.User.Identity != null) {

+					return _oContext.User.Identity.IsAuthenticated;

+				}

+

+				return false;

+			}

+		}

+

+		public bool IsSecureConnection {

+			get {

+				if (null != _WorkerRequest) {

+					return _WorkerRequest.IsSecure();

+				}

+

+				return false;

+			}

+		}

+

+		[MonoTODO("Call item in querystring, form, cookie and servervariables")]

+		public string this [string sKey] {

+			get {

+				throw new NotImplementedException();

+			}

+		}

+

+		[MonoTODO("Add cookie collection to our Params collection via merge")]

+		public NameValueCollection Params {

+			get {

+				if (_oParams == null) {

+					_oParams = new HttpValueCollection();

+					

+					_oParams.Merge(QueryString);

+					_oParams.Merge(Form);

+					_oParams.Merge(ServerVariables);

+					// TODO: Cookie

+

+					_oParams.MakeReadOnly();

+				}

+

+				return (NameValueCollection) _oParams;

+			}

+		}

+		

+		public string Path {

+			get {

+				if (_sPath == null) {

+					if (null != _WorkerRequest) {

+						_sPath = _WorkerRequest.GetUriPath();

+					}

+

+					if (_sPath == null) {

+						_sPath = string.Empty;

+					}

+				}

+

+				return _sPath;

+			}

+		}

+		

+		public string PathInfo {

+			get {

+				if (_sPathInfo == null) {

+					if (null != _WorkerRequest) {

+						_sPathInfo = _WorkerRequest.GetPathInfo();

+					}

+

+					if (_sPathInfo == null) {

+						_sPathInfo = string.Empty;

+					}

+				}

+				

+				return _sPathInfo;

+			}

+		}

+

+		public string PhysicalApplicationPath {

+			get {

+				if (null != _WorkerRequest) {

+					return _WorkerRequest.GetAppPathTranslated();

+				}

+

+				return null;

+			}

+		}

+

+		public string PhysicalPath {

+			get {

+				if (null != _WorkerRequest) {

+					_sPathTranslated = _WorkerRequest.GetFilePathTranslated();

+					if (null == _sPathTranslated) {

+						_sPathTranslated = _WorkerRequest.MapPath(FilePath);

+					}

+				}

+

+				return _sPathTranslated;

+			}

+		}

+

+		public NameValueCollection QueryString {

+			get {

+				if (_oQueryString == null) {

+					_oQueryString = new HttpValueCollection(QueryStringRaw, true, Encoding.UTF8);

+				}

+

+				return _oQueryString;

+			}

+		}

+

+		// Used to parse the querystring

+		internal string QueryStringRaw {

+			get {

+				if (_sQueryStringRaw == null && null != _WorkerRequest) {

+					byte [] arrQuerystringBytes = _WorkerRequest.GetQueryStringRawBytes();

+					if (null != arrQuerystringBytes && arrQuerystringBytes.Length > 0) {

+						_sQueryStringRaw = ContentEncoding.GetString(arrQuerystringBytes);

+					} else {

+						_sQueryStringRaw = _WorkerRequest.GetQueryString();   

+					}

+				}

+

+				if (_sQueryStringRaw == null) {

+					_sQueryStringRaw = string.Empty;

+				}

+

+				return _sQueryStringRaw;

+			}

+		}

+

+		public string RawUrl {

+			get {

+				if (null == _sRawUrl) {

+					if (null != _WorkerRequest) {

+						_sRawUrl = _WorkerRequest.GetRawUrl();

+					} else {

+						_sRawUrl = Path;

+						if (QueryStringRaw != null && QueryStringRaw.Length > 0) {

+							_sRawUrl = _sRawUrl + "?" + QueryStringRaw;

+						}

+					}

+				}

+

+				return _sRawUrl;

+			}

+		}

+

+		public string RequestType {

+			get {

+				if (null == _sRequestType) {

+					return HttpMethod;

+				}

+         

+				return _sRequestType;

+			}

+

+			set {

+				_sRequestType = value;

+			}

+		}

+		

+      

+		public NameValueCollection ServerVariables {

+			get {

+				ParseServerVariables();

+

+				return (NameValueCollection) _oServerVariables;

+			}

+		}      

+

+		public int TotalBytes {

+			get {

+				if (_iTotalBytes == -1) {

+					if (null != InputStream) {

+						_iTotalBytes = (int) InputStream.Length;

+					} else {

+						_iTotalBytes = 0;

+					}

+				}

+

+				return _iTotalBytes;

+			}

+		}

+

+		public Uri Url {

+			get {

+				if (null == _oUrl) {

+					_oUrl = new Uri(RawUrl);

+				}

+

+				return _oUrl;

+			}

+		}

+

+		public Uri UrlReferrer {

+			get {

+				if (null == _oUriReferrer && null != _WorkerRequest) {

+					string sReferrer = _WorkerRequest.GetKnownRequestHeader(HttpWorkerRequest.HeaderReferer);

+					if (null != sReferrer && sReferrer.Length > 0) {

+						try {

+							if (sReferrer.IndexOf("://") >= 0) {

+								_oUriReferrer = new Uri(sReferrer);

+							} else {

+								_oUriReferrer = new Uri(this.Url, sReferrer);

+							}

+						}

+						catch (Exception) {

+						}

+					}

+				}

+

+				return _oUriReferrer;

+			}

+		}

+

+		public string UserAgent {

+			get {

+				if (_sUserAgent == null && _WorkerRequest != null) {

+					_sUserAgent = _WorkerRequest.GetKnownRequestHeader(HttpWorkerRequest.HeaderUserAgent);

+				}

+

+				if (_sUserAgent == null) {

+					_sUserAgent = string.Empty;

+				}

+

+				return _sUserAgent;

+			}

+		}

+

+		public string UserHostAddress {

+			get {

+				if (_sUserHostAddress == null && null != _WorkerRequest) {

+					_sUserHostAddress = _WorkerRequest.GetRemoteAddress();

+				}

+

+				if (_sUserHostAddress == null || _sUserHostAddress.Length == 0) {

+					_sUserHostAddress = "127.0.0.1";

+				}

+

+				return _sUserHostAddress;

+			}

+		}

+		

+		public string UserHostName {

+			get {

+				if (_sUserHostName == null && null != _WorkerRequest) {

+					_sUserHostName = _WorkerRequest.GetRemoteName();

+				}

+

+				if (_sUserHostName == null || _sUserHostName.Length == 0) {

+					_sUserHostName = UserHostAddress;

+				}

+

+				return _sUserHostName;

+			}

+		}

+		

+		public string [] UserLanguages {

+			get {

+				if (_arrUserLanguages == null && null != _WorkerRequest) {

+					_arrUserLanguages = HttpHelper.ParseMultiValueHeader(_WorkerRequest.GetKnownRequestHeader(HttpWorkerRequest.HeaderAcceptLanguage));

+				}

+

+				return _arrUserLanguages;

+			}

+		}

+

+		public byte [] BinaryRead(int count) {

+			int iSize = TotalBytes;

+			if (iSize == 0) {

+				throw new ArgumentException();

+			}

+

+			byte [] arrData = new byte[iSize];

+			

+			int iRetSize = InputStream.Read(arrData, 0, iSize);

+			if (iRetSize != iSize) {

+				byte [] tmpData = new byte[iRetSize];

+				if (iRetSize > 0) {

+					Array.Copy(arrData, 0, tmpData, 0, iRetSize);

+				}

+

+				arrData = tmpData;

+			}

+

+			return arrData;

+		}

+

+		public int [] MapImageCoordinates(string ImageFieldName) {

+			NameValueCollection oItems;

+

+			if (HttpMethod == "GET" || HttpMethod == "HEAD") {

+				oItems = QueryString;

+			} else if (HttpMethod == "POST") {

+				oItems = Form;

+			} else {

+				return null;

+			}

+

+			int [] arrRet = null;

+			try {

+				string sX = oItems.Get(ImageFieldName + ".x");

+				string sY = oItems.Get(ImageFieldName + ".y");

+

+				if (null != sX && null != sY) {

+					int [] arrTmp = new Int32[2];

+					arrRet[0] = Int32.Parse(sX);

+					arrRet[1] = Int32.Parse(sY);

+

+					arrRet = arrTmp;

+				}

+			}

+			catch (Exception) {

+			}

+

+			return arrRet;

+		}

+

+		public string MapPath(string VirtualPath) {

+			if (null == _sRequestRootVirtualDir) {

+				if (null == FilePath || FilePath.Length == 0) {

+					throw new ArgumentException("Filepath can't be empty");

+				}

+

+				if (FilePath[0] != '/') {

+					throw new ArgumentException("Filepath must be a root");

+				}

+

+				_sRequestRootVirtualDir = FilePath.Substring(0, FilePath.LastIndexOf('/'));

+				if (_sRequestRootVirtualDir.Length == 0) {

+					_sRequestRootVirtualDir = "/";

+				}

+			}

+

+			return MapPath(VirtualPath, _sRequestRootVirtualDir, true);

+		}

+

+		[MonoTODO("Build a path to send to MapPath in the workerrequest")]

+		public string MapPath(string virtualPath, string baseVirtualDir, bool allowCrossAppMapping) {

+			throw new NotImplementedException();

+		}

+

+		public void SaveAs(string filename, bool includeHeaders) {

+			FileStream oFile;

+			TextWriter oWriter;

+			HttpRequestStream oData;

+

+			oFile = new FileStream(filename, FileMode.CreateNew);

+			if (includeHeaders) {

+				oWriter = new StreamWriter(oFile);

+				oWriter.Write(HttpMethod + " " + Path);

+

+				if (QueryStringRaw != null && QueryStringRaw.Length > 0)

+					oWriter.Write("?" + QueryStringRaw);

+				if (_WorkerRequest != null) {

+					oWriter.Write(" " + _WorkerRequest.GetHttpVersion() + "\r\n");

+					oWriter.Write(GetAllHeaders(true));

+				} else {

+					oWriter.Write("\r\n");

+				}

+

+				oWriter.Write("\r\n");

+				oWriter.Flush();

+			}

+

+			oData = (HttpRequestStream) InputStream;

+

+			if (oData.DataLength > 0) {

+				oFile.Write(oData.Data, oData.DataOffset, oData.DataLength);

+			}

+

+			oFile.Flush();

+			oFile.Close();

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/HttpRequestStream.cs b/mcs/class/System.Web/System.Web/HttpRequestStream.cs
new file mode 100644
index 00000000000..c67281d3dd1
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpRequestStream.cs
@@ -0,0 +1,142 @@
+// 

+// System.Web.HttpRequestStream

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.IO;

+

+namespace System.Web {

+   public class HttpRequestStream : Stream {

+      private byte []	_arrData;

+      private int			_iLength;

+      private int			_iOffset;

+      private int			_iPos;

+

+      internal HttpRequestStream(byte [] buffer, int offset, int length) {

+         _iPos = 0;

+         _iOffset = offset;

+         _iLength = length;

+

+         _arrData = buffer;

+      }

+		

+      private void Reset() {

+         _iPos = 0;

+         _iOffset = 0;

+         _iLength = 0;

+

+         _arrData = null;

+      }

+

+      public override void Flush() {

+      }

+

+      public override void Close() {

+         Reset();

+      }

+

+      public override int Read(byte [] buffer, int offset, int length) {

+         int iBytes = length;

+

+         if (_iPos + length > _arrData.Length) {

+            iBytes = (int) _arrData.Length - _iPos;

+         }

+

+         if (iBytes <= 0) {

+            return 0;

+         }

+

+         Buffer.BlockCopy(_arrData, _iPos, buffer, offset, iBytes);

+         _iPos += iBytes;

+

+         return iBytes;

+      }

+

+      public override long Seek(long offset, SeekOrigin origin) {

+         switch (origin) {

+            case SeekOrigin.Begin	:	if (offset > _arrData.Length) {

+                                          throw new ArgumentException();

+                                       }

+               _iPos = (int) offset;

+               break;

+											

+            case SeekOrigin.Current	:	if (((long) _iPos + offset > _arrData.Length) || (_iPos + (int) offset < 0)) {

+                                          throw new ArgumentException();

+                                       }

+               _iPos += Convert.ToInt32(offset);

+               break;

+

+            case SeekOrigin.End:		if (_arrData.Length - offset < 0) {

+                                       throw new ArgumentException();

+                                    }

+											

+               _iPos = Convert.ToInt32( _arrData.Length - offset);

+               break;

+         }

+

+         return (long) _iPos;										

+      }

+

+      public override void SetLength(long length) {

+         throw new NotSupportedException();

+      }

+

+      public override void Write(byte [] buffer, int offset, int length) {

+         throw new NotSupportedException();

+      }

+

+      public override bool CanRead {

+         get {

+            return true;

+         }

+      }

+

+      public override bool CanSeek {

+         get {

+            return true;

+         }

+      }

+

+      public override bool CanWrite {

+         get {

+            return false;

+         }

+      }

+

+      public byte [] Data {

+         get {

+            return _arrData;

+         }

+      }

+

+      public int DataLength {

+         get {

+            return _iLength;

+         }

+      }

+

+      public int DataOffset {

+         get {

+            return _iOffset;

+         }

+      }

+

+      public override long Length {

+         get {

+            return (long) _arrData.Length;

+         }

+      }

+

+      public override long Position {

+         get {

+            return (long) _iPos;

+         }

+

+         set {

+            Seek(value, SeekOrigin.Begin);

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpResponse.cs b/mcs/class/System.Web/System.Web/HttpResponse.cs
new file mode 100644
index 00000000000..86aff718fc6
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpResponse.cs
@@ -0,0 +1,765 @@
+// 

+// System.Web.HttpResponse

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Collections;

+using System.IO;

+using System.Text;

+using System.Globalization;

+

+namespace System.Web {

+   public sealed class HttpResponse {

+      // Chunked encoding static helpers

+      private static byte [] s_arrChunkSuffix = { 10, 13 };

+      private static byte [] s_arrChunkEnd = { 10 , 13 };

+      private static string s_sChunkedPrefix = "\r\n";

+

+      private ArrayList	_Headers;

+		

+      private bool _bClientDisconnected;

+      private bool _bSuppressHeaders;

+      private bool _bSuppressContent;

+      private bool _bChunked;

+      private bool _bEnded;

+      private bool _bBuffering;

+      private bool _bHeadersSent;

+      private bool _bFlushing;

+      private long _lContentLength;

+      private int _iStatusCode;

+

+      private bool _ClientDisconnected;

+

+      private string	_sContentType;

+      private string	_sCacheControl;

+      private string	_sTransferEncoding;

+      private string	_sCharset;

+      private string	_sStatusDescription;

+

+      private HttpCookieCollection _Cookies;

+      private HttpCachePolicy _CachePolicy;

+

+      private Encoding _ContentEncoding;

+		

+      private HttpContext _Context;

+      private HttpWriter _Writer;

+      private TextWriter _TextWriter;

+

+      private HttpWorkerRequest _WorkerRequest;

+

+      public HttpResponse(TextWriter output) {

+         _bBuffering = true;

+         _bFlushing = false;

+         _bHeadersSent = false;

+

+         _Headers = new ArrayList();

+

+         _sContentType = "text/html";

+

+         _iStatusCode = 200;

+         _sCharset = null;

+         _sCacheControl = null;

+

+         _lContentLength = 0;

+         _bSuppressContent = false;

+         _bSuppressHeaders = false;

+         _bClientDisconnected = false;

+

+         _bChunked = false;

+

+         _TextWriter = output;

+      }

+

+      internal HttpResponse(HttpWorkerRequest WorkerRequest, HttpContext Context) {

+         _Context = Context;

+         _WorkerRequest = WorkerRequest;

+

+         _bBuffering = true;

+         _bFlushing = false;

+         _bHeadersSent = false;

+

+         _Headers = new ArrayList();

+

+         _sContentType = "text/html";

+

+         _iStatusCode = 200;

+         _sCharset = null;

+         _sCacheControl = null;

+

+         _lContentLength = 0;

+         _bSuppressContent = false;

+         _bSuppressHeaders = false;

+         _bClientDisconnected = false;

+

+         _bChunked = false;

+

+         _Writer = new HttpWriter(this);

+         _TextWriter = _Writer;

+      }

+

+      internal System.Text.Encoder ContentEncoder {

+         get {

+            return ContentEncoding.GetEncoder();

+         }

+      }

+

+      internal void FinalFlush() {

+         Flush(true);

+      }

+

+		internal void DoFilter() {

+			if (null != _Writer) 

+				_Writer.FilterData(true);

+		}

+

+      [MonoTODO("We need to add cache headers also")]

+      private ArrayList GenerateHeaders() {

+         ArrayList oHeaders = new ArrayList(_Headers.ToArray());

+

+         // save culture info, we need us info here

+         CultureInfo oSavedInfo = System.Threading.Thread.CurrentThread.CurrentCulture;

+         System.Threading.Thread.CurrentThread.CurrentCulture = new CultureInfo(0x0409);

+

+         oHeaders.Add(new HttpResponseHeader("Date", DateTime.Now.ToUniversalTime().ToString("ddd, d MMM yyyy HH:mm:ss") + " GMT"));

+

+         System.Threading.Thread.CurrentThread.CurrentCulture = oSavedInfo;

+

+         if (_lContentLength > 0) {

+            oHeaders.Add(new HttpResponseHeader(HttpWorkerRequest.HeaderContentLength, _lContentLength.ToString()));

+         }

+

+         if (_sContentType != null) {

+            if (_sContentType.IndexOf("charset=") == -1) {

+               if (Charset.Length == 0) {

+                  Charset = ContentEncoding.HeaderName;

+               }

+

+               // Time to build our string

+               if (Charset.Length > 0) {

+                  _sContentType += "; charset=" + Charset;

+               }

+            }

+

+            oHeaders.Add(new HttpResponseHeader(HttpWorkerRequest.HeaderContentType, _sContentType));

+         }

+

+         if (_sCacheControl != null) {

+            oHeaders.Add(new HttpResponseHeader(HttpWorkerRequest.HeaderPragma, _sCacheControl));

+         }

+

+         if (_sTransferEncoding != null) {

+            oHeaders.Add(new HttpResponseHeader(HttpWorkerRequest.HeaderTransferEncoding, _sTransferEncoding));

+         }

+

+         // TODO: Add Cookie headers..

+

+         return oHeaders;

+      }

+

+      private void SendHeaders() {

+         _WorkerRequest.SendStatus(StatusCode, StatusDescription);

+			

+         ArrayList oHeaders = GenerateHeaders();

+         foreach (object oHeader in oHeaders) {

+            ((HttpResponseHeader) oHeader).SendContent(_WorkerRequest);

+         }

+			

+         _bHeadersSent = true;

+      }

+

+      public string Status {

+         get {

+            return StatusCode.ToString() + " " + StatusDescription;

+         }

+

+         set {

+            string sMsg = "OK";

+            int iCode = 200;

+

+            try {

+               iCode = Int32.Parse(value.Substring(0, value.IndexOf(' ')));

+               sMsg = value.Substring(value.IndexOf(' ') + 1);

+            }

+            catch(Exception) {

+               throw new HttpException("Invalid status string");

+            }

+

+            StatusCode = iCode;

+            StatusDescription = sMsg;

+         }

+      }

+

+      [MonoTODO()]

+      public void AddCacheItemDependencies(ArrayList cacheKeys) {

+         throw new NotImplementedException();

+      }

+

+      [MonoTODO()]

+      public void AddCacheItemDependency(string cacheKey) {

+         throw new NotImplementedException();

+      }

+

+      [MonoTODO()]

+      public void AddFileDependencies(ArrayList filenames) {

+         throw new NotImplementedException();

+      }

+

+      [MonoTODO()]

+      public void AddFileDependency(string filename) {

+         throw new NotImplementedException();

+      }

+

+      public void AddHeader(string name, string value) {

+         AppendHeader(name, value);

+      }

+

+      [MonoTODO()]

+      public void AppendCookie(HttpCookie cookie) {

+         throw new NotImplementedException();

+      }

+

+      [MonoTODO()]

+      public void AppendToLog(string param) {

+         throw new NotImplementedException();

+      }

+

+      [MonoTODO()]

+      public string ApplyAppPathModifier(string virtualPath) {

+         throw new NotImplementedException();

+      }

+

+      public bool Buffer {

+         get {

+            return BufferOutput;

+         }

+			

+         set {

+            BufferOutput = value;

+         }

+      }

+

+      public bool BufferOutput {

+         get {

+            return _bBuffering;

+         }

+			

+         set {

+            if (_Writer != null) {

+               _Writer.Update();

+            }

+

+            _bBuffering = value;

+         }

+      }

+

+      public HttpCachePolicy Cache {

+         get {

+            if (null == _CachePolicy) {

+               _CachePolicy = new HttpCachePolicy();

+            }

+

+            return _CachePolicy;

+         }

+      }

+

+      [MonoTODO("Set status in the cache policy")]

+      public string CacheControl {

+         get {

+            return _sCacheControl;

+         }

+

+         set {

+            if (_bHeadersSent) {

+               throw new System.Web.HttpException("Headers has been sent to the client");

+            }

+

+            _sCacheControl = value;

+         }

+      }

+

+      public string Charset {

+         get {	

+            if (null == _sCharset) {

+               _sCharset = ContentEncoding.WebName;

+            }

+

+            return _sCharset;

+         }

+         set {

+            if (_bHeadersSent) {

+               throw new System.Web.HttpException("Headers has been sent to the client");

+            }

+

+            _sCharset = value;

+         }

+      }

+

+      public Encoding ContentEncoding {

+         get {

+            if (_ContentEncoding == null) {

+               _ContentEncoding = Encoding.UTF8;

+            }

+

+            return _ContentEncoding;

+         }

+

+         set {

+            if (value == null) {

+               throw new ArgumentException("Can't set a null as encoding");

+            }

+

+            _ContentEncoding = value;

+

+            if (_Writer != null) {

+               _Writer.Update();

+            }

+         }

+      }

+

+      public string ContentType {

+         get {

+            return _sContentType;

+         }

+

+         set {

+            if (_bHeadersSent) {

+               throw new System.Web.HttpException("Headers has been sent to the client");

+            }

+

+            _sContentType = value;

+         }

+      }

+

+      public HttpCookieCollection Cookies {

+         get {

+            if (null == _Cookies) {

+               _Cookies = new HttpCookieCollection(this, false);

+            }

+            return _Cookies;

+         }

+      }

+

+      [MonoTODO("Set expires in the cache policy")]

+      public int Expires {

+         get {

+            throw new NotImplementedException();

+         }

+

+         set {

+            throw new NotImplementedException();

+         }

+      }

+

+      [MonoTODO("Set expiresabsolute in the cache policy")]

+      public DateTime ExpiresAbsolute {

+         get {

+            throw new NotImplementedException();

+         }

+

+         set {

+            throw new NotImplementedException();

+         }

+      }

+

+      public Stream Filter {

+         get {

+            if (_Writer != null) {

+               return _Writer.GetActiveFilter();

+            }

+            return null;

+         }

+

+         set {

+            if (_Writer == null) {

+               throw new HttpException("Filtering is not allowed");

+            }

+

+            _Writer.ActivateFilter(value);

+         }

+      }

+

+      public bool IsClientConnected {

+         get {

+            if (_ClientDisconnected) {

+               return false;

+            }

+

+            if (null != _WorkerRequest && (!_WorkerRequest.IsClientConnected())) {

+               _ClientDisconnected = false;

+               return false;

+            }

+

+            return true;

+         }

+      }

+      

+      public TextWriter Output {

+         get {

+            return _TextWriter;

+         }

+      }

+

+      public Stream OutputStream {

+         get {

+            if (_Writer == null) {

+               throw new System.Web.HttpException("a Output stream not available when running with custom text writer");

+            }

+

+            return _Writer.OutputStream;

+         }

+      }

+

+      public string StatusDescription {

+         get {

+            if (null == _sStatusDescription) {

+               _sStatusDescription = HttpWorkerRequest.GetStatusDescription(_iStatusCode);

+            } 

+               

+            return _sStatusDescription;

+         }

+

+         set {

+            if (_bHeadersSent) {

+               throw new System.Web.HttpException("Headers has been sent to the client");

+            }

+

+            _sStatusDescription = value;

+         }

+      }

+	

+      public int StatusCode {

+         get {

+            return _iStatusCode;

+         }

+         set {

+            if (_bHeadersSent) {

+               throw new System.Web.HttpException("Headers has been sent to the client");

+            }

+

+            _sStatusDescription = null;

+            _iStatusCode = value;

+         }

+      }

+

+      public bool SuppressContent {

+         get {

+            return _bSuppressContent;

+         }

+			

+         set {

+            if (_bHeadersSent) {

+               throw new System.Web.HttpException("Headers has been sent to the client");

+            }

+

+            _bSuppressContent = true;

+         }

+      }

+

+      public HttpRequest Request {

+         get {

+            return _Context.Request;

+         }

+      }

+

+      internal void AppendHeader(int iIndex, string value) {

+         if (_bHeadersSent) {

+            throw new System.Web.HttpException("Headers has been sent to the client");

+         }

+         switch (iIndex) {

+            case HttpWorkerRequest.HeaderContentLength :	

+               _lContentLength = Int64.Parse(value);

+               break;

+            case HttpWorkerRequest.HeaderContentEncoding :	

+               _sContentType = value;

+               break;

+            case HttpWorkerRequest.HeaderTransferEncoding :	

+               _sTransferEncoding = value;

+               if (value.Equals("chunked")) {

+                  _bChunked = true;

+               } else {

+                  _bChunked = false;

+               }

+               break;

+

+            case HttpWorkerRequest.HeaderPragma	:	

+               _sCacheControl = value;

+               break;

+

+            default	:	

+               _Headers.Add(new HttpResponseHeader(iIndex, value));

+               break;

+         }

+      

+

+      }

+

+      public void AppendHeader(string name, string value) {

+         if (_bHeadersSent) {

+            throw new System.Web.HttpException("Headers has been sent to the client");

+         }

+	

+         switch (name.ToLower()) {

+            case "content-length"		:	_lContentLength = Int64.Parse(value);

+               break;

+            case "content-type"			:	_sContentType = value;

+               break;

+            case "transfer-encoding"	:	_sTransferEncoding = value;

+               if (value.Equals("chunked")) {

+                  _bChunked = true;

+               } else {

+                  _bChunked = false;

+               }

+

+               break;

+            case "pragma"				:	_sCacheControl = value;

+               break;

+

+            default						:	_Headers.Add(new HttpResponseHeader(name, value));

+               break;

+         }

+      }

+	

+      public void BinaryWrite(byte [] buffer) {

+         OutputStream.Write(buffer, 0, buffer.Length);

+      }

+

+      public void Clear() {

+         if (_Writer != null) {

+            _Writer.Clear();

+         }

+      }

+

+      public void ClearContent() {

+         Clear();

+      }

+

+      public void ClearHeaders() {

+         if (_bHeadersSent) {

+            throw new System.Web.HttpException("Headers has been sent to the client");

+         }

+

+         _sContentType = "text/html";

+

+         _iStatusCode = 200;

+         _sCharset = null;

+         _Headers = new ArrayList();

+         _sCacheControl = null;

+         _sTransferEncoding = null;

+

+         _lContentLength = 0;

+         _bSuppressContent = false;

+         _bSuppressHeaders = false;

+         _bClientDisconnected = false;

+      }

+

+      public void Close() {

+         _bClientDisconnected = false;

+

+         _WorkerRequest.CloseConnection();

+

+         _bClientDisconnected = true;

+      }

+

+      internal void Dispose() {

+         if (_Writer != null) {

+            _Writer.Dispose();

+            _Writer = null;

+         }

+      }

+

+      [MonoTODO("Handle callbacks into before done with session, needs to have a non ended flush here")]

+      internal void FlushAtEndOfRequest() 

+      {

+         Flush(true);

+      }

+

+      [MonoTODO("Check timeout and if we can cancel the thread...")]

+      public void End() {

+         if (!_bEnded) {

+            Flush();

+            _WorkerRequest.CloseConnection();

+

+            _bEnded = true;

+         }

+      }

+

+      public void Flush() {

+         Flush(false);

+      }

+

+      private void Flush(bool bFinish) {

+         if (_bFlushing) {

+            return;

+         }

+

+         _bFlushing = true;

+

+         if (_Writer != null) {

+            _Writer.FlushBuffers();

+         } else {

+            _TextWriter.Flush();

+         }

+

+         try {

+            if (!_bHeadersSent) {

+               if (!_bSuppressHeaders && !_bClientDisconnected) {

+                  if (_Writer != null && BufferOutput) {

+                     _lContentLength = _Writer.BufferSize;

+                  } 

+                  else {

+                     _lContentLength = 0;

+                  }

+		

+                  if (_lContentLength == 0 && _iStatusCode == 200 && _sTransferEncoding == null) {

+                     // Check we are going todo chunked encoding

+                     string sProto = _Context.Request.ServerVariables["SERVER_PROTOCOL"];

+                     if (sProto != null && sProto == "HTTP/1.1") {

+                        AppendHeader(HttpWorkerRequest.HeaderTransferEncoding, "chunked");

+                     }  

+                     else {

+                        // Just in case, the old browsers sends a HTTP/1.0 request with Connection: Keep-Alive

+                        AppendHeader(HttpWorkerRequest.HeaderConnection, "Close");

+                     }

+                  } 

+

+                  SendHeaders();

+               }					

+            }	

+            if ((!_bSuppressContent && Request.HttpMethod.Equals("HEAD")) || _Writer == null) {

+               _bSuppressContent = true;

+            }

+

+            if (!_bSuppressContent) {

+               _bClientDisconnected = false;

+               if (_bChunked) {

+                  Encoding oASCII = Encoding.ASCII;

+

+                  byte [] arrPrefix = oASCII.GetBytes(Convert.ToString(_Writer.BufferSize, 16) + s_sChunkedPrefix);

+                  _WorkerRequest.SendResponseFromMemory(arrPrefix, arrPrefix.Length);

+

+                  _Writer.SendContent(_WorkerRequest);

+

+                  _WorkerRequest.SendResponseFromMemory(s_arrChunkSuffix, s_arrChunkSuffix.Length);

+                  if (bFinish) {

+                     _WorkerRequest.SendResponseFromMemory(s_arrChunkEnd, s_arrChunkEnd.Length);

+                  }

+               } 

+               else {

+                  _Writer.SendContent(_WorkerRequest);

+               }

+

+               _WorkerRequest.FlushResponse(bFinish);	

+

+               if (!bFinish) {

+                  _Writer.Clear();

+               }

+            }

+         }

+         finally {

+            _bFlushing = false;

+         }

+      }

+

+      public void Pics(string value) {

+         AppendHeader("PICS-Label", value);

+      }

+

+

+      public void Redirect(string url) {

+         Redirect(url, true);

+      }

+

+      //FIXME: [1] this is an ugly hack to make it work until we have SimpleWorkerRequest!

+      private string redirectLocation;

+      public string RedirectLocation

+      {

+	      get {

+		      return redirectLocation;

+	      }

+      }

+      public void Redirect(string url, bool endResponse) {

+         if (_bHeadersSent) {

+            throw new System.Web.HttpException("Headers has been sent to the client");

+         }

+

+         Clear();

+

+         StatusCode = 302;

+	 redirectLocation = url;

+         //[1]AppendHeader(HttpWorkerRequest.HeaderLocation, url);

+

+         // Text for browsers that can't handle location header

+         Write("<html><head><title>Object moved</title></head><body>\r\n");

+         Write("<h2>Object moved to <a href='" + url + "'>here</a></h2>\r\n");

+         Write("</body><html>\r\n");

+

+         /* [1]

+	 if (endResponse) {

+            End();

+         }

+	 */

+      }

+

+      public void Write(char ch) {

+         _TextWriter.Write(ch);

+      }

+

+      public void Write(object obj) {

+         _TextWriter.Write(obj);

+      }

+

+      public void Write(string str) {

+         _TextWriter.Write(str);

+      }

+

+      public void Write(char [] buffer, int index, int count) {

+         _TextWriter.Write(buffer, index, count);

+      }

+

+      [MonoTODO()]

+      public static void RemoveOutputCacheItem(string path) {

+         throw new NotImplementedException();

+      }

+

+      [MonoTODO()]

+      public void SetCookie(HttpCookie cookie) {

+         throw new NotImplementedException();

+      }

+

+      public void WriteFile(string filename) {

+         WriteFile(filename, false);

+      }

+

+      [MonoTODO()]

+      public void WriteFile(string filename, bool readIntoMemory) {

+         throw new NotImplementedException();

+      }

+      

+      [MonoTODO()]

+      public void WriteFile(string filename, long offset, long size) {

+         throw new NotImplementedException();

+      }

+

+      [MonoTODO("Should we support fileHandle ptrs?")]

+      public void WriteFile(IntPtr fileHandle, long offset, long size) {

+      }   

+

+      [MonoTODO()]

+      internal void OnCookieAdd(HttpCookie cookie) {

+      }

+

+      [MonoTODO("Do we need this?")]

+      internal void OnCookieChange(HttpCookie cookie) {

+      }

+

+      [MonoTODO()]

+      internal void GoingToChangeCookieColl() {

+      }

+

+      [MonoTODO()]

+      internal void ChangedCookieColl() {

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpResponseHeader.cs b/mcs/class/System.Web/System.Web/HttpResponseHeader.cs
new file mode 100644
index 00000000000..1d34d8da430
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpResponseHeader.cs
@@ -0,0 +1,53 @@
+// 

+// System.Web.HttpResponseHeader

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+

+namespace System.Web {

+   internal class HttpResponseHeader {

+      private string _sHeader;

+      private string _sValue;

+      private int _iKnowHeaderId;

+

+      internal HttpResponseHeader(int KnowHeaderId, string value) {

+         _iKnowHeaderId = KnowHeaderId;

+         _sValue = value;

+      }

+

+      internal HttpResponseHeader(string header, string value) {

+         _sHeader = header;

+         _sValue = value;

+      }

+

+      internal string Name {

+         get {

+            if (null == _sHeader) {

+               return HttpWorkerRequest.GetKnownResponseHeaderName(_iKnowHeaderId);

+            }

+

+            return _sHeader;

+         }

+      }

+

+      internal string Value {

+         get {

+            return _sValue;

+         }

+      }

+

+      override public string ToString() {

+         return Name + ": " + Value;

+      }

+

+      internal void SendContent(HttpWorkerRequest WorkerRequest) {

+         if (null != _sHeader) {

+            WorkerRequest.SendUnknownResponseHeader(_sHeader, _sValue);

+         } else {

+            WorkerRequest.SendKnownResponseHeader(_iKnowHeaderId, _sValue);

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpResponseStream.cs b/mcs/class/System.Web/System.Web/HttpResponseStream.cs
new file mode 100644
index 00000000000..340a5a50442
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpResponseStream.cs
@@ -0,0 +1,87 @@
+// 

+// System.Web.HttpResponseStream

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.IO;

+

+namespace System.Web {

+   /// <summary>

+   /// Simple wrapper around HttpWriter to support the Stream interface

+   /// </summary>

+   public class HttpResponseStream : Stream {

+      private HttpWriter _Writer;

+	   

+      internal HttpResponseStream(HttpWriter Writer) {

+         _Writer = Writer;

+      }

+		

+      public override void Flush() {

+         _Writer.Flush();

+      }

+

+      public override void Close() {

+         _Writer.Close();

+      }

+

+      public override int Read(byte [] buffer, int offset, int length) {

+         throw new NotSupportedException();

+      }

+

+      public override long Seek(long offset, SeekOrigin origin) {

+         throw new NotSupportedException();

+      }

+

+      public override void SetLength(long length) {

+         throw new NotSupportedException();

+      }

+

+      public override void Write(byte [] buffer, int offset, int length) {

+         if (offset < 0) {

+            throw new ArgumentOutOfRangeException("offset");

+         }

+

+         if (length <= 0) {

+            throw new ArgumentOutOfRangeException("length");

+         }

+		   

+         _Writer.WriteBytes(buffer, offset, length);

+      }

+

+      public override bool CanRead {

+         get {

+            return false;

+         }

+      }

+

+      public override bool CanSeek {

+         get {

+            return false;

+         }

+      }

+

+      public override bool CanWrite {

+         get {

+            return true;

+         }

+      }

+

+      public override long Length {

+         get {

+            throw new NotSupportedException();

+         }

+      }

+

+      public override long Position {

+         get {

+            throw new NotSupportedException();

+         }

+

+         set {

+            throw new NotSupportedException();

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpResponseStreamProxy.cs b/mcs/class/System.Web/System.Web/HttpResponseStreamProxy.cs
new file mode 100644
index 00000000000..1ef2778f459
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpResponseStreamProxy.cs
@@ -0,0 +1,48 @@
+// 

+// System.Web.HttpResponseStreamProxy

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.IO;

+

+namespace System.Web {

+   /// <summary>

+   /// Used to detect if there is a valid filter proxy.

+   /// </summary>

+   public class HttpResponseStreamProxy : HttpResponseStream {

+      bool _FilteringActive;

+	   

+      internal HttpResponseStreamProxy(HttpWriter Writer) : base(Writer) {

+         _FilteringActive = false;

+      }

+		

+      internal void CheckFilteringState() {

+         if (_FilteringActive) {

+            throw new HttpException("Invalid response filter state");

+         }

+      }

+		

+      internal bool Active {

+         get {

+            return _FilteringActive;

+         }

+         set {

+            _FilteringActive = value;

+         }

+      }

+		

+      public override void Flush() {

+      }

+

+      public override void Close() {

+      }

+		

+      public override void Write(byte [] buffer, int offset, int length) {

+         CheckFilteringState();

+         

+         Write(buffer, offset, length);

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpRuntime.cs b/mcs/class/System.Web/System.Web/HttpRuntime.cs
new file mode 100644
index 00000000000..43a94a198ca
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpRuntime.cs
@@ -0,0 +1,429 @@
+// 
+// System.Web.HttpRuntime
+//
+// Author:
+//   Patrik Torstensson (ptorsten@hotmail.com)
+//   Gaurav Vaish (gvaish@iitk.ac.in)
+//
+using System;
+using System.Collections;
+using System.Security;
+using System.Security.Permissions;
+using System.Threading;
+using System.Web.UI;
+using System.Web.Utils;
+using System.Web.Caching;
+
+namespace System.Web {
+
+	[MonoTODO ("Make corrent right now this is a simple impl to give us a base for testing... the methods here are not complete or valid")]	
+	public sealed class HttpRuntime {
+
+		// Security permission helper objects
+		private static IStackWalk appPathDiscoveryStackWalk;
+		private static IStackWalk ctrlPrincipalStackWalk;
+		private static IStackWalk sensitiveInfoStackWalk;
+		private static IStackWalk unmgdCodeStackWalk;
+		private static IStackWalk unrestrictedStackWalk;
+		private static IStackWalk reflectionStackWalk;
+
+		private static HttpRuntime _runtime;
+		private Cache _cache;
+
+		private int _activeRequests;
+		private HttpWorkerRequest.EndOfSendNotification _endOfSendCallback;
+		private AsyncCallback _handlerCallback;
+		private WaitCallback _appDomainCallback;
+
+		private bool _firstRequestStarted;
+		private bool _firstRequestExecuted;
+		private DateTime _firstRequestStartTime;
+
+		private Exception _initError;
+
+		static HttpRuntime ()
+		{
+			appPathDiscoveryStackWalk = null;
+			ctrlPrincipalStackWalk    = null;
+			sensitiveInfoStackWalk    = null;
+			unmgdCodeStackWalk        = null;
+			unrestrictedStackWalk     = null;
+         
+			_runtime = new HttpRuntime ();
+			_runtime.Init();
+		}
+
+		public HttpRuntime ()
+		{	
+		}
+
+		static internal object CreateInternalObject(Type type) {
+			return Activator.CreateInstance(type, true);
+		}
+
+		[MonoTODO()]
+		private void Init ()
+		{
+			try {
+				_cache = new Cache ();
+
+				// TODO: timeout manager
+				// TODO: Load all app domain data
+				// TODO: Trace manager
+				_endOfSendCallback = new HttpWorkerRequest.EndOfSendNotification(OnEndOfSend);
+				_handlerCallback = new AsyncCallback(OnHandlerReady);
+				_appDomainCallback = new WaitCallback(OnAppDomainUnload);
+			} 
+			catch (Exception error) {
+				_initError = error;
+			}
+		}
+
+		private void OnFirstRequestStart() {
+			if (null == _initError) {
+				// TODO: First request initialize (config, trace, request queue)
+			}
+
+			// If we got an error during init, throw to client now..
+			if (null != _initError)
+				throw _initError;
+		}
+
+		private void OnFirstRequestEnd() {
+		}
+
+		private void OnHandlerReady(IAsyncResult ar) {
+			HttpContext context = (HttpContext) ar.AsyncState;
+			try {
+				IHttpAsyncHandler handler = context.AsyncHandler;
+
+				try {
+					handler.EndProcessRequest(ar);
+				}
+				catch (Exception error) {
+					context.AddError(error);
+				}
+			}
+			finally {
+				context.AsyncHandler = null;
+			}
+
+			FinishRequest(context, context.Error);
+		}
+
+		private void OnEndOfSend(HttpWorkerRequest request, object data) {
+			HttpContext context = (HttpContext) data;
+
+			context.Request.Dispose();
+			context.Response.Dispose();
+		}
+
+		internal void FinishRequest(HttpContext context, Exception error) {
+			HttpWorkerRequest request = context.WorkerRequest;
+
+			try {
+				context.Response.FlushAtEndOfRequest();
+			}
+			catch (Exception obj) {
+				error = obj;
+			}
+
+			if (null != error) {
+				Console.WriteLine("Error happend during execution: ");
+				Console.WriteLine(error.Message);
+				Console.WriteLine("Trace: " + error.StackTrace);
+				// TODO: Report runtime error
+			}
+
+			if (!_firstRequestExecuted) {
+				lock (this) {
+					if (!_firstRequestExecuted) {
+						OnFirstRequestEnd();
+						_firstRequestExecuted = true;
+					}
+				}
+			}
+
+			Interlocked.Decrement(ref _activeRequests);
+
+			if (null != request)
+				request.EndOfRequest();
+
+			// TODO: Schedule more work in request queue
+		}
+
+		private void OnAppDomainUnload(object state) {
+			Dispose();
+		}
+
+		[MonoTODO]
+		internal void Dispose() {
+			// TODO: Drain Request queue
+			// TODO: Stop request queue
+			// TODO: Move timeout value to config
+			WaitForRequests(5000);
+			
+			_cache.Dispose();
+			HttpApplicationFactory.EndApplication();
+		}
+
+		[MonoTODO]
+		internal void WaitForRequests(int ms) {
+			DateTime timeout = DateTime.Now.AddMilliseconds(ms);
+
+			do {
+				// TODO: We should check the request queue here also
+				if (_activeRequests == 0)
+					return;
+
+				Thread.Sleep(100);
+			} while (timeout > DateTime.Now);
+		}
+
+		internal void InternalExecuteRequest(HttpWorkerRequest request) {
+			IHttpHandler handler;
+			IHttpAsyncHandler async_handler;
+
+			HttpContext context = new HttpContext(request);
+
+			request.SetEndOfSendNotification(_endOfSendCallback, context);
+			
+			Interlocked.Increment(ref _activeRequests);
+
+			try {
+				if (!_firstRequestStarted) {
+					lock (this) {
+						if (!_firstRequestStarted) {
+							_firstRequestStartTime = DateTime.Now;
+
+							OnFirstRequestStart();
+							_firstRequestStarted = true;
+						}						
+					}
+				}
+
+				handler = HttpApplicationFactory.GetInstance(context);
+				if (null == handler)
+					throw new HttpException(FormatResourceString("unable_to_create_app"));
+
+				if (handler is IHttpAsyncHandler) {
+					async_handler = (IHttpAsyncHandler) handler;
+
+					context.AsyncHandler = async_handler;
+					async_handler.BeginProcessRequest(context, _handlerCallback, context);
+				} else {
+					handler.ProcessRequest(context);
+					FinishRequest(context, null);
+				}
+			}
+			catch (Exception error) {
+				FinishRequest(context, error);
+			}
+		}
+
+		public static void ProcessRequest (HttpWorkerRequest Request)
+		{
+			// TODO: Request queue
+			_runtime.InternalExecuteRequest(Request);
+		}
+
+		public static Cache Cache {
+			get {
+				return _runtime._cache;
+			}
+		}      
+
+		[MonoTODO]
+		public static string AppDomainAppId {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static string AppDomainAppPath {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static string AppDomainAppVirtualPath {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static string AppDomainId {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static string AspInstallDirectory {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static string BinDirectory {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static string ClrInstallDirectory {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static string CodegenDir {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static bool IsOnUNCShare {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static string MachineConfigurationDirectory {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public static void Close ()
+		{
+			_runtime.Dispose();
+		}
+
+		internal static string FormatResourceString (string key)
+		{
+			return GetResourceString (key);
+		}
+
+		internal static string FormatResourceString (string key, string arg0)
+		{
+			string format = GetResourceString (key);
+
+			if (format == null)
+				return null;
+			
+			return String.Format (format, arg0);
+		}
+
+		[MonoTODO ("FormatResourceString (string, string, string)")]
+		internal static string FormatResourceString (string key, string arg0, string type) {
+			return String.Format ("{0}: {1} {2}", key, arg0, type);
+		}
+
+		[MonoTODO ("FormatResourceString (string, string, string, string)")]
+		internal static string FormatResourceString (string key, string arg0,
+							     string arg1, string arg2)
+		{
+			// String.Format (string, object, object, object);
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("FormatResourceString (string, string[]")]
+		internal static string FormatResourceString (string key, string[] args)
+		{
+			// String.Format (string, object[]);
+			throw new NotImplementedException ();
+		}
+
+		private static string GetResourceString (string key) {
+			return _runtime.GetResourceStringFromResourceManager (key);
+		}
+
+		[MonoTODO ("GetResourceStringFromResourceManager (string)")]
+		private string GetResourceStringFromResourceManager (string key) {
+			return "String returned by HttpRuntime.GetResourceStringFromResourceManager";
+		}
+
+		#region Security Internal Methods (not impl)
+		[MonoTODO ("Get Application path from the appdomain object")]
+		internal static IStackWalk AppPathDiscovery {
+			get {
+				if (appPathDiscoveryStackWalk == null) {
+					appPathDiscoveryStackWalk = new FileIOPermission (
+						FileIOPermissionAccess.PathDiscovery, "<apppath>");
+				}
+				return appPathDiscoveryStackWalk;
+			}
+		}
+
+		internal static IStackWalk ControlPrincipal {
+			get {
+				if (ctrlPrincipalStackWalk == null) {
+					ctrlPrincipalStackWalk = new SecurityPermission (
+						SecurityPermissionFlag.ControlPrincipal);
+				}
+				return ctrlPrincipalStackWalk;
+			}
+		}
+
+		internal static IStackWalk Reflection {
+			get {
+				if (reflectionStackWalk == null) {
+					reflectionStackWalk = new ReflectionPermission (
+						ReflectionPermissionFlag.TypeInformation |
+						ReflectionPermissionFlag.MemberAccess);
+				}
+				return reflectionStackWalk;
+			}
+		}
+
+		internal static IStackWalk SensitiveInformation {
+			get {
+				if (sensitiveInfoStackWalk == null) {
+					sensitiveInfoStackWalk = new EnvironmentPermission (
+						PermissionState.Unrestricted);
+				}
+				return sensitiveInfoStackWalk;
+			}
+		}
+
+		internal static IStackWalk UnmanagedCode {
+			get {
+				if (unmgdCodeStackWalk == null) {
+					unmgdCodeStackWalk = new SecurityPermission (
+						SecurityPermissionFlag.UnmanagedCode);
+				}
+				return unmgdCodeStackWalk;
+			}
+		}
+
+		internal static IStackWalk Unrestricted {
+			get {
+				if (unrestrictedStackWalk == null) {
+					unrestrictedStackWalk = new PermissionSet (
+						PermissionState.Unrestricted);
+				}
+				return unrestrictedStackWalk;
+			}
+		}
+
+		internal static IStackWalk FileReadAccess (string file)
+		{
+			return new FileIOPermission (FileIOPermissionAccess.Read, file);
+		}
+
+		internal static IStackWalk PathDiscoveryAccess (string path)
+		{
+			return new FileIOPermission (FileIOPermissionAccess.PathDiscovery, path);
+		}
+		#endregion
+	}
+}
diff --git a/mcs/class/System.Web/System.Web/HttpServerUtility.cs b/mcs/class/System.Web/System.Web/HttpServerUtility.cs
new file mode 100644
index 00000000000..c41d72d9d56
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpServerUtility.cs
@@ -0,0 +1,283 @@
+/**

+ * Namespace: System.Web

+ * Class:     HttpServerUtility

+ *

+ * Author:  Wictor Wilén

+ * Contact: <wictor@ibizkit.se>, <patrik.torstensson@labs2.com>

+ * Status:  ?%

+ *

+ * (C) Wictor Wilén (2002)

+ * ---------------------------------------

+ * 2002-03-27	Wictor		Started implementation

+ * 2002-04-09  Patrik      Added HttpContext constructor

+ * 2002-04-10  Patrik      Moved encoding to HttpUtility and

+ *                         fixed all functions that used

+ *                         HttpContext

+ * 

+ */

+using System;

+using System.IO;

+

+namespace System.Web {

+   public sealed class HttpServerUtility {

+

+      private static string _name = "";

+

+      private HttpContext _Context;

+      private HttpApplication _Application;

+		

+      [MonoTODO()]

+      internal HttpServerUtility(HttpContext Context) {

+         _Context = Context;

+      }

+		

+      [MonoTODO()]

+      internal HttpServerUtility(HttpApplication app) {

+         _Application = app;

+      }

+

+      // Properties

+

+

+      /// <summary>

+      /// Gets the server's computer name.

+      /// </summary>

+      public string MachineName {

+         get {

+            if(_name.Length == 0) {

+               _name = Environment.MachineName;

+            }

+            return _name;

+         }

+      }

+      /// <summary>

+      /// Gets and sets the request time-out in seconds.

+      /// </summary>

+      [MonoTODO()]

+      public int ScriptTimeout {

+         get {

+            throw new System.NotImplementedException();

+         } 

+         set {

+            throw new System.NotImplementedException();

+         }

+      }

+

+      // Methods

+

+      /// <summary>

+      /// Clears the previous exception.

+      /// </summary>

+      public void ClearError() {

+         if (null != _Context) {

+            _Context.ClearError();

+            return;

+         }

+

+         if (null != _Application) {

+            _Application.ClearError();

+         }

+      }

+

+		

+      /// <summary>

+      /// Creates a server instance of a COM object identified by the object's Programmatic Identifier (ProgID).

+      /// </summary>

+      /// <param name="progID">The class or type of object to be instantiated. </param>

+      /// <returns>The new object.</returns>

+      public object CreateObject(string progID) {

+         return CreateObject(Type.GetTypeFromProgID(progID));

+      }

+

+

+      /// <summary>

+      /// Creates a server instance of a COM object identified by the object's type.

+      /// </summary>

+      /// <param name="type">A Type representing the object to create. </param>

+      /// <returns>The new object.</returns>

+      [MonoTODO()]

+      public object CreateObject(Type type) {	

+         Object o;

+         o = Activator.CreateInstance(type);

+			

+         // TODO: Call OnStartPage()

+

+         return o;

+      }

+

+

+      /// <summary>

+      /// Creates a server instance of a COM object identified by the object's class identifier (CLSID).

+      /// </summary>

+      /// <param name="clsid">The class identifier of the object to be instantiated. </param>

+      /// <returns>The new object.</returns>

+      public object CreateObjectFromClsid(string clsid) {

+         Guid guid = new Guid(clsid);

+         return CreateObject(Type.GetTypeFromCLSID(guid));

+      }

+

+

+      /// <summary>

+      /// Executes a request to another page using the specified URL path to the page.

+      /// </summary>

+      /// <param name="path">The URL path of the new request. </param>

+      [MonoTODO()]

+      public void Execute(string path) {

+         throw new System.NotImplementedException();

+      }

+

+

+      /// <summary>

+      /// Executes a request to another page using the specified URL path to the page. A TextWriter captures output from the page.

+      /// </summary>

+      /// <param name="path">The URL path of the new request. </param>

+      /// <param name="writer">The TextWriter to capture the output. </param>

+      [MonoTODO()]

+      public void Execute(string path, TextWriter writer ) {

+         throw new System.NotImplementedException();

+      }

+

+

+

+      /// <summary>

+      /// Returns the previous exception.

+      /// </summary>

+      /// <returns>The previous exception that was thrown.</returns>

+      [MonoTODO()]

+      public Exception GetLastError() {

+         throw new System.NotImplementedException();

+      }

+

+

+

+      /// <summary>

+      /// Decodes an HTML-encoded string and returns the decoded string.

+      /// </summary>

+      /// <param name="s">The HTML string to decode. </param>

+      /// <returns>The decoded text.</returns>

+      [MonoTODO()]

+      public string HtmlDecode(string s) {

+         return HttpUtility.HtmlDecode(s);

+      }

+

+

+      /// <summary>

+      /// Decodes an HTML-encoded string and sends the resulting output to a TextWriter output stream.

+      /// </summary>

+      /// <param name="s">The HTML string to decode</param>

+      /// <param name="output">The TextWriter output stream containing the decoded string. </param>

+      public void HtmlDecode(string s, TextWriter output) {

+         output.Write(HttpUtility.HtmlDecode(s));

+      }

+

+      /// <summary>

+      /// HTML-encodes a string and returns the encoded string.

+      /// </summary>

+      /// <param name="s">The text string to encode. </param>

+      /// <returns>The HTML-encoded text.</returns>

+      public string HtmlEncode(string s) {

+         return HttpUtility.HtmlEncode(s);

+      }

+

+      /// <summary>

+      /// HTML-encodes a string and sends the resulting output to a TextWriter output stream.

+      /// </summary>

+      /// <param name="s">The string to encode. </param>

+      /// <param name="output">The TextWriter output stream containing the encoded string. </param>

+      public void HtmlEncode(	string s, TextWriter output) {

+         output.Write(HtmlEncode(s));

+      }

+

+

+      /// <summary>

+      /// Returns the physical file path that corresponds to the specified virtual path on the Web server.

+      /// </summary>

+      /// <param name="path">The virtual path on the Web server. </param>

+      /// <returns>The physical file path that corresponds to path.</returns>

+      public string MapPath(string path) {

+         if (null == _Context) {

+            throw new HttpException("MapPath is not available");

+         }

+

+         return _Context.Request.MapPath(path);

+      }

+

+      /// <summary>

+      /// Terminates execution of the current page and begins execution of a new page using the specified URL path to the page.

+      /// </summary>

+      /// <param name="path">The URL path of the new page on the server to execute. </param>

+      [MonoTODO()]

+      public void Transfer(string path) {

+         throw new System.NotImplementedException();

+      }

+

+      /// <summary>

+      /// Terminates execution of the current page and begins execution of a new page using the specified URL path to the page. Specifies whether to clear the QueryString and Form collections.

+      /// </summary>

+      /// <param name="path">The URL path of the new page on the server to execute. </param>

+      /// <param name="preserveForm">If true, the QueryString and Form collections are preserved. If false, they are cleared. The default is false. </param>

+      [MonoTODO()]

+      public void Transfer(string path, bool preserveForm	) {

+         throw new System.NotImplementedException();

+      }

+

+      /// <summary>

+      /// URL-decodes a string and returns the decoded string.

+      /// </summary>

+      /// <param name="s">The text string to decode. </param>

+      /// <returns>The decoded text.</returns>

+      /// <remarks>

+      /// Post/html encoding @ ftp://ftp.isi.edu/in-notes/rfc1866.txt

+      /// Uncomment the line marked with RFC1738 to get pure RFC1738

+      /// and it will also consider the RFC1866 (ftp://ftp.isi.edu/in-notes/rfc1866.txt)

+      /// `application/x-www-form-urlencoded' format

+      /// </remarks>

+      public string UrlDecode(string s) {

+         return HttpUtility.UrlDecode(s);

+      }

+

+      /// <summary>

+      /// Decodes an HTML string received in a URL and sends the resulting output to a TextWriter output stream.

+      /// </summary>

+      /// <param name="s"></param>

+      /// <param name="output"></param>

+      public void UrlDecode(string s, TextWriter output) {

+         output.Write(UrlDecode(s));

+      }

+

+      /// <summary>

+      /// URL-encodes a string and returns the encoded string.

+      /// </summary>

+      /// <param name="s">The text to URL-encode. </param>

+      /// <returns>The URL encoded text.</returns>

+      public string UrlEncode(string s) {

+         return HttpUtility.UrlEncode(s);

+      }

+

+      /// <summary>

+      /// URL encodes a string and sends the resulting output to a TextWriter output stream.

+      /// </summary>

+      /// <param name="s">The text string to encode. </param>

+      /// <param name="output">The TextWriter output stream containing the encoded string. </param>

+      public void UrlEncode(string s,	TextWriter output) {

+         output.Write(UrlEncode(s));

+      }

+

+      /// <summary>

+      /// URL-encodes the path portion of a URL string and returns the encoded string.

+      /// </summary>

+      /// <param name="s">The text to URL-encode.</param>

+      /// <returns>The URL encoded text.</returns>

+      /// <remarks>Does not do any browser specific adjustments, just encode everything</remarks>

+      public string UrlPathEncode(string s) {

+         // find the path portion (?)

+         int idx = s.IndexOf("?");

+         string s2 = s.Substring(0, idx-1);

+         s2 = UrlEncode(s2);

+         s2 += s.Substring(idx);

+

+         return s2;

+      }

+

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpStaticObjectsCollection.cs b/mcs/class/System.Web/System.Web/HttpStaticObjectsCollection.cs
new file mode 100644
index 00000000000..d2027061ea2
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpStaticObjectsCollection.cs
@@ -0,0 +1,59 @@
+using System;

+using System.Collections;

+

+namespace System.Web {

+   public sealed class HttpStaticObjectsCollection : ICollection, IEnumerable {

+      private Hashtable _Objects;

+

+      // Needs to hold object items that can be latebound and can be serialized

+      public HttpStaticObjectsCollection() {

+         _Objects = new Hashtable();

+      }

+

+      public object GetObject(string name) {

+         return this[name];

+      }

+

+      public IEnumerator GetEnumerator() {

+         return _Objects.GetEnumerator ();

+      }

+      

+      public void CopyTo(Array array, int index) {

+	 _Objects.CopyTo (array, index);

+      }   

+

+      internal IDictionary GetObjects() {

+         return _Objects;

+      }

+

+      public object this[string name] {

+         get {

+            return _Objects [name];

+         }

+      }

+

+      public int Count {

+         get {

+            return _Objects.Count;

+         }

+      }

+

+      public bool IsReadOnly {

+         get {

+            return true;

+         }

+      }

+

+      public bool IsSynchronized {

+         get {

+            return false;

+         }

+      }

+

+      public object SyncRoot {

+         get {

+            return this;

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/HttpUnhandledException.cs b/mcs/class/System.Web/System.Web/HttpUnhandledException.cs
new file mode 100644
index 00000000000..bb411bdf6f1
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpUnhandledException.cs
@@ -0,0 +1,28 @@
+// 

+// System.Web.HttpUnhandledException.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Web {

+	public sealed class HttpUnhandledException : HttpException {

+

+		#region Constructors

+

+		internal HttpUnhandledException (string message, Exception innerException)

+			: base (message, innerException)

+		{

+		}

+

+		[MonoTODO ("What does this do?")]

+		internal HttpUnhandledException (string message, string x, Exception innerException)

+			: base (message, innerException)

+		{

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/HttpUtility.cs b/mcs/class/System.Web/System.Web/HttpUtility.cs
new file mode 100644
index 00000000000..2032039e8f2
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpUtility.cs
@@ -0,0 +1,481 @@
+// 

+// System.Web.HttpUtility

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//   Wictor Wilén (decode/encode functions) (wictor@ibizkit.se)

+//   Tim Coleman (tim@timcoleman.com)

+//

+using System;

+using System.Collections;

+using System.Globalization;

+using System.IO;

+using System.Text;

+

+namespace System.Web {

+	public sealed class HttpUtility {

+

+		#region Fields

+	

+		const string _hex = "0123456789ABCDEF";

+		const string _chars = "<>;:.?=&@*+%/\\";

+		static Hashtable entities;

+		static string buildingHtmlEntityReferences = "Building HTML entity reference table.";

+	

+		#endregion // Fields

+	

+		#region Constructors

+

+		static HttpUtility ()

+		{

+			lock (buildingHtmlEntityReferences) {

+				// Build the hash table of HTML entity references.  This list comes

+				// from the HTML 4.01 W3C recommendation.

+				entities = new Hashtable ();

+				entities.Add ("nbsp", '\u00A0');

+				entities.Add ("iexcl", '\u00A1');

+				entities.Add ("cent", '\u00A2');

+				entities.Add ("pound", '\u00A3');

+				entities.Add ("curren", '\u00A4');

+				entities.Add ("yen", '\u00A5');

+				entities.Add ("brvbar", '\u00A6');

+				entities.Add ("sect", '\u00A7');

+				entities.Add ("uml", '\u00A8');

+				entities.Add ("copy", '\u00A9');

+				entities.Add ("ordf", '\u00AA');

+				entities.Add ("laquo", '\u00AB');

+				entities.Add ("not", '\u00AC');

+				entities.Add ("shy", '\u00AD');

+				entities.Add ("reg", '\u00AE');

+				entities.Add ("macr", '\u00AF');

+				entities.Add ("deg", '\u00B0');

+				entities.Add ("plusmn", '\u00B1');

+				entities.Add ("sup2", '\u00B2');

+				entities.Add ("sup3", '\u00B3');

+				entities.Add ("acute", '\u00B4');

+				entities.Add ("micro", '\u00B5');

+				entities.Add ("para", '\u00B6');

+				entities.Add ("middot", '\u00B7');

+				entities.Add ("cedil", '\u00B8');

+				entities.Add ("sup1", '\u00B9');

+				entities.Add ("ordm", '\u00BA');

+				entities.Add ("raquo", '\u00BB');

+				entities.Add ("frac14", '\u00BC');

+				entities.Add ("frac12", '\u00BD');

+				entities.Add ("frac34", '\u00BE');

+				entities.Add ("iquest", '\u00BF');

+				entities.Add ("Agrave", '\u00C0');

+				entities.Add ("Aacute", '\u00C1');

+				entities.Add ("Acirc", '\u00C2');

+				entities.Add ("Atilde", '\u00C3');

+				entities.Add ("Auml", '\u00C4');

+				entities.Add ("Aring", '\u00C5');

+				entities.Add ("AElig", '\u00C6');

+				entities.Add ("Ccedil", '\u00C7');

+				entities.Add ("Egrave", '\u00C8');

+				entities.Add ("Eacute", '\u00C9');

+				entities.Add ("Ecirc", '\u00CA');

+				entities.Add ("Euml", '\u00CB');

+				entities.Add ("Igrave", '\u00CC');

+				entities.Add ("Iacute", '\u00CD');

+				entities.Add ("Icirc", '\u00CE');

+				entities.Add ("Iuml", '\u00CF');

+				entities.Add ("ETH", '\u00D0');

+				entities.Add ("Ntilde", '\u00D1');

+				entities.Add ("Ograve", '\u00D2');

+				entities.Add ("Oacute", '\u00D3');

+				entities.Add ("Ocirc", '\u00D4');

+				entities.Add ("Otilde", '\u00D5');

+				entities.Add ("Ouml", '\u00D6');

+				entities.Add ("times", '\u00D7');

+				entities.Add ("Oslash", '\u00D8');

+				entities.Add ("Ugrave", '\u00D9');

+				entities.Add ("Uacute", '\u00DA');

+				entities.Add ("Ucirc", '\u00DB');

+				entities.Add ("Uuml", '\u00DC');

+				entities.Add ("Yacute", '\u00DD');

+				entities.Add ("THORN", '\u00DE');

+				entities.Add ("szlig", '\u00DF');

+				entities.Add ("agrave", '\u00E0');

+				entities.Add ("aacute", '\u00E1');

+				entities.Add ("acirc", '\u00E2');

+				entities.Add ("atilde", '\u00E3');

+				entities.Add ("auml", '\u00E4');

+				entities.Add ("aring", '\u00E5');

+				entities.Add ("aelig", '\u00E6');

+				entities.Add ("ccedil", '\u00E7');

+				entities.Add ("egrave", '\u00E8');

+				entities.Add ("eacute", '\u00E9');

+				entities.Add ("ecirc", '\u00EA');

+				entities.Add ("euml", '\u00EB');

+				entities.Add ("igrave", '\u00EC');

+				entities.Add ("iacute", '\u00ED');

+				entities.Add ("icirc", '\u00EE');

+				entities.Add ("iuml", '\u00EF');

+				entities.Add ("eth", '\u00F0');

+				entities.Add ("ntilde", '\u00F1');

+				entities.Add ("ograve", '\u00F2');

+				entities.Add ("oacute", '\u00F3');

+				entities.Add ("ocirc", '\u00F4');

+				entities.Add ("otilde", '\u00F5');

+				entities.Add ("ouml", '\u00F6');

+				entities.Add ("divide", '\u00F7');

+				entities.Add ("oslash", '\u00F8');

+				entities.Add ("ugrave", '\u00F9');

+				entities.Add ("uacute", '\u00FA');

+				entities.Add ("ucirc", '\u00FB');

+				entities.Add ("uuml", '\u00FC');

+				entities.Add ("yacute", '\u00FD');

+				entities.Add ("thorn", '\u00FE');

+				entities.Add ("yuml", '\u00FF');

+				entities.Add ("fnof", '\u0192');

+				entities.Add ("Alpha", '\u0391');

+				entities.Add ("Beta", '\u0392');

+				entities.Add ("Gamma", '\u0393');

+				entities.Add ("Delta", '\u0394');

+				entities.Add ("Epsilon", '\u0395');

+				entities.Add ("Zeta", '\u0396');

+				entities.Add ("Eta", '\u0397');

+				entities.Add ("Theta", '\u0398');

+				entities.Add ("Iota", '\u0399');

+				entities.Add ("Kappa", '\u039A');

+				entities.Add ("Lambda", '\u039B');

+				entities.Add ("Mu", '\u039C');

+				entities.Add ("Nu", '\u039D');

+				entities.Add ("Xi", '\u039E');

+				entities.Add ("Omicron", '\u039F');

+				entities.Add ("Pi", '\u03A0');

+				entities.Add ("Rho", '\u03A1');

+				entities.Add ("Sigma", '\u03A3');

+				entities.Add ("Tau", '\u03A4');

+				entities.Add ("Upsilon", '\u03A5');

+				entities.Add ("Phi", '\u03A6');

+				entities.Add ("Chi", '\u03A7');

+				entities.Add ("Psi", '\u03A8');

+				entities.Add ("Omega", '\u03A9');

+				entities.Add ("alpha", '\u03B1');

+				entities.Add ("beta", '\u03B2');

+				entities.Add ("gamma", '\u03B3');

+				entities.Add ("delta", '\u03B4');

+				entities.Add ("epsilon", '\u03B5');

+				entities.Add ("zeta", '\u03B6');

+				entities.Add ("eta", '\u03B7');

+				entities.Add ("theta", '\u03B8');

+				entities.Add ("iota", '\u03B9');

+				entities.Add ("kappa", '\u03BA');

+				entities.Add ("lambda", '\u03BB');

+				entities.Add ("mu", '\u03BC');

+				entities.Add ("nu", '\u03BD');

+				entities.Add ("xi", '\u03BE');

+				entities.Add ("omicron", '\u03BF');

+				entities.Add ("pi", '\u03C0');

+				entities.Add ("rho", '\u03C1');

+				entities.Add ("sigmaf", '\u03C2');

+				entities.Add ("sigma", '\u03C3');

+				entities.Add ("tau", '\u03C4');

+				entities.Add ("upsilon", '\u03C5');

+				entities.Add ("phi", '\u03C6');

+				entities.Add ("chi", '\u03C7');

+				entities.Add ("psi", '\u03C8');

+				entities.Add ("omega", '\u03C9');

+				entities.Add ("thetasym", '\u03D1');

+				entities.Add ("upsih", '\u03D2');

+				entities.Add ("piv", '\u03D6');

+				entities.Add ("bull", '\u2022');

+				entities.Add ("hellip", '\u2026');

+				entities.Add ("prime", '\u2032');

+				entities.Add ("Prime", '\u2033');

+				entities.Add ("oline", '\u203E');

+				entities.Add ("frasl", '\u2044');

+				entities.Add ("weierp", '\u2118');

+				entities.Add ("image", '\u2111');

+				entities.Add ("real", '\u211C');

+				entities.Add ("trade", '\u2122');

+				entities.Add ("alefsym", '\u2135');

+				entities.Add ("larr", '\u2190');

+				entities.Add ("uarr", '\u2191');

+				entities.Add ("rarr", '\u2192');

+				entities.Add ("darr", '\u2193');

+				entities.Add ("harr", '\u2194');

+				entities.Add ("crarr", '\u21B5');

+				entities.Add ("lArr", '\u21D0');

+				entities.Add ("uArr", '\u21D1');

+				entities.Add ("rArr", '\u21D2');

+				entities.Add ("dArr", '\u21D3');

+				entities.Add ("hArr", '\u21D4');

+				entities.Add ("forall", '\u2200');

+				entities.Add ("part", '\u2202');

+				entities.Add ("exist", '\u2203');

+				entities.Add ("empty", '\u2205');

+				entities.Add ("nabla", '\u2207');

+				entities.Add ("isin", '\u2208');

+				entities.Add ("notin", '\u2209');

+				entities.Add ("ni", '\u220B');

+				entities.Add ("prod", '\u220F');

+				entities.Add ("sum", '\u2211');

+				entities.Add ("minus", '\u2212');

+				entities.Add ("lowast", '\u2217');

+				entities.Add ("radic", '\u221A');

+				entities.Add ("prop", '\u221D');

+				entities.Add ("infin", '\u221E');

+				entities.Add ("ang", '\u2220');

+				entities.Add ("and", '\u2227');

+				entities.Add ("or", '\u2228');

+				entities.Add ("cap", '\u2229');

+				entities.Add ("cup", '\u222A');

+				entities.Add ("int", '\u222B');

+				entities.Add ("there4", '\u2234');

+				entities.Add ("sim", '\u223C');

+				entities.Add ("cong", '\u2245');

+				entities.Add ("asymp", '\u2248');

+				entities.Add ("ne", '\u2260');

+				entities.Add ("equiv", '\u2261');

+				entities.Add ("le", '\u2264');

+				entities.Add ("ge", '\u2265');

+				entities.Add ("sub", '\u2282');

+				entities.Add ("sup", '\u2283');

+				entities.Add ("nsub", '\u2284');

+				entities.Add ("sube", '\u2286');

+				entities.Add ("supe", '\u2287');

+				entities.Add ("oplus", '\u2295');

+				entities.Add ("otimes", '\u2297');

+				entities.Add ("perp", '\u22A5');

+				entities.Add ("sdot", '\u22C5');

+				entities.Add ("lceil", '\u2308');

+				entities.Add ("rceil", '\u2309');

+				entities.Add ("lfloor", '\u230A');

+				entities.Add ("rfloor", '\u230B');

+				entities.Add ("lang", '\u2329');

+				entities.Add ("rang", '\u232A');

+				entities.Add ("loz", '\u25CA');

+				entities.Add ("spades", '\u2660');

+				entities.Add ("clubs", '\u2663');

+				entities.Add ("hearts", '\u2665');

+				entities.Add ("diams", '\u2666');

+				entities.Add ("quot", '\u0022');

+				entities.Add ("amp", '\u0026');

+				entities.Add ("lt", '\u003C');

+				entities.Add ("gt", '\u003E');

+				entities.Add ("OElig", '\u0152');

+				entities.Add ("oelig", '\u0153');

+				entities.Add ("Scaron", '\u0160');

+				entities.Add ("scaron", '\u0161');

+				entities.Add ("Yuml", '\u0178');

+				entities.Add ("circ", '\u02C6');

+				entities.Add ("tilde", '\u02DC');

+				entities.Add ("ensp", '\u2002');

+				entities.Add ("emsp", '\u2003');

+				entities.Add ("thinsp", '\u2009');

+				entities.Add ("zwnj", '\u200C');

+				entities.Add ("zwj", '\u200D');

+				entities.Add ("lrm", '\u200E');

+				entities.Add ("rlm", '\u200F');

+				entities.Add ("ndash", '\u2013');

+				entities.Add ("mdash", '\u2014');

+				entities.Add ("lsquo", '\u2018');

+				entities.Add ("rsquo", '\u2019');

+				entities.Add ("sbquo", '\u201A');

+				entities.Add ("ldquo", '\u201C');

+				entities.Add ("rdquo", '\u201D');

+				entities.Add ("bdquo", '\u201E');

+				entities.Add ("dagger", '\u2020');

+				entities.Add ("Dagger", '\u2021');

+				entities.Add ("permil", '\u2030');

+				entities.Add ("lsaquo", '\u2039');

+				entities.Add ("rsaquo", '\u203A');

+				entities.Add ("euro", '\u20AC');

+			}

+		}

+	

+		public HttpUtility () 

+		{

+		}

+	

+		#endregion // Constructors

+	

+		#region Methods

+	

+		public static void HtmlAttributeEncode (string s, TextWriter output) 

+		{

+			output.Write(HtmlAttributeEncode(s));

+		}

+	

+		public static string HtmlAttributeEncode (string s) 

+		{

+			if (null == s) 

+				return null;

+	

+			StringBuilder output = new StringBuilder ();

+	

+			foreach (char c in s) 

+				switch (c) {

+				case '&' : 

+					output.Append ("&amp;");

+					break;

+				case '"' :

+					output.Append ("&quot;");

+					break;

+				default:

+					output.Append (c);

+					break;

+				}

+	

+			return output.ToString();

+		}

+	

+		public static string UrlDecode (string str) 

+		{

+			return UrlDecode(str, Encoding.UTF8);

+		}

+	

+		[MonoTODO("Use Encoding")]

+		public static string UrlDecode(string s, Encoding Enc) {

+			if (null == s) 

+				return null;

+	

+			StringBuilder output = new StringBuilder ();

+			long len = s.Length;

+	

+			for (int i = 0; i < len; i++) {

+				if (s [i] == '%' && i + 2 < len) {

+					output.Append ((char) Int32.Parse (s.Substring (i + 1, 2), NumberStyles.HexNumber));

+					i += 2;

+				} 

+				else if (s [i] == '+')

+					output.Append (' ');

+				else

+					output.Append (s [i]);

+	         	}

+	

+			return output.ToString ();

+		}

+	

+	

+	

+		public static string UrlEncode(string str) 

+		{

+			return UrlEncode(str, Encoding.UTF8);

+		}

+	

+		[MonoTODO("Use encoding")]

+		public static string UrlEncode(string s, Encoding Enc) 

+		{

+			if (null == s) 

+				return null;

+	

+			StringBuilder output = new StringBuilder ();

+			int h1, h2;

+	

+			foreach (char c in s) {

+				if (c == ' ') // space character is replaced with '+'

+					output.Append ('+');

+				else if ( _chars.IndexOf (c) >= 0 ) {

+					output.Append ('%');

+					output.Append (_hex [((int) c) % 16].ToString ());

+					output.Append (_hex [((int) c) / 16].ToString ());

+				}

+				else

+					output.Append (c);

+			}

+			return output.ToString ();

+		}

+	  

+		/// <summary>

+		/// Decodes an HTML-encoded string and returns the decoded string.

+		/// </summary>

+		/// <param name="s">The HTML string to decode. </param>

+		/// <returns>The decoded text.</returns>

+		public static string HtmlDecode (string s) 

+		{

+			bool insideEntity = false; // used to indicate that we are in a potential entity

+			string entity = String.Empty;

+			StringBuilder output = new StringBuilder ();

+	

+			foreach (char c in s) 

+				switch (c) {

+				case '&' :

+					output.Append (entity);

+					entity = "&";

+					insideEntity = true;

+					break;

+				case ';' :

+					entity += c;

+					if (entity[1] == '#' && entity[2] != ';')

+						entity = ((char) Int32.Parse (entity.Substring (2, entity.Length - 3))).ToString();

+					else if (entities.ContainsKey (entity.Substring (1, entity.Length - 2)))

+						entity = entities [entity.Substring (1, entity.Length - 2)].ToString ();

+					

+					output.Append (entity);

+					entity = String.Empty;

+					insideEntity = false;

+					break;

+				default :

+					if (insideEntity)

+						entity += c;

+					else

+						output.Append (c);

+					break;

+				}

+			output.Append (entity);

+			return output.ToString ();

+		}

+	

+		/// <summary>

+		/// Decodes an HTML-encoded string and sends the resulting output to a TextWriter output stream.

+		/// </summary>

+		/// <param name="s">The HTML string to decode</param>

+		/// <param name="output">The TextWriter output stream containing the decoded string. </param>

+		public static void HtmlDecode(string s, TextWriter output) 

+		{

+			output.Write (HtmlDecode (s));

+		}

+	

+		/// <summary>

+		/// HTML-encodes a string and returns the encoded string.

+		/// </summary>

+		/// <param name="s">The text string to encode. </param>

+		/// <returns>The HTML-encoded text.</returns>

+		public static string HtmlEncode (string s) 

+		{

+			StringBuilder output = new StringBuilder ();

+			

+			foreach (char c in s) 

+				switch (c) {

+				case '&' :

+					output.Append ("&amp;");

+					break;

+				case '>' : 

+					output.Append ("&gt;");

+					break;

+				case '<' :

+					output.Append ("&lt;");

+					break;

+				case '"' :

+					output.Append ("&quot;");

+					break;

+				default:

+					if ((int) c > 128) {

+						output.Append ("&#");

+						output.Append (((int) c).ToString ());

+						output.Append (";");

+					}

+					else

+						output.Append (c);

+					break;

+				}

+			return output.ToString ();

+		}

+	

+		/// <summary>

+		/// HTML-encodes a string and sends the resulting output to a TextWriter output stream.

+		/// </summary>

+		/// <param name="s">The string to encode. </param>

+		/// <param name="output">The TextWriter output stream containing the encoded string. </param>

+		public static void HtmlEncode(string s, TextWriter output) 

+		{

+			output.Write (HtmlEncode (s));

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/HttpValidationStatus.cs b/mcs/class/System.Web/System.Web/HttpValidationStatus.cs
new file mode 100644
index 00000000000..0933b9a6737
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpValidationStatus.cs
@@ -0,0 +1,17 @@
+//
+// System.Web.HttpValidationStatus.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+namespace System.Web {
+	[Serializable]
+        public enum HttpValidationStatus {
+                Invalid = 0x1,
+                IgnoreThisRequest,
+                Valid
+        }
+}
diff --git a/mcs/class/System.Web/System.Web/HttpValueCollection.cs b/mcs/class/System.Web/System.Web/HttpValueCollection.cs
new file mode 100644
index 00000000000..018234198b7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpValueCollection.cs
@@ -0,0 +1,142 @@
+// 

+// System.Web.HttpValueCollection

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.Collections.Specialized;

+using System.Runtime.Serialization;

+using System.Text;

+

+namespace System.Web {

+

+   [Serializable]

+   public class HttpValueCollection : NameValueCollection {

+      private bool	_bHeaders;

+

+      internal HttpValueCollection() {

+         _bHeaders = false;

+      }

+

+      internal HttpValueCollection(string sData) {

+         FillFromQueryString(sData, Encoding.UTF8);

+         IsReadOnly = true;

+      }

+

+      internal HttpValueCollection(string sData, bool ReadOnly, Encoding encoding) {

+         FillFromQueryString(sData, encoding);

+         IsReadOnly = ReadOnly;

+      }

+

+      protected HttpValueCollection(SerializationInfo info, StreamingContext context) : base(info, context) {

+      }

+      

+      // string = header1: value1\r\nheader2: value2

+      internal void FillFromHeaders(string sHeaders, Encoding encoding) {

+         _bHeaders = true;

+         char [] arrSplitValue = new char [] {':'};

+         string sKey, sValue;

+

+         sKey = "";

+         sValue = "";

+

+         string [] arrValues = sHeaders.Split(new char [] {'\r', '\n'});

+         foreach (string sLine in arrValues) {

+            string [] arrKeyValue = sLine.Split(arrSplitValue);

+            if (arrKeyValue.Length == 1 && arrKeyValue[0].Length == 0) {

+               // Empty \r or \n is ignored

+               continue;

+            }

+

+            if (arrKeyValue[0] != sKey && sKey.Length > 0) {

+               Add(System.Web.HttpUtility.UrlDecode(sKey, encoding), System.Web.HttpUtility.UrlDecode(sValue, encoding));

+            }

+

+            if (arrKeyValue.Length == 1) {

+               sValue += "\r\n" + arrKeyValue[0].Trim();

+               continue;

+            } 

+            else if (arrKeyValue.Length == 2) {

+               if (arrKeyValue[0].Length == 0) {

+                  sValue += arrKeyValue[1].Trim();

+                  continue;

+               }

+

+               sKey = arrKeyValue[0].Trim();

+               sValue = arrKeyValue[1].Trim();

+            } 

+         }

+			

+         if (sKey.Length > 0) {

+            Add(System.Web.HttpUtility.UrlDecode(sKey, encoding), System.Web.HttpUtility.UrlDecode(sValue, encoding));

+         }

+      }

+

+      internal void FillFromHeaders(string sData) {

+         FillFromHeaders(sData, Encoding.UTF8);

+      }

+

+      // String = test=aaa&kalle=nisse

+      internal void FillFromQueryString(string sData, Encoding encoding) {

+         _bHeaders = false;

+

+         char [] arrSplitValue = new char [] {'='};

+

+         string [] arrValues = sData.Split(new char [] {'&'});

+         foreach (string sValue in arrValues) {

+            string [] arrKeyValue = sValue.Split(arrSplitValue);

+            if (arrKeyValue.Length == 1) {

+               // Add key only

+               Add(System.Web.HttpUtility.UrlDecode(arrKeyValue[0].Trim(), encoding), string.Empty);

+            } 

+            else if (arrKeyValue.Length == 2) {

+               Add(System.Web.HttpUtility.UrlDecode(arrKeyValue[0].Trim(), encoding),System.Web.HttpUtility.UrlDecode(arrKeyValue[1].Trim(), encoding));

+            } 

+            else {

+               throw new InvalidOperationException("Data is malformed");

+            }

+         }		

+      }

+

+      internal void FillFromQueryString(string sData) {

+         FillFromQueryString(sData, Encoding.UTF8);

+      }

+

+      internal void FillFromCookieString(string sData) {

+         FillFromQueryString(sData, Encoding.UTF8);

+      }

+

+      internal void MakeReadOnly() {

+         IsReadOnly = true;

+      }

+		

+      internal void MakeReadWrite() {

+         IsReadOnly = false;

+      }

+

+      internal void Merge(NameValueCollection oData) {

+         foreach (string sKey in oData) {

+            Add(sKey, oData[sKey]);

+         }

+      }

+

+      internal void Reset() {

+         Clear();

+      }

+

+      [MonoTODO("string ToString(bool UrlEncode)")]

+      internal string ToString(bool UrlEncode) {

+         if (_bHeaders) {

+         }

+

+         // TODO: Should return a correctly formated string (different depending on header flag)

+         throw new NotImplementedException();

+      }

+

+      virtual new public string ToString() {

+         return ToString(false);

+      }

+   }

+

+}

diff --git a/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs b/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs
new file mode 100644
index 00000000000..e1bf3c981a7
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpWorkerRequest.cs
@@ -0,0 +1,477 @@
+// 

+// System.Web.HttpResponseStreamProxy

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//   (constants from Bob Smith (bob@thestuff.net))

+//

+using System;

+using System.Collections;

+

+namespace System.Web {

+   public abstract class HttpWorkerRequest {

+      public delegate void EndOfSendNotification(HttpWorkerRequest wr, object extraData);

+

+      public const int HeaderAccept = 20;

+      public const int HeaderAcceptCharset = 21;

+      public const int HeaderAcceptEncoding = 22;

+      public const int HeaderAcceptLanguage = 23;

+      public const int HeaderAcceptRanges = 20;

+      public const int HeaderAge = 21;

+      public const int HeaderAllow = 10;

+      public const int HeaderAuthorization = 24;

+      public const int HeaderCacheControl = 0;

+      public const int HeaderConnection = 1;

+      public const int HeaderContentEncoding = 13;

+      public const int HeaderContentLanguage = 14;

+      public const int HeaderContentLength = 11;

+      public const int HeaderContentLocation = 15;

+      public const int HeaderContentMd5 = 16;

+      public const int HeaderContentRange = 17;

+      public const int HeaderContentType = 12;

+      public const int HeaderCookie = 25;

+      public const int HeaderDate = 2;

+      public const int HeaderEtag = 22;

+      public const int HeaderExpect = 26;

+      public const int HeaderExpires = 18;

+      public const int HeaderFrom = 27;

+      public const int HeaderHost = 28;

+      public const int HeaderIfMatch = 29;

+      public const int HeaderIfModifiedSince = 30;

+      public const int HeaderIfNoneMatch = 31;

+      public const int HeaderIfRange = 32;

+      public const int HeaderIfUnmodifiedSince = 33;

+      public const int HeaderKeepAlive = 3;

+      public const int HeaderLastModified = 19;

+      public const int HeaderLocation = 23;

+      public const int HeaderMaxForwards = 34;

+      public const int HeaderPragma = 4;

+      public const int HeaderProxyAuthenticate = 24;

+      public const int HeaderProxyAuthorization = 35;

+      public const int HeaderRange = 37;

+      public const int HeaderReferer = 36;

+      public const int HeaderRetryAfter = 25;

+      public const int HeaderServer = 26;

+      public const int HeaderSetCookie = 27;

+      public const int HeaderTe = 38;

+      public const int HeaderTrailer = 5;

+      public const int HeaderTransferEncoding = 6;

+      public const int HeaderUpgrade = 7;

+      public const int HeaderUserAgent = 39;

+      public const int HeaderVary = 28;

+      public const int HeaderVia = 8;

+      public const int HeaderWarning = 9;

+      public const int HeaderWwwAuthenticate = 29;

+      public const int ReasonCachePolicy = 2;

+      public const int ReasonCacheSecurity = 3;

+      public const int ReasonClientDisconnect = 4;

+      public const int ReasonDefault = 0;

+      public const int ReasonFileHandleCacheMiss = 1;

+      public const int ReasonResponseCacheMiss = 0;

+      public const int RequestHeaderMaximum = 40;

+      public const int ResponseHeaderMaximum = 30;

+

+      static string [][] s_HttpStatusDescriptions;

+      static string [] s_HttpRequestHeaderNames;

+      static string [] s_HttpResponseHeaderNames;

+

+      static Hashtable s_HttpResponseHeadersTable;

+      static Hashtable s_HttpRequestHeaderTable;

+

+      static HttpWorkerRequest() {

+         string[] sSubCodes;

+

+         s_HttpStatusDescriptions = new string[6][];

+

+         sSubCodes = new String[3];

+         sSubCodes[0] = "Continue";

+         sSubCodes[1] = "Switching Protocols";

+         sSubCodes[2] = "Processing";

+         s_HttpStatusDescriptions[1] = sSubCodes;

+

+         sSubCodes = new String[8];

+         sSubCodes[0] = "OK";

+         sSubCodes[1] = "Created";

+         sSubCodes[2] = "Accepted";

+         sSubCodes[3] = "Non-Authoritative Information";

+         sSubCodes[4] = "No Content";

+         sSubCodes[5] = "Reset Content";

+         sSubCodes[6] = "Partial Content";

+         sSubCodes[7] = "Multi-Status";

+         s_HttpStatusDescriptions[2] = sSubCodes;

+         

+         sSubCodes = new String[8];

+         sSubCodes[0] = "Multiple Choices";

+         sSubCodes[1] = "Moved Permanently";

+         sSubCodes[2] = "Found";

+         sSubCodes[3] = "See Other";

+         sSubCodes[4] = "Not Modified";

+         sSubCodes[5] = "Use Proxy";

+         sSubCodes[6] = "";

+         sSubCodes[7] = "Temporary Redirect";

+         s_HttpStatusDescriptions[3] = sSubCodes;

+

+         sSubCodes = new String[24];

+         sSubCodes[0] = "Bad Request";

+         sSubCodes[1] = "Unauthorized";

+         sSubCodes[2] = "Payment Required";

+         sSubCodes[3] = "Forbidden";

+         sSubCodes[4] = "Not Found";

+         sSubCodes[5] = "Method Not Allowed";

+         sSubCodes[6] = "Not Acceptable";

+         sSubCodes[7] = "Proxy Authentication Required";

+         sSubCodes[8] = "Request Timeout";

+         sSubCodes[9] = "Conflict";

+         sSubCodes[10] = "Gone";

+         sSubCodes[11] = "Length Required";

+         sSubCodes[12] = "Precondition Failed";

+         sSubCodes[13] = "Request Entity Too Large";

+         sSubCodes[14] = "Request-Uri Too Long";

+         sSubCodes[15] = "Unsupported Media Type";

+         sSubCodes[16] = "Requested Range Not Satisfiable";

+         sSubCodes[17] = "Expectation Failed";

+         sSubCodes[18] = "";

+         sSubCodes[19] = "";

+         sSubCodes[20] = "";

+         sSubCodes[21] = "Unprocessable Entity";

+         sSubCodes[22] = "Locked";

+         sSubCodes[23] = "Failed Dependency";

+         s_HttpStatusDescriptions[4] = sSubCodes;

+         

+         sSubCodes = new String[8];

+         sSubCodes[0] = "Internal Server Error";

+         sSubCodes[1] = "Not Implemented";

+         sSubCodes[2] = "Bad Gateway";

+         sSubCodes[3] = "Service Unavailable";

+         sSubCodes[4] = "Gateway Timeout";

+         sSubCodes[5] = "Http Version Not Supported";

+         sSubCodes[6] = "";

+         sSubCodes[7] = "Insufficient Storage";

+         s_HttpStatusDescriptions[5] = sSubCodes;     

+ 

+         InitLookupTables();

+      }

+

+      protected HttpWorkerRequest() {

+      }

+

+      static private void InitLookupTables() {

+         // Performance arrays

+         s_HttpRequestHeaderNames = new string[40];

+         s_HttpResponseHeaderNames = new string[30];

+

+         // Lookup tables (name -> id)

+         s_HttpRequestHeaderTable = new Hashtable();

+         s_HttpResponseHeadersTable = new Hashtable();

+

+         AddHeader(true, true, 0, "Cache-Control");

+         AddHeader(true, true, 1, "Connection");

+         AddHeader(true, true, 2, "Date");

+         AddHeader(true, true, 3, "Keep-Alive");

+         AddHeader(true, true, 4, "Pragma");

+         AddHeader(true, true, 5, "Trailer");

+         AddHeader(true, true, 6, "Transfer-Encoding");

+         AddHeader(true, true, 7, "Upgrade");

+         AddHeader(true, true, 8, "Via");

+         AddHeader(true, true, 9, "Warning");

+         AddHeader(true, true, 10, "Allow");

+         AddHeader(true, true, 11, "Content-Length");

+         AddHeader(true, true, 12, "Content-Type");

+         AddHeader(true, true, 13, "Content-Encoding");

+         AddHeader(true, true, 14, "Content-Language");

+         AddHeader(true, true, 15, "Content-Location");

+         AddHeader(true, true, 16, "Content-MD5");

+         AddHeader(true, true, 17, "Content-Range");

+         AddHeader(true, true, 18, "Expires");

+         AddHeader(true, true, 19, "Last-Modified");

+         AddHeader(true, false, 20, "Accept");

+         AddHeader(true, false, 21, "Accept-Charset");

+         AddHeader(true, false, 22, "Accept-Encoding");

+         AddHeader(true, false, 23, "Accept-Language");

+         AddHeader(true, false, 24, "Authorization");

+         AddHeader(true, false, 25, "Cookie");

+         AddHeader(true, false, 26, "Expect");

+         AddHeader(true, false, 27, "From");

+         AddHeader(true, false, 28, "Host");

+         AddHeader(true, false, 29, "If-Match");

+         AddHeader(true, false, 30, "If-Modified-Since");

+         AddHeader(true, false, 31, "If-None-Match");

+         AddHeader(true, false, 32, "If-Range");

+         AddHeader(true, false, 33, "If-Unmodified-Since");

+         AddHeader(true, false, 34, "Max-Forwards");

+         AddHeader(true, false, 35, "Proxy-Authorization");

+         AddHeader(true, false, 36, "Referer");

+         AddHeader(true, false, 37, "Range");

+         AddHeader(true, false, 38, "TE");

+         AddHeader(true, false, 39, "User-Agent");

+         AddHeader(false, true, 20, "Accept-Ranges");

+         AddHeader(false, true, 21, "Age");

+         AddHeader(false, true, 22, "ETag");

+         AddHeader(false, true, 23, "Location");

+         AddHeader(false, true, 24, "Proxy-Authenticate");

+         AddHeader(false, true, 25, "Retry-After");

+         AddHeader(false, true, 26, "Server");

+         AddHeader(false, true, 27, "Set-Cookie");

+         AddHeader(false, true, 28, "Vary");

+         AddHeader(false, true, 29, "WWW-Authenticate");

+      }

+

+      static private void AddHeader(bool bRequest, bool bResponse, int iID, string sHeader) {

+         if (bResponse) {

+            s_HttpResponseHeaderNames[iID] = sHeader;

+            s_HttpResponseHeadersTable.Add(sHeader, iID);

+         }

+

+         if (bRequest) {

+            s_HttpRequestHeaderNames[iID] = sHeader;

+            s_HttpRequestHeaderTable.Add(sHeader, iID);

+         }

+      }

+

+      public virtual void CloseConnection() {}

+      public abstract void EndOfRequest();

+      public abstract void FlushResponse(bool finalFlush);

+      

+      public virtual string GetAppPath() {

+         return null;

+      }

+      

+      public virtual string GetAppPathTranslated() {

+         return null;

+      }

+      

+      public virtual string GetAppPoolID() {

+         return null;

+      }

+      

+      public virtual long GetBytesRead() {

+         return 0;

+      }

+      

+      public virtual byte[] GetClientCertificate() {

+         return new byte[0];

+      }

+      

+      public virtual byte[] GetClientCertificateBinaryIssuer() {

+         return new byte[0];

+      }

+      

+      public virtual int GetClientCertificateEncoding() {

+         return 0;

+      }

+      

+      public virtual byte[] GetClientCertificatePublicKey() {

+         return new byte[0];

+      }

+      

+      public virtual DateTime GetClientCertificateValidFrom() {

+         return DateTime.Now;

+      }

+

+      public virtual DateTime GetClientCertificateValidUntil() {

+         return DateTime.Now;

+      }

+

+      public virtual long GetConnectionID() {

+         return 0;

+      }

+      

+      public virtual string GetFilePath() {

+         return GetUriPath();

+      }

+   

+      public virtual string GetFilePathTranslated() {

+         return null;

+      }

+      

+      public abstract string GetHttpVerbName();

+      public abstract string GetHttpVersion();

+      

+      public virtual string GetKnownRequestHeader(int index) {

+         return null;

+      }

+      

+      public static int GetKnownRequestHeaderIndex(string header) {

+         object Index;

+         Index = s_HttpRequestHeaderTable[header];

+         if (null != Index) {

+            return (Int32) Index;

+         }

+

+         return -1;

+      }

+

+      public static string GetKnownRequestHeaderName(int index) {

+         return s_HttpRequestHeaderNames[index];

+      }

+

+      public static int GetKnownResponseHeaderIndex(string header) {

+         object Index;

+

+         Index = s_HttpResponseHeadersTable[header];

+         if (null != Index) {

+            return (Int32) Index;

+         }

+

+         return -1;

+      }

+

+      public static string GetKnownResponseHeaderName(int index) {

+         return s_HttpResponseHeaderNames[index];

+      }

+

+      public abstract string GetLocalAddress();

+      public abstract int GetLocalPort();

+      

+      public virtual string GetPathInfo() {

+         return "";

+      }

+      

+      public virtual byte[] GetPreloadedEntityBody() {

+         return null;

+      }

+      

+      public virtual string GetProtocol() {

+         if (IsSecure()) {

+            return "HTTPS";

+         } 

+         

+         return "HTTP";

+      }

+      

+      public abstract string GetQueryString();

+      

+      public virtual byte[] GetQueryStringRawBytes() {

+         return null;

+      }

+      

+      public abstract string GetRawUrl();

+      public abstract string GetRemoteAddress();

+      

+      public virtual string GetRemoteName() {

+         return GetRemoteAddress();

+      }

+      

+      public abstract int GetRemotePort();

+

+      public virtual int GetRequestReason() {

+         return 0;

+      }

+      

+      public virtual string GetServerName() {

+         return GetLocalAddress();  

+      }

+      

+      public virtual string GetServerVariable(string name) {

+         return null;

+      }

+

+      public static string GetStatusDescription(int code) {

+         if (code>= 100 && code < 600) {

+            int iMajor = code / 100;

+            int iMinor = code % 100;

+            if (iMinor < (int) s_HttpStatusDescriptions[iMajor].Length) {

+               return s_HttpStatusDescriptions[iMajor][iMinor];

+            }

+         }

+

+         return "";

+      }

+      

+      public virtual string GetUnknownRequestHeader(string name) {

+         return null;

+      }

+      

+      [CLSCompliant(false)]

+      public virtual string[][] GetUnknownRequestHeaders() {

+         return null;

+      }

+

+      public abstract string GetUriPath();

+

+      public virtual long GetUrlContextID() {

+         return 0;

+      }

+      

+      public virtual IntPtr GetUserToken() {

+         throw new NotSupportedException();

+      }

+      

+      public virtual IntPtr GetVirtualPathToken() {

+         throw new NotSupportedException();

+      }

+      

+      public bool HasEntityBody() {

+         string sContentLength = GetKnownRequestHeader(HeaderContentLength);

+         if (null != sContentLength && sContentLength != "0") {

+            return true;

+         }

+

+         if (null != GetKnownRequestHeader(HeaderTransferEncoding)) {

+            return true;

+         }

+         

+         if (null != GetPreloadedEntityBody() || IsEntireEntityBodyIsPreloaded()) {

+            return true;

+         }

+

+         return false;

+      }

+      

+      public virtual bool HeadersSent() {

+         return true;

+      }

+      

+      public virtual bool IsClientConnected() {

+         return true;

+      }

+      

+      public virtual bool IsEntireEntityBodyIsPreloaded() {

+         return false;

+      }

+      

+      public virtual bool IsSecure() {

+         return false;

+      }

+      

+      public virtual string MapPath(string virtualPath) {

+         return null;

+      }

+      

+      public virtual int ReadEntityBody(byte[] buffer, int size) {

+         return 0;

+      }

+      

+      public virtual void SendCalculatedContentLength(int contentLength) {

+      }

+      

+      public abstract void SendKnownResponseHeader(int index, string value);

+      public abstract void SendResponseFromFile(IntPtr handle, long offset, long length);

+      public abstract void SendResponseFromFile(string filename, long offset, long length);

+      public abstract void SendResponseFromMemory(byte[] data, int length);

+      

+      [MonoTODO("Should we support this method? We could just use the stringresource to build a string and then send it via SendResponseFromMemory?")]

+      public virtual void SendResponseFromMemory(IntPtr data, int length) {

+         throw new NotSupportedException();

+      }

+      

+      public abstract void SendStatus(int statusCode, string statusDescription);

+      public abstract void SendUnknownResponseHeader(string name, string value);

+      

+      public virtual void SetEndOfSendNotification(HttpWorkerRequest.EndOfSendNotification callback, object extraData) {

+      }

+

+      public virtual string MachineConfigPath {

+         get {

+            return null;

+         }

+      }

+      

+      public virtual string MachineInstallDirectory {

+         get {

+            return null;

+         }

+      }

+   }

+}

+

diff --git a/mcs/class/System.Web/System.Web/HttpWriter.cs b/mcs/class/System.Web/System.Web/HttpWriter.cs
new file mode 100644
index 00000000000..f34dc5c33ed
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/HttpWriter.cs
@@ -0,0 +1,230 @@
+// 

+// System.Web.HttpWriter

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+using System.IO;

+using System.Text;

+

+namespace System.Web {

+   public sealed class HttpWriter : TextWriter {

+      private HttpResponse	_Response;

+		

+      private HttpResponseStream _ResponseStream;

+		

+      private MemoryStream	_OutputStream;

+      private StreamWriter	_OutputHelper;

+      private Encoder		_Encoder;

+      private Encoding		_Encoding;	

+

+      private Stream       _OutputFilter;

+      private HttpResponseStreamProxy  _OutputProxy;

+

+      internal HttpWriter(HttpResponse Response) {

+         _Response = Response;

+

+         _OutputStream = new MemoryStream(32768);

+         _OutputHelper = new StreamWriter(_OutputStream, Encoding.Unicode);

+         _ResponseStream = new HttpResponseStream(this);

+

+         Update();

+      }  

+

+      internal void Dispose() {

+         _OutputHelper.Close();

+         _OutputStream.Close();

+			

+         _OutputFilter.Close();

+      }

+		

+      internal Stream GetActiveFilter() {

+         if (null == _OutputFilter) {

+            if (null == _OutputProxy) {

+               // Create a filter proxy to allow us to know if we have a valid filter

+               _OutputProxy = new HttpResponseStreamProxy(this);

+            }

+            		      

+            return _OutputProxy;

+         }

+		   

+         return _OutputFilter;

+      }

+		

+      internal void ActivateFilter(Stream OutputFilter) {

+         if (null == _OutputProxy) {

+            throw new HttpException("Invalid filter usage");

+         }

+		   

+         _OutputFilter = OutputFilter;

+      }

+		

+      internal void FilterData(bool CloseStream) {

+         // Check if we have any filter at all

+         if (null == _OutputFilter) {

+            return;

+         }

+		   

+         FlushBuffers();

+		     

+         // Save our current data

+         byte [] arrData = _OutputStream.ToArray();

+		   

+         // Remove our internal data

+         Clear();   	     

+         

+         // If we have a filter then we have a proxy

+         _OutputProxy.Active = true;

+         

+         try {

+            // Call the filter (it does a callback into our HttpWriter again)

+            _OutputFilter.Write(arrData, 0, arrData.Length);

+		      

+            if (CloseStream) {

+               _OutputFilter.Close();

+            }

+         }

+         finally {

+            _OutputProxy.Active = false;

+         }

+      }

+

+      internal void Clear() {

+         _OutputHelper.Close();

+         _OutputStream.Close();

+								

+         // Quick way of doing cleanup

+         _OutputStream = new MemoryStream(32768);

+         _OutputHelper = new StreamWriter(_OutputStream, Encoding.Unicode);

+      }

+

+      internal byte [] ToArray() {

+         if (_OutputStream.Length == 0) {

+            return null;

+         }

+

+         // TODO: Optimize

+         byte [] arrStream = _OutputStream.ToArray();

+         byte [] arrData = new byte [arrStream.Length - 2];

+

+         Buffer.BlockCopy(arrStream, 2, arrData, 0, arrStream.Length - 2);

+			

+         byte [] arrContent = _Encoding.GetBytes(Encoding.Unicode.GetString(arrData));

+

+         return arrContent;

+      }

+

+      internal void SendContent(HttpWorkerRequest Handler) {

+         FlushBuffers();

+

+         if (_OutputStream.Length > 0) {

+            byte [] arrContent = ToArray();

+            Handler.SendResponseFromMemory(arrContent, arrContent.Length);

+         }

+      }

+

+      internal void Update() {

+         _Encoder = _Response.ContentEncoder;

+         _Encoding = _Response.ContentEncoding;

+      }

+

+      internal long BufferSize {

+         get {

+            FlushBuffers();

+

+            if (_OutputStream.Length == 0) {

+               return 0;

+            }

+

+            return ToArray().Length;

+         }

+      }

+

+      internal void FlushBuffers() {

+         _OutputHelper.Flush();

+         _OutputStream.Flush();

+      }

+

+      public override Encoding Encoding {

+         get {

+            return _Encoding;

+         }

+      }

+

+      public Stream OutputStream {

+         get {

+            return _ResponseStream;

+         }

+      }

+

+      public override void Close() {

+         FlushBuffers();

+

+         _Response.Flush();

+         _Response.Close();

+      }

+

+      public override void Flush() {

+         FlushBuffers();

+

+         _Response.Flush();

+      }

+

+      public override void Write(char ch) {

+         _OutputHelper.Write(ch);

+         if (!_Response.BufferOutput) {

+            FlushBuffers();

+            _Response.Flush();

+         }

+      }

+

+      public override void Write(object obj) {

+         _OutputHelper.Write(obj.ToString());

+         if (!_Response.BufferOutput) {

+            FlushBuffers();

+            _Response.Flush();

+         }

+      }

+

+      public override void Write(string s) {

+         _OutputHelper.Write(s);

+         if (!_Response.BufferOutput) {

+            FlushBuffers();

+            _Response.Flush();

+         }

+      }

+

+      public override void Write(char[] buffer, int index, int count) {

+         _OutputHelper.Write(buffer, index, count);

+         if (!_Response.BufferOutput) {

+            FlushBuffers();

+            _Response.Flush();

+         }

+      }

+

+      public void WriteBytes(byte[] buffer, int index, int count) {

+         _OutputStream.Write(buffer, index, count);

+         if (!_Response.BufferOutput) {

+            FlushBuffers();

+            _Response.Flush();

+         }

+      }

+		

+      override public void WriteLine() {

+         _OutputHelper.Write("\n\r");

+         if (!_Response.BufferOutput) {

+            FlushBuffers();

+            _Response.Flush();

+         }

+      }

+

+      public void WriteString(string s, int index, int count) {

+         _OutputHelper.Write(s.Substring(index, count));

+         if (!_Response.BufferOutput) {

+            FlushBuffers();

+            _Response.Flush();

+         }

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/IHttpAsyncHandler.cs b/mcs/class/System.Web/System.Web/IHttpAsyncHandler.cs
new file mode 100644
index 00000000000..06e62cba463
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/IHttpAsyncHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Web.IHttpAsyncHandler.cs

+//

+// Author:

+//   Bob Smith <bob@thestuff.net>

+//

+// (C) Bob Smith

+//

+namespace System.Web

+{

+   public interface IHttpAsyncHandler : IHttpHandler

+   {

+      IAsyncResult BeginProcessRequest(HttpContext context,

+                                       AsyncCallback cb,

+                                       object extraData);

+      void EndProcessRequest(IAsyncResult result);

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/IHttpHandler.cs b/mcs/class/System.Web/System.Web/IHttpHandler.cs
new file mode 100644
index 00000000000..8bad2c1b1bd
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/IHttpHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.IHttpHandler.cs

+//

+// Author:

+//   Bob Smith <bob@thestuff.net>

+//

+// (C) Bob Smith

+//

+namespace System.Web

+{

+   public interface IHttpHandler

+   {

+      bool IsReusable { get; }

+      void ProcessRequest(HttpContext context);

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/IHttpHandlerFactory.cs b/mcs/class/System.Web/System.Web/IHttpHandlerFactory.cs
new file mode 100644
index 00000000000..b8cc4a3d2c5
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/IHttpHandlerFactory.cs
@@ -0,0 +1,19 @@
+//

+// System.Web.IHttpHandlerFactory.cs

+//

+// Author:

+//   Bob Smith <bob@thestuff.net>

+//

+// (C) Bob Smith

+//

+namespace System.Web

+{

+   public interface IHttpHandlerFactory

+   {

+      IHttpHandler GetHandler(HttpContext context,

+                              string requestType,

+                              string url,

+                              string pathTranslated);

+      void ReleaseHandler(IHttpHandler handler);

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/IHttpModule.cs b/mcs/class/System.Web/System.Web/IHttpModule.cs
new file mode 100644
index 00000000000..a98d2f54d29
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/IHttpModule.cs
@@ -0,0 +1,14 @@
+//

+// System.Web.IHttpModule.cs

+//

+// Author:

+//   Bob Smith <bob@thestuff.net>

+//

+// (C) Bob Smith

+//

+namespace System.Web {

+   public interface IHttpModule {

+      void Dispose();

+      void Init(HttpApplication context);

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/NOTES b/mcs/class/System.Web/System.Web/NOTES
new file mode 100644
index 00000000000..55926bd4ef9
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/NOTES
@@ -0,0 +1,21 @@
+Found another namespace not listed. System.Web.Hosting.
+HttpRuntime.ProcessRequest and HttpWorkerRequest seems to be the key. 
+
+ASP maintains a pool of HttpApplication objects dirived from Global.asax.
+One is used per request, then reclamed after the request is totally
+complete.
+
+Read:
+http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpguidnf/html/cpconaspnetapplications.asp
+
+
+Request notes:
+It apears each http request has its own thread. Need to figure out how to deal with this with apache.
+
+Session notes:
+When a request is finished, the contents of Request.Session are serialized and dumped to the State Server.
+When a request is started, a new Request.Session is created, data is deserialized from the State Server, and the objects are placed back into Request.Session.
+The State Server is accessed via the SessionStateModule which is used for both session ID and state data management.
+HttpApplicationState instance is created the first time a url within the applications virtual directory is accessed. Its accessable through HttpContext.Application.
+HttpApplicationState needs to use lock/unlock explicitly.
+Not shared across machines or multiple processes.
diff --git a/mcs/class/System.Web/System.Web/ProcessInfo.cs b/mcs/class/System.Web/System.Web/ProcessInfo.cs
new file mode 100644
index 00000000000..d9e8ec60421
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/ProcessInfo.cs
@@ -0,0 +1,90 @@
+// 

+// System.Web.ProcessInfo

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+

+namespace System.Web {

+	public class ProcessInfo {

+

+		#region Fields

+

+		TimeSpan age;

+		int peakMemoryUsed;

+		int processID;

+		int requestCount;

+		ProcessShutdownReason shutdownReason;

+		DateTime startTime;

+		ProcessStatus status;

+

+		#endregion

+

+		#region Constructors

+

+		public ProcessInfo ()

+		{

+		}

+

+		public ProcessInfo (DateTime startTime, TimeSpan age, int processID, int requestCount, ProcessStatus status, ProcessShutdownReason shutdownReason, int peakMemoryUsed)

+		{

+			this.age = age;

+			this.peakMemoryUsed = peakMemoryUsed;

+			this.processID = processID;

+			this.requestCount = requestCount;

+			this.shutdownReason = shutdownReason;

+			this.startTime = startTime;

+			this.status = status;

+		}

+

+		#endregion

+

+		#region Properties

+

+		public TimeSpan Age {

+			get { return age; }

+		}

+

+		public int PeakMemoryUsed {

+			get { return peakMemoryUsed; }

+		}

+

+		public int ProcessID {

+			get { return processID; }

+		}

+

+		public int RequestCount {

+			get { return requestCount; }

+		}

+

+		public ProcessShutdownReason ShutdownReason {

+			get { return shutdownReason; }

+		}

+

+		public DateTime StartTime {

+			get { return startTime; }

+		}

+

+		public ProcessStatus Status {

+			get { return status; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public void SetAll (DateTime startTime, TimeSpan age, int processID, int requestCount, ProcessStatus status, ProcessShutdownReason shutdownReason, int peakMemoryUsed)

+		{

+			this.age = age;

+			this.peakMemoryUsed = peakMemoryUsed;

+			this.processID = processID;

+			this.requestCount = requestCount;

+			this.shutdownReason = shutdownReason;

+			this.startTime = startTime;

+			this.status = status;

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/ProcessModelInfo.cs b/mcs/class/System.Web/System.Web/ProcessModelInfo.cs
new file mode 100644
index 00000000000..7d6f1f6a10b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/ProcessModelInfo.cs
@@ -0,0 +1,52 @@
+// 

+// System.Web.ProcessModelInfo

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+

+using System;

+

+namespace System.Web {

+	public class ProcessModelInfo {

+

+		#region Fields

+

+		#endregion

+

+		#region Constructors

+

+		public ProcessModelInfo ()

+		{

+		}

+

+		#endregion

+

+		#region Properties

+

+		[MonoTODO ("Retrieve appropriate variables from worker")]

+		public static ProcessInfo GetCurrentProcessInfo ()

+		{

+			HttpContext httpContext;

+			DateTime startTime = DateTime.Now;

+			TimeSpan age = TimeSpan.Zero;

+			int processID = 0;

+			int requestCount = 0;

+			ProcessStatus status = ProcessStatus.Terminated;

+			ProcessShutdownReason shutdownReason = ProcessShutdownReason.None;

+			int peakMemoryUsed = 0;

+

+			httpContext = HttpContext.Current;

+			return new ProcessInfo (startTime, age, processID, requestCount, status, shutdownReason, peakMemoryUsed);

+		}

+

+		[MonoTODO ("Retrieve process information.")]

+		public static ProcessInfo[] GetHistory ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs b/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs
new file mode 100644
index 00000000000..8dcb0783a69
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/ProcessShutdownReason.cs
@@ -0,0 +1,23 @@
+//
+// System.Web.ProcessShutdownReason.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+namespace System.Web {
+	[Serializable]
+	public enum ProcessShutdownReason {
+		None,
+		Unexpected,
+		RequestsLimit,
+		RequestQueueLimit,
+		Timeout,
+		IdleTimeout,
+		MemoryLimitExceeded,
+		PingFailed,
+		DeadlockSuspected
+   }
+}
diff --git a/mcs/class/System.Web/System.Web/ProcessStatus.cs b/mcs/class/System.Web/System.Web/ProcessStatus.cs
new file mode 100644
index 00000000000..a7897b54d3b
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/ProcessStatus.cs
@@ -0,0 +1,17 @@
+//
+// System.Web.ProcessStatus.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+namespace System.Web {
+	public enum ProcessStatus {
+		Alive = 0x1,
+		ShuttingDown,
+		ShutDown,
+		Terminated
+	}
+}
diff --git a/mcs/class/System.Web/System.Web/TODO b/mcs/class/System.Web/System.Web/TODO
new file mode 100644
index 00000000000..4de26ec8397
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/TODO
@@ -0,0 +1,19 @@
+HttpClientCertificate
+HttpApplicationState
+HttpFileCollection
+HttpModuleCollection
+HttpException
+HttpCompileException
+HttpParseException
+HttpUnhandledException
+HttpCapabilitiesBase
+HttpBrowserCapabilities
+HttpApplication
+HttpCachePolicy
+HttpCacheVaryByHeaders
+HttpCacheVaryByParams
+HttpPostedFile
+HttpStaticObjectsCollection
+ProcessInfo
+ProcessModelInfo
+TraceContext
diff --git a/mcs/class/System.Web/System.Web/TODOAttribute.cs b/mcs/class/System.Web/System.Web/TODOAttribute.cs
new file mode 100644
index 00000000000..e8d67ea5791
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/TODOAttribute.cs
@@ -0,0 +1,33 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+using System;
+
+namespace System.Web {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All)]
+	internal class MonoTODOAttribute : Attribute {
+
+		string comment;
+
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+	}
+}
diff --git a/mcs/class/System.Web/System.Web/TraceContext.cs b/mcs/class/System.Web/System.Web/TraceContext.cs
new file mode 100644
index 00000000000..0708227547c
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/TraceContext.cs
@@ -0,0 +1,69 @@
+// 

+// System.Web.TraceContext

+//

+// Author:

+//   Patrik Torstensson (Patrik.Torstensson@labs2.com)

+//

+using System;

+

+namespace System.Web {

+   public sealed class TraceContext {

+      private HttpContext _Context;

+      private bool _Enabled;

+      private TraceMode _Mode;

+

+      public TraceContext(HttpContext Context) {

+         _Context = Context;

+         _Enabled = true;

+      }

+

+      public bool IsEnabled {

+         get {

+            return _Enabled;

+         }

+

+         set {

+            _Enabled = value;

+         }

+      }

+

+      public TraceMode TraceMode {

+         get {

+            return _Mode;

+         }

+

+         set {

+            _Mode = value;

+         }

+      }

+

+      public void Warn(string msg) {

+         Write(String.Empty, msg, null, true);

+      }

+

+      public void Warn(string category, string msg) {

+         Write(category, msg, null, true);

+      }

+

+      public void Warn(string category, string msg, Exception error) {

+         Write(category, msg, error, true);

+      }

+

+      public void Write(string msg) {

+         Write(String.Empty, msg, null, true);

+      }

+

+      public void Write(string category, string msg) {

+         Write(category, msg, null, true);

+      }

+

+      public void Write(string category, string msg, Exception error) {

+         Write(category, msg, error, true);

+      }

+

+      [MonoTODO("Save the data into a web dataset directly...")]

+      private void Write(string category, string msg, Exception error, bool Warning) {

+         throw new NotImplementedException();

+      }

+   }

+}

diff --git a/mcs/class/System.Web/System.Web/TraceMode.cs b/mcs/class/System.Web/System.Web/TraceMode.cs
new file mode 100644
index 00000000000..caab8229afd
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/TraceMode.cs
@@ -0,0 +1,16 @@
+//
+// System.Web.TraceMode.cs
+//
+// Author:
+//   Bob Smith <bob@thestuff.net>
+//
+// (C) Bob Smith
+//
+
+namespace System.Web {
+	public enum TraceMode {
+		SortByTime,
+		SortByCategory,
+		Default
+	}
+}
diff --git a/mcs/class/System.Web/System.Web/WebCategoryAttribute.cs b/mcs/class/System.Web/System.Web/WebCategoryAttribute.cs
new file mode 100644
index 00000000000..dd4b9ea5b46
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/WebCategoryAttribute.cs
@@ -0,0 +1,38 @@
+/**

+ * Namespace: System.Web

+ * Class:     WebCategoryAttribute

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  95%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.ComponentModel;

+

+namespace System.Web

+{

+	[AttributeUsage(AttributeTargets.All)]

+	internal sealed class WebCategoryAttribute : CategoryAttribute

+	{

+		public WebCategoryAttribute(string category) : base(category)

+		{

+		}

+

+		[MonoTODO]

+		protected override string GetLocalizedString(string value)

+		{

+			string retVal = base.GetLocalizedString(value);

+			if(retVal == null)

+			{

+				throw new NotImplementedException();

+				//retVal = "Category_" + something I don't know how to get!

+			}

+			return retVal;

+		}

+	}

+}

diff --git a/mcs/class/System.Web/System.Web/WebSysDescriptionAttribute.cs b/mcs/class/System.Web/System.Web/WebSysDescriptionAttribute.cs
new file mode 100644
index 00000000000..2425607069a
--- /dev/null
+++ b/mcs/class/System.Web/System.Web/WebSysDescriptionAttribute.cs
@@ -0,0 +1,44 @@
+/**
+ * Namespace: System.Web
+ * Class:     WebSysDescriptionAttribute
+ *
+ * Author:  Gaurav Vaish
+ * Maintainer: gvaish@iitk.ac.in
+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>
+ * Implementation: yes
+ * Status:  95%
+ *
+ * (C) Gaurav Vaish (2002)
+ */
+
+using System;
+using System.ComponentModel;
+using System.Web;
+using System.Web.UI;
+
+namespace System.Web
+{
+	[AttributeUsage(AttributeTargets.All)]
+	internal class WebSysDescriptionAttribute : DescriptionAttribute
+	{
+		private bool isReplaced;
+
+		public WebSysDescriptionAttribute(string description) : base(description)
+		{
+		}
+
+		[MonoTODO]
+		public override string Description
+		{
+			get
+			{
+				if(!isReplaced)
+				{
+					throw new NotImplementedException();
+					//DescriptionValue = Description + do something I donno;
+				}
+				return Description;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.Web/Test/TestMonoWeb/AsyncHandler.cs b/mcs/class/System.Web/Test/TestMonoWeb/AsyncHandler.cs
new file mode 100644
index 00000000000..cab2351e1ed
--- /dev/null
+++ b/mcs/class/System.Web/Test/TestMonoWeb/AsyncHandler.cs
@@ -0,0 +1,103 @@
+using System;

+using System.Threading;

+using System.Web;

+

+namespace TestMonoWeb {

+	/// <summary>

+	/// Summary description for AsyncHandler.

+	/// </summary>

+	public class AsyncHandler : IHttpAsyncHandler {

+		private HttpContext _context;

+		public bool IsReusable {

+			get {

+				//To enable pooling, return true here.

+				//This keeps the handler in memory.

+				return false;

+			}

+		}

+

+		public IAsyncResult BeginProcessRequest(HttpContext context,    AsyncCallback cb, Object extraData) {

+			AsynchOperation asynch = new AsynchOperation(cb, context, null);

+			asynch.StartAsyncWork();

+

+			context.Response.Write("AsyncHandler.BeginProcessRequest<br>\n");

+			context.Response.Flush();

+

+			//Signal the application that asynchronous 

+			//processing is being performed. 

+			SomeResult asynchForBegin = new SomeResult();

+

+			//Processing is not synchronous.

+			asynchForBegin.SetSynch(false);

+

+			//Processing is not complete.

+			asynchForBegin.SetCompleted(false);

+

+			_context = context;

+

+			return new SomeResult();

+		}

+

+		public void EndProcessRequest(IAsyncResult result) {

+			_context.Response.Write("AsyncHandler.EndProcessRequest<br>\n");

+		}

+

+		//This method is required but is not called.

+		public void ProcessRequest(HttpContext context) {

+		}

+

+	}//end class

+

+	public class SomeResult : IAsyncResult {

+

+		/*

+		An instance of this class is returned to the application.

+		This class lets the application know how the BeginEventHandler method has been handled. The application checks the CompletedSynchronously method.

+		*/

+

+		private bool _blnIsCompleted = false;

+		private Mutex myMutex = null;

+		private Object myAsynchStateObject = null;

+		private bool _blnCompletedSynchronously = false;

+

+		public void SetCompleted(bool blnTrueOrFalse) {

+			_blnIsCompleted = blnTrueOrFalse;

+		}

+

+		public void SetSynch(bool blnTrueOrFalse) {

+			_blnCompletedSynchronously = blnTrueOrFalse;

+		}

+

+		public bool IsCompleted {

+			/*

+			  This is not called by the application. However, set it to true. 

+			*/

+			get {

+				return _blnIsCompleted;

+			}

+		}

+

+		public WaitHandle AsyncWaitHandle {

+			//The application does not call this method.         

+			get {

+				return myMutex;

+			}

+		}

+

+		public Object AsyncState {

+			//The application does not call this method because

+			//null is passed in as the last parameter to BeginEventHandler.

+			get {

+				return myAsynchStateObject;

+			}

+		}

+

+		public bool CompletedSynchronously {

+			//The application wants to know if this is synchronous.

+			//Return true if the Begin method was called synchronously.

+			get { 

+				return _blnCompletedSynchronously;

+			}

+		}

+	}	

+}

diff --git a/mcs/class/System.Web/Test/TestMonoWeb/AsyncModule.cs b/mcs/class/System.Web/Test/TestMonoWeb/AsyncModule.cs
new file mode 100644
index 00000000000..839297b1c9e
--- /dev/null
+++ b/mcs/class/System.Web/Test/TestMonoWeb/AsyncModule.cs
@@ -0,0 +1,36 @@
+using System;

+using System.Web;

+

+namespace TestMonoWeb

+{

+	/// <summary>

+	/// Summary description for AsyncModule.

+	/// </summary>

+	public class AsyncModule : IHttpModule

+	{

+		HttpApplication _app;

+

+		public void Init(HttpApplication app) {

+			app.AddOnPreRequestHandlerExecuteAsync(

+				new BeginEventHandler(this.BeginPreHandlerExecute), 

+				new EndEventHandler(this.EndPreHandlerExecute));

+

+			_app = app;

+		}

+

+		IAsyncResult BeginPreHandlerExecute(Object source, EventArgs e, AsyncCallback cb, Object extraData) {

+			((HttpApplication) source).Context.Response.Write("AsyncModule.BeginPreHandlerExecute()<br>\n");

+

+			AsynchOperation asynch = new AsynchOperation(cb, _app.Context, extraData);

+			asynch.StartAsyncWork();

+			return asynch;

+		}

+		

+		void EndPreHandlerExecute(IAsyncResult ar) {

+			((AsynchOperation) ar).Context.Response.Write("AsyncModule.EndPreHandlerExecute()<br>\n");

+		}		

+

+		public void Dispose() {

+		}

+	}

+}

diff --git a/mcs/class/System.Web/Test/TestMonoWeb/AsyncOperation.cs b/mcs/class/System.Web/Test/TestMonoWeb/AsyncOperation.cs
new file mode 100644
index 00000000000..46b0ff1f722
--- /dev/null
+++ b/mcs/class/System.Web/Test/TestMonoWeb/AsyncOperation.cs
@@ -0,0 +1,42 @@
+using System;

+using System.Threading;

+using System.Web;

+

+namespace TestMonoWeb

+{

+	class AsynchOperation : IAsyncResult {

+		private bool _completed;

+		private Object _state;

+		private AsyncCallback _callback;

+		private HttpContext _context;

+

+		bool IAsyncResult.IsCompleted { get { return _completed; } }

+		WaitHandle IAsyncResult.AsyncWaitHandle { get { return null; } }

+		Object IAsyncResult.AsyncState { get { return _state; } }

+		bool IAsyncResult.CompletedSynchronously { get { return false; } }

+

+		public HttpContext Context {

+			get {

+				return _context;

+			}

+		}

+

+		public AsynchOperation(AsyncCallback callback, HttpContext context, Object state) {

+			_callback = callback;

+			_context = context;

+			_state = state;

+			_completed = false;

+		}

+

+		public void StartAsyncWork() {

+			ThreadPool.QueueUserWorkItem(new WaitCallback(DoSomething), null /*workItemState*/);

+		}

+

+		private void DoSomething(Object workItemState) {

+			// Just for testing..

+			Thread.Sleep(100);

+			_completed = true;

+			_callback(this);

+		}

+	}

+}

diff --git a/mcs/class/System.Web/Test/TestMonoWeb/README b/mcs/class/System.Web/Test/TestMonoWeb/README
new file mode 100644
index 00000000000..1d4950d8036
--- /dev/null
+++ b/mcs/class/System.Web/Test/TestMonoWeb/README
@@ -0,0 +1,5 @@
+This small test program tests HttpModule and HttpHandler. The test program can both handle async and sync tests.

+

+This program uses the temporary configuration for modules and handlers.

+

+- Patrik Torstensson
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/TestMonoWeb/SyncHandler.cs b/mcs/class/System.Web/Test/TestMonoWeb/SyncHandler.cs
new file mode 100644
index 00000000000..7dd01bb65ab
--- /dev/null
+++ b/mcs/class/System.Web/Test/TestMonoWeb/SyncHandler.cs
@@ -0,0 +1,16 @@
+using System;

+using System.Web;

+

+namespace TestMonoWeb

+{

+	public class SyncHandler : IHttpHandler {

+		

+		public void ProcessRequest(HttpContext context) {

+			context.Response.Write("SyncHandler.ProcessRequest<br>\n");

+		}

+		

+		public bool IsReusable {

+			get { return false; }  

+		}

+	}

+}

diff --git a/mcs/class/System.Web/Test/TestMonoWeb/SyncModule.cs b/mcs/class/System.Web/Test/TestMonoWeb/SyncModule.cs
new file mode 100644
index 00000000000..7fddb06a8bf
--- /dev/null
+++ b/mcs/class/System.Web/Test/TestMonoWeb/SyncModule.cs
@@ -0,0 +1,37 @@
+using System;

+using System.Collections;

+using System.Web; 

+

+namespace TestMonoWeb

+{

+	public class SyncModule : IHttpModule {

+		public String ModuleName { 

+			get { return "HelloWorldModule"; } 

+		}    

+		//In the Init function, register for HttpApplication 

+		//events by adding your handlers.

+		public void Init(HttpApplication application) { 

+			application.BeginRequest += (new EventHandler(this.Application_BeginRequest));

+			application.EndRequest += (new EventHandler(this.Application_EndRequest));

+		}

+    

+		//Your BeginRequest event handler.

+		private void Application_BeginRequest(Object source, EventArgs e) {

+			HttpApplication application = (HttpApplication)source;

+			HttpContext context = application.Context;

+        

+			context.Response.Write("SyncModule.Application_BeginRequest()<br>\n");

+		}

+    

+		//Your EndRequest event handler.

+		private void Application_EndRequest(Object source, EventArgs e) {

+			HttpApplication application = (HttpApplication)source;

+			HttpContext context = application.Context;

+        

+			context.Response.Write("SyncModule.Application_EndRequest()<br>\n");

+		}  

+      

+		public void Dispose() {

+		}

+	}

+}

diff --git a/mcs/class/System.Web/Test/TestMonoWeb/Test1.cs b/mcs/class/System.Web/Test/TestMonoWeb/Test1.cs
new file mode 100644
index 00000000000..b453cd8b170
--- /dev/null
+++ b/mcs/class/System.Web/Test/TestMonoWeb/Test1.cs
@@ -0,0 +1,46 @@
+using System;

+using System.Web;

+using System.Web.Hosting;

+using System.Web.Configuration;

+

+namespace TestMonoWeb

+{

+	public class MyHost : MarshalByRefObject {

+		public MyHost() {

+		}

+	}

+	/// <summary>

+	/// Summary description for Test1.

+	/// </summary>

+	public class Test1

+	{

+		static void Main(string[] args) {

+			// Create the application host

+			object host = ApplicationHost.CreateApplicationHost(typeof(MyHost), "/", "c:\\");

+			

+			int request_count = 10;

+			SimpleWorkerRequest [] requests = new SimpleWorkerRequest[request_count];

+

+			int pos;

+			for (pos = 0; pos != request_count; pos++) {

+				requests[pos] = new SimpleWorkerRequest("test.aspx", "", Console.Out);

+			}

+

+			ModulesConfiguration.Add("syncmodule", typeof(SyncModule).AssemblyQualifiedName);

+			ModulesConfiguration.Add("asyncmodule", typeof(AsyncModule).AssemblyQualifiedName);

+			

+			HandlerFactoryConfiguration.Add("get", "/", typeof(AsyncHandler).AssemblyQualifiedName);

+			//HandlerFactoryConfiguration.Add("get", "/", typeof(SyncHandler).AssemblyQualifiedName);

+

+			for (pos = 0; pos != request_count; pos++) 

+				HttpRuntime.ProcessRequest(requests[pos]);

+

+			HttpRuntime.Close();

+/*

+			Console.Write("Press Enter to quit.");

+			Console.WriteLine();

+			Console.ReadLine();

+*/

+		}	

+	}

+}

diff --git a/mcs/class/System.Web/Test/TestMonoWeb/TestMonoWeb.build b/mcs/class/System.Web/Test/TestMonoWeb/TestMonoWeb.build
new file mode 100644
index 00000000000..98ecbcc49c3
--- /dev/null
+++ b/mcs/class/System.Web/Test/TestMonoWeb/TestMonoWeb.build
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+<project name="System" default="build">

+	<property name="debug" value="false"/>

+

+	<target name="build">

+		<csc target="exe" output="TestMonoWeb.exe" debug="${debug}">

+			<arg value="/nowarn:1595"/>

+			<arg value="/nowarn:0169"/>

+			<arg value="/nowarn:0649"/> <!-- always default value -->

+			<arg value="/nowarn:0067"/> <!-- event never used -->

+			<arg value="/nowarn:0679"/> <!-- internal virual -->

+			<arg value="/nowarn:0168"/> <!-- never used variable -->

+			<arg value="/nowarn:0162"/> <!-- unreachable code -->

+			<arg value="/unsafe"/>

+			<arg value="/noconfig"/>

+			<arg value="/debug"/>

+			<arg value="/r:System.dll"/>

+			<arg value="/r:System.Web.dll"/>

+			<arg value="/r:System.Drawing.dll"/>

+			<arg value="/r:System.Xml.dll"/>

+			<sources>

+				<includes name="**/*.cs"/> 

+			</sources>

+		</csc>

+	</target>

+</project>

diff --git a/mcs/class/System.Web/Test/test.aspx b/mcs/class/System.Web/Test/test.aspx
new file mode 100644
index 00000000000..363fab9697f
--- /dev/null
+++ b/mcs/class/System.Web/Test/test.aspx
@@ -0,0 +1,29 @@
+<%@ page language="c#"%>
+<html>
+<head>
+<title>Test</title>
+<%Response.Write("Test");%>
+
+<script runat="server" language="c#">
+  void SubmitBtn_Click(Object sender, EventArgs e) {
+    Response.Write("Hi");
+  }
+</script>
+
+<form action="test.aspx" method="post" runat="server">
+<asp:button text="Click Me" OnClick="SubmitBtn_Click" runat="server"/>
+</form>
+
+<!-- output
+
+<html>
+<head>
+<title>Test</title>
+Test<form name="ctrl0" method="post" action="test.aspx" id="ctrl0">
+<input type="hidden" name="__VIEWSTATE" value="dDwtMTc0MDc5ODg1Mzs7Pg==" />
+
+<input type="submit" name="ctrl1" value="Click Me" />
+</form>
+
+
+-->
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/test2.aspx b/mcs/class/System.Web/Test/test2.aspx
new file mode 100644
index 00000000000..168aa05cb58
--- /dev/null
+++ b/mcs/class/System.Web/Test/test2.aspx
@@ -0,0 +1,101 @@
+<%@ Page Language="C#" %>
+<html>
+<head>
+<script language="C#" runat="server">
+void Page_Load(Object Sender, EventArgs e) {
+          if (!IsPostBack) {
+             ArrayList values = new ArrayList();
+
+             values.Add(new PositionData("Microsoft", "Msft"));
+             values.Add(new PositionData("Intel", "Intc"));
+             values.Add(new PositionData("Dell", "Dell"));
+
+             Repeater1.DataSource = values;
+             Repeater1.DataBind();
+
+             Repeater2.DataSource = values;
+             Repeater2.DataBind();
+             Response.Write(Repeater1.Controls[0].ClientID);
+             Response.Write("<br>");
+             Response.Write(Repeater1.Controls[0].UniqueID);
+             Response.Write("<br>");
+          }
+       }
+
+       public class PositionData {
+
+          private string name;
+          private string ticker;
+
+          public PositionData(string name, string ticker) {
+             this.name = name;
+             this.ticker = ticker;
+          }
+
+          public string Name {
+             get {
+                return name;
+             }
+          }
+
+          public string Ticker {
+             get {
+                return ticker;
+             }
+          }
+       }
+
+    </script>
+
+</head>
+<body>
+
+<h3><font face="Verdana">Repeater Example</font></h3>
+
+<form runat=server>
+
+<b>Repeater1:</b>
+
+<p>
+
+<asp:Repeater id=Repeater1 runat="server">
+<HeaderTemplate>
+<table border=1>
+<tr>
+<td><b>Company</b></td>
+<td><b>Symbol</b></td>
+</tr>
+</HeaderTemplate>
+
+<ItemTemplate>
+<tr>
+<td> <%# DataBinder.Eval(Container.DataItem, "Name") %> <asp:label id="test"></td>
+<td> <%# DataBinder.Eval(Container.DataItem, "Ticker") %> </td>
+</tr>
+</ItemTemplate>
+
+<FooterTemplate>
+</table>
+</FooterTemplate>
+
+</asp:Repeater>
+<p>
+
+<b>Repeater2:</b>
+<p>
+<asp:Repeater id=Repeater2 runat="server">
+
+<HeaderTemplate>
+Company data:
+          </HeaderTemplate>
+
+<ItemTemplate>
+<%# DataBinder.Eval(Container.DataItem, "Name") %> (<%# DataBinder.Eval(Container.DataItem, "Ticker") %>)
+          </ItemTemplate>
+
+<SeparatorTemplate>, </SeparatorTemplate>
+</asp:Repeater>
+</form>
+</body>
+</html>
+
diff --git a/mcs/class/System.Web/Test/test3.aspx b/mcs/class/System.Web/Test/test3.aspx
new file mode 100644
index 00000000000..d8776e45f48
--- /dev/null
+++ b/mcs/class/System.Web/Test/test3.aspx
@@ -0,0 +1,23 @@
+<%@ Page Debug="true" %>
+<html>
+<script runat=server language="vb">
+
+Sub AnchorBtn_Click(Source As Object, E as EventArgs)
+          Message.InnerText = Message.InnerHtml
+       End Sub
+
+    </script>
+
+<body>
+<form method=post runat=server>
+
+<a OnServerClick="AnchorBtn_Click" runat=server> Click here at your peril.</a>
+
+<h1>
+<span id="Message" runat=server><span id="Message2" runat=server>narf</span></span>
+</h1>
+
+</form>
+</body>
+</html>
+
diff --git a/mcs/class/System.Web/Test/test4.aspx b/mcs/class/System.Web/Test/test4.aspx
new file mode 100644
index 00000000000..f9c020c1d85
--- /dev/null
+++ b/mcs/class/System.Web/Test/test4.aspx
@@ -0,0 +1,119 @@
+<%@ Page Language="C#" Debug="true" %>
+<html>
+<head>
+<script language="C#" runat="server">
+//    protected override void OnInit(EventArgs e){
+//      throw new Exception();
+//    }
+    protected override void LoadViewState(object savedState){
+      throw new Exception();
+    }
+    protected override object SaveViewState(){
+      throw new Exception();
+    }
+    void Page_Kill(Object Sender, EventArgs e) {
+      throw new Exception();
+    }
+    protected override void OnInit(EventArgs e){
+      EnableViewState = true;
+      TrackViewState();
+      ViewState["test"] = "DIE!";
+    }
+    void Page_Load(Object Sender, EventArgs e) {
+//          ((Control)Sender).PreRender += new EventHandler(Page_Kill);
+          if (!IsPostBack) {
+             ArrayList values = new ArrayList();
+
+             values.Add(new PositionData("Microsoft", "Msft"));
+             values.Add(new PositionData("Intel", "Intc"));
+             values.Add(new PositionData("Dell", "Dell"));
+
+             Repeater1.DataSource = values;
+             Repeater1.DataBind();
+
+             Repeater2.DataSource = values;
+             Repeater2.DataBind();
+             Response.Write(Repeater1.Controls[0].ClientID);
+             Response.Write("<br>");
+             Response.Write(Repeater1.Controls[0].UniqueID);
+             Response.Write("<br>");
+          }
+       }
+
+       public class PositionData {
+
+          private string name;
+          private string ticker;
+
+          public PositionData(string name, string ticker) {
+             this.name = name;
+             this.ticker = ticker;
+          }
+
+          public string Name {
+             get {
+                return name;
+             }
+          }
+
+          public string Ticker {
+             get {
+                return ticker;
+             }
+          }
+       }
+
+    </script>
+
+</head>
+<body>
+
+<h3><font face="Verdana">Repeater Example</font></h3>
+
+<form runat=server>
+
+<b>Repeater1:</b>
+
+<p>
+
+<asp:Repeater id=Repeater1 runat="server">
+<HeaderTemplate>
+<table border=1>
+<tr>
+<td><b>Company</b></td>
+<td><b>Symbol</b></td>
+</tr>
+</HeaderTemplate>
+
+<ItemTemplate>
+<tr>
+<td> <%# DataBinder.Eval(Container.DataItem, "Name") %> <asp:label id="test"></td>
+<td> <%# DataBinder.Eval(Container.DataItem, "Ticker") %> </td>
+</tr>
+</ItemTemplate>
+
+<FooterTemplate>
+</table>
+</FooterTemplate>
+
+</asp:Repeater>
+<p>
+
+<b>Repeater2:</b>
+<p>
+<asp:Repeater id=Repeater2 runat="server">
+
+<HeaderTemplate>
+Company data:
+          </HeaderTemplate>
+
+<ItemTemplate>
+<%# DataBinder.Eval(Container.DataItem, "Name") %> (<%# DataBinder.Eval(Container.DataItem, "Ticker") %>)
+          </ItemTemplate>
+
+<SeparatorTemplate>, </SeparatorTemplate>
+</asp:Repeater>
+</form>
+</body>
+</html>
+
diff --git a/mcs/class/System.Web/Test/test5.aspx b/mcs/class/System.Web/Test/test5.aspx
new file mode 100644
index 00000000000..2aaf4bf06c2
--- /dev/null
+++ b/mcs/class/System.Web/Test/test5.aspx
@@ -0,0 +1,121 @@
+<%@ Page Language="C#" Debug="true" %>
+<html>
+<head>
+<%
+Response.Write(HttpWorkerRequest.HeaderAccept);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderAcceptCharset);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderAcceptEncoding);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderAcceptLanguage);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderAcceptRanges);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderAge);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderAllow);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderAuthorization);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderCacheControl);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderConnection);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderContentEncoding);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderContentLanguage);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderContentLength);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderContentLocation);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderContentMd5);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderContentRange);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderContentType);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderCookie);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderDate);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderEtag);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderExpect);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderExpires);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderFrom);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderHost);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderIfMatch);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderIfModifiedSince);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderIfNoneMatch);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderIfRange);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderIfUnmodifiedSince);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderKeepAlive);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderLastModified);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderLocation);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderMaxForwards);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderPragma);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderProxyAuthenticate);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderProxyAuthorization);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderRange);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderReferer);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderRetryAfter);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderServer);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderSetCookie);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderTe);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderTrailer);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderTransferEncoding);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderUpgrade);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderUserAgent);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderVary);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderVia);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderWarning);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.HeaderWwwAuthenticate);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.ReasonCachePolicy);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.ReasonCacheSecurity);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.ReasonClientDisconnect);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.ReasonDefault);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.ReasonFileHandleCacheMiss);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.ReasonResponseCacheMiss);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.RequestHeaderMaximum);
+Response.Write("<br>");
+Response.Write(HttpWorkerRequest.ResponseHeaderMaximum);
+Response.Write("<br>");
+%>
\ No newline at end of file
diff --git a/mcs/class/System.Web/Test/test6.aspx b/mcs/class/System.Web/Test/test6.aspx
new file mode 100644
index 00000000000..594c4bc7bbb
--- /dev/null
+++ b/mcs/class/System.Web/Test/test6.aspx
@@ -0,0 +1,83 @@
+<html>

+<head>

+<!--

+ Author: Gaurav Vaish

+ Original Source: http://msdn.microsoft.com/library/en-us/cpref/html/frlrfSystemWebUIWebControlsCalendarClassSelectedDateTopic.asp

+ Copyright: (C) Gaurav Vaish, 2001

+-->

+   <script language="C#" runat="server">

+

+      void Selection_Change(Object sender, EventArgs e) 

+      {

+         Label1.Text = "The selected date is " + Calendar1.SelectedDate.ToShortDateString();

+      }

+

+      void Selection_Change_Month(Object sender, EventArgs e)

+      {

+         Label2.Text = "The selected date is " + Calendar2.SelectedDate.ToShortDateString();

+      }

+

+      void Selection_Change_DWM(Object sender, EventArgs e)

+      {

+         Label3.Text = "The selected date is " + Calendar3.SelectedDate.ToShortDateString();

+      }

+

+   </script>

+

+</head>

+<body>

+

+   <form runat="server">

+

+      <h3><font face="Verdana">Calendar Example</font></h3>

+

+      Select a date on the Calendar control.<br><br>

+

+      <asp:Calendar ID="Calendar1" runat="server"  

+           SelectionMode="Day" 

+           ShowGridLines="True"

+           OnSelectionChanged="Selection_Change">

+ 

+         <SelectedDayStyle BackColor="Yellow"

+                           ForeColor="Red">

+         </SelectedDayStyle>

+      

+      </asp:Calendar>     

+

+      <asp:Label id="Label1" runat=server />

+

+      <hr><br>

+

+     <asp:Calendar ID="Calendar2" runat="server"  

+           SelectionMode="DayWeek"

+           ShowGridLines="True"

+           OnSelectionChanged="Selection_Change_Month">

+ 

+         <SelectedDayStyle BackColor="Yellow"

+                           ForeColor="Red">

+         </SelectedDayStyle>

+      

+      </asp:Calendar>     

+

+      <asp:Label id="Label2" runat=server />

+

+      <hr><br>

+

+     <asp:Calendar ID="Calendar3" runat="server"  

+           SelectionMode="DayWeekMonth"

+           ShowGridLines="True"

+           OnSelectionChanged="Selection_Change_DWM">

+ 

+         <SelectedDayStyle BackColor="Yellow"

+                           ForeColor="Red">

+         </SelectedDayStyle>

+      

+      </asp:Calendar>     

+

+      <asp:Label id="Label3" runat=server />

+

+      <hr><br>

+

+   </form>

+</body>

+</html>
\ No newline at end of file
diff --git a/mcs/class/System.Web/list b/mcs/class/System.Web/list
new file mode 100755
index 00000000000..591e7f679c7
--- /dev/null
+++ b/mcs/class/System.Web/list
@@ -0,0 +1,321 @@
+System.Web/BeginEventHandler.cs
+System.Web/EndEventHandler.cs
+System.Web/HttpCacheRevalidation.cs
+System.Web/HttpCacheability.cs
+System.Web/HttpCookie.cs
+System.Web/HttpCookieCollection.cs
+System.Web/HttpRuntime.cs
+System.Web/HttpServerUtility.cs
+System.Web/HttpValidationStatus.cs
+System.Web/HttpWriter.cs
+System.Web/TraceContext.cs
+System.Web/HttpWorkerRequest.cs
+System.Web/IHttpAsyncHandler.cs
+System.Web/IHttpHandler.cs
+System.Web/IHttpHandlerFactory.cs
+System.Web/IHttpModule.cs
+System.Web/ProcessShutdownReason.cs
+System.Web/ProcessStatus.cs
+System.Web/TODOAttribute.cs
+System.Web/TraceMode.cs
+System.Web/WebCategoryAttribute.cs
+System.Web/WebSysDescriptionAttribute.cs
+System.Web/HttpApplication.cs
+System.Web/HttpApplicationState.cs
+System.Web/HttpApplicationFactory.cs
+System.Web/HttpAsyncResult.cs
+System.Web/HttpBrowserCapabilities.cs
+System.Web/HttpCachePolicy.cs
+System.Web/HttpClientCertificate.cs
+System.Web/HttpCompileException.cs
+System.Web/HttpContext.cs
+System.Web/HttpException.cs
+System.Web/HttpFileCollection.cs
+System.Web/HttpHelper.cs
+System.Web/HttpParseException.cs
+System.Web/HttpRequest.cs
+System.Web/HttpRequestStream.cs
+System.Web/HttpResponse.cs
+System.Web/HttpResponseHeader.cs
+System.Web/HttpResponseStream.cs
+System.Web/HttpResponseStreamProxy.cs
+System.Web/HttpUtility.cs
+System.Web/HttpValueCollection.cs
+System.Web/HttpCacheValidateHandler.cs
+System.Web/HttpCacheVaryByHeaders.cs
+System.Web/HttpCacheVaryByParams.cs
+System.Web/HttpModuleCollection.cs
+System.Web/HttpPostedFile.cs
+System.Web/HttpStaticObjectsCollection.cs
+System.Web/HttpUnhandledException.cs
+System.Web/ProcessInfo.cs
+System.Web.Caching/Cache.cs
+System.Web.Caching/CacheDefinitions.cs
+System.Web.Caching/CacheDependency.cs
+System.Web.Caching/CacheEntry.cs
+System.Web.Caching/CacheExpires.cs
+System.Web.Caching/ExpiresBuckets.cs
+System.Web.Configuration/AuthenticationMode.cs
+System.Web.Configuration/ClientTargetSectionHandler.cs
+System.Web.Configuration/FormsAuthPasswordFormat.cs
+System.Web.Configuration/FormsProtectionEnum.cs
+System.Web.Configuration/GlobalizationConfiguration.cs
+System.Web.Configuration/HttpCapabilitiesBase.cs
+System.Web.Configuration/HandlerFactoryConfiguration.cs
+System.Web.Configuration/HandlerFactoryProxy.cs
+System.Web.Configuration/HandlerItem.cs
+System.Web.Configuration/ModulesConfiguration.cs
+System.Web.Configuration/ModuleItem.cs
+System.Web.Hosting/AppDomainFactory.cs
+System.Web.Hosting/ApplicationHost.cs
+System.Web.Hosting/IAppDomainFactory.cs
+System.Web.Hosting/IISAPIRuntime.cs
+System.Web.Hosting/ISAPIRuntime.cs
+System.Web.Hosting/SimpleWorkerRequest.cs
+System.Web.Mail/MailAttachment.cs
+System.Web.Mail/MailEncoding.cs
+System.Web.Mail/MailFormat.cs
+System.Web.Mail/MailMessage.cs
+System.Web.Mail/MailPriority.cs
+System.Web.Mail/SmtpMail.cs
+System.Web.UI/BuildMethod.cs
+System.Web.UI/BuildTemplateMethod.cs
+System.Web.UI/Control.cs
+System.Web.UI/DataBindingHandlerAttribute.cs
+System.Web.UI/DesignTimeParseData.cs
+System.Web.UI/HtmlTextWriter.cs
+System.Web.UI/HtmlTextWriterAttribute.cs
+System.Web.UI/HtmlTextWriterStyle.cs
+System.Web.UI/HtmlTextWriterTag.cs
+System.Web.UI/IAttributeAccessor.cs
+System.Web.UI/IDataBindingsAccessor.cs
+System.Web.UI/INamingContainer.cs
+System.Web.UI/IParserAccessor.cs
+System.Web.UI/IPostBackDataHandler.cs
+System.Web.UI/IPostBackEventHandler.cs
+System.Web.UI/IStateManager.cs
+System.Web.UI/ITagNameToTypeMapper.cs
+System.Web.UI/ITemplate.cs
+System.Web.UI/IValidator.cs
+System.Web.UI/ImageClickEventHandler.cs
+System.Web.UI/LiteralControl.cs
+System.Web.UI/LosFormatter.cs
+System.Web.UI/OutputCacheLocation.cs
+System.Web.UI/Pair.cs
+System.Web.UI/PersistenceMode.cs
+System.Web.UI/PropertyConverter.cs
+System.Web.UI/StateBag.cs
+System.Web.UI/StateItem.cs
+System.Web.UI/ToolboxDataAttribute.cs
+System.Web.UI/Utils.cs
+System.Web.UI/ConstructorNeedsTagAttribute.cs
+System.Web.UI/ControlBuilderAttribute.cs
+System.Web.UI/ImageClickEventArgs.cs
+System.Web.UI/Page.cs
+System.Web.UI/PageParser.cs
+System.Web.UI/ParseChildrenAttribute.cs
+System.Web.UI/PartialCachingAttribute.cs
+System.Web.UI/PersistChildrenAttribute.cs
+System.Web.UI/PersistenceModeAttribute.cs
+System.Web.UI/TagPrefixAttribute.cs
+System.Web.UI/TemplateContainerAttribute.cs
+System.Web.UI/TemplateControlParser.cs
+System.Web.UI/ValidatorCollection.cs
+System.Web.UI/ValidationPropertyAttribute.cs
+System.Web.UI/AttributeCollection.cs
+System.Web.UI/BaseParser.cs
+System.Web.UI/ControlBuilder.cs
+System.Web.UI/ControlCollection.cs
+System.Web.UI/CssStyleCollection.cs
+System.Web.UI/DataBinder.cs
+System.Web.UI/DataBinding.cs
+System.Web.UI/DataBindingCollection.cs
+System.Web.UI/DataBoundLiteralControl.cs
+System.Web.UI/EmptyControlCollection.cs
+System.Web.UI/RenderMethod.cs
+System.Web.UI/TemplateControl.cs
+System.Web.UI/TemplateParser.cs
+System.Web.UI/Triplet.cs
+System.Web.UI/UserControl.cs
+System.Web.UI/CompiledTemplateBuilder.cs
+System.Web.UI.HtmlControls/HtmlAnchor.cs
+System.Web.UI.HtmlControls/HtmlButton.cs
+System.Web.UI.HtmlControls/HtmlContainerControl.cs
+System.Web.UI.HtmlControls/HtmlControl.cs
+System.Web.UI.HtmlControls/HtmlForm.cs
+System.Web.UI.HtmlControls/HtmlGenericControl.cs
+System.Web.UI.HtmlControls/HtmlImage.cs
+System.Web.UI.HtmlControls/HtmlInputButton.cs
+System.Web.UI.HtmlControls/HtmlInputCheckBox.cs
+System.Web.UI.HtmlControls/HtmlInputControl.cs
+System.Web.UI.HtmlControls/HtmlInputFile.cs
+System.Web.UI.HtmlControls/HtmlInputHidden.cs
+System.Web.UI.HtmlControls/HtmlInputImage.cs
+System.Web.UI.HtmlControls/HtmlInputRadioButton.cs
+System.Web.UI.HtmlControls/HtmlInputText.cs
+System.Web.UI.HtmlControls/HtmlSelect.cs
+System.Web.UI.HtmlControls/HtmlTable.cs
+System.Web.UI.HtmlControls/HtmlTableCell.cs
+System.Web.UI.HtmlControls/HtmlTableCellCollection.cs
+System.Web.UI.HtmlControls/HtmlTableRow.cs
+System.Web.UI.HtmlControls/HtmlTableRowCollection.cs
+System.Web.UI.HtmlControls/HtmlTextArea.cs
+System.Web.UI.WebControls/AdCreatedEventArgs.cs
+System.Web.UI.WebControls/AdCreatedEventHandler.cs
+System.Web.UI.WebControls/AdRotator.cs
+System.Web.UI.WebControls/BaseCompareValidator.cs
+System.Web.UI.WebControls/BaseDataList.cs
+System.Web.UI.WebControls/BaseValidator.cs
+System.Web.UI.WebControls/BorderStyle.cs
+System.Web.UI.WebControls/BoundColumn.cs
+System.Web.UI.WebControls/Button.cs
+System.Web.UI.WebControls/ButtonColumn.cs
+System.Web.UI.WebControls/ButtonColumnType.cs
+System.Web.UI.WebControls/Calendar.cs
+System.Web.UI.WebControls/CalendarDay.cs
+System.Web.UI.WebControls/CalendarSelectionMode.cs
+System.Web.UI.WebControls/CheckBox.cs
+System.Web.UI.WebControls/CheckBoxList.cs
+System.Web.UI.WebControls/CommandEventArgs.cs
+System.Web.UI.WebControls/CommandEventHandler.cs
+System.Web.UI.WebControls/CompareValidator.cs
+System.Web.UI.WebControls/CustomValidator.cs
+System.Web.UI.WebControls/DataGrid.cs
+System.Web.UI.WebControls/DataGridColumn.cs
+System.Web.UI.WebControls/DataGridColumnCollection.cs
+System.Web.UI.WebControls/DataGridCommandEventArgs.cs
+System.Web.UI.WebControls/DataGridCommandEventHandler.cs
+System.Web.UI.WebControls/DataGridItem.cs
+System.Web.UI.WebControls/DataGridItemCollection.cs
+System.Web.UI.WebControls/DataGridItemEventArgs.cs
+System.Web.UI.WebControls/DataGridItemEventHandler.cs
+System.Web.UI.WebControls/DataGridPageChangedEventArgs.cs
+System.Web.UI.WebControls/DataGridPageChangedEventHandler.cs
+System.Web.UI.WebControls/DataGridPagerStyle.cs
+System.Web.UI.WebControls/DataGridSortCommandEventArgs.cs
+System.Web.UI.WebControls/DataGridSortCommandEventHandler.cs
+System.Web.UI.WebControls/DataKeyCollection.cs
+System.Web.UI.WebControls/DataList.cs
+System.Web.UI.WebControls/DataListCommandEventArgs.cs
+System.Web.UI.WebControls/DataListCommandEventHandler.cs
+System.Web.UI.WebControls/DataListItem.cs
+System.Web.UI.WebControls/DataListItemCollection.cs
+System.Web.UI.WebControls/DataListItemEventArgs.cs
+System.Web.UI.WebControls/DataListItemEventHandler.cs
+System.Web.UI.WebControls/DayNameFormat.cs
+System.Web.UI.WebControls/DayRenderEventArgs.cs
+System.Web.UI.WebControls/DayRenderEventHandler.cs
+System.Web.UI.WebControls/DropDownList.cs
+System.Web.UI.WebControls/EditCommandColumn.cs
+System.Web.UI.WebControls/FirstDayOfWeek.cs
+System.Web.UI.WebControls/FontInfo.cs
+System.Web.UI.WebControls/FontNamesConverter.cs
+System.Web.UI.WebControls/FontSize.cs
+System.Web.UI.WebControls/FontUnit.cs
+System.Web.UI.WebControls/FontUnitConverter.cs
+System.Web.UI.WebControls/GridLines.cs
+System.Web.UI.WebControls/HorizontalAlign.cs
+System.Web.UI.WebControls/HyperLink.cs
+System.Web.UI.WebControls/HyperLinkColumn.cs
+System.Web.UI.WebControls/HyperLinkControlBuilder.cs
+System.Web.UI.WebControls/IRepeatInfoUser.cs
+System.Web.UI.WebControls/Image.cs
+System.Web.UI.WebControls/ImageAlign.cs
+System.Web.UI.WebControls/ImageButton.cs
+System.Web.UI.WebControls/Label.cs
+System.Web.UI.WebControls/LabelControlBuilder.cs
+System.Web.UI.WebControls/LinkButton.cs
+System.Web.UI.WebControls/LinkButtonControlBuilder.cs
+System.Web.UI.WebControls/LinkButtonInternal.cs
+System.Web.UI.WebControls/ListBox.cs
+System.Web.UI.WebControls/ListControl.cs
+System.Web.UI.WebControls/ListItem.cs
+System.Web.UI.WebControls/ListItemCollection.cs
+System.Web.UI.WebControls/ListItemControlBuilder.cs
+System.Web.UI.WebControls/ListItemType.cs
+System.Web.UI.WebControls/ListSelectionMode.cs
+System.Web.UI.WebControls/Literal.cs
+System.Web.UI.WebControls/LiteralControlBuilder.cs
+System.Web.UI.WebControls/MonthChangedEventArgs.cs
+System.Web.UI.WebControls/MonthChangedEventHandler.cs
+System.Web.UI.WebControls/NextPrevFormat.cs
+System.Web.UI.WebControls/PagedDataSource.cs
+System.Web.UI.WebControls/PagerMode.cs
+System.Web.UI.WebControls/PagerPosition.cs
+System.Web.UI.WebControls/Panel.cs
+System.Web.UI.WebControls/PlaceHolder.cs
+System.Web.UI.WebControls/PlaceHolderControlBuilder.cs
+System.Web.UI.WebControls/RadioButton.cs
+System.Web.UI.WebControls/RadioButtonList.cs
+System.Web.UI.WebControls/RangeValidator.cs
+System.Web.UI.WebControls/RegularExpressionValidator.cs
+System.Web.UI.WebControls/RepeatDirection.cs
+System.Web.UI.WebControls/RepeatInfo.cs
+System.Web.UI.WebControls/RepeatLayout.cs
+System.Web.UI.WebControls/Repeater.cs
+System.Web.UI.WebControls/RepeaterCommandEventArgs.cs
+System.Web.UI.WebControls/RepeaterCommandEventHandler.cs
+System.Web.UI.WebControls/RepeaterItem.cs
+System.Web.UI.WebControls/RepeaterItemCollection.cs
+System.Web.UI.WebControls/RepeaterItemEventArgs.cs
+System.Web.UI.WebControls/RepeaterItemEventHandler.cs
+System.Web.UI.WebControls/RequiredFieldValidator.cs
+System.Web.UI.WebControls/SelectedDatesCollection.cs
+System.Web.UI.WebControls/ServerValidateEventArgs.cs
+System.Web.UI.WebControls/ServerValidateEventHandler.cs
+System.Web.UI.WebControls/Style.cs
+System.Web.UI.WebControls/Table.cs
+System.Web.UI.WebControls/TableCell.cs
+System.Web.UI.WebControls/TableCellCollection.cs
+System.Web.UI.WebControls/TableCellControlBuilder.cs
+System.Web.UI.WebControls/TableHeaderCell.cs
+System.Web.UI.WebControls/TableItemStyle.cs
+System.Web.UI.WebControls/TableRow.cs
+System.Web.UI.WebControls/TableRowCollection.cs
+System.Web.UI.WebControls/TableStyle.cs
+System.Web.UI.WebControls/TargetConverter.cs
+System.Web.UI.WebControls/TemplateColumn.cs
+System.Web.UI.WebControls/TextAlign.cs
+System.Web.UI.WebControls/TextBox.cs
+System.Web.UI.WebControls/TextBoxControlBuilder.cs
+System.Web.UI.WebControls/TextBoxMode.cs
+System.Web.UI.WebControls/TitleFormat.cs
+System.Web.UI.WebControls/Unit.cs
+System.Web.UI.WebControls/UnitConverter.cs
+System.Web.UI.WebControls/UnitType.cs
+System.Web.UI.WebControls/ValidatedControlConverter.cs
+System.Web.UI.WebControls/ValidationCompareOperator.cs
+System.Web.UI.WebControls/ValidationDataType.cs
+System.Web.UI.WebControls/ValidationSummary.cs
+System.Web.UI.WebControls/ValidationSummaryDisplayMode.cs
+System.Web.UI.WebControls/ValidatorDisplay.cs
+System.Web.UI.WebControls/VerticalAlign.cs
+System.Web.UI.WebControls/WebColorConverter.cs
+System.Web.UI.WebControls/WebControl.cs
+System.Web.UI.WebControls/Xml.cs
+System.Web.Utils/ApacheVersionInfo.cs
+System.Web.Utils/DataSourceHelper.cs
+System.Web.Utils/FileAction.cs
+System.Web.Utils/FileChangeEventHandler.cs
+System.Web.Utils/FileChangedEventArgs.cs
+System.Web.Utils/FileChangesMonitor.cs
+System.Web.Utils/FilePathParser.cs
+System.Web.Utils/IISVersionInfo.cs
+System.Web.Utils/NativeFileChangeEventHandler.cs
+System.Web.Utils/UrlUtils.cs
+System.Web.Utils/WebEqualComparer.cs
+System.Web.Utils/WebHashCodeProvider.cs
+System.Web.Security/DefaultAuthenticationEventArgs.cs
+System.Web.SessionState/HttpSessionState.cs
+System.Web.SessionState/IReadOnlySessionState.cs
+System.Web.SessionState/IRequiresSessionState.cs
+System.Web.SessionState/SessionDictionary.cs
+System.Web.SessionState/SessionStateMode.cs
+System.Web.SessionState/SessionStateModule.cs
+System.Web.Compilation/AspComponentFoundry.cs
+System.Web.Compilation/AspElements.cs
+System.Web.Compilation/AspGenerator.cs
+System.Web.Compilation/AspParser.cs
+System.Web.Compilation/AspTokenizer.cs
+System.Web.Compilation/PageCompiler.cs
+System.Web.Compilation/TemplateFactory.cs
diff --git a/mcs/class/System.Web/makefile.gnu b/mcs/class/System.Web/makefile.gnu
new file mode 100644
index 00000000000..53781b6ffe4
--- /dev/null
+++ b/mcs/class/System.Web/makefile.gnu
@@ -0,0 +1,13 @@
+topdir = ../..
+
+LIBRARY = ../lib/System.Web.dll
+
+LIB_LIST = list
+LIB_FLAGS = -r corlib -r System -r System.Drawing -r System.Xml
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=./Test*
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/System.Windows.Forms/Gtk/AnchorStyles.cs b/mcs/class/System.Windows.Forms/Gtk/AnchorStyles.cs
new file mode 100644
index 00000000000..2b166e21061
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/AnchorStyles.cs
@@ -0,0 +1,22 @@
+//

+// System.Windows.Forms.AnchorStyles.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum AnchorStyles{

+		Bottom = 2,

+		Left = 4,

+		None = 0,

+		Right = 8,

+		Top = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/Application.cs b/mcs/class/System.Windows.Forms/Gtk/Application.cs
new file mode 100644
index 00000000000..1ce7107ef92
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/Application.cs
@@ -0,0 +1,37 @@
+//
+// System.Windows.Forms.Application
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2002 Ximian, Inc
+//
+
+using System;
+using System.Drawing;
+using Gtk;
+using GtkSharp;
+using System.ComponentModel;
+
+namespace System.Windows.Forms {
+
+	public sealed class Application {
+		public static void Run ()
+		{
+			Gtk.Application.Run ();
+		}
+
+		static void terminate_event_loop (object o, EventArgs args)
+		{
+			Gtk.Application.Quit ();
+		}
+		
+		public static void Run (Form form)
+		{
+			form.Visible = true;
+			form.Closed += new EventHandler (terminate_event_loop);
+				
+			Gtk.Application.Run ();
+		}
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/Gtk/Button.cs b/mcs/class/System.Windows.Forms/Gtk/Button.cs
new file mode 100644
index 00000000000..5bfd9b998a5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/Button.cs
@@ -0,0 +1,107 @@
+//

+// System.Windows.Forms.Button.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	  implemented for Gtk+ by Rachel Hestilow (hestilow@ximian.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+namespace System.Windows.Forms

+{

+	/// <summary>

+	/// Represents a Windows button control.

+	/// </summary>

+

+	public class Button : ButtonBase, IButtonControl

+	{

+		// private fields

+		DialogResult dialogResult;

+//		

+//		// --- Constructor ---

+//		protected Button() : base() {

+//			dialogResult = DialogResult.None;

+//		}

+//		

+//		

+//		

+//		

+//		// --- Properties ---

+//		[MonoTODO]

+//		protected override CreateParams CreateParams {

+//			get { throw new NotImplementedException (); }

+//		}

+//		

+		// --- IButtonControl property ---

+		public virtual DialogResult DialogResult {

+			get { return dialogResult; }

+			set { dialogResult=value; }

+		}

+//		

+//		

+//		

+//		

+		// --- IButtonControl method ---

+		[MonoTODO]

+		public virtual void NotifyDefault(bool value) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void PerformClick() {

+			throw new NotImplementedException ();

+		}

+//		

+//		// --- Button methods for events ---

+//		[MonoTODO]

+//		protected override void OnClick(EventArgs e) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnMouseUp(MouseEventArgs mevent) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		// --- Button methods ---

+//		[MonoTODO]

+//		protected override bool ProcessMnemonic(char charCode) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		public override string ToString() {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void WndProc(ref Message m) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		

+//		

+//		

+//		/// --- Button events ---

+//		/// commented out, cause it only supports the .NET Framework infrastructure

+//		/*

+//		[MonoTODO]

+//		public new event EventHandler DoubleClick {

+//			add {

+//				throw new NotImplementedException ();

+//			}

+//			remove {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		*/

+

+		internal override Gtk.Widget CreateWidget () {

+			Gtk.Button button = new Gtk.Button ();

+			button.Add (label.Widget);

+			return button;

+		}

+	}

+//	

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/ButtonBase.cs b/mcs/class/System.Windows.Forms/Gtk/ButtonBase.cs
new file mode 100644
index 00000000000..48ffea11b0e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/ButtonBase.cs
@@ -0,0 +1,204 @@
+//

+// System.Windows.Forms.ButtonBase.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	  implemented for Gtk+ by Rachel Hestilow (hestilow@ximian.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Drawing;

+

+namespace System.Windows.Forms

+{

+	/// <summary>

+	/// Implements the basic functionality common to button controls.

+	/// ToDo note:

+	///  - no methods are implemented

+	/// </summary>

+

+	public abstract class ButtonBase : Control

+	{

+		// private fields

+//		FlatStyle flatStyle;

+//		Image image;

+//		ContentAlignment imageAlign;

+//		int imageIndex;

+		ContentAlignment textAlign;

+		internal protected Label label;

+

+//		

+//		// --- Constructor ---

+		protected ButtonBase() : base() {

+//			flatStyle = FlatStyle.Standard;

+//			image = null;

+//			imageAlign = ContentAlignment.MiddleCenter;

+//			imageIndex = -1;

+			textAlign = ContentAlignment.MiddleCenter;

+			label = new Label ();

+			label.Text = Text;

+			label.Visible = true;

+			ConnectToClicked ();

+		}

+		

+		internal protected void clicked_cb (object o, EventArgs args)

+		{

+			OnClick (EventArgs.Empty);

+		}

+		

+		internal protected void ConnectToClicked ()

+		{

+			((Gtk.Button) Widget).Clicked += new EventHandler (clicked_cb);

+		}

+		

+		// --- Properties ---

+//		[MonoTODO]

+//		protected override CreateParams CreateParams {

+//			get { throw new NotImplementedException (); }

+//		}

+//		

+//		[MonoTODO]

+//		protected override ImeMode DefaultImeMode {

+//			get { throw new NotImplementedException (); }

+//		}

+//		

+//		[MonoTODO]

+//		protected override Size DefaultSize {

+//			get { throw new NotImplementedException (); }

+//		}

+//		

+//		public FlatStyle FlatStyle {

+//			get { return flatStyle; }

+//			set { flatStyle=value; }

+//		}

+//		

+//		public Image Image {

+//			get { return image; }

+//			set { image=value; }

+//		}

+//		

+//		public ContentAlignment ImageAlign {

+//			get { return imageAlign; }

+//			set { imageAlign=value; }

+//		}

+//		

+//		public int ImageIndex {

+//			get { return imageIndex; }

+//			set { imageIndex=value; }

+//		}

+//		

+//		[MonoTODO]

+//		public new ImeMode ImeMode {

+//			get { throw new NotImplementedException (); }

+//			set { throw new NotImplementedException (); }

+//		}

+//		

+//		protected bool IsDefault {

+//			get { throw new NotImplementedException (); }

+//			set { throw new NotImplementedException (); }

+//		}

+		

+		public virtual ContentAlignment TextAlign {

+			get { return label.TextAlign; }

+			set { label.TextAlign=value; }

+		}

+//		

+//		

+//		

+//		

+//		

+//		/// --- Methods ---

+//		/// internal .NET framework supporting methods, not stubbed out:

+//		/// - protected override void Dispose(bool);

+//		/// - protected void ResetFlagsandPaint();

+//		[MonoTODO]

+//		protected override AccessibleObject CreateAccessibilityInstance() {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		/// [methods for events]

+//		[MonoTODO]

+//		protected override void OnEnabledChanged(EventArgs e) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnGotFocus(EventArgs e) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnKeyDown(KeyEventArgs kevent) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnKeyUp(KeyEventArgs kevent) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnLostFocus(EventArgs e) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnMouseDown(MouseEventArgs mevent) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnMouseEnter(EventArgs eventargs) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnMouseLeave(EventArgs eventargs) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnMouseMove(MouseEventArgs mevent) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnMouseUp(MouseEventArgs mevent) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnPaint(PaintEventArgs pevent) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnParentChanged(EventArgs e) {

+//			throw new NotImplementedException ();

+//		}

+//		

+		protected override void OnTextChanged(EventArgs e) {

+			label.Text = Text;

+		}

+//		

+//		[MonoTODO]

+//		protected override void OnVisibleChanged(EventArgs e) {

+//			throw new NotImplementedException ();

+//		}

+//		/// end of [methods for events]

+//		

+//		[MonoTODO]

+//		protected override void WndProc(ref Message m) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		

+//		

+//		/// --- ButtonBase.ButtonBaseAccessibleObject ---

+//		/// the class is not stubbed, cause it's only used for .NET framework

+//		

+//		

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/ContainerControl.cs b/mcs/class/System.Windows.Forms/Gtk/ContainerControl.cs
new file mode 100644
index 00000000000..5efb9445089
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/ContainerControl.cs
@@ -0,0 +1,114 @@
+//

+// System.Windows.Forms.ContainerControl.cs

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com)

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Drawing;

+

+namespace System.Windows.Forms

+{

+	/// <summary>

+	/// Provides focus management functionality for controls that can function as a container for other controls.

+	/// </summary>

+

+	public class ContainerControl : ScrollableControl, IContainerControl

+	{

+		protected ContainerControl() : base() {

+		}

+		

+		

+		public Control ActiveControl {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+//		

+//		[MonoTODO]

+//		public override BindingContext BindingContext {

+//			get { throw new NotImplementedException (); }

+//			set { throw new NotImplementedException (); }

+//		}

+//		

+//		[MonoTODO]

+//		protected override CreateParams CreateParams {

+//			get { throw new NotImplementedException (); }

+//		}

+//		

+//		[MonoTODO]

+//		public Form ParentForm {

+//			get { throw new NotImplementedException (); }

+//		}

+//		

+//		

+//		

+//		/// --- Methods ---

+//		/// internal .NET framework supporting methods, not stubbed out:

+//		/// - protected virtual void UpdateDefaultButton()

+//		[MonoTODO]

+//		protected override void AdjustFormScrollbars(bool displayScrollbars) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void Dispose(bool disposing) {

+//			throw new NotImplementedException ();

+//		}

+//		

+		[MonoTODO]

+		bool IContainerControl.ActivateControl(Control control) {

+			throw new NotImplementedException ();

+		}

+//		

+//		// [event methods]

+//		[MonoTODO]

+//		protected override void OnControlRemoved(ControlEventArgs e) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void OnCreateControl() {

+//			throw new NotImplementedException ();

+//		}

+//		// end of [event methods]

+//		

+//		[MonoTODO]

+//		protected override bool ProcessDialogChar(char charCode) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override bool ProcessDialogKey(Keys keyData) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override bool ProcessMnemonic(char charCode) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected virtual bool ProcessTabKey(bool forward) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void Select(bool directed,bool forward) {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		public bool Validate() {

+//			throw new NotImplementedException ();

+//		}

+//		

+//		[MonoTODO]

+//		protected override void WndProc(ref Message m) {

+//			throw new NotImplementedException ();

+//		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/Control.cs b/mcs/class/System.Windows.Forms/Gtk/Control.cs
new file mode 100644
index 00000000000..6f3354bfff8
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/Control.cs
@@ -0,0 +1,266 @@
+//
+// System.Windows.Forms.Form
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Rachel Hestilow (hestilow@ximian.com)
+//
+// (C) 2002 Ximian, Inc
+//
+
+using System;
+using System.Drawing;
+using Gtk;
+using GtkSharp;
+using System.ComponentModel;
+using System.Collections;
+
+namespace System.Windows.Forms {
+	public class Control : Component {
+		internal Widget widget;
+		Control parent;
+		string text;
+		int left, top, width, height;
+		ControlCollection controls = CreateControlsInstance ();
+		Point location = new Point (0, 0);
+		Gtk.Layout layout = null;
+		AnchorStyles anchor = AnchorStyles.Top|AnchorStyles.Left;
+		
+		static int init_me;
+
+		public class ControlCollection : IList, ICollection, IEnumerable, ICloneable 
+		{
+			ArrayList list = new ArrayList ();
+			Control owner;
+
+			public ControlCollection (Control owner)
+			{
+				this.owner = owner;
+			}
+
+			private ControlCollection ()
+			{
+			}
+
+			// ControlCollection
+			public virtual void Add (Control value) {
+				list.Add (value);
+				owner.OnControlAdded (new ControlEventArgs (value));
+			}
+			public virtual void AddRange (Control[] controls) {
+				list.AddRange (controls);
+				foreach (Control c in controls)
+					owner.OnControlAdded (new ControlEventArgs (c));
+			}
+			
+			public bool Contains (Control value) { return list.Contains (value); }
+			public int IndexOf (Control value) { return list.IndexOf (value); }
+			public virtual void Remove (Control value) {
+				list.Remove (value);
+				owner.OnControlAdded (new ControlEventArgs (value));
+			}
+			public virtual Control this[int index] { get { return (Control) list[index]; } }
+			public int GetChildIndex (Control child) {
+				return GetChildIndex (child, true);
+			}
+			public int GetChildIndex (Control child, bool throwException) {
+				if (throwException && !Contains (child))
+					throw new Exception ();
+				return list.IndexOf (child);
+			}
+			public int IndexOf (Control value) { return list.IndexOf (value); }
+			public void SetChildIndex (Control child, int newIndex) {
+				int oldIndex = GetChildIndex (child);
+				if (oldIndex == newIndex)
+					return;
+				// is this correct behavior?
+				Control other = (Control) list[newIndex];
+				list[oldIndex] = other;
+				list[newIndex] = child;
+			}
+
+			// IList
+			public bool IsFixedSize { get { return list.IsFixedSize; } }
+			public bool IsReadOnly { get { return list.IsReadOnly; } }
+			public object this[int index]
+			{
+				get { return list[index]; }
+				set { list[index] = value; }
+			}
+			int IList.Add (object value) { return list.Add (value); }
+			public void Clear () { list.Clear (); }
+			bool IList.Contains (object value) { return list.Contains (value); }
+			int IList.IndexOf (object value) { return list.IndexOf (value); }
+			void IList.Insert (int index, object value) { list.Insert (index, value); }
+			void IList.Remove (object value) { list.Remove (value); }
+			public void RemoveAt (int index) { list.RemoveAt (index); }
+
+			// ICollection
+			public int Count { get { return list.Count; } }
+			public bool IsSynchronized { get { return list.IsSynchronized; } }
+			public object SyncRoot { get { return list.SyncRoot; } }
+			public void CopyTo (Array array, int index) { list.CopyTo (array, index); }
+			
+			// IEnumerable
+			public IEnumerator GetEnumerator () { return list.GetEnumerator (); }
+
+			// ICloneable
+			public object Clone () {
+				ControlCollection c = new ControlCollection ();
+				c.list = (ArrayList) list.Clone ();
+				c.owner = owner;
+				return c;
+			}
+		}
+		
+		static Control ()
+		{
+			init_me = 1;
+		}
+		
+		public Control () : this ("")
+		{
+		}
+
+		public Control (string text) : this (null, text)
+		{
+		}
+
+		public Control (Control parent, string text)
+		{
+			this.parent = parent;
+			this.text = text;
+		}
+
+		public Control (string text, int left, int top, int width, int height)
+		{
+		}
+
+		public Control (Control parent, string text, int left, int top, int width, int height)
+		{
+		}
+
+		internal Widget Widget {
+			get {
+				if (widget == null)
+					widget = CreateWidget ();
+				return widget;
+			}
+		}
+		
+		internal virtual Widget CreateWidget ()
+		{
+			layout = new Gtk.Layout (new Gtk.Adjustment (IntPtr.Zero), new Gtk.Adjustment (IntPtr.Zero));
+			layout.Show ();
+			return layout;
+		}
+
+		public virtual string Text {
+			get {
+				return text;
+			}
+
+			set {
+				text = value;
+				OnTextChanged (EventArgs.Empty);
+			}
+		}
+		
+		public event EventHandler TextChanged;
+
+		protected virtual void OnTextChanged (EventArgs e) {
+			if (TextChanged != null)
+			 TextChanged (this, e);
+		}
+		
+		public void Show ()
+		{
+			Widget.Show ();
+		}
+
+		public void Hide ()
+		{
+			Widget.Hide ();
+		}
+
+		public bool Visible {
+			get {
+				return Widget.Visible;
+			}
+
+			set {
+				Widget.Visible = value;
+			}
+		}
+		
+		public ControlCollection Controls {
+			get { return controls;}
+		}
+		
+		protected virtual ControlCollection CreateControlsInstance() {
+			controls = new ControlCollection (this);
+			return controls;
+		}
+		
+		public event ControlEventHandler ControlAdded;
+		public event ControlEventHandler ControlRemoved;
+
+		internal void ControlLocationChanged (object o, EventArgs e)
+		{
+			Control c = (Control) o;
+			Point l = c.Location;
+			if (layout == null) {
+				Widget w = Widget;
+			}
+				
+			layout.Move (c.Widget, l.X, l.Y); 
+		}
+
+		protected virtual void OnControlAdded(ControlEventArgs e) {
+			e.Control.Visible = true;
+			
+			if (ControlAdded != null)
+				ControlAdded (this, e);
+
+			Point l = e.Control.Location;
+			if (layout == null) { 
+				Widget w = Widget;
+			}
+			layout.Put (e.Control.Widget, l.X, l.Y);
+			e.Control.LocationChanged += new EventHandler (ControlLocationChanged);
+		}
+
+		protected virtual void OnControlRemoved(ControlEventArgs e) {
+			if (ControlRemoved != null)
+				ControlRemoved (this, e);
+		}
+
+		public Point Location {
+			get { return location; }
+			set {
+				location = value;
+				OnLocationChanged (EventArgs.Empty);
+			}
+		}
+
+		public event EventHandler LocationChanged;
+
+		public virtual void OnLocationChanged (EventArgs e) {
+			
+			if (LocationChanged != null)
+				LocationChanged (this, e);
+		}
+
+		public event EventHandler Click;
+
+		protected virtual void OnClick (EventArgs e) {
+			if (Click != null)
+				Click (this, e);
+		}
+		
+		public virtual AnchorStyles Anchor {
+			get { return anchor; }
+			set { anchor=value; }
+    }
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/Gtk/ControlEventArgs.cs b/mcs/class/System.Windows.Forms/Gtk/ControlEventArgs.cs
new file mode 100644
index 00000000000..408647128e9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/ControlEventArgs.cs
@@ -0,0 +1,36 @@
+//

+// System.Windows.Forms.ControlEventArgs.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	  implemented for Gtk+ by Rachel Hestilow (hestilow@ximian.com)

+

+// (C) Ximian, Inc., 2002

+

+

+namespace System.Windows.Forms

+{

+	/// <summary>

+	/// Provides data for the ControlAdded and ControlRemoved events.

+	/// ToDo note:

+	///  - no methods are implemented

+	/// </summary>

+

+	public class ControlEventArgs : EventArgs

+	{

+		Control control;

+

+		#region Constructors

+		public ControlEventArgs(Control control) {

+			this.control = control;

+		}

+		#endregion

+		

+		#region Properties

+		public Control Control {

+			get { return control; }

+		}

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/ControlEventHandler.cs b/mcs/class/System.Windows.Forms/Gtk/ControlEventHandler.cs
new file mode 100644
index 00000000000..d42d35259c8
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/ControlEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.ControlEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	[Serializable]

+	public delegate void ControlEventHandler (

+	object sender,

+	ControlEventArgs e

+	);

+}
\ No newline at end of file
diff --git a/mcs/class/System.Windows.Forms/Gtk/DialogResult.cs b/mcs/class/System.Windows.Forms/Gtk/DialogResult.cs
new file mode 100644
index 00000000000..82a5ff3646c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/DialogResult.cs
@@ -0,0 +1,31 @@
+//

+// System.Windows.Forms.DialogResult.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms

+{

+	/// <summary>

+	/// Specifies identifiers to indicate the return value of a dialog box.

+	/// </summary>

+	[Serializable]

+	//[ComVisible(true)]

+	public enum DialogResult

+	{

+		//Values were verified with enumcheck.

+		None = 0,

+		OK = 1,

+		Cancel = 2,

+		Abort = 3,

+		Retry = 4,

+		Ignore = 5,

+		Yes = 6,

+		No = 7,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/Form.cs b/mcs/class/System.Windows.Forms/Gtk/Form.cs
new file mode 100644
index 00000000000..92f5a224fd4
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/Form.cs
@@ -0,0 +1,823 @@
+//
+// System.Windows.Forms.Form
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)
+//
+// (C) 2002 Ximian, Inc
+//
+
+using System;
+using System.Drawing;
+using Gtk;
+using GtkSharp;
+
+namespace System.Windows.Forms {
+
+	public class Form : ContainerControl {
+		Window win;
+		string caption;
+
+		public Form () : base ()
+		{
+		}
+
+		static Form ()
+		{
+			Gtk.Application.Init ();
+		}
+		
+		void delete_cb (object o, EventArgs args)
+		{
+                        SignalArgs sa = (SignalArgs) args;
+
+			//if (Closing != null)
+			//Closing (o, args);
+			
+			if (Closed != null)
+				Closed (o, args);
+			
+			sa.RetVal = false;
+		}
+		
+		internal override Widget CreateWidget ()
+		{
+			Widget contents = base.CreateWidget ();
+			win = new Window (WindowType.Toplevel);
+
+			win.DeleteEvent += new EventHandler (delete_cb);
+			win.Title = Text;
+			win.Add (contents);
+			return (Widget) win;
+		}
+
+		//  --- Public Properties
+		//
+		// [MonoTODO]
+		// public IButtonControl AcceptButton {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public static Form ActiveForm {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Form ActiveMdiChild {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool AutoScale {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public virtual Size AtoScaleBaseSize {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public override bool AutoScroll {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public virtual Color BackColor {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public IButtonControl CancelButton {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public new Size ClientSize {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool ControlBox {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Rectangle DesktopBounds {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Point DesktopLocation {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public DialogResult DialogResult {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public FormBorderStyle FormBorderStyle {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool HelpButton {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Icon Icon {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool IsMidiChild {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool IsMidiContainer {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool KeyPreview {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool MaximizeBox {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Size MaximumSize {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Form[] MdiChildren {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Form MdiParent {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public MainMenu Menu {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public MainMenu MergedMenu {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool MinimizeBox {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Size MinimumSize {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool Modal {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public double Opacity {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Form[] OwnedForms {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Form Owner {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool ShowInTaskbar {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public override ISite Site {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public SizeGripStyle SizeGripStyle {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public FormStartPosition StartPosition {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool TopLevel {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public bool TopMost {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public Color TransparencyKey {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public FormWindowState WindowState {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+
+		//
+		//  --- Public Methods
+		//
+		// [MonoTODO]
+		// public void Activate()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void AddOwnedForm(Form ownedForm)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void Close()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void Dispose()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public virtual bool Equals(object o);
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public static bool Equals(object o1, object o2);
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public static SizeF GetAutoScaleSize(Font font)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void Invalidate()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public object Invoke()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void LayoutMdi(MdiLayout value)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void PerformLayout()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void RemoveOwnedForm(Form ownedForm)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void ResumeLayout()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void Scale(float f)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void Select()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void SetBounds(int, int, int, int)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public void SetDesktopLocation(int x, int y)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public DialogResult ShowDialog()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// public override string ToString()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+
+		//
+		//  --- Public Events
+		//
+		// [MonoTODO]
+		// public event EventHandler Activated {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		
+		public event EventHandler Closed;
+		
+		// public event CancelEventHandler Closing;
+		
+		// [MonoTODO]
+		// public event EventHandler Deactivate {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public event InputLanguageChangedEventHandler InputLanguageChanged {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public event InputLanguageChangingEventHandler InputLanguageChanging {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+
+		// [MonoTODO]
+		// public event EventHandler  Load {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public event EventHandler  MaximizedBoundsChanged {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public event EventHandler  MaximumSizeChanged {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public event EventHandler  MdiChildActivate {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public event EventHandler  MenuComplete {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public event EventHandler  MenuStart {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// public event EventHandler  MinimumSizedChanged {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+
+		//
+		//  --- Protected Properties
+		//
+		// [MonoTODO]
+		// protected override CreateParams CreateParams {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// protected override ImeMode DefaultImeMode {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		// [MonoTODO]
+		// protected override Size DefaultSize {
+		//}
+		// [MonoTODO]
+		// protected Rectangle MaximizedBounds {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+
+		//
+		//  --- Protected Methods
+		//
+		// [MonoTODO]
+		// protected override void AdjustFormScrollbars(bool displayScrollbars)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override ControlCollection CreateControlsInstnace()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void CreateHandle()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void DefWndProc(ref Message m)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void Dispose(bool b)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+
+		// [MonoTODO]
+		// protected virtual void  OnClosed(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected virtual void  OnClosing(CancelEventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+
+		// [MonoTODO]
+		// protected override void OnCreateControl()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void OnFontChanged(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void OnHandleCreated(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void OnHandleDestroyed(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+
+		// [MonoTODO]
+		// protected virtual void OnInputLanguageChanged( OnInputLanguageChangedEventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected virtual void OnInputLanguagedChanging( OnInputLanguagedChangingEventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected virtual void OnLoad(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected virtual void OnMaximizedBoundsChanged(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected virtual void OnMaximumSizedChanged(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected virtual void OnMdiChildActive(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected virtual void OnMenuComplete(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected virtual void OnMenuStart(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected virtual void OnMinimumSizeChanged(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+
+		// [MonoTODO]
+		// protected override void  OnPaint(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void  OnResize(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void  OnStyleChanged(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		
+		protected override void  OnTextChanged(EventArgs e)
+		{
+			if (win != null)
+				win.Title = Text;
+		}
+
+		// [MonoTODO]
+		// protected override void  OnVisibleChanged(EventArgs e)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+
+		// [MonoTODO]
+		// protected override bool ProcessCmdKey( ref Message msg, Keys keyData)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override bool ProcessDialogKey(Keys keyData)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override bool ProcessKeyPreview(ref Message m)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override bool ProcessTabKey(bool forward)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+
+		// [MonoTODO]
+		// protected override void ScaleScore(float x, float y)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void Select(bool b1, bool b2)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void SetBoundsCore(int x, int y,  int width,  int height,  BoundsSpecified specified)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void SelectClientSizeCore(int x, int y)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void SetVisibleCore(bool value)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+
+		// [MonoTODO]
+		// protected void UpdateBounds()
+		// {
+		//		throw new NotImplementedException ();
+		// }
+		// [MonoTODO]
+		// protected override void WndProc(ref Message m)
+		// {
+		//		throw new NotImplementedException ();
+		// }
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/Gtk/HorizontalAlignment.cs b/mcs/class/System.Windows.Forms/Gtk/HorizontalAlignment.cs
new file mode 100644
index 00000000000..0430f0ae8bc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/HorizontalAlignment.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.HorizontalAlignment.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum HorizontalAlignment {

+		Center = 2,

+		Left = 0,

+		Right = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/IButtonControl.cs b/mcs/class/System.Windows.Forms/Gtk/IButtonControl.cs
new file mode 100644
index 00000000000..874d98543c0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/IButtonControl.cs
@@ -0,0 +1,17 @@
+//

+// System.Windows.Forms.IButtonControl.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	interface IButtonControl {

+		void NotifyDefault(bool value);

+		void PerformClick();

+		DialogResult DialogResult {get; set;}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/IContainerControl.cs b/mcs/class/System.Windows.Forms/Gtk/IContainerControl.cs
new file mode 100644
index 00000000000..989400c32c0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/IContainerControl.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.IContainerControl.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+

+namespace System.Windows.Forms

+{

+	public interface IContainerControl

+	{

+		bool ActivateControl(Control active);

+		Control ActiveControl {get; set;}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.Windows.Forms/Gtk/Label.cs b/mcs/class/System.Windows.Forms/Gtk/Label.cs
new file mode 100644
index 00000000000..982c0a68f8a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/Label.cs
@@ -0,0 +1,276 @@
+//
+// System.Windows.Forms.Label.cs
+//
+// Author:
+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)
+//	  implemented for Gtk+ by Rachel Hestilow (hestilow@ximian.com)
+//
+// (C) 2002 Ximian, Inc
+//
+
+namespace System.Windows.Forms {
+	using System.Drawing;
+
+	// <summary>
+	//
+	// </summary>
+	
+	public class Label : Control {
+	
+	public Label () : base ()
+	{
+	}
+		
+	//public virtual bool AutoSize {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public FlatStyle FlatStyle {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public Image Image {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public ContentAlignment ImageAlign {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public int ImageIndex {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public ImageList ImageList {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public ImeMode ImeMode {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public int PreferredHeight {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public int PreferredWidth {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public bool TabStop {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		[MonoTODO]
+		public virtual ContentAlignment TextAlign {
+			get {
+				throw new NotImplementedException ();
+			}
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+		//[MonoTODO]
+		//public bool UseMnemonic {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+
+		//
+		//  --- Public Methods
+		//
+		//[MonoTODO]
+		//public virtual bool Equals(object o);
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public static bool Equals(object o1, object o2);
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Select()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public override string ToString()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+
+		//
+		//  --- Public Events
+		// 
+		//[MonoTODO]
+		//public event EventHandler AutoSizeChanged {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public event EventHandler TextAlignChanged {
+		//	add {
+		//		throw new NotImplementedException ();
+		//	}
+		//	remove {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+
+		//
+		//  --- Protected Methods
+		//
+		//[MonoTODO]
+		//protected  Rectangle CalcImageRenderBounds( Image image, Rectangle rect,  ContentAlignment align)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected  override AccessibleObject CreateAccessibilityInstance()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected  void Dispose()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected  override void Dispose(bool val)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected  void DrawImage(  Graphics g,  Image img,  Rectangle r,  ContentAlignment align)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void  OnEnabledChanged (EventArgs e)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void  OnFontChanged (EventArgs e)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void  OnPaint (PaintEventArgs e)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void  OnParentChanged (EventArgs e)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		protected override void  OnTextChanged (EventArgs e)
+		{
+			((Gtk.Label) Widget).Text = Text;
+		}
+
+		//[MonoTODO]
+		//protected override void  OnVisibleChanged (EventArgs e)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override bool ProcessMnemonic(char charCode)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected ContentAlignment RtlTranslateAlignment( ContentAlignment alignment)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected HorizontalAlignment RtlTranslateAlignment( HorizontalAlignment alignment)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected virtual void Select(bool val1, bool val2)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void SetBoundsCore(  int x, int y,  int width, int height  BoundsSpecified specified)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected void UpdateBounds()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected void UpdateBounds(int b1, int b2, int b3, int b4)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void WndProc(ref Message m)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+
+		internal override Gtk.Widget CreateWidget () {
+			return new Gtk.Label (Text);
+		}
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/Gtk/ProgressBar.cs b/mcs/class/System.Windows.Forms/Gtk/ProgressBar.cs
new file mode 100644
index 00000000000..c18aa28f0c9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/ProgressBar.cs
@@ -0,0 +1,206 @@
+//

+// System.Windows.Forms.ProgressBar

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//  Remco de Jong (rdj@rdj.cg.nu)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+using System.Drawing.Printing;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents a Windows progress bar control.

+	///

+	/// </summary>

+

+	[MonoTODO]

+	public sealed class ProgressBar : Control {

+

+		#region Fields

+		private int maximum;

+		private int minimum;

+		private int step;

+		private int val;

+		#endregion

+

+		#region Constructor

+		[MonoTODO]

+		public ProgressBar() 

+		{

+			maximum=100;

+			minimum=0;

+			step=10;

+			val=0;

+		}

+		#endregion

+

+		internal override Gtk.Widget CreateWidget () {

+			Gtk.ProgressBar pbar = new Gtk.ProgressBar ();

+			return pbar;

+		}		

+		

+/*		#region Properties

+		[MonoTODO]

+		public override bool AllowDrop {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Color BackColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Color ForeColor  {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+*/

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new bool CausesValidation {get; set;}

+		

+/*		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Font Font {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+*/

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new ImeMode ImeMode {get; set;}

+		

+		public int Maximum {

+			get { 

+				return maximum; 

+			}

+			set { 

+				maximum=value; 

+			}

+		}

+		

+		public int Minimum {

+			get { 

+				return minimum; 

+			}

+			set { 

+				minimum=value; 

+			}

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new bool TabStop {get; set;}

+/*		[MonoTODO]

+		public override RightToLeft RightToLeft {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+*/		

+		public int Step {

+			get { 

+				return step; 

+			}

+			set { 

+				step=value; 

+			}

+		}

+		

+		protected override void  OnTextChanged(EventArgs e)

+		{

+			((Gtk.ProgressBar)Widget).Text = Text;

+		}

+		

+		public int Value {

+			get { 

+				return val; 

+			}

+			set { 

+				if (val <= maximum) {

+					val=value; 

+					float fraction = ((float) val / (float) maximum);

+					((Gtk.ProgressBar)Widget).Fraction = fraction;

+				}

+			}

+		}

+//		#endregion

+		

+		

+		

+		

+/*		#region Methods

+		[MonoTODO]

+		protected override void CreateHandle() 

+		{

+			throw new NotImplementedException ();

+		}

+*/		

+		[MonoTODO]

+		public void Increment(int value) 

+		{

+			Value += value;

+		}

+		

+/*		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+*/		

+		[MonoTODO]

+		public void PerformStep() 

+		{

+			Value += step;

+		}

+		

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+//		#endregion

+		

+		

+		

+		

+		#region Events

+		/*

+		 * This member supports the .NET Framework infrastructure and is not intended to be used directly from your code:

+		 public new event EventHandler DoubleClick;

+		 public new event EventHandler Enter;

+		 public new event KeyEventHandler KeyDown;

+		 public new event KeyPressEventHandler KeyPress;

+		 public new event KeyEventHandler KeyUp;

+		 public new event EventHandler Leave;

+		 public new event PaintEventHandler Paint;

+		*/

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/ScrollBars.cs b/mcs/class/System.Windows.Forms/Gtk/ScrollBars.cs
new file mode 100644
index 00000000000..355b159bbfb
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/ScrollBars.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.ScrollBars.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ScrollBars {

+		Both = 3,

+		Horizontal = 1,

+		None = 0,

+		Vertical = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/ScrollableControl.cs b/mcs/class/System.Windows.Forms/Gtk/ScrollableControl.cs
new file mode 100644
index 00000000000..6bfa153b5c7
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/ScrollableControl.cs
@@ -0,0 +1,305 @@
+//
+// System.Windows.Forms.Form
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)
+//
+// (C) 2002 Ximian, Inc
+//
+
+using System;
+using System.Drawing;
+using Gtk;
+using GtkSharp;
+
+namespace System.Windows.Forms {
+	public class ScrollableControl : Control {
+
+		//
+		//  --- Constructor
+		//
+		//[MonoTODO]
+		//public ScrollableControl()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+
+		//
+		//  --- Public Properties
+		//
+		//[MonoTODO]
+		//public virtual bool AutoScroll {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public Size AutoScrollMargin {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public Size AutoScrollMinSize {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public Point AutoScrollPosition {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public override Rectangle DisplayRectangle {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public ScrollableControl.DockPaddingEdges DockPadding {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//public override ISite Site {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+
+		//
+		//  --- Public Methods
+		//
+		//[MonoTODO]
+		//public IAsyncResult BeginInvoke(Delegate del)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public IAsyncResult BeginInvoke(Delegate del, object[] objs)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Dispose()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public virtual bool Equals(object o);
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public static bool Equals(object o1, object o2);
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Invalidate()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Invalidate(bool val)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Invalidate(Rectangle rect)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Invalidate(Region reg)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Invalidate(Rectangle rect, bool val)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Invalidate(Region reg, bool val)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public object Invoke(Delegate del)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public object Invoke(Delegate del, object[] objs)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void PerformLayout()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void PerformLayout(Control ctl, string str)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void ResumeLayout()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void ResumeLayout(bool val)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Scale(float val)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Scale(float val1, float val2)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Select()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void Select(bool val1, bool val2)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void SetBounds(int val1, int val2, int val3, int val4)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//public void SetBounds(int val1, int val2, int val3, int val4, BoundsSpecified bounds)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+
+		//
+		//  --- Protected Properties
+		//
+		//[MonoTODO]
+		//protected override CreateParams CreateParams {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//protected bool HScroll {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+		//[MonoTODO]
+		//protected bool VScroll {
+		//	get {
+		//		throw new NotImplementedException ();
+		//	}
+		//	set {
+		//		throw new NotImplementedException ();
+		//	}
+		//}
+
+		//
+		//  --- Protected Methods
+		//
+		//[MonoTODO]
+		//protected virtual void AdjustFormScrollbars( bool displayScrollbars)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void Dispose(bool val)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void OnLayout(LayoutEventArgs levent)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void OnMouseWheel(MouseEventArgs e)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void OnVisibleChanged(EventArgs e)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//ContentAlignment RtlTranslateAlignment(ContentAlignment calign)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment halign)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment lralign)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void ScaleCore(float dx, float dy)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected void UpdateBounds()
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected void UpdateBounds(int val1, int val2, int val3, int val4)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected void UpdateBounds(int val1, int val2, int val3, int val4, int val5, int val6)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+		//[MonoTODO]
+		//protected override void WndProc(ref Message m)
+		//{
+		//	throw new NotImplementedException ();
+		//}
+	 }
+}
diff --git a/mcs/class/System.Windows.Forms/Gtk/TextBox.cs b/mcs/class/System.Windows.Forms/Gtk/TextBox.cs
new file mode 100644
index 00000000000..6f0c3a805cd
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/TextBox.cs
@@ -0,0 +1,218 @@
+//

+// System.Windows.Forms.TextBox

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//	Dennis Hayes (dennish@raytek.com)

+//  Remco de Jong (rdj@rdj.cg.nu)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+     public class TextBox : TextBoxBase {

+

+		private Gtk.TextView textview;

+		private ScrollBars scrollbars;

+		private HorizontalAlignment textalign;

+		private bool wordwrap;

+

+		//

+		//  --- Public Constructor

+		//

+		public TextBox() {

+			scrollbars = ScrollBars.None;

+		}

+

+		internal override Gtk.Widget CreateWidget () {

+			// needs to initialized with a textbuffer from TextBoxBase

+			// we need default adjustments, but the scrolledwindow constructor does not take null as argument

+			

+			Gtk.ScrolledWindow window = new Gtk.ScrolledWindow (new Gtk.Adjustment (IntPtr.Zero), new Gtk.Adjustment (IntPtr.Zero));

+			window.SetPolicy(Gtk.PolicyType.Never, Gtk.PolicyType.Never);

+			window.AddWithViewport(TextView);

+			return window;

+		}

+

+		//  --- Public Properties

+		

+		public override bool ReadOnly {

+			get

+			{

+				return !TextView.Editable;

+			}

+			set

+			{

+				if (value == TextView.Editable) { // only change if value is different, correct behaviour?

+					TextView.Editable = !value;

+					OnReadOnlyChanged(EventArgs.Empty);

+				}

+			}

+		}

+

+		[MonoTODO]

+		public bool AcceptsReturn  {

+

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+/*		public CharacterCasing CharacterCasing {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+*/		[MonoTODO]

+		public char PasswordChar {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+

+		public ScrollBars ScrollBars {

+			get {

+				return scrollbars;

+			}

+			set {

+				scrollbars = value;

+

+				Gtk.PolicyType vpolicy = Gtk.PolicyType.Never; // correct behaviour?

+				Gtk.PolicyType hpolicy = Gtk.PolicyType.Never;

+				

+				if (scrollbars == ScrollBars.Both) {

+					vpolicy = Gtk.PolicyType.Always;

+					hpolicy = Gtk.PolicyType.Always;

+				}

+				else if (scrollbars == ScrollBars.Horizontal) {

+					hpolicy = Gtk.PolicyType.Always;

+				}

+				else if (scrollbars == ScrollBars.Vertical) {

+					vpolicy = Gtk.PolicyType.Always;

+				}

+

+				((Gtk.ScrolledWindow) Widget).SetPolicy(hpolicy, vpolicy);

+			}

+		}

+

+		public HorizontalAlignment TextAlign {

+			get

+			{

+				return textalign;

+			}

+			set

+			{

+				Gtk.Justification justification = Gtk.Justification.Left;

+				if (value == HorizontalAlignment.Center) {

+					justification = Gtk.Justification.Center;

+				}

+				else if (value == HorizontalAlignment.Right) {

+					justification = Gtk.Justification.Right;

+				}	

+				

+				TextView.Justification = justification;

+				textalign = value;

+				

+				OnTextAlignChanged(EventArgs.Empty);

+			}

+		}

+		

+			public override bool WordWrap {

+			get

+			{

+				return wordwrap;

+			}

+			set

+			{

+				Gtk.WrapMode wrapmode = Gtk.WrapMode.None;

+				wordwrap = value;

+				if (wordwrap)

+					wrapmode = Gtk.WrapMode.Word;

+				

+				TextView.WrapMode = wrapmode;

+			}

+		}

+

+		

+		// --- Public Events

+		

+		public event EventHandler TextAlignChanged;

+        

+       //  --- Protected Properties

+        

+/*		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+*/		

+		// --- Protected Members

+		

+		protected Gtk.TextView TextView {

+			get {

+				if (textview == null) {

+					textview = new Gtk.TextView(TextBuffer);

+					textview.Show();

+				}

+				return textview;

+			}

+		}

+

+/*		protected override bool IsInputKey(Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnMouseUp(MouseEventArgs mevent)

+		{

+			throw new NotImplementedException ();

+		}

+*/

+		protected virtual void OnTextAlignChanged(EventArgs e)

+		{

+			if (TextAlignChanged != null)

+			 TextAlignChanged (this, e);

+		}

+		

+/*		[MonoTODO]

+		protected override void WndProc(ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+*/	}

+}

diff --git a/mcs/class/System.Windows.Forms/Gtk/TextBoxBase.cs b/mcs/class/System.Windows.Forms/Gtk/TextBoxBase.cs
new file mode 100644
index 00000000000..28e14422f38
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/TextBoxBase.cs
@@ -0,0 +1,442 @@
+//

+// System.Windows.Forms.TextBoxBase

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//	Dennis Hayes (dennish@raytek.com)

+//  Remco de Jong (rdj@rdj.cg.nu)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+        public class TextBoxBase : Control {

+

+		private int maxlength = 0;

+		private Gtk.TextTagTable tagtable;

+		private Gtk.TextBuffer textbuffer = null;

+

+		//

+		//  --- Public Properties

+		//

+

+		public TextBoxBase () {

+		}

+

+		protected Gtk.TextBuffer TextBuffer {

+			get {

+				if (textbuffer == null) {

+					tagtable = new Gtk.TextTagTable ();

+					textbuffer = new Gtk.TextBuffer (tagtable);

+					// attach events

+

+					textbuffer.ModifiedChanged += new EventHandler (modified_changed_cb);

+				}

+	

+				return textbuffer;

+			}

+		}

+

+		protected override void OnTextChanged(EventArgs e)

+		{

+			TextBuffer.SetText(Text, Text.Length);

+		}

+

+		[MonoTODO]

+		public bool AcceptsTab {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual bool AutoSize {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+/*		[MonoTODO]

+		public override Color BackColor {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color ForeColor {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public BorderStyle BorderStyle {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+*/		[MonoTODO]

+		public bool CanUndo {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool HideSelection {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string[] Lines {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				Clear ();

+				foreach (String s in value) {

+					AppendText (s + "\n");

+				}

+			}

+		}

+		[MonoTODO]

+		public virtual int MaxLength {

+			get

+			{

+				return maxlength;

+			}

+			set

+			{

+				maxlength = value;

+			}

+		}

+

+		public bool Modified {

+			get

+			{

+				return TextBuffer.Modified;

+			}

+			set

+			{

+				if (TextBuffer.Modified != value) { // only call if it has really been changed since this will trigger an event, is this correct behavior?

+					TextBuffer.Modified = value;

+				}

+			}

+		}

+		[MonoTODO]

+		public virtual bool Multiline {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int PreferredHeight {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+

+		public virtual bool ReadOnly {

+			// needs to be overwritten by child classes

+			get { return false; }

+			set {}

+		}

+

+		[MonoTODO]

+		public virtual string SelectedText {

+			get

+			{

+				String selection = "";

+				Gtk.TextIter start;

+				Gtk.TextIter end;

+		

+				if (TextBuffer.GetSelectionBounds(ref start, ref end))

+					selection = TextBuffer.GetText(start, end, true);

+					

+				return selection;

+			}

+			set

+			{

+				// paste text over selection

+			}

+		}

+		[MonoTODO]

+		public virtual int SelectionLength {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SelectionStart {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual int TextLength  {

+

+			get

+			{

+				return Text.Length;

+			}

+		}

+		[MonoTODO]

+

+		public virtual bool WordWrap {

+			get

+			{

+				return false;

+			}

+			set

+			{

+			}

+		}

+		

+		// --- Public Methods

+		

+		public void AppendText(string text) 

+		{

+			Text += text;

+		}

+

+		public void Clear()

+		{

+			TextBuffer.SetText("", 0);

+		}

+		[MonoTODO]

+		public void ClearUndo()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Copy()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Cut()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Paste()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void ScrollToCaret()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Select(int start, int length) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void SelectAll()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Undo()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// --- Internal Events (Gtk)

+

+		internal protected void modified_changed_cb (object o, EventArgs args)

+		{

+			OnModifiedChanged (EventArgs.Empty);

+		}

+

+		// --- Public Events

+		

+		[MonoTODO]

+		public event EventHandler AcceptsTabChanged;

+		[MonoTODO]

+		public event EventHandler AutoSizeChanged;

+		[MonoTODO]

+		public event EventHandler BorderStyleChanged;

+		[MonoTODO]

+		//public override event EventHandler Click;

+		[MonoTODO]

+		public event EventHandler HideSelectionChanged;

+		public event EventHandler ModifiedChanged;

+		[MonoTODO]

+		public event EventHandler MultilineChanged;

+		public event EventHandler ReadOnlyChanged;

+

+	        // --- Protected Properties

+/*        

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Protected Methods

+		

+		[MonoTODO]

+		protected override void CreateHandle()

+		{

+			throw new NotImplementedException ();

+		}

+*/

+		[MonoTODO]

+/*		protected override bool IsInputKey(Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+*/		[MonoTODO]

+		protected virtual void OnAcceptsTabChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnAutoSizeChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnBorderStyleChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+/*

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleDestroyed(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+*/

+		[MonoTODO]

+		protected virtual void OnHideSelectionChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnModifiedChanged(EventArgs e)

+		{

+			if (ModifiedChanged != null)

+			 ModifiedChanged (this, e);

+		}

+		[MonoTODO]

+		protected virtual void OnMultilineChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		protected virtual void OnReadOnlyChanged(EventArgs e)

+		{

+			if (ReadOnlyChanged != null)

+			 ReadOnlyChanged (this, e);

+		}

+/*		[MonoTODO]

+		protected override bool ProcessDialogKey(Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+*/	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/Gtk/changelog b/mcs/class/System.Windows.Forms/Gtk/changelog
new file mode 100644
index 00000000000..1ba86b3a7ea
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/changelog
@@ -0,0 +1,13 @@
+2002-8-7  DennisHayes <dennish@raytek.com>

+

+*  Started changelog

+

+2002-8-7  DennisHayes <dennish@raytek.com>

+Check in for  Remco de Jong <rdj@rdj.cg.nu>

+

+* HorizontalAlignment.cs

+* ProgressBar.cs

+* ScrollBars.cs

+* TextBox.cs

+* TextBoxBase.cs

+* added new files with some functinality

diff --git a/mcs/class/System.Windows.Forms/Gtk/demo.cs b/mcs/class/System.Windows.Forms/Gtk/demo.cs
new file mode 100644
index 00000000000..d0a6abbe9f1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/demo.cs
@@ -0,0 +1,58 @@
+using System;
+using System.Drawing;
+using System.Windows.Forms;
+
+class X {
+	static void Clicked (object o, EventArgs args)
+	{
+		Console.WriteLine ("the button was clicked");
+	}
+	
+	static void Demo_Window ()
+	{
+		Form form = new Form ();
+
+		form.Text = "hello";
+
+		Label l = new Label ();
+		l.Location = new Point (20, 20);
+		l.Text = "Hello world";
+		form.Controls.Add (l);
+
+		Button b = new Button ();
+		b.Text = "a button";
+		b.Location = new Point (20, 60);
+		b.Click += new EventHandler (Clicked);
+		form.Controls.Add (b);
+
+		form.Visible = true;
+
+		Application.Run ();
+	}
+
+	static void Demo_AppRun ()
+	{
+		Form form = new Form ();
+
+		form.Text = "hello";
+		
+		Application.Run (form);
+	}
+	
+	static void Main (string [] args)
+	{
+		string demo = "window";
+
+		if (args.Length > 0)
+			demo = args [0];
+		
+		switch (demo){
+		case "window":
+			Demo_Window ();
+			break;
+		case "app_run":
+			Demo_AppRun ();
+			break;
+		}
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/Gtk/makefile b/mcs/class/System.Windows.Forms/Gtk/makefile
new file mode 100644
index 00000000000..d7857734d5c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/Gtk/makefile
@@ -0,0 +1,26 @@
+CSC=mcs
+SWFF=-r gtk-sharp -r glib-sharp -r System.Drawing 
+
+SOURCES = \
+	AnchorStyles.cs		\
+	Application.cs		\
+	ContainerControl.cs	\
+	Button.cs		\
+	ButtonBase.cs		\
+	Control.cs		\
+	ControlEventArgs.cs	\
+	ControlEventHandler.cs	\
+	DialogResult.cs		\
+	Form.cs 		\
+	IButtonControl.cs	\
+	IContainerControl.cs	\
+	Label.cs		\
+	ScrollableControl.cs
+
+all: demo.exe
+
+demo.exe: demo.cs System.Windows.Forms.dll
+	$(CSC) demo.cs -r System.Windows.Forms.dll -r System.Drawing 
+
+System.Windows.Forms.dll: $(SOURCES)
+	$(CSC) $(SWFF) --target library -o System.Windows.Forms.dll $(SOURCES)
diff --git a/mcs/class/System.Windows.Forms/System.Resources/ResXResourceReader.cs b/mcs/class/System.Windows.Forms/System.Resources/ResXResourceReader.cs
new file mode 100644
index 00000000000..4fd3fdeb868
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Resources/ResXResourceReader.cs
@@ -0,0 +1,89 @@
+//
+// System.Resources.ResXResourceReader.cs
+//
+// Authors: 
+// 	Duncan Mak <duncan@ximian.com>
+//	Nick Drochak <ndrochak@gol.com>
+//
+// 2001 (C) Ximian Inc, http://www.ximian.com
+//
+// TODO: Finish this
+
+using System.Collections;
+using System.Resources;
+using System.IO;
+
+namespace System.Resources
+{
+	public sealed class ResXResourceReader : IResourceReader, IDisposable
+	{
+		Stream stream;
+
+		// Constructors
+		public ResXResourceReader (Stream stream)
+		{
+			if (stream == null)
+				throw new ArgumentNullException ("Value cannot be null.");
+			
+			if (!stream.CanRead)
+				throw new ArgumentException ("Stream was not readable.");
+
+			this.stream = stream;
+			
+			if (!IsStreamValid()){
+				throw new ArgumentException("Stream is not a valid .resources file!  It was possibly truncated.");
+			}
+		}
+		
+		public ResXResourceReader (string fileName)
+		{
+			if (fileName == null)
+				throw new ArgumentException ("Path cannot be null.");
+			
+			if (String.Empty == fileName)
+				throw new ArgumentException("Empty path name is not legal.");
+
+			if (!System.IO.File.Exists (fileName)) 
+				throw new FileNotFoundException ("Could not find file " + Path.GetFullPath(fileName));
+
+			stream = new FileStream (fileName, FileMode.Open);
+
+			if (!IsStreamValid()){
+				throw new ArgumentException("Stream is not a valid .resources file!  It was possibly truncated.");
+			}
+		}
+		
+		[MonoTODO]
+		private bool IsStreamValid() {
+			return true;
+		}
+
+		public void Close ()
+		{
+			stream.Close ();
+			stream = null;
+		}
+		
+		public IDictionaryEnumerator GetEnumerator () {
+			if (null == stream){
+				throw new InvalidOperationException("ResourceReader is closed.");
+			}
+			else {
+				return null;
+			}
+		}
+		
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			return ((IResourceReader) this).GetEnumerator();
+		}
+		
+		[MonoTODO]
+		void IDisposable.Dispose ()
+		{
+			// FIXME: is this all we need to do?
+			Close();
+		}
+		
+	}  // public sealed class ResXResourceReader
+} // namespace System.Resources
diff --git a/mcs/class/System.Windows.Forms/System.Resources/ResXResourceWriter.cs b/mcs/class/System.Windows.Forms/System.Resources/ResXResourceWriter.cs
new file mode 100644
index 00000000000..b228bed4a3a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Resources/ResXResourceWriter.cs
@@ -0,0 +1,64 @@
+//
+// System.Resources.ResXResourceWriter.cs
+//
+// Author:
+//	Duncan Mak <duncan@ximian.com>
+//
+// 2001 (C) Ximian, Inc. 	http://www.ximian.com
+//
+
+using System.IO;
+
+namespace System.Resources
+{
+	public sealed class ResXResourceWriter : IResourceWriter
+	{
+		[MonoTODO]
+		public ResXResourceWriter (Stream stream)
+		{
+			if (stream == null)
+				throw new ArgumentNullException ("stream is null");
+			if (stream.CanWrite == false)
+				throw new ArgumentException ("stream is not writable.");
+		}
+		
+		[MonoTODO]
+		public ResXResourceWriter (String fileName)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName is null.");
+		}
+		
+		[MonoTODO]
+		public void AddResource (string name, byte[] value)
+		{
+			if (name == null || value == null)
+				throw new ArgumentNullException ("Parameter is a null reference.");
+		}
+		
+		[MonoTODO]
+		public void AddResource (string name, object value)
+		{			 
+			if (name == null || value == null)
+				throw new ArgumentNullException ("Parameter is a null reference.");
+		}
+		
+		[MonoTODO]
+		public void AddResource (string name, string value)
+		{
+			if (name == null || value == null)
+				throw new ArgumentNullException ("Parameter is a null reference.");
+		}
+
+		[MonoTODO]
+		public void Close () {}
+		
+		public void Dispose ()
+		{
+			Close();
+		}
+
+		[MonoTODO]
+		public void Generate () {}
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/AnchorEditor.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/AnchorEditor.cs
new file mode 100644
index 00000000000..86354eab2af
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/AnchorEditor.cs
@@ -0,0 +1,35 @@
+//

+// System.Windows.Forms.Design.AnchorEditor.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+using System.Drawing.Design;

+using System.ComponentModel;

+using System.Runtime.Remoting;

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for AnchorEditor.

+	/// </summary>

+	[MonoTODO]

+	public sealed class AnchorEditor : UITypeEditor {

+		[MonoTODO]

+		public AnchorEditor() {

+			//

+			// TODO: Add constructor logic here

+			//

+		}

+//		[MonoTODO]

+//		public override object EditValue(ITypeDescriptorContext context, IServiceProvider provider, Object value){

+//			throw new NotImplementedException ();

+//		}

+//		Documented, but not implmented by Mictosoft?

+//		[MonoTODO]

+//		public override UITypeEditorEditStyle GetEditStyle(ITypeDescriptorContext context){

+//			throw new NotImplementedException ();

+//		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/AssemblyInfo.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/AssemblyInfo.cs
new file mode 100644
index 00000000000..177a4f0e70a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+using System.Reflection;

+using System.Runtime.CompilerServices;

+

+//

+// General Information about an assembly is controlled through the following 

+// set of attributes. Change these attribute values to modify the information

+// associated with an assembly.

+//

+[assembly: AssemblyTitle("")]

+[assembly: AssemblyDescription("")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("")]

+[assembly: AssemblyProduct("")]

+[assembly: AssemblyCopyright("")]

+[assembly: AssemblyTrademark("")]

+[assembly: AssemblyCulture("")]		

+

+//

+// Version information for an assembly consists of the following four values:

+//

+//      Major Version

+//      Minor Version 

+//      Build Number

+//      Revision

+//

+// You can specify all the values or you can default the Revision and Build Numbers 

+// by using the '*' as shown below:

+

+[assembly: AssemblyVersion("1.0.*")]

+

+//

+// In order to sign your assembly you must specify a key to use. Refer to the 

+// Microsoft .NET Framework documentation for more information on assembly signing.

+//

+// Use the attributes below to control which key is used for signing. 

+//

+// Notes: 

+//   (*) If no key is specified, the assembly is not signed.

+//   (*) KeyName refers to a key that has been installed in the Crypto Service

+//       Provider (CSP) on your machine. KeyFile refers to a file which contains

+//       a key.

+//   (*) If the KeyFile and the KeyName values are both specified, the 

+//       following processing occurs:

+//       (1) If the KeyName can be found in the CSP, that key is used.

+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 

+//           in the KeyFile is installed into the CSP and used.

+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.

+//       When specifying the KeyFile, the location of the KeyFile should be

+//       relative to the project output directory which is

+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is

+//       located in the project directory, you would specify the AssemblyKeyFile 

+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]

+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

+//       documentation for more information on this.

+//

+[assembly: AssemblyDelaySign(false)]

+[assembly: AssemblyKeyFile("")]

+[assembly: AssemblyKeyName("")]

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/AxImporter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/AxImporter.cs
new file mode 100644
index 00000000000..0bd1fa61e62
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/AxImporter.cs
@@ -0,0 +1,87 @@
+//

+// System.Windows.Forms.Design.AxImporter.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+using System.Runtime.InteropServices;

+using System.IO;

+using System.Reflection;

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for AxImporter.

+	/// </summary>

+	[MonoTODO]

+	public class AxImporter

+	{

+		[MonoTODO]

+		public 	AxImporter(AxImporter.Options options)

+		{

+			throw new NotImplementedException ();

+			//

+			// TODO: Add constructor logic here

+			//

+		}

+		[MonoTODO]

+		public string[] GeneratedAsemblies{

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string[] GeneratedSoruces{

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TYPELIBATTR[] GeneratedTypeLibAttribute{

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string GenerateFromFile(FileInfo file){

+			throw new NotImplementedException ();

+		}

+//		UCOMITTypeLib documented, but not implmented by Microsoft?

+//		[MonoTODO]

+//		public string GenerateFromTypeLibrary(UCOMITTypeLib typeLib){

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public string GenerateFromTypeLibrary(UCOMITTypeLib typeLib, Guid clsid){

+//			throw new NotImplementedException ();

+//		}

+		[MonoTODO]

+		public static string GetFileOfTypeLib(ref TYPELIBATTR tlibattr){

+			throw new NotImplementedException ();

+		}

+

+		public sealed class Options{

+			public Options(){

+			}

+

+			//props

+			public bool delaySign;

+			public bool GenSources;

+			public string keyContainer;

+			public string keyfile;

+			public StrongNameKeyPair keyPair;

+

+			public bool noLogo;

+			public string outputDirectory;

+			public string outputName;

+			public bool overwriteRCW;

+			public byte[] publicKey;

+//implment

+//			public AxImporter.IReferenceResolver references;

+			public bool silentMode;

+			public bool verboseMode;

+		}

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentDocumentDesigner.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentDocumentDesigner.cs
new file mode 100644
index 00000000000..19c2fe7d05e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentDocumentDesigner.cs
@@ -0,0 +1,59 @@
+//

+// System.Windows.Forms.Design.ComponentDocumentDesigner.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+using System.Windows.Forms;

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for ComponentDocumentDesigner.

+	/// </summary>

+	public class ComponentDocumentDesigner {//: ComponentDesigner, IRootDesigner, ITooloxUser, ITypeDescriptorFilterService {

+		public ComponentDocumentDesigner()

+		{

+			throw new NotImplementedException ();

+			//

+			// TODO: Add constructor logic here

+			//

+		}

+

+//		public Control Control {

+//			get{

+//				throw new NotImplementedException ();

+//			}

+//		}

+		public bool TrayAutoArrange{

+			get{

+				throw new NotImplementedException ();

+			}

+			set{

+				throw new NotImplementedException ();

+			}

+		}

+		public bool TrayLargeIcon{

+			get{

+				throw new NotImplementedException ();

+			}

+			set{

+				throw new NotImplementedException ();

+			}

+		}

+//		public override void Initialize(IComponent component){

+//			throw new NotImplementedException ();

+//		}

+	

+//		protected override void Dispose(bool disposing){

+//			throw new NotImplementedException ();

+//		}

+//		protected virtual bool GetToolSupported(ToolboxItem tool){

+//			throw new NotImplementedException ();

+//		}

+//		protected override void preFilterProperties(IDictionary properties){

+//			throw new NotImplementedException ();

+//		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentEditor.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentEditor.cs
new file mode 100644
index 00000000000..ea69adbc175
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentEditor.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for WindowsFormsComponentEditor.

+	/// </summary>

+	public class ComponentEditor

+	{

+		public ComponentEditor()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentEditorForm.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentEditorForm.cs
new file mode 100644
index 00000000000..59575f040f1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentEditorForm.cs
@@ -0,0 +1,51 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+using System.Windows.Forms;

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for ComponentEditorForm.

+	/// </summary>

+	public class ComponentEditorForm { //: Form {

+		public ComponentEditorForm()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+		public ComponentEditorForm(object component, Type[] pageTypes){

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+//		protected override void OnActivated(EventArgs e){

+//			throw new NotImplementedException ();

+//		}

+//		public override bool PreProcessMessage(ref Message msg){

+//			throw new NotImplementedException ();

+//		}

+//		public virtual DialogResult ShowForm(){

+//			throw new NotImplementedException ();

+//		}

+//		public virtual DialogResult ShowForm(int page){

+//			throw new NotImplementedException ();

+//		}

+//		public virtual DialogResult ShowForm(IWin32Window owner){

+//			throw new NotImplementedException ();

+//		}

+//		public virtual DialogResult ShowForm(IWin32Window owner, int page){

+//			throw new NotImplementedException ();

+//		}

+//		protected override viod onHelpRequested(HelpEventArgs e){

+//			throw new NotImplementedException ();

+//		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentTray.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentTray.cs
new file mode 100644
index 00000000000..09fd00408fc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ComponentTray.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for ComponentTray.

+	/// </summary>

+	public class ComponentTray

+	{

+		public ComponentTray()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ControlDesigner.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ControlDesigner.cs
new file mode 100644
index 00000000000..5adb68c6320
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ControlDesigner.cs
@@ -0,0 +1,29 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+

+namespace System.Windows.Forms.Design {

+	/// <summary>

+	/// Summary description for ControlDesigner.

+	/// </summary>

+	public class ControlDesigner {

+		public ControlDesigner() {

+			//

+			// TODO: Add constructor logic here

+			//

+		}

+		public class ControlDesignerAccessibleObject{

+			public ControlDesignerAccessibleObject() {

+				//

+				// TODO: Add constructor logic here

+				throw new NotImplementedException ();

+				//

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/DocumentDesigner.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/DocumentDesigner.cs
new file mode 100644
index 00000000000..0a0030cde1b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/DocumentDesigner.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for DocumentDesigner.

+	/// </summary>

+	public class DocumentDesigner

+	{

+		public DocumentDesigner()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/EventsTab.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/EventsTab.cs
new file mode 100644
index 00000000000..82f9db9e8e5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/EventsTab.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for EventsTab.

+	/// </summary>

+	public class EventsTab

+	{

+		public EventsTab()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/FileNameEditor.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/FileNameEditor.cs
new file mode 100644
index 00000000000..c41e4c39745
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/FileNameEditor.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for FileNameEditor.

+	/// </summary>

+	public class FileNameEditor

+	{

+		public FileNameEditor()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/IMenuEditorService.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/IMenuEditorService.cs
new file mode 100644
index 00000000000..0ff23b98c38
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/IMenuEditorService.cs
@@ -0,0 +1,11 @@
+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for IMenuEditorService.

+	/// </summary>

+	public interface IMenuEditorService

+	{

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/IUIService.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/IUIService.cs
new file mode 100644
index 00000000000..649d7eed5f9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/IUIService.cs
@@ -0,0 +1,11 @@
+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for IUIService.

+	/// </summary>

+	public interface IUIService

+	{

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/IWindowsformsEditorService.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/IWindowsformsEditorService.cs
new file mode 100644
index 00000000000..a87af92b94d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/IWindowsformsEditorService.cs
@@ -0,0 +1,11 @@
+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for IWindowsformsEditorService.

+	/// </summary>

+	public interface IWindowsformsEditorService

+	{

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/MenusCommands.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/MenusCommands.cs
new file mode 100644
index 00000000000..0b7cdc26988
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/MenusCommands.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for MenusCommands.

+	/// </summary>

+	public class MenusCommands

+	{

+		public MenusCommands()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ParentControlDesigner.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ParentControlDesigner.cs
new file mode 100644
index 00000000000..593a82ead06
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ParentControlDesigner.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for ParentControlDesigner.

+	/// </summary>

+	public class ParentControlDesigner

+	{

+		public ParentControlDesigner()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/PropertyTab.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/PropertyTab.cs
new file mode 100644
index 00000000000..3488cb62ea8
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/PropertyTab.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for PropertyTab.

+	/// </summary>

+	public class PropertyTab

+	{

+		public PropertyTab()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ScrollableControlDesigner.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ScrollableControlDesigner.cs
new file mode 100644
index 00000000000..673c74aecce
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/ScrollableControlDesigner.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.Design.ComponentEditorForm.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for ScrollableControlDesigner.

+	/// </summary>

+	public class ScrollableControlDesigner

+	{

+		public ScrollableControlDesigner()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/SelectionRules.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/SelectionRules.cs
new file mode 100644
index 00000000000..f990290ef1a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/SelectionRules.cs
@@ -0,0 +1,11 @@
+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for SelectionRules.

+	/// </summary>

+	public enum SelectionRules

+	{

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/System.Windows.Forms.Design.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/System.Windows.Forms.Design.csproj
new file mode 100644
index 00000000000..0026e1e1937
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/System.Windows.Forms.Design.csproj
@@ -0,0 +1,193 @@
+<VisualStudioProject>

+    <CSHARP

+        ProjectType = "Local"

+        ProductVersion = "7.0.9466"

+        SchemaVersion = "1.0"

+        ProjectGuid = "{EF89E643-02F5-4E97-9353-3C92F209EB47}"

+    >

+        <Build>

+            <Settings

+                ApplicationIcon = ""

+                AssemblyKeyContainerName = ""

+                AssemblyName = "System.Windows.Forms.Design"

+                AssemblyOriginatorKeyFile = ""

+                DefaultClientScript = "JScript"

+                DefaultHTMLPageLayout = "Grid"

+                DefaultTargetSchema = "IE50"

+                DelaySign = "false"

+                OutputType = "Library"

+                RootNamespace = "System.Windows.Forms.Design"

+                StartupObject = ""

+            >

+                <Config

+                    Name = "Debug"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "DEBUG;TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "true"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "true"

+                    Optimize = "false"

+                    OutputPath = "bin\Debug\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+                <Config

+                    Name = "Release"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "false"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "false"

+                    Optimize = "true"

+                    OutputPath = "bin\Release\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+            </Settings>

+            <References>

+                <Reference

+                    Name = "System"

+                    AssemblyName = "System"

+                    HintPath = "..\..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.dll"

+                />

+                <Reference

+                    Name = "System.Data"

+                    AssemblyName = "System.Data"

+                    HintPath = "..\..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"

+                />

+                <Reference

+                    Name = "System.XML"

+                    AssemblyName = "System.XML"

+                    HintPath = "..\..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"

+                />

+                <Reference

+                    Name = "System.Drawing.Design"

+                    AssemblyName = "System.Drawing.Design"

+                    HintPath = "..\..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Drawing.Design.dll"

+                />

+            </References>

+        </Build>

+        <Files>

+            <Include>

+                <File

+                    RelPath = "AnchorEditor.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AssemblyInfo.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AxImporter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ComponentDocumentDesigner.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ComponentEditor.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ComponentEditorForm.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ComponentTray.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ControlDesigner.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DocumentDesigner.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "EventsTab.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "FileNameEditor.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IMenuEditorService.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IUIService.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IWindowsformsEditorService.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MenusCommands.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ParentControlDesigner.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PropertyTab.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ScrollableControlDesigner.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SelectionRules.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TODOAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "UITypeEditor.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+            </Include>

+        </Files>

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/System.Windows.Forms.Design.csproj.user b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/System.Windows.Forms.Design.csproj.user
new file mode 100644
index 00000000000..fca0192f25c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/System.Windows.Forms.Design.csproj.user
@@ -0,0 +1,48 @@
+<VisualStudioProject>

+    <CSHARP>

+        <Build>

+            <Settings ReferencePath = "" >

+                <Config

+                    Name = "Debug"

+                    EnableASPDebugging = "false"

+                    EnableASPXDebugging = "false"

+                    EnableUnmanagedDebugging = "false"

+                    EnableSQLServerDebugging = "false"

+                    RemoteDebugEnabled = "false"

+                    RemoteDebugMachine = ""

+                    StartAction = "Project"

+                    StartArguments = ""

+                    StartPage = ""

+                    StartProgram = ""

+                    StartURL = ""

+                    StartWorkingDirectory = ""

+                    StartWithIE = "true"

+                />

+                <Config

+                    Name = "Release"

+                    EnableASPDebugging = "false"

+                    EnableASPXDebugging = "false"

+                    EnableUnmanagedDebugging = "false"

+                    EnableSQLServerDebugging = "false"

+                    RemoteDebugEnabled = "false"

+                    RemoteDebugMachine = ""

+                    StartAction = "Project"

+                    StartArguments = ""

+                    StartPage = ""

+                    StartProgram = ""

+                    StartURL = ""

+                    StartWorkingDirectory = ""

+                    StartWithIE = "false"

+                />

+            </Settings>

+        </Build>

+        <OtherProjectSettings

+            CopyProjectDestinationFolder = ""

+            CopyProjectUncPath = ""

+            CopyProjectOption = "0"

+            ProjectView = "ProjectFiles"

+            ProjectTrust = "0"

+        />

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/TODOAttribute.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/TODOAttribute.cs
new file mode 100644
index 00000000000..6e2ace72630
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/TODOAttribute.cs
@@ -0,0 +1,32 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Windows.Forms {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All)]
+	internal class MonoTODOAttribute : Attribute {
+
+		string comment;
+
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/UITypeEditor.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/UITypeEditor.cs
new file mode 100644
index 00000000000..7b3fa422e1b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/UITypeEditor.cs
@@ -0,0 +1,17 @@
+using System;

+

+namespace System.Windows.Forms.Design

+{

+	/// <summary>

+	/// Summary description for UITypeEditor.

+	/// </summary>

+	public class UITypeEditor

+	{

+		public UITypeEditor()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/changelog b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/changelog
new file mode 100644
index 00000000000..53df5dbe98f
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms.Design/changelog
@@ -0,0 +1,40 @@
+2002-8-4  DennisHayes <dennish@raytek.com>

+

+*  Started cheanglog

+

+2002-8-4  DennisHayes <dennish@raytek.com>

+

+* AnchorEditor.cs

+* AxImporter.cs

+* ComponentDocumentDesigner.cs

+* ComponentEditorForm.cs

+* Stubbed out

+

+* ComponentTray.cs

+* ControlDesigner.cs

+* ComponentEditor.cs

+* DocumentDesigner.cs

+* EventsTab.cs

+* FileNameEditor.cs

+* IMenuEditorService.cs

+* IUIService.cs

+* IWindowsformsEditorService.cs

+* MenusCommands.cs

+* ParentControlDesigner.cs

+* PropertyTab.cs

+* ScrollableControlDesigner.cs

+* SelectionRules.cs

+* UITypeEditor.cs

+* Class body defined only. No stubbs done.

+

+* TODOAttribute.cs

+* Used to mark unimplemented functions.

+

+* System.Windows.Forms.Design.csproj

+* System.Windows.Forms.Design.csproj.user

+* AssemblyInfo.cs

+* Needed for Visual Studio compile.

+

+

+

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleEvents.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleEvents.cs
new file mode 100644
index 00000000000..d39f188ec1d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleEvents.cs
@@ -0,0 +1,59 @@
+//

+// System.Windows.Forms.AccessibleEvents.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian = , Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum AccessibleEvents{

+		AcceleratorChange = 32786,

+		Create = 32768,

+		DefaultActionChange = 32765,

+		DescriptionChange = 32781,

+		Destroy = 32769,

+		Focus = 32773,

+		HelpChange = 32784,

+		Hide = 32771,

+		LocationChange = 32779,

+		NameChange = 32780,

+		ParentChange = 32783,

+		Reorder = 32772,

+		Selection = 32774,

+		SelectionAdd = 32775,

+		SelectionRemove = 32776,

+		SelectionWithin = 32777,

+		Show = 32770,

+		StateChange = 32778,

+		SystemAlert = 2,

+		SystemCaptureEnd = 9,

+		SystemCaptureStart = 8,

+		SystemContextHelpEnd = 13,

+		SystemContextHelpStart = 12,

+		SystemDialogEnd = 17,

+		SystemDialogStart = 16,

+		SystemDragDropEnd = 15,

+		SystemDragDropStart = 14,

+		SystemForeground = 3,

+		SystemMenuEnd = 5,

+		SystemMenuPopupEnd = 7,

+		SystemMenuPopupStart = 6,

+		SystemMenuStart = 4,

+		SystemMinimizeEnd = 23,

+		SystemMinimizeStart = 22,

+		SystemMoveSizeEnd = 11,

+		SystemMoveSizeStart = 10,

+		SystemScrollingEnd = 19,

+		SystemScrollingStart = 18,

+		SystemSound = 1,

+		SystemSwitchEnd = 21,

+		SystemSwitchStart = 20,

+		ValueChange = 32782

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleNavigation.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleNavigation.cs
new file mode 100644
index 00000000000..c7d017728cf
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleNavigation.cs
@@ -0,0 +1,32 @@
+//

+// System.Windows.Forms.AccessibleNavigation.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+	/// Specifies a values for navigating among accessible objects.

+	/// </summary>

+

+	//[Serializable]

+	public enum AccessibleNavigation {

+

+		//Values were verified with enumcheck.

+		Down = 2,

+		FirstChild = 7,

+		LastChild = 8,

+		Left = 3,

+		Next = 5,

+		Previous = 6,

+		Right = 4,

+		Up = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleObject.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleObject.cs
new file mode 100644
index 00000000000..d8e57c7930a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleObject.cs
@@ -0,0 +1,369 @@
+//

+// System.Windows.Forms.AccessibleObject.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+

+using System;

+using System.Reflection;

+using System.Globalization;

+//using System.Windows.Forms.AccessibleObject.IAccessible;

+using System.Drawing;

+using Accessibility;

+using System.Runtime.InteropServices;

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides information that accessibility applications use to adjust an application's UI for users with impairments.

+	///

+	/// ToDo note:

+	///  - Nothing is implemented

+	///  - IAccessible members not stubbed out

+	///  - MarshalByRefObject members not stubbed out

+	/// MSDN gives little info on the members of IAccessible: "This member supports the .NET Framework infrastructure and is not intended to be used directly from your code."

+	/// </summary>

+	[MonoTODO]

+	[ComVisible(true)]

+	public class AccessibleObject : MarshalByRefObject, IReflect, IAccessible {

+

+		string name;

+		string value;

+		// --- Constructor ---

+		[MonoTODO]

+		public AccessibleObject() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		~AccessibleObject(){

+		}

+		

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this AccessibleObject and another object.

+		/// </remarks>

+		

+		public override bool Equals (object obj) {

+			if (!(obj is AccessibleObject))

+				return false;

+

+			return (this == (AccessibleObject) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		

+		public override int GetHashCode () {

+			unchecked{//FIXME Add out proprities to the hash

+				return base.GetHashCode();

+			}

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the AccessibleObject as a string.

+		/// </remarks>

+		

+		public override string ToString () {

+			//FIXME add our proprities to ToString

+			return base.ToString();// String.Format ("[{0},{1},{2}]", bindingpath, bindingfield, bindingmember);

+		}

+

+		// --- Properties ---

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual Rectangle Bounds {

+

+			get { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual string DefaultAction {

+

+			get { throw new NotImplementedException (); }

+		}

+    

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual string Description {

+

+			get { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual string Help {

+

+			get { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual string KeyboardShortcut {

+

+			get { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual string Value {

+			get { return this.value; }

+			set { this.value = value; }

+		}

+

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual AccessibleObject Parent {

+

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual AccessibleRole Role {

+

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual AccessibleStates State {

+

+			get { throw new NotImplementedException (); }

+		}

+

+		// --- Methods ---

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual void DoDefaultAction() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual AccessibleObject GetChild(int index) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual int GetChildCount() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual AccessibleObject GetFocused() {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual int GetHelpTopic(out string fileName) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual AccessibleObject GetSelected() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual AccessibleObject HitTest(int x,int y) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual AccessibleObject Navigate(AccessibleNavigation navdir) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		[ComVisible(true)]

+		public virtual void Select(AccessibleSelection flags) {

+			throw new NotImplementedException ();

+		}

+

+		//Not part of spec?

+		//[MonoTODO]

+		//[ComVisible(true)]

+		//protected void UseStdAccessibleObjects(IntPtr handle,int objid) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+

+		// --- Methods: IReflect ---

+		[MonoTODO]

+		FieldInfo IReflect.GetField( string name,BindingFlags bindingAttr) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		FieldInfo[] IReflect.GetFields (BindingFlags bindingAttr) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		MemberInfo[] IReflect.GetMember( string name, BindingFlags bindingAttr) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		MemberInfo[] IReflect.GetMembers( BindingFlags bindingAttr) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		MethodInfo IReflect.GetMethod( string name, BindingFlags bindingAttr, Binder binder, Type[] types, ParameterModifier[] modifiers) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		MethodInfo IReflect.GetMethod( string name, BindingFlags bindingAttr) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+

+

+

+		[MonoTODO]

+		MethodInfo[] IReflect.GetMethods( BindingFlags bindingAttr) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		PropertyInfo[] IReflect.GetProperties( BindingFlags bindingAttr) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		PropertyInfo IReflect.GetProperty( string name, BindingFlags bindingAttr) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		PropertyInfo IReflect.GetProperty( string name, BindingFlags bindingAttr, Binder binder, Type returnType, Type[] types, ParameterModifier[] modifiers) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		//[Guid("")]

+		object IReflect.InvokeMember( string name, BindingFlags invokeAttr, Binder binder, object target, object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters) {

+			// FIXME

+			throw new NotImplementedException ();

+		}

+		

+		

+		Type IReflect.UnderlyingSystemType {

+		//private Type UnderlyingSystemType {

+			get { throw new NotImplementedException (); }

+		}

+		

+		void IAccessible.accDoDefaultAction(object childID) {

+			throw new NotImplementedException ();

+		}

+		int IAccessible.accChildCount{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+

+		object IAccessible.accFocus{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		object IAccessible.accHitTest(int xLeft, int yTop) {

+			throw new NotImplementedException ();

+		}

+		void IAccessible.accLocation(out int pxLeft, out int pyTop, out int pcxWidth, out int pcyHeight, object childID) {

+			throw new NotImplementedException ();

+		}

+		object IAccessible.accNavigate(int navDir, object childID) {

+			throw new NotImplementedException ();

+		}

+		object IAccessible.accParent {

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		void IAccessible.accSelect(int flagsSelect, object childID) {

+			throw new NotImplementedException ();

+		}

+		object IAccessible.accSelection {

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		object IAccessible.get_accChild(object childID) {

+			throw new NotImplementedException ();

+		}

+		string IAccessible.get_accDefaultAction(object childID) {

+			throw new NotImplementedException ();

+		}

+		string IAccessible.get_accDescription(object childID) {

+			throw new NotImplementedException ();

+		}

+		string IAccessible.get_accHelp(object childID) {

+			throw new NotImplementedException ();

+		}

+		int IAccessible.get_accHelpTopic(out string pszHelpFile,object childID) {

+			throw new NotImplementedException ();

+		}

+		string IAccessible.get_accKeyboardShortcut(object childID) {

+			throw new NotImplementedException ();

+		}

+		string IAccessible.get_accName(object childID) {

+			throw new NotImplementedException ();

+		}

+		object IAccessible.get_accRole(object childID) {

+			throw new NotImplementedException ();

+		}

+		object IAccessible.get_accState(object childID) {

+			throw new NotImplementedException ();

+		}

+		string IAccessible.get_accValue(object childID) {

+			throw new NotImplementedException ();

+		}

+		void IAccessible.set_accName(object childID, string newName) {

+			throw new NotImplementedException ();

+		}

+		void IAccessible.set_accValue(object childID, string newValue) {

+			throw new NotImplementedException ();

+		}

+	}

+	

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleRole.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleRole.cs
new file mode 100644
index 00000000000..8a21d96e95c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleRole.cs
@@ -0,0 +1,80 @@
+//

+// System.Windows.Forms.AccessibleRole.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum AccessibleRole{

+		Alert = 8,

+		Animation = 54,

+		Application = 14,

+		Border = 19,

+		ButtonDropDownGrid = 58,

+		ButtonMenu = 57,

+		Caret = 7,

+		Cell = 29,

+		Character = 32,

+		Chart = 17,

+		CheckButton = 44,

+		Client = 10,

+		Clock = 61,

+		Column = 27,

+		ColumnHeader = 25,

+		ComboBox = 46,

+		Cursor = 6,

+		Default = -1,

+		Diagram = 53,

+		Dial = 49,

+		Dialog = 18,

+		Document = 15,

+		DropList = 47,

+		Equation = 55,

+		Graphic = 40,

+		Grip = 4,

+		Grouping = 20,

+		HelpBalloon = 31,

+		HotkeyField = 50,

+		Indicator = 39,

+		Link = 30,

+		List = 33,

+		ListItem = 34,

+		MenuBar = 2,

+		MenuItem = 12,

+		MenuPopup = 11,

+		None = 0,

+		Outline = 35,

+		OutlineItem = 36,

+		PageTab = 37,

+		PageTabList = 60,

+		Pane = 16,

+		ProgressBar = 48,

+		PropertyPage = 38,

+		PushButton = 43,

+		RadioButton = 45,

+		Row = 28,

+		RowHeader = 26,

+		ScrollBar = 3,

+		Separator = 21,

+		Slider = 51,

+		Sound = 5,

+		SpinButton = 52,

+		StaticText = 41,

+		StatusBar = 23,

+		Table = 24,

+		Text = 42,

+		TitleBar = 1,

+		ToolBar = 22,

+		ToolTip = 13,

+		WhiteSpace = 59,

+		Window = 9

+	}

+

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleSelection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleSelection.cs
new file mode 100644
index 00000000000..dce814a48bd
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleSelection.cs
@@ -0,0 +1,30 @@
+//

+// System.Windows.Forms.AccessibleSelection.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies how an accessible object is selected or receives focus.

+  /// This enumeration has a FlagsAttribute attribute that allows a bitwise combination of its member values.

+	/// </summary>

+	[Flags]

+	//[Serializable]

+	public enum AccessibleSelection {

+

+		AddSelection = 1,

+		ExtendSelection = 2,

+		None = 0,

+		RemoveSelection = 4,

+		TakeFocus = 8,

+		TakeSelection = 16

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleStates.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleStates.cs
new file mode 100644
index 00000000000..49eb44e63bc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AccessibleStates.cs
@@ -0,0 +1,59 @@
+//

+// System.Windows.Forms.AccessibleStates.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum AccessibleStates{

+		AlertLow = 67108864,

+		AlertMedium = 134217728,

+		AlertHigh = 268435456,

+		Animated = 16384,

+		Busy = 2048,

+		Checked = 16,

+		Collapsed = 1024,

+		Default = 256,

+		Expanded = 512,

+		ExtSelectable = 33554432,

+		Floating = 4096,

+		Focusable = 1048576,

+		Focused = 4,

+		HotTracked = 128,

+		Indeterminate =32,

+		Mixed = 32,

+		Invisible = 32768,

+		Linked = 4194304,

+		Marqueed = 8192,

+		Moveable = 262144,

+		MultiSelectable = 16777216,

+		None = 0,

+		Pressed = 8,

+		Protected = 536870912,

+		ReadOnly = 64,

+		Offscreen = 65536,

+		Selectable = 2097152,

+		Selected = 2,

+		SelfVoicing = 524288,

+		Sizeable = 131072,

+		Traversed =8388608,

+		Unavailable = 1,

+		Valid = 1073741823,		

+

+

+		//Where did these come from, are they missing from elsewhere?

+		//AddSelection = ,

+		//ExtendSelection = ,

+		//None = ,

+		//RemoveSelection = ,

+		//TakeFocus = ,

+		//TakeSelection = 

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AmbientProperties.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AmbientProperties.cs
new file mode 100644
index 00000000000..67bbeeb4c61
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AmbientProperties.cs
@@ -0,0 +1,116 @@
+//

+// System.Windows.Forms.AmbientProperties

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//	Dennis Hayes (dennish@raytek.com)

+// (C) Ximian, Inc 2002

+//

+using System.Runtime.InteropServices;

+

+using System;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides ambient property values to top-level controls.

+	/// </summary>

+	

+	public sealed class AmbientProperties {

+

+		

+		// --- Constructor ---

+		public AmbientProperties() 

+		{

+			//

+		}

+

+		//[Serializable]

+		//[ClassInterface(ClassInterfaceType.AutoDual)]

+		~AmbientProperties(){

+		}

+

+		// --- (public) Properties ---

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this AmbientProperties and another object.

+		/// </remarks>

+		

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is AmbientProperties))

+				return false;

+

+			return (this == (AmbientProperties) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		

+		public override int GetHashCode () 

+		{

+			unchecked{//FIXME Add out proprities to the hash

+				return base.GetHashCode();

+			}

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the AmbientProperties as a string.

+		/// </remarks>

+		

+		public override string ToString () 

+		{

+			//FIXME add our proprities to ToString

+			return base.ToString();// String.Format ("[{0},{1},{2}]", bindingpath, bindingfield, bindingmember);

+		}

+

+		public Cursor Cursor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+	

+		public Font Font {

+			get {

+				throw new NotImplementedException (); 

+			}

+			set {

+				throw new NotImplementedException (); 

+			}

+		}

+	

+		public Color ForeColor {

+			get { 

+				throw new NotImplementedException (); 

+			}

+			set {

+				throw new NotImplementedException (); 

+			}

+		}

+		public Color BackColor {

+			get { 

+				throw new NotImplementedException (); 

+			}

+			set {

+				throw new NotImplementedException (); 

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AnchorStyles.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AnchorStyles.cs
new file mode 100644
index 00000000000..2b166e21061
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AnchorStyles.cs
@@ -0,0 +1,22 @@
+//

+// System.Windows.Forms.AnchorStyles.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum AnchorStyles{

+		Bottom = 2,

+		Left = 4,

+		None = 0,

+		Right = 8,

+		Top = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Appearance.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Appearance.cs
new file mode 100644
index 00000000000..9e6c25cf59c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Appearance.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.Appearance.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum Appearance {

+		Button = 0,

+		Normal = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Application.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Application.cs
new file mode 100644
index 00000000000..2adf0218a23
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Application.cs
@@ -0,0 +1,232 @@
+//

+// System.Windows.Forms.Application

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Miguel de Icaza (miguel@ximian.com)

+//	Dennis hayes (dennish@raytek.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) Ximian, Inc 2002

+//

+

+using System;

+using System.Drawing;

+using Microsoft.Win32;

+using System.ComponentModel;

+using System.Threading;

+using System.Globalization;

+using System.Reflection;

+using System.Collections;

+using System.Runtime.CompilerServices;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides static methods and properties to manage an application, 

+	/// such as methods to start and stop an application, to process 

+	/// Windows messages, and properties to get information about an 

+	/// application. This class cannot be inherited.

+	/// </summary>

+

+	[MonoTODO]

+	public sealed class Application {

+

+		//[MethodImplAttribute(MethodImplOptions.InternalCall)]

+		//extern static int GetInstance();

+

+		static private Form applicationForm;

+

+		// --- (public) Properties ---

+		[MonoTODO]

+		public static bool AllowQuit {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string CommonAppDataPath {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		// Registry key not yet defined (this should be interesting)

+		//public static RegistryKey CommonAppDataRegistry {

+		//	get { throw new NotImplementedException (); }

+		//}

+	

+		[MonoTODO]

+		public static string CompanyName {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static CultureInfo CurrentCulture {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static InputLanguage CurrentInputLanguage {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string ExecutablePath {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string LocalUserAppDataPath {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static bool MessageLoop {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string ProductName {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string ProductVersion {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string SafeTopLevelCaptionFormat {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string StartupPath {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string UserAppDataPath {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		// Registry key not yet defined

+		//public static RegistryKey UserAppDataRegistry {

+		//	get { throw new NotImplementedException (); }

+		//}

+		

+

+		private static ArrayList messageFilters = new ArrayList ();

+	

+		// --- Methods ---

+		[MonoTODO]

+		public static void AddMessageFilter (IMessageFilter value) 

+		{

+			messageFilters.Add (value);

+		}

+	

+		[MonoTODO]

+		public static void DoEvents () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static void Exit () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static void ExitThread () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static ApartmentState OleRequired () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static void OnThreadException (Exception t) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static void RemoveMessageFilter (IMessageFilter value)

+		{

+			messageFilters.Remove (value);

+		}

+

+		public static void Run ()

+		{

+

+		}

+

+		[MonoTODO]

+		public static void Run (ApplicationContext context) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		//[TypeAttributes.BeforeFieldInit]

+		public static void Run (Form context)

+		// Documents say this parameter name should be mainform, 

+		// but the verifier says context.

+		{

+			applicationForm = context;

+			int msg = 0;

+			context.Show ();

+

+			while (Win32.GetMessageA (ref msg, 0, 0, 0) != 0) {

+				Win32.TranslateMessage (ref msg);

+				Win32.DispatchMessageA (ref msg);

+			}

+		}

+		

+		// --- Events ---

+//		public static event EventHandler ApplicationExit;		

+		public static event EventHandler Idle;

+		public static event ThreadExceptionEventHandler ThreadException;

+		public static event EventHandler ThreadExit;

+

+

+

+		// The WndProc is initialized in the monostub and calls the 

+		// WndProc defined here

+		static private IntPtr _ApplicationWndProc (IntPtr hWnd, 

+							   int msg, 

+							   IntPtr wParam, 

+							   IntPtr lParam)  {

+

+ 		        Console.WriteLine ("in _ApplicationWndProc");

+ 			Message message = new Message ();

+

+ 			message.Result = (IntPtr) 0;

+			message.HWnd = hWnd;

+			message.Msg = msg;

+			message.WParam = wParam;

+			message.LParam = lParam;

+

+			IEnumerator e = messageFilters.GetEnumerator ();

+			

+			while (e.MoveNext()) {

+				IMessageFilter filter = 

+				    (IMessageFilter) e.Current;

+				if (filter.PreFilterMessage (ref message))

+					return message.Result;

+			}

+

+			//if (applicationForm != null)

+			//	applicationForm.WndProc (ref message);

+

+			return message.Result;

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ApplicationContext.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ApplicationContext.cs
new file mode 100644
index 00000000000..9fcf00f9a15
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ApplicationContext.cs
@@ -0,0 +1,83 @@
+//

+// System.Windows.Forms.ApplicationContext

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis hayes (dennish@raytek.com)

+//

+// (C) Ximian, Inc 2002

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Specifies the contextual information about an application thread.

+	///

+	/// ToDo note: Needsa Core; eg,==,!=,Gethascode,ToString.

+	/// </summary>

+

+	[MonoTODO]

+	public class ApplicationContext {

+

+		Form mainForm;

+		

+		// --- (public) Properties ---

+		public Form MainForm {

+			get { return mainForm; }

+			set { mainForm = value; }

+		}

+		

+		// --- Constructor ---

+		public ApplicationContext() 

+		{

+			mainForm=null;

+		}

+		

+		public ApplicationContext(Form mainForm) : this() 

+		{

+			this.mainForm=mainForm;

+		}

+		

+		// --- Methods ---

+		[MonoTODO]

+		public void Dispose() 

+		{

+			// see documentation on ApplicationContext.Dispose Method (Boolean)

+			this.Dispose(true);

+		}

+		

+		[MonoTODO]

+		protected virtual void Dispose(bool disposing) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ExitThread() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void ExitThreadCore() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMainFormClosed(object sender,EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// --- Methods: object ---

+		[MonoTODO]

+		~ApplicationContext() {

+			// see documentation on ApplicationContext.Dispose Method (Boolean)

+			this.Dispose(false);

+		}

+		

+		// --- Events ---

+		public event EventHandler ThreadExit;

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ArrangeDirection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ArrangeDirection.cs
new file mode 100644
index 00000000000..744c65e79e6
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ArrangeDirection.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.ArrangeDirection.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ArrangeDirection {

+		Down = 4,

+		Left = 0,

+		Right = 0,

+		Up = 4

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ArrangeStartingPosition.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ArrangeStartingPosition.cs
new file mode 100644
index 00000000000..a289f785cad
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ArrangeStartingPosition.cs
@@ -0,0 +1,22 @@
+//

+// System.Windows.Forms.ArrangeStartingPosition.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ArrangeStartingPosition {

+		BottomLeft = 0,

+		BottomRight = 1,

+		Hide = 8,

+		TopLeft = 2,

+		TopRight = 3

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AssemblyInfo.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AssemblyInfo.cs
new file mode 100644
index 00000000000..f064b9de847
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AssemblyInfo.cs
@@ -0,0 +1,61 @@
+// Used for Visual Studio only.

+// This file has nothing to do with System.Windows.Forms

+

+using System.Reflection;

+using System.Runtime.CompilerServices;

+

+//

+// General Information about an assembly is controlled through the following 

+// set of attributes. Change these attribute values to modify the information

+// associated with an assembly.

+//

+[assembly: AssemblyTitle("")]

+[assembly: AssemblyDescription("")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("")]

+[assembly: AssemblyProduct("")]

+[assembly: AssemblyCopyright("")]

+[assembly: AssemblyTrademark("")]

+[assembly: AssemblyCulture("")]		

+

+//

+// Version information for an assembly consists of the following four values:

+//

+//      Major Version

+//      Minor Version 

+//      Build Number

+//      Revision

+//

+// You can specify all the values or you can default the Revision and Build Numbers 

+// by using the '*' as shown below:

+

+[assembly: AssemblyVersion("1.0.*")]

+

+//

+// In order to sign your assembly you must specify a key to use. Refer to the 

+// Microsoft .NET Framework documentation for more information on assembly signing.

+//

+// Use the attributes below to control which key is used for signing. 

+//

+// Notes: 

+//   (*) If no key is specified, the assembly is not signed.

+//   (*) KeyName refers to a key that has been installed in the Crypto Service

+//       Provider (CSP) on your machine. KeyFile refers to a file which contains

+//       a key.

+//   (*) If the KeyFile and the KeyName values are both specified, the 

+//       following processing occurs:

+//       (1) If the KeyName can be found in the CSP, that key is used.

+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 

+//           in the KeyFile is installed into the CSP and used.

+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.

+//       When specifying the KeyFile, the location of the KeyFile should be

+//       relative to the project output directory which is

+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is

+//       located in the project directory, you would specify the AssemblyKeyFile 

+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]

+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

+//       documentation for more information on this.

+//

+[assembly: AssemblyDelaySign(false)]

+[assembly: AssemblyKeyFile("")]

+[assembly: AssemblyKeyName("")]

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/AxHost.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/AxHost.cs
new file mode 100644
index 00000000000..d4add3cf584
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/AxHost.cs
@@ -0,0 +1,438 @@
+//

+// System.Windows.Forms.AxHost

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis hayes (dennish@raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+//

+using System;

+using System.ComponentModel;

+using System.Drawing;

+using System.Runtime.Serialization;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Wraps ActiveX controls and exposes them as fully featured Windows Forms controls.

+	///

+	/// ToDo note:

+	///  - Nothing is implemented

+	/// </summary>

+	

+	[MonoTODO]

+	public abstract class AxHost : Control, ISupportInitialize, ICustomTypeDescriptor {

+

+		/// --- Constructors ---

+		/// Class AxHost does not have a constructor for non-internal purposes.

+		/// Thus, no constructor is stubbed out.

+		/// Here are the two AxHost constructors for supporting .NET Framework infrastructure:

+		/// - AxHost(String clsid);

+		/// - AxHost(string clsid,int flags);

+		

+		

+		

+		

+		/// --- public Properties ---

+		/// Properties supporting .NET framework, only. Not stubbed out:

+		///  - public bool EditMode {get;}

+		[MonoTODO]

+		public override Color BackColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public ContainerControl ContainingControl {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override ContextMenu ContextMenu {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Cursor Cursor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get { throw new NotImplementedException (); }

+		}

+		

+		//[MonoTODO]

+		public override bool Enabled {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Font Font {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Color ForeColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public bool HasAboutBox {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public AxHost.State OcxState {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		//		[MonoTODO]

+		//		//FIXME

+		//		public virtual bool RightToLeft {

+		//			get { throw new NotImplementedException (); }

+		//			set { throw new NotImplementedException (); }

+		//		}

+		

+		//		[MonoTODO]

+		//		//FIXME

+		//		ISite Site {

+		//			set { throw new NotImplementedException (); }

+		//		}

+		

+		[MonoTODO]

+		public override string Text {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		

+		

+		

+		

+		/// --- methods ---

+		/// internal .NET framework supporting methods, not stubbed out:

+		///  - protected virtual void CreateSink();

+		///  - protected virtual void DetachSink();

+		///  - public void DoVerb(int verb);

+		///  - protected static Color GetColorFromOleColor(uint color);

+		///  - protected static Font GetFontFromIFont(object font);

+		///  - protected static Font GetFontFromIFontDisp(object font);

+		///  - protected static object GetIFontDispFromFont(Font font);

+		///  - protected static object GetIFontFromFont(Font font);

+		///  - protected static object GetIPictureDispFromPicture(Image image);

+		///  - protected static object GetIPictureFromCursor(Cursor cursor);

+		///  - protected static object GetIPictureFromPicture(Image image);

+		///  - protected static double GetOADateFromTime(DateTime time);

+		///  - protected static uint GetOleColorFromColor(Color color);

+		///  - protected static Image GetPictureFromIPicture(object picture);

+		///  - protected static Image GetPictureFromIPictureDisp(object picture);

+		///  - protected static DateTime GetTimeFromOADate(double date);

+		///  - public void InvokeEditMode();

+		///  - public void MakeDirty();

+		///  - protected bool PropsValid();

+		///  - protected void RaiseOnMouseDown(short button,short shift,int x,int y);

+		///  - protected void RaiseOnMouseDown(short button,short shift,float x,float y);

+		///  - protected void RaiseOnMouseDown(object o1,object o2,object o3,object o4);

+		///  - protected void RaiseOnMouseMove(short button,short shift,int x,int y);

+		///  - protected void RaiseOnMouseMove(short button,short shift,float x,float y);

+		///  - protected void RaiseOnMouseMove(object o1,object o2,object o3,object o4);

+		///  - protected void RaiseOnMouseUp(short button,short shift,int x,int y);

+		///  - protected void RaiseOnMouseUp(short button,short shift,float x,float y);

+		///  - protected void RaiseOnMouseUp(object o1,object o2,object o3,object o4);

+		

+		[MonoTODO]

+		protected virtual void AttachInterfaces() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void BeginInit() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void CreateHandle() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void DestroyHandle() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void Dispose(bool disposing) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void EndInit() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public object GetOcx() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public bool HasPropertyPages() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool IsInputChar(char charCode) {

+			throw new NotImplementedException ();

+		}

+		

+		/// --- methods used with events ---

+		[MonoTODO]

+		protected override void OnBackColorChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnForeColorChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnLostFocus(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		/// --- END OF: methods used with events ---

+		

+		[MonoTODO]

+		public override bool PreProcessMessage(ref Message msg) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool ProcessMnemonic(char charCode) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void SetAboutBoxDelegate(AxHost.AboutBoxDelegate d) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void SetBoundsCore(int x,int y,int width,int height,BoundsSpecified specified) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void SetVisibleCore(bool value) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ShowAboutBox() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ShowPropertyPages() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ShowPropertyPages(Control control) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void WndProc(ref Message m) {

+			throw new NotImplementedException ();

+		}

+		

+		/// --- events ---

+

+		//[MonoToDo]

+		//public event EventHandler BackColorChanged;

+		//public new event EventHandler BackgroundImageChanged;

+		//public new event EventHandler BindingContextChanged;

+		//public new event UICuesEventHandler ChangeUICues;

+		//public new event EventHandler Click;

+		//public new event EventHandler ContextMenuChanged;

+		//public new event EventHandler CursorChanged;

+		//public new event EventHandler DoubleClick;

+		//public new event DragEventHandler DragDrop;

+		//public new event DragEventHandler DragEnter;

+		//public new event EventHandler DragLeave;

+		//public new event DragEventHandler DragOver;

+		//public new event EventHandler EnabledChanged;

+		//public new event EventHandler FontChanged;

+		//public new event EventHandler ForeColorChanged;

+		//public new event GiveFeedbackEventHandler GiveFeedback;

+		//public new event HelpEventHandler HelpRequested;

+		//public new event EventHandler ImeModeChanged;

+		//public new event KeyEventHandler KeyDown;

+		//public new event KeyPressEventHandler KeyPress;

+		//public new event KeyEventHandler KeyUp;

+		//public new event LayoutEventHandler Layout;

+		//public new event MouseEventHandler MouseDown;

+		//public new event EventHandler MouseEnter;

+		//public new event EventHandler MouseHover;

+		//public new event EventHandler MouseLeave;

+		//public new event MouseEventHandler MouseMove;

+		//public new event MouseEventHandler MouseUp;

+		//public new event MouseEventHandler MouseWheel;

+		//public new event PaintEventHandler Paint;

+		//public new event QueryAccessibilityHelpEventHandler QueryAccessibilityHelp;

+		//public new event QueryContinueDragEventHandler QueryContinueDrag;

+		//public new event EventHandler RightToLeftChanged;

+		//public new event EventHandler StyleChanged;

+		//public new event EventHandler TabIndexChanged;

+		//public new event EventHandler TabStopChanged;

+		//public new event EventHandler TextChanged;

+		

+		/// --- public delegates ---

+		//[Serializable]

+		protected delegate void AboutBoxDelegate();

+		

+		/// --- ICustomTypeDescriptor methods ---

+		/// Note: all of them are supporting .NET framework, but have to be stubbed out for the interface

+		

+		[MonoTODO]

+		AttributeCollection ICustomTypeDescriptor.GetAttributes() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		string ICustomTypeDescriptor.GetClassName() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		string ICustomTypeDescriptor.GetComponentName() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		TypeConverter ICustomTypeDescriptor.GetConverter() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		EventDescriptor ICustomTypeDescriptor.GetDefaultEvent() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		PropertyDescriptor ICustomTypeDescriptor.GetDefaultProperty() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		object ICustomTypeDescriptor.GetEditor(Type editorBaseType) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		EventDescriptorCollection ICustomTypeDescriptor.GetEvents() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		EventDescriptorCollection ICustomTypeDescriptor.GetEvents(Attribute[] attributes) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		PropertyDescriptorCollection ICustomTypeDescriptor.GetProperties(Attribute[] attributes) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		object ICustomTypeDescriptor.GetPropertyOwner(PropertyDescriptor pd) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		

+		/// sub-class: AxHost.InvalidActiveXStateException

+		/// <summary>

+		/// The exception that is thrown when the ActiveX control is referenced while in an invalid state.

+		/// </summary>

+		[MonoTODO]

+		public class InvalidActiveXStateException : Exception {

+

+			/// --- methods ---

+//			[MonoTODO]

+//			public override string ToString() {

+//				throw new NotImplementedException ();

+//			}

+		}

+		

+		

+		/// sub-class: AxHost.State

+		/// <summary>

+		/// Encapsulates the persisted state of an ActiveX control.

+		///

+		/// Note: the class does not contain any documented methods, just only those supporting .NET framework

+		/// </summary>

+		[MonoTODO]

+		[Serializable]

+		public class State : ISerializable {

+			

+			/// The classes only constructor is supporting .NET framework, and thus not stubbed out:

+			/// - [Serializable] public AxHost.State(Stream ms,int storageType,bool manualUpdate,string licKey);

+			

+			/// --- Methods ---

+			//[Serializable]

+			void ISerializable.GetObjectData(SerializationInfo si,StreamingContext context) 

+			{

+				throw new NotImplementedException ();

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/BaseCollection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/BaseCollection.cs
new file mode 100644
index 00000000000..14807bab7d4
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/BaseCollection.cs
@@ -0,0 +1,85 @@
+//

+// System.Windows.Forms.BaseCollection

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis hayes (dennish@raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides the base functionality for creating data-related collections in the System.Windows.Forms namespace.

+	/// ToDo note:

+	///  - Synchronization is not implemented

+	///  - MarshalByRefObject members not stubbed out

+	/// </summary>

+	

+	[MonoTODO]

+	public class BaseCollection : MarshalByRefObject, ICollection, IEnumerable {

+

+//		ArrayList list;

+//		

+//		

+//		// --- Constructor ---

+//		public BaseCollection()

+//		{

+//			this.list=null;

+//		}

+

+

+

+		// --- public and protected Properties ---

+		//virtual 

+		int ICollection.Count {

+			get {

+				throw new NotImplementedException ();

+				//return list.Count; 

+			}

+		}

+		

+		public bool IsReadOnly {

+			get { return false; }

+		}

+		

+		[MonoTODO]

+		public bool IsSynchronized {

+			// FIXME: should return true if object is synchronized

+			get { return false; }

+		}

+		

+		protected virtual ArrayList List {

+			get { 

+				throw new NotImplementedException ();

+				//return list; 

+			}

+		}

+		

+		[MonoTODO]

+		public object SyncRoot {

+			// FIXME: should return object that can be used with the C# lock keyword

+			get { return this; }

+		}

+		

+		

+		

+		// --- public Methods ---

+		public void CopyTo (Array ar, int index) 

+		{

+			throw new NotImplementedException ();

+			//list.CopyTo(ar, index);

+		}

+		

+		public IEnumerator GetEnumerator() 

+		{

+			throw new NotImplementedException ();

+			//return list.GetEnumerator();

+		}

+		

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Binding.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Binding.cs
new file mode 100644
index 00000000000..1ffad0d12e1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Binding.cs
@@ -0,0 +1,101 @@
+//

+// System.Windows.Forms.Binding.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+	public class Binding {

+

+		/// <summary>

+		/// Represents the simple binding between the property value of an object and the property value of a control.

+		///

+		/// ToDo note:

+		///  - Nothing is implemented

+		///  - MarshalByRefObject members not stubbed out

+		/// </summary>

+

+		// --- Constructor

+		//

+		public Binding(string propertyName,object dataSource,string dataMember)

+		{

+			throw new NotImplementedException ();

+		}

+

+

+		//

+		// --- Public Properties

+		//

+		[MonoTODO]

+		public BindingManagerBase BindingManagerBase  {

+

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public BindingMemberInfo BindingMemberInfo  {

+

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public Control Control  {

+

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public object DataSource  {

+

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public bool IsBinding  {

+

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public string PropertyName  {

+

+			get { throw new NotImplementedException (); }

+		}

+

+		//

+		// --- Public Methods

+		//

+		[MonoTODO]

+		protected virtual void OnFormat(ConvertEventArgs cevent)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParse(ConvertEventArgs cevent)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		// --- Public Events

+		//

+		[MonoTODO]

+		public event ConvertEventHandler Format {

+

+			add { throw new NotImplementedException (); }

+			remove { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public event ConvertEventHandler Parse {

+

+			add { throw new NotImplementedException (); }

+			remove { throw new NotImplementedException (); }

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingContext.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingContext.cs
new file mode 100644
index 00000000000..0bab6b58182
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingContext.cs
@@ -0,0 +1,87 @@
+//

+// System.Windows.Forms.BindingContext.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	public class BindingContext {

+

+		/// <summary>

+		/// Manages the collection of BindingManagerBase objects for any object that inherits from the Control class.

+		/// </summary>

+

+		// --- Constructor

+		[MonoTODO]

+		public BindingContext ()

+		{

+			throw new NotImplementedException ();

+		}

+

+

+		//

+		// --- Public Properties

+		// Following properties not stubbed out, because they are only supporting internal .NET Framework infrastructure.

+		// - bool IsReadOnly {get;}

+		[MonoTODO]

+		public BindingManagerBase this[object dataSource]  {

+

+			get { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		public BindingManagerBase this[object dataSource,string dataMember]  {

+

+			get { throw new NotImplementedException (); }

+		}

+

+		//

+		// --- Methods

+		// Following methods not stubbed out, because they are only supporting internal .NET Framework infrastructure.

+		// - protected virtual void AddCore(object dataSource,BindingManagerBase listManager)

+		// - protected virtual void ClearCore()

+		// - void ICollection.CopyTo(Array ar,int index)

+		// - IEnumerator IEnumerable.GetEnumerator()

+		// - protected virtual void OnCollectionChanged(CollectionChangeEventArgs ccevent)

+		// - protected virtual void RemoveCore(object dataSource)

+		[MonoTODO]

+		protected internal void Add(object dataSource, BindingManagerBase listManager)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected internal void Clear()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool Contains(object dataSource)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool Contains(object dataSource,string dataMember)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected internal void Remove(object dataSource)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		// --- Public Events

+		// Following events not stubbed out, because they are only supporting internal .NET Framework infrastructure

+		public event CollectionChangeEventHandler CollectionChanged;

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingManagerBase.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingManagerBase.cs
new file mode 100644
index 00000000000..665a812f662
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingManagerBase.cs
@@ -0,0 +1,125 @@
+//

+// System.Windows.Forms.BindingManagerBase.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+

+using System.ComponentModel;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	[MonoTODO]

+	public abstract class BindingManagerBase {

+

+

+		/// <summary>

+		/// Manages all Binding objects that are bound to the same data source and data member. This class is abstract.

+		/// </summary>

+

+		// --- Constructor

+		[MonoTODO]

+		public BindingManagerBase ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		//

+		// --- Fields

+		protected EventHandler onCurrentChangedHandler;

+		protected EventHandler onPositionChangedHandler;

+

+

+		//

+		// --- Public Properties

+		[MonoTODO]

+		public BindingsCollection Bindings  {

+

+			get { throw new NotImplementedException (); }

+		}

+		

+		public abstract int Count  {

+

+			get;

+		}

+

+		public abstract object Current  {

+

+			get;

+		}

+

+		public abstract int Position  {

+

+			get;

+			set;

+		}

+

+

+

+		//

+		// --- Methods

+		public abstract void AddNew();

+

+		public abstract void CancelCurrentEdit();

+

+		public abstract void EndCurrentEdit();

+

+		public abstract PropertyDescriptorCollection GetItemProperties ();

+

+		[MonoTODO]

+		protected internal virtual PropertyDescriptorCollection GetItemProperties (ArrayList dataSources,ArrayList listAccessors)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual PropertyDescriptorCollection GetItemProperties (Type listType,int offset,ArrayList dataSources,ArrayList listAccessors)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//protected abstract string GetListName(ArrayList listAccessors);

+		protected internal abstract string GetListName(ArrayList listAccessors);

+

+		protected internal abstract void OnCurrentChanged(EventArgs e); 

+

+		[MonoTODO]

+		protected void PullData()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected void PushData()

+		{

+			throw new NotImplementedException ();

+		}

+

+		public abstract void RemoveAt(int index);

+

+		public abstract void ResumeBinding();

+

+		public abstract void SuspendBinding();

+

+		protected abstract void UpdateIsBinding();

+

+

+		//

+		// --- Public Events

+		[MonoTODO]

+		public event EventHandler CurrentChanged {

+			add { throw new NotImplementedException (); }

+			remove { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		public event EventHandler PositionChanged {

+			add { throw new NotImplementedException (); }

+			remove { throw new NotImplementedException (); }

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingMemberInfo.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingMemberInfo.cs
new file mode 100644
index 00000000000..f4268a7319a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingMemberInfo.cs
@@ -0,0 +1,149 @@
+//

+// System.Drawing.BindingMemberInfo.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+//TODO:

+// 1) Add real values in constructor.

+// 2) Verify nocheck needed in GetHashCode.

+// 3) Verify GetHashCode returns decent and valid hash.

+

+

+using System;

+using System.Windows.Forms;

+namespace System.Windows.Forms {

+	

+	public struct BindingMemberInfo { 

+

+		private string bindingfield;

+		private string bindingpath;

+		private string bindingmember;

+

+		// -----------------------

+		// Public Constructor

+		// -----------------------

+

+		/// <summary>

+		/// 

+		/// </summary>

+		///

+		/// <remarks>

+		///

+		/// </remarks>

+		

+		public BindingMemberInfo (string dataMember)

+		{

+			//TODO: Initilize with real values.

+			bindingmember =  ("");

+			bindingfield =  ("");

+			bindingpath =  ("");

+		}

+

+		// -----------------------

+		// Public Shared Members

+		// -----------------------

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two BindingMemberInfo objects. The return value is

+		///	based on the equivalence of the BindingMember, BindingPath,

+		///	and BindingMember  properties of the two objects.

+		/// </remarks>

+

+		public static bool operator == (BindingMemberInfo bmi_a, 

+			BindingMemberInfo bmi_b) {

+

+			return ((bmi_a.bindingfield == bmi_b.bindingfield) &&

+				(bmi_a.bindingpath == bmi_b.bindingpath)&&

+				(bmi_a.bindingmember == bmi_b.bindingmember));

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two BindingMemberInfo objects. The return value is

+		///	based on the equivalence of the BindingMember, BindingPath,

+		///	and BindingMember  properties of the two objects.

+		/// </remarks>

+		public static bool operator != (BindingMemberInfo bmi_a, 

+			BindingMemberInfo bmi_b) {

+			return ((bmi_a.bindingfield != bmi_b.bindingfield) ||

+				(bmi_a.bindingpath != bmi_b.bindingpath)||

+				(bmi_a.bindingmember != bmi_b.bindingmember));

+		}

+		

+		// -----------------------

+		// Public Instance Members

+		// -----------------------

+

+

+		public string BindingField {

+			get{

+				return bindingfield;

+			}

+		}

+

+		public string BindingPath {

+			get{

+				return bindingpath;

+			}

+		}

+

+		public string BindingMember {

+			get{

+				return bindingmember;

+			}

+		}

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this BindingMemberInfo and another object.

+		/// </remarks>

+		

+		public override bool Equals (object obj)

+		{

+			if (!(obj is BindingMemberInfo))

+				return false;

+

+			return (this == (BindingMemberInfo) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		

+		public override int GetHashCode ()

+		{

+			unchecked{// MONOTODO: This should not be checked, remove unchecked, if redundant.

+				return (int)( bindingfield.GetHashCode() ^ bindingmember.GetHashCode() ^ bindingpath.GetHashCode());

+			}

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the BindingMemberInfo as a string.

+		/// </remarks>

+		

+		public override string ToString ()

+		{

+			return String.Format ("[{0},{1},{2}]", bindingpath, bindingfield, bindingmember);

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingsCollection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingsCollection.cs
new file mode 100644
index 00000000000..547bb59a80c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/BindingsCollection.cs
@@ -0,0 +1,134 @@
+//

+// System.Windows.Forms.BindingsCollection.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Collections;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents a collection of Binding objects for a control.

+	///

+	/// ToDo note:

+	///  - most methods are not implemented

+	///  - those few that are implemented need checking

+	/// </summary>

+	

+	[MonoTODO]

+	public class BindingsCollection : BaseCollection {

+

+		#region Constructors

+		protected internal BindingsCollection () 

+		{

+		}

+		#endregion

+

+		// --- public and protected Properties ---

+		[MonoTODO]

+//		//FIXME

+		public virtual int Count {

+			get {

+				throw new NotImplementedException ();

+				//return base.Count;

+			}

+		}

+		

+		[MonoTODO]

+		public Binding this[int index] {

+			// CHECKME:

+			get {

+				return (Binding)(base.List[index]);

+			}

+		}

+		

+		[MonoTODO]

+		protected override ArrayList List {

+			// CHECKME:

+			get {

+				return base.List;

+ }

+		}

+		

+		

+		

+		// --- public Methods ---

+		// following internal methods are (will) not be stubbed out:

+		// - protected virtual void AddCore(Binding dataBinding);

+		// - protected virtual void ClearCore();

+		// - protected virtual void RemoveCore(Binding dataBinding);

+		// 

+		// CollectionChanged event:

+		// Though it was not documented, here methods Add and Remove 

+		// cause the CollectionChanged event to occur, similarily as Clear.

+		// Would be nice if someone checked the exact event behavior of .NET implementation.

+		

+		[MonoTODO]

+		protected internal void Add(Binding binding) 

+		{

+			// CHECKME:

+			base.List.Add(binding);

+			OnCollectionChanged(new CollectionChangeEventArgs(

+				CollectionChangeAction.Add,

+				base.List

+			));

+		}

+		

+		[MonoTODO]

+		protected internal void Clear() 

+		{

+			// CHECKME:

+			base.List.Clear();

+			OnCollectionChanged(new CollectionChangeEventArgs(

+				CollectionChangeAction.Refresh,

+				base.List

+			));

+		}

+

+		[MonoTODO]

+		protected virtual void OnCollectionChanged(CollectionChangeEventArgs ccevent) 

+		{

+			// CHECKME:

+			if (CollectionChanged != null)

+				CollectionChanged(this, ccevent);

+		}

+

+		[MonoTODO]

+		protected internal void Remove(Binding binding) 

+		{

+			// CHECKME:

+			base.List.Remove(binding);

+			OnCollectionChanged(new CollectionChangeEventArgs(

+				CollectionChangeAction.Remove,

+				base.List

+			));

+		}

+

+		[MonoTODO]

+		protected internal void RemoveAt(int index) 

+		{

+			// CHECKME:

+			base.List.RemoveAt(index);

+			OnCollectionChanged(new CollectionChangeEventArgs(

+				CollectionChangeAction.Remove,

+				base.List

+			));

+		}

+		

+		protected internal bool ShouldSerializeMyAll() 

+		{

+			throw new NotImplementedException ();

+			//if (this.Count>0) return true;

+			//else return false;

+		}

+		

+		// public events

+		public event CollectionChangeEventHandler CollectionChanged;

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/BootMode.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/BootMode.cs
new file mode 100644
index 00000000000..c837768bf2b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/BootMode.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.BootMode.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum BootMode {

+		FailSafe = 1,

+		FailSafeWithNetwork = 2,

+		Normal = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Border3DSide.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Border3DSide.cs
new file mode 100644
index 00000000000..5169430f8de
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Border3DSide.cs
@@ -0,0 +1,23 @@
+//

+// System.Windows.Forms.Border3DSide.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum Border3DSide {

+		All = 2063,

+		Bottom = 8,

+		Left = 1,

+		Middle = 2048,

+		Right = 4,

+		Top = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Border3DStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Border3DStyle.cs
new file mode 100644
index 00000000000..47ce12902f0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Border3DStyle.cs
@@ -0,0 +1,27 @@
+//

+// System.Windows.Forms.Border3DStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum Border3DStyle {

+		Adjust = 8192,

+		Bump = 9,

+		Etched = 6,

+		Flat = 16394,

+		Raised = 5,

+		RaisedInner = 4,

+		RaisedOuter = 1,

+		Sunken = 10,

+		SunkenInner = 8,

+		SunkenOuter = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/BorderStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/BorderStyle.cs
new file mode 100644
index 00000000000..ae105c61d4c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/BorderStyle.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.BorderStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum BorderStyle {

+		Fixed3D = 2,

+		FixedSingle = 1,

+		None = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/BoundsSpecified.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/BoundsSpecified.cs
new file mode 100644
index 00000000000..797552920e0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/BoundsSpecified.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.BoundsSpecified.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum BoundsSpecified {

+		All = 15,

+		Height = 8,

+		Location = 3,

+		None = 0,

+		Size = 12,

+		Width = 4,

+		X = 1,

+		Y = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ButtonBorderStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ButtonBorderStyle.cs
new file mode 100644
index 00000000000..2ae296ecae4
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ButtonBorderStyle.cs
@@ -0,0 +1,23 @@
+//

+// System.Windows.Forms.ButtonBorderStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ButtonBorderStyle {

+		Dashed = 2,

+		Dotted = 1,

+		Inset = 4,

+		None = 0,

+		Outset = 5,

+		Solid = 3

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ButtonState.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ButtonState.cs
new file mode 100644
index 00000000000..b2f4313eda6
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ButtonState.cs
@@ -0,0 +1,23 @@
+//

+// System.Windows.Forms.ButtonState.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ButtonState {

+		All = 181176,

+		Checked = 1024,

+		Flat = 16384,

+		Inactive = 256,

+		Normal = 0,

+		Pushed = 512

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/CaptionButton.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/CaptionButton.cs
new file mode 100644
index 00000000000..e93ad47be97
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/CaptionButton.cs
@@ -0,0 +1,29 @@
+//

+// System.Windows.Forms.CaptionButton.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+	/// Specifies the type of caption button to display.

+	/// </summary>

+

+	//[Serializable]

+	public enum CaptionButton {

+

+		//Values were verified with enumcheck.

+		Close = 0,

+		Minimize = 1,

+		Maximize = 2,

+		Restore = 3,

+		Help = 4,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ChangeLog b/mcs/class/System.Windows.Forms/System.Windows.Forms/ChangeLog
new file mode 100644
index 00000000000..b2dac41700d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ChangeLog
@@ -0,0 +1,1562 @@
+2002-8-6  DennisHayes <dennish@raytek.com>

+* Checked in for Ginandrea Terzi (gterzi@lario.com)

+

+* MeasureItemEventArgs.cs

+* PropertyValueChangedEventArgs.cs

+* ScrollEventArgs.cs

+* ScrollEventType.cs

+* SelectionMode.cs

+* Shortcut.cs

+* TickStyle.cs

+* ToolBarButtonClickEventArgs.cs

+* TreeViewAction.cs

+* TriangleDirection.cs

+* UICues.cs

+* UICuesEventArgs.cs

+* UpDownBase.cs

+* UpDownEventHandler.cs

+* Fixed syntax errors and verifier errors

+

+2002-8-6  DennisHayes <dennish@raytek.com>

+

+* PropertyTabChangedEventArgs.cs

+* Minor sytax bug fixes.

+

+* System.Windows.Forms.csproj

+* System.Windows.Forms.csproj.user

+* System.Windows.Forms.sln

+* Added support for System.Windows.Forms.Design

+* Builds two dlls instead of one.

+* Allows compiling for now, but needs to be fixed

+

+2002-8-2  DennisHayes <dennish@raytek.com>

+* Checked in for Ginandrea Terzi (gterzi@lario.com)

+

+* AssemblyInfo.cs

+* ColumnClickEventArgs.cs

+* ContentsResizedEventArgs.cs

+* ControlEventArgs.cs

+* ConvertEventArgs.cs

+* DateBoldEventArgs.cs

+* DateRangeEventArgs.cs

+* DragEventArgs.cs

+* DrawItemEventArgs.cs

+* GiveFeedbackEventArgs.cs

+* HelpEventArgs.cs

+* InputLanguageChangedEventArgs.cs

+* InputLanguageChangingEventArgs.cs

+* InvalidateEventArgs.cs

+* ItemChangedEventArgs.cs

+* ItemCheckEventArgs.cs

+* ItemDragEventArgs.cs

+* KeyEventArgs.cs

+* KeyPressEventArgs.cs

+* LabelEditEventArgs.cs

+* LayoutEventArgs.cs

+* LinkClickedEventArgs.cs

+* LinkLabelLinkClickedEventArgs.cs

+* logfile.txt

+* MeasureItemEventArgs.cs

+* MouseEventArgs.cs

+* NavigateEventArgs.cs

+* NodeLabelEditEventArgs.cs

+* PaintEventArgs.cs

+* PropertyTabChangedEventArgs.cs

+* PropertyValueChangedEventArgs.cs

+* QueryAccessibilityHelpEventArgs.cs

+* QueryContinueDragEventArgs.cs

+* ScrollEventArgs.cs

+* SelectedGridItemChangedEventArgs.cs

+* SplitterEventArgs.cs

+* StatusBarDrawItemEventArgs.cs

+* StatusBarPanelClickEventArgs.cs

+* ToolBarButtonClickEventArgs.cs

+* TreeViewCancelEventArgs.cs

+* UICuesEventArgs.cs

+* UpDownEventArgs.cs

+* Improved ToString functions

+* Completed the rest of the *.args classes

+

+2002-8-1  DennisHayes <dennish@raytek.com>

+* Checked in for Ginandrea Terzi (gterzi@lario.com)

+

+* KeyEventArgs.cs

+* KeyPressEventArgs.cs

+* LabelEditEventArgs.cs

+* LayoutEventArgs.cs

+* LinkClickedEventArgs.cs

+* LinkLabelLinkClickedEventArgs.cs

+* MeasureItemEventArgs.cs

+* MouseEventArgs.cs

+* NavigateEventArgs.cs

+* NodeLabelEditEventArgs.cs

+* PaintEventArgs.cs

+* PropertyTabChangedEventArgs.cs

+* PropertyValueChangedEventArgs.cs

+* QueryAccessibilityHelpEventArgs.cs

+* QueryContinueDragEventArgs.cs

+* ScrollEventArgs.cs

+* SelectedGridItemChangedEventArgs.cs

+* SplitterEventArgs.cs

+* StatusBarDrawItemEventArgs.cs

+* StatusBarPanelClickEventArgs.cs

+* ToolBarButtonClickEventArgs.cs

+* TreeViewCancelEventArgs.cs

+* UICuesEventArgs.cs

+* UpDownEventArgs.cs

+* Corrected, cleaned up/ completed some *args.cs classes.

+* May break build, but should be easy to fix, will verifiy

+*   tonight and check in any needed fixes.

+

+2002-8-1  DennisHayes <dennish@raytek.com>

+* MonthCalendar.cs

+* ButtonBase.cs

+* Form.cs

+* MonthCalendar commented out, stubbs need work

+* GTK references removed from Buttonbase and form, to make compile easier.

+* Replace GTK references as soon as build works on Windows and Linux.

+* With this, SWF should compile uder visual studio

+

+2002-8-1  DennisHayes <dennish@raytek.com>

+* TODOAttribute.cs

+* ComVisible.cs

+* added so the namespace can compile, remove when replaced with mono equivalents.

+

+2002-8-1  DennisHayes <dennish@raytek.com>

+* System.Windows.Forms.csproj

+* System.Windows.Forms.csproj.user

+* System.Windows.Forms.sln

+* AssemblyInfo.cs * Not sure if this file is needed. not a part of the namespace, just visual studio

+* Added files to compile using visual Studio

+

+2002-8-1  DennisHayes <dennish@raytek.com>

+* Getopt.cs

+* removed, file contained only trash, not needed.

+

+

+2002-7-30  DennisHayes <dennish@raytek.com>

+

+* AccessibleNavigation.cs

+* AccessibleObject.cs

+* AccessibleSelection.cs

+* AmbientProperties.cs

+* Application.cs

+* ApplicationContext.cs

+* AxHost.cs

+* BaseCollection.cs

+* Binding.cs

+* BindingContext.cs

+* BindingManagerBase.cs

+* BindingMemberInfo.cs

+* BindingsCollection.cs

+* Button.cs

+* ButtonBase.cs

+* CaptionButton.cs

+* CharacterCasing.cs

+* CheckBox.cs

+* CheckedListBox.cs

+* CheckState.cs

+* Clipboard.cs

+* ColorDialog.cs

+* ColumnClickEventArgs.cs

+* ColumnClickEventHandler.cs

+* ColumnHeader.cs

+* ComboBox.cs

+* CommonDialog.cs

+* ContainerControl.cs

+* ContentsResizedEventHandler.cs

+* ContextMenu.cs

+* Control.cs

+* ControlBindingsCollection.cs

+* ControlEventArgs.cs

+* ControlEventHandler.cs

+* ControlPaint.cs

+* ConvertEventHandler.cs

+* CreateParams.cs

+* CurrencyManager.cs

+* Cursor.cs

+* CursorConverter.cs

+* Cursors.cs

+* DataFormats.cs

+* DataGrid.cs

+* DataGridBoolColumn.cs

+* DataGridCell.cs

+* DataGridColumnStyle.cs

+* DataGridParentRowsLabelStyle.cs

+* DataGridPreferredColumnWidthTypeConverter.cs

+* DataGridTableStyle.cs

+* DataGridTextBox.cs

+* DataGridTextBoxColumn.cs

+* DataObject.cs

+* DateBoldEventArgs.cs

+* DateRangeEventArgs.cs

+* DateRangeEventHandler.cs

+* DateTimePicker.cs

+* DialogResult.cs

+* DockStyle.cs

+* DomainUpDown.cs

+* DragAction.cs

+* DragDropEffects.cs

+* DragEventArgs.cs

+* DragEventHandler.cs

+* DrawItemEventArgs.cs

+* DrawItemEventHandler.cs

+* DrawItemState.cs

+* DrawMode.cs

+* ErrorBlinkStyle.cs

+* ErrorIconAlignment.cs

+* ErrorProvider.cs

+* FeatureSupport.cs

+* FileDialog.cs

+* FlatStyle.cs

+* FontDialog.cs

+* Form.cs

+* FormBorderStyle.cs

+* FormStartPosition.cs

+* FormWindowState.cs

+* FrameStyle.cs

+* GiveFeedbackEventHandler.cs

+* GridColumnStylesCollection.cs

+* GridItemCollection.cs

+* GridTableStylesCollection.cs

+* GroupBox.cs

+* Help.cs

+* HelpEventHandler.cs

+* HelpProvider.cs

+* HScrollBar.cs

+* ImageIndexConverter.cs

+* ImageList.cs

+* ImageListStreamer.cs

+* InputLanguage.cs

+* InputLanguageChangedEventHandler.cs

+* InputLanguageChangingEventHandler.cs

+* InputLanguageCollection.cs

+* InvalidateEventHandler.cs

+* ItemChangedEventArgs.cs

+* ItemChangedEventHandler.cs

+* ItemCheckEventHandler.cs

+* ItemDragEventHandler.cs

+* KeyEventHandler.cs

+* KeyPressEventArgs.cs

+* KeyPressEventHandler.cs

+* KeysConverter.cs

+* Label.cs

+* LabelEditEventHandler.cs

+* LayoutEventHandler.cs

+* LinkArea.cs

+* LinkClickedEventHandler.cs

+* LinkLabel.cs

+* LinkLabelLinkClickedEventHandler.cs

+* ListBindingConverter.cs

+* ListBox.cs

+* ListControl.cs

+* ListView.cs

+* ListViewItem.cs

+* ListViewItemConverter.cs

+* logfile.txt

+* MainMenu.cs

+* MeasureItemEventHandler.cs

+* Menu.cs

+* MenuItem.cs

+* Message.cs

+* MessageBox.cs

+* MethodInvoker.cs

+* MonthCalendar.cs

+* MouseEventHandler.cs

+* NativeWindow.cs

+* NavigateEventHandler.cs

+* NodeLabelEditEventHandler.cs

+* NotifyIcon.cs

+* NumericUpDown.cs

+* OpacityConverter.cs

+* OpenFileDialog.cs

+* OSFeature.cs

+* PageSetupDialog.cs

+* PaintEventArgs.cs

+* PaintEventHandler.cs

+* Panel.cs

+* PrintControllerWithStatusDialog.cs

+* PrintDialog.cs

+* PrintPreviewControl.cs

+* PrintPreviewDialog.cs

+* ProgressBar.cs

+* PropertyGrid.cs

+* PropertyManager.cs

+* PropertyTabChangedEventArgs.cs

+* PropertyTabChangedEventHandler.cs

+* PropertyValueChangedEventHandler.cs

+* QueryAccessibilityHelpEventHandler.cs

+* QueryContinueDragEventHandler.cs

+* RadioButton.cs

+* RichTextBox.cs

+* SaveFileDialog.cs

+* Screen.cs

+* ScrollableControl.cs

+* ScrollBar.cs

+* ScrollEventArgs.cs

+* ScrollEventHandler.cs

+* SelectedGridItemChangedEventHandler.cs

+* SelectionRange.cs

+* SelectionRangeConverter.cs

+* SendKeys.cs

+* Splitter.cs

+* SplitterEventHandler.cs

+* StatusBar.cs

+* StatusBarDrawItemEventArgs.cs

+* StatusBarDrawItemEventHandler.cs

+* StatusBarPanel.cs

+* StatusBarPanelClickEventArgs.cs

+* StatusBarPanelClickEventHandler.cs

+* StatusBarPanelCollection.cs

+* SystemInformation.cs

+* TabControl.cs

+* TabPage.cs

+* TextBox.cs

+* TextBoxBase.cs

+* ThreadExceptionDialog.cs

+* Timer.cs

+* ToolBar.cs

+* ToolBarButton.cs

+* ToolBarButtonClickEventHandler.cs

+* ToolTip.cs

+* TrackBar.cs

+* TreeNode.cs

+* TreeNodeCollection.cs

+* TreeNodeConverter.cs

+* TreeView.cs

+* TreeViewCancelEventHandler.cs

+* TreeViewEventHandler.cs

+* TreeViewImageIndexConverter.cs

+* UICuesEventArgs.cs

+* UICuesEventHandler.cs

+* UpDownBase.cs

+* UpDownEventHandler.cs

+* UserControl.cs

+* VScrollBar.cs

+* Fixed errors reported by verify.exe, mostly attribute errors.

+* Added my name to author's list to files I edited in the last two weeks

+

+2002-7-22  DennisHayes <dennish@raytek.com>

+

+* DateTimePickerFormat.cs

+* Added values.

+* The NAMESPACE NOW COMPILES under windows in Visual Studio using the Microsoft version of the classes.

+* Verify.exe reports 600 errors.

+

+2002-7-21  DennisHayes <dennish@raytek.com>

+

+* AccessibleObject.cs

+* AmbientProperties.cs

+* AxHost.cs

+* BaseCollection.cs

+* BindingsCollection.cs

+* ButtonBase.cs

+* CheckBox.cs

+* CheckedListBox.cs

+* ComboBox.cs

+* ContainerControl.cs

+* ContextMenu.cs

+* Control.cs

+* ControlEventArgs.cs

+* ControlPaint.cs

+* ConvertEventArgs.cs

+* DataGrid.cs

+* DataGridColumnStyle.cs

+* DataObject.cs

+* DateTimePicker.cs

+* DomainUpDown.cs

+* DragEventArgs.cs

+* DrawItemEventArgs.cs

+* ErrorProvider.cs

+* FeatureSupport.cs

+* FileDialog.cs

+* FontDialog.cs

+* Form.cs

+* GiveFeedbackEventArgs.cs

+* GridColumnStylesCollection.cs

+* GridItem.cs

+* GridItemCollection.cs

+* GridTableStylesCollection.cs

+* GroupBox.cs

+* Help.cs

+* HelpEventArgs.cs

+* HelpProvider.cs

+* HScrollBar.cs

+* ImageIndexConverter.cs

+* ImageList.cs

+* ImageListStreamer.cs

+* InputLanguage.cs

+* InputLanguageChangedEventArgs.cs

+* InputLanguageChangingEventArgs.cs

+* InputLanguageCollection.cs

+* InvalidateEventArgs.cs

+* ItemChangedEventArgs.cs

+* ItemCheckEventArgs.cs

+* ItemDragEventArgs.cs

+* KeyEventArgs.cs

+* KeyPressEventArgs.cs

+* KeysConverter.cs

+* Label.cs

+* LabelEditEventArgs.cs

+* LayoutEventArgs.cs

+* LinkArea.cs

+* LinkClickedEventArgs.cs

+* LinkLabel.cs

+* LinkLabelLinkClickedEventArgs.cs

+* LinkLabelLinkClickedEventHandler.cs

+* ListBindingConverter.cs

+* ListBox.cs

+* ListControl.cs

+* ListView.cs

+* ListViewItem.cs

+* ListViewItemConverter.cs

+* MainMenu.cs

+* MeasureItemEventArgs.cs

+* Menu.cs

+* MenuItem.cs

+* Message.cs

+* MessageBox.cs

+* MouseEventArgs.cs

+* NativeWindow.cs

+* NavigateEventArgs.cs

+* NodeLabelEditEventArgs.cs

+* NotifyIcon.cs

+* NumericUpDown.cs

+* OpacityConverter.cs

+* OpenFileDialog.cs

+* OSFeature.cs

+* PageSetupDialog.cs

+* PaintEventArgs.cs

+* Panel.cs

+* PrintControllerWithStatusDialog.cs

+* PrintDialog.cs

+* PrintPreviewDialog.cs

+* QueryAccessibilityHelpEventArgs.cs

+* QueryContinueDragEventArgs.cs

+* RadioButton.cs

+* RichTextBox.cs

+* SaveFileDialog.cs

+* Screen.cs

+* ScrollableControl.cs

+* ScrollBar.cs

+* ScrollEventArgs.cs

+* SelectedGridItemChangedEventArgs.cs

+* SelectionRange.cs

+* SelectionRangeConverter.cs

+* SendKeys.cs

+* Splitter.cs

+* SplitterEventArgs.cs

+* StatusBar.cs

+* StatusBarDrawItemEventArgs.cs

+* StatusBarPanelCollection.cs

+* TabControl.cs

+* TabPage.cs

+* TextBox.cs

+* TextBoxBase.cs

+* ToolBar.cs

+* ToolBarButtonClickEventArgs.cs

+* ToolTip.cs

+* TrackBar.cs

+* TreeNodeCollection.cs

+* TreeView.cs

+* UserControl.cs

+* commented out inherited class that did not need to be stubbed.

+* fixed bugs, added values to one enum. Stubbed interfaces.

+* The NAMESPACE NOW COMPILES under windows in Visual Studio using the Microsoft version of the classes.

+* Verify.exe reports 600 errors.

+

+2002-7-7  DennisHayes <dennish@raytek.com>

+

+* ToolBarButtonClickEventArgs.cs 

+* UpDownEventArgs.cs 

+* KeyPressEventHandler.cs

+* Added new files.

+

+2002-7-7  DennisHayes <dennish@raytek.com>

+

+* AccessibleEvents.cs

+* AccessibleNavigation.cs

+* AccessibleObject.cs

+* AccessibleRole.cs

+* AccessibleSelection.cs

+* AccessibleStates.cs

+* AmbientProperties.cs

+* AnchorStyles.cs

+* Appearance.cs

+* Application.cs

+* ApplicationContext.cs

+* ArrangeDirection.cs

+* ArrangeStartingPosition.cs

+* AxHost.cs

+* BaseCollection.cs

+* Binding.cs

+* BindingContext.cs

+* BindingManagerBase.cs

+* BindingMemberInfo.cs

+* BindingsCollection.cs

+* BootMode.cs

+* Border3DSide.cs

+* Border3DStyle.cs

+* BorderStyle.cs

+* BoundsSpecified.cs

+* Button.cs

+* ButtonBase.cs

+* ButtonBorderStyle.cs

+* ButtonState.cs

+* CaptionButton.cs

+* CharacterCasing.cs

+* CheckBox.cs

+* CheckedListBox.cs

+* CheckState.cs

+* Clipboard.cs

+* ColorDepth.cs

+* ColorDialog.cs

+* ColumnClickEventArgs.cs

+* ColumnClickEventHandler.cs

+* ColumnHeader.cs

+* ColumnHeaderStyle.cs

+* ComboBox.cs

+* ComboBoxStyle.cs

+* CommonDialog.cs

+* ComVisible.cs

+* ContainerControl.cs

+* ContentsResizedEventArgs.cs

+* ContentsResizedEventHandler.cs

+* ContextMenu.cs

+* Control.cs

+* ControlBindingsCollection.cs

+* ControlEventArgs.cs

+* ControlEventHandler.cs

+* ControlPaint.cs

+* ControlStyles.cs

+* ConvertEventArgs.cs

+* ConvertEventHandler.cs

+* CreateParams.cs

+* CurrencyManager.cs

+* Cursor.cs

+* CursorConverter.cs

+* Cursors.cs

+* DataFormats.cs

+* DataGrid.cs

+* DataGridBoolColumn.cs

+* DataGridCell.cs

+* DataGridColumnStyle.cs

+* DataGridLineStyle.cs

+* DataGridParentRowsLabelStyle.cs

+* DataGridPreferredColumnWidthTypeConverter.cs

+* DataGridTableStyle.cs

+* DataGridTextBox.cs

+* DataGridTextBoxColumn.cs

+* DataObject.cs

+* DateBoldEventArgs.cs

+* DateRangeEventArgs.cs

+* DateRangeEventHandler.cs

+* DateTimePicker.cs

+* DateTimePickerFormat.cs

+* day.cs

+* DialogResult.cs

+* DockStyle.cs

+* DomainUpDown.cs

+* DragAction.cs

+* DragDropEffects.cs

+* DragEventArgs.cs

+* DragEventHandler.cs

+* DrawItemEventArgs.cs

+* DrawItemEventHandler.cs

+* DrawItemState.cs

+* DrawMode.cs

+* ErrorBlinkStyle.cs

+* ErrorIconAlignment.cs

+* ErrorProvider.cs

+* FeatureSupport.cs

+* FileDialog.cs

+* FlatStyle.cs

+* FontDialog.cs

+* Form.cs

+* FormBorderStyle.cs

+* FormStartPosition.cs

+* FormWindowState.cs

+* FrameStyle.cs

+* Getopt.cs

+* GiveFeedbackEventArgs.cs

+* GiveFeedbackEventHandler.cs

+* GridColumnStylesCollection.cs

+* GridItem.cs

+* GridItemCollection.cs

+* GridItemType.cs

+* GridTableStylesCollection.cs

+* GroupBox.cs

+* Help.cs

+* HelpEventArgs.cs

+* HelpEventHandler.cs

+* HelpNavigator.cs

+* HelpProvider.cs

+* HorizontalAlignment.cs

+* HScrollBar.cs

+* IButtonControl.cs

+* ICommandExecutor.cs

+* IComponentEditorPageSite.cs

+* IContainerControl.cs

+* IDataGridColumnStyleEditingNotificationService.cs

+* IDataGridEditingService.cs

+* IDataObject.cs

+* IFeatureSupport.cs

+* IFileReaderService.cs

+* ImageIndexConverter.cs

+* ImageList.cs

+* ImageListStreamer.cs

+* ImeMode.cs

+* IMessageFilter.cs

+* InputLanguage.cs

+* InputLanguageChangedEventArgs.cs

+* InputLanguageChangedEventHandler.cs

+* InputLanguageChangingEventArgs.cs

+* InputLanguageChangingEventHandler.cs

+* InputLanguageCollection.cs

+* InvalidateEventArgs.cs

+* InvalidateEventHandler.cs

+* ItemActivation.cs

+* ItemBoundsPortion.cs

+* ItemChangedEventArgs.cs

+* ItemChangedEventHandler.cs

+* ItemCheckEventArgs.cs

+* ItemCheckEventHandler.cs

+* ItemDragEventArgs.cs

+* ItemDragEventHandler.cs

+* IWin32Window.cs

+* IWindowTarget.cs

+* KeyEventArgs.cs

+* KeyEventHandler.cs

+* KeyPressEventArgs.cs

+* KeyPressEventHandler.cs

+* Keys.cs

+* KeysConverter.cs

+* Label.cs

+* LabelEditEventArgs.cs

+* LabelEditEventHandler.cs

+* LayoutEventArgs.cs

+* LayoutEventHandler.cs

+* LeftRightAlignment.cs

+* LinkArea.cs

+* LinkBehavior.cs

+* LinkClickedEventArgs.cs

+* LinkClickedEventHandler.cs

+* LinkLabel.cs

+* LinkLabelLinkClickedEventArgs.cs

+* LinkLabelLinkClickedEventHandler.cs

+* LinkState.cs

+* ListBindingConverter.cs

+* ListBox.cs

+* ListControl.cs

+* ListView.cs

+* ListViewAlignment.cs

+* ListViewItem.cs

+* ListViewItemConverter.cs

+* MainMenu.cs

+* MdiLayout.cs

+* MeasureItemEventArgs.cs

+* MeasureItemEventHandler.cs

+* Menu.cs

+* MenuGlyph.cs

+* MenuItem.cs

+* MenuMerge.cs

+* Message.cs

+* MessageBox.cs

+* MessageBoxButtons.cs

+* MessageBoxDefaultButton.cs

+* MessageBoxIcon.cs

+* MessageBoxOptions.cs

+* MethodInvoker.cs

+* MonthCalendar.cs

+* MouseButtons.cs

+* MouseEventArgs.cs

+* MouseEventHandler.cs

+* NativeWindow.cs

+* NavigateEventArgs.cs

+* NavigateEventHandler.cs

+* NodeLabelEditEventArgs.cs

+* NodeLabelEditEventHandler.cs

+* NotifyIcon.cs

+* NumericUpDown.cs

+* OpacityConverter.cs

+* OpenFileDialog.cs

+* Orientation.cs

+* OSFeature.cs

+* PageSetupDialog.cs

+* PaintEventArgs.cs

+* PaintEventHandler.cs

+* Panel.cs

+* PictureBoxSizeMode.cs

+* PrintControllerWithStatusDialog.cs

+* PrintDialog.cs

+* PrintPreviewControl.cs

+* PrintPreviewDialog.cs

+* ProgressBar.cs

+* PropertyGrid.cs

+* PropertyManager.cs

+* PropertySort.cs

+* PropertyTabChangedEventArgs.cs

+* PropertyTabChangedEventHandler.cs

+* PropertyValueChangedEventArgs.cs

+* PropertyValueChangedEventHandler.cs

+* QueryAccessibilityHelpEventArgs.cs

+* QueryAccessibilityHelpEventHandler.cs

+* QueryContinueDragEventArgs.cs

+* QueryContinueDragEventHandler.cs

+* RadioButton.cs

+* RichTextBox.cs

+* RichTextBoxFinds.cs

+* RichTextBoxScrollBars.cs

+* RichTextBoxSelectionAttribute.cs

+* RichTextBoxSelectionTypes.cs

+* RichTextBoxStreamType.cs

+* RichTextBoxWordPunctuations.cs

+* RightToLeft.cs

+* SaveFileDialog.cs

+* Screen.cs

+* ScrollableControl.cs

+* ScrollBar.cs

+* ScrollBars.cs

+* ScrollButton.cs

+* ScrollEventArgs.cs

+* ScrollEventHandler.cs

+* ScrollEventType.cs

+* SecurityIDType.cs

+* SelectedGridItemChangedEventArgs.cs

+* SelectedGridItemChangedEventHandler.cs

+* SelectionMode.cs

+* SelectionRange.cs

+* SelectionRangeConverter.cs

+* SendKeys.cs

+* Shortcut.cs

+* SizeGripStyle.cs

+* SortOrder.cs

+* Splitter.cs

+* SplitterEventArgs.cs

+* SplitterEventHandler.cs

+* StatusBar.cs

+* StatusBarDrawItemEventArgs.cs

+* StatusBarDrawItemEventHandler.cs

+* StatusBarPanel.cs

+* StatusBarPanelAutoSize.cs

+* StatusBarPanelBorderStyle.cs

+* StatusBarPanelClickEventArgs.cs

+* StatusBarPanelClickEventHandler.cs

+* StatusBarPanelCollection.cs

+* StatusBarPanelStyle.cs

+* StructFormat.cs

+* SystemInformation.cs

+* TabAlignment.cs

+* TabAppearance.cs

+* TabControl.cs

+* TabDrawMode.cs

+* TabPage.cs

+* TabSizeMode.cs

+* TextBox.cs

+* TextBoxBase.cs

+* ThreadExceptionDialog.cs

+* TickStyle.cs

+* Timer.cs

+* ToolBar.cs

+* ToolBarAppearance.cs

+* ToolBarButton.cs

+* ToolBarButtonClickEventArgs.cs

+* ToolBarButtonClickEventHandler.cs

+* ToolBarButtonStyle.cs

+* ToolBarTextAlign.cs

+* ToolTip.cs

+* TrackBar.cs

+* TreeNode.cs

+* TreeNodeCollection.cs

+* TreeNodeConverter.cs

+* TreeView.cs

+* TreeViewAction.cs

+* TreeViewCancelEventArgs.cs

+* TreeViewCancelEventHandler.cs

+* TreeViewEventArgs.cs

+* TreeViewEventHandler.cs

+* TreeViewImageIndexConverter.cs

+* UICues.cs

+* UICuesEventArgs.cs

+* UICuesEventHandler.cs

+* UpDownBase.cs

+* UpDownEventArgs.cs

+* UpDownEventHandler.cs

+* UserControl.cs

+* View.cs

+* VScrollBar.cs

+* Monostyled everything!

+

+

+

+2002-7-7  DennisHayes <dennish@raytek.com>

+

+* AccessibleObject.cs

+* AmbientProperties.cs

+* AxHost.cs

+* BindingsCollection.cs

+* Button.cs

+* ButtonBase.cs

+* ChangeLog

+* CheckBox.cs

+* CheckedListBox.cs

+* ColorDialog.cs

+* ComboBox.cs

+* CommonDialog.cs

+* ContainerControl.cs

+* ContextMenu.cs

+* ControlEventArgs.cs

+* CurrencyManager.cs

+* DataGrid.cs

+* DataGridBoolColumn.cs

+* DataGridColumnStyle.cs

+* DataGridTableStyle.cs

+* DataGridTextBox.cs

+* DataGridTextBoxColumn.cs

+* DateTimePickerFormat.cs

+* ErrorProvider.cs

+* FileDialog.cs

+* FontDialog.cs

+* Form.cs

+* GroupBox.cs

+* HelpProvider.cs

+* HScrollBar.cs

+* ImageList.cs

+* KeyPressEventHandler.cs

+* Label.cs

+* LinkLabel.cs

+* LinkLabelLinkClickedEventArgs.cs

+* ListBox.cs

+* ListControl.cs

+* ListView.cs

+* logfile.txt

+* MainMenu.cs

+* Menu.cs

+* MenuItem.cs

+* MonthCalendar.cs

+* NotifyIcon.cs

+* OpenFileDialog.cs

+* PageSetupDialog.cs

+* Panel.cs

+* PrintDialog.cs

+* PropertyManager.cs

+* RadioButton.cs

+* RichTextBox.cs

+* SaveFileDialog.cs

+* ScrollableControl.cs

+* ScrollBar.cs

+* Splitter.cs

+* StatusBar.cs

+* StatusBarPanel.cs

+* TabControl.cs

+* TabPage.cs

+* TextBox.cs

+* TextBoxBase.cs

+* ThreadExceptionDialog.cs

+* Timer.cs

+* ToolBar.cs

+* ToolBarButton.cs

+* TrackBar.cs

+* TreeView.cs

+* UpDownBase.cs

+* VScrollBar.cs

+* Uncommented stuff, re-commented stuff, adding usings, fixed minor syntax errors.

+

+2002-7-6  DennisHayes <dennish@raytek.com>

+

+* DragEventArgs.cs

+* PropertyValueChangedEventArgs.cs

+* InputLanguageChangedEventArgs.cs

+* added files

+

+2002-7-6  DennisHayes <dennish@raytek.com>

+

+* ToolBarButtonClickEventArgs.cs

+* UpDownEventArgs.cs

+* PropertyValueChangedEventArgs.c

+* Added new files

+

+2002-7-6  DennisHayes <dennish@raytek.com>

+

+* AccessibleObject.cs

+* AmbientProperties.cs

+* Application.cs

+* ApplicationContext.cs

+* AxHost.cs

+* BaseCollection.cs

+* Binding.cs

+* BindingContext.cs

+* BindingManagerBase.cs

+* BindingsCollection.cs

+* CaptionButton.cs

+* Clipboard.cs

+* ColumnHeader.cs

+* Control.cs

+* ControlBindingsCollection.cs

+* ControlPaint.cs

+* CreateParams.cs

+* CurrencyManager.cs

+* Cursor.cs

+* CursorConverter.cs

+* Cursors.cs

+* DataFormats.cs

+* DataGridPreferredColumnWidthTypeConverter.cs

+* DataGridTextBoxColumn.cs

+* DataObject.cs

+* DateBoldEventArgs.cs

+* DateTimePicker.cs

+* DomainUpDown.cs

+* FeatureSupport.cs

+* FontDialog.cs

+* Form.cs

+* GridColumnStylesCollection.cs

+* GridItemCollection.cs

+* GridTableStylesCollection.cs

+* Help.cs

+* IButtonControl.cs

+* IFileReaderService.cs

+* ImageIndexConverter.cs

+* ImageListStreamer.cs

+* IMessageFilter.cs

+* InputLanguage.cs

+* InputLanguageChangeEventArgs.cs

+* InputLanguageCollection.cs

+* ItemChangedEventArgs.cs

+* KeyEventArgs.cs

+* KeyPressEventArgs.cs

+* KeysConverter.cs

+* LinkLabel.cs

+* LinkLabelLinkClickedEventArgs.cs

+* LinkLabelLinkClickedEventHandler.cs

+* ListBindingConverter.cs

+* ListViewItem.cs

+* ListViewItemConverter.cs

+* logfile.txt

+* MessageBox.cs

+* NativeWindow.cs

+* NumericUpDown.cs

+* OpacityConverter.cs

+* OSFeature.cs

+* PaintEventArgs.cs

+* PrintControllerWithStatusDialog.cs

+* PropertyGrid.cs

+* PropertyTabChangedEventArgs.cs

+* PropertyTabChangedEventHandler.cs

+* PropertyValueChangedEventArgs.cs

+* Screen.cs

+* ScrollEventArgs.cs

+* SelectionRange.cs

+* SelectionRangeConverter.cs

+* SendKeys.cs

+* SplitterEventArgs.cs

+* StatusBarPanelClickEventArgs.cs

+* StatusBarPanelCollection.cs

+* SystemInformation.cs

+* ToolBarButtonClickEventArgs.cs

+* ToolTip.cs

+* TreeNode.cs

+* TreeNodeCollection.cs

+* TreeNodeConverter.cs

+* TreeViewCancelEventArgs.cs

+* TreeViewImageIndexConverter.cs

+* UICuesEventArgs.cs

+* UpDownBase.cs

+* UpDownEventArgs.cs

+* UserControl.cs

+* Added usings, corrected minor syntax errors, uncommented some stuff to flush out compile errors.

+

+2002-7-3  DennisHayes <dennish@raytek.com>

+

+* AccessibleObject.cs

+* Application.cs

+* AxHost.cs

+* Button.cs

+* Control.cs

+* Form.cs

+* GridColumnStylesCollection.cs

+* GridItemCollection.cs

+* GridTableStylesCollection.cs

+* ImageIndexConverter.cs

+* ImageListStreamer.cs

+* InputLanguageChangingEventArgs.cs

+* KeysConverter.cs

+* Label.cs

+* LinkLabel.cs

+* LinkLabelLinkClickedEventArgs.cs

+* ListBox.cs

+* ListView.cs

+* ListViewItem.cs

+* ListViewItemConverter.cs

+* Menu.cs

+* NumericUpDown.cs

+* ScrollableControl.cs

+* StatusBarDrawItemEventArgs.cs

+* StatusBarPanel.cs

+* StatusBarPanelCollection.cs

+* TabControl.cs

+* TrackBar.cs

+* TreeNodeCollection.cs

+* added usings, minor syntax corrections.

+

+2002-7-3  DennisHayes <dennish@raytek.com>

+* checked in for Jaak Simm (jaaksimm@firm.ee)

+* PrintPreviewControl.cs

+* PrintPreviewDialog.cs

+* ProgressBar.cs

+* PropertyGrid.cs

+* PropertyManager.cs

+* PropertyTabChangedEventArgs.cs

+* new files added

+

+2002-7-2  DennisHayes <dennish@raytek.com>

+* Application.cs

+* ControlEventArgs.cs

+* Form.cs

+* merged changes made by miguel and hestilow in gkt# to system.windows.forms

+

+2002-7-2  DennisHayes <dennish@raytek.com>

+* Button.cs

+* ButtonBase.cs

+* ContainerControl.cs

+* Label.cs

+* ScrollableControl.cs

+* Copied changes made by miguel and hestilow in gkt# to system.windows.forms

+

+2002-7-2  DennisHayes <dennish@raytek.com>

+*  Checked in for Richard Baumann (biochem333@nyc.rr.com)

+* DataGridTextBoxColumn.cs

+* DataObject.cs

+* DateBoldEventArgs.cs

+* DateRangeEventArgs.cs

+* DateTimePicker.cs

+* DomainUpDown.cs

+* DragEventArgs.cs

+* DrawItemEventArgs.cs

+* added new files

+

+2002-7-2  DennisHayes <dennish@raytek.com>

+* checked in for Jaak Simm (jaaksimm@firm.ee)

+* DataFormats.cs

+* DataGrid.cs

+* DataGridBoolColumn.cs

+* DataGridColumnStyle.cs

+* DataGridPreferredColumnWidthTypeConverter.cs

+* DataGridTableStyle.cs

+* DataGridTextBox.cs

+* new classes added

+

+2002-7-2  DennisHayes <dennish@raytek.com>

+*  Checked in for Richard Baumann (biochem333@nyc.rr.com)

+* StatusBar.cs

+* StatusBarDrawItemEventArgs.cs

+* StatusBarPanel.cs

+* StatusBarPanelClickEventArgs.cs

+* SystemInformation.cs

+* Minor changes by Rich B

+

+2002-7-1  DennisHayes <dennish@raytek.com>

+

+* AccessibleObject.cs

+* AmbientProperties.cs

+* Application.cs

+* ApplicationContext.cs

+* ArrangeDirection.cs

+* AxHost.cs BaseCollection.cs

+* Binding.cs BindingContext.cs

+* BindingManagerBase.cs

+* BindingMemberInfo.cs

+* BindingsCollection.cs

+* Button.cs

+* ButtonBase.cs

+* CheckBox.cs

+* CheckedListBox.cs

+* Clipboard.cs

+* ColorDialog.cs

+* ColumnClickEventArgs.cs

+* ColumnClickEventHandler.cs

+* ColumnHeader.cs

+* ComboBox.cs

+* CommonDialog.cs

+* ComVisible.cs

+* ContainerControl.cs

+* ContentsResizedEventArgs.cs

+* ContextMenu.cs

+* Control.cs

+* ControlBindingsCollection.cs

+* ControlEventArgs.cs

+* ControlPaint.cs

+* ConvertEventArgs.cs

+* CreateParams.cs

+* CurrencyManager.cs

+* Cursor.cs

+* CursorConverter.cs

+* Cursors.cs

+* ErrorProvider.cs 

+* FeatureSupport.cs

+* FileDialog.cs

+* Form.cs

+* GiveFeedbackEventArgs.cs

+* GridColumnStylesCollection.cs

+* GridItem.cs

+* GridItemCollection.cs

+* GridTableStylesCollection.cs

+* GroupBox.cs

+* Help.cs 

+* HelpEventArgs.cs

+* HelpProvider.cs

+* HScrollBar.cs

+* ImageIndexConverter.cs

+* ImageList.cs

+* ImageListStreamer.cs

+* InputLanguage.cs

+* InputLanguageChangedEventArgs.cs

+* InputLanguageChangingEventArgs.cs

+* InputLanguageCollection.cs

+* InvalidateEventArgs.cs

+* ItemChangedEventArgs.cs

+* ItemCheckEventArgs.cs

+* ItemDragEventArgs.cs

+* IWin32Window.cs

+* KeyEventArgs.cs

+* KeyPressEventArgs.cs

+* KeysConverter.cs

+* Label.cs

+* LabelEditEventArgs.cs

+* LabelEditEventHandler.cs

+* LayoutEventArgs.cs

+* LinkClickedEventArgs.cs

+* LinkLabel.cs

+* LinkLabelLinkClickedEventArgs.cs

+* ListBindingConverter.cs

+* ListBox.cs

+* ListControl.cs

+* ListView.cs

+* ListViewItem.cs

+* ListViewItemConverter.cs

+* MainMenu.cs

+* MeasureItemEventArgs.cs

+* Menu.cs MenuItem.cs

+* Message.cs

+* MessageBox.cs

+* MonthCalendar.cs

+* MouseEventArgs.cs

+* NativeWindow.cs

+* NavigateEventArgs.cs

+* NodeLabelEditEventArgs.cs

+* NotifyIcon.cs

+* NumericUpDown.cs

+* OpacityConverter.cs

+* OpenFileDialog.cs

+* OSFeature.cs

+* PageSetupDialog.cs

+* PaintEventArgs.cs

+* Panel.cs

+* PrintControllerWithStatusDialog.cs

+* PrintDialog.cs

+* QueryAccessibilityHelpEventArgs.cs

+* QueryContinueDragEventArgs.cs

+* RadioButton.cs

+* RichTextBox.cs

+* SaveFileDialog.cs

+* Screen.cs

+* ScrollableControl.cs

+* ScrollBar.cs

+* ScrollEventArgs.cs

+* SelectedGridItemChangedEventArgs.cs

+* SelectionRange.cs

+* SelectionRangeConverter.cs

+* SendKeys.cs

+* Splitter.cs

+* SplitterEventArgs.cs

+* StatusBar.cs

+* StatusBarDrawItemEventArgs.cs

+* StatusBarPanel.cs

+* StatusBarPanelClickEventArgs.cs

+* StatusBarPanelCollection.cs

+* SystemInformation.cs

+* TabControl.cs

+* TabPage.cs

+* TextBox.cs

+* TextBoxBase.cs

+* ThreadExceptionDialog.cs

+* Timer.cs

+* ToolBar.cs

+* ToolBarButton.cs

+* TrackBar.cs

+* TreeNode.cs

+* TreeNodeCollection.cs

+* TreeNodeConverter.cs

+* TreeView.cs

+* TreeViewCancelEventArgs.cs

+* TreeViewEventArgs.cs

+* TreeViewImageIndexConverter.cs

+* UICuesEventArgs.cs

+* UserControl.cs

+* VScrollBar.cs

+* Implmented some stuff, fixed some stuff, monostyled some stuff, uncommented-out some stuff.

+

+

+2002-7-1  DennisHayes <dennish@raytek.com>

+* changelog

+* reversed order, putting most recent entries at the top

+

+2002-6-24 DennisHayes <dennish@raytek.com>

+* AccessibleStates.cs

+* ArrangeDirection.cs

+* AccessibleEvents.cs

+* Added values for enums

+

+2002-6-24 DennisHayes <dennish@raytek.com>

+* BindingMemberInfo.cs

+* CaptionButton.cs

+* DataGridCell.cs

+* Message.cs

+* MessageBox.cs

+* Fixed bugs preventing compile

+

+2002-6-18 DennisHayes <dennish@raytek.com>

+* checked in  for Stefan Warnke (StefanW@POBox.com)

+* UICuesEventArgs.cs

+* UpDownBase.cs

+* Better comments and formatting

+

+2002-6-18 DennisHayes <dennish@raytek.com>

+* Checked in for Jackson Harper (jackson@latitudegeo.com)

+* ToolBar.cs

+* TabControl.cs

+* TabPage.cs

+* Added sub classes

+

+2002-6-5 DennisHayes <dennish@raytek.com>

+* TabControl.cs

+* TabPage.cs

+* TextBox.cs

+* TextBoxBase.cs

+* ThreadExceptionDialog.cs

+* Timer.cs

+* added new files for Jackson Harper (jackson@latitudegeo.com)

+* needs to be mono styled, and may have other issues

+

+2002-6-5 DennisHayes <dennish@raytek.com>

+* ErrorProvider.cs

+* PrintControllerWithStatusDialog.cs

+* PrintDialog.cs

+* added new files for paul

+

+2002-6-5 DennisHayes <dennish@raytek.com>

+* StatusBarDrawItemEventArgs.cs

+* StatusBarPanel.cs

+* StatusBarPanelClickEventArgs.cs

+* StatusBarPanelCollection.cs

+* SystemInformation.cs

+* added new files for Richard Baumann (biochem333@nyc.rr.com)

+

+2002-6-5 DennisHayes <dennish@raytek.com>

+* removed, code moved to main class files, Form.cs, ImageList.cs, LinkLabel.cs,

+*   ListBox.cs, ListView.cs, ListViewItem.cs, Menu.cs, MonthCalendar.cs, ScrollableControl.cs

+* Form.ControlCollectison.cs

+* ImageList.ImageCollection.c

+* LinkLabel.LinkCollection.cs

+* ListBox.ObjectCollection.cs

+* ListBox.SelectedIndexCollection.cs

+* ListBox.SelectedObjectCollection.cs

+* ListView.CheckedListViewItemCollection.cs

+* ListView.CheckedIndexCollection.cs

+* ListView.ColumnHeaderCollection.cs

+* ListView.ListViewItemCollection.cs

+* ListView.SelectedIndexCollection.cs

+* ListView.SelectedListViewItemCollection.cs

+* ListViewItem.ListViewSubItem.cs

+* ListViewItem.ListViewSubItemCollection.cs

+* Menu.MenuItemCollection.cs

+* MonthCalendar.HitTestInfo.cs

+* ScrollableControl.DockPaddingEdges.cs

+

+2002-6-5 DennisHayes <dennish@raytek.com>

+* Checked in for Jackson Harper (jackson@latitudegeo.com)

+* ToolBar.cs

+* ToolBarButton.cs

+* ToolTip.cs

+* TrackBar.cs

+* TreeNode.cs

+* TreeNodeCollection.cs

+* TreeNodeConverter.cs

+* TreeView.cs

+* TreeViewCancelEventArgs.cs

+* TreeViewEventArgs.cs

+* TreeViewImageIndexConverter.cs

+* Just stubbs

+* New files added, work in progress cleanup and mono style needed.

+

+2002-6-5 DennisHayes <dennish@raytek.com>

+* checked in  for Stefan Warnke (StefanW@POBox.com)

+* UICuesEventArgs.cs

+* UpDownBase.cs

+* Just stubbs

+* New files, work in progress, needs cleanup and mono style

+

+

+

+2002-5-31 DennisHayes <dennish@raytek.com>

+* ItemChangedEventHandler.cs

+* InvalidateEventHandler.cs

+* ItemChangedEventHandler.cs

+* added new files

+

+2002-5-31 DennisHayes <dennish@raytek.com>

+		Check in for Paul Osman <paul.osman@sympatico.ca>

+* Panel.cs

+* New class, Stubbed and commented out

+

+2002-5-31 DennisHayes <dennish@raytek.com>

+		Check in for Paul Osman <paul.osman@sympatico.ca>

+* MonthCalendar.cs

+* MonthCalendar.HitTestInfo.cs

+* MouseEventArgs.cs

+* NativeWindow.cs

+* Removed trash byte

+

+2002-5-31 DennisHayes <dennish@raytek.com>

+* ColumnClickEventArgs.cs

+* Fully implmented.

+

+2002-5-31 DennisHayes <dennish@raytek.com>

+* Minor formating in lots of files

+

+

+2002-5-27 DennisHayes <dennish@raytek.com>

+Added structs. All structs in System.Windows.Forms done

+* BindingMemberInfo.cs

+* DataGridCell.cs

+* LinkArea.cs

+* Message.cs

+* Complete execpt for Message.cs GetLParam

+* and

+* BindingMemberInfo needs constructor.

+* All need verification of hashcodes.

+

+2002-5-27 DennisHayes <dennish@raytek.com>

+Added delegates. All delegates in System.Windows.Forms done

+* ColumnClickEventHandler.cs

+* ContentsResizedEventHandler.cs

+* ControlEventHandler.cs

+* ConvertEventHandler.cs

+* DateRangeEventHandler.cs

+* DragEventHandler.cs

+* DrawItemEventHandler.cs

+* GiveFeedbackEventHandler.cs

+* HelpEventHandler.cs

+* InputLanguageChangedEventHandler.cs

+* InputLanguageChangingEventHandler.cs

+* InvalidateEventHandler.cs

+* ItemChangedEventHandler.cs

+* ItemCheckEventHandler.cs

+* ItemDragEventHandler.cs

+* KeyEventHandler.cs

+* LabelEditEventHandler.cs

+* LayoutEventHandler.cs

+* LinkClickedEventHandler.cs

+* LinkLabelLinkClickedEventHandler.cs

+

+2002-5-27 DennisHayes <dennish@raytek.com>

+		Check in for Paul Osman <paul.osman@sympatico.ca>

+* NumericUpDown.cs

+* OpacityConverter.cs

+* OpenFileDialog.cs

+* OSFeature.cs

+* PageSetupDialog.cs

+* PaintEventArgs.cs

+* MonthCalendar.HitTestInfo.cs

+* MouseEventArgs.cs

+* NativeWindow.cs

+* Stubbed and commented out

+* NativeWindow.cs, MonthCalendar.HitTestInfo.cs, MouseEventArgs.cs,

+* have bad extra byte from old skeleton, need new corrected version.

+* MonthCalendar.HitTestInfo.cs needs to be incorporated into MonthCalendar.

+

+2002-5-27 DennisHayes <dennish@raytek.com>

+		Check in for Paul Osman <paul.osman@sympatico.ca>

+* Menu.cs

+* Menu.MenuItemCollection.cs

+* MenuItem.cs

+* MessageBox.cs

+* MonthCalendar.cs

+* Stubbed and commented out

+* MonthCalendar.cs has bad extra byte from old skeleton, need new corrected version.

+* MonthCalendar.HitTestInfo.cs needs to be incorporated into MonthCalendar.

+* Menu.MenuItemCollection.cs needs to be incorporated into Menu.cs.

+

+2002-5-27 DennisHayes <dennish@raytek.com>

+		Check in for Paul Osman <paul.osman@sympatico.ca>

+* Panel.cs

+* New class, Stubbed and commented out

+

+2002-5-10 Dennis Hayes

+* added IMessageFilter

+* Interfaces complete

+

+ 2002-5-8 Dennis Hayes <dennish@raytek.com>

+* RichTextBoxFinds.cs

+* RichTextBoxScrollBars.cs

+* RichTextBoxSelectionAttribute.cs

+* RichTextBoxSelectionTypes.cs

+* RichTextBoxStreamType.cs

+* RichTextBoxWordPunctuations.cs

+* RightToLeft.cs

+* ScrollBars.cs

+* ScrollButton.cs

+* ScrollEventType.cs

+* SecurityIDType.cs

+* SelectionMode.cs

+* Shortcut.cs

+* SizeGripStyle.cs

+* SortOrder.cs

+* StatusBarPanelAutoSize.cs

+* StatusBarPanelBorderStyle.cs

+* StatusBarPanelStyle.cs

+* StructFormat.cs

+* TabAlignment.cs

+* TabAppearance.cs

+* TabDrawMode.cs

+* TabSizeMode.cs

+* TickStyle.cs

+* ToolBarAppearance.cs

+* ToolBarButtonStyle.cs

+* ToolBarTextAlign.cs

+* TreeViewAction.cs

+* UICues.cs

+* View.cs

+* Added enums.

+* All System.Windows.Forms enums complete with correct values.

+ 2002-5-8 Dennis Hayes <dennish@raytek.com>

+Dennis Hayes <dennish@raytek.com>

+Checking in new System.Windows.forms classes (a* to c*) for 

+Jaak Simm <jaaksimm@firm.ee>

+* AmbientProperties.cs

+* Application.cs

+* ApplicationContext.cs

+* AxHost.cs

+* BaseCollection.cs

+* Binding.cs

+* BindingContext.cs

+* BindingManagerBase.cs

+* BindingsCollection.cs

+* Button.cs

+* ButtonBase.cs

+* CheckBox.cs

+* CheckedListBox.cs

+* Clipboard.cs

+* ColorDialog.cs

+* ColumnClickEventArgs.cs

+* ColumnHeader.cs

+* ComboBox.cs

+* CommonDialog.cs

+* ContainerControl.cs

+* ContentsResizedEventArgs.cs

+* ContextMenu.cs

+* Control.cs

+* ControlBindingsCollection.cs

+* ControlEventArgs.cs

+* ControlPaint.cs

+* ConvertEventArgs.cs

+* CreateParams.cs

+* CurrencyManager.cs

+* Cursor.cs

+* CursorConverter.cs

+* Cursors.cs

+* Classes stubbed and commented out.

+

+ 2002-5-8 Dennis Hayes <dennish@raytek.com>

+Dennis Hayes <dennish@raytek.com>

+Checking in new System.Windows.forms classe for John Rebbeck <john@rebent.com>

+

+* UserControl.cs

+Stubbed and commented out

+

+ 2002-5-8 Dennis Hayes <dennish@raytek.com>

+Dennis Hayes <dennish@raytek.com>

+Checking in new System.Windows.forms classe for Paul Osman <paul.osmand@sympatico.ca>

+

+* NavigateEventArgs.cs

+* NodeLabelEditEventArgs.cs

+* NotifyIcon.cs

+Stubbed and commented out

+

+2002-05-07 Daniel Carrera (dcarrera@math.utoronto.ca)

+* Fixed a problem with an "extra byte" problem.  It caused an extra '?'

+  at the beginning of some lines.

+  Classes F-L and Q-R were updated.

+* Added the classes SaveFileDialog.cs and Screen.cs

+

+2002-5-7 Dennis Hayes <dennish@raytek.com>

+* Added duplicate values

+* System.Windows.Forms.Keys.cs

+

+2002-5-7 Dennis Hayes <dennish@raytek.com>

+* LeftRightAlignment.cs

+* LinkBehavior.cs

+* LinkState.cs

+* ListViewAlignment.cs

+* MdiLayout.cs

+* MenuGlyph.cs

+* MenuMerge.cs

+* MessageBoxButtons.cs

+* MessageBoxDefaultButton.cs

+* MessageBoxIcon.cs

+* MessageBoxOptions.cs

+* MouseButtons.cs

+* Orientation.cs

+* PictureBoxSizeMode.cs

+* PropertySort.cs

+* Added some more enums. All have correct values.

+

+* 5-5-2002 Dennis Hayes <dennish@raytek.com>

+* Added enums

+* 	GridItemType.cs

+* 	HelpNavigator.cs

+* 	HorizontalAlignment.cs

+* 	ImeMode.cs

+* 	ItemActivation.cs

+* 	ItemBoundsPortion.cs

+* 	Keys.cs

+* All correct execpt for Keys.cs which is missing a half dozen

+* duplicate entries that need correcting.

+

+2002-05-02 Daniel Carrera (dcarrera@math.utoronto.ca)

+* small update to classes [F-H]*

+* added stubbed and commented out classes for [I-L]*

+* added stubbed and commented out classes for R*

+2002-4-23 Dennis Hayes <dennish@raytek.com>

+

+	* AccessibleNavigation.cs :added to cvs with bad enum values, I will correct.

+	* AccessibleSelection.cs :added with good enum values.

+	* ContentsResizedEventHandler.cs :Added delagate

+	* MainMenu.cs

+	* AccessibleObject.cs

+	* MeasureItemEventArgs :added stubbed classes. Commented out.

+	* IButtonControl.cs : Added interface.

+2002-4-23 Dennis Hayes <dennish@raytek.com>

+* added stubbed and commented out classes from F to G *

+

+

+2002-04-10  Duncan Mak  <duncan@ximian.com>

+

+	* CaptionButton.cs:

+	* CharacterCasing.cs: 

+	* CheckState.cs: 

+	* DataGridParentRowsLabelStyle.cs: 

+	* DialogResult.cs: 

+	* DockStyle.cs: 

+	* DragAction.cs: 

+	* DragDropEffects.cs: 

+	* DrawItemState.cs: 

+	* DrawMode.cs: 

+	* ErrorBlinkStyle.cs: 

+	* ErrorIconAlignment.cs: 

+	* FlatStyle.cs: 

+	* FormBorderStyle.cs: 

+	* FormStartPosition.cs: 

+	* FormWindowState.cs: 

+	* FrameStyle.cs: Fixed enum layouts with EnumCheck.

+

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/CharacterCasing.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/CharacterCasing.cs
new file mode 100644
index 00000000000..d2cf9114106
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/CharacterCasing.cs
@@ -0,0 +1,26 @@
+//

+// System.Windows.Forms.CharacterCasing.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies the case of characters in a TextBox control.

+	/// </summary>

+	//[Serializable]

+	public enum CharacterCasing {

+

+		//Values were verified with enumcheck.

+		Normal = 0,

+		Upper = 1,

+		Lower = 2,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckBox.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckBox.cs
new file mode 100644
index 00000000000..45b2f3c2d92
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckBox.cs
@@ -0,0 +1,194 @@
+//

+// System.Windows.Forms.CheckBox.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents a Windows check box.

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class CheckBox : ButtonBase {

+

+		// private fields

+		Appearance appearance;

+		bool autoCheck;

+		ContentAlignment checkAlign;

+		bool _checked;

+		CheckState checkState;

+		bool threeState;

+		

+		

+		// --- Constructor ---

+		public CheckBox() : base() 

+		{

+			appearance = Appearance.Normal;

+			autoCheck = true;

+			checkAlign = ContentAlignment.MiddleLeft;

+			_checked = false;

+			checkState = CheckState.Unchecked;

+			threeState = false;

+		}

+		

+		

+		

+		

+		// --- CheckBox Properties ---

+		public Appearance Appearance {

+			get { return appearance; }

+			set { appearance=value; }

+		}

+		

+		public bool AutoCheck {

+			get { return autoCheck; }

+			set { autoCheck=value; }

+		}

+		

+		public ContentAlignment CheckAlign {

+			get { return checkAlign; }

+			set { checkAlign=value; }

+		}

+		

+		public bool Checked {

+			get { return _checked; }

+			set { _checked=value; }

+		}

+		

+		public CheckState CheckState {

+			get { return checkState; }

+			set { checkState=value; }

+		}

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override ContentAlignment TextAlign {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public bool ThreeState {

+			get { return threeState; }

+			set { threeState=value; }

+		}

+		

+		

+		

+		

+		// --- CheckBox methods ---

+

+		// I do not think this is part of the spec

+		//protected override AccessibleObject CreateAccessibilityInstance() 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		

+		// [event methods]

+		[MonoTODO]

+		protected virtual void OnAppearanceChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnCheckedChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnCheckStateChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnClick(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMouseUp(MouseEventArgs mevent) 

+		{

+			throw new NotImplementedException ();

+		}

+		// end of [event methods]

+		

+		

+		[MonoTODO]

+		protected override bool ProcessMnemonic(char charCode) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		

+		

+		

+		/// --- CheckBox events ---

+		[MonoTODO]

+		public event EventHandler AppearanceChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler CheckedChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler CheckStateChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		/// --- public class CheckBox.CheckBoxAccessibleObject : ButtonBase.ButtonBaseAccessibleObject ---

+		/// the class is not stubbed, cause it's only used for .NET framework

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckState.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckState.cs
new file mode 100644
index 00000000000..94464793c81
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckState.cs
@@ -0,0 +1,27 @@
+//

+// System.Windows.Forms.CheckState.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies the state of a control, such as a check box, 

+  /// that can be checked, unchecked, or set to an indeterminate state.

+	/// </summary>

+	//[Serializable]

+	public enum CheckState {

+

+		//Values were verified with enumcheck.

+		Unchecked = 0,

+		Checked = 1,

+		Indeterminate = 2,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckedListBox.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckedListBox.cs
new file mode 100644
index 00000000000..1ac299d1276
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/CheckedListBox.cs
@@ -0,0 +1,496 @@
+//

+// System.Windows.Forms.CheckedListBox.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Denis hayes (dennish@raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Displays a ListBox in which a check box is displayed to the left of each item.

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class CheckedListBox : ListBox {

+

+		// private fields

+		private bool checkOnClick;

+		private bool threeDCheckBoxes;

+		

+		

+		// --- Constructor ---

+		public CheckedListBox() : base() 

+		{

+			checkOnClick = false;

+			threeDCheckBoxes = true;

+		}

+		

+		// --- CheckedListBox Properties ---

+		[MonoTODO]

+		public CheckedListBox.CheckedIndexCollection CheckedIndices {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public CheckedListBox.CheckedItemCollection CheckedItems {

+			get { throw new NotImplementedException (); }

+		}

+		

+		public bool CheckOnClick {

+			get { return checkOnClick; }

+			set { checkOnClick=value; }

+		}

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get { throw new NotImplementedException (); }

+		}

+		

+//		[MonoTODO]

+// FIXME

+//		public override DrawMode DrawMode {

+//			get { throw new NotImplementedException (); }

+//			set { throw new NotImplementedException (); }

+//		}

+//		

+//		[MonoTODO]

+//		public override int ItemHeight {

+//			get { throw new NotImplementedException (); }

+//			set { throw new NotImplementedException (); }

+//		}

+//		

+		[MonoTODO]

+		public CheckedListBox.ObjectCollection Items {

+			get { throw new NotImplementedException (); }

+		}

+		

+		public override SelectionMode SelectionMode {

+			set {

+				if (value!=SelectionMode.One && value!=SelectionMode.None)

+					throw new ArgumentException();

+				base.SelectionMode=value;

+			}

+		}

+		

+		public bool ThreeDCheckBoxes {

+			get { return threeDCheckBoxes; }

+			set { threeDCheckBoxes=value; }

+		}

+		

+		

+		

+		

+		// --- CheckedListBox methods ---

+		// following methods were not stubbed out, because they only support .NET framework:

+		// - protected virtual void OnItemCheck(ItemCheckEventArgs ice)

+		// - protected override void WmReflectCommand(ref Message m)

+

+		// I do not think this is part of the spec.

+		//protected override AccessibleObject CreateAccessibilityInstance() 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		protected override ObjectCollection CreateItemCollection() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public bool GetItemChecked(int index) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public CheckState GetItemCheckState(int index) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// [event methods]

+		[MonoTODO]

+		protected override void OnBackColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnClick(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnDrawItem(DrawItemEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// only supports .NET framework, thus is not stubbed out

+		/*

+		[MonoTODO]

+		protected virtual void OnItemCheck(ItemCheckEventArgs ice) 

+		{

+			throw new NotImplementedException ();

+		}

+		*/

+		

+		[MonoTODO]

+		protected override void OnKeyPress(KeyPressEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMeasureItem(MeasureItemEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnSelectedIndexChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		// end of [event methods]

+		

+		[MonoTODO]

+		public void SetItemChecked(int index,bool value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SetItemCheckState(int index,CheckState value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void WndProc(ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		

+		

+		

+		/// --- CheckedListBox events ---

+		/// following events are not stubbed out, because they only support .NET framework:

+		/// - public new event EventHandler Click;

+		/// - public new event DrawItemEventHandler DrawItem;

+		/// - public new event MeasureItemEventHandler MeasureItem;

+		[MonoTODO]

+		public event ItemCheckEventHandler ItemCheck {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		

+		

+		

+		/// sub-class: CheckedListBox.CheckedIndexCollection

+		/// <summary>

+		/// Encapsulates the collection of indexes of checked items (including items in an indeterminate state) in a CheckedListBox.

+		/// </summary>

+		[MonoTODO]

+		public class CheckedIndexCollection : IList, ICollection, IEnumerable {

+			

+			

+			/// --- CheckedIndexCollection Properties ---

+			[MonoTODO]

+			public int Count {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public bool IsReadOnly {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public int this[int index] {

+				get { throw new NotImplementedException (); }

+			}

+			

+			/// --- ICollection properties ---

+			bool IList.IsFixedSize {

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			object IList.this[int index] {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+				[MonoTODO] set { throw new NotImplementedException (); }

+			}

+	

+			object ICollection.SyncRoot {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+	

+			bool ICollection.IsSynchronized {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			

+			

+			

+			/// --- CheckedIndexCollection Methods ---

+			/// Note: IList methods are stubbed out, otherwise does not IList interface cannot be implemented

+			[MonoTODO]

+			public bool Contains(int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void CopyTo(Array dest,int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public IEnumerator GetEnumerator() 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public int IndexOf(int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			/// --- CheckedIndexCollection.IList methods ---

+			[MonoTODO]

+			int IList.Add(object value) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Clear() 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			bool IList.Contains(object index) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.IndexOf(object index) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Insert(int index,object value) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Remove(object value) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			void IList.RemoveAt(int index) 

+			{

+				throw new NotImplementedException ();

+			}

+		}  // --- end of CheckedListBox.CheckedIndexCollection ---

+		

+		

+		

+		

+		/// sub-class: CheckedListBox.CheckedItemCollection

+		/// <summary>

+		/// Encapsulates the collection of checked items (including items in an indeterminate state) in a CheckedListBox control.

+		/// </summary>

+		[MonoTODO]

+		public class CheckedItemCollection : IList, ICollection, IEnumerable {

+			

+			

+			/// --- CheckedItemCollection Properties ---

+			[MonoTODO]

+			public int Count {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public bool IsReadOnly {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public int this[int index] {

+				get { throw new NotImplementedException (); }

+				set { throw new NotImplementedException (); }

+			}

+			

+			/// --- ICollection properties ---

+			bool IList.IsFixedSize {

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			object IList.this[int index] {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+				[MonoTODO] set { throw new NotImplementedException (); }

+			}

+	

+			object ICollection.SyncRoot {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+	

+			bool ICollection.IsSynchronized {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			

+			

+			/// --- CheckedItemCollection Methods ---

+			/// Note: IList methods are stubbed out, otherwise IList interface cannot be implemented

+			[MonoTODO]

+			public bool Contains(int item) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void CopyTo(Array dest,int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public IEnumerator GetEnumerator() 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public int IndexOf(int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			/// --- CheckedItemCollection.IList methods ---

+			[MonoTODO]

+			int IList.Add(object value) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Clear() 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			bool IList.Contains(object index) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.IndexOf(object index) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Insert(int index,object value) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Remove(object value) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			void IList.RemoveAt(int index) 

+			{

+				throw new NotImplementedException ();

+			}

+		}  // --- end of CheckedListBox.CheckedItemCollection ---

+

+		

+		

+		// FIXME:

+		// fix the problem of causing error CS0508.

+		// The error occurs as the ObjectCollection class will change the return type of the overriden method

+		// CheckedListBox.CreateItemCollection().

+		

+		/// sub-class: CheckedListBox.ObjectCollection

+		/// <summary>

+		/// Represents the collection of items in a CheckedListBox.

+		/// </summary>

+		/*

+		[MonoTODO]

+		public class ObjectCollection : ListBox.ObjectCollection {

+			

+			/// --- ObjectCollection.constructor ---

+			[MonoTODO]

+			public ObjectCollection(CheckedListBox owner) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			

+			/// --- methods ---

+			[MonoTODO]

+			public int Add(object item,bool isChecked) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public int Add(object item,CheckState check) 

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		*/

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Clipboard.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Clipboard.cs
new file mode 100644
index 00000000000..fb1ef7a5517
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Clipboard.cs
@@ -0,0 +1,42 @@
+//

+// System.Windows.Forms.Clipboard.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides methods to place data on and retrieve data from the system Clipboard. This class cannot be inherited.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public sealed class Clipboard {

+

+		// --- Methods ---

+		[MonoTODO]

+		public static IDataObject GetDataObject() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void SetDataObject(object data) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void SetDataObject(object data,bool copy) 

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ColorDepth.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColorDepth.cs
new file mode 100644
index 00000000000..9ee4992bb42
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColorDepth.cs
@@ -0,0 +1,22 @@
+//

+// System.Windows.Forms.ColorDepth.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ColorDepth {

+		Depth16Bit = 16,

+		Depth24Bit = 24,

+		Depth32Bit = 32,

+		Depth4Bit = 4,

+		Depth8Bit = 8

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ColorDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColorDialog.cs
new file mode 100644
index 00000000000..db490f42185
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColorDialog.cs
@@ -0,0 +1,150 @@
+//

+// System.Windows.Forms.ColorDialog.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents a common dialog box that displays available colors along with controls that allow the user to define custom colors.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class ColorDialog : CommonDialog {

+

+		// private fields

+		//private bool allowFullOpen;

+		//private bool anyColor;

+		//private Color color;

+		//private int[] customColors;

+		//private bool fullOpen;

+		//private bool showHelp;

+		//private bool solidColorOnly;

+

+		/// --- Constructor ---

+		protected ColorDialog() : base() 

+		{

+			//allowFullOpen = true;

+			//anyColor = false;

+			//color = Color.Black;

+			//customColors = null;

+			//fullOpen = false;

+			//showHelp = false;

+			//solidColorOnly = false;

+		}

+		

+		

+		

+		

+		/// --- Properties ---

+		/// following properties are not stubbed out, because they only support .NET framework

+		/// - protected virtual IntPtr Instance {get;}

+		/// - protected virtual int Options {get;}

+		public virtual bool AllowFullOpen {

+			get {

+				throw new NotImplementedException ();

+				//return allowFullOpen;

+			}

+			set {

+				throw new NotImplementedException ();

+				//allowFullOpen=value;

+			}

+		}

+		

+		public virtual bool AnyColor {

+			get {

+				throw new NotImplementedException ();

+				//return anyColor;

+			}

+			set {

+				throw new NotImplementedException ();

+				//anyColor=value;

+			}

+		}

+		

+		public Color Color {

+			get {

+				throw new NotImplementedException ();

+				//return color;

+			}

+			set {

+				throw new NotImplementedException ();

+				//color=value;

+			}

+		}

+		

+		public int[] CustomColors {

+			get {

+				throw new NotImplementedException ();

+				//return customColors;

+			}

+			set {

+				throw new NotImplementedException ();

+				//customColors=value;

+			}

+		}

+		

+		public virtual bool FullOpen {

+			get {

+				throw new NotImplementedException ();

+				//return fullOpen;

+			}

+			set {

+				throw new NotImplementedException ();

+				//fullOpen=value;

+			}

+		}

+		

+		public virtual bool ShowHelp {

+			get {

+				throw new NotImplementedException ();

+				//return showHelp;

+			}

+			set {

+				throw new NotImplementedException ();

+				//showHelp=value;

+			}

+		}

+		

+		public virtual bool SolidColorOnly {

+			get {

+				throw new NotImplementedException ();

+				//return solidColorOnly;

+			}

+			set {

+				throw new NotImplementedException ();

+				//solidColorOnly=value;

+			}

+		}

+

+		/// --- ColorDialog methods ---

+		[MonoTODO]

+		public override void Reset() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool RunDialog(IntPtr hwndOwner) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnClickEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnClickEventArgs.cs
new file mode 100644
index 00000000000..1adcdbdc6e1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnClickEventArgs.cs
@@ -0,0 +1,103 @@
+//

+// System.Windows.Forms.ColumnClickEventArgs.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Implmented by Dennis Hayes <dennish@raytek.com>

+//

+// (C) Ximian, Inc., 2002

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides data for the ColumnClick event.

+	/// </summary>

+	public class ColumnClickEventArgs : EventArgs {

+

+		private int column;

+		/// --- Constructor ---

+		public ColumnClickEventArgs(int Column) : base() 

+		{

+			column = Column;

+		}

+		

+		

+		/// --- Properties ---

+		public int Column {

+			get { 

+				return column;

+			}

+		}

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ColumnClickEventArgs objects. The return value is

+		///	based on the equivalence of the Column properties 

+		///	of the two ColumnClickEventArgs.

+		/// </remarks>

+

+		public static bool operator == (ColumnClickEventArgs ColumnClickEventArgsA , ColumnClickEventArgs ColumnClickEventArgsB) 

+		{

+			return ColumnClickEventArgsA.column == ColumnClickEventArgsB.column;

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ColumnClickEventArgs objects. The return value is

+		///	based on the equivalence of the Column properties 

+		///	of the two ColumnClickEventArgs.

+		/// </remarks>

+

+		public static bool operator != (ColumnClickEventArgs ColumnClickEventArgsA, ColumnClickEventArgs ColumnClickEventArgsB) 

+		{

+			return ColumnClickEventArgsA.column != ColumnClickEventArgsB.column;

+		}

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this ColumnClickEventArgs and another object.

+		/// </remarks>

+		

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is ColumnClickEventArgs))return false;

+			return (this == (ColumnClickEventArgs) obj);

+		}

+

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		// If class has only one proprity, just return the hash code of the proprity.

+		public override int GetHashCode () 

+		{

+			return column.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the ColumnClickEventArgs as a string.

+		/// </remarks>

+		

+		public override string ToString () 

+		{

+			return String.Format ("[{0}]", column);

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnClickEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnClickEventHandler.cs
new file mode 100644
index 00000000000..b3f15632067
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnClickEventHandler.cs
@@ -0,0 +1,15 @@
+//

+// System.Windows.Forms.ColumnClickEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void ColumnClickEventHandler(

+	object sender,

+	ColumnClickEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnHeader.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnHeader.cs
new file mode 100644
index 00000000000..7224046fcbc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnHeader.cs
@@ -0,0 +1,85 @@
+//

+// System.Windows.Forms.ColumnHeader.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Displays a single column header in a ListView control.

+	///

+	/// ToDo note:

+	///  - no methods are implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class ColumnHeader : Component, ICloneable {

+

+		// private fields

+		string text;

+		HorizontalAlignment textAlign;

+		

+		/// --- constructor ---

+		[MonoTODO]

+		public ColumnHeader() : base () 

+		{

+			text = null;

+			textAlign = HorizontalAlignment.Left;

+		}

+		

+		

+		

+		// --- Properties ---

+		[MonoTODO]

+		public int Index {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public ListView ListView {

+			get { throw new NotImplementedException (); }

+		}

+		

+		public string Text {

+			get { return text; }

+			set { text=value; }

+		}

+		

+		public HorizontalAlignment TextAlign {

+			get { return textAlign; }

+			set { textAlign=value; }

+		}

+		

+		[MonoTODO]

+		public int Width {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		/// --- Methods ---

+		[MonoTODO]

+		public object Clone() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void Dispose(bool disposing) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		public override string ToString() 

+		{

+			//FIXME: add class specific info to the string

+			return base.ToString();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnHeaderStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnHeaderStyle.cs
new file mode 100644
index 00000000000..c6992925a82
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ColumnHeaderStyle.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.ColumnHeaderStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ColumnHeaderStyle {

+		Clickable = 2,

+		Nonclickable = 1,

+		None = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ComVisible.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ComVisible.cs
new file mode 100644
index 00000000000..5b55ebf5ee9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ComVisible.cs
@@ -0,0 +1,25 @@
+//

+// System.Runtime.InteropServices.ComVisible.cs

+//

+// Author:

+//   Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2002 Nick Drochak

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class

+		| AttributeTargets.Struct | AttributeTargets.Enum |

+		AttributeTargets.Method | AttributeTargets.Property |

+		AttributeTargets.Field | AttributeTargets.Interface |

+		AttributeTargets.Delegate)]

+	public sealed class ComVisibleAttribute : Attribute  {

+

+		private bool Visible = false;

+		public ComVisibleAttribute(bool value) {Visible = value;}

+		public bool Value { get {return Visible;} }

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ComboBox.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ComboBox.cs
new file mode 100644
index 00000000000..25291c3ffed
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ComboBox.cs
@@ -0,0 +1,589 @@
+//

+// System.Windows.Forms.ComboBox.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Collections;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents a Windows combo box control.

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class ComboBox : ListControl {

+

+		// private fields

+		DrawMode drawMode;

+		ComboBoxStyle dropDownStyle;

+		bool droppedDown;

+		bool integralHeight;

+		bool sorted;

+		

+		

+		// --- Constructor ---

+		public ComboBox() : base() 

+		{

+			drawMode = DrawMode.Normal;

+			dropDownStyle = ComboBoxStyle.DropDown;

+			droppedDown = false;

+			integralHeight = true;

+			sorted = false;

+		}

+		

+		

+		

+		

+		// --- Properties ---

+		[MonoTODO]

+		public override Color BackColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get { throw new NotImplementedException (); }

+		}

+		

+		public DrawMode DrawMode {

+			get { return drawMode; }

+			set { drawMode=value; }

+		}

+		

+		public ComboBoxStyle DropDownStyle {

+			get { return dropDownStyle; }

+			set { dropDownStyle=value; }

+		}

+		

+		[MonoTODO]

+		public int DropDownWidth {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public bool DroppedDown {

+			get { return droppedDown; }

+			set { droppedDown=value; }

+		}

+		

+		[MonoTODO]

+		public override bool Focused {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Color ForeColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public bool IntegralHeight {

+			get { return integralHeight; }

+			set { integralHeight=value; }

+		}

+		

+		[MonoTODO]

+		public int ItemHeight {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public ComboBox.ObjectCollection Items {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int MaxDropDownItems {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int MaxLength {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int PreferredHeight {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override int SelectedIndex {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public object SelectedItem {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public string SelectedText {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int SelectionLength {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int SelectionStart {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public bool Sorted {

+			get { return sorted; }

+			set { sorted=value; }

+		}

+		

+		[MonoTODO]

+		public override string Text {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		

+		

+		

+		/// --- Methods ---

+		/// internal .NET framework supporting methods, not stubbed out:

+		/// - protected virtual void OnSelectedItemChanged(EventArgs e);

+		/// - protected override void SetItemCore(int index,object value);

+		[MonoTODO]

+		protected virtual void AddItemsCore(object[] value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void BeginUpdate() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void Dispose(bool disposing) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void EndUpdate() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public int FindString(string s) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public int FindString(string s,int startIndex) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public int FindStringExact(string s) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public int FindStringExact(string s,int startIndex) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public int GetItemHeight(int index) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool IsInputKey(Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/// [methods for events]

+		[MonoTODO]

+		protected override void OnBackColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnDataSourceChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnDisplayMemberChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDrawItem(DrawItemEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDropDown(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDropDownStyleChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnForeColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnHandleDestroyed(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnKeyPress(KeyPressEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMeasureItem(MeasureItemEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnParentBackColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnResize(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnSelectedIndexChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnSelectionChangeCommitted(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		/// end of [methods for events]

+		

+		

+		[MonoTODO]

+		protected override void RefreshItem(int index) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Select(int start,int length) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SelectAll() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void SetBoundsCore(int x,int y,int width,int height,BoundsSpecified specified) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// for IList interface

+		// FIXME not sure how to handle this

+		//[MonoTODO]

+		//protected override void SetItemsCore(IList value) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void WndProc(ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+	

+		/// --- Button events ---

+		/// commented out, cause it only supports the .NET Framework infrastructure

+		[MonoTODO]

+		public event DrawItemEventHandler DrawItem {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler DropDown {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler DropDownStyleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event MeasureItemEventHandler MeasureItem {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		/* only supports .NET framework

+			[MonoTODO]

+			public new event PaintEventHandler Paint;

+		*/

+		

+		[MonoTODO]

+		public event EventHandler SelectedIndexChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler SelectionChangeCommitted {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		

+		

+		

+		

+		/// --- public class ComboBox.ChildAccessibleObject : AccessibleObject ---

+		/// the class is not stubbed, cause it's only used for .NET framework

+		

+		

+		

+		

+		/// sub-class: ComboBox.ObjectCollection

+		/// <summary>

+		/// Represents the collection of items in a ComboBox.

+		/// </summary>

+		[MonoTODO]

+		public class ObjectCollection : IList, ICollection, IEnumerable {

+			

+			/// --- ObjectCollection.constructor ---

+			[MonoTODO]

+			public ObjectCollection (ComboBox owner) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			

+			

+			/// --- ObjectCollection Properties ---

+			[MonoTODO]

+			public int Count {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public bool IsReadOnly {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public int this[int index] {

+				get { throw new NotImplementedException (); }

+				set { throw new NotImplementedException (); }

+			}

+

+			/// --- ICollection properties ---

+			bool IList.IsFixedSize {

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			object IList.this[int index] {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+				[MonoTODO] set { throw new NotImplementedException (); }

+			}

+	

+			object ICollection.SyncRoot {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+	

+			bool ICollection.IsSynchronized {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			/// --- methods ---

+			/// --- ObjectCollection Methods ---

+			/// Note: IList methods are stubbed out, otherwise IList interface cannot be implemented

+			[MonoTODO]

+			public int Add(object item) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void AddRange(object[] items) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void Clear() 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public bool Contains(object value) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void CopyTo(object[] dest,int arrayIndex) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			/// for ICollection:

+			[MonoTODO]

+			void ICollection.CopyTo(Array dest,int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public IEnumerator GetEnumerator() 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public int IndexOf(object value) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void Insert(int index,object item) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void Remove(object value) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void RemoveAt(int index) 

+			{

+				throw new NotImplementedException ();

+			}

+		}  // --- end of ComboBox.ObjectCollection ---

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ComboBoxStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ComboBoxStyle.cs
new file mode 100644
index 00000000000..22d36738661
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ComboBoxStyle.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.ComboBoxStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ComboBoxStyle {

+		DropDown = 1,

+		DropDownList = 2,

+		Simple = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/CommonDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/CommonDialog.cs
new file mode 100644
index 00000000000..a1e45bcef06
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/CommonDialog.cs
@@ -0,0 +1,81 @@
+//

+// System.Windows.Forms.CommonDialog.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Specifies the base class used for displaying dialog boxes on the screen.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public abstract class CommonDialog : Component {

+

+		// private fields

+		

+		/// --- constructor ---

+		[MonoTODO]

+		public CommonDialog() : base () 

+		{

+		}

+		

+		/// --- Methods ---

+		[MonoTODO]

+		protected virtual IntPtr HookProc(IntPtr hWnd,int msg,IntPtr wparam,IntPtr lparam) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// event methods

+		[MonoTODO]

+		protected virtual void OnHelpRequest(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		// end of event methods

+		

+		[MonoTODO]

+		protected virtual IntPtr OwnerWndProc(IntPtr hWnd,int msg,IntPtr wparam,IntPtr lparam) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		public abstract void Reset();

+		

+		protected abstract bool RunDialog(IntPtr hwndOwner);

+		

+		[MonoTODO]

+		public DialogResult ShowDialog() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public DialogResult ShowDialog(IWin32Window owner) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/// events

+		[MonoTODO]

+		public event EventHandler HelpRequest {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ContainerControl.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ContainerControl.cs
new file mode 100644
index 00000000000..7d7f5d30b53
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ContainerControl.cs
@@ -0,0 +1,129 @@
+//

+// System.Windows.Forms.ContainerControl.cs

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com)

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides focus management functionality for controls that can function as a container for other controls.

+	/// </summary>

+

+	public class ContainerControl : ScrollableControl, IContainerControl {

+

+		protected ContainerControl () : base () 

+		{

+		}

+		

+		

+		public Control ActiveControl {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		// not ready for BindingContext

+		//public override BindingContext BindingContext {

+		//	get { throw new NotImplementedException (); }

+		//	set { throw new NotImplementedException (); }

+		//}

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public Form ParentForm {

+			get { throw new NotImplementedException (); }

+		}

+		

+		/// --- Methods ---

+		/// internal .NET framework supporting methods, not stubbed out:

+		/// - protected virtual void UpdateDefaultButton()

+		[MonoTODO]

+		protected override void AdjustFormScrollbars (bool displayScrollbars) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void Dispose (bool disposing) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		// not memeber?

+		//bool IContainerControl.ActivateControl(Control control) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		// [event methods]

+		[MonoTODO]

+		protected override void OnControlRemoved (ControlEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnCreateControl () 

+		{

+			throw new NotImplementedException ();

+		}

+		// end of [event methods]

+		

+		[MonoTODO]

+		protected override bool ProcessDialogChar (char charCode) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool ProcessDialogKey (Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool ProcessMnemonic (char charCode) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessTabKey (bool forward) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// Not an overridden function?

+		//protected override void Select(bool directed,bool forward) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		public bool Validate () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void WndProc(ref Message m) 

+		{

+			base.WndProc(ref m);

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ContentsResizedEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ContentsResizedEventArgs.cs
new file mode 100644
index 00000000000..c439f824ced
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ContentsResizedEventArgs.cs
@@ -0,0 +1,122 @@
+//

+// System.Windows.Forms.ColumnClickEventArgs.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Partially completed by Dennis Hayes (dennish@raytek.com)

+//  Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides data for the ContentsResized event.

+	/// </summary>

+

+	public class ContentsResizedEventArgs : EventArgs {

+

+		#region Fields

+		private Rectangle newrectangle;

+		#endregion

+

+		/// --- Constructor ---

+		public ContentsResizedEventArgs(Rectangle newRectangle) : base() 

+		{

+			newrectangle = newRectangle;

+		}

+		

+		#region Public Propeties

+		public Rectangle NewRectangle 

+		{

+			get {

+				return newrectangle;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ContentsResizedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	newRectangle Property

+		///	of the two ContentsResizedEventArgs.

+		/// </remarks>

+		public static bool operator == (ContentsResizedEventArgs ContentsResizedEventArgsA, ContentsResizedEventArgs ContentsResizedEventArgsB) 

+		{

+			return (ContentsResizedEventArgsA.NewRectangle == ContentsResizedEventArgsB.NewRectangle);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ContentsResizedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	newRectangle Property

+		///	of the two ContentsResizedEventArgs.

+		/// </remarks>

+		public static bool operator != (ContentsResizedEventArgs ContentsResizedEventArgsA, ContentsResizedEventArgs ContentsResizedEventArgsB) 

+		{

+			return (ContentsResizedEventArgsA.NewRectangle != ContentsResizedEventArgsB.NewRectangle);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	ContentsResizedEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is ContentsResizedEventArgs))return false;

+			return (this == (ContentsResizedEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " ContentsResizedEventArgs";

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ContentsResizedEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ContentsResizedEventHandler.cs
new file mode 100644
index 00000000000..ed43ff42eb9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ContentsResizedEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.ContentsResizedEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void ContentsResizedEventHandler(

+	object sender,

+	ContentsResizedEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ContextMenu.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ContextMenu.cs
new file mode 100644
index 00000000000..ac06acc5e6d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ContextMenu.cs
@@ -0,0 +1,82 @@
+//

+// System.Windows.Forms.ContextMenu.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+//using System.ComponentModel;

+//using System.Collections;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents a Windows combo box control.

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class ContextMenu : Menu {

+

+		// private fields

+		RightToLeft rightToLeft;

+		

+		// --- Constructor ---

+		[MonoTODO]

+		public ContextMenu() //: base(null) 

+		{

+			rightToLeft = RightToLeft.Inherit;

+		}

+

+		[MonoTODO]

+		public ContextMenu(MenuItem[] menuItems) //: base(menuItems)//menu does not have public constructor. Is this a gtk menu?

+		{

+		}

+		

+		

+		

+		

+		// --- Properties ---

+		public virtual RightToLeft RightToLeft {

+			get { return rightToLeft; }

+			set { rightToLeft=value; }

+		}

+		

+		[MonoTODO]

+		public Control SourceControl {

+			get { throw new NotImplementedException (); }

+		}

+		

+		

+		

+		

+		/// --- Methods ---

+		/// internal .NET framework supporting methods, not stubbed out:

+		/// - protected internal virtual void OnPopup(EventArgs e);

+		[MonoTODO]

+		public void Show(Control control,Point pos) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		

+		

+		

+		/// events

+		[MonoTODO]

+		public event EventHandler Popup {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Control.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Control.cs
new file mode 100644
index 00000000000..56cdece5763
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Control.cs
@@ -0,0 +1,2718 @@
+//

+// System.Windows.Forms.Control.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis Hayes (dennish@rayetk.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Drawing;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Defines the base class for controls, which are components with 

+	/// visual representation.

+	///

+	/// ToDo note:

+	///  - no methods are implemented

+	/// </summary>

+	

+	[MonoTODO]

+	public class Control : Component , ISynchronizeInvoke, IWin32Window {

+

+		protected class ControlNativeWindow : NativeWindow {

+

+			private Control control;

+

+			public ControlNativeWindow (Control control) : base() {

+				this.control = control;

+			}

+

+			protected override void WndProc (ref Message m) {

+				control.WndProc (ref m);

+			}

+		}

+		

+		protected ControlNativeWindow window;

+

+		// private fields

+		//Acually many of these need to be gotten or sent to the OS, 

+		//and not stored here.

+		//string accessibleDefaultActionDescription;

+		//string accessibleDescription;

+		//string accessibleName;

+		//AccessibleRole accessibleRole;

+		//bool allowDrop;

+		//AnchorStyles anchor;

+		//Color backColor;

+		//Image backgroundImage;

+		//BindingContext bindingContext;

+		//Rectangle bounds;

+		//bool causesValidation;

+		//ContextMenu contextMenu;

+		//DockStyle dock;

+		//bool enabled;

+		//Font font;

+		//Color foreColor;

+		//ImeMode imeMode;

+		//bool isAccessible;

+		//Point location;

+		//string name;

+		//Region region;

+		//RightToLeft rightToLeft;

+		//bool tabStop;

+		//string text;

+		//bool visible;

+		

+		// --- Constructors ---

+		public Control ()

+		{

+			CreateParams cp = new CreateParams ();

+			window = new ControlNativeWindow (this);

+			

+			cp.Caption = "";

+			cp.ClassName = "mono_wine_class";

+			cp.X = 10;

+			cp.Y = 10;

+			cp.Width = 50;

+			cp.Height = 50;

+			cp.ClassStyle = 0;

+			cp.ExStyle = 0;

+			cp.Param = 0;

+			cp.Param = 0;

+			cp.Style = (int) Win32.WS_OVERLAPPEDWINDOW;

+

+			window.CreateHandle (cp);

+

+			//Acually many of these need to be gotten or sent to 

+			//the OS, and not stored here.

+			//accessibleDefaultActionDescription=null;

+			//accessibleDescription=null;

+			//accessibleName=null;

+			//accessibleRole=AccessibleRole.Default;

+			//allowDrop=false;

+			//anchor=AnchorStyles.Top|AnchorStyles.Left;

+			//backColor=Control.DefaultBackColor;

+			//backgroundImage=null;

+			//bounds=new Rectangle();

+			//bindingContext=null;

+			//causesValidation=true;

+			//contextMenu=null;

+			//dock=DockStyle.None;

+			//enabled=true;

+			//font=Control.DefaultFont;

+			//foreColor=Control.DefaultForeColor;

+			//imeMode=ImeMode.Inherit;

+			//isAccessible=false;

+			//location=new Point (0,0);

+			//name="";

+			//region=null;

+			//rightToLeft=RightToLeft.Inherit;

+			//tabStop=false;

+			//text="";

+			//visible=true;

+		}

+		

+		public Control (string text) : this() 

+		{

+			throw new NotImplementedException ();

+			//this.text=text;

+		}

+		

+		[MonoTODO]

+		public Control (Control parent, string text) : this (text) 

+		{

+			// FIXME: set parent

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Control (string text, int left, int top, 

+				int width, int height) : this(text) 

+		{

+			// FIXME: set size and location

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Control (Control parent,string text,int left, int top,

+				int width,int height) : this (parent,text) 

+		{

+			// FIXME: set size and location

+			throw new NotImplementedException ();

+		}

+		

+		// --- Properties ---

+		// Properties only supporting .NET framework, not stubbed out:

+		//  - protected bool RenderRightToLeft {get;}

+		//  - public IWindowTarget WindowTarget {get; set;}

+		//[MonoTODO]

+		// AccessibleObject not ready

+		//public AccessibleObject AccessibilityObject {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		public string AccessibleDefaultActionDescription {

+			get {

+				//return accessibleDefaultActionDescription;

+				throw new NotImplementedException ();

+			}

+			set {

+				//accessibleDefaultActionDescription=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public string AccessibleDescription {

+			get {

+				//return accessibleDescription;

+				throw new NotImplementedException ();

+			}

+			set {

+				//accessibleDescription=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public string AccessibleName {

+			get {

+				//return accessibleName;

+				throw new NotImplementedException ();

+			}

+			set {

+				//accessibleName=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public AccessibleRole AccessibleRole {

+			get {

+				//return accessibleRole;

+				throw new NotImplementedException ();

+			}

+			set {

+				//accessibleRole=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public virtual bool AllowDrop {

+			get {

+				//return allowDrop;

+				throw new NotImplementedException ();

+			}

+			set {

+				//allowDrop=value;

+				throw new NotImplementedException ();

+			}

+		}

+	

+		public virtual AnchorStyles Anchor {

+			get {

+				//return anchor;

+				throw new NotImplementedException ();

+			}

+			set {

+				//anchor=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public virtual Color BackColor {

+			get {

+				//return backColor;

+				throw new NotImplementedException ();

+			}

+			set {

+				//backColor=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public virtual Image BackgroundImage {

+			get {

+				//return backgroundImage;

+				throw new NotImplementedException ();

+			}

+			set {

+				//backgroundImage=value;

+				throw new NotImplementedException ();

+			}

+		}

+

+		// waiting for BindingContext

+		//public virtual BindingContext BindingContext {

+		//	get {

+		//		//return bindingContext;

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		//bindingContext=value;

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		[MonoTODO]

+		public int Bottom {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Rectangle Bounds {

+			// CHECKME:

+			get {

+				//return bounds;

+				throw new NotImplementedException ();

+			}

+			set {

+				//bounds=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool CanFocus {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool CanSelect {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool Capture {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public bool CausesValidation {

+			get {

+				//return causesValidation;

+				throw new NotImplementedException ();

+			}

+			set {

+				//causesValidation=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Rectangle ClientRectangle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Size ClientSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public string CompanyName {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool ContainsFocus {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		//public virtual ContextMenu ContextMenu {

+		//	get {

+		//		//return contextMenu;

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		//contextMenu=value;

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		[MonoTODO]

+		public ControlCollection Controls {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool Created {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		protected virtual CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual Cursor Cursor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		// waiting for BindingContext

+		//public ControlBindingsCollection DataBindings {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		public static Color DefaultBackColor {

+			get {

+				//return SystemColors.Control;

+				throw new NotImplementedException ();

+			}

+		}

+

+		//[MonoTODO]

+ 		//public static Font DefaultFont {

+			// FIXME: get current system font from GenericSansSerif

+			//        call ArgumentException not called

+		//	get {

+		//		throw new NotImplementedException ();

+				//return (FontFamily.GenericSansSerif); 

+		//	}

+		//}

+		

+		public static Color DefaultForeColor {

+			get {

+				//return SystemColors.ControlText;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		protected virtual ImeMode DefaultImeMode {

+			get {

+				//return ImeMode.Inherit;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		protected virtual Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual Rectangle DisplayRectangle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool Disposing {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual DockStyle Dock {

+			// CHECKME:

+			get {

+				//return dock;

+				throw new NotImplementedException ();

+			}

+			set {

+				//dock=value;

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public virtual bool Enabled {

+			// CHECKME:

+			get {

+				//return enabled;

+				throw new NotImplementedException ();

+			}

+			set {

+				//enabled=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual bool Focused {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		//public virtual Font Font {

+			// CHECKME:

+		//	get {

+				//return font;

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+				//font=value;

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		[MonoTODO]

+		protected int FontHeight {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual Color ForeColor {

+			// CHECKME:

+			get {

+				//return foreColor;

+				throw new NotImplementedException ();

+			}

+			set {

+				//foreColor=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool HasChildren {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int Height {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public ImeMode ImeMode {

+			// CHECKME:

+			get {

+				//return imeMode;

+				throw new NotImplementedException ();

+			}

+			set {

+				//imeMode=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool IsAccessible {

+			// CHECKME:

+			get {

+				//return isAccessible;

+				throw new NotImplementedException ();

+			} // default is false

+			set {

+				//isAccessible=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool IsDisposed {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool IsHandleCreated {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int Left {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Point Location {

+			// CHECKME:

+			get {

+				//return location;

+				throw new NotImplementedException ();

+			}

+			set {

+				//location=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public static Keys ModifierKeys {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public static MouseButtons MouseButtons {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public static Point MousePosition {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public string Name {

+			// CHECKME:

+			get {

+				//return name;

+				throw new NotImplementedException ();

+			}

+			set {

+				//name=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Control Parent {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public string ProductName {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public string ProductVersion {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool RecreatingHandle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		// Region class not ready

+		//public Region Region {

+		//	// CHECKME:

+		//	get {

+		//		//return region;

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		//region=value;

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		[MonoTODO]

+		protected bool ResizeRedraw {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int Right {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual RightToLeft RightToLeft {

+			// CHECKME:

+			get {

+				//return rightToLeft;

+				throw new NotImplementedException ();

+			}

+			set {

+				//rightToLeft=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShowFocusCues {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		protected bool ShowKeyboardCues {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Size Size {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int TabIndex {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool TabStop {

+			// CHECKME:

+			get {

+				//return tabStop;

+				throw new NotImplementedException ();

+			}

+			set {

+				//tabStop=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public object Tag {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual string Text {

+			// CHECKME:

+			get {

+				//return text;

+				throw new NotImplementedException ();

+			}

+			set {

+				//text=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int Top {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Control TopLevelControl {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool Visible {

+			// CHECKME:

+			get {

+				//return visible;

+				throw new NotImplementedException ();

+			}

+			set {

+				//visible=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int Width {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		

+		

+		/// --- methods ---

+		/// internal .NET framework supporting methods, not stubbed out:

+		/// - protected virtual void NotifyInvalidate(Rectangle invalidatedArea)

+		/// - protected void RaiseDragEvent(object key,DragEventArgs e);

+		/// - protected void RaiseKeyEvent(object key,KeyEventArgs e);

+		/// - protected void RaiseMouseEvent(object key,MouseEventArgs e);

+		/// - protected void RaisePaintEvent(object key,PaintEventArgs e);

+		/// - protected void ResetMouseEventArgs();

+		

+		

+		[MonoTODO]

+		protected void AccessibilityNotifyClients (

+			AccessibleEvents accEvent,int childID) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void BringToFront () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public bool Contains (Control ctl) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void CreateControl () 

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// AccessibleObject not ready

+		//protected virtual AccessibleObject CreateAccessibilityInstance() {

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		protected virtual ControlCollection CreateControlsInstance ()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Graphics CreateGraphics () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected virtual void CreateHandle ()

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected virtual void DefWndProc (ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected virtual void DestroyHandle ()

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected override void Dispose (bool disposing) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public DragDropEffects DoDragDrop (

+			object data, DragDropEffects allowedEffects)

+		{

+			throw new NotImplementedException ();

+		}

+	

+		//public object EndInvoke(IAsyncResult asyncResult):

+		//look under ISynchronizeInvoke methods

+	

+		[MonoTODO]

+		public Form FindForm () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public bool Focus () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static Control FromChildHandle (IntPtr handle) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static Control FromHandle (IntPtr handle) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public Control GetChildAtPoint (Point pt) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		//public IContainerControl GetContainerControl () 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		public Control GetNextControl (Control ctl, bool forward) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected bool GetStyle (ControlStyles flag) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected bool GetTopLevel () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Hide ()

+ 		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void InitLayout () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Invalidate () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Invalidate (bool invalidateChildren) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Invalidate (Rectangle rc) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		// Region class not ready

+		//public void Invalidate(Region region) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		public void Invalidate (Rectangle rc, bool invalidateChildren) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		// Region not ready

+		//public void Invalidate(Region region,bool invalidateChildren) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		protected void InvokeGotFocus (Control toInvoke, EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void InvokeLostFocus (Control toInvoke, EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void InvokeOnClick (Control toInvoke, EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void InvokePaint (Control c, PaintEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void InvokePaintBackground (

+			Control c,PaintEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool IsInputChar (char charCode)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool IsInputKey (Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static bool IsMnemonic (char charCode,string text)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// methods used with events:

+		[MonoTODO]

+		protected virtual void OnBackColorChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnBackgroundImageChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnBindingContextChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnCausesValidationChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		// Region not ready

+		//protected virtual void OnChangeUICues(UICuesEventArgs e) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		protected virtual void OnClick (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnContextMenuChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnControlAdded (ControlEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnControlRemoved (ControlEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnCreateControl ()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnCursorChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDockChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDoubleClick (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDragDrop (DragEventArgs drgevent)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDragEnter (DragEventArgs drgevent)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDragLeave (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDragOver (DragEventArgs drgevent)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnEnabledChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnEnter (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnFontChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnForeColorChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnGiveFeedback (

+			GiveFeedbackEventArgs gfbevent)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnGotFocus (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnHandleCreated (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnHandleDestroyed (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnHelpRequested (HelpEventArgs hevent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnImeModeChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnInvalidated (InvalidateEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnKeyDown (KeyEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnKeyPress (KeyPressEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnKeyUp (KeyEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnLayout (LayoutEventArgs levent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnLeave (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnLocationChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnLostFocus (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseDown (MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseEnter (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseHover (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseLeave (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseMove (MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseUp (MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseWheel (MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMove (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnNotifyMessage (Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnPaint (PaintEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnPaintBackground (

+			PaintEventArgs pevent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentBackColorChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentBackgroundImageChanged (

+			EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentBindingContextChanged(

+			EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentEnabledChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentFontChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentForeColorChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentRightToLeftChanged (

+			EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentVisibleChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnQueryContinueDrag (

+			QueryContinueDragEventArgs qcdevent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnResize (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnRightToLeftChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnSizeChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnStyleChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnSystemColorsChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnTabIndexChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnTabStopChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnTextChanged (EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnTextAlignChanged (EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnValidated (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		// CancelEventArgs not ready

+		//protected virtual void OnValidating(CancelEventArgs e) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		protected virtual void OnVisibleChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		// --- end of methods for events ---

+		

+		

+		[MonoTODO]

+		public void PerformLayout () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void PerformLayout (Control affectedControl,

+					   string affectedProperty) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Point PointToClient (Point p) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Point PointToScreen (Point p) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual bool PreProcessMessage (ref Message msg) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessCmdKey (ref Message msg,

+						      Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessDialogChar (char charCode) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessDialogKey (Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessKeyEventArgs (ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual bool ProcessKeyMessage (

+			ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessKeyPreview (ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessMnemonic (char charCode) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void RecreateHandle() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Rectangle RectangleToClient (Rectangle r) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Rectangle RectangleToScreen (Rectangle r) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected static bool ReflectMessage (IntPtr hWnd,

+						      ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void Refresh () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void ResetBackColor () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetBindings () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void ResetFont () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void ResetForeColor () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetImeMode () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void ResetRightToLeft () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void ResetText () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResumeLayout () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResumeLayout (bool performLayout) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected ContentAlignment RtlTranslateAlignment (

+			ContentAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected HorizontalAlignment RtlTranslateAlignment (

+			HorizontalAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected LeftRightAlignment RtlTranslateAlignment (

+			LeftRightAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected ContentAlignment RtlTranslateContent (

+			ContentAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected HorizontalAlignment RtlTranslateHorizontal (

+			HorizontalAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected LeftRightAlignment RtlTranslateLeftRight (

+			LeftRightAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Scale (float ratio) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Scale (float dx,float dy) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void ScaleCore (float dx, float dy) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Select () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void Select (bool directed,bool forward) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public bool SelectNextControl (Control ctl, bool forward, 

+					       bool tabStopOnly, 

+					       bool nested, bool wrap)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SendToBack () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SetBounds (int x, int y, int width, int height) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SetBounds (int x, int y, int width, int height,

+				       BoundsSpecified specified) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void SetBoundsCore (

+			int x, int y, int width, int height,

+			BoundsSpecified specified) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void SetClientSizeCore (int x, int y)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void SetStyle (ControlStyles flag, bool value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void SetTopLevel (bool value)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void SetVisibleCore (bool value)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Show () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SuspendLayout () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Update () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void UpdateBounds () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void UpdateBounds (int x, int y, int width, int height) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void UpdateBounds (

+			int x, int y, int width, int height, int clientWidth,

+			int clientHeight)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void UpdateStyles () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void UpdateZOrder () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void WndProc(ref Message m) 

+		{

+

+		}

+		

+		/// --- Control: events ---

+		[MonoTODO]

+		public event EventHandler BackColorChanged;// {

+//			add {

+//				throw new NotImplementedException ();

+//			}

+//			remove {

+//				throw new NotImplementedException ();

+//			}

+//		}

+		

+		[MonoTODO]

+		public event EventHandler BackgroundImageChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler BindingContextChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler CausesValidationChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event UICuesEventHandler ChangeUICues {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Click {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ContextMenuChanged;

+		

+		[MonoTODO]

+		public event ControlEventHandler ControlAdded	{

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event ControlEventHandler ControlRemoved	{

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler CursorChanged	{

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler DockChanged	{

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler DoubleClick {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event DragEventHandler DragDrop {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event DragEventHandler DragEnter {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler DragLeave {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event DragEventHandler DragOver {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler EnabledChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Enter {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler FontChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ForeColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event GiveFeedbackEventHandler GiveFeedback {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler GotFocus {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler HandleCreated {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler HandleDestroyed {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event HelpEventHandler HelpRequested {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ImeModeChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event InvalidateEventHandler Invalidated {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event KeyEventHandler KeyDown {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event KeyPressEventHandler KeyPress {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event KeyEventHandler KeyUp {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event LayoutEventHandler Layout {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Leave {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler LocationChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler LostFocus {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event MouseEventHandler MouseDown {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler MouseEnter {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler MouseHover {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler MouseLeave {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event MouseEventHandler MouseMove {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event MouseEventHandler MouseUp {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event MouseEventHandler MouseWheel {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Move {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event PaintEventHandler Paint {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ParentChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event QueryAccessibilityHelpEventHandler QueryAccessibilityHelp {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event QueryContinueDragEventHandler QueryContinueDrag {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Resize {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler RightToLeftChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler SizeChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler StyleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler SystemColorsChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler TabIndexChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler TabStopChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler TextChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Validated {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		// CancelEventHandler not yet defined

+		//public event CancelEventHandler Validating {

+		//	add {

+		//		throw new NotImplementedException ();

+		//	}

+		//	remove {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		[MonoTODO]

+		public event EventHandler VisibleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		/// --- IWin32Window properties

+		[MonoTODO]

+		public IntPtr Handle {

+			get { throw new NotImplementedException (); }

+		}

+		

+		/// --- ISynchronizeInvoke properties ---

+		[MonoTODO]

+		public bool InvokeRequired {

+			get { throw new NotImplementedException (); }

+		}

+		

+		/// --- ISynchronizeInvoke methods ---

+		[MonoTODO]

+		public IAsyncResult BeginInvoke (Delegate method) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public IAsyncResult BeginInvoke (Delegate method,

+						 object[] args) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public object EndInvoke (IAsyncResult asyncResult) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public object Invoke (Delegate method) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public object Invoke (Delegate method,object[] args) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/// sub-class: Control.ControlAccessibleObject

+		/// <summary>

+		/// Provides information about a control that can be used by an accessibility application.

+		/// </summary>

+		public class ControlAccessibleObject /*: AccessibleObject*/ {

+			// AccessibleObject not ready to be base class

+			/// --- ControlAccessibleObject.constructor ---

+			[MonoTODO]

+			public ControlAccessibleObject (Control ownerControl) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			

+			/// --- ControlAccessibleObject Properties ---

+			[MonoTODO]

+// 			public override string DefaultAction {

+// 				get { throw new NotImplementedException (); }

+// 			}

+			

+			[MonoTODO]

+// 			public override string Description {

+// 				get { throw new NotImplementedException (); }

+// 			}

+			

+			[MonoTODO]

+			public IntPtr Handle {

+				get { throw new NotImplementedException (); }

+				set { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+// 			public override string Help {

+// 				get { throw new NotImplementedException (); }

+// 			}

+			

+			[MonoTODO]

+// 			public override string KeyboardShortcut {

+// 				get { throw new NotImplementedException (); }

+// 			}

+			

+			[MonoTODO]

+// 			public override string Name {

+// 				get { throw new NotImplementedException (); }

+// 				set { throw new NotImplementedException (); }

+// 			}

+			

+			[MonoTODO]

+			public Control Owner {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+// 			public override AccessibleRole Role {

+// 				get { throw new NotImplementedException (); }

+// 			}

+			

+			

+			/// --- ControlAccessibleObject Methods ---

+			[MonoTODO]

+// 			public override int GetHelpTopic(out string fileName) 

+// 			{

+// 				throw new NotImplementedException ();

+// 			}

+			

+			[MonoTODO]

+			public void NotifyClients (AccessibleEvents accEvent) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void NotifyClients (AccessibleEvents accEvent,

+						   int childID) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override string ToString ()

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		/// sub-class: Control.ControlCollection

+		/// <summary>

+		/// Represents a collection of Control objects

+		/// </summary>

+		public class ControlCollection : IList, ICollection, IEnumerable, ICloneable {

+			

+			/// --- ControlCollection.constructor ---

+			[MonoTODO]

+			public ControlCollection (Control owner) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			/// --- ControlCollection Properties ---

+			[MonoTODO]

+			public int Count {

+				get { throw new NotImplementedException (); }

+			}

+		

+			[MonoTODO]

+			public bool IsReadOnly {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public virtual Control this [int index] {

+				get { throw new NotImplementedException (); }

+			}

+		

+		

+			/// --- ControlCollection Methods ---

+			/// .NET framework supporting internal methods, not stubbed out:

+			/// - object ICloneable.Clone();

+			/// Note: IList methods stubbed out, otherwise does not compile

+			

+			[MonoTODO]

+			public virtual void Add (Control value) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public virtual void AddRange (Control[] controls) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public virtual void Clear () 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			public bool Contains (Control control) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void CopyTo (Array dest,int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override bool Equals (object other) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			//inherited

+			//public static bool Equals(object o1, object o2) {

+			//	throw new NotImplementedException ();

+			//}

+

+			[MonoTODO]

+			public int GetChildIndex (Control child) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public int GetChildIndex (Control child,

+						  bool throwException) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public IEnumerator GetEnumerator () 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override int GetHashCode () 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public int IndexOf (Control control) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public virtual void Remove (Control value) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void RemoveAt (int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void SetChildIndex (Control child,int newIndex) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			

+			

+			/// --- ControlCollection.IClonable methods ---

+			[MonoTODO]

+			object ICloneable.Clone ()

+			{

+				throw new NotImplementedException ();

+			}

+	

+			

+			

+			/// --- ControlCollection.IList properties ---

+			[MonoTODO]

+			bool IList.IsFixedSize {

+				get { throw new NotImplementedException (); }

+			}

+

+			[MonoTODO]			

+			object IList.this [int index] {

+				get { throw new NotImplementedException (); }

+				set { throw new NotImplementedException (); }

+			}

+

+			[MonoTODO]				

+			object ICollection.SyncRoot {

+				get { throw new NotImplementedException (); }

+			}

+	

+			[MonoTODO]				

+			bool ICollection.IsSynchronized {

+				get { throw new NotImplementedException (); }

+			}

+			

+			/// --- ControlCollection.IList methods ---

+			[MonoTODO]

+			int IList.Add (object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			bool IList.Contains (object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.IndexOf (object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Insert (int index,object value) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Remove (object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		}  // --- end of Control.ControlCollection ---

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs
new file mode 100644
index 00000000000..1e5c9623e31
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlBindingsCollection.cs
@@ -0,0 +1,85 @@
+//

+// System.Windows.Forms.ControlBindingsCollection.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Collections;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the collection of data bindings for a control.

+	///

+	/// ToDo note:

+	///  - no methods are implemented

+	/// </summary>

+	

+	[MonoTODO]

+	public class ControlBindingsCollection : BindingsCollection {

+

+		#region Constructors

+		protected internal ControlBindingsCollection() : base () 

+		{

+		}

+		#endregion

+		

+		

+		#region Properties

+		[MonoTODO]

+		public Control Control {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public Binding this[string propertyName] {

+			get { throw new NotImplementedException (); }

+		}

+		#endregion

+		

+		

+		

+		

+		#region Methods

+		/// following methods were not stubbed out, because they only support .NET framework:

+		/// - protected override void AddCore(Binding dataBinding);

+		/// - protected override void ClearCore();

+		/// - protected override void RemoveCore(Binding dataBinding);

+		[MonoTODO]

+		public new void Add(Binding binding) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Binding Add(string propertyName,object dataSource,string dataMember) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public new void Clear() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public new void Remove(Binding binding) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public new void RemoveAt(int index) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlEventArgs.cs
new file mode 100644
index 00000000000..7c8804b109d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlEventArgs.cs
@@ -0,0 +1,121 @@
+//

+// System.Windows.Forms.ControlEventArgs.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	  implemented for Gtk+ by Rachel Hestilow (hestilow@ximian.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+

+// (C) Ximian, Inc., 2002

+

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Complete.

+	/// </summary>

+

+	public class ControlEventArgs : EventArgs {

+

+		#region Fields

+		Control control;

+		#endregion

+

+		public ControlEventArgs(Control control) 

+		{

+			this.control = control;

+		}

+		

+		#region Public Properties

+		public Control Control 

+		{

+			get 

+				{ 

+					return control; 

+				}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ControlEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	control Property

+		///	of the two ControlEventArgs.

+		/// </remarks>

+		public static bool operator == (ControlEventArgs ControlEventArgsA, ControlEventArgs ControlEventArgsB) 

+		{

+			return (ControlEventArgsA.Control == ControlEventArgsB.Control);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ControlEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	control Property

+		///	of the two ControlEventArgs.

+		/// </remarks>

+		public static bool operator != (ControlEventArgs ControlEventArgsA, ControlEventArgs ControlEventArgsB) 

+		{

+			return (ControlEventArgsA.Control != ControlEventArgsB.Control);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	ControlEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is ControlEventArgs))return false;

+			return (this == (ControlEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " ControlEventArgs";

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlEventHandler.cs
new file mode 100644
index 00000000000..e478b17c87e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.ControlEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void ControlEventHandler (

+	object sender,

+	ControlEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlPaint.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlPaint.cs
new file mode 100644
index 00000000000..708d49ba84d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlPaint.cs
@@ -0,0 +1,466 @@
+//

+// System.Windows.Forms.ControlPaint.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc 2002

+//

+

+

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides methods used to paint common Windows controls and their elements.

+	///

+	/// ToDo note:

+	///  - Nothing is implemented

+	/// </summary>

+	

+	[MonoTODO]

+  public sealed class ControlPaint {

+

+		#region Properties

+		[MonoTODO]

+		public static Color ContrastControlDark {

+

+			get { throw new NotImplementedException (); }

+		}

+		#endregion

+		

+		#region Methods

+		/// following methods were not stubbed out, because they only support .NET framework:

+		/// - public static IntPtr CreateHBitmap16Bit(Bitmap bitmap,Color background)

+		/// - public static IntPtr CreateHBitmapColorMask(Bitmap bitmap,IntPtr monochromeMask);

+		/// - public static IntPtr CreateHBitmapTransparencyMask(Bitmap bitmap);

+		[MonoTODO]

+		public static Color Dark(Color baseColor) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static Color Dark(Color baseColor,float percOfDarkDark) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static Color DarkDark(Color baseColor) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawBorder(

+			Graphics graphics) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawBorder(

+			Graphics graphics,

+			Rectangle bounds,

+			Color leftColor,

+			int leftWidth,

+			ButtonBorderStyle leftStyle,

+			Color topColor,

+			int topWidth,

+			ButtonBorderStyle topStyle,

+			Color rightColor,

+			int rightWidth,

+			ButtonBorderStyle rightStyle,

+			Color bottomColor,

+			int bottomWidth,

+			ButtonBorderStyle bottomStyle) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawBorder3D(

+			Graphics graphics,

+			Rectangle rectangle) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawBorder3D(

+			Graphics graphics,

+			Rectangle rectangle,

+			Border3DStyle Style) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawBorder3D(

+			Graphics graphics,

+			Rectangle rectangle,

+			Border3DStyle Style,

+			Border3DSide Sides) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawBorder3D(

+			Graphics graphics, int x) {

+			throw new NotImplementedException ();

+		}

+		//is this part of spec? I do not think so.

+		//[MonoTODO]

+		//public static void DrawBorder3D(

+		//	Graphics graphics, int x) {

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		public static void DrawBorder3D(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawBorder3D(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height,

+			Border3DStyle style) {

+

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static void DrawBorder3D(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height,

+			Border3DStyle style,

+			Border3DSide sides) {

+

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static void DrawButton(

+			Graphics graphics,

+			Rectangle rectangle) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawButton(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height,

+			ButtonState state) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawCaptionButton(

+			Graphics graphics,

+			Rectangle rectangle) {

+

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawCaptionButton(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height,

+			CaptionButton button,

+			ButtonState state) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawCheckBox(

+			Graphics graphics,

+			Rectangle rectangle) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawCheckBox(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height,

+			ButtonState state) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawComboButton(

+			Graphics graphics,

+			Rectangle rectangle) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawComboButton(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height,

+			ButtonState state) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawContainerGrabHandle(Graphics graphics,Rectangle bounds) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawFocusRectangle(

+			Graphics graphics,

+			Rectangle rectangle) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawFocusRectangle(

+			Graphics graphics,

+			Rectangle rectangle,

+			Color foreColor,

+			Color backColor) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawGrabHandle(

+			Graphics graphics,

+			Rectangle rectangle,

+			bool primary,

+			bool enabled) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawGrid(

+			Graphics graphics,

+			Rectangle area,

+			Size pixelsBetweenDots,

+			Color backColor) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawImageDisabled(

+			Graphics graphics,

+			Image image,

+			int x,

+			int y,

+			Color background) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawLockedFrame(

+			Graphics graphics,

+			Rectangle rectangle,

+			bool primary) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawMenuGlyph(

+			Graphics graphics,

+			Rectangle rectangle,

+			MenuGlyph glyph) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawMenuGlyph(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height,

+			MenuGlyph glyph) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawMixedCheckBox(

+			Graphics graphics,

+			Rectangle rectangle,

+			ButtonState state) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawMixedCheckBox(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height,

+			ButtonState state) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawRadioButton(

+			Graphics graphics,

+			Rectangle rectangle,

+			ButtonState state) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawRadioButton(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height,

+			ButtonState state) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawReversibleFrame(

+			Rectangle rectangle,

+			Color backColor) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawReversibleLine(

+			Point start,

+			Point end,

+			Color backColor) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawScrollButton(

+			Graphics graphics,

+			Rectangle rectangle,

+			ScrollButton button) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawScrollButton(

+			Graphics graphics,

+			int x,

+			int y,

+			int width,

+			int height,

+			ScrollButton button,

+			ButtonState state) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawSelectionFrame(

+			Graphics graphics,

+			bool active,

+			Rectangle outsideRect,

+			Rectangle insideRect,

+			Color backColor) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawSizeGrip(

+			Graphics graphics,

+			Color backColor) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawSizeGrip(

+			Graphics graphics,

+			Color backColor,

+			int x,

+			int y,

+			int width,

+			int height) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void DrawStringDisabled(

+			Graphics graphics,

+			string s,

+			Font font,

+			Color color,

+			RectangleF layoutRectangle,

+			StringFormat format) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void FillReversibleRectangle(

+			Rectangle rectangle,

+			Color backColor) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static Color Light(Color baseColor) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static Color Light(Color baseColor,float percOfLightLight) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public static Color LightLight(Color baseColor) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlStyles.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlStyles.cs
new file mode 100644
index 00000000000..bddb6c49752
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ControlStyles.cs
@@ -0,0 +1,32 @@
+//

+// System.Windows.Forms.ControlStyles.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ControlStyles {

+		AllPaintingInWmPaint = 8192,

+		CacheText = 16384,

+		ContainerControl = 1,

+		DoubleBuffer = 65536,

+		EnableNotifyMessage = 32768,

+		FixedHeight = 64,

+		FixedWidth = 32,

+		Opaque = 4,

+		ResizeRedraw = 16,

+		Selectable = 512,

+		StandardClick = 256,

+		StandardDoubleClick = 4096,

+		SupportsTransparentBackColor = 2045,

+		UserMouse = 1024,

+		UserPaint = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ConvertEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ConvertEventArgs.cs
new file mode 100644
index 00000000000..ccc4f86dd98
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ConvertEventArgs.cs
@@ -0,0 +1,134 @@
+//

+// System.Windows.Forms.ConvertEventArgs.cs

+//

+// Author:

+//  Stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Finished by Dennis Hayes (dennish@raytek.com)

+//  Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides data for the Format and Parse events.

+	/// </summary>

+

+	public class ConvertEventArgs : EventArgs {

+

+		#region Fields

+

+		private Type desiredtype;

+		private object objectvalue;

+

+		#endregion

+		

+		//Constructor

+		public ConvertEventArgs(object objectValue,Type desiredType) 

+		{

+			this.desiredtype = desiredType;

+			this.objectvalue = objectValue;

+		}

+		

+		#region Public Properties

+		public Type DesiredType 

+		{

+			get { 

+					return desiredtype; 

+				}

+		}

+		

+		public object Value {

+			get { 

+				return objectvalue; 

+			}

+			set {

+				objectvalue = value; 

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ConvertEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	DesiredType and Value Property

+		///	of the two ContentsResizedEventArgs.

+		/// </remarks>

+		public static bool operator == (ConvertEventArgs ConvertEventArgsA, ConvertEventArgs ConvertEventArgsB) 

+		{

+			return (ConvertEventArgsA.DesiredType == ConvertEventArgsB.DesiredType) && 

+				   (ConvertEventArgsA.Value == ConvertEventArgsB.Value);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ConvertEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	DesiredType and Value Property

+		///	of the two ContentsResizedEventArgs.

+		/// </remarks>

+		public static bool operator != (ConvertEventArgs ConvertEventArgsA, ConvertEventArgs ConvertEventArgsB) 

+		{

+			return (ConvertEventArgsA.DesiredType != ConvertEventArgsB.DesiredType) || 

+				   (ConvertEventArgsA.Value != ConvertEventArgsB.Value);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	ConvertEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is ConvertEventArgs))return false;

+			return (this == (ConvertEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " ConvertEventArgs";

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ConvertEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ConvertEventHandler.cs
new file mode 100644
index 00000000000..080edc9fdc8
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ConvertEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.ConvertEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void ConvertEventHandler (

+	object sender,

+	ConvertEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/CreateParams.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/CreateParams.cs
new file mode 100644
index 00000000000..b6bb0c463f9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/CreateParams.cs
@@ -0,0 +1,108 @@
+//

+// System.Windows.Forms.CreateParams.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Collections;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Encapsulates the information needed when creating a control.

+	/// </summary>

+	

+	public class CreateParams {

+

+		#region Fields

+		private string caption;

+		private string className;

+		private int classStyle;

+		private int exStyle;

+		private int height;

+		private object param;

+		private IntPtr parent;

+		private int style;

+		private int width;

+		private int x;

+		private int y;

+		#endregion

+		

+		#region Constructors

+		public CreateParams() 

+		{

+		}

+		#endregion

+		

+		#region Properties

+		public string Caption {

+			get { return caption; }

+			set { caption = value; }

+		}

+		

+		public string ClassName {

+			get { return className; }

+			set { className = value; }

+		}

+		

+		public int ClassStyle {

+			get { return classStyle; }

+			set { classStyle = value; }

+		}

+		

+		public int ExStyle {

+			get { return exStyle; }

+			set { exStyle = value; }

+		}

+		

+		public int Height {

+			get { return height; }

+			set { height = value; }

+		}

+		

+		public object Param {

+			get { return param; }

+			set { param = value; }

+		}

+		

+		public IntPtr Parent {

+			get { return parent; }

+			set { parent = value; }

+		}

+		

+		public int Style {

+			get { return style; }

+			set { style = value; }

+		}

+		

+		public int Width {

+			get { return width; }

+			set { width = value; }

+		}

+		

+		public int X {

+			get { return x; }

+			set { x = value; }

+		}

+		

+		public int Y {

+			get { return y; }

+			set { y = value; }

+		}

+		#endregion

+		

+		#region Methods

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/CurrencyManager.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/CurrencyManager.cs
new file mode 100644
index 00000000000..dd6a79ed624
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/CurrencyManager.cs
@@ -0,0 +1,157 @@
+//

+// System.Windows.Forms.CurrencyManager.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.ComponentModel;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Manages a list of Binding objects.

+	/// </summary>

+	[MonoTODO]

+	public class CurrencyManager : BindingManagerBase {

+

+		#region Fields

+		/* uncomment if needed

+		protected Type finalType;

+		protected int listposition;

+		*/

+		#endregion

+

+

+

+		#region Properties

+		[MonoTODO]

+		public override int Count {

+			get { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		public override object Current {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public IList List {

+			get { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		public override int Position {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		#endregion

+

+

+

+

+		#region Methods

+		[MonoTODO]

+		public override void AddNew() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void CancelCurrentEdit() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void CheckEmpty() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void EndCurrentEdit() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override PropertyDescriptorCollection GetItemProperties() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override string GetListName(ArrayList listAccessors) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/// <methods for events>

+		[MonoTODO]

+		protected internal override void OnCurrentChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnItemChanged(ItemChangedEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/* this method only supports .NET framework

+		[MonoTODO]

+		protected virtual void OnPositionChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}*/

+		/// </methods for events>

+		

+		[MonoTODO]

+		public void Refresh() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void RemoveAt(int index) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void ResumeBinding() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void SuspendBinding() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void UpdateIsBinding() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+

+

+

+		#region Events

+		[MonoTODO]

+		public event ItemChangedEventHandler ItemChanged {

+			add { throw new NotImplementedException (); }

+			remove { throw new NotImplementedException (); }

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Cursor.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Cursor.cs
new file mode 100644
index 00000000000..fb1a8f66890
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Cursor.cs
@@ -0,0 +1,180 @@
+//

+// System.Windows.Forms.Cursor.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Runtime.Serialization;

+using System.IO;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the image used to paint the mouse pointer.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	[Serializable]

+	public sealed class Cursor : IDisposable, ISerializable {

+

+		#region Fields

+		#endregion

+		

+		

+		

+		#region Constructors

+		[MonoTODO]

+		public Cursor(IntPtr handle) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Cursor(Stream stream) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Cursor(string fileName) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Cursor(Type type,string resource) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		

+		#region Properties

+		[MonoTODO]

+		public static Rectangle Clip {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor Current {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public IntPtr Handle {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Point Position {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public Size Size {

+			get { throw new NotImplementedException (); }

+		}

+		#endregion

+		

+		

+		

+		

+		#region Methods

+		[MonoTODO]

+		public IntPtr CopyHandle() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Dispose() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Draw(Graphics g,Rectangle targetRect) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void DrawStretched(Graphics g,Rectangle targetRect) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override bool Equals(object obj) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		~Cursor() {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override int GetHashCode() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void Hide() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/// ISerializable.GetObjectData only supports .NET framework:

+		[MonoTODO]

+		void ISerializable.GetObjectData(SerializationInfo si,StreamingContext context) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static void Show() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		#region Operators

+		[MonoTODO]

+		public static bool operator ==(Cursor left, Cursor right) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static bool operator !=(Cursor left, Cursor right) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/CursorConverter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/CursorConverter.cs
new file mode 100644
index 00000000000..3d7c33a5179
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/CursorConverter.cs
@@ -0,0 +1,75 @@
+//

+// System.Windows.Forms.CursorConverter.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Globalization;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides a type converter to convert Cursor objects to and from various other representations.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class CursorConverter : TypeConverter {

+

+		

+		#region Constructors

+		[MonoTODO]

+		public CursorConverter() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		#region Methods

+		[MonoTODO]

+		public override bool CanConvertFrom(ITypeDescriptorContext context,Type sourceType) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override bool CanConvertTo(ITypeDescriptorContext context,Type destinationType) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override object ConvertFrom(ITypeDescriptorContext context,CultureInfo culture,object value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override object ConvertTo(ITypeDescriptorContext context,CultureInfo culture,object value,Type destinationType) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override bool GetStandardValuesSupported(ITypeDescriptorContext context) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Cursors.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Cursors.cs
new file mode 100644
index 00000000000..9fcf4ef2dc8
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Cursors.cs
@@ -0,0 +1,170 @@
+//

+// System.Windows.Forms.Cursors.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Runtime.Serialization;

+using System.IO;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides a collection of Cursor objects for use by a Windows Forms application.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public sealed class Cursors {

+

+		#region Properties

+		[MonoTODO]

+		public static Cursor AppStarting {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor Arrow {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor Cross {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor Default {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor Hand {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor Help {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor HSplit {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor IBeam {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor No {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor NoMove2D {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor NoMoveHoriz {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor NoMoveVert {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor PanEast {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor PanNE {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor PanNorth {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor PanNW {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor PanSE {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor PanSouth {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor PanSW {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor PanWest {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor SizeAll {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor SizeNESW {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor SizeNS {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor SizeNWSE {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor SizeWE {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor UpArrow {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor VSplit {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public static Cursor WaitCursor {

+			get { throw new NotImplementedException (); }

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataFormats.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataFormats.cs
new file mode 100644
index 00000000000..18a4f8c0f6a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataFormats.cs
@@ -0,0 +1,100 @@
+//

+// System.Windows.Forms.DataFormats

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides static (Shared in Visual Basic), predefined Clipboard format names.

+	/// Use them to identify the format of data that you store in an IDataObject.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class DataFormats {

+

+		#region Fields

+		public static readonly string Bitmap="Bitmap";

+		public static readonly string CommaSeparatedValue="Csv";

+		public static readonly string Dib="DeviceIndependentBitmap";

+		public static readonly string Dif="DataInterchangeFormat";

+		public static readonly string EnhancedMetafile="EnhancedMetafile";

+		public static readonly string FileDrop="FileDrop";

+		public static readonly string Html="HTML Format";

+		public static readonly string Locale="Locale";

+		public static readonly string MetafilePict="MetaFilePict";

+		public static readonly string OemText="OEMText";

+		public static readonly string Palette="Palette";

+		public static readonly string PenData="PenData";

+		public static readonly string Riff="RiffAudio";

+		public static readonly string Rtf="Rich Text Format";

+		public static readonly string Serializable="WindowsForms10PersistentObject";

+		public static readonly string StringFormat="System.String";

+		public static readonly string Text="Text";

+		public static readonly string Tiff="TaggedImageFileFormat";

+		public static readonly string UnicodeText="UnicodeText";

+		public static readonly string WaveAudio="WaveAudio";

+		#endregion

+		

+		

+		#region Methods

+		/// <todo>

+		/// these methods will have to use Windows Registry to fetch the existing Format (id,name)

+		/// or create a new format with the given string/int

+		/// </todo>

+		[MonoTODO]

+		public static Format GetFormat(int id) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static Format GetFormat(string format) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		/// sub-class: DataFormats.Format

+		/// <summary>

+		/// Represents a clipboard format type.

+		/// </summary>

+		public class Format {

+			int id;

+			string name;

+			

+			

+			#region Constructors

+			/// <note>

+			/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+			/// </note>

+			public Format (string name,int id) 

+			{

+				this.id=id;

+				this.name=name;

+			}

+			#endregion

+

+			#region Methods

+			public int Id {

+				get { return id; }

+			}

+

+			public string Name {

+				get { return name; }

+			}

+			#endregion

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGrid.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGrid.cs
new file mode 100644
index 00000000000..b4bd3af2774
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGrid.cs
@@ -0,0 +1,1107 @@
+//

+// System.Windows.Forms.DataGrid

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Displays ADO.NET data in a scrollable grid.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class DataGrid : Control, ISupportInitialize {

+

+		#region Fields

+		bool allowNavigation;

+		bool allowSorting;

+		Color alternatingBackColor;

+		Color backgroundColor;

+		BorderStyle borderStyle;

+		Color captionBackColor;

+		Font captionFont;

+		Color captionForeColor;

+		string captionText;

+		bool captionVisible;

+		bool columnHeadersVisible;

+		string dataMember;

+		bool flatMode;

+		Color gridLineColor;

+		DataGridLineStyle gridLineStyle;

+		Color headerBackColor;

+		Color headerForeColor;

+		Color linkColor;

+		Color linkHoverColor;

+		Color parentRowsBackColor;

+		Color parentRowsForeColor;

+		DataGridParentRowsLabelStyle parentRowsLabelStyle;

+		bool parentRowsVisible;

+		bool readOnly;

+		int rowHeaderWidth;

+		Color selectionBackColor;

+		Color selectionForeColor;

+		#endregion

+		

+		#region Constructors

+		[MonoTODO]

+		public DataGrid() 

+		{

+			// setting default values:

+			allowNavigation=true;

+			borderStyle = BorderStyle.FixedSingle;

+			captionBackColor = SystemColors.ActiveCaption;

+			captionForeColor = SystemColors.ActiveCaptionText;

+			captionText = "";

+			captionVisible = true;

+			columnHeadersVisible = true;

+			dataMember = "";

+			flatMode = true;

+			gridLineColor = SystemColors.Control;

+			gridLineStyle = DataGridLineStyle.Solid;

+			headerBackColor = SystemColors.Control;

+			headerForeColor = SystemColors.ControlText;

+			linkColor = SystemColors.HotTrack;

+			linkHoverColor = SystemColors.HotTrack;

+			parentRowsBackColor = SystemColors.Control;

+			parentRowsForeColor = SystemColors.WindowText;

+			parentRowsLabelStyle = DataGridParentRowsLabelStyle.Both;

+			parentRowsVisible = true;

+			readOnly = false;

+			rowHeaderWidth = 50;

+			selectionBackColor = SystemColors.ActiveCaption;

+			selectionForeColor = SystemColors.ActiveCaptionText;

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		#region Properties

+		public bool AllowNavigation {

+			get { return allowNavigation; }

+			set { allowNavigation=value; }

+		}

+		

+		public bool AllowSorting {

+			get { return allowSorting; }

+			set { allowSorting=value; }

+		}

+		

+		public Color AlternatingBackColor {

+			get { return alternatingBackColor; }

+			set { alternatingBackColor=value; }

+		}

+		

+		[MonoTODO]

+		public override Color BackColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public Color BackgroundColor {

+			get { return backgroundColor; }

+			set { backgroundColor=value; }

+		}

+		

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public BorderStyle BorderStyle {

+			get { return borderStyle; }

+			set { borderStyle=value; }

+		}

+		

+		public Color CaptionBackColor {

+			get { return captionBackColor; }

+			set { captionBackColor=value; }

+		}

+		

+		public Font CaptionFont {

+			get { return captionFont; }

+			set { captionFont=value; }

+		}

+		

+		public Color CaptionForeColor {

+			get { return captionForeColor; }

+			set { captionForeColor=value; }

+		}

+		

+		public string CaptionText {

+			get { return captionText; }

+			set { captionText=value; }

+		}

+		

+		public bool CaptionVisible {

+			get { return captionVisible; }

+			set { captionVisible=value; }

+		}

+		

+		public bool ColumnHeadersVisible {

+			get { return columnHeadersVisible; }

+			set { columnHeadersVisible=value; }

+		}

+		

+		[MonoTODO]

+		public DataGridCell CurrentCell {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int CurrentRowIndex {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Cursor Cursor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public string DataMember {

+			get { return dataMember; }

+			set { dataMember=value; }

+		}

+		

+		[MonoTODO]

+		public object DataSource {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int FirstVisibleColumn {

+			get { throw new NotImplementedException (); }

+		}

+		

+		public bool FlatMode {

+			get { return flatMode; }

+			set { flatMode=value; }

+		}

+		

+		[MonoTODO]

+		public override Color ForeColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public Color GridLineColor {

+			get { return gridLineColor; }

+			set { gridLineColor=value; }

+		}

+		

+		public DataGridLineStyle GridLineStyle {

+			get { return gridLineStyle; }

+			set { gridLineStyle=value; }

+		}

+		

+		public Color HeaderBackColor {

+			get { return headerBackColor; }

+			set {

+				if (value==Color.Empty) throw new ArgumentNullException();

+				headerBackColor=value;

+			}

+		}

+		

+		public Color HeaderForeColor {

+			get { return headerForeColor; }

+			set { headerForeColor=value; }

+		}

+		

+		[MonoTODO]

+		protected ScrollBar HorizScrollBar {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public object this[DataGridCell cell] {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public object this[int rowIndex,int columnIndex] {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public Color LinkColor {

+			get { return linkColor; }

+			set { linkColor=value; }

+		}

+		

+		public Color LinkHoverColor {

+			get { return linkHoverColor; }

+			set { linkHoverColor=value; }

+		}

+		

+		[MonoTODO]

+		protected internal CurrencyManager ListManager {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public Color ParentRowsBackColor {

+			get { return parentRowsBackColor; }

+			set { parentRowsBackColor=value; }

+		}

+		

+		public Color ParentRowsForeColor {

+			get { return parentRowsForeColor; }

+			set { parentRowsForeColor=value; }

+		}

+		

+		public DataGridParentRowsLabelStyle ParentRowsLabelStyle {

+			get { return parentRowsLabelStyle; }

+			set { parentRowsLabelStyle=value; }

+		}

+		

+		public bool ParentRowsVisible {

+			get { return parentRowsVisible; }

+			set { parentRowsVisible=value; }

+		}

+		

+		[MonoTODO]

+		public int PreferredColumnWidth {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int PreferredRowHeight {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public bool ReadOnly {

+			get { return readOnly; }

+			set { readOnly=value; }

+		}

+		

+		[MonoTODO]

+		public bool RowHeadersVisible {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int RowHeaderWidth {

+			get { return rowHeaderWidth; }

+			set { rowHeaderWidth=value; }

+		}

+		

+		public Color SelectionBackColor {

+			get { return selectionBackColor; }

+			set { selectionBackColor=value; }

+		}

+		

+		public Color SelectionForeColor {

+			get { return selectionForeColor; }

+			set { selectionForeColor=value; }

+		}

+		

+		[MonoTODO]

+		public override ISite Site {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public GridTableStylesCollection TableStyles {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override string Text {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		protected ScrollBar VertScrollBar {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int VisibleColumnCount {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public int VisibleRowCount {

+			get { throw new NotImplementedException (); }

+		}

+		#endregion

+		

+		#region Methods

+		/* Following members support the .NET Framework infrastructure and are not intended to be used directly from your code.

+		 * Methods not stubbed out:

+		   - protected virtual string GetOutputTextDelimiter()

+			 - public void ResetLinkHoverColor()

+			 - public void SubObjectsSiteChange(bool site)

+		 */

+		[MonoTODO]

+		public bool BeginEdit(DataGridColumnStyle gridColumn,int rowNumber) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void BeginInit() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void CancelEditing() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Collapse(int row) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual void ColumnStartedEditing(Control editingControl) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual void ColumnStartedEditing(Rectangle bounds) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		 protected override AccessibleObject CreateAccessibilityInstance() 

+		 {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual DataGridColumnStyle CreateGridColumn(PropertyDescriptor prop) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual DataGridColumnStyle CreateGridColumn(PropertyDescriptor prop,bool isDefault) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void Dispose(bool disposing) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public bool EndEdit(DataGridColumnStyle gridColumn,int rowNumber,bool shouldAbort) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void EndInit() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Rectangle GetCellBounds(DataGridCell dgc) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Rectangle GetCellBounds(int row,int col) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Rectangle GetCurrentCellBounds() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void GridHScrolled(object sender,ScrollEventArgs se) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void GridVScrolled(object sender,ScrollEventArgs se) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public HitTestInfo HitTest(Point position) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public HitTestInfo HitTest(int x,int y) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public bool IsExpanded(int rowNumber) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public bool IsSelected(int row) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void NavigateBack() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void NavigateTo(int rowNumber,string relationName) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnAllowNavigationChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void OnBackButtonClicked(object sender,EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnBackColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnBackgroundColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnBindingContextChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnBorderStyleChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnCaptionVisibleChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnCurrentCellChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDataSourceChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnEnter(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnFlatModeChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnForeColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnHandleDestroyed(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnKeyDown(KeyEventArgs ke) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnKeyPress(KeyPressEventArgs kpe) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnLayout(LayoutEventArgs levent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnLeave(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMouseDown(MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMouseLeave(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMouseMove(MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMouseUp(MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMouseWheel(MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void OnNavigate(NavigateEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnPaint(PaintEventArgs pe) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnPaintBackground(PaintEventArgs ebe) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentRowsLabelStyleChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentRowsVisibleChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnReadOnlyChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected void OnRowHeaderClick(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void OnScroll(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void OnShowParentDetailsButtonClicked(object sender,EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool ProcessDialogKey(Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected bool ProcessGridKey(KeyEventArgs ke) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool ProcessKeyPreview(ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected bool ProcessTabKey(Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetAlternatingBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void ResetBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void ResetForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetGridLineColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetHeaderBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetHeaderFont() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetHeaderForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetLinkColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void ResetSelection() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetSelectionBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetSelectionForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Select(int row) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SetDataBinding(object dataSource,string dataMember) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeAlternatingBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeBackgroundColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeCaptionBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeCaptionForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeGridLineColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeHeaderBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected bool ShouldSerializeHeaderFont() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeHeaderForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeLinkHoverColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeParentRowsBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeParentRowsForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected bool ShouldSerializePreferredRowHeight() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected bool ShouldSerializeSelectionBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeSelectionForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void UnSelect(int row) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		#region Events

+		[MonoTODO]

+		public event EventHandler AllowNavigationChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler BackButtonClick {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler BackgroundColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler BorderStyleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler CaptionVisibleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler CurrentCellChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler DataSourceChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler FlatModeChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event NavigateEventHandler Navigate {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ParentRowsLabelStyleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ParentRowsVisibleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ReadOnlyChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		protected event EventHandler RowHeaderClick {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Scroll {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ShowParentDetailsButtonClick {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		#endregion

+		

+		/// sub-class: DataGrid.HitTestInfo

+		/// <summary>

+		/// Contains information about a part of the System.Windows.Forms.DataGrid at a specified coordinate. This class cannot be inherited.

+		/// </summary>

+		[MonoTODO]

+		public sealed class HitTestInfo {

+			#region DataGrid.HitTestInfo: Fields

+			[MonoTODO]

+			public static readonly DataGrid.HitTestInfo Nowhere;

+			#endregion

+			

+			#region DataGrid.HitTestInfo: Properties

+			[MonoTODO]

+			public int Column {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public int Row {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public HitTestType Type {

+				get { throw new NotImplementedException (); }

+			}

+			#endregion

+			

+			#region DataGrid.HitTestInfo: Methods

+			[MonoTODO]

+			public override bool Equals(object value) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override int GetHashCode() 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override string ToString() 

+			{

+				throw new NotImplementedException ();

+			}

+			#endregion

+		}

+		

+		/// sub-enumeration: DataGrid.HitTestType

+		/// <summary>

+		/// Specifies the part of the System.Windows.Forms.DataGrid control the user has clicked

+		/// </summary>

+		[Flags]

+		[Serializable]

+		public enum HitTestType {

+			Caption = 32,

+			Cell = 1,

+			ColumnHeader = 2,

+			ColumnResize = 8,

+			None = 0,

+			ParentRows = 64,

+			RowHeader = 4,

+			RowResize = 16

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridBoolColumn.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridBoolColumn.cs
new file mode 100644
index 00000000000..1e2f4c296a3
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridBoolColumn.cs
@@ -0,0 +1,212 @@
+//

+// System.Windows.Forms.DataGridBoolColumn

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Specifies a column in which each cell contains a check box for representing a Boolean value.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class DataGridBoolColumn : DataGridColumnStyle {

+

+		#region Fields

+		bool allowNull;

+		object falseValue;

+		object nullValue;

+		object trueValue;

+		#endregion

+		

+		#region Constructor

+		[MonoTODO]

+		public DataGridBoolColumn() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public DataGridBoolColumn(PropertyDescriptor prop) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/*

+		 * This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		[MonoTODO]

+		public DataGridBoolColumn(PropertyDescriptor prop,bool isDefault) 

+		{

+		}

+		*/

+		#endregion

+		

+		#region Properties

+		

+		public bool AllowNull {

+			get { return allowNull; }

+			set { allowNull=value; }

+		}

+		

+		public object FalseValue {

+			get { return falseValue; }

+			set { falseValue=value; }

+		}

+		

+		public object NullValue {

+			get { return nullValue; }

+			set { nullValue=value; }

+		}

+		

+		public object TrueValue {

+			get { return trueValue; }

+			set { trueValue=value; }

+		}

+		#endregion

+		

+		#region Methods

+		[MonoTODO]

+		protected internal override void Abort(int rowNum) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected internal override bool Commit(CurrencyManager dataSource,int rowNum) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override void ConcedeFocus() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override void Edit(

+			CurrencyManager source,

+			int rowNum,

+			Rectangle bounds,

+			bool readOnly,

+			string instantText,

+			bool cellIsVisible) {

+

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected internal override void EnterNullValue() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override object GetColumnValueAtRow(CurrencyManager lm,int row) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override int GetMinimumHeight() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override int GetPreferredHeight(Graphics g,object value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override Size GetPreferredSize(Graphics g,object value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override void Paint(

+			Graphics g,

+			Rectangle bounds,

+			CurrencyManager source,

+			int rowNum) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override void Paint(

+			Graphics g,

+			Rectangle bounds,

+			CurrencyManager source,

+			int rowNum,

+			bool alignToRight) {

+

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected internal override void Paint(

+			Graphics g,

+			Rectangle bounds,

+			CurrencyManager source,

+			int rowNum,

+			Brush backBrush,

+			Brush foreBrush,

+			bool alignToRight) {

+

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected internal override void SetColumnValueAtRow(CurrencyManager lm,int row,object value) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		#region Events

+		[MonoTODO]

+		public event EventHandler AllowNullChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler FalseValueChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		protected event EventHandler TrueValueChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridCell.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridCell.cs
new file mode 100644
index 00000000000..0cd8a1282a7
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridCell.cs
@@ -0,0 +1,138 @@
+//

+// System.Windows.Forms.DataGridCell.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+	

+	public struct DataGridCell { 

+

+		private int rownumber;

+		private int columnnumber;

+

+		// -----------------------

+		// Public Constructor

+		// -----------------------

+

+		/// <summary>

+		/// 

+		/// </summary>

+		///

+		/// <remarks>

+		///

+		/// </remarks>

+		

+		public DataGridCell (int r, int c)

+		{

+			rownumber = r;

+			columnnumber = c;

+		}

+

+		// -----------------------

+		// Public Shared Members

+		// -----------------------

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two DataGridCell objects. The return value is

+		///	based on the equivalence of the RowNumber and ColumnNumber properties of the two objects.

+		/// </remarks>

+

+		public static bool operator == (DataGridCell dgc_a, 

+			DataGridCell dgc_b) {

+

+			return ((dgc_a.rownumber == dgc_b.rownumber) &&

+				(dgc_a.columnnumber == dgc_b.columnnumber));

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two DataGridCell objects. The return value is

+		///	based on the equivalence of the RowNumber and ColumnNumber properties of the two objects.

+		/// </remarks>

+		public static bool operator != (DataGridCell dgc_a, 

+			DataGridCell dgc_b) {

+			return ((dgc_a.rownumber != dgc_b.rownumber) ||

+				(dgc_a.columnnumber != dgc_b.columnnumber));

+		}

+		

+		// -----------------------

+		// Public Instance Members

+		// -----------------------

+

+

+		public int RowNumber {

+			get{

+				return rownumber;

+			}

+			set{

+				rownumber = value;

+			}

+		}

+

+		public int ColumeNumber {

+			get{

+				return columnnumber;

+			}

+			set{

+				columnnumber = value;

+			}

+		}

+

+

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this DataGridCell and another object.

+		/// </remarks>

+		

+		public override bool Equals (object obj)

+		{

+			if (!(obj is DataGridCell))

+				return false;

+

+			return (this == (DataGridCell) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		

+		public override int GetHashCode ()

+		{

+			return (int)( rownumber ^ columnnumber);

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the DataGridCell as a string.

+		/// </remarks>

+		

+		public override string ToString ()

+		{

+			return String.Format ("[{0},{1}]", rownumber, columnnumber );

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridColumnStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridColumnStyle.cs
new file mode 100644
index 00000000000..351c7db4491
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridColumnStyle.cs
@@ -0,0 +1,332 @@
+//

+// System.Windows.Forms.DataGridColumnStyle

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Drawing;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Specifies the appearance and text formatting and behavior of a System.Windows.Forms.DataGrid control column. This class is abstract.

+	///

+	/// ToDo note:

+	///  - no methods are implemented

+	/// </summary>

+	

+	[MonoTODO]

+	public abstract class DataGridColumnStyle : Component, IDataGridColumnStyleEditingNotificationService {

+

+		#region Fields

+		HorizontalAlignment alignment;

+		DataGridTableStyle dataGridTableStyle;

+		int fontHeight;

+		string headerText;

+		string mappingName;

+		string nullText;

+		PropertyDescriptor propertyDescriptor;

+		bool readOnly;

+		int width;

+		#endregion

+		

+		#region Constructors

+		[MonoTODO]

+		public DataGridColumnStyle() 

+		{

+			alignment=HorizontalAlignment.Left;

+			dataGridTableStyle=null;

+			fontHeight=-1;

+			headerText="";

+			readOnly=false;

+		}

+		

+		[MonoTODO]

+		public DataGridColumnStyle(PropertyDescriptor prop) : this() 

+		{

+			propertyDescriptor=prop;

+		}

+		#endregion

+		

+		#region Properties

+		public virtual HorizontalAlignment Alignment {

+			get { return alignment; }

+			set { alignment=value; }

+		}

+		

+		public virtual DataGridTableStyle DataGridTableStyle {

+			get { return dataGridTableStyle; }

+		}

+		

+		protected int FontHeight {

+			get { return fontHeight; }

+		}

+		/*

+		 * This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		public AccessibleObject HeaderAccessibleObject {get;}

+		*/

+		

+		public virtual string HeaderText {

+			get { return headerText; }

+			set { headerText=value; }

+		}

+		

+		public string MappingName {

+			get { return mappingName; }

+			set { mappingName=value; }

+		}

+		

+		public virtual string NullText {

+			get { return nullText; }

+			set { nullText=value; }

+		}

+		

+		public virtual PropertyDescriptor PropertyDescriptor {

+			get { return propertyDescriptor; }

+			set { propertyDescriptor=value; }

+		}

+		

+		public virtual bool ReadOnly {

+			get { return readOnly; }

+			set { readOnly=value; }

+		}

+		

+		public virtual int Width {

+			get { return width; }

+			set { width=value; }

+		}

+		#endregion

+		

+		#region Methods

+		protected internal abstract void Abort(int rowNum);

+		

+		[MonoTODO]

+		protected void BeginUpdate() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void CheckValidDataSource(CurrencyManager value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual void ColumnStartedEditing(Control editingControl) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		protected internal abstract bool Commit(CurrencyManager dataSource,int rowNum);

+		

+		[MonoTODO]

+		protected internal virtual void ConcedeFocus() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/*

+		 * This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		protected virtual AccessibleObject CreateHeaderAccessibleObject()

+		 */

+		 

+		[MonoTODO]

+		protected internal virtual void Edit(CurrencyManager source) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual void Edit(

+			CurrencyManager source,

+			int rowNum) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal abstract void Edit(

+			CurrencyManager source,

+			int rowNum,

+			Rectangle bounds,

+			bool readOnly,

+			string instantText,

+			bool cellIsVisible);

+		

+		[MonoTODO]

+		protected void EndUpdate() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual void EnterNullValue() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual object GetColumnValueAtRow(CurrencyManager source,int rowNum) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		protected internal abstract int GetMinimumHeight();

+		

+		protected internal abstract int GetPreferredHeight(Graphics g,object value);

+		

+		protected internal abstract Size GetPreferredSize(Graphics g,object value);

+		

+		/*

+		 * This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		 */

+		[MonoTODO]

+		void IDataGridColumnStyleEditingNotificationService.ColumnStartedEditing(Control editingControl) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void Invalidate() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		protected internal abstract void Paint(Graphics g,Rectangle bounds,CurrencyManager source,int rowNum);

+		

+		protected internal abstract void Paint(Graphics g,Rectangle bounds,CurrencyManager source,int rowNum,bool alignToRight);

+		

+		[MonoTODO]

+		protected internal virtual void Paint(

+			Graphics g,

+			Rectangle bounds,

+			CurrencyManager source,

+			int rowNum,

+			Brush backBrush,

+			Brush foreBrush,

+			bool alignToRight) {

+

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetHeaderText() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual void SetColumnValueAtRow(CurrencyManager source,int rowNum,object value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void SetDataGrid(DataGrid value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void SetDataGridInColumn(DataGrid value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual void UpdateUI(CurrencyManager source,int rowNum,string instantText) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		#region Events

+		[MonoTODO]

+		public event EventHandler AlignmentChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		/* This member supports the .NET Framework infrastructure and is not intended to be used directly from your code

+		public event EventHandler FontChanged;

+		*/

+		

+		[MonoTODO]

+		public event EventHandler HeaderTextChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler MappingNameChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler NullTextChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler PropertyDescriptorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ReadOnlyChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler WidthChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		#endregion

+

+		/// sub-classes:

+		/// This type supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		///

+		/// protected class DataGridColumnStyle.CompModSwitches;

+		/// protected class DataGridColumnStyle.DataGridColumnHeaderAccessibleObject : AccessibleObject;

+		

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridLineStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridLineStyle.cs
new file mode 100644
index 00000000000..ba799c5e15f
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridLineStyle.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.DataGridLineStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum DataGridLineStyle {

+		None = 0,

+		Solid = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridParentRowsLabelStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridParentRowsLabelStyle.cs
new file mode 100644
index 00000000000..fb6454f71a2
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridParentRowsLabelStyle.cs
@@ -0,0 +1,27 @@
+//

+// System.Windows.Forms.DataGridParentRowsLabelStyle.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies how the parent row labels of a DataGrid control are displayed.

+	/// </summary>

+	//[Serializable]

+	public enum DataGridParentRowsLabelStyle {

+

+		//Values were verified with enumcheck.

+		None = 0,

+		TableName = 1,

+		ColumnName = 2,

+		Both = 3,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridPreferredColumnWidthTypeConverter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridPreferredColumnWidthTypeConverter.cs
new file mode 100644
index 00000000000..836f525f9f3
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridPreferredColumnWidthTypeConverter.cs
@@ -0,0 +1,60 @@
+//

+// System.Windows.Forms.DataGridPreferredColumnWidthTypeConverter

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Globalization;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Converts the value of an object to a different data type.

+	///

+	/// ToDo note:

+	///  - no methods are implemented

+	/// </summary>

+	

+	[MonoTODO]

+	public class DataGridPreferredColumnWidthTypeConverter : TypeConverter {

+

+

+		#region Constructors

+		[MonoTODO]

+		public DataGridPreferredColumnWidthTypeConverter() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		#region Methods

+		[MonoTODO]

+		public override bool CanConvertFrom(ITypeDescriptorContext context,Type sourceType) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override object ConvertFrom(ITypeDescriptorContext context,CultureInfo culture,object value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override object ConvertTo(

+			ITypeDescriptorContext context,

+			CultureInfo culture,

+			object value,

+			Type destinationType) {

+

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridTableStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridTableStyle.cs
new file mode 100644
index 00000000000..aac00e63211
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridTableStyle.cs
@@ -0,0 +1,657 @@
+//

+// System.Windows.Forms.DataGridTableStyle

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Drawing;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the table drawn by the System.Windows.Forms.DataGrid control at run time.

+	///

+	/// ToDo note:

+	///  - no methods are implemented

+	/// </summary>

+	

+	[MonoTODO]

+	public class DataGridTableStyle : Component {

+

+		#region Fields

+		// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code:

+		// public static DataGridTableStyle DefaultTableStyle;

+		bool allowSorting;

+		Color alternatingBackColor;

+		Color backColor;

+		bool columnHeadersVisible;

+		DataGrid dataGrid;

+		Color foreColor;

+		Color gridLineColor;

+		DataGridLineStyle gridLineStyle;

+		Color headerBackColor;

+		Font headerFont;

+		Color headerForeColor;

+		Color linkColor;

+		string mappingName;

+		int preferredColumnWidth;

+		int preferredRowHeight;

+		bool readOnly;

+		bool rowHeadersVisible;

+		int rowHeaderWidth;

+		Color selectionBackColor;

+		Color selectionForeColor;

+		#endregion

+		

+		#region Constructors

+		[MonoTODO]

+		public DataGridTableStyle() 

+		{

+			allowSorting=true;

+			alternatingBackColor=SystemColors.Window;

+			gridLineStyle=DataGridLineStyle.Solid;

+			rowHeadersVisible=true;

+			throw new NotImplementedException ();

+		}

+

+		// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code:

+		// public DataGridTableStyle(bool isDefaultTableStyle);

+		

+		[MonoTODO]

+		public DataGridTableStyle(CurrencyManager listManager) : this() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		#region Properties

+		public bool AllowSorting {

+			get { return allowSorting; }

+			set { allowSorting=value; }

+		}

+		

+		public Color AlternatingBackColor {

+			get { return alternatingBackColor; }

+			set { alternatingBackColor=value; }

+		}

+		

+		public Color BackColor {

+			get { return backColor; }

+			set { backColor=value; }

+		}

+		

+		public bool ColumnHeadersVisible {

+			get { return columnHeadersVisible; }

+			set { columnHeadersVisible=value; }

+		}

+		

+		public virtual DataGrid DataGrid {

+			get { return dataGrid; }

+			set { dataGrid=value; }

+		}

+		

+		public Color ForeColor {

+			get { return foreColor; }

+			set { foreColor=value; }

+		}

+		

+		[MonoTODO]

+		public virtual GridColumnStylesCollection GridColumnStyles {

+			get { throw new NotImplementedException (); }

+		}

+		

+		public Color GridLineColor {

+			get { return gridLineColor; }

+			set { gridLineColor=value; }

+		}

+		

+		public DataGridLineStyle GridLineStyle {

+			get { return gridLineStyle; }

+			set { gridLineStyle=value; }

+		}

+		

+		public Color HeaderBackColor {

+			get { return headerBackColor; }

+			set { headerBackColor=value; }

+		}

+		

+		public Font HeaderFont {

+			get { return headerFont; }

+			set { headerFont=value; }

+		}

+		

+		public Color HeaderForeColor {

+			get { return headerForeColor; }

+			set { headerForeColor=value; }

+		}

+		

+		public Color LinkColor {

+			get { return linkColor; }

+			set { linkColor=value; }

+		}

+		

+		// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		// public Color LinkHoverColor {get; set;}

+		

+		public string MappingName {

+			get { return mappingName; }

+			set { mappingName=value; }

+		}

+		

+		public int PreferredColumnWidth {

+			get { return preferredColumnWidth; }

+			set { preferredColumnWidth=value; }

+		}

+		

+		public int PreferredRowHeight {

+			get { return preferredRowHeight; }

+			set { preferredRowHeight=value; }

+		}

+		

+		public virtual bool ReadOnly {

+			get { return allowSorting; }

+			set { allowSorting=value; }

+		}

+		

+		public bool RowHeadersVisible {

+			get { return rowHeadersVisible; }

+			set { rowHeadersVisible=value; }

+		}

+		

+		[MonoTODO]

+		public int RowHeaderWidth {

+			get { return rowHeaderWidth; }

+			set { rowHeaderWidth=value; }

+		}

+		

+		public Color SelectionBackColor {

+			get { return selectionBackColor; }

+			set { selectionBackColor=value; }

+		}

+		

+		public Color SelectionForeColor {

+			get { return selectionForeColor; }

+			set { selectionForeColor=value; }

+		}

+		#endregion

+		

+		#region Methods

+		[MonoTODO]

+		public bool BeginEdit(DataGridColumnStyle gridColumn,int rowNumber) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual DataGridColumnStyle CreateGridColumn(PropertyDescriptor prop) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual DataGridColumnStyle CreateGridColumn(PropertyDescriptor prop,bool isDefault) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void Dispose(bool disposing) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public bool EndEdit(DataGridColumnStyle gridColumn,int rowNumber,bool shouldAbort) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnAllowSortingChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnAlternatingBackColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnBackColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnColumnHeadersVisibleChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnForeColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnGridLineColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnGridLineStyleChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnHeaderBackColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnHeaderFontChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnHeaderForeColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnLinkColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnLinkHoverColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMappingNameChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnPreferredColumnWidthChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnPreferredRowHeightChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnReadOnlyChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnRowHeadersVisibleChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnRowHeaderWidthChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnSelectionBackColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnSelectionForeColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetAlternatingBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetGridLineColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetHeaderBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetHeaderFont() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetHeaderForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetLinkColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		// public void ResetLinkHoverColor

+		

+		[MonoTODO]

+		public void ResetSelectionBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetSelectionForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeAlternatingBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected bool ShouldSerializeBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected bool ShouldSerializeForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeGridLineColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeHeaderBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeHeaderForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeLinkColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// protected virtual bool ShouldSerializeLinkHoverColor();

+		

+		[MonoTODO]

+		protected bool ShouldSerializePreferredRowHeight() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected bool ShouldSerializeSelectionBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShouldSerializeSelectionForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		#region Events

+		[MonoTODO]

+		public event EventHandler AllowSortingChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler AlternatingBackColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler BackColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ColumnHeadersVisibleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ForeColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler GridLineColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler GridLineStyleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler HeaderBackColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler HeaderFontChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler HeaderForeColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler LinkColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public event EventHandler LinkHoverColorChanged;

+		

+		[MonoTODO]

+		public event EventHandler MappingNameChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler PreferredColumnWidthChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler PreferredRowHeightChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ReadOnlyChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler RowHeadersVisibleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler RowHeaderWidthChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler SelectionBackColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler SelectionForeColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridTextBox.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridTextBox.cs
new file mode 100644
index 00000000000..ad0eee8aba8
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridTextBox.cs
@@ -0,0 +1,87 @@
+//

+// System.Windows.Forms.DataGridTextBox

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents a TextBox control that is hosted in a DataGridTextBoxColumn.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class DataGridTextBox : TextBox {

+

+		#region Fields

+		bool isInEditOrNavigateMode;

+		#endregion

+		

+		

+		

+		

+		#region Constructor

+		[MonoTODO]

+		public DataGridTextBox() 

+		{

+			isInEditOrNavigateMode=true;

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		

+		#region Properties

+		public bool IsInEditOrNavigateMode {

+			get { return isInEditOrNavigateMode; }

+			set { isInEditOrNavigateMode=value; }

+		}

+		#endregion

+		

+		

+		

+		

+		#region Methods

+		[MonoTODO]

+		protected override void OnKeyPress(KeyPressEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMouseWheel(MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override bool ProcessKeyMessage(ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SetDataGrid(DataGrid parentGrid) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void WndProc(ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs
new file mode 100644
index 00000000000..aaf835b9082
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataGridTextBoxColumn.cs
@@ -0,0 +1,192 @@
+//

+// System.Windows.Forms.DataGridTextBoxColumn

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System.Drawing;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template. Nothing is implemented yet.

+	//	Hosts a TextBox control in a cell of a DataGridColumnStyle for editing strings.

+	// </summary>

+	public class DataGridTextBoxColumn : DataGridColumnStyle {

+

+		//

+		//  --- Constructors/Destructors

+		//

+		[MonoTODO]

+		public DataGridTextBoxColumn() : base()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public DataGridTextBoxColumn(PropertyDescriptor prop) : base(prop)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public DataGridTextBoxColumn(PropertyDescriptor prop, bool isDefault) : base(prop)

+		{

+			// This method is internal to the .NET framework.

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public DataGridTextBoxColumn(PropertyDescriptor prop, string format) : base(prop)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public DataGridTextBoxColumn(PropertyDescriptor prop, string format, bool isDefault) : base(prop)

+		{

+			// This method is internal to the .NET framework.

+			throw new NotImplementedException ();

+		}

+

+		

+		//  --- Protected Methods

+		

+		[MonoTODO]

+		protected internal override void Abort(int rowNum)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override bool Commit(CurrencyManager dataSource, int rowNum)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override void ConcedeFocus()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override void Edit(CurrencyManager source, int rowNum, Rectangle bounds,

+		                                       bool readOnly, string instantText, bool cellIsVisible) {

+

+			// This method is internal to the .NET framework.

+			throw new NotImplementedException ();

+		}

+//		[MonoTODO]

+//		//FIXME

+//		protected internal virtual void Edit(CurrencyManager source, int rowNum, Rectangle bounds, bool readOnly)

+//		{

+//			// This method is internal to the .NET framework.

+//			throw new NotImplementedException ();

+//		}

+		[MonoTODO]

+		protected internal virtual void Edit(CurrencyManager source, int rowNum, Rectangle bounds, bool readOnly, string instantText)

+		{

+			// This method is internal to the .NET framework.

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected void EndEdit()

+		{

+			// This method is internal to the .NET framework.

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override void EnterNullValue()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override int GetMinimumHeight()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override int GetPreferredHeight(Graphics g, object value)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override Size GetPreferredSize(Graphics g, object value)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected void HideEditBox()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override void Paint(Graphics g, Rectangle bounds, CurrencyManager source, int rowNum)

+		{

+			// This method is internal to the .NET framework.

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override void Paint(Graphics g, Rectangle bounds, CurrencyManager source, int rowNum, bool alignToRight)

+		{

+			// This method is internal to the .NET framework.

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override void Paint(Graphics g, Rectangle bounds, CurrencyManager source, int rowNum,

+		                                        Brush backBrush, Brush foreBrush, bool alignToRight) {

+

+			// This method is internal to the .NET framework.

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected void PaintText(Graphics g, Rectangle bounds, string text, bool alignToRight)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected void PaintText(Graphics g, Rectangle textBounds, string text, Brush backBrush, Brush foreBrush, bool alignToRight)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void SetDataGridInColumn(DataGrid value)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected internal override void UpdateUI(CurrencyManager source, int rowNum, string instantText)

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		//  --- Public Properties

+		

+		[MonoTODO]

+		public string Format {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public IFormatProvider FormatInfo {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public override PropertyDescriptor PropertyDescriptor {

+

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public override bool ReadOnly {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public virtual TextBox TextBox {

+

+			get { throw new NotImplementedException (); }

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DataObject.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataObject.cs
new file mode 100644
index 00000000000..01e299cd0c0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DataObject.cs
@@ -0,0 +1,118 @@
+//

+// System.Windows.Forms.DataObject

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System.Runtime.InteropServices;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template. Nothing is implemented yet.

+	//	Implements a basic data transfer mechanism.

+	// </summary>

+	[ClassInterface(ClassInterfaceType.None)]

+	public class DataObject : IDataObject {

+

+		//

+		//  --- Constructors/Destructors

+		//

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public DataObject() : base()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public DataObject(object data) : base()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public DataObject(string format, object data) : base()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual object GetData(string format)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual object GetData(Type format)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual object GetData(string format, bool autoConvert)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual bool GetDataPresent(string format)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual bool GetDataPresent(Type format)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual bool GetDataPresent(string format, bool autoConvert)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual string[] GetFormats()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual string[] GetFormats(bool autoConvert)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual void SetData(object data)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual void SetData(string format, object data)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual void SetData(Type format, object data)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[ClassInterface(ClassInterfaceType.None)]

+		public virtual void SetData(string format, bool autoConvert, object data)

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DateBoldEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DateBoldEventArgs.cs
new file mode 100644
index 00000000000..bc36fd3f348
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DateBoldEventArgs.cs
@@ -0,0 +1,39 @@
+//

+// System.Windows.Forms.DateBoldEventArgs

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template. Nothing is implemented yet.

+	//	This class is internal to the .NET framework.

+	// </summary>

+	public class DateBoldEventArgs : EventArgs {

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public int[] DaysToBold {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public int Size {

+

+			get { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public DateTime StartDate {

+

+			get { throw new NotImplementedException (); }

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DateRangeEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DateRangeEventArgs.cs
new file mode 100644
index 00000000000..04ea20b353b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DateRangeEventArgs.cs
@@ -0,0 +1,133 @@
+//

+// System.Windows.Forms.DateRangeEventArgs

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Implemented by Richard Baumann <biochem333@nyc.rr.com>

+//   Dennis Hayes (dennish@Raytek.com)

+//	 Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	///	Provides data for the DateChanged or DateSelected events of the MonthCalendar control.

+	/// </summary>

+	public class DateRangeEventArgs : EventArgs {

+

+		#region Fields

+

+		private DateTime end;

+		private DateTime start;

+		

+		#endregion

+

+		//

+		//  --- Constructors/Destructors

+		//

+		public DateRangeEventArgs(DateTime start, DateTime end) : base()

+		{

+			this.start = start;

+			this.end = end;

+		}

+

+		#region Public Properties

+		public DateTime End 

+		{

+			get { 

+					return end; 

+			}

+		}

+

+		public DateTime Start {

+			get { 

+					return start; 

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two DateRangeEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	start and end Property

+		///	of the two DateRangeEventArgs.

+		/// </remarks>

+		public static bool operator == (DateRangeEventArgs DateRangeEventArgsA, DateRangeEventArgs DateRangeEventArgsB) 

+		{

+			return (DateRangeEventArgsA.Start == DateRangeEventArgsB.Start) && 

+				   (DateRangeEventArgsA.End == DateRangeEventArgsB.End);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two DateRangeEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	start and end Property

+		///	of the two DateRangeEventArgs.

+		/// </remarks>

+		public static bool operator != (DateRangeEventArgs DateRangeEventArgsA, DateRangeEventArgs DateRangeEventArgsB) 

+		{

+			return (DateRangeEventArgsA.Start != DateRangeEventArgsB.Start) || 

+				   (DateRangeEventArgsA.End != DateRangeEventArgsB.End);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	DateRangeEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is DateRangeEventArgs))return false;

+			return (this == (DateRangeEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " DateRangeEventArgs";

+		}

+

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DateRangeEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DateRangeEventHandler.cs
new file mode 100644
index 00000000000..5913f96335c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DateRangeEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.DateRangeEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void DateRangeEventHandler (

+	object sender,

+	DateRangeEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DateTimePicker.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DateTimePicker.cs
new file mode 100644
index 00000000000..f2f94a080b2
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DateTimePicker.cs
@@ -0,0 +1,324 @@
+//

+// System.Windows.Forms.DateTimePicker

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template. Nothing is implemented yet.

+	//	Represents a Windows date-time picker control.

+	// </summary>

+	public class DateTimePicker : Control {

+

+		//

+		//  --- Public Fields

+		//

+		public static readonly DateTime MaxDateTime;

+		public static readonly DateTime MinDateTime;

+

+		//

+		//  --- Protected Fields

+		//

+		protected static readonly Color DefaultMonthBackColor;

+		protected static readonly Color DefaultTitleBackColor;

+		protected static readonly Color DefaultTitleForeColor;

+		protected static readonly Color DefaultTrailingForeColor;

+

+		//

+		//  --- Private Fields

+		//

+		private Font calendarFont;

+		private Color calendarForeColor;

+		private Color calendarMonthBackground;

+		private Color calendarTitleBackColor;

+		private Color calendarTitleForeColor;

+		private Color calendarTrailingForeColor;

+		private bool CHecked;

+		private string customFormat;

+		private LeftRightAlignment dropDownAlign;

+		private DateTimePickerFormat format;

+		private DateTime maxDate;

+		private DateTime minDate;

+		private int preferredHeight;

+		private bool showCheckBox;

+		private bool showUpDown;

+		private DateTime value;

+

+		//

+		//  --- Constructors/Destructors

+		//

+		[MonoTODO]

+		public DateTimePicker() : base()

+		{

+			// defaults :)

+			calendarForeColor = ForeColor;

+			calendarMonthBackground = DefaultMonthBackColor;

+			calendarTitleBackColor = DefaultTitleBackColor;

+			calendarTitleForeColor = DefaultTitleForeColor;

+			calendarTrailingForeColor = DefaultTrailingForeColor;

+			CHecked = true;

+			customFormat = null;

+			dropDownAlign = LeftRightAlignment.Left;

+			format = DateTimePickerFormat.Long;

+			maxDate = MaxDateTime;

+			minDate = MinDateTime;

+			showCheckBox = false;

+			showUpDown = false;

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		static DateTimePicker()

+		{

+			MaxDateTime = new DateTime(9998,12,31,23,59,59);

+			MinDateTime = new DateTime(1753,1,1,0,0,0);

+			// As usual, the MS docs aren't very helpful...

+			// I'm guessing these are all the right colors... not sure though

+			// I'll check on Windows when I'm in a more masochistic mood ;)

+			DefaultMonthBackColor = System.Drawing.SystemColors.Window;

+			DefaultTitleBackColor = System.Drawing.SystemColors.ActiveCaption;

+			DefaultTitleForeColor = System.Drawing.SystemColors.ActiveCaptionText;

+			DefaultTrailingForeColor = System.Drawing.SystemColors.WindowText;

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected override AccessibleObject CreateAccessibilityInstance()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void CreateHandle()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void DestroyHandle()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override bool IsInputKey(Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnCloseUp(EventArgs e)

+		{

+			if (CloseUp != null) {

+

+				CloseUp(this, e);

+			}

+		}

+		[MonoTODO]

+		protected virtual void OnDropDown(EventArgs e)

+		{

+			if (DropDown != null) {

+

+				DropDown(this, e);

+			}

+		}

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e)

+		{

+			//if (FontChanged != null) {

+			//	FontChanged(this, e);

+			//}

+		}

+		[MonoTODO]

+		protected virtual void OnFormatChanged(EventArgs e)

+		{

+			if (FormatChanged != null) {

+

+				FormatChanged(this, e);

+			}

+		}

+		[MonoTODO]

+		protected override void OnSystemColorsChanged(EventArgs e)

+		{

+			//if (SystemColorsChanged != null) {

+			//	SystemColorsChanged(this, e);

+			//}

+		}

+		[MonoTODO]

+		protected virtual void OnValueChanged(EventArgs e)

+		{

+			if (ValueChanged != null) {

+

+				ValueChanged(this, e);

+			}

+		}

+		[MonoTODO]

+		protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		//  --- Public Events

+		

+		public event EventHandler CloseUp;

+		public event EventHandler DropDown;

+		public event EventHandler FormatChanged;

+		//public new event PaintEventHandler Paint; // This event is internal to the .NET framework.

+		public event EventHandler ValueChanged;

+

+		

+		//  --- Public Properties

+		

+		[MonoTODO]

+		public override Color BackColor {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public override Image BackgroundImage {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public Font CalendarFont {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public Color CalendarForeColor {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public Color CalendarMonthBackground {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public Color CalendarTitleBackColor {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public Color CalendarTitleForeColor {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public Color CalendarTrailingForeColor {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public bool Checked {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public string CustomFormat {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public LeftRightAlignment DropDownAlign {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public override Color ForeColor {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public DateTimePickerFormat Format {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public DateTime MaxDate {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public DateTime MinDate {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public int PreferredHeight {

+

+			get { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public bool ShowCheckBox {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public bool ShowUpDown {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public override string Text {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public DateTime Value {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+

+		

+		//  --- Protected Properties

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+

+			get { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+

+			get { throw new NotImplementedException (); }

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DateTimePickerFormat.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DateTimePickerFormat.cs
new file mode 100644
index 00000000000..972c167d035
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DateTimePickerFormat.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.DateTimePickerFormat.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms

+{

+	/// <summary>

+	/// </summary>

+	public enum DateTimePickerFormat {

+		Custom = 8,

+		Long = 1,

+		Short = 2,

+		Time = 4

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DialogResult.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DialogResult.cs
new file mode 100644
index 00000000000..d45246f20f9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DialogResult.cs
@@ -0,0 +1,32 @@
+//

+// System.Windows.Forms.DialogResult.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Specifies identifiers to indicate the return value of a dialog box.

+	/// </summary>

+	//LAMESPEC: Docs say serializable, verifer says no.

+	//[Serializable]

+	[ComVisible(true)]

+	public enum DialogResult {

+

+		//Values were verified with enumcheck.

+		None = 0,

+		OK = 1,

+		Cancel = 2,

+		Abort = 3,

+		Retry = 4,

+		Ignore = 5,

+		Yes = 6,

+		No = 7,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DockStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DockStyle.cs
new file mode 100644
index 00000000000..b510861bfde
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DockStyle.cs
@@ -0,0 +1,29 @@
+//

+// System.Windows.Forms.DockStyle.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+	/// Specifies the position and manner in which a control is docked.

+	/// </summary>

+	//[Serializable]

+	public enum DockStyle {

+

+		//Values were verified with enumcheck.

+		None = 0,

+		Top = 1,

+		Bottom = 2,

+		left = 3,		

+		Right = 4,

+		Fill = 5,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DomainUpDown.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DomainUpDown.cs
new file mode 100644
index 00000000000..d59c501400e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DomainUpDown.cs
@@ -0,0 +1,185 @@
+//

+// System.Windows.Forms.DomainUpDown

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System.Collections;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template. Nothing is implemented yet.

+	//	Represents a Windows up-down control that displays string values.

+	// </summary>

+	public class DomainUpDown : UpDownBase {

+

+		

+		//  --- Constructors/Destructors

+		

+		[MonoTODO]

+		public DomainUpDown() : base()

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		//  --- Public Methods

+		

+		[MonoTODO]

+		public override void DownButton()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override void UpButton()

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		//  --- Protected Methods

+		

+		[MonoTODO]

+		protected override AccessibleObject CreateAccessibilityInstance()

+		{

+			throw new NotImplementedException ();

+		}

+		//[MonoTODO]

+		//protected override void OnChanged(object source, EventArgs e)

+		//{

+		//	//This method is internal to the .NET framework.

+		//	if (Changed != null) {

+		//

+		//		Changed(this, e);

+		//	}

+		//}

+		[MonoTODO]

+		protected void OnSelectedItemChanged(object source, EventArgs e)

+		{

+			if (SelectedItemChanged != null) {

+

+				SelectedItemChanged(this, e);

+			}

+		}

+		[MonoTODO]

+		protected override void OnTextBoxKeyDown(object source, KeyEventArgs e)

+		{

+			throw new NotImplementedException ();

+			//if (TextBoxKeyDown != null) {

+			//	TextBoxKeyDown(this, e);

+			//}

+		}

+		[MonoTODO]

+		protected override void UpdateEditText()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		//  --- Public Events

+		

+		public event EventHandler SelectedItemChanged;

+

+		

+		//  --- Public Properties

+		

+		[MonoTODO]

+		public DomainUpDown.DomainUpDownItemCollection Items {

+

+			get { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public int SelectedIndex{// default -1 {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public object SelectedItem{ // default null {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public bool Sorted{ // default false {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public bool Wrap{ // default false {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+

+		//System.Windows.Forms.DomainUpDown.DomainUpDownItemCollection

+		//

+		//Author:

+		//stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+		//

+		//(C) Ximian, Inc., 2002

+		//

+		//<summary>

+		//This is only a template. Nothing is implemented yet.

+		//Encapsulates a collection of objects for use by the DomainUpDown class.

+		//</summary>

+		public class DomainUpDownItemCollection : ArrayList {

+

+			//

+			//  --- Constructors/Destructors

+			//

+			[MonoTODO]

+			internal DomainUpDownItemCollection(DomainUpDown owner) : base()

+			{

+				throw new NotImplementedException ();

+			}

+

+			

+			//  --- Public Methods

+			

+			[MonoTODO]

+			public override int Add(object item)

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override void Insert(int index, object item)

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override void Remove(object item)

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override void RemoveAt(int item)

+			{

+				throw new NotImplementedException ();

+			}

+

+			

+			//  --- Public Properties

+					

+			public override object this[int index] {

+

+				get { throw new NotImplementedException (); }

+				set { throw new NotImplementedException (); }

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DragAction.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DragAction.cs
new file mode 100644
index 00000000000..e345b1dbfd7
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DragAction.cs
@@ -0,0 +1,27 @@
+//

+// System.Windows.Forms.DragAction.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+	/// Specifies how and if a drag-and-drop operation should continue.

+	/// </summary>

+	//[Serializable]

+	[ComVisible(true)]

+	public enum DragAction {

+

+		//Values were verified with enumcheck.

+		Continue = 0,

+		Drop = 1,

+		Cancel = 2,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DragDropEffects.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DragDropEffects.cs
new file mode 100644
index 00000000000..e7152fd029d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DragDropEffects.cs
@@ -0,0 +1,30 @@
+//

+// System.Windows.Forms.DragDropEffects.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+	/// Specifies the effects of a drag-and-drop operation.

+	/// This enumeration has a FlagsAttribute attribute that allows a bitwise combination of its member values.

+	/// </summary>

+	[Flags]

+	//[Serializable]

+	public enum DragDropEffects {

+

+		None = 0,

+		Copy = 1,

+		Move = 2,

+		Link = 4,

+		Scroll = -2147483648,

+		All = -2147483645,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DragEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DragEventArgs.cs
new file mode 100644
index 00000000000..c612833b155
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DragEventArgs.cs
@@ -0,0 +1,177 @@
+//

+// System.Windows.Forms.DragEventArgs

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Implemented by Richard Baumann <biochem333@nyc.rr.com>

+//   Dennis Hayes (dennish@Raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System;

+using System.Runtime.InteropServices;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	///	Provides data for the DragDrop, DragEnter, or DragOver event.

+	/// </summary>

+	[ComVisible(true)]

+	public class DragEventArgs : EventArgs {

+

+		#region Fields

+		private DragDropEffects allowedEffect;

+		private IDataObject data;

+		private DragDropEffects effect;

+		private int keyState;

+		private int x;

+		private int y;

+		#endregion

+

+		//

+		//  --- Constructors/Destructors

+		//

+		public DragEventArgs(IDataObject data, int keyState, int x, int y, DragDropEffects allowedEffect, DragDropEffects effect) : base()

+		{

+			this.data = data;

+			this.keyState = keyState;

+			this.x = x;

+			this.y = y;

+			this.allowedEffect = allowedEffect;

+			this.effect = effect;

+		}

+

+		#region Public Properties

+		[ComVisible(true)]

+		public DragDropEffects AllowedEffect {

+			get { 

+					return allowedEffect; 

+			}

+		}

+		[ComVisible(true)]

+		public IDataObject Data {

+			get { 

+					return data; 

+			}

+		}

+		[ComVisible(true)]

+		public DragDropEffects Effect {

+			get { 

+					return effect; 

+			}

+			set { 

+					effect = value; 

+			}

+		}

+		[ComVisible(true)]

+		public int KeyState {

+			get { 

+					return keyState; 

+			}

+		}

+		[ComVisible(true)]

+		public int X {

+			get { 

+					return x; 

+			}

+		}

+		[ComVisible(true)]

+		public int Y {

+			get { 

+					return y; 

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two DragEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	AllowedEffect, Data, Effect, KeyState, X , Y Property

+		///	of the two DragEventArgs.

+		/// </remarks>

+		public static bool operator == (DragEventArgs DragEventArgsA, DragEventArgs DragEventArgsB) 

+		{

+			return (DragEventArgsA.AllowedEffect == DragEventArgsB.AllowedEffect) && 

+				   (DragEventArgsA.Data == DragEventArgsB.Data) && 

+				   (DragEventArgsA.Effect == DragEventArgsB.Effect) && 

+				   (DragEventArgsA.KeyState == DragEventArgsB.KeyState) && 

+				   (DragEventArgsA.X == DragEventArgsB.X) && 

+				   (DragEventArgsA.Y == DragEventArgsB.Y);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two DragEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	AllowedEffect, Data, Effect, KeyState, X , Y Property

+		///	of the two DragEventArgs.

+		/// </remarks>

+		public static bool operator != (DragEventArgs DragEventArgsA, DragEventArgs DragEventArgsB) 

+		{

+			return (DragEventArgsA.AllowedEffect != DragEventArgsB.AllowedEffect) || 

+				(DragEventArgsA.Data != DragEventArgsB.Data) || 

+				(DragEventArgsA.Effect != DragEventArgsB.Effect) || 

+				(DragEventArgsA.KeyState != DragEventArgsB.KeyState) || 

+				(DragEventArgsA.X != DragEventArgsB.X) || 

+				(DragEventArgsA.Y != DragEventArgsB.Y);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	DragEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is DragEventArgs))return false;

+			return (this == (DragEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " DragEventArgs";

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DragEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DragEventHandler.cs
new file mode 100644
index 00000000000..6dfc763e634
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DragEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.DragEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void DragEventHandler (

+	object sender,

+	DragEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawItemEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawItemEventArgs.cs
new file mode 100644
index 00000000000..3850ae1424e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawItemEventArgs.cs
@@ -0,0 +1,208 @@
+//

+// System.Windows.Forms.DrawItemEventArgs

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Implemented by Richard Baumann <biochem333@nyc.rr.com>

+//   Dennis Hayes (dennish@Raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	///	Provides data for the DrawItem event.

+	/// </summary>

+	public class DrawItemEventArgs : EventArgs {

+

+		#region Fields

+		private Color backColor;

+		private Rectangle bounds;

+		private Font font;

+		private Color foreColor;

+		private Graphics graphics;

+		private int index;

+		private DrawItemState state;

+		#endregion

+

+		//

+		//  --- Constructors/Destructors

+		//

+		public DrawItemEventArgs(Graphics graphics, Font font, Rectangle bounds, int index, DrawItemState state) : base()

+		{

+			this.graphics = graphics;

+			this. font = font;

+			this. bounds = bounds;

+			this.index = index;

+			this.state = state;

+			foreColor = SystemColors.WindowText;

+			backColor = SystemColors.Window;

+			throw new NotImplementedException ();

+		}

+		public DrawItemEventArgs(Graphics graphics, Font font, Rectangle bounds, int index,

+		                          DrawItemState state, Color foreColor, Color backColor) : base()

+		{

+			this.graphics = graphics;

+			this. font = font;

+			this. bounds = bounds;

+			this.index = index;

+			this.state = state;

+			this.foreColor = foreColor;

+			this.backColor = backColor;

+		}

+

+		#region Public Methods

+		public virtual void DrawBackground()

+		{

+			SolidBrush temp = new SolidBrush(BackColor);

+			graphics.FillRectangle(temp,bounds);

+			temp.Dispose();

+		}

+		public virtual void DrawFocusRectangle()

+		{

+			if( (DrawItemState.Focus == (DrawItemState.Focus & state)) && // check for focus

+			    (DrawItemState.NoFocusRect != (DrawItemState.NoFocusRect & state))){ // check if this matters {

+

+				ControlPaint.DrawFocusRectangle(graphics,bounds,foreColor,backColor);

+			}

+		}

+		#endregion

+

+		#region Public Properties

+		public Color BackColor 

+		{

+			get { 

+					return (DrawItemState.Selected == (state & DrawItemState.Selected)) ? SystemColors.Highlight : backColor; 

+			}

+		}

+		public Rectangle Bounds {

+			get { 

+					return bounds; 

+			}

+		}

+		public Font Font {

+			get { 

+					return font; 

+			}

+		}

+		public Color ForeColor {

+			get { 

+					return (DrawItemState.Selected == (state & DrawItemState.Selected)) ? SystemColors.HighlightText : foreColor; 

+			}

+		}

+		public Graphics Graphics {

+			get { 

+					return graphics; 

+			}

+		}

+		public int Index {

+			get { 

+					return index; 

+			}

+		}

+		public DrawItemState State {

+			get { 

+					return state; 

+			}

+		}

+		#endregion

+

+		#region Operators 

+

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two DrawItemEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	BackColor, Bounds, Font, ForeColor, Graphics, Index and State  Property

+		///	of the two DrawItemEventArgs.

+		/// </remarks>

+		public static bool operator == (DrawItemEventArgs DrawItemEventArgsA, DrawItemEventArgs DrawItemEventArgsB) 

+		{

+			return (DrawItemEventArgsA.BackColor ==  DrawItemEventArgsB.BackColor) && 

+				   (DrawItemEventArgsA.Bounds ==  DrawItemEventArgsB.Bounds) && 

+				   (DrawItemEventArgsA.Font ==  DrawItemEventArgsB.Font) && 

+				   (DrawItemEventArgsA.ForeColor ==  DrawItemEventArgsB.ForeColor) && 

+				   (DrawItemEventArgsA.Graphics ==  DrawItemEventArgsB.Graphics) && 

+				   (DrawItemEventArgsA.Index ==  DrawItemEventArgsB.Index) && 

+				   (DrawItemEventArgsA.State ==  DrawItemEventArgsB.State);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two DrawItemEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	BackColor, Bounds, Font, ForeColor, Graphics, Index and State  Property

+		///	of the two DrawItemEventArgs.

+		/// </remarks>

+		public static bool operator != (DrawItemEventArgs DrawItemEventArgsA, DrawItemEventArgs DrawItemEventArgsB) 

+		{

+			return (DrawItemEventArgsA.BackColor !=  DrawItemEventArgsB.BackColor) || 

+				(DrawItemEventArgsA.Bounds !=  DrawItemEventArgsB.Bounds) || 

+				(DrawItemEventArgsA.Font !=  DrawItemEventArgsB.Font) || 

+				(DrawItemEventArgsA.ForeColor !=  DrawItemEventArgsB.ForeColor) || 

+				(DrawItemEventArgsA.Graphics !=  DrawItemEventArgsB.Graphics) || 

+				(DrawItemEventArgsA.Index !=  DrawItemEventArgsB.Index) || 

+				(DrawItemEventArgsA.State !=  DrawItemEventArgsB.State);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	DrawItemEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is DrawItemEventArgs))return false;

+			return (this == (DrawItemEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " DrawItemEventArgs";

+		}

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawItemEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawItemEventHandler.cs
new file mode 100644
index 00000000000..1e58091aaeb
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawItemEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.DrawItemEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void DrawItemEventHandler (

+	object sender,

+	DrawItemEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawItemState.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawItemState.cs
new file mode 100644
index 00000000000..8ccf8f0e2a7
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawItemState.cs
@@ -0,0 +1,36 @@
+//

+// System.Windows.Forms.DrawItemState.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+	/// Specifies the state of an item that is being drawn.

+	/// this enumeration has a FlagsAttribute attribute that allows a bitwise combination of its member values.

+	/// </summary>

+	[Flags]

+	//[Serializable]

+	public enum DrawItemState {

+

+		None = 0,

+		Selected = 1,

+		Grayed = 2,

+		Disabled = 4,

+		Checked = 8,

+		Focus = 16,

+		Default = 32,

+		HotLight = 64,

+		Inactive = 128,

+		NoAccelerator = 256,

+		NoFocusRect = 512,

+		ComboBoxEdit = 1024,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawMode.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawMode.cs
new file mode 100644
index 00000000000..1fe60d2e9c6
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/DrawMode.cs
@@ -0,0 +1,26 @@
+//

+// System.Windows.Forms.DrawMode.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies how the elements of a control are drawn.

+	/// </summary>

+	//[Serializable]

+	public enum DrawMode {

+

+		//Values were verified with enumcheck.

+		Normal = 0,

+		OwnerDrawFixed = 1,

+		OwnerDrawVariable = 2,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ErrorBlinkStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ErrorBlinkStyle.cs
new file mode 100644
index 00000000000..1e86f26d905
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ErrorBlinkStyle.cs
@@ -0,0 +1,27 @@
+//

+// System.Windows.Forms.ErrorBlinkStyle.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies constants indicating when the error icon, supplied by an ErrorProvider, 

+  /// should blink to alert the user that an error has occurred.

+	/// </summary>

+	//[Serializable]

+	public enum ErrorBlinkStyle {

+

+		//Values were verified with enumcheck.

+		BlinkIfDifferentError = 0,

+		AlwaysBlink = 1,

+		NeverBlink = 2,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ErrorIconAlignment.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ErrorIconAlignment.cs
new file mode 100644
index 00000000000..968a9502d59
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ErrorIconAlignment.cs
@@ -0,0 +1,30 @@
+//

+// System.Windows.Forms.ErrorIconAlignment.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies constants indicating the locations that an error icon can appear

+  /// in relation to the control with an error. 

+	/// </summary>

+	//[Serializable]

+	public enum ErrorIconAlignment {

+

+		//Values were verified with enumcheck.

+		TopLeft = 0,

+		TopRight = 1,

+		MiddleLeft = 2,

+		MiddleRight = 3,

+		BottomLeft = 4,

+		BottomRight = 5,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ErrorProvider.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
new file mode 100644
index 00000000000..05b54c91880
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ErrorProvider.cs
@@ -0,0 +1,236 @@
+//

+// System.Windows.Forms.ErrorProvider

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	 Dennis Hayes(dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+using System.Runtime.Remoting;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+using System.ComponentModel;

+	public class ErrorProvider : Component, IExtenderProvider {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ErrorProvider()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public override ISite  Site {

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int BlinkRate {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ErrorBlinkStyle BlinkStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//public IContainer Container {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public ContainerControl ContainerControl {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string DataMember {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public object DataSource {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Icon Icon {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public void BindToDataAndErrors(object newDataSource, string newDataMember)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public bool CanExtend(object extendee)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override ObjRef CreateObjRef(Type requestedType)

+		{

+			throw new NotImplementedException ();

+		}

+		//inheriated

+		//public void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public string GetError(Control control)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override int GetHashCode()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ErrorIconAlignment GetIconAlignment(Control control)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int GetIconPadding(Control control)

+		{

+			throw new NotImplementedException ();

+		}

+		//public object GetLifetimeService()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public Type GetType()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override object InitializeLifetimeService()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void SetError(Control control,string value)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void SetIconAlignment(Control control, ErrorIconAlignment value)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void SetIconPadding(Control control, int padding)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void UpdateBinding()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		//inherited

+		//public event EventHandler Disposed;

+

+		//

+		//  --- Protected Properties

+		//

+		//protected bool DesignMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected EventHandlerList Events {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected override void Dispose(bool disposing)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override object GetService(Type service)

+		{

+			throw new NotImplementedException ();

+		}

+		//protected object MemberwiseClone()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Destructor

+		//

+		[MonoTODO]

+		~ErrorProvider()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/FeatureSupport.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/FeatureSupport.cs
new file mode 100644
index 00000000000..54552f3aeb1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/FeatureSupport.cs
@@ -0,0 +1,70 @@
+//

+// System.Windows.Forms.FeatureSupport.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public abstract class FeatureSupport : IFeatureSupport {

+

+		//

+		//  --- Public Methods

+		//

+		//IFeatureSupport

+

+		Version IFeatureSupport.GetVersionPresent(object feature) {

+			throw new NotImplementedException ();

+		}

+		bool IFeatureSupport.IsPresent(object feature){

+			throw new NotImplementedException ();

+		}

+		bool IFeatureSupport.IsPresent(object feature, Version minimumVersion){

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override bool Equals(object obj)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		[MonoTODO]

+		public abstract Version GetVersionPresent(object o);

+

+		//[MonoTODO]

+		//public virtual bool IsPresent(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		// --- Protected Constructors

+		//

+		[MonoTODO]

+		protected FeatureSupport()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/FileDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/FileDialog.cs
new file mode 100644
index 00000000000..48c16ef8516
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/FileDialog.cs
@@ -0,0 +1,230 @@
+//

+// System.Windows.Forms.FileDialog.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public abstract class FileDialog : CommonDialog {

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public bool AddExtension {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual bool CheckFileExists {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool CheckPathExists {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string DefaultExt {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool DereferenceLinks {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string FileName {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string[] FileNames {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string Filter {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int FilterIndex {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string InitialDirectory {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool RestoreDirectory {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowHelp {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string Title {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ValidateNames {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		// inherited

+		//[MonoTODO]

+		//public override void Dispose() {

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//public override void Dispose(bool disposing) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities 

+			return base.GetHashCode();

+		}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override void Reset()

+		{

+			throw new NotImplementedException ();

+		}

+		//public DialogResult ShowDialog()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public DialogResult ShowDialog(IWin32Window owner)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		// --- Public Events

+		//

+		[MonoTODO]

+		public event CancelEventHandler FileOk {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		// --- Protected Methods

+		//

+		//inherited

+		//[MonoTODO]

+		//protected  void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected  override IntPtr HookProc( IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam )

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected  void OnFileOk( CancelEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected  override bool RunDialog( IntPtr hWndOwner)

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/FlatStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/FlatStyle.cs
new file mode 100644
index 00000000000..5f31c5fb20d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/FlatStyle.cs
@@ -0,0 +1,27 @@
+//

+// System.Windows.Forms.FlatStyle.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies the appearance of a control.

+	/// </summary>

+	//[Serializable]

+	public enum FlatStyle {

+

+		//Values were verified with enumcheck.

+		Flat = 0,

+		Popup = 1,

+		Standard = 2,

+		System = 3,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/FontDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/FontDialog.cs
new file mode 100644
index 00000000000..5898bebd52c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/FontDialog.cs
@@ -0,0 +1,226 @@
+//

+// System.Windows.Forms.FontDialog.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+        public class FontDialog : CommonDialog {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public FontDialog()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public bool AllowScriptChange {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AllowSimululations {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AllowVectorForms {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AllowVerticalForms {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Color Color {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool FixedPitchOnly {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Font Font {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool FontMustExist {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int MaxSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int MinSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ScriptsOnly {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowApply {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowEffects {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowHelp {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		

+		//  --- Public Methods

+		//inherited

+		//public void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override int GetHashCode()

+		{

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		[MonoTODO]

+		public override void Reset()

+		{

+			throw new NotImplementedException ();

+		}

+		//public DialogResult ShowDialog()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		[MonoTODO]

+		public event EventHandler Apply;

+

+		//

+		//  --- Protected Properties

+		//

+		//inherited

+		//[MonoTODO]

+		//protected void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override IntPtr HookProc( IntPtr hWnd,  int msg,  IntPtr wparam,  IntPtr lparam )

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override bool RunDialog(IntPtr hWndOwner)

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Form.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Form.cs
new file mode 100644
index 00000000000..ff637210754
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Form.cs
@@ -0,0 +1,1035 @@
+//

+// System.Windows.Forms.Form

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com)

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System;

+using System.Drawing;

+using System.ComponentModel;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	public class Form : ContainerControl  {

+

+		string caption;

+

+		public Form () : base ()

+		{

+

+		}

+		

+		static Form ()

+		{

+

+		}

+		

+		void delete_cb (object o, EventArgs args)

+		{

+			if (Closed != null)

+				Closed (o, args);

+		}

+

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public IButtonControl AcceptButton {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public static Form ActiveForm {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Form ActiveMdiChild {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool AutoScale {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public virtual Size AutoScaleBaseSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override bool AutoScroll {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override Color BackColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public IButtonControl CancelButton {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public new Size ClientSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool ControlBox {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Rectangle DesktopBounds {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Point DesktopLocation {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public DialogResult DialogResult {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public FormBorderStyle FormBorderStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool HelpButton {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		// Icon class not yet stubbed/implemented

+		//public Icon Icon {

+		//	 get {

+		//		 throw new NotImplementedException ();

+		//	 }

+		//	 set {

+		//		 throw new NotImplementedException ();

+		//	 }

+		//}

+

+		[MonoTODO]

+		public bool IsMidiChild {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool IsMidiContainer {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool KeyPreview {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool MaximizeBox {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Size MaximumSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Form[] MdiChildren {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Form MdiParent {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		//public MainMenu Menu {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		[MonoTODO]

+		//public MainMenu MergedMenu {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		[MonoTODO]

+		public bool MinimizeBox {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Size MinimumSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool Modal {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public double Opacity {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Form[] OwnedForms {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Form Owner {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool ShowInTaskbar {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public SizeGripStyle SizeGripStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public FormStartPosition StartPosition {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool TopLevel {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool TopMost {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Color TransparencyKey {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public FormWindowState WindowState {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		

+		//  --- Public Methods

+		public void Activate ()

+		{

+			Win32.SetActiveWindow (window.Handle);

+		}

+

+		[MonoTODO]

+		public void AddOwnedForm (Form ownedForm)

+		{

+			throw new NotImplementedException ();

+		}

+

+		public void Close ()

+		{

+			Win32.CloseWindow (window.Handle);

+		}

+

+		//inherited

+		//public void Dispose ()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+		//public static bool Equals (object o1, object o2)

+		//{

+		//		throw new NotImplementedException ();

+		//}		 [MonoTODO]

+

+		public override bool Equals (object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+

+		[MonoTODO]

+		public override int GetHashCode () {

+			//FIXME add our proprities

+			return base.GetHashCode ();

+		}

+

+		[MonoTODO]

+		// Font class not implemented or stubbed

+ 		//public static SizeF GetAutoScaleSize(Font font)

+ 		//{

+ 		//	throw new NotImplementedException ();

+ 		//}

+

+		//public void Invalidate()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		//public object Invoke()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public void LayoutMdi (MdiLayout value)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public void PerformLayout()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public void RemoveOwnedForm (Form ownedForm)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//	public void ResumeLayout()

+		//	{

+		//		throw new NotImplementedException ();

+		//	}

+		//

+		//	public void Scale(float f)

+		//	{

+		//		throw new NotImplementedException ();

+		//	}

+		//

+		//	public void Select()

+		//	{

+		//		throw new NotImplementedException ();

+		//	}

+		//

+		//	public void SetBounds(int x, int y, int width, int height)

+		//	{

+		//		throw new NotImplementedException ();

+		//	}

+

+		public void SetDesktopLocation (int x, int y)

+		{

+			Win32.SetWindowPos ((IntPtr) window.Handle, (IntPtr) 0, 

+					    x, y, 0, 0, 

+					    (int) (Win32.SWP_NOSIZE | 

+					    Win32.SWP_NOZORDER));

+		}

+

+		public new void Show ()

+		{

+			Win32.ShowWindow (window.Handle, (int) Win32.SW_SHOW);

+		}

+

+		[MonoTODO]

+		public DialogResult ShowDialog ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override string ToString ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//  --- Public Events

+		

+		[MonoTODO]

+		public event EventHandler Activated {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public event EventHandler Closed;

+		 

+		// CancelEventHandler not yet implemented/stubbed

+		//public event CancelEventHandler Closing;

+		

+		[MonoTODO]

+		public event EventHandler Deactivate {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event InputLanguageChangedEventHandler InputLanguageChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event InputLanguageChangingEventHandler InputLanguageChanging {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  Load {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MaximizedBoundsChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MaximumSizeChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MdiChildActivate {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MenuComplete {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MenuStart {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MinimumSizedChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		

+		//  --- Protected Properties

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//[MonoTODO]

+		////FIXME

+		//protected override Size DefaultSize {

+		//}

+

+		[MonoTODO]

+		protected Rectangle MaximizedBounds {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		

+		//  --- Protected Methods

+		

+		[MonoTODO]

+		protected override void AdjustFormScrollbars (bool displayScrollbars)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//[MonoTODO]

+		//protected override ControlCollection CreateControlsInstance()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void CreateHandle ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void DefWndProc (ref Message m)

+		{

+			window.DefWndProc (ref m);

+		}

+

+		//protected override void Dispose(bool disposing)

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected virtual void  OnClosed (EventArgs e)

+		{

+

+		}

+

+		[MonoTODO]

+		// CancelEventArgs not yet stubbed/implemented

+		//protected virtual void  OnClosing(CancelEventArgs e)

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void OnCreateControl ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnFontChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnHandleCreated (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnHandleDestroyed (EventArgs e)

+		{

+		}

+

+		[MonoTODO]

+		protected virtual void OnInputLanguageChanged (InputLanguageChangedEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnInputLanguagedChanging (InputLanguageChangingEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnLoad (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMaximizedBoundsChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMaximumSizedChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMdiChildActive (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMenuComplete (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMenuStart (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMinimumSizeChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void  OnPaint (PaintEventArgs e)

+		{

+

+		}

+		[MonoTODO]

+		protected override void  OnResize (EventArgs e)

+		{

+

+		}

+

+		[MonoTODO]

+		protected override void  OnStyleChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		protected override void  OnTextChanged (EventArgs e)

+		{

+

+		}

+

+		[MonoTODO]

+		protected override void  OnVisibleChanged (EventArgs e)

+		{

+

+		}

+

+		[MonoTODO]

+		protected override bool ProcessCmdKey (ref Message msg, Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override bool ProcessDialogKey (Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override bool ProcessKeyPreview (ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override bool ProcessTabKey (bool forward)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void ScaleCore (float x, float y)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public void Select(bool b1, bool b2)

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void SetBoundsCore (int x, int y,  int width,  int height,  BoundsSpecified specified)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void SetClientSizeCore (int x, int y)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void SetVisibleCore (bool value)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//protected void UpdateBounds()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void WndProc (ref Message m)

+		{

+			base.WndProc (ref m);

+

+			switch (m.Msg) {

+			case Win32.WM_CLOSE:

+				EventArgs closeArgs = new EventArgs();

+				OnClosed (closeArgs);

+				break;

+				//case ?:

+				//OnCreateControl()

+				//break;

+			case Win32.WM_FONTCHANGE:

+				EventArgs fontChangedArgs = new EventArgs();

+				OnFontChanged (fontChangedArgs);

+				break;

+			case Win32.WM_CREATE:

+				EventArgs handleCreatedArgs = new EventArgs(); 

+				OnHandleCreated (handleCreatedArgs);

+				break;

+			case Win32.WM_DESTROY:

+				EventArgs destroyArgs = new EventArgs();

+				OnHandleDestroyed (destroyArgs);

+				break;

+			case Win32.WM_INPUTLANGCHANGE:

+				//InputLanguageChangedEventArgs ilChangedArgs =

+				//	new InputLanguageChangedEventArgs();

+				//OnInputLanguageChanged (ilChangedArgs);

+				break;

+			case Win32.WM_INPUTLANGCHANGEREQUEST:

+				//InputLanguageChangingEventArgs ilChangingArgs =

+				//	new InputLanguageChangingEventArgs();

+				//OnInputLanguagedChanging (ilChangingArgs);

+				break;

+				/*

+				  case Win32.WM_SHOWWINDOW:

+				  EventArgs e;

+				  OnLoad (e);

+				  break;

+				*/

+				// case ?:

+				// OnMaximizedBoundsChanged(EventArgs e)

+				// break;

+				// case ?:

+				// OnMaximumSizedChanged(EventArgs e)

+				//break;

+			case Win32.WM_MDIACTIVATE:

+				EventArgs mdiActivateArgs = new EventArgs();

+				OnMdiChildActive (mdiActivateArgs);

+				break;

+			case Win32.WM_EXITMENULOOP:

+				EventArgs menuCompleteArgs = new EventArgs();

+				OnMenuComplete (menuCompleteArgs);

+				break;

+			case Win32.WM_ENTERMENULOOP:

+				EventArgs enterMenuLoopArgs = new EventArgs();

+				OnMenuStart (enterMenuLoopArgs);

+				break;

+				// case ?:

+				// OnMinimumSizeChanged(EventArgs e)

+				// break;

+			case Win32.WM_PAINT:

+				//PaintEventArgs paintArgs = new PaintEventArgs();

+				//OnPaint (paintArgs);

+				break;

+			case Win32.WM_SIZE:

+				EventArgs resizeArgs = new EventArgs();

+				OnResize (resizeArgs);

+				break;

+				//case ?:

+				//OnStyleChanged(EventArgs e)

+				//break;

+			case Win32.WM_SETTEXT:

+				EventArgs textChangedArgs = new EventArgs();

+				OnTextChanged (textChangedArgs);

+				break;

+			case Win32.WM_SHOWWINDOW:

+				EventArgs visibleChangedArgs = new EventArgs();

+				OnVisibleChanged (visibleChangedArgs);

+				break;

+			}

+		}

+

+		//sub class

+		//System.Windows.Forms.Form.ControlCollection.cs

+		//

+		//Author:

+		//  stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+		//

+		// (C) 2002 Ximian, Inc

+		//

+		//

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+		// TODO: implement support classes and derive from 

+		// proper classes

+		public /*new(remove error)*/ class  ControlCollection /*: System.Windows.Forms.Control.ControlCollection, ICollection*/ {

+

+			//  --- Constructor

+			[MonoTODO]

+			// base class not defined (yet!)

+			public ControlCollection (Form owner) /*: base(owner)*/ {

+				throw new NotImplementedException ();

+			}

+		

+			//  --- Public Methods

+

+			[MonoTODO]

+			// TODO: see what causes this compile error

+			//public override void Add(Control value) {

+			//	throw new NotImplementedException ();

+			//}

+

+			[MonoTODO]

+			public override bool Equals (object o) {

+				throw new NotImplementedException ();

+			}

+

+			//public static bool Equals(object o1, object o2) {

+			//	throw new NotImplementedException ();

+			//}

+

+			[MonoTODO]

+			public override int GetHashCode () {

+				//FIXME add our proprities

+				return base.GetHashCode ();

+			}

+

+			// Inherited

+			//public override int GetChildIndex(Control c) {

+			//	throw new NotImplementedException ();

+			//}

+

+			//[MonoTODO]

+			// Control not yet usuable due to dependencies

+			//public override void Remove(Control value) {

+			//	throw new NotImplementedException ();

+			//}

+		} // end of Subclass

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/FormBorderStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/FormBorderStyle.cs
new file mode 100644
index 00000000000..66738ef9bbb
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/FormBorderStyle.cs
@@ -0,0 +1,31 @@
+//

+// System.Windows.Forms.FormBorderStyle.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies the border styles for a form.

+	/// </summary>

+	//[Serializable]

+	[ComVisible(true)]

+	public enum FormBorderStyle {

+

+		//Values were verified with enumcheck.

+		None = 0,

+		FixedSingle = 1,

+		Fixed3D = 2,

+		FixedDialog = 3,

+		Sizable = 4,

+		FixedToolWindows = 5,

+		SizableToolWindow = 6

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/FormStartPosition.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/FormStartPosition.cs
new file mode 100644
index 00000000000..b1fb9089e70
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/FormStartPosition.cs
@@ -0,0 +1,29 @@
+//

+// System.Windows.Forms.FormStartPosition.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies the initial position of a form.

+	/// </summary>

+	//[Serializable]

+	[ComVisible(true)]

+	public enum FormStartPosition {

+

+		//Values were verified with enumcheck.

+		Manual = 0,

+		CenterScreen = 1,

+		WindowsDefaultLocation = 2,

+		WindowsDefaultBounds = 3,

+		CenterParent = 4,		

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/FormWindowState.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/FormWindowState.cs
new file mode 100644
index 00000000000..e47baa119da
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/FormWindowState.cs
@@ -0,0 +1,27 @@
+//

+// System.Windows.Forms.FormWindowState.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies how a form window is displayed.

+	/// </summary>

+	//[Serializable]

+	[ComVisible(true)]

+	public enum FormWindowState {

+

+		//Values were verified with enumcheck.

+		Normal = 0,

+		Maximized = 1,

+		Minimized = 2,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/FrameStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/FrameStyle.cs
new file mode 100644
index 00000000000..00e1751e8bb
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/FrameStyle.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.FrameStyle.cs

+//

+// Author:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+

+	/// <summary>

+  /// Specifies the frame style of the selected control.

+	/// </summary>

+	//[Serializable]

+	public enum FrameStyle {

+

+		//Values were verified with enumcheck.

+		Dashed = 0,

+		Thick = 1,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/GiveFeedbackEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/GiveFeedbackEventArgs.cs
new file mode 100644
index 00000000000..19d817d4415
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/GiveFeedbackEventArgs.cs
@@ -0,0 +1,131 @@
+//

+// System.Windows.Forms.GiveFeedbackEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	 Partialy completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Completed

+	/// </summary>

+

+	public class GiveFeedbackEventArgs : EventArgs {

+

+		#region Fields

+		DragDropEffects effect;

+		bool useDefaultCursors;

+		#endregion

+

+		public GiveFeedbackEventArgs(  DragDropEffects effect,  bool useDefaultCursors ) 

+		{

+			this.effect = effect;

+			this.useDefaultCursors = useDefaultCursors;

+		}

+		

+		#region Public Properties

+		public DragDropEffects Effect 

+		{

+			get {

+				return effect;

+			}

+		}

+		public bool UseDefaultCursors {

+			get {

+				return useDefaultCursors;

+			}

+			set {

+				useDefaultCursors = value;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two GiveFeedbackEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Effect and UseDefaultCursors Property

+		///	of the two GiveFeedbackEventArgs.

+		/// </remarks>

+		public static bool operator == (GiveFeedbackEventArgs GiveFeedbackEventArgsA, GiveFeedbackEventArgs GiveFeedbackEventArgsB) 

+		{

+			return (GiveFeedbackEventArgsA.Effect == GiveFeedbackEventArgsB.Effect) && 

+				   (GiveFeedbackEventArgsA.UseDefaultCursors == GiveFeedbackEventArgsB.UseDefaultCursors);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two GiveFeedbackEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Effect and UseDefaultCursors Property

+		///	of the two GiveFeedbackEventArgs.

+		/// </remarks>

+		public static bool operator != (GiveFeedbackEventArgs GiveFeedbackEventArgsA, GiveFeedbackEventArgs GiveFeedbackEventArgsB) 

+		{

+			return (GiveFeedbackEventArgsA.Effect != GiveFeedbackEventArgsB.Effect) ||

+				(GiveFeedbackEventArgsA.UseDefaultCursors != GiveFeedbackEventArgsB.UseDefaultCursors);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	GiveFeedbackEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is GiveFeedbackEventArgs))return false;

+			return (this == (GiveFeedbackEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " GiveFeedbackEventArgs";

+		}

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/GiveFeedbackEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/GiveFeedbackEventHandler.cs
new file mode 100644
index 00000000000..136b6a29c98
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/GiveFeedbackEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.GiveFeedbackEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void GiveFeedbackEventHandler (

+	object sender,

+	GiveFeedbackEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/GridColumnStylesCollection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/GridColumnStylesCollection.cs
new file mode 100644
index 00000000000..7bdfa3d6211
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/GridColumnStylesCollection.cs
@@ -0,0 +1,215 @@
+//

+// System.Windows.Forms.GridColumnStylesCollection.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Collections;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class GridColumnStylesCollection : BaseCollection, IList {

+

+		//

+		//  --- Public Properties

+		//

+//		[MonoTODO]

+//		public DataGridColumnStyle Item this[int index]  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public virtual int Add(DataGridColumnStyle column)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void AddRange(DataGridColumnStyle [] columns)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Clear()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool Contains()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		[MonoTODO]

+		public int IndexOf(DataGridColumnStyle element)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Remove(DataGridColumnStyle column)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void RemoveAt(int index)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void ResetPropertyDescriptors()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		[MonoTODO]

+		public event CollectionChangeEventHandler CollectionChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override ArrayList List {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected void OnCollectionChanged(CollectionChangeEventArgs cevent)

+		{

+			throw new NotImplementedException ();

+		}

+		/// <summary>

+		/// IList Interface implmentation.

+		/// </summary>

+		bool IList.IsReadOnly{

+			get{

+				// We allow addition, removeal, and editing of items after creation of the list.

+				return false;

+			}

+		}

+		bool IList.IsFixedSize{

+			get{

+				// We allow addition and removeal of items after creation of the list.

+				return false;

+			}

+		}

+

+		[MonoTODO]

+		public object this[int index]{

+			get{

+				throw new NotImplementedException ();

+			}

+			set{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		void IList.Clear(){

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		int IList.Add( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		bool IList.Contains( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		int IList.IndexOf( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.Insert(int index, object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.Remove( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.RemoveAt( int index){

+			throw new NotImplementedException ();

+		}

+		// End of IList interface

+

+		/// <summary>

+		/// ICollection Interface implmentation.

+		/// </summary>

+		int ICollection.Count{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		bool ICollection.IsSynchronized{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		object ICollection.SyncRoot{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		void ICollection.CopyTo(Array array, int index){

+			throw new NotImplementedException ();

+		}

+		// End Of ICollection

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/GridItem.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/GridItem.cs
new file mode 100644
index 00000000000..573dfa3c977
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/GridItem.cs
@@ -0,0 +1,100 @@
+//

+// System.Windows.Forms.GridItem.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Partially completed by Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public abstract class GridItem {

+		bool expandable;

+		bool expanded;

+		//

+		//  --- Public Properties

+		//

+		public bool Expandable {

+			get {

+				return expandable;

+			}

+		}

+		public bool Expanded {

+			get {

+				return expanded;

+			}

+			set {

+				expanded = value;

+			}

+		}

+		//[MonoTODO]

+		//public abstract GridItemCollection GridItems {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//public abstract GridItemType GridItemType {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//public abstract string Label {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//public abstract GridItem Parent {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//public abstract PropertyDescriptor PropertyDescriptor {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//public abstract object Value {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		//

+		// --- Protected Constructor

+		//

+		[MonoTODO]

+		protected GridItem()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/GridItemCollection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/GridItemCollection.cs
new file mode 100644
index 00000000000..ed39907524f
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/GridItemCollection.cs
@@ -0,0 +1,86 @@
+//

+// System.Windows.Forms.GridItemCollection.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public abstract class GridItemCollection : ICollection, IEnumerable {

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public int Count {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public GridItem this[string str] {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		[MonoTODO]

+		public IEnumerator GetEnumerator()

+		{

+			throw new NotImplementedException ();

+		}

+		/// <summary>

+		/// ICollection Interface implmentation.

+		/// </summary>

+		int ICollection.Count{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		bool ICollection.IsSynchronized{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		object ICollection.SyncRoot{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		void ICollection.CopyTo(Array array, int index){

+			throw new NotImplementedException ();

+		}

+		// End Of ICollection

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/GridItemType.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/GridItemType.cs
new file mode 100644
index 00000000000..3946e0d9161
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/GridItemType.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.GridItemType.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum GridItemType {

+		ArrayValue = 2,

+		Category = 1,

+		Property = 0,

+		Root = 3

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/GridTableStylesCollection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/GridTableStylesCollection.cs
new file mode 100644
index 00000000000..275c6493f90
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/GridTableStylesCollection.cs
@@ -0,0 +1,181 @@
+//

+// System.Windows.Forms.GridTableStylesCollection.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Collections;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class GridTableStylesCollection : BaseCollection, IList {

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public DataGridTableStyle this[int index]  {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public DataGridTableStyle this[string s]  {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		[MonoTODO]

+		public virtual int Add(DataGridTableStyle table)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void AddRange(DataGridTableStyle[] tables)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual void Clear()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		[MonoTODO]

+		public bool Contains(DataGridTableStyle table)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Remove(DataGridTableStyle table)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void RemoveAt(int index)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		[MonoTODO]

+		public event CollectionChangeEventHandler CollectionChanged;

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override ArrayList List {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected void OnCollectionChanged(CollectionChangeEventArgs cevent)

+		{

+			throw new NotImplementedException ();

+		}

+		/// <summary>

+		/// IList Interface implmentation.

+		/// </summary>

+		bool IList.IsReadOnly{

+			get{

+				// We allow addition, removeal, and editing of items after creation of the list.

+				return false;

+			}

+		}

+		bool IList.IsFixedSize{

+			get{

+				// We allow addition and removeal of items after creation of the list.

+				return false;

+			}

+		}

+

+		//[MonoTODO]

+		object IList.this[int index]{

+			get{

+				throw new NotImplementedException ();

+			}

+			set{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		void IList.Clear(){

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		int IList.Add( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		bool IList.Contains( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		int IList.IndexOf( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.Insert(int index, object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.Remove( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.RemoveAt( int index){

+			throw new NotImplementedException ();

+		}

+		// End of IList interface

+

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/GroupBox.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/GroupBox.cs
new file mode 100644
index 00000000000..5b13bdc4252
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/GroupBox.cs
@@ -0,0 +1,208 @@
+//

+// System.Windows.Forms.GroupBox.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class GroupBox : Control {

+

+		//

+		//  --- Constructor

+		//

+

+		[MonoTODO]

+		public GroupBox() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+

+		[MonoTODO]

+		public override bool AllowDrop {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override Rectangle DisplayRectangle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public FlatStyle FlatStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		

+		//inherited

+		//public IAsyncResult BeginInvoke(Delegate d) {

+		//	throw new NotImplementedException ();

+		//}

+

+		//public IAsyncResult BeginInvoke(Delegate d, object[] objs) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Dispose() {

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override bool Equals(object o) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		//public static bool Equals(object o1, object o2) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate() {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public object Invoke(Delegate d) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public object Invoke(Delegate d, object[] objs) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void PerformLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void ResumeLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Scale(float val) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Scale(float val1, float val2) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Select() {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void SetBounds(int b1, int b2, int b3, int b4) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void SetBounds(int b1, int b2, int b3, int b4, BoundsSpecified bounds) {

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override string ToString() {

+			throw new NotImplementedException ();

+		}

+

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+

+		//[MonoTODO]

+		//protected override void Dispose(bool disposing) {

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnPaint(PaintEventArgs e) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override bool ProcessMnemonic(char charCode) {

+			throw new NotImplementedException ();

+		}

+

+		//[MonoTODO]

+		//protected override virtual void Select(bool b1, bool b2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+

+		//protected override void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		// Inherited

+		//protected override void UpdateBounds(int b1, int b2, int b3, int b4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		// Inherited

+		//protected override void UpdateBounds(int b1, int b2, int b3, int b4, int b5, int b6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void WndProc(ref Message m) {

+			throw new NotImplementedException ();

+		}

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/HScrollBar.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/HScrollBar.cs
new file mode 100644
index 00000000000..d425d5a620a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/HScrollBar.cs
@@ -0,0 +1,188 @@
+//

+// System.Windows.Forms.HScrollBar.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class HScrollBar : ScrollBar {

+

+		//

+		//  --- Constructor

+		//

+

+		[MonoTODO]

+		public HScrollBar() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		[MonoTODO]

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Properties

+		//

+

+		//public override void Dispose() {

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override bool Equals(object o) {

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2) {

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		//public void Invalidate() {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate(bool val) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate(Rectangle rect) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate(Region reg) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate(Rectangle rect, bool val) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate(Region reg, bool val) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public object Invoke(Delegate del) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public object Invoke(Delegate del, object[] objs) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void PerformLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void PerformLayout(Control ctl, string s) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void ResumeLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void ResumeLayout(bool val) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Scale(float val) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Scale(float val1, float val2) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Select() {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void SetBounds(int b1, int b2, int b3, int b4) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void SetBounds(int b1, int b2, int b3, int b4, BoundsSpecified bnds) {

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Protected Properties

+		//

+

+		[MonoTODO]

+		protected  override  CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		protected override  ImeMode DefaultImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		protected override  Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+

+		[MonoTODO]

+		protected override void Dispose(bool val) {

+			throw new NotImplementedException ();

+		}

+		//inherited

+		//protected override void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//protected void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//protected void UpdateBounds(int b1, int b2, int b3, int b4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//protected void UpdateBounds(int b1, int b2, int b3, int b4, int b5, int b6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Help.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Help.cs
new file mode 100644
index 00000000000..66c9f3c22cc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Help.cs
@@ -0,0 +1,65 @@
+//

+// System.Windows.Forms.Help.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class Help {

+

+		//

+		//  --- Public Methods

+		//

+

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		[MonoTODO]

+		public static void ShowHelp(Control c, string s)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static void ShowHelp(Control c, string s, HelpNavigator nav)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public static void ShowHelpIndex(Control parent, string url)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpEventArgs.cs
new file mode 100644
index 00000000000..87fa7088839
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpEventArgs.cs
@@ -0,0 +1,134 @@
+//

+// System.Windows.Forms.HelpEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	// Complete.

+	// </summary>

+

+	public class HelpEventArgs : EventArgs {

+

+		#region Fields

+		private Point mousePos;

+		private  bool handled;

+		#endregion

+

+		//

+		//  --- Constructor

+		//

+		public HelpEventArgs(Point mousePos) 

+		{

+			this.mousePos = mousePos;

+			handled = false; // Gian : hadled is false, otherwise all events are managed by user by default.

+		}

+

+		#region Public Properties

+		public bool Handled 

+		{

+			get {

+				return handled;

+			}

+			set {

+				handled = value;

+			}

+		}

+		public Point MousePos {

+			get {

+				return mousePos;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two HelpEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Handled and MousePos Property

+		///	of the two HelpEventArgs.

+		/// </remarks>

+		public static bool operator == (HelpEventArgs HelpEventArgsA, HelpEventArgs HelpEventArgsB) 

+		{

+			return (HelpEventArgsA.Handled == HelpEventArgsB.Handled) && 

+				   (HelpEventArgsA.MousePos == HelpEventArgsB.MousePos);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two HelpEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Handled and MousePos Property

+		///	of the two HelpEventArgs.

+		/// </remarks>

+		public static bool operator != (HelpEventArgs HelpEventArgsA, HelpEventArgs HelpEventArgsB) 

+		{

+			return (HelpEventArgsA.Handled != HelpEventArgsB.Handled) || 

+				   (HelpEventArgsA.MousePos != HelpEventArgsB.MousePos);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	HelpEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is HelpEventArgs))return false;

+			return (this == (HelpEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " HelpEventArgs";

+		}

+

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpEventHandler.cs
new file mode 100644
index 00000000000..14f84f59d78
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.HelpEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void HelpEventHandler (

+	object sender,

+	HelpEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpNavigator.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpNavigator.cs
new file mode 100644
index 00000000000..fb6d1041616
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpNavigator.cs
@@ -0,0 +1,23 @@
+//

+// System.Windows.Forms.HelpNavigator.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum HelpNavigator {

+		AssociateIndex = -2147483643,

+		Find = -2147483644,

+		Index = -2147483645,

+		KeywordIndex = -2147483642,

+		TableOfContents = -2147483646,

+		Topic = -2147483647

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpProvider.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpProvider.cs
new file mode 100644
index 00000000000..3e8338a1dd9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/HelpProvider.cs
@@ -0,0 +1,134 @@
+//

+// System.Windows.Forms.HelpProvider.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+	using System.ComponentModel;

+	public class HelpProvider : Component, IExtenderProvider {

+

+		//

+		//  --- Constructor

+		//

+

+		[MonoTODO]

+		public HelpProvider() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+

+		[MonoTODO]

+		public virtual string HelpNamespace {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		//public void Dispose() {

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override bool Equals(object o) {

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2) {

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		[MonoTODO]

+		public virtual  string GetHelpKeyword(Control ctl) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual  HelpNavigator GetHelpNavigator(Control ctl) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual  string GetHelpString(Control ctl) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual  bool GetShowHelp(Control ctl) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual  void SetHelpKeyword(Control ctl, string keyword) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual  void SetHelpNavigator(Control ctl, HelpNavigator nav) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual  void SetHelpString(Control ctl, string helpString) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual  void SetShowHelp(Control ctl, bool val) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override string ToString() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		

+		//public event EventHandler Disposed {

+		//	add {

+		//		throw new NotImplementedException ();

+		//	}

+		//	remove {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//

+		//  --- Protected Methods

+		//

+

+		

+		//protected override void Dispose(bool disposing) {

+		//	throw new NotImplementedException ();

+		//}

+		bool IExtenderProvider.CanExtend(object extendee){

+			throw new NotImplementedException ();

+		}	

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/HorizontalAlignment.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/HorizontalAlignment.cs
new file mode 100644
index 00000000000..0430f0ae8bc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/HorizontalAlignment.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.HorizontalAlignment.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum HorizontalAlignment {

+		Center = 2,

+		Left = 0,

+		Right = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IButtonControl.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IButtonControl.cs
new file mode 100644
index 00000000000..c962adc53db
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IButtonControl.cs
@@ -0,0 +1,17 @@
+//

+// System.Windows.Forms.IButtonControl.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	public interface IButtonControl {

+		void NotifyDefault(bool value);

+		void PerformClick();

+		DialogResult DialogResult {get; set;}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ICommandExecutor.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ICommandExecutor.cs
new file mode 100644
index 00000000000..b14787ddbd1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ICommandExecutor.cs
@@ -0,0 +1,22 @@
+//

+// System.Windows.Forms.ICommandExecutor.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	public interface ICommandExecutor {

+

+		// There is no documentation for this interface's members!

+		// Only a note saying that it supports the .NET infrastructure

+		// and is not intended to be used directly from your code.

+		// The Execute method had its own listing in the documentation;

+		// I don't know what other methods and properties there may be.

+		void Execute();

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IComponentEditorPageSite.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IComponentEditorPageSite.cs
new file mode 100644
index 00000000000..6b9fff640ba
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IComponentEditorPageSite.cs
@@ -0,0 +1,24 @@
+//

+// System.Windows.Forms.IComponentEditorPageSite.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	public interface IComponentEditorPageSite {

+

+		// There is no documentation for this interface's members!

+		// Only a note saying that it supports the .NET infrastructure

+		// and is not intended to be used directly from your code.

+		// The following methods had their own listing in the documentation;

+		// I don't know what other methods and properties there may be.

+

+		Control GetControl();

+		void SetDirty();

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IContainerControl.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IContainerControl.cs
new file mode 100644
index 00000000000..9084ba5b50a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IContainerControl.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.IContainerControl.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	public interface IContainerControl {

+

+		bool ActivateControl(Control active);

+		Control ActiveControl {get; set;}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IDataGridColumnStyleEditingNotificationService.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IDataGridColumnStyleEditingNotificationService.cs
new file mode 100644
index 00000000000..a678c607214
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IDataGridColumnStyleEditingNotificationService.cs
@@ -0,0 +1,17 @@
+//

+// System.Windows.Forms.IDataGridColumnStyleEditingNotificationService.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	public interface IDataGridColumnStyleEditingNotificationService {

+

+		void ColumnStartedEditing(Control editingControl);

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IDataGridEditingService.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IDataGridEditingService.cs
new file mode 100644
index 00000000000..d7f2bfac85d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IDataGridEditingService.cs
@@ -0,0 +1,24 @@
+//

+// System.Windows.Forms.IDataGridEditingService.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	public interface IDataGridEditingService {

+

+		// There is no documentation for this interface's members!

+		// Only a note saying that it supports the .NET infrastructure

+		// and is not intended to be used directly from your code.

+		// The following methods had their own listing in the documentation;

+		// I don't know what other methods and properties there may be.

+

+		bool BeginEdit(DataGridColumnStyle gridColumn, int rowNumber);

+		bool EndEdit(DataGridColumnStyle gridColumn, int rowNumber, bool shouldAbort);

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IDataObject.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IDataObject.cs
new file mode 100644
index 00000000000..319c2772f18
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IDataObject.cs
@@ -0,0 +1,33 @@
+//

+// System.Windows.Forms.IDataObject.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	[ComVisible(true)]

+	public interface IDataObject {

+

+		object GetData(string format);

+		object GetData(Type format);

+		object GetData(string format, bool autoConvert);

+		

+		bool GetDataPresent(string format);

+		bool GetDataPresent(Type format);

+		bool GetDataPresent(string format, bool autoConvert);

+

+		string[] GetFormats();

+		string[] GetFormats(bool autoConvert);

+		

+		void SetData(object data);

+		void SetData(string format, object data);

+		void SetData(Type format, object data);

+		void SetData(string format, bool autoConvert, object data);

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IFeatureSupport.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IFeatureSupport.cs
new file mode 100644
index 00000000000..ebf56432a7d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IFeatureSupport.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.IFeatureSupport.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	public interface IFeatureSupport {

+

+		Version GetVersionPresent(object feature);

+		bool IsPresent(object feature);

+		bool IsPresent(object feature, Version minimumVersion);

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IFileReaderService.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IFileReaderService.cs
new file mode 100644
index 00000000000..bd3dbf8a2a4
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IFileReaderService.cs
@@ -0,0 +1,23 @@
+//

+// System.Windows.Forms.IFileReaderService.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+using System.IO;

+namespace System.Windows.Forms {

+

+	public interface IFileReaderService {

+

+		// There is no documentation for this interface's members!

+		// Only a note saying that it supports the .NET infrastructure

+		// and is not intended to be used directly from your code.

+		// The following method had its own listing in the documentation;

+		// I don't know what other methods and properties there may be.

+

+		Stream OpenFileFromSource(string relativePath);

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IMessageFilter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IMessageFilter.cs
new file mode 100644
index 00000000000..cb57ed75204
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IMessageFilter.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.IMessageFilter.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System.Threading;

+namespace System.Windows.Forms {

+

+	public interface IMessageFilter {

+		bool PreFilterMessage(ref Message m);

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IWin32Window.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IWin32Window.cs
new file mode 100644
index 00000000000..5de9e06dd79
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IWin32Window.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.IWin32Window.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	[ComVisible(true)]

+	// FixMe [Guid("")]

+	// FixMe [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]

+	public interface IWin32Window {

+

+		IntPtr Handle {get;}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/IWindowTarget.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/IWindowTarget.cs
new file mode 100644
index 00000000000..f5482584eed
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/IWindowTarget.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.IWindowTarget.cs

+//

+// Author:

+// William Lamb (wdlamb@notwires.com)

+// Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc. http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	public interface IWindowTarget {

+

+		// There is no documentation for this interface's members!

+		// Only a note saying that it supports the .NET infrastructure

+		// and is not intended to be used directly from your code.

+		// The following methods had their own listing in the documentation;

+		// I don't know what other methods and properties there may be.

+

+		void OnHandleChange(IntPtr newHandle);

+		void OnMessage(ref Message m);

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ImageIndexConverter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ImageIndexConverter.cs
new file mode 100644
index 00000000000..b5b300cf236
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ImageIndexConverter.cs
@@ -0,0 +1,249 @@
+//

+// System.Windows.Forms.ImageIndexConverter.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+using System.Globalization;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class ImageIndexConverter : Int32Converter {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ImageIndexConverter()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		//public bool CanConvertFrom(Type t)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public override bool CanConvertFrom(ITypeDescriptorContext context, Type t)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public bool CanConvertTo(Type t)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public override bool CanConvertTo(ITypeDescriptorContext context, Type t)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object o )

+		{

+			throw new NotImplementedException ();

+		}

+

+		//inherited

+		//public override object ConvertFrom(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+

+		//public object ConvertFromInvariantString(string s)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//public object ConvertFromInvariantString(ITypeDescriptorContext context , string s)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//public object ConvertFromString(string s)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public object ConvertFromString( ITypeDescriptorContext context, string s)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public object ConvertFromString( ITypeDescriptorContext context, CultureInfo culture, string s)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+

+		//public object ConvertTo(object o, Type t)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override object ConvertTo( ITypeDescriptorContext context, CultureInfo culture, object o, Type t)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public string ConvertToInvariantString(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public string ConvertToInvariantString( ITypeDescriptorContext context, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public string ConvertToInvariantString( ITypeDescriptorContext context, CultureInfo culture, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public string ConvertToString( ITypeDescriptorContext context, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public string ConvertToString( ITypeDescriptorContext context, CultureInfo culture, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public object CreateInstance(IDictionary dict)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public override object CreateInstance( ITypeDescriptorContext context, IDictionary dict)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+

+		//public bool GetCreateInstanceSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//public PropertyDescriptorCollection GetProperties(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public bool GetPropertiesSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public override bool GetPropertiesSupported(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public ICollection GetStandardValues()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//public bool GetStandardValuesExclusive()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public bool GetStandardValuesSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override bool GetStandardValuesSupported(ITypeDescriptorContext context)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public bool IsValid(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public override bool IsValid( ITypeDescriptorContext context, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+

+		[MonoTODO]

+		protected virtual bool IncludeNoneAsStandardValue {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ImageList.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ImageList.cs
new file mode 100644
index 00000000000..fc85a25df33
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ImageList.cs
@@ -0,0 +1,381 @@
+//

+// System.Windows.Forms.ImageList.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+using System.Drawing;

+using System.Collections;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+    public sealed class ImageList : Component {

+

+		//

+		//  --- Constructor

+		//

+

+		[MonoTODO]

+		public ImageList()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public ImageList(IContainer cont)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+

+		[MonoTODO]

+		public ColorDepth ColorDepth {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public IntPtr Handle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool HandleCreated {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public ImageList.ImageCollection Images {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Size ImageSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public ImageListStreamer ImageStream {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Color TransparentColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		//public void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public void Draw(Graphics g, Point pt, int n)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Draw(Graphics g, int n1, int n2, int n3)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		public event EventHandler RecreateHandle;

+

+		//

+		//  --- Protected Methods

+		//

+		//[MonoTODO]

+		//protected virtual void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+

+		//

+		// System.Windows.Forms.ImageList.ImageCollection.cs

+		//

+		// Author:

+		//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+		//

+		//// (C) 2002 Ximian, Inc

+		////

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+

+		public sealed class ImageCollection : IList, ICollection, IEnumerable {

+

+

+		//

+		//  --- Public Properties

+		//

+

+		[MonoTODO]

+		public int Count {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool Empty {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool IsReadOnly {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Image this[int index] {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		[MonoTODO]

+		public void Add(Icon icon)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Add(Image img)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public int Add(Image img, Color col)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public int AddStrip(Image value)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Clear()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public bool Contains(Image image)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		[MonoTODO]

+		public IEnumerator GetEnumerator()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public int IndexOf(Image image)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Remove(Image image)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void RemoveAt(int index)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+

+		}// End of Subclass

+

+	 }//End of class

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ImageListStreamer.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ImageListStreamer.cs
new file mode 100644
index 00000000000..a35d9759d69
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ImageListStreamer.cs
@@ -0,0 +1,41 @@
+//

+// System.Windows.Forms.ImageListStreamer.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Runtime.Serialization;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public sealed class ImageListStreamer : ISerializable {

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override bool Equals(object o) {

+			throw new NotImplementedException ();

+		}

+		//public static bool Equals(object o1, object o2) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		[MonoTODO]

+		void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context){

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ImeMode.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ImeMode.cs
new file mode 100644
index 00000000000..bd34afa9430
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ImeMode.cs
@@ -0,0 +1,29 @@
+//

+// System.Windows.Forms.ImeMode.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ImeMode {

+		Alpha = 8,

+		AlphaFull = 7,

+		Disable = 3,

+		Hangul = 10,

+		HangulFull = 9,

+		Hiragana = 4,

+		Inherit = -1,

+		Katakana = 5,

+		KatakanaHalf = 6,

+		NoControl = 0,

+		Off = 2,

+		On = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguage.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguage.cs
new file mode 100644
index 00000000000..8b466c7ed48
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguage.cs
@@ -0,0 +1,86 @@
+//

+// System.Windows.Forms.InputLanguage.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Globalization;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public sealed class InputLanguage {

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public CultureInfo Culture {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public static InputLanguage CurrentInputLanguage {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public static InputLanguage DefaultInputLanguage {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public IntPtr Handle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public static InputLanguageCollection InstalledInputLanguages {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string LayoutName {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public static InputLanguage FromCulture(CultureInfo culture)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override int GetHashCode()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangedEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangedEventArgs.cs
new file mode 100644
index 00000000000..2cf36fb3e65
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangedEventArgs.cs
@@ -0,0 +1,140 @@
+//

+// System.Windows.Forms.InputLanguageChangeEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Partial Completed by Dennis Hayes (dennish@raytek.com)

+//  Giananadrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Globalization;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	// Template. Needs completition on CharSet property

+	// </summary>

+

+	public class InputLanguageChangedEventArgs : EventArgs {

+

+		#region Fields

+		private CultureInfo culture;

+		private byte b;

+		#endregion

+

+		//

+		//  --- Constructor

+		//

+		public InputLanguageChangedEventArgs ( CultureInfo culture, byte b) {

+			this.culture = culture;

+			this.b = b;

+		}

+

+		#region Public Properties

+		[MonoTODO]

+		public byte CharSet 

+		{

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		public CultureInfo Culture {

+			get {

+				return culture;

+			}

+		}

+		[MonoTODO]

+		public InputLanguage InputLanguage {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two InputLanguageChangedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	CharSet, Culture and InputLanguage Property

+		///	of the two InputLanguageChangedEventArgs.

+		/// </remarks>

+		public static bool operator == (InputLanguageChangedEventArgs InputLanguageChangedEventArgsA, InputLanguageChangedEventArgs InputLanguageChangedEventArgsB) 

+		{

+			return (InputLanguageChangedEventArgsA.CharSet == InputLanguageChangedEventArgsB.CharSet) && 

+				   (InputLanguageChangedEventArgsA.Culture == InputLanguageChangedEventArgsB.Culture) && 

+				   (InputLanguageChangedEventArgsA.InputLanguage == InputLanguageChangedEventArgsB.InputLanguage);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two InputLanguageChangedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	CharSet, Culture and InputLanguage Property

+		///	of the two InputLanguageChangedEventArgs.

+		/// </remarks>

+		public static bool operator != (InputLanguageChangedEventArgs InputLanguageChangedEventArgsA, InputLanguageChangedEventArgs InputLanguageChangedEventArgsB) 

+		{

+			return (InputLanguageChangedEventArgsA.CharSet != InputLanguageChangedEventArgsB.CharSet) || 

+				(InputLanguageChangedEventArgsA.Culture != InputLanguageChangedEventArgsB.Culture) || 

+				(InputLanguageChangedEventArgsA.InputLanguage != InputLanguageChangedEventArgsB.InputLanguage);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	InputLanguageChangedEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is InputLanguageChangedEventArgs))return false;

+			return (this == (InputLanguageChangedEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " InputLanguageChangedEventArgs";

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangedEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangedEventHandler.cs
new file mode 100644
index 00000000000..72b5732f3f5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangedEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windoes.Forms.InputLanguageChangedEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void InputLanguageChangedEventHandler (

+	object sender,

+	InputLanguageChangedEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangingEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangingEventArgs.cs
new file mode 100644
index 00000000000..4192b8f2774
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangingEventArgs.cs
@@ -0,0 +1,146 @@
+//

+// System.Windows.Forms.InputLanguageChangingEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Globalization;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	// </summary>

+

+	public class InputLanguageChangingEventArgs : EventArgs {

+

+		#region Fields

+		private CultureInfo culture;

+		private bool systemcharset;

+		private InputLanguage inputlanguage;

+		#endregion

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO] //what about input lang?

+		public InputLanguageChangingEventArgs(CultureInfo culture, bool sysCharSet) {

+			this.culture = culture;

+			this.systemcharset =sysCharSet;

+		}

+

+		[MonoTODO] //what about culture?

+		public InputLanguageChangingEventArgs(InputLanguage inputlanguage, bool sysCharSet) {

+			this.culture = culture;

+			this.inputlanguage = inputlanguage;

+		}

+

+		#region Public Properties

+		public CultureInfo Culture 

+		{

+			get {

+				return culture;

+			}

+		}

+		public InputLanguage InputLanguage {

+			get {

+				return inputlanguage;

+			}

+		}

+		public bool SysCharSet {

+			get {

+				return systemcharset;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two InputLanguageChangingEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Culture, InputLanguage and SysCharSet Property

+		///	of the two InputLanguageChangingEventArgs.

+		/// </remarks>

+		public static bool operator == (InputLanguageChangingEventArgs InputLanguageChangingEventArgsA, InputLanguageChangingEventArgs InputLanguageChangingEventArgsB) 

+		{

+			return (InputLanguageChangingEventArgsA.Culture == InputLanguageChangingEventArgsB.Culture) && 

+				   (InputLanguageChangingEventArgsA.InputLanguage == InputLanguageChangingEventArgsB.InputLanguage) && 

+				   (InputLanguageChangingEventArgsA.SysCharSet == InputLanguageChangingEventArgsB.SysCharSet);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two InputLanguageChangingEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Culture, InputLanguage and SysCharSet Property

+		///	of the two InputLanguageChangingEventArgs.

+		/// </remarks>

+		public static bool operator != (InputLanguageChangingEventArgs InputLanguageChangingEventArgsA, InputLanguageChangingEventArgs InputLanguageChangingEventArgsB) 

+		{

+			return (InputLanguageChangingEventArgsA.Culture != InputLanguageChangingEventArgsB.Culture) || 

+				(InputLanguageChangingEventArgsA.InputLanguage != InputLanguageChangingEventArgsB.InputLanguage) || 

+				(InputLanguageChangingEventArgsA.SysCharSet != InputLanguageChangingEventArgsB.SysCharSet);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	InputLanguageChangingEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is InputLanguageChangingEventArgs))return false;

+			return (this == (InputLanguageChangingEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " InputLanguageChangingEventArgs";

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangingEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangingEventHandler.cs
new file mode 100644
index 00000000000..89c61f80f78
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageChangingEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.InputLanguageChangingEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void InputLanguageChangingEventHandler (

+	object sender,

+	InputLanguageChangingEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageCollection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageCollection.cs
new file mode 100644
index 00000000000..f30fa29a68a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/InputLanguageCollection.cs
@@ -0,0 +1,70 @@
+//

+// System.Windows.Forms.InputLanguageCollection.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Collections;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class InputLanguageCollection : ReadOnlyCollectionBase {

+

+		//

+		//  --- Public Properties

+		//

+

+		[MonoTODO]

+		public InputLanguage this[int index] {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		[MonoTODO]

+		public bool Contains(InputLanguage lang)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void CopyTo(InputLanguage[] array, int index)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		[MonoTODO]

+		public int IndexOf(InputLanguage lang)

+		{

+			throw new NotImplementedException ();

+		}

+ }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/InvalidateEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/InvalidateEventArgs.cs
new file mode 100644
index 00000000000..67cbf6d2aac
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/InvalidateEventArgs.cs
@@ -0,0 +1,122 @@
+//

+// System.Windows.Forms.InvalidateEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class InvalidateEventArgs : EventArgs {

+

+		#region Fields

+		private Rectangle InvalidRectangle;

+		#endregion

+

+		//

+		//  --- Constructor

+		//

+		public InvalidateEventArgs(Rectangle invalidRect) 

+		{

+			InvalidRectangle = invalidRect;

+		}

+

+		#region Public Properties

+		public Rectangle InvalidRect 

+		{

+			get {

+				return InvalidRectangle;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two InvalidateEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	InvalidRect Property

+		///	of the two InvalidateEventArgs.

+		/// </remarks>

+		public static bool operator == (InvalidateEventArgs InvalidateEventArgsA, InvalidateEventArgs InvalidateEventArgsB) 

+		{

+			return (InvalidateEventArgsA.InvalidRect == InvalidateEventArgsB.InvalidRect);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two InvalidateEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	InvalidRect Property

+		///	of the two InvalidateEventArgs.

+		/// </remarks>

+		public static bool operator != (InvalidateEventArgs InvalidateEventArgsA, InvalidateEventArgs InvalidateEventArgsB) 

+		{

+			return (InvalidateEventArgsA.InvalidRect != InvalidateEventArgsB.InvalidRect);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	InvalidateEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is InvalidateEventArgs))return false;

+			return (this == (InvalidateEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " InvalidateEventArgs";

+		}

+

+

+		#endregion	 

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/InvalidateEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/InvalidateEventHandler.cs
new file mode 100644
index 00000000000..11fa398faac
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/InvalidateEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.InvalidateEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void InvalidateEventHandler (

+	object sender,

+	InvalidateEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemActivation.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemActivation.cs
new file mode 100644
index 00000000000..b1947e7a12b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemActivation.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.ItemActivation.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ItemActivation {

+		OneClick = 1,

+		Standard = 0,

+		TwoClick = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemBoundsPortion.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemBoundsPortion.cs
new file mode 100644
index 00000000000..8e9de3f554b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemBoundsPortion.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.ItemBoundsPortion.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ItemBoundsPortion {

+		Entire = 0,

+		Icon = 1,

+		ItemOnly = 3,

+		Label = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemChangedEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemChangedEventArgs.cs
new file mode 100644
index 00000000000..b0905dc7cb5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemChangedEventArgs.cs
@@ -0,0 +1,113 @@
+//

+// System.Windows.Forms.ItemChangedEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//	 Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class ItemChangedEventArgs : EventArgs {

+

+		#region Fields

+		private int index = 0;		//Never assigned. default to 0.

+		#endregion

+

+		#region Public Properties

+		public int Index 

+		{

+			get {

+				return index;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ItemChangedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Index Property

+		///	of the two ItemChangedEventArgs.

+		/// </remarks>

+		public static bool operator == (ItemChangedEventArgs ItemChangedEventArgsA, ItemChangedEventArgs ItemChangedEventArgsB) 

+		{

+			return (ItemChangedEventArgsA.Index == ItemChangedEventArgsB.Index);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ItemChangedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Index Property

+		///	of the two ItemChangedEventArgs.

+		/// </remarks>

+		public static bool operator != (ItemChangedEventArgs ItemChangedEventArgsA, ItemChangedEventArgs ItemChangedEventArgsB) 

+		{

+			return (ItemChangedEventArgsA.Index != ItemChangedEventArgsB.Index);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	ItemChangedEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is ItemChangedEventArgs))return false;

+			return (this == (ItemChangedEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " ItemChangedEventArgs";

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemChangedEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemChangedEventHandler.cs
new file mode 100644
index 00000000000..99563864331
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemChangedEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.ItemChangedEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void ItemChangedEventHandler (

+	object sender,

+	ItemChangedEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemCheckEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemCheckEventArgs.cs
new file mode 100644
index 00000000000..b2a7d7c16a5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemCheckEventArgs.cs
@@ -0,0 +1,143 @@
+//

+// System.Windows.Forms.ItemCheckEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//	 Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class ItemCheckEventArgs : EventArgs {

+

+		#region Fields

+		private int index;

+		private CheckState newcheckvalue;

+		private CheckState currentcheckvalue;

+		#endregion

+

+		//

+		//  --- Constructor

+		//

+		public ItemCheckEventArgs(int index,  CheckState newCheckValue, CheckState currentValue ) 

+		{

+			this.index = index;

+			newcheckvalue = newCheckValue;

+			currentcheckvalue = currentValue;

+		}

+		

+		#region Public Properties

+		public CheckState CurrentValue 

+		{

+			get {

+				return currentcheckvalue;

+			}

+		}

+		public int Index {

+			get {

+				return index;

+			}

+		}

+		public CheckState NewValue {

+			get {

+				return newcheckvalue;

+			}

+			set {

+				newcheckvalue = value;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ItemCheckEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	CurrentValue, Index, NewValue and end Property

+		///	of the two ItemCheckEventArgs.

+		/// </remarks>

+		public static bool operator == (ItemCheckEventArgs ItemCheckEventArgsA, ItemCheckEventArgs ItemCheckEventArgsB) 

+		{

+			return (ItemCheckEventArgsA.CurrentValue == ItemCheckEventArgsB.CurrentValue) && 

+				   (ItemCheckEventArgsA.Index == ItemCheckEventArgsB.Index) && 

+				   (ItemCheckEventArgsA.NewValue == ItemCheckEventArgsB.NewValue);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ItemCheckEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	CurrentValue, Index, NewValue and end Property

+		///	of the two ItemCheckEventArgs.

+		/// </remarks>

+		public static bool operator != (ItemCheckEventArgs ItemCheckEventArgsA, ItemCheckEventArgs ItemCheckEventArgsB) 

+		{

+			return (ItemCheckEventArgsA.CurrentValue != ItemCheckEventArgsB.CurrentValue) || 

+				(ItemCheckEventArgsA.Index != ItemCheckEventArgsB.Index) || 

+				(ItemCheckEventArgsA.NewValue != ItemCheckEventArgsB.NewValue);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	ItemCheckEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is ItemCheckEventArgs))return false;

+			return (this == (ItemCheckEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " ItemCheckEventArgs";

+		}

+

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemCheckEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemCheckEventHandler.cs
new file mode 100644
index 00000000000..b1abaab8ddc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemCheckEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Wondows.Forms.ItemCheckEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms  {

+	//[Serializable]

+	public delegate void ItemCheckEventHandler (

+	object sender,

+	ItemCheckEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemDragEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemDragEventArgs.cs
new file mode 100644
index 00000000000..02956fd6468
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemDragEventArgs.cs
@@ -0,0 +1,137 @@
+//

+// System.Windows.Forms.ItemDragEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)   

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	// </summary>

+

+    public class ItemDragEventArgs : EventArgs {

+

+		#region Fields

+		private MouseButtons buttons;

+		private object itemdrageobject;

+		#endregion

+

+		//

+		//  --- Constructor

+		//

+		public ItemDragEventArgs(MouseButtons bttns)

+		{

+			buttons = bttns;

+		}

+		public ItemDragEventArgs(MouseButtons bttns, object o)

+		{

+			buttons = bttns;

+			itemdrageobject = o;

+		}

+		

+		#region Public Properties

+		public MouseButtons Button 

+		{

+			get {

+				return buttons;

+			}

+		}

+

+		public object Item 

+		{

+			get {

+				return itemdrageobject;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ItemDragEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	button and item Property

+		///	of the two ItemDragEventArgs.

+		/// </remarks>

+		public static bool operator == (ItemDragEventArgs ItemDragEventArgsA, ItemDragEventArgs ItemDragEventArgsB) 

+		{

+			return (ItemDragEventArgsA.Button == ItemDragEventArgsB.Button) && 

+				   (ItemDragEventArgsA.Item == ItemDragEventArgsB.Item);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ItemDragEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	button and item Property

+		///	of the two ItemDragEventArgs.

+		/// </remarks>

+		public static bool operator != (ItemDragEventArgs ItemDragEventArgsA, ItemDragEventArgs ItemDragEventArgsB) 

+		{

+			return (ItemDragEventArgsA.Button != ItemDragEventArgsB.Button) || 

+				(ItemDragEventArgsA.Item != ItemDragEventArgsB.Item);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	ItemDragEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is ItemDragEventArgs))return false;

+			return (this == (ItemDragEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " ItemDragEventArgs";

+		}

+

+

+		#endregion

+ 

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemDragEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemDragEventHandler.cs
new file mode 100644
index 00000000000..07c36587ae0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ItemDragEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.ItemDragEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void ItemDragEventHandler (

+	object sender,

+	 ItemDragEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyEventArgs.cs
new file mode 100644
index 00000000000..a73b69713f5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyEventArgs.cs
@@ -0,0 +1,208 @@
+//

+// System.Windows.Forms.KeyEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Partially completed by Dennis Hayes (dennish@raytek.com)

+//  Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.InteropServices;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	// Complete

+	// </summary>

+

+    public class KeyEventArgs : EventArgs {

+

+		#region Fields

+		

+		private Keys keydata;

+		private Keys keycode;			

+		private Keys modifiers;

+

+		private bool alt = false;

+		private bool control = false;

+		private bool handled = false;

+		private bool shift = false;

+		

+		private int keyvalue = -1;

+		

+		#endregion

+		//

+		//  --- Constructor

+		//

+		public KeyEventArgs (Keys keyData)

+		{

+			keydata = keyData;

+		}

+

+		#region Public Properties

+

+		[ComVisible(true)]

+		public virtual bool Alt 

+		{

+			get {

+				return alt;

+			}

+		}

+		

+		[ComVisible(true)]

+		public bool Control 

+		{

+			get {

+				return control;

+			}

+		}

+		

+		[ComVisible(true)]

+		public bool Handled 

+		{

+			get {

+				return handled;

+			}

+			set {

+				handled = value;

+			}

+		}

+		

+		[ComVisible(true)]

+		public Keys KeyCode 

+		{

+			get {

+				return keycode;

+			}

+		}

+		

+		[ComVisible(true)]

+		public Keys KeyData 

+		{

+			get {

+				return keydata;

+			}

+		}

+		

+		[ComVisible(true)]

+		public int KeyValue 

+		{

+			get {

+				return keyvalue;

+			}

+		}

+		

+		[ComVisible(true)]

+		public Keys Modifiers 

+		{

+			get {

+				return modifiers;

+			}

+		}

+		

+		[ComVisible(true)]

+		public bool Shift 

+		{

+			get {

+				return shift;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two KeyEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	alt, control, handled, keycode, keydata, keyvalue, modifiers, shift Property

+		///	of the two KeyEventArgs.

+		/// </remarks>

+		public static bool operator == (KeyEventArgs KeyEventArgsA, KeyEventArgs KeyEventArgsB) 

+		{

+			return (KeyEventArgsA.Alt == KeyEventArgsB.Alt) &&

+				   (KeyEventArgsA.Control == KeyEventArgsB.Control) &&

+				   (KeyEventArgsA.Handled == KeyEventArgsB.Handled) &&

+				   (KeyEventArgsA.KeyCode == KeyEventArgsB.KeyCode) &&

+				   (KeyEventArgsA.KeyData == KeyEventArgsB.KeyData) &&

+				   (KeyEventArgsA.KeyValue == KeyEventArgsB.KeyValue) &&

+				   (KeyEventArgsA.Modifiers == KeyEventArgsB.Modifiers) &&

+				   (KeyEventArgsA.Shift == KeyEventArgsB.Shift);

+

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two KeyEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	alt, control, handled, keycode, keydata, keyvalue, modifiers, shift Property

+		///	of the two KeyEventArgs.

+		/// </remarks>

+		public static bool operator != (KeyEventArgs KeyEventArgsA, KeyEventArgs KeyEventArgsB) 

+		{

+			return (KeyEventArgsA.Alt != KeyEventArgsB.Alt) ||

+				(KeyEventArgsA.Control != KeyEventArgsB.Control) ||

+				(KeyEventArgsA.Handled != KeyEventArgsB.Handled) ||

+				(KeyEventArgsA.KeyCode != KeyEventArgsB.KeyCode) ||

+				(KeyEventArgsA.KeyData != KeyEventArgsB.KeyData) ||

+				(KeyEventArgsA.KeyValue != KeyEventArgsB.KeyValue) ||

+				(KeyEventArgsA.Modifiers != KeyEventArgsB.Modifiers) ||

+				(KeyEventArgsA.Shift != KeyEventArgsB.Shift);

+

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	KeyEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is KeyEventArgs))return false;

+			return (this == (KeyEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " KeyEventArgs";

+		}

+

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyEventHandler.cs
new file mode 100644
index 00000000000..d86cf733bd1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.KeyEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void KeyEventHandler (

+	object sender,

+	KeyEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyPressEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyPressEventArgs.cs
new file mode 100644
index 00000000000..ac6e6805baa
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyPressEventArgs.cs
@@ -0,0 +1,135 @@
+//

+// System.Windows.Forms.KeyPressEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//   Gianandrea Terzi (gterzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.InteropServices;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	// </summary>

+

+    public class KeyPressEventArgs : EventArgs {

+

+		#region Fields

+

+		private char keychar;

+		private bool handled = false;	//Gian : Initialize?

+		

+		#endregion

+

+		//

+		//  --- Constructor

+		//

+		public KeyPressEventArgs (char keyChar)

+		{

+			this.keychar = keyChar;

+		}

+

+		#region Public Properties

+		[ComVisible(true)]

+		public bool Handled {

+			get {

+				return handled;

+			}

+			set {

+				handled = value;

+			}

+		}

+

+		[ComVisible(true)]

+		public char KeyChar {

+			get {

+				return keychar;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two KeyPressEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Handled and KeyChar Property

+		///	of the two KeyPressEventArgs.

+		/// </remarks>

+		public static bool operator == (KeyPressEventArgs KeyPressEventArgsA, KeyPressEventArgs KeyPressEventArgsB) 

+		{

+			return (KeyPressEventArgsA.Handled == KeyPressEventArgsB.Handled) && (KeyPressEventArgsA.KeyChar == KeyPressEventArgsB.KeyChar);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two KeyPressEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Handled and KeyChar Property

+		///	of the two KeyPressEventArgs.

+		/// </remarks>

+		public static bool operator != (KeyPressEventArgs KeyPressEventArgsA, KeyPressEventArgs KeyPressEventArgsB) 

+		{

+			return (KeyPressEventArgsA.Handled != KeyPressEventArgsB.Handled) || (KeyPressEventArgsA.KeyChar != KeyPressEventArgsB.KeyChar);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	KeyPressEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is KeyPressEventArgs))return false;

+			return (this == (KeyPressEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " KeyPressEventArgs";

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyPressEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyPressEventHandler.cs
new file mode 100644
index 00000000000..193ab1700f3
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/KeyPressEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.KeyPressEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void KeyPressEventHandler (

+	object sender,

+	KeyPressEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Keys.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Keys.cs
new file mode 100644
index 00000000000..f9d8081a250
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Keys.cs
@@ -0,0 +1,202 @@
+//

+// System.Windows.Forms.Keys.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	//TODO:

+	//Values not yet implmented

+	/// </summary>

+	public enum Keys {

+		A = 65,

+		Add = 107,

+		Alt = 262144,

+		Apps = 93,

+		Attn = 246,

+		B = 66,

+		Back = 8,

+		BrowserBack = 166,

+		BrowserFavorites = 171,

+		BrowserForward = 167,

+		BrowserHome = 172,

+		BrowserRefresh = 168,

+		BrowserSearch = 170,

+		BrowserStop = 169,

+		C = 67,

+		Cancel = 3,

+		Capital = 20,

+		CapsLock = 20,

+		Clear = 12,

+		Control = 131072,

+		ControlKey = 17,

+		Crsel = 247,

+		D = 68,

+		D0 = 48,

+		D1 = 49,

+		D2 = 50,

+		D3 = 51,

+		D4 = 52,

+		D5 = 53,

+		D6 = 54,

+		D7 = 55,

+		D8 = 56,

+		D9 = 57,

+		Decimal = 110,

+		Delete = 46,

+		Divide = 111,

+		Down = 40,

+		E = 69,

+		End = 35,

+		Enter = 13,

+		EraseEof = 249,

+		Escape = 27,

+		Execute = 43,

+		Exsel = 248,

+		F = 70,

+		F1 = 112,

+		F2 = 113,

+		F3 = 114,

+		F4 = 115,

+		F5 = 116,

+		F6 = 117,

+		F7 = 118,

+		F8 = 119,

+		F9 = 120,

+		F10 = 121,

+		F11 = 122,

+		F12 = 123,

+		F13 = 124,

+		F14 = 125,

+		F15 = 126,

+		F16 = 127,

+		F17 = 128,

+		F18 = 129,

+		F19 = 130,

+		F20 = 131,

+		F21 = 132,

+		F22 = 133,

+		F23 = 134,

+		F24 = 135,

+		FinalMode = 24,

+		G = 71,

+		H = 72,

+		HanguelMode = 21,

+		HangulMode = 21,

+		HanjaMode = 25,

+		Help = 47,

+		Home = 36,

+		I = 73,

+		IMEAceept = 30,

+		IMEConvert = 28,

+		IMEModeChange = 31,

+		IMENonconvert = 29,

+		Insert = 45,

+		J = 74,

+		JunjaMode = 23,

+		K = 75,

+		KanaMode = 21,

+		KanjiMode = 25,

+		KeyCode = 65535,

+		L = 76,

+		LaunchApplication1 = 182,

+		LaunchApplication2 = 183,

+		LaunchMail = 180,

+		LButton = 1,

+		LControlKey = 162,

+		Left = 37,

+		LineFeed = 10,

+		LShiftKey = 160,

+		LMenu = 164,

+		LWin = 91,

+		M = 77,

+		MButton = 4,

+		MediaNextTrack = 176,

+		MediaPlayPause = 179,

+		MediaPreviousTrack = 177,

+		MediaStop = 178,

+		Menu = 18,

+		Modifiers = -65536,

+		Multiply = 106,

+		N = 78,

+		Next = 34,

+		NoName = 252,

+		None = 0,

+		NumLock = 144,

+		NumPad0 = 96,

+		NumPad1 = 97,

+		NumPad2 = 98,

+		NumPad3 = 99,

+		NumPad4 = 100,

+		NumPad5 = 101,

+		NumPad6 = 102,

+		NumPad7 = 103,

+		NumPad8 = 104,

+		NumPad9 = 105,

+		O = 79,

+		Oem8 = 223,

+		OemBackslash = 226,

+		OemClear = 254,

+		OemCloseBrackets = 221,

+		Oemcomma = 188,

+		OemMinus = 189,

+		OemOpenBrackets = 219,

+		OemPeriod = 190,

+		OemPipe = 220,

+		Oemplus = 187,

+		OemQuestion = 191,

+		OemQuotes = 222,

+		OemSemicolon = 186,

+		Oemtilde = 192,

+		P = 80,

+		Pa1 = 253,

+		PageDown = 34,

+		PageUp = 33,

+		Pause = 19,

+		Play = 250,

+		Print = 42,

+		PrintScreen = 44,

+		Prior = 33,

+		ProcessKey = 229,

+		Q = 81,

+		R = 82,

+		RButton = 2,

+		RControlKey = 163,

+		Return = 13,

+		Right = 39,

+		RMenu = 165,

+		RShiftKey = 161,

+		RWin = 92,

+		S = 83,

+		Scroll = 145,

+		Select = 41,

+		SelectMedia = 181,

+		Separator = 108,

+		Shift = 65536,

+		ShiftKey = 16,

+		Snapshot = 44,

+		Space = 32,

+		Subtract = 109,

+		T = 84,

+		Tab = 9,

+		U = 85,

+		Up = 38,

+		V = 86,

+		VolumeDown = 174,

+		VolumeMute = 173,

+		VolumeUp = 175,

+		W = 87,

+		X = 88,

+		XButton1 = 5,

+		XButton2 = 6,

+		Y = 89,

+		Z = 90,

+		Zoom = 251

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/KeysConverter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/KeysConverter.cs
new file mode 100644
index 00000000000..fe5e2b05c7a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/KeysConverter.cs
@@ -0,0 +1,200 @@
+//

+// System.Windows.Forms.KeysConverter.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Collections;

+using System.Globalization;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+    public class KeysConverter : TypeConverter, IComparer {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public KeysConverter()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+		//public bool CanConvertFrom(Type type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type type)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public bool CanCompareTo(Type type)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual bool CanCompareTo(ITypeDescriptorContext context, Type type)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int Compare(object a, object b)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public object ConvertFrom(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//public object ConvertFromInvariantString(string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromInvariantString( ITypeDescriptorContext context, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromString(string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromString( ITypeDescriptorContext context, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertTo( object o, Type t)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override object ConvertTo( ITypeDescriptorContext context, CultureInfo culture, object o, Type t)

+		{

+			throw new NotImplementedException ();

+		}

+		//public string ConvertToInvariantString( object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToInvariantString( ITypeDescriptorContext context, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToString( object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToString( ITypeDescriptorContext context , object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object CreateInstance(IDictionary dict)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override object CreateInstance( ITypeDescriptorContext context, IDictionary dict)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		//public bool GetCreateInstanceSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public PropertyDescriptorCollection GetProperties(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public PropertyDescriptorCollection GetProperties( ITypeDescriptorContext context, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context,  object o, Attribute[] attributes)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public bool GetProertiesSupported()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public bool GetProertiesSupported(ITypeDescriptorContext context)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)

+		{

+			throw new NotImplementedException ();

+		}

+		//public ICollection GetStandardValues()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public bool GetStandardValuesExclusive()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public bool GetStandardValuesSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool GetStandardValuesSupported(ITypeDescriptorContext context)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public bool IsValid(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool IsValid(ITypeDescriptorContext context, object o)

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LabelEditEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LabelEditEventArgs.cs
new file mode 100644
index 00000000000..7d329d98104
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LabelEditEventArgs.cs
@@ -0,0 +1,144 @@
+//

+// System.Windows.Forms.LabelEditEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Partially completed by Dennis Hayes (dennish@raytek.com)

+//  Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	// </summary>

+

+	public class LabelEditEventArgs : EventArgs {

+

+		#region Fields

+

+		private int item;

+		private string label = "";			//Gian : Initialized string to empty...

+		private bool canceledit = false;	

+		

+		#endregion

+		//

+		//  --- Constructor

+		//

+		public LabelEditEventArgs (int item) 

+		{

+			this.item = item;

+		}

+

+		public LabelEditEventArgs (int item, string label) {

+			this.item = item;

+			this.label = label;

+		}

+

+

+		#region Public Properties

+		public bool CancelEdit 

+		{

+			get {

+				return canceledit;

+			}

+			set {

+				canceledit = value;

+			}

+		}

+		public int Item {

+			get {

+				return item;

+			}

+		}

+		public string Label {

+			get {

+				return label;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two LabelEditEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	CancelEdit, Item and Label Property

+		///	of the two LabelEditEventArgs.

+		/// </remarks>

+		public static bool operator == (LabelEditEventArgs LabelEditEventArgsA, LabelEditEventArgs LabelEditEventArgsB) 

+		{

+			return (LabelEditEventArgsA.CancelEdit == LabelEditEventArgsB.CancelEdit) &&

+				   (LabelEditEventArgsA.Item == LabelEditEventArgsB.Item) &&

+				   (LabelEditEventArgsA.Label == LabelEditEventArgsB.Label);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two LabelEditEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	CancelEdit, Item and Label Property

+		///	of the two LabelEditEventArgs.

+		/// </remarks>

+		public static bool operator != (LabelEditEventArgs LabelEditEventArgsA, LabelEditEventArgs LabelEditEventArgsB) 

+		{

+			return (LabelEditEventArgsA.CancelEdit != LabelEditEventArgsB.CancelEdit) ||

+				   (LabelEditEventArgsA.Item != LabelEditEventArgsB.Item) ||

+				   (LabelEditEventArgsA.Label != LabelEditEventArgsB.Label);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	LabelEditEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is LabelEditEventArgs))return false;

+			return (this == (LabelEditEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " LabelEditEventArgs";

+		}

+

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LabelEditEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LabelEditEventHandler.cs
new file mode 100644
index 00000000000..acf126b983b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LabelEditEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.LabelEditEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void LabelEditEventHandler (

+	object sender,

+	LabelEditEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LayoutEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LayoutEventArgs.cs
new file mode 100644
index 00000000000..42d225cae10
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LayoutEventArgs.cs
@@ -0,0 +1,130 @@
+//

+// System.Windows.Forms.LayoutEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Partially completed by Dennis Hayes (dennish@raytek.com)

+//  Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public sealed class LayoutEventArgs : EventArgs {

+

+		#region Fields

+

+		private Control affectedcontrol;

+		private string affectedproperty;

+		

+		#endregion

+		//

+		//  --- Constructor

+		//

+		public LayoutEventArgs (Control affectedControl, string affectedProperty)

+		{

+			affectedproperty = affectedProperty;

+			affectedcontrol = affectedControl;

+		}

+

+		#region Public Properties

+		

+		public Control AffectedControl {

+			get {

+				return affectedcontrol;

+			}

+		}

+		public string AffectedProperty {

+			get {

+				return affectedproperty;

+			}

+		}

+

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two LayoutEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	AffectedControl and AffectedProperty Property

+		///	of the two LayoutEventArgs.

+		/// </remarks>

+		public static bool operator == (LayoutEventArgs LayoutEventArgsA, LayoutEventArgs LayoutEventArgsB) 

+		{

+			return (LayoutEventArgsA.AffectedControl == LayoutEventArgsB.AffectedControl) && (LayoutEventArgsA.AffectedProperty == LayoutEventArgsB.AffectedProperty);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two LayoutEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	AffectedControl and AffectedProperty Property

+		///	of the two LayoutEventArgs.

+		/// </remarks>

+		public static bool operator != (LayoutEventArgs LayoutEventArgsA, LayoutEventArgs LayoutEventArgsB) 

+		{

+			return (LayoutEventArgsA.AffectedControl != LayoutEventArgsB.AffectedControl) || (LayoutEventArgsA.AffectedProperty != LayoutEventArgsB.AffectedProperty);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	LayoutEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is LayoutEventArgs))return false;

+			return (this == (LayoutEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " LayoutEventArgs";

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LayoutEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LayoutEventHandler.cs
new file mode 100644
index 00000000000..a9dab24f202
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LayoutEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.Windows.Forms.LayoutEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void LayoutEventHandler (

+	object sender,

+	LayoutEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LeftRightAlignment.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LeftRightAlignment.cs
new file mode 100644
index 00000000000..2cbb2f15fbe
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LeftRightAlignment.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.LeftRightAlignment.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum LeftRightAlignment {

+		Left = 0,

+		Right = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkArea.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkArea.cs
new file mode 100644
index 00000000000..dcd8583e2db
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkArea.cs
@@ -0,0 +1,146 @@
+//

+// System.Drawing.LinkArea.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+	[Serializable]

+	public struct LinkArea { 

+

+		private int start;

+		private int length;

+

+		// -----------------------

+		// Public Constructor

+		// -----------------------

+

+		/// <summary>

+		/// 

+		/// </summary>

+		///

+		/// <remarks>

+		///

+		/// </remarks>

+		

+		public LinkArea (int Start, int Length)

+		{

+			start = Start;

+			length = Length;

+		}

+

+		// -----------------------

+		// Public Shared Members

+		// -----------------------

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two LinkArea objects. The return value is

+		///	based on the equivalence of the Start and Length properties of the two objects.

+		/// </remarks>

+

+		public static bool operator == (LinkArea la_a, 

+			LinkArea la_b) {

+

+			return ((la_a.start == la_b.start) &&

+				(la_a.length == la_b.length));

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two LinkArea objects. The return value is

+		///	based on the equivalence of the Start and Length properties of the two objects.

+		/// </remarks>

+		public static bool operator != (LinkArea la_a, 

+			LinkArea la_b) {

+			return ((la_a.start != la_b.start) ||

+				(la_a.length != la_b.length));

+		}

+		

+		// -----------------------

+		// Public Instance Members

+		// -----------------------

+

+		public bool IsEmpty {

+			get{

+				// Start can be 0, so no way to know if it is empty.

+				// Docs seem to say Start must/should be set before

+				// length, os if length is valid, start must also be ok.

+				return length!=0;

+			}

+		}

+

+		public int Start {

+			get{

+				return start;

+			}

+			set{

+				start = value;

+			}

+		}

+

+		public int Length {

+			get{

+				return length;

+			}

+			set{

+				length = value;

+			}

+		}

+

+

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this LinkArea and another object.

+		/// </remarks>

+		

+		public override bool Equals (object obj)

+		{

+			if (!(obj is LinkArea))

+				return false;

+

+			return (this == (LinkArea) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		

+		public override int GetHashCode ()

+		{

+			return (int)( start ^ length);

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the LinkArea as a string.

+		/// </remarks>

+		

+		public override string ToString ()

+		{

+			return String.Format ("[{0},{1}]", start, length );

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkBehavior.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkBehavior.cs
new file mode 100644
index 00000000000..0c994a33cb0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkBehavior.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.LinkBehavior.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum LinkBehavior {

+		AlwaysUnderline = 1,

+		HoverUnderline = 2,

+		NeverUnderline = 3,

+		SystemDefault = 0,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkClickedEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkClickedEventArgs.cs
new file mode 100644
index 00000000000..fee8194c7be
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkClickedEventArgs.cs
@@ -0,0 +1,123 @@
+//

+// System.Windows.Forms.LinkClickedEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Partially completed by Dennis Hayes (dennish@raytek.com)

+//  Gianandrea Terzi (gianandrea.terzi@lario.com)

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.InteropServices;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	// </summary>

+

+	public class LinkClickedEventArgs : EventArgs {

+

+		#region Fields

+

+		private string linktext;

+		

+		#endregion

+		//

+		//  --- Constructor

+		//

+		public LinkClickedEventArgs(string linkText) 

+		{

+			linktext = linkText;

+		}

+

+		#region Public Properties

+

+		[ComVisible(true)]

+		public string LinkText 

+		{

+			get {

+				return linktext;

+			}

+		}

+

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two LinkClickedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	LinkText Property

+		///	of the two LinkClickedEventArgs.

+		/// </remarks>

+		public static bool operator == (LinkClickedEventArgs LinkClickedEventArgsA, LinkClickedEventArgs LinkClickedEventArgsB) 

+		{

+			return (LinkClickedEventArgsA.LinkText == LinkClickedEventArgsB.LinkText);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two LinkClickedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	LinkText Property

+		///	of the two LinkClickedEventArgs.

+		/// </remarks>

+		public static bool operator != (LinkClickedEventArgs LinkClickedEventArgsA, LinkClickedEventArgs LinkClickedEventArgsB) 

+		{

+			return (LinkClickedEventArgsA.LinkText != LinkClickedEventArgsB.LinkText);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	LinkClickedEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is LinkClickedEventArgs))return false;

+			return (this == (LinkClickedEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString() + " LinkClickedEventArgs";

+		}

+

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkClickedEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkClickedEventHandler.cs
new file mode 100644
index 00000000000..54d6eab5b2e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkClickedEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.LinkClickedEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms  {

+	//[Serializable]

+	public delegate void LinkClickedEventHandler (

+	object sender,

+	LinkClickedEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkLabel.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkLabel.cs
new file mode 100644
index 00000000000..186e37bab61
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkLabel.cs
@@ -0,0 +1,601 @@
+//

+// System.Windows.Forms.LinkLabel.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   stub ammended by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+using System.Collections;

+using System.Drawing;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class LinkLabel : Label, IButtonControl {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public LinkLabel()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public Color ActiveLinkcolor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Color DisabledLinkColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public LinkArea LinkArea {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public LinkBehavior LinkBehavior {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Color LinkColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public LinkLabel.LinkCollection Links {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool LinkVisited {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Color VisitedLinkColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		//public IAsyncResult BeginInvoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public IAsyncResult BeginInvoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		//public void Invalidate()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout(Control ctl, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1, float val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override void Select()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override void Select(bool directed, bool forward)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int b1, int b2, int b3, int b4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int b1, int b2, int b3, int b4, int b5, int b6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		// --- IButtonControl members:

+		DialogResult IButtonControl.DialogResult {

+			[MonoTODO] get { throw new NotImplementedException (); }

+			[MonoTODO] set { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		void IButtonControl.NotifyDefault(bool value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		void IButtonControl.PerformClick() 

+		{

+			throw new NotImplementedException ();

+		}

+		// --- end of IButtonControl members

+

+		

+		//  --- Public Events

+		//

+		[MonoTODO]

+		public event LinkLabelLinkClickedEventHandler LinkClicked;

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected override AccessibleObject CreateAccessibilityInstance()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void CreateHandle()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//inherited

+		//protected override virtual void Dispose(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+

+		[MonoTODO]

+		protected override void OnEnabledChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnFontChanged( EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnGotFocus( EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnKeyDown (KeyEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnLostFocus (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnMouseDown (MouseEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		// I think that this should be 'MouseEventArgs' 

+		// but the documentation says EventArgs.

+		[MonoTODO]

+		protected override void OnMouseLeave(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnMouseMove (MouseEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnMouseUp (MouseEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnPaint (PaintEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnPaintBackground(PaintEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnTextAlignChanged( EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnTextChanged( EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override bool ProcessDialogKey(Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+		//protected ContentAlignment RtlTranslateAlignment(ContentAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected HorizontalAlignment RtlTranslateAlignment( HorizontalAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected LeftRightAlignment RtlTranslateAlignment( LeftRightAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override void Select(bool val1, bool val2)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void SetBoundsCore(

+			int x, 

+			int y, 

+			int width, 

+			int height, 

+			BoundsSpecified specified) {

+

+			throw new NotImplementedException ();

+		}

+		//protected void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4, int val5, int val6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override void WndProc(ref Message msg)

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		

+		

+		/// System.Windows.Forms.LinkLabel.Link

+		/// <summary>Represents a link within a LinkLabel control.</summary>

+		///

+		/// stubbed out by Jaak Simm (jaaksimm@firm.ee)

+		[MonoTODO]

+		public class Link {

+			bool enabled;

+			int length;

+			object linkData;

+			int start;

+			bool visited;

+			

+			public bool Enabled {

+				get { return enabled; }

+				set { enabled=value; }

+			}

+			

+			public int Length {

+				get { return length; }

+				set { length=value; }

+			}

+			

+			public object LinkData {

+				get { return linkData; }

+				set { linkData=value; }

+			}

+			

+			public int Start {

+				get { return start; }

+				set { start=value; }

+			}

+			

+			public bool Visited {

+				get { return visited; }

+				set { visited=value; }

+			}

+		}

+		

+//

+// System.Windows.Forms.LinkLabel.LinkCollection.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//

+// (C) 2002 Ximian, Inc

+//

+

+			// <summary>

+			//	This is only a template.  Nothing is implemented yet.

+			//

+			// </summary>

+

+		public class LinkCollection :  IList, ICollection, IEnumerable {

+

+			//

+			//  --- Constructor

+			//

+			[MonoTODO]

+			public LinkCollection(LinkLabel owner)

+			{

+				throw new NotImplementedException ();

+			}

+

+			//

+			//  --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public virtual LinkLabel.Link this[ int index]  {

+				get {

+					throw new NotImplementedException ();

+				}

+				set {

+					throw new NotImplementedException ();

+				}

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public Link Add(int val1, int val2)

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public Link Add(int val1, int val2, object o)

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public virtual void Clear()

+			{

+				throw new NotImplementedException ();

+			}

+			// Inherited

+			//public override bool Contains(LinkLabel.Link link)

+			//{

+			//	throw new NotImplementedException ();

+			//}

+			[MonoTODO]

+			public override bool Equals(object o)

+			{

+				throw new NotImplementedException ();

+			}

+

+			//public static bool Equals(object o1, object o2)

+			//{

+			//	throw new NotImplementedException ();

+			//}

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator()

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(LinkLabel.Link link)

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Remove(LinkLabel.Link value)

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void RemoveAt(int index)

+			{

+				throw new NotImplementedException ();

+			}

+			

+			/// --- LinkLabel.IList properties ---

+			bool IList.IsFixedSize {

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			object IList.this[int index] {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+				[MonoTODO] set { throw new NotImplementedException (); }

+			}

+	

+			object ICollection.SyncRoot {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+	

+			bool ICollection.IsSynchronized {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			void ICollection.CopyTo(Array dest,int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			/// --- LinkLabel.IList methods ---

+			[MonoTODO]

+			int IList.Add(object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			bool IList.Contains(object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.IndexOf(object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Insert(int index,object value) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Remove(object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		}//End of subclass

+	}// End of Class

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkLabelLinkClickedEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkLabelLinkClickedEventArgs.cs
new file mode 100644
index 00000000000..7bbd6baa75f
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkLabelLinkClickedEventArgs.cs
@@ -0,0 +1,124 @@
+//

+// System.Windows.Forms.LinkLabelLinkClickedEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Partially completed by Dennis Hayes (dennish@raytek.com)

+//	Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.InteropServices;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	// Just a template...

+	// </summary>

+

+    public class LinkLabelLinkClickedEventArgs : EventArgs {

+

+		#region Fields

+

+		private LinkLabel.Link link;

+		

+		#endregion

+		//

+		//  --- Constructor

+		//

+		public LinkLabelLinkClickedEventArgs(LinkLabel.Link link)

+		{

+			this.link = link;

+		}

+

+		#region Public Properties

+

+		[ComVisible(true)]

+		public LinkLabel.Link Link{

+			get {

+				return link;

+			}

+		}

+

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two LinkLabelLinkClickedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Link Property

+		///	of the two LinkLabelLinkClickedEventArgs.

+		/// </remarks>

+		public static bool operator == (LinkLabelLinkClickedEventArgs LinkLabelLinkClickedEventArgsA, LinkLabelLinkClickedEventArgs LinkLabelLinkClickedEventArgsB) 

+		{

+			return (LinkLabelLinkClickedEventArgsA.Link == LinkLabelLinkClickedEventArgsB.Link);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two LinkLabelLinkClickedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Link Property

+		///	of the two LinkLabelLinkClickedEventArgs.

+		/// </remarks>

+		public static bool operator != (LinkLabelLinkClickedEventArgs LinkLabelLinkClickedEventArgsA, LinkLabelLinkClickedEventArgs LinkLabelLinkClickedEventArgsB) 

+		{

+			return (LinkLabelLinkClickedEventArgsA.Link != LinkLabelLinkClickedEventArgsB.Link);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	LinkLabelLinkClickedEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is LinkLabelLinkClickedEventArgs))return false;

+			return (this == (LinkLabelLinkClickedEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkLabelLinkClickedEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkLabelLinkClickedEventHandler.cs
new file mode 100644
index 00000000000..09ce8ddb225
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkLabelLinkClickedEventHandler.cs
@@ -0,0 +1,16 @@
+//

+// System.LinkLabelLinkClickEventHandler.cs

+//

+// Author:

+//   Dennis hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+	//[Serializable]

+	public delegate void LinkLabelLinkClickedEventHandler (

+	object sender,

+	LinkLabelLinkClickedEventArgs e

+	);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkState.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkState.cs
new file mode 100644
index 00000000000..6d5c93de3ae
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/LinkState.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.LinkState.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum LinkState {

+		Active = 2,

+		Hover = 1,

+		Normal = 0,

+		Visited = 4

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListBindingConverter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListBindingConverter.cs
new file mode 100644
index 00000000000..f278b973c51
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListBindingConverter.cs
@@ -0,0 +1,220 @@
+//

+// System.Windows.Forms.ListBindingConverter.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Globalization;

+using System.ComponentModel;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+    public class ListBindingConverter : TypeConverter {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ListBindingConverter()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+		//

+		

+		//public bool CanConvertTo(Type t) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool CanConvertTo(ITypeDescriptorContext context, Type t) 

+		{

+			throw new NotImplementedException ();

+		}

+		//public object ConvertTo(object o, Type t) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object o, Type t) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override object CreateInstance(ITypeDescriptorContext context, IDictionary dict) 

+		{

+			throw new NotImplementedException ();

+		}

+		//inheritedpublic bool GetCreateInstanceSupported() 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool GetCreateInstanceSupported(ITypeDescriptorContext context) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+

+		

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//Inherited/not needed

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		

+		

+		////Inherited/not needed

+		//public bool CanConvertFrom(Type t)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool (ITypeDescriptorContext context, Type t)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object ConvertFrom(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object ConvertFromInvariantString(string s)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object ConvertFromInvariantString(ITypeDescriptorContext context, string s)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object ConvertFromString(string s)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object ConvertFromString(ITypeDescriptorContext context, string s)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object ConvertFromString(ITypeDescriptorContext context, CultureInfo culture, string s)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public string ConvertToInvariantString(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public string ConvertToInvariantString(ITypeDescriptorContext context, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public string ConvertToString(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public string ConvertToString(ITypeDescriptorContext context, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object CreateInstance(IDictionary dict)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		////Inherited/not needed

+		//public PropertyDescriptorCollection GetProperties(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool GetPropertiesObject()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool GetPropertiesObject(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public ICollection GetStandardValues()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool GetStandardValuesExclusive()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool GetStandardValuesExclusive(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool GetStandardValuesSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool GetStandardValuesSupported(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool IsValid(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool IsValid(ITypeDescriptorContext context, object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListBox.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListBox.cs
new file mode 100644
index 00000000000..e0b72af4d19
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListBox.cs
@@ -0,0 +1,896 @@
+//

+// System.Windows.Forms.ListBox.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Collections;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class ListBox : ListControl {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ListBox() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//	 --- Public Fields

+		//

+		public const int DefaultItemHeight = 500;//just guessing FIXME // = ??;

+		public const int NoMatches = 0 ;//just guessing FIXME // = ??;

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public override Color BackColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override RightToLeft RightToLeft {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ScrollAlwaysVisible {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override int SelectedIndex {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ListBox.SelectedIndexCollection SelectedIndices {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public object SelectedItem {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ListBox.SelectedObjectCollection SelectedItems {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual SelectionMode SelectionMode {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Sorted {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int TopIndex {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool UseTabStops {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public void BeginUpdate() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void ClearSelected() {

+			throw new NotImplementedException ();

+		}

+		//inherited

+		//public override void Dispose() {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public void EndUpdate() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int FindString(string str) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int FindString(string str, int val) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int FindStringExact(string str) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int FindStringExact(string str, int val) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int GetItemHeight(int index) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public Rectangle GetItemRectangle(int index) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public bool GetSelected(int index) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int IndexFromPoint(Point pt) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int IndexFromPoint(int val1, int val2) {

+			throw new NotImplementedException ();

+		}

+		//inherited

+		//public void Invalidate() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(bool val) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg, bool val) {

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del) {

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del, object[] objs) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout(Control ctl, string str ) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout(bool val) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1, float val2) {

+		//	throw new NotImplementedException ();

+		//}

+		//public override void Select(bool val1, bool val2) {

+		//	throw new NotImplementedException ();

+		//}

+		//public override void SetBounds(int val1, int val2, int val3, int val4) {

+		//	throw new NotImplementedException ();

+		//}

+		//public override void SetBounds(int val1, int val2, int val3, int val4, BoundsSpecified bounds) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public void SetSelected(int index, bool val) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		[MonoTODO]

+		public event DrawItemEventHandler DrawItem {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public event MeasureItemEventHandler MeasureItem {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected virtual ObjectCollection CreateItemCollection() {

+			throw new NotImplementedException ();

+		}

+

+		//inherited

+		//protected override void Dispose(bool val1) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override void OnChangeUICues(UICuesEventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnDataSourceChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnDisplayMemberChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnDrawItem(DrawItemEventArgs e) {

+			throw new NotImplementedException ();

+		}

+

+

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleDestroyed(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMeasureItem(MeasureItemEventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnParentChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnResize(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnSelectedIndexChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+

+		protected override void RefreshItem(int index) {

+			throw new NotImplementedException ();

+		}

+		//Inherited

+		//protected ContentAlignment RtlTranslateAlignment(ContentAlignment align) {

+		//	throw new NotImplementedException ();

+		//}

+		//protected HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment align) {

+		//	throw new NotImplementedException ();

+		//}

+		//protected LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment align) {

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override void SetBoundsCore( int x, int y,  int width, int height,  BoundsSpecified specified) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected void Sort() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message mgs) {

+			throw new NotImplementedException ();

+		}

+

+		//

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		// This is a subclass

+		// </summary>

+

+		public class SelectedObjectCollection :  IList, ICollection, IEnumerable {

+

+			//

+			//  --- Constructor

+			//

+			[MonoTODO]

+			public SelectedObjectCollection(ListBox owner) {

+				throw new NotImplementedException ();

+			}

+

+			//

+			//  --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public object this[int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+				set {

+					throw new NotImplementedException ();

+				}

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public bool Contains(object selectedObject) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void CopyTo(Array dest, int index) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override bool Equals(object o) {

+				throw new NotImplementedException ();

+			}

+			//inherited

+			//public static bool Equals(object o1, object o2) {

+			//	throw new NotImplementedException ();

+			//}

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(object selectedObject) {

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}//End of subclass

+

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+

+		public class ObjectCollection : IList, ICollection {

+

+			//

+			//  --- Constructor

+			//

+			[MonoTODO]

+			public ObjectCollection(ListBox box) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public ObjectCollection(ListBox box, object[] objs) {

+				throw new NotImplementedException ();

+			}

+

+			//

+			//  --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public virtual object this[int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+				set {

+					throw new NotImplementedException ();

+				}

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public int Add(object item) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void AddRange(object[] items) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void AddRange(ListBox.ObjectCollection collection) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Clear() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public bool Contains(object value) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void CopyTo(object[] dest, int arrayIndex) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override bool Equals(object o) {

+				throw new NotImplementedException ();

+			}

+			//inherited

+			//[Serializable]

+			//[ClassInterface(ClassInterfaceType.AutoDual)]

+			//public static bool Equals(object objA, object objB) {

+			//	throw new NotImplementedException ();

+			//}

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(object val) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Insert(int index, object item) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Remove(object val) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void RemoveAt(int index) {

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}//end of SubClass

+

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+

+		public class SelectedIndexCollection :  IList, ICollection, IEnumerable {

+

+			//

+			//  --- Constructor

+			//

+			[MonoTODO]

+			public SelectedIndexCollection(ListBox owner) {

+				throw new NotImplementedException ();

+			}

+

+			//

+			//  --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public int this[int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public bool Contains(int selectedIndex) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void CopyTo(Array dest, int index) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override bool Equals(object o) {

+				throw new NotImplementedException ();

+			}

+			//inherited

+			//public static bool Equals(object objA, object objB) {

+			//	throw new NotImplementedException ();

+			//}

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() {

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+

+		}//End of subclass

+

+		

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListControl.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListControl.cs
new file mode 100644
index 00000000000..0f07d75d456
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListControl.cs
@@ -0,0 +1,278 @@
+//

+// System.Windows.Forms.ListControl.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+using System;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public abstract class ListControl : Control {

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public object DataSource {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string DisplayMember {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public abstract int SelectedIndex {get;set;}

+//			get {

+//				//throw new NotImplementedException ();

+//			}

+//			set {

+//				//throw new NotImplementedException ();

+//			}

+//		}

+		[MonoTODO]

+		public object SelectedValue {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string ValueMember {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		//inherited

+		//public IAsyncResult BeginInvoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public IAsyncResult BeginInvoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		[MonoTODO]

+		public string GetItemText(object Item)

+		{

+			throw new NotImplementedException ();

+		}

+		//inherited

+		//public void Invalidate()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout(Control ctl, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1, float val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected override void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4, BoundsSpecified bounds)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Public Events

+		//

+		[MonoTODO]

+		public event EventHandler DataSourceChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public event EventHandler DisplayMemberChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		// --- Protected Constructor

+		//

+		[MonoTODO]

+		protected ListControl()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected CurrencyManager DataManager {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+

+		//

+		//  --- Protected Methods

+		//

+		//inherited

+		//protected override void Dispose(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override bool IsInputKey(Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnDataSourceChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnDisplayMemberChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnSelectedIndexChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}		

+		

+		[MonoTODO]

+		protected override void OnBindingContextChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected abstract void RefreshItem(int index);

+		//inherited

+		//protected ContentAlignment RtlTranslateAlignment(ContentAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void Select()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4, int val5, int val6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListView.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListView.cs
new file mode 100644
index 00000000000..1a0f06b6a7f
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListView.cs
@@ -0,0 +1,1539 @@
+//

+// System.Windows.Forms.ListView.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+using System.Collections;

+using System;

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+	public class ListView : Control {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ListView() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		// Is this part of the spec? I do not think so.

+		//[MonoTODO]

+		//public ImageActivation Activation {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public ListViewAlignment Alignment {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AllowColumnReorder {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AutoArrange {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color BackColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public BorderStyle BorderStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool CheckBoxes {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public CheckedIndexCollection CheckedIndices {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public  CheckedListViewItemCollection CheckedItems {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ColumnHeaderCollection Columns {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color ForeColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool FullRowSelect {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool GridLines {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ColumnHeaderStyle HeaderStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool HideSelection {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool HoverSelection {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ListView.ListViewItemCollection Items {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool LabelEdit {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool LabelWrap {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ImageList LargeImageList {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool MultiSelect {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Scrollable {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ListView.SelectedIndexCollection SelectedIndices {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ListView.SelectedListViewItemCollection SelectedItems {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ImageList SmallImageList {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public SortOrder Sorting {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ImageList StateImageList {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public View View {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public void ArrangeIcons() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void ArrangeIcons(ListViewAlignment align) {

+			throw new NotImplementedException ();

+		}

+		//public IAsyncResult BeginInvoke(Delegate del) {

+		//	throw new NotImplementedException ();

+		//}

+		//public IAsyncResult BeginInvoke(Delegate del, object[] objs) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public void BeginUpdate() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Clear() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void EndUpdate() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void EnsureVisible(int index) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ListViewItem GetItemAt(int x, int y) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public Rectangle RetItemRect(int val) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public Rectangle RetItemRect(int val, ItemBoundsPortion portion) {

+			throw new NotImplementedException ();

+		}

+		//public void Invalidate() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(bool b) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect, bool b) {

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del) {

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del, object[] objs) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout(Control ctl, string str) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout(bool b) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1, float val2) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4, BoundsSpecified bounds) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override string ToString() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		[MonoTODO]

+		public event LabelEditEventHandler AfterLabelEdit;

+		public event LabelEditEventHandler BeforeLabelEdit;

+		public event ColumnClickEventHandler ColumnClick;

+		public event EventHandler ItemActivate;

+		public event ItemCheckEventHandler ItemCheck;

+		public event ItemDragEventHandler ItemDrag;

+		public event EventHandler SelectedIndexChanged;

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected override void CreateHandle() {

+			throw new NotImplementedException ();

+		}

+		//protected override void Dispose(bool disposing) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override bool IsInputKey(Keys keyData) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void  OnAfterLabelEdit(LabelEditEventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void  OnBeforeLabelEdit(LabelEditEventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void  OnColumnClick(ColumnClickEventArgs e) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnEnabledChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleDestroyed(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void  OnItemActivate(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void  OnItemCheck(ItemCheckEventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void  OnItemDrag(ItemDragEventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void  OnSelectedItemChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnSystemColorsChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void Select(bool val1, bool val2) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected void UpdateExtendedStyles() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m) {

+			throw new NotImplementedException ();

+		}

+		//start subclasses

+		//

+		// System.Windows.Forms.ListView.SelectedListViewItemCollection.cs

+		//

+		// Author:

+		//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+		//

+		// (C) 2002 Ximian, Inc

+		//

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+

+		public class SelectedListViewItemCollection :  IList, ICollection, IEnumerable {

+

+			//

+			//  --- Constructor

+			//

+			[MonoTODO]

+			public SelectedListViewItemCollection(ListView owner) {

+				throw new NotImplementedException ();

+			}

+

+			//

+			//  --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public ListViewItem this[int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public void Clear() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public bool Contains(ListViewItem item) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void CopyTo(Array dest, int index) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override bool Equals(object o) {

+				throw new NotImplementedException ();

+			}

+

+			//public static bool Equals(object o1, object o2) {

+			//	throw new NotImplementedException ();

+			//}

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(ListViewItem item) {

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}

+		//

+		// System.Windows.Forms.ListView.CheckedListViewItemCollection.cs

+		//

+		// Author:

+		//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+		//

+		// (C) 2002 Ximian, Inc

+		//

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+

+		public class CheckedListViewItemCollection : IList, ICollection, IEnumerable {

+

+			//

+			//  --- Constructor

+			//

+			[MonoTODO]

+			public CheckedListViewItemCollection(ListView owner) {

+				throw new NotImplementedException ();

+			}

+

+			//

+			//  --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public ListViewItem this[int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public bool Contains(ListViewItem item) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public object CopyTo(Array dest, int index) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override bool Equals(object o) {

+				throw new NotImplementedException ();

+			}

+			//				[MonoTODO]

+			//				public static bool Equals(object o1, object o2) {

+			//					throw new NotImplementedException ();

+			//				}

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(ListViewItem item) {

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}

+		//

+		// System.Windows.Forms.ListView.ColumnHeaderCollection.cs

+		//

+		// Author:

+		//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+		//

+		// (C) 2002 Ximian, Inc

+		//

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+

+		public class ColumnHeaderCollection :  IList, ICollection, IEnumerable {

+

+			//

+			//  --- Constructor

+			//

+			[MonoTODO]

+			public ColumnHeaderCollection(ListView owner) {

+				throw new NotImplementedException ();

+			}

+

+			//

+			//  --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public virtual ColumnHeader this[int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public virtual int Add(ColumnHeader value) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public virtual ColumnHeader Add(string s, int b, HorizontalAlignment align) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public virtual void AddRange(ColumnHeader[] values) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Clear() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public bool Contains(ColumnHeader value) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override bool Equals(object o) {

+				throw new NotImplementedException ();

+			}

+			//				[MonoTODO]

+			//				public static bool Equals(object o1, object o2) {

+			//					throw new NotImplementedException ();

+			//				}

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(ColumnHeader value) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Insert(int b, ColumnHeader value) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Insert(int val1, string str, int val2, HorizontalAlignment align) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public virtual void Remove(ColumnHeader value) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public virtual void RemoveAt(int index) {

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}

+		//

+		// System.Windows.Forms.ListView.ListViewItemCollection.cs

+		//

+		// Author:

+		//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+		//

+		// (C) 2002 Ximian, Inc

+		//

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+

+		public class ListViewItemCollection :  IList, ICollection, IEnumerable {

+

+			//

+			//  --- Constructor

+			//

+			[MonoTODO]

+			public ListViewItemCollection (ListView owner) {

+				throw new NotImplementedException ();

+			}

+

+			//

+			//  --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly  {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public virtual ListViewItem this [int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+				set {

+					throw new NotImplementedException ();

+				}

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public virtual ListViewItem Add (ListViewItem item) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public virtual ListViewItem Add (string str) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public virtual ListViewItem Add (string str, int val) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void AddRange(ListViewItem[] values) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Clear() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public bool Contains(ListViewItem item) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void CopyTo(Array dest, int index) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override bool Equals(object o) {

+				throw new NotImplementedException ();

+			}

+

+			//public static bool Equals(object o1, object o2) {

+			//	throw new NotImplementedException ();

+			//}

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(ListViewItem item) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public virtual void Remove(ListViewItem item) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public virtual void RemoveAt(int index) {

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}

+		//

+		// System.Windows.Forms.ListView.SelectedIndexCollection.cs

+		//

+		// Author:

+		//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+		//

+		// (C) 2002 Ximian, Inc

+		//

+

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+

+		public class SelectedIndexCollection :  IList, ICollection, IEnumerable {

+

+			//

+			//  --- Constructor

+			//

+			[MonoTODO]

+			public SelectedIndexCollection(ListView owner) {

+				throw new NotImplementedException ();

+			}

+

+			//

+			//  --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public int this [int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public bool Contains(ListView item) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void CopyTo(Array dest, int index) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override bool Equals(object o) {

+				throw new NotImplementedException ();

+			}

+			//			[MonoTODO]

+			//			public static bool Equals(object o1, object o2) {

+			//				throw new NotImplementedException ();

+			//			}

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(int index) {

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}

+		//

+		// System.Windows.Forms.ListView.CheckedIndexCollection.cs

+		//

+		// Author:

+		//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+		//

+		// (C) 2002 Ximian, Inc

+		//

+

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+

+		public class CheckedIndexCollection :  IList, ICollection, IEnumerable {

+

+			//

+			//  --- Constructor

+			//

+			[MonoTODO]

+			public CheckedIndexCollection(ListView owner) {

+				throw new NotImplementedException ();

+			}

+

+			//

+			//  --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+				set {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public int this[int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public bool Contains(int checkedIndex) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public override bool Equals(object o) {

+				throw new NotImplementedException ();

+			}

+			//			[MonoTODO]

+			//			public static bool Equals(object o1, object o2) {

+			//				throw new NotImplementedException ();

+			//			}

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(int checkedIndex) {

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}

+		//***********************************

+		// Sub Class

+		//***********************************

+//		[MonoTODO]

+//			// FIXME this sub class has many members that have not been stubbed out.

+//			public class CheckedListViewItemCollection  {

+//			CheckedListViewItemCollection(ListView owner){

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//			// FIXME this sub class has many members that have not been stubbed out.

+//			public class ColumnHeaderCollection  {

+//			ColumnHeaderCollection(ListView owner){

+//				throw new NotImplementedException ();

+//			}

+//

+//		}

+	}	

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListViewAlignment.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListViewAlignment.cs
new file mode 100644
index 00000000000..13a609ce8be
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListViewAlignment.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.ListViewAlignment.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ListViewAlignment {

+		Default = 0,

+		Left = 1,

+		SnapToGrid = 5,

+		Top = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListViewItem.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListViewItem.cs
new file mode 100644
index 00000000000..651cb175607
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListViewItem.cs
@@ -0,0 +1,554 @@
+//

+// System.Windows.Forms.ListViewItem.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Runtime.Serialization;

+using System.Drawing;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class ListViewItem :  ICloneable, ISerializable {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ListViewItem()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ListViewItem(string str)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ListViewItem(string[] strings)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ListViewItem(ListViewItem.ListViewSubItem[] subItems)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ListViewItem(string str, int val)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ListViewItem(string[] strings, int val)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ListViewItem(string[] strings, int val,  Color color1, Color color2, Font font)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public Color BackColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Rectangle Bounds {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Checked {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Focused {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Font Font {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Color Forecolor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int ImageIndex {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ImageList ImageList {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int Index {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ListView ListView {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Selected {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int StateImageIndex  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ListViewSubItemCollection SubItems {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public object Tag {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool UseItemStyleForSubItems {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public void BeginEdit()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public object Clone()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual void EnsureVisible()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		[MonoTODO]

+		public Rectangle GetBounds(ItemBoundsPortion portion)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Remove()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected virtual void Deserialize(SerializationInfo info, StreamingContext context)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void Serialize(SerializationInfo info, StreamingContext context)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// ISerializable.method:

+		[MonoTODO]

+		void ISerializable.GetObjectData(SerializationInfo info,StreamingContext context) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		// System.Windows.Forms.ListViewItem.ListViewSubItemCollection.cs

+		//

+		// Author:

+		//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+		//   stub ammended by Jaak Simm (jaaksimm@firm.ee)

+		//

+		// (C) 2002 Ximian, Inc

+		//

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+		[MonoTODO]

+		[Serializable]

+		public class ListViewSubItemCollection :  IList, ICollection, IEnumerable {

+			/// Constructors

+			[MonoTODO]

+			public ListViewSubItemCollection(ListViewItem owner) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			

+			/// Properties

+			[MonoTODO]

+			public int Count {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public bool IsReadOnly {

+				get { throw new NotImplementedException (); }

+			}

+		

+			[MonoTODO]

+			public ListViewSubItem this[int index] {

+				get { throw new NotImplementedException (); }

+				set { throw new NotImplementedException (); }

+			}

+			

+			

+			/// --- ICollection properties ---

+			bool IList.IsFixedSize {

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			object IList.this[int index] {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+				[MonoTODO] set { throw new NotImplementedException (); }

+			}

+	

+			object ICollection.SyncRoot {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+	

+			bool ICollection.IsSynchronized {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			

+			/// Methods

+			[MonoTODO]

+			public ListViewSubItem Add(ListViewItem.ListViewSubItem item) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public ListViewSubItem Add(string text) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public ListViewSubItem Add(string text,Color foreColor,Color backColor,Font font) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void AddRange(ListViewItem.ListViewSubItem[] items) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void AddRange(string[] items) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void AddRange(

+				string[] items,

+				Color foreColor,

+				Color backColor,

+				Font font) {

+

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void Clear() 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public bool Contains(ListViewItem.ListViewSubItem subItem) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public IEnumerator GetEnumerator() 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			void ICollection.CopyTo(Array dest,int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			int IList.Add(object item) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			bool IList.Contains(object subItem) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			int IList.IndexOf(object subItem) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			void IList.Insert(int index,object item) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			void IList.Remove(object item) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public int IndexOf(ListViewItem.ListViewSubItem subItem) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void Insert(int index,ListViewItem.ListViewSubItem item) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void Remove(ListViewItem.ListViewSubItem item) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void RemoveAt(int index) 

+			{

+				throw new NotImplementedException ();

+			}

+		}

+	//

+	// System.Windows.Forms.ListViewItem.ListViewSubItem.cs

+	//

+	// Author:

+	//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+	//

+	// (C) 2002 Ximian, Inc

+	//

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class ListViewSubItem {

+	

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ListViewSubItem()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ListViewSubItem(ListViewItem item, string str)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ListViewSubItem(ListViewItem item, string str, Color color1, Color color2, Font font)

+		{

+			throw new NotImplementedException ();

+		}

+	

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public Color BackColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Font Font {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Color ForeColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//inherited

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		[MonoTODO]

+		public void ResetStyle()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+		}

+	}

+}

+

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ListViewItemConverter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListViewItemConverter.cs
new file mode 100644
index 00000000000..20ebab4227c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ListViewItemConverter.cs
@@ -0,0 +1,188 @@
+//

+// System.Windows.Forms.ListViewItemConverter.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Globalization;

+using System.ComponentModel;

+using System.Collections;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class ListViewItemConverter : ExpandableObjectConverter {

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ListViewItemConverter()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		[MonoTODO]

+		public override bool Equals(object o) {

+			throw new NotImplementedException ();

+		}

+		//inherited

+		//public bool CanConvertFrom(Type type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override bool CanConvertFrom(ITypeDescriptorContext context, Type type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public bool CanConvertTo(Type type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override bool CanConvertTo(ITypeDescriptorContext context, Type type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFrom(object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromInvariantString(string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromInvariantString(ITypeDescriptorContext context, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromString(string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromString(ITypeDescriptorContext context, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromString(ITypeDescriptorContext context, CultureInfo culture, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertTo(object obj, Type type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object obj, Type type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToInvariantString(object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToInvariantString(ITypeDescriptorContext context, object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToString(object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToString(ITypeDescriptorContext context, object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToString(ITypeDescriptorContext context, CultureInfo culture, object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object CreateInstance(IDictionary dict)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override object CreateInstance(ITypeDescriptorContext context, IDictionary dict)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override bool GetCreateInstanceSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public PropertyDescriptorCollection GetProperties(object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context,object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual PropertyDescriptorCollection GetProperties(ITypeDescriptorContext context, object obj, Attribute[] attributes)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override bool GetPropertiesSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override bool GetPropertiesSupported(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public ICollection GetStandardValues()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override StandardValuesCollection GetStandardValues(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public bool GetStandardValuesExclusive()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override bool GetStandardValuesExclusive(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public bool GetStandardValuesSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override bool GetStandardValuesSupported(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public bool IsValid(object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override bool IsValid(ITypeDescriptorContext context, object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MainMenu.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MainMenu.cs
new file mode 100644
index 00000000000..b8e117abbc8
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MainMenu.cs
@@ -0,0 +1,243 @@
+//

+// System.Windows.Forms.MainMenu.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+

+using System;

+using System.Reflection;

+using System.Globalization;

+//using System.Windows.Forms.AccessibleObject.IAccessible;

+using System.Drawing;

+using System.Runtime.Remoting;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// ToDo note:

+	///  - Nothing is implemented

+	/// </summary>

+

+	public class MainMenu : Menu  {

+

+		//

+		//  --- Constructors

+		//

+

+		[MonoTODO]

+		public MainMenu() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public MainMenu(MenuItem[] items) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+		

+		[MonoTODO]

+		public virtual MainMenu CloneMenu()

+		{

+			throw new NotImplementedException();

+		}

+//		[MonoTODO]

+//		//FIXME

+//		protected void MainMenu(Menu m)

+//		{

+//			throw new NotImplementedException();

+//		}

+

+		[MonoTODO]

+		public override ObjRef CreateObjRef(Type requestedType)

+		{

+			throw new NotImplementedException();

+		}

+		[MonoTODO]

+		public override bool Equals(object o) {

+			throw new NotImplementedException();

+		}

+

+

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}		

+		//inherited

+		//public override void Dispose() 

+		//{

+		//	throw new NotImplementedException();

+		//}

+		//

+		//protected override void Dispose(bool disposing) 

+		//{

+		//	throw new NotImplementedException();

+		//}

+		//public override bool Equals(object o, object o)

+		//{

+		//	throw new NotImplementedException();

+		//}

+		//public ContextMenu GetContextMenu()

+		//{

+		//	throw new NotImplementedException();

+		//}

+		//public object GetLifetimeService()

+		//{

+		//	throw new NotImplementedException();

+		//}

+		//public MainMenu GetMainMenu() {

+		//	throw new NotImplementedException();

+		//}

+		//

+		//public override Type GetType() {

+		//	throw new NotImplementedException();

+		//}

+		//

+		//public virtual object InitializeLifetimeService() {

+		//	throw new NotImplementedException();

+		//}

+		//

+		//public virtual void MergeMenu(Menu menuSrc) {

+		//	throw new NotImplementedException();

+		//}

+

+		[MonoTODO]

+		public Form GetForm()

+		{

+			throw new NotImplementedException();

+		}

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException();

+		}

+

+		//

+		// -- Protected Methods

+		//

+

+		//protected void CloneMenu(Menu menuSrc) 

+		//{

+		//	throw new NotImplementedException();

+		//}

+		//protected override void Dispose(bool disposing) 

+		//{

+		//	throw new NotImplementedException();

+		//}

+		//public void Dispose() 

+		//{

+		//	throw new NotImplementedException();

+		//}

+		//protected object MemberwiseClone() 

+		//{

+		//	throw new NotImplementedException();

+		//}

+

+		[MonoTODO]

+		protected virtual object GetService() 

+		{

+			throw new NotImplementedException();

+		}

+

+		//

+		// -- DeConstructor

+		//

+

+		[MonoTODO]

+		~MainMenu() 

+		{

+			throw new NotImplementedException();

+		}

+

+		//

+		// -- Public Events

+		//

+		//inherited

+		//public event EventHandler Disposed;

+

+		//

+		// -- Public Properties

+		//

+		//inherited

+		//public IContainer Container  {

+		//	get 

+		//	{

+		//		throw new NotImplementedException(); 

+		//	}

+		//}

+		//public IntPtr Handle  {

+		//	get

+		//	{

+		//		throw new NotImplementedException();

+		//	}

+		//}

+		//public MenuItem MdiListItem  {

+		//	get 

+		//	{

+		//		throw new NotImplementedException();

+		//	}

+		//}

+		//public Menu.MenuItemCollection MenuItems  {

+		//	get

+		//	{

+		//		throw new NotImplementedException();

+		//	}

+		//}

+		//public override ISite Site  {

+		//	get 

+		//	{

+		//		throw new NotImplementedException();

+		//	}

+		//	set

+		//	{

+		//		throw new NotImplementedException();

+		//	}

+		//}

+

+		[MonoTODO]

+		public override bool IsParent  {

+			get 

+			{

+				throw new NotImplementedException();

+			}

+		}

+		[MonoTODO]

+		public virtual RightToLeft RightToLeft  {

+			get 

+			{

+				throw new NotImplementedException();

+			}

+			set

+			{

+				throw new NotImplementedException();

+			}

+		}

+

+		//

+		// -- protected Properties

+		//

+		//inherited

+		//protected bool DesignMode  {

+		//	get 

+		//	{

+		//		throw new NotImplementedException();

+		//	}

+		//}

+		//protected EventHandler Events  {

+		//	get 

+		//	{

+		//		throw new NotImplementedException();

+		//	}

+		//}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MdiLayout.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MdiLayout.cs
new file mode 100644
index 00000000000..628de363de7
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MdiLayout.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.MdiLayout.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum MdiLayout {

+		ArrangeIcons = 3,

+		Cascade = 0,

+		TileHorizontal = 1,

+		TileVertical = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MeasureItemEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MeasureItemEventArgs.cs
new file mode 100644
index 00000000000..1f14b6623f4
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MeasureItemEventArgs.cs
@@ -0,0 +1,180 @@
+//

+// System.Windows.Forms.MeasureItemEventArgs.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Partially completed by Dennis Hayes (dennish@raytek.com)

+//	Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System;

+using System.Reflection;

+using System.Globalization;

+//using System.Windows.Forms.AccessibleObject.IAccessible;

+using System.Drawing;

+

+namespace System.Windows.Forms  {

+

+

+	/// <summary>

+	/// </summary>

+

+	public class MeasureItemEventArgs : EventArgs {

+

+		#region Fields

+

+		private Graphics graphics;

+		private int index;

+		private int itemheight = -1;

+		private int itemwidth = -1;

+

+		#endregion

+

+		//

+		//  --- Constructors

+		//

+		public MeasureItemEventArgs(Graphics graphics, int index)

+		{

+			this.index = index;

+			this.graphics = graphics;

+		}

+

+		public MeasureItemEventArgs(Graphics graphics, int index, int itemheight) 

+		{

+			this.index = index;

+			this.graphics = graphics;

+			itemheight = ItemHeight;

+		}

+

+		#region Public Properties

+

+		public Graphics Graphics  

+		{

+			get 

+			{ 

+				return graphics;

+			}

+		}

+

+		public int Index  

+		{

+			get 

+			{

+				return index;

+			}

+		}

+

+		public int ItemHeight  

+		{

+			get 

+			{

+				return itemheight;

+			}

+			set 

+			{

+				itemheight = value;

+			}

+		}

+

+		public int ItemWidth  

+		{

+			get 

+			{

+				return itemwidth;

+			}

+			set 

+			{

+				itemwidth = value;

+			}

+		}

+

+		#endregion

+		

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two MeasureItemEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	graphics, index, itemheight and itemwidth Property

+		///	of the two MeasureItemEventArgs.

+		/// </remarks>

+		public static bool operator == (MeasureItemEventArgs MeasureItemEventArgsA, MeasureItemEventArgs MeasureItemEventArgsB) 

+		{

+			return (MeasureItemEventArgsA.Graphics == MeasureItemEventArgsB.Graphics) && 

+				   (MeasureItemEventArgsA.Index == MeasureItemEventArgsB.Index) &&

+				   (MeasureItemEventArgsA.ItemHeight == MeasureItemEventArgsB.ItemHeight) &&

+				   (MeasureItemEventArgsA.ItemWidth == MeasureItemEventArgsB.ItemWidth);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two MeasureItemEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	graphics, index, itemheight and itemwidth Property

+		///	of the two MeasureItemEventArgs.

+		/// </remarks>

+		public static bool operator != (MeasureItemEventArgs MeasureItemEventArgsA, MeasureItemEventArgs MeasureItemEventArgsB) 

+		{

+			return (MeasureItemEventArgsA.Graphics != MeasureItemEventArgsB.Graphics) || 

+				   (MeasureItemEventArgsA.Index != MeasureItemEventArgsB.Index) ||

+				   (MeasureItemEventArgsA.ItemHeight != MeasureItemEventArgsB.ItemHeight) ||

+				   (MeasureItemEventArgsA.ItemWidth != MeasureItemEventArgsB.ItemWidth);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	PropertyTabChangedEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is MeasureItemEventArgs))return false;

+			return (this == (MeasureItemEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+		#endregion

+

+	}

+}

+		

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MeasureItemEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MeasureItemEventHandler.cs
new file mode 100644
index 00000000000..b0dcb098028
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MeasureItemEventHandler.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.MeasureItemEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the MeasureItem event of the 

+	/// ListBox, ComboBox, CheckedListBox, or MenuItem controls.

+	/// </summary>

+	//[Serializable]

+	public delegate void MeasureItemEventHandler(object sender, MeasureItemEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Menu.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Menu.cs
new file mode 100644
index 00000000000..33bf9313e5c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Menu.cs
@@ -0,0 +1,394 @@
+//

+// System.Windows.Forms.Menu.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System;

+using System.Reflection;

+using System.Globalization;

+//using System.Windows.Forms.AccessibleObject.IAccessible;

+using System.Drawing;

+using System.Collections;

+using System.Runtime.Remoting;

+

+namespace System.Windows.Forms  {

+

+

+	/// <summary>

+	/// ToDo note:

+	///  - Nothing is implemented

+	/// </summary>

+	using System.ComponentModel;

+	public abstract class Menu : Component {

+

+		//

+		// -- Public Methods

+		//

+		//inherited

+		//public virtual ObjRef CreateObjRef(Type t) {

+		//	throw new NotImplementedException();

+		//}

+		//

+		//public void Dispose() {

+		//	throw new NotImplementedException();

+		//}

+		//

+		//protected virtual void Dispose(bool disposing) {

+		//	throw new NotImplementedException();

+		//}

+

+		public override bool Equals(object o) {

+			throw new NotImplementedException();

+		}

+

+		//public static bool Equals(object o1, object o2) {

+		//	throw new NotImplementedException();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		public ContextMenu GetContextMenu() {

+			throw new NotImplementedException();

+		}

+

+		public MainMenu GetMainMenu() {

+			throw new NotImplementedException();

+		}

+

+		//inherited

+		//public object GetLifetimeService() {

+		//	throw new NotImplementedException();

+		//}

+		//public Type GetType() {

+		//	throw new NotImplementedException();

+		//}

+		//public virtual object InitializeLifetimeService() {

+		//	throw new NotImplementedException();

+		//}

+

+		public virtual void MergeMenu(Menu menuSrc) {

+			throw new NotImplementedException();

+		}

+

+		public override string ToString() {

+			throw new NotImplementedException();

+		}

+

+		//

+		// -- Protected Methods

+		//

+

+		protected void CloneMenu(Menu menuSrc) {

+			throw new NotImplementedException();

+		}

+

+

+		~Menu() {

+			throw new NotImplementedException();

+		}

+

+		//protected virtual object GetService(Type service) {

+		//	throw new NotImplementedException();

+		//}

+		//

+		//protected object MemberwiseClone() {

+		//	throw new NotImplementedException();

+		//}

+

+		//

+		// -- Public Events

+		//

+

+		//inherited

+		//public event EventHandler Disposed;

+

+		//

+		// -- Public Properties

+		//

+

+		//inherited

+		//public IContainer Container {

+		//	get {

+		//		throw new NotImplementedException();

+		//	}

+		//}

+

+		public IntPtr Handle {

+

+			get {

+				throw new NotImplementedException();

+			}

+		}

+

+		public virtual bool IsParent {

+

+			get {

+				throw new NotImplementedException();

+			}

+		}

+

+		public MenuItem MdiListItem {

+

+			get {

+				throw new NotImplementedException();

+			}

+		}

+

+		public Menu.MenuItemCollection MenuItems {

+

+			get {

+				throw new NotImplementedException();

+			}

+		}

+		//inherited

+		//public virtual ISite Site {

+		//	get {

+		//		throw new NotImplementedException();

+		//	}

+		//	set {

+		//		throw new NotImplementedException();

+		//	}

+		//}

+

+		//

+		// -- Protected Properties

+		//

+

+		//inherited

+		//protected bool DesignMode {

+		//	get {

+		//		throw new NotImplementedException();

+		//	}

+		//}

+		//protected EventHandlerList Events {

+		//	get {

+		//		throw new NotImplementedException();

+		//	}

+		//}

+		//

+		// System.Windows.Forms.Menu.MenuItemCollection.cs

+		//

+		// Author:

+		//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+		//

+		// (C) 2002 Ximian, Inc

+		//

+		/// <summary>

+		/// ToDo note:

+		///  - Nothing is implemented

+		/// </summary>

+

+		public class MenuItemCollection : IList, ICollection, IEnumerable {

+	

+			//

+			// -- Constructor

+			//

+

+			public MenuItemCollection(Menu m) {

+				throw new NotImplementedException ();

+			}

+	

+			//

+			// -- Public Methods

+			//

+		

+			public virtual int Add(MenuItem m) {

+				throw new NotImplementedException ();

+			}

+	    

+			public virtual MenuItem Add(string s) {

+				throw new NotImplementedException ();

+			}

+		

+			public virtual int Add(int i, MenuItem m) {

+				throw new NotImplementedException ();

+			}

+		

+			public virtual MenuItem Add(string s, EventHandler e) {

+				throw new NotImplementedException ();

+			}

+		

+			public virtual MenuItem Add(string s, MenuItem[] items) {

+				throw new NotImplementedException ();

+			}

+		

+			public virtual void AddRange(MenuItem[] items) {

+				throw new NotImplementedException ();

+			}

+		

+			public virtual void Clear() {

+				throw new NotImplementedException ();

+			}

+		

+			public bool Contains(MenuItem m) {

+				throw new NotImplementedException ();

+			}

+		

+			public void CopyTo(Array a, int i) {

+				throw new NotImplementedException ();

+			}

+		

+			public override bool Equals(object o) {

+				throw new NotImplementedException ();

+			}

+		

+			//inherited

+			//public static bool Equals(object o1, object o2) {

+			//	throw new NotImplementedException ();

+			//}

+		

+			[MonoTODO]

+			public override int GetHashCode() {

+				//FIXME add our proprities

+				return base.GetHashCode();

+			}		public IEnumerator GetEnumerator() {

+						throw new NotImplementedException ();

+					}

+		

+			//public override Type GetType() {

+			//	throw new NotImplementedException ();

+			//}

+		

+			public int IndexOf(MenuItem m) {

+				throw new NotImplementedException ();

+			}

+		

+			public virtual void Remove(MenuItem m) {

+				throw new NotImplementedException ();

+			}

+		

+			public virtual void RemoveAt(int i) {

+				throw new NotImplementedException ();

+			}

+		

+			public override string ToString() {

+				throw new NotImplementedException ();

+			}

+		

+			//

+			// -- Protected Methods

+			//

+		

+			~MenuItemCollection() {

+				throw new NotImplementedException ();

+			}

+		

+			//inherited

+			//protected object MemberwiseClone() {

+			//	throw new NotImplementedException ();

+			//}

+		

+			//

+			// -- Public Properties

+			//

+		

+			public int Count {

+

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+		

+			//		public virtual MenuItem this(int i)

+			//		{

+			//			get

+			//			{

+			//				throw new NotImplementedException ();

+			//			}

+			//		}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}

+

+	}

+}

+			

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuGlyph.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuGlyph.cs
new file mode 100644
index 00000000000..13cc3ce1e70
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuGlyph.cs
@@ -0,0 +1,24 @@
+

+//

+// System.Windows.Forms.MenuGlyph.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum MenuGlyph {

+		Arrow = 0,

+		Bullet = 2,

+		Checkmark = 1,

+		Max = 2,

+		Min = 0

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuItem.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuItem.cs
new file mode 100644
index 00000000000..d31a034acc6
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuItem.cs
@@ -0,0 +1,417 @@
+//

+// System.Windows.Forms.Menu.MenuItem.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System;

+using System.Reflection;

+using System.Globalization;

+//using System.Windows.Forms.AccessibleObject.IAccessible;

+using System.Drawing;

+using System.Runtime.Remoting;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// ToDo note:

+	///  - Nothing is implemented

+	/// </summary>

+        

+	public class MenuItem : Menu {

+		//

+		// - Constructor

+		//

+		public MenuItem() {

+			throw new NotImplementedException ();

+		}

+                

+		public MenuItem(string s) {

+			throw new NotImplementedException ();

+		}

+                

+		public MenuItem(string s, EventHandler e) {

+			throw new NotImplementedException ();

+		}

+                

+		public MenuItem(string s, MenuItem[] items) {

+			throw new NotImplementedException ();

+		}

+                

+		public MenuItem(string s, EventHandler e, Shortcut sc) {

+			throw new NotImplementedException ();

+		}

+                

+		public MenuItem(MenuMerge mm, int i, Shortcut sc, string s, EventHandler e, EventHandler e1, EventHandler e2, MenuItem[] items) {

+			throw new NotImplementedException ();

+		}

+                

+		//

+		// -- Public Methods

+		//

+                

+		public virtual MenuItem CloneMenu() {

+			throw new NotImplementedException ();

+		}

+                

+		public override ObjRef CreateObjRef(Type t) {

+			throw new NotImplementedException ();

+		}

+        //inherited

+		//public void Dispose()

+		//{

+		//        throw new NotImplementedException ();

+		//}

+		//

+		//public override void Dispose(bool disposing)

+		//{

+		//        throw new NotImplementedException ();

+		//}

+		//public override bool Equals(object o, object o1) {

+		//	throw new NotImplementedException ();

+		//}

+                

+		public override bool Equals(object o) {

+			throw new NotImplementedException ();

+		}

+                

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		//inherited	

+		//public ContextMenu GetContextMenu() {

+		//	throw new NotImplementedException ();

+		//}

+                

+		//public object GetLifetimeService() {

+		//	throw new NotImplementedException ();

+		//}

+        //        

+		//public MainMenu GetMainMenu() {

+		//	throw new NotImplementedException ();

+		//}

+                

+		//public Type GetType() {

+		//	throw new NotImplementedException ();

+		//}

+                

+		//public virtual object InitializeLifetimeService() {

+		//	throw new NotImplementedException ();

+		//}

+                

+		public virtual MenuItem MergeMenu() {

+			throw new NotImplementedException ();

+		}

+                

+		public void MergeMenu(MenuItem m) {

+			throw new NotImplementedException ();

+		}

+                

+		//inherited

+		//public virtual void MergeMenu(Menu m) {

+		//	throw new NotImplementedException ();

+		//}

+                

+		public void PerformClick() {

+			throw new NotImplementedException ();

+		}

+                

+		public virtual void PerformSelect() {

+			throw new NotImplementedException ();

+		}

+                

+		public override string ToString() {

+			throw new NotImplementedException ();

+		}

+                

+		//

+		// -- Protected Methods

+		//

+                

+		protected void CloneMenu(MenuItem m) {

+			throw new NotImplementedException ();

+		}

+                

+		//inherited

+		//protected void CloneMenu(Menu m) {

+		//	throw new NotImplementedException ();

+		//}

+                

+		//protected override void Dispose(bool disposing)

+		//{

+		//        throw new NotImplementedException ();

+		//}

+                

+		~MenuItem() {

+			throw new NotImplementedException ();

+		}

+                

+		//protected virtual object GetService(Type t) {

+		//	throw new NotImplementedException ();

+		//}

+                

+		//protected object MemberwiseClone() {

+		//	throw new NotImplementedException ();

+		//}

+                

+		protected virtual void OnClick(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+                

+		protected virtual void OnDrawItem(DrawItemEventArgs e) {

+			throw new NotImplementedException ();

+		}

+                

+		protected virtual void OnMeasureItem(MeasureItemEventArgs e) {

+			throw new NotImplementedException ();

+		}

+                

+		protected virtual void OnPopUp(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+                

+		protected virtual void OnSelect(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+                

+		//

+		// -- Public Properties

+		//

+                

+		public bool BarBreak {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public bool Break {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public bool Checked {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		//public IContainer Container {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+                

+		public bool DefaultItem {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public bool Enabled {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		//public IntPtr Handle {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+                

+		public int Index {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public override bool IsParent {

+

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public bool MdiList {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		//inherited

+		//public MenuItem MdiListItem {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}        

+		//public Menu.MenuItemCollection MenuItems {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+                

+		public int MergeOrder {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public MenuMerge MergeType {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public char Mnemonic {

+

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public bool OwnerDraw {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public Menu Parent {

+

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public bool RadioCheck {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public Shortcut Shortcut {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		//inherited

+		//public virtual ISite Site {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+                

+		public string Text {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		public bool Visible {

+

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		//

+		// -- Protected Properties

+		//

+                

+		//inherited

+		//protected bool DesignMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}      

+		//protected EventHandlerList Events {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+                

+		protected int MenuID {

+

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+                

+		//

+		// -- Public Events

+		//

+                

+		public event EventHandler Click;

+		//inherited

+		//public event EventHandler Disposed;

+		public event DrawItemEventHandler DrawItem;

+		public event MeasureItemEventHandler MeasureItem;

+		public event EventHandler PopUp;

+		public event EventHandler Select;

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuMerge.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuMerge.cs
new file mode 100644
index 00000000000..0b77357eacc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MenuMerge.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.MenuMerge.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum MenuMerge {

+		Add = 0,

+		MergeItems = 2,

+		Remove = 3,

+		Replace = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Message.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Message.cs
new file mode 100644
index 00000000000..b0515a5d904
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Message.cs
@@ -0,0 +1,172 @@
+//

+// System.Drawing.Message.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+//TODO uncomment and implment GetLParam.

+using System;

+

+namespace System.Windows.Forms {

+	[Serializable]

+	public struct Message { 

+

+		private int msg;

+		private IntPtr hwnd;

+		private IntPtr lparam;

+		private IntPtr wparam;

+		private IntPtr result;

+

+

+		// -----------------------

+		// Public Shared Members

+		// -----------------------

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two Message objects. The return value is

+		///	based on the equivalence of the Msg, HWnd, LParam,

+		///	 WParam, and Result properties of the two objects.

+		/// </remarks>

+

+		public static bool operator == (Message msg_a, 

+			Message msg_b) {

+

+			return ((msg_a.msg == msg_b.msg) &&

+				(msg_a.hwnd == msg_b.hwnd) &&

+				(msg_a.lparam == msg_b.lparam) &&

+				(msg_a.wparam == msg_b.wparam) &&

+				(msg_a.result == msg_b.result));

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two Message objects. The return value is

+		///	based on the equivalence of the Msg, HWnd, LParam,

+		///	 WParam, and Result properties of the two objects.

+		/// </remarks>

+

+		public static bool operator != (Message msg_a, 

+			Message msg_b) {

+			return ((msg_a.msg != msg_b.msg) ||

+				(msg_a.hwnd != msg_b.hwnd) ||

+				(msg_a.lparam != msg_b.lparam) ||

+				(msg_a.wparam != msg_b.wparam) ||

+				(msg_a.result != msg_b.result));

+		}

+		

+		// -----------------------

+		// Public Instance Members

+		// -----------------------

+

+		public int Msg {

+			get{

+				return msg;

+			}

+			set{

+				msg = value;

+			}

+		}

+

+		public IntPtr HWnd {

+			get{

+				return hwnd;

+			}

+			set{

+				hwnd = value;

+			}

+		}

+

+		public IntPtr LParam {

+			get{

+				return lparam;

+			}

+			set{

+				lparam = value;

+			}

+		}

+

+		public IntPtr WParam {

+			get{

+				return wparam;

+			}

+			set{

+				wparam = value;

+			}

+		}

+

+		public IntPtr Result {

+			get{

+				return result;

+			}

+			set{

+				result = value;

+			}

+		}

+

+		public static Message create(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)

+		{

+			Message NewMessage =  new Message();

+			NewMessage.msg = msg;

+			NewMessage.wparam = wparam;

+			NewMessage.lparam = lparam;

+			NewMessage.hwnd = hWnd;

+			return NewMessage;

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this Message and another object.

+		/// </remarks>

+		

+		public override bool Equals (object obj)

+		{

+			if (!(obj is Message))

+				return false;

+

+			return (this == (Message) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		

+		public override int GetHashCode ()

+		{

+			return base.GetHashCode();// (int)( msg ^ lparam ^ wparam ^ result ^ whnd);

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the Message as a string.

+		/// </remarks>

+		

+		public override string ToString ()

+		{

+			return String.Format ("[{0},{1},{2},{3},{4}]", msg.ToString(), lparam.ToString(), wparam.ToString(), result.ToString(), hwnd.ToString());

+		}

+

+//		public object GetLParam(Type cls){

+//			//	throw new NotImplementedException ();

+//			//return (object) lparam;

+//		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxButtons.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxButtons.cs
new file mode 100644
index 00000000000..cc0fa0dfaaf
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxButtons.cs
@@ -0,0 +1,23 @@
+//

+// System.Windows.Forms.MessageBoxButtons.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+public enum MessageBoxButtons {

+		AbortRetryIgnore = 2,

+		OK = 0,

+		OKCancel = 1,

+		RetryCancel = 5,

+		YesNo = 4,

+		YesNoCancel = 3

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxDefaultButton.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxDefaultButton.cs
new file mode 100644
index 00000000000..cb3357d39fc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxDefaultButton.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.MessageBoxDefaultButton.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum MessageBoxDefaultButton {

+		Button1 = 0,

+		Button2 = 256,

+		Button3 = 512

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxIcon.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxIcon.cs
new file mode 100644
index 00000000000..43f05fc767a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxIcon.cs
@@ -0,0 +1,26 @@
+//

+// System.Windows.Forms.MessageBoxIcon.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum MessageBoxIcon {

+		Asterisk = 64,

+		Error = 16,

+		Exclamation = 48,

+		Hand = 16,

+		Information = 64,

+		None = 0,

+		Question = 32,

+		Stop = 16,

+		Warning = 48

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxOptions.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxOptions.cs
new file mode 100644
index 00000000000..57a638335d2
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MessageBoxOptions.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.MessageBoxOptions.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum MessageBoxOptions {

+		DefaultDesktopOnly = 131072,

+		RightAlign = 524288,

+		RtlReading = 1048576,

+		ServiceNotification = 2097152

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MethodInvoker.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MethodInvoker.cs
new file mode 100644
index 00000000000..553746b631f
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MethodInvoker.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.MethodInvoker.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that handles the Invoke event for a method.

+	/// </summary>

+	//[Serializable]

+	public delegate void MethodInvoker();

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MonthCalendar.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MonthCalendar.cs
new file mode 100644
index 00000000000..53be14f0a96
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MonthCalendar.cs
@@ -0,0 +1,1861 @@
+//

+// System.Windows.Forms.MonthCalendar.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+        public class MonthCalendar : Control {

+

+		//

+		//  --- Constructor

+		//

+//		[MonoTODO]

+//		public MonthCalendar()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//

+//		//

+//		//  --- Public Methods

+//		//

+//		[MonoTODO]

+//		public void AddAnnuallyBoldedDate(DateTime date)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void AddBoldedDate(DateTime date)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void AddMonthlyBoldedDate(DateTime date)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		//inherited

+//		//public void Dispose()

+//		//{

+//		//	throw new NotImplementedException ();

+//		//}

+//		[MonoTODO]

+//		public void RemoveAllAnnuallyBoldedDates()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void BringToFront()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void CreateControl()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Hide()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Invalidate()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Invalidate(bool b)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Invalidate(Rectangle r)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Invalidate(Region rg)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Invalidate(Rectangle r, bool b)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Invalidate(Region rg, bool b)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void PerformLayout()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void PerformLayout(Control ctl, string s)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void RemoveAllBoldedDates()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void RemoveAllMonthlyBoldedDates()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void RemoveAnnuallyBoldedDate(Datetime Date)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void RemoveBoldedDate(Datetime Date)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void RemoveMonthlyBoldedDate(Datetime Date)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void ResetBindings()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void ResetImeMode()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void ResumeLayout()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void ResumeLayout(bool b)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Scale(float ft)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Scale(float ft, float ft1)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Select()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void SendToBack()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void SetBounds(int i, int i1, int i2, int i3)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void SetCalendarDimensions(int x, int y)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void SetDate(Datetime Date)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void SetSelectionRange(Datetime Date, Datetime Date1)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Show()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void SuspendLayout()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void Update()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public void UpdateBoldedDates()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public IAsyncResult BeginInvoke(Delegate dels)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public IAsyncResult BeginInvoke(Delegate dels, object[] objs)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public bool Contains(Control ctl)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public Graphics CreateGraphics()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public DragDropEffects DoDragDrop(object o, DragDropEffects dde)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public object EndEnvoke(IAsyncResult asyncResult)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public static bool Equals(object o, object o1)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public Form FindForm()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public bool Focus()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public Control GetChildAtPoint(Point pt)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public IContainerControl GetContainerControl()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public SelectionRange GetDisplayRange(bool b)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual int GetHashCode()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public object GetLifetimeService()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public Control GetNextControl(Control ctl, bool b)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public Type GetType()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public HitTestInfo HitTest(Point pt)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public HitTestInfo HitTest(int i, int i1)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual object InitializeLifetimeService()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public object Invoke(Delegate d)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public object Invoke(Delegate d, object[])

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public Point PointToClient(Point pt)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public Point PointToScreen(Point pt)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public Rectangle RectangleToClient(Rectangle r)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public Rectangle RectangleToScreen(Rectangle r)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public bool SelectNextControl(Control ctl, bool b, bool b1, bool b2, bool b3)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public override string ToString()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual ObjRef CreateObjRef(Type reqType)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual bool Equals(object o)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual bool PreProcessMessage(ref Message msg)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual void Refresh()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual void ResetBackColor()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual void ResetCursor()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual void ResetFont()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual void ResetForeColor()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual void ResetRightToLeft()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual void ResetText()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual void Select(bool b, bool b1)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//

+//		//

+//		//  --- Public Properties

+//		//

+//		[MonoTODO]

+//		public AccessibleObject AccessibilityObject  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public string AccessibleDefaultActionDescription  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public string AccessibleDescription  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public string AccessibleName  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public AccessibleRole AccessibleRole  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public virtual bool AllowDrop  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public virtual AnchorStyles Anchor  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public DateTime[] AnnuallyBoldedDates  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public override Color BackColor  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public override Image BackgroundImage  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public virtual BindingContext BindingContext  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public DateTime[] BoldedDates  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public int Bottom  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Rectangle Bounds  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Size CalendarDimensions  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool CanFocus  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool CanSelect  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool Capture  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool CausesValidation  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Rectangle ClientRectangle  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Size ClientSize  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public string CompanyName  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public IContainer Container  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool ContainsFocus  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public virtual ContextMenu ContextMenu  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Control.ControlCollection Controls  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool Created  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public virtual Cursor Cursor  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public ControlBindingsCollection DataBindings  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public virtual Rectangle DisplayRectangle  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool Disposing  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public virtual DockStyle Dock  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool Enabled  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Day FirstDayOfWeek  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public virtual bool Focused  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public virtual Font Font  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public override Color ForeColor  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public IntPtr Handle  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool HasChildren  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public int Height  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool InvokeRequired  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool IsAccessible  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool IsDisposed  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool IsHandleCreated  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public int Left  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Point Location  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public DateTime MaxDate  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public int MaxSelectionCount  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public DateTime MinDate  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public DateTime[] MonthlyBoldedDates  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public string Name  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Control Parent  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public string ProductName  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public string ProductVersion  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool RecreatingHandle  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Region Region  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public int Right  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public virtual RightToLeft RightToLeft  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public int ScrollChange  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public DateTime SelectionEnd  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public SelectionRange SelectionRange  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public DateTime SelectionStart  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool ShowToday  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool ShowTodayCircle  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool ShowWeekNumbers  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Size SingleMonthSize  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public override ISite Site  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Size Size  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public int TabIndex  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool TabStop  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public object Tag  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public override string Text  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Color TitleBackColor  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Color TitleForeColor  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public DateTime TodayDate  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool TodayDateSet  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public int Top  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Control TopLevelControl  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Color TrailingForeColor  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public bool Visible  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public int Width  {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//

+//		//

+//		//  --- Protected Methods

+//		//

+//		[MonoTODO]

+//		protected override void CreateHandle()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected bool GetStyle(ControlStyles flag)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected bool GetTopLevel()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected override bool IsInputKey(Keys KeyData)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected object MemberwiseClone()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected override void OnBackColorChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected override void OnHandleCreated(EventArgs e) 

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected internal virtual bool ProcessKeyMessage(ref Message m)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected ContentAlignment RtlTranslateAlignment(ContentAlignment)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected ContentAlignment RtlTranslateContent(ContentAlignment align)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected HorizontalAlignment RtlTranslateHorizontal(HorizontalAlignment align)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected LeftRightAlignment RtlTranslateLeftRight(LeftRightAlignment align)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected override void WndProc(ref Message m)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		//protected virtual void Dispose(bool disposed)

+//		//{

+//		//	throw new NotImplementedException ();

+//		//}

+//		[MonoTODO]

+//		protected virtual void InitLayout()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnBackgroundImageChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnBindingContextChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnCausesValidationChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnChangeUICues(UICuesEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnClick(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnContextMenuChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnControlAdded(ControlEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnControlRemoved(ControlEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnCreateControl()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnCursorChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnDateChanged(DateRangeEventArgs drevent)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnDateSelected(DateRangeEventArgs drevent)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnDockChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnDoubleClick(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnDragDrop(DragEventArgs drgevent)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnDragEnter(DragEventArgs drgevent)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnDragLeave(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnDragOver(DragEventArgs drgevent)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnEnabledChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnEnter(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnFontChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnForeColorChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnGiveFeedback(GiveFeedbackEventArgs gfbevent)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnGotFocus(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnHandleDestroyed(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnHelpRequested(HelpEventArgs hevent)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnImeModeChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnInvalidated(InvalidateEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnKeyDown(KeyEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnKeyPress(KeyPressEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnKeyUp(KeyEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnLayout(LayoutEventArgs levent)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnLeave(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnLocationChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnLostFocus(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnMouseDown(MouseEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnMouseEnter(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnMouseHover(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnMouseLeave(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnMouseMove(MouseEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnMouseUp(MouseEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnMouseWheel(MouseEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnMove(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnNotifyMessage(Message m)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnPaint(PaintEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnPaintBackground(PaintEventArgs pevent)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnParentBackColorChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnParentBackgroundImageChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnParentBindingContextChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnParentChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnParentEnabledChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnParentFontChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnParentForeColorChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnParentRightToLeftChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnParentVisibleChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnQueryContinueDrag(QueryContinueDragEventArgs qcdevent)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnResize(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnRightToLeftChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnSizeChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnStyleChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnSystemColorsChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnTabIndexChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnTabStopChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnTextChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnValidated(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnValidating(CancelEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void OnVisibleChanged(EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void ScaleCore(float dx,float dy)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void Select(bool b, bool b1)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void SetClientSizeCore(int x, int y)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void SetVisibleCore(bool value)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void AccessibilityNotifyClients(AccessibleEvents accEvent, int i)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void InvokeGotFocus(Control toInvoke, EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void InvokeLostFocus(Control toInvoke, EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void InvokeOnClick(Control toInvoke, EventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void InvokePaint(Control c, PaintEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void InvokePaintBackground(Control c, PaintEventArgs e)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void RecreateHandle()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void SetStyle(ControlStyles flag, bool value)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void SetTopLevel(bool value)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void UpdateBounds()

+//		{

+//			throw new NotImplementedException ();

+//		}

+////		[MonoTODO]

+////		protected void UpdateBounds(int x, int y, int width, int height);

+////		{

+////			throw new NotImplementedException ();

+////		}

+////		[MonoTODO]

+////		protected void UpdateBounds(int x, int y, int width, int height, int clientWidth, intclientHeigth);

+////		{

+////			throw new NotImplementedException ();

+////		}

+//		[MonoTODO]

+//		protected void UpdateStyles()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected void UpdateZOrder()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual AccessibleObject CreateAccessibilityInstance()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual ControlCollection CreateControlsInstance()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void DefWndProc(ref Message m)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual void DestroyHandle()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual object GetService(Type service)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual bool IsInputChar(char charCode)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual bool ProcessCmdKey(ref Message msg, Keys keyData)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual bool ProcessDialogChar(char charCode)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual bool ProcessDialogKey(Keys keyData)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual bool ProcessKeyEventArgs(ref Message m)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual bool ProcessKeyPreview(ref Message m)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		protected virtual bool ProcessMnemonic(char charCode)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//

+//		//

+//		//  --- Protected Properties

+//		//

+//		[MonoTODO]

+//		protected override CreateParams CreateParams {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		protected override ImeMode DefaultImeMode {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		protected override Size DefaultSize {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		protected bool DesignMode {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		protected bool ResizeRedraw {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		protected EventHandlerList Events {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		protected bool ShowKeyboardCues {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		protected int FontHeight {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//			set {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		protected virtual bool ShowFocusCues {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//

+//		//

+//		//  --- Public Events

+//		//

+//		public event EventHandler BackColorChanged;

+//		public event EventHandler BackgroundImageChanged;

+//		public event EventHandler BindingContextChanged;

+//		public event EventHandler CausesValidationChanged;

+//		public event UICuesEventHandler ChangeUICues;

+//		public event EventHandler ContextMenuChanged;

+//		public event ControlEventHandler ControlAdded;

+//		public event ControlEventHandler ControlRemoved;

+//		public event EventHandler CursorChanged;

+//		public event DateRangeEventHandler DateChanged;

+//		public event DateRangeEventHandler DateSelected;

+//		public event EventHandler Disposed;

+//		public event EventHandler DockChanged;

+//		public event DragEventHandler DragDrop;

+//		public event DragEventHandler DragEnter;

+//		public event EventHandler DragLeave;

+//		public event DragEventHandler DragOver;

+//		public event EventHandler EnabledChanged;

+//		public event EventHandler Enter;

+//		public event EventHandler FontChanged;

+//		public event EventHandler ForeColorChanged;

+//		public event GiveFeedbackEventHandler GiveFeedback;

+//		public event EventHandler GotFocus;

+//		public event EventHandler HandleCreated;

+//		public event EventHandler HandleDestroyed;

+//		public event HelpEventHandler HelpRequested;

+//		public event EventHandler ImeModeChanged;

+//		public event InvalidateEventHandler Invalidated;

+//		public event KeyEventHandler KeyDown;

+//		public event KeyPressEventHandler KeyPress;

+//		public event KeyEventHandler KeyUp;

+//		public event LayoutEventHandler Layout;

+//		public event EventHandler Leave;

+//		public event EventHandler LocationChanged;

+//		public event EventHandler LostFocus;

+//		public event MouseEventHandler MouseDown;

+//		public event EventHandler MouseEnter;

+//		public event EventHandler MouseHover;

+//		public event EventHandler MouseLeave;

+//		public event MouseEventHandler MouseMove;

+//		public event MouseEventHandler MouseUp;

+//		public event MouseEventHandler MouseWheel;

+//		public event EventHandler Move;

+//		public event EventHandler ParentChanged;

+//		public event QueryAccessibilityHelpEventHandler QueryAccessibilityHelp;

+//		public event QueryContinueDragEventHandler QueryContinueDrag;

+//		public event EventHandler Resize;

+//		public event EventHandler RightToLeftChanged;

+//		public event EventHandler SizeChanged;

+//		public event EventHandler StyleChanged;

+//		public event EventHandler SystemColorsChanged;

+//		public event EventHandler TabIndexChanged;

+//		public event EventHandler TabStopChanged;

+//		public event EventHandler TextChanged;

+//		public event EventHandler Validated;

+//		public event CancelEventHandler Validating;

+//		public event EventHandler VisibleChanged;

+//

+//		//

+//		//  --- Destructor

+//		//

+//		[MonoTODO]

+//		~MonthCalendar()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//	//

+//	// System.Windows.Forms.MonthCalendar.HitTestInfo.cs

+//	//

+//	// Author:

+//	//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	//

+//	// (C) 2002 Ximian, Inc

+//	//

+//

+//	// <summary>

+//	//	This is only a template.  Nothing is implemented yet.

+//	//

+//	// </summary>

+//

+//        public sealed class HitTestInfo {

+//

+//		//

+//		//  --- Public Properties

+//		//

+//		[MonoTODO]

+//		public MonthCalendar.HitArea HitArea {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public Point Point {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//		[MonoTODO]

+//		public DateTime Time {

+//			get {

+//				throw new NotImplementedException ();

+//			}

+//		}

+//

+//		//

+//		//  --- Public Methods

+//		//

+//		[MonoTODO]

+//		public virtual bool Equals(object o)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public static bool Equals(object o1, object o2)

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual int GetHashCode()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public Type GetType()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//		[MonoTODO]

+//		public virtual string ToString()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//

+//		//

+//		//  --- Protected Methods

+//		//

+//		[MonoTODO]

+//		protected object MemberwiseClone()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//

+//		//

+//		//  --- Destructor

+//		//

+//		[MonoTODO]

+//		~HitTestInfo()

+//		{

+//			throw new NotImplementedException ();

+//		}

+//	 }

+//

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MouseButtons.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MouseButtons.cs
new file mode 100644
index 00000000000..0e2a1628b69
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MouseButtons.cs
@@ -0,0 +1,23 @@
+//

+// System.Windows.Forms.MouseButtons.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum MouseButtons {

+		Left = 1048576,

+		Middle = 4194304,

+		None = 0,

+		Right = 2097152,

+		XButton1 = 8388608,

+		XButton2 = 16777216

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MouseEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MouseEventArgs.cs
new file mode 100644
index 00000000000..ff2ca4a3137
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MouseEventArgs.cs
@@ -0,0 +1,168 @@
+//

+// System.Windows.Forms.MouseEventArgs.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//	 Gianandrea Terzi (gianandrea.terzi@lario.com)   

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.InteropServices;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class MouseEventArgs : EventArgs {

+

+		#region Fields

+

+		private MouseButtons button;

+		private int clicks;

+		private int x;

+		private int y;

+		private int delta;

+		

+		#endregion

+

+		public MouseEventArgs(MouseButtons button, int clicks, int x, int y, int delta)

+		{

+			this.button = button;

+			this.clicks = clicks;

+			this.x = x;

+			this.y = y;

+			this.delta = delta;

+		}

+

+		#region Public Properties

+

+		[ComVisible(true)]

+		public MouseButtons Button 

+		{

+			get {

+				return button;

+			}

+		}

+

+		[ComVisible(true)]

+		public int Clicks {

+			get {

+				return clicks;

+			}

+		}

+

+		[ComVisible(true)]

+		public int Delta {

+			get {

+				return delta;

+			}

+		}

+

+		[ComVisible(true)]

+		public int X {

+			get {

+				return x;

+			}

+		}

+

+		[ComVisible(true)]

+		public int Y {

+			get {

+				return y;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two MouseEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	X, Y, Clicks, Delta and Button  Property

+		///	of the two MouseEventArgs.

+		/// </remarks>

+		public static bool operator == (MouseEventArgs MouseEventArgsA, MouseEventArgs MouseEventArgsB) 

+		{

+			return (MouseEventArgsA.X == MouseEventArgsB.X) && 

+				   (MouseEventArgsA.Y == MouseEventArgsB.Y) && 

+				   (MouseEventArgsA.Clicks == MouseEventArgsB.Clicks) && 

+				   (MouseEventArgsA.Delta == MouseEventArgsB.Delta) &&

+				   (MouseEventArgsA.Button == MouseEventArgsB.Button);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two MouseEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	X, Y, Clicks, Delta and Button  Property

+		///	of the two MouseEventArgs.

+		/// </remarks>

+		public static bool operator != (MouseEventArgs MouseEventArgsA, MouseEventArgs MouseEventArgsB) 

+		{

+			return (MouseEventArgsA.X != MouseEventArgsB.X) || 

+				   (MouseEventArgsA.Y != MouseEventArgsB.Y) || 

+				   (MouseEventArgsA.Clicks != MouseEventArgsB.Clicks) || 

+				   (MouseEventArgsA.Delta != MouseEventArgsB.Delta) ||

+				   (MouseEventArgsA.Button != MouseEventArgsB.Button);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	MouseEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is MouseEventArgs))return false;

+			return (this == (MouseEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+		#endregion

+

+

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/MouseEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/MouseEventHandler.cs
new file mode 100644
index 00000000000..64d95720fde
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/MouseEventHandler.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.MouseEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the MouseDown, MouseUp, or MouseMove 

+	/// event of a form, control, or other component.

+	/// </summary>

+	//[Serializable]

+	public delegate void MouseEventHandler(object sender, MouseEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/NativeWindow.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/NativeWindow.cs
new file mode 100644
index 00000000000..1f9a3dab981
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/NativeWindow.cs
@@ -0,0 +1,190 @@
+//

+// System.Windows.Forms.NativeWindow.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//   Dennis Hayes (dennish@Raytek.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.Remoting;

+using System.Runtime.InteropServices;

+using System.Runtime.CompilerServices;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class NativeWindow : MarshalByRefObject {

+

+		// the window's HWND

+		private IntPtr windowHandle;

+		static private Hashtable windowCollection = new Hashtable ();

+

+		//

+		//  --- Constructor

+		//

+		public NativeWindow () {

+			windowHandle = (IntPtr) 0;

+		}

+

+		//

+		//  --- Public Properties

+		//

+		public IntPtr Handle {

+			get {

+				return windowHandle;

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		public void AssignHandle (IntPtr handle) {

+			if (windowHandle != (IntPtr) 0)

+				windowCollection.Remove (windowHandle);

+

+			windowHandle = handle;

+			windowCollection.Add (windowHandle, this);

+			OnHandleChange ();

+		}

+

+		public virtual void CreateHandle (CreateParams cp) {

+			IntPtr createdHWnd = (IntPtr) 0;

+			Object lpParam = new Object();

+

+			windowHandle = Win32.CreateWindowExA ((uint) cp.ExStyle,

+							      cp.ClassName,

+							      cp.Caption,

+							      (uint) cp.Style,

+							      cp.X,

+							      cp.Y,

+							      cp.Width,

+							      cp.Height,

+							      (IntPtr) cp.Parent,

+							      (IntPtr) 0,

+							      (IntPtr) 0,

+							      ref lpParam);

+			

+			if (windowHandle != (IntPtr) 0)

+				windowCollection.Add (windowHandle, this);

+		}

+

+		[MonoTODO]

+		public override ObjRef CreateObjRef (Type requestedType) {

+			throw new NotImplementedException ();

+		}

+

+		public void DefWndProc (ref Message m) {

+			m.Result = Win32.DefWindowProcA (m.HWnd, m.Msg, 

+							 m.WParam, m.LParam);

+		}

+

+		public virtual void DestroyHandle () {

+			windowCollection.Remove (windowHandle);

+			Win32.DestroyWindow (windowHandle);

+		}

+

+		[MonoTODO]

+		public override bool Equals (object o) {

+			throw new NotImplementedException ();

+		}

+

+		//inherited

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode () {

+			//FIXME add our proprities

+			return base.GetHashCode ();

+		}

+

+		public static NativeWindow FromHandle (IntPtr handle) {

+			NativeWindow window = new NativeWindow ();

+			window.AssignHandle (handle);

+			return window;

+		}

+

+		//inherited

+		//public object GetLifetimeService() {

+		//	throw new NotImplementedException ();

+		//}

+		//public Type GetType() {

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual object InitializeLifetimeService(){

+		//	throw new NotImplementedException ();

+		//}

+

+		public virtual void ReleaseHandle () {

+			windowHandle = (IntPtr) 0;

+			OnHandleChange ();

+		}

+

+		[MonoTODO]

+		public override string ToString () {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		//inherited

+		//protected object MemberwiseClone() {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected virtual void OnHandleChange () {

+			// to be overridden

+		}

+		[MonoTODO]

+		protected virtual void OnThreadException (Exception e) {

+			throw new NotImplementedException ();

+		}

+

+		protected virtual void WndProc (ref Message m) {

+			Console.WriteLine ("NativeWindow.WndProc");

+			DefWndProc (ref m);

+		}

+

+		//

+		//  --- Destructor

+		//

+		[MonoTODO]

+		~NativeWindow () {

+		}

+

+// obsolete: should probably be handled by Application class

+// 		static private IntPtr _WndProc (IntPtr hWnd, int msg, 

+// 					        IntPtr wParam, IntPtr lParam) {

+// 		        Console.WriteLine ("in _WndProc");

+// 			NativeWindow window = 

+// 			    (NativeWindow) windowCollection[hWnd];

+// 			Message message = new Message ();

+// 			message.Result = (IntPtr) 0;

+// 			if (window != null) {

+// 				message.HWnd = hWnd;

+// 				message.Msg = msg;

+// 				message.WParam = wParam;

+// 				message.LParam = lParam;

+// 				window.WndProc(ref message);

+// 			} else {

+// 				// even though we are not managing the

+// 				// window let the window get the message

+// 				message.Result = Win32.DefWindowProcA (hWnd, 

+// 								       msg, 

+// 								       wParam, 

+// 								       lParam);

+// 			}

+// 			return message.Result;

+// 		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/NavigateEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/NavigateEventArgs.cs
new file mode 100644
index 00000000000..713b8a662dd
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/NavigateEventArgs.cs
@@ -0,0 +1,128 @@
+//

+// System.Windows.Forms.NavigateEventArgs.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//	 Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.InteropServices;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+        public class NavigateEventArgs : EventArgs {

+			

+			#region Fields

+			

+			private bool isforward;

+

+			#endregion

+

+			//

+			//  --- Constructor

+			//

+			public NavigateEventArgs(bool isForward)

+			{

+				isforward = isForward;

+			}

+

+			#region Public Properties

+

+			[ComVisible(true)]

+			public bool Forward 

+			{

+				get {

+					return isforward;

+				}

+			}

+			#endregion

+

+

+			#region Public Methods

+

+			/// <summary>

+			///	Equality Operator

+			/// </summary>

+			///

+			/// <remarks>

+			///	Compares two NavigateEventArgs objects.

+			///	The return value is based on the equivalence of

+			///	Forward Property

+			///	of the two NavigateEventArgs.

+			/// </remarks>

+			public static bool operator == (NavigateEventArgs NavigateEventArgsA, NavigateEventArgs NavigateEventArgsB) 

+			{

+				return (NavigateEventArgsA.Forward == NavigateEventArgsB.Forward);

+			}

+		

+			/// <summary>

+			///	Inequality Operator

+			/// </summary>

+			///

+			/// <remarks>

+			///	Compares two NavigateEventArgs objects.

+			///	The return value is based on the equivalence of

+			///	Forward Property

+			///	of the two NavigateEventArgs.

+			/// </remarks>

+			public static bool operator != (NavigateEventArgs NavigateEventArgsA, NavigateEventArgs NavigateEventArgsB) 

+			{

+				return (NavigateEventArgsA.Forward != NavigateEventArgsB.Forward);

+				}

+

+			/// <summary>

+			///	Equals Method

+			/// </summary>

+			///

+			/// <remarks>

+			///	Checks equivalence of this

+			///	PropertyTabChangedEventArgs and another

+			///	object.

+			/// </remarks>

+			public override bool Equals (object obj) 

+			{

+				if (!(obj is NavigateEventArgs))return false;

+				return (this == (NavigateEventArgs) obj);

+			}

+

+			/// <summary>

+			///	GetHashCode Method

+			/// </summary>

+			///

+			/// <remarks>

+			///	Calculates a hashing value.

+			/// </remarks>

+			[MonoTODO]

+			public override int GetHashCode () 

+			{

+				//FIXME: add class specific stuff;

+				return base.GetHashCode();

+			}

+

+			/// <summary>

+			///	ToString Method

+			/// </summary>

+			///

+			/// <remarks>

+			///	Formats the object as a string.

+			/// </remarks>

+			[MonoTODO]

+			public override string ToString () 

+			{

+				//FIXME: add class specific stuff;

+				return base.ToString();

+			}

+

+		#endregion

+

+

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/NavigateEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/NavigateEventHandler.cs
new file mode 100644
index 00000000000..eee69bb3d75
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/NavigateEventHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.NavigateEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the NavigateEventArgs event of a DataGrid.

+	/// </summary>

+	//[Serializable]

+	public delegate void NavigateEventHandler(object sender, NavigateEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/NodeLabelEditEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/NodeLabelEditEventArgs.cs
new file mode 100644
index 00000000000..3e396e3e747
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/NodeLabelEditEventArgs.cs
@@ -0,0 +1,144 @@
+//

+// System.Windows.Forms.NodeLabelEditEventArgs.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+        public class NodeLabelEditEventArgs : EventArgs {

+

+			#region Fields

+

+			private TreeNode node;

+			private string label = "";

+			private bool canceledit = false;

+			

+			#endregion

+

+			//

+			//  --- Constructor

+			//

+			public NodeLabelEditEventArgs(TreeNode node)

+			{

+				this.node = node;

+			}

+			public NodeLabelEditEventArgs(TreeNode node, string label)

+			{

+				this.node = node;

+				this.label = label;

+			}

+

+			#region Public Properties

+

+			public bool CancelEdit {

+				get {

+					return canceledit;

+				}

+				set {

+					canceledit = value;

+				}

+			}

+			public string Label 

+			{

+				get {

+					return label;

+				}

+			}

+			public TreeNode Node {

+				get {

+					return node;

+				}

+			}

+

+			#endregion

+

+			#region Public Methods

+

+			/// <summary>

+			///	Equality Operator

+			/// </summary>

+			///

+			/// <remarks>

+			///	Compares two NodeLabelEditEventArgs objects.

+			///	The return value is based on the equivalence of

+			///	label, Node and CancelEdit Property

+			///	of the two NodeLabelEditEventArgs.

+			/// </remarks>

+			public static bool operator == (NodeLabelEditEventArgs NodeLabelEditEventArgsA, NodeLabelEditEventArgs NodeLabelEditEventArgsB) 

+			{

+				return (NodeLabelEditEventArgsA.Label == NodeLabelEditEventArgsB.Label) && (NodeLabelEditEventArgsA.Node == NodeLabelEditEventArgsB.Node) && (NodeLabelEditEventArgsA.CancelEdit == NodeLabelEditEventArgsB.CancelEdit);

+			}

+		

+			/// <summary>

+			///	Inequality Operator

+			/// </summary>

+			///

+			/// <remarks>

+			///	Compares two NodeLabelEditEventArgs objects.

+			///	The return value is based on the equivalence of

+			///	label, Node and CancelEdit Property

+			///	of the two NodeLabelEditEventArgs.

+			/// </remarks>

+			public static bool operator != (NodeLabelEditEventArgs NodeLabelEditEventArgsA, NodeLabelEditEventArgs NodeLabelEditEventArgsB) 

+			{

+				return (NodeLabelEditEventArgsA.Label != NodeLabelEditEventArgsB.Label) || (NodeLabelEditEventArgsA.Node != NodeLabelEditEventArgsB.Node) || (NodeLabelEditEventArgsA.CancelEdit != NodeLabelEditEventArgsB.CancelEdit);

+			}

+

+			/// <summary>

+			///	Equals Method

+			/// </summary>

+			///

+			/// <remarks>

+			///	Checks equivalence of this

+			///	PropertyTabChangedEventArgs and another

+			///	object.

+			/// </remarks>

+			public override bool Equals (object obj) 

+			{

+				if (!(obj is NodeLabelEditEventArgs))return false;

+				return (this == (NodeLabelEditEventArgs) obj);

+			}

+

+			/// <summary>

+			///	GetHashCode Method

+			/// </summary>

+			///

+			/// <remarks>

+			///	Calculates a hashing value.

+			/// </remarks>

+			[MonoTODO]

+			public override int GetHashCode () 

+			{

+				//FIXME: add class specific stuff;

+				return base.GetHashCode();

+			}

+

+			/// <summary>

+			///	ToString Method

+			/// </summary>

+			///

+			/// <remarks>

+			///	Formats the object as a string.

+			/// </remarks>

+			[MonoTODO]

+			public override string ToString () 

+			{

+				//FIXME: add class specific stuff;

+				return base.ToString();

+			}

+

+		#endregion

+

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/NodeLabelEditEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/NodeLabelEditEventHandler.cs
new file mode 100644
index 00000000000..e6f35aa403e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/NodeLabelEditEventHandler.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.NodeLabelEditEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the BeforeLabelEdit 

+	/// and AfterLabelEdit events of a TreeView control. 

+	/// </summary>

+	//[Serializable]

+	public delegate void NodeLabelEditEventHandler(object sender, NodeLabelEditEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/NotifyIcon.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/NotifyIcon.cs
new file mode 100644
index 00000000000..fc2650dc5a7
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/NotifyIcon.cs
@@ -0,0 +1,192 @@
+//

+// System.Windows.Forms.NotifyIcon.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+using System.Drawing;

+using System.Runtime.Remoting;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+    public sealed class NotifyIcon : Component {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public NotifyIcon()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		//inherited

+		//public IContainer Container {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public ContextMenu ContextMenu {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Icon Icon {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//[MonoTODO]

+		//public override ISite Site {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Visible {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override ObjRef CreateObjRef(Type requestedType)

+		{

+			throw new NotImplementedException ();

+		}

+		//inherited

+		//public void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object GetLifetimeService()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//inherited

+		//public virtual object InitializeLifetimeService()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//inherited

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+		//inherited

+		//public Type GetType()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		[MonoTODO]

+		public event EventHandler Click;

+		//public event EventHandler Disposed;

+		public event EventHandler DoubleClick;

+		public event MouseEventHandler MouseDown;

+		public event MouseEventHandler MouseMove;

+		public event MouseEventHandler MouseUp;

+

+		//

+		//  --- Protected Properties

+		//

+		//[MonoTODO]

+		//protected bool DesignMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected EventHandlerList Events {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//

+		//  --- Protected Methods

+		//

+		//[MonoTODO]

+		//protected virtual void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual object GetService(Type service)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected object MemberwiseClone()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- DeConstructor

+		//

+		[MonoTODO]

+		~NotifyIcon()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/NumericUpDown.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/NumericUpDown.cs
new file mode 100644
index 00000000000..e25a28170ed
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/NumericUpDown.cs
@@ -0,0 +1,1635 @@
+//

+// System.Windows.Forms.NumericUpDown.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class NumericUpDown : UpDownBase, ISupportInitialize {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public NumericUpDown()

+		{

+			throw new NotImplementedException ();

+		}

+//		void UpDownBase.DownButton(){

+		public override void DownButton(){

+			throw new NotImplementedException ();

+		}

+		//

+		//  --- Public Properties

+		//

+

+		[MonoTODO]

+		public int DecimalPlaces  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Hexadecimal  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public decimal Maximum  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public decimal Minimum  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ThousandsSeparator  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public decimal Value  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override void UpButton()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+

+		public event EventHandler ValueChanged;

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected override AccessibleObject CreateAccessibilityInstance() 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnTextBoxKeyPress(object source, KeyPressEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnValueChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected void ParseEditText() 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void UpdateEditText() 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void ValidateEditText() 

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override bool Equals(object o) {

+			throw new NotImplementedException ();

+		}

+		//Inherited/not needed

+		//public static bool Equals(object o1, object o2) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+

+

+		#region Inherited Not Needed

+		////Inherited/not needed

+		//public AccessibleObject AccessibilityObject {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public string AccessibleDefaultActionDescription {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public string AccessibleDescription  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public string AccessibleName  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public AccessibleRole AccessibleRole  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Control ActiveControl  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual bool AllowDrop  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual AnchorStyle Anchor  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual bool AutoScroll  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Size AutoScrollMargin  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Size AutoScrollMinSize  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Point AutoScrollPosition  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual Color BackColor  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual Image BackgroundImage  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual BindingContext BindingContext  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public BorderStyle BorderStyle  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public int Bottom  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Rectangle Bounds  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool CanFocus  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool CanSelect  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool Capture  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool CausesValidation  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Rectangle ClientRectangle  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Size ClientSize  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public string CompanyName  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public IContainer Container  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool ContainsFocus  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual ContextMenu ContextMenu  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Control.ControlCollection Controls  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool Created  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual Cursor Cursor  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public ControlBindingsCollection DataBindings  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual Rectangle DisplayRectangle  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool Disposing  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual DockStyle Dock  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public ScrollableControl.DockPaddingEdges DockPadding  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool Enabled  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual bool Focused  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual Font Font  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual Color ForeColor  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public IntPtr Handle  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool HasChildren  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public int Height  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public ImeMode ImeMode  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public decimal Increment  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool InterceptArrowKeys  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool InvokeRequired  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool IsAccessible  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool IsDisposed  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool IsHandleCreated  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public int Left  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Point Location  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public string Name  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Control Parent  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Form ParentForm  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public int PreferredHeight  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public string ProductName  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public string ProductVersion  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool ReadOnly  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool RecreatingHandle  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Region Region  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public int Right  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public virtual RightToLeft RightToLeft  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public override ISite Site  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Size Size  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public int TabIndex  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool TabStop  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public object Tag  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public HorizontalAlignment TextAlign  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public int Top  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public Control TopLevelControl  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public LeftRightAlignment UpDownAlign  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public bool Visible  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public int Width  {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//public IAsyncResult BeginInvoke(Delegate) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public IAsyncResult BeginInvoke(Delegate, object[]) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void BringToFront() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool Contains(Control ctl) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void CreateControl() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public Graphics CreateGraphics() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual ObjRef CreateObjRef(Type requestedType) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void Dispose() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public DragDropEffects DoDragDrop(object data, DragDropEffects allowedEffects) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public override void DownButton() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object EndInvoke(IAsyncResult asyncResult) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool Equals(object o) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public static bool Equals(object o1, object o2) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public Form FindForm() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool Focus() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public Control GetChildAtPoint(Point pt) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public IContainerControl GetContainerControl() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual int GetHashCode() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object GetLifetimeService() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public Control GetNextControl(Control ctl, bool forward) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public Type GetType() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void Hide() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual object InitializeLifetimeService() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void Invalidate() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void Invalidate(bool) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object Invoke(Delegate) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void PerformLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void PerformLayout(Control ctl, string s) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public Point PointToClient(Point p) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public Point PointToScreen(Point p) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool PreProcessMessage(ref Message msg) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public Rectangle RectangleToClient(Rectangle r) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public Rectangle RectangleToScreen(Rectangle r) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual void Refresh() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual void ResetBackColor() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void ResetBindings() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual void ResetCursor() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual void ResetFont() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual void ResetForeColor() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void ResetImeMode() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual void ResetRightToLeft() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual void ResetText() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void ResumeLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void ResumeLayout(bool b) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void Scale(float flt) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void Scale(float flt, float flt1) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void Select(int x, int y) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void Select() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool SelectNextControl(Control ctl, bool forward, bool tabStopOnly, bool nested, bool wrap) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void SendToBack() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void SetAutoScrollMargin(int x, int y) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void SetBounds(int x, int y, int w, int l) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void SetBounds(int x, int y, int w, int l, BoundsSpecified) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void Show() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void SuspendLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public void Update() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public vool Validate() {

+		//	throw new NotImplementedException ();

+		//}

+

+		//public event EventHandler BackColorChanged;

+		//public event EventHandler BackgroundImageChanged;

+		//public event EventHandler BindingContextChanged;

+		//public event EventHandler CausesValidationChanged;

+		//public event EventHandler Click;

+		//public event EventHandler ContextMenuChanged;

+		//public event EventHandler CursorChanged;

+		//public event EventHandler DockChanged;

+		//public event EventHandler DoubleClick;

+		//public event EventHandler DragLeave;

+		//public event EventHandler EnabledChanged;

+		//public event EventHandler Enter;

+		//public event EventHandler FontChanged;

+		//public event EventHandler ForeColorChanged;

+		//public event EventHandler GotFocus;

+		//public event EventHandler HandleCreated;

+		//public event EventHandler HandleDestroyed;

+		//public event EventHandler ImeModeChanged;

+		//public event EventHandler Leave;

+		//public event EventHandler LocationChanged;

+		//public event EventHandler LostFocus;

+		//public event EventHandler MouseEnter;

+		//public event EventHandler MouseHover;

+		//public event EventHandler MouseLeave;

+		//public event EventHandler Move;

+		//public event EventHandler ParentChanged;

+		//public event EventHandler Resize;

+		//public event EventHandler RightToLeftChanged;

+		//public event EventHandler SizeChanged;

+		//public event EventHandler StyleChanged;

+		//public event EventHandler SystemColorsChanged;

+		//public event EventHandler TabIndexChanged;

+		//public event EventHandler TabStopChanged;

+		//public event EventHandler TextChanged;

+		//public event EventHandler Validated;

+		//public event EventHandler VisibleChanged;

+		//public event CancelEventHandler Validating;

+		//public event QueryAccessibilityHelpEventHandler QueryAccessibilityHelp;

+		//public event QueryContinueDragEventHandler QueryContinueDrag;

+		//public event PaintEventHandler Paint;

+		//public event UICueeEventHandler ChangeUICues;

+		//public event ControlEventHandler ControlAdded;

+		//public event ControlEventHandler ControlRemoved;

+		//public event DragEventHandler DragDrop;

+		//public event DragEventHandler DragEnter;

+		//public event DragEventHandler DragOver;

+		//public event GiveFeedbackEventHandler GiveFeedback;

+		//public event HelpEventHandler HelpRequested;

+		//public event InvalidateEventHandler Invalidated;

+		//public event KeyEventHandler KeyDown;

+		//public event KeyPressEventHandler KeyPress;

+		//public event KeyEventHandler KeyUp;

+		//public event LayoutEventHandler Layout;

+		//public event MouseEventHandler MouseDown;

+		//public event MouseEventHandler MouseMove;

+		//public event MouseEventHandler MouseUp;

+		//public event MouseEventHandler MouseWheel;

+

+		////

+		////  --- Protected Properties

+		////

+		//[MonoTODO]

+		//protected bool ChangingText {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected virtual CreateParame CreateParams {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected virtual ImeMode DefaultImeMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected virtual Size DefaultSize {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected bool DesignMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected EventHandler Events {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected int FontHeight {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected bool HScroll {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected bool ResizeRedraw {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected virtual bool ShowFocusCues {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected bool ShowKeyboardCues {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected bool UserEdit {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//protected bool VScroll {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		////Inherited/not needed

+		//protected ContentAlignment RtlTranslateAlignment(ContentAlignment) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected ContentAlignment RtlTranslateContent(ContentAlignment align) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected HorizontalAlignment RtlTranslateHorizontal(HorizontalAlignment align) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected LeftRightAlignment RtlTranslateLeftRight(LeftRightAlignment align) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void Dispose(bool b) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void Select(bool b, bool b1) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void AccessibilityNotifyClients(AccessibleEvents accEvent, int childID) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void AdjustFormScrollBars(bool displayScrollbars) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual ControlCollection CreateControlsInstance() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void CreateHandle() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void DefWndProc(ref Message m) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void DestroyHandle() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual object GetService(Type service) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected bool GetStyle(ControlStyles flag) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected bool GetTopLevel() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void InitLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void InvokeGotFocus(Control toInvoke, EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void InvokeLostFocus(Control toInvoke, EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void InvokeOnClick(Control toInvoke, EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void InvokePaint(Control c, PaintEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void InvokePaintBackground(Control c, PaintEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual bool IsInputChar(char charCode) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual bool IsInputKey(Keys keyData) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected object MemberwiseClone() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void UpdateStyles() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void UpdateZOrder() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void WndProc(ref Message m) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnBackColorChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnBackgroundImageChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnBindingContextChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnCausesValidationChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnChangeUICues(UICuesEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnClick(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnContextMenuChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnControlAdded(ControlEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnControlRemoved(ControlEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnCreateControl() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnCursorChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnDockChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnDoubleClick(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnDragDrop(DragEventArgs drgevent) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnDragEnter(DragEventArgs drgevent) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnDragLeave(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnDragOver(DragEventArgs drgevent) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnEnabledChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnEnter(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnFontChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnForeColorChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnGiveFeedback(GiveFeedbackEventArgs gfbevent) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnGotFocus(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnHandleCreated(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnHandleDestroyed(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnHelpRequested(HelpEventArgs hevent) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnImeModeChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnInvalidated(InvalidateEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnKeyDown(KeyEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnKeyPress(KeyPressEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnKeyUp(KeyEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnLayout(LayoutEventArgs levent) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnLeave(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnLocationChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnLostFocus(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnMouseDown(MouseEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnMouseEnter(MouseEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnMouseHover(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnMouseLeave(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnMouseMove(MouseEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnMouseUp(MouseEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnMouseWheel(MouseEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnMove(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnNotifyMessage(Message m) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnPaint(PaintEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnPaintBackground(PaintEventArgs pevent) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnParentBackColorChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnParentBackgroundImageChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnParentBindingContextChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnParentChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnParentEnabledChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnParentFontChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnParentForeColorChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnParentRightToLeftChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnParentVisibleChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnQueryContinueDrag(QueryContinueDragEventArgs qcdevent) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnResize(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnRightToLeftChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnSizeChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnStyleChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnSystemColorsChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnTabIndexChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnTabStopChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnTextBoxKeyDown(object source, KeyEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnTextBoxLostFocus(object source, EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnTextBoxResize(object source, EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnTextBoxTextChanged(object source, EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnTextChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnValidated(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnValidating(CancelEventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void OnVisibleChanged(EventArgs e) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void SetClientSizeCore(int x, int y) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual void SetVisibleCore(bool value) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void RecreateHandle() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void SetTopLevel(bool value) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void UpdateBounds() {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void UpdateBounds(int, int, int, int) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected void UpdateBounds(int, int, int, int, int, int) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual bool ProcessCmdKey(ref Message msg, Keys keyData) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual bool ProcessDialogChar(char charCode) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual bool ProcessDialogKey(Keys keyData) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual bool ProcessKeyEventArgs(ref Message m) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual bool ProcessKeyPreview(ref Message m) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual bool ProcessMnemonic(char charCode) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual bool ProcessTabKey(bool forward) {

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected virtual ScaleCore(float dx, float dy)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//[MonoTODO]

+		//protected virtual SetStyle(ControlStyles flag, bool value)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected internal virtual bool ProcessKeyMessage(ref Message m) {

+		//	throw new NotImplementedException ();

+		//}

+		//

+		////

+		////  --- Destructor

+		////

+		////Inherited/not needed

+		//~NumericUpDown() {

+		//	throw new NotImplementedException ();

+		//}

+		

+		#endregion

+		void ISupportInitialize.BeginInit(){

+			throw new NotImplementedException ();

+		}

+		void ISupportInitialize.EndInit(){

+			throw new NotImplementedException ();

+		}

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/OSFeature.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/OSFeature.cs
new file mode 100644
index 00000000000..2a4c7e9519c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/OSFeature.cs
@@ -0,0 +1,95 @@
+//

+// System.Windows.Forms.OSFeature.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+        public class OSFeature : FeatureSupport {

+

+		//

+		//	 --- Public Fields

+		//

+		public static readonly object LayeredWindows;

+		public static readonly object Themes;

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public static OSFeature Feature {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		//public Type GetType()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override Version GetVersionPresent(object feature)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual bool IsPresent(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual bool IsPresent(object o, Version v)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		//protected object MemberwiseClone()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Destructor

+		//

+		[MonoTODO]

+		~OSFeature()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/OpacityConverter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/OpacityConverter.cs
new file mode 100644
index 00000000000..caec41de581
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/OpacityConverter.cs
@@ -0,0 +1,276 @@
+//

+// System.Windows.Forms.OpacityConverter.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class OpacityConverter : TypeConverter {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public OpacityConverter()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		//public bool CanConvertFrom(Type sourceType)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		//public object ConvertFrom(object context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertTo(object context, Type destinationType)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+

+		#region Inherited from bases no implmentation needed

+		////Inherited/not needed

+		//public bool CanConvertTo(Type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object ConvertFromInvariantString(string)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object ConvertFromString(string)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object ConvertFromString(ITypeDescriptorContext, string)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object ConvertFromString(ITypeDescriptorContext, CultureInfo, string)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public string ConvertToInvariantString(object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public string ConvertToInvariantString(ITypeDescriptorContext, object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public string ConvertToString(object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public string ConvertToString(ITypeDescriptorContext, object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public string ConvertToString(ITypeDescriptorContext, CultureInfo, object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public object CreateInstance(IDictionary)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual object CreateInstance(ITypeDescriptorContext, IDictionary)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool Equals(object o)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool GetCreateInstanceSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool GetCreateInstanceSupported(ITypeDescriptorContext)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual int GetHashCode()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public PropertyDescriptorCollection GetProperties(object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public PropertyDescriptorCollection GetProperties(ITypeDescriptorContext, object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual PropertyDescriptorCollection GetProperties(ITypeDescriptorContext, object, Attribute[])

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool GetPropertiesSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool GetPropertiesSupported(ITypeDescriptorContext)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public ICollection GetStandardValues()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual StandardValuesCollection GetStandardValues(ITypeDescriptorContext)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool GetStandardValuesExclusive()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool GetStandardValuesExclusive(ITypeDescriptorContext)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool GetStandardValuesSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool GetStandardValuesSupported(ITypeDescriptorContext)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public Type GetType()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool IsValid(object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool IsValid(ITypeDescriptorContext, object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public bool IsValid(object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual bool IsValid(ITypeDescriptorContext, object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public virtual string ToString()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public override bool CanConvertFrom(ITypeDescriptorContext, Type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public override object ConvertFrom(ITypeDescriptorContext, CultureInfo, object)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//public override object ConvertTo(ITypeDescriptorContext, CultureInfo, object, Type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		////

+		////  --- Protected Methods

+		////

+		////Inherited/not needed

+		//protected Exception GetConvertFromException(object value)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected Exception GetConvertToException(object value, Type destinationType)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Inherited/not needed

+		//protected object MemberwiseClone()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		////Is this a part of this class?

+		////[MonoTODO]

+		////protected PropertyDescriptorCollection {

+		////

+		////	throw new NotImplementedException ();

+		////}

+		////Inherited/not needed

+		////[COMvisible]

+		//protected PropertyDescriptorCollection SortProperties(PropertyDescriptorCollection props, string[] names)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		////

+		////  --- Destructor

+		////

+		////Inherited/not needed

+		//~OpacityConverter()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		#endregion

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/OpenFileDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/OpenFileDialog.cs
new file mode 100644
index 00000000000..b7207925ad5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/OpenFileDialog.cs
@@ -0,0 +1,315 @@
+//

+// System.Windows.Forms.OpenFileDialog.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+using System.IO;

+using System.Runtime.Remoting;

+using System;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public sealed class OpenFileDialog : FileDialog {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public OpenFileDialog() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		//public IContainer Container {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string DefaultExt {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string FileName {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string[] FileNames {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string Filter {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public int FilterIndex {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string InitialDirectory {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual ISite Site {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string Title {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool AddExtension {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//

+		//public override bool CheckPathExists {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//public bool DereferenceLinks {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public bool Multiselect {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ReadOnlyChecked {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//public bool RestoreDirectory {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool ShowHelp {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public bool ShowReadOnly {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//public bool ValidateNames {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public override bool CheckFileExists {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		//inherited

+		//public void Dispose() {

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual ObjRef CreateObjRef(Type requestedType)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		//inherited

+		//public static bool Equals(object o1, object o2) {

+		//	throw new NotImplementedException ();

+		//}

+		//public Type GetType() {

+		//	throw new NotImplementedException ();

+		//}

+		//public object GetLifetimeService() {

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual object InitializeLifetimeService() {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public Stream OpenFile() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override void Reset() {

+			throw new NotImplementedException ();

+		}

+		//public DialogResult ShowDialog() {

+		//	throw new NotImplementedException ();

+		//}

+		

+		//public DialogResult ShowDialog(IWin32Window owner) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override string ToString() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		//inherited

+		//public event EventHandler Disposed; 

+		//public event CancelEventHandler FileOk;

+		//public event EventHandler HelpRequest;

+

+		//

+		//  --- Protected Properties

+		//

+

+		//protected bool DesignMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected EventHandlerList Events {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//

+		//  --- Protected Methods

+		//

+		//[MonoTODO]

+		//protected virtual void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual void OnHelpRequest(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual object GetService(Type service)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual IntPtr HookProc(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual IntPtr OwnerWndProc(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected object MemberwiseClone()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected void OnFileOk(CancelEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected abstract bool RunDialog(IntPtr hwndOwner)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Destructor

+		//

+		[MonoTODO]

+		~OpenFileDialog() {

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Orientation.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Orientation.cs
new file mode 100644
index 00000000000..eff93094a95
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Orientation.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.Orientation.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum Orientation {

+		Horizontal = 0,

+		Vertical = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PageSetupDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PageSetupDialog.cs
new file mode 100644
index 00000000000..a62a2f20b64
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PageSetupDialog.cs
@@ -0,0 +1,259 @@
+//

+// System.Windows.Forms.PageSetupDialog.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing.Printing;

+using System.Runtime.Remoting;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+        public sealed class PageSetupDialog : CommonDialog {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public PageSetupDialog()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public bool AllowMargins {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AllowOrientation {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AllowPaper {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AllowPrinter {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowHelp {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowNetwork {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		//public IContainer Container {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public PrintDocument Document {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Margins MinMargins {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public PageSettings PageSettings {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public PrinterSettings PrinterSettings {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//public virtual ISite Site {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//

+		//  --- Public Methods

+		//

+		//public virtual ObjRef CreateObjRef(Type requestedType)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+	

+		//public object GetLifetimeService()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public Type GetType()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual object InitializeLifetimeService()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override void Reset()

+		{

+			throw new NotImplementedException ();

+		}

+		//public DialogResult ShowDialog()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public DialogResult ShowDialog(IWin32Window owner)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Public Events

+		//

+		//public event EventHandler Disposed;

+		//public event EventHandler HelpRequest;

+

+		//

+		//  --- Protected Properties

+		//

+		//protected bool DesignMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected EventHandlerList Events {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//

+		//  --- Protected Methods

+		//

+		//[MonoTODO]

+		//protected virtual void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual void OnHelpRequest(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual object GetService(Type service)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual IntPtr HookProc(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual IntPtr OwnerWndProc(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected object MemberwiseClone()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override bool RunDialog(IntPtr hwndOwner)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Destructor

+		//

+		[MonoTODO]

+		~PageSetupDialog()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PaintEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PaintEventArgs.cs
new file mode 100644
index 00000000000..773c2abe008
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PaintEventArgs.cs
@@ -0,0 +1,146 @@
+//

+// System.Windows.Forms.PaintEventArgs.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Dennis Hayes (dennish@raytek.com)

+//  Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class PaintEventArgs : EventArgs, IDisposable {

+

+		#region Fields

+

+			private Graphics mgraphics;

+			private Rectangle mclipRect;

+

+		#endregion

+

+

+		public PaintEventArgs(Graphics graphics, Rectangle clipRect )

+		{

+				this.mgraphics = graphics;

+				this.mclipRect = clipRect;

+		}

+

+		

+		#region Public Properties

+		public Rectangle ClipRectangle 

+		{

+			get {

+				return mclipRect;

+			}

+		}

+		

+		public Graphics Graphics {

+			get {

+				return mgraphics;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		[MonoTODO]

+		public void Dispose()

+		{

+			throw new NotImplementedException ();

+		}

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two PaintEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Graphics and ClipRectangle Property

+		///	of the two PaintEventArgs.

+		/// </remarks>

+		public static bool operator == (PaintEventArgs PaintEventArgsA, PaintEventArgs PaintEventArgsB) 

+		{

+			return (PaintEventArgsA.Graphics == PaintEventArgsB.Graphics) && (PaintEventArgsA.ClipRectangle == PaintEventArgsB.ClipRectangle);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two PaintEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Graphics and ClipRectangle Property

+		///	of the two PaintEventArgs.

+		/// </remarks>

+		public static bool operator != (PaintEventArgs PaintEventArgsA, PaintEventArgs PaintEventArgsB) 

+		{

+			return (PaintEventArgsA.Graphics != PaintEventArgsB.Graphics) || (PaintEventArgsA.ClipRectangle != PaintEventArgsB.ClipRectangle);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	PaintEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is PaintEventArgs))return false;

+			return (this == (PaintEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+		#endregion

+

+		#region Protected Methods

+

+		[MonoTODO]

+		protected virtual void Dispose(bool disposing)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		#endregion

+

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PaintEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PaintEventHandler.cs
new file mode 100644
index 00000000000..565f768af61
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PaintEventHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.PaintEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the Paint event of a Control class.

+	/// </summary>

+	//[Serializable]

+	public delegate void PaintEventHandler(object sender, PaintEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Panel.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Panel.cs
new file mode 100644
index 00000000000..90fe9d803a8
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Panel.cs
@@ -0,0 +1,1281 @@
+//

+// System.Windows.Forms.Panel.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+using System.Runtime.Remoting;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class Panel : ScrollableControl {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public Panel() {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		//inherited

+		//public AccessibleObject AccessibilityObject {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string AccessibleDefaultActionDescription {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string AccessibleDescription {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string AccessibleName {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public AccessibleRole AccessibleRole {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual bool AllowDrop {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual bool AutoScroll {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual AnchorStyles Anchor {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Size AutoScrollMargin {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Size AutoScrollMinSize {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Point AutoScrollPosition {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual Color BackColor {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual Image BackgroundImage {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual BindingContext BindingContext {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public BorderStyle BorderStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//public int Bottom {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Rectangle Bounds {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool CanFocus {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool CanSelect {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool Capture {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool CausesValidation {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Rectangle ClientRectangle {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Size ClientSize {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string CompanyName {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public IContainer Container {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool ContainsFocus {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//[MonoTODO]

+		//public override bool Equals(object o) {

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual ContextMenu ContextMenu {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Control.ControlCollection Controls {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool Created {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual Cursor Cursor {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public ControlBindingsCollection DataBindings {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		//public virtual Rectangle DisplayRectangle {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual DockStyle Dock {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}	

+		//public bool Disposing {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public ScrollableControl.DockPaddingEdges DockPadding {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool Enabled {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual bool Focused {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual Font Font {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual Color ForeColor {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public IntPtr Handle {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool HasChildren {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public int Height {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public ImeMode ImeMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool InvokeRequired {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool IsAccessible {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool IsDisposed {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool IsHandleCreated {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public int Left {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Point Location {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string Name {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Control Parent {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string ProductName {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public string ProductVersion {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool RecreatingHandle {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Region Region {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public int Right {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public virtual RightToLeft RightToLeft {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+

+

+		[MonoTODO]

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//public int TabIndex {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public object Tag {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public override string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//inherited

+		//public int Top {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public Control TopLevelControl {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public bool Visible {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//public int Width {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//

+		//  --- Public Methods

+		//

+		//inherited

+		//public IAsyncResult BeginInvoke(Delegate method) {

+		//	throw new NotImplementedException ();

+		//}

+		//public IAsyncResult BeginInvoke(Delegate method, object[] args) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void BringToFront() {

+		//	throw new NotImplementedException ();

+		//}

+		//public bool Contains(Control ctl) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void CreateControl() {

+		//	throw new NotImplementedException ();

+		//}

+		//public Graphics CreateGraphics() {

+		//	throw new NotImplementedException ();

+		//}

+

+		//public virtual ObjRef CreateObjRef(Type requestedType)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Dispose() {

+		//	throw new NotImplementedException ();

+		//}

+		//public DragDropEffects DoDragDrop(object data, DragDropEffects allowedEffects) {

+		//	throw new NotImplementedException ();

+		//}

+		//public object EndInvoke(IAsyncResult asyncResult) {

+		//	throw new NotImplementedException ();

+		//}

+		//public static bool Equals(object o1, object o2) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		//public Form FindForm() {

+		//			throw new NotImplementedException ();

+		//		}

+		//public bool Focus() {

+		//	throw new NotImplementedException ();

+		//}

+		//public Control GetChildAtPoint(Point pt) {

+		//	throw new NotImplementedException ();

+		//}

+		//public IContainerControl GetContainerControl() {

+		//	throw new NotImplementedException ();

+		//}

+		//public object GetLifetimeService() {

+		//	throw new NotImplementedException ();

+		//}

+		//public object GetNextControl(Control ctl, bool forward) {

+		//	throw new NotImplementedException ();

+		//}

+		//public Type GetType() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Hide() {

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual object InitializeLifetimeService()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(bool invalidateChildren)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout(Control affectedControl, string affectedProperty)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public Point PointToClient(Point p)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public Point PointToScreen(Point p)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual bool PreProcessMessage(ref Message msg)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public Rectangle RectangleToClient(Rectangle r)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public Rectangle RectangleToScreen(Rectangle r)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual void Refresh()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual void ResetBackColor()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResetBindings()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual void ResetCursor()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual void ResetFont()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual void ResetForeColor()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResetImeMode()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual void ResetRightToLeft()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual void ResetText()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout(bool performLayout) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float ratio) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float dx, float dy) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select() {

+		//	throw new NotImplementedException ();

+		//}

+		//public bool SelectNextControl(Control ctl, bool forward, bool tabStopOnly,bool nested, bool wrap) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void SendToBack() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetAutoScrollMargin(int x, int y) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int x, int y, int width, int height) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int x, int y, int width, int height, BoundsSpecified specified) {

+		//	throw new NotImplementedException ();

+		//}

+		//public void Show() {

+		//	throw new NotImplementedException ();

+		//}

+		//public void SuspendLayout() {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override string ToString() {

+			throw new NotImplementedException ();

+		}

+		//public void Update() {

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Public Events

+		//

+		//inherited

+		//public event EventHandler BackColorChanged;

+		//public event EventHandler BackgroundImageChanged;

+		//public event EventHandler BindingContextChanged;

+		//public event EventHandler CausesValidationChanged;

+		//public event EventHandler Click;

+		//public event EventHandler ContextMenuChanged;

+		//public event EventHandler CursorChanged;

+		//public event EventHandler Disposed;

+		//public event EventHandler DockChanged;

+		//public event EventHandler DoubleClick;

+		//public event EventHandler DragLeave;

+		//public event EventHandler EnabledChanged;

+		//public event EventHandler Enter;

+		//public event EventHandler FontChanged;

+		//public event EventHandler ForeColorChanged;

+		//public event EventHandler GotFocus;

+		//public event EventHandler HandleCreated;

+		//public event EventHandler HandleDestroyed;

+		//public event EventHandler ImeModeChanged;

+		//public event EventHandler Leave;

+		//public event EventHandler LocationChanged;

+		//public event EventHandler LostFocus;

+		//public event EventHandler MouseEnter;

+		//public event EventHandler MouseHover;

+		//public event EventHandler MouseLeave;

+		//public event EventHandler Move;

+		//public event EventHandler ParentChanged;

+		//public event EventHandler Resize;

+		//public event EventHandler RightToLeftChanged;

+		//public event EventHandler SizeChanged;

+		//public event EventHandler StyleChanged;

+		//public event EventHandler SystemColorsChanged;

+		//public event EventHandler TabIndexChanged;

+		//public event EventHandler TabStopChanged;

+		//public event EventHandler TextChanged;

+		//public event EventHandler Validated;

+		//public event EventHandler VisibleChanged;

+		//public UICuesEventHandler ChangeUICues;

+		//public ControlEventHandler ControlAdded;

+		//public ControlEventHandler ControlRemoved;

+		//public DragEventHandler DragDrop;

+		//public DragEventHandler DragEnter;

+		//public DragEventHandler DragOver;

+		//public GiveFeedbackEventHandler GiveFeedback;

+		//public HelpEventHandler HelpRequested;

+		//public InvalidateEventHandler Invalidated;

+		//public LayoutEventHandler Layout;

+		//public MouseEventHandler MouseDown;

+		//public MouseEventHandler MouseMove;

+		//public MouseEventHandler MouseUp;

+		//public MouseEventHandler MouseWheel;

+		//public PaintEventHandler Paint;

+		//public QueryAccessibilityHelpEventHandler QueryAccessibilityHelp;

+		//public QueryContinueDragEventHandler QueryContinueDrag;

+		//public CancelEventHandler Validating;

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		//protected virtual ImeMode DefaultImeMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		//inherited

+		//protected bool DesignMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected EventHandlerList Events {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected int FontHeight {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected bool HScroll {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected bool ResizeRedraw {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected override bool ShowFocusCues {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected bool ShowKeyboardCues {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected bool VScroll {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected override void OnResize(EventArgs eventargs) {

+			throw new NotImplementedException ();

+		}		//inherited

+		//protected virtual void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void Select(bool directed, bool forward)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void AccessibilityNotifyClients(AccessibleEvents accEvent, int childID)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//inherited

+		//protected virtual void AdjustFormScrollbars(bool displayScrollbars)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual AccessibleObject CreateAccessibilityInstance()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual ControlCollection CreateControlsInstance()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void CreateHandle()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void DefWndProc(ref Message m)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void DestroyHandle()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual object GetService(Type service)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected bool GetStyle(ControlStyles flag)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected bool GetTopLevel()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void InitLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void InvokeGotFocus(Control toInvoke, EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void InvokeLostFocus(Control toInvoke, EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void InvokeOnClick(Control toInvoke, EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void InvokePaint(Control c, PaintEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void InvokePaintBackground(Control c, PaintEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual bool IsInputChar(char charCode)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual bool IsInputKey(Keys keyData)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnBackColorChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnBackgroundImageChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnBindingContextChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnCausesValidationChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnChangeUICues(UICuesEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnClick(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnContextMenuChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnControlAdded(ControlEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnControlRemoved(ControlEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnCreateControl()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnCursorChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnDockChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnDoubleClick(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnDragDrop(DragEventArgs drgevent)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnDragEnter(DragEventArgs drgevent)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnDragLeave(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnDragOver(DragEventArgs drgevent)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnEnabledChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnEnter(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnFontChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnForeColorChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnGiveFeedback(GiveFeedbackEventArgs gfbevent)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnGotFocus(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnHandleCreated(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnHandleDestroyed(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnHelpRequested(HelpEventArgs hevent)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnImeModeChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnInvalidated(InvalidateEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnKeyDown(KeyEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnKeyPress(KeyPressEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnKeyUp(KeyEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnLayout(LayoutEventArgs levent)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnLeave(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnLocationChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnLostFocus(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnMouseDown(MouseEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnMouseEnter(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnMouseHover(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnMouseLeave(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnMouseMove(MouseEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnMouseUp(MouseEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnMouseWheel(MouseEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnMove(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnNotifyMessage(Message m)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnPaint(PaintEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnPaintBackground(PaintEventArgs pevent)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnParentBackColorChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnParentBackgroundImageChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnParentBindingContextChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnParentChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnParentEnabledChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnParentFontChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnParentForeColorChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnParentRightToLeftChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnParentVisibleChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnQueryContinueDrag(QueryContinueDragEventArgs qcdevent)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnRightToLeftChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnSizeChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnStyleChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnSystemColorsChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnTabIndexChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnTabStopChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnTextChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnValidated(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnValidating(CancelEventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void OnVisibleChanged(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual bool ProcessCmdKey(ref Message msg, Keys keyData)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual bool ProcessDialogChar(char charCode)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual bool ProcessDialogKey(Keys keyData)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual bool ProcessKeyEventArgs(ref Message m)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected internal virtual bool ProcessKeyMessage(ref Message m)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual bool ProcessKeyPreview(ref Message m)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual bool ProcessMnemonic(char charCode)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void RecreateHandle()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected ContentAlignment RtlTranslateAlignment(ContentAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected ContentAlignment RtlTranslateContent(ContentAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected HorizontalAlignment RtlTranslateHorizontal(HorizontalAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected LeftRightAlignment RtlTranslateLeftRight(LeftRightAlignment align)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void ScaleCore(float dx, float dy)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void SetBoundsCore(int x, int y, int width, int height,BoundsSpecified specified)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void SetClientSizeCore(int x, int y)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void SetStyle(ControlStyles flag, bool value)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void SetTopLevel(bool value)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void SetVisibleCore(bool value)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int x, int y, int width, int height)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int x, int y, int width, int height, int clientWidth, int clientHeight)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateStyles()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateZOrder()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void WndProc(ref Message m)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		// -- Destructor

+		//

+

+		[MonoTODO]

+		~Panel() {

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PictureBoxSizeMode.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PictureBoxSizeMode.cs
new file mode 100644
index 00000000000..4dd862756a5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PictureBoxSizeMode.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.PictureBoxSizeMode.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum PictureBoxSizeMode {

+		AutoSize = 2,

+		CenterImage = 3,

+		Normal = 0,

+		StretchImage = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintControllerWithStatusDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintControllerWithStatusDialog.cs
new file mode 100644
index 00000000000..bcaa85033a2
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintControllerWithStatusDialog.cs
@@ -0,0 +1,99 @@
+//

+// System.Windows.Forms.PrintControllerWithStatusDialog

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing.Printing;

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+        public class PrintControllerWithStatusDialog : PrintController {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+			public PrintControllerWithStatusDialog(PrintController underlyingController)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+			public PrintControllerWithStatusDialog(PrintController underlyingController, string dialogTitle)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		//public Type GetType()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override void OnEndPage(PrintDocument document, PrintPageEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override void OnEndPrint(PrintDocument document, PrintEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override Graphics OnStartPage(PrintDocument document, PrintPageEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override void OnStartPrint(PrintDocument document, PrintEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		//protected object MemberwiseClone()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Destructor

+		//

+		[MonoTODO]

+		~PrintControllerWithStatusDialog()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintDialog.cs
new file mode 100644
index 00000000000..c4e145ce51a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintDialog.cs
@@ -0,0 +1,246 @@
+//

+// System.Windows.Forms.PrintDialog

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing.Printing;

+using System.Runtime.Remoting;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+        public sealed class PrintDialog : CommonDialog {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public PrintDialog()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public bool AllowPrintToFile {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AllowSelection {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AllowSomePages {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//public IContainer Container {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		[MonoTODO]

+		public PrintDocument Document {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public PrinterSettings PrinterSettings {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool PrintToFile {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowHelp {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowNetwork {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//public virtual ISite Site {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//inherited

+		//public virtual ObjRef CreateObjRef(Type requestedType)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public Type GetType()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+		//public object GetLifetimeService()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual object InitializeLifetimeService()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override void Reset()

+		{

+			throw new NotImplementedException ();

+		}

+		//public DialogResult ShowDialog()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public DialogResult ShowDialog(IWin32Window owner)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Public Events

+		//

+		//inherited

+		//public event EventHandler Disposed;

+		//public event EventHandler HelpRequest;

+

+		//

+		//  --- Protected Properties

+		//

+		//protected bool DesignMode {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		//protected EventHandlerList Events {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		//

+		//  --- Protected Methods

+		//

+		//[MonoTODO]

+		//protected virtual void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual object GetService(Type service)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual IntPtr HookProc(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected object MemberwiseClone()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual void OnHelpRequest(EventArgs e)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//[MonoTODO]

+		//protected virtual IntPtr OwnerWndProc(IntPtr hWnd, int msg, IntPtr wparam, IntPtr lparam)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override bool RunDialog(IntPtr hwndOwner)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Destructor

+		//

+		[MonoTODO]

+		~PrintDialog()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintPreviewControl.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintPreviewControl.cs
new file mode 100644
index 00000000000..ab1beb4cf88
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintPreviewControl.cs
@@ -0,0 +1,167 @@
+//

+// System.Windows.Forms.PrintPreviewControl

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+using System.Drawing.Printing;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// The raw "preview" part of print previewing, without any dialogs or buttons. Most PrintPreviewControl objects are found on PrintPreviewDialog objects, but they do not have to be.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class PrintPreviewControl : Control {

+

+		#region Fields

+		bool autoZoom;

+		int columns;

+		PrintDocument document;

+		int rows;

+		int startPage;

+		bool useAntiAlias;

+		double zoom;

+		#endregion

+		

+		

+		

+		

+		#region Constructors

+		[MonoTODO]

+		public PrintPreviewControl() 

+		{

+			autoZoom=true;

+			columns=1;

+			document=null;

+			rows=0;

+			startPage=0;

+			zoom=1.0;

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		

+		#region Properties

+		public bool AutoZoom {

+			get { return autoZoom; }

+			set { autoZoom=value; }

+		}

+		

+		public int Columns {

+			get { return columns; }

+			set { columns=value; }

+		}

+

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get { throw new NotImplementedException (); }

+		}

+

+		public PrintDocument Document {

+			get { return document; }

+			set { document=value; }

+		}

+		

+		public int Rows {

+			get { return rows; }

+			set { rows=value; }

+		}

+		

+		public int StartPage {

+			get { return startPage; }

+			set { startPage=value; }

+		}

+		

+		[MonoTODO]

+		public override string Text {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public bool UseAntiAlias {

+			get { return useAntiAlias; }

+			set { useAntiAlias=value; }

+		}

+		

+		public double Zoom {

+			get { return zoom; }

+			set { zoom=value; }

+		}

+		#endregion

+		

+		

+		

+		

+		#region Methods

+		[MonoTODO]

+		public void InvalidatePreview() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnPaint(PaintEventArgs pevent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnResize(EventArgs eventargs) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnStartPageChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void ResetBackColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void ResetForeColor() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void WndProc(ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		

+		#region Events

+		[MonoTODO]

+		public event EventHandler StartPageChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintPreviewDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintPreviewDialog.cs
new file mode 100644
index 00000000000..29a68510c8d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PrintPreviewDialog.cs
@@ -0,0 +1,384 @@
+//

+// System.Windows.Forms.PrintPreviewDialog

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+using System.Drawing.Printing;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents a dialog box form that contains a PrintPreviewControl.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class PrintPreviewDialog : Form {

+

+		#region Fields

+		IButtonControl acceptButton;

+		string accessibleDescription;

+		string accessibleName;

+		AccessibleRole accessibleRole;

+		bool autoScale;

+		Size autoScrollMargin;

+		Size autoScrollMinSize;

+		bool causesValidation;

+		bool controlBox;

+		ControlBindingsCollection dataBindings;

+		PrintDocument document;

+		bool enabled;

+		FormBorderStyle formBorderStyle;

+		bool helpButton;

+		Icon icon;

+		ImeMode imeMode;

+		bool isMdiContainer;

+		bool keyPreview;

+		Point location;

+		bool maximizeBox;

+		Size maximumSize;

+		MainMenu menu;

+		bool minimizeBox;

+		Size minimumSize;

+		PrintPreviewControl printPreviewControl;

+		bool showInTaskbar;

+		Size size;

+		FormStartPosition startPosition;

+		bool tabStop;

+		object tag;

+		bool topMost;

+		Color transparencyKey;

+		bool useAntiAlias;

+		bool visible;

+		FormWindowState windowState;

+		#endregion

+

+

+

+

+		#region Constructor

+		[MonoTODO]

+		public PrintPreviewDialog() 

+		{

+			document=null;

+			

+			accessibleDescription=null;

+			accessibleName=null;

+			accessibleRole=AccessibleRole.Default;

+			autoScale=true;

+			controlBox=true;

+			enabled=true;

+			helpButton=false;

+			imeMode=ImeMode.Inherit;

+			isMdiContainer=false;

+			keyPreview=false;

+			maximizeBox=true;

+			minimizeBox=true;

+			showInTaskbar=true;

+			tabStop=true;

+			tag=null;

+			topMost=false;

+			visible=true;

+			windowState=FormWindowState.Normal;

+			

+			throw new NotImplementedException ();

+		}

+		#endregion

+

+

+

+

+		#region Properties

+		public new IButtonControl AcceptButton {

+			get { return acceptButton; }

+			set { acceptButton=value; }

+		}

+		

+		public new string AccessibleDescription {

+			get { return accessibleDescription; }

+			set { accessibleDescription=value; }

+		}

+		

+		public new string AccessibleName {

+			get { return accessibleName; }

+			set { accessibleName=value; }

+		}

+		

+		public new AccessibleRole AccessibleRole {

+			get { return accessibleRole; }

+			set { accessibleRole=value; }

+		}

+		

+		[MonoTODO]

+		public override bool AllowDrop {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override AnchorStyles Anchor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public new bool AutoScale {

+			get { return autoScale; }

+			set { autoScale=value; }

+		}

+		

+		[MonoTODO]

+		public override Size AutoScaleBaseSize {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override bool AutoScroll {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public new Size AutoScrollMargin {

+			get { return autoScrollMargin; }

+			set { autoScrollMargin=value; }

+		}

+		

+		public new Size AutoScrollMinSize {

+			get { return autoScrollMinSize; }

+			set { autoScrollMinSize=value; }

+		}

+		

+		[MonoTODO]

+		public override Color BackColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new IButtonControl CancelButton {get; set;}

+		

+		public new bool CausesValidation {

+			get { return causesValidation; }

+			set { causesValidation=value; }

+		}

+		

+		[MonoTODO]

+		public override ContextMenu ContextMenu {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public new bool ControlBox {

+			get { return controlBox; }

+			set { controlBox=value; }

+		}

+		

+		[MonoTODO]

+		public override Cursor Cursor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public new ControlBindingsCollection DataBindings {

+			get { return dataBindings; }

+			set { dataBindings=value; }

+		}

+		

+		[MonoTODO]

+		public override DockStyle Dock {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new ScrollableControl.DockPaddingEdges DockPadding {get;}

+		

+		public PrintDocument Document {

+			get { return document; }

+			set { document=value; }

+		}

+		

+		public new bool Enabled {

+			get { return enabled; }

+			set { enabled=value; }

+		}

+		

+		[MonoTODO]

+		public override Font Font {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Color ForeColor  {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public new FormBorderStyle FormBorderStyle {

+			get { return formBorderStyle; }

+			set { formBorderStyle=value; }

+		}

+		

+		public new bool HelpButton {

+			get { return helpButton; }

+			set { helpButton=value; }

+		}

+		

+		public new Icon Icon {

+			get { return icon; }

+			set { icon=value; }

+		}

+		

+		public new ImeMode ImeMode {

+			get { return imeMode; }

+			set { imeMode=value; }

+		}

+		

+		public bool IsMdiContainer {

+			get { return isMdiContainer; }

+			set { isMdiContainer=value; }

+		}

+		

+		public new bool KeyPreview {

+			get { return keyPreview; }

+			set { keyPreview=value; }

+		}

+		

+		public new Point Location {

+			get { return location; }

+			set { location=value; }

+		}

+		

+		public new bool MaximizeBox {

+			get { return maximizeBox; }

+			set { maximizeBox=value; }

+		}

+		

+		public new Size MaximumSize {

+			get { return maximumSize; }

+			set { maximumSize=value; }

+		}

+		

+		public new MainMenu Menu {

+			get { return menu; }

+			set { menu=value; }

+		}

+		

+		public new bool MinimizeBox {

+			get { return minimizeBox; }

+			set { minimizeBox=value; }

+		}

+		

+		public new Size MinimumSize {

+			get { return minimumSize; }

+			set { minimumSize=value; }

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new double Opacity {get; set;}

+		

+		public PrintPreviewControl PrintPreviewControl {

+			get { return printPreviewControl; }

+			set { printPreviewControl=value; }

+		}

+		

+		[MonoTODO]

+		public override RightToLeft RightToLeft {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public new bool ShowInTaskbar {

+			get { return showInTaskbar; }

+			set { showInTaskbar=value; }

+		}

+		

+		public new Size Size {

+			get { return size; }

+			set { size=value; }

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new SizeGripStyle SizeGripStyle {get; set;}

+		

+		public new FormStartPosition StartPosition {

+			get { return startPosition; }

+			set { startPosition=value; }

+		}

+		

+		public new bool TabStop {

+			get { return tabStop; }

+			set { tabStop=value; }

+		}

+		

+		public new object Tag {

+			get { return tag; }

+			set { tag=value; }

+		}

+		

+		[MonoTODO]

+		public override string Text {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public new bool TopMost {

+			get { return topMost; }

+			set { topMost=value; }

+		}

+		

+		public new Color TransparencyKey {

+			get { return transparencyKey; }

+			set { transparencyKey=value; }

+		}

+		

+		public bool UseAntiAlias {

+			get { return useAntiAlias; }

+			set { useAntiAlias=value; }

+		}

+		

+		public new bool Visible {

+			get { return visible; }

+			set { visible=value; }

+		}

+		

+		public new FormWindowState WindowState {

+			get { return windowState; }

+			set { windowState=value; }

+		}

+		#endregion

+

+

+

+

+		#region Methods

+		[MonoTODO]

+		protected override void CreateHandle() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnClosing(CancelEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ProgressBar.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ProgressBar.cs
new file mode 100644
index 00000000000..c8a8b6a58a6
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ProgressBar.cs
@@ -0,0 +1,190 @@
+//

+// System.Windows.Forms.ProgressBar

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+using System.Drawing.Printing;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents a Windows progress bar control.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public sealed class ProgressBar : Control {

+

+		#region Fields

+		int maximum;

+		int minimum;

+		int step;

+		int value;

+		#endregion

+		

+		

+		

+		

+		#region Constructor

+		[MonoTODO]

+		public ProgressBar() 

+		{

+			maximum=100;

+			minimum=0;

+			step=10;

+			value=0;

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		

+		#region Properties

+		[MonoTODO]

+		public override bool AllowDrop {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Color BackColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new bool CausesValidation {get; set;}

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get { throw new NotImplementedException (); }

+		}

+

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Font Font {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Color ForeColor  {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new ImeMode ImeMode {get; set;}

+		

+		public int Maximum {

+			get { return maximum; }

+			set { maximum=value; }

+		}

+		

+		public int Minimum {

+			get { return minimum; }

+			set { minimum=value; }

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new bool TabStop {get; set;}

+		[MonoTODO]

+		public override RightToLeft RightToLeft {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public int Step {

+			get { return step; }

+			set { step=value; }

+		}

+		

+		[MonoTODO]

+		public override string Text {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public int Value {

+			get { return value; }

+			set { value=value; }

+		}

+		#endregion

+		

+		

+		

+		

+		#region Methods

+		[MonoTODO]

+		protected override void CreateHandle() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Increment(int value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void PerformStep() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		

+		#region Events

+		/*

+		 * This member supports the .NET Framework infrastructure and is not intended to be used directly from your code:

+		 public new event EventHandler DoubleClick;

+		 public new event EventHandler Enter;

+		 public new event KeyEventHandler KeyDown;

+		 public new event KeyPressEventHandler KeyPress;

+		 public new event KeyEventHandler KeyUp;

+		 public new event EventHandler Leave;

+		 public new event PaintEventHandler Paint;

+		*/

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyGrid.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
new file mode 100644
index 00000000000..42d214aa9af
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyGrid.cs
@@ -0,0 +1,526 @@
+//

+// System.Windows.Forms.PropertyGrid

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Drawing;

+//using System.Drawing.Printing;

+using System.ComponentModel;

+using System.Collections;

+//using System.Windows.Forms.Design;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides a user interface for browsing the properties of an object.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class PropertyGrid : ContainerControl {

+

+		#region Fields

+		AttributeCollection browsableAttributes;

+		Color commandsBackColor;

+		Color commandsForeColor;

+		bool commandsVisibleIfAvailable;

+		Color helpBackColor;

+		Color helpForeColor;

+		bool helpVisible;

+		bool largeButtons;

+		Color lineColor;

+		PropertySort propertySort;

+		bool toolbarVisible;

+		Color viewBackColor;

+		Color viewForeColor;

+		#endregion

+		

+		

+		

+		

+		#region Constructors

+		[MonoTODO]

+		public PropertyGrid() 

+		{

+			browsableAttributes = new AttributeCollection( 

+			 new Attribute[] {BrowsableAttribute.Yes} //Attribute[] attributes

+			);

+			commandsBackColor=SystemColors.Control;

+			commandsForeColor=SystemColors.ControlText;

+			commandsVisibleIfAvailable=false;

+			helpBackColor=SystemColors.Control;

+			helpForeColor=SystemColors.ControlText;

+			helpVisible=true;

+			largeButtons=false;

+			lineColor=SystemColors.ScrollBar;

+			propertySort=PropertySort.Categorized;// OR PropertySort.Alphabetical;

+			toolbarVisible=true;

+			viewBackColor=SystemColors.Window;

+			viewForeColor=SystemColors.WindowText;

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		

+		#region Properties

+		[MonoTODO]

+		public override bool AutoScroll {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Color BackColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public AttributeCollection BrowsableAttributes {

+			get { return browsableAttributes; }

+			set {

+				if (value==null || value==AttributeCollection.Empty) {

+					browsableAttributes=new AttributeCollection( 

+						new Attribute[] {BrowsableAttribute.Yes} //Attribute[] attributes

+					);

+				}

+				else {

+					browsableAttributes=value;

+				}

+			}

+		}

+		

+		[MonoTODO]

+		public virtual bool CanShowCommands {

+			get { throw new NotImplementedException (); }

+		}

+		

+		public Color CommandsBackColor {

+			get { return commandsBackColor; }

+			set { commandsBackColor=value; }

+		}

+		

+		public Color CommandsForeColor {

+			get { return commandsForeColor; }

+			set { commandsForeColor=value; }

+		}

+		

+		[MonoTODO]

+		public virtual bool CommandsVisible {

+			get { throw new NotImplementedException (); }

+		}

+		

+		public virtual bool CommandsVisibleIfAvailable {

+			get { return commandsVisibleIfAvailable; }

+			set { commandsVisibleIfAvailable=value; }

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// public new Control.ControlCollection Controls {get;}

+		

+		[MonoTODO]

+		public Point ContextMenuDefaultLocation {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		protected virtual Type DefaultTabType {

+			get { throw new NotImplementedException (); }

+		}

+		

+		/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+		/// protected bool DrawFlatToolbar {get; set;}

+		

+		[MonoTODO]

+		public override Color ForeColor {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public Color HelpBackColor {

+			get { return helpBackColor; }

+			set { helpBackColor=value; }

+		}

+		

+		public Color HelpForeColor {

+			get { return helpForeColor; }

+			set { helpForeColor=value; }

+		}

+		

+		public virtual bool HelpVisible {

+			get { return helpVisible; }

+			set { helpVisible=value; }

+		}

+		

+		public bool LargeButtons {

+			get { return largeButtons; }

+			set { largeButtons=value; }

+		}

+		

+		public Color LineColor {

+			get { return lineColor; }

+			set { lineColor=value; }

+		}

+		

+		public PropertySort PropertySort {

+			get { return propertySort; }

+			set { propertySort=value; }

+		}

+		

+		[MonoTODO]

+		public PropertyGrid.PropertyTabCollection PropertyTabs {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public GridItem SelectedGridItem {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public object SelectedObject {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public object[] SelectedObjects {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+//		[MonoTODO]

+//		public PropertyTab SelectedTab {

+//			get { throw new NotImplementedException (); }

+//		}

+		

+		[MonoTODO]

+		protected override bool ShowFocusCues {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override ISite Site {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		public virtual bool ToolbarVisible {

+			get { return toolbarVisible; }

+			set { toolbarVisible=value; }

+		}

+		

+		public Color ViewBackColor {

+			get { return viewBackColor; }

+			set { viewBackColor=value; }

+		}

+		

+		public Color ViewForeColor {

+			get { return viewForeColor; }

+			set { viewForeColor=value; }

+		}

+		#endregion

+		

+		

+		

+		

+		#region Methods

+		[MonoTODO]

+		public void CollapseAllGridItems() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+//		[MonoTODO]

+//		protected virtual PropertyTab CreatePropertyTab(Type tabType) {

+//			throw new NotImplementedException ();

+//		}

+		

+		//inherited

+		//protected override void Dispose(bool disposing) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		public void ExpandAllGridItems() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnGotFocus(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnHandleDestroyed(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMouseDown(MouseEventArgs me) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMouseMove(MouseEventArgs me) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnMouseUp(MouseEventArgs me) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnPaint(PaintEventArgs pevent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnPropertyTabChanged(PropertyTabChangedEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnPropertyValueChanged(PropertyValueChangedEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnResize(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnSelectedGridItemChanged(SelectedGridItemChangedEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnSelectedObjectsChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnSystemColorsChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnVisibleChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool ProcessDialogKey(Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void Refresh() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void RefreshTabs(PropertyTabScope tabScope) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetSelectedProperty() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void ScaleCore(float dx,float dy) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void WndProc(ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		

+		#region Events

+		[MonoTODO]

+		public event EventHandler PropertySortChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event PropertyTabChangedEventHandler PropertyTabChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event PropertyValueChangedEventHandler PropertyValueChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event SelectedGridItemChangedEventHandler SelectedGridItemChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler SelectedObjectsChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		#endregion

+		

+		

+		

+		

+		/// sub-class: PropertyGrid.PropertyTabCollection

+		/// <summary>

+		/// Contains a collection of PropertyTab objects.

+		/// </summary>

+		public class PropertyTabCollection : ICollection, IEnumerable {

+			#region Properties

+			[MonoTODO]

+			public int Count {

+				get { throw new NotImplementedException (); }

+			}

+			

+//			[MonoTODO]

+//			public PropertyTab this[int index] {

+//				get { throw new NotImplementedException (); }

+//			}

+			#endregion

+			

+			

+			

+			#region Methods

+			[MonoTODO]

+			public void AddTabType(Type propertyTabType) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void AddTabType(Type propertyTabType,PropertyTabScope tabScope) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void Clear(PropertyTabScope tabScope) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public IEnumerator GetEnumerator() 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			void ICollection.CopyTo(Array dest,int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void RemoveTabType(Type propertyTabType) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public object SyncRoot {

+				// FIXME: should return object that can be used with the C# lock keyword

+				get { return this; }

+			}

+			

+			[MonoTODO]

+			public bool IsSynchronized {

+				// FIXME: should return true if object is synchronized

+				get { return false; }

+			}

+			#endregion

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyManager.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyManager.cs
new file mode 100644
index 00000000000..cb11990f18b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyManager.cs
@@ -0,0 +1,130 @@
+//

+// System.Windows.Forms.PropertyManager

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+//using System.Drawing;

+//using System.Drawing.Printing;

+using System.ComponentModel;

+using System.Collections;

+//using System.Windows.Forms.Design;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Maintains a Binding between an object's property and a data-bound control property.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	public class PropertyManager : BindingManagerBase {

+

+		/*

+		#region Fields

+		#endregion

+		*/

+		

+		

+		

+		#region Constructor

+		[MonoTODO]

+		public PropertyManager() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+		

+		

+		

+		

+		#region Properties

+		[MonoTODO]

+		public override int Count {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override object Current {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public override int Position {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		#endregion

+		

+		

+		

+		

+		#region Methods

+		[MonoTODO]

+		public override void AddNew() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void CancelCurrentEdit() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void EndCurrentEdit() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override PropertyDescriptorCollection GetItemProperties() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override string GetListName(ArrayList listAccessors) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal override void OnCurrentChanged(EventArgs ea) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void RemoveAt(int index) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void ResumeBinding() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public override void SuspendBinding() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void UpdateIsBinding() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertySort.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertySort.cs
new file mode 100644
index 00000000000..19c9dbbc9a6
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertySort.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.PropertySort.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum PropertySort {

+		Alphabetical = 1,

+		Categorized = 2,

+		CategorizedAlphabetical = 3,

+		NoSort = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyTabChangedEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyTabChangedEventArgs.cs
new file mode 100644
index 00000000000..36d8395d595
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyTabChangedEventArgs.cs
@@ -0,0 +1,139 @@
+//

+// System.Windows.Forms.PropertyTabChangedEventArgs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.Runtime.InteropServices;

+using System.Windows.Forms.Design;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides data for the PropertyTabChanged event of a PropertyGrid.

+	///

+	/// ToDo note:

+	///  - nothing is implemented

+	/// </summary>

+

+	[MonoTODO]

+	[ComVisible(true)]

+	public class PropertyTabChangedEventArgs : EventArgs	{

+

+		#region Fields

+

+			private PropertyTab oldtab;

+			private PropertyTab newtab;

+

+		#endregion

+

+		#region Constructor

+		//[ComVisible(true)]

+		public PropertyTabChangedEventArgs(PropertyTab oldTab, PropertyTab newTab){

+			

+			this.oldtab = oldTab;

+			this.newtab = newTab;

+

+		}

+		#endregion

+				

+		#region Public Properties

+

+		[ComVisible(true)]

+		public PropertyTab NewTab  {

+			get {

+				return newtab;

+			}

+		}

+

+		[ComVisible(true)]

+		public PropertyTab OldTab {

+			get { 

+				return oldtab;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two PropertyTabChangedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	oldtab and newtab Property

+		///	of the two PropertyTabChangedEventArgs.

+		/// </remarks>

+		public static bool operator == (PropertyTabChangedEventArgs PropertyTabChangedEventArgsA, PropertyTabChangedEventArgs PropertyTabChangedEventArgsB) 

+		{

+			return (PropertyTabChangedEventArgsA.NewTab == PropertyTabChangedEventArgsB.NewTab) && (PropertyTabChangedEventArgsA.OldTab == PropertyTabChangedEventArgsB.OldTab);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two PropertyValueChangedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	ChangedItem and OldValue Property

+		///	of the two PropertyValueChangedEventArgs.

+		/// </remarks>

+		public static bool operator != (PropertyTabChangedEventArgs PropertyTabChangedEventArgsA, PropertyTabChangedEventArgs PropertyTabChangedEventArgsB) 

+		{

+			return (PropertyTabChangedEventArgsA.NewTab != PropertyTabChangedEventArgsB.NewTab) || (PropertyTabChangedEventArgsA.OldTab != PropertyTabChangedEventArgsB.OldTab);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	PropertyTabChangedEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is PropertyTabChangedEventArgs))return false;

+			return (this == (PropertyTabChangedEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyTabChangedEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyTabChangedEventHandler.cs
new file mode 100644
index 00000000000..c878d4425b5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyTabChangedEventHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.PropertyTabChangedEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the PropertyTabChanged event of a PropertyGrid.

+	/// </summary>

+	//[Serializable]

+	public delegate void PropertyTabChangedEventHandler(object s, PropertyTabChangedEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyValueChangedEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyValueChangedEventArgs.cs
new file mode 100644
index 00000000000..a280a71664e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyValueChangedEventArgs.cs
@@ -0,0 +1,131 @@
+//

+// System.Windows.Forms.PropertyValueChangedEventArgs

+//

+// Author:

+//	 stubbed out by Dennis Hayes(dennish@raytek.com)

+//   completed by Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Summary description for PropertyValueChangedEventArgs.

+	/// </summary>

+	public class PropertyValueChangedEventArgs : EventArgs {

+

+		#region Fields

+		private GridItem changedItem;

+		private object oldValue;

+		#endregion

+

+		public PropertyValueChangedEventArgs(GridItem changedItem, object oldValue)

+		{

+			this.changedItem = changedItem;

+			this.oldValue = oldValue;

+		}

+

+		#region Public Properties

+		

+		// ChangedItem Property

+		public GridItem ChangedItem 

+		{

+			get 

+			{

+				return changedItem;

+			}

+		}

+

+		// OldValue Property

+		public object OldValue 

+		{

+			get 

+			{

+				return oldValue;

+			}

+		}

+

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two PropertyValueChangedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	ChangedItem and OldValue Property

+		///	of the two PropertyValueChangedEventArgs.

+		/// </remarks>

+		public static bool operator == (PropertyValueChangedEventArgs PropertyValueChangedEventArgsA, PropertyValueChangedEventArgs PropertyValueChangedEventArgsB) 

+		{

+			return (PropertyValueChangedEventArgsA.ChangedItem == PropertyValueChangedEventArgsB.ChangedItem) && (PropertyValueChangedEventArgsA.OldValue == PropertyValueChangedEventArgsB.OldValue);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two PropertyValueChangedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	ChangedItem and OldValue Property

+		///	of the two PropertyValueChangedEventArgs.

+		/// </remarks>

+		public static bool operator != (PropertyValueChangedEventArgs PropertyValueChangedEventArgsA, PropertyValueChangedEventArgs PropertyValueChangedEventArgsB) 

+		{

+			return (PropertyValueChangedEventArgsA.ChangedItem != PropertyValueChangedEventArgsB.ChangedItem) || (PropertyValueChangedEventArgsA.OldValue != PropertyValueChangedEventArgsB.OldValue);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	PropertyValueChangedEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is PropertyValueChangedEventArgs))return false;

+			return (this == (PropertyValueChangedEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the PropertyValueChangedEventArgs as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+		#endregion

+

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyValueChangedEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyValueChangedEventHandler.cs
new file mode 100644
index 00000000000..1722cea904e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/PropertyValueChangedEventHandler.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.PropertyValueChangedEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// The event handler class that is invoked when 

+	/// a property in the grid is modified by the user. 

+	/// </summary>

+	//[Serializable]

+	public delegate void PropertyValueChangedEventHandler(object s, PropertyValueChangedEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryAccessibilityHelpEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryAccessibilityHelpEventArgs.cs
new file mode 100644
index 00000000000..9a8d13b570c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryAccessibilityHelpEventArgs.cs
@@ -0,0 +1,156 @@
+//

+// System.Windows.Forms.QueryAccessibilityHelpEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gterzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.InteropServices;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class QueryAccessibilityHelpEventArgs : EventArgs {

+

+		#region Fields

+

+		string helpnamespace;

+		string helpstring;

+		string helpkeyword;

+		

+		#endregion

+		//

+		//  --- Constructor

+		//

+		public QueryAccessibilityHelpEventArgs() 

+		{

+			this.helpkeyword = "";

+			this.helpnamespace = "";

+			this.helpstring = "";

+		}

+		public QueryAccessibilityHelpEventArgs(string helpNamespace, string helpString, string helpKeyword) {

+			this.helpkeyword = helpKeyword;

+			this.helpnamespace = helpNamespace;

+			this.helpstring =helpString;

+		}

+

+

+		#region Public Properties

+		[ComVisible(true)] 

+		public string HelpKeyword {

+			get {

+				return helpkeyword;

+			}

+			set {

+				helpkeyword = value;

+			}

+		}

+		[ComVisible(true)] 

+		public string HelpNamespace {

+			get {

+				return helpnamespace;

+			}

+			set {

+				helpnamespace = value;

+			}

+		}

+		[ComVisible(true)] 

+		public string HelpString {

+			get {

+				return helpstring;

+			}

+			set {

+				helpstring = value;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two QueryAccessibilityHelpEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	helpkeyword, helpnamespace and helpstring Property

+		///	of the two QueryAccessibilityHelpEventArgs.

+		/// </remarks>

+		public static bool operator == (QueryAccessibilityHelpEventArgs QueryAccessibilityHelpEventArgsA, QueryAccessibilityHelpEventArgs QueryAccessibilityHelpEventArgsB) 

+		{

+			return ((QueryAccessibilityHelpEventArgsA.HelpKeyword == QueryAccessibilityHelpEventArgsB.HelpKeyword) && (QueryAccessibilityHelpEventArgsA.HelpNamespace == QueryAccessibilityHelpEventArgsB.HelpNamespace) && (QueryAccessibilityHelpEventArgsA.HelpString == QueryAccessibilityHelpEventArgsB.HelpString));

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two QueryAccessibilityHelpEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	helpkeyword, helpnamespace and helpstring Property

+		///	of the two QueryAccessibilityHelpEventArgs.

+		/// </remarks>

+		public static bool operator != (QueryAccessibilityHelpEventArgs QueryAccessibilityHelpEventArgsA, QueryAccessibilityHelpEventArgs QueryAccessibilityHelpEventArgsB) 

+		{

+			return ((QueryAccessibilityHelpEventArgsA.HelpKeyword != QueryAccessibilityHelpEventArgsB.HelpKeyword) || (QueryAccessibilityHelpEventArgsA.HelpNamespace != QueryAccessibilityHelpEventArgsB.HelpNamespace) || (QueryAccessibilityHelpEventArgsA.HelpString != QueryAccessibilityHelpEventArgsB.HelpString));

+		}

+

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	QueryAccessibilityHelpEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is QueryAccessibilityHelpEventArgs))return false;

+			return (this == (QueryAccessibilityHelpEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryAccessibilityHelpEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryAccessibilityHelpEventHandler.cs
new file mode 100644
index 00000000000..63470391650
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryAccessibilityHelpEventHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.QueryAccessibilityHelpEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the QueryAccessibilityHelp event of a control.

+	/// </summary>

+	//[Serializable]

+	public delegate void QueryAccessibilityHelpEventHandler(object sender, QueryAccessibilityHelpEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryContinueDragEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryContinueDragEventArgs.cs
new file mode 100644
index 00000000000..46cac1028a1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryContinueDragEventArgs.cs
@@ -0,0 +1,142 @@
+//

+// System.Windows.Forms.QueryContinueDragEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gterzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.InteropServices;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	// Just a template.

+	// </summary>

+

+    public class QueryContinueDragEventArgs : EventArgs {

+

+		#region Fields

+

+		private int keystate;

+		private bool escapepressed;

+		private DragAction action;

+

+		#endregion

+		//

+		//  --- Constructor

+		//

+		//[ComVisible(true)] 

+		public QueryContinueDragEventArgs(int keyState, bool escapePressed, DragAction action)

+		{

+			this.keystate = keyState;

+			this.escapepressed = escapePressed;

+			this.action = action;

+		}

+

+		#region Public Properties

+		[ComVisible(true)]

+		public DragAction Action {

+			get {

+				return action;

+			}

+			set {

+				action = value;

+			}

+		}

+		[ComVisible(true)] 

+		public bool EscapePressed {

+			get {

+				return escapepressed;

+			}

+		}

+		[ComVisible(true)]

+		public int KeyState {

+			get {

+				return keystate;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two QueryContinueDragEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	keystate, escaperessed and action Property

+		///	of the two QueryContinueDragEventArgs.

+		/// </remarks>

+		public static bool operator == (QueryContinueDragEventArgs QueryContinueDragEventArgsA, QueryContinueDragEventArgs QueryContinueDragEventArgsB) 

+		{

+			return ((QueryContinueDragEventArgsA.EscapePressed == QueryContinueDragEventArgsB.EscapePressed) && (QueryContinueDragEventArgsA.KeyState == QueryContinueDragEventArgsB.KeyState) && (QueryContinueDragEventArgsA.Action == QueryContinueDragEventArgsB.Action));

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ScrollEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	newvalue and type Property

+		///	of the two ScrollEventArgs.

+		/// </remarks>

+		public static bool operator != (QueryContinueDragEventArgs QueryContinueDragEventArgsA, QueryContinueDragEventArgs QueryContinueDragEventArgsB) 

+		{

+			return ((QueryContinueDragEventArgsA.EscapePressed != QueryContinueDragEventArgsB.EscapePressed) || (QueryContinueDragEventArgsA.KeyState != QueryContinueDragEventArgsB.KeyState) || (QueryContinueDragEventArgsA.Action != QueryContinueDragEventArgsB.Action));

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	QueryContinueDragEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is QueryContinueDragEventArgs))return false;

+			return (this == (QueryContinueDragEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryContinueDragEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryContinueDragEventHandler.cs
new file mode 100644
index 00000000000..a53272926a1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/QueryContinueDragEventHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.QueryContinueDragEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the QueryContinueDrag event of a Control.

+	/// </summary>

+	//[Serializable]

+	public delegate void QueryContinueDragEventHandler(object sender, QueryContinueDragEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/RadioButton.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/RadioButton.cs
new file mode 100644
index 00000000000..2dc96011e43
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/RadioButton.cs
@@ -0,0 +1,302 @@
+//

+// System.Windows.Forms.RadioButton.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class RadioButton : ButtonBase {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public RadioButton()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public Appearance Appearance {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AutoCheck {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ContentAlignment CheckAlign {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Checked {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override ContentAlignment TextAlign {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		//inherited

+		//public IAsyncResult BeginInvoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public IAsyncResult BeginInvoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		//public void Invalidate()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect, bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del, object[] obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public void PerformClick()

+		{

+			throw new NotImplementedException ();

+		}

+		//public void PerformLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout(Control ctl, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1, float val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4, BoundsSpecified bounds)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		[MonoTODO]

+		public event EventHandler AppearanceChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public event EventHandler CheckedChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected override AccessibleObject CreateAccessibilityInstance()

+		{

+			throw new NotImplementedException ();

+		}

+		//inherited

+		//protected override void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected virtual void OnCheckedChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnClick(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnEnter(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnMouseUp(MouseEventArgs mevent)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override bool ProcessMnemonic(char charCode)

+		{

+			throw new NotImplementedException ();

+		}

+		//protected ContentAlignment RtlTranslateAlignment(ContentAlignment calign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment halign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment lralign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected override void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4, int val5, int val6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBox.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBox.cs
new file mode 100644
index 00000000000..7b19d45572b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBox.cs
@@ -0,0 +1,667 @@
+//

+// System.Windows.Forms.RichTextBox.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+using System.IO;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class RichTextBox : TextBoxBase {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public RichTextBox()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public override bool AllowDrop {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override bool AutoSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AutoWordSelection {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int BulletIndent {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool CanRedo {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool DetectUrls {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Font Font {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color ForeColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override int MaxLength {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override bool Multiline {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string RedoActionName {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int RightMargin {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string Rtf {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public RichTextBoxScrollBars ScrollBars {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string SelectedRtf {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string SelectedText {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public HorizontalAlignment SelectionAlignment {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool SelectionBullet {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SelectionCharOffset {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Color SelectionColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Font SelectionFont {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SelectionHangingIndent {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SelectionIndent {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override int SelectionLength {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool SelectionProtected {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SelectionRightIndent {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int[] SelectionTabs {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public RichTextBoxSelectionTypes SelectionType {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowSelectionMargin {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override int TextLength {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string UndoActionName {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public float ZoomFactor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		//public IAsyncResult BeginInvoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public IAsyncResult BeginInvoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public bool CanPaste(DataFormats.Format clipFormat)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}		[MonoTODO]

+		public int Find(char[] chars)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int Find(string srt)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int Find(char[] chars, int val)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int Find(string srt, RichTextBoxFinds finds)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int Find(char[] chars, int val1, int val2)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int Find(string srt, int val, RichTextBoxFinds finds)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int Find(string srt, int val1, int val2, RichTextBoxFinds finds)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public char GetCharFromPosition(Point pt)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int GetLineFromCharIndex(int index)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public Point GetPositionFromCharIndex(int index)

+		{

+			throw new NotImplementedException ();

+		}

+		//public void Invalidate()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect, bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg, bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public void LoadFile(string str)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void LoadFile(Stream str, RichTextBoxStreamType type)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		//public void Paste()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public void Paste(DataFormats.Format format)

+		{

+			throw new NotImplementedException ();

+		}

+		//public void PerformLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout(Control ctl, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public void Redo()

+		{

+			throw new NotImplementedException ();

+		}

+		//public void ResumeLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public void SaveFile(string str)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void SaveFile(Stream str, RichTextBoxStreamType type)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void SaveFile(string str, RichTextBoxStreamType type)

+		{

+			throw new NotImplementedException ();

+		}

+		//public void Scale(float val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1, float val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select(int val1, int val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4, BoundsSpecified bounds)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Public Events

+		//

+		public event ContentsResizedEventHandler ContentsResized;

+		public event EventHandler HScroll;

+		public event EventHandler ImeChange;

+		public event LinkClickedEventHandler LinkClicked;

+		public event EventHandler Protected;

+		public event EventHandler SelectionChanged;

+		public event EventHandler VScroll;

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected virtual object CreateRichTextEditOleCallback()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnBackColorChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnContentsResized(ContentsResizedEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void  OnContextMenuChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void  OnHandleCreated(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void  OnHandleDestroyed(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnHScroll(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnImeChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnClicked(LinkClickedEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnProtected(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnRightToLeftChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnSelectionChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnSystemColorsChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnTextChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnVScroll(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		//protected ContentAlignment RtlTranslateAlignment(ContentAlignment calign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment halign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment lralign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void Select()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4, int val5, int val6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override void WndProc(ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxFinds.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxFinds.cs
new file mode 100644
index 00000000000..99792e41cbc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxFinds.cs
@@ -0,0 +1,22 @@
+//

+// System.Windows.Forms.RichTextBoxFinds.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum RichTextBoxFinds {

+		MatchCase = 4,

+		NoHighlight = 8,

+		None = 0,

+		Reverse = 16,

+		WholeWord = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxScrollBars.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxScrollBars.cs
new file mode 100644
index 00000000000..fd1a0a5efdd
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxScrollBars.cs
@@ -0,0 +1,24 @@
+//

+// System.Windows.Forms.RichTextBoxScrollBars.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum RichTextBoxScrollBars {

+		Both = 3,

+		ForcedBoth = 19,

+		ForcedHorizontal = 17,

+		ForcedVertical = 18,

+		Horizontal = 1,

+		None = 0,

+		Vertical = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxSelectionAttribute.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxSelectionAttribute.cs
new file mode 100644
index 00000000000..d90dd10964c
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxSelectionAttribute.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.RichTextBoxSelectionAttribute.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum RichTextBoxSelectionAttribute {

+		All = 1,

+		Mixed = -1,

+		None = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxSelectionTypes.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxSelectionTypes.cs
new file mode 100644
index 00000000000..a3031154599
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxSelectionTypes.cs
@@ -0,0 +1,22 @@
+//

+// System.Windows.Forms.RichTextBoxSelectionTypes.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum RichTextBoxSelectionTypes {

+		Empty = 0,

+		MultiChar = 4,

+		MultiObject = 8,

+		Object = 2,

+		Text = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxStreamType.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxStreamType.cs
new file mode 100644
index 00000000000..949ff8d693a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxStreamType.cs
@@ -0,0 +1,22 @@
+//

+// System.Windows.Forms.RichTextBoxStreamType.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum RichTextBoxStreamType {

+		RichNoOleObjs = 2,

+		PlainText = 1,

+		RichText = 0,

+		TextTextOleObjs = 3,

+		UnicodePlainText = 4

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxWordPunctuations.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxWordPunctuations.cs
new file mode 100644
index 00000000000..e310593f4b4
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/RichTextBoxWordPunctuations.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.RichTextBoxWordPunctuations.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum RichTextBoxWordPunctuations {

+		All = 896,

+		Custom = 512,

+		Level1 =128,

+		Level2 = 256

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/RightToLeft.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/RightToLeft.cs
new file mode 100644
index 00000000000..bd7b9fb4a12
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/RightToLeft.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.RightToLeft.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum RightToLeft {

+		Inherit = 2,

+		No =0,

+		Yes = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SaveFileDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SaveFileDialog.cs
new file mode 100644
index 00000000000..83f8129971b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SaveFileDialog.cs
@@ -0,0 +1,84 @@
+//

+// System.Windows.Forms.SaveFileDialog.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.IO;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public sealed class SaveFileDialog : FileDialog {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public SaveFileDialog()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public bool CreatePrompt {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool OverwritePrompt {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		//public void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public Stream OpenFile()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override void Reset()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		//public DialogResult ShowDialog()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Protected Methods

+		//

+		//[MonoTODO]

+		//protected virtual void Dispose(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Screen.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Screen.cs
new file mode 100644
index 00000000000..b0310063a13
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Screen.cs
@@ -0,0 +1,128 @@
+//

+// System.Windows.Forms.Screen.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Runtime.InteropServices;

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class Screen {

+

+		//

+		//  --- Public Properties

+		//

+

+		[MonoTODO]

+		public static Screen[] AllScreens {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Rectangle Bounds {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string DeviceName {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Primary {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public static Screen PrimaryScreen {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Rectangle WorkingArea {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		

+		//  --- Public Methods

+		

+		[MonoTODO]

+		public override bool Equals(object obj)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public static Screen FormControl(Control ctl)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public static Screen FormHandle(IntPtr hwnd)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public static Screen FormPoint(Point point)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public static Screen FormRectangle(Rectangle rect)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public static Rectangle GetBounds(Control ctl)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public static Rectangle GetBounds(Point pt)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public static Rectangle GetBounds(Rectangle rect)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override int GetHashCode()

+		{

+			throw new NotImplementedException ();

+		}

+		//[Serializable]

+		//[ClassInterface(ClassInterfaceType.AutoDual)]

+		//public Type GetType()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public static Rectangle GetWorkingArea(Control ctl)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollBar.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollBar.cs
new file mode 100644
index 00000000000..67b39a1d9a1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollBar.cs
@@ -0,0 +1,361 @@
+//

+// System.Windows.Forms.ScrollBar.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+     public class ScrollBar : Control {

+

+		//

+		//  --- Constructor

+		//

+

+		[MonoTODO]

+		public ScrollBar()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+

+		[MonoTODO]

+		public override Color BackColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override Color ForeColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public new ImeMode ImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public int LastChange {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public int Maximum {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public int Minimum {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public int SmallChange {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public int Value {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+

+		//inherited

+		//public IAsyncResult BeginInvoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public IAsyncResult BeginInvoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		 [MonoTODO]

+		 public override int GetHashCode() {

+			 //FIXME add our proprities

+			 return base.GetHashCode();

+		 }

+		//

+		//public void Invalidate()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate(Rectangle rect)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate(Region reg)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate(Rectangle rect, bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void Invalidate(Region reg, bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public object Invoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public object Invoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void PerformLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void PerformLayout(Control ctl, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void ResumeLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void ResumeLayout(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//public void Select()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//public virtual void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//public void SetBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void SetBounds(int val1, int val2, int val3, int val4, BoundsSpecified bounds)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+

+		[MonoTODO]

+		public event ScrollEventHandler Scroll {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler ValueChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Properties

+		//

+

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+

+		//inherited

+		//protected override void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void OnEnabledChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//protected ContentAlignment RtlTranslateAlignment(ContentAlignment calign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment halign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment lralign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//[MonoTODO]

+		//public virtual void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void UpdateBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public void UpdateBounds(int val1, int val2, int val3, int val4, int val5, int val6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//

+		//public override void WndProc(ref Message m)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollBars.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollBars.cs
new file mode 100644
index 00000000000..355b159bbfb
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollBars.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.ScrollBars.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ScrollBars {

+		Both = 3,

+		Horizontal = 1,

+		None = 0,

+		Vertical = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollButton.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollButton.cs
new file mode 100644
index 00000000000..3d82228f457
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollButton.cs
@@ -0,0 +1,23 @@
+//

+// System.Windows.Forms.ScrollButton.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ScrollButton {

+		Down = 1,

+		Left = 2,

+		Max = 3,

+		Min = 0,

+		Right = 3,

+		Up = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollEventArgs.cs
new file mode 100644
index 00000000000..6ad6169db91
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollEventArgs.cs
@@ -0,0 +1,140 @@
+//

+// System.Windows.Forms.ScrollEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//   Gianandrea Terzi (gterzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.InteropServices;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	// </summary>

+

+    public class ScrollEventArgs : EventArgs {

+

+		#region Fields

+			

+		private int newvalue;

+		private ScrollEventType type;

+

+		#endregion

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ScrollEventArgs(ScrollEventType type, int newVal)

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		#region Public Properties

+

+		[ComVisible(true)]

+		public int NewValue 

+		{

+			get {

+				return newvalue;

+			}

+			set {

+				newvalue = value;

+			}

+		}

+		

+		[ComVisible(true)]

+		public ScrollEventType Type {

+			get {

+				return type;

+			}

+		}

+

+		#endregion

+	

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ScrollEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	newvalue and type Property

+		///	of the two ScrollEventArgs.

+		/// </remarks>

+		public static bool operator == (ScrollEventArgs ScrollEventArgsA, ScrollEventArgs ScrollEventArgsB) 

+		{

+			return ((ScrollEventArgsA.NewValue == ScrollEventArgsB.NewValue) && (ScrollEventArgsA.Type == ScrollEventArgsB.Type));

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ScrollEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	newvalue and type Property

+		///	of the two ScrollEventArgs.

+		/// </remarks>

+		public static bool operator != (ScrollEventArgs ScrollEventArgsA, ScrollEventArgs ScrollEventArgsB) 

+		{

+			return ((ScrollEventArgsA.NewValue != ScrollEventArgsB.NewValue) || (ScrollEventArgsA.Type != ScrollEventArgsB.Type));

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	UICuesEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is ScrollEventArgs))return false;

+			return (this == (ScrollEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the object as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollEventHandler.cs
new file mode 100644
index 00000000000..2aa9bf6c3de
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollEventHandler.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.ScrollEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that handles the Scroll 

+	/// event of a ScrollBar, TrackBar, or DataGrid.

+	/// </summary>

+	//[Serializable]

+	public delegate void ScrollEventHandler(object sender, ScrollEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollEventType.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollEventType.cs
new file mode 100644
index 00000000000..2b9b3f495b3
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollEventType.cs
@@ -0,0 +1,29 @@
+//

+// System.Windows.Forms.ScrollEventType.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+//	 Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	[Flags]

+	public enum ScrollEventType {

+		EndScroll = 8,

+		First = 6,

+		LargeDecrement = 2,

+		LargeIncrement = 3,

+		Last = 7,

+		SmallDecrement = 0,

+		ThumbPosition = 4,

+		SmallIncrement = 1,

+		ThumbTrack = 5

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollableControl.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollableControl.cs
new file mode 100644
index 00000000000..93331c60a8e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ScrollableControl.cs
@@ -0,0 +1,371 @@
+//

+// System.Windows.Forms.Form

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com)

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   ScrollableControl.DockPaddingEdges stub added by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis Hayes (dennish@raytek.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System;

+using System.Drawing;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	public class ScrollableControl : Control {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ScrollableControl () : base ()

+		{

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public virtual bool AutoScroll {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Size AutoScrollMargin {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Size AutoScrollMinSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Point AutoScrollPosition {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override Rectangle DisplayRectangle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public ScrollableControl.DockPaddingEdges DockPadding {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		//public IAsyncResult BeginInvoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public IAsyncResult BeginInvoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override bool Equals (object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode () {

+			//FIXME add our proprities

+			return base.GetHashCode ();

+		}

+

+		//public void Invalidate()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect, bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg, bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout(Control ctl, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1, float val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4, BoundsSpecified bounds)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Protected Properties

+		//

+

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		protected bool HScroll {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		protected bool VScroll {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected virtual void AdjustFormScrollbars (

+			bool displayScrollbars)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//protected override void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void OnLayout (LayoutEventArgs levent)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnMouseWheel (MouseEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnVisibleChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//ContentAlignment RtlTranslateAlignment(ContentAlignment calign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment halign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment lralign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void ScaleCore (float dx, float dy)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//protected void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4, int val5, int val6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void WndProc (ref Message m)

+		{

+			base.WndProc (ref m);

+		}

+		

+		/// ScrollableControl.DockPaddingEdges

+		/// Determines the border padding for docked controls.

+		public class DockPaddingEdges : ICloneable {

+			// --- Fields ---

+			int all;

+			int bottom;

+			int left;

+			int right;

+			int top;

+			

+			

+			// --- public Properties ---

+			public int All {

+				get { return all; }

+				set { all=value; }

+			}

+			

+			public int Bottom {

+				get { return bottom; }

+				set { bottom=value; }

+			}

+			

+			public int Left {

+				get { return left; }

+				set { left=value; }

+			}

+			

+			public int Right {

+				get { return right; }

+				set { right=value; }

+			}

+			

+			public int Top {

+				get { return top; }

+				set { top=value; }

+			}

+			

+			

+			/// --- public Methods ---

+			[MonoTODO]

+			public override bool Equals (object other) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override int GetHashCode () 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+			[MonoTODO]

+			object ICloneable.Clone () 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override string ToString () 

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SecurityIDType.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SecurityIDType.cs
new file mode 100644
index 00000000000..a55978ce4fe
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SecurityIDType.cs
@@ -0,0 +1,26 @@
+//

+// System.Windows.Forms.SecurityIDType.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum SecurityIDType {

+		Alias = 4,

+		Computer = 9,

+		DeletedAccount = 6,

+		Domain = 3,

+		Group = 2,

+		Invalid = 7,

+		Unknown = 8,

+		User = 1,

+		WellKnownGroup = 5

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectedGridItemChangedEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectedGridItemChangedEventArgs.cs
new file mode 100644
index 00000000000..3c3bf1133c6
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectedGridItemChangedEventArgs.cs
@@ -0,0 +1,121 @@
+//

+// System.Windows.Forms.SelectedGridItemChangedEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms 

+{

+

+	// <summary>

+	// </summary>

+

+	public class SelectedGridItemChangedEventArgs : EventArgs {

+		GridItem old;

+		GridItem newGridItem;

+

+		//

+		//  --- Constructor

+		//

+		public SelectedGridItemChangedEventArgs(GridItem old, GridItem newGridItem) {

+			this.newGridItem = newGridItem;

+			this.old = old;

+		}

+

+		#region Public Properties

+		public GridItem NewSelection 

+		{

+			get {

+				return newGridItem;

+			}

+		}

+		public GridItem OldSelection {

+			get {

+				return old;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two SelectedGridItemChangedEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	NewSelection and OldSelection Property

+		///	of the two SelectedGridItemChangedEventArgs.

+		/// </remarks>

+		public static bool operator == (SelectedGridItemChangedEventArgs SelectedGridItemChangedEventArgsA, SelectedGridItemChangedEventArgs SelectedGridItemChangedEventArgsB) 

+		{

+			return (SelectedGridItemChangedEventArgsA.NewSelection == SelectedGridItemChangedEventArgsB.NewSelection) && (SelectedGridItemChangedEventArgsA.OldSelection == SelectedGridItemChangedEventArgsB.OldSelection);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two UICuesEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Changed Property

+		///	of the two UICuesEventArgs.

+		/// </remarks>

+		public static bool operator != (SelectedGridItemChangedEventArgs SelectedGridItemChangedEventArgsA, SelectedGridItemChangedEventArgs SelectedGridItemChangedEventArgsB) 

+		{

+			return (SelectedGridItemChangedEventArgsA.NewSelection != SelectedGridItemChangedEventArgsB.NewSelection) || (SelectedGridItemChangedEventArgsA.OldSelection != SelectedGridItemChangedEventArgsB.OldSelection);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	SelectedGridItemChangedEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is SelectedGridItemChangedEventArgs))return false;

+			return (this == (SelectedGridItemChangedEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the SelectedGridItemChangedEventArgs as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+		#endregion  

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectedGridItemChangedEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectedGridItemChangedEventHandler.cs
new file mode 100644
index 00000000000..3c2a65959c4
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectedGridItemChangedEventHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.SelectedGridItemChangedEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the SelectedGridItemChanged event of a PropertyGrid.

+	/// </summary>

+	//[Serializable]

+	public delegate void SelectedGridItemChangedEventHandler(object sender, SelectedGridItemChangedEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectionMode.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectionMode.cs
new file mode 100644
index 00000000000..9d6a4ddc7ac
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectionMode.cs
@@ -0,0 +1,24 @@
+//

+// System.Windows.Forms.SelectionMode.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	[Flags]

+	public enum SelectionMode {

+		MultiExtended = 3,

+		MultiSimple = 2,

+		None = 0,

+		One = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectionRange.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectionRange.cs
new file mode 100644
index 00000000000..550fdf5231f
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectionRange.cs
@@ -0,0 +1,85 @@
+//

+// System.Windows.Forms.SelectionRange.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class SelectionRange {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public SelectionRange()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public SelectionRange(SelectionRange range)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public SelectionRange(DateTime time1,DateTime time2)

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		//  --- Public Properties

+		

+		[MonoTODO]

+		public DateTime End {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public DateTime Start {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}	 

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectionRangeConverter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectionRangeConverter.cs
new file mode 100644
index 00000000000..93414c35da0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SelectionRangeConverter.cs
@@ -0,0 +1,200 @@
+//

+// System.Windows.Forms.SelectionRangeConverter.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Globalization;

+using System.Collections;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+using System.ComponentModel;

+    public class SelectionRangeConverter : TypeConverter {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public SelectionRangeConverter()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+		

+		//public bool CanConvertFrom(Type type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool CanConvertFrom(ITypeDescriptorContext context, Type type)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		//public bool CanConvertTo(Type type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool CanConvertTo(ITypeDescriptorContext context, Type type)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		//public object ConvertFrom(object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object obj)

+		{

+			throw new NotImplementedException ();

+		}

+		//public object ConvertFromInvariantString(string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromInvariantString(ITypeDescriptorContext context, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromString(string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertFromString(ITypeDescriptorContext context, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object ConvertTo(object obj, Type type)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override object ConvertTo( ITypeDescriptorContext context, CultureInfo culture, object obj, Type type)

+		{

+			throw new NotImplementedException ();

+		}

+		//public string ConvertToInvariantString(object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToInvariantString(ITypeDescriptorContext context, object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToString(object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToString(ITypeDescriptorContext context, object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public string ConvertToString(ITypeDescriptorContext context, CultureInfo culture, object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object CreateInstance(IDictionary dict)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override object CreateInstance(ITypeDescriptorContext context, IDictionary dict)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}

+		[MonoTODO]

+		public bool CreateInstanceSupported()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override bool GetCreateInstanceSupported(ITypeDescriptorContext context)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		//public PropertyDescriptorCollection GetProperties( object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public PropertyDescriptorCollection GetProperties( ITypeDescriptorContext context, object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override PropertyDescriptorCollection GetProperties( ITypeDescriptorContext context, object obj, Attribute[] atts)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		//public bool GetPropertiesSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool GetPropertiesSupported(ITypeDescriptorContext context)

+		{

+			throw new NotImplementedException ();

+		}

+		//public ICollection GetStandardValues()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual StandardValuesCollection GetStandardValues (ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public bool GetStandardValuesExclusive()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual bool GetStandardValuesExclusive(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public bool GetStandardValuesSupported()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual bool GetStandardValuesSupported(ITypeDescriptorContext context)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public bool IsValid(object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual bool IsValid(ITypeDescriptorContext context, object obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SendKeys.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SendKeys.cs
new file mode 100644
index 00000000000..112361bc425
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SendKeys.cs
@@ -0,0 +1,52 @@
+//

+// System.Windows.Forms.SendKeys.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class SendKeys {

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}		[MonoTODO]

+		static void Flush()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		static void Send(string keys)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		static void SendWait(string keys)

+		{

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Shortcut.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Shortcut.cs
new file mode 100644
index 00000000000..5cdda77ab2b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Shortcut.cs
@@ -0,0 +1,170 @@
+//

+// System.Windows.Forms.Shortcut.cs

+//

+// Author:

+//   Dennis Hayes = dennish@raytek.com

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// = C, 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	[Flags]

+	public enum Shortcut {

+		Alt0 = 262192,

+		Alt1 = 262193,

+		Alt2 = 262194,

+		Alt3 = 262195,

+		Alt4 = 262196,

+		Alt5 = 262197,

+		Alt6 = 262198,

+		Alt7 = 262199,

+		Alt8 = 262200,

+		Alt9 = 262201,

+		AltBksp = 262152,

+		AltF1 = 262256,

+		AltF2 = 262257,

+		AltF3 = 262258,

+		AltF4 = 262259,

+		AltF5 = 262260,

+		AltF6 = 262261,

+		AltF7 = 262262,

+		AltF8 = 262263,

+		AltF9 = 262264,

+		AltF10 = 262265,

+		AltF11 = 262266,

+		AltF12 = 262267,

+		Ctrl0 = 131120,

+		Ctrl1 = 131121,

+		Ctrl2 = 131122,

+		Ctrl3 = 131123,

+		Ctrl4 = 131124,

+		Ctrl5 = 131125,

+		Ctrl6 = 131126,

+		Ctrl7 = 131127,

+		Ctrl8 = 131128,

+		Ctrl9 = 131129,

+		CtrlA = 131137,

+		CtrlB = 131138,

+		CtrlC = 131139,

+		CtrlD = 131140,

+		CtrlDel = 131118,

+		CtrlE = 131141,

+		CtrlF = 131142,

+		CtrlF1 = 131184,

+		CtrlF2 = 131185,

+		CtrlF3 = 131186,

+		CtrlF4 = 131187,

+		CtrlF5 = 131188,

+		CtrlF6 = 131189,

+		CtrlF7 = 131190,

+		CtrlF8 = 131191,

+		CtrlF9 = 131192,

+		CtrlF10 = 131193,

+		CtrlF11 = 131194,

+		CtrlF12 = 131195,

+		CtrlG = 131143,

+		CtrlH = 131144,

+		CtrlI = 131145,

+		CtrlIns = 131117,

+		CtrlJ = 131146,

+		CtrlK = 131147,

+		CtrlL = 131148,

+		CtrlM = 131149,

+		CtrlN = 131150,

+		CtrlO = 131151,

+		CtrlP = 131152,

+		CtrlQ = 131153,

+		CtrlR = 131154,

+		CtrlS = 131155,

+		CtrlT = 131156,

+		CtrlU = 131157,

+		CtrlV = 131158,

+		CtrlW = 131159,

+		CtrlX = 131160,

+		CtrlY = 131161,

+		CtrlZ = 131162,

+		CtrlShift0 = 196656,

+		CtrlShift1 = 196657,

+		CtrlShift2 = 196658,

+		CtrlShift3 = 196659,

+		CtrlShift4 = 196660,

+		CtrlShift5 = 196661,

+		CtrlShift6 = 196662,

+		CtrlShift7 = 196663,

+		CtrlShift8 = 196664,

+		CtrlShift9 = 196665,

+		CtrlShiftA = 196673,

+		CtrlShiftB = 196674,

+		CtrlShiftC = 196675,

+		CtrlShiftD = 196676,

+		CtrlShiftE = 196677,

+		CtrlShiftF = 196678,

+		CtrlShiftF1 = 196720,

+		CtrlShiftF2 = 196721,

+		CtrlShiftF3 = 196722,

+		CtrlShiftF4 = 196723,

+		CtrlShiftF5 = 196724,

+		CtrlShiftF6 = 196725,

+		CtrlShiftF7 = 196726,

+		CtrlShiftF8 = 196727,

+		CtrlShiftF9 = 196728,

+		CtrlShiftF10 = 196729,

+		CtrlShiftF11 = 196730,

+		CtrlShiftF12 = 196731,

+		CtrlShiftG = 196679,

+		CtrlShiftH = 196680,

+		CtrlShiftI = 196681,

+		CtrlShiftJ = 196682,

+		CtrlShiftK = 196683,

+		CtrlShiftL = 196684,

+		CtrlShiftM = 196685,

+		CtrlShiftN = 196686,

+		CtrlShiftO = 196687,

+		CtrlShiftP = 196688,

+		CtrlShiftQ = 196689,

+		CtrlShiftR = 196690,

+		CtrlShiftS = 196691,

+		CtrlShiftT = 196692,

+		CtrlShiftU = 196693,

+		CtrlShiftV = 196694,

+		CtrlShiftW = 196695,

+		CtrlShiftX = 196696,

+		CtrlShiftY = 196697,

+		CtrlShiftZ = 196698,

+		Del = 46,

+		F1 = 112,

+		F2 = 113,

+		F3 = 114,

+		F4 = 115,

+		F5 = 116,

+		F6 = 117,

+		F7 = 118,

+		F8 = 119,

+		F9 = 120,

+		F10 = 121,

+		F11 = 122,

+		F12 = 123,

+		Ins = 45,

+		None = 0,

+		ShiftDel = 65582,

+		ShiftF1 = 65648,

+		ShiftF2 = 65649,

+		ShiftF3 = 65650,

+		ShiftF4 = 65651,

+		ShiftF5 = 65652,

+		ShiftF6 = 65653,

+		ShiftF7 = 65654,

+		ShiftF8 = 65655,

+		ShiftF9 = 65656,

+		ShiftF10 = 65657,

+		ShiftF11 = 65658,

+		ShiftF12 = 65659,

+		ShiftIns = 65581

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SizeGripStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SizeGripStyle.cs
new file mode 100644
index 00000000000..7883ed12915
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SizeGripStyle.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.SizeGripStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum SizeGripStyle {

+		Auto = 0,

+		Hide = 2,

+		Show = 1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SortOrder.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SortOrder.cs
new file mode 100644
index 00000000000..58cf0b0f2e1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SortOrder.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.SortOrder.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum SortOrder {

+		Ascending = 1,

+		Descending = 2,

+		Nonoe = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Splitter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Splitter.cs
new file mode 100644
index 00000000000..0dc4f803cb0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Splitter.cs
@@ -0,0 +1,329 @@
+//

+// System.Windows.Forms.Splitter.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class Splitter : Control, IMessageFilter {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public Splitter()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public override  bool AllowDrop {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override  AnchorStyles Anchor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override  Image BackgroundImage {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public BorderStyle BorderStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override DockStyle Dock {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Font Font {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color ForeColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int MinExtra {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int MinSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SplitPosition {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		

+		//  --- Public Methods

+		

+		//public IAsyncResult BeginInvoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public IAsyncResult BeginInvoke(Delegate del, object[] obj)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public override void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override bool Equals(object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode() {

+			//FIXME add our proprities

+			return base.GetHashCode();

+		}		

+		//public void Invalidate()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(bool b)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect, bool b)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout(Control ctl, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout(bool b)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1, float val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4, BoundsSpecified bounds)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		//inherited

+		//protected override void Dispose(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override void OnKeyDown(KeyEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnMouseDown(MouseEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnMouseMove(MouseEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnMouseUp(MouseEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		//ContentAlignment RtlTranslateAlignment(ContentAlignment calign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment halign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment lralign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected virtual void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override void SetBoundsCore( int x, int y, int width, int height, BoundsSpecified specified)

+		{

+			throw new NotImplementedException ();

+		}

+		//protected void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4, int val5, int val6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		bool IMessageFilter.PreFilterMessage(ref Message m){

+			throw new NotImplementedException ();

+		}

+	 }

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SplitterEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SplitterEventArgs.cs
new file mode 100644
index 00000000000..b6e084182a2
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SplitterEventArgs.cs
@@ -0,0 +1,148 @@
+//

+// System.Windows.Forms.SplitterEventArgs.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	// </summary>

+

+    [ComVisible(true)]

+	public class SplitterEventArgs : EventArgs {

+

+		#region Fields

+		private int x;

+		private int y;

+		private int splitx;

+		private int splity;

+		#endregion

+

+		//

+		//  --- Constructor

+		//

+		public SplitterEventArgs(int x, int y, int splitX, int splitY)

+		{

+			this.x = x;

+			this.y = y;

+			splitx = splitX;

+			splity = splitY;

+		}

+

+		#region Public Properties

+		[ComVisible(true)]

+		public int SplitX {

+			get {

+				return splitx;

+			}

+			set {

+				splitx = value;

+			}

+		}

+		[ComVisible(true)]

+		public int SplitY {

+			get {

+				return splity;

+			}

+			set {

+				splity = value;

+			}

+		}

+		[ComVisible(true)]

+		public int X {

+			get {

+				return x;

+			}

+		}

+		[ComVisible(true)]

+		public int Y {

+			get {

+				return y;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two SplitterEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	SplitX, SplitY, X, Y Property

+		///	of the two SplitterEventArgs.

+		/// </remarks>

+		public static bool operator == (SplitterEventArgs SplitterEventArgsA, SplitterEventArgs SplitterEventArgsB) 

+		{

+			return (SplitterEventArgsA.SplitX == SplitterEventArgsB.SplitX) && (SplitterEventArgsA.SplitY == SplitterEventArgsB.SplitY) && (SplitterEventArgsA.X == SplitterEventArgsB.X) && (SplitterEventArgsA.Y == SplitterEventArgsB.Y);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two SplitterEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	SplitX, SplitY, X, Y Property

+		///	of the two SplitterEventArgs.

+		/// </remarks>

+		public static bool operator != (SplitterEventArgs SplitterEventArgsA, SplitterEventArgs SplitterEventArgsB) 

+		{

+			return (SplitterEventArgsA.SplitX != SplitterEventArgsB.SplitX) || (SplitterEventArgsA.SplitY != SplitterEventArgsB.SplitY) || (SplitterEventArgsA.X != SplitterEventArgsB.X) || (SplitterEventArgsA.Y != SplitterEventArgsB.Y);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	UICuesEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is SplitterEventArgs))return false;

+			return (this == (SplitterEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the SplitterEventArgs as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SplitterEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SplitterEventHandler.cs
new file mode 100644
index 00000000000..5b8aafae22e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SplitterEventHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.SplitterEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the SplitterMoving and SplitterMoved events of a Splitter.

+	/// </summary>

+	//[Serializable]

+	public delegate void SplitterEventHandler(object sender, SplitterEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBar.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBar.cs
new file mode 100644
index 00000000000..14ad7423aa9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBar.cs
@@ -0,0 +1,487 @@
+//

+// System.Windows.Forms.StatusBar.cs

+//

+// Author:

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System;

+using System.Collections;

+using System.Drawing;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//	Represents a Windows status bar control.

+	// </summary>

+	public class StatusBar : Control {

+

+		//

+		//  --- Private Fields

+		//

+		private bool showPanels;

+		private bool sizingGrip;

+

+		//

+		//  --- Constructors/Destructors

+		//

+		[MonoTODO]

+		public StatusBar() : base()

+		{

+			Dock = DockStyle.Bottom;

+			showPanels = false;

+			sizingGrip = true;

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected override void CreateHandle()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//inherited

+		//protected override void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected virtual void OnDrawItem(StatusBarDrawItemEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleDestroyed(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnLayout(LayoutEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnMouseDown(MouseEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnPanelClick(StatusBarPanelClickEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnResize(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Events

+		//

+		public event StatusBarDrawItemEventHandler DrawItem;

+		public event StatusBarPanelClickEventHandler PanelClick;

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public override Color BackColor {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public override Image BackgroundImage {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public override DockStyle Dock {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public override Font Font {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public override Color ForeColor {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public new ImeMode ImeMode {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public StatusBar.StatusBarPanelCollection Panels {

+

+			get { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public bool ShowPanels {// default false {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public bool SizingGrip // default true {

+		{

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public new bool TabStop {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public override string Text {

+

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+

+		//

+		//  --- Protected Properties

+		//

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+

+			get { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+

+			get { throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+

+			get { throw new NotImplementedException (); }

+		}

+

+		//

+		// System.Windows.Forms.StatusBar.StatusBarPanelCollection

+		//

+		// Author:

+		//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+		//   stub ammended by Jaak Simm (jaaksimm@firm.ee)

+		//   Implemented by Richard Baumann <biochem333@nyc.rr.com>

+		// (C) Ximian, Inc., 2002

+		//

+		// <summary>

+		//	Represents the collection of panels in a StatusBar control.

+		// </summary>

+		public class StatusBarPanelCollection : IList, ICollection, IEnumerable {

+

+			//

+			//  --- Private Fields

+			//

+			private ArrayList list;

+			private StatusBar owner;

+			private static string class_string = "System.Windows.Forms.StatusBar.StatusBarPanelCollection::";

+

+			//

+			//  --- Constructors/Destructors

+			//

+			StatusBarPanelCollection(StatusBar owner) : base()

+			{

+				list = new ArrayList();

+				this.owner = owner;

+			}

+

+			//

+			//  --- Public Methods

+			//

+			[MonoTODO]

+			public virtual int Add(StatusBarPanel panel)

+			{

+				string method_string = "Add(StatusBarPanel) ";

+				if (panel == null) {

+

+					throw new ArgumentNullException(class_string + method_string + "panel == null");

+				}

+				if (panel.Parent == null) {

+

+					throw new ArgumentException(class_string + method_string + "panel.Parent != null");

+				}

+				// FIXME: StatusBarPanel.Parent is readonly!

+				//panel.Parent = owner;

+				return list.Add(panel);

+			}

+			[MonoTODO]

+			public virtual StatusBarPanel Add(string s)

+			{

+				throw new NotImplementedException ();

+			//	StatusBarPanel tmp = new StatusBarPanel();

+			//	tmp.Text = s;

+			//	// FIXME: StatusBarPanel.Parent is readonly!

+			//	//tmp.Parent = owner;

+			//	list.Add(tmp);

+			//	return tmp;

+			}

+			[MonoTODO]

+			public virtual void AddRange(StatusBarPanel[] panels)

+			{

+				string method_string = "AddRange(StatusBarPanel[]) ";

+				if (panels == null) {

+

+					throw new ArgumentNullException(class_string + method_string + "panels == null");

+				}

+				for (int i = 0; i < panels.Length; i++) {

+					// FIXME: StatusBarPanel.Parent is readonly!

+					//panels[i].Parent = owner;

+				}

+				list.AddRange(panels);

+			}

+			public virtual void Clear()

+			{

+				list.Clear();

+			}

+			public bool Contains(StatusBarPanel panel)

+			{

+				return list.Contains(panel);

+			}

+			public IEnumerator GetEnumerator()

+			{

+				return list.GetEnumerator();

+			}

+			public int IndexOf(StatusBarPanel panel)

+			{

+				return list.IndexOf(panel);

+			}

+			[MonoTODO]

+			public virtual void Insert(int index, StatusBarPanel panel)

+			{

+				string method_string = "Insert(int,StatusBarPanel) ";

+				if (panel == null) {

+

+					throw new ArgumentNullException(class_string + method_string + "panel == null");

+				}

+				if (panel.Parent == null) {

+

+					throw new ArgumentException(class_string + method_string + "panel.Parent != null");

+				}

+				if  (panel.AutoSize != StatusBarPanelAutoSize.None &&

+				     panel.AutoSize != StatusBarPanelAutoSize.Contents &&

+				     panel.AutoSize != StatusBarPanelAutoSize.Spring)

+				{

+					throw new InvalidEnumArgumentException(class_string + method_string + "panel.AutoSize is not a valid StatusBarPanelAutoSize value");

+				}

+				list.Insert(index,panel);

+				

+				                      // do this after insert because insert does the range checking and might throw an exception

+				// FIXME: StatusBarPanel.Parent is readonly!

+				// panel.Parent = owner; // a rethrow for a better exception message, or an extra range check, would incur an unnecessary performance cost

+			}

+			public virtual void Remove(StatusBarPanel panel)

+			{

+				string method_string = "Remove(StatusBarPanel) ";

+				if (panel == null) {

+

+					throw new ArgumentNullException(class_string + method_string + "panel == null");

+				}

+				list.Remove(panel);

+			}

+			public virtual void RemoveAt(int index)

+			{

+				list.RemoveAt(index);

+			}

+			void ICollection.CopyTo(Array dest, int index)

+			{

+				string method_string = "ICollection.CopyTo(Array,int) ";

+				if (dest == null) {

+

+					throw new ArgumentNullException(class_string + method_string + "array == null");

+				}

+				if (index < 0) {

+

+					throw new ArgumentOutOfRangeException(class_string + method_string + "index < 0");

+				}

+				if (dest.Rank != 1) {

+

+					throw new ArgumentException(class_string + method_string + "array is multidimensional");

+				}

+				if (index >= dest.Length) {

+

+					throw new ArgumentException(class_string + method_string + "index >= array.Length");

+				}

+				if (Count+index >= dest.Length) {

+

+					throw new ArgumentException(class_string + method_string + "insufficient array capacity");

+				}

+				// easier/quicker to let the runtime throw the invalid cast exception if necessary

+				for (int i = 0; index < dest.Length; i++, index++) {

+

+					dest.SetValue(list[i], index);

+				}

+			}

+			int IList.Add(object panel)

+			{

+				string method_string = "IList.Add(object) ";

+				if (!(panel is StatusBarPanel)) {

+

+					throw new ArgumentException(class_string + method_string + "panel is not a StatusBarPanel");

+				}

+				return Add((StatusBarPanel) panel);

+			}

+			bool IList.Contains(object panel)

+			{

+				if (!(panel is StatusBarPanel)) {

+

+					return false;

+				}

+				return Contains((StatusBarPanel) panel);

+			}

+			int IList.IndexOf(object panel)

+			{

+				if (!(panel is StatusBarPanel)) {

+

+					return -1;

+				}

+				return IndexOf((StatusBarPanel) panel);

+			}

+			void IList.Insert(int index, object panel)

+			{

+				string method_string = "IList.Insert(int,object) ";

+				if (!(panel is StatusBarPanel)) {

+

+					throw new ArgumentException(class_string + method_string + "panel is not a StatusBarPanel");

+				}

+				Insert(index, (StatusBarPanel) panel);

+			}

+			void IList.Remove(object panel)

+			{

+				string method_string = "IList.Remove(object) ";

+				if (!(panel is StatusBarPanel)) {

+

+					throw new ArgumentException(class_string + method_string + "panel is not a StatusBarPanel");

+				}

+				Remove((StatusBarPanel) panel);

+			}

+

+			

+			//  --- Public Properties

+			[MonoTODO]

+			public int Count {

+				get { throw new NotImplementedException (); }

+				//get { return list.Count; }

+			}

+			public bool IsReadOnly {

+

+				get { return false; }

+			}

+			object IList.this[int index] {

+

+				get { return this[index]; }

+				set { this[index]=(StatusBarPanel)value; }

+			}

+			public virtual StatusBarPanel this[int index] {

+

+				get

+				{

+					// The same checks are done by the list, so this is redundant

+					// This is left here in case you prefer better exception messages over performance

+					//string method_string = "get_Item(int) ";

+					//if (index < 0)

+					//{

+					//	throw new ArgumentOutOfRangeException(class_string + method_string + "index < 0");

+					//}

+					//if (index >= Count)

+					//{

+					//	throw new ArgumentOutOfRangeException(class_string + method_string + "index >= Count");

+					//}

+					return (StatusBarPanel)list[index];

+				}

+				set

+				{

+					// The same checks are done by the list, so this is redundant

+					// This is left here in case you prefer better exception messages over performance

+					//string method_string = "set_Item(int,StatusBarPanel) ";

+					//if (index < 0)

+					//{

+					//	throw new ArgumentOutOfRangeException(class_string + method_string + "index < 0");

+					//}

+					//if (index >= Count)

+					//{

+					//	throw new ArgumentOutOfRangeException(class_string + method_string + "index >= Count");

+					//}

+					//if (value == null)

+					//{

+					//	throw new ArgumentNullException(class_string + method_string + "panel == null");

+					//}

+					list[index] = value;

+				}

+			}

+			bool IList.IsFixedSize {

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			object ICollection.SyncRoot {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			bool ICollection.IsSynchronized {

+

+				[MonoTODO] get { throw new NotImplementedException (); }

+			}

+			

+			

+			//  --- Private Properties

+			

+			private bool IsFixedSize { get { return false; } }

+

+//			private object ILList.this[int index]

+//			{

+//				get { return (StatusBarPanel) this[index]; }

+//				set

+//				{

+//					string method_string = "IList.set_Item(int,object) ";

+//					if (!(value is StatusBarPanel))

+//					{

+//						throw new ArgumentException(class_string + method_string + "panel is not a StatusBarPanel");

+//					}

+//					this[index] = (StatusBarPanel) value;

+//				}

+//			}

+		}

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarDrawItemEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarDrawItemEventArgs.cs
new file mode 100644
index 00000000000..cf5cf819c70
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarDrawItemEventArgs.cs
@@ -0,0 +1,111 @@
+//

+// System.Windows.Forms.StatusBarDrawItemEventArgs

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides data for the DrawItem event.

+	/// </summary>

+	public class StatusBarDrawItemEventArgs : DrawItemEventArgs {

+

+		private StatusBarPanel panel;

+

+		/// --- Constructor ---

+		public StatusBarDrawItemEventArgs(Graphics g, Font font, Rectangle r, int itemId, DrawItemState itemState, StatusBarPanel panel)

+		: base(g, font, r, itemId, itemState) {

+			this.panel = panel;

+		}

+		

+		#region Public Properties

+		public StatusBarPanel Panel 

+		{

+			get {

+				return panel;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two StatusBarDrawItemEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	the BackColor, Bounds, Font, ForeColor, Graphics,

+		///	Index, Panel, and State properties of the two

+		///	StatusBarDrawItemEventArgs.

+		/// </remarks>

+		public static bool operator == (StatusBarDrawItemEventArgs objA, StatusBarDrawItemEventArgs objB) 

+		{

+			return ((objA.panel == objB.panel) && ((DrawItemEventArgs) objA == (DrawItemEventArgs) objB));

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two StatusBarDrawItemEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	the BackColor, Bounds, Font, ForeColor, Graphics,

+		///	Index, Panel, and State properties of the two

+		///	StatusBarDrawItemEventArgs.

+		/// </remarks>

+		public static bool operator != (StatusBarDrawItemEventArgs objA, StatusBarDrawItemEventArgs objB) 

+		{

+			return ((objA.panel != objB.panel) || ((DrawItemEventArgs) objA != (DrawItemEventArgs) objB));

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	StatusBarDrawItemEventArgs and another object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is StatusBarDrawItemEventArgs))return false;

+			return (this == (StatusBarDrawItemEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		///	Returns DrawItemEventArgs.GetHashCode().

+		/// </remarks>

+		public override int GetHashCode () 

+		{

+			// FIXME: In a perfect world, get hashcode would include

+			//		  Panel, but this shouldbe good enough.

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the StatusBarDrawItemEventArgs as a string.

+		/// </remarks>

+		public override string ToString () 

+		{

+			return base.ToString() + panel.ToString();

+		}

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarDrawItemEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarDrawItemEventHandler.cs
new file mode 100644
index 00000000000..a10c044ca9e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarDrawItemEventHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.StatusBarDrawItemEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the DrawItem event of a StatusBar.

+	/// </summary>

+	//[Serializable]

+	public delegate void StatusBarDrawItemEventHandler(object sender, StatusBarDrawItemEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanel.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanel.cs
new file mode 100644
index 00000000000..b5728b7744b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanel.cs
@@ -0,0 +1,141 @@
+//

+// System.Windows.Forms.StatusBarPanel

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System;

+using System.ComponentModel;

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	/// <summary>

+	///	Represents a panel in a StatusBar control.

+	/// </summary>

+	public class StatusBarPanel : Component, ISupportInitialize {

+

+		//

+		//  --- Private Fields

+		//

+		private HorizontalAlignment alignment;

+		private StatusBarPanelAutoSize autoSize;

+		private StatusBarPanelBorderStyle borderStyle;

+		private Icon icon;

+		private int minWidth;

+		private StatusBar parent;

+		private StatusBarPanelStyle style;

+		private string text;

+		private string toolTipText;

+		private int width;

+

+		//

+		//  --- Constructors/Destructors

+		//

+		StatusBarPanel() : base()

+		{

+			alignment = HorizontalAlignment.Left;

+			autoSize = StatusBarPanelAutoSize.None;

+			borderStyle = StatusBarPanelBorderStyle.Sunken;

+			icon = null;

+			minWidth = 10;

+			style = StatusBarPanelStyle.Text;

+			text = "";

+			toolTipText = "";

+			width = 100;

+		}

+

+		//

+		//  --- Public Methods

+		//

+		[MonoTODO]

+		public void BeginInit()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void EndInit()

+		{

+			throw new NotImplementedException ();

+		}

+		public override string ToString()

+		{

+			return text;

+		}

+

+		//

+		//  --- Protected Methods

+		//

+

+		//inherited

+		//protected override void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Public Properties

+		//

+		public HorizontalAlignment Alignment {

+

+			get { return alignment; }

+			set { alignment = value; }

+		}

+		public StatusBarPanelAutoSize AutoSize {

+

+			get { return autoSize; }

+			set

+			{

+				if  (value != StatusBarPanelAutoSize.None && value != StatusBarPanelAutoSize.Contents && value != StatusBarPanelAutoSize.Spring) {

+

+					throw new InvalidEnumArgumentException("System.Windows.Forms.StatusBarPanel::set_AutoSize(StatusBarPanelAutoSize) " +

+					                                       "value is not a valid StatusBarPanelAutoSize value");

+				}

+				autoSize = value;

+			}

+		}

+		public StatusBarPanelBorderStyle BorderStyle {

+

+			get { return borderStyle; }

+			set { borderStyle = value; }

+		}

+		public Icon Icon {

+

+			get { return icon; }

+			set { icon = value; }

+		}

+		public int MinWidth {

+

+			get { return minWidth; }

+			set { minWidth = value; }

+		}

+		public StatusBar Parent {

+

+			get { return parent; }

+			set { parent = value; }

+		}

+		public StatusBarPanelStyle Style {

+

+			get { return style; }

+			set { style = value; }

+		}

+		public string Text {

+

+			get { return text; }

+			set { text = value; }

+		}

+		public string ToolTipText {

+

+			get { return toolTipText; }

+			set { toolTipText = value; }

+		}

+		public int Width {

+

+			get { return width; }

+			set { width = value; }

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelAutoSize.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelAutoSize.cs
new file mode 100644
index 00000000000..d1f02a8e314
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelAutoSize.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.StatusBarPanelAutoSize.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum StatusBarPanelAutoSize {

+		Contents = 3,

+		None = 1,

+		Spring = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelBorderStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelBorderStyle.cs
new file mode 100644
index 00000000000..19eec69a051
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelBorderStyle.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.StatusBarPanelBorderStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum StatusBarPanelBorderStyle {

+		None = 1,

+		Raised = 2,

+		Sunken =3

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelClickEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelClickEventArgs.cs
new file mode 100644
index 00000000000..3f8fc50e254
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelClickEventArgs.cs
@@ -0,0 +1,121 @@
+//

+// System.Windows.Forms.StatusBarPanelClickEventArgs

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides data for the PanelClick event.

+	/// </summary>

+	public class StatusBarPanelClickEventArgs : MouseEventArgs {

+

+		private StatusBarPanel panel;

+

+		/// --- Constructor ---

+		public StatusBarPanelClickEventArgs(StatusBarPanel panel, MouseButtons button, int clicks, int x, int y) : base(button, clicks, x, y, 0) 

+		{

+			this.panel = panel;

+		}

+

+		#region Public Properties

+		

+		/// <summary>

+		///	StatusBarPanel Property

+		/// </summary>

+		///

+		/// <remarks>

+		///	Gets the StatusBarPanel to draw.

+		/// </remarks>

+		public StatusBarPanel StatusBarPanel 

+		{

+			get 

+			{

+				return panel;

+			}

+		}

+

+

+		#endregion

+

+		#region Public Methods

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two StatusBarPanelClickEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	the StatusBarPanel, Button, Clicks, X, and Y

+		///	properties of the two StatusBarPanelClickEventArgs.

+		/// </remarks>

+		public static bool operator == (StatusBarPanelClickEventArgs objA, StatusBarPanelClickEventArgs objB) 

+		{

+			return ((objA.panel == objB.panel) && (objA.Button == objB.Button) && (objA.Clicks == objB.Clicks) && (objA.X == objB.X) && (objA.Y == objB.Y));

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two StatusBarPanelClickEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	the StatusBarPanel, Button, Clicks, X, and Y

+		///	properties of the two StatusBarPanelClickEventArgs.

+		/// </remarks>

+		public static bool operator != (StatusBarPanelClickEventArgs objA, StatusBarPanelClickEventArgs objB) 

+		{

+			return ((objA.panel != objB.panel) || (objA.Button != objB.Button) || (objA.Clicks != objB.Clicks) || (objA.X != objB.X) || (objA.Y != objB.Y));

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	StatusBarPanelClickEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is StatusBarPanelClickEventArgs))return false;

+			return (this == (StatusBarPanelClickEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		public override int GetHashCode () 

+		{

+			return unchecked(panel.GetHashCode() * base.GetHashCode());

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the StatusBarPanelClickEventArgs as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelClickEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelClickEventHandler.cs
new file mode 100644
index 00000000000..c7238743026
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelClickEventHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.StatusBarPanelClickEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the PanelClick event of a StatusBar.

+	/// </summary>

+	//[Serializable]

+	public delegate void StatusBarPanelClickEventHandler(object sender, StatusBarPanelClickEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelCollection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelCollection.cs
new file mode 100644
index 00000000000..b2c030bddf9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelCollection.cs
@@ -0,0 +1,195 @@
+//

+// System.Windows.Forms.StatusBarPanelCollection

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template. Nothing is implemented yet.

+	//	Represents the collection of panels in a StatusBar control.

+	// </summary>

+

+	public class StatusBarPanelCollection : IList, ICollection, IEnumerable {

+

+		

+		//  --- Public Methods

+		

+		[MonoTODO]

+		StatusBarPanelCollection(StatusBar owner)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual int Add(StatusBarPanel panel)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual StatusBarPanel Add(string s)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual void AddRange(StatusBarPanel[] panels)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual void Clear()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public bool Contains(StatusBarPanel panel)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public IEnumerator GetEnumerator()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int IndexOf(StatusBarPanel panel)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual void Insert(int index, StatusBarPanel panel)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual void Remove(StatusBarPanel panel)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual void RemoveAt(int index)

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		//  --- Protected Methods

+		

+		[MonoTODO]

+		~StatusBarPanelCollection()

+		{

+			throw new NotImplementedException ();

+		}

+

+		

+		//  --- Public Properties

+		

+		[MonoTODO]

+		public int Count {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public bool IsReadOnly {

+

+			get

+			{

+				return false; // for this collection, this is always false

+			}

+		}

+		[MonoTODO]

+		public virtual StatusBarPanel this[int index] {

+

+			get{ throw new NotImplementedException (); }

+			set{ throw new NotImplementedException (); }

+		}

+		/// <summary>

+		/// IList Interface implmentation.

+		/// </summary>

+		bool IList.IsReadOnly{

+			get{

+				// We allow addition, removeal, and editing of items after creation of the list.

+				return false;

+			}

+		}

+		bool IList.IsFixedSize{

+			get{

+				// We allow addition and removeal of items after creation of the list.

+				return false;

+			}

+		}

+

+		//[MonoTODO]

+		object IList.this[int index]{

+			get{

+				throw new NotImplementedException ();

+			}

+			set{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		void IList.Clear(){

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		int IList.Add( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		bool IList.Contains( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		int IList.IndexOf( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.Insert(int index, object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.Remove( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.RemoveAt( int index){

+			throw new NotImplementedException ();

+		}

+		// End of IList interface

+		/// <summary>

+		/// ICollection Interface implmentation.

+		/// </summary>

+		int ICollection.Count{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		bool ICollection.IsSynchronized{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		object ICollection.SyncRoot{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		void ICollection.CopyTo(Array array, int index){

+			throw new NotImplementedException ();

+		}

+		// End Of ICollection

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelStyle.cs
new file mode 100644
index 00000000000..1be98572930
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StatusBarPanelStyle.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.StatusBarPanelStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum StatusBarPanelStyle {

+		OwnerDraw = 2,

+		Text =1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/StructFormat.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/StructFormat.cs
new file mode 100644
index 00000000000..54ebd39caec
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/StructFormat.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.StructFormat.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum StructFormat {

+		Ansi = 1,

+		Auto = 3,

+		Unicode = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/System.Windows.Forms.csproj b/mcs/class/System.Windows.Forms/System.Windows.Forms/System.Windows.Forms.csproj
new file mode 100644
index 00000000000..a32cdf90b74
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/System.Windows.Forms.csproj
@@ -0,0 +1,1658 @@
+<VisualStudioProject>

+    <CSHARP

+        ProjectType = "Local"

+        ProductVersion = "7.0.9466"

+        SchemaVersion = "1.0"

+        ProjectGuid = "{E432273C-2550-4642-866B-3FD63BE785EB}"

+    >

+        <Build>

+            <Settings

+                ApplicationIcon = ""

+                AssemblyKeyContainerName = ""

+                AssemblyName = "System.Windows.Forms"

+                AssemblyOriginatorKeyFile = ""

+                DefaultClientScript = "JScript"

+                DefaultHTMLPageLayout = "Grid"

+                DefaultTargetSchema = "IE50"

+                DelaySign = "false"

+                OutputType = "Library"

+                RootNamespace = "System.Windows.Forms"

+                StartupObject = ""

+            >

+                <Config

+                    Name = "Debug"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "DEBUG;TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "true"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "true"

+                    Optimize = "false"

+                    OutputPath = "bin\Debug\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+                <Config

+                    Name = "Release"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "false"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "false"

+                    Optimize = "true"

+                    OutputPath = "bin\Release\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+            </Settings>

+            <References>

+                <Reference

+                    Name = "System"

+                    AssemblyName = "System"

+                    HintPath = "..\..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.dll"

+                />

+                <Reference

+                    Name = "System.Data"

+                    AssemblyName = "System.Data"

+                    HintPath = "..\..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"

+                />

+                <Reference

+                    Name = "System.XML"

+                    AssemblyName = "System.Xml"

+                    HintPath = "..\..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"

+                />

+                <Reference

+                    Name = "System.Drawing"

+                    AssemblyName = "System.Drawing"

+                    HintPath = "..\..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Drawing.dll"

+                />

+                <Reference

+                    Name = "Accessibility"

+                    AssemblyName = "Accessibility"

+                    HintPath = "..\..\..\..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\Accessibility.dll"

+                />

+                <Reference

+                    Name = "System.Windows.Forms.Design"

+                    Project = "{EF89E643-02F5-4E97-9353-3C92F209EB47}"

+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"

+                />

+            </References>

+        </Build>

+        <Files>

+            <Include>

+                <File

+                    RelPath = "AccessibleEvents.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AccessibleNavigation.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AccessibleObject.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AccessibleRole.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AccessibleSelection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AccessibleStates.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AmbientProperties.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AnchorStyles.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Appearance.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Application.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ApplicationContext.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ArrangeDirection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ArrangeStartingPosition.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AssemblyInfo.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AxHost.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "BaseCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Binding.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "BindingContext.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "BindingManagerBase.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "BindingMemberInfo.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "BindingsCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "BootMode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Border3DSide.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Border3DStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "BorderStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "BoundsSpecified.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Button.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ButtonBase.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ButtonBorderStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ButtonState.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "CaptionButton.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "CharacterCasing.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "CheckBox.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "CheckedListBox.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "CheckState.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Clipboard.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ColorDepth.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ColorDialog.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ColumnClickEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ColumnClickEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ColumnHeader.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ColumnHeaderStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ComboBox.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ComboBoxStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "CommonDialog.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ComVisible.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ContainerControl.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ContentsResizedEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ContentsResizedEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ContextMenu.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Control.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ControlBindingsCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ControlEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ControlEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ControlPaint.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ControlStyles.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ConvertEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ConvertEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "CreateParams.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "CurrencyManager.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Cursor.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "CursorConverter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Cursors.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataFormats.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataGrid.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataGridBoolColumn.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataGridCell.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataGridColumnStyle.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataGridLineStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataGridParentRowsLabelStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataGridPreferredColumnWidthTypeConverter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataGridTableStyle.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataGridTextBox.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataGridTextBoxColumn.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DataObject.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DateBoldEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DateRangeEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DateRangeEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DateTimePicker.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DateTimePickerFormat.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "day.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DialogResult.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DockStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DomainUpDown.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DragAction.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DragDropEffects.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DragEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DragEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DrawItemEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DrawItemEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DrawItemState.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DrawMode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ErrorBlinkStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ErrorIconAlignment.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ErrorProvider.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "FeatureSupport.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "FileDialog.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "FlatStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "FontDialog.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Form.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "FormBorderStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "FormStartPosition.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "FormWindowState.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "FrameStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "GiveFeedbackEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "GiveFeedbackEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "GridColumnStylesCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "GridItem.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "GridItemCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "GridItemType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "GridTableStylesCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "GroupBox.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Help.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "HelpEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "HelpEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "HelpNavigator.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "HelpProvider.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "HorizontalAlignment.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "HScrollBar.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IButtonControl.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ICommandExecutor.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IComponentEditorPageSite.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IContainerControl.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IDataGridColumnStyleEditingNotificationService.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IDataGridEditingService.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IDataObject.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IFeatureSupport.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IFileReaderService.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ImageIndexConverter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ImageList.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ImageListStreamer.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ImeMode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IMessageFilter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "InputLanguage.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "InputLanguageChangedEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "InputLanguageChangedEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "InputLanguageChangingEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "InputLanguageChangingEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "InputLanguageCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "InvalidateEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "InvalidateEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ItemActivation.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ItemBoundsPortion.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ItemChangedEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ItemChangedEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ItemCheckEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ItemCheckEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ItemDragEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ItemDragEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IWin32Window.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "IWindowTarget.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "KeyEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "KeyEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "KeyPressEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "KeyPressEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Keys.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "KeysConverter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Label.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LabelEditEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LabelEditEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LayoutEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LayoutEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LeftRightAlignment.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LinkArea.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LinkBehavior.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LinkClickedEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LinkClickedEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LinkLabel.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LinkLabelLinkClickedEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LinkLabelLinkClickedEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "LinkState.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ListBindingConverter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ListBox.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ListControl.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ListView.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ListViewAlignment.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ListViewItem.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ListViewItemConverter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MainMenu.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MdiLayout.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MeasureItemEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MeasureItemEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Menu.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MenuGlyph.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MenuItem.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MenuMerge.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Message.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MessageBox.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MessageBoxButtons.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MessageBoxDefaultButton.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MessageBoxIcon.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MessageBoxOptions.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MethodInvoker.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MonthCalendar.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MouseButtons.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MouseEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MouseEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NativeWindow.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NavigateEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NavigateEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NodeLabelEditEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NodeLabelEditEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NotifyIcon.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NumericUpDown.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "OpacityConverter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "OpenFileDialog.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Orientation.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "OSFeature.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PageSetupDialog.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PaintEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PaintEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Panel.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PictureBoxSizeMode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PrintControllerWithStatusDialog.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PrintDialog.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PrintPreviewControl.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PrintPreviewDialog.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ProgressBar.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PropertyGrid.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PropertyManager.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PropertySort.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PropertyTabChangedEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PropertyTabChangedEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PropertyValueChangedEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PropertyValueChangedEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "QueryAccessibilityHelpEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "QueryAccessibilityHelpEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "QueryContinueDragEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "QueryContinueDragEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "RadioButton.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "RichTextBox.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "RichTextBoxFinds.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "RichTextBoxScrollBars.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "RichTextBoxSelectionAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "RichTextBoxSelectionTypes.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "RichTextBoxStreamType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "RichTextBoxWordPunctuations.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "RightToLeft.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SaveFileDialog.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Screen.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ScrollableControl.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ScrollBar.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ScrollBars.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ScrollButton.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ScrollEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ScrollEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ScrollEventType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SecurityIDType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SelectedGridItemChangedEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SelectedGridItemChangedEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SelectionMode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SelectionRange.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SelectionRangeConverter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SendKeys.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Shortcut.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SizeGripStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SortOrder.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Splitter.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SplitterEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SplitterEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StatusBar.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StatusBarDrawItemEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StatusBarDrawItemEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StatusBarPanel.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StatusBarPanelAutoSize.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StatusBarPanelBorderStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StatusBarPanelClickEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StatusBarPanelClickEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StatusBarPanelCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StatusBarPanelStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StructFormat.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SystemInformation.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TabAlignment.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TabAppearance.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TabControl.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TabDrawMode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TabPage.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TabSizeMode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TextBox.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TextBoxBase.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ThreadExceptionDialog.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TickStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "Timer.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TODOAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ToolBar.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ToolBarAppearance.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ToolBarButton.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ToolBarButtonClickEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ToolBarButtonClickEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ToolBarButtonStyle.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ToolBarTextAlign.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "tooltip.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TrackBar.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TreeNode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TreeNodeCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TreeNodeConverter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TreeView.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TreeViewAction.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TreeViewCancelEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TreeViewCancelEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TreeViewEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TreeViewEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TreeViewImageIndexConverter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "UICues.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "UICuesEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "UICuesEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "UpDownBase.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "UpDownEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "UpDownEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "UserControl.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "View.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "VScrollBar.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+            </Include>

+        </Files>

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/System.Windows.Forms.csproj.user b/mcs/class/System.Windows.Forms/System.Windows.Forms/System.Windows.Forms.csproj.user
new file mode 100644
index 00000000000..b31ea6e5b06
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/System.Windows.Forms.csproj.user
@@ -0,0 +1,48 @@
+<VisualStudioProject>

+    <CSHARP>

+        <Build>

+            <Settings ReferencePath = "" >

+                <Config

+                    Name = "Debug"

+                    EnableASPDebugging = "false"

+                    EnableASPXDebugging = "false"

+                    EnableUnmanagedDebugging = "false"

+                    EnableSQLServerDebugging = "false"

+                    RemoteDebugEnabled = "false"

+                    RemoteDebugMachine = ""

+                    StartAction = "Project"

+                    StartArguments = ""

+                    StartPage = ""

+                    StartProgram = ""

+                    StartURL = ""

+                    StartWorkingDirectory = ""

+                    StartWithIE = "false"

+                />

+                <Config

+                    Name = "Release"

+                    EnableASPDebugging = "false"

+                    EnableASPXDebugging = "false"

+                    EnableUnmanagedDebugging = "false"

+                    EnableSQLServerDebugging = "false"

+                    RemoteDebugEnabled = "false"

+                    RemoteDebugMachine = ""

+                    StartAction = "Project"

+                    StartArguments = ""

+                    StartPage = ""

+                    StartProgram = ""

+                    StartURL = ""

+                    StartWorkingDirectory = ""

+                    StartWithIE = "true"

+                />

+            </Settings>

+        </Build>

+        <OtherProjectSettings

+            CopyProjectDestinationFolder = ""

+            CopyProjectUncPath = ""

+            CopyProjectOption = "0"

+            ProjectView = "ProjectFiles"

+            ProjectTrust = "0"

+        />

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/System.Windows.Forms.sln b/mcs/class/System.Windows.Forms/System.Windows.Forms/System.Windows.Forms.sln
new file mode 100644
index 00000000000..cb5a2aecab4
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/System.Windows.Forms.sln
@@ -0,0 +1,27 @@
+Microsoft Visual Studio Solution File, Format Version 7.00

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Windows.Forms", "System.Windows.Forms.csproj", "{E432273C-2550-4642-866B-3FD63BE785EB}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "System.Windows.Forms.Design", "..\System.Windows.Forms.Design\System.Windows.Forms.Design.csproj", "{EF89E643-02F5-4E97-9353-3C92F209EB47}"

+EndProject

+Global

+	GlobalSection(SolutionConfiguration) = preSolution

+		ConfigName.0 = Debug

+		ConfigName.1 = Release

+	EndGlobalSection

+	GlobalSection(ProjectDependencies) = postSolution

+	EndGlobalSection

+	GlobalSection(ProjectConfiguration) = postSolution

+		{E432273C-2550-4642-866B-3FD63BE785EB}.Debug.ActiveCfg = Debug|.NET

+		{E432273C-2550-4642-866B-3FD63BE785EB}.Debug.Build.0 = Debug|.NET

+		{E432273C-2550-4642-866B-3FD63BE785EB}.Release.ActiveCfg = Release|.NET

+		{E432273C-2550-4642-866B-3FD63BE785EB}.Release.Build.0 = Release|.NET

+		{EF89E643-02F5-4E97-9353-3C92F209EB47}.Debug.ActiveCfg = Debug|.NET

+		{EF89E643-02F5-4E97-9353-3C92F209EB47}.Debug.Build.0 = Debug|.NET

+		{EF89E643-02F5-4E97-9353-3C92F209EB47}.Release.ActiveCfg = Release|.NET

+		{EF89E643-02F5-4E97-9353-3C92F209EB47}.Release.Build.0 = Release|.NET

+	EndGlobalSection

+	GlobalSection(ExtensibilityGlobals) = postSolution

+	EndGlobalSection

+	GlobalSection(ExtensibilityAddIns) = postSolution

+	EndGlobalSection

+EndGlobal

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/SystemInformation.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/SystemInformation.cs
new file mode 100644
index 00000000000..906c1bcf61e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/SystemInformation.cs
@@ -0,0 +1,333 @@
+//

+// System.Windows.Forms.SystemInformation

+//

+// Author:

+//   stubbed out by Richard Baumann (biochem333@nyc.rr.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template. Nothing is implemented yet.

+	//	Provides information about the operating system.

+	// </summary>

+

+	public class SystemInformation {

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		~SystemInformation()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public static ArrangeDirection ArrangeDirection {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static ArrangeStartingPosition ArrangeStartingPosition {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static BootMode BootMode {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size Border3DSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size BorderSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size CaptionButtonSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int CaptionHeight {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static string ComputerName {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size CursorSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool DbcsEnabled {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool DebugOS {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size DoubleClickSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int DoubleClickTime {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool DragFullWindows {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size DragSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size FixedFrameBorderSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size FrameBorderSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool HighContrast {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int HorizontalScrollBarArrowWidth {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int HorizontalScrollBarHeight {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int HorizontalScrollBarThumbWidth {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size IconSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size IconSpacingSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int KanjiWindowHeight {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size MaxWindowTrackSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size MenuButtonSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size MenuCheckSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Font MenuFont {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int MenuHeight {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool MidEastEnabled {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size MinimizedWindowSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size MinimizedWindowSpacingSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size MinimumWindowSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size MinWindowTrackSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int MonitorCount {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool MonitorsSameDisplayFormat {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int MouseButtons {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool MouseButtonsSwapped {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool MousePresent {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool MouseWheelPresent {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int MouseWheelScrollLines {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool NativeMouseWheelSupport {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool Network {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool PenWindows {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size PrimaryMonitorMaximizedWindowSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size PrimaryMonitorSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool RightAlignedMenus {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool Secure {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool ShowSounds {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size SmallIconSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Size ToolWindowCaptionButtonSize {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int ToolWindowCaptionHeight {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static string UserDomainName {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static bool UserInteractive {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static string UserName {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int VerticalScrollBarArrowHeight {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int VerticalScrollBarThumbHeight {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static int VerticalScrollBarWidth {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Rectangle VirtualScreen {

+

+			get{ throw new NotImplementedException (); }

+		}

+		[MonoTODO]

+		public static Rectangle WorkingArea {

+

+			get{ throw new NotImplementedException (); }

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TODOAttribute.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TODOAttribute.cs
new file mode 100644
index 00000000000..6e2ace72630
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TODOAttribute.cs
@@ -0,0 +1,32 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Windows.Forms {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All)]
+	internal class MonoTODOAttribute : Attribute {
+
+		string comment;
+
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TabAlignment.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabAlignment.cs
new file mode 100644
index 00000000000..fb7ed7f6b82
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabAlignment.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.TabAlignment.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum TabAlignment {

+		Bottom = 1,

+		Left = 2,

+		Right = 3,

+		Top = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TabAppearance.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabAppearance.cs
new file mode 100644
index 00000000000..794256bad2d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabAppearance.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.TabAppearance.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum TabAppearance {

+		Buttons = 1,

+		FlatButtons = 2,

+		Normal =0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TabControl.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabControl.cs
new file mode 100644
index 00000000000..d9fad6afd05
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabControl.cs
@@ -0,0 +1,457 @@
+//

+// System.Windows.Forms.TabControl

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+using System.Collections;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class TabControl : Control  {

+

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public TabControl() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public TabAlignment Alignment  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TabAppearance Appearance  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color BackColor  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Image BackgroundImage  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Rectangle DisplayRectangle  {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TabDrawMode DrawMode  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color ForeColor  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool HotTrack  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ImageList ImageList  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Size ItemSize  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Multiline  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Point Padding  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int RowCount {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SelectedIndex {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TabPage SelectedTab  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowToolTips  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TabSizeMode SizeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int TabCount  {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TabControl.TabPageCollection TabPages  {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		 

+		// --- Public Methods

+		

+		[MonoTODO]

+		public Rectangle GetTabRect(int index) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString() {

+			throw new NotImplementedException ();

+		}

+		

+		// --- Public Events

+		

+		[MonoTODO]

+		public event DrawItemEventHandler DrawItem;

+		

+		// --- Protected Properties

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams  {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Protected Methods

+		

+		[MonoTODO]

+		protected override Control.ControlCollection CreateControlsInstance() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void CreateHandle() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override bool IsInputKey(Keys keyData) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnDrawItem(DrawItemEventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleDestroyed(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnKeyDown(KeyEventArgs ke) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnResize(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnSelectedIndexChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnStyleChanged(EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override bool ProcessKeyPreview(ref Message m) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected void RemoveAll() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m) {

+			throw new NotImplementedException ();

+		}

+		//FIXME DONT COMPILE

+//		[MonoTODO]

+//		public class ControlCollection {//: Control.ControlCollection {

+//			//

+//			// --- Public Methods

+//			//

+//			[MonoTODO]

+//			public override void Add(Control value) {

+//				throw new NotImplementedException ();

+//			}

+//			[MonoTODO]

+//			public override void Remove(Control value) {

+//				throw new NotImplementedException ();

+//			}

+//		}

+		public class TabPageCollection : IList, ICollection, IEnumerable {

+			//

+			// --- Public Contructor

+			//

+			[MonoTODO]

+			public TabPageCollection(TabControl owner) {

+				throw new NotImplementedException ();

+			}

+			//

+			// --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public virtual TabPage this[int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+				set {

+					throw new NotImplementedException ();

+				}

+			}

+			

+			//--- Public Methods

+			

+			[MonoTODO]

+			public void Add(TabPage value) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void AddRange(TabPage[] pages) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public virtual void Clear() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public bool Contains(TabPage page) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(TabPage page) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Remove(TabPage value) {

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void RemoveAt(int index) {

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TabDrawMode.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabDrawMode.cs
new file mode 100644
index 00000000000..8fde27d17a8
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabDrawMode.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.TabDrawMode.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum TabDrawMode {

+		Normal = 0,

+		OwnerDrawfixed =1

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TabPage.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabPage.cs
new file mode 100644
index 00000000000..ef69b5df573
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabPage.cs
@@ -0,0 +1,108 @@
+//

+// System.Windows.Forms.TabPage

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class TabPage : Panel {

+

+		//

+		//  --- Public Constructor

+		//

+		[MonoTODO]

+		public TabPage() {

+			throw new NotImplementedException ();

+		}

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public override AnchorStyles Anchor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}	

+		}

+		[MonoTODO]

+		public override DockStyle Dock {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int ImageIndex {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string ToolTipText  {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		//  --- Public Methods

+		

+		[MonoTODO]

+		public static TabPage GetTabPageOfComponent(object comp) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString() {

+			throw new NotImplementedException ();

+		}

+		

+		//  --- Protected Methods

+		

+		[MonoTODO]

+		protected override ControlCollection CreateControlsInstance() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified) {

+			throw new NotImplementedException ();

+		}

+		// FIXME  dont compile

+		//[MonoTODO]

+		//public class TabPageControlCollection : Control.ControlCollection {

+		//	//

+		//	// --- Public Methods

+		//	//

+		//	public override void Add(Control value) {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TabSizeMode.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabSizeMode.cs
new file mode 100644
index 00000000000..54373dcbcc3
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TabSizeMode.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.TabSizeMode.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum TabSizeMode {

+		FillToRight = 1,

+		Fixed = 2,

+		Normal = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TextBox.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TextBox.cs
new file mode 100644
index 00000000000..80a00c9c686
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TextBox.cs
@@ -0,0 +1,138 @@
+//

+// System.Windows.Forms.TextBox

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+     public class TextBox : TextBoxBase {

+

+		//

+		//  --- Public Constructor

+		//

+		[MonoTODO]

+		public TextBox()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		//  --- Public Properties

+		

+		[MonoTODO]

+		public bool AcceptsReturn  {

+

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public CharacterCasing CharacterCasing {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public char PasswordChar {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ScrollBars ScrollBars {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public HorizontalAlignment TextAlign {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Public Events

+		

+		[MonoTODO]

+		public event EventHandler TextAlignChanged;

+        

+       //  --- Protected Properties

+        

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Protected Members

+		

+		protected override bool IsInputKey(Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnMouseUp(MouseEventArgs mevent)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		//[Lame Spec] spec says this should be virtural

+		protected override void OnTextAlignChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TextBoxBase.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
new file mode 100644
index 00000000000..511e4c4c37b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TextBoxBase.cs
@@ -0,0 +1,407 @@
+//

+// System.Windows.Forms.TextBoxBase

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+        public class TextBoxBase : Control {

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public bool AcceptsTab {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual bool AutoSize {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color BackColor {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public BorderStyle BorderStyle {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool CanUndo {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color ForeColor {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool HideSelection {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string[] Lines {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual int MaxLength {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Modified {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual bool Multiline {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int PreferredHeight {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ReadOnly {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual string SelectedText {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual int SelectionLength {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SelectionStart {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual int TextLength  {

+

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool WordWrap {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Public Methods

+		

+		[MonoTODO]

+		public void AppendText(string text) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Clear()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void ClearUndo()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Copy()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Cut()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Paste()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void ScrollToCaret()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Select(int start, int length) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void SelectAll()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Undo()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// --- Public Events

+		

+		[MonoTODO]

+		public event EventHandler AcceptsTabChanged;

+		[MonoTODO]

+		public event EventHandler AutoSizeChanged;

+		[MonoTODO]

+		public event EventHandler BorderStyleChanged;

+		//[MonoTODO]

+		//public event EventHandler Click;

+		[MonoTODO]

+		public event EventHandler HideSelectionChanged;

+		[MonoTODO]

+		public event EventHandler ModifiedChanged;

+		[MonoTODO]

+		public event EventHandler MultilineChanged;

+		[MonoTODO]

+		public event EventHandler ReadOnlyChanged;

+        

+        // --- Protected Properties

+        

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Protected Methods

+		

+		[MonoTODO]

+		protected override void CreateHandle()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override bool IsInputKey(Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnAcceptsTabChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnAutoSizeChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnBorderStyleChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleDestroyed(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnHideSelectionChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnModifiedChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnMultilineChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnReadOnlyChanged(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override bool ProcessDialogKey(Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ThreadExceptionDialog.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ThreadExceptionDialog.cs
new file mode 100644
index 00000000000..93e1594c470
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ThreadExceptionDialog.cs
@@ -0,0 +1,29 @@
+//

+// System.Windows.Forms.ThreadExceptionDialog

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class ThreadExceptionDialog : Form {

+

+		//

+		//  --- Public Constructor

+		//

+		[MonoTODO]

+		public ThreadExceptionDialog(Exception t)

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TickStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TickStyle.cs
new file mode 100644
index 00000000000..cdc6ab56a83
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TickStyle.cs
@@ -0,0 +1,23 @@
+//

+// System.Windows.Forms.TickStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+//	 Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum TickStyle {

+		Both = 3,

+		BottomRight = 2,

+		None =0,

+		TopLeft = 1,

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Timer.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Timer.cs
new file mode 100644
index 00000000000..9e43978d7b7
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Timer.cs
@@ -0,0 +1,92 @@
+//

+// System.Windows.Forms.Timer

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+using System.ComponentModel;

+    public class Timer : Component {

+

+		//

+		//  --- Public Constructors

+		//

+		[MonoTODO]

+		public Timer()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public Timer(IContainer container)

+		{

+			throw new NotImplementedException ();

+		}

+		//

+		// --- Public Properties

+		//

+		[MonoTODO]

+		public virtual bool Enabled {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int Interval {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		//

+		// --- Public Methods

+		//

+		[MonoTODO]

+		public void Start() 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Stop() 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+		//

+		// --- Public Events

+		//

+		[MonoTODO]

+		public event EventHandler Tick;

+		//

+		// --- Protected Methods

+		//

+

+		//inherited

+		//protected override void Dispose(bool disposing) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected virtual void OnTick(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBar.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBar.cs
new file mode 100644
index 00000000000..1065bd3690d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBar.cs
@@ -0,0 +1,458 @@
+//

+// System.Windows.Forms.ToolBar

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+using System.Collections;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class ToolBar : Control {

+

+		//

+		//  --- Public Constructors

+		//

+		[MonoTODO]

+		public ToolBar() 

+		{

+			throw new NotImplementedException ();

+		}

+		//

+		// --- Public Properties

+		//

+		[MonoTODO]

+		public ToolBarAppearance Appearance {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool AutoSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color BackColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Image BackgroundImage{

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public BorderStyle BorderStyle{

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ToolBar.ToolBarButtonCollection Buttons {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Size ButtonSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Divider {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override DockStyle Dock{

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool DropDownArrows {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color ForeColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ImageList ImageList {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Size ImageSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public new ImeMode ImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override RightToLeft RightToLeft {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowToolTips {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ToolBarTextAlign TextAlign {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Wrappable{

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Public Methods

+		

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// --- Public Events

+		

+		[MonoTODO]

+		public event ToolBarButtonClickEventHandler ButtonClick;

+		[MonoTODO]

+		public event ToolBarButtonClickEventHandler ButtonDropDown;

+		//

+		// --- Protected Properties

+		//

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Protected Methods

+		

+		[MonoTODO]

+		protected override void CreateHandle() 

+		{

+			throw new NotImplementedException ();

+		}

+

+		//inherited

+		//protected override void Dispose(bool disposing) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected virtual void OnButtonClick(ToolBarButtonClickEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnButtonDropDown(ToolBarButtonClickEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnFontChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnResize(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		public class ToolBarButtonCollection : IList, ICollection, IEnumerable {

+			//

+			// --- Public Constructor

+			//

+			[MonoTODO]

+			public ToolBarButtonCollection(ToolBar owner)

+			{

+				throw new NotImplementedException ();

+			}

+			//

+			// --- Public Properties

+			//

+			[MonoTODO]

+			public int Count {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public bool IsReadOnly {

+				get {

+					throw new NotImplementedException ();

+				}

+			}

+			[MonoTODO]

+			public virtual ToolBarButton this[int index] {

+				get {

+					throw new NotImplementedException ();

+				}

+				set {

+					throw new NotImplementedException ();

+				}

+			}

+			//

+			// --- Public Methods

+			//

+			[MonoTODO]

+			public int Add(string text) 

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int Add(ToolBarButton button) 

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void AddRange(ToolBarButton[] buttons) 

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Clear() 

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public bool Contains(ToolBarButton button) 

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public IEnumerator GetEnumerator() 

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public int IndexOf(ToolBarButton button) 

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void Insert(int index, ToolBarButton button) 

+			{

+				throw new NotImplementedException ();

+			}

+			//[MonoTODO]

+			//public void Insert(int index, ToolBarButton button) {

+			//	throw new NotImplementedException ();

+			//}

+			[MonoTODO]

+			public void Remove(ToolBarButton button) 

+			{

+				throw new NotImplementedException ();

+			}

+			[MonoTODO]

+			public void RemoveAt(int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			/// <summary>

+			/// IList Interface implmentation.

+			/// </summary>

+			bool IList.IsReadOnly{

+				get{

+					// We allow addition, removeal, and editing of items after creation of the list.

+					return false;

+				}

+			}

+			bool IList.IsFixedSize{

+				get{

+					// We allow addition and removeal of items after creation of the list.

+					return false;

+				}

+			}

+

+			//[MonoTODO]

+			object IList.this[int index]{

+				get{

+					throw new NotImplementedException ();

+				}

+				set{

+					throw new NotImplementedException ();

+				}

+			}

+		

+			[MonoTODO]

+			void IList.Clear(){

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.Add( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			bool IList.Contains( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			int IList.IndexOf( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Insert(int index, object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.Remove( object value){

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			void IList.RemoveAt( int index){

+				throw new NotImplementedException ();

+			}

+			// End of IList interface

+			/// <summary>

+			/// ICollection Interface implmentation.

+			/// </summary>

+			int ICollection.Count{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			bool ICollection.IsSynchronized{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			object ICollection.SyncRoot{

+				get{

+					throw new NotImplementedException ();

+				}

+			}

+			void ICollection.CopyTo(Array array, int index){

+				throw new NotImplementedException ();

+			}

+			// End Of ICollection

+		}

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarAppearance.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarAppearance.cs
new file mode 100644
index 00000000000..7400821b435
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarAppearance.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.ToolBarAppearance.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ToolBarAppearance {

+		Flat = 1,

+		Normal = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButton.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButton.cs
new file mode 100644
index 00000000000..a05f776daa4
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButton.cs
@@ -0,0 +1,157 @@
+//

+// System.Windows.Forms.ToolBarButton

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+using System.ComponentModel;

+    public class ToolBarButton : Component {

+

+		//

+		//  --- Public Constructors

+		//

+		[MonoTODO]

+		public ToolBarButton()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ToolBarButton(string text)

+		{

+			throw new NotImplementedException ();

+		}

+		//

+		// --- Public Properties

+		//

+		[MonoTODO]

+		public Menu DropDownMenu {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}	

+		}

+		[MonoTODO]

+		public bool Enabled {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}	

+		}

+		[MonoTODO]

+		public int ImageIndex {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ToolBar Parent {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool PartialPush {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Pushed {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Rectangle Rectangle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ToolBarButtonStyle Style {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public object Tag {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string ToolTipText {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Visible {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Public Methods

+		

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+		//

+		// --- Protected Methods

+		//

+

+		//inherited

+		//protected override void Dispose(bool disposing) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButtonClickEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButtonClickEventArgs.cs
new file mode 100644
index 00000000000..89f7fa171bc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButtonClickEventArgs.cs
@@ -0,0 +1,118 @@
+//

+// System.Windows.Forms.ToolBarButtonClickEventArgs

+//

+// Author:

+//	 stubbed out by Dennis Hayes(dennish@raytek.com)

+//   stub ammended by Jaak Simm (jaaksimm@firm.ee)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Summary description for ToolBarButtonClickEventArgs.

+	/// </summary>

+	[MonoTODO]

+	public class ToolBarButtonClickEventArgs : EventArgs {

+

+		#region Field

+		ToolBarButton button;

+		#endregion

+		

+		#region Constructor

+		public ToolBarButtonClickEventArgs(ToolBarButton button)

+		{

+			this.button=button;

+		}

+		#endregion

+		

+		#region Properties

+		public ToolBarButton Button {

+			get { return button; }

+			set { button=value; }

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ToolBarButtonClickEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Button Property

+		///	of the two ToolBarButtonClickEventArgs.

+		/// </remarks>

+		public static bool operator == (ToolBarButtonClickEventArgs ToolBarButtonClickEventArgsA, ToolBarButtonClickEventArgs ToolBarButtonClickEventArgsB) 

+		{

+			return (ToolBarButtonClickEventArgsA.Button == ToolBarButtonClickEventArgsB.Button);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two ToolBarButtonClickEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Button Property

+		///	of the two ToolBarButtonClickEventArgs.

+		/// </remarks>

+		public static bool operator != (ToolBarButtonClickEventArgs ToolBarButtonClickEventArgsA, ToolBarButtonClickEventArgs ToolBarButtonClickEventArgsB) 

+		{

+			return (ToolBarButtonClickEventArgsA.Button != ToolBarButtonClickEventArgsB.Button);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	ToolBarButtonClickEventArgsA and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is ToolBarButtonClickEventArgs))return false;

+			return (this == (ToolBarButtonClickEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the ToolBarButtonClickEventArgsA as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+		#endregion 

+

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButtonClickEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButtonClickEventHandler.cs
new file mode 100644
index 00000000000..0cf437186e0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButtonClickEventHandler.cs
@@ -0,0 +1,18 @@
+//

+// System.Windows.Forms.ToolBarButtonClickEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the ButtonClick event of a ToolBar.

+	/// </summary>

+	//[Serializable]

+	public delegate void ToolBarButtonClickEventHandler(object sender, ToolBarButtonClickEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButtonStyle.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButtonStyle.cs
new file mode 100644
index 00000000000..954774f964d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarButtonStyle.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.ToolBarButtonStyle.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ToolBarButtonStyle {

+		DropDownButton = 4,

+		PushButton = 1,

+		Separator = 3,

+		ToggleButton =2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarTextAlign.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarTextAlign.cs
new file mode 100644
index 00000000000..76d26fd5aca
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ToolBarTextAlign.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.ToolBarTextAlign.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum ToolBarTextAlign {

+		Right = 1,

+		Underneath = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TrackBar.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TrackBar.cs
new file mode 100644
index 00000000000..0d3834f06c9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TrackBar.cs
@@ -0,0 +1,236 @@
+//

+// System.Windows.Forms.TrackBar

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class TrackBar : Control, ISupportInitialize {

+

+		//

+		//  --- Public Constructors

+		//

+		[MonoTODO]

+		public TrackBar()

+		{

+			throw new NotImplementedException ();

+		}

+		//

+		// --- Public Properties

+		//

+		[MonoTODO]

+		public bool AutoSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Font Font {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color ForeColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int LargeChange {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int Maximum {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int Minimum {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Orientation Orientation {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SmallChange {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int TickFrequency {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TickStyle TickStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int Value {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Public Methods

+		

+		[MonoTODO]

+		public void SetRange(int minValue, int maxValue) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// --- Public Events

+		

+		[MonoTODO]

+		public event EventHandler Scroll;

+		[MonoTODO]

+		public event EventHandler ValueChanged;

+        

+        // --- Protected Properties

+        //

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		//

+		// --- Protected Methods

+		//

+		[MonoTODO]

+		protected override void CreateHandle() 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override bool IsInputKey(Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnBackColorChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnScroll(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void SetBoundsCore(int x, int y, int width, int height, BoundsSpecified specified) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		void ISupportInitialize.BeginInit(){

+			throw new NotImplementedException ();

+		}

+		void ISupportInitialize.EndInit(){

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNode.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNode.cs
new file mode 100644
index 00000000000..4baede6efdc
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNode.cs
@@ -0,0 +1,316 @@
+//

+// System.Windows.Forms.TreeNode

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class TreeNode : MarshalByRefObject, ICloneable {

+

+		

+		//  --- Public Constructors

+		

+		[MonoTODO]

+		public TreeNode()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public TreeNode(string text)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public TreeNode(string text, TreeNode[] children)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// --- Public Properties

+		

+		[MonoTODO]

+		public Color BackColor {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Rectangle Bounds {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Checked {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNode FirstNode {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Color ForeColor {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string FullPath {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public IntPtr Handle {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int ImageIndex {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int Index {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool IsEditing {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool IsExpanded {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool IsSelected {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool IsVisible {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNode LastNode {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNode NextNode {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNode NextVisibleNode {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public Font NodeFont {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNodeCollection Nodes {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNode Parent {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNode PrevNode {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNode PrevVisibleNode {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SelectedImageIndex {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public object Tag {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string Text {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeView TreeView {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Public Methods

+		

+		[MonoTODO]

+		public void BeginEdit()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual object Clone()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Collapse()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void EndEdit(bool cancel)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void EnsureVisible()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Expand()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void ExpandAll()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public static TreeNode FromHandle(TreeView tree, IntPtr handle)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int GetNodeCount(bool includeSubTrees)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Remove()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Toggle()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNodeCollection.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNodeCollection.cs
new file mode 100644
index 00000000000..062c8bdcd3a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNodeCollection.cs
@@ -0,0 +1,187 @@
+//

+// System.Windows.Forms.TreeNodeCollection

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class TreeNodeCollection : IList, ICollection, IEnumerable {

+

+		

+		//  --- Public Properties

+		

+		[MonoTODO]

+		public int Count {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool IsReadOnly {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public virtual TreeNode this[int index] {

+			get	{

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Public Methods

+		

+		[MonoTODO]

+		public virtual TreeNode Add(string text) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual int Add(TreeNode node) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual void AddRange(TreeNode[] nodes) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual void Clear() 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public bool Contains(TreeNode node) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void CopyTo(Array dest, int index) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public IEnumerator GetEnumerator() 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int IndexOf(TreeNode node) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual void Insert(int index, TreeNode node) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void Remove(TreeNode node) 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public virtual void RemoveAt(int index) 

+		{

+			throw new NotImplementedException ();

+		}

+		/// <summary>

+		/// IList Interface implmentation.

+		/// </summary>

+		bool IList.IsReadOnly{

+			get{

+				// We allow addition, removeal, and editing of items after creation of the list.

+				return false;

+			}

+		}

+		bool IList.IsFixedSize{

+			get{

+				// We allow addition and removeal of items after creation of the list.

+				return false;

+			}

+		}

+

+		//[MonoTODO]

+		object IList.this[int index]{

+			get{

+				throw new NotImplementedException ();

+			}

+			set{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		void IList.Clear(){

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		int IList.Add( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		bool IList.Contains( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		int IList.IndexOf( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.Insert(int index, object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.Remove( object value){

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		void IList.RemoveAt( int index){

+			throw new NotImplementedException ();

+		}

+		// End of IList interface

+		/// <summary>

+		/// ICollection Interface implmentation.

+		/// </summary>

+		int ICollection.Count{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		bool ICollection.IsSynchronized{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		object ICollection.SyncRoot{

+			get{

+				throw new NotImplementedException ();

+			}

+		}

+		void ICollection.CopyTo(Array array, int index){

+			throw new NotImplementedException ();

+		}

+		// End Of ICollection

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNodeConverter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNodeConverter.cs
new file mode 100644
index 00000000000..d1002d58c9f
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeNodeConverter.cs
@@ -0,0 +1,42 @@
+//

+// System.Windows.Forms.TreeNodeConverter

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Globalization;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+using System.ComponentModel;

+    public class TreeNodeConverter : TypeConverter {

+

+		

+		//  --- Public Constructors

+		

+		[MonoTODO]

+		public TreeNodeConverter()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// --- Public Methods

+		

+		[MonoTODO]

+		public override bool CanConvertTo(ITypeDescriptorContext context, Type destinationType)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override object ConvertTo(ITypeDescriptorContext context, CultureInfo culture, object value, Type destinationType)

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeView.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeView.cs
new file mode 100644
index 00000000000..ee0fe2280f6
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeView.cs
@@ -0,0 +1,485 @@
+//

+// System.Windows.Forms.TreeView

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.Drawing;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class TreeView : Control {

+

+		//

+		//  --- Public Constructors

+		//

+		[MonoTODO]

+		public TreeView()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// --- Public Properties

+		

+		[MonoTODO]

+		public override Color BackColor {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Image BackgroundImage {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public BorderStyle BorderStyle {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool CheckBoxes {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override Color ForeColor {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool FullRowSelect {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool HideSelection {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool HotTracking {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int ImageIndex {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public ImageList ImageList {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int Indent {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int ItemHeight {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool LabelEdit {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNodeCollection Nodes {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public string PathSeparator {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Scrollable {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int SelectedImageIndex {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNode SelectedNode {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowLines {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowPlusMinus {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowRootLines {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool Sorted {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public override string Text {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public TreeNode TopNode {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int VisibleCount {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Public Methods

+		

+		[MonoTODO]

+		public void BeginUpdate() 

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void CollapseAll()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void EndUpdate()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void ExpandAll()

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public TreeNode GetNodeAt(Point pt)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public TreeNode GetNodeAt(int x, int y)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public int GetNodeCount(bool includeSubTrees)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// --- Public Events

+		

+		[MonoTODO]

+		public event TreeViewEventHandler AfterCheck;

+		[MonoTODO]

+		public event TreeViewEventHandler AfterCollapse;

+		[MonoTODO]

+		public event TreeViewEventHandler AfterExpand;

+		[MonoTODO]

+		public event NodeLabelEditEventHandler AfterLabelEdit;

+		[MonoTODO]

+		public event TreeViewEventHandler AfterSelect;

+		[MonoTODO]

+		public event TreeViewCancelEventHandler BeforeCheck;

+		[MonoTODO]

+		public event TreeViewCancelEventHandler BeforeCollapse;

+		[MonoTODO]

+		public event TreeViewCancelEventHandler BeforeExpand;

+		[MonoTODO]

+		public event NodeLabelEditEventHandler BeforeLabelEdit;

+		[MonoTODO]

+		public event TreeViewCancelEventHandler BeforeSelect;

+		[MonoTODO]

+		public event ItemDragEventHandler ItemDrag;

+		//public new event PaintEventHandler Paint;

+        

+        // --- Protected Properties

+        

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		protected override Size DefaultSize {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Protected Methods

+		

+		[MonoTODO]

+		protected override void CreateHandle()

+		{

+			throw new NotImplementedException ();	

+		}

+

+		//inherited

+		//protected override void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected override bool IsInputKey(Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnAfterCheck(TreeViewEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnAfterCollapse(TreeViewEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnAfterExpand(TreeViewEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnAfterLabelEdit(NodeLabelEditEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnAfterSelect(TreeViewEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnBeforeCheck(TreeViewCancelEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnBeforeCollapse(TreeViewCancelEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnBeforeExpand(TreeViewCancelEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnBeforeLabelEdit(NodeLabelEditEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnBeforeSelect(TreeViewCancelEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleCreated(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnHandleDestroyed(EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnItemDrag(ItemDragEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnKeyDown(KeyEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnKeyPress(KeyPressEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void OnKeyUp(KeyEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void WndProc(ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewAction.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewAction.cs
new file mode 100644
index 00000000000..2af134e947d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewAction.cs
@@ -0,0 +1,24 @@
+//

+// System.Windows.Forms.TreeViewAction.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+//	 Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum TreeViewAction {

+		ByKeyboard = 1,

+		ByMouse = 2,

+		Collapse = 3,

+		Expand =4,

+		Unknown = 0

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewCancelEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewCancelEventArgs.cs
new file mode 100644
index 00000000000..9b7528aee53
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewCancelEventArgs.cs
@@ -0,0 +1,138 @@
+//

+// System.Windows.Forms.TreeViewCancelEventArgs

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//	 Partially completed by Dennis Hayes (dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	// </summary>

+

+    public class TreeViewCancelEventArgs : CancelEventArgs {

+

+		private TreeNode node;

+		private TreeViewAction action;

+		//

+		//  --- Public Constructors

+		//

+		public TreeViewCancelEventArgs(TreeNode node, bool cancel, TreeViewAction action) : base(cancel)

+		{

+			this.node = node;

+			this.action = action;

+		}

+		

+		#region Public Properties

+		/// <summary>

+		///	Action Property

+		/// </summary>

+		///

+		/// <remarks>

+		///	Gets the type of TreeViewAction that raised the event.

+		/// </remarks>

+		public TreeViewAction Action 

+		{

+			get {

+				return action;

+			}

+		}

+

+		/// <summary>

+		///	Node Property

+		/// </summary>

+		///

+		/// <remarks>

+		///	Gets the tree node to be checked, expanded, collapsed, or selected.

+		/// </remarks>

+		public TreeNode Node 

+		{

+			get {

+				return node;

+			}

+		}

+		#endregion

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this TreeViewCancelEventArgs and another object.

+		/// </remarks>

+		public override bool Equals(object obj) 

+		{

+			if (!(obj is TreeViewCancelEventArgs)) 

+				return false;

+			

+			return (this == (TreeViewCancelEventArgs) obj);

+		}

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two TreeViewCancelEventArgs objects. The return value is

+		///	based on the equivalence of the node and action property

+		///	of the two TreeViewCancelEventArgs.

+		/// </remarks>

+		public static bool operator == (TreeViewCancelEventArgs TreeViewCancelEventArgsA, TreeViewCancelEventArgs TreeViewCancelEventArgsB) 

+		{

+			return ((TreeViewCancelEventArgsA.action == TreeViewCancelEventArgsB.action) && (TreeViewCancelEventArgsA.Node == TreeViewCancelEventArgsB.Node)) ;

+		}

+

+

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two TreeViewCancelEventArgs objects. The return value is

+		///	based on the equivalence of the node and action property

+		///	of the two TreeViewCancelEventArgs.

+		/// </remarks>

+		public static bool operator != (TreeViewCancelEventArgs TreeViewCancelEventArgsA, TreeViewCancelEventArgs TreeViewCancelEventArgsB) 

+		{

+			return ((TreeViewCancelEventArgsA.action != TreeViewCancelEventArgsB.action) || (TreeViewCancelEventArgsA.Node != TreeViewCancelEventArgsB.Node)) ;

+		}

+

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the TreeViewCancelEventArgs as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+		#endregion // Public Methods

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewCancelEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewCancelEventHandler.cs
new file mode 100644
index 00000000000..005595fb3f5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewCancelEventHandler.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.TreeViewCancelEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the BeforeCheck, 

+	/// BeforeCollapse, BeforeExpand, or BeforeSelect event of a TreeView.

+	/// </summary>

+	//[Serializable]

+	public delegate void TreeViewCancelEventHandler(object sender, TreeViewCancelEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewEventArgs.cs
new file mode 100644
index 00000000000..7188c1ee2ac
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewEventArgs.cs
@@ -0,0 +1,44 @@
+//

+// System.Windows.Forms.TreeViewEventArgs

+//

+// Author:

+//  Stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//	Completed by Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	// </summary>

+

+    public class TreeViewEventArgs : EventArgs {

+		private TreeNode node;

+		private TreeViewAction action;

+		//

+		//  --- Public Constructors

+		//

+		public TreeViewEventArgs(TreeNode node)

+		{

+			this.node = node;

+		}

+		public TreeViewEventArgs(TreeNode node, TreeViewAction action)

+		{

+			this.node = node;

+			this.action = action;

+		}

+		//

+		// --- Public Properties

+		//

+		public TreeViewAction Action {

+			get	{

+				return action;

+			}

+		}

+		public TreeNode Node {

+			get {

+				return node;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewEventHandler.cs
new file mode 100644
index 00000000000..14702b3f0a7
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewEventHandler.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.TreeViewEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents the method that will handle the 

+	/// AfterCheck, AfterCollapse, AfterExpand, or AfterSelect event of a TreeView.

+	/// </summary>

+	//[Serializable]

+	public delegate void TreeViewEventHandler(object sender, TreeViewEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewImageIndexConverter.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewImageIndexConverter.cs
new file mode 100644
index 00000000000..aacc66def3b
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/TreeViewImageIndexConverter.cs
@@ -0,0 +1,39 @@
+//

+// System.Windows.Forms.TreeViewImageIndexConverter

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+    public class TreeViewImageIndexConverter : ImageIndexConverter {

+

+		

+		//  --- Public Constructors

+		

+		[MonoTODO]

+		public TreeViewImageIndexConverter()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// --- Protected Properties

+		

+		[MonoTODO]

+		protected override bool IncludeNoneAsStandardValue {

+			get

+			{

+				throw new NotImplementedException ();

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/UICues.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/UICues.cs
new file mode 100644
index 00000000000..6a3336daab9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/UICues.cs
@@ -0,0 +1,26 @@
+//

+// System.Windows.Forms.UICues.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	// Specifies the state of the user interface

+	[Flags]

+	public enum UICues 

+	{

+		Changed			= 12,			// The state of the focus cues and keyboard cues has changed. 

+		ChangeFocus		=  4,			// The state of the focus cues has changed. 

+		ChangeKeyboard	=  8,			// The state of the keyboard cues has changed. 

+		None			=  0,			// No change was made.

+		ShowFocus		=  1,			// Focus rectangles are displayed after the change.

+		ShowKeyboard	=  2,			// Keyboard cues are underlined after the change. 

+		Shown			=  3,			// Focus rectangles are displayed and keyboard cues are underlined 

+	}

+

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/UICuesEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/UICuesEventArgs.cs
new file mode 100644
index 00000000000..0110ff21049
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/UICuesEventArgs.cs
@@ -0,0 +1,149 @@
+//

+// System.Windows.Forms.UICuesEventArgs

+//

+// Author:

+//	 stubbed out by Stefan Warnke (StefanW@POBox.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	// </summary>

+

+

+	/// <summary>

+	/// UICuesEventArgs specifies which user interface feature changed and its new value.

+	/// </summary>

+	public class UICuesEventArgs : EventArgs {

+		

+		private UICues uicues;

+//		/// --- Constructor ---

+		public UICuesEventArgs(UICues uicues) 

+		{

+			this.uicues = uicues;

+		}

+

+		/// --- Public Properties ---

+		#region Public Properties

+

+		// Gets the bitwise combination of the UICues values

+		public UICues Changed {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// Gets a value indicating whether the state of the focus cues has changed.

+		public bool ChangeFocus {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets a value indicating whether the state of the keyboard cues has changed

+		public bool ChangeKeyboard {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets a value indicating whether focus rectangles are shown after the change

+		public bool ShowFocus {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets a value indicating whether keyboard cues are underlined after the change

+		public bool ShowKeyboard {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		#endregion // Public Properties

+

+		#region Public Methods

+

+		/// <summary>

+		///	Equality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two UICuesEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Changed Property

+		///	of the two UICuesEventArgs.

+		/// </remarks>

+		public static bool operator == (UICuesEventArgs UICuesEventArgsA, UICuesEventArgs UICuesEventArgsB) 

+		{

+			return (UICuesEventArgsA.Changed == UICuesEventArgsB.Changed);

+		}

+		

+		/// <summary>

+		///	Inequality Operator

+		/// </summary>

+		///

+		/// <remarks>

+		///	Compares two UICuesEventArgs objects.

+		///	The return value is based on the equivalence of

+		///	Changed Property

+		///	of the two UICuesEventArgs.

+		/// </remarks>

+		public static bool operator != (UICuesEventArgs UICuesEventArgsA, UICuesEventArgs UICuesEventArgsB) 

+		{

+			return (UICuesEventArgsA.Changed != UICuesEventArgsB.Changed);

+		}

+

+		/// <summary>

+		///	Equals Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Checks equivalence of this

+		///	UICuesEventArgs and another

+		///	object.

+		/// </remarks>

+		public override bool Equals (object obj) 

+		{

+			if (!(obj is UICuesEventArgs))return false;

+			return (this == (UICuesEventArgs) obj);

+		}

+

+		/// <summary>

+		///	GetHashCode Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Calculates a hashing value.

+		/// </remarks>

+		[MonoTODO]

+		public override int GetHashCode () 

+		{

+			//FIXME: add class specific stuff;

+			return base.GetHashCode();

+		}

+

+		/// <summary>

+		///	ToString Method

+		/// </summary>

+		///

+		/// <remarks>

+		///	Formats the UICuesEventArgs as a string.

+		/// </remarks>

+		[MonoTODO]

+		public override string ToString () 

+		{

+			//FIXME: add class specific stuff;

+			return base.ToString();

+		}

+

+		#endregion 

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/UICuesEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/UICuesEventHandler.cs
new file mode 100644
index 00000000000..dcb179ae4bf
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/UICuesEventHandler.cs
@@ -0,0 +1,17 @@
+//

+// System.Windows.Forms.UICuesEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Represents a method that will handle the ChangeUICues event of a Control.

+	/// </summary>

+	public delegate void UICuesEventHandler(object sender, UICuesEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/UpDownBase.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/UpDownBase.cs
new file mode 100644
index 00000000000..c2ae7414007
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/UpDownBase.cs
@@ -0,0 +1,315 @@
+//

+// System.Windows.Forms.UICuesEventArgs

+//

+// Author:

+//	 stubbed out by Stefan Warnke (StefanW@POBox.com)

+//   Dennis Hayes (dennish@Raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System;

+using System.Drawing;

+using System.ComponentModel;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	// </summary>

+

+

+	/// <summary>

+	/// The up-down control consists of a text box and a small vertical scroll 

+	/// bar, commonly referred to as a spinner control.

+	/// </summary>

+	public abstract class UpDownBase : ContainerControl {

+

+		//UpDownBase+ButtonID

+		enum ButtonID 

+		{

+			Down = 2, 

+			None = 0, 

+			Up = 1

+		}

+

+		/// --- Constructor ---

+		public UpDownBase()	

+		{

+			throw new NotImplementedException ();

+		}

+

+		/// --- Destructor ---

+		~UpDownBase() {

+			throw new NotImplementedException ();

+		}

+

+		/// --- Public Properties ---

+		#region Public Properties

+		// Gets or sets the background color for the control

+		public override Color BackColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets or sets the background image displayed in the control

+		public override Image BackgroundImage {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets or sets the border style for the up-down control

+		public BorderStyle BorderStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets or sets the shortcut menu associated with the control

+		public override ContextMenu ContextMenu {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets a value indicating whether the control has input focus

+		public override bool Focused {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// Gets or sets the foreground color of the control

+		public override Color ForeColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets or sets a value indicating whether the user can use the 

+		// UP ARROW and DOWN ARROW keys to select values

+		public bool InterceptArrowKeys {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets the height of the up-down control

+		public int PreferredHeight {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets or sets a value indicating whether the text may be 

+		// changed by the use of the up or down buttons only

+		public bool ReadOnly {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets or sets the site of the control.

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets or sets the text displayed in the up-down control

+		public override string Text {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets or sets the alignment of the text in the up-down control

+		public HorizontalAlignment TextAlign {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets or sets the alignment of the up and down buttons on the 

+		// up-down control

+		public LeftRightAlignment UpDownAlign {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		#endregion // Public Properties

+

+

+		/// --- Public Methods ---

+		#region Public Methods

+

+		// When overridden in a derived class, handles the pressing of the down 

+		// button on the up-down control. 

+		public abstract void DownButton();

+	

+		// Selects a range of text in the up-down control specifying the 

+		// starting position and number of characters to select.

+		public void Select(int start,int length) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// When overridden in a derived class, handles the pressing of 

+		// the up button on the up-down control

+		public abstract void UpButton();

+

+		#endregion // Public Methods

+

+

+		/// --- Protected Properties ---

+		#region Protected Properties

+

+		// Gets or sets a value indicating whether the text property is being 

+		// changed internally by its parent class

+		protected bool ChangingText {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets the required creation parameters when the control handle is created

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets the default size of the control.

+		protected override Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		// Gets or sets a value indicating whether a value has been entered by the user

+		protected bool UserEdit {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		#endregion // Protected Properties

+

+	

+		/// --- Protected Methods ---

+		#region Protected Methods

+

+		// Raises the FontChanged event

+		protected override void OnFontChanged(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		// Raises the HandleCreated event

+		protected override void OnHandleCreated(EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		// Raises the Layout event

+		protected override void OnLayout(LayoutEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		// Raises the MouseWheel event

+		protected override void OnMouseWheel(MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		// Raises the KeyDown event

+		protected virtual void OnTextBoxKeyDown(object source, KeyEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		// Raises the KeyPress event

+		protected virtual void OnTextBoxKeyPress(object source, KeyPressEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		// Raises the LostFocus event

+		protected virtual void OnTextBoxLostFocus(object source, EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		// Raises the Resize event

+		protected virtual void OnTextBoxResize(object source, EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// Raises the TextChanged event.

+		protected virtual void OnTextBoxTextChanged(object source, EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// This member overrides Control.SetBoundsCore.

+		protected override void SetBoundsCore(int x, int y, int width, 

+			int height, BoundsSpecified specified)  {

+			throw new NotImplementedException ();

+		}

+

+		// When overridden in a derived class, updates the text displayed in the

+		// up-down control

+		protected abstract void UpdateEditText();

+

+		// When overridden in a derived class, validates the text displayed in the

+		// up-down control

+		protected virtual void ValidateEditText() 

+		{

+			throw new NotImplementedException ();

+		}

+		#endregion // Protected Methods

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/UpDownEventArgs.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/UpDownEventArgs.cs
new file mode 100644
index 00000000000..dc3fd67b0d3
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/UpDownEventArgs.cs
@@ -0,0 +1,19 @@
+//

+// System.Windows.Forms.UpDownEventArgs

+//

+// Author:

+//	 stubbed out by Dennis Hayes(dennish@raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) Ximian, Inc., 2002

+//

+using System;

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Summary description for UpDownEventArgs.

+	/// </summary>

+	public class UpDownEventArgs : EventArgs {

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/UpDownEventHandler.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/UpDownEventHandler.cs
new file mode 100644
index 00000000000..e2a408355ab
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/UpDownEventHandler.cs
@@ -0,0 +1,20 @@
+//

+// System.Windows.Forms.UpDownEventHandler.cs

+//

+// Authors:

+//   Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//   Gianandrea Terzi (gianandrea.terzi@lario.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// This type supports the .NET Framework infrastructure 

+	/// and is not intended to be used directly from your code.

+	/// </summary>

+	//[Serializable]

+	public delegate void UpDownEventHandler(object source, UpDownEventArgs e);

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/UserControl.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/UserControl.cs
new file mode 100644
index 00000000000..30c264408a1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/UserControl.cs
@@ -0,0 +1,67 @@
+//

+// System.Windows.Forms.UpDownEventHandler.cs

+//

+// Authors:

+//	//unknown

+//   Dennis Hayes (dennish@Raytek.com)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	public class UserControl : ContainerControl{

+

+		// --- Properties ---

+		[MonoTODO]

+		protected override Size DefaultSize {

+

+			get { throw new NotImplementedException(); }

+		}

+

+		[MonoTODO]

+		public override string Text {

+

+			get { throw new NotImplementedException(); }

+			set { throw new NotImplementedException(); }

+		}

+

+		// --- Constructor ---

+		[MonoTODO]

+		public UserControl()

+		{

+			throw new NotImplementedException();

+		}

+

+		// --- Methods ---

+		[MonoTODO]

+		protected override void OnCreateControl()

+		{

+			throw new NotImplementedException();

+		}

+

+		[MonoTODO]

+		protected virtual void OnLoad(EventArgs e)

+		{

+			throw new NotImplementedException();

+		}

+

+		[MonoTODO]

+		protected override void OnMouseDown(MouseEventArgs e)

+		{

+			throw new NotImplementedException();

+		}

+

+		[MonoTODO]

+		protected override void WndProc(ref Message m)

+		{

+			throw new NotImplementedException();

+		}

+

+		// --- Events ---

+		[MonoTODO]

+		public event EventHandler Load;

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/VScrollBar.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/VScrollBar.cs
new file mode 100644
index 00000000000..4a43af761c3
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/VScrollBar.cs
@@ -0,0 +1,43 @@
+//

+// System.Windows.Forms.StructFormat.cs

+//

+// Author:

+//   John Rebbeck <john@rebent.com>

+//   Dennis Hayes (dennish@Raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+using System;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	public class VScrollBar : ScrollBar {

+

+		// --- Properties ---

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+

+			get { throw new NotImplementedException(); }

+		}

+

+		[MonoTODO]

+		protected override Size DefaultSize {

+

+			get { throw new NotImplementedException(); }

+		}

+

+		[MonoTODO]

+		public override RightToLeft RightToLeft {

+

+			get { throw new NotImplementedException(); }

+			set { throw new NotImplementedException(); }

+		}

+

+		// --- Constructor ---

+		[MonoTODO]

+		public VScrollBar()

+		{

+			throw new NotImplementedException();

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/View.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/View.cs
new file mode 100644
index 00000000000..14a1ccda845
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/View.cs
@@ -0,0 +1,21 @@
+//

+// System.Windows.Forms.View.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum View {

+		Details = 1,

+		LargeIcon = 0,

+		List = 3,

+		SmallIcon = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/Win32.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/Win32.cs
new file mode 100644
index 00000000000..4539d561191
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/Win32.cs
@@ -0,0 +1,416 @@
+//
+// System.Windows.Forms.Win32
+//
+// Provides easy access to commonly used Win32/WINELib contants and functions
+//
+// Author:
+//   John Sohn (jsohn@columbus.rr.com)
+//	Dennis Hayes (dennish@raytek.com)
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.Windows.Forms {
+
+	// holder for DLL Win32 DllImports 
+	public class Win32 {
+
+		[DllImport ("user32.dll", 
+			    CallingConvention = CallingConvention.StdCall,
+			    CharSet = CharSet.Auto)]
+		public static extern IntPtr CreateWindowExA (
+			uint dwExStyle, string lpClassName, string lpWindowName,
+			uint dwStyle, int x, int y, int nWidth, int nHeight,
+			IntPtr hWndParent, IntPtr hMenu, IntPtr hInstance,
+			ref object lpParam);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall, CharSet = CharSet.Auto)]
+		public extern static IntPtr DefWindowProcA (
+			IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall, CharSet = CharSet.Auto)]
+		public extern static int DestroyWindow (IntPtr hWnd);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall, CharSet = CharSet.Auto)]
+		public static extern int ShowWindow (IntPtr hWnd, 
+						     int nCmdShow);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall,CharSet = CharSet.Auto)]
+		public static extern int GetMessageA (ref int msg, int hwnd, 
+						      int msgFrom,  int msgTo);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall, CharSet = CharSet.Auto)]
+		public static extern int  TranslateMessage (ref int msg);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall, CharSet = CharSet.Auto)]
+		public static extern int DispatchMessageA (ref int msg);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall,
+			    CharSet = CharSet.Auto)]
+		public extern static void PostQuitMessage (int nExitCode);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall,
+			    CharSet = CharSet.Auto)]
+		public extern static IntPtr SetActiveWindow (IntPtr hWnd);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall,
+			    CharSet = CharSet.Auto)]
+		public extern static int CloseWindow (IntPtr hWnd);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall,
+			    CharSet = CharSet.Auto)]
+		public extern static int SetWindowPos (
+			IntPtr hWnd, IntPtr hWndInsertAfter, 
+			int X, int Y, int cx, int cy, int uFlags);
+
+		// Window Messages
+		public const uint WM_NULL                 = 0x0000;
+		public const uint WM_CREATE               = 0x0001;
+		public const uint WM_DESTROY              = 0x0002;
+		public const uint WM_MOVE                 = 0x0003;
+		public const uint WM_SIZEWAIT             = 0x0004;
+		public const uint WM_SIZE                 = 0x0005;
+		public const uint WM_ACTIVATE             = 0x0006;
+		public const uint WM_SETFOCUS             = 0x0007;
+		public const uint WM_KILLFOCUS            = 0x0008;
+		public const uint WM_SETVISIBLE           = 0x0009;
+		public const uint WM_ENABLE               = 0x000a;
+		public const uint WM_SETREDRAW            = 0x000b;
+		public const uint WM_SETTEXT              = 0x000c;
+		public const uint WM_GETTEXT              = 0x000d;
+		public const uint WM_GETTEXTLENGTH        = 0x000e;
+		public const uint WM_PAINT                = 0x000f;
+		public const uint WM_CLOSE                = 0x0010;
+		public const uint WM_QUERYENDSESSION      = 0x0011;
+		public const uint WM_QUIT                 = 0x0012;
+		public const uint WM_QUERYOPEN            = 0x0013;
+		public const uint WM_ERASEBKGND           = 0x0014;
+		public const uint WM_SYSCOLORCHANGE       = 0x0015;
+		public const uint WM_ENDSESSION           = 0x0016;
+		public const uint WM_SYSTEMERROR          = 0x0017;
+		public const uint WM_SHOWWINDOW           = 0x0018;
+		public const uint WM_CTLCOLOR             = 0x0019;
+		public const uint WM_WININICHANGE         = 0x001a;
+		public const uint WM_SETTINGCHANGE        = WM_WININICHANGE;
+		public const uint WM_DEVMODECHANGE        = 0x001b;
+		public const uint WM_ACTIVATEAPP          = 0x001c;
+		public const uint WM_FONTCHANGE           = 0x001d;
+		public const uint WM_TIMECHANGE           = 0x001e;
+		public const uint WM_CANCELMODE           = 0x001f;
+		public const uint WM_SETCURSOR            = 0x0020;
+		public const uint WM_MOUSEACTIVATE        = 0x0021;
+		public const uint WM_CHILDACTIVATE        = 0x0022;
+		public const uint WM_QUEUESYNC            = 0x0023;
+		public const uint WM_GETMINMAXINFO        = 0x0024;
+
+		public const uint WM_PAINTICON            = 0x0026;
+		public const uint WM_ICONERASEBKGND       = 0x0027;
+		public const uint WM_NEXTDLGCTL           = 0x0028;
+		public const uint WM_ALTTABACTIVE         = 0x0029;
+		public const uint WM_SPOOLERSTATUS        = 0x002a;
+		public const uint WM_DRAWITEM             = 0x002b;
+		public const uint WM_MEASUREITEM          = 0x002c;
+		public const uint WM_DELETEITEM           = 0x002d;
+		public const uint WM_VKEYTOITEM           = 0x002e;
+		public const uint WM_CHARTOITEM           = 0x002f;
+		public const uint WM_SETFONT              = 0x0030;
+		public const uint WM_GETFONT              = 0x0031;
+		public const uint WM_SETHOTKEY            = 0x0032;
+		public const uint WM_GETHOTKEY            = 0x0033;
+		public const uint WM_FILESYSCHANGE        = 0x0034;
+		public const uint WM_ISACTIVEICON         = 0x0035;
+		public const uint WM_QUERYPARKICON        = 0x0036;
+		public const uint WM_QUERYDRAGICON        = 0x0037;
+		public const uint WM_QUERYSAVESTATE       = 0x0038;
+		public const uint WM_COMPAREITEM          = 0x0039;
+		public const uint WM_TESTING              = 0x003a;
+
+		public const uint WM_OTHERWINDOWCREATED	= 0x003c;
+		public const uint WM_OTHERWINDOWDESTROYED	= 0x003d;
+		public const uint WM_ACTIVATESHELLWINDOW	= 0x003e;
+
+		public const uint WM_COMPACTING		= 0x0041;
+
+		public const uint WM_COMMNOTIFY		= 0x0044;
+		public const uint WM_WINDOWPOSCHANGING 	= 0x0046;
+		public const uint WM_WINDOWPOSCHANGED 	= 0x0047;
+		public const uint WM_POWER		= 0x0048;
+
+		/* Win32 4.0 messages */
+		public const uint WM_COPYDATA		= 0x004a;
+		public const uint WM_CANCELJOURNAL	= 0x004b;
+		public const uint WM_NOTIFY		= 0x004e;
+		public const uint WM_INPUTLANGCHANGEREQUEST       = 0x0050;
+		public const uint WM_INPUTLANGCHANGE              = 0x0051;
+		public const uint WM_TCARD                = 0x0052;
+		public const uint WM_HELP			= 0x0053;
+		public const uint WM_USERCHANGED		= 0x0054;
+		public const uint WM_NOTIFYFORMAT		= 0x0055;
+
+		public const uint WM_CONTEXTMENU		= 0x007b;
+		public const uint WM_STYLECHANGING 	= 0x007c;
+		public const uint WM_STYLECHANGED		= 0x007d;
+		public const uint WM_DISPLAYCHANGE        = 0x007e;
+		public const uint WM_GETICON		= 0x007f;
+		public const uint WM_SETICON		= 0x0080;
+
+		/* Non-client system messages */
+		public const uint WM_NCCREATE         = 0x0081;
+		public const uint WM_NCDESTROY        = 0x0082;
+		public const uint WM_NCCALCSIZE       = 0x0083;
+		public const uint WM_NCHITTEST        = 0x0084;
+		public const uint WM_NCPAINT          = 0x0085;
+		public const uint WM_NCACTIVATE       = 0x0086;
+
+		public const uint WM_GETDLGCODE	    = 0x0087;
+		public const uint WM_SYNCPAINT	    = 0x0088;
+		public const uint WM_SYNCTASK	    = 0x0089;
+
+		/* Non-client mouse messages */
+		public const uint WM_NCMOUSEMOVE      = 0x00a0;
+		public const uint WM_NCLBUTTONDOWN    = 0x00a1;
+		public const uint WM_NCLBUTTONUP      = 0x00a2;
+		public const uint WM_NCLBUTTONDBLCLK  = 0x00a3;
+		public const uint WM_NCRBUTTONDOWN    = 0x00a4;
+		public const uint WM_NCRBUTTONUP      = 0x00a5;
+		public const uint WM_NCRBUTTONDBLCLK  = 0x00a6;
+		public const uint WM_NCMBUTTONDOWN    = 0x00a7;
+		public const uint WM_NCMBUTTONUP      = 0x00a8;
+		public const uint WM_NCMBUTTONDBLCLK  = 0x00a9;
+
+		public const uint WM_NCXBUTTONDOWN    = 0x00ab;
+		public const uint WM_NCXBUTTONUP      = 0x00ac;
+		public const uint WM_NCXBUTTONDBLCLK  = 0x00ad;
+
+		/* Keyboard messages */
+		public const uint WM_KEYDOWN          = 0x0100;
+		public const uint WM_KEYUP            = 0x0101;
+		public const uint WM_CHAR             = 0x0102;
+		public const uint WM_DEADCHAR         = 0x0103;
+		public const uint WM_SYSKEYDOWN       = 0x0104;
+		public const uint WM_SYSKEYUP         = 0x0105;
+		public const uint WM_SYSCHAR          = 0x0106;
+		public const uint WM_SYSDEADCHAR      = 0x0107;
+		public const uint WM_KEYFIRST         = WM_KEYDOWN;
+		public const uint WM_KEYLAST          = 0x0108;
+
+		/* Win32 4.0 messages for IME */
+		public const uint IME_STARTCOMPOSITION     = 0x010d;
+		public const uint IME_ENDCOMPOSITION       = 0x010e;
+		public const uint IME_COMPOSITION          = 0x010f;
+		public const uint IME_KEYLAST              = 0x010f;
+
+		public const uint WM_INITDIALOG       = 0x0110;
+		public const uint WM_COMMAND          = 0x0111;
+		public const uint WM_SYSCOMMAND       = 0x0112;
+		public const uint WM_TIMER	    = 0x0113;
+		public const uint WM_SYSTIMER	    = 0x0118;
+
+		/* scroll messages */
+		public const uint WM_HSCROLL          = 0x0114;
+		public const uint WM_VSCROLL          = 0x0115;
+
+		/* Menu messages */
+		public const uint WM_INITMENU         = 0x0116;
+		public const uint WM_INITMENUPOPUP    = 0x0117;
+
+		public const uint WM_MENUSELECT       = 0x011F;
+		public const uint WM_MENUCHAR         = 0x0120;
+		public const uint WM_ENTERIDLE        = 0x0121;
+
+		public const uint WM_MENURBUTTONUP    = 0x0122;
+		public const uint WM_MENUDRAG         = 0x0123;
+		public const uint WM_MENUGETOBJECT    = 0x0124;
+		public const uint WM_UNINITMENUPOPUP  = 0x0125;
+		public const uint WM_MENUCOMMAND      = 0x0126;
+
+		public const uint WM_CHANGEUISTATE    = 0x0127;
+		public const uint WM_UPDATEUISTATE    = 0x0128;
+		public const uint WM_QUERYUISTATE     = 0x0129;
+
+		public const uint WM_LBTRACKPOINT     = 0x0131;
+
+		/* Win32 CTLCOLOR messages */
+		public const uint WM_CTLCOLORMSGBOX    = 0x0132;
+		public const uint WM_CTLCOLOREDIT      = 0x0133;
+		public const uint WM_CTLCOLORLISTBOX   = 0x0134;
+		public const uint WM_CTLCOLORBTN       = 0x0135;
+		public const uint WM_CTLCOLORDLG       = 0x0136;
+		public const uint WM_CTLCOLORSCROLLBAR = 0x0137;
+		public const uint WM_CTLCOLORSTATIC    = 0x0138;
+
+		/* Mouse messages */
+		public const uint WM_MOUSEMOVE	    = 0x0200;
+		public const uint WM_LBUTTONDOWN	    = 0x0201;
+		public const uint WM_LBUTTONUP	    = 0x0202;
+		public const uint WM_LBUTTONDBLCLK    = 0x0203;
+		public const uint WM_RBUTTONDOWN	    = 0x0204;
+		public const uint WM_RBUTTONUP	    = 0x0205;
+		public const uint WM_RBUTTONDBLCLK    = 0x0206;
+		public const uint WM_MBUTTONDOWN	    = 0x0207;
+		public const uint WM_MBUTTONUP	    = 0x0208;
+		public const uint WM_MBUTTONDBLCLK    = 0x0209;
+		public const uint WM_MOUSEWHEEL       = 0x020A;
+		public const uint WM_XBUTTONDOWN      = 0x020B;
+		public const uint WM_XBUTTONUP        = 0x020C;
+		public const uint WM_XBUTTONDBLCLK    = 0x020D;
+
+		public const uint WM_MOUSEFIRST       = 0x0200;
+		public const uint WM_MOUSELAST        = 0x020D;
+
+		public const uint WM_WHEEL_DELTA      = 120;
+		public const uint WM_WHEEL_PAGESCROLL  = 65535;
+		public const uint WM_PARENTNOTIFY     = 0x0210;
+		public const uint WM_ENTERMENULOOP    = 0x0211;
+		public const uint WM_EXITMENULOOP     = 0x0212;
+		public const uint WM_NEXTMENU	    = 0x0213;
+
+		/* Win32 4.0 messages */
+		public const uint WM_SIZING	    = 0x0214;
+		public const uint WM_CAPTURECHANGED   = 0x0215;
+		public const uint WM_MOVING	    = 0x0216;
+		public const uint WM_POWERBROADCAST   = 0x0218;
+		public const uint WM_DEVICECHANGE     = 0x0219;
+
+		/* wParam for WM_SIZING message */
+		public const uint WMSZ_LEFT           = 1;
+		public const uint WMSZ_RIGHT          = 2;
+		public const uint WMSZ_TOP            = 3;
+		public const uint WMSZ_TOPLEFT        = 4;
+		public const uint WMSZ_TOPRIGHT       = 5;
+		public const uint WMSZ_BOTTOM         = 6;
+		public const uint WMSZ_BOTTOMLEFT     = 7;
+		public const uint WMSZ_BOTTOMRIGHT    = 8;
+
+		/* MDI messages */
+		public const uint WM_MDICREATE	    = 0x0220;
+		public const uint WM_MDIDESTROY	    = 0x0221;
+		public const uint WM_MDIACTIVATE	    = 0x0222;
+		public const uint WM_MDIRESTORE	    = 0x0223;
+		public const uint WM_MDINEXT	    = 0x0224;
+		public const uint WM_MDIMAXIMIZE	    = 0x0225;
+		public const uint WM_MDITILE	    = 0x0226;
+		public const uint WM_MDICASCADE	    = 0x0227;
+		public const uint WM_MDIICONARRANGE   = 0x0228;
+		public const uint WM_MDIGETACTIVE     = 0x0229;
+		public const uint WM_MDIREFRESHMENU   = 0x0234;
+
+		/* D&D messages */
+		public const uint WM_DROPOBJECT	    = 0x022A;
+		public const uint WM_QUERYDROPOBJECT  = 0x022B;
+		public const uint WM_BEGINDRAG	    = 0x022C;
+		public const uint WM_DRAGLOOP	    = 0x022D;
+		public const uint WM_DRAGSELECT	    = 0x022E;
+		public const uint WM_DRAGMOVE	    = 0x022F;
+		public const uint WM_MDISETMENU	    = 0x0230;
+
+		public const uint WM_ENTERSIZEMOVE    = 0x0231;
+		public const uint WM_EXITSIZEMOVE     = 0x0232;
+		public const uint WM_DROPFILES	    = 0x0233;
+
+
+		/* Win32 4.0 messages for IME */
+		public const uint IME_SETCONTEXT           = 0x0281;
+		public const uint IME_NOTIFY               = 0x0282;
+		public const uint IME_CONTROL              = 0x0283;
+		public const uint IME_COMPOSITIONFULL      = 0x0284;
+		public const uint IME_SELECT               = 0x0285;
+		public const uint IME_CHAR                 = 0x0286;
+		/* Win32 5.0 messages for IME */
+		public const uint IME_REQUEST              = 0x0288;
+
+		/* Win32 4.0 messages for IME */
+		public const uint IME_KEYDOWN              = 0x0290;
+		public const uint IME_KEYUP                = 0x0291;
+
+		/* Clipboard command messages */
+		public const uint WM_CUT               = 0x0300;
+		public const uint WM_COPY              = 0x0301;
+		public const uint WM_PASTE             = 0x0302;
+		public const uint WM_CLEAR             = 0x0303;
+		public const uint WM_UNDO              = 0x0304;
+
+		/* Clipboard owner messages */
+		public const uint WM_RENDERFORMAT      = 0x0305;
+		public const uint WM_RENDERALLFORMATS  = 0x0306;
+		public const uint WM_DESTROYCLIPBOARD  = 0x0307;
+
+		/* Clipboard viewer messages */
+		public const uint WM_DRAWCLIPBOARD     = 0x0308;
+		public const uint WM_PAINTCLIPBOARD    = 0x0309;
+		public const uint WM_VSCROLLCLIPBOARD  = 0x030A;
+		public const uint WM_SIZECLIPBOARD     = 0x030B;
+		public const uint WM_ASKCBFORMATNAME   = 0x030C;
+		public const uint WM_CHANGECBCHAIN     = 0x030D;
+		public const uint WM_HSCROLLCLIPBOARD  = 0x030E;
+
+		public const uint WM_QUERYNEWPALETTE   = 0x030F;
+		public const uint WM_PALETTEISCHANGING = 0x0310;
+		public const uint WM_PALETTECHANGED    = 0x0311;
+		public const uint WM_HOTKEY	     = 0x0312;
+
+		public const uint WM_PRINT             = 0x0317;
+		public const uint WM_PRINTCLIENT       = 0x0318;
+
+		public const uint WM_PENWINFIRST      = 0x0380;
+		public const uint WM_PENWINLAST       = 0x038F;
+
+
+		public const uint WM_APP               = 0x8000;
+
+		// Window Styles
+		public const uint WS_OVERLAPPED = 0x00000000;
+		public const uint WS_POPUP = 0x80000000;
+		public const uint WS_CHILD = 0x40000000;
+		public const uint WS_MINIMIZE = 0x20000000;
+		public const uint WS_VISIBLE = 0x10000000;
+		public const uint WS_DISABLED = 0x08000000;
+		public const uint WS_CLIPSIBLINGS = 0x04000000;
+		public const uint WS_CLIPCHILDREN = 0x02000000;
+		public const uint WS_MAXIMIZE = 0x01000000;
+		public const uint WS_CAPTION = 0x00C00000;
+		public const uint WS_BORDER = 0x00800000;
+		public const uint WS_DLGFRAME = 0x00400000;
+		public const uint WS_VSCROLL = 0x00200000;
+		public const uint WS_HSCROLL = 0x00100000;
+		public const uint WS_SYSMENU = 0x00080000;
+		public const uint WS_THICKFRAME = 0x00040000;
+		public const uint WS_GROUP = 0x00020000;
+		public const uint WS_TABSTOP = 0x00010000;
+		public const uint WS_MINIMIZEBOX = 0x00020000;
+		public const uint WS_MAXIMIZEBOX = 0x00010000;
+		public const uint WS_OVERLAPPEDWINDOW = WS_OVERLAPPED | 
+		  WS_CAPTION | WS_SYSMENU | WS_THICKFRAME| 
+		  WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
+
+		// ShowWindow types
+		public const uint SW_SHOW = 5;
+
+		// SetWindowPos types
+		public const uint SWP_NOSIZE          = 0x0001;
+		public const uint SWP_NOMOVE          = 0x0002;
+		public const uint SWP_NOZORDER        = 0x0004;
+		public const uint SWP_NOREDRAW        = 0x0008;
+		public const uint SWP_NOACTIVATE      = 0x0010;
+		public const uint SWP_FRAMECHANGED    = 0x0020;
+		public const uint SWP_SHOWWINDOW      = 0x0040;
+		public const uint SWP_HIDEWINDOW      = 0x0080;
+		public const uint SWP_NOCOPYBITS      = 0x0100;
+		public const uint SWP_NOOWNERZORDER   = 0x0200;
+		public const uint SWP_DRAWFRAME       = SWP_FRAMECHANGED;
+		public const uint SWP_NOREPOSITION    = SWP_NOOWNERZORDER;
+		public const uint SWP_NOSENDCHANGING  = 0x0400;
+		public const uint SWP_DEFERERASE      = 0x2000;
+		public const uint SWP_ASYNCWINDOWPOS  = 0x4000;
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/day.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/day.cs
new file mode 100644
index 00000000000..e886ae799eb
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/day.cs
@@ -0,0 +1,25 @@
+//

+// System.Windows.Forms.Day.cs

+//

+// Author:

+//   Dennis Hayes (dennish@raytek.com)

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// </summary>

+	public enum Day {

+		Default = 7,

+		Friday = 4,

+		Monday = 0,

+		Saturday = 5,

+		Sunday = 6,

+		Thursday = 3,

+		Tuesday = 1,

+		Wednesday = 2

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/makefile b/mcs/class/System.Windows.Forms/System.Windows.Forms/makefile
new file mode 100644
index 00000000000..702583000f9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/makefile
@@ -0,0 +1,135 @@
+CSC=mcs
+X11R6_INCLUDE=/usr/X11R6/include
+WINE_INCLUDE=/usr/local/include/wine
+WINE_LIB=/usr/local/lib/wine
+GLIB20_INCLUDE=/usr/include/glib-2.0
+GLIB20_LIB_INCLUDE=/usr/lib/glib-2.0/include
+LIBMONO=/usr/local/lib/libmono.a
+SOURCES = \
+	Win32.cs \
+	Font.cs \
+	MenuItem.cs \
+	DrawItemEventArgs.cs \
+	DrawItemEventHandler.cs \
+	../System.Windows.Forms/Message.cs \
+	../System.Windows.Forms/CreateParams.cs \
+	../System.Windows.Forms/MdiLayout.cs \
+	../System.Windows.Forms/InputLanguage.cs \
+	../System.Windows.Forms/InputLanguageCollection.cs \
+	../System.Windows.Forms/InputLanguageChangedEventArgs.cs \
+	../System.Windows.Forms/InputLanguageChangingEventArgs.cs \
+	../System.Windows.Forms/PaintEventArgs.cs \
+	../System.Windows.Forms/Keys.cs \
+	../System.Windows.Forms/BoundsSpecified.cs \
+	../System.Windows.Forms/RightToLeft.cs \
+	../System.Windows.Forms/Shortcut.cs \
+	../System.Windows.Forms/MeasureItemEventArgs.cs \
+	../System.Windows.Forms/SizeGripStyle.cs \
+	../System.Windows.Forms/FormStartPosition.cs \
+	../System.Windows.Forms/FormWindowState.cs \
+	../System.Windows.Forms/ImeMode.cs \
+	../System.Windows.Forms/InputLanguageChangedEventHandler.cs \
+	../System.Windows.Forms/MeasureItemEventHandler.cs \
+	../System.Windows.Forms/InputLanguageChangingEventHandler.cs \
+	../System.Windows.Forms/DrawItemState.cs \
+	../System.Windows.Forms/ComVisible.cs \
+	../System.Windows.Forms/DialogResult.cs \
+	../System.Windows.Forms/IButtonControl.cs \
+	../System.Windows.Forms/FormBorderStyle.cs \
+	../System.Windows.Forms/AccessibleEvents.cs \
+	../System.Windows.Forms/IWin32Window.cs \
+	../System.Windows.Forms/DragDropEffects.cs \
+	../System.Windows.Forms/ControlStyles.cs \
+	../System.Windows.Forms/ControlEventArgs.cs \
+	../System.Windows.Forms/DragEventArgs.cs \
+	../System.Windows.Forms/GiveFeedbackEventArgs.cs \
+	../System.Windows.Forms/HelpEventArgs.cs \
+	../System.Windows.Forms/InvalidateEventArgs.cs \
+	../System.Windows.Forms/KeyEventArgs.cs \
+	../System.Windows.Forms/KeyPressEventArgs.cs \
+	../System.Windows.Forms/MouseEventArgs.cs \
+	../System.Windows.Forms/LayoutEventArgs.cs \
+	../System.Windows.Forms/QueryContinueDragEventArgs.cs \
+	../System.Windows.Forms/HorizontalAlignment.cs \
+	../System.Windows.Forms/LeftRightAlignment.cs \
+	../System.Windows.Forms/AccessibleRole.cs \
+	../System.Windows.Forms/AnchorStyles.cs \
+	../System.Windows.Forms/Cursor.cs \
+	../System.Windows.Forms/BaseCollection.cs \
+	../System.Windows.Forms/DockStyle.cs \
+	../System.Windows.Forms/ControlEventHandler.cs \
+	../System.Windows.Forms/MouseButtons.cs \
+	../System.Windows.Forms/UICues.cs \
+	../System.Windows.Forms/UICuesEventArgs.cs \
+	../System.Windows.Forms/UICuesEventHandler.cs \
+	../System.Windows.Forms/DragEventHandler.cs \
+	../System.Windows.Forms/HelpEventHandler.cs \
+	../System.Windows.Forms/GiveFeedbackEventHandler.cs \
+	../System.Windows.Forms/InvalidateEventHandler.cs \
+	../System.Windows.Forms/KeyEventHandler.cs \
+	../System.Windows.Forms/KeyPressEventHandler.cs \
+	../System.Windows.Forms/LayoutEventHandler.cs \
+	../System.Windows.Forms/MouseEventHandler.cs \
+	../System.Windows.Forms/PaintEventHandler.cs \
+	../System.Windows.Forms/QueryAccessibilityHelpEventHandler.cs \
+	../System.Windows.Forms/QueryContinueDragEventHandler.cs \
+	../System.Windows.Forms/IDataObject.cs \
+	../System.Windows.Forms/DragAction.cs \
+	../System.Windows.Forms/QueryAccessibilityHelpEventArgs.cs \
+	../System.Windows.Forms/IMessageFilter.cs \
+	../System.Windows.Forms/ApplicationContext.cs \
+	IContainerControl.cs \
+	Control.cs \
+	ScrollableControl.cs \
+	ContainerControl.cs \
+	Form.cs \
+	Application.cs \
+	NativeWindow.cs
+
+all:	monostub.exe.so System.Windows.Forms.dll NativeWindowTest.exe \
+	FormTest.exe
+
+##########################################################################
+# build the mono stub application
+monostub.exe.so: monostub.o monostart.o monostub.exe.spec.o monostub.exe.dbg.o
+	gcc -shared -Wl,-Bsymbolic -o monostub.exe.so monostub.exe.spec.o \
+	monostub.o monostub.exe.dbg.o monostart.o -I/usr/local/include \
+	 -I$(GLIB20_INCUDE) -I$(GLIB20_LIB_INCLUDE) -L/usr/lib $(LIBMONO) \
+	-lwine -lntdll.dll -lglib-2.0 -lgmodule-2.0 -lm -lpthread -lgc
+
+clean:	
+	rm *.o monostub.exe.dbg.c monostub.exe.spec.c monostub.exe.so *.exe *.dll
+
+monostub.o: monostub.c
+	gcc -c -I. -I$(WINE_INCLUDE)  -g -O2 -Wall -I$(X11R6_INCLUDE) -o monostub.o monostub.c
+
+monostart.o: monostart.c
+	gcc -c -I. -g -O2 -Wall -I$(X11R6_INCLUDE) -o monostart.o monostart.c -I$(GLIB20_INCLUDE) -I$(GLIB20_LIB_INCLUDE) -I$(WINE_INCLUDE)
+
+monostub.exe.tmp.o: monostub.o monostart.o
+	ld -r  monostub.o -o monostub.exe.tmp.o  
+	strip --strip-unneeded monostub.exe.tmp.o
+
+monostub.exe.spec.c: monostub.exe.tmp.o
+	winebuild -sym monostub.exe.tmp.o -o monostub.exe.spec.c -exe monostub.exe -mgui -L$(WINE_LIB)  -lcomdlg32 -lshell32 -luser32 -lgdi32 -lkernel32
+
+monostub.exe.spec.o: monostub.exe.spec.c
+	gcc -c -I. -I. -I$(WINE_INCLUDE) -g -O2 -I$(X11R6_INCLUDE) -o monostub.exe.spec.o monostub.exe.spec.c
+
+monostub.exe.dbg.c: monostub.exe.spec.o
+	winebuild -o monostub.exe.dbg.c -debug -C. monostub.c
+
+monostub.exe.dbg.o: monostub.exe.dbg.c
+	gcc -c -I. -I. -I$(WINE_INCLUDE)  -g -O2 -I$(X11R6_INCLUDE) -o monostub.exe.dbg.o monostub.exe.dbg.c
+
+##########################################################################
+# build System.Windows.Forms.dll and test/sample applications
+
+NativeWindowTest.exe: NativeWindowTest.cs System.Windows.Forms.dll
+	$(CSC) -r System.Windows.Forms.dll NativeWindowTest.cs
+
+FormTest.exe: FormTest.cs System.Windows.Forms.dll
+	$(CSC) -r System.Windows.Forms.dll FormTest.cs
+
+System.Windows.Forms.dll: $(SOURCES)
+	$(CSC) --target library -o System.Windows.Forms.dll $(SOURCES) -r System.Drawing
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/monostub.c b/mcs/class/System.Windows.Forms/System.Windows.Forms/monostub.c
new file mode 100644
index 00000000000..6be0e24d044
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/monostub.c
@@ -0,0 +1,37 @@
+#include <windows.h>
+#include <stdio.h>
+//
+// The Mono and WINE header files have overlapping definitions in the
+// header files. This file contains the "WinMain" startup code and
+// other code that must call functions in the windows.h header file.
+// 
+
+int mono_start(unsigned int hInstance, unsigned int hPrevInstance, char* lpszCmdLine, int nCmdShow);
+long __attribute__((__stdcall__)) WndProc(unsigned int hWnd, unsigned int msg, unsigned int wParam, long lParam);
+
+// register WNDCLASS for use in embeded application
+void register_mono_wine_class(HINSTANCE hInstance)
+{
+	WNDCLASS wc;
+
+	wc.lpszClassName = "mono_wine_class";
+	wc.lpfnWndProc = (WNDPROC) WndProc;
+	wc.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW;
+	wc.hInstance = hInstance;
+	wc.hIcon = (HICON) LoadIcon( 0, (LPCTSTR) IDI_APPLICATION );
+	wc.hCursor = (HCURSOR) LoadCursor( 0, (LPCTSTR) IDC_ARROW );
+	wc.hbrBackground = (HBRUSH)( COLOR_WINDOW+1 );
+	wc.lpszMenuName = NULL;
+	wc.cbClsExtra = 0;
+	wc.cbWndExtra = 0;
+
+	RegisterClass(&wc);
+}
+
+int PASCAL WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCmdShow )
+{
+	printf("registering mono_wine_class\n");
+	register_mono_wine_class(hInstance);
+	return mono_start(hInstance, hPrevInstance, lpszCmdLine, nCmdShow);
+}
+
diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/ochangelog b/mcs/class/System.Windows.Forms/System.Windows.Forms/ochangelog
new file mode 100644
index 00000000000..60bdc98f7cb
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/ochangelog
@@ -0,0 +1,84 @@
+2002-8-21  John Sohn <jsohn@columbus.rr.com>

+	* Application.cs:

+	* Control.cs:

+	* Form.cs:

+	* NativeWindow.cs:

+	* NativeWindowTest.cs: updated code to build on latest mcs in cvs

+

+2002-8-21  John Sohn <jsohn@columbus.rr.com>

+	* Application.cs:

+	* NativeWindow.cs: 

+	* NativeWindowTest.cs: compliant with new DllImports in Win32.cs

+	* makefile: correctly links libmono.a

+

+2002-8-20  John Sohn <jsohn@columbus.rr.com>

+	* Win32.cs: now uses correct Win32 imports and defs. Fixed file provded

+	by Dennis Hayes (dennish@raytek.com)

+	* Application.cs: fixed Win32 API calls

+	* Control.cs: commented out functions which broked build 

+	but are not currently implemented

+	* DrawItemEventHandler.cs: 

+	* MenuItem.cs: added empty classes that allows build to continue

+	without commenting out refernces to them in the source

+	* NativeWindow.cs: fixed Win32 API calls

+

+2002-8-19  John Sohn <jsohn@columbus.rr.com>

+	* monostart.c: fixed link from monostub WndProc to Application

+	class WndProc

+	* FormTest.cs: test of class NOT derived from the Form class

+

+2002-8-18  John Sohn <jsohn@columbus.rr.com>

+	* Application.cs:

+	* ContainerControl.cs:

+	* Control.cs:

+	* Form.cs:

+	* FormTest.cs:

+	* NativeWindow.cs:

+	* NativeWindowTest.cs:

+	* ScrollableControl.cs:

+	* Win32.cs: Updated to better conform to Mono coding conventions

+

+2002-8-16  John Sohn <jsohn@columbus.rr.com>

+	* Application.cs: start of implementation, implements Run(Form) and 

+	handles WndProc as called from monostub WINE application

+	* Font.cs: empty class that allows code with references to 

+	Font to compile

+	* IContainerControl.cs: empty class the allows code with references to 

+	IContainerControl to compile

+	* ContainerControl.cs: start of implementation, a base class of Form

+	* Form.cs: start of implementation, converts most messages to 

+	appropriate On handlers

+	* NativeWindow.cs: almost complete implementation of NativeWindow class

+	* Win32.cs: central point for DllImport and WineLib defs

+	* Control.cs: start of implementation, a base class of Form

+	* DrawItemEventArgs.cs - empty class the allows code with references 

+	to DrawItemEventArgs to compile

+	* IAccessible.cs - empty class the allows code with references to 

+	IAccessible to compile

+	* ScrollableControl.cs: start of implementation, a base class of Form

+	* FormTest.cs - test application for the Form class

+	* NativeWindowTest.cs - test application for the NativeWindowTest

+	* monostub.c - added WNDCLASS registration

+	* monosart.c - added WndProc handler for messages, dispatch messages

+	to C# code using Mono embedded API

+	* makefile - Now uses a real makefile to build monostub.exe.so, 

+	System.Windows.Forms, and test applications. Based on the makefile 

+	used in the Gtk target of Windows.Forms. The build.sh script is

+	no longer maintained.

+	

+2002-8-7  DennisHayes <dennish@raytek.com>

+

+*  Started cheanglog

+

+2002-8-4  DennisHayes <dennish@raytek.com>

+Checked in for John Sohn <jsohn@columbus.rr.com

+

+* build.sh

+* changelog

+* monostart.c

+* monostub.c

+* monostub.exe.dbg.c

+* monostub.exe.spec.c

+* Test.cs

+* test.sh

+* Experiment to get first form working using WINELIB

diff --git a/mcs/class/System.Windows.Forms/System.Windows.Forms/tooltip.cs b/mcs/class/System.Windows.Forms/System.Windows.Forms/tooltip.cs
new file mode 100644
index 00000000000..e81a2949e64
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/System.Windows.Forms/tooltip.cs
@@ -0,0 +1,120 @@
+//

+// System.Windows.Forms.ToolTip

+//

+// Author:

+//   stubbed out by Jackson Harper (jackson@latitudegeo.com)

+//	Dennis Hayes (dennish@raytek.com)

+//

+// (C) 2002 Ximian, Inc

+//

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public sealed class ToolTip : Component, IExtenderProvider {

+

+		//

+		//  --- Public Constructors

+		//

+		[MonoTODO]

+		public ToolTip() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public ToolTip(IContainer cont) {

+			throw new NotImplementedException ();

+		}

+		//

+		// --- Public Properties

+		//

+		[MonoTODO]

+		public bool Active {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}	

+		}

+		[MonoTODO]

+		public int AutomaticDelay {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}	

+		}

+		[MonoTODO]

+		public int AutoPopDelay{

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int InitialDelay {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public int ReshowDelay {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		[MonoTODO]

+		public bool ShowAlways {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		// --- Public Methods

+		

+		[MonoTODO]

+		public void RemoveAll() {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public void SetToolTip(Control control, string caption) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		public override string ToString() {

+			throw new NotImplementedException ();

+		}

+		//

+		// --- Protected Methods

+		//

+

+		//inherited

+		//protected override void Dispose(bool disposing) {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		~ToolTip() {

+			throw new NotImplementedException ();

+		}

+		bool IExtenderProvider.CanExtend(object extendee){

+			throw new NotImplementedException ();

+		}

+

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/WINELib/Application.cs b/mcs/class/System.Windows.Forms/WINELib/Application.cs
new file mode 100644
index 00000000000..2adf0218a23
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/Application.cs
@@ -0,0 +1,232 @@
+//

+// System.Windows.Forms.Application

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Miguel de Icaza (miguel@ximian.com)

+//	Dennis hayes (dennish@raytek.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) Ximian, Inc 2002

+//

+

+using System;

+using System.Drawing;

+using Microsoft.Win32;

+using System.ComponentModel;

+using System.Threading;

+using System.Globalization;

+using System.Reflection;

+using System.Collections;

+using System.Runtime.CompilerServices;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides static methods and properties to manage an application, 

+	/// such as methods to start and stop an application, to process 

+	/// Windows messages, and properties to get information about an 

+	/// application. This class cannot be inherited.

+	/// </summary>

+

+	[MonoTODO]

+	public sealed class Application {

+

+		//[MethodImplAttribute(MethodImplOptions.InternalCall)]

+		//extern static int GetInstance();

+

+		static private Form applicationForm;

+

+		// --- (public) Properties ---

+		[MonoTODO]

+		public static bool AllowQuit {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string CommonAppDataPath {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		// Registry key not yet defined (this should be interesting)

+		//public static RegistryKey CommonAppDataRegistry {

+		//	get { throw new NotImplementedException (); }

+		//}

+	

+		[MonoTODO]

+		public static string CompanyName {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static CultureInfo CurrentCulture {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static InputLanguage CurrentInputLanguage {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string ExecutablePath {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string LocalUserAppDataPath {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static bool MessageLoop {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string ProductName {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string ProductVersion {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string SafeTopLevelCaptionFormat {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string StartupPath {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		public static string UserAppDataPath {

+			get { throw new NotImplementedException (); }

+		}

+	

+		[MonoTODO]

+		// Registry key not yet defined

+		//public static RegistryKey UserAppDataRegistry {

+		//	get { throw new NotImplementedException (); }

+		//}

+		

+

+		private static ArrayList messageFilters = new ArrayList ();

+	

+		// --- Methods ---

+		[MonoTODO]

+		public static void AddMessageFilter (IMessageFilter value) 

+		{

+			messageFilters.Add (value);

+		}

+	

+		[MonoTODO]

+		public static void DoEvents () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static void Exit () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static void ExitThread () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static ApartmentState OleRequired () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static void OnThreadException (Exception t) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static void RemoveMessageFilter (IMessageFilter value)

+		{

+			messageFilters.Remove (value);

+		}

+

+		public static void Run ()

+		{

+

+		}

+

+		[MonoTODO]

+		public static void Run (ApplicationContext context) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		//[TypeAttributes.BeforeFieldInit]

+		public static void Run (Form context)

+		// Documents say this parameter name should be mainform, 

+		// but the verifier says context.

+		{

+			applicationForm = context;

+			int msg = 0;

+			context.Show ();

+

+			while (Win32.GetMessageA (ref msg, 0, 0, 0) != 0) {

+				Win32.TranslateMessage (ref msg);

+				Win32.DispatchMessageA (ref msg);

+			}

+		}

+		

+		// --- Events ---

+//		public static event EventHandler ApplicationExit;		

+		public static event EventHandler Idle;

+		public static event ThreadExceptionEventHandler ThreadException;

+		public static event EventHandler ThreadExit;

+

+

+

+		// The WndProc is initialized in the monostub and calls the 

+		// WndProc defined here

+		static private IntPtr _ApplicationWndProc (IntPtr hWnd, 

+							   int msg, 

+							   IntPtr wParam, 

+							   IntPtr lParam)  {

+

+ 		        Console.WriteLine ("in _ApplicationWndProc");

+ 			Message message = new Message ();

+

+ 			message.Result = (IntPtr) 0;

+			message.HWnd = hWnd;

+			message.Msg = msg;

+			message.WParam = wParam;

+			message.LParam = lParam;

+

+			IEnumerator e = messageFilters.GetEnumerator ();

+			

+			while (e.MoveNext()) {

+				IMessageFilter filter = 

+				    (IMessageFilter) e.Current;

+				if (filter.PreFilterMessage (ref message))

+					return message.Result;

+			}

+

+			//if (applicationForm != null)

+			//	applicationForm.WndProc (ref message);

+

+			return message.Result;

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/WINELib/ContainerControl.cs b/mcs/class/System.Windows.Forms/WINELib/ContainerControl.cs
new file mode 100644
index 00000000000..7d7f5d30b53
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/ContainerControl.cs
@@ -0,0 +1,129 @@
+//

+// System.Windows.Forms.ContainerControl.cs

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com)

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//   Dennis Hayes (dennish@Raytek.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Drawing;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Provides focus management functionality for controls that can function as a container for other controls.

+	/// </summary>

+

+	public class ContainerControl : ScrollableControl, IContainerControl {

+

+		protected ContainerControl () : base () 

+		{

+		}

+		

+		

+		public Control ActiveControl {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		// not ready for BindingContext

+		//public override BindingContext BindingContext {

+		//	get { throw new NotImplementedException (); }

+		//	set { throw new NotImplementedException (); }

+		//}

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public Form ParentForm {

+			get { throw new NotImplementedException (); }

+		}

+		

+		/// --- Methods ---

+		/// internal .NET framework supporting methods, not stubbed out:

+		/// - protected virtual void UpdateDefaultButton()

+		[MonoTODO]

+		protected override void AdjustFormScrollbars (bool displayScrollbars) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void Dispose (bool disposing) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		// not memeber?

+		//bool IContainerControl.ActivateControl(Control control) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		// [event methods]

+		[MonoTODO]

+		protected override void OnControlRemoved (ControlEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void OnCreateControl () 

+		{

+			throw new NotImplementedException ();

+		}

+		// end of [event methods]

+		

+		[MonoTODO]

+		protected override bool ProcessDialogChar (char charCode) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool ProcessDialogKey (Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override bool ProcessMnemonic (char charCode) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessTabKey (bool forward) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// Not an overridden function?

+		//protected override void Select(bool directed,bool forward) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		public bool Validate () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected override void WndProc(ref Message m) 

+		{

+			base.WndProc(ref m);

+		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/WINELib/Control.cs b/mcs/class/System.Windows.Forms/WINELib/Control.cs
new file mode 100644
index 00000000000..56cdece5763
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/Control.cs
@@ -0,0 +1,2718 @@
+//

+// System.Windows.Forms.Control.cs

+//

+// Author:

+//   stubbed out by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis Hayes (dennish@rayetk.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) Ximian, Inc., 2002

+//

+

+using System.ComponentModel;

+using System.Drawing;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	/// <summary>

+	/// Defines the base class for controls, which are components with 

+	/// visual representation.

+	///

+	/// ToDo note:

+	///  - no methods are implemented

+	/// </summary>

+	

+	[MonoTODO]

+	public class Control : Component , ISynchronizeInvoke, IWin32Window {

+

+		protected class ControlNativeWindow : NativeWindow {

+

+			private Control control;

+

+			public ControlNativeWindow (Control control) : base() {

+				this.control = control;

+			}

+

+			protected override void WndProc (ref Message m) {

+				control.WndProc (ref m);

+			}

+		}

+		

+		protected ControlNativeWindow window;

+

+		// private fields

+		//Acually many of these need to be gotten or sent to the OS, 

+		//and not stored here.

+		//string accessibleDefaultActionDescription;

+		//string accessibleDescription;

+		//string accessibleName;

+		//AccessibleRole accessibleRole;

+		//bool allowDrop;

+		//AnchorStyles anchor;

+		//Color backColor;

+		//Image backgroundImage;

+		//BindingContext bindingContext;

+		//Rectangle bounds;

+		//bool causesValidation;

+		//ContextMenu contextMenu;

+		//DockStyle dock;

+		//bool enabled;

+		//Font font;

+		//Color foreColor;

+		//ImeMode imeMode;

+		//bool isAccessible;

+		//Point location;

+		//string name;

+		//Region region;

+		//RightToLeft rightToLeft;

+		//bool tabStop;

+		//string text;

+		//bool visible;

+		

+		// --- Constructors ---

+		public Control ()

+		{

+			CreateParams cp = new CreateParams ();

+			window = new ControlNativeWindow (this);

+			

+			cp.Caption = "";

+			cp.ClassName = "mono_wine_class";

+			cp.X = 10;

+			cp.Y = 10;

+			cp.Width = 50;

+			cp.Height = 50;

+			cp.ClassStyle = 0;

+			cp.ExStyle = 0;

+			cp.Param = 0;

+			cp.Param = 0;

+			cp.Style = (int) Win32.WS_OVERLAPPEDWINDOW;

+

+			window.CreateHandle (cp);

+

+			//Acually many of these need to be gotten or sent to 

+			//the OS, and not stored here.

+			//accessibleDefaultActionDescription=null;

+			//accessibleDescription=null;

+			//accessibleName=null;

+			//accessibleRole=AccessibleRole.Default;

+			//allowDrop=false;

+			//anchor=AnchorStyles.Top|AnchorStyles.Left;

+			//backColor=Control.DefaultBackColor;

+			//backgroundImage=null;

+			//bounds=new Rectangle();

+			//bindingContext=null;

+			//causesValidation=true;

+			//contextMenu=null;

+			//dock=DockStyle.None;

+			//enabled=true;

+			//font=Control.DefaultFont;

+			//foreColor=Control.DefaultForeColor;

+			//imeMode=ImeMode.Inherit;

+			//isAccessible=false;

+			//location=new Point (0,0);

+			//name="";

+			//region=null;

+			//rightToLeft=RightToLeft.Inherit;

+			//tabStop=false;

+			//text="";

+			//visible=true;

+		}

+		

+		public Control (string text) : this() 

+		{

+			throw new NotImplementedException ();

+			//this.text=text;

+		}

+		

+		[MonoTODO]

+		public Control (Control parent, string text) : this (text) 

+		{

+			// FIXME: set parent

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Control (string text, int left, int top, 

+				int width, int height) : this(text) 

+		{

+			// FIXME: set size and location

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Control (Control parent,string text,int left, int top,

+				int width,int height) : this (parent,text) 

+		{

+			// FIXME: set size and location

+			throw new NotImplementedException ();

+		}

+		

+		// --- Properties ---

+		// Properties only supporting .NET framework, not stubbed out:

+		//  - protected bool RenderRightToLeft {get;}

+		//  - public IWindowTarget WindowTarget {get; set;}

+		//[MonoTODO]

+		// AccessibleObject not ready

+		//public AccessibleObject AccessibilityObject {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		public string AccessibleDefaultActionDescription {

+			get {

+				//return accessibleDefaultActionDescription;

+				throw new NotImplementedException ();

+			}

+			set {

+				//accessibleDefaultActionDescription=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public string AccessibleDescription {

+			get {

+				//return accessibleDescription;

+				throw new NotImplementedException ();

+			}

+			set {

+				//accessibleDescription=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public string AccessibleName {

+			get {

+				//return accessibleName;

+				throw new NotImplementedException ();

+			}

+			set {

+				//accessibleName=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public AccessibleRole AccessibleRole {

+			get {

+				//return accessibleRole;

+				throw new NotImplementedException ();

+			}

+			set {

+				//accessibleRole=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public virtual bool AllowDrop {

+			get {

+				//return allowDrop;

+				throw new NotImplementedException ();

+			}

+			set {

+				//allowDrop=value;

+				throw new NotImplementedException ();

+			}

+		}

+	

+		public virtual AnchorStyles Anchor {

+			get {

+				//return anchor;

+				throw new NotImplementedException ();

+			}

+			set {

+				//anchor=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public virtual Color BackColor {

+			get {

+				//return backColor;

+				throw new NotImplementedException ();

+			}

+			set {

+				//backColor=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public virtual Image BackgroundImage {

+			get {

+				//return backgroundImage;

+				throw new NotImplementedException ();

+			}

+			set {

+				//backgroundImage=value;

+				throw new NotImplementedException ();

+			}

+		}

+

+		// waiting for BindingContext

+		//public virtual BindingContext BindingContext {

+		//	get {

+		//		//return bindingContext;

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		//bindingContext=value;

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		[MonoTODO]

+		public int Bottom {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Rectangle Bounds {

+			// CHECKME:

+			get {

+				//return bounds;

+				throw new NotImplementedException ();

+			}

+			set {

+				//bounds=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool CanFocus {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool CanSelect {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool Capture {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public bool CausesValidation {

+			get {

+				//return causesValidation;

+				throw new NotImplementedException ();

+			}

+			set {

+				//causesValidation=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Rectangle ClientRectangle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Size ClientSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public string CompanyName {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool ContainsFocus {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		//public virtual ContextMenu ContextMenu {

+		//	get {

+		//		//return contextMenu;

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		//contextMenu=value;

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		[MonoTODO]

+		public ControlCollection Controls {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool Created {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		protected virtual CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual Cursor Cursor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		// waiting for BindingContext

+		//public ControlBindingsCollection DataBindings {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		public static Color DefaultBackColor {

+			get {

+				//return SystemColors.Control;

+				throw new NotImplementedException ();

+			}

+		}

+

+		//[MonoTODO]

+ 		//public static Font DefaultFont {

+			// FIXME: get current system font from GenericSansSerif

+			//        call ArgumentException not called

+		//	get {

+		//		throw new NotImplementedException ();

+				//return (FontFamily.GenericSansSerif); 

+		//	}

+		//}

+		

+		public static Color DefaultForeColor {

+			get {

+				//return SystemColors.ControlText;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		protected virtual ImeMode DefaultImeMode {

+			get {

+				//return ImeMode.Inherit;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		protected virtual Size DefaultSize {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual Rectangle DisplayRectangle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool Disposing {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual DockStyle Dock {

+			// CHECKME:

+			get {

+				//return dock;

+				throw new NotImplementedException ();

+			}

+			set {

+				//dock=value;

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public virtual bool Enabled {

+			// CHECKME:

+			get {

+				//return enabled;

+				throw new NotImplementedException ();

+			}

+			set {

+				//enabled=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual bool Focused {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		//public virtual Font Font {

+			// CHECKME:

+		//	get {

+				//return font;

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+				//font=value;

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		[MonoTODO]

+		protected int FontHeight {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual Color ForeColor {

+			// CHECKME:

+			get {

+				//return foreColor;

+				throw new NotImplementedException ();

+			}

+			set {

+				//foreColor=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool HasChildren {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int Height {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public ImeMode ImeMode {

+			// CHECKME:

+			get {

+				//return imeMode;

+				throw new NotImplementedException ();

+			}

+			set {

+				//imeMode=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool IsAccessible {

+			// CHECKME:

+			get {

+				//return isAccessible;

+				throw new NotImplementedException ();

+			} // default is false

+			set {

+				//isAccessible=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool IsDisposed {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool IsHandleCreated {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int Left {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Point Location {

+			// CHECKME:

+			get {

+				//return location;

+				throw new NotImplementedException ();

+			}

+			set {

+				//location=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public static Keys ModifierKeys {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public static MouseButtons MouseButtons {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public static Point MousePosition {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public string Name {

+			// CHECKME:

+			get {

+				//return name;

+				throw new NotImplementedException ();

+			}

+			set {

+				//name=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Control Parent {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public string ProductName {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public string ProductVersion {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool RecreatingHandle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		// Region class not ready

+		//public Region Region {

+		//	// CHECKME:

+		//	get {

+		//		//return region;

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		//region=value;

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		[MonoTODO]

+		protected bool ResizeRedraw {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int Right {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual RightToLeft RightToLeft {

+			// CHECKME:

+			get {

+				//return rightToLeft;

+				throw new NotImplementedException ();

+			}

+			set {

+				//rightToLeft=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		protected virtual bool ShowFocusCues {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		protected bool ShowKeyboardCues {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Size Size {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int TabIndex {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool TabStop {

+			// CHECKME:

+			get {

+				//return tabStop;

+				throw new NotImplementedException ();

+			}

+			set {

+				//tabStop=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public object Tag {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public virtual string Text {

+			// CHECKME:

+			get {

+				//return text;

+				throw new NotImplementedException ();

+			}

+			set {

+				//text=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int Top {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public Control TopLevelControl {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public bool Visible {

+			// CHECKME:

+			get {

+				//return visible;

+				throw new NotImplementedException ();

+			}

+			set {

+				//visible=value;

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public int Width {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		

+		

+		/// --- methods ---

+		/// internal .NET framework supporting methods, not stubbed out:

+		/// - protected virtual void NotifyInvalidate(Rectangle invalidatedArea)

+		/// - protected void RaiseDragEvent(object key,DragEventArgs e);

+		/// - protected void RaiseKeyEvent(object key,KeyEventArgs e);

+		/// - protected void RaiseMouseEvent(object key,MouseEventArgs e);

+		/// - protected void RaisePaintEvent(object key,PaintEventArgs e);

+		/// - protected void ResetMouseEventArgs();

+		

+		

+		[MonoTODO]

+		protected void AccessibilityNotifyClients (

+			AccessibleEvents accEvent,int childID) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void BringToFront () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public bool Contains (Control ctl) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void CreateControl () 

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// AccessibleObject not ready

+		//protected virtual AccessibleObject CreateAccessibilityInstance() {

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		protected virtual ControlCollection CreateControlsInstance ()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Graphics CreateGraphics () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected virtual void CreateHandle ()

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected virtual void DefWndProc (ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected virtual void DestroyHandle ()

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected override void Dispose (bool disposing) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public DragDropEffects DoDragDrop (

+			object data, DragDropEffects allowedEffects)

+		{

+			throw new NotImplementedException ();

+		}

+	

+		//public object EndInvoke(IAsyncResult asyncResult):

+		//look under ISynchronizeInvoke methods

+	

+		[MonoTODO]

+		public Form FindForm () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public bool Focus () 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static Control FromChildHandle (IntPtr handle) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public static Control FromHandle (IntPtr handle) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		public Control GetChildAtPoint (Point pt) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		//public IContainerControl GetContainerControl () 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		public Control GetNextControl (Control ctl, bool forward) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected bool GetStyle (ControlStyles flag) 

+		{

+			throw new NotImplementedException ();

+		}

+	

+		[MonoTODO]

+		protected bool GetTopLevel () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Hide ()

+ 		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void InitLayout () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Invalidate () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Invalidate (bool invalidateChildren) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Invalidate (Rectangle rc) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		// Region class not ready

+		//public void Invalidate(Region region) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		public void Invalidate (Rectangle rc, bool invalidateChildren) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		// Region not ready

+		//public void Invalidate(Region region,bool invalidateChildren) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		protected void InvokeGotFocus (Control toInvoke, EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void InvokeLostFocus (Control toInvoke, EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void InvokeOnClick (Control toInvoke, EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void InvokePaint (Control c, PaintEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void InvokePaintBackground (

+			Control c,PaintEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool IsInputChar (char charCode)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool IsInputKey (Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public static bool IsMnemonic (char charCode,string text)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// methods used with events:

+		[MonoTODO]

+		protected virtual void OnBackColorChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnBackgroundImageChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnBindingContextChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnCausesValidationChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		// Region not ready

+		//protected virtual void OnChangeUICues(UICuesEventArgs e) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		protected virtual void OnClick (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnContextMenuChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnControlAdded (ControlEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnControlRemoved (ControlEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnCreateControl ()

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnCursorChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDockChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDoubleClick (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDragDrop (DragEventArgs drgevent)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDragEnter (DragEventArgs drgevent)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDragLeave (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnDragOver (DragEventArgs drgevent)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnEnabledChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnEnter (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnFontChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnForeColorChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnGiveFeedback (

+			GiveFeedbackEventArgs gfbevent)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnGotFocus (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnHandleCreated (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnHandleDestroyed (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnHelpRequested (HelpEventArgs hevent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnImeModeChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnInvalidated (InvalidateEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnKeyDown (KeyEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnKeyPress (KeyPressEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnKeyUp (KeyEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnLayout (LayoutEventArgs levent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnLeave (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnLocationChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnLostFocus (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseDown (MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseEnter (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseHover (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseLeave (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseMove (MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseUp (MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMouseWheel (MouseEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnMove (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnNotifyMessage (Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnPaint (PaintEventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnPaintBackground (

+			PaintEventArgs pevent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentBackColorChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentBackgroundImageChanged (

+			EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentBindingContextChanged(

+			EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentEnabledChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentFontChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentForeColorChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentRightToLeftChanged (

+			EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnParentVisibleChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnQueryContinueDrag (

+			QueryContinueDragEventArgs qcdevent) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnResize (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnRightToLeftChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnSizeChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnStyleChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnSystemColorsChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnTabIndexChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnTabStopChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnTextChanged (EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected virtual void OnTextAlignChanged (EventArgs e) {

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void OnValidated (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		// CancelEventArgs not ready

+		//protected virtual void OnValidating(CancelEventArgs e) 

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		

+		[MonoTODO]

+		protected virtual void OnVisibleChanged (EventArgs e) 

+		{

+			throw new NotImplementedException ();

+		}

+		// --- end of methods for events ---

+		

+		

+		[MonoTODO]

+		public void PerformLayout () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void PerformLayout (Control affectedControl,

+					   string affectedProperty) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Point PointToClient (Point p) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Point PointToScreen (Point p) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual bool PreProcessMessage (ref Message msg) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessCmdKey (ref Message msg,

+						      Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessDialogChar (char charCode) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessDialogKey (Keys keyData) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessKeyEventArgs (ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected internal virtual bool ProcessKeyMessage (

+			ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessKeyPreview (ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual bool ProcessMnemonic (char charCode) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void RecreateHandle() 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Rectangle RectangleToClient (Rectangle r) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Rectangle RectangleToScreen (Rectangle r) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected static bool ReflectMessage (IntPtr hWnd,

+						      ref Message m) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void Refresh () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void ResetBackColor () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetBindings () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void ResetFont () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void ResetForeColor () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResetImeMode () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void ResetRightToLeft () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public virtual void ResetText () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResumeLayout () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void ResumeLayout (bool performLayout) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected ContentAlignment RtlTranslateAlignment (

+			ContentAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected HorizontalAlignment RtlTranslateAlignment (

+			HorizontalAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected LeftRightAlignment RtlTranslateAlignment (

+			LeftRightAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected ContentAlignment RtlTranslateContent (

+			ContentAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected HorizontalAlignment RtlTranslateHorizontal (

+			HorizontalAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected LeftRightAlignment RtlTranslateLeftRight (

+			LeftRightAlignment align) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Scale (float ratio) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Scale (float dx,float dy) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void ScaleCore (float dx, float dy) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Select () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void Select (bool directed,bool forward) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public bool SelectNextControl (Control ctl, bool forward, 

+					       bool tabStopOnly, 

+					       bool nested, bool wrap)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SendToBack () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SetBounds (int x, int y, int width, int height) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SetBounds (int x, int y, int width, int height,

+				       BoundsSpecified specified) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void SetBoundsCore (

+			int x, int y, int width, int height,

+			BoundsSpecified specified) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void SetClientSizeCore (int x, int y)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void SetStyle (ControlStyles flag, bool value) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void SetTopLevel (bool value)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void SetVisibleCore (bool value)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Show () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void SuspendLayout () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void Update () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void UpdateBounds () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void UpdateBounds (int x, int y, int width, int height) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void UpdateBounds (

+			int x, int y, int width, int height, int clientWidth,

+			int clientHeight)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void UpdateStyles () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected void UpdateZOrder () 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		protected virtual void WndProc(ref Message m) 

+		{

+

+		}

+		

+		/// --- Control: events ---

+		[MonoTODO]

+		public event EventHandler BackColorChanged;// {

+//			add {

+//				throw new NotImplementedException ();

+//			}

+//			remove {

+//				throw new NotImplementedException ();

+//			}

+//		}

+		

+		[MonoTODO]

+		public event EventHandler BackgroundImageChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler BindingContextChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler CausesValidationChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event UICuesEventHandler ChangeUICues {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Click {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ContextMenuChanged;

+		

+		[MonoTODO]

+		public event ControlEventHandler ControlAdded	{

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event ControlEventHandler ControlRemoved	{

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler CursorChanged	{

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler DockChanged	{

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler DoubleClick {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event DragEventHandler DragDrop {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event DragEventHandler DragEnter {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler DragLeave {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event DragEventHandler DragOver {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler EnabledChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Enter {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler FontChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ForeColorChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event GiveFeedbackEventHandler GiveFeedback {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler GotFocus {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler HandleCreated {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler HandleDestroyed {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event HelpEventHandler HelpRequested {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ImeModeChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event InvalidateEventHandler Invalidated {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event KeyEventHandler KeyDown {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event KeyPressEventHandler KeyPress {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event KeyEventHandler KeyUp {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event LayoutEventHandler Layout {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Leave {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler LocationChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler LostFocus {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event MouseEventHandler MouseDown {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler MouseEnter {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler MouseHover {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler MouseLeave {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event MouseEventHandler MouseMove {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event MouseEventHandler MouseUp {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event MouseEventHandler MouseWheel {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Move {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event PaintEventHandler Paint {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler ParentChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event QueryAccessibilityHelpEventHandler QueryAccessibilityHelp {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event QueryContinueDragEventHandler QueryContinueDrag {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Resize {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler RightToLeftChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler SizeChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler StyleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler SystemColorsChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler TabIndexChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler TabStopChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler TextChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		public event EventHandler Validated {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		[MonoTODO]

+		// CancelEventHandler not yet defined

+		//public event CancelEventHandler Validating {

+		//	add {

+		//		throw new NotImplementedException ();

+		//	}

+		//	remove {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+		

+		[MonoTODO]

+		public event EventHandler VisibleChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		/// --- IWin32Window properties

+		[MonoTODO]

+		public IntPtr Handle {

+			get { throw new NotImplementedException (); }

+		}

+		

+		/// --- ISynchronizeInvoke properties ---

+		[MonoTODO]

+		public bool InvokeRequired {

+			get { throw new NotImplementedException (); }

+		}

+		

+		/// --- ISynchronizeInvoke methods ---

+		[MonoTODO]

+		public IAsyncResult BeginInvoke (Delegate method) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public IAsyncResult BeginInvoke (Delegate method,

+						 object[] args) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public object EndInvoke (IAsyncResult asyncResult) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public object Invoke (Delegate method) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public object Invoke (Delegate method,object[] args) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		/// sub-class: Control.ControlAccessibleObject

+		/// <summary>

+		/// Provides information about a control that can be used by an accessibility application.

+		/// </summary>

+		public class ControlAccessibleObject /*: AccessibleObject*/ {

+			// AccessibleObject not ready to be base class

+			/// --- ControlAccessibleObject.constructor ---

+			[MonoTODO]

+			public ControlAccessibleObject (Control ownerControl) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			

+			/// --- ControlAccessibleObject Properties ---

+			[MonoTODO]

+// 			public override string DefaultAction {

+// 				get { throw new NotImplementedException (); }

+// 			}

+			

+			[MonoTODO]

+// 			public override string Description {

+// 				get { throw new NotImplementedException (); }

+// 			}

+			

+			[MonoTODO]

+			public IntPtr Handle {

+				get { throw new NotImplementedException (); }

+				set { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+// 			public override string Help {

+// 				get { throw new NotImplementedException (); }

+// 			}

+			

+			[MonoTODO]

+// 			public override string KeyboardShortcut {

+// 				get { throw new NotImplementedException (); }

+// 			}

+			

+			[MonoTODO]

+// 			public override string Name {

+// 				get { throw new NotImplementedException (); }

+// 				set { throw new NotImplementedException (); }

+// 			}

+			

+			[MonoTODO]

+			public Control Owner {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+// 			public override AccessibleRole Role {

+// 				get { throw new NotImplementedException (); }

+// 			}

+			

+			

+			/// --- ControlAccessibleObject Methods ---

+			[MonoTODO]

+// 			public override int GetHelpTopic(out string fileName) 

+// 			{

+// 				throw new NotImplementedException ();

+// 			}

+			

+			[MonoTODO]

+			public void NotifyClients (AccessibleEvents accEvent) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void NotifyClients (AccessibleEvents accEvent,

+						   int childID) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override string ToString ()

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+		/// sub-class: Control.ControlCollection

+		/// <summary>

+		/// Represents a collection of Control objects

+		/// </summary>

+		public class ControlCollection : IList, ICollection, IEnumerable, ICloneable {

+			

+			/// --- ControlCollection.constructor ---

+			[MonoTODO]

+			public ControlCollection (Control owner) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			/// --- ControlCollection Properties ---

+			[MonoTODO]

+			public int Count {

+				get { throw new NotImplementedException (); }

+			}

+		

+			[MonoTODO]

+			public bool IsReadOnly {

+				get { throw new NotImplementedException (); }

+			}

+			

+			[MonoTODO]

+			public virtual Control this [int index] {

+				get { throw new NotImplementedException (); }

+			}

+		

+		

+			/// --- ControlCollection Methods ---

+			/// .NET framework supporting internal methods, not stubbed out:

+			/// - object ICloneable.Clone();

+			/// Note: IList methods stubbed out, otherwise does not compile

+			

+			[MonoTODO]

+			public virtual void Add (Control value) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public virtual void AddRange (Control[] controls) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public virtual void Clear () 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			public bool Contains (Control control) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void CopyTo (Array dest,int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override bool Equals (object other) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			//inherited

+			//public static bool Equals(object o1, object o2) {

+			//	throw new NotImplementedException ();

+			//}

+

+			[MonoTODO]

+			public int GetChildIndex (Control child) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public int GetChildIndex (Control child,

+						  bool throwException) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public IEnumerator GetEnumerator () 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override int GetHashCode () 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public int IndexOf (Control control) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public virtual void Remove (Control value) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void RemoveAt (int index) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public void SetChildIndex (Control child,int newIndex) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			

+			

+			/// --- ControlCollection.IClonable methods ---

+			[MonoTODO]

+			object ICloneable.Clone ()

+			{

+				throw new NotImplementedException ();

+			}

+	

+			

+			

+			/// --- ControlCollection.IList properties ---

+			[MonoTODO]

+			bool IList.IsFixedSize {

+				get { throw new NotImplementedException (); }

+			}

+

+			[MonoTODO]			

+			object IList.this [int index] {

+				get { throw new NotImplementedException (); }

+				set { throw new NotImplementedException (); }

+			}

+

+			[MonoTODO]				

+			object ICollection.SyncRoot {

+				get { throw new NotImplementedException (); }

+			}

+	

+			[MonoTODO]				

+			bool ICollection.IsSynchronized {

+				get { throw new NotImplementedException (); }

+			}

+			

+			/// --- ControlCollection.IList methods ---

+			[MonoTODO]

+			int IList.Add (object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			bool IList.Contains (object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			int IList.IndexOf (object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Insert (int index,object value) 

+			{

+				throw new NotImplementedException ();

+			}

+		

+			[MonoTODO]

+			void IList.Remove (object control) 

+			{

+				throw new NotImplementedException ();

+			}

+		}  // --- end of Control.ControlCollection ---

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/WINELib/DrawItemEventArgs.cs b/mcs/class/System.Windows.Forms/WINELib/DrawItemEventArgs.cs
new file mode 100644
index 00000000000..838b2649aee
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/DrawItemEventArgs.cs
@@ -0,0 +1,9 @@
+
+namespace System.Windows.Forms {
+        // allows code to compile without commenting out references
+        // to Font... to be removed
+	class DrawItemEventArgs {
+
+	}
+}
+
diff --git a/mcs/class/System.Windows.Forms/WINELib/DrawItemEventHandler.cs b/mcs/class/System.Windows.Forms/WINELib/DrawItemEventHandler.cs
new file mode 100644
index 00000000000..bab209627e1
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/DrawItemEventHandler.cs
@@ -0,0 +1,8 @@
+
+namespace System.Windows.Forms {
+
+	class DrawItemEventHandler {
+
+	}
+}
+
diff --git a/mcs/class/System.Windows.Forms/WINELib/Font.cs b/mcs/class/System.Windows.Forms/WINELib/Font.cs
new file mode 100644
index 00000000000..45a960b3ae6
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/Font.cs
@@ -0,0 +1,6 @@
+namespace System.Windows.Forms {
+	// allows code to compile without commenting out references
+	// to Font... to be removed
+	class Font {
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/WINELib/Form.cs b/mcs/class/System.Windows.Forms/WINELib/Form.cs
new file mode 100644
index 00000000000..ff637210754
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/Form.cs
@@ -0,0 +1,1035 @@
+//

+// System.Windows.Forms.Form

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com)

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//	Dennis Hayes (dennish@raytek.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System;

+using System.Drawing;

+using System.ComponentModel;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	public class Form : ContainerControl  {

+

+		string caption;

+

+		public Form () : base ()

+		{

+

+		}

+		

+		static Form ()

+		{

+

+		}

+		

+		void delete_cb (object o, EventArgs args)

+		{

+			if (Closed != null)

+				Closed (o, args);

+		}

+

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public IButtonControl AcceptButton {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public static Form ActiveForm {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Form ActiveMdiChild {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool AutoScale {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public virtual Size AutoScaleBaseSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override bool AutoScroll {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override Color BackColor {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public IButtonControl CancelButton {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public new Size ClientSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool ControlBox {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Rectangle DesktopBounds {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Point DesktopLocation {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public DialogResult DialogResult {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public FormBorderStyle FormBorderStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool HelpButton {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		// Icon class not yet stubbed/implemented

+		//public Icon Icon {

+		//	 get {

+		//		 throw new NotImplementedException ();

+		//	 }

+		//	 set {

+		//		 throw new NotImplementedException ();

+		//	 }

+		//}

+

+		[MonoTODO]

+		public bool IsMidiChild {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool IsMidiContainer {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool KeyPreview {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool MaximizeBox {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Size MaximumSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Form[] MdiChildren {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Form MdiParent {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		//public MainMenu Menu {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//	set {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		[MonoTODO]

+		//public MainMenu MergedMenu {

+		//	get {

+		//		throw new NotImplementedException ();

+		//	}

+		//}

+

+		[MonoTODO]

+		public bool MinimizeBox {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Size MinimumSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool Modal {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public double Opacity {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Form[] OwnedForms {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Form Owner {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool ShowInTaskbar {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public SizeGripStyle SizeGripStyle {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public FormStartPosition StartPosition {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool TopLevel {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public bool TopMost {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Color TransparencyKey {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public FormWindowState WindowState {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		

+		//  --- Public Methods

+		public void Activate ()

+		{

+			Win32.SetActiveWindow (window.Handle);

+		}

+

+		[MonoTODO]

+		public void AddOwnedForm (Form ownedForm)

+		{

+			throw new NotImplementedException ();

+		}

+

+		public void Close ()

+		{

+			Win32.CloseWindow (window.Handle);

+		}

+

+		//inherited

+		//public void Dispose ()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+		//public static bool Equals (object o1, object o2)

+		//{

+		//		throw new NotImplementedException ();

+		//}		 [MonoTODO]

+

+		public override bool Equals (object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+

+		[MonoTODO]

+		public override int GetHashCode () {

+			//FIXME add our proprities

+			return base.GetHashCode ();

+		}

+

+		[MonoTODO]

+		// Font class not implemented or stubbed

+ 		//public static SizeF GetAutoScaleSize(Font font)

+ 		//{

+ 		//	throw new NotImplementedException ();

+ 		//}

+

+		//public void Invalidate()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		//public object Invoke()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public void LayoutMdi (MdiLayout value)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public void PerformLayout()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public void RemoveOwnedForm (Form ownedForm)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//	public void ResumeLayout()

+		//	{

+		//		throw new NotImplementedException ();

+		//	}

+		//

+		//	public void Scale(float f)

+		//	{

+		//		throw new NotImplementedException ();

+		//	}

+		//

+		//	public void Select()

+		//	{

+		//		throw new NotImplementedException ();

+		//	}

+		//

+		//	public void SetBounds(int x, int y, int width, int height)

+		//	{

+		//		throw new NotImplementedException ();

+		//	}

+

+		public void SetDesktopLocation (int x, int y)

+		{

+			Win32.SetWindowPos ((IntPtr) window.Handle, (IntPtr) 0, 

+					    x, y, 0, 0, 

+					    (int) (Win32.SWP_NOSIZE | 

+					    Win32.SWP_NOZORDER));

+		}

+

+		public new void Show ()

+		{

+			Win32.ShowWindow (window.Handle, (int) Win32.SW_SHOW);

+		}

+

+		[MonoTODO]

+		public DialogResult ShowDialog ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override string ToString ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		//  --- Public Events

+		

+		[MonoTODO]

+		public event EventHandler Activated {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+		

+		public event EventHandler Closed;

+		 

+		// CancelEventHandler not yet implemented/stubbed

+		//public event CancelEventHandler Closing;

+		

+		[MonoTODO]

+		public event EventHandler Deactivate {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event InputLanguageChangedEventHandler InputLanguageChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event InputLanguageChangingEventHandler InputLanguageChanging {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  Load {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MaximizedBoundsChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MaximumSizeChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MdiChildActivate {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MenuComplete {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MenuStart {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public event EventHandler  MinimumSizedChanged {

+			add {

+				throw new NotImplementedException ();

+			}

+			remove {

+				throw new NotImplementedException ();

+			}

+		}

+

+		

+		//  --- Protected Properties

+		

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		protected override ImeMode DefaultImeMode {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//[MonoTODO]

+		////FIXME

+		//protected override Size DefaultSize {

+		//}

+

+		[MonoTODO]

+		protected Rectangle MaximizedBounds {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		

+		//  --- Protected Methods

+		

+		[MonoTODO]

+		protected override void AdjustFormScrollbars (bool displayScrollbars)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//[MonoTODO]

+		//protected override ControlCollection CreateControlsInstance()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void CreateHandle ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void DefWndProc (ref Message m)

+		{

+			window.DefWndProc (ref m);

+		}

+

+		//protected override void Dispose(bool disposing)

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected virtual void  OnClosed (EventArgs e)

+		{

+

+		}

+

+		[MonoTODO]

+		// CancelEventArgs not yet stubbed/implemented

+		//protected virtual void  OnClosing(CancelEventArgs e)

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void OnCreateControl ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnFontChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnHandleCreated (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnHandleDestroyed (EventArgs e)

+		{

+		}

+

+		[MonoTODO]

+		protected virtual void OnInputLanguageChanged (InputLanguageChangedEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnInputLanguagedChanging (InputLanguageChangingEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnLoad (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMaximizedBoundsChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMaximumSizedChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMdiChildActive (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMenuComplete (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMenuStart (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected virtual void OnMinimumSizeChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void  OnPaint (PaintEventArgs e)

+		{

+

+		}

+		[MonoTODO]

+		protected override void  OnResize (EventArgs e)

+		{

+

+		}

+

+		[MonoTODO]

+		protected override void  OnStyleChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+		protected override void  OnTextChanged (EventArgs e)

+		{

+

+		}

+

+		[MonoTODO]

+		protected override void  OnVisibleChanged (EventArgs e)

+		{

+

+		}

+

+		[MonoTODO]

+		protected override bool ProcessCmdKey (ref Message msg, Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override bool ProcessDialogKey (Keys keyData)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override bool ProcessKeyPreview (ref Message m)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override bool ProcessTabKey (bool forward)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void ScaleCore (float x, float y)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public void Select(bool b1, bool b2)

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void SetBoundsCore (int x, int y,  int width,  int height,  BoundsSpecified specified)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void SetClientSizeCore (int x, int y)

+		{

+			throw new NotImplementedException ();

+		}

+		[MonoTODO]

+		protected override void SetVisibleCore (bool value)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//protected void UpdateBounds()

+		//{

+		//		throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void WndProc (ref Message m)

+		{

+			base.WndProc (ref m);

+

+			switch (m.Msg) {

+			case Win32.WM_CLOSE:

+				EventArgs closeArgs = new EventArgs();

+				OnClosed (closeArgs);

+				break;

+				//case ?:

+				//OnCreateControl()

+				//break;

+			case Win32.WM_FONTCHANGE:

+				EventArgs fontChangedArgs = new EventArgs();

+				OnFontChanged (fontChangedArgs);

+				break;

+			case Win32.WM_CREATE:

+				EventArgs handleCreatedArgs = new EventArgs(); 

+				OnHandleCreated (handleCreatedArgs);

+				break;

+			case Win32.WM_DESTROY:

+				EventArgs destroyArgs = new EventArgs();

+				OnHandleDestroyed (destroyArgs);

+				break;

+			case Win32.WM_INPUTLANGCHANGE:

+				//InputLanguageChangedEventArgs ilChangedArgs =

+				//	new InputLanguageChangedEventArgs();

+				//OnInputLanguageChanged (ilChangedArgs);

+				break;

+			case Win32.WM_INPUTLANGCHANGEREQUEST:

+				//InputLanguageChangingEventArgs ilChangingArgs =

+				//	new InputLanguageChangingEventArgs();

+				//OnInputLanguagedChanging (ilChangingArgs);

+				break;

+				/*

+				  case Win32.WM_SHOWWINDOW:

+				  EventArgs e;

+				  OnLoad (e);

+				  break;

+				*/

+				// case ?:

+				// OnMaximizedBoundsChanged(EventArgs e)

+				// break;

+				// case ?:

+				// OnMaximumSizedChanged(EventArgs e)

+				//break;

+			case Win32.WM_MDIACTIVATE:

+				EventArgs mdiActivateArgs = new EventArgs();

+				OnMdiChildActive (mdiActivateArgs);

+				break;

+			case Win32.WM_EXITMENULOOP:

+				EventArgs menuCompleteArgs = new EventArgs();

+				OnMenuComplete (menuCompleteArgs);

+				break;

+			case Win32.WM_ENTERMENULOOP:

+				EventArgs enterMenuLoopArgs = new EventArgs();

+				OnMenuStart (enterMenuLoopArgs);

+				break;

+				// case ?:

+				// OnMinimumSizeChanged(EventArgs e)

+				// break;

+			case Win32.WM_PAINT:

+				//PaintEventArgs paintArgs = new PaintEventArgs();

+				//OnPaint (paintArgs);

+				break;

+			case Win32.WM_SIZE:

+				EventArgs resizeArgs = new EventArgs();

+				OnResize (resizeArgs);

+				break;

+				//case ?:

+				//OnStyleChanged(EventArgs e)

+				//break;

+			case Win32.WM_SETTEXT:

+				EventArgs textChangedArgs = new EventArgs();

+				OnTextChanged (textChangedArgs);

+				break;

+			case Win32.WM_SHOWWINDOW:

+				EventArgs visibleChangedArgs = new EventArgs();

+				OnVisibleChanged (visibleChangedArgs);

+				break;

+			}

+		}

+

+		//sub class

+		//System.Windows.Forms.Form.ControlCollection.cs

+		//

+		//Author:

+		//  stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+		//

+		// (C) 2002 Ximian, Inc

+		//

+		//

+		// <summary>

+		//	This is only a template.  Nothing is implemented yet.

+		//

+		// </summary>

+		// TODO: implement support classes and derive from 

+		// proper classes

+		public /*new(remove error)*/ class  ControlCollection /*: System.Windows.Forms.Control.ControlCollection, ICollection*/ {

+

+			//  --- Constructor

+			[MonoTODO]

+			// base class not defined (yet!)

+			public ControlCollection (Form owner) /*: base(owner)*/ {

+				throw new NotImplementedException ();

+			}

+		

+			//  --- Public Methods

+

+			[MonoTODO]

+			// TODO: see what causes this compile error

+			//public override void Add(Control value) {

+			//	throw new NotImplementedException ();

+			//}

+

+			[MonoTODO]

+			public override bool Equals (object o) {

+				throw new NotImplementedException ();

+			}

+

+			//public static bool Equals(object o1, object o2) {

+			//	throw new NotImplementedException ();

+			//}

+

+			[MonoTODO]

+			public override int GetHashCode () {

+				//FIXME add our proprities

+				return base.GetHashCode ();

+			}

+

+			// Inherited

+			//public override int GetChildIndex(Control c) {

+			//	throw new NotImplementedException ();

+			//}

+

+			//[MonoTODO]

+			// Control not yet usuable due to dependencies

+			//public override void Remove(Control value) {

+			//	throw new NotImplementedException ();

+			//}

+		} // end of Subclass

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/WINELib/FormTest.cs b/mcs/class/System.Windows.Forms/WINELib/FormTest.cs
new file mode 100644
index 00000000000..5e1f707ad64
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/FormTest.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Windows.Forms;
+
+class FormTest
+{
+ 	static public void Main ()
+	{
+		Console.WriteLine ("Creating Form");
+		Form form = new Form ();
+		Application.Run (form);
+	}
+}
+
diff --git a/mcs/class/System.Windows.Forms/WINELib/IAccessible.cs b/mcs/class/System.Windows.Forms/WINELib/IAccessible.cs
new file mode 100644
index 00000000000..a3e89588756
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/IAccessible.cs
@@ -0,0 +1,7 @@
+
+namespace System.Windows.Forms {
+	interface IAccessible {
+
+	}
+}
+
diff --git a/mcs/class/System.Windows.Forms/WINELib/IContainerControl.cs b/mcs/class/System.Windows.Forms/WINELib/IContainerControl.cs
new file mode 100644
index 00000000000..61dbbb42cc0
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/IContainerControl.cs
@@ -0,0 +1,8 @@
+namespace System.Windows.Forms {
+        // allows code to compile without commenting out references
+        // to Font... to be removed
+	interface IContainerControl {
+
+	}
+}
+
diff --git a/mcs/class/System.Windows.Forms/WINELib/MenuItem.cs b/mcs/class/System.Windows.Forms/WINELib/MenuItem.cs
new file mode 100644
index 00000000000..c3dbc1b89a5
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/MenuItem.cs
@@ -0,0 +1,7 @@
+
+namespace System.Windows.Forms {
+
+	class MenuItem {
+
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/WINELib/NativeWindow.cs b/mcs/class/System.Windows.Forms/WINELib/NativeWindow.cs
new file mode 100644
index 00000000000..1f9a3dab981
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/NativeWindow.cs
@@ -0,0 +1,190 @@
+//

+// System.Windows.Forms.NativeWindow.cs

+//

+// Author:

+//   stubbed out by Paul Osman (paul.osman@sympatico.ca)

+//   Dennis Hayes (dennish@Raytek.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System.Runtime.Remoting;

+using System.Runtime.InteropServices;

+using System.Runtime.CompilerServices;

+using System.Collections;

+

+namespace System.Windows.Forms {

+

+	// <summary>

+	//	This is only a template.  Nothing is implemented yet.

+	//

+	// </summary>

+

+	public class NativeWindow : MarshalByRefObject {

+

+		// the window's HWND

+		private IntPtr windowHandle;

+		static private Hashtable windowCollection = new Hashtable ();

+

+		//

+		//  --- Constructor

+		//

+		public NativeWindow () {

+			windowHandle = (IntPtr) 0;

+		}

+

+		//

+		//  --- Public Properties

+		//

+		public IntPtr Handle {

+			get {

+				return windowHandle;

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		public void AssignHandle (IntPtr handle) {

+			if (windowHandle != (IntPtr) 0)

+				windowCollection.Remove (windowHandle);

+

+			windowHandle = handle;

+			windowCollection.Add (windowHandle, this);

+			OnHandleChange ();

+		}

+

+		public virtual void CreateHandle (CreateParams cp) {

+			IntPtr createdHWnd = (IntPtr) 0;

+			Object lpParam = new Object();

+

+			windowHandle = Win32.CreateWindowExA ((uint) cp.ExStyle,

+							      cp.ClassName,

+							      cp.Caption,

+							      (uint) cp.Style,

+							      cp.X,

+							      cp.Y,

+							      cp.Width,

+							      cp.Height,

+							      (IntPtr) cp.Parent,

+							      (IntPtr) 0,

+							      (IntPtr) 0,

+							      ref lpParam);

+			

+			if (windowHandle != (IntPtr) 0)

+				windowCollection.Add (windowHandle, this);

+		}

+

+		[MonoTODO]

+		public override ObjRef CreateObjRef (Type requestedType) {

+			throw new NotImplementedException ();

+		}

+

+		public void DefWndProc (ref Message m) {

+			m.Result = Win32.DefWindowProcA (m.HWnd, m.Msg, 

+							 m.WParam, m.LParam);

+		}

+

+		public virtual void DestroyHandle () {

+			windowCollection.Remove (windowHandle);

+			Win32.DestroyWindow (windowHandle);

+		}

+

+		[MonoTODO]

+		public override bool Equals (object o) {

+			throw new NotImplementedException ();

+		}

+

+		//inherited

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		public override int GetHashCode () {

+			//FIXME add our proprities

+			return base.GetHashCode ();

+		}

+

+		public static NativeWindow FromHandle (IntPtr handle) {

+			NativeWindow window = new NativeWindow ();

+			window.AssignHandle (handle);

+			return window;

+		}

+

+		//inherited

+		//public object GetLifetimeService() {

+		//	throw new NotImplementedException ();

+		//}

+		//public Type GetType() {

+		//	throw new NotImplementedException ();

+		//}

+		//public virtual object InitializeLifetimeService(){

+		//	throw new NotImplementedException ();

+		//}

+

+		public virtual void ReleaseHandle () {

+			windowHandle = (IntPtr) 0;

+			OnHandleChange ();

+		}

+

+		[MonoTODO]

+		public override string ToString () {

+			throw new NotImplementedException ();

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		//inherited

+		//protected object MemberwiseClone() {

+		//	throw new NotImplementedException ();

+		//}

+		[MonoTODO]

+		protected virtual void OnHandleChange () {

+			// to be overridden

+		}

+		[MonoTODO]

+		protected virtual void OnThreadException (Exception e) {

+			throw new NotImplementedException ();

+		}

+

+		protected virtual void WndProc (ref Message m) {

+			Console.WriteLine ("NativeWindow.WndProc");

+			DefWndProc (ref m);

+		}

+

+		//

+		//  --- Destructor

+		//

+		[MonoTODO]

+		~NativeWindow () {

+		}

+

+// obsolete: should probably be handled by Application class

+// 		static private IntPtr _WndProc (IntPtr hWnd, int msg, 

+// 					        IntPtr wParam, IntPtr lParam) {

+// 		        Console.WriteLine ("in _WndProc");

+// 			NativeWindow window = 

+// 			    (NativeWindow) windowCollection[hWnd];

+// 			Message message = new Message ();

+// 			message.Result = (IntPtr) 0;

+// 			if (window != null) {

+// 				message.HWnd = hWnd;

+// 				message.Msg = msg;

+// 				message.WParam = wParam;

+// 				message.LParam = lParam;

+// 				window.WndProc(ref message);

+// 			} else {

+// 				// even though we are not managing the

+// 				// window let the window get the message

+// 				message.Result = Win32.DefWindowProcA (hWnd, 

+// 								       msg, 

+// 								       wParam, 

+// 								       lParam);

+// 			}

+// 			return message.Result;

+// 		}

+	}

+}

diff --git a/mcs/class/System.Windows.Forms/WINELib/NativeWindowTest.cs b/mcs/class/System.Windows.Forms/WINELib/NativeWindowTest.cs
new file mode 100644
index 00000000000..b7efc88a20f
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/NativeWindowTest.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Windows.Forms;
+
+
+public class NativeWindowTest : NativeWindow {
+
+	protected override void WndProc (ref Message m) {
+		Console.WriteLine ("in NativeWindowTest WndProc");
+		if (m.Msg == Win32.WM_DESTROY) {
+			Console.WriteLine ("posting quit message");
+			Win32.PostQuitMessage (0);
+		}
+		DefWndProc (ref m);
+	}
+
+	static public void Main () {
+		Console.WriteLine ("NativeWindow sample application begin");
+		Console.WriteLine ("Creating NativeWindow");
+		NativeWindow nw = new NativeWindow ();
+		Console.WriteLine ("Creating CreateParams");
+		CreateParams cp = new CreateParams ();
+		  
+		Console.WriteLine ("setting up CreateParams");
+
+		cp.Caption = "Mono Native Window Test";
+		cp.ClassName = "mono_wine_class";
+		cp.X = 10;
+		cp.Y = 10;
+		cp.Width = 640;
+		cp.Height = 480;
+		cp.ClassStyle = 0;
+		cp.ExStyle = 0;
+		cp.Param = 0;
+		cp.Param = 0;
+		cp.Style = (int) Win32.WS_OVERLAPPEDWINDOW;
+
+		Console.WriteLine ("creating handle");
+		nw.CreateHandle (cp);
+		Console.WriteLine ("showing window");
+		Win32.ShowWindow (nw.Handle, (int) Win32.SW_SHOW);
+
+		int msg = 0;
+
+		while (Win32.GetMessageA (ref msg, 0, 0, 0) != 0) {
+			Win32.TranslateMessage (ref msg);
+			Win32.DispatchMessageA (ref msg);
+		}
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/WINELib/ScrollableControl.cs b/mcs/class/System.Windows.Forms/WINELib/ScrollableControl.cs
new file mode 100644
index 00000000000..93331c60a8e
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/ScrollableControl.cs
@@ -0,0 +1,371 @@
+//

+// System.Windows.Forms.Form

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com)

+//   stubbed out by Daniel Carrera (dcarrera@math.toronto.edu)

+//   ScrollableControl.DockPaddingEdges stub added by Jaak Simm (jaaksimm@firm.ee)

+//	Dennis Hayes (dennish@raytek.com)

+//   WINELib implementation started by John Sohn (jsohn@columbus.rr.com)

+//

+// (C) 2002 Ximian, Inc

+//

+

+using System;

+using System.Drawing;

+using System.ComponentModel;

+namespace System.Windows.Forms {

+

+	public class ScrollableControl : Control {

+

+		//

+		//  --- Constructor

+		//

+		[MonoTODO]

+		public ScrollableControl () : base ()

+		{

+		}

+

+		//

+		//  --- Public Properties

+		//

+		[MonoTODO]

+		public virtual bool AutoScroll {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Size AutoScrollMargin {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Size AutoScrollMinSize {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public Point AutoScrollPosition {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override Rectangle DisplayRectangle {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public ScrollableControl.DockPaddingEdges DockPadding {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		public override ISite Site {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Public Methods

+		//

+		//public IAsyncResult BeginInvoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public IAsyncResult BeginInvoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Dispose()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override bool Equals (object o)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//public static bool Equals(object o1, object o2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		public override int GetHashCode () {

+			//FIXME add our proprities

+			return base.GetHashCode ();

+		}

+

+		//public void Invalidate()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Rectangle rect, bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Invalidate(Region reg, bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public object Invoke(Delegate del, object[] objs)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void PerformLayout(Control ctl, string str)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void ResumeLayout(bool val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Scale(float val1, float val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void Select(bool val1, bool val2)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//public void SetBounds(int val1, int val2, int val3, int val4, BoundsSpecified bounds)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		//

+		//  --- Protected Properties

+		//

+

+		[MonoTODO]

+		protected override CreateParams CreateParams {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		protected bool HScroll {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		[MonoTODO]

+		protected bool VScroll {

+			get {

+				throw new NotImplementedException ();

+			}

+			set {

+				throw new NotImplementedException ();

+			}

+		}

+

+		//

+		//  --- Protected Methods

+		//

+		[MonoTODO]

+		protected virtual void AdjustFormScrollbars (

+			bool displayScrollbars)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//protected override void Dispose(bool disposing)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void OnLayout (LayoutEventArgs levent)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnMouseWheel (MouseEventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected override void OnVisibleChanged (EventArgs e)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//ContentAlignment RtlTranslateAlignment(ContentAlignment calign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//HorizontalAlignment RtlTranslateAlignment(HorizontalAlignment halign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//LeftRightAlignment RtlTranslateAlignment(LeftRightAlignment lralign)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void ScaleCore (float dx, float dy)

+		{

+			throw new NotImplementedException ();

+		}

+

+		//protected void UpdateBounds()

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+		//protected void UpdateBounds(int val1, int val2, int val3, int val4, int val5, int val6)

+		//{

+		//	throw new NotImplementedException ();

+		//}

+

+		[MonoTODO]

+		protected override void WndProc (ref Message m)

+		{

+			base.WndProc (ref m);

+		}

+		

+		/// ScrollableControl.DockPaddingEdges

+		/// Determines the border padding for docked controls.

+		public class DockPaddingEdges : ICloneable {

+			// --- Fields ---

+			int all;

+			int bottom;

+			int left;

+			int right;

+			int top;

+			

+			

+			// --- public Properties ---

+			public int All {

+				get { return all; }

+				set { all=value; }

+			}

+			

+			public int Bottom {

+				get { return bottom; }

+				set { bottom=value; }

+			}

+			

+			public int Left {

+				get { return left; }

+				set { left=value; }

+			}

+			

+			public int Right {

+				get { return right; }

+				set { right=value; }

+			}

+			

+			public int Top {

+				get { return top; }

+				set { top=value; }

+			}

+			

+			

+			/// --- public Methods ---

+			[MonoTODO]

+			public override bool Equals (object other) 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override int GetHashCode () 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			/// This member supports the .NET Framework infrastructure and is not intended to be used directly from your code.

+			[MonoTODO]

+			object ICloneable.Clone () 

+			{

+				throw new NotImplementedException ();

+			}

+			

+			[MonoTODO]

+			public override string ToString () 

+			{

+				throw new NotImplementedException ();

+			}

+		}

+		

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/WINELib/Test.cs b/mcs/class/System.Windows.Forms/WINELib/Test.cs
new file mode 100644
index 00000000000..3f62a000e6f
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/Test.cs
@@ -0,0 +1,14 @@
+using System;

+using System.Runtime.InteropServices;

+

+public class Test 

+{

+ [DllImport ("user32.dll", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Auto)]

+ public static extern int MessageBoxA (int hWnd, string pText, string pCaption, int uType);

+

+	static public void Main()

+	{

+		MessageBoxA(0, "Calling winelib from Mono", "TEST", 0);

+	}

+}

+

diff --git a/mcs/class/System.Windows.Forms/WINELib/Win32.cs b/mcs/class/System.Windows.Forms/WINELib/Win32.cs
new file mode 100644
index 00000000000..4539d561191
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/Win32.cs
@@ -0,0 +1,416 @@
+//
+// System.Windows.Forms.Win32
+//
+// Provides easy access to commonly used Win32/WINELib contants and functions
+//
+// Author:
+//   John Sohn (jsohn@columbus.rr.com)
+//	Dennis Hayes (dennish@raytek.com)
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.Windows.Forms {
+
+	// holder for DLL Win32 DllImports 
+	public class Win32 {
+
+		[DllImport ("user32.dll", 
+			    CallingConvention = CallingConvention.StdCall,
+			    CharSet = CharSet.Auto)]
+		public static extern IntPtr CreateWindowExA (
+			uint dwExStyle, string lpClassName, string lpWindowName,
+			uint dwStyle, int x, int y, int nWidth, int nHeight,
+			IntPtr hWndParent, IntPtr hMenu, IntPtr hInstance,
+			ref object lpParam);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall, CharSet = CharSet.Auto)]
+		public extern static IntPtr DefWindowProcA (
+			IntPtr hWnd, int Msg, IntPtr wParam, IntPtr lParam);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall, CharSet = CharSet.Auto)]
+		public extern static int DestroyWindow (IntPtr hWnd);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall, CharSet = CharSet.Auto)]
+		public static extern int ShowWindow (IntPtr hWnd, 
+						     int nCmdShow);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall,CharSet = CharSet.Auto)]
+		public static extern int GetMessageA (ref int msg, int hwnd, 
+						      int msgFrom,  int msgTo);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall, CharSet = CharSet.Auto)]
+		public static extern int  TranslateMessage (ref int msg);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall, CharSet = CharSet.Auto)]
+		public static extern int DispatchMessageA (ref int msg);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall,
+			    CharSet = CharSet.Auto)]
+		public extern static void PostQuitMessage (int nExitCode);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall,
+			    CharSet = CharSet.Auto)]
+		public extern static IntPtr SetActiveWindow (IntPtr hWnd);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall,
+			    CharSet = CharSet.Auto)]
+		public extern static int CloseWindow (IntPtr hWnd);
+
+		[DllImport ("user32.dll", CallingConvention = 
+			    CallingConvention.StdCall,
+			    CharSet = CharSet.Auto)]
+		public extern static int SetWindowPos (
+			IntPtr hWnd, IntPtr hWndInsertAfter, 
+			int X, int Y, int cx, int cy, int uFlags);
+
+		// Window Messages
+		public const uint WM_NULL                 = 0x0000;
+		public const uint WM_CREATE               = 0x0001;
+		public const uint WM_DESTROY              = 0x0002;
+		public const uint WM_MOVE                 = 0x0003;
+		public const uint WM_SIZEWAIT             = 0x0004;
+		public const uint WM_SIZE                 = 0x0005;
+		public const uint WM_ACTIVATE             = 0x0006;
+		public const uint WM_SETFOCUS             = 0x0007;
+		public const uint WM_KILLFOCUS            = 0x0008;
+		public const uint WM_SETVISIBLE           = 0x0009;
+		public const uint WM_ENABLE               = 0x000a;
+		public const uint WM_SETREDRAW            = 0x000b;
+		public const uint WM_SETTEXT              = 0x000c;
+		public const uint WM_GETTEXT              = 0x000d;
+		public const uint WM_GETTEXTLENGTH        = 0x000e;
+		public const uint WM_PAINT                = 0x000f;
+		public const uint WM_CLOSE                = 0x0010;
+		public const uint WM_QUERYENDSESSION      = 0x0011;
+		public const uint WM_QUIT                 = 0x0012;
+		public const uint WM_QUERYOPEN            = 0x0013;
+		public const uint WM_ERASEBKGND           = 0x0014;
+		public const uint WM_SYSCOLORCHANGE       = 0x0015;
+		public const uint WM_ENDSESSION           = 0x0016;
+		public const uint WM_SYSTEMERROR          = 0x0017;
+		public const uint WM_SHOWWINDOW           = 0x0018;
+		public const uint WM_CTLCOLOR             = 0x0019;
+		public const uint WM_WININICHANGE         = 0x001a;
+		public const uint WM_SETTINGCHANGE        = WM_WININICHANGE;
+		public const uint WM_DEVMODECHANGE        = 0x001b;
+		public const uint WM_ACTIVATEAPP          = 0x001c;
+		public const uint WM_FONTCHANGE           = 0x001d;
+		public const uint WM_TIMECHANGE           = 0x001e;
+		public const uint WM_CANCELMODE           = 0x001f;
+		public const uint WM_SETCURSOR            = 0x0020;
+		public const uint WM_MOUSEACTIVATE        = 0x0021;
+		public const uint WM_CHILDACTIVATE        = 0x0022;
+		public const uint WM_QUEUESYNC            = 0x0023;
+		public const uint WM_GETMINMAXINFO        = 0x0024;
+
+		public const uint WM_PAINTICON            = 0x0026;
+		public const uint WM_ICONERASEBKGND       = 0x0027;
+		public const uint WM_NEXTDLGCTL           = 0x0028;
+		public const uint WM_ALTTABACTIVE         = 0x0029;
+		public const uint WM_SPOOLERSTATUS        = 0x002a;
+		public const uint WM_DRAWITEM             = 0x002b;
+		public const uint WM_MEASUREITEM          = 0x002c;
+		public const uint WM_DELETEITEM           = 0x002d;
+		public const uint WM_VKEYTOITEM           = 0x002e;
+		public const uint WM_CHARTOITEM           = 0x002f;
+		public const uint WM_SETFONT              = 0x0030;
+		public const uint WM_GETFONT              = 0x0031;
+		public const uint WM_SETHOTKEY            = 0x0032;
+		public const uint WM_GETHOTKEY            = 0x0033;
+		public const uint WM_FILESYSCHANGE        = 0x0034;
+		public const uint WM_ISACTIVEICON         = 0x0035;
+		public const uint WM_QUERYPARKICON        = 0x0036;
+		public const uint WM_QUERYDRAGICON        = 0x0037;
+		public const uint WM_QUERYSAVESTATE       = 0x0038;
+		public const uint WM_COMPAREITEM          = 0x0039;
+		public const uint WM_TESTING              = 0x003a;
+
+		public const uint WM_OTHERWINDOWCREATED	= 0x003c;
+		public const uint WM_OTHERWINDOWDESTROYED	= 0x003d;
+		public const uint WM_ACTIVATESHELLWINDOW	= 0x003e;
+
+		public const uint WM_COMPACTING		= 0x0041;
+
+		public const uint WM_COMMNOTIFY		= 0x0044;
+		public const uint WM_WINDOWPOSCHANGING 	= 0x0046;
+		public const uint WM_WINDOWPOSCHANGED 	= 0x0047;
+		public const uint WM_POWER		= 0x0048;
+
+		/* Win32 4.0 messages */
+		public const uint WM_COPYDATA		= 0x004a;
+		public const uint WM_CANCELJOURNAL	= 0x004b;
+		public const uint WM_NOTIFY		= 0x004e;
+		public const uint WM_INPUTLANGCHANGEREQUEST       = 0x0050;
+		public const uint WM_INPUTLANGCHANGE              = 0x0051;
+		public const uint WM_TCARD                = 0x0052;
+		public const uint WM_HELP			= 0x0053;
+		public const uint WM_USERCHANGED		= 0x0054;
+		public const uint WM_NOTIFYFORMAT		= 0x0055;
+
+		public const uint WM_CONTEXTMENU		= 0x007b;
+		public const uint WM_STYLECHANGING 	= 0x007c;
+		public const uint WM_STYLECHANGED		= 0x007d;
+		public const uint WM_DISPLAYCHANGE        = 0x007e;
+		public const uint WM_GETICON		= 0x007f;
+		public const uint WM_SETICON		= 0x0080;
+
+		/* Non-client system messages */
+		public const uint WM_NCCREATE         = 0x0081;
+		public const uint WM_NCDESTROY        = 0x0082;
+		public const uint WM_NCCALCSIZE       = 0x0083;
+		public const uint WM_NCHITTEST        = 0x0084;
+		public const uint WM_NCPAINT          = 0x0085;
+		public const uint WM_NCACTIVATE       = 0x0086;
+
+		public const uint WM_GETDLGCODE	    = 0x0087;
+		public const uint WM_SYNCPAINT	    = 0x0088;
+		public const uint WM_SYNCTASK	    = 0x0089;
+
+		/* Non-client mouse messages */
+		public const uint WM_NCMOUSEMOVE      = 0x00a0;
+		public const uint WM_NCLBUTTONDOWN    = 0x00a1;
+		public const uint WM_NCLBUTTONUP      = 0x00a2;
+		public const uint WM_NCLBUTTONDBLCLK  = 0x00a3;
+		public const uint WM_NCRBUTTONDOWN    = 0x00a4;
+		public const uint WM_NCRBUTTONUP      = 0x00a5;
+		public const uint WM_NCRBUTTONDBLCLK  = 0x00a6;
+		public const uint WM_NCMBUTTONDOWN    = 0x00a7;
+		public const uint WM_NCMBUTTONUP      = 0x00a8;
+		public const uint WM_NCMBUTTONDBLCLK  = 0x00a9;
+
+		public const uint WM_NCXBUTTONDOWN    = 0x00ab;
+		public const uint WM_NCXBUTTONUP      = 0x00ac;
+		public const uint WM_NCXBUTTONDBLCLK  = 0x00ad;
+
+		/* Keyboard messages */
+		public const uint WM_KEYDOWN          = 0x0100;
+		public const uint WM_KEYUP            = 0x0101;
+		public const uint WM_CHAR             = 0x0102;
+		public const uint WM_DEADCHAR         = 0x0103;
+		public const uint WM_SYSKEYDOWN       = 0x0104;
+		public const uint WM_SYSKEYUP         = 0x0105;
+		public const uint WM_SYSCHAR          = 0x0106;
+		public const uint WM_SYSDEADCHAR      = 0x0107;
+		public const uint WM_KEYFIRST         = WM_KEYDOWN;
+		public const uint WM_KEYLAST          = 0x0108;
+
+		/* Win32 4.0 messages for IME */
+		public const uint IME_STARTCOMPOSITION     = 0x010d;
+		public const uint IME_ENDCOMPOSITION       = 0x010e;
+		public const uint IME_COMPOSITION          = 0x010f;
+		public const uint IME_KEYLAST              = 0x010f;
+
+		public const uint WM_INITDIALOG       = 0x0110;
+		public const uint WM_COMMAND          = 0x0111;
+		public const uint WM_SYSCOMMAND       = 0x0112;
+		public const uint WM_TIMER	    = 0x0113;
+		public const uint WM_SYSTIMER	    = 0x0118;
+
+		/* scroll messages */
+		public const uint WM_HSCROLL          = 0x0114;
+		public const uint WM_VSCROLL          = 0x0115;
+
+		/* Menu messages */
+		public const uint WM_INITMENU         = 0x0116;
+		public const uint WM_INITMENUPOPUP    = 0x0117;
+
+		public const uint WM_MENUSELECT       = 0x011F;
+		public const uint WM_MENUCHAR         = 0x0120;
+		public const uint WM_ENTERIDLE        = 0x0121;
+
+		public const uint WM_MENURBUTTONUP    = 0x0122;
+		public const uint WM_MENUDRAG         = 0x0123;
+		public const uint WM_MENUGETOBJECT    = 0x0124;
+		public const uint WM_UNINITMENUPOPUP  = 0x0125;
+		public const uint WM_MENUCOMMAND      = 0x0126;
+
+		public const uint WM_CHANGEUISTATE    = 0x0127;
+		public const uint WM_UPDATEUISTATE    = 0x0128;
+		public const uint WM_QUERYUISTATE     = 0x0129;
+
+		public const uint WM_LBTRACKPOINT     = 0x0131;
+
+		/* Win32 CTLCOLOR messages */
+		public const uint WM_CTLCOLORMSGBOX    = 0x0132;
+		public const uint WM_CTLCOLOREDIT      = 0x0133;
+		public const uint WM_CTLCOLORLISTBOX   = 0x0134;
+		public const uint WM_CTLCOLORBTN       = 0x0135;
+		public const uint WM_CTLCOLORDLG       = 0x0136;
+		public const uint WM_CTLCOLORSCROLLBAR = 0x0137;
+		public const uint WM_CTLCOLORSTATIC    = 0x0138;
+
+		/* Mouse messages */
+		public const uint WM_MOUSEMOVE	    = 0x0200;
+		public const uint WM_LBUTTONDOWN	    = 0x0201;
+		public const uint WM_LBUTTONUP	    = 0x0202;
+		public const uint WM_LBUTTONDBLCLK    = 0x0203;
+		public const uint WM_RBUTTONDOWN	    = 0x0204;
+		public const uint WM_RBUTTONUP	    = 0x0205;
+		public const uint WM_RBUTTONDBLCLK    = 0x0206;
+		public const uint WM_MBUTTONDOWN	    = 0x0207;
+		public const uint WM_MBUTTONUP	    = 0x0208;
+		public const uint WM_MBUTTONDBLCLK    = 0x0209;
+		public const uint WM_MOUSEWHEEL       = 0x020A;
+		public const uint WM_XBUTTONDOWN      = 0x020B;
+		public const uint WM_XBUTTONUP        = 0x020C;
+		public const uint WM_XBUTTONDBLCLK    = 0x020D;
+
+		public const uint WM_MOUSEFIRST       = 0x0200;
+		public const uint WM_MOUSELAST        = 0x020D;
+
+		public const uint WM_WHEEL_DELTA      = 120;
+		public const uint WM_WHEEL_PAGESCROLL  = 65535;
+		public const uint WM_PARENTNOTIFY     = 0x0210;
+		public const uint WM_ENTERMENULOOP    = 0x0211;
+		public const uint WM_EXITMENULOOP     = 0x0212;
+		public const uint WM_NEXTMENU	    = 0x0213;
+
+		/* Win32 4.0 messages */
+		public const uint WM_SIZING	    = 0x0214;
+		public const uint WM_CAPTURECHANGED   = 0x0215;
+		public const uint WM_MOVING	    = 0x0216;
+		public const uint WM_POWERBROADCAST   = 0x0218;
+		public const uint WM_DEVICECHANGE     = 0x0219;
+
+		/* wParam for WM_SIZING message */
+		public const uint WMSZ_LEFT           = 1;
+		public const uint WMSZ_RIGHT          = 2;
+		public const uint WMSZ_TOP            = 3;
+		public const uint WMSZ_TOPLEFT        = 4;
+		public const uint WMSZ_TOPRIGHT       = 5;
+		public const uint WMSZ_BOTTOM         = 6;
+		public const uint WMSZ_BOTTOMLEFT     = 7;
+		public const uint WMSZ_BOTTOMRIGHT    = 8;
+
+		/* MDI messages */
+		public const uint WM_MDICREATE	    = 0x0220;
+		public const uint WM_MDIDESTROY	    = 0x0221;
+		public const uint WM_MDIACTIVATE	    = 0x0222;
+		public const uint WM_MDIRESTORE	    = 0x0223;
+		public const uint WM_MDINEXT	    = 0x0224;
+		public const uint WM_MDIMAXIMIZE	    = 0x0225;
+		public const uint WM_MDITILE	    = 0x0226;
+		public const uint WM_MDICASCADE	    = 0x0227;
+		public const uint WM_MDIICONARRANGE   = 0x0228;
+		public const uint WM_MDIGETACTIVE     = 0x0229;
+		public const uint WM_MDIREFRESHMENU   = 0x0234;
+
+		/* D&D messages */
+		public const uint WM_DROPOBJECT	    = 0x022A;
+		public const uint WM_QUERYDROPOBJECT  = 0x022B;
+		public const uint WM_BEGINDRAG	    = 0x022C;
+		public const uint WM_DRAGLOOP	    = 0x022D;
+		public const uint WM_DRAGSELECT	    = 0x022E;
+		public const uint WM_DRAGMOVE	    = 0x022F;
+		public const uint WM_MDISETMENU	    = 0x0230;
+
+		public const uint WM_ENTERSIZEMOVE    = 0x0231;
+		public const uint WM_EXITSIZEMOVE     = 0x0232;
+		public const uint WM_DROPFILES	    = 0x0233;
+
+
+		/* Win32 4.0 messages for IME */
+		public const uint IME_SETCONTEXT           = 0x0281;
+		public const uint IME_NOTIFY               = 0x0282;
+		public const uint IME_CONTROL              = 0x0283;
+		public const uint IME_COMPOSITIONFULL      = 0x0284;
+		public const uint IME_SELECT               = 0x0285;
+		public const uint IME_CHAR                 = 0x0286;
+		/* Win32 5.0 messages for IME */
+		public const uint IME_REQUEST              = 0x0288;
+
+		/* Win32 4.0 messages for IME */
+		public const uint IME_KEYDOWN              = 0x0290;
+		public const uint IME_KEYUP                = 0x0291;
+
+		/* Clipboard command messages */
+		public const uint WM_CUT               = 0x0300;
+		public const uint WM_COPY              = 0x0301;
+		public const uint WM_PASTE             = 0x0302;
+		public const uint WM_CLEAR             = 0x0303;
+		public const uint WM_UNDO              = 0x0304;
+
+		/* Clipboard owner messages */
+		public const uint WM_RENDERFORMAT      = 0x0305;
+		public const uint WM_RENDERALLFORMATS  = 0x0306;
+		public const uint WM_DESTROYCLIPBOARD  = 0x0307;
+
+		/* Clipboard viewer messages */
+		public const uint WM_DRAWCLIPBOARD     = 0x0308;
+		public const uint WM_PAINTCLIPBOARD    = 0x0309;
+		public const uint WM_VSCROLLCLIPBOARD  = 0x030A;
+		public const uint WM_SIZECLIPBOARD     = 0x030B;
+		public const uint WM_ASKCBFORMATNAME   = 0x030C;
+		public const uint WM_CHANGECBCHAIN     = 0x030D;
+		public const uint WM_HSCROLLCLIPBOARD  = 0x030E;
+
+		public const uint WM_QUERYNEWPALETTE   = 0x030F;
+		public const uint WM_PALETTEISCHANGING = 0x0310;
+		public const uint WM_PALETTECHANGED    = 0x0311;
+		public const uint WM_HOTKEY	     = 0x0312;
+
+		public const uint WM_PRINT             = 0x0317;
+		public const uint WM_PRINTCLIENT       = 0x0318;
+
+		public const uint WM_PENWINFIRST      = 0x0380;
+		public const uint WM_PENWINLAST       = 0x038F;
+
+
+		public const uint WM_APP               = 0x8000;
+
+		// Window Styles
+		public const uint WS_OVERLAPPED = 0x00000000;
+		public const uint WS_POPUP = 0x80000000;
+		public const uint WS_CHILD = 0x40000000;
+		public const uint WS_MINIMIZE = 0x20000000;
+		public const uint WS_VISIBLE = 0x10000000;
+		public const uint WS_DISABLED = 0x08000000;
+		public const uint WS_CLIPSIBLINGS = 0x04000000;
+		public const uint WS_CLIPCHILDREN = 0x02000000;
+		public const uint WS_MAXIMIZE = 0x01000000;
+		public const uint WS_CAPTION = 0x00C00000;
+		public const uint WS_BORDER = 0x00800000;
+		public const uint WS_DLGFRAME = 0x00400000;
+		public const uint WS_VSCROLL = 0x00200000;
+		public const uint WS_HSCROLL = 0x00100000;
+		public const uint WS_SYSMENU = 0x00080000;
+		public const uint WS_THICKFRAME = 0x00040000;
+		public const uint WS_GROUP = 0x00020000;
+		public const uint WS_TABSTOP = 0x00010000;
+		public const uint WS_MINIMIZEBOX = 0x00020000;
+		public const uint WS_MAXIMIZEBOX = 0x00010000;
+		public const uint WS_OVERLAPPEDWINDOW = WS_OVERLAPPED | 
+		  WS_CAPTION | WS_SYSMENU | WS_THICKFRAME| 
+		  WS_MINIMIZEBOX | WS_MAXIMIZEBOX;
+
+		// ShowWindow types
+		public const uint SW_SHOW = 5;
+
+		// SetWindowPos types
+		public const uint SWP_NOSIZE          = 0x0001;
+		public const uint SWP_NOMOVE          = 0x0002;
+		public const uint SWP_NOZORDER        = 0x0004;
+		public const uint SWP_NOREDRAW        = 0x0008;
+		public const uint SWP_NOACTIVATE      = 0x0010;
+		public const uint SWP_FRAMECHANGED    = 0x0020;
+		public const uint SWP_SHOWWINDOW      = 0x0040;
+		public const uint SWP_HIDEWINDOW      = 0x0080;
+		public const uint SWP_NOCOPYBITS      = 0x0100;
+		public const uint SWP_NOOWNERZORDER   = 0x0200;
+		public const uint SWP_DRAWFRAME       = SWP_FRAMECHANGED;
+		public const uint SWP_NOREPOSITION    = SWP_NOOWNERZORDER;
+		public const uint SWP_NOSENDCHANGING  = 0x0400;
+		public const uint SWP_DEFERERASE      = 0x2000;
+		public const uint SWP_ASYNCWINDOWPOS  = 0x4000;
+	}
+}
diff --git a/mcs/class/System.Windows.Forms/WINELib/build.sh b/mcs/class/System.Windows.Forms/WINELib/build.sh
new file mode 100644
index 00000000000..32033ff6f7a
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/build.sh
@@ -0,0 +1,42 @@
+# OBSOLETE!!!! NOW USING MAKEFILE
+# this file builds the stub wine application that loads a mono application
+# calling WINELib functions
+# 
+# 
+#
+X11R6_INCLUDE=/usr/X11R6/include
+WINE_INCLUDE=/usr/local/include/wine
+WINE_LIB=/usr/local/lib/wine
+GLIB20_INCLUDE=/usr/include/glib-2.0
+GLIB20_LIB_INCLUDE=/usr/lib/glib-2.0/include
+LIBMONO=/usr/local/lib/libmono.a
+
+# The Mono 0.13 build used at the time this code was written is missing
+# some object code in the static libs. Due to conflicts between functions
+# in the shared libs of Mono and Wine this stub at this point it seems
+# we will need to statically link the embedded Mono engine.
+#
+# These are the two object files are missing in the libmono.a so link these 
+# in also:
+LIBMETADATA=/home/john/mono-src/mono-0.13/mono/metadata/.libs/libmetadata.al 
+LIBMONORUNTIME=/home/john/mono-src/mono-0.13/mono/metadata/.libs/libmonoruntime.al
+
+gcc -c -I. -I$WINE_INCLUDE  -g -O2 -Wall -I$X11R6_INCLUDE -o monostub.o monostub.c
+
+gcc -c -I. -g -O2 -Wall -I$X11R6_INCLUDE $I-o monostart.o monostart.c -I$GLIB20_INCLUDE -I$GLIB20_LIB_INCLUDE -I$WINE_INCLUDE
+
+ld -r  monostub.o -o monostub.exe.tmp.o  
+
+strip --strip-unneeded monostub.exe.tmp.o
+
+winebuild -sym monostub.exe.tmp.o -o monostub.exe.spec.c -exe monostub.exe -mgui -L$WINE_LIB  -lcomdlg32 -lshell32 -luser32 -lgdi32 -lkernel32
+
+gcc -c -I. -I. -I$WINE_INCLUDE -g -O2 -I$X11R6_INCLUDE -o monostub.exe.spec.o monostub.exe.spec.c
+
+winebuild -o monostub.exe.dbg.c -debug -C. monostub.c
+
+gcc -c -I. -I. -I$WINE_INCLUDE  -g -O2 -I$X11R6_INCLUDE -o monostub.exe.dbg.o monostub.exe.dbg.c
+
+gcc -shared -Wl,-Bsymbolic -o monostub.exe.so monostub.exe.spec.o monostub.o monostart.o -L$WINE_LIB -L/usr/lib -L. -lm -L/usr/local/lib -lglib-2.0 -L/usr/lib -lmono -lgc -lnsl -lrt -lgd -lgmodule-2.0  -lwine
+
+gcc -shared -Wl,-Bsymbolic -o monostub.exe.so monostub.exe.spec.o monostub.o monostart.o -I/usr/local/include -I -I$GLIB20_INCUDE -I$GLIB20_LIB_INCLUDE -L/usr/lib $LIBMONO -lwine -lntdll.dll -lglib-2.0 -lgmodule-2.0 -lm $LIBMETADATA $LIBMONORUNTIME
diff --git a/mcs/class/System.Windows.Forms/WINELib/changelog b/mcs/class/System.Windows.Forms/WINELib/changelog
new file mode 100644
index 00000000000..60bdc98f7cb
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/changelog
@@ -0,0 +1,84 @@
+2002-8-21  John Sohn <jsohn@columbus.rr.com>

+	* Application.cs:

+	* Control.cs:

+	* Form.cs:

+	* NativeWindow.cs:

+	* NativeWindowTest.cs: updated code to build on latest mcs in cvs

+

+2002-8-21  John Sohn <jsohn@columbus.rr.com>

+	* Application.cs:

+	* NativeWindow.cs: 

+	* NativeWindowTest.cs: compliant with new DllImports in Win32.cs

+	* makefile: correctly links libmono.a

+

+2002-8-20  John Sohn <jsohn@columbus.rr.com>

+	* Win32.cs: now uses correct Win32 imports and defs. Fixed file provded

+	by Dennis Hayes (dennish@raytek.com)

+	* Application.cs: fixed Win32 API calls

+	* Control.cs: commented out functions which broked build 

+	but are not currently implemented

+	* DrawItemEventHandler.cs: 

+	* MenuItem.cs: added empty classes that allows build to continue

+	without commenting out refernces to them in the source

+	* NativeWindow.cs: fixed Win32 API calls

+

+2002-8-19  John Sohn <jsohn@columbus.rr.com>

+	* monostart.c: fixed link from monostub WndProc to Application

+	class WndProc

+	* FormTest.cs: test of class NOT derived from the Form class

+

+2002-8-18  John Sohn <jsohn@columbus.rr.com>

+	* Application.cs:

+	* ContainerControl.cs:

+	* Control.cs:

+	* Form.cs:

+	* FormTest.cs:

+	* NativeWindow.cs:

+	* NativeWindowTest.cs:

+	* ScrollableControl.cs:

+	* Win32.cs: Updated to better conform to Mono coding conventions

+

+2002-8-16  John Sohn <jsohn@columbus.rr.com>

+	* Application.cs: start of implementation, implements Run(Form) and 

+	handles WndProc as called from monostub WINE application

+	* Font.cs: empty class that allows code with references to 

+	Font to compile

+	* IContainerControl.cs: empty class the allows code with references to 

+	IContainerControl to compile

+	* ContainerControl.cs: start of implementation, a base class of Form

+	* Form.cs: start of implementation, converts most messages to 

+	appropriate On handlers

+	* NativeWindow.cs: almost complete implementation of NativeWindow class

+	* Win32.cs: central point for DllImport and WineLib defs

+	* Control.cs: start of implementation, a base class of Form

+	* DrawItemEventArgs.cs - empty class the allows code with references 

+	to DrawItemEventArgs to compile

+	* IAccessible.cs - empty class the allows code with references to 

+	IAccessible to compile

+	* ScrollableControl.cs: start of implementation, a base class of Form

+	* FormTest.cs - test application for the Form class

+	* NativeWindowTest.cs - test application for the NativeWindowTest

+	* monostub.c - added WNDCLASS registration

+	* monosart.c - added WndProc handler for messages, dispatch messages

+	to C# code using Mono embedded API

+	* makefile - Now uses a real makefile to build monostub.exe.so, 

+	System.Windows.Forms, and test applications. Based on the makefile 

+	used in the Gtk target of Windows.Forms. The build.sh script is

+	no longer maintained.

+	

+2002-8-7  DennisHayes <dennish@raytek.com>

+

+*  Started cheanglog

+

+2002-8-4  DennisHayes <dennish@raytek.com>

+Checked in for John Sohn <jsohn@columbus.rr.com

+

+* build.sh

+* changelog

+* monostart.c

+* monostub.c

+* monostub.exe.dbg.c

+* monostub.exe.spec.c

+* Test.cs

+* test.sh

+* Experiment to get first form working using WINELIB

diff --git a/mcs/class/System.Windows.Forms/WINELib/makefile b/mcs/class/System.Windows.Forms/WINELib/makefile
new file mode 100644
index 00000000000..702583000f9
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/makefile
@@ -0,0 +1,135 @@
+CSC=mcs
+X11R6_INCLUDE=/usr/X11R6/include
+WINE_INCLUDE=/usr/local/include/wine
+WINE_LIB=/usr/local/lib/wine
+GLIB20_INCLUDE=/usr/include/glib-2.0
+GLIB20_LIB_INCLUDE=/usr/lib/glib-2.0/include
+LIBMONO=/usr/local/lib/libmono.a
+SOURCES = \
+	Win32.cs \
+	Font.cs \
+	MenuItem.cs \
+	DrawItemEventArgs.cs \
+	DrawItemEventHandler.cs \
+	../System.Windows.Forms/Message.cs \
+	../System.Windows.Forms/CreateParams.cs \
+	../System.Windows.Forms/MdiLayout.cs \
+	../System.Windows.Forms/InputLanguage.cs \
+	../System.Windows.Forms/InputLanguageCollection.cs \
+	../System.Windows.Forms/InputLanguageChangedEventArgs.cs \
+	../System.Windows.Forms/InputLanguageChangingEventArgs.cs \
+	../System.Windows.Forms/PaintEventArgs.cs \
+	../System.Windows.Forms/Keys.cs \
+	../System.Windows.Forms/BoundsSpecified.cs \
+	../System.Windows.Forms/RightToLeft.cs \
+	../System.Windows.Forms/Shortcut.cs \
+	../System.Windows.Forms/MeasureItemEventArgs.cs \
+	../System.Windows.Forms/SizeGripStyle.cs \
+	../System.Windows.Forms/FormStartPosition.cs \
+	../System.Windows.Forms/FormWindowState.cs \
+	../System.Windows.Forms/ImeMode.cs \
+	../System.Windows.Forms/InputLanguageChangedEventHandler.cs \
+	../System.Windows.Forms/MeasureItemEventHandler.cs \
+	../System.Windows.Forms/InputLanguageChangingEventHandler.cs \
+	../System.Windows.Forms/DrawItemState.cs \
+	../System.Windows.Forms/ComVisible.cs \
+	../System.Windows.Forms/DialogResult.cs \
+	../System.Windows.Forms/IButtonControl.cs \
+	../System.Windows.Forms/FormBorderStyle.cs \
+	../System.Windows.Forms/AccessibleEvents.cs \
+	../System.Windows.Forms/IWin32Window.cs \
+	../System.Windows.Forms/DragDropEffects.cs \
+	../System.Windows.Forms/ControlStyles.cs \
+	../System.Windows.Forms/ControlEventArgs.cs \
+	../System.Windows.Forms/DragEventArgs.cs \
+	../System.Windows.Forms/GiveFeedbackEventArgs.cs \
+	../System.Windows.Forms/HelpEventArgs.cs \
+	../System.Windows.Forms/InvalidateEventArgs.cs \
+	../System.Windows.Forms/KeyEventArgs.cs \
+	../System.Windows.Forms/KeyPressEventArgs.cs \
+	../System.Windows.Forms/MouseEventArgs.cs \
+	../System.Windows.Forms/LayoutEventArgs.cs \
+	../System.Windows.Forms/QueryContinueDragEventArgs.cs \
+	../System.Windows.Forms/HorizontalAlignment.cs \
+	../System.Windows.Forms/LeftRightAlignment.cs \
+	../System.Windows.Forms/AccessibleRole.cs \
+	../System.Windows.Forms/AnchorStyles.cs \
+	../System.Windows.Forms/Cursor.cs \
+	../System.Windows.Forms/BaseCollection.cs \
+	../System.Windows.Forms/DockStyle.cs \
+	../System.Windows.Forms/ControlEventHandler.cs \
+	../System.Windows.Forms/MouseButtons.cs \
+	../System.Windows.Forms/UICues.cs \
+	../System.Windows.Forms/UICuesEventArgs.cs \
+	../System.Windows.Forms/UICuesEventHandler.cs \
+	../System.Windows.Forms/DragEventHandler.cs \
+	../System.Windows.Forms/HelpEventHandler.cs \
+	../System.Windows.Forms/GiveFeedbackEventHandler.cs \
+	../System.Windows.Forms/InvalidateEventHandler.cs \
+	../System.Windows.Forms/KeyEventHandler.cs \
+	../System.Windows.Forms/KeyPressEventHandler.cs \
+	../System.Windows.Forms/LayoutEventHandler.cs \
+	../System.Windows.Forms/MouseEventHandler.cs \
+	../System.Windows.Forms/PaintEventHandler.cs \
+	../System.Windows.Forms/QueryAccessibilityHelpEventHandler.cs \
+	../System.Windows.Forms/QueryContinueDragEventHandler.cs \
+	../System.Windows.Forms/IDataObject.cs \
+	../System.Windows.Forms/DragAction.cs \
+	../System.Windows.Forms/QueryAccessibilityHelpEventArgs.cs \
+	../System.Windows.Forms/IMessageFilter.cs \
+	../System.Windows.Forms/ApplicationContext.cs \
+	IContainerControl.cs \
+	Control.cs \
+	ScrollableControl.cs \
+	ContainerControl.cs \
+	Form.cs \
+	Application.cs \
+	NativeWindow.cs
+
+all:	monostub.exe.so System.Windows.Forms.dll NativeWindowTest.exe \
+	FormTest.exe
+
+##########################################################################
+# build the mono stub application
+monostub.exe.so: monostub.o monostart.o monostub.exe.spec.o monostub.exe.dbg.o
+	gcc -shared -Wl,-Bsymbolic -o monostub.exe.so monostub.exe.spec.o \
+	monostub.o monostub.exe.dbg.o monostart.o -I/usr/local/include \
+	 -I$(GLIB20_INCUDE) -I$(GLIB20_LIB_INCLUDE) -L/usr/lib $(LIBMONO) \
+	-lwine -lntdll.dll -lglib-2.0 -lgmodule-2.0 -lm -lpthread -lgc
+
+clean:	
+	rm *.o monostub.exe.dbg.c monostub.exe.spec.c monostub.exe.so *.exe *.dll
+
+monostub.o: monostub.c
+	gcc -c -I. -I$(WINE_INCLUDE)  -g -O2 -Wall -I$(X11R6_INCLUDE) -o monostub.o monostub.c
+
+monostart.o: monostart.c
+	gcc -c -I. -g -O2 -Wall -I$(X11R6_INCLUDE) -o monostart.o monostart.c -I$(GLIB20_INCLUDE) -I$(GLIB20_LIB_INCLUDE) -I$(WINE_INCLUDE)
+
+monostub.exe.tmp.o: monostub.o monostart.o
+	ld -r  monostub.o -o monostub.exe.tmp.o  
+	strip --strip-unneeded monostub.exe.tmp.o
+
+monostub.exe.spec.c: monostub.exe.tmp.o
+	winebuild -sym monostub.exe.tmp.o -o monostub.exe.spec.c -exe monostub.exe -mgui -L$(WINE_LIB)  -lcomdlg32 -lshell32 -luser32 -lgdi32 -lkernel32
+
+monostub.exe.spec.o: monostub.exe.spec.c
+	gcc -c -I. -I. -I$(WINE_INCLUDE) -g -O2 -I$(X11R6_INCLUDE) -o monostub.exe.spec.o monostub.exe.spec.c
+
+monostub.exe.dbg.c: monostub.exe.spec.o
+	winebuild -o monostub.exe.dbg.c -debug -C. monostub.c
+
+monostub.exe.dbg.o: monostub.exe.dbg.c
+	gcc -c -I. -I. -I$(WINE_INCLUDE)  -g -O2 -I$(X11R6_INCLUDE) -o monostub.exe.dbg.o monostub.exe.dbg.c
+
+##########################################################################
+# build System.Windows.Forms.dll and test/sample applications
+
+NativeWindowTest.exe: NativeWindowTest.cs System.Windows.Forms.dll
+	$(CSC) -r System.Windows.Forms.dll NativeWindowTest.cs
+
+FormTest.exe: FormTest.cs System.Windows.Forms.dll
+	$(CSC) -r System.Windows.Forms.dll FormTest.cs
+
+System.Windows.Forms.dll: $(SOURCES)
+	$(CSC) --target library -o System.Windows.Forms.dll $(SOURCES) -r System.Drawing
diff --git a/mcs/class/System.Windows.Forms/WINELib/monostart.c b/mcs/class/System.Windows.Forms/WINELib/monostart.c
new file mode 100644
index 00000000000..4893138c67d
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/monostart.c
@@ -0,0 +1,76 @@
+#include <mono/jit/jit.h>
+#include <mono/metadata/debug-helpers.h>
+#include <stdio.h>
+
+static unsigned int application_instance;
+MonoMethod *wndproc_method = NULL;
+
+// wrapped in the Mono class, enables the embedded application
+// to get the HINSTANCE
+int GetInstance()
+{
+	return application_instance;
+}
+
+// WndProc for registered class, calls embeded Mono WndProc function
+unsigned long __attribute__((__stdcall__)) WndProc(unsigned int hWnd, unsigned int msg, unsigned int wParam, long lParam)
+{
+	MonoObject *return_object = NULL;
+	gpointer params[4];
+
+	printf("WndProc begin\n");
+
+	params[0] = &hWnd;
+	params[1] = &msg;
+	params[2] = &wParam;
+	params[3] = &lParam;
+
+	return_object = mono_runtime_invoke(wndproc_method, NULL, params, NULL);
+	printf("WndProc end\n");
+
+	return (long) &return_object->vtable;
+}
+
+// uses Mono embedding API to execute application
+int mono_start(unsigned int hInstance, unsigned int hPrevInstance, char* lpszCmdLine, int nCmdShow)
+{
+	MonoDomain *domain = NULL;
+	MonoAssembly *assembly = NULL;
+	MonoMethodDesc* desc = NULL;
+	MonoImage *image = NULL;
+  
+	application_instance = hInstance;
+
+      	printf("initializing JIT engine\n");	
+	domain = mono_jit_init(lpszCmdLine);
+
+	// helper to allow embedded application to get the HINSTANCE
+	// (not sure if we need this in the latest Win32 API's)
+	//printf("adding internal calls\n");
+	//mono_add_internal_call ("Application::GetInstance", 
+	//			GetInstance);
+
+	printf("opening assembly\n");
+	assembly = mono_domain_assembly_open (domain, lpszCmdLine);
+
+	// setup WNDPROC method in embedded application
+	desc = mono_method_desc_new ("System.Windows.Forms.Application:_ApplicationWndProc", TRUE);
+	printf("finding method(s)\n");
+	image = mono_image_loaded ("System.Windows.Forms");
+
+	if (image && desc)
+	  wndproc_method = mono_method_desc_search_in_image (desc, image);
+
+	if (!wndproc_method) {
+	  printf("error: Application:_ApplicationWndProc not found\n");
+	  return 1;
+	}
+
+	printf("executing assembly\n");
+	mono_jit_exec(domain, assembly, 0, 0);
+	
+	printf("calling JIT cleanup\n");
+	mono_jit_cleanup(domain);
+
+	return 0;
+}
diff --git a/mcs/class/System.Windows.Forms/WINELib/monostub.c b/mcs/class/System.Windows.Forms/WINELib/monostub.c
new file mode 100644
index 00000000000..6be0e24d044
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/monostub.c
@@ -0,0 +1,37 @@
+#include <windows.h>
+#include <stdio.h>
+//
+// The Mono and WINE header files have overlapping definitions in the
+// header files. This file contains the "WinMain" startup code and
+// other code that must call functions in the windows.h header file.
+// 
+
+int mono_start(unsigned int hInstance, unsigned int hPrevInstance, char* lpszCmdLine, int nCmdShow);
+long __attribute__((__stdcall__)) WndProc(unsigned int hWnd, unsigned int msg, unsigned int wParam, long lParam);
+
+// register WNDCLASS for use in embeded application
+void register_mono_wine_class(HINSTANCE hInstance)
+{
+	WNDCLASS wc;
+
+	wc.lpszClassName = "mono_wine_class";
+	wc.lpfnWndProc = (WNDPROC) WndProc;
+	wc.style = CS_OWNDC | CS_VREDRAW | CS_HREDRAW;
+	wc.hInstance = hInstance;
+	wc.hIcon = (HICON) LoadIcon( 0, (LPCTSTR) IDI_APPLICATION );
+	wc.hCursor = (HCURSOR) LoadCursor( 0, (LPCTSTR) IDC_ARROW );
+	wc.hbrBackground = (HBRUSH)( COLOR_WINDOW+1 );
+	wc.lpszMenuName = NULL;
+	wc.cbClsExtra = 0;
+	wc.cbWndExtra = 0;
+
+	RegisterClass(&wc);
+}
+
+int PASCAL WinMain( HINSTANCE hInstance, HINSTANCE hPrevInstance, LPSTR lpszCmdLine, int nCmdShow )
+{
+	printf("registering mono_wine_class\n");
+	register_mono_wine_class(hInstance);
+	return mono_start(hInstance, hPrevInstance, lpszCmdLine, nCmdShow);
+}
+
diff --git a/mcs/class/System.Windows.Forms/WINELib/test.sh b/mcs/class/System.Windows.Forms/WINELib/test.sh
new file mode 100644
index 00000000000..c0822705ffd
--- /dev/null
+++ b/mcs/class/System.Windows.Forms/WINELib/test.sh
@@ -0,0 +1 @@
+# wine monostub.exe.so Window.exe

diff --git a/mcs/class/System.XML/.cvsignore b/mcs/class/System.XML/.cvsignore
new file mode 100644
index 00000000000..4e89ecb3b74
--- /dev/null
+++ b/mcs/class/System.XML/.cvsignore
@@ -0,0 +1,8 @@
+*.dll
+list
+*.suo
+*.csproj.user
+bin
+obj
+.makefrag
+.response
diff --git a/mcs/class/System.XML/ChangeLog b/mcs/class/System.XML/ChangeLog
new file mode 100644
index 00000000000..ecdc05a39cc
--- /dev/null
+++ b/mcs/class/System.XML/ChangeLog
@@ -0,0 +1,43 @@
+2002-08-22  Tim Coleman <tim@timcoleman.com>
+	* list.unix:
+		Add System.Xml.Serialization/XmlCustomFormatter.cs
+
+2002-08-19  Tim Coleman <tim@timcoleman.com>
+	* list.unix:
+		Add System.Xml.Serialization/XmlSerializationWriter.cs
+
+2002-07-24  Tim Coleman <tim@timcoleman.com>
+	* list.unix:
+		Add some more classes to this build list.
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* list.unix:
+		Add System.Xml.Serialization/SoapReflectionImporter.cs to build
+		list.
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* list.unix: added new classes to build list.
+
+2002-06-20  Ajay kumar Dwivedi <adwiv@yahoo.com>
+	
+	* System.Xml.Serialization: Added to build target
+
+2002-05-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* System.Xml.Serialization/XmlElementAttribute.cs: Add allowmultiple
+
+2002-03-06  Jason Diamond  <jason@injektilo.org>
+
+	* System.XML.build: Disable warning CS0679: Other languages may permit the internal virtual member 'foo' to be overridden.
+
+2002-02-23  Nick Drochak  <ndrochak@gol.com>
+
+	* System.XML.build: Change dll name to System.Xml.dll from 
+	System.XML.dll (not easy to notice, btw)
+
+2001-12-07  Nick Drochak <ndrochak@gol.com>
+
+	* ChangeLog: Add the change log to this directory
+
+	* System.XML.build: Add dependancy on linux target to test target. Need to have the dll before we can test it, right?  Plus is encourages other to try 'make test'.
+
diff --git a/mcs/class/System.XML/Mono.System.XML.csproj b/mcs/class/System.XML/Mono.System.XML.csproj
new file mode 100644
index 00000000000..0d99f0896b8
--- /dev/null
+++ b/mcs/class/System.XML/Mono.System.XML.csproj
@@ -0,0 +1,510 @@
+<VisualStudioProject>

+    <CSHARP

+        ProjectType = "Local"

+        ProductVersion = "7.0.9466"

+        SchemaVersion = "1.0"

+        ProjectGuid = "{0CB7FB41-3C0F-40E8-ACD3-8C5B8BC35B2C}"

+    >

+        <Build>

+            <Settings

+                ApplicationIcon = ""

+                AssemblyKeyContainerName = ""

+                AssemblyName = "System.XML"

+                AssemblyOriginatorKeyFile = ""

+                DefaultClientScript = "JScript"

+                DefaultHTMLPageLayout = "Grid"

+                DefaultTargetSchema = "IE50"

+                DelaySign = "false"

+                OutputType = "Library"

+                RootNamespace = "System.XML"

+                StartupObject = ""

+            >

+                <Config

+                    Name = "Debug"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "DEBUG;TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "true"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "true"

+                    Optimize = "false"

+                    OutputPath = "bin\Debug\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+                <Config

+                    Name = "Release"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "false"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "false"

+                    Optimize = "true"

+                    OutputPath = "bin\Release\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+            </Settings>

+            <References>

+                <Reference

+                    Name = "System"

+                    AssemblyName = "System"

+                    HintPath = "..\..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"

+                />

+                <Reference

+                    Name = "System.Data"

+                    AssemblyName = "System.Data"

+                    HintPath = "..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"

+                />

+            </References>

+        </Build>

+        <Files>

+            <Include>

+                <File

+                    RelPath = "System.Xml\ChangeLog"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "System.Xml\Driver.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\EntityHandling.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\Formatting.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\IHasXmlNode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\IXmlLineInfo.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\NameTable.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\Profile.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\ReadState.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\TODOAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\ValidationType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\WhitespaceHandling.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\WriteState.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlAttribute.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlAttributeCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlCDataSection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlChar.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlCharacterData.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlComment.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlConstructs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlConvert.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlDeclaration.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlDocument.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlDocumentFragment.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlDocumentNavigator.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlDocumentType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlElement.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlEntity.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlEntityReference.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlException.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlImplementation.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlLinkedNode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNamedNodeMap.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNamespaceManager.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNameTable.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNode.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNodeArrayList.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNodeChangedAction.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNodeChangedEventArgs.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNodeChangedEventHandler.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNodeList.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNodeListChildren.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNodeOrder.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNodeReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNodeType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlNotation.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlParserContext.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlProcessingInstruction.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlQualifiedName.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlResolver.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlSignificantWhitespace.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlSpace.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlText.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlTextReader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlTextWriter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlTextWriterOpenElement.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlTokenizedType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlUrlResolver.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlWhitespace.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml\XmlWriter.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\ChangeLog"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\DefaultContext.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\Expression.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\Iterator.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\IXPathNavigable.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\Parser.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\Parser.jay"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\Tokenizer.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XmlCaseOrder.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XmlDataType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XmlSortOrder.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XPathDocument.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XPathException.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XPathExpression.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XPathNamespaceScope.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XPathNavigator.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XPathNodeIterator.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XPathNodeType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.XPath\XPathResultType.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.Xsl\IXsltContextFunction.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.Xsl\IXsltContextVariable.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.Xsl\XsltArgumentList.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.Xsl\XsltCompileException.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.Xsl\XsltContext.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.Xsl\XsltException.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "System.Xml.Xsl\XslTransform.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+            </Include>

+        </Files>

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/class/System.XML/Mono.System.XML.sln b/mcs/class/System.XML/Mono.System.XML.sln
new file mode 100644
index 00000000000..0d2c98ae7dd
--- /dev/null
+++ b/mcs/class/System.XML/Mono.System.XML.sln
@@ -0,0 +1,27 @@
+Microsoft Visual Studio Solution File, Format Version 7.00
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.System.XML", "Mono.System.XML.csproj", "{0CB7FB41-3C0F-40E8-ACD3-8C5B8BC35B2C}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MonoMicro.Test", "Test\MonoMicro.Test.csproj", "{F7734143-3845-4288-B1CA-FE614FFA70F0}"
+EndProject
+Global
+	GlobalSection(SolutionConfiguration) = preSolution
+		ConfigName.0 = Debug
+		ConfigName.1 = Release
+	EndGlobalSection
+	GlobalSection(ProjectDependencies) = postSolution
+	EndGlobalSection
+	GlobalSection(ProjectConfiguration) = postSolution
+		{0CB7FB41-3C0F-40E8-ACD3-8C5B8BC35B2C}.Debug.ActiveCfg = Debug|.NET
+		{0CB7FB41-3C0F-40E8-ACD3-8C5B8BC35B2C}.Debug.Build.0 = Debug|.NET
+		{0CB7FB41-3C0F-40E8-ACD3-8C5B8BC35B2C}.Release.ActiveCfg = Release|.NET
+		{0CB7FB41-3C0F-40E8-ACD3-8C5B8BC35B2C}.Release.Build.0 = Release|.NET
+		{F7734143-3845-4288-B1CA-FE614FFA70F0}.Debug.ActiveCfg = Debug|.NET
+		{F7734143-3845-4288-B1CA-FE614FFA70F0}.Debug.Build.0 = Debug|.NET
+		{F7734143-3845-4288-B1CA-FE614FFA70F0}.Release.ActiveCfg = Release|.NET
+		{F7734143-3845-4288-B1CA-FE614FFA70F0}.Release.Build.0 = Release|.NET
+	EndGlobalSection
+	GlobalSection(ExtensibilityGlobals) = postSolution
+	EndGlobalSection
+	GlobalSection(ExtensibilityAddIns) = postSolution
+	EndGlobalSection
+EndGlobal
diff --git a/mcs/class/System.XML/README b/mcs/class/System.XML/README
new file mode 100755
index 00000000000..498b53d0796
--- /dev/null
+++ b/mcs/class/System.XML/README
@@ -0,0 +1,8 @@
+Build instructions for use with the mono runtime.
+
+Run:
+	mcs @list.unix
+
+If no errors occourred, copy the generated System.Xml.dll file to the runtime dir
+(probably /usr/local/lib).
+
diff --git a/mcs/class/System.XML/System.XML.build b/mcs/class/System.XML/System.XML.build
new file mode 100644
index 00000000000..cee6b79d8b9
--- /dev/null
+++ b/mcs/class/System.XML/System.XML.build
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.XML.dll -->
+
+<project name="System.XML" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<mkdir dir="../lib"/>
+		<csc target="library" output="../lib/System.Xml.dll" debug="${debug}">
+			<!-- 'foo' is defined in multiple places; using definition from 'bar' -->
+			<arg value="/nowarn:1595"/>
+			<!-- Other languages may permit the internal virtual member 'foo' to be overridden -->
+			<arg value="/nowarn:0679"/>
+			<arg value="/nowarn:0649"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/>
+				<!--excludes name="System.Xml.Serialization/**"/--> 
+			</sources>
+		</csc>
+		<copy file="../lib/System.Xml.dll" tofile="Test/System.XML.dll"/>
+		<nant basedir="Test" target="build"/>
+	</target>
+
+	<target name="test" depends="build">
+		<nant basedir="Test" target="test"/>
+	</target>
+
+	<target name="clean">
+		<nant basedir="Test" target="clean"/>
+		<delete file="../lib/System.XML.dll" failonerror="false"/>
+		<delete file="../lib/System.Xml.dll" failonerror="false"/>
+		<delete file="Test/System.XML.dll" failonerror="false"/>
+		<delete file="Test/System.Xml.dll" failonerror="false"/>
+		<delete file="../lib/System.XML.pdb" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/System.XML/System.Xml.Schema/BUGS-MS.txt b/mcs/class/System.XML/System.Xml.Schema/BUGS-MS.txt
new file mode 100755
index 00000000000..ad4ece9c910
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/BUGS-MS.txt
@@ -0,0 +1,20 @@
+BUGS in MS Implementation of XmlSchema:

+

+1. Does not allow duplicate values in lists for final* and block* attributes. 

+   For example "restriction restriction" is not allowed even though its a valid

+   value for blockDefault.

+

+2. Resets the minOccurs to 0 if maxOccurs="0", whereas it should raise an error.

+

+3. Allows abstract="true" in the a localElement whereas it is not allowed.

+	<?xml version="1.0"?>

+	<xsd:schema xmlns:xsd="http://www.w3.org/2001/XMLSchema" targetNamespace="http://xsdtesting" xmlns:x="http://xsdtesting" elementFormDefault="qualified">

+		<xsd:element name="doc">

+			<xsd:complexType>

+				<xsd:sequence>

+					<xsd:element name="elem1"/>

+					<xsd:element abstract="true" name="elem2"/> <!--This element is not valid -->

+				</xsd:sequence>

+			</xsd:complexType>

+		</xsd:element>

+	</xsd:schema>
\ No newline at end of file
diff --git a/mcs/class/System.XML/System.Xml.Schema/BUGS.txt b/mcs/class/System.XML/System.Xml.Schema/BUGS.txt
new file mode 100755
index 00000000000..cf602178c3d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/BUGS.txt
@@ -0,0 +1,5 @@
+Bugs in Implementation:

+

+// None of the XmlSchemaObjects except the XmlSchema populate XmlSerializerNamespaces.

+//2. Non schema attributes are not being handled. Need an internal XmlAttribute constructor.

+//3. Documentation and appInfo's Markup is not being read in the Read() Method.

diff --git a/mcs/class/System.XML/System.Xml.Schema/ChangeLog b/mcs/class/System.XML/System.Xml.Schema/ChangeLog
new file mode 100755
index 00000000000..13917ba73c5
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/ChangeLog
@@ -0,0 +1,69 @@
+2002-07-23  Duncan Mak  <duncan@ximian.com>
+
+	* XmlSchemaException.cs: Partiall implement the ISerializable
+	methods. It's not clear now SourceSchemaObject should be deserialized.
+
+2002-07-22  Tim Coleman  <tim@timcoleman.com>
+	* XmlSchema.cs: Removed isCompiled which is defined as internal
+		in XmlSchemaObject.
+
+2002-06-18  Dwivedi, Ajay kumar <adwiv@yahoo.com>
+	
+	* XmlSchema: Started work on Validate methods
+
+2002-06-18  Dwivedi, Ajay kumar <adwiv@yahoo.com>
+	* XmlSchema: The Read and Write methods are no more [MonoTODO] :)
+	
+	* XmlSchemaAppInfo: Xml Markup is now being read.
+	
+	* XmlSchemaDocumentation: Xml Markup is now being read.
+
+	* All: Unhandled attributes are being handled properly.
+	       
+	* All: Reordered the properties in all cs files to match with MS
+	       Implementation. This was required since the order is importatnt
+	       for the XmlSerializer.
+	
+2002-06-14  Dwivedi, Ajay kumar <adwiv@yahoo.com>
+	* General: Fixed a few more Bugs
+
+2002-06-10  Dwivedi, Ajay kumar <adwiv@yahoo.com>
+	* XmlSchemaReader: A Wrapper class around XmlReader with customized
+	  methods to suit reading a schema.
+	* General: Implemented Read() method for the schema. There are only
+	  a few minor bugs remaining.
+
+2002-05-25  Dwivedi, Ajay kumar <adwiv@yahoo.com>
+	* BUGS.txt: New file to keep track of bugs
+
+	* ALL: All classes are initialized exactly as in .NET except
+	       1. inclusion of language attribute in schema
+	       2. ComplexContent's Particle is initialized to null whereas .NET 
+	          to some internal implementation. IMO Null is more appropriate
+
+	* ALL: Changed the Compile methods to return the count of errors.
+
+	* ALL: Complile methods are almost complete. Pass 1453 of 3061 tests.
+	       This number should shoot up if we write a parser to read the
+	       Schema instead of using reflection (which is slower too)
+
+2002-05-04  Dwivedi, Ajay kumar <adwiv@yahoo.com>
+	* XmlSchemaUtil.cs: New file added. 
+	
+	* Parser.cs: New file Added. Unused at the moment.
+
+	* XmlSchemaObjectCollection: Fixed GetEnumerator
+	
+	* General: Preprocessing for Attributes and SimpleTypes completed.
+
+2002-04-26  Duncan Mak  <duncan@ximian.com>
+
+	* ValidationHandler.cs: New file.
+
+	* XmlSchemaInfo.cs: New file.
+
+	* *.cs: More updates from Ajay.
+
+2002-03-27  Duncan Mak  <duncan@ximian.com>
+
+	* *.cs: Updates from Ajay Dwivedi <AjayKumar.Dwivedi@dresdner-bank.com>.
diff --git a/mcs/class/System.XML/System.Xml.Schema/ValidationEventArgs.cs b/mcs/class/System.XML/System.Xml.Schema/ValidationEventArgs.cs
new file mode 100755
index 00000000000..df846514e1e
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/ValidationEventArgs.cs
@@ -0,0 +1,38 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for ValidationEventArgs.

+	/// </summary>

+	public sealed class ValidationEventArgs : EventArgs

+	{

+		private XmlSchemaException exception;

+		private string message;

+		private XmlSeverityType severity;

+

+		private ValidationEventArgs()

+		{}

+

+		internal ValidationEventArgs(XmlSchemaException ex, string message, XmlSeverityType severity)

+		{

+			this.exception = ex;

+			this.message = message;

+			this.severity = severity;

+		}

+		public XmlSchemaException Exception 

+		{

+			get{ return exception; }

+		}

+		public string Message 

+		{

+			get{ return message; }

+		}

+		public XmlSeverityType Severity 

+		{

+			get{ return severity; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/ValidationHandler.cs b/mcs/class/System.XML/System.Xml.Schema/ValidationHandler.cs
new file mode 100755
index 00000000000..898a10a840f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/ValidationHandler.cs
@@ -0,0 +1,48 @@
+using System;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// </summary>

+	public delegate void ValidationEventHandler(object sender,ValidationEventArgs e);

+

+	/// <summary>

+	/// Docs say we need to raise an exception if ValidationEventHandler is not set(null)

+	/// So we use this class to raise the events rather than calling the delegate by itself

+	/// </summary>

+	internal class ValidationHandler

+	{

+		public static void RaiseValidationEvent(ValidationEventHandler handle, Exception innerException,  object sender, string message, XmlSeverityType severity)

+		{

+			XmlSchemaException ex = new XmlSchemaException(message,innerException);

+			ValidationEventArgs e = new ValidationEventArgs(ex,message,severity);

+			if(handle == null)

+			{

+				throw e.Exception;

+			}

+			else

+			{

+				handle(sender,e);

+			}

+		}

+		public static void RaiseValidationError(ValidationEventHandler handle, object sender, string message)

+		{

+			RaiseValidationEvent(handle,null,sender,message,XmlSeverityType.Error);

+		}

+		

+		public static void RaiseValidationError(ValidationEventHandler handle, string message, Exception innerException)

+		{

+			RaiseValidationEvent(handle, innerException, null, message, XmlSeverityType.Error);

+		}

+

+		public static void RaiseValidationWarning (ValidationEventHandler handle, object sender, string message)

+		{

+			RaiseValidationEvent(handle,null,sender,message,XmlSeverityType.Warning);

+		}

+

+		public static void RaiseValidationWarning(ValidationEventHandler handle, string message, Exception innerException)

+		{

+			RaiseValidationEvent(handle, innerException, null, message, XmlSeverityType.Warning);

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
new file mode 100755
index 00000000000..61f16ec71ca
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchema.cs
@@ -0,0 +1,711 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Collections;

+using System.Xml;

+using System.IO;

+using System.Xml.Serialization;

+using System.ComponentModel;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchema.

+	/// </summary>

+	[XmlRoot("schema",Namespace="http://www.w3.org/2001/XMLSchema")]

+	public class XmlSchema : XmlSchemaObject

+	{

+		//public constants

+		public const string Namespace = "http://www.w3.org/2001/XMLSchema";

+		public const string InstanceNamespace = "http://www.w3.org/2001/XMLSchema-instance";

+

+		//private fields

+		private XmlSchemaForm attributeFormDefault ;

+		private XmlSchemaObjectTable attributeGroups ;

+		private XmlSchemaObjectTable attributes ;

+		private XmlSchemaDerivationMethod blockDefault ;

+		private XmlSchemaForm elementFormDefault ;

+		private XmlSchemaObjectTable elements ;

+		private XmlSchemaDerivationMethod finalDefault ;

+		private XmlSchemaObjectTable groups ;

+		private string id ;

+		private XmlSchemaObjectCollection includes ;

+		private XmlSchemaObjectCollection items ;

+		private XmlSchemaObjectTable notations ;

+		private XmlSchemaObjectTable schemaTypes ;

+		private string targetNamespace ;

+		private XmlAttribute[] unhandledAttributes ;

+		private string version;

+		private string language;

+		

+		// Compiler specific things

+		private XmlSchemaInfo info;

+		private static string xmlname = "schema";

+

+		public XmlSchema()

+		{

+			attributeFormDefault= XmlSchemaForm.None;

+			blockDefault		= XmlSchemaDerivationMethod.None;

+			elementFormDefault	= XmlSchemaForm.None;

+			finalDefault		= XmlSchemaDerivationMethod.None;

+			includes			= new XmlSchemaObjectCollection();

+			isCompiled			= false;

+			items				= new XmlSchemaObjectCollection();

+			attributeGroups		= new XmlSchemaObjectTable();

+			attributes			= new XmlSchemaObjectTable();

+			elements			= new XmlSchemaObjectTable();

+			groups				= new XmlSchemaObjectTable();

+			notations			= new XmlSchemaObjectTable();

+			schemaTypes			= new XmlSchemaObjectTable();

+		}

+

+		#region Properties

+

+		[DefaultValue(XmlSchemaForm.None)]

+		[System.Xml.Serialization.XmlAttribute("attributeFormDefault")]

+		public XmlSchemaForm AttributeFormDefault 

+		{

+			get{ return attributeFormDefault; }

+			set{ this.attributeFormDefault = value;}

+		}

+		

+		[DefaultValue(XmlSchemaDerivationMethod.None)]

+		[System.Xml.Serialization.XmlAttribute("blockDefault")]

+		public XmlSchemaDerivationMethod BlockDefault 

+		{

+			get{ return blockDefault;}

+			set{ blockDefault = value;}

+		}

+

+		[DefaultValue(XmlSchemaDerivationMethod.None)]

+		[System.Xml.Serialization.XmlAttribute("finalDefault")]

+		public XmlSchemaDerivationMethod FinalDefault 

+		{

+			get{ return finalDefault;}

+			set{ finalDefault = value;}

+		}

+		

+		[DefaultValue(XmlSchemaForm.None)]

+		[System.Xml.Serialization.XmlAttribute("elementFormDefault")]

+		public XmlSchemaForm ElementFormDefault 

+		{

+			get{ return elementFormDefault;}

+			set{ elementFormDefault = value;}

+		}

+		

+		[System.Xml.Serialization.XmlAttribute("targetNamespace")]

+		public string TargetNamespace 

+		{

+			get{ return targetNamespace;}

+			set{ targetNamespace = value;}

+		}

+		

+		[System.Xml.Serialization.XmlAttribute("version")]

+		public string Version 

+		{

+			get{ return version;}

+			set{ version = value;}

+		}

+		

+		[XmlElement("include",typeof(XmlSchemaInclude),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("import",typeof(XmlSchemaImport),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("redefine",typeof(XmlSchemaRedefine),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Includes 

+		{

+			get{ return includes;}

+		}

+		

+		[XmlElement("simpleType",typeof(XmlSchemaSimpleType),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("complexType",typeof(XmlSchemaComplexType),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("group",typeof(XmlSchemaGroup),Namespace="http://www.w3.org/2001/XMLSchema")]

+			//Only Schema's attributeGroup has type XmlSchemaAttributeGroup.

+			//Others (complextype, restrictions etc) must have XmlSchemaAttributeGroupRef

+		[XmlElement("attributeGroup",typeof(XmlSchemaAttributeGroup),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("element",typeof(XmlSchemaElement),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("attribute",typeof(XmlSchemaAttribute),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("notation",typeof(XmlSchemaNotation),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("annotation",typeof(XmlSchemaAnnotation),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Items 

+		{

+			get{ return items;}

+		}

+

+		[XmlIgnore]

+		public bool IsCompiled 

+		{

+			get{ return isCompiled;}

+		}

+

+		[XmlIgnore]

+		public XmlSchemaObjectTable Attributes 

+		{

+			get{ return attributes;}

+		}

+

+		[XmlIgnore]

+		public XmlSchemaObjectTable AttributeGroups 

+		{

+			get{ return attributeGroups; }

+		}

+		

+		[XmlIgnore]

+		public XmlSchemaObjectTable SchemaTypes 

+		{

+			get{ return schemaTypes; }

+		}

+

+		[XmlIgnore]

+		public XmlSchemaObjectTable Elements 

+		{

+			get{ return elements;}

+		}

+

+		[System.Xml.Serialization.XmlAttribute("id")]

+		public string Id 

+		{

+			get{ return id;}

+			set{ id = value;}

+		}

+		

+		[XmlAnyAttribute]

+		public XmlAttribute[] UnhandledAttributes 

+		{

+			get

+			{

+				if(unhandledAttributeList != null)

+				{

+					unhandledAttributes = (XmlAttribute[]) unhandledAttributeList.ToArray(typeof(XmlAttribute));

+					unhandledAttributeList = null;

+				}

+				return unhandledAttributes;

+			}

+			set

+			{ 

+				unhandledAttributes = value; 

+				unhandledAttributeList = null;

+			}

+		}

+

+		[XmlIgnore]

+		public XmlSchemaObjectTable Groups 

+		{

+			get{ return groups;}

+		}

+		

+		[XmlIgnore]

+		public XmlSchemaObjectTable Notations 

+		{

+			get{ return notations;}

+		}

+

+		// New attribute defined in W3C schema element

+		[System.Xml.Serialization.XmlAttribute("xml:lang")]

+		public string Language

+		{

+			get{ return  language; }

+			set{ language = value; }

+		}

+

+		#endregion

+

+		#region Compile

+

+		// Methods

+		/// <summary>

+		/// This compile method does two things:

+		/// 1. It compiles and fills the PSVI dataset

+		/// 2. Validates the schema by calling Validate method.

+		/// Every XmlSchemaObject has a Compile Method which gets called.

+		/// </summary>

+		/// <remarks>

+		///		1. blockDefault must be one of #all | List of (extension | restriction | substitution)

+		///		2. finalDefault must be one of (#all | List of (extension | restriction| union| list))

+		///		3. id must be of type ID

+		///		4. targetNamespace should be any uri

+		///		5. version should be a normalizedString

+		///		6. xml:lang should be a language

+		/// </remarks>

+		[MonoTODO]

+		public void Compile(ValidationEventHandler handler)

+		{

+			// Create the xmlschemainfo object which we use to pass variables like targetnamespace;

+			info = new XmlSchemaInfo();

+

+			//1. Union and List are not allowed in block default

+			if(BlockDefault != XmlSchemaDerivationMethod.All)

+			{

+				if((BlockDefault & XmlSchemaDerivationMethod.List)!=0 )

+					error(handler, "list is not allowed in blockDefault attribute");

+				if((BlockDefault & XmlSchemaDerivationMethod.Union)!=0 )

+					error(handler, "union is not allowed in blockDefault attribute");

+			}

+

+			//2. Substitution is not allowed in finaldefault.

+			if(FinalDefault != XmlSchemaDerivationMethod.All)

+			{

+				if((FinalDefault & XmlSchemaDerivationMethod.Substitution)!=0 )

+					error(handler, "substitution is not allowed in finalDefault attribute");

+			}

+

+			//3. id must be of type ID

+			XmlSchemaUtil.CompileID(Id, this, info.IDCollection, handler);

+

+			//4. targetNamespace should be of type anyURI or absent

+			if(TargetNamespace != null)

+			{

+				if(!XmlSchemaUtil.CheckAnyUri(TargetNamespace))

+					error(handler, TargetNamespace+" is not a valid value for targetNamespace attribute of schema");

+				else

+					info.TargetNamespace = TargetNamespace;

+			}

+

+			//5. version should be of type normalizedString

+			if(!XmlSchemaUtil.CheckNormalizedString(Version))

+				error(handler, Version + "is not a valid value for version attribute of schema");

+

+			//6. xml:lang must be a language

+			if(!XmlSchemaUtil.CheckLanguage(Language))

+				error(handler, Language + " is not a valid language");

+

+			// elementFormDefault defaults to UnQualified

+			if(ElementFormDefault != XmlSchemaForm.Qualified)

+				info.ElementFormDefault = XmlSchemaForm.Unqualified;

+			else

+				info.ElementFormDefault = XmlSchemaForm.Qualified;

+

+			// attributeFormDefault defaults to UnQualified

+			if(AttributeFormDefault != XmlSchemaForm.Qualified)

+				info.AttributeFormDefault = XmlSchemaForm.Unqualified;

+			else

+				info.AttributeFormDefault = XmlSchemaForm.Qualified;

+

+			if(FinalDefault == XmlSchemaDerivationMethod.All)

+				info.FinalDefault = XmlSchemaDerivationMethod.All;

+			else // If finalDefault is None, info's finalDefault is set to empty

+				info.FinalDefault = (FinalDefault & (XmlSchemaDerivationMethod.Extension | XmlSchemaDerivationMethod.Restriction));

+

+			if(BlockDefault == XmlSchemaDerivationMethod.All)

+				info.BlockDefault = XmlSchemaDerivationMethod.All;

+			else // If finalDefault is None, info's blockDefault is set to empty

+				info.BlockDefault = (blockDefault & (XmlSchemaDerivationMethod.Extension |

+					XmlSchemaDerivationMethod.Restriction | XmlSchemaDerivationMethod.Substitution));

+

+			// Compile the content of this schema

+			foreach(XmlSchemaObject obj in Includes)

+			{

+				if(obj is XmlSchemaExternal)

+				{

+					//FIXME: Kuch to karo! (Do Something ;)

+				}

+				else

+				{

+					error(handler,"Object of Type "+obj.GetType().Name+" is not valid in Includes Property of XmlSchema");

+				}

+			}

+			foreach(XmlSchemaObject obj in Items)

+			{

+				if(obj is XmlSchemaAnnotation)

+				{

+					int numerr = ((XmlSchemaAnnotation)obj).Compile(handler,info);

+					errorCount += numerr;

+					if( numerr == 0)

+					{

+						//FIXME: What PSVI set do we add this to?

+					}

+				}

+				else if(obj is XmlSchemaAttribute)

+				{

+					XmlSchemaAttribute attr = (XmlSchemaAttribute) obj;

+					attr.parentIsSchema = true;

+					int numerr = attr.Compile(handler,info);

+					errorCount += numerr;					

+					if(numerr == 0)

+					{

+						Attributes.Add(attr.QualifiedName, attr);

+					}

+				}

+				else if(obj is XmlSchemaAttributeGroup)

+				{

+					XmlSchemaAttributeGroup attrgrp = (XmlSchemaAttributeGroup) obj;

+					int numerr = attrgrp.Compile(handler,info);

+					errorCount += numerr;					

+					if(numerr == 0)

+					{

+						AttributeGroups.Add(attrgrp.QualifiedName, attrgrp);

+					}

+				}

+				else if(obj is XmlSchemaComplexType)

+				{

+					XmlSchemaComplexType ctype = (XmlSchemaComplexType) obj;

+					ctype.istoplevel = true;

+					int numerr = ctype.Compile(handler,info);

+					errorCount += numerr;					

+					if(numerr == 0)

+					{

+						schemaTypes.Add(ctype.QualifiedName, ctype);

+					}

+				}

+				else if(obj is XmlSchemaSimpleType)

+				{

+					XmlSchemaSimpleType stype = (XmlSchemaSimpleType) obj;

+					stype.islocal = false; //This simple type is toplevel

+					int numerr = stype.Compile(handler,info);

+					errorCount += numerr;					

+					if(numerr == 0)

+					{

+						SchemaTypes.Add(stype.QualifiedName, stype);

+					}

+				}

+				else if(obj is XmlSchemaElement)

+				{

+					XmlSchemaElement elem = (XmlSchemaElement) obj;

+					elem.parentIsSchema = true;

+					int numerr = elem.Compile(handler,info);

+					errorCount += numerr;					

+					if(numerr == 0)

+					{

+						Elements.Add(elem.QualifiedName,elem);

+					}

+				}

+				else if(obj is XmlSchemaGroup)

+				{

+					XmlSchemaGroup grp = (XmlSchemaGroup) obj;

+					int numerr = grp.Compile(handler,info);

+					errorCount += numerr;					

+					if(numerr == 0)

+					{

+						Groups.Add(grp.QualifiedName,grp);

+					}

+				}

+				else if(obj is XmlSchemaNotation)

+				{

+					XmlSchemaNotation ntn = (XmlSchemaNotation) obj;

+					int numerr = ntn.Compile(handler,info);

+					errorCount += numerr;					

+					if(numerr == 0)

+					{

+						Notations.Add(ntn.QualifiedName, ntn);

+					}

+				}

+				else

+				{

+					ValidationHandler.RaiseValidationError(handler,this,

+						"Object of Type "+obj.GetType().Name+" is not valid in Item Property of Schema");

+				}

+			}

+			Validate(handler);

+		}

+

+		#endregion

+

+		[MonoTODO]

+		private void Validate(ValidationEventHandler handler)

+		{

+			info.SchemaTypes = SchemaTypes;

+

+			foreach(XmlSchemaAttribute attr in Attributes.Values)

+			{

+				attr.Validate(handler, info);

+			}

+			foreach(XmlSchemaAttributeGroup attrgrp in AttributeGroups.Values)

+			{

+				attrgrp.Validate(handler);

+			}

+			foreach(XmlSchemaType type in SchemaTypes.Values)

+			{

+				if(type is XmlSchemaComplexType)

+				{

+					((XmlSchemaComplexType)type).Validate(handler);

+				}

+				else

+					((XmlSchemaSimpleType)type).Validate(handler, info);

+			}

+			foreach(XmlSchemaElement elem in Elements.Values)

+			{

+				elem.Validate(handler);

+			}

+			foreach(XmlSchemaGroup grp in Groups.Values)

+			{

+				grp.Validate(handler);

+			}

+			foreach(XmlSchemaNotation ntn in Notations.Values)

+			{

+				ntn.Validate(handler);

+			}

+		}

+

+

+		#region Read 

+

+		public static XmlSchema Read(TextReader reader, ValidationEventHandler validationEventHandler)

+		{

+			return Read(new XmlTextReader(reader),validationEventHandler);

+		}

+		public static XmlSchema Read(Stream stream, ValidationEventHandler validationEventHandler)

+		{

+			return Read(new XmlTextReader(stream),validationEventHandler);

+		}

+

+		public static XmlSchema Read(XmlReader rdr, ValidationEventHandler validationEventHandler)

+		{

+			//XmlSerializer xser = new XmlSerializer(typeof(XmlSchema));

+			//return (XmlSchema) xser.Deserialize(reader);

+			XmlSchemaReader reader = new XmlSchemaReader(rdr, validationEventHandler);

+

+			while(reader.ReadNextElement())

+			{

+				switch(reader.NodeType)

+				{

+					case XmlNodeType.Element:

+						if(reader.LocalName == "schema")

+						{

+							XmlSchema schema = new XmlSchema();

+							

+							schema.LineNumber = reader.LineNumber;

+							schema.LinePosition = reader.LinePosition;

+							schema.SourceUri = reader.BaseURI;

+

+							ReadAttributes(schema, reader, validationEventHandler);

+							//IsEmptyElement does not behave properly if reader is

+							//positioned at an attribute.

+							reader.MoveToElement();

+							if(!reader.IsEmptyElement)

+							{

+								ReadContent(schema, reader, validationEventHandler);

+							}

+							return schema;

+						}

+						else

+						{

+							//Schema can't be generated. Throw an exception

+							throw new XmlSchemaException("The root element must be schema", null);

+						}

+					default:

+						error(validationEventHandler, "This should never happen. XmlSchema.Read 1 ",null);

+						break;

+				}

+			}

+			throw new XmlSchemaException("The top level schema must have namespace "+XmlSchema.Namespace, null);

+		}

+

+		private static void ReadAttributes(XmlSchema schema, XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			Exception ex;

+

+			reader.MoveToElement();

+			while(reader.MoveToNextAttribute())

+			{

+				switch(reader.Name)

+				{

+					case "attributeFormDefault" :

+						schema.attributeFormDefault = XmlSchemaUtil.ReadFormAttribute(reader,out ex);

+						if(ex != null)

+							error(h, reader.Value + " is not a valid value for attributeFormDefault.", ex);

+						break;

+					case "blockDefault" :

+						schema.blockDefault = XmlSchemaUtil.ReadDerivationAttribute(reader,out ex, "blockDefault");

+						if(ex != null)

+							warn(h, ex.Message, ex);

+						break;

+					case "elementFormDefault":

+						schema.elementFormDefault = XmlSchemaUtil.ReadFormAttribute(reader, out ex);

+						if(ex != null)

+							error(h, reader.Value + " is not a valid value for elementFormDefault.", ex);

+						break;

+					case "finalDefault":

+						schema.finalDefault = XmlSchemaUtil.ReadDerivationAttribute(reader, out ex, "finalDefault");

+						if(ex != null)

+							warn(h, ex.Message , ex);

+						break;

+					case "id":

+						schema.id = reader.Value;

+						break;

+					case "targetNamespace":

+						schema.targetNamespace = reader.Value;

+						break;

+					case "version":

+						schema.version = reader.Value;

+						break;

+					case "xml:lang":

+						schema.language = reader.Value;

+						break;

+					default:

+						if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+							error(h, reader.Name + " attribute is not allowed in schema element",null);

+						else

+						{

+							XmlSchemaUtil.ReadUnhandledAttribute(reader,schema);

+						}

+						break;

+				}

+			}

+		}

+

+		private static void ReadContent(XmlSchema schema, XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			reader.MoveToElement();

+			if(reader.LocalName != "schema" && reader.NamespaceURI != XmlSchema.Namespace && reader.NodeType != XmlNodeType.Element)

+				error(h, "UNREACHABLE CODE REACHED: Method: Schema.ReadContent, " + reader.LocalName + ", " + reader.NamespaceURI,null);

+

+			//(include | import | redefine | annotation)*, 

+			//((simpleType | complexType | group | attributeGroup | element | attribute | notation | annotation)*

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchema.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1)

+				{

+					if(reader.LocalName == "include")

+					{

+						XmlSchemaInclude include = XmlSchemaInclude.Read(reader,h);

+						if(include != null) 

+							schema.includes.Add(include);

+						continue;

+					}

+					if(reader.LocalName == "import")

+					{

+						XmlSchemaImport import = XmlSchemaImport.Read(reader,h);

+						if(import != null)

+							schema.includes.Add(import);

+						continue;

+					}

+					if(reader.LocalName == "redefine")

+					{

+						XmlSchemaRedefine redefine = XmlSchemaRedefine.Read(reader,h);

+						if(redefine != null)

+							schema.includes.Add(redefine);

+						continue;

+					}

+					if(reader.LocalName == "annotation")

+					{

+						XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+						if(annotation != null)

+							schema.items.Add(annotation);

+						continue;

+					}

+				}

+				if(level <=2)

+				{

+					level = 2;

+					if(reader.LocalName == "simpleType")

+					{

+						XmlSchemaSimpleType stype = XmlSchemaSimpleType.Read(reader,h);

+						if(stype != null)

+							schema.items.Add(stype);

+						continue;

+					}

+					if(reader.LocalName == "complexType")

+					{

+						XmlSchemaComplexType ctype = XmlSchemaComplexType.Read(reader,h);

+						if(ctype != null)

+							schema.items.Add(ctype);

+						continue;

+					}

+					if(reader.LocalName == "group")

+					{

+						XmlSchemaGroup group = XmlSchemaGroup.Read(reader,h);

+						if(group != null)

+							schema.items.Add(group);

+						continue;

+					}

+					if(reader.LocalName == "attributeGroup")

+					{

+						XmlSchemaAttributeGroup attributeGroup = XmlSchemaAttributeGroup.Read(reader,h);

+						if(attributeGroup != null)

+							schema.items.Add(attributeGroup);

+						continue;

+					}

+					if(reader.LocalName == "element")

+					{

+						XmlSchemaElement element = XmlSchemaElement.Read(reader,h);

+						if(element != null)

+							schema.items.Add(element);

+						continue;

+					}

+					if(reader.LocalName == "attribute")

+					{

+						XmlSchemaAttribute attr = XmlSchemaAttribute.Read(reader,h);

+						if(attr != null)

+							schema.items.Add(attr);

+						continue;

+					}

+					if(reader.LocalName == "notation")

+					{

+						XmlSchemaNotation notation = XmlSchemaNotation.Read(reader,h);

+						if(notation != null)

+							schema.items.Add(notation);

+						continue;

+					}

+					if(reader.LocalName == "annotation")

+					{

+						XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+						if(annotation != null)

+							schema.items.Add(annotation);

+						continue;

+					}

+				}

+				reader.RaiseInvalidElementError();

+			}

+		}

+		#endregion

+

+		#region write

+

+		public void Write(System.IO.Stream stream)

+		{

+			Write(stream,null);

+		}

+		public void Write(System.IO.TextWriter writer)

+		{

+			Write(writer,null);

+		}

+		public void Write(System.Xml.XmlWriter writer)

+		{

+			Write(writer,null);

+		}

+		public void Write(System.IO.Stream stream, System.Xml.XmlNamespaceManager namespaceManager)

+		{

+			Write(new XmlTextWriter(stream,null),namespaceManager);

+		}

+		public void Write(System.IO.TextWriter writer, System.Xml.XmlNamespaceManager namespaceManager)

+		{

+			XmlTextWriter xwriter = new XmlTextWriter(writer);

+			xwriter.Formatting = Formatting.Indented;

+			Write(xwriter,namespaceManager);

+		}

+		public void Write(System.Xml.XmlWriter writer, System.Xml.XmlNamespaceManager namespaceManager)

+		{

+			if(Namespaces == null)

+			{

+				Namespaces = new XmlSerializerNamespaces();

+			}

+			//Add the xml schema namespace.

+			if(Namespaces.Count == 0)

+			{

+				Namespaces.Add("xs", XmlSchema.Namespace);

+				if (TargetNamespace != null && TargetNamespace != String.Empty)

+					Namespaces.Add("tns", TargetNamespace);

+			}

+			if(namespaceManager != null)

+			{

+				foreach(string name in namespaceManager)

+				{

+					//xml and xmlns namespaced are added by default in namespaceManager. 

+					//So we should ignore them

+					if(name!="xml" && name != "xmlns")

+						Namespaces.Add(name,namespaceManager.LookupNamespace(name));

+				}

+			}

+

+			XmlSerializer xser = new XmlSerializer(typeof(XmlSchema));

+			xser.Serialize(writer,this,Namespaces);

+			writer.Flush();

+		}

+		#endregion

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAll.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAll.cs
new file mode 100755
index 00000000000..21e52e7e5b6
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAll.cs
@@ -0,0 +1,165 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaAll.

+	/// </summary>

+	public class XmlSchemaAll : XmlSchemaGroupBase

+	{

+		private XmlSchemaObjectCollection items;

+		private static string xmlname = "all";

+

+		public XmlSchemaAll()

+		{

+			items = new XmlSchemaObjectCollection();

+		}

+

+		[XmlElement("element",typeof(XmlSchemaElement),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public override XmlSchemaObjectCollection Items 

+		{

+			get{ return items; }

+		}

+

+		/// <remarks>

+		/// 1. MaxOccurs must be one. (default is also one)

+		/// 2. MinOccurs must be zero or one.

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			//FIXME: Should we reset the values on error??

+			if(MaxOccurs != Decimal.One)

+				error(h,"maxOccurs must be 1");

+			if(MinOccurs != Decimal.One && MinOccurs != Decimal.Zero)

+				error(h,"minOccurs must be 0 or 1");

+

+			XmlSchemaUtil.CompileID(Id, this, info.IDCollection, h);

+

+			foreach(XmlSchemaObject obj in Items)

+			{

+				if(obj is XmlSchemaElement)

+				{

+					XmlSchemaElement elem = (XmlSchemaElement)obj;

+					if(elem.MaxOccurs != Decimal.One && elem.MaxOccurs != Decimal.Zero)

+					{

+						elem.error(h,"The {max occurs} of all the elements of 'all' must be 0 or 1. ");

+					}

+					errorCount += elem.Compile(h,info);

+				}

+				else

+				{

+					error(h,"XmlSchemaAll can only contain Items of type Element");

+				}

+			}

+

+			return errorCount;

+		}

+

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<all

+		//  id = ID

+		//  maxOccurs = 1 : 1

+		//  minOccurs = (0 | 1) : 1

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, element*)

+		//</all>

+		internal static XmlSchemaAll Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaAll all = new XmlSchemaAll();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaAll.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+			

+			all.LineNumber = reader.LineNumber;

+			all.LinePosition = reader.LinePosition;

+			all.SourceUri = reader.BaseURI;

+

+			//Read Attributes

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					all.Id = reader.Value;

+				}

+				else if(reader.Name == "maxOccurs")

+				{

+					try

+					{

+						all.MaxOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for maxOccurs",e);

+					}

+				}

+				else if(reader.Name == "minOccurs")

+				{

+					try

+					{

+						all.MinOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for minOccurs",e);

+					}

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for all",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,all);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return all;

+

+			//Content: (annotation?, element*)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaAll.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						all.Annotation = annotation;

+					continue;

+				}

+				if(level <=2 && reader.LocalName == "element")

+				{

+					level = 2;

+					XmlSchemaElement element = XmlSchemaElement.Read(reader,h);

+					if(element != null)

+						all.items.Add(element);

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return all;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAnnotated.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAnnotated.cs
new file mode 100755
index 00000000000..6631dfed480
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAnnotated.cs
@@ -0,0 +1,56 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Collections;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaAnnotated.

+	/// </summary>

+

+	public class XmlSchemaAnnotated : XmlSchemaObject

+	{

+		private XmlSchemaAnnotation annotation;

+		private string id;

+		private XmlAttribute[] unhandledAttributes;

+

+		public XmlSchemaAnnotated()

+		{}

+		

+		[System.Xml.Serialization.XmlAttribute("id")]

+		public string Id 

+		{ 

+			get{ return  id; } 

+			set{ id = value; } 

+		}

+		

+		[XmlElement("annotation",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaAnnotation Annotation 

+		{ 

+			get{ return  annotation; } 

+			set{ annotation = value; } 

+		}

+		

+		[XmlAnyAttribute]

+		public XmlAttribute[] UnhandledAttributes 

+		{ 

+			get

+			{

+				if(unhandledAttributeList != null)

+				{

+					unhandledAttributes = (XmlAttribute[]) unhandledAttributeList.ToArray(typeof(XmlAttribute));

+					unhandledAttributeList = null;

+				}

+				return unhandledAttributes;

+			}

+			set

+			{ 

+				unhandledAttributes = value; 

+				unhandledAttributeList = null;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAnnotation.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAnnotation.cs
new file mode 100755
index 00000000000..12fe3d26875
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAnnotation.cs
@@ -0,0 +1,145 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Collections;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaAnnotation.

+	/// </summary>

+	public class XmlSchemaAnnotation : XmlSchemaObject

+	{

+		private string id;

+		private XmlSchemaObjectCollection items;

+		private XmlAttribute[] unhandledAttributes;

+		private static string xmlname = "annotation";

+		public XmlSchemaAnnotation()

+		{

+			items = new XmlSchemaObjectCollection();

+		}

+

+		[System.Xml.Serialization.XmlAttribute("id")]

+		public string Id 

+		{

+			get{ return  id; } 

+			set{ id = value; }

+		}

+		

+		[XmlElement("appinfo",typeof(XmlSchemaAppInfo),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("documentation",typeof(XmlSchemaDocumentation),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Items

+		{

+			get{ return items; }

+		}

+		

+		[XmlAnyAttribute]

+		public XmlAttribute[] UnhandledAttributes 

+		{

+			get

+			{

+				if(unhandledAttributeList != null)

+				{

+					unhandledAttributes = (XmlAttribute[]) unhandledAttributeList.ToArray(typeof(XmlAttribute));

+					unhandledAttributeList = null;

+				}

+				return unhandledAttributes;

+			}

+			set

+			{ 

+				unhandledAttributes = value; 

+				unhandledAttributeList = null;

+			}

+		}

+

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			return 0;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return 0;

+		}

+

+		//<annotation

+		//  id = ID

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (appinfo | documentation)*

+		//</annotation>

+		internal static XmlSchemaAnnotation Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaAnnotation annotation = new XmlSchemaAnnotation();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaAnnotation.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			annotation.LineNumber = reader.LineNumber;

+			annotation.LinePosition = reader.LinePosition;

+			annotation.SourceUri = reader.BaseURI;

+

+			//Read Attributes

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					annotation.Id = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for annotation",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,annotation);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return annotation;

+

+			//Content: (appinfo | documentation)*

+			bool skip = false;

+			while(!reader.EOF)

+			{

+				if(skip) 

+					skip=false;

+				else 

+					reader.ReadNextElement();

+

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaAnnotation.Read, name="+reader.Name,null);

+					break;

+				}

+				if(reader.LocalName == "appinfo")

+				{

+					XmlSchemaAppInfo appinfo = XmlSchemaAppInfo.Read(reader,h,out skip);

+					if(appinfo != null)

+						annotation.items.Add(appinfo);

+					continue;

+				}

+				if(reader.LocalName == "documentation")

+				{

+					XmlSchemaDocumentation documentation = XmlSchemaDocumentation.Read(reader,h, out skip);

+					if(documentation != null)

+						annotation.items.Add(documentation);

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return annotation;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAny.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAny.cs
new file mode 100755
index 00000000000..6f652481669
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAny.cs
@@ -0,0 +1,192 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+using System.ComponentModel;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaAny.

+	/// </summary>

+	public class XmlSchemaAny : XmlSchemaParticle

+	{

+		private string nameSpace;

+		private XmlSchemaContentProcessing processing;

+		private static string xmlname = "any";

+

+		public XmlSchemaAny()

+		{

+		}

+

+		[System.Xml.Serialization.XmlAttribute("namespace")]

+		public string Namespace 

+		{

+			get{ return  nameSpace; } 

+			set{ nameSpace = value; }

+		}

+		

+		[DefaultValue(XmlSchemaContentProcessing.None)]

+		[System.Xml.Serialization.XmlAttribute("processContents")]

+		public XmlSchemaContentProcessing ProcessContents

+		{ 

+			get{ return processing; } 

+			set{ processing = value; }

+		}

+

+		/// <remarks>

+		/// 1. id must be of type ID

+		/// 2. namespace can have one of the following values:

+		///		a) ##any or ##other

+		///		b) list of anyURI and ##targetNamespace and ##local

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			errorCount = 0;

+

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			//define ##any=1,##other=2,##targetNamespace=4,##local=8,anyURI=16

+			int nscount = 0;

+			string[] nslist = XmlSchemaUtil.SplitList(Namespace);

+			foreach(string ns in nslist)

+			{

+				switch(ns)

+				{

+					case "##any": 

+						nscount |= 1;

+						break;

+					case "##other":

+						nscount |= 2;

+						break;

+					case "##targetNamespace":

+						nscount |= 4;

+						break;

+					case "##local":

+						nscount |= 8;

+						break;

+					default:

+						if(!XmlSchemaUtil.CheckAnyUri(ns))

+							error(h,"the namespace is not a valid anyURI");

+						else

+							nscount |= 16;

+						break;

+				}

+			}

+			if((nscount&1) == 1 && nscount != 1)

+				error(h,"##any if present must be the only namespace attribute");

+			if((nscount&2) == 2 && nscount != 2)

+				error(h,"##other if present must be the only namespace attribute");

+			

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<any

+		//  id = ID

+		//  maxOccurs =  (nonNegativeInteger | unbounded)  : 1

+		//  minOccurs = nonNegativeInteger : 1

+		//  namespace = ((##any | ##other) | List of (anyURI | (##targetNamespace | ##local)) )  : ##any

+		//  processContents = (lax | skip | strict) : strict

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</any>

+		internal static XmlSchemaAny Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaAny any = new XmlSchemaAny();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaAny.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			any.LineNumber = reader.LineNumber;

+			any.LinePosition = reader.LinePosition;

+			any.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					any.Id = reader.Value;

+				}

+				else if(reader.Name == "maxOccurs")

+				{

+					try

+					{

+						any.MaxOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for maxOccurs",e);

+					}

+				}

+				else if(reader.Name == "minOccurs")

+				{

+					try

+					{

+						any.MinOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for minOccurs", e);

+					}

+				}

+				else if(reader.Name == "namespace")

+				{

+					any.nameSpace = reader.Value;

+				}

+				else if(reader.Name == "processContents")

+				{

+					Exception innerex;

+					any.processing = XmlSchemaUtil.ReadProcessingAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for processContents",innerex);

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for any",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,any);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return any;

+			

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaAny.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						any.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return any;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAnyAttribute.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAnyAttribute.cs
new file mode 100755
index 00000000000..fb1a515e5ca
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAnyAttribute.cs
@@ -0,0 +1,169 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.ComponentModel;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaAnyAttribute.

+	/// </summary>

+	public class XmlSchemaAnyAttribute : XmlSchemaAnnotated

+	{

+		private string nameSpace;

+		private XmlSchemaContentProcessing processing;

+		private static string xmlname = "anyAttribute";

+

+		public XmlSchemaAnyAttribute()

+		{

+		}

+

+		[System.Xml.Serialization.XmlAttribute("namespace")]

+		public string Namespace 

+		{ 

+			get{ return nameSpace; } 

+			set{ nameSpace = value; } 

+		}

+		

+		[DefaultValue(XmlSchemaContentProcessing.None)]

+		[System.Xml.Serialization.XmlAttribute("processContents")]

+		public XmlSchemaContentProcessing ProcessContents 

+		{ 

+			get{ return processing; } 

+			set{ processing = value; }

+		}

+

+		/// <remarks>

+		/// 1. id must be of type ID

+		/// 2. namespace can have one of the following values:

+		///		a) ##any or ##other

+		///		b) list of anyURI and ##targetNamespace and ##local

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			errorCount = 0;

+

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			//define ##any=1,##other=2,##targetNamespace=4,##local=8,anyURI=16

+			int nscount = 0;

+			string[] nslist = XmlSchemaUtil.SplitList(Namespace);

+			foreach(string ns in nslist)

+			{

+				switch(ns)

+				{

+					case "##any": 

+						nscount |= 1;

+						break;

+					case "##other":

+						nscount |= 2;

+						break;

+					case "##targetNamespace":

+						nscount |= 4;

+						break;

+					case "##local":

+						nscount |= 8;

+						break;

+					default:

+						if(!XmlSchemaUtil.CheckAnyUri(ns))

+							error(h,"the namespace is not a valid anyURI");

+						else

+							nscount |= 16;

+						break;

+				}

+			}

+			if((nscount&1) == 1 && nscount != 1)

+				error(h,"##any if present must be the only namespace attribute");

+			if((nscount&2) == 2 && nscount != 2)

+				error(h,"##other if present must be the only namespace attribute");

+			

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		//<anyAttribute

+		//  id = ID

+		//  namespace = ((##any | ##other) | List of (anyURI | (##targetNamespace | ##local)) )  : ##any

+		//  processContents = (lax | skip | strict) : strict

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</anyAttribute>

+		internal static XmlSchemaAnyAttribute Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaAnyAttribute any = new XmlSchemaAnyAttribute();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaAnyAttribute.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			any.LineNumber = reader.LineNumber;

+			any.LinePosition = reader.LinePosition;

+			any.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					any.Id = reader.Value;

+				}

+				else if(reader.Name == "namespace")

+				{

+					any.nameSpace = reader.Value;

+				}

+				else if(reader.Name == "processContents")

+				{

+					Exception innerex;

+					any.processing = XmlSchemaUtil.ReadProcessingAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for processContents",innerex);

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for anyAttribute",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,any);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return any;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaAnyAttribute.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						any.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}	

+			return any;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAppInfo.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAppInfo.cs
new file mode 100755
index 00000000000..da66837c504
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAppInfo.cs
@@ -0,0 +1,91 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaAppInfo.

+	/// </summary>

+	public class XmlSchemaAppInfo : XmlSchemaObject

+	{

+		private XmlNode[] markup;

+		private string source;

+

+		public XmlSchemaAppInfo()

+		{

+		}

+

+		[System.Xml.Serialization.XmlAttribute("source")]

+		public string Source 

+		{

+			get{ return  source; } 

+			set{ source = value; }

+		}

+

+		[XmlAnyElement]

+		[XmlText]

+		public XmlNode[] Markup 

+		{

+			get{ return  markup; }

+			set{ markup = value; }

+		}

+

+		//<appinfo

+		//  source = anyURI>

+		//  Content: ({any})*

+		//</appinfo>

+		internal static XmlSchemaAppInfo Read(XmlSchemaReader reader, ValidationEventHandler h, out bool skip)

+		{

+			skip = false;

+			XmlSchemaAppInfo appinfo = new XmlSchemaAppInfo();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != "appinfo")

+			{

+				error(h,"Should not happen :1: XmlSchemaAppInfo.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			appinfo.LineNumber = reader.LineNumber;

+			appinfo.LinePosition = reader.LinePosition;

+			appinfo.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "source")

+				{

+					appinfo.source = reader.Value;

+				}

+				else

+				{

+					error(h,reader.Name + " is not a valid attribute for appinfo",null);

+				}

+			}

+

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return appinfo;

+

+			//Content {any}*

+			//FIXME: This is a pure Quick Hack; There must be a another method;

+			XmlDocument xmldoc = new XmlDocument();

+			xmldoc.AppendChild(xmldoc.ReadNode(reader));

+			XmlNode root = xmldoc.FirstChild;

+			if(root != null && root.ChildNodes != null)

+			{

+				appinfo.Markup = new XmlNode[root.ChildNodes.Count];

+				for(int i=0;i<root.ChildNodes.Count;i++)

+				{

+					appinfo.Markup[i] = root.ChildNodes[i];

+				}

+			}

+			if(reader.NodeType == XmlNodeType.Element || reader.NodeType == XmlNodeType.EndElement)

+				skip = true;

+			return appinfo;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttribute.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttribute.cs
new file mode 100755
index 00000000000..a7e82b6db3f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttribute.cs
@@ -0,0 +1,435 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.ComponentModel;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaAttribute.

+	/// </summary>

+	public class XmlSchemaAttribute : XmlSchemaAnnotated

+	{

+		private object attributeType;

+		private string defaultValue;

+		private string fixedValue;

+		private XmlSchemaForm form;

+		private string name;

+		private XmlQualifiedName qualifiedName;

+		private XmlQualifiedName refName;

+		private XmlSchemaSimpleType schemaType;

+		private XmlQualifiedName schemaTypeName;

+		private XmlSchemaUse use;

+		//Compilation fields

+		internal bool parentIsSchema = false;

+		private static string xmlname = "attribute";

+

+		public XmlSchemaAttribute()

+		{

+			//FIXME: Docs says the default is optional.

+			//Whereas the MS implementation has default None.

+			form	= XmlSchemaForm.None;

+			use		= XmlSchemaUse.None;

+			schemaTypeName	= XmlQualifiedName.Empty;

+			qualifiedName	= XmlQualifiedName.Empty;

+			refName			= XmlQualifiedName.Empty;

+		}

+

+		// Properties

+		#region Properties

+

+		[DefaultValue(null)]

+		[System.Xml.Serialization.XmlAttribute("default")]

+		public string DefaultValue 

+		{

+			get{ return defaultValue;}

+			set

+			{ // Default Value and fixed Value are mutually exclusive

+				fixedValue = null;

+				defaultValue = value;

+			}

+		}

+

+		[DefaultValue(null)]

+		[System.Xml.Serialization.XmlAttribute("fixed")]

+		public string FixedValue 

+		{

+			get{ return fixedValue;}

+			set

+			{ // Default Value and fixed Value are mutually exclusive

+				defaultValue = null;

+				fixedValue = value;

+			}

+		}

+

+		[DefaultValue(XmlSchemaForm.None)]

+		[System.Xml.Serialization.XmlAttribute("form")]

+		public XmlSchemaForm Form 

+		{

+			get{ return form;}

+			set{ form = value;}

+		}

+

+		[System.Xml.Serialization.XmlAttribute("name")]

+		public string Name 

+		{

+			get{ return name;}

+			set

+			{

+				name  = value;

+			}

+		}

+

+		[System.Xml.Serialization.XmlAttribute("ref")]

+		public XmlQualifiedName RefName 

+		{

+			get{ return refName;}

+			set

+			{

+				refName = value; 

+			}

+		}

+		

+		[System.Xml.Serialization.XmlAttribute("type")]

+		public XmlQualifiedName SchemaTypeName 

+		{

+			get{ return schemaTypeName;}

+			set{ schemaTypeName = value;}

+		}

+

+		[XmlElement("simpleType",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaSimpleType SchemaType 

+		{

+			get{ return schemaType;}

+			set{ schemaType = value;}

+		}

+

+		[DefaultValue(XmlSchemaUse.None)]

+		[System.Xml.Serialization.XmlAttribute("use")]

+		public XmlSchemaUse Use 

+		{

+			get{ return use;}

+			set{ use = value;}

+		}

+

+		[XmlIgnore]

+		public XmlQualifiedName QualifiedName 

+		{

+			get{ return qualifiedName;}

+		}

+

+		[XmlIgnore]

+		public object AttributeType 

+		{ //FIXME: This is not correct. Is it?

+			get{ return attributeType; }

+		}

+

+		#endregion

+

+		/// <remarks>

+		/// For an attribute:

+		///  a) If the parent is schema 

+		///		1-5		are from <xs:complexType name="topLevelAttribute"> in the Schema for Schema

+		///		6-8		are from  "Constraints on XML Representations of Attribute Declarations"

+		///		9-10	are from "Attribute Declaration Schema Component"

+		///		11-16	are from "Constraints on Attribute Declaration Schema Components"

+		///		1. ref	must be absent

+		///		2. form must be absent

+		///		3. use	must be absent

+		///		4. name must be present and of type NCName

+		///		5. *NO CHECK REQUIRED* Only simple types and annotation are allowed as content

+		///		6. default and fixed must not both be present. 

+		///		7. *NO CHECK REQUIRED* If default and use are both present... (Not possible since use is absent)

+		///		8. type and <simpleType> must not both be present.

+		///		9. Target Namespace should be schema's targetnamespace or absent

+		///		10. Type Definiton coressponds to <simpletype> element, or type value, or absent

+		///		11. *TO UNDERSTAND* Missing Sub-components

+		///		12. value constraint must be of the same datatype as of type

+		///		13. if the type definition is ID then there should be no value constraint.

+		///		14. name must not be xmlns

+		///		15. Targetnamespace must not be xsi. This implies the target namespace of schema can't be xsi if toplevel attributes are used.

+		///		16. *Exception to rule 15* inbuilt attributes: xsi:nil, xsi:type, xsi:schemaLocation, xsi: noNamespaceSchemaLocation

+		///	b) If the parent is complextype and ref is not set

+		///		1. name must be present and of type NCName.

+		///		2. type and <simpleType> must not both be present.

+		///		3. default and fixed must not both be present. 

+		///     4. If default and use are both present, use must have the ·actual value· optional.

+		///		5. name must not be xmlns

+		///		6. Targetnamespace must not be xsi.

+		///		7. *Exception to rule 15* inbuilt attributes: xsi:nil, xsi:type, xsi:schemaLocation, xsi: noNamespaceSchemaLocation

+		///		8. If form has actual value qualified or the schema's formdefault is qualified, targetnamespace

+		///		   is same as schema's target namespace, otherwise absent.

+		///	c) if the parent is not schema and ref is set

+		///		1. name must not be present

+		///		2. all of <simpleType>, form and type must be absent. 

+		///		3. default and fixed must not both be present. 

+		///     4. If default and use are both present, use must have the ·actual value· optional.

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			errorCount = 0;

+			

+			if(parentIsSchema)//a

+			{

+				if(RefName!= null && !RefName.IsEmpty) // a.1

+					error(h,"ref must be absent in the top level <attribute>");

+				

+				if(Form != XmlSchemaForm.None)	// a.2

+					error(h,"form must be absent in the top level <attribute>");

+				

+				if(Use != XmlSchemaUse.None)		// a.3

+					error(h,"use must be absent in the top level <attribute>");

+

+				// TODO: a.10, a.11, a.12, a.13

+				CompileCommon(h,info, true);

+			}

+			else // local

+			{

+				//FIXME: How to Use of AttributeFormDefault????

+				if(RefName == null || RefName.IsEmpty)

+				{

+					//TODO: b.8

+					CompileCommon(h,info, true);

+				}

+				else

+				{

+					if(this.name != null)

+						error(h,"name must be absent if ref is present");

+					if(this.form != XmlSchemaForm.None)

+						error(h,"form must be absent if ref is present");

+					if(this.schemaType != null)

+						error(h,"simpletype must be absent if ref is present");

+					if(this.schemaTypeName != null && !this.schemaTypeName.IsEmpty)

+						error(h,"type must be absent if ref is present");

+					CompileCommon(h,info,false);

+				}

+			}

+

+			return errorCount;

+		}

+		

+		private void CompileCommon(ValidationEventHandler h, XmlSchemaInfo info, bool refIsNotPresent)

+		{

+			if(refIsNotPresent)

+			{

+				if(Name == null)	//a.4, b.1, 

+					error(h,"Required attribute name must be present");

+				else if(!XmlSchemaUtil.CheckNCName(Name)) // a.4.2, b1.2

+					error(h,"attribute name must be NCName");

+				else if(Name == "xmlns") // a.14 , b5

+					error(h,"attribute name must not be xmlns");

+				else

+					qualifiedName = new XmlQualifiedName(Name, info.TargetNamespace);	

+

+				if(SchemaType != null)

+				{

+					if(SchemaTypeName != null && !SchemaTypeName.IsEmpty) // a.8

+						error(h,"attribute can't have both a type and <simpleType> content");

+

+					errorCount += SchemaType.Compile(h,info); 

+				}

+

+				if(SchemaTypeName != null && !XmlSchemaUtil.CheckQName(SchemaTypeName))

+					error(h,SchemaTypeName+" is not a valid QName");

+			}

+			else

+			{

+				if(RefName == null || RefName.IsEmpty) 

+					error(h,"Error: Should Never Happen. refname must be present");

+				else

+					qualifiedName = RefName;

+			}

+

+			if(info.TargetNamespace == XmlSchema.InstanceNamespace && Name != "nil" && Name != "type" 

+				&& Name != "schemaLocation" && Name != "noNamespaceSchemaLocation") // a.15, a.16

+				error(h,"targetNamespace can't be " + XmlSchema.InstanceNamespace);

+

+			if(DefaultValue != null && FixedValue != null) // a.6, b.3, c.3

+				error(h,"default and fixed must not both be present in an Attribute");

+

+			if(DefaultValue != null && Use != XmlSchemaUse.None && Use != XmlSchemaUse.Optional)

+				error(h,"if default is present, use must be optional");

+

+			XmlSchemaUtil.CompileID(Id, this, info.IDCollection, h);

+		}

+

+		/// <summary>

+		/// Schema Component: 

+		///			QName, SimpleType, Scope, Default|Fixed, annotation

+		/// </summary>

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(isCompiled)

+				return errorCount;

+

+			//If Parent is schema:

+			if(parentIsSchema)

+			{

+				if(SchemaType != null)

+				{

+					errorCount += SchemaType.Validate(h, info);

+					attributeType = SchemaType;

+				}

+				else if(SchemaTypeName != null && !SchemaTypeName.IsEmpty)

+				{

+					//First Try to get a Inbuilt DataType

+					XmlSchemaDatatype dtype = XmlSchemaDatatype.GetType(SchemaTypeName);

+					if(dtype != null)

+					{

+						attributeType = dtype;

+					}

+					else

+					{

+						XmlSchemaObject obj = info.SchemaTypes[SchemaTypeName];

+

+						if(obj is XmlSchemaSimpleType)

+						{

+							XmlSchemaSimpleType stype = (XmlSchemaSimpleType) obj;

+							errorCount += stype.Validate(h, info);

+							attributeType = stype;

+						}

+						else if(attributeType == null)

+							error(h,"The type '"+ SchemaTypeName +"' is not defined in the schema");

+						else if(attributeType is XmlSchemaComplexType)

+							error(h,"An attribute can't have complexType Content");

+						else

+							error(h, "Should Never Happen. Illegal content in SchemaTypes");

+					}

+				}

+				else

+				{

+					error(h,"Should Never Happen. Attribute SimpleType Not set. Should have been caught in the Compile() phase");

+				}

+			}

+			else

+			{

+				//TODO: Local Attribute Validation

+			}

+			isCompiled = true;

+			return errorCount;

+		}

+		//<attribute

+		//  default = string

+		//  fixed = string

+		//  form = (qualified | unqualified)

+		//  id = ID

+		//  name = NCName

+		//  ref = QName

+		//  type = QName

+		//  use = (optional | prohibited | required) : optional

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (simpleType?))

+		//</attribute>

+		internal static XmlSchemaAttribute Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaAttribute attribute = new XmlSchemaAttribute();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaAttribute.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			attribute.LineNumber = reader.LineNumber;

+			attribute.LinePosition = reader.LinePosition;

+			attribute.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "default")

+				{

+					attribute.defaultValue = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					attribute.fixedValue = reader.Value;

+				}

+				else if(reader.Name == "form")

+				{

+					Exception innerex;

+					attribute.form = XmlSchemaUtil.ReadFormAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for form attribute", innerex);

+				}

+				else if(reader.Name == "id")

+				{

+					attribute.Id = reader.Value;

+				}

+				else if(reader.Name == "name")

+				{

+					attribute.name = reader.Value;

+				}

+				else if(reader.Name == "ref")

+				{

+					Exception innerex;

+					attribute.refName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for ref attribute",innerex);

+				}

+				else if(reader.Name == "type")

+				{

+					Exception innerex;

+					attribute.schemaTypeName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for type attribute",innerex);

+				}

+				else if(reader.Name == "use")

+				{

+					Exception innerex;

+					attribute.use = XmlSchemaUtil.ReadUseAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for use attribute", innerex);

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for attribute",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,attribute);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return attribute;

+

+			//  Content: (annotation?, (simpleType?))

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaAttribute.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						attribute.Annotation = annotation;

+					continue;

+				}

+				if(level <=2 && reader.LocalName == "simpleType")

+				{

+					level = 3;

+					XmlSchemaSimpleType stype = XmlSchemaSimpleType.Read(reader,h);

+					if(stype != null)

+						attribute.schemaType = stype;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return attribute;

+		}

+		

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttributeGroup.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttributeGroup.cs
new file mode 100755
index 00000000000..ab5d1da1afe
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttributeGroup.cs
@@ -0,0 +1,208 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaAttributeGroup.

+	/// </summary>

+	public class XmlSchemaAttributeGroup : XmlSchemaAnnotated

+	{

+		private XmlSchemaAnyAttribute any;

+		private XmlSchemaObjectCollection attributes;

+		private string name;

+		private XmlSchemaAttributeGroup redefined;

+		private XmlQualifiedName qualifiedName;

+		private static string xmlname = "attributeGroup";

+

+		public XmlSchemaAttributeGroup()

+		{

+			attributes  = new XmlSchemaObjectCollection();

+		}

+

+		[System.Xml.Serialization.XmlAttribute("name")]

+		public string Name 

+		{

+			get{ return name;}

+			set{ name = value;}

+		}

+

+		[XmlElement("attribute",typeof(XmlSchemaAttribute),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("attributeGroup",typeof(XmlSchemaAttributeGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Attributes 

+		{

+			get{ return attributes;}

+		}

+

+		[XmlElement("anyAttribute",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaAnyAttribute AnyAttribute 

+		{

+			get{ return any;}

+			set{ any = value;}

+		}

+

+		//Undocumented property

+		[XmlIgnore]

+		public XmlSchemaAttributeGroup RedefinedAttributeGroup 

+		{

+			get{ return redefined;}

+		}

+

+		[XmlIgnore]

+		internal XmlQualifiedName QualifiedName 

+		{

+			get{ return qualifiedName;}

+		}

+

+		/// <remarks>

+		/// An Attribute group can only be defined as a child of XmlSchema or in XmlSchemaRedefine.

+		/// The other attributeGroup has type XmlSchemaAttributeGroupRef.

+		///  1. Name must be present

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			errorCount = 0;

+

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			if(this.Name == null) //1

+				error(h,"Name is required in top level simpletype");

+			else if(!XmlSchemaUtil.CheckNCName(this.Name)) // b.1.2

+				error(h,"name attribute of a simpleType must be NCName");

+			else

+				this.qualifiedName = new XmlQualifiedName(this.Name,info.TargetNamespace);

+			

+			if(this.AnyAttribute != null)

+			{

+				errorCount += this.AnyAttribute.Compile(h,info);

+			}

+			

+			foreach(XmlSchemaObject obj in Attributes)

+			{

+				if(obj is XmlSchemaAttribute)

+				{

+					XmlSchemaAttribute attr = (XmlSchemaAttribute) obj;

+					errorCount += attr.Compile(h, info);

+				}

+				else if(obj is XmlSchemaAttributeGroupRef)

+				{

+					XmlSchemaAttributeGroupRef gref = (XmlSchemaAttributeGroupRef) obj;

+					errorCount += gref.Compile(h, info);

+				}

+				else

+				{

+					error(h,"invalid type of object in Attributes property");

+				}

+			}

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		//<attributeGroup

+		//  id = ID

+		//  name = NCName

+		//  ref = QName // Not present in this class.

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, ((attribute | attributeGroup)*, anyAttribute?))

+		//</attributeGroup>

+		internal static XmlSchemaAttributeGroup Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaAttributeGroup attrgrp = new XmlSchemaAttributeGroup();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaAttributeGroup.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			attrgrp.LineNumber = reader.LineNumber;

+			attrgrp.LinePosition = reader.LinePosition;

+			attrgrp.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					attrgrp.Id = reader.Value;

+				}

+				else if(reader.Name == "name")

+				{

+					attrgrp.name = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for attributeGroup in this context",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,attrgrp);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return attrgrp;

+

+			//Content: 1.annotation?, 2.(attribute | attributeGroup)*, 3.anyAttribute?

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaAttributeGroup.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						attrgrp.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2)

+				{

+					if(reader.LocalName == "attribute")

+					{

+						level = 2;

+						XmlSchemaAttribute attr = XmlSchemaAttribute.Read(reader,h);

+						if(attr != null)

+							attrgrp.Attributes.Add(attr);

+						continue;

+					}

+					if(reader.LocalName == "attributeGroup")

+					{

+						level = 2;

+						XmlSchemaAttributeGroupRef attr = XmlSchemaAttributeGroupRef.Read(reader,h);

+						if(attr != null)

+							attrgrp.attributes.Add(attr);

+						continue;

+					}

+				}

+				if(level <= 3 && reader.LocalName == "anyAttribute")

+				{

+					level = 4;

+					XmlSchemaAnyAttribute anyattr = XmlSchemaAnyAttribute.Read(reader,h);

+					if(anyattr != null)

+						attrgrp.AnyAttribute = anyattr;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return attrgrp;

+		}

+		

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttributeGroupRef.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttributeGroupRef.cs
new file mode 100755
index 00000000000..0fb4a4261aa
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaAttributeGroupRef.cs
@@ -0,0 +1,126 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaAttributeGroupRef.

+	/// </summary>

+	public class XmlSchemaAttributeGroupRef : XmlSchemaAnnotated

+	{

+		private XmlQualifiedName refName;

+		private static string xmlname = "attributeGroup";

+		public XmlSchemaAttributeGroupRef()

+		{

+			refName = XmlQualifiedName.Empty;

+		}

+		

+		[System.Xml.Serialization.XmlAttribute("ref")]

+		public XmlQualifiedName RefName 

+		{

+			get{ return  refName; }

+			set{ refName = value; }

+		}

+

+		/// <remarks>

+		/// 1. ref must be present

+		/// 2. The element must be empty. ?? FIXME: Is this correct or annotation is permitted?

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			errorCount = 0;

+			if(RefName == null || RefName.IsEmpty)

+				error(h, "ref must be present");

+			else if(!XmlSchemaUtil.CheckQName(RefName))

+				error(h, "ref must be a valid qname");

+

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+//			if(this.Annotation != null)

+//				error(h, "attributegroup with a ref can't have any content");

+			

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		//<attributeGroup

+		//  id = ID

+		//  ref = QName

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</attributeGroup>

+		internal static XmlSchemaAttributeGroupRef Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaAttributeGroupRef attrgrp = new XmlSchemaAttributeGroupRef();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaAttributeGroupRef.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			attrgrp.LineNumber = reader.LineNumber;

+			attrgrp.LinePosition = reader.LinePosition;

+			attrgrp.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					attrgrp.Id = reader.Value;

+				}

+				else if(reader.Name == "ref")

+				{

+					Exception innerex;

+					attrgrp.refName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for ref attribute",innerex);

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for attributeGroup in this context",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,attrgrp);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return attrgrp;

+			int level = 1;

+

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaAttributeGroupRef.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						attrgrp.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return attrgrp;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaChoice.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaChoice.cs
new file mode 100755
index 00000000000..040de9d9719
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaChoice.cs
@@ -0,0 +1,203 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaAll.

+	/// </summary>

+	public class XmlSchemaChoice : XmlSchemaGroupBase

+	{

+		private XmlSchemaObjectCollection items;

+		private static string xmlname = "choice";

+

+		public XmlSchemaChoice()

+		{

+			items = new XmlSchemaObjectCollection();

+		}

+

+		[XmlElement("element",typeof(XmlSchemaElement),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("group",typeof(XmlSchemaGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("choice",typeof(XmlSchemaChoice),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("sequence",typeof(XmlSchemaSequence),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("any",typeof(XmlSchemaAny),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public override XmlSchemaObjectCollection Items 

+		{

+			get{ return items; }

+		}

+

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			//FIXME: Should we reset the values

+			if(MinOccurs > MaxOccurs)

+				error(h,"minOccurs must be less than or equal to maxOccurs");

+

+			XmlSchemaUtil.CompileID(Id, this, info.IDCollection, h);

+

+			foreach(XmlSchemaObject obj in Items)

+			{

+				if(obj is XmlSchemaElement)

+				{

+					errorCount += ((XmlSchemaElement)obj).Compile(h,info);

+				}

+				else if(obj is XmlSchemaGroupRef)

+				{

+					errorCount += ((XmlSchemaGroupRef)obj).Compile(h,info);

+				}

+				else if(obj is XmlSchemaChoice)

+				{

+					errorCount += ((XmlSchemaChoice)obj).Compile(h,info);

+				}

+				else if(obj is XmlSchemaSequence)

+				{

+					errorCount += ((XmlSchemaSequence)obj).Compile(h,info);

+				}

+				else if(obj is XmlSchemaAny)

+				{

+					errorCount += ((XmlSchemaAny)obj).Compile(h,info);

+				}

+			}

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<choice

+		//  id = ID

+		//  maxOccurs =  (nonNegativeInteger | unbounded)  : 1

+		//  minOccurs = nonNegativeInteger : 1

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (element | group | choice | sequence | any)*)

+		//</choice>

+		internal static XmlSchemaChoice Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaChoice choice = new XmlSchemaChoice();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaChoice.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			choice.LineNumber = reader.LineNumber;

+			choice.LinePosition = reader.LinePosition;

+			choice.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					choice.Id = reader.Value;

+				}

+				else if(reader.Name == "maxOccurs")

+				{

+					try

+					{

+						choice.MaxOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for maxOccurs",e);

+					}

+				}

+				else if(reader.Name == "minOccurs")

+				{

+					try

+					{

+						choice.MinOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for minOccurs",e);

+					}

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for choice",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,choice);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return choice;

+

+			//  Content: (annotation?, (element | group | choice | sequence | any)*)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaChoice.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						choice.Annotation = annotation;

+					continue;

+				}

+				if(level <=2)

+				{

+					if(reader.LocalName == "element")

+					{

+						level = 2;

+						XmlSchemaElement element = XmlSchemaElement.Read(reader,h);

+						if(element != null)

+							choice.items.Add(element);

+						continue;

+					}

+					if(reader.LocalName == "group")

+					{

+						level = 2;

+						XmlSchemaGroupRef group = XmlSchemaGroupRef.Read(reader,h);

+						if(group != null)

+							choice.items.Add(group);

+						continue;

+					}

+					if(reader.LocalName == "choice")

+					{

+						level = 2;

+						XmlSchemaChoice ch = XmlSchemaChoice.Read(reader,h);

+						if(ch != null)

+							choice.items.Add(ch);

+						continue;

+					}

+					if(reader.LocalName == "sequence")

+					{

+						level = 2;

+						XmlSchemaSequence sequence = XmlSchemaSequence.Read(reader,h);

+						if(sequence != null)

+							choice.items.Add(sequence);

+						continue;

+					}

+					if(reader.LocalName == "any")

+					{

+						level = 2;

+						XmlSchemaAny any = XmlSchemaAny.Read(reader,h);

+						if(any != null)

+							choice.items.Add(any);

+						continue;

+					}

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return choice;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollection.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollection.cs
new file mode 100755
index 00000000000..c4ed836b0e1
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollection.cs
@@ -0,0 +1,118 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Collections;

+using System.Xml;

+

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaCollection.

+	/// </summary>

+	public sealed class XmlSchemaCollection : ICollection, IEnumerable

+	{

+		//private fields

+		private Hashtable htable;

+		private XmlNameTable ntable;

+

+		[MonoTODO]

+		public XmlSchemaCollection()

+		{

+			htable = new Hashtable();

+			ntable = new NameTable();

+		}

+		public XmlSchemaCollection(XmlNameTable nametable)

+		{

+			htable = new Hashtable();

+			ntable = nametable;

+		}

+

+		//properties

+		public int Count 

+		{ 

+			get

+			{ 

+				return this.htable.Count; 

+			}

+		}

+		public XmlNameTable NameTable 

+		{ 

+			get

+			{

+				return this.ntable;

+			}

+		}

+		public XmlSchema this[ string ns ] 

+		{ 

+			get

+			{

+				return (XmlSchema) this.htable[ns];

+			}

+		}

+

+		// Events

+		public event ValidationEventHandler ValidationEventHandler;

+

+		// Methods

+		[MonoTODO]

+		public XmlSchema Add(string ns, XmlReader reader)

+		{

+			return null;

+		}

+		[MonoTODO]

+		public XmlSchema Add(string ns, string uri)

+		{

+			return null;

+		}

+		[MonoTODO]

+		public XmlSchema Add(XmlSchema schema)

+		{

+			return null;

+		}

+

+		public void Add(XmlSchemaCollection schema)

+		{

+			XmlSchemaCollectionEnumerator xenum = schema.GetEnumerator();

+			while(xenum.MoveNext())

+			{

+				this.Add(xenum.Current);

+			}

+		}

+

+		public bool Contains(string ns)

+		{

+			return this.htable.Contains(ns);

+		}

+		public bool Contains(XmlSchema schema)

+		{

+			return this.htable.Contains(schema.TargetNamespace); 

+		}

+		public void CopyTo(XmlSchema[] array, int index)

+		{

+

+		}

+		public XmlSchemaCollectionEnumerator GetEnumerator()

+		{

+			return new XmlSchemaCollectionEnumerator(this.htable);

+		}

+		

+		//assembly Methods

+		[MonoTODO]

+		void ICollection.CopyTo(Array array, int index)

+		{

+		}

+		bool ICollection.IsSynchronized

+		{

+			get { return false; }

+		}

+		IEnumerator IEnumerable.GetEnumerator()

+		{

+			return this.htable.GetEnumerator();

+		}

+		Object ICollection.SyncRoot

+		{

+			get { return this; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollectionEnumerator.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollectionEnumerator.cs
new file mode 100755
index 00000000000..3130c3094ac
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaCollectionEnumerator.cs
@@ -0,0 +1,47 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Collections;

+

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaCollectionEnumerator.

+	/// </summary>

+	public sealed class XmlSchemaCollectionEnumerator : IEnumerator

+	{

+		private IDictionaryEnumerator xenum;

+		internal XmlSchemaCollectionEnumerator(Hashtable htable)

+		{

+			this.xenum = htable.GetEnumerator();

+		}

+		// Properties

+		public XmlSchema Current 

+		{ 

+			get

+			{

+				return (XmlSchema) xenum.Current; 

+			}

+		}

+		// Methods

+		public bool MoveNext()

+		{

+			return xenum.MoveNext();

+		}

+

+		//Explicit Interface implementation

+		bool IEnumerator.MoveNext()

+		{

+			return xenum.MoveNext();

+		}

+		void IEnumerator.Reset()

+		{

+			xenum.Reset();

+		}

+		object IEnumerator.Current

+		{

+			get{return (XmlSchema) xenum.Current;}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexContent.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexContent.cs
new file mode 100755
index 00000000000..45b07b3b1f0
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexContent.cs
@@ -0,0 +1,162 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaComplexContent.

+	/// </summary>

+	public class XmlSchemaComplexContent : XmlSchemaContentModel

+	{

+		private XmlSchemaContent content;

+		private bool isMixed;

+		private static string xmlname = "complexContent";

+

+		public XmlSchemaComplexContent()

+		{}

+

+		[System.Xml.Serialization.XmlAttribute("mixed")]

+		public bool IsMixed 

+		{

+			get{ return  isMixed; } 

+			set{ isMixed = value; }

+		}

+

+		[XmlElement("restriction",typeof(XmlSchemaComplexContentRestriction),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("extension",typeof(XmlSchemaComplexContentExtension),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public override XmlSchemaContent Content 

+		{

+			get{ return  content; } 

+			set{ content = value; }

+		}

+

+		/// <remarks>

+		/// 1. Content must be present

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(Content == null)

+			{

+				error(h, "Content must be present in a complexContent");

+			}

+			else

+			{

+				if(Content is XmlSchemaComplexContentRestriction)

+				{

+					XmlSchemaComplexContentRestriction xscr = (XmlSchemaComplexContentRestriction) Content;

+					errorCount += xscr.Compile(h,info);

+				}

+				else if(Content is XmlSchemaComplexContentExtension)

+				{

+					XmlSchemaComplexContentExtension xsce = (XmlSchemaComplexContentExtension) Content;

+					errorCount += xsce.Compile(h,info);

+				}

+				else

+					error(h,"complexContent can't have any value other than restriction or extention");

+			}

+

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<complexContent

+		//  id = ID

+		//  mixed = boolean

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (restriction | extension))

+		//</complexContent>

+		internal static XmlSchemaComplexContent Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaComplexContent complex = new XmlSchemaComplexContent();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaComplexContent.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			complex.LineNumber = reader.LineNumber;

+			complex.LinePosition = reader.LinePosition;

+			complex.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					complex.Id = reader.Value;

+				}

+				else if(reader.Name == "mixed")

+				{

+					Exception innerex;

+					complex.isMixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h,reader.Value + " is an invalid value for mixed",innerex);

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for complexContent",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,complex);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return complex;

+			//Content: (annotation?, (restriction | extension))

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaComplexContent.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						complex.Annotation = annotation;

+					continue;

+				}

+				if(level <=2)

+				{

+					if(reader.LocalName == "restriction")

+					{

+						level = 3;

+						XmlSchemaComplexContentRestriction restriction = XmlSchemaComplexContentRestriction.Read(reader,h);

+						if(restriction != null)

+							complex.content = restriction;

+						continue;

+					}

+					if(reader.LocalName == "extension")

+					{

+						level = 3;

+						XmlSchemaComplexContentExtension extension = XmlSchemaComplexContentExtension.Read(reader,h);

+						if(extension != null)

+							complex.content = extension;

+						continue;

+					}

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return complex;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexContentExtension.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexContentExtension.cs
new file mode 100755
index 00000000000..4deced9326a
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexContentExtension.cs
@@ -0,0 +1,254 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaComplexContentExtension.

+	/// </summary>

+	public class XmlSchemaComplexContentExtension : XmlSchemaContent

+	{

+		private XmlSchemaAnyAttribute any;

+		private XmlSchemaObjectCollection attributes;

+		private XmlQualifiedName baseTypeName;

+		private XmlSchemaParticle particle;

+		private static string xmlname = "extension";

+

+		public XmlSchemaComplexContentExtension()

+		{

+			attributes = new XmlSchemaObjectCollection();

+			baseTypeName = XmlQualifiedName.Empty;

+		}

+		

+		[System.Xml.Serialization.XmlAttribute("base")]

+		public XmlQualifiedName BaseTypeName 

+		{

+			get{ return  baseTypeName; }

+			set{ baseTypeName = value; }

+		}

+

+		[XmlElement("group",typeof(XmlSchemaGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("all",typeof(XmlSchemaAll),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("choice",typeof(XmlSchemaChoice),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("sequence",typeof(XmlSchemaSequence),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaParticle Particle

+		{

+			get{ return  particle; }

+			set{ particle = value; }

+		}

+

+		[XmlElement("attribute",typeof(XmlSchemaAttribute),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("attributeGroup",typeof(XmlSchemaAttributeGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Attributes 

+		{

+			get{ return attributes; }

+		}

+

+		[XmlElement("anyAttribute",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaAnyAttribute AnyAttribute 

+		{

+			get{ return any; }

+			set{ any = value;}

+		}

+

+		/// <remarks>

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(BaseTypeName == null || BaseTypeName.IsEmpty)

+			{

+				error(h, "base must be present and a QName");

+			}

+			else if(!XmlSchemaUtil.CheckQName(BaseTypeName))

+				error(h,"BaseTypeName is not a valid XmlQualifiedName");

+			

+			if(this.AnyAttribute != null)

+			{

+				errorCount += AnyAttribute.Compile(h,info);

+			}

+

+			foreach(XmlSchemaObject obj in Attributes)

+			{

+				if(obj is XmlSchemaAttribute)

+				{

+					XmlSchemaAttribute attr = (XmlSchemaAttribute) obj;

+					errorCount += attr.Compile(h,info);

+				}

+				else if(obj is XmlSchemaAttributeGroupRef)

+				{

+					XmlSchemaAttributeGroupRef atgrp = (XmlSchemaAttributeGroupRef) obj;

+					errorCount += atgrp.Compile(h,info);

+				}

+				else

+					error(h,obj.GetType() +" is not valid in this place::ComplexConetnetExtension");

+			}

+			

+			if(Particle != null)

+			{

+				if(Particle is XmlSchemaGroupRef)

+				{

+					errorCount += ((XmlSchemaGroupRef)Particle).Compile(h,info);

+				}

+				else if(Particle is XmlSchemaAll)

+				{

+					errorCount += ((XmlSchemaAll)Particle).Compile(h,info);

+				}

+				else if(Particle is XmlSchemaChoice)

+				{

+					errorCount += ((XmlSchemaChoice)Particle).Compile(h,info);

+				}

+				else if(Particle is XmlSchemaSequence)

+				{

+					errorCount += ((XmlSchemaSequence)Particle).Compile(h,info);

+				}

+			}

+			

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<extension

+		//  base = QName

+		//  id = ID

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, ((group | all | choice | sequence)?, ((attribute | attributeGroup)*, anyAttribute?)))

+		//</extension>

+		internal static XmlSchemaComplexContentExtension Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaComplexContentExtension extension = new XmlSchemaComplexContentExtension();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaComplexContentExtension.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			extension.LineNumber = reader.LineNumber;

+			extension.LinePosition = reader.LinePosition;

+			extension.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "base")

+				{

+					Exception innerex;

+					extension.baseTypeName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for base attribute",innerex);

+				}

+				else if(reader.Name == "id")

+				{

+					extension.Id = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for extension",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,extension);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return extension;

+			//Content: 1. annotation?, 

+			//			(2.(group | all | choice | sequence)?, (3.(attribute | attributeGroup)*, 4.anyAttribute?)))

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaComplexContentExtension.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						extension.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2)

+				{

+					if(reader.LocalName == "group")

+					{

+						level = 3;

+						XmlSchemaGroupRef group = XmlSchemaGroupRef.Read(reader,h);

+						if(group != null)

+							extension.particle = group;

+						continue;

+					}

+					if(reader.LocalName == "all")

+					{

+						level = 3;

+						XmlSchemaAll all = XmlSchemaAll.Read(reader,h);

+						if(all != null)

+							extension.particle = all;

+						continue;

+					}

+					if(reader.LocalName == "choice")

+					{

+						level = 3;

+						XmlSchemaChoice choice = XmlSchemaChoice.Read(reader,h);

+						if(choice != null)

+							extension.particle = choice;

+						continue;

+					}

+					if(reader.LocalName == "sequence")

+					{

+						level = 3;

+						XmlSchemaSequence sequence = XmlSchemaSequence.Read(reader,h);

+						if(sequence != null)

+							extension.particle = sequence;

+						continue;

+					}

+				}

+				if(level <= 3)

+				{

+					if(reader.LocalName == "attribute")

+					{

+						level = 3;

+						XmlSchemaAttribute attr = XmlSchemaAttribute.Read(reader,h);

+						if(attr != null)

+							extension.Attributes.Add(attr);

+						continue;

+					}

+					if(reader.LocalName == "attributeGroup")

+					{

+						level = 3;

+						XmlSchemaAttributeGroupRef attr = XmlSchemaAttributeGroupRef.Read(reader,h);

+						if(attr != null)

+							extension.attributes.Add(attr);

+						continue;

+					}

+				}

+				if(level <= 4 && reader.LocalName == "anyAttribute")

+				{

+					level = 5;

+					XmlSchemaAnyAttribute anyattr = XmlSchemaAnyAttribute.Read(reader,h);

+					if(anyattr != null)

+						extension.AnyAttribute = anyattr;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return extension;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexContentRestriction.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexContentRestriction.cs
new file mode 100755
index 00000000000..e744a3a47c0
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexContentRestriction.cs
@@ -0,0 +1,256 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaComplexContentRestriction.

+	/// </summary>

+	public class XmlSchemaComplexContentRestriction : XmlSchemaContent

+	{

+		private XmlSchemaAnyAttribute any;

+		private XmlSchemaObjectCollection attributes;

+		private XmlQualifiedName baseTypeName;

+		private XmlSchemaParticle particle;

+		private static string xmlname = "restriction";

+

+		public XmlSchemaComplexContentRestriction()

+		{

+			baseTypeName = XmlQualifiedName.Empty;

+			attributes	 = new XmlSchemaObjectCollection();

+		}

+

+		[System.Xml.Serialization.XmlAttribute("base")]

+		public XmlQualifiedName BaseTypeName 

+		{

+			get{ return  baseTypeName; }

+			set{ baseTypeName = value; }

+		}

+

+		[XmlElement("group",typeof(XmlSchemaGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("all",typeof(XmlSchemaAll),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("choice",typeof(XmlSchemaChoice),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("sequence",typeof(XmlSchemaSequence),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaParticle Particle 

+		{

+			get{ return  particle; }

+			set{ particle = value; }

+		}

+

+		[XmlElement("attribute",typeof(XmlSchemaAttribute),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("attributeGroup",typeof(XmlSchemaAttributeGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Attributes 

+		{

+			get{ return attributes; }

+		}

+

+		[XmlElement("anyAttribute",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaAnyAttribute AnyAttribute 

+		{

+			get{ return  any; }

+			set{ any = value; }

+		}

+

+		/// <remarks>

+		/// 1. base must be present

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(BaseTypeName == null || BaseTypeName.IsEmpty)

+			{

+				error(h, "base must be present and a QName");

+			}

+			else if(!XmlSchemaUtil.CheckQName(BaseTypeName))

+				error(h,"BaseTypeName is not a valid XmlQualifiedName");

+

+			if(this.AnyAttribute != null)

+			{

+				errorCount += AnyAttribute.Compile(h,info);

+			}

+

+			foreach(XmlSchemaObject obj in Attributes)

+			{

+				if(obj is XmlSchemaAttribute)

+				{

+					XmlSchemaAttribute attr = (XmlSchemaAttribute) obj;

+					errorCount += attr.Compile(h,info);

+				}

+				else if(obj is XmlSchemaAttributeGroupRef)

+				{

+					XmlSchemaAttributeGroupRef atgrp = (XmlSchemaAttributeGroupRef) obj;

+					errorCount += atgrp.Compile(h,info);

+				}

+				else

+					error(h,obj.GetType() +" is not valid in this place::ComplexContentRestriction");

+			}

+			

+			if(Particle != null)

+			{

+				if(Particle is XmlSchemaGroupRef)

+				{

+					errorCount += ((XmlSchemaGroupRef)Particle).Compile(h,info);

+				}

+				else if(Particle is XmlSchemaAll)

+				{

+					errorCount += ((XmlSchemaAll)Particle).Compile(h,info);

+				}

+				else if(Particle is XmlSchemaChoice)

+				{

+					errorCount += ((XmlSchemaChoice)Particle).Compile(h,info);

+				}

+				else if(Particle is XmlSchemaSequence)

+				{

+					errorCount += ((XmlSchemaSequence)Particle).Compile(h,info);

+				}

+			}

+			

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		//<restriction

+		//  base = QName

+		//  id = ID

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, ((group | all | choice | sequence)?, ((attribute | attributeGroup)*, anyAttribute?)))

+		//</restriction>

+		internal static XmlSchemaComplexContentRestriction Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaComplexContentRestriction restriction = new XmlSchemaComplexContentRestriction();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaComplexContentRestriction.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			restriction.LineNumber = reader.LineNumber;

+			restriction.LinePosition = reader.LinePosition;

+			restriction.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "base")

+				{

+					Exception innerex;

+					restriction.baseTypeName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for base attribute",innerex);

+				}

+				else if(reader.Name == "id")

+				{

+					restriction.Id = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for restriction",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,restriction);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return restriction;

+			//Content: 1. annotation?, 

+			//			(2.(group | all | choice | sequence)?, (3.(attribute | attributeGroup)*, 4.anyAttribute?)))

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaComplexContentRestriction.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						restriction.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2)

+				{

+					if(reader.LocalName == "group")

+					{

+						level = 3;

+						XmlSchemaGroupRef group = XmlSchemaGroupRef.Read(reader,h);

+						if(group != null)

+							restriction.particle = group;

+						continue;

+					}

+					if(reader.LocalName == "all")

+					{

+						level = 3;

+						XmlSchemaAll all = XmlSchemaAll.Read(reader,h);

+						if(all != null)

+							restriction.particle = all;

+						continue;

+					}

+					if(reader.LocalName == "choice")

+					{

+						level = 3;

+						XmlSchemaChoice choice = XmlSchemaChoice.Read(reader,h);

+						if(choice != null)

+							restriction.particle = choice;

+						continue;

+					}

+					if(reader.LocalName == "sequence")

+					{

+						level = 3;

+						XmlSchemaSequence sequence = XmlSchemaSequence.Read(reader,h);

+						if(sequence != null)

+							restriction.particle = sequence;

+						continue;

+					}

+				}

+				if(level <= 3)

+				{

+					if(reader.LocalName == "attribute")

+					{

+						level = 3;

+						XmlSchemaAttribute attr = XmlSchemaAttribute.Read(reader,h);

+						if(attr != null)

+							restriction.Attributes.Add(attr);

+						continue;

+					}

+					if(reader.LocalName == "attributeGroup")

+					{

+						level = 3;

+						XmlSchemaAttributeGroupRef attr = XmlSchemaAttributeGroupRef.Read(reader,h);

+						if(attr != null)

+							restriction.attributes.Add(attr);

+						continue;

+					}

+				}

+				if(level <= 4 && reader.LocalName == "anyAttribute")

+				{

+					level = 5;

+					XmlSchemaAnyAttribute anyattr = XmlSchemaAnyAttribute.Read(reader,h);

+					if(anyattr != null)

+						restriction.AnyAttribute = anyattr;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return restriction;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexType.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexType.cs
new file mode 100755
index 00000000000..113aff9f415
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaComplexType.cs
@@ -0,0 +1,463 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.ComponentModel;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaComplexType.

+	/// </summary>

+	public class XmlSchemaComplexType : XmlSchemaType

+	{

+		private XmlSchemaAnyAttribute anyAttribute;

+		private XmlSchemaObjectCollection attributes;

+		private XmlSchemaObjectTable attributeUses;

+		private XmlSchemaAnyAttribute attributeWildcard;

+		private XmlSchemaDerivationMethod block;

+		private XmlSchemaDerivationMethod blockResolved;

+		private XmlSchemaContentModel contentModel;

+		private XmlSchemaContentType contentType;

+		private XmlSchemaParticle contentTypeParticle;

+		private bool isAbstract;

+		private bool isMixed;

+		private XmlSchemaParticle particle;

+		

+		internal bool istoplevel = false;

+		private static string xmlname = "complexType";

+

+		public XmlSchemaComplexType()

+		{

+			attributes = new XmlSchemaObjectCollection();

+			block = XmlSchemaDerivationMethod.None;

+			attributeUses = new XmlSchemaObjectTable();

+		}

+

+		#region Attributes

+

+		[DefaultValue(false)]

+		[System.Xml.Serialization.XmlAttribute("abstract")]

+		public bool IsAbstract 

+		{

+			get{ return  isAbstract; }

+			set{ isAbstract = value; }

+		}

+		[DefaultValue(XmlSchemaDerivationMethod.None)]

+		[System.Xml.Serialization.XmlAttribute("block")]

+		public XmlSchemaDerivationMethod Block

+		{

+			get{ return  block; }

+			set{ block = value; }

+		}

+		[DefaultValue(false)]

+		[System.Xml.Serialization.XmlAttribute("mixed")]

+		public override bool IsMixed

+		{

+			get{ return  isMixed; }

+			set{ isMixed = value; }

+		}

+		

+		#endregion

+		

+		#region Elements

+				

+		[XmlElement("simpleContent",typeof(XmlSchemaSimpleContent),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("complexContent",typeof(XmlSchemaComplexContent),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaContentModel ContentModel 

+		{

+			get{ return  contentModel; } 

+			set{ contentModel = value; }

+		}

+

+		//LAMESPEC: The default value for particle in Schema is of Type EmptyParticle (internal?)

+		[XmlElement("group",typeof(XmlSchemaGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("all",typeof(XmlSchemaAll),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("choice",typeof(XmlSchemaChoice),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("sequence",typeof(XmlSchemaSequence),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaParticle Particle 

+		{

+			get{ return  particle; } 

+			set{ particle = value; }

+		}

+

+		[XmlElement("attribute",typeof(XmlSchemaAttribute),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("attributeGroup",typeof(XmlSchemaAttributeGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Attributes 

+		{

+			get{ return attributes; }

+		}

+

+		[XmlElement("anyAttribute",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaAnyAttribute AnyAttribute 

+		{

+			get{ return  anyAttribute; }

+			set{ anyAttribute = value; }

+		}

+

+		#endregion

+

+		#region XmlIgnore

+		[XmlIgnore]

+		public XmlSchemaContentType ContentType 

+		{

+			get{ return contentType; }

+		}

+		[XmlIgnore]

+		public XmlSchemaParticle ContentTypeParticle 

+		{

+			get{ return contentTypeParticle; }

+		}

+		[XmlIgnore]

+		public XmlSchemaDerivationMethod BlockResolved 

+		{

+			get{ return blockResolved; }

+		}

+		[XmlIgnore]

+		public XmlSchemaObjectTable AttributeUses 

+		{

+			get{ return attributeUses; }

+		}

+		[XmlIgnore]

+		public XmlSchemaAnyAttribute AttributeWildcard 

+		{

+			get{ return attributeWildcard; }

+		}

+		#endregion

+

+		/// <remarks>

+		/// 1. If ContentModel is present, neither particle nor Attributes nor AnyAttribute can be present.

+		/// 2. If particle is present, 

+		/// a. For a topLevelComplexType

+		///		1. name must be present and type NCName

+		///		2. if block is #all, blockdefault is #all, else List of (extension | restriction)

+		///		3. if final is #all, finaldefault is #all, else List of (extension | restriction)

+		///	b. For a local Complex type 

+		///		1. abstract must be false

+		///		2. Name must be absent

+		///		3. final must be absent

+		///		4. block must be absent

+		///		

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(istoplevel)

+			{

+				if(this.Name == null || this.Name == string.Empty)

+					error(h,"name must be present in a top level complex type");

+				else if(!XmlSchemaUtil.CheckNCName(Name))

+					error(h,"name must be a NCName");

+				else

+					this.qName = new XmlQualifiedName(Name,info.TargetNamespace);

+				

+				if(Block != XmlSchemaDerivationMethod.None)

+				{

+					if(Block == XmlSchemaDerivationMethod.All)

+					{

+						blockResolved = XmlSchemaDerivationMethod.All;

+					}

+					else

+					{

+						//TODO: Check what all is not allowed

+						blockResolved = Block & (XmlSchemaDerivationMethod.Extension | XmlSchemaDerivationMethod.Restriction);

+					}

+				}

+				else

+				{

+					if(info.BlockDefault == XmlSchemaDerivationMethod.All)

+					{

+						blockResolved = XmlSchemaDerivationMethod.All;

+					}

+					else

+						blockResolved = info.BlockDefault & (XmlSchemaDerivationMethod.Extension | XmlSchemaDerivationMethod.Restriction);

+				}

+				if(Final != XmlSchemaDerivationMethod.None)

+				{

+					if(Final == XmlSchemaDerivationMethod.All)

+					{

+						finalResolved = XmlSchemaDerivationMethod.All;

+					}

+					else

+					{

+						//TODO: Check what all is not allowed

+						finalResolved = Final & (XmlSchemaDerivationMethod.Extension | XmlSchemaDerivationMethod.Restriction);

+					}

+				}

+				else

+				{

+					if(info.FinalDefault == XmlSchemaDerivationMethod.All)

+					{

+						finalResolved = XmlSchemaDerivationMethod.All;

+					}

+					else

+					{

+						finalResolved = info.BlockDefault & (XmlSchemaDerivationMethod.Extension | XmlSchemaDerivationMethod.Restriction);

+					}

+				}

+			}

+			else // Not Top Level

+			{

+				if(isAbstract)

+					error(h,"abstract must be false in a local complex type");

+				if(Name != null)

+					error(h,"name must be absent in a local complex type");

+				if(Final != XmlSchemaDerivationMethod.None)

+					error(h,"final must be absent in a local complex type");

+				if(block != XmlSchemaDerivationMethod.None)

+					error(h,"block must be absent in a local complex type");

+			}

+

+			if(ContentModel != null)

+			{

+				if(anyAttribute != null || Attributes.Count != 0 || Particle != null)

+					error(h,"attributes, particles or anyattribute is not allowed if ContentModel is present");

+

+				if(ContentModel is XmlSchemaSimpleContent)

+				{

+					XmlSchemaSimpleContent smodel = (XmlSchemaSimpleContent)ContentModel;

+					errorCount += smodel.Compile(h,info);

+				}

+				else if(ContentModel is XmlSchemaComplexContent)

+				{

+					XmlSchemaComplexContent cmodel = (XmlSchemaComplexContent)ContentModel;

+					errorCount += cmodel.Compile(h,info);

+				}

+			}

+			else

+			{

+				if(Particle is XmlSchemaGroupRef)

+				{

+					XmlSchemaGroupRef xsgr = (XmlSchemaGroupRef)Particle;

+					errorCount += xsgr.Compile(h,info);

+				}

+				else if(Particle is XmlSchemaAll)

+				{

+					XmlSchemaAll xsa = (XmlSchemaAll)Particle;

+					errorCount += xsa.Compile(h,info);

+				}

+				else if(Particle is XmlSchemaChoice)

+				{

+					XmlSchemaChoice xsc = (XmlSchemaChoice)Particle;

+					errorCount += xsc.Compile(h,info);

+				}

+				else if(Particle is XmlSchemaSequence)

+				{

+					XmlSchemaSequence xss = (XmlSchemaSequence)Particle;

+					errorCount += xss.Compile(h,info);

+				}

+

+				if(this.anyAttribute != null)

+				{

+					AnyAttribute.Compile(h,info);

+				}

+				foreach(XmlSchemaObject obj in Attributes)

+				{

+					if(obj is XmlSchemaAttribute)

+					{

+						XmlSchemaAttribute attr = (XmlSchemaAttribute) obj;

+						errorCount += attr.Compile(h,info);

+					}

+					else if(obj is XmlSchemaAttributeGroupRef)

+					{

+						XmlSchemaAttributeGroupRef atgrp = (XmlSchemaAttributeGroupRef) obj;

+						errorCount += atgrp.Compile(h,info);

+					}

+					else

+						error(h,obj.GetType() +" is not valid in this place::ComplexType");

+				}

+			}

+

+			XmlSchemaUtil.CompileID(Id, this, info.IDCollection, h);

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		//<complexType

+		//  abstract = boolean : false

+		//  block = (#all | List of (extension | restriction)) 

+		//  final = (#all | List of (extension | restriction)) 

+		//  id = ID

+		//  mixed = boolean : false

+		//  name = NCName

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (simpleContent | complexContent | ((group | all | choice | sequence)?, ((attribute | attributeGroup)*, anyAttribute?))))

+		//</complexType>

+		internal static XmlSchemaComplexType Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaComplexType ctype = new XmlSchemaComplexType();

+			reader.MoveToElement();

+			Exception innerex;

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaComplexType.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			ctype.LineNumber = reader.LineNumber;

+			ctype.LinePosition = reader.LinePosition;

+			ctype.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "abstract")

+				{

+					ctype.IsAbstract = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h,reader.Value + " is invalid value for abstract",innerex);

+				}

+				else if(reader.Name == "block")

+				{

+					ctype.block = XmlSchemaUtil.ReadDerivationAttribute(reader,out innerex, "block");

+					if(innerex != null)

+						warn(h,"some invalid values for block attribute were found",innerex);

+				}

+				else if(reader.Name == "final")

+				{

+					ctype.Final = XmlSchemaUtil.ReadDerivationAttribute(reader,out innerex, "block");

+					if(innerex != null)

+						warn(h,"some invalid values for final attribute were found",innerex);

+				}

+				else if(reader.Name == "id")

+				{

+					ctype.Id = reader.Value;

+				}

+				else if(reader.Name == "mixed")

+				{

+					ctype.isMixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h,reader.Value + " is invalid value for mixed",innerex);

+				}

+				else if(reader.Name == "name")

+				{

+					ctype.Name = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for complexType",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,ctype);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return ctype;

+

+			//Content: 1. annotation?, 

+			//		   2. simpleContent | 2. complexContent | 

+			//			(3.(group | all | choice | sequence)?, (4.(attribute | attributeGroup)*, 5.anyAttribute?)))

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaComplexType.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						ctype.Annotation = annotation;

+					continue;

+				}

+				if(level <=2)

+				{

+					if(reader.LocalName == "simpleContent")

+					{

+						level = 6;

+						XmlSchemaSimpleContent simple = XmlSchemaSimpleContent.Read(reader,h);

+						if(simple != null)

+							ctype.ContentModel = simple;

+						continue;

+					}

+					if(reader.LocalName == "complexContent")

+					{

+						level = 6;

+						XmlSchemaComplexContent complex = XmlSchemaComplexContent.Read(reader,h);

+						if(complex != null)

+							ctype.contentModel = complex;

+						continue;

+					}

+				}

+				if(level <= 3)

+				{

+					if(reader.LocalName == "group")

+					{

+						level = 4;

+						XmlSchemaGroupRef group = XmlSchemaGroupRef.Read(reader,h);

+						if(group != null)

+							ctype.particle = group;

+						continue;

+					}

+					if(reader.LocalName == "all")

+					{

+						level = 4;

+						XmlSchemaAll all = XmlSchemaAll.Read(reader,h);

+						if(all != null)

+							ctype.particle = all;

+						continue;

+					}

+					if(reader.LocalName == "choice")

+					{

+						level = 4;

+						XmlSchemaChoice choice = XmlSchemaChoice.Read(reader,h);

+						if(choice != null)

+							ctype.particle = choice;

+						continue;

+					}

+					if(reader.LocalName == "sequence")

+					{

+						level = 4;

+						XmlSchemaSequence sequence = XmlSchemaSequence.Read(reader,h);

+						if(sequence != null)

+							ctype.particle = sequence;

+						continue;

+					}

+				}

+				if(level <= 4)

+				{

+					if(reader.LocalName == "attribute")

+					{

+						level = 4;

+						XmlSchemaAttribute attr = XmlSchemaAttribute.Read(reader,h);

+						if(attr != null)

+							ctype.Attributes.Add(attr);

+						continue;

+					}

+					if(reader.LocalName == "attributeGroup")

+					{

+						level = 4;

+						XmlSchemaAttributeGroupRef attr = XmlSchemaAttributeGroupRef.Read(reader,h);

+						if(attr != null)

+							ctype.attributes.Add(attr);

+						continue;

+					}

+				}

+				if(level <= 5 && reader.LocalName == "anyAttribute")

+				{

+					level = 6;

+					XmlSchemaAnyAttribute anyattr = XmlSchemaAnyAttribute.Read(reader,h);

+					if(anyattr != null)

+						ctype.AnyAttribute = anyattr;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return ctype;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContent.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContent.cs
new file mode 100755
index 00000000000..ac32916437a
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContent.cs
@@ -0,0 +1,15 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaContent.

+	/// </summary>

+	public abstract class XmlSchemaContent : XmlSchemaAnnotated

+	{

+		protected XmlSchemaContent()

+		{}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContentModel.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContentModel.cs
new file mode 100755
index 00000000000..994dd211de5
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContentModel.cs
@@ -0,0 +1,19 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaContentModel.

+	/// </summary>

+	public abstract class XmlSchemaContentModel : XmlSchemaAnnotated

+	{

+		protected XmlSchemaContentModel()

+		{

+		}

+		[XmlIgnore]

+		public abstract XmlSchemaContent Content {get; set;}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContentProcessing.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContentProcessing.cs
new file mode 100755
index 00000000000..2cd60231a03
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContentProcessing.cs
@@ -0,0 +1,22 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaContentProcessing.

+	/// </summary>

+	public enum XmlSchemaContentProcessing 

+	{

+		[XmlIgnore]

+		None	= 0,

+		[XmlEnum("skip")]

+		Skip	= 1,

+		[XmlEnum("lax")]

+		Lax		= 2, 

+		[XmlEnum("strict")]

+		Strict	= 3, 

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContentType.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContentType.cs
new file mode 100755
index 00000000000..dc7bda2433e
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaContentType.cs
@@ -0,0 +1,17 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaContentType.

+	/// </summary>

+	public enum XmlSchemaContentType 

+	{

+		TextOnly	= 0, 

+		Empty		= 1, 

+		ElementOnly = 2, 

+		Mixed		= 3, 

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaDatatype.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaDatatype.cs
new file mode 100755
index 00000000000..778a9ef39ec
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaDatatype.cs
@@ -0,0 +1,30 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaDatatype.

+	/// </summary>

+	public abstract class XmlSchemaDatatype

+	{

+		protected XmlSchemaDatatype()

+		{

+		}

+		

+		public abstract XmlTokenizedType TokenizedType {  get; }

+		public abstract Type ValueType {  get; }

+

+		// Methods

+		public abstract object ParseValue(string s, 

+			XmlNameTable nameTable, XmlNamespaceManager nsmgr);

+

+		//TODO: This should return appropriate inbuilt type

+		internal static XmlSchemaDatatype GetType(XmlQualifiedName qname)

+		{

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaDerivationMethod.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaDerivationMethod.cs
new file mode 100755
index 00000000000..fcd63c899fe
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaDerivationMethod.cs
@@ -0,0 +1,31 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaDerivationMethod.

+	/// </summary>

+	[Flags]

+	public enum XmlSchemaDerivationMethod

+	{

+		[XmlEnum("")]

+		Empty		= 0x00000000, 

+		[XmlEnum("substitution")]

+		Substitution= 0x00000001, 

+		[XmlEnum("extension")]

+		Extension	= 0x00000002, 

+		[XmlEnum("restriction")]

+		Restriction	= 0x00000004, 

+		[XmlEnum("list")]

+		List		= 0x00000008, 

+		[XmlEnum("union")]

+		Union		= 0x00000010, 

+		[XmlEnum("#all")]

+		All			= 0x000000FF,

+		[XmlIgnore]

+		None		= 0x00000100, 

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaDocumentation.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaDocumentation.cs
new file mode 100755
index 00000000000..7788d6d685b
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaDocumentation.cs
@@ -0,0 +1,104 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaDocumentation.

+	/// </summary>

+	public class XmlSchemaDocumentation : XmlSchemaObject

+	{

+		private string language;

+		private XmlNode[] markup;

+		private string source;

+

+		public XmlSchemaDocumentation()

+		{

+		}

+

+		[XmlAnyElement]

+		[XmlText]

+		public XmlNode[] Markup 

+		{

+			get{ return  markup; }

+			set{ markup = value; }

+		}

+		

+		[System.Xml.Serialization.XmlAttribute("source")]

+		public string Source 

+		{

+			get{ return  source; } 

+			set{ source = value; }

+		}

+

+		[System.Xml.Serialization.XmlAttribute("xml:lang")]

+		public string Language 

+		{

+			get{ return  language; }

+			set{ language = value; }

+		}

+

+		//<documentation

+		//  source = anyURI

+		//  xml:lang = language>

+		//  Content: ({any})*

+		//</documentation>

+		internal static XmlSchemaDocumentation Read(XmlSchemaReader reader, ValidationEventHandler h, out bool skip)

+		{

+			skip = false;

+			XmlSchemaDocumentation doc = new XmlSchemaDocumentation();

+

+			reader.MoveToElement();

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != "documentation")

+			{

+				error(h,"Should not happen :1: XmlSchemaDocumentation.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			doc.LineNumber = reader.LineNumber;

+			doc.LinePosition = reader.LinePosition;

+			doc.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "source")

+				{

+					doc.source = reader.Value;

+				}

+				else if(reader.Name == "xml:lang")

+				{

+					doc.language = reader.Value;

+				}

+				else

+				{

+					error(h,reader.Name + " is not a valid attribute for documentation",null);

+				}

+			}

+

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return doc;

+

+			//Content {any}*

+			XmlDocument xmldoc = new XmlDocument();

+			xmldoc.AppendChild(xmldoc.ReadNode(reader));

+			XmlNode root = xmldoc.FirstChild;

+			if(root != null && root.ChildNodes != null)

+			{

+				doc.Markup = new XmlNode[root.ChildNodes.Count];

+				for(int i=0;i<root.ChildNodes.Count;i++)

+				{

+					doc.Markup[i] = root.ChildNodes[i];

+				}

+			}

+			if(reader.NodeType == XmlNodeType.Element || reader.NodeType == XmlNodeType.EndElement)

+				skip = true;

+

+			return doc;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs
new file mode 100755
index 00000000000..5f95fd66ef2
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaElement.cs
@@ -0,0 +1,625 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+using System.ComponentModel;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaElement.

+	/// </summary>

+	public class XmlSchemaElement : XmlSchemaParticle

+	{

+		private XmlSchemaDerivationMethod block;

+		private XmlSchemaDerivationMethod blockResolved;

+		private XmlSchemaObjectCollection constraints;

+		private string defaultValue;

+		private object elementType;

+		private XmlSchemaDerivationMethod final;

+		private XmlSchemaDerivationMethod finalResolved;

+		private string fixedValue;

+		private XmlSchemaForm form;

+		private bool isAbstract;

+		private bool isNillable;

+		private string name;

+		private XmlQualifiedName qName;

+		private XmlQualifiedName refName;

+		private XmlSchemaType schemaType;

+		private XmlQualifiedName schemaTypeName;

+		private XmlQualifiedName substitutionGroup;

+		internal bool parentIsSchema = false;

+		private string targetNamespace;

+		private string hash;

+

+		private static string xmlname = "element";

+

+		public XmlSchemaElement()

+		{

+			block = XmlSchemaDerivationMethod.None;

+			final = XmlSchemaDerivationMethod.None;

+			constraints = new XmlSchemaObjectCollection();

+			qName = XmlQualifiedName.Empty;

+			refName = XmlQualifiedName.Empty;

+			schemaTypeName = XmlQualifiedName.Empty;

+			substitutionGroup = XmlQualifiedName.Empty;

+			substitutionGroup = XmlQualifiedName.Empty;

+		}

+

+		#region Attributes

+		

+		[DefaultValue(false)]

+		[System.Xml.Serialization.XmlAttribute("abstract")]

+		public bool IsAbstract 

+		{

+			get{ return  isAbstract; }

+			set{ isAbstract = value; }

+		}

+

+		[DefaultValue(XmlSchemaDerivationMethod.None)]

+		[System.Xml.Serialization.XmlAttribute("block")]

+		public XmlSchemaDerivationMethod Block 

+		{

+			get{ return  block; }

+			set{ block = value; }

+		}

+		

+		[DefaultValue(null)]

+		[System.Xml.Serialization.XmlAttribute("default")]

+		public string DefaultValue 

+		{

+			get{ return  defaultValue; }

+			set{ defaultValue = value; }

+		}

+		

+		[DefaultValue(XmlSchemaDerivationMethod.None)]

+		[System.Xml.Serialization.XmlAttribute("final")]

+		public XmlSchemaDerivationMethod Final 

+		{

+			get{ return  final; }

+			set{ final = value; }

+		}

+

+		[DefaultValue(null)]

+		[System.Xml.Serialization.XmlAttribute("fixed")]

+		public string FixedValue 

+		{

+			get{ return  fixedValue; }

+			set{ fixedValue = value; }

+		}

+		[DefaultValue(XmlSchemaForm.None)]

+		[System.Xml.Serialization.XmlAttribute("form")]

+		public XmlSchemaForm Form 

+		{

+			get{ return  form; }

+			set{ form = value; }

+		}

+

+		[DefaultValue(null)]

+		[System.Xml.Serialization.XmlAttribute("name")]

+		public string Name 

+		{

+			get{ return  name; }

+			set{ name = value; }

+		}

+

+		[DefaultValue(false)]

+		[System.Xml.Serialization.XmlAttribute("nillable")]

+		public bool IsNillable 

+		{

+			get{ return  isNillable; }

+			set{ isNillable = value; }

+		}

+

+		[System.Xml.Serialization.XmlAttribute("ref")]

+		public XmlQualifiedName RefName 

+		{

+			get{ return  refName; }

+			set{ refName = value;}

+		}

+

+		[System.Xml.Serialization.XmlAttribute("substitutionGroup")]

+		public XmlQualifiedName SubstitutionGroup

+		{

+			get{ return  substitutionGroup; }

+			set{ substitutionGroup = value; }

+		}

+		

+		[System.Xml.Serialization.XmlAttribute("type")]

+		public XmlQualifiedName SchemaTypeName 

+		{

+			get{ return  schemaTypeName; }

+			set{ schemaTypeName = value; }

+		}

+

+		[XmlElement("simpleType",typeof(XmlSchemaSimpleType),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("complexType",typeof(XmlSchemaComplexType),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaType SchemaType 

+		{

+			get{ return  schemaType; }

+			set{ schemaType = value; }

+		}

+

+		[XmlElement("unique",typeof(XmlSchemaUnique),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("key",typeof(XmlSchemaKey),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("keyref",typeof(XmlSchemaKeyref),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Constraints 

+		{

+			get{ return constraints; }

+		}

+

+		[XmlIgnore]

+		public XmlQualifiedName QualifiedName 

+		{

+			get{ return qName; }

+		}

+

+		[XmlIgnore]

+		public object ElementType 

+		{

+			get{ return elementType; }

+		}

+		

+		[XmlIgnore]

+		public XmlSchemaDerivationMethod BlockResolved 

+		{

+			get{ return blockResolved; }

+		}

+		

+		[XmlIgnore]

+		public XmlSchemaDerivationMethod FinalResolved 

+		{

+			get{ return finalResolved; }

+		}

+

+		#endregion

+

+		/// <remarks>

+		/// a) If Element has parent as schema:

+		///		1. name must be present and of type NCName.

+		///		2. ref must be absent

+		///		3. form must be absent

+		///		4. minOccurs must be absent

+		///		5. maxOccurs must be absent

+		///	b) If Element has parent is not schema and ref is absent

+		///		1. name must be present and of type NCName.

+		///		2. if form equals qualified or form is absent and schema's formdefault is qualifed,

+		///		   targetNamespace is schema's targetnamespace else empty.

+		///		3. type and either <simpleType> or <complexType> are mutually exclusive

+		///		4. default and fixed must not both be present.

+		///		5. substitutiongroup must be absent

+		///		6. final must be absent

+		///		7. abstract must be absent

+		///	c) if the parent is not schema and ref is set

+		///		1. name must not be present

+		///		2. all of <simpleType>,<complexType>,  <key>, <keyref>, <unique>, nillable, 

+		///		   default, fixed, form, block and type,  must be absent.

+		///	    3. substitutiongroup is prohibited

+		///		4. final is prohibited

+		///		5. abstract is prohibited

+		///		6. default and fixed must not both be present.(Actually both are absent)

+		/// </remarks>	

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(this.defaultValue != null && this.fixedValue != null)

+				error(h,"both default and fixed can't be present");

+

+			if(parentIsSchema)

+			{

+				if(this.refName != null && !RefName.IsEmpty)

+					error(h,"ref must be absent");

+

+				if(this.name == null)	//b1

+					error(h,"Required attribute name must be present");

+				else if(!XmlSchemaUtil.CheckNCName(this.name)) // b1.2

+					error(h,"attribute name must be NCName");

+				else

+					this.qName = new XmlQualifiedName(this.name, info.TargetNamespace);

+				

+				if(form != XmlSchemaForm.None)

+					error(h,"form must be absent");

+				if(MinOccursString != null)

+					error(h,"minOccurs must be absent");

+				if(MaxOccursString != null)

+					error(h,"maxOccurs must be absent");

+

+				XmlSchemaDerivationMethod allfinal = (XmlSchemaDerivationMethod.Extension | XmlSchemaDerivationMethod.Restriction);

+				if(final == XmlSchemaDerivationMethod.All)

+					finalResolved = allfinal;

+				else if(final == XmlSchemaDerivationMethod.None)

+					finalResolved = info.BlockDefault & allfinal;

+				else 

+				{

+					if((final & ~allfinal) != 0)

+						warn(h,"some values for final are invalid in this context");

+					finalResolved = final & allfinal;

+				}

+

+				XmlSchemaDerivationMethod allblock = XmlSchemaDerivationMethod.Extension | 

+					XmlSchemaDerivationMethod.Restriction | XmlSchemaDerivationMethod.Substitution;

+

+				if(block == XmlSchemaDerivationMethod.All)

+					blockResolved = allblock;

+				else if(block == XmlSchemaDerivationMethod.None)

+					blockResolved = info.BlockDefault & allblock;

+				else

+				{

+					if((block & ~allblock) != 0)

+						warn(h,"Some of the values for block are invalid in this context");

+					blockResolved = block & allblock;

+				}

+

+				if(schemaType != null && schemaTypeName != null && !schemaTypeName.IsEmpty)

+				{

+					error(h,"both schemaType and content can't be present");

+				}

+

+				//Even if both are present, read both of them.

+				if(schemaType != null)

+				{

+					if(schemaType is XmlSchemaSimpleType)

+					{

+						errorCount += ((XmlSchemaSimpleType)schemaType).Compile(h,info);

+					}

+					else if(schemaType is XmlSchemaComplexType)

+					{

+						errorCount += ((XmlSchemaComplexType)schemaType).Compile(h,info);

+					}

+					else

+						error(h,"only simpletype or complextype is allowed");

+				}

+				if(schemaTypeName != null && !schemaTypeName.IsEmpty)

+				{

+					if(!XmlSchemaUtil.CheckQName(SchemaTypeName))

+						error(h,"SchemaTypeName must be an XmlQualifiedName");

+				}

+				if(SubstitutionGroup != null && !SubstitutionGroup.IsEmpty)

+				{

+					if(!XmlSchemaUtil.CheckQName(SubstitutionGroup))

+						error(h,"SubstitutionGroup must be a valid XmlQualifiedName");

+				}

+

+				foreach(XmlSchemaObject obj in constraints)

+				{

+					if(obj is XmlSchemaUnique)

+						errorCount += ((XmlSchemaUnique)obj).Compile(h,info);

+					else if(obj is XmlSchemaKey)

+						errorCount += ((XmlSchemaKey)obj).Compile(h,info);

+					else if(obj is XmlSchemaKeyref)

+						errorCount += ((XmlSchemaKeyref)obj).Compile(h,info);

+				}

+

+

+			}

+			else

+			{

+				if(substitutionGroup != null && !substitutionGroup.IsEmpty)

+					error(h,"substitutionGroup must be absent");

+				if(final != XmlSchemaDerivationMethod.None)

+					error(h,"final must be absent");

+				if(isAbstract)

+					error(h,"abstract must be absent");

+

+				//FIXME: Should we reset the values

+				if(MinOccurs > MaxOccurs)

+					error(h,"minOccurs must be less than or equal to maxOccurs");

+

+				if(refName == null || RefName.IsEmpty)

+				{

+					if(form == XmlSchemaForm.Qualified || (form == XmlSchemaForm.None && info.ElementFormDefault == XmlSchemaForm.Qualified))

+						this.targetNamespace = info.TargetNamespace;

+					else

+						this.targetNamespace = string.Empty;

+

+					if(this.name == null)	//b1

+						error(h,"Required attribute name must be present");

+					else if(!XmlSchemaUtil.CheckNCName(this.name)) // b1.2

+						error(h,"attribute name must be NCName");

+					else

+						this.qName = new XmlQualifiedName(this.name, this.targetNamespace);

+				

+					XmlSchemaDerivationMethod allblock = XmlSchemaDerivationMethod.Extension | 

+						XmlSchemaDerivationMethod.Restriction | XmlSchemaDerivationMethod.Substitution;

+

+					if(block == XmlSchemaDerivationMethod.All)

+						blockResolved = allblock;

+					else if(block == XmlSchemaDerivationMethod.None)

+						blockResolved = info.BlockDefault & allblock;

+					else

+					{

+						if((block & ~allblock) != 0)

+							warn(h,"Some of the values for block are invalid in this context");

+						blockResolved = block & allblock;

+					}

+

+					if(schemaType != null && schemaTypeName != null && !schemaTypeName.IsEmpty)

+					{

+						error(h,"both schemaType and content can't be present");

+					}

+

+					//Even if both are present, read both of them.

+					if(schemaType != null)

+					{

+						if(schemaType is XmlSchemaSimpleType)

+						{

+							errorCount += ((XmlSchemaSimpleType)schemaType).Compile(h,info);

+						}

+						else if(schemaType is XmlSchemaComplexType)

+						{

+							errorCount += ((XmlSchemaComplexType)schemaType).Compile(h,info);

+						}

+						else

+							error(h,"only simpletype or complextype is allowed");

+					}

+					if(schemaTypeName != null && !schemaTypeName.IsEmpty)

+					{

+						if(!XmlSchemaUtil.CheckQName(SchemaTypeName))

+							error(h,"SchemaTypeName must be an XmlQualifiedName");

+					}

+					if(SubstitutionGroup != null && !SubstitutionGroup.IsEmpty)

+					{

+						if(!XmlSchemaUtil.CheckQName(SubstitutionGroup))

+							error(h,"SubstitutionGroup must be a valid XmlQualifiedName");

+					}

+

+					foreach(XmlSchemaObject obj in constraints)

+					{

+						if(obj is XmlSchemaUnique)

+							errorCount += ((XmlSchemaUnique)obj).Compile(h,info);

+						else if(obj is XmlSchemaKey)

+							errorCount += ((XmlSchemaKey)obj).Compile(h,info);

+						else if(obj is XmlSchemaKeyref)

+							errorCount += ((XmlSchemaKeyref)obj).Compile(h,info);

+					}

+				}

+				else

+				{

+					if(!XmlSchemaUtil.CheckQName(RefName))

+						error(h,"RefName must be a XmlQualifiedName");

+

+					if(name != null)

+						error(h,"name must not be present when ref is present");

+					if(Constraints.Count != 0)

+						error(h,"key, keyref and unique must be absent");

+					if(isNillable)

+						error(h,"nillable must be absent");

+					if(defaultValue != null)

+						error(h,"default must be absent");

+					if(fixedValue != null)

+						error(h,"fixed must be null");

+					if(form != XmlSchemaForm.None)

+						error(h,"form must be absent");

+					if(block != XmlSchemaDerivationMethod.None)

+						error(h,"block must be absent");

+					if(schemaTypeName != null && !schemaTypeName.IsEmpty)

+						error(h,"type must be absent");

+					if(SchemaType != null)

+						error(h,"simpleType or complexType must be absent");

+				}

+			}

+			

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		//<element

+		//  abstract = boolean : false

+		//  block = (#all | List of (extension | restriction | substitution)) 

+		//  default = string

+		//  final = (#all | List of (extension | restriction)) 

+		//  fixed = string

+		//  form = (qualified | unqualified)

+		//  id = ID

+		//  maxOccurs = (nonNegativeInteger | unbounded)  : 1

+		//  minOccurs = nonNegativeInteger : 1

+		//  name = NCName

+		//  nillable = boolean : false

+		//  ref = QName

+		//  substitutionGroup = QName

+		//  type = QName

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, ((simpleType | complexType)?, (unique | key | keyref)*))

+		//</element>

+

+		internal static XmlSchemaElement Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaElement element = new XmlSchemaElement();

+			Exception innerex;

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaElement.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			element.LineNumber = reader.LineNumber;

+			element.LinePosition = reader.LinePosition;

+			element.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "abstract")

+				{

+					element.IsAbstract = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h,reader.Value + " is invalid value for abstract",innerex);

+				}

+				else if(reader.Name == "block")

+				{

+					element.block = XmlSchemaUtil.ReadDerivationAttribute(reader,out innerex, "block");

+					if(innerex != null)

+						warn(h,"some invalid values for block attribute were found",innerex);

+				}

+				else if(reader.Name == "default")

+				{

+					element.defaultValue = reader.Value;

+				}

+				else if(reader.Name == "final")

+				{

+					element.Final = XmlSchemaUtil.ReadDerivationAttribute(reader,out innerex, "block");

+					if(innerex != null)

+						warn(h,"some invalid values for final attribute were found",innerex);

+				}

+				else if(reader.Name == "fixed")

+				{

+					element.fixedValue = reader.Value;

+				}

+				else if(reader.Name == "form")

+				{

+					element.form = XmlSchemaUtil.ReadFormAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h,reader.Value + " is an invalid value for form attribute",innerex);

+				}

+				else if(reader.Name == "id")

+				{

+					element.Id = reader.Value;

+				}

+				else if(reader.Name == "maxOccurs")

+				{

+					try

+					{

+						element.MaxOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for maxOccurs",e);

+					}

+				}

+				else if(reader.Name == "minOccurs")

+				{

+					try

+					{

+						element.MinOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for minOccurs",e);

+					}

+				}

+				else if(reader.Name == "name")

+				{

+					element.Name = reader.Value;

+				}

+				else if(reader.Name == "nillable")

+				{

+					element.IsNillable = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h,reader.Value + "is not a valid value for nillable",innerex);

+				}

+				else if(reader.Name == "ref")

+				{

+					element.refName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for ref attribute",innerex);

+				}

+				else if(reader.Name == "substitutionGroup")

+				{

+					element.substitutionGroup = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for substitutionGroup attribute",innerex);

+				}

+				else if(reader.Name == "type")

+				{

+					element.SchemaTypeName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for type attribute",innerex);

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for element",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,element);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return element;

+

+			//  Content: annotation?, 

+			//			(simpleType | complexType)?, 

+			//			(unique | key | keyref)*

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaElement.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						element.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2)

+				{

+					if(reader.LocalName == "simpleType")

+					{

+						level = 3;

+						XmlSchemaSimpleType simple = XmlSchemaSimpleType.Read(reader,h);

+						if(simple != null)

+							element.SchemaType = simple;

+						continue;

+					}

+					if(reader.LocalName == "complexType")

+					{

+						level = 3;

+						XmlSchemaComplexType complex = XmlSchemaComplexType.Read(reader,h);

+						if(complex != null)

+						{

+							element.SchemaType = complex;

+						}

+						continue;

+					}

+				}

+				if(level <= 3)

+				{

+					if(reader.LocalName == "unique")

+					{

+						level = 3;

+						XmlSchemaUnique unique = XmlSchemaUnique.Read(reader,h);

+						if(unique != null)

+							element.constraints.Add(unique);

+						continue;

+					}

+					else if(reader.LocalName == "key")

+					{

+						level = 3;

+						XmlSchemaKey key = XmlSchemaKey.Read(reader,h);

+						if(key != null)

+							element.constraints.Add(key);

+						continue;

+					}

+					else if(reader.LocalName == "keyref")

+					{

+						level = 3;

+						XmlSchemaKeyref keyref = XmlSchemaKeyref.Read(reader,h);

+						if(keyref != null)

+							element.constraints.Add(keyref);

+						continue;

+					}

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return element;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaEnumerationFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaEnumerationFacet.cs
new file mode 100755
index 00000000000..512b3c7d70a
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaEnumerationFacet.cs
@@ -0,0 +1,87 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaEnumerationFacet.

+	/// </summary>

+	public class XmlSchemaEnumerationFacet : XmlSchemaFacet

+	{

+		private static string xmlname = "enumeration";

+		public XmlSchemaEnumerationFacet()

+		{

+		}

+

+		//<enumeration

+		//  id = ID

+		//  value = anySimpleType

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</enumeration>

+		internal static XmlSchemaEnumerationFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaEnumerationFacet enumeration = new XmlSchemaEnumerationFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaEnumerationFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			enumeration.LineNumber = reader.LineNumber;

+			enumeration.LinePosition = reader.LinePosition;

+			enumeration.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					enumeration.Id = reader.Value;

+				}

+				else if(reader.Name == "value")

+				{

+					enumeration.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+xmlname,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,enumeration);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return enumeration;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaEnumerationFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						enumeration.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return enumeration;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaException.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaException.cs
new file mode 100755
index 00000000000..a34c4b2cd83
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaException.cs
@@ -0,0 +1,81 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Runtime.Serialization;

+

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaException.

+	/// </summary>

+	[Serializable]

+	public class XmlSchemaException : System.SystemException

+	{

+		//fields

+		private int lineNumber;

+		private int linePosition;

+		private XmlSchemaObject sourceObj;

+		private string sourceUri;

+

+		[MonoTODO ("sourceObj needs to be serialized")]

+		protected XmlSchemaException(SerializationInfo info, StreamingContext context)

+			: base (info, context)

+		{

+			this.lineNumber = info.GetInt32 ("lineNumber");

+			this.linePosition = info.GetInt32 ("linePosition");

+			this.sourceUri = info.GetString ("sourceUri");

+		}

+		

+		

+		internal XmlSchemaException(string message, int lineNumber, int linePosition,

+			XmlSchemaObject sourceObject, string sourceUri, Exception innerException)

+			: base(message, innerException)

+		{

+			this.lineNumber		= lineNumber;

+			this.linePosition	= linePosition;

+			this.sourceObj		= sourceObject;

+			this.sourceUri		= sourceUri;

+		}

+		internal XmlSchemaException(string message, XmlSchemaObject sourceObject,

+			Exception innerException)

+			: base(message, innerException)

+		{

+			this.lineNumber = sourceObject.LineNumber;

+			this.linePosition = sourceObject.LinePosition;

+			this.sourceObj	=	sourceObject;

+			this.sourceUri	=	sourceObject.SourceUri;

+		}

+

+		public XmlSchemaException(string message, Exception innerException)

+			: base(message,innerException){}

+

+		// Properties

+		public int LineNumber 

+		{ 

+			get{ return this.lineNumber;} 

+		}

+		public int LinePosition 

+		{ 

+			get{ return this.linePosition;} 

+		}

+		public XmlSchemaObject SourceSchemaObject 

+		{

+			get{ return this.sourceObj; } 

+		}

+		public string SourceUri 

+		{ 

+			get{ return this.sourceUri; } 

+		}

+

+		// Methods

+		[MonoTODO ("sourceObj needs to be serialized")]

+		public override void GetObjectData(SerializationInfo info, StreamingContext context)

+		{

+			base.GetObjectData (info, context);

+			info.AddValue ("lineNumber", lineNumber);

+			info.AddValue ("linePosition", linePosition);

+			info.AddValue ("SourceUri", sourceUri);

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaExternal.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaExternal.cs
new file mode 100755
index 00000000000..1f691587ea1
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaExternal.cs
@@ -0,0 +1,62 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+using System.Collections;

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaExternal.

+	/// </summary>

+	public abstract class XmlSchemaExternal : XmlSchemaObject

+	{

+		private string id;

+		private XmlSchema schema;

+		private string location;

+		private XmlAttribute[] unhandledAttributes;

+

+		protected XmlSchemaExternal()

+		{}

+		

+		[System.Xml.Serialization.XmlAttribute("schemaLocation")]

+		public string SchemaLocation 

+		{

+			get{ return  location; } 

+			set{ location = value; }

+		}

+

+		[XmlIgnore]

+		public XmlSchema Schema 

+		{

+			get{ return  schema; }

+			set{ schema = value; }

+		}

+

+		[System.Xml.Serialization.XmlAttribute("id")]

+		public string Id 

+		{

+			get{ return  id; }

+			set{ id = value; }

+		}

+

+		[XmlAnyAttribute]

+		public XmlAttribute[] UnhandledAttributes 

+		{

+			get

+			{

+				if(unhandledAttributeList != null)

+				{

+					unhandledAttributes = (XmlAttribute[]) unhandledAttributeList.ToArray(typeof(XmlAttribute));

+					unhandledAttributeList = null;

+				}

+				return unhandledAttributes;

+			}

+			set

+			{ 

+				unhandledAttributes = value; 

+				unhandledAttributeList = null;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaFacet.cs
new file mode 100755
index 00000000000..076bc74486d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaFacet.cs
@@ -0,0 +1,37 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+using System.ComponentModel;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaFacet.

+	/// </summary>

+	public abstract class XmlSchemaFacet : XmlSchemaAnnotated

+	{

+		private bool isFixed;

+		private string val;

+

+		protected XmlSchemaFacet()

+		{

+		}

+		

+		[System.Xml.Serialization.XmlAttribute("value")]

+		public string Value

+		{

+			get{ return  val; } 

+			set{ val = value; }

+		}

+

+		[DefaultValue(false)]

+		[System.Xml.Serialization.XmlAttribute("fixed")]

+		public virtual bool IsFixed 

+		{

+			get{ return  isFixed; }

+			set{ isFixed = value; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaForm.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaForm.cs
new file mode 100755
index 00000000000..8efb7e3d548
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaForm.cs
@@ -0,0 +1,19 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaForm.

+	/// </summary>

+	public enum XmlSchemaForm 

+	{

+		[XmlIgnore]

+		None = 0x00000000, 

+		[XmlEnum("qualified")]

+		Qualified = 0x00000001, 

+		[XmlEnum("unqualified")]

+		Unqualified = 0x00000002, 

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaFractionDigitsFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaFractionDigitsFacet.cs
new file mode 100755
index 00000000000..319d19fd8e3
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaFractionDigitsFacet.cs
@@ -0,0 +1,98 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaFractionDigitsFacet.

+	/// </summary>

+	public class XmlSchemaFractionDigitsFacet : XmlSchemaNumericFacet

+	{

+		private static string xmlname = "fractionDigits";

+

+		public XmlSchemaFractionDigitsFacet()

+		{

+		}

+

+		//<fractionDigits

+		//  fixed = boolean : false

+		//  id = ID

+		//  value = nonNegativeInteger

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</fractionDigits>

+		internal static XmlSchemaFractionDigitsFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaFractionDigitsFacet fraction = new XmlSchemaFractionDigitsFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaFractionDigitsFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			fraction.LineNumber = reader.LineNumber;

+			fraction.LinePosition = reader.LinePosition;

+			fraction.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					fraction.Id = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					Exception innerex;

+					fraction.IsFixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for fixed attribute",innerex);

+				}

+				else if(reader.Name == "value")

+				{

+					fraction.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+xmlname,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,fraction);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return fraction;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaFractionDigitsFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						fraction.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return fraction;

+		}	

+

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaGroup.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaGroup.cs
new file mode 100755
index 00000000000..9848d6ad319
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaGroup.cs
@@ -0,0 +1,195 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// refers to the named group

+	/// </summary>

+	public class XmlSchemaGroup : XmlSchemaAnnotated

+	{

+		private string name;

+		private XmlSchemaGroupBase particle;

+		private XmlQualifiedName qualifiedName;

+		

+		private static string xmlname = "group";

+

+		public XmlSchemaGroup()

+		{

+		}

+

+		[System.Xml.Serialization.XmlAttribute("name")]

+		public string Name 

+		{

+			get{ return  name; } 

+			set{ name = value; }

+		}

+

+		[XmlElement("all",typeof(XmlSchemaAll),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("choice",typeof(XmlSchemaChoice),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("sequence",typeof(XmlSchemaSequence),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaGroupBase Particle

+		{

+			get{ return  particle; }

+			set{ particle = value; }

+		}

+

+		[XmlIgnore]

+		internal XmlQualifiedName QualifiedName 

+		{

+			get{ return qualifiedName;}

+		}

+

+		// 1. name must be present

+		// 2. MinOccurs & MaxOccurs of the Particle must be absent

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(Name == null)

+				error(h,"Required attribute name must be present");

+			else if(!XmlSchemaUtil.CheckNCName(this.name)) 

+				error(h,"attribute name must be NCName");

+			else

+				qualifiedName = new XmlQualifiedName(Name,info.TargetNamespace);

+

+			if(Particle == null)

+			{

+				error(h,"Particle is required");

+			}

+			else 

+			{

+				if(Particle.MaxOccursString != null)

+					Particle.error(h,"MaxOccurs must not be present when the Particle is a child of Group");

+				if(Particle.MinOccursString != null)

+					Particle.error(h,"MinOccurs must not be present when the Particle is a child of Group");

+			

+				if(Particle is XmlSchemaChoice)

+				{

+					errorCount += ((XmlSchemaChoice)Particle).Compile(h,info);

+				}

+				else if(Particle is XmlSchemaSequence)

+				{

+					errorCount += ((XmlSchemaSequence)Particle).Compile(h,info);

+				}

+				else if(Particle is XmlSchemaAll)

+				{

+					errorCount += ((XmlSchemaAll)Particle).Compile(h,info);

+				}

+				else

+				{

+					error(h,"only all,choice or sequence are allowed");

+				}

+			}

+			

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		//From the Errata

+		//<group 

+		//  id = ID

+		//  name = NCName

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (all | choice | sequence)?)

+		//</group>

+		internal static XmlSchemaGroup Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaGroup group = new XmlSchemaGroup();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaGroup.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			group.LineNumber = reader.LineNumber;

+			group.LinePosition = reader.LinePosition;

+			group.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					group.Id = reader.Value;

+				}

+				else if(reader.Name == "name")

+				{

+					group.name = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for group",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,group);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return group;

+

+//			 Content: (annotation?, (all | choice | sequence)?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaGroup.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						group.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2)

+				{

+					if(reader.LocalName == "all")

+					{

+						level = 3;

+						XmlSchemaAll all = XmlSchemaAll.Read(reader,h);

+						if(all != null)

+							group.Particle = all;

+						continue;

+					}

+					if(reader.LocalName == "choice")

+					{

+						level = 3;

+						XmlSchemaChoice choice = XmlSchemaChoice.Read(reader,h);

+						if(choice != null)

+							group.Particle = choice;

+						continue;

+					}

+					if(reader.LocalName == "sequence")

+					{

+						level = 3;

+						XmlSchemaSequence sequence = XmlSchemaSequence.Read(reader,h);

+						if(sequence != null)

+							group.Particle = sequence;

+						continue;

+					}

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return group;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaGroupBase.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaGroupBase.cs
new file mode 100755
index 00000000000..152e3b09f57
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaGroupBase.cs
@@ -0,0 +1,20 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaGroupBase.

+	/// </summary>

+	public abstract class XmlSchemaGroupBase : XmlSchemaParticle

+	{

+		protected XmlSchemaGroupBase()

+		{

+		}

+

+		[XmlIgnore]

+		public abstract XmlSchemaObjectCollection Items { get; }

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaGroupRef.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaGroupRef.cs
new file mode 100755
index 00000000000..31ceaf8e864
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaGroupRef.cs
@@ -0,0 +1,156 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaGroupRef.

+	/// </summary>

+	public class XmlSchemaGroupRef : XmlSchemaParticle

+	{

+		private XmlSchemaGroupBase particle;

+		private XmlQualifiedName refName;

+		private static string xmlname = "group";

+

+		public XmlSchemaGroupRef()

+		{

+			refName = XmlQualifiedName.Empty;

+		}

+		[System.Xml.Serialization.XmlAttribute("ref")]

+		public XmlQualifiedName RefName 

+		{

+			get{ return  refName; } 

+			set{ refName = value; }

+		}

+		[XmlIgnore]

+		public XmlSchemaGroupBase Particle 

+		{

+			get{ return particle; }

+		}

+		/// <remarks>

+		/// 1. RefName must be present

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			//FIXME: Should we reset the values

+			if(MinOccurs > MaxOccurs)

+				error(h,"minOccurs must be less than or equal to maxOccurs");

+

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			if(refName == null || refName.IsEmpty)

+			{

+				error(h,"ref must be present");

+			}

+			else if(!XmlSchemaUtil.CheckQName(RefName))

+				error(h, "RefName must be a valid XmlQualifiedName");

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		//	<group 

+		//		 id = ID 

+		//		 ref = QName

+		//		 minOccurs = ? : 1

+		//		 maxOccurs = ? : 1>

+		//		 Content: (annotation?)

+		//	</group>

+		internal static XmlSchemaGroupRef Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaGroupRef groupref = new XmlSchemaGroupRef();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaGroup.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			groupref.LineNumber = reader.LineNumber;

+			groupref.LinePosition = reader.LinePosition;

+			groupref.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					groupref.Id = reader.Value;

+				}

+				else if(reader.Name == "ref")

+				{

+					Exception innerex;

+					groupref.refName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for ref attribute",innerex);

+				}

+				else if(reader.Name == "maxOccurs")

+				{

+					try

+					{

+						groupref.MaxOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for maxOccurs",e);

+					}

+				}

+				else if(reader.Name == "minOccurs")

+				{

+					try

+					{

+						groupref.MinOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for minOccurs", e);

+					}

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for group",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,groupref);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return groupref;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaGroupRef.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						groupref.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return groupref;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaIdentityConstraint.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaIdentityConstraint.cs
new file mode 100755
index 00000000000..7e09ca0842d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaIdentityConstraint.cs
@@ -0,0 +1,91 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaIdentityConstraint.

+	/// </summary>

+	public class XmlSchemaIdentityConstraint : XmlSchemaAnnotated

+	{

+		private XmlSchemaObjectCollection fields;

+		private string name;

+		private XmlQualifiedName qName;

+		private XmlSchemaXPath selector;

+

+		public XmlSchemaIdentityConstraint()

+		{

+			fields = new XmlSchemaObjectCollection();

+			qName = XmlQualifiedName.Empty;

+		}

+		

+		[System.Xml.Serialization.XmlAttribute("name")]

+		public string Name 

+		{

+			get{ return  name; } 

+			set{ name = value; }

+		}

+

+		[XmlElement("selector",typeof(XmlSchemaXPath),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaXPath Selector 

+		{

+			get{ return  selector; } 

+			set{ selector = value; }

+		}

+

+		[XmlElement("field",typeof(XmlSchemaXPath),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Fields 

+		{

+			get{ return fields; }

+		}

+		

+		[XmlIgnore]

+		public XmlQualifiedName QualifiedName 

+		{

+			get{ return  qName; }

+		}

+		/// <remarks>

+		/// 1. name must be present

+		/// 2. selector and field must be present

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(Name == null)

+				error(h,"Required attribute name must be present");

+			else if(!XmlSchemaUtil.CheckNCName(this.name)) 

+				error(h,"attribute name must be NCName");

+			else

+				this.qName = new XmlQualifiedName(Name,info.TargetNamespace);

+

+			if(Selector == null)

+				error(h,"selector must be present");

+			else

+			{

+				errorCount += Selector.Compile(h,info);

+			}

+

+			if(Fields.Count == 0)

+				error(h,"atleast one field value must be present");

+			else

+			{

+				foreach(XmlSchemaObject obj in Fields)

+				{

+					if(obj is XmlSchemaXPath)

+					{

+						XmlSchemaXPath field = (XmlSchemaXPath)obj;

+						errorCount += field.Compile(h,info);

+					}

+					else

+						error(h,"Object of type "+obj.GetType()+" is invalid in the Fields Collection");

+				}

+			}

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaImport.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaImport.cs
new file mode 100755
index 00000000000..7586b2db155
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaImport.cs
@@ -0,0 +1,109 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaImport.

+	/// </summary>

+	public class XmlSchemaImport : XmlSchemaExternal

+	{

+		private XmlSchemaAnnotation annotation;

+		private string nameSpace;

+		private static string xmlname = "import";

+

+		public XmlSchemaImport()

+		{

+		}

+		

+		[System.Xml.Serialization.XmlAttribute("namespace")]

+		public string Namespace 

+		{

+			get{ return  nameSpace; } 

+			set{ nameSpace = value; }

+		}

+

+		[XmlElement("annotation",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaAnnotation Annotation 

+		{

+			get{ return  annotation; } 

+			set{ annotation = value; }

+		}

+		//<import 

+		//  id = ID 

+		//  namespace = anyURI 

+		//  schemaLocation = anyURI 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</import>

+		internal static XmlSchemaImport Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaImport import = new XmlSchemaImport();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != "import")

+			{

+				error(h,"Should not happen :1: XmlSchemaImport.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			import.LineNumber = reader.LineNumber;

+			import.LinePosition = reader.LinePosition;

+			import.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					import.Id = reader.Value;

+				}

+				else if(reader.Name == "namespace")

+				{

+					import.nameSpace = reader.Value;

+				}

+				else if(reader.Name == "schemaLocation")

+				{

+					import.SchemaLocation = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for import",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,import);

+				}

+			}

+

+			reader.MoveToElement();	

+			if(reader.IsEmptyElement)

+				return import;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaImport.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						import.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return import;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaInclude.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaInclude.cs
new file mode 100755
index 00000000000..8cbb081eb7a
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaInclude.cs
@@ -0,0 +1,97 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaInclude.

+	/// </summary>

+	public class XmlSchemaInclude : XmlSchemaExternal

+	{

+		private XmlSchemaAnnotation annotation;

+		private static string xmlname = "include";

+

+		public XmlSchemaInclude()

+		{

+		}

+		[XmlElement("annotation",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaAnnotation Annotation 

+		{

+			get{ return  annotation; } 

+			set{ annotation = value; }

+		}

+

+		//<include 

+		//  id = ID 

+		//  schemaLocation = anyURI 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</include>

+		internal static XmlSchemaInclude Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaInclude include = new XmlSchemaInclude();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaInclude.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			include.LineNumber = reader.LineNumber;

+			include.LinePosition = reader.LinePosition;

+			include.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					include.Id = reader.Value;

+				}

+				else if(reader.Name == "schemaLocation")

+				{

+					include.SchemaLocation = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for include",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,include);

+				}

+			}

+

+			reader.MoveToElement();	

+			if(reader.IsEmptyElement)

+				return include;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaInclude.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						include.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+

+			return include;

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaInfo.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaInfo.cs
new file mode 100755
index 00000000000..9fc85b04f26
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaInfo.cs
@@ -0,0 +1,25 @@
+using System;

+using System.Xml;

+using System.Collections;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// This class would store the infomation we need during compilation.

+	/// </summary>

+	internal class XmlSchemaInfo

+	{

+		internal XmlSchemaInfo()

+		{

+			IDCollection = new Hashtable();

+		}

+

+		internal string TargetNamespace = null;

+		internal XmlSchemaDerivationMethod FinalDefault = XmlSchemaDerivationMethod.None;

+		internal XmlSchemaDerivationMethod BlockDefault = XmlSchemaDerivationMethod.None;

+		internal XmlSchemaForm ElementFormDefault = XmlSchemaForm.None;

+		internal XmlSchemaForm AttributeFormDefault = XmlSchemaForm.None;

+		internal Hashtable IDCollection;

+		internal XmlSchemaObjectTable SchemaTypes ;

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaKey.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaKey.cs
new file mode 100755
index 00000000000..b883f9e8da7
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaKey.cs
@@ -0,0 +1,127 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaKey.

+	/// </summary>

+	public class XmlSchemaKey : XmlSchemaIdentityConstraint

+	{

+		private static string xmlname = "key";

+

+		public XmlSchemaKey()

+		{

+		}

+		/// <remarks>

+		/// 1. name must be present

+		/// 2. selector and field must be present

+		/// </remarks>

+		[MonoTODO]

+		internal new int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			return base.Compile(h,info);

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		internal new void error(ValidationEventHandler handle, string message)

+		{

+			errorCount++;

+			ValidationHandler.RaiseValidationError(handle, this, message);

+		}

+

+		//<key 

+		//  id = ID 

+		//  name = NCName 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (selector, field+))

+		//</key>

+		internal static XmlSchemaKey Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaKey key = new XmlSchemaKey();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaKey.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			key.LineNumber = reader.LineNumber;

+			key.LinePosition = reader.LinePosition;

+			key.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					key.Id = reader.Value;

+				}

+				else if(reader.Name == "name")

+				{

+					key.Name = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for key",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,key);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return key;

+

+			//  Content: annotation?, selector, field+

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaKey.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						key.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2 && reader.LocalName == "selector")

+				{

+					level = 3;

+					XmlSchemaXPath selector = XmlSchemaXPath.Read(reader,h,"selector");

+					if(selector != null)

+						key.Selector = selector;

+					continue;

+				}

+				if(level <= 3 && reader.LocalName == "field")

+				{

+					level = 3;

+					if(key.Selector == null)

+						error(h,"selector must be defined before field declarations",null);

+					XmlSchemaXPath field = XmlSchemaXPath.Read(reader,h,"field");

+					if(field != null)

+						key.Fields.Add(field);

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return key;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaKeyref.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaKeyref.cs
new file mode 100755
index 00000000000..f22a40f23bd
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaKeyref.cs
@@ -0,0 +1,151 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaKeyref.

+	/// </summary>

+	public class XmlSchemaKeyref : XmlSchemaIdentityConstraint

+	{

+		private XmlQualifiedName refer;

+		private static string xmlname = "keyref";

+

+		public XmlSchemaKeyref()

+		{

+			refer = XmlQualifiedName.Empty;

+		}

+

+		[System.Xml.Serialization.XmlAttribute("refer")]

+		public XmlQualifiedName Refer

+		{

+			get{ return  refer; } 

+			set{ refer = value; }

+		}

+		/// <remarks>

+		/// 1. name must be present

+		/// 2. selector and field must be present

+		/// 3. refer must be present

+		/// </remarks>

+		[MonoTODO]

+		internal new int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			errorCount += base.Compile(h,info);

+			if(refer == null || refer.IsEmpty)

+				error(h,"refer must be present");

+			else if(!XmlSchemaUtil.CheckQName(refer))

+				error(h,"Refer is not a valid XmlQualifiedName");

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		internal new void error(ValidationEventHandler handle, string message)

+		{

+			errorCount++;

+			ValidationHandler.RaiseValidationError(handle, this, message);

+		}

+		//<key 

+		//  id = ID 

+		//  name = NCName 

+		//  refer = QName 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (selector, field+))

+		//</key>

+		internal static XmlSchemaKeyref Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaKeyref keyref = new XmlSchemaKeyref();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaKeyref.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			keyref.LineNumber = reader.LineNumber;

+			keyref.LinePosition = reader.LinePosition;

+			keyref.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					keyref.Id = reader.Value;

+				}

+				else if(reader.Name == "name")

+				{

+					keyref.Name = reader.Value;

+				}

+				else if(reader.Name == "refer")

+				{

+					Exception innerex;

+					keyref.refer = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for refer attribute",innerex);

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for keyref",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,keyref);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return keyref;

+

+			//  Content: annotation?, selector, field+

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaKeyref.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						keyref.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2 && reader.LocalName == "selector")

+				{

+					level = 3;

+					XmlSchemaXPath selector = XmlSchemaXPath.Read(reader,h,"selector");

+					if(selector != null)

+						keyref.Selector = selector;

+					continue;

+				}

+				if(level <= 3 && reader.LocalName == "field")

+				{

+					level = 3;

+					if(keyref.Selector == null)

+						error(h,"selector must be defined before field declarations",null);

+					XmlSchemaXPath field = XmlSchemaXPath.Read(reader,h,"field");

+					if(field != null)

+						keyref.Fields.Add(field);

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return keyref;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaLengthFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaLengthFacet.cs
new file mode 100755
index 00000000000..263d3c1c58e
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaLengthFacet.cs
@@ -0,0 +1,96 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaLengthFacet.

+	/// </summary>

+	public class XmlSchemaLengthFacet : XmlSchemaNumericFacet

+	{

+		private static string xmlname = "length";

+

+		public XmlSchemaLengthFacet()

+		{

+		}

+

+		//<length

+		//	fixed = boolean : false

+		//	id = ID

+		//	value = nonNegativeInteger

+		//	{any attributes with non-schema namespace . . .}>

+		//	Content: (annotation?)

+		//</length>

+		internal static XmlSchemaLengthFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaLengthFacet length = new XmlSchemaLengthFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaLengthFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			length.LineNumber = reader.LineNumber;

+			length.LinePosition = reader.LinePosition;

+			length.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					length.Id = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					Exception innerex;

+					length.IsFixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for fixed attribute",innerex);

+				}

+				else if(reader.Name == "value")

+				{

+					length.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for group",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,length);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return length;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaLengthFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						length.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return length;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMaxExclusiveFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMaxExclusiveFacet.cs
new file mode 100755
index 00000000000..258c5bf9ccc
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMaxExclusiveFacet.cs
@@ -0,0 +1,96 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaMaxExclusiveFacet.

+	/// </summary>

+	public class XmlSchemaMaxExclusiveFacet : XmlSchemaFacet

+	{

+		private static string xmlname = "maxExclusive";

+

+		public XmlSchemaMaxExclusiveFacet()

+		{

+		}

+

+		//<maxExclusive

+		//  fixed = boolean : false

+		//  id = ID

+		//  value = anySimpleType

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</maxExclusive>

+		internal static XmlSchemaMaxExclusiveFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaMaxExclusiveFacet maxex = new XmlSchemaMaxExclusiveFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaMaxExclusiveFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			maxex.LineNumber = reader.LineNumber;

+			maxex.LinePosition = reader.LinePosition;

+			maxex.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					maxex.Id = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					Exception innerex;

+					maxex.IsFixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for fixed attribute",innerex);

+				}

+				else if(reader.Name == "value")

+				{

+					maxex.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+xmlname,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,maxex);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return maxex;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaMaxExclusiveFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						maxex.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return maxex;

+		}	

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMaxInclusiveFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMaxInclusiveFacet.cs
new file mode 100755
index 00000000000..c080abad8d9
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMaxInclusiveFacet.cs
@@ -0,0 +1,96 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaMaxInclusiveFacet.

+	/// </summary>

+	public class XmlSchemaMaxInclusiveFacet : XmlSchemaFacet

+	{

+		private static string xmlname = "maxInclusive";

+

+		public XmlSchemaMaxInclusiveFacet()

+		{

+		}

+

+		//<maxInclusive

+		//  fixed = boolean : false

+		//  id = ID

+		//  value = anySimpleType

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</maxInclusive>

+		internal static XmlSchemaMaxInclusiveFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaMaxInclusiveFacet maxi = new XmlSchemaMaxInclusiveFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaMaxInclusiveFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			maxi.LineNumber = reader.LineNumber;

+			maxi.LinePosition = reader.LinePosition;

+			maxi.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					maxi.Id = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					Exception innerex;

+					maxi.IsFixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for fixed attribute",innerex);

+				}

+				else if(reader.Name == "value")

+				{

+					maxi.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+xmlname,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,maxi);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return maxi;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaMaxInclusiveFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						maxi.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return maxi;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMaxLengthFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMaxLengthFacet.cs
new file mode 100755
index 00000000000..a7bbb98b145
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMaxLengthFacet.cs
@@ -0,0 +1,97 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaMaxLengthFacet.

+	/// </summary>

+	public class XmlSchemaMaxLengthFacet : XmlSchemaNumericFacet

+	{

+		private static string xmlname = "maxLength";

+

+		public XmlSchemaMaxLengthFacet()

+		{

+		}

+

+		//<maxLength

+		//  fixed = boolean : false

+		//  id = ID

+		//  value = nonNegativeInteger

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</maxLength>

+		internal static XmlSchemaMaxLengthFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaMaxLengthFacet length = new XmlSchemaMaxLengthFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaMaxLengthFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			length.LineNumber = reader.LineNumber;

+			length.LinePosition = reader.LinePosition;

+			length.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					length.Id = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					Exception innerex;

+					length.IsFixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for fixed attribute",innerex);

+				}

+				else if(reader.Name == "value")

+				{

+					length.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for group",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,length);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return length;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaMaxLengthFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						length.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return length;

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMinExclusiveFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMinExclusiveFacet.cs
new file mode 100755
index 00000000000..ea0cda2c7fa
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMinExclusiveFacet.cs
@@ -0,0 +1,96 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaMinExclusiveFacet.

+	/// </summary>

+	public class XmlSchemaMinExclusiveFacet : XmlSchemaFacet

+	{

+		private static string xmlname = "minExclusive";

+

+		public XmlSchemaMinExclusiveFacet()

+		{

+		}

+

+		//<minExclusive

+		//  fixed = boolean : false

+		//  id = ID

+		//  value = anySimpleType

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</minExclusive>

+		internal static XmlSchemaMinExclusiveFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaMinExclusiveFacet minex = new XmlSchemaMinExclusiveFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaMinExclusiveFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			minex.LineNumber = reader.LineNumber;

+			minex.LinePosition = reader.LinePosition;

+			minex.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					minex.Id = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					Exception innerex;

+					minex.IsFixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for fixed attribute",innerex);

+				}

+				else if(reader.Name == "value")

+				{

+					minex.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+xmlname,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,minex);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return minex;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaMinExclusiveFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						minex.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return minex;

+		}	

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMinInclusiveFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMinInclusiveFacet.cs
new file mode 100755
index 00000000000..8459cd3ebe5
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMinInclusiveFacet.cs
@@ -0,0 +1,95 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaMinInclusiveFacet.

+	/// </summary>

+	public class XmlSchemaMinInclusiveFacet : XmlSchemaFacet

+	{

+		private static string xmlname = "minInclusive";

+

+		public XmlSchemaMinInclusiveFacet()

+		{

+		}

+		//<minInclusive

+		//  fixed = boolean : false

+		//  id = ID

+		//  value = anySimpleType

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</minInclusive>

+		internal static XmlSchemaMinInclusiveFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaMinInclusiveFacet mini = new XmlSchemaMinInclusiveFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaMinInclusiveFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			mini.LineNumber = reader.LineNumber;

+			mini.LinePosition = reader.LinePosition;

+			mini.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					mini.Id = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					Exception innerex;

+					mini.IsFixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for fixed attribute",innerex);

+				}

+				else if(reader.Name == "value")

+				{

+					mini.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+xmlname,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,mini);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return mini;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaMinInclusiveFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						mini.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return mini;

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMinLengthFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMinLengthFacet.cs
new file mode 100755
index 00000000000..51763977a4a
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaMinLengthFacet.cs
@@ -0,0 +1,96 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaMinLengthFacet.

+	/// </summary>

+	public class XmlSchemaMinLengthFacet : XmlSchemaNumericFacet

+	{

+		private static string xmlname = "minLength";

+

+		public XmlSchemaMinLengthFacet()

+		{

+		}

+

+		//<minLength

+		//  fixed = boolean : false

+		//  id = ID

+		//  value = nonNegativeInteger

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</minLength>

+		internal static XmlSchemaMinLengthFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaMinLengthFacet length = new XmlSchemaMinLengthFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaMinLengthFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			length.LineNumber = reader.LineNumber;

+			length.LinePosition = reader.LinePosition;

+			length.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					length.Id = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					Exception innerex;

+					length.IsFixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for fixed attribute",innerex);

+				}

+				else if(reader.Name == "value")

+				{

+					length.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+xmlname,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,length);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return length;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaMinLengthFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						length.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return length;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaNotation.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaNotation.cs
new file mode 100755
index 00000000000..f07b83213c5
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaNotation.cs
@@ -0,0 +1,158 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaNotation.

+	/// </summary>

+	public class XmlSchemaNotation : XmlSchemaAnnotated

+	{

+		private string name;

+		private string pub;

+		private string system;

+		private XmlQualifiedName qualifiedName;

+		private static string xmlname = "notation";

+

+		public XmlSchemaNotation()

+		{

+		}

+		[System.Xml.Serialization.XmlAttribute("name")]

+		public string Name 

+		{

+			get{ return  name; } 

+			set{ name = value; }

+		}

+		[System.Xml.Serialization.XmlAttribute("public")]

+		public string Public 

+		{

+			get{ return  pub; } 

+			set{ pub = value; }

+		}

+		[System.Xml.Serialization.XmlAttribute("system")]

+		public string System 

+		{

+			get{ return  system; } 

+			set{ system = value; }

+		}

+

+		[XmlIgnore]

+		internal XmlQualifiedName QualifiedName 

+		{

+			get{ return qualifiedName;}

+		}

+

+		// 1. name and public must be present

+		// public and system must be anyURI

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(Name == null)

+				error(h,"Required attribute name must be present");

+			else if(!XmlSchemaUtil.CheckNCName(this.name)) 

+				error(h,"attribute name must be NCName");

+			else

+				qualifiedName = new XmlQualifiedName(Name,info.TargetNamespace);

+

+			if(Public==null)

+				error(h,"public must be present");

+			else if(!XmlSchemaUtil.CheckAnyUri(Public))

+				error(h,"public must be anyURI");

+

+			if(system != null && !XmlSchemaUtil.CheckAnyUri(system))

+				error(h,"system must be present and of Type anyURI");

+			

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		//<notation 

+		//  id = ID 

+		//  name = NCName 

+		//  public = anyURI 

+		//  system = anyURI 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</notation>

+		internal static XmlSchemaNotation Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaNotation notation = new XmlSchemaNotation();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaInclude.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			notation.LineNumber = reader.LineNumber;

+			notation.LinePosition = reader.LinePosition;

+			notation.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					notation.Id = reader.Value;

+				}

+				else if(reader.Name == "name")

+				{

+					notation.name = reader.Value;

+				}

+				else if(reader.Name == "public")

+				{

+					notation.pub = reader.Value;

+				}

+				else if(reader.Name == "system")

+				{

+					notation.system = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for notation",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,notation);

+				}

+			}

+

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return notation;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaNotation.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						notation.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return notation;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaNumericFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaNumericFacet.cs
new file mode 100755
index 00000000000..72359a71f16
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaNumericFacet.cs
@@ -0,0 +1,16 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaNumericFacet.

+	/// </summary>

+	public abstract class XmlSchemaNumericFacet : XmlSchemaFacet

+	{

+		protected XmlSchemaNumericFacet()

+		{

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObject.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObject.cs
new file mode 100755
index 00000000000..71e8b57faf4
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObject.cs
@@ -0,0 +1,75 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Collections;

+using System.Xml.Serialization;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaObject.

+	/// </summary>

+	public abstract class XmlSchemaObject

+	{

+		private int lineNumber;

+		private int linePosition;

+		private string sourceUri;

+		private XmlSerializerNamespaces namespaces;

+		internal ArrayList unhandledAttributeList ;

+		internal bool isCompiled = false;

+		internal int errorCount = 0;

+

+		protected XmlSchemaObject()

+		{

+			namespaces = new XmlSerializerNamespaces();

+			unhandledAttributeList = null;

+		}

+

+		[XmlIgnore]

+		public int LineNumber 

+		{ 

+			get{ return lineNumber; } 

+			set{ lineNumber = value; } 

+		}

+		[XmlIgnore]

+		public int LinePosition 

+		{ 

+			get{ return linePosition; } 

+			set{ linePosition = value; } 

+		}

+		[XmlIgnore]

+		public string SourceUri 

+		{ 

+			get{ return sourceUri; } 

+			set{ sourceUri = value; } 

+		}

+

+		// Undocumented Property

+		[XmlNamespaceDeclarations]

+		public XmlSerializerNamespaces Namespaces 

+		{ 

+			get{ return namespaces; } 

+			set{ namespaces = value; } 

+		}

+

+		internal void error(ValidationEventHandler handle,string message)

+		{

+			errorCount++;

+			ValidationHandler.RaiseValidationError(handle,this,message);

+		}

+		internal void warn(ValidationEventHandler handle,string message)

+		{

+			errorCount++;

+			ValidationHandler.RaiseValidationWarning(handle,this,message);

+		}

+		internal static void error(ValidationEventHandler handle, string message, Exception innerException)

+		{

+			ValidationHandler.RaiseValidationError(handle,message, innerException);

+		}

+		internal static void warn(ValidationEventHandler handle, string message, Exception innerException)

+		{

+			ValidationHandler.RaiseValidationWarning(handle,message, innerException);

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectCollection.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectCollection.cs
new file mode 100755
index 00000000000..0a5defffc19
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectCollection.cs
@@ -0,0 +1,82 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Collections;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaObjectCollection.

+	/// </summary>

+	public class XmlSchemaObjectCollection : System.Collections.CollectionBase

+	{

+		private XmlSchemaObject parent;

+

+		public XmlSchemaObjectCollection()

+		{

+		}

+		public XmlSchemaObjectCollection(XmlSchemaObject parent)

+		{

+			this.parent = parent;

+		}

+

+		// Properties

+		public virtual XmlSchemaObject this[ int index ] 

+		{  

+			get

+			{

+				return (XmlSchemaObject) this.List[index];

+			} 

+			set

+			{

+				this.List[index] = value;

+			}

+		}

+

+		// Methods

+		public int  Add(XmlSchemaObject item)

+		{

+			return this.List.Add(item);

+		}

+		

+		public bool Contains(XmlSchemaObject item)

+		{

+			return this.List.Contains(item);

+		}

+		

+		public void CopyTo(XmlSchemaObject[] array, int index)

+		{

+			this.List.CopyTo(array,index);

+		}

+		

+		[MonoTODO]

+		public new XmlSchemaObjectEnumerator GetEnumerator()

+		{

+			return new XmlSchemaObjectEnumerator(this.List);

+		}

+		

+		public int IndexOf(XmlSchemaObject item)

+		{

+			return this.List.IndexOf(item);

+		}

+		

+		public void Insert(int index, XmlSchemaObject item)

+		{

+			this.List.Insert(index, item);

+		}

+		

+		[MonoTODO]

+		protected override void OnClear(){}

+		[MonoTODO]

+		protected override void OnInsert(int index,object item){}

+		[MonoTODO]

+		protected override void OnRemove(int index,object item){}

+		[MonoTODO]

+		protected override void OnSet(int index,object oldValue,object newValue){}

+

+		public void Remove(XmlSchemaObject item)

+		{

+			this.List.Remove(item);

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectEnumerator.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectEnumerator.cs
new file mode 100755
index 00000000000..6c2af9513d5
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectEnumerator.cs
@@ -0,0 +1,49 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Collections;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaObjectEnumerator.

+	/// </summary>

+	public sealed class XmlSchemaObjectEnumerator : IEnumerator

+	{

+		private IEnumerator ienum;

+		internal XmlSchemaObjectEnumerator(IList list)

+		{

+			this.ienum = list.GetEnumerator();

+		}

+		// Properties

+		public XmlSchemaObject Current

+		{ 

+			get

+			{

+				return (XmlSchemaObject) ienum.Current; 

+			}

+		}

+		// Methods

+		public bool MoveNext()

+		{

+			return ienum.MoveNext();

+		}

+		public void Reset()

+		{

+			ienum.Reset();

+		}

+		//Explicit Interface implementation

+		bool IEnumerator.MoveNext()

+		{

+			return ienum.MoveNext();

+		}

+		void IEnumerator.Reset()

+		{

+			ienum.Reset();

+		}

+		object IEnumerator.Current

+		{

+			get{return (XmlSchema) ienum.Current;}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectTable.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectTable.cs
new file mode 100755
index 00000000000..16461b9875c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaObjectTable.cs
@@ -0,0 +1,51 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Collections;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaObjectTable.

+	/// </summary>

+	public class XmlSchemaObjectTable

+	{

+		private Hashtable table;

+

+		internal XmlSchemaObjectTable()

+		{

+			table = new Hashtable(); 

+		}

+		public int Count 

+		{

+			get{ return table.Count; }

+		}

+		public XmlSchemaObject this[XmlQualifiedName name] 

+		{

+			get{ return (XmlSchemaObject) table[name]; }

+		}

+		public ICollection Names 

+		{

+			get{ return table.Keys; }

+		}

+		public ICollection Values 

+		{

+			get{ return table.Values;}

+		}

+

+		public bool Contains(XmlQualifiedName name)

+		{

+			return table.Contains(name);

+		}

+		public IDictionaryEnumerator GetEnumerator()

+		{

+			return table.GetEnumerator();

+		}

+

+		internal void Add(XmlQualifiedName name, XmlSchemaObject value)

+		{

+			table.Add(name,value);

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaParticle.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaParticle.cs
new file mode 100755
index 00000000000..119c335b3c0
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaParticle.cs
@@ -0,0 +1,98 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaParticle.

+	/// </summary>

+	public abstract class XmlSchemaParticle : XmlSchemaAnnotated

+	{

+		decimal minOccurs, maxOccurs;

+		string  minstr, maxstr;

+

+		protected XmlSchemaParticle()

+		{

+			minOccurs = decimal.One;

+			maxOccurs = decimal.One;

+		}

+

+		#region Attributes

+

+		[System.Xml.Serialization.XmlAttribute("minOccurs")]

+		public string MinOccursString

+		{

+			get{ return minstr; }

+			set

+			{

+				decimal val = decimal.Parse(value);

+				if(val >= 0 && (val == Decimal.Truncate(val)))

+				{

+					minOccurs = val;

+					minstr	 = val.ToString();

+				}

+				else

+				{

+					throw new XmlSchemaException

+						("MinOccursString must be a non-negative number",null); 					

+				}

+			}

+		}

+

+		[System.Xml.Serialization.XmlAttribute("maxOccurs")]

+		public string MaxOccursString

+		{

+			get{ return maxstr; }

+			set

+			{

+				if(value == "unbounded")

+				{

+					maxstr = value;

+					maxOccurs = decimal.MaxValue;

+				}

+				else

+				{

+					decimal val = decimal.Parse(value);

+					if(val >= 0 && (val == Decimal.Truncate(val)))

+					{

+						maxOccurs = val;

+						maxstr = val.ToString();

+					}

+					else

+					{

+						throw new XmlSchemaException

+							("MaxOccurs must be a non-negative integer",null);

+					}

+				}

+			}

+		}

+

+		#endregion

+

+		#region XmlIgnore

+

+		[XmlIgnore]

+		public decimal MinOccurs

+		{

+			get{ return  minOccurs; }

+			set

+			{

+				MinOccursString = value.ToString();

+			}

+		}

+

+		[XmlIgnore]

+		public decimal MaxOccurs 

+		{

+			get{ return  maxOccurs; } 

+			set

+			{

+				MaxOccursString = value.ToString();

+			}

+		}

+

+		#endregion

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaPatternFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaPatternFacet.cs
new file mode 100755
index 00000000000..da2effbb380
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaPatternFacet.cs
@@ -0,0 +1,87 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaPatternFacet.

+	/// </summary>

+	public class XmlSchemaPatternFacet : XmlSchemaFacet

+	{

+		private static string xmlname = "pattern";

+

+		public XmlSchemaPatternFacet()

+		{

+		}

+		//<pattern

+		//  id = ID

+		//  value = anySimpleType

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</pattern>

+		internal static XmlSchemaPatternFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaPatternFacet pattern = new XmlSchemaPatternFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaPatternFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			pattern.LineNumber = reader.LineNumber;

+			pattern.LinePosition = reader.LinePosition;

+			pattern.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					pattern.Id = reader.Value;

+				}

+				else if(reader.Name == "value")

+				{

+					pattern.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+xmlname,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,pattern);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return pattern;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaPatternFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						pattern.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return pattern;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaReader.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaReader.cs
new file mode 100755
index 00000000000..fc4375a9767
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaReader.cs
@@ -0,0 +1,358 @@
+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// A wrapper around XmlReader

+	/// </summary>

+	public class XmlSchemaReader : XmlReader, IXmlLineInfo

+	{

+		XmlReader reader;

+		ValidationEventHandler handler;

+		bool hasLineInfo;

+		public XmlSchemaReader(XmlReader reader,ValidationEventHandler handler)

+		{

+			this.reader = reader;

+			this.handler = handler;

+			if(reader is IXmlLineInfo)

+			{

+				IXmlLineInfo info = (IXmlLineInfo)reader;

+				hasLineInfo = info.HasLineInfo();

+			}

+		}

+

+		/// <summary>

+		/// Returns the Namespace:LocalName for the object

+		/// </summary>

+		public string FullName

+		{

+			get { return NamespaceURI + ":" + LocalName; }

+		}

+

+		public void RaiseInvalidElementError()

+		{

+			string errstr = "Element "+FullName + " is invalid in this context.\n";

+			if(hasLineInfo)

+				errstr += "The error occured on ("+((IXmlLineInfo)reader).LineNumber

+					+","+((IXmlLineInfo)reader).LinePosition+")";

+			XmlSchemaObject.error(handler, errstr, null);

+			SkipToEnd();

+		}

+		/// <summary>

+		/// Reads till the next Element or EndElement. Also checks that the Namespace of the element is

+		/// Schema's Namespace.

+		/// </summary>

+		/// <returns></returns>

+		public bool ReadNextElement()

+		{

+			MoveToElement();

+			while(Read())

+			{

+				if(NodeType == XmlNodeType.Element || NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.NamespaceURI != XmlSchema.Namespace)

+					{

+						RaiseInvalidElementError();

+					}

+					else

+					{

+						return true;

+					}

+				}

+			}

+			return false;

+		}

+

+		/// <summary>

+		/// Skips to the end of the current element

+		/// </summary>

+		public void SkipToEnd()

+		{

+			MoveToElement();

+			if(IsEmptyElement || NodeType != XmlNodeType.Element)

+				return;

+			if(NodeType == XmlNodeType.Element)

+			{

+				int depth = Depth;

+				while(Read())

+				{

+					if(Depth == depth)

+						break;

+				}

+			}

+			return;

+		}

+

+		#region LineInfo

+		public bool HasLineInfo()

+		{

+			return hasLineInfo;

+		}

+		public int LineNumber

+		{

+			get { return hasLineInfo?((IXmlLineInfo)reader).LineNumber: 0; }

+		}

+		public int LinePosition

+		{

+			get { return hasLineInfo?((IXmlLineInfo)reader).LinePosition: 0; }

+		}

+		#endregion

+

+		#region Delegates

+		public override int AttributeCount 

+		{

+			get { return  reader.AttributeCount; }

+		}

+		public override string BaseURI 

+		{

+			get { return  reader.BaseURI; }

+		}

+		public override bool CanResolveEntity 

+		{

+			get { return  reader.CanResolveEntity; }

+		}

+		public override int Depth 

+		{

+			get { return  reader.Depth; }

+		}

+		public override bool EOF 

+		{

+			get { return  reader.EOF; }

+		}

+		public override bool HasAttributes 

+		{

+			get { return  reader.HasAttributes; }

+		}

+		public override bool HasValue 

+		{

+			get { return  reader.HasValue; }

+		}

+		public override bool IsDefault 

+		{

+			get { return  reader.IsDefault; }

+		}

+		public override bool IsEmptyElement 

+		{

+			get { return  reader.IsEmptyElement; }

+		}

+		public override string this[ int i ] 

+		{

+			get { return  reader[i]; }

+		}

+		public override string this[ string name ] 

+		{

+			get { return  reader[name]; }

+		}

+		public override string this[ string name, string namespaceURI ] 

+		{

+			get { return  reader[name,namespaceURI]; }

+		}

+		public override string LocalName 

+		{

+			get { return  reader.LocalName; }

+		}

+		public override string Name 

+		{

+			get { return  reader.Name; }

+		}

+		public override string NamespaceURI 

+		{

+			get { return  reader.NamespaceURI; }

+		}

+		public override XmlNameTable NameTable 

+		{

+			get { return  reader.NameTable; }

+		}

+		public override XmlNodeType NodeType 

+		{

+			get { return  reader.NodeType; }

+		}

+		public override string Prefix 

+		{

+			get { return  reader.Prefix; }

+		}

+		public override char QuoteChar 

+		{

+			get { return  reader.QuoteChar; }

+		}

+		public override ReadState ReadState 

+		{

+			get { return  reader.ReadState; }

+		}

+		public override string Value 

+		{

+			get { return  reader.Value; }

+		}

+		public override string XmlLang 

+		{

+			get { return  reader.XmlLang; }

+		}

+		public override XmlSpace XmlSpace 

+		{

+			get { return  reader.XmlSpace; }

+		}

+

+		public override void Close()

+		{

+			reader.Close(); 

+		}

+

+		public override bool Equals(object obj)

+		{

+			return reader.Equals(obj); 

+		}

+

+		public override string GetAttribute(int i)

+		{

+			return reader.GetAttribute(i); 

+		}

+

+		public override string GetAttribute(string name)

+		{

+			return reader.GetAttribute(name); 

+		}

+

+		public override string GetAttribute(string name, string namespaceURI)

+		{

+			return reader.GetAttribute(name, namespaceURI); 

+		}

+

+		public override int GetHashCode()

+		{

+			return reader.GetHashCode(); 

+		}

+

+		public override bool IsStartElement()

+		{

+			return reader.IsStartElement(); 

+		}

+

+		public override bool IsStartElement(string localname, string ns)

+		{

+			return reader.IsStartElement(localname, ns); 

+		}

+

+		public override bool IsStartElement(string name)

+		{

+			return reader.IsStartElement(name); 

+		}

+

+		public override string LookupNamespace(string prefix)

+		{

+			return reader.LookupNamespace(prefix); 

+		}

+

+		public override void MoveToAttribute(int i)

+		{

+			reader.MoveToAttribute(i); 

+		}

+

+		public override bool MoveToAttribute(string name)

+		{

+			return reader.MoveToAttribute(name); 

+		}

+

+		public override bool MoveToAttribute(string name, string ns)

+		{

+			return reader.MoveToAttribute(name,ns); 

+		}

+

+		public override System.Xml.XmlNodeType MoveToContent()

+		{

+			return reader.MoveToContent(); 

+		}

+

+		public override bool MoveToElement()

+		{

+			return reader.MoveToElement(); 

+		}

+

+		public override bool MoveToFirstAttribute()

+		{

+			return reader.MoveToFirstAttribute(); 

+		}

+

+		public override bool MoveToNextAttribute()

+		{

+			return reader.MoveToNextAttribute(); 

+		}

+

+		public override bool Read()

+		{

+			return reader.Read(); 

+		}

+

+		public override bool ReadAttributeValue()

+		{

+			return reader.ReadAttributeValue(); 

+		}

+

+		public override string ReadElementString()

+		{

+			return reader.ReadElementString(); 

+		}

+

+		public override string ReadElementString(string localname, string ns)

+		{

+			return reader.ReadElementString(localname, ns); 

+		}

+

+		public override string ReadElementString(string name)

+		{

+			return reader.ReadElementString(name); 

+		}

+

+		public override void ReadEndElement()

+		{

+			reader.ReadEndElement(); 

+		}

+

+		public override string ReadInnerXml()

+		{

+			return reader.ReadInnerXml(); 

+		}

+

+		public override string ReadOuterXml()

+		{

+			return reader.ReadOuterXml(); 

+		}

+

+		public override void ReadStartElement()

+		{

+			reader.ReadStartElement(); 

+		}

+

+		public override void ReadStartElement(string localname, string ns)

+		{

+			reader.ReadStartElement(localname, ns); 

+		}

+

+		public override void ReadStartElement(string name)

+		{

+			reader.ReadStartElement(name); 

+		}

+

+		public override string ReadString()

+		{

+			return reader.ReadString(); 

+		}

+

+		public override void ResolveEntity()

+		{

+			reader.ResolveEntity(); 

+		}

+

+		public override void Skip()

+		{

+			reader.Skip(); 

+		}

+

+		public override string ToString()

+		{

+			return reader.ToString(); 

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaRedefine.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaRedefine.cs
new file mode 100755
index 00000000000..bd573ec94ab
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaRedefine.cs
@@ -0,0 +1,151 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaRedefine.

+	/// </summary>

+	public class XmlSchemaRedefine : XmlSchemaExternal

+	{

+		private XmlSchemaObjectTable attributeGroups;

+		private XmlSchemaObjectTable groups;

+		private XmlSchemaObjectCollection items;

+		private XmlSchemaObjectTable schemaTypes;

+		private static string xmlname = "redefine";

+

+		public XmlSchemaRedefine()

+		{

+			attributeGroups = new XmlSchemaObjectTable();

+			groups = new XmlSchemaObjectTable();

+			items = new XmlSchemaObjectCollection(this);

+			schemaTypes = new XmlSchemaObjectTable();

+		}

+		

+		[XmlElement("annotation",typeof(XmlSchemaAnnotation),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("simpleType",typeof(XmlSchemaSimpleType),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("complexType",typeof(XmlSchemaComplexType),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("group",typeof(XmlSchemaGroup),Namespace="http://www.w3.org/2001/XMLSchema")]

+			//NOTE: AttributeGroup and not AttributeGroupRef

+		[XmlElement("attributeGroup",typeof(XmlSchemaAttributeGroup),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Items 

+		{

+			get{ return items; }

+		}

+

+		[XmlIgnore]

+		public XmlSchemaObjectTable AttributeGroups 

+		{

+			get{ return attributeGroups; }

+		}

+		

+		[XmlIgnore]

+		public XmlSchemaObjectTable SchemaTypes 

+		{

+			get{ return schemaTypes; }

+		}

+

+		[XmlIgnore]

+		public XmlSchemaObjectTable Groups 

+		{

+			get{ return groups; }

+		}

+//<redefine 

+//  id = ID 

+//  schemaLocation = anyURI 

+//  {any attributes with non-schema namespace . . .}>

+//  Content: (annotation | (simpleType | complexType | group | attributeGroup))*

+//</redefine>

+		internal static XmlSchemaRedefine Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaRedefine redefine = new XmlSchemaRedefine();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaRedefine.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			redefine.LineNumber = reader.LineNumber;

+			redefine.LinePosition = reader.LinePosition;

+			redefine.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					redefine.Id = reader.Value;

+				}

+				else if(reader.Name == "schemaLocation")

+				{

+					redefine.SchemaLocation = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for redefine",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,redefine);

+				}

+			}

+

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return redefine;

+

+			//(annotation | (simpleType | complexType | group | attributeGroup))*

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaRedefine.Read, name="+reader.Name,null);

+					break;

+				}

+				if(reader.LocalName == "annotation")

+				{

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						redefine.items.Add(annotation);

+					continue;

+				}

+				if(reader.LocalName == "simpleType")

+				{

+					XmlSchemaSimpleType simpleType = XmlSchemaSimpleType.Read(reader,h);

+					if(simpleType != null)

+						redefine.items.Add(simpleType);

+					continue;

+				}

+				if(reader.LocalName == "complexType")

+				{

+					XmlSchemaComplexType complexType = XmlSchemaComplexType.Read(reader,h);

+					if(complexType != null)

+						redefine.items.Add(complexType);

+					continue;

+				}

+				if(reader.LocalName == "group")

+				{

+					XmlSchemaGroup group = XmlSchemaGroup.Read(reader,h);

+					if(group != null)

+						redefine.items.Add(group);

+					continue;

+				}

+				if(reader.LocalName == "attributeGroup")

+				{

+					XmlSchemaAttributeGroup attributeGroup = XmlSchemaAttributeGroup.Read(reader,h);

+					if(attributeGroup != null)

+						redefine.items.Add(attributeGroup);

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return redefine;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSequence.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSequence.cs
new file mode 100755
index 00000000000..769ab66f2b7
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSequence.cs
@@ -0,0 +1,202 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaSequence.

+	/// </summary>

+	public class XmlSchemaSequence : XmlSchemaGroupBase

+	{

+		private XmlSchemaObjectCollection items;

+		private static string xmlname = "sequence";

+

+		public XmlSchemaSequence()

+		{

+			items = new XmlSchemaObjectCollection();

+		}

+

+		[XmlElement("element",typeof(XmlSchemaElement),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("group",typeof(XmlSchemaGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("choice",typeof(XmlSchemaChoice),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("sequence",typeof(XmlSchemaSequence),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("any",typeof(XmlSchemaAny),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public override XmlSchemaObjectCollection Items 

+		{

+			get{ return items; }

+		}

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			//FIXME: Should we reset the values

+			if(MinOccurs > MaxOccurs)

+				error(h,"minOccurs must be less than or equal to maxOccurs");

+

+			XmlSchemaUtil.CompileID(Id, this, info.IDCollection, h);

+

+			foreach(XmlSchemaObject obj in Items)

+			{

+				if(obj is XmlSchemaElement)

+				{

+					errorCount += ((XmlSchemaElement)obj).Compile(h,info);

+				}

+				else if(obj is XmlSchemaGroupRef)

+				{

+					errorCount += ((XmlSchemaGroupRef)obj).Compile(h,info);

+				}

+				else if(obj is XmlSchemaChoice)

+				{

+					errorCount += ((XmlSchemaChoice)obj).Compile(h,info);

+				}

+				else if(obj is XmlSchemaSequence)

+				{

+					errorCount += ((XmlSchemaSequence)obj).Compile(h,info);

+				}

+				else if(obj is XmlSchemaAny)

+				{

+					errorCount += ((XmlSchemaAny)obj).Compile(h,info);

+				}

+			}

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<sequence

+		//  id = ID

+		//  maxOccurs =  (nonNegativeInteger | unbounded)  : 1

+		//  minOccurs = nonNegativeInteger : 1

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (element | group | choice | sequence | any)*)

+		//</sequence>

+		internal static XmlSchemaSequence Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaSequence sequence = new XmlSchemaSequence();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaSequence.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			sequence.LineNumber = reader.LineNumber;

+			sequence.LinePosition = reader.LinePosition;

+			sequence.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					sequence.Id = reader.Value;

+				}

+				else if(reader.Name == "maxOccurs")

+				{

+					try

+					{

+						sequence.MaxOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for maxOccurs",e);

+					}

+				}

+				else if(reader.Name == "minOccurs")

+				{

+					try

+					{

+						sequence.MinOccursString = reader.Value;

+					}

+					catch(Exception e)

+					{

+						error(h,reader.Value + " is an invalid value for minOccurs",e);

+					}

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for sequence",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,sequence);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return sequence;

+

+			//  Content: (annotation?, (element | group | choice | sequence | any)*)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaSequence.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						sequence.Annotation = annotation;

+					continue;

+				}

+				if(level <=2)

+				{

+					if(reader.LocalName == "element")

+					{

+						level = 2;

+						XmlSchemaElement element = XmlSchemaElement.Read(reader,h);

+						if(element != null)

+							sequence.items.Add(element);

+						continue;

+					}

+					if(reader.LocalName == "group")

+					{

+						level = 2;

+						XmlSchemaGroupRef group = XmlSchemaGroupRef.Read(reader,h);

+						if(group != null)

+							sequence.items.Add(group);

+						continue;

+					}

+					if(reader.LocalName == "choice")

+					{

+						level = 2;

+						XmlSchemaChoice choice = XmlSchemaChoice.Read(reader,h);

+						if(choice != null)

+							sequence.items.Add(choice);

+						continue;

+					}

+					if(reader.LocalName == "sequence")

+					{

+						level = 2;

+						XmlSchemaSequence seq = XmlSchemaSequence.Read(reader,h);

+						if(seq != null)

+							sequence.items.Add(seq);

+						continue;

+					}

+					if(reader.LocalName == "any")

+					{

+						level = 2;

+						XmlSchemaAny any = XmlSchemaAny.Read(reader,h);

+						if(any != null)

+							sequence.items.Add(any);

+						continue;

+					}

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return sequence;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContent.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContent.cs
new file mode 100755
index 00000000000..2c2fce3f933
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContent.cs
@@ -0,0 +1,146 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaSimpleContent.

+	/// </summary>

+	public class XmlSchemaSimpleContent : XmlSchemaContentModel

+	{

+		private XmlSchemaContent content;

+		private static string xmlname = "simpleContent";

+		public XmlSchemaSimpleContent()

+		{

+		}

+

+		[XmlElement("restriction",typeof(XmlSchemaSimpleContentRestriction),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("extension",typeof(XmlSchemaSimpleContentExtension),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public override XmlSchemaContent Content 

+		{

+			get{ return  content; } 

+			set{ content = value; }

+		}

+

+		///<remarks>

+		/// 1. Content must be present and one of restriction or extention

+		///</remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(Content == null)

+			{

+				error(h, "Content must be present in a simpleContent");

+			}

+			else

+			{

+				if(Content is XmlSchemaSimpleContentRestriction)

+				{

+					XmlSchemaSimpleContentRestriction xscr = (XmlSchemaSimpleContentRestriction) Content;

+					errorCount += xscr.Compile(h,info);

+				}

+				else if(Content is XmlSchemaSimpleContentExtension)

+				{

+					XmlSchemaSimpleContentExtension xsce = (XmlSchemaSimpleContentExtension) Content;

+					errorCount += xsce.Compile(h,info);

+				}

+				else

+					error(h,"simpleContent can't have any value other than restriction or extention");

+			}

+			

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<simpleContent 

+		//  id = ID 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (restriction | extension))

+		//</simpleContent>

+		internal static XmlSchemaSimpleContent Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaSimpleContent simple = new XmlSchemaSimpleContent();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaComplexContent.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			simple.LineNumber = reader.LineNumber;

+			simple.LinePosition = reader.LinePosition;

+			simple.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					simple.Id = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for simpleContent",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,simple);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return simple;

+			//Content: (annotation?, (restriction | extension))

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaSimpleContent.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						simple.Annotation = annotation;

+					continue;

+				}

+				if(level <=2)

+				{

+					if(reader.LocalName == "restriction")

+					{

+						level = 3;

+						XmlSchemaSimpleContentRestriction restriction = XmlSchemaSimpleContentRestriction.Read(reader,h);

+						if(restriction != null)

+							simple.content = restriction;

+						continue;

+					}

+					if(reader.LocalName == "extension")

+					{

+						level = 3;

+						XmlSchemaSimpleContentExtension extension = XmlSchemaSimpleContentExtension.Read(reader,h);

+						if(extension != null)

+							simple.content = extension;

+						continue;

+					}

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return simple;

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContentExtension.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContentExtension.cs
new file mode 100755
index 00000000000..09d10f25ef6
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContentExtension.cs
@@ -0,0 +1,190 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaSimpleContentExtension.

+	/// </summary>

+	public class XmlSchemaSimpleContentExtension : XmlSchemaContent

+	{

+

+		private XmlSchemaAnyAttribute any;

+		private XmlSchemaObjectCollection attributes;

+		private XmlQualifiedName baseTypeName;

+		private static string xmlname = "extension";

+

+		public XmlSchemaSimpleContentExtension()

+		{

+			baseTypeName = XmlQualifiedName.Empty;

+			attributes	 = new XmlSchemaObjectCollection();

+		}

+

+		[System.Xml.Serialization.XmlAttribute("base")]

+		public XmlQualifiedName BaseTypeName 

+		{

+			get{ return  baseTypeName; }

+			set{ baseTypeName = value; }

+		}

+

+		[XmlElement("attribute",typeof(XmlSchemaAttribute),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("attributeGroup",typeof(XmlSchemaAttributeGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Attributes 

+		{

+			get{ return attributes; }

+		}

+

+		[XmlElement("anyAttribute",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaAnyAttribute AnyAttribute 

+		{

+			get{ return  any; }

+			set{ any = value; }

+		}

+

+		///<remarks>

+		/// 1. Base must be present and a QName

+		///</remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(BaseTypeName == null || BaseTypeName.IsEmpty)

+			{

+				error(h, "base must be present and a QName");

+			}

+			else if(!XmlSchemaUtil.CheckQName(BaseTypeName))

+				error(h,"BaseTypeName must be a QName");

+

+			if(this.AnyAttribute != null)

+			{

+				errorCount += AnyAttribute.Compile(h,info);

+			}

+

+			foreach(XmlSchemaObject obj in Attributes)

+			{

+				if(obj is XmlSchemaAttribute)

+				{

+					XmlSchemaAttribute attr = (XmlSchemaAttribute) obj;

+					errorCount += attr.Compile(h,info);

+				}

+				else if(obj is XmlSchemaAttributeGroupRef)

+				{

+					XmlSchemaAttributeGroupRef atgrp = (XmlSchemaAttributeGroupRef) obj;

+					errorCount += atgrp.Compile(h,info);

+				}

+				else

+					error(h,obj.GetType() +" is not valid in this place::SimpleConentExtension");

+			}

+			

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<extension 

+		//base = QName 

+		//id = ID 

+		//{any attributes with non-schema namespace . . .}>

+		//Content: (annotation?, ((attribute | attributeGroup)*, anyAttribute?))

+		//</extension>

+		internal static XmlSchemaSimpleContentExtension Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaSimpleContentExtension extension = new XmlSchemaSimpleContentExtension();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaAttributeGroup.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			extension.LineNumber = reader.LineNumber;

+			extension.LinePosition = reader.LinePosition;

+			extension.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "base")

+				{

+					Exception innerex;

+					extension.baseTypeName= XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for base attribute",innerex);

+				}

+				else if(reader.Name == "id")

+				{

+					extension.Id = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for extension in this context",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,extension);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return extension;

+

+			//Content: 1.annotation?, 2.(attribute | attributeGroup)*, 3.anyAttribute?

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaSimpleContentExtension.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						extension.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2)

+				{

+					if(reader.LocalName == "attribute")

+					{

+						level = 2;

+						XmlSchemaAttribute attr = XmlSchemaAttribute.Read(reader,h);

+						if(attr != null)

+							extension.Attributes.Add(attr);

+						continue;

+					}

+					if(reader.LocalName == "attributeGroup")

+					{

+						level = 2;

+						XmlSchemaAttributeGroupRef attr = XmlSchemaAttributeGroupRef.Read(reader,h);

+						if(attr != null)

+							extension.attributes.Add(attr);

+						continue;

+					}

+				}

+				if(level <= 3 && reader.LocalName == "anyAttribute")

+				{

+					level = 4;

+					XmlSchemaAnyAttribute anyattr = XmlSchemaAnyAttribute.Read(reader,h);

+					if(anyattr != null)

+						extension.AnyAttribute = anyattr;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return extension;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContentRestriction.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContentRestriction.cs
new file mode 100755
index 00000000000..f908b8788ed
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleContentRestriction.cs
@@ -0,0 +1,337 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaSimpleContentRestriction.

+	/// </summary>

+	public class XmlSchemaSimpleContentRestriction : XmlSchemaContent

+	{

+		

+		private XmlSchemaAnyAttribute any;

+		private XmlSchemaObjectCollection attributes;

+		private XmlSchemaSimpleType baseType;

+		private XmlQualifiedName baseTypeName;

+		private XmlSchemaObjectCollection facets;

+		private static string xmlname = "restriction";

+

+		public XmlSchemaSimpleContentRestriction()

+		{

+			baseTypeName = XmlQualifiedName.Empty;

+			attributes	 = new XmlSchemaObjectCollection();

+			facets		 = new XmlSchemaObjectCollection();

+		}

+

+		[System.Xml.Serialization.XmlAttribute("base")]

+		public XmlQualifiedName BaseTypeName 

+		{

+			get{ return  baseTypeName; }

+			set{ baseTypeName = value; }

+		}

+

+		[XmlElement("simpleType",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaSimpleType BaseType 

+		{ 

+			get{ return  baseType; } 

+			set{ baseType = value; } 

+		}

+		

+		[XmlElement("minExclusive",typeof(XmlSchemaMinExclusiveFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("minInclusive",typeof(XmlSchemaMinInclusiveFacet),Namespace="http://www.w3.org/2001/XMLSchema")] 

+		[XmlElement("maxExclusive",typeof(XmlSchemaMaxExclusiveFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("maxInclusive",typeof(XmlSchemaMaxInclusiveFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("totalDigits",typeof(XmlSchemaTotalDigitsFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("fractionDigits",typeof(XmlSchemaFractionDigitsFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("length",typeof(XmlSchemaLengthFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("minLength",typeof(XmlSchemaMinLengthFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("maxLength",typeof(XmlSchemaMaxLengthFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("enumeration",typeof(XmlSchemaEnumerationFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("whiteSpace",typeof(XmlSchemaWhiteSpaceFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("pattern",typeof(XmlSchemaPatternFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Facets 

+		{ 

+			get{ return facets; } 

+		}

+

+		[XmlElement("attribute",typeof(XmlSchemaAttribute),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("attributeGroup",typeof(XmlSchemaAttributeGroupRef),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Attributes 

+		{

+			get{ return attributes; }

+		}

+

+		[XmlElement("anyAttribute",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaAnyAttribute AnyAttribute 

+		{

+			get{ return  any; }

+			set{ any = value; }

+		}

+		

+		///<remarks>

+		/// 1. Base must be present and a QName

+		///</remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(BaseTypeName == null || BaseTypeName.IsEmpty)

+			{

+				error(h, "base must be present and a QName");

+			}

+			else if(!XmlSchemaUtil.CheckQName(BaseTypeName))

+				error(h,"BaseTypeName must be a QName");

+

+			if(BaseType != null)

+			{

+				errorCount += BaseType.Compile(h,info);

+			}

+

+			if(this.AnyAttribute != null)

+			{

+				errorCount += AnyAttribute.Compile(h,info);

+			}

+

+			foreach(XmlSchemaObject obj in Attributes)

+			{

+				if(obj is XmlSchemaAttribute)

+				{

+					XmlSchemaAttribute attr = (XmlSchemaAttribute) obj;

+					errorCount += attr.Compile(h,info);

+				}

+				else if(obj is XmlSchemaAttributeGroupRef)

+				{

+					XmlSchemaAttributeGroupRef atgrp = (XmlSchemaAttributeGroupRef) obj;

+					errorCount += atgrp.Compile(h,info);

+				}

+				else

+					error(h,obj.GetType() +" is not valid in this place::SimpleContentRestriction");

+			}

+			

+			//TODO: Compile Facets: Looks like they are a part of datatypes. So we'll do them with the datatypes

+

+			

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		//<restriction 

+		//base = QName 

+		//id = ID 

+		//{any attributes with non-schema namespace . . .}>

+		//Content: (annotation?, (simpleType?, (minExclusive | minInclusive | maxExclusive | maxInclusive | totalDigits | fractionDigits | length | minLength | maxLength | enumeration | whiteSpace | pattern)*)?, ((attribute | attributeGroup)*, anyAttribute?))

+		//</restriction>

+		internal static XmlSchemaSimpleContentRestriction Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaSimpleContentRestriction restriction = new XmlSchemaSimpleContentRestriction();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaComplexContentRestriction.Read, name="+reader.Name,null);

+				reader.SkipToEnd();

+				return null;

+			}

+

+			restriction.LineNumber = reader.LineNumber;

+			restriction.LinePosition = reader.LinePosition;

+			restriction.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "base")

+				{

+					Exception innerex;

+					restriction.baseTypeName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for base attribute",innerex);

+				}

+				else if(reader.Name == "id")

+				{

+					restriction.Id = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for restriction",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,restriction);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return restriction;

+			

+			//Content:  1.annotation?, 

+			//		    2.simpleType?, 

+			//			3.(minExclusive |...| enumeration | whiteSpace | pattern)*, 

+			//			4.(attribute | attributeGroup)*, 

+			//			5.anyAttribute?

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaSimpleContentRestriction.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						restriction.Annotation = annotation;

+					continue;

+				}

+				if(level <=2 && reader.LocalName == "simpleType")

+				{

+					level = 3;

+					XmlSchemaSimpleType stype = XmlSchemaSimpleType.Read(reader,h);

+					if(stype != null)

+						restriction.baseType = stype;

+					continue;

+				}

+				if(level <= 3)

+				{

+					if(reader.LocalName == "minExclusive")

+					{

+						level = 3;

+						XmlSchemaMinExclusiveFacet minex = XmlSchemaMinExclusiveFacet.Read(reader,h);

+						if(minex != null)

+							restriction.facets.Add(minex);

+						continue;

+					}

+					else if(reader.LocalName == "minInclusive")

+					{

+						level = 3;

+						XmlSchemaMinInclusiveFacet mini = XmlSchemaMinInclusiveFacet.Read(reader,h);

+						if(mini != null)

+							restriction.facets.Add(mini);

+						continue;

+					}

+					else if(reader.LocalName == "maxExclusive")

+					{

+						level = 3;

+						XmlSchemaMaxExclusiveFacet maxex = XmlSchemaMaxExclusiveFacet.Read(reader,h);

+						if(maxex != null)

+							restriction.facets.Add(maxex);

+						continue;

+					}

+					else if(reader.LocalName == "maxInclusive")

+					{

+						level = 3;

+						XmlSchemaMaxInclusiveFacet maxi = XmlSchemaMaxInclusiveFacet.Read(reader,h);

+						if(maxi != null)

+							restriction.facets.Add(maxi);

+						continue;

+					}

+					else if(reader.LocalName == "totalDigits")

+					{

+						level = 3;

+						XmlSchemaTotalDigitsFacet total = XmlSchemaTotalDigitsFacet.Read(reader,h);

+						if(total != null)

+							restriction.facets.Add(total);

+						continue;

+					}

+					else if(reader.LocalName == "fractionDigits")

+					{

+						level = 3;

+						XmlSchemaFractionDigitsFacet fraction = XmlSchemaFractionDigitsFacet.Read(reader,h);

+						if(fraction != null)

+							restriction.facets.Add(fraction);

+						continue;

+					}

+					else if(reader.LocalName == "length")

+					{

+						level = 3;

+						XmlSchemaLengthFacet length = XmlSchemaLengthFacet.Read(reader,h);

+						if(length != null)

+							restriction.facets.Add(length);

+						continue;

+					}

+					else if(reader.LocalName == "minLength")

+					{

+						level = 3;

+						XmlSchemaMinLengthFacet minlen = XmlSchemaMinLengthFacet.Read(reader,h);

+						if(minlen != null)

+							restriction.facets.Add(minlen);

+						continue;

+					}

+					else if(reader.LocalName == "maxLength")

+					{

+						level = 3;

+						XmlSchemaMaxLengthFacet maxlen = XmlSchemaMaxLengthFacet.Read(reader,h);

+						if(maxlen != null)

+							restriction.facets.Add(maxlen);

+						continue;

+					}

+					else if(reader.LocalName == "enumeration")

+					{

+						level = 3;

+						XmlSchemaEnumerationFacet enumeration = XmlSchemaEnumerationFacet.Read(reader,h);

+						if(enumeration != null)

+							restriction.facets.Add(enumeration);

+						continue;

+					}

+					else if(reader.LocalName == "whiteSpace")

+					{

+						level = 3;

+						XmlSchemaWhiteSpaceFacet ws = XmlSchemaWhiteSpaceFacet.Read(reader,h);

+						if(ws != null)

+							restriction.facets.Add(ws);

+						continue;

+					}

+					else if(reader.LocalName == "pattern")

+					{

+						level = 3;

+						XmlSchemaPatternFacet pattern = XmlSchemaPatternFacet.Read(reader,h);

+						if(pattern != null)

+							restriction.facets.Add(pattern);

+						continue;

+					}

+				}

+				if(level <= 4)

+				{

+					if(reader.LocalName == "attribute")

+					{

+						level = 4;

+						XmlSchemaAttribute attr = XmlSchemaAttribute.Read(reader,h);

+						if(attr != null)

+							restriction.Attributes.Add(attr);

+						continue;

+					}

+					if(reader.LocalName == "attributeGroup")

+					{

+						level = 4;

+						XmlSchemaAttributeGroupRef attr = XmlSchemaAttributeGroupRef.Read(reader,h);

+						if(attr != null)

+							restriction.attributes.Add(attr);

+						continue;

+					}

+				}

+				if(level <= 5 && reader.LocalName == "anyAttribute")

+				{

+					level = 6;

+					XmlSchemaAnyAttribute anyattr = XmlSchemaAnyAttribute.Read(reader,h);

+					if(anyattr != null)

+						restriction.AnyAttribute = anyattr;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return restriction;

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleType.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleType.cs
new file mode 100755
index 00000000000..81007f59a63
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleType.cs
@@ -0,0 +1,237 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaSimpleType.

+	/// </summary>

+	public class XmlSchemaSimpleType : XmlSchemaType

+	{

+		private XmlSchemaSimpleTypeContent content;

+		//compilation vars

+		internal bool islocal = true; // Assuming local means we have to specify islocal=false only in XmlSchema

+		private static string xmlname = "simpleType";

+

+		public XmlSchemaSimpleType()

+		{

+		}

+

+		[XmlElement("restriction",typeof(XmlSchemaSimpleTypeRestriction),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("list",typeof(XmlSchemaSimpleTypeList),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("union",typeof(XmlSchemaSimpleTypeUnion),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaSimpleTypeContent Content

+		{

+			get{ return  content; } 

+			set{ content = value; }

+		}

+

+		/// <remarks>

+		/// For a simple Type:

+		///		1. Content must be present

+		///		2. id if present, must have be a valid ID

+		///		a) If the simpletype is local

+		///			1-	are from <xs:complexType name="simpleType"> and <xs:complexType name="localSimpleType">

+		///			1. name  is prohibited

+		///			2. final is prohibited

+		///		b) If the simpletype is toplevel

+		///			1-  are from <xs:complexType name="simpleType"> and <xs:complexType name="topLevelSimpleType">

+		///			1. name is required, type must be NCName

+		///			2. Content is required

+		///			3. final can have values : #all | (list | union | restriction)

+		///			4. If final is set, finalResolved is same as final (but within the values of b.3)

+		///			5. If final is not set, the finalDefault of the schema (ie. only #all and restriction)

+		///			6. Base type is:

+		///				4.1 If restriction is chosen,the base type of restriction or elements

+		///				4.2 otherwise simple ur-type

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			errorCount = 0;

+

+			if(this.islocal) // a

+			{

+				if(this.Name != null) // a.1

+					error(h,"Name is prohibited in a local simpletype");

+				if(this.Final != XmlSchemaDerivationMethod.None) //a.2

+					error(h,"Final is prohibited in a local simpletype");

+			}

+			else //b

+			{

+				if(this.Name == null) //b.1

+					error(h,"Name is required in top level simpletype");

+				else if(!XmlSchemaUtil.CheckNCName(this.Name)) // b.1.2

+					error(h,"name attribute of a simpleType must be NCName");

+				else

+					this.qName = new XmlQualifiedName(this.Name,info.TargetNamespace);

+				

+				//NOTE: Although the FinalResolved can be Empty, it is not a valid value for Final

+				//DEVIATION: If an error occurs, the finaldefault is always consulted. This deviates

+				//			 from the way MS implementation works.

+				switch(this.Final) //b.3, b.4

+				{

+					case XmlSchemaDerivationMethod.All:

+						this.finalResolved = XmlSchemaDerivationMethod.All;

+						break;

+					case XmlSchemaDerivationMethod.List:

+						this.finalResolved = XmlSchemaDerivationMethod.List;

+						break;

+					case XmlSchemaDerivationMethod.Union:

+						this.finalResolved = XmlSchemaDerivationMethod.Union;

+						break;

+					case XmlSchemaDerivationMethod.Restriction:

+						this.finalResolved = XmlSchemaDerivationMethod.Restriction;

+						break;

+					default:

+						error(h,"The value of final attribute is not valid for simpleType");

+						goto case XmlSchemaDerivationMethod.None;

+						// use assignment from finaldefault on schema.

+					case XmlSchemaDerivationMethod.None: // b.5

+						if(info.FinalDefault == XmlSchemaDerivationMethod.All)

+							finalResolved = XmlSchemaDerivationMethod.All;

+						else 

+							finalResolved = info.FinalDefault & (XmlSchemaDerivationMethod.Restriction | XmlSchemaDerivationMethod.List |

+								XmlSchemaDerivationMethod.Extension | XmlSchemaDerivationMethod.Union );

+						break;

+				}

+			}

+

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			if(this.Content == null) //a.3,b.2

+				error(h,"Content is required in a simpletype");

+			else if(Content is XmlSchemaSimpleTypeRestriction)

+			{

+				errorCount += ((XmlSchemaSimpleTypeRestriction)Content).Compile(h,info);

+			}

+			else if(Content is XmlSchemaSimpleTypeList)

+			{

+				errorCount += ((XmlSchemaSimpleTypeList)Content).Compile(h,info);

+			}

+			else if(Content is XmlSchemaSimpleTypeUnion)

+			{

+				errorCount += ((XmlSchemaSimpleTypeUnion)Content).Compile(h,info);

+			}

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			if(isCompiled)

+				return errorCount;

+

+			return errorCount;

+		}

+

+		//<simpleType 

+		//  final = (#all | (list | union | restriction)) 

+		//  id = ID 

+		//  name = NCName 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (restriction | list | union))

+		//</simpleType>

+		internal static XmlSchemaSimpleType Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaSimpleType stype = new XmlSchemaSimpleType();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaGroup.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			stype.LineNumber = reader.LineNumber;

+			stype.LinePosition = reader.LinePosition;

+			stype.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "final")

+				{

+					Exception innerex;

+					stype.Final = XmlSchemaUtil.ReadDerivationAttribute(reader, out innerex, "final");

+					if(innerex != null)

+						error(h, "some invalid values not a valid value for final", innerex);

+				}

+				else if(reader.Name == "id")

+				{

+					stype.Id = reader.Value;

+				}

+				else if(reader.Name == "name")

+				{

+					stype.Name = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for simpleType",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,stype);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return stype;

+

+			//	Content: (annotation?, (restriction | list | union))

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaSimpleType.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						stype.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2)

+				{

+					if(reader.LocalName == "restriction")

+					{

+						level = 3;

+						XmlSchemaSimpleTypeRestriction restriction = XmlSchemaSimpleTypeRestriction.Read(reader,h);

+						if(restriction != null)

+							stype.content = restriction;

+						continue;

+					}

+					if(reader.LocalName == "list")

+					{

+						level = 3;

+						XmlSchemaSimpleTypeList list = XmlSchemaSimpleTypeList.Read(reader,h);

+						if(list != null)

+							stype.content = list;

+						continue;

+					}

+					if(reader.LocalName == "union")

+					{

+						level = 3;

+						XmlSchemaSimpleTypeUnion union = XmlSchemaSimpleTypeUnion.Read(reader,h);

+						if(union != null)

+							stype.content = union;

+						continue;

+					}

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return stype;

+		}

+

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeContent.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeContent.cs
new file mode 100755
index 00000000000..6068361768c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeContent.cs
@@ -0,0 +1,17 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaSimpleTypeContent.

+	/// </summary>

+	public abstract class XmlSchemaSimpleTypeContent : XmlSchemaAnnotated

+	{

+		protected XmlSchemaSimpleTypeContent()

+		{

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeList.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeList.cs
new file mode 100755
index 00000000000..dea8741a540
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeList.cs
@@ -0,0 +1,152 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaSimpleTypeList.

+	/// </summary>

+	public class XmlSchemaSimpleTypeList : XmlSchemaSimpleTypeContent

+	{

+		private XmlSchemaSimpleType itemType;

+		private XmlQualifiedName itemTypeName;

+		private static string xmlname = "list";

+

+		public XmlSchemaSimpleTypeList()

+		{

+			this.ItemTypeName = XmlQualifiedName.Empty;

+		}

+

+		[System.Xml.Serialization.XmlAttribute("itemType")]

+		public XmlQualifiedName ItemTypeName

+		{

+			get{ return itemTypeName; } 

+			set

+			{

+				itemTypeName = value;

+			}

+		}

+

+		[XmlElement("simpleType",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaSimpleType ItemType 

+		{

+			get{ return itemType; } 

+			set

+			{

+				itemType = value;

+			}

+		}

+		/// <remarks>

+		/// 1. One of itemType or a <simpleType> must be present, but not both.

+		/// 2. id must be of type ID

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			errorCount = 0;

+

+			if(ItemType != null && !ItemTypeName.IsEmpty)

+				error(h, "both itemType and simpletype can't be present");

+			if(ItemType == null && ItemTypeName.IsEmpty)

+				error(h, "one of itemType or simpletype must be present");

+			if(ItemType != null)

+			{

+				errorCount += ItemType.Compile(h,info);

+			}

+			if(!XmlSchemaUtil.CheckQName(ItemTypeName))

+				error(h,"BaseTypeName must be a XmlQualifiedName");

+			

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<list 

+		//  id = ID 

+		//  itemType = QName 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (simpleType?))

+		//</list>

+		internal static XmlSchemaSimpleTypeList Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaSimpleTypeList list = new XmlSchemaSimpleTypeList();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaSimpleTypeList.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			list.LineNumber = reader.LineNumber;

+			list.LinePosition = reader.LinePosition;

+			list.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					list.Id = reader.Value;

+				}

+				else if(reader.Name == "itemType")

+				{

+					Exception innerex;

+					list.ItemTypeName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for itemType attribute",innerex);

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for list",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,list);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return list;

+			//  Content: annotation?, simpleType?

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaSimpleTypeList.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						list.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2 && reader.LocalName == "simpleType")

+				{

+					level = 3;

+					XmlSchemaSimpleType stype = XmlSchemaSimpleType.Read(reader,h);

+					if(stype != null)

+						list.itemType = stype;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return list;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeRestriction.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeRestriction.cs
new file mode 100755
index 00000000000..b3f78b77129
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeRestriction.cs
@@ -0,0 +1,267 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaSimpleTypeRestriction.

+	/// </summary>

+	public class XmlSchemaSimpleTypeRestriction : XmlSchemaSimpleTypeContent

+	{

+		private XmlSchemaSimpleType baseType;

+		private XmlQualifiedName baseTypeName;

+		private XmlSchemaObjectCollection facets;

+		private static string xmlname = "restriction";

+

+		public XmlSchemaSimpleTypeRestriction()

+		{

+			baseTypeName = XmlQualifiedName.Empty;

+			facets = new XmlSchemaObjectCollection();

+		}

+

+		[System.Xml.Serialization.XmlAttribute("base")]

+		public XmlQualifiedName BaseTypeName 

+		{

+			get{ return  baseTypeName; } 

+			set{ baseTypeName = value; }

+		}

+

+		[XmlElement("simpleType",Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaSimpleType BaseType 

+		{

+			get{ return  baseType; } 

+			set{ baseType = value; }

+		}

+

+		[XmlElement("minExclusive",typeof(XmlSchemaMinExclusiveFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("minInclusive",typeof(XmlSchemaMinInclusiveFacet),Namespace="http://www.w3.org/2001/XMLSchema")] 

+		[XmlElement("maxExclusive",typeof(XmlSchemaMaxExclusiveFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("maxInclusive",typeof(XmlSchemaMaxInclusiveFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("totalDigits",typeof(XmlSchemaTotalDigitsFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("fractionDigits",typeof(XmlSchemaFractionDigitsFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("length",typeof(XmlSchemaLengthFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("minLength",typeof(XmlSchemaMinLengthFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("maxLength",typeof(XmlSchemaMaxLengthFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("enumeration",typeof(XmlSchemaEnumerationFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("whiteSpace",typeof(XmlSchemaWhiteSpaceFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		[XmlElement("pattern",typeof(XmlSchemaPatternFacet),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection Facets 

+		{

+			get{ return facets; }

+		}

+

+		/// <remarks>

+		/// 1. One of base or simpletype must be present but not both

+		/// 2. id must be a valid ID

+		/// 3. base must be a valid QName *NO CHECK REQUIRED*

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			errorCount = 0;

+

+			if(this.baseType != null && !this.BaseTypeName.IsEmpty)

+				error(h, "both base and simpletype can't be set");

+			if(this.baseType == null && this.BaseTypeName.IsEmpty)

+				error(h, "one of basetype or simpletype must be present");

+			if(this.baseType != null)

+			{

+				errorCount += this.baseType.Compile(h,info);

+			}

+			if(!XmlSchemaUtil.CheckQName(BaseTypeName))

+				error(h,"BaseTypeName must be a XmlQualifiedName");

+

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<restriction 

+		//  base = QName 

+		//  id = ID 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (simpleType?, (minExclusive | minInclusive | maxExclusive | maxInclusive | totalDigits | fractionDigits | length | minLength | maxLength | enumeration | whiteSpace | pattern)*))

+		//</restriction>

+		internal static XmlSchemaSimpleTypeRestriction Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaSimpleTypeRestriction restriction = new XmlSchemaSimpleTypeRestriction();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaSimpleTypeRestriction.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			restriction.LineNumber = reader.LineNumber;

+			restriction.LinePosition = reader.LinePosition;

+			restriction.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					restriction.Id = reader.Value;

+				}

+				else if(reader.Name == "base")

+				{

+					Exception innerex;

+					restriction.baseTypeName = XmlSchemaUtil.ReadQNameAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for base attribute",innerex);

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for restriction",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,restriction);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return restriction;

+

+			//  Content: annotation?, simpleType?, (minExclusive |. .. | pattern)*

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaSimpleTypeRestriction.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						restriction.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2 && reader.LocalName == "simpleType")

+				{

+					level = 3;

+					XmlSchemaSimpleType stype = XmlSchemaSimpleType.Read(reader,h);

+					if(stype != null)

+						restriction.baseType = stype;

+					continue;

+				}

+				if(level <= 3)

+				{

+					if(reader.LocalName == "minExclusive")

+					{

+						level = 3;

+						XmlSchemaMinExclusiveFacet minex = XmlSchemaMinExclusiveFacet.Read(reader,h);

+						if(minex != null)

+							restriction.facets.Add(minex);

+						continue;

+					}

+					else if(reader.LocalName == "minInclusive")

+					{

+						level = 3;

+						XmlSchemaMinInclusiveFacet mini = XmlSchemaMinInclusiveFacet.Read(reader,h);

+						if(mini != null)

+							restriction.facets.Add(mini);

+						continue;

+					}

+					else if(reader.LocalName == "maxExclusive")

+					{

+						level = 3;

+						XmlSchemaMaxExclusiveFacet maxex = XmlSchemaMaxExclusiveFacet.Read(reader,h);

+						if(maxex != null)

+							restriction.facets.Add(maxex);

+						continue;

+					}

+					else if(reader.LocalName == "maxInclusive")

+					{

+						level = 3;

+						XmlSchemaMaxInclusiveFacet maxi = XmlSchemaMaxInclusiveFacet.Read(reader,h);

+						if(maxi != null)

+							restriction.facets.Add(maxi);

+						continue;

+					}

+					else if(reader.LocalName == "totalDigits")

+					{

+						level = 3;

+						XmlSchemaTotalDigitsFacet total = XmlSchemaTotalDigitsFacet.Read(reader,h);

+						if(total != null)

+							restriction.facets.Add(total);

+						continue;

+					}

+					else if(reader.LocalName == "fractionDigits")

+					{

+						level = 3;

+						XmlSchemaFractionDigitsFacet fraction = XmlSchemaFractionDigitsFacet.Read(reader,h);

+						if(fraction != null)

+							restriction.facets.Add(fraction);

+						continue;

+					}

+					else if(reader.LocalName == "length")

+					{

+						level = 3;

+						XmlSchemaLengthFacet length = XmlSchemaLengthFacet.Read(reader,h);

+						if(length != null)

+							restriction.facets.Add(length);

+						continue;

+					}

+					else if(reader.LocalName == "minLength")

+					{

+						level = 3;

+						XmlSchemaMinLengthFacet minlen = XmlSchemaMinLengthFacet.Read(reader,h);

+						if(minlen != null)

+							restriction.facets.Add(minlen);

+						continue;

+					}

+					else if(reader.LocalName == "maxLength")

+					{

+						level = 3;

+						XmlSchemaMaxLengthFacet maxlen = XmlSchemaMaxLengthFacet.Read(reader,h);

+						if(maxlen != null)

+							restriction.facets.Add(maxlen);

+						continue;

+					}

+					else if(reader.LocalName == "enumeration")

+					{

+						level = 3;

+						XmlSchemaEnumerationFacet enumeration = XmlSchemaEnumerationFacet.Read(reader,h);

+						if(enumeration != null)

+							restriction.facets.Add(enumeration);

+						continue;

+					}

+					else if(reader.LocalName == "whiteSpace")

+					{

+						level = 3;

+						XmlSchemaWhiteSpaceFacet ws = XmlSchemaWhiteSpaceFacet.Read(reader,h);

+						if(ws != null)

+							restriction.facets.Add(ws);

+						continue;

+					}

+					else if(reader.LocalName == "pattern")

+					{

+						level = 3;

+						XmlSchemaPatternFacet pattern = XmlSchemaPatternFacet.Read(reader,h);

+						if(pattern != null)

+							restriction.facets.Add(pattern);

+						continue;

+					}

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return restriction;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeUnion.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeUnion.cs
new file mode 100755
index 00000000000..f6279ad6bf3
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaSimpleTypeUnion.cs
@@ -0,0 +1,175 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaSimpleTypeUnion.

+	/// </summary>

+	public class XmlSchemaSimpleTypeUnion : XmlSchemaSimpleTypeContent

+	{

+		private XmlSchemaObjectCollection baseTypes;

+		private XmlQualifiedName[] memberTypes;

+		private static string xmlname = "union";

+

+		public XmlSchemaSimpleTypeUnion()

+		{

+			baseTypes = new XmlSchemaObjectCollection();

+		}

+

+		[XmlElement("simpleType",typeof(XmlSchemaSimpleType),Namespace="http://www.w3.org/2001/XMLSchema")]

+		public XmlSchemaObjectCollection BaseTypes 

+		{

+			get{ return baseTypes; }

+		}

+

+		[System.Xml.Serialization.XmlAttribute("memberTypes")]

+		public XmlQualifiedName[] MemberTypes

+		{

+			get{ return  memberTypes; } 

+			set{ memberTypes = value; }

+		}

+		/// <remarks>

+		/// 1. Circular union type definition is disallowed. (WTH is this?)

+		/// 2. id must be a valid ID

+		/// </remarks>

+		[MonoTODO]

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			errorCount = 0;

+

+			int count = BaseTypes.Count;

+

+			foreach(XmlSchemaObject obj in baseTypes)

+			{

+				if(obj != null && obj is XmlSchemaSimpleType)

+				{

+					XmlSchemaSimpleType stype = (XmlSchemaSimpleType) obj;

+					errorCount += stype.Compile(h,info);

+				}

+				else

+				{

+					error(h, "baseTypes can't have objects other than a simpletype");

+				}

+			}

+			

+			if(memberTypes!=null)

+			{

+				for(int i=0; i< memberTypes.Length; i++)

+				{

+					if(memberTypes[i] == null || !XmlSchemaUtil.CheckQName(MemberTypes[i]))

+					{

+						warn(h,"Invalid membertype");

+						memberTypes[i] = XmlQualifiedName.Empty;

+					}

+					else

+					{

+						count += MemberTypes.Length;

+					}

+				}

+			}

+

+			if(count == 0)

+				error(h, "Atleast one simpletype or membertype must be present");

+

+			XmlSchemaUtil.CompileID(Id,this,info.IDCollection,h);

+

+			return errorCount;

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+		//<union 

+		//  id = ID 

+		//  memberTypes = List of QName 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (simpleType*))

+		//</union>

+		internal static XmlSchemaSimpleTypeUnion Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaSimpleTypeUnion union = new XmlSchemaSimpleTypeUnion();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaSimpleTypeUnion.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			union.LineNumber = reader.LineNumber;

+			union.LinePosition = reader.LinePosition;

+			union.SourceUri = reader.BaseURI;

+

+			//Read Attributes

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					union.Id = reader.Value;

+				}

+				else if(reader.Name == "memberTypes")

+				{

+					Exception innerEx;

+					string[] names = XmlSchemaUtil.SplitList(reader.Value);

+					union.memberTypes = new XmlQualifiedName[names.Length];

+					for(int i=0;i<names.Length;i++)

+					{

+						union.memberTypes[i] = XmlSchemaUtil.ToQName(reader,names[i],out innerEx);

+						if(innerEx != null)

+							error(h,"'"+names[i] + "' is not a valid memberType",innerEx);

+					}

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for union",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,union);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return union;

+

+			//  Content: annotation?, simpleType*

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaSimpleTypeUnion.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						union.Annotation = annotation;

+					continue;

+				}

+				if(level <=2 && reader.LocalName == "simpleType")

+				{

+					level = 2;

+					XmlSchemaSimpleType stype = XmlSchemaSimpleType.Read(reader,h);

+					if(stype != null)

+						union.baseTypes.Add(stype);

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return union;

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaTotalDigitsFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaTotalDigitsFacet.cs
new file mode 100755
index 00000000000..d7ef688b549
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaTotalDigitsFacet.cs
@@ -0,0 +1,96 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaTotalDigitsFacet.

+	/// </summary>

+	public class XmlSchemaTotalDigitsFacet : XmlSchemaNumericFacet

+	{

+		private static string xmlname = "totalDigits";

+

+		public XmlSchemaTotalDigitsFacet()

+		{

+		}

+		//<totalDigits

+		//  fixed = boolean : false

+		//  id = ID

+		//  value = positiveInteger

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</totalDigits>

+		internal static XmlSchemaTotalDigitsFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaTotalDigitsFacet td = new XmlSchemaTotalDigitsFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaTotalDigitsFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			td.LineNumber = reader.LineNumber;

+			td.LinePosition = reader.LinePosition;

+			td.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					td.Id = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					Exception innerex;

+					td.IsFixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for fixed attribute",innerex);

+				}

+				else if(reader.Name == "value")

+				{

+					td.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+xmlname,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,td);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return td;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaTotalDigitsFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						td.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return td;

+		}	

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs
new file mode 100755
index 00000000000..e1a24b97c17
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaType.cs
@@ -0,0 +1,81 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+using System.ComponentModel;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaType.

+	/// </summary>

+	public class XmlSchemaType : XmlSchemaAnnotated

+	{

+		private object baseSchemaType;

+		private XmlSchemaDatatype datatype;

+		private XmlSchemaDerivationMethod derivedBy;

+		private XmlSchemaDerivationMethod final;

+		internal XmlSchemaDerivationMethod finalResolved;

+		private bool isMixed;

+		private string name;

+		internal XmlQualifiedName qName;

+

+		public XmlSchemaType()

+		{

+			final = XmlSchemaDerivationMethod.None;

+			qName = XmlQualifiedName.Empty;

+		}

+

+		#region Attributes

+		[System.Xml.Serialization.XmlAttribute("name")]

+		public string Name 

+		{

+			get{ return name; }

+			set{ name = value; }

+		}

+		[DefaultValue(XmlSchemaDerivationMethod.None)]

+		[System.Xml.Serialization.XmlAttribute("final")]

+		public XmlSchemaDerivationMethod Final 

+		{

+			get{ return  final; }

+			set{ final = value; }

+		}

+		[XmlIgnore]

+		public XmlQualifiedName QualifiedName 

+		{

+			get{ return qName; }

+		}

+		[XmlIgnore]

+		public XmlSchemaDerivationMethod FinalResolved 

+		{

+			get{ return finalResolved; }

+		}

+		[XmlIgnore]

+		public object BaseSchemaType 

+		{

+			get{ return  baseSchemaType; }

+		}

+		[XmlIgnore]

+		public XmlSchemaDerivationMethod DerivedBy 

+		{

+			get{ return derivedBy; }

+		}

+		[XmlIgnore]

+		public XmlSchemaDatatype Datatype 

+		{

+			get{ return datatype; }

+		}

+		#endregion

+

+		#region XmlIgnore

+		[XmlIgnore]

+		public virtual bool IsMixed 

+		{  

+			get{ return  isMixed; }

+			set{ isMixed = value; } 

+		}

+		#endregion

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaUnique.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaUnique.cs
new file mode 100755
index 00000000000..bb8fd7a6e0d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaUnique.cs
@@ -0,0 +1,126 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaUnique.

+	/// </summary>

+	public class XmlSchemaUnique : XmlSchemaIdentityConstraint

+	{

+		private static string xmlname = "unique";

+

+		public XmlSchemaUnique()

+		{

+		}

+		/// <remarks>

+		/// 1. name must be present

+		/// 2. selector and field must be present

+		/// </remarks>

+		[MonoTODO]

+		internal new int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			return base.Compile(h,info);

+		}

+		

+		[MonoTODO]

+		internal int Validate(ValidationEventHandler h)

+		{

+			return errorCount;

+		}

+

+		internal new void error(ValidationEventHandler handle, string message)

+		{

+			errorCount++;

+			ValidationHandler.RaiseValidationError(handle, this, message);

+		}

+		//<unique 

+		//  id = ID 

+		//  name = NCName 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?, (selector, field+))

+		//</unique>

+		internal static XmlSchemaUnique Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaUnique unique = new XmlSchemaUnique();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaUnique.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			unique.LineNumber = reader.LineNumber;

+			unique.LinePosition = reader.LinePosition;

+			unique.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					unique.Id = reader.Value;

+				}

+				else if(reader.Name == "name")

+				{

+					unique.Name = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for unique",null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,unique);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return unique;

+

+			//  Content: annotation?, selector, field+

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaUnion.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2; //Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						unique.Annotation = annotation;

+					continue;

+				}

+				if(level <= 2 && reader.LocalName == "selector")

+				{

+					level = 3;

+					XmlSchemaXPath selector = XmlSchemaXPath.Read(reader,h,"selector");

+					if(selector != null)

+						unique.Selector = selector;

+					continue;

+				}

+				if(level <= 3 && reader.LocalName == "field")

+				{

+					level = 3;

+					if(unique.Selector == null)

+						error(h,"selector must be defined before field declarations",null);

+					XmlSchemaXPath field = XmlSchemaXPath.Read(reader,h,"field");

+					if(field != null)

+						unique.Fields.Add(field);

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return unique;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaUse.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaUse.cs
new file mode 100755
index 00000000000..8015edd8ed2
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaUse.cs
@@ -0,0 +1,22 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaUse.

+	/// </summary>

+	public enum XmlSchemaUse 

+	{

+		[XmlIgnore]

+		None = 0x00000000, 

+		[XmlEnum("optional")]

+		Optional = 0x00000001, 

+		[XmlEnum("prohibited")]

+		Prohibited = 0x00000002, 

+		[XmlEnum("required")]

+		Required = 0x00000003, 

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaUtil.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaUtil.cs
new file mode 100755
index 00000000000..dc6a7c6a64d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaUtil.cs
@@ -0,0 +1,299 @@
+using System;

+using System.Xml;

+using System.Collections;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	///  All Methods in this class should use XmlConvert. Some Methods are not present in the

+	///  MS Implementation. We should provide them.

+	/// </summary>

+	internal class XmlSchemaUtil

+	{

+		private XmlSchemaUtil()

+		{}

+

+		public static void CompileID(string id,  XmlSchemaObject xso, Hashtable idCollection, ValidationEventHandler h)

+		{

+			//check if the string conforms to http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/datatypes.html#ID

+			// 1. ID must be a NCName

+			// 2. ID must be unique in the schema

+			if(id == null)

+				return;

+			if(!CheckNCName(id)) 

+				xso.error(h,id+" is not a valid id attribute");

+			else if(idCollection.ContainsKey(id))

+				xso.error(h,"Duplicate id attribute "+id);

+			else

+				idCollection.Add(id,xso);

+		}

+

+		[MonoTODO]

+		public static bool CheckAnyUri(string uri)

+		{

+			 return true;

+		}

+

+		public static bool CheckToken(string token)

+		{

+			//check if the string conforms to http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/datatypes.html#token

+			return true;

+		}

+

+		public static bool CheckNormalizedString(string token)

+		{

+			return true;

+		}

+

+		public static bool CheckLanguage(string lang)

+		{

+			//check if the string conforms to http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/datatypes.html#language

+			return true;

+		}

+		public static bool CheckNCName(string name)

+		{

+			//check if the string conforms to http://www.w3.org/TR/2001/REC-xmlschema-2-20010502/datatypes.html#NCName

+			try

+			{

+				XmlConvert.VerifyNCName(name);

+				return true;

+			}

+			catch(Exception ex)

+			{

+				return false;

+			}

+		}

+

+		public static bool CheckQName(XmlQualifiedName qname)

+		{

+			return true;

+		}

+		public static bool IsValidQName(string qname)

+		{

+			foreach(string part in qname.Split(new char[]{':'},2))

+			{

+				if(!CheckNCName(part))

+					return false;

+			}

+			return true;

+		}

+

+		//FIXME: First remove all the multiple instances of whitespace and then return the strings.

+		//The current method returns empty strings if there are two or more consecutive whitespaces.

+		public static string[] SplitList(string list)

+		{

+			if(list == null || list == string.Empty)

+				return new String[0];

+

+			string[] listarr = list.Split(new char[]{' ','\t','\n'});

+			int pos=0;

+			int i = 0;

+			for(i=0;i<listarr.Length;i++)

+			{

+				if(listarr[i] != null && listarr[i] != String.Empty)

+				{

+					listarr[pos++] = listarr[i];

+				}

+			}

+			if(pos == i)

+				return listarr;

+			string[] retarr = new String[pos];

+			if(pos!=0)

+				Array.Copy(listarr, retarr, pos);

+			return retarr;

+		}

+

+		public static void ReadUnhandledAttribute(XmlReader reader, XmlSchemaObject xso)

+		{

+			if(reader.Prefix == "xmlns")

+				xso.Namespaces.Add(reader.LocalName, reader.Value);

+			else if(reader.Name == "xmlns")

+				xso.Namespaces.Add("",reader.Value);

+			else

+			{

+				if(xso.unhandledAttributeList == null)

+					xso.unhandledAttributeList = new System.Collections.ArrayList();

+				XmlAttribute attr = new XmlDocument().CreateAttribute(reader.LocalName,reader.NamespaceURI);

+				attr.Value = reader.Value;

+				xso.unhandledAttributeList.Add(attr);

+			}

+		}

+

+		public static bool ReadBoolAttribute(XmlReader reader, out Exception innerExcpetion)

+		{

+			innerExcpetion = null;

+			try

+			{

+				bool val = XmlConvert.ToBoolean(reader.Value);

+				return val;

+			}

+			catch(Exception ex)

+			{

+				innerExcpetion = ex;

+				return false;

+			}

+		}

+		public static decimal ReadDecimalAttribute(XmlReader reader,  out Exception innerExcpetion)

+		{

+			innerExcpetion = null;

+			try

+			{

+				decimal val = XmlConvert.ToDecimal(reader.Value);

+				return val;

+			}

+			catch(Exception ex)

+			{

+				innerExcpetion = ex;

+				return decimal.Zero;

+			}

+		}

+

+		// Is some value is read, return it.

+		// If no values return empty.

+		// If exception, return none

+		public static XmlSchemaDerivationMethod ReadDerivationAttribute(XmlReader reader, out Exception innerExcpetion, string name)

+		{

+			innerExcpetion = null;

+			try

+			{

+				string list = reader.Value;

+				string warn = "";

+				XmlSchemaDerivationMethod val = 0;

+				

+				if(list.IndexOf("#all") != -1 && list.Trim() != "#all")

+				{

+					innerExcpetion = new Exception(list+" is not a valid value for "+ name +". #all if present must be the only value");

+					return XmlSchemaDerivationMethod.All;

+				}

+				foreach(string xsdm in XmlSchemaUtil.SplitList(list))

+				{

+					switch(xsdm)

+					{

+						case "":

+							val |= XmlSchemaDerivationMethod.Empty; break;

+						case "#all":

+							val |= XmlSchemaDerivationMethod.All; break;

+						case "substitution":

+							val |= XmlSchemaDerivationMethod.Substitution; break;

+						case "extension":

+							val |= XmlSchemaDerivationMethod.Extension; break;

+						case "restriction":

+							val |= XmlSchemaDerivationMethod.Restriction; break;

+						case "list":

+							val |= XmlSchemaDerivationMethod.List; break;

+						case "union":

+							val |= XmlSchemaDerivationMethod.Union; break;

+						default:

+							warn += xsdm + " "; break;

+					}

+				}

+				if(warn != "")

+						innerExcpetion = new Exception(warn + "is/are not valid values for " + name);

+				return val;

+			}

+			catch(Exception ex)

+			{

+				innerExcpetion = ex;

+				return XmlSchemaDerivationMethod.None;

+			}

+		}

+

+		public static XmlSchemaForm ReadFormAttribute(XmlReader reader, out Exception innerExcpetion)

+		{

+			innerExcpetion = null;

+			XmlSchemaForm val = XmlSchemaForm.None;

+			switch(reader.Value)

+			{

+				case "qualified":

+					val = XmlSchemaForm.Qualified; break;

+				case "unqualified":

+					val = XmlSchemaForm.Unqualified; break;

+				default:

+					innerExcpetion = new Exception("only qualified or unqulified is a valid value"); break;

+			}

+			return val;

+		}

+

+		public static XmlSchemaContentProcessing ReadProcessingAttribute(XmlReader reader, out Exception innerExcpetion)

+		{

+			innerExcpetion = null;

+			XmlSchemaContentProcessing val = XmlSchemaContentProcessing.None;

+			switch(reader.Value)

+			{

+				case "lax":

+					val = XmlSchemaContentProcessing.Lax; break;

+				case "strict":

+					val = XmlSchemaContentProcessing.Strict; break;

+				case "skip":

+					val = XmlSchemaContentProcessing.Skip; break;

+				default:

+					innerExcpetion = new Exception("only lax , strict or skip are valid values for processContents");

+					break;

+			}

+			return val;

+		}

+

+		public static XmlSchemaUse ReadUseAttribute(XmlReader reader, out Exception innerExcpetion)

+		{

+			innerExcpetion = null;

+			XmlSchemaUse val = XmlSchemaUse.None;

+			switch(reader.Value)

+			{

+				case "optional":

+					val = XmlSchemaUse.Optional; break;

+				case "prohibited":

+					val = XmlSchemaUse.Prohibited; break;

+				case "required":

+					val = XmlSchemaUse.Required; break;

+				default:

+					innerExcpetion = new Exception("only optional , prohibited or required are valid values for use");

+					break;

+			}

+			return val;

+		}

+		public static XmlQualifiedName ReadQNameAttribute(XmlReader reader, out Exception innerEx)

+		{

+			return ToQName(reader, reader.Value, out innerEx);

+		}

+

+		//While Creating a XmlQualifedName, we should check:

+		// 1. If a prefix is present, its namespace should be resolvable.

+		// 2. If a prefix is not present, and if the defaultNamespace is set, 

+		public static XmlQualifiedName ToQName(XmlReader reader, string qnamestr, out Exception innerEx)

+		{

+

+			string ns;

+			string name;

+			XmlQualifiedName qname;

+			innerEx = null;

+			

+			if(!IsValidQName(qnamestr))

+			{

+				innerEx = new Exception(qnamestr + " is an invalid QName. Either name or namespace is not a NCName");

+				return XmlQualifiedName.Empty;

+			}

+

+			string[] values = qnamestr.Split(new char[]{':'},2);

+

+			if(values.Length == 2)

+			{

+				ns = reader.LookupNamespace(values[0]);

+				if(ns == null)

+				{

+					innerEx = new Exception("Namespace Prefix '"+values[0]+"could not be resolved");

+					return XmlQualifiedName.Empty;

+				}

+				name = values[1];

+			}

+			else

+			{

+				//Default Namespace

+				ns = reader.LookupNamespace("");

+				name = values[0];

+			}

+

+			qname = new XmlQualifiedName(name,ns);

+			return qname;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaWhiteSpaceFacet.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaWhiteSpaceFacet.cs
new file mode 100755
index 00000000000..df39caba223
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaWhiteSpaceFacet.cs
@@ -0,0 +1,97 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaWhiteSpaceFacet.

+	/// </summary>

+	public class XmlSchemaWhiteSpaceFacet : XmlSchemaFacet

+	{

+		private static string xmlname = "whiteSpace";

+

+		public XmlSchemaWhiteSpaceFacet()

+		{

+		}

+		//	<whiteSpace

+		//	fixed = boolean : false

+		//	id = ID

+		//	value = (collapse | preserve | replace)

+		//	{any attributes with non-schema namespace . . .}>

+		//	Content: (annotation?)

+		//	</whiteSpace>

+		internal static XmlSchemaWhiteSpaceFacet Read(XmlSchemaReader reader, ValidationEventHandler h)

+		{

+			XmlSchemaWhiteSpaceFacet ws = new XmlSchemaWhiteSpaceFacet();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != xmlname)

+			{

+				error(h,"Should not happen :1: XmlSchemaWhiteSpaceFacet.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			ws.LineNumber = reader.LineNumber;

+			ws.LinePosition = reader.LinePosition;

+			ws.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					ws.Id = reader.Value;

+				}

+				else if(reader.Name == "fixed")

+				{

+					Exception innerex;

+					ws.IsFixed = XmlSchemaUtil.ReadBoolAttribute(reader,out innerex);

+					if(innerex != null)

+						error(h, reader.Value + " is not a valid value for fixed attribute",innerex);

+				}

+				else if(reader.Name == "value")

+				{

+					ws.Value = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+xmlname,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,ws);

+				}

+			}

+			

+			reader.MoveToElement();

+			if(reader.IsEmptyElement)

+				return ws;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != xmlname)

+						error(h,"Should not happen :2: XmlSchemaWhiteSpaceFacet.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						ws.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}			

+			return ws;

+		}

+

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSchemaXPath.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaXPath.cs
new file mode 100755
index 00000000000..8f7447e0f53
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSchemaXPath.cs
@@ -0,0 +1,104 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+using System.Xml.Serialization;

+using System.ComponentModel;

+using System.Xml;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSchemaXPath.

+	/// </summary>

+	public class XmlSchemaXPath : XmlSchemaAnnotated

+	{

+		private string xpath;

+

+		public XmlSchemaXPath()

+		{

+		}

+		[DefaultValue(null)]

+		[System.Xml.Serialization.XmlAttribute("xpath")]

+		public string XPath 

+		{

+			get{ return  xpath; } 

+			set{ xpath = value; }

+		}

+

+		internal int Compile(ValidationEventHandler h, XmlSchemaInfo info)

+		{

+			XmlSchemaUtil.CompileID(Id, this, info.IDCollection, h);

+			return errorCount;

+		}

+

+		//<selector 

+		//  id = ID 

+		//  xpath = a subset of XPath expression, see below 

+		//  {any attributes with non-schema namespace . . .}>

+		//  Content: (annotation?)

+		//</selector>

+		internal static XmlSchemaXPath Read(XmlSchemaReader reader, ValidationEventHandler h,string name)

+		{

+			XmlSchemaXPath path = new XmlSchemaXPath();

+			reader.MoveToElement();

+

+			if(reader.NamespaceURI != XmlSchema.Namespace || reader.LocalName != name)

+			{

+				error(h,"Should not happen :1: XmlSchemaComplexContentRestriction.Read, name="+reader.Name,null);

+				reader.Skip();

+				return null;

+			}

+

+			path.LineNumber = reader.LineNumber;

+			path.LinePosition = reader.LinePosition;

+			path.SourceUri = reader.BaseURI;

+

+			while(reader.MoveToNextAttribute())

+			{

+				if(reader.Name == "id")

+				{

+					path.Id = reader.Value;

+				}

+				else if(reader.Name == "xpath")

+				{

+					path.xpath = reader.Value;

+				}

+				else if((reader.NamespaceURI == "" && reader.Name != "xmlns") || reader.NamespaceURI == XmlSchema.Namespace)

+				{

+					error(h,reader.Name + " is not a valid attribute for "+name,null);

+				}

+				else

+				{

+					XmlSchemaUtil.ReadUnhandledAttribute(reader,path);

+				}

+			}

+

+			reader.MoveToElement();	

+			if(reader.IsEmptyElement)

+				return path;

+

+			//  Content: (annotation?)

+			int level = 1;

+			while(reader.ReadNextElement())

+			{

+				if(reader.NodeType == XmlNodeType.EndElement)

+				{

+					if(reader.LocalName != name)

+						error(h,"Should not happen :2: XmlSchemaXPath.Read, name="+reader.Name,null);

+					break;

+				}

+				if(level <= 1 && reader.LocalName == "annotation")

+				{

+					level = 2;	//Only one annotation

+					XmlSchemaAnnotation annotation = XmlSchemaAnnotation.Read(reader,h);

+					if(annotation != null)

+						path.Annotation = annotation;

+					continue;

+				}

+				reader.RaiseInvalidElementError();

+			}

+			return path;

+		}

+

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.XML/System.Xml.Schema/XmlSeverityType.cs b/mcs/class/System.XML/System.Xml.Schema/XmlSeverityType.cs
new file mode 100755
index 00000000000..f16d15967e8
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Schema/XmlSeverityType.cs
@@ -0,0 +1,15 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+using System;

+

+namespace System.Xml.Schema

+{

+	/// <summary>

+	/// Summary description for XmlSeverityType.

+	/// </summary>

+	public enum XmlSeverityType 

+	{

+		Error = 0x00000000, 

+		Warning = 0x00000001, 

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/AssemblyInfo.cs b/mcs/class/System.XML/System.Xml.Serialization/AssemblyInfo.cs
new file mode 100644
index 00000000000..177a4f0e70a
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/AssemblyInfo.cs
@@ -0,0 +1,58 @@
+using System.Reflection;

+using System.Runtime.CompilerServices;

+

+//

+// General Information about an assembly is controlled through the following 

+// set of attributes. Change these attribute values to modify the information

+// associated with an assembly.

+//

+[assembly: AssemblyTitle("")]

+[assembly: AssemblyDescription("")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("")]

+[assembly: AssemblyProduct("")]

+[assembly: AssemblyCopyright("")]

+[assembly: AssemblyTrademark("")]

+[assembly: AssemblyCulture("")]		

+

+//

+// Version information for an assembly consists of the following four values:

+//

+//      Major Version

+//      Minor Version 

+//      Build Number

+//      Revision

+//

+// You can specify all the values or you can default the Revision and Build Numbers 

+// by using the '*' as shown below:

+

+[assembly: AssemblyVersion("1.0.*")]

+

+//

+// In order to sign your assembly you must specify a key to use. Refer to the 

+// Microsoft .NET Framework documentation for more information on assembly signing.

+//

+// Use the attributes below to control which key is used for signing. 

+//

+// Notes: 

+//   (*) If no key is specified, the assembly is not signed.

+//   (*) KeyName refers to a key that has been installed in the Crypto Service

+//       Provider (CSP) on your machine. KeyFile refers to a file which contains

+//       a key.

+//   (*) If the KeyFile and the KeyName values are both specified, the 

+//       following processing occurs:

+//       (1) If the KeyName can be found in the CSP, that key is used.

+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 

+//           in the KeyFile is installed into the CSP and used.

+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.

+//       When specifying the KeyFile, the location of the KeyFile should be

+//       relative to the project output directory which is

+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is

+//       located in the project directory, you would specify the AssemblyKeyFile 

+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]

+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

+//       documentation for more information on this.

+//

+[assembly: AssemblyDelaySign(false)]

+[assembly: AssemblyKeyFile("")]

+[assembly: AssemblyKeyName("")]

diff --git a/mcs/class/System.XML/System.Xml.Serialization/ChangeLog b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
new file mode 100755
index 00000000000..f2c9faa2305
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/ChangeLog
@@ -0,0 +1,94 @@
+2002-08-22  Tim Coleman <tim@timcoleman.com>
+	* XmlSerializationReader.cs:
+		Some implementation
+	* XmlSerializationWriter.cs:
+		More implementation
+	* XmlCustomFormatter.cs:
+		Implemented this class.
+
+2002-08-20  Tim Coleman <tim@timcoleman.com>
+	* XmlSerializationWriter.cs:
+		Some implementation.
+
+2002-08-19  Tim Coleman <tim@timcoleman.com>
+	* XmlSerializer.cs:
+		New stubs added.
+	* XmlSerializationWriter.cs:
+		New stubs added.
+
+2002-08-14  Tim Coleman <tim@timcoleman.com>
+	* XmlSerializer.cs:
+		More reformatting of source code so I can
+		better understand what it does.
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>
+	* XmlSerializer.cs:
+		Some reformatting of code for readability.
+		Modify to correctly serialize ICollection objects
+		such as the BindingCollection of a ServiceDescription
+		for example.
+
+2002-08-03  Tim Coleman <tim@timcoleman.com>
+	* XmlSerializer.cs: 
+		Changed Implements() to check based on name rather
+		than FullName.  FullName was never working correctly.
+
+2002-07-26  Tim Coleman <tim@timcoleman.com>
+	* XmlSerializer.cs:
+		The constructor now looks for an XmlRootAttribute attribute
+		if one is not passed in.  Various changes to make it emit
+		proper XML, such as handling an element without a namespace
+		prefix, and using WriteEndDocument where it should be.
+
+2002-07-24  Tim Coleman <tim@timcoleman.com>
+	* CodeIdentifier.cs:
+	* IXmlSerializable.cs:
+	* XmlSerializationCollectionFixupCallback.cs:
+	* XmlSerializationFixupCallback.cs:
+	* XmlSerializationReadCallback.cs:
+	* XmlSerializationReader.cs:
+	* XmlSerializationWriteCallback.cs:
+		Add new classes.
+	* XmlSchemas.cs
+	* CodeIdentifiers.cs:
+		Implement some of these classes
+	* XmlCodeExporter.cs:
+		Fix return type of a function
+
+2002-07-24  Tim Coleman <tim@timcoleman.com>
+	* SoapReflectionImporter.cs:
+		New class added to build
+		System.Web.Services.Description.ServiceDescription.cs
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* CodeIdentifiers.cs:
+	* SoapCodeExporter.cs:
+	* SoapSchemaExporter.cs:
+	* XmlCodeExporter.cs:
+	* XmlMemberMapping.cs:
+	* XmlMembersMapping.cs:
+	* XmlReflectionImporter.cs:
+	* XmlReflectionMember.cs:
+	* XmlSchemaExporter.cs:
+	* XmlSchemaImporter.cs:
+	* XmlSchemas.cs: 
+		New stubbs added to aid in the linux build of
+		System.Web.Services.
+
+2002-07-05  Ajay kumar Dwivedi <adwiv@yahoo.com>
+	
+	* XmlSeriailizer: Serialize method can serialize XmlSchema perfectly.
+
+	* XmlSerializerNamespaces: Reverted to use of a single Hashtable.
+
+2002-07-02  Ajay kumar Dwivedi <adwiv@yahoo.com>
+	
+	* XmlSeriailizer: Updated Serialize() method.
+
+2002-06-27 Ajay kumar Dwivedi <adwiv@yahoo.com>
+	* XmlSerializer: Serialize() method Partially Implemented.
+
+2002-06-20 Ajay kumar Dwivedi <adwiv@yahoo.com>
+
+	* Soap & XmlOverrides: Implemented using TypeMember as key with
+	  suggestions from Rafael.
diff --git a/mcs/class/System.XML/System.Xml.Serialization/CodeIdentifier.cs b/mcs/class/System.XML/System.Xml.Serialization/CodeIdentifier.cs
new file mode 100644
index 00000000000..94a532b402b
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/CodeIdentifier.cs
@@ -0,0 +1,50 @@
+//
+// System.Xml.Serialization.CodeIdentifier.cs
+//
+// Author: 
+//    Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+
+namespace System.Xml.Serialization {
+	public class CodeIdentifier {
+
+		public CodeIdentifier ()
+		{
+		}
+
+		public static string MakeCamel (string identifier)
+		{
+			string validIdentifier = MakeValid (identifier);
+			return (Char.ToLower (validIdentifier[0]) + validIdentifier.Substring (1));
+		}
+
+		public static string MakePascal (string identifier)
+		{
+			string validIdentifier = MakeValid (identifier);
+			return (Char.ToUpper (validIdentifier[0]) + validIdentifier.Substring (1));
+		}
+
+		public static string MakeValid (string identifier)
+		{
+			if (identifier == null)
+				throw new NullReferenceException ();
+			if (identifier.Length == 0)
+				return identifier;
+
+			string output = "";
+
+			if (Char.IsNumber (identifier[0]))
+				output = "Item";
+
+			foreach (char c in identifier) 
+				if (Char.IsLetterOrDigit (c) || c == '_')
+					output += c;
+
+			return output;
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/CodeIdentifiers.cs b/mcs/class/System.XML/System.Xml.Serialization/CodeIdentifiers.cs
new file mode 100644
index 00000000000..a93a3805542
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/CodeIdentifiers.cs
@@ -0,0 +1,108 @@
+// 

+// System.Xml.Serialization.CodeIdentifiers 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Collections;

+

+namespace System.Xml.Serialization {

+	public class CodeIdentifiers {

+

+		#region Fields

+

+		bool useCamelCasing;

+		static Hashtable table = new Hashtable ();

+

+		#endregion

+

+		#region Constructors

+

+		public CodeIdentifiers ()

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool UseCamelCasing {

+			get { return useCamelCasing; }

+			set { useCamelCasing = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public void Add (string identifier, object value)

+		{

+			table.Add (identifier, value);

+		}

+

+		[MonoTODO ("What does this do?")]

+		public void AddReserved (string identifier)

+		{

+			throw new NotImplementedException ();

+		}

+

+		public void AddUnique (string identifier, object value)

+		{

+			Add (MakeUnique (identifier), value);

+		}

+

+		public void Clear ()

+		{

+			table.Clear ();

+		}

+

+		public bool IsInUse (string identifier)

+		{

+			return (table.ContainsKey (identifier));

+		}

+

+		public string MakeRightCase (string identifier)

+		{

+			if (UseCamelCasing)

+				return CodeIdentifier.MakeCamel (identifier);

+			else

+				return CodeIdentifier.MakePascal (identifier);

+		}

+

+		public string MakeUnique (string identifier)

+		{

+			string uniqueIdentifier = identifier;

+			int i = 1;

+

+			while (IsInUse (uniqueIdentifier)) {

+				uniqueIdentifier = String.Format ("{0}{1}", identifier, i.ToString ());

+				i += 1;

+			}

+

+			return uniqueIdentifier;

+		}

+

+		public void Remove (string identifier)

+		{

+			table.Remove (identifier);

+		}

+

+		[MonoTODO ("What does this do?")]

+		public void RemoveReserved (string identifier)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO ("Need to determine how to do the conversion.")]

+		public object ToArray (Type type)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/IXmlSerializable.cs b/mcs/class/System.XML/System.Xml.Serialization/IXmlSerializable.cs
new file mode 100644
index 00000000000..3aa7f785e69
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/IXmlSerializable.cs
@@ -0,0 +1,19 @@
+//
+// System.Xml.Serialization.IXmlSerializable.cs
+//
+// Author: 
+//    Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Xml.Schema;
+
+namespace System.Xml.Serialization {
+	public interface IXmlSerializable {
+
+		XmlSchema GetSchema ();
+		void ReadXml (XmlReader reader);
+		void WriteXml (XmlWriter writer);
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapAttributeAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapAttributeAttribute.cs
new file mode 100644
index 00000000000..71311673741
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapAttributeAttribute.cs
@@ -0,0 +1,61 @@
+//
+// SoapAttributeAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for SoapAttributeAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		 | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class SoapAttributeAttribute : Attribute

+	{

+		private string attrName;

+		private string dataType;

+		private string ns;

+

+		public SoapAttributeAttribute ()

+		{

+		}

+

+		public SoapAttributeAttribute (string attrName) 

+		{

+			AttributeName = attrName;

+		}

+

+		public string AttributeName {

+			get	{

+				return attrName;

+			} 

+			set	{

+				attrName = value;

+			}

+		}

+

+		public string DataType {

+			get {

+				return dataType;

+			} 

+			set {

+				dataType = value;

+			}

+		}

+

+		public string Namespace {

+			get {

+				return ns;

+			} 

+			set {

+				ns = value;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapAttributeOverrides.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapAttributeOverrides.cs
new file mode 100644
index 00000000000..dcbbca6bcb7
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapAttributeOverrides.cs
@@ -0,0 +1,72 @@
+//
+// SoapAttributeOverrides.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+using System.Collections;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// 

+	/// </summary>

+	public class SoapAttributeOverrides

+	{

+		/// <summary>

+		/// This class requires to store SoapAttrributes indexed by a key containg

+		/// both Type and Member Name. There are 3 approaches to this IMO.

+		/// 1. Make the key as "FullTypeName..MemberName", with ".." seperating Type and Member.

+		/// 2. Use a jagged 2D hashtable. The main hashtable is indexed by Type and each value 

+		///    contains another hashtable which is indexed by member names. (Too many hashtables)

+		/// 3. Use a new class which emcompasses the Type and MemberName. An implementation is there

+		///    in TypeMember class in this namespace. (Too many instantiations of the class needed)

+		///    

+		/// Method 1 is the most elegent, but I am not sure if the seperator is language insensitive.

+		/// What if someone writes a language which allows . in the member names.

+		/// </summary>

+		/// 

+		private Hashtable overrides;

+

+		public SoapAttributeOverrides ()

+		{

+			overrides = new Hashtable();

+		}

+

+		public SoapAttributes this [Type type] 

+		{

+			get { return this [type, string.Empty];	}

+		}

+

+		public SoapAttributes this [Type type, string member]

+		{

+			get 

+			{

+				return (SoapAttributes) overrides[GetKey(type,member)];

+			}

+		}

+

+		public void Add (Type type, SoapAttributes attributes) 

+		{

+			Add(type, string.Empty, attributes);

+		}

+

+		public void Add (Type type, string member, SoapAttributes attributes) 

+		{

+			if(overrides[GetKey(type, member)] != null)

+				throw new Exception("The attributes for the given type and Member already exist in the collection");

+			

+			overrides.Add(GetKey(type,member), attributes);

+		}

+

+		private TypeMember GetKey(Type type, string member)

+		{

+			return new TypeMember(type, member);

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapAttributes.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapAttributes.cs
new file mode 100644
index 00000000000..786ca2921f3
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapAttributes.cs
@@ -0,0 +1,88 @@
+//
+// SoapAttributes.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Reflection;

+using System;

+using System.ComponentModel;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for SoapAttributes.

+	/// </summary>

+	public class SoapAttributes

+	{

+		private SoapAttributeAttribute soapAttribute;

+		private object soapDefaultValue;

+		private SoapElementAttribute soapElement;

+		private SoapEnumAttribute soapEnum;

+		private bool soapIgnore;

+		private SoapTypeAttribute soapType;

+

+		public SoapAttributes ()

+		{

+		}

+		

+		public SoapAttributes (ICustomAttributeProvider provider)

+		{

+			object[] attributes = provider.GetCustomAttributes(false);

+			foreach(object obj in attributes)

+			{

+				if(obj is SoapAttributeAttribute)

+					soapAttribute = (SoapAttributeAttribute) obj;

+				else if(obj is DefaultValueAttribute)

+					soapDefaultValue = obj;

+				else if(obj is SoapElementAttribute)

+					soapElement = (SoapElementAttribute) obj;

+				else if(obj is SoapEnumAttribute)

+					soapEnum = (SoapEnumAttribute) obj;

+				else if(obj is SoapIgnoreAttribute)

+					soapIgnore = true;

+				else if(obj is SoapTypeAttribute)

+					soapType = (SoapTypeAttribute) obj;

+			}

+		}

+

+		public SoapAttributeAttribute SoapAttribute 

+		{

+			get { return  soapAttribute; } 

+			set { soapAttribute = value; }

+		}

+

+		public object SoapDefaultValue 

+		{

+			get { return  soapDefaultValue; } 

+			set { soapDefaultValue = value; }

+		}

+

+		public SoapElementAttribute SoapElement 

+		{

+			get { return  soapElement; } 

+			set { soapElement = value; }

+		}

+

+		public SoapEnumAttribute SoapEnum 

+		{

+			get { return  soapEnum; } 

+			set { soapEnum = value; }

+		}

+

+		public bool SoapIgnore

+		{

+			get { return  soapIgnore; } 

+			set { soapIgnore = value; }

+		}

+

+		public SoapTypeAttribute SoapType 

+		{

+			get { return  soapType; } 

+			set { soapType = value; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs
new file mode 100644
index 00000000000..a0e617a85c1
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapCodeExporter.cs
@@ -0,0 +1,75 @@
+// 

+// System.Xml.Serialization.SoapCodeExporter 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.CodeDom;

+

+namespace System.Xml.Serialization {

+	public class SoapCodeExporter {

+

+		#region Fields

+

+		CodeNamespace codeNamespace;

+		CodeCompileUnit codeCompileUnit;

+		CodeAttributeDeclarationCollection includeMetadata;

+

+		#endregion

+

+		#region Constructors

+

+		public SoapCodeExporter (CodeNamespace codeNamespace)

+		{

+			includeMetadata = new CodeAttributeDeclarationCollection ();

+			this.codeNamespace = codeNamespace;

+		}

+

+		public SoapCodeExporter (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit)

+			: this (codeNamespace)

+		{

+			this.codeCompileUnit = codeCompileUnit;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public CodeAttributeDeclarationCollection IncludeMetadata {

+			get { return includeMetadata; }

+		}

+		

+		#endregion // Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public void AddMappingMetadata (CodeAttributeDeclarationCollection metadata, XmlMemberMapping member)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void AddMappingMetadata (CodeAttributeDeclarationCollection metadata, XmlMemberMapping member, bool forceUseMemberName)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void ExportMembersMapping (XmlMembersMapping xmlMembersMapping)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlQualifiedName ExportTypeMapping (XmlTypeMapping xmlTypeMapping)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapElementAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapElementAttribute.cs
new file mode 100644
index 00000000000..fbb6527e821
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapElementAttribute.cs
@@ -0,0 +1,60 @@
+//
+// SoapElementAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for SoapElementAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		 | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class SoapElementAttribute : Attribute

+	{

+		private string dataType;

+		private string elementName;

+		private bool isNullable;

+

+		public SoapElementAttribute ()

+		{

+		}

+		public SoapElementAttribute (string elementName) 

+		{

+			ElementName = elementName;

+		}

+

+		public string DataType {

+			get { 

+				return dataType; 

+			}

+			set { 

+				dataType = value; 

+			}

+		}

+

+		public string ElementName {

+			get { 

+				return elementName; 

+			}

+			set { 

+				elementName = value; 

+			}

+		}

+

+		public bool IsNullable {

+			get { 

+				return isNullable; 

+			} 

+			set { 

+				isNullable = value; 

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapEnumAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapEnumAttribute.cs
new file mode 100644
index 00000000000..fba4f311126
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapEnumAttribute.cs
@@ -0,0 +1,40 @@
+//
+// SoapEnumAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for SoapEnumAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Field)]

+	public class SoapEnumAttribute : Attribute

+	{

+		private string name;

+

+		public SoapEnumAttribute ()

+		{

+		}

+

+		public SoapEnumAttribute (string name)

+		{

+			Name = name;

+		}

+

+		public string Name {

+			get { 

+				return name; 

+			}

+			set { 

+				name = value; 

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapIgnoreAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapIgnoreAttribute.cs
new file mode 100644
index 00000000000..52798f1dd30
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapIgnoreAttribute.cs
@@ -0,0 +1,25 @@
+//
+// SoapIgnoreAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for SoapIgnoreAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		 | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class SoapIgnoreAttribute : Attribute

+	{

+		public SoapIgnoreAttribute ()

+		{

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapIncludeAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapIncludeAttribute.cs
new file mode 100644
index 00000000000..aaf3e29d03c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapIncludeAttribute.cs
@@ -0,0 +1,38 @@
+//
+// SoapIncludeAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for SoapIncludeAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct |

+		 AttributeTargets.Method)]

+	public class SoapIncludeAttribute : Attribute

+	{

+		private Type type;

+

+		public SoapIncludeAttribute( Type type) 

+		{

+			Type = type;

+		}

+

+		public Type Type 

+		{

+			get { 

+				return type; 

+			}

+			set { 

+				type = value; 

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapReflectionImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapReflectionImporter.cs
new file mode 100644
index 00000000000..11c2b5926c2
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapReflectionImporter.cs
@@ -0,0 +1,90 @@
+// 

+// System.Xml.Serialization.SoapReflectionImporter 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Reflection;

+using System.Xml;

+

+namespace System.Xml.Serialization {

+	public class SoapReflectionImporter {

+

+		#region Constructors

+

+		[MonoTODO]

+		public SoapReflectionImporter ()

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SoapReflectionImporter (SoapAttributeOverrides attributeOverrides)

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SoapReflectionImporter (string defaultNamespace)

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public SoapReflectionImporter (SoapAttributeOverrides attributeOverrides, string defaultNamespace)

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (string elementName, string ns, XmlReflectionMember[] members)

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (string elementName, string ns, XmlReflectionMember[] members, bool hasWrapperElement, bool writeAccessors)

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (string elementName, string ns, XmlReflectionMember[] members, bool hasWrapperElement, bool writeAccessors, bool validate)

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlTypeMapping ImportTypeMapping (Type type)

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlTypeMapping ImportTypeMapping (Type type, string defaultNamespace)

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void IncludeType (Type type)

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void IncludeTypes (ICustomAttributeProvider provider)

+		{ 

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapSchemaImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapSchemaImporter.cs
new file mode 100644
index 00000000000..baafb07716d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapSchemaImporter.cs
@@ -0,0 +1,71 @@
+// 

+// System.Xml.Serialization.SoapSchemaImporter 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml;

+

+namespace System.Xml.Serialization {

+	public class SoapSchemaImporter {

+

+		#region Fields

+

+		XmlSchemas schemas;

+		CodeIdentifiers typeIdentifiers;

+

+		#endregion

+

+		#region Constructors

+

+		public SoapSchemaImporter (XmlSchemas schemas)

+		{

+			this.schemas = schemas;

+		}

+

+		public SoapSchemaImporter (XmlSchemas schemas, CodeIdentifiers typeIdentifiers)

+			: this (schemas)

+		{

+			this.typeIdentifiers = typeIdentifiers;

+		}

+

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public XmlTypeMapping ImportDerivedTypeMapping (XmlQualifiedName name, Type baseType, bool baseTypeCanBeIndirect)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (string name, string ns, SoapSchemaMember member)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (string name, string ns, SoapSchemaMember[] members)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (string name, string ns, SoapSchemaMember[] members, bool hasWrapperElement)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (string name, string ns, SoapSchemaMember[] members, bool hasWrapperElement, Type baseType, bool baseTypeCanBeIndirect)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapSchemaMember.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapSchemaMember.cs
new file mode 100644
index 00000000000..733d59c57e8
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapSchemaMember.cs
@@ -0,0 +1,44 @@
+// 

+// System.Xml.Serialization.SoapSchemaMember 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml;

+

+namespace System.Xml.Serialization {

+	public class SoapSchemaMember {

+

+		#region Fields

+

+		string memberName;

+		XmlQualifiedName memberType;

+

+		#endregion

+

+		#region Constructors

+

+		public SoapSchemaMember ()

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public string MemberName {

+			get { return memberName; }

+			set { memberName = value; }

+		}

+

+		public XmlQualifiedName MemberType {

+			get { return memberType; }

+			set { memberType = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/SoapTypeAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/SoapTypeAttribute.cs
new file mode 100644
index 00000000000..038181ab828
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/SoapTypeAttribute.cs
@@ -0,0 +1,59 @@
+//
+// SoapTypeAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for SoapTypeAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct |

+		 AttributeTargets.Enum | AttributeTargets.Interface)]

+	public class SoapTypeAttribute : Attribute

+	{

+		private string ns;

+		private string typeName;

+		private bool includeInSchema;

+

+		public SoapTypeAttribute ()

+		{

+		}

+		public SoapTypeAttribute (string typeName)

+		{

+			TypeName = typeName;

+		}

+		public SoapTypeAttribute (string typeName, string ns)

+		{

+			TypeName = typeName;

+			Namespace = ns;

+		}

+		

+		public bool IncludeInSchema 

+		{

+			get { return  includeInSchema; }

+			set { includeInSchema = value; }

+		}

+

+		public string Namespace {

+			get { return ns;
+			}

+			set { ns = value;
+			}

+		}

+		public string TypeName {

+			get { return typeName;
+			}

+			set { typeName = value;
+			}

+		}

+

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/TypeMember.cs b/mcs/class/System.XML/System.Xml.Serialization/TypeMember.cs
new file mode 100755
index 00000000000..854e31cb511
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/TypeMember.cs
@@ -0,0 +1,54 @@
+using System;

+using System.Collections;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// TypeMember is immutable class which is used as a key in a Hashtable.

+	/// </summary>

+

+	internal sealed class TypeMember

+	{

+		Type type;

+		string member;

+		internal TypeMember(Type type, string member)

+		{

+			this.type = type;

+			this.member = member;

+		}

+

+		public override int GetHashCode()

+		{

+			return unchecked (type.GetHashCode() + member.GetHashCode());

+		}

+

+		public override bool Equals(object obj)

+		{

+			if(obj is TypeMember)

+				return TypeMember.Equals(this,(TypeMember)obj);

+			

+			return false;

+		}

+

+		public static bool Equals(TypeMember tm1, TypeMember tm2)

+		{

+			if(Object.ReferenceEquals(tm1,tm2))

+				return true;

+			if(Object.ReferenceEquals(tm1,null) || Object.ReferenceEquals(tm2,null))

+				return false;

+			if(tm1.type == tm2.type && tm1.member == tm2.member)

+				return true;

+			return false;

+		}

+

+		public static bool operator==(TypeMember tm1, TypeMember tm2)

+		{

+			return TypeMember.Equals(tm1,tm2);

+		}

+

+		public static bool operator!=(TypeMember tm1, TypeMember tm2)

+		{

+			return !TypeMember.Equals(tm1,tm2);

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventArgs.cs b/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventArgs.cs
new file mode 100644
index 00000000000..b501cb5fea0
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventArgs.cs
@@ -0,0 +1,35 @@
+//
+// UnreferencedObjectEventArgs.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for UnreferencedObjectEventArgs.

+	/// </summary>

+	public class UnreferencedObjectEventArgs : EventArgs

+	{

+		private object unreferencedObject;

+		private string unreferencedId;

+		

+		public UnreferencedObjectEventArgs(object o, string id)

+		{

+			unreferencedObject = o;

+			unreferencedId = id;

+		}

+		

+		public string UnreferencedId {

+			get{ return unreferencedId; }

+		}

+		public object UnreferencedObject {

+			get{ return unreferencedObject; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventHandler.cs b/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventHandler.cs
new file mode 100755
index 00000000000..5344f05a746
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/UnreferencedObjectEventHandler.cs
@@ -0,0 +1,16 @@
+//
+// UnreferencedObjectEventHandler.cs: 
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+//
+using System;
+
+namespace System.Xml.Serialization {
+	
+	[Serializable]
+	public delegate void UnreferencedObjectEventHandler (object sender, UnreferencedObjectEventArgs e);
+}
+
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAnyAttributeAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyAttributeAttribute.cs
new file mode 100644
index 00000000000..c34e70448d6
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyAttributeAttribute.cs
@@ -0,0 +1,28 @@
+//
+// XmlAnyAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlAnyAttributeAttribute.

+	/// </summary>

+	/// 

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		| AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class XmlAnyAttributeAttribute : Attribute

+	{

+		

+		public XmlAnyAttributeAttribute()

+		{

+		

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs
new file mode 100644
index 00000000000..289b1a31dbb
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttribute.cs
@@ -0,0 +1,66 @@
+//
+// filename.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlAnyElementAttribute.

+	/// </summary>

+	/// 

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		| AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class XmlAnyElementAttribute : Attribute

+	{

+		private string elementName;

+		private string ns;

+		private int order;

+

+		public XmlAnyElementAttribute ()

+		{

+		}

+

+		public XmlAnyElementAttribute (string name) 

+		{

+			elementName = name;

+		}

+

+		public XmlAnyElementAttribute (string name, string ns)

+		{

+			elementName = name;

+			Namespace = ns;

+		}

+

+		public string Name {

+			get {
+				return elementName;
+			} 

+			set {
+				elementName = value;
+			}

+		}

+		public string Namespace {

+			get {
+				return ns;
+			}

+			set {
+				ns = value;
+			}

+		}

+		/// <summary>

+		/// Specifies Order in which Memberswill be serialized as Elements.

+		/// </summary>

+		public int Order

+		{

+			get{ return  order; }

+			set{ order = value; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttributes.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttributes.cs
new file mode 100644
index 00000000000..86242fe7097
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAnyElementAttributes.cs
@@ -0,0 +1,66 @@
+//
+// XmlAnyElementAttributes.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Xml;

+using System.Xml.Serialization;

+using System.Collections;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlAnyElementAttributes.

+	/// </summary>

+	public class XmlAnyElementAttributes : CollectionBase

+	{

+		

+		public XmlAnyElementAttribute this[int index] 

+		{

+			get 

+			{

+				return (XmlAnyElementAttribute)List[index];

+			}

+			set 

+			{

+				List[index] = value;

+			}	

+		}

+

+		public int Add(XmlAnyElementAttribute attribute)

+		{

+			return List.Add(attribute);

+		}

+

+		public bool Contains(XmlAnyElementAttribute attribute)

+		{

+			return List.Contains(attribute);	

+		}

+

+		public int IndexOf(XmlAnyElementAttribute attribute)

+		{

+			return List.IndexOf(attribute);

+		}

+

+		public void Insert(int index, XmlAnyElementAttribute attribute)

+		{

+			List.Insert(index, attribute);

+		}

+

+		public void Remove(XmlAnyElementAttribute attribute)

+		{

+			List.Remove(attribute);

+		}

+

+		public void CopyTo(XmlAnyElementAttribute[] array,int index)

+		{

+			List.CopyTo(array, index);

+		}

+	}

+

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlArrayAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlArrayAttribute.cs
new file mode 100644
index 00000000000..69916ef8f81
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlArrayAttribute.cs
@@ -0,0 +1,90 @@
+//
+// XmlArrayAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Xml.Schema;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlArrayAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+	| AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class XmlArrayAttribute : Attribute

+	{

+		private string elementName;

+		private XmlSchemaForm form;

+		private bool isNullable;

+		private string ns;

+		private int order;

+

+		public XmlArrayAttribute()

+		{

+		}

+

+		public XmlArrayAttribute(string elementName)

+		{

+			ElementName = elementName;

+		}

+

+		public string ElementName 

+		{

+			get

+			{

+				return elementName;

+			} 

+			set

+			{

+				elementName = value;

+			}

+		}

+		public XmlSchemaForm Form 

+		{

+			get

+			{

+				return form;

+			} 

+			set

+			{

+				form = value;

+			}

+		}

+		public bool IsNullable 

+		{

+			get

+			{

+				return isNullable;

+			} 

+			set

+			{

+				isNullable = value;

+			}

+		}

+		public string Namespace 

+		{

+			get

+			{

+				return ns;

+			} 

+			set

+			{

+				ns = value;

+			}

+		}

+		/// <summary>

+		/// Specifies Order in which Memberswill be serialized as Elements.

+		/// </summary>

+		public int Order

+		{

+			get{ return  order; }

+			set{ order = value; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlArrayItemAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlArrayItemAttribute.cs
new file mode 100644
index 00000000000..354af362b76
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlArrayItemAttribute.cs
@@ -0,0 +1,85 @@
+//
+// XmlArrayItemAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Xml.Schema;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlArrayItemAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		 | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class XmlArrayItemAttribute : Attribute

+	{

+		private string dataType;

+		private string elementName;

+		private XmlSchemaForm form;

+		private string ns;

+		private bool isNullable;

+		private int nestingLevel;

+		private Type type;

+		private int order;

+

+		public XmlArrayItemAttribute ()

+		{

+		}

+		public XmlArrayItemAttribute (string elementName)

+		{

+			ElementName = elementName;

+		}

+		public XmlArrayItemAttribute (Type type)

+		{

+			Type = type;

+		}

+		public XmlArrayItemAttribute (string elementName, Type type)

+		{

+			ElementName = elementName;

+			Type = type;

+		}

+

+		public string DataType {

+			get { return dataType; }

+			set { dataType = value; }

+		}

+		public string ElementName {

+			get { return elementName; }

+			set { elementName = value; }

+		}

+		public XmlSchemaForm Form {

+			get { return form; }

+			set { form = value; }

+		}

+		public string Namespace {

+			get { return ns; }

+			set { ns = value; }

+		}

+		public bool IsNullable {

+			get { return isNullable; } 

+			set { isNullable = value; }

+		}

+		public Type Type {

+			get { return type; }

+			set { type = value; }

+		}

+		public int NestingLevel {

+			get { return nestingLevel; }

+			set { nestingLevel = value; }

+		}

+		/// <summary>

+		/// Specifies Order in which Memberswill be serialized as Elements.

+		/// </summary>

+		public int Order

+		{

+			get{ return  order; }

+			set{ order = value; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlArrayItemAttributes.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlArrayItemAttributes.cs
new file mode 100644
index 00000000000..51528209a41
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlArrayItemAttributes.cs
@@ -0,0 +1,61 @@
+//
+// XmlArrayItemAttributes.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Xml.Serialization;

+using System.Collections;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlArrayItemAttributes.

+	/// </summary>

+	public class XmlArrayItemAttributes : CollectionBase

+	{

+

+		public XmlArrayItemAttribute this [int index] {

+			get {

+				return (XmlArrayItemAttribute)List [index];

+			}

+			set {

+				List [index] = value;

+			}	

+		}

+

+		public int Add (XmlArrayItemAttribute attribute)

+		{

+			return List.Add(attribute);

+		}

+

+		public bool Contains(XmlArrayItemAttribute attribute)

+		{

+			return List.Contains(attribute);

+		}

+

+		public void CopyTo(XmlArrayItemAttribute[] array, int index)

+		{

+			List.CopyTo(array, index);

+		}

+

+		public int IndexOf(XmlArrayItemAttribute attribute)

+		{

+			return List.IndexOf(attribute);

+		}

+

+		public void Insert(int index, XmlArrayItemAttribute attribute)

+		{

+			List.Insert(index, attribute);

+		}

+

+		public void Remove(XmlArrayItemAttribute attribute)

+		{

+			List.Remove(attribute);

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeAttribute.cs
new file mode 100644
index 00000000000..e23ff75890c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeAttribute.cs
@@ -0,0 +1,95 @@
+//
+// XmlAttributeAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Xml.Schema;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlAttributeAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		 | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class XmlAttributeAttribute : Attribute

+	{

+		private string attributeName;

+		private string dataType;

+		private Type type;

+		private XmlSchemaForm form;

+		private string ns;

+

+		public XmlAttributeAttribute ()

+		{

+		}

+

+		public XmlAttributeAttribute (string attributeName)

+		{

+			AttributeName = attributeName;

+		}

+		

+		public XmlAttributeAttribute (Type type)

+		{

+			Type = type;

+		}

+

+		public XmlAttributeAttribute (string attributeName, Type type)

+		{

+			AttributeName = attributeName;

+			Type = type;

+		}

+

+		public string AttributeName {

+			get {
+				return attributeName;
+			}

+			set {
+				attributeName = value;
+			}

+		}

+		public string DataType {

+			get {
+				return dataType;
+			}

+			set {
+				dataType = value;
+			}

+		}

+		public XmlSchemaForm Form {

+			get {
+				return form;
+			}

+			set {
+				if(Namespace != null)
+				form = value;
+			}

+		}

+		public string Namespace {

+			get {
+				return ns;
+			}

+			set {
+				ns = value;
+			}

+		}

+

+		public Type Type

+		{

+			get 

+			{
+				return type;
+			}

+			set 

+			{
+				type = value;
+			}

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventArgs.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventArgs.cs
new file mode 100644
index 00000000000..e39c6811573
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventArgs.cs
@@ -0,0 +1,49 @@
+//
+// XmlAttributeEventArgs.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Xml;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlAttributeEventArgs.

+	/// </summary>

+	public class XmlAttributeEventArgs : EventArgs

+	{

+		private XmlAttribute attr;

+		private int lineNumber;

+		private int linePosition;

+		private object obj;

+

+		internal XmlAttributeEventArgs(XmlAttribute attr, int lineNum, int linePos, object source)

+		{

+			this.attr		= attr;

+			this.lineNumber = lineNum;

+			this.linePosition = linePos;

+			this.obj		= source;

+		}

+

+		public XmlAttribute Attr { 

+			get { return attr; }

+		}

+

+		public int LineNumber {

+			get { return lineNumber; }

+		}

+		

+		public int LinePosition {

+			get { return linePosition; }

+		}

+		

+		public object ObjectBeingDeserialized {

+			get{ return obj; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventHandler.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventHandler.cs
new file mode 100755
index 00000000000..35a0f2d5474
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeEventHandler.cs
@@ -0,0 +1,16 @@
+//
+// XmlAttributeEventHandler.cs: 
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+//
+using System;
+
+namespace System.Xml.Serialization {
+	
+	[Serializable]
+	public delegate void XmlAttributeEventHandler (object sender, XmlAttributeEventArgs e);
+}
+
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeOverrides.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeOverrides.cs
new file mode 100644
index 00000000000..75c6112c794
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributeOverrides.cs
@@ -0,0 +1,60 @@
+//
+// XmlAttributeOverrides.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+using System.Collections;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlAttributeOverrides.

+	/// </summary>

+	public class XmlAttributeOverrides

+	{

+		

+		private Hashtable overrides;

+

+		public XmlAttributeOverrides ()

+		{

+			overrides = new Hashtable();

+		}

+

+		public XmlAttributes this [Type type] 

+		{

+			get { return this [type, string.Empty];	}

+		}

+

+		public XmlAttributes this [Type type, string member]

+		{

+			get 

+			{

+				return (XmlAttributes) overrides[GetKey(type,member)];

+			}

+		}

+

+		public void Add (Type type, XmlAttributes attributes) 

+		{

+			Add(type, string.Empty, attributes);

+		}

+

+		public void Add (Type type, string member, XmlAttributes attributes) 

+		{

+			if(overrides[GetKey(type, member)] != null)

+				throw new Exception("The attributes for the given type and Member already exist in the collection");

+			

+			overrides.Add(GetKey(type,member), attributes);

+		}

+

+		private TypeMember GetKey(Type type, string member)

+		{

+			return new TypeMember(type, member);

+		}

+

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlAttributes.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributes.cs
new file mode 100644
index 00000000000..a861a4dde32
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlAttributes.cs
@@ -0,0 +1,443 @@
+//
+// XmlAttributes.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Reflection;
+using System;

+using System.ComponentModel;

+using System.Collections;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlAttributes.

+	/// </summary>

+	public class XmlAttributes

+	{

+		private XmlAnyAttributeAttribute xmlAnyAttribute;

+		private XmlAnyElementAttributes xmlAnyElements;

+		private XmlArrayAttribute xmlArray;

+		private XmlArrayItemAttributes xmlArrayItems;

+		private XmlAttributeAttribute xmlAttribute;

+		private XmlChoiceIdentifierAttribute xmlChoiceIdentifier;

+		private object xmlDefaultValue;

+		private XmlElementAttributes xmlElements;

+		private XmlEnumAttribute xmlEnum;

+		private bool xmlIgnore;

+		private bool xmlns;

+		private XmlRootAttribute xmlRoot;

+		private XmlTextAttribute xmlText;

+		private XmlTypeAttribute xmlType;

+

+		private MemberInfo minfo;

+		private FieldInfo  finfo;

+		private PropertyInfo pinfo;

+		internal ArrayList XmlIncludes;

+		//internal string ElementName;

+

+		//The element Order in serialization.

+		internal int order;

+		internal bool isAttribute;

+		internal static XmlAttributes.XmlAttributesComparer attrComparer;

+

+		//Sorting Order of Elements: XmlNs, XmlAttributes, XmlElement

+		internal class XmlAttributesComparer : IComparer

+		{

+			public int Compare(object x,object y)

+			{

+				if(x is XmlAttributes && y is XmlAttributes)

+				{

+					XmlAttributes attx = (XmlAttributes)x;

+					XmlAttributes atty = (XmlAttributes)y;

+					if(attx.xmlns)

+						return -1;

+					if(atty.xmlns)

+						return 1;

+					if(attx.isAttribute)

+						return -1;

+					if(atty.isAttribute)

+						return 1;

+					int diff = attx.order - atty.order;

+					if(diff == 0)

+						return 0;

+					if(diff > 0)

+						return 1;

+					if(diff < 0)

+						return -1;

+				}

+				if(x == null)

+					return -1;

+				if(y == null)

+					return 1;

+				throw new Exception("Should never occur. XmlAttributesComparer.Compare");

+			}

+		}

+

+		public XmlAttributes ()

+		{

+			xmlAnyElements = new XmlAnyElementAttributes ();

+			xmlArrayItems = new XmlArrayItemAttributes ();

+			xmlElements = new XmlElementAttributes ();

+			XmlIncludes = new ArrayList();

+		}

+

+		static XmlAttributes ()

+		{

+			attrComparer = new XmlAttributes.XmlAttributesComparer();

+		}

+

+		public XmlAttributes (ICustomAttributeProvider provider)

+		{

+			object[] attributes = provider.GetCustomAttributes(false);

+			foreach(object obj in attributes)

+			{

+				if(obj is XmlAnyAttributeAttribute)

+					xmlAnyAttribute = (XmlAnyAttributeAttribute) obj;

+				else if(obj is XmlAnyElementAttribute)

+					xmlAnyElements.Add((XmlAnyElementAttribute) obj);

+				else if(obj is XmlArrayAttribute)

+					xmlArray = (XmlArrayAttribute) obj;

+				else if(obj is XmlArrayItemAttribute)

+					xmlArrayItems.Add((XmlArrayItemAttribute) obj);

+				else if(obj is XmlAttributeAttribute)

+					xmlAttribute = (XmlAttributeAttribute) obj;

+				else if(obj is XmlChoiceIdentifierAttribute)

+					xmlChoiceIdentifier = (XmlChoiceIdentifierAttribute) obj;

+				else if(obj is DefaultValueAttribute)

+					xmlDefaultValue = obj;

+				else if(obj is XmlElementAttribute )

+					xmlElements.Add((XmlElementAttribute ) obj);

+				else if(obj is XmlEnumAttribute)

+					xmlEnum = (XmlEnumAttribute) obj;

+				else if(obj is XmlIgnoreAttribute)

+					xmlIgnore = true;

+				else if(obj is XmlNamespaceDeclarationsAttribute)

+					xmlns = true;

+				else if(obj is XmlRootAttribute)

+					xmlRoot = (XmlRootAttribute) obj;

+				else if(obj is XmlTextAttribute)

+					xmlText = (XmlTextAttribute) obj;

+				else if(obj is XmlTypeAttribute)

+					xmlType = (XmlTypeAttribute) obj;

+			}

+		}

+

+		#region public properties

+		public XmlAnyAttributeAttribute XmlAnyAttribute 

+		{

+			get 

+			{
+				return xmlAnyAttribute;
+			}

+			set 

+			{
+				xmlAnyAttribute = value;
+			}

+		}

+		public XmlAnyElementAttributes XmlAnyElements 

+		{

+			get 

+			{
+				return xmlAnyElements;
+			}

+		}

+		public XmlArrayAttribute XmlArray

+		{

+			get 

+			{
+				return xmlArray;
+			}

+			set 

+			{
+				xmlArray = value;
+			}

+		}

+		public XmlArrayItemAttributes XmlArrayItems 

+		{

+			get 

+			{
+				return xmlArrayItems;
+			}

+		}

+		public XmlAttributeAttribute XmlAttribute 

+		{

+			get 

+			{
+				return xmlAttribute;
+			}

+			set 

+			{
+				xmlAttribute = value;
+			}

+		}

+		public XmlChoiceIdentifierAttribute XmlChoiceIdentifier 

+		{

+			get 

+			{
+				return xmlChoiceIdentifier;
+			}

+			set 

+			{
+				xmlChoiceIdentifier = value;
+			}

+		}

+		public object XmlDefaultValue 

+		{

+			get 

+			{
+				return xmlDefaultValue;
+			}

+			set 

+			{
+				xmlDefaultValue = value;
+			}

+		}

+		public XmlElementAttributes XmlElements 

+		{

+			get 

+			{
+				return xmlElements;
+			}

+		}

+		public XmlEnumAttribute XmlEnum 

+		{

+			get 

+			{
+				return xmlEnum;
+			}

+			set 

+			{
+				xmlEnum = value;
+			}

+		}

+		public bool XmlIgnore 

+		{

+			get 

+			{
+				return xmlIgnore;
+			}

+			set 

+			{
+				xmlIgnore = value;
+			}

+		}

+		public bool Xmlns 

+		{

+			get 

+			{
+				return xmlns;
+			}

+			set 

+			{
+				xmlns = value;
+			}

+		}

+		public XmlRootAttribute XmlRoot 

+		{

+			get 

+			{
+				return xmlRoot;}

+			set 

+			{
+				xmlRoot = value;
+			}

+		}

+		public XmlTextAttribute XmlText 

+		{

+			get 

+			{
+				return xmlText;
+			}

+			set 

+			{
+				xmlText = value;
+			}

+		}

+		public XmlTypeAttribute XmlType 

+		{

+			get 

+			{
+				return xmlType;
+			}

+			set 

+			{
+				xmlType = value;
+			}

+		}

+		#endregion

+

+		#region internal properties

+		internal MemberInfo MemberInfo

+		{

+			get { return  minfo; }

+			set { minfo = value; }

+		}

+

+		internal FieldInfo FieldInfo 

+		{

+			get { return  finfo; }

+			set { finfo = value; }

+		}

+

+		internal PropertyInfo PropertyInfo

+		{

+			get { return  pinfo; }

+			set { pinfo = value; }

+		}

+		#endregion

+

+		//Only permissible attributes for a class type are: XmlRoot and XmlInclude

+		internal static XmlAttributes FromClass(Type classType)

+		{

+			XmlAttributes XmlAttr = new XmlAttributes();

+			object[] attributes = classType.GetCustomAttributes(false);

+			foreach(object obj in attributes)

+			{

+				if(obj is XmlRootAttribute)

+					XmlAttr.xmlRoot = (XmlRootAttribute) obj;

+				else if(obj is XmlIncludeAttribute)

+					XmlAttr.XmlIncludes.Add(obj);

+			}

+			return XmlAttr;

+		}

+

+		internal static XmlAttributes FromField(MemberInfo member, FieldInfo finfo)

+		{

+			XmlAttributes XmlAttr = new XmlAttributes();

+			object[] attributes = member.GetCustomAttributes(false);

+			XmlAttr.AddMemberAttributes(attributes);

+

+			XmlAttr.minfo = member;

+			XmlAttr.finfo = finfo;

+

+			return XmlAttr;

+		}

+

+		

+		internal static XmlAttributes FromProperty(MemberInfo member, PropertyInfo pinfo)

+		{

+

+			XmlAttributes XmlAttr = new XmlAttributes();

+			object[] attributes = member.GetCustomAttributes(false);

+			XmlAttr.AddMemberAttributes(attributes);

+

+			XmlAttr.minfo = member;

+			XmlAttr.pinfo = pinfo;

+			return XmlAttr;

+		}

+

+		internal void AddMemberAttributes(object[] attributes)

+		{

+			foreach(object obj in attributes)

+			{

+				if(obj is XmlAnyAttributeAttribute)

+				{

+					xmlAnyAttribute = (XmlAnyAttributeAttribute) obj;

+					isAttribute = true;	

+				}

+				else if(obj is XmlAttributeAttribute)

+				{

+					xmlAttribute = (XmlAttributeAttribute) obj;

+					isAttribute = true;

+				}

+				else if(obj is XmlNamespaceDeclarationsAttribute)

+				{

+					xmlns = true;

+					isAttribute = true;

+				}

+				else if(obj is XmlAnyElementAttribute)

+				{

+					xmlAnyElements.Add((XmlAnyElementAttribute) obj);

+					order = ((XmlAnyElementAttribute) obj).Order;

+				}

+				else if(obj is XmlArrayAttribute)

+				{

+					xmlArray = (XmlArrayAttribute) obj;

+					order = ((XmlArrayAttribute) obj).Order;

+				}

+				else if(obj is XmlArrayItemAttribute)

+				{

+					xmlArrayItems.Add((XmlArrayItemAttribute) obj);

+					order = ((XmlArrayItemAttribute) obj).Order;

+				}

+				else if(obj is XmlChoiceIdentifierAttribute)

+				{

+					xmlChoiceIdentifier = (XmlChoiceIdentifierAttribute) obj;

+					order = ((XmlChoiceIdentifierAttribute) obj).Order;

+				}

+				else if(obj is XmlTextAttribute)

+				{

+					xmlText = (XmlTextAttribute) obj;

+					order = ((XmlTextAttribute) obj).Order;

+				}

+				else if(obj is XmlElementAttribute )

+				{

+					xmlElements.Add((XmlElementAttribute ) obj);

+					order = ((XmlElementAttribute ) obj).Order;

+				}

+				else if(obj is DefaultValueAttribute)

+				{

+					xmlDefaultValue = ((DefaultValueAttribute ) obj).Value;

+				}

+				else if(obj is XmlEnumAttribute)

+				{

+					xmlEnum = (XmlEnumAttribute) obj;

+				}

+				else if(obj is XmlIgnoreAttribute)

+				{

+					xmlIgnore = true;

+				}

+				else if(obj is XmlRootAttribute)

+				{

+					throw new Exception("should never happen. XmlRoot on a member");

+				}

+				else if(obj is XmlTypeAttribute)

+				{

+					xmlType = (XmlTypeAttribute) obj;

+				}

+			}

+		}

+

+		internal string GetAttributeName(Type type, string defaultName)

+		{

+			if(XmlAttribute != null && XmlAttribute.AttributeName != null && XmlAttribute.AttributeName != "")

+				return XmlAttribute.AttributeName;

+			return defaultName;

+		}

+

+		internal string GetElementName(Type type, string defaultName)

+		{

+			foreach(XmlElementAttribute elem in XmlElements)

+			{

+				if(elem.Type == type && elem.ElementName != null && elem.ElementName != "")

+					return elem.ElementName;

+				else if(elem.Type == null && elem.ElementName != null && elem.ElementName != "")

+					return elem.ElementName;

+			}

+			return defaultName;

+		}

+

+		internal string GetAttributeNamespace(Type type)

+		{

+			if(XmlAttribute != null)

+				return XmlAttribute.Namespace;

+			return null;

+		}

+		internal string GetElementNamespace(Type type)

+		{

+			foreach(XmlElementAttribute elem in XmlElements)

+			{

+				if(elem.Type == type )

+					return elem.Namespace;

+				else if(elem.Type == null)

+					return elem.Namespace;

+			}

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
new file mode 100644
index 00000000000..6477cc2fbc2
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
@@ -0,0 +1,51 @@
+//
+// XmlChoiceIdentifierAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlChoiceIdentifierAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		 | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class XmlChoiceIdentifierAttribute : Attribute

+	{

+		private string memberName;

+		private int order;

+

+		public XmlChoiceIdentifierAttribute ()

+		{

+		}

+		public XmlChoiceIdentifierAttribute (string name)

+		{

+			MemberName = name;

+		}

+

+		public string MemberName {

+			get {
+				return memberName;
+			} 

+			set {
+				memberName = value;
+			}

+		}

+		

+		/// <summary>

+		/// Specifies Order in which Memberswill be serialized as Elements.

+		/// </summary>

+		public int Order

+		{

+			get{ return  order; }

+			set{ order = value; }

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
new file mode 100644
index 00000000000..d6ead00212f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlCodeExporter.cs
@@ -0,0 +1,81 @@
+// 

+// System.Xml.Serialization.XmlCodeExporter 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.CodeDom;

+

+namespace System.Xml.Serialization {

+	public class XmlCodeExporter {

+

+		#region Fields

+

+		CodeNamespace codeNamespace;

+		CodeCompileUnit codeCompileUnit;

+		CodeAttributeDeclarationCollection includeMetadata;

+

+		#endregion

+

+		#region Constructors

+

+		public XmlCodeExporter (CodeNamespace codeNamespace)

+		{

+			includeMetadata = new CodeAttributeDeclarationCollection ();

+			this.codeNamespace = codeNamespace;

+		}

+

+		public XmlCodeExporter (CodeNamespace codeNamespace, CodeCompileUnit codeCompileUnit)

+			: this (codeNamespace)

+		{

+			this.codeCompileUnit = codeCompileUnit;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public CodeAttributeDeclarationCollection IncludeMetadata {

+			get { return includeMetadata; }

+		}

+

+		#endregion Properties

+

+		#region Methods

+

+		[MonoTODO]

+		public void AddMappingMetadata (CodeAttributeDeclarationCollection metadata, XmlMemberMapping member, string ns)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void AddMappingMetadata (CodeAttributeDeclarationCollection metadata, XmlTypeMapping member, string ns)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void AddMappingMetadata (CodeAttributeDeclarationCollection metadata, XmlMemberMapping member, string ns, bool forceUseMemberName)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void ExportMembersMapping (XmlMembersMapping xmlMembersMapping)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void ExportTypeMapping (XmlTypeMapping xmlTypeMapping)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
new file mode 100644
index 00000000000..c18fd559430
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlCustomFormatter.cs
@@ -0,0 +1,141 @@
+//
+// System.Xml.Serialization.XmlCustomFormatter.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+using System.Text;
+using System.Xml;
+
+namespace System.Xml.Serialization {
+	internal class XmlCustomFormatter {
+
+		#region Methods
+
+		[MonoTODO]
+		public static byte[] FromByteArrayBase64 (byte[] value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static string FromByteArrayHex (byte[] value)
+		{
+			StringBuilder output = new StringBuilder ();
+			foreach (byte val in value)
+				output.Append (val.ToString ("X2"));
+			return output.ToString ();
+		}
+
+		public static string FromChar (char value)
+		{
+			return ((int) value).ToString ();
+		}
+
+		public static string FromDate (DateTime value)
+		{
+			return XmlConvert.ToString (value, "HH':'mm':'ss'.'fffffffzzz");
+		}
+
+		public static string FromDateTime (DateTime value)
+		{
+			return XmlConvert.ToString (value, "yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffzzz");
+		}
+
+		public static string FromTime (DateTime value)
+		{
+			return XmlConvert.ToString (value, "yyyy'-'MM'-'dd");
+		}
+
+		public static string FromEnum (long value, string[] values, long[] ids)
+		{
+			int length = ids.Length;
+
+			for (int i = 0; i < length; i ++) {
+				if (ids[i] == value) 
+					if (i >= values.Length)
+						return String.Empty;
+					else
+						return values[i].ToString ();
+			}
+			return value.ToString ();
+		}
+
+		public static string FromXmlName (string name)
+		{
+			return XmlConvert.EncodeName (name);
+		}
+
+		public static string FromXmlNCName (string ncName)
+		{
+			return XmlConvert.EncodeLocalName (ncName);
+		}
+
+		public static string FromXmlNmToken (string nmToken)
+		{
+			return XmlConvert.EncodeNmToken (nmToken);
+		}
+
+		public static string FromXmlNmTokens (string nmTokens)
+		{
+			StringBuilder output = new StringBuilder ();
+			string [] tokens = nmTokens.Split (' ');
+			foreach (string token in tokens)
+				output.Append (FromXmlNmToken (token));
+			return output.ToString ();
+		}
+
+		[MonoTODO]
+		public static char ToChar (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static DateTime ToDate (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static DateTime ToDateTime (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static DateTime ToTime (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static string ToXmlName (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static string ToXmlNCName (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static string ToXmlNmToken (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static string ToXmlNmTokens (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlElementAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlElementAttribute.cs
new file mode 100644
index 00000000000..3a10563f99b
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlElementAttribute.cs
@@ -0,0 +1,104 @@
+//
+// XmlElementAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Xml.Schema;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlElementAttribute.

+	/// </summary

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		 | AttributeTargets.Parameter | AttributeTargets.ReturnValue, AllowMultiple=true)]

+	public class XmlElementAttribute : Attribute

+	{

+		private string dataType;

+		private string elementName;

+		private XmlSchemaForm form;

+		private string ns;

+		private bool isNullable;

+		private Type type;

+		private int order;

+

+		public XmlElementAttribute ()

+		{	

+		}

+		public XmlElementAttribute (string elementName)

+		{

+			ElementName = elementName;

+		}

+		public XmlElementAttribute (Type type)

+		{

+			Type = type;

+		}

+		public XmlElementAttribute (string elementName, Type type)

+		{

+			ElementName = elementName;

+			Type = type;

+		}

+

+		public string DataType {

+			get {
+				return dataType;
+			}

+			set {
+				dataType = value;
+			}

+		}

+		public string ElementName {

+			get {
+				return elementName;
+			}

+			set {
+				elementName = value;
+			}

+		}

+		public XmlSchemaForm Form {

+			get {
+				return form;
+			}

+			set {
+				form = value;
+			}

+		}

+		public string Namespace {

+			get {
+				return ns;
+			}

+			set {
+				ns = value;
+			}

+		}

+		public bool IsNullable {

+			get {
+				return isNullable;
+			} 

+			set {
+				isNullable = value;
+			}

+		}

+		public Type Type {

+			get {
+				return type;
+			}

+			set {
+				type = value;
+			}

+		}

+		/// <summary>

+		/// Specifies Order in which Memberswill be serialized as Elements.

+		/// </summary>

+		public int Order

+		{

+			get{ return  order; }

+			set{ order = value; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlElementAttributes.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlElementAttributes.cs
new file mode 100644
index 00000000000..b2a75c1d50c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlElementAttributes.cs
@@ -0,0 +1,59 @@
+//
+// XmlElementAttributes.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Collections;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlElementAttributes.

+	/// </summary>

+	public class XmlElementAttributes : CollectionBase

+	{

+		public XmlElementAttribute this [int index] {

+			get {

+				return (XmlElementAttribute)List [index];

+			}

+			set {

+				List [index] = value;

+			}	

+		}

+

+		public int Add (XmlElementAttribute attribute)

+		{

+			return List.Add (attribute);

+		}

+

+		public bool Contains(XmlElementAttribute attribute)

+		{

+			return List.Contains(attribute);	

+		}

+

+		public int IndexOf(XmlElementAttribute attribute)

+		{

+			return List.IndexOf(attribute);

+		}

+

+		public void Insert(int index, XmlElementAttribute attribute)

+		{

+			List.Insert(index, attribute);

+		}

+

+		public void Remove(XmlElementAttribute attribute)

+		{

+			List.Remove(attribute);

+		}

+

+		public void CopyTo(XmlElementAttribute[] array,int index)

+		{

+			List.CopyTo(array, index);

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventArgs.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventArgs.cs
new file mode 100644
index 00000000000..94655c0bb0c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventArgs.cs
@@ -0,0 +1,53 @@
+//
+// XmlElementEventArgs.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Xml;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlElementEventArgs.

+	/// </summary>

+	public class XmlElementEventArgs : EventArgs

+	{

+		private XmlElement attr;

+		private int lineNumber;

+		private int linePosition;

+		private object obj;

+

+		internal XmlElementEventArgs(XmlElement attr, int lineNum, int linePos, object source)

+		{

+			this.attr		= attr;

+			this.lineNumber = lineNum;

+			this.linePosition = linePos;

+			this.obj		= source;

+		}

+

+		public XmlElement Element

+		{ 

+			get { return attr; }

+		}

+

+		public int LineNumber 

+		{

+			get { return lineNumber; }

+		}

+		

+		public int LinePosition 

+		{

+			get { return linePosition; }

+		}

+		

+		public object ObjectBeingDeserialized 

+		{

+			get{ return obj; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventHandler.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventHandler.cs
new file mode 100755
index 00000000000..be4dda7428a
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlElementEventHandler.cs
@@ -0,0 +1,16 @@
+//
+// XmlElementEventHandler.cs: 
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+//
+using System;
+
+namespace System.Xml.Serialization {
+	
+	[Serializable]
+	public delegate void XmlElementEventHandler (object sender, XmlElementEventArgs e);
+}
+
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlEnumAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlEnumAttribute.cs
new file mode 100644
index 00000000000..e95087c09fb
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlEnumAttribute.cs
@@ -0,0 +1,41 @@
+//
+// XmlEnumAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlEnumAttribute.

+	/// </summary>\

+	[AttributeUsage(AttributeTargets.Field)]

+	public class XmlEnumAttribute : Attribute

+	{

+		private string name;

+

+		public XmlEnumAttribute ()

+		{

+		}

+

+		public XmlEnumAttribute (string name) 

+		{

+			Name = name;

+		}

+

+		public string Name {

+			get { 

+				return name; 

+			}

+			set { 

+				name = value; 

+			}

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlIgnoreAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlIgnoreAttribute.cs
new file mode 100644
index 00000000000..cb0fe82ba33
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlIgnoreAttribute.cs
@@ -0,0 +1,26 @@
+//
+// XmlIgnoreAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlIgnoreAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		 | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class XmlIgnoreAttribute : Attribute

+	{

+		public XmlIgnoreAttribute ()

+		{

+			

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlIncludeAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlIncludeAttribute.cs
new file mode 100644
index 00000000000..e7eafcdf4cc
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlIncludeAttribute.cs
@@ -0,0 +1,37 @@
+//
+// XmlIncludeAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlIncludeAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct |

+		 AttributeTargets.Method)]

+	public class XmlIncludeAttribute : Attribute

+	{

+		private Type type;

+

+		public XmlIncludeAttribute (Type type)

+		{

+			Type = type;

+		}

+

+		public Type Type {

+			get { 

+				return type; 

+			}

+			set { 

+				type = value; 

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlMapping.cs
new file mode 100644
index 00000000000..7c6fd5f880a
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlMapping.cs
@@ -0,0 +1,20 @@
+//
+// XmlMapping.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlMapping.

+	/// </summary>

+	public abstract class XmlMapping

+	{

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
new file mode 100644
index 00000000000..1a9f61ee59d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlMemberMapping.cs
@@ -0,0 +1,52 @@
+// 

+// System.Xml.Serialization.XmlMemberMapping

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Xml.Serialization {

+	public class XmlMemberMapping {

+

+		#region Properties

+

+		public bool Any {	

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string ElementName {	

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string MemberName {	

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string Namespace {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string TypeFullName {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string TypeName {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string TypeNamespace {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlMembersMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlMembersMapping.cs
new file mode 100644
index 00000000000..933c44a7481
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlMembersMapping.cs
@@ -0,0 +1,49 @@
+// 

+// System.Xml.Serialization.XmlMembersMapping

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Reflection;

+

+namespace System.Xml.Serialization {

+	public class XmlMembersMapping : XmlMapping {

+

+		#region Properties

+

+		public int Count {	

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string ElementName {	

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public XmlMemberMapping this [int index] {	

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string Namespace {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string TypeName {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string TypeNamespace {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.cs
new file mode 100644
index 00000000000..4cc59b3cf00
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.cs
@@ -0,0 +1,26 @@
+//
+// XmlNamespaceDeclarationsAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlNamespaceDeclarationsAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		 | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class XmlNamespaceDeclarationsAttribute : Attribute

+	{

+		public XmlNamespaceDeclarationsAttribute ()

+		{

+			

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventArgs.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventArgs.cs
new file mode 100644
index 00000000000..8064d6855f2
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventArgs.cs
@@ -0,0 +1,82 @@
+//
+// XmlNodeEventArgs.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Xml;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlNodeEventArgs.

+	/// </summary>

+	public class XmlNodeEventArgs : EventArgs

+	{

+		private int linenumber;

+		private int lineposition ;

+		private string localname;

+		private string name;

+		private string nsuri;

+		private XmlNodeType nodetype;

+		private object source;

+		private string text;

+

+		internal XmlNodeEventArgs(int linenumber, int lineposition, string localname, string name, string nsuri,

+			XmlNodeType nodetype, object source, string text)

+		{

+			this.linenumber = linenumber;

+			this.lineposition = lineposition;

+			this.localname = localname;

+			this.name = name;

+			this.nsuri = nsuri;

+			this.nodetype = nodetype;

+			this.source = source;

+			this.text = text;

+		}

+

+		public int LineNumber 
+		{

+			get { return linenumber; } 

+		}
+		

+		public int LinePosition 
+		{

+			get { return lineposition; } 

+		}

+

+		public string LocalName
+		{

+			get { return localname; } 

+		}

+

+		public string Name 
+		{

+			get { return name; } 

+		}

+

+		public string NamespaceURI
+		{

+			get { return nsuri; } 

+		}

+

+		public XmlNodeType NodeType
+		{

+			get { return nodetype; } 

+		}

+

+		public object ObjectBeingDeserialized 
+		{

+			get { return source; } 

+		}

+

+		public string Text
+		{

+			get { return text; } 

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventHandler.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventHandler.cs
new file mode 100755
index 00000000000..4c1fdb5c92b
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlNodeEventHandler.cs
@@ -0,0 +1,16 @@
+//
+// XmlNodeEventHandler.cs: 
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+//
+using System;
+
+namespace System.Xml.Serialization {
+	
+	[Serializable]
+	public delegate void XmlNodeEventHandler (object sender, XmlNodeEventArgs e);
+}
+
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
new file mode 100644
index 00000000000..0b75c8b3caa
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionImporter.cs
@@ -0,0 +1,89 @@
+// 

+// System.Xml.Serialization.XmlReflectionImporter 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Reflection;

+

+namespace System.Xml.Serialization {

+	public class XmlReflectionImporter {

+

+		#region Constructors

+

+		[MonoTODO]

+		public XmlReflectionImporter ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlReflectionImporter (string defaultNamespace)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlReflectionImporter (XmlAttributeOverrides attributeOverrides)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlReflectionImporter (XmlAttributeOverrides attributeOverrides, string defaultNamespace)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (string elementName, string ns, XmlReflectionMember[] members, bool hasWrapperElement)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlTypeMapping ImportTypeMapping (Type type)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlTypeMapping ImportTypeMapping (Type type, string defaultNamespace)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlTypeMapping ImportTypeMapping (Type type, XmlRootAttribute group)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlTypeMapping ImportTypeMapping (Type type, XmlRootAttribute group, string defaultNamespace)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void IncludeType (Type type)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void IncludeTypes (ICustomAttributeProvider provider)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionMember.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionMember.cs
new file mode 100644
index 00000000000..43ba1a82e9b
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlReflectionMember.cs
@@ -0,0 +1,66 @@
+// 

+// System.Xml.Serialization.XmlReflectionMember 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+namespace System.Xml.Serialization {

+	public class XmlReflectionMember {

+

+		#region Fields

+

+		bool isReturnValue;

+		string memberName;

+		Type memberType;

+		bool overrideIsNullable;

+		SoapAttributes soapAttributes;

+		XmlAttributes xmlAttributes;

+

+		#endregion

+

+		#region Constructors

+

+		public XmlReflectionMember ()

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool IsReturnValue {

+			get { return isReturnValue; }

+			set { isReturnValue = value; }

+		}

+

+		public string MemberName {

+			get { return memberName; }

+			set { memberName = value; }

+		}

+

+		public Type MemberType {

+			get { return memberType; }

+			set { memberType = value; }

+		}

+

+		public bool OverrideIsNullable {

+			get { return overrideIsNullable; }

+			set { overrideIsNullable = value; }

+		}

+

+		public SoapAttributes SoapAttributes {

+			get { return soapAttributes; }

+			set { soapAttributes = value; }

+		}

+

+		public XmlAttributes XmlAttributes {

+			get { return xmlAttributes; }

+			set { xmlAttributes = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlRootAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlRootAttribute.cs
new file mode 100644
index 00000000000..cc3a83c1b9f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlRootAttribute.cs
@@ -0,0 +1,73 @@
+//
+// XmlRootAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlRootAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct |

+		AttributeTargets.Enum | AttributeTargets.Interface |

+		AttributeTargets.ReturnValue)]

+	public class XmlRootAttribute : Attribute

+	{

+		private string dataType;

+		private string elementName;

+		private bool isNullable;

+		private string ns;

+

+		public XmlRootAttribute ()

+		{

+		

+		}

+		public XmlRootAttribute (string elementName)

+		{

+			ElementName = elementName;

+		}

+

+		public string DataType 

+		{

+			get { 

+				return dataType; 

+			} 

+			set { 

+				dataType = value; 

+			}

+		}

+		public string ElementName 

+		{

+			get { 

+				return elementName; 

+			}

+			set { 

+				elementName = value; 

+			}

+		}

+		public bool IsNullable 

+		{

+			get { 

+				return isNullable; 

+			}

+			set { 

+				isNullable = value; 

+			}

+		}

+		public string Namespace 

+		{

+			get { 

+				return ns; 

+			} 

+			set { 

+				ns = value; 

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaExporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaExporter.cs
new file mode 100644
index 00000000000..bc219bc023b
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaExporter.cs
@@ -0,0 +1,58 @@
+// 

+// System.Xml.Serialization.XmlSchemaExporter 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml;

+

+namespace System.Xml.Serialization {

+	public class XmlSchemaExporter {

+

+		#region Fields

+

+		XmlSchemas schemas;

+

+		#endregion

+

+		#region Constructors

+

+		public XmlSchemaExporter (XmlSchemas schemas)

+		{

+			this.schemas = schemas;

+		}

+

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public string ExportAnyType (string ns)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void ExportMembersMapping (XmlMembersMapping xmlMembersMapping)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlQualifiedName ExportTypeMapping (XmlMembersMapping xmlMembersMapping)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlQualifiedName ExportTypeMapping (XmlTypeMapping xmlTypeMapping)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
new file mode 100644
index 00000000000..9379b948c34
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemaImporter.cs
@@ -0,0 +1,83 @@
+// 

+// System.Xml.Serialization.XmlSchemaImporter 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Xml;

+

+namespace System.Xml.Serialization {

+	public class XmlSchemaImporter {

+

+		#region Fields

+

+		XmlSchemas schemas;

+		CodeIdentifiers typeIdentifiers;

+

+		#endregion

+

+		#region Constructors

+

+		public XmlSchemaImporter (XmlSchemas schemas)

+		{

+			this.schemas = schemas;

+		}

+

+		public XmlSchemaImporter (XmlSchemas schemas, CodeIdentifiers typeIdentifiers)

+			: this (schemas)

+		{

+			this.typeIdentifiers = typeIdentifiers;

+		}

+

+		#endregion // Constructors

+

+		#region Methods

+

+		[MonoTODO]

+		public XmlMembersMapping ImportAnyType (XmlQualifiedName typeName, string elementName)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlTypeMapping ImportDerivedTypeMapping (XmlQualifiedName name, Type baseType)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlTypeMapping ImportDerivedTypeMapping (XmlQualifiedName name, bool baseTypeCanBeIndirect)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (XmlQualifiedName name)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (XmlQualifiedName[] names)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlMembersMapping ImportMembersMapping (XmlQualifiedName[] names, Type baseType, bool baseTypeCanBeIndirect)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public XmlTypeMapping ImportTypeMapping (XmlQualifiedName name)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs
new file mode 100644
index 00000000000..a6f79f6ccd1
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSchemas.cs
@@ -0,0 +1,115 @@
+// 

+// System.Xml.Serialization.XmlSchemas 

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System.Collections;

+using System.Xml.Schema;

+

+namespace System.Xml.Serialization {

+	public class XmlSchemas : CollectionBase {

+

+		#region Fields

+

+		static Hashtable table = new Hashtable ();

+

+		#endregion

+

+		#region Constructors

+

+		public XmlSchemas ()

+		{

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public XmlSchema this [int index] {

+			get { 

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+

+				return (XmlSchema) List [index]; 

+			}

+			set { List [index] = value; }

+		}

+

+		public XmlSchema this [string ns] {

+			get { return (XmlSchema) table[ns]; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public int Add (XmlSchema schema)

+		{

+			Insert (Count, schema);

+			return (Count - 1);

+		}

+

+		public void Add (XmlSchemas schemas) 

+		{

+			foreach (XmlSchema schema in schemas) 

+				Add (schema);

+		}

+

+		public bool Contains (XmlSchema schema)

+		{

+			return List.Contains (schema);

+		}

+

+		public void CopyTo (XmlSchema[] array, int index) 

+		{

+			List.CopyTo (array, index);

+		}

+

+		public int IndexOf (XmlSchema schema)

+		{

+			return List.IndexOf (schema);

+		}

+

+		public void Insert (int index, XmlSchema schema)

+		{

+			List.Insert (index, schema);

+		}

+

+		[MonoTODO]

+		public static bool IsDataSet (XmlSchema schema)

+		{

+			throw new NotImplementedException ();

+		}

+

+		protected override void OnClear ()

+		{

+			table.Clear ();

+		}

+

+		protected override void OnInsert (int index, object value)

+		{	

+			table [((XmlSchema) value).TargetNamespace] = value;

+		}

+

+		protected override void OnRemove (int index, object value)

+		{

+			table.Remove (value);

+		}

+

+		protected override void OnSet (int index, object oldValue, object newValue)

+		{

+			table [((XmlSchema) oldValue).TargetNamespace] = newValue;

+		}

+	

+		public void Remove (XmlSchema schema)

+		{

+			List.Remove (schema);

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationCollectionFixupCallback.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationCollectionFixupCallback.cs
new file mode 100644
index 00000000000..2fd79643126
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationCollectionFixupCallback.cs
@@ -0,0 +1,17 @@
+//
+// System.Xml.Serialization.XmlSerializationCollectionFixupCallback.cs: 
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+
+namespace System.Xml.Serialization {
+	
+	[Serializable]
+	public delegate void XmlSerializationCollectionFixupCallback (object collection, object collectionItems);
+}
+
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationFixupCallback.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationFixupCallback.cs
new file mode 100644
index 00000000000..e1bf47a4fa5
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationFixupCallback.cs
@@ -0,0 +1,17 @@
+//
+// System.Xml.Serialization.XmlSerializationFixupCallback.cs: 
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+
+namespace System.Xml.Serialization {
+	
+	[Serializable]
+	public delegate void XmlSerializationFixupCallback (object fixup);
+}
+
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReadCallback.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReadCallback.cs
new file mode 100644
index 00000000000..bd426ff0415
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReadCallback.cs
@@ -0,0 +1,17 @@
+//
+// System.Xml.Serialization.XmlSerializationReadCallback.cs: 
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+
+namespace System.Xml.Serialization {
+	
+	[Serializable]
+	public delegate object XmlSerializationReadCallback ();
+}
+
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
new file mode 100644
index 00000000000..b42fb6a5932
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationReader.cs
@@ -0,0 +1,445 @@
+//
+// System.Xml.Serialization.XmlSerializationReader.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+using System.Collections;
+using System.Xml;
+
+namespace System.Xml.Serialization {
+	public abstract class XmlSerializationReader {
+
+		#region Fields
+
+		XmlDocument document;
+		XmlReader reader;
+
+		#endregion
+
+		[MonoTODO]
+		protected XmlSerializationReader ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected XmlDocument Document {
+			get { return document; }
+		}
+
+		protected XmlReader Reader {
+			get { return reader; }
+		}
+
+		#region Methods
+
+		[MonoTODO ("Implement")]
+		protected void AddFixup (XmlSerializationReader.CollectionFixup fixup)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void AddFixup (XmlSerializationReader.Fixup fixup)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void AddReadCallback (string name, string ns, Type type, XmlSerializationReadCallback read)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void AddTarget (string id, object o)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected Exception CreateAbstractTypeException (string name, string ns)
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected Exception CreateInvalidCastException (Type type, object value)
+		{
+			string message = String.Format ("Cannot assign object of type {0} to an object of type {1}.", value.GetType (), type);
+			return new InvalidCastException (message);
+		}
+
+		protected Exception CreateReadOnlyCollectionException (string name)
+		{
+			string message = String.Format ("Could not serialize {0}. Default constructors are required for collections and enumerators.", name);
+			return new InvalidOperationException (message);
+		}
+
+		protected Exception CreateUnknownConstantException (string value, Type enumType)
+		{
+			string message = String.Format ("'{0}' is not a valid value for {1}.", value, enumType);
+			return new InvalidOperationException (message);
+		}
+
+		[MonoTODO ("Implement")]
+		protected Exception CreateUnknownNodeException ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected Exception CreateUnknownTypeException (XmlQualifiedName type)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected Array EnsureArrayIndex (Array a, int index, Type elementType)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void FixupArrayRefs (object fixup)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected int GetArrayLength (string name, string ns)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected bool GetNullAttr ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected object GetTarget (string id)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected XmlQualifiedName GetXsiType ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected abstract void InitCallbacks ();
+		protected abstract void InitIDs ();
+
+		[MonoTODO ("Implement")]
+		protected bool IsXmlnsAttribute (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void ParseWsdlArrayType (XmlAttribute attr)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected XmlQualifiedName ReadElementQualifiedName ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void ReadEndElement ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected bool ReadNull ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected XmlQualifiedName ReadNullableQualifiedName ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected string ReadNullableString ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected bool ReadReference (out string fixupReference)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected object ReadReferencedElement ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected object ReadReferencedElement (string name, string ns)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void ReadReferencedElements ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected object ReadReferencingElement (out string fixupReference)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected object ReadReferencingElement (string name, string ns, out string fixupReference)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected object ReadReferencingElement (string name, string ns, bool elementCanBeType, out string fixupReference)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected IXmlSerializable ReadSerializable (IXmlSerializable serializable)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected string ReadString (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected object ReadTypedPrimitive (XmlQualifiedName type)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected XmlNode ReadXmlNode (bool wrapped)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void Referenced (object o)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected Array ShrinkArray (Array a, int length, Type elementType, bool isNullable)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected byte[] ToByteArrayBase64 (bool isNull)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected static byte[] ToByteArrayBase64 (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected byte[] ToByteArrayHex (bool isNull)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected static byte[] ToByteArrayHex (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected static char ToChar (string value)
+		{
+			return XmlCustomFormatter.ToChar (value);
+		}
+
+		protected static DateTime ToDate (string value)
+		{
+			return XmlCustomFormatter.ToDate (value);
+		}
+
+		protected static DateTime ToDateTime (string value)
+		{
+			return XmlCustomFormatter.ToDateTime (value);
+		}
+
+		[MonoTODO ("Implement")]
+		protected static long ToEnum (string value, Hashtable h, string typeName)
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected static DateTime ToTime (string value)
+		{
+			return XmlCustomFormatter.ToTime (value);
+		}
+
+		protected static string ToXmlName (string value)
+		{
+			return XmlCustomFormatter.ToXmlName (value);
+		}
+
+		protected static string ToXmlNCName (string value)
+		{
+			return XmlCustomFormatter.ToXmlNCName (value);
+		}
+
+		protected static string ToXmlNmToken (string value)
+		{
+			return XmlCustomFormatter.ToXmlNmToken (value);
+		}
+
+		protected static string ToXmlNmTokens (string value)
+		{
+			return XmlCustomFormatter.ToXmlNmTokens (value);
+		}
+
+		[MonoTODO ("Implement")]
+		protected XmlQualifiedName ToXmlQualifiedName (string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void UnknownAttribute (object o, XmlAttribute attr)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void UnknownElement (object o, XmlElement elem)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void UnknownNode (object o)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void UnreferencedObject (string id, object o)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+
+		protected class CollectionFixup {
+			
+			#region Fields
+
+			XmlSerializationCollectionFixupCallback callback;
+			object collection;
+			object collectionItems;
+
+			#endregion // Fields
+
+			#region Constructors
+
+			[MonoTODO]
+			public CollectionFixup (object collection, XmlSerializationCollectionFixupCallback callback, object collectionItems)
+			{
+				this.callback = callback;
+				this.collection = collection;
+				this.collectionItems = collectionItems;
+			}
+
+			#endregion // Constructors
+
+			#region Properties
+
+			public XmlSerializationCollectionFixupCallback Callback { 
+				get { return callback; }
+			}
+
+			public object Collection {
+				get { return collection; }
+			}
+
+			public object CollectionItems {
+				get { return collectionItems; }
+			}
+
+			#endregion // Properties
+		}
+
+		protected class Fixup {
+
+			#region Fields
+
+			object source;
+			string[] ids;
+			XmlSerializationFixupCallback callback;
+
+			#endregion // Fields
+
+			#region Constructors
+
+			[MonoTODO]
+			public Fixup (object o, XmlSerializationFixupCallback callback, int count) 
+			{
+				this.callback = callback;
+			}
+
+			[MonoTODO]
+			public Fixup (object o, XmlSerializationFixupCallback callback, string[] ids)
+			{
+				this.callback = callback;
+			}
+
+			#endregion // Constructors
+
+			#region Properties
+
+			public XmlSerializationFixupCallback Callback {
+				get { return callback; }
+			}
+
+			public string[] Ids {
+				get { return ids; }
+			}
+
+			public object Source {
+				get { return source; }
+				set { source = value; }
+			}
+
+			#endregion // Properties
+		}
+	}
+}
+
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriteCallback.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriteCallback.cs
new file mode 100644
index 00000000000..bc51126e2c7
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriteCallback.cs
@@ -0,0 +1,17 @@
+//
+// System.Xml.Serialization.XmlSerializationWriteCallback.cs: 
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+
+namespace System.Xml.Serialization {
+	
+	[Serializable]
+	public delegate object XmlSerializationWriteCallback (object o);
+}
+
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
new file mode 100644
index 00000000000..5b5dac4616e
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializationWriter.cs
@@ -0,0 +1,527 @@
+//
+// System.Xml.Serialization.XmlSerializationWriter.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+using System.Collections;
+using System.Text;
+using System.Xml;
+using System.Xml.Schema;
+
+namespace System.Xml.Serialization {
+	public abstract class XmlSerializationWriter {
+
+		#region Fields
+
+		Hashtable references;
+		int referenceCount;
+
+		ArrayList namespaces;
+		XmlWriter writer;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		[MonoTODO]
+		protected XmlSerializationWriter ()
+		{
+			references = new Hashtable ();
+			referenceCount = 0;
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+
+		protected ArrayList Namespaces {
+			get { return namespaces; }
+			set { namespaces = value; }
+		}
+
+		protected XmlWriter Writer {
+			get { return writer; }
+			set { writer = value; }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO ("Implement")]
+		protected void AddWriteCallback (Type type, string typeName, string typeNs, XmlSerializationWriteCallback callback)
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected Exception CreateMismatchChoiceException (string value, string elementName, string enumValue)
+		{
+			string message = String.Format ("Value of {0} mismatches the type of {1}, you need to set it to {2}.", elementName, value, enumValue);
+			return new InvalidOperationException (message);
+		}
+
+		protected Exception CreateUnknownAnyElementException (string name, string ns)
+		{
+			string message = String.Format ("The XML element named '{0}' from namespace '{1}' was not expected. The XML element name and namespace must match those provided via XmlAnyElementAttribute(s).", name, ns);
+			return new InvalidOperationException (message);
+		}
+
+		protected Exception CreateUnknownTypeException (object o)
+		{
+			return CreateUnknownTypeException (o.GetType ());
+		}
+
+		protected Exception CreateUnknownTypeException (Type type)
+		{
+			string message = String.Format ("The type {0} may not be used in this context.", type);
+			return new InvalidOperationException (message);
+		}
+
+		protected static byte[] FromByteArrayBase64 (byte[] value)
+		{
+			return XmlCustomFormatter.FromByteArrayBase64 (value);
+		}
+
+		protected static string FromByteArrayHex (byte[] value)
+		{
+			return XmlCustomFormatter.FromByteArrayHex (value);
+		}
+
+		protected static string FromChar (char value)
+		{
+			return XmlCustomFormatter.FromChar (value);
+		}
+
+		protected static string FromDate (DateTime value)
+		{
+			return XmlCustomFormatter.FromDate (value);
+		}
+
+		protected static string FromDateTime (DateTime value)
+		{
+			return XmlCustomFormatter.FromDateTime (value);
+		}
+
+		protected static string FromEnum (long value, string[] values, long[] ids)
+		{
+			return XmlCustomFormatter.FromEnum (value, values, ids);
+		}
+
+		protected static string FromTime (DateTime value)
+		{
+			return XmlCustomFormatter.FromTime (value);
+		}
+
+		protected static string FromXmlName (string name)
+		{
+			return XmlCustomFormatter.FromXmlName (name);
+		}
+
+		protected static string FromXmlNCName (string ncName)
+		{
+			return XmlCustomFormatter.FromXmlNCName (ncName);
+		}
+
+		protected static string FromXmlNmToken (string nmToken)
+		{
+			return XmlCustomFormatter.FromXmlNmToken (nmToken);
+		}
+
+		protected static string FromXmlNmTokens (string nmTokens)
+		{
+			return XmlCustomFormatter.FromXmlNmTokens (nmTokens);
+		}
+
+		[MonoTODO ("Implement")]
+		protected string FromXmlQualifiedName (XmlQualifiedName xmlQualifiedName)
+		{
+			return GetQualifiedName (xmlQualifiedName.Name, xmlQualifiedName.Namespace);
+		}
+
+		private string GetId (object o, bool addToReferencesList)
+		{
+			referenceCount += 1;
+			string id = String.Format ("id{0}", referenceCount);
+			if (addToReferencesList)
+				references[o] = id;
+			return id;
+		}
+
+		private string GetQualifiedName (string name, string ns)
+		{
+			WriteAttribute ("xmlns", "q1", null, ns);
+			return String.Format ("{0}:{1}", "q1", name);
+		}
+
+		protected abstract void InitCallbacks ();
+
+		[MonoTODO ("Implement")]
+		protected void TopLevelElement ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected void WriteAttribute (string localName, byte[] value)
+		{
+			WriteAttribute (localName, String.Empty, value);
+		}
+
+		protected void WriteAttribute (string localName, string value)
+		{
+			WriteAttribute (String.Empty, localName, String.Empty, value);
+		}
+
+		protected void WriteAttribute (string localName, string ns, byte[] value)
+		{
+			Writer.WriteStartAttribute (localName, ns);
+			WriteValue (value);
+			Writer.WriteEndAttribute ();
+		}
+
+		protected void WriteAttribute (string localName, string ns, string value)
+		{
+			WriteAttribute (String.Empty, localName, ns, value);
+		}
+
+		protected void WriteAttribute (string prefix, string localName, string ns, string value)
+		{
+			Writer.WriteStartAttribute (prefix, localName, ns);
+			WriteValue (value);
+			Writer.WriteEndAttribute ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteElementEncoded (XmlNode node, string name, string ns, bool isNullable, bool any)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteElementLiteral (XmlNode node, string name, string ns, bool isNullable, bool any)
+		{
+			WriteStartElement (name, ns);
+			node.WriteTo (Writer);
+			WriteEndElement ();
+		}
+
+		protected void WriteElementQualifiedName (string localName, XmlQualifiedName value)
+		{
+			WriteElementQualifiedName (localName, String.Empty, value, null);
+		}
+
+		protected void WriteElementQualifiedName (string localName, string ns, XmlQualifiedName value)
+		{
+			WriteElementQualifiedName (localName, ns, value, null);
+		}
+
+		protected void WriteElementQualifiedName (string localName, XmlQualifiedName value, XmlQualifiedName xsiType)
+		{
+			WriteElementQualifiedName (localName, String.Empty, value, xsiType);
+		}
+
+		protected void WriteElementQualifiedName (string localName, string ns, XmlQualifiedName value, XmlQualifiedName xsiType)
+		{
+			WriteStartElement (localName, ns);
+			Writer.WriteString (FromXmlQualifiedName (value));
+			WriteEndElement ();
+		}
+
+		protected void WriteElementString (string localName, string value)
+		{
+			WriteElementString (localName, String.Empty, value, null);
+		}
+
+		protected void WriteElementString (string localName, string ns, string value)
+		{
+			WriteElementString (localName, ns, value, null);
+		}
+
+		protected void WriteElementString (string localName, string value, XmlQualifiedName xsiType)
+		{
+			WriteElementString (localName, String.Empty, value, xsiType);
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteElementString (string localName, string ns, string value, XmlQualifiedName xsiType)
+		{
+			WriteStartElement (localName, ns);
+
+			if (xsiType != null)
+				WriteXsiType (xsiType.Name, xsiType.Namespace);
+
+			Writer.WriteString (value);
+			WriteEndElement ();
+		}
+
+		protected void WriteElementStringRaw (string localName, byte[] value)
+		{
+			WriteElementStringRaw (localName, String.Empty, value, null);
+		}
+
+		protected void WriteElementStringRaw (string localName, string value)
+		{
+			WriteElementStringRaw (localName, String.Empty, value, null);
+		}
+
+		protected void WriteElementStringRaw (string localName, byte[] value, XmlQualifiedName xsiType)
+		{
+			WriteElementStringRaw (localName, String.Empty, value, xsiType);
+		}
+
+		protected void WriteElementStringRaw (string localName, string ns, byte[] value)
+		{
+			WriteElementStringRaw (localName, ns, value, null);
+		}
+
+		protected void WriteElementStringRaw (string localName, string ns, string value)
+		{
+			WriteElementStringRaw (localName, ns, value, null);
+		}
+
+		protected void WriteElementStringRaw (string localName, string value, XmlQualifiedName xsiType)
+		{
+			WriteElementStringRaw (localName, String.Empty, value, null);
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteElementStringRaw (string localName, string ns, byte[] value, XmlQualifiedName xsiType)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteElementStringRaw (string localName, string ns, string value, XmlQualifiedName xsiType)
+		{
+			WriteStartElement (localName, ns);
+
+			if (xsiType != null)
+				WriteXsiType (xsiType.Name, xsiType.Namespace);
+
+			Writer.WriteRaw (value);
+			WriteEndElement ();
+		}
+
+		protected void WriteEmptyTag (string name)
+		{
+			WriteEmptyTag (name, String.Empty);
+		}
+
+		[MonoTODO ("Verify")]
+		protected void WriteEmptyTag (string name, string ns)
+		{
+			Writer.WriteStartElement (name, ns);
+			Writer.WriteEndElement ();
+		}
+
+		protected void WriteEndElement ()
+		{
+			WriteEndElement (null);
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteEndElement (object o)
+		{
+			Writer.WriteEndElement ();
+		}
+
+		protected void WriteId (object o)
+		{
+			WriteAttribute ("id", GetId (o, true));
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteNullableQualifiedNameEncoded (string name, string ns, XmlQualifiedName value, XmlQualifiedName xsiType)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteNullableQualifiedNameLiteral (string name, string ns, XmlQualifiedName value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteNullableStringEncoded (string name, string ns, string value, XmlQualifiedName xsiType)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteNullableStringEncodedRaw (string name, string ns, byte[] value, XmlQualifiedName xsiType)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteNullableStringEncodedRaw (string name, string ns, string value, XmlQualifiedName xsiType)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteNullableStringLiteral (string name, string ns, string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteNullableStringLiteralRaw (string name, string ns, byte[] value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteNullableStringLiteralRaw (string name, string ns, string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected void WriteNullTagEncoded (string name)
+		{
+			WriteNullTagEncoded (name, String.Empty);
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteNullTagEncoded (string name, string ns)
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected void WriteNullTagLiteral (string name)
+		{
+			WriteNullTagLiteral (name, String.Empty);
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteNullTagLiteral (string name, string ns)
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected void WritePotentiallyReferencingElement (string n, string ns, object o)
+		{
+			WritePotentiallyReferencingElement (n, ns, o, null, false, false);
+		}
+
+		protected void WritePotentiallyReferencingElement (string n, string ns, object o, Type ambientType)
+		{
+			WritePotentiallyReferencingElement (n, ns, o, ambientType, false, false);
+		}
+
+		protected void WritePotentiallyReferencingElement (string n, string ns, object o, Type ambientType, bool suppressReference)
+		{
+			WritePotentiallyReferencingElement (n, ns, o, ambientType, suppressReference, false);
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WritePotentiallyReferencingElement (string n, string ns, object o, Type ambientType, bool suppressReference, bool isNullable)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteReferencedElements ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected void WriteReferencingElement (string n, string ns, object o)
+		{
+			WriteReferencingElement (n, ns, o, false);
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteReferencingElement (string n, string ns, object o, bool isNullable)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteSerializable (IXmlSerializable serializable, string name, string ns, bool isNullable)
+		{
+			throw new NotImplementedException ();
+		}
+
+		protected void WriteStartDocument ()
+		{
+			Writer.WriteStartDocument ();
+		}
+
+		protected void WriteStartElement (string name)
+		{
+			WriteStartElement (name, String.Empty, null, false);
+		}
+
+		protected void WriteStartElement (string name, string ns)
+		{
+			WriteStartElement (name, ns, null, false);
+		}
+
+		protected void WriteStartElement (string name, string ns, bool writePrefixed)
+		{
+			WriteStartElement (name, ns, null, writePrefixed);
+		}
+
+		protected void WriteStartElement (string name, string ns, object o)
+		{
+			WriteStartElement (name, ns, o, false);
+		}
+
+		[MonoTODO]
+		protected void WriteStartElement (string name, string ns, object o, bool writePrefixed)
+		{
+			if (writePrefixed)
+				Writer.WriteStartElement (String.Empty, name, ns);
+			else
+				Writer.WriteStartElement (name, ns);
+		}
+
+		[MonoTODO ("get primitive type name")]
+		protected void WriteTypedPrimitive (string name, string ns, object o, bool xsiType)
+		{
+			WriteStartElement (name, ns);
+
+			if (xsiType)
+				WriteXsiType (o.GetType ().Name, XmlSchema.Namespace);
+
+			WriteValue (o.ToString ());
+			WriteEndElement ();
+		}
+
+		protected void WriteValue (byte[] value)
+		{
+			Writer.WriteBase64 (value, 0, value.Length);
+		}
+
+		protected void WriteValue (string value)
+		{
+			Writer.WriteString (value);
+		}
+
+		protected void WriteXmlAttribute (XmlNode node)
+		{
+			WriteXmlAttribute (node, null);
+		}
+
+		[MonoTODO ("Implement")]
+		protected void WriteXmlAttribute (XmlNode node, object container)
+		{
+			if (!(node is XmlAttribute))
+				throw new InvalidOperationException ("The node must be either type XmlAttribute or a derived type.");
+			throw new NotImplementedException ();
+		}
+
+		protected void WriteXsiType (string name, string ns)
+		{
+			WriteAttribute ("type", XmlSchema.InstanceNamespace, GetQualifiedName (name, ns));
+		}
+		
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
new file mode 100644
index 00000000000..d7e46627fd2
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializer.cs
@@ -0,0 +1,857 @@
+//
+// Mono Class Libraries
+// System.Xml.Serialization.XmlSerializer
+//
+// Authors:
+//   John Donagher (john@webmeta.com)
+//   Ajay kumar Dwivedi (adwiv@yahoo.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) 2002 John Donagher, Ajay kumar Dwivedi
+// Copyright (C) Tim Coleman, 2002
+// 
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+using System.Xml.Schema;
+
+namespace System.Xml.Serialization {	
+	/// <summary>
+	/// Summary description for XmlSerializer.
+	/// </summary>
+	public class XmlSerializer {
+
+		#region Fields
+
+		Type type;
+		XmlAttributeOverrides overrides;
+		Type[] extraTypes;
+		XmlRootAttribute rootAttribute;
+		string defaultNamespace;
+		static Hashtable typeTable;
+		bool useOrder;
+		bool isNullable;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		protected XmlSerializer ()
+		{
+		}
+
+		public XmlSerializer (Type type)
+			: this (type, null, null, null, null)
+		{
+		}
+
+		[MonoTODO]
+		public XmlSerializer (XmlTypeMapping xmltypemapping)
+		{
+		}
+
+		public XmlSerializer (Type type, string defaultNamespace)
+			: this (type, null, null, null, defaultNamespace)
+		{
+		}
+
+		public XmlSerializer (Type type, Type[] extraTypes)
+			: this (type, null, extraTypes, null, null)
+		{
+		}
+
+		public XmlSerializer (Type type, XmlAttributeOverrides overrides)
+			: this (type, overrides, null, null, null)
+		{
+		}
+
+		public XmlSerializer (Type type, XmlRootAttribute root)
+			: this (type, null, null, root, null)
+		{
+		}
+
+		internal XmlSerializer (Hashtable typeTable)
+		{
+			typeTable = typeTable;
+		}
+
+		public XmlSerializer (Type type, XmlAttributeOverrides overrides, Type[] extraTypes, XmlRootAttribute root, string defaultNamespace)
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type", "XmlSerializer can't be constructed with a null type");
+
+			this.type = type;
+			this.overrides = overrides;
+			this.extraTypes = (extraTypes == null ? new Type[0] : extraTypes);
+		
+			if (root != null)
+				this.rootAttribute = root;
+			else {
+				object[] attributes = type.GetCustomAttributes (typeof (XmlRootAttribute), false);
+				if (attributes.Length > 0)
+					this.rootAttribute = (XmlRootAttribute) attributes[0];
+			}
+			
+			this.defaultNamespace = defaultNamespace;
+
+			if (typeTable == null)
+				typeTable = new Hashtable ();
+
+			FillTypeTable (type);
+		}
+
+		#endregion // Constructors
+
+		#region Events
+
+		[MonoTODO]
+		public event XmlAttributeEventHandler UnknownAttribute;
+		[MonoTODO]
+		public event XmlElementEventHandler UnknownElement;
+		[MonoTODO]
+		public event XmlNodeEventHandler UnknownNode;
+		[MonoTODO]
+		public event UnreferencedObjectEventHandler UnreferencedObject;
+
+		#endregion // Events
+
+		#region Properties
+
+		public bool UseOrder {
+			get { return useOrder; }
+			set { useOrder = value; }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public virtual bool CanDeserialize (XmlReader xmlReader)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected virtual XmlSerializationReader CreateReader ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected virtual XmlSerializationWriter CreateWriter ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public object Deserialize (Stream stream)
+		{
+			throw new NotImplementedException ();
+		}
+		[MonoTODO]
+		public object Deserialize (TextReader textReader)
+		{
+			throw new NotImplementedException ();
+		}
+		[MonoTODO]
+		public object Deserialize (XmlReader xmlReader)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected virtual object Deserialize (XmlSerializationReader reader)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected virtual void Serialize (object o, XmlSerializationWriter writer)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void Serialize (Stream stream, object o)
+		{
+			XmlTextWriter xmlWriter = new XmlTextWriter (stream, System.Text.Encoding.Default);
+			xmlWriter.Formatting = Formatting.Indented;
+			Serialize (xmlWriter, o, null);
+		}
+		
+		public void Serialize (TextWriter textWriter, object o)
+		{
+			XmlTextWriter xmlWriter = new XmlTextWriter (textWriter);
+			xmlWriter.Formatting = Formatting.Indented;
+			Serialize (xmlWriter, o, null);
+		}
+		
+		public void Serialize (XmlWriter xmlWriter, object o)
+		{
+			Serialize (xmlWriter, o);
+		}
+		
+		public void Serialize (Stream stream, object o, XmlSerializerNamespaces namespaces)
+		{
+			XmlTextWriter xmlWriter = new XmlTextWriter (stream, System.Text.Encoding.Default);
+			xmlWriter.Formatting = Formatting.Indented;
+			Serialize (xmlWriter, o, namespaces);
+		}
+		
+		public void Serialize (TextWriter textWriter, object o, XmlSerializerNamespaces namespaces)
+		{
+			XmlTextWriter xmlWriter = new XmlTextWriter (textWriter);
+			xmlWriter.Formatting = Formatting.Indented;
+			Serialize (xmlWriter, o, namespaces);
+		}
+
+		public void Serialize (XmlWriter writer, object o, XmlSerializerNamespaces namespaces)
+		{	
+			Type objType = o.GetType ();
+			string rootName = objType.Name;
+			string rootNs = String.Empty;
+			string rootPrefix = String.Empty;
+
+			if (namespaces == null)
+				namespaces = new XmlSerializerNamespaces ();
+
+			if (namespaces.Count == 0) {
+				namespaces.Add ("xsd", XmlSchema.Namespace);
+				namespaces.Add ("xsi", XmlSchema.InstanceNamespace);
+			}
+
+			XmlSerializerNamespaces nss = new XmlSerializerNamespaces ();
+			XmlQualifiedName[] qnames;
+
+			writer.WriteStartDocument ();
+			
+			object[] memberObj = (object[]) typeTable[objType];
+			if (memberObj == null)
+				throw new Exception ("Unknown Type " + objType + " encountered during Serialization");
+
+			Hashtable memberTable = (Hashtable) memberObj[0];
+			XmlAttributes xmlAttributes = (XmlAttributes) memberTable[""];
+
+			//If we have been passed an XmlRoot, set it on the base class
+			if (rootAttribute != null)
+				xmlAttributes.XmlRoot = rootAttribute;
+			
+			if (xmlAttributes.XmlRoot != null) {
+				isNullable = xmlAttributes.XmlRoot.IsNullable;
+				if (xmlAttributes.XmlRoot.ElementName != null)
+					rootName = xmlAttributes.XmlRoot.ElementName;
+				rootNs	= xmlAttributes.XmlRoot.Namespace;
+			}
+
+			if (namespaces.GetPrefix (rootNs) != null)
+				rootPrefix = namespaces.GetPrefix (rootNs);
+
+			//XMLNS attributes in the Root
+			XmlAttributes XnsAttrs = (XmlAttributes) ((object[]) typeTable[objType])[1];
+			if (XnsAttrs != null) {
+				MemberInfo member = XnsAttrs.MemberInfo;
+				FieldInfo fieldInfo = member as FieldInfo;
+				PropertyInfo propertyInfo = member as PropertyInfo;
+				XmlSerializerNamespaces xns;
+
+				if (fieldInfo != null)
+					xns = (XmlSerializerNamespaces) fieldInfo.GetValue (o);
+				else
+					xns = (XmlSerializerNamespaces) propertyInfo.GetValue (o, null);
+				
+				qnames = xns.ToArray ();
+
+				foreach (XmlQualifiedName qname in qnames)
+					nss.Add (qname.Name, qname.Namespace);
+			}
+
+			//XmlNs from the namespaces passed
+			qnames = namespaces.ToArray ();
+			foreach (XmlQualifiedName qname in qnames)
+				if (writer.LookupPrefix (qname.Namespace) != qname.Name)
+					nss.Add (qname.Name, qname.Namespace);
+
+			writer.WriteStartElement (rootPrefix, rootName, rootNs);
+
+			qnames = nss.ToArray();
+			foreach (XmlQualifiedName qname in qnames)
+				if (writer.LookupPrefix (qname.Namespace) != qname.Name)
+					writer.WriteAttributeString ("xmlns", qname.Name, null, qname.Namespace);
+
+			if (rootPrefix == String.Empty && rootNs != String.Empty && rootNs != null)
+				writer.WriteAttributeString (String.Empty, "xmlns", null, rootNs);
+
+			SerializeMembers (writer, o, true);//, namespaces);
+			writer.WriteEndDocument ();
+		}
+
+		private void SerializeMembers (XmlWriter writer, object o, bool isRoot)
+		{
+			Type objType = o.GetType ();
+			XmlAttributes nsAttributes = (XmlAttributes) ((object[]) typeTable [objType])[1];
+			ArrayList attributes = (ArrayList) ((object[]) typeTable [objType])[2];
+			ArrayList elements = (ArrayList) ((object[]) typeTable [objType])[3];
+
+
+			if (!isRoot && nsAttributes != null) {
+				MemberInfo member = nsAttributes.MemberInfo;
+				FieldInfo fieldInfo = member as FieldInfo;
+				PropertyInfo propertyInfo = member as PropertyInfo;
+
+				XmlSerializerNamespaces xns;
+
+				if (fieldInfo != null)
+					xns = (XmlSerializerNamespaces) fieldInfo.GetValue (o);
+				else
+					xns = (XmlSerializerNamespaces) propertyInfo.GetValue (o, null);
+				
+				XmlQualifiedName[] qnames = xns.ToArray ();
+				foreach (XmlQualifiedName qname in qnames)
+					if (writer.LookupPrefix (qname.Namespace) != qname.Name)
+						writer.WriteAttributeString ("xmlns", qname.Name, null, qname.Namespace);
+			}
+
+			//Serialize the Attributes.
+			foreach (XmlAttributes xmlAttributes in attributes) {
+				MemberInfo member = xmlAttributes.MemberInfo;
+				FieldInfo fieldInfo = member as FieldInfo;
+				PropertyInfo propertyInfo = member as PropertyInfo;
+
+				Type attributeType;
+				object attributeValue;
+				string attributeValueString;
+				string attributeName;
+				string attributeNs;
+
+				if (fieldInfo != null) {
+					attributeType = fieldInfo.FieldType;
+					attributeValue = fieldInfo.GetValue (o);
+				} 
+				else {
+					attributeType = propertyInfo.PropertyType;
+					attributeValue = propertyInfo.GetValue (o, null);
+				}
+
+				attributeName = xmlAttributes.GetAttributeName (attributeType, member.Name);
+				attributeNs = xmlAttributes.GetAttributeNamespace (attributeType);
+			
+				if (attributeValue is XmlQualifiedName) {
+					XmlQualifiedName qname = (XmlQualifiedName) attributeValue;
+
+					if (qname.IsEmpty)
+						continue;
+
+					writer.WriteStartAttribute (attributeName, attributeNs);
+					writer.WriteQualifiedName (qname.Name, qname.Namespace);
+					writer.WriteEndAttribute ();
+					continue;
+				}
+				else if (attributeValue is XmlQualifiedName[]) {
+					XmlQualifiedName[] qnames = (XmlQualifiedName[]) attributeValue;
+					writer.WriteStartAttribute (attributeName, attributeNs);
+					int count = 0;
+					foreach (XmlQualifiedName qname in qnames) {
+						if (qname.IsEmpty)
+							continue;
+						if (count++ > 0)
+							writer.WriteWhitespace (" ");
+						writer.WriteQualifiedName (qname.Name, qname.Namespace);
+					}
+					writer.WriteEndAttribute ();
+					continue;
+				}
+				else if (attributeValue is XmlAttribute[]) {
+					XmlAttribute[] xmlattrs = (XmlAttribute[]) attributeValue;
+					foreach (XmlAttribute xmlattr in xmlattrs)
+						xmlattr.WriteTo(writer);
+					continue;
+				}
+
+				attributeValueString = GetXmlValue (attributeValue);
+				if (attributeValueString != GetXmlValue (xmlAttributes.XmlDefaultValue))
+					writer.WriteAttributeString (attributeName, attributeNs, attributeValueString);
+			}
+
+			// Serialize Elements
+			foreach (XmlAttributes xmlElements in elements) {
+				MemberInfo member = xmlElements.MemberInfo;
+				FieldInfo fieldInfo = member as FieldInfo;
+				PropertyInfo propertyInfo = member as PropertyInfo;
+
+				Type elementType;
+				object elementValue;
+				string elementName;
+				string elementNs;
+
+				if (fieldInfo != null) {
+					elementType = fieldInfo.FieldType;
+					elementValue = fieldInfo.GetValue (o);
+				}
+				else {
+					elementType  = propertyInfo.PropertyType;
+					elementValue = propertyInfo.GetValue (o, null);
+				}
+
+				elementName = xmlElements.GetElementName (elementType, member.Name);
+				elementNs = xmlElements.GetElementNamespace (elementType);
+				WriteElement (writer, xmlElements, elementName, elementNs, elementType, elementValue);
+			}
+		}
+
+		[MonoTODO ("Remove FIXMEs")]
+		private void WriteElement (XmlWriter writer, XmlAttributes attrs, string name, string ns, Type type, Object value)
+		{
+			if (IsInbuiltType (type)) {
+				string xmlValue = GetXmlValue (value);
+				if (xmlValue != String.Empty && xmlValue != null)
+					writer.WriteElementString (name, ns,  xmlValue);
+			}
+			else if (attrs.XmlText != null && value != null) {
+				if (type == typeof (object[])) {
+					// FIXME
+				}
+				else if (type == typeof (string[])) {
+					// FIXME
+				}
+				else if (type == typeof (XmlNode)) {
+					((XmlNode) value).WriteTo (writer);
+				}
+				else if (type == typeof (XmlNode[])) {
+					XmlNode[] nodes = (XmlNode[]) value;
+					foreach (XmlNode node in nodes)
+						node.WriteTo (writer);
+				}
+			}
+			else if (type.IsArray && value != null) {
+				writer.WriteStartElement (name, ns);
+				SerializeArray (writer, value);
+				writer.WriteEndElement ();
+			}
+			else if (value is ICollection) {
+				BindingFlags flags = BindingFlags.Public | BindingFlags.Instance;
+
+				//Find a non indexer Count Property with return type of int
+				PropertyInfo countInfo = type.GetProperty ("Count", flags, null, typeof (int), new Type[0], null);
+				PropertyInfo itemInfo = type.GetProperty ("Item", flags, null, null, new Type[1] {typeof (int)}, null);
+				int count = (int) countInfo.GetValue (value, null);
+
+				if (count > 0) 
+					for (int i = 0; i < count; i++) {
+						object itemValue = itemInfo.GetValue (value, new object[1] {i});
+
+						if (itemValue != null) {
+							string itemName = attrs.GetElementName (itemValue.GetType (), name);
+							string itemNs = attrs.GetElementNamespace (itemValue.GetType ());
+
+							writer.WriteStartElement (itemName, itemNs);
+							SerializeMembers (writer, itemValue, false);
+							writer.WriteEndElement ();
+						}
+					}
+			}
+			else if (value is IEnumerable) {
+				// FIXME
+			}
+			else if (type.IsEnum) {
+				// FIXME
+			}
+			else if (value != null) { //Complex Type?
+				string itemName = attrs.GetElementName (value.GetType (), name);
+				string itemNs = attrs.GetElementNamespace (value.GetType ());
+				writer.WriteStartElement (itemName, itemNs);
+				SerializeMembers (writer, value, false);
+				writer.WriteEndElement ();
+			}
+			else {
+				// FIXME
+			}
+		}
+
+		[MonoTODO]
+		private void SerializeArray (XmlWriter writer, object o)
+		{
+			throw new NotImplementedException ();
+		}
+
+		/// <summary>
+		/// If the type is a string, valuetype or primitive type we do not populate the TypeTable.
+		/// If the type is an array, we populate the TypeTable with Element type of the array.
+		/// If the type implements ICollection, it is handled differently. We do not care for its members.
+		/// If the type implements IEnumberable, we check that it implements Add(). Don't care for members.
+		/// </summary>
+		[MonoTODO ("Remove FIXMEs")]
+		private void FillTypeTable (Type type)
+		{
+			if (typeTable.Contains (type))
+				return;
+
+			//For value types and strings we don't need the members.
+			//FIXME: We will need the enum types probably.
+			if (IsInbuiltType (type))
+				return;
+
+			//Array, ICollection and IEnumberable are treated differenty
+			if (type.IsArray) {
+				FillArrayType (type);
+				return;
+			}
+			else if (type.IsEnum) {
+				FillEnum (type);
+				return;
+			}
+			else {
+				//There must be a public constructor
+				if (!HasDefaultConstructor (type))
+					throw new Exception ("Can't Serialize Type " + type.Name + " since it does not have default Constructor");
+
+				if (type.GetInterface ("ICollection") == typeof (System.Collections.ICollection)) {
+					FillICollectionType (type);
+					return;
+				}
+				if (type.GetInterface ("IEnumerable") == typeof (System.Collections.IEnumerable)) {
+					//FillIEnumerableType(type);
+					//return;
+				}
+			}
+
+			
+			//Add the Class to the hashtable.
+			//Each value of the hashtable has two objects, one is the hashtable with key of membername (for deserialization)
+			//Other is an Array of XmlSerializernames, Array of XmlAttributes & Array of XmlElements.
+			Object[] memberObj = new Object[4];
+			typeTable.Add (type,memberObj);
+
+			Hashtable memberTable = new Hashtable ();
+			memberObj[0] = memberTable;
+			memberTable.Add ("", XmlAttributes.FromClass (type));
+
+			memberObj[1] = null;
+
+			ArrayList attributes = new ArrayList ();
+			memberObj[2] = attributes;
+
+			ArrayList elements = new ArrayList ();
+			memberObj[3] = elements;
+
+			//Get the graph of the members. Graph is nothing but the order
+			//in which MS implementation serializes the members.
+			MemberInfo[] minfo = GetGraph (type);
+
+			foreach (MemberInfo member in minfo) {
+				FieldInfo fieldInfo = (member as FieldInfo);
+				PropertyInfo propertyInfo = (member as PropertyInfo);
+
+				if (fieldInfo != null) {
+					//If field is readOnly or const, do not serialize it.
+					if (fieldInfo.IsLiteral || fieldInfo.IsInitOnly)
+						continue;
+
+					XmlAttributes xmlAttributes = XmlAttributes.FromField (member, fieldInfo);
+
+					//If XmlAttributes have XmlIgnore, ignore this member
+
+					if (xmlAttributes.XmlIgnore)
+						continue;
+
+					//If this member is a XmlNs type, set the XmlNs object.
+					if (xmlAttributes.Xmlns) {
+						memberObj[1] = xmlAttributes;
+						continue;
+					}
+
+					//If the member is a attribute Type, Add to attribute list
+					if (xmlAttributes.isAttribute)
+						attributes.Add (xmlAttributes);
+					else //Add to elements
+						elements.Add (xmlAttributes);
+
+					//Add in the Hashtable.
+					memberTable.Add (member.Name, xmlAttributes);
+					
+					if (xmlAttributes.XmlAnyAttribute != null  || xmlAttributes.XmlText != null)
+						continue;
+
+					if (xmlAttributes.XmlElements.Count > 0) {
+						foreach (XmlElementAttribute elem in xmlAttributes.XmlElements) {
+							if (elem.Type != null)
+								FillTypeTable (elem.Type);
+							else
+								FillTypeTable (fieldInfo.FieldType);
+						}
+						continue;
+					}
+
+					if (!IsInbuiltType (fieldInfo.FieldType))
+						FillTypeTable (fieldInfo.FieldType);
+				} 
+				else if (propertyInfo != null) {
+					//If property is readonly or writeonly, do not serialize it.
+					//Exceptions are properties whose return type is array, ICollection or IEnumerable
+					//Indexers are not serialized unless the class Implements ICollection.
+					if (!(propertyInfo.PropertyType.IsArray || Implements (propertyInfo.PropertyType, typeof (ICollection)) || 
+						(propertyInfo.PropertyType != typeof (string) && Implements (propertyInfo.PropertyType, typeof (IEnumerable))))) {
+						if(!(propertyInfo.CanRead && propertyInfo.CanWrite) || propertyInfo.GetIndexParameters ().Length != 0)
+							continue;
+					}
+
+					XmlAttributes xmlAttributes = XmlAttributes.FromProperty (member, propertyInfo);
+
+					// If XmlAttributes have XmlIgnore, ignore this member
+					if (xmlAttributes.XmlIgnore)
+						continue;
+
+					// If this member is a XmlNs type, set the XmlNs object.
+					if (xmlAttributes.Xmlns) {
+						memberObj[1] = xmlAttributes;
+						continue;
+					}
+					// If the member is a attribute Type, Add to attribute list
+					if (xmlAttributes.isAttribute)
+						attributes.Add (xmlAttributes);
+					else  //Add to elements
+						elements.Add (xmlAttributes);
+
+					// OtherWise add in the Hashtable.
+					memberTable.Add (member.Name, xmlAttributes);
+
+					if (xmlAttributes.XmlAnyAttribute != null || xmlAttributes.XmlText != null)
+						continue;
+
+					if (xmlAttributes.XmlElements.Count > 0) {
+						foreach (XmlElementAttribute elem in xmlAttributes.XmlElements) {
+							if (elem.Type != null)
+								FillTypeTable (elem.Type);
+							else
+								FillTypeTable (propertyInfo.PropertyType);
+						}
+						continue;
+					}
+
+					if (!IsInbuiltType (propertyInfo.PropertyType))
+						FillTypeTable (propertyInfo.PropertyType);
+				}
+			}
+
+			// Sort the attributes for the members according to their Order
+			// This is an extension to MS's Implementation and will be useful
+			// if our reflection does not return the same order of elements
+			// as MS .NET impl
+			if (useOrder)
+				BubbleSort (elements, XmlAttributes.attrComparer);
+		}
+
+		private void FillArrayType (Type type)
+		{
+			if (type.GetArrayRank () != 1)
+				throw new Exception ("MultiDimensional Arrays are not Supported");
+
+			Type arrayType = type.GetElementType ();
+
+			if (arrayType.IsArray)
+				FillArrayType (arrayType);
+			else if (!IsInbuiltType (arrayType))
+				FillTypeTable (arrayType);
+		}
+
+		private void FillICollectionType (Type type)
+		{
+			//Must have an public Indexer that takes an integer and
+			//a public Count Property which returns an int.
+
+			BindingFlags flags = BindingFlags.Public | BindingFlags.Instance;
+			
+			//Find a non indexer Count Property with return type of int
+			PropertyInfo countProp = type.GetProperty ("Count", flags, null, typeof (int), new Type[0], null);
+			if (countProp == null || !countProp.CanRead)
+				throw new Exception ("Cannot Serialize " + type + " because it implements ICollectoion, but does not implement public Count property");
+			//Find a indexer Item Property which takes an int
+			PropertyInfo itemProp = type.GetProperty ("Item", flags, null, null, new Type[1] {typeof (int)}, null);
+			if (itemProp == null || !itemProp.CanRead || !itemProp.CanWrite)
+				throw new Exception ("Cannot Serialize " + type + " because it does not have a read/write indexer property that takes an int as argument");
+			FillTypeTable (itemProp.PropertyType);
+		}
+
+		[MonoTODO]
+		private void FillIEnumerableType (Type type)
+		{
+			//Must implement a public Add method that takes a single parameter.
+			//The Add method's parameter must be of the same type as is returned from 
+			//the Current property on the value returned from GetEnumerator, or one of that type's bases.
+
+			// We currently ignore enumerable types anyway, so this method was junked.
+			// The code did not do what the documentation above says (if that is even possible!)
+			return;
+		}
+
+		private void FillEnum (Type type)
+		{
+			Hashtable memberTable = new Hashtable ();
+			BindingFlags flags = BindingFlags.Public | BindingFlags.Instance;
+			typeTable.Add (type, memberTable);
+			string[] names = Enum.GetNames (type);
+
+			foreach (string name in names) {
+				MemberInfo[] members = type.GetMember (name);
+				if (members.Length != 1)
+					throw new Exception("Should never happen. Enum member not present or more than one. " + name);
+				XmlAttributes xmlAttributes = new XmlAttributes (members[0]);
+
+				if (xmlAttributes.XmlIgnore)
+					continue;
+
+				if (xmlAttributes.XmlEnum != null)
+					memberTable.Add (members[0].Name, xmlAttributes.XmlEnum.Name);
+				else
+					memberTable.Add (members[0].Name, members[0].Name);
+			}
+		}
+
+		private bool HasDefaultConstructor (Type type)
+		{
+			ConstructorInfo defaultConstructor = type.GetConstructor (new Type[0]);
+			if (defaultConstructor == null || defaultConstructor.IsAbstract || defaultConstructor.IsStatic || !defaultConstructor.IsPublic)
+				return false;
+			
+			return true;
+		}
+
+		private bool IsInbuiltType (Type type)
+		{
+			if (type.IsEnum)
+				return false;
+			if (type.IsValueType || type == typeof (string) || type.IsPrimitive)
+				return true;
+			return false;
+		}
+
+		private static MemberInfo[] GetGraph(Type type)
+		{
+			ArrayList typeGraph = new ArrayList ();
+			GetGraph (type, typeGraph);
+			return (MemberInfo[]) typeGraph.ToArray (typeof (MemberInfo));
+		}
+
+		private static void GetGraph (Type type, ArrayList typeGraph)
+		{
+			BindingFlags flags = BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly;
+			if (type.BaseType == null)
+				return;
+			GetGraph (type.BaseType, typeGraph);
+
+			typeGraph.AddRange (type.GetFields (flags));
+			typeGraph.AddRange (type.GetProperties (flags));
+		}
+
+		private string GetXmlValue (object value)
+		{
+			if (value == null)
+				return null;
+
+			if (value is Enum) {
+				Type type = value.GetType ();
+				
+				if (typeTable.ContainsKey (type)) {
+					Hashtable memberTable = (Hashtable) (typeTable[type]);
+					if (type.IsDefined (typeof (FlagsAttribute), false)) {
+						//If value is exactly a single enum member
+						if (memberTable.Contains (value.ToString ()))
+							return (string) memberTable[value.ToString ()];
+
+						string retval = "";
+						int enumval = (int) value;
+						string[] names = Enum.GetNames (type);
+
+						foreach (string key in names) {
+							if (!memberTable.ContainsKey (key))
+								continue;
+
+							//Otherwise multiple values.
+							int val = (int) Enum.Parse (type, key);
+							if (val != 0 && (enumval & val) == val)
+								retval += " " + (string) memberTable[Enum.GetName (type, val)];
+						}
+
+						retval = retval.Trim ();
+
+						if (retval.Length == 0)
+							return null;
+
+						return retval;
+					}
+					else if (memberTable.ContainsKey (value.ToString ()))
+						return (string) memberTable[value.ToString()];
+					else
+						return null;
+				}
+				else
+					throw new Exception ("Unknown Enumeration");
+			}
+			if (value is bool)
+				return (bool) value ? "true" : "false";
+			if (value is XmlQualifiedName) {
+				if (((XmlQualifiedName) value).IsEmpty)
+					return null;
+			}
+			return (value == null) ? null : value.ToString ();
+		}
+
+		[MonoTODO ("Remove FIXMEs")]
+		private static void ProcessAttributes (XmlAttributes attrs, Hashtable memberTable)
+		{
+			if (attrs.XmlAnyAttribute != null) {
+				// FIXME
+			}
+			foreach (XmlAnyElementAttribute anyelem in attrs.XmlAnyElements) 
+				memberTable.Add (new XmlQualifiedName (anyelem.Name, anyelem.Namespace), attrs);
+
+			if (attrs.XmlArray != null) {
+				// FIXME
+			}
+
+			foreach (XmlArrayItemAttribute item in attrs.XmlArrayItems)
+				memberTable.Add (new XmlQualifiedName (item.ElementName, item.Namespace), attrs);
+
+			if (attrs.XmlAttribute != null)
+				memberTable.Add (new XmlQualifiedName (attrs.XmlAttribute.AttributeName,attrs.XmlAttribute.Namespace), attrs);
+
+			if (attrs.XmlChoiceIdentifier != null) {
+				// FIXME
+			}
+
+			foreach (XmlElementAttribute elem in attrs.XmlElements)
+				memberTable.Add (new XmlQualifiedName (elem.ElementName, elem.Namespace), attrs);
+
+			if (attrs.XmlEnum != null) {
+				// FIXME
+			}
+
+			if (attrs.XmlType != null)
+				memberTable.Add (new XmlQualifiedName (attrs.XmlType.TypeName, attrs.XmlType.Namespace), attrs);
+		}
+
+		private bool Implements (Type type, Type interfaceType)
+		{
+			return (type.GetInterface (interfaceType.Name) == interfaceType);
+		}
+
+		private static void BubbleSort (ArrayList array, IComparer comparer)
+		{
+			int len = array.Count;
+			object obj1, obj2;
+			for (int i=0; i < len; i++) {
+				for (int j=0; j < len -i -1; j++) {
+					obj1 = array[j];
+					obj2 = array[j+1];
+					if (comparer.Compare (obj2 , obj1 ) < 0) {
+						array[j] = obj2;
+						array[j+1] = obj1;
+					}
+				}
+			}
+		}
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs
new file mode 100644
index 00000000000..cbba1ded59f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlSerializerNamespaces.cs
@@ -0,0 +1,70 @@
+//
+// XmlSerializerNamespaces.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+using System.Xml;

+using System.Collections;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlSerializerNamespaces.

+	/// </summary>

+	public class XmlSerializerNamespaces

+	{

+		private Hashtable namespaces;

+			

+		public XmlSerializerNamespaces ()

+		{

+			namespaces = new Hashtable ();

+		}

+	

+		public XmlSerializerNamespaces(XmlQualifiedName[] namespaces)

+			: this()

+		{

+			foreach(XmlQualifiedName qname in namespaces) 

+			{

+				this.namespaces[qname.Name] = qname;

+			}

+		}

+	

+		public XmlSerializerNamespaces(XmlSerializerNamespaces namespaces)

+			: this(namespaces.ToArray())

+		{}

+	

+		public void Add (string prefix, string ns)

+		{

+			XmlQualifiedName qname = new XmlQualifiedName(prefix,ns);

+			namespaces[qname.Name] = qname;  

+		}

+	

+		public XmlQualifiedName[] ToArray ()

+		{

+			XmlQualifiedName[] array = new XmlQualifiedName[namespaces.Count];

+			namespaces.Values.CopyTo(array,0);

+			return array;

+		}

+	

+		public int Count 

+		{

+			get{ return namespaces.Count; }

+		}

+

+		internal string GetPrefix(string Ns)

+		{

+			foreach(string prefix in namespaces.Keys)

+			{

+				if(Ns == ((XmlQualifiedName)namespaces[prefix]).Namespace) 

+					return prefix;

+			}

+			return null;

+		}

+	

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlTextAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlTextAttribute.cs
new file mode 100644
index 00000000000..1cbbc8081bb
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlTextAttribute.cs
@@ -0,0 +1,61 @@
+//
+// XmlTextAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlTextAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Property | AttributeTargets.Field

+		 | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]

+	public class XmlTextAttribute : Attribute

+	{

+		private string dataType;

+		private Type type;

+		private int order;

+

+		public XmlTextAttribute ()

+		{

+		}

+

+		public XmlTextAttribute (Type type)

+		{

+			Type = type;

+		}

+		

+		public string DataType {

+			get { 

+				return dataType; 

+			}

+			set { 

+				dataType = value; 

+			}

+		}

+		public Type Type 

+		{

+			get { 

+				return type; 

+			}

+			set { 

+				type = value; 

+			}

+		}

+		/// <summary>

+		/// Specifies Order in which Memberswill be serialized as Elements.

+		/// </summary>

+		public int Order

+		{

+			get{ return  order; }

+			set{ order = value; }

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeAttribute.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeAttribute.cs
new file mode 100644
index 00000000000..dd8ebacb162
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeAttribute.cs
@@ -0,0 +1,60 @@
+//
+// XmlTypeAttribute.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlTypeAttribute.

+	/// </summary>

+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct |

+		AttributeTargets.Enum | AttributeTargets.Interface)]

+	public class XmlTypeAttribute : Attribute

+	{

+		private bool includeInSchema;

+		private string ns;

+		private string typeName;

+

+		public XmlTypeAttribute ()

+		{

+		}

+

+		public XmlTypeAttribute (string typeName)

+		{

+			TypeName = typeName;

+		}

+

+		public bool IncludeInSchema {

+			get { 

+				return includeInSchema; 

+			}

+			set { 

+				includeInSchema = value; 

+			}

+		}

+

+		public string Namespace {

+			get { 

+				return ns; 

+			} 

+			set { 

+				ns = value; 

+			}

+		}

+		public string TypeName {

+			get { 

+				return typeName; 

+			} 

+			set { 

+				typeName = value; 

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
new file mode 100644
index 00000000000..ff9c9b7b4f0
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Serialization/XmlTypeMapping.cs
@@ -0,0 +1,50 @@
+//
+// XmlTypeMapping.cs: 
+//
+// Author:
+//   John Donagher (john@webmeta.com)
+//
+// (C) 2002 John Donagher
+//
+
+using System.Xml;

+using System;

+

+namespace System.Xml.Serialization

+{

+	/// <summary>

+	/// Summary description for XmlTypeMapping.

+	/// </summary>

+	public class XmlTypeMapping : XmlMapping

+	{

+		private string elementName;

+		private string ns;

+		private string typeFullName;

+		private string typeName;

+

+		internal XmlTypeMapping(string elementName, string ns, string typeFullName, string typeName)

+		{

+			this.elementName = elementName;

+			this.ns = ns;

+			this.typeFullName = typeFullName;

+			this.typeName = typeName;

+		}

+

+		public string ElementName  

+		{

+			get { return elementName; }

+		}

+		public string Namespace  

+		{

+			get { return ns; }

+		}

+		public string TypeFullName  

+		{

+			get { return typeFullName; }

+		}

+		public string TypeName  

+		{

+			get { return typeName; }

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.XPath/ChangeLog b/mcs/class/System.XML/System.Xml.XPath/ChangeLog
new file mode 100644
index 00000000000..59222021cdc
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/ChangeLog
@@ -0,0 +1,137 @@
+2002-08-17  Jason Diamond <jason@injektilo.org>
+
+	* XPathNavigator.cs: Fixed matching on patterns that look like
+	absolute XPath expressions.
+
+2002-08-17  Jason Diamond <jason@injektilo.org>
+
+	* XPathNavigator.cs: Added naive (but working) implementation of
+	 Matches.
+
+2002-07-31  Piers Haken <piersh@friskit.com>
+
+	* XPathDocument.cs: simple, XmlDocument-based implementation
+
+2002-07-25  Piers Haken <piersh@friskit.com>
+
+	* DefaultContext.cs: implement XPathFunctionName 'name()' function.
+
+2002-07-17  Piers Haken <piersh@friskit.com>
+	
+	* DefaultContext.cs: implement 'string-length()', 'normalize-space()'
+	* Parser.jay: remove redundant production
+	* Expression.cs: add switches for debugging under VS.NET
+
+2002-07-17  Piers Haken <piersh@friskit.com>
+
+	* Expression.cs: implement nodeset/nodeset comparisons (non-optimal)
+
+2002-07-15  Piers Haken <piersh@friskit.com>
+
+	* Iterator.cs:
+		- rename UnionIterator to MergedIterator, 
+		- create new UnionIterator to implment uniqueness for '|' operator
+		- fix position bug in ArrayListIterator.Clone()
+	* Expression.cs: use new UnionIterator constructor syntax
+
+2002-07-12  Piers Haken <piersh@friskit.com>
+
+	* Iterator.cs: PredicateIterator: handle numeric predicates
+	* Parser.jay: add some debugging support: yyparseDebug
+	* Tokenizer.cs: cleanup, include '-' chars in identifier tokens
+
+2002-06-29  Piers Haken <piersh@friskit.com>
+
+	* Expression.cs:
+		- remove dead code
+		- NodeTest uses XPathResultType instead of internal NodeTestTypes enum
+		- remove NodeTestTypes enum
+		- remove NodeTestTypeAny (functionality provided by base now)
+		- fix ExprStep to handle wildcard QNames
+	* Parser.jay:
+		- moved to Mono.Xml.XPath namespace
+		- use XPathResultType
+		- handle wildcard QNames
+		
+	* Tokenizer.cs: moved to Mono.Xml.XPath namespace
+	
+	* XPathNavigator.cs: implement
+		- IsDescendant
+		- SelectAncestors
+		- SelectDescendants
+		- SelectChildren
+		
+	* XPathResultType.cs: fix enum values
+	
+2002-06-24  Jason Diamond  <jason@injektilo.org>
+
+	* XPathScanner.cs: Removed.
+
+2002-06-24  Dick Porter <dick@ximian.com>
+
+	* XmlCaseOrder.cs: Fix namespace
+
+2002-06-23  Piers Haken <piersh@friskit.com>
+
+	* DefaultContext.cs: implemented XPathFUnctionId
+	* Iterator.cs: new ArrayListIterator for id() support
+
+2002-06-23  Piers Haken <piersh@friskit.com>
+
+	* XPathNavigator.cs: implement:
+		- Compile
+		- Evaluate
+		- Clone
+		- Select
+		- ToString
+		- some forwarding methods
+
+	* XPathNodeIterator: implement caching Count
+
+	* Tokenizer.cs: new XPath tokenizer
+	* Parser.jay: new XPath grammar
+	* Parser.cs: new precompiled XPath grammar
+	* Expression.cs: new XPath expression objects
+	* Iterator.cs: new XPath result/context objects
+	* DefaultContext.cs: new XPath function binding context
+
+2002-05-08  Tim Coleman <tim@timcoleman.com>
+	* XPathDocument.cs:
+	* XPathException.cs: New stub files added.
+
+2002-04-12  Duncan Mak  <duncan@ximian.com>
+
+	* XmlCaseOrder.cs: Moved to here from System.Xml.
+
+2002-03-26  Jason Diamond  <jason@injektilo.org>
+
+	* XPathScanner.cs: Now handles name tests with wildacards. Abbreviated 
+	steps. Both absolution and relative abbreviated location paths.
+
+2002-03-25  Jason Diamond  <jason@injektilo.org>
+
+	* XPathScanner.cs: Added new file. This class is supposed to be internal
+	but that would make it impossible to test.
+
+2002-03-08  Duncan Mak  <duncan@ximian.com>
+
+	* XPathNamespaceScope.cs:
+	* XPathNodeType.cs:
+	* XPathResultType.cs:
+	* XmlDataType.cs:
+	* XmlSortOrder.cs: Used EnumCheck and realigned elements to be compatible with MS
+	implementation. XPathResultType is interesting as EnumCheck does
+	not show the Navigator element, but shows the String element twice.
+
+2002-03-08  Jason Diamond  <jason@injektilo.org>
+
+	* XmlDataType.cs, XmlSortOrder.cs, XPathNodeType.cs: Added files.
+
+2002-03-06  Jason Diamond  <jason@injektilo.org>
+
+	* ChangeLog: Added to this directory.
+
+	* XPathExpression.cs, XPathNamespaceScope.cs, XPathNodeIterator.cs,
+	XPathResultType.cs: New files.
+
+	* XPathNavigator.cs: Stubbed out all properties and methods.
diff --git a/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs b/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs
new file mode 100644
index 00000000000..00f1026f81b
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/DefaultContext.cs
@@ -0,0 +1,618 @@
+//
+// System.Xml.XPath.DefaultContext & support classes
+//
+// Author:
+//   Piers Haken (piersh@friskit.com)
+//
+// (C) 2002 Piers Haken
+//
+using System;
+using System.Collections;
+using System.Xml;
+using System.Xml.XPath;
+using System.Xml.Xsl;
+
+namespace System.Xml.XPath
+{
+	/// <summary>
+	/// Summary description for DefaultContext.
+	/// </summary>
+	internal class DefaultContext : XsltContext
+	{
+		protected static Hashtable _htFunctions = new Hashtable ();
+
+		static DefaultContext()
+		{
+			Add (new XPathFunctionLast ());
+			Add (new XPathFunctionPosition ());
+			Add (new XPathFunctionCount ());
+			Add (new XPathFunctionId ());
+			Add (new XPathFunctionLocalName ());
+			Add (new XPathFunctionNamespaceUri ());
+			Add (new XPathFunctionName ());
+			Add (new XPathFunctionString ());
+			Add (new XPathFunctionConcat ());
+			Add (new XPathFunctionStartsWith ());
+			Add (new XPathFunctionContains ());
+			Add (new XPathFunctionSubstringBefore ());
+			Add (new XPathFunctionSubstringAfter ());
+			Add (new XPathFunctionSubstring ());
+			Add (new XPathFunctionStringLength ());
+			Add (new XPathFunctionNormalizeSpace ());
+			Add (new XPathFunctionTranslate ());
+			Add (new XPathFunctionBoolean ());
+			Add (new XPathFunctionNot ());
+			Add (new XPathFunctionTrue ());
+			Add (new XPathFunctionFalse ());
+			Add (new XPathFunctionLang ());
+			Add (new XPathFunctionNumber ());
+			Add (new XPathFunctionSum ());
+			Add (new XPathFunctionFloor ());
+			Add (new XPathFunctionCeil ());
+			Add (new XPathFunctionRound ());
+		}
+
+		[MonoTODO]
+		public override IXsltContextFunction ResolveFunction (string prefix, string name, XPathResultType[] ArgTypes)
+		{
+			// match the prefix
+			if (prefix != null && prefix != "")	// TODO: should we allow some namespaces here?
+				return null;
+
+			// match the function name
+			XPathFunction fn = (XPathFunction) _htFunctions [name];
+			if (fn == null)
+				return null;
+
+			// check the number of arguments
+			int cArgs = ArgTypes.Length;
+			if (cArgs < fn.Minargs || cArgs > fn.Maxargs)
+				return null;
+
+			// check the types of the arguments
+			XPathResultType [] rgTypes = fn.ArgTypes;
+			if (rgTypes == null)
+			{
+				if (cArgs != 0)
+					return null;
+			}
+			else
+			{
+				int cTypes = rgTypes.Length;
+				for (int iArg = 0; iArg < cArgs; iArg ++)
+				{
+					XPathResultType typeRequested = ArgTypes [iArg];
+					XPathResultType typeDefined = (iArg >= cTypes) ? rgTypes [cTypes - 1] : rgTypes [iArg];
+					if (typeDefined != XPathResultType.Any && typeDefined != typeRequested)
+						return null;
+				}
+			}
+			return fn;
+		}
+		public override IXsltContextVariable ResolveVariable (string prefix, string name)
+		{
+			return null;
+		}
+		[MonoTODO]
+		public override int CompareDocument (string baseUri, string nextBaseUri) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public override bool PreserveWhitespace (XPathNavigator nav) { throw new NotImplementedException (); }
+		[MonoTODO]
+		public override bool Whitespace { get { throw new NotImplementedException (); }}
+		protected static void Add (XPathFunction fn)
+		{
+			_htFunctions.Add (fn.Name, fn);
+		}
+	}
+
+	internal class XPathFunctions
+	{
+		public static bool ToBoolean (object arg)
+		{
+			if (arg == null)
+				throw new ArgumentNullException ();
+			if (arg is bool)
+				return (bool) arg;
+			if (arg is double)
+			{
+				double dArg = (double) arg;
+				return (dArg != 0.0 && !double.IsNaN (dArg));
+			}
+			if (arg is string)
+				return ((string) arg).Length != 0;
+			if (arg is BaseIterator)
+			{
+				BaseIterator iter = (BaseIterator) arg;
+				return iter.MoveNext ();
+			}
+			throw new ArgumentException ();
+		}
+		[MonoTODO]
+		public static string ToString (object arg)
+		{
+			if (arg == null)
+				throw new ArgumentNullException ();
+			if (arg is string)
+				return (string) arg;
+			if (arg is bool)
+				return ((bool) arg) ? "true" : "false";
+			if (arg is double)
+				return (string) XmlConvert.ToString ((double) arg);	// TODO: spec? convert number to string
+			if (arg is BaseIterator)
+			{
+				BaseIterator iter = (BaseIterator) arg;
+				if (!iter.MoveNext ())
+					return "";
+				return iter.Current.Value;
+			}
+			throw new ArgumentException ();
+		}
+		[MonoTODO]
+		public static double ToNumber (object arg)
+		{
+			if (arg == null)
+				throw new ArgumentNullException ();
+			if (arg is BaseIterator)
+				arg = ToString (arg);	// follow on
+			if (arg is string)
+				return XmlConvert.ToDouble ((string) arg);	// TODO: spec? convert string to number
+			if (arg is double)
+				return (double) arg;
+			if (arg is bool)
+				return Convert.ToDouble ((bool) arg);
+			throw new ArgumentException ();
+		}
+	}
+
+	internal abstract class XPathFunction : IXsltContextFunction
+	{
+		public abstract XPathResultType ReturnType { get; }
+		public abstract int Minargs { get; }
+		public abstract int Maxargs { get; }
+		public abstract XPathResultType [] ArgTypes { get; }
+		public object Invoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			return TypesafeInvoke (xsltContext, args, docContext);
+		}
+
+		public abstract string Name { get; }
+		public abstract object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext);
+	}
+
+	internal class XPathFunctionLast : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 0; }}
+		public override XPathResultType [] ArgTypes { get { return null; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			throw new NotImplementedException ();	// special-cased
+		}
+		public override string Name { get { return "last"; }}
+	}
+	internal class XPathFunctionPosition : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 0; }}
+		public override XPathResultType [] ArgTypes { get { return null; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			throw new NotImplementedException ();	// special-cased
+		}
+		public override string Name { get { return "position"; }}
+	}
+	internal class XPathFunctionCount : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override int Minargs { get { return 1; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.NodeSet }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			return ((BaseIterator) args [0]).Count;
+		}
+		public override string Name { get { return "count"; }}
+	}
+	internal class XPathFunctionId : XPathFunction
+	{
+		private static char [] rgchWhitespace = {' ', '\t', '\r', '\n'};
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override int Minargs { get { return 1; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.Any }; }}
+		[MonoTODO]
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			String strArgs;
+			BaseIterator iter = args [0] as BaseIterator;
+			if (iter != null)
+			{
+				strArgs = "";
+				while (!iter.MoveNext ())
+					strArgs += iter.Current.Value + " ";
+			}
+			else
+				strArgs = XPathFunctions.ToString (args [0]);
+			string [] rgstrArgs = strArgs.Split (rgchWhitespace);
+			ArrayList rgNodes = new ArrayList ();
+			foreach (string strArg in rgstrArgs)
+			{
+				if (docContext.MoveToId (strArg))
+					rgNodes.Add (docContext.Clone ());
+			}
+			return new ArrayListIterator (iter, rgNodes);
+		}
+		public override string Name { get { return "id"; }}
+	}
+	internal class XPathFunctionLocalName : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.NodeSet; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.NodeSet }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			BaseIterator iter = (args.Length == 1) ? ((BaseIterator) args [0]) : new SelfIterator (docContext, xsltContext);
+			if (iter == null || !iter.MoveNext ())
+				return "";
+			return iter.Current.LocalName;
+		}
+		public override string Name { get { return "local-name"; }}
+	}
+	internal class XPathFunctionNamespaceUri : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.String; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.NodeSet }; }}
+		[MonoTODO]
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			BaseIterator iter = (args.Length == 1) ? ((BaseIterator) args [0]) : new SelfIterator (docContext, xsltContext);
+			if (iter == null || !iter.MoveNext ())
+				return "";
+			return iter.Current.NamespaceURI;	// TODO: should the namespace be expanded wrt. the given context?
+		}
+		public override string Name { get { return "namespace-uri"; }}
+	}
+	internal class XPathFunctionName : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.String; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.NodeSet }; }}
+		[MonoTODO]
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			BaseIterator iter = (args.Length == 1) ? ((BaseIterator) args [0]) : new SelfIterator (docContext, xsltContext);
+			if (iter == null || !iter.MoveNext ())
+				return "";
+			return iter.Current.Name;
+		}
+		public override string Name { get { return "name"; }}
+	}
+	internal class XPathFunctionString : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.String; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.Any }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			return XPathFunctions.ToString (args [0]);
+		}
+		public override string Name { get { return "string"; }}
+	}
+	internal class XPathFunctionConcat : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.String; }}
+		public override int Minargs { get { return 2; }}
+		public override int Maxargs { get { return int.MaxValue; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.String, XPathResultType.String, XPathResultType.String }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			String str = "";
+			foreach (string strArg in args)
+				str += strArg;
+			return str;
+		}
+		public override string Name { get { return "concat"; }}
+	}
+	internal class XPathFunctionStartsWith : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Boolean; }}
+		public override int Minargs { get { return 2; }}
+		public override int Maxargs { get { return 2; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.String, XPathResultType.String }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			string str1 = (string) args [0];
+			string str2 = (string) args [1];
+			return str1.StartsWith (str2);
+		}
+		public override string Name { get { return "starts-with"; }}
+	}
+	internal class XPathFunctionContains : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Boolean; }}
+		public override int Minargs { get { return 2; }}
+		public override int Maxargs { get { return 2; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.String, XPathResultType.String }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			string str1 = (string) args [0];
+			string str2 = (string) args [1];
+			return str1.IndexOf (str2) != -1;
+		}
+		public override string Name { get { return "contains"; }}
+	}
+	internal class XPathFunctionSubstringBefore : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.String; }}
+		public override int Minargs { get { return 2; }}
+		public override int Maxargs { get { return 2; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.String, XPathResultType.String }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			string str1 = (string) args [0];
+			string str2 = (string) args [1];
+			int ich = str1.IndexOf (str2);
+			if (ich <= 0)
+				return "";
+			return str1.Substring (0, ich);
+		}
+		public override string Name { get { return "substring-before"; }}
+	}
+	internal class XPathFunctionSubstringAfter : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.String; }}
+		public override int Minargs { get { return 2; }}
+		public override int Maxargs { get { return 2; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.String, XPathResultType.String }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			string str1 = (string) args [0];
+			string str2 = (string) args [1];
+			int ich = str1.IndexOf (str2);
+			if (ich <= 0)
+				return "";
+			return str1.Substring (ich + str2.Length);
+		}
+		public override string Name { get { return "substring-after"; }}
+	}
+	internal class XPathFunctionSubstring : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.String; }}
+		public override int Minargs { get { return 2; }}
+		public override int Maxargs { get { return int.MaxValue; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.String, XPathResultType.String, XPathResultType.String }; }}
+		[MonoTODO]
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			// TODO: check this, what the hell were they smoking?
+			string str = (string) args [0];
+			double ich = Math.Round ((double) args [1]) - 1;
+			if (Double.IsNaN (ich) || ich >= (double) str.Length)
+				return "";
+
+			if (args.Length == 2)
+			{
+				if (ich < 0)
+					ich = 0.0;
+				return str.Substring ((int) ich);
+			}
+			else
+			{
+				double cch = Math.Round ((double) args [2]);
+				if (Double.IsNaN (cch))
+					return "";
+				if (ich < 0.0 || cch < 0.0) 
+				{
+					cch = ich + cch;
+					if (cch <= 0.0)
+						return "";
+					ich = 0.0;
+				}
+				double cchMax = (double) str.Length - ich;
+				if (cch > cchMax)
+					cch = cchMax;
+				return str.Substring ((int) ich, (int) cch);
+			}
+		}
+		public override string Name { get { return "substring"; }}
+	}
+	internal class XPathFunctionStringLength : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.String }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			string str;
+			if (args.Length == 1)
+				str = (string) args [0];
+			else
+				str = docContext.Value;
+			return (double) str.Length;
+		}
+		public override string Name { get { return "string-length"; }}
+	}
+	internal class XPathFunctionNormalizeSpace : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.String; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.String }; }}
+		[MonoTODO]
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			string str;
+			if (args.Length == 1)
+				str = (string) args [0];
+			else
+				str = docContext.Value;
+			System.Text.StringBuilder sb = new System.Text.StringBuilder ();
+			bool fSpace = false;
+			foreach (char ch in str)
+			{
+				if (ch == ' ' || ch == '\t' || ch == '\r' || ch == '\n')
+				{
+					fSpace = true;
+				}
+				else
+				{
+					if (fSpace)
+					{
+						fSpace = false;
+						if (sb.Length > 0)
+							sb.Append (' ');
+					}
+					sb.Append (ch);
+				}
+			}
+			return sb.ToString ();
+		}
+		public override string Name { get { return "normalize-space"; }}
+	}
+	internal class XPathFunctionTranslate : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.String; }}
+		public override int Minargs { get { return 3; }}
+		public override int Maxargs { get { return 3; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.String, XPathResultType.String, XPathResultType.String }; }}
+		[MonoTODO]
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			throw new NotImplementedException ();
+		}
+		public override string Name { get { return "translate"; }}
+	}
+	internal class XPathFunctionBoolean : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Boolean; }}
+		public override int Minargs { get { return 1; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.Any }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			return XPathFunctions.ToBoolean (args [0]);
+		}
+		public override string Name { get { return "boolean"; }}
+	}
+	internal class XPathFunctionNot : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Boolean; }}
+		public override int Minargs { get { return 1; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.Boolean }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			return !((bool) args [0]);
+		}
+		public override string Name { get { return "not"; }}
+	}
+	internal class XPathFunctionTrue : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Boolean; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 0; }}
+		public override XPathResultType [] ArgTypes { get { return null; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			return true;
+		}
+		public override string Name { get { return "true"; }}
+	}
+	internal class XPathFunctionFalse : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Boolean; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 0; }}
+		public override XPathResultType [] ArgTypes { get { return null; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			return false;
+		}
+		public override string Name { get { return "false"; }}
+	}
+	internal class XPathFunctionLang : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Boolean; }}
+		public override int Minargs { get { return 1; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.String }; }}
+		[MonoTODO]
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			throw new NotImplementedException ();
+		}
+		public override string Name { get { return "lang"; }}
+	}
+	internal class XPathFunctionNumber : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override int Minargs { get { return 0; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.Any }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			return XPathFunctions.ToNumber (args [0]);
+		}
+		public override string Name { get { return "number"; }}
+	}
+	internal class XPathFunctionSum : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override int Minargs { get { return 1; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.NodeSet }; }}
+		[MonoTODO]
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			throw new NotImplementedException ();
+		}
+		public override string Name { get { return "sum"; }}
+	}
+	internal class XPathFunctionFloor : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override int Minargs { get { return 1; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.Number }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			return Math.Floor ((double) args [0]);
+		}
+		public override string Name { get { return "floor"; }}
+	}
+	internal class XPathFunctionCeil : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override int Minargs { get { return 1; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.Number }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			return Math.Ceiling ((double) args [0]);
+		}
+		public override string Name { get { return "ceil"; }}
+	}
+	internal class XPathFunctionRound : XPathFunction
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override int Minargs { get { return 1; }}
+		public override int Maxargs { get { return 1; }}
+		public override XPathResultType [] ArgTypes { get { return new XPathResultType [] { XPathResultType.Number }; }}
+		public override object TypesafeInvoke (XsltContext xsltContext, object[] args, XPathNavigator docContext)
+		{
+			double arg = (double) args [0];
+			if (arg < -0.5 || arg > 0)
+				return Math.Floor (arg + 0.5);
+			return Math.Round (arg);
+		}
+		public override string Name { get { return "round"; }}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/Expression.cs b/mcs/class/System.XML/System.Xml.XPath/Expression.cs
new file mode 100644
index 00000000000..e5dd7218891
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/Expression.cs
@@ -0,0 +1,986 @@
+//
+// System.Xml.XPath.XPathExpression support classes
+//
+// Author:
+//   Piers Haken (piersh@friskit.com)
+//
+// (C) 2002 Piers Haken
+//
+using System;
+using System.IO;
+using System.Collections;
+using System.Xml;
+using System.Xml.XPath;
+using System.Xml.Xsl;
+
+namespace System.Xml.XPath
+{
+#if XPATH_DEBUG
+	internal class CompiledExpression : Test.Xml.XPath.XPathExpression
+#else
+	internal class CompiledExpression : XPathExpression
+#endif
+	{
+		protected XmlNamespaceManager _nsm;
+		protected Expression _expr;
+
+		public CompiledExpression (Expression expr)
+		{
+			_expr = expr;
+		}
+		private CompiledExpression (CompiledExpression other)
+		{
+			_nsm = other._nsm;
+			_expr = other._expr;
+		}
+#if XPATH_DEBUG
+		public override Test.Xml.XPath.XPathExpression Clone () { return new CompiledExpression (this); }
+#else
+		public override XPathExpression Clone () { return new CompiledExpression (this); }
+#endif
+
+		public override void SetContext (XmlNamespaceManager nsManager)
+		{
+			_nsm = nsManager;
+		}
+		public override String Expression { get { return _expr.ToString (); }}
+		public override XPathResultType ReturnType { get { return _expr.ReturnType; }}
+		[MonoTODO]
+		public override void AddSort (Object obj, IComparer cmp)
+		{
+			throw new NotImplementedException ();
+		}
+		[MonoTODO]
+		public override void AddSort(object obj, XmlSortOrder sortOrder, XmlCaseOrder caseOrder, string str, XmlDataType type)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public object Evaluate (BaseIterator iter)
+		{
+			return _expr.Evaluate (iter);
+		}
+		public XPathNodeIterator EvaluateNodeSet (BaseIterator iter)
+		{
+			return _expr.EvaluateNodeSet (iter);
+		}
+	}
+
+
+	/// <summary>
+	/// Summary description for Expression.
+	/// </summary>
+	internal abstract class Expression
+	{
+		public Expression ()
+		{
+		}
+		public abstract XPathResultType ReturnType { get; }
+		public virtual XPathResultType GetReturnType (BaseIterator iter) { return ReturnType; }
+		public virtual object Evaluate (BaseIterator iter) { return null; }
+
+		public BaseIterator EvaluateNodeSet (BaseIterator iter)
+		{
+			if (GetReturnType (iter) == XPathResultType.NodeSet)
+				return (BaseIterator) Evaluate (iter);
+			throw new Exception ("expected nodeset: "+ToString ());
+		}
+		[MonoTODO]
+		public double EvaluateNumber (BaseIterator iter)
+		{
+			object result;
+			XPathResultType type = GetReturnType (iter);
+			if (type == XPathResultType.NodeSet)
+			{
+				result = EvaluateString (iter);
+				type = XPathResultType.String;
+			}
+			else
+				result = Evaluate (iter);
+
+			switch (type)
+			{
+				case XPathResultType.Number:
+					return (double) result;
+				case XPathResultType.Boolean:
+					return Convert.ToDouble ((bool) result);
+				case XPathResultType.String:
+					return XmlConvert.ToDouble ((string) result);	// TODO: spec? convert string to number
+				default:
+					throw new Exception (); // TODO: handle other types
+			}
+		}
+		[MonoTODO]
+		public string EvaluateString (BaseIterator iter)
+		{
+			object result = Evaluate (iter);
+			switch (GetReturnType (iter))
+			{
+				case XPathResultType.Number:
+					return (string) XmlConvert.ToString ((double) result);	// TODO: spec? convert number to string
+				case XPathResultType.Boolean:
+					return ((bool) result) ? "true" : "false";
+				case XPathResultType.String:
+					return (string) result;
+				case XPathResultType.NodeSet:
+				{
+					BaseIterator iterResult = (BaseIterator) result;
+					if (iterResult == null || !iterResult.MoveNext ())
+						return "";
+					return iterResult.Current.Value;
+				}
+				default:
+					throw new Exception (); // TODO: handle other types
+			}
+		}
+		[MonoTODO]
+		public bool EvaluateBoolean (BaseIterator iter)
+		{
+			object result = Evaluate (iter);
+			switch (GetReturnType (iter))
+			{
+				case XPathResultType.Number:
+				{
+					double num = (double) result;
+					return (num != 0.0 && num != -0.0 && num != Double.NaN);
+				}
+				case XPathResultType.Boolean:
+					return (bool) result;
+				case XPathResultType.String:
+					return ((string) result).Length != 0;
+				case XPathResultType.NodeSet:
+				{
+					BaseIterator iterResult = (BaseIterator) result;
+					return (iterResult != null && iterResult.MoveNext ());
+				}
+				default:
+					throw new Exception (); // TODO: handle other types
+			}
+		}
+	}
+
+	internal abstract class ExprBinary : Expression
+	{
+		protected Expression _left, _right;
+
+		public ExprBinary (Expression left, Expression right)
+		{
+			_left = left;
+			_right = right;
+		}
+		public override String ToString ()
+		{
+			return _left.ToString () + ' ' + Operator + ' ' + _right.ToString ();
+		}
+		protected abstract String Operator { get; }
+	}
+
+	internal abstract class ExprBoolean : ExprBinary
+	{
+		public ExprBoolean (Expression left, Expression right) : base (left, right) {}
+		public override XPathResultType ReturnType { get { return XPathResultType.Boolean; }}
+	}
+
+	internal class ExprOR : ExprBoolean
+	{
+		public ExprOR (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "or"; }}
+		public override object Evaluate (BaseIterator iter)
+		{
+			if (_left.EvaluateBoolean (iter))
+				return true;
+			return _right.EvaluateBoolean (iter);
+		}
+	}
+	internal class ExprAND : ExprBoolean
+	{
+		public ExprAND (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "and"; }}
+		public override object Evaluate (BaseIterator iter)
+		{
+			if (!_left.EvaluateBoolean (iter))
+				return false;
+			return _right.EvaluateBoolean (iter);
+		}
+	}
+
+	internal abstract class EqualityExpr : ExprBoolean
+	{
+		public EqualityExpr (Expression left, Expression right) : base (left, right) {}
+		[MonoTODO]
+		public override object Evaluate (BaseIterator iter)
+		{
+			XPathResultType typeL = _left.GetReturnType (iter);
+			XPathResultType typeR = _right.GetReturnType (iter);
+			if (typeL == XPathResultType.NodeSet || typeR == XPathResultType.NodeSet)
+			{
+				Expression left, right;
+				if (typeL != XPathResultType.NodeSet)
+				{
+					left = _right;
+					right = _left;
+					XPathResultType typeTmp = typeL;
+					typeL = typeR;
+					typeR = typeTmp;
+				}
+				else
+				{
+					left = _left;
+					right = _right;
+				}
+				if (typeR == XPathResultType.Boolean)
+				{
+					bool fL = left.EvaluateBoolean (iter);
+					bool fR = right.EvaluateBoolean (iter);
+					return Compare (Convert.ToDouble (fL), Convert.ToDouble (fR));
+				}
+				else
+				{
+					BaseIterator iterL = left.EvaluateNodeSet (iter);
+					if (typeR == XPathResultType.Number)
+					{
+						double dR = right.EvaluateNumber (iter);
+						while (iterL.MoveNext ())
+							if (Compare (XPathFunctions.ToNumber (iterL.Current.Value), dR))
+								return true;
+					}
+					else if (typeR == XPathResultType.String)
+					{
+						string strR = right.EvaluateString (iter);
+						while (iterL.MoveNext ())
+							if (Compare (iterL.Current.Value, strR))
+								return true;
+					}
+					else if (typeR == XPathResultType.NodeSet)
+					{
+						BaseIterator iterR = right.EvaluateNodeSet (iter);
+						ArrayList rgNodesL = new ArrayList ();
+						while (iterL.MoveNext ())
+							rgNodesL.Add (XPathFunctions.ToString (iterL.Current.Value));
+						while (iterR.MoveNext ())
+						{
+							string strR = XPathFunctions.ToString (iterR.Current.Value);
+							foreach (string strL in rgNodesL)
+								if (Compare (strL, strR))
+									return true;
+						}
+					}
+					return false;
+				}
+			}
+			else if (typeL == XPathResultType.Boolean || typeR == XPathResultType.Boolean)
+				return Compare (_left.EvaluateBoolean (iter), _right.EvaluateBoolean (iter));
+			else if (typeL == XPathResultType.Number || typeR == XPathResultType.Number)
+				return Compare (_left.EvaluateNumber (iter), _right.EvaluateNumber (iter));
+			else
+				return Compare (_left.EvaluateString (iter), _right.EvaluateString (iter));
+		}
+		[MonoTODO]
+		public abstract bool Compare (object arg1, object arg2);	// TODO: should probably have type-safe methods here
+	}
+	
+	internal class ExprEQ : EqualityExpr
+	{
+		public ExprEQ (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "="; }}
+		public override bool Compare (object arg1, object arg2)
+		{
+			return arg1.Equals (arg2);
+		}
+	}
+	internal class ExprNE : EqualityExpr
+	{
+		public ExprNE (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "!="; }}
+		public override bool Compare (object arg1, object arg2)
+		{
+			return !arg1.Equals (arg2);
+		}
+	}
+
+	internal abstract class RelationalExpr : ExprBoolean
+	{
+		public RelationalExpr (Expression left, Expression right) : base (left, right) {}
+		[MonoTODO]
+		public override object Evaluate (BaseIterator iter)
+		{
+			XPathResultType typeL = _left.GetReturnType (iter);
+			XPathResultType typeR = _right.GetReturnType (iter);
+			if (typeL == XPathResultType.NodeSet || typeR == XPathResultType.NodeSet)
+			{
+				bool fReverse = false;
+				Expression left, right;
+				if (typeL != XPathResultType.NodeSet)
+				{
+					fReverse = true;
+					left = _right;
+					right = _left;
+					XPathResultType typeTmp = typeL;
+					typeL = typeR;
+					typeR = typeTmp;
+				}
+				else
+				{
+					left = _left;
+					right = _right;
+				}
+				if (typeR == XPathResultType.Boolean)
+				{
+					bool fL = left.EvaluateBoolean (iter);
+					bool fR = right.EvaluateBoolean (iter);
+					return Compare (Convert.ToDouble (fL), Convert.ToDouble (fR), fReverse);
+				}
+				else
+				{
+					BaseIterator iterL = left.EvaluateNodeSet (iter);
+					if (typeR == XPathResultType.Number || typeR == XPathResultType.String)
+					{
+						double dR = right.EvaluateNumber (iter);
+						while (iterL.MoveNext ())
+							if (Compare (XPathFunctions.ToNumber (iterL.Current.Value), dR, fReverse))
+								return true;
+					}
+					else if (typeR == XPathResultType.NodeSet)
+					{
+						BaseIterator iterR = right.EvaluateNodeSet (iter);
+						ArrayList rgNodesL = new ArrayList ();
+						while (iterL.MoveNext ())
+							rgNodesL.Add (XPathFunctions.ToNumber (iterL.Current.Value));
+						while (iterR.MoveNext ())
+						{
+							double numR = XPathFunctions.ToNumber (iterR.Current.Value);
+							foreach (double numL in rgNodesL)
+								if (Compare (numL, numR))
+									return true;
+						}
+					}
+					return false;
+				}
+			}
+			else
+				return Compare (_left.EvaluateNumber (iter), _right.EvaluateNumber (iter));
+		}
+		public abstract bool Compare (double arg1, double arg2);
+		public bool Compare (double arg1, double arg2, bool fReverse)
+		{
+			if (fReverse)
+				return Compare (arg2, arg1);
+			else
+				return Compare (arg1, arg2);
+		}
+	}
+	internal class ExprGT : RelationalExpr
+	{
+		public ExprGT (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return ">"; }}
+		public override bool Compare (double arg1, double arg2)
+		{
+			return arg1 > arg2;
+		}
+	}
+	internal class ExprGE : RelationalExpr
+	{
+		public ExprGE (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return ">="; }}
+		public override bool Compare (double arg1, double arg2)
+		{
+			return arg1 >= arg2;
+		}
+	}
+	internal class ExprLT : RelationalExpr
+	{
+		public ExprLT (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "<"; }}
+		public override bool Compare (double arg1, double arg2)
+		{
+			return arg1 < arg2;
+		}
+	}
+	internal class ExprLE : RelationalExpr
+	{
+		public ExprLE (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "<="; }}
+		public override bool Compare (double arg1, double arg2)
+		{
+			return arg1 <= arg2;
+		}
+	}
+
+
+	internal abstract class ExprNumeric : ExprBinary
+	{
+		public ExprNumeric (Expression left, Expression right) : base (left, right) {}
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+	}
+
+	internal class ExprPLUS : ExprNumeric
+	{
+		public ExprPLUS (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "+"; }}
+		public override object Evaluate (BaseIterator iter)
+		{
+			return _left.EvaluateNumber (iter) + _right.EvaluateNumber (iter);
+		}
+	}
+	internal class ExprMINUS : ExprNumeric
+	{
+		public ExprMINUS (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "-"; }}
+		public override object Evaluate (BaseIterator iter)
+		{
+			return _left.EvaluateNumber (iter) - _right.EvaluateNumber (iter);
+		}
+	}
+	internal class ExprMULT : ExprNumeric
+	{
+		public ExprMULT (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "*"; }}
+		public override object Evaluate (BaseIterator iter)
+		{
+			return _left.EvaluateNumber (iter) * _right.EvaluateNumber (iter);
+		}
+	}
+	internal class ExprDIV : ExprNumeric
+	{
+		public ExprDIV (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "/"; }}
+		public override object Evaluate (BaseIterator iter)
+		{
+			return _left.EvaluateNumber (iter) / _right.EvaluateNumber (iter);
+		}
+	}
+	internal class ExprMOD : ExprNumeric
+	{
+		public ExprMOD (Expression left, Expression right) : base (left, right) {}
+		protected override String Operator { get { return "%"; }}
+		[MonoTODO]
+		public override object Evaluate (BaseIterator iter)
+		{
+			return _left.EvaluateNumber (iter) % _right.EvaluateNumber (iter);	// TODO: spec?
+		}
+	}
+	internal class ExprNEG : Expression
+	{
+		Expression _expr;
+		public ExprNEG (Expression expr)
+		{
+			_expr = expr;
+		}
+		public override String ToString () { return "- " + _expr.ToString (); }
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override object Evaluate (BaseIterator iter)
+		{
+			return - _expr.EvaluateNumber (iter);
+		}
+	}
+
+
+	internal abstract class NodeSet : Expression
+	{
+		public override XPathResultType ReturnType { get { return XPathResultType.NodeSet; }}
+	}
+	internal class ExprUNION : NodeSet
+	{
+		protected Expression _left, _right;
+		public ExprUNION (NodeSet left, NodeSet right)
+		{
+			_left = left;
+			_right = right;
+		}
+		public override String ToString () { return _left.ToString ()+ " | " + _right.ToString (); }
+		public override object Evaluate (BaseIterator iter)
+		{
+			BaseIterator iterLeft = _left.EvaluateNodeSet (iter);
+			BaseIterator iterRight = _right.EvaluateNodeSet (iter);
+			return new UnionIterator (iter, iterLeft, iterRight);
+		}
+	}
+	internal class ExprSLASH : NodeSet
+	{
+		protected Expression _left, _right;
+		public ExprSLASH (NodeSet left, NodeSet right)
+		{
+			_left = left;
+			_right = right;
+		}
+		public override String ToString () { return _left.ToString ()+ "/" + _right.ToString (); }
+		public override object Evaluate (BaseIterator iter)
+		{
+			BaseIterator iterLeft = _left.EvaluateNodeSet (iter);
+			return new SlashIterator (iterLeft, _right);
+		}
+	}
+	internal class ExprRoot : NodeSet
+	{
+		public override String ToString () { return ""; }
+		public override object Evaluate (BaseIterator iter)
+		{
+			XPathNavigator navRoot = iter.Current.Clone ();
+			navRoot.MoveToRoot ();
+			return new SelfIterator (navRoot, iter.Context);
+		}
+	}
+
+	internal enum Axes
+	{
+		Ancestor,
+		AncestorOrSelf,
+		Attribute,
+		Child,
+		Descendant,
+		DescendantOrSelf,
+		Following,
+		FollowingSibling,
+		Namespace,
+		Parent,
+		Preceding,
+		PrecedingSibling,
+		Self,
+	}
+
+	internal class AxisSpecifier
+	{
+		protected Axes _axis;
+		public AxisSpecifier (Axes axis)
+		{
+			_axis = axis;
+		}
+		public XPathNodeType NodeType
+		{
+			get
+			{
+				switch (_axis)
+				{
+					case Axes.Namespace:
+						return XPathNodeType.Namespace;
+					case Axes.Attribute:
+						return XPathNodeType.Attribute;
+					default:
+						return XPathNodeType.Element;
+				}
+			}
+		}
+		public override string ToString ()
+		{
+			switch (_axis)
+			{
+				case Axes.Ancestor:
+					return "ancestor";
+				case Axes.AncestorOrSelf:
+					return "ancestor-or-self";
+				case Axes.Attribute:
+					return "attribute";
+				case Axes.Child:
+					return "child";
+				case Axes.Descendant:
+					return "descendant";
+				case Axes.DescendantOrSelf:
+					return "descendant-or-self";
+				case Axes.Following:
+					return "following";
+				case Axes.FollowingSibling:
+					return "following-sibling";
+				case Axes.Namespace:
+					return "namespace";
+				case Axes.Parent:
+					return "parent";
+				case Axes.Preceding:
+					return "preceeding";
+				case Axes.PrecedingSibling:
+					return "preceeding-sibling";
+				case Axes.Self:
+					return "self";
+				default:
+					throw new IndexOutOfRangeException ();
+			}
+		}
+		public Axes Axis { get { return _axis; }}
+		public virtual BaseIterator Evaluate (BaseIterator iter)
+		{
+			switch (_axis)
+			{
+				case Axes.Ancestor:
+					return new AncestorIterator (iter);
+				case Axes.AncestorOrSelf:
+					return new AncestorOrSelfIterator (iter);
+				case Axes.Attribute:
+					return new AttributeIterator (iter);
+				case Axes.Child:
+					return new ChildIterator (iter);
+				case Axes.Descendant:
+					return new DescendantIterator (iter);
+				case Axes.DescendantOrSelf:
+					return new DescendantOrSelfIterator (iter);
+				case Axes.Following:
+					return new FollowingIterator (iter);
+				case Axes.FollowingSibling:
+					return new FollowingSiblingIterator (iter);
+				case Axes.Namespace:
+					return new NamespaceIterator (iter);
+				case Axes.Parent:
+					return new ParentIterator (iter);
+				case Axes.Preceding:
+					return new PrecedingIterator (iter);
+				case Axes.PrecedingSibling:
+					return new PrecedingSiblingIterator (iter);
+				case Axes.Self:
+					return new SelfIterator (iter);
+				default:
+					throw new IndexOutOfRangeException ();
+			}
+		}
+	}
+
+	internal abstract class NodeTest
+	{
+		protected AxisSpecifier _axis;
+		public NodeTest (AxisSpecifier axis)
+		{
+			_axis = axis;
+		}
+		public NodeTest (Axes axis)
+		{
+			_axis = new AxisSpecifier (axis);
+		}
+		public abstract bool Match (XsltContext context, XPathNavigator nav);
+		public AxisSpecifier Axis { get { return _axis; }}
+		public virtual BaseIterator Evaluate (BaseIterator iter)
+		{
+			BaseIterator iterAxis = _axis.Evaluate (iter);
+			return new AxisIterator (iterAxis, this);
+		}
+	}
+
+	internal class NodeTypeTest : NodeTest
+	{
+		protected XPathNodeType _type;
+		protected String _param;
+		public NodeTypeTest (Axes axis) : base (axis)
+		{
+			_type = _axis.NodeType;
+		}
+		public NodeTypeTest (Axes axis, XPathNodeType type) : base (axis)
+		{
+			_type = type;
+		}
+		[MonoTODO]
+		public NodeTypeTest (Axes axis, XPathNodeType type, String param) : base (axis)
+		{
+			_type = type;
+			_param = param;
+			if (param != null && type != XPathNodeType.ProcessingInstruction)
+				throw new Exception ("No argument allowed for "+ToString (_type)+"() test");	// TODO: better description
+		}
+		public override String ToString ()
+		{
+			String strType = ToString (_type);
+			if (_type == XPathNodeType.ProcessingInstruction && _param != null)
+				strType += "('" + _param + "')";
+			else
+				strType += "()";
+
+			return _axis.ToString () + "::" + strType;
+		}
+		private static String ToString (XPathNodeType type)
+		{
+			switch (type)
+			{
+				case XPathNodeType.Comment:
+					return "comment";
+				case XPathNodeType.Text:
+					return "text";
+				case XPathNodeType.ProcessingInstruction:
+					return "processing-instruction";
+				case XPathNodeType.All:
+				case XPathNodeType.Attribute:
+				case XPathNodeType.Element:
+					return "node";
+				default:
+					throw new NotImplementedException ();
+			}
+		}
+		public override bool Match (XsltContext context, XPathNavigator nav)
+		{
+			XPathNodeType nodeType = nav.NodeType;
+			switch (_type)
+			{
+				case XPathNodeType.All:
+					return true;
+
+				case XPathNodeType.ProcessingInstruction:
+					if (nodeType != XPathNodeType.ProcessingInstruction)
+						return false;
+					if (_param != null && nav.Name != _param)
+						return false;
+					return true;
+				
+				default:
+					return _type == nodeType;
+			}
+		}
+	}
+	internal class NodeNameTest : NodeTest
+	{
+		protected QName _name;
+		public NodeNameTest (Axes axis, QName name) : base (axis)
+		{
+			_name = name;
+		}
+		public override String ToString () { return _axis.ToString () + "::" + _name.ToString (); }
+		[MonoTODO]
+		public override bool Match (XsltContext context, XPathNavigator nav)
+		{
+			// must be the correct node type
+			if (nav.NodeType != _axis.NodeType)
+				return false;
+
+			if (_name.Local != null && _name.Local != "")
+			{
+				// test the local part of the name first
+				if (_name.Local != nav.LocalName)
+					return false;
+			}
+
+			// get the prefix for the given name
+			String strURI1 = "";
+			if (_name.Prefix != null)
+			{
+				strURI1 = context.LookupNamespace (_name.Prefix);	// TODO: check to see if this returns null or ""
+				if (strURI1 == null)
+					throw new Exception ("Invalid namespace prefix: "+_name.Prefix);
+			}
+
+			string strURI = nav.NamespaceURI;
+			if (strURI == null && strURI1 == "")	// TODO: remove when bug #26855 fixed
+				return true;
+
+			// test the prefixes
+			return strURI1 == nav.NamespaceURI;
+		}
+	}
+
+	internal class ExprStep : NodeSet
+	{
+		protected NodeTest _test;
+		protected Expression [] _preds;
+		public ExprStep (NodeTest test, ExprPredicates preds)
+		{
+			_test = test;
+			if (preds != null)
+				_preds = preds.GetPredicates ();
+		}
+		public ExprStep (NodeTest test)
+		{
+			_test = test;
+		}
+		public override String ToString ()
+		{
+			String strExpr = _test.ToString ();
+			if (_preds != null)
+			{
+				foreach (Expression pred in _preds)
+				{
+					strExpr += '[' + pred.ToString () + ']';
+				}
+			}
+			return strExpr;
+		}
+		public override object Evaluate (BaseIterator iter)
+		{
+			BaseIterator iterStep = _test.Evaluate (iter);
+			if (_preds == null)
+				return iterStep;
+
+			return new PredicateIterator (iterStep, _preds);
+		}
+	}
+
+
+	internal class ExprPredicates
+	{
+		protected Expression _pred;
+		protected ExprPredicates _tail;
+		public ExprPredicates (Expression pred, ExprPredicates tail)
+		{
+			_pred = pred;
+			_tail = tail;
+		}
+		public ExprPredicates (Expression pred)
+		{
+			_pred = pred;
+		}
+		public Expression [] GetPredicates ()
+		{
+			ArrayList lstPreds = new ArrayList ();
+			ExprPredicates curr = this;
+			while (curr != null)
+			{
+				lstPreds.Add (curr._pred);
+				curr = curr._tail;
+			}
+			return (Expression []) lstPreds.ToArray (typeof (Expression));
+		}
+	}
+
+	internal class ExprFilter : Expression
+	{
+		protected Expression _expr;
+		protected Expression _pred;
+		public ExprFilter (Expression expr, Expression pred)
+		{
+			_expr = expr;
+			_pred = pred;
+		}
+		public override String ToString () { return "(" + _expr.ToString () + ")[" + _pred.ToString () + "]"; }
+		public override XPathResultType ReturnType { get { return XPathResultType.NodeSet; }}
+	}
+
+	internal class QName
+	{
+		protected String _prefix;
+		protected String _local;
+		public QName (String prefix, String local)
+		{
+			_prefix = prefix;
+			_local = local;
+		}
+		public override String ToString ()
+		{
+			String strLocal = (_local != null) ? _local : "*";
+			if (_prefix != null)
+				return _prefix + ':' + strLocal;
+			return strLocal;
+		}
+		public String Prefix { get { return _prefix; } }
+		public String Local { get { return _local; } }
+	}
+	internal class NCName : QName
+	{
+		public NCName (String local) : base (null, local) {}
+	}
+
+	internal class ExprNumber : Expression
+	{
+		protected double _value;
+		public ExprNumber (double value)
+		{
+			_value = value;
+		}
+		public override String ToString () { return _value.ToString (); }
+		public override XPathResultType ReturnType { get { return XPathResultType.Number; }}
+		public override object Evaluate (BaseIterator iter)
+		{
+			return _value;
+		}
+	}
+	internal class ExprLiteral : Expression
+	{
+		protected String _value;
+		public ExprLiteral (String value)
+		{
+			_value = value;
+		}
+		public override String ToString () { return "'" + _value + "'"; }
+		public override XPathResultType ReturnType { get { return XPathResultType.String; }}
+		public override object Evaluate (BaseIterator iter)
+		{
+			return _value;
+		}
+	}
+
+	internal class ExprVariable : Expression
+	{
+		protected QName _name;
+		public ExprVariable (QName name)
+		{
+			_name = name;
+		}
+		public override String ToString () { return "$" + _name.ToString (); }
+		public override XPathResultType ReturnType { get { return XPathResultType.Any; }}
+		public override XPathResultType GetReturnType (BaseIterator iter)
+		{
+			IXsltContextVariable var = iter.Context.ResolveVariable (_name.Prefix, _name.Local);
+			return var.VariableType;
+		}
+	}
+
+	internal class FunctionArguments
+	{
+		protected Expression _arg;
+		protected FunctionArguments _tail;
+		public FunctionArguments (Expression arg, FunctionArguments tail)
+		{
+			_arg = arg;
+			_tail = tail;
+		}
+		public Expression Arg
+		{
+			get { return _arg; }
+		}
+		public FunctionArguments Tail
+		{
+			get { return _tail; }
+		}
+	}
+	internal class ExprFunctionCall : Expression
+	{
+		protected QName _name;
+		protected ArrayList _args = new ArrayList ();
+		public ExprFunctionCall (String name, FunctionArguments args)
+		{
+			_name = new NCName (name);
+			while (args != null)
+			{
+				_args.Add (args.Arg);
+				args = args.Tail;
+			}
+		}
+		public override String ToString ()
+		{
+			String strArgs = "";
+			foreach (Expression arg in _args)
+			{
+				if (strArgs != "")
+					strArgs += ", ";
+				strArgs += arg.ToString ();
+			}
+			return _name.ToString () + '(' + strArgs + ')';
+		}
+		public override XPathResultType ReturnType { get { return XPathResultType.Any; }}
+		public override XPathResultType GetReturnType (BaseIterator iter)
+		{
+			IXsltContextFunction func = iter.Context.ResolveFunction (_name.Prefix, _name.Local, GetArgTypes (iter));
+			return func.ReturnType;
+		}
+		private XPathResultType [] GetArgTypes (BaseIterator iter)
+		{
+			// TODO: can we cache these? what if the types depend on the context?
+			XPathResultType [] rgArgs = new XPathResultType [_args.Count];
+			for (int iArg = 0; iArg < _args.Count; iArg++)
+				rgArgs [iArg] = ((Expression) _args [iArg]).GetReturnType (iter);
+			return rgArgs;
+		}
+		public override object Evaluate (BaseIterator iter)
+		{
+			//special-case the 'last' and 'position' functions
+			if (_args.Count == 0 && _name.Prefix == null)
+			{
+				if (_name.Local == "last")
+				{
+					return (double) iter.Count;
+				}
+				else if (_name.Local == "position")
+				{
+					return (double) iter.CurrentPosition;
+				}
+			}
+
+			XPathResultType [] rgTypes = GetArgTypes (iter);
+			IXsltContextFunction func = iter.Context.ResolveFunction (_name.Prefix, _name.Local, rgTypes);
+			object [] rgArgs = new object [_args.Count];
+			for (int iArg = 0; iArg < _args.Count; iArg ++)
+				rgArgs [iArg] = ((Expression) _args [iArg]).Evaluate (iter);
+			return func.Invoke (iter.Context, rgArgs, iter.Current);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/IXPathNavigable.cs b/mcs/class/System.XML/System.Xml.XPath/IXPathNavigable.cs
new file mode 100644
index 00000000000..13c9018e761
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/IXPathNavigable.cs
@@ -0,0 +1,16 @@
+//
+// System.Xml.XPath.IXPathNavigable
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2001 Jason Diamond  http://injektilo.org/
+//
+
+namespace System.Xml.XPath
+{
+	public interface IXPathNavigable
+	{
+		XPathNavigator CreateNavigator ();
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/Iterator.cs b/mcs/class/System.XML/System.Xml.XPath/Iterator.cs
new file mode 100644
index 00000000000..9584cf46f89
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/Iterator.cs
@@ -0,0 +1,594 @@
+//
+// System.Xml.XPath.BaseIterator
+//
+// Author:
+//   Piers Haken (piersh@friskit.com)
+//
+// (C) 2002 Piers Haken
+//
+
+using System;
+using System.Collections;
+using System.Xml;
+using System.Xml.XPath;
+using System.Xml.Xsl;
+
+namespace System.Xml.XPath
+{
+	internal abstract class BaseIterator : XPathNodeIterator
+	{
+		private XsltContext _context;
+
+		internal BaseIterator (BaseIterator other)
+		{
+			_context = other._context;
+		}
+		internal BaseIterator (XsltContext context)
+		{
+			_context = context;
+		}
+
+		public XsltContext Context { get { return _context; } }
+		
+		public override string ToString ()
+		{
+			return Current.NodeType.ToString () + "[" + CurrentPosition + "] : " + Current.Name + " = " + Current.Value;
+		}
+	}
+
+	internal class MergedIterator : BaseIterator
+	{
+		protected ArrayList _iters = new ArrayList ();
+		protected int _pos;
+		protected int _index;
+
+		public MergedIterator (BaseIterator iter ) : base (iter) {}
+		protected MergedIterator (MergedIterator other) : base (other)
+		{
+			foreach (object obj in other._iters)
+				_iters.Add (obj);
+			_pos = other._pos;
+			_index = other._index;
+		}
+		public override XPathNodeIterator Clone () { return new MergedIterator (this); }
+
+		public void Add (BaseIterator iter)
+		{
+			_iters.Add (iter);
+		}
+
+		public override bool MoveNext ()
+		{
+			while (_index < _iters.Count)
+			{
+				BaseIterator iter = (BaseIterator) _iters [_index];
+				if (iter.MoveNext ())
+				{
+					_pos ++;
+					return true;
+				}
+				_index ++;
+			}
+			return false;
+		}
+		public override XPathNavigator Current
+		{
+			get
+			{
+				if (_index >= _iters.Count)
+					return null;
+				BaseIterator iter = (BaseIterator) _iters [_index];
+				return iter.Current;
+			}
+		}
+		public override int CurrentPosition { get { return _pos; }}
+	}
+
+	internal abstract class SimpleIterator : BaseIterator
+	{
+		protected XPathNavigator _nav;
+		protected int _pos;
+
+		public SimpleIterator (BaseIterator iter) : base (iter)
+		{
+			_nav = iter.Current.Clone ();
+		}
+		protected SimpleIterator (SimpleIterator other) : base (other)
+		{
+			_nav = other._nav.Clone ();
+			_pos = other._pos;
+		}
+		public SimpleIterator (XPathNavigator nav, XsltContext context) : base (context)
+		{
+			_nav = nav.Clone ();
+		}
+
+		public override XPathNavigator Current { get { return _nav; }}
+		public override int CurrentPosition { get { return _pos; }}
+	}
+
+	internal class SelfIterator : SimpleIterator
+	{
+		public SelfIterator (BaseIterator iter) : base (iter) {}
+		public SelfIterator (XPathNavigator nav, XsltContext context) : base (nav, context) {}
+		protected SelfIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new SelfIterator (this); }
+		public override bool MoveNext ()
+		{
+			if (_pos == 0)
+			{
+				_pos = 1;
+				return true;
+			}
+			return false;
+		}
+	}
+
+	internal class ParentIterator : SimpleIterator
+	{
+		public ParentIterator (BaseIterator iter) : base (iter) {}
+		protected ParentIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new ParentIterator (this); }
+		public override bool MoveNext ()
+		{
+			if (_pos == 0 && _nav.MoveToParent ())
+			{
+				_pos = 1;
+				return true;
+			}
+			return false;
+		}
+	}
+
+	internal class ChildIterator : SimpleIterator
+	{
+		public ChildIterator (BaseIterator iter) : base (iter) {}
+		protected ChildIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new ChildIterator (this); }
+		public override bool MoveNext ()
+		{
+			bool fSuccess = (_pos == 0) ? _nav.MoveToFirstChild () : _nav.MoveToNext ();
+			if (fSuccess)
+				_pos ++;
+			return fSuccess;
+		}
+	}
+
+	internal class FollowingSiblingIterator : SimpleIterator
+	{
+		public FollowingSiblingIterator (BaseIterator iter) : base (iter) {}
+		protected FollowingSiblingIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new FollowingSiblingIterator (this); }
+		public override bool MoveNext ()
+		{
+			if (_nav.MoveToNext ())
+			{
+				_pos ++;
+				return true;
+			}
+			return false;
+		}
+	}
+
+	internal class PrecedingSiblingIterator : SimpleIterator
+	{
+		public PrecedingSiblingIterator (BaseIterator iter) : base (iter) {}
+		protected PrecedingSiblingIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new PrecedingSiblingIterator (this); }
+		public override bool MoveNext ()
+		{
+			if (_nav.MoveToPrevious ())
+			{
+				_pos ++;
+				return true;
+			}
+			return false;
+		}
+	}
+
+	internal class AncestorIterator : SimpleIterator
+	{
+		public AncestorIterator (BaseIterator iter) : base (iter) {}
+		protected AncestorIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new AncestorIterator (this); }
+		public override bool MoveNext ()
+		{
+			if (_nav.MoveToParent ())
+			{
+				_pos ++;
+				return true;
+			}
+			return false;
+		}
+	}
+
+	internal class AncestorOrSelfIterator : MergedIterator
+	{
+		public AncestorOrSelfIterator (BaseIterator iter) : base (iter)
+		{
+			Add (new SelfIterator (iter));
+			Add (new AncestorIterator (iter));
+		}
+		protected AncestorOrSelfIterator (MergedIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new AncestorOrSelfIterator (this); }
+	}
+
+	internal class DescendantIterator : SimpleIterator
+	{
+		protected int _depth;
+		public DescendantIterator (BaseIterator iter) : base (iter) {}
+		protected DescendantIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new DescendantIterator (this); }
+		[MonoTODO]
+		public override bool MoveNext ()
+		{
+			if (_nav.MoveToFirstChild ())
+			{
+				_depth ++;
+				_pos ++;
+				return true;
+			}
+			while (_depth != 0)
+			{
+				if (_nav.MoveToNext ())
+				{
+					_pos ++;
+					return true;
+				}
+				if (!_nav.MoveToParent ())	// should NEVER fail!
+					throw new Exception ("unexpected depth");	// TODO: better message
+				_depth --;
+			}
+			return false;
+		}
+	}
+
+	internal class DescendantOrSelfIterator : MergedIterator
+	{
+		public DescendantOrSelfIterator (BaseIterator iter) : base (iter)
+		{
+			Add (new SelfIterator (iter));
+			Add (new DescendantIterator (iter));
+		}
+		protected DescendantOrSelfIterator (MergedIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new DescendantOrSelfIterator (this); }
+	}
+
+	internal class FollowingIterator : SimpleIterator
+	{
+		public FollowingIterator (BaseIterator iter) : base (iter) {}
+		protected FollowingIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new FollowingIterator (this); }
+		public override bool MoveNext ()
+		{
+			if (_pos == 0)
+			{
+				if (_nav.MoveToNext ())
+				{
+					_pos ++;
+					return true;
+				}
+			}
+			else
+			{
+				if (_nav.MoveToFirstChild ())
+				{
+					_pos ++;
+					return true;
+				}
+				do
+				{
+					if (_nav.MoveToNext ())
+					{
+						_pos ++;
+						return true;
+					}
+				}
+				while (_nav.MoveToParent ());
+			}
+			return false;
+		}
+	}
+
+	internal class PrecedingIterator : SimpleIterator
+	{
+		public PrecedingIterator (BaseIterator iter) : base (iter) {}
+		protected PrecedingIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new PrecedingIterator (this); }
+		public override bool MoveNext ()
+		{
+			if (_pos == 0)
+			{
+				if (_nav.MoveToPrevious ())
+				{
+					_pos ++;
+					return true;
+				}
+			}
+			else
+			{
+				if (_nav.MoveToFirstChild ())
+				{
+					while (_nav.MoveToNext ())
+						;
+					_pos ++;
+					return true;
+				}
+				do
+				{
+					if (_nav.MoveToPrevious ())
+					{
+						_pos ++;
+						return true;
+					}
+				}
+				while (_nav.MoveToParent ());
+			}
+			return false;
+		}
+	}
+
+	internal class NamespaceIterator : SimpleIterator
+	{
+		public NamespaceIterator (BaseIterator iter) : base (iter) {}
+		protected NamespaceIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new NamespaceIterator (this); }
+		public override bool MoveNext ()
+		{
+			if (_pos == 0)
+			{
+				if (_nav.MoveToFirstNamespace ())
+				{
+					_pos ++;
+					return true;
+				}
+			}
+			else if (_nav.MoveToNextNamespace ())
+			{
+				_pos ++;
+				return true;
+			}
+			return false;
+		}
+	}
+
+	internal class AttributeIterator : SimpleIterator
+	{
+		public AttributeIterator (BaseIterator iter) : base (iter) {}
+		protected AttributeIterator (SimpleIterator other) : base (other) {}
+		public override XPathNodeIterator Clone () { return new AttributeIterator (this); }
+		public override bool MoveNext ()
+		{
+			if (_pos == 0)
+			{
+				if (_nav.MoveToFirstAttribute ())
+				{
+					_pos += 1;
+					return true;
+				}
+			}
+			else if (_nav.MoveToNextAttribute ())
+			{
+				_pos ++;
+				return true;
+			}
+			return false;			
+		}
+	}
+
+	internal class AxisIterator : BaseIterator
+	{
+		protected BaseIterator _iter;
+		protected NodeTest _test;
+		protected int _pos;
+
+		public AxisIterator (BaseIterator iter, NodeTest test) : base (iter)
+		{
+			_iter = iter;
+			_test = test;
+		}
+
+		protected AxisIterator (AxisIterator other) : base (other)
+		{
+			_iter = (BaseIterator) other._iter.Clone ();
+			_test = other._test;
+			_pos = other._pos;
+		}
+		public override XPathNodeIterator Clone () { return new AxisIterator (this); }
+
+		public override bool MoveNext ()
+		{
+			while (_iter.MoveNext ())
+			{
+				if (_test.Match (Context, Current))
+				{
+					_pos ++;
+					return true;
+				}
+			}
+			return false;
+		}
+		public override XPathNavigator Current { get { return _iter.Current; }}
+		public override int CurrentPosition { get { return _pos; }}
+	}
+
+	internal class SlashIterator : BaseIterator
+	{
+		protected BaseIterator _iterLeft;
+		protected BaseIterator _iterRight;
+		protected Expression _expr;
+		protected int _pos;
+
+		public SlashIterator (BaseIterator iter, Expression expr) : base (iter)
+		{
+			_iterLeft = iter;
+			_expr = expr;
+		}
+
+		protected SlashIterator (SlashIterator other) : base (other)
+		{
+			_iterLeft = (BaseIterator) other._iterLeft.Clone ();
+			_iterRight = (BaseIterator) other._iterRight.Clone ();
+			_expr = other._expr;
+			_pos = other._pos;
+		}
+		public override XPathNodeIterator Clone () { return new SlashIterator (this); }
+
+		public override bool MoveNext ()
+		{
+			while (_iterRight == null || !_iterRight.MoveNext ())
+			{
+				if (!_iterLeft.MoveNext ())
+					return false;
+				_iterRight = _expr.EvaluateNodeSet (_iterLeft);
+			}
+			_pos ++;
+			return true;
+		}
+		public override XPathNavigator Current { get { return _iterRight.Current; }}
+		public override int CurrentPosition { get { return _pos; }}
+	}
+	internal class PredicateIterator : BaseIterator
+	{
+		protected BaseIterator _iter;
+		protected Expression [] _preds;
+		protected int _pos;
+
+		public PredicateIterator (BaseIterator iter, Expression [] preds) : base (iter)
+		{
+			_iter = iter;
+			_preds = preds;
+		}
+
+		protected PredicateIterator (PredicateIterator other) : base (other)
+		{
+			_iter = (BaseIterator) other._iter.Clone ();
+			_preds = other._preds;
+			_pos = other._pos;
+		}
+		public override XPathNodeIterator Clone () { return new PredicateIterator (this); }
+
+		public override bool MoveNext ()
+		{
+			while (_iter.MoveNext ())
+			{
+				bool fTrue = true;
+				foreach (Expression pred in _preds)
+				{
+					object result = pred.Evaluate ((BaseIterator) _iter.Clone ());
+					if (result is double)
+					{
+						if ((double) result != _iter.CurrentPosition)
+						{
+							fTrue = false;
+							break;
+						}
+					}
+					else if (!XPathFunctions.ToBoolean (result))
+					{
+						fTrue = false;
+						break;
+					}
+				}
+				if (fTrue)
+					return true;
+			}
+			return false;
+		}
+		public override XPathNavigator Current { get { return _iter.Current; }}
+		public override int CurrentPosition { get { return _pos; }}
+	}
+	internal class ArrayListIterator : BaseIterator
+	{
+		protected ArrayList _rgNodes;
+		protected int _pos;
+
+		public ArrayListIterator (BaseIterator iter, ArrayList rgNodes) : base (iter)
+		{
+			_rgNodes = rgNodes;
+		}
+
+		protected ArrayListIterator (ArrayListIterator other) : base (other)
+		{
+			_rgNodes = other._rgNodes;
+			_pos = other._pos;
+		}
+		public override XPathNodeIterator Clone () { return new ArrayListIterator (this); }
+
+		public override bool MoveNext ()
+		{
+			if (_pos >= _rgNodes.Count)
+				return false;
+			_pos++;
+			return true;
+		}
+		public override XPathNavigator Current { get { return (XPathNavigator) _rgNodes [_pos - 1]; }}
+		public override int CurrentPosition { get { return _pos; }}
+	}
+
+	internal class UnionIterator : BaseIterator
+	{
+		protected ArrayList _rgNodes;
+		protected BaseIterator _left, _right;
+		protected int _pos;
+
+		public UnionIterator (BaseIterator iter, BaseIterator left, BaseIterator right) : base (iter)
+		{
+			_rgNodes = new ArrayList ();
+			_left = left;
+			_right = right;
+		}
+
+		protected UnionIterator (UnionIterator other) : base (other)
+		{
+			_rgNodes = (ArrayList) other._rgNodes.Clone ();
+			_left = other._left;
+			_right = other._right;
+			_pos = other._pos;
+		}
+		public override XPathNodeIterator Clone () { return new UnionIterator (this); }
+
+		public override bool MoveNext ()
+		{
+			if (_left.MoveNext ())
+			{
+				_rgNodes.Add (_left.Current.Clone ());
+				_pos ++;
+				return true;
+			}
+
+			while (_right.MoveNext ())
+			{
+				XPathNavigator navRight = _right.Current;
+				bool fFound = false;
+				foreach (XPathNavigator navLeft in _rgNodes)
+				{
+					if (navLeft.IsSamePosition (navRight))
+					{
+						fFound = true;
+						break;
+					}
+				}
+				if (!fFound)
+				{
+					_pos ++;
+					return true;
+				}
+			}
+			return false;
+		}
+		public override XPathNavigator Current
+		{
+			get
+			{
+				if (_pos < _rgNodes.Count)
+					throw new Exception ("bug in UnionOperator");	// TODO: better exception
+				if (_pos == _rgNodes.Count)
+					return _left.Current;
+				else
+					return _right.Current;
+			}
+		}
+		public override int CurrentPosition { get { return _pos; }}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/Parser.cs b/mcs/class/System.XML/System.Xml.XPath/Parser.cs
new file mode 100644
index 00000000000..0da95f7ad54
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/Parser.cs
@@ -0,0 +1,1085 @@
+// created by jay 0.7 (c) 1998 Axel.Schreiner@informatik.uni-osnabrueck.de
+
+					// line 2 "Parser.jay"
+// XPath parser
+//
+// Author - Piers Haken <piersh@friskit.com>
+//
+
+// TODO: FUNCTION_CALL should be a QName, not just a NCName
+// TODO: PROCESSING_INSTRUCTION's optional parameter
+// TODO: flatten argument/predicate lists in place
+
+using System;
+using System.Xml.XPath;
+
+namespace Mono.Xml.XPath
+{
+	public class XPathParser
+	{
+		internal object yyparseDebug (Tokenizer tok)
+		{
+			return yyparse (tok, new yydebug.yyDebugSimple ());
+		}
+
+					// line 27 "-"
+
+  /** simplified error message.
+      @see <a href="#yyerror(java.lang.String, java.lang.String[])">yyerror</a>
+    */
+  public void yyerror (string message) {
+    yyerror(message, null);
+  }
+
+  /** (syntax) error message.
+      Can be overwritten to control message format.
+      @param message text to be displayed.
+      @param expected vector of acceptable tokens, if available.
+    */
+  public void yyerror (string message, string[] expected) {
+    if ((expected != null) && (expected.Length  > 0)) {
+      System.Console.Write (message+", expecting");
+      for (int n = 0; n < expected.Length; ++ n)
+        System.Console.Write (" "+expected[n]);
+        System.Console.WriteLine ();
+    } else
+      System.Console.WriteLine (message);
+  }
+
+  /** debugging support, requires the package jay.yydebug.
+      Set to null to suppress debugging messages.
+    */
+  protected yydebug.yyDebug debug;
+
+  protected static  int yyFinal = 25;
+  public static  string [] yyRule = {
+    "$accept : Expr",
+    "Expr : OrExpr",
+    "OrExpr : AndExpr",
+    "OrExpr : OrExpr OR AndExpr",
+    "AndExpr : EqualityExpr",
+    "AndExpr : AndExpr AND EqualityExpr",
+    "EqualityExpr : RelationalExpr",
+    "EqualityExpr : EqualityExpr EQ RelationalExpr",
+    "EqualityExpr : EqualityExpr NE RelationalExpr",
+    "RelationalExpr : AdditiveExpr",
+    "RelationalExpr : RelationalExpr LT AdditiveExpr",
+    "RelationalExpr : RelationalExpr GT AdditiveExpr",
+    "RelationalExpr : RelationalExpr LE AdditiveExpr",
+    "RelationalExpr : RelationalExpr GE AdditiveExpr",
+    "AdditiveExpr : MultiplicativeExpr",
+    "AdditiveExpr : AdditiveExpr PLUS MultiplicativeExpr",
+    "AdditiveExpr : AdditiveExpr MINUS MultiplicativeExpr",
+    "MultiplicativeExpr : UnaryExpr",
+    "MultiplicativeExpr : MultiplicativeExpr ASTERISK UnaryExpr",
+    "MultiplicativeExpr : MultiplicativeExpr DIV UnaryExpr",
+    "MultiplicativeExpr : MultiplicativeExpr MOD UnaryExpr",
+    "UnaryExpr : UnionExpr",
+    "UnaryExpr : MINUS UnaryExpr",
+    "UnionExpr : PathExpr",
+    "UnionExpr : UnionExpr BAR PathExpr",
+    "PathExpr : RelativeLocationPath",
+    "PathExpr : SLASH",
+    "PathExpr : SLASH RelativeLocationPath",
+    "PathExpr : SLASH2 RelativeLocationPath",
+    "PathExpr : FilterExpr",
+    "PathExpr : FilterExpr SLASH RelativeLocationPath",
+    "PathExpr : FilterExpr SLASH2 RelativeLocationPath",
+    "RelativeLocationPath : Step",
+    "RelativeLocationPath : RelativeLocationPath SLASH Step",
+    "RelativeLocationPath : RelativeLocationPath SLASH2 Step",
+    "Step : AxisSpecifier QName ZeroOrMorePredicates",
+    "Step : AxisSpecifier ASTERISK ZeroOrMorePredicates",
+    "Step : AxisSpecifier NodeType PAREN_OPEN OptionalLiteral PAREN_CLOSE ZeroOrMorePredicates",
+    "Step : DOT",
+    "Step : DOT2",
+    "AxisSpecifier :",
+    "AxisSpecifier : AT",
+    "AxisSpecifier : AxisName COLON2",
+    "NodeType : COMMENT",
+    "NodeType : TEXT",
+    "NodeType : PROCESSING_INSTRUCTION",
+    "NodeType : NODE",
+    "FilterExpr : PrimaryExpr",
+    "FilterExpr : FilterExpr Predicate",
+    "PrimaryExpr : DOLLAR QName",
+    "PrimaryExpr : PAREN_OPEN Expr PAREN_CLOSE",
+    "PrimaryExpr : LITERAL",
+    "PrimaryExpr : NUMBER",
+    "PrimaryExpr : FunctionCall",
+    "FunctionCall : FUNCTION_NAME PAREN_OPEN OptionalArgumentList PAREN_CLOSE",
+    "OptionalArgumentList :",
+    "OptionalArgumentList : Expr OptionalArgumentListTail",
+    "OptionalArgumentListTail :",
+    "OptionalArgumentListTail : COMMA Expr OptionalArgumentListTail",
+    "ZeroOrMorePredicates :",
+    "ZeroOrMorePredicates : Predicate ZeroOrMorePredicates",
+    "Predicate : BRACKET_OPEN Expr BRACKET_CLOSE",
+    "AxisName : ANCESTOR",
+    "AxisName : ANCESTOR_OR_SELF",
+    "AxisName : ATTRIBUTE",
+    "AxisName : CHILD",
+    "AxisName : DESCENDANT",
+    "AxisName : DESCENDANT_OR_SELF",
+    "AxisName : FOLLOWING",
+    "AxisName : FOLLOWING_SIBLING",
+    "AxisName : NAMESPACE",
+    "AxisName : PARENT",
+    "AxisName : PRECEDING",
+    "AxisName : PRECEDING_SIBLING",
+    "AxisName : SELF",
+    "OptionalLiteral :",
+    "OptionalLiteral : LITERAL",
+    "QName : NCName",
+    "QName : NCName COLON ASTERISK",
+    "QName : NCName COLON NCName",
+  };
+  protected static  string [] yyName = {    
+    "end-of-file",null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,null,null,null,null,null,null,null,
+    null,null,null,null,null,null,null,"ERROR","EOF","SLASH","SLASH2",
+    "DOT","DOT2","COLON","COLON2","COMMA","AT","FUNCTION_NAME",
+    "BRACKET_OPEN","BRACKET_CLOSE","PAREN_OPEN","PAREN_CLOSE","AND","OR",
+    "DIV","MOD","PLUS","MINUS","ASTERISK","DOLLAR","BAR","EQ","NE","LE",
+    "GE","LT","GT","ANCESTOR","ANCESTOR_OR_SELF","ATTRIBUTE","CHILD",
+    "DESCENDANT","DESCENDANT_OR_SELF","FOLLOWING","FOLLOWING_SIBLING",
+    "NAMESPACE","PARENT","PRECEDING","PRECEDING_SIBLING","SELF","COMMENT",
+    "TEXT","PROCESSING_INSTRUCTION","NODE","NUMBER","LITERAL","NCName",
+  };
+
+  /** index-checked interface to yyName[].
+      @param token single character or %token value.
+      @return token name or [illegal] or [unknown].
+    */
+  public static string yyname (int token) {
+    if ((token < 0) || (token > yyName.Length)) return "[illegal]";
+    string name;
+    if ((name = yyName[token]) != null) return name;
+    return "[unknown]";
+  }
+
+  /** computes list of expected tokens on error by tracing the tables.
+      @param state for which to compute the list.
+      @return list of token names.
+    */
+  protected string[] yyExpecting (int state) {
+    int token, n, len = 0;
+    bool[] ok = new bool[yyName.Length];
+
+    if ((n = yySindex[state]) != 0)
+      for (token = n < 0 ? -n : 0;
+           (token < yyName.Length) && (n+token < yyTable.Length); ++ token)
+        if (yyCheck[n+token] == token && !ok[token] && yyName[token] != null) {
+          ++ len;
+          ok[token] = true;
+        }
+    if ((n = yyRindex[state]) != 0)
+      for (token = n < 0 ? -n : 0;
+           (token < yyName.Length) && (n+token < yyTable.Length); ++ token)
+        if (yyCheck[n+token] == token && !ok[token] && yyName[token] != null) {
+          ++ len;
+          ok[token] = true;
+        }
+
+    string [] result = new string[len];
+    for (n = token = 0; n < len;  ++ token)
+      if (ok[token]) result[n++] = yyName[token];
+    return result;
+  }
+
+  /** the generated parser, with debugging messages.
+      Maintains a state and a value stack, currently with fixed maximum size.
+      @param yyLex scanner.
+      @param yydebug debug message writer implementing yyDebug, or null.
+      @return result of the last reduction, if any.
+      @throws yyException on irrecoverable parse error.
+    */
+  public Object yyparse (yyParser.yyInput yyLex, Object yyd)
+				 {
+    this.debug = (yydebug.yyDebug)yyd;
+    return yyparse(yyLex);
+  }
+
+  /** initial size and increment of the state/value stack [default 256].
+      This is not final so that it can be overwritten outside of invocations
+      of yyparse().
+    */
+  protected int yyMax;
+
+  /** executed at the beginning of a reduce action.
+      Used as $$ = yyDefault($1), prior to the user-specified action, if any.
+      Can be overwritten to provide deep copy, etc.
+      @param first value for $1, or null.
+      @return first.
+    */
+  protected Object yyDefault (Object first) {
+    return first;
+  }
+
+  /** the generated parser.
+      Maintains a state and a value stack, currently with fixed maximum size.
+      @param yyLex scanner.
+      @return result of the last reduction, if any.
+      @throws yyException on irrecoverable parse error.
+    */
+  public Object yyparse (yyParser.yyInput yyLex)
+				{
+    if (yyMax <= 0) yyMax = 256;			// initial size
+    int yyState = 0;                                   // state stack ptr
+    int [] yyStates = new int[yyMax];	                // state stack 
+    Object yyVal = null;                               // value stack ptr
+    Object [] yyVals = new Object[yyMax];	        // value stack
+    int yyToken = -1;					// current input
+    int yyErrorFlag = 0;				// #tks to shift
+
+    int yyTop = 0;
+    goto skip;
+    yyLoop:
+    yyTop++;
+    skip:
+    for (;; ++ yyTop) {
+      if (yyTop >= yyStates.Length) {			// dynamically increase
+        int[] i = new int[yyStates.Length+yyMax];
+        System.Array.Copy(yyStates, i, 0);
+        yyStates = i;
+        Object[] o = new Object[yyVals.Length+yyMax];
+        System.Array.Copy(yyVals, o, 0);
+        yyVals = o;
+      }
+      yyStates[yyTop] = yyState;
+      yyVals[yyTop] = yyVal;
+      if (debug != null) debug.push(yyState, yyVal);
+
+      yyDiscarded: for (;;) {	// discarding a token does not change stack
+        int yyN;
+        if ((yyN = yyDefRed[yyState]) == 0) {	// else [default] reduce (yyN)
+          if (yyToken < 0) {
+            yyToken = yyLex.advance() ? yyLex.token() : 0;
+            if (debug != null)
+              debug.lex(yyState, yyToken, yyname(yyToken), yyLex.value());
+          }
+          if ((yyN = yySindex[yyState]) != 0 && ((yyN += yyToken) >= 0)
+              && (yyN < yyTable.Length) && (yyCheck[yyN] == yyToken)) {
+            if (debug != null)
+              debug.shift(yyState, yyTable[yyN], yyErrorFlag-1);
+            yyState = yyTable[yyN];		// shift to yyN
+            yyVal = yyLex.value();
+            yyToken = -1;
+            if (yyErrorFlag > 0) -- yyErrorFlag;
+            goto yyLoop;
+          }
+          if ((yyN = yyRindex[yyState]) != 0 && (yyN += yyToken) >= 0
+              && yyN < yyTable.Length && yyCheck[yyN] == yyToken)
+            yyN = yyTable[yyN];			// reduce (yyN)
+          else
+            switch (yyErrorFlag) {
+  
+            case 0:
+              yyerror("syntax error", yyExpecting(yyState));
+              if (debug != null) debug.error("syntax error");
+              goto case 1;
+            case 1: case 2:
+              yyErrorFlag = 3;
+              do {
+                if ((yyN = yySindex[yyStates[yyTop]]) != 0
+                    && (yyN += Token.yyErrorCode) >= 0 && yyN < yyTable.Length
+                    && yyCheck[yyN] == Token.yyErrorCode) {
+                  if (debug != null)
+                    debug.shift(yyStates[yyTop], yyTable[yyN], 3);
+                  yyState = yyTable[yyN];
+                  yyVal = yyLex.value();
+                  goto yyLoop;
+                }
+                if (debug != null) debug.pop(yyStates[yyTop]);
+              } while (-- yyTop >= 0);
+              if (debug != null) debug.reject();
+              throw new yyParser.yyException("irrecoverable syntax error");
+  
+            case 3:
+              if (yyToken == 0) {
+                if (debug != null) debug.reject();
+                throw new yyParser.yyException("irrecoverable syntax error at end-of-file");
+              }
+              if (debug != null)
+                debug.discard(yyState, yyToken, yyname(yyToken),
+  							yyLex.value());
+              yyToken = -1;
+              goto yyDiscarded;		// leave stack alone
+            }
+        }
+        int yyV = yyTop + 1-yyLen[yyN];
+        if (debug != null)
+          debug.reduce(yyState, yyStates[yyV-1], yyN, yyRule[yyN], yyLen[yyN]);
+        yyVal = yyDefault(yyV > yyTop ? null : yyVals[yyV]);
+        switch (yyN) {
+case 3:
+					// line 112 "Parser.jay"
+  {
+		yyVal = new ExprOR ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 5:
+					// line 120 "Parser.jay"
+  {
+		yyVal = new ExprAND ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 7:
+					// line 128 "Parser.jay"
+  {
+		yyVal = new ExprEQ ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 8:
+					// line 132 "Parser.jay"
+  {
+		yyVal = new ExprNE ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 10:
+					// line 140 "Parser.jay"
+  {
+		yyVal = new ExprLT ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 11:
+					// line 144 "Parser.jay"
+  {
+		yyVal = new ExprGT ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 12:
+					// line 148 "Parser.jay"
+  {
+		yyVal = new ExprLE ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 13:
+					// line 152 "Parser.jay"
+  {
+		yyVal = new ExprGE ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 15:
+					// line 160 "Parser.jay"
+  {
+		yyVal = new ExprPLUS ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 16:
+					// line 164 "Parser.jay"
+  {
+		yyVal = new ExprMINUS ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 18:
+					// line 172 "Parser.jay"
+  {
+		yyVal = new ExprMULT ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 19:
+					// line 176 "Parser.jay"
+  {
+		yyVal = new ExprDIV ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 20:
+					// line 180 "Parser.jay"
+  {
+		yyVal = new ExprMOD ((Expression) yyVals[-2+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 22:
+					// line 188 "Parser.jay"
+  {
+		yyVal = new ExprNEG ((Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 24:
+					// line 196 "Parser.jay"
+  {
+		yyVal = new ExprUNION ((NodeSet) yyVals[-2+yyTop], (NodeSet) yyVals[0+yyTop]);
+	}
+  break;
+case 26:
+					// line 204 "Parser.jay"
+  {
+		yyVal = new ExprRoot ();
+	}
+  break;
+case 27:
+					// line 208 "Parser.jay"
+  {
+		yyVal = new ExprSLASH (new ExprRoot (), (NodeSet) yyVals[0+yyTop]);
+	}
+  break;
+case 28:
+					// line 212 "Parser.jay"
+  {
+		ExprStep exprStep = new ExprStep (new NodeTypeTest (Axes.DescendantOrSelf, XPathNodeType.All));
+		yyVal = new ExprSLASH (new ExprSLASH (new ExprRoot (), exprStep), (NodeSet) yyVals[0+yyTop]);
+	}
+  break;
+case 30:
+					// line 218 "Parser.jay"
+  {
+		yyVal = new ExprSLASH ((NodeSet) yyVals[-2+yyTop], (NodeSet) yyVals[0+yyTop]);
+	}
+  break;
+case 31:
+					// line 222 "Parser.jay"
+  {
+		ExprStep exprStep = new ExprStep (new NodeTypeTest (Axes.DescendantOrSelf, XPathNodeType.All));
+		yyVal = new ExprSLASH (new ExprSLASH ((NodeSet) yyVals[-2+yyTop], exprStep), (NodeSet) yyVals[0+yyTop]);
+	}
+  break;
+case 33:
+					// line 231 "Parser.jay"
+  {
+		yyVal = new ExprSLASH ((NodeSet) yyVals[-2+yyTop], (NodeSet) yyVals[0+yyTop]);
+	}
+  break;
+case 34:
+					// line 235 "Parser.jay"
+  {
+		ExprStep exprStep = new ExprStep (new NodeTypeTest (Axes.DescendantOrSelf, XPathNodeType.All));
+		yyVal = new ExprSLASH (new ExprSLASH ((NodeSet) yyVals[-2+yyTop], exprStep), (NodeSet) yyVals[0+yyTop]);
+	}
+  break;
+case 35:
+					// line 243 "Parser.jay"
+  {
+		yyVal = new ExprStep (new NodeNameTest ((Axes) yyVals[-2+yyTop], (QName) yyVals[-1+yyTop]), (ExprPredicates) yyVals[0+yyTop]);
+	}
+  break;
+case 36:
+					// line 247 "Parser.jay"
+  {
+		yyVal = new ExprStep (new NodeTypeTest ((Axes) yyVals[-2+yyTop]), (ExprPredicates) yyVals[0+yyTop]);
+	}
+  break;
+case 37:
+					// line 256 "Parser.jay"
+  {
+		yyVal = new ExprStep (new NodeTypeTest ((Axes) yyVals[-5+yyTop], (XPathNodeType) yyVals[-4+yyTop], (String) yyVals[-2+yyTop]), (ExprPredicates) yyVals[0+yyTop]);
+	}
+  break;
+case 38:
+					// line 260 "Parser.jay"
+  {
+		yyVal = new ExprStep (new NodeTypeTest (Axes.Self, XPathNodeType.All));
+	}
+  break;
+case 39:
+					// line 264 "Parser.jay"
+  {
+		yyVal = new ExprStep (new NodeTypeTest (Axes.Parent, XPathNodeType.All));
+	}
+  break;
+case 40:
+					// line 271 "Parser.jay"
+  {
+		yyVal = Axes.Child;
+	}
+  break;
+case 41:
+					// line 275 "Parser.jay"
+  {
+		yyVal = Axes.Attribute;
+	}
+  break;
+case 42:
+					// line 279 "Parser.jay"
+  {
+		yyVal = yyVals[-1+yyTop];
+	}
+  break;
+case 43:
+					// line 285 "Parser.jay"
+  { yyVal = XPathNodeType.Comment; }
+  break;
+case 44:
+					// line 286 "Parser.jay"
+  { yyVal = XPathNodeType.Text; }
+  break;
+case 45:
+					// line 287 "Parser.jay"
+  { yyVal = XPathNodeType.ProcessingInstruction; }
+  break;
+case 46:
+					// line 288 "Parser.jay"
+  { yyVal = XPathNodeType.All; }
+  break;
+case 48:
+					// line 295 "Parser.jay"
+  {
+		yyVal = new ExprFilter ((Expression) yyVals[-1+yyTop], (Expression) yyVals[0+yyTop]);
+	}
+  break;
+case 49:
+					// line 302 "Parser.jay"
+  {
+		yyVal = new ExprVariable ((QName) yyVals[0+yyTop]);
+	}
+  break;
+case 50:
+					// line 306 "Parser.jay"
+  {
+		yyVal = yyVals[-1+yyTop];
+	}
+  break;
+case 51:
+					// line 310 "Parser.jay"
+  {
+		yyVal = new ExprLiteral ((String) yyVals[0+yyTop]);
+	}
+  break;
+case 52:
+					// line 314 "Parser.jay"
+  {
+		yyVal = new ExprNumber ((double) yyVals[0+yyTop]);
+	}
+  break;
+case 54:
+					// line 322 "Parser.jay"
+  {
+		yyVal = new ExprFunctionCall ((String) yyVals[-3+yyTop], (FunctionArguments) yyVals[-1+yyTop]);
+	}
+  break;
+case 56:
+					// line 330 "Parser.jay"
+  {
+		yyVal = new FunctionArguments ((Expression) yyVals[-1+yyTop], (FunctionArguments) yyVals[0+yyTop]);
+	}
+  break;
+case 58:
+					// line 338 "Parser.jay"
+  {
+		yyVal = new FunctionArguments ((Expression) yyVals[-1+yyTop], (FunctionArguments) yyVals[0+yyTop]);
+	}
+  break;
+case 60:
+					// line 347 "Parser.jay"
+  {
+		yyVal = new ExprPredicates ((Expression) yyVals[-1+yyTop], (ExprPredicates) yyVals[0+yyTop]);
+	}
+  break;
+case 61:
+					// line 354 "Parser.jay"
+  {
+		yyVal = yyVals[-1+yyTop];
+	}
+  break;
+case 62:
+					// line 360 "Parser.jay"
+  { yyVal = Axes.Ancestor; }
+  break;
+case 63:
+					// line 361 "Parser.jay"
+  { yyVal = Axes.AncestorOrSelf; }
+  break;
+case 64:
+					// line 362 "Parser.jay"
+  { yyVal = Axes.Attribute; }
+  break;
+case 65:
+					// line 363 "Parser.jay"
+  { yyVal = Axes.Child; }
+  break;
+case 66:
+					// line 364 "Parser.jay"
+  { yyVal = Axes.Descendant; }
+  break;
+case 67:
+					// line 365 "Parser.jay"
+  { yyVal = Axes.DescendantOrSelf; }
+  break;
+case 68:
+					// line 366 "Parser.jay"
+  { yyVal = Axes.Following; }
+  break;
+case 69:
+					// line 367 "Parser.jay"
+  { yyVal = Axes.FollowingSibling; }
+  break;
+case 70:
+					// line 368 "Parser.jay"
+  { yyVal = Axes.Namespace; }
+  break;
+case 71:
+					// line 369 "Parser.jay"
+  { yyVal = Axes.Parent; }
+  break;
+case 72:
+					// line 370 "Parser.jay"
+  { yyVal = Axes.Preceding; }
+  break;
+case 73:
+					// line 371 "Parser.jay"
+  { yyVal = Axes.PrecedingSibling; }
+  break;
+case 74:
+					// line 372 "Parser.jay"
+  { yyVal = Axes.Self; }
+  break;
+case 77:
+					// line 382 "Parser.jay"
+  {
+		yyVal = new NCName ((String) yyVals[0+yyTop]);
+	}
+  break;
+case 78:
+					// line 386 "Parser.jay"
+  {
+		yyVal = new QName ((String) yyVals[-2+yyTop], null);
+	}
+  break;
+case 79:
+					// line 390 "Parser.jay"
+  {
+		yyVal = new QName ((String) yyVals[-2+yyTop], (String) yyVals[0+yyTop]);
+	}
+  break;
+					// line 662 "-"
+        }
+        yyTop -= yyLen[yyN];
+        yyState = yyStates[yyTop];
+        int yyM = yyLhs[yyN];
+        if (yyState == 0 && yyM == 0) {
+          if (debug != null) debug.shift(0, yyFinal);
+          yyState = yyFinal;
+          if (yyToken < 0) {
+            yyToken = yyLex.advance() ? yyLex.token() : 0;
+            if (debug != null)
+               debug.lex(yyState, yyToken,yyname(yyToken), yyLex.value());
+          }
+          if (yyToken == 0) {
+            if (debug != null) debug.accept(yyVal);
+            return yyVal;
+          }
+          goto yyLoop;
+        }
+        if (((yyN = yyGindex[yyM]) != 0) && ((yyN += yyState) >= 0)
+            && (yyN < yyTable.Length) && (yyCheck[yyN] == yyState))
+          yyState = yyTable[yyN];
+        else
+          yyState = yyDgoto[yyM];
+        if (debug != null) debug.shift(yyStates[yyTop], yyState);
+	 goto yyLoop;
+      }
+    }
+  }
+
+   static  short [] yyLhs  = {              -1,
+    0,    1,    1,    2,    2,    3,    3,    3,    4,    4,
+    4,    4,    4,    5,    5,    5,    6,    6,    6,    6,
+    7,    7,    8,    8,    9,    9,    9,    9,    9,    9,
+    9,   10,   10,   10,   12,   12,   12,   12,   12,   13,
+   13,   13,   16,   16,   16,   16,   11,   11,   19,   19,
+   19,   19,   19,   21,   22,   22,   23,   23,   15,   15,
+   20,   18,   18,   18,   18,   18,   18,   18,   18,   18,
+   18,   18,   18,   18,   17,   17,   14,   14,   14,
+  };
+   static  short [] yyLen = {           2,
+    1,    1,    3,    1,    3,    1,    3,    3,    1,    3,
+    3,    3,    3,    1,    3,    3,    1,    3,    3,    3,
+    1,    2,    1,    3,    1,    1,    2,    2,    1,    3,
+    3,    1,    3,    3,    3,    3,    6,    1,    1,    0,
+    1,    2,    1,    1,    1,    1,    1,    2,    2,    3,
+    1,    1,    1,    4,    0,    2,    0,    3,    0,    2,
+    3,    1,    1,    1,    1,    1,    1,    1,    1,    1,
+    1,    1,    1,    1,    0,    1,    1,    3,    3,
+  };
+   static  short [] yyDefRed = {            0,
+    0,    0,   38,   39,   41,    0,    0,    0,    0,   62,
+   63,   64,   65,   66,   67,   68,   69,   70,   71,   72,
+   73,   74,   52,   51,    0,    0,    0,    0,    0,    0,
+    0,   17,    0,   23,    0,    0,   32,    0,    0,   47,
+   53,    0,    0,    0,    0,   22,    0,   49,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,   48,    0,   43,
+   44,   45,   46,    0,    0,   42,    0,    0,   50,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+   19,   20,   18,   24,   33,   34,    0,    0,    0,   36,
+    0,   35,    0,    0,   56,   54,   78,   79,   61,   60,
+   76,    0,    0,    0,   58,   37,
+  };
+  protected static  short [] yyDgoto  = {            25,
+   26,   27,   28,   29,   30,   31,   32,   33,   34,   35,
+   36,   37,   38,   48,  100,   75,  112,   39,   40,  101,
+   41,   78,  105,
+  };
+  protected static  short [] yySindex = {         -188,
+  -85,  -85,    0,    0,    0, -258, -188, -188, -297,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0, -215, -257, -253, -265, -245,
+ -261,    0, -221,    0, -218, -252,    0, -256, -203,    0,
+    0, -218, -218, -188, -209,    0, -200,    0, -188, -188,
+ -188, -188, -188, -188, -188, -188, -188, -188, -188, -188,
+ -188, -130,  -85,  -85,  -85,  -85, -188,    0, -204,    0,
+    0,    0,    0, -204, -195,    0, -199, -194,    0, -268,
+ -257, -253, -265, -265, -245, -245, -245, -245, -261, -261,
+    0,    0,    0,    0,    0,    0, -218, -218, -202,    0,
+ -204,    0, -229, -188,    0,    0,    0,    0,    0,    0,
+    0, -191, -199, -204,    0,    0,
+  };
+  protected static  short [] yyRindex = {         -182,
+    1, -182,    0,    0,    0,    0, -182, -182,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,  253,   65,   23,  435,  319,
+  244,    0,  222,    0,   90,  112,    0,    0,    0,    0,
+    0,  134,  156, -267,    0,    0,   40,    0, -182, -182,
+ -182, -182, -182, -182, -182, -182, -182, -182, -182, -182,
+ -182, -182, -182, -182, -182, -182, -182,    0,   68,    0,
+    0,    0,    0,   68,    0,    0, -190,    0,    0,    0,
+  510,  501,  457,  479,  347,  369,  391,  413,  267,  289,
+    0,    0,    0,    0,    0,    0,  178,  200,    0,    0,
+   68,    0, -187, -182,    0,    0,    0,    0,    0,    0,
+    0,    0, -190,   68,    0,    0,
+  };
+  protected static  short [] yyGindex = {           -7,
+    0,   34,   35,   -3,  -29,   -1,   -6,    0,   24,    4,
+    0,  -12,    0,   49,  -71,    0,    0,    0,    0,   52,
+    0,    0,  -21,
+  };
+  protected static  short [] yyTable = {            45,
+   26,   46,  102,   55,   42,   43,   65,   66,   47,  107,
+   40,   44,   59,   60,   50,   67,   61,   53,   54,   55,
+   56,   69,    4,   85,   86,   87,   88,   51,   52,  110,
+   57,   58,   40,   40,   40,   40,   77,  108,   40,   77,
+   63,   64,  116,   70,   71,   72,   73,   83,   84,   47,
+   95,   96,   91,   92,   93,   89,   90,   49,   62,   99,
+   76,   79,   80,   67,    2,  104,  109,   59,   97,   98,
+    1,    2,    3,    4,  103,  111,  106,    5,    6,  114,
+   57,    7,   81,   75,   82,   94,   74,   68,    8,   25,
+    9,  115,    0,    0,    0,   40,  113,    0,   10,   11,
+   12,   13,   14,   15,   16,   17,   18,   19,   20,   21,
+   22,   29,    0,    0,    0,   23,   24,   40,   40,   40,
+   40,    0,    0,   40,    0,    0,    0,    0,    1,    2,
+    3,    4,    0,   27,    0,    5,    6,    0,    0,    7,
+    0,    0,    0,    0,    0,    0,    0,    0,    9,    0,
+    0,    0,    0,    0,    0,   28,   10,   11,   12,   13,
+   14,   15,   16,   17,   18,   19,   20,   21,   22,    0,
+    0,    0,    0,   23,   24,    3,    4,   30,    0,    0,
+    5,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,   31,
+    0,   10,   11,   12,   13,   14,   15,   16,   17,   18,
+   19,   20,   21,   22,    0,    0,    0,    0,    0,    0,
+    0,   21,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,   14,    0,    0,    0,    0,    0,    0,
+    0,    0,    1,    0,    0,    0,    0,    0,    0,    0,
+    0,    0,    0,    0,    0,   26,   15,    0,    0,   26,
+    0,   26,   26,   26,   26,   26,   26,   26,   26,    0,
+   26,   26,   26,   26,   26,   26,   26,    4,   16,    0,
+    0,    4,    0,    4,    4,    4,    0,    0,   77,   77,
+   40,   40,   40,   40,   77,    0,   40,   77,   77,    0,
+   77,   77,   77,   77,   77,   77,   77,   77,    9,   77,
+   77,   77,   77,   77,   77,   77,   59,   59,    0,    2,
+    0,    0,   59,    2,    0,    2,   59,    2,   59,   59,
+   59,   59,   59,   59,   59,   59,   12,   59,   59,   59,
+   59,   59,   59,   59,   25,    0,    0,    0,   25,    0,
+   25,   25,   25,   25,   25,   25,   25,   25,   13,   25,
+   25,   25,   25,   25,   25,   25,   29,    0,    0,    0,
+   29,    0,   29,   29,   29,   29,   29,   29,   29,   29,
+   10,   29,   29,   29,   29,   29,   29,   29,   27,    0,
+    0,    0,   27,    0,   27,   27,   27,   27,   27,   27,
+   27,   27,   11,   27,   27,   27,   27,   27,   27,   27,
+   28,    0,    0,    0,   28,    0,   28,   28,   28,   28,
+   28,   28,   28,   28,    6,   28,   28,   28,   28,   28,
+   28,   28,   30,    0,    0,    0,   30,    0,   30,   30,
+   30,   30,   30,   30,   30,   30,    7,   30,   30,   30,
+   30,   30,   30,   30,   31,    0,    0,    0,   31,    0,
+   31,   31,   31,   31,   31,   31,   31,   31,    8,   31,
+   31,   31,   31,   31,   31,   31,   21,    0,    0,    0,
+   21,    0,   21,   21,   21,   21,   21,   21,   21,   21,
+    5,    0,   21,   21,   21,   21,   21,   21,   14,    3,
+    0,    0,   14,    0,   14,   14,   14,    1,    0,   14,
+   14,    1,    0,    1,   14,   14,   14,   14,   14,   14,
+    0,   15,    0,    0,    0,   15,    0,   15,   15,   15,
+    0,    0,   15,   15,    0,    0,    0,   15,   15,   15,
+   15,   15,   15,   16,    0,    0,    0,   16,    0,   16,
+   16,   16,    0,    0,   16,   16,    0,    0,    0,   16,
+   16,   16,   16,   16,   16,    0,    0,    0,    0,    0,
+    0,    0,    0,    9,    0,    0,    0,    9,    0,    9,
+    9,    9,    0,    0,    0,    0,    0,    0,    0,    9,
+    9,    9,    9,    9,    9,    0,    0,    0,    0,    0,
+    0,   12,    0,    0,    0,   12,    0,   12,   12,   12,
+    0,    0,    0,    0,    0,    0,    0,   12,   12,   12,
+   12,   12,   12,   13,    0,    0,    0,   13,    0,   13,
+   13,   13,    0,    0,    0,    0,    0,    0,    0,   13,
+   13,   13,   13,   13,   13,   10,    0,    0,    0,   10,
+    0,   10,   10,   10,    0,    0,    0,    0,    0,    0,
+    0,   10,   10,   10,   10,   10,   10,   11,    0,    0,
+    0,   11,    0,   11,   11,   11,    0,    0,    0,    0,
+    0,    0,    0,   11,   11,   11,   11,   11,   11,    6,
+    0,    0,    0,    6,    0,    6,    6,    6,    0,    0,
+    0,    0,    0,    0,    0,    6,    6,    0,    0,    0,
+    0,    7,    0,    0,    0,    7,    0,    7,    7,    7,
+    0,    0,    0,    0,    0,    0,    0,    7,    7,    0,
+    0,    0,    0,    8,    0,    0,    0,    8,    0,    8,
+    8,    8,    0,    0,    0,    0,    0,    0,    0,    8,
+    8,    0,    0,    0,    0,    5,    0,    0,    0,    5,
+    0,    5,    5,    5,    3,    0,    0,    0,    3,    0,
+    3,    0,    3,
+  };
+  protected static  short [] yyCheck = {             7,
+    0,    8,   74,  271,    1,    2,  259,  260,  306,  278,
+  278,  270,  274,  275,  272,  268,  278,  283,  284,  285,
+  286,  278,    0,   53,   54,   55,   56,  281,  282,  101,
+  276,  277,  300,  301,  302,  303,   44,  306,  306,    0,
+  259,  260,  114,  300,  301,  302,  303,   51,   52,  306,
+   63,   64,   59,   60,   61,   57,   58,  273,  280,   67,
+  264,  271,  263,  268,    0,  265,  269,    0,   65,   66,
+  259,  260,  261,  262,  270,  305,  271,  266,  267,  271,
+  271,  270,   49,  271,   50,   62,   38,   36,  277,    0,
+  279,  113,   -1,   -1,   -1,  278,  104,   -1,  287,  288,
+  289,  290,  291,  292,  293,  294,  295,  296,  297,  298,
+  299,    0,   -1,   -1,   -1,  304,  305,  300,  301,  302,
+  303,   -1,   -1,  306,   -1,   -1,   -1,   -1,  259,  260,
+  261,  262,   -1,    0,   -1,  266,  267,   -1,   -1,  270,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  279,   -1,
+   -1,   -1,   -1,   -1,   -1,    0,  287,  288,  289,  290,
+  291,  292,  293,  294,  295,  296,  297,  298,  299,   -1,
+   -1,   -1,   -1,  304,  305,  261,  262,    0,   -1,   -1,
+  266,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,    0,
+   -1,  287,  288,  289,  290,  291,  292,  293,  294,  295,
+  296,  297,  298,  299,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,    0,   -1,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  265,    0,   -1,   -1,  269,
+   -1,  271,  272,  273,  274,  275,  276,  277,  278,   -1,
+  280,  281,  282,  283,  284,  285,  286,  265,    0,   -1,
+   -1,  269,   -1,  271,  272,  273,   -1,   -1,  259,  260,
+  300,  301,  302,  303,  265,   -1,  306,  268,  269,   -1,
+  271,  272,  273,  274,  275,  276,  277,  278,    0,  280,
+  281,  282,  283,  284,  285,  286,  259,  260,   -1,  265,
+   -1,   -1,  265,  269,   -1,  271,  269,  273,  271,  272,
+  273,  274,  275,  276,  277,  278,    0,  280,  281,  282,
+  283,  284,  285,  286,  265,   -1,   -1,   -1,  269,   -1,
+  271,  272,  273,  274,  275,  276,  277,  278,    0,  280,
+  281,  282,  283,  284,  285,  286,  265,   -1,   -1,   -1,
+  269,   -1,  271,  272,  273,  274,  275,  276,  277,  278,
+    0,  280,  281,  282,  283,  284,  285,  286,  265,   -1,
+   -1,   -1,  269,   -1,  271,  272,  273,  274,  275,  276,
+  277,  278,    0,  280,  281,  282,  283,  284,  285,  286,
+  265,   -1,   -1,   -1,  269,   -1,  271,  272,  273,  274,
+  275,  276,  277,  278,    0,  280,  281,  282,  283,  284,
+  285,  286,  265,   -1,   -1,   -1,  269,   -1,  271,  272,
+  273,  274,  275,  276,  277,  278,    0,  280,  281,  282,
+  283,  284,  285,  286,  265,   -1,   -1,   -1,  269,   -1,
+  271,  272,  273,  274,  275,  276,  277,  278,    0,  280,
+  281,  282,  283,  284,  285,  286,  265,   -1,   -1,   -1,
+  269,   -1,  271,  272,  273,  274,  275,  276,  277,  278,
+    0,   -1,  281,  282,  283,  284,  285,  286,  265,    0,
+   -1,   -1,  269,   -1,  271,  272,  273,  265,   -1,  276,
+  277,  269,   -1,  271,  281,  282,  283,  284,  285,  286,
+   -1,  265,   -1,   -1,   -1,  269,   -1,  271,  272,  273,
+   -1,   -1,  276,  277,   -1,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  265,   -1,   -1,   -1,  269,   -1,  271,
+  272,  273,   -1,   -1,  276,  277,   -1,   -1,   -1,  281,
+  282,  283,  284,  285,  286,   -1,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  265,   -1,   -1,   -1,  269,   -1,  271,
+  272,  273,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
+  282,  283,  284,  285,  286,   -1,   -1,   -1,   -1,   -1,
+   -1,  265,   -1,   -1,   -1,  269,   -1,  271,  272,  273,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,  283,
+  284,  285,  286,  265,   -1,   -1,   -1,  269,   -1,  271,
+  272,  273,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
+  282,  283,  284,  285,  286,  265,   -1,   -1,   -1,  269,
+   -1,  271,  272,  273,   -1,   -1,   -1,   -1,   -1,   -1,
+   -1,  281,  282,  283,  284,  285,  286,  265,   -1,   -1,
+   -1,  269,   -1,  271,  272,  273,   -1,   -1,   -1,   -1,
+   -1,   -1,   -1,  281,  282,  283,  284,  285,  286,  265,
+   -1,   -1,   -1,  269,   -1,  271,  272,  273,   -1,   -1,
+   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,   -1,   -1,
+   -1,  265,   -1,   -1,   -1,  269,   -1,  271,  272,  273,
+   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,  282,   -1,
+   -1,   -1,   -1,  265,   -1,   -1,   -1,  269,   -1,  271,
+  272,  273,   -1,   -1,   -1,   -1,   -1,   -1,   -1,  281,
+  282,   -1,   -1,   -1,   -1,  265,   -1,   -1,   -1,  269,
+   -1,  271,  272,  273,  265,   -1,   -1,   -1,  269,   -1,
+  271,   -1,  273,
+  };
+
+					// line 396 "Parser.jay"
+	}
+					// line 929 "-"
+namespace yydebug {
+        using System;
+	 public interface yyDebug {
+		 void push (int state, Object value);
+		 void lex (int state, int token, string name, Object value);
+		 void shift (int from, int to, int errorFlag);
+		 void pop (int state);
+		 void discard (int state, int token, string name, Object value);
+		 void reduce (int from, int to, int rule, string text, int len);
+		 void shift (int from, int to);
+		 void accept (Object value);
+		 void error (string message);
+		 void reject ();
+	 }
+	 
+	 class yyDebugSimple : yyDebug {
+		 void println (string s){
+			 Console.WriteLine (s);
+		 }
+		 
+		 public void push (int state, Object value) {
+			 println ("push\tstate "+state+"\tvalue "+value);
+		 }
+		 
+		 public void lex (int state, int token, string name, Object value) {
+			 println("lex\tstate "+state+"\treading "+name+"\tvalue "+value);
+		 }
+		 
+		 public void shift (int from, int to, int errorFlag) {
+			 switch (errorFlag) {
+			 default:				// normally
+				 println("shift\tfrom state "+from+" to "+to);
+				 break;
+			 case 0: case 1: case 2:		// in error recovery
+				 println("shift\tfrom state "+from+" to "+to
+					     +"\t"+errorFlag+" left to recover");
+				 break;
+			 case 3:				// normally
+				 println("shift\tfrom state "+from+" to "+to+"\ton error");
+				 break;
+			 }
+		 }
+		 
+		 public void pop (int state) {
+			 println("pop\tstate "+state+"\ton error");
+		 }
+		 
+		 public void discard (int state, int token, string name, Object value) {
+			 println("discard\tstate "+state+"\ttoken "+name+"\tvalue "+value);
+		 }
+		 
+		 public void reduce (int from, int to, int rule, string text, int len) {
+			 println("reduce\tstate "+from+"\tuncover "+to
+				     +"\trule ("+rule+") "+text);
+		 }
+		 
+		 public void shift (int from, int to) {
+			 println("goto\tfrom state "+from+" to "+to);
+		 }
+		 
+		 public void accept (Object value) {
+			 println("accept\tvalue "+value);
+		 }
+		 
+		 public void error (string message) {
+			 println("error\t"+message);
+		 }
+		 
+		 public void reject () {
+			 println("reject");
+		 }
+		 
+	 }
+}
+// %token constants
+ class Token {
+  public const int ERROR = 257;
+  public const int EOF = 258;
+  public const int SLASH = 259;
+  public const int SLASH2 = 260;
+  public const int DOT = 261;
+  public const int DOT2 = 262;
+  public const int COLON = 263;
+  public const int COLON2 = 264;
+  public const int COMMA = 265;
+  public const int AT = 266;
+  public const int FUNCTION_NAME = 267;
+  public const int BRACKET_OPEN = 268;
+  public const int BRACKET_CLOSE = 269;
+  public const int PAREN_OPEN = 270;
+  public const int PAREN_CLOSE = 271;
+  public const int AND = 272;
+  public const int OR = 273;
+  public const int DIV = 274;
+  public const int MOD = 275;
+  public const int PLUS = 276;
+  public const int MINUS = 277;
+  public const int ASTERISK = 278;
+  public const int DOLLAR = 279;
+  public const int BAR = 280;
+  public const int EQ = 281;
+  public const int NE = 282;
+  public const int LE = 283;
+  public const int GE = 284;
+  public const int LT = 285;
+  public const int GT = 286;
+  public const int ANCESTOR = 287;
+  public const int ANCESTOR_OR_SELF = 288;
+  public const int ATTRIBUTE = 289;
+  public const int CHILD = 290;
+  public const int DESCENDANT = 291;
+  public const int DESCENDANT_OR_SELF = 292;
+  public const int FOLLOWING = 293;
+  public const int FOLLOWING_SIBLING = 294;
+  public const int NAMESPACE = 295;
+  public const int PARENT = 296;
+  public const int PRECEDING = 297;
+  public const int PRECEDING_SIBLING = 298;
+  public const int SELF = 299;
+  public const int COMMENT = 300;
+  public const int TEXT = 301;
+  public const int PROCESSING_INSTRUCTION = 302;
+  public const int NODE = 303;
+  public const int NUMBER = 304;
+  public const int LITERAL = 305;
+  public const int NCName = 306;
+  public const int yyErrorCode = 256;
+ }
+ namespace yyParser {
+  using System;
+  /** thrown for irrecoverable syntax errors and stack overflow.
+    */
+  public class yyException : System.Exception {
+    public yyException (string message) : base (message) {
+    }
+  }
+
+  /** must be implemented by a scanner object to supply input to the parser.
+    */
+  public interface yyInput {
+    /** move on to next token.
+        @return false if positioned beyond tokens.
+        @throws IOException on input error.
+      */
+    bool advance (); // throws java.io.IOException;
+    /** classifies current token.
+        Should not be called if advance() returned false.
+        @return current %token or single character.
+      */
+    int token ();
+    /** associated with current token.
+        Should not be called if advance() returned false.
+        @return value for token().
+      */
+    Object value ();
+  }
+ }
+} // close outermost namespace, that MUST HAVE BEEN opened in the prolog
diff --git a/mcs/class/System.XML/System.Xml.XPath/Parser.jay b/mcs/class/System.XML/System.Xml.XPath/Parser.jay
new file mode 100644
index 00000000000..5c3906d19fc
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/Parser.jay
@@ -0,0 +1,391 @@
+%{
+// XPath parser
+//
+// Author - Piers Haken <piersh@friskit.com>
+//
+
+// TODO: FUNCTION_CALL should be a QName, not just a NCName
+// TODO: PROCESSING_INSTRUCTION's optional parameter
+// TODO: flatten argument/predicate lists in place
+
+using System;
+using System.Xml.XPath;
+using Test.Xml.XPath;
+
+namespace Mono.Xml.XPath
+{
+	public class XPathParser
+	{
+		internal object yyparseDebug (Tokenizer tok)
+		{
+			return yyparse (tok, new yydebug.yyDebugSimple ());
+		}
+
+%}
+
+%token ERROR
+%token EOF
+
+%token SLASH
+%token SLASH2
+%token DOT
+%token DOT2
+%token COLON
+%token COLON2
+%token COMMA
+%token AT
+
+%token FUNCTION_NAME
+
+%token BRACKET_OPEN
+%token BRACKET_CLOSE
+%token PAREN_OPEN
+%token PAREN_CLOSE
+
+%token AND
+%token OR
+%token DIV
+%token MOD
+%token PLUS
+%token MINUS
+%token ASTERISK
+%token DOLLAR
+%token BAR
+%token EQ
+%token NE
+%token LE
+%token GE
+%token LT
+%token GT
+
+%token ANCESTOR
+%token ANCESTOR_OR_SELF
+%token ATTRIBUTE
+%token CHILD
+%token DESCENDANT
+%token DESCENDANT_OR_SELF
+%token FOLLOWING
+%token FOLLOWING_SIBLING
+%token NAMESPACE
+%token PARENT
+%token PRECEDING
+%token PRECEDING_SIBLING
+%token SELF
+
+%token COMMENT
+%token TEXT
+%token PROCESSING_INSTRUCTION
+%token NODE
+
+%token NUMBER
+%token LITERAL
+%token NCName
+
+
+%start Expr
+
+
+%left AND
+%left OR
+%left EQ
+%left NE
+%left LE
+%left GE
+%left LT
+%left GT
+
+%left DIV
+%left MOD
+%left PLUS
+%left MINUS
+
+%%
+
+
+Expr
+	: OrExpr
+	;
+	
+OrExpr
+	: AndExpr 
+	| OrExpr OR AndExpr
+	{
+		$$ = new ExprOR ((Expression) $1, (Expression) $3);
+	}
+	;
+
+AndExpr
+	: EqualityExpr 
+	| AndExpr AND EqualityExpr 
+	{
+		$$ = new ExprAND ((Expression) $1, (Expression) $3);
+	}
+	;
+
+EqualityExpr
+	: RelationalExpr 
+	| EqualityExpr EQ RelationalExpr 
+	{
+		$$ = new ExprEQ ((Expression) $1, (Expression) $3);
+	}
+	| EqualityExpr NE RelationalExpr 
+	{
+		$$ = new ExprNE ((Expression) $1, (Expression) $3);
+	}
+	;
+
+RelationalExpr
+	: AdditiveExpr 
+	| RelationalExpr LT AdditiveExpr 
+	{
+		$$ = new ExprLT ((Expression) $1, (Expression) $3);
+	}
+	| RelationalExpr GT AdditiveExpr 
+	{
+		$$ = new ExprGT ((Expression) $1, (Expression) $3);
+	}
+	| RelationalExpr LE AdditiveExpr 
+	{
+		$$ = new ExprLE ((Expression) $1, (Expression) $3);
+	}
+	| RelationalExpr GE AdditiveExpr 
+	{
+		$$ = new ExprGE ((Expression) $1, (Expression) $3);
+	}
+	;
+
+AdditiveExpr
+	: MultiplicativeExpr 
+	| AdditiveExpr PLUS MultiplicativeExpr
+	{
+		$$ = new ExprPLUS ((Expression) $1, (Expression) $3);
+	}
+	| AdditiveExpr MINUS MultiplicativeExpr
+	{
+		$$ = new ExprMINUS ((Expression) $1, (Expression) $3);
+	}
+	;
+
+MultiplicativeExpr
+	: UnaryExpr 
+	| MultiplicativeExpr ASTERISK UnaryExpr 
+	{
+		$$ = new ExprMULT ((Expression) $1, (Expression) $3);
+	}
+	| MultiplicativeExpr DIV UnaryExpr
+	{
+		$$ = new ExprDIV ((Expression) $1, (Expression) $3);
+	}
+	| MultiplicativeExpr MOD UnaryExpr
+	{
+		$$ = new ExprMOD ((Expression) $1, (Expression) $3);
+	}
+	;
+
+UnaryExpr
+	: UnionExpr 
+	| MINUS UnaryExpr 
+	{
+		$$ = new ExprNEG ((Expression) $2);
+	}
+	;
+
+UnionExpr
+	: PathExpr 
+	| UnionExpr BAR PathExpr
+	{
+		$$ = new ExprUNION ((NodeSet) $1, (NodeSet) $3);
+	}
+	;
+
+PathExpr
+	: RelativeLocationPath
+	| SLASH
+	{
+		$$ = new ExprRoot ();
+	}
+	| SLASH RelativeLocationPath
+	{
+		$$ = new ExprSLASH (new ExprRoot (), (NodeSet) $2);
+	}
+	| SLASH2 RelativeLocationPath 
+	{
+		ExprStep exprStep = new ExprStep (new NodeTypeTest (Axes.DescendantOrSelf, XPathNodeType.All));
+		$$ = new ExprSLASH (new ExprSLASH (new ExprRoot (), exprStep), (NodeSet) $2);
+	}
+	| FilterExpr 
+	| FilterExpr SLASH RelativeLocationPath
+	{
+		$$ = new ExprSLASH ((NodeSet) $1, (NodeSet) $3);
+	}
+	| FilterExpr SLASH2 RelativeLocationPath
+	{
+		ExprStep exprStep = new ExprStep (new NodeTypeTest (Axes.DescendantOrSelf, XPathNodeType.All));
+		$$ = new ExprSLASH (new ExprSLASH ((NodeSet) $1, exprStep), (NodeSet) $3);
+	}
+	;
+
+RelativeLocationPath
+	: Step
+	| RelativeLocationPath SLASH Step 
+	{
+		$$ = new ExprSLASH ((NodeSet) $1, (NodeSet) $3);
+	}
+	| RelativeLocationPath SLASH2 Step 
+	{
+		ExprStep exprStep = new ExprStep (new NodeTypeTest (Axes.DescendantOrSelf, XPathNodeType.All));
+		$$ = new ExprSLASH (new ExprSLASH ((NodeSet) $1, exprStep), (NodeSet) $3);
+	}
+	;
+
+Step
+	: AxisSpecifier QName ZeroOrMorePredicates
+	{
+		$$ = new ExprStep (new NodeNameTest ((Axes) $1, (QName) $2), (ExprPredicates) $3);
+	}
+	| AxisSpecifier ASTERISK ZeroOrMorePredicates
+	{
+		$$ = new ExprStep (new NodeTypeTest ((Axes) $1), (ExprPredicates) $3);
+	}
+	| AxisSpecifier NodeType PAREN_OPEN OptionalLiteral PAREN_CLOSE ZeroOrMorePredicates
+	{
+		$$ = new ExprStep (new NodeTypeTest ((Axes) $1, (XPathNodeType) $2, (String) $4), (ExprPredicates) $6);
+	}
+	| DOT
+	{
+		$$ = new ExprStep (new NodeTypeTest (Axes.Self, XPathNodeType.All));
+	}
+	| DOT2
+	{
+		$$ = new ExprStep (new NodeTypeTest (Axes.Parent, XPathNodeType.All));
+	}
+	;
+
+AxisSpecifier
+	: /* empty */
+	{
+		$$ = Axes.Child;
+	}
+	| AT
+	{
+		$$ = Axes.Attribute;
+	}
+	| AxisName COLON2
+	{
+		$$ = $1;
+	}
+	;
+
+NodeType
+	: COMMENT					{ $$ = XPathNodeType.Comment; }
+	| TEXT						{ $$ = XPathNodeType.Text; }
+	| PROCESSING_INSTRUCTION	{ $$ = XPathNodeType.ProcessingInstruction; }
+	| NODE						{ $$ = XPathNodeType.All; }
+	;
+
+
+FilterExpr
+	: PrimaryExpr 
+	| FilterExpr Predicate 
+	{
+		$$ = new ExprFilter ((Expression) $1, (Expression) $2);
+	}
+	;
+
+PrimaryExpr
+	: DOLLAR QName
+	{
+		$$ = new ExprVariable ((QName) $2);
+	} 
+	| PAREN_OPEN Expr PAREN_CLOSE
+	{
+		$$ = $2;
+	}
+	| LITERAL
+	{
+		$$ = new ExprLiteral ((String) $1);
+	}
+	| NUMBER
+	{
+		$$ = new ExprNumber ((double) $1);
+	}
+	| FunctionCall
+	;
+
+FunctionCall
+	: FUNCTION_NAME PAREN_OPEN OptionalArgumentList PAREN_CLOSE
+	{
+		$$ = new ExprFunctionCall ((String) $1, (FunctionArguments) $3);
+	}
+	;
+
+OptionalArgumentList
+	: /* empty */
+	| Expr OptionalArgumentListTail
+	{
+		$$ = new FunctionArguments ((Expression) $1, (FunctionArguments) $2);
+	}
+	;
+
+OptionalArgumentListTail
+	: /* empty */
+	| COMMA Expr OptionalArgumentListTail
+	{
+		$$ = new FunctionArguments ((Expression) $2, (FunctionArguments) $3);
+	}
+	;
+
+
+ZeroOrMorePredicates
+	: /* empty */
+	| Predicate ZeroOrMorePredicates
+	{
+		$$ = new ExprPredicates ((Expression) $1, (ExprPredicates) $2);
+	}
+	;
+
+Predicate
+	: BRACKET_OPEN Expr BRACKET_CLOSE
+	{
+		$$ = $2;
+	}
+	;
+
+AxisName
+	: ANCESTOR				{ $$ = Axes.Ancestor; }
+	| ANCESTOR_OR_SELF		{ $$ = Axes.AncestorOrSelf; }
+	| ATTRIBUTE				{ $$ = Axes.Attribute; }
+	| CHILD					{ $$ = Axes.Child; }
+	| DESCENDANT			{ $$ = Axes.Descendant; }
+	| DESCENDANT_OR_SELF	{ $$ = Axes.DescendantOrSelf; }
+	| FOLLOWING				{ $$ = Axes.Following; }
+	| FOLLOWING_SIBLING		{ $$ = Axes.FollowingSibling; }
+	| NAMESPACE				{ $$ = Axes.Namespace; }
+	| PARENT				{ $$ = Axes.Parent; }
+	| PRECEDING				{ $$ = Axes.Preceding; }
+	| PRECEDING_SIBLING		{ $$ = Axes.PrecedingSibling; }
+	| SELF					{ $$ = Axes.Self; }
+	;
+
+OptionalLiteral
+	: /* empty */
+	| LITERAL
+	;
+
+QName
+	: NCName
+	{
+		$$ = new NCName ((String) $1);
+	}
+	| NCName COLON ASTERISK
+	{
+		$$ = new QName ((String) $1, null);
+	}
+	| NCName COLON NCName
+	{
+		$$ = new QName ((String) $1, (String) $3);
+	}
+	;
+
+%%
+	}
diff --git a/mcs/class/System.XML/System.Xml.XPath/Tokenizer.cs b/mcs/class/System.XML/System.Xml.XPath/Tokenizer.cs
new file mode 100644
index 00000000000..990fb18509f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/Tokenizer.cs
@@ -0,0 +1,334 @@
+//
+// System.Xml.XPath.Tokenizer
+//
+// Author:
+//   Piers Haken (piersh@friskit.com)
+//
+// (C) 2002 Piers Haken
+//
+using System;
+using System.IO;
+using System.Text;
+using System.Collections;
+using Mono.Xml.XPath;
+using Mono.Xml.XPath.yyParser;
+
+namespace System.Xml.XPath
+{
+	internal class Tokenizer : Mono.Xml.XPath.yyParser.yyInput
+	{
+		private char [] m_rgchInput;
+		private int m_ich;
+		private int m_cch;
+//		private System.IO.StreamReader m_input;
+		private int m_iToken;
+		private Object m_objToken;
+		private static Hashtable m_mapTokens = new Hashtable ();
+		private static readonly Object [] rgTokenMap =
+		{
+		   Token.AND, "and",
+		   Token.OR, "or",
+		   Token.DIV, "div",
+		   Token.MOD, "mod",
+		   Token.ANCESTOR, "ancestor",
+		   Token.ANCESTOR_OR_SELF, "ancestor-or-self",
+		   Token.ATTRIBUTE, "attribute",
+		   Token.CHILD, "child",
+		   Token.DESCENDANT, "descendant",
+		   Token.DESCENDANT_OR_SELF, "descendant-or-self",
+		   Token.FOLLOWING, "following",
+		   Token.FOLLOWING_SIBLING, "following-sibling",
+		   Token.NAMESPACE, "namespace",
+		   Token.PARENT, "parent",
+		   Token.PRECEDING, "preceding",
+		   Token.PRECEDING_SIBLING, "preceding-sibling",
+		   Token.SELF, "self",
+		   Token.COMMENT, "comment",
+		   Token.TEXT, "text",
+		   Token.PROCESSING_INSTRUCTION, "processing-instruction",
+		   Token.NODE, "node",
+		};
+
+		static Tokenizer ()
+		{
+			for (int i = 0; i < rgTokenMap.Length; i += 2)
+				m_mapTokens.Add (rgTokenMap [i + 1], rgTokenMap [i]);
+		}
+
+		public Tokenizer (string strInput)
+		{
+			m_rgchInput = strInput.ToCharArray ();
+			m_ich = 0;
+			m_cch = strInput.Length;
+			SkipWhitespace ();
+		}
+
+		private int Peek ()
+		{
+			if (m_ich >= m_cch)
+				return -1;
+			return m_rgchInput [m_ich];
+		}
+
+		private int GetChar ()
+		{
+			if (m_ich >= m_cch)
+				return -1;
+			return m_rgchInput [m_ich++];
+		}
+
+		private void SkipWhitespace ()
+		{
+			while (IsWhitespace (Peek ()))
+				GetChar ();
+		}
+
+		[MonoTODO]
+		private int ParseNumber ()
+		{
+			StringBuilder sb = new StringBuilder ();
+
+			while (IsDigit (Peek ()))
+				sb.Append ((char) GetChar ());
+
+			// TODO: doesn't handle '3.' error case
+			if (Peek () == '.')
+			{
+				sb.Append ((char) GetChar ());
+				while (IsDigit (Peek ()))
+					sb.Append ((char) GetChar ());
+			}
+			m_objToken = Double.Parse (sb.ToString ());
+			return Token.NUMBER;
+		}
+
+		private int ParseLiteral ()
+		{
+			StringBuilder sb = new StringBuilder ();
+
+			int chInit = GetChar ();
+			int ch;
+			while ((ch = Peek ()) != chInit)
+			{
+				if (ch == -1)
+					return Token.ERROR;
+				sb.Append ((char) GetChar ());
+			}
+			GetChar ();
+			m_objToken = sb.ToString ();
+			return Token.LITERAL;
+		}
+
+		private int ParseIdentifier ()
+		{
+			StringBuilder sb = new StringBuilder ();
+
+			while (true)
+			{
+				int ch = Peek ();
+				if (ch == '_' || ch == '-' ||
+						(ch >= 'a' && ch <= 'z') ||
+						(ch >= 'A' && ch <= 'Z'))
+				{
+					sb.Append ((char) GetChar ());
+				}
+				else
+					break;
+			}
+			String strToken = sb.ToString ();
+			Object objToken = m_mapTokens [strToken];
+			if (objToken != null)
+			{
+				return (int) objToken;
+			}
+			else
+			{
+				m_objToken = strToken;
+
+				SkipWhitespace ();
+				if (Peek () == '(')					
+					return Token.FUNCTION_NAME;
+				return Token.NCName;
+			}
+		}
+
+		private static bool IsWhitespace (int ch)
+		{
+			return (ch == ' ' || ch == '\t' || ch == '\n' || ch == '\r');
+		}
+
+		private static bool IsDigit (int ch)
+		{
+			return ch >= '0' && ch <= '9';
+		}
+
+
+		int ParseToken ()
+		{
+			switch (Peek ())
+			{
+				case -1:
+					return Token.EOF;
+
+				case '/':
+					GetChar ();
+					if (Peek () == '/')
+					{
+						GetChar ();
+						return Token.SLASH2;
+					}
+					return Token.SLASH;
+
+				case '.':
+					GetChar ();
+					if (Peek () == '.')
+					{
+						GetChar ();
+						return Token.DOT2;
+					}
+					else if (Peek () >= '0' && Peek () <= '9')
+					{
+						return ParseNumber ();
+					}
+					return Token.DOT;
+
+				case ':':
+					GetChar ();
+					if (Peek () == ':')
+					{
+						GetChar ();
+						return Token.COLON2;
+					}
+					return Token.COLON;
+
+				case ',':
+					GetChar ();
+					return Token.COMMA;
+
+				case '@':
+					GetChar ();
+					return Token.AT;
+
+				case '[':
+					GetChar ();
+					return Token.BRACKET_OPEN;
+
+				case ']':
+					GetChar ();
+					return Token.BRACKET_CLOSE;
+
+				case '(':
+					GetChar ();
+					return Token.PAREN_OPEN;
+
+				case ')':
+					GetChar ();
+					return Token.PAREN_CLOSE;
+
+				case '+':
+					GetChar ();
+					return Token.PLUS;
+
+				case '-':
+					GetChar ();
+					return Token.MINUS;
+
+				case '*':
+					GetChar ();
+					return Token.ASTERISK;
+
+				case '$':
+					GetChar ();
+					return Token.DOLLAR;
+
+				case '|':
+					GetChar ();
+					return Token.BAR;
+
+				case '=':
+					GetChar ();
+					return Token.EQ;
+
+				case '!':
+					GetChar ();
+					if (Peek () == '=')
+					{
+						GetChar ();
+						return Token.NE;
+					}
+					break;
+
+				case '>':
+					GetChar ();
+					if (Peek () == '=')
+					{
+						GetChar ();
+						return Token.GE;
+					}
+					return Token.GT;
+
+				case '<':
+					GetChar ();
+					if (Peek () == '=')
+					{
+						GetChar ();
+						return Token.LE;
+					}
+					return Token.LT;
+
+				case '\'':
+					return ParseLiteral ();
+
+				case '\"':
+					return ParseLiteral ();
+
+				default:
+					{
+						if (IsDigit (Peek ()))
+						{
+							return ParseNumber ();
+						}
+						else
+						{
+							return ParseIdentifier ();
+						}
+					}
+			}
+			return Token.ERROR;
+		}
+
+		///////////////////////////
+		// yyParser.yyInput methods
+		///////////////////////////
+
+		/** move on to next token.
+		  @return false if positioned beyond tokens.
+		  @throws IOException on input error.
+		  */
+		public bool advance ()
+		{
+			m_objToken = null;
+			m_iToken = ParseToken ();
+			SkipWhitespace ();
+			return (m_iToken != Token.EOF);
+		}
+
+		/** classifies current token.
+		  Should not be called if advance() returned false.
+		  @return current %token or single character.
+		  */
+		public int token ()
+		{
+			return m_iToken;
+		}
+
+		/** associated with current token.
+		  Should not be called if advance() returned false.
+		  @return value for token().
+		  */
+		public Object value ()
+		{
+			return m_objToken;
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathDocument.cs b/mcs/class/System.XML/System.Xml.XPath/XPathDocument.cs
new file mode 100644
index 00000000000..a48f9473ca5
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathDocument.cs
@@ -0,0 +1,68 @@
+//
+// System.Xml.XPath.XPathDocument
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System.IO;
+using System.Xml;
+
+namespace System.Xml.XPath
+{
+	[MonoTODO]
+	public class XPathDocument : IXPathNavigable
+	{
+		XmlDocument _doc = new XmlDocument ();
+
+#region Constructors
+
+		public XPathDocument (Stream stream)
+		{
+			_doc.Load (stream);
+		}
+
+		public XPathDocument (string uri)
+		{
+			_doc.Load (uri);
+		}
+
+		public XPathDocument (TextReader reader)
+		{
+			_doc.Load (reader);
+		}
+
+		public XPathDocument (XmlReader reader)
+		{
+			_doc.Load (reader);
+		}
+
+		public XPathDocument (string uri, XmlSpace space)
+		{
+			if (space == XmlSpace.Preserve)
+				_doc.PreserveWhitespace = true;
+			_doc.Load (uri);
+		}
+
+		public XPathDocument (XmlReader reader, XmlSpace space)
+		{
+			if (space == XmlSpace.Preserve)
+				_doc.PreserveWhitespace = true;
+			_doc.Load (reader);
+		}
+
+#endregion
+
+#region Methods
+
+		public XPathNavigator CreateNavigator ()
+		{
+			return _doc.CreateNavigator ();
+		}
+
+#endregion
+	}
+}
+
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathException.cs b/mcs/class/System.XML/System.Xml.XPath/XPathException.cs
new file mode 100644
index 00000000000..4817111fd9b
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathException.cs
@@ -0,0 +1,57 @@
+//
+// System.Xml.XPath.XPathException
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Copyright 2002 Tim Coleman
+//
+
+using System.Runtime.Serialization;
+
+namespace System.Xml.XPath
+{
+	[Serializable]
+	public class XPathException : SystemException
+	{
+		#region Fields
+		
+		string message;
+
+		#endregion
+		
+		#region Constructors
+
+		[MonoTODO]
+		protected XPathException (SerializationInfo info, StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XPathException (string message, Exception innerException)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+
+		#region Properties
+		
+		public override string Message {
+			get { return message; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathExpression.cs b/mcs/class/System.XML/System.Xml.XPath/XPathExpression.cs
new file mode 100644
index 00000000000..4d525b36e02
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathExpression.cs
@@ -0,0 +1,50 @@
+//
+// System.Xml.XPath.XPathExpression
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System.Collections;
+
+namespace System.Xml.XPath
+{
+	public abstract class XPathExpression
+	{
+		#region Constructor
+
+		internal XPathExpression ()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public abstract string Expression { get; }
+
+		public abstract XPathResultType ReturnType { get; }
+
+		#endregion
+
+		#region Methods
+
+		public abstract void AddSort (object expr, IComparer comparer);
+
+		public abstract void AddSort (
+			object expr,
+			XmlSortOrder order,
+			XmlCaseOrder caseOrder,
+			string lang,
+			XmlDataType dataType
+		);
+
+		public abstract XPathExpression Clone ();
+
+		public abstract void SetContext (XmlNamespaceManager nsManager);
+		
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathNamespaceScope.cs b/mcs/class/System.XML/System.Xml.XPath/XPathNamespaceScope.cs
new file mode 100644
index 00000000000..34a55e92662
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathNamespaceScope.cs
@@ -0,0 +1,18 @@
+//
+// System.Xml.XPath.XPathNamespaceScope
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+namespace System.Xml.XPath
+{
+	public enum XPathNamespaceScope
+	{
+		All = 0,
+		ExcludeXml = 1,
+		Local =2,
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
new file mode 100644
index 00000000000..62887a3ed2c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathNavigator.cs
@@ -0,0 +1,261 @@
+//
+// System.Xml.XPath.XPathNavigator
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+using Mono.Xml.XPath;
+
+namespace System.Xml.XPath
+{
+	public abstract class XPathNavigator : ICloneable
+	{
+		#region Constructor
+
+		protected XPathNavigator ()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public abstract string BaseURI { get; }
+
+		public abstract bool HasAttributes { get; }
+
+		public abstract bool HasChildren { get; }
+
+		public abstract bool IsEmptyElement { get; }
+
+		public abstract string LocalName { get; }
+
+		public abstract string Name { get; }
+
+		public abstract string NamespaceURI { get; }
+
+		public abstract XmlNameTable NameTable { get; }
+
+		public abstract XPathNodeType NodeType { get; }
+
+		public abstract string Prefix { get; }
+
+		public abstract string Value { get; }
+
+		public abstract string XmlLang { get; }
+
+		#endregion
+
+		#region Methods
+
+		public abstract XPathNavigator Clone ();
+
+		[MonoTODO]
+		public virtual XmlNodeOrder ComparePosition (XPathNavigator nav)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual XPathExpression Compile (string xpath)
+		{
+			Tokenizer tokenizer = new Tokenizer (xpath);
+			XPathParser parser = new XPathParser ();
+			Expression expr = (Expression) parser.yyparse (tokenizer);
+//			Expression expr = (Expression) parser.yyparseDebug (tokenizer);
+			return new CompiledExpression (expr);
+		}
+
+		public virtual object Evaluate (string xpath)
+		{
+			return Evaluate (Compile (xpath));
+		}
+
+		public virtual object Evaluate (XPathExpression expr)
+		{
+			return Evaluate (expr, null);
+		}
+
+		public virtual object Evaluate (XPathExpression expr, XPathNodeIterator context)
+		{
+			if (context == null)
+				context = new SelfIterator (this, new DefaultContext ());
+			return ((CompiledExpression) expr).Evaluate ((BaseIterator) context);
+		}
+
+		public abstract string GetAttribute (string localName, string namespaceURI);
+
+		public abstract string GetNamespace (string name);
+		
+		object ICloneable.Clone ()
+		{
+			return Clone ();
+		}
+
+		public virtual bool IsDescendant (XPathNavigator nav)
+		{
+			if (nav != null)
+			{
+				nav = nav.Clone ();
+				while (nav.MoveToParent ())
+				{
+					if (IsSamePosition (nav))
+						return true;
+				}
+			}
+			return false;
+		}
+
+		public abstract bool IsSamePosition (XPathNavigator other);
+
+		public virtual bool Matches (string xpath)
+		{
+			return Matches (Compile (xpath));
+		}
+
+		public virtual bool Matches (XPathExpression expr)
+		{
+			XPathNodeIterator nodes = Select (expr);
+
+			while (nodes.MoveNext ()) {
+				if (IsSamePosition (nodes.Current))
+					return true;
+			}
+
+			XPathNavigator navigator = Clone ();
+
+			while (navigator.MoveToParent ()) {
+				nodes = navigator.Select (expr);
+
+				while (nodes.MoveNext ()) {
+					if (IsSamePosition (nodes.Current))
+						return true;
+				}
+			}
+
+			return false;
+		}
+
+		public abstract bool MoveTo (XPathNavigator other);
+
+		public abstract bool MoveToAttribute (string localName, string namespaceURI);
+
+		public abstract bool MoveToFirst ();
+
+		public abstract bool MoveToFirstAttribute ();
+
+		public abstract bool MoveToFirstChild ();
+
+		public bool MoveToFirstNamespace ()
+		{
+			return MoveToFirstNamespace (XPathNamespaceScope.All);
+		}
+
+		public abstract bool MoveToFirstNamespace (XPathNamespaceScope namespaceScope);
+
+		public abstract bool MoveToId (string id);
+
+		public abstract bool MoveToNamespace (string name);
+
+		public abstract bool MoveToNext ();
+
+		public abstract bool MoveToNextAttribute ();
+
+		public bool MoveToNextNamespace ()
+		{
+			return MoveToNextNamespace (XPathNamespaceScope.All);
+		}
+
+		public abstract bool MoveToNextNamespace (XPathNamespaceScope namespaceScope);
+
+		public abstract bool MoveToParent ();
+
+		public abstract bool MoveToPrevious ();
+
+		public abstract void MoveToRoot ();
+
+		public virtual XPathNodeIterator Select (string xpath)
+		{
+			return Select (Compile (xpath));
+		}
+
+		public virtual XPathNodeIterator Select (XPathExpression expr)
+		{
+			BaseIterator iter = new SelfIterator (this, new DefaultContext ());
+			return ((CompiledExpression) expr).EvaluateNodeSet (iter);
+		}
+
+		public virtual XPathNodeIterator SelectAncestors (XPathNodeType type, bool matchSelf)
+		{
+			Axes axis = (matchSelf) ? Axes.AncestorOrSelf : Axes.Ancestor;
+			NodeTest test = new NodeTypeTest (axis, type);
+			return SelectTest (test);
+		}
+
+		[MonoTODO]
+		public virtual XPathNodeIterator SelectAncestors (string name, string namespaceURI, bool matchSelf)
+		{
+			if (namespaceURI != null && namespaceURI != "")
+				throw new NotImplementedException ();
+
+			Axes axis = (matchSelf) ? Axes.AncestorOrSelf : Axes.Ancestor;
+			QName qname = new QName ("", name);
+			NodeTest test = new NodeNameTest (axis, qname);
+			return SelectTest (test);
+		}
+
+		public virtual XPathNodeIterator SelectChildren (XPathNodeType type)
+		{
+			NodeTest test = new NodeTypeTest (Axes.Child, type);
+			return SelectTest (test);
+		}
+
+		[MonoTODO]
+		public virtual XPathNodeIterator SelectChildren (string name, string namespaceURI)
+		{
+			if (namespaceURI != null && namespaceURI != "")
+				throw new NotImplementedException ();
+
+			Axes axis = Axes.Child;
+			QName qname = new QName ("", name);
+			NodeTest test = new NodeNameTest (axis, qname);
+			return SelectTest (test);
+		}
+
+		public virtual XPathNodeIterator SelectDescendants (XPathNodeType type, bool matchSelf)
+		{
+			Axes axis = (matchSelf) ? Axes.DescendantOrSelf : Axes.Descendant;
+			NodeTest test = new NodeTypeTest (axis, type);
+			return SelectTest (test);
+		}
+
+		[MonoTODO]
+		public virtual XPathNodeIterator SelectDescendants (string name, string namespaceURI, bool matchSelf)
+		{
+			if (namespaceURI != null && namespaceURI != "")
+				throw new NotImplementedException ();
+
+			Axes axis = (matchSelf) ? Axes.DescendantOrSelf : Axes.Descendant;
+			QName qname = new QName ("", name);
+			NodeTest test = new NodeNameTest (axis, qname);
+			return SelectTest (test);
+		}
+
+		internal XPathNodeIterator SelectTest (NodeTest test)
+		{
+			Expression expr = new ExprStep (test, null);
+			BaseIterator iter = new SelfIterator (this, new DefaultContext ());
+			return expr.EvaluateNodeSet (iter);
+		}
+
+		public override string ToString ()
+		{
+			return Value;
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathNodeIterator.cs b/mcs/class/System.XML/System.Xml.XPath/XPathNodeIterator.cs
new file mode 100644
index 00000000000..661b6564467
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathNodeIterator.cs
@@ -0,0 +1,63 @@
+//
+// System.Xml.XPath.XPathNodeIterator
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+
+namespace System.Xml.XPath
+{
+	public abstract class XPathNodeIterator : ICloneable
+	{
+		private int _count;
+
+		#region Constructor
+
+		protected XPathNodeIterator ()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public virtual int Count
+		{
+			get
+			{
+				if (_count == 0)
+				{
+					// compute and cache the count
+					XPathNodeIterator tmp = Clone ();
+					while (tmp.MoveNext ())
+						;
+					_count = tmp.CurrentPosition;
+				}
+				return _count;
+			}
+		}
+
+		public abstract XPathNavigator Current { get; }
+
+		public abstract int CurrentPosition { get; }
+
+		#endregion
+
+		#region Methods
+
+		public abstract XPathNodeIterator Clone ();
+
+		object ICloneable.Clone ()
+		{
+			return Clone ();
+		}
+
+		public abstract bool MoveNext ();
+		
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathNodeType.cs b/mcs/class/System.XML/System.Xml.XPath/XPathNodeType.cs
new file mode 100644
index 00000000000..22720f838be
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathNodeType.cs
@@ -0,0 +1,25 @@
+//
+// System.Xml.XPath.XPathNodeType
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+namespace System.Xml.XPath
+{
+	public enum XPathNodeType
+	{
+		Root = 0,
+		Element = 1,
+		Attribute = 2,
+		Namespace = 3,
+		Text = 4,
+		SignificantWhitespace = 5,
+		Whitespace = 6,
+		ProcessingInstruction = 7,
+		Comment = 8,
+		All = 9,
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/XPathResultType.cs b/mcs/class/System.XML/System.Xml.XPath/XPathResultType.cs
new file mode 100644
index 00000000000..82ab383a1e3
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XPathResultType.cs
@@ -0,0 +1,22 @@
+//
+// System.Xml.XPath.XPathResultType
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+namespace System.Xml.XPath
+{
+	public enum XPathResultType
+	{
+		Number = 0,
+		String = 1,
+		Boolean = 2,
+		NodeSet = 3,
+		Navigator = 1,
+		Any = 5,
+		Error = 6,
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/XmlCaseOrder.cs b/mcs/class/System.XML/System.Xml.XPath/XmlCaseOrder.cs
new file mode 100755
index 00000000000..6e841b7467c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XmlCaseOrder.cs
@@ -0,0 +1,33 @@
+// XmlCaseOrder.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:47:03 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Xml.XPath {
+
+
+	/// <summary>
+	/// </summary>
+	public enum XmlCaseOrder {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		UpperFirst = 1,
+
+		/// <summary>
+		/// </summary>
+		LowerFirst = 2,
+	} // XmlCaseOrder
+
+} // System.Xml
diff --git a/mcs/class/System.XML/System.Xml.XPath/XmlDataType.cs b/mcs/class/System.XML/System.Xml.XPath/XmlDataType.cs
new file mode 100644
index 00000000000..4b8c8ea44ae
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XmlDataType.cs
@@ -0,0 +1,17 @@
+//
+// System.Xml.XPath.XmlDataType
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+namespace System.Xml.XPath
+{
+	public enum XmlDataType
+	{
+		Text = 1,
+		Number = 2,
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.XPath/XmlSortOrder.cs b/mcs/class/System.XML/System.Xml.XPath/XmlSortOrder.cs
new file mode 100644
index 00000000000..925aa15cd6c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.XPath/XmlSortOrder.cs
@@ -0,0 +1,17 @@
+//
+// System.Xml.XPath.XmlSortOrder
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+namespace System.Xml.XPath
+{
+	public enum XmlSortOrder
+	{
+		Ascending = 1,
+		Descending = 2,
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml.Xsl/ChangeLog b/mcs/class/System.XML/System.Xml.Xsl/ChangeLog
new file mode 100644
index 00000000000..4043d3a0744
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Xsl/ChangeLog
@@ -0,0 +1,4 @@
+2002-06-23  Piers Haken <piersh@friskit.com>
+	
+	* XsltContext.cs: added 'PreserveWhitespace' abstract method
+
diff --git a/mcs/class/System.XML/System.Xml.Xsl/IXsltContextFunction.cs b/mcs/class/System.XML/System.Xml.Xsl/IXsltContextFunction.cs
new file mode 100644
index 00000000000..4f2dc25efd0
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Xsl/IXsltContextFunction.cs
@@ -0,0 +1,28 @@
+// System.Xml.Xsl.IXsltContextFunction

+//

+// Author: Tim Coleman <tim@timcoleman.com>

+// (C) Copyright 2002 Tim Coleman

+

+using System;

+using System.Xml.XPath;

+

+namespace System.Xml.Xsl

+{

+	public interface IXsltContextFunction

+	{

+		#region Properties

+

+		XPathResultType [] ArgTypes { get; }

+		int Maxargs { get; }

+		int Minargs { get; }

+		XPathResultType ReturnType { get; }

+

+		#endregion

+

+		#region Methods

+

+		object Invoke (XsltContext xsltContext, object [] args, XPathNavigator docContext);

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Xsl/IXsltContextVariable.cs b/mcs/class/System.XML/System.Xml.Xsl/IXsltContextVariable.cs
new file mode 100644
index 00000000000..f1b4aa0f3b9
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Xsl/IXsltContextVariable.cs
@@ -0,0 +1,27 @@
+// System.Xml.Xsl.IXsltContextVariable

+//

+// Author: Tim Coleman <tim@timcoleman.com>

+// (C) Copyright 2002 Tim Coleman

+

+using System;

+using System.Xml.XPath;

+

+namespace System.Xml.Xsl

+{

+	public interface IXsltContextVariable

+	{

+		#region Properties

+

+		bool IsLocal { get; }

+		bool IsParam { get; }

+		XPathResultType VariableType { get; }

+

+		#endregion

+

+		#region Methods

+

+		object Evaluate (XsltContext xsltContext);

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs b/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
new file mode 100644
index 00000000000..3aa0a8a9f7e
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Xsl/XslTransform.cs
@@ -0,0 +1,169 @@
+// System.Xml.Xsl.XslTransform

+//

+// Author: Tim Coleman <tim@timcoleman.com>

+// (C) Copyright 2002 Tim Coleman

+

+using System;

+using System.Xml.XPath;

+using System.IO;

+

+namespace System.Xml.Xsl

+{

+	public class XslTransform

+	{

+		#region Fields

+

+		XmlResolver xmlResolver;

+

+		#endregion

+

+		#region Constructors

+

+		[MonoTODO]

+		public XslTransform ()

+		{

+		}

+

+		#endregion

+

+		#region Properties

+

+		XmlResolver XmlResolver {

+			set { xmlResolver = value; }

+		}

+

+		#endregion

+

+		#region Methods

+

+		[MonoTODO]

+		// Loads the XSLT stylesheet contained in the IXPathNavigable.

+		public void Load (IXPathNavigable stylesheet)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Loads the XSLT stylesheet specified by a URL.

+		public void Load (string url)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Loads the XSLT stylesheet contained in the XmlReader

+		public void Load (XmlReader stylesheet)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Loads the XSLT stylesheet contained in the XPathNavigator

+		public void Load (XPathNavigator stylesheet)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Loads the XSLT stylesheet contained in the IXPathNavigable.

+		public void Load (IXPathNavigable stylesheet, XmlResolver resolver)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Loads the XSLT stylesheet specified by a URL.

+		public void Load (string url, XmlResolver resolver)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Loads the XSLT stylesheet contained in the XmlReader

+		public void Load (XmlReader stylesheet, XmlResolver resolver)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Loads the XSLT stylesheet contained in the XPathNavigator

+		public void Load (XPathNavigator stylesheet, XmlResolver resolver)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Transforms the XML data in the IXPathNavigable using

+		// the specified args and outputs the result to an XmlReader.

+		public XmlReader Transform (IXPathNavigable input, XsltArgumentList args)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Transforms the XML data in the input file and outputs

+		// the result to an output file.

+		public void Transform (string inputfile, string outputfile)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Transforms the XML data in the XPathNavigator using

+		// the specified args and outputs the result to an XmlReader.

+		public XmlReader Transform (XPathNavigator input, XsltArgumentList args)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Transforms the XML data in the IXPathNavigable using

+		// the specified args and outputs the result to a Stream.

+		public void Transform (IXPathNavigable input, XsltArgumentList args, Stream output)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Transforms the XML data in the IXPathNavigable using

+		// the specified args and outputs the result to a TextWriter.

+		public void Transform (IXPathNavigable input, XsltArgumentList args, TextWriter output)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Transforms the XML data in the IXPathNavigable using

+		// the specified args and outputs the result to an XmlWriter.

+		public void Transform (IXPathNavigable input, XsltArgumentList args, XmlWriter output)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Transforms the XML data in the XPathNavigator using

+		// the specified args and outputs the result to a Stream.

+		public void Transform (XPathNavigator input, XsltArgumentList args, Stream output)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Transforms the XML data in the XPathNavigator using

+		// the specified args and outputs the result to a TextWriter.

+		public void Transform (XPathNavigator input, XsltArgumentList args, TextWriter output)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		// Transforms the XML data in the XPathNavigator using

+		// the specified args and outputs the result to an XmlWriter.

+		public void Transform (XPathNavigator input, XsltArgumentList args, XmlWriter output)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltArgumentList.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltArgumentList.cs
new file mode 100644
index 00000000000..e4ac3b138f0
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltArgumentList.cs
@@ -0,0 +1,131 @@
+// System.Xml.Xsl.XsltArgumentList

+//

+// Author: Tim Coleman <tim@timcoleman.com>

+// (C) Copyright 2002 Tim Coleman

+

+using System;

+using System.Collections;

+using System.Xml;

+using System.Xml.XPath;

+

+namespace System.Xml.Xsl

+{

+	public sealed class XsltArgumentList

+	{

+		#region Fields

+

+		private Hashtable extensionObjects;

+		private Hashtable parameters;

+

+		#endregion

+

+		#region Constructors

+

+		public XsltArgumentList ()

+		{

+			extensionObjects = new Hashtable ();

+			parameters = new Hashtable ();

+		}

+

+		#endregion

+

+		#region Methods

+

+		public void AddExtensionObject (string namespaceUri, object extension)

+		{

+			if (namespaceUri == null)

+				throw new ArgumentException ("The namespaceUri is a null reference.");

+			if (namespaceUri == "http://www.w3.org/1999/XSL/Transform")

+				throw new ArgumentException ("The namespaceUri is http://www.w3.org/1999/XSL/Transform.");

+			if (extensionObjects.Contains (namespaceUri))

+				throw new ArgumentException ("The namespaceUri already has an extension object associated with it.");

+

+			extensionObjects [namespaceUri] = extension;

+		}

+

+		public void AddParam (string name, string namespaceUri, object parameter)

+		{

+

+			if (namespaceUri == null)

+				throw new ArgumentException ("The namespaceUri is a null reference.");

+

+			if (namespaceUri == "http://www.w3.org/1999/XSL/Transform")

+				throw new ArgumentException ("The namespaceUri is http://www.w3.org/1999/XSL/Transform.");

+

+			if (name == null)

+				throw new ArgumentException ("The parameter name is a null reference.");

+

+

+			// TODO:

+			// verify that the name is a valid name according to

+			// the W3C XML specification

+

+			XmlQualifiedName qName = new XmlQualifiedName (name, namespaceUri);

+

+			if (parameters.Contains (qName))

+				throw new ArgumentException ("The namespaceUri already has a parameter associated with it.");

+

+			parameter = ValidateParam (parameter);

+

+			parameters [qName] = parameter;

+		}

+

+		public void Clear ()

+		{

+			extensionObjects.Clear ();

+			parameters.Clear ();

+		}

+

+		public object GetExtensionObject (string namespaceUri)

+		{

+			return extensionObjects [namespaceUri];

+		}

+

+		public object GetParam (string name, string namespaceUri)

+		{

+			if (name == null)

+				throw (new ArgumentException ("The parameter name is a null reference."));

+			if (namespaceUri == null)

+				throw (new ArgumentException ("The namespaceUri is a null reference."));

+

+			XmlQualifiedName qName = new XmlQualifiedName (name, namespaceUri);

+			return parameters [qName];

+		}

+

+		public object RemoveExtensionObject (string namespaceUri)

+		{

+			object extensionObject = this.GetExtensionObject (namespaceUri);

+			extensionObjects.Remove (namespaceUri);

+			return extensionObject;

+		}

+

+		public object RemoveParam (string name, string namespaceUri)

+		{

+			XmlQualifiedName qName = new XmlQualifiedName (name, namespaceUri);

+			object parameter = this.GetParam (name, namespaceUri);

+			parameters.Remove (qName);

+			return parameter;

+		}

+

+		private object ValidateParam (object parameter)

+		{

+			if (parameter is string)		return parameter;

+			if (parameter is bool)			return parameter;

+			if (parameter is double)		return parameter;

+			if (parameter is XPathNavigator)	return parameter;

+			if (parameter is XPathNodeIterator)	return parameter;

+

+			if (parameter is Int16)			return (double) parameter;

+			if (parameter is UInt16)		return (double) parameter;

+			if (parameter is Int32)			return (double) parameter;

+			if (parameter is Int64)			return (double) parameter;

+			if (parameter is UInt64)		return (double) parameter;

+			if (parameter is Single)		return (double) parameter;

+			if (parameter is decimal)		return (double) parameter;

+

+			return parameter.ToString ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltCompileException.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltCompileException.cs
new file mode 100644
index 00000000000..7cd4011b763
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltCompileException.cs
@@ -0,0 +1,56 @@
+// System.Xml.Xsl.XsltCompileException

+//

+// Author: Tim Coleman <tim@timcoleman.com>

+// (C) Copyright 2002 Tim Coleman

+

+using System;

+using System.Runtime.Serialization;

+

+namespace System.Xml.Xsl

+{

+	[Serializable]

+	public class XsltCompileException : XsltException

+	{

+		#region Fields

+

+		string message;

+

+		#endregion

+

+		#region Constructors

+

+		[MonoTODO]

+		protected XsltCompileException (SerializationInfo info, StreamingContext context )

+			: base (info, context)

+		{

+		}

+

+		[MonoTODO]

+		// I don't think this base() call is right, but what

+		// should the message be for XsltException?

+		public XsltCompileException (Exception inner, String sourceUri, int lineNumber, int linePosition)

+			: base (sourceUri, inner)

+		{

+		}

+

+

+		#endregion

+

+		#region Properties

+

+		public override string Message {

+			get { return message; }

+		}

+

+		#endregion

+

+		#region Methods

+

+		public override void GetObjectData (SerializationInfo info, StreamingContext context)

+		{

+			base.GetObjectData (info, context);

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs
new file mode 100644
index 00000000000..b47822ae7a3
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltContext.cs
@@ -0,0 +1,45 @@
+// System.Xml.Xsl.XsltContext

+//

+// Author: Tim Coleman <tim@timcoleman.com>

+// (C) Copyright 2002 Tim Coleman

+

+using System;

+using System.Xml;

+using System.Xml.XPath;

+

+namespace System.Xml.Xsl

+{

+	public abstract class XsltContext : XmlNamespaceManager

+	{

+		#region Constructors

+

+		// should this really be calling new NameTable() in the

+		// base() call?

+		public XsltContext ()

+			: base (new NameTable ())

+		{

+		}

+

+		public XsltContext (NameTable table)

+			: base (table)

+		{

+		}

+

+		#endregion

+

+		#region Properties

+

+		public abstract bool Whitespace { get; }

+		public abstract bool PreserveWhitespace (XPathNavigator nav);

+

+		#endregion

+

+		#region Methods

+

+		public abstract int CompareDocument (string baseUri, string nextbaseUri);

+		public abstract IXsltContextFunction ResolveFunction (string prefix, string name, XPathResultType [] ArgTypes);

+		public abstract IXsltContextVariable ResolveVariable (string prefix, string name);

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml.Xsl/XsltException.cs b/mcs/class/System.XML/System.Xml.Xsl/XsltException.cs
new file mode 100644
index 00000000000..29e6adad0b6
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml.Xsl/XsltException.cs
@@ -0,0 +1,72 @@
+// System.Xml.Xsl.XsltException

+//

+// Author: Tim Coleman <tim@timcoleman.com>

+// (C) Copyright 2002 Tim Coleman

+

+using System;

+using System.Runtime.Serialization;

+

+namespace System.Xml.Xsl

+{

+	[Serializable]

+	public class XsltException : SystemException

+	{

+		#region Fields

+

+		string message;

+		int lineNumber;

+		int linePosition;

+		string sourceUri;

+

+		#endregion

+

+		#region Constructors

+

+		public XsltException (string message, Exception innerException)

+			: base (message, innerException)

+		{

+			this.message = message;

+		}

+

+		protected XsltException (SerializationInfo info, StreamingContext context)

+		{

+			lineNumber = info.GetInt32 ("lineNumber");

+			linePosition = info.GetInt32 ("linePosition");

+			sourceUri = info.GetString ("sourceUri");

+		}

+

+		#endregion

+

+		#region Properties

+

+		public int LineNumber {

+			get { return lineNumber; }

+		}

+

+		public int LinePosition {

+			get { return linePosition; }

+		}

+

+		public override string Message {

+			get { return message; }

+		}

+

+		public string SourceUri {

+			get { return sourceUri; }

+		}

+

+		#endregion

+

+		#region Methods

+

+		public override void GetObjectData (SerializationInfo info, StreamingContext context)

+		{

+			base.GetObjectData (info, context);

+			info.AddValue ("lineNumber", lineNumber);

+			info.AddValue ("linePosition", linePosition);

+			info.AddValue ("sourceUri", sourceUri);

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/ChangeLog b/mcs/class/System.XML/System.Xml/ChangeLog
new file mode 100644
index 00000000000..a44fce96d1b
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/ChangeLog
@@ -0,0 +1,747 @@
+2002-08-22  Jason Diamond <jason@injektilo.org>
+
+	* XmlAttributeCollection.cs, XmlElement.cs: Implementation of RemoveAll
+	and RemoveAllAttributes courtesy of Matt Hunter <xrkune@tconl.com>.
+
+2002-08-22  Jason Diamond <jason@injektilo.org>
+
+	* XmlElement.cs: Correction to previous GetElementsByTagName patch
+	courtesy of Matt Hunter <xrkune@tconl.com>.
+
+2002-08-22  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocument.cs, XmlElement.cs: Added implementation of namepsace
+	qualified GetElementsByTagName courtesy of Matt Hunter 
+	<xrkune@tconl.com>.
+
+2002-08-19  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocument.cs, XmlElement.cs: Added implementation of 
+	GetElementsByTagName courtesy of Matt Hunter <xrkune@tconl.com>.
+
+2002-08-16  Jason Diamond <jason@injektilo.org>
+
+	* XmlElement.cs: Fixed writing out qualified elements courtesy of
+	Marcus Bürgel <marcus.buergel@gmx.de>.
+
+2002-08-13  Tim Coleman <tim@timcoleman.com>
+	* XmlTextWriter.cs:
+		Partial implementation of WriteQualifiedName ().
+
+2002-08-07  Kral Ferch <kral_ferch@hotmail.com>
+	* XmlCharacterData.cs:  Implemented AppendData(), DeleteData(),
+		InsertData(), and ReplaceData().  These methods fire the
+		NodeChanging and NodeChanged events.
+		
+	* XmlDocument.cs:  Fixed bugs in onNodeChanged() and onNodeChanging().
+	
+	* XmlNode.cs:  AppendChild() fires NodeInserting and NodeInserted events.
+		RemoveAll() and RemoveChild() fire NodeRemoving and NodeRemoved events.
+	
+2002-08-03  Tim Coleman <tim@timcoleman.com>
+	* XmlNamespaceManager.cs:
+		.Net allows the empty namespace to be redefined
+		at a later point, but the current implementation
+		did not.  This fixes a hashtable conflict.
+
+2002-07-26  Tim Coleman <tim@timcoleman.com>
+	* XmlTextWriter.cs:
+		When given a textwriter, check to see if it has a
+		null encoding. This was being done for other inputs
+		than a textwriter.
+
+Wed Jul 24 13:16:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* XmlTextReader.cs: rough line/column support.
+
+2002-07-23  Duncan Mak  <duncan@ximian.com>
+
+	* XmlConvert.cs: Implement the ToDateTime method. ToDateTime
+	(string, string []) is particularly strange.
+
+	* XmlException.cs: Remember to call the base serialization
+	constructor.
+
+	* XmlNodeReader.cs: Keep a new variable to store the Depth. 
+
+2002-07-14  Jason Diamond  <jason@injektilo.org>
+
+	* XmlAttribute.cs: Removed ownerElement field since we can reuse 
+	parentNode field.
+
+	* XmlDocumentNavigator.cs: MoveToParent now moves to the OwnerElement
+	if the current node is an attribute.
+
+	* XmlElement.cs: SetAttributeNode now sets the new attribute's
+	owner element.
+
+2002-07-12  Jason Diamond  <jason@injektilo.org>
+
+	* XmlDocument.cs: If null was passed in for prefix or namespaceURI when
+	creating an element, use String.Empty instead.
+
+2002-07-12	Piers Haken <piersh@friksit.com>
+
+	* XmlAttributeCollection.cs: implement some ItemOf indexers
+	* XmlNamedNodeMap.cs: add internal 'Nodes' accessor for the nodeList field
+	* XmlNode.cs: SelectNodes: return empty XmlNodeList, not null
+
+2002-07-06  Ajay kumar Dwivedi <adwiv@yahoo.com>
+
+	* XmlTextWriter: Fixed Indentation. IndentationOverridden should
+		not be set when inside a attribute.
+
+2002-07-06  Ajay kumar Dwivedi <adwiv@yahoo.com>
+
+	* XmlTextWriter: In WriteStartElement, if namespace is null and 
+		prefix is null|empty do not write out xmlns=""
+	
+	* XmlWriter: WriteStartElement calls the virtual method with null
+		argument instead of empty string.
+
+2002-07-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* XmlTextReader.cs: implemented .ctor (Stream).
+
+2002-06-26  Duncan Mak  <duncan@ximian.com>
+
+	* XmlNodeReader.cs: Implementation of most of the properties, and
+	some of the related methods. 
+
+2002-06-23  Piers Haken <piersh@friskit.com>
+	
+	* XmlDocumentNavigator.cs: implement Clone()
+	* XmlElement.cs: remove bogus unimplemented override of InnerText
+	* XmlNode.cs: implment SelectNodes/SelectSingleNode
+	* XmlNodeArrayList.cs: new support class for SelectNodes
+
+2002-06-21  Ajay kumar Dwivedi <adwiv@yahoo.com>
+	
+	* XmlQualifiedName: Name and Namespaces are never null. If null is passed
+		to the constructor, set them to empty strings.
+		Fixed the Operators.
+	
+2002-06-18  Ajay kumar Dwivedi <adwiv@yahoo.com>
+	
+	* XmlTextReader.cs: HasLineInfo returns false instead of throwing an
+	Exception.
+
+2002-06-14  Duncan Mak  <duncan@ximian.com>
+
+	* XmlConvert.cs: Added CLSCompliant attributes to methods.
+	
+2002-06-12  Duncan Mak  <duncan@ximian.com>
+
+	* XmlCharacterData.cs (Value): Throw an ArgumentException in the
+	set block if the node is read-only.
+
+2002-06-10  Ajay kumar Dwivedi <adwiv@yahoo.com>
+	* XmlConstruct.cs : New Internal class with Helper methods for
+	Checking XmlConstructs
+	* XmlConvert.cs: Implemented most of the methods
+
+2002-06-08  Duncan Mak  <duncan@ximian.com>	
+
+	* XmlDocument.cs (Load):
+	Added bits to Load (string) for BaseURI support.
+
+	* XmlAttribute.cs (BaseURI): 
+	* XmlDocument.cs (BaseURI): 
+	* XmlEntity.cs (BaseURI): Implemented.
+
+2002-05-27  Jason Diamond  <jason@injektilo.org>
+
+	* XmlDocumentNavigator.cs: Added file to directory.
+
+	* XmlNode.cs (CreateNavigator): Implemented.
+	(InnerText): Implemented.
+
+	* XmlDocument.cs (NamespaceURI, Prefix): Return String.Empty instead of
+	throwing exception.
+	(Load(XmlReader)): Allow for namespace qualified attributes.
+
+	* XmlElement.cs: Implemented GetAttribute(string, string) and both 
+	GetAttributeNode overloads.
+	(SetAttributeNode(XmlAttribute)): Implemented.
+
+	* XmlNamedNodeMap.cs: Fixed copy/paste bugs in GetNamedItem(string, string)
+	and RemoveNamedItem(string, string).
+
+	* XmlLinkedNode.cs (PreviousSibling): Implemented.
+
+	* XmlTextReader.cs: Added code to maintain the order of attributes as 
+	they're parsed. XML doesn't require this but Microsoft's parser does it and
+	matching them makes testing easier so now we have it, too.
+
+2002-05-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* XmlDocument.cs: Implement the Save methods.
+
+2002-05-08  Mike Kestner  <mkestner@speakeasy.net>
+
+	* XmlNamedNodeMap.cs (SetNamedItem): Fixed a copy/paste bug.
+
+2002-04-28  Duncan Mak  <duncan@ximian.com>
+
+	* XmlSignificantWhitespace.cs (Value):
+	* XmlWhitespace.cs (Value): Added MonoTODO to the 'set'
+	block. Added new private method, IsValidWhitespaceChar, for
+	checking.
+
+2002-04-16  Duncan Mak  <duncan@ximian.com>
+
+	* XmlParserContext.cs (NameTable): Fixed a typo in the set block.
+
+2002-04-12  Duncan Mak  <duncan@ximian.com>
+
+	* XmlAttribute.cs (Prefix): Added preliminary code for set block,
+	added comment on work that needs to be done here. A new MonoTODO item. 
+
+	* XmlDocument.cs (ctor): Corrected constructor signature, changed
+	parameter from 'NameTable' to 'XmlNameTable'.
+
+	* XmlDocumentFragment.cs (InnerXml): Added missing set block.
+
+	* XmlCaseOrder.cs: Moved to System.Xml.XPath.
+
+2002-04-10  Duncan Mak  <duncan@ximian.com>
+
+	* XmlNodeReader.cs: Initial stubs for the class.
+
+2002-04-08  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlAttributes.cs: InnerXml getter, WriteContentTo, and WriteTo
+	implementations.
+	
+	* XmlDeclaration.cs: WriteTo implementation.
+	
+	* XmlDocument.cs: InnerXml getter implementation.
+	
+	* XmlElement.cs: InnerXml getter implementation.
+
+	* XmlNode.cs: Removed MonoTODO attrib on OuterXml.
+	
+	* XmlSignificantWhitespace.cs: WriteTo implementation.
+	
+	* XmlText.cs: WriteContentTo and WriteTo implementation.
+	
+	* XmlTextWriter.cs: WriteRaw implementation.
+	
+	* XmlWhitespace.cs: WriteContentTo and WriteTo implementations.
+
+2002-04-05  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlAttributes.cs: Added reminder MonoTODO to set NamespaceURI
+	if prefix in constructor is one of the default ones.
+	
+	* XmlCharacterData.cs: Returns String.Empty for Value and Data
+	even when constructed with null.
+	
+	* XmlDeclaration.cs: Value doesn't put encoding or standalone
+	in if they are empty.
+	
+	* XmlDocument.cs: Implemented CreateNode methods and this caused
+	the changes in the other files in this checkin.
+	
+	* XmlProcessingInstruction.cs: Returns String.Empty for Value and Data
+	even when constructed with null.
+	
+	* XmlWhitespace.cs: Changed Value 'get' to return Data.
+
+2002-04-01  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlTextWriter.cs: Impls for WriteEndDocument and WriteFullEndElement.
+	
+2002-03-31  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlTextWriter.cs: Impls for LookupPrefix, WriteBase64,
+	and WriteCharEntity.
+	
+	* XmlWrite.cs:  Fixed bug where attribute namespace decl
+	was pushing a scope onto the namespace manager when it shouldn't
+	have been.
+	
+2002-03-31  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlTextWriter.cs: Some tweaks for WriteAttibuteString
+	in different states (no open start element, in WriteState.Content mode).
+	
+2002-03-29  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlTextWriter.cs: XmlLang and XmlSpace properties
+	and WriteWhitespace.
+	
+	* XmlTextWriterOpenElement.cs: scope support for XmlLang
+	and XmlSpace.
+
+2002-03-29  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlTextWriter.cs: Working on Attribute methods.
+	
+	* XmlWriter.cs: Working on Attribute methods.
+
+2002-03-28  Duncan Mak  <duncan@ximian.com>
+
+	* XmlDocument.cs (CreateWhitespace):
+	(CreateSignificantWhitespace): Removed extraneous call to the ToCharArray
+	method.
+
+	* XmlSignificantWhitespace.cs (Value): Removed MonoTODO attribute.
+
+2002-03-26  Duncan Mak  <duncan@ximian.com>
+
+	* XmlDocument.cs (CreateDocumentType): Implemented.
+
+	* XmlNode.cs (Value): Implemented.
+
+	* XmlProcessingInstruction.cs (InnerText): Implemented. It works just
+	like XmlCharacterData.
+
+	* XmlDeclaration.cs (CloneNode): 
+	* XmlDocument.cs (CreateXmlDeclaration): Added missing constructor
+	arguments.
+
+	* XmlCharacterData.cs (InnerText): Implemented. Funny that the
+	docs say it is the "The concatenated values of the node and all
+	the children of the node.". I wrote some test programs and
+	couldn't get any of the derived nodes to AppendChild. For now,
+	InnerText == Data == Value.
+	(Substring): Fixed typo.
+
+	* XmlDeclaration.cs (XmlDeclaration): Fixed the constructor parameter signature.
+
+	* XmlImplementation.cs (CreateDocument): Implemented.
+
+2002-03-25  Duncan Mak  <duncan@ximian.com>
+
+	* XmlDeclaration.cs: Rewrote the class, fixed formatting, added
+	missing properties (InnerText, Value).
+	
+	* XmlDocument.cs (CreateXmlDeclaration): Implemented.
+
+2002-03-23  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextWriter.cs: Impls for BaseStream and
+	Namespaces and WriteState.
+	
+	* XmlWriter.cs: WriteState and WriteStartElementInternal.
+
+2002-03-23  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlNodeListChildren.cs: made class internal
+	instead of public.  Shouldn't be visible outside
+	of System.Xml.
+	
+	* XmlTextWriter.cs: Implementations for Formatting,
+	IndentChar, Indenting, QuoteChar, WriteStartDocument(standalone).
+	Suppresses encoding on xml declaration if null stream passed in.
+	Formats output including suppressing indentation for elements in
+	mixed content mode.
+	
+	* XmlTextWriterOpenElement.cs: Initial checkin.
+	XmlTextWriter uses stack of these objects to track
+	state.
+	
+2002-03-22  Mike Kestner  <mkestner@speakeasy.net>
+
+	* XmlElement.cs: impl HasAttribute(string name).
+
+2002-03-22  Duncan Mak  <duncan@ximian.com>
+
+	* XmlElement.cs: Reformatted.
+	(CloneNode) Corrected.
+
+	* XmlDocument.cs (CreateWhitespace):
+	(CreateSignificantWhitespace): Implemented.
+
+	* XmlAttribute.cs (CloneNode): Changed the child's CloneNode to
+	true, because Attributes have ChildNodes.
+
+2002-03-21  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextWriter.cs: WriteStartDocument tracks state, writes out
+	xml declaration along with encoding.  WriteEndElement throws
+	exception if no WriteStartElement exists.
+
+2002-03-20  Duncan Mak  <duncan@ximian.com>
+
+	* XmlEntityReference.cs (CloneNode): Implemented.
+
+	* XmlException.cs (Message): Implemented. We need to cache the
+	message string because SystemException doesn't expose 'message'
+	from Exception.
+
+	* XmlText.cs (Value): Added in the missing Value property.
+
+2002-03-20  Duncan Mak  <duncan@ximian.com>	
+
+	* XmlAttribute.cs (CloneNode): Implemented.
+
+	* XmlDocumentFragment.cs (CloneNode): Implemented.
+
+	* XmlElement.cs (CloneNode): Implemented.
+
+2002-03-19  Duncan Mak  <duncan@ximian.com>
+
+	* XmlNotation.cs: Added to CVS.
+
+	* XmlAttribute.cs (CloneNode): First crack at the CloneNode method.
+
+	* XmlCDataSection.cs (CloneNode): Implemented.
+
+	* XmlDocumentFragment.cs: Reformatted and added the missing properties
+	(InnerXml, OwnerDocument, ParentNode).
+	(CloneNode): Implemented.
+
+	* XmlSignificantWhitespace.cs (CloneNode): Implemented.
+	(Value) Implemented the 'get' property.
+
+	* XmlWhitespace.cs (Module): implemented.
+
+2002-03-19  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocument.cs: Fixed typo in Load that was duplicating the LocalName
+	in the prefix.
+
+2002-03-18  Jason Diamond <jason@injektilo.org>
+
+	* XmlTextReader.cs: Don't restore properties after reading last
+	attribute on an element.
+
+	* XmlDocument.cs: Move back to element after reading attributes
+	so that IsEmptyElement test succeeds.
+
+2002-03-18  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlNamespaceManager.cs: Implemented LookupPrefix.
+	
+	* XmlTextWriter.cs: Implemented namespace and prefix support.
+
+2002-03-18  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextReader.cs: Restores properties after
+	reading last attribute on an element.
+	
+	* XmlNode.cs: AppendChild sets the parent
+	on the child.
+
+2002-03-17  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlCDataSection.cs: Formatting, Implementation for WriteTo.
+
+	* XmlComment.cs: Implementations for WriteTo and WriteContentTo.
+	
+	* XmlElement.cs: Fixed bug in WriteTo.
+	
+	* XmlProcessingInstruction.cs: Formatting.
+	
+	* XmlTextWriter.cs: Implementations for Close, WriteCData, WriteComment,
+	fixes for WriteEndElement, WriteProcessingInstruction.
+
+2002-03-17  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlDocument.cs: Implementations for WriteTo() and WriteContentTo(),
+	had Load() add PIs to the document, moved onXXX methods to alphabetical
+	order in the file.
+	
+	* XmlElement.cs: Implementations for WriteTo() and WriteContentTo().
+	
+	* XmlNode.cs: Implementations for InnerXml Get and OuterXml.
+	
+	* XmlProcessingInstruction.cs: Implementations for WriteTo() and
+	WriteContentTo().
+	
+	* XmlTextWriter.cs: Implementations for WriteEndElement,
+	WriteProcessingInstruction, WriteStartElement, and WriteString.
+	
+	* XmlWriter.cs: Implemented WriteStartElement() methods.
+
+2002-03-15  Duncan Mak  <duncan@ximian.com>
+
+	* XmlEntity.cs: Added to CVS. Need to implement BaseURI and
+	InnerText once I know what they do.
+
+	* XmlDocumentType.cs (XmlDocumentType): Fix the constructor now
+	that we can properly chain constructors.
+	(CloneNode): implemented.
+	(WriteContentTo): Removed MonoTODO attribute as this method has no
+	effect in this class.
+
+	* XmlProcessingInstruction.cs (Value): Added the missing Set
+	block.
+	(InnerText): Added in, but not implemented.
+
+2002-03-14  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlTextWriter.cs: implemented constructors and 
+	WriteCData and WriteComment.
+
+2002-03-14  Duncan Mak  <duncan@ximian.com>
+
+	* XmlDocument.cs: Moved the NodeChanged EventHandler to its own
+	file, and updated the callbacks to reflect the change.
+	(XmlDocument): Added the NameTable constructor.
+	(NameTable): Also the NameTable property.
+
+	* XmlNodeChangedEventHandler.cs: Added, replacing the version that
+	was in XmlDocument.cs. It has two arguments now (object,
+	EventArgs) , instead of one (object).
+
+2002-03-14  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlWriter.cs: Formatting.
+	
+	* XmlTextWriter.cs: Initial checkin.
+	
+2002-03-14  Duncan Mak  <duncan@ximian.com>
+
+	* Validation.cs: Removed, replaced by ValidationType.cs.
+
+	* ValidationType.cs: Added.
+
+2002-03-13  Duncan Mak  <duncan@ximian.com>
+
+	* XmlException.cs: Made it [Serializable], implemented good ol'
+	GetObjectData, and the serialization constructor.
+
+	* XmlNamedNodeMap.cs (SetNamedItem): Check for the Name property.
+	(SetNamedItem): Reverted (added back in) the patch with the
+	ReadOnly checks. "Don't doubt yourself, my son... you were right!"
+
+	* XmlNamedNodeMap.cs (GetEnumerator): piggyback on the ArrayList implementation.
+	(GetNamedItem (string, string)): implemented.
+	(RemoveNamedItem): implemented.
+	(SetNamedItem): implemented.
+
+2002-03-12  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlAttribute.cs: Moved a method from amongst properties down to
+	it's alphabetical position in the methods section.
+	
+	* XmlNode.cs: Passes in 'this' to XmlNodeList constructor instead of
+	last linked child.  Set XmlNode base class to return false for IsReadOnly().
+	Implemented GetEnumerator() and RemoveChild().
+	
+	* XmlNodeListChildren.cs: Now stores the parent instead of the last child.
+	This is to support the behavior that the Enumerator doesn't become invalid
+	when changes to the children occur.  Flushed out rest of implementation for
+	MoveNext, Current, and Reset.
+
+2002-03-12  Duncan Mak  <duncan@ximian.com>
+
+	* XmlCharacterData.cs: Reformatted the properties for better readability.
+
+	* XmlLinkedNode.cs: Removed the awful boxy comments.
+
+	* XmlNamedNodeMap.cs (Count):
+	(Item): Implemented. Tests will be coming.
+
+	* XmlEntityReference.cs: 
+	* XmlSignificantWhitespace.cs: Implemented these classes except for
+	the Clone, WriteContentTo and WriteTo methods. Will have to
+	investigate into these later.
+
+2002-03-11  Duncan Mak  <duncan@ximian.com>
+
+	* IHasXmlNode.cs: Added to CVS.
+
+2002-03-08  Jason Diamond <jason@injektilo.org>
+
+	* XmlParserContext.cs: Added missing constructors and missing Encoding 
+	property.
+
+	* XmlTextReader.cs: Start using the XmlParserContext class.
+
+2002-03-08  Jason Diamond <jason@injektilo.org>
+
+	* XmlTextReader.cs: Implemented MoveToElement and MoveToFirstAttribute.
+
+2002-03-08  Mike Kestner  <mkestner@speakeasy.net>
+
+	* XmlNode.cs (Item): Implemented both indexers.
+
+2002-03-08  Jason Diamond  <jason@injektilo.org>
+
+	* DomEncodingType.cs, TreePosition.cs, XPathNodeType.cs, XmlDataType.cs,
+	XmlExceptionCode.cs, XmlSortOrder.cs, XmlUtil.cs: Removed files.
+
+2002-03-08  Jason Diamond  <jason@injektilo.org>
+
+	* XmlAttribute.cs: Attribute nodes are supposed to store their values
+	as child nodes so updated to reflect that.
+
+	* XmlDocument.cs, XmlElement.cs, XmlNode.cs: Moved code that was
+	duplicated in XmlDocument and XmlElement into XmlNode so that it
+	wouldn't have to be duplicated in XmlAttribute, too.
+
+2002-03-08  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlNodeList.cs, XmlDocument.cs, XmlLinkedNode.cs,
+	XmlNode.cs: Formatting.
+	
+	* XmlNodeListChildren.cs: Implementation of XmlNodeList
+	for XmlNode.ChildNodes property.
+	
+	* XmlNodeListAsArrayList.cs: Removed file.  Using different
+	data structure (circular list) in XmlNode so this file
+	is no longer valid.
+	
+	* XmlDocument.cs, XmlElement.cs: New ChildNodes tests found
+	bug in setter property of LastLinkedChild so fixed it.
+	
+2002-03-06  Jason Diamond  <jason@injektilo.org>
+
+	* XmlInputSource.cs, XmlNames_1_0.cs, XmlParse.cs: Removed files.
+	We already have a parser in XmlTextReader.
+
+	* XmlException.cs: Removed constructor accepting XmlInputSource.
+
+2002-03-06  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlNode.cs: Rewrote this class from scratch with
+	MonoToDo attribs and NotImplementedExceptions.  Now defines an
+	internal LastLinkedNode property to aid the new implementation.
+	XmlNodes only have ref to owner doc and parent nodes now.
+	
+	* XmlLinkedNode.cs: Added NextLinkedSibling internal property
+	and ref to next sibling to support walking our circular child
+	node list.
+	
+	* XmlDocument.cs: Added ref to last child node and overrides
+	XmlNode's internal LastLinkedChild property to support walking
+	our circular child node list.
+	
+2002-03-02  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlProcessingInstructions.cs: Class was empty.  Implemented
+	constructor, properties, and CloneNode() method.  Put in
+	MonoToDo attrib for remaining methods.
+
+	* XmlComment.cs: Reformatted and put in MonoToDo attribs.
+	Got rid of helper methods and fields since they were no
+	longer needed.
+
+	* XmlLinkedNode.cs: Reformatted and put in MonoToDo attribs.
+
+	* XmlDocument.cs: Added code to Load(XmlReader) to create XmlComment,
+	XmlCDataSection, and XmlProcessingInstruction nodes. Implemented
+	Createxxx() methods for those three node types.
+
+2002-03-02  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocument.cs: Implemented the remaining CreateElement and
+	CreateAttribute methods.
+
+	* XmlAttribute.cs: Re-implemented.
+
+	* XmlElement.cs: Set owner element on attributes. Reformatted.
+
+2002-03-02  Jason Diamond <jason@injektilo.org>
+
+	* XmlTextReader.cs: Implemented MoveToNextAttribute().
+
+	* XmlDocument.cs: Reformatted. Adding missing methods and MonoTODO
+	attributes. Create attribute nodes while loading. Implemented
+	Load(string) and CreateTextNode().
+
+	* XmlCharacterData.cs, XmlText.cs: Re-implemented.
+
+	* XmlCDataSection.cs, XmlComment.cs: Call correct constructor in 
+	XmlCharacterData.
+
+	* XmlNamedNodeMap.cs, XmlAttributeCollection.cs: Stubbed out.
+
+2002-03-02  Mike Kestner <mkestner@speakeasy.net>
+
+	* XmlAttribute.cs : Using fix.
+	* XmlDocument.cs (CreateAttribute(String)): Implement.
+
+2002-03-02  Jason Diamond <jason@injektilo.org>
+
+	* XmlNamespaceManager.cs: Atomize prefixes and namespaces strings in 
+	the name table.
+
+2002-02-28  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocument.cs, XmlNode.cs: Initial implementation of LoadXml 
+	courtesy of Kral Ferch <kral.ferch@hotmail.com>.
+
+2002-02-28  Jason Diamond <jason@injektilo.org>
+
+	* XmlException.cs, XmlReader.cs, XmlTextReader.cs: Reformatted, 
+	added missing members and MonoTODO attributes.
+	
+	* XmlTextReader.cs: Throw XmlException instead of System.Exception.
+
+2002-02-27  Jason Diamond <jason@injektilo.org>
+
+	* XmlElement.cs: Reformatted, added missing members and MonoTODO 
+	attributes.
+
+2002-02-26  Duncan Mak  <duncan@ximian.com>
+
+	* XmlCDataSection.cs: Initial implementation.
+
+	* NameTable.cs: Fixed the whole thing. Wrote a NUnit test to test
+	it out. This should (hopefully) be correct.
+
+2002-02-26  Jason Diamond <jason@injektilo.org>
+
+	* XmlTextReader.cs: Apparently Microsoft's implementation treats
+	namespace declarations as attributes so we do now, too.
+
+	* XmlNamespaceManager.cs: HasNamespace fixed so that it only
+	checks the current scope.
+
+2002-02-26  Duncan Mak  <duncan@ximian.com>
+
+	* XmlDocumentType.cs: Added a few hacks here and there to
+	temporarily fix the "I broke the build issue".
+
+2002-02-25  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocument.cs, XmlElement.cs, XmlNode.xs, XmlNodeList.cs,
+	XmlNodeListAsArrayList.cs: Multiple fixes necessary to get
+	simple test to pass. The existing code is really shitty so I'll
+	probably start writing tests and refactoring before much else 
+	can get done.
+
+2002-02-25  Duncan Mak  <duncan@ximian.com>
+
+	* NameTable.cs: Implemented.
+
+	* XmlDeclaration.cs: It should inherit from XmlLinkedNode, not XmlNode.
+
+2002-02-24  Duncan Mak  <duncan@ximian.com>
+	
+	* XmlNodeOrder.cs: Added to CVS.
+
+	* XmlQualifiedName.cs: Fixed a warning from Equals ().
+
+	* XmlTokenizedType.cs: Added to CVS.
+
+	* XmlUrlResolver.cs: Added to CVS with one TODO task.
+
+2002-02-23  Duncan Mak  <duncan@ximian.com>
+
+	* XmlQualifiedName.cs: Fixed ToString () and added the operators
+	(== and !=).
+
+2002-02-23  Jason Diamond <jason@injektilo.org>
+
+	* XmlTextReader.cs: Added support for qualified attributes.
+
+2002-02-23  Jason Diamond <jason@injektilo.org>
+
+	* XmlNamespaceManager.cs: Initial implementation.
+	
+	* XmlTextReader.cs: Added support for NamespaceURI property on
+	elements.
+
+2002-02-23  Nick Drochak <ndrochak@gol.com>
+
+	* ChangeLog: Add the change log to this directory
+
+	* XmlQualifiedName.cs: Fixed compile errors so it would build. Still has
+	MonoTODO's
+
diff --git a/mcs/class/System.XML/System.Xml/Driver.cs b/mcs/class/System.XML/System.Xml/Driver.cs
new file mode 100644
index 00000000000..80f9cf32934
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/Driver.cs
@@ -0,0 +1,56 @@
+//

+// Driver.cs

+//

+// Author:

+//   Jason Diamond (jason@injektilo.org)

+//

+// (C) 2001 Jason Diamond  http://injektilo.org/

+//

+

+using System;

+using System.Xml;

+

+public class Driver

+{

+	public static void Main(string[] args)

+	{

+		XmlReader xmlReader = null;

+

+		if (args.Length < 1)

+		{

+			xmlReader = new XmlTextReader(Console.In);

+		}

+		else

+		{

+			xmlReader = new XmlTextReader(args[0]);

+		}

+

+		while (xmlReader.Read())

+		{

+			Console.WriteLine("NodeType = {0}", xmlReader.NodeType);

+			Console.WriteLine("  Name = {0}", xmlReader.Name);

+			Console.WriteLine("  IsEmptyElement = {0}", xmlReader.IsEmptyElement);

+			Console.WriteLine("  HasAttributes = {0}", xmlReader.HasAttributes);

+			Console.WriteLine("  AttributeCount = {0}", xmlReader.AttributeCount);

+			Console.WriteLine("  HasValue = {0}", xmlReader.HasValue);

+			Console.WriteLine("  Value = {0}", xmlReader.Value);

+			Console.WriteLine("  Depth = {0}", xmlReader.Depth);

+

+			if (xmlReader.HasAttributes)

+			{

+				while (xmlReader.MoveToNextAttribute())

+				{

+					Console.WriteLine("    AttributeName = {0}", xmlReader.Name);

+					Console.WriteLine("    AttributeValue = {0}", xmlReader.Value);

+

+					while (xmlReader.ReadAttributeValue())

+					{

+						Console.WriteLine("      AttributeValueNodeType = {0}", xmlReader.NodeType);

+						Console.WriteLine("      AttributeValueName = {0}", xmlReader.Name);

+						Console.WriteLine("      AttributeValueValue = {0}", xmlReader.Value);

+					}

+				}

+			}

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/EntityHandling.cs b/mcs/class/System.XML/System.Xml/EntityHandling.cs
new file mode 100755
index 00000000000..c54b016b1e6
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/EntityHandling.cs
@@ -0,0 +1,29 @@
+// EntityHandling.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:46:17 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Xml {
+
+
+	/// <summary>
+	/// </summary>
+	public enum EntityHandling {
+
+		/// <summary>
+		/// </summary>
+		ExpandEntities = 1,
+
+		/// <summary>
+		/// </summary>
+		ExpandCharEntities = 2,
+	} // EntityHandling
+
+} // System.Xml
diff --git a/mcs/class/System.XML/System.Xml/Formatting.cs b/mcs/class/System.XML/System.Xml/Formatting.cs
new file mode 100755
index 00000000000..2586f58a04d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/Formatting.cs
@@ -0,0 +1,29 @@
+// Formatting.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:31:21 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Xml {
+
+
+	/// <summary>
+	/// </summary>
+	public enum Formatting {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		Indented = 1,
+	} // Formatting
+
+} // System.Xml
diff --git a/mcs/class/System.XML/System.Xml/IHasXmlNode.cs b/mcs/class/System.XML/System.Xml/IHasXmlNode.cs
new file mode 100755
index 00000000000..6eaef10dcfa
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/IHasXmlNode.cs
@@ -0,0 +1,15 @@
+//
+// System.Xml.IHasXmlNode.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Xml
+{
+	public interface IHasXmlNode
+	{
+		XmlNode GetNode ();
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/IXmlLineInfo.cs b/mcs/class/System.XML/System.Xml/IXmlLineInfo.cs
new file mode 100644
index 00000000000..d49e1e93208
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/IXmlLineInfo.cs
@@ -0,0 +1,19 @@
+//

+// System.Xml.IXmlLineInfo.cs

+//

+// Author:

+//   Jason Diamond (jason@injektilo.org)

+//

+// (C) 2001 Jason Diamond  http://injektilo.org/

+//

+

+namespace System.Xml

+{

+	public interface IXmlLineInfo

+	{

+		int LineNumber { get; }

+		int LinePosition { get; }

+

+		bool HasLineInfo();

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/NameTable.cs b/mcs/class/System.XML/System.Xml/NameTable.cs
new file mode 100755
index 00000000000..c8533218040
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/NameTable.cs
@@ -0,0 +1,74 @@
+//
+// System.Xml.NameTable.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+
+namespace System.Xml
+{
+	public class NameTable : XmlNameTable
+	{
+		// Fields
+		Hashtable table;
+		
+		// Constructor
+		public NameTable ()
+			: base ()
+		{
+			table = new Hashtable ();
+		}
+	  
+		// Method
+		public override string Add (string key)
+		{
+			if (table.Contains (key))
+				return (string) table [key];
+			else {
+				table.Add (key, key);
+				return key;
+			}
+		}
+
+		public override string Add (char[] key, int start, int len)
+		{
+			if (((0 > start) && (start >= key.Length))
+			    || ((0 > len) && (len >= key.Length - len)))
+				throw new IndexOutOfRangeException ("The Index is out of range.");
+					
+			if (len == 0)
+				return String.Empty;
+
+			string item = new string (key, start, len);
+
+			return Add (item);
+		}
+
+		public override string Get (string key)
+		{
+			if (! (table.Contains (key)))
+				return null;
+		        else
+				return (string) table [key];
+
+		}
+	  
+		public override string Get (char[] array, int offset, int length)
+		{
+			if (((0 > offset) && (offset >= array.Length))
+			    || ((0 > length) && (length >= array.Length - offset)))
+				throw new IndexOutOfRangeException ("The Index is out of range.");
+
+			if (length == 0)
+				return String.Empty;
+
+			string key = new string (array, offset, length);
+
+			return Get (key);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/Profile.cs b/mcs/class/System.XML/System.Xml/Profile.cs
new file mode 100644
index 00000000000..d16049576d1
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/Profile.cs
@@ -0,0 +1,47 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-

+//

+// Profile.cs

+//

+// Author:

+//   Jason Diamond (jason@injektilo.org)

+//

+// (C) 2001 Jason Diamond  http://injektilo.org/

+//

+

+using System;

+using System.Xml;

+

+using System.IO;

+using System.Text;

+

+public class Profile

+{

+	public static void Main(string[] args)

+	{

+		XmlReader xmlReader = null;

+

+		if (args.Length < 1)

+		{

+			xmlReader = new XmlTextReader(Console.In);

+		}

+		else

+		{

+			xmlReader = new XmlTextReader(args[0]);

+		}

+

+		int nodes = 0;

+

+		DateTime start = DateTime.Now;

+

+		while (xmlReader.Read())

+		{

+			++nodes;

+		}

+

+		DateTime end = DateTime.Now;

+

+		Console.WriteLine("time = {0}", end - start);

+

+		Console.WriteLine("nodes = {0}", nodes);

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/ReadState.cs b/mcs/class/System.XML/System.Xml/ReadState.cs
new file mode 100644
index 00000000000..6675af3990f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/ReadState.cs
@@ -0,0 +1,41 @@
+// ReadState.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:31:27 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Xml {
+
+
+	/// <summary>
+	/// </summary>
+	public enum ReadState {
+
+		/// <summary>
+		/// </summary>
+		Initial = 0,
+
+		/// <summary>
+		/// </summary>
+		Interactive = 1,
+
+		/// <summary>
+		/// </summary>
+		Error = 2,
+
+		/// <summary>
+		/// </summary>
+		EndOfFile = 3,
+
+		/// <summary>
+		/// </summary>
+		Closed = 4,
+	} // ReadState
+
+} // System.Xml
diff --git a/mcs/class/System.XML/System.Xml/TODOAttribute.cs b/mcs/class/System.XML/System.Xml/TODOAttribute.cs
new file mode 100644
index 00000000000..741cd760c1f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/TODOAttribute.cs
@@ -0,0 +1,32 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Xml {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All)]
+	internal class MonoTODOAttribute : Attribute {
+
+		string comment;
+
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/ValidationType.cs b/mcs/class/System.XML/System.Xml/ValidationType.cs
new file mode 100755
index 00000000000..d746324e256
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/ValidationType.cs
@@ -0,0 +1,20 @@
+// System.Xml.ValidationType.cs
+//
+// Author:
+// 	Duncan Mak  (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Xml
+{
+	public enum ValidationType
+	{
+		None = 0,
+		Auto = 1,
+		DTD = 2,
+		XDR = 3,
+		Schema = 4,
+	}
+}
+
diff --git a/mcs/class/System.XML/System.Xml/WhitespaceHandling.cs b/mcs/class/System.XML/System.Xml/WhitespaceHandling.cs
new file mode 100644
index 00000000000..8e9962b367e
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/WhitespaceHandling.cs
@@ -0,0 +1,33 @@
+// WhitespaceHandling.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:31:33 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Xml {
+
+
+	/// <summary>
+	/// </summary>
+	public enum WhitespaceHandling {
+
+		/// <summary>
+		/// </summary>
+		All = 0,
+
+		/// <summary>
+		/// </summary>
+		Significant = 1,
+
+		/// <summary>
+		/// </summary>
+		None = 2,
+	} // WhitespaceHandling
+
+} // System.Xml
diff --git a/mcs/class/System.XML/System.Xml/WriteState.cs b/mcs/class/System.XML/System.Xml/WriteState.cs
new file mode 100755
index 00000000000..7d387708782
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/WriteState.cs
@@ -0,0 +1,53 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-

+//

+// System.Xml.WriteState

+//

+// Author:

+//   Daniel Weber (daniel-weber@austin.rr.com)

+//

+// (C) 2001 Daniel Weber
+
+namespace System.Xml 

+{
+
+
+	/// <summary>
+	/// </summary>
+	public enum WriteState {
+
+		/// <summary>
+		/// A write method has not been called.
+		/// </summary>
+		Start = 0,
+
+		/// <summary>
+		/// The prolog is being written.
+		/// </summary>
+		Prolog = 1,
+
+		/// <summary>
+		/// An element start tag is being written.
+		/// </summary>
+		Element = 2,
+
+		/// <summary>
+		/// An attribute is being written.
+		/// </summary>
+		Attribute = 3,
+
+		/// <summary>
+		/// Element content is being written.
+		/// </summary>
+		Content = 4,
+
+		/// <summary>
+		/// The close method has been called.
+		/// </summary>
+		Closed = 5,
+
+
+
+
+
+	} 
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlAttribute.cs b/mcs/class/System.XML/System.Xml/XmlAttribute.cs
new file mode 100644
index 00000000000..70419b6c593
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlAttribute.cs
@@ -0,0 +1,189 @@
+//
+// System.Xml.XmlAttribute
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+
+namespace System.Xml
+{
+	public class XmlAttribute : XmlNode
+	{
+		#region Fields
+
+		private XmlLinkedNode lastChild;
+		private string localName;
+		private string namespaceURI;
+		private string prefix;
+
+		#endregion
+
+		#region Constructor
+
+		[MonoTODO("need to set namespaceURI if prefix is recognized built-in ones like xmlns")]
+		protected internal XmlAttribute (
+			string prefix, 
+			string localName, 
+			string namespaceURI, 
+			XmlDocument doc) : base (doc)
+		{
+			this.prefix = prefix;
+			this.localName = localName;
+			this.namespaceURI = namespaceURI;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public override string BaseURI {
+			get {
+				return OwnerElement.BaseURI;
+			}
+		}
+
+		[MonoTODO]
+		public override string InnerText {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO ("Setter.")]
+		public override string InnerXml {
+			get {
+				// Not sure why this is an override.  Passing through for now.
+				return base.InnerXml;
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public override string LocalName {
+			get {
+				return localName;
+			}
+		}
+
+		public override string Name {
+			get { 
+				return prefix != String.Empty ? prefix + ":" + localName : localName; 
+			}
+		}
+
+		public override string NamespaceURI {
+			get {
+				return namespaceURI;
+			}
+		}
+
+		public override XmlNodeType NodeType {
+			get {
+				return XmlNodeType.Attribute;
+			}
+		}
+
+		public override XmlDocument OwnerDocument {
+			get {
+				return base.OwnerDocument;
+			}
+		}
+
+		public virtual XmlElement OwnerElement {
+			get {
+				return base.ParentNode as XmlElement;
+			}
+		}
+
+		[MonoTODO]
+		public override XmlNode ParentNode {
+			get {
+				return null;
+			}
+		}
+
+		[MonoTODO]
+		// We gotta do more in the set block here
+		// We need to do the proper tests and throw
+		// the correct Exceptions
+		public override string Prefix {
+			set {
+				prefix = value;
+			}
+			
+			get {
+				return prefix;
+			}
+		}
+
+		[MonoTODO]
+		public virtual bool Specified {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public override string Value {
+			get {
+				XmlNode firstChild = FirstChild;
+				if (firstChild == null)
+					return String.Empty;
+				return firstChild.Value;
+			}
+
+			set {
+				XmlNode firstChild = FirstChild;
+				if (firstChild == null)
+					AppendChild (OwnerDocument.CreateTextNode (value));
+				else
+					firstChild.Value = value;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public override XmlNode CloneNode (bool deep)
+		{
+			XmlNode node = new XmlAttribute (prefix, localName, namespaceURI,
+							 OwnerDocument);
+			if (deep) {
+				while ((node != null) && (node.HasChildNodes)) {
+					AppendChild (node.NextSibling.CloneNode (true));
+					node = node.NextSibling;
+				}
+			}
+
+			return node;
+		}
+
+		public override void WriteContentTo (XmlWriter w)
+		{
+			w.WriteString (Value);
+		}
+
+		public override void WriteTo (XmlWriter w)
+		{
+			w.WriteAttributeString (prefix, localName, namespaceURI, Value);
+		}
+
+		#endregion
+
+		internal override XmlLinkedNode LastLinkedChild {
+			get { return lastChild; }
+
+			set { lastChild = value; }
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlAttributeCollection.cs b/mcs/class/System.XML/System.Xml/XmlAttributeCollection.cs
new file mode 100644
index 00000000000..3c3afbf5385
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlAttributeCollection.cs
@@ -0,0 +1,118 @@
+//
+// System.Xml.XmlAttributeCollection
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+using System.Collections;
+
+namespace System.Xml
+{
+	public class XmlAttributeCollection : XmlNamedNodeMap, ICollection
+	{
+		internal XmlAttributeCollection (XmlNode parent) : base (parent)
+		{
+		}
+
+		bool ICollection.IsSynchronized {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		[System.Runtime.CompilerServices.IndexerName ("ItemOf")]
+		public virtual XmlAttribute this [string name] {
+			get {
+				return (XmlAttribute) GetNamedItem (name);
+			}
+		}
+
+		[MonoTODO]
+		[System.Runtime.CompilerServices.IndexerName ("ItemOf")]
+		public virtual XmlAttribute this [int i] {
+			get {
+				return (XmlAttribute) Nodes [i];
+			}
+		}
+
+		[MonoTODO]
+		[System.Runtime.CompilerServices.IndexerName ("ItemOf")]
+		public virtual XmlAttribute this [string localName, string namespaceURI] {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		object ICollection.SyncRoot {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute Append (XmlAttribute node) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void CopyTo (XmlAttribute [] array, int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		void ICollection.CopyTo (Array array, int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute InsertAfter (XmlAttribute newNode, XmlAttribute refNode)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute InsertBefore (XmlAttribute newNode, XmlAttribute refNode)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute Prepend (XmlAttribute node) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute Remove (XmlAttribute node) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual void RemoveAll () 
+		{
+			while (this.Count > 0)
+				base.RemoveNamedItem (this.Item (0).Name);
+			
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute RemoveAt (int i) 
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override XmlNode SetNamedItem (XmlNode node)
+		{
+			return base.SetNamedItem (node);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlCDataSection.cs b/mcs/class/System.XML/System.Xml/XmlCDataSection.cs
new file mode 100644
index 00000000000..fae85718883
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlCDataSection.cs
@@ -0,0 +1,54 @@
+//
+// System.Xml.XmlCDataSection.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Xml
+{
+	public class XmlCDataSection : XmlCharacterData
+	{
+		#region Constructors
+
+		protected internal XmlCDataSection (string data, XmlDocument doc)
+			: base (data, doc)
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public override string LocalName {
+			get { return "#cdata-section"; }
+		}
+
+		public override string Name	{
+			get { return "#cdata-section"; }
+		}
+
+		public override XmlNodeType NodeType {
+			get { return XmlNodeType.CDATA; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		public override XmlNode CloneNode (bool deep)
+		{
+			return new XmlCDataSection (Data, OwnerDocument); // CDATA nodes have no children.
+		}
+
+		public override void WriteContentTo (XmlWriter w) {	}
+
+		public override void WriteTo (XmlWriter w)
+		{
+			w.WriteCData (Data);
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlChar.cs b/mcs/class/System.XML/System.Xml/XmlChar.cs
new file mode 100644
index 00000000000..2ea00dd8572
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlChar.cs
@@ -0,0 +1,200 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-

+//

+// System.Xml.XmlChar.cs

+//

+// Author:

+//   Jason Diamond (jason@injektilo.org)

+//

+// (C) 2001 Jason Diamond  http://injektilo.org/

+//

+

+namespace System.Xml

+{

+	internal class XmlChar

+	{

+		internal static bool IsWhitespace(int ch)

+		{

+			return ch == 0x20 || ch == 0x9 || ch == 0xD || ch == 0xA;

+		}

+

+		internal static bool IsFirstNameChar(int ch)

+		{

+			bool result = false;

+

+			if (ch >= 0 && ch <= 0xFFFF)

+			{

+				result = (nameBitmap[(firstNamePages[ch >> 8] << 3) + ((ch & 0xFF) >> 5)] & (1 << (ch & 0x1F))) != 0;

+			}

+

+			return result;

+		}

+

+		internal static bool IsNameChar(int ch)

+		{

+			bool result = false;

+

+			if (ch >= 0 && ch <= 0xFFFF)

+			{

+				result = (nameBitmap[(namePages[ch >> 8] << 3) + ((ch & 0xFF) >> 5)] & (1 << (ch & 0x1F))) != 0;

+			}

+

+			return result;

+		}

+

+		private static byte[] firstNamePages =

+		{

+			0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x00,

+			0x00, 0x09, 0x0A, 0x0B, 0x0C, 0x0D, 0x0E, 0x0F,

+			0x10, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x13,

+			0x00, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x15, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x17,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x18,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

+		};

+

+		private static byte[] namePages =

+		{

+			0x19, 0x03, 0x1A, 0x1B, 0x1C, 0x1D, 0x1E, 0x00,

+			0x00, 0x1F, 0x20, 0x21, 0x22, 0x23, 0x24, 0x25,

+			0x10, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x12, 0x13,

+			0x26, 0x14, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x27, 0x16, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x17,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01,

+			0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x01, 0x18,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,

+			0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00

+		};

+

+		private static uint[] nameBitmap =

+		{

+			0x00000000, 0x00000000, 0x00000000, 0x00000000,

+			0x00000000, 0x00000000, 0x00000000, 0x00000000,

+			0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,

+			0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,

+			0x00000000, 0x04000000, 0x87FFFFFE, 0x07FFFFFE,

+			0x00000000, 0x00000000, 0xFF7FFFFF, 0xFF7FFFFF,

+			0xFFFFFFFF, 0x7FF3FFFF, 0xFFFFFDFE, 0x7FFFFFFF,

+			0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFE00F, 0xFC31FFFF,

+			0x00FFFFFF, 0x00000000, 0xFFFF0000, 0xFFFFFFFF,

+			0xFFFFFFFF, 0xF80001FF, 0x00000003, 0x00000000,

+			0x00000000, 0x00000000, 0x00000000, 0x00000000,

+			0xFFFFD740, 0xFFFFFFFB, 0x547F7FFF, 0x000FFFFD,

+			0xFFFFDFFE, 0xFFFFFFFF, 0xDFFEFFFF, 0xFFFFFFFF,

+			0xFFFF0003, 0xFFFFFFFF, 0xFFFF199F, 0x033FCFFF,

+			0x00000000, 0xFFFE0000, 0x027FFFFF, 0xFFFFFFFE,

+			0x0000007F, 0x00000000, 0xFFFF0000, 0x000707FF,

+			0x00000000, 0x07FFFFFE, 0x000007FE, 0xFFFE0000,

+			0xFFFFFFFF, 0x7CFFFFFF, 0x002F7FFF, 0x00000060,

+			0xFFFFFFE0, 0x23FFFFFF, 0xFF000000, 0x00000003,

+			0xFFF99FE0, 0x03C5FDFF, 0xB0000000, 0x00030003,

+			0xFFF987E0, 0x036DFDFF, 0x5E000000, 0x001C0000,

+			0xFFFBAFE0, 0x23EDFDFF, 0x00000000, 0x00000001,

+			0xFFF99FE0, 0x23CDFDFF, 0xB0000000, 0x00000003,

+			0xD63DC7E0, 0x03BFC718, 0x00000000, 0x00000000,

+			0xFFFDDFE0, 0x03EFFDFF, 0x00000000, 0x00000003,

+			0xFFFDDFE0, 0x03EFFDFF, 0x40000000, 0x00000003,

+			0xFFFDDFE0, 0x03FFFDFF, 0x00000000, 0x00000003,

+			0x00000000, 0x00000000, 0x00000000, 0x00000000,

+			0xFFFFFFFE, 0x000D7FFF, 0x0000003F, 0x00000000,

+			0xFEF02596, 0x200D6CAE, 0x0000001F, 0x00000000,

+			0x00000000, 0x00000000, 0xFFFFFEFF, 0x000003FF,

+			0x00000000, 0x00000000, 0x00000000, 0x00000000,

+			0x00000000, 0x00000000, 0x00000000, 0x00000000,

+			0x00000000, 0xFFFFFFFF, 0xFFFF003F, 0x007FFFFF,

+			0x0007DAED, 0x50000000, 0x82315001, 0x002C62AB,

+			0x40000000, 0xF580C900, 0x00000007, 0x02010800,

+			0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,

+			0x0FFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0x03FFFFFF,

+			0x3F3FFFFF, 0xFFFFFFFF, 0xAAFF3F3F, 0x3FFFFFFF,

+			0xFFFFFFFF, 0x5FDFFFFF, 0x0FCF1FDC, 0x1FDC1FFF,

+			0x00000000, 0x00004C40, 0x00000000, 0x00000000,

+			0x00000007, 0x00000000, 0x00000000, 0x00000000,

+			0x00000080, 0x000003FE, 0xFFFFFFFE, 0xFFFFFFFF,

+			0x001FFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0x07FFFFFF,

+			0xFFFFFFE0, 0x00001FFF, 0x00000000, 0x00000000,

+			0x00000000, 0x00000000, 0x00000000, 0x00000000,

+			0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,

+			0xFFFFFFFF, 0x0000003F, 0x00000000, 0x00000000,

+			0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF, 0xFFFFFFFF,

+			0xFFFFFFFF, 0x0000000F, 0x00000000, 0x00000000,

+			0x00000000, 0x07FF6000, 0x87FFFFFE, 0x07FFFFFE,

+			0x00000000, 0x00800000, 0xFF7FFFFF, 0xFF7FFFFF,

+			0x00FFFFFF, 0x00000000, 0xFFFF0000, 0xFFFFFFFF,

+			0xFFFFFFFF, 0xF80001FF, 0x00030003, 0x00000000,

+			0xFFFFFFFF, 0xFFFFFFFF, 0x0000003F, 0x00000003,

+			0xFFFFD7C0, 0xFFFFFFFB, 0x547F7FFF, 0x000FFFFD,

+			0xFFFFDFFE, 0xFFFFFFFF, 0xDFFEFFFF, 0xFFFFFFFF,

+			0xFFFF007B, 0xFFFFFFFF, 0xFFFF199F, 0x033FCFFF,

+			0x00000000, 0xFFFE0000, 0x027FFFFF, 0xFFFFFFFE,

+			0xFFFE007F, 0xBBFFFFFB, 0xFFFF0016, 0x000707FF,

+			0x00000000, 0x07FFFFFE, 0x0007FFFF, 0xFFFF03FF,

+			0xFFFFFFFF, 0x7CFFFFFF, 0xFFEF7FFF, 0x03FF3DFF,

+			0xFFFFFFEE, 0xF3FFFFFF, 0xFF1E3FFF, 0x0000FFCF,

+			0xFFF99FEE, 0xD3C5FDFF, 0xB080399F, 0x0003FFCF,

+			0xFFF987E4, 0xD36DFDFF, 0x5E003987, 0x001FFFC0,

+			0xFFFBAFEE, 0xF3EDFDFF, 0x00003BBF, 0x0000FFC1,

+			0xFFF99FEE, 0xF3CDFDFF, 0xB0C0398F, 0x0000FFC3,

+			0xD63DC7EC, 0xC3BFC718, 0x00803DC7, 0x0000FF80,

+			0xFFFDDFEE, 0xC3EFFDFF, 0x00603DDF, 0x0000FFC3,

+			0xFFFDDFEC, 0xC3EFFDFF, 0x40603DDF, 0x0000FFC3,

+			0xFFFDDFEC, 0xC3FFFDFF, 0x00803DCF, 0x0000FFC3,

+			0x00000000, 0x00000000, 0x00000000, 0x00000000,

+			0xFFFFFFFE, 0x07FF7FFF, 0x03FF7FFF, 0x00000000,

+			0xFEF02596, 0x3BFF6CAE, 0x03FF3F5F, 0x00000000,

+			0x03000000, 0xC2A003FF, 0xFFFFFEFF, 0xFFFE03FF,

+			0xFEBF0FDF, 0x02FE3FFF, 0x00000000, 0x00000000,

+			0x00000000, 0x00000000, 0x00000000, 0x00000000,

+			0x00000000, 0x00000000, 0x1FFF0000, 0x00000002,

+			0x000000A0, 0x003EFFFE, 0xFFFFFFFE, 0xFFFFFFFF,

+			0x661FFFFF, 0xFFFFFFFE, 0xFFFFFFFF, 0x77FFFFFF

+		};

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlCharacterData.cs b/mcs/class/System.XML/System.Xml/XmlCharacterData.cs
new file mode 100644
index 00000000000..75d188d91f0
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlCharacterData.cs
@@ -0,0 +1,132 @@
+//
+// System.Xml.XmlCharacterData.cs
+//
+// Authors:
+//   Jason Diamond <jason@injektilo.org>
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Jason Diamond, Kral Ferch
+//
+
+using System;
+
+namespace System.Xml
+{
+	public abstract class XmlCharacterData : XmlLinkedNode
+	{
+		private string data;
+
+		#region Constructor
+
+		protected internal XmlCharacterData (string data, XmlDocument doc)
+			: base (doc)
+		{
+			if (data == null)
+				data = String.Empty;
+
+			this.data = data;
+		}
+
+		#endregion
+		
+		#region Properties
+
+		public virtual string Data {
+			get { return data; }
+			
+			set { data = value; }
+		}
+
+		public override string InnerText {
+			get { return data; }
+
+			set { data = value; }
+		}
+
+		public virtual int Length {
+			get { return data != null ? data.Length : 0; }
+		}
+
+		public override string Value {
+			get { return data; }
+
+			set {
+				OwnerDocument.onNodeChanging (this, this.ParentNode);
+
+				if (IsReadOnly)
+					throw new ArgumentException ("Node is read-only.");
+
+				data = value;
+
+				OwnerDocument.onNodeChanged (this, this.ParentNode);
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public virtual void AppendData (string strData)
+		{
+			OwnerDocument.onNodeChanging (this, this.ParentNode);
+			data += strData;
+			OwnerDocument.onNodeChanged (this, this.ParentNode);
+		}
+
+		public virtual void DeleteData (int offset, int count)
+		{
+			OwnerDocument.onNodeChanging (this, this.ParentNode);
+
+			if (offset < 0)
+				throw new ArgumentOutOfRangeException ("offset", "Must be non-negative and must not be greater than the length of this instance.");
+
+			int newCount = data.Length - offset;
+
+			if ((offset + count) < data.Length)
+				newCount = count;
+
+			data = data.Remove (offset, newCount);
+			
+			OwnerDocument.onNodeChanged (this, this.ParentNode);
+		}
+
+		public virtual void InsertData (int offset, string strData)
+		{
+			OwnerDocument.onNodeChanging (this, this.ParentNode);
+
+			if ((offset < 0) || (offset > data.Length))
+				throw new ArgumentOutOfRangeException ("offset", "Must be non-negative and must not be greater than the length of this instance.");
+
+			data = data.Insert(offset, strData);
+			
+			OwnerDocument.onNodeChanged (this, this.ParentNode);
+		}
+
+		public virtual void ReplaceData (int offset, int count, string strData)
+		{
+			OwnerDocument.onNodeChanging (this, this.ParentNode);
+
+			if ((offset < 0) || (offset > data.Length))
+				throw new ArgumentOutOfRangeException ("offset", "Must be non-negative and must not be greater than the length of this instance.");
+
+			if (strData == null)
+				throw new ArgumentNullException ("strData", "Must be non-null.");
+
+			string newData = data.Substring (0, offset) + strData;
+			
+			if ((offset + count) < data.Length)
+				newData += data.Substring (offset + count);
+
+			data = newData;
+
+			OwnerDocument.onNodeChanged (this, this.ParentNode);
+		}
+
+		public virtual string Substring (int offset, int count)
+		{
+			return data.Substring (offset, count);
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlComment.cs b/mcs/class/System.XML/System.Xml/XmlComment.cs
new file mode 100644
index 00000000000..4c83ebab0e6
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlComment.cs
@@ -0,0 +1,58 @@
+//
+// System.Xml.XmlComment
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+
+namespace System.Xml
+{
+	public class XmlComment : XmlCharacterData
+	{
+		#region Constructors
+
+		protected internal XmlComment (string comment, XmlDocument doc)
+			: base (comment, doc)
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public override string LocalName {
+			get { return "#comment"; }
+		}
+
+		public override string Name {
+			get { return "#comment"; }
+		}
+
+		public override XmlNodeType NodeType {
+			get { return XmlNodeType.Comment; }
+		}
+		
+		#endregion
+
+		#region Methods
+
+		public override XmlNode CloneNode (bool deep)
+		{
+			// discard deep because Comments have no children.
+			return new XmlComment(Value, OwnerDocument); 
+		}
+
+		public override void WriteContentTo (XmlWriter w) { }
+
+		public override void WriteTo (XmlWriter w)
+		{
+			w.WriteComment (Data);
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlConstructs.cs b/mcs/class/System.XML/System.Xml/XmlConstructs.cs
new file mode 100755
index 00000000000..7f23eba5e44
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlConstructs.cs
@@ -0,0 +1,545 @@
+using System;

+

+namespace System.Xml

+{

+	/// <summary>

+	/// http://www.w3.org/TR/REC-xml

+	/// </summary>

+	/// <remarks>

+	/// Includes code and Ideas from  org.apache.xerces.util.XMLChar class of Xerces 2.0.1

+	/// However, No surrogate support is included in this class.

+	/// This class is currently public. Make it internal after testing completes

+	/// </remarks>

+	public class XmlConstructs

+	{

+		/** Character flags. */

+		internal static byte[] CHARS = new byte[1 << 16];

+

+		/** Valid character mask. */

+		internal static int VALID = 0x01;

+

+		/** Space character mask. */

+		internal static int SPACE = 0x02;

+

+		/** Name start character mask. */

+		internal static int NAME_START = 0x04;

+

+		/** Name character mask. */

+		internal static int NAME = 0x08;

+

+		/** Pubid character mask. */

+		internal static int PUBID = 0x10;

+		/** 

+			 * Content character mask. Special characters are those that can

+			 * be considered the start of markup, such as '&lt;' and '&amp;'. 

+			 * The various newline characters are considered special as well.

+			 * All other valid XML characters can be considered content.

+			 * <p>

+			 * This is an optimization for the inner loop of character scanning.

+			 */

+		internal static int CONTENT = 0x20;

+

+		/** NCName start character mask. */

+		internal static int NCNAME_START = 0x40;

+

+		/** NCName character mask. */

+		internal static int NCNAME = 0x80;

+	

+		static XmlConstructs()

+		{

+			//

+			// [2] Char ::= #x9 | #xA | #xD | [#x20-#xD7FF] |

+			//              [#xE000-#xFFFD] | [#x10000-#x10FFFF]

+			//

+			int[] charRange = { 

+								  0x0009, 0x000A, 0x000D, 0x000D, 0x0020, 0xD7FF, 0xE000, 0xFFFD,

+			};

+

+			//

+			// [3] S ::= (#x20 | #x9 | #xD | #xA)+

+			//

+			int[] spaceChar = { 

+								  0x0020, 0x0009, 0x000D, 0x000A,

+			};

+

+			//

+			// [4] NameChar ::= Letter | Digit | '.' | '-' | '_' | ':' |

+			//                  CombiningChar | Extender

+			//

+			int[] nameChar = { 

+								 0x002D, 0x002E, // '-' and '.'

+			};

+

+			//

+			// [5] Name ::= (Letter | '_' | ':') (NameChar)*

+			//

+

+			int[] nameStartChar = { 

+									  0x003A, 0x005F, // ':' and '_'

+			};

+

+			//

+			// [13] PubidChar ::= #x20 | 0xD | 0xA | [a-zA-Z0-9] | [-'()+,./:=?;!*#@$_%]

+			//

+

+			int[] pubidChar = {

+								  0x000A, 0x000D, 0x0020, 0x0021, 0x0023, 0x0024, 0x0025, 0x003D,

+								  0x005F

+							  };

+

+			int[] pubidRange = {

+								   0x0027, 0x003B, 0x003F, 0x005A, 0x0061, 0x007A

+							   };

+

+			//

+			// [84] Letter ::= BaseChar | Ideographic

+			//

+

+			int[] letterRange = {

+									// BaseChar

+									0x0041, 0x005A, 0x0061, 0x007A, 0x00C0, 0x00D6, 0x00D8, 0x00F6,

+									0x00F8, 0x0131, 0x0134, 0x013E, 0x0141, 0x0148, 0x014A, 0x017E,

+									0x0180, 0x01C3, 0x01CD, 0x01F0, 0x01F4, 0x01F5, 0x01FA, 0x0217,

+									0x0250, 0x02A8, 0x02BB, 0x02C1, 0x0388, 0x038A, 0x038E, 0x03A1,

+									0x03A3, 0x03CE, 0x03D0, 0x03D6, 0x03E2, 0x03F3, 0x0401, 0x040C,

+									0x040E, 0x044F, 0x0451, 0x045C, 0x045E, 0x0481, 0x0490, 0x04C4,

+									0x04C7, 0x04C8, 0x04CB, 0x04CC, 0x04D0, 0x04EB, 0x04EE, 0x04F5,

+									0x04F8, 0x04F9, 0x0531, 0x0556, 0x0561, 0x0586, 0x05D0, 0x05EA,

+									0x05F0, 0x05F2, 0x0621, 0x063A, 0x0641, 0x064A, 0x0671, 0x06B7,

+									0x06BA, 0x06BE, 0x06C0, 0x06CE, 0x06D0, 0x06D3, 0x06E5, 0x06E6,

+									0x0905, 0x0939, 0x0958, 0x0961, 0x0985, 0x098C, 0x098F, 0x0990,

+									0x0993, 0x09A8, 0x09AA, 0x09B0, 0x09B6, 0x09B9, 0x09DC, 0x09DD,

+									0x09DF, 0x09E1, 0x09F0, 0x09F1, 0x0A05, 0x0A0A, 0x0A0F, 0x0A10,

+									0x0A13, 0x0A28, 0x0A2A, 0x0A30, 0x0A32, 0x0A33, 0x0A35, 0x0A36,

+									0x0A38, 0x0A39, 0x0A59, 0x0A5C, 0x0A72, 0x0A74, 0x0A85, 0x0A8B,

+									0x0A8F, 0x0A91, 0x0A93, 0x0AA8, 0x0AAA, 0x0AB0, 0x0AB2, 0x0AB3,

+									0x0AB5, 0x0AB9, 0x0B05, 0x0B0C, 0x0B0F, 0x0B10, 0x0B13, 0x0B28,

+									0x0B2A, 0x0B30, 0x0B32, 0x0B33, 0x0B36, 0x0B39, 0x0B5C, 0x0B5D,

+									0x0B5F, 0x0B61, 0x0B85, 0x0B8A, 0x0B8E, 0x0B90, 0x0B92, 0x0B95,

+									0x0B99, 0x0B9A, 0x0B9E, 0x0B9F, 0x0BA3, 0x0BA4, 0x0BA8, 0x0BAA,

+									0x0BAE, 0x0BB5, 0x0BB7, 0x0BB9, 0x0C05, 0x0C0C, 0x0C0E, 0x0C10,

+									0x0C12, 0x0C28, 0x0C2A, 0x0C33, 0x0C35, 0x0C39, 0x0C60, 0x0C61,

+									0x0C85, 0x0C8C, 0x0C8E, 0x0C90, 0x0C92, 0x0CA8, 0x0CAA, 0x0CB3,

+									0x0CB5, 0x0CB9, 0x0CE0, 0x0CE1, 0x0D05, 0x0D0C, 0x0D0E, 0x0D10,

+									0x0D12, 0x0D28, 0x0D2A, 0x0D39, 0x0D60, 0x0D61, 0x0E01, 0x0E2E,

+									0x0E32, 0x0E33, 0x0E40, 0x0E45, 0x0E81, 0x0E82, 0x0E87, 0x0E88,

+									0x0E94, 0x0E97, 0x0E99, 0x0E9F, 0x0EA1, 0x0EA3, 0x0EAA, 0x0EAB,

+									0x0EAD, 0x0EAE, 0x0EB2, 0x0EB3, 0x0EC0, 0x0EC4, 0x0F40, 0x0F47,

+									0x0F49, 0x0F69, 0x10A0, 0x10C5, 0x10D0, 0x10F6, 0x1102, 0x1103,

+									0x1105, 0x1107, 0x110B, 0x110C, 0x110E, 0x1112, 0x1154, 0x1155,

+									0x115F, 0x1161, 0x116D, 0x116E, 0x1172, 0x1173, 0x11AE, 0x11AF,

+									0x11B7, 0x11B8, 0x11BC, 0x11C2, 0x1E00, 0x1E9B, 0x1EA0, 0x1EF9,

+									0x1F00, 0x1F15, 0x1F18, 0x1F1D, 0x1F20, 0x1F45, 0x1F48, 0x1F4D,

+									0x1F50, 0x1F57, 0x1F5F, 0x1F7D, 0x1F80, 0x1FB4, 0x1FB6, 0x1FBC,

+									0x1FC2, 0x1FC4, 0x1FC6, 0x1FCC, 0x1FD0, 0x1FD3, 0x1FD6, 0x1FDB,

+									0x1FE0, 0x1FEC, 0x1FF2, 0x1FF4, 0x1FF6, 0x1FFC, 0x212A, 0x212B,

+									0x2180, 0x2182, 0x3041, 0x3094, 0x30A1, 0x30FA, 0x3105, 0x312C,

+									0xAC00, 0xD7A3,

+									// Ideographic

+									0x3021, 0x3029, 0x4E00, 0x9FA5,

+			};

+			int[] letterChar = {

+								   // BaseChar

+								   0x0386, 0x038C, 0x03DA, 0x03DC, 0x03DE, 0x03E0, 0x0559, 0x06D5,

+								   0x093D, 0x09B2, 0x0A5E, 0x0A8D, 0x0ABD, 0x0AE0, 0x0B3D, 0x0B9C,

+								   0x0CDE, 0x0E30, 0x0E84, 0x0E8A, 0x0E8D, 0x0EA5, 0x0EA7, 0x0EB0,

+								   0x0EBD, 0x1100, 0x1109, 0x113C, 0x113E, 0x1140, 0x114C, 0x114E,

+								   0x1150, 0x1159, 0x1163, 0x1165, 0x1167, 0x1169, 0x1175, 0x119E,

+								   0x11A8, 0x11AB, 0x11BA, 0x11EB, 0x11F0, 0x11F9, 0x1F59, 0x1F5B,

+								   0x1F5D, 0x1FBE, 0x2126, 0x212E,

+								   // Ideographic

+								   0x3007,

+			};

+

+			//

+			// [87] CombiningChar ::= ...

+			//

+

+			int[] combiningCharRange = {

+										   0x0300, 0x0345, 0x0360, 0x0361, 0x0483, 0x0486, 0x0591, 0x05A1,

+										   0x05A3, 0x05B9, 0x05BB, 0x05BD, 0x05C1, 0x05C2, 0x064B, 0x0652,

+										   0x06D6, 0x06DC, 0x06DD, 0x06DF, 0x06E0, 0x06E4, 0x06E7, 0x06E8,

+										   0x06EA, 0x06ED, 0x0901, 0x0903, 0x093E, 0x094C, 0x0951, 0x0954,

+										   0x0962, 0x0963, 0x0981, 0x0983, 0x09C0, 0x09C4, 0x09C7, 0x09C8,

+										   0x09CB, 0x09CD, 0x09E2, 0x09E3, 0x0A40, 0x0A42, 0x0A47, 0x0A48,

+										   0x0A4B, 0x0A4D, 0x0A70, 0x0A71, 0x0A81, 0x0A83, 0x0ABE, 0x0AC5,

+										   0x0AC7, 0x0AC9, 0x0ACB, 0x0ACD, 0x0B01, 0x0B03, 0x0B3E, 0x0B43,

+										   0x0B47, 0x0B48, 0x0B4B, 0x0B4D, 0x0B56, 0x0B57, 0x0B82, 0x0B83,

+										   0x0BBE, 0x0BC2, 0x0BC6, 0x0BC8, 0x0BCA, 0x0BCD, 0x0C01, 0x0C03,

+										   0x0C3E, 0x0C44, 0x0C46, 0x0C48, 0x0C4A, 0x0C4D, 0x0C55, 0x0C56,

+										   0x0C82, 0x0C83, 0x0CBE, 0x0CC4, 0x0CC6, 0x0CC8, 0x0CCA, 0x0CCD,

+										   0x0CD5, 0x0CD6, 0x0D02, 0x0D03, 0x0D3E, 0x0D43, 0x0D46, 0x0D48,

+										   0x0D4A, 0x0D4D, 0x0E34, 0x0E3A, 0x0E47, 0x0E4E, 0x0EB4, 0x0EB9,

+										   0x0EBB, 0x0EBC, 0x0EC8, 0x0ECD, 0x0F18, 0x0F19, 0x0F71, 0x0F84,

+										   0x0F86, 0x0F8B, 0x0F90, 0x0F95, 0x0F99, 0x0FAD, 0x0FB1, 0x0FB7,

+										   0x20D0, 0x20DC, 0x302A, 0x302F,

+			};

+

+			int[] combiningCharChar = {

+										  0x05BF, 0x05C4, 0x0670, 0x093C, 0x094D, 0x09BC, 0x09BE, 0x09BF,

+										  0x09D7, 0x0A02, 0x0A3C, 0x0A3E, 0x0A3F, 0x0ABC, 0x0B3C, 0x0BD7,

+										  0x0D57, 0x0E31, 0x0EB1, 0x0F35, 0x0F37, 0x0F39, 0x0F3E, 0x0F3F,

+										  0x0F97, 0x0FB9, 0x20E1, 0x3099, 0x309A,

+			};

+

+			//

+			// [88] Digit ::= ...

+			//

+

+			int[] digitRange = {

+								   0x0030, 0x0039, 0x0660, 0x0669, 0x06F0, 0x06F9, 0x0966, 0x096F,

+								   0x09E6, 0x09EF, 0x0A66, 0x0A6F, 0x0AE6, 0x0AEF, 0x0B66, 0x0B6F,

+								   0x0BE7, 0x0BEF, 0x0C66, 0x0C6F, 0x0CE6, 0x0CEF, 0x0D66, 0x0D6F,

+								   0x0E50, 0x0E59, 0x0ED0, 0x0ED9, 0x0F20, 0x0F29,

+			};

+

+			//

+			// [89] Extender ::= ...

+			//

+

+			int[] extenderRange = {

+									  0x3031, 0x3035, 0x309D, 0x309E, 0x30FC, 0x30FE,

+			};

+

+			int[] extenderChar = {

+									 0x00B7, 0x02D0, 0x02D1, 0x0387, 0x0640, 0x0E46, 0x0EC6, 0x3005,

+			};

+

+			//

+			// SpecialChar ::= '<', '&', '\n', '\r', ']'

+			//

+

+			int[] specialChar = {

+									'<', '&', '\n', '\r', ']',

+			};

+

+			//

+			// Initialize

+			//

+

+			// set valid characters

+			for (int i = 0; i < charRange.Length; i += 2) 

+			{

+				for (int j = charRange[i]; j <= charRange[i + 1]; j++) 

+				{

+					CHARS[j] = (byte)(CHARS[j] | VALID | CONTENT);

+				}

+			}

+

+			// remove special characters

+			for (int i = 0; i < specialChar.Length; i++) 

+			{

+				CHARS[specialChar[i]] = (byte)(CHARS[specialChar[i]] & ~CONTENT);

+			}

+

+			// set space characters

+			for (int i = 0; i < spaceChar.Length; i++) 

+			{

+				CHARS[spaceChar[i]] = (byte)(CHARS[spaceChar[i]] | SPACE);

+			}

+

+			// set name start characters

+			for (int i = 0; i < nameStartChar.Length; i++) 

+			{

+				CHARS[nameStartChar[i]] = (byte)(CHARS[nameStartChar[i]] | NAME_START | NAME | 

+					NCNAME_START | NCNAME);

+			}

+			for (int i = 0; i < letterRange.Length; i += 2) 

+			{

+				for (int j = letterRange[i]; j <= letterRange[i + 1]; j++) 

+				{

+					CHARS[j] = (byte)(CHARS[j] | NAME_START | NAME |	NCNAME_START | NCNAME);

+				}

+			}

+			for (int i = 0; i < letterChar.Length; i++) 

+			{

+				CHARS[letterChar[i]] = (byte)(CHARS[letterChar[i]] | NAME_START | NAME |

+					NCNAME_START | NCNAME);

+			}

+

+			// set name characters

+			for (int i = 0; i < nameChar.Length; i++) 

+			{

+				CHARS[nameChar[i]] = (byte)(CHARS[nameChar[i]] | NAME | NCNAME);

+			}

+			for (int i = 0; i < digitRange.Length; i += 2) 

+			{

+				for (int j = digitRange[i]; j <= digitRange[i + 1]; j++) 

+				{

+					CHARS[j] = (byte)(CHARS[j] | NAME | NCNAME);

+				}

+			}

+			for (int i = 0; i < combiningCharRange.Length; i += 2) 

+			{

+				for (int j = combiningCharRange[i]; j <= combiningCharRange[i + 1]; j++) 

+				{

+					CHARS[j] = (byte)(CHARS[j] | NAME | NCNAME);

+				}

+			}

+			for (int i = 0; i < combiningCharChar.Length; i++) 

+			{

+				CHARS[combiningCharChar[i]] = (byte)(CHARS[combiningCharChar[i]] | NAME | NCNAME);

+			}

+			for (int i = 0; i < extenderRange.Length; i += 2) 

+			{

+				for (int j = extenderRange[i]; j <= extenderRange[i + 1]; j++) 

+				{

+					CHARS[j] = (byte)(CHARS[j] | NAME | NCNAME);

+				}

+			}

+			for (int i = 0; i < extenderChar.Length; i++) 

+			{

+				CHARS[extenderChar[i]] = (byte)(CHARS[extenderChar[i]] | NAME | NCNAME);

+			}

+

+			// remove ':' from allowable NCNAME_START and NCNAME chars

+			CHARS[':'] = (byte)(CHARS[':'] & ~(NCNAME_START | NCNAME));

+

+			// set Pubid characters

+			for (int i = 0; i < pubidChar.Length; i++) 

+			{

+				CHARS[pubidChar[i]] = (byte)(CHARS[pubidChar[i]] | PUBID);

+			}

+			for (int i = 0; i < pubidRange.Length; i += 2) 

+			{

+				for (int j = pubidRange[i]; j <= pubidRange[i + 1]; j++) 

+				{

+					CHARS[j] = (byte)(CHARS[j] | PUBID);

+				}

+			}

+		}

+

+		private XmlConstructs()

+		{

+		}

+

+

+		//Static Methods

+

+		/// <summary>

+		/// Returns true if the specified character is valid.

+		/// </summary>

+		/// <param name="c">The character to check.</param>

+		public static bool IsValid(char c) 

+		{

+			return (CHARS[c] & VALID) != 0;

+		}

+

+		/// <summary>

+		/// Returns true if the specified character is invalid.

+		/// </summary>

+		/// <param name="c">The character to check.</param>

+		public static bool IsInvalid(char c) 

+		{

+			return !IsValid(c);

+		}

+

+		/// <summary>

+		/// Returns true if the specified character can be considered content.

+		/// </summary>

+		/// <param name="c">The character to check.</param>

+		public static bool IsContent(char c) 

+		{

+			return (CHARS[c] & CONTENT) != 0;

+		}

+

+		/// <summary>

+		/// Returns true if the specified character can be considered markup.

+		/// Markup characters include '&lt;', '&amp;', and '%'.

+		/// </summary>

+		/// <param name="c">The character to check.</param>

+		public static bool IsMarkup(char c) 

+		{

+			return c == '<' || c == '&' || c == '%';

+		}

+

+		/// <summary>

+		/// Returns true if the specified character is a space character

+		/// as defined by production [3] in the XML 1.0 specification. 

+		/// </summary>

+		/// <param name="c">The character to check.</param>

+		/// <returns></returns>

+		public static bool IsSpace(char c) 

+		{

+			return (CHARS[c] & SPACE) != 0;

+		}

+

+		/// <summary>

+		/// Returns true if the specified character is a valid name start

+		/// character as defined by production [5] in the XML 1.0 specification.

+		/// </summary>

+		/// <param name="c">The character to check.</param>

+		public static bool IsNameStart(char c) 

+		{

+			return (CHARS[c] & NAME_START) != 0;

+		} 

+

+		/// <summary>

+		/// Returns true if the specified character is a valid name

+		/// character as defined by production [4] in the XML 1.0 specification.

+		/// </summary>

+		/// <param name="c">The character to check.</param>

+		public static bool IsName(char c) 

+		{

+			return (CHARS[c] & NAME) != 0;

+		} 

+

+		/// <summary>

+		/// Returns true if the specified character is a valid NCName start

+		/// character as defined by production [4] in Namespaces in XML

+		/// recommendation.

+		/// </summary>

+		/// <param name="c">The character to check.</param>

+		/// <returns></returns>

+		public static bool IsNCNameStart(char c) 

+		{

+			return (CHARS[c] & NCNAME_START) != 0;

+		} 

+

+		/// <summary>

+		/// Returns true if the specified character is a valid NCName

+		/// character as defined by production [5] in Namespaces in XML

+		/// recommendation.

+		/// </summary>

+		/// <param name="c"></param>

+		/// <returns></returns>

+		public static bool IsNCName(char c) 

+		{

+			return (CHARS[c] & NCNAME) != 0;

+		} 

+

+		/// <summary>

+		/// Returns true if the specified character is a valid Pubid

+		/// character as defined by production [13] in the XML 1.0 specification.

+		/// </summary>

+		/// <param name="c">The character to check</param>

+		public static bool IsPubid(char c) 

+		{

+			return (CHARS[c] & PUBID) != 0;

+		}

+

+		/// <summary>

+		/// Check to see if a string is a valid Name according to [5]

+		/// in the XML 1.0 Recommendation

+		/// </summary>

+		/// <param name="name">The string to check</param>

+		public static bool IsValidName(String name, out Exception err) 

+		{

+			err = null;

+			if (name.Length == 0)

+			{

+				err = new XmlException("Name can not be an empty string",null);

+				return false;

+			}

+			char ch = name[0];

+			if( IsNameStart(ch) == false)

+			{

+				err = new XmlException("The character '"+ch+"' cannot start a Name",null);

+				return false;

+			}

+			for (int i = 1; i < name.Length; i++ ) 

+			{

+				ch = name[i];

+				if( IsName( ch ) == false )

+				{

+					err = new XmlException("The character '"+ch+"' is not allowed in a Name",null);

+					return false;

+				}

+			}

+			return true;

+		}

+

+		/// <summary>

+		/// Check to see if a string is a valid NCName according to [4]

+		/// from the XML Namespaces 1.0 Recommendation

+		/// </summary>

+		/// <param name="ncName">The string to check</param>

+		public static bool IsValidNCName(String ncName, out Exception err) 

+		{

+			err = null;

+			if (ncName.Length == 0)

+			{

+				err = new XmlException("NCName can not be an empty string",null);

+				return false;

+			}

+			char ch = ncName[0];

+			if( IsNCNameStart(ch) == false)

+			{

+				err = new XmlException("The character '"+ch+"' cannot start a NCName",null);

+				return false;

+			}

+			for (int i = 1; i < ncName.Length; i++ ) 

+			{

+				ch = ncName[i];

+				if( IsNCName( ch ) == false )

+				{

+					err = new XmlException("The character '"+ch+"' is not allowed in a NCName",null);

+					return false;

+				}

+			}

+			return true;

+		}

+

+		/// <summary>

+		/// Check to see if a string is a valid Nmtoken according to [7]

+		/// in the XML 1.0 Recommendation

+		/// </summary>

+		/// <param name="nmtoken">The string to check.</param>

+		public static bool IsValidNmtoken(String nmtoken, out Exception err) 

+		{

+			err = null;

+			if (nmtoken.Length == 0)

+			{

+				err = new XmlException("NMTOKEN can not be an empty string", null);

+				return false;

+			}

+			for (int i = 0; i < nmtoken.Length; i++ ) 

+			{

+				char ch = nmtoken[i];

+				if(  ! IsName( ch ) )

+				{

+					err = new XmlException("The character '"+ch+"' is not allowed in a NMTOKEN",null);

+					return false;

+				}

+			}

+			return true;

+		}

+

+		// encodings

+

+		/// <summary>

+		/// Returns true if the encoding name is a valid IANA encoding.

+		/// This method does not verify that there is a decoder available

+		/// for this encoding, only that the characters are valid for an

+		/// IANA encoding name.

+		/// </summary>

+		/// <param name="ianaEncoding">The encoding to check.</param>

+		/// <returns></returns>

+		public static bool IsValidIANAEncoding(String ianaEncoding) 

+		{

+			if (ianaEncoding != null) 

+			{

+				int length = ianaEncoding.Length;

+				if (length > 0) 

+				{

+					char c = ianaEncoding[0];

+					if ((c >= 'A' && c <= 'Z') || (c >= 'a' && c <= 'z')) 

+					{

+						for (int i = 1; i < length; i++) 

+						{

+							c = ianaEncoding[i];

+							if ((c < 'A' || c > 'Z') && (c < 'a' || c > 'z') &&

+								(c < '0' || c > '9') && c != '.' && c != '_' &&

+								c != '-') 

+							{

+								return false;

+							}

+						}

+						return true;

+					}

+				}

+			}

+			return false;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlConvert.cs b/mcs/class/System.XML/System.Xml/XmlConvert.cs
new file mode 100755
index 00000000000..5c3e278b9b4
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlConvert.cs
@@ -0,0 +1,254 @@
+// Author: Dwivedi, Ajay kumar

+//            Adwiv@Yahoo.com

+// XmlConvert.cs: Xml data type conversion

+// 

+using System;

+using System.Globalization;

+

+namespace System.Xml {

+

+	public class XmlConvert {

+

+		public XmlConvert()

+		{}

+

+		// Methods

+		[MonoTODO]

+		public static string DecodeName(string name)

+		{

+			return null;

+		}

+		[MonoTODO]

+		public static string EncodeLocalName(string name)

+		{

+			return null;

+		}

+		[MonoTODO]

+		public static string EncodeName(string name)

+		{

+			return null;

+		}

+		[MonoTODO]

+		public static string EncodeNmToken(string name)

+		{

+			return null;

+		}

+

+		// {true, false, 1, 0}

+		public static bool ToBoolean(string s)

+		{

+			s = s.Trim();

+			switch(s)

+			{

+				case "1":

+					return true;

+				case "true":

+					return true;

+				case "0":

+					return false;

+				case "false":

+					return false;

+				default:

+					throw new FormatException(s + " is not a valid boolean value");

+			}

+		}

+

+		public static byte ToByte(string s)

+		{

+			return Byte.Parse(s, CultureInfo.InvariantCulture);

+		}

+

+		public static char ToChar(string s)

+		{

+			return Char.Parse(s);

+		}

+

+		public static DateTime ToDateTime(string s)

+		{

+			return DateTime.Parse(s);

+		}

+

+		public static DateTime ToDateTime(string s, string format)

+		{

+			DateTimeFormatInfo d = new DateTimeFormatInfo();

+			d.FullDateTimePattern = format;

+			return DateTime.Parse(s, d);

+		}

+

+		[MonoTODO]

+		public static DateTime ToDateTime(string s, string[] formats)

+		{

+			return DateTime.Parse(s);

+		}

+		

+		public static Decimal ToDecimal(string s)

+		{

+			return Decimal.Parse(s, CultureInfo.InvariantCulture);

+		}

+		

+		public static double ToDouble(string s)

+		{

+			return Double.Parse(s, CultureInfo.InvariantCulture);

+		}

+

+		public static Guid ToGuid(string s)

+		{

+			return new Guid(s);

+		}

+

+		public static short ToInt16(string s)

+		{

+			return Int16.Parse(s, CultureInfo.InvariantCulture);

+		}

+

+		public static int ToInt32(string s)

+		{

+			return Int32.Parse(s, CultureInfo.InvariantCulture);

+		}

+

+		public static long ToInt64(string s)

+		{

+			return Int64.Parse(s, CultureInfo.InvariantCulture);

+		}

+

+		[CLSCompliant (false)]

+		public static SByte ToSByte(string s)

+		{

+			return SByte.Parse(s, CultureInfo.InvariantCulture);

+		}

+

+		public static float ToSingle(string s)

+		{

+			return Single.Parse(s, CultureInfo.InvariantCulture);

+		}

+

+		public static string ToString(Guid value)

+		{

+			return value.ToString("D",CultureInfo.InvariantCulture);

+		}

+

+		public static string ToString(int value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+

+		public static string ToString(short value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+

+		public static string ToString(byte value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+

+		public static string ToString(long value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+

+		public static string ToString(char value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+

+		public static string ToString(bool value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+

+		[CLSCompliant (false)]

+		public static string ToString(SByte value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+		public static string ToString(Decimal value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+

+		[CLSCompliant (false)]

+		public static string ToString(UInt64 value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+		public static string ToString(TimeSpan value)

+		{

+			return value.ToString();

+		}

+		public static string ToString(double value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+		public static string ToString(float value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+

+		[CLSCompliant (false)]

+		public static string ToString(UInt32 value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+

+		[CLSCompliant (false)]

+		public static string ToString(UInt16 value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+		public static string ToString(DateTime value)

+		{

+			return value.ToString(CultureInfo.InvariantCulture);

+		}

+		public static string ToString(DateTime value, string format)

+		{

+			return value.ToString(format, CultureInfo.InvariantCulture);

+		}

+		public static TimeSpan ToTimeSpan(string s)

+		{

+			return TimeSpan.Parse(s);

+		}

+

+		[CLSCompliant (false)]

+		public static UInt16 ToUInt16(string s)

+		{

+			return UInt16.Parse(s, CultureInfo.InvariantCulture);

+		}

+

+		[CLSCompliant (false)]

+		public static UInt32 ToUInt32(string s)

+		{

+			return UInt32.Parse(s, CultureInfo.InvariantCulture);

+		}

+

+		[CLSCompliant (false)]

+		public static UInt64 ToUInt64(string s)

+		{

+			return UInt64.Parse(s, CultureInfo.InvariantCulture);

+		}

+

+		public static string VerifyName(string name)

+		{

+			Exception innerEx;

+			if(name == null)

+				throw new ArgumentNullException("name");

+

+			if(XmlConstructs.IsValidName(name, out innerEx))

+				return name;

+			

+			throw new XmlException("'"+name+"' is not a valid XML Name",null);

+		}

+

+		public static string VerifyNCName(string ncname)

+		{

+			Exception innerEx;

+			if(ncname == null)

+				throw new ArgumentNullException("ncname");

+

+			if(XmlConstructs.IsValidName(ncname, out innerEx))

+				return ncname;

+			

+			throw new XmlException("'"+ncname+"' is not a valid XML NCName",innerEx);

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlDeclaration.cs b/mcs/class/System.XML/System.Xml/XmlDeclaration.cs
new file mode 100644
index 00000000000..8f1974e4d9a
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlDeclaration.cs
@@ -0,0 +1,107 @@
+//
+// System.Xml.XmlDeclaration
+//
+// Author:
+//	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+using System;
+using System.Xml;
+
+namespace System.Xml
+{
+	public class XmlDeclaration : XmlLinkedNode
+	{
+		string encoding = "UTF-8"; // defaults to UTF-8
+		string standalone;
+		string version;
+
+		protected internal XmlDeclaration (string version, string encoding,
+						   string standalone, XmlDocument doc)
+			: base (doc)
+		{
+			if (encoding == null)
+				encoding = "";
+
+			if (standalone == null)
+				standalone = "";
+
+			this.version = version;
+			this.encoding = encoding;
+			this.standalone = standalone;
+		}
+
+		public string Encoding  {
+			get { return encoding; } 
+			set { encoding = (value == null) ? String.Empty : value; }
+		}
+
+		public override string InnerText {
+			get { return Value; }
+			set { ParseInput (value); }
+		}
+		
+		public override string LocalName {
+			get { return "xml"; }
+		}
+
+		public override string Name {
+			get { return "xml"; }
+		}
+
+		public override XmlNodeType NodeType {
+			get { return XmlNodeType.XmlDeclaration; }
+		}
+
+		public string Standalone {
+			get { return standalone; }
+			set {
+				if (value.ToUpper() == "YES")
+					standalone = "yes";
+				if (value.ToUpper() == "NO")
+					standalone = "no";
+			}
+		}
+
+		public override string Value {
+			get {
+				string formatEncoding = "";
+				string formatStandalone = "";
+
+				if (encoding != String.Empty)
+					formatEncoding = String.Format (" encoding=\"{0}\"", encoding);
+
+				if (standalone != String.Empty)
+					formatStandalone = String.Format (" standalone=\"{0}\"", standalone);
+
+				return String.Format ("version=\"{0}\"{1}{2}", Version, formatEncoding, formatStandalone);
+			}
+			set { ParseInput (value); }
+		}
+
+		public string Version {
+			get { return version; }
+		}
+
+		public override XmlNode CloneNode (bool deep)
+		{
+			return new XmlDeclaration (Version, Encoding, standalone, OwnerDocument);
+		}
+
+		public override void WriteContentTo (XmlWriter w) {}
+
+		public override void WriteTo (XmlWriter w)
+		{
+			// This doesn't seem to match up very well with w.WriteStartDocument()
+			// so writing out custom here.
+			w.WriteRaw (String.Format ("<?xml {0}?>", Value));
+		}
+
+		void ParseInput (string input)
+		{			
+			Encoding = input.Split (new char [] { ' ' }) [1].Split (new char [] { '=' }) [1];
+			Standalone = input.Split (new char [] { ' ' }) [2].Split (new char [] { '=' }) [1];
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlDocument.cs b/mcs/class/System.XML/System.Xml/XmlDocument.cs
new file mode 100644
index 00000000000..54fbc3c8fcf
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlDocument.cs
@@ -0,0 +1,595 @@
+//
+// System.Xml.XmlDocument
+//
+// Authors:
+//   Daniel Weber (daniel-weber@austin.rr.com)
+//   Kral Ferch <kral_ferch@hotmail.com>
+//   Jason Diamond <jason@injektilo.org>
+//   Miguel de Icaza (miguel@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Daniel Weber
+// (C) 2002 Kral Ferch, Jason Diamond, Miguel de Icaza, Duncan Mak
+//
+
+using System;
+using System.IO;
+using System.Text;
+using System.Xml.XPath;
+using System.Diagnostics;
+using System.Collections;
+
+namespace System.Xml
+{
+	public class XmlDocument : XmlNode
+	{
+		#region Fields
+
+		XmlLinkedNode lastLinkedChild;
+		XmlNameTable nameTable;
+		string baseURI = String.Empty;
+
+		#endregion
+
+		#region Constructors
+
+		public XmlDocument () : base (null) { }
+
+		[MonoTODO]
+		protected internal XmlDocument (XmlImplementation imp) : base (null)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public XmlDocument (XmlNameTable nt) : base (null)
+		{
+			nameTable = nt;
+		}
+
+		#endregion
+
+		#region Events
+
+		public event XmlNodeChangedEventHandler NodeChanged;
+
+		public event XmlNodeChangedEventHandler NodeChanging;
+
+		public event XmlNodeChangedEventHandler NodeInserted;
+
+		public event XmlNodeChangedEventHandler NodeInserting;
+
+		public event XmlNodeChangedEventHandler NodeRemoved;
+
+		public event XmlNodeChangedEventHandler NodeRemoving;
+
+		#endregion
+
+		#region Properties
+
+		public override string BaseURI {
+			get {
+				return baseURI;
+			}
+		}
+
+		public XmlElement DocumentElement {
+			get {
+				XmlNode node = FirstChild;
+
+				while (node != null) {
+					if (node is XmlElement)
+						break;
+					node = node.NextSibling;
+				}
+
+				return node != null ? node as XmlElement : null;
+			}
+		}
+
+		[MonoTODO]
+		public virtual XmlDocumentType DocumentType {
+			get { throw new NotImplementedException(); }
+		}
+
+		[MonoTODO]
+		public XmlImplementation Implementation {
+			get { throw new NotImplementedException(); }
+		}
+
+		[MonoTODO ("Setter.")]
+		public override string InnerXml {
+			get {
+				// Not sure why this is an override.  Passing through for now.
+				return base.InnerXml;
+			}
+			set { throw new NotImplementedException(); }
+		}
+
+		public override bool IsReadOnly {
+			get { return false; }
+		}
+
+		internal override XmlLinkedNode LastLinkedChild {
+			get	{
+				return lastLinkedChild;
+			}
+
+			set {
+				lastLinkedChild = value;
+			}
+		}
+		
+		public override string LocalName {
+			get { return "#document"; }
+		}
+
+		public override string Name {
+			get { return "#document"; }
+		}
+
+		public XmlNameTable NameTable {
+			get { return nameTable; }
+		}
+
+		public override XmlNodeType NodeType {
+			get { return XmlNodeType.Document; }
+		}
+
+		public override XmlDocument OwnerDocument {
+			get { return null; }
+		}
+
+		[MonoTODO]
+		public bool PreserveWhitespace {
+			get { throw new NotImplementedException(); }
+			set { throw new NotImplementedException(); }
+		}
+
+		[MonoTODO]
+		public virtual XmlResolver XmlResolver {
+			set { throw new NotImplementedException(); }
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public override XmlNode CloneNode (bool deep)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public XmlAttribute CreateAttribute (string name)
+		{
+			return CreateAttribute (name, String.Empty);
+		}
+
+		public XmlAttribute CreateAttribute (string qualifiedName, string namespaceURI)
+		{
+			string prefix;
+			string localName;
+
+			ParseName (qualifiedName, out prefix, out localName);
+
+			return CreateAttribute (prefix, localName, namespaceURI);
+		}
+
+		public virtual XmlAttribute CreateAttribute (string prefix, string localName, string namespaceURI)
+		{
+			if ((localName == null) || (localName == String.Empty))
+				throw new ArgumentException ("The attribute local name cannot be empty.");
+
+			return new XmlAttribute (prefix, localName, namespaceURI, this);
+		}
+
+		public virtual XmlCDataSection CreateCDataSection (string data)
+		{
+			return new XmlCDataSection (data, this);
+		}
+
+		public virtual XmlComment CreateComment (string data)
+		{
+			return new XmlComment(data, this);
+		}
+
+		[MonoTODO]
+		protected internal virtual XmlAttribute CreateDefaultAttribute (string prefix, string localName, string namespaceURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlDocumentFragment CreateDocumentFragment ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual XmlDocumentType CreateDocumentType (string name, string publicId,
+								   string systemId, string internalSubset)
+		{
+			return new XmlDocumentType (name, publicId, systemId, internalSubset, this);
+		}
+
+		public XmlElement CreateElement (string name)
+		{
+			return CreateElement (name, String.Empty);
+		}
+
+		public XmlElement CreateElement (
+			string qualifiedName, 
+			string namespaceURI)
+		{
+			string prefix;
+			string localName;
+
+			ParseName (qualifiedName, out prefix, out localName);
+
+			return CreateElement (prefix, localName, namespaceURI);
+		}
+
+		public virtual XmlElement CreateElement (
+			string prefix,
+			string localName,
+			string namespaceURI)
+		{
+			if ((localName == null) || (localName == String.Empty))
+				throw new ArgumentException ("The local name for elements or attributes cannot be null or an empty string.");
+
+			return new XmlElement (prefix != null ? prefix : String.Empty, localName, namespaceURI != null ? namespaceURI : String.Empty, this);
+		}
+
+		[MonoTODO]
+		public virtual XmlEntityReference CreateEntityReference (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual XmlNode CreateNode (
+			string nodeTypeString,
+			string name,
+			string namespaceURI)
+		{
+			return CreateNode (GetNodeTypeFromString (nodeTypeString), name, namespaceURI);
+		}
+
+		public virtual XmlNode CreateNode (
+			XmlNodeType type,
+			string name,
+			string namespaceURI)
+		{
+			string prefix = null;
+			string localName = name;
+
+			if ((type == XmlNodeType.Attribute) || (type == XmlNodeType.Element) || (type == XmlNodeType.EntityReference))
+				ParseName (name, out prefix, out localName);
+			
+			return CreateNode (type, prefix, localName, namespaceURI);
+		}
+
+		public virtual XmlNode CreateNode (
+			XmlNodeType type,
+			string prefix,
+			string name,
+			string namespaceURI)
+		{
+			switch (type) {
+				case XmlNodeType.Attribute: return CreateAttribute (prefix, name, namespaceURI);
+				case XmlNodeType.CDATA: return CreateCDataSection (null);
+				case XmlNodeType.Comment: return CreateComment (null);
+				case XmlNodeType.Document: return new XmlDocument (); // TODO - test to see which constructor to use, i.e. use existing NameTable or not.
+				case XmlNodeType.DocumentFragment: return CreateDocumentFragment ();
+				case XmlNodeType.DocumentType: return CreateDocumentType (null, null, null, null);
+				case XmlNodeType.Element: return CreateElement (prefix, name, namespaceURI);
+				case XmlNodeType.EntityReference: return CreateEntityReference (null);
+				case XmlNodeType.ProcessingInstruction: return CreateProcessingInstruction (null, null);
+				case XmlNodeType.SignificantWhitespace: return CreateSignificantWhitespace (String.Empty);
+				case XmlNodeType.Text: return CreateTextNode (null);
+				case XmlNodeType.Whitespace: return CreateWhitespace (String.Empty);
+				case XmlNodeType.XmlDeclaration: return CreateXmlDeclaration ("1.0", null, null);
+				default: throw new ArgumentOutOfRangeException(String.Format("{0}\nParameter name: {1}",
+							 "Specified argument was out of the range of valid values", type.ToString ()));
+			}
+		}
+
+		public virtual XmlProcessingInstruction CreateProcessingInstruction (
+			string target,
+			string data)
+		{
+			return new XmlProcessingInstruction (target, data, this);
+		}
+
+		public virtual XmlSignificantWhitespace CreateSignificantWhitespace (string text)
+		{
+			foreach (char c in text)
+				if ((c != ' ') && (c != '\r') && (c != '\n') && (c != '\t'))
+				    throw new ArgumentException ("Invalid whitespace characters.");
+			 
+			return new XmlSignificantWhitespace (text, this);
+		}
+
+		public virtual XmlText CreateTextNode (string text)
+		{
+			return new XmlText (text, this);
+		}
+
+		public virtual XmlWhitespace CreateWhitespace (string text)
+		{
+			foreach (char c in text)
+				if ((c != ' ') && (c != '\r') && (c != '\n') && (c != '\t'))
+				    throw new ArgumentException ("Invalid whitespace characters.");
+			 
+			return new XmlWhitespace (text, this);
+		}
+
+		public virtual XmlDeclaration CreateXmlDeclaration (string version, string encoding,
+								    string standalone)
+		{
+			if (version != "1.0")
+				throw new ArgumentException ("version string is not correct.");
+
+			if  ((standalone != null) && !((standalone == "yes") || (standalone == "no")))
+				throw new ArgumentException ("standalone string is not correct.");
+			
+			return new XmlDeclaration (version, encoding, standalone, this);
+		}
+
+		[MonoTODO]
+		public virtual XmlElement GetElementById (string elementId)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual XmlNodeList GetElementsByTagName (string name)
+		{
+			ArrayList nodeArrayList = new ArrayList ();
+			this.searchNodesRecursively (this, name, String.Empty, nodeArrayList);
+			return new XmlNodeArrayList (nodeArrayList);
+		}
+
+		private void searchNodesRecursively (XmlNode argNode, string argName, string argNamespaceURI, 
+			ArrayList argArrayList)
+		{
+			XmlNodeList xmlNodeList = argNode.ChildNodes;
+			foreach (XmlNode node in xmlNodeList){
+				if (node.LocalName.Equals (argName) && node.NamespaceURI.Equals (argNamespaceURI))
+					argArrayList.Add (node);
+				else	
+					this.searchNodesRecursively (node, argName, argNamespaceURI, argArrayList);
+			}
+		}
+
+		public virtual XmlNodeList GetElementsByTagName (string localName, string namespaceURI)
+		{
+			ArrayList nodeArrayList = new ArrayList ();
+			this.searchNodesRecursively (this, localName, namespaceURI, nodeArrayList);
+			return new XmlNodeArrayList (nodeArrayList);
+		}
+
+		private XmlNodeType GetNodeTypeFromString (string nodeTypeString)
+		{
+			switch (nodeTypeString) {
+				case "attribute": return XmlNodeType.Attribute;
+				case "cdatasection": return XmlNodeType.CDATA;
+				case "comment": return XmlNodeType.Comment;
+				case "document": return XmlNodeType.Document;
+				case "documentfragment": return XmlNodeType.DocumentFragment;
+				case "documenttype": return XmlNodeType.DocumentType;
+				case "element": return XmlNodeType.Element;
+				case "entityreference": return XmlNodeType.EntityReference;
+				case "processinginstruction": return XmlNodeType.ProcessingInstruction;
+				case "significantwhitespace": return XmlNodeType.SignificantWhitespace;
+				case "text": return XmlNodeType.Text;
+				case "whitespace": return XmlNodeType.Whitespace;
+				default:
+					throw new ArgumentException(String.Format("The string doesn't represent any node type : {0}.", nodeTypeString));
+			}
+		}
+
+		[MonoTODO]
+		public virtual XmlNode ImportNode (XmlNode node, bool deep)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual void Load (Stream inStream)
+		{
+			XmlReader xmlReader = new XmlTextReader (inStream);
+			Load (xmlReader);
+		}
+
+		public virtual void Load (string filename)
+		{
+			baseURI = filename;
+			XmlReader xmlReader = new XmlTextReader (new StreamReader (filename));
+			Load (xmlReader);
+		}
+
+		[MonoTODO]
+		public virtual void Load (TextReader txtReader)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual void Load (XmlReader xmlReader)
+		{
+			// Reset our document
+			// For now this just means removing all our children but later this
+			// may turn out o need to call a private method that resets other things
+			// like properties we have, etc.
+			RemoveAll ();
+
+			XmlNode currentNode = this;
+			XmlNode newNode;
+
+			while (xmlReader.Read ()) 
+			{
+				switch (xmlReader.NodeType) {
+
+				case XmlNodeType.CDATA:
+					newNode = CreateCDataSection(xmlReader.Value);
+					currentNode.AppendChild (newNode);
+					break;
+
+				case XmlNodeType.Comment:
+					newNode = CreateComment (xmlReader.Value);
+					currentNode.AppendChild (newNode);
+					break;
+
+				case XmlNodeType.Element:
+					XmlElement element = CreateElement (xmlReader.Prefix, xmlReader.LocalName, xmlReader.NamespaceURI);
+					currentNode.AppendChild (element);
+
+					// set the element's attributes.
+					while (xmlReader.MoveToNextAttribute ()) {
+						XmlAttribute attribute = CreateAttribute (xmlReader.Prefix, xmlReader.LocalName, xmlReader.NamespaceURI);
+						attribute.Value = xmlReader.Value;
+						element.SetAttributeNode (attribute);
+					}
+
+					xmlReader.MoveToElement ();
+
+					// if this element isn't empty, push it onto our "stack".
+					if (!xmlReader.IsEmptyElement)
+						currentNode = element;
+
+					break;
+
+				case XmlNodeType.EndElement:
+					currentNode = currentNode.ParentNode;
+					break;
+
+				case XmlNodeType.ProcessingInstruction:
+					newNode = CreateProcessingInstruction (xmlReader.Name, xmlReader.Value);
+					currentNode.AppendChild (newNode);
+					break;
+
+				case XmlNodeType.Text:
+					newNode = CreateTextNode (xmlReader.Value);
+					currentNode.AppendChild (newNode);
+					break;
+				}
+			}
+		}
+
+		public virtual void LoadXml (string xml)
+		{
+			XmlReader xmlReader = new XmlTextReader (new StringReader (xml));
+			Load (xmlReader);
+		}
+
+		internal void onNodeChanged (XmlNode node, XmlNode Parent)
+		{
+			if (NodeChanged != null)
+				NodeChanged (node, new XmlNodeChangedEventArgs
+					(XmlNodeChangedAction.Change,
+					node, Parent, Parent));
+		}
+
+		internal void onNodeChanging(XmlNode node, XmlNode Parent)
+		{
+			if (NodeChanging != null)
+				NodeChanging (node, new XmlNodeChangedEventArgs
+					(XmlNodeChangedAction.Change,
+					node, Parent, Parent));
+		}
+
+		internal void onNodeInserted (XmlNode node, XmlNode newParent)
+		{
+			if (NodeInserted != null)
+				NodeInserted (node, new XmlNodeChangedEventArgs
+					(XmlNodeChangedAction.Insert,
+					node, null, newParent));
+		}
+
+		internal void onNodeInserting (XmlNode node, XmlNode newParent)
+		{
+			if (NodeInserting != null)
+				NodeInserting (node, new XmlNodeChangedEventArgs
+					(XmlNodeChangedAction.Insert,
+					node, null, newParent));
+		}
+
+		internal void onNodeRemoved (XmlNode node, XmlNode oldParent)
+		{
+			if (NodeRemoved != null)
+				NodeRemoved (node, new XmlNodeChangedEventArgs
+					(XmlNodeChangedAction.Remove,
+					node, oldParent, null));
+		}
+
+		internal void onNodeRemoving (XmlNode node, XmlNode oldParent)
+		{
+			if (NodeRemoving != null)
+				NodeRemoving (node, new XmlNodeChangedEventArgs
+					(XmlNodeChangedAction.Remove,
+					node, oldParent, null));
+		}
+
+		private void ParseName (string name, out string prefix, out string localName)
+		{
+			int indexOfColon = name.IndexOf (':');
+			
+			if (indexOfColon != -1) {
+				prefix = name.Substring (0, indexOfColon);
+				localName = name.Substring (indexOfColon + 1);
+			} else {
+				prefix = "";
+				localName = name;
+			}
+		}
+
+		[MonoTODO]
+		public virtual XmlNode ReadNode(XmlReader reader)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Verify what encoding is used by default;  Should use PreserveWhiteSpace")]
+		public virtual void Save(Stream outStream)
+		{
+			XmlTextWriter xmlWriter = new XmlTextWriter (outStream, Encoding.UTF8);
+			WriteContentTo (xmlWriter);
+			xmlWriter.Close ();
+		}
+
+		[MonoTODO ("Verify what encoding is used by default; Should use PreseveWhiteSpace")]
+		public virtual void Save (string filename)
+		{
+			XmlTextWriter xmlWriter = new XmlTextWriter (filename, Encoding.UTF8);
+			WriteContentTo (xmlWriter);
+			xmlWriter.Close ();
+		}
+
+		[MonoTODO]
+		public virtual void Save (TextWriter writer)
+		{
+			XmlTextWriter xmlWriter = new XmlTextWriter (writer);
+			WriteContentTo (xmlWriter);
+			xmlWriter.Flush ();
+		}
+
+		[MonoTODO ("Should preserve white space if PreserveWhisspace is set")]
+		public virtual void Save (XmlWriter xmlWriter)
+		{
+			//
+			// This should preserve white space if PreserveWhiteSpace is true
+			//
+			WriteContentTo (xmlWriter);
+			xmlWriter.Flush ();
+		}
+
+		public override void WriteContentTo (XmlWriter w)
+		{
+			foreach(XmlNode childNode in ChildNodes)
+				childNode.WriteTo(w);
+		}
+
+		public override void WriteTo (XmlWriter w)
+		{
+			WriteContentTo(w);
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentFragment.cs b/mcs/class/System.XML/System.Xml/XmlDocumentFragment.cs
new file mode 100644
index 00000000000..8bc9aa4aac3
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlDocumentFragment.cs
@@ -0,0 +1,84 @@
+//

+// System.Xml.XmlDocumentFragment

+//

+// Author:

+//   Duncan Mak  (duncan@ximian.com)

+//

+// (C), Ximian, Inc

+//

+using System;

+

+namespace System.Xml

+{

+	public class XmlDocumentFragment : XmlNode

+	{

+		#region Constructor

+

+		protected internal XmlDocumentFragment (XmlDocument doc)

+			: base (doc)

+		{

+		}

+		

+		#endregion

+		#region Properties

+

+		[MonoTODO]

+		public override string InnerXml {

+			set { throw new NotImplementedException (); }

+			get { throw new NotImplementedException (); }

+		}

+		

+		public override string LocalName {

+			get { return "#document-fragment"; }

+		}

+

+

+		public override string Name { 

+			get { return "#document-fragment"; }

+		}

+

+		public override XmlNodeType NodeType {

+			get { return XmlNodeType.DocumentFragment; }

+		}

+

+		public override XmlDocument OwnerDocument {

+			get { return base.OwnerDocument; }

+		}

+

+		public override XmlNode ParentNode {

+			get { return null; } // it's always null here.

+		}

+

+		#endregion

+

+		#region Methods		

+		public override XmlNode CloneNode (bool deep)

+		{

+			if (deep) { // clone document + child nodes

+				XmlNode node = FirstChild;

+

+				while ((node != null) && (node.HasChildNodes)) {

+					AppendChild (node.NextSibling.CloneNode (false));

+					node = node.NextSibling;

+				}

+

+				return node;

+			} else

+				return new XmlDocumentFragment (OwnerDocument);

+		}

+

+		[MonoTODO]

+		public override void WriteContentTo (XmlWriter w)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public override void WriteTo (XmlWriter w)

+		{

+			throw new NotImplementedException ();

+		}

+

+		#endregion

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
new file mode 100644
index 00000000000..4c763000834
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlDocumentNavigator.cs
@@ -0,0 +1,317 @@
+//
+// System.Xml.XmlDocumentNavigator
+//
+// Author:
+//   Jason Diamond <jason@injektilo.org>
+//
+// (C) 2002 Jason Diamond
+//
+

+using System;

+using System.Collections;

+using System.Xml;

+using System.Xml.XPath;

+

+namespace System.Xml

+{

+	internal class XmlDocumentNavigator : XPathNavigator

+	{

+		#region Constructors

+

+		[MonoTODO]
+		internal XmlDocumentNavigator(XmlNode node)

+		{

+			this.node = node;

+		}

+

+		#endregion

+

+		#region Fields

+

+		private XmlNode node;

+		private IEnumerator attributesEnumerator;

+

+		#endregion

+
+		#region Properties
+
+		[MonoTODO]
+		public override string BaseURI {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public override bool HasAttributes {
+			get {
+				if (node.Attributes != null)
+					foreach (XmlAttribute attribute in node.Attributes)
+						if (attribute.NamespaceURI != "http://www.w3.org/2000/xmlns/")
+							return true;
+				return false;
+			}
+		}
+
+		public override bool HasChildren {
+			get {
+				XPathNodeType nodeType = NodeType;
+				bool canHaveChildren = nodeType == XPathNodeType.Root || nodeType == XPathNodeType.Element;
+				return canHaveChildren && node.FirstChild != null;
+			}
+		}
+
+		public override bool IsEmptyElement {
+			get {
+				return node.NodeType == XmlNodeType.Element && !HasChildren;
+			}
+		}
+
+		public override string LocalName {
+			get {
+				XPathNodeType nodeType = NodeType;
+				bool canHaveName = 
+					nodeType == XPathNodeType.Element || 
+					nodeType == XPathNodeType.Attribute || 
+					nodeType == XPathNodeType.ProcessingInstruction ||
+					nodeType == XPathNodeType.Namespace;
+				return canHaveName ? node.LocalName : String.Empty;
+			}
+		}
+
+		public override string Name {
+			get {
+				XPathNodeType nodeType = NodeType;
+				bool canHaveName = 
+					nodeType == XPathNodeType.Element || 
+					nodeType == XPathNodeType.Attribute || 
+					nodeType == XPathNodeType.ProcessingInstruction ||
+					nodeType == XPathNodeType.Namespace;
+				return canHaveName ? node.Name : String.Empty;
+			}
+		}
+
+		public override string NamespaceURI {
+			get {
+				return node.NamespaceURI;
+			}
+		}
+
+		[MonoTODO]
+		public override XmlNameTable NameTable {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public override XPathNodeType NodeType {
+			get {
+				switch (node.NodeType) {
+				case XmlNodeType.Document:
+					return XPathNodeType.Root;
+				case XmlNodeType.Element:
+					return XPathNodeType.Element;
+				case XmlNodeType.Attribute:
+					return XPathNodeType.Attribute;
+				case XmlNodeType.Text:
+					return XPathNodeType.Text;
+				case XmlNodeType.Whitespace:
+					return XPathNodeType.Whitespace;
+				case XmlNodeType.SignificantWhitespace:
+					return XPathNodeType.SignificantWhitespace;
+				case XmlNodeType.Comment:
+					return XPathNodeType.Comment;
+				case XmlNodeType.ProcessingInstruction:
+					return XPathNodeType.ProcessingInstruction;
+				}
+				throw new InvalidOperationException ();
+			}
+		}
+
+		public override string Prefix {
+			get {
+				return node.Prefix;
+			}
+		}
+
+		public override string Value {
+			get {
+				switch (NodeType) {
+				case XPathNodeType.Attribute:
+					return node.Value;
+				case XPathNodeType.Element:
+					return node.InnerText;
+				case XPathNodeType.Comment:
+					return node.Value;
+				case XPathNodeType.ProcessingInstruction:
+					return node.Value;
+				case XPathNodeType.Text:
+					return node.Value;
+				case XPathNodeType.Whitespace:
+					return node.Value;
+				case XPathNodeType.SignificantWhitespace:
+					return node.Value;
+				case XPathNodeType.Root:
+					return node.InnerText;
+				}
+				return String.Empty;
+			}
+		}
+
+		[MonoTODO]
+		public override string XmlLang {
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public override XPathNavigator Clone ()
+		{
+			return new XmlDocumentNavigator (node);
+		}
+
+		[MonoTODO]
+		public override string GetAttribute (string localName, string namespaceURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override string GetNamespace (string name)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		public override bool IsSamePosition (XPathNavigator other)
+		{
+			XmlDocumentNavigator otherDocumentNavigator = other as XmlDocumentNavigator;
+			if (otherDocumentNavigator != null)
+				return node == otherDocumentNavigator.node;
+			return false;
+		}
+
+		public override bool MoveTo (XPathNavigator other)
+		{
+			XmlDocumentNavigator otherDocumentNavigator = other as XmlDocumentNavigator;
+			if (otherDocumentNavigator != null) {
+				if (node.OwnerDocument == otherDocumentNavigator.node.OwnerDocument) {
+					node = otherDocumentNavigator.node;
+					return true;
+				}
+			}
+			return false;
+		}
+
+		[MonoTODO]
+		public override bool MoveToAttribute (string localName, string namespaceURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override bool MoveToFirst ()
+		{
+			if (node.NodeType != XmlNodeType.Attribute && node.ParentNode != null) {
+				node = node.ParentNode.FirstChild;
+				return true;
+			}
+			return false;
+		}
+
+		public override bool MoveToFirstAttribute ()
+		{
+			if (NodeType == XPathNodeType.Element) {
+				attributesEnumerator = node.Attributes.GetEnumerator ();
+				return MoveToNextAttribute ();
+			}
+			return false;
+		}
+
+		public override bool MoveToFirstChild ()
+		{
+			if (HasChildren) {
+				node = node.FirstChild;
+				return true;
+			}
+			return false;
+		}
+
+		[MonoTODO]
+		public override bool MoveToFirstNamespace (XPathNamespaceScope namespaceScope)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool MoveToId (string id)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool MoveToNamespace (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override bool MoveToNext ()
+		{
+			if (node.NextSibling != null) {
+				node = node.NextSibling;
+				return true;
+			}
+			return false;
+		}
+
+		public override bool MoveToNextAttribute ()
+		{
+			if (attributesEnumerator != null && attributesEnumerator.MoveNext ()) {
+				node = attributesEnumerator.Current as XmlAttribute;
+				return true;
+			}
+			return false;
+		}
+
+		[MonoTODO]
+		public override bool MoveToNextNamespace (XPathNamespaceScope namespaceScope)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override bool MoveToParent ()
+		{
+			if (node.NodeType == XmlNodeType.Attribute) {
+				XmlElement ownerElement = ((XmlAttribute)node).OwnerElement;
+				if (ownerElement != null) {
+					node = ownerElement;
+					return true;
+				}
+			} else if (node.ParentNode != null) {
+				node = node.ParentNode;
+				return true;
+			}
+			return false;
+		}
+
+		public override bool MoveToPrevious ()
+		{
+			if (node.PreviousSibling != null) {
+				node = node.PreviousSibling;
+				return true;
+			}
+			return false;
+		}
+
+		public override void MoveToRoot ()
+		{
+			if (node.NodeType != XmlNodeType.Document)
+				node = node.OwnerDocument;
+		}
+
+		internal XmlNode Node { get { return node; } }
+
+		#endregion
+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlDocumentType.cs b/mcs/class/System.XML/System.Xml/XmlDocumentType.cs
new file mode 100644
index 00000000000..83dbf11c7ea
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlDocumentType.cs
@@ -0,0 +1,98 @@
+//

+// System.Xml.XmlDocumentType.cs

+//

+// Author: Duncan Mak (duncan@ximian.com)

+//

+// (C) Ximian, Inc.

+//

+

+namespace System.Xml

+{

+	public class XmlDocumentType  : XmlLinkedNode

+	{

+		// Fields

+		string name;            // name of the document type

+		string publicId;        // public identifier on the DOCTYPE

+		string systemId;        // system identifier on the DOCTYPE

+		string internalSubset;  // value of the DTD internal subset

+		

+		// Constructor

+		protected internal XmlDocumentType (string name, string publicId,

+						    string systemId, string internalSubset,

+						    XmlDocument doc)

+			: base (doc)

+		{

+			this.name = name;

+			this.publicId = publicId;

+			this.systemId = systemId;

+			this.internalSubset = internalSubset;

+		}

+

+

+		// Properties

+		[MonoTODO]

+		public XmlNamedNodeMap Entities

+		{

+			get { return null; }

+		}

+			

+		public string InternalSubset

+		{

+			get { return internalSubset; }

+		}

+

+		public override bool IsReadOnly

+		{

+			get { return true; } // always return true

+		}

+

+		public override string LocalName

+		{

+			get { return name; }

+		}

+

+		public override string Name

+		{

+			get { return name; }

+		}

+

+		public override XmlNodeType NodeType

+		{

+			get { return XmlNodeType.DocumentType; }

+		}

+

+		[MonoTODO]

+		public XmlNamedNodeMap Notations

+		{

+			get { return null; }

+		}

+

+		public string PublicId

+		{

+			get { return publicId; }

+		}

+

+		public string SystemId

+		{

+			get { return systemId; }

+		}

+

+		// Methods

+		public override XmlNode CloneNode (bool deep)

+		{

+			// deep is ignored

+			return new XmlDocumentType (name, publicId, systemId,

+						    internalSubset, OwnerDocument);

+		}

+		

+		public override void WriteContentTo (XmlWriter w)

+		{

+			// No effect

+		}

+

+		[MonoTODO]

+		public override void WriteTo (XmlWriter w)

+		{

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlElement.cs b/mcs/class/System.XML/System.Xml/XmlElement.cs
new file mode 100644
index 00000000000..5c346024596
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlElement.cs
@@ -0,0 +1,304 @@
+//
+// System.Xml.XmlAttribute
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+using System.Collections;
+
+namespace System.Xml
+{
+	public class XmlElement : XmlLinkedNode
+	{
+		#region Fields
+
+		private XmlAttributeCollection attributes;
+		private XmlLinkedNode lastLinkedChild;
+		private string localName;
+		private string namespaceURI;
+		private string prefix;
+
+		#endregion
+
+		#region Constructor
+
+		protected internal XmlElement (
+			string prefix, 
+			string localName, 
+			string namespaceURI, 
+			XmlDocument doc) : base (doc)
+		{
+			this.prefix = prefix;
+			this.localName = localName;
+			this.namespaceURI = namespaceURI;
+
+			attributes = new XmlAttributeCollection (this);
+		}
+
+		#endregion
+
+		#region Properties
+
+		public override XmlAttributeCollection Attributes {
+			get { return attributes; }
+		}
+
+		public virtual bool HasAttributes {
+			get { return attributes.Count > 0; }
+		}
+
+		[MonoTODO ("Setter.")]
+		public override string InnerXml {
+			get {
+				// Not sure why this is an override.  Passing through for now.
+				return base.InnerXml;
+			}
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public bool IsEmpty {
+			get { throw new NotImplementedException (); }
+
+			set { throw new NotImplementedException (); }
+		}
+
+		internal override XmlLinkedNode LastLinkedChild {
+			get { return lastLinkedChild; }
+
+			set { lastLinkedChild = value; }
+		}
+		
+		public override string LocalName {
+			get { return localName; }
+		}
+
+		public override string Name {
+			get { 
+				return prefix != String.Empty ? prefix + ":" + localName : localName; 
+			}
+		}
+
+		public override string NamespaceURI {
+			get { return namespaceURI; }
+		}
+
+		[MonoTODO]
+		public override XmlNode NextSibling {
+			get { 
+				return base.NextSibling; 
+			}
+		}
+
+		public override XmlNodeType NodeType {
+			get { 
+				return XmlNodeType.Element; 
+			}
+		}
+
+		[MonoTODO]
+		public override XmlDocument OwnerDocument {
+			get { 
+				return base.OwnerDocument; 
+			}
+		}
+
+		public override string Prefix {
+			get { 
+				return prefix; 
+			}
+		}
+
+		#endregion
+
+		#region Methods
+		
+		[MonoTODO]
+		public override XmlNode CloneNode (bool deep)
+		{
+			XmlNode node =  new XmlElement (prefix, localName, namespaceURI,
+							OwnerDocument);
+
+			for (int i = 0; i < node.Attributes.Count; i++)
+				node.AppendChild (node.Attributes [i].CloneNode (false));
+			
+			if (deep) {
+				while ((node != null) && (node.HasChildNodes)) {					
+					AppendChild (node.NextSibling.CloneNode (true));
+					node = node.NextSibling;
+				}
+			} // shallow cloning
+				
+			//
+			// Reminder: Also look into Default attributes.
+			//
+			return node;
+		}
+
+		[MonoTODO]
+		public virtual string GetAttribute (string name)
+		{
+			XmlNode attributeNode = Attributes.GetNamedItem (name);
+			return attributeNode != null ? attributeNode.Value : String.Empty;
+		}
+
+		[MonoTODO]
+		public virtual string GetAttribute (string localName, string namespaceURI)
+		{
+			XmlNode attributeNode = Attributes.GetNamedItem (localName, namespaceURI);
+			return attributeNode != null ? attributeNode.Value : String.Empty;
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute GetAttributeNode (string name)
+		{
+			XmlNode attributeNode = Attributes.GetNamedItem (name);
+			return attributeNode != null ? attributeNode as XmlAttribute : null;
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute GetAttributeNode (string localName, string namespaceURI)
+		{
+			XmlNode attributeNode = Attributes.GetNamedItem (localName, namespaceURI);
+			return attributeNode != null ? attributeNode as XmlAttribute : null;
+		}
+
+		public virtual XmlNodeList GetElementsByTagName (string name)
+		{
+			ArrayList nodeArrayList = new ArrayList ();
+			this.searchNodesRecursively (this, name, String.Empty, nodeArrayList);
+			return new XmlNodeArrayList (nodeArrayList);
+		}
+
+		private void searchNodesRecursively (XmlNode argNode, string argName, string argNamespaceURI, 
+			ArrayList argArrayList)
+		{
+			XmlNodeList xmlNodeList = argNode.ChildNodes;
+			foreach (XmlNode node in xmlNodeList)
+			{
+				if (node.LocalName.Equals (argName) && node.NamespaceURI.Equals (argNamespaceURI))
+					argArrayList.Add (node);
+				else	
+					this.searchNodesRecursively (node, argName, argNamespaceURI, argArrayList);
+			}
+		}
+
+		public virtual XmlNodeList GetElementsByTagName (string localName, string namespaceURI)
+		{
+			ArrayList nodeArrayList = new ArrayList ();
+			this.searchNodesRecursively (this, localName, namespaceURI, nodeArrayList);
+			return new XmlNodeArrayList (nodeArrayList);
+		}
+
+		[MonoTODO]
+		public virtual bool HasAttribute (string name)
+		{
+			XmlNode attributeNode = Attributes.GetNamedItem (name);
+			return attributeNode != null;
+		}
+
+		[MonoTODO]
+		public virtual bool HasAttribute (string localName, string namespaceURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("Don't remove default attributes.")]
+		public override void RemoveAll ()
+		{
+			// Remove the child nodes.
+			base.RemoveAll ();
+
+			// Remove all attributes.
+			attributes.RemoveAll ();
+		}
+
+		public virtual void RemoveAllAttributes ()
+		{
+			attributes.RemoveAll ();
+		}
+
+		[MonoTODO]
+		public virtual void RemoveAttribute (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void RemoveAttribute (string localName, string namespaceURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlNode RemoveAttributeAt (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute RemoveAttributeNode (XmlAttribute oldAttr)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute RemoveAttributeNode (string localName, string namespaceURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void SetAttribute (string name, string value)
+		{
+			XmlAttribute attribute = OwnerDocument.CreateAttribute (name);
+			attribute.SetParentNode (this);
+			attribute.Value = value;
+			Attributes.SetNamedItem (attribute);
+		}
+
+		[MonoTODO]
+		public virtual string SetAttribute (string localName, string namespaceURI, string value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute SetAttributeNode (XmlAttribute newAttr)
+		{
+			newAttr.SetParentNode(this);
+			XmlNode oldAttr = Attributes.SetNamedItem(newAttr);
+			return oldAttr != null ? oldAttr as XmlAttribute : null;
+		}
+
+		[MonoTODO]
+		public virtual XmlAttribute SetAttributeNode (string localName, string namespaceURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override void WriteContentTo (XmlWriter w)
+		{
+			foreach(XmlNode childNode in ChildNodes)
+				childNode.WriteTo(w);
+		}
+
+		public override void WriteTo (XmlWriter w)
+		{
+			w.WriteStartElement(Prefix, LocalName, NamespaceURI);
+
+			foreach(XmlNode attributeNode in Attributes)
+				attributeNode.WriteTo(w);
+
+			WriteContentTo(w);
+
+			w.WriteEndElement();
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlEntity.cs b/mcs/class/System.XML/System.Xml/XmlEntity.cs
new file mode 100755
index 00000000000..f0778d8f3e7
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlEntity.cs
@@ -0,0 +1,123 @@
+//
+// System.Xml.XmlEntity.cs
+//
+// Author:
+// 	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Xml
+{
+	public class XmlEntity : XmlNode
+	{
+		#region Constructors
+
+		internal XmlEntity (string name, string NDATA, string publicId, string systemId,
+				    XmlDocument doc)
+			: base (doc)
+		{
+			this.name = name;
+			this.NDATA = NDATA;
+			this.publicId = publicId;
+			this.systemId = systemId;
+			this.baseUri = doc.BaseURI;
+		}
+
+		#endregion
+		
+		#region Fields
+
+		string name;
+		string NDATA;
+		string publicId;
+		string systemId;
+		string baseUri;
+
+		#endregion
+
+		#region Properties
+
+		public override string BaseURI {
+			get {  return baseUri; }
+		}
+
+		[MonoTODO]
+		public override string InnerText {
+			get { throw new NotImplementedException (); }
+			set { throw new InvalidOperationException ("This operation is not supported."); }
+		}
+
+		public override string InnerXml {
+			get { return String.Empty; }
+			set { throw new InvalidOperationException ("This operation is not supported."); }
+		}
+
+		public override bool IsReadOnly {
+			get { return true; } // always read-only.
+		}
+
+		public override string LocalName {
+			get { return name; }
+		}
+
+		public override string Name {
+			get { return name; }
+		}
+
+		public override XmlNodeType NodeType {
+			get { return XmlNodeType.Entity; }
+		}
+
+		public string NotationName {
+			get {
+				if (NDATA == null)
+					return null;
+				else
+					return NDATA;
+			}
+		}
+
+		public override string OuterXml {
+			get { return String.Empty; }
+		}
+
+		public string PublicId {
+			get {
+				if (publicId == null)
+					return null;
+				else
+					return publicId;
+			}
+		}
+
+		public string SystemId {
+			get {
+				if (publicId == null)
+					return null;
+				else
+					return systemId;
+			}
+		}
+		#endregion
+
+		#region Methods
+
+		public override XmlNode CloneNode (bool deep)
+		{
+			throw new InvalidOperationException ("This operation is not supported.");
+		}
+
+		public override void WriteContentTo (XmlWriter w)
+		{
+			// No effect.
+		}
+
+		public override void WriteTo (XmlWriter w)
+		{
+			// No effect.
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlEntityReference.cs b/mcs/class/System.XML/System.Xml/XmlEntityReference.cs
new file mode 100644
index 00000000000..b0b4aae79c9
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlEntityReference.cs
@@ -0,0 +1,70 @@
+//

+// System.Xml.XmlEntityReference.cs

+// Author:

+//	Duncan Mak  (duncan@ximian.com)

+//

+// (C) Ximian, Inc. http://www.ximian.com

+//

+

+using System;

+

+namespace System.Xml

+{

+	public class XmlEntityReference : XmlLinkedNode

+	{

+		string entityName;

+		

+		// Constructor

+		protected internal XmlEntityReference (string name, XmlDocument doc)

+			: base (doc)

+		{

+			entityName = name;

+		}

+

+		// Properties

+		[MonoTODO]

+		public override string BaseURI {

+			get { return null; }

+		}

+

+		public override bool IsReadOnly {

+			get { return true; } 

+		}

+

+		public override string LocalName {

+			get { return entityName; } // name of the entity referenced.

+		}

+

+		public override string Name {

+			get { return entityName; } // name of the entity referenced.

+		}

+

+		public override XmlNodeType NodeType {

+			get { return XmlNodeType.EntityReference; }

+		}

+

+		public override string Value {

+			get { return null; } // always return null here.

+		}

+

+		// Methods

+		public override XmlNode CloneNode (bool deep)

+		{

+			

+			// API docs: "The replacement text is not included." XmlNode.CloneNode

+			// "The replacement text is set when node is inserted." XmlEntityReference.CloneNode

+			//

+			return new XmlEntityReference ("", OwnerDocument);

+		}

+

+		[MonoTODO]

+		public override void WriteContentTo (XmlWriter w)

+		{

+		}

+

+		[MonoTODO]

+		public override void WriteTo (XmlWriter w)

+		{

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlException.cs b/mcs/class/System.XML/System.Xml/XmlException.cs
new file mode 100755
index 00000000000..f6efec719ad
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlException.cs
@@ -0,0 +1,82 @@
+//
+// XmlException.cs
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Xml
+{
+	[Serializable]
+	public class XmlException : SystemException
+	{
+		#region Fields
+
+		string msg; 	//  Cache message here because SystemException doesn't expose it
+		int lineNumber;
+		int linePosition;
+
+		#endregion
+
+		#region Constructors
+
+		public XmlException (string message, Exception innerException) 
+			: base (message, innerException)
+		{
+			msg = message;
+		}
+
+		protected XmlException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+			this.lineNumber = info.GetInt32 ("lineNumber");
+			this.linePosition = info.GetInt32 ("linePosition");
+		}
+
+		internal XmlException (string message)
+			: base (message)
+		{
+			msg = message;
+		}
+
+		internal XmlException (string message, int lineNumber, int linePosition) : base (message)
+		{
+			this.lineNumber = lineNumber;
+			this.linePosition = linePosition;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public int LineNumber {
+			get { return lineNumber; }
+		}
+
+		public int LinePosition {
+			get { return linePosition; }
+		}
+
+		public override string Message {
+			get { return msg; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("lineNumber", lineNumber);
+			info.AddValue ("linePosition", linePosition);
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlImplementation.cs b/mcs/class/System.XML/System.Xml/XmlImplementation.cs
new file mode 100644
index 00000000000..c76875d30bc
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlImplementation.cs
@@ -0,0 +1,32 @@
+//

+// System.Xml.XmlImplementation.cs

+//

+// Author: Duncan Mak (duncan@ximian.com)

+//

+// (C) Ximian, Inc.

+//

+

+namespace System.Xml

+{

+	public class XmlImplementation

+	{

+		public XmlImplementation ()

+			: base ()

+		{

+		}

+

+		public virtual XmlDocument CreateDocument ()

+		{

+			return new XmlDocument (this);

+		}

+

+		public bool HasFeature (string strFeature, string strVersion)

+		{

+			if ((strVersion == "XML") || (strVersion == "xml") // not case-sensitive

+			    && (strVersion == "1.0") || (strVersion == "2.0"))

+				return true;

+			else

+				return false;

+		}

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs b/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs
new file mode 100644
index 00000000000..090bedcf6b9
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlLinkedNode.cs
@@ -0,0 +1,66 @@
+//
+// System.Xml.XmlLinkedNode
+//
+// Authors:
+//   Jason Diamond <jason@injektilo.org>
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Jason Diamond, Kral Ferch
+//
+

+using System;
+
+namespace System.Xml
+{
+	public abstract class XmlLinkedNode : XmlNode
+	{
+		#region Fields
+
+		XmlLinkedNode nextSibling;
+
+		#endregion
+
+		#region Constructors
+		internal XmlLinkedNode(XmlDocument doc) : base(doc) { }
+
+		#endregion
+
+		#region Properties
+
+		public override XmlNode NextSibling
+		{
+			get {
+				if (Object.ReferenceEquals(nextSibling, ParentNode.LastLinkedChild.NextLinkedSibling) == false) {
+					return nextSibling;
+				}
+				else {
+					return null;
+				}
+			}
+		}
+
+		internal XmlLinkedNode NextLinkedSibling
+		{
+			get { return nextSibling; }
+			set { nextSibling = value; }
+		}
+
+		public override XmlNode PreviousSibling
+		{
+			get {
+				if (ParentNode != null) {
+					XmlNode node = ParentNode.FirstChild;
+					if (node != this) {
+						do {
+							if (node.NextSibling == this)
+								return node;
+						} while ((node = node.NextSibling) != null);
+					}					
+				}
+				return null;
+			}
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlNameTable.cs b/mcs/class/System.XML/System.Xml/XmlNameTable.cs
new file mode 100644
index 00000000000..7de896f0fc4
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNameTable.cs
@@ -0,0 +1,20 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-

+//

+// System.Xml.XmlNameTable.cs

+//

+// Author:

+//   Jason Diamond (jason@injektilo.org)

+//

+// (C) 2001 Jason Diamond  http://injektilo.org/

+//

+

+namespace System.Xml

+{

+	public abstract class XmlNameTable

+	{

+		public abstract string Add (string name);

+		public abstract string Add (char [] buffer, int offset, int length);

+		public abstract string Get (string name);

+		public abstract string Get (char [] buffer, int offset, int length);

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs b/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs
new file mode 100644
index 00000000000..4a92046fd93
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNamedNodeMap.cs
@@ -0,0 +1,106 @@
+//
+// System.Xml.XmlNamedNodeMap
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//   Duncan Mak  (duncan@ximian.com)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+using System.Collections;
+
+namespace System.Xml
+{
+	public class XmlNamedNodeMap : IEnumerable
+	{
+		XmlNode parent;
+		ArrayList nodeList;
+		bool readOnly = false;
+
+		internal XmlNamedNodeMap (XmlNode parent)
+		{
+			this.parent = parent;
+			nodeList = new ArrayList ();
+		}
+
+		public virtual int Count {
+			get { return nodeList.Count; }
+		}
+
+		public virtual IEnumerator GetEnumerator () 
+		{
+			return nodeList.GetEnumerator ();
+		}
+
+		public virtual XmlNode GetNamedItem (string name)
+		{
+			foreach (XmlNode node in nodeList) {
+				if (node.Name == name)
+					return node;
+			}
+			return null;
+		}
+
+		public virtual XmlNode GetNamedItem (string localName, string namespaceURI)
+		{
+			foreach (XmlNode node in nodeList) {
+				if ((node.LocalName == localName)
+				    && (node.NamespaceURI == namespaceURI))
+					return node;
+			}
+
+			return null;
+		}
+		
+		public virtual XmlNode Item (int index)
+		{
+			if (index < 0 || index > nodeList.Count)
+				return null;
+			else
+				return (XmlNode) nodeList [index];
+		}
+
+		public virtual XmlNode RemoveNamedItem (string name)
+		{			
+			foreach (XmlNode node in nodeList)
+				if (node.Name == name) {
+					nodeList.Remove (node);
+					return node;
+				}
+			
+			return null;
+		}
+
+		public virtual XmlNode RemoveNamedItem (string localName, string namespaceURI)
+		{
+			foreach (XmlNode node in nodeList)
+				if ((node.LocalName == localName)
+				    && (node.NamespaceURI == namespaceURI)) {
+					nodeList.Remove (node);
+					return node;
+				}
+
+			return null;
+		}
+
+		public virtual XmlNode SetNamedItem (XmlNode node)
+		{
+			if (readOnly || (node.OwnerDocument != parent.OwnerDocument))
+				throw new ArgumentException ("Cannot add to NodeMap.");
+						
+			foreach (XmlNode x in nodeList)
+				if (x.Name == node.Name) {
+					nodeList.Remove (x);
+					nodeList.Add (node);
+					return x;
+				}
+			
+			nodeList.Add (node);
+			return null;
+		}
+
+		internal ArrayList Nodes { get { return nodeList; } }
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
new file mode 100644
index 00000000000..745a1f5cca4
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNamespaceManager.cs
@@ -0,0 +1,158 @@
+//
+// XmlNamespaceManager.cs
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2001 Jason Diamond  http://injektilo.org/
+//
+
+using System.Collections;
+
+namespace System.Xml
+{
+	public class XmlNamespaceManager : IEnumerable
+	{
+		#region Fields
+
+		private XmlNameTable nameTable;
+		private NamespaceScope currentScope;
+
+		#endregion
+
+		#region Constructor
+
+		public XmlNamespaceManager (XmlNameTable nameTable)
+		{
+			this.nameTable = nameTable;
+
+			nameTable.Add ("xmlns");
+			nameTable.Add ("xml");
+			nameTable.Add (String.Empty);
+			nameTable.Add ("http://www.w3.org/2000/xmlns/");
+			nameTable.Add ("http://www.w3.org/XML/1998/namespace");
+
+			PushScope ();
+		}
+
+		#endregion
+
+		#region Properties
+
+		public virtual string DefaultNamespace {
+			get { return LookupNamespace (String.Empty); }
+		}
+
+		public XmlNameTable NameTable {
+			get { return nameTable; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		public virtual void AddNamespace (string prefix, string uri)
+		{
+			if (prefix == null)
+				throw new ArgumentNullException ("prefix", "Value cannot be null.");
+
+			if (uri == null)
+				throw new ArgumentNullException ("uri", "Value cannot be null.");
+
+			if (prefix.Length > 2 && prefix.Substring (0, 3).ToLower () == "xml")
+				throw new ArgumentException ("Prefixes beginning with \"xml\" (regardless of whether the characters are uppercase, lowercase, or some combination thereof) are reserved for use by XML.", "prefix");
+
+			if (currentScope.Namespaces == null)
+				currentScope.Namespaces = new Hashtable ();
+
+			if (prefix == String.Empty)
+				currentScope.Namespaces [prefix] = nameTable.Add (uri);
+			else
+				currentScope.Namespaces.Add (nameTable.Add (prefix), nameTable.Add (uri));
+		}
+
+		[MonoTODO]
+		public virtual IEnumerator GetEnumerator ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual bool HasNamespace (string prefix)
+		{
+			return currentScope != null && currentScope.Namespaces != null && currentScope.Namespaces.Contains (prefix);
+		}
+
+		public virtual string LookupNamespace (string prefix)
+		{
+			NamespaceScope scope = currentScope;
+
+			while (scope != null) {
+				if (scope.Namespaces != null && scope.Namespaces.Contains (prefix))
+					return scope.Namespaces[prefix] as string;
+				scope = scope.Next;
+			}
+
+			switch (prefix) {
+			case "xmlns":
+				return nameTable.Get ("http://www.w3.org/2000/xmlns/");
+			case "xml":
+				return nameTable.Get ("http://www.w3.org/XML/1998/namespace");
+			case "":
+				return nameTable.Get (String.Empty);
+			}
+
+			return null;
+		}
+
+		public virtual string LookupPrefix (string uri)
+		{
+			if (uri == null)
+				return null;
+
+			NamespaceScope scope = currentScope;
+
+			while (scope != null) 
+			{
+				if (scope.Namespaces != null && scope.Namespaces.ContainsValue (uri)) {
+					foreach (DictionaryEntry entry in scope.Namespaces) {
+						if (entry.Value.ToString() == uri)
+							return nameTable.Get (entry.Key as string) as string;
+					}
+				}
+
+				scope = scope.Next;
+			}
+
+			return String.Empty;
+		}
+
+		public virtual bool PopScope ()
+		{
+			if (currentScope != null)
+				currentScope = currentScope.Next;
+
+			return currentScope != null;
+		}
+
+		public virtual void PushScope ()
+		{
+			NamespaceScope newScope = new NamespaceScope ();
+			newScope.Next = currentScope;
+			currentScope = newScope;
+		}
+
+		[MonoTODO]
+		public virtual void RemoveNamespace (string prefix, string uri)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+	}
+
+	internal class NamespaceScope
+	{
+		internal NamespaceScope Next;
+		internal Hashtable Namespaces;
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlNode.cs b/mcs/class/System.XML/System.Xml/XmlNode.cs
new file mode 100644
index 00000000000..292a860a60f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNode.cs
@@ -0,0 +1,398 @@
+//
+// System.Xml.XmlNode
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+using System.Xml.XPath;
+
+namespace System.Xml
+{
+	public abstract class XmlNode : ICloneable, IEnumerable, IXPathNavigable
+	{
+		#region Fields
+
+		XmlDocument ownerDocument;
+		XmlNode parentNode;
+
+		#endregion
+
+		#region Constructors
+
+		internal XmlNode (XmlDocument ownerDocument)
+		{
+			this.ownerDocument = ownerDocument;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public virtual XmlAttributeCollection Attributes
+		{
+			get { return null; }
+		}
+
+		public virtual string BaseURI
+		{
+			get { return ParentNode.BaseURI; }
+		}
+
+		public virtual XmlNodeList ChildNodes {
+			get {
+				return new XmlNodeListChildren(this);
+			}
+		}
+
+		public virtual XmlNode FirstChild {
+			get {
+				if (LastChild != null) {
+					return LastLinkedChild.NextLinkedSibling;
+				}
+				else {
+					return null;
+				}
+			}
+		}
+
+		public virtual bool HasChildNodes {
+			get { return LastChild != null; }
+		}
+
+		[MonoTODO]
+		public virtual string InnerText {
+			get {
+				StringBuilder builder = new StringBuilder ();
+				AppendChildValues (this, builder);
+				return builder.ToString ();
+			}
+
+			set { throw new NotImplementedException (); }
+		}
+
+		private void AppendChildValues(XmlNode parent, StringBuilder builder)
+		{
+			XmlNode node = parent.FirstChild;
+
+			while (node != null) {
+				builder.Append (node.Value);
+				AppendChildValues (node, builder);
+				node = node.NextSibling;
+			}
+		}
+
+		[MonoTODO("Setter.")]
+		public virtual string InnerXml {
+			get {
+				StringWriter sw = new StringWriter ();
+				XmlTextWriter xtw = new XmlTextWriter (sw);
+
+				WriteContentTo(xtw);
+
+				return sw.GetStringBuilder().ToString();
+			}
+
+			set { throw new NotImplementedException (); }
+		}
+
+		public virtual bool IsReadOnly {
+			get { return false; }
+		}
+
+		[System.Runtime.CompilerServices.IndexerName("Item")]
+		public virtual XmlElement this [string name] {
+			get { 
+				foreach (XmlNode node in ChildNodes) {
+					if ((node.NodeType == XmlNodeType.Element) &&
+					    (node.Name == name)) {
+						return (XmlElement) node;
+					}
+				}
+
+				return null;
+			}
+		}
+
+		[System.Runtime.CompilerServices.IndexerName("Item")]
+		public virtual XmlElement this [string localname, string ns] {
+			get { 
+				foreach (XmlNode node in ChildNodes) {
+					if ((node.NodeType == XmlNodeType.Element) &&
+					    (node.LocalName == localname) && 
+					    (node.NamespaceURI == ns)) {
+						return (XmlElement) node;
+					}
+				}
+
+				return null;
+			}
+		}
+
+		public virtual XmlNode LastChild {
+			get { return LastLinkedChild; }
+		}
+
+		internal virtual XmlLinkedNode LastLinkedChild {
+			get { return null; }
+			set { }
+		}
+
+		public abstract string LocalName { get;	}
+
+		public abstract string Name	{ get; }
+
+		public virtual string NamespaceURI {
+			get { return String.Empty; }
+		}
+
+		public virtual XmlNode NextSibling {
+			get { return null; }
+		}
+
+		public abstract XmlNodeType NodeType { get;	}
+
+		public virtual string OuterXml {
+			get {
+				StringWriter sw = new StringWriter ();
+				XmlTextWriter xtw = new XmlTextWriter (sw);
+
+				WriteTo(xtw);
+
+				return sw.GetStringBuilder().ToString();
+			}
+		}
+
+		public virtual XmlDocument OwnerDocument {
+			get { return ownerDocument; }
+		}
+
+		public virtual XmlNode ParentNode {
+			get { return parentNode; }
+		}
+
+		public virtual string Prefix {
+			get { return String.Empty; }
+			set {}
+		}
+
+		public virtual XmlNode PreviousSibling {
+			get { return null; }
+		}
+
+		public virtual string Value {
+			get { return null; }
+			set { throw new InvalidOperationException ("This node does not have a value"); }
+		}
+
+		#endregion
+
+		#region Methods
+
+		public virtual XmlNode AppendChild (XmlNode newChild)
+		{
+			XmlDocument ownerDoc = (NodeType == XmlNodeType.Document) ? (XmlDocument)this : OwnerDocument;
+
+			ownerDoc.onNodeInserting (newChild, this);
+
+			if (NodeType == XmlNodeType.Document || NodeType == XmlNodeType.Element || NodeType == XmlNodeType.Attribute) {
+				
+				if (newChild.OwnerDocument != ownerDoc)
+					throw new ArgumentException ("Can't append a node created by another document.");
+
+				XmlLinkedNode newLinkedChild = (XmlLinkedNode) newChild;
+				XmlLinkedNode lastLinkedChild = LastLinkedChild;
+
+				newLinkedChild.parentNode = this;
+				
+				if (lastLinkedChild != null) {
+					newLinkedChild.NextLinkedSibling = lastLinkedChild.NextLinkedSibling;
+					lastLinkedChild.NextLinkedSibling = newLinkedChild;
+				} else
+					newLinkedChild.NextLinkedSibling = newLinkedChild;
+				
+				LastLinkedChild = newLinkedChild;
+
+				ownerDoc.onNodeInserted (newChild, newChild.ParentNode);
+
+				return newChild;
+			} else
+				throw new InvalidOperationException();
+		}
+
+		[MonoTODO]
+		public virtual XmlNode Clone ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public abstract XmlNode CloneNode (bool deep);
+
+		[MonoTODO]
+		public virtual XPathNavigator CreateNavigator ()
+		{
+			return new XmlDocumentNavigator(this);
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return new XmlNodeListChildren(this).GetEnumerator();
+		}
+
+		[MonoTODO]
+		public virtual string GetNamespaceOfPrefix (string prefix)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual string GetPrefixOfNamespace (string namespaceURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+		object ICloneable.Clone ()
+		{
+			return Clone ();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			return GetEnumerator ();
+		}
+
+		[MonoTODO]
+		public virtual XmlNode InsertAfter (XmlNode newChild, XmlNode refChild)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlNode InsertBefore (XmlNode newChild, XmlNode refChild)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void Normalize ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlNode PrependChild (XmlNode newChild)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual void RemoveAll ()
+		{
+			XmlDocument ownerDoc = (NodeType == XmlNodeType.Document) ? (XmlDocument)this : OwnerDocument;
+
+			ownerDoc.onNodeRemoving (this, this.ParentNode);
+			LastLinkedChild = null;
+			ownerDoc.onNodeRemoved (this, this.ParentNode);
+		}
+
+		public virtual XmlNode RemoveChild (XmlNode oldChild)
+		{
+			OwnerDocument.onNodeRemoving (oldChild, oldChild.ParentNode);
+
+			if (NodeType == XmlNodeType.Document || NodeType == XmlNodeType.Element || NodeType == XmlNodeType.Attribute) 
+			{
+				if (IsReadOnly)
+					throw new ArgumentException();
+
+				if (Object.ReferenceEquals(LastLinkedChild, LastLinkedChild.NextLinkedSibling) && Object.ReferenceEquals(LastLinkedChild, oldChild))
+					LastLinkedChild = null;
+				else {
+					XmlLinkedNode oldLinkedChild = (XmlLinkedNode)oldChild;
+					XmlLinkedNode beforeLinkedChild = LastLinkedChild;
+					
+					while (!Object.ReferenceEquals(beforeLinkedChild.NextLinkedSibling, LastLinkedChild) && !Object.ReferenceEquals(beforeLinkedChild.NextLinkedSibling, oldLinkedChild))
+						beforeLinkedChild = beforeLinkedChild.NextLinkedSibling;
+
+					if (!Object.ReferenceEquals(beforeLinkedChild.NextLinkedSibling, oldLinkedChild))
+						throw new ArgumentException();
+
+					beforeLinkedChild.NextLinkedSibling = oldLinkedChild.NextLinkedSibling;
+					oldLinkedChild.NextLinkedSibling = null;
+				 }
+
+				OwnerDocument.onNodeRemoved (oldChild, oldChild.ParentNode);
+
+				return oldChild;
+			} 
+			else
+				throw new ArgumentException();
+		}
+
+		[MonoTODO]
+		public virtual XmlNode ReplaceChild (XmlNode newChild, XmlNode oldChild)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public XmlNodeList SelectNodes (string xpath)
+		{
+			return SelectNodes (xpath, null);
+		}
+
+		[MonoTODO]
+		public XmlNodeList SelectNodes (string xpath, XmlNamespaceManager nsmgr)
+		{
+			XPathNavigator nav = CreateNavigator ();
+			XPathExpression expr = nav.Compile (xpath);
+			if (nsmgr != null)
+				expr.SetContext (nsmgr);
+			XPathNodeIterator iter = nav.Select (expr);
+			ArrayList rgNodes = new ArrayList ();
+			while (iter.MoveNext ())
+			{
+				rgNodes.Add (((XmlDocumentNavigator) iter.Current).Node);
+			}
+			return new XmlNodeArrayList (rgNodes);
+		}
+
+		public XmlNode SelectSingleNode (string xpath)
+		{
+			return SelectSingleNode (xpath, null);
+		}
+
+		[MonoTODO]
+		public XmlNode SelectSingleNode (string xpath, XmlNamespaceManager nsmgr)
+		{
+			XPathNavigator nav = CreateNavigator ();
+			XPathExpression expr = nav.Compile (xpath);
+			if (nsmgr != null)
+				expr.SetContext (nsmgr);
+			XPathNodeIterator iter = nav.Select (expr);
+			if (!iter.MoveNext ())
+				return null;
+			return ((XmlDocumentNavigator) iter.Current).Node;
+		}
+
+		internal void SetParentNode (XmlNode parent)
+		{
+			parentNode = parent;
+		}
+
+		[MonoTODO]
+		public virtual bool Supports (string feature, string version)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public abstract void WriteContentTo (XmlWriter w);
+
+		public abstract void WriteTo (XmlWriter w);
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeArrayList.cs b/mcs/class/System.XML/System.Xml/XmlNodeArrayList.cs
new file mode 100644
index 00000000000..a62fd77f401
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNodeArrayList.cs
@@ -0,0 +1,36 @@
+//
+// System.Xml.XmlNodeArrayList
+//
+// Author:
+//   Piers Haken <piersh@friskit.com>
+//
+// (C) 2002 Piers Haken
+//
+
+using System;
+using System.Collections;
+
+namespace System.Xml
+{
+	internal class XmlNodeArrayList : XmlNodeList
+	{
+		ArrayList _rgNodes;
+
+		public XmlNodeArrayList (ArrayList rgNodes)
+		{
+			_rgNodes = rgNodes;
+		}
+
+		public override int Count { get { return _rgNodes.Count; } }
+
+		public override IEnumerator GetEnumerator ()
+		{
+			return _rgNodes.GetEnumerator ();
+		}
+
+		public override XmlNode Item (int index)
+		{
+			return (XmlNode) _rgNodes [index];
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeChangedAction.cs b/mcs/class/System.XML/System.Xml/XmlNodeChangedAction.cs
new file mode 100755
index 00000000000..811edfd92f0
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNodeChangedAction.cs
@@ -0,0 +1,27 @@
+using System;

+

+namespace System.Xml

+{

+	/// <summary>

+	/// Enumeration of node changed actions.

+	/// </summary>

+	public enum XmlNodeChangedAction

+	{

+

+		/// <summary>

+		/// A node is being inserted in the tree

+		/// </summary>

+		Insert = 0,

+

+        /// <summary>

+        /// A node is being removed from the tree.

+        /// </summary>

+		Remove = 1,

+

+		/// <summary>

+		/// A node is being changed.

+		/// </summary>

+        Change  = 2,

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlNodeChangedEventArgs.cs b/mcs/class/System.XML/System.Xml/XmlNodeChangedEventArgs.cs
new file mode 100644
index 00000000000..29a842ad55d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNodeChangedEventArgs.cs
@@ -0,0 +1,67 @@
+using System;

+

+namespace System.Xml

+{

+	/// <summary>

+	/// Passed to delegates on document tree changes

+	/// </summary>

+	public class XmlNodeChangedEventArgs

+	{

+		// Private data members

+		XmlNode _oldParent;

+		XmlNode _newParent;

+		XmlNodeChangedAction _action;

+		XmlNode _node;

+

+		// public properties

+		public XmlNodeChangedAction Action 

+		{ 

+			get

+			{

+				return _action;

+			}

+		} 

+

+		public XmlNode Node 

+		{ 

+			get

+			{

+				return _node;

+			}

+		} 

+

+

+		public XmlNode OldParent 

+		{ 

+			get

+			{

+				return _oldParent;

+			}

+		} 

+

+

+		public XmlNode NewParent 

+		{ 

+			get

+			{

+				return _newParent;

+			}

+		} 

+		

+

+		// Public Methods

+		// Internal Methods

+		internal XmlNodeChangedEventArgs(

+			XmlNodeChangedAction action, 

+			XmlNode node, 

+			XmlNode oldParent,

+			XmlNode newParent)

+		{

+			_node = node;

+			_oldParent = oldParent;

+			_newParent = newParent;

+			_action = action;

+		}

+

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlNodeChangedEventHandler.cs b/mcs/class/System.XML/System.Xml/XmlNodeChangedEventHandler.cs
new file mode 100755
index 00000000000..161482276d2
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNodeChangedEventHandler.cs
@@ -0,0 +1,14 @@
+//
+// System.Xml.XmlNodeChangedEventHandler.cs
+//
+// Author:
+//	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Xml
+{
+	public delegate void XmlNodeChangedEventHandler (Object sender,
+							 XmlNodeChangedEventArgs e);
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeList.cs b/mcs/class/System.XML/System.Xml/XmlNodeList.cs
new file mode 100644
index 00000000000..eff56279b55
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNodeList.cs
@@ -0,0 +1,42 @@
+//
+// System.Xml.XmlNodeList
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+using System.Collections;
+
+namespace System.Xml
+{
+	public abstract class XmlNodeList : IEnumerable
+	{
+		#region Constructors
+
+		protected XmlNodeList() { }
+
+		#endregion
+
+		#region Properties
+
+		public abstract int Count {	get; }
+
+		[System.Runtime.CompilerServices.IndexerName("ItemOf")]
+		public virtual XmlNode this [int i]	{
+			get { return Item(i); }
+		}
+
+		#endregion
+
+		#region Methods
+
+		public abstract IEnumerator GetEnumerator ();
+
+		public abstract XmlNode Item (int index);
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeListChildren.cs b/mcs/class/System.XML/System.Xml/XmlNodeListChildren.cs
new file mode 100644
index 00000000000..c5d62823503
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNodeListChildren.cs
@@ -0,0 +1,146 @@
+//
+// System.Xml.XmlNodeList
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+using System.Collections;
+
+namespace System.Xml
+{
+	internal class XmlNodeListChildren : XmlNodeList
+	{
+		#region Enumerator
+
+		private class Enumerator : IEnumerator
+		{
+			XmlNode parent;
+			XmlLinkedNode currentChild;
+			bool passedLastNode;
+
+			internal Enumerator (XmlNode parent)
+			{
+				currentChild = null;
+				this.parent = parent;
+				passedLastNode = false;
+			}
+
+			public virtual object Current {
+				get {
+					if ((currentChild == null) ||
+						(parent.LastLinkedChild == null) ||
+						(passedLastNode == true))
+						throw new InvalidOperationException();
+
+					return currentChild;
+				}
+			}
+
+			public virtual bool MoveNext()
+			{
+				bool movedNext = true;
+
+				if (parent.LastLinkedChild == null) {
+					movedNext = false;
+				}
+				else if (currentChild == null) {
+					currentChild = parent.LastLinkedChild.NextLinkedSibling;
+				}
+				else {
+					if (Object.ReferenceEquals(currentChild, parent.LastLinkedChild)) {
+						movedNext = false;
+						passedLastNode = true;
+					}
+					else {
+						currentChild = currentChild.NextLinkedSibling;
+					}
+				}
+
+				return movedNext;
+			}
+
+			public virtual void Reset()
+			{
+				currentChild = null;
+			}
+		}
+
+		#endregion
+
+		#region Fields
+
+		XmlNode parent;
+
+		#endregion
+
+		#region Constructors
+		public XmlNodeListChildren(XmlNode parent)
+		{
+			this.parent = parent;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public override int Count {
+			get {
+				int count = 0;
+
+				if (parent.LastLinkedChild != null) {
+					XmlLinkedNode currentChild = parent.LastLinkedChild.NextLinkedSibling;
+					
+					count = 1;
+					while (!Object.ReferenceEquals(currentChild, parent.LastLinkedChild)) {
+						currentChild = currentChild.NextLinkedSibling;
+						count++;
+					}
+				}
+
+				return count;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public override IEnumerator GetEnumerator ()
+		{
+			return new Enumerator(parent);
+		}
+
+		public override XmlNode Item (int index)
+		{
+			XmlNode requestedNode = null;
+
+			// Instead of checking for && index < Count which has to walk
+			// the whole list to get a count, we'll just keep a count since
+			// we have to walk the list anyways to get to index.
+			if ((index >= 0) && (parent.LastLinkedChild != null)) {
+				XmlLinkedNode currentChild = parent.LastLinkedChild.NextLinkedSibling;
+				int count = 0;
+
+				while ((count < index) && !Object.ReferenceEquals(currentChild, parent.LastLinkedChild)) 
+				{
+					currentChild = currentChild.NextLinkedSibling;
+					count++;
+				}
+
+				if (count == index) {
+					requestedNode = currentChild;
+				}
+			}
+
+			return requestedNode;
+		}
+
+		#endregion
+	}
+
+	
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeOrder.cs b/mcs/class/System.XML/System.Xml/XmlNodeOrder.cs
new file mode 100755
index 00000000000..9550967bbe6
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNodeOrder.cs
@@ -0,0 +1,19 @@
+//
+// System.Xml.XmlNodeOrder.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Xml
+{
+	[Serializable]
+	public enum XmlNodeOrder
+	{
+		Before = 0,
+		After = 1,
+		Same = 2,
+		Unknown = 3,		
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeReader.cs b/mcs/class/System.XML/System.Xml/XmlNodeReader.cs
new file mode 100755
index 00000000000..b05a2e1814e
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNodeReader.cs
@@ -0,0 +1,319 @@
+//
+// System.Xml.XmlNodeReader.cs
+//
+// Author:
+//	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Xml;
+
+namespace System.Xml
+{
+	public class XmlNodeReader : XmlReader
+	{
+		#region Constructor
+
+		XmlNode current;
+		ReadState state = ReadState.Initial;
+		int depth;
+
+		public XmlNodeReader (XmlNode node)
+		{
+			current = node;
+		}
+		
+		#endregion
+
+		#region Properties
+
+		public override int AttributeCount {
+			get {
+				return ((ICollection) current.Attributes).Count;
+			}
+		}
+
+		public override string BaseURI {
+			get { return current.BaseURI; }
+		}
+
+		public override bool CanResolveEntity {
+			get { return false; }
+		}
+
+		public override int Depth {
+			get { return depth; }
+		}
+
+		[MonoTODO]
+		public override bool EOF {
+			get { return false; }
+		}
+
+		public override bool HasAttributes {
+			get {
+				if (current.Attributes == null)
+					return false;
+				else
+					return true;
+			}
+		}
+
+		public override bool HasValue {
+			get {
+				if (current.NodeType == XmlNodeType.Element ||
+				    current.NodeType == XmlNodeType.EntityReference ||
+				    current.NodeType == XmlNodeType.Document ||
+				    current.NodeType == XmlNodeType.DocumentFragment ||
+				    current.NodeType == XmlNodeType.Notation ||
+				    current.NodeType == XmlNodeType.EndElement ||
+				    current.NodeType == XmlNodeType.EndEntity)
+					return false;
+				else
+					return true;
+			}
+			      
+		}
+
+		[MonoTODO]
+		public override bool IsDefault {
+			get {
+				if (current.NodeType != XmlNodeType.Attribute)
+					return false;
+				else
+					return false;
+			}
+		}
+
+		[MonoTODO]
+		public override bool IsEmptyElement {
+			get {
+				if (current.NodeType == XmlNodeType.Entity &&
+				    ((XmlEntity) current).Value.EndsWith ("/>"))
+					return true;
+				else 
+					return false;
+			}
+		}
+
+		public override string this [int i] {
+			get {
+				if (i < 0 || i > AttributeCount)
+					throw new ArgumentOutOfRangeException ("i is out of range.");
+				
+				return current.Attributes [i].Value;
+			}
+		}
+
+		public override string this [string name] {
+			get {
+				string ret =  current.Attributes [name].Value;
+				
+				if (ret == null)
+					return String.Empty;
+				else
+					return ret;
+			}
+		}
+
+		public override string this [string name, string namespaceURI] {
+			get {
+				string ret =  current.Attributes [name].Value;
+				
+				if (ret == null)
+					return String.Empty;
+				else
+					return ret;
+			}
+		}
+
+		public override string LocalName {
+			get {
+				if (current is XmlCharacterData)
+					return String.Empty;
+				else
+					return current.LocalName;
+			}
+		}
+
+		public override string Name {
+			get { return current.Name; }
+		}
+
+		public override string NamespaceURI {
+			get {
+				return current.NamespaceURI;
+			}
+		}
+
+		[MonoTODO]
+		public override XmlNameTable NameTable {
+			get { return null; }
+		}
+
+		public override XmlNodeType NodeType {
+			get {
+				return current.NodeType;
+			}
+		}
+
+		public override string Prefix {
+			get { 
+				return current.Prefix;
+			}
+		}
+
+		public override char QuoteChar {
+			get { return '"'; }
+		}
+
+		public override ReadState ReadState {
+			get { return state; }
+		}
+
+		public override string Value {
+			get { return current.Value; }
+		}
+
+		[MonoTODO]
+		public override string XmlLang {
+			get { return String.Empty; }
+		}
+
+		[MonoTODO]
+		public override XmlSpace XmlSpace {
+			get { return 0; }
+		}
+		#endregion
+
+		#region Methods
+
+		public override void Close ()
+		{
+			current = null;
+			state = ReadState.Closed;
+		}
+
+		public override string GetAttribute (int attributeIndex)
+		{
+			return this [attributeIndex];
+		}
+
+		public override string GetAttribute (string name)
+		{
+			return this [name];
+		}
+
+		public override string GetAttribute (string name, string namespaceURI)
+		{
+			return this [name, namespaceURI];
+		}
+
+		[MonoTODO]
+		public override string LookupNamespace (string prefix)
+		{
+			return null;
+		}
+
+		public override void MoveToAttribute (int attributeIndex)
+		{
+			if (attributeIndex < 0 || attributeIndex > AttributeCount)
+				throw new ArgumentOutOfRangeException ();
+			
+			state = ReadState.Interactive;
+			current = current.Attributes [attributeIndex];
+		}
+
+		public override bool MoveToAttribute (string name)
+		{
+			if (GetAttribute (name) == null)
+				return false;
+			else
+				return true;
+		}
+
+		public override bool MoveToAttribute (string name, string namespaceURI)
+		{
+			if (GetAttribute (name, namespaceURI) == null)
+				return false;
+			else
+				return true;
+		}
+
+		public override bool MoveToElement ()
+		{
+			if (current.NodeType == XmlNodeType.Attribute) {
+				current = ((XmlAttribute) current).OwnerElement;
+				return true;
+			} else 
+				return false;
+		}
+
+		[MonoTODO]
+		public override bool MoveToFirstAttribute ()
+		{
+			return false;
+		}
+
+		[MonoTODO]
+		public override bool MoveToNextAttribute ()
+		{
+			if (current.NodeType != XmlNodeType.Attribute)
+				return MoveToFirstAttribute ();
+			else
+				return false;
+		}
+
+		[MonoTODO]
+		public override bool Read ()
+		{
+			return false;
+		}
+
+		[MonoTODO]
+		public override bool ReadAttributeValue ()
+		{
+			return false;
+		}
+
+		public override string ReadInnerXml ()
+		{
+			if (current.NodeType != XmlNodeType.Attribute &&
+			    current.NodeType != XmlNodeType.Element)
+				return String.Empty;
+			else
+				return current.InnerXml;
+		}
+
+		public override string ReadOuterXml ()
+		{
+			if (current.NodeType != XmlNodeType.Attribute &&
+			    current.NodeType != XmlNodeType.Element)
+				return String.Empty;
+			else
+				return current.OuterXml;
+		}
+
+		[MonoTODO]
+		public override string ReadString ()
+		{
+			return null;
+		}
+
+		[MonoTODO]
+		public override void ResolveEntity ()
+		{
+			if (current.NodeType != XmlNodeType.EntityReference)
+				throw new InvalidOperationException ("The current node is not an Entity Reference");
+		}
+
+		[MonoTODO]
+		public override void Skip ()
+		{
+		}
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlNodeType.cs b/mcs/class/System.XML/System.Xml/XmlNodeType.cs
new file mode 100644
index 00000000000..8ed73dd8db6
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNodeType.cs
@@ -0,0 +1,93 @@
+// XmlNodeType.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:31:46 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Xml {
+
+
+	/// <summary>
+	/// </summary>
+	public enum XmlNodeType {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		Element = 1,
+
+		/// <summary>
+		/// </summary>
+		Attribute = 2,
+
+		/// <summary>
+		/// </summary>
+		Text = 3,
+
+		/// <summary>
+		/// </summary>
+		CDATA = 4,
+
+		/// <summary>
+		/// </summary>
+		EntityReference = 5,
+
+		/// <summary>
+		/// </summary>
+		Entity = 6,
+
+		/// <summary>
+		/// </summary>
+		ProcessingInstruction = 7,
+
+		/// <summary>
+		/// </summary>
+		Comment = 8,
+
+		/// <summary>
+		/// </summary>
+		Document = 9,
+
+		/// <summary>
+		/// </summary>
+		DocumentType = 10,
+
+		/// <summary>
+		/// </summary>
+		DocumentFragment = 11,
+
+		/// <summary>
+		/// </summary>
+		Notation = 12,
+
+		/// <summary>
+		/// </summary>
+		Whitespace = 13,
+
+		/// <summary>
+		/// </summary>
+		SignificantWhitespace = 14,
+
+		/// <summary>
+		/// </summary>
+		EndElement = 15,
+
+		/// <summary>
+		/// </summary>
+		EndEntity = 16,
+
+		/// <summary>
+		/// </summary>
+		XmlDeclaration = 17,
+	} // XmlNodeType
+
+} // System.Xml
diff --git a/mcs/class/System.XML/System.Xml/XmlNotation.cs b/mcs/class/System.XML/System.Xml/XmlNotation.cs
new file mode 100755
index 00000000000..7a8ddbd91c8
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlNotation.cs
@@ -0,0 +1,100 @@
+//
+// System.Xml.XmlNotation.cs
+//
+// Author:
+//	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Xml;
+
+namespace System.Xml
+{
+	public class XmlNotation : XmlNode
+	{
+		#region Fields
+		
+		string localName;
+		string publicId;
+		string systemId;
+		string prefix;
+		
+		#endregion
+		
+		#region Constructor
+		
+		internal XmlNotation (string localName, string prefix, string publicId,
+				      string systemId, XmlDocument doc)
+			: base (doc)
+		{
+			this.localName = localName;
+			this.prefix = prefix;
+			this.publicId = publicId;
+			this.systemId = systemId;
+		}
+
+		#endregion
+
+		#region Properties
+		
+		public override string InnerXml {
+			get { return String.Empty; }
+			set { throw new InvalidOperationException ("This operation is not allowed."); }
+		}
+
+		public override bool IsReadOnly {
+			get { return true; } // Notation nodes are always read-only
+		}
+
+		public override string LocalName {
+			get { return localName; }
+		}
+
+		public override string Name {
+			get { return prefix + ":" + localName; }
+		}
+
+		public override XmlNodeType NodeType {
+			get { return XmlNodeType.Notation; }
+		}
+
+		public override string OuterXml {
+			get { return String.Empty; }
+		}
+
+		public string PublicId {
+			get {
+				if (publicId != null)
+					return publicId;
+				else
+					return null;
+			}
+		}
+
+		public string SystemId {
+			get {
+				if (systemId != null)
+					return systemId;
+				else
+					return null;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+		
+		public override XmlNode CloneNode (bool deep)
+		{
+			throw new InvalidOperationException ("This operation is not allowed.");
+		}
+
+		public override void WriteContentTo (XmlWriter w) {	} // has no effect.
+
+		public override void WriteTo (XmlWriter w) {	} // has no effect.
+		       
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlParserContext.cs b/mcs/class/System.XML/System.Xml/XmlParserContext.cs
new file mode 100644
index 00000000000..58c5536a6d1
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlParserContext.cs
@@ -0,0 +1,186 @@
+//
+// System.Xml.XmlParserContext
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2001, 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System.Text;
+
+namespace System.Xml
+{
+	public class XmlParserContext
+	{
+		#region Constructors
+
+		public XmlParserContext (
+			XmlNameTable nt,
+			XmlNamespaceManager nsMgr,
+			string xmlLang,
+			XmlSpace xmlSpace) :
+
+			this (
+				nt,
+				nsMgr,
+				null,
+				null,
+				null,
+				null,
+				null,
+				xmlLang,
+				xmlSpace,
+				null
+			)
+		{
+		}
+
+		public XmlParserContext (
+			XmlNameTable nt,
+			XmlNamespaceManager nsMgr,
+			string xmlLang,
+			XmlSpace xmlSpace,
+			Encoding enc) :
+
+			this (
+				nt,
+				nsMgr,
+				null,
+				null,
+				null,
+				null,
+				null,
+				xmlLang,
+				xmlSpace,
+				enc
+			)
+		{
+		}
+
+		public XmlParserContext (
+			XmlNameTable nt,
+			XmlNamespaceManager nsMgr,
+			string docTypeName,
+			string pubId,
+			string sysId,
+			string internalSubset,
+			string baseURI,
+			string xmlLang,
+			XmlSpace xmlSpace) :
+
+			this (
+				nt,
+				nsMgr,
+				null,
+				null,
+				null,
+				null,
+				null,
+				xmlLang,
+				xmlSpace,
+				null
+			)
+		{
+		}
+
+		public XmlParserContext (
+			XmlNameTable nt,
+			XmlNamespaceManager nsMgr,
+			string docTypeName,
+			string pubId,
+			string sysId,
+			string internalSubset,
+			string baseURI,
+			string xmlLang,
+			XmlSpace xmlSpace,
+			Encoding enc)
+		{
+			if (nt == null)
+				this.nameTable = nsMgr.NameTable;
+			else
+				this.NameTable = nt;
+
+			this.namespaceManager = nsMgr;
+			this.docTypeName = docTypeName;
+			this.publicID = pubId;
+			this.systemID = sysId;
+			this.internalSubset = internalSubset;
+			this.baseURI = baseURI;
+			this.xmlLang = xmlLang;
+			this.xmlSpace = xmlSpace;
+			this.encoding = enc;
+		}
+
+		#endregion
+
+		#region Fields
+
+		private string baseURI;
+		private string docTypeName;
+		private Encoding encoding;
+		private string internalSubset;
+		private XmlNamespaceManager namespaceManager;
+		private XmlNameTable nameTable;
+		private string publicID;
+		private string systemID;
+		private string xmlLang;
+		private XmlSpace xmlSpace;
+
+		#endregion
+
+		#region Properties
+
+		public string BaseURI {
+			get { return baseURI; }
+			set { baseURI = value; }
+		}
+
+		public string DocTypeName {
+			get { return docTypeName; }
+			set { docTypeName = value; }
+		}
+
+		public Encoding Encoding {
+			get { return encoding; }
+			set { encoding = value; }
+		}
+
+		public string InternalSubset {
+			get { return internalSubset; }
+			set { internalSubset = value; }
+		}
+
+		public XmlNamespaceManager NamespaceManager {
+			get { return namespaceManager; }
+			set { namespaceManager = value; }
+		}
+
+		public XmlNameTable NameTable {
+			get { return nameTable; }
+			set { nameTable = value; }
+		}
+
+		public string PublicId {
+			get { return publicID; }
+			set { publicID = value; }
+		}
+
+		public string SystemId {
+			get { return systemID; }
+			set { systemID = value; }
+		}
+
+		public string XmlLang {
+			get { return xmlLang; }
+			set { xmlLang = value; }
+		}
+
+		public XmlSpace XmlSpace {
+			get { return xmlSpace; }
+			set { xmlSpace = value; }
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlProcessingInstruction.cs b/mcs/class/System.XML/System.Xml/XmlProcessingInstruction.cs
new file mode 100644
index 00000000000..c328935a7fe
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlProcessingInstruction.cs
@@ -0,0 +1,96 @@
+//
+// System.Xml.XmlProcessingInstruction
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+
+namespace System.Xml
+{
+	public class XmlProcessingInstruction : XmlLinkedNode
+	{
+		string target;
+		string data;
+
+		#region Constructors
+
+		protected internal XmlProcessingInstruction (string target, string data, XmlDocument doc) : base(doc)
+		{
+			if (data == null)
+				data = String.Empty;
+
+			this.target = target;
+			this.data = data;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public string Data
+		{
+			get { return data; }
+
+			set { data = value; }
+		}
+
+		public override string InnerText
+		{
+			get { return Data; }
+			set { data = value; }
+		}
+
+		public override string LocalName
+		{
+			get { return target; }
+		}
+
+		public override string Name
+		{
+			get { return target; }
+		}
+
+		public override XmlNodeType NodeType
+		{
+			get { return XmlNodeType.ProcessingInstruction; }
+		}
+		
+		public string Target
+		{
+			get { return target; }
+		}
+
+		public override string Value
+		{
+			get { return data; }
+			set {
+				if (this.IsReadOnly)
+					throw new ArgumentException ("This node is read-only.");
+				else
+					data = value;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		public override XmlNode CloneNode (bool deep)
+		{
+			return new XmlProcessingInstruction (target, data, OwnerDocument);
+		}
+
+		public override void WriteContentTo (XmlWriter w) { }
+
+		public override void WriteTo (XmlWriter w)
+		{
+			w.WriteProcessingInstruction (target, data);
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs b/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs
new file mode 100644
index 00000000000..c7c8197ff7f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlQualifiedName.cs
@@ -0,0 +1,114 @@
+//
+// System.Xml.XmlQualifiedName.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//		 
+// (C) Ximian, Inc.
+// 
+// Modified: 
+//		21st June 2002 : Ajay kumar Dwivedi (adwiv@yahoo.com)
+
+using System;
+
+namespace System.Xml
+{
+	public class XmlQualifiedName
+	{
+		// Constructors		
+		public XmlQualifiedName ()
+			: this (string.Empty, string.Empty)
+		{
+		}
+
+		public XmlQualifiedName (string name)
+			: this (name, string.Empty)
+		{
+		}
+
+		public XmlQualifiedName (string name, string ns)
+			: base ()
+		{
+			this.name = name;
+			this.ns = ns;
+		}
+
+		// Fields
+		public static readonly XmlQualifiedName Empty = new XmlQualifiedName ();		
+		private string name;
+		private string ns;
+		
+		// Properties
+		public bool IsEmpty
+		{
+			get {
+				if ((name == String.Empty) && (ns == String.Empty))
+					return true;
+				else
+					return false;
+			}
+		}
+
+		public string Name
+		{
+			get { return name; }
+		}
+
+		public string Namespace
+		{
+			get { return ns; }
+		}
+
+		// Methods
+		public override bool Equals (object other)
+		{
+			if(!(other is XmlQualifiedName))
+				return false;
+
+			if ((XmlQualifiedName) this == (XmlQualifiedName) other)
+				return true;
+			else
+				return false;
+		}
+
+		public override int GetHashCode () 
+		{ 
+			return unchecked (name.GetHashCode() + ns.GetHashCode()); 
+		}
+
+		public override string ToString ()
+		{
+			if (ns == null)
+				return name;
+			else
+			 	return ns + ":" + name;
+		}
+
+		public static string ToString (string name, string ns)
+		{
+			if (ns == string.Empty)
+				return name;
+			else				
+				return ns + ":" + name;
+		}
+
+		// Operators
+		public static bool operator == (XmlQualifiedName a, XmlQualifiedName b)
+		{
+			if((Object)a == null || (Object)b == null)
+				return false;
+
+			if ((a.Name == b.Name) && (a.Namespace == b.Namespace))
+				return true;
+			else
+				return false;
+		}
+
+		public static bool operator != (XmlQualifiedName a, XmlQualifiedName b)
+		{
+			if (a == b)
+				return false;
+			else
+				return true;
+		}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/System.XML/System.Xml/XmlReader.cs b/mcs/class/System.XML/System.Xml/XmlReader.cs
new file mode 100644
index 00000000000..c2cd2f6541a
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlReader.cs
@@ -0,0 +1,241 @@
+//
+// XmlReader.cs
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2001, 2002 Jason Diamond  http://injektilo.org/
+//
+
+namespace System.Xml
+{
+	public abstract class XmlReader
+	{
+		#region Constructor
+
+		protected XmlReader ()
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public abstract int AttributeCount { get; }
+
+		public abstract string BaseURI { get; }
+
+		public virtual bool CanResolveEntity
+		{
+			get	{ return false; }
+		}
+
+		public abstract int Depth { get; }
+
+		public abstract bool EOF { get; }
+
+		public virtual bool HasAttributes
+		{
+			get { return AttributeCount > 0; }
+		}
+
+		public abstract bool HasValue { get; }
+
+		public abstract bool IsDefault { get; }
+
+		public abstract bool IsEmptyElement { get; }
+
+		public abstract string this[int i] { get; }
+
+		public abstract string this[string name] { get; }
+
+		public abstract string this[
+			string localName,
+			string namespaceName]
+		{ get; }
+
+		public abstract string LocalName { get; }
+
+		public abstract string Name { get; }
+
+		public abstract string NamespaceURI { get; }
+
+		public abstract XmlNameTable NameTable { get; }
+
+		public abstract XmlNodeType NodeType { get; }
+
+		public abstract string Prefix { get; }
+
+		public abstract char QuoteChar { get; }
+
+		public abstract ReadState ReadState { get; }
+
+		public abstract string Value { get; }
+
+		public abstract string XmlLang { get; }
+
+		public abstract XmlSpace XmlSpace { get; }
+
+		#endregion
+
+		#region Methods
+
+		public abstract void Close ();
+
+		public abstract string GetAttribute (int i);
+
+		public abstract string GetAttribute (string name);
+
+		public abstract string GetAttribute (
+			string localName,
+			string namespaceName);
+
+		public static bool IsName (string s)
+		{
+			bool result = false;
+
+			if (s != null && s.Length > 0) {
+				char[] chars = s.ToCharArray ();
+
+				if (XmlChar.IsFirstNameChar (chars[0])) {
+					int i = 1;
+					int n = chars.Length;
+
+					while (i < n && XmlChar.IsNameChar (chars[i]))
+						++i;
+
+					result = i == n;
+				}
+			}
+
+			return result;
+		}
+
+		public static bool IsNameToken (string s)
+		{
+			bool result = false;
+
+			if (s != null && s.Length > 0) {
+				char[] chars = s.ToCharArray ();
+
+				int i = 0;
+				int n = chars.Length;
+
+				while (i < n && XmlChar.IsNameChar (chars[i]))
+					++i;
+
+				result = i == n;
+			}
+
+			return result;
+		}
+
+		[MonoTODO]
+		public virtual bool IsStartElement ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual bool IsStartElement (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual bool IsStartElement (
+			string localName,
+			string namespaceName)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public abstract string LookupNamespace (string prefix);
+
+		public abstract void MoveToAttribute (int i);
+
+		public abstract bool MoveToAttribute (string name);
+
+		public abstract bool MoveToAttribute (
+			string localName,
+			string namespaceName);
+
+		[MonoTODO]
+		public virtual XmlNodeType MoveToContent ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public abstract bool MoveToElement ();
+
+		public abstract bool MoveToFirstAttribute ();
+
+		public abstract bool MoveToNextAttribute ();
+
+		public abstract bool Read ();
+
+		public abstract bool ReadAttributeValue ();
+
+		[MonoTODO]
+		public virtual string ReadElementString ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual string ReadElementString (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual string ReadElementString (
+			string localName,
+			string namespaceName)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void ReadEndElement ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public abstract string ReadInnerXml ();
+
+		public abstract string ReadOuterXml ();
+
+		[MonoTODO]
+		public virtual void ReadStartElement ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void ReadStartElement (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void ReadStartElement (
+			string localName,
+			string namespaceName)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public abstract string ReadString ();
+
+		public abstract void ResolveEntity ();
+
+		[MonoTODO]
+		public virtual void Skip ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlResolver.cs b/mcs/class/System.XML/System.Xml/XmlResolver.cs
new file mode 100644
index 00000000000..665dff630e6
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlResolver.cs
@@ -0,0 +1,32 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-

+//

+// System.Xml.XmlResolver.cs

+//

+// Author:

+//   Jason Diamond (jason@injektilo.org)

+//

+// (C) 2001 Jason Diamond  http://injektilo.org/

+//

+

+using System;

+using System.Net;

+

+namespace System.Xml

+{

+	public abstract class XmlResolver

+	{

+		public abstract ICredentials Credentials

+		{

+			set;

+		}

+

+		public abstract object GetEntity(

+			Uri absoluteUri,

+			string role,

+			Type type);

+

+		public abstract Uri ResolveUri(

+			Uri baseUri,

+			string relativeUri);

+	}

+}

diff --git a/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs b/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs
new file mode 100644
index 00000000000..d751df66836
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlSignificantWhitespace.cs
@@ -0,0 +1,65 @@
+//
+// System.Xml.XmlSignificantWhitespace.cs
+//
+// Author:
+//	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Xml
+{
+	public class XmlSignificantWhitespace : XmlCharacterData
+	{
+		// Constructor
+		protected internal XmlSignificantWhitespace (string strData, XmlDocument doc)
+			: base (strData, doc)
+		{
+		}
+		
+		// Properties
+		public override string LocalName {
+			get { return "#significant-whitespace"; }
+		}
+
+		public override string Name {
+			get { return "#significant-whitespace"; }
+		}
+
+		public override XmlNodeType NodeType {
+			get { return XmlNodeType.SignificantWhitespace; }
+		}
+
+		public override string Value {
+			get { return Data; }
+			[MonoTODO]
+			set {
+				if (IsValidWhitespaceChar (value) == false)
+					throw new ArgumentException ("Invalid whitespace characters.");
+			}
+		}
+
+		// Methods
+		public override XmlNode CloneNode (bool deep)
+		{
+			return new XmlSignificantWhitespace (Data, OwnerDocument);
+		}
+
+		public override void WriteContentTo (XmlWriter w) {}
+
+		public override void WriteTo (XmlWriter w)
+		{
+			w.WriteWhitespace (Data);
+		}
+
+		private bool IsValidWhitespaceChar (string text)
+		{
+			foreach (char c in text)
+				if ((c != ' ') && (c != '\r') && (c != '\n') && (c != '\t'))
+					return false;
+			return true;
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlSpace.cs b/mcs/class/System.XML/System.Xml/XmlSpace.cs
new file mode 100644
index 00000000000..f1e1128ff3c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlSpace.cs
@@ -0,0 +1,37 @@
+// XmlSpace.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:31:52 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Xml {
+
+
+	/// <summary>
+	/// Specifies the current xml:space scope
+	/// </summary>
+	public enum XmlSpace {
+
+		/// <summary>
+		/// No xml:space scope.
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// the xml:space scope = "default"
+		/// </summary>
+		Default = 1,
+
+		/// <summary>
+		/// the xml:space scope = "preserve"
+		/// </summary>
+		Preserve = 2,
+	} // XmlSpace
+
+} // System.Xml
diff --git a/mcs/class/System.XML/System.Xml/XmlText.cs b/mcs/class/System.XML/System.Xml/XmlText.cs
new file mode 100644
index 00000000000..59f2ba1477f
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlText.cs
@@ -0,0 +1,69 @@
+//
+// System.Xml.XmlText
+//
+// Author:
+//   Jason Diamond <jason@injektilo.org>
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+
+namespace System.Xml
+{
+	public class XmlText : XmlCharacterData
+	{
+		#region Constructor
+
+		protected internal XmlText (string strData, XmlDocument doc) : base(strData, doc)
+		{
+		}
+
+		#endregion
+
+		#region Properties
+
+		public override string LocalName 
+		{
+			get { return "#text"; }
+		}
+
+		public override string Name {
+			get { return "#text"; }
+		}
+
+		public override XmlNodeType NodeType {
+			get { return XmlNodeType.Text; }
+		}
+
+		public override string Value {
+			get { return Data; }
+			set { Data = value; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public override XmlNode CloneNode (bool deep)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual XmlText SplitText (int offset)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override void WriteContentTo (XmlWriter w) {}
+
+		public override void WriteTo (XmlWriter w)
+		{
+			w.WriteString (Data);
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlTextReader.cs b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
new file mode 100644
index 00000000000..178d9a06d3c
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlTextReader.cs
@@ -0,0 +1,1291 @@
+//
+// System.Xml.XmlTextReader
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//   Adam Treat (manyoso@yahoo.com)
+//
+// (C) 2001, 2002 Jason Diamond  http://injektilo.org/
+//
+
+// FIXME:
+//   This can only parse basic XML: elements, attributes, processing
+//   instructions, and comments are OK.
+//
+//   It barfs on DOCTYPE declarations.
+//
+//   There's also no checking being done for either well-formedness
+//   or validity.
+//
+//   NameTables aren't being used everywhere yet.
+//
+//   Some thought needs to be given to performance. There's too many
+//   strings being allocated.
+//
+//   Some of the MoveTo methods haven't been implemented yet.
+//
+//   LineNumber and LinePosition aren't being tracked.
+//
+//   xml:space, xml:lang, and xml:base aren't being tracked.
+//
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+
+namespace System.Xml
+{
+	public class XmlTextReader : XmlReader, IXmlLineInfo
+	{
+		#region Constructors
+
+		[MonoTODO]
+		protected XmlTextReader ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XmlTextReader (Stream input)
+		{
+			// We can share some code in the constructors (at least for this one and next 2)
+			XmlNameTable nt = new NameTable ();
+			XmlNamespaceManager nsMgr = new XmlNamespaceManager (nt);
+			parserContext = new XmlParserContext (null, nsMgr, null, XmlSpace.None);
+			Init ();
+			reader = new StreamReader (input);
+		}
+
+		[MonoTODO]
+		public XmlTextReader (string url)
+		{
+			XmlNameTable nt = new NameTable ();
+			XmlNamespaceManager nsMgr = new XmlNamespaceManager (nt);
+			parserContext = new XmlParserContext (null, nsMgr, null, XmlSpace.None);
+			Init ();
+			reader = new StreamReader(url);
+		}
+
+		[MonoTODO]
+		public XmlTextReader (TextReader input)
+		{
+			XmlNameTable nt = new NameTable ();
+			XmlNamespaceManager nsMgr = new XmlNamespaceManager (nt);
+			parserContext = new XmlParserContext (null, nsMgr, null, XmlSpace.None);
+			Init ();
+			reader = input;
+		}
+
+		[MonoTODO]
+		protected XmlTextReader (XmlNameTable nt)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XmlTextReader (Stream input, XmlNameTable nt)
+ 		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XmlTextReader (string url, Stream input)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XmlTextReader (string url, TextReader input)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XmlTextReader (string url, XmlNameTable nt)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XmlTextReader (TextReader input, XmlNameTable nt)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XmlTextReader (Stream xmlFragment, XmlNodeType fragType, XmlParserContext context)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XmlTextReader (string url, Stream input, XmlNameTable nt)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XmlTextReader (string url, TextReader input, XmlNameTable nt)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public XmlTextReader (string xmlFragment, XmlNodeType fragType, XmlParserContext context)
+		{
+			//Waiting for Validating reader for fragType rules.
+			parserContext = context;
+			Init ();
+			reader = new StringReader(xmlFragment);
+		}
+
+		#endregion
+
+		#region Properties
+
+		public override int AttributeCount
+		{
+			get { return attributes.Count; }
+		}
+
+		[MonoTODO]
+		public override string BaseURI
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		public override int Depth
+		{
+			get { return depth > 0 ? depth : 0; }
+		}
+
+		[MonoTODO]
+		public Encoding Encoding
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		public override bool EOF
+		{
+			get
+			{
+				return
+					readState == ReadState.EndOfFile ||
+					readState == ReadState.Closed;
+			}
+		}
+
+		public override bool HasValue
+		{
+			get { return value != String.Empty;	}
+		}
+
+		public override bool IsDefault
+		{
+			get
+			{
+				// XmlTextReader does not expand default attributes.
+				return false;
+			}
+		}
+
+		public override bool IsEmptyElement
+		{
+			get { return isEmptyElement; }
+		}
+
+		public override string this [int i]
+		{
+			get { return GetAttribute (i); }
+		}
+
+		public override string this [string name]
+		{
+			get { return GetAttribute (name); }
+		}
+
+		public override string this [string localName, string namespaceName]
+		{
+			get { return GetAttribute (localName, namespaceName); }
+		}
+
+		public int LineNumber
+		{
+			get { return line; }
+		}
+
+		public int LinePosition
+		{
+			get { return column; }
+		}
+
+		public override string LocalName
+		{
+			get { return localName; }
+		}
+
+		public override string Name
+		{
+			get { return name; }
+		}
+
+		[MonoTODO]
+		public bool Namespaces
+		{
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		public override string NamespaceURI
+		{
+			get { return namespaceURI; }
+		}
+
+		public override XmlNameTable NameTable
+		{
+			get { return parserContext.NameTable; }
+		}
+
+		public override XmlNodeType NodeType
+		{
+			get { return nodeType; }
+		}
+
+		[MonoTODO]
+		public bool Normalization
+		{
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		public override string Prefix
+		{
+			get { return prefix; }
+		}
+
+		[MonoTODO]
+		public override char QuoteChar
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		public override ReadState ReadState
+		{
+			get { return readState; }
+		}
+
+		public override string Value
+		{
+			get { return value; }
+		}
+
+		[MonoTODO]
+		public WhitespaceHandling WhitespaceHandling
+		{
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public override string XmlLang
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public XmlResolver XmlResolver
+		{
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public override XmlSpace XmlSpace
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		#endregion
+
+		#region Methods
+
+		[MonoTODO]
+		public override void Close ()
+		{
+			readState = ReadState.Closed;
+		}
+
+		[MonoTODO]
+		public override string GetAttribute (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override string GetAttribute (string name)
+		{
+			return attributes [name] as string;
+		}
+
+		public override string GetAttribute (string localName, string namespaceURI)
+		{
+			foreach (DictionaryEntry entry in attributes)
+			{
+				string thisName = entry.Key as string;
+
+				int indexOfColon = thisName.IndexOf (':');
+
+				if (indexOfColon != -1) {
+					string thisLocalName = thisName.Substring (indexOfColon + 1);
+
+					if (localName == thisLocalName) {
+						string thisPrefix = thisName.Substring (0, indexOfColon);
+						string thisNamespaceURI = LookupNamespace (thisPrefix);
+
+						if (namespaceURI == thisNamespaceURI)
+							return attributes [thisName] as string;
+					}
+				} else if (localName == "xmlns" && namespaceURI == "http://www.w3.org/2000/xmlns/" && thisName == "xmlns")
+					return attributes [thisName] as string;
+			}
+
+			return String.Empty;
+		}
+
+		[MonoTODO]
+		public TextReader GetRemainder ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		bool IXmlLineInfo.HasLineInfo ()
+		{
+			return false;
+		}
+
+		public override string LookupNamespace (string prefix)
+		{
+			return parserContext.NamespaceManager.LookupNamespace (prefix);
+		}
+
+		[MonoTODO]
+		public override void MoveToAttribute (int i)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override bool MoveToAttribute (string name)
+		{
+			MoveToElement ();
+			bool match = false;
+
+			if (attributes == null)
+				return false;
+
+			if (orderedAttributesEnumerator == null) {
+				SaveProperties ();
+				orderedAttributesEnumerator = orderedAttributes.GetEnumerator ();
+			}
+
+			while (orderedAttributesEnumerator.MoveNext ()) {
+				if(name == orderedAttributesEnumerator.Current as string) {
+					match = true;
+					break;
+				}
+			}
+
+			if (match) {
+					
+				string value = attributes [name] as string;
+				SetProperties (
+					XmlNodeType.Attribute, // nodeType
+					name, // name
+					false, // isEmptyElement
+					value, // value
+					false // clearAttributes
+				);
+			}
+			
+			return match;
+		}
+
+		[MonoTODO]
+		public override bool MoveToAttribute (string localName, string namespaceName)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override bool MoveToElement ()
+		{
+			if (orderedAttributesEnumerator != null) {
+				orderedAttributesEnumerator = null;
+				RestoreProperties ();
+				return true;
+			}
+
+			return false;
+		}
+
+		public override bool MoveToFirstAttribute ()
+		{
+			MoveToElement ();
+			return MoveToNextAttribute ();
+		}
+
+		public override bool MoveToNextAttribute ()
+		{
+			if (attributes == null)
+				return false;
+
+			if (orderedAttributesEnumerator == null) {
+				SaveProperties ();
+				orderedAttributesEnumerator = orderedAttributes.GetEnumerator ();
+			}
+
+			if (orderedAttributesEnumerator.MoveNext ()) {
+				string name = orderedAttributesEnumerator.Current as string;
+				string value = attributes [name] as string;
+				SetProperties (
+					XmlNodeType.Attribute, // nodeType
+					name, // name
+					false, // isEmptyElement
+					value, // value
+					false // clearAttributes
+				);
+				return true;
+			}
+
+			return false;
+		}
+
+		public override bool Read ()
+		{
+			bool more = false;
+
+			readState = ReadState.Interactive;
+
+			more = ReadContent ();
+
+			return more;
+		}
+
+		[MonoTODO]
+		public override bool ReadAttributeValue ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public int ReadBase64 (byte [] buffer, int offset, int length)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public int ReadBinHex (byte [] buffer, int offset, int length)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public int ReadChars (char [] buffer, int offset, int length)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override string ReadInnerXml ()
+		{
+			// Still need a Well Formedness check.
+			// Will wait for Validating reader ;-)
+			if (NodeType == XmlNodeType.Attribute) {
+				return Value;
+			} else {
+   				saveToXmlBuffer = true;
+				string startname = this.Name;
+				string endname = string.Empty;
+				readState = ReadState.Interactive;
+
+				while (startname != endname) {
+					ReadContent ();
+    				endname = this.Name;
+				}
+
+				xmlBuffer.Replace(currentTag.ToString (), "");
+				saveToXmlBuffer = false;
+				string InnerXml = xmlBuffer.ToString ();
+				xmlBuffer.Length = 0;
+				return InnerXml;
+			}
+		}
+
+		[MonoTODO]
+		public override string ReadOuterXml ()
+		{
+			// Still need a Well Formedness check.
+			// Will wait for Validating reader ;-)
+			if (NodeType == XmlNodeType.Attribute) {
+				return Name+"=\""+Value+"\"";
+			} else {
+   				saveToXmlBuffer = true;
+				xmlBuffer.Append(currentTag.ToString ());
+				string startname = this.Name;
+				string endname = string.Empty;
+				readState = ReadState.Interactive;
+
+				while (startname != endname) {
+					ReadContent ();
+    				endname = this.Name;
+				}
+				saveToXmlBuffer = false;
+				string OuterXml = xmlBuffer.ToString ();
+				xmlBuffer.Length = 0;
+				return OuterXml;
+			}
+		}
+
+		[MonoTODO]
+		public override string ReadString ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void ResetState ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override void ResolveEntity ()
+		{
+			// XmlTextReaders don't resolve entities.
+			throw new InvalidOperationException ("XmlTextReaders don't resolve entities.");
+		}
+
+		#endregion
+
+		// privates
+
+		private XmlParserContext parserContext;
+
+		private TextReader reader;
+		private ReadState readState;
+
+		private int depth;
+		private bool depthDown;
+
+		private bool popScope;
+
+		private XmlNodeType nodeType;
+		private string name;
+		private string prefix;
+		private string localName;
+		private string namespaceURI;
+		private bool isEmptyElement;
+		private string value;
+
+		private XmlNodeType saveNodeType;
+		private string saveName;
+		private string savePrefix;
+		private string saveLocalName;
+		private string saveNamespaceURI;
+		private bool saveIsEmptyElement;
+
+		private Hashtable attributes;
+		private ArrayList orderedAttributes;
+		private IEnumerator orderedAttributesEnumerator;
+
+		private bool returnEntityReference;
+		private string entityReferenceName;
+
+		private char [] nameBuffer;
+		private int nameLength;
+		private int nameCapacity;
+		private const int initialNameCapacity = 256;
+
+		private char [] valueBuffer;
+		private int valueLength;
+		private int valueCapacity;
+		private const int initialValueCapacity = 8192;
+
+		private StringBuilder xmlBuffer; // This is for Read(Inner|Outer)Xml
+		private StringBuilder currentTag; // A buffer for ReadContent for ReadOuterXml
+		private bool saveToXmlBuffer;
+		private int line;
+		private int column;
+
+		private void Init ()
+		{
+			readState = ReadState.Initial;
+
+			depth = -1;
+			depthDown = false;
+
+			popScope = false;
+
+			nodeType = XmlNodeType.None;
+			name = String.Empty;
+			prefix = String.Empty;
+			localName = string.Empty;
+			isEmptyElement = false;
+			value = String.Empty;
+
+			attributes = new Hashtable ();
+			orderedAttributes = new ArrayList ();
+			orderedAttributesEnumerator = null;
+
+			returnEntityReference = false;
+			entityReferenceName = String.Empty;
+
+			nameBuffer = new char [initialNameCapacity];
+			nameLength = 0;
+			nameCapacity = initialNameCapacity;
+
+			valueBuffer = new char [initialValueCapacity];
+			valueLength = 0;
+			valueCapacity = initialValueCapacity;
+
+			xmlBuffer = new StringBuilder ();
+			currentTag = new StringBuilder ();
+		}
+
+		// Use this method rather than setting the properties
+		// directly so that all the necessary properties can
+		// be changed in harmony with each other. Maybe the
+		// fields should be in a seperate class to help enforce
+		// this.
+		private void SetProperties (
+			XmlNodeType nodeType,
+			string name,
+			bool isEmptyElement,
+			string value,
+			bool clearAttributes)
+		{
+			this.nodeType = nodeType;
+			this.name = name;
+			this.isEmptyElement = isEmptyElement;
+			this.value = value;
+
+			if (clearAttributes)
+				ClearAttributes ();
+
+			int indexOfColon = name.IndexOf (':');
+
+			if (indexOfColon == -1) {
+				prefix = String.Empty;
+				localName = name;
+			} else {
+				prefix = name.Substring (0, indexOfColon);
+				localName = name.Substring (indexOfColon + 1);
+			}
+
+			namespaceURI = LookupNamespace (prefix);
+		}
+
+		private void SaveProperties ()
+		{
+			saveNodeType = nodeType;
+			saveName = name;
+			savePrefix = prefix;
+			saveLocalName = localName;
+			saveNamespaceURI = namespaceURI;
+			saveIsEmptyElement = isEmptyElement;
+			// An element's value is always String.Empty.
+		}
+
+		private void RestoreProperties ()
+		{
+			nodeType = saveNodeType;
+			name = saveName;
+			prefix = savePrefix;
+			localName = saveLocalName;
+			namespaceURI = saveNamespaceURI;
+			isEmptyElement = saveIsEmptyElement;
+			value = String.Empty;
+		}
+
+		private void AddAttribute (string name, string value)
+		{
+			attributes.Add (name, value);
+			orderedAttributes.Add (name);
+		}
+
+		private void ClearAttributes ()
+		{
+			if (attributes.Count > 0) {
+				attributes.Clear ();
+				orderedAttributes.Clear ();
+			}
+
+			orderedAttributesEnumerator = null;
+		}
+
+		private int PeekChar ()
+		{
+			return reader.Peek ();
+		}
+
+		private int ReadChar ()
+		{
+			int ch = reader.Read ();
+			if (ch == '\n') {
+				line++;
+				column = 1;
+			} else {
+				column++;
+			}
+			if (saveToXmlBuffer) {
+				xmlBuffer.Append ((char) ch);
+			}
+			currentTag.Append ((char) ch);
+			return ch;
+		}
+
+		// This should really keep track of some state so
+		// that it's not possible to have more than one document
+		// element or text outside of the document element.
+		private bool ReadContent ()
+		{
+			bool more = false;
+			currentTag.Length = 0;
+			if (popScope) {
+				parserContext.NamespaceManager.PopScope ();
+				popScope = false;
+			}
+
+			if (depthDown)
+				--depth;
+
+			if (returnEntityReference) {
+				++depth;
+				SetEntityReferenceProperties ();
+				more = true;
+			} else {
+    			switch (PeekChar ())
+				{
+				case '<':
+					ReadChar ();
+					ReadTag ();
+					more = true;
+					break;
+				case -1:
+					readState = ReadState.EndOfFile;
+					SetProperties (
+						XmlNodeType.None, // nodeType
+						String.Empty, // name
+						false, // isEmptyElement
+						String.Empty, // value
+						true // clearAttributes
+					);
+					more = false;
+					break;
+				default:
+					ReadText ();
+					more = true;
+					break;
+				}
+			}
+
+			return more;
+		}
+
+		private void SetEntityReferenceProperties ()
+		{
+			SetProperties (
+				XmlNodeType.EntityReference, // nodeType
+				entityReferenceName, // name
+				false, // isEmptyElement
+				String.Empty, // value
+				true // clearAttributes
+			);
+
+			returnEntityReference = false;
+			entityReferenceName = String.Empty;
+		}
+
+		// The leading '<' has already been consumed.
+		private void ReadTag ()
+		{
+			switch (PeekChar ())
+			{
+			case '/':
+				ReadChar ();
+				ReadEndTag ();
+				break;
+			case '?':
+				ReadChar ();
+				ReadProcessingInstruction ();
+				break;
+			case '!':
+				ReadChar ();
+				ReadDeclaration ();
+				break;
+			default:
+				ReadStartTag ();
+				break;
+			}
+		}
+
+		// The leading '<' has already been consumed.
+		private void ReadStartTag ()
+		{
+			parserContext.NamespaceManager.PushScope ();
+
+			string name = ReadName ();
+			SkipWhitespace ();
+
+			bool isEmptyElement = false;
+
+			ClearAttributes ();
+
+			if (XmlChar.IsFirstNameChar (PeekChar ()))
+				ReadAttributes ();
+
+			if (PeekChar () == '/') {
+				ReadChar ();
+				isEmptyElement = true;
+				depthDown = true;
+				popScope = true;
+			}
+
+			Expect ('>');
+
+			++depth;
+
+			SetProperties (
+				XmlNodeType.Element, // nodeType
+				name, // name
+				isEmptyElement, // isEmptyElement
+				String.Empty, // value
+				false // clearAttributes
+			);
+		}
+
+		// The reader is positioned on the first character
+		// of the element's name.
+		private void ReadEndTag ()
+		{
+			string name = ReadName ();
+			SkipWhitespace ();
+			Expect ('>');
+
+			--depth;
+
+			SetProperties (
+				XmlNodeType.EndElement, // nodeType
+				name, // name
+				false, // isEmptyElement
+				String.Empty, // value
+				true // clearAttributes
+			);
+
+			popScope = true;
+		}
+
+		private void AppendNameChar (int ch)
+		{
+			CheckNameCapacity ();
+			nameBuffer [nameLength++] = (char)ch;
+		}
+
+		private void CheckNameCapacity ()
+		{
+			if (nameLength == nameCapacity) {
+				nameCapacity = nameCapacity * 2;
+				char [] oldNameBuffer = nameBuffer;
+				nameBuffer = new char [nameCapacity];
+				Array.Copy (oldNameBuffer, nameBuffer, nameLength);
+			}
+		}
+
+		private string CreateNameString ()
+		{
+			return new String (nameBuffer, 0, nameLength);
+		}
+
+		private void AppendValueChar (int ch)
+		{
+			CheckValueCapacity ();
+			valueBuffer [valueLength++] = (char)ch;
+		}
+
+		private void CheckValueCapacity ()
+		{
+			if (valueLength == valueCapacity) {
+				valueCapacity = valueCapacity * 2;
+				char [] oldValueBuffer = valueBuffer;
+				valueBuffer = new char [valueCapacity];
+				Array.Copy (oldValueBuffer, valueBuffer, valueLength);
+			}
+		}
+
+		private string CreateValueString ()
+		{
+			return new String (valueBuffer, 0, valueLength);
+		}
+
+		// The reader is positioned on the first character
+		// of the text.
+		private void ReadText ()
+		{
+			valueLength = 0;
+
+			int ch = PeekChar ();
+
+			while (ch != '<' && ch != -1) {
+				if (ch == '&') {
+					ReadChar ();
+					if (ReadReference (false))
+						break;
+				} else
+					AppendValueChar (ReadChar ());
+
+				ch = PeekChar ();
+			}
+
+			if (returnEntityReference && valueLength == 0) {
+				++depth;
+				SetEntityReferenceProperties ();
+			} else {
+				if (depth >= 0) {
+					++depth;
+					depthDown = true;
+				}
+
+				SetProperties (
+					XmlNodeType.Text, // nodeType
+					String.Empty, // name
+					false, // isEmptyElement
+					CreateValueString (), // value
+					true // clearAttributes
+				);
+			}
+		}
+
+		// The leading '&' has already been consumed.
+		// Returns true if the entity reference isn't a simple
+		// character reference or one of the predefined entities.
+		// This allows the ReadText method to break so that the
+		// next call to Read will return the EntityReference node.
+		private bool ReadReference (bool ignoreEntityReferences)
+		{
+			if (PeekChar () == '#') {
+				ReadChar ();
+				ReadCharacterReference ();
+			} else
+				ReadEntityReference (ignoreEntityReferences);
+
+			return returnEntityReference;
+		}
+
+		private void ReadCharacterReference ()
+		{
+			int value = 0;
+
+			if (PeekChar () == 'x') {
+				ReadChar ();
+
+				while (PeekChar () != ';' && PeekChar () != -1) {
+					int ch = ReadChar ();
+
+					if (ch >= '0' && ch <= '9')
+						value = (value << 4) + ch - '0';
+					else if (ch >= 'A' && ch <= 'F')
+						value = (value << 4) + ch - 'A' + 10;
+					else if (ch >= 'a' && ch <= 'f')
+						value = (value << 4) + ch - 'a' + 10;
+					else
+						throw new XmlException (
+							String.Format (
+								"invalid hexadecimal digit: {0} (#x{1:X})",
+								(char)ch,
+								ch));
+				}
+			} else {
+				while (PeekChar () != ';' && PeekChar () != -1) {
+					int ch = ReadChar ();
+
+					if (ch >= '0' && ch <= '9')
+						value = value * 10 + ch - '0';
+					else
+						throw new XmlException (
+							String.Format (
+								"invalid decimal digit: {0} (#x{1:X})",
+								(char)ch,
+								ch));
+				}
+			}
+
+			ReadChar (); // ';'
+
+			AppendValueChar (value);
+		}
+
+		private void ReadEntityReference (bool ignoreEntityReferences)
+		{
+			nameLength = 0;
+
+			int ch = PeekChar ();
+
+			while (ch != ';' && ch != -1) {
+				AppendNameChar (ReadChar ());
+				ch = PeekChar ();
+			}
+
+			Expect (';');
+
+			string name = CreateNameString ();
+
+			switch (name)
+			{
+				case "lt":
+					AppendValueChar ('<');
+					break;
+				case "gt":
+					AppendValueChar ('>');
+					break;
+				case "amp":
+					AppendValueChar ('&');
+					break;
+				case "apos":
+					AppendValueChar ('\'');
+					break;
+				case "quot":
+					AppendValueChar ('"');
+					break;
+				default:
+					if (ignoreEntityReferences) {
+						AppendValueChar ('&');
+
+						foreach (char ch2 in name) {
+							AppendValueChar (ch2);
+						}
+
+						AppendValueChar (';');
+					} else {
+						returnEntityReference = true;
+						entityReferenceName = name;
+					}
+					break;
+			}
+		}
+
+		// The reader is positioned on the first character of
+		// the attribute name.
+		private void ReadAttributes ()
+		{
+			do {
+				string name = ReadName ();
+				SkipWhitespace ();
+				Expect ('=');
+				SkipWhitespace ();
+				string value = ReadAttribute ();
+				SkipWhitespace ();
+
+				if (name == "xmlns")
+					parserContext.NamespaceManager.AddNamespace (String.Empty, value);
+				else if (name.StartsWith ("xmlns:"))
+					parserContext.NamespaceManager.AddNamespace (name.Substring (6), value);
+
+				AddAttribute (name, value);
+			} while (PeekChar () != '/' && PeekChar () != '>' && PeekChar () != -1);
+		}
+
+		// The reader is positioned on the quote character.
+		private string ReadAttribute ()
+		{
+			int quoteChar = ReadChar ();
+
+			if (quoteChar != '\'' && quoteChar != '\"')
+				throw new XmlException ("an attribute value was not quoted");
+
+			valueLength = 0;
+
+			while (PeekChar () != quoteChar) {
+				int ch = ReadChar ();
+
+				switch (ch)
+				{
+				case '<':
+					throw new XmlException ("attribute values cannot contain '<'");
+				case '&':
+					ReadReference (true);
+					break;
+				case -1:
+					throw new XmlException ("unexpected end of file in an attribute value");
+				default:
+					AppendValueChar (ch);
+					break;
+				}
+			}
+
+			ReadChar (); // quoteChar
+
+			return CreateValueString ();
+		}
+
+		// The reader is positioned on the first character
+		// of the target.
+		private void ReadProcessingInstruction ()
+		{
+			string target = ReadName ();
+			SkipWhitespace ();
+
+			valueLength = 0;
+
+			while (PeekChar () != -1) {
+				int ch = ReadChar ();
+
+				if (ch == '?' && PeekChar () == '>') {
+					ReadChar ();
+					break;
+				}
+
+				AppendValueChar ((char)ch);
+			}
+
+			SetProperties (
+				XmlNodeType.ProcessingInstruction, // nodeType
+				target, // name
+				false, // isEmptyElement
+				CreateValueString (), // value
+				true // clearAttributes
+			);
+		}
+
+		// The reader is positioned on the first character after
+		// the leading '<!'.
+		private void ReadDeclaration ()
+		{
+			int ch = PeekChar ();
+
+			switch (ch)
+			{
+			case '-':
+				Expect ('-');
+				Expect ('-');
+				ReadComment ();
+				break;
+			case '[':
+				ReadChar ();
+				Expect ('C');
+				Expect ('D');
+				Expect ('A');
+				Expect ('T');
+				Expect ('A');
+				Expect ('[');
+				ReadCDATA ();
+				break;
+			}
+		}
+
+		// The reader is positioned on the first character after
+		// the leading '<!--'.
+		private void ReadComment ()
+		{
+			valueLength = 0;
+
+			while (PeekChar () != -1) {
+				int ch = ReadChar ();
+
+				if (ch == '-' && PeekChar () == '-') {
+					ReadChar ();
+
+					if (PeekChar () != '>')
+						throw new XmlException ("comments cannot contain '--'");
+
+					ReadChar ();
+					break;
+				}
+
+				AppendValueChar ((char)ch);
+			}
+
+			SetProperties (
+				XmlNodeType.Comment, // nodeType
+				String.Empty, // name
+				false, // isEmptyElement
+				CreateValueString (), // value
+				true // clearAttributes
+			);
+		}
+
+		// The reader is positioned on the first character after
+		// the leading '<![CDATA['.
+		private void ReadCDATA ()
+		{
+			valueLength = 0;
+
+			while (PeekChar () != -1) {
+				int ch = ReadChar ();
+
+				if (ch == ']' && PeekChar () == ']') {
+					ch = ReadChar (); // ']'
+
+					if (PeekChar () == '>') {
+						ReadChar (); // '>'
+						break;
+					} else {
+						AppendValueChar (']');
+						AppendValueChar (']');
+						ch = ReadChar ();
+					}
+				}
+
+				AppendValueChar ((char)ch);
+			}
+
+			++depth;
+
+			SetProperties (
+				XmlNodeType.CDATA, // nodeType
+				String.Empty, // name
+				false, // isEmptyElement
+				CreateValueString (), // value
+				true // clearAttributes
+			);
+		}
+
+		// The reader is positioned on the first character
+		// of the name.
+		private string ReadName ()
+		{
+			if (!XmlChar.IsFirstNameChar (PeekChar ()))
+				throw new XmlException ("a name did not start with a legal character");
+
+			nameLength = 0;
+
+			AppendNameChar (ReadChar ());
+
+			while (XmlChar.IsNameChar (PeekChar ())) {
+				AppendNameChar (ReadChar ());
+			}
+
+			return CreateNameString ();
+		}
+
+		// Read the next character and compare it against the
+		// specified character.
+		private void Expect (int expected)
+		{
+			int ch = ReadChar ();
+
+			if (ch != expected) {
+				throw new XmlException (
+					String.Format (
+						"expected '{0}' ({1:X}) but found '{2}' ({3:X})",
+						(char)expected,
+						expected,
+						(char)ch,
+						ch));
+			}
+		}
+
+		// Does not consume the first non-whitespace character.
+		private void SkipWhitespace ()
+		{
+			while (XmlChar.IsWhitespace (PeekChar ()))
+				ReadChar ();
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlTextWriter.cs b/mcs/class/System.XML/System.Xml/XmlTextWriter.cs
new file mode 100644
index 00000000000..a0779362129
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlTextWriter.cs
@@ -0,0 +1,649 @@
+//
+// System.Xml.XmlTextWriter
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+using System.Collections;
+using System.IO;
+using System.Text;
+
+namespace System.Xml
+{
+	public class XmlTextWriter : XmlWriter
+	{
+		#region Fields
+
+		protected TextWriter w;
+		protected bool nullEncoding = false;
+		protected bool openWriter = true;
+		protected bool openStartElement = false;
+		protected bool openStartAttribute = false;
+		protected bool documentStarted = false;
+		private bool namespaces = true;
+		protected bool openAttribute = false;
+		protected bool attributeWrittenForElement = false;
+		protected Stack openElements = new Stack ();
+		private Formatting formatting = Formatting.None;
+		private int indentation = 2;
+		private char indentChar = ' ';
+		protected string indentChars = "  ";
+		private char quoteChar = '\"';
+		protected int indentLevel = 0;
+		protected string indentFormatting;
+		protected Stream baseStream = null;
+		protected string xmlLang = null;
+		protected XmlSpace xmlSpace = XmlSpace.None;
+		protected bool openXmlLang = false;
+		protected bool openXmlSpace = false;
+
+		#endregion
+
+		#region Constructors
+
+		public XmlTextWriter (TextWriter w) : base ()
+		{
+			this.w = w;
+			nullEncoding = (w.Encoding == null);
+			
+			try {
+				baseStream = ((StreamWriter)w).BaseStream;
+			}
+			catch (Exception) { }
+		}
+
+		public XmlTextWriter (Stream w,	Encoding encoding) : base ()
+		{
+			if (encoding == null) {
+				nullEncoding = true;
+				encoding = new UTF8Encoding ();
+			}
+
+			this.w = new StreamWriter(w, encoding);
+			baseStream = w;
+		}
+
+		public XmlTextWriter (string filename, Encoding encoding) : base ()
+		{
+			this.w = new StreamWriter(filename, false, encoding);
+			baseStream = ((StreamWriter)w).BaseStream;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public Stream BaseStream {
+			get { return baseStream; }
+		}
+
+
+		public Formatting Formatting {
+			get { return formatting; }
+			set { formatting = value; }
+		}
+
+		public bool IndentingOverriden 
+		{
+			get {
+				if (openElements.Count == 0)
+					return false;
+				else
+					return (((XmlTextWriterOpenElement)openElements.Peek()).IndentingOverriden);
+			}
+			set {
+				if (openElements.Count > 0)
+					((XmlTextWriterOpenElement)openElements.Peek()).IndentingOverriden = value;
+			}
+		}
+
+		public int Indentation {
+			get { return indentation; }
+			set {
+				indentation = value;
+				UpdateIndentChars ();
+			}
+		}
+
+		public char IndentChar {
+			get { return indentChar; }
+			set {
+				indentChar = value;
+				UpdateIndentChars ();
+			}
+		}
+
+		public bool Namespaces {
+			get { return namespaces; }
+			set {
+				if (ws != WriteState.Start)
+					throw new InvalidOperationException ("NotInWriteState.");
+				
+				namespaces = value;
+			}
+		}
+
+		public char QuoteChar {
+			get { return quoteChar; }
+			set {
+				if ((value != '\'') && (value != '\"'))
+					throw new ArgumentException ("This is an invalid XML attribute quote character. Valid attribute quote characters are ' and \".");
+				
+				quoteChar = value;
+			}
+		}
+
+		public override WriteState WriteState {
+			get { return ws; }
+		}
+		
+		public override string XmlLang {
+			get {
+				string xmlLang = null;
+				int i;
+
+				for (i = 0; i < openElements.Count; i++) 
+				{
+					xmlLang = ((XmlTextWriterOpenElement)openElements.ToArray().GetValue(i)).XmlLang;
+					if (xmlLang != null)
+						break;
+				}
+
+				return xmlLang;
+			}
+		}
+
+		public override XmlSpace XmlSpace {
+			get {
+				XmlSpace xmlSpace = XmlSpace.None;
+				int i;
+
+				for (i = 0; i < openElements.Count; i++) 
+				{
+					xmlSpace = ((XmlTextWriterOpenElement)openElements.ToArray().GetValue(i)).XmlSpace;
+					if (xmlSpace != XmlSpace.None)
+						break;
+				}
+
+				return xmlSpace;
+			}
+		}
+
+		#endregion
+
+		#region Methods
+
+		private void CheckState ()
+		{
+			if (!openWriter) {
+				throw new InvalidOperationException ("The Writer is closed.");
+			}
+			if ((documentStarted == true) && (formatting == Formatting.Indented) && (!IndentingOverriden)) {
+				indentFormatting = "\r\n";
+				if (indentLevel > 0) {
+					for (int i = 0; i < indentLevel; i++)
+						indentFormatting += indentChars;
+				}
+			}
+			else
+				indentFormatting = "";
+
+			documentStarted = true;
+		}
+
+		public override void Close ()
+		{
+			CloseOpenAttributeAndElements ();
+
+			w.Close();
+			ws = WriteState.Closed;
+			openWriter = false;
+		}
+
+		private void CloseOpenAttributeAndElements ()
+		{
+			if (openAttribute)
+				WriteEndAttribute ();
+
+			while (openElements.Count > 0) {
+				WriteEndElement();
+			}
+		}
+
+		private void CloseStartElement ()
+		{
+			if (openStartElement) {
+				w.Write(">");
+				ws = WriteState.Content;
+				openStartElement = false;
+				attributeWrittenForElement = false;
+			}
+		}
+
+		public override void Flush ()
+		{
+			w.Flush ();
+		}
+
+		public override string LookupPrefix (string ns)
+		{
+			string prefix = namespaceManager.LookupPrefix (ns);
+
+			if (prefix == String.Empty)
+				prefix = null;
+
+			return prefix;
+		}
+
+		private void UpdateIndentChars ()
+		{
+			indentChars = "";
+			for (int i = 0; i < indentation; i++)
+				indentChars += indentChar;
+		}
+
+		public override void WriteBase64 (byte[] buffer, int index, int count)
+		{
+			w.Write (Convert.ToBase64String (buffer, index, count));
+		}
+
+		[MonoTODO]
+		public override void WriteBinHex (byte[] buffer, int index, int count)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override void WriteCData (string text)
+		{
+			if (text.IndexOf("]]>") > 0)
+				throw new ArgumentException ();
+
+			CheckState ();
+			CloseStartElement ();
+
+			w.Write("<![CDATA[{0}]]>", text);
+		}
+
+		public override void WriteCharEntity (char ch)
+		{
+			Int16	intCh = (Int16)ch;
+
+			// Make sure the character is not in the surrogate pair
+			// character range, 0xd800- 0xdfff
+			if ((intCh >= -10240) && (intCh <= -8193))
+				throw new ArgumentException ("Surrogate Pair is invalid.");
+
+			w.Write("&#x{0:X};", intCh);
+		}
+
+		[MonoTODO]
+		public override void WriteChars (char[] buffer, int index, int count)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override void WriteComment (string text)
+		{
+			if ((text.EndsWith("-")) || (text.IndexOf("-->") > 0)) {
+				throw new ArgumentException ();
+			}
+
+			CheckState ();
+			CloseStartElement ();
+
+			w.Write ("<!--{0}-->", text);
+		}
+
+		[MonoTODO]
+		public override void WriteDocType (string name, string pubid, string sysid, string subset)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override void WriteEndAttribute ()
+		{
+			if (!openAttribute)
+				throw new InvalidOperationException("Token EndAttribute in state Start would result in an invalid XML document.");
+
+			CheckState ();
+
+			if (openXmlLang) {
+				w.Write (xmlLang);
+				openXmlLang = false;
+				((XmlTextWriterOpenElement)openElements.Peek()).XmlLang = xmlLang;
+			}
+
+			if (openXmlSpace) 
+			{
+				w.Write (xmlSpace.ToString ().ToLower ());
+				openXmlSpace = false;
+				((XmlTextWriterOpenElement)openElements.Peek()).XmlSpace = xmlSpace;
+			}
+
+			w.Write ("{0}", quoteChar);
+
+			openAttribute = false;
+		}
+
+		public override void WriteEndDocument ()
+		{
+			if ((ws == WriteState.Start) || (ws == WriteState.Prolog))
+				throw new ArgumentException ("This document does not have a root element.");
+
+			CloseOpenAttributeAndElements ();
+
+			ws = WriteState.Start;
+		}
+
+		public override void WriteEndElement ()
+		{
+			WriteEndElementInternal (false);
+		}
+
+		private void WriteEndElementInternal (bool fullEndElement)
+		{
+			if (openElements.Count == 0)
+				throw new InvalidOperationException("There was no XML start tag open.");
+
+			indentLevel--;
+			CheckState ();
+
+			if (openStartElement) {
+				if (openAttribute)
+					WriteEndAttribute ();
+				if (fullEndElement)
+					w.Write ("></{0}>", ((XmlTextWriterOpenElement)openElements.Peek ()).Name);
+				else
+					w.Write (" />");
+
+				openElements.Pop ();
+				openStartElement = false;
+			} else {
+				w.Write ("{0}</{1}>", indentFormatting, openElements.Pop ());
+			}
+
+			namespaceManager.PopScope();
+		}
+
+		[MonoTODO]
+		public override void WriteEntityRef (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override void WriteFullEndElement ()
+		{
+			WriteEndElementInternal (true);
+		}
+
+		[MonoTODO]
+		public override void WriteName (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void WriteNmToken (string name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override void WriteProcessingInstruction (string name, string text)
+		{
+			if ((name == null) || (name == string.Empty) || (name.IndexOf("?>") > 0) || (text.IndexOf("?>") > 0)) {
+				throw new ArgumentException ();
+			}
+
+			CheckState ();
+			CloseStartElement ();
+
+			w.Write ("{0}<?{1} {2}?>", indentFormatting, name, text);
+		}
+
+		[MonoTODO]
+		public override void WriteQualifiedName (string localName, string ns)
+		{
+			if (localName == null || localName == String.Empty)
+				throw new ArgumentException ();
+
+			CheckState ();
+			w.Write ("{0}:{1}", ns, localName);
+		}
+
+		public override void WriteRaw (string data)
+		{
+			WriteStringInternal (data, false);
+		}
+
+		[MonoTODO]
+		public override void WriteRaw (char[] buffer, int index, int count)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override void WriteStartAttribute (string prefix, string localName, string ns)
+		{
+			if ((prefix == "xml") && (localName == "lang"))
+				openXmlLang = true;
+
+			if ((prefix == "xml") && (localName == "space"))
+				openXmlSpace = true;
+
+			if ((prefix == "xmlns") && (localName == "xmlns"))
+				throw new ArgumentException ("Prefixes beginning with \"xml\" (regardless of whether the characters are uppercase, lowercase, or some combination thereof) are reserved for use by XML.");
+
+			CheckState ();
+
+			if (ws == WriteState.Content)
+				throw new InvalidOperationException ("Token StartAttribute in state " + WriteState + " would result in an invalid XML document.");
+
+			if (prefix == null)
+				prefix = String.Empty;
+
+			if (ns == null)
+				ns = String.Empty;
+
+			string formatPrefix = "";
+			string formatSpace = "";
+
+			if (ns != String.Empty) 
+			{
+				string existingPrefix = namespaceManager.LookupPrefix (ns);
+
+				if (prefix == String.Empty)
+					prefix = existingPrefix;
+			}
+
+			if (prefix != String.Empty) 
+			{
+				formatPrefix = prefix + ":";
+			}
+
+			if (openStartElement || attributeWrittenForElement)
+				formatSpace = " ";
+
+			w.Write ("{0}{1}{2}={3}", formatSpace, formatPrefix, localName, quoteChar);
+
+			openAttribute = true;
+			attributeWrittenForElement = true;
+			ws = WriteState.Attribute;
+		}
+
+		public override void WriteStartDocument ()
+		{
+			WriteStartDocument ("");
+		}
+
+		public override void WriteStartDocument (bool standalone)
+		{
+			string standaloneFormatting;
+
+			if (standalone == true)
+				standaloneFormatting = String.Format (" standalone={0}yes{0}", quoteChar);
+			else
+				standaloneFormatting = String.Format (" standalone={0}no{0}", quoteChar);
+
+			WriteStartDocument (standaloneFormatting);
+		}
+
+		private void WriteStartDocument (string standaloneFormatting)
+		{
+			if (documentStarted == true)
+				throw new InvalidOperationException("WriteStartDocument should be the first call.");
+
+			CheckState ();
+
+			string encodingFormatting = "";
+
+			if (!nullEncoding) 
+				encodingFormatting = String.Format (" encoding={0}{1}{0}", quoteChar, w.Encoding.HeaderName);
+
+			w.Write("<?xml version={0}1.0{0}{1}{2}?>", quoteChar, encodingFormatting, standaloneFormatting);
+			ws = WriteState.Prolog;
+		}
+
+		public override void WriteStartElement (string prefix, string localName, string ns)
+		{
+			if (!Namespaces && (((prefix != null) && (prefix != String.Empty))
+				|| ((ns != null) && (ns != String.Empty))))
+				throw new ArgumentException ("Cannot set the namespace if Namespaces is 'false'.");
+
+			WriteStartElementInternal (prefix, localName, ns);
+		}
+
+		protected override void WriteStartElementInternal (string prefix, string localName, string ns)
+		{
+			if (prefix == null)
+				prefix = String.Empty;
+
+			if ((prefix != String.Empty) && ((ns == null) || (ns == String.Empty)))
+				throw new ArgumentException ("Cannot use a prefix with an empty namespace.");
+
+			CheckState ();
+			CloseStartElement ();
+			
+			string formatXmlns = "";
+			string formatPrefix = "";
+
+			if(ns != null)
+			{
+				if (ns != String.Empty) 
+				{
+					string existingPrefix = namespaceManager.LookupPrefix (ns);
+
+					if (prefix == String.Empty)
+						prefix = existingPrefix;
+
+					if (prefix != existingPrefix)
+						formatXmlns = String.Format (" xmlns:{0}={1}{2}{1}", prefix, quoteChar, ns);
+					else if (existingPrefix == String.Empty)
+						formatXmlns = String.Format (" xmlns={0}{1}{0}", quoteChar, ns);
+				}
+				else if ((prefix == String.Empty) && (namespaceManager.LookupNamespace(prefix) != String.Empty)) {
+					formatXmlns = String.Format (" xmlns={0}{0}", quoteChar);
+				}
+
+				if (prefix != String.Empty) {
+					formatPrefix = prefix + ":";
+				}
+			}
+
+			w.Write ("{0}<{1}{2}{3}", indentFormatting, formatPrefix, localName, formatXmlns);
+	
+
+			openElements.Push (new XmlTextWriterOpenElement (formatPrefix + localName));
+			ws = WriteState.Element;
+			openStartElement = true;
+
+			namespaceManager.PushScope ();
+			if(ns != null)
+			{
+				namespaceManager.AddNamespace (prefix, ns);
+			}
+			indentLevel++;
+		}
+
+		public override void WriteString (string text)
+		{
+			if (ws == WriteState.Prolog)
+				throw new InvalidOperationException ("Token content in state Prolog would result in an invalid XML document.");
+
+			WriteStringInternal (text, true);
+		}
+
+		public void WriteStringInternal (string text, bool entitize)
+		{
+			if (text == null)
+				text = String.Empty;
+
+			if (text != String.Empty) 
+			{
+				CheckState ();
+
+				if (entitize)
+				{
+					text = text.Replace ("&", "&amp;");
+					text = text.Replace ("<", "&lt;");
+					text = text.Replace (">", "&gt;");
+					
+					if (openAttribute) 
+					{
+						if (quoteChar == '"')
+							text = text.Replace ("\"", "&quot;");
+						else
+							text = text.Replace ("'", "&apos;");
+					}
+				}
+
+				if (!openAttribute)
+				{
+					IndentingOverriden = true;
+					CloseStartElement ();
+				}
+				if (!openXmlLang && !openXmlSpace)
+					w.Write (text);
+				else 
+				{
+					if (openXmlLang)
+						xmlLang = text;
+					else 
+					{
+						switch (text) 
+						{
+							case "default":
+								xmlSpace = XmlSpace.Default;
+								break;
+							case "preserve":
+								xmlSpace = XmlSpace.Preserve;
+								break;
+							default:
+								throw new ArgumentException ("'{0}' is an invalid xml:space value.");
+						}
+					}
+				}
+			}
+		}
+
+		[MonoTODO]
+		public override void WriteSurrogateCharEntity (char lowChar, char highChar)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override void WriteWhitespace (string ws)
+		{
+			foreach (char c in ws) {
+				if ((c != ' ') && (c != '\t') && (c != '\r') && (c != '\n'))
+					throw new ArgumentException ();
+			}
+
+			w.Write (ws);
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlTextWriterOpenElement.cs b/mcs/class/System.XML/System.Xml/XmlTextWriterOpenElement.cs
new file mode 100644
index 00000000000..1f0f63aae3d
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlTextWriterOpenElement.cs
@@ -0,0 +1,72 @@
+//
+// System.Xml.XmlTextWriterOpenElement
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+//
+//	Scope support for XmlLang and XmlSpace in XmlTextWriter.
+//
+using System;
+
+namespace System.Xml
+{
+	internal class XmlTextWriterOpenElement
+	{
+		#region Fields
+
+		string name;
+		string xmlLang;
+		XmlSpace xmlSpace;
+		bool indentingOverriden = false;
+
+		#endregion
+
+		#region Constructors
+
+		public XmlTextWriterOpenElement (string name)
+		{
+			this.name = name;
+		}
+
+		#endregion
+
+		#region Properties
+
+		public string Name 
+		{
+			get { return name; }
+		}
+
+		public bool IndentingOverriden 
+		{
+			get { return indentingOverriden; }
+			set { indentingOverriden = value; }
+		}
+
+		public string XmlLang
+		{
+			get { return xmlLang; }
+			set { xmlLang = value; }
+		}
+
+		public XmlSpace XmlSpace
+		{
+			get { return xmlSpace; }
+			set { xmlSpace = value; }
+		}
+
+		#endregion
+
+		#region Methods
+
+		public override string ToString ()
+		{
+			return name;
+		}
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlTokenizedType.cs b/mcs/class/System.XML/System.Xml/XmlTokenizedType.cs
new file mode 100755
index 00000000000..13762770ce6
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlTokenizedType.cs
@@ -0,0 +1,27 @@
+//
+// System.Xml.XmlTokenizedType.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Xml
+{
+	[Serializable] public enum XmlTokenizedType
+	{
+		CDATA = 0,
+		ID = 1,
+		IDREF = 2,
+		IDREFS = 3,
+		ENTITY = 4,
+		ENTITIES = 5,
+		NMTOKEN = 6,
+		NMTOKENS = 7,
+		NOTATION = 8,
+		ENUMERATION = 9,
+		QName = 10,
+		NCName = 11,
+		None = 12,
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlUrlResolver.cs b/mcs/class/System.XML/System.Xml/XmlUrlResolver.cs
new file mode 100755
index 00000000000..54750bb6f60
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlUrlResolver.cs
@@ -0,0 +1,41 @@
+// System.Xml.XmlUrlResolver.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System.Net;
+
+namespace System.Xml
+{
+	public class XmlUrlResolver : XmlResolver
+	{
+		// Field
+		ICredentials credential;
+		
+		// Constructor
+		public XmlUrlResolver ()
+			: base ()
+		{
+		}
+
+		// Properties		
+		public override ICredentials Credentials
+		{
+			set { credential = value; }
+		}
+		
+		// Methods
+		[MonoTODO]
+		public override object GetEntity (Uri absoluteUri, string role, Type ofObjectToReturn)
+		{
+			return null;
+		}
+
+		public override Uri ResolveUri (Uri baseUri, string relativeUri)
+		{
+			return new Uri (baseUri, relativeUri);
+		}
+	}       
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlWhitespace.cs b/mcs/class/System.XML/System.Xml/XmlWhitespace.cs
new file mode 100644
index 00000000000..62abbb82413
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlWhitespace.cs
@@ -0,0 +1,66 @@
+//
+// System.Xml.XmlWhitespace.cs
+//
+// Author:
+//	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Xml
+{
+	public class XmlWhitespace : XmlCharacterData
+	{
+		// Constructor
+		protected internal XmlWhitespace (string strData, XmlDocument doc)
+			: base (strData, doc)
+		{
+		}
+		
+		// Properties
+		public override string LocalName {
+			get { return "#whitespace"; }
+		}
+
+		public override string Name {
+			get { return "#whitespace"; }
+		}
+
+		public override XmlNodeType NodeType {
+			get { return XmlNodeType.Whitespace; }
+		}
+
+		public override string Value {
+			get { return Data; }
+			[MonoTODO]
+			set {
+				if (IsValidWhitespaceChar (value) == false)
+					throw new ArgumentException ("Invalid whitespace characters.");
+			}
+		}
+
+		// Methods
+		public override XmlNode CloneNode (bool deep)
+		{
+			// always return the data value
+			return new XmlWhitespace (Data, OwnerDocument); 
+		}
+
+		public override void WriteContentTo (XmlWriter w) {}
+
+		public override void WriteTo (XmlWriter w)
+		{
+			w.WriteWhitespace (Data);
+		}
+
+		private bool IsValidWhitespaceChar (string text)
+		{
+			foreach (char c in text)
+				if ((c != ' ') && (c != '\r') && (c != '\n') && (c != '\t'))
+					return false;
+			return true;
+		}
+	}
+}
diff --git a/mcs/class/System.XML/System.Xml/XmlWriter.cs b/mcs/class/System.XML/System.Xml/XmlWriter.cs
new file mode 100644
index 00000000000..c383cca6501
--- /dev/null
+++ b/mcs/class/System.XML/System.Xml/XmlWriter.cs
@@ -0,0 +1,170 @@
+//
+// System.Xml.XmlTextWriter
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+
+namespace System.Xml
+{
+	public abstract class XmlWriter
+	{
+		#region Fields
+
+		protected WriteState ws = WriteState.Start;
+		protected XmlNamespaceManager namespaceManager = new XmlNamespaceManager (new NameTable ());
+
+		#endregion
+
+		#region Constructors
+
+		protected XmlWriter () { }
+
+		#endregion
+
+		#region Properties
+
+		public abstract WriteState WriteState { get; }
+		
+		public abstract string XmlLang { get; }
+
+		public abstract XmlSpace XmlSpace { get; }
+
+		#endregion
+
+		#region Methods
+
+		public abstract void Close ();
+
+		public abstract void Flush ();
+
+		public abstract string LookupPrefix (string ns);
+
+		[MonoTODO]
+		public virtual void WriteAttributes (XmlReader reader, bool defattr)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public void WriteAttributeString (string localName, string value)
+		{
+			WriteAttributeString ("", localName, "", value);
+		}
+
+		public void WriteAttributeString (string localName, string ns, string value)
+		{
+			WriteAttributeString ("", localName, ns, value);
+		}
+
+		public void WriteAttributeString (string prefix, string localName, string ns, string value)
+		{
+			if ((prefix == "xmlns") || (localName == "xmlns"))
+				ns = value;
+			
+			WriteStartAttribute (prefix, localName, ns);
+			WriteString (value);
+			WriteEndAttribute ();
+
+			if ((prefix == "xmlns") || (localName == "xmlns")) 
+			{
+				if (prefix == "xmlns")
+					namespaceManager.AddNamespace (localName, ns);
+				else
+					namespaceManager.AddNamespace ("", ns);
+			}
+		}
+
+		public abstract void WriteBase64 (byte[] buffer, int index, int count);
+
+		public abstract void WriteBinHex (byte[] buffer, int index, int count);
+
+		public abstract void WriteCData (string text);
+
+		public abstract void WriteCharEntity (char ch);
+
+		public abstract void WriteChars (char[] buffer, int index, int count);
+
+		public abstract void WriteComment (string text);
+
+		public abstract void WriteDocType (string name, string pubid, string sysid, string subset);
+
+		public void WriteElementString (string localName, string value)
+		{
+			WriteStartElement(localName);
+			WriteString(value);
+			WriteEndElement();
+		}
+
+		public void WriteElementString (string localName, string ns, string value)
+		{
+			WriteStartElement(localName, ns);
+			WriteString(value);
+			WriteEndElement();
+		}
+
+		public abstract void WriteEndAttribute ();
+
+		public abstract void WriteEndDocument ();
+
+		public abstract void WriteEndElement ();
+
+		public abstract void WriteEntityRef (string name);
+
+		public abstract void WriteFullEndElement ();
+
+		public abstract void WriteName (string name);
+
+		public abstract void WriteNmToken (string name);
+
+		[MonoTODO]
+		public virtual void WriteNode (XmlReader reader, bool defattr)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public abstract void WriteProcessingInstruction (string name, string text);
+
+		public abstract void WriteQualifiedName (string localName, string ns);
+
+		public abstract void WriteRaw (string data);
+
+		public abstract void WriteRaw (char[] buffer, int index, int count);
+
+		public void WriteStartAttribute (string localName, string ns)
+		{
+			WriteStartAttribute ("", localName, ns);
+		}
+
+		public abstract void WriteStartAttribute (string prefix, string localName, string ns);
+
+		public abstract void WriteStartDocument ();
+
+		public abstract void WriteStartDocument (bool standalone);
+
+		public void WriteStartElement (string localName)
+		{
+			WriteStartElementInternal (null, localName, null);
+		}
+
+		public void WriteStartElement (string localName, string ns)
+		{
+			WriteStartElement (null, localName, ns);
+		}
+
+		public abstract void WriteStartElement (string prefix, string localName, string ns);
+
+		protected abstract void WriteStartElementInternal (string prefix, string localName, string ns);
+
+		public abstract void WriteString (string text);
+
+		public abstract void WriteSurrogateCharEntity (char lowChar, char highChar);
+
+		public abstract void WriteWhitespace (string ws);
+
+		#endregion
+	}
+}
diff --git a/mcs/class/System.XML/Test/.cvsignore b/mcs/class/System.XML/Test/.cvsignore
new file mode 100644
index 00000000000..136fcca0890
--- /dev/null
+++ b/mcs/class/System.XML/Test/.cvsignore
@@ -0,0 +1,4 @@
+*.dll
+*.csproj.user
+bin
+obj
diff --git a/mcs/class/System.XML/Test/AllTests.cs b/mcs/class/System.XML/Test/AllTests.cs
new file mode 100644
index 00000000000..1ebb2952079
--- /dev/null
+++ b/mcs/class/System.XML/Test/AllTests.cs
@@ -0,0 +1,48 @@
+// Author:
+//   Mario Martinez (mariom925@home.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	/// <summary>
+	///   Combines all unit tests for the System.XML.dll assembly
+	///   into one test suite.
+	/// </summary>
+	public class AllTests : TestCase
+	{
+		public AllTests (string name) : base (name) {}
+
+		public static ITest Suite {
+			get {
+				TestSuite suite =  new TestSuite ();
+				suite.AddTest (new TestSuite (typeof (XmlProcessingInstructionTests)));
+				suite.AddTest (new TestSuite (typeof (XmlTextTests)));
+				suite.AddTest (new TestSuite (typeof (XmlTextReaderTests)));
+				suite.AddTest (new TestSuite (typeof (XmlTextWriterTests)));
+				suite.AddTest (new TestSuite (typeof (XmlNamespaceManagerTests)));
+				suite.AddTest (new TestSuite (typeof (XmlAttributeTests)));
+				suite.AddTest (new TestSuite (typeof (XmlAttributeCollectionTests)));
+				suite.AddTest (new TestSuite (typeof (XmlDocumentTests)));
+				suite.AddTest (new TestSuite (typeof (NameTableTests)));
+				suite.AddTest (new TestSuite (typeof (XmlElementTests)));
+				suite.AddTest (new TestSuite (typeof (XmlNodeTests)));
+				suite.AddTest (new TestSuite (typeof (XmlNodeListTests)));
+				suite.AddTest (new TestSuite (typeof (XmlCharacterDataTests)));
+				suite.AddTest (new TestSuite (typeof (XmlCommentTests)));
+				suite.AddTest (new TestSuite (typeof (XmlCDataSectionTests)));
+				suite.AddTest (new TestSuite (typeof (XmlWhitespaceTests)));
+				suite.AddTest (new TestSuite (typeof (XmlSignificantWhitespaceTests)));
+				suite.AddTest (new TestSuite (typeof (XmlDeclarationTests)));
+				suite.AddTest (new TestSuite (typeof (XmlDocumentTypeTests)));
+				suite.AddTest (new TestSuite (typeof (XPathNavigatorTests)));
+				suite.AddTest (new TestSuite (typeof (SelectNodesTests)));
+				suite.AddTest (new TestSuite (typeof (XPathNavigatorMatchesTests)));
+				return suite;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/ChangeLog b/mcs/class/System.XML/Test/ChangeLog
new file mode 100644
index 00000000000..cb73def2b85
--- /dev/null
+++ b/mcs/class/System.XML/Test/ChangeLog
@@ -0,0 +1,427 @@
+2002-08-22  Jason Diamond <jason@injektilo.org>
+
+	* AllTests.cs, System.XML_linux_test.args, 
+	XmlAttributeCollectionTests.cs,XmlElementTests.cs: Added test for 
+	RemoveAll and RemoveAllAttributes courtesy of Matt Hunter
+	<xrkune@tconl.com>.
+
+2002-08-22  Jason Diamond <jason@injektilo.org>
+
+	* XmlElementTests.cs: Correction to previous GetElementsByTagName
+	patch courtesy of Matt Hunter <xrkune@tconl.com>.
+
+2002-08-22  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocumentTests.cs, XmlElementTests.cs: Added tests for 
+	namespace qualified GetElementsByTagName courtesy of Matt Hunter 
+	<xrkune@tconl.com>.
+
+2002-08-19  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocumentTests.cs, XmlElementTests.cs: Added tests for 
+	GetElementsByTagName courtesy of Matt Hunter <xrkune@tconl.com>.
+
+2002-08-17  Jason Diamond  <jason@injektilo.org>
+
+	* XPathNavigatorMatchesTests.cs: Added tests for absolute patterns
+	and patterns with predicates.
+
+2002-08-17  Jason Diamond  <jason@injektilo.org>
+
+	* AllTests.cs: Added XPathNavigatorMatchesTests suite.
+
+	* XPathNavigatorMatchesTests.cs: Added.
+
+2002-08-16  Jason Diamond  <jason@injektilo.org>
+
+	* XmlElementTests.cs: Added test for OuterXml (and WriteTo) for
+	qualified elements.
+
+2002-08-16  Jason Diamond  <jason@injektilo.org>
+
+	* makefile.gnu: Added SOURCES_INCLUDE and SOURCES_EXCLUDE variables
+	to get tests to build with the new build system.
+
+2002-08-10  Jason Diamond  <jason@injektilo.org>
+
+	* makefile.gnu: Use relative path to NUnitConsole_mono.exe instead of
+	hardcoding it to /usr/local/bin. Default test suite to AllTests but
+	allow it to be overridden from the command line.
+
+	* XmlTextWriterTests.cs: Split TestWriteString into multiple tests.
+	Added encoding parameters to all the StreamReaders in
+	TestBaseConstructorsAndBaseStream. I think this is a bug in Mono's
+	StreamReader since these aren't required when testing against
+	Microsoft's.
+
+2002-08-08  Jason Diamond  <jason@injektilo.org>
+
+	* System.XML_linux_test.args: Added Kral's new test classes.
+
+2002-08-07  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlCharacterDataTests.cs:  New file.
+	
+	* XmlNodeTests.cs:  New file.
+	
+	* AllTests.cs:  Added XmlCharacterDataTests and XmlNodeTests.
+	
+	* XmlDocumentTests.cs:  Added tests for NodeChanging, NodeChanged,
+		NodeInserting, NodeInserted, NodeRemoving, and NodeRemoved events.
+		
+2002-08-03  Jason Diamond  <jason@injektilo.org>
+
+	* makefile.gnu: Added.
+
+	* System.XML_linux_test.args: Added.
+
+2002-07-12  Piers Haken <piersh@friskit.com
+
+	* SelectNodesTests.cs: Added TestUnion (bug #27548)
+
+2002-07-11  Jason Diamond  <jason@injektilo.org>
+
+	* SelectNodesTests.cs: Added.
+
+	* AllTests.cs: Added SelectNodesTests to suite.
+
+2002-07-11  Piers Haken <piersh@friskit.com>
+
+	* XmlElementTests.cs: added TestCreateElement3WithNullNamespace
+
+2002-06-24  Jason Diamond  <jason@injektilo.org>
+
+	* XPathScannerTests.cs: Removed.
+
+	* System.XML_test.build: Removed tests for XPathScanner.
+
+2002-05-27  Jason Diamond  <jason@injektilo.org>
+
+	* XPathNavigatorTests.cs: Added file to directory.
+
+	* AllTests.cs: Added XPathNavigatorTests to suite.
+
+	* XmlTextReaderTests.cs: Added test to make sure attributes are ordered
+	like Microsoft's parser does it.
+
+2002-05-05  Nick Drochak  <ndrochak@gol.com>
+
+	* ChangeLog: Update build file to run correct class in the test dll.
+
+2002-05-05  Nick Drochak  <ndrochak@gol.com>
+
+	* AllTests.cs 
+	* NameTableTests.cs 
+	* TheTests.cs 
+	* XPathScannerTests.cs
+	* XmlAttributeTests.cs 
+	* XmlCDataSectionTests.cs
+	* XmlCommentTests.cs 
+	* XmlDeclarationTests.cs 
+	* XmlDocumentTests.cs
+	* XmlDocumentTypeTests.cs 
+	* XmlElementTests.cs
+	* XmlNamespaceManagerTests.cs 
+	* XmlNodeListTests.cs
+	* XmlProcessingInstructionTests.cs
+	* XmlSignificantWhitespaceTests.cs 
+	* XmlTextReaderTests.cs
+	* XmlTextTests.cs 
+	* XmlTextWriterTests.cs 
+	* XmlWhiteSpaceTests.cs: Use same namespace style as corlib tests.
+	Changed Ximian.Mono.Tests to MonoTests.System.Xml
+
+2002-04-08  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* AllTests.cs: added XmlProcessingInstructionTests and XmlTextTests.
+	
+	* MonoMicro.Test.csproj: Added XmlProcessingInstructionTests.cs and
+	XmlTextTests.cs.
+	
+	* XmlAttributeTests.cs: Added TestAttributeInnerAndOuterXml.
+	
+	* XmlCDataSectionTests.cs: Added TestXmlCDataSectionInnerAndOuterXml.
+	
+	* XmlCommentTests.cs: Added TestXmlCommentInnerAndOuterXml.
+	
+	* XmlDeclarationTests.cs: Added TestInnerAndOuterXml.
+	
+	* XmlDocumentTests.cs: Added TestInnerAndOuterXml.
+	
+	* XmlElementTests.cs: Added TestInnerAndOuterXml.
+	
+	* XmlProcessingInstructionTests.cs: Initial check-in.
+	
+	* XmlSignificantWhitespaceTests.cs: Added TestInnerAndOuterXml.
+	
+	* XmlTextTests.cs: Initial check-in.
+	
+	* XmlTextWriterTests.cs: Added TestWriteRaw, TestWriteRawInvalidInAttribute,
+	and TestXmlSpaceRaw.
+	
+	* XmlWhiteSpacesTests.cs: Added TestInnerAndOuterXml.
+
+2002-04-05  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlDocumentTests.cs: CreateNode tests.
+
+2002-04-01  Kral Ferch  <kral_ferch@hotmail.com>
+
+	* XmlTextWriterTests.cs: Tests for WriteEndDocument and WriteFullEndElement.
+	
+2002-03-31  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextWriterTests.cs: Tests for LookupPrefix, WriteBase64,
+	and WriteCharEntity.
+
+2002-03-31  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextWriterTests.cs: Finished XmlLang, XmlSpace, and
+	Attribute namespace declaration tests.
+	
+2002-03-29  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextWriterTests.cs: XmlLang and XmlSpace tests.
+	
+2002-03-29  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextWriterTests.cs: Working on Attributes.
+	
+2002-03-28  Duncan Mak  <duncan@ximian.com>
+
+	* XmlDeclarationTests.cs (TestConstructor): 
+	* XmlDocumentTypeTests.cs (TestAppendChild): 
+	* XmlSignificantWhitespaceTests.cs (TestXmlWhitespaceConstructor): 
+	* XmlWhiteSpaceTests.cs (TestXmlWhitespaceConstructor): Fixed the
+	test for catching Exceptions.
+
+2002-03-26  Jason Diamond  <jason@injektilo.org>
+
+	* AllTests.cs:
+	* Mono.Test.csproj: Removed XPathScanner tests.
+
+	* System.XML_test.build: Test XPathScanner separately.
+
+2002-03-26  Duncan Mak  <duncan@ximian.com>
+
+	* AllTests.cs: 
+	* Microsoft.Test.csproj: 
+	* Mono.Test.csproj: Updated to include new test,
+	XmlDocumentTypeTests.
+
+	* XmlDocumentTypeTests.cs: New testsuite for XmlDocumentType class.
+
+	* XmlCommentTests.cs (TestXmlNodeBaseProperties): Move the
+	XmlNode.Value test in here.
+
+2002-03-26  Jason Diamond  <jason@injektilo.org>
+
+	* XPathScannerTests.cs: More location path tests.
+
+2002-03-25  Jason Diamond  <jason@injektilo.org>
+
+	* AllTests.cs: 
+	* Microsoft.Test.csproj: 
+	* Mono.Test.csproj: Updated to include new test, XmlScannerTests.
+
+	* XPathScannerTests.cs: Added new tests for XPathScanner class.
+
+2002-03-25  Duncan Mak  <duncan@ximian.com>
+
+	* AllTests.cs: 
+	* Microsoft.Test.csproj: 
+	* Mono.Test.csproj: Updated to include new test,
+	XmlDeclarationTests.
+
+	* XmlDeclarationTests.cs: Added new test for XmlDeclaration class.
+
+2002-03-23  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextWriterTests.cs: Tests for BaseStream,
+	Namespaces = false, and WriteState.
+
+2002-03-23  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextWriterTests.cs: constructor tests with
+	different encodings to test that encoding gets suppressed
+	on xml declaration when null stream passed to constructor.
+	WriteStartDocument(standalone) tests.  Tests for formatting
+	and indentation.  Test for invalid value set on QuoteChar.
+
+2002-03-22  Duncan Mak  <duncan@ximian.com>
+
+	* AllTests.cs: 
+	* Microsoft.Test.csproj: 
+	* Mono.Test.csproj: Updated to include new files.
+
+	* XmlCDataSectionTests.cs: Added to CVS.
+
+	* XmlCommentTests.cs: Added to CVS. hanks to Kral for helping me
+	setup a testing environment on VS.NET.
+
+	* XmlElementTests.cs: Reformatted.
+	(TestCloneNode): Added.
+
+	* XmlSignificantWhitespaceTests.cs: Added to CVS.
+
+	* XmlWhiteSpaceTests.cs: Added to CVS.
+		
+2002-03-21  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlDocumentTests.cs: Tessts parent traversal up through
+	document itself until null.  Tests a removed elements next
+	sibling is null.
+	
+	* XmlNodeListTests.cs: Tests case where enumerator is on
+	a node that gets removed from list.
+	
+	* XmlTextWriterTests.cs: Keeping tests for WriteXXX after
+	writer is closed up to date as new WriteXXX methods are written.
+	TestDocumentStart and TestWriteEndElement.
+	
+2002-03-19  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocumentTests.cs: Added a test to check an element's names after 
+	loading.
+
+2002-03-17  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlDocumentTests.cs: Tests navigation to parents since
+	that was part of a document.Load() bug reported by Mike Kestner.
+	
+	* XmlTextWriterTests.cs: Tests for namespaces and prefixes.
+
+2002-03-17  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlDocumentTests.cs: TestOuterXml.
+	
+	* XmlTextWriterTests.cs: Tests for CData, Close, Comment, Element,
+	and ProcessingInstruction.
+
+2002-03-17  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlDocumentTests.cs: More LoadXml tests.
+	
+	* XmlTextWriterTests.cs: Test for invalid Processing Instructions.
+
+2002-03-14  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextWriterTests.cs:  Added tests TestCData and TestComment.
+	
+2002-03-14  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlTextWriterTests.cs:  Initial checkin.
+	
+2002-03-12  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlNodeListTests.cs: New tests: TestNodeTypesThatCantHaveChildren,
+	TestZeroChildren, TestOneChild, TestMultipleChildren,
+	TestAppendChildAffectOnEnumeration, TestRemoveChildAffectOnEnumeration,
+	TestRemoveOnlyChildAffectOnEnumeration, TestCurrentBeforeFirstNode,
+	TestCurrentAfterLastNode, TestCurrentDoesntMove, and TestReset.  Made
+	two other tests but not in use yet until RemoveAll is implemented for
+	attributes and XmlNode.ReplaceChild is implemented.  The tests are called
+	saveTestReplaceChildAffectOnEnumeration and saveTestRemoveAllAffectOnEnumeration.
+
+2002-03-08  Jason Diamond <jason@injektilo.org>
+
+	* XmlTextReaderTests.cs: Test MoveToElement and MoveToFirstAttribute.
+
+2002-03-08  Jason Diamond <jason@injektilo.org>
+
+	* XmlAttributeTests.cs: Test XmlAttribute child nodes.
+
+2002-03-08  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlNodeListTests.cs: New file.
+
+	* AllTests.cs: Added XmlNodeListTests.
+
+2002/03/08  Nick Drochak <ndrochak@gol.com>
+
+	* System_test.build: Don't build test dll by default.  Only build
+	it when 'make test' is specified.
+
+2002-03-06  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlAttributeTests.cs: Fixed bug in TestHasChildNodes test.
+	
+	* XmlDocumentTests.cs: Started work on some tests for invalid data in
+	various nodes created by the document.
+
+2002-03-02  Kral Ferch <kral_ferch@hotmail.com>
+
+	* XmlDocumentTests.cs: New tests TestLoadProcessingInstruction(),
+	TestLoadCDATA(), and TestLoadComment().
+
+2002-03-02  Jason Diamond <jason@injektilo.org>
+
+	* XmlElementTests.cs: New file.
+
+	* AllTests.cs: Added XmlElementTests.
+
+2002-03-02  Jason Diamond <jason@injektilo.org>
+
+	* XmlTextReaderTests.cs: Test MoveToNextAttribute().
+
+	* XmlDocumentTests.cs: Test loading document containing attributes
+	and text nodes.
+
+2002-03-02  Mike Kestner <mkestner@speakeasy.net>
+
+	* XmlAttributeTests.cs : New test suite for attrs.
+	* AllTests.cs : Add the attr suite.
+
+2002-03-02  Jason Diamond <jason@injektilo.org>
+
+	* XmlNamespaceManagerTests.cs: Make sure the XmlNamespaceManager 
+	is using its name table.
+
+	* NameTableTests.cs: Make sure NameTable is really returning the
+	same references.
+
+2002-02-28  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocumentTests.cs: Tests for XmlDocument.LoadXml courtesy of
+	Kral Ferch <kral.ferch@hotmail.com>.
+
+2002-02-28  Jason Diamond <jason@injektilo.org>
+
+	* XmlTextReaderTests.cs: Test for XmlException when parse fail.
+
+2002-02-27  Martin Baulig  <martin@gnome.org>
+
+	* System.XML_test.build: Build new executable RunTests.System.XML.exe
+	which you can use to run the tests on Linux.
+
+	* *.cs: Added zero-args constructors.
+
+2002-02-26  Duncan Mak  <duncan@ximian.com>
+
+	* NameTableTests.cs: Test for System.Xml.NameTable.
+
+2002-02-26  Jason Diamond <jason@injektilo.org>
+
+	* XmlTextReaderTests.cs: Test for namespace declarations as
+	attributes.
+
+	* XmlNamespaceManagerTests.cs: Use the newly implemented NameTable
+	when creating the XmlNamespaceManager. Properly test HasNamespace.
+
+2002-02-25  Jason Diamond <jason@injektilo.org>
+
+	* XmlDocumentTests.cs: Added file.
+	
+2002-02-23  Jason Diamond <jason@injektilo.org>
+
+	* XmlTextReaderTests.cs: Added tests for qualified attributes.
+	
+2002-02-23  Jason Diamond <jason@injektilo.org>
+
+	* ChangeLog: Added change log to this directory.
+
+	* Test.cs: Renamed to XmlTextReaderTests.cs.
+
+	* XmlTextReaderTests.cs: Added tests for NamespaceURI property.
+
+	* XmlNamespaceManagerTests.cs: Initial tests.
diff --git a/mcs/class/System.XML/Test/Microsoft.Test.csproj b/mcs/class/System.XML/Test/Microsoft.Test.csproj
new file mode 100644
index 00000000000..99f1015f00e
--- /dev/null
+++ b/mcs/class/System.XML/Test/Microsoft.Test.csproj
@@ -0,0 +1,162 @@
+<VisualStudioProject>

+    <CSHARP

+        ProjectType = "Local"

+        ProductVersion = "7.0.9466"

+        SchemaVersion = "1.0"

+        ProjectGuid = "{D6C51F53-33E2-41DF-981A-33FCFA81CDA7}"

+    >

+        <Build>

+            <Settings

+                ApplicationIcon = ""

+                AssemblyKeyContainerName = ""

+                AssemblyName = "Microsoft.Test"

+                AssemblyOriginatorKeyFile = ""

+                DefaultClientScript = "JScript"

+                DefaultHTMLPageLayout = "Grid"

+                DefaultTargetSchema = "IE50"

+                DelaySign = "false"

+                OutputType = "Library"

+                RootNamespace = "Test"

+                StartupObject = ""

+            >

+                <Config

+                    Name = "Debug"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "DEBUG;TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "true"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "true"

+                    Optimize = "false"

+                    OutputPath = "bin\Debug\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+                <Config

+                    Name = "Release"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "false"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "false"

+                    Optimize = "true"

+                    OutputPath = "bin\Release\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+            </Settings>

+            <References>

+                <Reference

+                    Name = "System"

+                    AssemblyName = "System"

+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"

+                />

+                <Reference

+                    Name = "System.XML"

+                    AssemblyName = "System.Xml"

+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"

+                />

+                <Reference

+                    Name = "NUnitCore"

+                    AssemblyName = "NUnitCore"

+                    HintPath = "..\..\..\nunit\NUnitCore.dll"

+                />

+            </References>

+        </Build>

+        <Files>

+            <Include>

+                <File

+                    RelPath = "AllTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ChangeLog"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "NameTableTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlAttributeTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlCDataSectionTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlCommentTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlDeclarationTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlDocumentTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlDocumentTypeTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlElementTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlNamespaceManagerTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlNodeListTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlSignificantWhitespaceTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlTextReaderTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlTextWriterTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlWhiteSpaceTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+            </Include>

+        </Files>

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/class/System.XML/Test/Mono.Test.csproj b/mcs/class/System.XML/Test/Mono.Test.csproj
new file mode 100644
index 00000000000..677a5b82388
--- /dev/null
+++ b/mcs/class/System.XML/Test/Mono.Test.csproj
@@ -0,0 +1,167 @@
+<VisualStudioProject>

+    <CSHARP

+        ProjectType = "Local"

+        ProductVersion = "7.0.9466"

+        SchemaVersion = "1.0"

+        ProjectGuid = "{D6C51F53-33E2-41DF-981A-33FCFA81CDA7}"

+    >

+        <Build>

+            <Settings

+                ApplicationIcon = ""

+                AssemblyKeyContainerName = ""

+                AssemblyName = "Mono.Test"

+                AssemblyOriginatorKeyFile = ""

+                DefaultClientScript = "JScript"

+                DefaultHTMLPageLayout = "Grid"

+                DefaultTargetSchema = "IE50"

+                DelaySign = "false"

+                OutputType = "Library"

+                RootNamespace = "Test"

+                StartupObject = ""

+            >

+                <Config

+                    Name = "Debug"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "DEBUG;TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "true"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "true"

+                    Optimize = "false"

+                    OutputPath = "bin\Debug\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+                <Config

+                    Name = "Release"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "false"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "false"

+                    Optimize = "true"

+                    OutputPath = "bin\Release\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+            </Settings>

+            <References>

+                <Reference

+                    Name = "System"

+                    AssemblyName = "System"

+                    HintPath = "..\..\..\..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"

+                />

+                <Reference

+                    Name = "Mono.System.XML"

+                    Project = "{0CB7FB41-3C0F-40E8-ACD3-8C5B8BC35B2C}"

+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"

+                />

+                <Reference

+                    Name = "NUnitCore"

+                    AssemblyName = "NUnitCore"

+                    HintPath = "..\..\..\nunit\NUnitCore.dll"

+                />

+                <Reference

+                    Name = "System.Data"

+                    AssemblyName = "System.Data"

+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"

+                />

+            </References>

+        </Build>

+        <Files>

+            <Include>

+                <File

+                    RelPath = "AllTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ChangeLog"

+                    BuildAction = "None"

+                />

+                <File

+                    RelPath = "NameTableTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlAttributeTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlCDataSectionTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlCommentTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlDeclarationTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlDocumentTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlDocumentTypeTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlElementTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlNamespaceManagerTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlNodeListTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlSignificantWhitespaceTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlTextReaderTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlTextWriterTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "XmlWhiteSpaceTests.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+            </Include>

+        </Files>

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/class/System.XML/Test/MonoMicro.Test.csproj b/mcs/class/System.XML/Test/MonoMicro.Test.csproj
new file mode 100644
index 00000000000..a90ea037a17
--- /dev/null
+++ b/mcs/class/System.XML/Test/MonoMicro.Test.csproj
@@ -0,0 +1,202 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9466"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{F7734143-3845-4288-B1CA-FE614FFA70F0}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "MonoMicro.Test"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Library"
+                RootNamespace = "MonoMicro.Test"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "true"
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"
+                />
+                <Reference
+                    Name = "NUnitCore"
+                    AssemblyName = "NUnitCore"
+                    HintPath = "..\..\..\nunit\NUnitCore.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\..\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\obj\Debug\System.XML.dll"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AllTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "ChangeLog"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "NameTableTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "SelectNodesTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlAttributeCollectionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlAttributeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlCDataSectionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlCharacterDataTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlCommentTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlDeclarationTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlDocumentTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlDocumentTypeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlElementTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlNamespaceManagerTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlNodeListTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlNodeTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlProcessingInstructionTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlSignificantWhitespaceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlTextReaderTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlTextTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlTextWriterTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XmlWhiteSpaceTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "XPathNavigatorTests.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/mcs/class/System.XML/Test/NameTableTests.cs b/mcs/class/System.XML/Test/NameTableTests.cs
new file mode 100755
index 00000000000..ee115132f44
--- /dev/null
+++ b/mcs/class/System.XML/Test/NameTableTests.cs
@@ -0,0 +1,91 @@
+//
+// System.Xml.NameTableTests.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class NameTableTests : TestCase
+	{
+		NameTable table;
+		
+		public NameTableTests (string name)
+			: base (name)
+		{
+		}
+
+		protected override void SetUp ()
+		{
+			table = new NameTable ();
+		}
+
+		//
+		// Tests System.Xml.NameTable.Add (string)
+		//		
+		public void TestAdd1 ()
+		{
+			string add = "add1";
+			string testAdd = table.Add (add);
+			AssertEquals (add, testAdd);
+			AssertSame (add, testAdd);
+		}
+
+		//
+		// Tests System.Xml.NameTable.Add (char[], int, int)
+		//		
+		public void TestAdd2 ()
+		{
+			char[] test = new char [4] { 'a', 'd', 'd', '2' };
+			int index = 0;
+			int length = 3; // "add"			
+
+			AssertEquals ("add", table.Add (test, index, length));
+		}
+
+		//
+		// Tests System.Xml.NameTable.Get (string)
+		//
+		public void TestGet1 ()
+		{
+			string get1 = "get1";
+			string testGet = table.Add (get1);			
+
+			AssertEquals (table.Get (get1), testGet);
+			AssertSame (get1, testGet );
+		}
+
+		//
+		// Tests System.Xml.NameTable.Get (char[], int, int)
+		//
+		public void TestGet2 ()
+		{						
+			char[] test = new char [4] { 'g', 'e', 't', '2' };
+			int index = 0; 
+			int length = 3; // "get"
+			
+			string testGet = table.Add (test, index, length);			
+
+			AssertEquals (table.Get (test, index, length), testGet);
+		}
+
+		//
+		// Tests System.Xml.NameTable.Get (char[], int, 0)
+		//
+		public void TestGet3 ()
+		{
+			char[] test = new char [4] { 't', 'e', 's', 't' };
+			int index = 0;
+			int length = 0;
+
+			AssertEquals (table.Get (test, index, length), String.Empty);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/SelectNodesTests.cs b/mcs/class/System.XML/Test/SelectNodesTests.cs
new file mode 100644
index 00000000000..8ab17dec2de
--- /dev/null
+++ b/mcs/class/System.XML/Test/SelectNodesTests.cs
@@ -0,0 +1,218 @@
+//
+// MonoTests.System.Xml.SelectNodesTests
+//
+// Author:
+//   Jason Diamond <jason@injektilo.org>
+//
+// (C) 2002 Jason Diamond
+//
+

+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class SelectNodesTests : TestCase
+	{
+		public SelectNodesTests () : base ("MonoTests.System.Xml.SelectNodesTests testsuite") {}
+		public SelectNodesTests (string name) : base (name) {}
+
+		public void TestRoot ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo />");
+			XmlNodeList nodes = document.SelectNodes ("/");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document, nodes [0]);
+		}
+
+		public void TestDocumentElement ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo />");
+			XmlNodeList nodes = document.SelectNodes ("/foo");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement, nodes [0]);
+		}
+
+		public void TestBadDocumentElement ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo />");
+			XmlNodeList nodes = document.SelectNodes ("/bar");
+			AssertEquals (0, nodes.Count);
+		}
+
+		public void TestElementWildcard ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /><baz /></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/*");
+			AssertEquals (2, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [0], nodes [0]);
+			AssertSame (document.DocumentElement.ChildNodes [1], nodes [1]);
+		}
+
+		public void TestOneChildElement ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /><baz /></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/bar");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [0], nodes [0]);
+		}
+
+		public void TestOneOtherChildElement ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /><baz /></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/baz");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [1], nodes [0]);
+		}
+
+		public void TestTextNode ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo>bar</foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/text()");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [0], nodes [0]);
+		}
+
+		public void TestSplitTextNodes ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo>bar<baz />quux</foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/text()");
+			AssertEquals (2, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [0], nodes [0]);
+			AssertSame (document.DocumentElement.ChildNodes [2], nodes [1]);
+		}
+
+		public void TestAbbreviatedParentAxis ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/bar/..");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement, nodes [0]);
+		}
+
+		public void TestFullParentAxis ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/bar/parent::node()");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement, nodes [0]);
+		}
+
+		public void TestAbbreviatedAttributeAxis ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo bar='baz' />");
+			XmlNodeList nodes = document.SelectNodes ("/foo/@bar");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement.Attributes ["bar"], nodes [0]);
+		}
+
+		public void TestFullAttributeAxis ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo bar='baz' />");
+			XmlNodeList nodes = document.SelectNodes ("/foo/attribute::bar");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement.Attributes ["bar"], nodes [0]);
+		}
+
+		public void TestAbbreviatedAttributeWildcard ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo bar='baz' quux='quuux' />");
+			XmlNodeList nodes = document.SelectNodes ("/foo/@*");
+			AssertEquals (2, nodes.Count);
+			// are the attributes guanteed to be ordered in the node list?
+			AssertSame (document.DocumentElement.Attributes ["bar"], nodes [0]);
+			AssertSame (document.DocumentElement.Attributes ["quux"], nodes [1]);
+		}
+
+		public void TestAttributeParent ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo bar='baz' />");
+			XmlNodeList nodes = document.SelectNodes ("/foo/@bar/..");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement, nodes [0]);
+		}
+		
+		public void TestUnionOperator ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /><baz /></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/bar|/foo/baz");
+			AssertEquals (2, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [0], nodes [0]);
+			AssertSame (document.DocumentElement.ChildNodes [1], nodes [1]);
+		}
+		
+		public void TestNodeWildcard ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar />baz<quux /></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/node()");
+			AssertEquals (3, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [0], nodes [0]);
+			AssertSame (document.DocumentElement.ChildNodes [1], nodes [1]);
+			AssertSame (document.DocumentElement.ChildNodes [2], nodes [2]);
+		}
+
+		public void TestPositionalPredicate ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar>1</bar><bar>2</bar></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/bar[1]");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [0], nodes [0]);
+		}
+
+		public void TestAllFollowingSiblings ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /><baz /><quux /></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/bar/following-sibling::*");
+			AssertEquals (2, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [1], nodes [0]);
+			AssertSame (document.DocumentElement.ChildNodes [2], nodes [1]);
+		}
+
+		public void TestFollowingSiblingBaz ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /><baz /><quux /></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/bar/following-sibling::baz");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [1], nodes [0]);
+		}
+
+		public void TestFollowingSiblingQuux ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /><baz /><quux /></foo>");
+			XmlNodeList nodes = document.SelectNodes ("/foo/bar/following-sibling::quux");
+			AssertEquals (1, nodes.Count);
+			AssertSame (document.DocumentElement.ChildNodes [2], nodes [0]);
+		}
+
+		public void TestUnion ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo />");
+			XmlNodeList nodes = document.SelectNodes ("(/foo) | (/foo)");
+			AssertEquals (1, nodes.Count);	// bug #27548
+			AssertSame (document.DocumentElement, nodes [0]);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/System.XML_linux_test.args b/mcs/class/System.XML/Test/System.XML_linux_test.args
new file mode 100644
index 00000000000..51c948e9812
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.XML_linux_test.args
@@ -0,0 +1,29 @@
+--target library
+-o System.XML_linux_test.dll
+--noconfig
+-r ../../lib/corlib.dll
+-r ../../lib/System.dll
+-r ../../../nunit/NUnitCore_mono.dll
+AllTests.cs
+NameTableTests.cs
+SelectNodesTests.cs
+XmlAttributeCollectionTests.cs
+XmlAttributeTests.cs
+XmlCDataSectionTests.cs
+XmlCharacterDataTests.cs
+XmlCommentTests.cs
+XmlDeclarationTests.cs
+XmlDocumentTests.cs
+XmlDocumentTypeTests.cs
+XmlElementTests.cs
+XmlNamespaceManagerTests.cs
+XmlNodeListTests.cs
+XmlNodeTests.cs
+XmlProcessingInstructionTests.cs
+XmlSignificantWhitespaceTests.cs
+XmlTextReaderTests.cs
+XmlTextTests.cs
+XmlTextWriterTests.cs
+XmlWhiteSpaceTests.cs
+XPathNavigatorTests.cs
+XPathNavigatorMatchesTests.cs
diff --git a/mcs/class/System.XML/Test/System.XML_test.build b/mcs/class/System.XML/Test/System.XML_test.build
new file mode 100644
index 00000000000..b7b3c68dd16
--- /dev/null
+++ b/mcs/class/System.XML/Test/System.XML_test.build
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.XML_test.dll -->
+<!-- Target build (default) builds tests -->
+<!-- Target test runs tests -->
+
+<project name="System.XML_test" default="build">
+	<property name="debug" value="false"/>
+	<property name="nunit_home" value="..\..\..\nunit"/>
+
+	<target name="build">
+	</target>
+
+	<target name="assemblies">
+		<csc target="library" output="System.XML_test.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<sources>
+				<includes name="**/*.cs"/>
+				<excludes name="TheTests.cs"/>
+			</sources>
+			<references basedir="..\..\..\nunit">
+				<includes name="NUnitCore.dll"/>
+			</references>
+			<arg value="/r:.\System.XML.dll"/>
+		</csc>
+
+		<csc target="exe" output="RunTests.System.XML.exe" debug="${debug}">
+			<sources>
+				<includes name="**/*.cs"/>
+				<excludes name="**/AllTests.cs"/>
+				<excludes name="**/MartinTests.cs"/>
+			</sources>
+			<references basedir="..\..\..\nunit">
+				<includes name="NUnitBase.dll"/>
+			</references>
+			<arg value="/nowarn:1595"/>
+			<arg value="/noconfig"/>
+			<arg value="/r:.\System.XML.dll"/>
+		</csc>
+
+	</target>
+
+	<target name="test" depends="assemblies">
+		<exec program="..\..\..\nunit\NUnitConsole" commandline="MonoTests.System.Xml.AllTests,System.XML_test.dll" failonerror="false"/>
+	</target>
+
+	<target name="clean">
+		<delete file="System.XML.dll" failonerror="false"/>
+		<delete file="System.XML_test.dll" failonerror="false"/>
+		<delete file="System.XML_test.pdb" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/System.XML/Test/TheTests.cs b/mcs/class/System.XML/Test/TheTests.cs
new file mode 100644
index 00000000000..6537bed3754
--- /dev/null
+++ b/mcs/class/System.XML/Test/TheTests.cs
@@ -0,0 +1,93 @@
+using NUnit.Framework;
+using System;
+using System.Threading;
+using System.Globalization;
+
+namespace MonoTests.System.Xml
+{
+	public class RunXmlTextReaderTests : XmlTextReaderTests
+	{
+		protected override void RunTest ()
+		{
+			TestEmptyElement ();
+			TestEmptyElementWithWhitespace ();
+			TestEmptyElementWithStartAndEndTag ();
+			TestEmptyElementWithStartAndEndTagWithWhitespace ();
+			TestNestedEmptyTag ();
+			TestNestedText ();
+			TestEmptyElementWithAttribute ();
+			TestStartAndEndTagWithAttribute ();
+			TestEmptyElementWithTwoAttributes ();
+			TestProcessingInstructionBeforeDocumentElement ();
+			TestCommentBeforeDocumentElement ();
+			TestPredefinedEntities ();
+			TestEntityReference ();
+			TestEntityReferenceInsideText ();
+			TestCharacterReferences ();
+			TestEntityReferenceInAttribute ();
+			TestPredefinedEntitiesInAttribute ();
+			TestCharacterReferencesInAttribute ();
+			TestCDATA ();
+			TestEmptyElementInNamespace ();
+			TestEmptyElementInDefaultNamespace ();
+			TestChildElementInNamespace ();
+			TestChildElementInDefaultNamespace ();
+			TestAttributeInNamespace ();
+			TestIsName ();
+			TestIsNameToken ();
+		}
+	}
+}
+
+namespace MonoTests.System.Xml
+{
+	public class RunXmlNamespaceManagerTests : XmlNamespaceManagerTests
+	{
+		protected override void RunTest ()
+		{
+			TestNewNamespaceManager ();
+			TestAddNamespace ();
+			TestPushScope ();
+			TestPopScope ();
+		}
+	}
+}
+
+namespace MonoTests.System.Xml
+{
+	public class RunXmlDocumentTests : XmlDocumentTests
+	{
+		protected override void RunTest ()
+		{
+			TestDocumentElement ();
+		}
+	}
+}
+
+namespace MonoTests
+{
+	public class RunAllTests
+	{
+		public static void AddAllTests (TestSuite suite)
+		{
+			suite.AddTest (new MonoTests.System.Xml.RunXmlTextReaderTests ());
+			suite.AddTest (new MonoTests.System.Xml.RunXmlNamespaceManagerTests ());
+			suite.AddTest (new MonoTests.System.Xml.RunXmlDocumentTests ());
+		}
+	}
+}
+
+class MainApp
+{
+	public static void Main()
+	{
+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US");
+
+		TestResult result = new TestResult ();
+		TestSuite suite = new TestSuite ();
+		MonoTests.RunAllTests.AddAllTests (suite);
+		suite.Run (result);
+		MonoTests.MyTestRunner.Print (result);
+	}
+}
+
diff --git a/mcs/class/System.XML/Test/XPathNavigatorMatchesTests.cs b/mcs/class/System.XML/Test/XPathNavigatorMatchesTests.cs
new file mode 100644
index 00000000000..a844d80c6b4
--- /dev/null
+++ b/mcs/class/System.XML/Test/XPathNavigatorMatchesTests.cs
@@ -0,0 +1,116 @@
+//
+// MonoTests.System.Xml.XPathNavigatorMatchesTests
+//
+// Author:
+//   Jason Diamond <jason@injektilo.org>
+//
+// (C) 2002 Jason Diamond
+//
+
+using System;
+using System.Xml;
+using System.Xml.XPath;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XPathNavigatorMatchesTests : TestCase
+	{
+		public XPathNavigatorMatchesTests () : base ("MonoTests.System.Xml.XPathNavigatorMatchesTests testsuite") {}
+		public XPathNavigatorMatchesTests (string name) : base (name) {}
+
+		public void TestMatchRoot ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo />");
+			XPathNavigator navigator = document.CreateNavigator ();
+
+			Assert (navigator.Matches ("/"));
+		}
+
+		public void TestFalseMatchRoot ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo />");
+			XPathNavigator navigator = document.CreateNavigator ();
+
+			Assert (!navigator.Matches ("foo"));
+		}
+
+		public void TestMatchDocumentElement ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo />");
+			XPathNavigator navigator = document.DocumentElement.CreateNavigator ();
+
+			Assert (navigator.Matches ("foo"));
+		}
+
+		public void TestMatchAbsoluteDocumentElement ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo />");
+			XPathNavigator navigator = document.DocumentElement.CreateNavigator ();
+
+			Assert (navigator.Matches ("/foo"));
+		}
+
+		public void TestMatchDocumentElementChild ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /></foo>");
+			XPathNavigator navigator = document.DocumentElement.FirstChild.CreateNavigator ();
+
+			Assert (navigator.Matches ("bar"));
+			Assert (navigator.Matches ("foo/bar"));
+		}
+
+		public void TestMatchAttribute ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo bar='baz' />");
+			XPathNavigator navigator = document.DocumentElement.Attributes[0].CreateNavigator ();
+
+			Assert (navigator.Matches ("@bar"));
+			Assert (navigator.Matches ("foo/@bar"));
+		}
+
+		public void TestSlashSlash ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar><baz/></bar></foo>");
+			XPathNavigator navigator = document.DocumentElement.FirstChild.FirstChild.CreateNavigator ();
+
+			Assert (navigator.Matches ("foo//baz"));
+		}
+
+		public void TestAbsoluteSlashSlash ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar><baz/></bar></foo>");
+			XPathNavigator navigator = document.DocumentElement.FirstChild.FirstChild.CreateNavigator ();
+
+			Assert (navigator.Matches ("//baz"));
+		}
+
+		public void TestMatchDocumentElementWithPredicate ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /></foo>");
+			XPathNavigator navigator = document.DocumentElement.CreateNavigator ();
+
+			Assert (navigator.Matches ("foo[bar]"));
+		}
+
+		public void TestFalseMatchDocumentElementWithPredicate ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /></foo>");
+			XPathNavigator navigator = document.DocumentElement.CreateNavigator ();
+
+			Assert (!navigator.Matches ("foo[baz]"));
+		}
+	}
+}
+
diff --git a/mcs/class/System.XML/Test/XPathNavigatorTests.cs b/mcs/class/System.XML/Test/XPathNavigatorTests.cs
new file mode 100644
index 00000000000..837b92430e5
--- /dev/null
+++ b/mcs/class/System.XML/Test/XPathNavigatorTests.cs
@@ -0,0 +1,172 @@
+//
+// MonoTests.System.Xml.XPathNavigatorTests
+//
+// Author:
+//   Jason Diamond <jason@injektilo.org>
+//
+// (C) 2002 Jason Diamond
+//
+
+using System;
+using System.Xml;
+using System.Xml.XPath;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XPathNavigatorTests : TestCase
+	{
+		public XPathNavigatorTests () : base ("MonoTests.System.Xml.XPathNavigatorTests testsuite") {}
+		public XPathNavigatorTests (string name) : base (name) {}
+
+		public void TestCreateNavigator ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo />");
+			XPathNavigator navigator = document.CreateNavigator ();
+			AssertNotNull (navigator);
+		}
+
+		public void TestPropertiesOnDocument ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo:bar xmlns:foo='#foo' />");
+			XPathNavigator navigator = document.CreateNavigator ();
+			
+			AssertEquals (XPathNodeType.Root, navigator.NodeType);
+			AssertEquals (String.Empty, navigator.Name);
+			AssertEquals (String.Empty, navigator.LocalName);
+			AssertEquals (String.Empty, navigator.NamespaceURI);
+			AssertEquals (String.Empty, navigator.Prefix);
+			Assert (!navigator.HasAttributes);
+			Assert (navigator.HasChildren);
+			Assert (!navigator.IsEmptyElement);
+		}
+
+		public void TestPropertiesOnElement ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo:bar xmlns:foo='#foo' />");
+			XPathNavigator navigator = document.DocumentElement.CreateNavigator ();
+			
+			AssertEquals (XPathNodeType.Element, navigator.NodeType);
+			AssertEquals ("foo:bar", navigator.Name);
+			AssertEquals ("bar", navigator.LocalName);
+			AssertEquals ("#foo", navigator.NamespaceURI);
+			AssertEquals ("foo", navigator.Prefix);
+			Assert (!navigator.HasAttributes);
+			Assert (!navigator.HasChildren);
+			Assert (navigator.IsEmptyElement);
+		}
+
+		public void TestPropertiesOnAttribute ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo bar:baz='quux' xmlns:bar='#bar' />");
+			XPathNavigator navigator = document.DocumentElement.GetAttributeNode("baz", "#bar").CreateNavigator ();
+			
+			AssertEquals (XPathNodeType.Attribute, navigator.NodeType);
+			AssertEquals ("bar:baz", navigator.Name);
+			AssertEquals ("baz", navigator.LocalName);
+			AssertEquals ("#bar", navigator.NamespaceURI);
+			AssertEquals ("bar", navigator.Prefix);
+			Assert (!navigator.HasAttributes);
+			Assert (!navigator.HasChildren);
+			Assert (!navigator.IsEmptyElement);
+		}
+
+		public void TestNavigation ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar /><baz /></foo>");
+			XPathNavigator navigator = document.DocumentElement.CreateNavigator ();
+			
+			AssertEquals ("foo", navigator.Name);
+			Assert (navigator.MoveToFirstChild ());
+			AssertEquals ("bar", navigator.Name);
+			Assert (navigator.MoveToNext ());
+			AssertEquals ("baz", navigator.Name);
+			Assert (!navigator.MoveToNext ());
+			AssertEquals ("baz", navigator.Name);
+			Assert (navigator.MoveToPrevious ());
+			AssertEquals ("bar", navigator.Name);
+			Assert (!navigator.MoveToPrevious ());
+			Assert (navigator.MoveToParent ());
+			AssertEquals ("foo", navigator.Name);
+			navigator.MoveToRoot ();
+			AssertEquals (XPathNodeType.Root, navigator.NodeType);
+			Assert (!navigator.MoveToParent ());
+			AssertEquals (XPathNodeType.Root, navigator.NodeType);
+			Assert (navigator.MoveToFirstChild ());
+			AssertEquals ("foo", navigator.Name);
+			Assert (navigator.MoveToFirst ());
+			AssertEquals ("foo", navigator.Name);
+			Assert (navigator.MoveToFirstChild ());
+			AssertEquals ("bar", navigator.Name);
+			Assert (navigator.MoveToNext ());
+			AssertEquals ("baz", navigator.Name);
+			Assert (navigator.MoveToFirst ());
+			AssertEquals ("bar", navigator.Name);
+		}
+
+		public void TestMoveToAndIsSamePosition ()
+		{
+			XmlDocument document1 = new XmlDocument ();
+			document1.LoadXml ("<foo><bar /></foo>");
+			XPathNavigator navigator1a = document1.DocumentElement.CreateNavigator ();
+			XPathNavigator navigator1b = document1.DocumentElement.CreateNavigator ();
+
+			XmlDocument document2 = new XmlDocument ();
+			document2.LoadXml ("<foo><bar /></foo>");
+			XPathNavigator navigator2 = document2.DocumentElement.CreateNavigator ();
+
+			AssertEquals ("foo", navigator1a.Name);
+			Assert (navigator1a.MoveToFirstChild ());
+			AssertEquals ("bar", navigator1a.Name);
+
+			Assert (!navigator1b.IsSamePosition (navigator1a));
+			AssertEquals ("foo", navigator1b.Name);
+			Assert (navigator1b.MoveTo (navigator1a));
+			Assert (navigator1b.IsSamePosition (navigator1a));
+			AssertEquals ("bar", navigator1b.Name);
+
+			Assert (!navigator2.IsSamePosition (navigator1a));
+			AssertEquals ("foo", navigator2.Name);
+			Assert (!navigator2.MoveTo (navigator1a));
+			AssertEquals ("foo", navigator2.Name);
+		}
+
+		public void TestAttributeNavigation ()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo bar='baz' quux='quuux' />");
+			XPathNavigator navigator = document.DocumentElement.CreateNavigator ();
+
+			AssertEquals (XPathNodeType.Element, navigator.NodeType);
+			AssertEquals ("foo", navigator.Name);
+			Assert (navigator.MoveToFirstAttribute ());
+			AssertEquals (XPathNodeType.Attribute, navigator.NodeType);
+			AssertEquals ("bar", navigator.Name);
+			AssertEquals ("baz", navigator.Value);
+			Assert (navigator.MoveToNextAttribute ());
+			AssertEquals (XPathNodeType.Attribute, navigator.NodeType);
+			AssertEquals ("quux", navigator.Name);
+			AssertEquals ("quuux", navigator.Value);
+		}
+
+		public void TestElementAndRootValues()
+		{
+			XmlDocument document = new XmlDocument ();
+			document.LoadXml ("<foo><bar>baz</bar><quux>quuux</quux></foo>");
+			XPathNavigator navigator = document.DocumentElement.CreateNavigator ();
+
+			AssertEquals (XPathNodeType.Element, navigator.NodeType);
+			AssertEquals ("foo", navigator.Name);
+			//AssertEquals ("bazquuux", navigator.Value);
+
+			navigator.MoveToRoot ();
+			//AssertEquals ("bazquuux", navigator.Value);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlAttributeCollectionTests.cs b/mcs/class/System.XML/Test/XmlAttributeCollectionTests.cs
new file mode 100644
index 00000000000..218691fccb8
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlAttributeCollectionTests.cs
@@ -0,0 +1,46 @@
+// XmlAttributeCollectionTests.cs : Tests for the XmlAttributeCollection class
+//
+// Author: Matt Hunter <xrkune@tconl.com>
+//
+// <c> 2002 Matt Hunter
+
+using System;
+using System.Xml;
+using System.Text;
+using System.IO;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlAttributeCollectionTests : TestCase
+	{
+		public XmlAttributeCollectionTests() : base("MonoTests.System.Xml.XmlAttributeCollectionTests testsuite") { }
+		public XmlAttributeCollectionTests(string name) : base(name) { }
+
+		private XmlDocument document;
+
+		protected override void SetUp()
+		{
+			document = new XmlDocument ();
+		}
+		public void TestRemoveAll ()
+		{
+			StringBuilder xml = new StringBuilder ();
+			xml.Append ("<?xml version=\"1.0\" ?><library><book type=\"non-fiction\" price=\"34.95\"> ");
+			xml.Append ("<title type=\"intro\">XML Fun</title> " );
+			xml.Append ("<author>John Doe</author></book></library>");
+
+			MemoryStream memoryStream = new MemoryStream (Encoding.UTF8.GetBytes (xml.ToString ()));
+			document = new XmlDocument ();
+			document.Load (memoryStream);
+			XmlNodeList bookList = document.GetElementsByTagName ("book");
+			XmlNode xmlNode = bookList.Item (0);
+			XmlElement xmlElement = xmlNode as XmlElement;
+			XmlAttributeCollection attributes = xmlElement.Attributes;
+			attributes.RemoveAll ();
+			AssertEquals ("not all attributes removed.", false, xmlElement.HasAttribute ("type"));
+		}
+
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlAttributeTests.cs b/mcs/class/System.XML/Test/XmlAttributeTests.cs
new file mode 100644
index 00000000000..dc9961bcd3d
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlAttributeTests.cs
@@ -0,0 +1,95 @@
+// XmlAttributeTests.cs : Tests for the XmlAttribute class
+//
+// Author: Mike Kestner <mkestner@speakeasy.net>
+//
+// <c> 2002 Mike Kestner
+
+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlAttributeTests : TestCase
+	{
+		public XmlAttributeTests() : base("MonoTests.System.Xml.XmlAttributeTests testsuite") { }
+		public XmlAttributeTests(string name) : base(name) { }
+
+		XmlDocument doc;
+		XmlAttribute attr;
+
+		protected override void SetUp()
+		{
+			doc = new XmlDocument();
+			attr = doc.CreateAttribute("attr1");
+			attr.Value = "val1";
+		}
+
+		public void TestAttributes()
+		{
+			AssertNull(attr.Attributes);
+		}
+
+		public void TestAttributeInnerAndOuterXml ()
+		{
+			attr = doc.CreateAttribute ("foo", "bar", "http://abc.def");
+			attr.Value = "baz";
+			AssertEquals ("baz", attr.InnerXml);
+			AssertEquals ("foo:bar=\"baz\"", attr.OuterXml);
+		}
+
+		public void TestAttributeWithNoValue ()
+		{
+			XmlAttribute attribute = doc.CreateAttribute ("name");
+			AssertEquals (String.Empty, attribute.Value);
+			Assert (!attribute.HasChildNodes);
+			AssertNull (attribute.FirstChild);
+			AssertNull (attribute.LastChild);
+			AssertEquals (0, attribute.ChildNodes.Count);
+		}
+
+		public void TestAttributeWithValue ()
+		{
+			XmlAttribute attribute = doc.CreateAttribute ("name");
+			attribute.Value = "value";
+			AssertEquals ("value", attribute.Value);
+			Assert (attribute.HasChildNodes);
+			AssertNotNull (attribute.FirstChild);
+			AssertNotNull (attribute.LastChild);
+			AssertEquals (1, attribute.ChildNodes.Count);
+			AssertEquals (XmlNodeType.Text, attribute.ChildNodes [0].NodeType);
+			AssertEquals ("value", attribute.ChildNodes [0].Value);
+		}
+
+		public void TestHasChildNodes()
+		{
+			Assert(attr.HasChildNodes);
+		}
+
+		public void TestName()
+		{
+			AssertEquals("attr1", attr.Name);
+		}
+
+		public void TestNodeType()
+		{
+			AssertEquals(XmlNodeType.Attribute, attr.NodeType);
+		}
+
+		public void TestOwnerDocument()
+		{
+			AssertSame(doc, attr.OwnerDocument);
+		}
+
+		public void TestParentNode()
+		{
+			AssertNull("Attr parents not allowed", attr.ParentNode);
+		}
+
+		public void TestValue()
+		{
+			AssertEquals("val1", attr.Value);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlCDataSectionTests.cs b/mcs/class/System.XML/Test/XmlCDataSectionTests.cs
new file mode 100755
index 00000000000..dad1050fcf6
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlCDataSectionTests.cs
@@ -0,0 +1,99 @@
+//
+// System.Xml.XmlCDataSectionTests.cs
+//
+// Author:
+//	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlCDataSectionTests : TestCase
+	{
+		XmlDocument document;
+		XmlCDataSection section;
+		XmlNode original;
+		XmlNode deep;
+		XmlNode shallow;
+
+		public XmlCDataSectionTests ()
+			: base ("MonoTests.System.Xml.XmlCDataSectionTests testsuite")
+		{
+		}
+
+		public XmlCDataSectionTests (string name)
+			: base (name)
+		{
+		}
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+			document.LoadXml ("<root><foo></foo></root>");
+			section = document.CreateCDataSection ("CDataSection");
+		}
+
+		internal void TestXmlNodeBaseProperties (XmlNode original, XmlNode cloned)
+		{
+			// AssertEquals (original.nodetype + " was incorrectly cloned.",
+			// 		 original.baseuri, cloned.baseuri);			
+			AssertNull (cloned.ParentNode);
+                        Assert ("Copies, not pointers", !Object.ReferenceEquals (original,cloned));
+		}
+	       
+		public void TestXmlCDataSectionInnerAndOuterXml ()
+		{
+			section = document.CreateCDataSection ("foo");
+			AssertEquals (String.Empty, section.InnerXml);
+			AssertEquals ("<![CDATA[foo]]>", section.OuterXml);
+		}
+
+		public void TestXmlCDataSectionName ()
+		{
+			AssertEquals (section.NodeType + " Name property broken",
+				      section.Name, "#cdata-section");
+		}
+
+		public void TestXmlCDataSectionLocalName ()
+		{
+			AssertEquals (section.NodeType + " LocalName property broken",
+				      section.LocalName, "#cdata-section");
+		}
+
+		public void TestXmlCDataSectionNodeType ()
+		{
+			AssertEquals ("XmlCDataSection NodeType property broken",
+				      section.NodeType.ToString (), "CDATA");
+		}
+
+		public void TestXmlCDataSectionIsReadOnly ()
+		{
+			AssertEquals ("XmlCDataSection IsReadOnly property broken",
+				      section.IsReadOnly, false);
+		}
+
+		public void TestXmlCDataSectionCloneNode ()
+		{
+			original = section;
+
+			shallow = section.CloneNode (false); // shallow
+			TestXmlNodeBaseProperties (original, shallow);
+			AssertEquals ("Value incorrectly cloned",
+				      original.Value, shallow.Value);
+			
+			deep = section.CloneNode (true); // deep
+			TestXmlNodeBaseProperties (original, deep);
+			AssertEquals ("Value incorrectly cloned",
+				       original.Value, deep.Value);
+
+                        AssertEquals ("deep cloning differs from shallow cloning",
+				      deep.OuterXml, shallow.OuterXml);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlCharacterDataTests.cs b/mcs/class/System.XML/Test/XmlCharacterDataTests.cs
new file mode 100644
index 00000000000..1fbe0b8295c
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlCharacterDataTests.cs
@@ -0,0 +1,175 @@
+//
+// System.Xml.XmlTextWriterTests
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlCharacterDataTests : TestCase
+	{
+		public XmlCharacterDataTests () : base ("MonoTests.System.Xml.XmlCharacterDataTests testsuite") {}
+		public XmlCharacterDataTests (string name) : base (name) {}
+
+		XmlDocument document;
+		XmlComment comment;
+		bool changed;
+		bool changing;
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+			document.NodeChanged += new XmlNodeChangedEventHandler (this.EventNodeChanged);
+			document.NodeChanging += new XmlNodeChangedEventHandler (this.EventNodeChanging);
+			comment = document.CreateComment ("foo");
+		}
+
+		private void EventNodeChanged(Object sender, XmlNodeChangedEventArgs e)
+		{
+			changed = true;
+		}
+
+		private void EventNodeChanging (Object sender, XmlNodeChangedEventArgs e)
+		{
+			changing = true;
+		}
+
+		public void TestAppendData ()
+		{
+			changed = false;
+			changing = false;
+			comment.AppendData ("bar");
+			Assert (changed);
+			Assert (changing);
+			AssertEquals ("foobar", comment.Data);
+
+			comment.Value = "foo";
+			comment.AppendData (null);
+			AssertEquals ("foo", comment.Data);
+		}
+
+		public void TestDeleteData ()
+		{
+			comment.Value = "bar";
+			changed = false;
+			changing = false;
+			comment.DeleteData (1, 1);
+			Assert (changed);
+			Assert (changing);
+			AssertEquals ("br", comment.Data);
+
+			try 
+			{
+				comment.Value = "foo";
+				comment.DeleteData(-1, 1);
+				Fail ("Expected an ArgumentOutOfRangeException to be thrown.");
+			} 
+			catch (ArgumentOutOfRangeException) {}
+
+			comment.Value = "foo";
+			comment.DeleteData(1, 5);
+			AssertEquals("f", comment.Data);
+
+			comment.Value = "foo";
+			comment.DeleteData(3, 10);
+			AssertEquals("foo", comment.Data);
+		}
+
+		public void TestInsertData ()
+		{
+			comment.Value = "foobaz";
+			changed = false;
+			changing = false;
+			comment.InsertData (3, "bar");
+			Assert (changed);
+			Assert (changing);
+			AssertEquals ("foobarbaz", comment.Data);
+
+			try 
+			{
+				comment.Value = "foo";
+				comment.InsertData (-1, "bar");
+				Fail ("Expected an ArgumentOutOfRangeException to be thrown.");
+			} 
+			catch (ArgumentOutOfRangeException) {}
+
+			comment.Value = "foo";
+			comment.InsertData (3, "bar");
+			AssertEquals ("foobar", comment.Data);
+
+			try 
+			{
+				comment.Value = "foo";
+				comment.InsertData (4, "bar");
+				Fail ("Expected an ArgumentOutOfRangeException to be thrown.");
+			} 
+			catch (ArgumentOutOfRangeException) {}
+
+			try 
+			{
+				comment.Value = "foo";
+				comment.InsertData (1, null);
+				Fail ("Expected an ArgumentNullException to be thrown.");
+			} 
+			catch (ArgumentNullException) {}
+		}
+
+		public void TestReplaceData ()
+		{
+			changed = false;
+			changing = false;
+			comment.ReplaceData (0, 3, "bar");
+			Assert (changed);
+			Assert (changing);
+			AssertEquals ("bar", comment.Data);
+
+			comment.Value = "foo";
+			comment.ReplaceData (2, 3, "bar");
+			AssertEquals ("fobar", comment.Data);
+
+			comment.Value = "foo";
+			comment.ReplaceData (3, 3, "bar");
+			AssertEquals ("foobar", comment.Data);
+
+			try 
+			{
+				comment.Value = "foo";
+				comment.ReplaceData (4, 3, "bar");
+				Fail ("Expected an ArgumentOutOfRangeException to be thrown.");
+			} 
+			catch (ArgumentOutOfRangeException) {}
+
+			try 
+			{
+				comment.Value = "foo";
+				comment.ReplaceData (-1, 3, "bar");
+				Fail ("Expected an ArgumentOutOfRangeException to be thrown.");
+			} 
+			catch (ArgumentOutOfRangeException) {}
+
+			comment.Value = "foo";
+			comment.ReplaceData (0, 2, "bar");
+			AssertEquals ("baro", comment.Data);
+
+			comment.Value = "foo";
+			comment.ReplaceData (0, 5, "bar");
+			AssertEquals ("bar", comment.Data);
+
+			try 
+			{
+				comment.Value = "foo";
+				comment.ReplaceData (1, 1, null);
+				Fail ("Expected an ArgumentNullException to be thrown.");
+			} 
+			catch (ArgumentNullException) {}
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlCommentTests.cs b/mcs/class/System.XML/Test/XmlCommentTests.cs
new file mode 100755
index 00000000000..77ff9abe1b7
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlCommentTests.cs
@@ -0,0 +1,107 @@
+//
+// System.Xml.XmlCommentTests.cs
+//
+// Author:
+//	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlCommentTests : TestCase
+	{
+		XmlDocument document;
+		XmlComment comment;
+		XmlNode original;
+		XmlNode deep;
+		XmlNode shallow;
+
+		public XmlCommentTests () : base ("MonoTests.System.Xml.XmlCommentTests testsuite") {}
+
+		public XmlCommentTests (string name) : base (name) {}
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+		}
+
+		public void TestXmlCommentCloneNode ()
+		{
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
+			original = comment;
+
+			shallow = comment.CloneNode (false); // shallow
+			TestXmlNodeBaseProperties (original, shallow);
+			
+			deep = comment.CloneNode (true); // deep
+			TestXmlNodeBaseProperties (original, deep);
+			AssertEquals ("Value incorrectly cloned",
+				original.Value, deep.Value);
+
+			AssertEquals ("deep cloning differs from shallow cloning",
+				deep.OuterXml, shallow.OuterXml);
+		}
+
+		public void TestXmlCommentInnerAndOuterXml ()
+		{
+			comment = document.CreateComment ("foo");
+			AssertEquals (String.Empty, comment.InnerXml);
+			AssertEquals ("<!--foo-->", comment.OuterXml);
+		}
+
+		public void TestXmlCommentIsReadOnly ()
+		{
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
+			AssertEquals ("XmlComment IsReadOnly property broken",
+				comment.IsReadOnly, false);
+		}
+
+		public void TestXmlCommentLocalName ()
+		{
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
+			AssertEquals (comment.NodeType + " LocalName property broken",
+				      comment.LocalName, "#comment");
+		}
+
+		public void TestXmlCommentName ()
+		{
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
+			AssertEquals (comment.NodeType + " Name property broken",
+				comment.Name, "#comment");
+		}
+
+		public void TestXmlCommentNodeType ()
+		{
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
+			AssertEquals ("XmlComment NodeType property broken",
+				      comment.NodeType.ToString (), "Comment");
+		}
+
+		internal void TestXmlNodeBaseProperties (XmlNode original, XmlNode cloned)
+		{
+			document.LoadXml ("<root><foo></foo></root>");
+			comment = document.CreateComment ("Comment");
+
+			//			assertequals (original.nodetype + " was incorrectly cloned.",
+			//				      original.baseuri, cloned.baseuri);			
+
+			AssertNull (cloned.ParentNode);
+			AssertEquals ("Value incorrectly cloned",
+				original.Value, cloned.Value);
+
+			Assert ("Copies, not pointers", !Object.ReferenceEquals (original,cloned));
+		}
+       
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlDeclarationTests.cs b/mcs/class/System.XML/Test/XmlDeclarationTests.cs
new file mode 100755
index 00000000000..2d148cca556
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlDeclarationTests.cs
@@ -0,0 +1,130 @@
+//
+// System.Xml.XmlDeclarationTests.cs
+//
+// Author:
+// 	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlDeclarationTests : TestCase
+	{
+
+		XmlDocument document;
+		XmlDeclaration declaration;
+		
+		public XmlDeclarationTests () : base ("MonoTests.System.Xml.XmlDeclarationTests testsuite") {}
+		
+		public XmlDeclarationTests (string name) : base (name) {}
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+			document.LoadXml ("<foo><bar></bar></foo>");
+			declaration = document.CreateXmlDeclaration ("1.0", null, null);
+		}
+
+		public void TestInnerAndOuterXml ()
+		{
+			declaration = document.CreateXmlDeclaration ("1.0", null, null);
+			AssertEquals (String.Empty, declaration.InnerXml);
+			AssertEquals ("<?xml version=\"1.0\"?>", declaration.OuterXml);
+
+			declaration = document.CreateXmlDeclaration ("1.0", "doesn't check", null);
+			AssertEquals (String.Empty, declaration.InnerXml);
+			AssertEquals ("<?xml version=\"1.0\" encoding=\"doesn't check\"?>", declaration.OuterXml);
+
+			declaration = document.CreateXmlDeclaration ("1.0", null, "yes");
+			AssertEquals (String.Empty, declaration.InnerXml);
+			AssertEquals ("<?xml version=\"1.0\" standalone=\"yes\"?>", declaration.OuterXml);
+
+			declaration = document.CreateXmlDeclaration ("1.0", "foo", "no");
+			AssertEquals (String.Empty, declaration.InnerXml);
+			AssertEquals ("<?xml version=\"1.0\" encoding=\"foo\" standalone=\"no\"?>", declaration.OuterXml);
+		}
+
+		internal void TestXmlNodeBaseProperties (XmlNode original, XmlNode cloned)
+		{
+//			assertequals (original.nodetype + " was incorrectly cloned.",
+//				      original.baseuri, cloned.baseuri);			
+			AssertNull (cloned.ParentNode);
+
+			AssertEquals ("Value incorrectly cloned",
+				      original.Value, cloned.Value);
+			
+                        Assert ("Copies, not pointers", !Object.ReferenceEquals (original,cloned));
+		}
+
+		public void TestConstructor ()
+		{
+			try {
+				XmlDeclaration broken = document.CreateXmlDeclaration ("2.0", null, null);
+			} catch (ArgumentException) {
+				return;
+
+			} catch (Exception e) {
+				Fail("first arg null, wrong exception: " + e.ToString());
+			}
+		}
+
+		public void TestNodeType ()
+		{
+			AssertEquals ("incorrect NodeType returned", XmlNodeType.XmlDeclaration, declaration.NodeType);
+		}
+
+		public void TestNames ()
+		{
+			AssertEquals ("Name is incorrect", "xml", declaration.Name);
+			AssertEquals ("LocalName is incorrect", "xml", declaration.LocalName);
+		}
+
+		public void TestEncodingProperty ()
+		{
+			XmlDeclaration d1 = document.CreateXmlDeclaration ("1.0", "foo", null);
+			AssertEquals ("Encoding property", "foo", d1.Encoding);
+
+			XmlDeclaration d2 = document.CreateXmlDeclaration ("1.0", null, null);
+			AssertEquals ("null Encoding property", String.Empty, d2.Encoding);
+		}
+
+		public void TestStandaloneProperty ()
+		{
+			XmlDeclaration d1 = document.CreateXmlDeclaration ("1.0", null, "yes");
+			AssertEquals ("Yes standalone property", "yes", d1.Standalone);
+
+			XmlDeclaration d2 = document.CreateXmlDeclaration ("1.0", null, "no");
+			AssertEquals ("No standalone property", "no", d2.Standalone);
+
+			XmlDeclaration d3 = document.CreateXmlDeclaration ("1.0", null, null);
+			AssertEquals ("null Standalone property", String.Empty, d3.Standalone);
+		}
+
+		public void TestValueProperty ()
+		{
+			XmlDeclaration d = document.CreateXmlDeclaration ("1.0", "UTF-8", "yes");
+			AssertEquals ("Value property", "version=\"1.0\" encoding=\"UTF-8\" standalone=\"yes\"",
+				      d.Value);
+		}
+
+		public void TestXmlCommentCloneNode ()
+		{
+			XmlNode original = declaration;
+
+			XmlNode shallow = declaration.CloneNode (false); // shallow
+			TestXmlNodeBaseProperties (original, shallow);
+			
+			XmlNode deep = declaration.CloneNode (true); // deep
+			TestXmlNodeBaseProperties (original, deep);
+
+                        AssertEquals ("deep cloning differs from shallow cloning",
+				      deep.OuterXml, shallow.OuterXml);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlDocumentTests.cs b/mcs/class/System.XML/Test/XmlDocumentTests.cs
new file mode 100644
index 00000000000..5ede6bf749d
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlDocumentTests.cs
@@ -0,0 +1,748 @@
+//
+// System.Xml.XmlDocumentTests
+//
+// Authors:
+//   Jason Diamond <jason@injektilo.org>
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Jason Diamond, Kral Ferch
+//
+
+using System;
+using System.Collections;
+using System.Xml;
+using System.IO;
+using System.Text;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlDocumentTests : TestCase
+	{
+		public XmlDocumentTests () : base ("MonoTests.System.Xml.XmlDocumentTests testsuite") {}
+		public XmlDocumentTests (string name) : base (name) {}
+
+		private XmlDocument document;
+		private ArrayList eventStrings = new ArrayList();
+
+		// These Event* methods support the TestEventNode* Tests in this file.
+		// Most of them are event handlers for the XmlNodeChangedEventHandler
+		// delegate.
+		private void EventStringAdd(string eventName, XmlNodeChangedEventArgs e)
+		{
+			string oldParent = (e.OldParent != null) ? e.OldParent.Name : "<none>";
+			string newParent = (e.NewParent != null) ? e.NewParent.Name : "<none>";
+			eventStrings.Add (String.Format ("{0}, {1}, {2}, {3}, {4}", eventName, e.Action.ToString (), e.Node.OuterXml, oldParent, newParent));
+		}
+
+		private void EventNodeChanged(Object sender, XmlNodeChangedEventArgs e)
+		{
+			EventStringAdd ("NodeChanged", e);
+		}
+
+		private void EventNodeChanging (Object sender, XmlNodeChangedEventArgs e)
+		{
+			EventStringAdd ("NodeChanging", e);
+		}
+
+		private void EventNodeChangingException (Object sender, XmlNodeChangedEventArgs e)
+		{
+			throw new Exception ("don't change the value.");
+		}
+
+		private void EventNodeInserted(Object sender, XmlNodeChangedEventArgs e)
+		{
+			EventStringAdd ("NodeInserted", e);
+		}
+
+		private void EventNodeInserting(Object sender, XmlNodeChangedEventArgs e)
+		{
+			EventStringAdd ("NodeInserting", e);
+		}
+
+		private void EventNodeInsertingException(Object sender, XmlNodeChangedEventArgs e)
+		{
+			throw new Exception ("don't insert the element.");
+		}
+
+		private void EventNodeRemoved(Object sender, XmlNodeChangedEventArgs e)
+		{
+			EventStringAdd ("NodeRemoved", e);
+		}
+
+		private void EventNodeRemoving(Object sender, XmlNodeChangedEventArgs e)
+		{
+			EventStringAdd ("NodeRemoving", e);
+		}
+
+		private void EventNodeRemovingException(Object sender, XmlNodeChangedEventArgs e)
+		{
+			throw new Exception ("don't remove the element.");
+		}
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+		}
+
+		public void TestCreateNodeNodeTypeNameEmptyParams ()
+		{
+			XmlNode node;
+
+			try {
+				node = document.CreateNode (null, null, null);
+				Fail ("Expected an ArgumentException to be thrown.");
+			} catch (ArgumentException) {}
+
+			try {
+				node = document.CreateNode ("attribute", null, null);
+				Fail ("Expected a NullReferenceException to be thrown.");
+			} catch (NullReferenceException) {}
+
+			try {
+				node = document.CreateNode ("attribute", "", null);
+				Fail ("Expected an ArgumentException to be thrown.");
+			} catch (ArgumentException) {}
+
+			try {
+				node = document.CreateNode ("element", null, null);
+				Fail ("Expected a NullReferenceException to be thrown.");
+			} catch (NullReferenceException) {}
+
+			try {
+				node = document.CreateNode ("element", "", null);
+				Fail ("Expected an ArgumentException to be thrown.");
+			} catch (ArgumentException) {}
+
+			try {
+				node = document.CreateNode ("entityreference", null, null);
+				Fail ("Expected a NullReferenceException to be thrown.");
+			} catch (NullReferenceException) {}
+		}
+
+		public void TestCreateNodeInvalidXmlNodeType ()
+		{
+			XmlNode node;
+
+			try {
+				node = document.CreateNode (XmlNodeType.EndElement, null, null);
+				Fail ("Expected an ArgumentOutOfRangeException to be thrown.");
+			} catch (ArgumentOutOfRangeException) {}
+
+			try {
+				node = document.CreateNode (XmlNodeType.EndEntity, null, null);
+				Fail ("Expected an ArgumentOutOfRangeException to be thrown.");
+			} catch (ArgumentOutOfRangeException) {}
+
+			try {
+				node = document.CreateNode (XmlNodeType.Entity, null, null);
+				Fail ("Expected an ArgumentOutOfRangeException to be thrown.");
+			} catch (ArgumentOutOfRangeException) {}
+
+			try {
+				node = document.CreateNode (XmlNodeType.None, null, null);
+				Fail ("Expected an ArgumentOutOfRangeException to be thrown.");
+			} catch (ArgumentOutOfRangeException) {}
+
+			try {
+				node = document.CreateNode (XmlNodeType.Notation, null, null);
+				Fail ("Expected an ArgumentOutOfRangeException to be thrown.");
+			} catch (ArgumentOutOfRangeException) {}
+
+			// TODO:  undocumented allowable type.
+			node = document.CreateNode (XmlNodeType.XmlDeclaration, null, null);
+			AssertEquals (XmlNodeType.XmlDeclaration, node.NodeType);
+		}
+
+		public void TestCreateNodeWhichParamIsUsed ()
+		{
+			XmlNode node;
+
+			// No constructor params for Document, DocumentFragment.
+
+			node = document.CreateNode (XmlNodeType.CDATA, "a", "b", "c");
+			AssertEquals (String.Empty, ((XmlCDataSection)node).Value);
+
+			node = document.CreateNode (XmlNodeType.Comment, "a", "b", "c");
+			AssertEquals (String.Empty, ((XmlComment)node).Value);
+
+			node = document.CreateNode (XmlNodeType.DocumentType, "a", "b", "c");
+			AssertNull (((XmlDocumentType)node).Value);
+
+// TODO: add this back in to test when it's implemented.
+//			node = document.CreateNode (XmlNodeType.EntityReference, "a", "b", "c");
+//			AssertNull (((XmlEntityReference)node).Value);
+
+			node = document.CreateNode (XmlNodeType.ProcessingInstruction, "a", "b", "c");
+			AssertEquals (String.Empty, ((XmlProcessingInstruction)node).Value);
+
+			node = document.CreateNode (XmlNodeType.SignificantWhitespace, "a", "b", "c");
+			AssertEquals (String.Empty, ((XmlSignificantWhitespace)node).Value);
+
+			node = document.CreateNode (XmlNodeType.Text, "a", "b", "c");
+			AssertEquals (String.Empty, ((XmlText)node).Value);
+
+			node = document.CreateNode (XmlNodeType.Whitespace, "a", "b", "c");
+			AssertEquals (String.Empty, ((XmlWhitespace)node).Value);
+
+			node = document.CreateNode (XmlNodeType.XmlDeclaration, "a", "b", "c");
+			AssertEquals ("version=\"1.0\"", ((XmlDeclaration)node).Value);
+		}
+
+		public void TestCreateNodeNodeTypeName ()
+		{
+			XmlNode node;
+
+			try {
+				node = document.CreateNode ("foo", null, null);
+				Fail ("Expected an ArgumentException to be thrown.");
+			} catch (ArgumentException) {}
+
+			node = document.CreateNode("attribute", "foo", null);
+			AssertEquals (XmlNodeType.Attribute, node.NodeType);
+
+			node = document.CreateNode("cdatasection", null, null);
+			AssertEquals (XmlNodeType.CDATA, node.NodeType);
+
+			node = document.CreateNode("comment", null, null);
+			AssertEquals (XmlNodeType.Comment, node.NodeType);
+
+			node = document.CreateNode("document", null, null);
+			AssertEquals (XmlNodeType.Document, node.NodeType);
+			// TODO: test which constructor this ended up calling,
+			// i.e. reuse underlying NameTable or not?
+
+// TODO: add this back in to test when it's implemented.
+//			node = document.CreateNode("documentfragment", null, null);
+//			AssertEquals (XmlNodeType.DocumentFragment, node.NodeType);
+
+			node = document.CreateNode("documenttype", null, null);
+			AssertEquals (XmlNodeType.DocumentType, node.NodeType);
+
+			node = document.CreateNode("element", "foo", null);
+			AssertEquals (XmlNodeType.Element, node.NodeType);
+
+// TODO: add this back in to test when it's implemented.
+//			node = document.CreateNode("entityreference", "foo", null);
+//			AssertEquals (XmlNodeType.EntityReference, node.NodeType);
+
+			node = document.CreateNode("processinginstruction", null, null);
+			AssertEquals (XmlNodeType.ProcessingInstruction, node.NodeType);
+
+			node = document.CreateNode("significantwhitespace", null, null);
+			AssertEquals (XmlNodeType.SignificantWhitespace, node.NodeType);
+
+			node = document.CreateNode("text", null, null);
+			AssertEquals (XmlNodeType.Text, node.NodeType);
+
+			node = document.CreateNode("whitespace", null, null);
+			AssertEquals (XmlNodeType.Whitespace, node.NodeType);
+		}
+
+		public void TestDocumentElement ()
+		{
+			AssertNull (document.DocumentElement);
+			XmlElement element = document.CreateElement ("foo", "bar", "http://foo/");
+			AssertNotNull (element);
+
+			AssertEquals ("foo", element.Prefix);
+			AssertEquals ("bar", element.LocalName);
+			AssertEquals ("http://foo/", element.NamespaceURI);
+
+			AssertEquals ("foo:bar", element.Name);
+
+			AssertSame (element, document.AppendChild (element));
+
+			AssertSame (element, document.DocumentElement);
+		}
+
+		public void TestDocumentEmpty()
+		{
+			AssertEquals ("Incorrect output for empty document.", "", document.OuterXml);
+		}
+
+		public void TestEventNodeChanged()
+		{
+			XmlElement element;
+			XmlComment comment;
+
+			document.NodeChanged += new XmlNodeChangedEventHandler (this.EventNodeChanged);
+
+			// Node that is part of the document.
+			document.AppendChild (document.CreateElement ("foo"));
+			comment = document.CreateComment ("bar");
+			document.DocumentElement.AppendChild (comment);
+			AssertEquals ("<!--bar-->", document.DocumentElement.InnerXml);
+			comment.Value = "baz";
+			Assert (eventStrings.Contains ("NodeChanged, Change, <!--baz-->, foo, foo"));
+			AssertEquals ("<!--baz-->", document.DocumentElement.InnerXml);
+
+			// Node that isn't part of the document but created by the document.
+			element = document.CreateElement ("foo");
+			comment = document.CreateComment ("bar");
+			element.AppendChild (comment);
+			AssertEquals ("<!--bar-->", element.InnerXml);
+			comment.Value = "baz";
+			Assert (eventStrings.Contains ("NodeChanged, Change, <!--baz-->, foo, foo"));
+			AssertEquals ("<!--baz-->", element.InnerXml);
+
+/*
+ TODO:  Insert this when XmlNode.InnerText() and XmlNode.InnerXml() have been implemented.
+ 
+			// Node that is part of the document.
+			element = document.CreateElement ("foo");
+			element.InnerText = "bar";
+			document.AppendChild(element);
+			element.InnerText = "baz";
+			Assert(eventStrings.Contains("NodeChanged, Change, baz, foo, foo"));
+			
+			// Node that isn't part of the document but created by the document.
+			element = document.CreateElement("qux");
+			element.InnerText = "quux";
+			element.InnerText = "quuux";
+			Assert(eventStrings.Contains("NodeChanged, Change, quuux, qux, qux"));
+*/
+		}
+
+		public void TestEventNodeChanging()
+		{
+			XmlElement element;
+			XmlComment comment;
+
+			document.NodeChanging += new XmlNodeChangedEventHandler (this.EventNodeChanging);
+
+			// Node that is part of the document.
+			document.AppendChild (document.CreateElement ("foo"));
+			comment = document.CreateComment ("bar");
+			document.DocumentElement.AppendChild (comment);
+			AssertEquals ("<!--bar-->", document.DocumentElement.InnerXml);
+			comment.Value = "baz";
+			Assert (eventStrings.Contains ("NodeChanging, Change, <!--bar-->, foo, foo"));
+			AssertEquals ("<!--baz-->", document.DocumentElement.InnerXml);
+
+			// Node that isn't part of the document but created by the document.
+			element = document.CreateElement ("foo");
+			comment = document.CreateComment ("bar");
+			element.AppendChild (comment);
+			AssertEquals ("<!--bar-->", element.InnerXml);
+			comment.Value = "baz";
+			Assert (eventStrings.Contains ("NodeChanging, Change, <!--bar-->, foo, foo"));
+			AssertEquals ("<!--baz-->", element.InnerXml);
+
+			// If an exception is thrown the Document returns to original state.
+			document.NodeChanging += new XmlNodeChangedEventHandler (this.EventNodeChangingException);
+			element = document.CreateElement("foo");
+			comment = document.CreateComment ("bar");
+			element.AppendChild (comment);
+			AssertEquals ("<!--bar-->", element.InnerXml);
+			try 
+			{
+				comment.Value = "baz";
+				Fail("Expected an exception to be thrown by the NodeChanging event handler method EventNodeChangingException().");
+			} catch (Exception) {}
+			AssertEquals ("<!--bar-->", element.InnerXml);
+
+			// Yes it's a bit anal but this tests whether the node changing event exception fires before the
+			// ArgumentOutOfRangeException.  Turns out it does so that means our implementation needs to raise
+			// the node changing event before doing any work.
+			try 
+			{
+				comment.ReplaceData(-1, 0, "qux");
+				Fail("Expected an ArgumentOutOfRangeException to be thrown.");
+			} 
+			catch (Exception) {}
+
+			/*
+ TODO:  Insert this when XmlNode.InnerText() and XmlNode.InnerXml() have been implemented.
+ 
+			// Node that is part of the document.
+			element = document.CreateElement ("foo");
+			element.InnerText = "bar";
+			document.AppendChild(element);
+			element.InnerText = "baz";
+			Assert(eventStrings.Contains("NodeChanging, Change, bar, foo, foo"));
+
+			// Node that isn't part of the document but created by the document.
+			element = document.CreateElement("foo");
+			element.InnerText = "bar";
+			element.InnerText = "baz";
+			Assert(eventStrings.Contains("NodeChanging, Change, bar, foo, foo"));
+
+			// If an exception is thrown the Document returns to original state.
+			document.NodeChanging += new XmlNodeChangedEventHandler (this.EventNodeChangingException);
+			element = document.CreateElement("foo");
+			element.InnerText = "bar";
+			try {
+				element.InnerText = "baz";
+				Fail("Expected an exception to be thrown by the NodeChanging event handler method EventNodeChangingException().");
+			} catch (Exception) {}
+			AssertEquals("bar", element.InnerText);
+*/
+		}
+
+		public void TestEventNodeInserted()
+		{
+			XmlElement element;
+
+			document.NodeInserted += new XmlNodeChangedEventHandler (this.EventNodeInserted);
+
+			// Inserted 'foo' element to the document.
+			element = document.CreateElement ("foo");
+			document.AppendChild (element);
+			Assert (eventStrings.Contains ("NodeInserted, Insert, <foo />, <none>, #document"));
+
+			// Append child on node in document
+			element = document.CreateElement ("foo");
+			document.DocumentElement.AppendChild (element);
+			Assert (eventStrings.Contains ("NodeInserted, Insert, <foo />, <none>, foo"));
+
+			// Append child on node not in document but created by document
+			element = document.CreateElement ("bar");
+			element.AppendChild(document.CreateElement ("bar"));
+			Assert(eventStrings.Contains("NodeInserted, Insert, <bar />, <none>, bar"));
+		}
+
+		public void TestEventNodeInserting()
+		{
+			XmlElement element;
+
+			document.NodeInserting += new XmlNodeChangedEventHandler (this.EventNodeInserting);
+
+			// Inserting 'foo' element to the document.
+			element = document.CreateElement ("foo");
+			document.AppendChild (element);
+			Assert (eventStrings.Contains ("NodeInserting, Insert, <foo />, <none>, #document"));
+
+			// Append child on node in document
+			element = document.CreateElement ("foo");
+			document.DocumentElement.AppendChild (element);
+			Assert(eventStrings.Contains ("NodeInserting, Insert, <foo />, <none>, foo"));
+
+			// Append child on node not in document but created by document
+			element = document.CreateElement ("bar");
+			AssertEquals (0, element.ChildNodes.Count);
+			element.AppendChild (document.CreateElement ("bar"));
+			Assert (eventStrings.Contains ("NodeInserting, Insert, <bar />, <none>, bar"));
+			AssertEquals (1, element.ChildNodes.Count);
+
+			// If an exception is thrown the Document returns to original state.
+			document.NodeInserting += new XmlNodeChangedEventHandler (this.EventNodeInsertingException);
+			AssertEquals (1, element.ChildNodes.Count);
+			try 
+			{
+				element.AppendChild (document.CreateElement("baz"));
+				Fail ("Expected an exception to be thrown by the NodeInserting event handler method EventNodeInsertingException().");
+			} 
+			catch (Exception) {}
+			AssertEquals (1, element.ChildNodes.Count);
+		}
+
+		public void TestEventNodeRemoved()
+		{
+			XmlElement element;
+			XmlElement element2;
+
+			document.NodeRemoved += new XmlNodeChangedEventHandler (this.EventNodeRemoved);
+
+			// Removed 'bar' element from 'foo' outside document.
+			element = document.CreateElement ("foo");
+			element2 = document.CreateElement ("bar");
+			element.AppendChild (element2);
+			AssertEquals (1, element.ChildNodes.Count);
+			element.RemoveChild (element2);
+			Assert (eventStrings.Contains ("NodeRemoved, Remove, <bar />, foo, <none>"));
+			AssertEquals (0, element.ChildNodes.Count);
+
+/*
+ * TODO:  put this test back in when AttributeCollection.RemoveAll() is implemented.
+
+			// RemoveAll.
+			element = document.CreateElement ("foo");
+			element2 = document.CreateElement ("bar");
+			element.AppendChild(element2);
+			AssertEquals(1, element.ChildNodes.Count);
+			element.RemoveAll();
+			Assert (eventStrings.Contains ("NodeRemoved, Remove, <bar />, foo, <none>"));
+			AssertEquals(0, element.ChildNodes.Count);
+*/
+
+			// Removed 'bar' element from 'foo' inside document.
+			element = document.CreateElement ("foo");
+			document.AppendChild (element);
+			element = document.CreateElement ("bar");
+			document.DocumentElement.AppendChild (element);
+			AssertEquals (1, document.DocumentElement.ChildNodes.Count);
+			document.DocumentElement.RemoveChild (element);
+			Assert (eventStrings.Contains ("NodeRemoved, Remove, <bar />, foo, <none>"));
+			AssertEquals (0, document.DocumentElement.ChildNodes.Count);
+		}
+	
+		public void TestEventNodeRemoving()
+		{
+			XmlElement element;
+			XmlElement element2;
+
+			document.NodeRemoving += new XmlNodeChangedEventHandler (this.EventNodeRemoving);
+
+			// Removing 'bar' element from 'foo' outside document.
+			element = document.CreateElement ("foo");
+			element2 = document.CreateElement ("bar");
+			element.AppendChild (element2);
+			AssertEquals (1, element.ChildNodes.Count);
+			element.RemoveChild (element2);
+			Assert (eventStrings.Contains ("NodeRemoving, Remove, <bar />, foo, <none>"));
+			AssertEquals (0, element.ChildNodes.Count);
+
+/*
+ * TODO:  put this test back in when AttributeCollection.RemoveAll() is implemented.
+
+			// RemoveAll.
+			element = document.CreateElement ("foo");
+			element2 = document.CreateElement ("bar");
+			element.AppendChild(element2);
+			AssertEquals(1, element.ChildNodes.Count);
+			element.RemoveAll();
+			Assert (eventStrings.Contains ("NodeRemoving, Remove, <bar />, foo, <none>"));
+			AssertEquals(0, element.ChildNodes.Count);
+*/
+
+			// Removing 'bar' element from 'foo' inside document.
+			element = document.CreateElement ("foo");
+			document.AppendChild (element);
+			element = document.CreateElement ("bar");
+			document.DocumentElement.AppendChild (element);
+			AssertEquals (1, document.DocumentElement.ChildNodes.Count);
+			document.DocumentElement.RemoveChild (element);
+			Assert (eventStrings.Contains ("NodeRemoving, Remove, <bar />, foo, <none>"));
+			AssertEquals (0, document.DocumentElement.ChildNodes.Count);
+
+			// If an exception is thrown the Document returns to original state.
+			document.NodeRemoving += new XmlNodeChangedEventHandler (this.EventNodeRemovingException);
+			element.AppendChild (element2);
+			AssertEquals (1, element.ChildNodes.Count);
+			try 
+			{
+				element.RemoveChild(element2);
+				Fail ("Expected an exception to be thrown by the NodeRemoving event handler method EventNodeRemovingException().");
+			} 
+			catch (Exception) {}
+			AssertEquals (1, element.ChildNodes.Count);
+		}
+
+		public void TestGetElementsByTagNameNoNameSpace ()
+		{
+			string xml = @"<library><book><title>XML Fun</title><author>John Doe</author>
+				<price>34.95</price></book><book><title>Bear and the Dragon</title>
+				<author>Tom Clancy</author><price>6.95</price></book><book>
+				<title>Bourne Identity</title><author>Robert Ludlum</author>
+				<price>9.95</price></book><Fluffer><Nutter><book>
+				<title>Bourne Ultimatum</title><author>Robert Ludlum</author>
+				<price>9.95</price></book></Nutter></Fluffer></library>";
+
+			MemoryStream memoryStream = new MemoryStream (Encoding.UTF8.GetBytes (xml));
+			document = new XmlDocument ();
+			document.Load (memoryStream);
+			XmlNodeList bookList = document.GetElementsByTagName ("book");
+			AssertEquals ("GetElementsByTagName (string) returned incorrect count.", 4, bookList.Count);
+		}
+
+		public void TestGetElementsByTagNameUsingNameSpace ()
+		{
+			StringBuilder xml = new StringBuilder ();
+			xml.Append ("<?xml version=\"1.0\" ?><library xmlns:North=\"http://www.foo.com\"");
+			xml.Append ("xmlns:South=\"http://www.goo.com\"><North:book type=\"non-fiction\"> ");
+			xml.Append ("<North:title type=\"intro\">XML Fun</North:title> " );
+			xml.Append ("<North:author>John Doe</North:author> " );
+			xml.Append ("<North:price>34.95</North:price></North:book> " );
+			xml.Append ("<South:book type=\"fiction\"> " );
+			xml.Append ("<South:title>Bear and the Dragon</South:title> " );
+			xml.Append ("<South:author>Tom Clancy</South:author> " );
+                        xml.Append ("<South:price>6.95</South:price></South:book> " );
+			xml.Append ("<South:book type=\"fiction\"><South:title>Bourne Identity</South:title> " );
+			xml.Append ("<South:author>Robert Ludlum</South:author> " );
+			xml.Append ("<South:price>9.95</South:price></South:book></library>");
+
+			MemoryStream memoryStream = new MemoryStream (Encoding.UTF8.GetBytes (xml.ToString ()));
+			document = new XmlDocument ();
+			document.Load (memoryStream);
+			XmlNodeList bookList = document.GetElementsByTagName ("book", "http://www.goo.com");
+			AssertEquals ("GetElementsByTagName (string, uri) returned incorrect count.", 2, bookList.Count);
+		}
+
+	
+		public void TestInnerAndOuterXml ()
+		{
+			AssertEquals (String.Empty, document.InnerXml);
+			AssertEquals (document.InnerXml, document.OuterXml);
+
+			XmlDeclaration declaration = document.CreateXmlDeclaration ("1.0", null, null);
+			document.AppendChild (declaration);
+			AssertEquals ("<?xml version=\"1.0\"?>", document.InnerXml);
+			AssertEquals (document.InnerXml, document.OuterXml);
+
+			XmlElement element = document.CreateElement ("foo");
+			document.AppendChild (element);
+			AssertEquals ("<?xml version=\"1.0\"?><foo />", document.InnerXml);
+			AssertEquals (document.InnerXml, document.OuterXml);
+
+			XmlComment comment = document.CreateComment ("bar");
+			document.DocumentElement.AppendChild (comment);
+			AssertEquals ("<?xml version=\"1.0\"?><foo><!--bar--></foo>", document.InnerXml);
+			AssertEquals (document.InnerXml, document.OuterXml);
+
+			XmlText text = document.CreateTextNode ("baz");
+			document.DocumentElement.AppendChild (text);
+			AssertEquals ("<?xml version=\"1.0\"?><foo><!--bar-->baz</foo>", document.InnerXml);
+			AssertEquals (document.InnerXml, document.OuterXml);
+
+			element = document.CreateElement ("quux");
+			element.SetAttribute ("quuux", "squonk");
+			document.DocumentElement.AppendChild (element);
+			AssertEquals ("<?xml version=\"1.0\"?><foo><!--bar-->baz<quux quuux=\"squonk\" /></foo>", document.InnerXml);
+			AssertEquals (document.InnerXml, document.OuterXml);
+		}
+
+		public void TestLoadWithSystemIOStream ()
+		{			
+			string xml = @"<library><book><title>XML Fun</title><author>John Doe</author>
+				<price>34.95</price></book><book><title>Bear and the Dragon</title>
+				<author>Tom Clancy</author><price>6.95</price></book><book>
+				<title>Bourne Identity</title><author>Robert Ludlum</author>
+				<price>9.95</price></book><Fluffer><Nutter><book>
+				<title>Bourne Ultimatum</title><author>Robert Ludlum</author>
+				<price>9.95</price></book></Nutter></Fluffer></library>";
+
+			MemoryStream memoryStream = new MemoryStream (Encoding.UTF8.GetBytes (xml));
+			document = new XmlDocument ();
+			document.Load (memoryStream);
+			AssertEquals ("Not Loaded From IOStream", true, document.HasChildNodes);
+		}
+
+		public void TestLoadXmlCDATA ()
+		{
+			document.LoadXml ("<foo><![CDATA[bar]]></foo>");
+			Assert (document.DocumentElement.FirstChild.NodeType == XmlNodeType.CDATA);
+			AssertEquals ("bar", document.DocumentElement.FirstChild.Value);
+		}
+
+		public void TestLoadXMLComment()
+		{
+// XmlTextReader needs to throw this exception
+//			try {
+//				document.LoadXml("<!--foo-->");
+//				Fail("XmlException should have been thrown.");
+//			}
+//			catch (XmlException e) {
+//				AssertEquals("Exception message doesn't match.", "The root element is missing.", e.Message);
+//			}
+
+			document.LoadXml ("<foo><!--Comment--></foo>");
+			Assert (document.DocumentElement.FirstChild.NodeType == XmlNodeType.Comment);
+			AssertEquals ("Comment", document.DocumentElement.FirstChild.Value);
+
+			document.LoadXml (@"<foo><!--bar--></foo>");
+			AssertEquals ("Incorrect target.", "bar", ((XmlComment)document.FirstChild.FirstChild).Data);
+		}
+
+		public void TestLoadXmlElementSingle ()
+		{
+			AssertNull (document.DocumentElement);
+			document.LoadXml ("<foo/>");
+
+			AssertNotNull (document.DocumentElement);
+			AssertSame (document.FirstChild, document.DocumentElement);
+
+			AssertEquals (String.Empty, document.DocumentElement.Prefix);
+			AssertEquals ("foo", document.DocumentElement.LocalName);
+			AssertEquals (String.Empty, document.DocumentElement.NamespaceURI);
+			AssertEquals ("foo", document.DocumentElement.Name);
+		}
+
+		public void TestLoadXmlElementWithAttributes ()
+		{
+			AssertNull (document.DocumentElement);
+			document.LoadXml ("<foo bar='baz' quux='quuux'/>");
+
+			XmlElement documentElement = document.DocumentElement;
+
+			AssertEquals ("baz", documentElement.GetAttribute ("bar"));
+			AssertEquals ("quuux", documentElement.GetAttribute ("quux"));
+		}
+		public void TestLoadXmlElementWithChildElement ()
+		{
+			document.LoadXml ("<foo><bar/></foo>");
+			Assert (document.ChildNodes.Count == 1);
+			Assert (document.FirstChild.ChildNodes.Count == 1);
+			AssertEquals ("foo", document.DocumentElement.LocalName);
+			AssertEquals ("bar", document.DocumentElement.FirstChild.LocalName);
+		}
+
+		public void TestLoadXmlElementWithTextNode ()
+		{
+			document.LoadXml ("<foo>bar</foo>");
+			Assert (document.DocumentElement.FirstChild.NodeType == XmlNodeType.Text);
+			AssertEquals ("bar", document.DocumentElement.FirstChild.Value);
+		}
+
+		public void TestLoadXmlExceptionClearsDocument ()
+		{
+			document.LoadXml ("<foo/>");
+			Assert (document.FirstChild != null);
+			
+			try {
+				document.LoadXml ("<123/>");
+				Fail ("An XmlException should have been thrown.");
+			} catch (XmlException) {}
+
+			Assert (document.FirstChild == null);
+		}
+
+		public void TestLoadXmlProcessingInstruction ()
+		{
+			document.LoadXml (@"<?foo bar='baaz' quux='quuux'?><quuuux></quuuux>");
+			AssertEquals ("Incorrect target.", "foo", ((XmlProcessingInstruction)document.FirstChild).Target);
+			AssertEquals ("Incorrect data.", "bar='baaz' quux='quuux'", ((XmlProcessingInstruction)document.FirstChild).Data);
+		}
+
+		public void TestOuterXml ()
+		{
+			string xml;
+			
+			xml = "<root><![CDATA[foo]]></root>";
+			document.LoadXml (xml);
+			AssertEquals("XmlDocument with cdata OuterXml is incorrect.", xml, document.OuterXml);
+
+			xml = "<root><!--foo--></root>";
+			document.LoadXml (xml);
+			AssertEquals("XmlDocument with comment OuterXml is incorrect.", xml, document.OuterXml);
+
+			xml = "<root><?foo bar?></root>";
+			document.LoadXml (xml);
+			AssertEquals("XmlDocument with processing instruction OuterXml is incorrect.", xml, document.OuterXml);
+		}
+
+		public void TestParentNodes ()
+		{
+			document.LoadXml ("<foo><bar><baz/></bar></foo>");
+			XmlNode node = document.FirstChild.FirstChild.FirstChild;
+			AssertEquals ("Wrong child found.", "baz", node.LocalName);
+			AssertEquals ("Wrong parent.", "bar", node.ParentNode.LocalName);
+			AssertEquals ("Wrong parent.", "foo", node.ParentNode.ParentNode.LocalName);
+			AssertEquals ("Wrong parent.", "#document", node.ParentNode.ParentNode.ParentNode.LocalName);
+			AssertNull ("Expected parent to be null.", node.ParentNode.ParentNode.ParentNode.ParentNode);
+		}
+
+		public void TestRemovedElementNextSibling ()
+		{
+			XmlNode node;
+			XmlNode nextSibling;
+
+			document.LoadXml ("<foo><child1/><child2/></foo>");
+			node = document.DocumentElement.FirstChild;
+			document.DocumentElement.RemoveChild (node);
+			nextSibling = node.NextSibling;
+			AssertNull ("Expected removed node's next sibling to be null.", nextSibling);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlDocumentTypeTests.cs b/mcs/class/System.XML/Test/XmlDocumentTypeTests.cs
new file mode 100755
index 00000000000..857478bc51c
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlDocumentTypeTests.cs
@@ -0,0 +1,104 @@
+//
+// System.Xml.XmlDocumentTypeTests.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlDocumentTypeTests : TestCase
+	{
+		XmlDocument document;
+		XmlDocumentType docType;
+		public XmlDocumentTypeTests ()
+			: base ("MonoTests.System.Xml.XmlDocumentTypeTests testsuite")
+		{
+		}
+
+		public XmlDocumentTypeTests (string name)
+			: base (name)
+		{
+		}
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+			docType = document.CreateDocumentType ("book", null, null, "<!ELEMENT book ANY>");
+			document.AppendChild (docType);
+		}
+
+		internal void TestXmlNodeBaseProperties (XmlNode original, XmlNode cloned)
+		{
+//			assertequals (original.nodetype + " was incorrectly cloned.",
+//				      original.baseuri, cloned.baseuri);			
+
+			AssertNull (cloned.ParentNode);
+			AssertEquals ("Value incorrectly cloned",
+				      original.Value, cloned.Value);
+
+                        Assert ("Copies, not pointers", !Object.ReferenceEquals (original, cloned));
+		}
+
+		public void TestName ()
+		{
+			AssertEquals ("Getting Name property", "book", docType.Name);
+		}
+
+		public void TestLocalName ()
+		{
+			AssertEquals ("Getting LocalName property", "book", docType.LocalName);
+		}
+
+		public void TestInternalSubset ()
+		{
+			AssertEquals ("Getting Internal Subset property",
+				      "<!ELEMENT book ANY>", docType.InternalSubset);
+		}
+
+		public void TestAppendChild ()
+		{
+			try {
+				XmlDocumentType type1 = document.CreateDocumentType ("book", null, null, null);
+				document.AppendChild (type1);
+
+			} catch (InvalidOperationException) {
+				return;
+
+			} catch (Exception) {				
+				Fail ("Incorrect Exception thrown.");
+			}
+		}
+
+		public void TestNodeType ()
+		{
+			AssertEquals ("NodeType property broken",
+				      docType.NodeType.ToString (), "DocumentType");
+		}
+		
+		public void TestIsReadOnly ()
+		{
+			AssertEquals ("IsReadOnly property", "True", docType.IsReadOnly.ToString ());
+		}
+
+		public void TestCloneNode ()
+		{
+			XmlNode original = docType;
+
+			XmlNode cloned1 = docType.CloneNode (true);
+			TestXmlNodeBaseProperties (original, cloned1);
+
+			XmlNode cloned2 = docType.CloneNode (false);
+			TestXmlNodeBaseProperties (original, cloned2);
+
+			AssertEquals ("Deep and shallow cloning", cloned1.Value, cloned2.Value);
+		}
+	       
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlElementTests.cs b/mcs/class/System.XML/Test/XmlElementTests.cs
new file mode 100644
index 00000000000..83a45b1e45f
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlElementTests.cs
@@ -0,0 +1,209 @@
+//
+// XmlElementTests
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+using System.Xml;
+using System.IO;
+using System.Text;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlElementTests : TestCase
+	{
+		public XmlElementTests () : base ("MonoTests.System.Xml.XmlElementTests testsuite") { }
+		public XmlElementTests (string name) : base (name) { }
+
+		private XmlDocument document;
+
+		protected override void SetUp()
+		{
+			document = new XmlDocument ();
+		}
+
+		private void AssertElement (XmlElement element, string prefix,
+					    string localName, string namespaceURI,
+					    int attributesCount)
+		{
+			AssertEquals (prefix != String.Empty ? prefix + ":" + localName : localName, element.Name);
+			AssertEquals (prefix, element.Prefix);
+			AssertEquals (localName, element.LocalName);
+			AssertEquals (namespaceURI, element.NamespaceURI);
+			//AssertEquals (attributesCount, element.Attributes.Count);
+		}
+
+		public void TestCloneNode ()
+		{
+			XmlElement element = document.CreateElement ("foo");
+			XmlElement child = document.CreateElement ("bar");
+			XmlElement grandson = document.CreateElement ("baz");
+
+			element.SetAttribute ("attr1", "val1");
+			element.SetAttribute ("attr2", "val2");
+			element.AppendChild (child);
+			child.SetAttribute ("attr3", "val3");
+			child.AppendChild (grandson);
+                        
+			document.AppendChild (element);
+			XmlNode deep = element.CloneNode (true);
+			// AssertEquals ("These should be the same", deep.OuterXml, element.OuterXml); 
+			AssertNull ("This is not null", deep.ParentNode);
+			Assert ("Copies, not pointers", !Object.ReferenceEquals (element,deep));
+
+			XmlNode shallow = element.CloneNode (false);
+			AssertNull ("This is not null", shallow.ParentNode);
+			Assert ("Copies, not pointers", !Object.ReferenceEquals (element,shallow));
+			AssertEquals ("Shallow clones shalt have no children!", false, shallow.HasChildNodes);
+		}
+
+		public void TestCreateElement1 ()
+		{
+			XmlElement element = document.CreateElement ("name");
+			AssertElement (element, String.Empty, "name", String.Empty, 0);
+		}
+
+		public void TestCreateElement1WithPrefix ()
+		{
+			XmlElement element = document.CreateElement ("prefix:localName");
+			AssertElement (element, "prefix", "localName", String.Empty, 0);
+		}
+
+		public void TestCreateElement2 ()
+		{
+			XmlElement element = document.CreateElement ("qualifiedName", "namespaceURI");
+			AssertElement (element, String.Empty, "qualifiedName",
+				       "namespaceURI", 0);
+		}
+
+		public void TestCreateElement2WithPrefix ()
+		{
+			XmlElement element = document.CreateElement ("prefix:localName", "namespaceURI");
+			AssertElement (element, "prefix", "localName", "namespaceURI", 0);
+		}
+
+		public void TestCreateElement3 ()
+		{
+			XmlElement element = document.CreateElement ("prefix", "localName", "namespaceURI");
+			AssertElement (element, "prefix", "localName", "namespaceURI", 0);
+		}
+
+		public void TestCreateElement3WithNullNamespace ()
+		{
+			// bug #26855, NamespaceURI should NEVER be null.
+			XmlElement element = document.CreateElement (null, "localName", null);
+			AssertElement (element, String.Empty, "localName", String.Empty, 0);
+		}
+
+		public void TestInnerAndOuterXml ()
+		{
+			XmlElement element;
+			XmlText text;
+			XmlComment comment;
+			
+			element = document.CreateElement ("foo");
+			AssertEquals (String.Empty, element.InnerXml);
+			AssertEquals ("<foo />", element.OuterXml);
+
+			text = document.CreateTextNode ("bar");
+			element.AppendChild (text);
+			AssertEquals ("bar", element.InnerXml);
+			AssertEquals ("<foo>bar</foo>", element.OuterXml);
+
+			element.SetAttribute ("baz", "quux");
+			AssertEquals ("bar", element.InnerXml);
+			AssertEquals ("<foo baz=\"quux\">bar</foo>", element.OuterXml);
+
+			comment = document.CreateComment ("squonk");
+			element.AppendChild (comment);
+			AssertEquals ("bar<!--squonk-->", element.InnerXml);
+			AssertEquals ("<foo baz=\"quux\">bar<!--squonk--></foo>", element.OuterXml);
+
+
+		}
+
+		public void TestSetGetAttribute ()
+		{
+			XmlElement element = document.CreateElement ("foo");
+			element.SetAttribute ("attr1", "val1");
+			element.SetAttribute ("attr2", "val2");
+			AssertEquals ("val1", element.GetAttribute ("attr1"));
+			AssertEquals ("val2", element.GetAttribute ("attr2"));
+		}
+
+		public void TestGetElementsByTagNameNoNameSpace ()
+		{
+			string xml = @"<library><book><title>XML Fun</title><author>John Doe</author>
+				<price>34.95</price></book><book><title>Bear and the Dragon</title>
+				<author>Tom Clancy</author><price>6.95</price></book><book>
+				<title>Bourne Identity</title><author>Robert Ludlum</author>
+				<price>9.95</price></book><Fluffer><Nutter><book>
+				<title>Bourne Ultimatum</title><author>Robert Ludlum</author>
+				<price>9.95</price></book></Nutter></Fluffer></library>";
+
+			MemoryStream memoryStream = new MemoryStream (Encoding.UTF8.GetBytes (xml));
+			document = new XmlDocument ();
+			document.Load (memoryStream);
+			XmlNodeList libraryList = document.GetElementsByTagName ("library");
+			XmlNode xmlNode = libraryList.Item (0);
+			XmlElement xmlElement = xmlNode as XmlElement;
+			XmlNodeList bookList = xmlElement.GetElementsByTagName ("book");
+			AssertEquals ("GetElementsByTagName (string) returned incorrect count.", 4, bookList.Count);
+		}
+
+		public void TestGetElementsByTagNameUsingNameSpace ()
+		{
+			StringBuilder xml = new StringBuilder ();
+			xml.Append ("<?xml version=\"1.0\" ?><library xmlns:North=\"http://www.foo.com\"");
+			xml.Append ("xmlns:South=\"http://www.goo.com\"><North:book type=\"non-fiction\"> ");
+			xml.Append ("<North:title type=\"intro\">XML Fun</North:title> " );
+			xml.Append ("<North:author>John Doe</North:author> " );
+			xml.Append ("<North:price>34.95</North:price></North:book> " );
+			xml.Append ("<South:book type=\"fiction\"> " );
+			xml.Append ("<South:title>Bear and the Dragon</South:title> " );
+			xml.Append ("<South:author>Tom Clancy</South:author> " );
+			xml.Append ("<South:price>6.95</South:price></South:book> " );
+			xml.Append ("<South:book type=\"fiction\"><South:title>Bourne Identity</South:title> " );
+			xml.Append ("<South:author>Robert Ludlum</South:author> " );
+			xml.Append ("<South:price>9.95</South:price></South:book></library>");
+
+			MemoryStream memoryStream = new MemoryStream (Encoding.UTF8.GetBytes (xml.ToString ()));
+			document = new XmlDocument ();
+			document.Load (memoryStream);
+			XmlNodeList libraryList = document.GetElementsByTagName ("library");
+			XmlNode xmlNode = libraryList.Item (0);
+			XmlElement xmlElement = xmlNode as XmlElement;
+			XmlNodeList bookList = xmlElement.GetElementsByTagName ("book", "http://www.foo.com");
+			AssertEquals ("GetElementsByTagName (string, uri) returned incorrect count.", 1, bookList.Count);
+		}
+
+		public void TestOuterXmlWithNamespace ()
+		{
+			XmlElement element = document.CreateElement ("foo", "bar", "#foo");
+			AssertEquals ("<foo:bar xmlns:foo=\"#foo\" />", element.OuterXml);
+		}		
+
+		public void TestRemoveAllAttributes ()
+		{
+			StringBuilder xml = new StringBuilder ();
+			xml.Append ("<?xml version=\"1.0\" ?><library><book type=\"non-fiction\" price=\"34.95\"> ");
+			xml.Append ("<title type=\"intro\">XML Fun</title> " );
+			xml.Append ("<author>John Doe</author></book></library>");
+
+			MemoryStream memoryStream = new MemoryStream (Encoding.UTF8.GetBytes (xml.ToString ()));
+			document = new XmlDocument ();
+			document.Load (memoryStream);
+			XmlNodeList bookList = document.GetElementsByTagName ("book");
+			XmlNode xmlNode = bookList.Item (0);
+			XmlElement xmlElement = xmlNode as XmlElement;
+			xmlElement.RemoveAllAttributes ();
+			AssertEquals ("attributes not properly removed.", false, xmlElement.HasAttribute ("type"));
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlNamespaceManagerTests.cs b/mcs/class/System.XML/Test/XmlNamespaceManagerTests.cs
new file mode 100644
index 00000000000..176c76765cb
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlNamespaceManagerTests.cs
@@ -0,0 +1,138 @@
+//
+// XmlNamespaceManagerTests.cs
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlNamespaceManagerTests : TestCase
+	{
+		public XmlNamespaceManagerTests () : base ("MonoTests.System.Xml.XmlNameSpaceManagerTests testsuite") { }
+		public XmlNamespaceManagerTests (string name) : base (name) { }
+
+		private XmlNameTable nameTable;
+		private XmlNamespaceManager namespaceManager;
+
+		protected override void SetUp ()
+		{
+			nameTable = new NameTable ();
+			namespaceManager = new XmlNamespaceManager (nameTable);
+		}
+
+		public void TestNewNamespaceManager ()
+		{
+			// make sure that you can call PopScope when there aren't any to pop.
+			Assert (!namespaceManager.PopScope ());
+
+			// the following strings should have been added to the name table by the
+			// namespace manager.
+			string xmlnsPrefix = nameTable.Get ("xmlns");
+			string xmlPrefix = nameTable.Get ("xml");
+			string stringEmpty = nameTable.Get (String.Empty);
+			string xmlnsNamespace = "http://www.w3.org/2000/xmlns/";
+			string xmlNamespace = "http://www.w3.org/XML/1998/namespace";
+
+			// none of them should be null.
+			AssertNotNull (xmlnsPrefix);
+			AssertNotNull (xmlPrefix);
+			AssertNotNull (stringEmpty);
+			AssertNotNull (xmlnsNamespace);
+			AssertNotNull (xmlNamespace);
+
+			// Microsoft's XmlNamespaceManager reports that these three
+			// namespaces aren't declared for some reason.
+			Assert (!namespaceManager.HasNamespace ("xmlns"));
+			Assert (!namespaceManager.HasNamespace ("xml"));
+			Assert (!namespaceManager.HasNamespace (String.Empty));
+
+			// these three namespaces are declared by default.
+			AssertEquals ("http://www.w3.org/2000/xmlns/", namespaceManager.LookupNamespace ("xmlns"));
+			AssertEquals ("http://www.w3.org/XML/1998/namespace", namespaceManager.LookupNamespace ("xml"));
+			AssertEquals (String.Empty, namespaceManager.LookupNamespace (String.Empty));
+
+			// the namespaces should be the same references found in the name table.
+			AssertSame (xmlnsNamespace, namespaceManager.LookupNamespace ("xmlns"));
+			AssertSame (xmlNamespace, namespaceManager.LookupNamespace ("xml"));
+			AssertSame (stringEmpty, namespaceManager.LookupNamespace (String.Empty));
+
+			// looking up undeclared namespaces should return null.
+			AssertNull (namespaceManager.LookupNamespace ("foo"));
+		}
+
+		public void TestAddNamespace ()
+		{
+			// add a new namespace.
+			namespaceManager.AddNamespace ("foo", "http://foo/");
+			// make sure the new namespace is there.
+			Assert (namespaceManager.HasNamespace ("foo"));
+			AssertEquals ("http://foo/", namespaceManager.LookupNamespace ("foo"));
+		}
+
+		public void TestAddNamespaceWithNameTable ()
+		{
+			// add a known reference to the name table.
+			string fooNamespace = "http://foo/";
+			nameTable.Add(fooNamespace);
+
+			// create a new string with the same value but different address.
+			string fooNamespace2 = "http://";
+			fooNamespace2 += "foo/";
+
+			// the references must be different in order for this test to prove anything.
+			Assert (!Object.ReferenceEquals (fooNamespace, fooNamespace2));
+
+			// add the namespace with the reference that's not in the name table.
+			namespaceManager.AddNamespace ("foo", fooNamespace2);
+
+			// the returned reference should be the same one that's in the name table.
+			AssertSame (fooNamespace, namespaceManager.LookupNamespace ("foo"));
+		}
+
+		public void TestPushScope ()
+		{
+			// add a new namespace.
+			namespaceManager.AddNamespace ("foo", "http://foo/");
+			// make sure the new namespace is there.
+			Assert (namespaceManager.HasNamespace ("foo"));
+			AssertEquals ("http://foo/", namespaceManager.LookupNamespace ("foo"));
+			// push a new scope.
+			namespaceManager.PushScope ();
+			// add a new namespace.
+			namespaceManager.AddNamespace ("bar", "http://bar/");
+			// make sure the old namespace is not in this new scope.
+			Assert (!namespaceManager.HasNamespace ("foo"));
+			// but we're still supposed to be able to lookup the old namespace.
+			AssertEquals ("http://foo/", namespaceManager.LookupNamespace ("foo"));
+			// make sure the new namespace is there.
+			Assert (namespaceManager.HasNamespace ("bar"));
+			AssertEquals ("http://bar/", namespaceManager.LookupNamespace ("bar"));
+		}
+
+		public void TestPopScope ()
+		{
+			// add some namespaces and a scope.
+			TestPushScope ();
+			// pop the scope.
+			Assert (namespaceManager.PopScope ());
+			// make sure the first namespace is still there.
+			Assert (namespaceManager.HasNamespace ("foo"));
+			AssertEquals ("http://foo/", namespaceManager.LookupNamespace ("foo"));
+			// make sure the second namespace is no longer there.
+			Assert (!namespaceManager.HasNamespace ("bar"));
+			AssertNull (namespaceManager.LookupNamespace ("bar"));
+			// make sure there are no more scopes to pop.
+			Assert (!namespaceManager.PopScope ());
+			// make sure that popping again doesn't cause an exception.
+			Assert (!namespaceManager.PopScope ());
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlNodeListTests.cs b/mcs/class/System.XML/Test/XmlNodeListTests.cs
new file mode 100644
index 00000000000..66279bb7664
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlNodeListTests.cs
@@ -0,0 +1,215 @@
+//
+// System.Xml.XmlTextWriterTests
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+using System.Xml;
+using System.Collections;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlNodeListTests : TestCase
+	{
+		public XmlNodeListTests () : base ("MonoTests.System.Xml.XmlNodeListTests testsuite") {}
+		public XmlNodeListTests (string name) : base (name) {}
+		
+		XmlDocument document;
+		XmlElement documentElement;
+		XmlElement element;
+		XmlNode node;
+		Object obj;
+		IEnumerator enumerator;
+		int index;
+		
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+		}
+
+		public void TestNodeTypesThatCantHaveChildren ()
+		{
+			document.LoadXml ("<foo>bar</foo>");
+			documentElement = document.DocumentElement;
+			node = documentElement.FirstChild;
+			AssertEquals ("Expected a text node.", node.NodeType, XmlNodeType.Text);
+			AssertEquals ("Shouldn't have children.", node.HasChildNodes, false);
+			AssertEquals ("Should be empty node list.", node.ChildNodes.Count, 0);
+			AssertEquals ("Should be empty node list.", node.GetEnumerator().MoveNext(), false);
+		}
+
+		public void TestZeroChildren ()
+		{
+			document.LoadXml ("<foo/>");
+			documentElement = document.DocumentElement;
+			AssertEquals ("Should be empty node list.", documentElement.GetEnumerator().MoveNext(), false);
+		}
+
+		public void TestOneChild ()
+		{
+			document.LoadXml ("<foo><child1/></foo>");
+			documentElement = document.DocumentElement;
+			AssertEquals ("Incorrect number of children returned from Count property.", documentElement.ChildNodes.Count, 1);
+			index = 1;
+			foreach (XmlNode childNode in documentElement.ChildNodes) 
+			{
+				AssertEquals ("Enumerator didn't return correct node.", "child" + index.ToString(), childNode.LocalName);
+				index++;
+			}
+			AssertEquals ("foreach didn't loop over all children correctly.", index, 2);
+		}
+
+		public void TestMultipleChildren ()
+		{
+			document.LoadXml ("<foo><child1/><child2/><child3/></foo>");
+			element = document.DocumentElement;
+			AssertEquals ("Incorrect number of children returned from Count property.", element.ChildNodes.Count, 3);
+			AssertNull ("Index less than zero should have returned null.", element.ChildNodes [-1]);
+			AssertNull ("Index greater than or equal to Count should have returned null.", element.ChildNodes [3]);
+			AssertEquals ("Didn't return the correct child.", element.FirstChild, element.ChildNodes[0]);
+			AssertEquals ("Didn't return the correct child.", "child1", element.ChildNodes[0].LocalName);
+			AssertEquals ("Didn't return the correct child.", "child2", element.ChildNodes[1].LocalName);
+			AssertEquals ("Didn't return the correct child.", "child3", element.ChildNodes[2].LocalName);
+
+			index = 1;
+			foreach (XmlNode childNode in element.ChildNodes) 
+			{
+				AssertEquals ("Enumerator didn't return correct node.", "child" + index.ToString(), childNode.LocalName);
+				index++;
+			}
+			AssertEquals ("foreach didn't loop over all children correctly.", index, 4);
+		}
+
+		public void TestAppendChildAffectOnEnumeration ()
+		{
+			document.LoadXml ("<foo><child1/></foo>");
+			element = document.DocumentElement;
+			enumerator = element.GetEnumerator();
+			AssertEquals ("MoveNext should have succeeded.", enumerator.MoveNext(), true);
+			AssertEquals ("MoveNext should have failed.", enumerator.MoveNext(), false);
+			enumerator.Reset();
+			AssertEquals ("MoveNext should have succeeded.", enumerator.MoveNext(), true);
+			element.AppendChild(document.CreateElement("child2"));
+			AssertEquals ("MoveNext should have succeeded.", enumerator.MoveNext(), true);
+			AssertEquals ("MoveNext should have failed.", enumerator.MoveNext(), false);
+		}
+
+		public void TestRemoveChildAffectOnEnumeration ()
+		{
+			document.LoadXml ("<foo><child1/><child2/></foo>");
+			element = document.DocumentElement;
+			enumerator = element.GetEnumerator();
+			element.RemoveChild(element.FirstChild);
+			enumerator.MoveNext();
+			AssertEquals ("Expected child2 element.", ((XmlElement)enumerator.Current).LocalName, "child2");
+		}
+
+		public void TestRemoveChildAffectOnEnumerationWhenEnumeratorIsOnRemovedChild ()
+		{
+			document.LoadXml ("<foo><child1/><child2/><child3/></foo>");
+			element = document.DocumentElement;
+			enumerator = element.GetEnumerator ();
+			enumerator.MoveNext ();
+			enumerator.MoveNext ();
+			AssertEquals ("Expected child2 element.", "child2", ((XmlElement)enumerator.Current).LocalName);
+			AssertEquals ("Expected child2 element.", "child2", element.FirstChild.NextSibling.LocalName);
+			element.RemoveChild (element.FirstChild.NextSibling);
+			enumerator.MoveNext ();
+			
+			try {
+				element = (XmlElement) enumerator.Current;
+				Fail ("Expected an InvalidOperationException.");
+			} catch (InvalidOperationException) { }
+		}
+
+		// TODO:  Take the word save off front of this method when XmlNode.ReplaceChild() is implemented.
+		public void saveTestReplaceChildAffectOnEnumeration ()
+		{
+			document.LoadXml ("<foo><child1/><child2/></foo>");
+			element = document.DocumentElement;
+			node = document.CreateElement("child3");
+			enumerator = element.GetEnumerator();
+			AssertEquals ("MoveNext should have succeeded.", enumerator.MoveNext(), true);
+			element.ReplaceChild(node, element.LastChild);
+			enumerator.MoveNext();
+			AssertEquals ("Expected child3 element.", ((XmlElement)enumerator.Current).LocalName, "child3");
+			AssertEquals ("MoveNext should have failed.", enumerator.MoveNext(), false);
+		}
+
+		public void TestRemoveOnlyChildAffectOnEnumeration ()
+		{
+			document.LoadXml ("<foo><child1/></foo>");
+			element = document.DocumentElement;
+			enumerator = element.GetEnumerator();
+			element.RemoveChild(element.FirstChild);
+			AssertEquals ("MoveNext should have failed.", enumerator.MoveNext(), false);
+		}
+
+		// TODO:  Take the word save off front of this method when XmlNode.RemoveAll() is fully implemented.
+		public void saveTestRemoveAllAffectOnEnumeration ()
+		{
+			document.LoadXml ("<foo><child1/><child2/><child3/></foo>");
+			element = document.DocumentElement;
+			enumerator = element.GetEnumerator();
+			AssertEquals ("Expected 3 children.", element.ChildNodes.Count, 3);
+			AssertEquals ("MoveNext should have succeeded.", enumerator.MoveNext(), true);
+			element.RemoveAll();
+			AssertEquals ("MoveNext should have failed.", enumerator.MoveNext(), false);
+		}
+
+		public void TestCurrentBeforeFirstNode ()
+		{
+			document.LoadXml ("<foo><child1/></foo>");
+			element = document.DocumentElement;
+			enumerator = element.GetEnumerator();
+			try 
+			{
+				obj = enumerator.Current;
+				Fail ("Calling Current property before first node in list should have thrown InvalidOperationException.");
+			} catch (InvalidOperationException) { }
+		}
+
+		public void TestCurrentAfterLastNode ()
+		{
+			document.LoadXml ("<foo><child1/></foo>");
+			element = document.DocumentElement;
+			enumerator = element.GetEnumerator();
+			enumerator.MoveNext();
+			enumerator.MoveNext();
+			try 
+			{
+				obj = enumerator.Current;
+				Fail ("Calling Current property after last node in list should have thrown InvalidOperationException.");
+			} 
+			catch (InvalidOperationException) { }
+		}
+
+		public void TestCurrentDoesntMove ()
+		{
+			document.LoadXml ("<foo><child1/></foo>");
+			element = document.DocumentElement;
+			enumerator = element.GetEnumerator();
+			enumerator.MoveNext();
+			AssertEquals("Consecutive calls to Current property should yield same reference.", Object.ReferenceEquals(enumerator.Current, enumerator.Current), true);
+		}
+
+		public void TestReset ()
+		{
+			document.LoadXml ("<foo><child1/><child2/></foo>");
+			element = document.DocumentElement;
+			enumerator = element.GetEnumerator();
+			enumerator.MoveNext();
+			enumerator.MoveNext();
+			AssertEquals("Expected child2.", ((XmlElement)enumerator.Current).LocalName, "child2");
+			enumerator.Reset();
+			enumerator.MoveNext();
+			AssertEquals("Expected child1.", ((XmlElement)enumerator.Current).LocalName, "child1");
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlNodeTests.cs b/mcs/class/System.XML/Test/XmlNodeTests.cs
new file mode 100644
index 00000000000..35f0f011d88
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlNodeTests.cs
@@ -0,0 +1,130 @@
+//
+// System.Xml.XmlNodeTests
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+using System.IO;
+using System.Text;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlNodeTests : TestCase
+	{
+		public XmlNodeTests () : base ("MonoTests.System.Xml.XmlNodeTests testsuite") {}
+		public XmlNodeTests (string name) : base (name) {}
+
+		XmlDocument document;
+		XmlElement element;
+		XmlElement element2;
+		bool inserted;
+		bool inserting;
+		bool removed;
+		bool removing;
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+			document.NodeInserted += new XmlNodeChangedEventHandler (this.EventNodeInserted);
+			document.NodeInserting += new XmlNodeChangedEventHandler (this.EventNodeInserting);
+			document.NodeRemoved += new XmlNodeChangedEventHandler (this.EventNodeRemoved);
+			document.NodeRemoving += new XmlNodeChangedEventHandler (this.EventNodeRemoving);
+			element = document.CreateElement ("foo");
+			element2 = document.CreateElement ("bar");
+		}
+
+		private void EventNodeInserted(Object sender, XmlNodeChangedEventArgs e)
+		{
+			inserted = true;
+		}
+
+		private void EventNodeInserting (Object sender, XmlNodeChangedEventArgs e)
+		{
+			inserting = true;
+		}
+
+		private void EventNodeRemoved(Object sender, XmlNodeChangedEventArgs e)
+		{
+			removed = true;
+		}
+
+		private void EventNodeRemoving (Object sender, XmlNodeChangedEventArgs e)
+		{
+			removing = true;
+		}
+
+		public void TestAppendChild ()
+		{
+			XmlComment comment;
+
+			inserted = false;
+			inserting = false;
+			element.AppendChild (element2);
+			Assert (inserted);
+			Assert (inserting);
+
+			// Can only append to elements, documents, and attributes
+			try 
+			{
+				comment = document.CreateComment ("baz");
+				comment.AppendChild (element2);
+				Fail ("Expected an InvalidOperationException to be thrown.");
+			} 
+			catch (InvalidOperationException) {}
+
+			// Can't append a node from one document into another document.
+			XmlDocument document2 = new XmlDocument();
+			AssertEquals (1, element.ChildNodes.Count);
+			try 
+			{
+				element2 = document2.CreateElement ("qux");
+				element.AppendChild (element2);
+				Fail ("Expected an ArgumentException to be thrown.");
+			} 
+			catch (ArgumentException) {}
+			AssertEquals (1, element.ChildNodes.Count);
+
+			// Can't append to a readonly node.
+/* TODO put this in when I figure out how to create a read-only node.
+			try 
+			{
+				XmlElement element3 = (XmlElement)element.CloneNode (false);
+				Assert (!element.IsReadOnly);
+				Assert (element3.IsReadOnly);
+				element2 = document.CreateElement ("quux");
+				element3.AppendChild (element2);
+				Fail ("Expected an ArgumentException to be thrown.");
+			} 
+			catch (ArgumentException) {}
+*/
+		}
+
+		public void saveTestRemoveAll ()
+		{
+			// TODO:  put this test back in when AttributeCollection.RemoveAll() is implemented.
+			element.AppendChild(element2);
+			removed = false;
+			removing = false;
+			element.RemoveAll ();
+			Assert (removed);
+			Assert (removing);
+		}
+
+		public void TestRemoveChild ()
+		{
+			element.AppendChild(element2);
+			removed = false;
+			removing = false;
+			element.RemoveChild (element2);
+			Assert (removed);
+			Assert (removing);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlProcessingInstructionTests.cs b/mcs/class/System.XML/Test/XmlProcessingInstructionTests.cs
new file mode 100644
index 00000000000..0926af316aa
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlProcessingInstructionTests.cs
@@ -0,0 +1,36 @@
+//
+// System.Xml.XmlTextWriterTests
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+using System.Xml;
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlProcessingInstructionTests : TestCase
+	{
+		public XmlProcessingInstructionTests () : base ("MonoTests.System.Xml.XmlProcessingInstructionTests testsuite") {}
+		public XmlProcessingInstructionTests (string name) : base (name) {}
+
+		XmlDocument document;
+		XmlProcessingInstruction pi;
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+		}
+
+		public void TestInnerAndOuterXml ()
+		{
+			pi = document.CreateProcessingInstruction ("foo", "bar");
+			AssertEquals (String.Empty, pi.InnerXml);
+			AssertEquals ("<?foo bar?>", pi.OuterXml);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlSignificantWhitespaceTests.cs b/mcs/class/System.XML/Test/XmlSignificantWhitespaceTests.cs
new file mode 100755
index 00000000000..adaef533a17
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlSignificantWhitespaceTests.cs
@@ -0,0 +1,117 @@
+//
+// System.Xml.XmlWhitespaceTests.cs
+//
+// Author:
+//	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlSignificantWhitespaceTests : TestCase
+	{
+		XmlDocument document;
+		XmlDocument doc2;
+		XmlSignificantWhitespace whitespace;
+		XmlSignificantWhitespace broken;
+		XmlNode original;
+		XmlNode deep;
+		XmlNode shallow;
+		
+		public XmlSignificantWhitespaceTests ()	: base ("MonoTests.System.Xml.XmlWhitespaceTests testsuite") {}
+		public XmlSignificantWhitespaceTests (string name) : base (name) {}
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+			document.LoadXml ("<root><foo></foo></root>");
+			XmlElement element = document.CreateElement ("foo");
+			whitespace = document.CreateSignificantWhitespace ("\r\n");
+			element.AppendChild (whitespace);
+
+			doc2 = new XmlDocument ();
+		}
+
+		public void TestInnerAndOuterXml ()
+		{
+			whitespace = doc2.CreateSignificantWhitespace ("\r\n\t ");
+			AssertEquals (String.Empty, whitespace.InnerXml);
+			AssertEquals ("\r\n\t ", whitespace.OuterXml);
+		}
+			
+		internal void TestXmlNodeBaseProperties (XmlNode original, XmlNode cloned)
+		{
+//			assertequals (original.nodetype + " was incorrectly cloned.",
+//				      original.baseuri, cloned.baseuri);			
+			AssertNull (cloned.ParentNode);
+			AssertEquals ("Value incorrectly cloned",
+				       cloned.Value, original.Value);
+			
+                        Assert ("Copies, not pointers", !Object.ReferenceEquals (original,cloned));
+		}
+
+		public void TestXmlSignificantWhitespaceBadConstructor ()
+		{
+			try {
+				broken = document.CreateSignificantWhitespace ("black");				
+
+			} catch (ArgumentException) {
+				return;
+
+			} catch (Exception) {
+				Fail ("Incorrect Exception thrown.");
+			}
+		}
+
+		public void TestXmlSignificantWhitespaceConstructor ()
+		{
+			AssertEquals ("whitespace char didn't get copied right",
+				      "\r\n", whitespace.Data);
+		}
+		
+	       
+		public void TestXmlSignificantWhitespaceName ()
+		{
+			AssertEquals (whitespace.NodeType + " Name property broken",
+				      whitespace.Name, "#significant-whitespace");
+		}
+
+		public void TestXmlSignificantWhitespaceLocalName ()
+		{
+			AssertEquals (whitespace.NodeType + " LocalName property broken",
+				      whitespace.LocalName, "#significant-whitespace");
+		}
+
+		public void TestXmlSignificantWhitespaceNodeType ()
+		{
+			AssertEquals ("XmlSignificantWhitespace NodeType property broken",
+				      whitespace.NodeType.ToString (), "SignificantWhitespace");
+		}
+
+		public void TestXmlSignificantWhitespaceIsReadOnly ()
+		{
+			AssertEquals ("XmlSignificantWhitespace IsReadOnly property broken",
+				      whitespace.IsReadOnly, false);
+		}
+
+		public void TestXmlSignificantWhitespaceCloneNode ()
+		{
+			original = whitespace;
+
+			shallow = whitespace.CloneNode (false); // shallow
+			TestXmlNodeBaseProperties (original, shallow);
+						
+			deep = whitespace.CloneNode (true); // deep
+			TestXmlNodeBaseProperties (original, deep); 
+
+                        AssertEquals ("deep cloning differs from shallow cloning",
+				      deep.OuterXml, shallow.OuterXml);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlTextReaderTests.cs b/mcs/class/System.XML/Test/XmlTextReaderTests.cs
new file mode 100644
index 00000000000..fbc69aa7b91
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlTextReaderTests.cs
@@ -0,0 +1,1785 @@
+//
+// XmlTextReaderTests.cs
+//
+// Author:
+//   Jason Diamond (jason@injektilo.org)
+//
+// (C) 2001, 2002 Jason Diamond  http://injektilo.org/
+//
+
+using System;
+using System.IO;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlTextReaderTests : TestCase
+	{
+		public XmlTextReaderTests () : base ("MonoTests.System.Xml.XmlTextReaderTests testsuite") { }
+		public XmlTextReaderTests (string name) : base (name) { }
+
+		private void AssertStartDocument (XmlReader xmlReader)
+		{
+			Assert (xmlReader.ReadState == ReadState.Initial);
+			Assert (xmlReader.NodeType == XmlNodeType.None);
+			Assert (xmlReader.Depth == 0);
+			Assert (!xmlReader.EOF);
+		}
+
+		private void AssertNode (
+			XmlReader xmlReader,
+			XmlNodeType nodeType,
+			int depth,
+			bool isEmptyElement,
+			string name,
+			string prefix,
+			string localName,
+			string namespaceURI,
+			string value,
+			int attributeCount)
+		{
+			Assert (xmlReader.Read ());
+			Assert (xmlReader.ReadState == ReadState.Interactive);
+			Assert (!xmlReader.EOF);
+		}
+
+		private void AssertNodeValues (
+			XmlReader xmlReader,
+			XmlNodeType nodeType,
+			int depth,
+			bool isEmptyElement,
+			string name,
+			string prefix,
+			string localName,
+			string namespaceURI,
+			string value,
+			int attributeCount)
+		{
+			Assert (xmlReader.NodeType == nodeType);
+			Assert (xmlReader.Depth == depth);
+			Assert (xmlReader.IsEmptyElement == isEmptyElement);
+
+			Assert (
+				String.Format (
+					"name was {0}, expected {1}",
+					xmlReader.Name,
+					name),
+				xmlReader.Name == name);
+
+			Assert (
+				String.Format (
+					"prefix was {0}, expected {1}",
+					xmlReader.Prefix,
+					prefix),
+				xmlReader.Prefix == prefix);
+
+			Assert (
+				String.Format (
+					"localName was {0}, expected {1}",
+					xmlReader.LocalName,
+					localName),
+				xmlReader.LocalName == localName);
+
+			Assert (
+				String.Format (
+					"namespaceURI was {0}, expected {1}",
+					xmlReader.NamespaceURI,
+					namespaceURI),
+				xmlReader.NamespaceURI == namespaceURI);
+
+			Assert (
+				String.Format (
+					"hasValue was {0}, expected {1}",
+					xmlReader.HasValue,
+					(value != String.Empty)),				
+				xmlReader.HasValue == (value != String.Empty));
+
+			Assert (
+				String.Format (
+					"value was {0}, expected {1}",
+					xmlReader.Value,
+					value),
+				xmlReader.Value == value);
+
+			Assert (
+				String.Format (
+					"hasAttributes was {0}, expected {1}",
+					xmlReader.HasAttributes,
+					(attributeCount > 0)),
+				xmlReader.HasAttributes == (attributeCount > 0));
+
+			Assert (
+				String.Format (
+					"attributeCount was {0}, expected {1}",
+					xmlReader.AttributeCount,
+					attributeCount),
+				xmlReader.AttributeCount == attributeCount);
+		}
+
+		private void AssertAttribute (
+			XmlReader xmlReader,
+			string name,
+			string prefix,
+			string localName,
+			string namespaceURI,
+			string value)
+		{
+			Assert (
+				String.Format (
+					"value was {0}, expected {1}",
+					xmlReader[name],
+					value),
+				xmlReader[name] == value);
+
+			Assert (xmlReader.GetAttribute (name) == value);
+
+			if (namespaceURI != String.Empty) {
+				Assert (xmlReader[localName, namespaceURI] == value);
+				Assert (xmlReader.GetAttribute (localName, namespaceURI) == value);
+			}
+		}
+
+		private void AssertEndDocument (XmlReader xmlReader)
+		{
+			Assert (!xmlReader.Read ());
+			Assert (xmlReader.NodeType == XmlNodeType.None);
+			Assert (xmlReader.Depth == 0);
+			Assert (xmlReader.ReadState == ReadState.EndOfFile);
+			Assert (xmlReader.EOF);
+
+			xmlReader.Close ();
+			Assert (xmlReader.ReadState == ReadState.Closed);
+		}
+
+		public void TestEmptyElement ()
+		{
+			string xml = "<foo/>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, // depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestEmptyElementWithBadName ()
+		{
+			string xml = "<1foo/>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			bool caughtXmlException = false;
+
+			try {
+				xmlReader.Read();
+			} catch (XmlException) {
+				caughtXmlException = true;
+			}
+
+			Assert(caughtXmlException);
+		}
+
+		public void TestEmptyElementWithWhitespace ()
+		{
+			string xml = "<foo />";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestEmptyElementWithStartAndEndTag ()
+		{
+			string xml = "<foo></foo>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestEmptyElementWithStartAndEndTagWithWhitespace ()
+		{
+			string xml = "<foo ></foo >";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestNestedEmptyTag ()
+		{
+			string xml = "<foo><bar/></foo>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				1, //depth
+				true, // isEmptyElement
+				"bar", // name
+				String.Empty, // prefix
+				"bar", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestNestedText ()
+		{
+			string xml = "<foo>bar</foo>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Text, // nodeType
+				1, //depth
+				false, // isEmptyElement
+				String.Empty, // name
+				String.Empty, // prefix
+				String.Empty, // localName
+				String.Empty, // namespaceURI
+				"bar", // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestEmptyElementWithAttribute ()
+		{
+			string xml = @"<foo bar=""baz""/>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"bar", // name
+				String.Empty, // prefix
+				"bar", // localName
+				String.Empty, // namespaceURI
+				"baz" // value
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestStartAndEndTagWithAttribute ()
+		{
+			string xml = @"<foo bar='baz'></foo>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"bar", // name
+				String.Empty, // prefix
+				"bar", // localName
+				String.Empty, // namespaceURI
+				"baz" // value
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestEmptyElementWithTwoAttributes ()
+		{
+			string xml = @"<foo bar=""baz"" quux='quuux'/>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				2 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"bar", // name
+				String.Empty, // prefix
+				"bar", // localName
+				String.Empty, // namespaceURI
+				"baz" // value
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"quux", // name
+				String.Empty, // prefix
+				"quux", // localName
+				String.Empty, // namespaceURI
+				"quuux" // value
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestProcessingInstructionBeforeDocumentElement ()
+		{
+			string xml = "<?foo bar?><baz/>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.ProcessingInstruction, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				"bar", // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				true, // isEmptyElement
+				"baz", // name
+				String.Empty, // prefix
+				"baz", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestCommentBeforeDocumentElement ()
+		{
+			string xml = "<!--foo--><bar/>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Comment, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				String.Empty, // name
+				String.Empty, // prefix
+				String.Empty, // localName
+				String.Empty, // namespaceURI
+				"foo", // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				true, // isEmptyElement
+				"bar", // name
+				String.Empty, // prefix
+				"bar", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestPredefinedEntities ()
+		{
+			string xml = "<foo>&lt;&gt;&amp;&apos;&quot;</foo>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Text, // nodeType
+				1, //depth
+				false, // isEmptyElement
+				String.Empty, // name
+				String.Empty, // prefix
+				String.Empty, // localName
+				String.Empty, // namespaceURI
+				"<>&'\"", // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestEntityReference ()
+		{
+			string xml = "<foo>&bar;</foo>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EntityReference, // nodeType
+				1, //depth
+				false, // isEmptyElement
+				"bar", // name
+				String.Empty, // prefix
+				"bar", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestEntityReferenceInsideText ()
+		{
+			string xml = "<foo>bar&baz;quux</foo>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Text, // nodeType
+				1, //depth
+				false, // isEmptyElement
+				String.Empty, // name
+				String.Empty, // prefix
+				String.Empty, // localName
+				String.Empty, // namespaceURI
+				"bar", // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EntityReference, // nodeType
+				1, //depth
+				false, // isEmptyElement
+				"baz", // name
+				String.Empty, // prefix
+				"baz", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Text, // nodeType
+				1, //depth
+				false, // isEmptyElement
+				String.Empty, // name
+				String.Empty, // prefix
+				String.Empty, // localName
+				String.Empty, // namespaceURI
+				"quux", // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestCharacterReferences ()
+		{
+			string xml = "<foo>&#70;&#x4F;&#x4f;</foo>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Text, // nodeType
+				1, //depth
+				false, // isEmptyElement
+				String.Empty, // name
+				String.Empty, // prefix
+				String.Empty, // localName
+				String.Empty, // namespaceURI
+				"FOO", // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestEntityReferenceInAttribute ()
+		{
+			string xml = "<foo bar='&baz;'/>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"bar", // name
+				String.Empty, // prefix
+				"bar", // localName
+				String.Empty, // namespaceURI
+				"&baz;" // value
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestPredefinedEntitiesInAttribute ()
+		{
+			string xml = "<foo bar='&lt;&gt;&amp;&apos;&quot;'/>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"bar", // name
+				String.Empty, // prefix
+				"bar", // localName
+				String.Empty, // namespaceURI
+				"<>&'\"" // value
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestCharacterReferencesInAttribute ()
+		{
+			string xml = "<foo bar='&#70;&#x4F;&#x4f;'/>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"bar", // name
+				String.Empty, // prefix
+				"bar", // localName
+				String.Empty, // namespaceURI
+				"FOO" // value
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestCDATA ()
+		{
+			string xml = "<foo><![CDATA[<>&]]></foo>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.CDATA, // nodeType
+				1, //depth
+				false, // isEmptyElement
+				String.Empty, // name
+				String.Empty, // prefix
+				String.Empty, // localName
+				String.Empty, // namespaceURI
+				"<>&", // value
+				0 // attributeCount
+			);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, //depth
+				false, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestEmptyElementInNamespace ()
+		{
+			string xml = @"<foo:bar xmlns:foo='http://foo/' />";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, // depth
+				true, // isEmptyElement
+				"foo:bar", // name
+				"foo", // prefix
+				"bar", // localName
+				"http://foo/", // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"xmlns:foo", // name
+				"xmlns", // prefix
+				"foo", // localName
+				"http://www.w3.org/2000/xmlns/", // namespaceURI
+				"http://foo/" // value
+			);
+
+			AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestEmptyElementInDefaultNamespace ()
+		{
+			string xml = @"<foo xmlns='http://foo/' />";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, // depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				"http://foo/", // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"xmlns", // name
+				String.Empty, // prefix
+				"xmlns", // localName
+				"http://www.w3.org/2000/xmlns/", // namespaceURI
+				"http://foo/" // value
+			);
+
+			AssertEquals ("http://foo/", xmlReader.LookupNamespace (String.Empty));
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestChildElementInNamespace ()
+		{
+			string xml = @"<foo:bar xmlns:foo='http://foo/'><baz:quux xmlns:baz='http://baz/' /></foo:bar>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, // depth
+				false, // isEmptyElement
+				"foo:bar", // name
+				"foo", // prefix
+				"bar", // localName
+				"http://foo/", // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"xmlns:foo", // name
+				"xmlns", // prefix
+				"foo", // localName
+				"http://www.w3.org/2000/xmlns/", // namespaceURI
+				"http://foo/" // value
+			);
+
+			AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				1, // depth
+				true, // isEmptyElement
+				"baz:quux", // name
+				"baz", // prefix
+				"quux", // localName
+				"http://baz/", // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"xmlns:baz", // name
+				"xmlns", // prefix
+				"baz", // localName
+				"http://www.w3.org/2000/xmlns/", // namespaceURI
+				"http://baz/" // value
+			);
+
+			AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));
+			AssertEquals ("http://baz/", xmlReader.LookupNamespace ("baz"));
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, // depth
+				false, // isEmptyElement
+				"foo:bar", // name
+				"foo", // prefix
+				"bar", // localName
+				"http://foo/", // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));
+			AssertNull (xmlReader.LookupNamespace ("baz"));
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestChildElementInDefaultNamespace ()
+		{
+			string xml = @"<foo:bar xmlns:foo='http://foo/'><baz xmlns='http://baz/' /></foo:bar>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, // depth
+				false, // isEmptyElement
+				"foo:bar", // name
+				"foo", // prefix
+				"bar", // localName
+				"http://foo/", // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"xmlns:foo", // name
+				"xmlns", // prefix
+				"foo", // localName
+				"http://www.w3.org/2000/xmlns/", // namespaceURI
+				"http://foo/" // value
+			);
+
+			AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				1, // depth
+				true, // isEmptyElement
+				"baz", // name
+				String.Empty, // prefix
+				"baz", // localName
+				"http://baz/", // namespaceURI
+				String.Empty, // value
+				1 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"xmlns", // name
+				String.Empty, // prefix
+				"xmlns", // localName
+				"http://www.w3.org/2000/xmlns/", // namespaceURI
+				"http://baz/" // value
+			);
+
+			AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));
+			AssertEquals ("http://baz/", xmlReader.LookupNamespace (String.Empty));
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.EndElement, // nodeType
+				0, // depth
+				false, // isEmptyElement
+				"foo:bar", // name
+				"foo", // prefix
+				"bar", // localName
+				"http://foo/", // namespaceURI
+				String.Empty, // value
+				0 // attributeCount
+			);
+
+			AssertEquals ("http://foo/", xmlReader.LookupNamespace ("foo"));
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestAttributeInNamespace ()
+		{
+			string xml = @"<foo bar:baz='quux' xmlns:bar='http://bar/' />";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, // depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				2 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"bar:baz", // name
+				"bar", // prefix
+				"baz", // localName
+				"http://bar/", // namespaceURI
+				"quux" // value
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"xmlns:bar", // name
+				"xmlns", // prefix
+				"bar", // localName
+				"http://www.w3.org/2000/xmlns/", // namespaceURI
+				"http://bar/" // value
+			);
+
+			AssertEquals ("http://bar/", xmlReader.LookupNamespace ("bar"));
+
+			AssertEndDocument (xmlReader);
+		}
+
+// The following is #if'ed out because it's specific to the Mono
+// implementation and won't compile when testing Microsoft's code.
+// Feel free to turn it on if you want to test Mono's name tables.
+
+#if false
+
+		public void TestIsFirstNameChar ()
+		{
+			for (int ch = 0; ch <= 0xFFFF; ++ch) {
+				Assert (
+					XmlChar.IsFirstNameChar (ch) ==
+						IsFirstNameChar (ch));
+			}
+		}
+
+		public void TestIsNameChar ()
+		{
+			for (int ch = 0; ch <= 0xFFFF; ++ch) {
+				Assert (
+					XmlChar.IsNameChar (ch) ==
+						IsNameChar (ch));
+			}
+		}
+
+		private static bool IsFirstNameChar (int ch)
+		{
+			return
+				IsLetter (ch) ||
+				(ch == '_') ||
+				(ch == ':');
+		}
+
+		private static bool IsNameChar (int ch)
+		{
+			return
+				IsLetter (ch) ||
+				IsDigit (ch) ||
+				(ch == '.') ||
+				(ch == '-') ||
+				(ch == '_') ||
+				(ch == ':') ||
+				IsCombiningChar (ch) ||
+				IsExtender (ch);
+		}
+
+		private static bool IsLetter (int ch)
+		{
+			return
+				IsBaseChar (ch) ||
+				IsIdeographic (ch);
+		}
+
+		private static bool IsBaseChar (int ch)
+		{
+			return
+				(ch >= 0x0041 && ch <= 0x005A) ||
+				(ch >= 0x0061 && ch <= 0x007A) ||
+				(ch >= 0x00C0 && ch <= 0x00D6) ||
+				(ch >= 0x00D8 && ch <= 0x00F6) ||
+				(ch >= 0x00F8 && ch <= 0x00FF) ||
+				(ch >= 0x0100 && ch <= 0x0131) ||
+				(ch >= 0x0134 && ch <= 0x013E) ||
+				(ch >= 0x0141 && ch <= 0x0148) ||
+				(ch >= 0x014A && ch <= 0x017E) ||
+				(ch >= 0x0180 && ch <= 0x01C3) ||
+				(ch >= 0x01CD && ch <= 0x01F0) ||
+				(ch >= 0x01F4 && ch <= 0x01F5) ||
+				(ch >= 0x01FA && ch <= 0x0217) ||
+				(ch >= 0x0250 && ch <= 0x02A8) ||
+				(ch >= 0x02BB && ch <= 0x02C1) ||
+				(ch == 0x0386) ||
+				(ch >= 0x0388 && ch <= 0x038A) ||
+				(ch == 0x038C) ||
+				(ch >= 0x038E && ch <= 0x03A1) ||
+				(ch >= 0x03A3 && ch <= 0x03CE) ||
+				(ch >= 0x03D0 && ch <= 0x03D6) ||
+				(ch == 0x03DA) ||
+				(ch == 0x03DC) ||
+				(ch == 0x03DE) ||
+				(ch == 0x03E0) ||
+				(ch >= 0x03E2 && ch <= 0x03F3) ||
+				(ch >= 0x0401 && ch <= 0x040C) ||
+				(ch >= 0x040E && ch <= 0x044F) ||
+				(ch >= 0x0451 && ch <= 0x045C) ||
+				(ch >= 0x045E && ch <= 0x0481) ||
+				(ch >= 0x0490 && ch <= 0x04C4) ||
+				(ch >= 0x04C7 && ch <= 0x04C8) ||
+				(ch >= 0x04CB && ch <= 0x04CC) ||
+				(ch >= 0x04D0 && ch <= 0x04EB) ||
+				(ch >= 0x04EE && ch <= 0x04F5) ||
+				(ch >= 0x04F8 && ch <= 0x04F9) ||
+				(ch >= 0x0531 && ch <= 0x0556) ||
+				(ch == 0x0559) ||
+				(ch >= 0x0561 && ch <= 0x0586) ||
+				(ch >= 0x05D0 && ch <= 0x05EA) ||
+				(ch >= 0x05F0 && ch <= 0x05F2) ||
+				(ch >= 0x0621 && ch <= 0x063A) ||
+				(ch >= 0x0641 && ch <= 0x064A) ||
+				(ch >= 0x0671 && ch <= 0x06B7) ||
+				(ch >= 0x06BA && ch <= 0x06BE) ||
+				(ch >= 0x06C0 && ch <= 0x06CE) ||
+				(ch >= 0x06D0 && ch <= 0x06D3) ||
+				(ch == 0x06D5) ||
+				(ch >= 0x06E5 && ch <= 0x06E6) ||
+				(ch >= 0x0905 && ch <= 0x0939) ||
+				(ch == 0x093D) ||
+				(ch >= 0x0958 && ch <= 0x0961) ||
+				(ch >= 0x0985 && ch <= 0x098C) ||
+				(ch >= 0x098F && ch <= 0x0990) ||
+				(ch >= 0x0993 && ch <= 0x09A8) ||
+				(ch >= 0x09AA && ch <= 0x09B0) ||
+				(ch == 0x09B2) ||
+				(ch >= 0x09B6 && ch <= 0x09B9) ||
+				(ch >= 0x09DC && ch <= 0x09DD) ||
+				(ch >= 0x09DF && ch <= 0x09E1) ||
+				(ch >= 0x09F0 && ch <= 0x09F1) ||
+				(ch >= 0x0A05 && ch <= 0x0A0A) ||
+				(ch >= 0x0A0F && ch <= 0x0A10) ||
+				(ch >= 0x0A13 && ch <= 0x0A28) ||
+				(ch >= 0x0A2A && ch <= 0x0A30) ||
+				(ch >= 0x0A32 && ch <= 0x0A33) ||
+				(ch >= 0x0A35 && ch <= 0x0A36) ||
+				(ch >= 0x0A38 && ch <= 0x0A39) ||
+				(ch >= 0x0A59 && ch <= 0x0A5C) ||
+				(ch == 0x0A5E) ||
+				(ch >= 0x0A72 && ch <= 0x0A74) ||
+				(ch >= 0x0A85 && ch <= 0x0A8B) ||
+				(ch == 0x0A8D) ||
+				(ch >= 0x0A8F && ch <= 0x0A91) ||
+				(ch >= 0x0A93 && ch <= 0x0AA8) ||
+				(ch >= 0x0AAA && ch <= 0x0AB0) ||
+				(ch >= 0x0AB2 && ch <= 0x0AB3) ||
+				(ch >= 0x0AB5 && ch <= 0x0AB9) ||
+				(ch == 0x0ABD) ||
+				(ch == 0x0AE0) ||
+				(ch >= 0x0B05 && ch <= 0x0B0C) ||
+				(ch >= 0x0B0F && ch <= 0x0B10) ||
+				(ch >= 0x0B13 && ch <= 0x0B28) ||
+				(ch >= 0x0B2A && ch <= 0x0B30) ||
+				(ch >= 0x0B32 && ch <= 0x0B33) ||
+				(ch >= 0x0B36 && ch <= 0x0B39) ||
+				(ch == 0x0B3D) ||
+				(ch >= 0x0B5C && ch <= 0x0B5D) ||
+				(ch >= 0x0B5F && ch <= 0x0B61) ||
+				(ch >= 0x0B85 && ch <= 0x0B8A) ||
+				(ch >= 0x0B8E && ch <= 0x0B90) ||
+				(ch >= 0x0B92 && ch <= 0x0B95) ||
+				(ch >= 0x0B99 && ch <= 0x0B9A) ||
+				(ch == 0x0B9C) ||
+				(ch >= 0x0B9E && ch <= 0x0B9F) ||
+				(ch >= 0x0BA3 && ch <= 0x0BA4) ||
+				(ch >= 0x0BA8 && ch <= 0x0BAA) ||
+				(ch >= 0x0BAE && ch <= 0x0BB5) ||
+				(ch >= 0x0BB7 && ch <= 0x0BB9) ||
+				(ch >= 0x0C05 && ch <= 0x0C0C) ||
+				(ch >= 0x0C0E && ch <= 0x0C10) ||
+				(ch >= 0x0C12 && ch <= 0x0C28) ||
+				(ch >= 0x0C2A && ch <= 0x0C33) ||
+				(ch >= 0x0C35 && ch <= 0x0C39) ||
+				(ch >= 0x0C60 && ch <= 0x0C61) ||
+				(ch >= 0x0C85 && ch <= 0x0C8C) ||
+				(ch >= 0x0C8E && ch <= 0x0C90) ||
+				(ch >= 0x0C92 && ch <= 0x0CA8) ||
+				(ch >= 0x0CAA && ch <= 0x0CB3) ||
+				(ch >= 0x0CB5 && ch <= 0x0CB9) ||
+				(ch == 0x0CDE) ||
+				(ch >= 0x0CE0 && ch <= 0x0CE1) ||
+				(ch >= 0x0D05 && ch <= 0x0D0C) ||
+				(ch >= 0x0D0E && ch <= 0x0D10) ||
+				(ch >= 0x0D12 && ch <= 0x0D28) ||
+				(ch >= 0x0D2A && ch <= 0x0D39) ||
+				(ch >= 0x0D60 && ch <= 0x0D61) ||
+				(ch >= 0x0E01 && ch <= 0x0E2E) ||
+				(ch == 0x0E30) ||
+				(ch >= 0x0E32 && ch <= 0x0E33) ||
+				(ch >= 0x0E40 && ch <= 0x0E45) ||
+				(ch >= 0x0E81 && ch <= 0x0E82) ||
+				(ch == 0x0E84) ||
+				(ch >= 0x0E87 && ch <= 0x0E88) ||
+				(ch == 0x0E8A) ||
+				(ch == 0x0E8D) ||
+				(ch >= 0x0E94 && ch <= 0x0E97) ||
+				(ch >= 0x0E99 && ch <= 0x0E9F) ||
+				(ch >= 0x0EA1 && ch <= 0x0EA3) ||
+				(ch == 0x0EA5) ||
+				(ch == 0x0EA7) ||
+				(ch >= 0x0EAA && ch <= 0x0EAB) ||
+				(ch >= 0x0EAD && ch <= 0x0EAE) ||
+				(ch == 0x0EB0) ||
+				(ch >= 0x0EB2 && ch <= 0x0EB3) ||
+				(ch == 0x0EBD) ||
+				(ch >= 0x0EC0 && ch <= 0x0EC4) ||
+				(ch >= 0x0F40 && ch <= 0x0F47) ||
+				(ch >= 0x0F49 && ch <= 0x0F69) ||
+				(ch >= 0x10A0 && ch <= 0x10C5) ||
+				(ch >= 0x10D0 && ch <= 0x10F6) ||
+				(ch == 0x1100) ||
+				(ch >= 0x1102 && ch <= 0x1103) ||
+				(ch >= 0x1105 && ch <= 0x1107) ||
+				(ch == 0x1109) ||
+				(ch >= 0x110B && ch <= 0x110C) ||
+				(ch >= 0x110E && ch <= 0x1112) ||
+				(ch == 0x113C) ||
+				(ch == 0x113E) ||
+				(ch == 0x1140) ||
+				(ch == 0x114C) ||
+				(ch == 0x114E) ||
+				(ch == 0x1150) ||
+				(ch >= 0x1154 && ch <= 0x1155) ||
+				(ch == 0x1159) ||
+				(ch >= 0x115F && ch <= 0x1161) ||
+				(ch == 0x1163) ||
+				(ch == 0x1165) ||
+				(ch == 0x1167) ||
+				(ch == 0x1169) ||
+				(ch >= 0x116D && ch <= 0x116E) ||
+				(ch >= 0x1172 && ch <= 0x1173) ||
+				(ch == 0x1175) ||
+				(ch == 0x119E) ||
+				(ch == 0x11A8) ||
+				(ch == 0x11AB) ||
+				(ch >= 0x11AE && ch <= 0x11AF) ||
+				(ch >= 0x11B7 && ch <= 0x11B8) ||
+				(ch == 0x11BA) ||
+				(ch >= 0x11BC && ch <= 0x11C2) ||
+				(ch == 0x11EB) ||
+				(ch == 0x11F0) ||
+				(ch == 0x11F9) ||
+				(ch >= 0x1E00 && ch <= 0x1E9B) ||
+				(ch >= 0x1EA0 && ch <= 0x1EF9) ||
+				(ch >= 0x1F00 && ch <= 0x1F15) ||
+				(ch >= 0x1F18 && ch <= 0x1F1D) ||
+				(ch >= 0x1F20 && ch <= 0x1F45) ||
+				(ch >= 0x1F48 && ch <= 0x1F4D) ||
+				(ch >= 0x1F50 && ch <= 0x1F57) ||
+				(ch == 0x1F59) ||
+				(ch == 0x1F5B) ||
+				(ch == 0x1F5D) ||
+				(ch >= 0x1F5F && ch <= 0x1F7D) ||
+				(ch >= 0x1F80 && ch <= 0x1FB4) ||
+				(ch >= 0x1FB6 && ch <= 0x1FBC) ||
+				(ch == 0x1FBE) ||
+				(ch >= 0x1FC2 && ch <= 0x1FC4) ||
+				(ch >= 0x1FC6 && ch <= 0x1FCC) ||
+				(ch >= 0x1FD0 && ch <= 0x1FD3) ||
+				(ch >= 0x1FD6 && ch <= 0x1FDB) ||
+				(ch >= 0x1FE0 && ch <= 0x1FEC) ||
+				(ch >= 0x1FF2 && ch <= 0x1FF4) ||
+				(ch >= 0x1FF6 && ch <= 0x1FFC) ||
+				(ch == 0x2126) ||
+				(ch >= 0x212A && ch <= 0x212B) ||
+				(ch == 0x212E) ||
+				(ch >= 0x2180 && ch <= 0x2182) ||
+				(ch >= 0x3041 && ch <= 0x3094) ||
+				(ch >= 0x30A1 && ch <= 0x30FA) ||
+				(ch >= 0x3105 && ch <= 0x312C) ||
+				(ch >= 0xAC00 && ch <= 0xD7A3);
+		}
+
+		private static bool IsIdeographic (int ch)
+		{
+			return
+				(ch >= 0x4E00 && ch <= 0x9FA5) ||
+				(ch == 0x3007) ||
+				(ch >= 0x3021 && ch <= 0x3029);
+		}
+
+		private static bool IsDigit (int ch)
+		{
+			return
+				(ch >= 0x0030 && ch <= 0x0039) ||
+				(ch >= 0x0660 && ch <= 0x0669) ||
+				(ch >= 0x06F0 && ch <= 0x06F9) ||
+				(ch >= 0x0966 && ch <= 0x096F) ||
+				(ch >= 0x09E6 && ch <= 0x09EF) ||
+				(ch >= 0x0A66 && ch <= 0x0A6F) ||
+				(ch >= 0x0AE6 && ch <= 0x0AEF) ||
+				(ch >= 0x0B66 && ch <= 0x0B6F) ||
+				(ch >= 0x0BE7 && ch <= 0x0BEF) ||
+				(ch >= 0x0C66 && ch <= 0x0C6F) ||
+				(ch >= 0x0CE6 && ch <= 0x0CEF) ||
+				(ch >= 0x0D66 && ch <= 0x0D6F) ||
+				(ch >= 0x0E50 && ch <= 0x0E59) ||
+				(ch >= 0x0ED0 && ch <= 0x0ED9) ||
+				(ch >= 0x0F20 && ch <= 0x0F29);
+		}
+
+		private static bool IsCombiningChar (int ch)
+		{
+			return
+				(ch >= 0x0300 && ch <= 0x0345) ||
+				(ch >= 0x0360 && ch <= 0x0361) ||
+				(ch >= 0x0483 && ch <= 0x0486) ||
+				(ch >= 0x0591 && ch <= 0x05A1) ||
+				(ch >= 0x05A3 && ch <= 0x05B9) ||
+				(ch >= 0x05BB && ch <= 0x05BD) ||
+				(ch == 0x05BF) ||
+				(ch >= 0x05C1 && ch <= 0x05C2) ||
+				(ch == 0x05C4) ||
+				(ch >= 0x064B && ch <= 0x0652) ||
+				(ch == 0x0670) ||
+				(ch >= 0x06D6 && ch <= 0x06DC) ||
+				(ch >= 0x06DD && ch <= 0x06DF) ||
+				(ch >= 0x06E0 && ch <= 0x06E4) ||
+				(ch >= 0x06E7 && ch <= 0x06E8) ||
+				(ch >= 0x06EA && ch <= 0x06ED) ||
+				(ch >= 0x0901 && ch <= 0x0903) ||
+				(ch == 0x093C) ||
+				(ch >= 0x093E && ch <= 0x094C) ||
+				(ch == 0x094D) ||
+				(ch >= 0x0951 && ch <= 0x0954) ||
+				(ch >= 0x0962 && ch <= 0x0963) ||
+				(ch >= 0x0981 && ch <= 0x0983) ||
+				(ch == 0x09BC) ||
+				(ch == 0x09BE) ||
+				(ch == 0x09BF) ||
+				(ch >= 0x09C0 && ch <= 0x09C4) ||
+				(ch >= 0x09C7 && ch <= 0x09C8) ||
+				(ch >= 0x09CB && ch <= 0x09CD) ||
+				(ch == 0x09D7) ||
+				(ch >= 0x09E2 && ch <= 0x09E3) ||
+				(ch == 0x0A02) ||
+				(ch == 0x0A3C) ||
+				(ch == 0x0A3E) ||
+				(ch == 0x0A3F) ||
+				(ch >= 0x0A40 && ch <= 0x0A42) ||
+				(ch >= 0x0A47 && ch <= 0x0A48) ||
+				(ch >= 0x0A4B && ch <= 0x0A4D) ||
+				(ch >= 0x0A70 && ch <= 0x0A71) ||
+				(ch >= 0x0A81 && ch <= 0x0A83) ||
+				(ch == 0x0ABC) ||
+				(ch >= 0x0ABE && ch <= 0x0AC5) ||
+				(ch >= 0x0AC7 && ch <= 0x0AC9) ||
+				(ch >= 0x0ACB && ch <= 0x0ACD) ||
+				(ch >= 0x0B01 && ch <= 0x0B03) ||
+				(ch == 0x0B3C) ||
+				(ch >= 0x0B3E && ch <= 0x0B43) ||
+				(ch >= 0x0B47 && ch <= 0x0B48) ||
+				(ch >= 0x0B4B && ch <= 0x0B4D) ||
+				(ch >= 0x0B56 && ch <= 0x0B57) ||
+				(ch >= 0x0B82 && ch <= 0x0B83) ||
+				(ch >= 0x0BBE && ch <= 0x0BC2) ||
+				(ch >= 0x0BC6 && ch <= 0x0BC8) ||
+				(ch >= 0x0BCA && ch <= 0x0BCD) ||
+				(ch == 0x0BD7) ||
+				(ch >= 0x0C01 && ch <= 0x0C03) ||
+				(ch >= 0x0C3E && ch <= 0x0C44) ||
+				(ch >= 0x0C46 && ch <= 0x0C48) ||
+				(ch >= 0x0C4A && ch <= 0x0C4D) ||
+				(ch >= 0x0C55 && ch <= 0x0C56) ||
+				(ch >= 0x0C82 && ch <= 0x0C83) ||
+				(ch >= 0x0CBE && ch <= 0x0CC4) ||
+				(ch >= 0x0CC6 && ch <= 0x0CC8) ||
+				(ch >= 0x0CCA && ch <= 0x0CCD) ||
+				(ch >= 0x0CD5 && ch <= 0x0CD6) ||
+				(ch >= 0x0D02 && ch <= 0x0D03) ||
+				(ch >= 0x0D3E && ch <= 0x0D43) ||
+				(ch >= 0x0D46 && ch <= 0x0D48) ||
+				(ch >= 0x0D4A && ch <= 0x0D4D) ||
+				(ch == 0x0D57) ||
+				(ch == 0x0E31) ||
+				(ch >= 0x0E34 && ch <= 0x0E3A) ||
+				(ch >= 0x0E47 && ch <= 0x0E4E) ||
+				(ch == 0x0EB1) ||
+				(ch >= 0x0EB4 && ch <= 0x0EB9) ||
+				(ch >= 0x0EBB && ch <= 0x0EBC) ||
+				(ch >= 0x0EC8 && ch <= 0x0ECD) ||
+				(ch >= 0x0F18 && ch <= 0x0F19) ||
+				(ch == 0x0F35) ||
+				(ch == 0x0F37) ||
+				(ch == 0x0F39) ||
+				(ch == 0x0F3E) ||
+				(ch == 0x0F3F) ||
+				(ch >= 0x0F71 && ch <= 0x0F84) ||
+				(ch >= 0x0F86 && ch <= 0x0F8B) ||
+				(ch >= 0x0F90 && ch <= 0x0F95) ||
+				(ch == 0x0F97) ||
+				(ch >= 0x0F99 && ch <= 0x0FAD) ||
+				(ch >= 0x0FB1 && ch <= 0x0FB7) ||
+				(ch == 0x0FB9) ||
+				(ch >= 0x20D0 && ch <= 0x20DC) ||
+				(ch == 0x20E1) ||
+				(ch >= 0x302A && ch <= 0x302F) ||
+				(ch == 0x3099) ||
+				(ch == 0x309A);
+		}
+
+		private static bool IsExtender (int ch)
+		{
+			return
+				(ch == 0x00B7) ||
+				(ch == 0x02D0) ||
+				(ch == 0x02D1) ||
+				(ch == 0x0387) ||
+				(ch == 0x0640) ||
+				(ch == 0x0E46) ||
+				(ch == 0x0EC6) ||
+				(ch == 0x3005) ||
+				(ch >= 0x3031 && ch <= 0x3035) ||
+				(ch >= 0x309D && ch <= 0x309E) ||
+				(ch >= 0x30FC && ch <= 0x30FE);
+		}
+
+#endif
+
+		public void TestIsName ()
+		{
+			Assert (XmlReader.IsName ("foo"));
+			Assert (!XmlReader.IsName ("1foo"));
+			Assert (!XmlReader.IsName (" foo"));
+		}
+
+		public void TestIsNameToken ()
+		{
+			Assert (XmlReader.IsNameToken ("foo"));
+			Assert (XmlReader.IsNameToken ("1foo"));
+			Assert (!XmlReader.IsNameToken (" foo"));
+		}
+
+		public void TestMoveToElementFromAttribute ()
+		{
+			string xml = @"<foo bar=""baz"" />";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			Assert (xmlReader.Read ());
+			AssertEquals (XmlNodeType.Element, xmlReader.NodeType);
+			Assert (xmlReader.MoveToFirstAttribute ());
+			AssertEquals (XmlNodeType.Attribute, xmlReader.NodeType);
+			Assert (xmlReader.MoveToElement ());
+			AssertEquals (XmlNodeType.Element, xmlReader.NodeType);
+		}
+
+		public void TestMoveToElementFromElement ()
+		{
+			string xml = @"<foo bar=""baz"" />";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			Assert (xmlReader.Read ());
+			AssertEquals (XmlNodeType.Element, xmlReader.NodeType);
+			Assert (!xmlReader.MoveToElement ());
+			AssertEquals (XmlNodeType.Element, xmlReader.NodeType);
+		}
+
+		public void TestMoveToFirstAttributeWithNoAttributes ()
+		{
+			string xml = @"<foo />";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			Assert (xmlReader.Read ());
+			AssertEquals (XmlNodeType.Element, xmlReader.NodeType);
+			Assert (!xmlReader.MoveToFirstAttribute ());
+			AssertEquals (XmlNodeType.Element, xmlReader.NodeType);
+		}
+
+		public void TestMoveToNextAttributeWithNoAttributes ()
+		{
+			string xml = @"<foo />";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			Assert (xmlReader.Read ());
+			AssertEquals (XmlNodeType.Element, xmlReader.NodeType);
+			Assert (!xmlReader.MoveToNextAttribute ());
+			AssertEquals (XmlNodeType.Element, xmlReader.NodeType);
+		}
+
+		public void TestMoveToNextAttribute()
+		{
+			string xml = @"<foo bar=""baz"" quux='quuux'/>";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			AssertStartDocument (xmlReader);
+
+			AssertNode (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				2 // attributeCount
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"bar", // name
+				String.Empty, // prefix
+				"bar", // localName
+				String.Empty, // namespaceURI
+				"baz" // value
+			);
+
+			AssertAttribute (
+				xmlReader, // xmlReader
+				"quux", // name
+				String.Empty, // prefix
+				"quux", // localName
+				String.Empty, // namespaceURI
+				"quuux" // value
+			);
+
+			Assert (xmlReader.MoveToNextAttribute ());
+			Assert ("bar" == xmlReader.Name || "quux" == xmlReader.Name);
+			Assert ("baz" == xmlReader.Value || "quuux" == xmlReader.Value);
+
+			Assert (xmlReader.MoveToNextAttribute ());
+			Assert ("bar" == xmlReader.Name || "quux" == xmlReader.Name);
+			Assert ("baz" == xmlReader.Value || "quuux" == xmlReader.Value);
+
+			Assert (!xmlReader.MoveToNextAttribute ());
+
+            Assert (xmlReader.MoveToElement ());
+
+			AssertNodeValues (
+				xmlReader, // xmlReader
+				XmlNodeType.Element, // nodeType
+				0, //depth
+				true, // isEmptyElement
+				"foo", // name
+				String.Empty, // prefix
+				"foo", // localName
+				String.Empty, // namespaceURI
+				String.Empty, // value
+				2 // attributeCount
+			);
+
+			AssertEndDocument (xmlReader);
+		}
+
+		public void TestAttributeOrder ()
+		{
+			string xml = @"<foo _1='1' _2='2' _3='3' />";
+			XmlReader xmlReader =
+				new XmlTextReader (new StringReader (xml));
+
+			Assert (xmlReader.Read ());
+			AssertEquals (XmlNodeType.Element, xmlReader.NodeType);
+
+			Assert (xmlReader.MoveToFirstAttribute ());
+			AssertEquals ("_1", xmlReader.Name);
+			Assert (xmlReader.MoveToNextAttribute ());
+			AssertEquals ("_2", xmlReader.Name);
+			Assert (xmlReader.MoveToNextAttribute ());
+			AssertEquals ("_3", xmlReader.Name);
+
+			Assert (!xmlReader.MoveToNextAttribute ());
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlTextTests.cs b/mcs/class/System.XML/Test/XmlTextTests.cs
new file mode 100644
index 00000000000..a885402e354
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlTextTests.cs
@@ -0,0 +1,36 @@
+//
+// System.Xml.XmlTextWriterTests
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+using System.Xml;
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlTextTests : TestCase
+	{
+		public XmlTextTests () : base ("MonoTests.System.Xml.XmlTextTests testsuite") {}
+		public XmlTextTests (string name) : base (name) {}
+
+		XmlDocument document;
+		XmlText text;
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+		}
+
+		public void TestInnerAndOuterXml ()
+		{
+			text = document.CreateTextNode ("&<>\"'");
+			AssertEquals (String.Empty, text.InnerXml);
+			AssertEquals ("&amp;&lt;&gt;\"'", text.OuterXml);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlTextWriterTests.cs b/mcs/class/System.XML/Test/XmlTextWriterTests.cs
new file mode 100644
index 00000000000..a1f92e53f4d
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlTextWriterTests.cs
@@ -0,0 +1,911 @@
+//
+// System.Xml.XmlTextWriterTests
+//
+// Author:
+//   Kral Ferch <kral_ferch@hotmail.com>
+//
+// (C) 2002 Kral Ferch
+//
+
+using System;
+using System.IO;
+using System.Text;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlTextWriterTests : TestCase
+	{
+		public XmlTextWriterTests () : base ("MonoTests.System.Xml.XmlTextWriterTests testsuite") {}
+		public XmlTextWriterTests (string name) : base (name) {}
+
+		StringWriter sw;
+		XmlTextWriter xtw;
+
+		protected override void SetUp ()
+		{
+			sw = new StringWriter ();
+			xtw = new XmlTextWriter (sw);
+			xtw.QuoteChar = '\'';
+		}
+
+		private string StringWriterText 
+		{
+			get { return sw.GetStringBuilder ().ToString (); }
+		}
+
+		public void TestAttributeNamespacesNonNamespaceAttributeBefore ()
+		{
+			xtw.WriteStartElement ("foo");
+			xtw.WriteAttributeString("bar", "baz");
+			xtw.WriteAttributeString ("xmlns", "abc", null, "http://abc.def");
+			AssertEquals ("<foo bar='baz' xmlns:abc='http://abc.def'", StringWriterText);
+		}
+
+		public void TestAttributeNamespacesNonNamespaceAttributeAfter ()
+		{
+			xtw.WriteStartElement ("foo");
+
+			xtw.WriteAttributeString ("xmlns", "abc", null, "http://abc.def");
+			xtw.WriteAttributeString("bar", "baz");
+			AssertEquals ("<foo xmlns:abc='http://abc.def' bar='baz'", StringWriterText);
+		}
+
+		public void TestAttributeNamespacesThreeParamWithNullInNamespaceParam ()
+		{
+			xtw.WriteAttributeString ("xmlns", null, "http://abc.def");
+			AssertEquals ("xmlns='http://abc.def'", StringWriterText);
+		}
+
+		public void TestAttributeNamespacesThreeParamWithTextInNamespaceParam ()
+		{
+			try 
+			{
+				xtw.WriteAttributeString ("xmlns", "http://somenamespace.com", "http://abc.def");
+			} 
+			catch (ArgumentException) {}
+		}
+
+		public void TestAttributeNamespacesWithNullInNamespaceParam ()
+		{
+			xtw.WriteAttributeString ("xmlns", "abc", null, "http://abc.def");
+			AssertEquals ("xmlns:abc='http://abc.def'", StringWriterText);
+		}
+
+		public void TestAttributeNamespacesWithTextInNamespaceParam ()
+		{
+			try {
+				xtw.WriteAttributeString ("xmlns", "abc", "http://somenamespace.com", "http://abc.def");
+			} catch (ArgumentException) {}
+		}
+
+		public void TestAttributeNamespacesXmlnsXmlns ()
+		{
+			xtw.WriteStartElement ("foo");
+			try 
+			{
+				xtw.WriteAttributeString ("xmlns", "xmlns", null, "http://abc.def");
+				Fail ("Expected an ArgumentException to be thrown.");
+			} 
+			catch (ArgumentException) {}
+		}
+
+		public void TestAttributeWriteAttributeString ()
+		{
+			xtw.WriteStartElement ("foo");
+
+			xtw.WriteAttributeString ("foo", "bar");
+			AssertEquals ("<foo foo='bar'", StringWriterText);
+
+			xtw.WriteAttributeString ("bar", "");
+			AssertEquals ("<foo foo='bar' bar=''", StringWriterText);
+
+			xtw.WriteAttributeString ("baz", null);
+			AssertEquals ("<foo foo='bar' bar='' baz=''", StringWriterText);
+
+			// TODO: Why does this pass Microsoft?
+			xtw.WriteAttributeString ("", "quux");
+			AssertEquals ("<foo foo='bar' bar='' baz='' ='quux'", StringWriterText);
+
+			// TODO: Why does this pass Microsoft?
+			xtw.WriteAttributeString (null, "quuux");
+			AssertEquals ("<foo foo='bar' bar='' baz='' ='quux' ='quuux'", StringWriterText);
+		}
+
+		public void TestAttributeWriteAttributeStringNotInsideOpenStartElement ()
+		{
+			xtw.WriteStartElement ("foo");
+			xtw.WriteString ("bar");
+			
+			try 
+			{
+				xtw.WriteAttributeString ("baz", "quux");
+				Fail ("Expected an InvalidOperationException to be thrown.");
+			} 
+			catch (InvalidOperationException) {}
+		}
+
+		public void TestAttributeWriteAttributeStringWithoutParentElement ()
+		{
+			xtw.WriteAttributeString ("foo", "bar");
+			AssertEquals ("foo='bar'", StringWriterText);
+
+			xtw.WriteAttributeString ("baz", "quux");
+			AssertEquals ("foo='bar' baz='quux'", StringWriterText);
+		}
+
+		public void TestCDataValid ()
+		{
+			xtw.WriteCData ("foo");
+			AssertEquals ("WriteCData had incorrect output.", "<![CDATA[foo]]>", StringWriterText);
+		}
+
+		public void TestCDataInvalid ()
+		{
+			try {
+				xtw.WriteCData("foo]]>bar");
+				Fail("Should have thrown an ArgumentException.");
+			} 
+			catch (ArgumentException) { }
+		}
+
+		public void TestCloseOpenElements ()
+		{
+			xtw.WriteStartElement("foo");
+			xtw.WriteStartElement("bar");
+			xtw.WriteStartElement("baz");
+			xtw.Close();
+			AssertEquals ("Close didn't write out end elements properly.", "<foo><bar><baz /></bar></foo>",	StringWriterText);
+		}
+
+		public void TestCloseWriteAfter ()
+		{
+			xtw.WriteElementString ("foo", "bar");
+			xtw.Close ();
+
+			// WriteEndElement and WriteStartDocument aren't tested here because
+			// they will always throw different exceptions besides 'The Writer is closed.'
+			// and there are already tests for those exceptions.
+
+			try {
+				xtw.WriteCData ("foo");
+				Fail ("WriteCData after Close Should have thrown an InvalidOperationException.");
+			} 
+			catch (InvalidOperationException e) {
+				AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message);
+			}
+
+			try {
+				xtw.WriteComment ("foo");
+				Fail ("WriteComment after Close Should have thrown an InvalidOperationException.");
+			} 
+			catch (InvalidOperationException e) {
+				AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message);
+			}
+
+			try {
+				xtw.WriteProcessingInstruction ("foo", "bar");
+				Fail ("WriteProcessingInstruction after Close Should have thrown an InvalidOperationException.");
+			} 
+			catch (InvalidOperationException e) {
+				AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message);
+			}
+
+			try {
+				xtw.WriteStartElement ("foo", "bar", "baz");
+				Fail ("WriteStartElement after Close Should have thrown an InvalidOperationException.");
+			} 
+			catch (InvalidOperationException e) {
+				AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message);
+			}
+
+			try 
+			{
+				xtw.WriteAttributeString ("foo", "bar");
+				Fail ("WriteAttributeString after Close Should have thrown an InvalidOperationException.");
+			} 
+			catch (InvalidOperationException e) 
+			{
+				AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message);
+			}
+
+			try {
+				xtw.WriteString ("foo");
+				Fail ("WriteString after Close Should have thrown an InvalidOperationException.");
+			} 
+			catch (InvalidOperationException e) {
+				AssertEquals ("Exception message is incorrect.", "The Writer is closed.", e.Message);
+			}
+		}
+
+		public void TestCommentValid ()
+		{
+			xtw.WriteComment ("foo");
+			AssertEquals ("WriteComment had incorrect output.", "<!--foo-->", StringWriterText);
+		}
+
+		public void TestCommentInvalid ()
+		{
+			try {
+				xtw.WriteComment("foo-");
+				Fail("Should have thrown an ArgumentException.");
+			} 
+			catch (ArgumentException) { }
+
+			try {
+				xtw.WriteComment("foo-->bar");
+				Fail("Should have thrown an ArgumentException.");
+			} 
+			catch (ArgumentException) { }
+		}
+
+		public void TestConstructorsAndBaseStream ()
+		{
+			Assert ("BaseStream property returned wrong value.", Object.ReferenceEquals (null, this.xtw.BaseStream));
+
+			MemoryStream ms;
+			StreamReader sr;
+			XmlTextWriter xtw;
+
+			ms = new MemoryStream ();
+			xtw = new XmlTextWriter (ms, new UnicodeEncoding ());
+			xtw.WriteStartDocument ();
+			xtw.Flush ();
+			ms.Seek (0, SeekOrigin.Begin);
+			sr = new StreamReader (ms, Encoding.Unicode);
+			string expectedXmlDeclaration = "<?xml version=\"1.0\" encoding=\"utf-16\"?>";
+			string actualXmlDeclaration = sr.ReadToEnd();
+			AssertEquals (expectedXmlDeclaration, actualXmlDeclaration);
+			Assert ("BaseStream property returned wrong value.", Object.ReferenceEquals (ms, xtw.BaseStream));
+
+			ms = new MemoryStream ();
+			xtw = new XmlTextWriter (ms, new UnicodeEncoding ());
+			xtw.WriteStartDocument (true);
+			xtw.Flush ();
+			ms.Seek (0, SeekOrigin.Begin);
+			sr = new StreamReader (ms, Encoding.Unicode);
+			AssertEquals ("<?xml version=\"1.0\" encoding=\"utf-16\" standalone=\"yes\"?>", sr.ReadToEnd ());
+
+			ms = new MemoryStream ();
+			xtw = new XmlTextWriter (ms, new UTF8Encoding ());
+			xtw.WriteStartDocument ();
+			xtw.Flush ();
+			ms.Seek (0, SeekOrigin.Begin);
+			sr = new StreamReader (ms, Encoding.UTF8);
+			AssertEquals ("<?xml version=\"1.0\" encoding=\"utf-8\"?>", sr.ReadToEnd ());
+
+			ms = new MemoryStream ();
+			xtw = new XmlTextWriter (ms, null);
+			xtw.WriteStartDocument ();
+			xtw.Flush ();
+			ms.Seek (0, SeekOrigin.Begin);
+			sr = new StreamReader (ms, Encoding.UTF8);
+			AssertEquals ("<?xml version=\"1.0\"?>", sr.ReadToEnd ());
+
+			ms = new MemoryStream ();
+			xtw = new XmlTextWriter (ms, null);
+			xtw.WriteStartDocument (true);
+			xtw.Flush ();
+			ms.Seek (0, SeekOrigin.Begin);
+			sr = new StreamReader (ms, Encoding.UTF8);
+			AssertEquals ("<?xml version=\"1.0\" standalone=\"yes\"?>", sr.ReadToEnd ());
+			Assert ("BaseStream property returned wrong value.", Object.ReferenceEquals (ms, xtw.BaseStream));
+		}
+
+		public void TestDocumentStart ()
+		{
+			xtw.WriteStartDocument ();
+			AssertEquals ("XmlDeclaration is incorrect.", "<?xml version='1.0' encoding='utf-16'?>", StringWriterText);
+
+			try 
+			{
+				xtw.WriteStartDocument ();
+				Fail("Should have thrown an InvalidOperationException.");
+			} 
+			catch (InvalidOperationException e) {
+				AssertEquals ("Exception message is incorrect.",
+					"WriteStartDocument should be the first call.", e.Message);
+			}
+
+			xtw = new XmlTextWriter (sw = new StringWriter ());
+			xtw.QuoteChar = '\'';
+			xtw.WriteStartDocument (true);
+			AssertEquals ("<?xml version='1.0' encoding='utf-16' standalone='yes'?>", StringWriterText);
+
+			xtw = new XmlTextWriter (sw = new StringWriter ());
+			xtw.QuoteChar = '\'';
+			xtw.WriteStartDocument (false);
+			AssertEquals ("<?xml version='1.0' encoding='utf-16' standalone='no'?>", StringWriterText);
+		}
+
+		public void TestElementEmpty ()
+		{
+			xtw.WriteStartElement ("foo");
+			xtw.WriteEndElement ();
+			AssertEquals ("Incorrect output.", "<foo />", StringWriterText);
+		}
+
+		public void TestElementWriteElementString ()
+		{
+			xtw.WriteElementString ("foo", "bar");
+			AssertEquals ("WriteElementString has incorrect output.", "<foo>bar</foo>", StringWriterText);
+
+			xtw.WriteElementString ("baz", "");
+			AssertEquals ("<foo>bar</foo><baz />", StringWriterText);
+
+			xtw.WriteElementString ("quux", null);
+			AssertEquals ("<foo>bar</foo><baz /><quux />", StringWriterText);
+
+			xtw.WriteElementString ("", "quuux");
+			AssertEquals ("<foo>bar</foo><baz /><quux /><>quuux</>", StringWriterText);
+
+			xtw.WriteElementString (null, "quuuux");
+			AssertEquals ("<foo>bar</foo><baz /><quux /><>quuux</><>quuuux</>", StringWriterText);
+		}
+
+		public void TestFormatting ()
+		{
+			xtw.Formatting = Formatting.Indented;
+			xtw.WriteStartDocument ();
+			xtw.WriteStartElement ("foo");
+			xtw.WriteElementString ("bar", "");
+			xtw.Close ();
+			AssertEquals ("<?xml version='1.0' encoding='utf-16'?>\r\n<foo>\r\n  <bar />\r\n</foo>", StringWriterText);
+		}
+
+		public void TestFormattingInvalidXmlForFun ()
+		{
+			xtw.Formatting = Formatting.Indented;
+			xtw.IndentChar = 'x';
+			xtw.WriteStartDocument ();
+			xtw.WriteStartElement ("foo");
+			xtw.WriteStartElement ("bar");
+			xtw.WriteElementString ("baz", "");
+			xtw.Close ();
+			AssertEquals ("<?xml version='1.0' encoding='utf-16'?>\r\n<foo>\r\nxx<bar>\r\nxxxx<baz />\r\nxx</bar>\r\n</foo>", StringWriterText);
+		}
+
+		public void TestFormattingFromRemarks ()
+		{
+			// Remarks section of on-line help for XmlTextWriter.Formatting suggests this test.
+			xtw.Formatting = Formatting.Indented; 
+			xtw.WriteStartElement ("ol"); 
+			xtw.WriteStartElement ("li"); 
+			xtw.WriteString ("The big "); // This means "li" now has a mixed content model. 
+			xtw.WriteElementString ("b", "E"); 
+			xtw.WriteElementString ("i", "lephant"); 
+			xtw.WriteString (" walks slowly."); 
+			xtw.WriteEndElement (); 
+			xtw.WriteEndElement ();
+			AssertEquals ("<ol>\r\n  <li>The big <b>E</b><i>lephant</i> walks slowly.</li>\r\n</ol>", StringWriterText);
+		}
+
+		public void TestLookupPrefix ()
+		{
+			xtw.WriteStartElement ("root");
+
+			xtw.WriteStartElement ("one");
+			xtw.WriteAttributeString ("xmlns", "foo", null, "http://abc.def");
+			xtw.WriteAttributeString ("xmlns", "bar", null, "http://ghi.jkl");
+			AssertEquals ("foo", xtw.LookupPrefix ("http://abc.def"));
+			AssertEquals ("bar", xtw.LookupPrefix ("http://ghi.jkl"));
+			xtw.WriteEndElement ();
+
+			xtw.WriteStartElement ("two");
+			xtw.WriteAttributeString ("xmlns", "baz", null, "http://mno.pqr");
+			xtw.WriteString("quux");
+			AssertEquals ("baz", xtw.LookupPrefix ("http://mno.pqr"));
+			AssertNull (xtw.LookupPrefix ("http://abc.def"));
+			AssertNull (xtw.LookupPrefix ("http://ghi.jkl"));
+
+			AssertNull (xtw.LookupPrefix ("http://bogus"));
+		}
+
+		public void TestNamespacesAttributesPassingInNamespaces ()
+		{
+			xtw.Namespaces = false;
+			xtw.WriteStartElement ("foo");
+
+			// These shouldn't throw any exceptions since they don't pass in
+			// a namespace.
+			xtw.WriteAttributeString ("bar", "baz");
+			xtw.WriteAttributeString ("", "a", "", "b");
+			xtw.WriteAttributeString (null, "c", "", "d");
+			xtw.WriteAttributeString ("", "e", null, "f");
+			xtw.WriteAttributeString (null, "g", null, "h");
+
+			AssertEquals ("<foo bar='baz' a='b' c='d' e='f' g='h'", StringWriterText);
+
+			// These should throw ArgumentException because they pass in a
+			// namespace when Namespaces = false.
+		}
+
+		public void TestNamespacesElementsPassingInNamespaces ()
+		{
+			xtw.Namespaces = false;
+
+			// These shouldn't throw any exceptions since they don't pass in
+			// a namespace.
+			xtw.WriteElementString ("foo", "bar");
+			xtw.WriteStartElement ("baz");
+			xtw.WriteStartElement ("quux", "");
+			xtw.WriteStartElement ("quuux", null);
+			xtw.WriteStartElement (null, "a", null);
+			xtw.WriteStartElement (null, "b", "");
+			xtw.WriteStartElement ("", "c", null);
+			xtw.WriteStartElement ("", "d", "");
+
+			AssertEquals ("<foo>bar</foo><baz><quux><quuux><a><b><c><d", StringWriterText);
+
+			// These should throw ArgumentException because they pass in a
+			// namespace when Namespaces = false.
+			try {
+				xtw.WriteElementString ("qux", "http://netsack.com/", String.Empty);
+				Fail ("Expected an ArgumentException.");
+			} catch (ArgumentException) {}
+
+			try {
+				xtw.WriteStartElement ("foo", "http://netsack.com/");
+				Fail ("Expected an ArgumentException.");
+			} catch (ArgumentException) {}
+
+			try {
+				xtw.WriteStartElement ("foo", "bar", "http://netsack.com/");
+				Fail ("Expected an ArgumentException.");
+			} catch (ArgumentException) {}
+
+			try {
+				xtw.WriteStartElement ("foo", "bar", null);
+				Fail ("Expected an ArgumentException.");
+			} catch (ArgumentException) {}
+
+			try {
+				xtw.WriteStartElement ("foo", "bar", "");
+				Fail ("Expected an ArgumentException.");
+			} catch (ArgumentException) {}
+
+			try {
+				xtw.WriteStartElement ("foo", "", "");
+				Fail ("Expected an ArgumentException.");
+			} catch (ArgumentException) {}
+		}
+
+		public void TestNamespacesNoNamespaceClearsDefaultNamespace ()
+		{
+			xtw.WriteStartElement(String.Empty, "foo", "http://netsack.com/");
+			xtw.WriteStartElement(String.Empty, "bar", String.Empty);
+			xtw.WriteElementString("baz", String.Empty, String.Empty);
+			xtw.WriteEndElement();
+			xtw.WriteEndElement();
+			AssertEquals ("XmlTextWriter is incorrectly outputting namespaces.",
+				"<foo xmlns='http://netsack.com/'><bar xmlns=''><baz /></bar></foo>", StringWriterText);
+		}
+
+		public void TestNamespacesPrefix ()
+		{
+			xtw.WriteStartElement ("foo", "bar", "http://netsack.com/");
+			xtw.WriteStartElement ("foo", "baz", "http://netsack.com/");
+			xtw.WriteElementString ("qux", "http://netsack.com/", String.Empty);
+			xtw.WriteEndElement ();
+			xtw.WriteEndElement ();
+			AssertEquals ("XmlTextWriter is incorrectly outputting prefixes.",
+				"<foo:bar xmlns:foo='http://netsack.com/'><foo:baz><foo:qux /></foo:baz></foo:bar>", StringWriterText);
+		}
+
+		public void TestNamespacesPrefixWithEmptyAndNullNamespace ()
+		{
+			try {
+				xtw.WriteStartElement ("foo", "bar", "");
+				Fail ("Should have thrown an ArgumentException.");
+			} catch (ArgumentException) {}
+
+			try 
+			{
+				xtw.WriteStartElement ("foo", "bar", null);
+				Fail ("Should have thrown an ArgumentException.");
+			} 
+			catch (ArgumentException) {}
+		}
+
+		public void TestNamespacesSettingWhenWriteStateNotStart ()
+		{
+			xtw.WriteStartElement ("foo");
+			try 
+			{
+				xtw.Namespaces = false;
+				Fail ("Expected an InvalidOperationException.");
+			} 
+			catch (InvalidOperationException) {}
+			AssertEquals (true, xtw.Namespaces);
+		}
+
+		public void TestProcessingInstructionValid ()
+		{
+			xtw.WriteProcessingInstruction("foo", "bar");
+			AssertEquals ("WriteProcessingInstruction had incorrect output.", "<?foo bar?>", StringWriterText);
+		}
+
+		public void TestProcessingInstructionInvalid ()
+		{
+			try 
+			{
+				xtw.WriteProcessingInstruction("fo?>o", "bar");
+				Fail("Should have thrown an ArgumentException.");
+			} 
+			catch (ArgumentException) { }
+
+			try 
+			{
+				xtw.WriteProcessingInstruction("foo", "ba?>r");
+				Fail("Should have thrown an ArgumentException.");
+			} 
+			catch (ArgumentException) { }
+
+			try 
+			{
+				xtw.WriteProcessingInstruction("", "bar");
+				Fail("Should have thrown an ArgumentException.");
+			} 
+			catch (ArgumentException) { }
+
+			try 
+			{
+				xtw.WriteProcessingInstruction(null, "bar");
+				Fail("Should have thrown an ArgumentException.");
+			} 
+			catch (ArgumentException) { }
+		}
+
+		public void TestQuoteCharDoubleQuote ()
+		{
+			xtw.QuoteChar = '"';
+
+			// version, encoding, standalone
+			xtw.WriteStartDocument (true);
+			
+			// namespace declaration
+			xtw.WriteElementString ("foo", "http://netsack.com", "bar");
+
+			AssertEquals ("<?xml version=\"1.0\" encoding=\"utf-16\" standalone=\"yes\"?><foo xmlns=\"http://netsack.com\">bar</foo>", StringWriterText);
+
+
+		}
+
+		public void TestQuoteCharInvalid ()
+		{
+			try {
+				xtw.QuoteChar = 'x';
+				Fail ("Should have thrown an ArgumentException.");
+			} catch (ArgumentException) {}
+		}
+
+		public void TestWriteBase64 ()
+		{
+			UTF8Encoding encoding = new UTF8Encoding();
+			byte[] fooBar = encoding.GetBytes("foobar");
+			xtw.WriteBase64 (fooBar, 0, 6);
+			AssertEquals("Zm9vYmFy", StringWriterText);
+
+			try {
+				xtw.WriteBase64 (fooBar, 3, 6);
+				Fail ("Expected an Argument Exception to be thrown.");
+			} catch (ArgumentException) {}
+
+			try {
+				xtw.WriteBase64 (fooBar, -1, 6);
+				Fail ("Expected an Argument Exception to be thrown.");
+			} catch (ArgumentOutOfRangeException) {}
+
+			try {
+				xtw.WriteBase64 (fooBar, 3, -1);
+				Fail ("Expected an Argument Exception to be thrown.");
+			} catch (ArgumentOutOfRangeException) {}
+
+			try {
+				xtw.WriteBase64 (null, 0, 6);
+				Fail ("Expected an Argument Exception to be thrown.");
+			} catch (ArgumentNullException) {}
+		}
+
+		public void TestWriteCharEntity ()
+		{
+			xtw.WriteCharEntity ('a');
+			AssertEquals ("&#x61;", StringWriterText);
+
+			xtw.WriteCharEntity ('A');
+			AssertEquals ("&#x61;&#x41;", StringWriterText);
+
+			xtw.WriteCharEntity ('1');
+			AssertEquals ("&#x61;&#x41;&#x31;", StringWriterText);
+
+			xtw.WriteCharEntity ('K');
+			AssertEquals ("&#x61;&#x41;&#x31;&#x4B;", StringWriterText);
+
+			try {
+				xtw.WriteCharEntity ((char)0xd800);
+			} catch (ArgumentException) {}
+		}
+
+		public void TestWriteEndAttribute ()
+		{
+			try 
+			{
+				xtw.WriteEndAttribute ();
+				Fail ("Should have thrown an InvalidOperationException.");
+			}
+			catch (InvalidOperationException) {}
+		}
+
+		public void TestWriteEndDocument ()
+		{
+			try {
+				xtw.WriteEndDocument ();
+				Fail ("Expected an ArgumentException.");
+			} catch (ArgumentException) {}
+
+			xtw.WriteStartDocument ();
+
+			try 
+			{
+				xtw.WriteEndDocument ();
+				Fail ("Expected an ArgumentException.");
+			} 
+			catch (ArgumentException) {}
+
+			xtw.WriteStartElement ("foo");
+			xtw.WriteStartAttribute ("bar", null);
+			AssertEquals ("<?xml version='1.0' encoding='utf-16'?><foo bar='", StringWriterText);
+
+			xtw.WriteEndDocument ();
+			AssertEquals ("<?xml version='1.0' encoding='utf-16'?><foo bar='' />", StringWriterText);
+			AssertEquals (WriteState.Start, xtw.WriteState);
+		}
+
+		public void TestWriteEndElement ()
+		{
+			try {
+				xtw.WriteEndElement ();
+				Fail ("Should have thrown an InvalidOperationException.");
+			} catch (InvalidOperationException e) {
+				AssertEquals ("Exception message is incorrect.", "There was no XML start tag open.", e.Message);
+			}
+
+			xtw.WriteStartElement ("foo");
+			xtw.WriteEndElement ();
+			AssertEquals ("<foo />", StringWriterText);
+
+			xtw.WriteStartElement ("bar");
+			xtw.WriteStartAttribute ("baz", null);
+			xtw.WriteEndElement ();
+			AssertEquals ("<foo /><bar baz='' />", StringWriterText);
+		}
+
+		public void TestFullEndElement ()
+		{
+			xtw.WriteStartElement ("foo");
+			xtw.WriteFullEndElement ();
+			AssertEquals ("<foo></foo>", StringWriterText);
+
+			xtw.WriteStartElement ("bar");
+			xtw.WriteAttributeString ("foo", "bar");
+			xtw.WriteFullEndElement ();
+			AssertEquals ("<foo></foo><bar foo='bar'></bar>", StringWriterText);
+
+			xtw.WriteStartElement ("baz");
+			xtw.WriteStartAttribute ("bar", null);
+			xtw.WriteFullEndElement ();
+			AssertEquals ("<foo></foo><bar foo='bar'></bar><baz bar=''></baz>", StringWriterText);
+		}
+
+		public void TestWriteRaw ()
+		{
+			xtw.WriteRaw("&<>\"'");
+			AssertEquals ("&<>\"'", StringWriterText);
+
+			xtw.WriteRaw(null);
+			AssertEquals ("&<>\"'", StringWriterText);
+
+			xtw.WriteRaw("");
+			AssertEquals ("&<>\"'", StringWriterText);
+		}
+
+		public void TestWriteRawInvalidInAttribute ()
+		{
+			xtw.WriteStartElement ("foo");
+			xtw.WriteStartAttribute ("bar", null);
+			xtw.WriteRaw ("&<>\"'");
+			xtw.WriteEndAttribute ();
+			xtw.WriteEndElement ();
+			AssertEquals ("<foo bar='&<>\"'' />", StringWriterText);
+		}
+
+		public void TestWriteState ()
+		{
+			AssertEquals (WriteState.Start, xtw.WriteState);
+			xtw.WriteStartDocument ();
+			AssertEquals (WriteState.Prolog, xtw.WriteState);
+			xtw.WriteStartElement ("root");
+			AssertEquals (WriteState.Element, xtw.WriteState);
+			xtw.WriteElementString ("foo", "bar");
+			AssertEquals (WriteState.Content, xtw.WriteState);
+			xtw.Close ();
+			AssertEquals (WriteState.Closed, xtw.WriteState);
+		}
+
+		public void TestWriteString ()
+		{
+			xtw.WriteStartDocument ();
+			try {
+				xtw.WriteString("foo");
+			} catch (InvalidOperationException) {}
+
+			// Testing attribute values
+
+			xtw.WriteStartElement ("foo");
+			xtw.WriteAttributeString ("bar", "&<>");
+			AssertEquals ("<?xml version='1.0' encoding='utf-16'?><foo bar='&amp;&lt;&gt;'", StringWriterText);
+		}
+
+		public void TestWriteAttributeStringSingleQuoteChar()
+		{
+			// When QuoteChar is single quote then replaces single quotes within attributes
+			// but not double quotes.
+			xtw.WriteStartElement ("foo");
+			xtw.WriteAttributeString ("bar", "\"baz\"");
+			xtw.WriteAttributeString ("quux", "'baz'");
+			AssertEquals ("<foo bar='\"baz\"' quux='&apos;baz&apos;'", StringWriterText);
+		}
+
+		public void TestWriteAttributeStringDoubleQuoteChar()
+		{
+			// When QuoteChar is double quote then replaces double quotes within attributes
+			// but not single quotes.
+			xtw.QuoteChar = '"';
+			xtw.WriteStartElement ("foo");
+			xtw.WriteAttributeString ("bar", "\"baz\"");
+			xtw.WriteAttributeString ("quux", "'baz'");
+			AssertEquals ("<foo bar=\"&quot;baz&quot;\" quux=\"'baz'\"", StringWriterText);
+		}
+
+		public void TestWriteStringWithEntities()
+		{
+			// Testing element values
+			xtw.QuoteChar = '\'';
+			xtw.WriteElementString ("foo", "&<>\"'");
+			AssertEquals ("<foo>&amp;&lt;&gt;\"'</foo>", StringWriterText);
+		}
+
+		public void TestXmlLang ()
+		{
+			AssertNull (xtw.XmlLang);
+			
+			xtw.WriteStartElement ("foo");
+			xtw.WriteAttributeString ("xml", "lang", null, "langfoo");
+			AssertEquals ("langfoo", xtw.XmlLang);
+			AssertEquals ("<foo xml:lang='langfoo'", StringWriterText);
+
+			xtw.WriteAttributeString ("boo", "yah");
+			AssertEquals ("langfoo", xtw.XmlLang);
+			AssertEquals ("<foo xml:lang='langfoo' boo='yah'", StringWriterText);
+			
+			xtw.WriteElementString("bar", "baz");
+			AssertEquals ("langfoo", xtw.XmlLang);
+			AssertEquals ("<foo xml:lang='langfoo' boo='yah'><bar>baz</bar>", StringWriterText);
+			
+			xtw.WriteString("baz");
+			AssertEquals ("langfoo", xtw.XmlLang);
+			AssertEquals ("<foo xml:lang='langfoo' boo='yah'><bar>baz</bar>baz", StringWriterText);
+			
+			xtw.WriteStartElement ("quux");
+			xtw.WriteStartAttribute ("xml", "lang", null);
+			AssertEquals ("langfoo", xtw.XmlLang);
+			AssertEquals ("<foo xml:lang='langfoo' boo='yah'><bar>baz</bar>baz<quux xml:lang='", StringWriterText);
+			
+			xtw.WriteString("langbar");
+			AssertEquals ("langfoo", xtw.XmlLang);
+			AssertEquals ("<foo xml:lang='langfoo' boo='yah'><bar>baz</bar>baz<quux xml:lang='", StringWriterText);
+			
+			xtw.WriteEndAttribute ();
+			AssertEquals ("langbar", xtw.XmlLang);
+			AssertEquals ("<foo xml:lang='langfoo' boo='yah'><bar>baz</bar>baz<quux xml:lang='langbar'", StringWriterText);
+
+			// check if xml:lang repeats output even if same as current scope.
+			xtw.WriteStartElement ("joe");
+			xtw.WriteAttributeString ("xml", "lang", null, "langbar");
+			AssertEquals ("<foo xml:lang='langfoo' boo='yah'><bar>baz</bar>baz<quux xml:lang='langbar'><joe xml:lang='langbar'", StringWriterText);
+
+			
+			xtw.WriteElementString ("quuux", "squonk");
+			AssertEquals ("langbar", xtw.XmlLang);
+			AssertEquals ("<foo xml:lang='langfoo' boo='yah'><bar>baz</bar>baz<quux xml:lang='langbar'><joe xml:lang='langbar'><quuux>squonk</quuux>", StringWriterText);
+
+			xtw.WriteEndElement ();
+			xtw.WriteEndElement ();
+			AssertEquals ("langfoo", xtw.XmlLang);
+			AssertEquals ("<foo xml:lang='langfoo' boo='yah'><bar>baz</bar>baz<quux xml:lang='langbar'><joe xml:lang='langbar'><quuux>squonk</quuux></joe></quux>", StringWriterText);
+			
+			xtw.WriteEndElement ();
+			AssertNull (xtw.XmlLang);
+			AssertEquals ("<foo xml:lang='langfoo' boo='yah'><bar>baz</bar>baz<quux xml:lang='langbar'><joe xml:lang='langbar'><quuux>squonk</quuux></joe></quux></foo>", StringWriterText);
+			
+			xtw.Close ();
+			AssertNull (xtw.XmlLang);
+		}
+
+		// TODO: test operational aspects
+		public void TestXmlSpace ()
+		{
+			xtw.WriteStartElement ("foo");
+			AssertEquals (XmlSpace.None, xtw.XmlSpace);
+
+			xtw.WriteStartElement ("bar");
+			xtw.WriteAttributeString ("xml", "space", null, "preserve");
+			AssertEquals (XmlSpace.Preserve, xtw.XmlSpace);
+			AssertEquals ("<foo><bar xml:space='preserve'",	StringWriterText);
+
+			xtw.WriteStartElement ("baz");
+			xtw.WriteAttributeString ("xml", "space", null, "preserve");
+			AssertEquals (XmlSpace.Preserve, xtw.XmlSpace);
+			AssertEquals ("<foo><bar xml:space='preserve'><baz xml:space='preserve'", StringWriterText);
+
+			xtw.WriteStartElement ("quux");
+			xtw.WriteStartAttribute ("xml", "space", null);
+			AssertEquals (XmlSpace.Preserve, xtw.XmlSpace);
+			AssertEquals ("<foo><bar xml:space='preserve'><baz xml:space='preserve'><quux xml:space='", StringWriterText);
+
+			xtw.WriteString ("default");
+			AssertEquals (XmlSpace.Preserve, xtw.XmlSpace);
+			AssertEquals ("<foo><bar xml:space='preserve'><baz xml:space='preserve'><quux xml:space='", StringWriterText);
+			
+			xtw.WriteEndAttribute ();
+			AssertEquals (XmlSpace.Default, xtw.XmlSpace);
+			AssertEquals ("<foo><bar xml:space='preserve'><baz xml:space='preserve'><quux xml:space='default'", StringWriterText);
+
+			xtw.WriteEndElement ();
+			AssertEquals (XmlSpace.Preserve, xtw.XmlSpace);
+			xtw.WriteEndElement ();
+			AssertEquals (XmlSpace.Preserve, xtw.XmlSpace);
+			xtw.WriteEndElement ();
+			AssertEquals (XmlSpace.None, xtw.XmlSpace);
+
+			xtw.WriteStartElement ("quux");
+			try {
+				xtw.WriteAttributeString ("xml", "space", null, "bubba");
+			} catch (ArgumentException) {}
+
+			try {
+				xtw.WriteAttributeString ("xml", "space", null, "PRESERVE");
+			} catch (ArgumentException) {}
+
+			try {
+				xtw.WriteAttributeString ("xml", "space", null, "Preserve");
+			} catch (ArgumentException) {}
+
+			try {
+				xtw.WriteAttributeString ("xml", "space", null, "Default");
+			} catch (ArgumentException) {}
+
+			try {
+				xtw.WriteWhitespace ("x");
+			} catch (ArgumentException) { }
+		}
+
+		public void TestXmlSpaceRaw ()
+		{
+			xtw.WriteStartElement ("foo");
+			xtw.WriteStartAttribute ("xml", "space", null);
+			AssertEquals (XmlSpace.None, xtw.XmlSpace);
+			AssertEquals ("<foo xml:space='", StringWriterText);
+
+			xtw.WriteString ("default");
+			AssertEquals (XmlSpace.None, xtw.XmlSpace);
+			AssertEquals ("<foo xml:space='", StringWriterText);
+
+			xtw.WriteEndAttribute ();
+			AssertEquals (XmlSpace.Default, xtw.XmlSpace);
+			AssertEquals ("<foo xml:space='default'", StringWriterText);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/XmlWhiteSpaceTests.cs b/mcs/class/System.XML/Test/XmlWhiteSpaceTests.cs
new file mode 100755
index 00000000000..d50c749b141
--- /dev/null
+++ b/mcs/class/System.XML/Test/XmlWhiteSpaceTests.cs
@@ -0,0 +1,117 @@
+//
+// System.Xml.XmlWhitespaceTests.cs
+//
+// Author:
+//	Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Xml;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Xml
+{
+	public class XmlWhitespaceTests : TestCase
+	{
+		XmlDocument document;
+		XmlDocument doc2;
+		XmlWhitespace whitespace;
+		XmlWhitespace broken;
+		XmlNode original;
+		XmlNode deep;
+		XmlNode shallow;
+		
+		public XmlWhitespaceTests () : base ("MonoTests.System.Xml.XmlWhitespaceTests testsuite") {}
+		public XmlWhitespaceTests (string name) : base (name) {}
+
+		protected override void SetUp ()
+		{
+			document = new XmlDocument ();
+			document.LoadXml ("<root><foo></foo></root>");
+			XmlElement element = document.CreateElement ("foo");
+			whitespace = document.CreateWhitespace ("\r\n");
+			element.AppendChild (whitespace);
+
+			doc2 = new XmlDocument ();
+		}
+
+		public void TestInnerAndOuterXml ()
+		{
+			whitespace = doc2.CreateWhitespace ("\r\n\t ");
+			AssertEquals (String.Empty, whitespace.InnerXml);
+			AssertEquals ("\r\n\t ", whitespace.OuterXml);
+		}
+			
+		internal void TestXmlNodeBaseProperties (XmlNode original, XmlNode cloned)
+		{
+//			assertequals (original.nodetype + " was incorrectly cloned.",
+//				      original.baseuri, cloned.baseuri);			
+			AssertNull (cloned.ParentNode);
+			AssertEquals ("Value incorrectly cloned",
+				       cloned.Value, original.Value);
+			
+                        Assert ("Copies, not pointers", !Object.ReferenceEquals (original,cloned));
+		}
+
+		public void TestXmlWhitespaceBadConstructor ()
+		{
+			try {
+				broken = document.CreateWhitespace ("black");				
+
+			} catch (ArgumentException) {
+				return;
+
+			} catch (Exception) {
+				Fail ("Incorrect Exception thrown.");
+			}
+		}
+
+		public void TestXmlWhitespaceConstructor ()
+		{
+			AssertEquals ("whitespace char didn't get copied right",
+				      "\r\n", whitespace.Data);
+		}
+		
+	       
+		public void TestXmlWhitespaceName ()
+		{
+			AssertEquals (whitespace.NodeType + " Name property broken",
+				      whitespace.Name, "#whitespace");
+		}
+
+		public void TestXmlWhitespaceLocalName ()
+		{
+			AssertEquals (whitespace.NodeType + " LocalName property broken",
+				      whitespace.LocalName, "#whitespace");
+		}
+
+		public void TestXmlWhitespaceNodeType ()
+		{
+			AssertEquals ("XmlWhitespace NodeType property broken",
+				      whitespace.NodeType.ToString (), "Whitespace");
+		}
+
+		public void TestXmlWhitespaceIsReadOnly ()
+		{
+			AssertEquals ("XmlWhitespace IsReadOnly property broken",
+				      whitespace.IsReadOnly, false);
+		}
+
+		public void TestXmlWhitespaceCloneNode ()
+		{
+			original = whitespace;
+
+			shallow = whitespace.CloneNode (false); // shallow
+			TestXmlNodeBaseProperties (original, shallow);
+						
+			deep = whitespace.CloneNode (true); // deep
+			TestXmlNodeBaseProperties (original, deep);			
+
+                        AssertEquals ("deep cloning differs from shallow cloning",
+				      deep.OuterXml, shallow.OuterXml);
+		}
+	}
+}
diff --git a/mcs/class/System.XML/Test/makefile.gnu b/mcs/class/System.XML/Test/makefile.gnu
new file mode 100644
index 00000000000..7f82dd7348a
--- /dev/null
+++ b/mcs/class/System.XML/Test/makefile.gnu
@@ -0,0 +1,19 @@
+topdir = ../../..
+
+LIBRARY = System.XML_linux_test.dll
+
+LIB_LIST = System.XML_linux_test.args
+LIB_FLAGS = -r ../../lib/corlib.dll -r ../../lib/System.Xml.dll -r ../../lib/NUnitCore_mono.dll
+
+SOURCES_INCLUDE = *.cs
+SOURCES_EXCLUDE = ./TheTests.cs
+
+include ../../library.make
+
+MCS_FLAGS = --target library --noconfig
+
+TEST_SUITE_PREFIX = MonoTests.System.Xml.
+TEST_SUITE = AllTests
+
+test: $(LIBRARY)
+	mono ../../../nunit/src/NUnitConsole/NUnitConsole_mono.exe $(TEST_SUITE_PREFIX)$(TEST_SUITE),System.XML_linux_test.dll
diff --git a/mcs/class/System.XML/list b/mcs/class/System.XML/list
new file mode 100755
index 00000000000..11bdb474cb0
--- /dev/null
+++ b/mcs/class/System.XML/list
@@ -0,0 +1,190 @@
+System.Xml\\EntityHandling.cs

+System.Xml\\XmlConvert.cs
+System.Xml\\Formatting.cs

+System.Xml\\IHasXmlNode.cs

+System.Xml\\IXmlLineInfo.cs

+System.Xml\\NameTable.cs

+System.Xml\\ReadState.cs

+System.Xml\\TODOAttribute.cs

+System.Xml\\ValidationType.cs

+System.Xml\\WhitespaceHandling.cs

+System.Xml\\WriteState.cs

+System.Xml\\XmlAttribute.cs

+System.Xml\\XmlAttributeCollection.cs

+System.Xml\\XmlCDataSection.cs

+System.Xml\\XmlChar.cs

+System.Xml\\XmlCharacterData.cs

+System.Xml\\XmlComment.cs

+System.Xml\\XmlDeclaration.cs

+System.Xml\\XmlDocument.cs

+System.Xml\\XmlDocumentFragment.cs

+System.Xml\\XmlDocumentType.cs

+System.Xml\\XmlElement.cs

+System.Xml\\XmlEntity.cs

+System.Xml\\XmlEntityReference.cs

+System.Xml\\XmlException.cs

+System.Xml\\XmlImplementation.cs

+System.Xml\\XmlLinkedNode.cs

+System.Xml\\XmlNamedNodeMap.cs

+System.Xml\\XmlNamespaceManager.cs

+System.Xml\\XmlNameTable.cs

+System.Xml\\XmlNode.cs

+System.Xml\\XmlNodeChangedAction.cs

+System.Xml\\XmlNodeChangedEventArgs.cs

+System.Xml\\XmlNodeChangedEventHandler.cs

+System.Xml\\XmlNodeList.cs

+System.Xml\\XmlNodeListChildren.cs

+System.Xml\\XmlNodeOrder.cs

+System.Xml\\XmlNodeReader.cs

+System.Xml\\XmlNodeType.cs

+System.Xml\\XmlNotation.cs

+System.Xml\\XmlParserContext.cs

+System.Xml\\XmlProcessingInstruction.cs

+System.Xml\\XmlQualifiedName.cs

+System.Xml\\XmlReader.cs

+System.Xml\\XmlResolver.cs

+System.Xml\\XmlSignificantWhitespace.cs

+System.Xml\\XmlSpace.cs

+System.Xml\\XmlText.cs

+System.Xml\\XmlTextReader.cs

+System.Xml\\XmlTextWriter.cs

+System.Xml\\XmlTextWriterOpenElement.cs

+System.Xml\\XmlTokenizedType.cs

+System.Xml\\XmlUrlResolver.cs

+System.Xml\\XmlWhitespace.cs

+System.Xml\\XmlWriter.cs

+System.Xml.Schema\\Parser.cs

+System.Xml.Schema\\ValidationEventArgs.cs

+System.Xml.Schema\\ValidationHandler.cs

+System.Xml.Schema\\XmlSchema.cs

+System.Xml.Schema\\XmlSchemaAll.cs

+System.Xml.Schema\\XmlSchemaAnnotated.cs

+System.Xml.Schema\\XmlSchemaAnnotation.cs

+System.Xml.Schema\\XmlSchemaAny.cs

+System.Xml.Schema\\XmlSchemaAnyAttribute.cs

+System.Xml.Schema\\XmlSchemaAppInfo.cs

+System.Xml.Schema\\XmlSchemaAttribute.cs

+System.Xml.Schema\\XmlSchemaAttributeGroup.cs

+System.Xml.Schema\\XmlSchemaAttributeGroupRef.cs

+System.Xml.Schema\\XmlSchemaChoice.cs

+System.Xml.Schema\\XmlSchemaCollection.cs

+System.Xml.Schema\\XmlSchemaCollectionEnumerator.cs

+System.Xml.Schema\\XmlSchemaComplexContent.cs

+System.Xml.Schema\\XmlSchemaComplexContentExtension.cs

+System.Xml.Schema\\XmlSchemaComplexContentRestriction.cs

+System.Xml.Schema\\XmlSchemaComplexType.cs

+System.Xml.Schema\\XmlSchemaContent.cs

+System.Xml.Schema\\XmlSchemaContentModel.cs

+System.Xml.Schema\\XmlSchemaContentProcessing.cs

+System.Xml.Schema\\XmlSchemaContentType.cs

+System.Xml.Schema\\XmlSchemaDatatype.cs

+System.Xml.Schema\\XmlSchemaDerivationMethod.cs

+System.Xml.Schema\\XmlSchemaDocumentation.cs

+System.Xml.Schema\\XmlSchemaElement.cs

+System.Xml.Schema\\XmlSchemaEnumerationFacet.cs

+System.Xml.Schema\\XmlSchemaException.cs

+System.Xml.Schema\\XmlSchemaExternal.cs

+System.Xml.Schema\\XmlSchemaFacet.cs

+System.Xml.Schema\\XmlSchemaForm.cs

+System.Xml.Schema\\XmlSchemaFractionDigitsFacet.cs

+System.Xml.Schema\\XmlSchemaGroup.cs

+System.Xml.Schema\\XmlSchemaGroupBase.cs

+System.Xml.Schema\\XmlSchemaGroupRef.cs

+System.Xml.Schema\\XmlSchemaIdentityConstraint.cs

+System.Xml.Schema\\XmlSchemaImport.cs

+System.Xml.Schema\\XmlSchemaInclude.cs

+System.Xml.Schema\\XmlSchemaInfo.cs

+System.Xml.Schema\\XmlSchemaKey.cs

+System.Xml.Schema\\XmlSchemaKeyref.cs

+System.Xml.Schema\\XmlSchemaLengthFacet.cs

+System.Xml.Schema\\XmlSchemaMaxExclusiveFacet.cs

+System.Xml.Schema\\XmlSchemaMaxInclusiveFacet.cs

+System.Xml.Schema\\XmlSchemaMaxLengthFacet.cs

+System.Xml.Schema\\XmlSchemaMinExclusiveFacet.cs

+System.Xml.Schema\\XmlSchemaMinInclusiveFacet.cs

+System.Xml.Schema\\XmlSchemaMinLengthFacet.cs

+System.Xml.Schema\\XmlSchemaNotation.cs

+System.Xml.Schema\\XmlSchemaNumericFacet.cs

+System.Xml.Schema\\XmlSchemaObject.cs

+System.Xml.Schema\\XmlSchemaObjectCollection.cs

+System.Xml.Schema\\XmlSchemaObjectEnumerator.cs

+System.Xml.Schema\\XmlSchemaObjectTable.cs

+System.Xml.Schema\\XmlSchemaParticle.cs

+System.Xml.Schema\\XmlSchemaPatternFacet.cs

+System.Xml.Schema\\XmlSchemaRedefine.cs

+System.Xml.Schema\\XmlSchemaSequence.cs

+System.Xml.Schema\\XmlSchemaSimpleContent.cs

+System.Xml.Schema\\XmlSchemaSimpleContentExtension.cs

+System.Xml.Schema\\XmlSchemaSimpleContentRestriction.cs

+System.Xml.Schema\\XmlSchemaSimpleType.cs

+System.Xml.Schema\\XmlSchemaSimpleTypeContent.cs

+System.Xml.Schema\\XmlSchemaSimpleTypeList.cs

+System.Xml.Schema\\XmlSchemaSimpleTypeRestriction.cs

+System.Xml.Schema\\XmlSchemaSimpleTypeUnion.cs

+System.Xml.Schema\\XmlSchemaTotalDigitsFacet.cs

+System.Xml.Schema\\XmlSchemaType.cs

+System.Xml.Schema\\XmlSchemaUnique.cs

+System.Xml.Schema\\XmlSchemaUse.cs

+System.Xml.Schema\\XmlSchemaUtil.cs

+System.Xml.Schema\\XmlSchemaWhiteSpaceFacet.cs

+System.Xml.Schema\\XmlSchemaXPath.cs

+System.Xml.Schema\\XmlSeverityType.cs

+System.Xml.XPath\\IXPathNavigable.cs

+System.Xml.XPath\\XmlCaseOrder.cs

+System.Xml.XPath\\XmlDataType.cs

+System.Xml.XPath\\XmlSortOrder.cs

+System.Xml.XPath\\XPathDocument.cs

+System.Xml.XPath\\XPathException.cs

+System.Xml.XPath\\XPathExpression.cs

+System.Xml.XPath\\XPathNamespaceScope.cs

+System.Xml.XPath\\XPathNavigator.cs

+System.Xml.XPath\\XPathNodeIterator.cs

+System.Xml.XPath\\XPathNodeType.cs

+System.Xml.XPath\\XPathResultType.cs

+System.Xml.XPath\\XPathScanner.cs

+System.Xml.Xsl\\IXsltContextFunction.cs

+System.Xml.Xsl\\IXsltContextVariable.cs

+System.Xml.Xsl\\XsltArgumentList.cs

+System.Xml.Xsl\\XsltCompileException.cs

+System.Xml.Xsl\\XsltContext.cs

+System.Xml.Xsl\\XsltException.cs

+System.Xml.Xsl\\XslTransform.cs

+System.Xml.Serialization\\SoapAttributeAttribute.cs
+System.Xml.Serialization\\SoapAttributeOverrides.cs
+System.Xml.Serialization\\SoapAttributes.cs
+System.Xml.Serialization\\SoapElementAttribute.cs
+System.Xml.Serialization\\SoapEnumAttribute.cs
+System.Xml.Serialization\\SoapIgnoreAttribute.cs
+System.Xml.Serialization\\SoapIncludeAttribute.cs
+System.Xml.Serialization\\SoapTypeAttribute.cs
+System.Xml.Serialization\\UnreferencedObjectEventArgs.cs
+System.Xml.Serialization\\XmlAnyAttributeAttribute.cs
+System.Xml.Serialization\\XmlAnyElementAttribute.cs
+System.Xml.Serialization\\XmlAnyElementAttributes.cs
+System.Xml.Serialization\\XmlArrayAttribute.cs
+System.Xml.Serialization\\XmlArrayItemAttribute.cs
+System.Xml.Serialization\\XmlArrayItemAttributes.cs
+System.Xml.Serialization\\XmlAttributeAttribute.cs
+System.Xml.Serialization\\XmlAttributeEventArgs.cs
+System.Xml.Serialization\\XmlAttributeOverrides.cs
+System.Xml.Serialization\\XmlAttributes.cs
+System.Xml.Serialization\\XmlChoiceIdentifierAttribute.cs
+System.Xml.Serialization\\XmlElementAttribute.cs
+System.Xml.Serialization\\XmlElementAttributes.cs
+System.Xml.Serialization\\XmlElementEventArgs.cs
+System.Xml.Serialization\\XmlEnumAttribute.cs
+System.Xml.Serialization\\XmlIgnoreAttribute.cs
+System.Xml.Serialization\\XmlIncludeAttribute.cs
+System.Xml.Serialization\\XmlMapping.cs
+System.Xml.Serialization\\XmlNamespaceDeclarationsAttribute.cs
+System.Xml.Serialization\\XmlNodeEventArgs.cs
+System.Xml.Serialization\\XmlRootAttribute.cs
+System.Xml.Serialization\\XmlSerializer.cs
+System.Xml.Serialization\\XmlSerializerNamespaces.cs
+System.Xml.Serialization\\XmlTextAttribute.cs
+System.Xml.Serialization\\XmlTypeAttribute.cs
+System.Xml.Serialization\\XmlTypeMapping.cs
+System.Xml.Serialization\\XmlAttributeEventHandler.cs
+System.Xml.Serialization\\XmlElementEventHandler.cs
+System.Xml.Serialization\\XmlNodeEventHandler.cs
+System.Xml.Serialization\\UnreferencedObjectEventHandler.cs
diff --git a/mcs/class/System.XML/list.unix b/mcs/class/System.XML/list.unix
new file mode 100755
index 00000000000..e782b26e4ed
--- /dev/null
+++ b/mcs/class/System.XML/list.unix
@@ -0,0 +1,221 @@
+System.Xml/IHasXmlNode.cs
+System.Xml/EntityHandling.cs
+System.Xml/Formatting.cs
+System.Xml/IXmlLineInfo.cs
+System.Xml/NameTable.cs
+System.Xml/ReadState.cs
+System.Xml/TODOAttribute.cs
+System.Xml/ValidationType.cs
+System.Xml/XmlEntity.cs
+System.Xml/WhitespaceHandling.cs
+System.Xml/WriteState.cs
+System.Xml/XmlTextWriter.cs
+System.Xml/XmlAttribute.cs
+System.Xml/XmlAttributeCollection.cs
+System.Xml/XmlCDataSection.cs
+System.Xml/XmlConstructs.cs
+System.Xml/XmlChar.cs
+System.Xml/XmlCharacterData.cs
+System.Xml/XmlComment.cs
+System.Xml/XmlNotation.cs
+System.Xml/XmlDeclaration.cs
+System.Xml/XmlDocument.cs
+System.Xml/XmlDocumentFragment.cs
+System.Xml/XmlDocumentType.cs
+System.Xml/XmlElement.cs
+System.Xml/XmlEntityReference.cs
+System.Xml/XmlException.cs
+System.Xml/XmlNodeReader.cs
+System.Xml/XmlImplementation.cs
+System.Xml/XmlConvert.cs
+System.Xml/XmlLinkedNode.cs
+System.Xml/XmlNameTable.cs
+System.Xml/XmlNamedNodeMap.cs
+System.Xml/XmlNamespaceManager.cs
+System.Xml/XmlNode.cs
+System.Xml/XmlNodeChangedAction.cs
+System.Xml/XmlNodeChangedEventArgs.cs
+System.Xml/XmlNodeList.cs
+System.Xml/XmlNodeListChildren.cs
+System.Xml/XmlNodeOrder.cs
+System.Xml/XmlNodeType.cs
+System.Xml/XmlParserContext.cs
+System.Xml/XmlProcessingInstruction.cs
+System.Xml/XmlQualifiedName.cs
+System.Xml/XmlReader.cs
+System.Xml/XmlResolver.cs
+System.Xml/XmlSignificantWhitespace.cs
+System.Xml/XmlSpace.cs
+System.Xml/XmlText.cs
+System.Xml/XmlTextReader.cs
+System.Xml/XmlTokenizedType.cs
+System.Xml/XmlUrlResolver.cs
+System.Xml/XmlWhitespace.cs
+System.Xml/XmlWriter.cs
+System.Xml/XmlNodeChangedEventHandler.cs
+System.Xml/XmlTextWriterOpenElement.cs
+System.Xml/XmlDocumentNavigator.cs
+System.Xml/XmlNodeArrayList.cs
+System.Xml.XPath/IXPathNavigable.cs
+System.Xml.XPath/XPathNavigator.cs
+System.Xml.XPath/XPathExpression.cs
+System.Xml.XPath/XPathNamespaceScope.cs
+System.Xml.XPath/XPathNodeIterator.cs
+System.Xml.XPath/XPathResultType.cs
+System.Xml.XPath/XPathNodeType.cs
+System.Xml.XPath/XmlDataType.cs
+System.Xml.XPath/XmlSortOrder.cs
+System.Xml.XPath/XmlCaseOrder.cs
+System.Xml.XPath/XPathDocument.cs
+System.Xml.XPath/XPathException.cs
+System.Xml.XPath/DefaultContext.cs
+System.Xml.XPath/Expression.cs
+System.Xml.XPath/Iterator.cs
+System.Xml.XPath/Parser.cs
+System.Xml.XPath/Tokenizer.cs
+System.Xml.Xsl/IXsltContextFunction.cs
+System.Xml.Xsl/IXsltContextVariable.cs
+System.Xml.Xsl/XslTransform.cs
+System.Xml.Xsl/XsltArgumentList.cs
+System.Xml.Xsl/XsltCompileException.cs
+System.Xml.Xsl/XsltContext.cs
+System.Xml.Xsl/XsltException.cs
+System.Xml.Schema/ValidationEventArgs.cs
+System.Xml.Schema/XmlSchema.cs
+System.Xml.Schema/XmlSchemaAll.cs
+System.Xml.Schema/XmlSchemaAnnotated.cs
+System.Xml.Schema/XmlSchemaAnnotation.cs
+System.Xml.Schema/XmlSchemaAny.cs
+System.Xml.Schema/XmlSchemaAnyAttribute.cs
+System.Xml.Schema/XmlSchemaAppInfo.cs
+System.Xml.Schema/XmlSchemaAttribute.cs
+System.Xml.Schema/XmlSchemaAttributeGroup.cs
+System.Xml.Schema/XmlSchemaAttributeGroupRef.cs
+System.Xml.Schema/XmlSchemaChoice.cs
+System.Xml.Schema/XmlSchemaCollection.cs
+System.Xml.Schema/XmlSchemaCollectionEnumerator.cs
+System.Xml.Schema/XmlSchemaComplexContent.cs
+System.Xml.Schema/XmlSchemaComplexContentExtension.cs
+System.Xml.Schema/XmlSchemaComplexContentRestriction.cs
+System.Xml.Schema/XmlSchemaComplexType.cs
+System.Xml.Schema/XmlSchemaContent.cs
+System.Xml.Schema/XmlSchemaContentModel.cs
+System.Xml.Schema/XmlSchemaContentProcessing.cs
+System.Xml.Schema/XmlSchemaContentType.cs
+System.Xml.Schema/XmlSchemaDatatype.cs
+System.Xml.Schema/XmlSchemaDerivationMethod.cs
+System.Xml.Schema/XmlSchemaDocumentation.cs
+System.Xml.Schema/XmlSchemaElement.cs
+System.Xml.Schema/XmlSchemaEnumerationFacet.cs
+System.Xml.Schema/XmlSchemaException.cs
+System.Xml.Schema/XmlSchemaExternal.cs
+System.Xml.Schema/XmlSchemaFacet.cs
+System.Xml.Schema/XmlSchemaForm.cs
+System.Xml.Schema/XmlSchemaFractionDigitsFacet.cs
+System.Xml.Schema/XmlSchemaGroup.cs
+System.Xml.Schema/XmlSchemaGroupBase.cs
+System.Xml.Schema/XmlSchemaGroupRef.cs
+System.Xml.Schema/XmlSchemaIdentityConstraint.cs
+System.Xml.Schema/XmlSchemaImport.cs
+System.Xml.Schema/XmlSchemaInclude.cs
+System.Xml.Schema/XmlSchemaKey.cs
+System.Xml.Schema/XmlSchemaKeyref.cs
+System.Xml.Schema/XmlSchemaLengthFacet.cs
+System.Xml.Schema/XmlSchemaMaxExclusiveFacet.cs
+System.Xml.Schema/XmlSchemaMaxInclusiveFacet.cs
+System.Xml.Schema/XmlSchemaMaxLengthFacet.cs
+System.Xml.Schema/XmlSchemaMinExclusiveFacet.cs
+System.Xml.Schema/XmlSchemaMinInclusiveFacet.cs
+System.Xml.Schema/XmlSchemaMinLengthFacet.cs
+System.Xml.Schema/XmlSchemaNotation.cs
+System.Xml.Schema/XmlSchemaNumericFacet.cs
+System.Xml.Schema/XmlSchemaObject.cs
+System.Xml.Schema/XmlSchemaObjectCollection.cs
+System.Xml.Schema/XmlSchemaObjectEnumerator.cs
+System.Xml.Schema/XmlSchemaObjectTable.cs
+System.Xml.Schema/XmlSchemaParticle.cs
+System.Xml.Schema/XmlSchemaPatternFacet.cs
+System.Xml.Schema/XmlSchemaRedefine.cs
+System.Xml.Schema/XmlSchemaSequence.cs
+System.Xml.Schema/XmlSchemaSimpleContent.cs
+System.Xml.Schema/XmlSchemaSimpleContentExtension.cs
+System.Xml.Schema/XmlSchemaSimpleContentRestriction.cs
+System.Xml.Schema/XmlSchemaSimpleType.cs
+System.Xml.Schema/XmlSchemaSimpleTypeContent.cs
+System.Xml.Schema/XmlSchemaSimpleTypeList.cs
+System.Xml.Schema/XmlSchemaSimpleTypeRestriction.cs
+System.Xml.Schema/XmlSchemaSimpleTypeUnion.cs
+System.Xml.Schema/XmlSchemaTotalDigitsFacet.cs
+System.Xml.Schema/XmlSchemaType.cs
+System.Xml.Schema/XmlSchemaUnique.cs
+System.Xml.Schema/XmlSchemaUse.cs
+System.Xml.Schema/XmlSchemaWhiteSpaceFacet.cs
+System.Xml.Schema/XmlSchemaXPath.cs
+System.Xml.Schema/XmlSeverityType.cs
+System.Xml.Schema/ValidationHandler.cs
+System.Xml.Schema/XmlSchemaInfo.cs
+System.Xml.Schema/XmlSchemaUtil.cs
+System.Xml.Schema/XmlSchemaReader.cs
+System.Xml.Serialization/AssemblyInfo.cs
+System.Xml.Serialization/CodeIdentifier.cs
+System.Xml.Serialization/CodeIdentifiers.cs
+System.Xml.Serialization/IXmlSerializable.cs
+System.Xml.Serialization/SoapAttributeAttribute.cs
+System.Xml.Serialization/SoapAttributeOverrides.cs
+System.Xml.Serialization/SoapAttributes.cs
+System.Xml.Serialization/SoapCodeExporter.cs
+System.Xml.Serialization/SoapElementAttribute.cs
+System.Xml.Serialization/SoapEnumAttribute.cs
+System.Xml.Serialization/SoapIgnoreAttribute.cs
+System.Xml.Serialization/SoapIncludeAttribute.cs
+System.Xml.Serialization/SoapSchemaImporter.cs
+System.Xml.Serialization/SoapSchemaMember.cs
+System.Xml.Serialization/SoapReflectionImporter.cs
+System.Xml.Serialization/SoapTypeAttribute.cs
+System.Xml.Serialization/TypeMember.cs
+System.Xml.Serialization/UnreferencedObjectEventArgs.cs
+System.Xml.Serialization/UnreferencedObjectEventHandler.cs
+System.Xml.Serialization/XmlAnyAttributeAttribute.cs
+System.Xml.Serialization/XmlAnyElementAttribute.cs
+System.Xml.Serialization/XmlAnyElementAttributes.cs
+System.Xml.Serialization/XmlArrayAttribute.cs
+System.Xml.Serialization/XmlArrayItemAttribute.cs
+System.Xml.Serialization/XmlArrayItemAttributes.cs
+System.Xml.Serialization/XmlAttributeAttribute.cs
+System.Xml.Serialization/XmlAttributeEventArgs.cs
+System.Xml.Serialization/XmlAttributeEventHandler.cs
+System.Xml.Serialization/XmlAttributeOverrides.cs
+System.Xml.Serialization/XmlAttributes.cs
+System.Xml.Serialization/XmlCodeExporter.cs
+System.Xml.Serialization/XmlChoiceIdentifierAttribute.cs
+System.Xml.Serialization/XmlCustomFormatter.cs
+System.Xml.Serialization/XmlElementAttribute.cs
+System.Xml.Serialization/XmlElementAttributes.cs
+System.Xml.Serialization/XmlElementEventArgs.cs
+System.Xml.Serialization/XmlEnumAttribute.cs
+System.Xml.Serialization/XmlIgnoreAttribute.cs
+System.Xml.Serialization/XmlIncludeAttribute.cs
+System.Xml.Serialization/XmlMemberMapping.cs
+System.Xml.Serialization/XmlMembersMapping.cs
+System.Xml.Serialization/XmlMapping.cs
+System.Xml.Serialization/XmlNamespaceDeclarationsAttribute.cs
+System.Xml.Serialization/XmlNodeEventArgs.cs
+System.Xml.Serialization/XmlReflectionImporter.cs
+System.Xml.Serialization/XmlReflectionMember.cs
+System.Xml.Serialization/XmlRootAttribute.cs
+System.Xml.Serialization/XmlSchemaExporter.cs
+System.Xml.Serialization/XmlSchemaImporter.cs
+System.Xml.Serialization/XmlSchemas.cs
+System.Xml.Serialization/XmlSerializationCollectionFixupCallback.cs
+System.Xml.Serialization/XmlSerializationFixupCallback.cs
+System.Xml.Serialization/XmlSerializationReadCallback.cs
+System.Xml.Serialization/XmlSerializationReader.cs
+System.Xml.Serialization/XmlSerializationWriteCallback.cs
+System.Xml.Serialization/XmlSerializationWriter.cs
+System.Xml.Serialization/XmlSerializer.cs
+System.Xml.Serialization/XmlSerializerNamespaces.cs
+System.Xml.Serialization/XmlTextAttribute.cs
+System.Xml.Serialization/XmlTypeAttribute.cs
+System.Xml.Serialization/XmlTypeMapping.cs
+System.Xml.Serialization/XmlElementEventHandler.cs
+System.Xml.Serialization/XmlNodeEventHandler.cs
diff --git a/mcs/class/System.XML/makefile.gnu b/mcs/class/System.XML/makefile.gnu
new file mode 100644
index 00000000000..87bd748e327
--- /dev/null
+++ b/mcs/class/System.XML/makefile.gnu
@@ -0,0 +1,15 @@
+topdir = ../..
+
+LIBRARY = ../lib/System.Xml.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib -r System
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=\
+	./Test*	\
+	./System.Xml/Driver.cs
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/System/.cvsignore b/mcs/class/System/.cvsignore
new file mode 100644
index 00000000000..313d3b729f8
--- /dev/null
+++ b/mcs/class/System/.cvsignore
@@ -0,0 +1,4 @@
+System.dll
+list
+.makefrag
+.response
diff --git a/mcs/class/System/ChangeLog b/mcs/class/System/ChangeLog
new file mode 100644
index 00000000000..2ce0d0df462
--- /dev/null
+++ b/mcs/class/System/ChangeLog
@@ -0,0 +1,72 @@
+2002-08-15  Tim Coleman <tim@timcoleman.com>
+	* list.unix: Added System.IO files.
+
+2002-07-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* list:
+	* list.unix: added EnumConverter.cs
+
+2002-07-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* list:
+	* list.unix: added DerivedPropertyDescriptor.cs
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* list.unix: Added new file
+		System.ComponentModel.RecommendedAsConfigurableAttribute.cs
+		to build on unix.
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* list.unix: Added files to the build for linux
+		System.ComponentModel.BindableAttribute.cs,
+		System.ComponentModel.BindableSupport.cs,
+		System.ComponentModel.ExpandableObjectConverter.cs,
+		System.ComponentModel.NotifyParentPropertyAttribute.cs,
+		System.ComponentModel.ToolboxItemAttribute.cs,
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* list.unix: Added System.ComponentModel/DefaultEventAttribute.cs
+		and System.ComponentModel.DefaultProperty.cs to build
+
+
+2002-06-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.build: removed System.Drawing.dll dependency.
+
+2002-06-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.build: referenced System.Drawing.dll.
+
+2002-05-12  Lawrence Pit <loz@cable.a2000.nl>
+
+	* System.Security.Cryptography.X509Certificates: directory added
+	
+2002-05-09  Rodrigo Moya <rodrigo@ximian.com>
+
+	* System.build: don't exclude anymore excluded files in
+	System.ComponentModel. They compile on Linux, so they might also
+	on Windows.
+
+2002-05-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.build: excluded EventDescriptor.cs, 
+	EventDescriptorCollection.cs and ICustomTypeDescriptor.cs.
+
+2002-04-08  Nick Drochak  <ndrochak@gol.com>
+
+	* System.build: Build System.dll with mono's corlib.dll and 
+	System.Xml.dll.
+
+2002-01-23  Dick Porter  <dick@ximian.com>
+
+	* System.build: Start build System.Net.Sockets.Socket.cs,
+	TcpClient.cs and TcpListener.cs
+
+2001-12-07  Nick Drochak <ndrochak@gol.com>
+
+	* ChangeLog: Add the change log to this directory
+
+	* System.build: Add dependancy on linux target to test target. Need to 
+	have the dll before we can test it, right?  Plus it encourages others 
+	to try 'make test'.
+
diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs
new file mode 100644
index 00000000000..0a7802bc91c
--- /dev/null
+++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeGenerator.cs
@@ -0,0 +1,760 @@
+//
+// Mono.CSharp CSharpCodeProvider Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+namespace Mono.CSharp
+{
+	using System;
+	using System.CodeDom;
+	using System.CodeDom.Compiler;
+	using System.IO;
+	using System.Reflection;
+	using System.Collections;
+
+	internal class CSharpCodeGenerator
+		: CodeGenerator
+	{
+		//
+		// Constructors
+		//
+		public CSharpCodeGenerator()
+		{
+		}
+
+		//
+		// Properties
+		//
+		protected override string NullToken {
+			get {
+				return "null";
+			}
+		}
+
+		//
+		// Methods
+		//
+
+		protected override void GenerateArrayCreateExpression( CodeArrayCreateExpression expression )
+		{
+			//
+			// This tries to replicate MS behavior as good as
+			// possible.
+			//
+			// The Code-Array stuff in ms.net seems to be broken
+			// anyways, or I'm too stupid to understand it.
+			//
+			// I'm sick of it. If you try to develop array
+			// creations, test them on windows. If it works there
+			// but not in mono, drop me a note.  I'd be especially
+			// interested in jagged-multidimensional combinations
+			// with proper initialization :}
+			//
+
+			TextWriter output = Output;
+
+			output.Write( "new " );
+
+			CodeExpressionCollection initializers = expression.Initializers;
+			CodeTypeReference createType = expression.CreateType;
+
+			if ( initializers.Count > 0 ) {
+
+				OutputType( createType );
+				
+				output.WriteLine( " {" );
+				++Indent;
+				OutputExpressionList( initializers, true );
+				--Indent;
+				output.Write( "}" );
+
+			} else {
+				CodeTypeReference arrayType = createType.ArrayElementType;
+				while ( arrayType != null ) {
+					createType = arrayType;
+					arrayType = arrayType.ArrayElementType;
+				}
+
+				OutputType( createType );
+
+				output.Write( '[' );
+
+				CodeExpression size = expression.SizeExpression;
+				if ( size != null )
+					GenerateExpression( size );
+				else
+					output.Write( expression.Size );
+
+				output.Write( ']' );
+			}
+		}
+		
+		protected override void GenerateBaseReferenceExpression( CodeBaseReferenceExpression expression )
+		{
+			Output.Write( "base" );
+		}
+		
+		protected override void GenerateCastExpression( CodeCastExpression expression )
+		{
+			TextWriter output = Output;
+			output.Write( "((" );
+			OutputType( expression.TargetType );
+			output.Write( ")(" );
+			GenerateExpression( expression.Expression );
+			output.Write( "))" );
+		}
+
+
+		protected override void GenerateCompileUnitStart( CodeCompileUnit compileUnit )
+		{
+			GenerateComment( new CodeComment( "------------------------------------------------------------------------------" ) );
+			GenerateComment( new CodeComment( " <autogenerated>" ) );
+			GenerateComment( new CodeComment( "     This code was generated by a tool." ) );
+			GenerateComment( new CodeComment( "     Mono Runtime Version: " +  System.Environment.Version ) );
+			GenerateComment( new CodeComment( "" ) );
+			GenerateComment( new CodeComment( "     Changes to this file may cause incorrect behavior and will be lost if " ) );
+			GenerateComment( new CodeComment( "     the code is regenerated." ) );
+			GenerateComment( new CodeComment( " </autogenerated>" ) );
+			GenerateComment( new CodeComment( "------------------------------------------------------------------------------" ) );
+			Output.WriteLine();
+		}
+
+
+		protected override void GenerateDelegateCreateExpression( CodeDelegateCreateExpression expression )
+		{
+			TextWriter output = Output;
+
+			output.Write( "new " );
+
+			OutputType( expression.DelegateType );
+
+			output.Write( '(' );
+
+			CodeExpression targetObject = expression.TargetObject;
+			if ( targetObject != null ) {
+				GenerateExpression( targetObject );
+				Output.Write( '.' );
+			}
+			output.Write( expression.MethodName );
+
+			output.Write( ')' );
+		}
+
+		protected override void GenerateFieldReferenceExpression( CodeFieldReferenceExpression expression )
+		{
+			CodeExpression targetObject = expression.TargetObject;
+			if ( targetObject != null ) {
+				GenerateExpression( targetObject );
+				Output.Write( '.' );
+			}
+			Output.Write( expression.FieldName );
+		}
+		
+		protected override void GenerateArgumentReferenceExpression( CodeArgumentReferenceExpression expression )
+		{
+			Output.Write( expression.ParameterName );
+		}
+
+		protected override void GenerateVariableReferenceExpression( CodeVariableReferenceExpression expression )
+		{
+			Output.Write( expression.VariableName );
+		}
+			
+		protected override void GenerateIndexerExpression( CodeIndexerExpression expression )
+		{
+			TextWriter output = Output;
+
+			GenerateExpression( expression.TargetObject );
+			output.Write( '[' );
+			OutputExpressionList( expression.Indices );
+			output.Write( ']' );
+		}
+		
+		protected override void GenerateArrayIndexerExpression( CodeArrayIndexerExpression expression )
+		{
+			TextWriter output = Output;
+
+			GenerateExpression( expression.TargetObject );
+			output.Write( '[' );
+			OutputExpressionList( expression.Indices );
+			output.Write( ']' );
+		}
+		
+		protected override void GenerateSnippetExpression( CodeSnippetExpression expression )
+		{
+			Output.Write( expression.Value );
+		}
+		
+		protected override void GenerateMethodInvokeExpression( CodeMethodInvokeExpression expression )
+		{
+			TextWriter output = Output;
+
+			GenerateMethodReferenceExpression( expression.Method );
+
+			output.Write( '(' );
+			OutputExpressionList( expression.Parameters );
+			output.Write( ')' );
+		}
+
+		protected override void GenerateMethodReferenceExpression( CodeMethodReferenceExpression expression )
+		{
+			GenerateExpression( expression.TargetObject );
+			Output.Write( '.' );
+			Output.Write( expression.MethodName );
+		}
+
+		protected override void GenerateEventReferenceExpression( CodeEventReferenceExpression expression )
+		{
+			GenerateExpression( expression.TargetObject );
+			Output.Write( '.' );
+			Output.Write( expression.EventName );
+		}
+
+		protected override void GenerateDelegateInvokeExpression( CodeDelegateInvokeExpression expression )
+		{
+			GenerateExpression( expression.TargetObject );
+			Output.Write( '(' );
+			OutputExpressionList( expression.Parameters );
+			Output.Write( ')' );
+		}
+		
+		protected override void GenerateObjectCreateExpression( CodeObjectCreateExpression expression )
+		{
+			Output.Write( "new " );
+			OutputType( expression.CreateType );
+			Output.Write( '(' );
+			OutputExpressionList( expression.Parameters );
+			Output.Write( ')' );
+		}
+
+		protected override void GeneratePropertyReferenceExpression( CodePropertyReferenceExpression expression )
+		{
+			GenerateMemberReferenceExpression( expression.TargetObject,
+							   expression.PropertyName );
+		}
+
+		// TODO
+		protected override void GeneratePropertySetValueReferenceExpression( CodePropertySetValueReferenceExpression expression )
+		{
+			
+		}
+
+		protected override void GenerateThisReferenceExpression( CodeThisReferenceExpression expression )
+		{
+			Output.Write( "this" );
+		}
+
+		protected override void GenerateExpressionStatement( CodeExpressionStatement statement )
+		{
+			GenerateExpression( statement.Expression );
+			Output.WriteLine( ';' );
+		}
+
+		protected override void GenerateIterationStatement( CodeIterationStatement statement )
+		{
+			TextWriter output = Output;
+
+			output.Write( "for (" );
+			GenerateStatement( statement.InitStatement );
+			output.Write( "; " );
+			GenerateExpression( statement.TestExpression );
+			output.Write( "; " );
+			GenerateStatement( statement.IncrementStatement );
+			output.Write( ") " );
+			GenerateStatements( statement.Statements );
+		}
+
+		protected override void GenerateThrowExceptionStatement( CodeThrowExceptionStatement statement )
+		{
+			Output.Write( "throw " );
+			GenerateExpression( statement.ToThrow );
+		}
+
+		protected override void GenerateComment( CodeComment comment )
+		{
+			TextWriter output = Output;
+
+			if ( comment.DocComment )
+				output.Write( "/// " );
+			else
+				output.Write( "// " );
+
+			output.WriteLine( comment.Text );
+		}
+
+		protected override void GenerateMethodReturnStatement( CodeMethodReturnStatement statement )
+		{
+			TextWriter output = Output;
+
+			output.Write( "return " );
+
+			GenerateExpression( statement.Expression );
+
+			output.Write( ";" );
+		}
+
+		protected override void GenerateConditionStatement( CodeConditionStatement statement )
+		{
+			TextWriter output = Output;
+			output.Write( "if (" );
+
+			GenerateExpression( statement.Condition );
+
+			output.WriteLine( ") {" );
+			++Indent;
+			GenerateStatements( statement.TrueStatements );
+			--Indent;
+			output.Write( '}' );
+
+			CodeStatementCollection falses = statement.FalseStatements;
+			if ( falses.Count > 0 ) {
+				if ( Options.ElseOnClosing )
+					output.Write( ' ' );
+				else
+					output.WriteLine();
+				output.WriteLine( "else {" );
+				++Indent;
+				GenerateStatements( falses );
+				--Indent;
+				output.WriteLine( '}' );
+			}
+		}
+
+		protected override void GenerateTryCatchFinallyStatement( CodeTryCatchFinallyStatement statement )
+		{
+			TextWriter output = Output;
+			CodeGeneratorOptions options = Options;
+
+			output.WriteLine( "try {" );
+			++Indent;
+			GenerateStatements( statement.TryStatements );
+			--Indent;
+			output.Write( '}' );
+			
+			foreach ( CodeCatchClause clause in statement.CatchClauses ) {
+				if ( options.ElseOnClosing )
+					output.Write( ' ' );
+				else
+					output.WriteLine();
+				output.Write( "catch (" );
+				OutputTypeNamePair( clause.CatchExceptionType, clause.LocalName );
+				output.WriteLine( ") {" );
+				++Indent;
+				GenerateStatements( clause.Statements );
+				--Indent;
+				output.Write( '}' );
+			}
+
+			CodeStatementCollection finallies = statement.FinallyStatements;
+			if ( finallies.Count > 0 ) {
+				if ( options.ElseOnClosing )
+					output.Write( ' ' );
+				else
+					output.WriteLine();
+				output.WriteLine( "finally {" );
+				++Indent;
+				GenerateStatements( finallies );
+				--Indent;
+				output.WriteLine( '}' );
+			}
+
+			output.WriteLine();
+		}
+
+		protected override void GenerateAssignStatement( CodeAssignStatement statement )
+		{			
+			TextWriter output = Output;
+			GenerateExpression( statement.Left );
+			output.Write( " = " );
+			GenerateExpression( statement.Right );
+			output.WriteLine( ';' );
+		}
+
+		protected override void GenerateAttachEventStatement( CodeAttachEventStatement statement )
+		{
+			TextWriter output = Output;
+
+			GenerateEventReferenceExpression( statement.Event );
+			output.Write( " += " );
+			GenerateExpression( statement.Listener );
+			output.WriteLine( ';' );
+		}
+
+		protected override void GenerateRemoveEventStatement( CodeRemoveEventStatement statement )
+		{
+			TextWriter output = Output;
+			GenerateEventReferenceExpression( statement.Event );
+			Output.Write( " -= " );
+			GenerateExpression( statement.Listener );
+			output.WriteLine( ';' );
+		}
+
+		protected override void GenerateGotoStatement( CodeGotoStatement statement )
+		{
+			TextWriter output = Output;
+
+			output.Write( "goto " );
+			output.Write( statement.Label );
+			output.Write( ";" );
+		}
+		
+		protected override void GenerateLabeledStatement( CodeLabeledStatement statement )
+		{
+			TextWriter output = Output;
+
+			output.Write( statement.Label );
+			GenerateStatement( statement.Statement );
+		}
+
+		protected override void GenerateVariableDeclarationStatement( CodeVariableDeclarationStatement statement )
+		{
+			TextWriter output = Output;
+
+			OutputTypeNamePair( statement.Type, statement.Name );
+
+			CodeExpression initExpression = statement.InitExpression;
+			if ( initExpression != null ) {
+				output.Write( " = " );
+				GenerateExpression( initExpression );
+			}
+
+			output.WriteLine( ';' );
+		}
+
+		protected override void GenerateLinePragmaStart( CodeLinePragma linePragma )
+		{
+			Output.Write( "<GenerateLinePragmaStart>" );
+		}
+
+		protected override void GenerateLinePragmaEnd( CodeLinePragma linePragma )
+		{
+			Output.Write( "<GenerateLinePragmaEnd>" );
+		}
+
+		protected override void GenerateEvent( CodeMemberEvent eventRef, CodeTypeDeclaration declaration )
+		{
+			Output.Write( "<GenerateEvent>" );
+		}
+
+		protected override void GenerateField( CodeMemberField field )
+		{
+			TextWriter output = Output;
+
+			OutputAttributeDeclarations( field.CustomAttributes );
+
+			MemberAttributes attributes = field.Attributes;
+			OutputMemberAccessModifier( attributes );
+			OutputFieldScopeModifier( attributes );
+
+			OutputTypeNamePair( field.Type, field.Name );
+
+			CodeExpression initExpression = field.InitExpression;
+			if ( initExpression != null ) {
+				output.Write( " = " );
+				GenerateExpression( initExpression );
+			}
+
+			output.WriteLine( ';' );
+		}
+		
+		protected override void GenerateSnippetMember( CodeSnippetTypeMember member )
+		{
+			Output.Write( "<GenerateSnippetMember>" );
+		}
+		
+		protected override void GenerateEntryPointMethod( CodeEntryPointMethod method, 
+								  CodeTypeDeclaration declaration )
+		{
+			method.Name = "Main";
+			GenerateMethod( method, declaration );
+		}
+		
+		protected override void GenerateMethod( CodeMemberMethod method,
+							CodeTypeDeclaration declaration )
+		{
+			TextWriter output = Output;
+
+			OutputAttributeDeclarations( method.CustomAttributes );
+
+			MemberAttributes attributes = method.Attributes;
+
+			OutputMemberAccessModifier( attributes );
+			OutputMemberScopeModifier( attributes );
+
+			OutputType( method.ReturnType );
+
+			output.Write( ' ' );
+
+			CodeTypeReference privateType = method.PrivateImplementationType;
+			if ( privateType != null ) {
+				OutputType( privateType );
+				output.Write( '.' );
+			}
+			output.Write( method.Name );
+
+			output.Write( '(' );
+			OutputParameters( method.Parameters );
+			output.Write( ')' );
+
+			if ( (attributes & MemberAttributes.ScopeMask) == MemberAttributes.Abstract )
+				output.WriteLine( ';' );
+			else {
+				output.WriteLine( " {" );
+				++Indent;
+				GenerateStatements( method.Statements );
+				--Indent;
+				output.WriteLine( '}' );
+			}
+		}
+
+		protected override void GenerateProperty( CodeMemberProperty property,
+							  CodeTypeDeclaration declaration )
+		{
+			TextWriter output = Output;
+			output.Write( "<GenerateProperty>" );
+		}
+
+		protected override void GenerateConstructor( CodeConstructor constructor,
+							     CodeTypeDeclaration declaration )
+		{
+			Output.Write( "<GenerateConstructor>" );
+		}
+		
+		protected override void GenerateTypeConstructor( CodeTypeConstructor constructor )
+		{
+			Output.Write( "<GenerateTypeConstructor>" );
+		}
+
+		protected override void GenerateTypeStart( CodeTypeDeclaration declaration )
+		{
+			TextWriter output = Output;
+
+			TypeAttributes attributes = declaration.TypeAttributes;
+			OutputTypeAttributes( attributes,
+					      declaration.IsStruct,
+					      declaration.IsEnum );
+
+			output.Write( declaration.Name );
+			output.Write( ' ' );
+			
+			IEnumerator enumerator = declaration.BaseTypes.GetEnumerator();
+			if ( enumerator.MoveNext() ) {
+				CodeTypeReference type = (CodeTypeReference)enumerator.Current;
+			
+				output.Write( ": " );
+				OutputType( type );
+				
+				while ( enumerator.MoveNext() ) {
+					type = (CodeTypeReference)enumerator.Current;
+				
+					output.Write( ", " );
+					OutputType( type );
+				}
+
+				output.Write( ' ' );
+			}
+			output.WriteLine( "{" );
+			++Indent;
+		}
+
+		protected override void GenerateTypeEnd( CodeTypeDeclaration declaration )
+		{
+			--Indent;
+			Output.WriteLine( "}" );
+		}
+
+		protected override void GenerateNamespaceStart( CodeNamespace ns )
+		{
+			TextWriter output = Output;
+			
+			string name = ns.Name;
+			if ( name != null && name != "" ) {
+				output.Write( "namespace " );
+				output.Write( name );
+				output.WriteLine( " {" );
+				++Indent;
+			}
+		}
+
+		protected override void GenerateNamespaceEnd( CodeNamespace ns )
+		{
+			string name = ns.Name;
+			if ( name != null && name != "" ) {
+				--Indent;
+				Output.WriteLine( "}" );
+			}
+		}
+
+		protected override void GenerateNamespaceImport( CodeNamespaceImport import )
+		{
+			TextWriter output = Output;
+
+			output.Write( "using " );
+			output.Write( import.Namespace );
+			output.WriteLine( ';' );
+		}
+		
+		protected override void GenerateAttributeDeclarationsStart( CodeAttributeDeclarationCollection attributes )
+		{
+			Output.Write( '[' );
+		}
+		
+		protected override void GenerateAttributeDeclarationsEnd( CodeAttributeDeclarationCollection attributes )
+		{
+			Output.WriteLine( ']' );
+		}
+
+		protected override void OutputType( CodeTypeReference type )
+		{
+			Output.Write( GetTypeOutput( type ) );
+		}
+
+		protected override string QuoteSnippetString( string value )
+		{
+			return "\"" + value + "\"";
+			// FIXME: escape quotes
+		}
+
+		private void GenerateDeclaration( CodeTypeReference type, string name, CodeExpression initExpression )
+		{
+			TextWriter output = Output;
+
+			OutputTypeNamePair( type, name );
+
+			if ( initExpression != null ) {
+				output.Write( " = " );
+				GenerateExpression( initExpression );
+			}
+
+			output.WriteLine( ';' );
+		}
+		
+		private void GenerateMemberReferenceExpression( CodeExpression targetObject, string memberName )
+		{
+			GenerateExpression( targetObject );
+			Output.Write( '.' );
+			Output.Write( memberName );
+		}
+			
+		/* 
+		 * ICodeGenerator
+		 */
+
+		//[MonoTODO]
+		protected override string CreateEscapedIdentifier( string value )
+		{
+			return value;
+		}
+
+		//[MonoTODO]
+		protected override string CreateValidIdentifier( string value )
+		{
+			return value;
+		}
+
+		protected override string GetTypeOutput( CodeTypeReference type )
+		{
+			string output;
+			CodeTypeReference arrayType;
+
+			arrayType = type.ArrayElementType;
+			if ( arrayType != null )
+				output = GetTypeOutput( arrayType );
+			else { 
+				switch ( type.BaseType ) {
+
+				case "System.Decimal":
+					output = "decimal";
+					break;
+				case "System.Double":
+					output = "double";
+					break;
+				case "System.Single":
+					output = "float";
+					break;
+					
+				case "System.Byte":
+					output = "byte";
+					break;
+				case "System.SByte":
+					output = "sbyte";
+					break;
+				case "System.Int32":
+					output = "int";
+					break;
+				case "System.UInt32":
+					output = "uint";
+					break;
+				case "System.Int64":
+					output = "long";
+					break;
+				case "System.UInt64":
+					output = "ulong";
+					break;
+				case "System.Int16":
+					output = "short";
+					break;
+				case "System.UInt16":
+					output = "ushort";
+					break;
+
+				case "System.Boolean":
+					output = "bool";
+					break;
+					
+				case "System.Char":
+					output = "char";
+					break;
+
+				case "System.String":
+					output = "string";
+					break;
+				case "System.Object":
+					output = "object";
+					break;
+
+				case "System.Void":
+					output = "void";
+					break;
+
+				default:
+					output = type.BaseType;
+					break;
+				}
+			}
+
+			int rank = type.ArrayRank;
+			if ( rank > 0 ) {
+				output += "[";
+				for ( --rank; rank > 0; --rank  )
+					output += ",";
+				output += "]";
+			}
+
+			return output;
+		}
+
+		protected override bool IsValidIdentifier( string identifier )
+		{
+			return true;
+		}
+
+		protected override bool Supports( GeneratorSupport supports )
+		{
+			if ( (supports & GeneratorSupport.Win32Resources) != 0 )
+				return false;
+			return true;
+		}
+
+#if false
+		//[MonoTODO]
+		public override void ValidateIdentifier( string identifier )
+		{
+		}
+#endif
+	}
+}
diff --git a/mcs/class/System/Microsoft.CSharp/CSharpCodeProvider.cs b/mcs/class/System/Microsoft.CSharp/CSharpCodeProvider.cs
new file mode 100644
index 00000000000..c01d965ed6d
--- /dev/null
+++ b/mcs/class/System/Microsoft.CSharp/CSharpCodeProvider.cs
@@ -0,0 +1,55 @@
+//
+// Microsoft.CSharp CSharpCodeProvider Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+namespace Microsoft.CSharp
+{
+	using System;
+	using System.CodeDom.Compiler;
+	using System.ComponentModel;
+
+	public class CSharpCodeProvider
+		: CodeDomProvider
+	{
+		//
+		// Constructors
+		//
+		CSharpCodeProvider()
+		{
+		}
+
+		//
+		// Properties
+		//
+		public override string FileExtension {
+			get {
+				return "cs";
+			}
+		}
+
+		//
+		// Methods
+		//
+		[MonoTODO]
+		public override ICodeCompiler CreateCompiler()
+		{
+			throw new NotImplementedException();
+		}
+
+		public override ICodeGenerator CreateGenerator()
+		{
+			return new Mono.CSharp.CSharpCodeGenerator();
+		}
+		
+		[MonoTODO]
+		public override TypeConverter GetConverter( Type Type )
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/mcs/class/System/Microsoft.CSharp/ChangeLog b/mcs/class/System/Microsoft.CSharp/ChangeLog
new file mode 100644
index 00000000000..78d2a1090ad
--- /dev/null
+++ b/mcs/class/System/Microsoft.CSharp/ChangeLog
@@ -0,0 +1,10 @@
+2002-05-28  Daniel Stodden <stodden@in.tum.de>
+
+	* ChangeLog: added
+
+	* CSharpCodeProvider.cs: added
+
+	* CSharpCodeGenerator.cs: C# Code Generator. Not fully complete
+	but doing fairly well.
+
+
diff --git a/mcs/class/System/README b/mcs/class/System/README
new file mode 100755
index 00000000000..e7a0028b8af
--- /dev/null
+++ b/mcs/class/System/README
@@ -0,0 +1,8 @@
+Build instructions for use with the mono runtime.
+
+Run:
+	mcs @list.unix
+
+If no errors occourred, copy the generated System.dll file to the runtime dir
+(probably /usr/local/lib).
+
diff --git a/mcs/class/System/System.CodeDom.Compiler/ChangeLog b/mcs/class/System/System.CodeDom.Compiler/ChangeLog
new file mode 100755
index 00000000000..63003dd0f78
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/ChangeLog
@@ -0,0 +1,41 @@
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* CompilerError.cs: implemented.
+	* CompilerErrorCollection.cs: stubbed out and fix inheritance.
+	* GeneratorSupport.cs: fixed values.
+
+2002-05-28  Daniel Stodden <stodden@in.tum.de>
+
+	* CodeDomProvider.cs: added, incomplete
+
+	* CodeGeneratorOptions.cs: added, complete
+
+	* CompilerErrorCollection.cs: added, stub
+
+	* CompilerOptions.cs: added, stub
+
+	* CompilerResults.cs: added, complete
+
+	* GeneratorSupport.cs: added, complete
+
+	* ICodeCompiler.cs: added, complete
+
+	* ICodeParser.cs: added, complete
+
+	* IndentedTextWriter.cs: added, complete
+
+	* LanguageOptions.cs: added, complete
+
+	* TempFileCollection.cs: added, stub
+	
+	* ICodeGenerator.cs: added, complete
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* CodeGenerator.cs : Mark bits with MonoTODO.
+
+2001-07-15  Sean MacIsaac  <macisaac@ximian.com>
+
+	* CodeGenerator.cs: moved using statement out of namespace
+	declaration.
+
diff --git a/mcs/class/System/System.CodeDom.Compiler/CodeDomProvider.cs b/mcs/class/System/System.CodeDom.Compiler/CodeDomProvider.cs
new file mode 100644
index 00000000000..8490d637997
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/CodeDomProvider.cs
@@ -0,0 +1,69 @@
+//
+// System.CodeDom.Compiler CodeDomProvider Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.ComponentModel;
+using System.IO;
+
+namespace System.CodeDom.Compiler
+{
+	public abstract class CodeDomProvider
+		: Component
+	{
+		//
+		// Constructors
+		//
+		protected CodeDomProvider()
+		{
+		}
+
+		//
+		// Properties
+		//
+		public virtual string FileExtension {
+			get {
+				return String.Empty;
+			}
+		}
+
+		public virtual LanguageOptions LanguageOptions {
+			get {
+				return LanguageOptions.None;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public abstract ICodeCompiler CreateCompiler();
+
+		public abstract ICodeGenerator CreateGenerator();
+		
+		public virtual ICodeGenerator CreateGenerator( string fileName )
+		{
+			return CreateGenerator();
+		}
+
+		public virtual ICodeGenerator CreateGenerator( TextWriter output )
+		{
+			return CreateGenerator();
+		}
+
+		public virtual ICodeParser CreateParser()
+		{
+			return null;
+		}
+
+		[MonoTODO]
+		public virtual TypeConverter GetConverter( Type type )
+		{
+			throw new NotImplementedException();
+		}
+
+	}
+}
diff --git a/mcs/class/System/System.CodeDom.Compiler/CodeGenerator.cs b/mcs/class/System/System.CodeDom.Compiler/CodeGenerator.cs
new file mode 100755
index 00000000000..36ea5d13ef3
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/CodeGenerator.cs
@@ -0,0 +1,936 @@
+//
+// System.CodeDom.Compiler CodeGenerator class
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.CodeDom;
+using System.Reflection;
+using System.IO;
+using System.Collections;
+	
+namespace System.CodeDom.Compiler {
+
+	public abstract class CodeGenerator
+		: ICodeGenerator
+	{
+		private IndentedTextWriter output;
+		private CodeGeneratorOptions options;
+		private CodeTypeMember currentMember;
+		private CodeTypeDeclaration currentType;
+
+		//
+		// Constructors
+		//
+		protected CodeGenerator()
+		{
+		}
+
+		//
+		// Properties
+		//
+		protected CodeTypeMember CurrentMember {
+			get {
+				return currentMember;
+			}
+		}
+		
+		protected string CurrentMemberName {
+			get {
+				if ( currentType == null )
+					return null;
+				return currentMember.Name;
+			}
+		}
+
+		protected string CurrentTypeName {
+			get {
+				if ( currentType == null )
+					return null;
+				return currentType.Name;
+			}
+		}
+		
+		protected int Indent {
+			get {
+				return output.Indent;
+			}
+			set {
+				output.Indent = value;
+			}
+		}
+		
+		protected bool IsCurrentClass {
+			get {
+				if ( currentType == null )
+					return false;
+				return currentType.IsClass;
+			}
+		}
+
+		protected bool IsCurrentDelegate {
+			get {
+				return currentType is CodeTypeDelegate;
+			}
+		}
+
+		protected bool IsCurrentEnum {
+			get {
+				if ( currentType == null )
+					return false;
+				return currentType.IsEnum;
+			}
+		}
+
+		protected bool IsCurrentInterface {
+			get {
+				if ( currentType == null )
+					return false;
+				return currentType.IsInterface;
+			}
+		}
+
+		protected bool IsCurrentStruct {
+			get {
+				if ( currentType == null )
+					return false;
+				return currentType.IsStruct;
+			}
+		}
+
+		protected abstract string NullToken {
+			get;
+		}
+		
+		
+		protected CodeGeneratorOptions Options {
+			get {
+				return options;
+			}
+		}
+			
+		protected TextWriter Output {
+			get {
+				return output;
+			}
+		}
+
+		//
+		// Methods
+		//
+		protected virtual void ContinueOnNewLine( string st )
+		{
+		}
+
+		/*
+		 * Code Generation methods
+		 */
+		protected abstract void GenerateArgumentReferenceExpression (CodeArgumentReferenceExpression e);
+		protected abstract void GenerateArrayCreateExpression (CodeArrayCreateExpression e);
+		protected abstract void GenerateArrayIndexerExpression( CodeArrayIndexerExpression e );
+		protected abstract void GenerateAssignStatement (CodeAssignStatement s);
+		protected abstract void GenerateAttachEventStatement (CodeAttachEventStatement s);
+		protected abstract void GenerateAttributeDeclarationsStart( CodeAttributeDeclarationCollection attributes );
+		protected abstract void GenerateAttributeDeclarationsEnd( CodeAttributeDeclarationCollection attributes );
+		protected abstract void GenerateBaseReferenceExpression (CodeBaseReferenceExpression e);
+
+		protected virtual void GenerateBinaryOperatorExpression (CodeBinaryOperatorExpression e)
+		{
+			GenerateExpression( e.Left );
+			
+			switch ( e.Operator ) {
+			case CodeBinaryOperatorType.Add:
+				output.Write( " + " );
+				break;
+			case CodeBinaryOperatorType.Assign:
+				output.Write( " = " );
+				break;
+			case CodeBinaryOperatorType.BitwiseAnd:
+				output.Write( " & " );
+				break;
+			case CodeBinaryOperatorType.BitwiseOr:
+				output.Write( " | " );
+				break;
+			case CodeBinaryOperatorType.BooleanAnd:
+				output.Write( " && " );
+				break;
+			case CodeBinaryOperatorType.BooleanOr:
+				output.Write( " || " );
+				break;
+			case CodeBinaryOperatorType.Divide:
+				output.Write( " / " );
+				break;
+			case CodeBinaryOperatorType.GreaterThan:
+				output.Write( " > " );
+				break;
+			case CodeBinaryOperatorType.GreaterThanOrEqual:
+				output.Write( " >= " );
+				break;
+			case CodeBinaryOperatorType.IdentityEquality:
+				output.Write( " == " );
+				break;
+			case CodeBinaryOperatorType.IdentityInequality:
+				output.Write( " != " );
+				break;
+			case CodeBinaryOperatorType.LessThan:
+				output.Write( " < " );
+				break;
+			case CodeBinaryOperatorType.LessThanOrEqual:
+				output.Write( " <= " );
+				break;
+			case CodeBinaryOperatorType.Modulus:
+				output.Write( " % " );
+				break;
+			case CodeBinaryOperatorType.Multiply:
+				output.Write( " * " );
+				break;
+			case CodeBinaryOperatorType.Subtract:
+				output.Write( " - " );
+				break;
+			case CodeBinaryOperatorType.ValueEquality:
+				output.Write( " == " );
+				break;
+			}
+
+			GenerateExpression( e.Right );
+		}
+
+		protected abstract void GenerateCastExpression (CodeCastExpression e);
+		protected abstract void GenerateComment( CodeComment comment );
+
+		protected virtual void GenerateCommentStatement( CodeCommentStatement statement )
+		{
+			GenerateComment( statement.Comment );
+		}
+
+		protected virtual void GenerateCommentStatements (CodeCommentStatementCollection statements)
+		{
+			foreach ( CodeCommentStatement comment in statements )
+				GenerateCommentStatement( comment );
+		}
+
+		protected virtual void GenerateCompileUnit( CodeCompileUnit compileUnit )
+		{
+			GenerateCompileUnitStart( compileUnit );
+
+			CodeAttributeDeclarationCollection attributes = compileUnit.AssemblyCustomAttributes;
+			if ( attributes.Count != 0 ) {
+				GenerateAttributeDeclarationsStart( attributes );
+				output.Write( "assembly: " );
+				OutputAttributeDeclarations( compileUnit.AssemblyCustomAttributes );
+				GenerateAttributeDeclarationsEnd( attributes );
+			}
+
+			foreach ( CodeNamespace ns in compileUnit.Namespaces )
+				GenerateNamespace( ns );
+
+			GenerateCompileUnitEnd( compileUnit );
+		}
+
+		protected virtual void GenerateCompileUnitEnd( CodeCompileUnit compileUnit )
+		{
+			output.WriteLine( "<compileUnitEnd>" );
+		}
+
+		protected virtual void GenerateCompileUnitStart( CodeCompileUnit compileUnit )
+		{
+			output.WriteLine( "<compileUnitStart>" );
+		}
+
+		protected abstract void GenerateConditionStatement( CodeConditionStatement s );
+		protected abstract void GenerateConstructor (CodeConstructor x, CodeTypeDeclaration d);
+		protected abstract void GenerateDelegateCreateExpression( CodeDelegateCreateExpression e );
+		protected abstract void GenerateDelegateInvokeExpression( CodeDelegateInvokeExpression e );
+
+		protected virtual void GenerateDirectionExpression( CodeDirectionExpression e )
+		{
+			OutputDirection( e.Direction );
+			output.Write( ' ' );
+			GenerateExpression( e.Expression );
+		}
+
+		protected abstract void GenerateEntryPointMethod( CodeEntryPointMethod m, CodeTypeDeclaration d );
+		protected abstract void GenerateEvent( CodeMemberEvent ev, CodeTypeDeclaration d );
+		protected abstract void GenerateEventReferenceExpression( CodeEventReferenceExpression e );
+
+		protected void GenerateExpression( CodeExpression e )
+		{
+			CodeArgumentReferenceExpression argref = e as CodeArgumentReferenceExpression;
+			if ( argref != null ) {
+				GenerateArgumentReferenceExpression( argref );
+				return;
+			}
+			CodeArrayCreateExpression mkarray = e as CodeArrayCreateExpression;
+			if ( mkarray != null ) {
+				GenerateArrayCreateExpression( mkarray );
+				return;
+			}
+			CodeArrayIndexerExpression arrayidx = e as CodeArrayIndexerExpression;
+			if ( arrayidx != null ) {
+				GenerateArrayIndexerExpression( arrayidx );
+				return;
+			}
+			CodeBaseReferenceExpression baseref = e as CodeBaseReferenceExpression;
+			if ( baseref != null ) {
+				GenerateBaseReferenceExpression( baseref );
+				return;
+			}
+			CodeBinaryOperatorExpression binary = e as CodeBinaryOperatorExpression;
+			if ( binary != null ) {
+				GenerateBinaryOperatorExpression( binary );
+				return;
+			}
+			CodeCastExpression cast = e as CodeCastExpression;
+			if ( cast != null ) {
+				GenerateCastExpression( cast );
+				return;
+			}
+			CodeDelegateCreateExpression mkdel = e as CodeDelegateCreateExpression;
+			if ( mkdel != null ) {
+				GenerateDelegateCreateExpression( mkdel );
+				return;
+			}
+			CodeDelegateInvokeExpression delinvoke = e as CodeDelegateInvokeExpression;
+			if ( delinvoke != null ) {
+				GenerateDelegateInvokeExpression( delinvoke );
+				return;
+			}
+			CodeDirectionExpression direction = e as CodeDirectionExpression;
+			if ( direction != null ) {
+				GenerateDirectionExpression( direction );
+				return;
+			}
+			CodeEventReferenceExpression eventref = e as CodeEventReferenceExpression;
+			if ( eventref != null ) {
+				GenerateEventReferenceExpression( eventref );
+				return;
+			}
+			CodeFieldReferenceExpression fieldref = e as CodeFieldReferenceExpression;
+			if ( fieldref != null ) {
+				GenerateFieldReferenceExpression( fieldref );
+				return;
+			}
+			CodeIndexerExpression idx = e as CodeIndexerExpression;
+			if ( idx != null ) {
+				GenerateIndexerExpression( idx );
+				return;
+			}
+			CodeMethodInvokeExpression methodinv = e as CodeMethodInvokeExpression;
+			if ( methodinv != null ) {
+				GenerateMethodInvokeExpression( methodinv );
+				return;
+			}
+			CodeMethodReferenceExpression methodref = e as CodeMethodReferenceExpression;
+			if ( methodref != null ) {
+				GenerateMethodReferenceExpression( methodref );
+				return;
+			}
+			CodeObjectCreateExpression objref = e as CodeObjectCreateExpression;
+			if ( objref != null ) {
+				GenerateObjectCreateExpression( objref );
+				return;
+			}
+			CodeParameterDeclarationExpression param = e as CodeParameterDeclarationExpression;
+			if ( param != null ) {
+				GenerateParameterDeclarationExpression( param );
+				return;
+			}
+			CodePrimitiveExpression primitive = e as CodePrimitiveExpression;
+			if ( primitive != null ) {
+				GeneratePrimitiveExpression( primitive );
+				return;
+			}
+			CodePropertyReferenceExpression propref = e as CodePropertyReferenceExpression;
+			if ( propref != null ) {
+				GeneratePropertyReferenceExpression( propref );
+				return;
+			}
+			CodePropertySetValueReferenceExpression propset = e as CodePropertySetValueReferenceExpression;
+			if ( propset != null ) {
+				GeneratePropertySetValueReferenceExpression( propset );
+				return;
+			}
+			CodeSnippetExpression snippet = e as CodeSnippetExpression;
+			if ( snippet != null ) {
+				GenerateSnippetExpression( snippet );
+				return;
+			}
+			CodeThisReferenceExpression thisref = e as CodeThisReferenceExpression;
+			if ( thisref != null ) {
+				GenerateThisReferenceExpression( thisref );
+				return;
+			}
+			CodeTypeOfExpression typeOf = e as CodeTypeOfExpression;
+			if ( typeOf != null ) {
+				GenerateTypeOfExpression( typeOf );
+				return;
+			}
+			CodeTypeReferenceExpression typeref = e as CodeTypeReferenceExpression;
+			if ( typeref != null ) {
+				GenerateTypeReferenceExpression( typeref );
+				return;
+			}
+			CodeVariableReferenceExpression varref = e as CodeVariableReferenceExpression;
+			if ( varref != null ) {
+				GenerateVariableReferenceExpression( varref );
+				return;
+			}
+		}
+
+		protected abstract void GenerateExpressionStatement( CodeExpressionStatement statement );
+		protected abstract void GenerateField (CodeMemberField f);
+		protected abstract void GenerateFieldReferenceExpression (CodeFieldReferenceExpression e);
+		protected abstract void GenerateGotoStatement( CodeGotoStatement statement );
+		protected abstract void GenerateIndexerExpression (CodeIndexerExpression e);
+		protected abstract void GenerateIterationStatement( CodeIterationStatement s );
+		protected abstract void GenerateLabeledStatement( CodeLabeledStatement statement );
+		protected abstract void GenerateLinePragmaStart (CodeLinePragma p);
+		protected abstract void GenerateLinePragmaEnd (CodeLinePragma p);
+		protected abstract void GenerateMethod (CodeMemberMethod m, CodeTypeDeclaration d);
+		protected abstract void GenerateMethodInvokeExpression (CodeMethodInvokeExpression e);
+		protected abstract void GenerateMethodReferenceExpression( CodeMethodReferenceExpression e );
+		protected abstract void GenerateMethodReturnStatement (CodeMethodReturnStatement e);
+
+		protected virtual void GenerateNamespace (CodeNamespace ns)
+		{
+			foreach ( CodeCommentStatement statement in ns.Comments )
+				GenerateCommentStatement( statement );
+
+			GenerateNamespaceStart( ns );
+
+			foreach ( CodeNamespaceImport import in ns.Imports )
+				GenerateNamespaceImport( import );
+
+			output.WriteLine();
+
+			foreach ( CodeTypeDeclaration type in ns.Types )
+				GenerateCodeFromType( type, output, options );
+
+			GenerateNamespaceEnd( ns );
+		}
+
+		protected abstract void GenerateNamespaceStart (CodeNamespace ns);
+		protected abstract void GenerateNamespaceEnd (CodeNamespace ns);
+		protected abstract void GenerateNamespaceImport (CodeNamespaceImport i);
+		protected abstract void GenerateObjectCreateExpression (CodeObjectCreateExpression e);
+
+		protected virtual void GenerateParameterDeclarationExpression (CodeParameterDeclarationExpression e)
+		{
+			OutputAttributeDeclarations( e.CustomAttributes );
+			OutputDirection( e.Direction );
+			OutputType( e.Type );
+			output.Write( ' ' );
+			output.Write( e.Name );
+		}
+
+		protected virtual void GeneratePrimitiveExpression (CodePrimitiveExpression e)
+		{
+			output.Write( e.Value );
+		}
+
+		protected abstract void GenerateProperty (CodeMemberProperty p, CodeTypeDeclaration d);
+		protected abstract void GeneratePropertyReferenceExpression (CodePropertyReferenceExpression e);
+		protected abstract void GeneratePropertySetValueReferenceExpression( CodePropertySetValueReferenceExpression e );
+		protected abstract void GenerateRemoveEventStatement( CodeRemoveEventStatement statement );
+		protected abstract void GenerateSnippetExpression( CodeSnippetExpression e );
+		protected abstract void GenerateSnippetMember( CodeSnippetTypeMember m );
+		protected virtual void GenerateSnippetStatement( CodeSnippetStatement s )
+		{
+			output.Write( s.Value );
+		}
+
+		protected void GenerateStatement( CodeStatement s )
+		{
+			CodeAssignStatement assign = s as CodeAssignStatement;
+			if ( assign != null ) {
+				GenerateAssignStatement( assign );
+				return;
+			}
+			CodeAttachEventStatement attach = s as CodeAttachEventStatement;
+			if ( attach != null ) {
+				GenerateAttachEventStatement( attach );
+				return;
+			}
+			CodeCommentStatement comment = s as CodeCommentStatement;
+			if ( comment != null ) {
+				GenerateCommentStatement( comment );
+				return;
+			}
+			CodeConditionStatement condition = s as CodeConditionStatement;
+			if ( condition != null ) {
+				GenerateConditionStatement( condition );
+				return;
+			}
+			CodeExpressionStatement expression = s as CodeExpressionStatement;
+			if ( expression != null ) {
+				GenerateExpressionStatement( expression );
+				return;
+			}
+			CodeGotoStatement gotostmt = s as CodeGotoStatement;
+			if ( gotostmt != null ) {
+				GenerateGotoStatement( gotostmt );
+				return;
+			}
+			CodeIterationStatement iteration = s as CodeIterationStatement;
+			if ( iteration != null ) {
+				GenerateIterationStatement( iteration );
+				return;
+			}
+			CodeLabeledStatement label = s as CodeLabeledStatement;
+			if ( label != null ) {
+				GenerateLabeledStatement( label );
+				return;
+			}
+			CodeMethodReturnStatement returnstmt = s as CodeMethodReturnStatement;
+			if ( returnstmt != null ) {
+				GenerateMethodReturnStatement( returnstmt );
+				return;
+			}
+			CodeRemoveEventStatement remove = s as CodeRemoveEventStatement;
+			if ( remove != null ) {
+				GenerateRemoveEventStatement( remove );
+				return;
+			}
+			CodeSnippetStatement snippet = s as CodeSnippetStatement;
+			if ( snippet != null ) {
+				GenerateSnippetStatement( snippet );
+				return;
+			}
+			CodeThrowExceptionStatement exception = s as CodeThrowExceptionStatement;
+			if ( exception != null ) {
+				GenerateThrowExceptionStatement( exception );
+				return;
+			}
+			CodeTryCatchFinallyStatement trycatch = s as CodeTryCatchFinallyStatement;
+			if ( trycatch != null ) {
+				GenerateTryCatchFinallyStatement( trycatch );
+				return;
+			}
+			CodeVariableDeclarationStatement declaration = s as CodeVariableDeclarationStatement;
+			if ( declaration != null ) {
+				GenerateVariableDeclarationStatement( declaration );
+				return;
+			}
+		}
+
+		protected void GenerateStatements( CodeStatementCollection c )
+		{
+			foreach ( CodeStatement statement in c )
+				GenerateStatement( statement );
+		}
+
+		protected abstract void GenerateThisReferenceExpression (CodeThisReferenceExpression e);
+		protected abstract void GenerateThrowExceptionStatement (CodeThrowExceptionStatement s);
+		protected abstract void GenerateTryCatchFinallyStatement (CodeTryCatchFinallyStatement s);
+		protected abstract void GenerateTypeEnd( CodeTypeDeclaration declaration );
+		protected abstract void GenerateTypeConstructor( CodeTypeConstructor constructor );
+
+		protected virtual void GenerateTypeOfExpression (CodeTypeOfExpression e)
+		{
+			output.Write( "typeof(" );
+			OutputType( e.Type );
+			output.Write( ")" );
+		}
+
+		protected virtual void GenerateTypeReferenceExpression (CodeTypeReferenceExpression e)
+		{
+			OutputType( e.Type );
+		}
+
+		protected abstract void GenerateTypeStart( CodeTypeDeclaration declaration );
+		protected abstract void GenerateVariableDeclarationStatement (CodeVariableDeclarationStatement e);
+		protected abstract void GenerateVariableReferenceExpression( CodeVariableReferenceExpression e );
+
+		//
+		// Other members
+		//
+		
+		/*
+		 * Output Methods
+		 */
+		protected virtual void OutputAttributeArgument( CodeAttributeArgument argument )
+		{
+			string name = argument.Name;
+			if ( name != null ) {
+				output.Write( name );
+				output.Write( '=' );
+			}
+			GenerateExpression( argument.Value );
+		}
+
+		private void OutputAttributeDeclaration( CodeAttributeDeclaration attribute )
+		{
+			output.Write( attribute.Name );
+			output.Write( '(' );
+			IEnumerator enumerator = attribute.Arguments.GetEnumerator();
+			if ( enumerator.MoveNext() ) {
+				CodeAttributeArgument argument = (CodeAttributeArgument)enumerator.Current;
+				OutputAttributeArgument( argument );
+				
+				while ( enumerator.MoveNext() ) {
+					output.Write( ',' );
+					argument = (CodeAttributeArgument)enumerator.Current;
+					OutputAttributeArgument( argument );
+				}
+			}
+			output.Write( ')' );
+		}
+
+		protected virtual void OutputAttributeDeclarations( CodeAttributeDeclarationCollection attributes )
+		{
+			GenerateAttributeDeclarationsStart( attributes );
+			
+			IEnumerator enumerator = attributes.GetEnumerator();
+			if ( enumerator.MoveNext() ) {
+				CodeAttributeDeclaration attribute = (CodeAttributeDeclaration)enumerator.Current;
+
+				OutputAttributeDeclaration( attribute );
+				
+				while ( enumerator.MoveNext() ) {
+					attribute = (CodeAttributeDeclaration)enumerator.Current;
+
+					output.WriteLine( ',' );
+					OutputAttributeDeclaration( attribute );
+				}
+			}
+
+			GenerateAttributeDeclarationsEnd( attributes );
+		}
+
+		protected virtual void OutputDirection( FieldDirection direction )
+		{
+			switch ( direction ) {
+			case FieldDirection.In:
+				output.Write( "in " );
+				break;
+			case FieldDirection.Out:
+				output.Write( "out " );
+				break;
+			case FieldDirection.Ref:
+				output.Write( "ref " );
+				break;
+			}
+		}
+
+		protected virtual void OutputExpressionList( CodeExpressionCollection expressions )
+		{
+			OutputExpressionList( expressions, false );
+		}
+
+		protected virtual void OutputExpressionList( CodeExpressionCollection expressions,
+							     bool newLineBetweenItems )
+		{
+			IEnumerator enumerator = expressions.GetEnumerator();
+			if ( enumerator.MoveNext() ) {
+				CodeExpression expression = (CodeExpression)enumerator.Current;
+
+				GenerateExpression( expression );
+				
+				while ( enumerator.MoveNext() ) {
+					expression = (CodeExpression)enumerator.Current;
+					
+					output.Write( ',' );
+					if ( newLineBetweenItems )
+						output.WriteLine();
+					else
+						output.Write( ' ' );
+					
+					GenerateExpression( expression );
+				}
+			}
+		}
+
+		protected virtual void OutputFieldScopeModifier( MemberAttributes attributes )
+		{
+			if ( (attributes & MemberAttributes.VTableMask) == MemberAttributes.New )
+				output.Write( "new " );
+
+			switch ( attributes & MemberAttributes.ScopeMask ) {
+			case MemberAttributes.Static:
+				output.Write( "static " );
+				break;
+			case MemberAttributes.Const:
+				output.Write( "const " );
+				break;
+			}
+		}
+
+		protected virtual void OutputIdentifier( string ident )
+		{
+		}
+
+		protected virtual void OutputMemberAccessModifier( MemberAttributes attributes )
+		{
+			switch ( attributes & MemberAttributes.AccessMask ) {
+			case MemberAttributes.Assembly:
+				output.Write( "internal " );
+				break;
+			case MemberAttributes.FamilyAndAssembly:
+				output.Write( "/* FamAndAssem */ internal " ); 
+				break;
+			case MemberAttributes.Family:
+				output.Write( "protected " );
+				break;
+			case MemberAttributes.FamilyOrAssembly:
+				output.Write( "protected internal " );
+				break;
+			case MemberAttributes.Private:
+				output.Write( "private " );
+				break;
+			case MemberAttributes.Public:
+				output.Write( "public " );
+				break;
+			}
+		}
+
+		protected virtual void OutputMemberScopeModifier( MemberAttributes attributes )
+		{
+			if ( (attributes & MemberAttributes.VTableMask) == MemberAttributes.New )
+				output.Write( "new " );
+
+			switch ( attributes & MemberAttributes.ScopeMask ) {
+			case MemberAttributes.Abstract:
+				output.Write( "abstract " );
+				break;
+			case MemberAttributes.Final:
+				output.Write( "sealed " );
+				break;
+			case MemberAttributes.Static:
+				output.Write( "static " );
+				break;
+			case MemberAttributes.Override:
+				output.Write( "override " );
+				break;
+			default:
+				//
+				// FUNNY! if the scope value is
+				// rubbish (0 or >Const), and access
+				// is public or protected, make it
+				// "virtual".
+				//
+				// i'm not sure whether this is 100%
+				// correct, but it seems to be MS
+				// behavior. 
+				//
+				MemberAttributes access = attributes & MemberAttributes.AccessMask;
+				if ( access == MemberAttributes.Public || 
+				     access == MemberAttributes.Family )
+					output.Write( "virtual " );
+				break;
+			}
+		}
+				
+		protected virtual void OutputOperator( CodeBinaryOperatorType op )
+		{
+		}
+
+		protected virtual void OutputParameters( CodeParameterDeclarationExpressionCollection parameters )
+		{
+		}
+
+		protected abstract void OutputType( CodeTypeReference t );
+
+		protected virtual void OutputTypeAttributes( TypeAttributes attributes,
+							     bool isStruct,
+							     bool isEnum )
+		{
+			switch ( attributes & TypeAttributes.VisibilityMask ) {
+			case TypeAttributes.NotPublic:
+				// private by default
+				break; 
+
+			case TypeAttributes.Public:
+			case TypeAttributes.NestedPublic:
+				output.Write( "public " );
+				break;
+
+			case TypeAttributes.NestedPrivate:
+				output.Write( "private " );
+				break;
+			}
+
+			if ( isStruct )
+
+				output.Write( "struct " );
+
+			else if ( isEnum )
+
+				output.Write( "enum " );
+
+			else {
+				if ( (attributes & TypeAttributes.Interface) != 0 ) 
+
+					output.Write( "interface " );
+
+				else {
+
+					if ( (attributes & TypeAttributes.Sealed) != 0 )
+						output.Write( "sealed " );
+
+					if ( (attributes & TypeAttributes.Abstract) != 0 )
+						output.Write( "abstract " );
+					
+					output.Write( "class " );
+				}
+			}
+		}
+		
+		protected virtual void OutputTypeNamePair( CodeTypeReference type,
+							   string name )
+		{
+			OutputType( type );
+			output.Write( ' ' );
+			output.Write( name );
+		}
+
+		protected abstract string QuoteSnippetString( string value );
+
+		/*
+		 * ICodeGenerator
+		 */
+		protected abstract string CreateEscapedIdentifier( string value );
+		string ICodeGenerator.CreateEscapedIdentifier( string value )
+		{
+			return CreateEscapedIdentifier( value );
+		}
+
+		protected abstract string CreateValidIdentifier( string value );
+		string ICodeGenerator.CreateValidIdentifier( string value )
+		{
+			return CreateValidIdentifier( value );
+		}
+
+		private void InitOutput( TextWriter output, CodeGeneratorOptions options )
+		{
+			if ( options == null )
+				options = new CodeGeneratorOptions();
+				
+			this.output = new IndentedTextWriter( output, options.IndentString );
+			this.options = options;
+		}
+
+		public virtual void GenerateCodeFromCompileUnit( CodeCompileUnit compileUnit,
+								 TextWriter output,
+								 CodeGeneratorOptions options )
+		{
+			InitOutput( output, options );
+			GenerateCompileUnit( compileUnit );
+		}
+
+		[MonoTODO]
+		public virtual void GenerateCodeFromExpression( CodeExpression expression,
+								TextWriter output,
+								CodeGeneratorOptions options )
+		{
+			InitOutput( output, options );
+		}
+
+		public virtual void GenerateCodeFromNamespace( CodeNamespace ns,
+							       TextWriter output, 
+							       CodeGeneratorOptions options )
+		{
+			InitOutput( output, options );
+			GenerateNamespace( ns );
+		}
+
+		public virtual void GenerateCodeFromStatement( CodeStatement statement,
+							       TextWriter output, 
+							       CodeGeneratorOptions options )
+		{
+			InitOutput( output, options );
+		}
+
+		public virtual void GenerateCodeFromType( CodeTypeDeclaration type,
+							  TextWriter output,
+							  CodeGeneratorOptions options )
+		{
+			CodeTypeDeclaration prevType = this.currentType;
+			this.currentType = type;
+
+			InitOutput( output, options );
+
+			GenerateTypeStart( type );
+
+			foreach ( CodeTypeMember member in type.Members ) {
+
+				CodeTypeMember prevMember = this.currentMember;
+				this.currentMember = member;
+
+				if ( options.BlankLinesBetweenMembers )
+					output.WriteLine();
+
+				CodeMemberEvent eventm = member as CodeMemberEvent;
+				if ( eventm != null ) {
+					GenerateEvent( eventm, type );
+					continue;
+				}
+				CodeMemberField field = member as CodeMemberField;
+				if ( field != null ) {
+					GenerateField( field );
+					continue;
+				}
+				CodeMemberMethod method = member as CodeMemberMethod;
+				if ( method != null ) {
+					GenerateMethod( method, type );
+					continue;
+				}
+				CodeMemberProperty property = member as CodeMemberProperty;
+				if ( property != null ) {
+					GenerateProperty( property, type );
+					continue;
+				}
+				CodeSnippetTypeMember snippet = member as CodeSnippetTypeMember;
+				if ( snippet != null ) {
+					GenerateSnippetMember( snippet );
+					continue;
+				}
+				CodeTypeDeclaration subtype = member as CodeTypeDeclaration;
+				if ( subtype != null ) {
+					GenerateCodeFromType( subtype, output, options );
+					continue;
+				}
+				
+				this.currentMember = prevMember;
+			}
+				
+			GenerateTypeEnd( type );
+			this.currentType = prevType;
+		}
+
+		protected abstract string GetTypeOutput( CodeTypeReference type );
+
+		string ICodeGenerator.GetTypeOutput( CodeTypeReference type )
+		{
+			return GetTypeOutput( type );
+		}
+
+		protected abstract bool IsValidIdentifier( string value );
+
+		bool ICodeGenerator.IsValidIdentifier( string value )
+		{
+			return IsValidIdentifier( value );
+		}
+
+		protected abstract bool Supports( GeneratorSupport supports );
+
+		bool ICodeGenerator.Supports( GeneratorSupport value )
+		{
+			return Supports( value );
+		}
+
+		[MonoTODO]
+		protected virtual void ValidateIdentifier( string value )
+		{
+			throw new NotImplementedException();
+		}
+
+		void ICodeGenerator.ValidateIdentifier( string value )
+		{
+			ValidateIdentifier( value );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom.Compiler/CodeGeneratorOptions.cs b/mcs/class/System/System.CodeDom.Compiler/CodeGeneratorOptions.cs
new file mode 100644
index 00000000000..b95b620f66e
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/CodeGeneratorOptions.cs
@@ -0,0 +1,99 @@
+//
+// System.CodeDom.Compiler CodeGeneratorOptions class
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+
+namespace System.CodeDom.Compiler
+{
+	public class CodeGeneratorOptions
+	{
+		private IDictionary properties;
+		
+		//
+		// Constructors
+		//
+		public CodeGeneratorOptions()
+		{
+			properties = new ListDictionary();
+			properties.Add( "BlankLinesBetweenMembers", true );
+			properties.Add( "BracingStyle", "Block" );
+			properties.Add( "ElseOnClosing", false );
+			properties.Add( "IndentString", "    " );
+		}
+
+		//
+		// Properties
+		//
+
+		/// <summary>
+		/// Whether to insert blank lines between individual members.
+		/// Default is true.
+		/// </summary>
+		public bool BlankLinesBetweenMembers {
+			get {
+				return (bool)properties["BlankLinesBetweenMembers"];
+			}
+			set {
+				properties["BlankLinesBetweenMembers"] = value;
+			}
+		}
+
+		/// <summary>
+		/// "Block" puts braces on the same line as the associated statement or declaration.
+		/// "C" puts braces on the following line.
+		/// Default is "C"
+		/// </summary>
+		public string BracingStyle {
+			get {
+				return (string)properties["BracingStyle"];
+			}
+			set {
+				properties["BracingStyle"] = value;
+			}
+		}
+
+		/// <summary>
+		/// Whether to start <code>else</code>,
+		/// <code>catch</code>, or <code>finally</code>
+		/// blocks on the same line as the previous block.
+		/// Default is false.
+		/// </summary>
+		public bool ElseOnClosing {
+			get {
+				return (bool)properties["ElseOnClosing"];
+			}
+			set {
+				properties["ElseOnClosing"] = value;
+			}
+		}
+
+		/// <summary>
+		/// The string used for individual indentation levels. Default is four spaces.
+		/// </summary>
+		public string IndentString {
+			get {
+				return (string)properties["IndentString"];
+			}
+			set {
+				properties["IndentString"] = value;
+			}
+		}
+
+		public Object this[string index] {
+			get {
+				return properties[index];
+			}
+			set {
+				properties[index] = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom.Compiler/CompilerError.cs b/mcs/class/System/System.CodeDom.Compiler/CompilerError.cs
new file mode 100644
index 00000000000..07ca418218c
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/CompilerError.cs
@@ -0,0 +1,81 @@
+//
+// System.CodeDom.Compiler.CompilerError
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+
+namespace System.CodeDom.Compiler
+{
+	public class CompilerError
+	{
+		string fileName;
+		int line;
+		int column;
+		string errorNumber;
+		string errorText;
+		bool isWarning = false;
+
+		public CompilerError () :
+			this (String.Empty, 0, 0, String.Empty, String.Empty)
+		{
+		}
+
+		public CompilerError (string fileName, int line, int column, string errorNumber, string errorText)
+		{
+			this.fileName = fileName;
+			this.line = line;
+			this.column = column;
+			this.errorNumber = errorNumber;
+			this.errorText = errorText;
+		}
+
+		public override string ToString ()
+		{
+			string type = isWarning ? "warning" : "error";
+			return String.Format ("{0}({1},{2}) : {3} {4}: {5}", fileName, line, column, type,
+									    errorNumber, errorText);
+		}
+
+		public int Line
+		{
+			get { return line; }
+			set { line = value; }
+		}
+
+		public int Column
+		{
+			get { return column; }
+			set { column = value; }
+		}
+
+		public string ErrorNumber
+		{
+			get { return errorNumber; }
+			set { errorNumber = value; }
+		}
+
+		public string ErrorText
+		{
+			get { return errorText; }
+			set { errorText = value; }
+		}
+
+		public bool IsWarning
+		{
+			get { return isWarning; }
+			set { isWarning = value; }
+		}
+
+		public string FileName
+		{
+			get { return fileName; }
+			set { fileName = value; }
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.CodeDom.Compiler/CompilerErrorCollection.cs b/mcs/class/System/System.CodeDom.Compiler/CompilerErrorCollection.cs
new file mode 100644
index 00000000000..9d39c2fe6c9
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/CompilerErrorCollection.cs
@@ -0,0 +1,111 @@
+//
+// System.CodeDom.Compiler CompilerErrorCollection Class implementation
+//
+// Authors:
+// 	Daniel Stodden (stodden@in.tum.de)
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+using System.Collections;
+namespace System.CodeDom.Compiler
+{
+	[MonoTODO]
+	public class CompilerErrorCollection : CollectionBase
+	{
+		[MonoTODO]
+		public CompilerErrorCollection ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public CompilerErrorCollection (CompilerErrorCollection value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public CompilerErrorCollection (CompilerError[] value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public int Add (CompilerError value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void AddRange (CompilerError[] value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void AddRange (CompilerErrorCollection value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public bool Contains (CompilerError value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void CopyTo (CompilerError[] array, int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public int IndexOf (CompilerError value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Insert (int index, CompilerError value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Remove (CompilerError value)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public CompilerError this [int index]
+		{
+			get {
+				throw new NotImplementedException ();
+			}
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public bool HasErrors
+		{
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public bool HasWarnings
+		{
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+	}
+
+}
+
diff --git a/mcs/class/System/System.CodeDom.Compiler/CompilerOptions.cs b/mcs/class/System/System.CodeDom.Compiler/CompilerOptions.cs
new file mode 100644
index 00000000000..cd25110d763
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/CompilerOptions.cs
@@ -0,0 +1,16 @@
+//
+// System.CodeDom.Compiler CompilerOptions Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+namespace System.CodeDom.Compiler
+{
+	public class CompilerOptions
+	{
+		// FIXME
+	}
+}
diff --git a/mcs/class/System/System.CodeDom.Compiler/CompilerParameters.cs b/mcs/class/System/System.CodeDom.Compiler/CompilerParameters.cs
new file mode 100644
index 00000000000..5b41a9cc58d
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/CompilerParameters.cs
@@ -0,0 +1,160 @@
+//
+// System.CodeDom.Compiler CompilerParameters Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Collections.Specialized;
+
+namespace System.CodeDom.Compiler
+{
+	public class CompilerParameters
+	{
+		private CompilerOptions compilerOptions;
+		private bool generateExecutables;
+		private bool generateInMemory;
+		private bool includeDebugInformation;
+		private string mainClass;
+		private string outputAssembly;
+		private StringCollection referencedAssemblies;
+		private TempFileCollection tempFiles;
+		private bool treatWarningsAsErrors;
+		private IntPtr userToken;
+		private int warningLevel;
+		private string win32Resources;
+
+		//
+		// Constructors
+		//
+		public CompilerParameters()
+		{
+		}
+		
+		public CompilerParameters( string[] assemblyNames )
+		{
+		}
+
+		public CompilerParameters( string[] assemblyNames, string output )
+		{
+		}
+
+		public CompilerParameters( string[] assemblyNames, string output, bool includeDebugInfo )
+		{
+		}
+
+		
+		//
+		// Properties
+		//
+		public CompilerOptions CompilerOptions {
+			get {
+				return compilerOptions;
+			}
+			set {
+				compilerOptions = value;
+			}
+		}
+
+		public bool GenerateExecutables {
+			get {
+				return generateExecutables;
+			}
+			set {
+				generateExecutables = value;
+			}
+		}
+
+		public bool GenerateInMemory {
+			get {
+				return generateInMemory;
+			}
+			set {
+				generateInMemory = value;
+			}
+		}
+		
+		public bool IncludeDebugInformation {
+			get {
+				return includeDebugInformation;
+			}
+			set {
+				includeDebugInformation = value;
+			}
+		}
+
+		public string MainClass {
+			get {
+				return mainClass;
+			}
+			set {
+				mainClass = value;
+			}
+		}
+
+		public string OutputAssembly {
+			get {
+				return outputAssembly;
+			}
+			set {
+				outputAssembly = value;
+			}
+		}
+
+		public StringCollection ReferencedAssemblies {
+			get {
+				return referencedAssemblies;
+			}
+			set {
+				referencedAssemblies = value;
+			}
+		}
+
+		public TempFileCollection TempFiles {
+			get {
+				return tempFiles;
+			}
+			set {
+				tempFiles = value;
+			}
+		}
+
+		public bool TreatWarningsAsErrors {
+			get {
+				return treatWarningsAsErrors;
+			}
+			set {
+				treatWarningsAsErrors = value;
+			}
+		}
+
+		public IntPtr UserToken {
+			get {
+				return userToken;
+			}
+			set {
+				userToken = value;
+			}
+		}
+
+		public int WarningLevel {
+			get {
+				return warningLevel;
+			}
+			set {
+				warningLevel = value;
+			}
+		}
+		
+		public string Win32Resources {
+			get {
+				return win32Resources;
+			}
+			set {
+				win32Resources = value;
+			}
+		}
+	}
+};
diff --git a/mcs/class/System/System.CodeDom.Compiler/CompilerResults.cs b/mcs/class/System/System.CodeDom.Compiler/CompilerResults.cs
new file mode 100644
index 00000000000..ee1719cd053
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/CompilerResults.cs
@@ -0,0 +1,87 @@
+//
+// System.CodeDom.Compiler CompilerResults Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+namespace System.CodeDom.Compiler
+{
+	using System.Reflection;
+	using System.Collections.Specialized;
+
+	public class CompilerResults
+	{
+		private Assembly compiledAssembly;
+		private CompilerErrorCollection errors;
+		private int nativeCompilerReturnValue;
+		private StringCollection output;
+		private string pathToAssembly;
+		private TempFileCollection tempFiles;
+		
+		//
+		// Constructors
+		//
+		public CompilerResults( TempFileCollection tempFiles )
+		{
+			this.tempFiles = tempFiles;
+		}
+
+		//
+		// Properties
+		//
+		public Assembly CompiledAssembly {
+			get {
+				return compiledAssembly;
+			}
+			set {
+				compiledAssembly = value;
+			}
+		}
+
+		public CompilerErrorCollection Errors {
+			get {
+				if ( errors == null )
+					errors = new CompilerErrorCollection();
+				return errors;
+			}
+		}
+
+		public int NativeCompilerReturnValue {
+			get {
+				return nativeCompilerReturnValue;
+			}
+			set {
+				nativeCompilerReturnValue = value;
+			}
+		}
+
+		public StringCollection Output {
+			get {
+				if ( output == null )
+					output = new StringCollection();
+				return output;
+			}
+		}
+
+		public string PathToAssembly {
+			get {
+				return pathToAssembly;
+			}
+			set {
+				pathToAssembly = value;
+			}
+		}
+
+		public TempFileCollection TempFiles {
+			get {
+				return tempFiles;
+			}
+			set {
+				tempFiles = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom.Compiler/GeneratorSupport.cs b/mcs/class/System/System.CodeDom.Compiler/GeneratorSupport.cs
new file mode 100644
index 00000000000..354c97d5dbf
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/GeneratorSupport.cs
@@ -0,0 +1,38 @@
+//
+// System.CodeDom.Compiler GeneratorSupport Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+namespace System.CodeDom.Compiler
+{
+	[Flags]
+	[Serializable]
+	public enum GeneratorSupport {
+		ArraysOfArrays = 1,
+		EntryPointMethod = 1 << 1,
+		GotoStatements = 1 << 2,
+		MultidimensionalArrays = 1 << 3,
+		StaticConstructors = 1 << 4,
+		TryCatchStatements = 1 << 5,
+		ReturnTypeAttributes = 1 << 6,
+		DeclareValueTypes = 1 << 7,
+		DeclareEnums = 1 << 8,
+		DeclareDelegates = 1 << 9,
+		DeclareInterfaces = 1 << 10,
+		DeclareEvents = 1 << 11,
+		AssemblyAttributes = 1 << 12,
+		ParameterAttributes = 1 << 13,
+		ReferenceParameters = 1 << 14,
+		ChainedConstructorArguments = 1 << 15,
+		NestedTypes = 1 << 16,
+		MultipleInterfaceMembers = 1 << 17,
+		PublicStaticMembers = 1 << 18,
+		ComplexExpressions = 1 << 19,
+		Win32Resources = 1 << 20
+	}
+}
+
diff --git a/mcs/class/System/System.CodeDom.Compiler/ICodeCompiler.cs b/mcs/class/System/System.CodeDom.Compiler/ICodeCompiler.cs
new file mode 100644
index 00000000000..2a6484b0928
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/ICodeCompiler.cs
@@ -0,0 +1,32 @@
+//
+// System.CodeDom.Compiler ICodeCompiler Interface
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+namespace System.CodeDom.Compiler
+{
+	public interface ICodeCompiler
+	{
+		CompilerResults CompileAssemblyFromDom( CompilerParameters options,
+							CodeCompileUnit compilationUnit );
+
+		CompilerResults CompileAssemblyFromDomBatch( CompilerParameters options,
+							     CodeCompileUnit[] batch );
+
+		CompilerResults CompileAssemblyFromFile( CompilerParameters options,
+							 string fileName );
+
+		CompilerResults CompileAssemblyFromFileBatch( CompilerParameters options,
+							      string[] batch );
+
+		CompilerResults CompileAssemblyFromSource( CompilerParameters options,
+							   string source );
+
+		CompilerResults CompileAssemblyFromSourceBatch( CompilerParameters options,
+								string[] batch );
+	}
+}
diff --git a/mcs/class/System/System.CodeDom.Compiler/ICodeGenerator.cs b/mcs/class/System/System.CodeDom.Compiler/ICodeGenerator.cs
new file mode 100755
index 00000000000..a853048d20d
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/ICodeGenerator.cs
@@ -0,0 +1,53 @@
+//
+// System.CodeDom.Compiler ICodeGenerator Interface
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+namespace System.CodeDom.Compiler
+{
+	using System.CodeDom;
+	using System.IO;
+
+	public interface ICodeGenerator
+	{
+		//
+		// Methods
+		//
+		string CreateEscapedIdentifier( string value );
+
+		string CreateValidIdentifier( string value );
+
+		void GenerateCodeFromCompileUnit( CodeCompileUnit compileUnit,
+						  TextWriter output,
+						  CodeGeneratorOptions options );
+
+		void GenerateCodeFromExpression( CodeExpression expression,
+						 TextWriter output, 
+						 CodeGeneratorOptions options );
+
+		void GenerateCodeFromNamespace( CodeNamespace ns,
+						TextWriter output, 
+						CodeGeneratorOptions options );
+
+		void GenerateCodeFromStatement( CodeStatement statement,
+						TextWriter output, 
+						CodeGeneratorOptions options );
+
+		void GenerateCodeFromType( CodeTypeDeclaration typeDeclaration,
+					   TextWriter output,
+					   CodeGeneratorOptions options );
+
+		string GetTypeOutput( CodeTypeReference type );
+
+		bool IsValidIdentifier( string value );
+
+		bool Supports( GeneratorSupport supports );
+ 
+		void ValidateIdentifier( string value );
+	}
+}
diff --git a/mcs/class/System/System.CodeDom.Compiler/ICodeParser.cs b/mcs/class/System/System.CodeDom.Compiler/ICodeParser.cs
new file mode 100644
index 00000000000..2a2522f5ab2
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/ICodeParser.cs
@@ -0,0 +1,20 @@
+//
+// System.CodeDom.Compiler ICodeParser Interface
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+namespace System.CodeDom.Compiler
+{
+	using System.CodeDom;
+	using System.IO;
+
+	public interface ICodeParser
+	{
+		CodeCompileUnit Parse( TextReader codeStream );
+	}
+}
diff --git a/mcs/class/System/System.CodeDom.Compiler/IndentedTextWriter.cs b/mcs/class/System/System.CodeDom.Compiler/IndentedTextWriter.cs
new file mode 100644
index 00000000000..6538fc6e24d
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/IndentedTextWriter.cs
@@ -0,0 +1,286 @@
+//
+// System.CodeDom.Compiler IndentedTextWriter class
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.IO;
+using System.Text;
+
+namespace System.CodeDom.Compiler {
+	
+	public class IndentedTextWriter
+		: TextWriter
+	{
+		private TextWriter writer;
+		private string tabString;
+		private int indent;
+		private bool newline;
+
+		//
+		// Constructors
+		//
+		public IndentedTextWriter( TextWriter writer )
+		{
+			this.writer = writer;
+			this.tabString = DefaultTabString;
+			newline = true;
+		}
+
+		public IndentedTextWriter( TextWriter writer, string tabString )
+		{
+			this.writer = writer;
+			this.tabString = tabString;
+			newline = true;
+		}
+
+		
+		//
+		// Fields
+		//
+		public const string DefaultTabString = " ";
+
+		//
+		// Properties
+		//
+		public override Encoding Encoding {
+			get {
+				return writer.Encoding;
+			}
+		}
+
+		public int Indent {
+			get {
+				return indent;
+			}
+			set {
+				indent = value;
+			}
+		}
+
+		public TextWriter InnerWriter {
+			get {
+				return writer;
+			}
+		}
+
+		public override string NewLine {
+			get {
+				return writer.NewLine;
+			}
+			set {
+				writer.NewLine = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public override void Close()
+		{
+			writer.Close();
+		}
+
+		public override void Flush()
+		{
+			writer.Flush();
+		}
+
+		public override void Write( bool value )
+		{
+			OutputTabs();
+			writer.Write( value );
+		}
+
+		public override void Write( char value )
+		{
+			OutputTabs();
+			writer.Write( value );
+		}
+		
+		public override void Write( char[] value )
+		{
+			OutputTabs();
+			writer.Write( value );
+		}
+
+		public override void Write( double value )
+		{
+			OutputTabs();
+			writer.Write( value );
+		}
+
+		public override void Write( int value )
+		{
+			OutputTabs();
+			writer.Write( value );
+		}
+
+		public override void Write( long value )
+		{
+			OutputTabs();
+			writer.Write( value );
+		}
+
+		public override void Write( object value )
+		{
+			OutputTabs();
+			writer.Write( value );
+		}
+
+		public override void Write( float value )
+		{
+			OutputTabs();
+			writer.Write( value );
+		}
+
+		public override void Write( string value )
+		{
+			OutputTabs();
+			writer.Write( value );
+		}
+
+		public override void Write( string format, object arg )
+		{
+			OutputTabs();
+			writer.Write( format, arg );
+		}
+
+		public override void Write( string format, params object[] args )
+		{
+			OutputTabs();
+			writer.Write( format, args );
+		}
+
+		public override void Write( char[] buffer, int index, int count )
+		{
+			OutputTabs();
+			writer.Write( buffer, index, count );
+		}
+		
+		public override void Write( string format, object arg0, object arg1 )
+		{
+			OutputTabs();
+			writer.Write( format, arg0, arg1 );
+		}
+
+		
+		public override void WriteLine()
+		{
+			OutputTabs();
+			writer.WriteLine();
+			newline = true;
+		}
+
+		public override void WriteLine( char value )
+		{
+			OutputTabs();
+			writer.WriteLine( value );
+			newline = true;
+		}
+
+		public override void WriteLine( char[] value )
+		{
+			OutputTabs();
+			writer.WriteLine( value );
+			newline = true;
+		}
+
+		public override void WriteLine( double value )
+		{
+			OutputTabs();
+			writer.WriteLine( value );
+			newline = true;
+		}
+
+		public override void WriteLine( int value )
+		{
+			OutputTabs();
+			writer.WriteLine( value );
+			newline = true;
+		}
+
+		public override void WriteLine( long value )
+		{
+			OutputTabs();
+			writer.WriteLine( value );
+			newline = true;
+		}
+
+		public override void WriteLine( object value )
+		{
+			OutputTabs();
+			writer.WriteLine( value );
+			newline = true;
+		}
+
+		public override void WriteLine( float value )
+		{
+			OutputTabs();
+			writer.WriteLine( value );
+			newline = true;
+		}
+
+		public override void WriteLine( string value )
+		{
+			OutputTabs();
+			writer.WriteLine( value );
+			newline = true;
+		}
+
+		public override void WriteLine( uint value )
+		{
+			OutputTabs();
+			writer.WriteLine( value );
+			newline = true;
+		}
+
+		public override void WriteLine( string format, object arg )
+		{
+			OutputTabs();
+			writer.WriteLine( format, arg );
+			newline = true;
+		}
+
+		public override void WriteLine( string format, params object[] args )
+		{
+			OutputTabs();
+			writer.WriteLine( format, args );
+			newline = true;
+		}
+
+		public override void WriteLine( char[] buffer, int index, int count )
+		{
+			OutputTabs();
+			writer.WriteLine( buffer, index, count );
+			newline = true;
+		}
+
+		public override void WriteLine( string format, object arg0, object arg1 )
+		{
+			OutputTabs();
+			writer.WriteLine( format, arg0, arg1 );
+			newline = true;
+		}
+
+
+		public void WriteLineNoTabs( string value )
+		{
+			writer.WriteLine( value );
+			newline = true;
+		}
+
+
+		protected virtual void OutputTabs()
+		{
+			if ( newline ) {
+				for ( int i = 0; i < indent; ++i )
+					writer.Write( tabString );
+				newline = false;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom.Compiler/LanguageOptions.cs b/mcs/class/System/System.CodeDom.Compiler/LanguageOptions.cs
new file mode 100644
index 00000000000..7862a656554
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/LanguageOptions.cs
@@ -0,0 +1,18 @@
+//
+// System.CodeDom.Compiler LanguageOptions Enum implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+namespace System.CodeDom.Compiler
+{
+	[Flags]
+	[Serializable]	
+	public enum LanguageOptions {
+		None = 0,
+		CaseInsensitive = 1
+	}
+}
diff --git a/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs b/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs
new file mode 100644
index 00000000000..6f82830bf90
--- /dev/null
+++ b/mcs/class/System/System.CodeDom.Compiler/TempFileCollection.cs
@@ -0,0 +1,16 @@
+//
+// System.CodeDom.Compiler TempFileCollection Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+namespace System.CodeDom.Compiler
+{
+	public class TempFileCollection
+	{
+		// FIXME
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/ChangeLog b/mcs/class/System/System.CodeDom/ChangeLog
new file mode 100644
index 00000000000..2352f22b91f
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/ChangeLog
@@ -0,0 +1,229 @@
+2002-05-28  Daniel Stodden  <stodden@in.tum.de>
+
+	* CodeArrayCreateExpression.cs: typo + comments
+
+	* CodeAttributeArgumentCollection.cs: Add() signature fixed
+
+	* CodeAttributeDeclarationCollection.cs: Add() signature fixed
+
+	* CodeCatchClause.cs: ctor signature fixed
+
+	* CodeCatchClauseCollection.cs: Add() signature fixed
+
+	* CodeCommentStatementCollection.cs: Add() signature fixed
+
+	* CodeConstructor.cs: ctor added
+
+	* CodeExpressionCollection.cs: Populate* events: nullref checks
+	added
+
+	* CodeNamespace.cs: Populate* events: nullref checks added
+
+	* CodeNamespaceCollection.cs: Add() signature fixed
+
+	* CodeParameterDeclarationExpressionCollection.cs: Add() signature
+	fixed
+
+	* CodeStatementCollection.cs: Add() signature fixed, missing
+	overload added
+
+	* CodeTypeConstructor.cs: class name typo :P
+
+	* CodeTypeDeclaration.cs: finally figured out how TypeAttributes
+	work.
+
+	* CodeTypeDeclarationCollection.cs: Add() signature fixed
+
+	* CodeTypeReference.cs: added MonoTODOs. some corrections on array
+	type behavior.
+
+	* CodeTypeReferenceCollection.cs: Add() signature fixed
+
+	* MemberAttributes.cs: just comments
+	
+2002-05-11  Daniel Stodden  <stodden@in.tum.de>
+
+	* CodeAttributeArgumentCollection.cs: inherits CollectionBase
+
+	* CodeAttributeDeclarationCollection.cs: inherits CollectionBase
+
+	* CodeCatchClauseCollection.cs: inherits CollectionBase
+
+	* CodeExpressionCollection.cs: inherits CollectionBase
+
+	* CodeNamespaceImportCollection.cs: not CollectionBase, but
+	matching MS docs
+
+	* CodeParameterDeclarationCollection.cs: inherits CollectionBase
+
+	* CodeStatementCollection.cs: inherits CollectionBase
+
+	* CodeArrayCreateExpression.cs: corrections, completions, whatever
+
+	* CodeAssignStatement.cs: corrections, completions, whatever
+
+	* CodeAttachEventStatement.cs: corrections, completions, whatever
+
+	* CodeAttributeArgument.cs: corrections, completions, whatever
+
+	* CodeAttributeDeclaration.cs: corrections, completions, whatever
+
+	* CodeBaseReferenceExpression.cs: corrections, completions,
+	whatever
+
+	* CodeBinaryOperatorExpression.cs: corrections, completions,
+	whatever
+
+	* CodeCastExpression.cs: corrections, completions, whatever
+
+	* CodeCatchClause.cs: corrections, completions, whatever
+
+	* CodeCommentStatement.cs: corrections, completions, whatever
+
+	* CodeConstructor.cs: corrections, completions, whatever
+
+	* CodeDelegateCreateExpression.cs: corrections, completions,
+	whatever
+
+	* CodeDelegateInvokeExpression.cs: corrections, completions,
+	whatever
+
+	* CodeExpression.cs: corrections, completions, whatever
+
+	* CodeFieldReferenceExpression.cs: corrections, completions,
+	whatever
+
+	* CodeIndexerExpression.cs: corrections, completions, whatever
+
+	* CodeLinePragma.cs: corrections, completions, whatever
+
+	* CodeMemberEvent.cs: corrections, completions, whatever
+
+	* CodeMemberField.cs: corrections, completions, whatever
+
+	* CodeMemberMethod.cs: corrections, completions, whatever
+
+	* CodeMemberProperty.cs: corrections, completions, whatever
+
+	* CodeMethodInvokeExpression.cs: corrections, completions,
+	whatever
+
+	* CodeMethodReturnStatement.cs: corrections, completions, whatever
+
+	* CodeNamespace.cs: corrections, completions, whatever
+
+	* CodeNamespaceImport.cs: corrections, completions, whatever
+
+	* CodeObject.cs: corrections, completions, whatever
+
+	* CodeObjectCreateExpression.cs: corrections, completions,
+	whatever
+
+	* CodeParameterDeclarationExpression.cs: corrections, completions,
+	whatever
+
+	* CodePrimitiveExpression.cs: corrections, completions, whatever
+
+	* CodePropertyReferenceExpression.cs: corrections, completions,
+	whatever
+
+	* CodeStatement.cs: corrections, completions, whatever
+
+	* CodeThisReferenceExpression.cs: corrections, completions,
+	whatever
+
+	* CodeThrowExceptionStatement.cs: corrections, completions,
+	whatever
+
+	* CodeTryCatchFinallyStatement.cs: corrections, completions,
+	whatever
+
+	* CodeTypeDeclaration.cs: corrections, completions, whatever
+
+	* CodeTypeMember.cs: corrections, completions, whatever
+
+	* CodeTypeOfExpression.cs: corrections, completions, whatever
+
+	* CodeTypeReferenceExpression.cs: corrections, completions,
+	whatever
+
+	* CodeVariableDeclarationStatement.cs: corrections, completions,
+	whatever
+
+	* FieldDirection.cs: corrections, completions, whatever
+
+	* CodeArgumentReferenceExpression.cs: added
+
+	* CodeArrayIndexerExpression.cs: added
+
+	* CodeComment.cs: added
+
+	* CodeCommentStatementCollection.cs: added
+
+	* CodeCompileUnit.cs: added
+
+	* CodeConditionStatement.cs: added
+
+	* CodeDirectionExpression.cs: added
+
+	* CodeEntryPointMethod.cs: added
+
+	* CodeEventReferenceExpression.cs: added
+
+	* CodeExpressionStatement.cs: added
+
+	* CodeGotoStatement.cs: added
+
+	* CodeIterationStatement.cs: added
+
+	* CodeLabeledStatement.cs: added
+
+	* CodeMethodReferenceExpression.cs: added
+
+	* CodeNamespaceCollection.cs: added
+
+	* CodePropertySetValueReferenceExpression.cs: added
+
+	* CodeRemoveEventStatement.cs: added
+
+	* CodeSnippetCompileUnit.cs: added
+
+	* CodeSnippetExpression.cs: added
+
+	* CodeSnippetStatement.cs: added
+
+	* CodeSnippetTypeMember.cs: added
+
+	* CodeTypeConstructor.cs: added
+
+	* CodeTypeDeclarationCollection.cs: added
+
+	* CodeTypeDelegate.cs: added
+
+	* CodeTypeMemberCollection.cs: added
+
+	* CodeTypeReference.cs: added
+
+	* CodeTypeReferenceCollection.cs: added
+
+	* CodeVariableReferenceExpression.cs: added
+
+2001-07-15  Sean MacIsaac  <macisaac@ximian.com>
+
+	* MemberAttributes.cs: Added so rest of classes would compile.
+
+	* FieldDirection.cs: Added so rest of classes would compile.
+
+	* CodeTypeMember.cs: Added so rest of classes would compile.
+
+	* CodeTypeDeclaration.cs: Added so rest of classes would compile.
+
+	* CodeObject.cs: Added so rest of classes would compile.
+
+	* CodeBinaryOperatorType.cs: Added so rest of classes would compile.
+
+2001-07-12  Sean MacIsaac  <macisaac@ximian.com>
+	
+	* All files implementing IList: Added IsFixedSize property.
+
+	* All files:  Changed CodeDOM to CodeDom.
diff --git a/mcs/class/System/System.CodeDom/CodeArgumentReferenceExpression.cs b/mcs/class/System/System.CodeDom/CodeArgumentReferenceExpression.cs
new file mode 100644
index 00000000000..5f842f3f302
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeArgumentReferenceExpression.cs
@@ -0,0 +1,46 @@
+//
+// System.CodeDom CodeArgumentReferenceExpression Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom {
+
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeArgumentReferenceExpression 
+		: CodeExpression
+	{
+		private string parameterName;
+
+		//
+		// Constructors
+		//
+		public CodeArgumentReferenceExpression()
+		{
+		}
+
+		public CodeArgumentReferenceExpression( string name )
+		{
+			this.parameterName = name;
+		}
+
+		//
+		// Properties
+		//
+		public string ParameterName {
+			get {
+				return parameterName;
+			}
+			set {
+				parameterName = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeArrayCreateExpression.cs b/mcs/class/System/System.CodeDom/CodeArrayCreateExpression.cs
new file mode 100755
index 00000000000..e7bded6024d
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeArrayCreateExpression.cs
@@ -0,0 +1,145 @@
+//
+// System.CodeDom CodeArrayCreateExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom {
+
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeArrayCreateExpression
+		: CodeExpression 
+	{
+		private CodeTypeReference createType;
+		private CodeExpressionCollection initializers;
+		private CodeExpression sizeExpression;
+		private int size;
+		
+		//
+		// Constructors
+		//
+		public CodeArrayCreateExpression ()
+		{
+		}
+
+
+		public CodeArrayCreateExpression (CodeTypeReference createType, 
+						  CodeExpression size )
+		{
+			this.createType = createType;
+			this.sizeExpression = size;
+		}
+
+		public CodeArrayCreateExpression (CodeTypeReference createType, 
+						  params CodeExpression[] initializers )
+		{
+			this.createType = createType;
+			this.Initializers.AddRange( initializers );
+		}
+
+		public CodeArrayCreateExpression (CodeTypeReference createType, 
+						  int size)
+		{
+			this.createType = createType;
+			this.size = size;
+		}
+
+
+		public CodeArrayCreateExpression (string createType, 
+						  CodeExpression size)
+		{
+			this.createType = new CodeTypeReference( createType );
+			this.sizeExpression = size;
+		}
+
+		public CodeArrayCreateExpression (string createType, 
+						  params CodeExpression[] initializers)
+		{
+			this.createType = new CodeTypeReference( createType );
+			this.Initializers.AddRange( initializers );
+		}
+
+		public CodeArrayCreateExpression (string createType, 
+						  int size)
+		{
+			this.createType = new CodeTypeReference( createType );
+			this.size = size;
+		}
+
+
+		public CodeArrayCreateExpression (Type createType, 
+						  CodeExpression size)
+		{
+			this.createType = new CodeTypeReference( createType );
+			this.sizeExpression = size;
+		}
+			
+		public CodeArrayCreateExpression (Type createType, 
+						  params CodeExpression[] initializers)
+		{
+			this.createType = new CodeTypeReference( createType );
+			this.Initializers.AddRange( initializers );
+		}
+
+		public CodeArrayCreateExpression (Type createType, 
+						  int size)
+		{
+			this.createType = new CodeTypeReference( createType );
+			this.size = size;
+		}
+
+		//
+		// Properties
+		//
+		public CodeTypeReference CreateType {
+			get {
+				return createType;
+			}
+			set {
+				createType = value;
+			}
+		}
+
+		public CodeExpressionCollection Initializers {
+			get {
+				if ( initializers == null )
+					initializers = new CodeExpressionCollection();
+					
+				return initializers;
+			}
+		}
+
+		public CodeExpression SizeExpression {
+			get {
+				return sizeExpression;
+			}
+			set {
+				sizeExpression = value;
+			}
+		}
+
+		public int Size {
+			get {
+				return size;
+			}
+			set {
+				size = value;
+				// NOTE: Setting Size in ms.Net does
+				// not supersede SizeExpression
+				// values. Instead, the CodeGenerator
+				// seems to always prefer
+				// SizeExpression if set to a value !=
+				// null.
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.CodeDom/CodeArrayIndexerExpression.cs b/mcs/class/System/System.CodeDom/CodeArrayIndexerExpression.cs
new file mode 100644
index 00000000000..8851f3cf016
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeArrayIndexerExpression.cs
@@ -0,0 +1,56 @@
+//
+// System.CodeDom CodeArrayIndexerExpression Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom {
+
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeArrayIndexerExpression
+		: CodeExpression 
+	{
+		private CodeExpressionCollection indices;
+		private CodeExpression targetObject;
+
+		//
+		// Constructors
+		//
+		public CodeArrayIndexerExpression()
+		{
+		}
+
+		public CodeArrayIndexerExpression( CodeExpression targetObject, params CodeExpression[] indices )
+		{
+			this.targetObject = targetObject;
+			this.Indices.AddRange( indices );
+		}
+
+		//
+		// Properties
+		//
+		public CodeExpressionCollection Indices {
+			get {
+				if ( indices == null )
+					indices = new CodeExpressionCollection();
+				return indices;
+			}
+		}
+
+		public CodeExpression TargetObject {
+			get {
+				return targetObject;
+			}
+			set {
+				targetObject = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeAssignStatement.cs b/mcs/class/System/System.CodeDom/CodeAssignStatement.cs
new file mode 100755
index 00000000000..54f55af8d7e
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeAssignStatement.cs
@@ -0,0 +1,55 @@
+//
+// System.CodeDom CodeArrayCreateExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom {
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeAssignStatement
+		: CodeStatement 
+	{
+		CodeExpression left, right;
+
+		//
+		// Constructors
+		//
+		public CodeAssignStatement ()
+		{
+		}
+
+		public CodeAssignStatement (CodeExpression left, CodeExpression right)
+		{
+			this.left = left;
+			this.right = right;
+		}
+		
+		//
+		// Properties
+		//
+		public CodeExpression Left {
+			get {
+				return left;
+			}
+			set {
+				left = value;
+			}
+		}
+
+		public CodeExpression Right {
+			get {
+				return right;
+			}
+			set {
+				right = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeAttachEventStatement.cs b/mcs/class/System/System.CodeDom/CodeAttachEventStatement.cs
new file mode 100755
index 00000000000..093445711ab
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeAttachEventStatement.cs
@@ -0,0 +1,68 @@
+//
+// System.CodeDom CodeAttachEventStatement Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeAttachEventStatement
+		: CodeStatement 
+	{
+		private CodeEventReferenceExpression eventRef;
+		private CodeExpression listener;
+		
+		//
+		// Constructors
+		//
+		public CodeAttachEventStatement ()
+		{
+		}
+
+		public CodeAttachEventStatement (CodeEventReferenceExpression eventRef,
+						 CodeExpression listener)
+		{
+			this.eventRef = eventRef;
+			this.listener = listener;
+		}
+
+		public CodeAttachEventStatement (CodeExpression targetObject,
+						 string eventName, 
+						 CodeExpression listener)
+		{
+			this.eventRef = new CodeEventReferenceExpression( targetObject,
+									  eventName );
+			this.listener = listener;
+		}
+								  
+		//
+		// Properties
+		//
+		public CodeEventReferenceExpression Event {
+			get {
+				return eventRef;
+			}
+			set {
+				eventRef = value;
+			}
+		}
+
+		public CodeExpression Listener {
+			get {
+				return listener; 
+			}
+			set {
+				listener = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeAttributeArgument.cs b/mcs/class/System/System.CodeDom/CodeAttributeArgument.cs
new file mode 100755
index 00000000000..c7b6d577776
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeAttributeArgument.cs
@@ -0,0 +1,61 @@
+//
+// System.CodeDom CodeAttributeArgument Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeAttributeArgument
+	{
+		private string name;
+		private CodeExpression value;
+		
+		//
+		// Constructors
+		//
+		public CodeAttributeArgument ()
+		{
+		}
+
+		public CodeAttributeArgument (CodeExpression value)
+		{
+			this.value = value;
+		}
+
+		public CodeAttributeArgument (string name, CodeExpression value)
+		{
+			this.name = name;
+			this.value = value;
+		}
+
+		//
+		// Properties
+		//
+		public string Name {
+			get {
+				return name;
+			}
+			set {
+				name = value;
+			}
+		}
+
+		public CodeExpression Value {
+			get {
+				return this.value;
+			}
+			set {
+				this.value = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeAttributeArgumentCollection.cs b/mcs/class/System/System.CodeDom/CodeAttributeArgumentCollection.cs
new file mode 100755
index 00000000000..cca43373ae7
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeAttributeArgumentCollection.cs
@@ -0,0 +1,100 @@
+//
+// System.CodeDom CodeAttributeArgumentCollection Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeAttributeArgumentCollection
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeAttributeArgumentCollection()
+		{
+		}
+
+		public CodeAttributeArgumentCollection( CodeAttributeArgument[] value )
+		{
+			AddRange( value );
+		}
+
+		public CodeAttributeArgumentCollection( CodeAttributeArgumentCollection value )
+		{
+			AddRange( value );
+		}
+
+		//
+		// Properties
+		//
+		public CodeAttributeArgument this[int index]
+		{
+			get {
+				return (CodeAttributeArgument)List[index];
+			}
+			set {
+				List[index] = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public int Add (CodeAttributeArgument value)
+		{
+			return List.Add( value );
+		}
+
+		public void AddRange (CodeAttributeArgument [] value )
+		{
+			foreach ( CodeAttributeArgument elem in value )
+				Add( elem );
+		}
+		
+		public void AddRange (CodeAttributeArgumentCollection value)
+		{
+			foreach ( CodeAttributeArgument elem in value )
+				Add( elem );
+		}
+
+		public bool Contains( CodeAttributeArgument value )
+		{
+			return List.Contains( value );
+		}
+		
+		public void CopyTo( CodeAttributeArgument[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeAttributeArgument value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeAttributeArgument value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeAttributeArgument value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeAttributeDeclaration.cs b/mcs/class/System/System.CodeDom/CodeAttributeDeclaration.cs
new file mode 100755
index 00000000000..49d0c8d7ca3
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeAttributeDeclaration.cs
@@ -0,0 +1,63 @@
+//
+// System.CodeDom CodeAttributeDeclaration Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeAttributeDeclaration 
+	{
+		private string name;
+		private CodeAttributeArgumentCollection arguments;
+		
+		//
+		// Constructors
+		//
+		public CodeAttributeDeclaration ()
+		{
+		}
+
+		public CodeAttributeDeclaration (string name)
+		{
+			this.name = name;
+		}
+
+		public CodeAttributeDeclaration (string name, CodeAttributeArgument [] arguments)
+		{
+			this.name = name;
+			Arguments.AddRange (arguments);
+		}
+
+		//
+		// Properties
+		//
+		public CodeAttributeArgumentCollection Arguments {
+			get {
+				if ( arguments == null )
+					arguments = new CodeAttributeArgumentCollection();
+
+				return arguments;
+			}
+		}
+
+		public string Name {
+			get {
+				return name;
+			}
+			set {
+				name = value;
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.CodeDom/CodeAttributeDeclarationCollection.cs b/mcs/class/System/System.CodeDom/CodeAttributeDeclarationCollection.cs
new file mode 100755
index 00000000000..913641e6ebc
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeAttributeDeclarationCollection.cs
@@ -0,0 +1,100 @@
+//
+// System.CodeDom CodeAttributeDeclarationCollection Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeAttributeDeclarationCollection 
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeAttributeDeclarationCollection()
+		{
+		}
+
+		public CodeAttributeDeclarationCollection( CodeAttributeDeclaration[] value )
+		{
+			AddRange( value );
+		}
+
+		public CodeAttributeDeclarationCollection( CodeAttributeDeclarationCollection value )
+		{
+			AddRange( value );
+		}
+
+		//
+		// Properties
+		//
+		public CodeAttributeDeclaration this[int index]
+		{
+			get {
+				return (CodeAttributeDeclaration)List[index];
+			}
+			set {
+				List[index] = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public int Add (CodeAttributeDeclaration value)
+		{
+			return List.Add (value);
+		}
+
+		public void AddRange (CodeAttributeDeclaration [] value)
+		{
+			foreach (CodeAttributeDeclaration elem in value) 
+				Add( elem );
+		}
+
+		public void AddRange (CodeAttributeDeclarationCollection value)
+		{
+			foreach (CodeAttributeDeclaration elem in value) 
+				Add( elem );
+		}
+
+		public bool Contains( CodeAttributeDeclaration value )
+		{
+			return List.Contains( value );
+		}
+
+		public void CopyTo( CodeAttributeDeclaration[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeAttributeDeclaration value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeAttributeDeclaration value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeAttributeDeclaration value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeBaseReferenceExpression.cs b/mcs/class/System/System.CodeDom/CodeBaseReferenceExpression.cs
new file mode 100755
index 00000000000..3e4cbee16c8
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeBaseReferenceExpression.cs
@@ -0,0 +1,21 @@
+//
+// System.CodeDom CodeBaseReferenceExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeBaseReferenceExpression
+		: CodeExpression 
+	{
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeBinaryOperatorExpression.cs b/mcs/class/System/System.CodeDom/CodeBinaryOperatorExpression.cs
new file mode 100755
index 00000000000..b272e0e5c80
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeBinaryOperatorExpression.cs
@@ -0,0 +1,69 @@
+//
+// System.CodeDom CodeBinaryOperatorExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeBinaryOperatorExpression
+		: CodeExpression 
+	{
+		private CodeExpression left, right;
+		private CodeBinaryOperatorType op;
+
+		//
+		// Constructors
+		//
+		public CodeBinaryOperatorExpression ()
+		{
+		}
+
+		public CodeBinaryOperatorExpression (CodeExpression left,
+						     CodeBinaryOperatorType op,
+						     CodeExpression right)
+		{
+			this.left = left;
+			this.op = op;
+			this.right = right;
+		}
+
+		//
+		// Properties
+		//
+		public CodeExpression Left {
+			get {
+				return left;
+			}
+			set {
+				left = value;
+			}
+		}
+
+		public CodeBinaryOperatorType Operator {
+			get {
+				return op;
+			}
+			set {
+				op = value;
+			}
+		}
+
+		public CodeExpression Right {
+			get {
+				return right;
+			}
+			set {
+				right = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeBinaryOperatorType.cs b/mcs/class/System/System.CodeDom/CodeBinaryOperatorType.cs
new file mode 100755
index 00000000000..e879b206400
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeBinaryOperatorType.cs
@@ -0,0 +1,35 @@
+//
+// System.CodeDom CodeBinaryOperatorType Enum implementation
+//
+// Author:
+//   Sean MacIsaac (macisaac@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ComVisible(true)]
+	public enum CodeBinaryOperatorType {
+		Add,
+		Assign,
+		BitwiseAnd,
+		BitwiseOr,
+		BooleanAnd,
+		BooleanOr,
+		Divide,
+		GreaterThan,
+		GreaterThanOrEqual,
+		IdentityEquality,
+		IdentityInequality,
+		LessThan,
+		LessThanOrEqual,
+		Modulus,
+		Multiply,
+		Subtract,
+		ValueEquality
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeCastExpression.cs b/mcs/class/System/System.CodeDom/CodeCastExpression.cs
new file mode 100755
index 00000000000..90ee10aa2f0
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeCastExpression.cs
@@ -0,0 +1,71 @@
+//
+// System.CodeDom CodeCastExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeCastExpression
+		: CodeExpression 
+	{
+		private CodeTypeReference targetType;
+		private CodeExpression expression;
+		
+		//
+		// Constructors
+		//
+		public CodeCastExpression ()
+		{
+		}
+
+		public CodeCastExpression (CodeTypeReference targetType, CodeExpression expression)
+		{
+			this.targetType = targetType;
+			this.expression = expression;
+		}
+
+		public CodeCastExpression (string targetType, CodeExpression expression)
+		{
+			this.targetType = new CodeTypeReference( targetType );
+			this.expression = expression;
+		}
+
+		public CodeCastExpression (Type targetType, CodeExpression expression)
+		{
+			this.targetType = new CodeTypeReference( targetType );
+			this.expression = expression;
+		}
+
+		//
+		// Properties
+		//
+		public CodeExpression Expression {
+			get {
+				return expression;
+			}
+
+			set {
+				expression = value;
+			}
+		}
+
+		public CodeTypeReference TargetType {
+			get {
+				return targetType;
+			}
+			set {
+				targetType = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeCatchClause.cs b/mcs/class/System/System.CodeDom/CodeCatchClause.cs
new file mode 100755
index 00000000000..2d5addf592e
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeCatchClause.cs
@@ -0,0 +1,81 @@
+//
+// System.CodeDom CodeCatchClaus Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeCatchClause
+	{
+		private CodeTypeReference catchExceptionType;
+		private string localName;
+		private CodeStatementCollection statements;
+
+		//
+		// Constructors
+		//
+		public CodeCatchClause ()
+		{
+		}
+
+		public CodeCatchClause ( string localName )
+		{
+			this.localName = localName;
+		}
+
+		public CodeCatchClause ( string localName,
+					 CodeTypeReference catchExceptionType )
+		{
+			this.localName = localName;
+			this.catchExceptionType = catchExceptionType;
+		}
+
+		public CodeCatchClause ( string localName,
+					 CodeTypeReference catchExceptionType,
+					 params CodeStatement[] statements )
+		{
+			this.localName = localName;
+			this.catchExceptionType = catchExceptionType;
+			this.Statements.AddRange( statements );
+		}
+
+		//
+		// Properties
+		//
+		public CodeTypeReference CatchExceptionType {
+			get {
+				return catchExceptionType;
+			}
+			set {
+				catchExceptionType = value;
+			}
+		}
+
+		public string LocalName {
+			get {
+				return localName;
+			}
+			set {
+				localName = value;
+			}
+		}
+
+		public CodeStatementCollection Statements {
+			get {
+				if ( statements == null )
+					statements = new CodeStatementCollection();
+				return statements;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeCatchClauseCollection.cs b/mcs/class/System/System.CodeDom/CodeCatchClauseCollection.cs
new file mode 100755
index 00000000000..5cffe97c99f
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeCatchClauseCollection.cs
@@ -0,0 +1,98 @@
+//
+// System.CodeDom CodeCatchClauseCollection Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeCatchClauseCollection
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeCatchClauseCollection()
+		{
+		}
+
+		public CodeCatchClauseCollection( CodeCatchClause[] value )
+		{
+			AddRange( value );
+		}
+
+		public CodeCatchClauseCollection( CodeCatchClauseCollection value )
+		{
+			AddRange( value );
+		}
+
+		//
+		// Properties
+		//
+                public CodeCatchClause this[int index] {
+                        get {
+                                return (CodeCatchClause)List[index];
+                        }
+			set {
+				List[index] = value;
+			}
+                }
+
+		//
+		// Methods
+		//
+		public int Add (CodeCatchClause value)
+		{
+			return List.Add (value);
+		}
+
+		public void AddRange (CodeCatchClause [] value)
+		{
+			foreach (CodeCatchClause ca in value) 
+				Add (ca);
+		}
+
+		public void AddRange (CodeCatchClauseCollection value )
+		{
+			foreach (CodeCatchClause ca in value)
+				Add (ca);
+		}
+
+		public bool Contains( CodeCatchClause value )
+		{
+			return List.Contains( value );
+		}
+		
+		public void CopyTo( CodeCatchClause[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeCatchClause value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeCatchClause value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeCatchClause value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeComment.cs b/mcs/class/System/System.CodeDom/CodeComment.cs
new file mode 100644
index 00000000000..8f761110ee8
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeComment.cs
@@ -0,0 +1,62 @@
+//
+// System.CodeDom CodeComment Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeComment
+		: CodeObject
+	{
+		private bool docComment;
+		private string text;
+		
+		//
+		// Constructors
+		//
+		public CodeComment()
+		{
+		}
+
+		public CodeComment( string text )
+		{
+			this.text = text;
+		}
+
+		public CodeComment( string text, bool docComment )
+		{
+			this.text = text;
+			this.docComment = docComment;
+		}
+
+		//
+		// Properties
+		//
+		public bool DocComment {
+			get {
+				return docComment;
+			}
+			set {
+				docComment = value;
+			}
+		}
+		
+		public string Text {
+			get {
+				return text;
+			}
+			set {
+				text = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeCommentStatement.cs b/mcs/class/System/System.CodeDom/CodeCommentStatement.cs
new file mode 100755
index 00000000000..0b52d080afd
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeCommentStatement.cs
@@ -0,0 +1,57 @@
+//
+// System.CodeDom CodeCommentStatement Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001, 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeCommentStatement
+		: CodeStatement
+	{
+		private CodeComment comment;
+		
+		//
+		// Constructors
+		//
+		public CodeCommentStatement ()
+		{
+		}
+
+		public CodeCommentStatement (CodeComment comment)
+		{
+			this.comment = comment;
+		}
+
+		public CodeCommentStatement (string text)
+		{
+			this.comment = new CodeComment( text );
+		}
+		
+		public CodeCommentStatement (string text, bool docComment)
+		{
+			this.comment = new CodeComment( text, docComment );
+		}
+
+		//
+		// Properties
+		//
+		public CodeComment Comment {
+			get {
+				return comment;
+			}
+			set {
+				comment = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeCommentStatementCollection.cs b/mcs/class/System/System.CodeDom/CodeCommentStatementCollection.cs
new file mode 100644
index 00000000000..10372cc686b
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeCommentStatementCollection.cs
@@ -0,0 +1,100 @@
+//
+// System.CodeDom CodeCommentStatementCollection Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeCommentStatementCollection
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeCommentStatementCollection()
+		{
+		}
+		
+		public CodeCommentStatementCollection( CodeCommentStatement[] value )
+		{
+			AddRange( value );
+		}
+
+		public CodeCommentStatementCollection( CodeCommentStatementCollection value )
+		{
+			AddRange( value );
+		}
+
+		//
+		// Properties
+		//
+		public CodeCommentStatement this[int index]
+		{
+			get {
+				return (CodeCommentStatement)List[index];
+			}
+			set {
+				List[index] = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public int Add (CodeCommentStatement value)
+		{
+			return List.Add( value );
+		}
+
+		public void AddRange (CodeCommentStatement [] value )
+		{
+			foreach ( CodeCommentStatement elem in value )
+				Add( elem );
+		}
+		
+		public void AddRange (CodeCommentStatementCollection value)
+		{
+			foreach ( CodeCommentStatement elem in value )
+				Add( elem );
+		}
+
+		public bool Contains( CodeCommentStatement value )
+		{
+			return List.Contains( value );
+		}
+		
+		public void CopyTo( CodeCommentStatement[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeCommentStatement value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeCommentStatement value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeCommentStatement value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeCompileUnit.cs b/mcs/class/System/System.CodeDom/CodeCompileUnit.cs
new file mode 100644
index 00000000000..e357f9bec1c
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeCompileUnit.cs
@@ -0,0 +1,60 @@
+//
+// System.CodeDom CodeCompileUnit Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections.Specialized;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeCompileUnit
+		: CodeObject
+	{
+		private CodeAttributeDeclarationCollection assemblyCustomAttributes;
+		private CodeNamespaceCollection namespaces;
+		private StringCollection referencedAssemblies;
+
+		//
+		// Constructors
+		//
+		public CodeCompileUnit()
+		{
+		}
+
+		//
+		// Properties
+		//
+		public CodeAttributeDeclarationCollection AssemblyCustomAttributes {
+			get {
+				if ( assemblyCustomAttributes == null )
+					assemblyCustomAttributes = 
+						new CodeAttributeDeclarationCollection();
+				return assemblyCustomAttributes;
+			}
+		}
+
+		public CodeNamespaceCollection Namespaces {
+			get {
+				if ( namespaces == null )
+					namespaces = new CodeNamespaceCollection();
+				return namespaces;
+			}
+		}
+
+		public StringCollection ReferencedAssemblies {
+			get {
+				if ( referencedAssemblies == null )
+					referencedAssemblies = new StringCollection();
+				return referencedAssemblies;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeConditionStatement.cs b/mcs/class/System/System.CodeDom/CodeConditionStatement.cs
new file mode 100644
index 00000000000..fb04c884371
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeConditionStatement.cs
@@ -0,0 +1,77 @@
+//
+// System.CodeDom CodeConditionStatement Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeConditionStatement
+		: CodeStatement
+	{
+		private CodeExpression condition;
+		private CodeStatementCollection trueStatements;
+		private CodeStatementCollection falseStatements;
+
+		//
+		// Constructors
+		//
+		public CodeConditionStatement()
+		{
+		}
+
+		public CodeConditionStatement( CodeExpression condition, 
+					       params CodeStatement[] trueStatements )
+		{
+			this.condition = condition;
+			this.TrueStatements.AddRange( trueStatements );
+		}
+
+		public CodeConditionStatement( CodeExpression condition,
+					       CodeStatement[] trueStatements,
+					       CodeStatement[] falseStatements )
+		{
+			this.condition = condition;
+			this.TrueStatements.AddRange( trueStatements );
+			this.FalseStatements.AddRange( falseStatements );
+		}
+		
+		//
+		// Properties
+		//
+		public CodeExpression Condition {
+			get {
+				return condition;
+			}
+			set {
+				condition = value;
+			}
+		}
+
+		public CodeStatementCollection FalseStatements {
+			get {
+				if ( falseStatements == null )
+					falseStatements = 
+						new CodeStatementCollection();
+				return falseStatements;
+			}
+		}
+
+		public CodeStatementCollection TrueStatements {
+			get {
+				if ( trueStatements == null )
+					trueStatements = 
+						new CodeStatementCollection();
+				return trueStatements;
+			}
+		}
+ 	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeConstructor.cs b/mcs/class/System/System.CodeDom/CodeConstructor.cs
new file mode 100755
index 00000000000..bbf99879bb4
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeConstructor.cs
@@ -0,0 +1,52 @@
+//
+// System.CodeDom CodeConstructor Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeConstructor
+		: CodeMemberMethod 
+	{
+		private CodeExpressionCollection baseConstructorArgs;
+		private CodeExpressionCollection chainedConstructorArgs;
+
+		//
+		// Constructors
+		//
+		public CodeConstructor()
+		{
+		}
+
+		//
+		// Properties
+		//
+		public CodeExpressionCollection BaseConstructorArgs {
+			get {
+				if ( baseConstructorArgs == null )
+					baseConstructorArgs = new CodeExpressionCollection();
+
+				return baseConstructorArgs;
+			}
+		}
+
+		public CodeExpressionCollection ChainedConstructorArgs {
+			get {
+				if ( chainedConstructorArgs == null )
+					chainedConstructorArgs = new CodeExpressionCollection();
+
+				return chainedConstructorArgs;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeDelegateCreateExpression.cs b/mcs/class/System/System.CodeDom/CodeDelegateCreateExpression.cs
new file mode 100755
index 00000000000..04d1065b8e3
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeDelegateCreateExpression.cs
@@ -0,0 +1,72 @@
+//
+// System.CodeDom CodeDelegateCreateExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeDelegateCreateExpression
+		: CodeExpression 
+	{
+		private CodeTypeReference delegateType;
+		private string methodName;
+		private CodeExpression targetObject;
+
+		//
+		// Constructors
+		//
+		public CodeDelegateCreateExpression ()
+		{
+		}
+
+		public CodeDelegateCreateExpression (CodeTypeReference delegateType,
+						     CodeExpression targetObject,
+						     string methodName)
+		{
+			this.delegateType = delegateType;
+			this.targetObject = targetObject;
+			this.methodName = methodName;
+		}
+
+
+		//
+		// Properties
+		//
+		public CodeTypeReference DelegateType {
+			get {
+				return delegateType;
+			}
+			set {
+				delegateType = value;
+			}
+		}
+
+		public string MethodName {
+			get {
+				return methodName;
+			}
+			set {
+				methodName = value;
+			}
+		}
+
+		public CodeExpression TargetObject {
+			get {
+				return targetObject;
+			}
+			set {
+				targetObject = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeDelegateInvokeExpression.cs b/mcs/class/System/System.CodeDom/CodeDelegateInvokeExpression.cs
new file mode 100755
index 00000000000..84fa6a69669
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeDelegateInvokeExpression.cs
@@ -0,0 +1,64 @@
+//
+// System.CodeDom CodeDelegateInvokeExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeDelegateInvokeExpression
+		: CodeExpression 
+	{
+		private CodeExpressionCollection parameters;
+		private CodeExpression targetObject;
+		
+		//
+		// Constructors
+		//
+		public CodeDelegateInvokeExpression ()
+		{
+		}
+		
+		public CodeDelegateInvokeExpression (CodeExpression targetObject)
+		{
+			this.targetObject = targetObject;
+		}
+
+		public CodeDelegateInvokeExpression (CodeExpression targetObject,
+						     CodeExpression [] parameters)
+		{
+			this.targetObject = targetObject;
+			this.Parameters.AddRange( parameters );
+		}
+
+
+		//
+		// Properties
+		//
+		public CodeExpressionCollection Parameters {
+			get {
+				if ( parameters == null )
+					parameters = new CodeExpressionCollection();
+				return parameters;
+			}
+		}
+
+		public CodeExpression TargetObject {
+			get {
+				return targetObject;
+			}
+			set {
+				targetObject = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeDirectionExpression.cs b/mcs/class/System/System.CodeDom/CodeDirectionExpression.cs
new file mode 100644
index 00000000000..da6b96147af
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeDirectionExpression.cs
@@ -0,0 +1,59 @@
+//
+// System.CodeDom FieldDirection Enum implementation
+//
+// Author:
+//   Sean MacIsaac (macisaac@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeDirectionExpression
+		: CodeExpression
+	{
+		private FieldDirection direction;
+		private CodeExpression expression;
+
+		//
+		// Constructors
+		//
+		public CodeDirectionExpression()
+		{
+		}
+
+		public CodeDirectionExpression( FieldDirection direction, 
+						CodeExpression expression )
+		{
+			this.direction = direction;
+			this.expression = expression;
+		}
+
+		//
+		// Properties
+		//
+		public FieldDirection Direction {
+			get {
+				return direction;
+			}
+			set {
+				direction = value;
+			}
+		}
+
+		public CodeExpression Expression {
+			get {
+				return expression;
+			}
+			set {
+				expression = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeEntryPointMethod.cs b/mcs/class/System/System.CodeDom/CodeEntryPointMethod.cs
new file mode 100644
index 00000000000..ffc6a198dff
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeEntryPointMethod.cs
@@ -0,0 +1,21 @@
+//
+// System.CodeDom CodeEntryPointMethod Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeEntryPointMethod
+		: CodeMemberMethod
+	{
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeEventReferenceExpression.cs b/mcs/class/System/System.CodeDom/CodeEventReferenceExpression.cs
new file mode 100644
index 00000000000..cba9754a74b
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeEventReferenceExpression.cs
@@ -0,0 +1,57 @@
+//
+// System.CodeDom CodeEventReferenceExpression class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeEventReferenceExpression
+		: CodeExpression
+	{
+		private string eventName;
+		private CodeExpression targetObject;
+
+		//
+		// Constructors
+		//
+		public CodeEventReferenceExpression()
+		{
+		}
+
+		public CodeEventReferenceExpression( CodeExpression targetObject, string EventName )
+		{
+			this.targetObject = targetObject;
+			this.eventName = eventName;
+		}
+
+		//
+		// Properties
+		//
+		public string EventName {
+			get {
+				return eventName;
+			}
+			set {
+				eventName = value;
+			}
+		}
+		
+		public CodeExpression TargetObject {
+			get {
+				return targetObject;
+			}
+			set {
+				targetObject = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeExpression.cs b/mcs/class/System/System.CodeDom/CodeExpression.cs
new file mode 100755
index 00000000000..91d2f2f2839
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeExpression.cs
@@ -0,0 +1,21 @@
+//
+// System.CodeDom CodeExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeExpression
+		: CodeObject
+	{
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeExpressionCollection.cs b/mcs/class/System/System.CodeDom/CodeExpressionCollection.cs
new file mode 100755
index 00000000000..2ee42a1c9d8
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeExpressionCollection.cs
@@ -0,0 +1,100 @@
+//
+// System.CodeDom CodeExpressionCollection Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeExpressionCollection
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeExpressionCollection()
+		{
+		}
+		
+		public CodeExpressionCollection( CodeExpression[] value )
+		{
+			AddRange( value );
+		}
+
+		public CodeExpressionCollection( CodeExpressionCollection value )
+		{
+			AddRange( value );
+		}
+
+		//
+		// Properties
+		//
+		public CodeExpression this[int index]
+		{
+			get {
+				return (CodeExpression)List[index];
+			}
+			set {
+				List[index] = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public int Add (CodeExpression value)
+		{
+			return List.Add( value );
+		}
+
+		public void AddRange (CodeExpression [] value )
+		{
+			foreach ( CodeExpression elem in value )
+				Add( elem );
+		}
+		
+		public void AddRange (CodeExpressionCollection value)
+		{
+			foreach ( CodeExpression elem in value )
+				Add( elem );
+		}
+
+		public bool Contains( CodeExpression value )
+		{
+			return List.Contains( value );
+		}
+		
+		public void CopyTo( CodeExpression[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeExpression value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeExpression value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeExpression value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeExpressionStatement.cs b/mcs/class/System/System.CodeDom/CodeExpressionStatement.cs
new file mode 100644
index 00000000000..d397290cf99
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeExpressionStatement.cs
@@ -0,0 +1,46 @@
+//
+// System.CodeDom CodeExpressionStatement Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeExpressionStatement
+		: CodeStatement
+	{
+		private CodeExpression expression;
+
+		//
+		// Constructors
+		//
+		public CodeExpressionStatement()
+		{
+		}
+
+		public CodeExpressionStatement(CodeExpression expression)
+		{
+			Expression = expression;
+		}
+
+		//
+		// Properties
+		//
+		public CodeExpression Expression {
+			get {
+				return expression;
+			}
+			set {
+				expression = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeFieldReferenceExpression.cs b/mcs/class/System/System.CodeDom/CodeFieldReferenceExpression.cs
new file mode 100755
index 00000000000..04f0aca81ef
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeFieldReferenceExpression.cs
@@ -0,0 +1,59 @@
+//
+// System.CodeDom CodeFieldReferenceExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeFieldReferenceExpression
+		: CodeExpression 
+	{
+		private CodeExpression targetObject;
+		private string fieldName;
+
+		//
+		// Constructors
+		//
+		public CodeFieldReferenceExpression ()
+		{
+		}
+		
+		public CodeFieldReferenceExpression (CodeExpression targetObject,
+						     string fieldName)
+		{
+			this.targetObject = targetObject;
+			this.fieldName = fieldName;
+		}
+
+		//
+		// Properties
+		//
+		public string FieldName {
+			get {
+				return fieldName;
+			}
+			set {
+				fieldName = value;
+			}
+		}
+
+		public CodeExpression TargetObject {
+			get {
+				return targetObject;
+			}
+			set {
+				targetObject = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeGotoStatement.cs b/mcs/class/System/System.CodeDom/CodeGotoStatement.cs
new file mode 100644
index 00000000000..283b8862443
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeGotoStatement.cs
@@ -0,0 +1,42 @@
+//
+// System.CodeDom CodeGotoStatement Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeGotoStatement
+		: CodeStatement
+	{
+		private string label;
+
+		//
+		// Constructors
+		//
+		public CodeGotoStatement( string label )
+		{
+			Label = label;
+		}
+
+		//
+		// Properties
+		//
+		public string Label {
+			get {
+				return label;
+			}
+			set {
+				label = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeIndexerExpression.cs b/mcs/class/System/System.CodeDom/CodeIndexerExpression.cs
new file mode 100755
index 00000000000..958c2287c11
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeIndexerExpression.cs
@@ -0,0 +1,58 @@
+//
+// System.CodeDom CodeFieldReferenceExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeIndexerExpression
+		: CodeExpression 
+	{
+		private CodeExpression targetObject;
+		private CodeExpressionCollection indices;
+
+		//
+		// Constructors
+		//
+		public CodeIndexerExpression ()
+		{
+		}
+		
+		public CodeIndexerExpression (CodeExpression targetObject, params CodeExpression[] indices)
+		{
+			this.targetObject = targetObject;
+			this.Indices.AddRange( indices );
+		}
+
+		//
+		// Properties
+		//
+		public CodeExpressionCollection Indices {
+			get {
+				if ( indices == null )
+					indices = new CodeExpressionCollection();
+
+				return indices;
+			}
+		}
+
+		public CodeExpression TargetObject {
+			get {
+				return targetObject;
+			}
+			set {
+				targetObject = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeIterationStatement.cs b/mcs/class/System/System.CodeDom/CodeIterationStatement.cs
new file mode 100644
index 00000000000..67b41da3b98
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeIterationStatement.cs
@@ -0,0 +1,81 @@
+//
+// System.CodeDom CodeIterationStatement Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeIterationStatement
+		: CodeStatement
+	{
+		private CodeStatement incrementStatement;
+		private CodeStatement initStatement;
+		private CodeStatementCollection statements;
+		private CodeExpression testExpression;
+		
+		//
+		// Constructors
+		//
+		public CodeIterationStatement()
+		{
+		}
+
+		public CodeIterationStatement( CodeStatement initStatement, 
+					       CodeExpression testExpression,
+					       CodeStatement incrementStatement,
+					       params CodeStatement[] statements )
+		{
+			this.initStatement = initStatement;
+			this.testExpression = testExpression;
+			this.incrementStatement = incrementStatement;
+			this.Statements.AddRange( statements );
+		}
+
+		//
+		// Properties
+		//
+		public CodeStatement IncrementStatement {
+			get {
+				return incrementStatement;
+			}
+			set {
+				incrementStatement = value;
+			}
+		}
+
+		public CodeStatement InitStatement {
+			get {
+				return initStatement;
+			}
+			set {
+				initStatement = value;
+			}
+		}
+
+		public CodeStatementCollection Statements {
+			get {
+				if ( statements == null )
+					statements = new CodeStatementCollection();
+				return statements;
+			}
+		}
+
+		public CodeExpression TestExpression {
+			get {
+				return testExpression;
+			}
+			set {
+				testExpression = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeLabeledStatement.cs b/mcs/class/System/System.CodeDom/CodeLabeledStatement.cs
new file mode 100644
index 00000000000..0e79e2a042b
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeLabeledStatement.cs
@@ -0,0 +1,62 @@
+//
+// System.CodeDom CodeLabeledStatement Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeLabeledStatement
+		: CodeStatement
+	{
+		private string label;
+		private CodeStatement statement;
+
+		//
+		// Constructors
+		//
+		public CodeLabeledStatement()
+		{
+		}
+
+		public CodeLabeledStatement( string label )
+		{
+			this.label = label;
+		}
+
+		public CodeLabeledStatement( string label, CodeStatement statement )
+		{
+			this.label = label;
+			this.statement = statement;
+		}
+
+		//
+		// Properties
+		//
+		public string Label {
+			get {
+				return label;
+			}
+			set {
+				label = value;
+			}
+		}
+
+		public CodeStatement Statement {
+			get {
+				return statement;
+			}
+			set {
+				statement = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeLinePragma.cs b/mcs/class/System/System.CodeDom/CodeLinePragma.cs
new file mode 100755
index 00000000000..613961188b0
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeLinePragma.cs
@@ -0,0 +1,56 @@
+//
+// System.CodeDom CodeLinePragma Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	// <summary>
+	//    Use objects of this class to keep track of locations where
+	//    statements are defined
+	// </summary>
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeLinePragma 
+	{
+		private string fileName;
+		private int lineNumber;
+		
+		//
+		// Constructors
+		//
+		public CodeLinePragma (string fileName, int lineNumber)
+		{
+			this.fileName = fileName;
+			this.lineNumber = lineNumber;
+		}
+		
+		//
+		// Properties
+		//
+		public string FileName {
+			get {
+				return fileName;
+			}
+			set {
+				fileName = value;
+			}
+		}
+		
+		public int LineNumber {
+			get {
+				return lineNumber;
+			}
+			set {
+				lineNumber = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeMemberEvent.cs b/mcs/class/System/System.CodeDom/CodeMemberEvent.cs
new file mode 100755
index 00000000000..4537ddc0728
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeMemberEvent.cs
@@ -0,0 +1,62 @@
+//
+// System.CodeDom CodeMemberEvent Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeMemberEvent
+		: CodeTypeMember
+	{
+		private CodeTypeReference implementationType;
+		private CodeTypeReference privateImplementationType;
+		private CodeTypeReference type;
+		
+		//
+		// Constructors
+		//
+		public CodeMemberEvent ()
+		{
+		}
+
+		//
+		// Properties
+		//
+		public CodeTypeReference ImplementationTypes {
+			get {
+				return implementationType;
+			}
+			set {
+				implementationType = value;
+			}
+		}
+
+		public CodeTypeReference PrivateImplementationType {
+			get {
+				return privateImplementationType;
+			}
+			set {
+				privateImplementationType = value;
+			}
+		}
+
+		public CodeTypeReference Type {
+			get {
+				return type;
+			}
+			set {
+				type = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeMemberField.cs b/mcs/class/System/System.CodeDom/CodeMemberField.cs
new file mode 100755
index 00000000000..0665da3c2b3
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeMemberField.cs
@@ -0,0 +1,67 @@
+//
+// System.CodeDom CodeMemberField Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeMemberField
+		: CodeTypeMember
+	{
+		private CodeExpression initExpression;
+		private CodeTypeReference type;
+		
+		public CodeMemberField ()
+		{
+		}
+
+		public CodeMemberField (CodeTypeReference type, string name)
+		{
+			this.type = type;
+			this.Name = name;
+		}
+		
+		public CodeMemberField (string type, string name)
+		{
+			this.type = new CodeTypeReference( type );
+			this.Name = name;
+		}
+			
+		public CodeMemberField (Type type, string name)
+		{
+			this.type = new CodeTypeReference( type );
+			this.Name = name;
+		}
+
+		//
+		// Properties
+		//
+		public CodeExpression InitExpression {
+			get {
+				return initExpression;
+			}
+			set {
+				initExpression = value;
+			}
+		}
+
+		public CodeTypeReference Type {
+			get {
+				return type;
+			}
+			set {
+				type = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeMemberMethod.cs b/mcs/class/System/System.CodeDom/CodeMemberMethod.cs
new file mode 100755
index 00000000000..da7669adb34
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeMemberMethod.cs
@@ -0,0 +1,109 @@
+//
+// System.CodeDom CodeMemberMethod Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeMemberMethod
+		: CodeTypeMember 
+	{
+		private CodeTypeReferenceCollection implementationTypes;
+		private CodeParameterDeclarationExpressionCollection parameters;
+		private CodeTypeReference privateImplementationType;
+		private CodeTypeReference returnType;
+		private CodeStatementCollection statements;
+		private CodeAttributeDeclarationCollection returnTypeCustomAttributes;
+
+		//
+		// Constructors
+		//
+		public CodeMemberMethod()
+		{
+		}
+
+		//
+		// Properties
+		// 
+		public CodeTypeReferenceCollection ImplementationTypes {
+			get {
+				if ( implementationTypes == null ) {
+					implementationTypes = new CodeTypeReferenceCollection();
+					if ( PopulateImplementationTypes != null )
+						PopulateImplementationTypes( this, EventArgs.Empty );
+				}
+				return implementationTypes;
+			}
+		}
+
+		public CodeParameterDeclarationExpressionCollection Parameters {
+			get {
+				if ( parameters == null ) {
+					parameters = new CodeParameterDeclarationExpressionCollection();
+					if ( PopulateParameters != null )
+						PopulateParameters( this, EventArgs.Empty );
+				}
+				return parameters;
+			}
+		}
+
+		public CodeTypeReference PrivateImplementationType {
+			get {
+				return privateImplementationType;
+			}
+			set {
+				privateImplementationType = value;
+			}
+		}
+
+		public CodeTypeReference ReturnType {
+			get {
+				if ( returnType == null )
+					return new CodeTypeReference( typeof(void) );
+				return returnType;
+			}
+			set {
+				returnType = value;
+			}
+		}
+
+		public CodeStatementCollection Statements {
+			get {
+				if ( statements == null ) {
+					statements = new CodeStatementCollection();
+					if ( PopulateStatements != null )
+						PopulateStatements( this, EventArgs.Empty );
+				}
+				return statements;
+			}
+		}
+
+		public CodeAttributeDeclarationCollection ReturnTypeCustomAttributes {
+			get {
+				if ( returnTypeCustomAttributes == null )
+					returnTypeCustomAttributes = new CodeAttributeDeclarationCollection();
+				
+				return returnTypeCustomAttributes;
+			}
+		}
+
+		//
+		// Events
+		//
+		public event EventHandler PopulateImplementationTypes;
+
+		public event EventHandler PopulateParameters;
+
+		public event EventHandler PopulateStatements;
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeMemberProperty.cs b/mcs/class/System/System.CodeDom/CodeMemberProperty.cs
new file mode 100755
index 00000000000..8ad15530acc
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeMemberProperty.cs
@@ -0,0 +1,108 @@
+//
+// System.CodeDom CodeMemberProperty Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeMemberProperty
+		: CodeTypeMember
+	{
+		private CodeStatementCollection getStatements;
+		private bool hasGet;
+		private bool hasSet;
+		private CodeTypeReferenceCollection implementationTypes;
+		private CodeParameterDeclarationExpressionCollection parameters;
+		private CodeTypeReference privateImplementationType;
+		private CodeStatementCollection setStatements;
+		private CodeTypeReference type;
+		
+		//
+		// Constructors
+		//
+		public CodeMemberProperty ()
+		{
+		}
+
+		//
+		// Properties
+		//
+		public CodeStatementCollection GetStatements {
+			get {
+				if ( getStatements == null )
+					getStatements = new CodeStatementCollection();
+				return getStatements;
+			}
+		}
+
+		public bool HasGet {
+			get {
+				return hasGet;
+			}
+			set {
+				hasGet = value;
+			}
+		}
+		
+		public bool HasSet {
+			get {
+				return hasSet;
+			}
+			set {
+				hasSet = value;
+			}
+		}
+
+		public CodeTypeReferenceCollection ImplementationTypes {
+			get {
+				if ( implementationTypes == null )
+					implementationTypes = new CodeTypeReferenceCollection();
+				return implementationTypes;
+			}
+		}
+
+		public CodeParameterDeclarationExpressionCollection Parameters {
+			get {
+				if ( parameters == null )
+					parameters = new CodeParameterDeclarationExpressionCollection();
+				return parameters;
+			}
+		}
+
+		public CodeTypeReference PrivateImplementationType {
+			get {
+				return privateImplementationType;
+			}
+			set {
+				privateImplementationType = value;
+			}
+		}
+
+		public CodeStatementCollection SetStatements {
+			get {
+				if ( setStatements == null )
+					setStatements = new CodeStatementCollection();
+				return setStatements;
+			}
+		}
+
+		public CodeTypeReference Type {
+			get {
+				return type;
+			}
+			set {
+				type = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeMethodInvokeExpression.cs b/mcs/class/System/System.CodeDom/CodeMethodInvokeExpression.cs
new file mode 100755
index 00000000000..e01fdf5fdcd
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeMethodInvokeExpression.cs
@@ -0,0 +1,65 @@
+//
+// System.CodeDom CodeMethodInvokeExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeMethodInvokeExpression
+		: CodeExpression 
+	{
+		private CodeMethodReferenceExpression method;
+		private CodeExpressionCollection parameters;
+		
+		//
+		// Constructors
+		//
+		public CodeMethodInvokeExpression () 
+		{
+		}
+
+		public CodeMethodInvokeExpression (CodeMethodReferenceExpression method, params CodeExpression[] parameters)
+		{
+			this.method = method;
+			this.Parameters.AddRange( parameters );
+		}
+
+		public CodeMethodInvokeExpression ( CodeExpression targetObject,
+						    string methodName,
+						    CodeExpression [] parameters)
+		{
+			this.method = new CodeMethodReferenceExpression( targetObject, methodName );
+			this.Parameters.AddRange (parameters);
+		}
+
+		//
+		// Properties
+		//
+		public CodeMethodReferenceExpression Method {
+			get {
+				return method;
+			}
+			set {
+				method = value;
+			}
+		}
+
+		public CodeExpressionCollection Parameters {
+			get {
+				if ( parameters == null )
+					parameters = new CodeExpressionCollection();
+				return parameters;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeMethodReferenceExpression.cs b/mcs/class/System/System.CodeDom/CodeMethodReferenceExpression.cs
new file mode 100644
index 00000000000..1157a3fea7a
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeMethodReferenceExpression.cs
@@ -0,0 +1,59 @@
+//
+// System.CodeDom CodeMethodInvokeExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeMethodReferenceExpression
+		: CodeExpression 
+	{
+		private string methodName;
+		private CodeExpression targetObject;
+		
+		//
+		// Constructors
+		//
+		public CodeMethodReferenceExpression ()
+		{
+		}
+
+		public CodeMethodReferenceExpression (CodeExpression targetObject, 
+						      string methodName)
+		{
+			this.targetObject = targetObject;
+			this.methodName = methodName;
+		}
+
+		//
+		// Properties
+		//
+		public string MethodName {
+			get {
+				return methodName;
+			}
+			set {
+				methodName = value;
+			}
+		}
+
+		public CodeExpression TargetObject {
+			get {
+				return targetObject;
+			}
+			set {
+				targetObject = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeMethodReturnStatement.cs b/mcs/class/System/System.CodeDom/CodeMethodReturnStatement.cs
new file mode 100755
index 00000000000..8ab4bd58c2a
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeMethodReturnStatement.cs
@@ -0,0 +1,47 @@
+//
+// System.CodeDom CodeMethodReturnStatement class implementation
+//
+// Author:
+//   Sean MacIsaac (macisaac@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeMethodReturnStatement
+		: CodeStatement
+	{
+		private CodeExpression expression;
+
+		//
+		// Constructors
+		//
+		public CodeMethodReturnStatement()
+		{
+		}
+		
+		public CodeMethodReturnStatement( CodeExpression expression )
+		{
+			this.expression = expression;
+		}
+		
+		//
+		// Properties
+		//
+		public CodeExpression Expression {
+			get {
+				return expression;
+			}
+			set {
+				expression = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeNamespace.cs b/mcs/class/System/System.CodeDom/CodeNamespace.cs
new file mode 100755
index 00000000000..1de1f7dc76b
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeNamespace.cs
@@ -0,0 +1,92 @@
+//
+// System.CodeDom CodeNamespace Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeNamespace
+		: CodeObject
+	{
+		private CodeCommentStatementCollection comments;
+		private CodeNamespaceImportCollection imports;
+		private CodeTypeDeclarationCollection types;
+		private string name;
+
+		//
+		// Constructors
+		//
+		public CodeNamespace()
+		{
+		}
+
+		public CodeNamespace(string name)
+		{
+			this.name = name;
+		}
+
+		//
+		// Properties
+		//
+		public CodeCommentStatementCollection Comments {
+			get {
+				if ( comments == null ) {
+					comments = new CodeCommentStatementCollection();
+					if ( PopulateComments != null )
+						PopulateComments( this, EventArgs.Empty );
+				}
+				return comments;
+			}
+		}
+
+		public CodeNamespaceImportCollection Imports {
+			get {
+				if ( imports == null ) {
+					imports = new CodeNamespaceImportCollection();
+					if ( PopulateImports != null )
+						PopulateImports( this, EventArgs.Empty );
+				}
+				return imports;
+			}
+		}
+
+		public string Name {
+			get {
+				return name;
+			}
+			set {
+				name = value;
+			}
+		}
+
+		public CodeTypeDeclarationCollection Types {
+			get {
+				if ( types == null ) {
+					types = new CodeTypeDeclarationCollection();
+					if ( PopulateTypes != null )
+						PopulateTypes( this, EventArgs.Empty );
+				}
+				return types;
+			}
+		}
+
+		//
+		// Events
+		//
+		public event EventHandler PopulateComments;
+		
+		public event EventHandler PopulateImports;
+		
+		public event EventHandler PopulateTypes;
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeNamespaceCollection.cs b/mcs/class/System/System.CodeDom/CodeNamespaceCollection.cs
new file mode 100644
index 00000000000..414fc6826ba
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeNamespaceCollection.cs
@@ -0,0 +1,99 @@
+//
+// System.CodeDom CodeNamespaceCollection Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeNamespaceCollection
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeNamespaceCollection()
+		{
+		}
+
+		public CodeNamespaceCollection( CodeNamespace[] value )
+		{
+			AddRange( value );
+		}
+
+		public CodeNamespaceCollection( CodeNamespaceCollection value )
+		{
+			AddRange( value );
+		}
+		
+		//
+		// Properties
+		//
+		public CodeNamespace this[int index]
+		{
+			get {
+				return (CodeNamespace)List[index];
+			}
+			set {
+				List[index] = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public int Add (CodeNamespace value)
+		{
+			return List.Add( value ); 
+		}
+
+		public void AddRange (CodeNamespace [] value )
+		{
+			foreach ( CodeNamespace elem in value )
+				Add( elem );
+		}
+		
+		public void AddRange (CodeNamespaceCollection value)
+		{
+			foreach ( CodeNamespace elem in value )
+				Add( elem );
+		}
+
+		public bool Contains( CodeNamespace value )
+		{
+			return List.Contains( value );
+		}
+		
+		public void CopyTo( CodeNamespace[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeNamespace value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeNamespace value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeNamespace value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeNamespaceImport.cs b/mcs/class/System/System.CodeDom/CodeNamespaceImport.cs
new file mode 100755
index 00000000000..a3cc14a6d4f
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeNamespaceImport.cs
@@ -0,0 +1,57 @@
+//
+// System.CodeDom CodeNamespaceImport Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeNamespaceImport
+		: CodeObject 
+	{
+		private CodeLinePragma linePragma;
+		private string nameSpace;
+		
+		//
+		// Constructors
+		//
+		public CodeNamespaceImport ()
+		{
+		}
+
+		public CodeNamespaceImport (string nameSpace)
+		{
+			this.nameSpace = nameSpace;
+		}
+
+		//
+		// Properties
+		//
+		public CodeLinePragma LinePragma {
+			get {
+				return linePragma;
+			}
+			set {
+				linePragma = value;
+			}
+		}
+
+		public string Namespace {
+			get {
+				return nameSpace;
+			}
+			set {
+				nameSpace = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeNamespaceImportCollection.cs b/mcs/class/System/System.CodeDom/CodeNamespaceImportCollection.cs
new file mode 100755
index 00000000000..dedc7321efc
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeNamespaceImportCollection.cs
@@ -0,0 +1,150 @@
+//
+// System.CodeDom CodeNamespaceImportCollection Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom
+{
+	/*
+	 * Should probably be derived from CollectionBase like any
+	 * other System.CodeDom.*Collection. MS docs say it currently
+	 * is not, for whichever reason.
+	 */
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeNamespaceImportCollection
+		: IList, ICollection, IEnumerable
+	{
+		private ArrayList namespaceImports;
+
+		//
+		// Constructors
+		//
+		public CodeNamespaceImportCollection ()
+		{
+			namespaceImports = new ArrayList();
+		}
+
+		//
+		// Properties
+		//
+		public int Count {
+			get {
+				return namespaceImports.Count;
+			}
+		}
+
+                public CodeNamespaceImport this [int index] {
+                        get {
+                                return (CodeNamespaceImport)namespaceImports[index];
+                        }
+			set {
+				namespaceImports[index] = value;
+			}
+                }
+
+		//
+		// Methods
+		//
+		public void Add (CodeNamespaceImport value)
+		{
+			namespaceImports.Add (value);
+		}
+
+		public void AddRange (CodeNamespaceImport [] value)
+		{
+			foreach (CodeNamespaceImport elem in value) 
+				namespaceImports.Add (elem);
+		}
+
+		public void Clear ()
+		{
+			namespaceImports.Clear ();
+		}
+
+		// IList implementation
+		bool IList.IsFixedSize {
+			get {
+				return false;
+			}
+		}
+
+		bool IList.IsReadOnly {
+			get {
+				return false;
+			}
+		}
+
+		object IList.this[int index] {
+			get {
+				return namespaceImports[index];
+			}
+			set {
+				namespaceImports[index] = value;
+			}
+		}
+
+		int IList.Add( object value )
+		{
+			return namespaceImports.Add( value );
+		}
+		
+		bool IList.Contains( object value )
+		{
+			return namespaceImports.Contains( value );
+		}
+		
+		int IList.IndexOf( object value )
+		{
+			return namespaceImports.IndexOf( value );
+		}
+
+		void IList.Insert( int index, object value )
+		{
+			namespaceImports.Insert( index, value );
+		}
+
+		void IList.Remove( object value )
+		{
+			namespaceImports.Remove( value );
+		}
+		
+		void IList.RemoveAt( int index )
+		{
+			namespaceImports.RemoveAt( index );
+		}
+
+		// ICollection implementation
+		object ICollection.SyncRoot {
+			get {
+				return namespaceImports.SyncRoot;
+			}
+		}
+
+		bool ICollection.IsSynchronized {
+			get {
+				return namespaceImports.IsSynchronized;
+			}
+		}
+
+		void ICollection.CopyTo( Array array, int index )
+		{
+			namespaceImports.CopyTo( array, index );
+		}
+
+		// IEnumerable implementation
+		public IEnumerator GetEnumerator ()
+		{
+			return namespaceImports.GetEnumerator();
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeObject.cs b/mcs/class/System/System.CodeDom/CodeObject.cs
new file mode 100755
index 00000000000..35b6053e73c
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeObject.cs
@@ -0,0 +1,35 @@
+//
+// System.CodeDom CodeObject class implementation
+//
+// Author:
+//   Sean MacIsaac (macisaac@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+using System.Collections.Specialized;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeObject
+	{
+		private IDictionary userData;
+
+		//
+		// Properties
+		//
+		public IDictionary UserData {
+			get {
+				if ( userData == null )
+					userData = new ListDictionary();
+				return userData;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeObjectCreateExpression.cs b/mcs/class/System/System.CodeDom/CodeObjectCreateExpression.cs
new file mode 100755
index 00000000000..a495d0b74aa
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeObjectCreateExpression.cs
@@ -0,0 +1,72 @@
+//
+// System.CodeDom CodeObjectCreateExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeObjectCreateExpression
+		: CodeExpression 
+	{
+		private CodeTypeReference createType;
+		private CodeExpressionCollection parameters;
+		
+		//
+		// Constructors
+		//
+		public CodeObjectCreateExpression () 
+		{
+		}
+
+		public CodeObjectCreateExpression (CodeTypeReference createType, 
+						   params CodeExpression [] parameters)
+		{
+			this.createType = createType;
+			this.Parameters.AddRange( parameters );
+		}
+
+		public CodeObjectCreateExpression (string createType, 
+						   params CodeExpression [] parameters)
+		{
+			this.createType = new CodeTypeReference( createType );
+			this.Parameters.AddRange( parameters );
+		}
+
+		public CodeObjectCreateExpression (Type createType, 
+						   params CodeExpression [] parameters)
+		{
+			this.createType = new CodeTypeReference( createType );
+			this.Parameters.AddRange( parameters );
+		}
+
+		//
+		// Properties
+		//
+		public CodeTypeReference CreateType {
+			get {
+				return createType;
+			}
+			set {
+				createType = value;
+			}
+		}
+
+		public CodeExpressionCollection Parameters {
+			get {
+				if ( parameters == null )
+					parameters = new CodeExpressionCollection();
+				return parameters;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeParameterDeclarationExpression.cs b/mcs/class/System/System.CodeDom/CodeParameterDeclarationExpression.cs
new file mode 100755
index 00000000000..9f1cf463fa4
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeParameterDeclarationExpression.cs
@@ -0,0 +1,88 @@
+//
+// System.CodeDom CodeParameterDeclarationExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeParameterDeclarationExpression
+		: CodeExpression 
+	{
+		private CodeAttributeDeclarationCollection customAttributes;
+		private FieldDirection direction;
+		private string name;
+		private CodeTypeReference type;
+
+		//
+		// Constructors
+		//
+		public CodeParameterDeclarationExpression ()
+		{
+		}
+
+		public CodeParameterDeclarationExpression( CodeTypeReference type, string name )
+		{
+			this.type = type;
+			this.name = name;
+		}
+
+		public CodeParameterDeclarationExpression (string type, string name)
+		{
+			this.type = new CodeTypeReference( type );
+			this.name = name;
+		}
+
+		public CodeParameterDeclarationExpression (Type type, string name)
+		{
+			this.type = new CodeTypeReference( type );
+			this.name = name;
+		}
+
+		//
+		// Properties
+		//
+		public CodeAttributeDeclarationCollection CustomAttributes {
+			get {
+				if ( customAttributes == null )
+					customAttributes = new CodeAttributeDeclarationCollection();
+				return customAttributes;
+			}
+		}
+
+		public FieldDirection Direction {
+			get {
+				return direction;
+			}
+			set {
+				direction = value;
+			}
+		}
+
+		public string Name {
+			get {
+				return name;
+			}
+			set {
+				name = value;
+			}
+		}
+
+		public CodeTypeReference Type {
+			get {
+				return type;
+			}
+			set {
+				type = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeParameterDeclarationExpressionCollection.cs b/mcs/class/System/System.CodeDom/CodeParameterDeclarationExpressionCollection.cs
new file mode 100755
index 00000000000..92d73ed42d9
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeParameterDeclarationExpressionCollection.cs
@@ -0,0 +1,100 @@
+//
+// System.CodeDom CodeParameterDeclarationExpressionCollection Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeParameterDeclarationExpressionCollection
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeParameterDeclarationExpressionCollection()
+		{
+		}
+
+		public CodeParameterDeclarationExpressionCollection( CodeParameterDeclarationExpression[] value )
+		{
+			AddRange( value );
+		}
+		
+		public CodeParameterDeclarationExpressionCollection( CodeParameterDeclarationExpressionCollection value )
+		{
+			AddRange( value );
+		}
+
+		//
+		// Properties
+		//
+		public CodeParameterDeclarationExpression this[int index]
+		{
+			get {
+				return (CodeParameterDeclarationExpression)List[index];
+			}
+			set {
+				List[index] = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public int Add (CodeParameterDeclarationExpression value)
+		{
+			return List.Add( value );
+		}
+
+		public void AddRange (CodeParameterDeclarationExpression [] value )
+		{
+			foreach ( CodeParameterDeclarationExpression elem in value )
+				Add( elem );
+		}
+		
+		public void AddRange (CodeParameterDeclarationExpressionCollection value)
+		{
+			foreach ( CodeParameterDeclarationExpression elem in value )
+				Add( elem );
+		}
+
+		public bool Contains( CodeParameterDeclarationExpression value )
+		{
+			return List.Contains( value );
+		}
+		
+		public void CopyTo( CodeParameterDeclarationExpression[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeParameterDeclarationExpression value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeParameterDeclarationExpression value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeParameterDeclarationExpression value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodePrimitiveExpression.cs b/mcs/class/System/System.CodeDom/CodePrimitiveExpression.cs
new file mode 100755
index 00000000000..c6404cdf08f
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodePrimitiveExpression.cs
@@ -0,0 +1,46 @@
+//
+// System.CodeDom CodePrimitiveExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodePrimitiveExpression
+		: CodeExpression 
+	{
+		private object value;
+
+		//
+		// Constructors
+		//
+		public CodePrimitiveExpression ()
+		{
+		}
+
+		public CodePrimitiveExpression (Object value)
+		{
+			this.value = value;
+		}
+
+		//
+		// Properties
+		//
+		public object Value {
+			get {
+				return this.value;
+			}
+			set {
+				this.value = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodePropertyReferenceExpression.cs b/mcs/class/System/System.CodeDom/CodePropertyReferenceExpression.cs
new file mode 100755
index 00000000000..0680897c60c
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodePropertyReferenceExpression.cs
@@ -0,0 +1,59 @@
+//
+// System.CodeDom CodePropertyReferenceExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodePropertyReferenceExpression
+		: CodeExpression 
+	{
+		private CodeExpression targetObject;
+		private string propertyName;
+		
+		//
+		// Constructors
+		//
+		public CodePropertyReferenceExpression () 
+		{
+		}
+
+		public CodePropertyReferenceExpression (CodeExpression targetObject,
+							string propertyName)
+		{
+			this.targetObject = targetObject;
+			this.propertyName = propertyName;
+		}
+
+		//
+		// Properties
+		//
+		public string PropertyName {
+			get {
+				return propertyName;
+			}
+			set {
+				propertyName = value;
+			}
+		}
+
+		public CodeExpression TargetObject {
+			get {
+				return targetObject;
+			}
+			set {
+				targetObject = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodePropertySetValueReferenceExpression.cs b/mcs/class/System/System.CodeDom/CodePropertySetValueReferenceExpression.cs
new file mode 100644
index 00000000000..db99a3ad351
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodePropertySetValueReferenceExpression.cs
@@ -0,0 +1,21 @@
+//
+// System.CodeDom CodePropertySetValueReferenceExpression Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodePropertySetValueReferenceExpression
+		: CodeExpression
+	{
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeRemoveEventStatement.cs b/mcs/class/System/System.CodeDom/CodeRemoveEventStatement.cs
new file mode 100644
index 00000000000..c19ace0e84b
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeRemoveEventStatement.cs
@@ -0,0 +1,68 @@
+//
+// System.CodeDom CodeRemoveEventStatement Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeRemoveEventStatement
+		: CodeStatement 
+	{
+		private CodeEventReferenceExpression eventRef;
+		private CodeExpression listener;
+
+		//
+		// Constructors
+		//
+		public CodeRemoveEventStatement ()
+		{
+		}
+
+		public CodeRemoveEventStatement (CodeEventReferenceExpression eventRef,
+						 CodeExpression listener)
+		{
+			this.eventRef = eventRef;
+			this.listener = listener;
+		}
+
+		public CodeRemoveEventStatement (CodeExpression targetObject,
+						 string eventName,
+						 CodeExpression listener)
+		{
+			this.eventRef = new CodeEventReferenceExpression( targetObject,
+									  eventName );
+			this.listener = listener;
+		}
+
+		//
+		// Properties
+		//
+		public CodeEventReferenceExpression Event {
+			get {
+				return eventRef;
+			}
+			set {
+				eventRef = value;
+			}
+		}
+
+		public CodeExpression Listener {
+			get {
+				return listener; 
+			}
+			set {
+				listener = value;
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.CodeDom/CodeSnippetCompileUnit.cs b/mcs/class/System/System.CodeDom/CodeSnippetCompileUnit.cs
new file mode 100644
index 00000000000..49d13d5d461
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeSnippetCompileUnit.cs
@@ -0,0 +1,52 @@
+//
+// System.CodeDom CodeSnippetCompileUnit Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeSnippetCompileUnit
+		: CodeCompileUnit
+	{
+		private CodeLinePragma linePragma;
+		private string value;
+
+		//
+		// Constructors
+		//
+		public CodeSnippetCompileUnit( string value )
+		{
+			this.value = value;
+		}
+
+		//
+		// Properties
+		//
+		public CodeLinePragma LinePragma {
+			get {
+				return linePragma;
+			}
+			set {
+				linePragma = value;
+			}
+		}
+
+		public string Value {
+			get {
+				return this.value;
+			}
+			set {
+				this.value = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeSnippetExpression.cs b/mcs/class/System/System.CodeDom/CodeSnippetExpression.cs
new file mode 100644
index 00000000000..e9023d3c75b
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeSnippetExpression.cs
@@ -0,0 +1,46 @@
+//
+// System.CodeDom CodeSnippetExpression Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeSnippetExpression
+		: CodeExpression 
+	{
+		private string value;
+
+		//
+		// Constructors
+		//
+		public CodeSnippetExpression()
+		{
+		}
+
+		public CodeSnippetExpression( string value )
+		{
+			Value = value;
+		}
+		
+		//
+		// Properties
+		//
+		public string Value {
+			get {
+				return this.value;
+			}
+			set {
+				this.value = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeSnippetStatement.cs b/mcs/class/System/System.CodeDom/CodeSnippetStatement.cs
new file mode 100644
index 00000000000..1bd06116ba4
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeSnippetStatement.cs
@@ -0,0 +1,46 @@
+//
+// System.CodeDom CodeSnippetStatement Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeSnippetStatement
+		: CodeStatement 
+	{
+		private string value;
+
+		//
+		// Constructors
+		//
+		public CodeSnippetStatement()
+		{
+		}
+
+		public CodeSnippetStatement( string value )
+		{
+			this.value = value;
+		}
+		
+		//
+		// Properties
+		//
+		public string Value {
+			get {
+				return this.value;
+			}
+			set {
+				this.value = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeSnippetTypeMember.cs b/mcs/class/System/System.CodeDom/CodeSnippetTypeMember.cs
new file mode 100644
index 00000000000..656afc287af
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeSnippetTypeMember.cs
@@ -0,0 +1,46 @@
+//
+// System.CodeDom CodeSnippetTypeMember Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeSnippetTypeMember
+		: CodeTypeMember
+	{
+		private string text;
+
+		//
+		// Constructors
+		//
+		public CodeSnippetTypeMember()
+		{
+		}
+		
+		public CodeSnippetTypeMember( string text )
+		{
+			this.text = text;
+		}
+
+		//
+		// Properties
+		//
+		public string Text {
+			get {
+				return text;
+			}
+			set {
+				text = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeStatement.cs b/mcs/class/System/System.CodeDom/CodeStatement.cs
new file mode 100755
index 00000000000..f79710a1bbd
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeStatement.cs
@@ -0,0 +1,42 @@
+//
+// System.CodeDom CodeStatement class implementation
+//
+// Author:
+//   Sean MacIsaac (macisaac@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeStatement
+		: CodeObject
+	{
+		private CodeLinePragma linePragma;
+		
+		//
+		// Constructors
+		//
+		public CodeStatement()
+		{
+		}
+		
+		//
+		// Properties
+		//
+		public CodeLinePragma LinePragma {
+			get {
+				return linePragma;
+			}
+			set {
+				linePragma = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeStatementCollection.cs b/mcs/class/System/System.CodeDom/CodeStatementCollection.cs
new file mode 100755
index 00000000000..85462d76346
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeStatementCollection.cs
@@ -0,0 +1,105 @@
+//
+// System.CodeDom CodeStatementCollection Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeStatementCollection
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeStatementCollection()
+		{
+		}
+
+		public CodeStatementCollection( CodeStatement[] value )
+		{
+			AddRange( value );
+		}
+
+		public CodeStatementCollection( CodeStatementCollection value )
+		{
+			AddRange( value );
+		}
+
+		//
+		// Properties
+		//
+		public CodeStatement this[int index]
+		{
+			get {
+				return (CodeStatement)List[index];
+			}
+			set {
+				List[index] = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public int Add (CodeStatement value)
+		{
+			return List.Add( value );
+		}
+
+		public int Add (CodeExpression value)
+		{
+			return Add( new CodeExpressionStatement( value ) );
+		}
+
+		public void AddRange (CodeStatement [] statements )
+		{
+			foreach ( CodeStatement elem in statements )
+				Add( elem );
+		}
+		
+		public void AddRange( CodeStatementCollection value )
+		{
+			foreach ( CodeStatement elem in value )
+				Add( elem );
+		}
+
+		public bool Contains( CodeStatement value )
+		{
+			return List.Contains( value );
+		}
+		
+		public void CopyTo( CodeStatement[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeStatement value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeStatement value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeStatement value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeThisReferenceExpression.cs b/mcs/class/System/System.CodeDom/CodeThisReferenceExpression.cs
new file mode 100755
index 00000000000..737410bbf04
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeThisReferenceExpression.cs
@@ -0,0 +1,28 @@
+//
+// System.CodeDom CodeParameterDeclarationExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeThisReferenceExpression
+		: CodeExpression 
+	{
+
+		//
+		// Constructors
+		//
+		public CodeThisReferenceExpression()
+		{
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeThrowExceptionStatement.cs b/mcs/class/System/System.CodeDom/CodeThrowExceptionStatement.cs
new file mode 100755
index 00000000000..b031fa039dd
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeThrowExceptionStatement.cs
@@ -0,0 +1,46 @@
+//
+// System.CodeDom CodeThrowExceptionStatement Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeThrowExceptionStatement
+		: CodeStatement 
+	{
+		private CodeExpression toThrow;
+		
+		//
+		// Constructors
+		//
+		public CodeThrowExceptionStatement ()
+		{
+		}
+
+		public CodeThrowExceptionStatement (CodeExpression toThrow)
+		{
+			this.toThrow = toThrow;
+		}
+
+		//
+		// Properties
+		//
+		public CodeExpression ToThrow {
+			get {
+				return toThrow;
+			}
+			set {
+				toThrow = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTryCatchFinallyStatement.cs b/mcs/class/System/System.CodeDom/CodeTryCatchFinallyStatement.cs
new file mode 100755
index 00000000000..4ca30008464
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTryCatchFinallyStatement.cs
@@ -0,0 +1,73 @@
+//
+// System.CodeDom CodeTryCatchFinallyStatement Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTryCatchFinallyStatement
+		: CodeStatement 
+	{
+		private CodeStatementCollection tryStatements, finallyStatements;
+		private CodeCatchClauseCollection catchClauses;
+		
+		//
+		// Constructors
+		//
+		public CodeTryCatchFinallyStatement ()
+		{
+		}
+		
+		public CodeTryCatchFinallyStatement (CodeStatement [] tryStatements,
+						     CodeCatchClause [] catchClauses)
+		{
+			TryStatements.AddRange( tryStatements );
+			CatchClauses.AddRange( catchClauses );
+		}
+
+		public CodeTryCatchFinallyStatement (CodeStatement [] tryStatements,
+						     CodeCatchClause [] catchClauses,
+						     CodeStatement [] finallyStatements)
+		{
+			TryStatements.AddRange( tryStatements );
+			CatchClauses.AddRange( catchClauses );
+			FinallyStatements.AddRange( finallyStatements );
+		}
+
+		//
+		// Properties
+		//
+		public CodeStatementCollection FinallyStatements{
+			get {
+				if ( finallyStatements == null )
+					finallyStatements = new CodeStatementCollection();
+				return finallyStatements;
+			}
+		}
+
+		public CodeStatementCollection TryStatements {
+			get {
+				if ( tryStatements == null )
+					tryStatements = new CodeStatementCollection();
+				return tryStatements;
+			}
+		}
+		public CodeCatchClauseCollection CatchClauses {
+			get {
+				if ( catchClauses == null )
+					catchClauses = new CodeCatchClauseCollection();
+				return catchClauses;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTypeConstructor.cs b/mcs/class/System/System.CodeDom/CodeTypeConstructor.cs
new file mode 100644
index 00000000000..8213bf56c2a
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTypeConstructor.cs
@@ -0,0 +1,21 @@
+//
+// System.CodeDom CodeTypeConstructor Class Implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//   
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTypeConstructor
+		: CodeMemberMethod
+	{
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTypeDeclaration.cs b/mcs/class/System/System.CodeDom/CodeTypeDeclaration.cs
new file mode 100755
index 00000000000..be0fdc70cff
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTypeDeclaration.cs
@@ -0,0 +1,149 @@
+//
+// System.CodeDom CodeTypeDeclaration Class implementation
+//
+// Author:
+//   Sean MacIsaac (macisaac@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Reflection;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTypeDeclaration
+		: CodeTypeMember
+	{
+		private CodeTypeReferenceCollection baseTypes;
+		private CodeTypeMemberCollection members;
+		private TypeAttributes typeAttributes;
+		private bool isEnum;
+		private bool isStruct;
+
+		//
+		// Constructors
+		//
+
+		public CodeTypeDeclaration()
+		{
+		}
+		
+		public CodeTypeDeclaration( string name )
+		{
+			this.Name = name;
+		}
+
+		/* by default, it's a class */
+
+		//
+		// Properties
+		//
+		public CodeTypeReferenceCollection BaseTypes {
+			get {
+				if ( baseTypes == null ) {
+					baseTypes = new CodeTypeReferenceCollection();
+					if ( PopulateBaseTypes != null )
+						PopulateBaseTypes( this, EventArgs.Empty );
+				}
+				return baseTypes;
+			}
+		}
+
+		public bool IsClass {
+			get {
+				if ( (typeAttributes & TypeAttributes.Interface) != 0 )
+					return false;
+				if ( isEnum )
+					return false;
+				if ( isStruct )
+					return false;
+				return true;
+			}
+			set {
+				if ( value ) {
+					typeAttributes &= ~TypeAttributes.Interface;
+					isEnum = false;
+					isStruct = false;
+				}
+			}
+		}
+		
+		public bool IsEnum {
+			get {
+				return isEnum;
+			}
+			set {
+				if ( value ) {
+					typeAttributes &= ~TypeAttributes.Interface;
+					isEnum = true;
+					isStruct = false;
+				}
+			}
+		}
+
+		public bool IsInterface {
+			get {
+				return (typeAttributes & TypeAttributes.Interface) != 0;
+			}
+			set {
+				if ( value ) {
+					typeAttributes |= TypeAttributes.Interface;
+					isEnum = false;
+					isStruct = false;
+				}
+			}
+		}
+
+		public bool IsStruct {
+			get {
+				return isStruct;
+			}
+			set {
+				if ( value ) {
+					typeAttributes &= ~TypeAttributes.Interface;
+					isEnum = false;
+					isStruct = true;
+				}
+			}
+		}
+
+		public CodeTypeMemberCollection Members {
+			get {
+				if ( members == null ) {
+					members = new CodeTypeMemberCollection();
+					if ( PopulateMembers != null )
+						PopulateMembers( this, EventArgs.Empty );
+				}
+				return members;
+			}
+		}
+
+		public TypeAttributes TypeAttributes {
+			get {
+				return typeAttributes;
+			}
+			set {
+				typeAttributes = value;
+#if FALSE
+				/* MS does not seem to do this, so don't I */
+				if ( (typeAttributes & TypeAttributes.Interface) != 0 ) {
+					isEnum = false;
+					isStruct = false;
+				}
+#endif
+			}
+		}
+
+		//
+		// Events
+		// 
+		public event EventHandler PopulateBaseTypes;
+
+		public event EventHandler PopulateMembers;
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTypeDeclarationCollection.cs b/mcs/class/System/System.CodeDom/CodeTypeDeclarationCollection.cs
new file mode 100644
index 00000000000..9c1c2a1a3b3
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTypeDeclarationCollection.cs
@@ -0,0 +1,99 @@
+//
+// System.CodeDom CodeTypeDeclarationCollection Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTypeDeclarationCollection 
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeTypeDeclarationCollection()
+		{
+		}
+
+		public CodeTypeDeclarationCollection( CodeTypeDeclaration[] value )
+		{
+			AddRange( value );
+		}
+
+		public CodeTypeDeclarationCollection( CodeTypeDeclarationCollection value )
+		{
+			AddRange( value );
+		}
+
+		//
+		// Properties
+		//
+		public CodeTypeDeclaration this[int index]
+		{
+			get {
+				return (CodeTypeDeclaration)List[index];
+			}
+			set {
+				List[index] = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public int Add (CodeTypeDeclaration value)
+		{
+			return List.Add (value);
+		}
+
+		public void AddRange (CodeTypeDeclaration [] value)
+		{
+			foreach (CodeTypeDeclaration ca in value) 
+				Add( ca );
+		}
+
+		public void AddRange (CodeTypeDeclarationCollection value)
+		{
+			foreach (CodeTypeDeclaration ca in value) 
+				Add( ca );
+		}
+
+		public bool Contains( CodeTypeDeclaration value )
+		{
+			return List.Contains( value );
+		}
+
+		public void CopyTo( CodeTypeDeclaration[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeTypeDeclaration value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeTypeDeclaration value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeTypeDeclaration value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTypeDelegate.cs b/mcs/class/System/System.CodeDom/CodeTypeDelegate.cs
new file mode 100644
index 00000000000..27ef5a95b76
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTypeDelegate.cs
@@ -0,0 +1,55 @@
+//
+// System.CodeDom CodeTypeDelegate Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTypeDelegate
+		: CodeTypeDeclaration
+	{
+		private	CodeParameterDeclarationExpressionCollection parameters;
+		private CodeTypeReference returnType;
+
+		//
+		// Constructors
+		//
+		public CodeTypeDelegate()
+		{
+		}
+
+		public CodeTypeDelegate( string name )
+		{
+			this.Name = name;
+		}
+
+		//
+		// Properties
+		//
+		public CodeParameterDeclarationExpressionCollection Parameters {
+			get {
+				if ( parameters == null )
+					parameters = new CodeParameterDeclarationExpressionCollection();
+				return parameters;
+			}
+		}
+
+		public CodeTypeReference ReturnType {
+			get {
+				return returnType;
+			}
+			set {
+				returnType = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTypeMember.cs b/mcs/class/System/System.CodeDom/CodeTypeMember.cs
new file mode 100755
index 00000000000..cc7ce536080
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTypeMember.cs
@@ -0,0 +1,81 @@
+//
+// System.CodeDom CodeTypeMember Class implementation
+//
+// Author:
+//   Sean MacIsaac (macisaac@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTypeMember
+		: CodeObject
+	{
+		private string name;
+		private MemberAttributes attributes;
+		private CodeCommentStatementCollection comments;
+		private CodeAttributeDeclarationCollection customAttributes;
+		private CodeLinePragma linePragma;
+
+		//
+		// Constructors
+		//
+		public CodeTypeMember()
+		{
+		}
+		
+		//
+		// Properties
+		//
+		public MemberAttributes Attributes {
+			get {
+				return attributes;
+			}
+			set {
+				attributes = value;
+			}
+		}
+
+		public CodeCommentStatementCollection Comments {
+			get {
+				if ( comments == null )
+					comments = new CodeCommentStatementCollection();
+				return comments;
+			}
+		}
+
+		
+		public CodeAttributeDeclarationCollection CustomAttributes {
+			get {
+				if ( customAttributes == null )
+					customAttributes = new CodeAttributeDeclarationCollection();
+				return customAttributes;
+			}
+		}
+
+		public CodeLinePragma LinePragma {
+			get {
+				return linePragma;
+			}
+			set {
+				linePragma = value;
+			}
+		}
+
+		public string Name {
+			get {
+				return name;
+			}
+			set {
+				name = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTypeMemberCollection.cs b/mcs/class/System/System.CodeDom/CodeTypeMemberCollection.cs
new file mode 100644
index 00000000000..54b49418590
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTypeMemberCollection.cs
@@ -0,0 +1,99 @@
+//
+// System.CodeDom CodeTypeMemberCollection Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTypeMemberCollection
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeTypeMemberCollection()
+		{
+		}
+		
+		public CodeTypeMemberCollection( CodeTypeMember[] value )
+		{
+			AddRange( value );
+		}
+
+		public CodeTypeMemberCollection( CodeTypeMemberCollection value )
+		{
+			AddRange( value );
+		}
+
+		//
+		// Properties
+		//
+		public CodeTypeMember this[int index]
+		{
+			get {
+				return (CodeTypeMember)List[index];
+			}
+			set {
+				List[index] = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public int Add (CodeTypeMember value)
+		{
+			return List.Add( value );
+		}
+
+		public void AddRange (CodeTypeMember [] value )
+		{
+			foreach ( CodeTypeMember elem in value )
+				Add( elem );
+		}
+		
+		public void AddRange (CodeTypeMemberCollection value)
+		{
+			foreach ( CodeTypeMember elem in value )
+				Add( elem );
+		}
+
+		public bool Contains( CodeTypeMember value )
+		{
+			return List.Contains( value );
+		}
+		
+		public void CopyTo( CodeTypeMember[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeTypeMember value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeTypeMember value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeTypeMember value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTypeOfExpression.cs b/mcs/class/System/System.CodeDom/CodeTypeOfExpression.cs
new file mode 100755
index 00000000000..1462103aa18
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTypeOfExpression.cs
@@ -0,0 +1,57 @@
+//
+// System.CodeDom CodeTypeOfExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTypeOfExpression
+		: CodeExpression 
+	{
+		private CodeTypeReference type;
+			
+		//
+		// Constructors
+		//
+		public CodeTypeOfExpression () 
+		{
+		}
+
+		public CodeTypeOfExpression (CodeTypeReference type)
+		{
+			this.type = type;
+		}
+
+		public CodeTypeOfExpression (string type)
+		{
+			this.type = new CodeTypeReference( type );
+		}
+		
+		public CodeTypeOfExpression (Type type)
+		{
+			this.type = new CodeTypeReference( type );
+		}
+
+		//
+		// Properties
+		//
+		public CodeTypeReference Type {
+			get {
+				return type;
+			}
+			set {
+				type = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTypeReference.cs b/mcs/class/System/System.CodeDom/CodeTypeReference.cs
new file mode 100644
index 00000000000..2f66b093333
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTypeReference.cs
@@ -0,0 +1,91 @@
+//
+// System.CodeDom CodeTypeReferenceExpression Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTypeReference
+		: CodeObject
+	{
+		private string baseType;
+		private CodeTypeReference arrayType;
+		private int rank;
+
+		//
+		// Constructors
+		//
+		public CodeTypeReference( string baseType )
+		{
+			this.baseType = baseType;
+		}
+		
+		public CodeTypeReference( Type baseType )
+		{
+			this.baseType = baseType.FullName;
+		}
+
+		// FIXME: probably broken
+		[MonoTODO]
+		public CodeTypeReference( CodeTypeReference arrayType, int rank )
+		{
+			this.arrayType = arrayType;
+			this.baseType = arrayType.BaseType;
+			this.rank = rank;
+		}
+
+		// FIXME: probably broken
+		[MonoTODO]
+		public CodeTypeReference( string baseType, int rank )
+		{
+			this.baseType = baseType;
+			this.rank = rank;
+		}
+			
+
+		//
+		// Properties
+		//
+
+		// FIXME: probably broken
+		[MonoTODO]
+		public CodeTypeReference ArrayElementType
+		{
+			get {
+				return arrayType;
+			}
+			set {
+				arrayType = value;
+			}
+		}
+		
+		// FIXME: probably broken
+		[MonoTODO]
+		public int ArrayRank {
+			get {
+				return rank;
+			}
+			set {
+				rank = value;
+			}
+		}
+
+		public string BaseType {
+			get {
+				return baseType;
+			}
+			set {
+				baseType = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTypeReferenceCollection.cs b/mcs/class/System/System.CodeDom/CodeTypeReferenceCollection.cs
new file mode 100644
index 00000000000..e4e5302ba3a
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTypeReferenceCollection.cs
@@ -0,0 +1,99 @@
+//
+// System.CodeDom CodeTypeReferenceCollection Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+using System.Collections;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTypeReferenceCollection
+		: CollectionBase
+	{
+		//
+		// Constructors
+		//
+		public CodeTypeReferenceCollection()
+		{
+		}
+
+		public CodeTypeReferenceCollection( CodeTypeReference[] value )
+		{
+			AddRange( value );
+		}
+
+		public CodeTypeReferenceCollection( CodeTypeReferenceCollection value )
+		{
+			AddRange( value );
+		}
+
+		//
+		// Properties
+		//
+		public CodeTypeReference this[int index]
+		{
+			get {
+				return (CodeTypeReference)List[index];
+			}
+			set {
+				List[index] = value;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public int Add (CodeTypeReference value)
+		{
+			return List.Add( value );
+		}
+
+		public void AddRange (CodeTypeReference [] value )
+		{
+			foreach ( CodeTypeReference elem in value )
+				Add( elem );
+		}
+		
+		public void AddRange (CodeTypeReferenceCollection value)
+		{
+			foreach ( CodeTypeReference elem in value )
+				Add( elem );
+		}
+
+		public bool Contains( CodeTypeReference value )
+		{
+			return List.Contains( value );
+		}
+		
+		public void CopyTo( CodeTypeReference[] array, int index )
+		{
+			List.CopyTo( array, index );
+		}
+
+		public int IndexOf( CodeTypeReference value )
+		{
+			return List.IndexOf( value );
+		}
+
+		public void Insert( int index, CodeTypeReference value )
+		{
+			List.Insert( index, value );
+		}
+
+		public void Remove( CodeTypeReference value )
+		{
+			int index = IndexOf( value );
+			if ( index < 0 )
+				throw( new ArgumentException( "The specified object is not found in the collection" ) );
+			RemoveAt( index );
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeTypeReferenceExpression.cs b/mcs/class/System/System.CodeDom/CodeTypeReferenceExpression.cs
new file mode 100755
index 00000000000..726732587ab
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeTypeReferenceExpression.cs
@@ -0,0 +1,57 @@
+//
+// System.CodeDom CodeTypeReferenceExpression Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeTypeReferenceExpression
+		: CodeExpression
+	{
+		private CodeTypeReference type;
+		
+		//
+		// Constructors
+		//
+		public CodeTypeReferenceExpression ()
+		{
+		}
+
+		public CodeTypeReferenceExpression (CodeTypeReference type)
+		{
+			this.type = type;
+		}
+		
+		public CodeTypeReferenceExpression (string type)
+		{
+			this.type = new CodeTypeReference( type );
+		}
+
+		public CodeTypeReferenceExpression (Type type)
+		{
+			this.type = new CodeTypeReference( type );
+		}
+
+		//
+		// Properties
+		//
+		public CodeTypeReference Type {
+			get {
+				return type;
+			}
+			set {
+				type = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeVariableDeclarationStatement.cs b/mcs/class/System/System.CodeDom/CodeVariableDeclarationStatement.cs
new file mode 100755
index 00000000000..6bd0671802b
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeVariableDeclarationStatement.cs
@@ -0,0 +1,108 @@
+//
+// System.CodeDom CodeVariableDeclarationStatement Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom 
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeVariableDeclarationStatement
+		: CodeStatement  
+	{
+		private CodeExpression initExpression;
+		private CodeTypeReference type;
+		private string name;
+
+		//
+		// Constructors
+		//
+		public CodeVariableDeclarationStatement () 
+		{
+		}
+
+		public CodeVariableDeclarationStatement( CodeTypeReference type, string name )
+		{
+			this.type = type;
+			this.name = name;
+		}
+		
+		public CodeVariableDeclarationStatement( string type, string name )
+		{
+			this.type = new CodeTypeReference( type );
+			this.name = name;
+		}
+
+		public CodeVariableDeclarationStatement( Type type, string name )
+		{
+			this.type = new CodeTypeReference( type );
+			this.name = name;
+		}
+
+		public CodeVariableDeclarationStatement( CodeTypeReference type, 
+							 string name,
+							 CodeExpression initExpression )
+		{
+			this.type = type;
+			this.name = name;
+			this.initExpression = initExpression;
+		}
+
+		public CodeVariableDeclarationStatement( string type,
+							 string name, 
+							 CodeExpression initExpression )
+		{
+			this.type = new CodeTypeReference( type );
+			this.name = name;
+			this.initExpression = initExpression;
+		}
+
+		public CodeVariableDeclarationStatement( Type type, 
+							 string name, 
+							 CodeExpression initExpression )
+		{
+			this.type = new CodeTypeReference( type );
+			this.name = name;
+			this.initExpression = initExpression;
+		}
+
+
+		//
+		// Properties
+		//
+		public CodeExpression InitExpression {
+			get {
+				return initExpression;
+			}
+			set {
+				initExpression = value;
+			}
+		}
+
+		public string Name {
+			get {
+				return name;
+			}
+			set {
+				name = value;
+			}
+		}
+
+		public CodeTypeReference Type {
+			get {
+				return type;
+			}
+			set {
+				type = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/CodeVariableReferenceExpression.cs b/mcs/class/System/System.CodeDom/CodeVariableReferenceExpression.cs
new file mode 100644
index 00000000000..89b5d013b40
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/CodeVariableReferenceExpression.cs
@@ -0,0 +1,46 @@
+//
+// System.CodeDom CodeVariableReferenceExpression Class implementation
+//
+// Author:
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom
+{
+	[Serializable]
+	[ClassInterface(ClassInterfaceType.AutoDispatch)]
+	[ComVisible(true)]
+	public class CodeVariableReferenceExpression
+		: CodeExpression 
+	{
+		private string variableName;
+
+		//
+		// Constructors
+		//
+		public CodeVariableReferenceExpression() 
+		{
+		}
+
+		public CodeVariableReferenceExpression( string variableName )
+		{
+			this.variableName = variableName;
+		}
+
+		//
+		// Properties
+		//
+		public string VariableName {
+			get {
+				return variableName;
+			}
+			set {
+				variableName = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/FieldDirection.cs b/mcs/class/System/System.CodeDom/FieldDirection.cs
new file mode 100755
index 00000000000..ccd6b4c876d
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/FieldDirection.cs
@@ -0,0 +1,21 @@
+//
+// System.CodeDom FieldDirection Enum implementation
+//
+// Author:
+//   Sean MacIsaac (macisaac@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom {
+
+	[Serializable]
+	[ComVisible(true)]
+	public enum FieldDirection {
+		In,
+		Out,
+		Ref
+	}
+}
diff --git a/mcs/class/System/System.CodeDom/MemberAttributes.cs b/mcs/class/System/System.CodeDom/MemberAttributes.cs
new file mode 100755
index 00000000000..5097375c798
--- /dev/null
+++ b/mcs/class/System/System.CodeDom/MemberAttributes.cs
@@ -0,0 +1,38 @@
+//
+// System.CodeDom MemberAttributes Enum implementation
+//
+// Author:
+//   Sean MacIsaac (macisaac@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.CodeDom {
+
+	[Serializable]
+	[ComVisible(true)]
+	public enum MemberAttributes {
+		Abstract =		0x00000001,
+		Final =			0x00000002,
+		Static =		0x00000003,
+		Override =		0x00000004,
+		Const =			0x00000005,
+		ScopeMask =		0x0000000F,
+
+		New =			0x00000010,
+		VTableMask =		0x000000F0,
+
+		Overloaded =		0x00000100,
+
+		Assembly =		0x00001000, // internal
+		FamilyAndAssembly =	0x00002000, // protected AND internal
+		Family =		0x00003000, // protected
+		FamilyOrAssembly =	0x00004000, // protected internal
+		Private =		0x00005000, // private
+		Public =		0x00006000, // public
+		AccessMask =		0x0000F000
+	}
+}
diff --git a/mcs/class/System/System.Collections.Specialized/BitVector32.cs b/mcs/class/System/System.Collections.Specialized/BitVector32.cs
new file mode 100644
index 00000000000..2ff52d876eb
--- /dev/null
+++ b/mcs/class/System/System.Collections.Specialized/BitVector32.cs
@@ -0,0 +1,199 @@
+//
+// System.Collections.Specialized.BitVector32.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Lawrence Pit (loz@cable.a2000.nl)
+//   Andrew Birkett (adb@tardis.ed.ac.uk)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Text;
+
+namespace System.Collections.Specialized {
+	
+	public struct BitVector32 {
+		int bits;
+
+		public struct Section {
+			private short mask;
+			private short offset;
+			
+			internal Section (short mask, short offset) {
+				this.mask = mask;
+				this.offset = offset;
+			}
+			
+			public short Mask {
+				get { return mask; }
+			}
+			
+			public short Offset {
+				get { return offset; }
+			}
+			
+			public override bool Equals (object o) 
+			{
+				if (! (o is Section))
+					return false;
+					
+				Section section = (Section) o;
+				return this.mask == section.mask &&
+				       this.offset == section.offset;
+			}			
+			
+			public override int GetHashCode ()
+			{
+				return (((Int16) mask).GetHashCode () << 16) + 
+				       ((Int16) offset).GetHashCode ();
+			}
+			
+			public override string ToString ()
+			{
+				return "Section{0x" + Convert.ToString(mask, 16) + 
+				       ", 0x" + Convert.ToString(offset, 16) + "}";
+			}
+		}
+		
+		// Constructors
+		
+		public BitVector32 (BitVector32 source)
+		{
+			bits = source.bits;
+		}
+
+		public BitVector32 (int init)
+		{
+			bits = init;
+		}
+		
+		// Properties
+		
+		public int Data {
+			get { return bits; }
+		}
+		
+		public int this [BitVector32.Section section] {
+			get {
+				return ((bits >> section.Offset) & section.Mask);
+			}
+
+			set {
+				if (value < 0)
+					throw new ArgumentException ("Section can't hold negative values");
+				if (value > section.Mask)
+					throw new ArgumentException ("Value too large to fit in section");
+				bits &= (~section.Mask << section.Offset);
+				bits |= (value << section.Offset);
+			}
+		}
+		
+		public bool this [int mask] {
+			get {
+				return (bits & mask) == mask;
+			}
+			
+			set { 
+				if (value)
+					bits |= mask;
+				else
+					bits &= ~mask;
+			}
+		}
+		
+		// Methods
+		
+		public static int CreateMask ()
+		{
+			return 1;
+		}
+
+		public static int CreateMask (int prev)
+		{
+			if (prev == 0)
+				return 1;
+			if (prev == Int32.MinValue) 
+				throw new InvalidOperationException ("all bits set");
+			return prev << 1;
+		}
+
+		public static Section CreateSection (short maxValue)
+		{
+			return CreateSection (maxValue, new Section (0, 0));
+		}
+		
+		public static Section CreateSection (short maxValue, BitVector32.Section previous)
+		{
+			if (maxValue < 1)
+				throw new ArgumentException ("maxValue");
+			
+			int bit = HighestSetBit(maxValue) + 1;
+			int mask = (1 << bit) - 1;
+			int offset = previous.Offset + NumberOfSetBits (previous.Mask);
+
+			if (offset + NumberOfSetBits (mask) > 32) {
+				throw new ArgumentException ("Sections cannot exceed 32 bits in total");
+			}
+
+			return new Section ((short) mask, (short) offset);
+		}
+		
+		public override bool Equals (object o)
+		{
+			if (!(o is BitVector32))
+				return false;
+
+			return bits == ((BitVector32) o).bits;
+		}
+
+		public override int GetHashCode ()
+		{
+			return bits.GetHashCode ();
+		}
+		
+		public override string ToString () 
+		{
+			return ToString (this);
+		}
+		
+		public static string ToString (BitVector32 value)
+		{
+			StringBuilder b = new StringBuilder ();
+			b.Append ("BitVector32{");
+			long mask = (long) 0x80000000;
+			while (mask > 0) {
+				b.Append (((value.bits & mask) == 0) ? '0' : '1');
+				mask >>= 1;
+			}
+			b.Append ('}');
+			return b.ToString ();
+		}
+
+		// Private utilities
+		private static int NumberOfSetBits (int i) 
+		{
+			int count = 0;
+			for (int bit = 0; bit < 32; bit++) {
+				int mask = 1 << bit;
+				if ((i & mask) != 0) 
+					count++;
+			}
+			return count;
+		}
+
+		private static int HighestSetBit (int i) 
+		{
+			for (int bit = 31; bit >= 0; bit--) {
+				int mask = 1 << bit;
+				if ((mask & i) != 0) {
+					return bit;
+				}
+			}
+
+			return -1;
+		}
+
+	}
+}
diff --git a/mcs/class/System/System.Collections.Specialized/ChangeLog b/mcs/class/System/System.Collections.Specialized/ChangeLog
new file mode 100755
index 00000000000..5f2b73d9585
--- /dev/null
+++ b/mcs/class/System/System.Collections.Specialized/ChangeLog
@@ -0,0 +1,65 @@
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* NameObjectCollectionBase.cs: added iterator stubb to 
+		NameObjectCollectionBase.KeysCollection
+
+2002-07-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* HybridDictionary.cs:
+	(Remove): fixed. The value is either in the list or in the hash.
+
+2002-06-24  Andrew Birkett <adb@tardis.ed.ac.uk>
+
+	* BitVector32.cs: Implemented 'set' section indexer.  Check for
+	overly large sections.	Factored out some helper methods. 
+
+2002-05-11  Lawrence Pit <loz@cable.a2000.nl>
+
+	* NameValueCollection.AsStringArray: fixed ArgumentNullException bug.
+
+2002-05-10  Lawrence Pit <loz@cable.a2000.nl>
+
+	* HybridDictionary.cs: implemented
+	* CollectionsUtil.cs: implemented
+	* BitVector32.cs: implemeneted
+	* Modified signature of method ListDictionary.GetEnumerator 
+
+Fri Feb 8 18:02:50 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* NameObjectCollectionBase.cs, NameValueCollection.cs: tweaks to make
+	it compile and provide the constructor needed by nunitcore.
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* BitVector32.cs, ListDictionary.cs : MonoTODO everywhere!
+
+	* NameObjectCollectionBase.cs, NameValueCollection.cs : Ditto.
+
+2001-08-24  Nick Drochak  <ndrochak@gol.com>
+	* NameObjectCollectionBase.cs: Add stub implementation
+	* common.src: Add NameObjectCollectionBase to the build
+	* NameValueCollection.cs: add 'override' to CopyTo().  Maybe
+		this code actually belongs in the superclass.
+
+2001-08-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* common.src: Add NameValueCollection.cs to the build
+
+2001-08-22	John Barnette	<jbarn@httcb.net>
+	* StringDictionary.cs:
+		Initial working implementation.
+	* ListDictionary.cs:
+		Initial working implementation.
+
+2001-07-17	John Barnette	<jbarn@httcb.net>
+	* StringCollection.cs:
+		Implemented and working according to spec.
+	* StringIterator.cs:
+		(ADDED) Implemented and working according to spec.
+	* StringCollectionTest.cs:
+		(ADDED) Initial revision contains 17 tests; all of 'em
+		run correctly.  More complicated tests to follow.
+
+2001-07-15  Sean MacIsaac  <macisaac@ximian.com>
+
+	* StringCollection.cs: Added so that CodeDom.* would compile.
+
diff --git a/mcs/class/System/System.Collections.Specialized/CollectionsUtil.cs b/mcs/class/System/System.Collections.Specialized/CollectionsUtil.cs
new file mode 100644
index 00000000000..82d103134f1
--- /dev/null
+++ b/mcs/class/System/System.Collections.Specialized/CollectionsUtil.cs
@@ -0,0 +1,38 @@
+//

+// System.Collections.Specialized.CollectionsUtil.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System.Collections;

+

+namespace System.Collections.Specialized {

+	

+	public class CollectionsUtil {

+		

+		public CollectionsUtil () {}

+		

+		public static Hashtable CreateCaseInsensitiveHashtable ()

+		{

+			return new Hashtable (CaseInsensitiveHashCodeProvider.Default, 

+					      CaseInsensitiveComparer.Default);			

+		}

+		

+

+		public static Hashtable CreateCaseInsensitiveHashtable (IDictionary d) {

+			return new Hashtable (d, CaseInsensitiveHashCodeProvider.Default, 

+						 CaseInsensitiveComparer.Default);

+		}

+

+		public static Hashtable CreateCaseInsensitiveHashtable (int capacity) {

+			return new Hashtable (capacity, CaseInsensitiveHashCodeProvider.Default, 

+							CaseInsensitiveComparer.Default);

+		}

+

+

+		public static SortedList CreateCaseInsensitiveSortedList () {

+			return new SortedList (CaseInsensitiveComparer.Default);

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Collections.Specialized/HybridDictionary.cs b/mcs/class/System/System.Collections.Specialized/HybridDictionary.cs
new file mode 100644
index 00000000000..44548f38774
--- /dev/null
+++ b/mcs/class/System/System.Collections.Specialized/HybridDictionary.cs
@@ -0,0 +1,184 @@
+//

+// System.Collections.Specialized.HybridDictionary.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+

+namespace System.Collections.Specialized {

+	

+	[Serializable]

+	public class HybridDictionary : IDictionary, ICollection, IEnumerable {

+		

+		private const int switchAfter = 10;

+

+		private ListDictionary list;

+		private Hashtable hashtable;

+		private bool caseInsensitive = false;

+

+		// Constructors

+		

+		public HybridDictionary() : this (0, false) { }

+		

+		public HybridDictionary (bool caseInsensitive) : this (0, caseInsensitive) { }

+		

+		public HybridDictionary (int initialSize) : this (initialSize, false) { }

+		

+		public HybridDictionary(int initialSize, bool caseInsensitive) 

+		{

+			this.caseInsensitive = caseInsensitive;

+		

+			if (initialSize <= switchAfter)

+				if (caseInsensitive)

+					list = new ListDictionary (CaseInsensitiveComparer.Default);

+				else

+					list = new ListDictionary ();

+			else

+				if (caseInsensitive) 

+					hashtable = new Hashtable (initialSize, 

+							CaseInsensitiveHashCodeProvider.Default, 

+							CaseInsensitiveComparer.Default);

+				else

+					hashtable = new Hashtable (initialSize);

+		}		

+

+		

+		// Properties

+		

+		public int Count {

+			get {

+				if (list != null)

+					return list.Count;

+				return hashtable.Count;

+			}

+		}

+		

+		public bool IsFixedSize {

+			get { return false; }

+		}

+		

+		public bool IsReadOnly {

+			get { return false; }

+		}

+		

+		public bool IsSynchronized {

+			get { return false; }

+		}

+		

+		public object this [object key] {

+			get { 

+				if (key == null)

+					throw new ArgumentNullException("key");

+				if (list != null)

+					return list [key];

+				return hashtable [key];

+			}

+			set { 

+				if (list != null)

+					if (list.Count >= switchAfter) 

+						Switch ();

+					else {

+						list [key] = value;

+						return;

+					}

+				hashtable [key] = value;

+			}

+		}

+		

+		public ICollection Keys {

+			get {

+				if (list != null)

+					return list.Keys;

+				return hashtable.Keys;

+			}

+		}

+		

+		public object SyncRoot {

+			get { return this; }

+		}

+		

+		public ICollection Values {

+			get { 

+				if (list != null)

+					return list.Values;

+				return hashtable.Values;

+			}

+		}

+		

+		

+		// Methods

+		

+		public void Add (object key, object value) 

+		{

+			if (list != null)

+				if (list.Count >= switchAfter) 

+					Switch ();

+				else {

+					list.Add (key, value);

+					return;

+				}

+			hashtable.Add (key, value);

+		}

+		

+		public void Clear ()

+		{

+			if (caseInsensitive)

+				list = new ListDictionary (CaseInsensitiveComparer.Default);

+			else

+				list = new ListDictionary ();

+			hashtable = null;

+		}

+		

+		public bool Contains (object key)

+		{

+			if (list != null)

+				return list.Contains (key);

+			return hashtable.Contains (key);

+		}

+		

+		public void CopyTo (Array array, int index)

+		{

+			if (list != null) 

+				list.CopyTo (array, index);

+			else

+				hashtable.CopyTo (array, index);

+		}

+		

+		public IDictionaryEnumerator GetEnumerator ()

+		{

+			if (list != null)

+				return list.GetEnumerator ();

+			return hashtable.GetEnumerator ();

+		}

+

+		IEnumerator IEnumerable.GetEnumerator ()

+		{

+			return GetEnumerator ();

+		}

+

+		public void Remove (object key)

+		{

+			if (list != null)

+				list.Remove (key);

+			else	

+				hashtable.Remove (key);

+		}

+		

+		private void Switch ()

+		{

+			if (caseInsensitive) 

+				hashtable = new Hashtable (switchAfter + 1,

+							CaseInsensitiveHashCodeProvider.Default, 

+							CaseInsensitiveComparer.Default);

+			else

+				hashtable = new Hashtable (switchAfter + 1);

+			IDictionaryEnumerator e = list.GetEnumerator ();

+			while (e.MoveNext ())

+				hashtable.Add (e.Key, e.Value);

+			list = null;

+		}

+	}

+}

diff --git a/mcs/class/System/System.Collections.Specialized/ListDictionary.cs b/mcs/class/System/System.Collections.Specialized/ListDictionary.cs
new file mode 100644
index 00000000000..0ad664e3a1c
--- /dev/null
+++ b/mcs/class/System/System.Collections.Specialized/ListDictionary.cs
@@ -0,0 +1,435 @@
+namespace System.Collections.Specialized

+{

+	[Serializable]

+	public class ListDictionary : IDictionary, ICollection, IEnumerable

+	{

+		private int count;

+		private int modCount;

+		private ListEntry root;

+		private IComparer comparer;

+		

+		

+		public ListDictionary()

+		{

+			count = 0;

+			modCount = 0;

+			comparer = null;

+			root = null;

+		}

+		

+		public ListDictionary(IComparer comparer) : this()

+		{

+			this.comparer = comparer;

+		}

+		

+		private bool AreEqual(object obj1, object obj2)

+		{

+			if (comparer != null) {

+				if (comparer.Compare(obj1, obj2) == 0) {

+					return true;

+				}

+			} else {

+				if (obj1.Equals(obj2)) {

+					return true;

+				}

+			}

+			

+			return false;

+		}

+		

+		private ListEntry FindEntry(object key)

+		{

+			if (key == null) {

+				throw new ArgumentNullException("Attempted lookup for a null key.");

+			}

+			

+			if (root == null) {

+				return null;

+			} else {

+				ListEntry entry = root;

+				

+				while (entry != null) {

+					if (AreEqual(key, entry.key)) {

+						return entry;

+					}

+					

+					entry = entry.next;

+				}

+			}

+			

+			return null;

+		}

+

+		private void AddImpl(object key, object value)

+		{

+			if (key == null) {

+				throw new ArgumentNullException("Attempted add with a null key.");

+			}

+			

+			if (root == null) {

+				root = new ListEntry();

+				root.key = key;

+				root.value = value;

+			} else {

+				ListEntry entry = root;

+				

+				while (entry != null) {

+					if (AreEqual(key, entry.key)) {

+						throw new ArgumentException("Duplicate key in add.");

+					}

+					

+					if (entry.next == null) {

+						break;

+					}

+					

+					entry = entry.next;

+				}

+				

+				entry.next = new ListEntry();

+				entry.next.key = key;

+				entry.next.value = value;

+			}

+			

+			count++;

+			modCount++;

+		}

+		

+		// IEnumerable Interface

+		IEnumerator IEnumerable.GetEnumerator()

+		{

+			return new ListEntryEnumerator(this);

+		}

+		

+		// ICollection Interface

+		public int Count

+		{

+			get {

+				return count;

+			}

+		}

+		

+		public bool IsSynchronized

+		{

+			get {

+				return false;

+			}

+		}

+		

+		public object SyncRoot

+		{

+			get {

+				return this;

+			}

+		}

+

+		[MonoTODO]

+		public void CopyTo(Array array, int index)

+		{

+			// FIXME

+		}

+		

+		// IDictionary Interface

+		public bool IsFixedSize

+		{

+			get {

+				return false;

+			}

+		}

+		

+		public bool IsReadOnly

+		{

+			get {

+				return false;

+			}

+		}

+		

+		// Indexer

+		public object this[object key]

+		{

+			get {

+				ListEntry entry = FindEntry(key);

+				return entry == null ? entry : entry.value;

+			}

+			

+			set {

+				ListEntry entry = FindEntry(key);

+				

+				if (entry != null) {

+					entry.value = value;

+					count++;

+					modCount++;

+				} else {

+					AddImpl(key, value);

+				}

+			}

+		}

+		

+		public ICollection Keys

+		{

+			get {

+				return new ListEntryCollection(this, true);

+			}

+		}

+		

+		public ICollection Values

+		{

+			get {

+				return new ListEntryCollection(this, false);

+			}

+		}

+		

+		public void Add(object key, object value)

+		{

+			AddImpl(key, value);

+		}

+		

+		public void Clear()

+		{

+			root = null;

+			count = 0;

+			modCount++;

+		}

+		

+		public bool Contains(object key)

+		{

+			return FindEntry(key) != null ? true : false;

+		}

+		

+		public IDictionaryEnumerator GetEnumerator()

+		{

+			return new ListEntryEnumerator(this);

+		}

+		

+		public void Remove(object key)

+		{

+			ListEntry entry = root;

+			

+			for (ListEntry prev = null; entry != null; prev = entry, entry = entry.next) {

+				if (AreEqual(key, entry.key)) {

+					if (prev != null) {

+						prev.next = entry.next;

+					} else {

+						root = entry.next;

+					}

+					

+					entry.value = null;

+					count--;

+					modCount++;

+				}

+			}

+		}

+		

+

+		private class ListEntry

+		{

+			public object key = null;

+			public object value = null;

+			public ListEntry next = null;

+		}

+

+

+		private class ListEntryEnumerator : IEnumerator, IDictionaryEnumerator

+		{

+			private ListDictionary dict;

+			private bool isAtStart;

+			private ListEntry current;

+			private int version;

+			

+			public ListEntryEnumerator(ListDictionary dict)

+			{

+				this.dict = dict;

+				version = dict.modCount;

+				Reset();

+			}

+

+			private void FailFast()

+			{

+				if (version != dict.modCount) {

+					throw new InvalidOperationException(

+						"The ListDictionary's contents changed after this enumerator was instantiated.");

+				}

+			}

+				

+			public bool MoveNext()

+			{

+				FailFast();

+				

+				if (isAtStart) {

+					current = dict.root;

+					isAtStart = false;

+				} else {

+					current = current.next;

+				}

+				

+				return current != null ? true : false;	

+			}

+			

+			public void Reset()

+			{

+				FailFast();

+

+				isAtStart = true;

+				current = null;

+			}

+			

+			public object Current

+			{

+				get {

+					FailFast();

+					

+					if (isAtStart || current == null) {

+						throw new InvalidOperationException(

+							"Enumerator is positioned before the collection's first element or after the last element.");

+					}

+					

+					return new DictionaryEntry(current.key, current.value);

+				}

+			}

+			

+			// IDictionaryEnumerator

+			public DictionaryEntry Entry

+			{

+				get {

+					FailFast();

+					return (DictionaryEntry) Current;

+				}

+			}

+			

+			public object Key

+			{

+				get {

+					FailFast();

+					

+					if (isAtStart || current == null) {

+						throw new InvalidOperationException(

+							"Enumerator is positioned before the collection's first element or after the last element.");

+					}

+					

+					return current.key;

+				}

+			}

+			

+			public object Value

+			{

+				get {

+					FailFast();

+					

+					if (isAtStart || current == null) {

+						throw new InvalidOperationException(

+							"Enumerator is positioned before the collection's first element or after the last element.");

+					}

+					

+					return current.value;

+				}

+			}

+		}

+		

+		private class ListEntryCollection : ICollection

+		{

+			private ListDictionary dict;

+			private bool isKeyList;

+				

+			public ListEntryCollection(ListDictionary dict, bool isKeyList)

+			{

+				this.dict = dict;

+				this.isKeyList = isKeyList;

+			}

+			

+			// ICollection Interface

+			public int Count

+			{

+				get {

+					return dict.Count;

+				}

+			}

+			

+			public bool IsSynchronized

+			{

+				get {

+					return false;

+				}

+			}

+			

+			public object SyncRoot

+			{

+				get {

+					return dict.SyncRoot;

+				}

+			}

+

+			[MonoTODO]

+			public void CopyTo(Array array, int index)

+			{

+				// FIXME

+			}

+			

+			// IEnumerable Interface

+			public IEnumerator GetEnumerator()

+			{

+				return new ListEntryCollectionEnumerator(dict, isKeyList);

+			}

+			

+			private class ListEntryCollectionEnumerator : IEnumerator

+			{

+				private ListDictionary dict;

+				private bool isKeyList;

+				private bool isAtStart;

+				private int version;

+				private ListEntry current;

+					

+				public ListEntryCollectionEnumerator(ListDictionary dict, bool isKeyList)

+				{

+					this.dict = dict;

+					this.isKeyList = isKeyList;

+					isAtStart = true;

+					version = dict.modCount;

+				}

+

+				private void FailFast()

+				{

+					if (version != dict.modCount) {

+						throw new InvalidOperationException(

+							"The Collection's contents changed after this " +

+							"enumerator was instantiated.");

+					}

+				}

+				

+				public object Current

+				{

+					get {

+						FailFast();

+						

+						if (isAtStart || current == null) {

+							throw new InvalidOperationException(

+								"Enumerator is positioned before the collection's " +

+								"first element or after the last element.");

+						}

+						

+						return isKeyList ? current.key : current.value;

+					}

+				}

+				

+				public bool MoveNext()

+				{

+					FailFast();

+					

+					if (isAtStart) {

+						current = dict.root;

+						isAtStart = false;

+					} else {

+						current = current.next;

+					}

+					

+					return current != null ? true : false;

+				}

+				

+				public void Reset()

+				{

+					FailFast();

+					isAtStart = true;

+					current = null;

+				}

+			}

+		}

+	}

+}

diff --git a/mcs/class/System/System.Collections.Specialized/NameObjectCollectionBase.cs b/mcs/class/System/System.Collections.Specialized/NameObjectCollectionBase.cs
new file mode 100644
index 00000000000..09b4d952988
--- /dev/null
+++ b/mcs/class/System/System.Collections.Specialized/NameObjectCollectionBase.cs
@@ -0,0 +1,518 @@
+/**

+ * System.Collections.Specialized.NamaValueCollection class implementation

+ * 

+ * Author: Gleb Novodran

+ */

+

+using System;

+using System.Collections;

+using System.Runtime.Serialization;

+

+namespace System.Collections.Specialized

+{

+	[Serializable]

+	public abstract class NameObjectCollectionBase : ICollection, IEnumerable, ISerializable, IDeserializationCallback

+	{

+		private Hashtable m_ItemsContainer;

+		/// <summary>

+		/// Extends Hashtable based Items container to support storing null-key pairs

+		/// </summary>

+		private _Item m_NullKeyItem;

+		private ArrayList m_ItemsArray;

+		private IHashCodeProvider m_hashprovider;

+		private IComparer m_comparer;

+		private int m_defCapacity;

+		private bool m_readonly;

+

+		internal IComparer Comparer {

+			get {return m_comparer;}

+		}

+

+		internal IHashCodeProvider HashCodeProvider {

+			get {return m_hashprovider;}

+		}

+

+		internal protected /*?*/ class _Item

+		{

+			public string key;

+			public object value;

+			public _Item(string key, object value)

+			{

+				this.key = key;

+				this.value = value;

+			}

+		}		

+		/// <summary>

+		/// Implements IEnumerable interface for KeysCollection

+		/// </summary>

+		[Serializable]

+		internal protected /*?*/ class _KeysEnumerator : IEnumerator

+		{

+			private NameObjectCollectionBase m_collection;

+			private int m_position;

+			/*private*/internal _KeysEnumerator(NameObjectCollectionBase collection)

+			{

+				m_collection = collection;

+				Reset();

+			}

+			public object Current 

+			{

+				

+				get{

+					if ((m_position<m_collection.Count)||(m_position<0))

+						return m_collection.BaseGetKey(m_position);

+					else 

+						throw new InvalidOperationException();

+				}

+				

+			}

+			public bool MoveNext()

+			{

+				return ((++m_position)<m_collection.Count)?true:false;

+			}

+			public void Reset()

+			{

+				m_position = -1;

+			}

+		}

+		

+		/// <summary>

+		/// SDK: Represents a collection of the String keys of a collection.

+		/// </summary>

+		public class KeysCollection : ICollection, IEnumerable

+		{

+			private NameObjectCollectionBase m_collection;

+

+			internal/*protected?*/ KeysCollection(NameObjectCollectionBase collection)

+			{

+				this.m_collection = collection;

+			}

+			public virtual string Get( int index )

+			{

+				return m_collection.BaseGetKey(index);

+				//throw new Exception("Not implemented yet");

+			}

+			

+			// ICollection methods -----------------------------------

+			/// <summary>

+			/// 

+			/// </summary>

+			/// <param name="arr"></param>

+			/// <param name="index"></param>

+			public virtual void /*ICollection*/  CopyTo(Array arr, int index)

+			{

+				if (arr==null)

+					throw new ArgumentNullException("array can't be null");

+				IEnumerator en = this.GetEnumerator();

+				int i = index;

+				while (en.MoveNext())

+				{

+					arr.SetValue(en.Current,i);

+					i++;

+				}			

+			}

+

+			public virtual bool IsSynchronized

+			{

+				get{

+					throw new Exception("Not implemented yet");

+				}

+			}

+			public virtual object SyncRoot

+			{

+				get{

+					throw new Exception("Not implemented yet");

+				}

+			}

+			/// <summary>

+			/// Gets the number of keys in the NameObjectCollectionBase.KeysCollection

+			/// </summary>

+			public int Count 

+			{

+				get{

+					return m_collection.Count;

+					//throw new Exception("Not implemented yet");

+				}

+			}

+

+			[MonoTODO]

+			public string this [int index] {

+				get { throw new NotImplementedException (); }

+			}

+

+			// IEnumerable methods --------------------------------

+			/// <summary>

+			/// SDK: Returns an enumerator that can iterate through the NameObjectCollectionBase.KeysCollection.

+			/// </summary>

+			/// <returns></returns>

+			public IEnumerator GetEnumerator()

+			{

+				return new _KeysEnumerator(m_collection);

+//				throw new Exception("Not implemented yet");

+			}

+		}

+

+

+

+		//--------------- Protected Instance Constructors --------------

+		

+		/// <summary>

+		/// SDK: Initializes a new instance of the NameObjectCollectionBase class that is empty.

+		/// </summary>

+		[MonoTODO]

+		protected NameObjectCollectionBase():base()

+		{

+			m_readonly = false;

+			

+			m_hashprovider = CaseInsensitiveHashCodeProvider.Default;

+			m_comparer = CaseInsensitiveComparer.Default;

+			m_defCapacity = 0;

+			Init();

+			/*m_ItemsContainer = new Hashtable(m_hashprovider,m_comparer);

+			m_ItemsArray = new ArrayList();

+			m_NullKeyItem = null;*/

+			//TODO: consider common Reset() method

+		}

+		

+		protected NameObjectCollectionBase( int capacity )

+		{

+			m_readonly = false;

+			

+			m_hashprovider = CaseInsensitiveHashCodeProvider.Default;

+			m_comparer = CaseInsensitiveComparer.Default;

+			m_defCapacity = capacity;

+			Init();

+			/*m_ItemsContainer = new Hashtable(m_defCapacity, m_hashprovider,m_comparer);

+			m_ItemsArray = new ArrayList();

+			m_NullKeyItem = null;			*/

+			//throw new Exception("Not implemented yet");

+		}

+		protected NameObjectCollectionBase( IHashCodeProvider hashProvider, IComparer comparer )

+		{

+			m_readonly = false;

+			

+			m_hashprovider = hashProvider;

+			m_comparer = comparer;

+			m_defCapacity = 0;

+			Init();

+			/*m_ItemsContainer = new Hashtable(m_hashprovider,m_comparer);

+			m_ItemsArray = new ArrayList();

+			m_NullKeyItem = null;			*/

+			//throw new Exception("Not implemented yet");

+		}

+		protected NameObjectCollectionBase( SerializationInfo info, StreamingContext context )

+		{

+			throw new Exception("Not implemented yet");

+		}

+		protected NameObjectCollectionBase( int capacity, IHashCodeProvider hashProvider, IComparer comparer )

+		{

+			m_readonly = false;

+			

+			m_hashprovider = hashProvider;

+			m_comparer = comparer;

+			m_defCapacity = capacity;

+			Init();

+			/*m_ItemsContainer = new Hashtable(m_defCapacity,m_hashprovider,m_comparer);

+			m_ItemsArray = new ArrayList();

+			m_NullKeyItem = null;	*/

+

+			//throw new Exception("Not implemented yet");

+		}

+		

+		private void Init(){

+			m_ItemsContainer = new Hashtable(m_defCapacity,m_hashprovider,m_comparer);

+			m_ItemsArray = new ArrayList();

+			m_NullKeyItem = null;	

+		}

+		//--------------- Public Instance Properties -------------------

+		public virtual NameObjectCollectionBase.KeysCollection Keys 

+		{

+			get

+			{

+				return new KeysCollection(this);

+				//throw new Exception("Not implemented yet");

+			}

+		}

+				

+		//--------------- Public Instance Methods ----------------------

+		// 

+		/// <summary>

+		/// SDK: Returns an enumerator that can iterate through the NameObjectCollectionBase.

+		/// 

+		/// <remark>This enumerator returns the keys of the collection as strings.</remark>

+		/// </summary>

+		/// <returns></returns>

+		public IEnumerator GetEnumerator()

+		{

+			return new _KeysEnumerator(this);

+		}

+		// GetHashCode

+		

+		// ISerializable

+		public virtual void /*ISerializable*/ GetObjectData( SerializationInfo info, StreamingContext context )

+		{

+			throw new Exception("Not implemented yet");

+		}

+

+		// ICollection

+		public virtual int Count 

+		{

+			get{

+				return m_ItemsArray.Count;

+				//throw new Exception("Not implemented yet");

+			}

+		}

+		bool ICollection.IsSynchronized

+		{

+			get { return false; }

+		}

+		object ICollection.SyncRoot

+		{

+			get { return this; }

+		}

+

+		void ICollection.CopyTo (Array array, int index)

+		{

+			throw new NotImplementedException ();

+		}

+		

+

+		// IDeserializationCallback

+		public virtual void OnDeserialization( object sender)

+		{

+			throw new Exception("Not implemented yet");

+		}

+		

+		//--------------- Protected Instance Properties ----------------

+		/// <summary>

+		/// SDK: Gets or sets a value indicating whether the NameObjectCollectionBase instance is read-only.

+		/// </summary>

+		protected bool IsReadOnly 

+		{

+			get{

+				return m_readonly;

+			}

+			set{

+				m_readonly=value;

+			}

+		}

+		

+		//--------------- Protected Instance Methods -------------------

+		/// <summary>

+		/// Adds an Item with the specified key and value into the <see cref="NameObjectCollectionBase"/>NameObjectCollectionBase instance.

+		/// </summary>

+		/// <param name="name"></param>

+		/// <param name="value"></param>

+		protected void BaseAdd( string name, object value )

+		{

+			if (this.IsReadOnly)

+				throw new NotSupportedException("Collection is read-only");

+			

+			_Item newitem=new _Item(name, value);

+

+			if (name==null){

+				//todo: consider nullkey entry

+				if (m_NullKeyItem==null)

+					m_NullKeyItem = newitem;

+			}

+			else

+				if (m_ItemsContainer[name]==null){

+					m_ItemsContainer.Add(name,newitem);

+				}

+			m_ItemsArray.Add(newitem);

+			

+//			throw new Exception("Not implemented yet");

+		}

+		protected void BaseClear()

+		{

+			if (this.IsReadOnly)

+				throw new NotSupportedException("Collection is read-only");

+			Init();

+			//throw new Exception("Not implemented yet");

+		}

+		/// <summary>

+		/// SDK: Gets the value of the entry at the specified index of the NameObjectCollectionBase instance.

+		/// </summary>

+		/// <param name="index"></param>

+		/// <returns></returns>

+		protected object BaseGet( int index )

+		{

+			return ((_Item)m_ItemsArray[index]).value;

+			//throw new Exception("Not implemented yet");

+		}

+		/// <summary>

+		/// SDK: Gets the value of the first entry with the specified key from the NameObjectCollectionBase instance.

+		/// </summary>

+		/// <remark>CAUTION: The BaseGet method does not distinguish between a null reference which is returned because the specified key is not found and a null reference which is returned because the value associated with the key is a null reference.</remark>

+		/// <param name="name"></param>

+		/// <returns></returns>

+		protected object BaseGet( string name )

+		{

+			_Item item = FindFirstMatchedItem(name);

+			/// CAUTION: The BaseGet method does not distinguish between a null reference which is returned because the specified key is not found and a null reference which is returned because the value associated with the key is a null reference.

+			if (item==null)

+				return null;

+			else

+				return item.value;

+		}

+

+		/// <summary>

+		/// SDK:Returns a String array that contains all the keys in the NameObjectCollectionBase instance.

+		/// </summary>

+		/// <returns>A String array that contains all the keys in the NameObjectCollectionBase instance.</returns>

+		protected string[] BaseGetAllKeys()

+		{

+			int cnt = m_ItemsArray.Count;

+			string[] allKeys = new string[cnt];

+			for(int i=0; i<cnt; i++)

+				allKeys[i] = BaseGetKey(i);//((_Item)m_ItemsArray[i]).key;

+			

+			return allKeys;

+		}

+

+		/// <summary>

+		/// SDK: Returns an Object array that contains all the values in the NameObjectCollectionBase instance.

+		/// </summary>

+		/// <returns>An Object array that contains all the values in the NameObjectCollectionBase instance.</returns>

+		protected object[] BaseGetAllValues()

+		{

+			int cnt = m_ItemsArray.Count;

+			object[] allValues = new object[cnt];

+			for(int i=0; i<cnt; i++)

+				allValues[i] = BaseGet(i);

+			

+			return allValues;

+//			throw new Exception("Not implemented yet");

+		}

+		[MonoTODO]

+		protected object[] BaseGetAllValues( Type type )

+		{

+			if (type == null)

+				throw new ArgumentNullException("'type' argument can't be null");

+			// TODO: implements this

+

+			throw new Exception("Not implemented yet");

+		}

+		

+		protected string BaseGetKey( int index )

+		{

+			return ((_Item)m_ItemsArray[index]).key;

+			//throw new Exception("Not implemented yet");

+		}

+		/// <summary>

+		/// Gets a value indicating whether the NameObjectCollectionBase instance contains entries whose keys are not a null reference 

+		/// </summary>

+		/// <returns>true if the NameObjectCollectionBase instance contains entries whose keys are not a null reference otherwise, false.</returns>

+		protected bool BaseHasKeys()

+		{

+			return (m_ItemsContainer.Count>0);

+//			throw new Exception("Not implemented yet");

+		}

+		/// <summary>

+		/// 

+		/// </summary>

+		/// <param name="name"></param>

+		[MonoTODO]

+		protected void BaseRemove( string name )

+		{

+			int cnt = 0;

+			String key;

+			if (this.IsReadOnly)

+				throw new NotSupportedException("Collection is read-only");

+			if (name!=null)

+			{

+				m_ItemsContainer.Remove(name);

+			}

+			else {

+				m_NullKeyItem = null;

+			}

+			

+			cnt = m_ItemsArray.Count;

+			for (int i=0 ; i< cnt; ){

+				key=BaseGetKey(i);

+				// TODO: consider case-sensivity 

+				if (String.Compare(key,name)==0){

+					m_ItemsArray.RemoveAt(i);

+					cnt--;

+				}

+				else 

+					i++;

+				

+			}

+//			throw new Exception("Not implemented yet");

+		}

+		/// <summary>

+		/// 

+		/// </summary>

+		/// <param name="index"></param>

+		/// <LAME>This function implemented the way Microsoft implemented it - 

+		/// item is removed from hashtable and array without considering the case when there are two items with the same key but different values in array.

+		/// E.g. if

+		/// hashtable is [("Key1","value1")] and array contains [("Key1","value1")("Key1","value2")] then

+		/// after RemoveAt(1) the collection will be in following state:

+		/// hashtable:[] 

+		/// array: [("Key1","value1")] 

+		/// It's ok only then the key is uniquely assosiated with the value

+		/// To fix it a comparsion of objects stored under the same key in the hashtable and in the arraylist should be added 

+		/// </LAME>>

+		[MonoTODO]

+		protected void BaseRemoveAt( int index )

+		{

+			if (this.IsReadOnly)

+				throw new NotSupportedException("Collection is read-only");

+			string key = BaseGetKey(index);

+			if (key!=null){

+				// TODO: see LAME description above

+				m_ItemsContainer.Remove(key);

+			}

+			else

+				m_NullKeyItem = null;

+			m_ItemsArray.RemoveAt(index);

+//			throw new Exception("Not implemented yet");

+		}

+		/// <summary>

+		/// SDK: Sets the value of the entry at the specified index of the NameObjectCollectionBase instance.

+		/// </summary>

+		/// <param name="index"></param>

+		/// <param name="value"></param>

+		protected void BaseSet( int index, object value )

+		{

+			if (this.IsReadOnly)

+				throw new NotSupportedException("Collection is read-only");

+			_Item item = (_Item)m_ItemsArray[index];

+			item.value = value;

+			//throw new Exception("Not implemented yet");

+		}

+		/// <summary>

+		/// Sets the value of the first entry with the specified key in the NameObjectCollectionBase instance, if found; otherwise, adds an entry with the specified key and value into the NameObjectCollectionBase instance.

+		/// </summary>

+		/// <param name="name">The String key of the entry to set. The key can be a null reference </param>

+		/// <param name="value">The Object that represents the new value of the entry to set. The value can be a null reference</param>

+		protected void BaseSet( string name, object value )

+		{

+			if (this.IsReadOnly)

+				throw new NotSupportedException("Collection is read-only");

+			_Item item = FindFirstMatchedItem(name);

+			if (item!=null)

+				item.value=value;

+			else 

+				BaseAdd(name, value);

+

+			//throw new Exception("Not implemented yet");

+		}

+		[MonoTODO]

+		private _Item FindFirstMatchedItem(string name)

+		{

+			if (name!=null)

+ 				return (_Item)m_ItemsContainer[name];

+			else {

+				//TODO: consider null key case

+				return m_NullKeyItem;

+				//throw new Exception("Not implemented yet");

+			}

+

+		}

+		//~Object();

+		

+	}

+}

diff --git a/mcs/class/System/System.Collections.Specialized/NameValueCollection.cs b/mcs/class/System/System.Collections.Specialized/NameValueCollection.cs
new file mode 100644
index 00000000000..6cdf0197b11
--- /dev/null
+++ b/mcs/class/System/System.Collections.Specialized/NameValueCollection.cs
@@ -0,0 +1,367 @@
+/**
+ * System.Collections.Specialized.NamaValueCollection class implementation
+ * 
+ * Author: Gleb Novodran
+ */
+// created on 7/21/2001 at 5:15 PM
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Runtime.Serialization;
+using System.Text;
+
+namespace System.Collections.Specialized{
+	[Serializable]
+	public class NameValueCollection : NameObjectCollectionBase
+	{
+		string[] cachedAllKeys = null;
+		string[] cachedAll = null;
+
+		//--------------------- Constructors -----------------------------
+
+		/// <summary> SDK: Initializes a new instance of the NameValueCollection class that is empty,
+		/// has the default initial capacity and uses the default case-insensitive hash code provider and the default case-insensitive comparer.
+		/// </summary>
+		public NameValueCollection() : base()
+		{
+			
+		}
+		
+		/// <summary> SDK: Initializes a new instance of the NameValueCollection class that is empty, 
+		/// has the specified initial capacity and uses the default case-insensitive hash code provider and the default case-insensitive comparer.
+		///</summary>
+		public NameValueCollection( int capacity ) : base(capacity)
+		{
+			
+		}
+
+		/// <summary> SDK: Copies the entries from the specified NameValueCollection to a new 
+		/// NameValueCollection with the same initial capacity as the number of entries copied 
+		/// and using the same case-insensitive hash code provider and the same case-insensitive 
+		/// comparer as the source collection.
+		/// </summary>
+		/// TODO: uncomment constructor below after it will be possible to compile NameValueCollection and
+		/// NameObjectCollectionBase to the same assembly 
+		
+		public NameValueCollection( NameValueCollection col ) : base(col.HashCodeProvider,col.Comparer)
+		{
+			if (col==null)
+				throw new ArgumentNullException("Null argument is not allowed");
+			Add(col);
+		}
+
+		///<summary>SDK: Initializes a new instance of the NameValueCollection class that is empty, 
+		///has the default initial capacity and uses the specified hash code provider and 
+		///the specified comparer.</summary>
+		public NameValueCollection( IHashCodeProvider hashProvider, IComparer comparer )
+			: base(hashProvider, comparer)
+		{
+			
+		}
+
+		/// <summary>
+		/// SDK: Copies the entries from the specified NameValueCollection to a new NameValueCollection
+		/// with the specified initial capacity or the same initial capacity as the number of entries 
+		/// copied, whichever is greater, and using the default case-insensitive hash code provider and 
+		/// the default case-insensitive comparer.
+		/// </summary>
+		/// TODO: uncomment constructor below after it will be possible to compile NameValueCollection and
+		/// NameObjectCollectionBase to the same assembly 
+		
+/*		public NameValueCollection( int capacity, NameValueCollection col )
+			: base(capacity, col.get_HashCodeProvider(),col.Comparer)
+		{
+			if (col==null)
+				throw new ArgumentNullException("Null argument is not allowed");
+			Add(col);			
+		}
+*/		
+		/// <summary>
+		/// SDK: Initializes a new instance of the NameValueCollection class that is serializable
+		/// and uses the specified System.Runtime.Serialization.SerializationInfo and 
+		/// System.Runtime.Serialization.StreamingContext.
+		/// </summary>
+		protected NameValueCollection( SerializationInfo info, StreamingContext context )
+			:base(info, context)
+		{
+			
+		}
+		
+		/// <summary>
+		/// SDK: Initializes a new instance of the NameValueCollection class that is empty, 
+		/// has the specified initial capacity and uses the specified hash code provider and 
+		/// the specified comparer.
+		/// </summary>
+		public NameValueCollection( int capacity, IHashCodeProvider hashProvider, IComparer comparer )
+			:base(capacity, hashProvider, comparer)
+		{
+			
+		}
+
+        //----------------------- Public Instance Properties -------------------------------
+
+		
+		///<summary> SDK:
+		/// Gets all the keys in the NameValueCollection.
+		/// The arrays returned by AllKeys are cached for better performance and are 
+		/// automatically refreshed when the collection changes. A derived class can 
+		/// invalidate the cached version by calling InvalidateCachedArrays, thereby 
+		/// forcing the arrays to be recreated.
+		/// </summary>
+		public virtual string[] AllKeys 
+		{
+			get {
+				if (cachedAllKeys==null)
+					cachedAllKeys = BaseGetAllKeys();
+				return this.cachedAllKeys;
+			}
+		}
+		
+		public string this[ int index ] 
+		{
+			get{
+				return this.Get(index);
+			}
+		}
+		
+		public string this[ string name ] {
+			get{
+				return this.Get(name);
+			}
+			set{
+				this.Set(name,value);
+			}
+		}
+		
+/////////////////////////////// Public Instance Methods //////////////////////////////
+		
+		/// <summary> SDK: Copies the entries in the specified NameValueCollection 
+		/// to the current NameValueCollection.</summary>
+		/// LAMESPEC: see description that comes this Add(string, string)
+		
+		public void Add(  NameValueCollection c ){
+			
+			if (this.IsReadOnly)
+				throw new NotSupportedException("Collection is read-only");
+			if (c==null)
+				throw new ArgumentNullException();
+			
+			InvalidateCachedArrays();
+			ArrayList values = null;
+			
+			int max = c.Count;
+			for(int i=0; i<max; i++){
+				values=(ArrayList)BaseGet(c.GetKey(i));
+				if (values==null)
+					values = new ArrayList();
+				values.AddRange((ArrayList)c.BaseGet(i));
+			}
+
+		}
+
+		
+		/// <summary> SDK: Adds an entry with the specified name and value to the 
+		/// NameValueCollection. </summary>
+		/// 
+		/// LAMESPEC: 
+		/// in SDK doc: If the same value already exists under the same key in the collection, 
+		/// the new value overwrites the old value.
+		/// however the Microsoft implemenatation in this case just adds one more value
+		/// in other words after
+		/// <code>
+		/// NameValueCollection nvc;
+		/// nvc.Add("LAZY","BASTARD")
+		/// nvc.Add("LAZY","BASTARD")
+		/// </code>
+		/// nvc.Get("LAZY") will be "BASTARD,BASTARD" instead of "BASTARD"
+
+		public virtual void Add( string name, string val )
+		{
+			
+			if (this.IsReadOnly)
+				throw new NotSupportedException("Collection is read-only");
+			
+			InvalidateCachedArrays();
+			ArrayList values = (ArrayList)BaseGet(name);
+			if (values==null){
+				values = new ArrayList();
+				if (val!=null)
+					values.Add(val);
+				BaseAdd(name,values);
+			}
+			else {
+				if (val!=null)
+					values.Add(val);
+			}
+
+		}
+
+		/// <summary> SDK: Invalidates the cached arrays and removes all entries from 
+		/// the NameValueCollection.</summary>
+		 
+		public void Clear(){
+			if (this.IsReadOnly)
+				throw new NotSupportedException("Collection is read-only");
+			InvalidateCachedArrays();
+			BaseClear();
+		}
+
+		/// <summary> SDK: Copies the entire NameValueCollection to a compatible one-dimensional Array,
+		/// starting at the specified index of the target array.</summary>
+
+		[MonoTODO]
+		public void CopyTo( Array dest, int index )
+		{
+			if (dest==null)
+				throw new ArgumentNullException("Null argument - dest");
+			if (index<0)
+				throw new ArgumentOutOfRangeException("index is less than 0");
+//			throw new Exception("Not implemented yet");
+			
+			//TODO: add implementation here
+			if (cachedAll==null)
+				RefreshCachedAll();
+			cachedAll.CopyTo(dest, index);
+		}
+		protected void RefreshCachedAll()
+		{
+			this.cachedAll=null;
+			int max = this.Count;
+			cachedAll = new string[max];
+			for(int i=0;i<max;i++){
+				cachedAll[i] = this.Get(i);
+			}
+			
+		}
+		
+		/// <summary> SDK: Gets the values at the specified index of the NameValueCollection combined
+		/// into one comma-separated list.</summary>
+		
+		public virtual string Get( int index )
+		{
+			ArrayList values = (ArrayList)BaseGet(index);
+			// if index is out of range BaseGet throws an ArgumentOutOfRangeException
+
+			return AsSingleString(values);
+			
+		}
+		
+		/**
+		 * SDK: Gets the values associated with the specified key from the NameValueCollection
+		 * combined into one comma-separated list.
+		 */
+		public virtual string Get( string name )
+		{
+			ArrayList values = (ArrayList)BaseGet(name);
+/*			if (values==null) 
+				Console.WriteLine("BaseGet returned null");*/
+			return AsSingleString(values);
+// -------------------------------------------------------------
+
+		}
+		/// <summary></summary>
+		[MonoTODO]
+		private static string AsSingleString(ArrayList values)
+		{
+			const char separator = ',';
+			
+			if (values==null)
+				return null;
+			int max = values.Count;
+			
+			if (max==0)
+				return null;
+			//TODO: reimplement this
+			StringBuilder sb = new StringBuilder((string)values[0]);
+			for (int i=1; i<max; i++){
+				sb.Append(separator);
+				sb.Append(values[i]);
+			}
+
+			return sb.ToString();			
+		}
+		
+		
+		/// <summary>SDK: Gets the key at the specified index of the NameValueCollection.</summary>
+		public virtual string GetKey( int index )
+		{
+			return BaseGetKey(index);
+		}
+		
+		
+		/// <summary>SDK: Gets the values at the specified index of the NameValueCollection.</summary>
+		 
+		public virtual string[] GetValues( int index )
+		{
+			ArrayList values = (ArrayList)BaseGet(index);
+			
+			return AsStringArray(values);
+		}
+		
+		
+		public virtual string[] GetValues( string name )
+		{
+			ArrayList values = (ArrayList)BaseGet(name);
+			
+			return AsStringArray(values);
+		}
+		
+		private static string[] AsStringArray(ArrayList values)
+		{
+			if (values == null)
+				return null;
+			int max = values.Count;//get_Count();
+			if (max==0)
+				return null;
+			
+			string[] valArray =new string[max];
+			values.CopyTo(valArray);
+			return valArray;
+		}
+		
+		
+		/// <summary>
+		/// SDK: Gets a value indicating whether the NameValueCollection contains keys that
+		/// are not a null reference 
+		/// </summary>
+
+		public bool HasKeys()
+		{
+			return BaseHasKeys();
+		}
+		
+		public virtual void Remove( string name )
+		{
+			if (this.IsReadOnly)
+				throw new NotSupportedException("Collection is read-only");
+			InvalidateCachedArrays();
+			BaseRemove(name);
+			
+		}
+		
+		/// <summary>
+		/// Sets the value of an entry in the NameValueCollection.
+		/// </summary>
+		public virtual void Set( string name, string value )
+		{
+			if (this.IsReadOnly)
+				throw new NotSupportedException("Collection is read-only");
+			InvalidateCachedArrays();
+			
+			ArrayList values = new ArrayList();
+			values.Add(value);
+			BaseSet(name,values);
+
+		}
+		
+
+//---------------------- Protected Instance Methods ----------------------	
+
+		protected void InvalidateCachedArrays()
+		{
+			cachedAllKeys = null;
+			cachedAll = null;
+		}
+
+	}
+}
diff --git a/mcs/class/System/System.Collections.Specialized/StringCollection.cs b/mcs/class/System/System.Collections.Specialized/StringCollection.cs
new file mode 100755
index 00000000000..120468812f2
--- /dev/null
+++ b/mcs/class/System/System.Collections.Specialized/StringCollection.cs
@@ -0,0 +1,293 @@
+/* System.Collections.Specialized.StringCollection.cs

+ * Authors:

+ *   John Barnette (jbarn@httcb.net)

+ *   Sean MacIsaac (macisaac@ximian.com)

+ *

+ *  Copyright (C) 2001 John Barnette

+ * (C) Ximian, Inc.  http://www.ximian.com

+ *

+ * NOTES:

+ * I bet Microsoft uses ArrayList as a backing store for this; I wonder what

+ * the performance difference will be.

+*/

+

+using System;

+

+namespace System.Collections.Specialized {

+	[Serializable]

+	public class StringCollection : IList, ICollection, IEnumerable {

+		private static int   InitialCapacity    = 11;

+		private static float CapacityMultiplier = 2.0f;

+		

+		private int count;

+		private int modCount;

+		

+		private string[] entries;

+		

+		// Public Constructor

+		public StringCollection() {

+			entries  = new string[InitialCapacity];

+			count    = 0;

+			modCount = 0;

+		}

+		

+		// Public Instance Properties

+		public int Count {

+			get { return count; }

+		}

+		

+		public bool IsFixedSize {

+			get { return false; }

+		}

+		

+		public bool IsReadOnly {

+			get { return false; }

+		}

+		

+		public bool IsSynchronized {

+			get { return false; }

+		}

+		

+		object IList.this[int index] {

+			get { return this[index]; }

+			set { this[index] = value.ToString(); } 

+		}

+		

+		public string this[int index] {

+			get {

+				if (index < 0 || index >= count) {

+					throw new ArgumentOutOfRangeException("index");

+				}

+				

+				return entries[index];

+			}

+			

+			set {

+				if (index < 0 || index >= count) {

+					throw new ArgumentOutOfRangeException("index");

+				}

+				

+				modCount++;

+				entries[index] = value;

+			}

+		}

+		

+		public object SyncRoot {

+			get { return this; }

+		}

+		

+		

+		// Public Instance Methods

+		

+		int IList.Add(object value) {

+			return Add(value.ToString());

+		}

+		

+		public int Add(string value) {

+			modCount++;

+			Resize(count + 1);

+			int index = count++;

+			entries[index] = value;

+			

+			return index;

+		}

+		

+		public void AddRange(string[] value) {

+			int numEntries = value.Length;

+			

+			modCount++;

+			Resize(count + numEntries);

+			Array.Copy(value, 0, entries, count, numEntries);

+			count += numEntries;

+		}

+		

+		public void Clear() {

+			modCount++;

+			count = 0;

+		}

+		

+		bool IList.Contains(object value) {

+			return Contains(value.ToString());

+		}

+		

+		public bool Contains(string value) {

+			foreach (string entry in entries) {

+				if (value.Equals(entry)) {

+					return true;

+				}

+			}

+			

+			return false;

+		}

+		

+		void ICollection.CopyTo(Array array, int index) {

+			if (array == null) {

+				throw new ArgumentNullException("array");

+			} else if (index < 0) {

+				throw new ArgumentOutOfRangeException("index");

+			} else if (array.Rank > 1) {

+				throw new ArgumentException("array");

+			} else if (index >= array.Length) {

+				throw new ArgumentException("index");

+			} else if (array.Length - index < count) {

+				throw new ArgumentException("array");

+			}

+			

+			Array.Copy(entries, 0, array, index, count);

+		}

+		

+		public void CopyTo(string[] array, int index) {

+			if (array == null) {

+				throw new ArgumentNullException("array");

+			} else if (index < 0) {

+				throw new ArgumentOutOfRangeException("index");

+			} else if (array.Rank > 1) {

+				throw new ArgumentException("array");

+			} else if (index >= array.Length) {

+				throw new ArgumentException("index");

+			} else if (array.Length - index < count) {

+				throw new ArgumentException("array");

+			}

+			

+			Array.Copy(entries, 0, array, index, count);

+		}

+		

+		IEnumerator IEnumerable.GetEnumerator() {

+			return new InternalEnumerator(this);

+		}

+		

+		public StringEnumerator GetEnumerator() {

+			return new StringEnumerator(this);

+		}

+		

+		int IList.IndexOf(object value) {

+			return IndexOf(value.ToString());

+		}

+		

+		public int IndexOf(string value) {

+			for (int i = 0; i < count; i++) {

+				if (value.Equals(entries[i])) {

+					return i;

+				}

+			}

+			

+			return -1;

+		}

+		

+		void IList.Insert(int index, object value) {

+			Insert(index, value.ToString());

+		}

+		

+		public void Insert(int index, string value) {

+			if (index < 0 || index > count) {

+				throw new ArgumentOutOfRangeException("index");

+			}

+			

+			modCount++;

+			Resize(count + 1);

+			Array.Copy(entries, index, entries, index + 1, count - index);

+			entries[index] = value;

+			count++;

+		}

+

+		

+		void IList.Remove(object value) {

+			Remove(value.ToString());

+		}

+		

+		public void Remove(string value) {

+			for (int i = 0; i < count; i++) {

+				if (value.Equals(entries[i])) {

+					RemoveAt(i);

+					return;

+				}

+			}

+		}

+		

+		public void RemoveAt(int index) {

+			if (index < 0 || index >= count) {

+				throw new ArgumentOutOfRangeException("index");

+			}

+			

+			int remaining = count - index - 1;

+			

+			modCount++;

+			

+			if (remaining > 0) {

+				Array.Copy(entries, index + 1, entries, index, remaining);

+			}

+			

+			count--;

+			entries[count] = null;

+		}

+		

+		

+		// Private Instance Methods

+		

+		private void Resize(int minSize) {

+			int oldSize = entries.Length;

+			

+			if (minSize > oldSize) {

+				string[] oldEntries = entries;

+				int newSize = (int) (oldEntries.Length * CapacityMultiplier);

+				

+				if (newSize < minSize) newSize = minSize;

+				entries = new string[newSize];

+				Array.Copy(oldEntries, 0, entries, 0, count);

+			}

+		}

+		

+		

+		// Private classes

+		

+		private class InternalEnumerator : IEnumerator {

+			private StringCollection data;

+			private int index;

+			private int myModCount;

+			

+			public InternalEnumerator(StringCollection data) {

+				this.data  = data;

+				myModCount = data.modCount;

+				index      = -1;

+			}

+			

+			

+			// Public Instance Properties

+			

+			public object Current {

+				get {

+					if (myModCount != data.modCount) {

+						throw new InvalidOperationException();

+					} else if (index < 0 || index > data.count - 1) {

+						throw new InvalidOperationException();

+					}

+					

+					return data[index];

+				}

+			}

+			

+			

+			// Public Instance Methods

+			

+			public bool MoveNext() {

+				if (myModCount != data.modCount) {

+					throw new InvalidOperationException();

+				}

+				

+				if (++index >= data.count - 1) {

+					return false;

+				}

+				

+				return true;

+			}

+			

+			public void Reset() {

+				if (myModCount != data.modCount) {

+					throw new InvalidOperationException();

+				}

+				

+				index = -1;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System/System.Collections.Specialized/StringDictionary.cs b/mcs/class/System/System.Collections.Specialized/StringDictionary.cs
new file mode 100644
index 00000000000..2e5bc2bfe10
--- /dev/null
+++ b/mcs/class/System/System.Collections.Specialized/StringDictionary.cs
@@ -0,0 +1,97 @@
+namespace System.Collections.Specialized

+{

+	public class StringDictionary : IEnumerable

+	{

+		protected Hashtable table;

+			

+		public StringDictionary()

+		{

+			table = new Hashtable();

+		}

+		

+		// Public Instance Properties

+		

+		public virtual int Count

+		{

+			get {

+				return table.Count;

+			}

+		}

+		

+		public virtual bool IsSynchronized

+		{

+			get {

+				return false;

+			}

+		}

+		

+		public virtual string this[string key]

+		{

+			get {

+				return (string) table[key.ToLower()];

+			}

+			

+			set {

+				table[key.ToLower()] = value;

+			}

+		}

+		

+		public virtual ICollection Keys

+		{

+			get {

+				return table.Keys;

+			}

+		}

+		

+		public virtual ICollection Values

+		{

+			get {

+				return table.Values;

+			}

+		}

+		

+		public virtual object SyncRoot

+		{

+			get {

+				return table.SyncRoot;

+			}

+		}

+		

+		// Public Instance Methods

+		

+		public virtual void Add(string key, string value)

+		{

+			table.Add(key.ToLower(), value);

+		}

+		

+		public virtual void Clear()

+		{

+			table.Clear();

+		}

+		

+		public virtual bool ContainsKey(string key)

+		{

+			return table.ContainsKey(key.ToLower());

+		}

+		

+		public virtual bool ContainsValue(string value)

+		{

+			return table.ContainsValue(value);

+		}

+		

+		public virtual void CopyTo(Array array, int index)

+		{

+			table.CopyTo(array, index);

+		}

+		

+		public virtual IEnumerator GetEnumerator()

+		{

+			return table.GetEnumerator();

+		}

+		

+		public virtual void Remove(string key)

+		{

+			table.Remove(key.ToLower());

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Collections.Specialized/StringEnumerator.cs b/mcs/class/System/System.Collections.Specialized/StringEnumerator.cs
new file mode 100644
index 00000000000..8be9d7c5a6e
--- /dev/null
+++ b/mcs/class/System/System.Collections.Specialized/StringEnumerator.cs
@@ -0,0 +1,36 @@
+/* System.Collections.Specialized.StringEnumerator.cs

+ * Authors:

+ *   John Barnette (jbarn@httcb.net)

+ *

+ *  Copyright (C) 2001 John Barnette

+*/

+

+namespace System.Collections.Specialized {

+	public class StringEnumerator {

+		private StringCollection coll;

+		private IEnumerator enumerable;

+		

+		// assembly-scoped constructor

+		internal StringEnumerator(StringCollection coll) {

+			this.coll = coll;

+			this.enumerable = ((IEnumerable)coll).GetEnumerator();

+		}

+		

+		// Public Instance Properties

+		

+		public string Current {

+			get { return (string) enumerable.Current; }

+		}

+		

+		

+		// Public Instance Methods

+		

+		public bool MoveNext() {

+			return enumerable.MoveNext();

+		}

+		

+		public void Reset() {

+			enumerable.Reset();

+		}

+	}

+}

diff --git a/mcs/class/System/System.ComponentModel/AttributeCollection.cs b/mcs/class/System/System.ComponentModel/AttributeCollection.cs
new file mode 100644
index 00000000000..fb8c7937d2a
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/AttributeCollection.cs
@@ -0,0 +1,130 @@
+//
+// System.ComponentModel.AttributeCollection.cs
+//
+// Authors:
+// 	Rodrigo Moya (rodrigo@ximian.com)
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+namespace System.ComponentModel
+{
+	public class AttributeCollection : ICollection, IEnumerable
+	{
+		private ArrayList attrList = new ArrayList ();
+		public static readonly AttributeCollection Empty = new AttributeCollection (null);
+		
+		public AttributeCollection (Attribute[] attributes)
+		{
+			if (attributes != null)
+				for (int i = 0; i < attributes.Length; i++)
+					attrList.Add (attributes[i]);
+		}
+
+		public bool Contains (Attribute attr)
+		{
+			return attrList.Contains (attr);
+		}
+
+		public bool Contains (Attribute [] attributes)
+		{
+			if (attributes == null)
+				return true;
+
+			foreach (Attribute attr in attributes)
+				if (!Contains (attr))
+					return false;
+
+			return true;
+		}
+
+		public void CopyTo (Array array, int index)
+		{
+			attrList.CopyTo (array, index);
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return attrList.GetEnumerator ();
+		}
+
+		public bool Matches (Attribute attr)
+		{
+			foreach (Attribute a in attrList)
+				if (a.Match (attr))
+					return true;
+			return false;
+		}
+
+		public bool Matches (Attribute [] attributes)
+		{
+			foreach (Attribute a in attributes)
+				if (!(Matches (a)))
+					return false;
+			return true;
+		}
+
+		protected Attribute GetDefaultAttribute (Type attributeType)
+		{
+			Attribute attr;
+			BindingFlags bf = BindingFlags.Public | BindingFlags.Static;
+
+			FieldInfo def = attributeType.GetField ("Default", bf);
+			if (def == null) {
+				attr = Activator.CreateInstance (attributeType) as Attribute;
+				if (attr != null && !attr.IsDefaultAttribute ())
+					attr = null;
+			} else {
+				attr = (Attribute) def.GetValue (null);
+			}
+
+			return attr;
+		}
+
+		public bool IsSynchronized {
+			get {
+				return attrList.IsSynchronized;
+			}
+		}
+
+		public object SyncRoot {
+			get {
+				return attrList.SyncRoot;
+			}
+		}
+		
+		public int Count {
+			get {
+				return attrList.Count;
+			}
+		}
+
+		public virtual Attribute this[Type type] {
+			get {
+				Attribute attr = null;
+				foreach (Attribute a in attrList) {
+					if (a.GetType () == type){
+						attr = a;
+						break;
+					}
+				}
+
+				if (attr == null)
+					attr = GetDefaultAttribute (type);
+
+				return attr;
+			}
+		}
+
+		public virtual Attribute this[int index] {
+			get {
+				return (Attribute) attrList [index];
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/BindableAttribute.cs b/mcs/class/System/System.ComponentModel/BindableAttribute.cs
new file mode 100755
index 00000000000..ef48152bd48
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/BindableAttribute.cs
@@ -0,0 +1,71 @@
+//
+// System.ComponentModel.BindableAttribute.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+//
+
+namespace System.ComponentModel {
+	[AttributeUsage (AttributeTargets.All)]
+	public sealed class BindableAttribute : Attribute {
+
+		#region Fields
+
+		BindableSupport flags;
+		bool bindable;
+
+		#endregion // Fields
+		
+		public static readonly BindableAttribute No = new BindableAttribute (BindableSupport.No);
+		public static readonly BindableAttribute Yes = new BindableAttribute (BindableSupport.Yes);
+		public static readonly BindableAttribute Default = new BindableAttribute (BindableSupport.Default);
+
+		#region Constructors
+
+		public BindableAttribute (BindableSupport flags)
+		{
+			this.flags = flags;
+			this.bindable = false;
+		}
+
+		public BindableAttribute (bool bindable)
+		{
+			this.bindable = bindable;
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+
+		public bool Bindable {
+			get { return bindable; }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public override bool Equals (object obj)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsDefaultAttribute ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/BindableSupport.cs b/mcs/class/System/System.ComponentModel/BindableSupport.cs
new file mode 100644
index 00000000000..e11e9a1920b
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/BindableSupport.cs
@@ -0,0 +1,18 @@
+//
+// System.ComponentModel.BindableSupport.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+namespace System.ComponentModel
+{
+	[Serializable]
+	public enum BindableSupport {
+		No,
+		Yes,
+		Default
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/BrowsableAttribute.cs b/mcs/class/System/System.ComponentModel/BrowsableAttribute.cs
new file mode 100755
index 00000000000..e56beb2f809
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/BrowsableAttribute.cs
@@ -0,0 +1,38 @@
+//
+// System.ComponentModel.BrowsableAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+namespace System.ComponentModel {
+
+	[AttributeUsage (AttributeTargets.Property | AttributeTargets.Event)]
+	public sealed class BrowsableAttribute : Attribute {
+		bool browsable;
+		
+		public static readonly BrowsableAttribute No;
+		public static readonly BrowsableAttribute Yes;
+
+		static BrowsableAttribute ()
+		{
+			No = new BrowsableAttribute (false);
+			Yes = new BrowsableAttribute (false);
+		}
+		
+		public BrowsableAttribute (bool browsable)
+		{
+			this.browsable = browsable;
+		}
+
+		public bool Browsable {
+			get {
+				return browsable;
+			}
+		}
+		
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/CategoryAttribute.cs b/mcs/class/System/System.ComponentModel/CategoryAttribute.cs
new file mode 100755
index 00000000000..c68b49cda50
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/CategoryAttribute.cs
@@ -0,0 +1,227 @@
+//
+// System.ComponentModel.CategoryAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+namespace System.ComponentModel {
+
+	[AttributeUsage (AttributeTargets.Property | AttributeTargets.Event)]
+	public class CategoryAttribute : Attribute {
+		string category;
+
+		static CategoryAttribute action, appearance, behaviour, data,   def;
+		static CategoryAttribute design, drag_drop,  focus,     format, key;
+		static CategoryAttribute layout, mouse,      window_style;
+		
+		public CategoryAttribute (string category)
+		{
+			this.category = category;
+		}
+
+		public CategoryAttribute ()
+		{
+			this.category = "Misc";
+		}
+
+		[MonoTODO]
+		protected virtual string GetLocalizedString (string value)
+		{
+			// FIXME: IMPLEMENT
+
+			return category;
+		}
+
+		public string Category {
+			get {
+				return category;
+			}
+		}
+		
+		public static CategoryAttribute Action {
+			get {
+				if (action != null)
+					return action;
+
+				lock (typeof (CategoryAttribute)){
+					if (action == null)
+						action = new CategoryAttribute ("Action");
+				}
+
+				return action;
+			}
+		}
+
+		public static CategoryAttribute Appearance {
+			get {
+				if (appearance != null)
+					return appearance;
+
+				lock (typeof (CategoryAttribute)){
+					if (appearance == null)
+						appearance = new CategoryAttribute ("Appearance");
+				}
+
+				return appearance;
+			}
+		}
+
+		public static CategoryAttribute Behaviour {
+			get {
+				if (behaviour != null)
+					return behaviour;
+
+				lock (typeof (CategoryAttribute)){
+					if (behaviour == null)
+						behaviour = new CategoryAttribute ("Action");
+				}
+
+				return behaviour;
+			}
+		}
+
+		public static CategoryAttribute Data {
+			get {
+				if (data != null)
+					return data;
+
+				lock (typeof (CategoryAttribute)){
+					if (data == null)
+						data = new CategoryAttribute ("Data");
+				}
+
+				return data;
+			}
+		}
+
+		public static CategoryAttribute Default {
+			get {
+				if (def != null)
+					return def;
+
+				lock (typeof (CategoryAttribute)){
+					if (def == null)
+						def = new CategoryAttribute ("Default");
+				}
+
+				return def;
+			}
+		}
+
+		public static CategoryAttribute Design {
+			get {
+				if (design != null)
+					return design;
+
+				lock (typeof (CategoryAttribute)){
+					if (design == null)
+						design = new CategoryAttribute ("Design");
+				}
+
+				return design;
+			}
+		}
+
+		public static CategoryAttribute DragDrop {
+			get {
+				if (drag_drop != null)
+					return drag_drop;
+
+				lock (typeof (CategoryAttribute)){
+					if (drag_drop == null)
+						drag_drop = new CategoryAttribute ("Drag Drop");
+				}
+
+				return drag_drop;
+			}
+		}
+
+		public static CategoryAttribute Focus {
+			get {
+				if (focus != null)
+					return focus;
+
+				lock (typeof (CategoryAttribute)){
+					if (focus == null)
+						focus = new CategoryAttribute ("Focus");
+				}
+
+				return focus;
+			}
+		}
+
+		public static CategoryAttribute Format {
+			get {
+				if (format != null)
+					return format;
+
+				lock (typeof (CategoryAttribute)){
+					if (format == null)
+						format = new CategoryAttribute ("Format");
+				}
+
+				return format;
+			}
+		}
+
+		public static CategoryAttribute Key {
+			get {
+				if (key != null)
+					return key;
+
+				lock (typeof (CategoryAttribute)){
+					if (key == null)
+						key = new CategoryAttribute ("Key");
+				}
+
+				return key;
+			}
+		}
+
+		public static CategoryAttribute Layout {
+			get {
+				if (layout != null)
+					return layout;
+
+				lock (typeof (CategoryAttribute)){
+					if (layout == null)
+						layout = new CategoryAttribute ("Layout");
+				}
+
+				return layout;
+			}
+		}
+
+		public static CategoryAttribute Mouse {
+			get {
+				if (mouse != null)
+					return mouse;
+
+				lock (typeof (CategoryAttribute)){
+					if (mouse == null)
+						mouse = new CategoryAttribute ("Mouse");
+				}
+
+				return mouse;
+			}
+		}
+
+		public static CategoryAttribute WindowStyle {
+			get {
+				if (window_style != null)
+					return window_style;
+
+				lock (typeof (CategoryAttribute)){
+					if (window_style == null)
+						window_style = new CategoryAttribute ("Window Style");
+				}
+
+				return window_style;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/ChangeLog b/mcs/class/System/System.ComponentModel/ChangeLog
new file mode 100644
index 00000000000..ee1c1f0816c
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ChangeLog
@@ -0,0 +1,267 @@
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* BindableSupport.cs:
+	* Component.cs:
+	* EventDescriptorCollection.cs:
+	* ITypeDescriptorContext.cs:
+	* TypeConverter.cs:
+	* TypeDescriptor.cs: class status based fixes.
+	
+	* StringConverter.cs: implemented a couple of methods.
+
+2002-07-29  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* EnumConverter.cs: new file.
+	
+	* TypeConverter.cs: implemented a few simple methods.
+
+	* TypeDescriptor.cs:
+	(GetConverter): initial support for converters of well-known types.
+
+2002-07-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* DerivedPropertyDescriptor.cs: New file. Internal class.
+
+	* PropertyDescriptorCollection.cs: almost fully implemented.
+
+	* TypeDescriptor.cs: implemented a couple of GetProperties ().
+
+Wed Jul 24 13:14:30 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Component.cs: don't die if Disposed is null.
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* RecommendedAsConfigurableAttribute.cs: new file added
+		for System.Web.Services build
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* ExpandableObjectConverter.cs: Fix error with constructor
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* TypeConverter.cs: Fixed bad stubb function
+		GetConvertToException ()
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* ComponentCollection.cs: Added reference to
+		ReadOnlyCollectionBase to make sure
+		that we inherit the appropriate methods.
+		Not sure why the Dispose() method is
+		required, but left for now.
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* TypeConverter.cs: Added new stubbs
+	* BindableAttribute.cs: Added
+	* BindableSupport.cs: Added
+	* NotifyParentPropertyAttribute.cs: Added
+	* ExpandableObjectConverter.cs: Added
+
+2002-07-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* MemberDescriptor.cs: implemented Attributes and Category.
+
+	* PropertyDescriptor.cs: implemented Converter. Declared GetValue ().
+
+	* PropertyDescriptorCollection.cs: fixed indexers declaration.
+
+	* ReadOnlyAttribute.cs: GetHashCoder (), Equals (), IsDefault () and
+	fixed value for Yes.
+
+	* ToolboxItemAttribute.cs: fixed declaration of IsDefaultAttribute.
+
+	* TypeConverter.cs: added SimplePropertyDescriptor class.
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ToolboxItemAttribute.cs: New file.
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* DefaultEventAttribute.cs: new file.
+
+2002-07-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AttributeCollection.cs: fixlet.
+
+2002-07-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AttributeCollection.cs: finished implementation.
+	* TypeDescriptor.cs: implemented GetAttributes (object).
+
+2002-07-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AttributeCollection.cs: initialize member variables.
+
+	* RefreshEventArgs.cs: implemented.
+	* RefreshEventHandler.cs: New file.
+
+	* TypeDescriptor.cs: fully stubbed out the remaining method.
+
+2002-07-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* DefaultPropertyAttribute.cs: New file.
+
+2002-06-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* TypeConverter.cs: flushed local changes.
+
+2002-06-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* StringConverter.cs: stubbed out.
+	* TypeConverter.cs: stubbed the rest out and added some implementation.
+
+	Five errors left when compiling System.Web in linux.
+
+2002-06-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* TypeConverterAttribute.cs: attribute used by 
+	TypeDescriptor.Getconverter ().
+
+	* TypeDescriptor.cs:  implemented GetConverter in the right way.
+
+2002-06-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* TypeConverter.cs:
+	* ITypeDescriptorContext.cs:
+	* TypeDescriptor.cs: implemented minimal set of features needed by xsp,
+	which uses ColorConverter.
+
+2002-05-12  Daniel Morgan <danmorg@sc.rr.com>
+
+	* IComponent.cs
+	* ISite.cs: added using System
+	 
+	* MarshalByValueComponent.cs: changed all throwing of Not ImplementedException
+	to // TODOs and added using System.  The throwing of the exceptions prevented
+	System.Data from running.
+
+2002-05-10  Rodrigo Moya <rodrigo@ximian.com>
+
+	* EventDescriptorCollection.cs (this[index]): call eventList[index],
+	not this[index], which issues an 'ambigous call' error on Linux.
+
+2002-05-07  Rodrigo Moya <rodrigo@ximian.com>
+
+	* EventDescriptor.cs: added missing constructors.
+
+	* EventDescriptorCollection.cs: fixed interface methods implementation
+
+	* IDataErrorInfo.cs:
+	* IEditableObject.cs: new interfaces.
+
+2002-05-05  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.ComponentModel/AttributeCollection.cs: added a cast to make
+	it compile.
+
+2002-05-03  Rodrigo Moya <rodrigo@ximian.com>
+
+	* AttributeCollection.cs:
+	* EventDescriptor.cs:
+	* EventDescriptorCollection.cs:
+	* ICustomTypeDescriptor.cs: new files.
+
+2002-05-01  Duncan Mak  <duncan@ximian.com>
+
+	* ListChangedType.cs: 
+	* ListChangedEventHandler.cs: 
+	* ListChangedEventArgs.cs: Added to fix build.
+
+2002-05-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* PropertyDescriptorCollection.cs: Added the IList explicit
+	implementation methods. 
+
+	lots of bug fixes to get the build to compile again.
+
+2002-05-01  Duncan Mak  <duncan@ximian.com>
+
+	* ListSortDirection.cs: EnumChecked.
+
+2002-05-01  Rodrigo Moya <rodrigo@ximian.com>
+
+	* ListSortDirection.cs: new enumeration. Please, somebody run
+	EnumCheck on it, as I don't have a windows machine.
+
+	* PropertyDescriptorCollection.cs: new class.
+
+	* ITypedList.cs:
+	* IBindingList.cs: new interfaces.
+
+2002-04-28  Duncan Mak  <duncan@ximian.com>
+
+	* CollectionChangeAction.cs: Changed enum layout to fit the MS
+	implementation. Please use EnumCheck!
+
+2002-04-28  Rodrigo Moya <rodrigo@ximian.com>
+
+	* CollectionChangeAction.cs: new enumeration.
+
+	* CategoryAttribute.cs: moved the 'return' keyword to the
+	end of the method, to avoid compilation errors on Linux for
+	all CategoryAttribute properties.
+
+2002-04-28  Rodrigo Moya <rodrigo@ximian.com>
+
+	* IListSource.cs:
+	* ISupportInitialize.cs:
+	* MarshalByValueComponent.cs: new stubs, needed for System.Data
+	compilation.
+
+	* PropertyChangedEventArgs.cs:
+	* CollectionChangeEventHandler.cs:
+	* CollectionChangeEventArgs.cs: implemented.
+
+2002-04-28  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Added error code 11001 to Win32Exception, used by Dns.c
+
+2002-04-04  Dick Porter  <dick@ximian.com>
+
+	* ISynchronizeInvoke.cs: Needed by Process
+
+2002-01-23  Dick Porter  <dick@ximian.com>
+
+	* Win32Exception.cs: implement, with support for looking up
+	runtime errors.
+
+2002-01-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* Win32Exception.cs: Add.
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* CategoryAttribute.cs, Component.cs, ComponentCollection.cs: MonoTODO.
+
+	* Container.cs, MemberDescriptor.cs, PropertyDescriptor.cs : Ditto.
+
+2001-10-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* DesignerSerializationVisibilityAttribute.cs: Implemented.
+
+	* DesignerSerializationVisibility.cs: New enumeration.
+
+	* LocalizableAttribute.cs: Implemented.
+
+	* BrowsableAttribute.cs: Implemented.
+
+	* DesignOnlyAttribute.cs: Implemented.
+
+	* DescriptionAttribute.cs: Implement.
+
+	* MemberDescriptor.cs: Implemented.
+
+	* CategoryAttribute.cs: implemented.
+
+2001-08-21  Nick Drochak <ndrochak@gol.com>
+
+	* Component.cs: Eliminated compile errors by removing redundant fields and
+	using the ISite member instead.  Also raised the Disposed event, but not
+	sure if it's correct now.  Look for FIXME in the comments.
+
+2001-08-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* EventHandlerList.cs: New file.
+
+	* Container.cs, Component.cs, IContainer.cs, IComponent.cs,
+	ComponentCollection.cs, ISite.cs: New classes
+
diff --git a/mcs/class/System/System.ComponentModel/CollectionChangeAction.cs b/mcs/class/System/System.ComponentModel/CollectionChangeAction.cs
new file mode 100644
index 00000000000..640e36e11ae
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/CollectionChangeAction.cs
@@ -0,0 +1,20 @@
+//
+// System.ComponentModel.CollectionChangeAction.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+namespace System.ComponentModel
+{
+	/// <summary>
+	/// Specifies how the collection is changed.
+	/// </summary>
+	public enum CollectionChangeAction {
+		Add = 1,
+		Remove = 2,
+		Refresh = 3
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/CollectionChangeEventArgs.cs b/mcs/class/System/System.ComponentModel/CollectionChangeEventArgs.cs
new file mode 100644
index 00000000000..6ace57b02b7
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/CollectionChangeEventArgs.cs
@@ -0,0 +1,38 @@
+//
+// System.ComponentModel.CollectionChangeEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+namespace System.ComponentModel
+{
+	/// <summary>
+	/// Provides data for the CollectionChanged event.
+	/// </summary>
+	public class CollectionChangeEventArgs : EventArgs
+	{
+		private CollectionChangeAction changeAction;
+		private object theElement;
+		
+		public CollectionChangeEventArgs (CollectionChangeAction action,
+						  object element) {
+			changeAction = action;
+			theElement = element;
+		}
+
+		public virtual CollectionChangeAction Action {
+			get {
+				return changeAction;
+			}
+		}
+
+		public virtual object Element {
+			get {
+				return theElement;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/CollectionChangeEventHandler.cs b/mcs/class/System/System.ComponentModel/CollectionChangeEventHandler.cs
new file mode 100644
index 00000000000..6194af6f11e
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/CollectionChangeEventHandler.cs
@@ -0,0 +1,14 @@
+//
+// System.ComponentModel.CollectionChangeEventHandler.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+namespace System.ComponentModel
+{
+	public delegate void CollectionChangeEventHandler (object sender,
+							   CollectionChangeEventArgs e);
+}	
diff --git a/mcs/class/System/System.ComponentModel/Component.cs b/mcs/class/System/System.ComponentModel/Component.cs
new file mode 100644
index 00000000000..78bc0139ca3
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/Component.cs
@@ -0,0 +1,132 @@
+//
+// System.ComponentModel.Component.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System.ComponentModel {
+
+	// <summary>
+	//   Component class.
+	// </summary>
+	//
+	// <remarks>
+	//   Longer description
+	// </remarks>
+	public class Component : MarshalByRefObject, IComponent, IDisposable {
+
+		EventHandlerList event_handlers;
+		ISite            mySite;
+
+		// <summary>
+		//   Component Constructor
+		// </summary>
+		public Component ()
+		{
+			event_handlers = null;
+		}
+
+		// <summary>
+		//   Get IContainer of this Component
+		// </summary>
+		public IContainer Container {
+			get {
+				return mySite.Container;
+			}
+		}
+
+		protected bool DesignMode {
+			get {
+				return mySite.DesignMode;
+			}
+		}
+
+		protected EventHandlerList Events {
+			get {
+				// Note: space vs. time tradeoff
+				// We create the object here if it's never be accessed before.  This potentially 
+				// saves space. However, we must check each time the propery is accessed to
+				// determine whether we need to create the object, which increases overhead.
+				// We could put the creation in the contructor, but that would waste space
+				// if it were never used.  However, accessing this property would be faster.
+				if (null == event_handlers)

+				{
+					event_handlers = new EventHandlerList();
+				}
+				return event_handlers;
+			}
+		}
+
+		public virtual ISite Site {
+			get {
+				return mySite;
+			}
+
+			set {
+				mySite = value;
+			}
+		}
+
+		[MonoTODO]
+		~Component()
+		{
+			// FIXME: Not sure this is correct.
+			Dispose(true);
+		}
+
+		// <summary>
+		//   Dispose resources used by this component
+		// </summary>
+		[MonoTODO]
+		public void Dispose ()
+		{
+			// FIXME: Not sure this is correct.
+			Dispose(false);
+			if (Disposed != null)
+				Disposed(this, EventArgs.Empty);
+		}
+
+		// <summary>
+		//   Controls disposal of resources used by this.
+		// </summary>
+		//
+		// <param name="release_all"> Controls which resources are released</param>
+		//
+		// <remarks>
+		//   if release_all is set to true, both managed and unmanaged
+		//   resources should be released.  If release_all is set to false,
+		//   only unmanaged resources should be disposed
+		// </remarks>
+		protected virtual void Dispose (bool release_all)
+		{
+		}
+
+		// <summary>
+		//   Implements the IServiceProvider interface
+		// </summary>
+		[MonoTODO]
+		protected virtual object GetService (Type service)
+		{
+			// FIXME: Not sure what this should do.
+			return null;
+		}
+
+		public override string ToString ()
+		{
+			if (mySite == null)
+				return GetType ().ToString ();
+			return String.Format ("{0} [{1}]", mySite.Name, GetType ().ToString ());
+		}
+		// <summary>
+		//   FIXME: Figure out this one.
+	        // </summary>
+		[MonoTODO ("Figure this out")]
+		public event EventHandler Disposed;
+	}
+	
+}
diff --git a/mcs/class/System/System.ComponentModel/ComponentCollection.cs b/mcs/class/System/System.ComponentModel/ComponentCollection.cs
new file mode 100644
index 00000000000..548a3b6e1b0
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ComponentCollection.cs
@@ -0,0 +1,61 @@
+//
+// System.ComponentModel.ComponentCollection.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Tim Coleman (tim@timcoleman.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System.Collections;
+using System.Runtime.InteropServices;
+
+namespace System.ComponentModel {
+	[ComVisible (true)]
+	public class ComponentCollection : ReadOnlyCollectionBase {
+
+		#region Constructors
+
+		[MonoTODO]
+		public ComponentCollection (IComponent[] components)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+
+		public virtual IComponent this [string name] {
+			[MonoTODO]
+			get { throw new NotImplementedException (); }
+		}
+
+		public virtual IComponent this [int index] {
+			[MonoTODO]
+			get { throw new NotImplementedException (); }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public void CopyTo (IComponent[] array, int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO ("this probably shouldn't be here.")]
+		public void Dispose ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+		
+	}
+}
+			
diff --git a/mcs/class/System/System.ComponentModel/Container.cs b/mcs/class/System/System.ComponentModel/Container.cs
new file mode 100644
index 00000000000..f1b6b58abb6
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/Container.cs
@@ -0,0 +1,159 @@
+//
+// System.ComponentModel.Container.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.ComponentModel {
+
+	// <summary>
+	//   Container class: encapsulates components.  
+	// </summary>
+	//
+	// <remarks>
+	//   
+	// </remarks>
+	public class Container : IContainer, IDisposable {
+		ComponentCollection cc;
+
+		// <summary>
+		//   Auxiliary class to support the default behaviour of CreateSite
+		// </summary>
+		//
+		// <remarks>
+		//   This is an internal class that is used to provide a
+		//   default implementation of an ISite class.  Container
+		//   is just a default implementation of IContainer, and
+		//   provides this as a way of getting started
+		// </remarks>
+		
+		class DefaultSite : ISite {
+			IComponent component;
+			IContainer container;
+			string     name;
+			
+			public DefaultSite (string name, IComponent component, IContainer container)
+			{
+				this.component = component;
+				this.container = container;
+				this.name = name;
+			}
+
+			public IComponent Component {
+				get {
+					return component;
+				}
+			}
+
+			public IContainer Container {
+				get {
+					return container;
+				}
+			}
+
+			[MonoTODO]
+			public bool DesignMode {
+				get {
+					// FIXME: should we provide a way to set
+					// this value?
+					return false;
+				}
+			}
+
+			public string Name {
+				get {
+					return name;
+				}
+
+				set {
+					name = value;
+				}
+			}
+
+			[MonoTODO]
+			public virtual object GetService (Type t)
+			{
+				// FIXME: do not know what this is supposed to do.
+				return null;
+			}
+		}
+		
+		// <summary>
+		//   Container constructor
+		// </summary>
+		public Container ()
+		{
+		}
+
+		public virtual ComponentCollection Components {
+			get {
+				return cc;
+			}
+		}
+
+		// <summary>
+		//   Adds an IComponent to the Container
+		// </summary>
+		[MonoTODO]
+		public virtual void Add (IComponent component)
+		{
+			// FIXME: Add this component to the ComponentCollection.cc
+		}
+
+		// <summary>
+		//   Adds an IComponent to the Container.  With a name binding.
+		// </summary>
+		[MonoTODO]
+		public virtual void Add (IComponent component, string name)
+		{
+			// FIXME: Add this component to the ComponentCollection.cc
+		}
+
+		// <summary>
+		//   Returns an ISite for a component.
+		// <summary>
+		protected virtual ISite CreateSite (IComponent component, string name)
+		{
+			return new DefaultSite (name, component, this);
+		}
+
+		public void Dispose ()
+		{
+			Dispose (true);
+			GC.SuppressFinalize (this);
+		}
+
+		bool disposed = false;
+		
+		protected virtual void Dispose (bool release_all)
+		{
+			if (disposed)
+				return;
+
+			if (release_all){
+				cc.Dispose ();
+				cc = null;
+			}
+
+			disposed = true;
+		}
+
+		[MonoTODO]
+		protected virtual object GetService (Type service)
+		{
+			// FIXME: Not clear what GetService does.
+			
+			return null;
+		}
+
+		[MonoTODO]
+		public virtual void Remove (IComponent component)
+		{
+			// FIXME: Add this component to the ComponentCollection.cc
+		}
+	}
+	
+}
diff --git a/mcs/class/System/System.ComponentModel/DefaultEventAttribute.cs b/mcs/class/System/System.ComponentModel/DefaultEventAttribute.cs
new file mode 100644
index 00000000000..29495b6fb1d
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/DefaultEventAttribute.cs
@@ -0,0 +1,43 @@
+//
+// System.ComponentModel.DefaultEventAttribute
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+
+namespace System.ComponentModel
+{
+	[AttributeUsage(AttributeTargets.Class)]
+	public sealed class DefaultEventAttribute : Attribute
+	{
+		private string eventName;
+
+		public DefaultEventAttribute (string name)
+		{
+			eventName = name;
+		}
+
+		public string Name
+		{
+			get { return eventName; }
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is DefaultEventAttribute))
+				return false;
+
+			return (((DefaultEventAttribute) o).eventName == eventName);
+		}
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.ComponentModel/DefaultPropertyAttribute.cs b/mcs/class/System/System.ComponentModel/DefaultPropertyAttribute.cs
new file mode 100644
index 00000000000..0e4b3c351f3
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/DefaultPropertyAttribute.cs
@@ -0,0 +1,43 @@
+//
+// System.ComponentModel.DefaultPropertyAttribute
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+
+namespace System.ComponentModel
+{
+	[AttributeUsage(AttributeTargets.Class)]
+	public sealed class DefaultPropertyAttribute : Attribute
+	{
+		private string property_name;
+
+		public DefaultPropertyAttribute (string name)
+		{
+			property_name = name;
+		}
+
+		public string Name
+		{
+			get { return property_name; }
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is DefaultPropertyAttribute))
+				return false;
+
+			return (((DefaultPropertyAttribute) o).Name == property_name);
+		}
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.ComponentModel/DefaultValueAttribute.cs b/mcs/class/System/System.ComponentModel/DefaultValueAttribute.cs
new file mode 100755
index 00000000000..43dfae241ec
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/DefaultValueAttribute.cs
@@ -0,0 +1,133 @@
+using System;

+

+namespace System.ComponentModel

+{

+	/// <summary>

+	/// Specifies the default value for a property.

+	/// </summary>

+

+	[MonoTODO("Needs testing. DefaultValueAttribute(System.Type type, string value) is not implemented. Value has no description.")]

+	[AttributeUsage(AttributeTargets.Parameter)]

+	public sealed class DefaultValueAttribute : Attribute

+	{

+

+		private object defaultValue;

+

+		/// <summary>

+		/// FIXME: Summary description for Value.

+		/// </summary>

+		public object Value

+		{

+			get 

+			{

+				return defaultValue;

+			}

+		}

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class.

+		/// </summary>

+		/// <param name="value">An System.Object that represents the default value.</param>

+		public DefaultValueAttribute(object value)

+		{

+			defaultValue = value;

+		}

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class using a System.Boolean value.

+		/// </summary>

+		/// <param name="value">An System.Boolean that represents the default value.</param>

+		public DefaultValueAttribute(bool value)

+		{

+			defaultValue = value;

+		}

+

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class using an 8-bit unsigned integer.

+		/// </summary>

+		/// <param name="value">An 8-bit unsigned integer that is the default value.</param>

+		public DefaultValueAttribute(byte value)

+		{

+			defaultValue = value;

+		}

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class using a Unicode character.

+		/// </summary>

+		/// <param name="value">A Unicode character that is the default value.</param>

+		public DefaultValueAttribute(char value)

+		{

+			defaultValue = value;

+		}

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class using a double-precision floating point number.

+		/// </summary>

+		/// <param name="value">A double-precision floating point number that is the default value.</param>

+		public DefaultValueAttribute(double value)

+		{

+			defaultValue = value;

+		}

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class using a 32-bit signed integer.

+		/// </summary>

+		/// <param name="value">A 32-bit signed integer that is the default value.</param>

+		public DefaultValueAttribute(int value)

+		{

+			defaultValue = value;

+		}

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class using a 64-bit signed integer.

+		/// </summary>

+		/// <param name="value">A 64-bit signed integer that is the default value.</param>

+		public DefaultValueAttribute(long value)

+		{

+			defaultValue = value;

+		}

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class using a 16-bit signed integer.

+		/// </summary>

+		/// <param name="value">A 16-bit signed integer that is the default value.</param>

+		public DefaultValueAttribute(short value)

+		{

+			defaultValue = value;

+		}

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class using a single-precision floating point number.

+		/// </summary>

+		/// <param name="value">A single-precision floating point number that is the default value.</param>

+		public DefaultValueAttribute(System.Single value)

+		{

+			defaultValue = value;

+		}

+

+		/// <summary>	

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class using a System.String.

+		/// </summary>

+		/// <param name="value">A System.String that is the default value.</param>

+		public DefaultValueAttribute(string value)

+		{

+			defaultValue = value;

+		}

+

+		/*

+		/// <summary>	

+		/// Initializes a new instance of the System.ComponentModel.DefaultValueAttribute class, converting the specified value to the specified type, and using an invariant culture as the translation context.

+		/// </summary>

+		/// <param name="type">A System.Type that represents the type to convert the value to.</param>

+		/// <param name="value">A System.String that can be converted to the type using the System.ComponentModel.TypeConverter for the type and the U.S. English culture.</param>

+		public DefaultValueAttribute(System.Type type, string value)

+		{

+			//FIXME

+			throw new NotImplementedException(); 

+		}

+		*/

+	}

+

+}

+

diff --git a/mcs/class/System/System.ComponentModel/DerivedPropertyDescriptor.cs b/mcs/class/System/System.ComponentModel/DerivedPropertyDescriptor.cs
new file mode 100644
index 00000000000..8e111139731
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/DerivedPropertyDescriptor.cs
@@ -0,0 +1,80 @@
+//
+// System.ComponentModel.DerivedPropertyDescriptor
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Reflection;
+
+namespace System.ComponentModel
+{
+	class DerivedPropertyDescriptor : PropertyDescriptor
+	{
+		bool readOnly;
+		Type componentType;
+		Type propertyType;
+		PropertyInfo prop;
+
+		protected DerivedPropertyDescriptor (string name, Attribute [] attrs)
+			: base (name, attrs)
+		{
+		}
+
+		public DerivedPropertyDescriptor (string name, Attribute [] attrs, int dummy)
+			: this (name, attrs)
+		{
+		}
+
+		public void SetReadOnly (bool value)
+		{
+			readOnly = value;
+		}
+		
+		public void SetComponentType (Type type)
+		{
+			componentType = type;
+		}
+
+		public void SetPropertyType (Type type)
+		{
+			propertyType = type;
+		}
+
+		public override object GetValue (object component)
+		{
+			if (prop == null)
+				prop = componentType.GetProperty (Name);
+
+			return prop.GetValue (component, null);
+		}
+
+		public override Type ComponentType
+		{
+			get {
+				return componentType;
+			}
+
+		}
+
+		public override bool IsReadOnly
+		{
+			get {
+				return readOnly;
+				
+			}
+
+		}
+
+		public override Type PropertyType
+		{
+			get {
+				return propertyType;
+			}
+
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.ComponentModel/DescriptionAttribute.cs b/mcs/class/System/System.ComponentModel/DescriptionAttribute.cs
new file mode 100755
index 00000000000..03e6f411d78
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/DescriptionAttribute.cs
@@ -0,0 +1,46 @@
+//
+// System.ComponentModel.DescriptionAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+namespace System.ComponentModel {
+
+	[AttributeUsage (AttributeTargets.Property | AttributeTargets.Event)]
+	public class DescriptionAttribute : Attribute {
+		string desc;
+			
+		public DescriptionAttribute (string name)
+		{
+			desc = name;
+		}
+
+		public DescriptionAttribute ()
+		{
+			desc = "";
+		}
+
+		public virtual string Description {
+			get {
+				return DescriptionValue;
+			}
+		}
+
+		//
+		// Notice that the default Description implementation uses this by default
+		//
+		protected string DescriptionValue {
+			get {
+				return desc;
+			}
+
+			set {
+				desc = value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/DesignOnlyAttribute.cs b/mcs/class/System/System.ComponentModel/DesignOnlyAttribute.cs
new file mode 100755
index 00000000000..81b39db62f1
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/DesignOnlyAttribute.cs
@@ -0,0 +1,37 @@
+//
+// System.ComponentModel.DesignOnlyAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+namespace System.ComponentModel {
+
+	[AttributeUsage (AttributeTargets.Property)]
+	public sealed class DesignOnlyAttribute : Attribute {
+		bool design_only;
+		
+		public static readonly DesignOnlyAttribute No;
+		public static readonly DesignOnlyAttribute Yes;
+
+		static DesignOnlyAttribute ()
+		{
+			No = new DesignOnlyAttribute (false);
+			Yes = new DesignOnlyAttribute (false);
+		}
+		
+		public DesignOnlyAttribute (bool design_only)
+		{
+			this.design_only = design_only;
+		}
+
+		public bool IsDesignOnly {
+			get {
+				return design_only;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/DesignerSerializationVisibility.cs b/mcs/class/System/System.ComponentModel/DesignerSerializationVisibility.cs
new file mode 100755
index 00000000000..d4291a842c8
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/DesignerSerializationVisibility.cs
@@ -0,0 +1,16 @@
+//
+// System.ComponentModel.DesignerSerializationVisibility.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+namespace System.ComponentModel {
+
+	public enum DesignerSerializationVisibility {
+		Hidden, Visible, Content
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/DesignerSerializationVisibilityAttribute.cs b/mcs/class/System/System.ComponentModel/DesignerSerializationVisibilityAttribute.cs
new file mode 100755
index 00000000000..fd2fffec348
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/DesignerSerializationVisibilityAttribute.cs
@@ -0,0 +1,42 @@
+//
+// System.ComponentModel.DesignerSerializationVisibilityAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+namespace System.ComponentModel {
+
+	[AttributeUsage (AttributeTargets.Property)]
+	public sealed class DesignerSerializationVisibilityAttribute : Attribute {
+		DesignerSerializationVisibility visibility;
+
+		static DesignerSerializationVisibilityAttribute ()
+		{
+			Content = new DesignerSerializationVisibilityAttribute (
+				DesignerSerializationVisibility.Content);
+			Hidden = new DesignerSerializationVisibilityAttribute (
+				DesignerSerializationVisibility.Hidden);
+			Visible = new DesignerSerializationVisibilityAttribute (
+				DesignerSerializationVisibility.Visible);
+		}
+		
+		public DesignerSerializationVisibilityAttribute (DesignerSerializationVisibility vis)
+		{
+			visibility = vis;
+		}
+
+		public static readonly DesignerSerializationVisibilityAttribute Content;
+		public static readonly DesignerSerializationVisibilityAttribute Hidden;
+		public static readonly DesignerSerializationVisibilityAttribute Visible;
+
+		public DesignerSerializationVisibility Visibility {
+			get {
+				return visibility;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/EditorBrowsableAttribute.cs b/mcs/class/System/System.ComponentModel/EditorBrowsableAttribute.cs
new file mode 100755
index 00000000000..912cdb13eed
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/EditorBrowsableAttribute.cs
@@ -0,0 +1,53 @@
+using System;

+

+namespace System.ComponentModel

+{

+

+	/// <summary>

+	/// Specifies that a property or method is viewable in an editor. This class cannot be inherited.

+	/// </summary>

+	[MonoTODO("Missing description for State. Only minimal testing.")]

+	[AttributeUsage(

+		AttributeTargets.Class|

+		AttributeTargets.Constructor|

+		AttributeTargets.Delegate|

+		AttributeTargets.Enum|

+		AttributeTargets.Event|

+		AttributeTargets.Field|

+		AttributeTargets.Interface|

+		AttributeTargets.Method|

+		AttributeTargets.Property|

+		AttributeTargets.Struct)]

+	public sealed class EditorBrowsableAttribute : Attribute

+	{

+		private System.ComponentModel.EditorBrowsableState state;

+

+		/// <summary>

+		/// FIXME: Summary description for State.

+		/// </summary>

+		public System.ComponentModel.EditorBrowsableState State

+		{

+			get 

+			{

+				return state;

+			}

+		}

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.EditorBrowsableAttribute class with an System.ComponentModel.EditorBrowsableState.

+		/// </summary>

+		/// <param name="state">The System.ComponentModel.EditorBrowsableState to set System.ComponentModel.EditorBrowsableAttribute.State to.</param>

+		public EditorBrowsableAttribute(System.ComponentModel.EditorBrowsableState state)

+		{

+			this.state = state;

+		}

+

+		/// <summary>

+		/// Initializes a new instance of the System.ComponentModel.EditorBrowsableAttribute class with an System.ComponentModel.EditorBrowsableState == System.ComponentModel.EditorBrowsableState.Always.

+		/// </summary>

+		public EditorBrowsableAttribute()

+		{

+			this.state = System.ComponentModel.EditorBrowsableState.Always; 

+		}

+	}

+}

diff --git a/mcs/class/System/System.ComponentModel/EditorBrowsableState.cs b/mcs/class/System/System.ComponentModel/EditorBrowsableState.cs
new file mode 100755
index 00000000000..eab0d651bb8
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/EditorBrowsableState.cs
@@ -0,0 +1,34 @@
+//

+// ProjectData.cs

+//

+// Author:

+//   Martin Adoue (martin@cwanet.com)

+//

+// (C) 2002 Martin Adoue

+//

+

+using System;

+

+namespace System.ComponentModel

+{

+

+	/// <summary>

+	/// Specifies the browsable state of a property or method from within an editor.

+	/// </summary>

+	public enum EditorBrowsableState 

+	{

+		/// <summary>

+		/// The property or method is always browsable from within an editor.

+		/// </summary>

+		Always = 0,

+		/// <summary>

+		/// The property or method is never browsable from within an editor.

+		/// </summary>

+		Never = 1,

+		/// <summary>

+		/// The property or method is a feature that only advanced users should see. An editor can either show or hide such properties.

+		/// </summary>

+		Advanced = 2

+	}

+

+}

diff --git a/mcs/class/System/System.ComponentModel/EnumConverter.cs b/mcs/class/System/System.ComponentModel/EnumConverter.cs
new file mode 100644
index 00000000000..46f43f41757
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/EnumConverter.cs
@@ -0,0 +1,92 @@
+//
+// System.ComponentModel.EnumConverter
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Globalization;
+
+namespace System.ComponentModel
+{
+	public class EnumConverter : TypeConverter
+	{
+		private Type type;
+		private StandardValuesCollection stdValues;
+
+		public EnumConverter (Type type)
+		{
+			this.type = type;
+		}
+
+		[MonoTODO]
+		public override bool CanConvertTo (ITypeDescriptorContext context, Type destinationType)
+		{
+			return base.CanConvertTo (context, destinationType);
+		}
+
+		[MonoTODO]
+		public override object ConvertTo (ITypeDescriptorContext context,
+						  CultureInfo culture,
+						  object value,
+						  Type destinationType)
+		{
+			if (destinationType == typeof (string))
+				return value.ToString ();
+			return base.ConvertTo (context, culture, value, destinationType);
+		}
+
+		public override bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
+		{
+			if (sourceType == typeof (string))
+				return true;
+			return base.CanConvertFrom (context, sourceType);
+		}
+
+		public override object ConvertFrom (ITypeDescriptorContext context,
+						    CultureInfo culture,
+						    object value)
+		{
+			string val = value as string;
+			if (val == null)
+				return base.ConvertFrom(context, culture, value);
+
+			string [] subValues = val.Split (new char [] {','});
+					
+			long longResult = 0;
+			foreach (string s in subValues)
+				longResult |= (long) Enum.Parse (type, s, true);
+
+			return Enum.ToObject (type, longResult);
+		}
+
+		public override bool IsValid (ITypeDescriptorContext context, object value)
+		{
+			return Enum.IsDefined (type, value);
+		}
+
+		public override bool GetStandardValuesSupported (ITypeDescriptorContext context)
+		{
+			return true;
+		}
+
+		public override bool GetStandardValuesExclusive (ITypeDescriptorContext context)
+		{
+			return !(type.IsDefined (typeof (FlagsAttribute), false));
+		}
+
+		public override StandardValuesCollection GetStandardValues (ITypeDescriptorContext context)
+		{
+			if (stdValues == null) {
+				Array values = Enum.GetValues (type);
+				Array.Sort (values);
+				stdValues = new StandardValuesCollection (values);
+			}
+			return stdValues;
+		}
+	}
+
+}
+
diff --git a/mcs/class/System/System.ComponentModel/EventDescriptor.cs b/mcs/class/System/System.ComponentModel/EventDescriptor.cs
new file mode 100644
index 00000000000..211c07dac9d
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/EventDescriptor.cs
@@ -0,0 +1,26 @@
+//
+// System.ComponentModel.EventDescriptor.cs
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc. 2002
+//
+
+namespace System.ComponentModel
+{
+	public abstract class EventDescriptor : MemberDescriptor
+	{
+		protected EventDescriptor (MemberDescriptor desc) : base (desc)
+		{
+		}
+
+		protected EventDescriptor (MemberDescriptor desc, Attribute[] attrs) : base (desc, attrs)
+		{
+		}
+
+		protected EventDescriptor(string str, Attribute[] attrs) : base (str, attrs)
+		{
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/EventDescriptorCollection.cs b/mcs/class/System/System.ComponentModel/EventDescriptorCollection.cs
new file mode 100644
index 00000000000..67ab149d9ea
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/EventDescriptorCollection.cs
@@ -0,0 +1,167 @@
+//
+// System.ComponentModel.EventDescriptorCollection.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System.ComponentModel
+{
+	public class EventDescriptorCollection : IList, ICollection, IEnumerable
+	{
+		private ArrayList eventList;
+		
+		public static readonly EventDescriptorCollection Empty;
+		
+		public EventDescriptorCollection (EventDescriptor[] events) {
+			for (int i = 0; i < events.Length; i++)
+				this.Add (events[i]);
+		}
+
+		public int Add (EventDescriptor value) {
+			return eventList.Add (value);
+		}
+
+		public void Clear () {
+			eventList.Clear ();
+		}
+
+		public bool Contains (EventDescriptor value) {
+			return eventList.Contains (value);
+		}
+
+		[MonoTODO]
+		public virtual EventDescriptor Find (string name, bool ignoreCase) {
+			throw new NotImplementedException ();
+		}
+
+		public IEnumerator GetEnumerator () {
+			return eventList.GetEnumerator ();
+		}
+
+		public int IndexOf (EventDescriptor value) {
+			return eventList.IndexOf (value);
+		}
+
+		public void Insert (int index, EventDescriptor value) {
+			eventList.Insert (index, value);
+		}
+
+		public void Remove (EventDescriptor value) {
+			eventList.Remove (value);
+		}
+
+		public void RemoveAt (int index) {
+			eventList.RemoveAt (index);
+		}
+
+
+		[MonoTODO]
+		public virtual EventDescriptorCollection Sort () {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual EventDescriptorCollection Sort (IComparer comparer) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual EventDescriptorCollection Sort (string[] order) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual EventDescriptorCollection Sort (string[] order,
+							       IComparer comparer) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected virtual EventDescriptorCollection InternalSort (IComparer comparer) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected virtual EventDescriptorCollection InternalSort (string[] order) {
+			throw new NotImplementedException ();
+		}
+		
+		public int Count {
+			get {
+				return eventList.Count;
+			}
+		}
+
+		 public virtual EventDescriptor this[string name] {
+			 [MonoTODO]
+			 get {
+				 throw new NotImplementedException ();
+			 }
+		 }
+
+		public virtual EventDescriptor this[int index] {
+			get {
+				return (EventDescriptor) eventList[index];
+			}
+		}
+
+		// IList methods
+
+		int IList.Add (object value) {
+			return Add ((EventDescriptor) value);
+		}
+
+		bool IList.Contains (object value) {
+			return Contains ((EventDescriptor) value);
+		}
+
+		int IList.IndexOf (object value) {
+			return IndexOf ((EventDescriptor) value);
+		}
+
+		void IList.Insert (int index, object value) {
+			Insert (index, (EventDescriptor) value);
+		}
+
+		void IList.Remove (object value) {
+			Remove ((EventDescriptor) value);
+		}
+
+		bool IList.IsFixedSize {
+			get { return false; }
+		}
+
+		bool IList.IsReadOnly {
+			get { return false; }
+		}
+
+		object IList.this[int index] {
+			get {
+				return eventList[index];
+			}
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		// ICollection methods
+
+		[MonoTODO]
+		void ICollection.CopyTo (Array array, int index) {
+			throw new NotImplementedException ();
+		}
+
+		bool ICollection.IsSynchronized {
+			get { return false; }
+		}
+
+		object ICollection.SyncRoot {
+			get { return null; }
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/EventHandlerList.cs b/mcs/class/System/System.ComponentModel/EventHandlerList.cs
new file mode 100644
index 00000000000..dba45525db5
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/EventHandlerList.cs
@@ -0,0 +1,64 @@
+//
+// System.ComponentModel.EventHandlerList.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Collections;
+
+namespace System.ComponentModel {
+
+	// <summary>
+	//   List of Event delegates.
+	// </summary>
+	//
+	// <remarks>
+	//   Longer description
+	// </remarks>
+	public sealed class EventHandlerList : IDisposable {
+		Hashtable table;
+		
+		public EventHandlerList ()
+		{
+		}
+
+		public Delegate this [object key] {
+			get {
+				if (table == null)
+					return null;
+
+				return (Delegate) table [key];
+			}
+
+			set {
+				if (table == null)
+					table = new Hashtable ();
+
+				table.Add (key, value);
+			}
+		}
+
+		public void AddHandler (object key, Delegate value)
+		{
+			if (table == null)
+				table = new Hashtable ();
+
+			table.Add (key, value);
+		}
+
+		public void RemoveHandler (object key, Delegate value)
+		{
+			table.Remove (key);
+		}
+
+		public void Dispose ()
+		{
+			table = null;
+		}
+	}
+	
+}
diff --git a/mcs/class/System/System.ComponentModel/ExpandableObjectConverter.cs b/mcs/class/System/System.ComponentModel/ExpandableObjectConverter.cs
new file mode 100644
index 00000000000..1db14cd4fdd
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ExpandableObjectConverter.cs
@@ -0,0 +1,41 @@
+//
+// System.ComponentModel.ExpandableObjectConverter.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+
+using System;
+
+namespace System.ComponentModel {
+	public class ExpandableObjectConverter : TypeConverter {
+
+		#region Constructors
+
+		[MonoTODO]
+		public ExpandableObjectConverter ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Constructors
+
+		#region Methods
+
+		[MonoTODO]
+		public override PropertyDescriptorCollection GetProperties (ITypeDescriptorContext context, object value, Attribute[] attributes)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool GetPropertiesSupported (ITypeDescriptorContext context)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/IBindingList.cs b/mcs/class/System/System.ComponentModel/IBindingList.cs
new file mode 100644
index 00000000000..8de1b197f17
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/IBindingList.cs
@@ -0,0 +1,69 @@
+//
+// System.ComponentModel.IBindingList.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+using System.Collections;
+
+namespace System.ComponentModel
+{
+	/// <summary>
+	/// Provides the features required to support both complex and simple scenarios when binding to a data source.
+	/// </summary>
+	public interface IBindingList : IList, ICollection, IEnumerable
+	{
+		void AddIndex (PropertyDescriptor property);
+
+		object AddNew ();
+
+		void ApplySort (PropertyDescriptor property, ListSortDirection direction);
+
+		int Find (PropertyDescriptor property, object key);
+
+		void RemoveIndex (PropertyDescriptor property);
+
+		void RemoveSort ();
+		
+		bool AllowEdit {
+			get;
+		}
+
+		bool AllowNew {
+			get;
+		}
+
+		bool AllowRemove {
+			get;
+		}
+
+		bool IsSorted {
+			get;
+		}
+
+		ListSortDirection SortDirection {
+			get;
+		}
+
+		PropertyDescriptor SortProperty {
+			get;
+		}
+
+		bool SupportsChangeNotification {
+			get;
+		}
+
+		bool SupportsSearching {
+			get;
+		}
+
+		bool SupportsSorting {
+			get;
+		}
+
+		event ListChangedEventHandler ListChanged;
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/IComponent.cs b/mcs/class/System/System.ComponentModel/IComponent.cs
new file mode 100644
index 00000000000..347bd2beed7
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/IComponent.cs
@@ -0,0 +1,22 @@
+//
+// System.ComponentModel.IComponent.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System.ComponentModel {
+
+	public interface IComponent : IDisposable {
+
+		ISite Site {
+			get; set;
+		}
+
+		event EventHandler Disposed;
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/IContainer.cs b/mcs/class/System/System.ComponentModel/IContainer.cs
new file mode 100644
index 00000000000..fb5d34f1ab6
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/IContainer.cs
@@ -0,0 +1,24 @@
+//
+// System.ComponentModel.IContainer.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.ComponentModel {
+
+	public interface IContainer {
+
+		ComponentCollection Components {
+			get;
+		}
+
+		void Add (IComponent component);
+
+		void Add (IComponent component, string name);
+
+		void Remove (IComponent component);
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/ICustomTypeDescriptor.cs b/mcs/class/System/System.ComponentModel/ICustomTypeDescriptor.cs
new file mode 100644
index 00000000000..c716355a601
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ICustomTypeDescriptor.cs
@@ -0,0 +1,38 @@
+//
+// System.ComponentModel.ICustomTypeDescriptor.cs
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+
+namespace System.ComponentModel
+{
+	public interface ICustomTypeDescriptor
+	{
+		AttributeCollection GetAttributes();
+
+		string GetClassName();
+
+		string GetComponentName();
+
+		TypeConverter GetConverter();
+
+		EventDescriptor GetDefaultEvent();
+
+		PropertyDescriptor GetDefaultProperty();
+
+		object GetEditor(Type editorBaseType);
+
+		EventDescriptorCollection GetEvents();
+
+		EventDescriptorCollection GetEvents(Attribute[] arr);
+
+		PropertyDescriptorCollection GetProperties();
+
+		PropertyDescriptorCollection GetProperties(Attribute[] arr);
+
+		object GetPropertyOwner(PropertyDescriptor pd);
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/IDataErrorInfo.cs b/mcs/class/System/System.ComponentModel/IDataErrorInfo.cs
new file mode 100644
index 00000000000..a37627d07ca
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/IDataErrorInfo.cs
@@ -0,0 +1,18 @@
+//
+// System.ComponentModel.IDataErrorInfo.cs
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+
+namespace System.ComponentModel
+{
+	public interface IDataErrorInfo
+	{
+		string Error { get; }
+
+		string this[string columnName] { get; }
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/IEditableObject.cs b/mcs/class/System/System.ComponentModel/IEditableObject.cs
new file mode 100644
index 00000000000..40e4d105c17
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/IEditableObject.cs
@@ -0,0 +1,20 @@
+//
+// System.ComponentModel.IEditableObject.cs
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+
+namespace System.ComponentModel
+{
+	public interface IEditableObject
+	{
+		void BeginEdit();
+
+		void CancelEdit();
+
+		void EndEdit();
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/IListSource.cs b/mcs/class/System/System.ComponentModel/IListSource.cs
new file mode 100644
index 00000000000..f0d27cfec9b
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/IListSource.cs
@@ -0,0 +1,23 @@
+//
+// System.ComponentModel.IListSource.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+using System.Collections;
+
+namespace System.ComponentModel
+{
+	/// <summary>
+	/// Provides functionality to an object to return a list that can be bound to a data source.
+	/// </summary>
+	public interface IListSource
+	{
+		IList GetList ();
+		
+		bool ContainsListCollection { get; }
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/ISite.cs b/mcs/class/System/System.ComponentModel/ISite.cs
new file mode 100644
index 00000000000..dca26662b6f
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ISite.cs
@@ -0,0 +1,23 @@
+//
+// System.ComponentModel.Component.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System.ComponentModel {
+
+	public interface ISite : IServiceProvider {
+		IComponent Component { get; }
+
+		IContainer Container { get; }
+
+		bool DesignMode { get; }
+
+		string Name { get; set; }
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/ISupportInitialize.cs b/mcs/class/System/System.ComponentModel/ISupportInitialize.cs
new file mode 100644
index 00000000000..d5b15f6ee6d
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ISupportInitialize.cs
@@ -0,0 +1,23 @@
+//
+// System.ComponentModel.ISupportInitialize.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+namespace System.ComponentModel
+{
+	/// <summary>
+	/// Specifies that this object supports a simple, transacted notification for batch initialization.
+	/// </summary>
+	public interface ISupportInitialize
+	{
+		void BeginInit ();
+
+		void EndInit ();
+	}
+		
+}
+	
diff --git a/mcs/class/System/System.ComponentModel/ISynchronizeInvoke.cs b/mcs/class/System/System.ComponentModel/ISynchronizeInvoke.cs
new file mode 100755
index 00000000000..e5cad4e0739
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ISynchronizeInvoke.cs
@@ -0,0 +1,26 @@
+//
+// System.ComponentModel.ISynchronizeInvoke.cs
+//
+// Authors:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System.ComponentModel 
+{
+	public interface ISynchronizeInvoke 
+	{
+		bool InvokeRequired {
+			get;
+		}
+
+		IAsyncResult BeginInvoke(Delegate method, object[] args);
+
+		object EndInvoke(IAsyncResult result);
+
+		object Invoke(Delegate method, object[] args);
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/ITypeDescriptorContext.cs b/mcs/class/System/System.ComponentModel/ITypeDescriptorContext.cs
new file mode 100644
index 00000000000..1da741e37f2
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ITypeDescriptorContext.cs
@@ -0,0 +1,29 @@
+//
+// System.ComponentModel.ITypeDescriptorContext
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+
+namespace System.ComponentModel
+{
+
+public interface ITypeDescriptorContext : IServiceProvider
+{
+	IContainer Container { get; }
+
+	object Instance { get; }
+
+	PropertyDescriptor PropertyDescriptor { get; }
+
+	void OnComponentChanged ();
+
+	bool OnComponentChanging ();
+}
+
+}
+
diff --git a/mcs/class/System/System.ComponentModel/ITypedList.cs b/mcs/class/System/System.ComponentModel/ITypedList.cs
new file mode 100644
index 00000000000..8ecdeeef7eb
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ITypedList.cs
@@ -0,0 +1,24 @@
+//
+// System.ComponentModel.ITypedList.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+using System.Collections;
+
+namespace System.ComponentModel
+{
+	/// <summary>
+	/// Provides functionality to discover the schema for a bindable list, where the properties available for binding differ from the public properties of the object to bind to. For instance, using a DataView object that represents a customer table, you want to bind to the properties on the customer object that the DataView represents, not the properties of the DataView.
+	/// </summary>
+	public interface ITypedList
+	{
+		PropertyDescriptorCollection GetItemProperties (
+			PropertyDescriptor[] listAccessors);
+
+		string GetListName (PropertyDescriptor[] listAccessors);
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/ListChangedEventArgs.cs b/mcs/class/System/System.ComponentModel/ListChangedEventArgs.cs
new file mode 100755
index 00000000000..6004144b880
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ListChangedEventArgs.cs
@@ -0,0 +1,53 @@
+//
+// System.ComponentModel.ListChangedEventArgs.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System.ComponentModel;
+
+namespace System.ComponentModel {
+	public class ListChangedEventArgs : EventArgs
+	{
+	
+		ListChangedType changedType;
+		int oldIndex;
+		int newIndex;
+	
+		public ListChangedEventArgs (ListChangedType listChangedType,
+					     int newIndex)
+		{
+			this.changedType = listChangedType;
+			this.newIndex = newIndex;
+		}
+	
+		[MonoTODO]
+		public ListChangedEventArgs (ListChangedType listChangedType,
+					     PropertyDescriptor propDesc)
+		{
+			this.changedType = listChangedType;
+		}
+	
+		public ListChangedEventArgs (ListChangedType listChangedType,
+					     int newIndex, int oldIndex)
+		{
+			this.changedType = listChangedType;
+			this.newIndex = newIndex;
+			this.oldIndex = oldIndex;
+		}
+		 
+		public ListChangedType ListChangedType {
+			get { return changedType; }
+		}
+	
+		public int OldIndex {
+			get { return oldIndex; }
+		}
+	
+		public int NewIndex {
+			get { return newIndex; }
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/ListChangedEventHandler.cs b/mcs/class/System/System.ComponentModel/ListChangedEventHandler.cs
new file mode 100755
index 00000000000..02f5065b886
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ListChangedEventHandler.cs
@@ -0,0 +1,15 @@
+//
+// System.ComponentModel.ListChangedEventHandler.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+// 
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.ComponentModel {
+	[Serializable]
+	public delegate void ListChangedEventHandler(object sender, 
+					     ListChangedEventArgs e);
+}						    
diff --git a/mcs/class/System/System.ComponentModel/ListChangedType.cs b/mcs/class/System/System.ComponentModel/ListChangedType.cs
new file mode 100755
index 00000000000..b7eff8aa1fe
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ListChangedType.cs
@@ -0,0 +1,23 @@
+//
+// System.ComponentModel.ListChangedType.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+// 
+
+namespace System.ComponentModel {
+	public enum ListChangedType {
+		Reset = 0,
+		ItemAdded = 1,
+		ItemDeleted = 2,
+		ItemMoved = 3,
+		ItemChanged = 4,
+		PropertyDescriptorAdded = 5,
+		PropertyDescriptorDeleted = 6,
+		PropertyDescriptorChanged = 7
+	}
+}
+			
+			
+
diff --git a/mcs/class/System/System.ComponentModel/ListSortDirection.cs b/mcs/class/System/System.ComponentModel/ListSortDirection.cs
new file mode 100644
index 00000000000..b58a39a4170
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ListSortDirection.cs
@@ -0,0 +1,20 @@
+//
+// System.ComponentModel.ListSortDirection.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Rodrigo Moya, 2002
+//
+
+namespace System.ComponentModel
+{
+	/// <summary>
+	/// Specifies the direction of a sort operation.
+	/// </summary>
+	[Serializable]
+	public enum ListSortDirection {
+		Ascending = 0,
+		Descending = 1
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/LocalizableAttribute.cs b/mcs/class/System/System.ComponentModel/LocalizableAttribute.cs
new file mode 100755
index 00000000000..b5425ef8e53
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/LocalizableAttribute.cs
@@ -0,0 +1,40 @@
+//
+// System.ComponentModel.LocalizableAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+using System;
+
+namespace System.ComponentModel {
+
+	[AttributeUsage (AttributeTargets.Property)]
+	public sealed class LocalizableAttribute : Attribute {
+		bool localizable;
+		
+		public static readonly LocalizableAttribute No;
+		public static readonly LocalizableAttribute Yes;
+
+		static LocalizableAttribute ()
+		{
+			No = new LocalizableAttribute (false);
+			Yes = new LocalizableAttribute (false);
+		}
+		
+		public LocalizableAttribute (bool localizable)
+		{
+			this.localizable = localizable;
+		}
+
+		public bool IsLocalizable {
+			get {
+				return localizable;
+			}
+		}
+		
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/MarshalByValueComponent.cs b/mcs/class/System/System.ComponentModel/MarshalByValueComponent.cs
new file mode 100644
index 00000000000..22141db2343
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/MarshalByValueComponent.cs
@@ -0,0 +1,78 @@
+//
+// System.ComponentModel.MarshalByValueComponent.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+using System;
+
+namespace System.ComponentModel
+{
+	/// <summary>
+	/// Implements IComponent and provides the base implementation for remotable components that are marshaled by value (a copy of the serialized object is passed).
+	/// </summary>
+	public class MarshalByValueComponent : IComponent, IDisposable, IServiceProvider
+	{
+		[MonoTODO]
+		public MarshalByValueComponent () {
+			// TODO: need to implement for some component model
+			//        but do not throw a NotImplementedException
+		}
+
+		[MonoTODO]
+		public void Dispose () {
+			// TODO: need to do, but do not
+			// throw a NotImplementedException
+		}
+
+		[MonoTODO]
+		protected virtual void Dispose (bool disposing) {
+		}
+
+		[MonoTODO]
+		public virtual object GetService (Type service) {
+			return null;
+		}
+		
+		public virtual IContainer Container {
+			[MonoTODO]
+			get {
+				return null;
+			}
+		}
+
+		public virtual bool DesignMode {
+			[MonoTODO]
+			get {
+				return false;
+			}
+		}
+
+		public virtual ISite Site {
+			[MonoTODO]
+			get {
+				// TODO: need to get Site
+				return null;
+			}
+
+			[MonoTODO]
+			set {
+				// TODO: need to set Site
+			}
+		}
+
+		protected EventHandlerList Events {
+			[MonoTODO]
+			get {
+				// TODO: need to do, but do not
+				// throw a NotImplementedException
+				return null;
+			}
+		}
+		
+		public event EventHandler Disposed;
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/MemberDescriptor.cs b/mcs/class/System/System.ComponentModel/MemberDescriptor.cs
new file mode 100755
index 00000000000..3250a8a07b8
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/MemberDescriptor.cs
@@ -0,0 +1,120 @@
+//
+// System.ComponentModel.MemberDescriptor.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.ComponentModel {
+
+	public abstract class MemberDescriptor {
+		string name;
+		Attribute [] attrs;
+		AttributeCollection attrCollection;
+		
+		protected MemberDescriptor (string name, Attribute [] attrs)
+		{
+			this.name = name;
+			this.attrs = attrs;
+		}
+
+		protected MemberDescriptor (MemberDescriptor reference, Attribute [] attrs)
+		{
+			name = reference.name;
+			this.attrs = attrs;
+		}
+
+		protected MemberDescriptor (string name)
+		{
+			this.name = name;
+		}
+
+		protected MemberDescriptor (MemberDescriptor reference)
+		{
+			name = reference.name;
+			attrs = reference.attrs;
+		}
+
+		protected virtual Attribute [] AttributeArray {
+			get {
+				return attrs;
+			}
+
+			set {
+				attrs = value;
+			}
+		}
+
+		public virtual AttributeCollection Attributes
+		{
+			get {
+				if (attrCollection == null)
+					attrCollection = new AttributeCollection (attrs);
+				return attrCollection;
+			}
+		}
+			
+		public virtual string Category {
+			get {
+				return ((CategoryAttribute) Attributes [typeof (CategoryAttribute)]).Category;
+			}
+		}
+
+		public virtual string Description {
+			get {
+				foreach (Attribute attr in attrs){
+					if (attr is DescriptionAttribute)
+						return ((DescriptionAttribute) attr).Description;
+				}
+
+				return "";
+			}
+		}
+
+		public virtual bool DesignTimeOnly {
+			get {
+				foreach (Attribute attr in attrs){
+					if (attr is DesignOnlyAttribute)
+						return ((DesignOnlyAttribute) attr).IsDesignOnly;
+				}
+
+				return false;
+			}
+		}
+
+		//
+		// FIXME: Is there any difference between DisplayName and Name?
+		//
+		[MonoTODO ("Does this diff from Name ?")]
+		public virtual string DisplayName {
+			get {
+				return name;
+			}
+		}
+
+		public virtual string Name {
+			get {
+				return name;
+			}
+		}
+
+		public virtual bool IsBrowsable {
+			get {
+				foreach (Attribute attr in attrs){
+					if (attr is BrowsableAttribute)
+						return ((BrowsableAttribute) attr).Browsable;
+				}
+
+				return false;
+			}
+		}
+
+		protected virtual int NameHashCode {
+			get {
+				return name.GetHashCode ();
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/NotifyParentPropertyAttribute.cs b/mcs/class/System/System.ComponentModel/NotifyParentPropertyAttribute.cs
new file mode 100755
index 00000000000..327dee061c1
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/NotifyParentPropertyAttribute.cs
@@ -0,0 +1,64 @@
+//
+// System.ComponentModel.NotifyParentPropertyAttribute.cs
+//
+// Author:
+//   Tim Coleman (tim@timcoleman.com)
+//
+// Copyright (C) Tim Coleman, 2002
+//
+//
+
+namespace System.ComponentModel {
+	[AttributeUsage (AttributeTargets.Property)]
+	public sealed class NotifyParentPropertyAttribute : Attribute {
+
+		#region Fields
+
+		bool notifyParent;
+
+		#endregion // Fields
+		
+		public static readonly NotifyParentPropertyAttribute No = new NotifyParentPropertyAttribute (false);
+		public static readonly NotifyParentPropertyAttribute Yes = new NotifyParentPropertyAttribute (true);
+		public static readonly NotifyParentPropertyAttribute Default = new NotifyParentPropertyAttribute (false);
+
+		#region Constructors
+
+		public NotifyParentPropertyAttribute (bool notifyParent)
+		{
+			this.notifyParent = notifyParent;
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+
+		public bool NotifyParent {
+			get { return notifyParent; }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public override bool Equals (object obj)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsDefaultAttribute ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/PropertyChangedEventArgs.cs b/mcs/class/System/System.ComponentModel/PropertyChangedEventArgs.cs
new file mode 100644
index 00000000000..d456a807a7b
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/PropertyChangedEventArgs.cs
@@ -0,0 +1,29 @@
+//
+// System.ComponentModel.PropertyChangedEventArgs.cs
+//
+// Author:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc
+//
+
+namespace System.ComponentModel
+{
+	/// <summary>
+	/// Provides data for the PropertyChanged event.
+	/// </summary>
+	public class PropertyChangedEventArgs : EventArgs
+	{
+		private string propertyName;
+		
+		public PropertyChangedEventArgs (string name) {
+			propertyName = name;
+		}
+
+		public virtual string PropertyName {
+			get {
+				return propertyName;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/PropertyDescriptor.cs b/mcs/class/System/System.ComponentModel/PropertyDescriptor.cs
new file mode 100755
index 00000000000..5e87e082eb1
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/PropertyDescriptor.cs
@@ -0,0 +1,113 @@
+//
+// System.ComponentModel.PropertyDescriptor.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Collections;
+
+namespace System.ComponentModel {
+
+	public abstract class PropertyDescriptor : MemberDescriptor {
+
+		protected PropertyDescriptor (MemberDescriptor reference)
+			: base (reference)
+		{
+		}
+
+		protected PropertyDescriptor (MemberDescriptor reference, Attribute [] attrs)
+			: base (reference, attrs)
+		{
+		}
+
+		protected PropertyDescriptor (string name, Attribute [] attrs)
+			: base (name, attrs)
+		{
+		}
+
+		public abstract Type ComponentType { get; }
+
+		public virtual TypeConverter Converter {
+			get {
+				return TypeDescriptor.GetConverter (PropertyType);
+			}
+		}
+
+		public virtual bool IsLocalizable {
+			get {
+				foreach (Attribute attr in AttributeArray){
+					if (attr is LocalizableAttribute){
+						return ((LocalizableAttribute) attr).IsLocalizable;
+					}
+				}
+
+				return false;
+			}
+		}
+
+		public abstract bool IsReadOnly { get; }
+
+		public abstract Type PropertyType { get; }
+
+		public DesignerSerializationVisibility SerializationVisibility {
+			get {
+				foreach (Attribute attr in AttributeArray){
+					if (attr is DesignerSerializationVisibilityAttribute){
+						DesignerSerializationVisibilityAttribute a;
+
+						a = (DesignerSerializationVisibilityAttribute) attr;
+
+						return a.Visibility;
+					}
+				}
+
+				//
+				// Is this a good default if we cant find the property?
+				//
+				return DesignerSerializationVisibility.Hidden;
+			}
+		}
+
+		Hashtable notifiers;
+
+		public virtual void AddValueChanged (object component, EventHandler handler)
+		{
+			EventHandler component_notifiers;
+			
+			if (component == null)
+				throw new ArgumentNullException ("component");
+
+			if (handler == null)
+				throw new ArgumentNullException ("handler");
+
+			if (notifiers == null)
+				notifiers = new Hashtable ();
+
+			component_notifiers = (EventHandler) notifiers [component];
+
+			if (component_notifiers != null)
+				component_notifiers += handler;
+			else
+				notifiers [component] = handler;
+		}
+		
+		protected virtual void OnValueChanged (object component, EventArgs e)
+		{
+			if (notifiers == null)
+				return;
+
+			EventHandler component_notifiers = (EventHandler) notifiers [component];
+
+			if (component_notifiers == null)
+				return;
+
+			component_notifiers (component, e);
+		}
+
+		public abstract object GetValue (object component);
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/PropertyDescriptorCollection.cs b/mcs/class/System/System.ComponentModel/PropertyDescriptorCollection.cs
new file mode 100644
index 00000000000..0c230abf66c
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/PropertyDescriptorCollection.cs
@@ -0,0 +1,283 @@
+//

+// System.ComponentModel.PropertyDescriptorCollection.cs

+//

+// Authors:

+// 	Rodrigo Moya (rodrigo@ximian.com)

+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)

+//

+// (C) Rodrigo Moya, 2002

+// (c) 2002 Ximian, Inc. (http://www.ximian.com)

+//

+

+using System.Collections;

+

+namespace System.ComponentModel

+{

+	/// <summary>

+	/// Represents a collection of PropertyDescriptor objects.

+	/// </summary>

+	public class PropertyDescriptorCollection : IList, ICollection, IEnumerable, IDictionary

+	{

+		public static readonly PropertyDescriptorCollection Empty =

+						new PropertyDescriptorCollection (null);

+

+		ArrayList properties;

+		bool readOnly;

+

+		public PropertyDescriptorCollection (PropertyDescriptor[] properties)

+		{

+			this.properties = new ArrayList ();

+			if (properties == null)

+				return;

+

+			foreach (PropertyDescriptor p in properties)

+				this.properties.Add (p);

+		}

+

+		public int Add (PropertyDescriptor value)

+		{

+			properties.Add (value);

+			return properties.Count - 1;

+		}

+

+		int IList.Add (object value)

+		{

+			return Add ((PropertyDescriptor) value);

+		}

+

+		void IDictionary.Add (object key, object value)

+		{

+			Add ((PropertyDescriptor) value);

+		}

+		

+		public void Clear ()

+		{

+			properties.Clear ();

+		}

+

+		void IList.Clear ()

+		{

+			Clear ();

+		}

+

+		void IDictionary.Clear ()

+		{

+			Clear ();

+		}

+

+		public bool Contains (PropertyDescriptor value)

+		{

+			return properties.Contains (value);

+		}

+

+		bool IList.Contains (object value)

+		{

+			return Contains ((PropertyDescriptor) value);

+		}

+

+		bool IDictionary.Contains (object value)

+		{

+			return Contains ((PropertyDescriptor) value);

+		}

+

+		public void CopyTo (Array array, int index)

+		{

+			properties.CopyTo (array, index);

+		}

+

+		public virtual PropertyDescriptor Find (string name, bool ignoreCase)

+		{

+			foreach (PropertyDescriptor p in properties) {

+				if (0 == String.Compare (name, p.Name, ignoreCase))

+					return p;

+			}

+			return null;

+		}

+

+		public virtual IEnumerator GetEnumerator ()

+		{

+			return properties.GetEnumerator ();

+		}

+

+		[MonoTODO]

+		IDictionaryEnumerator IDictionary.GetEnumerator ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		public int IndexOf (PropertyDescriptor value)

+		{

+			return properties.IndexOf (value);

+		}

+

+		int IList.IndexOf (object value)

+		{

+			return IndexOf ((PropertyDescriptor) value);

+		}

+

+		[MonoTODO]

+		public void Insert (int index, PropertyDescriptor value)

+		{

+			throw new NotImplementedException ();

+		}

+

+		void IList.Insert (int index, object value)

+		{

+			Insert (index, (PropertyDescriptor) value);

+		}

+

+		public void Remove (PropertyDescriptor value)

+		{

+			properties.Remove (value);

+		}

+

+		void IDictionary.Remove (object value)

+		{

+			Remove ((PropertyDescriptor) value);

+		}

+

+		void IList.Remove (object value)

+		{

+			Remove ((PropertyDescriptor) value);

+		}

+

+		public void RemoveAt (int index)

+		{

+			properties.RemoveAt (index);

+		}

+

+		void IList.RemoveAt (int index)

+		{

+			RemoveAt (index);

+		}

+

+		[MonoTODO]

+		public virtual PropertyDescriptorCollection Sort ()

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public virtual PropertyDescriptorCollection Sort (IComparer ic)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected void InternalSort (IComparer ic)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		protected void InternalSort (string [] order)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		bool IDictionary.IsFixedSize

+		{

+			get {

+				return !readOnly;

+			}

+		}

+

+		bool IList.IsFixedSize

+		{

+			get {

+				return !readOnly;

+			}

+		}

+

+		public bool IsReadOnly

+		{

+			get {

+				return readOnly;

+			}

+		}

+

+		public bool IsSynchronized

+		{

+			get {

+				return false;

+			}

+		}

+

+		public int Count

+		{

+			get {

+				return properties.Count;

+			}

+		}

+

+		object ICollection.SyncRoot

+		{

+			get {

+				return null;

+			}

+		}

+		

+		ICollection IDictionary.Keys

+		{

+			get {

+				string [] keys = new string [properties.Count];

+				int i = 0;

+				foreach (PropertyDescriptor p in properties)

+					keys [i++] = p.Name;

+				return keys;

+			}

+		}

+		

+		ICollection IDictionary.Values

+		{

+			get {

+				return (ICollection) properties.Clone ();

+			}

+		}

+		

+		object IDictionary.this [object key]

+		{

+			get {

+				if (!(key is string))

+					return null;

+				return this [(string) key];

+			}

+			set {

+				if (!(key is string) || (value as PropertyDescriptor) == null)

+					throw new ArgumentException ();

+

+				int idx = properties.IndexOf (value);

+				if (idx == -1)

+					Add ((PropertyDescriptor) value);

+				else

+					properties [idx] = value;

+

+			}

+		}

+		public virtual PropertyDescriptor this [string s]

+		{

+			get {

+				return Find (s, false);

+			}

+		}

+

+		object IList.this [int index]

+		{

+			get {

+				return properties [index];

+			}

+

+			set {

+				properties [index] = value;

+			}

+		}

+

+		public virtual PropertyDescriptor this [int index]

+		{

+			get {

+				return (PropertyDescriptor) properties [index];

+			}

+		}

+	}

+}

+

diff --git a/mcs/class/System/System.ComponentModel/ReadOnlyAttribute.cs b/mcs/class/System/System.ComponentModel/ReadOnlyAttribute.cs
new file mode 100755
index 00000000000..e04ad8bbb94
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ReadOnlyAttribute.cs
@@ -0,0 +1,54 @@
+//
+// ReadOnlyAttribute.cs
+//
+// Author:
+//   Chris J Breisch (cjbreisch@altavista.net)
+//
+// (C) 2002 Chris J Breisch
+//
+namespace System.ComponentModel {
+	[AttributeUsage (AttributeTargets.All)]
+	sealed public class ReadOnlyAttribute : Attribute {
+		bool read_only;
+		
+		public static readonly ReadOnlyAttribute No;
+		public static readonly ReadOnlyAttribute Yes;
+		public static readonly ReadOnlyAttribute Default;
+
+		static ReadOnlyAttribute ()
+		{
+			No = new ReadOnlyAttribute (false);
+			Yes = new ReadOnlyAttribute (true);
+			Default = new ReadOnlyAttribute (false);
+		}
+		
+		public ReadOnlyAttribute (bool read_only)
+		{
+			this.read_only = read_only;
+		}
+
+		public bool IsReadOnly {
+			get {
+				return read_only;
+			}
+		}
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is ReadOnlyAttribute))
+				return false;
+
+			return (((ReadOnlyAttribute) o).read_only == read_only);
+		}
+
+		public override bool IsDefaultAttribute ()
+		{
+			return Equals (Default);
+		}
+	}
+}
diff --git a/mcs/class/System/System.ComponentModel/RecommendedAsConfigurableAttribute.cs b/mcs/class/System/System.ComponentModel/RecommendedAsConfigurableAttribute.cs
new file mode 100644
index 00000000000..1e3cd7be92f
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/RecommendedAsConfigurableAttribute.cs
@@ -0,0 +1,65 @@
+//

+// System.ComponentModel.RecommendedAsConfigurableAttribute

+//

+// Authors:

+//	Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.ComponentModel {

+	[AttributeUsage (AttributeTargets.Property)]

+	public class RecommendedAsConfigurableAttribute : Attribute {

+

+		#region Fields

+

+		bool recommendedAsConfigurable;

+

+		public static readonly RecommendedAsConfigurableAttribute Default = new RecommendedAsConfigurableAttribute (false);

+		public static readonly RecommendedAsConfigurableAttribute No = new RecommendedAsConfigurableAttribute (false);

+		public static readonly RecommendedAsConfigurableAttribute Yes = new RecommendedAsConfigurableAttribute (true);

+

+		#endregion // Fields

+		

+		#region Constructors

+

+		public RecommendedAsConfigurableAttribute (bool recommendedAsConfigurable)

+		{

+			this.recommendedAsConfigurable = recommendedAsConfigurable;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool RecommendedAsConfigurable {

+			get { return recommendedAsConfigurable; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+

+		public override bool Equals (object obj)

+		{

+			if (!(obj is RecommendedAsConfigurableAttribute))

+				return false;

+

+			return ((RecommendedAsConfigurableAttribute) obj).RecommendedAsConfigurable == recommendedAsConfigurable;

+		}

+

+		[MonoTODO]

+		public override int GetHashCode ()

+		{

+			throw new NotImplementedException (); 

+		}

+

+		public override bool IsDefaultAttribute ()

+		{

+			return (!recommendedAsConfigurable);

+		}

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System/System.ComponentModel/RefreshEventArgs.cs b/mcs/class/System/System.ComponentModel/RefreshEventArgs.cs
new file mode 100644
index 00000000000..87de49b4592
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/RefreshEventArgs.cs
@@ -0,0 +1,44 @@
+//
+// System.ComponentModel.RefreshEventArgs
+//
+// Author:
+//   Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+
+namespace System.ComponentModel
+{
+public class RefreshEventArgs : EventArgs
+{
+	private object component;
+	private Type type;
+
+	public RefreshEventArgs (object componentChanged)
+	{
+		if (componentChanged == null)
+			throw new ArgumentNullException ("componentChanged");
+
+		component = componentChanged;
+		type = component.GetType ();
+	}
+
+	public RefreshEventArgs (Type typeChanged)
+	{
+		type = typeChanged;
+	}
+
+	public object ComponentChanged
+	{
+		get { return component; }
+	}
+
+	public Type TypeChanged
+	{
+		get { return type; }
+	}
+}
+}
+
diff --git a/mcs/class/System/System.ComponentModel/RefreshEventHandler.cs b/mcs/class/System/System.ComponentModel/RefreshEventHandler.cs
new file mode 100644
index 00000000000..d14b5988000
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/RefreshEventHandler.cs
@@ -0,0 +1,14 @@
+//

+// System.ComponentModel.RefreshEventHandler

+//

+// Author:

+//   Gonzalo Paniagua Javier (gonzalo@ximian.com)

+//

+// (C) 2002 Ximian, Inc (http://www.ximian.com)

+//

+

+namespace System.ComponentModel

+{

+	public delegate void RefreshEventHandler (RefreshEventArgs e);

+}

+

diff --git a/mcs/class/System/System.ComponentModel/StringConverter.cs b/mcs/class/System/System.ComponentModel/StringConverter.cs
new file mode 100644
index 00000000000..351a00ea11c
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/StringConverter.cs
@@ -0,0 +1,41 @@
+//
+// System.ComponentModel.StringConverter
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+using System.Globalization;
+
+namespace System.ComponentModel {
+
+public class StringConverter : TypeConverter
+{
+	public StringConverter ()
+	{
+	}
+
+	public override bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
+	{
+		if (sourceType == typeof(String))
+			return true;
+
+		return base.CanConvertFrom (context, sourceType);
+	}
+
+	public override object ConvertFrom (ITypeDescriptorContext context, CultureInfo culture, object value)
+	{
+		if (value == null)
+			return String.Empty;
+
+		if (value is string)
+			return (string) value;
+
+		return base.ConvertFrom (context, culture, value);
+	}
+}
+}
+
diff --git a/mcs/class/System/System.ComponentModel/ToolboxItemAttribute.cs b/mcs/class/System/System.ComponentModel/ToolboxItemAttribute.cs
new file mode 100644
index 00000000000..c350c735b2d
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/ToolboxItemAttribute.cs
@@ -0,0 +1,82 @@
+//
+// System.ComponentModel.ToolboxItemAttribute
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+
+namespace System.ComponentModel
+{
+	[AttributeUsage(AttributeTargets.All)]
+	public class ToolboxItemAttribute : Attribute
+	{
+		private static string defaultItemType = "System.Drawing.Design.ToolboxItem,System.Drawing";
+
+		public static readonly ToolboxItemAttribute Default = new ToolboxItemAttribute (defaultItemType);
+		public static readonly ToolboxItemAttribute None = new ToolboxItemAttribute (false);
+
+		private Type itemType;
+		private string itemTypeName;
+
+		public ToolboxItemAttribute (bool defaultType)
+		{
+			if (defaultType)
+				itemTypeName = defaultItemType;
+		}
+
+		public ToolboxItemAttribute (string toolboxItemName)
+		{
+			itemTypeName = toolboxItemName;
+		}
+
+		public ToolboxItemAttribute (Type toolboxItemType)
+		{
+			itemType = toolboxItemType;
+		}
+
+		public Type ToolboxItemType
+		{
+			get {
+				if (itemType == null && itemTypeName != null)
+					itemType = Type.GetType (itemTypeName);
+				return itemType;
+			}
+		}
+		
+		public string ToolboxItemTypeName
+		{
+			get {
+				if (itemTypeName == null) {
+					if (itemType == null)
+						return "";
+					itemTypeName = itemType.AssemblyQualifiedName;
+				}
+
+				return itemTypeName;
+			}
+		}
+		
+		public override bool Equals (object o)
+		{
+			if (!(o is ToolboxItemAttribute))
+				return false;
+
+			return (((ToolboxItemAttribute) o).ToolboxItemTypeName == ToolboxItemTypeName);
+		}
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+
+		public override bool IsDefaultAttribute ()
+		{
+			return Equals (Default);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.ComponentModel/TypeConverter.cs b/mcs/class/System/System.ComponentModel/TypeConverter.cs
new file mode 100755
index 00000000000..ced08223f99
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/TypeConverter.cs
@@ -0,0 +1,318 @@
+//
+// System.ComponentModel.TypeConverter
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+using System.Collections;
+using System.Globalization;
+
+namespace System.ComponentModel {
+
+public class TypeConverter
+{
+	public TypeConverter ()
+	{
+	}
+
+	public bool CanConvertFrom (Type sourceType)
+	{
+		return CanConvertFrom (null, sourceType);
+	}
+	
+	[MonoTODO]
+	public virtual bool CanConvertFrom (ITypeDescriptorContext context, Type sourceType)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public bool CanConvertTo (Type destinationType)
+	{
+		return CanConvertTo (null, destinationType);
+	}
+	
+	public virtual bool CanConvertTo (ITypeDescriptorContext context, Type destinationType)
+	{
+		return (destinationType == typeof (string));
+	}
+
+	public object ConvertFrom (object o)
+	{
+		return ConvertFrom (null, CultureInfo.CurrentCulture, o);
+	}
+
+	[MonoTODO]
+	public virtual object ConvertFrom (ITypeDescriptorContext context, CultureInfo culture, object value)
+	{
+		throw new NotImplementedException ();
+	}
+	
+	public object ConvertFromInvariantString (string text)
+	{
+		return ConvertFromInvariantString (null, text); 
+	}
+
+	[MonoTODO]
+	public object ConvertFromInvariantString (ITypeDescriptorContext context, string text)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public object ConvertFromString (string s)
+	{
+		return ConvertFrom (s);
+	}
+
+	public object ConvertFromString (ITypeDescriptorContext context, string text)
+	{
+		return ConvertFromString (context, CultureInfo.CurrentCulture, text);
+	}
+
+	[MonoTODO]
+	public object ConvertFromString (ITypeDescriptorContext context, CultureInfo culture, string text)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public object ConvertTo (object value, Type destinationType)
+	{
+		return ConvertTo (null, null, value, destinationType);
+	}
+
+	public virtual object ConvertTo (ITypeDescriptorContext context,
+					 CultureInfo culture,
+					 object value,
+					 Type destinationType)
+	{
+		// context? culture?
+		if (destinationType == null)
+			throw new ArgumentNullException ("destinationType");
+
+		if (destinationType == typeof (string)) {
+			if (value != null)
+				return value.ToString();
+			return String.Empty;
+		}
+
+		throw new NotSupportedException ("Conversion not supported");
+	}
+
+	public string ConvertToInvariantString (object value)
+	{
+		return ConvertToInvariantString (null, value);
+	}
+
+	[MonoTODO]
+	public string ConvertToInvariantString (ITypeDescriptorContext context, object value)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public string ConvertToString (object value)
+	{
+		return (string) ConvertTo (null, CultureInfo.CurrentCulture, value, typeof (string));
+	}
+
+	public string ConvertToString (ITypeDescriptorContext context, object value)
+	{
+		return (string) ConvertTo (context, CultureInfo.CurrentCulture, value, typeof (string));
+	}
+
+	public string ConvertToString (ITypeDescriptorContext context, CultureInfo culture, object value)
+	{
+		return (string) ConvertTo (context, culture, value, typeof (string));
+	}
+
+	[MonoTODO]
+	public object CreateInstance (IDictionary propertyValues)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	protected Exception GetConvertFromException (object value)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	protected Exception GetConvertToException (object value, Type destinationType)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public virtual object CreateInstance (ITypeDescriptorContext context, IDictionary propertyValues)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public bool GetCreateInstanceSupported ()
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public virtual bool GetCreateInstanceSupported (ITypeDescriptorContext context)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public PropertyDescriptorCollection GetProperties (object value)
+	{
+		return GetProperties (null, value);
+	}
+
+	public PropertyDescriptorCollection GetProperties (ITypeDescriptorContext context, object value)
+	{
+		return GetProperties (context, value, null);
+	}
+
+	public virtual PropertyDescriptorCollection GetProperties (ITypeDescriptorContext context,
+								   object value,
+								   Attribute[] attributes)
+	{
+		return null;
+	}
+
+	public bool GetPropertiesSupported ()
+	{
+		return GetPropertiesSupported (null);
+	}
+
+	public virtual bool GetPropertiesSupported (ITypeDescriptorContext context)
+	{
+		return false;
+	}
+
+	public ICollection GetStandardValues ()
+	{
+		return GetStandardValues (null);
+	}
+
+	public virtual StandardValuesCollection GetStandardValues (ITypeDescriptorContext context)
+	{
+		return null;
+	}
+
+	public bool GetStandardValuesExclusive ()
+	{
+		return GetStandardValuesExclusive (null);
+	}
+
+	public virtual bool GetStandardValuesExclusive (ITypeDescriptorContext context)
+	{
+		return false;
+	}
+
+	public bool GetStandardValuesSupported ()
+	{
+		return GetStandardValuesSupported (null);
+	}
+
+	public virtual bool GetStandardValuesSupported (ITypeDescriptorContext context)
+	{
+		return false;
+	}
+
+	public bool IsValid (object value)
+	{
+		return IsValid (null, value);
+	}
+
+	public virtual bool IsValid (ITypeDescriptorContext context, object value)
+	{
+		return true;
+	}
+
+	public class StandardValuesCollection : ICollection, IEnumerable
+	{
+		private ICollection values;
+		
+		public StandardValuesCollection (ICollection values)
+		{
+			this.values = values;
+		}
+
+		public void CopyTo (Array array, int index)
+		{
+			values.CopyTo (array, index);
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return values.GetEnumerator ();
+		}
+
+		bool ICollection.IsSynchronized
+		{
+			get { return false; }
+		}
+
+		object ICollection.SyncRoot
+		{
+			get { return null; }
+		}
+
+		int ICollection.Count
+		{
+			get { return this.Count; }
+		}
+
+		public int Count
+		{
+			get { return values.Count; }
+		}
+
+		public object this [int index]
+		{
+			get { return ((IList) values) [index]; }
+		}
+	}
+
+	protected abstract class SimplePropertyDescriptor : PropertyDescriptor
+	{
+		private Type componentType;
+		private Type propertyType;
+		
+		public SimplePropertyDescriptor (Type componentType,
+						 string name,
+						 Type propertyType) :
+			this (componentType, name, propertyType, new Attribute [0])
+		{
+		}
+
+		public SimplePropertyDescriptor (Type componentType,
+						 string name,
+						 Type propertyType,
+						 Attribute [] attributes) : base (name, attributes)
+		{
+			this.componentType = componentType;
+			this.propertyType = propertyType;
+		}
+
+		public override Type ComponentType
+		{
+			get { return componentType; }
+		}
+
+		public override Type PropertyType
+		{
+			get { return propertyType; }
+		}
+
+		public override bool IsReadOnly
+		{
+			get {
+				return Attributes.Contains (ReadOnlyAttribute.Yes);
+			}
+		}
+	}
+}
+}
+
diff --git a/mcs/class/System/System.ComponentModel/TypeConverterAttribute.cs b/mcs/class/System/System.ComponentModel/TypeConverterAttribute.cs
new file mode 100644
index 00000000000..21c283db5fd
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/TypeConverterAttribute.cs
@@ -0,0 +1,53 @@
+//

+// System.ComponentModel.TypeConverterAttribute

+//

+// Authors:

+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)

+//

+// (C) 2002 Ximian, Inc (http://www.ximian.com)

+//

+

+using System;

+

+namespace System.ComponentModel {

+

+[AttributeUsage(AttributeTargets.All)]

+public sealed class TypeConverterAttribute : Attribute

+{

+	private string converter_type;

+

+	public TypeConverterAttribute ()

+	{

+		converter_type = "";

+	}

+

+	public TypeConverterAttribute (string typeName)

+	{

+		converter_type = typeName;

+	}

+

+	public TypeConverterAttribute (Type type)

+	{

+		converter_type = type.AssemblyQualifiedName;

+	}

+

+	public override bool Equals (object obj)

+	{

+		if (!(obj is TypeConverterAttribute))

+			return false;

+

+		return ((TypeConverterAttribute) obj).ConverterTypeName == converter_type;

+	}

+

+	public override int GetHashCode ()

+	{

+		return converter_type.GetHashCode ();

+	}

+

+	public string ConverterTypeName

+	{

+		get { return converter_type; }

+	}

+}

+}

+

diff --git a/mcs/class/System/System.ComponentModel/TypeDescriptor.cs b/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
new file mode 100644
index 00000000000..61ae5af86a0
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/TypeDescriptor.cs
@@ -0,0 +1,344 @@
+//
+// System.ComponentModel.TypeDescriptor
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+namespace System.ComponentModel
+{
+
+public sealed class TypeDescriptor
+{
+	private static readonly string creatingDefaultConverters = "creatingDefaultConverters";
+	private static Hashtable defaultConverters;
+
+	private TypeDescriptor ()
+	{
+	}
+
+	[MonoTODO]
+	public static void AddEditorTable (Type editorBaseType, Hashtable table)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static EventDescriptor CreateEvent (Type componentType,
+						   string name,
+						   Type type,
+						   Attribute [] attributes)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static EventDescriptor CreateEvent (Type componentType,
+						   EventDescriptor oldEventDescriptor,
+						   Attribute [] attributes)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static PropertyDescriptor CreateProperty (Type componentType,
+							 string name,
+							 Type type,
+							 Attribute [] attributes)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static PropertyDescriptor CreateProperty (Type componentType,
+							 PropertyDescriptor oldPropertyDescriptor,
+							 Attribute [] attributes)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public static AttributeCollection GetAttributes (Type componentType)
+	{
+		if (componentType == null)
+			return AttributeCollection.Empty;
+
+		object [] atts = componentType.GetCustomAttributes (false);
+		return new AttributeCollection ((Attribute []) atts);
+	}
+
+	public static AttributeCollection GetAttributes (object component)
+	{
+		return GetAttributes (component.GetType ());
+	}
+
+	[MonoTODO]
+	public static AttributeCollection GetAttributes (object component, bool noCustomTypeDesc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static string GetClassName (object component)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static string GetClassName (object component, bool noCustomTypeDesc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static string GetComponentName (object component)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static string GetComponentName (object component, bool noCustomTypeDesc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public static TypeConverter GetConverter (object component)
+	{
+		return GetConverter (component.GetType ());
+	}
+
+	[MonoTODO]
+	public static TypeConverter GetConverter (object component, bool noCustomTypeDesc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	private static Hashtable DefaultConverters
+	{
+		get {
+			if (defaultConverters != null)
+				return defaultConverters;
+
+			lock (creatingDefaultConverters) {
+				if (defaultConverters != null)
+					return defaultConverters;
+				
+				//FIXME: add more converters as we implement them
+				defaultConverters = new Hashtable ();
+				defaultConverters.Add (typeof (Enum), typeof (EnumConverter));
+				defaultConverters.Add (typeof (string), typeof (StringConverter));
+			}
+			return defaultConverters;
+		}
+	}
+	
+	public static TypeConverter GetConverter (Type type)
+	{
+		Type t = DefaultConverters [type] as Type;
+		if (t == null && type.IsEnum)
+			t = (Type) DefaultConverters [typeof (Enum)];
+
+		string converter_name = null;
+		if (t == null) {
+			object [] attrs = type.GetCustomAttributes (false);
+			foreach (object o in attrs){
+				if (o is TypeConverterAttribute){
+					TypeConverterAttribute tc = (TypeConverterAttribute) o;
+					converter_name = tc.ConverterTypeName;
+					break;
+				}
+			}
+		} else {
+			converter_name = t.FullName;
+		}
+		
+
+		if (converter_name == null)
+			return null;
+
+		object converter = null;
+		try {
+			converter = Activator.CreateInstance (Type.GetType (converter_name));
+		} catch (Exception){
+		}
+	
+		return converter as TypeConverter;
+	}
+
+	[MonoTODO]
+	public static EventDescriptor GetDefaultEvent (object component)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static EventDescriptor GetDefaultEvent (Type componentType)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static EventDescriptor GetDefaultEvent (object component, bool noCustomTypeDesc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static PropertyDescriptor GetDefaultProperty (object component)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static PropertyDescriptor GetDefaultProperty (Type componentType)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static PropertyDescriptor GetDefaultProperty (object component, bool noCustomTypeDesc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static object GetEditor (object component, Type editorBaseType)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static object GetEditor (Type componentType, Type editorBaseType)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static object GetEditor (object component, Type editorBaseType, bool noCustomTypeDesc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static EventDescriptorCollection GetEvents (object component)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static EventDescriptorCollection GetEvents (Type componentType)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static EventDescriptorCollection GetEvents (object component, Attribute [] attributes)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static EventDescriptorCollection GetEvents (object component, bool noCustomTypeDesc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static EventDescriptorCollection GetEvents (Type componentType, Attribute [] attributes)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static EventDescriptorCollection GetEvents (object component,
+							   Attribute [] attributes,
+							   bool noCustomTypeDesc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public static PropertyDescriptorCollection GetProperties (object component)
+	{
+		return GetProperties (component, false);
+	}
+
+	[MonoTODO]
+	public static PropertyDescriptorCollection GetProperties (Type componentType)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static PropertyDescriptorCollection GetProperties (object component, Attribute [] attributes)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO("noCustomTypeDesc")]
+	public static PropertyDescriptorCollection GetProperties (object component, bool noCustomTypeDesc)
+	{
+		Type type = component.GetType ();
+		PropertyInfo [] props = type.GetProperties ();
+		DerivedPropertyDescriptor [] propsDescriptor = new DerivedPropertyDescriptor [props.Length];
+		int i = 0;
+		foreach (PropertyInfo prop in props) {
+			DerivedPropertyDescriptor propDescriptor = new DerivedPropertyDescriptor (prop.Name,
+												  null, 0);
+			propDescriptor.SetReadOnly (!prop.CanWrite);
+			propDescriptor.SetComponentType (type);
+			propDescriptor.SetPropertyType (prop.PropertyType);
+			propsDescriptor [i++] = propDescriptor;
+		}
+		
+		return new PropertyDescriptorCollection (propsDescriptor);
+	}
+
+	[MonoTODO]
+	public static PropertyDescriptorCollection GetProperties (Type componentType,
+								  Attribute [] attributes)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static PropertyDescriptorCollection GetProperties (Type componentType,
+								  Attribute [] attributes,
+								  bool noCustomTypeDesc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static void Refresh (Assembly assembly)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static void Refresh (Module module)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static void Refresh (object component)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static void Refresh (Type type)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public static event RefreshEventHandler Refreshed;
+}
+}
+
diff --git a/mcs/class/System/System.ComponentModel/Win32Exception.cs b/mcs/class/System/System.ComponentModel/Win32Exception.cs
new file mode 100755
index 00000000000..c8949e445e0
--- /dev/null
+++ b/mcs/class/System/System.ComponentModel/Win32Exception.cs
@@ -0,0 +1,118 @@
+//
+// System.ComponentModel.Win32Exceptioncs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.InteropServices;
+using System.Runtime.Serialization;
+using System.Collections;
+using System.Globalization;
+
+namespace System.ComponentModel
+{
+	[Serializable]
+	public class Win32Exception : ExternalException
+	{
+		private int native_error_code;
+		
+		public Win32Exception ()
+			: base (W32ErrorMessage(Marshal.GetLastWin32Error()),
+				Marshal.GetLastWin32Error()) {
+			native_error_code=Marshal.GetLastWin32Error();
+		}
+
+		public Win32Exception(int error)
+			: base (W32ErrorMessage(error), error) {
+			native_error_code=error;
+		}
+
+		public Win32Exception(int error, string message) 
+			: base (message, error) {
+			native_error_code=error;
+		}
+
+		protected Win32Exception(SerializationInfo info,
+					 StreamingContext context)
+			: base (info, context) {
+		}
+
+		public int NativeErrorCode {
+			get {
+				return(native_error_code);
+			}
+		}
+
+		[MonoTODO]
+		public override void GetObjectData(SerializationInfo info,
+						   StreamingContext context) {
+			if(info==null) {
+				throw new ArgumentNullException();
+			}
+
+			throw new NotImplementedException();
+		}
+
+		private static Hashtable w32_errors = new Hashtable();
+
+		/* Initialise the list of error strings */
+		static Win32Exception() {
+			/* No need to list everything, just the ones
+			 * the runtime can throw. A list of the errors
+			 * can be found in class System.IO.MonoIOError.
+			 */
+			w32_errors.Add(11001,
+				       Locale.GetText("No such host is known"));
+			w32_errors.Add(10047,
+				       Locale.GetText("AF not supported"));
+			w32_errors.Add(10043,
+				       Locale.GetText("proto no supported"));
+			w32_errors.Add(10044,
+				       Locale.GetText("socket not supproted"));
+			w32_errors.Add(10004,
+			    Locale.GetText("interrupted"));
+
+			w32_errors.Add(10013,
+			    Locale.GetText("Access denied"));
+			w32_errors.Add(11002,
+			    Locale.GetText("A temporary error occurred on an  authoritative  name  server. Try  again later."));
+			w32_errors.Add(10022,
+			    Locale.GetText("Invalid arguments"));
+			w32_errors.Add(10050,
+			    Locale.GetText("Network subsystem is down"));
+			w32_errors.Add(10051,
+			    Locale.GetText("Network is unreachable"));
+			w32_errors.Add(10061,
+			    Locale.GetText("Connection refused"));
+			w32_errors.Add(10045,
+			    Locale.GetText("Operation not supported"));
+			w32_errors.Add(10038,
+			    Locale.GetText("The descriptor is not a socket"));
+			w32_errors.Add(10055,
+			    Locale.GetText("Not enough buffer space is available"));
+			w32_errors.Add(10056,
+			    Locale.GetText("Socket is already connected"));
+			w32_errors.Add(10048,
+			    Locale.GetText("Address already in use"));
+			w32_errors.Add(10057,
+			    Locale.GetText("The socket is not connected"));
+			w32_errors.Add(10058,
+			    Locale.GetText("The socket has been shut down"));
+			w32_errors.Add(10093,
+			    Locale.GetText("Winsock not initialized"));
+		}
+
+		private static string W32ErrorMessage(int error_code) {
+			string message=(string)w32_errors[error_code];
+			
+			if(message==null) {
+				return(Locale.GetText("Some sort of w32 error occurred"));
+			} else {
+				return(message);
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.Configuration/ChangeLog b/mcs/class/System/System.Configuration/ChangeLog
new file mode 100644
index 00000000000..acc2a035a7e
--- /dev/null
+++ b/mcs/class/System/System.Configuration/ChangeLog
@@ -0,0 +1,25 @@
+2002-01-31  Duncan Mak  <duncan@ximian.com>
+
+	* ConfigurationException.cs: Rewrote most of the file and added
+	serialization bits.
+
+2002-01-06  Ravi Pratap  <ravi@ximian.com>
+
+	* ConfigurationSettings.cs, IgnoreSectionHandler.cs : MonoTODO decoration
+
+	* SingleTagSectionHandler.cs, DictionarySectionHandler.cs, 
+	NameValueSectionHandler.cs : Ditto.
+
+2001-08-28  Christopher Podurgiel <cpodurgiel@msn.com>
+	* IConfigurationSectionHandler.cs: Added reference to System.Xml.
+	
+	* SingleTagSectionHandler.cs: Added Implementation of Create() method.
+	
+	* NameValueSectionHandler.cs: Added Implementation of Create() method.
+	
+	* ConfigurationException.cs: Now returns proper message rather than "System Exception".
+
+2001-08-26  Christopher Podurgiel <cpodurgiel@msn.com>
+
+	* ConfigurationSettings.cs: No longer references the NameValueSectionHandler 	  directly.  Instead it uses System.Reflection to call the Create() method 		  for the appropriate SectionHandler as defined in the .config file.
+
diff --git a/mcs/class/System/System.Configuration/ConfigurationException.cs b/mcs/class/System/System.Configuration/ConfigurationException.cs
new file mode 100644
index 00000000000..9b23ee88352
--- /dev/null
+++ b/mcs/class/System/System.Configuration/ConfigurationException.cs
@@ -0,0 +1,132 @@
+//
+// System.Configuration.ConfigurationException.cs
+//
+// Author:
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Xml;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Configuration 
+{
+	[Serializable]
+	public class ConfigurationException : SystemException
+	{
+		// Fields		
+		string bareMessage;
+		string filename;
+		int line;
+
+		//
+		// Constructors
+		//
+		public ConfigurationException ()
+			: base (Locale.GetText ("There is an error in a configuration setting."))
+		{
+			filename = null;
+			bareMessage = Locale.GetText ("There is an error in a configuration setting.");
+			line = 0;
+		}
+		
+		public ConfigurationException (string message)
+			: base (message)
+		{
+			bareMessage = message;
+		}
+
+		protected ConfigurationException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+			filename = info.GetString ("filename");
+			line = info.GetInt32 ("line");
+		}
+
+		public ConfigurationException (string message, Exception inner)
+			: base (message, inner)
+		{
+			bareMessage = message;
+		}
+
+		public ConfigurationException (string message, XmlNode node)
+			: base (message)
+		{
+			filename = GetXmlNodeFilename(node);
+			line = GetXmlNodeLineNumber(node);
+			bareMessage = message;
+		}
+
+		public ConfigurationException (string message, Exception inner, XmlNode node)
+			: base (message, inner)
+		{
+			filename = GetXmlNodeFilename (node);
+			line = GetXmlNodeLineNumber (node);
+			bareMessage = message;
+		}
+
+		public ConfigurationException (string message, string filename, int line)
+			: base (message)
+		{
+			bareMessage = message;
+			this.filename = filename;
+			this.line= line;
+		}
+
+		public ConfigurationException (string message, Exception inner, string filename, int line)
+			: base (message)
+		{
+			bareMessage = message;
+			this.filename = filename;
+			this.line = line;
+		}
+		//
+		// Properties
+		//
+		public string BareMessage
+		{
+			get  { return bareMessage; }
+		}
+
+		public string Filename
+		{
+			get { return filename; }
+		}
+		
+		public int Line
+		{
+			get { return line; }
+		}
+
+		public override string Message
+		{
+			get { return filename + " " + line; }
+		}
+
+		//
+		// Methods
+		//
+		[MonoTODO]
+		// Not sure if that's the correct return value.
+		public static string GetXmlNodeFilename (XmlNode node)
+		{
+			return node.OwnerDocument.Name;
+		}
+
+		[MonoTODO]
+		public static int GetXmlNodeLineNumber (XmlNode node)
+		{
+			return 0;
+		}
+
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("filename", filename);
+			info.AddValue ("line", line);
+		}
+	}
+}
diff --git a/mcs/class/System/System.Configuration/ConfigurationSettings.cs b/mcs/class/System/System.Configuration/ConfigurationSettings.cs
new file mode 100644
index 00000000000..ba5ccf02ad0
--- /dev/null
+++ b/mcs/class/System/System.Configuration/ConfigurationSettings.cs
@@ -0,0 +1,198 @@
+//
+// System.Configuration.ConfigurationSettings.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// C) Christopher Podurgiel
+//
+
+using System;
+using System.Collections.Specialized;
+using System.Reflection;
+using System.Xml;
+using System.Xml.XPath;
+
+namespace System.Configuration
+{
+	/// <summary>
+	///		Component class.
+	/// </summary>
+	/// <remarks>
+	///		Longer description
+	/// </remarks>
+
+	public sealed class ConfigurationSettings
+	{
+
+		private static string applicationConfigFileName;
+		
+		/// <summary>
+		///		ConfigurationSettings Constructor.
+		/// </summary>
+		private ConfigurationSettings ()
+		{
+			
+		}
+
+		/// <summary>
+		///		Returns configuration settings for a user-defined configuration section.
+		/// </summary>
+		/// <param name="sectionName">The name of the configuration section that configuration settings are read from.</param>
+		/// <returns></returns>
+		public static object GetConfig(string sectionName)
+		{
+			//Create an instance of an XML Document.
+			XmlDocument ConfigurationDocument = new XmlDocument();
+
+			/*
+			 * LAMESPEC: The .config file that needs to be parsed is the name of the application, plus ".config"
+			 * ie. "Myapplication.exe.config"
+			 * The only way I could find to get the name of the application is through System.Forms.Application.ExecutablePath, this
+			 * may be an incorrect way to get this information.  It works properly on a windows machine when building an executable,
+			 * however, I'm not sure how this would work under other platforms.
+			*/
+			//Get the full path to the Applicaton Configuration File.
+			applicationConfigFileName =  "FIXME:ConfigurationSettings" + ".config";
+
+			//Try to load the XML Document.
+			try
+			{ 
+				ConfigurationDocument.Load(applicationConfigFileName);
+			}
+			catch(XmlException e)
+			{
+				//Error loading the XML Document.  Throw a ConfigurationException.
+				throw(new ConfigurationException(e.Message, applicationConfigFileName, e.LineNumber));
+			}
+
+				string sectionHandlerName = GetSectionHanderType(ConfigurationDocument, sectionName);
+			     
+				XmlNode sectionNode = ConfigurationDocument.SelectSingleNode("/configuration/" + sectionName);
+			
+			
+			
+			//If the specified sectionName is not found, then sectionNode will be null.  When calling objNVSHandler.Create(),
+			//sectionNode cannot be null.
+			 if(sectionNode == null)
+			{
+				return null;
+			}
+			
+
+			//Create a new SectionHandler

+

+			//According to the Docs provided by Microsoft, the user can create their own configuration sections, and create a custom

+			//handler class for it. The user would specify the class and its assebly in the <configSections> section.  These would be

+			//seperated by a comma.

+

+			string sectionHandlerClassName = sectionHandlerName;
+			string sectionHandlerAssemblyName = "System";

+

+			//Split the SectionHandler Class Name from the Assembly Name (if provided).

+			string[] sectionHandlerArray = sectionHandlerName.Split(new char[]{','}, 2);
+			if(sectionHandlerArray.Length == 2)
+			{
+				sectionHandlerClassName = sectionHandlerArray[0];
+				sectionHandlerAssemblyName = sectionHandlerArray[1];
+			}
+			
+			// Load the assembly to use.
+			Assembly assem = Assembly.Load(sectionHandlerAssemblyName);
+			//Get the class type.
+			Type handlerObjectType = assem.GetType(sectionHandlerClassName);
+			//Get a reference to the method "Create"
+			MethodInfo createMethod = handlerObjectType.GetMethod("Create");
+			//Create an Instance of this SectionHandler.
+			Object objSectionHandler = Activator.CreateInstance(handlerObjectType);
+
+			//define the arguments to be passed to the "Create" Method.
+			Object[] args = new Object[3];
+			args[0] = null;
+			args[1] = null;
+			args[2] = sectionNode;
+
+			object sectionHandlerCollection = createMethod.Invoke(objSectionHandler, args);
+
+			//Return the collection
+			return sectionHandlerCollection;
+
+		}
+
+
+		/// <summary>

+		///		Gets the name of the SectionHander Class that will handle this section.

+		/// </summary>

+		/// <param name="xmlDoc">An xml Configuration Document.</param>

+		/// <param name="sectionName">The name of the configuration section that configuration settings are read from.</param>

+		/// <returns>The name of the Handler Object for this configuration section, including the name if its Assembly.</returns>
+		[MonoTODO]
+		private static string GetSectionHanderType(XmlDocument xmlDoc, string sectionName)
+		{
+			//TODO: This method does not account for sectionGroups yet.
+			string handlerName = null;
+
+			//<appSettings> is a predefined configuration section. It does not have a definition
+			// in the <configSections> section, and will always be handled by the NameValueSectionHandler.
+			if(sectionName == "appSettings")
+			{
+				handlerName = "System.Configuration.NameValueSectionHandler";
+			}
+			else
+			{
+				
+				string[] sectionPathArray = sectionName.Split(new char[]{'/'});
+
+				//Build an XPath statement.
+				string xpathStatement = "/configuration/configSections";
+				for (int i=0; i < sectionPathArray.Length; i++)
+				{
+					if(i < sectionPathArray.Length - 1)
+					{
+						xpathStatement = xpathStatement + "/sectionGroup[@name='" + sectionPathArray[i] + "']";
+					}
+					else
+					{
+						xpathStatement = xpathStatement + "/section[@name='" + sectionPathArray[i] + "']";
+					}
+				}
+				
+				//Get all of the <section> node using the xpath statement.
+				XmlNode sectionNode = xmlDoc.SelectSingleNode(xpathStatement);
+
+				// if this section isn't found, then there was something wrong with the config document,
+				// or the sectionName didn't have a proper definition.
+				if(sectionNode == null)
+				{
+					
+					throw (new ConfigurationException("Unrecognized element."));
+				}
+
+				handlerName =  sectionNode.Attributes["type"].Value;
+
+			}

+
+			//Return the name of the handler.
+			return handlerName;
+		}
+
+
+
+		/// <summary>
+		///		Get the Application Configuration Settings.
+		/// </summary>
+		public static NameValueCollection AppSettings
+		{
+			get
+			{	
+				//Get the Configuration Settings for the "appSettings" section.
+				NameValueCollection appSettings = (NameValueCollection)GetConfig("appSettings");;
+
+				return appSettings;
+			}
+		}
+
+	}
+}
+
+
diff --git a/mcs/class/System/System.Configuration/DictionarySectionHandler.cs b/mcs/class/System/System.Configuration/DictionarySectionHandler.cs
new file mode 100644
index 00000000000..f48eea8f38a
--- /dev/null
+++ b/mcs/class/System/System.Configuration/DictionarySectionHandler.cs
@@ -0,0 +1,91 @@
+

+//

+// System.Configuration.DictionarySectionHandler.cs

+//

+// Author:

+//   Christopher Podurgiel (cpodurgiel@msn.com)

+//

+// (C) Chris Podurgiel

+//

+using System;

+using System.Collections.Specialized;

+using System.Xml;

+

+namespace System.Configuration

+{

+	/// <summary>

+	/// Summary description for DictionarySectionHandler.

+	/// </summary>

+	public class DictionarySectionHandler : IConfigurationSectionHandler

+	{

+		private static string _stringKeyName;

+		private static string _stringValueName;

+

+		/// <summary>

+		///		DictionarySectionHandler Constructor

+		/// </summary>

+		public DictionarySectionHandler()

+		{

+			//Set Default Values.

+			_stringKeyName = "key";

+			_stringValueName = "value";

+		}

+

+		/// <summary>

+		///		Creates a new DictionarySectionHandler object and adds the object to the collection.

+		/// </summary>

+		/// <param name="parent">Composed from the configuration settings in a corresponding parent configuration section.</param>

+		/// <param name="context">Provides access to the virtual path for which the configuration section handler computes configuration values. Normally this parameter is reserved and is null.</param>

+		/// <param name="section">The XML node that contains the configuration information to be handled. section provides direct access to the XML contents of the configuration section.</param>

+		/// <returns></returns>

+		[MonoTODO]

+		public virtual object Create(object parent, object context, XmlNode section)

+		{

+			//FIXME: Enter a meaningful error message

+			if(section == null)

+			{ throw new ConfigurationException("XML Node can not be null."); }

+			

+			//FIXME: Enter a meaningful error message

+			if(parent == null)

+			{ throw new ConfigurationException("", section); }

+

+			

+			DictionarySectionHandler objHandler = new DictionarySectionHandler();

+			NameValueCollection objCollection;

+			

+			//Unbox parent as a NameValueCollection type.

+			objCollection=(NameValueCollection)parent;

+

+			objCollection.Add(section.Attributes[_stringKeyName].Value, section.Attributes[_stringValueName].Value);

+			 

+			return null;

+

+			//FIXME: this code is far form complete, probably not even correct.

+			

+		}

+

+		/// <summary>

+		///		Gets the name of the key attribute tag. This property is overidden by derived classes to change 

+		///		the name of the key attribute tag. The default is "key".

+		/// </summary>

+		protected virtual string KeyAttributeName

+		{

+			get

+			{

+				return _stringKeyName;

+			}

+		}

+

+		/// <summary>

+		///		Gets the name of the value tag. This property may be overidden by derived classes to change

+		///		the name of the value tag. The default is "value".

+		/// </summary>

+		protected virtual string ValueAttributeName 

+		{

+			get

+			{

+				return _stringValueName;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System/System.Configuration/IConfigurationSectionHandler.cs b/mcs/class/System/System.Configuration/IConfigurationSectionHandler.cs
new file mode 100644
index 00000000000..d3eae0ad018
--- /dev/null
+++ b/mcs/class/System/System.Configuration/IConfigurationSectionHandler.cs
@@ -0,0 +1,27 @@
+//
+// System.Configuration.IConfigurationSectionHandler.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+using System;
+using System.Xml;
+namespace System.Configuration
+{
+	/// <summary>
+	/// Summary description for IConfigurationSectionHandler.
+	/// </summary>
+	public interface IConfigurationSectionHandler
+	{
+		/// <summary>
+		///		Creates a new configuration handler and adds the specified configuration object to the collection.
+		/// </summary>
+		/// <param name="parent">Composed from the configuration settings in a corresponding parent configuration section.</param>
+		/// <param name="configContext">Provides access to the virtual path for which the configuration section handler computes configuration values. Normally this parameter is reserved and is null.</param>
+		/// <param name="section">The XML node that contains the configuration information to be handled. section provides direct access to the XML contents of the configuration section.</param>
+		/// <returns></returns>
+		object Create(object parent, object configContext, XmlNode section);
+	}
+}
diff --git a/mcs/class/System/System.Configuration/IgnoreSectionHandler.cs b/mcs/class/System/System.Configuration/IgnoreSectionHandler.cs
new file mode 100644
index 00000000000..4a0f558b395
--- /dev/null
+++ b/mcs/class/System/System.Configuration/IgnoreSectionHandler.cs
@@ -0,0 +1,45 @@
+//

+// System.Configuration.IgnoreSectionHandler.cs

+//

+// Author:

+//   Christopher Podurgiel (cpodurgiel@msn.com)

+//

+// (C) Chris Podurgiel

+//

+

+using System;

+using System.Xml;

+

+namespace System.Configuration

+{

+	/// <summary>

+	/// Summary description for IgnoreSectionHandler.

+	/// </summary>

+	public class IgnoreSectionHandler : IConfigurationSectionHandler

+	{

+		/// <summary>

+		///		IgnoreSectionHandler Constructor

+		/// </summary>

+		[MonoTODO]

+		public IgnoreSectionHandler()

+		{

+			//

+			// TODO: Add constructor logic here

+			//

+		}

+

+		/// <summary>

+		///		Creates a new configuration handler and adds the specified configuration object to the collection.

+		/// </summary>

+		/// <param name="parent">Composed from the configuration settings in a corresponding parent configuration section.</param>

+		/// <param name="configContext">Provides access to the virtual path for which the configuration section handler computes configuration values. Normally this parameter is reserved and is null.</param>

+		/// <param name="section">The XML node that contains the configuration information to be handled. section provides direct access to the XML contents of the configuration section.</param>

+		/// <returns></returns>

+		[MonoTODO]

+		public virtual object Create(object parent, object configContext, XmlNode section)

+		{

+			//FIXME: Add Implemetation code here.

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/System/System.Configuration/NameValueSectionHandler.cs b/mcs/class/System/System.Configuration/NameValueSectionHandler.cs
new file mode 100644
index 00000000000..0e88bf44950
--- /dev/null
+++ b/mcs/class/System/System.Configuration/NameValueSectionHandler.cs
@@ -0,0 +1,107 @@
+//
+// System.Configuration.NameValueSectionHandler.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+using System;
+using System.Xml;
+using System.Collections.Specialized;
+
+namespace System.Configuration
+{
+	/// <summary>
+	/// Summary description for NameValueSectionHandler.
+	/// </summary>
+	public class NameValueSectionHandler
+	{
+		private static string keyName;
+		private static string valueName;
+		private static NameValueCollection settingsCollection;
+		
+
+		/// <summary>
+		///		NameValueSectionHandler Constructor
+		/// </summary>
+		public NameValueSectionHandler()
+		{
+			//Set Default Values.
+			keyName = "key";
+			valueName = "value";
+			
+			settingsCollection = new NameValueCollection();
+			
+		}
+
+		/// <summary>
+		///		Creates a new configuration handler and adds the specified configuration object to the collection.
+		/// </summary>
+		/// <param name="parent">Composed from the configuration settings in a corresponding parent configuration section.</param>
+		/// <param name="context">Provides access to the virtual path for which the configuration section handler computes configuration values. Normally this parameter is reserved and is null.</param>
+		/// <param name="section">The XML node that contains the configuration information to be handled. section provides direct access to the XML contents of the configuration section.</param>
+		/// <returns></returns>
+		[MonoTODO]
+		public object Create(object parent, object context, XmlNode section)
+		{
+			//FIXME: I'm not quite sure how to implement 'parent' or 'context'.
+			
+
+			//Get all of the ChildNodes in the XML section.
+			XmlNodeList childNodeList = section.ChildNodes;
+			
+			//loop throught the ChildNodes
+			for (int i=0; i < childNodeList.Count; i++)
+			{
+				XmlNode childNode = childNodeList[i];
+
+				//if the name of this childNode is not 'add' then throw a ConfigurationException.
+				if(childNode.Name != "add")
+				{
+					throw (new ConfigurationException("Unrecognized element"));
+				}
+				
+				//Get the attributes for the childNode
+				XmlAttributeCollection xmlAttributes = childNode.Attributes;
+				
+				//Get the key and value Attributes by their Name
+				XmlAttribute keyAttribute = xmlAttributes[keyName];
+				XmlAttribute valueAttribute = xmlAttributes[valueName];
+				
+				//Add this Key/Value Pair to the collection
+				settingsCollection.Add(keyAttribute.Value, valueAttribute.Value);
+
+			}
+			
+						
+			//FIXME: Something is missing here. MS's version of this method returns a System.Configuration.ReadOnlyNameValueCollection type,
+			//this class id not documented ANYWHERE.  This method is curretly returning a NameValueCollection, but it should be ReadOnly.
+
+			return settingsCollection;
+		}
+
+		/// <summary>
+		///		Gets the name of the key in the key-value pair.
+		/// </summary>
+		protected virtual string KeyAttributeName
+		{
+			get
+			{
+				return keyName;
+			}
+		}
+
+		/// <summary>
+		///		Gets the value for the key in the key-value pair.
+		/// </summary>
+		protected virtual string ValueAttributeName 
+		{
+			get
+			{
+				return valueName;
+			}
+		}
+
+	}
+}
diff --git a/mcs/class/System/System.Configuration/SingleTagSectionHandler.cs b/mcs/class/System/System.Configuration/SingleTagSectionHandler.cs
new file mode 100644
index 00000000000..601ed10d82a
--- /dev/null
+++ b/mcs/class/System/System.Configuration/SingleTagSectionHandler.cs
@@ -0,0 +1,64 @@
+//
+// System.Configuration.SingleTagSectionHandler.cs
+//
+// Author:
+//   Christopher Podurgiel (cpodurgiel@msn.com)
+//
+// (C) Chris Podurgiel
+//
+
+using System;
+using System.Xml;
+using System.Collections;
+
+
+namespace System.Configuration
+{
+	/// <summary>
+	/// Summary description for SingleTagSectionHandler.
+	/// </summary>
+	public class SingleTagSectionHandler : IConfigurationSectionHandler
+	{
+
+		[MonoTODO]
+		public SingleTagSectionHandler()
+		{
+			//
+			// TODO: Add constructor logic here
+			//
+		}
+
+		/// <summary>
+		///		Returns a collection of configuration section values.
+		/// </summary>
+		/// <param name="parent"></param>
+		/// <param name="context"></param>
+		/// <param name="section">The name of the configuration section.</param>
+		/// <returns></returns>
+		[MonoTODO]
+		public virtual object Create(object parent, object context, XmlNode section)
+		{
+			//FIXME: I'm not quite sure how to implement 'parent' or 'context'.
+			//TODO: Add in proper Error Handling.
+
+			//Get all of the ChildNodes in the XML section.
+			if(section.HasChildNodes)
+			{
+				throw (new ConfigurationException("Child Nodes not allowed."));
+			}
+			
+			
+			//Get the attributes for the childNode
+			XmlAttributeCollection xmlAttributes = section.Attributes;
+
+			Hashtable settingsCollection = new Hashtable();
+			
+			for(int i=0; i < xmlAttributes.Count; i++)
+			{
+				settingsCollection.Add(xmlAttributes[i].Name, xmlAttributes[i].Value);
+			}
+			
+			return settingsCollection;
+		}
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/BooleanSwitch.cs b/mcs/class/System/System.Diagnostics/BooleanSwitch.cs
new file mode 100755
index 00000000000..e4f83292d55
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/BooleanSwitch.cs
@@ -0,0 +1,59 @@
+//
+// System.Diagnostics.BooleanSwitch.cs
+//
+// Author:
+//      John R. Hicks (angryjohn69@nc.rr.com)
+//
+// (C) 2001
+//
+
+namespace System.Diagnostics
+{
+        /// <summary>
+        /// Provides a simple on/off switch that controls debuggina
+        /// and tracing output
+        /// </summary>
+        public class BooleanSwitch : Switch
+        {
+                /// <summary>
+                /// Initializes a new instance
+                /// </summary>
+                public BooleanSwitch(string displayName, string description)
+                        : base(displayName, description)
+                {
+			SwitchSetting = (int)BooleanSwitchSetting.False;
+                }
+
+                // =================== Properties ===================
+
+                /// <summary>
+                /// Specifies whether the switch is enabled or disabled
+                /// </summary>
+                public bool Enabled
+                {
+                        get
+                        {
+                                if((int)BooleanSwitchSetting.False == SwitchSetting) {
+					return false;
+				}
+				else {
+					return true;
+				}
+                        }
+                        set
+                        {
+                                if(value) {
+					SwitchSetting = (int)BooleanSwitchSetting.True;
+				}
+				else {
+					SwitchSetting = (int)BooleanSwitchSetting.False;
+				}
+                        }
+                }
+
+		private enum BooleanSwitchSetting : int {
+			True = 1, False = 0
+		}
+        }
+
+}
diff --git a/mcs/class/System/System.Diagnostics/ChangeLog b/mcs/class/System/System.Diagnostics/ChangeLog
new file mode 100644
index 00000000000..d65e237f3d8
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ChangeLog
@@ -0,0 +1,156 @@
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Process.cs: class status based fixes.
+
+2002-07-20  Dick Porter  <dick@ximian.com>
+
+	* Process.cs: Implement file handle redirection
+
+2002-07-13  Jonathan Pryor <jonpryor@vt.edu>
+	* CounterCreationData.cs: Implemented
+	* CounterCreationDataCollection.cs: Implemented
+	* CounterSample.cs: Stubbed Out
+	* CounterSampleCalculator.cs: Stubbed Out
+	* InstanceData.cs: Implemented
+	* InstanceDataCollection.cs: Implemented
+	* InstanceDataCollectionCollection.cs: Implemented
+	* MonitoringDescriptionAttribute.cs: Implemented
+	* PerformanceCounter.cs: Stubbed Out
+	* PerformanceCounterCategory.cs: Stubbed Out
+	* PerformanceCounterInstaller.cs: Stubbed Out
+	* PerformanceCounterManager.cs: Stubbed Out
+	* PerformanceCounterPermission.cs: Stubbed Out
+	* PerformanceCounterPermissionAccess.cs: Implemented
+	* PerformanceCounterPermissionAttribute.cs: Stubbed Out
+	* PerformanceCounterPermissionEntry.cs: Stubbed Out
+	* PerformanceCounterPermissionEntryCollection.cs: Implemented
+	* PerformanceCounterType.cs: Implemented
+
+
+2002-06-25  Dick Porter  <dick@ximian.com>
+
+	* Process.cs: Process forking and waiting, and some support functions
+
+	* ProcessStartInfo.cs: Implemented the bits needed for basic
+	Process forking
+
+	* ProcessModule.cs: Implemented
+
+	* ProcessModuleCollection.cs: Mostly implemented
+
+	* FileVersionInfo.cs: Implemented
+
+2002-06-16  Jonathan Pryor <jonpryor@vt.edu>
+	* ICollectData.cs: Implemented
+	* TraceImpl.cs: Setting IndentLevel, IndentSize should change the
+		corresponding properties on all current TraceListeners.
+		Also, to answer the FIXME message: Yes, the properties in TraceListener
+		need to be [ThreadStatic] as well.
+	* TraceListenerCollection.cs: When adding a TraceListener, the TraceListener
+		should have its properties set to the current TraceImpl property values.
+	* TraceListener.cs: Make indentSize, lndentLevel [ThreadStatic].
+
+2002-06-09  Jonathan Pryor <jonpryor@vt.edu>
+	* EntryWrittenEventArgs.cs: Implemented
+	* EntryWrittenEventHandler.cs: Implemented
+	* EventLog.cs: Stubbed out
+	* EventLogEntry.cs: Stubbed out
+	* EventLogEntryCOllection.cs: Implemented.
+	* EventLogEntryType.cs: Implemented
+	* EventLogInstaller.cs: Stubbed out
+	* EventLogPermission.cs: Stubbed out
+	* EventLogPermissionAccess.cs: Implemented
+	* EventLogPermissionAttribute.cs: Stubbed out
+	* EventLogPermissionEntry.cs: Stubbed out
+	* EventLogPermissionEntryCollection.cs: Stubbed out
+	* EventLogTraceListener.cs: Stubbed out
+
+2002-05-29  Jonathan Pryor <jonpryor@vt.edu>
+  * DefaultTraceListener.cs: Implemented MONO_TRACE support
+
+2002-05-27  Jonathan Pryor <jonpryor@vt.edu>
+  * Moved public API documentation for the following files to the
+    /mcs/docs/apidocs/xml/en/System.Diagnostics directory:
+    - Debug.cs
+    - DefaultTraceListener.cs
+    - DiagnosticsConfigurationHandler.cs
+    - Switch.cs
+    - TextWriterTraceListener.cs
+    - Trace.cs
+    - TraceLevel.cs
+    - TraceListener.cs
+    - TraceListenerCollection.cs
+    - TraceSwitch.cs
+
+2002-04-10  Jonathan Pryor <jonpryor@vt.edu>
+
+	* TraceListenerCollection.cs: Corrected indexer property to provide the
+		correct return value and implement the IList indexer property correctly.
+
+2002-04-07  Jonathan Pryor <jonpryor@vt.edu>
+
+	* TraceListener.cs: Fix stack overflow bug
+	* DefaultTraceListener.cs: Implement log file support
+
+2002-04-04  Dick Porter  <dick@ximian.com>
+
+	* ThreadWaitReason.cs:
+	* ThreadState.cs:
+	* ThreadPriorityLevel.cs:
+	* ProcessWindowStyle.cs:
+	* ProcessThreadCollection.cs
+	* ProcessThread.cs:
+	* ProcessStartInfo.cs:
+	* ProcessModuleCollection.cs: Stub out more classes needed for Process
+
+2002-03-31  Dick Porter  <dick@ximian.com>
+
+	* Process.cs: 
+	* ProcessPriorityClass.cs: 
+	* ProcessModule.cs: 
+	* FileVersionInfo.cs: Stub out classes needed for Process
+
+2002-03-08  Jonathan Pryor <jonpryor@vt.edu>
+
+	* Debug.cs: Clean up (lots of code can be shared with Trace.cs, which 
+		is why TraceImpl.cs is introduced), "DEBUG" conditional support
+	* TraceListener.cs: Proper implementation of Dispose pattern;
+		implementatino of non-abstract methods in terms of abstract methods
+	* TraceListenerCollection.cs: check 'object' types before adding
+	* TextWriterTraceListener.cs: properly implement Dispose pattern;
+		handle NeedIndent and WriteIndent
+	* Trace.cs: new file; provides Trace functionality, "TRACE" conditional
+		support
+	* DefaultTraceListener.cs: new file; the default trace listener
+
+2002-01-17  Miguel de Icaza  <miguel@ximian.com>

+

+	* TraceListenerCollection.cs: Remove Warnings.

+

+2002-01-06  Ravi Pratap  <ravi@ximian.com>

+

+	* Switch.cs, TraceListenerCollection.cs : Decorate incomplete bits

+	with the MonoTODO attribute.

+

+2002-01-04  John R. Hicks <angryjohn69@nc.rr.com>

+	* Added Debug.cs to the build.

+2002-01-04  John R. Hicks <angryjohn69@nc.rr.com>

+	* Added preliminary TraceListenerCollection.cs to the build.

+2002-01-04  John R. Hicks <angryjohn69@nc.rr.com>

+	* Added TraceListener.cs, TextWriterTraceListener.cs, and

+	DefaultTraceListener.cs to the build and moved them into the

+	proper assembly.

+2002-01-04  John R. Hicks <angryjohn69@nc.rr.com>

+	* Added DiagnosticsConfigurationHandler.cs to the build.

+

+2001-09-09  Nick Drochak <ndrochak@gol.com>

+

+	* BooleanSwitch.cs: Make this class use it's parent class's features.  Namely, use SwitchSetting

+		so that we can get OnSwitchSettingChanged() to fire for free.

+

+2001-09-09  Nick Drochak <ndrochak@gol.com>

+

+	* ChangeLog: added this file

+	

+	* Switch.cs: call OnSwitchSettingChanged() when the switch setting is, yes you gessed it, changed.

+	

diff --git a/mcs/class/System/System.Diagnostics/CounterCreationData.cs b/mcs/class/System/System.Diagnostics/CounterCreationData.cs
new file mode 100644
index 00000000000..d814e012fea
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/CounterCreationData.cs
@@ -0,0 +1,52 @@
+//
+// System.Diagnostics.CounterCreationData.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	[Serializable]
+	public class CounterCreationData {
+
+		private string help;
+		private string name;
+		private PerformanceCounterType type;
+
+		public CounterCreationData ()
+		{
+		}
+
+		public CounterCreationData (string counterName, 
+			string counterHelp, 
+			PerformanceCounterType counterType)
+		{
+			name = counterName;
+			help = counterHelp;
+			type = counterType;
+		}
+
+		public string CounterHelp {
+			get {return help;}
+			set {help = value;}
+		}
+
+		public string CounterName {
+			get {return name;}
+			set {name = value;}
+		}
+
+		// may throw InvalidEnumArgumentException
+		public PerformanceCounterType CounterType {
+			get {return type;}
+			set {type = value;}
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/CounterCreationDataCollection.cs b/mcs/class/System/System.Diagnostics/CounterCreationDataCollection.cs
new file mode 100644
index 00000000000..b9114b1f11f
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/CounterCreationDataCollection.cs
@@ -0,0 +1,97 @@
+//
+// System.Diagnostics.CounterCreationDataCollection.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Globalization;
+
+namespace System.Diagnostics {
+
+	[Serializable]
+	public class CounterCreationDataCollection : CollectionBase {
+
+		public CounterCreationDataCollection ()
+		{
+		}
+
+		public CounterCreationDataCollection (
+			CounterCreationData[] value)
+		{
+			AddRange (value);
+		}
+
+		public CounterCreationDataCollection (
+			CounterCreationDataCollection value)
+		{
+			AddRange (value);
+		}
+
+		public CounterCreationData this [int index] {
+			get {return (CounterCreationData) InnerList[index];}
+			set {InnerList[index] = value;}
+		}
+
+		public int Add (CounterCreationData value)
+		{
+			return InnerList.Add (value);
+		}
+
+		public void AddRange (CounterCreationData[] value)
+		{
+			foreach (CounterCreationData v in value)
+			{
+				Add (v);
+			}
+		}
+
+		public void AddRange (CounterCreationDataCollection value)
+		{
+			foreach (CounterCreationData v in value)
+			{
+				Add (v);
+			}
+		}
+
+		public bool Contains (CounterCreationData value)
+		{
+			return InnerList.Contains (value);
+		}
+
+		public void CopyTo (CounterCreationData[] array, int index)
+		{
+			InnerList.CopyTo (array, index);
+		}
+
+		public int IndexOf (CounterCreationData value)
+		{
+			return InnerList.IndexOf (value);
+		}
+
+		public void Insert (int index, CounterCreationData value)
+		{
+			InnerList.Insert (index, value);
+		}
+
+		protected override void OnInsert (int index, object value)
+		{
+			if (!(value is CounterCreationData))
+				throw new NotSupportedException (Locale.GetText(
+					"You can only insert " + 
+					"CounterCreationData objects into " +
+					"the collection"));
+		}
+
+		public virtual void Remove (CounterCreationData value)
+		{
+			InnerList.Remove (value);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/CounterSample.cs b/mcs/class/System/System.Diagnostics/CounterSample.cs
new file mode 100644
index 00000000000..cf260861f71
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/CounterSample.cs
@@ -0,0 +1,110 @@
+//
+// System.Diagnostics.CounterSample.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public struct CounterSample {
+		
+		private long rawValue;
+		private long baseValue;
+		private long counterFrequency;
+		private long systemFrequency;
+		private long timeStamp;
+		private long timeStamp100nSec; 
+		private long counterTimeStamp;
+		private PerformanceCounterType counterType;
+
+		CounterSample (long rawValue, 
+			long baseValue, 
+			long counterFrequency, 
+			long systemFrequency, 
+			long timeStamp, 
+			long timeStamp100nSec, 
+			PerformanceCounterType counterType)
+			: this (rawValue, baseValue, counterFrequency, 
+				systemFrequency, timeStamp, timeStamp100nSec, 
+				counterType, 0)
+		{
+		}
+
+		CounterSample (long rawValue, 
+			long baseValue, 
+			long counterFrequency, 
+			long systemFrequency, 
+			long timeStamp, 
+			long timeStamp100nSec, 
+			PerformanceCounterType counterType, 
+			long counterTimeStamp)
+		{
+			this.rawValue = rawValue;
+			this.baseValue = baseValue;
+			this.counterFrequency = counterFrequency;
+			this.systemFrequency = systemFrequency;
+			this.timeStamp = timeStamp;
+			this.timeStamp100nSec = timeStamp100nSec;
+			this.counterType = counterType;
+			this.counterTimeStamp = counterTimeStamp;
+		}
+
+		public static CounterSample Empty = new CounterSample (
+			0, 0, 0, 0, 0, 0, 
+			PerformanceCounterType.NumberOfItems32, 
+			0);
+
+		public long BaseValue {
+			get {return baseValue;}
+		}
+
+		public long CounterFrequency {
+			get {return counterFrequency;}
+		}
+
+		public long CounterTimeStamp {
+			get {return counterTimeStamp;}
+		}
+
+		public PerformanceCounterType CounterType {
+			get {return counterType;}
+		}
+
+		public long RawValue {
+			get {return rawValue;}
+		}
+
+		public long SystemFrequency {
+			get {return systemFrequency;}
+		}
+
+		public long TimeStamp {
+			get {return timeStamp;}
+		}
+
+		public long TimeStamp100nSec {
+			get {return timeStamp100nSec;}
+		}
+
+//		[MonoTODO("What's the algorithm?")]
+//		public static float Calculate (CounterSample counterSample)
+//		{
+//			throw new NotSupportedException ();
+//		}
+//
+//		[MonoTODO("What's the algorithm?")]
+//		public static float Calculate (CounterSample counterSample,
+//			CounterSample nextCounterSample)
+//		{
+//			throw new NotSupportedException ();
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/CounterSampleCalculator.cs b/mcs/class/System/System.Diagnostics/CounterSampleCalculator.cs
new file mode 100644
index 00000000000..81e684444ac
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/CounterSampleCalculator.cs
@@ -0,0 +1,32 @@
+//
+// System.Diagnostics.CounterSampleCalculator.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public sealed class CounterSampleCalculator {
+
+//		[MonoTODO("What's the algorithm?")]
+//		public static float ComputeCounterValue (CounterSample newSample)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO("What's the algorithm?")]
+//		public static float ComputeCounterValue (CounterSample oldSample,
+//			CounterSample newSample)
+//		{
+//			throw new NotImplementedException ();
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/Debug.cs b/mcs/class/System/System.Diagnostics/Debug.cs
new file mode 100644
index 00000000000..73ead2ee832
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/Debug.cs
@@ -0,0 +1,197 @@
+//
+// System.Diagnostics.Debug.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// Comments from John R. Hicks <angryjohn69@nc.rr.com> original implementation 
+// can be found at: /mcs/docs/apidocs/xml/en/System.Diagnostics
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public sealed class Debug {
+
+		private Debug () {}
+
+		public static bool AutoFlush {
+			get {return TraceImpl.AutoFlush;}
+			set {TraceImpl.AutoFlush = value;}
+		}
+
+		public static int IndentLevel {
+			get {return TraceImpl.IndentLevel;}
+			set {TraceImpl.IndentLevel = value;}
+		}
+
+		public static int IndentSize {
+			get {return TraceImpl.IndentSize;}
+			set {TraceImpl.IndentSize = value;}
+		}
+
+		public static TraceListenerCollection Listeners {
+			get {return TraceImpl.Listeners;}
+		}
+
+		[Conditional("DEBUG")]
+		public static void Assert (bool condition)
+		{
+			TraceImpl.Assert (condition);
+		}
+
+		[Conditional("DEBUG")]
+		public static void Assert (bool condition, string message)
+		{
+			TraceImpl.Assert (condition, message);
+		}
+
+		[Conditional("DEBUG")]
+		public static void Assert (bool condition, string message, 
+			string detailMessage)
+		{
+			TraceImpl.Assert (condition, message, detailMessage);
+		}
+
+		[Conditional("DEBUG")]
+		public static void Close ()
+		{
+			TraceImpl.Close ();
+		}
+
+		[Conditional("DEBUG")]
+		public static void Fail (string message)
+		{
+			TraceImpl.Fail (message);
+		}
+
+		[Conditional("DEBUG")]
+		public static void Fail (string message, string detailMessage)
+		{
+			TraceImpl.Fail (message, detailMessage);
+		}
+
+		[Conditional("DEBUG")]
+		public static void Flush ()
+		{
+			TraceImpl.Flush ();
+		}
+
+		[Conditional("DEBUG")]
+		public static void Indent ()
+		{
+			TraceImpl.Indent ();
+		}
+
+		[Conditional("DEBUG")]
+		public static void Unindent ()
+		{
+			TraceImpl.Unindent ();
+		}
+
+		[Conditional("DEBUG")]
+		public static void Write (object value)
+		{
+			TraceImpl.Write (value);
+		}
+
+		[Conditional("DEBUG")]
+		public static void Write (string message)
+		{
+			TraceImpl.Write (message);
+		}
+
+		[Conditional("DEBUG")]
+		public static void Write (object value, string category)
+		{
+			TraceImpl.Write (value, category);
+		}
+
+		[Conditional("DEBUG")]
+		public static void Write (string message, string category)
+		{
+			TraceImpl.Write (message, category);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteIf (bool condition, object value)
+		{
+			TraceImpl.WriteIf (condition, value);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteIf (bool condition, string message)
+		{
+			TraceImpl.WriteIf (condition, message);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteIf (bool condition, object value, 
+			string category)
+		{
+			TraceImpl.WriteIf (condition, value, category);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteIf (bool condition, string message, 
+			string category)
+		{
+			TraceImpl.WriteIf (condition, message, category);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteLine (object value)
+		{
+			TraceImpl.WriteLine (value);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteLine (string message)
+		{
+			TraceImpl.WriteLine (message);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteLine (object value, string category)
+		{
+			TraceImpl.WriteLine (value, category);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteLine (string message, string category)
+		{
+			TraceImpl.WriteLine (message, category);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteLineIf (bool condition, object value)
+		{
+			TraceImpl.WriteLineIf (condition, value);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteLineIf (bool condition, string message)
+		{
+			TraceImpl.WriteLineIf (condition, message);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteLineIf (bool condition, object value, 
+			string category)
+		{
+			TraceImpl.WriteLineIf (condition, value, category);
+		}
+
+		[Conditional("DEBUG")]
+		public static void WriteLineIf (bool condition, string message, 
+			string category)
+		{
+			TraceImpl.WriteLineIf (condition, message, category);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/DefaultTraceListener.cs b/mcs/class/System/System.Diagnostics/DefaultTraceListener.cs
new file mode 100644
index 00000000000..d13d0aae8ef
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/DefaultTraceListener.cs
@@ -0,0 +1,225 @@
+//
+// System.Diagnostics.DefaultTraceListener.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// Comments from John R. Hicks <angryjohn69@nc.rr.com> original implementation 
+// can be found at: /mcs/docs/apidocs/xml/en/System.Diagnostics
+//
+// (C) 2002 Jonathan Pryor
+//
+
+using System;
+using System.IO;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace System.Diagnostics {
+
+	[ComVisible(false)]
+	public class DefaultTraceListener : TraceListener {
+
+		private static readonly bool OnWin32;
+
+		private static readonly string ConsoleOutTrace = "Console.Out";
+		private static readonly string ConsoleErrorTrace = "Console.Error";
+
+		private static readonly string MonoTracePrefix;
+		private static readonly string MonoTraceFile;
+
+		static DefaultTraceListener ()
+		{
+			// Determine what platform we're on.  This impacts how where we send
+			// messages.  On Win32 platforms (OnWin32 = true), we use the
+			// `OutputDebugString' api.
+			//
+			// On Linux platforms, we use MONO_TRACE to figure things out.  See the
+			// API documentation for more information on MONO_TRACE.
+			OnWin32 = (Path.DirectorySeparatorChar == '\\');
+
+			if (!OnWin32) {
+				// If we're running on Unix, we don't have OutputDebugString.
+				// Instead, send output to...wherever the MONO_TRACE environment
+				// variables says to.
+				String where = Environment.GetEnvironmentVariable("MONO_TRACE");
+
+				if (where != null) {
+					string file = null;
+					string prefix = null;
+
+					if (where.StartsWith (ConsoleOutTrace)) {
+						file = ConsoleOutTrace;
+						prefix = GetPrefix (where, ConsoleOutTrace);
+					}
+					else if (where.StartsWith (ConsoleErrorTrace)) {
+						file = ConsoleErrorTrace;
+						prefix = GetPrefix (where, ConsoleErrorTrace);
+					}
+					else {
+						file = where;
+
+						// We can't firgure out what the prefix would be, as ':' is a
+						// valid filename character.  Thus, arbitrary files don't support
+						// prefixes.
+						//
+						// I don't consider this to be a major issue.  Prefixes are useful 
+						// with Console.Out and Console.Error to help separate trace
+						// output from the actual program output.  Writing to an arbitrary
+						// file doesn't introduce issues with disambiguation.
+						prefix = "";
+					}
+
+					MonoTraceFile = file;
+					MonoTracePrefix = prefix;
+				}
+			}
+		}
+
+		/**
+		 * Get the prefix for the specified variable.
+		 *
+		 * "Prefixes" are used in the MONO_TRACE variable, and specify text that
+		 * should precede each message printed to the console.  The prefix is
+		 * appended to the console location with a colon (':') separating them.
+		 * For example, if MONO_TRACE is "Console.Out:** my prefix", the prefix is
+		 * "** my prefix".
+		 *
+		 * Everything after the colon, if the colon is present, is used as the
+		 * prefix.
+		 *
+		 * @param	var		The current MONO_TRACE variable
+		 * @param	where	The name of the output location, e.g. "Console.Out"
+		 */
+		private static string GetPrefix (string var, string where)
+		{
+			// actually, we permit any character to separate `where' and the prefix;
+			// we just skip over where the ':' would be.  This means that a space or
+			// anything else would suffice, as long as it was only a single
+			// character.
+			if (var.Length > where.Length)
+				return var.Substring (where.Length + 1);
+			return "";
+		}
+
+		private string logFileName = null;
+
+		public DefaultTraceListener () : base ("Default")
+		{
+		}
+
+		// It's hard to do anything with a UI when we don't have Windows.Forms...
+		[MonoTODO]
+		public bool AssertUiEnabled {
+			get {return false;}
+			set {/* ignore */}
+		}
+
+		[MonoTODO]
+		public string LogFileName {
+			get {return logFileName;}
+			set {logFileName = value;}
+		}
+
+    public override void Fail (string message)
+    {
+      base.Fail (message);
+      WriteLine (new StackTrace().ToString());
+    }
+
+ 		public override void Fail (string message, string detailMessage)
+ 		{
+      base.Fail (message, detailMessage);
+      WriteLine (new StackTrace().ToString());
+ 		}
+
+		[DllImport ("kernel32.dll", CharSet=CharSet.Auto)]
+		private extern static void OutputDebugString (string message);
+
+		private void WriteDebugString (string message)
+		{
+			if (OnWin32)
+				OutputDebugString (message);
+			else
+				WriteMonoTrace (message);
+		}
+
+		private void WriteMonoTrace (string message)
+		{
+			switch (MonoTraceFile) {
+			case "Console.Out":
+				Console.Out.Write (message);
+				break;
+			case "Console.Error":
+				Console.Error.Write (message);
+				break;
+			default:
+				WriteLogFile (message, MonoTraceFile);
+				break;
+			}
+		}
+
+		private void WritePrefix ()
+		{
+			if (!OnWin32) {
+				WriteMonoTrace (MonoTracePrefix);
+			}
+		}
+
+		private void WriteImpl (string message)
+		{
+			if (NeedIndent) {
+				WriteIndent ();
+				WritePrefix ();
+      }
+
+			WriteDebugString (message);
+
+			if (Debugger.IsLogging())
+				Debugger.Log (0, null, message);
+
+			WriteLogFile (message, LogFileName);
+		}
+
+		private void WriteLogFile (string message, string logFile)
+		{
+			string fname = logFile;
+			if (fname != null && fname.Length != 0) {
+				FileInfo info = new FileInfo (fname);
+				StreamWriter sw = null;
+
+				// Open the file
+				try {
+					if (info.Exists)
+						sw = info.AppendText ();
+					else
+						sw = info.CreateText ();
+				}
+				catch {
+					// We weren't able to open the file for some reason.
+					// We can't write to the log file; so give up.
+					return;
+				}
+
+				using (sw) {
+					sw.Write (message);
+          sw.Flush ();
+				}
+			}
+		}
+
+		public override void Write (string message)
+		{
+			WriteImpl (message);
+		}
+
+		public override void WriteLine (string message)
+		{
+			string msg = message + Environment.NewLine;
+			WriteImpl (msg);
+
+			NeedIndent = true;
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs b/mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs
new file mode 100644
index 00000000000..f99cd1094c4
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/DiagnosticsConfigurationHandler.cs
@@ -0,0 +1,41 @@
+//

+// System.Diagnostics.DiagnosticsConfigurationHandler.cs

+//

+// Comments from John R. Hicks <angryjohn69@nc.rr.com> original implementation 

+// can be found at: /mcs/docs/apidocs/xml/en/System.Diagnostics

+//

+// Author: 

+//	John R. Hicks <angryjohn69@nc.rr.com>

+//

+// (C) 2002

+//

+using System;

+using System.Configuration;

+using System.Xml;

+

+namespace System.Diagnostics

+{

+	public class DiagnosticsConfigurationHandler :

+		IConfigurationSectionHandler

+	{

+		public DiagnosticsConfigurationHandler()

+		{

+			

+		}

+		

+		public virtual object Create(

+		                             object parent,

+		                             object configContext,

+		                             XmlNode section)

+		{

+		    throw new NotImplementedException();                         	

+		}

+		

+		

+		~DiagnosticsConfigurationHandler() 

+		{

+			

+		}

+	}

+}

+

diff --git a/mcs/class/System/System.Diagnostics/EntryWrittenEventArgs.cs b/mcs/class/System/System.Diagnostics/EntryWrittenEventArgs.cs
new file mode 100644
index 00000000000..21e007dbe84
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EntryWrittenEventArgs.cs
@@ -0,0 +1,34 @@
+//
+// System.Diagnostics.EntryWrittenEventArgs.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace System.Diagnostics {
+
+	public class EntryWrittenEventArgs : EventArgs {
+
+		private EventLogEntry entry;
+
+		public EntryWrittenEventArgs () : this (null)
+		{
+		}
+
+		public EntryWrittenEventArgs (EventLogEntry entry)
+		{
+			this.entry = entry;
+		}
+
+		public EventLogEntry Entry {
+			get {return entry;}
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EntryWrittenEventHandler.cs b/mcs/class/System/System.Diagnostics/EntryWrittenEventHandler.cs
new file mode 100644
index 00000000000..beecc3ab8ab
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EntryWrittenEventHandler.cs
@@ -0,0 +1,21 @@
+//
+// System.Diagnostics.EntryWrittenEventHandler.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace System.Diagnostics {
+
+	public delegate void EntryWrittenEventHandler(
+		object sender, 
+		EntryWrittenEventArgs e);
+
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLog.cs b/mcs/class/System/System.Diagnostics/EventLog.cs
new file mode 100644
index 00000000000..477191cd8af
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLog.cs
@@ -0,0 +1,271 @@
+//
+// System.Diagnostics.EventLog.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+using System.ComponentModel;
+
+namespace System.Diagnostics {
+
+	[MonoTODO("This class is just stubbed out")]
+	public class EventLog : Component, ISupportInitialize {
+
+		private string source;
+		private string logName;
+		private string machineName;
+
+		public EventLog() : this ("")
+		{
+		}
+
+		public EventLog(string logName) : this (logName, "")
+		{
+		}
+
+		public EventLog(string logName, string machineName) 
+			: this (logName, machineName, "")
+		{
+		}
+
+		public EventLog(string logName, string machineName, 
+			string source)
+		{
+			this.source = source;
+			this.machineName = machineName;
+			this.logName = logName;
+		}
+
+//		[MonoTODO]
+//		public bool EnableRaisingEvents {
+//			get {return false;}
+//			set {/* ignore */}
+//		}
+//
+//		[MonoTODO]
+//		public EventLogEntryCollection Entries {
+//			get {return null;}
+//		}
+//
+//		[MonoTODO]
+//		public string Log {
+//			get {return log;}
+//			set {log = value;}
+//		}
+//
+//		[MonoTODO]
+//		public string LogDisplayName {
+//			get {return "";}
+//		}
+//
+//		[MonoTODO]
+//		public string MachineName {
+//			get {return machineName;}
+//			set {/* ignore */}
+//		}
+//
+//		[MonoTODO]
+//		public string Source {
+//			get {return source;}
+//			set {/* ignore */}
+//		}
+//
+//		[MonoTODO]
+//		public ISynchronizeInvoke SynchronizingObject {
+//			get {return null;}
+//			set {/* ignore */}
+//		}
+//
+		[MonoTODO]
+		public void BeginInit()
+		{
+			throw new NotImplementedException ();
+		}
+
+//		[MonoTODO]
+//		public void Clear()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public void Close()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void CreateEventSource(string source, 
+//			string logName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void CreateEventSource(string source, 
+//			string logName, 
+//			string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void Delete(string logName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void Delete(string logName, string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void DeleteEventSource(string source)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void DeleteEventSource(string source, 
+//			string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		protected override void Dispose(bool disposing)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+		[MonoTODO]
+		public void EndInit()
+		{
+			throw new NotImplementedException ();
+		}
+
+//		[MonoTODO]
+//		public static bool Exists(string logName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static bool Exists(string logName, string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static EventLog[] GetEventLogs()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static EventLog[] GetEventLogs(string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static string LogNameFromSourceName(string source, 
+//			string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static bool SourceExists(string source)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static bool SourceExists(string source, 
+//			string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public void WriteEntry(string message)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public void WriteEntry(string message, EventLogEntryType type)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void WriteEntry(string source, string message)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public void WriteEntry(string message, EventLogEntryType type, 
+//			int eventID)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void WriteEntry(string source, string message, 
+//			EventLogEntryType type)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public void WriteEntry(string message, EventLogEntryType type, 
+//			int eventID,
+//			short category)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void WriteEntry(string source, string message, 
+//			EventLogEntryType type, int eventID)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public void WriteEntry(string message, EventLogEntryType type, 
+//			int eventID,
+//			short category, byte[] rawData)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void WriteEntry(string source, string message, 
+//			EventLogEntryType type, int eventID, short category)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void WriteEntry(string source, string message, 
+//			EventLogEntryType type, int eventID, short category, 
+//			byte[] rawData)
+//		{
+//			throw new NotImplementedException ();
+//		}
+
+		public event EntryWrittenEventHandler EntryWritten;
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLogEntry.cs b/mcs/class/System/System.Diagnostics/EventLogEntry.cs
new file mode 100644
index 00000000000..32fb4533254
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLogEntry.cs
@@ -0,0 +1,105 @@
+//
+// System.Diagnostics.EventLogEntry.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+using System.Runtime.Serialization;
+
+namespace System.Diagnostics {
+
+	[Serializable]
+	[MonoTODO("Just stubbed out")]
+	public sealed class EventLogEntry : Component, ISerializable {
+
+		[MonoTODO]
+		internal EventLogEntry ()
+		{
+		}
+
+//		[MonoTODO]
+//		public string Categery {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public short CategoryNumber {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public byte[] Data {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public EventLogEntryType EntryType {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public int EventID {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public int Index {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public string Machineame {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public string Message {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public string[] ReplacementStrings {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public string Source {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public DateTime TimeGenerated {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public DateTime TimeWritten {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public string UserName {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public bool Equals(EventLogEntry otherEntry)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+		[MonoTODO]
+		void ISerializable.GetObjectData(SerializationInfo info, 
+			StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLogEntryCollection.cs b/mcs/class/System/System.Diagnostics/EventLogEntryCollection.cs
new file mode 100644
index 00000000000..746eec2a6c2
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLogEntryCollection.cs
@@ -0,0 +1,57 @@
+//
+// System.Diagnostics.EventLogEntryCollection.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002 Jonathan Pryor
+//
+
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public class EventLogEntryCollection : ICollection, IEnumerable {
+
+		private ArrayList eventLogs = new ArrayList ();
+
+		internal EventLogEntryCollection()
+		{
+		}
+
+		public int Count {
+			get {return eventLogs.Count;}
+		}
+
+		public virtual EventLogEntry this [int index] {
+			get {return (EventLogEntry) eventLogs[index];}
+		}
+
+		bool ICollection.IsSynchronized {
+			get {return eventLogs.IsSynchronized;}
+		}
+
+		object ICollection.SyncRoot {
+			get {return eventLogs.SyncRoot;}
+		}
+
+		public void CopyTo (EventLogEntry[] eventLogs, int index)
+		{
+			eventLogs.CopyTo (eventLogs, index);
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return eventLogs.GetEnumerator ();
+		}
+
+		void ICollection.CopyTo (Array array, int index)
+		{
+			eventLogs.CopyTo (array, index);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLogEntryType.cs b/mcs/class/System/System.Diagnostics/EventLogEntryType.cs
new file mode 100644
index 00000000000..0d52a79f31c
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLogEntryType.cs
@@ -0,0 +1,24 @@
+//
+// System.Diagnostics.EventLogEntryType.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	[Serializable]
+	public enum EventLogEntryType {
+		Error = 0x01,
+		Warning = 0x02,
+		Information = 0x04,
+		SuccessAudit = 0x08,
+		FailureAudit = 0x10
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLogInstaller.cs b/mcs/class/System/System.Diagnostics/EventLogInstaller.cs
new file mode 100644
index 00000000000..c49935cb714
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLogInstaller.cs
@@ -0,0 +1,75 @@
+//
+// System.Diagnostics.EventLogInstaller.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+// using System.Configuration.Install;
+
+namespace System.Diagnostics {
+
+	[MonoTODO]
+	public class EventLogInstaller 
+//		: ComponentInstaller
+	{
+//		[MonoTODO]
+//		public EventLogInstaller()
+//		{
+//		}
+//
+//		[MonoTODO]
+//		public string Log {
+//			get {throw new NotImplementedException();}
+//			set {throw new NotImplementedException();}
+//		}
+//
+//		[MonoTODO]
+//		public string Source {
+//			get {throw new NotImplementedException();}
+//			set {throw new NotImplementedException();}
+//		}
+//
+//		[MonoTODO]
+//		public UninstallAction UninstallAction {
+//			get {throw new NotImplementedException();}
+//			set {throw new NotImplementedException();}
+//		}
+//
+//		// may throw ArgumentException if
+//		// 	- component isn't an EventlOg
+//		//	- The Log or Source properties are null or ""
+//		[MonoTODO]
+//		public override void CopyFromComponenet(IComponent component)
+//		{
+//		}
+//
+//		// may throw PlatformNotSupportedException if not >= NT4
+//		[MonoTODO]
+//		public override void Install(IDictionary stateSaver)
+//		{
+//		}
+//
+//		[MonoTODO]
+//		public override bool IsEquivalentInstaller(
+//			ComponentInstaller otherInstaller)
+//		{
+//		}
+//
+//		[MonoTODO]
+//		public override void Rollback(IDictionary savedState)
+//		{
+//		}
+//
+//		[MonoTODO]
+//		public override void Uninstall(IDictionary savedState)
+//		{
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLogPermission.cs b/mcs/class/System/System.Diagnostics/EventLogPermission.cs
new file mode 100644
index 00000000000..1858ab6794a
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLogPermission.cs
@@ -0,0 +1,50 @@
+//
+// System.Diagnostics.EventLogPermission.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002 Jonathan Pryor
+//
+
+using System;
+using System.Diagnostics;
+using System.Security.Permissions;
+
+namespace System.Diagnostics {
+
+	[Serializable]
+	[MonoTODO("Just Stubbed Out")]
+	public class EventLogPermission 
+//		: ResourcePermissionBase
+	{
+//		[MonoTODO]
+//		public EventLogPermission()
+//		{
+//		}
+//
+//		[MonoTODO]
+//		public EventLogPermission(
+//			EventLogPermissionEntry[] permissionAccessEntries)
+//		{
+//		}
+//
+//		[MonoTODO]
+//		public EventLogPermission(PermissionState state)
+//		{
+//		}
+//
+//		[MonoTODO]
+//		public EventLogPermission(
+//			EventLogPermissionAccess permissionAccess,
+//			string machineName)
+//		{
+//		}
+//
+//		[MonoTODO]
+//		public EventLogPermissionEntryCollection PermissionEntries {
+//			get {throw new NotImplementedException();}
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLogPermissionAccess.cs b/mcs/class/System/System.Diagnostics/EventLogPermissionAccess.cs
new file mode 100644
index 00000000000..8ae00f87ae1
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLogPermissionAccess.cs
@@ -0,0 +1,23 @@
+//
+// System.Diagnostics.EventLogPermissionAccess.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002 Jonathan Pryor
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	[Flags, Serializable]
+	public enum EventLogPermissionAccess {
+		None=0,
+		Browse=0x2,
+		Instrument=0x6,
+		Audit=0xA,
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLogPermissionAttribute.cs b/mcs/class/System/System.Diagnostics/EventLogPermissionAttribute.cs
new file mode 100644
index 00000000000..17eb6ca9935
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLogPermissionAttribute.cs
@@ -0,0 +1,48 @@
+//
+// System.Diagnostics.EventLogPermissionAttribute.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Diagnostics {
+
+	[AttributeUsage(
+		AttributeTargets.Assembly | AttributeTargets.Class |
+		AttributeTargets.Struct | AttributeTargets.Constructor |
+		AttributeTargets.Method | AttributeTargets.Event)]
+	[Serializable]
+	[MonoTODO("Just Stubbed Out")]
+	public class EventLogPermissionAttribute : CodeAccessSecurityAttribute {
+
+		public EventLogPermissionAttribute(SecurityAction action)
+			: base(action)
+		{
+		}
+
+//		// May throw ArgumentException if computer name is invalid
+//		public string MachineName {
+//			get {throw new NotImplementedException();}
+//			set {throw new NotImplementedException();}
+//		}
+//
+//		public EventLogPermissionAccess PermissionAccess {
+//			get {throw new NotImplementedException();}
+//			set {throw new NotImplementedException();}
+//		}
+//
+		[MonoTODO]
+		public override IPermission CreatePermission()
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLogPermissionEntry.cs b/mcs/class/System/System.Diagnostics/EventLogPermissionEntry.cs
new file mode 100644
index 00000000000..efcbbc2016f
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLogPermissionEntry.cs
@@ -0,0 +1,37 @@
+//
+// System.Diagnostics.EventLogPermissionEntry.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	[Serializable]
+	[MonoTODO("Just Stubbed Out")]
+	public class EventLogPermissionEntry {
+
+//		[MonoTODO]
+//		public EventLogPermissionEntry(
+//			EventLogPermissionAccess permissionAccess,
+//			string machineName)
+//		{
+//		}
+//
+//		[MonoTODO]
+//		public string MachineName {
+//			get {throw new NotImplementedException();}
+//		}
+//
+//		[MonoTODO]
+//		public EventLogPermissionAccess PermissionAccess {
+//			get {throw new NotImplementedException();}
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLogPermissionEntryCollection.cs b/mcs/class/System/System.Diagnostics/EventLogPermissionEntryCollection.cs
new file mode 100644
index 00000000000..e078af0a509
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLogPermissionEntryCollection.cs
@@ -0,0 +1,104 @@
+//
+// System.Diagnostics.EventLogEntryCollection.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002 Jonathan Pryor
+//
+
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	[MonoTODO]
+	public class EventLogPermissionEntryCollection : CollectionBase {
+
+		[MonoTODO]
+		internal EventLogPermissionEntryCollection()
+		{
+		}
+
+//		[MonoTODO]
+//		public virtual EventLogEntry this [int index] {
+//			get {throw new NotImplementedException();}
+//		}
+//
+//		[MonoTODO]
+//		public int Add(EventLogPermissionEntry value)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		public void AddRange(EventLogPermissionEntry[] value)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		public void AddRange(EventLogPermissionEntryCollection value)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		public bool Contains(EventLogPermissionEntry value)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		public void CopyTo(EventLogPermissionEntry[] array, int index)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		public int IndexOf(EventLogPermissionEntry value)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		public void Insert(int index, EventLogPermissionEntry value)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		protected override void OnClear()
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		protected override void OnInsert(int index, object value)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		protected override void OnRemove(int index, object value)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		protected override void OnSet(int index, object oldValue, 
+//			object newValue)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		public void Remove(EventLogPermissionEntry value)
+//		{
+//			throw new NotImplementedException();
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/EventLogTraceListener.cs b/mcs/class/System/System.Diagnostics/EventLogTraceListener.cs
new file mode 100644
index 00000000000..56115b44522
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/EventLogTraceListener.cs
@@ -0,0 +1,75 @@
+//
+// System.Diagnostics.EventLogTraceListener.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002 Jonathan Pryor
+//
+
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	[MonoTODO]
+	public class EventLogTraceListener : TraceListener {
+
+//		[MonoTODO]
+//		public EventLogTraceListener()
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		public EventLogTraceListener(EventLog eventLog)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		public EventLogTraceListener(string source)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		public EventLog EventLog {
+//			get {throw new NotImplementedException();}
+//			set {throw new NotImplementedException();}
+//		}
+//
+//		[MonoTODO]
+//		public override string Name {
+//			get {throw new NotImplementedException();}
+//			set {throw new NotImplementedException();}
+//		}
+//
+//		[MonoTODO]
+//		public override void Close()
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+//		[MonoTODO]
+//		protected override void Dispose(bool disposing)
+//		{
+//			throw new NotImplementedException();
+//		}
+//
+		[MonoTODO]
+		public override void Write(string message)
+		{
+			throw new NotImplementedException();
+		}
+
+		[MonoTODO]
+		public override void WriteLine(string message)
+		{
+			throw new NotImplementedException();
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/FileVersionInfo.cs b/mcs/class/System/System.Diagnostics/FileVersionInfo.cs
new file mode 100755
index 00000000000..1291d4020a6
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/FileVersionInfo.cs
@@ -0,0 +1,274 @@
+//
+// System.Diagnostics.FileVersionInfo.cs
+//
+// Authors:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Diagnostics {
+	public sealed class FileVersionInfo {
+		/* There is no public constructor for this class, it
+		 * is initialised by the runtime.  All the private
+		 * variables here are looked up by name, so dont
+		 * change them without also changing the runtime
+		 */
+		private string comments;
+		private string companyname;
+		private string filedescription;
+		private string filename;
+		private string fileversion;
+		private string internalname;
+		private string language;
+		private string legalcopyright;
+		private string legaltrademarks;
+		private string originalfilename;
+		private string privatebuild;
+		private string productname;
+		private string productversion;
+		private string specialbuild;
+		private bool isdebug;
+		private bool ispatched;
+		private bool isprerelease;
+		private bool isprivatebuild;
+		private bool isspecialbuild;
+		private int filemajorpart;
+		private int fileminorpart;
+		private int filebuildpart;
+		private int fileprivatepart;
+		private int productmajorpart;
+		private int productminorpart;
+		private int productbuildpart;
+		private int productprivatepart;
+
+		private FileVersionInfo() {
+			/* This is here just to shut the compiler up */
+			comments=null;
+			companyname=null;
+			filedescription=null;
+			filename=null;
+			fileversion=null;
+			internalname=null;
+			language=null;
+			legalcopyright=null;
+			legaltrademarks=null;
+			originalfilename=null;
+			privatebuild=null;
+			productname=null;
+			productversion=null;
+			specialbuild=null;
+			isdebug=false;
+			ispatched=false;
+			isprerelease=false;
+			isprivatebuild=false;
+			isspecialbuild=false;
+			filemajorpart=0;
+			fileminorpart=0;
+			filebuildpart=0;
+			fileprivatepart=0;
+			productmajorpart=0;
+			productminorpart=0;
+			productbuildpart=0;
+			productprivatepart=0;
+		}
+		
+		
+		public string Comments {
+			get {
+				return(comments);
+			}
+		}
+
+		public string CompanyName {
+			get {
+				return(companyname);
+			}
+		}
+
+		public int FileBuildPart {
+			get {
+				return(filebuildpart);
+			}
+		}
+
+		public string FileDescription {
+			get {
+				return(filedescription);
+			}
+		}
+
+		public int FileMajorPart {
+			get {
+				return(filemajorpart);
+			}
+		}
+		
+		public int FileMinorPart {
+			get {
+				return(fileminorpart);
+			}
+		}
+
+		public string FileName {
+			get {
+				return(filename);
+			}
+		}
+
+		public int FilePrivatePart {
+			get {
+				return(fileprivatepart);
+			}
+		}
+
+		public string FileVersion {
+			get {
+				return(fileversion);
+			}
+		}
+
+		public string InternalName {
+			get {
+				return(internalname);
+			}
+		}
+
+		public bool IsDebug {
+			get {
+				return(isdebug);
+			}
+		}
+
+		public bool IsPatched {
+			get {
+				return(ispatched);
+			}
+		}
+
+		public bool IsPreRelease {
+			get {
+				return(isprerelease);
+			}
+		}
+		
+		public bool IsPrivateBuild {
+			get {
+				return(isprivatebuild);
+			}
+		}
+
+		public bool IsSpecialBuild {
+			get {
+				return(isspecialbuild);
+			}
+		}
+
+		public string Language {
+			get {
+				return(language);
+			}
+		}
+
+		public string LegalCopyright {
+			get {
+				return(legalcopyright);
+			}
+		}
+
+		public string LegalTrademarks {
+			get {
+				return(legaltrademarks);
+			}
+		}
+
+		public string OriginalFilename {
+			get {
+				return(originalfilename);
+			}
+		}
+
+		public string PrivateBuild {
+			get {
+				return(privatebuild);
+			}
+		}
+
+		public int ProductBuildPart {
+			get {
+				return(productbuildpart);
+			}
+		}
+
+		public int ProductMajorPart {
+			get {
+				return(productmajorpart);
+			}
+		}
+
+		public int ProductMinorPart {
+			get {
+				return(productminorpart);
+			}
+		}
+
+		public string ProductName {
+			get {
+				return(productname);
+			}
+		}
+
+		public int ProductPrivatePart {
+			get {
+				return(productprivatepart);
+			}
+		}
+
+		public string ProductVersion {
+			get {
+				return(productversion);
+			}
+		}
+
+		public string SpecialBuild {
+			get {
+				return(specialbuild);
+			}
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern void GetVersionInfo_internal(string fileName);
+		
+		public static FileVersionInfo GetVersionInfo(string fileName) {
+			FileVersionInfo fvi=new FileVersionInfo();
+
+			fvi.GetVersionInfo_internal(fileName);
+			
+			return(fvi);
+		}
+		
+		public override string ToString() {
+			string str;
+
+			str="File:             " + filename + "\n";
+			str+="InternalName:     " + internalname + "\n";
+			str+="OriginalFilename: " + originalfilename + "\n";
+			str+="FileVersion:      " + fileversion + "\n";
+			str+="FileDescription:  " + filedescription + "\n";
+			str+="Product:          " + productname + "\n";
+			str+="ProductVersion:   " + productversion + "\n";
+			str+="Debug:            " + isdebug + "\n";
+			str+="Patched:          " + ispatched + "\n";
+			str+="PreRelease:       " + isprerelease + "\n";
+			str+="PrivateBuild:     " + isprivatebuild + "\n";
+			str+="SpecialBuild:     " + isspecialbuild + "\n";
+			str+="Language          " + language + "\n";
+			
+			return(str);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/ICollectData.cs b/mcs/class/System/System.Diagnostics/ICollectData.cs
new file mode 100644
index 00000000000..8ed58307627
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ICollectData.cs
@@ -0,0 +1,26 @@
+//
+// System.Diagnostics.ICollectData.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace System.Diagnostics {
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface ICollectData {
+		void CloseData ();
+		void CollectData (
+			int id, 
+			IntPtr valueName, 
+			IntPtr data, 
+			int totalBytes, 
+			out IntPtr res);
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/InstanceData.cs b/mcs/class/System/System.Diagnostics/InstanceData.cs
new file mode 100644
index 00000000000..af260132fb0
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/InstanceData.cs
@@ -0,0 +1,39 @@
+//
+// System.Diagnostics.InstanceData.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public class InstanceData {
+
+		private string instanceName;
+		private CounterSample sample;
+
+		public InstanceData (string instanceName, CounterSample sample)
+		{
+			this.instanceName = instanceName;
+			this.sample = sample;
+		}
+
+		public string InstanceName {
+			get {return instanceName;}
+		}
+
+		public long RawValue {
+			get {return sample.RawValue;}
+		}
+
+		public CounterSample Sample {
+			get {return sample;}
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/InstanceDataCollection.cs b/mcs/class/System/System.Diagnostics/InstanceDataCollection.cs
new file mode 100644
index 00000000000..e45d7bf9754
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/InstanceDataCollection.cs
@@ -0,0 +1,66 @@
+//
+// System.Diagnostics.InstanceDataCollection.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public class InstanceDataCollection : DictionaryBase {
+
+		private string counterName;
+
+		private static void CheckNull (object value, string name)
+		{
+			if (value == null)
+				throw new ArgumentNullException (name);
+		}
+
+		// may throw ArgumentNullException
+		public InstanceDataCollection (string counterName)
+		{
+			CheckNull (counterName, "counterName");
+			this.counterName = counterName;
+		}
+
+		public string CounterName {
+			get {return counterName;}
+		}
+
+		// may throw ArgumentNullException
+		public InstanceData this [string instanceName] {
+			get {
+				CheckNull (instanceName, "instanceName");
+				return (InstanceData) Dictionary [instanceName];
+			}
+		}
+
+		public ICollection Keys {
+			get {return Dictionary.Keys;}
+		}
+
+		public ICollection Values {
+			get {return Dictionary.Values;}
+		}
+
+		// may throw ArgumentNullException
+		public bool Contains (string instanceName)
+		{
+			CheckNull (instanceName, "instanceName");
+			return Dictionary.Contains (instanceName);
+		}
+
+		public void CopyTo (InstanceData[] instances, int index)
+		{
+			Dictionary.CopyTo (instances, index);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/InstanceDataCollectionCollection.cs b/mcs/class/System/System.Diagnostics/InstanceDataCollectionCollection.cs
new file mode 100644
index 00000000000..6accd956f19
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/InstanceDataCollectionCollection.cs
@@ -0,0 +1,58 @@
+//
+// System.Diagnostics.InstanceDataCollectionCollection.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public class InstanceDataCollectionCollection : DictionaryBase {
+
+		private static void CheckNull (object value, string name)
+		{
+			if (value == null)
+				throw new ArgumentNullException (name);
+		}
+
+		// may throw ArgumentNullException
+		public InstanceDataCollectionCollection ()
+		{
+		}
+
+		// may throw ArgumentNullException
+		public InstanceDataCollection this [string counterName] {
+			get {
+				CheckNull (counterName, "counterName");
+				return (InstanceDataCollection) Dictionary [counterName];
+			}
+		}
+
+		public ICollection Keys {
+			get {return Dictionary.Keys;}
+		}
+
+		public ICollection Values {
+			get {return Dictionary.Values;}
+		}
+
+		// may throw ArgumentNullException
+		public bool Contains (string counterName)
+		{
+			CheckNull (counterName, "counterName");
+			return Dictionary.Contains (counterName);
+		}
+
+		public void CopyTo (InstanceData[] counters, int index)
+		{
+			Dictionary.CopyTo (counters, index);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/MonitoringDescriptionAttribute.cs b/mcs/class/System/System.Diagnostics/MonitoringDescriptionAttribute.cs
new file mode 100644
index 00000000000..982135601c4
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/MonitoringDescriptionAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.Diagnostics.MonitoringDescriptionAttribute.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	[AttributeUsage (AttributeTargets.All)]
+	public class MonitoringDescriptionAttribute : DescriptionAttribute {
+
+		public MonitoringDescriptionAttribute (string description)
+			: base (description)
+		{
+		}
+
+		public override string Description {
+			get {return base.Description;}
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounter.cs b/mcs/class/System/System.Diagnostics/PerformanceCounter.cs
new file mode 100644
index 00000000000..2e7f50478d3
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounter.cs
@@ -0,0 +1,216 @@
+//
+// System.Diagnostics.PerformanceCounter.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.ComponentModel;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	// must be safe for multithreaded operations
+	public class PerformanceCounter : Component, ISupportInitialize {
+
+		private string categoryName;
+		private string counterName;
+		private string instanceName;
+		private string machineName;
+		private bool readOnly;
+
+		[MonoTODO("Find the actual value")]
+		public static int DefaultFileMappingSize = 0x80000;
+
+		// set catname, countname, instname to "", machname to "."
+		public PerformanceCounter ()
+		{
+			categoryName = counterName = instanceName = "";
+			machineName = ".";
+		}
+
+		// throws: InvalidOperationException (if catName or countName
+		// is ""); ArgumentNullException if either is null
+		// sets instName to "", machname to "."
+		public PerformanceCounter (String categoryName, 
+			string counterName)
+			: this (categoryName, counterName, false)
+		{
+		}
+
+		public PerformanceCounter (string categoryName, 
+			string counterName,
+			bool readOnly)
+			: this (categoryName, counterName, "", readOnly)
+		{
+		}
+
+		public PerformanceCounter (string categoryName,
+			string counterName,
+			string instanceName)
+			: this (categoryName, counterName, instanceName, false)
+		{
+		}
+
+		public PerformanceCounter (string categoryName,
+			string counterName,
+			string instanceName,
+			bool readOnly)
+		{
+
+			CategoryName = categoryName;
+			CounterName = counterName;
+
+			if (categoryName == "" || counterName == "")
+				throw new InvalidOperationException ();
+
+			InstanceName = instanceName;
+			this.instanceName = instanceName;
+			this.machineName = ".";
+			this.readOnly = readOnly;
+		}
+
+		public PerformanceCounter (string categoryName,
+			string counterName,
+			string instanceName,
+			string machineName)
+			: this (categoryName, counterName, instanceName, false)
+		{
+			this.machineName = machineName;
+		}
+
+		// may throw ArgumentNullException
+		public string CategoryName {
+			get {return categoryName;}
+			set {
+				if (value == null)
+					throw new ArgumentNullException ("categoryName");
+				categoryName = value;
+			}
+		}
+
+//		// may throw InvalidOperationException
+//		[MonoTODO]
+//		public string CounterHelp {
+//			get {return "";}
+//		}
+//
+		// may throw ArgumentNullException
+		public string CounterName {
+			get {return counterName;}
+			set {
+				if (value == null)
+					throw new ArgumentNullException ("counterName");
+				counterName = value;
+			}
+		}
+
+//		// may throw InvalidOperationException
+//		[MonoTODO]
+//		public PerformanceCounterType CounterType {
+//			get {return 0;}
+//		}
+//
+		public string InstanceName {
+			get {return instanceName;}
+			set {instanceName = value;}
+		}
+
+//		// may throw ArgumentException if machine name format is wrong
+//		[MonoTODO("What's the machine name format?")]
+//		public string MachineName {
+//			get {return machineName;}
+//			set {machineName = value;}
+//		}
+//
+//		// may throw InvalidOperationException, Win32Exception
+//		[MonoTODO]
+//		public long RawValue {
+//			get {return 0;}
+//			set {
+//				throw new NotImplementedException ();
+//			}
+//		}
+//
+//		public bool ReadOnly {
+//			get {return readOnly;}
+//			set {readOnly = value;}
+//		}
+//
+		[MonoTODO]
+		public void BeginInit ()
+		{
+			throw new NotImplementedException ();
+		}
+
+//		[MonoTODO]
+//		public void Close ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void CloseSharedResources ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		// may throw InvalidOperationException, Win32Exception
+//		[MonoTODO]
+//		public long Decrement ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		protected override void Dispose (bool disposing)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+		[MonoTODO]
+		public void EndInit ()
+		{
+			throw new NotImplementedException ();
+		}
+
+//		// may throw InvalidOperationException, Win32Exception
+//		[MonoTODO]
+//		public long Increment ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		// may throw InvalidOperationException, Win32Exception
+//		[MonoTODO]
+//		public long IncrementBy (long value)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		// may throw InvalidOperationException, Win32Exception
+//		[MonoTODO]
+//		public CounterSample NextSample ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		// may throw InvalidOperationException, Win32Exception
+//		[MonoTODO]
+//		public float NextValue ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		// may throw InvalidOperationException, Win32Exception
+//		[MonoTODO]
+//		public void RemoveInstance ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounterCategory.cs b/mcs/class/System/System.Diagnostics/PerformanceCounterCategory.cs
new file mode 100644
index 00000000000..8d7a8e4a5cb
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounterCategory.cs
@@ -0,0 +1,182 @@
+//
+// System.Diagnostics.PerformanceCounterCategory.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public class PerformanceCounterCategory {
+
+//		[MonoTODO]
+//		public PerformanceCounterCategory ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		// may throw ArgumentException (""), ArgumentNullException
+//		[MonoTODO]
+//		public PerformanceCounterCategory (string categoryName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		// may throw ArgumentException (""), ArgumentNullException
+//		[MonoTODO]
+//		public PerformanceCounterCategory (string categoryName,
+//			string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		// may throw InvalidOperationException, Win32Exception
+//		[MonoTODO]
+//		public string CategoryHelp {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		// may throw ArgumentException (""), ArgumentNullException
+//		[MonoTODO]
+//		public string CategoryName {
+//			get {throw new NotImplementedException ();}
+//			set {throw new NotImplementedException ();}
+//		}
+//
+//		// may throw ArgumentException
+//		[MonoTODO]
+//		public string MachineName {
+//			get {throw new NotImplementedException ();}
+//			set {throw new NotImplementedException ();}
+//		}
+//
+//		// may throw ArgumentNullException, InvalidOperationException
+//		// (categoryName isn't set), Win32Exception
+//		[MonoTODO]
+//		public bool CounterExists (string counterName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		// may throw ArgumentNullException, InvalidOperationException
+//		// (categoryName is ""), Win32Exception
+//		[MonoTODO]
+//		public bool CounterExists (string counterName, 
+//			string categoryName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		// may throw ArgumentNullException, InvalidOperationException
+//		// (categoryName is "", machine name is bad), Win32Exception
+//		[MonoTODO]
+//		public bool CounterExists (string counterName, 
+//			string categoryName,
+//			string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static PerformanceCounterCategory Create (
+//			string categoryName,
+//			string categoryHelp,
+//			CounterCreationDataCollection counterData)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static PerformanceCounterCategory Create (
+//			string categoryName,
+//			string categoryHelp,
+//			string counterName,
+//			string counterHelp)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static void Delete (string categoryName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static bool Exists (string categoryName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static bool Exists (string categoryName, 
+//			string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static PerformanceCounterCategory[] GetCategories ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public static PerformanceCounterCategory[] GetCategories (
+//			string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public PerformanceCounter[] GetCounters ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public PerformanceCounter[] GetCounters (string instanceName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public string[] GetInstanceNames ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public bool InstanceExists (string instanceName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public bool InstanceExists (string instanceName, 
+//			string categoryName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public bool InstanceExists (string instanceName, 
+//			string categoryName,
+//			string machineName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public InstanceDataCollectionCollection ReadCategory ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounterInstaller.cs b/mcs/class/System/System.Diagnostics/PerformanceCounterInstaller.cs
new file mode 100644
index 00000000000..f6183e9e168
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounterInstaller.cs
@@ -0,0 +1,82 @@
+//
+// System.Diagnostics.PerformanceCounterInstaller.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Collections;
+// using System.Configuration.Install;
+using System.Diagnostics;
+using System.ComponentModel;
+
+namespace System.Diagnostics {
+
+	public class PerformanceCounterInstaller {
+
+//		[MonoTODO]
+//		public PerformanceCounterInstaller ()
+//		{
+//		}
+//
+//		// may throw ArgumentNullException
+//		[MonoTODO]
+//		public string CategoryHelp {
+//			get {throw new NotImplementedException ();}
+//			set {
+//				if (value == null)
+//					throw new ArgumentNullException ();
+//				throw new NotImplementedException ();
+//			}
+//		}
+//
+//		[MonoTODO]
+//		public string CategoryName {
+//			get {throw new NotImplementedException ();}
+//			set {
+//				if (value == null)
+//					throw new ArgumentNullException ();
+//				throw new NotImplementedException ();
+//			}
+//		}
+//
+//		[MonoTODO]
+//		public CounterCreationDataCollection Counters {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public UninstallAction UninstallAction {
+//			get {throw new NotImplementedException ();}
+//			set {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public override void CopyFromComponent (IComponent component)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public override void Install (IDictionary stateSaver)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public override void Rollback (IDictionary savedState)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public override void Uninstall (IDictionary savedState)
+//		{
+//			throw new NotImplementedException ();
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounterManager.cs b/mcs/class/System/System.Diagnostics/PerformanceCounterManager.cs
new file mode 100644
index 00000000000..629bb3f545c
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounterManager.cs
@@ -0,0 +1,44 @@
+//
+// System.Diagnostics.PerformanceCounterManager.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+using System.Runtime.InteropServices;
+
+namespace System.Diagnostics {
+
+	[ComVisible(true)]
+	// [Guid("")]
+	public class PerformanceCounterManager : ICollectData {
+
+//		[MonoTODO]
+//		public PerformanceCounterManager ()
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+		[MonoTODO]
+		void ICollectData.CloseData ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		void ICollectData.CollectData (
+			int callIdx,
+			IntPtr valueNamePtr,
+			IntPtr dataPtr,
+			int totalBytes,
+			out IntPtr res)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounterPermission.cs b/mcs/class/System/System.Diagnostics/PerformanceCounterPermission.cs
new file mode 100644
index 00000000000..b06d637e2fa
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounterPermission.cs
@@ -0,0 +1,45 @@
+//
+// System.Diagnostics.PerformaceCounterPermission.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+using System.Security.Permissions;
+
+namespace System.Diagnostics {
+
+	public class PerformaceCounterPermission : ResourcePermissionBase {
+
+//		public PerformaceCounterPermission ()
+//		{
+//		}
+//
+//		public PerformaceCounterPermission (
+//			PerformanceCounterPermissionEntry[] 
+//				permissionAccessEntries)
+//		{
+//		}
+//
+//		public PerformaceCounterPermission (PermissionState state)
+//		{
+//		}
+//
+//		public PerformaceCounterPermission (
+//			PerformanceCounterPermissionAccess permissionAccess, 
+//			string machineName, 
+//			string categoryName)
+//		{
+//		}
+//
+//		public PerformanceCounterPermissionEntryCollection 
+//			PermissionEntries {
+//			get {throw new NotImplementedException ();}
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAccess.cs b/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAccess.cs
new file mode 100644
index 00000000000..127bcd5f4f1
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAccess.cs
@@ -0,0 +1,22 @@
+//
+// System.Diagnostics.PerformanceCounterPermissionAccess.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public enum PerformanceCounterPermissionAccess {
+		Administrator=0x0E,
+		Browse=0x02,
+		Instrument=0x06,
+		None=0x00
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAttribute.cs b/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAttribute.cs
new file mode 100644
index 00000000000..9a011050368
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionAttribute.cs
@@ -0,0 +1,61 @@
+//
+// System.Diagnostics.PerformanceCounterPermissionAttribute.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Diagnostics {
+
+	[AttributeUsage(
+		AttributeTargets.Assembly |
+		AttributeTargets.Class |
+		AttributeTargets.Struct |
+		AttributeTargets.Constructor |
+		AttributeTargets.Method |
+		AttributeTargets.Event )]
+	[MonoTODO]
+	public class PerformanceCounterPermissionAttribute 
+		: CodeAccessSecurityAttribute {
+
+		[MonoTODO]
+		public PerformanceCounterPermissionAttribute (
+			SecurityAction action) 
+			: base (action)
+		{
+			throw new NotImplementedException ();
+		}
+
+//		[MonoTODO]
+//		public string CategoryName {
+//			get {throw new NotImplementedException ();}
+//			set {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public string MachineName {
+//			get {throw new NotImplementedException ();}
+//			set {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public PerformanceCounterPermissionAccess PermissionAccess {
+//			get {throw new NotImplementedException ();}
+//			set {throw new NotImplementedException ();}
+//		}
+//
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionEntry.cs b/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionEntry.cs
new file mode 100644
index 00000000000..ae2cd93ff95
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionEntry.cs
@@ -0,0 +1,44 @@
+//
+// System.Diagnostics.PerformanceCounterPermissionEntry.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	[Serializable]
+	[MonoTODO]
+	public class PerformanceCounterPermissionEntry {
+
+//		[MonoTODO]
+//		public PerformanceCounterPermissionEntry (
+//			PerformanceCounterPermissionAccess permissionAccess,
+//			string machineName,
+//			string categoryName)
+//		{
+//			throw new NotImplementedException ();
+//		}
+//
+//		[MonoTODO]
+//		public string CategoryName {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public string MachineName {
+//			get {throw new NotImplementedException ();}
+//		}
+//
+//		[MonoTODO]
+//		public PerformanceCounterPermissionAccess PermissionAccess {
+//			get {throw new NotImplementedException ();}
+//		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionEntryCollection.cs b/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionEntryCollection.cs
new file mode 100644
index 00000000000..818c3886a7e
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounterPermissionEntryCollection.cs
@@ -0,0 +1,107 @@
+//
+// System.Diagnostics.PerformanceCounterPermissionEntryCollection.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+using System.Collections;
+using System.Globalization;
+
+namespace System.Diagnostics {
+
+	[Serializable]
+	public class PerformanceCounterPermissionEntryCollection 
+		: CollectionBase 
+	{
+		internal PerformanceCounterPermissionEntryCollection ()
+		{
+		}
+
+		public PerformanceCounterPermissionEntry this [int index] {
+			get {
+				return (PerformanceCounterPermissionEntry)
+					InnerList[index];
+			}
+			set {InnerList[index] = value;}
+		}
+
+		public int Add (PerformanceCounterPermissionEntry value)
+		{
+			return InnerList.Add (value);
+		}
+
+		public void AddRange (PerformanceCounterPermissionEntry[] value)
+		{
+			foreach (PerformanceCounterPermissionEntry e in value)
+				Add (e);
+		}
+
+		public void AddRange (
+			PerformanceCounterPermissionEntryCollection value)
+		{
+			foreach (PerformanceCounterPermissionEntry e in value)
+				Add (e);
+		}
+
+		public bool Contains (PerformanceCounterPermissionEntry value)
+		{
+			return InnerList.Contains (value);
+		}
+
+		public void CopyTo (PerformanceCounterPermissionEntry[] array,
+			int index)
+		{
+			InnerList.CopyTo (array, index);
+		}
+
+		public int IndexOf (PerformanceCounterPermissionEntry value)
+		{
+			return InnerList.IndexOf (value);
+		}
+
+		public void Insert (int index, 
+			PerformanceCounterPermissionEntry value)
+		{
+			InnerList.Insert (index, value);
+		}
+
+		protected override void OnClear ()
+		{
+		}
+
+		protected override void OnInsert (int index, object value)
+		{
+			if (!(value is PerformanceCounterPermissionEntry))
+				throw new NotSupportedException (Locale.GetText(
+					"You can only insert " +
+					"PerformanceCounterPermissionEntry " +
+					"objects into the collection."));
+		}
+
+		protected override void OnRemove (int index, object value)
+		{
+		}
+
+		protected override void OnSet (int index, 
+			object oldValue, 
+			object newValue)
+		{
+			if (!(newValue is PerformanceCounterPermissionEntry))
+				throw new NotSupportedException (Locale.GetText(
+					"You can only insert " +
+					"PerformanceCounterPermissionEntry " +
+					"objects into the collection."));
+		}
+
+		public void Remove (PerformanceCounterPermissionEntry value)
+		{
+			InnerList.Remove (value);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/PerformanceCounterType.cs b/mcs/class/System/System.Diagnostics/PerformanceCounterType.cs
new file mode 100644
index 00000000000..a98462be1b5
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/PerformanceCounterType.cs
@@ -0,0 +1,47 @@
+//
+// System.Diagnostics.PerformanceCounterType.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	[Serializable]
+	public enum PerformanceCounterType {
+		NumberOfItemsHEX32=0x00000000,
+		NumberOfItemsHEX64=0x00000100,
+		NumberOfItems32=0x00010000,
+		NumberOfItems64=0x00010100,
+		CounterDelta32=0x00400400,
+		CounterDelta64=0x00400500,
+		SampleCounter=0x00410400,
+		CountPerTimeInterval32=0x00450400,
+		CountPerTimeInterval64=0x00450500,
+		RateOfCountsPerSecond32=0x10410400,
+		RateOfCountsPerSecond64=0x10410500,
+		RawFraction=0x20020400,
+		CounterTimer=0x20410500,
+		Timer100Ns=0x20510500,
+		SampleFraction=0x20C20400,
+		CounterTimerInverse=0x21410500,
+		Timer100NsInverse=0x21510500,
+		CounterMultiTimer=0x22410500,
+		CounterMultiTimer100Ns=0x22510500,
+		CounterMultiTimerInverse=0x23410500,
+		CounterMultiTimer100NsInverse=0x23510500,
+		AverageTimer32=0x30020400,
+		ElapsedTime=0x30240500,
+		AverageCount64=0x40020500,
+		SampleBase=0x40030401,
+		AverageBase=0x40030402,
+		RawBase=0x40030403,
+		CounterMultiBase=0x42030500
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/Process.cs b/mcs/class/System/System.Diagnostics/Process.cs
new file mode 100755
index 00000000000..2c5281dd4e6
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/Process.cs
@@ -0,0 +1,601 @@
+//
+// System.Diagnostics.Process.cs
+//
+// Authors:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System;
+using System.IO;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Diagnostics {
+	public class Process : Component {
+		[StructLayout(LayoutKind.Sequential)]
+		private struct ProcInfo {
+			public IntPtr process_handle;
+			public IntPtr thread_handle;
+			public int pid;
+			public int tid;
+		};
+		
+		IntPtr process_handle;
+		int pid;
+		
+		/* Private constructor called from other methods */
+		private Process(IntPtr handle, int id) {
+			process_handle=handle;
+			pid=id;
+		}
+		
+		[MonoTODO]
+		public Process() {
+		}
+
+		[MonoTODO]
+		public int BasePriority {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public bool EnableRaisingEvents {
+			get {
+				return(false);
+			}
+			set {
+			}
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static int ExitCode_internal(IntPtr handle);
+
+		public int ExitCode {
+			get {
+				return(ExitCode_internal(process_handle));
+			}
+		}
+
+		/* Returns the process start time in Windows file
+		 * times (ticks from DateTime(1/1/1601 00:00 GMT))
+		 */
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static long ExitTime_internal(IntPtr handle);
+		
+		public DateTime ExitTime {
+			get {
+				return(DateTime.FromFileTime(ExitTime_internal(process_handle)));
+			}
+		}
+
+		public IntPtr Handle {
+			get {
+				return(process_handle);
+			}
+		}
+
+		[MonoTODO]
+		public int HandleCount {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public bool HasExited {
+			get {
+				return(false);
+			}
+		}
+
+		public int Id {
+			get {
+				return(pid);
+			}
+		}
+
+		[MonoTODO]
+		public string MachineName {
+			get {
+				return("localhost");
+			}
+		}
+
+		public ProcessModule MainModule {
+			get {
+				return(this.Modules[0]);
+			}
+		}
+
+		[MonoTODO]
+		public IntPtr MainWindowHandle {
+			get {
+				return((IntPtr)0);
+			}
+		}
+
+		[MonoTODO]
+		public string MainWindowTitle {
+			get {
+				return("null");
+			}
+		}
+
+		[MonoTODO]
+		public IntPtr MaxWorkingSet {
+			get {
+				return((IntPtr)0);
+			}
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public IntPtr MinWorkingSet {
+			get {
+				return((IntPtr)0);
+			}
+			set {
+			}
+		}
+
+		/* Returns the list of process modules.  The main module is
+		 * element 0.
+		 */
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern ProcessModule[] GetModules_internal();
+
+		private ProcessModuleCollection module_collection;
+		
+		public ProcessModuleCollection Modules {
+			get {
+				if(module_collection==null) {
+					module_collection=new ProcessModuleCollection(GetModules_internal());
+				}
+
+				return(module_collection);
+			}
+		}
+
+		[MonoTODO]
+		public int NonpagedSystemMemorySize {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public int PagedMemorySize {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public int PagedSystemMemorySize {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public int PeakPagedMemorySize {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public int PeakVirtualMemorySize {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public int PeakWorkingSet {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public bool PriorityBoostEnabled {
+			get {
+				return(false);
+			}
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public ProcessPriorityClass PriorityClass {
+			get {
+				return(ProcessPriorityClass.Normal);
+			}
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public int PrivateMemorySize {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public TimeSpan PrivilegedProcessorTime {
+			get {
+				return(new TimeSpan(0));
+			}
+		}
+
+		[MonoTODO]
+		public string ProcessName {
+			get {
+				return("this-process");
+			}
+		}
+
+		[MonoTODO]
+		public IntPtr ProcessorAffinity {
+			get {
+				return((IntPtr)0);
+			}
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public bool Responding {
+			get {
+				return(false);
+			}
+		}
+
+		private StreamReader error_stream=null;
+		
+		public StreamReader StandardError {
+			get {
+				return(error_stream);
+			}
+		}
+
+		private StreamWriter input_stream=null;
+		
+		public StreamWriter StandardInput {
+			get {
+				return(input_stream);
+			}
+		}
+
+		private StreamReader output_stream=null;
+		
+		public StreamReader StandardOutput {
+			get {
+				return(output_stream);
+			}
+		}
+
+		private ProcessStartInfo start_info=null;
+		
+		public ProcessStartInfo StartInfo {
+			get {
+				if(start_info==null) {
+					start_info=new ProcessStartInfo();
+				}
+				
+				return(start_info);
+			}
+			set {
+				if(value==null) {
+					throw new ArgumentException("value is null");
+				}
+				
+				start_info=value;
+			}
+		}
+
+		/* Returns the process start time in Windows file
+		 * times (ticks from DateTime(1/1/1601 00:00 GMT))
+		 */
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static long StartTime_internal(IntPtr handle);
+		
+		public DateTime StartTime {
+			get {
+				return(DateTime.FromFileTime(StartTime_internal(process_handle)));
+			}
+		}
+
+		[MonoTODO]
+		public ISynchronizeInvoke SynchronizingObject {
+			get {
+				return(null);
+			}
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public ProcessThreadCollection Threads {
+			get {
+				return(null);
+			}
+		}
+
+		[MonoTODO]
+		public TimeSpan TotalProcessorTime {
+			get {
+				return(new TimeSpan(0));
+			}
+		}
+
+		[MonoTODO]
+		public TimeSpan UserProcessorTime {
+			get {
+				return(new TimeSpan(0));
+			}
+		}
+
+		[MonoTODO]
+		public int VirtualMemorySize {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public int WorkingSet {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public void Close() {
+		}
+
+		[MonoTODO]
+		public bool CloseMainWindow() {
+			return(false);
+		}
+
+		[MonoTODO]
+		public static void EnterDebugMode() {
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static IntPtr GetCurrentProcess_internal();
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static int GetPid_internal();
+
+		public static Process GetCurrentProcess() {
+			return(new Process(GetCurrentProcess_internal(),
+					   GetPid_internal()));
+		}
+
+		[MonoTODO]
+		public static Process GetProcessById(int processId) {
+			return(null);
+		}
+
+		[MonoTODO]
+		public static Process GetProcessById(int processId, string machineName) {
+			return(null);
+		}
+
+		[MonoTODO]
+		public static Process[] GetProcesses() {
+			return(null);
+		}
+
+		[MonoTODO]
+		public static Process[] GetProcesses(string machineName) {
+			return(null);
+		}
+
+		[MonoTODO]
+		public static Process[] GetProcessesByName(string processName) {
+			return(null);
+		}
+
+		[MonoTODO]
+		public static Process[] GetProcessesByName(string processName, string machineName) {
+			return(null);
+		}
+
+		[MonoTODO]
+		public void Kill() {
+		}
+
+		[MonoTODO]
+		public static void LeaveDebugMode() {
+		}
+
+		[MonoTODO]
+		public void Refresh() {
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static bool Start_internal(string file,
+							  string args,
+							  IntPtr stdin,
+							  IntPtr stdout,
+							  IntPtr stderr,
+							  ref ProcInfo proc_info);
+
+		private static bool Start_common(ProcessStartInfo startInfo,
+						 Process process) {
+			ProcInfo proc_info=new ProcInfo();
+			IntPtr stdin_rd, stdin_wr;
+			IntPtr stdout_rd, stdout_wr;
+			IntPtr stderr_rd, stderr_wr;
+			bool ret;
+			
+			if(startInfo.RedirectStandardInput==true) {
+				ret=MonoIO.CreatePipe(out stdin_rd,
+						      out stdin_wr);
+			} else {
+				stdin_rd=MonoIO.ConsoleInput;
+				/* This is required to stop the
+				 * &$*£ing stupid compiler moaning
+				 * that stdin_wr is unassigned, below.
+				 */
+				stdin_wr=(IntPtr)0;
+			}
+
+			if(startInfo.RedirectStandardOutput==true) {
+				ret=MonoIO.CreatePipe(out stdout_rd,
+						      out stdout_wr);
+			} else {
+				stdout_rd=(IntPtr)0;
+				stdout_wr=MonoIO.ConsoleOutput;
+			}
+
+			if(startInfo.RedirectStandardError==true) {
+				ret=MonoIO.CreatePipe(out stderr_rd,
+						      out stderr_wr);
+			} else {
+				stderr_rd=(IntPtr)0;
+				stderr_wr=MonoIO.ConsoleError;
+			}
+			
+			ret=Start_internal(startInfo.FileName,
+					   startInfo.Arguments,
+					   stdin_rd, stdout_wr, stderr_wr,
+					   ref proc_info);
+
+			process.process_handle=proc_info.process_handle;
+			process.pid=proc_info.pid;
+			
+			if(startInfo.RedirectStandardInput==true) {
+				MonoIO.Close(stdin_rd);
+				process.input_stream=new StreamWriter(new FileStream(stdin_wr, FileAccess.Write, true));
+			}
+
+			if(startInfo.RedirectStandardOutput==true) {
+				MonoIO.Close(stdout_wr);
+				process.output_stream=new StreamReader(new FileStream(stdout_rd, FileAccess.Read, true));
+			}
+
+			if(startInfo.RedirectStandardError==true) {
+				MonoIO.Close(stderr_wr);
+				process.error_stream=new StreamReader(new FileStream(stderr_rd, FileAccess.Read, true));
+			}
+
+			return(ret);
+		}
+		
+		public bool Start() {
+			bool ret;
+			
+			ret=Start_common(start_info, this);
+			
+			return(ret);
+		}
+
+		public static Process Start(ProcessStartInfo startInfo) {
+			Process process=new Process();
+			bool ret;
+
+			ret=Start_common(startInfo, process);
+			
+			if(ret==true) {
+				return(process);
+			} else {
+				return(null);
+			}
+		}
+
+		[MonoTODO]
+		public static Process Start(string fileName) {
+			return(null);
+		}
+
+		[MonoTODO]
+		public static Process Start(string fileName, string arguments) {
+			return(null);
+		}
+
+		[MonoTODO]
+		public override string ToString() {
+			return("process name");
+		}
+
+		/* Waits up to ms milliseconds for process 'handle' to
+		 * exit.  ms can be <0 to mean wait forever.
+		 */
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern bool WaitForExit_internal(IntPtr handle,
+							 int ms);
+
+		public void WaitForExit() {
+			WaitForExit_internal(process_handle, -1);
+		}
+
+		public bool WaitForExit(int milliseconds) {
+			return(WaitForExit_internal(process_handle,
+						    milliseconds));
+		}
+
+		[MonoTODO]
+		public bool WaitForInputIdle() {
+			return(false);
+		}
+
+		[MonoTODO]
+		public bool WaitForInputIdle(int milliseconds) {
+			return(false);
+		}
+
+		[MonoTODO]
+		public event EventHandler Exited;
+
+		// Closes the system process handle
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern void Process_free_internal(IntPtr handle);
+		
+		private bool disposed = false;
+		
+		protected override void Dispose(bool disposing) {
+			// Check to see if Dispose has already been called.
+			if(this.disposed) {
+				// If this is a call to Dispose,
+				// dispose all managed resources.
+				if(disposing) {
+					// Do stuff here
+				}
+				
+				// Release unmanaged resources
+				this.disposed=true;
+
+				lock(this) {
+					if(process_handle!=IntPtr.Zero) {
+						
+						Process_free_internal(process_handle);
+						process_handle=IntPtr.Zero;
+					}
+				}
+			}
+		}
+
+		public new void Dispose() {
+			Dispose(true);
+			// Take yourself off the Finalization queue
+			GC.SuppressFinalize(this);
+		}
+
+		[MonoTODO]
+		protected void OnExited() {
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/ProcessModule.cs b/mcs/class/System/System.Diagnostics/ProcessModule.cs
new file mode 100755
index 00000000000..a2b17a43f16
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ProcessModule.cs
@@ -0,0 +1,74 @@
+//
+// System.Diagnostics.ProcessModule.cs
+//
+// Authors:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System;
+using System.ComponentModel;
+
+namespace System.Diagnostics {
+	public class ProcessModule : Component {
+		private IntPtr baseaddr;
+		private IntPtr entryaddr;
+		private string filename;
+		private FileVersionInfo version_info;
+		private int memory_size;
+		private string modulename;
+		
+		internal ProcessModule(IntPtr baseaddr, IntPtr entryaddr,
+				       string filename,
+				       FileVersionInfo version_info,
+				       int memory_size, string modulename) {
+			this.baseaddr=baseaddr;
+			this.entryaddr=entryaddr;
+			this.filename=filename;
+			this.version_info=version_info;
+			this.memory_size=memory_size;
+			this.modulename=modulename;
+	}
+		
+		public IntPtr BaseAddress {
+			get {
+				return(baseaddr);
+			}
+		}
+
+		public IntPtr EntryPointAddress {
+			get {
+				return(entryaddr);
+			}
+		}
+
+		public string FileName {
+			get {
+				return(filename);
+			}
+		}
+
+		public FileVersionInfo FileVersionInfo {
+			get {
+				return(version_info);
+			}
+		}
+
+		public int ModuleMemorySize {
+			get {
+				return(memory_size);
+			}
+		}
+
+		public string ModuleName {
+			get {
+				return(modulename);
+			}
+		}
+
+		public override string ToString() {
+			return(this.ModuleName);
+		}
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/ProcessModuleCollection.cs b/mcs/class/System/System.Diagnostics/ProcessModuleCollection.cs
new file mode 100755
index 00000000000..c9ebdcefd5a
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ProcessModuleCollection.cs
@@ -0,0 +1,57 @@
+//
+// System.Diagnostics.ProcessModuleCollection.cs
+//
+// Authors:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Collections;
+
+namespace System.Diagnostics {
+	public class ProcessModuleCollection : ReadOnlyCollectionBase {
+		private ProcessModule[] modules;
+		
+		[MonoTODO]
+		protected ProcessModuleCollection() {
+		}
+
+		public ProcessModuleCollection(ProcessModule[] processModules) {
+			modules=processModules;
+		}
+		
+		public ProcessModule this[int index] {
+			get {
+				return(modules[index]);
+			}
+		}
+
+		public bool Contains(ProcessModule module) {
+			foreach(ProcessModule test in modules) {
+				if(module==test) {
+					return(true);
+				}
+			}
+			
+			return(false);
+		}
+
+		[MonoTODO]
+		public void CopyTo(ProcessModule[] array, int index) {
+		}
+
+		public int IndexOf(ProcessModule module) {
+			int i;
+
+			for(i=0; i<modules.Length; i++) {
+				if(modules[i]==module) {
+					return(i);
+				}
+			}
+			
+			// FIXME!
+			return(0);
+		}
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/ProcessPriorityClass.cs b/mcs/class/System/System.Diagnostics/ProcessPriorityClass.cs
new file mode 100755
index 00000000000..4218bb4390e
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ProcessPriorityClass.cs
@@ -0,0 +1,20 @@
+//
+// System.Diagnostics.ProcessPriorityClass.cs
+//
+// Authors:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Diagnostics {
+	[Serializable]
+	public enum ProcessPriorityClass {
+		AboveNormal=0x08000,
+		BelowNormal=0x04000,
+		High=0x00080,
+		Idle=0x00040,
+		Normal=0x00020,
+		RealTime=0x00100,
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/ProcessStartInfo.cs b/mcs/class/System/System.Diagnostics/ProcessStartInfo.cs
new file mode 100755
index 00000000000..fc2f87ce27a
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ProcessStartInfo.cs
@@ -0,0 +1,171 @@
+//
+// System.Diagnostics.ProcessStartInfo.cs
+//
+// Authors:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Collections.Specialized;
+
+namespace System.Diagnostics {
+	public sealed class ProcessStartInfo {
+		public ProcessStartInfo() {
+		}
+
+		public ProcessStartInfo(string filename) {
+			this.filename=filename;
+		}
+
+		public ProcessStartInfo(string filename, string arguments) {
+			this.filename=filename;
+			this.arguments=arguments;
+		}
+
+		private string arguments="";
+		
+		public string Arguments {
+			get {
+				return(arguments);
+			}
+			set {
+				arguments=value;
+			}
+		}
+
+		private bool create_no_window=false;
+		
+		public bool CreateNoWindow {
+			get {
+				return(create_no_window);
+			}
+			set {
+				create_no_window=value;
+			}
+		}
+
+		[MonoTODO("Need to read the env block somehow")]
+		public StringDictionary EnvironmentVariables {
+			get {
+				return(null);
+			}
+		}
+		private bool error_dialog=false;
+		
+		public bool ErrorDialog {
+			get {
+				return(error_dialog);
+			}
+			set {
+				error_dialog=value;
+			}
+		}
+
+		private IntPtr error_dialog_parent_handle=(IntPtr)0;
+		
+		public IntPtr ErrorDialogParentHandle {
+			get {
+				return(error_dialog_parent_handle);
+			}
+			set {
+				error_dialog_parent_handle=value;
+			}
+		}
+
+		private string filename="";
+		
+		public string FileName {
+			get {
+				return(filename);
+			}
+			set {
+				filename=value;
+			}
+		}
+
+		private bool redirect_standard_error=false;
+		
+		public bool RedirectStandardError {
+			get {
+				return(redirect_standard_error);
+			}
+			set {
+				redirect_standard_error=value;
+			}
+		}
+
+		private bool redirect_standard_input=false;
+		
+		public bool RedirectStandardInput {
+			get {
+				return(redirect_standard_input);
+			}
+			set {
+				redirect_standard_input=value;
+			}
+		}
+
+		private bool redirect_standard_output=false;
+		
+		public bool RedirectStandardOutput {
+			get {
+				return(redirect_standard_output);
+			}
+			set {
+				redirect_standard_output=value;
+			}
+		}
+
+		private bool use_shell_execute=true;
+		
+		public bool UseShellExecute {
+			get {
+				return(use_shell_execute);
+			}
+			set {
+				use_shell_execute=value;
+			}
+		}
+
+		private string verb="";
+		
+		public string Verb {
+			get {
+				return(verb);
+			}
+			set {
+				verb=value;
+			}
+		}
+
+		[MonoTODO]
+		public string[] Verbs {
+			get {
+				return(null);
+			}
+		}
+
+		private ProcessWindowStyle window_style=ProcessWindowStyle.Normal;
+		
+		public ProcessWindowStyle WindowStyle {
+			get {
+				return(window_style);
+			}
+			set {
+				window_style=value;
+			}
+		}
+
+		private string working_directory="";
+		
+		public string WorkingDirectory {
+			get {
+				return(working_directory);
+			}
+			set {
+				working_directory=value;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/ProcessThread.cs b/mcs/class/System/System.Diagnostics/ProcessThread.cs
new file mode 100755
index 00000000000..bbc6d56eb97
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ProcessThread.cs
@@ -0,0 +1,118 @@
+//
+// System.Diagnostics.ProcessThread.cs
+//
+// Authors:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.ComponentModel;
+
+namespace System.Diagnostics {
+	public class ProcessThread : Component {
+		[MonoTODO]
+		public int BasePriority {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public int CurrentPriority {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public int Id {
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		int IdealProcessor {
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public bool PriorityBoostEnabled {
+			get {
+				return(false);
+			}
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public ThreadPriorityLevel PriorityLevel {
+			get {
+				return(ThreadPriorityLevel.Idle);
+			}
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public TimeSpan PrivilegedProcessorTime {
+			get {
+				return(new TimeSpan(0));
+			}
+		}
+
+		[MonoTODO]
+		IntPtr ProcessorAffinity {
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public IntPtr StartAddress {
+			get {
+				return((IntPtr)0);
+			}
+		}
+
+		[MonoTODO]
+		public DateTime StartTime {
+			get {
+				return(new DateTime(0));
+			}
+		}
+
+		[MonoTODO]
+		public ThreadState ThreadState {
+			get {
+				return(ThreadState.Initialized);
+			}
+		}
+
+		[MonoTODO]
+		public TimeSpan TotalProcessorTime {
+			get {
+				return(new TimeSpan(0));
+			}
+		}
+
+		[MonoTODO]
+		public TimeSpan UserProcessorTime {
+			get {
+				return(new TimeSpan(0));
+			}
+		}
+
+		[MonoTODO]
+		public ThreadWaitReason WaitReason {
+			get {
+				return(ThreadWaitReason.Executive);
+			}
+		}
+
+		[MonoTODO]
+		public void ResetIdealProcessor() {
+		}
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/ProcessThreadCollection.cs b/mcs/class/System/System.Diagnostics/ProcessThreadCollection.cs
new file mode 100755
index 00000000000..4efbcd21bb0
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ProcessThreadCollection.cs
@@ -0,0 +1,56 @@
+//
+// System.Diagnostics.ProcessThreadCollection.cs
+//
+// Authors:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Collections;
+
+namespace System.Diagnostics {
+	public class ProcessThreadCollection : ReadOnlyCollectionBase {
+		[MonoTODO]
+		protected ProcessThreadCollection() {
+		}
+
+		[MonoTODO]
+		public ProcessThreadCollection(ProcessThread[] processThreads) {
+		}
+		
+		[MonoTODO]
+		public ProcessThread this[int index] {
+			get {
+				return(null);
+			}
+		}
+
+		[MonoTODO]
+		public int Add(ProcessThread thread) {
+			return(0);
+		}
+
+		[MonoTODO]
+		public bool Contains(ProcessThread thread) {
+			return(false);
+		}
+
+		[MonoTODO]
+		public void CopyTo(ProcessThread[] array, int index) {
+		}
+
+		[MonoTODO]
+		public int IndexOf(ProcessThread thread) {
+			return(0);
+		}
+
+		[MonoTODO]
+		public void Insert(int index, ProcessThread thread) {
+		}
+
+		[MonoTODO]
+		public void Remove(ProcessThread thread) {
+		}
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/ProcessWindowStyle.cs b/mcs/class/System/System.Diagnostics/ProcessWindowStyle.cs
new file mode 100755
index 00000000000..00afa1ac997
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ProcessWindowStyle.cs
@@ -0,0 +1,18 @@
+//
+// System.Diagnostics.ProcessWindowStyle.cs
+//
+// Authors:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Diagnostics {
+	[Serializable]
+	public enum ProcessWindowStyle {
+		Hidden=1,
+		Maximized=3,
+		Minimized=2,
+		Normal=0,
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/Switch.cs b/mcs/class/System/System.Diagnostics/Switch.cs
new file mode 100755
index 00000000000..155860f09b9
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/Switch.cs
@@ -0,0 +1,75 @@
+//
+// System.Diagnostics.Switch.cs
+//
+// Comments from John R. Hicks <angryjohn69@nc.rr.com> original implementation 
+// can be found at: /mcs/docs/apidocs/xml/en/System.Diagnostics
+//
+// Author:
+//      John R. Hicks  (angryjohn69@nc.rr.com)
+//
+// (C) 2001
+//
+
+namespace System.Diagnostics
+{
+        public abstract class Switch
+        {
+	            private string desc = "";
+                private string display_name = "";
+                private int iSwitch;
+
+                // ================= Constructors ===================
+                protected Switch(string displayName, string description)
+                {
+                        display_name = displayName;
+                        desc = description;
+                }
+
+                ~Switch()
+                {
+                }
+
+                // ================ Instance Methods ================
+
+                // ==================== Properties ==================
+
+                public string Description
+                {
+                        get
+                        {
+                                return desc;
+                        }
+                }
+
+                public string DisplayName
+                {
+                        get
+                        {
+                                return display_name;
+                        }
+                }
+
+                protected int SwitchSetting
+                {
+                        get
+                        {
+                                return iSwitch;
+                        }
+                        set
+                        {
+							if(iSwitch != value) 
+							{
+								iSwitch = value;
+								OnSwitchSettingChanged();
+							}
+						}
+				}
+
+		[MonoTODO]
+		protected virtual void OnSwitchSettingChanged()
+		{
+			// TODO: implement me
+		}
+        }
+}
+
diff --git a/mcs/class/System/System.Diagnostics/TextWriterTraceListener.cs b/mcs/class/System/System.Diagnostics/TextWriterTraceListener.cs
new file mode 100644
index 00000000000..e2c6129640d
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/TextWriterTraceListener.cs
@@ -0,0 +1,107 @@
+//
+// System.Diagnostics.TextWriterTraceListener.cs
+//
+// Comments from John R. Hicks <angryjohn69@nc.rr.com> original implementation 
+// can be found at: /mcs/docs/apidocs/xml/en/System.Diagnostics
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002 Jonathan Pryor
+//
+
+using System;
+using System.IO;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public class TextWriterTraceListener : TraceListener {
+
+		private TextWriter writer;
+
+		public TextWriterTraceListener () : base ("TextWriter")
+		{
+		}
+
+		public TextWriterTraceListener (Stream stream)
+			: this (stream, "")
+		{
+		}
+
+		public TextWriterTraceListener (string fileName)
+			: this (fileName, "")
+		{
+		}
+
+		public TextWriterTraceListener (TextWriter writer)
+			: this (writer, "")
+		{
+		}
+
+		public TextWriterTraceListener (Stream stream, string name) 
+			: base (name != null ? name : "")
+		{
+			if (stream == null) 
+				throw new ArgumentNullException ("stream");
+			writer = new StreamWriter (stream);
+		}
+
+		public TextWriterTraceListener (string fileName, string name) 
+			: base (name != null ? name : "")
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName");
+			writer = new StreamWriter (File.OpenWrite (fileName));
+		}
+
+		public TextWriterTraceListener (TextWriter writer, string name) 
+			: base (name != null ? name : "")
+		{
+			if (writer == null)
+				throw new ArgumentNullException ("writer");
+			this.writer = writer;
+		}
+
+		public TextWriter Writer {
+			get {return writer;}
+			set {writer = value;}
+		}
+
+		public override void Close ()
+		{
+			if (writer != null) {
+				writer.Flush ();
+				writer.Close ();
+				writer = null;
+			}
+		}
+
+		protected override void Dispose (bool disposing)
+		{
+			if (disposing)
+				Close ();
+		}
+
+		public override void Flush ()
+		{
+			writer.Flush ();
+		}
+
+		public override void Write (string message)
+		{
+			if (NeedIndent)
+				WriteIndent ();
+			writer.Write (message);
+		}
+
+		public override void WriteLine (string message)
+		{
+			if (NeedIndent)
+				WriteIndent ();
+			writer.WriteLine (message);
+			NeedIndent = true;
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/ThreadPriorityLevel.cs b/mcs/class/System/System.Diagnostics/ThreadPriorityLevel.cs
new file mode 100755
index 00000000000..17297c10738
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ThreadPriorityLevel.cs
@@ -0,0 +1,21 @@
+//
+// System.Diagnostics.ThreadPriorityLevel.cs
+//
+// Authors:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Diagnostics {
+	[Serializable]
+	public enum ThreadPriorityLevel {
+		AboveNormal=1,
+		BelowNormal=-1,
+		Highest=2,
+		Idle=-15,
+		Lowest=-2,
+		Normal=0,
+		TimeCritical=15,
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/ThreadState.cs b/mcs/class/System/System.Diagnostics/ThreadState.cs
new file mode 100755
index 00000000000..12e4501c104
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ThreadState.cs
@@ -0,0 +1,22 @@
+//
+// System.Diagnostics.ThreadState.cs
+//
+// Authors:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Diagnostics {
+	[Serializable]
+	public enum ThreadState {
+		Initialized=0,
+		Ready=1,
+		Running=2,
+		Standby=3,
+		Terminated=4,
+		Transition=6,
+		Unknown=7,
+		Wait=5,
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/ThreadWaitReason.cs b/mcs/class/System/System.Diagnostics/ThreadWaitReason.cs
new file mode 100755
index 00000000000..97946549f39
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/ThreadWaitReason.cs
@@ -0,0 +1,28 @@
+//
+// System.Diagnostics.ThreadWaitReason.cs
+//
+// Authors:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Diagnostics {
+	[Serializable]
+	public enum ThreadWaitReason {
+		EventPairHigh=7,
+		EventPairLow=8,
+		ExecutionDelay=4,
+		Executive=0,
+		FreePage=1,
+		LpcReceive=9,
+		LpcReply=10,
+		PageIn=2,
+		PageOut=12,
+		Suspended=5,
+		SystemAllocation=3,
+		Unknown=13,
+		UserRequest=6,
+		VirtualMemory=11,
+	}
+}
diff --git a/mcs/class/System/System.Diagnostics/Trace.cs b/mcs/class/System/System.Diagnostics/Trace.cs
new file mode 100644
index 00000000000..223672f156c
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/Trace.cs
@@ -0,0 +1,197 @@
+//
+// System.Diagnostics.Trace.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// Comments from John R. Hicks <angryjohn69@nc.rr.com> original implementation 
+// can be found at: /mcs/docs/apidocs/xml/en/System.Diagnostics
+//
+// (C) 2002
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public sealed class Trace {
+
+		private Trace () {}
+
+		public static bool AutoFlush {
+			get {return TraceImpl.AutoFlush;}
+			set {TraceImpl.AutoFlush = value;}
+		}
+
+		public static int IndentLevel {
+			get {return TraceImpl.IndentLevel;}
+			set {TraceImpl.IndentLevel = value;}
+		}
+
+		public static int IndentSize {
+			get {return TraceImpl.IndentSize;}
+			set {TraceImpl.IndentSize = value;}
+		}
+
+		public static TraceListenerCollection Listeners {
+			get {return TraceImpl.Listeners;}
+		}
+
+		[Conditional("TRACE")]
+		public static void Assert (bool condition)
+		{
+			TraceImpl.Assert (condition);
+		}
+
+		[Conditional("TRACE")]
+		public static void Assert (bool condition, string message)
+		{
+			TraceImpl.Assert (condition, message);
+		}
+
+		[Conditional("TRACE")]
+		public static void Assert (bool condition, string message, 
+			string detailMessage)
+		{
+			TraceImpl.Assert (condition, message, detailMessage);
+		}
+
+		[Conditional("TRACE")]
+		public static void Close ()
+		{
+			TraceImpl.Close ();
+		}
+
+		[Conditional("TRACE")]
+		public static void Fail (string message)
+		{
+			TraceImpl.Fail (message);
+		}
+
+		[Conditional("TRACE")]
+		public static void Fail (string message, string detailMessage)
+		{
+			TraceImpl.Fail (message, detailMessage);
+		}
+
+		[Conditional("TRACE")]
+		public static void Flush ()
+		{
+			TraceImpl.Flush ();
+		}
+
+		[Conditional("TRACE")]
+		public static void Indent ()
+		{
+			TraceImpl.Indent ();
+		}
+
+		[Conditional("TRACE")]
+		public static void Unindent ()
+		{
+			TraceImpl.Unindent ();
+		}
+
+		[Conditional("TRACE")]
+		public static void Write (object value)
+		{
+			TraceImpl.Write (value);
+		}
+
+		[Conditional("TRACE")]
+		public static void Write (string message)
+		{
+			TraceImpl.Write (message);
+		}
+
+		[Conditional("TRACE")]
+		public static void Write (object value, string category)
+		{
+			TraceImpl.Write (value, category);
+		}
+
+		[Conditional("TRACE")]
+		public static void Write (string message, string category)
+		{
+			TraceImpl.Write (message, category);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteIf (bool condition, object value)
+		{
+			TraceImpl.WriteIf (condition, value);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteIf (bool condition, string message)
+		{
+			TraceImpl.WriteIf (condition, message);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteIf (bool condition, object value, 
+			string category)
+		{
+			TraceImpl.WriteIf (condition, value, category);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteIf (bool condition, string message, 
+			string category)
+		{
+			TraceImpl.WriteIf (condition, message, category);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteLine (object value)
+		{
+			TraceImpl.WriteLine (value);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteLine (string message)
+		{
+			TraceImpl.WriteLine (message);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteLine (object value, string category)
+		{
+			TraceImpl.WriteLine (value, category);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteLine (string message, string category)
+		{
+			TraceImpl.WriteLine (message, category);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteLineIf (bool condition, object value)
+		{
+			TraceImpl.WriteLineIf (condition, value);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteLineIf (bool condition, string message)
+		{
+			TraceImpl.WriteLineIf (condition, message);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteLineIf (bool condition, object value, 
+			string category)
+		{
+			TraceImpl.WriteLineIf (condition, value, category);
+		}
+
+		[Conditional("TRACE")]
+		public static void WriteLineIf (bool condition, string message, 
+			string category)
+		{
+			TraceImpl.WriteLineIf (condition, message, category);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/TraceImpl.cs b/mcs/class/System/System.Diagnostics/TraceImpl.cs
new file mode 100644
index 00000000000..f159f2518c4
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/TraceImpl.cs
@@ -0,0 +1,298 @@
+//
+// System.Diagnostics.TraceImpl.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002 Jonathan Pryor
+//
+
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	internal class TraceImpl {
+
+		private static object lock_ = new object ();
+
+		private static bool autoFlush = false;
+
+		public static bool AutoFlush {
+			get {return autoFlush;}
+			set {autoFlush = value;}
+		}
+
+		[ThreadStatic]
+		private static int indentLevel = 0;
+
+		public static int IndentLevel {
+			get {return indentLevel;}
+			set {
+				indentLevel = value;
+
+				// Don't need to lock for threadsafety as 
+				// TraceListener.IndentLevel is [ThreadStatic]
+				foreach (TraceListener t in Listeners) {
+					t.IndentLevel = indentLevel;
+				}
+			}
+		}
+
+		[ThreadStatic]
+		private static int indentSize = 4;
+
+		public static int IndentSize {
+			get {return indentSize;}
+			set {
+				indentSize = value;
+
+				// Don't need to lock for threadsafety as 
+				// TraceListener.IndentSize is [ThreadStatic]
+				foreach (TraceListener t in Listeners) {
+					t.IndentSize = indentSize;
+				}
+			}
+		}
+
+		private static TraceListenerCollection listeners = 
+			new TraceListenerCollection ();
+
+		public static TraceListenerCollection Listeners {
+			get {return listeners;}
+		}
+
+		// FIXME: According to MSDN, this method should display a dialog box
+		[MonoTODO]
+		public static void Assert (bool condition)
+		{
+			if (!condition)
+				Fail (new StackTrace().ToString());
+		}
+
+		// FIXME: According to MSDN, this method should display a dialog box
+		[MonoTODO]
+		public static void Assert (bool condition, string message)
+		{
+			if (!condition)
+				Fail (message);
+		}
+
+		// FIXME: According to MSDN, this method should display a dialog box
+		[MonoTODO]
+		public static void Assert (bool condition, string message, 
+			string detailMessage)
+		{
+			if (!condition)
+				Fail (message, detailMessage);
+		}
+
+		public static void Close ()
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.Close ();
+				}
+			}
+		}
+
+		// FIXME: From testing .NET, this method should display a dialog
+		[MonoTODO]
+		public static void Fail (string message)
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.Fail (message);
+				}
+			}
+		}
+
+		// FIXME: From testing .NET, this method should display a dialog
+		[MonoTODO]
+		public static void Fail (string message, string detailMessage)
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.Fail (message, detailMessage);
+				}
+			}
+		}
+
+		public static void Flush ()
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners){
+					listener.Flush ();
+				}
+			}
+		}
+
+		public static void Indent ()
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.IndentLevel++;
+				}
+			}
+		}
+
+		public static void Unindent ()
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.IndentLevel--;
+				}
+			}
+		}
+
+		public static void Write (object value)
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.Write (value);
+
+					if (AutoFlush)
+						listener.Flush ();
+				}
+			}
+		}
+
+		public static void Write (string message)
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.Write (message);
+
+					if (AutoFlush)
+						listener.Flush ();
+				}
+			}
+		}
+
+		public static void Write (object value, string category)
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.Write (value, category);
+
+					if (AutoFlush)
+						listener.Flush ();
+				}
+			}
+		}
+
+		public static void Write (string message, string category)
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.Write (message, category);
+
+					if (AutoFlush)
+						listener.Flush ();
+				}
+			}
+		}
+
+		public static void WriteIf (bool condition, object value)
+		{
+			if (condition)
+				Write (value);
+		}
+
+		public static void WriteIf (bool condition, string message)
+		{
+			if (condition)
+				Write (message);
+		}
+
+		public static void WriteIf (bool condition, object value, 
+			string category)
+		{
+			if (condition)
+				Write (value, category);
+		}
+
+		public static void WriteIf (bool condition, string message, 
+			string category)
+		{
+			if (condition)
+				Write (message, category);
+		}
+
+		public static void WriteLine (object value)
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.WriteLine (value);
+
+					if (AutoFlush)
+						listener.Flush ();
+				}
+			}
+		}
+
+		public static void WriteLine (string message)
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.WriteLine (message);
+
+					if (AutoFlush)
+						listener.Flush ();
+				}
+			}
+		}
+
+		public static void WriteLine (object value, string category)
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.WriteLine (value, category);
+
+					if (AutoFlush)
+						listener.Flush ();
+				}
+			}
+		}
+
+		public static void WriteLine (string message, string category)
+		{
+			lock (lock_) {
+				foreach (TraceListener listener in Listeners) {
+					listener.WriteLine (message, category);
+
+					if (AutoFlush)
+						listener.Flush ();
+				}
+			}
+		}
+
+		public static void WriteLineIf (bool condition, object value)
+		{
+			if (condition)
+				WriteLine (value);
+		}
+
+		public static void WriteLineIf (bool condition, string message)
+		{
+			if (condition)
+				WriteLine (message);
+		}
+
+		public static void WriteLineIf (bool condition, object value, 
+			string category)
+		{
+			if (condition)
+				WriteLine (value, category);
+		}
+
+		public static void WriteLineIf (bool condition, string message, 
+			string category)
+		{
+			if (condition)
+				WriteLine (message, category);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/TraceLevel.cs b/mcs/class/System/System.Diagnostics/TraceLevel.cs
new file mode 100755
index 00000000000..f4f0ba6b4f1
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/TraceLevel.cs
@@ -0,0 +1,24 @@
+// TraceLevel.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:34:29 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Diagnostics {
+
+	public enum TraceLevel {
+		Off = 0,
+		Error = 1,
+		Warning = 2,
+		Info = 3,
+		Verbose = 4,
+	} 
+
+}
+
diff --git a/mcs/class/System/System.Diagnostics/TraceListener.cs b/mcs/class/System/System.Diagnostics/TraceListener.cs
new file mode 100644
index 00000000000..b32ced8eb1b
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/TraceListener.cs
@@ -0,0 +1,136 @@
+//
+// System.Diagnostics.TraceListener.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// Comments from John R. Hicks <angryjohn69@nc.rr.com> original implementation 
+// can be found at: /mcs/docs/apidocs/xml/en/System.Diagnostics
+//
+// (C) 2002 Jonathan Pryor
+//
+
+using System;
+using System.Diagnostics;
+
+namespace System.Diagnostics {
+
+	public abstract class TraceListener : MarshalByRefObject, IDisposable {
+
+		[ThreadStatic]
+		private int indentLevel = 0;
+
+		[ThreadStatic]
+		private int indentSize = 4;
+
+		private string name = null;
+		private bool needIndent = false;
+
+		protected TraceListener () : this ("")
+		{
+		}
+
+		protected TraceListener (string name)
+		{
+			Name = name;
+		}
+
+		public int IndentLevel {
+			get {return indentLevel;}
+			set {indentLevel = value;}
+		}
+
+		public int IndentSize {
+			get {return indentSize;}
+			set {indentSize = value;}
+		}
+
+		public virtual string Name {
+			get {return name;}
+			set {name = value;}
+		}
+
+		protected bool NeedIndent {
+			get {return needIndent;}
+			set {needIndent = value;}
+		}
+
+		public virtual void Close ()
+		{
+			Dispose ();
+		}
+
+		public void Dispose ()
+		{
+			Dispose (true);
+			GC.SuppressFinalize (this);
+		}
+
+		protected virtual void Dispose (bool disposing)
+		{
+		}
+
+		public virtual void Fail (string message)
+		{
+			Fail (message, "");
+		}
+
+		public virtual void Fail (string message, string detailMessage)
+		{
+			WriteLine ("---- DEBUG ASSERTION FAILED ----");
+			WriteLine ("---- Assert Short Message ----");
+			WriteLine (message);
+			WriteLine ("---- Assert Long Message ----");
+			WriteLine (detailMessage);
+			WriteLine ("");
+		}
+
+		public virtual void Flush ()
+		{
+		}
+
+		public virtual void Write (object o)
+		{
+			Write (o.ToString());
+		}
+
+		public abstract void Write (string message);
+
+		public virtual void Write (object o, string category)
+		{
+			Write (o.ToString(), category);
+		}
+
+		public virtual void Write (string message, string category)
+		{
+			Write (category + ": " + message);
+		}
+
+		protected virtual void WriteIndent ()
+		{
+			// Must set NeedIndent to false before Write; otherwise, we get endless
+			// recursion with Write->WriteIndent->Write->WriteIndent...*boom*
+			NeedIndent = false;
+			String indent = new String (' ', IndentLevel*IndentSize);
+			Write (indent);
+		}
+
+		public virtual void WriteLine (object o)
+		{
+			WriteLine (o.ToString());
+		}
+
+		public abstract void WriteLine (string message);
+
+		public virtual void WriteLine (object o, string category)
+		{
+			WriteLine (o.ToString(), category);
+		}
+
+		public virtual void WriteLine (string message, string category)
+		{
+			WriteLine (category + ": " + message);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/TraceListenerCollection.cs b/mcs/class/System/System.Diagnostics/TraceListenerCollection.cs
new file mode 100644
index 00000000000..8d32414efbc
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/TraceListenerCollection.cs
@@ -0,0 +1,210 @@
+//
+// System.Diagnostics.TraceListenerCollection.cs
+//
+// Authors:
+//   Jonathan Pryor (jonpryor@vt.edu)
+//
+// Comments from John R. Hicks <angryjohn69@nc.rr.com> original implementation 
+// can be found at: /mcs/docs/apidocs/xml/en/System.Diagnostics
+//
+// (C) 2002 Jonathan Pryor
+//
+
+
+using System;
+using System.Collections;
+using System.Diagnostics;
+using System.Globalization;
+
+namespace System.Diagnostics {
+
+	public class TraceListenerCollection : IList, ICollection, IEnumerable {
+
+		private ArrayList listeners = new ArrayList ();
+
+		internal TraceListenerCollection ()
+		{
+			Add (new DefaultTraceListener ());
+		}
+
+		public int Count{
+			get {return listeners.Count;}
+		}
+
+		public TraceListener this [string name] {
+			get {
+				foreach (TraceListener listener in listeners) {
+					if (listener.Name == name)
+						return listener;
+				}
+				return null;
+			}
+		}
+
+		public TraceListener this [int index] {
+			get {return (TraceListener) listeners[index];}
+			set {
+				InitializeListener (value);
+				listeners[index] = value;
+			}
+		}
+
+		object IList.this [int index] {
+			get {return listeners[index];}
+			set {
+				this[index] = (TraceListener) value;
+			}
+		}
+
+		bool ICollection.IsSynchronized {
+			get {return listeners.IsSynchronized;}
+		}
+
+		object ICollection.SyncRoot {
+			get {return listeners.SyncRoot;}
+		}
+
+		bool IList.IsFixedSize {
+			get {return listeners.IsFixedSize;}
+		}
+
+		bool IList.IsReadOnly {
+			get {return listeners.IsReadOnly;}
+		}
+
+		public int Add (TraceListener listener)
+		{
+			InitializeListener (listener);
+			return listeners.Add (listener);
+		}
+
+		private void InitializeListener (TraceListener listener)
+		{
+			listener.IndentLevel = TraceImpl.IndentLevel;
+			listener.IndentSize = TraceImpl.IndentSize;
+		}
+
+		private void InitializeRange (IList listeners)
+		{
+			int e = listeners.Count;
+			for (int i = 0; i != e; ++i)
+				InitializeListener (
+					(TraceListener) listeners[i]);
+		}
+
+		public void AddRange (TraceListener[] value)
+		{
+			InitializeRange (value);
+			listeners.AddRange (value);
+		}
+
+		public void AddRange (TraceListenerCollection value)
+		{
+			InitializeRange (value);
+			listeners.AddRange (value.listeners);
+		}
+
+		public void Clear ()
+		{
+			listeners.Clear ();
+		}
+
+		public bool Contains (TraceListener listener)
+		{
+			return listeners.Contains (listener);
+		}
+
+		public void CopyTo (TraceListener[] listeners, int index)
+		{
+			listeners.CopyTo (listeners, index);
+		}
+
+		public IEnumerator GetEnumerator ()
+		{
+			return listeners.GetEnumerator ();
+		}
+
+		void ICollection.CopyTo (Array array, int index)
+		{
+			listeners.CopyTo (array, index);
+		}
+
+		int IList.Add (object value)
+		{
+			if (value is TraceListener)
+				return Add ((TraceListener) value);
+			throw new NotSupportedException (Locale.GetText (
+				"You can only add TraceListener objects to the collection"));
+		}
+
+		bool IList.Contains (object value)
+		{
+			if (value is TraceListener)
+				return listeners.Contains (value);
+			return false;
+		}
+
+		int IList.IndexOf (object value)
+		{
+			if (value is TraceListener)
+				return listeners.IndexOf (value);
+			return -1;
+		}
+
+		void IList.Insert (int index, object value)
+		{
+			if (value is TraceListener) {
+				Insert (index, (TraceListener) value);
+				return;
+			}
+			throw new NotSupportedException (Locale.GetText (
+				"You can only insert TraceListener objects into the collection"));
+		}
+
+		void IList.Remove (object value)
+		{
+			if (value is TraceListener)
+				listeners.Remove (value);
+		}
+
+		public int IndexOf (TraceListener listener)
+		{
+			return listeners.IndexOf (listener);
+		}
+
+		public void Insert (int index, TraceListener listener)
+		{
+			InitializeListener (listener);
+			listeners.Insert (index, listener);
+		}
+
+		public void Remove (string name)
+		{
+			TraceListener found = null;
+
+			foreach (TraceListener listener in listeners) {
+				if (listener.Name == name) {
+					found = listener;
+					break;
+				}
+			}
+
+			if (found != null)
+				listeners.Remove (found);
+			else
+				throw new ArgumentException (Locale.GetText (
+					"TraceListener " + name + " was not in the collection"));
+		}
+
+		public void Remove (TraceListener listener)
+		{
+			listeners.Remove (listener);
+		}
+
+		public void RemoveAt (int index)
+		{
+			listeners.RemoveAt (index);
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Diagnostics/TraceSwitch.cs b/mcs/class/System/System.Diagnostics/TraceSwitch.cs
new file mode 100755
index 00000000000..e2404fe77cf
--- /dev/null
+++ b/mcs/class/System/System.Diagnostics/TraceSwitch.cs
@@ -0,0 +1,74 @@
+//
+// System.Diagnostics.TraceSwtich.cs
+//
+// Comments from John R. Hicks <angryjohn69@nc.rr.com> original implementation 
+// can be found at: /mcs/docs/apidocs/xml/en/System.Diagnostics
+//
+// Author:
+//	John R. Hicks (angryjohn69@nc.rr.com)
+//
+// (C) 2001
+//
+
+namespace System.Diagnostics
+{
+	public class TraceSwitch : Switch
+	{
+		private TraceLevel level;
+		private bool traceError = false;
+		private bool traceInfo = false;
+		private bool traceVerbose = false;
+		private bool traceWarning = false;
+
+		public TraceSwitch(string displayName, string description)
+			: base(displayName, description)
+		{
+		}
+
+		public TraceLevel Level
+		{
+			get 
+			{
+				return level;
+			}
+			set
+			{
+				level = value;
+			}
+
+		}
+
+		public bool TraceError
+		{
+			get 
+			{
+				return traceError;
+			}
+		}
+
+		public bool TraceInfo
+		{
+			get 
+			{
+				return traceInfo;
+			}
+		}
+
+		public bool TraceVerbose
+		{
+			get 
+			{
+				return traceVerbose;
+			}
+		}
+
+		public bool TraceWarning
+		{
+			get
+			{
+				return traceWarning;
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Globalization/Locale.cs b/mcs/class/System/System.Globalization/Locale.cs
new file mode 100755
index 00000000000..539184dbde4
--- /dev/null
+++ b/mcs/class/System/System.Globalization/Locale.cs
@@ -0,0 +1,22 @@
+//
+// System.Globalization.Locale.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+
+namespace System.Globalization {
+
+	internal class Locale {
+
+		/// <summary>
+		///   Returns the translated message for the current locale
+		/// </summary>
+		public static string GetText (string msg)
+		{
+			return msg;
+		}
+	}
+}
diff --git a/mcs/class/System/System.IO/ChangeLog b/mcs/class/System/System.IO/ChangeLog
new file mode 100755
index 00000000000..88e79691b01
--- /dev/null
+++ b/mcs/class/System/System.IO/ChangeLog
@@ -0,0 +1,27 @@
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* InternalBufferOverflowException.cs:
+	* NotifyFilters.cs:
+	* WatcherChangeTypes.cs: little fixes based on class status page.
+
+2002-08-15  Tim Coleman <tim@timcoleman.com>
+	* ErrorEventArgs.cs:
+	* ErrorEventHandler.cs:
+	* FileSystemEventArgs.cs:
+	* FileSystemEventHandler.cs:
+	* FileSystemWatcher.cs:
+	* InternalBufferOverflowException.cs:
+	* IODescriptionAttribute.cs:
+	* NotifyFilters.cs:
+	* RenamedEventArgs.cs:
+	* RenamedEventHandler.cs:
+	* WaitForChangedResult.cs:
+	* WatcherChangeTypes.cs:
+		New stubs added.
+
+2002-07-20  Dick Porter  <dick@ximian.com>
+
+	* MonoIO.cs: Cut down copy of corlib/System.IO/MonoIO.cs, so it
+	can be used from the System assembly but still not be exposed to
+	users.
+
diff --git a/mcs/class/System/System.IO/ErrorEventArgs.cs b/mcs/class/System/System.IO/ErrorEventArgs.cs
new file mode 100644
index 00000000000..49bc2c08677
--- /dev/null
+++ b/mcs/class/System/System.IO/ErrorEventArgs.cs
@@ -0,0 +1,39 @@
+// 

+// System.IO.ErrorEventArgs.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.IO {

+	public class ErrorEventArgs : EventArgs {

+

+		#region Fields

+

+		Exception exception;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public ErrorEventArgs (Exception exception) 

+		{

+			this.exception = exception;

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		public virtual Exception GetException ()

+		{

+			return exception;

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System/System.IO/ErrorEventHandler.cs b/mcs/class/System/System.IO/ErrorEventHandler.cs
new file mode 100644
index 00000000000..b4efe2d5b30
--- /dev/null
+++ b/mcs/class/System/System.IO/ErrorEventHandler.cs
@@ -0,0 +1,15 @@
+// 

+// System.IO.ErrorEventHandler.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.IO {

+	[Serializable]

+	public delegate void ErrorEventHandler (object sender, ErrorEventArgs e);

+}

diff --git a/mcs/class/System/System.IO/FileSystemEventArgs.cs b/mcs/class/System/System.IO/FileSystemEventArgs.cs
new file mode 100644
index 00000000000..b4595d49f1c
--- /dev/null
+++ b/mcs/class/System/System.IO/FileSystemEventArgs.cs
@@ -0,0 +1,51 @@
+// 

+// System.IO.FileSystemEventArgs.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.IO {

+	public class FileSystemEventArgs : EventArgs {

+

+		#region Fields

+

+		WatcherChangeTypes changeType;

+		string directory;

+		string name;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public FileSystemEventArgs (WatcherChangeTypes changeType, string directory, string name) 

+		{

+			this.changeType = changeType;

+			this.directory = directory;

+			this.name = name;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public WatcherChangeTypes ChangeType {

+			get { return changeType; }

+		}

+

+		public string FullPath {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string Name {

+			get { return name; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System/System.IO/FileSystemEventHandler.cs b/mcs/class/System/System.IO/FileSystemEventHandler.cs
new file mode 100644
index 00000000000..aa0efed9e41
--- /dev/null
+++ b/mcs/class/System/System.IO/FileSystemEventHandler.cs
@@ -0,0 +1,15 @@
+// 

+// System.IO.FileSystemEventHandler.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.IO {

+	[Serializable]

+	public delegate void FileSystemEventHandler (object sender, FileSystemEventArgs e);

+}

diff --git a/mcs/class/System/System.IO/FileSystemWatcher.cs b/mcs/class/System/System.IO/FileSystemWatcher.cs
new file mode 100644
index 00000000000..d5003bb912f
--- /dev/null
+++ b/mcs/class/System/System.IO/FileSystemWatcher.cs
@@ -0,0 +1,185 @@
+// 

+// System.IO.FileSystemWatcher.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.ComponentModel;

+

+namespace System.IO {

+	public class FileSystemWatcher : Component, ISupportInitialize {

+

+		#region Fields

+

+		bool enableRaisingEvents;

+		string filter;

+		bool includeSubdirectories;

+		int internalBufferSize;

+		NotifyFilters notifyFilter;

+		string path;

+		ISite site;

+		ISynchronizeInvoke synchronizingObject;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public FileSystemWatcher ()

+			: this (String.Empty, String.Empty)

+		{

+		}

+

+		public FileSystemWatcher (string path)

+			: this (path, String.Empty)

+		{

+		}

+

+		[MonoTODO]

+		public FileSystemWatcher (string path, string filter)

+		{

+			if (path == null)

+				throw new ArgumentNullException ();

+			if (filter == null)

+				throw new ArgumentNullException ();

+			if (path == String.Empty)

+				throw new ArgumentException ();

+

+			// if the path does not exist throw an ArgumentException

+

+			this.enableRaisingEvents = false;

+			this.filter = filter;

+			this.includeSubdirectories = false;

+			this.internalBufferSize = 8192;

+			this.notifyFilter = NotifyFilters.LastWrite | NotifyFilters.FileName | NotifyFilters.DirectoryName;

+			this.path = path;

+			this.synchronizingObject = null;

+		}

+

+		#endregion // Constructors

+

+		#region Properties

+

+		public bool EnableRaisingEvents {

+			get { return enableRaisingEvents; }

+			set { enableRaisingEvents = value; }

+		}

+

+		public string Filter {

+			get { return filter; }

+			set { filter = value; }

+		}

+

+		public bool IncludeSubdirectories {

+			get { return includeSubdirectories; }

+			set { includeSubdirectories = value; }

+		}

+

+		public int InternalBufferSize {

+			get { return internalBufferSize; }

+			set { internalBufferSize = value; }

+		}

+

+		public NotifyFilters NotifyFilter {

+			get { return notifyFilter; }

+			[MonoTODO ("Perform validation.")]

+			set { notifyFilter = value; }

+		}

+

+		public string Path {

+			get { return path; }

+			[MonoTODO ("Perform validation.")]

+			set { path = value; }

+		}

+

+		public override ISite Site {

+			get { return site; }

+			set { site = value; }

+		}

+

+		public ISynchronizeInvoke SynchronizingObject {

+			get { return synchronizingObject; }

+			set { synchronizingObject = value; }

+		}

+

+		#endregion // Properties

+

+		#region Methods

+	

+		[MonoTODO]

+		public void BeginInit ()

+		{

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		protected override void Dispose (bool disposing)

+		{

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		public void EndInit ()

+		{

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		protected void OnChanged (FileSystemEventArgs e)

+		{

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		protected void OnCreated (FileSystemEventArgs e)

+		{

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		protected void OnDeleted (FileSystemEventArgs e)

+		{

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		protected void OnError (ErrorEventArgs e)

+		{

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		protected void OnRenamed (RenamedEventArgs e)

+		{

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		public WaitForChangedResult WaitForChanged (WatcherChangeTypes changeType)

+		{

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		public WaitForChangedResult WaitForChanged (WatcherChangeTypes changeType, int timeout)

+		{

+			throw new NotImplementedException (); 

+		}

+

+

+		#endregion // Methods

+

+		#region Events and Delegates

+

+		public event FileSystemEventHandler Changed;

+		public event FileSystemEventHandler Created;

+		public event FileSystemEventHandler Deleted;

+		public event ErrorEventHandler Error;

+		public event RenamedEventHandler Renamed;

+

+		#endregion // Events and Delegates

+	}

+}

diff --git a/mcs/class/System/System.IO/IODescriptionAttribute.cs b/mcs/class/System/System.IO/IODescriptionAttribute.cs
new file mode 100644
index 00000000000..10e22173cc7
--- /dev/null
+++ b/mcs/class/System/System.IO/IODescriptionAttribute.cs
@@ -0,0 +1,40 @@
+// 

+// System.IO.IODescriptionAttribute.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.ComponentModel;

+

+namespace System.IO {

+	[AttributeUsage (AttributeTargets.All)]

+	public class IODescriptionAttribute : DescriptionAttribute {

+

+		#region Fields

+

+		string description;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public IODescriptionAttribute (string description)

+			: base (description)

+		{

+		}

+		

+		#endregion // Constructors

+

+		#region Methods

+

+		public override string Description {

+			get { return DescriptionValue; }

+		}

+

+		#endregion // Methods

+	}

+}

diff --git a/mcs/class/System/System.IO/InternalBufferOverflowException.cs b/mcs/class/System/System.IO/InternalBufferOverflowException.cs
new file mode 100644
index 00000000000..24d6b7cf760
--- /dev/null
+++ b/mcs/class/System/System.IO/InternalBufferOverflowException.cs
@@ -0,0 +1,41 @@
+// 

+// System.IO.InternalBufferOverflowException.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+using System.Runtime.Serialization;

+

+namespace System.IO {

+	[Serializable]

+	public class InternalBufferOverflowException : SystemException {

+

+		#region Constructors

+

+		public InternalBufferOverflowException ()

+			: base ("Internal buffer overflow occurred.")

+		{

+		}

+

+		public InternalBufferOverflowException (string message)

+			: base (message)

+		{

+		}

+

+		protected InternalBufferOverflowException (SerializationInfo info, StreamingContext context)

+			: base (info, context)

+		{

+		}

+

+		public InternalBufferOverflowException (string message, Exception innerException)

+			: base (message, innerException)

+		{

+		}

+

+		#endregion // Constructors

+	}

+}

diff --git a/mcs/class/System/System.IO/MonoIO.cs b/mcs/class/System/System.IO/MonoIO.cs
new file mode 100755
index 00000000000..911b8c245ad
--- /dev/null
+++ b/mcs/class/System/System.IO/MonoIO.cs
@@ -0,0 +1,51 @@
+//
+// System.IO.MonoIO.cs: static interface to native filesystem.
+//
+// Author:
+//   Dan Lewis (dihlewis@yahoo.co.uk)
+//   Dick Porter (dick@ximian.com)
+//
+// (C) 2002
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+// This is a heavily cut down version of the corlib class.  It's here
+// because we're keeping extensions invisible, but
+// System.Diagnostics.Process needs access to some of the
+// functionality (and CVS can't do symlinks).
+
+namespace System.IO
+{
+	internal sealed class MonoIO {
+
+		// handle methods
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool Close (IntPtr handle);
+		
+		// console handles
+
+		public extern static IntPtr ConsoleOutput {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		public extern static IntPtr ConsoleInput {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		public extern static IntPtr ConsoleError {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		// pipe handles
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool CreatePipe (out IntPtr read_handle, out IntPtr write_handle);
+	}
+}
+
diff --git a/mcs/class/System/System.IO/NotifyFilters.cs b/mcs/class/System/System.IO/NotifyFilters.cs
new file mode 100644
index 00000000000..17ae0951563
--- /dev/null
+++ b/mcs/class/System/System.IO/NotifyFilters.cs
@@ -0,0 +1,25 @@
+// 

+// System.IO.NotifyFilters.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.IO {

+	[Flags]

+	[Serializable]

+	public enum NotifyFilters {

+		Attributes = 4,

+		CreationTime = 64,

+		DirectoryName = 2,

+		FileName = 1,

+		LastAccess = 32,

+		LastWrite = 16,

+		Security = 256,

+		Size = 8

+	}

+}

diff --git a/mcs/class/System/System.IO/RenamedEventArgs.cs b/mcs/class/System/System.IO/RenamedEventArgs.cs
new file mode 100644
index 00000000000..134dca7a4b1
--- /dev/null
+++ b/mcs/class/System/System.IO/RenamedEventArgs.cs
@@ -0,0 +1,44 @@
+// 

+// System.IO.RenamedEventArgs.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.IO {

+	public class RenamedEventArgs : FileSystemEventArgs {

+

+		#region Fields

+

+		string oldName;

+

+		#endregion // Fields

+

+		#region Constructors

+

+		public RenamedEventArgs (WatcherChangeTypes changeType, string directory, string name, string oldName)

+			: base (changeType, directory, name)

+		{

+			this.oldName = oldName;

+		}

+		

+		#endregion // Constructors

+

+		#region Properties

+

+		public string OldFullPath {

+			[MonoTODO]

+			get { throw new NotImplementedException (); }

+		}

+

+		public string OldName {

+			get { return oldName; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System/System.IO/RenamedEventHandler.cs b/mcs/class/System/System.IO/RenamedEventHandler.cs
new file mode 100644
index 00000000000..50b28412391
--- /dev/null
+++ b/mcs/class/System/System.IO/RenamedEventHandler.cs
@@ -0,0 +1,15 @@
+// 

+// System.IO.FileSystemEventHandler.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.IO {

+	[Serializable]

+	public delegate void RenamedEventHandler (object sender, RenamedEventArgs e);

+}

diff --git a/mcs/class/System/System.IO/WaitForChangedResult.cs b/mcs/class/System/System.IO/WaitForChangedResult.cs
new file mode 100644
index 00000000000..e2e33cd95d7
--- /dev/null
+++ b/mcs/class/System/System.IO/WaitForChangedResult.cs
@@ -0,0 +1,48 @@
+// 

+// System.IO.WaitForChangedResult.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.IO {

+	public struct WaitForChangedResult {

+

+		#region Fields

+

+		WatcherChangeTypes changeType;

+		string name;

+		string oldName;

+		bool timedOut;

+

+		#endregion // Fields

+		

+		#region Properties

+

+		public WatcherChangeTypes ChangeType {

+			get { return changeType; }

+			set { changeType = value; }

+		}

+

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		public string OldName {

+			get { return oldName; }

+			set { oldName = value; }

+		}

+

+		public bool TimedOut {

+			get { return timedOut; }

+			set { timedOut = value; }

+		}

+

+		#endregion // Properties

+	}

+}

diff --git a/mcs/class/System/System.IO/WatcherChangeTypes.cs b/mcs/class/System/System.IO/WatcherChangeTypes.cs
new file mode 100644
index 00000000000..cb4d175dd9c
--- /dev/null
+++ b/mcs/class/System/System.IO/WatcherChangeTypes.cs
@@ -0,0 +1,22 @@
+// 

+// System.IO.WatcherChangeTypes.cs

+//

+// Author:

+//   Tim Coleman (tim@timcoleman.com)

+//

+// Copyright (C) Tim Coleman, 2002

+//

+

+using System;

+

+namespace System.IO {

+	[Flags]

+	[Serializable]

+	public enum WatcherChangeTypes {

+		All = 0xF,

+		Changed = 4,

+		Created = 1,

+		Deleted = 2,

+		Renamed = 8

+	}

+}

diff --git a/mcs/class/System/System.Net.Sockets/AddressFamily.cs b/mcs/class/System/System.Net.Sockets/AddressFamily.cs
new file mode 100644
index 00000000000..c53fd8835b1
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/AddressFamily.cs
@@ -0,0 +1,50 @@
+// AddressFamily.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:31:59 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net.Sockets {
+
+
+	[Serializable]
+	public enum AddressFamily {
+		Unknown = -1,
+		Unspecified = 0,
+		Unix = 1,
+		InterNetwork = 2,
+		ImpLink = 3,
+		Pup = 4,
+		Chaos = 5,
+		NS = 6,
+		Ipx = 6,
+		Iso = 7,
+		Osi = 7,
+		Ecma = 8,
+		DataKit = 9,
+		Ccitt = 10,
+		Sna = 11,
+		DecNet = 12,
+		DataLink = 13,
+		Lat = 14,
+		HyperChannel = 15,
+		AppleTalk = 16,
+		NetBios = 17,
+		VoiceView = 18,
+		FireFox = 19,
+		Banyan = 21,
+		Atm = 22,
+		InterNetworkV6 = 23,
+		Cluster = 24,
+		Ieee12844 = 25,
+		Irda = 26,
+		NetworkDesigners = 28,
+		Max = 29,
+	}
+}
diff --git a/mcs/class/System/System.Net.Sockets/ChangeLog b/mcs/class/System/System.Net.Sockets/ChangeLog
new file mode 100644
index 00000000000..fdfae71d2ad
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/ChangeLog
@@ -0,0 +1,70 @@
+2002-08-20  Dick Porter  <dick@ximian.com>
+
+	* Socket.cs: Fix deadlock when the AsyncResult callback calls
+	End*().  Set the async request's worker property so it can return
+	results.  These two fixes combined fix bug 28092.
+
+2002-06-24  Dick Porter  <dick@ximian.com>
+
+	* Socket.cs: Make SetSocketOption cope with boolean values (they
+	are passed as objects, not the ints the runtime was expecting)
+
+2002-05-17  Lawrence Pit <loz@cable.a2000.nl>
+ 	* TcpListener.cs: Renamed LocalEndPoint to LocalEndpoint
+	* NetworkStream.cs, UdpClient.cs and TcpClient.cs: modified disposable 
+	routines, added	checks for disposed state.
+	* UdpClient.cs: commented out GetHashCode and Equals as it's not
+	overriden in ms.net implementation.
+
+2002-05-17  Jaroslaw Kowalski <jarek@atm.com.pl>
+	* TcpClient.cs: fixed SetTcpClient so that
+	TcpListener.AcceptTcpClient works and allows
+	you to call GetStream() on its result
+
+2002-04-24  Dick Porter  <dick@ximian.com>
+
+	* Socket.cs (Poll): Give correct argument to Select(), as spotted
+	by Jaroslaw Kowalski <jarek@atm.com.pl>
+
+2002-04-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* UdpClient.cs: implemented.
+
+2002-04-02  Dick Porter  <dick@ximian.com>
+
+	* TcpListener.cs: in Start(), set the socket listen backlog value
+	to a sane value (noticed by Jonathan Stowe <gellyfish@gellyfish.com>)
+
+2002-02-13  Dick Porter  <dick@ximian.com>
+
+	* Socket.cs: Implemenent Select, Blocking, Connected,
+	GetSocketOption, Poll, SetSocketOption and Shutdown
+
+	* MulticastOption.cs: 
+	* LingerOption.cs: Delete override methods that don't need to be
+	implemented
+
+2002-01-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* NetworkStream.cs: Implement class.
+
+2002-01-23  Dick Porter  <dick@ximian.com>
+
+	* SocketException.cs: Implemented
+
+	* Socket.cs: Implemented most methods
+
+	* LingerOption.cs: Made compile
+
+	* AddressFamily.cs: Removed empty auto-generated comments
+
+2002-01-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* SocketException.cs: Reimplemented.
+
+2002-01-06  Ravi Pratap  <ravi@ximian.com>
+
+	* ChangeLog : Add to this directory.
+
+	* SocketException.cs, TcpClient.cs, TcpListener.cs : MonoTODO
+	attribute decoration.
diff --git a/mcs/class/System/System.Net.Sockets/LingerOption.cs b/mcs/class/System/System.Net.Sockets/LingerOption.cs
new file mode 100644
index 00000000000..4c6117f5035
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/LingerOption.cs
@@ -0,0 +1,42 @@
+//
+// System.Net.Sockets.LingerOption.cs
+//
+// Author:
+//   Andrew Sutton
+//
+// (C) Andrew Sutton
+//
+
+using System;
+
+namespace System.Net.Sockets
+{
+	// <remarks>
+	//   Encapsulates a linger option.
+	// </remarks>
+	public class LingerOption
+	{
+		// Don't change the names of these fields without also
+		// changing socket-io.c in the runtime
+		private bool	enabled;
+		protected int	seconds;
+
+		public LingerOption (bool enable, int secs)
+		{
+			enabled = enable;
+			seconds = secs;
+		}
+
+		public bool Enabled
+		{
+			get { return enabled; }
+			set { enabled = value; }
+		}
+
+		public int LingerTime
+		{
+			get { return seconds; }
+			set { seconds = value; }
+		}
+	}
+}
diff --git a/mcs/class/System/System.Net.Sockets/MulticastOption.cs b/mcs/class/System/System.Net.Sockets/MulticastOption.cs
new file mode 100644
index 00000000000..759cd48f314
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/MulticastOption.cs
@@ -0,0 +1,48 @@
+//
+// System.Net.Sockets.MulticastOption.cs
+//
+// Author:
+//   Andrew Sutton
+//
+// (C) Andrew Sutton
+//
+
+using System;
+using System.Net;
+
+namespace System.Net.Sockets
+{
+	// <remarks>
+	//   Encapsulates a multicast option
+	// </remarks>
+	public class MulticastOption
+	{
+		// Don't change the names of these fields without also
+		// changing socket-io.c in the runtime
+		private IPAddress group;
+		protected IPAddress local;
+
+		public MulticastOption (IPAddress grp)
+		{
+			group = grp;
+		}
+
+		public MulticastOption (IPAddress grp, IPAddress addr)
+		{
+			group = grp;
+			local = addr;
+		}
+
+		public IPAddress Group
+		{
+			get { return group; }
+			set { group = value; }
+		}
+
+		public IPAddress LocalAddress
+		{
+			get { return local; }
+			set { local = value; }
+		}
+	}
+}
diff --git a/mcs/class/System/System.Net.Sockets/NetworkStream.cs b/mcs/class/System/System.Net.Sockets/NetworkStream.cs
new file mode 100644
index 00000000000..d304795eef3
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/NetworkStream.cs
@@ -0,0 +1,307 @@
+//
+// System.Net.Sockets.NetworkStream.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System.IO;
+
+namespace System.Net.Sockets
+{
+	public class NetworkStream : Stream, IDisposable {
+		FileAccess access;
+		Socket socket;
+		bool owns_socket;
+		bool readable, writeable;
+		bool disposed = false;
+		
+		public NetworkStream (Socket socket)
+			: this (socket, FileAccess.ReadWrite, false)
+		{
+		}
+
+		public NetworkStream (Socket socket, bool owns_socket)
+			: this (socket, FileAccess.ReadWrite, owns_socket)
+		{
+		}
+
+		public NetworkStream (Socket socket, FileAccess access)
+			: this (socket, access, false)
+		{
+		}
+		
+		public NetworkStream (Socket socket, FileAccess access, bool owns_socket)
+		{
+			if (socket == null)
+				throw new ArgumentNullException ();
+			if (!socket.Connected)
+				throw new ArgumentException ("Not connected", "socket");
+			if (socket.SocketType != SocketType.Stream)
+				throw new ArgumentException ("Socket is not of type Stream", "socket");
+			if (!socket.Blocking)
+				throw new IOException ();
+			
+			this.socket = socket;
+			this.owns_socket = owns_socket;
+			this.access = access;
+
+			readable = CanRead;
+			writeable = CanWrite;
+		}
+
+		public override bool CanRead {
+			get {
+				return access == FileAccess.ReadWrite || access == FileAccess.Read;
+			}
+		}
+
+		public override bool CanSeek {
+			get {
+				// network sockets cant seek.
+				return false;
+			}
+		}
+
+		public override bool CanWrite {
+			get {
+				return access == FileAccess.ReadWrite || access == FileAccess.Write;
+			}
+		}
+
+		public virtual bool DataAvailable {
+			get {
+				try {
+					return socket.Available > 0;
+				} finally {
+					CheckDisposed ();
+				}
+			}
+		}
+
+		public override long Length {
+			get {
+				// Network sockets always throw an exception
+				throw new NotSupportedException ();
+			}
+		}
+
+		public override long Position {
+			get {
+				// Network sockets always throw an exception
+				throw new NotSupportedException ();
+			}
+			
+			set {
+				// Network sockets always throw an exception
+				throw new NotSupportedException ();
+			}
+		}
+
+		protected bool Readable {
+			get {
+				return readable;
+			}
+
+			set {
+				readable = value;
+			}
+		}
+
+		protected Socket Socket {
+			get {
+				return socket;
+			}
+		}
+
+		protected bool Writeable {
+			get {
+				return writeable;
+			}
+
+			set {
+				writeable = value;
+			}
+		}
+
+		public override IAsyncResult BeginRead (byte [] buffer, int offset, int size,
+							AsyncCallback callback, object state)
+		{
+			try {
+				IAsyncResult retval;
+
+				if (buffer == null)
+					throw new ArgumentNullException ();
+				int len = buffer.Length;
+				if (offset >= len || size != len)
+					throw new ArgumentOutOfRangeException ();
+
+				try {
+					retval = socket.BeginReceive (buffer, offset, size, 0, callback, state);
+				} catch {
+					throw new IOException ("BeginReceive failure");
+				}
+
+				return retval;
+			} finally {		
+				CheckDisposed ();				
+			}
+		}
+
+		public override IAsyncResult BeginWrite (byte [] buffer, int offset, int size,
+							AsyncCallback callback, object state)
+		{
+			try {
+				IAsyncResult retval;
+
+				if (buffer == null)
+					throw new ArgumentNullException ();
+
+				int len = buffer.Length;
+				if (len < size)
+					throw new ArgumentException ();
+
+				try {
+					retval = socket.BeginSend (buffer, offset, size, 0, callback, state);
+				} catch {
+					throw new IOException ("BeginWrite failure");
+				}
+
+				return retval;
+			} finally {
+				CheckDisposed ();
+			}
+		}
+
+		~NetworkStream ()
+		{
+			Dispose (false);
+		}
+		
+		public override void Close ()
+		{
+			((IDisposable) this).Dispose ();
+		}
+
+		protected virtual void Dispose (bool disposing)
+		{
+			if (disposed) 
+				return;
+			disposed = true;
+			
+			if (owns_socket) {
+				Socket s = socket;
+				if (s != null)
+					s.Close ();
+			}
+			socket = null;
+		}
+
+		public override int EndRead (IAsyncResult ar)
+		{
+			try {
+				int res;
+
+				if (ar == null)
+					throw new ArgumentNullException ();
+
+				try {
+					res = socket.EndReceive (ar);
+				} catch {
+					throw new IOException ("EndRead failure");
+				}
+				return res;
+			} finally {
+				CheckDisposed ();
+			}
+		}
+
+		public override void EndWrite (IAsyncResult ar)
+		{
+			try {			
+				if (ar == null)
+					throw new ArgumentNullException ();
+
+				try {
+					socket.EndSend (ar);
+				} catch {
+					throw new IOException ("EndWrite failure");
+				}
+			} finally {
+				CheckDisposed ();
+			}
+		}
+
+		public override void Flush ()
+		{
+			// network streams are non-buffered, this is a no-op
+		}
+
+		void IDisposable.Dispose ()
+		{
+			Dispose (true);
+			GC.SuppressFinalize (this);
+		}
+
+		public override int Read (byte [] buffer, int offset, int size)
+		{
+			try {
+				int res;
+
+				if (buffer == null)
+					throw new ArgumentNullException ();
+				if (buffer.Length < size)
+					throw new ArgumentException ();
+
+				try {
+					res = socket.Receive (buffer, offset, size, 0);
+				} catch {
+					throw new IOException ("Read failure");
+				}
+				return res;
+			} finally { 
+				CheckDisposed ();
+			}
+		}
+
+		public override long Seek (long offset, SeekOrigin origin)
+		{
+			// NetworkStream objects do not support seeking.
+			
+			throw new NotSupportedException ();
+		}
+
+		public override void SetLength (long value)
+		{
+			// NetworkStream objects do not support SetLength
+			
+			throw new NotSupportedException ();
+		}
+
+		public override void Write (byte [] buffer, int offset, int size)
+		{
+			try {
+				if (buffer == null)
+					throw new ArgumentNullException ();
+				if (buffer.Length < size)
+					throw new ArgumentException ();
+				try {
+					socket.Send (buffer, offset, size, 0);
+				} catch {
+					throw new IOException ("Write failure"); 
+				}
+			} finally {
+				CheckDisposed ();
+			}
+		}
+		
+		private void CheckDisposed ()
+		{
+			if (disposed)
+				throw new ObjectDisposedException (GetType().FullName);
+		}		
+	     
+	}
+}
diff --git a/mcs/class/System/System.Net.Sockets/ProtocolFamily.cs b/mcs/class/System/System.Net.Sockets/ProtocolFamily.cs
new file mode 100644
index 00000000000..cf6d59acfc2
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/ProtocolFamily.cs
@@ -0,0 +1,47 @@
+//
+// System.Net.Sockets.ProtocolFamily.cs
+//
+// Author:
+//   Andrew Sutton
+//
+// (C) Andrew Sutton
+//
+
+namespace System.Net.Sockets
+{
+	public enum ProtocolFamily
+	{
+		Unknown = -1,
+		Unspecified = 0,
+		Unix,
+		InterNetwork,
+		ImpLink,
+		Pup,
+		Chaos,
+		Ipx,
+		Iso,
+		Ecma,
+		DataKit,
+		Ccitt,
+		Sna,
+		DecNet,
+		DataLink,
+		Lat,
+		HyperChannel,
+		AppleTalk,
+		NetBios,
+		VoiceView,
+		FireFox,
+		Banyan = 0x15,
+		Atm,
+		InterNetworkV6,
+		Cluster,
+		Ieee12844,
+		Irda,
+		NetworkDesigners = 0x1c,
+		Max,
+
+		NS = Ipx,
+		Osi = Iso,
+	}
+}
diff --git a/mcs/class/System/System.Net.Sockets/ProtocolType.cs b/mcs/class/System/System.Net.Sockets/ProtocolType.cs
new file mode 100644
index 00000000000..0b106e5f946
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/ProtocolType.cs
@@ -0,0 +1,81 @@
+// ProtocolType.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:32:24 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net.Sockets {
+
+
+	/// <summary>
+	/// </summary>
+	public enum ProtocolType {
+
+		/// <summary>
+		/// </summary>
+		IP = 0,
+
+		/// <summary>
+		/// </summary>
+		Icmp = 1,
+
+		/// <summary>
+		/// </summary>
+		Igmp = 2,
+
+		/// <summary>
+		/// </summary>
+		Ggp = 3,
+
+		/// <summary>
+		/// </summary>
+		Tcp = 6,
+
+		/// <summary>
+		/// </summary>
+		Pup = 12,
+
+		/// <summary>
+		/// </summary>
+		Udp = 17,
+
+		/// <summary>
+		/// </summary>
+		Idp = 22,
+
+		/// <summary>
+		/// </summary>
+		ND = 77,
+
+		/// <summary>
+		/// </summary>
+		Raw = 255,
+
+		/// <summary>
+		/// </summary>
+		Unspecified = 0,
+
+		/// <summary>
+		/// </summary>
+		Ipx = 1000,
+
+		/// <summary>
+		/// </summary>
+		Spx = 1256,
+
+		/// <summary>
+		/// </summary>
+		SpxII = 1257,
+
+		/// <summary>
+		/// </summary>
+		Unknown = -1,
+	} // ProtocolType
+
+} // System.Net.Sockets
diff --git a/mcs/class/System/System.Net.Sockets/SelectMode.cs b/mcs/class/System/System.Net.Sockets/SelectMode.cs
new file mode 100644
index 00000000000..587f2a1d1b6
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/SelectMode.cs
@@ -0,0 +1,33 @@
+// SelectMode.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:32:30 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net.Sockets {
+
+
+	/// <summary>
+	/// </summary>
+	public enum SelectMode {
+
+		/// <summary>
+		/// </summary>
+		SelectRead = 0,
+
+		/// <summary>
+		/// </summary>
+		SelectWrite = 1,
+
+		/// <summary>
+		/// </summary>
+		SelectError = 2,
+	} // SelectMode
+
+} // System.Net.Sockets
diff --git a/mcs/class/System/System.Net.Sockets/Socket.cs b/mcs/class/System/System.Net.Sockets/Socket.cs
new file mode 100644
index 00000000000..85c72df0d84
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/Socket.cs
@@ -0,0 +1,963 @@
+// System.Net.Sockets.Socket.cs
+//
+// Authors:
+//    Phillip Pearson (pp@myelin.co.nz)
+//    Dick Porter <dick@ximian.com>
+//
+// Copyright (C) 2001, 2002 Phillip Pearson and Ximian, Inc.
+//    http://www.myelin.co.nz
+//
+
+using System;
+using System.Net;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Threading;
+
+namespace System.Net.Sockets 
+{
+	public class Socket : IDisposable 
+	{
+		private sealed class SocketAsyncResult: IAsyncResult 
+		{
+			private object state;
+			private WaitHandle waithandle;
+			private bool completed_sync, completed;
+			private Worker worker;
+
+			public SocketAsyncResult(object state) {
+				this.state=state;
+				waithandle=new ManualResetEvent(false);
+				completed_sync=completed=false;
+			}
+
+			public object AsyncState {
+				get {
+					return(state);
+				}
+			}
+
+			public WaitHandle AsyncWaitHandle {
+				get {
+					return(waithandle);
+				}
+				set {
+					waithandle=value;
+				}
+			}
+
+			public bool CompletedSynchronously {
+				get {
+					return(completed_sync);
+				}
+			}
+
+			public bool IsCompleted {
+				get {
+					return(completed);
+				}
+				set {
+					completed=value;
+				}
+			}
+			
+			public Worker Worker {
+				get {
+					return(worker);
+				}
+				set {
+					worker=value;
+				}
+			}
+		}
+
+		private sealed class Worker 
+		{
+			private AsyncCallback callback;
+			private SocketAsyncResult result;
+			private Socket socket;
+
+			// Parameters
+			private EndPoint endpoint;	// Connect,ReceiveFrom,SendTo
+			private byte[] buffer;		// Receive,ReceiveFrom,Send,SendTo
+			private int offset;		// Receive,ReceiveFrom,Send,SendTo
+			private int size;		// Receive,ReceiveFrom,Send,SendTo
+			private SocketFlags sockflags;	// Receive,ReceiveFrom,Send,SendTo
+
+			// Return values
+			private Socket acc_socket;
+			private int total;
+			
+
+			// For Accept
+			public Worker(Socket req_sock,
+				      AsyncCallback req_callback,
+				      SocketAsyncResult req_result)
+				: this(req_sock, null, 0, 0, SocketFlags.None,
+				       null, req_callback, req_result) {}
+
+			// For Connect
+			public Worker(Socket req_sock, EndPoint req_endpoint,
+				      AsyncCallback req_callback,
+				      SocketAsyncResult req_result)
+				: this(req_sock, null, 0, 0, SocketFlags.None,
+				       req_endpoint, req_callback,
+				       req_result) {}
+
+			// For Receive and Send
+			public Worker(Socket req_sock, byte[] req_buffer,
+				      int req_offset, int req_size,
+				      SocketFlags req_sockflags,
+				      AsyncCallback req_callback,
+				      SocketAsyncResult req_result)
+				: this(req_sock, req_buffer, req_offset,
+				       req_size, req_sockflags, null,
+				       req_callback, req_result) {}
+
+			// For ReceiveFrom and SendTo
+			public Worker(Socket req_sock, byte[] req_buffer,
+				      int req_offset, int req_size,
+				      SocketFlags req_sockflags,
+				      EndPoint req_endpoint,
+				      AsyncCallback req_callback,
+				      SocketAsyncResult req_result) {
+				socket=req_sock;
+				buffer=req_buffer;
+				offset=req_offset;
+				size=req_size;
+				sockflags=req_sockflags;
+				endpoint=req_endpoint;
+				callback=req_callback;
+				result=req_result;
+			}
+
+			private void End() {
+				((ManualResetEvent)result.AsyncWaitHandle).Set();
+				callback(result);
+				result.IsCompleted=true;
+			}
+			
+			public void Accept() {
+				lock(result) {
+					acc_socket=socket.Accept();
+					End();
+				}
+			}
+
+			public void Connect() {
+				lock(result) {
+					socket.Connect(endpoint);
+					End();
+				}
+			}
+
+			public void Receive() {
+				lock(result) {
+					total=socket.Receive(buffer, offset,
+							     size, sockflags);
+					End();
+				}
+			}
+
+			public void ReceiveFrom() {
+				lock(result) {
+					total=socket.ReceiveFrom(buffer,
+								 offset, size,
+								 sockflags,
+								 ref endpoint);
+					End();
+				}
+			}
+
+			public void Send() {
+				lock(result) {
+					total=socket.Send(buffer, offset, size,
+							  sockflags);
+					End();
+				}
+			}
+
+			public void SendTo() {
+				lock(result) {
+					total=socket.SendTo(buffer, offset,
+							    size, sockflags,
+							    endpoint);
+					End();
+				}
+			}
+
+			public EndPoint EndPoint {
+				get {
+					return(endpoint);
+				}
+			}
+
+			public Socket Socket {
+				get {
+					return(acc_socket);
+				}
+			}
+
+			public int Total {
+				get {
+					return(total);
+				}
+			}
+		}
+			
+		/* the field "socket" is looked up by name by the runtime */
+		private IntPtr socket;
+		private AddressFamily address_family;
+		private SocketType socket_type;
+		private ProtocolType protocol_type;
+		private bool blocking=true;
+
+		/* When true, the socket was connected at the time of
+		 * the last IO operation
+		 */
+		private bool connected=false;
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Select_internal(ref Socket[] read,
+							   ref Socket[] write,
+							   ref Socket[] err,
+							   int timeout);
+
+		public static void Select(IList read_list, IList write_list,
+					  IList err_list, int time_us) {
+			if(read_list==null &&
+			   write_list==null &&
+			   err_list==null) {
+				throw new ArgumentNullException();
+			}
+
+			int read_count, write_count, err_count;
+
+			if(read_list!=null) {
+				read_count=read_list.Count;
+			} else {
+				read_count=0;
+			}
+
+			if(write_list!=null) {
+				write_count=write_list.Count;
+			} else {
+				write_count=0;
+			}
+
+			if(err_list!=null) {
+				err_count=err_list.Count;
+			} else {
+				err_count=0;
+			}
+			
+			Socket[] read_arr=new Socket[read_count];
+			Socket[] write_arr=new Socket[write_count];
+			Socket[] err_arr=new Socket[err_count];
+
+			int i;
+
+			if(read_list!=null) {
+				i=0;
+				
+				foreach (Socket s in read_list) {
+					read_arr[i]=s;
+					i++;
+				}
+			}
+
+			if(write_list!=null) {
+				i=0;
+				foreach (Socket s in write_list) {
+					write_arr[i]=s;
+					i++;
+				}
+			}
+			
+			if(err_list!=null) {
+				i=0;
+				foreach (Socket s in err_list) {
+					err_arr[i]=s;
+					i++;
+				}
+			}
+
+			Select_internal(ref read_arr, ref write_arr,
+					ref err_arr, time_us);
+
+			if(read_list!=null) {
+				read_list.Clear();
+				for(i=0; i<read_arr.Length; i++) {
+					read_list.Add(read_arr[i]);
+				}
+			}
+			
+			if(write_list!=null) {
+				write_list.Clear();
+				for(i=0; i<write_arr.Length; i++) {
+					write_list.Add(write_arr[i]);
+				}
+			}
+			
+			if(err_list!=null) {
+				err_list.Clear();
+				for(i=0; i<err_arr.Length; i++) {
+					err_list.Add(err_arr[i]);
+				}
+			}
+		}
+
+		// private constructor used by Accept, which already
+		// has a socket handle to use
+		private Socket(AddressFamily family, SocketType type,
+			       ProtocolType proto, IntPtr sock) {
+			address_family=family;
+			socket_type=type;
+			protocol_type=proto;
+			
+			socket=sock;
+			connected=true;
+		}
+		
+		// Creates a new system socket, returning the handle
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern IntPtr Socket_internal(AddressFamily family,
+						      SocketType type,
+						      ProtocolType proto);
+		
+		public Socket(AddressFamily family, SocketType type,
+			      ProtocolType proto) {
+			address_family=family;
+			socket_type=type;
+			protocol_type=proto;
+			
+			socket=Socket_internal(family, type, proto);
+		}
+
+		public AddressFamily AddressFamily {
+			get {
+				return(address_family);
+			}
+		}
+
+		// Returns the amount of data waiting to be read on socket
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static int Available_internal(IntPtr socket);
+		
+		public int Available {
+			get {
+				return(Available_internal(socket));
+			}
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Blocking_internal(IntPtr socket,
+							    bool block);
+
+		public bool Blocking {
+			get {
+				return(blocking);
+			}
+			set {
+				Blocking_internal(socket, value);
+				blocking=value;
+			}
+		}
+
+		public bool Connected {
+			get {
+				return(connected);
+			}
+		}
+
+		public IntPtr Handle {
+			get {
+				return(socket);
+			}
+		}
+
+		// Returns the local endpoint details in addr and port
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static SocketAddress LocalEndPoint_internal(IntPtr socket);
+
+		[MonoTODO("Support non-IP endpoints")]
+		public EndPoint LocalEndPoint {
+			get {
+				SocketAddress sa;
+				
+				sa=LocalEndPoint_internal(socket);
+
+				if(sa.Family==AddressFamily.InterNetwork) {
+					// Stupidly, EndPoint.Create() is an
+					// instance method
+					return new IPEndPoint(0, 0).Create(sa);
+				} else {
+					throw new NotImplementedException();
+				}
+			}
+		}
+
+		public ProtocolType ProtocolType {
+			get {
+				return(protocol_type);
+			}
+		}
+
+		// Returns the remote endpoint details in addr and port
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static SocketAddress RemoteEndPoint_internal(IntPtr socket);
+
+		[MonoTODO("Support non-IP endpoints")]
+		public EndPoint RemoteEndPoint {
+			get {
+				SocketAddress sa;
+				
+				sa=RemoteEndPoint_internal(socket);
+
+				if(sa.Family==AddressFamily.InterNetwork) {
+					// Stupidly, EndPoint.Create() is an
+					// instance method
+					return new IPEndPoint(0, 0).Create(sa);
+				} else {
+					throw new NotImplementedException();
+				}
+			}
+		}
+
+		public SocketType SocketType {
+			get {
+				return(socket_type);
+			}
+		}
+
+		// Creates a new system socket, returning the handle
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static IntPtr Accept_internal(IntPtr sock);
+		
+		public Socket Accept() {
+			IntPtr sock=Accept_internal(socket);
+			
+			return(new Socket(this.AddressFamily, this.SocketType,
+					  this.ProtocolType, sock));
+		}
+
+		public IAsyncResult BeginAccept(AsyncCallback callback,
+						object state) {
+			SocketAsyncResult req=new SocketAsyncResult(state);
+			Worker worker=new Worker(this, callback, req);
+			req.Worker=worker;
+			Thread child=new Thread(new ThreadStart(worker.Accept));
+			child.Start();
+			return(req);
+		}
+
+		public IAsyncResult BeginConnect(EndPoint end_point,
+						 AsyncCallback callback,
+						 object state) {
+			SocketAsyncResult req=new SocketAsyncResult(state);
+			Worker worker=new Worker(this, end_point, callback,
+						 req);
+			req.Worker=worker;
+			Thread child=new Thread(new ThreadStart(worker.Connect));
+			child.Start();
+			return(req);
+		}
+
+		public IAsyncResult BeginReceive(byte[] buffer, int offset,
+						 int size,
+						 SocketFlags socket_flags,
+						 AsyncCallback callback,
+						 object state) {
+			SocketAsyncResult req=new SocketAsyncResult(state);
+			Worker worker=new Worker(this, buffer, offset, size,
+						 socket_flags, callback, req);
+			req.Worker=worker;
+			Thread child=new Thread(new ThreadStart(worker.Receive));
+			child.Start();
+			return(req);
+		}
+
+		public IAsyncResult BeginReceiveFrom(byte[] buffer, int offset,
+						     int size,
+						     SocketFlags socket_flags,
+						     ref EndPoint remote_end,
+						     AsyncCallback callback,
+						     object state) {
+			SocketAsyncResult req=new SocketAsyncResult(state);
+			Worker worker=new Worker(this, buffer, offset, size,
+						 socket_flags, remote_end,
+						 callback, req);
+			req.Worker=worker;
+			Thread child=new Thread(new ThreadStart(worker.ReceiveFrom));
+			child.Start();
+			return(req);
+		}
+
+		public IAsyncResult BeginSend(byte[] buffer, int offset,
+					      int size,
+					      SocketFlags socket_flags,
+					      AsyncCallback callback,
+					      object state) {
+			SocketAsyncResult req=new SocketAsyncResult(state);
+			Worker worker=new Worker(this, buffer, offset, size,
+						 socket_flags, callback, req);
+			req.Worker=worker;
+			Thread child=new Thread(new ThreadStart(worker.Send));
+			child.Start();
+			return(req);
+		}
+
+		public IAsyncResult BeginSendTo(byte[] buffer, int offset,
+						int size,
+						SocketFlags socket_flags,
+						EndPoint remote_end,
+						AsyncCallback callback,
+						object state) {
+			SocketAsyncResult req=new SocketAsyncResult(state);
+			Worker worker=new Worker(this, buffer, offset, size,
+						 socket_flags, remote_end,
+						 callback, req);
+			req.Worker=worker;
+			Thread child=new Thread(new ThreadStart(worker.SendTo));
+			child.Start();
+			return(req);
+		}
+
+		// Creates a new system socket, returning the handle
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Bind_internal(IntPtr sock,
+							 SocketAddress sa);
+
+		public void Bind(EndPoint local_end) {
+			if(local_end==null) {
+				throw new ArgumentNullException();
+			}
+			
+			Bind_internal(socket, local_end.Serialize());
+		}
+
+		// Closes the socket
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Close_internal(IntPtr socket);
+		
+		public void Close() {
+			connected=false;
+			Close_internal(socket);
+		}
+
+		// Connects to the remote address
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Connect_internal(IntPtr sock,
+							    SocketAddress sa);
+
+		public void Connect(EndPoint remote_end) {
+			if(remote_end==null) {
+				throw new ArgumentNullException();
+			}
+			
+			Connect_internal(socket, remote_end.Serialize());
+			connected=true;
+		}
+		
+		public Socket EndAccept(IAsyncResult result) {
+			SocketAsyncResult req=(SocketAsyncResult)result;
+
+			result.AsyncWaitHandle.WaitOne();
+			return(req.Worker.Socket);
+		}
+
+		public void EndConnect(IAsyncResult result) {
+			SocketAsyncResult req=(SocketAsyncResult)result;
+
+			result.AsyncWaitHandle.WaitOne();
+		}
+
+		public int EndReceive(IAsyncResult result) {
+			SocketAsyncResult req=(SocketAsyncResult)result;
+
+			result.AsyncWaitHandle.WaitOne();
+			return(req.Worker.Total);
+		}
+
+		public int EndReceiveFrom(IAsyncResult result,
+					  ref EndPoint end_point) {
+			SocketAsyncResult req=(SocketAsyncResult)result;
+
+			result.AsyncWaitHandle.WaitOne();
+			end_point=req.Worker.EndPoint;
+			return(req.Worker.Total);
+		}
+
+		public int EndSend(IAsyncResult result) {
+			SocketAsyncResult req=(SocketAsyncResult)result;
+
+			result.AsyncWaitHandle.WaitOne();
+			return(req.Worker.Total);
+		}
+
+		public int EndSendTo(IAsyncResult result) {
+			SocketAsyncResult req=(SocketAsyncResult)result;
+
+			result.AsyncWaitHandle.WaitOne();
+			return(req.Worker.Total);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void GetSocketOption_obj_internal(IntPtr socket, SocketOptionLevel level, SocketOptionName name, out object obj_val);
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void GetSocketOption_arr_internal(IntPtr socket, SocketOptionLevel level, SocketOptionName name, ref byte[] byte_val);
+
+		public object GetSocketOption(SocketOptionLevel level,
+					      SocketOptionName name) {
+			object obj_val;
+			
+			GetSocketOption_obj_internal(socket, level, name,
+						     out obj_val);
+			
+			if(name==SocketOptionName.Linger) {
+				return((LingerOption)obj_val);
+			} else if (name==SocketOptionName.AddMembership ||
+				   name==SocketOptionName.DropMembership) {
+				return((MulticastOption)obj_val);
+			} else {
+				return((int)obj_val);
+			}
+		}
+
+		public void GetSocketOption(SocketOptionLevel level,
+					    SocketOptionName name,
+					    byte[] opt_value) {
+			int opt_value_len=opt_value.Length;
+			
+			GetSocketOption_arr_internal(socket, level, name,
+						     ref opt_value);
+		}
+
+		public byte[] GetSocketOption(SocketOptionLevel level,
+					      SocketOptionName name,
+					      int length) {
+			byte[] byte_val=new byte[length];
+			
+			GetSocketOption_arr_internal(socket, level, name,
+						     ref byte_val);
+
+			return(byte_val);
+		}
+
+		[MonoTODO("Totally undocumented")]
+		public int IOControl(int ioctl_code, byte[] in_value,
+				     byte[] out_value) {
+			throw new NotImplementedException();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Listen_internal(IntPtr sock,
+							   int backlog);
+
+		public void Listen(int backlog) {
+			Listen_internal(socket, backlog);
+		}
+
+		/* The docs for Poll() are a bit lightweight too, but
+		 * it seems to be just a simple wrapper around Select.
+		 */
+		public bool Poll(int time_us, SelectMode mode) {
+			ArrayList socketlist=new ArrayList(1);
+
+			socketlist.Add(this);
+			
+			switch(mode) {
+			case SelectMode.SelectError:
+				Select(null, null, socketlist, time_us);
+				break;
+			case SelectMode.SelectRead:
+				Select(socketlist, null, null, time_us);
+				break;
+			case SelectMode.SelectWrite:
+				Select(null, socketlist, null, time_us);
+				break;
+			default:
+				throw new NotSupportedException();
+			}
+
+			if(socketlist.Contains(this)) {
+				return(true);
+			} else {
+				return(false);
+			}
+		}
+		
+		public int Receive(byte[] buf) {
+			return(Receive(buf, 0, buf.Length, SocketFlags.None));
+		}
+
+		public int Receive(byte[] buf, SocketFlags flags) {
+			return(Receive(buf, 0, buf.Length, flags));
+		}
+
+		public int Receive(byte[] buf, int size, SocketFlags flags) {
+			return(Receive(buf, 0, size, flags));
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static int Receive_internal(IntPtr sock,
+							   byte[] buffer,
+							   int offset,
+							   int count,
+							   SocketFlags flags);
+
+		public int Receive(byte[] buf, int offset, int size,
+				   SocketFlags flags) {
+			if(buf==null) {
+				throw new ArgumentNullException();
+			}
+			if(offset+size>buf.Length) {
+				throw new ArgumentException();
+			}
+			
+			int ret;
+			
+			try {
+				ret=Receive_internal(socket, buf, offset,
+						     size, flags);
+			} catch(SocketException) {
+				connected=false;
+				throw;
+			}
+			connected=true;
+
+			return(ret);
+		}
+		
+		public int ReceiveFrom(byte[] buf, ref EndPoint remote_end) {
+			return(ReceiveFrom(buf, 0, buf.Length,
+					   SocketFlags.None, ref remote_end));
+		}
+
+		public int ReceiveFrom(byte[] buf, SocketFlags flags,
+				       ref EndPoint remote_end) {
+			return(ReceiveFrom(buf, 0, buf.Length, flags,
+					   ref remote_end));
+		}
+
+		public int ReceiveFrom(byte[] buf, int size, SocketFlags flags,
+				       ref EndPoint remote_end) {
+			return(ReceiveFrom(buf, 0, size, flags,
+					   ref remote_end));
+		}
+
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static int RecvFrom_internal(IntPtr sock,
+							    byte[] buffer,
+							    int offset,
+							    int count,
+							    SocketFlags flags,
+							    ref SocketAddress sockaddr);
+
+		public int ReceiveFrom(byte[] buf, int offset, int size,
+				       SocketFlags flags,
+				       ref EndPoint remote_end) {
+			if(buf==null || remote_end==null) {
+				throw new ArgumentNullException();
+			}
+			if(offset+size>buf.Length) {
+				throw new ArgumentException();
+			}
+
+			SocketAddress sockaddr=remote_end.Serialize();
+			int count;
+
+			try {
+				count=RecvFrom_internal(socket, buf, offset,
+							size, flags,
+							ref sockaddr);
+			} catch(SocketException) {
+				connected=false;
+				throw;
+			}
+			connected=true;
+			
+			// Stupidly, EndPoint.Create() is an
+			// instance method
+			remote_end=remote_end.Create(sockaddr);
+
+			return(count);
+		}
+
+		public int Send(byte[] buf) {
+			return(Send(buf, 0, buf.Length, SocketFlags.None));
+		}
+
+		public int Send(byte[] buf, SocketFlags flags) {
+			return(Send(buf, 0, buf.Length, flags));
+		}
+
+		public int Send(byte[] buf, int size, SocketFlags flags) {
+			return(Send(buf, 0, size, flags));
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static int Send_internal(IntPtr sock,
+							byte[] buf, int offset,
+							int count,
+							SocketFlags flags);
+
+		public int Send(byte[] buf, int offset, int size,
+				SocketFlags flags) {
+			if(buf==null) {
+				throw new ArgumentNullException();
+			}
+			if(offset+size>buf.Length) {
+				throw new ArgumentException();
+			}
+
+			int ret;
+
+			try {
+				ret=Send_internal(socket, buf, offset, size,
+						  flags);
+			} catch(SocketException) {
+				connected=false;
+				throw;
+			}
+			connected=true;
+
+			return(ret);
+		}
+
+		public int SendTo(byte[] buffer, EndPoint remote_end) {
+			return(SendTo(buffer, 0, buffer.Length,
+				      SocketFlags.None, remote_end));
+		}
+
+		public int SendTo(byte[] buffer, SocketFlags flags,
+				  EndPoint remote_end) {
+			return(SendTo(buffer, 0, buffer.Length, flags,
+				      remote_end));
+		}
+
+		public int SendTo(byte[] buffer, int size, SocketFlags flags,
+				  EndPoint remote_end) {
+			return(SendTo(buffer, size, buffer.Length, flags,
+				      remote_end));
+		}
+
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static int SendTo_internal(IntPtr sock,
+							  byte[] buffer,
+							  int offset,
+							  int count,
+							  SocketFlags flags,
+							  SocketAddress sa);
+
+		public int SendTo(byte[] buffer, int offset, int size,
+				  SocketFlags flags, EndPoint remote_end) {
+			if(buffer==null || remote_end==null) {
+				throw new ArgumentNullException();
+			}
+			if(offset+size>buffer.Length) {
+				throw new ArgumentException();
+			}
+
+			SocketAddress sockaddr=remote_end.Serialize();
+
+			int ret;
+
+			try {
+				ret=SendTo_internal(socket, buffer, offset,
+						    size, flags, sockaddr);
+			}
+			catch(SocketException) {
+				connected=false;
+				throw;
+			}
+			connected=true;
+
+			return(ret);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void SetSocketOption_internal(IntPtr socket, SocketOptionLevel level, SocketOptionName name, object obj_val, byte[] byte_val, int int_val);
+
+		public void SetSocketOption(SocketOptionLevel level,
+					    SocketOptionName name,
+					    byte[] opt_value) {
+			SetSocketOption_internal(socket, level, name, null,
+						 opt_value, 0);
+		}
+
+		public void SetSocketOption(SocketOptionLevel level,
+					    SocketOptionName name,
+					    int opt_value) {
+			SetSocketOption_internal(socket, level, name, null,
+						 null, opt_value);
+		}
+
+		public void SetSocketOption(SocketOptionLevel level,
+					    SocketOptionName name,
+					    object opt_value) {
+			if(opt_value==null) {
+				throw new ArgumentNullException();
+			}
+			
+			/* Passing a bool as the third parameter to
+			 * SetSocketOption causes this overload to be
+			 * used when in fact we want to pass the value
+			 * to the runtime as an int.
+			 */
+			if(opt_value is System.Boolean) {
+				bool bool_val=(bool)opt_value;
+				
+				/* Stupid casting rules :-( */
+				if(bool_val==true) {
+					SetSocketOption_internal(socket, level,
+								 name, null,
+								 null, 1);
+				} else {
+					SetSocketOption_internal(socket, level,
+								 name, null,
+								 null, 0);
+				}
+			} else {
+				SetSocketOption_internal(socket, level, name,
+							 opt_value, null, 0);
+			}
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Shutdown_internal(IntPtr socket, SocketShutdown how);
+		
+		public void Shutdown(SocketShutdown how) {
+			Shutdown_internal(socket, how);
+		}
+
+		private bool disposed = false;
+		
+		protected virtual void Dispose(bool explicitDisposing) {
+			// Check to see if Dispose has already been called
+			if(!this.disposed) {
+				// If this is a call to Dispose,
+				// dispose all managed resources.
+				if(explicitDisposing) {
+					// Free up stuff here
+				}
+
+				// Release unmanaged resources
+				this.disposed=true;
+				this.Close();
+			}
+		}
+
+		public void Dispose() {
+			Dispose(true);
+			// Take yourself off the Finalization queue
+			GC.SuppressFinalize(this);
+		}
+
+		~Socket () {
+			Dispose(false);
+		}
+	}
+}
diff --git a/mcs/class/System/System.Net.Sockets/SocketException.cs b/mcs/class/System/System.Net.Sockets/SocketException.cs
new file mode 100644
index 00000000000..161a7cf27ae
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/SocketException.cs
@@ -0,0 +1,41 @@
+//
+// System.Net.Sockets.NetworkStream.cs
+//
+// Author:
+//	Dick Porter <dick@ximian.com>
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Runtime.Serialization;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace System.Net.Sockets
+{
+	[Serializable]
+	public class SocketException : Win32Exception
+	{
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern int WSAGetLastError_internal();
+		
+		public SocketException ()
+			: base (WSAGetLastError_internal()) {
+		}
+
+		public SocketException (int error)
+			: base (error) {
+		}
+
+		protected SocketException (SerializationInfo info,
+					StreamingContext context)
+			: base (info, context) {
+		}
+		
+		public override int ErrorCode {
+			get {
+				return NativeErrorCode;
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.Net.Sockets/SocketFlags.cs b/mcs/class/System/System.Net.Sockets/SocketFlags.cs
new file mode 100644
index 00000000000..8e958d47c05
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/SocketFlags.cs
@@ -0,0 +1,42 @@
+// SocketFlags.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:32:49 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net.Sockets {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum SocketFlags {
+
+		/// <summary>
+		/// </summary>
+		None = 0x00000000,
+
+		/// <summary>
+		/// </summary>
+		OutOfBand = 0x00000001,
+
+		/// <summary>
+		/// </summary>
+		Peek = 0x00000002,
+
+		/// <summary>
+		/// </summary>
+		DontRoute = 0x00000004,
+
+		/// <summary>
+		/// </summary>
+		Partial = 0x00008000,
+	} // SocketFlags
+
+} // System.Net.Sockets
diff --git a/mcs/class/System/System.Net.Sockets/SocketOptionLevel.cs b/mcs/class/System/System.Net.Sockets/SocketOptionLevel.cs
new file mode 100644
index 00000000000..657a4532154
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/SocketOptionLevel.cs
@@ -0,0 +1,37 @@
+// SocketOptionLevel.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:32:55 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net.Sockets {
+
+
+	/// <summary>
+	/// </summary>
+	public enum SocketOptionLevel {
+
+		/// <summary>
+		/// </summary>
+		Socket = 65535,
+
+		/// <summary>
+		/// </summary>
+		IP = 0,
+
+		/// <summary>
+		/// </summary>
+		Tcp = 6,
+
+		/// <summary>
+		/// </summary>
+		Udp = 17,
+	} // SocketOptionLevel
+
+} // System.Net.Sockets
diff --git a/mcs/class/System/System.Net.Sockets/SocketOptionName.cs b/mcs/class/System/System.Net.Sockets/SocketOptionName.cs
new file mode 100644
index 00000000000..117c7fc0225
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/SocketOptionName.cs
@@ -0,0 +1,181 @@
+// SocketOptionName.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:33:02 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net.Sockets {
+
+
+	/// <summary>
+	/// </summary>
+	public enum SocketOptionName {
+
+		/// <summary>
+		/// </summary>
+		Debug = 1,
+
+		/// <summary>
+		/// </summary>
+		AcceptConnection = 2,
+
+		/// <summary>
+		/// </summary>
+		ReuseAddress = 4,
+
+		/// <summary>
+		/// </summary>
+		KeepAlive = 8,
+
+		/// <summary>
+		/// </summary>
+		DontRoute = 16,
+
+		/// <summary>
+		/// </summary>
+		Broadcast = 32,
+
+		/// <summary>
+		/// </summary>
+		UseLoopback = 64,
+
+		/// <summary>
+		/// </summary>
+		Linger = 128,
+
+		/// <summary>
+		/// </summary>
+		OutOfBandInline = 256,
+
+		/// <summary>
+		/// </summary>
+		DontLinger = -129,
+
+		/// <summary>
+		/// </summary>
+		ExclusiveAddressUse = -5,
+
+		/// <summary>
+		/// </summary>
+		SendBuffer = 4097,
+
+		/// <summary>
+		/// </summary>
+		ReceiveBuffer = 4098,
+
+		/// <summary>
+		/// </summary>
+		SendLowWater = 4099,
+
+		/// <summary>
+		/// </summary>
+		ReceiveLowWater = 4100,
+
+		/// <summary>
+		/// </summary>
+		SendTimeout = 4101,
+
+		/// <summary>
+		/// </summary>
+		ReceiveTimeout = 4102,
+
+		/// <summary>
+		/// </summary>
+		Error = 4103,
+
+		/// <summary>
+		/// </summary>
+		Type = 4104,
+
+		/// <summary>
+		/// </summary>
+		MaxConnections = 2147483647,
+
+		/// <summary>
+		/// </summary>
+		IPOptions = 1,
+
+		/// <summary>
+		/// </summary>
+		HeaderIncluded = 2,
+
+		/// <summary>
+		/// </summary>
+		TypeOfService = 3,
+
+		/// <summary>
+		/// </summary>
+		IpTimeToLive = 4,
+
+		/// <summary>
+		/// </summary>
+		MulticastInterface = 9,
+
+		/// <summary>
+		/// </summary>
+		MulticastTimeToLive = 10,
+
+		/// <summary>
+		/// </summary>
+		MulticastLoopback = 11,
+
+		/// <summary>
+		/// </summary>
+		AddMembership = 12,
+
+		/// <summary>
+		/// </summary>
+		DropMembership = 13,
+
+		/// <summary>
+		/// </summary>
+		DontFragment = 14,
+
+		/// <summary>
+		/// </summary>
+		AddSourceMembership = 15,
+
+		/// <summary>
+		/// </summary>
+		DropSourceMembership = 16,
+
+		/// <summary>
+		/// </summary>
+		BlockSource = 17,
+
+		/// <summary>
+		/// </summary>
+		UnblockSource = 18,
+
+		/// <summary>
+		/// </summary>
+		PacketInformation = 19,
+
+		/// <summary>
+		/// </summary>
+		NoDelay = 1,
+
+		/// <summary>
+		/// </summary>
+		BsdUrgent = 2,
+
+		/// <summary>
+		/// </summary>
+		Expedited = 2,
+
+		/// <summary>
+		/// </summary>
+		NoChecksum = 1,
+
+		/// <summary>
+		/// </summary>
+		ChecksumCoverage = 20,
+	} // SocketOptionName
+
+} // System.Net.Sockets
diff --git a/mcs/class/System/System.Net.Sockets/SocketShutdown.cs b/mcs/class/System/System.Net.Sockets/SocketShutdown.cs
new file mode 100644
index 00000000000..0f9e5f269dc
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/SocketShutdown.cs
@@ -0,0 +1,33 @@
+// SocketShutdown.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:32:43 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net.Sockets {
+
+
+	/// <summary>
+	/// </summary>
+	public enum SocketShutdown {
+
+		/// <summary>
+		/// </summary>
+		Receive = 0,
+
+		/// <summary>
+		/// </summary>
+		Send = 1,
+
+		/// <summary>
+		/// </summary>
+		Both = 2,
+	} // SocketShutdown
+
+} // System.Net.Sockets
diff --git a/mcs/class/System/System.Net.Sockets/SocketType.cs b/mcs/class/System/System.Net.Sockets/SocketType.cs
new file mode 100644
index 00000000000..bdb6c54d3c2
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/SocketType.cs
@@ -0,0 +1,45 @@
+// SocketType.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:32:37 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net.Sockets {
+
+
+	/// <summary>
+	/// </summary>
+	public enum SocketType {
+
+		/// <summary>
+		/// </summary>
+		Stream = 1,
+
+		/// <summary>
+		/// </summary>
+		Dgram = 2,
+
+		/// <summary>
+		/// </summary>
+		Raw = 3,
+
+		/// <summary>
+		/// </summary>
+		Rdm = 4,
+
+		/// <summary>
+		/// </summary>
+		Seqpacket = 5,
+
+		/// <summary>
+		/// </summary>
+		Unknown = -1,
+	} // SocketType
+
+} // System.Net.Sockets
diff --git a/mcs/class/System/System.Net.Sockets/TcpClient.cs b/mcs/class/System/System.Net.Sockets/TcpClient.cs
new file mode 100755
index 00000000000..a6700373cfa
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/TcpClient.cs
@@ -0,0 +1,338 @@
+// System.Net.Sockets.TcpClient.cs
+//
+// Author:
+//    Phillip Pearson (pp@myelin.co.nz)
+//
+// Copyright (C) 2001, Phillip Pearson
+//    http://www.myelin.co.nz
+//
+
+// NB: This is untested (probably buggy) code - take care if using it
+
+using System;
+using System.Net;
+
+namespace System.Net.Sockets
+{
+	/// <remarks>
+	/// A slightly more abstracted way to create an
+	/// outgoing network connections than a Socket.
+	/// </remarks>
+	public class TcpClient : IDisposable
+	{
+		// private data
+		
+		private NetworkStream stream;
+		private bool active;
+		private Socket client;
+		private bool disposed = false;
+		
+		// constructor
+
+		/// <summary>
+		/// Some code that is shared between the constructors.
+		/// </summary>
+		private void Init ()
+		{
+			active = false;
+			client = new Socket(AddressFamily.InterNetwork,
+				SocketType.Stream, ProtocolType.Tcp);
+		}
+
+		/// <summary>
+		/// Constructs a new TcpClient with no connection set up
+		/// </summary>
+		public TcpClient ()
+		{
+			Init();
+			client.Bind(new IPEndPoint(IPAddress.Any, 0));
+		}
+	
+		/// <summary>
+		/// Constructs a new TcpClient with a specified local endpoint.
+		/// Use this if you want to have your connections originating
+		/// from a certain port, or a certain IP (on a multi homed
+		/// system).
+		/// </summary>
+		/// <param name="local_end_point">The aforementioned local endpoint</param>
+		public TcpClient (IPEndPoint local_end_point)
+		{
+			Init();
+			client.Bind(local_end_point);
+		}
+		
+		/// <summary>
+		/// Constructs a new TcpClient and connects to a specified
+		/// host on a specified port.  A quick way to set up a network
+		/// connection.
+		/// </summary>
+		/// <param name="hostname">The host to connect to, e.g.
+		/// 192.168.0.201 or www.myelin.co.nz</param>
+		/// <param name="port">The port to connect to, e.g. 80 for HTTP</param>
+		public TcpClient (string hostname, int port)
+		{
+			Init();
+			client.Bind(new IPEndPoint(IPAddress.Any, 0));
+			Connect(hostname, port);
+		}
+				
+		/// <summary>
+		/// A flag that is 'true' if the TcpClient has an active connection
+		/// </summary>
+		protected bool Active
+		{
+			get { return active; }
+			set { active = value; }
+		}
+		
+		/// <summary>
+		/// The socket that all network comms passes through
+		/// </summary>
+		protected Socket Client
+		{
+			get { return client; }
+			set { client = value; }
+		}
+
+		/// <summary>
+		/// Internal function to allow TcpListener.AcceptTcpClient
+		/// to work (it needs to be able to set protected property
+		/// 'Client')
+		/// </summary>
+		/// <param name="s"></param>
+		internal void SetTcpClient (Socket s) 
+		{
+			client = s;
+			stream = new NetworkStream (client, true);
+		}
+		
+		/// <summary>
+		/// If set, the socket will remain open after it has been
+		/// instructed to close, in order to send data that remains
+		/// in the buffer.
+		/// </summary>
+		public LingerOption LingerState
+		{
+			get {
+				return (LingerOption)client.GetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.Linger);
+			}
+			set {
+				client.SetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.Linger, value);
+			}
+		}
+				
+		/// <summary>
+		/// <p>If set, outbound data will be sent at once rather than collected
+		/// until enough is available to fill a packet.</p>
+		/// 
+		/// <p>This is the TCP_NODELAY sockopt from BSD sockets and WinSock.
+		/// For more information, look up the Nagle algorithm.</p>
+		/// </summary>
+		public bool NoDelay
+		{
+			get {
+				return (bool)client.GetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.NoDelay);
+			}
+			set {
+				client.SetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.NoDelay, value);
+			}
+		}
+				
+		/// <summary>
+		/// How big the receive buffer is (from the connection socket)
+		/// </summary>
+		public int ReceiveBufferSize
+		{
+			get {
+				return (int)client.GetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.ReceiveBuffer);
+			}
+			set {
+				client.SetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.ReceiveBuffer, value);
+			}
+		}
+			
+		/// <summary>
+		/// How long before the socket will time out on a 
+		/// Receive() call
+		/// </summary>
+		public int ReceiveTimeout
+		{
+			get {
+				return (int)client.GetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.ReceiveTimeout);
+			}
+			set {
+				client.SetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.ReceiveTimeout, value);
+			}
+		}
+		
+		/// <summary>
+		/// How big the send buffer is (from the connection socket)
+		/// </summary>
+		public int SendBufferSize
+		{
+			get {
+				return (int)client.GetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.SendBuffer);
+			}
+			set {
+				client.SetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.SendBuffer, value);
+			}
+		}
+		
+		/// <summary>
+		/// How long before the socket will time out on a
+		/// Send() call
+		/// </summary>
+		public int SendTimeout
+		{
+			get {
+				return (int)client.GetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.SendTimeout);
+			}
+			set {
+				client.SetSocketOption(
+					SocketOptionLevel.Socket,
+					SocketOptionName.SendTimeout, value);
+			}
+		}
+		
+		
+		// methods
+		
+		/// <summary>
+		/// Closes the socket and disposes of all managed resources.
+		/// 
+		/// Throws SocketException if something goes wrong while
+		/// closing the socket.
+		/// </summary>
+		public void Close ()
+		{
+			((IDisposable) this).Dispose ();
+		}
+		
+		/// <summary>
+		/// Connects to a specified remote endpoint
+		/// 
+		/// Throws SocketException if something goes wrong while
+		/// connecting.
+		/// </summary>
+		/// <param name="remote_end_point">The aforementioned endpoint</param>
+		public void Connect (IPEndPoint remote_end_point)
+		{
+			try {
+				client.Connect(remote_end_point);
+				stream = new NetworkStream(client, true);
+				active = true;
+			} finally {
+				CheckDisposed ();
+			}
+		}
+		
+		/// <summary>
+		/// Connects to an IP address on a port
+		/// 
+		/// Throws SocketException if something goes wrong while
+		/// connecting.
+		/// </summary>
+		/// <param name="address">The IP address (get it from Dns.GetHostByName)</param>
+		/// <param name="port">The port to connect to, e.g. 80 for HTTP</param>
+		public void Connect (IPAddress address, int port)
+		{
+			Connect(new IPEndPoint(address, port));
+		}
+		
+		/// <summary>
+		/// Resolves a fully qualified domain name to an IP address
+		/// and connects to it on a specified port
+		/// 
+		/// Throws SocketException if something goes wrong while
+		/// connecting.
+		/// </summary>
+		/// <param name="hostname">The hostname, e.g. www.myelin.co.nz</param>
+		/// <param name="port">The port, e.g. 80 for HTTP</param>
+		[MonoTODO]
+		public void Connect (string hostname, int port)
+		{
+			CheckDisposed ();
+			IPHostEntry host = Dns.GetHostByName(hostname);
+			/* TODO: This will connect to the first IP address returned
+			from GetHostByName.  Is that right? */
+			Connect(new IPEndPoint(host.AddressList[0], port));
+		}
+		
+		/// <summary>
+		/// Gets rid of all managed resources
+		/// </summary>
+		void IDisposable.Dispose ()
+		{
+			Dispose (true);
+			GC.SuppressFinalize (this);
+		}
+
+		/// <summary>
+		/// Gets rid of all unmanaged resources
+		/// </summary>
+		/// <param name="disposing">If this is true, it gets rid of all
+		/// managed resources as well</param>
+		protected virtual void Dispose (bool disposing)
+		{
+			if (disposed)
+				return;
+			disposed = true;
+				
+			// release unmanaged resources
+			NetworkStream s = stream;
+			stream = null;
+			if (s != null) {
+				// This closes the socket as well, as the NetworkStream
+				// owns the socket.
+				s.Close();
+				active = false;
+				s = null;
+			}
+			client = null;
+		}
+		
+		/// <summary>
+		/// Destructor - just calls Dispose()
+		/// </summary>
+		~TcpClient ()
+		{
+			Dispose (false);
+		}
+		
+		/// <returns>A NetworkStream object connected to the
+		/// connection socket</returns>
+		public NetworkStream GetStream()
+		{
+			try { return stream; }
+			finally { CheckDisposed (); }
+		}
+		
+		private void CheckDisposed ()
+		{
+			if (disposed)
+				throw new ObjectDisposedException (GetType().FullName);
+		}		
+	}
+}
diff --git a/mcs/class/System/System.Net.Sockets/TcpListener.cs b/mcs/class/System/System.Net.Sockets/TcpListener.cs
new file mode 100755
index 00000000000..feedae68b90
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/TcpListener.cs
@@ -0,0 +1,171 @@
+// System.Net.Sockets.TcpListener.cs
+//
+// Author:
+//    Phillip Pearson (pp@myelin.co.nz)
+//
+// Copyright (C) 2001, Phillip Pearson
+//    http://www.myelin.co.nz
+//
+
+// NB: This is untested (probably buggy) code - take care using it
+
+using System;
+using System.Net;
+
+namespace System.Net.Sockets
+{
+	/// <remarks>
+	/// A slightly more abstracted way to listen for incoming
+	/// network connections than a Socket.
+	/// </remarks>
+	public class TcpListener
+	{
+		// private data
+		
+		private bool active;
+		private Socket server;
+		
+		// constructor
+
+		/// <summary>
+		/// Some code that is shared between the constructors.
+		/// </summary>
+		private void Init ()
+		{
+			active = false;
+			server = new Socket(AddressFamily.InterNetwork,
+				SocketType.Stream, ProtocolType.Tcp);
+		}
+		
+		/// <summary>
+		/// Constructs a new TcpListener to listen on a specified port
+		/// </summary>
+		/// <param name="port">The port to listen on, e.g. 80 if you 
+		/// are a web server</param>
+		public TcpListener (int port)
+		{
+			Init();
+			server.Bind(new IPEndPoint(IPAddress.Any, port));
+		}
+
+		/// <summary>
+		/// Constructs a new TcpListener with a specified local endpoint
+		/// </summary>
+		/// <param name="local_end_point">The endpoint</param>
+		public TcpListener (IPEndPoint local_end_point)
+		{
+			Init();
+			server.Bind(local_end_point);
+		}
+		
+		/// <summary>
+		/// Constructs a new TcpListener, listening on a specified port
+		/// and IP (for use on a multi-homed machine)
+		/// </summary>
+		/// <param name="listen_ip">The IP to listen on</param>
+		/// <param name="port">The port to listen on</param>
+		public TcpListener (IPAddress listen_ip, int port)
+		{
+			Init();
+			server.Bind(new IPEndPoint(listen_ip, port));
+		}
+
+
+		// properties
+
+		/// <summary>
+		/// A flag that is 'true' if the TcpListener is listening,
+		/// or 'false' if it is not listening
+		/// </summary>
+		protected bool Active
+		{
+			get { return active; }
+		}
+
+		/// <summary>
+		/// The local end point
+		/// </summary>
+		public EndPoint LocalEndpoint
+		{
+			get { return server.LocalEndPoint; }
+		}
+		
+		/// <summary>
+		/// The listening socket
+		/// </summary>
+		protected Socket Server
+		{
+			get { return server; }
+		}
+		
+		
+		// methods
+
+		/// <summary>
+		/// Accepts a pending connection
+		/// <returns>A Socket object for the new connection</returns>
+		public Socket AcceptSocket ()
+		{
+			return server.Accept();
+		}
+		
+		/// <summary>
+		/// Accepts a pending connection
+		/// </summary>
+		/// <returns>A TcpClient
+		/// object made from the new socket.</returns>
+		public TcpClient AcceptTcpClient ()
+		{
+			TcpClient client = new TcpClient();
+			// use internal method SetTcpClient to make a
+			// client with the specified socket
+			client.SetTcpClient(AcceptSocket());
+			return client;
+		}
+		
+		/// <summary>
+		/// Destructor - stops the listener listening
+		/// </summary>
+		~TcpListener ()
+		{
+			if (active == true) {
+				Stop();
+			}
+		}
+	
+		/// <returns>
+		/// Returns 'true' if there is a connection waiting to be accepted
+		/// with AcceptSocket() or AcceptTcpClient().
+		/// </returns>
+		public bool Pending ()
+		{
+			return server.Poll(1000, SelectMode.SelectRead);
+		}
+		
+		/// <summary>
+		/// Tells the TcpListener to start listening.
+		/// </summary>
+		[MonoTODO]
+		public void Start ()
+		{
+			server.Listen(5);	// According to the
+						// man page some BSD
+						// and BSD-derived
+						// systems limit the
+						// backlog to 5.  This
+						// should really be
+						// configurable though
+			active = true;
+		}
+		
+		/// <summary>
+		/// Tells the TcpListener to stop listening and dispose
+		/// of all managed resources.
+		/// </summary>
+		public void Stop ()
+		{
+			server.Close();
+		}
+
+	}
+}
diff --git a/mcs/class/System/System.Net.Sockets/UdpClient.cs b/mcs/class/System/System.Net.Sockets/UdpClient.cs
new file mode 100644
index 00000000000..15e921abfc9
--- /dev/null
+++ b/mcs/class/System/System.Net.Sockets/UdpClient.cs
@@ -0,0 +1,269 @@
+//

+// System.Net.Sockets.UdpClient.cs

+//

+// Author:

+//    Gonzalo Paniagua Javier <gonzalo@ximian.com>

+//

+// Copyright (C) Ximian, Inc. http://www.ximian.com

+//

+

+using System;

+using System.Net;

+

+namespace System.Net.Sockets

+{

+	public class UdpClient : IDisposable

+	{

+		private bool disposed = false;

+		private bool active = false;

+		private Socket socket;

+		private IPEndPoint localEP;

+		

+#region Constructors

+		public UdpClient ()

+		{

+			localEP = new IPEndPoint (IPAddress.Any, 0);

+			InitSocket ();

+		}

+

+		public UdpClient (int port)

+		{

+			// IPEndPoint throws ArgumentException when port is invalid

+			localEP = new IPEndPoint (IPAddress.Any, port);

+			InitSocket ();

+		}

+

+		public UdpClient (IPEndPoint localEP)

+		{

+			if (localEP == null)

+				throw new ArgumentNullException ("IPEndPoint cannot be null");

+

+			this.localEP = localEP;

+			InitSocket ();

+		}

+

+		public UdpClient (string hostname, int port)

+		{

+			if (hostname == null)

+				throw new ArgumentNullException ("hostname cannot be null");

+

+			if (port < IPEndPoint.MinPort || port > IPEndPoint.MaxPort)

+				throw new ArgumentException ("Invalid port");

+

+			localEP = new IPEndPoint (IPAddress.Any, 0);

+			InitSocket ();

+			Connect (hostname, port);

+		}

+

+		private void InitSocket ()

+		{

+			active = false;

+			socket = new Socket (AddressFamily.InterNetwork, SocketType.Dgram, ProtocolType.Udp);

+			socket.Bind (localEP);

+		}

+

+#endregion // Constructors

+#region Public methods

+#region Close

+		public void Close ()

+		{

+			((IDisposable) this).Dispose ();	

+		}

+#endregion

+#region Connect

+		public void Connect (IPEndPoint endPoint)

+		{

+			try {

+				socket.Connect (endPoint);

+				active = true;

+			} finally {

+				CheckDisposed ();

+			}

+		}

+

+		public void Connect (IPAddress addr, int port)

+		{

+			Connect (new IPEndPoint (addr, port));

+		}

+

+		public void Connect (string hostname, int port)

+		{

+			Connect (new IPEndPoint (Dns.Resolve (hostname).AddressList [0], port));

+		}

+#endregion

+#region Multicast methods

+		public void DropMulticastGroup (IPAddress multicastAddr)

+		{

+			try {

+				socket.SetSocketOption (SocketOptionLevel.IP, SocketOptionName.DropMembership,

+							new MulticastOption (multicastAddr));

+			} finally {

+				CheckDisposed ();

+			}

+		}

+

+		public void JoinMulticastGroup (IPAddress multicastAddr)

+		{

+			try {

+				socket.SetSocketOption (SocketOptionLevel.IP, SocketOptionName.AddMembership,

+							new MulticastOption (multicastAddr));

+			} finally {

+				CheckDisposed ();

+			}

+		}

+

+		public void JoinMulticastGroup (IPAddress multicastAddr, int timeToLive)

+		{

+			JoinMulticastGroup (multicastAddr);

+			try {

+				socket.SetSocketOption (SocketOptionLevel.IP, SocketOptionName.MulticastTimeToLive,

+							timeToLive);

+			} finally {

+				CheckDisposed ();

+			}

+		}

+#endregion

+#region Data I/O

+		public byte [] Receive (ref IPEndPoint remoteEP)

+		{

+			try {

+				if (remoteEP == null)

+					throw new ArgumentNullException ("remoteEP cannot be null");

+

+				// Length of the array for receiving data??

+				byte [] recBuffer;

+				int available = socket.Available;

+

+				recBuffer = new byte [1024]; // FIXME: any suggestions?

+				EndPoint endPoint = (EndPoint) remoteEP;

+				int dataRead = socket.ReceiveFrom (recBuffer, ref endPoint);

+				if (dataRead < recBuffer.Length)

+					return CutArray (recBuffer, dataRead);

+

+				return recBuffer;

+			} finally {

+				CheckDisposed ();

+			}

+		}

+

+		public int Send (byte [] dgram, int bytes)

+		{

+			try {

+				if (dgram == null)

+					throw new ArgumentNullException ("dgram is null");

+

+				byte [] realDgram;

+				if (dgram.Length <= bytes)

+					realDgram = dgram;

+				else

+					realDgram = CutArray (dgram, (bytes >= dgram.Length) ? bytes : dgram.Length);

+

+				// the socket should be connected already, so I use Send instead of SendTo

+				return socket.Send (realDgram);

+			} finally {

+				CheckDisposed ();

+			}

+		}

+

+		public int Send (byte [] dgram, int bytes, IPEndPoint endPoint)

+		{

+			try {

+				if (dgram == null)

+					throw new ArgumentNullException ("dgram is null");

+

+				byte [] realDgram;

+				if (dgram.Length <= bytes)

+					realDgram = dgram;

+				else

+					realDgram = CutArray (dgram, (bytes >= dgram.Length) ? bytes : dgram.Length);

+

+				// the socket should not be connected

+				return socket.SendTo (realDgram, endPoint);

+			} finally {

+				CheckDisposed ();

+			}

+		}

+

+		public int Send (byte [] dgram, int bytes, string hostname, int port)

+		{

+			return Send (dgram, bytes, 

+				     new IPEndPoint (Dns.Resolve (hostname).AddressList [0], port));

+		}

+

+		private byte [] CutArray (byte [] orig, int length)

+		{

+			byte [] newArray = new byte [length];

+			Array.Copy (orig, 0, newArray, 0, length);

+

+			return newArray;

+		}

+#endregion

+#region Properties

+		protected bool Active {

+			get { return active; }

+			set { active = value; }

+		}

+

+		protected Socket Client {

+			get { return socket; }

+			set { socket = value; }

+		}

+#endregion

+

+/* 

+// commented because in the ms.net implementation these are not overriden. -- LP

+#region Overrides

+		public override bool Equals (object obj)

+		{

+			if (obj is UdpClient)

+				return (((UdpClient) obj).socket  == socket &&

+					((UdpClient) obj).localEP == localEP);

+

+			return false;

+		}

+

+		public override int GetHashCode ()

+		{

+			return (socket.GetHashCode () + localEP.GetHashCode () + (active ? 1 : 0));

+		}

+#endregion

+*/

+

+#region Disposing

+		void IDisposable.Dispose ()

+		{

+			Dispose (true);

+			GC.SuppressFinalize (this);

+		}

+

+		protected virtual void Dispose (bool disposing)

+		{

+			if (disposed) 

+				return;

+			disposed = true;

+			if (disposing) {

+				// release managed resources

+				localEP = null;

+			}			

+			// release unmanaged resources

+			Socket s = socket;

+			socket = null;

+			if (s != null)

+				s.Close ();

+		}

+		

+		~UdpClient ()

+		{

+			Dispose (false);

+		}

+		

+		private void CheckDisposed ()

+		{

+			if (disposed)

+				throw new ObjectDisposedException (GetType().FullName);

+		}		

+#endregion

+#endregion

+	}

+}

+

diff --git a/mcs/class/System/System.Net/AuthenticationManager.cs b/mcs/class/System/System.Net/AuthenticationManager.cs
new file mode 100755
index 00000000000..b67ff556817
--- /dev/null
+++ b/mcs/class/System/System.Net/AuthenticationManager.cs
@@ -0,0 +1,55 @@
+//
+// System.Net.AuthenticationManager.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Collections;
+
+namespace System.Net {
+
+	public class AuthenticationManager {
+
+		static ArrayList modules;
+
+		public static IEnumerator RegisteredModules {
+			get {
+				if (modules == null)
+					modules = new ArrayList ();
+
+				return modules as IEnumerator;
+			}
+		}
+
+		[MonoTODO]
+		public static Authorization PreAuthenticate (WebRequest request,
+							     ICredentials credentials)
+		{
+			// FIXME: implement
+			return null;
+		}
+
+		public static void Register (IAuthenticationModule authenticationModule)
+		{
+			if (modules == null)
+				modules = new ArrayList ();
+
+			modules.Add (authenticationModule);
+		}
+
+		[MonoTODO]
+		public static void Unregister (IAuthenticationModule authenticationModule)
+		{
+			// FIXME: implement
+		}
+
+		[MonoTODO]
+		public static void Unregister (string authenticationScheme)
+		{
+			// FIXME: implement
+		}
+	}
+}
diff --git a/mcs/class/System/System.Net/Authorization.cs b/mcs/class/System/System.Net/Authorization.cs
new file mode 100755
index 00000000000..1c21c85f0bc
--- /dev/null
+++ b/mcs/class/System/System.Net/Authorization.cs
@@ -0,0 +1,52 @@
+//
+// System.Net.Authorization.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Lawrence Pit (loz@cable.a2000.nl)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Net {
+
+	public class Authorization {
+		string token;
+		bool complete;
+		string connectionGroupId;
+		string [] protectionRealm;
+		
+		public Authorization (string token) : this (token, true)
+		{
+		}
+
+		public Authorization (string token, bool complete) 
+			: this (token, complete, null)
+		{
+		}
+		
+		public Authorization (string token, bool complete, string connectionGroupId)
+		{
+			this.token = token;
+			this.complete = complete;
+			this.connectionGroupId = connectionGroupId;
+		}
+
+		public string Message {
+			get { return token; }
+		}
+
+		public bool Complete {
+			get { return complete; }
+		}
+
+		public string ConnectionGroupId {
+			get { return connectionGroupId; }
+		}	
+		
+		public string[] ProtectionRealm {
+			get { return protectionRealm; }
+			set { protectionRealm = value; }
+		}		
+	}
+}
diff --git a/mcs/class/System/System.Net/ChangeLog b/mcs/class/System/System.Net/ChangeLog
new file mode 100644
index 00000000000..02a29d610a4
--- /dev/null
+++ b/mcs/class/System/System.Net/ChangeLog
@@ -0,0 +1,232 @@
+2002-05-29  Lawrence Pit <loz@cable.a2000.nl>
+
+	* MonoHttpDate.cs: added
+	* HttpWebRequest.cs: using MonoHttpDate
+	* HttpWebResponse.cs: using MonoHttpDate
+	* DnsPermission.cs: correct XML output
+	* SocketPermission.cs: correct XML output
+
+2002-05-21  Lawrence Pit <loz@cable.a2000.nl>
+
+	* WebClient.cs: stubbed
+	* WebProxy.cs: fixed bug; had to change internal representation
+	of bypasslist to ArrayList, different implementation of checking
+	regex's.
+
+2002-05-20  Lawrence Pit <loz@cable.a2000.nl>
+
+	* WebProxy.cs: added, implemented
+	* ServicePoint.cs: implemented most
+	* ServicePointManager.cs: implemented
+	* HttpWebRequest.cs: started implementation
+	* HttpWebResponse.cs: improved disposable routines
+	* FileWebRequest.cs: slight improvement of Close method
+	
+2002-05-19  Lawrence Pit <loz@cable.a2000.nl>
+
+	* FileWebRequest.cs: finished implementation of async methods.
+	* FileWebResponse.cs: improved disposable routines.
+	* IPEndPoint.cs: fixed bug #24666 in Serialize and Create methods, 
+	byte ordering of address was backwards.
+
+2002-05-13  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Dns.cs: Reimplemented (simplified and fixed) asynchronous methods by
+	relying on standard asynchronous delegate features. Added checks for
+	null strings.
+	* HttpWebResponse.cs: implemented properties
+	* FileWebResponse.cs: improved the way resources are disposed.
+	* FileWebRequest.cs: started implementation of asynchronous methods
+	* ServicePointManager.cs: implemented properties
+
+2002-05-12  Lawrence Pit <loz@cable.a2000.nl>
+
+	* HttpWebRequest.cs: properties implemented
+	* HttpWebResponse.cs: added
+	* GlobalProxySelection.cs: implemented
+	* FileWebResponse.cs: added
+	* FileWebRequest.cs: some methods implemented
+
+2002-05-11  Lawrence Pit <loz@cable.a2000.nl>
+
+	* WebHeaderCollection.cs: implemented
+	* WebRequest.cs: implemented
+	* FileWebRequest.cs and HttpWebRequest.cs stubs added
+
+2002-05-09  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Rewrote IPAddress.Parse method, passing all unit tests
+
+2002-05-09  Lawrence Pit <loz@cable.a2000.nl>
+
+	* fixed bug in IPEndPoint.Equals method
+	* fixed bug in IPAddress.Parse method
+	* fixed bug in IPAddress.SwapLong method
+	* fixed several bugs in Cookie.cs
+
+2002-05-06  Lawrence Pit <loz@cable.a2000.nl>
+
+	* WebRequest.cs: added
+	* WebResponse.cs: implemented
+	* WebException.cs: implemented
+	* WebHeaderCollection.cs: added
+	* HttpVersion.cs: implemented
+	* HttpContinueDelegate.cs: added
+	* IWebProxy.cs: added
+	* IWebRequestCreate.cs: added
+	* ICertificatePolicy.cs: added
+	* ServicePoint.cs: stubbed
+	* ServicePointManager.cs: stubbed
+	* CookieContainer.cs: added
+	* Authorization.cs: implemented
+
+2002-05-05  Lawrence Pit <loz@cable.a2000.nl>
+
+	* CredentialCache.cs: implemented
+
+2002-05-05  Lawrence Pit <loz@cable.a2000.nl>
+
+	* IPAddress.cs: fixed IsLoopback, address was already in host order
+
+2002-05-05  Lawrence Pit <loz@cable.a2000.nl>
+
+	* IPv6Address.cs: added (note: not part of .net spec)
+
+2002-05-01  Lawrence Pit <loz@cable.a2000.nl>
+
+	* DnsPermission.cs: implemented
+	* DnsPermissionAttribute.cs: implemented
+
+2002-04-28  Lawrence Pit <loz@cable.a2000.nl>
+
+	* EndpointPermission.cs: implemented
+	* SocketPermission.cs: implemented
+	* SocketPermissionAttribute.cs: implemented
+	* ProtocolViolationException.cs: implemented
+	* Dns.c: passing w32 error code when no host found
+
+2002-04-27  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Cookie.cs: implemented
+	* CookieCollection.cs: implemented
+	* CookieException.cs: implemented
+
+2002-04-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IPAddress.cs: initialize the read only fields with Parse().
+
+2002-04-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IPAddress.cs: little changes to behave as MS.
+
+2002-04-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Dns.cs (Resolve): behave as MS. Agreed with Mads.
+
+2002-04-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IPAddress.cs: the icalls for sockets are endianness-aware. So I
+	changed a few things. Also included a workaround for bug #23547.
+
+2002-04-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IPAddress.cs: use System.BitConverter.IsLittleEndian (suggested
+	by Paolo) instead of guessing the endianness.
+
+	* SocketAddress.cs: implemented Equals() and GetHashcode().
+	
+2002-04-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IPEndPoint.cs: modifications to constructors according to the
+	specifications (suggested by Lawrence Pit).
+
+2002-04-15  Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* IPEndPoint.cs: Fixed build breaker.
+
+2002-04-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IPEndPoint.cs: implemented Equals() and GetHashCode(). Now 100%
+	complete.
+
+2002-04-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IPAddress.cs: finished all MonoTODO's. Use network order to store 
+	the address. Check for max and min values in Address:set. IsLoopback()
+	returns now true for all 127.x.y.z. Some more checks in Parse ().
+	Some changes to behave as MS does.
+
+2002-02-24  Duncan Mak  <duncan@ximian.com>
+
+	* ICredentialLookup.cs: Added the GetCredential method to the
+	interface. The interface is named "ICredentials", should this file
+	be renamed?	
+
+	* NetworkCredential.cs: Added to CVS. Need to investigate on how
+	GetCredential() works
+
+2002-01-23  Dick Porter  <dick@ximian.com>
+
+	* SocketAddress.cs: Implemented.
+
+	* IPEndPoint.cs: Turned 'Address' field into a real property.
+	Implemented Create() and Serialize() methods.
+
+	* IPAddress.cs: Fixed class constructor, turned 'Address' field
+	into a real property. Removed undocumented "public
+	IPAddress(string)" constructor.
+
+	* EndPoint.cs: Implemented.  All methods return
+	NotSupportedException to enforce subclass overriding.
+
+	* Dns.cs: Replaced fixed-layout Hostent struct and cygwin
+	P/Invokes with portable internal calls.
+
+2002-01-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* Dns.cs: Updated to API changes.
+
+	* IPAddress.cs: Updated API.  Much left to implement.
+
+	* Dns.cs: Remove IPToString method
+
+2002-01-06  Ravi Pratap  <ravi@ximian.com>
+
+	* Dns.cs, AuthenticationManager.cs, SocketAddress.cs : MonoTODO
+	attribute insertion.
+
+2001-11-22  Nick Drochak <ndrochak@gol.com>
+
+	* IPAddress.cs: Fix constructor bug, properly name Address property,
+	and use triple-slash for comments.
+
+2001-11-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* IPAddress.cs: Updated to contain Any, Broadcast, Loopback and
+	None as suggested by Phillip.
+
+2001-09-26  Mads Pultz <mpultz@get2net.dk>
+	* Dns.cs: Initial work on BeginGetHostByName and EndGetHostByName implemented.
+
+2001-09-24  Mads Pultz <mpultz@get2net.dk>
+
+	* Dns.cs: Minor changes (some print statements removed)
+
+2001-09-23  Mads Pultz <mpultz@get2net.dk>
+
+	* Dns.cs: Initial work submitted to repository.
+	* IPHostEntry.cs: Initial work submitted to repository.
+
+2001-07-12  Sean MacIsaac  <macisaac@ximian.com>
+
+	* Authorization.cs: Fixed compiler error.
+
+	* IAuthenticationModule.cs: Changes for Beta2.
+
+	* IPAddress.cs: Internal storage changed to be uint not int.
+
+	* IPEndPoint.cs: Fixed compiler error.
+
+	* EndPoint.cs: Fixed compiler error.
+
+	* AuthenticationManager.cs: Fixed typo.
diff --git a/mcs/class/System/System.Net/ConnectionModes.cs b/mcs/class/System/System.Net/ConnectionModes.cs
new file mode 100755
index 00000000000..3a1cc437702
--- /dev/null
+++ b/mcs/class/System/System.Net/ConnectionModes.cs
@@ -0,0 +1,37 @@
+// ConnectionModes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:35:39 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net {
+
+
+	/// <summary>
+	/// </summary>
+	public enum ConnectionModes {
+
+		/// <summary>
+		/// </summary>
+		Single = 0,
+
+		/// <summary>
+		/// </summary>
+		Persistent = 1,
+
+		/// <summary>
+		/// </summary>
+		Pipeline = 2,
+
+		/// <summary>
+		/// </summary>
+		Mux = 3,
+	} // ConnectionModes
+
+} // System.Net
diff --git a/mcs/class/System/System.Net/Cookie.cs b/mcs/class/System/System.Net/Cookie.cs
new file mode 100644
index 00000000000..b3acb2b5d6f
--- /dev/null
+++ b/mcs/class/System/System.Net/Cookie.cs
@@ -0,0 +1,276 @@
+//

+// System.Net.Cookie.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Text;

+

+namespace System.Net {

+

+	// Supported cookie formats are:

+	// Netscape: http://home.netscape.com/newsref/std/cookie_spec.html

+	// RFC 2109: http://www.ietf.org/rfc/rfc2109.txt

+	// RFC 2965: http://www.ietf.org/rfc/rfc2965.txt

+	[Serializable]

+	public sealed class Cookie 

+	{

+		private string comment;

+		private Uri commentUri;

+		private bool discard;

+		private string domain;

+		private bool expired;

+		private DateTime expires;

+		private string name;

+		private string path;

+		private string port;

+		private int [] ports;

+		private bool secure;

+		private DateTime timestamp;

+		private string val;

+		private int version;

+		

+		private static char [] reservedCharsName = new char [] {' ', '=', ';', ',', '\n', '\r', '\t'};

+		private static char [] reservedCharsValue = new char [] {';', ','};

+		private static char [] portSeparators = new char [] {'"', ','};

+                private static string tspecials = "()<>@,;:\\\"/[]?={} \t";   // from RFC 2965, 2068

+		

+		public Cookie () 

+			: this (String.Empty, String.Empty) {}

+		

+		public Cookie (string name, string value) 

+		{

+			Name = name;

+			Value = value;

+			

+			discard = false;

+			expired = false;

+			secure = false;

+			expires = DateTime.MinValue;

+			timestamp = DateTime.Now;

+			version = 0;		

+		}		

+			

+		public Cookie (string name, string value, string path) 

+			: this (name, value) 

+		{

+			Path = path;

+		}

+		

+		public Cookie (string name, string value, string path, string domain)

+			: this (name, value, path)

+		{

+			Domain = domain;

+		}

+		

+		public string Comment {

+			get { return comment; }

+			set { comment = value == null ? String.Empty : value; }

+		}

+		

+		public Uri CommentUri {

+			get { return commentUri; }

+			set { commentUri = value; }

+		}

+

+		public bool Discard {

+			get { return discard; }

+			set { discard = value; }

+		}

+		

+		public string Domain {

+			get { return domain; }

+			set { domain = value == null ? String.Empty : value; }

+		}

+

+		public bool Expired {

+			get { 

+				return expires <= DateTime.Now && 

+				       expires != DateTime.MinValue;

+			}

+			set { 

+				expired = value; 

+				if (expired) {

+					expires = DateTime.Now;

+				}

+			}

+		}

+

+		public DateTime Expires {

+			get { return expires; }

+			set { expires = value; }

+		}

+

+		public string Name {

+			get { return name; }

+			set { 

+				if (value == null || value.Length == 0) {

+					throw new CookieException ("Name cannot be empty");

+				}			

+				

+				if (value [0] == '$' || value.IndexOfAny (reservedCharsName) != -1) {

+					// see CookieTest, according to MS implementation

+					// the name value changes even though it's incorrect

+					name = String.Empty;

+					throw new CookieException ("Name contains invalid characters");

+				}

+					

+				name = value; 

+			}

+		}

+

+		public string Path {

+			get { return (path == null) ? "/" : path; }

+			set { path = (value == null) ? String.Empty : value; }

+		}

+

+		public string Port {

+			get { return port; }

+			set { 

+				if (value == null || value.Length == 0) {

+					port = String.Empty;

+					return;

+				}

+				if (value [0] != '"' || value [value.Length - 1] != '"') {

+					throw new CookieException("The 'Port'='" + value + "' part of the cookie is invalid. Port must be enclosed by double quotes.");

+				}

+				port = value; 

+				string [] values = port.Split (portSeparators);

+				ports = new int[values.Length];

+				for (int i = 0; i < ports.Length; i++) {

+					ports [i] = Int32.MinValue;

+					if (values [i].Length == 0)

+						continue;

+					try {						

+						ports [i] = Int32.Parse (values [i]);

+					} catch (Exception e) {

+						throw new CookieException("The 'Port'='" + value + "' part of the cookie is invalid. Invalid value: " + values [i], e);

+					}

+				}

+			}

+		}

+		

+		int[] Ports {

+			get { return ports; }

+		}

+

+		public bool Secure {

+			get { return secure; }

+			set { secure = value; }

+		}

+

+		public DateTime TimeStamp {

+			get { return timestamp; }

+		}

+

+		public string Value {

+			get { return val; }

+			set { 

+				if (value == null) {

+					val = String.Empty;

+					return;

+				}

+				

+				// LAMESPEC: According to .Net specs the Value property should not accept 

+				// the semicolon and comma characters, yet it does. For now we'll follow

+				// the behaviour of MS.Net instead of the specs.

+				/*

+				if (value.IndexOfAny(reservedCharsValue) != -1)

+					throw new CookieException("Invalid value. Value cannot contain semicolon or comma characters.");

+				*/

+				

+				val = value; 

+			}

+		}

+		

+		public int Version {

+			get { return version; }

+			set { 

+				if ((value < 0) || (value > 10)) 

+					version = 0;

+				else 

+					version = value; 

+			}

+		}

+		

+		public override bool Equals (Object obj) 

+		{

+			System.Net.Cookie c = obj as System.Net.Cookie;			

+			

+			return c != null &&

+			       String.Compare (this.name, c.name, true) == 0 &&

+			       String.Compare (this.val, c.val, false) == 0 &&

+			       String.Compare (this.path, c.path, false) == 0 &&

+			       String.Compare (this.domain, c.domain, true) == 0 &&

+			       this.version == c.version;

+		}

+		

+		public override int GetHashCode ()

+		{

+			return hash(name.ToLower ().GetHashCode (),

+			            val.GetHashCode (),

+			            path.GetHashCode (),

+			            domain.ToLower ().GetHashCode (),

+			            version);

+		}

+		

+		private static int hash (int i, int j, int k, int l, int m) 

+		{

+			return i ^ (j << 13 | j >> 19) ^ (k << 26 | k >> 6) ^ (l << 7 | l >> 25) ^ (m << 20 | m >> 12);

+		}

+		

+		// returns a string that can be used to send a cookie to an Origin Server

+		// i.e., only used for clients

+		// see also para 3.3.4 of RFC 1965

+		public override string ToString () 

+		{

+			if (name.Length == 0) 

+				return String.Empty;

+

+			StringBuilder result = new StringBuilder (64);

+	

+			if (version > 0) {

+				result.Append ("$Version=").Append (version).Append (";");

+            		}				

+				

+			result.Append (name).Append ("=").Append (val);

+

+			// in the MS.Net implementation path and domain don't show up in

+			// the result, I guess that's a bug in their implementation...

+			if (path != null && path.Length != 0)

+				result.Append (";$Path=").Append (QuotedString (path));

+				

+			if (domain != null && domain.Length != 0)

+				result.Append (";$Domain=").Append (QuotedString (domain));			

+	

+			if (port != null && port.Length != 0)

+				result.Append (";$Port=").Append (port);	

+						

+			return result.ToString ();

+		}

+				

+		// See par 3.6 of RFC 2616

+  	    	private string QuotedString (string value)

+	    	{

+			if (version == 0 || IsToken (value))

+				return value;

+			else 

+				return "\"" + value.Replace("\"", "\\\"") + "\"";

+	    	}			    	    

+

+	    	private bool IsToken (string value) 

+	    	{

+			int len = value.Length;

+			for (int i = 0; i < len; i++) {

+			    	char c = value [i];

+				if (c < 0x20 || c >= 0x7f || tspecials.IndexOf (c) != -1)

+			      		return false;

+			}

+			return true;

+	    	}	    

+		

+	}

+}

+

diff --git a/mcs/class/System/System.Net/CookieCollection.cs b/mcs/class/System/System.Net/CookieCollection.cs
new file mode 100644
index 00000000000..b26645f78e2
--- /dev/null
+++ b/mcs/class/System/System.Net/CookieCollection.cs
@@ -0,0 +1,110 @@
+//

+// System.Net.CookieCollection

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class CookieCollection : ICollection, IEnumerable

+	{

+		private ArrayList list = new ArrayList ();

+		

+		// ctor

+		public CookieCollection () 

+		{

+		}

+

+		// ICollection

+

+		public int Count {

+			get { return list.Count; }

+		}

+

+		public bool IsSynchronized {

+			get { return false; }

+		}

+

+		public Object SyncRoot {

+			get { return this; }

+		}

+

+		public void CopyTo (Array array, int arrayIndex)

+		{

+			list.CopyTo (array, arrayIndex);

+		}

+

+

+		// IEnumerable

+

+		public IEnumerator GetEnumerator ()

+		{

+			return list.GetEnumerator ();

+		}

+		

+		

+		// This

+		

+		// LAMESPEC: So how is one supposed to create a writable CookieCollection 

+		// instance?? We simply ignore this property, as this collection is always

+		// writable.

+		public bool IsReadOnly {

+			get { return true; }

+		}		

+		

+		// LAMESPEC: Which exception should we throw when the read only 

+		// property is set to true??

+		public void Add (Cookie cookie) 

+		{

+			if (cookie == null)

+				throw new ArgumentNullException ("cookie");

+			int pos = list.IndexOf (cookie);

+			if (pos == -1)

+				list.Add (cookie);

+			else 

+				list [pos] = cookie;

+		}		

+		

+		// LAMESPEC: Which exception should we throw when the read only 

+		// property is set to true??

+		public void Add (CookieCollection cookies) 

+		{

+			if (cookies == null)

+				throw new ArgumentNullException ("cookies");

+				

+			IEnumerator enumerator = cookies.list.GetEnumerator ();

+			while (enumerator.MoveNext ())

+				Add ((Cookie) enumerator.Current);

+		}

+		

+		public Cookie this [int index] {

+			get {

+				if (index < 0 || index >= list.Count)

+					throw new ArgumentOutOfRangeException ("index");

+				return (Cookie) list [index];

+			}

+		}		

+				

+		public Cookie this [string name] {

+			get {

+				lock (this) {

+					IEnumerator enumerator = list.GetEnumerator ();

+					while (enumerator.MoveNext ())		

+						if (String.Compare (((Cookie) enumerator.Current).Name, name, true) == 0)

+							return (Cookie) enumerator.Current;

+				}

+				return null;

+			}

+		}		

+		

+

+	} // CookieCollection

+

+} // System.Net

+

diff --git a/mcs/class/System/System.Net/CookieContainer.cs b/mcs/class/System/System.Net/CookieContainer.cs
new file mode 100644
index 00000000000..4058b9fd67e
--- /dev/null
+++ b/mcs/class/System/System.Net/CookieContainer.cs
@@ -0,0 +1,130 @@
+//

+// System.Net.CookieContainer

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class CookieContainer

+	{		

+		private int count;

+		private int capacity;

+		private int perDomainCapacity;

+		private int maxCookieSize;

+				

+		// ctors

+		public CookieContainer () : this (DefaultCookieLimit) 

+		{ 

+		} 

+	

+		public CookieContainer (int capacity) : 

+			this (capacity, DefaultPerDomainCookieLimit, DefaultCookieLengthLimit) 

+		{ 

+		}

+		

+		public CookieContainer (int capacity, int perDomainCapacity, int maxCookieSize)

+		{

+			this.capacity = capacity;

+			this.perDomainCapacity = perDomainCapacity;

+			this.maxCookieSize = maxCookieSize;

+			this.count = 0;

+		}

+

+		// fields		

+		

+		public const int DefaultCookieLengthLimit = 4096;

+		public const int DefaultCookieLimit = 300;

+		public const int DefaultPerDomainCookieLimit = 20;

+		

+		// properties

+		

+		public int Count { 

+			get { return count; }

+		}

+		

+		public int Capacity {

+			get { return capacity; }

+			set { 

+				if ((value <= 0) ||

+				    (value < perDomainCapacity && perDomainCapacity != Int32.MaxValue))

+					throw new ArgumentOutOfRangeException ("value");

+				if (value < maxCookieSize)

+					maxCookieSize = value;

+				capacity = value;							

+			}

+		}

+		

+		public int MaxCookieSize {

+			get { return maxCookieSize; }

+			set {

+				if (value <= 0)

+					throw new ArgumentOutOfRangeException ("value");				

+				maxCookieSize = value;

+			}

+		}

+		

+		public int PerDomainCapacity {

+			get { return perDomainCapacity; }

+			set {

+				if ((value <= 0) ||

+				    (value > DefaultCookieLimit && value != Int32.MaxValue))

+					throw new ArgumentOutOfRangeException ("value");					

+				if (value < perDomainCapacity)

+					perDomainCapacity = value;

+				perDomainCapacity = value;

+			}

+		}

+		

+		[MonoTODO]

+		public void Add (Cookie cookie) 

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Add (CookieCollection cookies)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Add (Uri uri, Cookie cookie)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public void Add (Uri uri, CookieCollection cookies)

+		{

+			throw new NotImplementedException ();

+		}		

+

+		[MonoTODO]

+		public string GetCookieHeader (Uri uri)

+		{

+			throw new NotImplementedException ();

+		}

+

+		[MonoTODO]

+		public CookieCollection GetCookies (Uri uri)

+		{

+			throw new NotImplementedException ();				

+		}

+

+		[MonoTODO]

+		public void SetCookies (Uri uri, string cookieHeader)

+		{

+			throw new NotImplementedException ();			

+		}

+

+	} // CookieContainer

+

+} // System.Net

+

diff --git a/mcs/class/System/System.Net/CookieException.cs b/mcs/class/System/System.Net/CookieException.cs
new file mode 100644
index 00000000000..09fd80601ce
--- /dev/null
+++ b/mcs/class/System/System.Net/CookieException.cs
@@ -0,0 +1,42 @@
+//

+// System.Net.CookieException.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System.Globalization;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class CookieException : FormatException, ISerializable

+	{

+

+		// Constructors

+		public CookieException () : base ()

+		{

+		}

+		

+		internal CookieException (string msg) : base (msg) 

+		{

+		}

+		

+		internal CookieException (string msg, Exception e) : base (msg, e)

+		{

+		}

+

+		protected CookieException (SerializationInfo info, StreamingContext context)

+			: base (info, context)

+		{			

+		}

+

+		// Methods

+		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)

+		{

+			base.GetObjectData (info, context);

+		}

+	}

+}

+	

diff --git a/mcs/class/System/System.Net/CredentialCache.cs b/mcs/class/System/System.Net/CredentialCache.cs
new file mode 100644
index 00000000000..02557cb46ae
--- /dev/null
+++ b/mcs/class/System/System.Net/CredentialCache.cs
@@ -0,0 +1,170 @@
+//

+// System.Net.CredentialCache

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class CredentialCache : ICredentials, IEnumerable

+	{

+		// Fields

+		private Hashtable cache;

+		

+		// Constructors		

+		public CredentialCache () 

+		{

+			cache = new Hashtable ();

+		}

+		

+		// Properties

+		

+		[MonoTODO ("Need EnvironmentPermission implementation first")]

+		public static ICredentials DefaultCredentials {

+			get {

+				throw new NotImplementedException ();

+			}

+		}

+		

+

+		// ICredentials

+

+		public NetworkCredential GetCredential (Uri uriPrefix, string authType)

+		{

+			int longestPrefix = -1;

+			NetworkCredential result = null;

+			

+			if (uriPrefix == null || authType == null)

+				return null;

+				

+			string absPath = uriPrefix.AbsolutePath;

+			absPath = absPath.Substring (0, absPath.LastIndexOf ('/'));

+			

+			IDictionaryEnumerator e = cache.GetEnumerator ();

+			while (e.MoveNext ()) {

+				CredentialCacheKey key = e.Key as CredentialCacheKey;

+				

+				if (key.Length <= longestPrefix) 

+					continue;

+				

+				if (String.Compare (key.AuthType, authType, true) != 0)

+					continue;

+				

+				Uri cachedUri = key.UriPrefix;

+				

+				if (cachedUri.Scheme != uriPrefix.Scheme)

+					continue;

+					

+				if (cachedUri.Port != uriPrefix.Port)

+					continue;

+					

+				if (cachedUri.Host != uriPrefix.Host)

+					continue;

+								

+				if (!absPath.StartsWith (key.AbsPath))

+					continue;

+					

+				longestPrefix = key.Length;

+				result = (NetworkCredential) e.Value;

+			}

+			

+			return result;

+		}

+

+		// IEnumerable

+

+		public IEnumerator GetEnumerator ()

+		{

+			return cache.Values.GetEnumerator ();

+		}		

+		

+		// Methods

+		

+		public void Add (Uri uriPrefix, string authType, NetworkCredential cred)

+		{

+			if (uriPrefix == null) 

+				throw new ArgumentNullException ("uriPrefix");

+

+			if (authType == null) 

+				throw new ArgumentNullException ("authType");

+			

+			// throws ArgumentException when same key already exists.

+			cache.Add (new CredentialCacheKey (uriPrefix, authType), cred);

+		}

+		

+		public void Remove (Uri uriPrefix, string authType)

+		{

+			if (uriPrefix == null) 

+				throw new ArgumentNullException ("uriPrefix");

+

+			if (authType == null) 

+				throw new ArgumentNullException ("authType");

+

+			cache.Remove (new CredentialCacheKey (uriPrefix, authType));

+		}

+		

+		// Inner Classes

+		

+		internal class CredentialCacheKey

+		{

+			private Uri uriPrefix;

+			private string authType;

+			

+			private string absPath;

+			private int len;

+			private int hash;

+			

+			internal CredentialCacheKey (Uri uriPrefix, string authType)

+			{

+				this.uriPrefix = uriPrefix;

+				this.authType = authType;

+				

+				this.absPath = uriPrefix.AbsolutePath;

+				this.absPath = absPath.Substring (0, absPath.LastIndexOf ('/'));				

+

+				this.len = uriPrefix.AbsoluteUri.Length;

+				this.hash = uriPrefix.GetHashCode () 

+				          + authType.ToString ().GetHashCode ();

+			}

+			

+			public int Length {

+				get { return len; }

+			}			

+			

+			public string AbsPath {

+				get { return absPath; }

+			}

+			

+			public Uri UriPrefix {

+				get { return uriPrefix; }

+			}

+			

+			public string AuthType {

+				get { return authType; }

+			}

+			

+			public override int GetHashCode ()

+			{

+				return hash;

+			}

+			

+			public override bool Equals (object obj)

+			{

+				CredentialCacheKey key = obj as CredentialCacheKey;

+				return ((key != null) && (this.hash == key.hash));

+			}

+			

+			public override string ToString ()

+			{

+				return absPath + " : " + authType + " : len=" + len;

+			}

+		}

+	} 

+} 

+

diff --git a/mcs/class/System/System.Net/Dns.cs b/mcs/class/System/System.Net/Dns.cs
new file mode 100644
index 00000000000..c52c797508b
--- /dev/null
+++ b/mcs/class/System/System.Net/Dns.cs
@@ -0,0 +1,152 @@
+// System.Net.Dns.cs
+//
+// Author: Mads Pultz (mpultz@diku.dk)
+// Author: Lawrence Pit (loz@cable.a2000.nl)
+//
+// (C) Mads Pultz, 2001
+
+using System;
+using System.Net.Sockets;
+using System.Text;
+using System.Collections;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Net {
+        public sealed class Dns {
+
+		private Dns () {}
+
+                private delegate IPHostEntry GetHostByNameCallback (string hostName);
+                private delegate IPHostEntry ResolveCallback (string hostName);
+                
+                public static IAsyncResult BeginGetHostByName (string hostName,
+                	AsyncCallback requestCallback, object stateObject)
+               	{
+                        if (hostName == null)
+                                throw new ArgumentNullException();
+			GetHostByNameCallback c = new GetHostByNameCallback (GetHostByName);
+			return c.BeginInvoke (hostName, requestCallback, stateObject);
+                }
+
+                public static IAsyncResult BeginResolve (string hostName,
+                	AsyncCallback requestCallback, object stateObject)
+                {
+                        if (hostName == null)
+                                throw new ArgumentNullException();
+			ResolveCallback c = new ResolveCallback (Resolve);
+			return c.BeginInvoke (hostName, requestCallback, stateObject);
+                }
+                
+                public static IPHostEntry EndGetHostByName (IAsyncResult asyncResult) {
+			if (asyncResult == null)
+				throw new ArgumentNullException ("asyncResult");
+			AsyncResult async = (AsyncResult) asyncResult;
+			GetHostByNameCallback cb = (GetHostByNameCallback) async.AsyncDelegate;
+			asyncResult.AsyncWaitHandle.WaitOne ();
+			return cb.EndInvoke(asyncResult);
+                }
+
+                public static IPHostEntry EndResolve (IAsyncResult asyncResult) {
+			if (asyncResult == null)
+				throw new ArgumentNullException ("asyncResult");
+			AsyncResult async = (AsyncResult) asyncResult;
+			ResolveCallback cb = (ResolveCallback) async.AsyncDelegate;
+			asyncResult.AsyncWaitHandle.WaitOne ();
+			return cb.EndInvoke(asyncResult);
+                }
+                                
+                [MethodImplAttribute(MethodImplOptions.InternalCall)]
+                private extern static bool GetHostByName_internal(string host, out string h_name, out string[] h_aliases, out string[] h_addr_list);
+
+                [MethodImplAttribute(MethodImplOptions.InternalCall)]
+                private extern static bool GetHostByAddr_internal(string addr, out string h_name, out string[] h_aliases, out string[] h_addr_list);
+                
+                private static IPHostEntry hostent_to_IPHostEntry(string h_name, string[] h_aliases, string[] h_addrlist) {
+                        IPHostEntry he = new IPHostEntry();
+                        IPAddress[] addrlist = new IPAddress[h_addrlist.Length];
+                        
+                        he.HostName=h_name;
+                        he.Aliases=h_aliases;
+                        for(int i=0; i<h_addrlist.Length; i++) {
+                                addrlist[i]=IPAddress.Parse(h_addrlist[i]);
+                        }
+                        he.AddressList=addrlist;
+
+                        return(he);
+                }
+
+                public static IPHostEntry GetHostByAddress(IPAddress address) {
+                        if (address == null)
+                                throw new ArgumentNullException();
+                        return GetHostByAddress(address.ToString());
+                }
+                
+                public static IPHostEntry GetHostByAddress(string address) {
+                        if (address == null) {
+                                throw new ArgumentNullException();
+                        }
+                        
+                        string h_name;
+                        string[] h_aliases, h_addrlist;
+                        
+                        bool ret = GetHostByAddr_internal(address, out h_name,
+                                                          out h_aliases,
+                                                          out h_addrlist);
+                        if (ret == false) {
+                                throw new SocketException(11001);
+                        }
+                        
+                        return(hostent_to_IPHostEntry(h_name, h_aliases,
+                                                      h_addrlist));
+                }
+
+                public static IPHostEntry GetHostByName(string hostName) {
+                        if (hostName == null)
+                                throw new ArgumentNullException();
+                        
+                        string h_name;
+                        string[] h_aliases, h_addrlist;
+                        
+                        bool ret = GetHostByName_internal(hostName, out h_name,
+                                                          out h_aliases,
+                                                          out h_addrlist);
+                        if (ret == false)
+                                throw new SocketException(11001);
+
+                        return(hostent_to_IPHostEntry(h_name, h_aliases,
+                                                      h_addrlist));
+                }
+                
+                /// <summary>
+                /// This method returns the host name associated with the local host.
+                /// </summary>
+		[MonoTODO]
+                public static string GetHostName() {
+
+			//
+			// This should really PInvoke into `gethostname', which is not the
+			// same thing as `127.0.0.1' which will be most likely localhost
+			//
+                        IPHostEntry h = GetHostByAddress("127.0.0.1");
+                        return h.HostName;
+                }
+                
+                /// <summary>
+                /// This method resolves a DNS-style host name or IP
+                /// address.
+                /// </summary>
+                /// <param name=hostName>
+                /// A string containing either a DNS-style host name (e.g.
+                /// www.go-mono.com) or IP address (e.g. 129.250.184.233).
+                /// </param>
+                public static IPHostEntry Resolve(string hostName) {
+                        if (hostName == null)
+                                throw new ArgumentNullException();
+
+			return GetHostByName (hostName);
+                }
+        }
+}
+
diff --git a/mcs/class/System/System.Net/DnsPermission.cs b/mcs/class/System/System.Net/DnsPermission.cs
new file mode 100644
index 00000000000..e60a0fca65d
--- /dev/null
+++ b/mcs/class/System/System.Net/DnsPermission.cs
@@ -0,0 +1,139 @@
+//

+// System.Net.DnsPermission.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Security;

+using System.Security.Permissions;

+

+namespace System.Net

+{

+	[Serializable]

+	public sealed class DnsPermission : CodeAccessPermission, IUnrestrictedPermission

+	{

+		// Fields

+		bool m_noRestriction;

+		

+		// Constructors

+		public DnsPermission (PermissionState state) : base () 

+		{						

+			m_noRestriction = (state == PermissionState.Unrestricted);

+		}

+		

+		// Methods

+				

+		public override IPermission Copy ()

+		{

+			// this is immutable.

+			return this;		

+		}

+		

+		public override IPermission Intersect (IPermission target)

+		{

+			// LAMESPEC: says to throw an exception when null

+			// but at same time it says to return null. We'll

+			// follow MS behaviour.

+			if (target == null) 

+				return null;

+			

+			DnsPermission perm = target as DnsPermission;

+			

+			if (perm == null)

+				throw new ArgumentException ("Argument not of type DnsPermission");

+				

+			if (this.m_noRestriction && perm.m_noRestriction)

+				return this;

+			

+			return this.m_noRestriction ? perm : this;

+		}

+		

+		public override bool IsSubsetOf (IPermission target) 

+		{

+			if (target == null)

+				return !m_noRestriction;

+			

+			DnsPermission perm = target as DnsPermission;

+			

+			if (perm == null)

+				throw new ArgumentException ("Argument not of type DnsPermission");

+			

+			return !this.m_noRestriction || perm.m_noRestriction;

+		}

+

+		public bool IsUnrestricted () 

+		{

+			return this.m_noRestriction;

+		}

+

+		/*

+		

+		DnsPermission dns1 = new DnsPermission (PermissionState.None);

+		Console.WriteLine (dns1.ToXml ().ToString ());

+

+		DnsPermission dns2 = new DnsPermission (PermissionState.Unrestricted);

+		Console.WriteLine (dns2.ToXml ().ToString ());

+		

+		This is the sample xml output:

+

+		<IPermission class="System.Net.DnsPermission, System, Version=1.0.3300.0, Cultur

+		e=neutral, PublicKeyToken=b77a5c561934e089"

+			     version="1"/>

+

+		<IPermission class="System.Net.DnsPermission, System, Version=1.0.3300.0, Cultur

+		e=neutral, PublicKeyToken=b77a5c561934e089"

+			     version="1"

+			     Unrestricted="true"/>

+		*/

+		public override SecurityElement ToXml ()

+		{

+             

+			SecurityElement root = new SecurityElement ("IPermission");

+			root.AddAttribute ("class", this.GetType ().AssemblyQualifiedName);

+			root.AddAttribute ("version", "1");

+			if (m_noRestriction)

+				root.AddAttribute ("Unrestricted", "true");				

+

+			return root;

+		}

+		

+		public override void FromXml (SecurityElement securityElement)

+		{

+			if (securityElement == null)

+				throw new ArgumentNullException ("securityElement");

+				

+			// LAMESPEC: it says to throw an ArgumentNullException in this case				

+			if (securityElement.Tag != "IPermission")

+				throw new ArgumentException ("securityElement");

+				

+			string classStr = securityElement.Attribute ("class");

+			if (classStr == null || !classStr.StartsWith (this.GetType ().FullName + ","))

+				throw new ArgumentException ("securityElement");

+				

+			string unrestricted = securityElement.Attribute ("Unrestricted");

+			if (unrestricted != null) 

+				this.m_noRestriction = (String.Compare (unrestricted, "true", true) == 0);

+		}		

+		

+		public override IPermission Union (IPermission target) 

+		{

+			// LAMESPEC: according to spec we should throw an 

+			// exception when target is null. We'll follow the

+			// behaviour of MS.Net instead of the spec.

+			if (target == null)

+				return this;

+				// throw new ArgumentNullException ("target");

+				

+			DnsPermission perm = target as DnsPermission;

+			

+			if (perm == null)

+				throw new ArgumentException ("Argument not of type DnsPermission");

+			

+			return this.m_noRestriction ? this : perm;

+		}

+

+	}

+}

diff --git a/mcs/class/System/System.Net/DnsPermissionAttribute.cs b/mcs/class/System/System.Net/DnsPermissionAttribute.cs
new file mode 100644
index 00000000000..5b8a3a18f45
--- /dev/null
+++ b/mcs/class/System/System.Net/DnsPermissionAttribute.cs
@@ -0,0 +1,38 @@
+//

+// System.Net.DnsPermissionAttribute.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Security;

+using System.Security.Permissions;

+

+namespace System.Net

+{

+	[AttributeUsage (AttributeTargets.Assembly 

+	               | AttributeTargets.Class 

+	               | AttributeTargets.Struct 

+	               | AttributeTargets.Constructor 

+	               | AttributeTargets.Method)

+	]	

+	[Serializable]

+	public sealed class DnsPermissionAttribute : CodeAccessSecurityAttribute

+	{

+		

+		// Constructors

+		public DnsPermissionAttribute (SecurityAction action) : base (action)

+		{

+		}

+

+		// Methods

+		

+		public override IPermission CreatePermission () {

+			return new DnsPermission (

+				this.Unrestricted ?

+				PermissionState.Unrestricted :

+				PermissionState.None);

+		}		

+	}

+}

diff --git a/mcs/class/System/System.Net/EndPoint.cs b/mcs/class/System/System.Net/EndPoint.cs
new file mode 100755
index 00000000000..5e1d81f98dc
--- /dev/null
+++ b/mcs/class/System/System.Net/EndPoint.cs
@@ -0,0 +1,40 @@
+//
+// System.Net.EndPoint.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Net.Sockets;
+
+namespace System.Net {
+	[Serializable]
+	public abstract class EndPoint {
+
+		// NB: These methods really do nothing but throw
+		// NotSupportedException
+		
+		public virtual AddressFamily AddressFamily {
+			get {
+				throw new NotSupportedException();
+			}
+		}
+		
+		public virtual EndPoint Create (SocketAddress address)
+		{
+			throw new NotSupportedException();
+		}
+
+		public virtual SocketAddress Serialize ()
+		{
+			throw new NotSupportedException();
+		}
+
+		protected EndPoint ()
+		{
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Net/EndpointPermission.cs b/mcs/class/System/System.Net/EndpointPermission.cs
new file mode 100644
index 00000000000..ca895c75694
--- /dev/null
+++ b/mcs/class/System/System.Net/EndpointPermission.cs
@@ -0,0 +1,326 @@
+//

+// System.Net.EndpointPermission.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Security;

+using System.Security.Permissions;

+

+namespace System.Net

+{

+	[Serializable]

+	public class EndpointPermission // too bad about the lowercase p, not consistent with IPEndPoint ;)

+	{

+		private static char [] dot_char = new char [] { '.' };

+		

+		// Fields

+		private string hostname;

+		private int port;

+		private TransportType transport;

+

+		private bool resolved;		

+		private bool hasWildcard;

+		private IPAddress [] addresses;

+		

+		// Constructors

+		internal EndpointPermission (string hostname, 

+				   	     int port, 

+				   	     TransportType transport) : base () 

+		{			

+			if (hostname == null)

+				throw new ArgumentNullException ("hostname");

+			this.hostname = hostname;

+			this.port = port;

+			this.transport = transport;

+			this.resolved = false;

+			this.hasWildcard = false;

+			this.addresses = null;

+		}		

+		

+		// Properties

+

+		public string Hostname {

+			get { return hostname; }

+		}

+

+		public int Port {

+			get { return port; }

+		}

+		

+		public TransportType Transport {

+			get { return transport; }

+		}

+		

+		// Methods

+		

+		public override bool Equals (object obj) 

+		{

+			EndpointPermission epp = obj as EndpointPermission;

+			return ((epp != null) &&

+			        (this.port == epp.port) &&

+			        (this.transport == epp.transport) &&

+			        (String.Compare (this.hostname, epp.hostname, true) == 0));

+		}

+		

+		public override int GetHashCode () 

+		{

+			return ToString ().GetHashCode ();

+		}

+		

+		public override string ToString () 

+		{

+			return hostname + "#" + port + "#" + (int) transport;

+		}

+		

+		// Internal & Private Methods

+		

+		internal bool IsSubsetOf (EndpointPermission perm) 

+		{

+			if (perm == null)

+				return false;

+			

+			if (perm.port != SocketPermission.AllPorts &&

+			    this.port != perm.port)

+			    	return false;

+			

+			if (perm.transport != TransportType.All &&

+			    this.transport != perm.transport)

+				return false;

+			

+			this.Resolve ();

+			perm.Resolve ();

+			

+			if (this.hasWildcard) {

+				if (perm.hasWildcard)

+					return IsSubsetOf (this.hostname, perm.hostname);

+				else 

+					return false;

+			} 

+			

+			if (this.addresses == null) 

+				return false;

+			

+			if (perm.hasWildcard) 

+				// a bit dubious... should they all be a subset or is one 

+				// enough in this case?

+				foreach (IPAddress addr in this.addresses)

+					if (IsSubsetOf (addr.ToString (), perm.hostname))

+						return true;

+				

+			if (perm.addresses == null) 

+				return false;

+				

+			// a bit dubious... should they all be a subset or is one 

+			// enough in this case?

+			foreach (IPAddress addr in perm.addresses)

+				if (IsSubsetOf (this.hostname, addr.ToString ())) 

+					return true;	

+					

+			return false;		

+		}		

+		

+		private bool IsSubsetOf (string addr1, string addr2)

+		{

+			string [] h1 = addr1.Split (dot_char);		

+			string [] h2 = addr2.Split (dot_char);

+				

+			for (int i = 0; i < 4; i++) {

+				int part1 = ToNumber (h1 [i]);

+				if (part1 == -1) 

+					return false;				

+

+				int part2 = ToNumber (h2 [i]);

+				if (part2 == -1)

+					return false;				

+				if (part1 != part2 && part2 != 256)

+					return false;

+			}

+			return true;

+		}

+		

+		internal EndpointPermission Intersect (EndpointPermission perm) 

+		{

+			if (perm == null)

+				return null;

+			

+			int _port;

+			if (this.port == perm.port)

+				_port = this.port;

+			else if (this.port == SocketPermission.AllPorts)

+				_port = perm.port;

+			else if (perm.port == SocketPermission.AllPorts)

+				_port = this.port;

+			else

+				return null;

+

+			TransportType _transport;

+			if (this.transport == perm.transport)

+				_transport = this.transport;

+			else if (this.transport == TransportType.All)

+				_transport = perm.transport;

+			else if (perm.transport == TransportType.All)

+				_transport = this.transport;

+			else

+				return null;

+

+			string _hostname = IntersectHostname (perm);						

+			

+			if (_hostname == null)

+				return null;

+

+			if (!this.hasWildcard)

+				return this;

+				

+			if (!perm.hasWildcard)

+				return perm;

+				

+			EndpointPermission newperm = new EndpointPermission (_hostname, _port, _transport);

+			newperm.hasWildcard = true;

+			newperm.resolved = true;

+			return newperm;

+		}

+		

+		private string IntersectHostname (EndpointPermission perm)

+		{

+			if (this.hostname == perm.hostname)

+				return this.hostname;

+				

+			this.Resolve ();

+			perm.Resolve ();

+			

+			string _hostname = null;

+			

+			if (this.hasWildcard) {

+				if (perm.hasWildcard) {

+					_hostname = Intersect (this.hostname, perm.hostname);

+				} else if (perm.addresses != null) {

+					for (int j = 0; j < perm.addresses.Length; j++) {

+						_hostname = Intersect (this.hostname, perm.addresses [j].ToString ());

+						if (_hostname != null) 

+							break;

+					}

+				}

+			} else if (this.addresses != null) {

+				for (int i = 0; i < this.addresses.Length; i++) {

+					string thisaddr = this.addresses [i].ToString ();

+					if (perm.hasWildcard) {

+						_hostname = Intersect (thisaddr, perm.hostname);

+					} else if (perm.addresses != null) {

+						for (int j = 0; j < perm.addresses.Length; j++) {

+							_hostname = Intersect (thisaddr, perm.addresses [j].ToString ());

+							if (_hostname != null) 

+								break;

+						}

+					}

+				}

+			}

+			

+			return _hostname;

+		}

+		

+		// alas, currently we'll only support IPv4 as that's MS.Net behaviour

+		// returns null when both host strings do not intersect

+		private string Intersect (string addr1, string addr2)

+		{

+			string [] h1 = addr1.Split (dot_char);		

+			string [] h2 = addr2.Split (dot_char);

+				

+			string [] s = new string [7];

+			for (int i = 0; i < 4; i++) {

+				int part1 = ToNumber (h1 [i]);

+				if (part1 == -1) 

+					return null;				

+

+				int part2 = ToNumber (h2 [i]);

+				if (part2 == -1)

+					return null;				

+

+				if (part1 == 256) 

+					s [i << 1] = (part2 == 256) ? "*" : String.Empty + part2;

+				else if (part2 == 256)

+					s [i << 1] = (part1 == 256) ? "*" : String.Empty + part1;				

+				else if (part1 == part2)

+					s [i << 1] = String.Empty + part1;

+				else

+					return null;

+			}

+			

+			s [1] = s [3] = s [5] = ".";

+			return String.Concat (s);

+		}

+		

+		// returns 256 if value is a '*' character

+		// returns -1 if value isn't a number between 0 and 255		

+		private int ToNumber (string value)

+		{

+			if (value == "*")

+				return 256;

+				

+			int len = value.Length;

+			if (len < 1 || len > 3)

+				return -1;

+				

+			int val = 0;				

+			for (int i = 0; i < len; i++) {

+				char c = value [i];

+				if ('0' <= c && c <= '9') 

+					val = checked (val * 10 + (c - '0'));

+				else

+					return -1;

+			}

+			

+			return val <= 255 ? val : -1;

+		}

+

+		internal void Resolve ()

+		{

+			if (resolved) 	

+				return;

+				

+			bool isHostname = false;				

+			bool hasWildcard = false;

+			this.addresses = null;

+			

+			string [] s = hostname.Split (dot_char);

+

+			if (s.Length != 4) {

+				isHostname = true;

+			} else {

+				for (int i = 0; i < 4; i++) {

+					int quad = ToNumber (s [i]);

+					if (quad == -1) {

+						isHostname = true;

+						break;

+					}

+					if (quad == 256)

+						hasWildcard = true;

+				}

+			}

+			

+			if (isHostname) {

+				this.hasWildcard = false;

+				try {

+					this.addresses = Dns.GetHostByName (hostname).AddressList;

+				} catch (System.Net.Sockets.SocketException) {					

+				}

+			} else {

+				this.hasWildcard = hasWildcard;

+				if (!hasWildcard) {

+					addresses = new IPAddress [1];

+					addresses [0] = IPAddress.Parse (hostname);

+				}

+			}

+			

+			this.resolved = true;				

+		}

+		

+		internal void UndoResolve ()

+		{

+			resolved = false;

+		}

+	}

+}

diff --git a/mcs/class/System/System.Net/FileWebRequest.cs b/mcs/class/System/System.Net/FileWebRequest.cs
new file mode 100644
index 00000000000..899c10f7676
--- /dev/null
+++ b/mcs/class/System/System.Net/FileWebRequest.cs
@@ -0,0 +1,295 @@
+//

+// System.Net.FileWebRequest

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.IO;

+using System.Runtime.Serialization;

+using System.Runtime.Remoting.Messaging;

+using System.Threading;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class FileWebRequest : WebRequest, ISerializable

+	{

+		private Uri uri;

+		private WebHeaderCollection webHeaders;

+		

+		private ICredentials credentials;

+		private string connectionGroup;

+		private string method;

+		private int timeout;

+		

+		private Stream requestStream = null;

+		private FileWebResponse webResponse = null;

+		private AutoResetEvent requestEndEvent = null;

+		private bool requesting = false;

+		private bool asyncResponding = false;

+		

+		// Constructors

+		

+		internal FileWebRequest (Uri uri) 

+		{ 

+			this.uri = uri;

+			this.webHeaders = new WebHeaderCollection ();

+			this.method = "GET";

+			this.timeout = System.Threading.Timeout.Infinite; 

+		}		

+		

+		[MonoTODO]

+		protected FileWebRequest (SerializationInfo serializationInfo, StreamingContext streamingContext) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// Properties

+		

+		// currently not used according to spec

+		public override string ConnectionGroupName { 

+			get { return connectionGroup; }

+			set { connectionGroup = value; }

+		}

+		

+		public override long ContentLength { 

+			get { 

+				try {

+					return Int64.Parse (webHeaders ["Content-Length"]); 

+				} catch (Exception) {

+					return 0;

+				}

+			}

+			set { 

+				if (value < 0)

+					throw new ArgumentException ("value");

+				webHeaders ["Content-Length"] = Convert.ToString (value);

+			}

+		}

+		

+		public override string ContentType { 

+			get { return webHeaders ["Content-Type"]; }

+			set { webHeaders ["Content-Type"] = value; }

+		}

+		

+		public override ICredentials Credentials { 

+			get { return credentials; }

+			set { credentials = value; }

+		}

+		

+		public override WebHeaderCollection Headers { 

+			get { return webHeaders; }

+		}

+		

+		// currently not used according to spec

+		public override string Method { 

+			get { return this.method; }

+			set { this.method = value; }

+		}

+		

+		// currently not used according to spec

+		public override bool PreAuthenticate { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		// currently not used according to spec

+		public override IWebProxy Proxy { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public override Uri RequestUri { 

+			get { return this.uri; }

+		}

+		

+		public override int Timeout { 

+			get { return timeout; }

+			set { 

+				if (value < 0)

+					throw new ArgumentException ("value");

+				timeout = value;

+			}

+		}

+		

+		// Methods

+		

+		private delegate Stream GetRequestStreamCallback ();

+		private delegate WebResponse GetResponseCallback ();

+

+		public override IAsyncResult BeginGetRequestStream (AsyncCallback callback, object state) 

+		{		

+			if (method == null || (!method.Equals ("PUT") && !method.Equals ("POST")))

+				throw new ProtocolViolationException ("Cannot send file when method is: " + this.method + ". Method must be PUT.");

+			// workaround for bug 24943

+			Exception e = null;

+			lock (this) {

+				if (asyncResponding || webResponse != null)

+					e = new InvalidOperationException ("This operation cannot be performed after the request has been submitted.");

+				else if (requesting)

+					e = new InvalidOperationException ("Cannot re-call start of asynchronous method while a previous call is still in progress.");

+				else

+					requesting = true;

+			}

+			if (e != null)

+				throw e;

+			/*

+			lock (this) {

+				if (asyncResponding || webResponse != null)

+					throw new InvalidOperationException ("This operation cannot be performed after the request has been submitted.");

+				if (requesting)

+					throw new InvalidOperationException ("Cannot re-call start of asynchronous method while a previous call is still in progress.");

+				requesting = true;

+			}

+			*/

+			GetRequestStreamCallback c = new GetRequestStreamCallback (this.GetRequestStreamInternal);

+			return c.BeginInvoke (callback, state);			

+		}

+		

+		public override Stream EndGetRequestStream (IAsyncResult asyncResult)

+		{

+			if (asyncResult == null)

+				throw new ArgumentNullException ("asyncResult");

+			if (!asyncResult.IsCompleted)

+				asyncResult.AsyncWaitHandle.WaitOne ();				

+			AsyncResult async = (AsyncResult) asyncResult;

+			GetRequestStreamCallback cb = (GetRequestStreamCallback) async.AsyncDelegate;

+			return cb.EndInvoke (asyncResult);

+		}

+

+		public override Stream GetRequestStream()

+		{

+			IAsyncResult asyncResult = BeginGetRequestStream (null, null);

+			if (!(asyncResult.AsyncWaitHandle.WaitOne (timeout, false))) {

+				throw new WebException("The request timed out", WebExceptionStatus.Timeout);

+			}

+			return EndGetRequestStream (asyncResult);

+		}

+		

+		internal Stream GetRequestStreamInternal ()

+		{

+			this.requestStream = new FileWebStream (

+						this,

+						FileMode.CreateNew,

+						FileAccess.Write, 

+						FileShare.Read);

+			return this.requestStream;

+		}

+		

+		public override IAsyncResult BeginGetResponse (AsyncCallback callback, object state)

+		{

+			// workaround for bug 24943

+			Exception e = null;

+			lock (this) {

+				if (asyncResponding)

+					e = new InvalidOperationException ("Cannot re-call start of asynchronous method while a previous call is still in progress.");

+				else 

+					asyncResponding = true;

+			}

+			if (e != null)

+				throw e;

+			/*

+			lock (this) {

+				if (asyncResponding)

+					throw new InvalidOperationException ("Cannot re-call start of asynchronous method while a previous call is still in progress.");

+				asyncResponding = true;

+			}

+			*/

+			GetResponseCallback c = new GetResponseCallback (this.GetResponseInternal);

+			return c.BeginInvoke (callback, state);

+		}

+

+		public override WebResponse EndGetResponse (IAsyncResult asyncResult)

+		{

+			if (asyncResult == null)

+				throw new ArgumentNullException ("asyncResult");

+			if (!asyncResult.IsCompleted)

+				asyncResult.AsyncWaitHandle.WaitOne ();			

+			AsyncResult async = (AsyncResult) asyncResult;

+			GetResponseCallback cb = (GetResponseCallback) async.AsyncDelegate;

+			WebResponse webResponse = cb.EndInvoke(asyncResult);

+			asyncResponding = false;

+			return webResponse;

+		}

+				

+		public override WebResponse GetResponse ()

+		{

+			IAsyncResult asyncResult = BeginGetResponse (null, null);

+			if (!(asyncResult.AsyncWaitHandle.WaitOne (timeout, false))) {

+				throw new WebException("The request timed out", WebExceptionStatus.Timeout);

+			}

+			return EndGetResponse (asyncResult);

+		}

+			

+		public WebResponse GetResponseInternal ()

+		{

+			if (webResponse != null)

+				return webResponse;			

+			lock (this) {

+				if (requesting) {

+					requestEndEvent = new AutoResetEvent (false);

+				}

+			}

+			if (requestEndEvent != null) {

+				requestEndEvent.WaitOne ();

+			}

+			FileStream fileStream = new FileWebStream (

+							this,

+						     	FileMode.Open, 

+							FileAccess.Read, 

+							FileShare.Read);

+ 			this.webResponse = new FileWebResponse (this.uri, fileStream);

+ 			return (WebResponse) this.webResponse;

+		}

+		

+		[MonoTODO]

+		void ISerializable.GetObjectData (SerializationInfo serializationInfo,

+		   				  StreamingContext streamingContext)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		internal void Close ()

+		{

+			// already done in class below

+			// if (requestStream != null) {

+			// 	requestStream.Close ();

+			// }

+

+			lock (this) {			

+				requesting = false;

+				if (requestEndEvent != null) 

+					requestEndEvent.Set ();

+				// requestEndEvent = null;

+			}

+		}

+		

+		// to catch the Close called on the FileStream

+		internal class FileWebStream : FileStream

+		{

+			FileWebRequest webRequest;

+			

+			internal FileWebStream (FileWebRequest webRequest,    

+					   	FileMode mode,

+					   	FileAccess access,

+					   	FileShare share)

+				: base (webRequest.RequestUri.LocalPath, 

+					mode, access, share)

+			{

+				this.webRequest = webRequest;

+			}

+					   	

+			public override void Close() 

+			{

+				base.Close ();

+				FileWebRequest req = webRequest;

+				webRequest = null;

+				if (req != null)

+					req.Close ();

+			}

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/FileWebResponse.cs b/mcs/class/System/System.Net/FileWebResponse.cs
new file mode 100644
index 00000000000..d4acb6e79e9
--- /dev/null
+++ b/mcs/class/System/System.Net/FileWebResponse.cs
@@ -0,0 +1,139 @@
+//

+// System.Net.FileWebResponse

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.IO;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class FileWebResponse : WebResponse, ISerializable, IDisposable

+	{

+		private Uri responseUri;

+		private FileStream fileStream;

+		private long contentLength;

+		private WebHeaderCollection webHeaders;

+		private bool disposed = false;

+		

+		// Constructors

+		

+		protected FileWebResponse () { }

+		

+		internal FileWebResponse (Uri responseUri, FileStream fileStream)

+		{

+			try {

+				this.responseUri = responseUri;

+				this.fileStream = fileStream;

+				this.contentLength = fileStream.Length;

+				this.webHeaders = new WebHeaderCollection ();

+				this.webHeaders.Add ("Content-Length", Convert.ToString (contentLength));

+				this.webHeaders.Add ("Content-Type", "binary/octet-stream");

+			} catch (Exception e) {

+				throw new WebException (e.Message, e);

+			}

+		}

+		

+		[MonoTODO]

+		protected FileWebResponse (SerializationInfo serializationInfo, StreamingContext streamingContext)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// Properties

+		

+		public override long ContentLength {		

+			get {

+				try { return this.contentLength; }

+				finally { CheckDisposed (); }

+			}

+		}

+		

+		public override string ContentType {		

+			get {

+				try { return "binary/octet-stream"; }

+				finally { CheckDisposed (); }

+			}

+		}

+		

+		public override WebHeaderCollection Headers {		

+			get {

+				try { return this.webHeaders; }

+				finally { CheckDisposed (); }

+			}

+		}

+		

+		public override Uri ResponseUri {		

+			get {

+				try { return this.responseUri; }

+				finally { CheckDisposed (); }

+			}

+		}		

+

+		// Methods

+

+		[MonoTODO]

+		void ISerializable.GetObjectData (SerializationInfo serializationInfo,

+		   				  StreamingContext streamingContext)

+		{

+			try {

+				throw new NotImplementedException ();

+			} finally { CheckDisposed (); }

+		}		

+

+		public override Stream GetResponseStream()

+		{

+			try { return this.fileStream; }

+			finally { CheckDisposed (); }

+		}

+				

+		// Cleaning up stuff

+		

+		~FileWebResponse ()

+		{

+			Dispose (false);

+		}		

+		

+		public override void Close()

+		{

+			((IDisposable) this).Dispose ();

+		}

+

+		void IDisposable.Dispose()

+		{

+			Dispose (true);

+			

+			// see spec, suppress finalization of this object.

+			GC.SuppressFinalize (this);  

+		}

+		

+		protected virtual void Dispose (bool disposing)

+		{

+			if (this.disposed)

+				return;

+			this.disposed = true;

+			

+			if (disposing) {

+				// release managed resources

+				this.responseUri = null;

+				this.webHeaders = null;

+			}

+			

+			// release unmanaged resources

+			FileStream stream = fileStream;

+			fileStream = null;

+			if (stream != null)

+				stream.Close (); // also closes webRequest

+		}

+		

+		private void CheckDisposed ()

+		{

+			if (disposed)

+				throw new ObjectDisposedException (GetType ().FullName);

+		}		

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/GlobalProxySelection.cs b/mcs/class/System/System.Net/GlobalProxySelection.cs
new file mode 100644
index 00000000000..d17683ced5b
--- /dev/null
+++ b/mcs/class/System/System.Net/GlobalProxySelection.cs
@@ -0,0 +1,74 @@
+//

+// System.Net.GlobalProxySelection

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.IO;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	public class GlobalProxySelection

+	{

+		private static IWebProxy proxy;

+		

+		// Static Initializer

+		

+		static GlobalProxySelection ()

+		{

+			proxy = GetEmptyWebProxy ();

+			

+			// TODO: create proxy object based on information from

+			//       the global or application configuration file.

+		}

+		

+		// Constructors

+		

+		public GlobalProxySelection() { }

+		

+		// Properties

+		

+		public static IWebProxy Select {

+			get { return proxy; }

+			set { 

+				proxy = (value == null) ? GetEmptyWebProxy () : value; 

+			}

+		}

+		

+		// Methods

+		

+		public static IWebProxy GetEmptyWebProxy()

+		{

+			// must return a new one each time, as the credentials

+			// can be set

+			return new EmptyWebProxy ();	

+		}

+		

+		// Internal Classes

+		

+		internal class EmptyWebProxy : IWebProxy {

+			private ICredentials credentials = null;

+			

+			internal EmptyWebProxy () { }

+			

+			public ICredentials Credentials {

+				get { return credentials; } 

+				set { credentials = value; }

+			}

+

+			public Uri GetProxy (Uri destination)

+			{

+				return destination;

+			}

+

+			public bool IsBypassed (Uri host)

+			{

+				return true; // pass directly to host

+			}

+		}

+	}		

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/HttpContinueDelegate.cs b/mcs/class/System/System.Net/HttpContinueDelegate.cs
new file mode 100644
index 00000000000..a8f4d1f4aaa
--- /dev/null
+++ b/mcs/class/System/System.Net/HttpContinueDelegate.cs
@@ -0,0 +1,13 @@
+//

+// System.Net.HttpContinueDelegate.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+namespace System.Net

+{

+	public delegate void HttpContinueDelegate (

+			int StatusCode,

+	   		WebHeaderCollection httpHeaders);

+}

diff --git a/mcs/class/System/System.Net/HttpStatusCode.cs b/mcs/class/System/System.Net/HttpStatusCode.cs
new file mode 100755
index 00000000000..6688853fafc
--- /dev/null
+++ b/mcs/class/System/System.Net/HttpStatusCode.cs
@@ -0,0 +1,205 @@
+// HttpStatusCode.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:32:05 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net {
+
+
+	/// <summary>
+	/// </summary>
+	public enum HttpStatusCode {
+
+		/// <summary>
+		/// </summary>
+		Continue = 100,
+
+		/// <summary>
+		/// </summary>
+		SwitchingProtocols = 101,
+
+		/// <summary>
+		/// </summary>
+		OK = 200,
+
+		/// <summary>
+		/// </summary>
+		Created = 201,
+
+		/// <summary>
+		/// </summary>
+		Accepted = 202,
+
+		/// <summary>
+		/// </summary>
+		NonAuthoritativeInformation = 203,
+
+		/// <summary>
+		/// </summary>
+		NoContent = 204,
+
+		/// <summary>
+		/// </summary>
+		ResetContent = 205,
+
+		/// <summary>
+		/// </summary>
+		PartialContent = 206,
+
+		/// <summary>
+		/// </summary>
+		MultipleChoices = 300,
+
+		/// <summary>
+		/// </summary>
+		Ambiguous = 300,
+
+		/// <summary>
+		/// </summary>
+		MovedPermanently = 301,
+
+		/// <summary>
+		/// </summary>
+		Moved = 301,
+
+		/// <summary>
+		/// </summary>
+		Found = 302,
+
+		/// <summary>
+		/// </summary>
+		Redirect = 302,
+
+		/// <summary>
+		/// </summary>
+		SeeOther = 303,
+
+		/// <summary>
+		/// </summary>
+		RedirectMethod = 303,
+
+		/// <summary>
+		/// </summary>
+		NotModified = 304,
+
+		/// <summary>
+		/// </summary>
+		UseProxy = 305,
+
+		/// <summary>
+		/// </summary>
+		Unused = 306,
+
+		/// <summary>
+		/// </summary>
+		TemporaryRedirect = 307,
+
+		/// <summary>
+		/// </summary>
+		RedirectKeepVerb = 307,
+
+		/// <summary>
+		/// </summary>
+		BadRequest = 400,
+
+		/// <summary>
+		/// </summary>
+		Unauthorized = 401,
+
+		/// <summary>
+		/// </summary>
+		PaymentRequired = 402,
+
+		/// <summary>
+		/// </summary>
+		Forbidden = 403,
+
+		/// <summary>
+		/// </summary>
+		NotFound = 404,
+
+		/// <summary>
+		/// </summary>
+		MethodNotAllowed = 405,
+
+		/// <summary>
+		/// </summary>
+		NotAcceptable = 406,
+
+		/// <summary>
+		/// </summary>
+		ProxyAuthenticationRequired = 407,
+
+		/// <summary>
+		/// </summary>
+		RequestTimeout = 408,
+
+		/// <summary>
+		/// </summary>
+		Conflict = 409,
+
+		/// <summary>
+		/// </summary>
+		Gone = 410,
+
+		/// <summary>
+		/// </summary>
+		LengthRequired = 411,
+
+		/// <summary>
+		/// </summary>
+		PreconditionFailed = 412,
+
+		/// <summary>
+		/// </summary>
+		RequestEntityTooLarge = 413,
+
+		/// <summary>
+		/// </summary>
+		RequestUriTooLong = 414,
+
+		/// <summary>
+		/// </summary>
+		UnsupportedMediaType = 415,
+
+		/// <summary>
+		/// </summary>
+		RequestedRangeNotSatisfiable = 416,
+
+		/// <summary>
+		/// </summary>
+		ExpectationFailed = 417,
+
+		/// <summary>
+		/// </summary>
+		InternalServerError = 500,
+
+		/// <summary>
+		/// </summary>
+		NotImplemented = 501,
+
+		/// <summary>
+		/// </summary>
+		BadGateway = 502,
+
+		/// <summary>
+		/// </summary>
+		ServiceUnavailable = 503,
+
+		/// <summary>
+		/// </summary>
+		GatewayTimeout = 504,
+
+		/// <summary>
+		/// </summary>
+		HttpVersionNotSupported = 505,
+	} // HttpStatusCode
+
+} // System.Net
diff --git a/mcs/class/System/System.Net/HttpVersion.cs b/mcs/class/System/System.Net/HttpVersion.cs
new file mode 100644
index 00000000000..7172fbce27e
--- /dev/null
+++ b/mcs/class/System/System.Net/HttpVersion.cs
@@ -0,0 +1,22 @@
+//

+// System.Net.HttpVersion.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+

+namespace System.Net {

+

+	// <remarks>

+	// </remarks>

+	public class HttpVersion {

+		

+		public static readonly Version Version10 = new Version (1, 0);

+		public static readonly Version Version11 = new Version (1, 1);

+		

+		// pretty useless..

+		public HttpVersion () {}

+	}

+}

diff --git a/mcs/class/System/System.Net/HttpWebRequest.cs b/mcs/class/System/System.Net/HttpWebRequest.cs
new file mode 100644
index 00000000000..126bae37076
--- /dev/null
+++ b/mcs/class/System/System.Net/HttpWebRequest.cs
@@ -0,0 +1,579 @@
+//

+// System.Net.HttpWebRequest

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.IO;

+using System.Net.Sockets;

+using System.Runtime.Remoting.Messaging;

+using System.Runtime.Serialization;

+using System.Security.Cryptography.X509Certificates;

+using System.Threading;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class HttpWebRequest : WebRequest, ISerializable

+	{

+		private Uri requestUri;

+		private Uri actualUri = null;

+		private bool allowAutoRedirect = true;

+		private bool allowBuffering = true;

+		private X509CertificateCollection certificate = null;

+		private string connectionGroup = null;

+		private long contentLength = -1;

+		private HttpContinueDelegate continueDelegate = null;

+		private CookieContainer cookieContainer = null;

+		private ICredentials credentials = null;

+		private bool haveResponse = false;		

+		private WebHeaderCollection webHeaders;

+		private bool keepAlive = true;

+		private int maxAutoRedirect = 50;

+		private string mediaType = String.Empty;

+		private string method;

+		private bool pipelined = true;

+		private bool preAuthenticate = false;

+		private Version version;		

+		private IWebProxy proxy;

+		private bool sendChunked = false;

+		private ServicePoint servicePoint = null;

+		private int timeout = System.Threading.Timeout.Infinite;

+		

+		private Stream requestStream = null;

+		private HttpWebResponse webResponse = null;

+		private AutoResetEvent requestEndEvent = null;

+		private bool requesting = false;

+		private bool asyncResponding = false;

+		

+		// Constructors

+		

+		internal HttpWebRequest (Uri uri) 

+		{ 

+			this.requestUri = uri;

+			this.actualUri = uri;

+			this.webHeaders = new WebHeaderCollection (true);

+			// this.webHeaders.SetInternal ("Host", uri.Authority);

+			// this.webHeaders.SetInternal ("Date", DateTime.Now.ToUniversalTime ().ToString ("r", null));

+			// this.webHeaders.SetInternal ("Expect", "100-continue");

+			this.method = "GET";

+			this.version = HttpVersion.Version11;

+			this.proxy = GlobalProxySelection.Select;

+		}		

+		

+		[MonoTODO]

+		protected HttpWebRequest (SerializationInfo serializationInfo, StreamingContext streamingContext) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// Properties

+		

+		public string Accept {

+			get { return webHeaders ["Accept"]; }

+			set {

+				CheckRequestStarted ();

+				webHeaders.SetInternal ("Accept", value);

+			}

+		}

+		

+		public Uri Address {

+			get { return actualUri; }

+		}

+		

+		public bool AllowAutoRedirect {

+			get { return allowAutoRedirect; }

+			set { this.allowAutoRedirect = value; }

+		}

+		

+		public bool AllowWriteStreamBuffering {

+			get { return allowBuffering; }

+			set { this.allowBuffering = value; }

+		}

+		

+		public X509CertificateCollection ClientCertificates {

+			get { return certificate; }

+		}

+		

+		public string Connection {

+			get { return webHeaders ["Connection"]; }

+			set {

+				CheckRequestStarted ();

+				string val = value;

+				if (val != null) 

+					val = val.Trim ().ToLower ();

+				if (val == null || val.Length == 0) {

+					webHeaders.RemoveInternal ("Connection");

+					return;

+				}

+				if (val == "keep-alive" || val == "close") 

+					throw new ArgumentException ("value");

+				if (KeepAlive && val.IndexOf ("keep-alive") == -1)

+					value = value + ", Keep-Alive";

+				

+				webHeaders.SetInternal ("Connection", value);

+			}

+		}		

+		

+		public override string ConnectionGroupName { 

+			get { return connectionGroup; }

+			set { connectionGroup = value; }

+		}

+		

+		public override long ContentLength { 

+			get { return contentLength; }

+			set { 

+				CheckRequestStarted ();

+				if (value < 0)

+					throw new ArgumentException ("value");

+				contentLength = value;

+				webHeaders.SetInternal ("Content-Length", Convert.ToString (value));

+			}

+		}

+		

+		public override string ContentType { 

+			get { return webHeaders ["Content-Type"]; }

+			set {

+				CheckRequestStarted ();

+				if (value == null || value.Trim().Length == 0) {

+					webHeaders.RemoveInternal ("Content-Type");

+					return;

+				}

+				webHeaders.SetInternal ("Content-Type", value);

+			}

+		}

+		

+		public HttpContinueDelegate ContinueDelegate {

+			get { return continueDelegate; }

+			set { continueDelegate = value; }

+		}

+		

+		public CookieContainer CookieContainer {

+			get { return cookieContainer; }

+			set { cookieContainer = value; }

+		}

+		

+		public override ICredentials Credentials { 

+			get { return credentials; }

+			set { credentials = value; }

+		}

+		

+		public string Expect {

+			get { return webHeaders ["Expect"]; }

+			set {

+				CheckRequestStarted ();

+				string val = value;

+				if (val != null)

+					val = val.Trim ().ToLower ();

+				if (val == null || val.Length == 0) {

+					webHeaders.RemoveInternal ("Expect");

+					return;

+				}

+				if (val == "100-continue")

+					throw new ArgumentException ("value");

+				webHeaders.SetInternal ("Expect", value);

+			}

+		}

+		

+		public bool HaveResponse {

+			get { return haveResponse; }

+		}

+		

+		public override WebHeaderCollection Headers { 

+			get { return webHeaders; }

+			set {

+				CheckRequestStarted ();

+				WebHeaderCollection newHeaders = new WebHeaderCollection (true);

+				int count = value.Count;

+				for (int i = 0; i < count; i++) 

+					newHeaders.Add (value.GetKey (i), value.Get (i));

+				webHeaders = newHeaders;

+			}

+		}

+		

+		public DateTime IfModifiedSince {

+			get { 

+				string str = webHeaders ["If-Modified-Since"];

+				if (str == null)

+					return DateTime.Now;

+				try {

+					return MonoHttpDate.Parse (str);

+				} catch (Exception) {

+					return DateTime.Now;

+				}

+			}

+			set {

+				CheckRequestStarted ();

+				// rfc-1123 pattern

+				webHeaders.SetInternal ("If-Modified-Since", 

+					value.ToUniversalTime ().ToString ("r", null));

+				// TODO: check last param when using different locale

+			}

+		}

+

+		public bool KeepAlive {		

+			get {

+				CheckRequestStarted ();

+				return keepAlive;

+			}

+			set {

+				CheckRequestStarted ();

+				keepAlive = value;

+			}

+		}

+		

+		public int MaximumAutomaticRedirections {

+			get { return maxAutoRedirect; }

+			set {

+				if (value < 0)

+					throw new ArgumentException ("value");

+				maxAutoRedirect = value;

+			}			

+		}

+		

+		public string MediaType {

+			get { return mediaType; }

+			set { 

+				CheckRequestStarted ();

+				mediaType = value;

+			}

+		}

+		

+		public override string Method { 

+			get { return this.method; }

+			set { 

+				CheckRequestStarted ();

+				

+				if (value == null ||

+				    (value != "GET" &&

+				     value != "HEAD" &&

+				     value != "POST" &&

+				     value != "PUT" &&

+				     value != "DELETE" &&

+				     value != "TRACE" &&

+				     value != "OPTIONS"))

+					throw new ArgumentException ("not a valid method");

+				if (contentLength != -1 &&

+				    value != "POST" &&

+				    value != "PUT")

+				    	throw new ArgumentException ("method must be PUT or POST");

+				

+				method = value;

+			}

+		}

+		

+		public bool Pipelined {

+			get { return pipelined; }

+			set { this.pipelined = value; }

+		}		

+		

+		public override bool PreAuthenticate { 

+			get { return preAuthenticate; }

+			set { preAuthenticate = value; }

+		}

+		

+		public Version ProtocolVersion {

+			get { return version; }

+			set { 

+				if (value != HttpVersion.Version10 && value != HttpVersion.Version11)

+					throw new ArgumentException ("value");

+				version = (Version) value; 

+			}

+		}

+		

+		public override IWebProxy Proxy { 

+			get { return proxy; }

+			set { 

+				if (value == null)

+					throw new ArgumentNullException ("value");

+				proxy = value;

+			}

+		}

+		

+		public string Referer {

+			get { return webHeaders ["Referer" ]; }

+			set {

+				CheckRequestStarted ();

+				if (value == null || value.Trim().Length == 0) {

+					webHeaders.RemoveInternal ("Referer");

+					return;

+				}

+				webHeaders.SetInternal ("Referer", value);

+			}

+		}

+

+		public override Uri RequestUri { 

+			get { return requestUri; }

+		}

+		

+		public bool SendChunked {

+			get { return sendChunked; }

+			set {

+				CheckRequestStarted ();

+				sendChunked = value;

+			}

+		}

+		

+		public ServicePoint ServicePoint {

+			get { return servicePoint; }

+		}

+		

+		public override int Timeout { 

+			get { return timeout; }

+			set { timeout = value; }

+		}

+		

+		public string TransferEncoding {

+			get { return webHeaders ["Transfer-Encoding"]; }

+			set {

+				CheckRequestStarted ();

+				if (!sendChunked)

+					throw new InvalidOperationException ("SendChunked must be True");

+				string val = value;

+				if (val != null)

+					val = val.Trim ().ToLower ();

+				if (val == null || val.Length == 0) {

+					webHeaders.RemoveInternal ("Transfer-Encoding");

+					return;

+				}

+				if (val == "chunked")

+					throw new ArgumentException ("Cannot set value to Chunked");

+				webHeaders.SetInternal ("Transfer-Encoding", value);

+			}

+		}

+		

+		public string UserAgent {

+			get { return webHeaders ["User-Agent"]; }

+			set { webHeaders.SetInternal ("User-Agent", value); }

+		}

+				

+		// Methods

+		

+		public void AddRange (int range)

+		{

+			AddRange ("bytes", range);

+		}

+		

+		public void AddRange (int from, int to)

+		{

+			AddRange ("bytes", from, to);

+		}

+		

+		public void AddRange (string rangeSpecifier, int range)

+		{

+			if (rangeSpecifier == null)

+				throw new ArgumentNullException ("rangeSpecifier");

+			string value = webHeaders ["Range"];

+			if (value == null || value.Length == 0) 

+				value = rangeSpecifier + "=";

+			else if (value.ToLower ().StartsWith (rangeSpecifier.ToLower () + "="))

+				value += ",";

+			else

+				throw new InvalidOperationException ("rangeSpecifier");

+			webHeaders.SetInternal ("Range", value + range + "-");	

+		}

+		

+		public void AddRange (string rangeSpecifier, int from, int to)

+		{

+			if (rangeSpecifier == null)

+				throw new ArgumentNullException ("rangeSpecifier");

+			if (from < 0 || to < 0 || from > to)

+				throw new ArgumentOutOfRangeException ();			

+			string value = webHeaders ["Range"];

+			if (value == null || value.Length == 0) 

+				value = rangeSpecifier + "=";

+			else if (value.ToLower ().StartsWith (rangeSpecifier.ToLower () + "="))

+				value += ",";

+			else

+				throw new InvalidOperationException ("rangeSpecifier");

+			webHeaders.SetInternal ("Range", value + from + "-" + to);	

+		}

+		

+		public override int GetHashCode ()

+		{

+			return base.GetHashCode ();

+		}

+		

+		private delegate Stream GetRequestStreamCallback ();

+		private delegate WebResponse GetResponseCallback ();

+		

+		public override IAsyncResult BeginGetRequestStream (AsyncCallback callback, object state) 

+		{

+			if (method == null || (!method.Equals ("PUT") && !method.Equals ("POST")))

+				throw new ProtocolViolationException ("Cannot send file when method is: " + this.method + ". Method must be PUT.");

+			// workaround for bug 24943

+			Exception e = null;

+			lock (this) {

+				if (asyncResponding || webResponse != null)

+					e = new InvalidOperationException ("This operation cannot be performed after the request has been submitted.");

+				else if (requesting)

+					e = new InvalidOperationException ("Cannot re-call start of asynchronous method while a previous call is still in progress.");

+				else

+					requesting = true;

+			}

+			if (e != null)

+				throw e;

+			/*

+			lock (this) {

+				if (asyncResponding || webResponse != null)

+					throw new InvalidOperationException ("This operation cannot be performed after the request has been submitted.");

+				if (requesting)

+					throw new InvalidOperationException ("Cannot re-call start of asynchronous method while a previous call is still in progress.");

+				requesting = true;

+			}

+			*/

+			GetRequestStreamCallback c = new GetRequestStreamCallback (this.GetRequestStreamInternal);

+			return c.BeginInvoke (callback, state);	

+		}

+

+		public override Stream EndGetRequestStream (IAsyncResult asyncResult)

+		{

+			if (asyncResult == null)

+				throw new ArgumentNullException ("asyncResult");

+			if (!asyncResult.IsCompleted)

+				asyncResult.AsyncWaitHandle.WaitOne ();				

+			AsyncResult async = (AsyncResult) asyncResult;

+			GetRequestStreamCallback cb = (GetRequestStreamCallback) async.AsyncDelegate;

+			return cb.EndInvoke (asyncResult);

+		}

+		

+		public override Stream GetRequestStream()

+		{

+			IAsyncResult asyncResult = BeginGetRequestStream (null, null);

+			if (!(asyncResult.AsyncWaitHandle.WaitOne (timeout, false))) {

+				throw new WebException("The request timed out", WebExceptionStatus.Timeout);

+			}

+			return EndGetRequestStream (asyncResult);

+		}

+		

+		internal Stream GetRequestStreamInternal ()

+		{

+			this.requestStream = null;   // TODO: new HttpWebStream (this);

+			return this.requestStream;

+		}

+		

+		public override IAsyncResult BeginGetResponse (AsyncCallback callback, object state)

+		{

+			// workaround for bug 24943

+			Exception e = null;

+			lock (this) {

+				if (asyncResponding)

+					e = new InvalidOperationException ("Cannot re-call start of asynchronous method while a previous call is still in progress.");

+				else 

+					asyncResponding = true;

+			}

+			if (e != null)

+				throw e;

+			/*

+			lock (this) {

+				if (asyncResponding)

+					throw new InvalidOperationException ("Cannot re-call start of asynchronous method while a previous call is still in progress.");

+				asyncResponding = true;

+			}

+			*/

+			GetResponseCallback c = new GetResponseCallback (this.GetResponseInternal);

+			return c.BeginInvoke (callback, state);

+		}

+		

+		public override WebResponse EndGetResponse (IAsyncResult asyncResult)

+		{

+			if (asyncResult == null)

+				throw new ArgumentNullException ("asyncResult");

+			if (!asyncResult.IsCompleted)

+				asyncResult.AsyncWaitHandle.WaitOne ();			

+			AsyncResult async = (AsyncResult) asyncResult;

+			GetResponseCallback cb = (GetResponseCallback) async.AsyncDelegate;

+			WebResponse webResponse = cb.EndInvoke(asyncResult);

+			asyncResponding = false;

+			return webResponse;

+		}

+		

+		public override WebResponse GetResponse()

+		{

+			IAsyncResult asyncResult = BeginGetResponse (null, null);

+			if (!(asyncResult.AsyncWaitHandle.WaitOne (timeout, false))) {

+				throw new WebException("The request timed out", WebExceptionStatus.Timeout);

+			}

+			return EndGetResponse (asyncResult);

+		}

+		

+		public WebResponse GetResponseInternal ()

+		{

+			if (webResponse != null)

+				return webResponse;			

+			lock (this) {

+				if (requesting) {

+					requestEndEvent = new AutoResetEvent (false);

+				}

+			}

+			if (requestEndEvent != null) {

+				requestEndEvent.WaitOne ();

+			}

+			Stream responseStream = null; // TODO: new HttpWebStream (this);

+ 			this.webResponse = new HttpWebResponse (this.actualUri, method, responseStream);

+ 			return (WebResponse) this.webResponse;

+		}

+

+		[MonoTODO]		

+		public override void Abort()

+		{

+			this.haveResponse = true;

+			throw new NotImplementedException ();

+		}		

+		

+		[MonoTODO]

+		void ISerializable.GetObjectData (SerializationInfo serializationInfo,

+		   				  StreamingContext streamingContext)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// Private Methods

+		

+		private void CheckRequestStarted () 

+		{

+			if (requesting)

+				throw new InvalidOperationException ("request started");

+		}

+		

+		internal void Close ()

+		{

+			// already done in class below

+			// if (requestStream != null) {

+			// 	requestStream.Close ();

+			// }

+

+			lock (this) {			

+				requesting = false;

+				if (requestEndEvent != null) 

+					requestEndEvent.Set ();

+				// requestEndEvent = null;

+			}

+		}

+		

+		// Private Classes

+		

+		// to catch the Close called on the NetworkStream

+		/*

+		internal class HttpWebStream : Stream

+		{

+			HttpWebRequest webRequest;

+			

+			internal HttpWebStream (HttpWebRequest webRequest)

+				: base (webRequest.RequestUri)

+			{

+				this.webRequest = webRequest;

+			}

+					   	

+			public override void Close() 

+			{

+				base.Close ();

+				webRequest.Close ();

+			}

+		}		

+		*/

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/HttpWebResponse.cs b/mcs/class/System/System.Net/HttpWebResponse.cs
new file mode 100644
index 00000000000..50d0eedb55f
--- /dev/null
+++ b/mcs/class/System/System.Net/HttpWebResponse.cs
@@ -0,0 +1,271 @@
+//

+// System.Net.HttpWebResponse

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.IO;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class HttpWebResponse : WebResponse, ISerializable, IDisposable

+	{

+		private Uri uri;

+		private WebHeaderCollection webHeaders;

+		private CookieCollection cookieCollection = null;

+		private string method = null;

+		private Version version = null;

+		private HttpStatusCode statusCode;

+		private string statusDescription = null;

+

+		private Stream responseStream;		

+		private bool disposed = false;

+		

+		// Constructors

+		

+		internal HttpWebResponse (Uri uri, string method, Stream responseStream) 

+		{ 

+			this.uri = uri;

+			this.method = method;

+			this.responseStream = responseStream;

+			

+			// TODO: parse headers from responseStream

+			

+			this.statusCode = HttpStatusCode.OK;

+		}

+		

+		protected HttpWebResponse (SerializationInfo serializationInfo, StreamingContext streamingContext)

+		{

+			throw new NotSupportedException ();

+		}

+		

+		// Properties

+		

+		public string CharacterSet {

+			// Content-Type   = "Content-Type" ":" media-type

+			// media-type     = type "/" subtype *( ";" parameter )

+			// parameter      = attribute "=" value

+			// 3.7.1. default is ISO-8859-1

+			get { 

+				try {

+					string contentType = ContentType;

+					if (contentType == null)

+						return "ISO-8859-1";

+					string val = contentType.ToLower (); 					

+					int pos = val.IndexOf ("charset=");

+					if (pos == -1)

+						return "ISO-8859-1";

+					pos += 8;

+					int pos2 = val.IndexOf (';', pos);

+					return (pos2 == -1)

+					     ? contentType.Substring (pos) 

+					     : contentType.Substring (pos, pos2 - pos);

+				} finally {

+					CheckDisposed ();

+				}

+			}

+		}

+		

+		public string ContentEncoding {

+			get { 

+				try { return webHeaders ["Content-Encoding"]; }

+				finally { CheckDisposed (); }

+			}

+		}

+		

+		public override long ContentLength {		

+			get { 

+				try {

+					return Int64.Parse (webHeaders ["Content-Length"]); 

+				} catch (Exception) {

+					return -1;

+				} finally {

+					CheckDisposed ();

+				}

+			}

+		}

+		

+		public override string ContentType {		

+			get { 

+				try { return webHeaders ["Content-Type"]; }

+				finally { CheckDisposed (); }

+			}

+		}

+		

+		public CookieCollection Cookies {

+			get { 

+				CheckDisposed ();

+				

+				// LAMESPEC: a simple test reveal this always 

+				// returns an empty collection. It is not filled 

+				// with the values from the Set-Cookie or 

+				// Set-Cookie2 response headers, which is a bit

+				// of a shame..

+				if (cookieCollection == null)

+					cookieCollection = new CookieCollection ();

+				return cookieCollection;

+			}

+			set {

+				CheckDisposed ();

+				// ?? don't understand how you can set cookies on a response.

+				throw new NotSupportedException ();

+			}

+		}

+		

+		public override WebHeaderCollection Headers {		

+			get { 

+				CheckDisposed ();

+				return webHeaders; 

+			}

+		}

+		

+		public DateTime LastModified {

+			get {

+				CheckDisposed ();

+				try {

+					string dtStr = webHeaders ["Last-Modified"];

+					return MonoHttpDate.Parse (dtStr);

+				} catch (Exception) {

+					return DateTime.Now;	

+				}

+			}

+		}

+		

+		public string Method {

+			get { 

+				CheckDisposed ();

+				return method; 

+			}

+		}

+		

+		public Version ProtocolVersion {

+			get { 

+				CheckDisposed ();

+				return version; 

+			}

+		}

+		

+		public override Uri ResponseUri {		

+			get { 

+				CheckDisposed ();

+				return uri; 

+			}

+		}		

+		

+		public string Server {

+			get { 

+				try {

+					return webHeaders ["Server"]; 

+				} finally {

+					CheckDisposed ();

+				}

+			}

+		}

+		

+		public HttpStatusCode StatusCode {

+			get { 

+				CheckDisposed ();

+				return statusCode; 

+			}

+		}

+		

+		public string StatusDescription {

+			get { 

+				CheckDisposed ();

+				return statusDescription; 

+			}

+		}

+

+		// Methods

+		

+		public override int GetHashCode ()

+		{

+			try {

+				return base.GetHashCode ();

+			} finally {

+				CheckDisposed ();

+			}

+		}

+		

+		public string GetResponseHeader (string headerName)

+		{

+			try {

+				return webHeaders [headerName];

+			} finally {

+				CheckDisposed ();

+			}

+		}

+		

+		public override Stream GetResponseStream ()

+		{

+			try {

+				if (method.Equals ("HEAD")) // see par 4.3 & 9.4

+					return Stream.Null;  

+				return responseStream;

+			} finally {

+				CheckDisposed ();

+			}

+		}

+		

+		[MonoTODO]

+		void ISerializable.GetObjectData (SerializationInfo serializationInfo,

+		   				  StreamingContext streamingContext)

+		{

+			CheckDisposed ();

+			throw new NotImplementedException ();

+		}		

+

+

+		// Cleaning up stuff

+

+		~HttpWebResponse ()

+		{

+			Dispose (false);

+		}		

+		

+		public override void Close ()

+		{

+			((IDisposable) this).Dispose ();

+		}

+		

+		void IDisposable.Dispose ()

+		{

+			Dispose (true);

+			GC.SuppressFinalize (this);  

+		}

+		

+		protected virtual void Dispose (bool disposing) 

+		{

+			if (this.disposed)

+				return;

+			this.disposed = true;

+			

+			if (disposing) {

+				// release managed resources

+				uri = null;

+				webHeaders = null;

+				cookieCollection = null;

+				method = null;

+				version = null;

+				// statusCode = null;

+				statusDescription = null;

+			}

+			

+			// release unmanaged resources

+			Stream stream = responseStream;

+			responseStream = null;

+			if (stream != null)

+				stream.Close ();  // also closes webRequest			

+		}

+		

+		private void CheckDisposed () 

+		{

+			if (disposed)

+				throw new ObjectDisposedException (GetType ().FullName);

+		}

+	}	

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/IAuthenticationModule.cs b/mcs/class/System/System.Net/IAuthenticationModule.cs
new file mode 100755
index 00000000000..15119f74da3
--- /dev/null
+++ b/mcs/class/System/System.Net/IAuthenticationModule.cs
@@ -0,0 +1,30 @@
+//
+// System.Net.IAuthenticationModule.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Net {
+
+	// <remarks>
+	//   Authentication interface for Web client authentication modules.
+	// </remarks>
+	public interface IAuthenticationModule {
+		string AuthenticationType {
+			get;
+		}
+
+		bool CanPreAuthenticate {
+			get;
+		}
+
+		bool CanRespond (string challenge);
+
+		Authorization PreAuthenticate (WebRequest request, ICredentials credentials);
+
+		Authorization Respond (string challenge, WebRequest request, ICredentials credentials);
+	}
+}
diff --git a/mcs/class/System/System.Net/ICertificatePolicy.cs b/mcs/class/System/System.Net/ICertificatePolicy.cs
new file mode 100644
index 00000000000..37d2405a3ec
--- /dev/null
+++ b/mcs/class/System/System.Net/ICertificatePolicy.cs
@@ -0,0 +1,22 @@
+//
+// System.Net.ICertificatePolicy.cs
+//
+// Author:
+//   Lawrence Pit (loz@cable.a2000.nl)
+//
+
+using System.Security.Cryptography.X509Certificates;
+
+namespace System.Net {
+
+	// <remarks>
+	// </remarks>
+	public interface ICertificatePolicy {
+		bool CheckValidationResult (
+				ServicePoint srvPoint,
+				X509Certificate certificate,
+		   		WebRequest request,
+		   		int certificateProblem
+		);		
+	}
+}
diff --git a/mcs/class/System/System.Net/ICredentialLookup.cs b/mcs/class/System/System.Net/ICredentialLookup.cs
new file mode 100755
index 00000000000..26b48ba9860
--- /dev/null
+++ b/mcs/class/System/System.Net/ICredentialLookup.cs
@@ -0,0 +1,18 @@
+//
+// System.Net.ICredential.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+
+namespace System.Net {
+
+	// <remarks>
+	//   Base authentication interface for Web clients.
+	// </remarks>
+	public interface ICredentials 
+	{
+		NetworkCredential GetCredential (Uri uri, string authType);
+	}
+}
diff --git a/mcs/class/System/System.Net/IPAddress.cs b/mcs/class/System/System.Net/IPAddress.cs
new file mode 100755
index 00000000000..86041acb862
--- /dev/null
+++ b/mcs/class/System/System.Net/IPAddress.cs
@@ -0,0 +1,231 @@
+//
+// System.Net.IPAddress.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Lawrence Pit (loz@cable.a2000.nl)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+// Note: the address is stored in host order
+
+using System;
+using System.Globalization;
+using System.Net.Sockets;
+using System.Runtime.InteropServices;
+
+namespace System.Net {
+
+	/// <remarks>
+	///   Encapsulates an IP Address.
+	/// </remarks>
+	[Serializable]
+	public class IPAddress {
+		// Don't change the name of this field without also
+		// changing socket-io.c in the runtime
+		private long address;
+
+		public static readonly IPAddress Any = new IPAddress(0);
+		public static readonly IPAddress Broadcast = IPAddress.Parse ("255.255.255.255");
+		public static readonly IPAddress Loopback = IPAddress.Parse ("127.0.0.1");
+		public static readonly IPAddress None = IPAddress.Parse ("255.255.255.255");
+
+		private static short SwapShort (short number)
+		{
+			return (short) ( ((number >> 8) & 0xFF) + ((number << 8) & 0xFF00) );
+		}
+
+		private static int SwapInt (int number)
+		{
+			byte b0 = (byte) ((number >> 24) & 0xFF);
+			byte b1 = (byte) ((number >> 16) & 0xFF);
+			byte b2 = (byte) ((number >> 8) & 0xFF);
+			byte b3 = (byte) (number & 0xFF);
+			return b0 + (b1 << 8) + (b2 << 16) + (b3 << 24);
+		}
+
+		private static long SwapLong (long number)
+		{
+			byte b0 = (byte) ((number >> 56) & 0xFF);
+			byte b1 = (byte) ((number >> 48) & 0xFF);
+			byte b2 = (byte) ((number >> 40) & 0xFF);
+			byte b3 = (byte) ((number >> 32) & 0xFF);
+			byte b4 = (byte) ((number >> 24) & 0xFF);
+			byte b5 = (byte) ((number >> 16) & 0xFF);
+			byte b6 = (byte) ((number >> 8) & 0xFF);
+			byte b7 = (byte) (number & 0xFF);
+			return (long) b0 + ((long) b1 << 8) + ((long) b2 << 16) + ((long) b3 << 24) + ((long) b4 << 32) + ((long) b5 << 40) + ((long) b6 << 48) + ((long) b7 << 56);
+		}
+
+		public static short HostToNetworkOrder(short host) {
+			if (!BitConverter.IsLittleEndian)
+				return(host);
+
+			return SwapShort (host);
+		}
+
+		public static int HostToNetworkOrder(int host) {
+			if (!BitConverter.IsLittleEndian)
+				return(host);
+
+			return SwapInt (host);
+		}
+		
+		public static long HostToNetworkOrder(long host) {
+			if (!BitConverter.IsLittleEndian)
+				return(host);
+
+			return SwapLong (host);
+		}
+
+		public static short NetworkToHostOrder(short network) {
+			if (!BitConverter.IsLittleEndian)
+				return(network);
+
+			return SwapShort (network);
+		}
+
+		public static int NetworkToHostOrder(int network) {
+			if (!BitConverter.IsLittleEndian)
+				return(network);
+
+			return SwapInt (network);
+		}
+
+		public static long NetworkToHostOrder(long network) {
+			if (!BitConverter.IsLittleEndian)
+				return(network);
+
+			return SwapLong (network);
+		}
+		
+		/// <summary>
+		///   Constructor from a 32-bit constant with its bytes 
+		///   in network order.
+		/// </summary>
+		public IPAddress (long addr)
+		{
+			Address = addr;
+		}
+
+		public static IPAddress Parse (string ip)
+		{
+			if (ip == null)
+				throw new ArgumentNullException ("null ip string");
+				
+			if (ip.Length == 0 || ip [0] == ' ')
+				return new IPAddress (0);
+				
+			int pos = ip.IndexOf (' ');
+			if (pos != -1)
+				ip = ip.Substring (0, pos);				
+			else if (ip [ip.Length - 1] == '.')
+				throw new FormatException ("An invalid IP address was specified");
+
+			string [] ips = ip.Split (new char [] {'.'});
+			if (ips.Length > 4)
+				throw new FormatException ("An invalid IP address was specified");
+			
+			// Make the number in network order
+			try {
+				long a = 0;
+				byte val = 0;
+				for (int i = 0; i < ips.Length; i++) {
+					string subnet = ips [i];
+					if ((3 <= subnet.Length && subnet.Length <= 4) &&
+					    (subnet [0] == '0') &&
+					    (subnet [1] == 'x' || subnet [2] == 'X')) {
+						if (subnet.Length == 3)
+							val = (byte) Uri.FromHex (subnet [2]);
+						else 
+							val = (byte) ((Uri.FromHex (subnet [2]) << 4) | Uri.FromHex (subnet [3]));
+					} else if (subnet.Length == 0)
+						val = 0;
+					else 
+						val = Byte.Parse (subnet, NumberStyles.None);
+
+					if (ips.Length < 4 && i == (ips.Length - 1)) 
+						i = 3;
+
+					a |= (long) val << (i << 3);
+				}
+
+				return (new IPAddress (a));
+			} catch (Exception) {
+				throw new FormatException ("An invalid IP address was specified");
+			}
+		}
+		
+		public long Address {
+			get {
+				return address;
+			}
+			set {
+				/* no need to do this test, ms.net accepts any value.
+				if (value < 0 || value > 0x00000000FFFFFFFF)
+					throw new ArgumentOutOfRangeException (
+						"the address must be between 0 and 0xFFFFFFFF");
+				*/
+
+				address = value;
+			}
+		}
+
+		public AddressFamily AddressFamily {
+			get {
+				return(AddressFamily.InterNetwork);
+			}
+		}
+		
+		
+		/// <summary>
+		///   Used to tell whether an address is a loopback.
+		///   All IP addresses of the form 127.X.Y.Z, where X, Y, and Z are in 
+		///   the range 0-255, are loopback addresses.
+		/// </summary>
+		/// <param name="addr">Address to compare</param>
+		/// <returns></returns>
+		public static bool IsLoopback (IPAddress addr)
+		{
+			return (addr.address & 0xFF) == 127;
+		}
+
+		/// <summary>
+		///   Overrides System.Object.ToString to return
+		///   this object rendered in a quad-dotted notation
+		/// </summary>
+		public override string ToString ()
+		{
+			return ToString (address);
+		}
+
+		/// <summary>
+		///   Returns this object rendered in a quad-dotted notation
+		/// </summary>
+		static string ToString (long addr)
+		{
+			// addr is in network order
+			return  (addr & 0xff).ToString () + "." +
+				((addr >> 8) & 0xff).ToString () + "." +
+				((addr >> 16) & 0xff).ToString () + "." +
+				((addr >> 24) & 0xff).ToString ();
+		}
+
+		/// <returns>
+		///   Whether both objects are equal.
+		/// </returns>
+		public override bool Equals (object other)
+		{
+			if (other is System.Net.IPAddress){
+				return Address == ((System.Net.IPAddress) other).Address;
+			}
+			return false;
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int)Address;
+		}
+	}
+}
diff --git a/mcs/class/System/System.Net/IPEndPoint.cs b/mcs/class/System/System.Net/IPEndPoint.cs
new file mode 100755
index 00000000000..a52539faf79
--- /dev/null
+++ b/mcs/class/System/System.Net/IPEndPoint.cs
@@ -0,0 +1,129 @@
+//
+// System.Net.IPEndPoint.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Net.Sockets;
+
+namespace System.Net {
+	[Serializable]
+	public class IPEndPoint : EndPoint {
+
+		private IPAddress address;
+		private int port;
+
+		public const int MaxPort = 65535;
+		public const int MinPort = 0;
+		
+		public IPEndPoint (IPAddress address, int port)
+		{
+			if (address == null)
+				throw new ArgumentNullException ("Value cannot be null");
+
+			Address = address;
+			Port = port;
+		}
+		
+		public IPEndPoint (long iaddr, int port) : this (new IPAddress (iaddr), port)
+		{
+		}
+
+		public IPAddress Address {
+			get {
+				return (address);
+			}
+			set {
+				address=value;
+			}
+		}
+
+		public override AddressFamily AddressFamily {
+			get {
+				return AddressFamily.InterNetwork;
+			}
+		}
+
+		public int Port {
+			get {
+				return port;
+			}
+			set {
+				// LAMESPEC: no mention of sanity checking
+				// PS: MS controls the range when setting the value
+				if (value < MinPort || value > MaxPort)
+					throw new ArgumentOutOfRangeException ("Invalid port");
+			
+				port = value;
+			}
+		}
+
+		// bytes 2 and 3 store the port, the rest
+		// stores the address
+		public override EndPoint Create(SocketAddress sockaddr) {
+			int size=sockaddr.Size;
+			
+			// LAMESPEC: no mention of what to do if
+			// sockaddr is bogus
+			if(size<8) {
+				// absolute minimum amount needed for
+				// an address family, buffer size,
+				// port and address
+				return(null);
+			}
+			AddressFamily family=(AddressFamily)sockaddr[0];
+			if(family!=AddressFamily.InterNetwork) {
+				return(null);
+			}
+			
+			int port=(((int)sockaddr[2])<<8) + (int)sockaddr[3];
+			long address=(((long)sockaddr[7])<<24) +
+				(((long)sockaddr[6])<<16) +
+				(((long)sockaddr[5])<<8) +
+				(long)sockaddr[4];
+
+			IPEndPoint ipe = new IPEndPoint(address, port);
+			
+			return(ipe);
+		}
+
+		public override SocketAddress Serialize() {
+			// .net produces a 16 byte buffer, even though
+			// only 8 bytes are used. I guess its just a
+			// holdover from struct sockaddr padding.
+			SocketAddress sockaddr = new SocketAddress(AddressFamily.InterNetwork, 16);
+
+			// bytes 2 and 3 store the port, the rest
+			// stores the address
+			sockaddr [2] = (byte) ((port>>8) & 0xff);
+			sockaddr [3] = (byte) (port & 0xff);
+
+			sockaddr [4] = (byte) (address.Address & 0xff);
+			sockaddr [5] = (byte) ((address.Address >> 8) & 0xff);
+			sockaddr [6] = (byte) ((address.Address >> 16) & 0xff);
+			sockaddr [7] = (byte) ((address.Address >> 24) & 0xff);
+			
+			return(sockaddr);
+		}
+
+		public override string ToString() {
+			return(address.ToString() + ":" + port);
+		}
+
+		public override bool Equals (Object obj)
+		{
+			IPEndPoint p = obj as IPEndPoint;
+			return p != null && 
+			       p.port == port && 
+			       p.address.Equals (address);
+		}
+
+		public override int GetHashCode ()
+		{
+			return address.GetHashCode () + port;
+		}
+	}
+}
diff --git a/mcs/class/System/System.Net/IPHostEntry.cs b/mcs/class/System/System.Net/IPHostEntry.cs
new file mode 100644
index 00000000000..dd24e48b19b
--- /dev/null
+++ b/mcs/class/System/System.Net/IPHostEntry.cs
@@ -0,0 +1,75 @@
+// System.Net.IPHostEntry.cs
+//
+// Author: Mads Pultz (mpultz@diku.dk)
+//
+// (C) Mads Pultz, 2001
+
+using System;
+
+namespace System.Net {
+	
+	public class IPHostEntry {
+		private IPAddress[] addressList;
+		private String[] aliases;
+		private String hostName;
+		
+		public IPHostEntry() {
+			hostName = "localhost";
+			addressList = new IPAddress[1];
+			addressList[0] = IPAddress.Loopback;
+			aliases = new String[0];
+		}
+		
+		public IPAddress[] AddressList {
+			get { return addressList; }
+			set { addressList = value; }
+		}
+		
+		public string[] Aliases	{
+			get { return aliases; }
+			set { aliases = value; }
+		}
+		
+		public string HostName {
+			get { return hostName; }
+			set { hostName = value; }
+		}
+		
+/* According to the .NET Framework SDK Documentation (beta 2) the following
+   methods from Object are not overrided. I implemented them before realizing
+   this but I leave the implementation here if needed in the future.
+   
+		public override string ToString() {
+			string res = hostName;
+			if (addressList != null && addressList.Length > 0)
+				res += " [" + addressList[0] + "]";
+			return res;
+		}
+		
+		public override bool Equals(object obj) {
+			if (obj is IPHostEntry) {
+				IPHostEntry h = (IPHostEntry)obj;
+				return hostName.Equals(h.HostName) && aliases.Equals(h.Aliases) &&
+					addressList.Equals(h.AddressList);
+			}
+			else
+			  return false;
+		}
+		
+		public override int GetHashCode() {
+			return hostName.GetHashCode();
+		}
+		
+		protected new object MemberwiseClone() {
+			IPHostEntry res = new IPHostEntry();
+			res.AddressList = new IPAddress[addressList.Length];
+			Array.Copy(addressList, res.AddressList, addressList.Length);
+			res.Aliases = new String[aliases.Length];
+			Array.Copy(aliases, res.Aliases, aliases.Length);
+			res.HostName = hostName;
+			return res;
+		}
+*/
+	}
+}
+
diff --git a/mcs/class/System/System.Net/IPv6Address.cs b/mcs/class/System/System.Net/IPv6Address.cs
new file mode 100644
index 00000000000..96ed983f7dd
--- /dev/null
+++ b/mcs/class/System/System.Net/IPv6Address.cs
@@ -0,0 +1,278 @@
+//

+// System.Net.IPv6Address.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+// Note I: This class is not defined in the specs of .Net

+//

+// Note II : The name of this class is perhaps unfortunate as it turns

+//           out that in ms.net there's an internal class called

+//           IPv6Address in namespace System.

+//

+

+

+using System;

+using System.Net.Sockets;

+using System.Runtime.InteropServices;

+using System.Text;

+

+namespace System.Net {

+

+	/// <remarks>

+	///   Encapsulates an IPv6 Address.

+	///   See RFC 2373 for more info on IPv6 addresses.

+	/// </remarks>

+	[Serializable]

+	public class IPv6Address {

+		private ushort [] address;

+		private int prefixLength;

+

+		public static readonly IPv6Address Loopback = IPv6Address.Parse ("::1");

+		public static readonly IPv6Address Unspecified = IPv6Address.Parse ("::");

+

+		/// <summary>

+		///   Constructor from a 32-bit constant with its bytes 

+		///   in network order.

+		/// </summary>

+		public IPv6Address (ushort [] addr)

+		{

+			if (addr == null)

+				throw new ArgumentNullException ("addr");	

+			if (addr.Length != 8)	

+				throw new ArgumentException ("addr");

+			address = addr;			

+		}

+		

+		public IPv6Address (ushort [] addr, int prefixLength) : this (addr)

+		{

+			if (prefixLength < 0 || prefixLength > 128)

+				throw new ArgumentException ("prefixLength");

+			this.prefixLength = prefixLength;

+		}		

+		

+		public static IPv6Address Parse (string ipString)

+		{

+			if (ipString == null)

+				throw new ArgumentNullException ("ipString");

+

+			if (ipString.Length > 2 && 

+			    ipString [0] == '[' && 

+			    ipString [ipString.Length - 1] == ']')

+				ipString = ipString.Substring (1, ipString.Length - 2);				

+

+			if (ipString.Length  < 2)

+				throw new FormatException ("Not a valid IPv6 address");

+

+			int prefixLen = 0;

+			int pos = ipString.LastIndexOf ('/');

+			if (pos != -1) {

+				string prefix = ipString.Substring (pos + 1);

+				try {

+					prefixLen = Int32.Parse (prefix);

+				} catch (Exception) {

+					prefixLen = -1;

+				}

+				if (prefixLen < 0 || prefixLen > 128)

+					throw new FormatException ("Not a valid prefix length");;

+				ipString = ipString.Substring (0, pos);

+			}

+			

+			ushort [] addr = new ushort [8];			

+			

+			bool ipv4 = false;

+			int pos2 = ipString.LastIndexOf (":");

+			if (pos2 == -1)

+				throw new FormatException ("Not a valid IPv6 address");

+			if (pos2 < (ipString.Length - 1)) {

+				string ipv4Str = ipString.Substring (pos2 + 1);

+				if (ipv4Str.IndexOf ('.') != -1) {

+					try {

+						long a = IPAddress.Parse (ipv4Str).Address;

+						addr [6] = (ushort) (((int) (a & 0xff) << 8) + ((int) ((a >> 8) & 0xff)));

+						addr [7] = (ushort) (((int) ((a >> 16) & 0xff) << 8) + ((int) ((a >> 24) & 0xff)));

+						if (ipString [pos2 - 1] == ':') 

+							ipString = ipString.Substring (0, pos2 + 1);

+						else

+							ipString = ipString.Substring (0, pos2);

+						ipv4 = true;

+					} catch (Exception) {

+						throw new FormatException ("Not a valid IPv6 address");		

+					}

+				}

+			}	

+			

+			int origLen = ipString.Length;

+			if (origLen < 2)

+				throw new FormatException ("Not a valid IPv6 address");			

+			ipString = ipString.Replace ("::", ":!:");

+			int len = ipString.Length;

+			if ((len - origLen) > 1) 

+				throw new FormatException ("Not a valid IPv6 address");

+			

+			if (ipString [1] == '!') 

+				ipString = ipString.Remove (0, 1);

+			if (ipString [len - 2] == '!')

+				ipString = ipString.Remove (len - 1, 1);

+			if ((ipString.Length > 2) && 

+			    ((ipString [0] == ':') || (ipString [ipString.Length - 1] == ':'))) 

+				throw new FormatException ("Not a valid IPv6 address");

+				

+			string [] pieces = ipString.Split (new char [] {':'});

+			len = pieces.Length;

+			if (len > (ipv4 ? 6 : 8)) 

+				throw new FormatException ("Not a valid IPv6 address");

+			int piecedouble = -1;

+			for (int i = 0; i < len; i++) {

+				string piece = pieces [i];

+				if (piece == "!")

+					piecedouble = i;

+				else {

+					int plen = piece.Length;

+					if (plen > 4)

+						throw new FormatException ("Not a valid IPv6 address");

+					int p = 0;

+					for (int j = 0; j < plen; j++) 

+						try {

+							p = (p << 4) + Uri.FromHex (piece [j]);

+						} catch (ArgumentException) {

+							throw new FormatException ("Not a valid IPv6 address");

+						}

+					addr [i] = (ushort) p;

+				}

+			}

+

+			//expand the :: token

+			if (piecedouble != -1) {

+				int totallen = (ipv4 ? 5 : 7);

+				int i = totallen;

+				for (i = totallen; i >= (totallen - (len - piecedouble - 1)); i--) {

+					addr [i] = addr [(len - 1) + i - totallen];

+				}

+				for (; i >= piecedouble; i--) {

+					addr [i] = 0;

+				}

+			} else if (len != (ipv4 ? 6 : 8)) 

+				throw new FormatException ("Not a valid IPv6 address");

+

+			// check IPv4 validity

+			if (ipv4) {

+				for (int i = 0; i < 5; i++) 

+					if (addr [i] != 0)

+						throw new FormatException ("Not a valid IPv6 address");

+				if (addr [5] != 0 && addr [5] != 0xffff)

+					throw new FormatException ("Not a valid IPv6 address");

+			}

+			

+			return new IPv6Address (addr, prefixLen);

+		}

+		

+		public ushort [] Address {

+			get { return address; }

+		}

+

+		public int PrefixLength {

+			get { return this.prefixLength; }

+		}

+		

+		public ushort this [int index] {

+			get { return address [index]; }

+		}		

+

+		public AddressFamily AddressFamily {

+			get { return AddressFamily.InterNetworkV6; }

+		}

+		

+		/// <summary>

+		///   Used to tell whether the given address is the loopback address.

+		/// </summary>

+		public static bool IsLoopback (IPv6Address addr)

+		{

+			for (int i = 0; i < 4; i++)

+				if (addr.address [i] != 0)

+					return false;

+			if ((addr.address [5] != 0) && (addr.address [5] != 0xffff))

+				return false;

+			if ((addr.address [6] >> 8) == 0x7f)

+				return true;

+			return ((addr.address [5] == 0) && 

+			        (addr.address [6] == 0) && 

+			        (addr.address [7] == 1));

+		}

+		

+		public bool IsIPv4Compatible ()

+		{

+			for (int i = 0; i < 6; i++) 

+				if (address [i] != 0)

+					return false;			

+			return true;

+		}

+		

+		public bool IsIPv4Mapped ()

+		{

+			for (int i = 0; i < 5; i++) 

+				if (address [i] != 0)

+					return false;

+			return address [5] == 0xffff;

+		}

+		

+		/// <summary>

+		///   Overrides System.Object.ToString to return

+		///   this object rendered in a canonicalized notation

+		/// </summary>

+		public override string ToString ()

+		{

+			StringBuilder s = new StringBuilder ();

+			for (int i = 0; i < 7; i++)

+				s.Append (String.Format ("{0:X4}", address [i])).Append (':');

+			s.Append (String.Format ("{0:X4}", address [7]));

+			return s.ToString ();

+		}

+

+		/// <returns>

+		///   Whether both objects are equal.

+		/// </returns>

+		public override bool Equals (object other)

+		{

+			System.Net.IPv6Address ipv6 = other as System.Net.IPv6Address;

+			if (ipv6 != null) {

+				for (int i = 0; i < 8; i++) 

+					if (this.address [i] != ipv6.address [i])

+						return false;

+				return true;				

+			} 

+			

+			System.Net.IPAddress ipv4 = other as System.Net.IPAddress;

+			if (ipv4 != null) {

+				for (int i = 0; i < 5; i++) 

+					if (address [i] != 0)

+						return false;			

+

+				if (address [5] != 0 && address [5] != 0xffff)

+					return false;

+

+				long a = ipv4.Address;

+				if (address [6] != (ushort) (((int) (a & 0xff) << 8) + ((int) ((a >> 8) & 0xff))) ||

+				    address [7] != (ushort) (((int) ((a >> 16) & 0xff) << 8) + ((int) ((a >> 24) & 0xff))))

+				    	return false;

+				    	

+				return true;

+			}

+			

+			return false;

+		}

+

+		public override int GetHashCode ()

+		{

+			return Hash (((((int) address [0]) << 16) + address [1]), 

+			             ((((int) address [2]) << 16) + address [3]),

+			             ((((int) address [4]) << 16) + address [5]),

+			             ((((int) address [6]) << 16) + address [7]));

+		}

+		

+	    	private static int Hash (int i, int j, int k, int l) 

+	    	{

+	    		return i ^ (j << 13 | j >> 19) ^ (k << 26 | k >> 6) ^ (l << 7 | l >> 25);

+    		}

+	}

+}

diff --git a/mcs/class/System/System.Net/IWebProxy.cs b/mcs/class/System/System.Net/IWebProxy.cs
new file mode 100644
index 00000000000..00f10e32da1
--- /dev/null
+++ b/mcs/class/System/System.Net/IWebProxy.cs
@@ -0,0 +1,24 @@
+//
+// System.Net.IWebProxy.cs
+//
+// Author:
+//   Lawrence Pit (loz@cable.a2000.nl)
+//
+
+using System;
+
+namespace System.Net {
+
+	// <remarks>
+	// </remarks>
+	public interface IWebProxy {
+		ICredentials Credentials {
+			get; 
+			set;
+		}
+
+		Uri GetProxy (Uri destination);
+		
+		bool IsBypassed (Uri host);
+	}
+}
diff --git a/mcs/class/System/System.Net/IWebRequestCreate.cs b/mcs/class/System/System.Net/IWebRequestCreate.cs
new file mode 100644
index 00000000000..85eb452abf4
--- /dev/null
+++ b/mcs/class/System/System.Net/IWebRequestCreate.cs
@@ -0,0 +1,15 @@
+//
+// System.Net.IWebRequestCreate.cs
+//
+// Author:
+//   Lawrence Pit (loz@cable.a2000.nl)
+//
+
+namespace System.Net {
+
+	// <remarks>
+	// </remarks>
+	public interface IWebRequestCreate {
+		WebRequest Create (Uri uri);		
+	}
+}
diff --git a/mcs/class/System/System.Net/MonoHttpDate.cs b/mcs/class/System/System.Net/MonoHttpDate.cs
new file mode 100644
index 00000000000..e7ebfe419f5
--- /dev/null
+++ b/mcs/class/System/System.Net/MonoHttpDate.cs
@@ -0,0 +1,33 @@
+//

+// System.Net.MonoHttpDate

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Globalization;

+

+namespace System.Net 

+{

+	/// <summary>

+	/// See RFC 2068 3.3.1

+	/// </summary>

+	internal class MonoHttpDate

+	{

+		private static readonly string rfc1123_date = "r";

+		private static readonly string rfc850_date = "dddd, dd-MMM-yy HH:mm:ss G\\MT";

+		private static readonly string asctime_date = "ddd MMM d HH:mm:ss yyyy";

+		private static readonly string [] formats = 

+			new string [] {rfc1123_date, rfc850_date, asctime_date};

+		private static readonly CultureInfo enUS = new CultureInfo("en-US", false);

+		

+		internal static DateTime Parse (string dateStr)

+		{			

+			 return DateTime.ParseExact (dateStr, 

+			                             formats, 

+			                             enUS, 

+			                             DateTimeStyles.AllowWhiteSpaces);

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/NetworkAccess.cs b/mcs/class/System/System.Net/NetworkAccess.cs
new file mode 100755
index 00000000000..7d20e93aa2c
--- /dev/null
+++ b/mcs/class/System/System.Net/NetworkAccess.cs
@@ -0,0 +1,29 @@
+// NetworkAccess.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:35:58 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net {
+
+
+	/// <summary>
+	/// </summary>
+	public enum NetworkAccess {
+
+		/// <summary>
+		/// </summary>
+		Accept = 128,
+
+		/// <summary>
+		/// </summary>
+		Connect = 64,
+	} // NetworkAccess
+
+} // System.Net
diff --git a/mcs/class/System/System.Net/NetworkCredential.cs b/mcs/class/System/System.Net/NetworkCredential.cs
new file mode 100755
index 00000000000..8f62cdbe292
--- /dev/null
+++ b/mcs/class/System/System.Net/NetworkCredential.cs
@@ -0,0 +1,63 @@
+//
+// System.Net.NetworkCredential.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Net
+{
+	public class NetworkCredential : ICredentials
+	{
+		// Fields
+		string userName;
+		string password;
+		string domain;
+		
+		// Constructors
+		public NetworkCredential ()
+			: base ()
+		{
+		}
+
+		public NetworkCredential (string userName, string password)
+		{
+			this.userName = userName;
+			this.password = password;
+		}
+
+		public NetworkCredential (string userName, string password, string domain)
+		{
+			this.userName = userName;
+			this.password = password;
+			this.domain = domain;
+		}
+
+		// Properties
+
+		public string Domain
+		{
+			get { return domain; }
+			set { domain = value; }
+		}
+
+		public string UserName
+		{
+			get { return userName; }
+			set { userName = value; }			
+		}
+
+		public string Password
+		{
+			get { return password; }
+			set { password = value; }
+		}
+
+		[MonoTODO]
+		public NetworkCredential GetCredential (Uri uri, string authType)
+		{
+			return null;
+		}					
+	}
+}
diff --git a/mcs/class/System/System.Net/ProtocolViolationException.cs b/mcs/class/System/System.Net/ProtocolViolationException.cs
new file mode 100644
index 00000000000..cb201ce0d63
--- /dev/null
+++ b/mcs/class/System/System.Net/ProtocolViolationException.cs
@@ -0,0 +1,38 @@
+//

+// System.Net.ProtocolViolationException.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System.Globalization;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class ProtocolViolationException : InvalidOperationException, ISerializable

+	{

+

+		// Constructors

+		public ProtocolViolationException () : base ()

+		{

+		}

+		

+		public ProtocolViolationException (string message) : base (message)

+		{

+		}

+

+		protected ProtocolViolationException (SerializationInfo info, StreamingContext context)

+			: base (info, context)

+		{			

+		}

+

+		// Methods

+		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)

+		{

+			base.GetObjectData (info, context);

+		}

+	}

+}

+	

diff --git a/mcs/class/System/System.Net/ProxyUseType.cs b/mcs/class/System/System.Net/ProxyUseType.cs
new file mode 100755
index 00000000000..fc878e6c09a
--- /dev/null
+++ b/mcs/class/System/System.Net/ProxyUseType.cs
@@ -0,0 +1,37 @@
+// ProxyUseType.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:36:08 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net {
+
+
+	/// <summary>
+	/// </summary>
+	public enum ProxyUseType {
+
+		/// <summary>
+		/// </summary>
+		Standard = 0,
+
+		/// <summary>
+		/// </summary>
+		Tunnel = 1,
+
+		/// <summary>
+		/// </summary>
+		FtpGateway = 2,
+
+		/// <summary>
+		/// </summary>
+		Socks = 3,
+	} // ProxyUseType
+
+} // System.Net
diff --git a/mcs/class/System/System.Net/ServicePoint.cs b/mcs/class/System/System.Net/ServicePoint.cs
new file mode 100644
index 00000000000..5800434edfc
--- /dev/null
+++ b/mcs/class/System/System.Net/ServicePoint.cs
@@ -0,0 +1,105 @@
+//

+// System.Net.ServicePoint

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Security.Cryptography.X509Certificates;

+using System.Threading;

+

+namespace System.Net 

+{

+	public class ServicePoint

+	{

+		private Uri uri;

+		private int connectionLimit;

+		private int maxIdleTime;

+		private int currentConnections;

+		private DateTime idleSince;

+		private Version protocolVersion;

+		

+		// Constructors

+

+		internal ServicePoint (Uri uri, int connectionLimit, int maxIdleTime)

+		{

+			this.uri = uri;  

+			this.connectionLimit = connectionLimit;

+			this.maxIdleTime = maxIdleTime;			

+			this.currentConnections = 0;

+			this.idleSince = DateTime.Now;

+		}

+		

+		// Properties

+		

+		public Uri Address {

+			get { return this.uri; }

+		}

+		

+		[MonoTODO]

+		public X509Certificate Certificate {

+			get { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public X509Certificate ClientCertificate {

+			get { throw new NotImplementedException (); }

+		}

+		

+		public int ConnectionLimit {

+			get { return connectionLimit; }

+			set {

+				if (value <= 0)

+					throw new ArgumentOutOfRangeException ();

+				connectionLimit = value;

+			}

+		}

+		

+		public string ConnectionName {

+			get { return uri.Scheme; }

+		}

+

+		public int CurrentConnections {

+			get { return currentConnections; }

+		}

+

+		public DateTime IdleSince {

+			get { return idleSince; }

+		}

+		

+		public int MaxIdleTime {

+			get { return maxIdleTime; }

+			set { 

+				if (value < Timeout.Infinite || value > Int32.MaxValue)

+					throw new ArgumentOutOfRangeException ();

+				this.maxIdleTime = value; 

+			}

+		}

+		

+		public virtual Version ProtocolVersion {

+			get { return protocolVersion; }

+		}

+		

+		public bool SupportsPipelining {

+			get { return HttpVersion.Version11.Equals (protocolVersion); }

+		}

+		

+		// Methods

+		

+		public override int GetHashCode() 

+		{

+			return base.GetHashCode ();

+		}

+		

+		// Internal Methods

+

+		internal bool AvailableForRecycling {

+			get { 

+				return CurrentConnections == 0

+				    && maxIdleTime != Timeout.Infinite

+			            && DateTime.Now >= IdleSince.AddMilliseconds (maxIdleTime);

+			}

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/ServicePointManager.cs b/mcs/class/System/System.Net/ServicePointManager.cs
new file mode 100644
index 00000000000..2dc6831761d
--- /dev/null
+++ b/mcs/class/System/System.Net/ServicePointManager.cs
@@ -0,0 +1,169 @@
+//

+// System.Net.ServicePointManager

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+using System.Security.Cryptography.X509Certificates;

+

+//

+// notes:

+// A service point manager manages service points (duh!).

+// A service point maintains a list of connections (per scheme + authority).

+// According to HttpWebRequest.ConnectionGroupName each connection group

+// creates additional connections. therefor, a service point has a hashtable

+// of connection groups where each value is a list of connections.

+// 

+// when we need to make an HttpWebRequest, we need to do the following:

+// 1. find service point, given Uri and Proxy 

+// 2. find connection group, given service point and group name

+// 3. find free connection in connection group, or create one (if ok due to limits)

+// 4. lease connection

+// 5. execute request

+// 6. when finished, return connection

+//

+

+

+namespace System.Net 

+{

+	public class ServicePointManager

+	{

+		private static HybridDictionary servicePoints = new HybridDictionary ();

+		

+		// Static properties

+		

+		private static ICertificatePolicy policy = null;

+		private static int defaultConnectionLimit = DefaultPersistentConnectionLimit;

+		private static int maxServicePointIdleTime = 900000; // 15 minutes

+		private static int maxServicePoints = 0;

+		

+		// Fields

+		

+		public const int DefaultNonPersistentConnectionLimit = 4;

+		public const int DefaultPersistentConnectionLimit = 2;

+		

+		// Constructors

+		private ServicePointManager ()

+		{

+		}		

+		

+		// Properties

+		

+		public static ICertificatePolicy CertificatePolicy {

+			get { return policy; }

+			set { policy = value; }

+		}

+		

+		public static int DefaultConnectionLimit {

+			get { return defaultConnectionLimit; }

+			set { 

+				if (value < 0)

+					throw new ArgumentOutOfRangeException ("value");

+				defaultConnectionLimit = value; 

+			}

+		}

+		

+		public static int MaxServicePointIdleTime {

+			get { 

+				return maxServicePointIdleTime;

+			}

+			set { 

+				if (value < -2 || value > Int32.MaxValue)

+					throw new ArgumentOutOfRangeException ("value");

+				maxServicePointIdleTime = value;

+			}

+		}

+		

+		public static int MaxServicePoints {

+			get { 

+				return maxServicePoints; 

+			}

+			set {  

+				if (value < 0)

+					throw new ArgumentException ("value");				

+				maxServicePoints = value;

+				RecycleServicePoints ();

+			}

+		}

+		

+		// Methods

+		

+		public static ServicePoint FindServicePoint (Uri address) 

+		{

+			return FindServicePoint (address, GlobalProxySelection.Select);

+		}

+		

+		public static ServicePoint FindServicePoint (string uriString, IWebProxy proxy)

+		{

+			return FindServicePoint (new Uri(uriString), proxy);

+		}

+		

+		public static ServicePoint FindServicePoint (Uri address, IWebProxy proxy)

+		{

+			RecycleServicePoints ();

+			

+			if (address == null)

+				throw new ArgumentNullException ("address");

+

+			if (proxy != null && !proxy.IsBypassed(address)) {

+				address = proxy.GetProxy (address);				

+			} 

+

+			address = new Uri (address.Scheme + "://" + address.Authority);

+			

+			ServicePoint sp = null;

+			lock (servicePoints) {

+				sp = (ServicePoint) servicePoints [address];

+				if (sp != null)

+					return sp;

+				if (maxServicePoints > 0 && servicePoints.Count >= maxServicePoints)

+					throw new InvalidOperationException ("maximum number of service points reached");

+				sp = new ServicePoint (address, defaultConnectionLimit, maxServicePointIdleTime);

+				servicePoints.Add (address, sp);

+			}

+			

+			return sp;

+		}

+		

+		// Internal Methods

+

+		internal static void RecycleServicePoints ()

+		{

+			ArrayList toRemove = new ArrayList ();

+			lock (servicePoints) {

+				IDictionaryEnumerator e = servicePoints.GetEnumerator ();

+				while (e.MoveNext ()) {

+					ServicePoint sp = (ServicePoint) e.Value;

+					if (sp.AvailableForRecycling) {

+						toRemove.Add (e.Key);

+					}

+				}

+				

+				for (int i = 0; i < toRemove.Count; i++) 

+					servicePoints.Remove (toRemove [i]);

+

+				if (maxServicePoints == 0 || servicePoints.Count <= maxServicePoints)

+					return;

+

+				// get rid of the ones with the longest idle time

+				SortedList list = new SortedList (servicePoints.Count);

+				e = servicePoints.GetEnumerator ();

+				while (e.MoveNext ()) {

+					ServicePoint sp = (ServicePoint) e.Value;

+					if (sp.CurrentConnections == 0) {

+						while (list.ContainsKey (sp.IdleSince))

+							sp.IdleSince.AddMilliseconds (1);

+						list.Add (sp.IdleSince, sp.Address);

+					}

+				}

+				

+				for (int i = 0; i < list.Count && servicePoints.Count > maxServicePoints; i++)

+					servicePoints.Remove (list.GetByIndex (i));

+			}

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/SocketAddress.cs b/mcs/class/System/System.Net/SocketAddress.cs
new file mode 100755
index 00000000000..757a71fd7f4
--- /dev/null
+++ b/mcs/class/System/System.Net/SocketAddress.cs
@@ -0,0 +1,101 @@
+//
+// System.Net.SocketAddress.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Net.Sockets;
+
+namespace System.Net {
+
+	public class SocketAddress {
+		private byte[] data;
+		
+		public SocketAddress (AddressFamily family, int size)
+		{
+			if(size<2) {
+				throw new ArgumentOutOfRangeException("size is too small");
+			}
+			
+			data=new byte[size];
+			data[0]=(byte)family;
+			data[1]=(byte)size;
+		}
+
+		public SocketAddress (AddressFamily family)
+		{
+			data=new byte[32];
+			data[0]=(byte)family;
+			data[1]=(byte)32;
+		}
+		
+		public AddressFamily Family {
+			get {
+				return((AddressFamily)data[0]);
+			}
+		}
+
+		public int Size {
+			get {
+				return((int)data[1]);
+			}
+		}
+
+		public byte this [ int offset ] {
+			get {
+				return(data[offset]);
+			}
+
+			set {
+				data[offset]=value;
+			}
+		}
+
+		public override string ToString() {
+			string af=((AddressFamily)data[0]).ToString();
+			int size=(int)data[1];
+			string ret=af+":"+size+":{";
+			
+			for(int i=2; i<size; i++) {
+				int val=(int)data[i];
+				ret=ret+val;
+				if(i<size-1) {
+					ret=ret+",";
+				}
+			}
+			
+			ret=ret+"}";
+			
+			return(ret);
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (obj is System.Net.SocketAddress &&
+			    ((System.Net.SocketAddress) obj).data.Length == data.Length){
+				byte [] otherData = ((System.Net.SocketAddress) obj).data;
+				for (int i = 0; i < data.Length; i++)
+					if (otherData [i] != data [i])
+						return false;
+
+				return true;
+			}
+
+			return false;
+		}
+
+		public override int GetHashCode ()
+		{
+			int code = 0;
+
+			for (int i = 0; i < data.Length; i++)
+				code += data [i] + i;
+
+			return code;
+		}
+	}
+}
diff --git a/mcs/class/System/System.Net/SocketPermission.cs b/mcs/class/System/System.Net/SocketPermission.cs
new file mode 100644
index 00000000000..56faa80056f
--- /dev/null
+++ b/mcs/class/System/System.Net/SocketPermission.cs
@@ -0,0 +1,339 @@
+//

+// System.Net.SocketPermission.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Security;

+using System.Security.Permissions;

+

+namespace System.Net

+{

+	[Serializable]

+	public sealed class SocketPermission : CodeAccessPermission, IUnrestrictedPermission

+	{

+		// Fields

+		ArrayList m_acceptList = new ArrayList ();

+		ArrayList m_connectList = new ArrayList ();

+		bool m_noRestriction;

+		

+		// Constructors

+		public SocketPermission (PermissionState state) : base () 

+		{						

+			m_noRestriction = (state == PermissionState.Unrestricted);

+		}

+		

+		public SocketPermission (NetworkAccess access, TransportType transport, 

+					 string hostName, int portNumber) : base () 

+		{

+			m_noRestriction = false;

+			AddPermission (access, transport, hostName, portNumber);

+		}	

+		

+		// Fields

+		public const int AllPorts = -1;

+		

+		// Properties

+

+		public IEnumerator AcceptList {

+			get { return m_acceptList.GetEnumerator (); }

+		}

+

+		public IEnumerator ConnectList {

+			get { return m_connectList.GetEnumerator (); }

+		}

+		

+		// Methods

+		

+		public void AddPermission (NetworkAccess access, TransportType transport,

+					   string hostName, int portNumber)

+		{

+			if (m_noRestriction)

+				return;

+				

+			EndpointPermission permission = new EndpointPermission (hostName, portNumber, transport);

+

+			if (access == NetworkAccess.Accept)

+				m_acceptList.Add (permission);

+			else

+				m_connectList.Add (permission);

+		}		

+		

+		public override IPermission Copy ()

+		{

+			SocketPermission permission;

+

+			permission = new SocketPermission (m_noRestriction ? 

+						PermissionState.Unrestricted : 

+						PermissionState.None);

+

+			// as EndpointPermission's are immutable it's safe to do a shallow copy.						

+			permission.m_connectList = (ArrayList) this.m_connectList.Clone ();

+			permission.m_acceptList = (ArrayList) this.m_acceptList.Clone ();

+

+			return permission;		

+		}

+		

+		public override IPermission Intersect (IPermission target)

+		{

+			if (target == null) 

+				return null;

+				

+			SocketPermission perm = target as SocketPermission;

+			if (perm == null) 

+				throw new ArgumentException ("Argument not of type SocketPermission");

+			

+			if (m_noRestriction) 

+				return IntersectEmpty (perm) ? null : perm.Copy ();

+				

+			if (perm.m_noRestriction)

+				return IntersectEmpty (this) ? null : this.Copy ();

+				

+			SocketPermission newperm = new SocketPermission (PermissionState.None);

+			Intersect (this.m_connectList, perm.m_connectList, newperm.m_connectList);

+			Intersect (this.m_acceptList, perm.m_acceptList, newperm.m_acceptList);

+			return IntersectEmpty (newperm) ? null : newperm;			

+		}

+		

+		private bool IntersectEmpty (SocketPermission permission)		

+		{

+			return !permission.m_noRestriction && 

+			       (permission.m_connectList.Count == 0) &&

+			       (permission.m_acceptList.Count == 0);

+		}

+		

+		private void Intersect (ArrayList list1, ArrayList list2, ArrayList result)

+		{

+			foreach (EndpointPermission perm1 in list1) {

+				foreach (EndpointPermission perm2 in list2) {

+					EndpointPermission perm = perm1.Intersect (perm2);

+					if (perm != null) {

+						// instead of the below it's also okay to simply do:

+						//     result.Add (perm);

+						// below is only done to avoid double entries						

+						bool replaced = false;

+						for (int i = 0; i < result.Count; i++) {

+							EndpointPermission res = (EndpointPermission) result [i];

+							EndpointPermission resperm = perm.Intersect (res);

+							if (resperm != null) {

+								result [i] = resperm;

+								replaced = true;

+								break;

+							}

+						}

+						if (!replaced) 

+							result.Add (perm);

+					}

+				}

+			}

+		}

+		

+		public override bool IsSubsetOf (IPermission target) 

+		{

+			if (target == null)

+				return (!m_noRestriction && m_connectList.Count == 0 && m_acceptList.Count ==	 0);

+			

+			SocketPermission perm = target as SocketPermission;

+

+			if (perm == null) 

+				throw new ArgumentException ("Parameter target must be of type SocketPermission");

+			

+			if (perm.m_noRestriction) 

+				return true;

+

+			if (this.m_noRestriction)

+				return false;

+

+			if (this.m_acceptList.Count == 0 && this.m_connectList.Count == 0)

+				return true;

+

+			if (perm.m_acceptList.Count == 0 && perm.m_connectList.Count == 0)

+				return false;

+

+			return IsSubsetOf (this.m_connectList, perm.m_connectList)

+			    && IsSubsetOf (this.m_acceptList, perm.m_acceptList);

+		}

+

+		private bool IsSubsetOf (ArrayList list1, ArrayList list2)

+		{

+			foreach (EndpointPermission perm1 in list1) {

+				bool issubset = false;

+				foreach (EndpointPermission perm2 in list2) 

+					if (perm1.IsSubsetOf (perm2)) {

+						issubset = true;

+						break;

+					}

+				if (!issubset) 

+					return false;

+			}

+			return true;

+		}

+		

+		public bool IsUnrestricted () 

+		{

+			return m_noRestriction;

+		}

+

+		/*

+		

+		SocketPermission s = new SocketPermission (NetworkAccess.Connect, TransportType.Tcp, "www.google.com", 80);

+		s.AddPermission (NetworkAccess.Accept, TransportType.All, "localhost", 8080);

+		s.AddPermission (NetworkAccess.Accept, TransportType.All, "localhost", SocketPermission.AllPorts);

+		// s = new SocketPermission (PermissionState.None);

+		SecurityElement sec = s.ToXml ();	

+		Console.WriteLine (sec.ToString ());

+

+		This is sample xml output:

+

+		<IPermission class="System.Net.SocketPermission, System, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"

+			     version="1">

+		   <ConnectAccess>

+		      <ENDPOINT host="www.google.com"

+				transport="Tcp"

+				port="80"/>

+		   </ConnectAccess>

+		   <AcceptAccess>

+		      <ENDPOINT host="localhost"

+				transport="All"

+				port="8080"/>

+		      <ENDPOINT host="localhost"

+				transport="All"

+				port="All"/>

+		   </AcceptAccess>

+		</IPermission>

+

+

+

+		This is a sample unrestricted socketpermission, no matter how many permissions you add:			

+

+		<IPermission class="System.Net.SocketPermission, System, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"

+			     version="1"

+			     Unrestricted="true"/>

+

+

+		This is a sample constructed restricted socketpermission with no permissions added:

+

+		<IPermission class="System.Net.SocketPermission, System, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"

+			     version="1"/>

+		*/

+		public override SecurityElement ToXml ()

+		{

+             

+			SecurityElement root = new SecurityElement ("IPermission");

+

+			root.AddAttribute ("class", this.GetType ().AssemblyQualifiedName);

+			root.AddAttribute ("version", "1");

+			if (m_noRestriction) {

+				root.AddAttribute ("Unrestricted", "true");				

+				return root;

+			}				

+				

+			if (this.m_connectList.Count > 0)

+				ToXml (root, "ConnectAccess", m_connectList.GetEnumerator ());

+			

+			if (this.m_acceptList.Count > 0) 

+				ToXml (root, "AcceptAccess", m_acceptList.GetEnumerator ());			

+			

+			return root;

+		}

+		

+		private void ToXml (SecurityElement root, string childName, IEnumerator enumerator)

+		{

+			SecurityElement child = new SecurityElement (childName);

+			while (enumerator.MoveNext ()) {

+				EndpointPermission perm = enumerator.Current as EndpointPermission;

+				SecurityElement grandchild = new SecurityElement ("ENDPOINT");

+				grandchild.AddAttribute ("host", perm.Hostname);

+				grandchild.AddAttribute ("transport", perm.Transport.ToString ());

+				grandchild.AddAttribute ("port", 

+						perm.Port == AllPorts 

+						? "All" 

+						: ((Int32) perm.Port).ToString ());

+				child.AddChild (grandchild);

+			}

+			root.AddChild (child);

+		}

+		

+		public override void FromXml (SecurityElement securityElement)

+		{

+			if (securityElement == null)

+				throw new ArgumentNullException ("securityElement");

+				

+			// LAMESPEC: it says to throw an ArgumentNullException in this case				

+			if (securityElement.Tag != "IPermission")

+				throw new ArgumentException ("securityElement");

+				

+			string classStr = securityElement.Attribute ("class");

+			if (classStr == null || !classStr.StartsWith (this.GetType ().FullName + ","))

+				throw new ArgumentException ("securityElement");

+				

+			string unrestricted = securityElement.Attribute ("Unrestricted");

+			if (unrestricted != null) {

+				this.m_noRestriction = (String.Compare (unrestricted, "true", true) == 0);

+				if (this.m_noRestriction)

+					return;

+			}

+			

+			this.m_noRestriction = false;

+			this.m_connectList = new ArrayList ();

+			this.m_acceptList = new ArrayList ();

+			

+			ArrayList children = securityElement.Children;

+			foreach (SecurityElement child in children) {

+				if (child.Tag == "ConnectAccess") 

+					FromXml (child.Children, NetworkAccess.Connect);

+				else if (child.Tag == "AcceptAccess")

+					FromXml (child.Children, NetworkAccess.Accept);

+			}

+		}		

+		

+		private void FromXml (ArrayList endpoints, NetworkAccess access)

+		{

+			foreach (SecurityElement endpoint in endpoints) {

+				if (endpoint.Tag != "ENDPOINT")

+					continue;

+				string hostname = endpoint.Attribute ("host");

+				TransportType transport = 

+					(TransportType) Enum.Parse (typeof (TransportType), 

+							            endpoint.Attribute ("transport"), 

+							            true);

+				string p = endpoint.Attribute ("port");

+				int port = 0;

+				if (p == "All") 

+					port = SocketPermission.AllPorts;

+				else

+					port = Int32.Parse (p);

+

+				AddPermission (access, transport, hostname, port);

+			}

+		}

+		

+		public override IPermission Union (IPermission target) 

+		{

+			// LAMESPEC: according to spec we should throw an 

+			// exception when target is null. We'll follow the

+			// behaviour of MS.Net instead of the spec, also

+			// because it matches the Intersect behaviour.

+			if (target == null)

+				return null;

+				// throw new ArgumentNullException ("target");

+				

+			SocketPermission perm = target as SocketPermission;

+			if (perm == null)

+				throw new ArgumentException ("Argument not of type SocketPermission");

+			

+			if (this.m_noRestriction || perm.m_noRestriction) 

+				return new SocketPermission (PermissionState.Unrestricted);

+				

+			SocketPermission copy = (SocketPermission) perm.Copy ();

+			copy.m_acceptList.InsertRange (copy.m_acceptList.Count, this.m_acceptList);

+			copy.m_connectList.InsertRange (copy.m_connectList.Count, this.m_connectList);				

+			

+			return copy;

+		}

+

+	}

+}

diff --git a/mcs/class/System/System.Net/SocketPermissionAttribute.cs b/mcs/class/System/System.Net/SocketPermissionAttribute.cs
new file mode 100644
index 00000000000..80a4a2c625b
--- /dev/null
+++ b/mcs/class/System/System.Net/SocketPermissionAttribute.cs
@@ -0,0 +1,127 @@
+//

+// System.Net.SocketPermissionAttribute.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Security;

+using System.Security.Permissions;

+

+namespace System.Net

+{

+	[AttributeUsage (AttributeTargets.Assembly 

+	               | AttributeTargets.Class 

+	               | AttributeTargets.Struct 

+	               | AttributeTargets.Constructor 

+	               | AttributeTargets.Method)

+	]	

+	[Serializable]

+	public sealed class SocketPermissionAttribute : CodeAccessSecurityAttribute

+	{

+		// Fields

+		string m_access;

+		string m_host;

+		string m_port;

+		string m_transport;

+		

+		// Constructors

+		public SocketPermissionAttribute (SecurityAction action) : base (action)

+		{

+		}

+

+		// Properties

+

+		public string Access {

+			get { return m_access; }

+			set { 

+				if (m_access != null)

+					throw new ArgumentException ("The parameter 'Access' can be set only once.");

+				if (value == null) 

+					throw new ArgumentException ("The parameter 'Access' cannot be null.");

+				m_access = value;

+			}

+		}

+

+		public string Host {

+			get { return m_host; }

+			set { 

+				if (m_host != null)

+					throw new ArgumentException ("The parameter 'Host' can be set only once.");

+				if (value == null) 

+					throw new ArgumentException ("The parameter 'Host' cannot be null.");					

+				m_host = value;

+			}

+		}

+

+		public string Port {

+			get { return m_port; }

+			set { 

+				if (m_port != null)

+					throw new ArgumentException ("The parameter 'Port' can be set only once.");

+				if (value == null) 

+					throw new ArgumentException ("The parameter 'Port' cannot be null.");					

+				m_port = value;

+			}

+		}

+

+		public string Transport {

+			get { return m_transport; }

+			set { 

+				if (m_transport != null)

+					throw new ArgumentException ("The parameter 'Transport' can be set only once.");

+				if (value == null) 

+					throw new ArgumentException ("The parameter 'Transport' cannot be null.");					

+				m_transport = value;

+			}

+		}

+		

+		// Methods

+		

+		public override IPermission CreatePermission () {

+			if (this.Unrestricted)

+				return new SocketPermission (PermissionState.Unrestricted);

+

+			if (m_access == null) 

+				throw new ArgumentException ("The value for 'Access' must be specified.");

+			if (m_host == null) 

+				throw new ArgumentException ("The value for 'Host' must be specified.");

+			if (m_port == null) 

+				throw new ArgumentException ("The value for 'Port' must be specified.");

+			if (m_transport == null) 

+				throw new ArgumentException ("The value for 'Transport' must be specified.");

+

+			NetworkAccess access;

+			TransportType transport;

+			int port = SocketPermission.AllPorts;

+

+			if (String.Compare (m_access, "Connect", true) == 0)

+				access = NetworkAccess.Connect;

+			else if (String.Compare (m_access, "Accept", true) == 0)

+				access = NetworkAccess.Accept;

+			else 

+				throw new ArgumentException ("The parameter value 'Access=" + m_access + "' is invalid.");

+

+			if (String.Compare (m_port, "All", true) != 0) {

+				try {

+					port = Int32.Parse (m_port);					

+				} catch (Exception) {

+					throw new ArgumentException ("The parameter value 'Port=" + port + "' is invalid.");

+				}

+				// test whether port number is valid..

+				new IPEndPoint (1, port);

+			}

+

+			try {

+				transport = (TransportType) Enum.Parse (typeof (TransportType), m_transport, true);

+			} catch (Exception) {

+				throw new ArgumentException ("The parameter value 'Transport=" + m_transport + "' is invalid.");

+			}

+						

+			SocketPermission perm = new SocketPermission (PermissionState.None);

+			perm.AddPermission (access, transport, m_host, port);

+			return perm;

+		}		

+	}

+}

diff --git a/mcs/class/System/System.Net/TransportType.cs b/mcs/class/System/System.Net/TransportType.cs
new file mode 100755
index 00000000000..b9e5822fcff
--- /dev/null
+++ b/mcs/class/System/System.Net/TransportType.cs
@@ -0,0 +1,41 @@
+// TransportType.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:32:18 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net {
+
+
+	/// <summary>
+	/// </summary>
+	public enum TransportType {
+
+		/// <summary>
+		/// </summary>
+		Udp = 1,
+
+		/// <summary>
+		/// </summary>
+		Connectionless = 1,
+
+		/// <summary>
+		/// </summary>
+		Tcp = 2,
+
+		/// <summary>
+		/// </summary>
+		ConnectionOriented = 2,
+
+		/// <summary>
+		/// </summary>
+		All = 3,
+	} // TransportType
+
+} // System.Net
diff --git a/mcs/class/System/System.Net/WebClient.cs b/mcs/class/System/System.Net/WebClient.cs
new file mode 100644
index 00000000000..17c5895ee3e
--- /dev/null
+++ b/mcs/class/System/System.Net/WebClient.cs
@@ -0,0 +1,123 @@
+//

+// System.Net.WebClient

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+using System.ComponentModel;

+using System.IO;

+using System.Runtime.InteropServices;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[ComVisible(true)]

+	public sealed class WebClient : Component

+	{		

+	

+		// Constructors

+		

+		public WebClient ()

+		{

+		}

+		

+		// Properties

+		

+		[MonoTODO]

+		public string BaseAddress {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public ICredentials Credentials {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public WebHeaderCollection Headers {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public NameValueCollection QueryString {

+			get { throw new NotImplementedException (); }

+			set { throw new NotImplementedException (); }

+		}

+		

+		[MonoTODO]

+		public WebHeaderCollection ResponseHeaders {

+			get { throw new NotImplementedException (); }

+		}

+

+		// Methods

+		

+		[MonoTODO]

+		public byte [] DownloadData (string address)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public void DownloadFile (string address, string fileName)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		[MonoTODO]

+		public Stream OpenRead (string address)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		public Stream OpenWrite (string address)

+		{

+			return OpenWrite (address, "POST");

+		}

+		

+		[MonoTODO]

+		public Stream OpenWrite (string address, string method)

+		{

+			throw new NotImplementedException ();

+		}

+				

+		public byte [] UploadData (string address, byte [] data)

+		{

+			return UploadData (address, "POST", data);

+		}

+		

+		[MonoTODO]

+		public byte [] UploadData (string address, string method, byte [] data)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		public byte [] UploadFile (string address, string fileName)

+		{

+			return UploadFile (address, "POST", fileName);

+		}

+		

+		[MonoTODO]

+		public byte[] UploadFile (string address, string method, string fileName)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		public byte[] UploadValues (string address, NameValueCollection data)

+		{

+			return UploadValues (address, "POST", data);

+		}

+		

+		[MonoTODO]

+		public byte[] UploadValues (string address, string method, NameValueCollection data)

+		{

+			throw new NotImplementedException ();

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/WebException.cs b/mcs/class/System/System.Net/WebException.cs
new file mode 100644
index 00000000000..e3607a15a43
--- /dev/null
+++ b/mcs/class/System/System.Net/WebException.cs
@@ -0,0 +1,74 @@
+//

+// System.Net.WebException.cs

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class WebException : InvalidOperationException, ISerializable

+	{

+		private WebResponse response;

+		private WebExceptionStatus status;

+		

+

+		// Constructors

+		

+		public WebException () : base ()

+		{

+		}

+		

+		public WebException (string message) : base (message)

+		{

+		}

+

+		protected WebException (SerializationInfo serializationInfo,

+		   			StreamingContext streamingContext)

+			: base (serializationInfo, streamingContext)

+		{

+		}

+

+		public WebException (string message, Exception innerException)

+			: base (message, innerException)

+		{

+		}

+

+		public WebException (string message, WebExceptionStatus status)

+			: base (message)

+		{

+			this.status = status;

+		}

+

+		public WebException(string message, 

+				    Exception innerException,

+		   		    WebExceptionStatus status, 

+		   		    WebResponse response)

+			: base (message, innerException)		   		    

+		{

+			this.status = status;

+			this.response = response;

+		}

+		

+		// Properties

+		

+		public WebResponse Response {

+			get { return this.response; }

+		}

+		

+		public WebExceptionStatus Status {

+			get { return this.status; }

+		}

+		

+		// Methods

+		

+		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)

+		{

+			base.GetObjectData (info, context);

+		}

+	}

+}

+	

diff --git a/mcs/class/System/System.Net/WebExceptionStatus.cs b/mcs/class/System/System.Net/WebExceptionStatus.cs
new file mode 100755
index 00000000000..05dd876bac0
--- /dev/null
+++ b/mcs/class/System/System.Net/WebExceptionStatus.cs
@@ -0,0 +1,85 @@
+// WebExceptionStatus.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:33:08 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net {
+
+
+	/// <summary>
+	/// </summary>
+	public enum WebExceptionStatus {
+
+		/// <summary>
+		/// </summary>
+		Success = 0,
+
+		/// <summary>
+		/// </summary>
+		NameResolutionFailure = 1,
+
+		/// <summary>
+		/// </summary>
+		ConnectFailure = 2,
+
+		/// <summary>
+		/// </summary>
+		ReceiveFailure = 3,
+
+		/// <summary>
+		/// </summary>
+		SendFailure = 4,
+
+		/// <summary>
+		/// </summary>
+		PipelineFailure = 5,
+
+		/// <summary>
+		/// </summary>
+		RequestCanceled = 6,
+
+		/// <summary>
+		/// </summary>
+		ProtocolError = 7,
+
+		/// <summary>
+		/// </summary>
+		ConnectionClosed = 8,
+
+		/// <summary>
+		/// </summary>
+		TrustFailure = 9,
+
+		/// <summary>
+		/// </summary>
+		SecureChannelFailure = 10,
+
+		/// <summary>
+		/// </summary>
+		ServerProtocolViolation = 11,
+
+		/// <summary>
+		/// </summary>
+		KeepAliveFailure = 12,
+
+		/// <summary>
+		/// </summary>
+		Pending = 13,
+
+		/// <summary>
+		/// </summary>
+		Timeout = 14,
+
+		/// <summary>
+		/// </summary>
+		ProxyNameResolutionFailure = 15,
+	} // WebExceptionStatus
+
+} // System.Net
diff --git a/mcs/class/System/System.Net/WebHeaderCollection.cs b/mcs/class/System/System.Net/WebHeaderCollection.cs
new file mode 100644
index 00000000000..5b4b2217943
--- /dev/null
+++ b/mcs/class/System/System.Net/WebHeaderCollection.cs
@@ -0,0 +1,310 @@
+//

+// System.Net.WebHeaderCollection

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+using System.Runtime.InteropServices;

+using System.Runtime.Serialization;

+using System.Text;

+    

+// See RFC 2068 par 4.2 Message Headers

+    

+namespace System.Net 

+{

+	[Serializable]

+	[ComVisible(true)]

+	public class WebHeaderCollection : NameValueCollection, ISerializable

+	{

+		private static readonly int [] restricted;

+		private static readonly int [] multiValue;

+		private bool internallyCreated = false;

+		

+		// Static Initializer

+		

+		static WebHeaderCollection () 

+		{

+			// For performance reasons we initialize the following

+			// tables by taking the hashcode of header names.

+			// When you add a header make sure all characters are in 

+			// lowercase.

+			

+			// the list of restricted header names as defined 

+			// by the ms.net spec

+			ArrayList a = new ArrayList ();

+			a.Add ("accept".GetHashCode ());

+			a.Add ("connection".GetHashCode ());

+			a.Add ("content-length".GetHashCode ());

+			a.Add ("content-type".GetHashCode ());

+			a.Add ("date".GetHashCode ());

+			a.Add ("expect".GetHashCode ());    // ??? What is this anyway?

+			a.Add ("host".GetHashCode ());

+			a.Add ("range".GetHashCode ());

+			a.Add ("referer".GetHashCode ());

+			a.Add ("transfer-encoding".GetHashCode ());

+			a.Add ("user-agent".GetHashCode ());			

+			restricted = (int []) a.ToArray (typeof (int));

+			

+			// see par 14 of RFC 2068 to see which header names

+			// accept multiple values each separated by a comma

+			a = new ArrayList ();

+			a.Add ("accept".GetHashCode ());

+			a.Add ("accept-charset".GetHashCode ());

+			a.Add ("accept-encoding".GetHashCode ());

+			a.Add ("accept-language".GetHashCode ());

+			a.Add ("accept-ranges".GetHashCode ());

+			a.Add ("allow".GetHashCode ());

+			a.Add ("authorization".GetHashCode ());

+			a.Add ("cache-control".GetHashCode ());

+			a.Add ("connection".GetHashCode ());

+			a.Add ("content-encoding".GetHashCode ());

+			a.Add ("content-language".GetHashCode ());			

+			a.Add ("expect".GetHashCode ());		

+			a.Add ("if-match".GetHashCode ());

+			a.Add ("if-none-match".GetHashCode ());

+			a.Add ("proxy-authenticate".GetHashCode ());

+			a.Add ("public".GetHashCode ());			

+			a.Add ("range".GetHashCode ());

+			a.Add ("transfer-encoding".GetHashCode ());

+			a.Add ("upgrade".GetHashCode ());

+			a.Add ("vary".GetHashCode ());

+			a.Add ("via".GetHashCode ());

+			a.Add ("warning".GetHashCode ());

+			multiValue = (int []) a.ToArray (typeof (int));

+		}

+		

+		// Constructors

+		

+		public WebHeaderCollection () {	}	

+		

+		protected WebHeaderCollection (SerializationInfo serializationInfo, 

+					       StreamingContext streamingContext)

+		{

+			// TODO: test for compatibility with ms.net

+			int count = serializationInfo.GetInt32("count");

+			for (int i = 0; i < count; i++) 

+				this.Add (serializationInfo.GetString ("k" + i),

+					  serializationInfo.GetString ("v" + i));

+		}

+		

+		internal WebHeaderCollection (bool dummy) : base ()

+		{	

+			this.internallyCreated = true;

+		}		

+		

+		// Methods

+		

+		public void Add (string header)

+		{

+			if (header == null)

+				throw new ArgumentNullException ("header");

+			int pos = header.IndexOf (':');

+			if (pos == -1)

+				throw new ArgumentException ("no colon found");				

+			this.Add (header.Substring (0, pos), 

+				  header.Substring (pos + 1));

+		}

+		

+		public override void Add (string name, string value)

+		{

+			if (name == null)

+				throw new ArgumentNullException ("name");

+			if (internallyCreated && IsRestricted (name))

+				throw new ArgumentException ("restricted header");

+			this.AddWithoutValidate (name, value);

+		}

+

+		protected void AddWithoutValidate (string headerName, string headerValue)

+		{

+			if (!IsHeaderName (headerName))

+				throw new ArgumentException ("invalid header name");

+			if (headerValue == null)

+				headerValue = String.Empty;

+			else

+				headerValue = headerValue.Trim ();

+			if (!IsHeaderValue (headerValue))

+				throw new ArgumentException ("invalid header value");

+			base.Add (headerName, headerValue);			

+		}

+		

+		public override string [] GetValues (string header)

+		{

+			if (header == null)

+				throw new ArgumentNullException ("header");

+			string [] values = base.GetValues (header);

+			if (values == null || values.Length == 0) 

+				return null;

+			if (!IsMultiValue (header))

+				return values;

+			StringCollection col = new StringCollection ();

+			for (int i = 0; i < values.Length; i++) {

+				string [] s = values [i].Split (new char [] {','});

+				for (int j = 0; j < s.Length; j++) 

+					s [j] = s [j].Trim ();

+				col.AddRange (s);

+			}

+			values = new string [col.Count];

+			col.CopyTo (values, 0);

+			return values;

+		}

+

+		public static bool IsRestricted (string headerName)

+		{

+			int hashCode = headerName.ToLower ().GetHashCode ();

+			for (int i = 0; i < restricted.Length; i++) 

+				if (restricted [i] == hashCode)

+					return true;

+			return false;

+		}

+

+		[MonoTODO]

+		public override void OnDeserialization (object sender)

+		{

+			// no idea what to do here... spec doesn't say much

+			throw new NotImplementedException ();

+		}

+

+		public override void Remove (string name)

+		{

+			if (name == null)

+				throw new ArgumentNullException ("name");

+			if (internallyCreated && IsRestricted (name))

+				throw new ArgumentException ("restricted header");

+			base.Remove (name);

+		}

+

+		public override void Set (string name, string value)

+		{

+			if (name == null)

+				throw new ArgumentNullException ("name");

+			if (internallyCreated && IsRestricted (name))

+				throw new ArgumentException ("restricted header");

+			if (!IsHeaderName (name))

+				throw new ArgumentException ("invalid header name");

+			if (value == null)

+				value = String.Empty;

+			else

+				value = value.Trim ();

+			if (!IsHeaderValue (value))

+				throw new ArgumentException ("invalid header value");

+			base.Set (name, value);			

+		}

+

+		public byte[] ToByteArray ()

+		{

+			return Encoding.UTF8.GetBytes(ToString ());

+		}

+

+		public override string ToString ()

+		{

+			StringBuilder sb = new StringBuilder();

+

+			int count = base.Count;

+			for (int i = 0; i < count ; i++)

+				sb.Append (GetKey (i))

+				  .Append (": ")

+				  .Append (Get (i))

+				  .Append ("\r\n");

+				  

+			return sb.Append("\r\n").ToString();

+		}

+		

+		void ISerializable.GetObjectData (SerializationInfo serializationInfo,

+		   				  StreamingContext streamingContext)

+		{

+			int count = base.Count;

+			serializationInfo.AddValue ("count", count);

+			for (int i = 0; i < count ; i++) {

+				serializationInfo.AddValue ("k" + i, GetKey (i));

+				serializationInfo.AddValue ("v" + i, Get (i));

+			}

+		}

+		

+		// Internal Methods

+		

+		internal void SetInternal (string name, string value)

+		{

+			if (value == null)

+				value = String.Empty;

+			else

+				value = value.Trim ();

+			if (!IsHeaderValue (value))

+				throw new ArgumentException ("invalid header value");

+			base.Set (name, value);	

+		}

+		

+		internal void RemoveInternal (string name)

+		{

+			if (name == null)

+				throw new ArgumentNullException ("name");

+			base.Remove (name);

+		}		

+		

+		// Private Methods

+		

+		private static bool IsMultiValue (string headerName)

+		{

+			int hashCode = headerName.ToLower ().GetHashCode ();

+			for (int i = 0; i < multiValue.Length; i++) 

+				if (multiValue [i] == hashCode)

+					return true;

+			return false;

+		}		

+		

+		private bool IsHeaderValue (string value)

+		{

+			// TEXT any 8 bit value except CTL's (0-31 and 127)

+			//      but including \r\n space and \t

+			//      after a newline at least one space or \t must follow

+			//      certain header fields allow comments ()

+				

+			int len = value.Length;

+			for (int i = 0; i < len; i++) {			

+				char c = value [i];

+				if (c == 127)

+					return false;

+				if (c < 0x20 && (c != '\r' && c != '\n' && c != '\t'))

+					return false;

+				if (c == '\n' && ++i < len) {

+					c = value [i];

+					if (c != ' ' && c != '\t')

+						return false;

+				}

+			}

+			

+			return true;

+		}

+		

+		private bool IsHeaderName (string name)

+		{

+			// token          = 1*<any CHAR except CTLs or tspecials>

+			// tspecials      = "(" | ")" | "<" | ">" | "@"

+			//                | "," | ";" | ":" | "\" | <">

+			//                | "/" | "[" | "]" | "?" | "="

+			//                | "{" | "}" | SP | HT

+			

+			if (name == null || name.Length == 0)

+				return false;

+

+			int len = name.Length;

+			for (int i = 0; i < len; i++) {			

+				char c = name [i];

+				if (c < 0x20 || c >= 0x7f)

+					return false;

+			}

+			

+			return name.IndexOfAny (tspecials) == -1;

+		}

+

+		private static char [] tspecials = 

+				new char [] {'(', ')', '<', '>', '@',

+					     ',', ';', ':', '\\', '"',

+					     '/', '[', ']', '?', '=',

+					     '{', '}', ' ', '\t'};

+							

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/WebProxy.cs b/mcs/class/System/System.Net/WebProxy.cs
new file mode 100644
index 00000000000..05fde3d4d6d
--- /dev/null
+++ b/mcs/class/System/System.Net/WebProxy.cs
@@ -0,0 +1,194 @@
+//

+// System.Net.WebProxy

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Runtime.Serialization;

+using System.Text.RegularExpressions;

+

+namespace System.Net 

+{

+	[Serializable]

+	public class WebProxy : IWebProxy, ISerializable

+	{		

+		private Uri address;

+		private bool bypassOnLocal;

+		private ArrayList bypassList;

+		private ICredentials credentials;

+	

+		// Constructors

+	

+		public WebProxy () 

+			: this ((Uri) null, false, null, null) {}

+		

+		public WebProxy (string address) 

+			: this (ToUri (address), false, null, null) {}

+		

+		public WebProxy (Uri address) 

+			: this (address, false, null, null) {}

+		

+		public WebProxy (string address, bool bypassOnLocal) 

+			: this (ToUri (address), bypassOnLocal, null, null) {}

+		

+		public WebProxy (string host, int port)

+			: this (new Uri ("http://" + host + ":" + port)) {}

+		

+		public WebProxy (Uri address, bool bypassOnLocal)

+			: this (address, bypassOnLocal, null, null) {}

+

+		public WebProxy (string address, bool bypassOnLocal, string [] bypassList)

+			: this (ToUri (address), bypassOnLocal, bypassList, null) {}

+

+		public WebProxy (Uri address, bool bypassOnLocal, string [] bypassList)

+			: this (address, bypassOnLocal, bypassList, null) {}

+		

+		public WebProxy (string address, bool bypassOnLocal,

+				 string[] bypassList, ICredentials credentials)

+			: this (ToUri (address), bypassOnLocal, bypassList, null) {}

+

+		public WebProxy (Uri address, bool bypassOnLocal, 

+				 string[] bypassList, ICredentials credentials)

+		{

+			this.address = address;

+			this.bypassOnLocal = bypassOnLocal;

+			if (bypassList == null)

+				bypassList = new string [] {};

+			this.bypassList = new ArrayList (bypassList);

+			this.credentials = credentials;

+			CheckBypassList ();

+		}

+		

+		[MonoTODO]

+		protected WebProxy (SerializationInfo serializationInfo, StreamingContext streamingContext) 

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// Properties

+		

+		public Uri Address {

+			get { return address; }

+			set { address = value; }

+		}

+		

+		public ArrayList BypassArrayList {

+			get { 

+				return bypassList;

+			}

+		}

+		

+		public string [] BypassList {

+			get { return (string []) bypassList.ToArray (typeof (string)); }

+			set { 

+				if (value == null)

+					throw new ArgumentNullException ();

+				bypassList = new ArrayList (value); 

+				CheckBypassList ();

+			}

+		}

+		

+		public bool BypassProxyOnLocal {

+			get { return bypassOnLocal; }

+			set { bypassOnLocal = value; }

+		}

+		

+		public ICredentials Credentials {

+			get { return credentials; }

+			set { credentials = value; }

+		}

+		

+		// Methods

+		

+		[MonoTODO]

+		public static WebProxy GetDefaultProxy ()

+		{

+			// for Mono we should probably read in these settings

+			// from the global application configuration file

+			

+			// for now, return the empty WebProxy to indicate

+			// no proxy is used

+			// return GlobalProxySelection.GetEmptyWebProxy ();

+			// ??

+			

+			throw new NotImplementedException ();

+		}

+		

+		public Uri GetProxy (Uri destination)

+		{

+			if (IsBypassed (destination))

+				return destination;

+				

+			return address;

+		}

+		

+		public bool IsBypassed (Uri host)

+		{

+			if (address == null)

+				return true;

+			

+			if (host.IsLoopback)

+				return true;

+				

+			if (bypassOnLocal && host.Host.IndexOf ('.') == -1)

+				return true;

+				

+			try {				

+				string hostStr = host.Scheme + "://" + host.Authority;				

+				int i = 0;

+				for (; i < bypassList.Count; i++) {

+					Regex regex = new Regex ((string) bypassList [i], 

+						// TODO: RegexOptions.Compiled |  // not implemented yet by Regex

+						RegexOptions.IgnoreCase |

+						RegexOptions.Singleline);

+

+					if (regex.IsMatch (hostStr))

+						break;

+				}

+

+				if (i == bypassList.Count)

+					return false;

+

+				// continue checking correctness of regular expressions..

+				// will throw expression when an invalid one is found

+				for (; i < bypassList.Count; i++)

+					new Regex ((string) bypassList [i]);

+

+				return true;

+			} catch (ArgumentException) {

+				return false;

+			}

+		}

+

+		[MonoTODO]		

+		void ISerializable.GetObjectData (SerializationInfo serializationInfo,

+		                                  StreamingContext streamingContext)

+		{

+			throw new NotImplementedException ();

+		}

+		

+		// Private Methods

+		

+		// this compiles the regular expressions, and will throw

+		// an exception when an invalid one is found.

+		private void CheckBypassList ()

+		{			

+			for (int i = 0; i < bypassList.Count; i++)

+				new Regex ((string) bypassList [i]);

+		}

+		

+		private static Uri ToUri (string address)

+		{

+			if (address == null)

+				return null;

+				

+			if (address.IndexOf (':') == -1) 

+				address = "http://" + address;

+			

+			return new Uri (address);

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/WebRequest.cs b/mcs/class/System/System.Net/WebRequest.cs
new file mode 100644
index 00000000000..0be53a781ef
--- /dev/null
+++ b/mcs/class/System/System.Net/WebRequest.cs
@@ -0,0 +1,216 @@
+//

+// System.Net.WebRequest

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+using System.IO;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[Serializable]

+	public abstract class WebRequest : MarshalByRefObject, ISerializable

+	{

+		private static HybridDictionary prefixes;

+		

+		static WebRequest () {

+			prefixes = new HybridDictionary (3, true);

+			RegisterPrefix ("file", new FileWebRequestCreator ());

+			RegisterPrefix ("http", new HttpWebRequestCreator ());

+			RegisterPrefix ("https", new HttpWebRequestCreator ());

+		}

+		

+		internal class HttpWebRequestCreator : IWebRequestCreate

+		{

+			internal HttpWebRequestCreator () { }

+			

+			public WebRequest Create (Uri uri) 

+			{

+				return new HttpWebRequest (uri);

+			}

+		}

+

+		internal class FileWebRequestCreator : IWebRequestCreate

+		{

+			internal FileWebRequestCreator () { }

+			

+			public WebRequest Create (Uri uri) 

+			{

+				return new FileWebRequest (uri);

+			}

+		}

+

+		

+		// Constructors

+		

+		protected WebRequest () { }		

+		

+		protected WebRequest (SerializationInfo serializationInfo, StreamingContext streamingContext) 

+		{

+			throw new NotSupportedException ();

+		}

+		

+		// Properties

+		

+		public virtual string ConnectionGroupName { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual long ContentLength { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual string ContentType { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual ICredentials Credentials { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual WebHeaderCollection Headers { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual string Method { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual bool PreAuthenticate { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual IWebProxy Proxy { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual Uri RequestUri { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual int Timeout { 

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		// Methods

+		

+		public virtual void Abort()

+		{

+			throw new NotSupportedException ();

+		}

+		

+		public virtual IAsyncResult BeginGetRequestStream (AsyncCallback callback, object state) 

+		{

+			throw new NotSupportedException ();

+		}

+		

+		public virtual IAsyncResult BeginGetResponse (AsyncCallback callback, object state)

+		{

+			throw new NotSupportedException ();

+		}

+

+		public static WebRequest Create (string requestUriString) 

+		{

+			if (requestUriString == null)

+				throw new ArgumentNullException ("requestUriString");

+			return Create (new Uri (requestUriString));

+		}

+				

+		public static WebRequest Create (Uri requestUri) 

+		{

+			if (requestUri == null)

+				throw new ArgumentNullException ("requestUri");

+			return GetCreator (requestUri.AbsoluteUri).Create (requestUri);

+		}

+		

+		public static WebRequest CreateDefault (Uri requestUri)

+		{

+			if (requestUri == null)

+				throw new ArgumentNullException ("requestUri");

+			return GetCreator (requestUri.Scheme).Create (requestUri);

+		}

+

+		public virtual Stream EndGetRequestStream (IAsyncResult asyncResult)

+		{

+			throw new NotSupportedException ();

+		}

+		

+		public virtual WebResponse EndGetResponse (IAsyncResult asyncResult)

+		{

+			throw new NotSupportedException ();

+		}

+		

+		public virtual Stream GetRequestStream()

+		{

+			throw new NotSupportedException ();

+		}

+		

+		public virtual WebResponse GetResponse()

+		{

+			throw new NotSupportedException ();

+		}

+		

+		void ISerializable.GetObjectData (SerializationInfo serializationInfo,

+		   				  StreamingContext streamingContext)

+		{

+			throw new NotSupportedException ();

+		}

+

+		public static bool RegisterPrefix (string prefix, IWebRequestCreate creator)

+		{

+			if (prefix == null)

+				throw new ArgumentNullException("prefix");

+			if (creator == null)

+				throw new ArgumentNullException("creator");			

+			

+			lock (prefixes.SyncRoot) {

+				if (prefixes.Contains (prefix))

+					return false;

+				prefixes.Add (prefix.ToLower (), creator);

+			}

+			return true;

+		}

+		

+		private static IWebRequestCreate GetCreator (string prefix)

+		{

+			int longestPrefix = -1;

+			IWebRequestCreate creator = null;

+

+			prefix = prefix.ToLower ();

+

+			IDictionaryEnumerator e = prefixes.GetEnumerator ();

+			while (e.MoveNext ()) {

+				string key = e.Key as string;

+

+				if (key.Length <= longestPrefix) 

+					continue;

+				

+				if (!prefix.StartsWith (key))

+					continue;					

+					

+				longestPrefix = key.Length;

+				creator = (IWebRequestCreate) e.Value;

+			}

+			

+			if (creator == null) 

+				throw new NotSupportedException (prefix);

+				

+			return creator;

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/WebResponse.cs b/mcs/class/System/System.Net/WebResponse.cs
new file mode 100644
index 00000000000..e3b2285e88f
--- /dev/null
+++ b/mcs/class/System/System.Net/WebResponse.cs
@@ -0,0 +1,69 @@
+//

+// System.Net.WebResponse

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.IO;

+using System.Runtime.Serialization;

+

+namespace System.Net 

+{

+	[Serializable]

+	public abstract class WebResponse : MarshalByRefObject, ISerializable, IDisposable

+	{

+		// Constructors

+		

+		protected WebResponse () { }

+		

+		protected WebResponse (SerializationInfo serializationInfo, StreamingContext streamingContext)

+		{

+			throw new NotSupportedException ();

+		}

+		

+		// Properties

+		

+		public virtual long ContentLength {		

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual string ContentType {		

+			get { throw new NotSupportedException (); }

+			set { throw new NotSupportedException (); }

+		}

+		

+		public virtual WebHeaderCollection Headers {		

+			get { throw new NotSupportedException (); }

+		}

+		

+		public virtual Uri ResponseUri {		

+			get { throw new NotSupportedException (); }

+		}		

+

+		// Methods

+		

+		public virtual void Close()

+		{

+			throw new NotSupportedException ();

+		}

+		

+		public virtual Stream GetResponseStream()

+		{

+			throw new NotSupportedException ();

+		}

+		

+		void IDisposable.Dispose()

+		{

+			Close ();

+		}

+		

+		void ISerializable.GetObjectData (SerializationInfo serializationInfo,

+		   				  StreamingContext streamingContext)

+		{

+			throw new NotSupportedException ();

+		}		

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/System/System.Net/WebStatus.cs b/mcs/class/System/System.Net/WebStatus.cs
new file mode 100755
index 00000000000..5ad5450a738
--- /dev/null
+++ b/mcs/class/System/System.Net/WebStatus.cs
@@ -0,0 +1,77 @@
+// WebStatus.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:37:37 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Net {
+
+
+	/// <summary>
+	/// </summary>
+	public enum WebStatus {
+
+		/// <summary>
+		/// </summary>
+		Success = 0,
+
+		/// <summary>
+		/// </summary>
+		NameResolutionFailure = 1,
+
+		/// <summary>
+		/// </summary>
+		ConnectFailure = 2,
+
+		/// <summary>
+		/// </summary>
+		ReceiveFailure = 3,
+
+		/// <summary>
+		/// </summary>
+		SendFailure = 4,
+
+		/// <summary>
+		/// </summary>
+		PipelineFailure = 5,
+
+		/// <summary>
+		/// </summary>
+		RequestCanceled = 6,
+
+		/// <summary>
+		/// </summary>
+		ProtocolError = 7,
+
+		/// <summary>
+		/// </summary>
+		ConnectionClosed = 8,
+
+		/// <summary>
+		/// </summary>
+		TrustFailure = 9,
+
+		/// <summary>
+		/// </summary>
+		SecureChannelFailure = 10,
+
+		/// <summary>
+		/// </summary>
+		ServerProtocolViolation = 11,
+
+		/// <summary>
+		/// </summary>
+		KeepAliveFailure = 12,
+
+		/// <summary>
+		/// </summary>
+		Pending = 13,
+	} // WebStatus
+
+} // System.Net
diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog b/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog
new file mode 100644
index 00000000000..c8684168dca
--- /dev/null
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/ChangeLog
@@ -0,0 +1,4 @@
+2002-05-12  Lawrence Pit <loz@cable.a2000.nl>

+

+	* X509CertificateCollection.cs: implemented

+

diff --git a/mcs/class/System/System.Security.Cryptography.X509Certificates/X509CertificateCollection.cs b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509CertificateCollection.cs
new file mode 100644
index 00000000000..82546c7a295
--- /dev/null
+++ b/mcs/class/System/System.Security.Cryptography.X509Certificates/X509CertificateCollection.cs
@@ -0,0 +1,146 @@
+//

+// System.Security.Cryptography.X509Certificates.X509CertificateCollection

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography.X509Certificates {

+

+	[Serializable]

+	public class X509CertificateCollection : CollectionBase, IEnumerable {

+		

+		private ArrayList list = new ArrayList ();

+		

+		// Constructors

+		

+		public X509CertificateCollection () { }

+		

+		public X509CertificateCollection (X509Certificate [] value) 

+		{

+			AddRange (value);

+		}

+		

+		public X509CertificateCollection (X509CertificateCollection value)

+		{

+			AddRange (value);

+		}

+		

+		// Properties

+		

+		public X509Certificate this [int index] {

+			get { return (X509Certificate) list [index]; }

+			set { list [index] = value; }

+		}

+		

+		// Methods

+

+		public void AddRange (X509Certificate [] value) 

+		{

+			if (value == null)

+				throw new ArgumentNullException ("value");

+			for (int i = 0; i < value.Length; i++) 

+				list.Add (value);

+		}

+		

+		public void AddRange (X509CertificateCollection value)

+		{

+			if (value == null)

+				throw new ArgumentNullException ("value");

+			int len = value.list.Count;

+			for (int i = 0; i < len; i++) 

+				this.list.Add (value);

+		}

+		

+		public bool Contains (X509Certificate value) 

+		{

+			return list.Contains (value);

+		}

+

+

+		public void CopyTo (X509Certificate [] array, int index)

+		{

+			list.CopyTo (array, index);

+		}

+		

+		public new X509CertificateEnumerator GetEnumerator()

+		{

+			return new X509CertificateEnumerator (this);

+		}

+		

+		IEnumerator IEnumerable.GetEnumerator()

+		{

+			return list.GetEnumerator ();

+		}

+		

+		public override int GetHashCode() 

+		{

+			return list.GetHashCode ();

+		}

+		

+		public int IndexOf (X509Certificate value)

+		{

+			return list.IndexOf (value);

+		}

+		

+		public void Insert (int index, X509Certificate value)

+		{

+			list.Insert (index, value);

+		}

+		

+		public void Remove (X509Certificate value)

+		{

+			list.Remove (value);

+		}

+

+		// Inner Class

+		

+		public class X509CertificateEnumerator : IEnumerator {

+			private IEnumerator enumerator;

+

+			// Constructors

+			

+			public X509CertificateEnumerator (X509CertificateCollection mappings)

+			{

+				enumerator = ((IEnumerable) mappings).GetEnumerator ();

+			}

+

+			// Properties

+			

+			public X509Certificate Current {

+				get { return (X509Certificate) enumerator.Current; }

+			}

+			

+			object IEnumerator.Current {

+				get { return (X509Certificate) enumerator.Current; }

+			}

+

+			// Methods

+			

+			bool IEnumerator.MoveNext ()

+			{

+				return enumerator.MoveNext ();

+			}

+			

+			void IEnumerator.Reset () 

+			{

+				enumerator.Reset ();

+			}

+			

+			public bool MoveNext () 

+			{

+				return enumerator.MoveNext ();

+			}

+			

+			public void Reset ()

+			{

+				enumerator.Reset ();

+			}

+		}		

+	}

+}

+

diff --git a/mcs/class/System/System.Security.Permissions/ResourcePermissionBase.cs b/mcs/class/System/System.Security.Permissions/ResourcePermissionBase.cs
new file mode 100755
index 00000000000..dade994b5cd
--- /dev/null
+++ b/mcs/class/System/System.Security.Permissions/ResourcePermissionBase.cs
@@ -0,0 +1,118 @@
+//
+// System.Security.Permissions.ResourcePermissionBase.cs
+//
+// Authors:
+//	Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions {
+
+	[Serializable]
+	public class ResourcePermissionBase 
+		: CodeAccessPermission, IUnrestrictedPermission {
+
+		[MonoTODO]
+		protected ResourcePermissionBase ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected ResourcePermissionBase (PermissionState state)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public const string Any = "any?";
+
+		[MonoTODO]
+		public const string Local = "local?";
+
+		[MonoTODO]
+		protected Type PermissionAccessType {
+			get {throw new NotImplementedException ();}
+			set {throw new NotImplementedException ();}
+		}
+
+		[MonoTODO]
+		protected string[] TagNames {
+			get {throw new NotImplementedException ();}
+			set {throw new NotImplementedException ();}
+		}
+
+		[MonoTODO]
+		protected void AddPermissionAccess (
+			ResourcePermissionBaseEntry entry)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected void Clear ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Copy ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void FromXml (SecurityElement securityElement)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected ResourcePermissionBaseEntry[] GetPermissionEntries ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Intersect (IPermission target)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsSubsetOf (IPermission target)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public bool IsUnrestricted ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		protected void RemovePermissionAccess (
+			ResourcePermissionBaseEntry entry)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override SecurityElement ToXml ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Union (IPermission target)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Security.Permissions/ResourcePermissionBaseEntry.cs b/mcs/class/System/System.Security.Permissions/ResourcePermissionBaseEntry.cs
new file mode 100755
index 00000000000..7bc09d5912f
--- /dev/null
+++ b/mcs/class/System/System.Security.Permissions/ResourcePermissionBaseEntry.cs
@@ -0,0 +1,42 @@
+//
+// System.Security.Permissions.ResourcePermissionBaseEntry.cs
+//
+// Authors:
+//	Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) 2002
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions {
+
+	[Serializable]
+	public class ResourcePermissionBaseEntry { 
+
+		private int permissionAccess;
+		private string[] permissionAccessPath;
+
+		public ResourcePermissionBaseEntry ()
+		{
+		}
+
+		public ResourcePermissionBaseEntry (int permissionAccess,
+			string[] permissionAccessPath)
+		{
+			if (permissionAccessPath == null)
+				throw new ArgumentNullException (
+					"permissionAccessPath");
+		}
+
+		public int PermissionAccess {
+			get {return permissionAccess;}
+		}
+
+		public string[] PermissionAccessPath {
+			get {return permissionAccessPath;}
+		}
+	}
+}
+
diff --git a/mcs/class/System/System.Text.RegularExpressions/ChangeLog b/mcs/class/System/System.Text.RegularExpressions/ChangeLog
new file mode 100644
index 00000000000..3c4b063cefc
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/ChangeLog
@@ -0,0 +1,46 @@
+2002-08-14  Cesar Octavio Lopez Nataren <cesar@ciencias.unam.mx>
+
+	* regex.cs: Added the ctr for ISerializable implementation and
+	implemented the GetObjectData function.
+
+2002-07-30  Juli Mallett  <jmallett@FreeBSD.org>
+
+	* regex.cs: Fixed bug where the expression would not be
+	re-evaluated for grouping purposes when factory caches were
+	used, resulting in no groups being recognised after one call
+	with a given pattern and no change in options.
+
+2002-05-13  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* regex.cs: Fixed bug in split.
+
+2002-05-08  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* interpreter.cs: Moved to an array-based stack representation
+	for faster captures.
+
+	* match.cs, collections.cs: Decoupled capture representation from
+	interpreter internals.
+
+	* cache.cs: Changed Key type from struct to class for speed.
+
+2002-04-06  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* cache.cs: Object methods should be overridden with "override".
+
+2002-04-04  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* RegexRunner.cs, RegexRunnerFactory.cs: MS support classes. Stubs
+	added for completeness.
+
+	* regex.cs, match.cs, collections.cs: Serializable attribute.
+
+2002-04-04  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* regex.cs: Added static Matches and IsMatch methods.
+
+2002-04-03  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* ChangeLog: Added changelog.
+
+	* cache.cs: Fixed bug in MRUList.Evict.
diff --git a/mcs/class/System/System.Text.RegularExpressions/RegexRunner.cs b/mcs/class/System/System.Text.RegularExpressions/RegexRunner.cs
new file mode 100644
index 00000000000..dfed1ad2479
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/RegexRunner.cs
@@ -0,0 +1,92 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	RegexRunner.cs

+//

+// author:	Dan Lewis (dihlewis@yahoo.co.uk)

+// 		(c) 2002

+

+using System;

+

+namespace System.Text.RegularExpressions {

+	

+	public abstract class RegexRunner {

+		// constructor

+	

+		protected internal RegexRunner () {

+			throw new NotImplementedException ("RegexRunner is not supported by Mono.");

+		}

+

+		// protected abstract

+

+		protected abstract bool FindFirstChar ();

+

+		protected abstract void Go ();

+

+		protected abstract void InitTrackCount ();

+

+		// protected methods

+

+		protected void Capture (int capnum, int start, int end) {

+		}

+

+		protected static bool CharInSet (char ch, string set, string category) {

+			return false;

+		}

+

+		protected void Crawl (int i) {

+		}

+

+		protected int CrawlPos () {

+			return 0;

+		}

+

+		protected void DoubleCrawl () {

+		}

+

+		protected void DoubleStack () {

+		}

+

+		protected void DoubleTrack () {

+		}

+

+		protected void EnsureStorage () {

+		}

+

+		protected bool IsBoundary (int index, int startpos, int endpos) {

+			return false;

+		}

+

+		protected bool IsECMABoundary (int index, int startpos, int endpos) {

+			return false;

+		}

+

+		protected bool IsMatched (int cap) {

+			return false;

+		}

+

+		protected int MatchIndex (int cap) {

+			return 0;

+		}

+

+		protected int MatchLength (int cap) {

+			return 0;

+		}

+

+		protected int PopCrawl () {

+			return 0;

+		}

+

+		protected void TransferCapture (int capnum, int uncapnum, int start, int end) {

+		}

+

+		protected void Uncapture () {

+		}

+

+		// internal

+		

+		protected internal Match Scan (Regex regex, string text, int textbeg, int textend, int textstart, int prevlen, bool quick) {

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/RegexRunnerFactory.cs b/mcs/class/System/System.Text.RegularExpressions/RegexRunnerFactory.cs
new file mode 100644
index 00000000000..895ff165607
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/RegexRunnerFactory.cs
@@ -0,0 +1,20 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	RegexRunnerFactory.cs

+//

+// author:	Dan Lewis (dihlewis@yahoo.co.uk)

+// 		(c) 2002

+

+using System;

+

+namespace System.Text.RegularExpressions {

+	

+	public abstract class RegexRunnerFactory {

+		protected RegexRunnerFactory () {

+			throw new NotImplementedException ("RegexRunnerFactory is not supported by Mono.");

+		}

+

+		protected internal abstract RegexRunner CreateInstance ();

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/arch.cs b/mcs/class/System/System.Text.RegularExpressions/arch.cs
new file mode 100644
index 00000000000..274d9add1a9
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/arch.cs
@@ -0,0 +1,333 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	arch.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+

+namespace System.Text.RegularExpressions {

+

+	enum OpCode : ushort {

+		False		= 0,	// always fails

+		True,			// always succeeds

+

+		// matching

+

+		Position,		// zero-width position assertion

+		String,			// match string literal

+		Reference,		// back reference

+

+		// character matching

+

+		Character,		// match character exactly

+		Category,		// match character from category

+		Range,			// match character from range

+		Set,			// match character from set

+		In,			// match character from group of tests

+

+		// capturing

+

+		Open,			// open group

+		Close,			// close group

+		Balance,		// balance groups

+

+		// control flow

+

+		IfDefined,		// conditional on capture

+		Sub,			// non-backtracking subexpression

+		Test,			// non-backtracking lookahead/behind

+		Branch,			// alternative expression

+		Jump,			// unconditional goto

+		Repeat,			// new repeat context

+		Until,			// repeat subexpression within context

+		FastRepeat,		// repeat simple subexpression

+		Anchor,			// anchoring expression

+

+		// miscellaneous

+		

+		Info			// pattern information

+	}

+

+	[Flags]

+	enum OpFlags : ushort {

+		None		= 0x000,

+		Negate		= 0x100,	// succeed on mismatch

+		IgnoreCase	= 0x200,	// case insensitive matching

+		RightToLeft	= 0x400,	// right-to-left matching

+		Lazy		= 0x800		// minimizing repeat

+	}

+

+	enum Position : ushort {

+		Any,			// anywhere

+		Start,			// start of string			\A

+		StartOfString,		// start of string			\A

+		StartOfLine,		// start of line			^

+		StartOfScan,		// start of scan			\G

+		End,			// end or before newline at end		\Z

+		EndOfString,		// end of string			\z

+		EndOfLine,		// end of line				$

+		Boundary,		// word boundary			\b

+		NonBoundary		// not word boundary			\B

+	};

+	

+	// see category.cs for Category enum

+

+	interface IMachine {

+		Match Scan (Regex regex, string text, int start, int end);

+	}

+

+	interface IMachineFactory {

+		IMachine NewInstance ();

+	}

+

+	// Anchor SKIP OFFSET

+	//

+	// Flags:	[RightToLeft] ??

+	// SKIP:	relative address of tail expression

+	// OFFSET:	offset of anchor from start of pattern

+	//

+	// Usage:

+	//

+	// 	Anchor :1 OFFSET

+	//		<expr>

+	//		True

+	// 1:	<tail>

+	//

+	// Notes:

+	//

+	// In practice, the anchoring expression is only going to be

+	// Position (StartOfString, StartOfLine, StartOfScan) or String.

+	// This is because the optimizer looks for position anchors at the

+	// start of the expression, and if that fails it looks for the

+	// longest substring. If an expression has neither a position

+	// anchor or a longest substring anchor, then the anchoring expression

+	// is left empty. Since an empty expression will anchor at any

+	// position in any string, the entire input string will be scanned.

+

+	// String LEN STR...

+	//

+	// Flags:	[RightToLeft, IgnoreCase]

+	// LEN:		length of string

+	// STR:		string characters

+

+	// Branch SKIP

+	//

+	// SKIP:	relative address of next branch

+	//

+	//	Branch :1

+	//		<alt expr 1>

+	//		Jump :4

+	// 1:	Branch :2

+	//		<alt expr 2>

+	//		Jump :4

+	// 2:	Branch :3

+	//		<alt expr 3>

+	//		Jump :4

+	// 3:	False

+	// 4:	<tail>

+

+	// Repeat SKIP MIN MAX

+	//

+	// Flags:	[Lazy]

+	// SKIP:	relative address of Until instruction

+	// MIN:		minimum iterations

+	// MAX:		maximum iterations (0xffff is infinity)

+	//

+	//	Repeat :1 MIN MAX

+	//		<expr>

+	//		Until

+	// 1:	<tail>

+

+	// FastRepeat SKIP MIN MAX

+	//

+	// Flags:	[Lazy]

+	// SKIP:	relative address of tail expression

+	// MIN:		minimum iterations

+	// MAX:		maximum iterations (0xffff is infinity)

+	//

+	//	FastRepeat :1 MIN MAX

+	//		<expr>

+	//		True

+	// 1:	<tail>

+	//

+	// Notes:

+	//

+	// The subexpression of a FastRepeat construct must not contain any

+	// complex operators. These include: Open, Close, Balance, Repeat,

+	// FastRepeat, Sub, Test. In addition, the subexpression must have

+	// been determined to have a fixed width.

+	

+	// Sub SKIP

+	//

+	// SKIP:	relative address of tail expression

+	//

+	//	Sub :1

+	//		<expr>

+	// 1:	<tail>

+	//

+	// Notes:

+	//

+	// The Sub operator invokes an independent subexpression. This means

+	// that the subexpression will match only once and so will not

+	// participate in any backtracking.

+

+	// Test TSKIP FSKIP

+	//

+	// TSKIP:	relative address of true expression

+	// FSKIP:	relative address of false expression

+	//

+	// Usage:	(?(?=test)true|false)

+	//

+	//	Test :1 :2

+	//		<test expr>

+	// 1:		<true expr>

+	//		Jump

+	// 2:		<false epxr>

+	//	<tail>

+	//

+	// Usage:	(?(?=test)true)

+	//

+	//	Test :1 :2

+	//		<test expr>

+	// 1:		<true expr>

+	// 2:	<tail>

+	//

+	// Usage:	(?=test)

+	//

+	//	Test :1 :2

+	//		<test expr>

+	// 1:		<true expr>

+	//		Jump 3:

+	// 2:		False

+	// 3:		<tail>

+	//

+	// Notes:

+	//

+	// For negative lookaheads, just swap the values of TSKIP and

+	// FSKIP. For lookbehinds, the test expression must be compiled

+	// in reverse. The test expression is always executed as an

+	// independent subexpression, so its behaviour is non-backtracking

+	// (like a Sub clause.)

+

+	// IfDefined SKIP GID

+	//

+	// SKIP:	relative address of else expression

+	// GID:		number of group to check

+	//

+	// Usage:	(?(gid)true)

+	//

+	//	IfDefined :1

+	//		<true expr>

+	// 1:	<tail>

+	//

+	// Usage:	(?(gid)true|false)

+	//

+	//	IfDefined :1

+	//		<true expr>

+	//		Jump :2

+	// 1:		<false expr>

+	// 2:	<tail>

+

+	// Jump SKIP

+	//

+	// SKIP:	relative address of target expression

+	//

+	//	Jump :1

+	//	...

+	// :1	<target expr>

+

+	// Character CHAR

+	//

+	// Flags:	[Negate, IgnoreCase, RightToLeft]

+	// CHAR:	exact character to match

+

+	// Category CAT

+	//

+	// Flags:	[Negate, RightToLeft]

+	// CAT:		category to match (see Category enum)

+

+	// Range LO HI

+	//

+	// Flags:	[Negate, IgnoreCase, RightToLeft]

+	// LO:		lowest character in range

+	// HI:		higest character in range

+

+	// Set LO LEN SET...

+	//

+	// Flags:	[Negate, IgnoreCase, RightToLeft]

+	// LO:		lowest character in set

+	// LEN:		number of words in set

+	// SET:		bit array representing characters in set

+	//

+	// Notes:

+	//

+	// Each word in the set represents 16 characters, so the first word

+	// defines membership for characters LO to LO + 15, the second for

+	// LO + 16 to LO + 31, and so on up to LO + (LEN * 16 - 1). It is

+	// up to the compiler to provide a compact representation for sparse

+	// unicode sets. The simple way is to use Set 0 4096. Other methods

+	// involve paritioning the set and placing the components into an

+	// In block.

+

+	// In SKIP

+	//

+	// SKIP:	relative address of tail expression

+	//

+	// Usage:	[expr]

+	//

+	//	In :1

+	//		<expr>

+	//		True

+	// :1	<tail>

+	//

+	// Usage:	[^expr]

+	//

+	//	In :1

+	//		<expr>

+	//		False

+	// :1	<tail>

+	//

+	// Notes:

+	//

+	// The In instruction consumes a single character, using the flags

+	// of the first instruction in the subexpression to determine its

+	// IgnoreCase and RightToLeft properties. The subexpression is then

+	// applied to the single character as a disjunction. If any instruction

+	// in the subexpression succeeds, the entire In construct succeeds

+	// and matching continues with the tail.

+

+	// Position POS

+	//

+	// POS:		position to match (see Position enum)

+

+	// Open GID

+	//

+	// GID:		number of group to open

+

+	// Close GID

+	//

+	// GID:		number of group to close

+	

+	// Balance GID BAL

+	//

+	// GID:		number of capturing group (0 if none)

+	// BAL:		number of group to undefine

+

+	// Info GROUPS MIN MAX

+	//

+	// GROUPS:	number of capturing groups

+	// MIN:		minimum width of pattern

+	// MAX:		maximum width of pattern (0xffff means undefined)

+

+	// False

+

+	// True

+

+	// Reference GID

+	//

+	// Flags:	[IgnoreCase, RightToLeft]

+	// GID:		number of group to reference

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/cache.cs b/mcs/class/System/System.Text.RegularExpressions/cache.cs
new file mode 100644
index 00000000000..b77278fee80
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/cache.cs
@@ -0,0 +1,143 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	cache.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Collections;

+

+namespace System.Text.RegularExpressions {

+

+	class FactoryCache {

+		public FactoryCache (int capacity) {

+			this.capacity = capacity;

+			this.factories = new Hashtable (capacity);

+			this.mru_list = new MRUList ();

+		}

+

+		public void Add (string pattern, RegexOptions options, IMachineFactory factory) {

+			lock (this) {

+				Key k = new Key (pattern, options);

+

+				while (factories.Count >= capacity) {

+					object victim = mru_list.Evict ();

+					if (victim != null)

+						factories.Remove ((Key)victim);

+				}

+				

+				factories[k] = factory;

+				mru_list.Use (k);

+			}

+		}

+

+		public IMachineFactory Lookup (string pattern, RegexOptions options) {

+			lock (this) {

+				Key k = new Key (pattern, options);

+				if (factories.Contains (k)) {

+					mru_list.Use (k);

+					return (IMachineFactory)factories[k];

+				}

+			}

+

+			return null;

+		}

+

+		private int capacity;

+		private Hashtable factories;

+		private MRUList mru_list;

+

+		class Key {

+			public string pattern;

+			public RegexOptions options;

+

+			public Key (string pattern, RegexOptions options) {

+				this.pattern = pattern;

+				this.options = options;

+			}

+			

+			public override int GetHashCode () {

+				return pattern.GetHashCode () ^ (int)options;

+			}

+

+			public override bool Equals (object o) {

+				if (o == null || !(o is Key))

+					return false;

+

+				Key k = (Key)o;

+				return options == k.options && pattern.Equals (k.pattern);

+			}

+

+			public override string ToString () {

+				return "('" + pattern + "', [" + options + "])";

+			}

+		}

+	}

+

+	class MRUList {

+		public MRUList () {

+			head = tail = null;

+		}

+

+		public void Use (object o) {

+			Node node;

+

+			if (head == null) {

+				node = new Node (o);

+				head = tail = node;

+				return;

+			}

+

+			node = head;

+			while (node != null && !o.Equals (node.value))

+				node = node.previous;

+

+			if (node == null)

+				node = new Node (o);

+			else {

+				if (node == head)

+					return;

+

+				if (node == tail)

+					tail = node.next;

+				else

+					node.previous.next = node.next;

+

+				node.next.previous = node.previous;

+			}

+

+			head.next = node;

+			node.previous = head;

+			node.next = null;

+			head = node;

+		}

+

+		public object Evict () {

+			if (tail == null)

+				return null;

+

+			object o = tail.value;

+			tail = tail.next;

+

+			if (tail == null)

+				head = null;

+			else

+				tail.previous = null;

+

+			return o;

+		}

+

+		private Node head, tail;

+

+		private class Node {

+			public object value;

+			public Node previous, next;

+

+			public Node (object value) {

+				this.value = value;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/category.cs b/mcs/class/System/System.Text.RegularExpressions/category.cs
new file mode 100644
index 00000000000..763712cb581
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/category.cs
@@ -0,0 +1,637 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	category.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Globalization;

+

+namespace System.Text.RegularExpressions {

+

+	enum Category : ushort {

+		None,

+

+		// canonical classes

+	

+		Any,			// any character except newline		.

+		AnySingleline,		// any character			. (s option)

+		Word,			// any word character			\w

+		Digit,			// any digit character			\d

+		WhiteSpace,		// any whitespace character		\s

+		

+		// ECMAScript classes

+

+

+		EcmaAny,

+		EcmaAnySingleline,

+		EcmaWord,		// [a-zA-Z_0-9]

+		EcmaDigit,		// [0-9]

+		EcmaWhiteSpace,		// [ \f\n\r\t\v]

+

+		// unicode categories

+		

+		UnicodeL,		// Letter

+		UnicodeM,		// Mark

+		UnicodeN,		// Number

+		UnicodeZ,		// Separator

+		UnicodeP,		// Punctuation

+		UnicodeS,		// Symbol

+		UnicodeC,		// Other

+

+		UnicodeLu,		// UppercaseLetter

+		UnicodeLl,		// LowercaseLetter

+		UnicodeLt,		// TitlecaseLetter

+		UnicodeLm,		// ModifierLetter

+		UnicodeLo,		// OtherLetter

+		UnicodeMn,		// NonspacingMark

+		UnicodeMe,		// EnclosingMark

+		UnicodeMc,		// SpacingMark

+		UnicodeNd,		// DecimalNumber

+		UnicodeNl,		// LetterNumber

+		UnicodeNo,		// OtherNumber

+		UnicodeZs,		// SpaceSeparator

+		UnicodeZl,		// LineSeparator

+		UnicodeZp,		// ParagraphSeparator

+		UnicodePd,		// DashPunctuation

+		UnicodePs,		// OpenPunctuation

+		UnicodePi,		// InitialPunctuation

+		UnicodePe,		// ClosePunctuation

+		UnicodePf,		// FinalPunctuation

+		UnicodePc,		// ConnectorPunctuation

+		UnicodePo,		// OtherPunctuation

+		UnicodeSm,		// MathSymbol

+		UnicodeSc,		// CurrencySymbol

+		UnicodeSk,		// ModifierSymbol

+		UnicodeSo,		// OtherSymbol

+		UnicodeCc,		// Control

+		UnicodeCf,		// Format

+		UnicodeCo,		// PrivateUse

+		UnicodeCs,		// Surrogate

+		UnicodeCn,		// Unassigned

+

+		// unicode block ranges

+

+		// notes: the categories marked with a star are valid unicode block ranges,

+		// but don't seem to be accepted by the MS parser using the /p{...} format.

+		// any ideas?

+

+		UnicodeBasicLatin,

+		UnicodeLatin1Supplement,			// *

+		UnicodeLatinExtendedA,				// *

+		UnicodeLatinExtendedB,				// *

+		UnicodeIPAExtensions,

+		UnicodeSpacingModifierLetters,

+		UnicodeCombiningDiacriticalMarks,

+		UnicodeGreek,

+		UnicodeCyrillic,

+		UnicodeArmenian,

+		UnicodeHebrew,

+		UnicodeArabic,

+		UnicodeSyriac,

+		UnicodeThaana,

+		UnicodeDevanagari,

+		UnicodeBengali,

+		UnicodeGurmukhi,

+		UnicodeGujarati,

+		UnicodeOriya,

+		UnicodeTamil,

+		UnicodeTelugu,

+		UnicodeKannada,

+		UnicodeMalayalam,

+		UnicodeSinhala,

+		UnicodeThai,

+		UnicodeLao,

+		UnicodeTibetan,

+		UnicodeMyanmar,

+		UnicodeGeorgian,

+		UnicodeHangulJamo,

+		UnicodeEthiopic,

+		UnicodeCherokee,

+		UnicodeUnifiedCanadianAboriginalSyllabics,

+		UnicodeOgham,

+		UnicodeRunic,

+		UnicodeKhmer,

+		UnicodeMongolian,

+		UnicodeLatinExtendedAdditional,

+		UnicodeGreekExtended,

+		UnicodeGeneralPunctuation,

+		UnicodeSuperscriptsandSubscripts,

+		UnicodeCurrencySymbols,

+		UnicodeCombiningMarksforSymbols,

+		UnicodeLetterlikeSymbols,

+		UnicodeNumberForms,

+		UnicodeArrows,

+		UnicodeMathematicalOperators,

+		UnicodeMiscellaneousTechnical,

+		UnicodeControlPictures,

+		UnicodeOpticalCharacterRecognition,

+		UnicodeEnclosedAlphanumerics,

+		UnicodeBoxDrawing,

+		UnicodeBlockElements,

+		UnicodeGeometricShapes,

+		UnicodeMiscellaneousSymbols,

+		UnicodeDingbats,

+		UnicodeBraillePatterns,

+		UnicodeCJKRadicalsSupplement,

+		UnicodeKangxiRadicals,

+		UnicodeIdeographicDescriptionCharacters,

+		UnicodeCJKSymbolsandPunctuation,

+		UnicodeHiragana,

+		UnicodeKatakana,

+		UnicodeBopomofo,

+		UnicodeHangulCompatibilityJamo,

+		UnicodeKanbun,

+		UnicodeBopomofoExtended,

+		UnicodeEnclosedCJKLettersandMonths,

+		UnicodeCJKCompatibility,

+		UnicodeCJKUnifiedIdeographsExtensionA,

+		UnicodeCJKUnifiedIdeographs,

+		UnicodeYiSyllables,

+		UnicodeYiRadicals,

+		UnicodeHangulSyllables,

+		UnicodeHighSurrogates,

+		UnicodeHighPrivateUseSurrogates,

+		UnicodeLowSurrogates,

+		UnicodePrivateUse,

+		UnicodeCJKCompatibilityIdeographs,

+		UnicodeAlphabeticPresentationForms,

+		UnicodeArabicPresentationFormsA,		// *

+		UnicodeCombiningHalfMarks,

+		UnicodeCJKCompatibilityForms,

+		UnicodeSmallFormVariants,

+		UnicodeArabicPresentationFormsB,		// *

+		UnicodeSpecials,

+		UnicodeHalfwidthandFullwidthForms,

+		

+		UnicodeOldItalic,

+		UnicodeGothic,

+		UnicodeDeseret,

+		UnicodeByzantineMusicalSymbols,

+		UnicodeMusicalSymbols,

+		UnicodeMathematicalAlphanumericSymbols,

+		UnicodeCJKUnifiedIdeographsExtensionB,

+		UnicodeCJKCompatibilityIdeographsSupplement,

+		UnicodeTags

+	}

+

+	class CategoryUtils {

+		public static Category CategoryFromName (string name) {

+			try {

+				if (name.Substring (0, 2).Equals ("Is"))	// remove prefix from block range

+					name = name.Substring (2);

+

+				return (Category)Enum.Parse (typeof (Category), "Unicode" + name);

+			}

+			catch (ArgumentException) {

+				return Category.None;

+			}

+		}

+	

+		public static bool IsCategory (Category cat, char c) {

+			switch (cat) {

+			case Category.None:

+				return false;

+			

+			case Category.Any:

+				return c != '\n';

+

+			case Category.AnySingleline:

+				return true;

+

+			case Category.Word:

+				return

+					Char.IsLetterOrDigit (c) ||

+					IsCategory (UnicodeCategory.ConnectorPunctuation, c);

+

+			case Category.Digit:

+				return Char.IsDigit (c);

+

+			case Category.WhiteSpace:

+				return Char.IsWhiteSpace (c);

+

+			// ECMA categories

+

+			case Category.EcmaAny:

+				return c != '\n';

+				

+			case Category.EcmaAnySingleline:

+				return true;

+

+			case Category.EcmaWord:

+				return

+					'a' <= c && c <= 'z' ||

+					'A' <= c && c <= 'Z' ||

+					'0' <= c && c <= '9' ||

+					'_' == c;

+

+			case Category.EcmaDigit:

+				return

+					'0' <= c && c <= 9;

+			

+			case Category.EcmaWhiteSpace:

+				return

+					c == ' '  ||

+					c == '\f' ||

+					c == '\n' ||

+					c == '\r' ||

+					c == '\t' ||

+					c == '\v';

+

+			// Unicode categories...

+

+			// letter

+			

+			case Category.UnicodeLu: return IsCategory (UnicodeCategory.UppercaseLetter, c);

+			case Category.UnicodeLl: return IsCategory (UnicodeCategory.LowercaseLetter, c);

+			case Category.UnicodeLt: return IsCategory (UnicodeCategory.TitlecaseLetter, c);

+			case Category.UnicodeLm: return IsCategory (UnicodeCategory.ModifierLetter, c);

+			case Category.UnicodeLo: return IsCategory (UnicodeCategory.OtherLetter, c);

+

+			// mark

+

+			case Category.UnicodeMn: return IsCategory (UnicodeCategory.NonSpacingMark, c);

+			case Category.UnicodeMe: return IsCategory (UnicodeCategory.EnclosingMark, c);

+			case Category.UnicodeMc: return IsCategory (UnicodeCategory.SpacingCombiningMark, c);

+			case Category.UnicodeNd: return IsCategory (UnicodeCategory.DecimalDigitNumber, c);

+

+			// number

+

+			case Category.UnicodeNl: return IsCategory (UnicodeCategory.LetterNumber, c);

+			case Category.UnicodeNo: return IsCategory (UnicodeCategory.OtherNumber, c);

+

+			// separator

+

+			case Category.UnicodeZs: return IsCategory (UnicodeCategory.SpaceSeparator, c);

+			case Category.UnicodeZl: return IsCategory (UnicodeCategory.LineSeparator, c);

+			case Category.UnicodeZp: return IsCategory (UnicodeCategory.ParagraphSeparator, c);

+

+			// punctuation

+

+			case Category.UnicodePd: return IsCategory (UnicodeCategory.DashPunctuation, c);

+			case Category.UnicodePs: return IsCategory (UnicodeCategory.OpenPunctuation, c);

+			case Category.UnicodePi: return IsCategory (UnicodeCategory.InitialQuotePunctuation, c);

+			case Category.UnicodePe: return IsCategory (UnicodeCategory.ClosePunctuation, c);

+			case Category.UnicodePf: return IsCategory (UnicodeCategory.FinalQuotePunctuation, c);

+			case Category.UnicodePc: return IsCategory (UnicodeCategory.ConnectorPunctuation, c);

+			case Category.UnicodePo: return IsCategory (UnicodeCategory.OtherPunctuation, c);

+

+			// symbol

+

+			case Category.UnicodeSm: return IsCategory (UnicodeCategory.MathSymbol, c);

+			case Category.UnicodeSc: return IsCategory (UnicodeCategory.CurrencySymbol, c);

+			case Category.UnicodeSk: return IsCategory (UnicodeCategory.ModifierSymbol, c);

+			case Category.UnicodeSo: return IsCategory (UnicodeCategory.OtherSymbol, c);

+

+			// other

+

+			case Category.UnicodeCc: return IsCategory (UnicodeCategory.Control, c);

+			case Category.UnicodeCf: return IsCategory (UnicodeCategory.Format, c);

+			case Category.UnicodeCo: return IsCategory (UnicodeCategory.PrivateUse, c);

+			case Category.UnicodeCs: return IsCategory (UnicodeCategory.Surrogate, c);

+			case Category.UnicodeCn: return IsCategory (UnicodeCategory.OtherNotAssigned, c); 

+

+			case Category.UnicodeL:	// letter

+				return

+					IsCategory (UnicodeCategory.UppercaseLetter, c) ||

+					IsCategory (UnicodeCategory.LowercaseLetter, c) ||

+					IsCategory (UnicodeCategory.TitlecaseLetter, c) ||

+					IsCategory (UnicodeCategory.ModifierLetter, c) ||

+					IsCategory (UnicodeCategory.OtherLetter, c);

+			

+			case Category.UnicodeM:	// mark

+				return

+					IsCategory (UnicodeCategory.NonSpacingMark, c) ||

+					IsCategory (UnicodeCategory.EnclosingMark, c) ||

+					IsCategory (UnicodeCategory.SpacingCombiningMark, c);

+

+			case Category.UnicodeN:	// number

+				return

+					IsCategory (UnicodeCategory.DecimalDigitNumber, c) ||

+					IsCategory (UnicodeCategory.LetterNumber, c) ||

+					IsCategory (UnicodeCategory.OtherNumber, c);

+

+			case Category.UnicodeZ:	// separator

+				return

+					IsCategory (UnicodeCategory.SpaceSeparator, c) ||

+					IsCategory (UnicodeCategory.LineSeparator, c) ||

+					IsCategory (UnicodeCategory.ParagraphSeparator, c);

+					

+			case Category.UnicodeP:	// punctuation

+				return

+					IsCategory (UnicodeCategory.DashPunctuation, c) ||

+					IsCategory (UnicodeCategory.OpenPunctuation, c) ||

+					IsCategory (UnicodeCategory.InitialQuotePunctuation, c) ||

+					IsCategory (UnicodeCategory.ClosePunctuation, c) ||

+					IsCategory (UnicodeCategory.FinalQuotePunctuation, c) ||

+					IsCategory (UnicodeCategory.ConnectorPunctuation, c) ||

+					IsCategory (UnicodeCategory.OtherPunctuation, c);

+			

+			case Category.UnicodeS:	// symbol

+				return

+					IsCategory (UnicodeCategory.MathSymbol, c) ||

+					IsCategory (UnicodeCategory.CurrencySymbol, c) ||

+					IsCategory (UnicodeCategory.ModifierSymbol, c) ||

+					IsCategory (UnicodeCategory.OtherSymbol, c);

+			

+			case Category.UnicodeC:	// other

+				return

+					IsCategory (UnicodeCategory.Control, c) ||

+					IsCategory (UnicodeCategory.Format, c) ||

+					IsCategory (UnicodeCategory.PrivateUse, c) ||

+					IsCategory (UnicodeCategory.Surrogate, c) ||

+					IsCategory (UnicodeCategory.OtherNotAssigned, c);

+

+			// Unicode block ranges...

+

+			case Category.UnicodeBasicLatin:

+				return '\u0000' <= c && c <= '\u007F';

+

+			case Category.UnicodeLatin1Supplement:

+				return '\u0080' <= c && c <= '\u00FF';

+

+			case Category.UnicodeLatinExtendedA:

+				return '\u0100' <= c && c <= '\u017F';

+

+			case Category.UnicodeLatinExtendedB:

+				return '\u0180' <= c && c <= '\u024F';

+

+			case Category.UnicodeIPAExtensions:

+				return '\u0250' <= c && c <= '\u02AF';

+

+			case Category.UnicodeSpacingModifierLetters:

+				return '\u02B0' <= c && c <= '\u02FF';

+

+			case Category.UnicodeCombiningDiacriticalMarks:

+				return '\u0300' <= c && c <= '\u036F';

+

+			case Category.UnicodeGreek:

+				return '\u0370' <= c && c <= '\u03FF';

+

+			case Category.UnicodeCyrillic:

+				return '\u0400' <= c && c <= '\u04FF';

+

+			case Category.UnicodeArmenian:

+				return '\u0530' <= c && c <= '\u058F';

+

+			case Category.UnicodeHebrew:

+				return '\u0590' <= c && c <= '\u05FF';

+

+			case Category.UnicodeArabic:

+				return '\u0600' <= c && c <= '\u06FF';

+

+			case Category.UnicodeSyriac:

+				return '\u0700' <= c && c <= '\u074F';

+

+			case Category.UnicodeThaana:

+				return '\u0780' <= c && c <= '\u07BF';

+

+			case Category.UnicodeDevanagari:

+				return '\u0900' <= c && c <= '\u097F';

+

+			case Category.UnicodeBengali:

+				return '\u0980' <= c && c <= '\u09FF';

+

+			case Category.UnicodeGurmukhi:

+				return '\u0A00' <= c && c <= '\u0A7F';

+

+			case Category.UnicodeGujarati:

+				return '\u0A80' <= c && c <= '\u0AFF';

+

+			case Category.UnicodeOriya:

+				return '\u0B00' <= c && c <= '\u0B7F';

+

+			case Category.UnicodeTamil:

+				return '\u0B80' <= c && c <= '\u0BFF';

+

+			case Category.UnicodeTelugu:

+				return '\u0C00' <= c && c <= '\u0C7F';

+

+			case Category.UnicodeKannada:

+				return '\u0C80' <= c && c <= '\u0CFF';

+

+			case Category.UnicodeMalayalam:

+				return '\u0D00' <= c && c <= '\u0D7F';

+

+			case Category.UnicodeSinhala:

+				return '\u0D80' <= c && c <= '\u0DFF';

+

+			case Category.UnicodeThai:

+				return '\u0E00' <= c && c <= '\u0E7F';

+

+			case Category.UnicodeLao:

+				return '\u0E80' <= c && c <= '\u0EFF';

+

+			case Category.UnicodeTibetan:

+				return '\u0F00' <= c && c <= '\u0FFF';

+

+			case Category.UnicodeMyanmar:

+				return '\u1000' <= c && c <= '\u109F';

+

+			case Category.UnicodeGeorgian:

+				return '\u10A0' <= c && c <= '\u10FF';

+

+			case Category.UnicodeHangulJamo:

+				return '\u1100' <= c && c <= '\u11FF';

+

+			case Category.UnicodeEthiopic:

+				return '\u1200' <= c && c <= '\u137F';

+

+			case Category.UnicodeCherokee:

+				return '\u13A0' <= c && c <= '\u13FF';

+

+			case Category.UnicodeUnifiedCanadianAboriginalSyllabics:

+				return '\u1400' <= c && c <= '\u167F';

+

+			case Category.UnicodeOgham:

+				return '\u1680' <= c && c <= '\u169F';

+

+			case Category.UnicodeRunic:

+				return '\u16A0' <= c && c <= '\u16FF';

+

+			case Category.UnicodeKhmer:

+				return '\u1780' <= c && c <= '\u17FF';

+

+			case Category.UnicodeMongolian:

+				return '\u1800' <= c && c <= '\u18AF';

+

+			case Category.UnicodeLatinExtendedAdditional:

+				return '\u1E00' <= c && c <= '\u1EFF';

+

+			case Category.UnicodeGreekExtended:

+				return '\u1F00' <= c && c <= '\u1FFF';

+

+			case Category.UnicodeGeneralPunctuation:

+				return '\u2000' <= c && c <= '\u206F';

+

+			case Category.UnicodeSuperscriptsandSubscripts:

+				return '\u2070' <= c && c <= '\u209F';

+

+			case Category.UnicodeCurrencySymbols:

+				return '\u20A0' <= c && c <= '\u20CF';

+

+			case Category.UnicodeCombiningMarksforSymbols:

+				return '\u20D0' <= c && c <= '\u20FF';

+

+			case Category.UnicodeLetterlikeSymbols:

+				return '\u2100' <= c && c <= '\u214F';

+

+			case Category.UnicodeNumberForms:

+				return '\u2150' <= c && c <= '\u218F';

+

+			case Category.UnicodeArrows:

+				return '\u2190' <= c && c <= '\u21FF';

+

+			case Category.UnicodeMathematicalOperators:

+				return '\u2200' <= c && c <= '\u22FF';

+

+			case Category.UnicodeMiscellaneousTechnical:

+				return '\u2300' <= c && c <= '\u23FF';

+

+			case Category.UnicodeControlPictures:

+				return '\u2400' <= c && c <= '\u243F';

+

+			case Category.UnicodeOpticalCharacterRecognition:

+				return '\u2440' <= c && c <= '\u245F';

+

+			case Category.UnicodeEnclosedAlphanumerics:

+				return '\u2460' <= c && c <= '\u24FF';

+

+			case Category.UnicodeBoxDrawing:

+				return '\u2500' <= c && c <= '\u257F';

+

+			case Category.UnicodeBlockElements:

+				return '\u2580' <= c && c <= '\u259F';

+

+			case Category.UnicodeGeometricShapes:

+				return '\u25A0' <= c && c <= '\u25FF';

+

+			case Category.UnicodeMiscellaneousSymbols:

+				return '\u2600' <= c && c <= '\u26FF';

+

+			case Category.UnicodeDingbats:

+				return '\u2700' <= c && c <= '\u27BF';

+

+			case Category.UnicodeBraillePatterns:

+				return '\u2800' <= c && c <= '\u28FF';

+

+			case Category.UnicodeCJKRadicalsSupplement:

+				return '\u2E80' <= c && c <= '\u2EFF';

+

+			case Category.UnicodeKangxiRadicals:

+				return '\u2F00' <= c && c <= '\u2FDF';

+

+			case Category.UnicodeIdeographicDescriptionCharacters:

+				return '\u2FF0' <= c && c <= '\u2FFF';

+

+			case Category.UnicodeCJKSymbolsandPunctuation:

+				return '\u3000' <= c && c <= '\u303F';

+

+			case Category.UnicodeHiragana:

+				return '\u3040' <= c && c <= '\u309F';

+

+			case Category.UnicodeKatakana:

+				return '\u30A0' <= c && c <= '\u30FF';

+

+			case Category.UnicodeBopomofo:

+				return '\u3100' <= c && c <= '\u312F';

+

+			case Category.UnicodeHangulCompatibilityJamo:

+				return '\u3130' <= c && c <= '\u318F';

+

+			case Category.UnicodeKanbun:

+				return '\u3190' <= c && c <= '\u319F';

+

+			case Category.UnicodeBopomofoExtended:

+				return '\u31A0' <= c && c <= '\u31BF';

+

+			case Category.UnicodeEnclosedCJKLettersandMonths:

+				return '\u3200' <= c && c <= '\u32FF';

+

+			case Category.UnicodeCJKCompatibility:

+				return '\u3300' <= c && c <= '\u33FF';

+

+			case Category.UnicodeCJKUnifiedIdeographsExtensionA:

+				return '\u3400' <= c && c <= '\u4DB5';

+

+			case Category.UnicodeCJKUnifiedIdeographs:

+				return '\u4E00' <= c && c <= '\u9FFF';

+

+			case Category.UnicodeYiSyllables:

+				return '\uA000' <= c && c <= '\uA48F';

+

+			case Category.UnicodeYiRadicals:

+				return '\uA490' <= c && c <= '\uA4CF';

+

+			case Category.UnicodeHangulSyllables:

+				return '\uAC00' <= c && c <= '\uD7A3';

+

+			case Category.UnicodeHighSurrogates:

+				return '\uD800' <= c && c <= '\uDB7F';

+

+			case Category.UnicodeHighPrivateUseSurrogates:

+				return '\uDB80' <= c && c <= '\uDBFF';

+

+			case Category.UnicodeLowSurrogates:

+				return '\uDC00' <= c && c <= '\uDFFF';

+

+			case Category.UnicodePrivateUse:

+				return '\uE000' <= c && c <= '\uF8FF';

+

+			case Category.UnicodeCJKCompatibilityIdeographs:

+				return '\uF900' <= c && c <= '\uFAFF';

+

+			case Category.UnicodeAlphabeticPresentationForms:

+				return '\uFB00' <= c && c <= '\uFB4F';

+

+			case Category.UnicodeArabicPresentationFormsA:

+				return '\uFB50' <= c && c <= '\uFDFF';

+

+			case Category.UnicodeCombiningHalfMarks:

+				return '\uFE20' <= c && c <= '\uFE2F';

+

+			case Category.UnicodeCJKCompatibilityForms:

+				return '\uFE30' <= c && c <= '\uFE4F';

+

+			case Category.UnicodeSmallFormVariants:

+				return '\uFE50' <= c && c <= '\uFE6F';

+

+			case Category.UnicodeArabicPresentationFormsB:

+				return '\uFE70' <= c && c <= '\uFEFE';

+

+			case Category.UnicodeHalfwidthandFullwidthForms:

+				return '\uFF00' <= c && c <= '\uFFEF';

+

+			case Category.UnicodeSpecials:

+				return

+					'\uFEFF' <= c && c <= '\uFEFF' ||

+					'\uFFF0' <= c && c <= '\uFFFD';

+

+			// these block ranges begin above 0x10000

+

+			case Category.UnicodeOldItalic:

+			case Category.UnicodeGothic:

+			case Category.UnicodeDeseret:

+			case Category.UnicodeByzantineMusicalSymbols:

+			case Category.UnicodeMusicalSymbols:

+			case Category.UnicodeMathematicalAlphanumericSymbols:

+			case Category.UnicodeCJKUnifiedIdeographsExtensionB:

+			case Category.UnicodeCJKCompatibilityIdeographsSupplement:

+			case Category.UnicodeTags:

+				return false;

+

+			default:

+				return false;

+			}

+		}

+

+		private static bool IsCategory (UnicodeCategory uc, char c) {

+			if (Char.GetUnicodeCategory (c) == uc)

+				return true;

+

+			return false;

+		}

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/collections.cs b/mcs/class/System/System.Text.RegularExpressions/collections.cs
new file mode 100644
index 00000000000..a56d27effa2
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/collections.cs
@@ -0,0 +1,123 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	collections.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Collections;

+

+namespace System.Text.RegularExpressions {

+	public abstract class RegexCollectionBase : ICollection, IEnumerable {

+		public int Count {

+			get { return list.Count; }

+		}

+

+		public bool IsReadOnly {

+			get { return true; }	// FIXME

+		}

+

+		public bool IsSynchronized {

+			get { return false; }	// FIXME

+		}

+

+		public object SyncRoot {

+			get { return list; }	// FIXME

+		}

+

+		public void CopyTo (Array array, int index) {

+			foreach (Object o in list) {

+				if (index > array.Length)

+					break;

+				

+				array.SetValue (o, index ++);

+			}

+		}

+

+		public IEnumerator GetEnumerator () {

+			return new Enumerator (list);

+		}

+

+		// internal methods

+

+		internal RegexCollectionBase () {

+			list = new ArrayList ();

+		}

+

+		internal void Add (Object o) {

+			list.Add (o);

+		}

+

+		internal void Reverse () {

+			list.Reverse ();

+		}

+

+		// IEnumerator implementation

+

+		private class Enumerator : IEnumerator {

+			public Enumerator (IList list) {

+				this.list = list;

+				Reset ();

+			}

+

+			public object Current {

+				get {

+					if (ptr >= list.Count)

+						throw new InvalidOperationException ();

+

+					return list[ptr];

+				}

+			}

+

+			public bool MoveNext () {

+				if (ptr > list.Count)

+					throw new InvalidOperationException ();

+				

+				return ++ ptr < list.Count;

+			}

+

+			public void Reset () {

+				ptr = -1;

+			}

+

+			private IList list;

+			private int ptr;

+		}

+

+		// protected fields

+

+		protected ArrayList list;

+	}

+

+	[Serializable]

+	public class CaptureCollection : RegexCollectionBase, ICollection, IEnumerable {

+		public Capture this[int i] {

+			get { return (Capture)list[i]; }

+		}

+

+		internal CaptureCollection () {

+		}

+	}

+

+	[Serializable]

+	public class GroupCollection : RegexCollectionBase, ICollection, IEnumerable {

+		public Group this[int i] {

+			get { return (Group)list[i]; }

+		}

+		

+		internal GroupCollection () {

+		}

+	}

+

+	[Serializable]

+	public class MatchCollection : RegexCollectionBase, ICollection, IEnumerable {

+		public virtual Match this[int i] {

+			get { return (Match)list[i]; }

+		}

+

+		internal MatchCollection () {

+		}

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/compiler.cs b/mcs/class/System/System.Text.RegularExpressions/compiler.cs
new file mode 100644
index 00000000000..82fb8cfbb73
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/compiler.cs
@@ -0,0 +1,368 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	compiler.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Collections;

+

+namespace System.Text.RegularExpressions {

+	abstract class LinkRef {

+		// empty

+	}

+		

+	interface ICompiler {

+		void Reset ();

+		IMachineFactory GetMachineFactory ();

+

+		// instruction emission

+

+		void EmitFalse ();

+		void EmitTrue ();

+

+		// character matching

+

+		void EmitCharacter (char c, bool negate, bool ignore, bool reverse);

+		void EmitCategory (Category cat, bool negate, bool reverse);

+		void EmitRange (char lo, char hi, bool negate, bool ignore, bool reverse);

+		void EmitSet (char lo, BitArray set, bool negate, bool ignore, bool reverse);

+

+		// other operators

+

+		void EmitString (string str, bool ignore, bool reverse);

+		void EmitPosition (Position pos);

+		void EmitOpen (int gid);

+		void EmitClose (int gid);

+		void EmitBalance (int gid, int balance);

+		void EmitReference (int gid, bool ignore, bool reverse);

+

+		// constructs

+

+		void EmitIfDefined (int gid, LinkRef tail);

+		void EmitSub (LinkRef tail);

+		void EmitTest (LinkRef yes, LinkRef tail);

+		void EmitBranch (LinkRef next);

+		void EmitJump (LinkRef target);

+		void EmitRepeat (int min, int max, bool lazy, LinkRef until);

+		void EmitUntil (LinkRef repeat);

+		void EmitIn (LinkRef tail);

+		void EmitInfo (int count, int min, int max);

+		void EmitFastRepeat (int min, int max, bool lazy, LinkRef tail);

+		void EmitAnchor (int offset, LinkRef tail);

+

+		LinkRef NewLink ();

+		void ResolveLink (LinkRef link);

+	}

+

+	class InterpreterFactory : IMachineFactory {

+		public InterpreterFactory (ushort[] pattern) {

+			this.pattern = pattern;

+		}

+		

+		public IMachine NewInstance () {

+			return new Interpreter (pattern);

+		}

+

+		private ushort[] pattern;

+	}

+

+	class PatternCompiler : ICompiler {

+		public static ushort EncodeOp (OpCode op, OpFlags flags) {

+			return (ushort)((int)op | ((int)flags & 0xff00));

+		}

+

+		public static void DecodeOp (ushort word, out OpCode op, out OpFlags flags) {

+			op = (OpCode)(word & 0x00ff);

+			flags = (OpFlags)(word & 0xff00);

+		}

+

+		public PatternCompiler () {

+			pgm = new ArrayList ();

+		}

+

+		// ICompiler implementation

+

+		public void Reset () {

+			pgm.Clear ();

+		}

+

+		public IMachineFactory GetMachineFactory () {

+			ushort[] image = new ushort[pgm.Count];

+			pgm.CopyTo (image);

+

+			return new InterpreterFactory (image);

+		}

+

+		public void EmitFalse () {

+			Emit (OpCode.False);

+		}

+

+		public void EmitTrue () {

+			Emit (OpCode.True);

+		}

+

+		public void EmitCharacter (char c, bool negate, bool ignore, bool reverse) {

+			Emit (OpCode.Character, MakeFlags (negate, ignore, reverse, false));

+

+			if (ignore)

+				c = Char.ToLower (c);

+

+			Emit ((ushort)c);

+		}

+

+		public void EmitCategory (Category cat, bool negate, bool reverse) {

+			Emit (OpCode.Category, MakeFlags (negate, false, reverse, false));

+			Emit ((ushort)cat);

+		}

+

+		public void EmitRange (char lo, char hi, bool negate, bool ignore, bool reverse) {

+			Emit (OpCode.Range, MakeFlags (negate, ignore, reverse, false));

+			Emit ((ushort)lo);

+			Emit ((ushort)hi);

+		}

+

+		public void EmitSet (char lo, BitArray set, bool negate, bool ignore, bool reverse) {

+			Emit (OpCode.Set, MakeFlags (negate, ignore, reverse, false));

+			Emit ((ushort)lo);

+

+			int len = (set.Length + 0xf) >> 4;

+			Emit ((ushort)len);

+

+			int b = 0;

+			while (len -- != 0) {

+				ushort word = 0;

+				for (int i = 0; i < 16; ++ i) {

+					if (b >= set.Length)

+						break;

+				

+					if (set[b ++])

+						word |= (ushort)(1 << i);

+				}

+

+				Emit (word);

+			}

+		}

+

+		public void EmitString (string str, bool ignore, bool reverse) {

+			Emit (OpCode.String, MakeFlags (false, ignore, reverse, false));

+			int len = str.Length;

+			Emit ((ushort)len);

+

+			if (ignore)

+				str = str.ToLower ();

+			

+			for (int i = 0; i < len; ++ i)

+				Emit ((ushort)str[i]);

+		}

+

+		public void EmitPosition (Position pos) {

+			Emit (OpCode.Position, 0);

+			Emit ((ushort)pos);

+		}

+

+		public void EmitOpen (int gid) {

+			Emit (OpCode.Open);

+			Emit ((ushort)gid);

+		}

+

+		public void EmitClose (int gid) {

+			Emit (OpCode.Close);

+			Emit ((ushort)gid);

+		}

+

+		public void EmitBalance (int gid, int balance) {

+			Emit (OpCode.Balance);

+			Emit ((ushort)gid);

+			Emit ((ushort)balance);

+		}

+

+		public void EmitReference (int gid, bool ignore, bool reverse) {

+			Emit (OpCode.Reference, MakeFlags (false, ignore, reverse, false));

+			Emit ((ushort)gid);

+		}

+

+		public void EmitIfDefined (int gid, LinkRef tail) {

+			BeginLink (tail);

+			Emit (OpCode.IfDefined);

+			EmitLink (tail);

+			Emit ((ushort)gid);

+		}

+

+		public void EmitSub (LinkRef tail) {

+			BeginLink (tail);

+			Emit (OpCode.Sub);

+			EmitLink (tail);

+		}

+

+		public void EmitTest (LinkRef yes, LinkRef tail) {

+			BeginLink (yes);

+			BeginLink (tail);

+			Emit (OpCode.Test);

+			EmitLink (yes);

+			EmitLink (tail);

+		}

+

+		public void EmitBranch (LinkRef next) {

+			BeginLink (next);

+			Emit (OpCode.Branch, 0);

+			EmitLink (next);

+		}

+

+		public void EmitJump (LinkRef target) {

+			BeginLink (target);

+			Emit (OpCode.Jump, 0);

+			EmitLink (target);

+		}

+

+		public void EmitRepeat (int min, int max, bool lazy, LinkRef until) {

+			BeginLink (until);

+			Emit (OpCode.Repeat, MakeFlags (false, false, false, lazy));

+			EmitLink (until);

+			Emit ((ushort)min);

+			Emit ((ushort)max);

+		}

+

+		public void EmitUntil (LinkRef repeat) {

+			ResolveLink (repeat);

+			Emit (OpCode.Until);

+		}

+

+		public void EmitFastRepeat (int min, int max, bool lazy, LinkRef tail) {

+			BeginLink (tail);

+			Emit (OpCode.FastRepeat, MakeFlags (false, false, false, lazy));

+			EmitLink (tail);

+			Emit ((ushort)min);

+			Emit ((ushort)max);

+		}

+

+		public void EmitIn (LinkRef tail) {

+			BeginLink (tail);

+			Emit (OpCode.In);

+			EmitLink (tail);

+		}

+

+		public void EmitAnchor (int offset, LinkRef tail) {

+			BeginLink (tail);

+			Emit (OpCode.Anchor);

+			EmitLink (tail);

+			Emit ((ushort)offset);

+		}

+

+		public void EmitInfo (int count, int min, int max) {

+			Emit (OpCode.Info);

+			Emit ((ushort)count);

+			Emit ((ushort)min);

+			Emit ((ushort)max);

+		}

+

+		public LinkRef NewLink () {

+			return new PatternLinkStack ();

+		}

+		

+		public void ResolveLink (LinkRef lref) {

+			PatternLinkStack stack = (PatternLinkStack)lref;

+		

+			while (stack.Pop ())

+				pgm[stack.OffsetAddress] = (ushort)stack.GetOffset (CurrentAddress);

+		}

+

+		// private members

+

+		private static OpFlags MakeFlags (bool negate, bool ignore, bool reverse, bool lazy) {

+			OpFlags flags = 0;

+			if (negate) flags |= OpFlags.Negate;

+			if (ignore) flags |= OpFlags.IgnoreCase;

+			if (reverse) flags |= OpFlags.RightToLeft;

+			if (lazy) flags |= OpFlags.Lazy;

+

+			return flags;

+		}

+		

+		private void Emit (OpCode op) {

+			Emit (op, (OpFlags)0);

+		}

+

+		private void Emit (OpCode op, OpFlags flags) {

+			Emit (EncodeOp (op, flags));

+		}

+

+		private void Emit (ushort word) {

+			pgm.Add (word);

+		}

+

+		private int CurrentAddress {

+			get { return pgm.Count; }

+		}

+

+		private void BeginLink (LinkRef lref) {

+			PatternLinkStack stack = (PatternLinkStack)lref;

+			stack.BaseAddress = CurrentAddress;

+		}

+

+		private void EmitLink (LinkRef lref) {

+			PatternLinkStack stack = (PatternLinkStack)lref;

+			stack.OffsetAddress = CurrentAddress;

+			Emit ((ushort)0);	// placeholder

+			stack.Push ();

+		}

+

+		private class PatternLinkStack : LinkStack {

+			public PatternLinkStack () {

+			}

+		

+			public int BaseAddress {

+				set { link.base_addr = value; }

+			}

+

+			public int OffsetAddress {

+				get { return link.offset_addr; }

+				set { link.offset_addr = value; }

+			}

+

+			public int GetOffset (int target_addr) {

+				return target_addr - link.base_addr;

+			}

+

+			// LinkStack implementation

+

+			protected override object GetCurrent () { return link; }

+			protected override void SetCurrent (object l) { link = (Link)l; }

+

+			private struct Link {

+				public int base_addr;

+				public int offset_addr;

+			}

+

+			Link link;

+		}

+

+		private ArrayList pgm;

+	}

+

+	abstract class LinkStack : LinkRef {

+		public LinkStack () {

+			stack = new Stack ();

+		}

+

+		public void Push () {

+			stack.Push (GetCurrent ());

+		}

+

+		public bool Pop () {

+			if (stack.Count > 0) {

+				SetCurrent (stack.Pop ());

+				return true;

+			}

+

+			return false;

+		}

+

+		protected abstract object GetCurrent ();

+		protected abstract void SetCurrent (object l);

+

+		private Stack stack;

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/debug.cs b/mcs/class/System/System.Text.RegularExpressions/debug.cs
new file mode 100644
index 00000000000..fdc3ab87bc3
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/debug.cs
@@ -0,0 +1,208 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	debug.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Collections;

+

+namespace System.Text.RegularExpressions {

+

+	class Disassembler {

+		public static void DisassemblePattern (ushort[] image) {

+			DisassembleBlock (image, 0, 0);

+		}

+	

+		public static void DisassembleBlock (ushort[] image, int pc, int depth) {

+			OpCode op;

+			OpFlags flags;

+

+			for (;;) {

+				if (pc >= image.Length)

+					return;

+			

+				PatternCompiler.DecodeOp (image[pc], out op, out flags);

+				Console.Write (FormatAddress (pc) + ": ");		// address

+				Console.Write (new string (' ', depth * 2));		// indent

+				Console.Write (DisassembleOp (image, pc));		// instruction

+				Console.WriteLine ();

+

+				int skip;

+				switch (op) {

+				case OpCode.False: case OpCode.True: case OpCode.Until:

+					skip = 1;

+					break;

+

+				case OpCode.Character: case OpCode.Category: case OpCode.Position:

+				case OpCode.Open: case OpCode.Close: case OpCode.Reference:

+				case OpCode.Sub: case OpCode.Branch: case OpCode.Jump: case OpCode.In:

+					skip = 2;

+					break;

+

+				case OpCode.Balance: case OpCode.IfDefined: case OpCode.Range:

+				case OpCode.Test: case OpCode.Anchor:

+					skip = 3;

+					break;

+

+				case OpCode.Repeat: case OpCode.FastRepeat: case OpCode.Info:

+					skip = 4;

+					break;

+

+				case OpCode.String: skip = image[pc + 1] + 2; break;

+				case OpCode.Set: skip = image[pc + 2] + 3; break;

+

+				default:

+					skip = 1;

+					break;

+				}

+

+				pc += skip;

+			}

+		}

+

+		public static string DisassembleOp (ushort[] image, int pc) {

+			OpCode op;

+			OpFlags flags;

+

+			PatternCompiler.DecodeOp (image[pc], out op, out flags);

+			string str = op.ToString ();

+			if (flags != 0)

+				str += "[" + flags.ToString ("f") + "]";

+

+			switch (op) {

+			case OpCode.False: case OpCode.True: case OpCode.Until:

+			default:

+				break;

+

+			case OpCode.Info:

+				str += " " + image[pc + 1];

+				str += " (" + image[pc + 2] + ", " + image[pc + 3] + ")";

+				break;

+			

+			case OpCode.Character:

+				str += " '" + FormatChar ((char)image[pc + 1]) + "'";

+				break;

+

+			case OpCode.Category:

+				str += " /" + (Category)image[pc + 1];

+				break;

+			

+			case OpCode.Range:

+				str += " '" + FormatChar ((char)image[pc + 1]) + "', ";

+				str += " '" + FormatChar ((char)image[pc + 2]) + "'";

+				break;

+

+			case OpCode.Set:

+				str += " " + FormatSet (image, pc + 1);

+				break;

+

+			case OpCode.String:

+				str += " '" + ReadString (image, pc + 1) + "'";

+				break;

+

+			case OpCode.Position:

+				str += " /" + (Position)image[pc + 1];

+				break;

+

+			case OpCode.Open: case OpCode.Close: case OpCode.Reference:

+				str += " " + image[pc + 1];

+				break;

+

+			case OpCode.Balance:

+				str += " " + image[pc + 1] + " " + image[pc + 2];

+				break;

+

+			case OpCode.IfDefined: case OpCode.Anchor:

+				str += " :" + FormatAddress (pc + image[pc + 1]);

+				str += " " + image[pc + 2];

+				break;

+			

+			case OpCode.Sub: case OpCode.Branch: case OpCode.Jump:

+			case OpCode.In:

+				str += " :" + FormatAddress (pc + image[pc + 1]);

+				break;

+

+			case OpCode.Test:

+				str += " :" + FormatAddress (pc + image[pc + 1]);

+				str += ", :" + FormatAddress (pc + image[pc + 2]);

+				break;

+

+			case OpCode.Repeat: case OpCode.FastRepeat:

+				str += " :" + FormatAddress (pc + image[pc + 1]);

+				str += " (" + image[pc + 2] + ", ";

+				if (image[pc + 3] == 0xffff)

+					str += "Inf";

+				else

+					str += image[pc + 3];

+				str += ")";

+				break;

+

+			}

+

+			return str;

+		}

+

+		// private static members

+	

+		private static string ReadString (ushort[] image, int pc) {

+			int len = image[pc];

+			char[] chars = new char[len];

+

+			for (int i = 0; i < len; ++ i)

+				chars[i] = (char)image[pc + i + 1];

+

+			return new string (chars);

+		}

+

+		private static string FormatAddress (int pc) {

+			return pc.ToString ("x4");

+		}

+

+		private static string FormatSet (ushort[] image, int pc) {

+			int lo = image[pc ++];

+			int hi = (image[pc ++] << 4) - 1;

+

+			string str = "[";

+

+			bool hot = false;

+			char a = (char)0, b;

+			for (int i = 0; i <= hi; ++ i) {

+				bool m = (image[pc + (i >> 4)] & (1 << (i & 0xf))) != 0;

+

+				if (m & !hot) {				// start of range

+					a = (char)(lo + i);

+					hot = true;

+				}

+				else if (hot & (!m || i == hi)) {	// end of range

+					b = (char)(lo + i - 1);

+

+					str += FormatChar (a);

+					if (b != a)

+						str += "-" + FormatChar (b);

+					

+					hot = false;

+				}

+			}

+

+			str += "]";

+			return str;

+		}

+

+		private static string FormatChar (char c) {

+			if (c == '-' || c == ']')

+				return "\\" + c;

+

+			if (Char.IsLetterOrDigit (c) || Char.IsSymbol (c))

+				return c.ToString ();

+			

+			if (Char.IsControl (c)) {

+				return "^" + (char)('@' + c);

+			}

+

+			return "\\u" + ((int)c).ToString ("x4");

+		}

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/interpreter.cs b/mcs/class/System/System.Text.RegularExpressions/interpreter.cs
new file mode 100644
index 00000000000..1be1a36b2ee
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/interpreter.cs
@@ -0,0 +1,953 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	interpreter.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Collections;

+using System.Diagnostics;

+using System.Globalization;

+

+namespace System.Text.RegularExpressions {

+

+	class Interpreter : IMachine {

+		public Interpreter (ushort[] program) {

+			this.program = program;

+			this.qs = null;

+

+			// process info block

+

+			Debug.Assert ((OpCode)program[0] == OpCode.Info, "Regex", "Cant' find info block");

+

+			this.group_count = program[1] + 1;

+			this.match_min = program[2];

+			this.match_max = program[3];

+

+			// setup

+

+			this.program_start = 4;

+			this.groups = new int [group_count];

+		}

+

+		// IMachine implementation

+

+		public Match Scan (Regex regex, string text, int start, int end) {

+			this.text = text;

+			this.text_end = end;

+			this.scan_ptr = start;

+

+			if (Eval (Mode.Match, ref scan_ptr, program_start))

+				return GenerateMatch (regex);

+

+			return Match.Empty;

+		}

+

+		// private methods

+

+		private void Reset () {

+			ResetGroups ();

+			fast = repeat = null;

+		}

+

+		private bool Eval (Mode mode, ref int ref_ptr, int pc) {

+			int ptr = ref_ptr;

+		Begin:

+			for (;;) {

+				ushort word = program[pc];

+				OpCode op = (OpCode)(word & 0x00ff);

+				OpFlags flags = (OpFlags)(word & 0xff00);

+

+				switch (op) {

+				case OpCode.Anchor: {

+					int skip = program[pc + 1];

+

+					int anch_offset = program[pc + 2];

+					int anch_ptr = ptr + anch_offset;

+					int anch_end = text_end - match_min + anch_offset;	// maximum anchor position

+

+					// the general case for an anchoring expression is at the bottom, however we

+					// do some checks for the common cases before to save processing time. the current

+					// optimizer only outputs three types of anchoring expressions: fixed position,

+					// fixed substring, and no anchor.

+

+					OpCode anch_op = (OpCode)(program[pc + 3] & 0x00ff);

+					if (anch_op == OpCode.Position && skip == 6) {				// position anchor

+						// Anchor

+						// 	Position

+						//	True

+

+						switch ((Position)program[pc + 4]) {

+						case Position.StartOfString:

+							if (anch_ptr == 0) {

+								ptr = 0;

+								if (TryMatch (ref ptr, pc + skip))

+									goto Pass;

+							}

+							break;

+						

+						case Position.StartOfLine:

+							if (anch_ptr == 0) {

+								ptr = 0;

+								if (TryMatch (ref ptr, pc + skip))

+									goto Pass;

+

+								++ anch_ptr;

+							}

+

+							while (anch_ptr <= anch_end) {

+								if (text[anch_ptr - 1] == '\n') {

+									ptr = anch_ptr - anch_offset;

+									if (TryMatch (ref ptr, pc + skip))

+										goto Pass;

+								}

+

+								++ anch_ptr;

+							}

+							break;

+						

+						case Position.StartOfScan:

+							if (anch_ptr == scan_ptr) {

+								ptr = scan_ptr - anch_offset;

+								if (TryMatch (ref ptr, pc + skip))

+									goto Pass;

+							}

+							break;

+

+						default:

+							// FIXME

+							break;

+						}

+					}

+					else if (qs != null ||

+						(anch_op == OpCode.String && skip == 6 + program[pc + 4])) {	// substring anchor

+						// Anchor

+						//	String

+						//	True

+

+						if (qs == null) {

+							bool ignore = ((OpFlags)program[pc + 3] & OpFlags.IgnoreCase) != 0;

+							string substring = GetString (pc + 3);

+

+							qs = new QuickSearch (substring, ignore);

+						}

+

+						while (anch_ptr <= anch_end) {

+							anch_ptr = qs.Search (text, anch_ptr, anch_end);

+							if (anch_ptr < 0)

+								break;

+

+							ptr = anch_ptr - anch_offset;

+							if (TryMatch (ref ptr, pc + skip))

+								goto Pass;

+

+							++ anch_ptr;

+						}

+					}

+					else if (anch_op == OpCode.True) {					// no anchor

+						// Anchor

+						//	True

+

+						while (anch_ptr <= anch_end) {

+							ptr = anch_ptr;

+							if (TryMatch (ref ptr, pc + skip))

+								goto Pass;

+

+							++ anch_ptr;

+						}

+					}

+					else {									// general case

+						// Anchor

+						//	<expr>

+						//	True

+

+						while (anch_ptr <= anch_end) {

+							ptr = anch_ptr;

+							if (Eval (Mode.Match, ref ptr, pc + 3)) {

+								// anchor expression passed: try real expression at the correct offset

+

+								ptr = anch_ptr - anch_offset;

+								if (TryMatch (ref ptr, pc + skip))

+									goto Pass;

+							}

+

+							++ anch_ptr;

+						}

+					}

+

+					goto Fail;

+				}

+				

+				case OpCode.False: {

+					goto Fail;

+				}

+

+				case OpCode.True: {

+					goto Pass;

+				}

+

+				case OpCode.Position: {

+					if (!IsPosition ((Position)program[pc + 1], ptr))

+						goto Fail;

+					pc += 2;

+					break;

+				}

+

+				case OpCode.String: {

+					bool reverse = (flags & OpFlags.RightToLeft) != 0;

+					bool ignore = (flags & OpFlags.IgnoreCase) != 0;

+					int len = program[pc + 1];

+

+					if (reverse) {

+						ptr -= len;

+						if (ptr < 0)

+							goto Fail;

+					}

+					else if (ptr + len > text_end)

+						goto Fail;

+

+					pc += 2;

+					for (int i = 0; i < len; ++ i) {

+						char c = text[ptr + i];

+						if (ignore)

+							c = Char.ToLower (c);

+

+						if (c != (char)program[pc ++])

+							goto Fail;

+					}

+

+					if (!reverse)

+						ptr += len;

+					break;

+				}

+

+				case OpCode.Reference: {

+					bool reverse = (flags & OpFlags.RightToLeft) != 0;

+					bool ignore = (flags & OpFlags.IgnoreCase) != 0;

+					int m = GetLastDefined (program [pc + 1]);

+					if (m < 0)

+						goto Fail;

+

+					int str = marks [m].Index;

+					int len = marks [m].Length;

+

+					if (reverse) {

+						ptr -= len;

+						if (ptr < 0)

+							goto Fail;

+					}

+					else if (ptr + len > text_end)

+						goto Fail;

+

+					pc += 2;

+					for (int i = 0; i < len; ++ i) {

+						if (ignore) {

+							if (Char.ToLower (text[ptr + i]) != Char.ToLower (text[str + i]))

+								goto Fail;

+						}

+						else {

+							if (text[ptr + i] != text[str + i])

+								goto Fail;

+						}

+					}

+

+					if (!reverse)

+						ptr += len;

+					break;

+				}

+

+				case OpCode.Character: case OpCode.Category:

+				case OpCode.Range: case OpCode.Set: {

+					if (!EvalChar (mode, ref ptr, ref pc, false))

+						goto Fail;

+					break;

+				}

+

+				case OpCode.In: {

+					int target = pc + program[pc + 1];

+					pc += 2;

+					if (!EvalChar (mode, ref ptr, ref pc, true))

+						goto Fail;

+

+					pc = target;

+					break;

+				}

+

+				case OpCode.Open: {

+					Open (program[pc + 1], ptr);

+					pc += 2;

+					break;

+				}

+

+				case OpCode.Close: {

+					Close (program[pc + 1], ptr);

+					pc += 2;

+					break;

+				}

+

+				case OpCode.Balance: {

+					Balance (program[pc + 1], program[pc + 2], ptr);

+					break;

+				}

+

+				case OpCode.IfDefined: {

+					int m = GetLastDefined (program [pc + 2]);

+					if (m < 0)

+						pc += program[pc + 1];

+					else

+						pc += 3;

+					break;

+				}

+

+				case OpCode.Sub: {

+					if (!Eval (Mode.Match, ref ptr, pc + 2))

+						goto Fail;

+

+					pc += program[pc + 1];

+					break;

+				}

+

+				case OpCode.Test: {

+					int cp = Checkpoint ();

+					int test_ptr = ptr;

+					if (Eval (Mode.Match, ref test_ptr, pc + 3))

+						pc += program[pc + 1];

+					else {

+						Backtrack (cp);

+						pc += program[pc + 2];

+					}

+					break;

+				}

+

+				case OpCode.Branch: {

+					OpCode branch_op;

+					do {

+						int cp = Checkpoint ();

+						if (Eval (Mode.Match, ref ptr, pc + 2))

+							goto Pass;

+						

+						Backtrack (cp);

+						

+						pc += program[pc + 1];

+						branch_op = (OpCode)(program[pc] & 0xff);

+					} while (branch_op != OpCode.False);

+

+					goto Fail;

+				}

+

+				case OpCode.Jump: {

+					pc += program[pc + 1];

+					break;

+				}

+

+				case OpCode.Repeat: {

+					this.repeat = new RepeatContext (

+						this.repeat,			// previous context

+						program[pc + 2],		// minimum

+						program[pc + 3],		// maximum

+						(flags & OpFlags.Lazy) != 0,	// lazy

+						pc + 4				// subexpression

+					);

+

+					if (Eval (Mode.Match, ref ptr, pc + program[pc + 1]))

+						goto Pass;

+					else {

+						this.repeat = this.repeat.Previous;

+						goto Fail;

+					}

+				}

+

+				case OpCode.Until: {

+					RepeatContext current = this.repeat;

+					int start = current.Start;

+

+					if (!current.IsMinimum) {

+						++ current.Count;

+						current.Start = ptr;

+						if (Eval (Mode.Match, ref ptr, repeat.Expression))

+							goto Pass;

+

+						current.Start = start;

+						-- current.Count;

+						goto Fail;

+					}

+

+					if (ptr == current.Start) {

+						// degenerate match ... match tail or fail

+

+						this.repeat = current.Previous;

+						if (Eval (Mode.Match, ref ptr, pc + 1))

+							goto Pass;

+					

+						goto Fail;

+					}

+

+					if (current.IsLazy) {

+						// match tail first ...

+

+						this.repeat = current.Previous;

+						int cp = Checkpoint ();

+						if (Eval (Mode.Match, ref ptr, pc + 1))

+							goto Pass;

+

+						Backtrack (cp);

+

+						// ... then match more

+

+						this.repeat = current;

+						if (!current.IsMaximum) {

+							++ current.Count;

+							current.Start = ptr;

+							if (Eval (Mode.Match, ref ptr, current.Expression))

+								goto Pass;

+

+							current.Start = start;

+							-- current.Count;

+							goto Fail;

+						}

+

+						return false;

+					}

+					else {

+						// match more first ...

+

+						if (!current.IsMaximum) {

+							int cp = Checkpoint ();

+							++ current.Count;

+							current.Start = ptr;

+							if (Eval (Mode.Match, ref ptr, current.Expression))

+								goto Pass;

+

+							current.Start = start;

+							-- current.Count;

+							Backtrack (cp);

+						}

+

+						// ... then match tail

+

+						this.repeat = current.Previous;

+						if (Eval (Mode.Match, ref ptr, pc + 1))

+							goto Pass;

+

+						this.repeat = current;

+						goto Fail;

+					}

+				}

+

+				case OpCode.FastRepeat: {

+					this.fast = new RepeatContext (

+						fast,

+						program[pc + 2],		// minimum

+						program[pc + 3],		// maximum

+						(flags & OpFlags.Lazy) != 0,	// lazy

+						pc + 4				// subexpression

+					);

+					fast.Start = ptr;

+

+					int cp = Checkpoint ();

+

+					pc += program[pc + 1];		// tail expression

+					ushort tail_word = program[pc];

+

+					int c1, c2;			// first character of tail operator

+					int coff;			// 0 or -1 depending on direction

+

+					OpCode tail_op = (OpCode)(tail_word & 0xff);

+					if (tail_op == OpCode.Character || tail_op == OpCode.String) {

+						OpFlags tail_flags = (OpFlags)(tail_word & 0xff00);

+

+						if (tail_op == OpCode.String)

+							c1 = program[pc + 2];				// first char of string

+						else

+							c1 = program[pc + 1];				// character

+						

+						if ((tail_flags & OpFlags.IgnoreCase) != 0)

+							c2 = Char.ToUpper ((char)c1);			// ignore case

+						else

+							c2 = c1;

+

+						if ((tail_flags & OpFlags.RightToLeft) != 0)

+							coff = -1;					// reverse

+						else

+							coff = 0;

+					}

+					else {

+						c1 = c2 = -1;

+						coff = 0;

+					}

+

+					if (fast.IsLazy) {

+						if (!fast.IsMinimum && !Eval (Mode.Count, ref ptr, fast.Expression)) {

+							//Console.WriteLine ("lazy fast: failed mininum.");

+							fast = fast.Previous;

+							goto Fail;

+						}

+						

+						while (true) {

+							int p = ptr + coff;

+							if ((c1 < 0 || (p >= 0 && p < text_end && (c1 == text[p] || c2 == text[p]))) &&

+							    Eval (Mode.Match, ref ptr, pc))

+								break;

+

+							if (fast.IsMaximum) {

+								//Console.WriteLine ("lazy fast: failed with maximum.");

+								fast = fast.Previous;

+								goto Fail;

+							}

+

+							Backtrack (cp);

+							if (!Eval (Mode.Count, ref ptr, fast.Expression)) {

+								//Console.WriteLine ("lazy fast: no more.");

+								fast = fast.Previous;

+								goto Fail;

+							}

+						}

+						fast = fast.Previous;

+						goto Pass;

+					}

+					else {

+						if (!Eval (Mode.Count, ref ptr, fast.Expression)) {

+							fast = fast.Previous;

+							goto Fail;

+						}

+					

+						int width;

+						if (fast.Count > 0)

+							width = (ptr - fast.Start) / fast.Count;

+						else

+							width = 0;

+

+						while (true) {

+							int p = ptr + coff;

+							if ((c1 < 0 || (p >= 0 && p < text_end && (c1 == text[p] || c2 == text[p]))) &&

+							    Eval (Mode.Match, ref ptr, pc))

+								break;

+

+							-- fast.Count;

+							if (!fast.IsMinimum) {

+								fast = fast.Previous;

+								goto Fail;

+							}

+

+							ptr -= width;

+							Backtrack (cp);

+						}

+						fast = fast.Previous;

+						goto Pass;

+					}

+				}

+

+				case OpCode.Info: {

+					Debug.Assert (false, "Regex", "Info block found in pattern");

+					goto Fail;

+				}

+				}

+			}

+		Pass:

+			ref_ptr = ptr;

+

+			switch (mode) {

+			case Mode.Match:

+				return true;

+

+			case Mode.Count: {

+				++ fast.Count;

+				if (fast.IsMaximum || (fast.IsLazy && fast.IsMinimum))

+					return true;

+

+				pc = fast.Expression;

+				goto Begin;

+			}

+			}

+

+		Fail:

+			switch (mode) {

+			case Mode.Match:

+				return false;

+

+			case Mode.Count: {

+				if (!fast.IsLazy && fast.IsMinimum)

+					return true;

+

+				ref_ptr = fast.Start;

+				return false;

+			}

+			}

+

+			return false;

+		}

+

+		private bool EvalChar (Mode mode, ref int ptr, ref int pc, bool multi) {

+			bool consumed = false;

+			char c = '\0';

+			bool negate;

+			bool ignore;

+			do {

+				ushort word = program[pc];

+				OpCode op = (OpCode)(word & 0x00ff);

+				OpFlags flags = (OpFlags)(word & 0xff00);

+

+				++ pc;

+

+				ignore = (flags & OpFlags.IgnoreCase) != 0;

+				

+				// consume character: the direction of an In construct is

+				// determined by the direction of its first op

+

+				if (!consumed) {

+					if ((flags & OpFlags.RightToLeft) != 0) {

+						if (ptr <= 0)

+							return false;

+

+						c = text[-- ptr];

+					}

+					else {

+						if (ptr >= text_end)

+							return false;

+

+						c = text[ptr ++];

+					}

+

+					if (ignore)

+						c = Char.ToLower (c);

+

+					consumed = true;

+				}

+

+				// negate flag

+

+				negate = (flags & OpFlags.Negate) != 0;

+

+				// execute op

+				

+				switch (op) {

+				case OpCode.True:

+					return true;

+

+				case OpCode.False:

+					return false;

+				

+				case OpCode.Character: {

+					if (c == (char)program[pc ++])

+						return !negate;

+					break;

+				}

+

+				case OpCode.Category: {

+					if (CategoryUtils.IsCategory ((Category)program[pc ++], c))

+						return !negate;

+

+					break;

+				}

+				

+				case OpCode.Range: {

+					int lo = (char)program[pc ++];

+					int hi = (char)program[pc ++];

+					if (lo <= c && c <= hi)

+						return !negate;

+					break;

+				}

+

+				case OpCode.Set: {

+					int lo = (char)program[pc ++];

+					int len = (char)program[pc ++];

+					int bits = pc;

+					pc += len;

+

+					int i = (int)c - lo;

+					if (i < 0 || i >= len << 4)

+						break;

+

+					if ((program[bits + (i >> 4)] & (1 << (i & 0xf))) != 0)

+						return !negate;

+					break;

+				}

+				}

+			} while (multi);

+

+			return negate;

+		}

+

+		private bool TryMatch (ref int ref_ptr, int pc) {

+			Reset ();

+			

+			int ptr = ref_ptr;

+			marks [groups [0]].Start = ptr;

+			if (Eval (Mode.Match, ref ptr, pc)) {

+				marks [groups [0]].End = ptr;

+				ref_ptr = ptr;

+				return true;

+			}

+

+			return false;

+		}

+		

+		private bool IsPosition (Position pos, int ptr) {

+			switch (pos) {

+			case Position.Start: case Position.StartOfString:

+				return ptr == 0;

+

+			case Position.StartOfLine:

+				return ptr == 0 || text[ptr - 1] == '\n';

+				

+			case Position.StartOfScan:

+				return ptr == scan_ptr;

+			

+			case Position.End:

+				return ptr == text_end ||

+					(ptr == text_end - 1 && text[ptr] == '\n');

+

+			case Position.EndOfLine:

+				return ptr == text_end || text[ptr] == '\n';

+				

+			case Position.EndOfString:

+				return ptr == text_end;

+				

+			case Position.Boundary:

+				if (text_end == 0)

+					return false;

+

+				if (ptr == 0)

+					return IsWordChar (text[ptr]);

+				else if (ptr == text_end)

+					return IsWordChar (text[ptr - 1]);

+				else

+					return IsWordChar (text[ptr]) != IsWordChar (text[ptr - 1]);

+

+			case Position.NonBoundary:

+				if (text_end == 0)

+					return false;

+

+				if (ptr == 0)

+					return !IsWordChar (text[ptr]);

+				else if (ptr == text_end)

+					return !IsWordChar (text[ptr - 1]);

+				else

+					return IsWordChar (text[ptr]) == IsWordChar (text[ptr - 1]);

+			

+			default:

+				return false;

+			}

+		}

+

+		private bool IsWordChar (char c) {

+			return CategoryUtils.IsCategory (Category.Word, c);

+		}

+

+		private string GetString (int pc) {

+			int len = program[pc + 1];

+			int str = pc + 2;

+

+			char[] cs = new char[len];

+			for (int i = 0; i < len; ++ i)

+				cs[i] = (char)program[str ++];

+

+			return new string (cs);

+		}

+

+		// capture management

+

+		private void Open (int gid, int ptr) {

+			int m = groups [gid];

+			if (m < mark_start || marks [m].IsDefined) {

+				m = CreateMark (m);

+				groups [gid] = m;

+			}

+

+			marks [m].Start = ptr;

+		}

+

+		private void Close (int gid, int ptr) {

+			marks [groups [gid]].End = ptr;

+		}

+

+		private void Balance (int gid, int balance_gid, int ptr) {

+			int b = groups [balance_gid];

+			Debug.Assert (marks [b].IsDefined, "Regex", "Balancing group not closed");

+

+			if (gid > 0) {

+				Open (gid, marks [b].Index + marks [b].Length);

+				Close (gid, ptr);

+			}

+

+			groups [balance_gid] = marks [b].Previous;

+		}

+

+		private int Checkpoint () {

+			mark_start = mark_end;

+			return mark_start;

+		}

+

+		private void Backtrack (int cp) {

+			Debug.Assert (cp > mark_start, "Regex", "Attempt to backtrack forwards");

+

+			for (int i = 0; i < groups.Length; ++ i) {

+				int m = groups [i];

+				while (cp <= m)

+					m = marks [m].Previous;

+

+				groups [i] = m;

+			}

+		}

+

+		private void ResetGroups () {

+			int n = groups.Length;

+			if (marks == null)

+				marks = new Mark [n * 10];

+

+			for (int i = 0; i < n; ++ i) {

+				groups [i] = i;

+

+				marks [i].Start = -1;

+				marks [i].End = -1;

+				marks [i].Previous = -1;

+			}

+			

+			mark_start = 0;

+			mark_end = n;

+		}

+

+		private int GetLastDefined (int gid) {

+			int m = groups [gid];

+			while (m >= 0 && !marks [m].IsDefined)

+				m = marks [m].Previous;

+

+			return m;

+		}

+

+		private int CreateMark (int previous) {

+			if (mark_end == marks.Length) {

+				Mark [] dest = new Mark [marks.Length * 2];

+				marks.CopyTo (dest, 0);

+				marks = dest;

+			}

+

+			int m = mark_end ++;

+			marks [m].Start = marks [m].End = -1;

+			marks [m].Previous = previous;

+

+			return m;

+		}

+

+		private Match GenerateMatch (Regex regex) {

+			int[][] grps = new int[groups.Length][];

+			ArrayList caps = new ArrayList ();

+

+			for (int gid = 0; gid < groups.Length; ++ gid) {

+				caps.Clear ();

+				for (int m = groups[gid]; m >= 0; m = marks[m].Previous) {

+					if (!marks[m].IsDefined)

+						continue;

+					

+					caps.Add (marks[m].Index);

+					caps.Add (marks[m].Length);

+				}

+

+				grps[gid] = (int[])caps.ToArray (typeof (int));

+			}

+

+			return new Match (regex, this, text, text_end, grps);

+		}

+

+		// interpreter attributes

+

+		private ushort[] program;		// regex program

+		private int program_start;		// first instruction after info block

+		private string text;			// input text

+		private int text_end;			// end of input text (last character + 1)

+		private int group_count;		// number of capturing groups

+		private int match_min, match_max;	// match width information

+		private QuickSearch qs;			// fast substring matcher

+

+		// match state

+		

+		private int scan_ptr;			// start of scan

+

+		private RepeatContext repeat;		// current repeat context

+		private RepeatContext fast;		// fast repeat context

+

+		private Mark[] marks = null;		// mark stack

+		private int mark_start;			// start of current checkpoint

+		private int mark_end;			// end of checkpoint/next free mark

+

+		private int[] groups;			// current group definitions

+

+		// private classes

+

+		private struct Mark {

+			public int Start, End;

+			public int Previous;

+

+			public bool IsDefined {

+				get { return Start >= 0 && End >= 0; }

+			}

+

+			public int Index {

+				get { return Start < End ? Start : End; }

+			}

+

+			public int Length {

+				get { return Start < End ? End - Start : Start - End; }

+			}

+		}

+

+		private class RepeatContext {

+			public RepeatContext (RepeatContext previous, int min, int max, bool lazy, int expr_pc) {

+				this.previous = previous;

+				this.min = min;

+				this.max = max;

+				this.lazy = lazy;

+				this.expr_pc = expr_pc;

+				

+				this.start = -1;

+				this.count = 0;

+			}

+

+			public int Count {

+				get { return count; }

+				set { count = value; }

+			}

+

+			public int Start {

+				get { return start; }

+				set { start = value; }

+			}

+

+			public bool IsMinimum {

+				get { return min <= count; }

+			}

+

+			public bool IsMaximum {

+				get { return max <= count; }

+			}

+

+			public bool IsLazy {

+				get { return lazy; }

+			}

+

+			public int Expression {

+				get { return expr_pc; }

+			}

+

+			public RepeatContext Previous {

+				get { return previous; }

+			}

+		

+			private int start;

+			private int min, max;

+			private bool lazy;

+			private int expr_pc;

+			private RepeatContext previous;

+

+			private int count;

+		}

+

+		private enum Mode {

+			Search,

+			Match,

+			Count

+		}

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/interval.cs b/mcs/class/System/System.Text.RegularExpressions/interval.cs
new file mode 100644
index 00000000000..4c8d19f5b15
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/interval.cs
@@ -0,0 +1,305 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	interval.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Collections;

+

+namespace System.Text.RegularExpressions {

+

+	struct Interval : IComparable {

+		public int low;

+		public int high;

+		public bool contiguous;

+

+		public static Interval Empty {

+			get {

+				Interval i;

+				i.low = 0;

+				i.high = i.low - 1;

+				i.contiguous = true;

+

+				return i;

+			}

+		}

+

+		public static Interval Entire {

+			get { return new Interval (Int32.MinValue, Int32.MaxValue); }

+		}

+

+		public Interval (int low, int high) {

+			if (low > high) {

+				int t = low;

+				low = high;

+				high = t;

+			}

+		

+			this.low = low;

+			this.high = high;

+			this.contiguous = true;

+		}

+

+		public bool IsDiscontiguous {

+			get { return !contiguous; }

+		}

+		

+		public bool IsSingleton {

+			get { return contiguous && low == high; }

+		}

+

+		public bool IsRange {

+			get { return !IsSingleton && !IsEmpty; }

+		}

+

+		public bool IsEmpty {

+			get { return low > high; }

+		}

+

+		public int Size {

+			get {

+				if (IsEmpty)

+					return 0;

+				

+				return high - low + 1;

+			}

+		}

+

+		public bool IsDisjoint (Interval i) {

+			if (IsEmpty || i.IsEmpty)

+				return true;

+			

+			return !(low <= i.high && i.low <= high);

+		}

+

+		public bool IsAdjacent (Interval i) {

+			if (IsEmpty || i.IsEmpty)

+				return false;

+		

+			return low == i.high + 1 || high == i.low - 1;

+		}

+

+		public bool Contains (Interval i) {

+			if (!IsEmpty && i.IsEmpty)

+				return true;

+			if (IsEmpty)

+				return false;

+		

+			return low <= i.low && i.high <= high;

+		}

+

+		public bool Contains (int i) {

+			return low <= i && i <= high;

+		}

+

+		public void Merge (Interval i) {

+			if (i.IsEmpty)

+				return;

+			if (IsEmpty) {

+				this.low = i.low;

+				this.high = i.high;

+			}

+		

+			if (i.low < low)

+				low = i.low;

+			if (i.high > high)

+				high = i.high;

+		}

+

+		public void Intersect (Interval i) {

+			if (IsDisjoint (i)) {

+				low = 0;

+				high = low - 1;

+				return;

+			}

+		

+			if (i.low > low)

+				low = i.low;

+			if (i.high > high)

+				high = i.high;

+		}

+

+		public int CompareTo (object o) {

+			return low - ((Interval)o).low;

+		}

+

+		public new string ToString () {

+			if (IsEmpty)

+				return "(EMPTY)";

+			else if (!contiguous)

+				return "{" + low + ", " + high + "}";

+			else if (IsSingleton)

+				return "(" + low + ")";

+			else

+				return "(" + low + ", " + high + ")";

+		}

+	}

+

+	class IntervalCollection : ICollection, IEnumerable {

+		public IntervalCollection () {

+			intervals = new ArrayList ();

+		}

+

+		public Interval this[int i] {

+			get { return (Interval)intervals[i]; }

+			set { intervals[i] = value; }

+		}

+

+		public void Add (Interval i) {

+			intervals.Add (i);

+		}

+			

+		public void Clear () {

+			intervals.Clear ();

+		}

+

+		public void Sort () {

+			intervals.Sort ();

+		}

+		

+		public void Normalize () {

+			intervals.Sort ();

+

+			int j = 0;

+			while (j < intervals.Count - 1) {

+				Interval a = (Interval)intervals[j];

+				Interval b = (Interval)intervals[j + 1];

+

+				if (!a.IsDisjoint (b) || a.IsAdjacent (b)) {

+					a.Merge (b);

+					intervals[j] = a;

+					intervals.RemoveAt (j + 1);

+				}

+				else

+					++ j;

+			}

+

+		}

+

+		public delegate double CostDelegate (Interval i);

+

+		public IntervalCollection GetMetaCollection (CostDelegate cost_del) {

+			IntervalCollection meta = new IntervalCollection ();

+		

+			Normalize ();

+			Optimize (0, Count - 1, meta, cost_del);

+			meta.intervals.Sort ();

+

+			return meta;

+		}

+

+		private void Optimize (int begin, int end, IntervalCollection meta, CostDelegate cost_del) {

+			Interval set;

+			set.contiguous = false;

+		

+			int best_set_begin = -1;

+			int best_set_end = -1;

+			double best_set_cost = 0;

+

+			for (int i = begin; i <= end; ++ i) {

+				set.low = this[i].low;

+

+				double cost = 0.0;

+				for (int j = i; j <= end; ++ j) {

+					set.high = this[j].high;

+					cost += cost_del (this[j]);

+					

+					double set_cost = cost_del (set);

+					if (set_cost < cost && cost > best_set_cost) {

+						best_set_begin = i;

+						best_set_end = j;

+						best_set_cost = cost;

+					}

+				}

+			}

+

+			if (best_set_begin < 0) {

+				// didn't find an optimal set: add original members

+

+				for (int i = begin; i <= end; ++ i)

+					meta.Add (this[i]);

+			}

+			else {

+				// found set: add it ...

+

+				set.low = this[best_set_begin].low;

+				set.high = this[best_set_end].high;

+				

+				meta.Add (set);

+

+				// ... and optimize to the left and right

+

+				if (best_set_begin > begin)

+					Optimize (begin, best_set_begin - 1, meta, cost_del);

+				if (best_set_end < end)

+					Optimize (best_set_end + 1, end, meta, cost_del);

+			}

+		}

+

+		// ICollection implementation

+

+		public int Count {

+			get { return intervals.Count; }

+		}

+

+		public bool IsSynchronized {

+			get { return false; }

+		}

+

+		public object SyncRoot {

+			get { return intervals; }

+		}

+

+		public void CopyTo (Array array, int index) {

+			foreach (Interval i in intervals) {

+				if (index > array.Length)

+					break;

+				

+				array.SetValue (i, index ++);

+			}

+		}

+

+		// IEnumerator implementation

+

+		public IEnumerator GetEnumerator () {

+			return new Enumerator (intervals);

+		}

+

+		private class Enumerator : IEnumerator {

+			public Enumerator (IList list) {

+				this.list = list;

+				Reset ();

+			}

+

+			public object Current {

+				get {

+					if (ptr >= list.Count)

+						throw new InvalidOperationException ();

+

+					return list[ptr];

+				}

+			}

+

+			public bool MoveNext () {

+				if (ptr > list.Count)

+					throw new InvalidOperationException ();

+				

+				return ++ ptr < list.Count;

+			}

+

+			public void Reset () {

+				ptr = -1;

+			}

+

+			private IList list;

+			private int ptr;

+		}

+

+		// private fields

+

+		private ArrayList intervals;

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/match.cs b/mcs/class/System/System.Text.RegularExpressions/match.cs
new file mode 100644
index 00000000000..aa2d3f0a4b3
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/match.cs
@@ -0,0 +1,157 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	match.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+

+namespace System.Text.RegularExpressions {

+

+	[Serializable]

+	public class Capture {

+		public int Index {

+			get { return index; }

+		}

+

+		public int Length {

+			get { return length; }

+		}

+

+		public string Value {

+			get { return text.Substring (index, length); }

+		}

+

+		public override string ToString () {

+			return Value;

+		}

+

+		// internal members

+

+		internal Capture (string text) : this (text, 0, 0) { }

+

+		internal Capture (string text, int index, int length) {

+			this.text = text;

+			this.index = index;

+			this.length = length;

+		}

+		

+		internal string Text {

+			get { return text; }

+		}

+

+		// private

+

+		internal int index, length;

+		internal string text;

+	}

+

+	[Serializable]

+	public class Group : Capture {

+		public static Group Synchronized (Group inner) {

+			return inner;	// is this enough?

+		}

+

+		public CaptureCollection Captures {

+			get { return captures; }

+		}

+

+		public bool Success {

+			get { return success; }

+		}

+

+		// internal

+

+		internal Group (string text, int[] caps) : base (text) {

+			this.captures = new CaptureCollection ();

+

+			if (caps == null || caps.Length == 0) {

+				this.success = false;

+				return;

+			}

+

+			this.success = true;

+			this.index = caps[0];

+			this.length = caps[1];

+			captures.Add (this);

+			for (int i = 2; i < caps.Length; i += 2)

+				captures.Add (new Capture (text, caps[i], caps[i + 1]));

+			captures.Reverse ();

+		}

+

+		private bool success;

+		private CaptureCollection captures;

+	}

+

+	[Serializable]

+	public class Match : Group {

+		public static Match Empty {

+			get { return empty; }

+		}

+		

+		public static Match Synchronized (Match inner) {

+			return inner;	// FIXME need to sync on machine access

+		}

+		

+		public virtual GroupCollection Groups {

+			get { return groups; }

+		}

+

+		public Match NextMatch () {

+			if (this == Empty)

+				return Empty;

+

+			int scan_ptr = regex.RightToLeft ? Index : Index + Length;

+

+			// next match after an empty match: make sure scan ptr makes progress

+			

+			if (Length == 0)

+				scan_ptr += regex.RightToLeft ? -1 : +1;

+

+			return machine.Scan (regex, Text, scan_ptr, text_length);

+		}

+

+		public virtual string Result (string replacement) {

+			return ReplacementEvaluator.Evaluate (replacement, this);

+		}

+

+		// internal

+

+		internal Match () : base (null, null) {

+			this.regex = null;

+			this.machine = null;

+			this.text_length = 0;

+			this.groups = new GroupCollection ();

+

+			groups.Add (this);

+		}

+		

+		internal Match (Regex regex, IMachine machine, string text, int text_length, int[][] grps) :

+			base (text, grps[0])

+		{

+			this.regex = regex;

+			this.machine = machine;

+			this.text_length = text_length;

+

+			this.groups = new GroupCollection ();

+			groups.Add (this);

+			for (int i = 1; i < grps.Length; ++ i)

+				groups.Add (new Group (text, grps[i]));

+		}

+

+		internal Regex Regex {

+			get { return regex; }

+		}

+

+		// private

+

+		private Regex regex;

+		private IMachine machine;

+		private int text_length;

+		private GroupCollection groups;

+

+		private static Match empty = new Match ();

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/notes.txt b/mcs/class/System/System.Text.RegularExpressions/notes.txt
new file mode 100644
index 00000000000..56b047ec76e
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/notes.txt
@@ -0,0 +1,45 @@
+TODO:
+
+* Need to go through everything and square it with RightToLeft matching.
+  The support for this was built into an early version, and lots of things built
+  afterwards are not savvy about bi-directional matching. Things that spring to
+  mind: Regex match methods should start at 0 or text.Length depending on
+  direction. Do split and replace need changes? Match should be aware of its
+  direction (already applied some of this to NextMatch logic). The interpreter
+  needs to check left and right bounds. Anchoring and substring discovery need
+  to be reworked. RTL matches are going to have anchors on the right - ie $, \Z
+  and \z. This should be added to the anchor logic. QuickSearch needs to work in
+  reverse. There may be other stuff.... work through the code.
+
+* Add ECMAScript support to the parser. For example, [.\w\s\d] map to ECMA
+  categories instead of canonical ones [DONE]. There's different behaviour on
+  backreference/octal disambiguation. Find out what the runtime behavioural
+  difference is for cyclic backreferences eg (?(1)abc\1) - this is only briefly 
+  mentioned in the spec. I couldn't find much on this in the ECMAScript
+  specification either.
+
+* Octal/backreference parsing needs a big fix. The rules are ridiculously complex.
+
+* Add a check in QuickSearch for single character substrings. This is likely to
+  be a common case. There's no need to go through a shift table. Also, have a
+  look at just computing a relevant subset of the shift table and using an
+  (offset, size) pair to help test inclusion. Characters not in the table get
+  the default len + 1 shift.
+
+* Improve the perl test suite. Run under MS runtime to generate checksums for
+  each trial. Checksums should incorporate: all captures (index, length) for all
+  groups; names of explicit capturing groups, and the numbers they map to. Any
+  other state? RegexTrial.Execute() will then compare result and checksum.
+
+* The pattern (?(1?)a|b). It should fail: Perl fails, the MS implementation
+  fails, but I pass. The documentation says that the construct (?(X)...) can be
+  processed in two ways. If X is a valid group number, or a valid group name,
+  then the expression becomes a capture conditional - the (...) part is
+  executed only if X has been captured. If X is not a group number or name, then
+  it is treated as a positive lookahead., and (...) is only executed if the
+  lookahead succeeds. My code does the latter, but on further investigation it
+  appears that both Perl and MS fail to recognize an expression assertion if the
+  first character of the assertion is a number - which instead suggests a
+  capture conditional. The exception raised is something like "invalid group
+  number". I get the feeling the my behaviour seems more correct, but it's not
+  consistent with the other implementations, so it should probably be changed.
diff --git a/mcs/class/System/System.Text.RegularExpressions/parser.cs b/mcs/class/System/System.Text.RegularExpressions/parser.cs
new file mode 100644
index 00000000000..3327cf3024a
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/parser.cs
@@ -0,0 +1,1109 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	parser.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Collections;

+using System.Globalization;

+

+namespace System.Text.RegularExpressions.Syntax {

+

+	class Parser {

+		public static int ParseDecimal (string str, ref int ptr) {

+			return ParseNumber (str, ref ptr, 10, 1, Int32.MaxValue);

+		}

+

+		public static int ParseOctal (string str, ref int ptr) {

+			return ParseNumber (str, ref ptr, 8, 1, 3);

+		}

+

+		public static int ParseHex (string str, ref int ptr, int digits) {

+			return ParseNumber (str, ref ptr, 16, digits, digits);

+		}

+

+		public static int ParseNumber (string str, ref int ptr, int b, int min, int max) {

+			int p = ptr, n = 0, digits = 0, d;

+			if (max < min)

+				max = Int32.MaxValue;

+

+			while (digits < max && p < str.Length) {

+				d = ParseDigit (str[p ++], b, digits);

+				if (d < 0) {

+					-- p;

+					break;

+				}

+

+				n = n * b + d;

+				++ digits;

+			}

+

+			if (digits < min)

+				return -1;

+

+			ptr = p;

+			return n;

+		}

+

+		public static string ParseName (string str, ref int ptr) {

+			if (Char.IsDigit (str[ptr])) {

+				int gid = ParseNumber (str, ref ptr, 10, 1, 0);

+				if (gid > 0)

+					return gid.ToString ();

+				

+				return null;

+			}

+

+			int start = ptr;

+			for (;;) {

+				if (!IsNameChar (str[ptr]))

+					break;

+				++ ptr;

+			}

+

+			if (ptr - start > 0)

+				return str.Substring (start, ptr - start);

+

+			return null;

+		}

+

+		public static string Escape (string str) {

+			string result = "";

+			for (int i = 0; i < str.Length; ++ i) {

+				char c = str[i];

+				switch (c) {

+				case '\\': case '*': case '+': case '?': case '|':

+				case '{': case '[': case '(': case ')': case '^':

+				case '$': case '.': case '#': case ' ':

+					result += "\\" + c;

+					break;

+

+				case '\t': result += "\\t"; break;

+				case '\n': result += "\\n"; break;

+				case '\r': result += "\\r"; break;

+				case '\f': result += "\\f"; break;

+

+				default: result += c; break;

+				}

+			}

+

+			return result;

+		}

+

+		public static string Unescape (string str) {

+			return new Parser ().ParseString (str);

+		}

+

+		// public instance

+

+		public Parser () {

+			this.caps = new ArrayList ();

+			this.refs = new Hashtable ();

+		}

+

+		public RegularExpression ParseRegularExpression (string pattern, RegexOptions options) {

+			this.pattern = pattern;

+			this.ptr = 0;

+

+			caps.Clear ();

+			refs.Clear ();

+			this.num_groups = 0;

+

+			try {

+				RegularExpression re = new RegularExpression ();

+				ParseGroup (re, options, null);

+				ResolveReferences ();

+

+				re.GroupCount = num_groups;

+				

+				return re;

+			}

+			catch (IndexOutOfRangeException) {

+				throw NewParseException ("Unexpected end of pattern.");

+			}

+		}

+

+		public IDictionary GetMapping () {

+			Hashtable mapping = new Hashtable ();

+			foreach (CapturingGroup group in caps) {

+				if (group.Name != null)

+					mapping.Add (group.Name, group.Number);

+			}

+

+			return mapping;

+		}

+

+		// private methods

+

+		private void ParseGroup (Group group, RegexOptions options, Assertion assertion) {

+			bool is_top_level = group is RegularExpression;

+		

+			Alternation alternation = null;

+			string literal = null;

+

+			Group current = new Group ();

+			Expression expr = null;

+			bool closed = false;

+

+			while (true) {

+				ConsumeWhitespace (IsIgnorePatternWhitespace (options));

+				if (ptr >= pattern.Length)

+					break;

+				

+				// (1) Parse for Expressions

+			

+				char ch = pattern[ptr ++];

+				

+				switch (ch) {

+				case '^': {

+					Position pos =

+						IsMultiline (options) ? Position.StartOfLine : Position.Start;

+					expr = new PositionAssertion (pos);

+					break;

+				}

+

+				case '$': {

+					Position pos =

+						IsMultiline (options) ? Position.EndOfLine : Position.End;

+					expr = new PositionAssertion (pos);

+					break;

+				}

+

+				case '.': {

+					Category cat =

+						IsSingleline (options) ? Category.AnySingleline : Category.Any;

+					expr = new CharacterClass (cat, false);

+					break;

+				}

+

+				case '\\': {

+					int c = ParseEscape ();

+					if (c >= 0)

+						ch = (char)c;

+					else {

+						expr = ParseSpecial (options);

+

+						if (expr == null)

+							ch = pattern[ptr ++];		// default escape

+					}

+					break;

+				}

+

+				case '[': {

+					expr = ParseCharacterClass (options);

+					break;

+				}

+

+				case '(': {

+					bool ignore = IsIgnoreCase (options);

+					expr = ParseGroupingConstruct (ref options);

+					if (expr == null) {

+						if (literal != null && IsIgnoreCase (options) != ignore) {

+							current.AppendExpression (new Literal (literal, IsIgnoreCase (options)));

+							literal = null;

+						}

+

+						continue;

+					}

+					break;

+				}

+

+				case ')': {

+					closed = true;

+					goto EndOfGroup;

+				}

+

+				case '|': {

+					if (literal != null) {

+						current.AppendExpression (new Literal (literal, IsIgnoreCase (options)));

+						literal = null;

+					}

+

+					if (assertion != null) {

+						if (assertion.TrueExpression == null)

+							assertion.TrueExpression = current;

+						else if (assertion.FalseExpression == null)

+							assertion.FalseExpression = current;

+						else

+							throw NewParseException ("Too many | in (?()|).");

+					}

+					else {

+						if (alternation == null)

+							alternation = new Alternation ();

+

+						alternation.AddAlternative (current);

+					}

+

+					current = new Group ();

+					continue;

+				}

+

+				case '*': case '+': case '?': case '{': {

+					throw NewParseException ("Bad quantifier.");

+				}

+

+				default: 

+					break;		// literal character

+				}

+

+				ConsumeWhitespace (IsIgnorePatternWhitespace (options));

+				

+				// (2) Check for Repetitions

+				

+				if (ptr < pattern.Length) {

+					char k = pattern[ptr];

+

+					if (k == '?' || k == '*' || k == '+' || k == '{') {

+						++ ptr;

+

+						int min = 0, max = 0;

+						bool lazy = false;

+

+						switch (k) {

+						case '?': min = 0; max = 1; break;

+						case '*': min = 0; max = 0xffff; break;

+						case '+': min = 1; max = 0xffff; break;

+						case '{': ParseRepetitionBounds (out min, out max, options); break;

+						}

+

+						ConsumeWhitespace (IsIgnorePatternWhitespace (options));

+						if (ptr < pattern.Length && pattern[ptr] == '?') {

+							++ ptr;

+							lazy = true;

+						}

+

+						Repetition repetition = new Repetition (min, max, lazy);

+

+						if (expr == null)

+							repetition.Expression = new Literal (ch.ToString (), IsIgnoreCase (options));

+						else

+							repetition.Expression = expr;

+

+						expr = repetition;

+					}

+				}

+

+				// (3) Append Expression and/or Literal

+

+				if (expr == null) {

+					if (literal == null)

+						literal = "";

+					literal += ch;

+				}

+				else {

+					if (literal != null) {

+						current.AppendExpression (new Literal (literal, IsIgnoreCase (options)));

+						literal = null;

+					}

+

+					current.AppendExpression (expr);

+					expr = null;

+				}

+

+				if (is_top_level && ptr >= pattern.Length)

+					goto EndOfGroup;

+			}

+

+		EndOfGroup:

+			if (is_top_level && closed)

+				throw NewParseException ("Too many )'s.");

+			if (!is_top_level && !closed)

+				throw NewParseException ("Not enough )'s.");

+				

+		

+			// clean up literals and alternations

+

+			if (literal != null)

+				current.AppendExpression (new Literal (literal, IsIgnoreCase (options)));

+

+			if (assertion != null) {

+				if (assertion.TrueExpression == null)

+					assertion.TrueExpression = current;

+				else

+					assertion.FalseExpression = current;

+				

+				group.AppendExpression (assertion);

+			}

+			else if (alternation != null) {

+				alternation.AddAlternative (current);

+				group.AppendExpression (alternation);

+			}

+			else

+				group.AppendExpression (current);

+		}

+

+		private Expression ParseGroupingConstruct (ref RegexOptions options) {

+			if (pattern[ptr] != '?') {

+				Group group;

+

+				if (IsExplicitCapture (options))

+					group = new Group ();

+				else {

+					group = new CapturingGroup ();

+					caps.Add (group);

+				}

+

+				ParseGroup (group, options, null);

+				return group;

+			}

+			else

+				++ ptr;

+

+			switch (pattern[ptr]) {

+			case ':': {						// non-capturing group

+				++ ptr;

+				Group group = new Group ();

+				ParseGroup (group, options, null);

+

+				return group;

+			}

+

+			case '>': {						// non-backtracking group

+				++ ptr;

+				Group group = new NonBacktrackingGroup ();

+				ParseGroup (group, options, null);

+				

+				return group;

+			}

+

+			case 'i': case 'm': case 'n':

+			case 's': case 'x': case '-': {				// options

+				RegexOptions o = options;

+				ParseOptions (ref o, false);

+				if (pattern[ptr] == '-') {

+					++ ptr;

+					ParseOptions (ref o, true);

+				}

+

+				if (pattern[ptr] == ':') {			// pass options to child group

+					++ ptr;

+					Group group = new Group ();

+					ParseGroup (group, o, null);

+					return group;

+				}

+				else if (pattern[ptr] == ')') {			// change options of enclosing group

+					++ ptr;

+					options = o;

+					return null;

+				}

+				else

+					throw NewParseException ("Bad options");

+			}

+

+			case '<': case '=': case '!': {				// lookahead/lookbehind

+				ExpressionAssertion asn = new ExpressionAssertion ();

+				if (!ParseAssertionType (asn))

+					goto case '\'';				// it's a (?<name> ) construct

+

+				Group test = new Group ();

+				ParseGroup (test, options, null);

+

+				asn.TestExpression = test;

+				return asn;

+			}

+

+			case '\'': {						// named/balancing group

+				char delim;

+				if (pattern[ptr] == '<')

+					delim = '>';

+				else

+					delim = '\'';

+

+				++ ptr;

+				string name = ParseName ();

+

+				if (pattern[ptr] == delim) {

+					// capturing group

+

+					if (name == null)

+						throw NewParseException ("Bad group name.");

+

+					++ ptr;

+					CapturingGroup cap = new CapturingGroup ();

+					cap.Name = name;

+					caps.Add (cap);

+					ParseGroup (cap, options, null);

+

+					return cap;

+				}

+				else if (pattern[ptr] == '-') {

+					// balancing group

+

+					++ ptr;

+					string balance_name = ParseName ();

+					if (balance_name == null || pattern[ptr] != delim)

+						throw NewParseException ("Bad balancing group name.");

+

+					++ ptr;

+					BalancingGroup bal = new BalancingGroup ();

+					bal.Name = name;

+					caps.Add (bal);

+					refs.Add (bal, balance_name);

+

+					return bal;

+				}

+				else

+					throw NewParseException ("Bad group name.");

+			}

+

+			case '(': {						// expression/capture test

+				Assertion asn;

+			

+				++ ptr;

+				int p = ptr;

+				string name = ParseName ();

+				if (name == null || pattern[ptr] != ')') {	// expression test

+					// FIXME MS implementation doesn't seem to

+					// implement this version of (?(x) ...)

+

+					ptr = p;

+					ExpressionAssertion expr_asn = new ExpressionAssertion ();

+

+					if (pattern[ptr] == '?') {

+						++ ptr;

+						if (!ParseAssertionType (expr_asn))

+							throw NewParseException ("Bad conditional.");

+					}

+					else {

+						expr_asn.Negate = false;

+						expr_asn.Reverse = false;

+					}

+

+					Group test = new Group ();

+					ParseGroup (test, options, null);

+					expr_asn.TestExpression = test;

+					asn = expr_asn;

+				}

+				else {						// capture test

+					++ ptr;

+					asn = new CaptureAssertion ();

+					refs.Add (asn, name);

+				}

+

+				Group group = new Group ();

+				ParseGroup (group, options, asn);

+				return group;

+			}

+

+			case '#': {						// comment

+				++ ptr;

+				while (pattern[ptr ++] != ')') {

+					if (ptr >= pattern.Length)

+						throw NewParseException ("Unterminated (?#...) comment.");

+				}

+				return null;

+			}

+

+			default: 						// error

+				throw NewParseException ("Bad grouping construct.");

+			}

+		}

+

+		private bool ParseAssertionType (ExpressionAssertion assertion) {

+			if (pattern[ptr] == '<') {

+				switch (pattern[ptr + 1]) {

+				case '=':

+					assertion.Negate = false;

+					break;

+				case '!':

+					assertion.Negate = true;

+					break;

+				default:

+					return false;

+				}

+

+				assertion.Reverse = true;

+				ptr += 2;

+			}

+			else {

+				switch (pattern[ptr]) {

+				case '=':

+					assertion.Negate = false;

+					break;

+				case '!':

+					assertion.Negate = true;

+					break;

+				default:

+					return false;

+				}

+

+				assertion.Reverse = false;

+				ptr += 1;

+			}

+

+			return true;

+		}

+

+		private void ParseOptions (ref RegexOptions options, bool negate) {

+			for (;;) {

+				switch (pattern[ptr]) {

+				case 'i':

+					if (negate)

+						options &= ~RegexOptions.IgnoreCase;

+					else

+						options |= RegexOptions.IgnoreCase;

+					break;

+

+				case 'm':

+					if (negate)

+						options &= ~RegexOptions.Multiline;

+					else

+						options |= RegexOptions.Multiline;

+					break;

+					

+				case 'n':

+					if (negate)

+						options &= ~RegexOptions.ExplicitCapture;

+					else

+						options |= RegexOptions.ExplicitCapture;

+					break;

+					

+				case 's':

+					if (negate)

+						options &= ~RegexOptions.Singleline;

+					else

+						options |= RegexOptions.Singleline;

+					break;

+					

+				case 'x':

+					if (negate)

+						options &= ~RegexOptions.IgnorePatternWhitespace;

+					else

+						options |= RegexOptions.IgnorePatternWhitespace;

+					break;

+

+				default:

+					return;

+				}

+

+				++ ptr;

+			}

+		}

+

+		private Expression ParseCharacterClass (RegexOptions options) {

+			bool negate, ecma;

+			if (pattern[ptr] == '^') {

+				negate = true;

+				++ ptr;

+			}

+			else

+				negate = false;

+			

+			ecma = IsECMAScript (options);

+			CharacterClass cls = new CharacterClass (negate, IsIgnoreCase (options));

+

+			if (pattern[ptr] == ']') {

+				cls.AddCharacter (']');

+				++ ptr;

+			}

+

+			int c = -1;

+			int last = -1;

+			bool range = false;

+			bool closed = false;

+			while (ptr < pattern.Length) {

+				c = pattern[ptr ++];

+

+				if (c == ']') {

+					closed = true;

+					break;

+				}

+				

+				if (c == '-') {

+					range = true;

+					continue;

+				}

+

+				if (c == '\\') {

+					c = ParseEscape ();

+					if (c < 0) {

+						// didn't recognize escape

+

+						c = pattern[ptr ++];

+						switch (c) {

+						case 'b': c = '\b'; break;

+

+						case 'd':

+							cls.AddCategory (ecma ? Category.EcmaDigit : Category.Digit, false);

+							last = -1;

+							continue;

+							

+						case 'w':

+							cls.AddCategory (ecma ? Category.EcmaWord : Category.Word, false);

+							last = -1;

+							continue;

+							

+						case 's':

+							cls.AddCategory (ecma ? Category.EcmaWhiteSpace : Category.WhiteSpace, false);

+							last = -1;

+							continue;

+							

+						case 'p':

+							cls.AddCategory (ParseUnicodeCategory (), false);	// ignore ecma

+							last = -1;

+							continue;

+							

+						case 'D':

+							cls.AddCategory (ecma ? Category.EcmaDigit : Category.Digit, true);

+							last = -1;

+							continue;

+							

+						case 'W':

+							cls.AddCategory (ecma ? Category.EcmaWord : Category.Word, true);

+							last = -1;

+							continue;

+							

+						case 'S':

+							cls.AddCategory (ecma ? Category.EcmaWhiteSpace : Category.WhiteSpace, true);

+							last = -1;

+							continue;

+							

+						case 'P':

+							cls.AddCategory (ParseUnicodeCategory (), true);

+							last = -1;

+							continue;

+

+						default: break;		// add escaped character

+						}

+					}

+				}

+

+				if (range) {

+					if (c < last)

+						throw NewParseException ("[x-y] range in reverse order.");

+

+					if (last >=0 )

+						cls.AddRange ((char)last, (char)c);

+					else {

+						cls.AddCharacter ((char)c);

+						cls.AddCharacter ('-');

+					}

+

+					range = false;

+					last = -1;

+				}

+				else {

+					cls.AddCharacter ((char)c);

+					last = c;

+				}

+			}

+

+			if (!closed)

+				throw NewParseException ("Unterminated [] set.");

+

+			if (range)

+				cls.AddCharacter ('-');

+

+			return cls;

+		}

+

+		private void ParseRepetitionBounds (out int min, out int max, RegexOptions options) {

+			int n, m;

+

+			/* check syntax */

+

+			ConsumeWhitespace (IsIgnorePatternWhitespace (options));

+			n = ParseNumber (10, 1, 0);

+			if (n < 0)

+				throw NewParseException ("Illegal {x,y} - bad value of x.");

+

+			ConsumeWhitespace (IsIgnorePatternWhitespace (options));

+			switch (pattern[ptr ++]) {

+			case '}':

+				m = n;

+				break;

+			case ',':

+				ConsumeWhitespace (IsIgnorePatternWhitespace (options));

+				m = ParseNumber (10, 1, 0);

+				ConsumeWhitespace (IsIgnorePatternWhitespace (options));

+				if (pattern[ptr ++] != '}')

+					throw NewParseException ("Illegal {x,y} - bad value of y.");

+				break;

+			default:

+				throw NewParseException ("Illegal {x,y}");

+			}

+

+			/* check bounds and ordering */

+

+			if (n >= 0xffff || m >= 0xffff)

+				throw NewParseException ("Illegal {x, y} - maximum of 65535.");

+			if (m >= 0 && m < n)

+				throw NewParseException ("Illegal {x, y} with x > y.");

+

+			/* assign min and max */

+			

+			min = n;

+			if (m > 0)

+				max = m;

+			else

+				max = 0xffff;

+		}

+

+		private Category ParseUnicodeCategory () {

+			if (pattern[ptr ++] != '{')

+				throw NewParseException ("Incomplete \\p{X} character escape.");

+

+			string name = ParseName (pattern, ref ptr);

+			if (name == null)

+				throw NewParseException ("Incomplete \\p{X} character escape.");

+

+			Category cat = CategoryUtils.CategoryFromName (name);

+			if (cat == Category.None)

+				throw NewParseException ("Unknown property '" + name + "'.");

+

+			if (pattern[ptr ++] != '}')

+				throw NewParseException ("Incomplete \\p{X} character escape.");

+

+			return cat;

+		}

+

+		private Expression ParseSpecial (RegexOptions options) {

+			int p = ptr;

+			bool ecma = IsECMAScript (options);

+			Expression expr = null;

+			

+			switch (pattern[ptr ++]) {

+

+			// categories

+

+			case 'd':

+				expr = new CharacterClass (ecma ? Category.EcmaDigit : Category.Digit, false);

+				break;

+				

+			case 'w':

+				expr = new CharacterClass (ecma ? Category.EcmaWord : Category.Word, false);

+				break;

+				

+			case 's':

+				expr = new CharacterClass (ecma ? Category.EcmaWhiteSpace : Category.WhiteSpace, false);

+				break;

+				

+			case 'p':

+				// this is odd - ECMAScript isn't supposed to support Unicode,

+				// yet \p{..} compiles and runs under the MS implementation

+				// identically to canonical mode. That's why I'm ignoring the

+				// value of ecma here.

+			

+				expr = new CharacterClass (ParseUnicodeCategory (), false);

+				break;

+				

+			case 'D':

+				expr = new CharacterClass (ecma ? Category.EcmaDigit : Category.Digit, true);

+				break;

+				

+			case 'W':

+				expr = new CharacterClass (ecma ? Category.EcmaWord : Category.Word, true);

+				break;

+				

+			case 'S':

+				expr = new CharacterClass (ecma ? Category.EcmaWhiteSpace : Category.WhiteSpace, true);

+				break;

+				

+			case 'P':

+				expr = new CharacterClass (ParseUnicodeCategory (), true);

+				break;

+

+			// positions

+

+			case 'A': expr = new PositionAssertion (Position.StartOfString); break;

+			case 'Z': expr = new PositionAssertion (Position.End); break;

+			case 'z': expr = new PositionAssertion (Position.EndOfString); break;

+			case 'G': expr = new PositionAssertion (Position.StartOfScan); break;

+			case 'b': expr = new PositionAssertion (Position.Boundary); break;

+			case 'B': expr = new PositionAssertion (Position.NonBoundary); break;

+			

+			// references

+

+			case '1': case '2': case '3': case '4': case '5':

+			case '6': case '7': case '8': case '9': {

+				ptr --;

+				int n = ParseNumber (10, 1, 0);

+				if (n < 0) {

+					ptr = p;

+					return null;

+				}

+

+				// FIXME test if number is within number of assigned groups

+				// this may present a problem for right-to-left matching

+

+				Reference reference = new Reference (IsIgnoreCase (options));

+				refs.Add (reference, n.ToString ());

+				expr = reference;

+				break;

+			}

+

+			case 'k': {

+				char delim = pattern[ptr ++];

+				if (delim == '<')

+					delim = '>';

+				else if (delim != '\'')

+					throw NewParseException ("Malformed \\k<...> named backreference.");

+

+				string name = ParseName ();

+				if (name == null || pattern[ptr] != delim)

+					throw NewParseException ("Malformed \\k<...> named backreference.");

+

+				++ ptr;

+				Reference reference = new Reference (IsIgnoreCase (options));

+				refs.Add (reference, name);

+				expr = reference;

+				break;

+			}

+

+			default:

+				expr = null;

+				break;

+			}

+

+			if (expr == null)

+				ptr = p;

+

+			return expr;

+		}

+

+		private int ParseEscape () {

+			int p = ptr;

+			int c;

+

+			switch (pattern[ptr ++]) {

+	

+			// standard escapes (except \b)

+

+			case 'a': return '\u0007';

+			case 't': return '\u0009';

+			case 'r': return '\u000d';

+			case 'v': return '\u000b';

+			case 'f': return '\u000c';

+			case 'n': return '\u000a';

+			case 'e': return '\u001b';

+			case '\\': return '\\';

+

+			// character codes

+

+			case '0': return ParseOctal (pattern, ref ptr);

+

+			case 'x':

+				c = ParseHex (pattern, ref ptr, 2);

+				if (c < 0)

+					throw NewParseException ("Insufficient hex digits");

+

+				return c;

+

+			case 'u':

+				c = ParseHex (pattern, ref ptr, 4);

+				if (c < 0)

+					throw NewParseException ("Insufficient hex digits");

+				

+				return c;

+

+			// control characters

+

+			case 'c':

+				c = pattern[p ++];

+				if (c >= 'A' && c <= 'Z')

+					return c - 'A';

+				else if (c >= '@' && c <= '_')

+					return c - '@';

+				else

+					throw NewParseException ("Unrecognized control character.");

+

+			// unknown escape

+

+			default:

+				ptr = p;

+				return -1;

+			}

+		}

+

+		private string ParseName () {

+			return Parser.ParseName (pattern, ref ptr);

+		}

+

+		private static bool IsNameChar (char c) {

+			UnicodeCategory cat = Char.GetUnicodeCategory (c);

+			if (cat == UnicodeCategory.ModifierLetter)

+				return false;

+			if (cat == UnicodeCategory.ConnectorPunctuation)

+				return true;

+			return Char.IsLetterOrDigit (c);

+		}

+	

+		private int ParseNumber (int b, int min, int max) {

+			return Parser.ParseNumber (pattern, ref ptr, b, min, max);

+		}

+

+		private int ParseDecimal () {

+			return Parser.ParseDecimal (pattern, ref ptr);

+		}

+

+		private static int ParseDigit (char c, int b, int n) {

+			switch (b) {

+			case 8:

+				if (c >= '0' && c <= '7')

+					return c - '0';

+				else

+					return -1;

+			case 10:

+				if (c >= '0' && c <= '9')

+					return c - '0';

+				else

+					return -1;

+			case 16:

+				if (c >= '0' && c <= '9')

+					return c - '0';

+				else if (c >= 'a' && c <= 'f')

+					return 10 + c - 'a';

+				else if (c >= 'A' && c <= 'F')

+					return 10 + c - 'A';

+				else

+					return -1;

+			default:

+				return -1;

+			}

+		}

+

+		private void ConsumeWhitespace (bool ignore) {

+			while (true) {

+				if (ptr >= pattern.Length)

+					break;

+			

+				if (pattern[ptr] == '(') {

+					if (ptr + 3 >= pattern.Length)

+						return;

+

+					if (pattern[ptr + 1] != '?' || pattern[ptr + 2] != '#')

+						return;

+

+					ptr += 3;

+					while (pattern[ptr ++] != ')')

+						/* ignore */ ;

+				}

+				else if (ignore && pattern[ptr] == '#') {

+					while (ptr < pattern.Length && pattern[ptr ++] != '\n')

+						/* ignore */ ;

+				}

+				else if (ignore && Char.IsWhiteSpace (pattern[ptr])) {

+					while (ptr < pattern.Length && Char.IsWhiteSpace (pattern[ptr]))

+						++ ptr;

+				}

+				else

+					return;

+			}

+		}

+

+		private string ParseString (string pattern) {

+			this.pattern = pattern;

+			this.ptr = 0;

+

+			string result = "";

+			while (ptr < pattern.Length) {

+				int c = pattern[ptr ++];

+				if (c == '\\')

+					c = ParseEscape ();

+				

+				result += (char)c;

+			}

+

+			return result;

+		}

+

+		private void ResolveReferences () {

+			int gid = 1;

+			Hashtable dict = new Hashtable ();

+

+			// number unnamed groups

+

+			foreach (CapturingGroup group in caps) {

+				if (group.Name == null) {

+					dict.Add (gid.ToString (), group);

+					group.Number = gid ++;

+

+					++ num_groups;

+				}

+			}

+

+			// number named groups

+

+			foreach (CapturingGroup group in caps) {

+				if (group.Name != null) {

+					if (!dict.Contains (group.Name)) {

+						dict.Add (group.Name, group);

+						group.Number = gid ++;

+

+						++ num_groups;

+					}

+					else {

+						CapturingGroup prev = (CapturingGroup)dict[group.Name];

+						group.Number = prev.Number;

+					}

+				}

+			}

+

+			// resolve references

+

+			foreach (Expression expr in refs.Keys) {

+				string name = (string)refs[expr];

+				if (!dict.Contains (name)) {

+					throw NewParseException ("Reference to undefined group " +

+						(Char.IsDigit (name[0]) ? "number " : "name ") +

+						name);

+				}

+

+				CapturingGroup group = (CapturingGroup)dict[name];

+				if (expr is Reference)

+					((Reference)expr).CapturingGroup = group;

+				else if (expr is CaptureAssertion)

+					((CaptureAssertion)expr).CapturingGroup = group;

+				else if (expr is BalancingGroup)

+					((BalancingGroup)expr).Balance = group;

+			}

+		}

+

+		// flag helper functions

+

+		private static bool IsIgnoreCase (RegexOptions options) {

+			return (options & RegexOptions.IgnoreCase) != 0;

+		}

+

+		private static bool IsMultiline (RegexOptions options) {

+			return (options & RegexOptions.Multiline) != 0;

+		}

+

+		private static bool IsExplicitCapture (RegexOptions options) {

+			return (options & RegexOptions.ExplicitCapture) != 0;

+		}

+	

+		private static bool IsSingleline (RegexOptions options) {

+			return (options & RegexOptions.Singleline) != 0;

+		}

+

+		private static bool IsIgnorePatternWhitespace (RegexOptions options) {

+			return (options & RegexOptions.IgnorePatternWhitespace) != 0;

+		}

+

+		private static bool IsRightToLeft (RegexOptions options) {

+			return (options & RegexOptions.RightToLeft) != 0;

+		}

+

+		private static bool IsECMAScript (RegexOptions options) {

+			return (options & RegexOptions.ECMAScript) != 0;

+		}

+

+		// exception creation

+

+		private ArgumentException NewParseException (string msg) {

+			msg = "parsing \"" + pattern + "\" - " + msg;

+			return new ArgumentException (msg, pattern);

+		}

+

+		private string pattern;

+		private int ptr;

+

+		private ArrayList caps;

+		private Hashtable refs;

+		private int num_groups;

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/quicksearch.cs b/mcs/class/System/System.Text.RegularExpressions/quicksearch.cs
new file mode 100644
index 00000000000..65665a2518b
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/quicksearch.cs
@@ -0,0 +1,108 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	quicksearch.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+

+namespace System.Text.RegularExpressions {

+

+	// TODO use simple test for single character strings

+

+	class QuickSearch {

+		// simplified boyer-moore for fast substring matching

+	

+		public QuickSearch (string str, bool ignore) {

+			this.str = str;

+			this.len = str.Length;

+			this.ignore = ignore;

+		

+			Setup ();

+		}

+		

+		public string String {

+			get { return str; }

+		}

+

+		public int Length {

+			get { return len; }

+		}

+

+		public bool IgnoreCase {

+			get { return ignore; }

+		}

+

+		public int Search (string text, int start, int end) {

+			if (end > text.Length - len)

+				end = text.Length - len;

+		

+			int ptr = start;

+			if (!ignore) {

+				while (ptr <= end) {

+					int i = len - 1;

+					while (str[i] == text[ptr + i]) {

+						if (-- i < 0)

+							return ptr;

+					}

+

+					if (ptr < end)

+						ptr += shift[text[ptr + len]];

+					else

+						break;

+				}

+			}

+			else {

+				// ignore case: same as above, but we convert text

+				// to lower case before doing the string compare

+			

+				while (ptr <= end) {

+					int i = len - 1;

+					while (str[i] == Char.ToLower (text[ptr + i])) {

+						if (-- i < 0)

+							return ptr;

+					}

+

+					if (ptr < end)

+						ptr += shift[text[ptr + len]];

+					else

+						break;

+				}

+			}

+

+			return -1;

+		}

+

+		// private

+

+		private void Setup () {

+			if (ignore)

+				str = str.ToLower ();

+

+			// this is a 64k entry shift table. that's 128kb per pattern!

+			// is it worth compressing this by only storing shifts within

+			// a (lo, hi) character range? for most substrings this would

+			// be around 50 bytes...

+

+			shift = new int[0x1000];

+			for (int i = 0; i < 0x1000; ++ i)

+				shift[i] = len + 1;

+

+			for (int i = 0; i < len; ++ i) {

+				char c = str[i];

+

+				shift[c] = len - i;

+				if (ignore)

+					shift[Char.ToUpper (c)] = len - i;

+			}

+		}

+

+		private string str;

+		private int len;

+		private bool ignore;

+

+		private int[] shift;

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/regex.cs b/mcs/class/System/System.Text.RegularExpressions/regex.cs
new file mode 100644
index 00000000000..ea91a187c90
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/regex.cs
@@ -0,0 +1,410 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	regex.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Text;

+using System.Collections;

+using System.Reflection;

+using System.Reflection.Emit;

+using System.Runtime.Serialization;

+

+using RegularExpression = System.Text.RegularExpressions.Syntax.RegularExpression;

+using Parser = System.Text.RegularExpressions.Syntax.Parser;

+

+namespace System.Text.RegularExpressions {

+	

+	public delegate string MatchEvaluator (Match match);

+

+	[Flags]

+	public enum RegexOptions {

+		None				= 0x000,

+		IgnoreCase			= 0x001,

+		Multiline			= 0x002,

+		ExplicitCapture			= 0x004,

+		Compiled			= 0x008,

+		Singleline			= 0x010,

+		IgnorePatternWhitespace		= 0x020,

+		RightToLeft			= 0x040,

+		ECMAScript			= 0x100

+	}

+	

+	[Serializable]

+	public class Regex : ISerializable {

+		public static void CompileToAssembly

+			(RegexCompilationInfo[] regexes, AssemblyName aname)

+		{

+			throw new Exception ("Not implemented.");

+		}

+

+		public static void CompileToAssembly

+			(RegexCompilationInfo[] regexes, AssemblyName aname,

+			 CustomAttributeBuilder[] attribs)

+		{

+			throw new Exception ("Not implemented.");

+		}

+

+		public static void CompileToAssembly

+			(RegexCompilationInfo[] regexes, AssemblyName aname,

+			 CustomAttributeBuilder[] attribs, string resourceFile)

+		{

+			throw new Exception ("Not implemented.");

+		}

+		

+		public static string Escape (string str) {

+			return Parser.Escape (str);

+		}

+

+		public static string Unescape (string str) {

+			return Parser.Unescape (str);

+		}

+

+		public static bool IsMatch (string input, string pattern) {

+			return IsMatch (input, pattern, RegexOptions.None);

+		}

+

+		public static bool IsMatch (string input, string pattern, RegexOptions options) {

+			Regex re = new Regex (pattern, options);

+			return re.IsMatch (input);

+		}

+

+		public static Match Match (string input, string pattern) {

+			return Regex.Match (input, pattern, RegexOptions.None);

+		}

+

+		public static Match Match (string input, string pattern, RegexOptions options) {

+			Regex re = new Regex (pattern, options);

+			return re.Match (input);

+		}

+

+		public static MatchCollection Matches (string input, string pattern) {

+			return Matches (input, pattern, RegexOptions.None);

+		}

+

+		public static MatchCollection Matches (string input, string pattern, RegexOptions options) {

+			Regex re = new Regex (pattern, options);

+			return re.Matches (input);

+		}

+

+		public static string Replace

+			(string input, string pattern, MatchEvaluator evaluator)

+		{

+			return Regex.Replace (input, pattern, evaluator, RegexOptions.None);

+		}

+

+		public static string Replace

+			(string input, string pattern, MatchEvaluator evaluator,

+			 RegexOptions options)

+		{

+			Regex re = new Regex (pattern, options);

+			return re.Replace (input, evaluator);

+		}

+

+		public static string Replace

+			(string input, string pattern, string replacement)

+		{

+			return Regex.Replace (input, pattern, replacement, RegexOptions.None);

+		}

+

+		public static string Replace

+			(string input, string pattern, string replacement,

+			 RegexOptions options)

+		{

+			Regex re = new Regex (pattern, options);

+			return re.Replace (input, replacement);

+		}

+

+		public static string[] Split (string input, string pattern) {

+			return Regex.Split (input, pattern, RegexOptions.None);

+		}

+

+		public static string[] Split (string input, string pattern, RegexOptions options) {

+			Regex re = new Regex (input, options);

+			return re.Split (input);

+		}

+

+		// private

+

+		private static FactoryCache cache = new FactoryCache (200);	// TODO put some meaningful number here

+

+		// constructors

+

+		protected Regex () {

+			// XXX what's this constructor for?

+		}

+

+		public Regex (string pattern) : this (pattern, RegexOptions.None) {

+		}

+

+		public Regex (string pattern, RegexOptions options) {

+			this.pattern = pattern;

+			this.options = options;

+		

+			this.factory = cache.Lookup (pattern, options);

+

+			// parse and install group mapping

+

+			Parser psr = new Parser ();

+			RegularExpression re = psr.ParseRegularExpression (pattern, options);

+			this.group_count = re.GroupCount;

+			this.mapping = psr.GetMapping ();

+

+			if (this.factory == null) {

+				// compile

+				

+				ICompiler cmp;

+				//if ((options & RegexOptions.Compiled) != 0)

+				//	throw new Exception ("Not implemented.");

+					//cmp = new CILCompiler ();

+				//else

+					cmp = new PatternCompiler ();

+

+				re.Compile (cmp, RightToLeft);

+

+				// install machine factory and add to pattern cache

+

+				this.factory = cmp.GetMachineFactory ();

+				cache.Add (pattern, options, this.factory);

+			}

+		}

+

+		protected Regex (SerializationInfo info, StreamingContext context) :

+			this (info.GetString ("pattern"), 

+			      (RegexOptions) info.GetValue ("options", typeof (RegexOptions))) {			

+		}

+

+

+		// public instance properties

+		

+		public RegexOptions Options {

+			get { return options; }

+		}

+

+		public bool RightToLeft {

+			get { return (options & RegexOptions.RightToLeft) != 0; }

+		}

+

+		// public instance methods

+		

+		public string[] GetGroupNames () {

+			string[] names = new string[mapping.Count];

+			mapping.Keys.CopyTo (names, 0);

+

+			return names;

+		}

+

+		public int[] GetGroupNumbers () {

+			int[] numbers = new int[mapping.Count];

+			mapping.Values.CopyTo (numbers, 0);

+

+			return numbers;

+		}

+

+		public string GroupNameFromNumber (int i) {

+			if (i >= group_count)

+				return "";

+		

+			foreach (string name in mapping.Keys) {

+				if ((int)mapping[name] == i)

+					return name;

+			}

+

+			return "";

+		}

+

+		public int GroupNumberFromName (string name) {

+			if (mapping.Contains (name))

+				return (int)mapping[name];

+

+			return -1;

+		}

+

+		// match methods

+		

+		public bool IsMatch (string input) {

+			return IsMatch (input, 0);

+		}

+

+		public bool IsMatch (string input, int startat) {

+			return Match (input, startat).Success;

+		}

+

+		public Match Match (string input) {

+			return Match (input, 0);

+		}

+

+		public Match Match (string input, int startat) {

+			return CreateMachine ().Scan (this, input, startat, input.Length);

+		}

+

+		public Match Match (string input, int startat, int length) {

+			return CreateMachine ().Scan (this, input, startat, startat + length);

+		}

+

+		public MatchCollection Matches (string input) {

+			return Matches (input, 0);

+		}

+

+		public MatchCollection Matches (string input, int startat) {

+			MatchCollection ms = new MatchCollection ();

+			Match m = Match (input, startat);

+			while (m.Success) {

+				ms.Add (m);

+				m = m.NextMatch ();

+			}

+

+			return ms;

+		}

+

+		// replace methods

+

+		public string Replace (string input, MatchEvaluator evaluator) {

+			return Replace (input, evaluator, Int32.MaxValue, 0);

+		}

+

+		public string Replace (string input, MatchEvaluator evaluator, int count) {

+			return Replace (input, evaluator, count, 0);

+		}

+

+		public string Replace (string input, MatchEvaluator evaluator, int count, int startat)

+		{

+			StringBuilder result = new StringBuilder ();

+			int ptr = startat;

+

+			Match m = Match (input, startat);

+			while (m.Success && count -- > 0) {

+				result.Append (input.Substring (ptr, m.Index - ptr));

+				result.Append (evaluator (m));

+

+				ptr = m.Index + m.Length;

+				m = m.NextMatch ();

+			}

+			result.Append (input.Substring (ptr));

+

+			return result.ToString ();

+		}

+

+		public string Replace (string input, string replacement) {

+			return Replace (input, replacement, Int32.MaxValue, 0);

+		}

+

+		public string Replace (string input, string replacement, int count) {

+			return Replace (input, replacement, count, 0);

+		}

+

+		public string Replace (string input, string replacement, int count, int startat) {

+			ReplacementEvaluator ev = new ReplacementEvaluator (this, replacement);

+			return Replace (input, new MatchEvaluator (ev.Evaluate), count, startat);

+		}

+

+		// split methods

+

+		public string[] Split (string input) {

+			return Split (input, Int32.MaxValue, 0);

+		}

+

+		public string[] Split (string input, int count) {

+			return Split (input, count, 0);

+		}

+

+		public string[] Split (string input, int count, int startat) {

+			ArrayList splits = new ArrayList ();

+			if (count == 0)

+				count = Int32.MaxValue;

+

+			int ptr = startat;

+			while (count -- > 0) {

+				Match m = Match (input, ptr);

+				if (!m.Success)

+					break;

+			

+				splits.Add (input.Substring (ptr, m.Index - ptr));

+				ptr = m.Index + m.Length;

+			}

+

+			if (count > 0)

+				splits.Add (input.Substring (ptr));

+

+			string[] result = new string[splits.Count];

+			splits.CopyTo (result);

+			return result;

+		}

+

+		// object methods

+		

+		public override string ToString () {

+			return pattern;

+		}

+

+		// ISerializable interface

+		public virtual void GetObjectData (SerializationInfo info, StreamingContext context) {

+			info.AddValue ("pattern", this.ToString (), typeof (string));

+			info.AddValue ("options", this.Options, typeof (RegexOptions));

+		}

+

+		// internal

+

+		internal int GroupCount {

+			get { return group_count; }

+		}

+

+		// private

+

+		private IMachine CreateMachine () {

+			return factory.NewInstance ();

+		}

+

+		protected internal string pattern;

+		private RegexOptions options;

+

+		private IMachineFactory factory;

+		private IDictionary mapping;

+		private int group_count;

+	}

+

+	[Serializable]

+	public class RegexCompilationInfo {

+		public RegexCompilationInfo (string pattern, RegexOptions options, string name, string full_namespace, bool is_public) {

+			this.pattern = pattern;

+			this.options = options;

+			this.name = name;

+			this.full_namespace = full_namespace;

+			this.is_public = is_public;

+		}

+

+		public bool IsPublic {

+			get { return is_public; }

+			set { is_public = value; }

+		}

+

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		public string Namespace {

+			get { return full_namespace; }

+			set { full_namespace = value; }

+		}

+

+		public RegexOptions Options {

+			get { return options; }

+			set { options = value; }

+		}

+

+		public string Pattern {

+			get { return pattern; }

+			set { pattern = value; }

+		}

+

+		// private

+

+		private string pattern, name, full_namespace;

+		private RegexOptions options;

+		private bool is_public;

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/replace.cs b/mcs/class/System/System.Text.RegularExpressions/replace.cs
new file mode 100644
index 00000000000..88b99f394bc
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/replace.cs
@@ -0,0 +1,181 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	replace.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Text;

+using System.Collections;

+

+using Parser = System.Text.RegularExpressions.Syntax.Parser;

+

+namespace System.Text.RegularExpressions {

+

+	class ReplacementEvaluator {

+		public static string Evaluate (string replacement, Match match) {

+			ReplacementEvaluator ev = new ReplacementEvaluator (match.Regex, replacement);

+			return ev.Evaluate (match);

+		}

+

+		public ReplacementEvaluator (Regex regex, string replacement) {

+			this.regex = regex;

+			terms = new ArrayList ();

+			Compile (replacement);

+		}

+

+		public string Evaluate (Match match) {

+			StringBuilder result = new StringBuilder ();

+			foreach (Term term in terms)

+				result.Append (term.GetResult (match));

+

+			return result.ToString ();

+		}

+

+		// private

+

+		private void Compile (string replacement) {

+			replacement = Parser.Unescape (replacement);

+			string literal = "";

+

+			int ptr = 0;

+			char c;

+			Term term = null;

+			while (ptr < replacement.Length) {

+				c = replacement[ptr ++];

+

+				if (c == '$') {

+					if (replacement[ptr] == '$') {

+						++ ptr;

+						break;

+					}

+

+					term = CompileTerm (replacement, ref ptr);

+				}

+

+				if (term != null) {

+					term.Literal = literal;

+					terms.Add (term);

+

+					term = null;

+					literal = "";

+				}

+				else

+					literal += c;

+			}

+

+			if (term == null && literal.Length > 0) {

+				terms.Add (new Term (literal));

+			}

+		}

+

+		private Term CompileTerm (string str, ref int ptr) {

+			char c = str[ptr];

+

+			if (Char.IsDigit (c)) {		// numbered group

+				int n = Parser.ParseDecimal (str, ref ptr);

+				if (n < 0 || n > regex.GroupCount)

+					throw new ArgumentException ("Bad group number.");

+				

+				return new Term (TermOp.Match, n);

+			}

+			

+			++ ptr;

+

+			switch (c) {

+			case '{': {			// named group

+				string name = Parser.ParseName (str, ref ptr);

+				if (str[ptr ++] != '}' || name == null)

+					throw new ArgumentException ("Bad group name.");

+				

+				int n = regex.GroupNumberFromName (name);

+				

+				if (n < 0)

+					throw new ArgumentException ("Bad group name.");

+

+				return new Term (TermOp.Match, n);

+			}

+

+			case '&':			// entire match

+				return new Term (TermOp.Match, 0);

+

+			case '`':			// text before match

+				return new Term (TermOp.PreMatch, 0);

+

+			case '\'':			// text after match

+				return new Term (TermOp.PostMatch, 0);

+

+			case '+':			// last group

+				return new Term (TermOp.Match, regex.GroupCount - 1);

+

+			case '_':			// entire text

+				return new Term (TermOp.All, 0);

+

+			default:

+				throw new ArgumentException ("Bad replacement pattern.");

+			}

+		}

+

+		private Regex regex;

+		private ArrayList terms;

+

+		private enum TermOp {

+			None,				// no action

+			Match,				// input within group

+			PreMatch,			// input before group

+			PostMatch,			// input after group

+			All				// entire input

+		}

+

+		private class Term {

+			public Term (TermOp op, int arg) {

+				this.op = op;

+				this.arg = arg;

+				this.literal = "";

+			}

+

+			public Term (string literal) {

+				this.op = TermOp.None;

+				this.arg = 0;

+				this.literal = literal;

+			}

+

+			public string Literal {

+				set { literal = value; }

+			}

+

+			public string GetResult (Match match) {

+				Group group = match.Groups[arg];

+			

+				switch (op) {

+				case TermOp.None:

+					return literal;

+

+				case TermOp.Match:

+					return literal + group.Value;

+

+				case TermOp.PreMatch:

+					return literal + group.Text.Substring (0, group.Index);

+

+				case TermOp.PostMatch:

+					return literal + group.Text.Substring (group.Index + group.Length);

+

+				case TermOp.All:

+					return literal + group.Text;

+				}

+

+				return "";

+			}

+		

+			public TermOp op;		// term type

+			public int arg;			// group argument

+			public string literal;		// literal to prepend

+

+			public override string ToString () {

+				return op.ToString () + "(" + arg + ") " + literal;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System/System.Text.RegularExpressions/syntax.cs b/mcs/class/System/System.Text.RegularExpressions/syntax.cs
new file mode 100644
index 00000000000..f0d0bc4ef78
--- /dev/null
+++ b/mcs/class/System/System.Text.RegularExpressions/syntax.cs
@@ -0,0 +1,976 @@
+//

+// assembly:	System

+// namespace:	System.Text.RegularExpressions

+// file:	syntax.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Collections;

+

+namespace System.Text.RegularExpressions.Syntax {

+	// collection classes

+	

+	class ExpressionCollection : CollectionBase {

+		public void Add (Expression e) {

+			List.Add (e);

+		}

+

+		public Expression this[int i] {

+			get { return (Expression)List[i]; }

+			set { List[i] = value; }

+		}

+

+		protected override void OnValidate (object o) {

+			// allow null elements

+		}

+	}

+

+	// abstract classes

+	

+	abstract class Expression {

+		public abstract void Compile (ICompiler cmp, bool reverse);

+		public abstract void GetWidth (out int min, out int max);

+

+		public int GetFixedWidth () {

+			int min, max;

+			GetWidth (out min, out max);

+

+			if (min == max)

+				return min;

+

+			return -1;

+		}

+

+		public virtual AnchorInfo GetAnchorInfo () {

+			return new AnchorInfo (this, GetFixedWidth ());

+		}

+

+		public virtual bool IsComplex () {

+			return true;

+		}

+	}

+

+	// composite expressions

+	

+	abstract class CompositeExpression : Expression {

+		public CompositeExpression () {

+			expressions = new ExpressionCollection ();

+		}

+

+		protected ExpressionCollection Expressions {

+			get { return expressions; }

+		}

+

+		protected void GetWidth (out int min, out int max, int count) {

+			min = Int32.MaxValue;

+			max = 0;

+			bool empty = true;

+

+			for (int i = 0; i < count; ++ i) {

+				Expression e = Expressions[i];

+				if (e == null)

+					continue;

+			

+				empty = false;

+				int a, b;

+				e.GetWidth (out a, out b);

+				if (a < min) min = a;

+				if (b > max) max = b;

+			}

+

+			if (empty)

+				min = max = 0;

+		}

+

+		private ExpressionCollection expressions;

+	}

+

+	// groups

+	

+	class Group : CompositeExpression {

+		public Group () {

+		}

+

+		public Expression Expression {

+			get { return Expressions[0]; }

+			set { Expressions[0] = value; }

+		}

+

+		public void AppendExpression (Expression e) {

+			Expressions.Add (e);

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			int count = Expressions.Count;

+			for (int i = 0; i < count; ++ i) {

+				Expression e;

+				if (reverse)

+					e = Expressions[count - i - 1];

+				else

+					e = Expressions[i];

+

+				e.Compile (cmp, reverse);

+			}

+		}

+

+		public override void GetWidth (out int min, out int max) {

+			min = 0;

+			max = 0;

+

+			foreach (Expression e in Expressions) {

+				int a, b;

+				e.GetWidth (out a, out b);

+				min += a;

+				if (max == Int32.MaxValue || b == Int32.MaxValue)

+					max = Int32.MaxValue;

+				else

+					max += b;

+			}

+		}

+

+		public override AnchorInfo GetAnchorInfo () {

+			int ptr;

+			int width = GetFixedWidth ();

+

+			ArrayList infos = new ArrayList ();

+			IntervalCollection segments = new IntervalCollection ();

+

+			// accumulate segments

+

+			ptr = 0;

+			foreach (Expression e in Expressions) {

+				AnchorInfo info = e.GetAnchorInfo ();

+				infos.Add (info);

+

+				if (info.IsPosition)

+					return new AnchorInfo (this, ptr + info.Offset, width, info.Position);

+

+				if (info.IsSubstring)

+					segments.Add (info.GetInterval (ptr));

+

+				if (info.IsUnknownWidth)

+					break;

+

+				ptr += info.Width;

+			}

+

+			// normalize and find the longest segment

+

+			segments.Normalize ();

+

+			Interval longest = Interval.Empty;

+			foreach (Interval segment in segments) {

+				if (segment.Size > longest.Size)

+					longest = segment;

+			}

+

+			// now chain the substrings that made this segment together

+

+			if (!longest.IsEmpty) {

+				string str = "";

+				bool ignore = false;

+

+				ptr = 0;

+				foreach (AnchorInfo info in infos) {

+					if (info.IsSubstring && longest.Contains (info.GetInterval (ptr))) {

+						str += info.Substring;	// TODO mark subexpressions

+						ignore |= info.IgnoreCase;

+					}

+

+					if (info.IsUnknownWidth)

+						break;

+

+					ptr += info.Width;

+				}

+

+				return new AnchorInfo (this, longest.low, width, str, ignore);

+			}

+

+			return new AnchorInfo (this, width);

+		}

+

+		public override bool IsComplex () {

+			bool comp = false;

+			foreach (Expression e in Expressions) {

+				comp |= e.IsComplex ();

+			}

+

+			return comp | GetFixedWidth () <= 0;

+		}

+	}

+

+	class RegularExpression : Group {

+		public RegularExpression () {

+			group_count = 0;

+		}

+

+		public int GroupCount {

+			get { return group_count; }

+			set { group_count = value; }

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			// info block

+

+			int min, max;

+			GetWidth (out min, out max);

+			cmp.EmitInfo (group_count, min, max);

+

+			// anchoring expression

+

+			AnchorInfo info = GetAnchorInfo ();

+			if (reverse)

+				info = new AnchorInfo (this, GetFixedWidth ());	// FIXME

+

+			LinkRef pattern = cmp.NewLink ();

+			cmp.EmitAnchor (info.Offset, pattern);

+

+			if (info.IsPosition)

+				cmp.EmitPosition (info.Position);

+			else if (info.IsSubstring)

+				cmp.EmitString (info.Substring, info.IgnoreCase, reverse);

+			

+			cmp.EmitTrue ();

+			

+			// pattern

+

+			cmp.ResolveLink (pattern);

+			base.Compile (cmp, reverse);

+			cmp.EmitTrue ();

+		}

+

+		private int group_count;

+	}

+

+	class CapturingGroup : Group {

+		public CapturingGroup () {

+			this.gid = 0;

+			this.name = null;

+		}

+

+		public int Number {

+			get { return gid; }

+			set { gid = value; }

+		}

+

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		public bool IsNamed {

+			get { return name != null; }

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			cmp.EmitOpen (gid);

+			base.Compile (cmp, reverse);

+			cmp.EmitClose (gid);

+		}

+

+		public override bool IsComplex () {

+			return true;

+		}

+

+		private int gid;

+		private string name;

+	}

+

+	class BalancingGroup : CapturingGroup {

+		public BalancingGroup () {

+			this.balance = null;

+		}

+

+		public CapturingGroup Balance {

+			get { return balance; }

+			set { balance = value; }

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			// can't invoke Group.Compile from here :(

+			// so I'll just repeat the code

+		

+			int count = Expressions.Count;

+			for (int i = 0; i < count; ++ i) {

+				Expression e;

+				if (reverse)

+					e = Expressions[count - i - 1];

+				else

+					e = Expressions[i];

+

+				e.Compile (cmp, reverse);

+			}

+

+			cmp.EmitBalance (this.Number, balance.Number);

+		}

+

+		private CapturingGroup balance;

+	}

+

+	class NonBacktrackingGroup : Group {

+		public NonBacktrackingGroup () {

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			LinkRef tail = cmp.NewLink ();

+

+			cmp.EmitSub (tail);

+			base.Compile (cmp, reverse);

+			cmp.EmitTrue ();

+			cmp.ResolveLink (tail);

+		}

+

+		public override bool IsComplex () {

+			return true;

+		}

+	}

+

+	// repetition

+

+	class Repetition : CompositeExpression {

+		public Repetition (int min, int max, bool lazy) {

+			Expressions.Add (null);

+			

+			this.min = min;

+			this.max = max;

+			this.lazy = lazy;

+		}

+

+		public Expression Expression {

+			get { return Expressions[0]; }

+			set { Expressions[0] = value; }

+		}

+

+		public int Minimum {

+			get { return min; }

+			set { min = value; }

+		}

+

+		public int Maximum {

+			get { return max; }

+			set { max = value; }

+		}

+

+		public bool Lazy {

+			get { return lazy; }

+			set { lazy = value; }

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			if (Expression.IsComplex ()) {

+				LinkRef until = cmp.NewLink ();

+				

+				cmp.EmitRepeat (min, max, lazy, until);

+				Expression.Compile (cmp, reverse);

+				cmp.EmitUntil (until);

+			}

+			else {

+				LinkRef tail = cmp.NewLink ();

+

+				cmp.EmitFastRepeat (min, max, lazy, tail);

+				Expression.Compile (cmp, reverse);

+				cmp.EmitTrue ();

+				cmp.ResolveLink (tail);

+			}

+		}

+

+		public override void GetWidth (out int min, out int max) {

+			Expression.GetWidth (out min, out max);

+			min = min * this.min;

+			if (max == Int32.MaxValue || this.max == 0xffff)

+				max = Int32.MaxValue;

+			else

+				max = max * this.max;

+		}

+

+		public override AnchorInfo GetAnchorInfo () {

+			int width = GetFixedWidth ();

+			if (Minimum == 0)

+				return new AnchorInfo (this, width);

+			

+			AnchorInfo info = Expression.GetAnchorInfo ();

+			if (info.IsPosition)

+				return new AnchorInfo (this, info.Offset, width, info.Position);

+			

+			if (info.IsSubstring) {

+				if (info.IsComplete) {

+					string str = "";

+					for (int i = 0; i < Minimum; ++ i)

+						str += info.Substring;

+

+					return new AnchorInfo (this, 0, width, str, info.IgnoreCase);

+				}

+

+				return new AnchorInfo (this, info.Offset, width, info.Substring, info.IgnoreCase);

+			}

+

+			return new AnchorInfo (this, width);

+		}

+

+		private int min, max;

+		private bool lazy;

+	}

+

+	// assertions

+

+	abstract class Assertion : CompositeExpression {

+		public Assertion () {

+			Expressions.Add (null);		// true expression

+			Expressions.Add (null);		// false expression

+		}

+

+		public Expression TrueExpression {

+			get { return Expressions[0]; }

+			set { Expressions[0] = value; }

+		}

+

+		public Expression FalseExpression {

+			get { return Expressions[1]; }

+			set { Expressions[1] = value; }

+		}

+

+		public override void GetWidth (out int min, out int max) {

+			GetWidth (out min, out max, 2);

+

+			if (TrueExpression == null || FalseExpression == null)

+				min = 0;

+		}

+	}

+

+	class CaptureAssertion : Assertion {

+		public CaptureAssertion () {

+		}

+

+		public CapturingGroup CapturingGroup {

+			get { return group; }

+			set { group = value; }

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			int gid = group.Number;

+			LinkRef tail = cmp.NewLink ();

+

+			if (FalseExpression == null) {

+				//    IfDefined :1

+				//      <yes_exp>

+				// 1: <tail>

+			

+				cmp.EmitIfDefined (gid, tail);

+				TrueExpression.Compile (cmp, reverse);

+			}

+			else {

+				//    IfDefined :1

+				//      <yes_expr>

+				//      Jump :2

+				// 1:   <no_expr>

+				// 2: <tail>

+			

+				LinkRef false_expr = cmp.NewLink ();

+				cmp.EmitIfDefined (gid, false_expr);

+				TrueExpression.Compile (cmp, reverse);

+				cmp.EmitJump (tail);

+				cmp.ResolveLink (false_expr);

+				FalseExpression.Compile (cmp, reverse);

+			}

+

+			cmp.ResolveLink (tail);

+		}

+

+		public override bool IsComplex () {

+			bool comp = false;

+			if (TrueExpression != null)

+				comp |= TrueExpression.IsComplex ();

+			if (FalseExpression != null)

+				comp |= FalseExpression.IsComplex ();

+

+			return comp | GetFixedWidth () <= 0;

+		}

+

+		private CapturingGroup group;

+	}

+

+	class ExpressionAssertion : Assertion {

+		public ExpressionAssertion () {

+			Expressions.Add (null);		// test expression

+		}

+

+		public bool Reverse {

+			get { return reverse; }

+			set { reverse = value; }

+		}

+

+		public bool Negate {

+			get { return negate; }

+			set { negate = value; }

+		}

+

+		public Expression TestExpression {

+			get { return Expressions[2]; }

+			set { Expressions[2] = value; }

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			LinkRef true_expr = cmp.NewLink ();

+			LinkRef false_expr = cmp.NewLink ();

+

+			// test op: positive / negative

+

+			if (!negate)

+				cmp.EmitTest (true_expr, false_expr);

+			else

+				cmp.EmitTest (false_expr, true_expr);

+			

+			// test expression: lookahead / lookbehind

+

+			TestExpression.Compile (cmp, reverse ^ this.reverse);

+			cmp.EmitTrue ();

+

+			// target expressions

+

+			if (TrueExpression == null) {			// (?= ...)

+				//    Test :1, :2

+				//      <test_expr>

+				// :2   False

+				// :1   <tail>

+			

+				cmp.ResolveLink (false_expr);

+				cmp.EmitFalse ();

+				cmp.ResolveLink (true_expr);

+			}

+			else {

+				cmp.ResolveLink (true_expr);

+				TrueExpression.Compile (cmp, reverse);

+				

+				if (FalseExpression == null) {		// (?(...) ...)

+					//    Test :1, :2

+					//      <test_expr>

+					// :1   <yes_expr>

+					// :2   <tail>

+

+					cmp.ResolveLink (false_expr);

+				}

+				else {					// (?(...) ... | ...)

+					//    Test :1, :2

+					//      <test_expr>

+					// :1   <yes_expr>

+					//      Jump :3

+					// :2   <no_expr>

+					// :3   <tail>

+				

+					LinkRef tail = cmp.NewLink ();

+				

+					cmp.EmitJump (tail);

+					cmp.ResolveLink (false_expr);

+					FalseExpression.Compile (cmp, reverse);

+					cmp.ResolveLink (tail);

+				}

+			}

+		}

+

+		private bool reverse, negate;

+	}

+

+	// alternation

+

+	class Alternation : CompositeExpression {

+		public Alternation () {

+		}

+

+		public ExpressionCollection Alternatives {

+			get { return Expressions; }

+		}

+

+		public void AddAlternative (Expression e) {

+			Alternatives.Add (e);

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			LinkRef next = cmp.NewLink ();

+			LinkRef tail = cmp.NewLink ();

+		

+			foreach (Expression e in Alternatives) {

+				cmp.EmitBranch (next);

+				e.Compile (cmp, reverse);

+				cmp.EmitJump (tail);

+				cmp.ResolveLink (next);

+			}

+

+			cmp.EmitFalse ();

+			cmp.ResolveLink (tail);

+		}

+

+		public override void GetWidth (out int min, out int max) {

+			GetWidth (out min, out max, Alternatives.Count);

+		}

+

+		public override bool IsComplex () {

+			bool comp = false;

+			foreach (Expression e in Alternatives) {

+				comp |= e.IsComplex ();

+			}

+

+			return comp | GetFixedWidth () <= 0;

+		}

+	}

+

+	// terminal expressions

+

+	class Literal : Expression {

+		public Literal (string str, bool ignore) {

+			this.str = str;

+			this.ignore = ignore;

+		}

+

+		public string String {

+			get { return str; }

+			set { str = value; }

+		}

+

+		public bool IgnoreCase {

+			get { return ignore; }

+			set { ignore = value; }

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			if (str.Length == 0)

+				return;

+

+			if (str.Length == 1)

+				cmp.EmitCharacter (str[0], false, ignore, reverse);

+			else

+				cmp.EmitString (str, ignore, reverse);

+		}

+

+		public override void GetWidth (out int min, out int max) {

+			min = max = str.Length;

+		}

+

+		public override AnchorInfo GetAnchorInfo () {

+			return new AnchorInfo (this, 0, str.Length, str, ignore);

+		}

+

+		public override bool IsComplex () {

+			return false;

+		}

+

+		private string str;

+		private bool ignore;

+	}

+

+	class PositionAssertion : Expression {

+		public PositionAssertion (Position pos) {

+			this.pos = pos;

+		}

+

+		public Position Position {

+			get { return pos; }

+			set { pos = value; }

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			cmp.EmitPosition (pos);

+		}

+

+		public override void GetWidth (out int min, out int max) {

+			min = max = 0;

+		}

+

+		public override bool IsComplex () {

+			return false;

+		}

+

+		public override AnchorInfo GetAnchorInfo () {

+			switch (pos) {

+			case Position.StartOfString: case Position.StartOfLine: case Position.StartOfScan:

+				return new AnchorInfo (this, 0, 0, pos);

+

+			default:

+				return new AnchorInfo (this, 0);

+			}

+		}

+

+		private Position pos;

+	}

+

+	class Reference : Expression {

+		public Reference (bool ignore) {

+			this.ignore = ignore;

+		}

+

+		public CapturingGroup CapturingGroup {

+			get { return group; }

+			set { group = value; }

+		}

+

+		public bool IgnoreCase {

+			get { return ignore; }

+			set { ignore = value; }

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			cmp.EmitReference (group.Number, ignore, reverse);

+		}

+

+		public override void GetWidth (out int min, out int max) {

+			//group.GetWidth (out min, out max);

+			// TODO set width to referenced group for non-cyclical references

+			min = 0;

+			max = Int32.MaxValue;

+		}

+

+		public override bool IsComplex () {

+			return true;	// FIXME incorporate cyclic check

+		}

+

+		private CapturingGroup group;

+		private bool ignore;

+	}

+

+	class CharacterClass : Expression {

+		public CharacterClass (bool negate, bool ignore) {

+			this.negate = negate;

+			this.ignore = ignore;

+

+			intervals = new IntervalCollection ();

+

+			// initialize pos/neg category arrays

+

+			Array cat_values = Enum.GetValues (typeof (Category));

+			int cat_size = (int)(Category)cat_values.GetValue (cat_values.Length - 1) + 1;

+			pos_cats = new bool[cat_size];

+			neg_cats = new bool[cat_size];

+			for (int i = 0; i < cat_size; ++ i) {

+				pos_cats[i] = false;

+				neg_cats[i] = false;

+			}

+		}

+

+		public CharacterClass (Category cat, bool negate) : this (false, false) {

+			this.AddCategory (cat, negate);

+		}

+

+		public bool Negate {

+			get { return negate; }

+			set { negate = value; }

+		}

+

+		public bool IgnoreCase {

+			get { return ignore; }

+			set { ignore = value; }

+		}

+

+		public void AddCategory (Category cat, bool negate) {

+			int n = (int)cat;

+			

+			if (negate) {

+				if (pos_cats[n])

+					pos_cats[n] = false;

+

+				neg_cats[n] = true;

+			}

+			else {

+				if (neg_cats[n])

+					neg_cats[n] = false;

+

+				pos_cats[n] = true;

+			}

+		}

+

+		public void AddCharacter (char c) {

+			intervals.Add (new Interval (c, c));

+		}

+

+		public void AddRange (char lo, char hi) {

+			intervals.Add (new Interval (lo, hi));

+		}

+

+		public override void Compile (ICompiler cmp, bool reverse) {

+			// create the meta-collection

+

+			IntervalCollection meta =

+				intervals.GetMetaCollection (new IntervalCollection.CostDelegate (GetIntervalCost));

+

+			// count ops

+			

+			int count = meta.Count;

+			for (int i = 0; i < pos_cats.Length; ++ i) {

+				if (pos_cats[i]) ++ count;

+				if (neg_cats[i]) ++ count;

+			}

+

+			if (count == 0)

+				return;

+

+			// emit in op for |meta| > 1

+

+			LinkRef tail = cmp.NewLink ();

+			if (count > 1)

+				cmp.EmitIn (tail);

+

+			// emit categories

+

+			for (int i = 0; i < pos_cats.Length; ++ i) {

+				if (pos_cats[i])

+					cmp.EmitCategory ((Category)i, negate, reverse);

+				else if (neg_cats[i])

+					cmp.EmitCategory ((Category)i, !negate, reverse);

+			}

+

+			// emit character/range/sets from meta-collection

+

+			foreach (Interval a in meta) {

+				if (a.IsDiscontiguous) {			// Set

+					BitArray bits = new BitArray (a.Size);

+					foreach (Interval b in intervals) {

+						if (a.Contains (b)) {

+							for (int i = b.low; i <= b.high; ++ i)

+								bits[i - a.low] = true;

+						}

+					}

+

+					cmp.EmitSet ((char)a.low, bits, negate, ignore, reverse);

+				}

+				else if (a.IsSingleton)				// Character

+					cmp.EmitCharacter ((char)a.low, negate, ignore, reverse);

+				else						// Range

+					cmp.EmitRange ((char)a.low, (char)a.high, negate, ignore, reverse);

+			}

+			

+			// finish up

+

+			if (count > 1) {

+				if (negate)

+					cmp.EmitTrue ();

+				else

+					cmp.EmitFalse ();

+

+				cmp.ResolveLink (tail);

+			}

+		}

+

+		public override void GetWidth (out int min, out int max) {

+			min = max = 1;

+		}

+

+		public override bool IsComplex () {

+			return false;

+		}

+

+		// private

+

+		private static double GetIntervalCost (Interval i) {

+			// use op length as cost metric (=> optimize for space)

+		

+			if (i.IsDiscontiguous)

+				return 3 + ((i.Size + 0xf) >> 4);		// Set

+			else if (i.IsSingleton)

+				return 2;					// Character

+			else

+				return 3;					// Range

+		}

+

+		private bool negate, ignore;

+		private bool[] pos_cats, neg_cats;

+		private IntervalCollection intervals;

+	}

+

+	class AnchorInfo {

+		private Expression expr;

+

+		private Position pos;

+		private int offset;

+

+		private string str;

+		private int width;

+		private bool ignore;

+

+		public AnchorInfo (Expression expr, int width) {

+			this.expr = expr;

+			this.offset = 0;

+			this.width = width;

+

+			this.str = null;

+			this.ignore = false;

+			this.pos = Position.Any;

+		}

+		

+		public AnchorInfo (Expression expr, int offset, int width, string str, bool ignore) {

+			this.expr = expr;

+			this.offset = offset;

+			this.width = width;

+

+			this.str = ignore ? str.ToLower () : str;

+

+			this.ignore = ignore;

+			this.pos = Position.Any;

+		}

+

+		public AnchorInfo (Expression expr, int offset, int width, Position pos) {

+			this.expr = expr;

+			this.offset = offset;

+			this.width = width;

+

+			this.pos = pos;

+

+			this.str = null;

+			this.ignore = false;

+		}

+

+		public Expression Expression {

+			get { return expr; }

+		}

+

+		public int Offset {

+			get { return offset; }

+		}

+

+		public int Width {

+			get { return width; }

+		}

+

+		public int Length {

+			get { return (str != null) ? str.Length : 0; }

+		}

+

+		public bool IsUnknownWidth {

+			get { return width < 0; }

+		}

+

+		public bool IsComplete {

+			get { return Length == Width; }

+		}

+

+		public string Substring {

+			get { return str; }

+		}

+

+		public bool IgnoreCase {

+			get { return ignore; }

+		}

+

+		public Position Position {

+			get { return pos; }

+		}

+

+		public bool IsSubstring {

+			get { return str != null; }

+		}

+

+		public bool IsPosition {

+			get { return pos != Position.Any; }

+		}

+

+		public Interval GetInterval () {

+			return GetInterval (0);

+		}

+

+		public Interval GetInterval (int start) {

+			if (!IsSubstring)

+				return Interval.Empty;

+

+			return new Interval (start + Offset, start + Offset + Length - 1);

+		}

+	}

+}

diff --git a/mcs/class/System/System.Threading/ChangeLog b/mcs/class/System/System.Threading/ChangeLog
new file mode 100755
index 00000000000..2f7f43e9fc6
--- /dev/null
+++ b/mcs/class/System/System.Threading/ChangeLog
@@ -0,0 +1,9 @@
+2001-09-21  Dick Porter  <dick@ximian.com>
+
+	* ThreadExceptionEventArgs.cs: Implemented
+
+2001-09-13  Dick Porter  <dick@ximian.com>
+
+	* ThreadExceptionEventArgs.cs, ThreadExceptionEventHandler.cs:
+	More System.Threading stubs, in the System assembly.
+
diff --git a/mcs/class/System/System.Threading/ThreadExceptionEventArgs.cs b/mcs/class/System/System.Threading/ThreadExceptionEventArgs.cs
new file mode 100755
index 00000000000..002324fe2db
--- /dev/null
+++ b/mcs/class/System/System.Threading/ThreadExceptionEventArgs.cs
@@ -0,0 +1,27 @@
+//
+// System.Threading.ThreadExceptionEventArgs.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public class ThreadExceptionEventArgs : EventArgs
+	{
+		private Exception exception;
+		
+		public ThreadExceptionEventArgs(Exception t) {
+			exception=t;
+		}
+
+		public Exception Exception {
+			get {
+				return(exception);
+			}
+		}
+	}
+}
diff --git a/mcs/class/System/System.Threading/ThreadExceptionEventHandler.cs b/mcs/class/System/System.Threading/ThreadExceptionEventHandler.cs
new file mode 100755
index 00000000000..6f47d2bdd96
--- /dev/null
+++ b/mcs/class/System/System.Threading/ThreadExceptionEventHandler.cs
@@ -0,0 +1,14 @@
+//
+// System.Threading.ThreadExceptionEventHandler.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public delegate void ThreadExceptionEventHandler(object sender, ThreadExceptionEventArgs e);
+}
diff --git a/mcs/class/System/System.build b/mcs/class/System/System.build
new file mode 100644
index 00000000000..2473c69866e
--- /dev/null
+++ b/mcs/class/System/System.build
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System.dll -->
+
+<project name="System" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<mkdir dir="../lib"/>
+		<csc target="library" output="../lib/System.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/unsafe"/>
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+			<arg value="/lib:../lib/"/>
+			
+			<!-- cor compare dies with these currently -->
+			<!--arg value="/nostdlib"/--> 	<!-- don't reference mscorlib -->
+			<!--arg value="/r:corlib.dll"/-->
+			<arg value="/r:System.Xml.dll"/>
+			<sources>
+				<includes name="**/*.cs"/> 
+				<excludes name="Test/**"/>
+				<excludes name="System.CodeDom/Code-X-Collection.cs"/>
+				<excludes name="System.Net/IAuthenticationModule.cs"/>
+				<excludes name="System.Net/AuthenticationManager.cs"/>
+			</sources>
+		</csc>
+		<copy file="../lib/System.dll" tofile="Test/System.dll"/>
+		<nant basedir="Test" target="build"/>
+	</target>
+
+	<target name="test" depends="build">
+		<nant basedir="Test" target="test"/>
+	</target>
+
+	<target name="clean">
+		<nant basedir="Test" target="clean"/>
+		<delete file="../lib/System.dll" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/System/System/ChangeLog b/mcs/class/System/System/ChangeLog
new file mode 100644
index 00000000000..d7bd8226c95
--- /dev/null
+++ b/mcs/class/System/System/ChangeLog
@@ -0,0 +1,45 @@
+
+Mon Jun 17 15:05:05 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Uri.cs: workaround for mcs bug.
+
+2002-05-28  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Uri.cs: Implemented ctor UriTest (baseUri, relativeUri)
+	* Uri.cs: Fixed bug in internal method GetSchemeDelimiter
+
+2002-05-22  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Uri.cs: implemented MakeRelative, improved GetLeftPart
+	* UriBuilder.cs: removed Serializable attribute
+	* UriHostNameType.cs: added Basic
+
+2002-05-12  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Uri.LocalPath and Uri.AbsoluteUri modified to support both w32 
+	and *nix filepaths
+
+2002-05-09  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Uri.GetLeftPart fixed for mailto and news schemes.
+
+2002-05-05  Lawrence Pit <loz@cable.a2000.nl>
+
+	* UriBuilder.cs: Implemented.
+	
+	* Uri.cs: Complete new reimplementation. 
+
+2002-02-08  Duncan Mak  <duncan@ximian.com>
+
+	* UriFormatException.cs: Removed TODO attribute, the docs are
+	probably wrong here. In any case, this code compiles and should work.
+
+2002-01-31  Duncan Mak  <duncan@ximian.com>
+
+	* UriFormatException.cs: Added bits for serialization.
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* ChangeLog : Add to this directory.
+
+	* Uri.cs, UriFormatException.cs : Decorate bits with MonoTODO attribute.
diff --git a/mcs/class/System/System/TODOAttribute.cs b/mcs/class/System/System/TODOAttribute.cs
new file mode 100644
index 00000000000..e14b61a2649
--- /dev/null
+++ b/mcs/class/System/System/TODOAttribute.cs
@@ -0,0 +1,32 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All)]
+	internal class MonoTODOAttribute : Attribute {
+
+		string comment;
+		
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+	}
+}
diff --git a/mcs/class/System/System/Uri.cs b/mcs/class/System/System/Uri.cs
new file mode 100755
index 00000000000..d477dfa70cd
--- /dev/null
+++ b/mcs/class/System/System/Uri.cs
@@ -0,0 +1,823 @@
+//
+// System.Uri
+//
+// Author:
+//    Lawrence Pit (loz@cable.a2000.nl)
+//
+// Author:
+//    Garrett Rooney (rooneg@electricjellyfish.net)
+//
+// (C) 2001 Garrett Rooney
+//
+
+using System.Net;
+using System.Runtime.Serialization;
+using System.Text;
+
+// See RFC 2396 for more info on URI's.
+
+// TODO: optimize by parsing host string only once
+
+namespace System 
+{
+	[Serializable]
+	public class Uri : MarshalByRefObject, ISerializable 
+	{
+		// NOTES:
+		// o  scheme excludes the scheme delimiter
+		// o  port is -1 to indicate no port is defined
+		// o  path is empty or starts with / when scheme delimiter == "://"
+		// o  query is empty or starts with ? char
+		// o  fragment is empty or starts with # char
+		// o  all class variables are in escaped format when they are escapable,
+		//    except cachedToString.
+		
+		private string scheme = String.Empty;
+		private string host = String.Empty;
+		private int port = -1;
+		private string path = String.Empty;
+		private string query = String.Empty;
+		private string fragment = String.Empty;
+		private string userinfo = String.Empty;
+		
+		private bool userEscaped = false;
+		private string cachedAbsoluteUri = null;
+		private string cachedToString = null;
+		private int cachedHashCode = 0;
+		
+		private static readonly string hexUpperChars = "0123456789ABCDEF";
+	
+		// Fields
+		
+		public static readonly string SchemeDelimiter = "://";
+		public static readonly string UriSchemeFile = "file";
+		public static readonly string UriSchemeFtp = "ftp";
+		public static readonly string UriSchemeGopher = "gopher";
+		public static readonly string UriSchemeHttp = "http";
+		public static readonly string UriSchemeHttps = "https";
+		public static readonly string UriSchemeMailto = "mailto";
+		public static readonly string UriSchemeNews = "news";
+		public static readonly string UriSchemeNntp = "nntp";
+
+		// Constructors		
+
+		public Uri (string uriString) : this (uriString, false) 
+		{
+		}
+
+		[MonoTODO]
+		protected Uri (SerializationInfo serializationInfo, 
+			       StreamingContext streamingContext) :
+			this (serializationInfo.GetString ("Uri"), true)
+		{
+			// TODO: check whether this is compatible with ms.net
+		}
+
+		public Uri (string uriString, bool dontEscape) 
+		{			
+			userEscaped = dontEscape;
+			Parse (uriString);
+			
+			if (userEscaped) 
+				return;
+			
+			host = EscapeString (host, false, true, false);
+			path = EscapeString (path);
+			query = EscapeString (query);
+			fragment = EscapeString (fragment, false, false, true);
+		}
+
+		public Uri (Uri baseUri, string relativeUri) 
+			: this (baseUri, relativeUri, false) 
+		{			
+		}
+
+		public Uri (Uri baseUri, string relativeUri, bool dontEscape) 
+		{
+			// See RFC 2396 Par 5.2 and Appendix C
+
+			userEscaped = dontEscape;
+
+			this.scheme = baseUri.scheme;
+			this.host = baseUri.host;
+			this.port = baseUri.port;
+			this.userinfo = baseUri.userinfo;
+			
+			if (relativeUri == null)
+				throw new NullReferenceException ("relativeUri");
+
+			if (relativeUri == String.Empty) {
+				this.path = baseUri.path;
+				this.query = baseUri.query;
+				this.fragment = baseUri.fragment;
+				return;
+			}
+			
+			int pos = relativeUri.IndexOf (':');
+			if (pos != -1) {
+				int pos2 = relativeUri.IndexOfAny (new char [] {'/', '\\'});
+				if (pos2 > pos) {
+					// equivalent to new Uri (relativeUri, dontEscape)
+					Parse (relativeUri);
+
+					if (userEscaped) 
+						return;
+
+					host = EscapeString (host, false, true, false);
+					path = EscapeString (path);
+					query = EscapeString (query);
+					fragment = EscapeString (fragment, false, false, true);
+					return;
+				}
+			}
+						
+			// 8 fragment
+			pos = relativeUri.IndexOf ('#');
+			if (pos != -1) {
+				fragment = relativeUri.Substring (pos);
+				if (!userEscaped)
+					fragment = EscapeString (fragment, false, false, true);
+				relativeUri = relativeUri.Substring (0, pos);
+			}
+
+			// 6 query
+			pos = relativeUri.IndexOf ('?');
+			if (pos != -1) {
+				query = relativeUri.Substring (pos);
+				if (!userEscaped)
+					query = EscapeString (query);
+				relativeUri = relativeUri.Substring (0, pos);
+			}
+
+			if (relativeUri[0] == '/') {
+				path = relativeUri;
+				if (!userEscaped)
+					path = EscapeString (path);
+				return;
+			}
+			
+			// par 5.2 step 6 a)
+			path = baseUri.path;
+			pos = path.LastIndexOf ('/');
+			if (pos > 0) 
+				path = path.Substring (0, pos + 1);
+				
+			// 6 b)
+			path += relativeUri;
+			
+			// 6 c)
+			int startIndex = 0;
+			while (true) {
+				pos = path.IndexOf ("./", startIndex);
+				if (pos == -1)
+					break;
+				if (pos == 0)
+					path = path.Remove (0, 2);
+				else if (path [pos - 1] != '.')
+					path = path.Remove (pos, 2);
+				else
+					startIndex = pos + 1;
+			}
+			
+			// 6 d)
+			if (path.Length > 1 && 
+			    path [path.Length - 1] == '.' &&
+			    path [path.Length - 2] == '/')
+				path = path.Remove (path.Length - 1, 1);
+			
+			// 6 e)
+			startIndex = 0;
+			while (true) {
+				pos = path.IndexOf ("/../", startIndex);
+				if (pos == -1)
+					break;
+				if (pos == 0) {
+					startIndex = 3;
+					continue;
+				}
+				int pos2 = path.LastIndexOf ('/', pos - 1);
+				if (pos2 == -1) {
+					startIndex = pos + 1;
+				} else {
+					if (path.Substring (pos2 + 1, pos - pos2 - 1) != "..")
+						path = path.Remove (pos2 + 1, pos - pos2 + 3);
+					else
+						startIndex = pos + 1;
+				}
+			}
+			
+			// 6 f)
+			if (path.Length > 3 && path.EndsWith ("/..")) {
+				pos = path.LastIndexOf ('/', path.Length - 4);
+				Console.WriteLine ("6f " + pos);
+				if (pos != -1)
+					if (path.Substring (pos + 1, path.Length - pos - 4) != "..")
+						path = path.Remove (pos + 1, path.Length - pos - 1);
+			}
+			
+			if (!userEscaped)
+				path = EscapeString (path);
+		}		
+		
+		// Properties
+		
+		public string AbsolutePath { 
+			get { return path; } 
+		}
+
+		public string AbsoluteUri { 
+			get { 
+				if (cachedAbsoluteUri == null)
+					cachedAbsoluteUri = GetLeftPart (UriPartial.Path) + query + fragment;
+				return cachedAbsoluteUri;
+			} 
+		}
+
+		public string Authority { 
+			get { 
+				return (GetDefaultPort (scheme) == port)
+				     ? host : host + ":" + port;
+			} 
+		}
+
+		public string Fragment { 
+			get { return fragment; } 
+		}
+
+		public string Host { 
+			get { return host; } 
+		}
+
+		public UriHostNameType HostNameType { 
+			get { return CheckHostName (host); } 
+		}
+
+		public bool IsDefaultPort { 
+			get { return GetDefaultPort (scheme) == port; } 
+		}
+
+		public bool IsFile { 
+			get { return (scheme == UriSchemeFile); }
+		}
+
+		public bool IsLoopback { 
+			get { 
+				if (host == String.Empty)
+					return false;
+					
+				if (host == "loopback" || host == "localhost") 
+					return true;
+					
+				try {
+					return IPAddress.IsLoopback (IPAddress.Parse (host));
+				} catch (FormatException) {}
+
+				try {
+					return IPv6Address.IsLoopback (IPv6Address.Parse (host));
+				} catch (FormatException) {}
+				
+				return false;
+			} 
+		}
+
+		public bool IsUnc { 
+			get { return (scheme == Uri.UriSchemeFile); } 
+		}
+
+		public string LocalPath { 
+			get { 
+				if (!IsUnc)
+					return path;				
+				
+				// support *nix and W32 styles
+				if (path.Length > 1 && path [1] == ':')
+					return path.Replace ('/', '\\');
+					
+				if (System.IO.Path.DirectorySeparatorChar == '\\')
+					return "\\\\" + host + path.Replace ('/', '\\');
+				else 
+					return "/" + host + path;
+			} 
+		}
+
+		public string PathAndQuery { 
+			get { return path + query; } 
+		}
+
+		public int Port { 
+			get { return port; } 
+		}
+
+		public string Query { 
+			get { return query; } 
+		}
+
+		public string Scheme { 
+			get { return scheme; } 
+		}
+
+		public string [] Segments { 
+			get { 
+				string p = path.EndsWith ("/") 
+				         ? path.Remove (path.Length - 1, 1)
+				         : path;
+				string [] segments = p.Split ('/');
+				int len = segments.Length - 1;
+				for (int i = 0; i < len; i++) 
+					segments [i] += '/';
+				if (path.EndsWith ("/"))
+					segments [len] += '/';
+				return segments;
+			} 
+		}
+
+		public bool UserEscaped { 
+			get { return userEscaped; } 
+		}
+
+		public string UserInfo { 
+			get { return userinfo; }
+		}
+		
+
+		// Methods		
+		
+		public static UriHostNameType CheckHostName (string name) 
+		{
+			if (name == null || name.Length == 0)
+				return UriHostNameType.Unknown;
+
+			if (IsIPv4Address (name)) 
+				return UriHostNameType.IPv4;
+				
+			if (IsDomainAddress (name))
+				return UriHostNameType.Dns;				
+				
+			try {
+				IPv6Address.Parse (name);
+				return UriHostNameType.IPv6;
+			} catch (FormatException) {}
+			
+			return UriHostNameType.Unknown;
+		}
+		
+		internal static bool IsIPv4Address (string name)
+		{		
+			string [] captures = name.Split (new char [] {'.'});
+			if (captures.Length != 4)
+				return false;
+			for (int i = 0; i < 4; i++) {
+				try {
+					int d = Int32.Parse (captures [i]);
+					if (d < 0 || d > 255)
+						return false;
+				} catch (Exception) {
+					return false;
+				}
+			}
+			return true;
+		}			
+				
+		internal static bool IsDomainAddress (string name)
+		{
+			int len = name.Length;
+			
+			if (name [len - 1] == '.')
+				return false;
+				
+			int count = 0;
+			for (int i = 0; i < len; i++) {
+				char c = name [i];
+				if (count == 0) {
+					if (!Char.IsLetterOrDigit (c))
+						return false;
+				} else if (c == '.') {
+					count = 0;
+				} else if (!Char.IsLetterOrDigit (c) && c != '-' && c != '_') {
+					return false;
+				}
+				if (++count == 64)
+					return false;
+			}
+			
+			return true;
+		}
+
+		public static bool CheckSchemeName (string schemeName) 
+		{
+			if (schemeName == null || schemeName.Length == 0)
+				return false;
+			
+			if (!Char.IsLetter (schemeName [0]))
+				return false;
+
+			int len = schemeName.Length;
+			for (int i = 1; i < len; i++) {
+				char c = schemeName [i];
+				if (!Char.IsLetterOrDigit (c) || c != ',' || c != '+' || c != '-')
+					return false;
+			}
+			
+			return true;
+		}
+		
+		public override bool Equals (object comparant) 
+		{
+			if (comparant == null) 
+				return false;
+				
+			Uri uri = comparant as Uri;
+			if (uri == null) {
+				string s = comparant as String;
+				if (s == null)
+					return false;
+				uri = new Uri (s);
+			}
+			
+			return ((this.scheme == uri.scheme) &&
+			        (this.userinfo == uri.userinfo) &&
+			        (this.host == uri.host) &&
+			        (this.port == uri.port) &&
+			        (this.path == uri.path) &&
+			        (this.query == uri.query));
+		}		
+		
+		public override int GetHashCode () 
+		{
+			if (cachedHashCode == 0)			
+				cachedHashCode = scheme.GetHashCode ()
+				               + userinfo.GetHashCode ()
+					       + host.GetHashCode ()
+					       + port
+					       + path.GetHashCode ()
+					       + query.GetHashCode ();			           
+			return cachedHashCode;				
+		}
+		
+		public string GetLeftPart (UriPartial part) 
+		{
+			int defaultPort;
+			switch (part) {				
+			case UriPartial.Scheme : 
+				return scheme + GetSchemeDelimiter (scheme); 				
+			case UriPartial.Authority :
+				if (host == String.Empty ||
+				    scheme == Uri.UriSchemeMailto ||
+				    scheme == Uri.UriSchemeNews)
+					return String.Empty;
+					
+				StringBuilder s = new StringBuilder ();
+				s.Append (scheme);
+				s.Append (GetSchemeDelimiter (scheme));
+				if (path.Length > 1 && path [1] == ':' && "file".Equals (scheme)) 
+					s.Append ('/');  // win32 file
+				if (userinfo.Length > 0) 
+					s.Append (userinfo).Append ('@');
+				s.Append (host);
+				defaultPort = GetDefaultPort (scheme);
+				if ((port != -1) && (port != defaultPort))
+					s.Append (':').Append (port);			 
+				return s.ToString ();				
+			case UriPartial.Path :			
+				StringBuilder sb = new StringBuilder ();
+				sb.Append (scheme);
+				sb.Append (GetSchemeDelimiter (scheme));
+				if (path.Length > 1 && path [1] == ':' && "file".Equals (scheme)) 
+					sb.Append ('/');  // win32 file
+				if (userinfo.Length > 0) 
+					sb.Append (userinfo).Append ('@');
+				sb.Append (host);
+				defaultPort = GetDefaultPort (scheme);
+				if ((port != -1) && (port != defaultPort))
+					sb.Append (':').Append (port);			 
+				sb.Append (path);
+				return sb.ToString ();
+			}
+			return null;
+		}
+
+		public static int FromHex (char digit) 
+		{
+			if ('0' <= digit && digit <= '9') {
+				return (int) (digit - '0');
+			}
+				
+			if ('a' <= digit && digit <= 'f')
+				return (int) (digit - 'a' + 10);
+
+			if ('A' <= digit && digit <= 'F')
+				return (int) (digit - 'A' + 10);
+				
+			throw new ArgumentException ("digit");
+		}
+
+		public static string HexEscape (char character) 
+		{
+			if (character > 255) {
+				throw new ArgumentOutOfRangeException ("character");
+			}
+			
+			return "%" + hexUpperChars [((character & 0xf0) >> 4)] 
+			           + hexUpperChars [((character & 0x0f))];
+		}
+
+		public static char HexUnescape (string pattern, ref int index) 
+		{
+			if (pattern == null) 
+				throw new ArgumentException ("pattern");
+				
+			if (index < 0 || index >= pattern.Length)
+				throw new ArgumentOutOfRangeException ("index");	
+				
+			if (((index + 3) > pattern.Length) ||
+			    (pattern [index] != '%') || 
+			    !IsHexDigit (pattern [index + 1]) || 
+			    !IsHexDigit (pattern [index + 2]))
+			{
+				return pattern[index++];
+			}
+			
+			index++;
+			return (char) ((FromHex (pattern [index++]) << 4) + FromHex (pattern [index++]));
+		}
+
+		public static bool IsHexDigit (char digit) 
+		{
+			return (('0' <= digit && digit <= '9') ||
+			        ('a' <= digit && digit <= 'f') ||
+			        ('A' <= digit && digit <= 'F'));
+		}
+
+		public static bool IsHexEncoding (string pattern, int index) 
+		{
+			if ((index + 3) > pattern.Length)
+				return false;
+
+			return ((pattern [index++] == '%') &&
+			        IsHexDigit (pattern [index++]) &&
+			        IsHexDigit (pattern [index]));
+		}
+
+		public string MakeRelative (Uri toUri) 
+		{
+			if ((this.Scheme != toUri.Scheme) ||
+			    (this.Authority != toUri.Authority))
+				return toUri.ToString ();
+				
+			if (this.path == toUri.path)
+				return String.Empty;
+				
+			string [] segments = this.Segments;
+			string [] segments2 = toUri.Segments;
+			
+			int k = 0;
+			int max = Math.Max (segments.Length, segments2.Length);
+			for (; k < max; k++)
+				if (segments [k] != segments2 [k]) 
+					break;
+			
+			string result = String.Empty;
+			for (int i = k + 1; i < segments.Length; i++)
+				result += "../";
+			for (int i = k; i < segments2.Length; i++)
+				result += segments2 [i];
+			
+			return result;
+		}
+
+		public override string ToString () 
+		{
+			if (cachedToString != null) 
+				return cachedToString;
+				
+			cachedToString = Unescape (AbsoluteUri);
+			
+			return cachedToString;
+		}
+
+		[MonoTODO]
+		public void GetObjectData (SerializationInfo info, 
+					  StreamingContext context)
+		{
+			// TODO: check whether this is compatible with ms.net
+			info.AddValue ("Uri", this.AbsoluteUri);
+		}
+
+
+		// Internal Methods		
+
+		protected static string EscapeString (string str) 
+		{
+			return EscapeString (str, false, true, true);
+		}
+		
+		internal static string EscapeString (string str, bool escapeReserved, bool escapeHex, bool escapeBrackets) 
+		{
+			if (str == null)
+				return String.Empty;
+			
+			StringBuilder s = new StringBuilder ();
+			int len = str.Length;	
+			for (int i = 0; i < len; i++) {
+				char c = str [i];
+				// reserved    = ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" | "$" | ","
+				// mark        = "-" | "_" | "." | "!" | "~" | "*" | "'" | "(" | ")"
+				// control     = <US-ASCII coded characters 00-1F and 7F hexadecimal>
+				// space       = <US-ASCII coded character 20 hexadecimal>
+				// delims      = "<" | ">" | "#" | "%" | <">
+				// unwise      = "{" | "}" | "|" | "\" | "^" | "[" | "]" | "`"
+
+				if ((c <= 0x20) || (c >= 0x7f) || 
+				    ("<>%\"{}|\\^`".IndexOf (c) != -1) ||
+				    (escapeHex && (c == '#')) ||
+				    (escapeBrackets && (c == '[' || c == ']')) ||
+				    (escapeReserved && (";/?:@&=+$,".IndexOf (c) != -1))) {
+					s.Append (HexEscape (c));
+					continue;
+				}
+					
+				s.Append (c);
+			}
+			
+			return s.ToString ();
+		}		
+		
+		protected virtual string Unescape (string str) 
+		{
+			if (str == null)
+				return String.Empty;
+			StringBuilder s = new StringBuilder ();
+			int len = str.Length;
+			for (int i = 0; i < len; i++) {
+				char c = str [i];
+				if (c == '%') {
+					s.Append (HexUnescape (str, ref i));
+					i--;
+				} else
+					s.Append (c);					
+			}
+			return s.ToString ();
+		}
+
+		
+		// Private Methods
+		
+		// this parse method is as relaxed as possible about the format
+		// it will hardly ever throw a UriFormatException
+		private void Parse (string uriString)
+		{			
+			//
+			// From RFC 2396 :
+			//
+			//      ^(([^:/?#]+):)?(//([^/?#]*))?([^?#]*)(\?([^#]*))?(#(.*))?
+			//       12            3  4          5       6  7        8 9
+			//			
+			
+			if (uriString == null)
+				throw new ArgumentNullException ("uriString");
+
+			int len = uriString.Length;
+			if (len <= 1) 
+				throw new UriFormatException ();
+
+			// 1
+			char c = 'x';
+			int pos = 0;
+			for (; pos < len; pos++) {
+				c = uriString [pos];
+				if ((c == ':') || (c == '/') || (c == '\\') || (c == '?') || (c == '#')) 
+					break;
+			}
+
+			// 2 scheme
+			if (c == ':') {				
+				if (pos == 1) {
+					// a windows filepath
+					scheme = "file";
+					path = uriString.Replace ('\\', '/');
+					return;
+				}
+					
+				scheme = uriString.Substring (0, pos).ToLower ();
+				uriString = uriString.Remove (0, pos + 1);
+			} else 
+				scheme = "file";			
+						
+			// 3
+			if ((uriString.Length >= 2) && 
+			    ((uriString [0] == '/') || (uriString [0] == '\\')) &&
+			    ((uriString [1] == '/') || (uriString [1] == '\\'))) 
+				if ("file".Equals (scheme)) 
+					uriString = uriString.TrimStart (new char [] {'/', '\\'});			    	
+				else
+				    	uriString = uriString.Remove (0, 2);
+			    	
+			// 8 fragment
+			pos = uriString.IndexOf ('#');
+			if (pos != -1) {
+				fragment = uriString.Substring (pos);
+				uriString = uriString.Substring (0, pos);
+			}
+
+			// 6 query
+			pos = uriString.IndexOf ('?');
+			if (pos != -1) {
+				query = uriString.Substring (pos);
+				uriString = uriString.Substring (0, pos);
+			}
+			
+			// 5 path
+			pos = uriString.IndexOfAny (new char[] {'/', '\\'});
+			if (pos == -1) {
+				if ((scheme != Uri.UriSchemeMailto) &&
+				    (scheme != Uri.UriSchemeNews))
+					path = "/";
+			} else {
+				path = uriString.Substring (pos).Replace ('\\', '/');
+				uriString = uriString.Substring (0, pos);
+			}
+
+			// 4.a user info
+			pos = uriString.IndexOf ("@");
+			if (pos != -1) {
+				userinfo = uriString.Substring (0, pos);
+				uriString = uriString.Remove (0, pos + 1);
+			}
+
+			// 4.b port
+			port = -1;
+			pos = uriString.LastIndexOf (":");
+			if (pos != -1 && pos != (uriString.Length - 1)) {
+				string portStr = uriString.Remove (0, pos + 1);
+				if (portStr.Length > 1 && portStr [portStr.Length - 1] != ']') {
+					try {
+						port = Int32.Parse (portStr);
+						new System.Net.IPEndPoint (0, port);  // test validity port
+						uriString = uriString.Substring (0, pos);
+					} catch (Exception) {
+						throw new UriFormatException ("Invalid URI: invalid port number");
+					}
+				}
+			}
+			if (port == -1) {
+				port = GetDefaultPort (scheme);
+			}
+			
+			// 4 authority
+			host = uriString;
+			if (host.Length > 1 && host [0] == '[' && host [host.Length - 1] == ']') 
+				try {
+					host = "[" + IPv6Address.Parse (host).ToString () + "]";
+				} catch (Exception) {
+					throw new UriFormatException ("Invalid URI: The hostname could not be parsed");
+				}
+			if (host.Length == 2 && host [1] == ':') {
+				// windows filepath
+				path = host + path;
+				host = String.Empty;
+			}
+		}
+
+				
+		private struct UriScheme 
+		{
+			public string scheme;
+			public string delimiter;
+			public int defaultPort;
+
+			public UriScheme (string s, string d, int p) 
+			{
+				scheme = s;
+				delimiter = d;
+				defaultPort = p;
+			}
+		};
+
+		static UriScheme [] schemes = new UriScheme [] {
+			new UriScheme (UriSchemeHttp, SchemeDelimiter, 80),
+			new UriScheme (UriSchemeHttps, SchemeDelimiter, 223),
+			new UriScheme (UriSchemeFtp, SchemeDelimiter, 23),
+			new UriScheme (UriSchemeFile, SchemeDelimiter, -1),
+			new UriScheme (UriSchemeMailto, ":", 25),
+			new UriScheme (UriSchemeNews, ":", -1),
+			new UriScheme (UriSchemeNntp, SchemeDelimiter, 119),
+			new UriScheme (UriSchemeGopher, SchemeDelimiter, 70),
+		};
+				
+		internal static string GetSchemeDelimiter (string scheme) 
+		{
+			for (int i = 0; i < schemes.Length; i++) 
+				if (schemes [i].scheme == scheme)
+					return schemes [i].delimiter;
+			return Uri.SchemeDelimiter;
+		}
+		
+		internal static int GetDefaultPort (string scheme)
+		{
+			for (int i = 0; i < schemes.Length; i++) 
+				if (schemes [i].scheme == scheme)
+					return schemes [i].defaultPort;
+			return -1;			
+		}				
+	}
+}
diff --git a/mcs/class/System/System/UriBuilder.cs b/mcs/class/System/System/UriBuilder.cs
new file mode 100644
index 00000000000..241909fef87
--- /dev/null
+++ b/mcs/class/System/System/UriBuilder.cs
@@ -0,0 +1,247 @@
+//

+// System.UriBuilder

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using System;

+using System.Collections;

+using System.Runtime.Serialization;

+using System.Text;

+

+// See RFC 2396 for more info on URI's.

+

+namespace System 

+{

+	public class UriBuilder

+	{

+		private string scheme;

+		private string host;

+		private int port;

+		private string path;

+		private string query;

+		private string fragment;

+		private string username;

+		private string password;

+		

+		private Uri uri;

+		private bool modified;

+		

+		

+		// Constructors		

+		

+		public UriBuilder () : this (Uri.UriSchemeHttp, "loopback")

+		{		

+		}

+

+		public UriBuilder (string uri) : this (new Uri (uri))

+		{

+		}

+		

+		public UriBuilder (Uri uri)

+		{

+			scheme = uri.Scheme;

+			host = uri.Host;

+			port = uri.Port;

+			path = uri.AbsolutePath;

+			query = uri.Query;

+			fragment = uri.Fragment;

+			username = uri.UserInfo;

+			int pos = username.IndexOf (':');

+			if (pos != -1) {

+				password = username.Substring (pos + 1);

+				username = username.Substring (0, pos);

+			}

+			modified = true;

+		}

+		

+		public UriBuilder (string schemeName, string hostName) 

+		{

+			Scheme = schemeName;

+			Host = hostName;

+			port = -1;

+			Path = String.Empty;   // dependent on scheme it may set path to "/"

+			query = String.Empty;

+			fragment = String.Empty;

+			username = String.Empty;

+			password = String.Empty;

+			modified = true;

+		}

+		

+		public UriBuilder (string scheme, string host, int portNumber) 

+			: this (scheme, host)

+		{

+			Port = portNumber;

+		}

+		

+		public UriBuilder (string scheme, string host, int port, string pathValue)

+			: this (scheme, host, port)

+		{

+			Path = pathValue;

+		}

+

+		public UriBuilder (string scheme, string host, int port, string pathValue, string extraValue)

+			: this (scheme, host, port, pathValue)

+		{

+			if (extraValue == null || extraValue.Length == 0)

+				return;

+				

+			if (extraValue [0] == '#') 

+				Fragment = extraValue.Remove (0, 1);

+			else if (extraValue [0] == '?') 

+				Query = extraValue.Remove (0, 1);

+			else 

+				throw new ArgumentException ("extraValue");

+		}

+

+		

+		// Properties

+		

+		public string Fragment {

+			get { return fragment; }

+			set {

+				fragment = value;

+				if (fragment == null)

+					fragment = String.Empty;

+				else if (fragment.Length > 0)

+					fragment = "#" + Uri.EscapeString (fragment, false, true, true).Replace ("%23", "#");

+				query = String.Empty;				

+				modified = true;

+			}

+		}

+

+		public string Host {

+			get { return host; }

+			set {

+				host = (value == null) ? String.Empty : value;;

+				modified = true;

+			}

+		}

+

+		public string Password {

+			get { return password; }

+			set {

+				password = (value == null) ? String.Empty : value;;

+				modified = true;

+			}

+		}

+		

+		public string Path {

+			get { return path; }

+			set {

+				if (value == null || value.Length == 0) {

+					if ((scheme != Uri.UriSchemeMailto) &&

+					    (scheme != Uri.UriSchemeNews)) 

+						path = "/";					

+				} else {

+					path = Uri.EscapeString (value.Replace ('\\', '/'), false, true, true);

+					if ((scheme != Uri.UriSchemeMailto) &&

+					    (scheme != Uri.UriSchemeNews) &&

+					    path [0] != '/') 

+						path = "/" + path;					

+				}

+				modified = true;

+			}

+		}

+		

+		public int Port {

+			get { return port; }

+			set {

+				if (value == -1) {

+					port = -1;

+					return;

+				}

+				

+				// checks whether port number is valid

+				new System.Net.IPEndPoint (0, value);

+				

+				// apparently it is

+				port = value;

+				modified = true;

+			}

+		}

+		

+		public string Query {

+			get { return query; }

+			set {

+				// LAMESPEC: it doesn't say to always prepend a 

+				// question mark to the value.. it does say this 

+				// for fragment.

+				query = value;

+				if (query == null)

+					query = String.Empty;

+				else if (query.Length > 0)

+					query = "?" + Uri.EscapeString (query, false, true, true);

+				fragment = String.Empty;

+				modified = true;

+			}

+		}

+		

+		public string Scheme {

+			get { return scheme; }

+			set {

+				if (value == null)

+					value = String.Empty;

+				int colonPos = value.IndexOf (':');

+				if (colonPos != -1)

+					value = value.Substring (0, colonPos);

+				scheme = value.ToLower ();

+				modified = true;

+			}

+		}

+		

+		public Uri Uri {

+			get {

+				if (!modified) 

+					return uri;

+

+				StringBuilder s = new StringBuilder ();

+				s.Append (scheme);

+				s.Append (Uri.GetSchemeDelimiter (scheme));

+				if (username.Length > 0) {

+					string userinfo = username;

+					if (password.Length > 0)

+						userinfo += ":" + password;

+					s.Append (userinfo).Append ('@');

+				}

+				s.Append (host);

+				if (port != -1)

+					s.Append (':').Append (port);

+				s.Append (path);

+				s.Append (query);

+				s.Append (fragment);

+				

+				uri = new Uri (s.ToString (), true);

+				modified = false;

+				return uri;

+			}

+		}

+		

+		public string UserName {

+			get { return username; }

+			set {

+				username = (value == null) ? String.Empty : value;;

+				modified = true;

+			}

+		}		

+

+		// Methods

+		

+		public override bool Equals (object rparam) 

+		{

+			return (rparam == null) ? false : this.Uri.Equals (rparam.ToString ());

+		}

+		

+		public override int GetHashCode ()

+		{

+			return this.Uri.GetHashCode ();

+		}

+		

+		public override string ToString ()

+		{

+			return this.Uri.ToString ();

+		}

+	} 

+} 

+

diff --git a/mcs/class/System/System/UriFormatException.cs b/mcs/class/System/System/UriFormatException.cs
new file mode 100755
index 00000000000..8bd1813602f
--- /dev/null
+++ b/mcs/class/System/System/UriFormatException.cs
@@ -0,0 +1,43 @@
+//
+// System.UriFormatException.cs
+//
+// Author:
+//   Scott Sanders (scott@stonecobra.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Scott Sanders
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+	[Serializable]
+	public class UriFormatException : FormatException, ISerializable
+	{
+
+		// Constructors
+		public UriFormatException ()
+			: base (Locale.GetText ("Invalid URI format"))
+		{
+		}
+
+		public UriFormatException (string message)
+			: base (message)
+		{
+		}
+
+		protected UriFormatException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{			
+		}
+
+		// Methods
+		void ISerializable.GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+		}
+	}
+}
+	
diff --git a/mcs/class/System/System/UriHostNameType.cs b/mcs/class/System/System/UriHostNameType.cs
new file mode 100755
index 00000000000..e2e57d4f33b
--- /dev/null
+++ b/mcs/class/System/System/UriHostNameType.cs
@@ -0,0 +1,41 @@
+// UriHostNameType.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:33:14 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System {
+
+
+	/// <summary>
+	/// </summary>
+	public enum UriHostNameType {
+
+		/// <summary>
+		/// </summary>
+		Unknown = 0,
+		
+		/// <summary>
+		/// </summary>
+		Basic = 1,
+
+		/// <summary>
+		/// </summary>
+		Dns = 2,
+
+		/// <summary>
+		/// </summary>
+		IPv4 = 3,
+
+		/// <summary>
+		/// </summary>
+		IPv6 = 4,
+	} // UriHostNameType
+
+} // System
diff --git a/mcs/class/System/System/UriPartial.cs b/mcs/class/System/System/UriPartial.cs
new file mode 100755
index 00000000000..21cb52f8dbe
--- /dev/null
+++ b/mcs/class/System/System/UriPartial.cs
@@ -0,0 +1,33 @@
+// UriPartial.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:33:21 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System {
+
+
+	/// <summary>
+	/// </summary>
+	public enum UriPartial {
+
+		/// <summary>
+		/// </summary>
+		Scheme = 0,
+
+		/// <summary>
+		/// </summary>
+		Authority = 1,
+
+		/// <summary>
+		/// </summary>
+		Path = 2,
+	} // UriPartial
+
+} // System
diff --git a/mcs/class/System/Test/.cvsignore b/mcs/class/System/Test/.cvsignore
new file mode 100644
index 00000000000..6a7461313bb
--- /dev/null
+++ b/mcs/class/System/Test/.cvsignore
@@ -0,0 +1 @@
+*.dll
diff --git a/mcs/class/System/Test/AllTests.cs b/mcs/class/System/Test/AllTests.cs
new file mode 100644
index 00000000000..923916f47e6
--- /dev/null
+++ b/mcs/class/System/Test/AllTests.cs
@@ -0,0 +1,33 @@
+// MonoTests.AllTests, System.dll

+//

+// Author:

+//   Mario Martinez (mariom925@home.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+//

+

+using NUnit.Framework;

+namespace MonoTests

+{

+	/// <summary>

+	///   Combines all unit tests for the System.dll assembly

+	///   into one test suite.

+	/// </summary>

+	public class AllTests : TestCase

+	{

+		public AllTests(string name) : base(name) {}

+

+		public static ITest Suite {

+			get {

+				TestSuite suite = new TestSuite();

+				suite.AddTest (System.AllTests.Suite);

+				suite.AddTest (System.Collections.Specialized.AllTests.Suite);

+				suite.AddTest (System.Diagnostics.AllTests.Suite);

+                                suite.AddTest (System.Net.AllTests.Suite);

+                                suite.AddTest (System.Net.Sockets.AllTests.Suite);

+				suite.AddTest (System.Text.RegularExpressions.AllTests.Suite);

+				return suite;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System/Test/BasicOperationsTest.cs b/mcs/class/System/Test/BasicOperationsTest.cs
new file mode 100755
index 00000000000..2b078956790
--- /dev/null
+++ b/mcs/class/System/Test/BasicOperationsTest.cs
@@ -0,0 +1,165 @@
+// created on 7/21/2001 at 2:36 PM

+

+

+

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+using System.Text;

+

+using NUnit.Framework;

+

+

+

+namespace MonoTests.System.Collections.Specialized {

+

+

+	public class BasicOperationsTest : TestCase {

+

+		protected NameValueCollection nvc;

+		private static Random rnd;

+

+		public BasicOperationsTest() : base("MonoTests.System.Collections.Specialized.BasicOperationsTest testsuite") {}

+		public BasicOperationsTest(String name) : base(name) {}

+

+		protected override void SetUp() {

+			nvc = new NameValueCollection();

+			rnd=new Random();

+		}

+

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(BasicOperationsTest));

+			}

+		}

+

+

+

+		private void SetDefaultData() {

+			nvc.Clear();

+			nvc.Add("k1","this");

+			nvc.Add("k2","test");

+			nvc.Add("k3","is");

+			nvc.Add("k4","silly");

+		}

+		private static string FormatForPrinting(NameValueCollection nv)

+		{

+			if (nv==null) 

+				return null;

+			int max = nv.Count;

+			StringBuilder sb = new StringBuilder("-\t-Key-\t-Value-\n");

+			for (int i=0; i<max; i++){

+				

+				sb.Append("\t"+nv.GetKey(i)+"\t"+nv[i]+"\n");

+			}

+			return sb.ToString();

+		}

+		

+

+		public void TestAddRemoveClearSetGet() 

+		{

+			nvc.Clear();

+			Assert(nvc.Count==0&& !nvc.HasKeys());

+

+			SetDefaultData();

+			Assert(nvc.Count==4);

+			Assert("Get operation returns wrong result.\n"+FormatForPrinting(nvc),(nvc.Get(0).Equals("this"))&&(nvc.Get("k1").Equals("this")));

+

+

+			nvc.Add("k2","programmer");

+			Assert(nvc["k2"].Equals("test,programmer"));

+

+			nvc["k2"]="project";

+			nvc.Add("k2","project");

+			Assert(nvc.Count==4);

+			Assert("Wrong effect of add(samekey,samevalue)\n"+FormatForPrinting(nvc),nvc["k2"].Equals("project"));

+			// TODO: add Remove test

+			nvc.Remove("k4");

+			Assert("wrong nvc.Count="+nvc.Count,nvc.Count==3);

+			Assert(nvc["k4"]==null);

+			

+			NameValueCollection nvc1 = new NameValueCollection();

+			nvc1["k1"]="these";

+			nvc1["k5"]="!";

+			nvc.Add(nvc1);

+			Assert(FormatForPrinting(nvc)+"Count is wrong after Add(nvc1) Count="+nvc.Count,nvc.Count==4);

+			Assert("Values are wrong after Add(nvc1)",(nvc["k1"].Equals("this,these"))&&(nvc["k5"].Equals("!")));

+			

+			nvc.Set("k3","accomplished");

+			Assert("Wrong result of Set operation",nvc["k3"].Equals("accomplished"));

+			

+		}

+		

+		public void TestGetKeyGetValues()

+		{

+			SetDefaultData();

+			Assert(nvc.GetKey(0).Equals("k1"));

+			string[] values = nvc.GetValues(0);

+			Assert(values[0].Equals("this"));

+			

+		}

+		

+		public void TestCopyTo() {

+			SetDefaultData();

+			string[] entries=new string[nvc.Count];

+			nvc.CopyTo(entries,0);

+			//Message(FormatForPrinting(nvc));

+			//Assert("Not an entry.",entries[0] is DictionaryEntry);

+		}

+

+		public void TestUnderHeavyLoad() {

+			

+			//TODO: add memory and time measurement

+			

+			nvc.Clear();

+			int max=10000;

+			String[] cache=new String[max*2];

+			int n=0;

+

+			for (int i=0;i<max;i++) {

+				int id=rnd.Next()&0xFFFF;

+				String key=""+id+"-key-"+id;

+				String val="value-"+id;

+				if (nvc[key]==null) {

+					nvc[key]=val;

+					cache[n]=key;

+					cache[n+max]=val;

+					n++;

+				}

+			}

+

+			Assert(nvc.Count==n);

+

+			for (int i=0;i<n;i++) {

+				String key=cache[i];

+				String val=nvc[key] as String;

+				String err="nvc[\""+key+"\"]=\""+val+

+				      "\", expected \""+cache[i+max]+"\"";

+				Assert(err,val!=null && val.Equals(cache[i+max]));

+			}

+

+			int r1=(n/3);

+			int r2=r1+(n/5);

+

+			for (int i=r1;i<r2;i++) {

+				nvc.Remove(cache[i]);

+			}

+

+

+			for (int i=0;i<n;i++) {

+				if (i>=r1 && i<r2) {

+					Assert(nvc[cache[i]]==null);

+				} else {

+					String key=cache[i];

+					String val=nvc[key] as String;

+					String err="ht[\""+key+"\"]=\""+val+

+					      "\", expected \""+cache[i+max]+"\"";

+					Assert(err,val!=null && val.Equals(cache[i+max]));

+				}

+			}

+

+		}

+

+	}

+}

+

diff --git a/mcs/class/System/Test/ChangeLog b/mcs/class/System/Test/ChangeLog
new file mode 100644
index 00000000000..b0784f1ebaa
--- /dev/null
+++ b/mcs/class/System/Test/ChangeLog
@@ -0,0 +1,84 @@
+2002/05/17  Lawrence Pit  <loz@cable.a2000.nl>
+
+	* AllTests.cs: added call to System.Net.Sockets.AllTests.cs
+
+2002/05/14  Lawrence Pit  <loz@cable.a2000.nl>
+
+	* Dnstest.cs: added test for asynchronous methods
+	
+2002/05/09  Lawrence Pit  <loz@cable.a2000.nl>
+
+	* AllTests.cs: added System.AllTests
+	* Moved 2 files to the System.Collections.Specialized dir
+
+2002/05/07  Nick Drochak <ndrochak@gol.com>
+
+	* AllTests.cs: Run the System.Net tests from here.
+
+2002-05-05  Nick Drochak  <ndrochak@gol.com>
+
+	* ChangeLog: Update build file to run correct class in the test dll.
+
+2002-05-05  Nick Drochak  <ndrochak@gol.com>
+
+	* AllTests.cs:
+	* BasicOperationsTest.cs:
+	* DnsTest.cs:
+	* NameValueCollectionTest.cs:
+	* StringCollectionTest.cs:
+	* TheTests.cs:
+	* System.Text.RegularExpressions/AllTests.cs:
+	* System.Text.RegularExpressions/PerlTest.cs:
+	* System.Text.RegularExpressions/PerlTrials.cs:
+	* System.Text.RegularExpressions/RegexTrial.cs: Fix Namespace
+	inconsistancies.  Use MonoTests instead of Ximian.Mono.Tests
+
+2002-04-07  Jonathan Pryor  <jonpryor@vt.edu>
+
+	* AllTests.cs: Added System.Diagnostics tests, as they work now.
+
+2002/03/08  Nick Drochak <ndrochak@gol.com>
+
+	* System.XML_test.build: Don't build test dll by default.  Only build
+	it when 'make test' is specified.
+
+2002-02-27  Martin Baulig  <martin@gnome.org>
+
+	* System.Text.RegularExpressions/*.cs: Put everything into namespace
+	Ximian.Mono.Tests.System.Text.RegularExpressions.
+
+	* System_test.build: Build new executable RunTests.System.exe which you can
+	use to run the tests on Linux.
+
+	* NameValueCollectionTest.cs: Split out BasicOperationTest into
+	BasicOperationTest.cs.
+
+	* AllTests.cs: Use namespace Ximian.Mono.Tests.System instead of
+	Ximian.Mono.Tests.
+
+	* DnsTest.cs: Put this into namespace Ximian.Mono.Tests.Systeam.
+	* NameValueCollectionTest.cs: Likewise.
+	* StringCollectionTest.cs: Likewise.
+
+2002-02-11  Duncan Mak  <duncan@ximian.com>
+
+	* AllTests.cs: Removed entry for IPHostEntryTest.cs because Mads
+	removed it and included it in the new DnsTest.cs. This fixes the build.
+
+2002-01-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* DnsTest.cs: Updated test.
+
+2001-09-26  Mads Pultz <mpultz@get2net.dk>
+	* DnsTest.cs: initial tests of BeginGetHostByName and EndGetHostByName implemented.
+
+2001-09-24  Mads Pultz <mpultz@get2net.dk>
+
+	* DnsTest.cs: now tests GetHostByAddress, GetHostByName,
+	  IpToString and Resolve. 
+
+2001-09-23  Mads Pultz <mpultz@get2net.dk>
+
+	* DnsTest.cs: Initial work submitted to repository.
+	* IPHostEntryTest.cs: Initial work submitted to repository.
+
diff --git a/mcs/class/System/Test/System.Collections.Specialized/AllTests.cs b/mcs/class/System/Test/System.Collections.Specialized/AllTests.cs
new file mode 100644
index 00000000000..5956415bda7
--- /dev/null
+++ b/mcs/class/System/Test/System.Collections.Specialized/AllTests.cs
@@ -0,0 +1,31 @@
+//

+// MonoTests.System.Collections.Specialized.AllTests, System.dll

+//

+// Author:

+//   Lawrence Pit <loz@cable.a2000nl>

+//

+

+using NUnit.Framework;

+using System;

+

+namespace MonoTests.System.Collections.Specialized  {

+	

+	public class AllTests : TestCase {

+

+		public AllTests (string name) : base (name)

+		{

+		}

+

+		public static ITest Suite {

+			get {

+				TestSuite suite = new TestSuite ();

+				suite.AddTest (BitVector32Test.Suite);

+				suite.AddTest (HybridDictionaryTest.Suite);				

+				suite.AddTest (NameValueCollectionTest.Suite);

+				suite.AddTest (StringCollectionTest.Suite);

+				return suite;

+			}

+		}

+	}

+}

+

diff --git a/mcs/class/System/Test/System.Collections.Specialized/BitVector32Test.cs b/mcs/class/System/Test/System.Collections.Specialized/BitVector32Test.cs
new file mode 100644
index 00000000000..883deed976f
--- /dev/null
+++ b/mcs/class/System/Test/System.Collections.Specialized/BitVector32Test.cs
@@ -0,0 +1,140 @@
+//

+// BitVector32Test.cs - NUnit Test Cases for System.Net.BitVector32

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+

+namespace MonoTests.System.Collections.Specialized

+{

+	public class BitVector32Test : TestCase

+	{

+		public BitVector32Test () :

+			base ("[MonoTests.System.Net.BitVector32Test]") {}

+

+		public BitVector32Test (string name) : base (name) {}

+

+		protected override void SetUp () {}

+

+		protected override void TearDown () {}

+

+		public static ITest Suite

+		{

+			get {

+				return new TestSuite (typeof (BitVector32Test));

+			}

+		}

+		

+		public void TestConstructors ()

+		{

+			BitVector32 b = new BitVector32 (31);

+		}

+		

+		public void TestIndexers ()

+		{

+			BitVector32 b = new BitVector32 (7);

+			Assert ("#1", b [0]);

+			Assert ("#2", b [1]);

+			Assert ("#3", b [2]);

+			Assert ("#4", b [4]);

+			Assert ("#5", !b [8]);

+			Assert ("#6", !b [16]);

+			b [8] = true;

+			Assert ("#7", b [4]);

+			Assert ("#8", b [8]);

+			Assert ("#9", !b [16]);

+			b [8] = false;

+			Assert ("#10", b [4]);

+			Assert ("#11", !b [8]);

+			Assert ("#12", !b [16]);

+

+			BitVector32.Section s = BitVector32.CreateSection (31);

+			s = BitVector32.CreateSection (64, s);

+			// Print (s);

+			

+			// b = new BitVector32 (0x777777);

+			BitVector32 b1 = new BitVector32 (0xffff77);

+			BitVector32 b2 = new BitVector32 (b1 [s]);

+			//Console.WriteLine (b1.ToString ());

+			//Console.WriteLine (b2.ToString ());

+			AssertEquals ("#14", 123, b1 [s]);

+			

+			// b1 [s] = 15;

+			//Console.WriteLine (b1.ToString ());

+		}

+

+		public void TestCreateMask ()

+		{

+			AssertEquals ("#1", 1, BitVector32.CreateMask ());

+			AssertEquals ("#2", 1, BitVector32.CreateMask (0));

+			AssertEquals ("#3", 2, BitVector32.CreateMask (1));

+			AssertEquals ("#4", 32, BitVector32.CreateMask (16));

+			AssertEquals ("#6", -2, BitVector32.CreateMask (Int32.MaxValue));

+			AssertEquals ("#5", -4, BitVector32.CreateMask (-2));

+			try {

+				BitVector32.CreateMask (Int32.MinValue);

+				Fail ("#7");

+			} catch (InvalidOperationException) {}			

+		}

+		

+		public void TestCreateSection ()

+		{

+			BitVector32.Section s = BitVector32.CreateSection (1);

+			AssertEquals ("#1", (short) 1, s.Mask);

+

+			s = BitVector32.CreateSection (2);

+			AssertEquals ("#2", (short) 3, s.Mask);

+

+			s = BitVector32.CreateSection (3);

+			AssertEquals ("#3", (short) 3, s.Mask);

+

+			s = BitVector32.CreateSection (5);

+			AssertEquals ("#4", (short) 7, s.Mask);

+			

+			s = BitVector32.CreateSection (20);

+			AssertEquals ("#4", (short) 0x1f, s.Mask);

+

+			s = BitVector32.CreateSection (Int16.MaxValue);

+			AssertEquals ("#5", (short) 0x7fff, s.Mask);

+

+			s = BitVector32.CreateSection (Int16.MaxValue - 100);

+			AssertEquals ("#6", (short) 0x7fff, s.Mask);

+

+			try {

+				BitVector32.Section s2 = BitVector32.CreateSection (0);

+				Fail ("#7");

+			} catch (ArgumentException) {}

+

+			try {

+				BitVector32.Section s2 = BitVector32.CreateSection (-1);

+				Fail ("#8");

+			} catch (ArgumentException) {}

+

+			try {

+				BitVector32.Section s2 = BitVector32.CreateSection (Int16.MinValue);

+				Fail ("#9");

+			} catch (ArgumentException) {}

+			

+			s = BitVector32.CreateSection (20);

+			AssertEquals ("#10a", (short) 0x1f, s.Mask);

+			AssertEquals ("#10b", (short) 0x00, s.Offset);			

+			s = BitVector32.CreateSection (120, s);

+			AssertEquals ("#10c", (short) 0x7f, s.Mask);

+			AssertEquals ("#10d", (short) 0x05, s.Offset);					

+			s = BitVector32.CreateSection (1000, s);

+			AssertEquals ("#10e", (short) 0x3ff, s.Mask);

+			AssertEquals ("#10f", (short) 0x0c, s.Offset);			

+		}

+

+

+		private void Print (BitVector32.Section s)

+		{

+			Console.WriteLine (s.ToString () + " : "+ s.Mask + " : " + s.Offset);

+		}

+	}        

+}
\ No newline at end of file
diff --git a/mcs/class/System/Test/System.Collections.Specialized/ChangeLog b/mcs/class/System/Test/System.Collections.Specialized/ChangeLog
new file mode 100644
index 00000000000..c16d19e343e
--- /dev/null
+++ b/mcs/class/System/Test/System.Collections.Specialized/ChangeLog
@@ -0,0 +1,11 @@
+2002-06-24  Andrew Birkett <adb@tardis.ed.ac.uk>
+
+	* BitVector32Test.cs: New tests for sections and removed ^M's.
+
+2002-05-11  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Added NameValueCollectionTest.TestGetValues
+
+2002-05-09  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Moved StringCollectionTest.cs and NameValueCollectionTest to this dir
diff --git a/mcs/class/System/Test/System.Collections.Specialized/HybridDictionaryTest.cs b/mcs/class/System/Test/System.Collections.Specialized/HybridDictionaryTest.cs
new file mode 100644
index 00000000000..cdcc74c4e31
--- /dev/null
+++ b/mcs/class/System/Test/System.Collections.Specialized/HybridDictionaryTest.cs
@@ -0,0 +1,57 @@
+//

+// HybridDictionaryTest.cs - NUnit Test Cases for System.Net.HybridDictionary

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+

+namespace MonoTests.System.Collections.Specialized

+{

+	public class HybridDictionaryTest : TestCase

+	{

+		public HybridDictionaryTest () :

+			base ("[MonoTests.System.Net.HybridDictionaryTest]") {}

+

+		public HybridDictionaryTest (string name) : base (name) {}

+

+		protected override void SetUp () {}

+

+		protected override void TearDown () {}

+

+		public static ITest Suite

+		{

+			get {

+				return new TestSuite (typeof (HybridDictionaryTest));

+			}

+		}

+

+		public void TestAll ()

+		{

+			HybridDictionary dict = new HybridDictionary (true);

+			dict.Add ("CCC", "ccc");

+			dict.Add ("BBB", "bbb");

+			dict.Add ("fff", "fff");

+			dict ["EEE"] = "eee";

+			dict ["ddd"] = "ddd";

+			

+			AssertEquals ("#1", 5, dict.Count);

+			AssertEquals ("#2", "eee", dict ["eee"]);

+			

+			dict.Add ("CCC2", "ccc");

+			dict.Add ("BBB2", "bbb");

+			dict.Add ("fff2", "fff");

+			dict ["EEE2"] = "eee";

+			dict ["ddd2"] = "ddd";

+			dict ["xxx"] = "xxx";

+			dict ["yyy"] = "yyy";

+			

+			AssertEquals ("#3", 12, dict.Count);

+			AssertEquals ("#4", "eee", dict ["eee"]);	

+		}

+	}        

+}
\ No newline at end of file
diff --git a/mcs/class/System/Test/System.Collections.Specialized/NameValueCollectionTest.cs b/mcs/class/System/Test/System.Collections.Specialized/NameValueCollectionTest.cs
new file mode 100644
index 00000000000..dd066f4d225
--- /dev/null
+++ b/mcs/class/System/Test/System.Collections.Specialized/NameValueCollectionTest.cs
@@ -0,0 +1,35 @@
+// created on 7/21/2001 at 2:36 PM

+

+using System;

+using System.Collections;

+using System.Collections.Specialized;

+using System.Text;

+

+using NUnit.Framework;

+

+namespace MonoTests.System.Collections.Specialized {

+

+

+	/// <summary>Microsoft NameValueCollection test.</summary>

+	public class NameValueCollectionTest : TestCase {

+

+		public NameValueCollectionTest() : base("MonoTests.System.Collections.Specialized.NameValueCollectionTest testsuite") {}

+		public NameValueCollectionTest(String name) : base(name) {}

+

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(NameValueCollectionTest));

+			}

+		}

+		

+		public void TestGetValues ()

+		{

+			NameValueCollection col = new NameValueCollection ();

+			col.Add ("foo1", "bar1");

+			AssertEquals ("#1", null, col.GetValues (null));

+			AssertEquals ("#2", null, col.GetValues (""));

+			AssertEquals ("#3", null, col.GetValues ("NotExistent"));

+		}

+	}

+}

+

diff --git a/mcs/class/System/Test/System.Collections.Specialized/StringCollectionTest.cs b/mcs/class/System/Test/System.Collections.Specialized/StringCollectionTest.cs
new file mode 100644
index 00000000000..839970cd786
--- /dev/null
+++ b/mcs/class/System/Test/System.Collections.Specialized/StringCollectionTest.cs
@@ -0,0 +1,157 @@
+/* System.Collections.Specialized.StringCollection.cs

+ * Authors:

+ *   John Barnette (jbarn@httcb.net)

+ *

+ *  Copyright (C) 2001 John Barnette

+*/

+

+using NUnit.Framework;

+using System.Collections.Specialized;

+

+namespace MonoTests.System.Collections.Specialized {

+	public class StringCollectionTest : TestCase {

+

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof (StringCollectionTest));

+			}

+		}

+

+		private StringCollection sc;

+		string[] strings = {

+			"foo",

+			"bar",

+			"baz",

+			"john",

+			"paul",

+			"george",

+			"ringo"

+		};

+		

+		public StringCollectionTest() : base("MonoTests.System.Collections.Specialized.StringCollectionTest testsuite") {}

+		public StringCollectionTest(string name) : base(name) {}

+		

+		protected override void SetUp() {

+			sc = new StringCollection();

+			sc.AddRange(strings);

+		}

+

+		// Simple Tests

+		

+		public void TestSimpleCount() {

+			Assert(sc.Count == 7);

+		}

+		

+		public void TestSimpleIsReadOnly() {

+			Assert(!sc.IsReadOnly);

+		}

+		

+		public void TestSimpleIsSynchronized() {

+			Assert(!sc.IsSynchronized);

+		}

+		

+		public void TestSimpleItemGet() {

+			for(int i = 0; i < strings.Length; i++) {

+				Assert(strings[i].Equals(sc[i]));

+			}

+		}

+		

+		public void TestSimpleItemSet() {

+			sc[0] = "bob";

+			Assert(sc[0].Equals("bob"));

+		}

+		

+		public void TestSimpleSyncRoot() {

+			Assert(sc.Equals(sc.SyncRoot));

+		}

+		

+		public void TestSimpleAdd() {

+			int index = sc.Add("chuck");

+			Assert(index == strings.Length);

+			Assert(sc[strings.Length].Equals("chuck"));

+			

+		}

+		

+		public void TestSimpleAddRange() {

+			string[] newStrings = {

+				"peter",

+				"paul",

+				"mary"

+			};

+			

+			int index = sc.Count;

+			sc.AddRange(newStrings);

+			

+			Assert(sc.Count == index + newStrings.Length);

+			

+			for (int i = 0; i+index <= sc.Count-1; i++) {

+				Assert(newStrings[i].Equals(sc[i+index]));

+			}

+		}

+		

+		public void TestSimpleClear() {

+			sc.Clear();

+			Assert(sc.Count == 0);

+		}

+		

+		public void TestSimpleContains() {

+			Assert(sc.Contains(strings[0]));

+			Assert(!sc.Contains("NOT CONTAINED"));

+		}

+		

+		public void TestSimpleCopyTo() {

+			string[] copyArray = new string[sc.Count];

+			sc.CopyTo(copyArray, 0);

+			for (int i = 0; i < copyArray.Length; i++) {

+				Assert(copyArray[i] == sc[i]);

+			}

+		}

+		

+		public void TestSimpleGetEnumerator() {

+			int index = 0;

+			foreach(string s in sc) {

+				Assert(s.Equals(strings[index]));

+				index++;

+			}

+		}

+		

+		public void TestSimpleIndexOf() {

+			Assert(sc.IndexOf(strings[0]) == 0);

+		}

+		

+		public void TestSimpleInsert() {

+			int index = 3;

+			int oldCount = sc.Count;

+			string before  = sc[index - 1];

+			string current = sc[index];

+			string after   = sc[index + 1];

+			string newStr  = "paco";

+			

+			sc.Insert(index, newStr);

+			

+			Assert(sc.Count == oldCount + 1);

+			Assert(sc[index].Equals(newStr));

+			Assert(sc[index-1].Equals(before));

+			Assert(sc[index+1].Equals(current));

+			Assert(sc[index+2].Equals(after));

+		}

+		

+		public void TestSimpleRemove() {

+			int oldCount = sc.Count;

+			sc.Remove(strings[0]);

+			Assert(oldCount == sc.Count + 1);

+			Assert(!sc.Contains(strings[0]));

+		}

+		

+		public void TestSimpleRemoveAt() {

+			int index = 3;

+			int oldCount = sc.Count;

+			string after = sc[index+1];

+			

+			sc.RemoveAt(index);

+			Assert(oldCount == sc.Count + 1);

+			Assert(sc[index].Equals(after));

+		}

+			

+	}

+}

diff --git a/mcs/class/System/Test/System.Diagnostics/AllTests.cs b/mcs/class/System/Test/System.Diagnostics/AllTests.cs
new file mode 100644
index 00000000000..2f5cdb7d305
--- /dev/null
+++ b/mcs/class/System/Test/System.Diagnostics/AllTests.cs
@@ -0,0 +1,29 @@
+//

+// MonoTests.System.Diagnostics.AllTests, System.dll

+//

+// Author:

+//   Jonathan Pryor (jonpryor@vt.edu)

+//

+// (C) 2002 Jonathan Pryor

+//

+

+using NUnit.Framework;

+using System;

+

+namespace MonoTests.System.Diagnostics {

+

+	public class AllTests : TestCase {

+

+		public AllTests(string name) : base(name)

+		{}

+

+		public static ITest Suite {

+			get {

+				TestSuite suite = new TestSuite();

+				suite.AddTest (MonoTests.System.Diagnostics.TraceTest.Suite);

+				return suite;

+			}

+		}

+	}

+}

+

diff --git a/mcs/class/System/Test/System.Diagnostics/ChangeLog b/mcs/class/System/Test/System.Diagnostics/ChangeLog
new file mode 100644
index 00000000000..c4a7195d06d
--- /dev/null
+++ b/mcs/class/System/Test/System.Diagnostics/ChangeLog
@@ -0,0 +1,14 @@
+2002-06-16  Jonathan Pryor  <jonpryor@vt.edu>
+	* TraceTest.cs: Added additional test cases.
+
+2002-04-07  Jonathan Pryor  <jonpryor@vt.edu>
+
+	* TraceTest.cs: Removed extraneous output; renamed test case so that NUnit
+	  would find it.
+
+2002-03-10  Jonathan Pryor  <jonpryor@vt.edu>
+
+	* Initial creation of System.Diagnostics test directory
+	* AllTests.cs: file added
+	* TraceTest.cs: Test System.Diagnostics.Trace class
+
diff --git a/mcs/class/System/Test/System.Diagnostics/TraceTest.cs b/mcs/class/System/Test/System.Diagnostics/TraceTest.cs
new file mode 100644
index 00000000000..e284f27407a
--- /dev/null
+++ b/mcs/class/System/Test/System.Diagnostics/TraceTest.cs
@@ -0,0 +1,155 @@
+//
+// TraceTest.cs - NUnit Test Cases for System.Diagnostics.Trace
+//
+// Jonathan Pryor (jonpryor@vt.edu)
+//
+// (C) Jonathan Pryor
+// 
+
+// We want tracing enabled, so...
+#define TRACE
+
+using NUnit.Framework;
+using System;
+using System.IO;
+using System.Diagnostics;
+
+namespace MonoTests.System.Diagnostics {
+
+	public class TraceTest : TestCase {
+    
+		private StringWriter buffer;
+		private TraceListener listener;
+
+		public TraceTest () 
+			: base ("System.Diagnostics.Trace testsuite")
+		{
+		}
+
+		public TraceTest (string name)
+			: base(name)
+		{
+		}
+
+		protected override void SetUp ()
+		{
+			// We don't want to deal with the default listener, which can send the
+			// output to various places (Debug stream, Console.Out, ...)
+			// Trace.Listeners.Remove ("Default");
+
+			buffer = new StringWriter ();
+
+			listener = new TextWriterTraceListener (buffer, "TestOutput");
+
+			Trace.Listeners.Add (listener);
+
+			Trace.AutoFlush = true;
+
+		}
+
+		protected override void TearDown ()
+		{
+			// Trace.Listeners.Add (new DefaultTraceListener ());
+			Trace.Listeners.Remove (listener);
+		}
+
+    public static ITest Suite {
+ 			get { 
+				return new TestSuite (typeof (TraceTest)); 
+			}
+		}
+
+		// Make sure that when we get the output we expect....
+		public void TestTracing ()
+		{
+			string value =  
+				"Entering Main" + Environment.NewLine +
+				"Exiting Main" + Environment.NewLine;
+
+			Trace.WriteLine ("Entering Main");
+			Trace.WriteLine ("Exiting Main");
+
+			AssertEquals ("#Tr01", value, buffer.ToString ());
+		}
+
+		// Make sure we get the output we expect in the presence of indenting...
+		public void TestIndent ()
+		{
+			Console.Error.WriteLine ("TraceTest.TestIndent");
+			string value =  
+				"List of errors:" + Environment.NewLine +
+				"    Error 1: File not found" + Environment.NewLine +
+				"    Error 2: Directory not found" + Environment.NewLine +
+				"End of list of errors" + Environment.NewLine;
+
+			Trace.WriteLine ("List of errors:");
+			Trace.Indent ();
+			Trace.WriteLine ("Error 1: File not found");
+			Trace.WriteLine ("Error 2: Directory not found");
+			Trace.Unindent ();
+			Trace.WriteLine ("End of list of errors");
+
+			AssertEquals ("#In01", value, buffer.ToString());
+		}
+
+		// Make sure that TraceListener properties (IndentLevel, IndentSize) are
+		// modified when the corresponding Trace properties are changed.
+		public void TestAddedTraceListenerProperties ()
+		{
+			TraceListener t1 = new TextWriterTraceListener (Console.Out);
+			TraceListener t2 = new TextWriterTraceListener (Console.Error);
+			Trace.Listeners.Add(t1);
+			Trace.Listeners.Add(t2);
+
+			const int ExpectedSize = 5;
+			const int ExpectedLevel = 2;
+
+			Trace.IndentSize = ExpectedSize;
+			Trace.IndentLevel = ExpectedLevel;
+
+			foreach (TraceListener t in Trace.Listeners) {
+				string ids = "#TATLP-S-" + t.Name;
+				string idl = "#TATLP-L-" + t.Name;
+				AssertEquals (ids, ExpectedSize, t.IndentSize);
+				AssertEquals (idl, ExpectedLevel, t.IndentLevel);
+			}
+
+			Trace.Listeners.Remove(t1);
+			Trace.Listeners.Remove(t2);
+		}
+
+		// Make sure that the TraceListener properties (IndentLevel, IndentSize)
+		// are properly modified when the TraceListener is added to the
+		// collection.
+		public void TestListeners_Add_Values()
+		{
+			const int ExpectedLevel = 5;
+			const int ExpectedSize = 3;
+			Trace.IndentLevel = ExpectedLevel;
+			Trace.IndentSize = ExpectedSize;
+			TraceListener tl = new TextWriterTraceListener(Console.Out);
+
+			tl.IndentLevel = 2*ExpectedLevel;
+			tl.IndentSize = 2*ExpectedSize;
+
+			Trace.Listeners.Add(tl);
+
+			// Assert that the listener we added has been set to the correct indent
+			// level.
+			AssertEquals ("#LATL-L", ExpectedLevel, tl.IndentLevel);
+			AssertEquals ("#LATL-S", ExpectedSize, tl.IndentSize);
+
+			// Assert that all listeners in the collection have the same level.
+			foreach (TraceListener t in Trace.Listeners)
+			{
+				string idl = "#LATL-L:" + t.Name;
+				string ids = "#LATL-S:" + t.Name;
+				AssertEquals(idl, ExpectedLevel, t.IndentLevel);
+				AssertEquals(ids, ExpectedSize, t.IndentSize);
+			}
+		}
+
+		// IndentSize, IndentLevel are thread-static
+	}
+}
+
diff --git a/mcs/class/System/Test/System.Net.Sockets/AllTests.cs b/mcs/class/System/Test/System.Net.Sockets/AllTests.cs
new file mode 100644
index 00000000000..fdff9250947
--- /dev/null
+++ b/mcs/class/System/Test/System.Net.Sockets/AllTests.cs
@@ -0,0 +1,33 @@
+//
+// MonoTests.System.Net.Sockets.AllTests, System.dll
+//
+// Author:
+//   Lawrence Pit <loz@cable.a2000nl>
+//
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System.Net.Sockets {
+        /// <summary>
+        ///   Combines all available unit tests into one test suite.
+        /// </summary>
+        public class AllTests : TestCase {
+
+                public AllTests (string name) : base (name) {}
+                
+                public static ITest Suite { 
+                        get 
+                        {
+                                TestSuite suite = new TestSuite ();
+				#if NETWORKTEST                                                            
+					suite.AddTest (TcpListenerTest.Suite);
+					suite.AddTest (TcpClientTest.Suite);                                
+					//suite.AddTest (UdpClientTest.Suite);
+				#endif                                
+				return suite;
+                        }
+                }
+        }
+}
+
diff --git a/mcs/class/System/Test/System.Net.Sockets/ChangeLog b/mcs/class/System/Test/System.Net.Sockets/ChangeLog
new file mode 100644
index 00000000000..09eef5e988b
--- /dev/null
+++ b/mcs/class/System/Test/System.Net.Sockets/ChangeLog
@@ -0,0 +1,6 @@
+2002-05-17  Lawrence Pit <loz@cable.a2000.nl>
+
+	* AllTests.cs: added
+
+
+
diff --git a/mcs/class/System/Test/System.Net.Sockets/TcpClientTest.cs b/mcs/class/System/Test/System.Net.Sockets/TcpClientTest.cs
new file mode 100755
index 00000000000..f7b39fd5050
--- /dev/null
+++ b/mcs/class/System/Test/System.Net.Sockets/TcpClientTest.cs
@@ -0,0 +1,82 @@
+// System.Net.Sockets.TcpClientTest.cs

+//

+// Author:

+//    Phillip Pearson (pp@myelin.co.nz)

+//

+// Copyright (C) 2001, Phillip Pearson

+//    http://www.myelin.co.nz

+//

+

+using System;

+using System.Net;

+using System.Net.Sockets;

+using NUnit.Framework;

+

+namespace MonoTests.System.Net.Sockets {

+

+	/// <summary>

+	/// Tests System.Net.Sockets.TcpClient

+	/// </summary>

+	public class TcpClientTest : TestCase {

+		

+		public TcpClientTest(string name) : base(name) {}

+		

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof (TcpClientTest));

+			}

+		}

+

+		/// <summary>

+		/// Tests the TcpClient object

+		/// (from System.Net.Sockets)

+		/// </summary>

+		public void test_TcpClient()

+		{

+			// set up a listening Socket

+			Socket lSock = new Socket(AddressFamily.InterNetwork,

+				SocketType.Stream, ProtocolType.Tcp);

+			

+			lSock.Bind(new IPEndPoint(IPAddress.Any, 1234));

+			lSock.Listen(-1);

+

+

+			// connect to it with a TcpClient

+			TcpClient outClient = new TcpClient("localhost", 1234);

+			Socket inSock = lSock.Accept();

+

+			

+			// now try exchanging data

+			NetworkStream stream = outClient.GetStream();

+

+			const int len = 1024;

+			byte[] outBuf = new Byte[len];

+			for (int i=0; i<len; i++) 

+			{

+				outBuf[i] = (byte)(i % 256);

+			}

+

+			// send it

+			stream.Write(outBuf,0,len);

+

+			// and see if it comes back

+			byte[] inBuf = new Byte[len];

+			int ret = inSock.Receive(inBuf, 0, len, 0);

+			Assert(ret != 0);

+

+			for (int i=0; i<len; i++) 

+			{

+				Assert(inBuf[i] == outBuf[i]);

+			}

+			

+

+			// tidy up

+			inSock.Close();

+			outClient.Close();

+			lSock.Close();

+			

+		}	

+		

+	}

+

+}

diff --git a/mcs/class/System/Test/System.Net.Sockets/TcpListenerTest.cs b/mcs/class/System/Test/System.Net.Sockets/TcpListenerTest.cs
new file mode 100755
index 00000000000..a07d6bfcb9e
--- /dev/null
+++ b/mcs/class/System/Test/System.Net.Sockets/TcpListenerTest.cs
@@ -0,0 +1,85 @@
+// System.Net.Sockets.TcpListenerTest.cs
+//
+// Author:
+//    Phillip Pearson (pp@myelin.co.nz)
+//
+// Copyright (C) 2001, Phillip Pearson
+//    http://www.myelin.co.nz
+//
+
+using System;
+using System.Net;
+using System.Net.Sockets;
+using NUnit.Framework;
+
+namespace MonoTests.System.Net.Sockets {
+
+	/// <summary>
+	/// Tests System.Net.Sockets.TcpListener
+	/// </summary>
+	public class TcpListenerTest : TestCase {
+		
+		public TcpListenerTest(string name) : base(name) {}
+
+		public static ITest Suite {
+			get {
+				return new TestSuite(typeof (TcpListenerTest));
+			}
+		}
+
+		/// <summary>
+		/// Tests the TcpListener object
+		/// (from System.Net.Sockets)
+		/// </summary>
+		public void test_TcpListener()
+		{
+			// listen with a new listener
+			TcpListener inListener = new TcpListener(1234);
+			inListener.Start();
+			
+
+			// connect to it from a new socket
+			Socket outSock = new Socket(AddressFamily.InterNetwork, SocketType.Stream,
+				ProtocolType.IP);
+			IPHostEntry hostent = Dns.GetHostByAddress("127.0.0.1");
+			IPEndPoint remote = new IPEndPoint(hostent.AddressList[0], 1234);
+			outSock.Connect(remote);
+
+			
+			// make sure the connection arrives
+			Assert(inListener.Pending());
+			Socket inSock = inListener.AcceptSocket();
+
+
+			// now send some data and see if it comes out the other end
+			const int len = 1024;
+			byte[] outBuf = new Byte[len];
+			for (int i=0; i<len; i++) 
+			{
+				outBuf[i] = (byte)(i % 256);
+			}
+
+			outSock.Send(outBuf, 0, len, 0);
+
+			byte[] inBuf = new Byte[len];
+			int ret = inSock.Receive(inBuf, 0, len, 0);
+
+
+			// let's see if it arrived OK
+			Assert(ret != 0);
+			for (int i=0; i<len; i++) 
+			{
+				Assert(inBuf[i] == outBuf[i]);
+			}
+
+
+			// tidy up after ourselves
+			inSock.Close();
+
+			inListener.Stop();	
+		}
+	
+		
+	}
+
+}
diff --git a/mcs/class/System/Test/System.Net/AllTests.cs b/mcs/class/System/Test/System.Net/AllTests.cs
new file mode 100644
index 00000000000..ed2c8f1e78b
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/AllTests.cs
@@ -0,0 +1,47 @@
+// Testsuite.System.AllSystemTests.cs
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System.Net {
+        /// <summary>
+        ///   Combines all available unit tests into one test suite.
+        /// </summary>
+        public class AllTests : TestCase {
+
+                public AllTests (string name) : base (name) {}
+                
+                public static ITest Suite { 
+                        get 
+                        {
+                                TestSuite suite = new TestSuite ();
+                                suite.AddTest (CookieTest.Suite);
+                                suite.AddTest (CookieCollectionTest.Suite);
+                                //suite.AddTest (CookieContainerTest.Suite);
+                                suite.AddTest (CredentialCacheTest.Suite);
+                                suite.AddTest (FileWebRequestTest.Suite);
+                                suite.AddTest (IPAddressTest.Suite);
+                                suite.AddTest (IPEndPointTest.Suite);
+                                suite.AddTest (SocketPermissionTest.Suite);
+                                suite.AddTest (WebHeaderCollectionTest.Suite);
+                                suite.AddTest (WebProxyTest.Suite);
+                                suite.AddTest (WebRequestTest.Suite);
+                                
+				#if NETWORKTEST                                
+                                	suite.AddTest (DnsTest.Suite);
+                                	suite.AddTest (HttpWebRequestTest.Suite);
+                                	suite.AddTest (ServicePointTest.Suite);
+                                	suite.AddTest (ServicePointManagerTest.Suite);
+				#endif                                
+                                
+				return suite;
+                        }
+                }
+        }
+}
+
diff --git a/mcs/class/System/Test/System.Net/ChangeLog b/mcs/class/System/Test/System.Net/ChangeLog
new file mode 100644
index 00000000000..bd6c4a00919
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/ChangeLog
@@ -0,0 +1,78 @@
+2002-05-21  Lawrence Pit <loz@cable.a2000.nl>
+
+	* WebClientTest.cs: added
+	* WebProxyTest.cs: more tests
+
+2002-05-20  Lawrence Pit <loz@cable.a2000.nl>
+
+	* ServicePointTest.cs: added
+	* ServicePointManagerTest.cs: added
+	* WebProxyTest.cs: added
+	* AllTests.cs: added the above tests
+	* WebHeaderCollection.cs: added TestIndexers.
+
+2002-05-19  Lawrence Pit <loz@cable.a2000.nl>
+
+	* FileWebRequestTest.cs: all the async methods tests to behave the same 
+	as in ms.net
+
+2002-05-12  Lawrence Pit <loz@cable.a2000.nl>
+
+	* FileWebRequestTest.cs: added
+
+2002-05-11  Lawrence Pit <loz@cable.a2000.nl>
+
+	* WebRequestTest.cs: added
+	* WebHeaderCollectionTest.cs: added
+
+2002-05-09  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Added tests to IPAddressTest.cs
+	* Fixed tests in CookieTest.cs, SocketPermissionsTest.cs, IPEndPointTest.cs
+
+2002-05-05  Lawrence Pit <loz@cable.a2000.nl>
+
+	* CredentialCacheTest.cs: added
+	* AllTests.cs: added CredentialCacheTest
+
+2002-05-05  Lawrence Pit <loz@cable.a2000.nl>
+
+	* IPAddressTest.cs: added test for loopback
+
+2002-04-30  Nick Drochak  <ndrochak@gol.com>
+
+	* IPAddressTest.cs: Remove unused code to eliminate compiler warnings.
+
+2002-04-27  Lawrence Pit <loz@cable.a2000.nl>
+
+	* CookieTest.cs: added
+	* CookieCollectionTest.cs: added
+	* AllTests.cs: added
+
+2002-04-24  Nick Drochak  <ndrochak@gol.com>
+
+	* IPAddressTest.cs: Make test conform to MS behavior. Also, if wrong 
+	exception is thrown, let eveyone know which one.
+
+2002-04-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IPAddressTest.cs: use BitConverter to set localhost, catch
+	OverflowException in TestParseWrong() and changed some constants.
+
+2002-04-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AllTests.cs: added IPEndPointTest.
+	* IPEndPointTest.cs: added file (author: Lawrence Pit).
+	* IPAdressTest.cs: use Fail is expected exception are not raised.
+
+2002-04-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IPAddressTest.cs: use System.BitConverter.IsLittleEndian (suggested
+	by Paolo) instead of guessing the endianness.
+	
+2002-04-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ChangeLog:
+	* AllTests.cs:
+	* IPAddressTest.cs: added files.
+
diff --git a/mcs/class/System/Test/System.Net/CookieCollectionTest.cs b/mcs/class/System/Test/System.Net/CookieCollectionTest.cs
new file mode 100644
index 00000000000..9d5e53eb64b
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/CookieCollectionTest.cs
@@ -0,0 +1,123 @@
+//

+// CookieCollectionTest.cs - NUnit Test Cases for System.Net.CookieCollection

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Net;

+using System.Collections;

+

+namespace MonoTests.System.Net

+{

+

+public class CookieCollectionTest : TestCase

+{

+	CookieCollection col;

+	

+        public CookieCollectionTest () :

+                base ("[MonoTests.System.Net.CookieCollectionTest]") {}

+

+        public CookieCollectionTest (string name) : base (name) {}

+

+        protected override void SetUp () 

+        {

+		col = new CookieCollection ();	

+		col.Add (new Cookie ("name1", "value1"));

+		col.Add (new Cookie ("name2", "value2", "path2"));

+		col.Add (new Cookie ("name3", "value3", "path3", "domain3"));		

+	}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (CookieCollectionTest));

+                }

+        }

+        

+        public void TestCount ()

+        {

+		AssertEquals ("#1", col.Count, 3);

+	}

+

+        public void TestIndexer ()

+        {

+		Cookie c = null;

+		try {

+			c = col [-1];

+			Fail ("#1");

+		} catch (ArgumentOutOfRangeException) {

+		}

+		try {

+			c = col [col.Count];

+			Fail ("#2");

+		} catch (ArgumentOutOfRangeException) {

+		}

+		c = col ["name1"];

+		AssertEquals ("#3", c.Name, "name1");

+		c = col ["NAME2"];

+		AssertEquals ("#4", c.Name, "name2");

+	}

+	

+	public void TestAdd ()

+	{

+		try {

+			Cookie c = null;

+			col.Add (c);

+			Fail ("#1");

+		} catch (ArgumentNullException) {

+		}

+		

+		// in the microsoft implementation this will fail,

+		// so we'll have to fail to.

+		try {

+			col.Add (col);

+			Fail ("#2");

+		} catch (Exception) {

+		}

+		AssertEquals ("#3", col.Count, 3);

+		

+		col.Add (new Cookie("name1", "value1"));		

+		AssertEquals ("#4", col.Count, 3);

+		

+		CookieCollection col2 = new CookieCollection();

+		Cookie c4 = new Cookie("name4", "value4");

+		Cookie c5 = new Cookie("name5", "value5");

+		col2.Add (c4);

+		col2.Add (c5);

+		col.Add (col2);

+		AssertEquals ("#5", col.Count, 5);

+		AssertEquals ("#6", col ["NAME4"], c4);

+		AssertEquals ("#7", col [4], c5);

+	}

+	

+	public void TestCopyTo ()

+	{

+		Array a = Array.CreateInstance (typeof (Cookie), 3);

+		col.CopyTo (a, 0);

+		AssertEquals ("#1", a.GetValue (0), col [0]);

+		AssertEquals ("#2", a.GetValue (1), col [1]);

+		AssertEquals ("#3", a.GetValue (2), col [2]);

+	}

+	

+	public void TestEnumerator ()

+	{

+		IEnumerator enumerator = col.GetEnumerator ();

+		enumerator.MoveNext ();

+		Cookie c = (Cookie) enumerator.Current;

+		AssertEquals ("#1", c, col [0]);

+		col.Add (new Cookie ("name6", "value6"));

+		try {

+			enumerator.MoveNext ();

+			Fail ("#2");

+		} catch (InvalidOperationException) {

+		}

+	}

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Net/CookieTest.cs b/mcs/class/System/Test/System.Net/CookieTest.cs
new file mode 100644
index 00000000000..d00d38421e4
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/CookieTest.cs
@@ -0,0 +1,165 @@
+//

+// CookieTest.cs - NUnit Test Cases for System.Net.Cookie

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Net;

+

+namespace MonoTests.System.Net

+{

+

+public class CookieTest : TestCase

+{

+        public CookieTest () :

+                base ("[MonoTests.System.Net.CookieTest]") {}

+

+        public CookieTest (string name) : base (name) {}

+

+        protected override void SetUp () {}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (CookieTest));

+                }

+        }

+

+        public void TestPublicFields ()

+        {

+        }

+

+        public void TestConstructors ()

+        {

+		Cookie c = new Cookie ("somename", null, null, null);

+		try {

+			c = new Cookie (null, null, null, null);

+			Fail ("#1: Name cannot be null");

+		} catch (CookieException) {

+		}

+        }

+        

+        public void TestName ()         

+        {

+		Cookie c = new Cookie ("SomeName", "SomeValue");

+		AssertEquals ("#1", c.Name, "SomeName");

+		try {

+			c.Name = null;

+			Fail ("#2a");

+		} catch (CookieException) {

+			AssertEquals ("#2b", "SomeName", c.Name);

+		}

+		try {

+			c.Name = "";

+			Fail ("#2c");

+		} catch (CookieException) {

+			AssertEquals ("#2d", "SomeName", c.Name);			

+		}

+		try {

+			c.Name = " ";

+			Fail ("#2e");			

+		} catch (CookieException) {

+			// bah! this fails, yet the name is changed.. 

+			// inconsistent with previous test

+			AssertEquals ("#2f", String.Empty, c.Name);			

+		}

+		try {

+			c.Name = "xxx\r\n";

+			Fail ("#2g");			

+		} catch (CookieException) {

+			AssertEquals ("#2h", String.Empty, c.Name);			

+		}		

+		try {

+			c.Name = "xxx" + (char) 0x80;

+		} catch (CookieException) {

+			Fail ("#2i");			

+		}				

+		try {

+			c.Name = "$omeName";

+			Fail ("#3a: Name cannot start with '$' character");

+		} catch (CookieException) {

+			AssertEquals ("#3b", String.Empty, c.Name);

+		}

+		c.Name = "SomeName$";

+		AssertEquals ("#4", c.Name, "SomeName$");

+		try {

+			c.Name = "Some=Name";

+			Fail ("#5a: Name cannot contain '=' character");

+		} catch (CookieException) {

+			AssertEquals ("#5b", String.Empty, c.Name);

+		}		

+		c.Name = "domain";

+		AssertEquals ("#6", c.Name, "domain");

+	}

+	

+	public void TestValue ()

+	{

+		// LAMESPEC: According to .Net specs the Value property should not accept 

+		// the semicolon and comma characters, yet it does

+		/*

+		Cookie c = new Cookie("SomeName", "SomeValue");

+		try {

+			c.Value = "Some;Value";

+			Fail ("#1: semicolon should not be accepted");

+		} catch (CookieException) {

+		}

+		try {

+			c.Value = "Some,Value";

+			Fail ("#2: comma should not be accepted");

+		} catch (CookieException) {

+		}

+		c.Value = "Some\tValue";

+		AssertEquals ("#3", c.Value, "Some\tValue");

+		*/

+	}

+	

+	public void TestPort ()

+	{

+		Cookie c = new Cookie ("SomeName", "SomeValue");

+		try {

+			c.Port = "123";

+			Fail ("#1: port must start and end with double quotes");

+		} catch (CookieException) {			

+		}

+		try {

+			c.Port = "\"123\"";

+		} catch (CookieException) {			

+			Fail ("#2");

+		}

+		try {

+			c.Port = "\"123;124\"";

+			Fail ("#3");

+		} catch (CookieException) {					

+		}

+		try {

+			c.Port = "\"123,123,124\"";

+		} catch (CookieException) {			

+			Fail ("#4");

+		}

+		try {

+			c.Port = "\"123,124\"";

+		} catch (CookieException) {			

+			Fail ("#5");

+		}

+	}

+

+        public void TestEquals ()

+        {

+		Cookie c1 = new Cookie ("NAME", "VALUE", "PATH", "DOMAIN");

+		Cookie c2 = new Cookie ("name", "value", "path", "domain");

+		Assert("#1", !c1.Equals (c2));

+		c2.Value = "VALUE";

+		c2.Path = "PATH";

+		Assert("#2", c1.Equals (c2));

+		c2.Version = 1;

+		Assert("#3", !c1.Equals (c2));

+        }

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Net/CredentialCacheTest.cs b/mcs/class/System/Test/System.Net/CredentialCacheTest.cs
new file mode 100644
index 00000000000..1509f280087
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/CredentialCacheTest.cs
@@ -0,0 +1,120 @@
+//

+// CredentialCacheTest.cs - NUnit Test Cases for System.Net.CredentialCache

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Net;

+using System.Collections;

+using System.Security;

+using System.Security.Permissions;

+

+namespace MonoTests.System.Net

+{

+

+public class CredentialCacheTest : TestCase

+{

+        public CredentialCacheTest () :

+                base ("[MonoTests.System.Net.CredentialCacheTest]") {}

+

+        public CredentialCacheTest (string name) : base (name) {}

+

+        protected override void SetUp () {}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (CredentialCacheTest));

+                }

+        }

+        

+        public void TestAll ()

+        {

+		CredentialCache c = new CredentialCache ();

+		

+		NetworkCredential cred1 = new NetworkCredential ("user1", "pwd1");

+		NetworkCredential cred2 = new NetworkCredential ("user2", "pwd2");

+		NetworkCredential cred3 = new NetworkCredential ("user3", "pwd3");

+		NetworkCredential cred4 = new NetworkCredential ("user4", "pwd4");

+		NetworkCredential cred5 = new NetworkCredential ("user5", "pwd5");

+		

+		c.Add (new Uri ("http://www.ximian.com"), "Basic", cred1);

+		c.Add (new Uri ("http://www.ximian.com"), "Kerberos", cred2);

+		

+		c.Add (new Uri ("http://www.contoso.com/portal/news/index.aspx"), "Basic", cred1);

+		c.Add (new Uri ("http://www.contoso.com/portal/news/index.aspx?item=1"), "Basic", cred2);

+		c.Add (new Uri ("http://www.contoso.com/portal/news/index.aspx?item=12"), "Basic", cred3);

+		c.Add (new Uri ("http://www.contoso.com/portal/"), "Basic", cred4);

+		c.Add (new Uri ("http://www.contoso.com"), "Basic", cred5);

+		

+		NetworkCredential result = null;

+	

+		try {

+			c.Add (new Uri("http://www.ximian.com"), "Basic", cred1);

+			Fail ("#1: should have failed");

+		} catch (ArgumentException) { }

+

+		c.Add (new Uri("http://www.contoso.com/"), "**Unknown**", cred1);

+		result = c.GetCredential (new Uri("http://www.contoso.com/"), "**Unknown**");

+		AssertEquals ("#3", result, cred1);

+		c.Remove (new Uri("http://www.contoso.com/"), "**Unknown**");

+		result = c.GetCredential (new Uri("http://www.contoso.com/"), "**Unknown**");

+		Assert ("#4", result == null);

+

+		c.Add (new Uri("http://www.contoso.com/"), "**Unknown**", cred1);

+		result = c.GetCredential (new Uri("http://www.contoso.com"), "**Unknown**");

+		AssertEquals ("#5", result, cred1);

+		c.Remove (new Uri("http://www.contoso.com"), "**Unknown**");

+		result = c.GetCredential (new Uri("http://www.contoso.com"), "**Unknown**");

+		Assert ("#6", result == null);

+

+		c.Add (new Uri("http://www.contoso.com/portal/"), "**Unknown**", cred1);

+		result = c.GetCredential (new Uri("http://www.contoso.com/portal/foo/bar.html"), "**Unknown**");

+		AssertEquals ("#7", result, cred1);

+		c.Remove (new Uri("http://www.contoso.com"), "**Unknown**");

+		result = c.GetCredential (new Uri("http://www.contoso.com"), "**Unknown**");

+		Assert ("#8", result == null);

+

+		result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/news/index.aspx"), "Basic");

+		AssertEquals ("#9", result, cred3);

+

+		result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/news/index"), "Basic");

+		AssertEquals ("#10", result, cred3);

+

+		result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/news/"), "Basic");

+		AssertEquals ("#11", result, cred3);

+		

+		result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/news"), "Basic");

+		AssertEquals ("#12", result, cred4);

+

+		result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/ne"), "Basic");

+		AssertEquals ("#13", result, cred4);

+

+		result = c.GetCredential (new Uri("http://www.contoso.com:80/portal/"), "Basic");

+		AssertEquals ("#14", result, cred4);				

+

+		result = c.GetCredential (new Uri("http://www.contoso.com:80/portal"), "Basic");

+		AssertEquals ("#15", result, cred5);

+

+		result = c.GetCredential (new Uri("http://www.contoso.com:80/"), "Basic");

+		AssertEquals ("#16", result, cred5);

+

+		result = c.GetCredential (new Uri("http://www.contoso.com"), "Basic");

+		AssertEquals ("#17", result, cred5);		

+

+		/*		

+		IEnumerator e = c.GetEnumerator ();

+		while (e.MoveNext ()) {

+			Console.WriteLine (e.Current.GetType () + " : " + e.Current.ToString ());

+		}

+		*/

+	}

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Net/DnsTest.cs b/mcs/class/System/Test/System.Net/DnsTest.cs
new file mode 100644
index 00000000000..804351a8bb7
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/DnsTest.cs
@@ -0,0 +1,172 @@
+// DnsTest.cs - NUnit Test Cases for the System.Net.Dns class

+//

+// Author: Mads Pultz (mpultz@diku.dk)

+//

+// (C) Mads Pultz, 2001

+// 

+// This test assumes the following:

+// 1) The following Internet sites exist:

+//        www.go-mono.com with IP address 129.250.184.233

+//        info.diku.dk with IP address 130.225.96.4

+// 2) The following DNS name does not exist:

+//        www.hopefullydoesnotexist.dk

+//

+

+using NUnit.Framework;

+using System;

+using System.Net;

+using System.Net.Sockets;

+using System.Threading;

+using System.Collections;

+

+namespace MonoTests.System.Net {

+

+public class DnsTest: TestCase {

+        

+        private String site1Name = "www.go-mono.com",

+                site1Dot = "129.250.184.233",

+                site2Name = "info.diku.dk",

+                site2Dot = "130.225.96.4",

+                noneExistingSite = "www.hopefullydoesnotexist.dk";

+        private uint site1IP = 2180692201, site2IP = 2195808260; // Big-Endian

+        

+        public DnsTest(): base("MonoTests.System.Net.DnsTest testsuite") { }

+        public DnsTest(String name): base(name) { }

+

+        public static ITest Suite {

+                get { return new TestSuite(typeof(DnsTest)); }

+        }

+        

+        private void Callback(IAsyncResult ar) { 

+                IPHostEntry h;

+                h = Dns.EndGetHostByName(ar);

+                SubTestValidIPHostEntry(h);

+        }

+

+        public void TestAsyncGetHostByName(){

+                IAsyncResult r;

+                r = Dns.BeginGetHostByName(site1Name, new AsyncCallback(Callback), null);

+                

+		IAsyncResult async = Dns.BeginGetHostByName (site1Name, null, null);

+		IPHostEntry entry = Dns.EndGetHostByName (async);                

+		SubTestValidIPHostEntry(entry);

+		AssertEquals ("#1", "www.go-mono.com", entry.HostName);

+        }

+        

+        public void TestAsyncResolve() {

+                IAsyncResult r;

+                r = Dns.BeginResolve(site1Name, new AsyncCallback(Callback), null);

+

+		IAsyncResult async = Dns.BeginResolve (site1Dot, null, null);

+		IPHostEntry entry = Dns.EndResolve (async);                

+		SubTestValidIPHostEntry(entry);

+		AssertEquals ("#1", "129.250.184.233", entry.HostName);

+        }

+        

+        public void TestGetHostName() {

+                string hostName = Dns.GetHostName();

+                Assert(hostName != null);

+        }

+        

+        private void SubTestGetHostByName(string siteName, string siteDot) {

+                IPHostEntry h = Dns.GetHostByName(siteName);

+                SubTestValidIPHostEntry(h);

+                Assert(h.HostName.Equals(siteName));

+                Assert(h.AddressList[0].ToString() == siteDot);

+        }

+        

+        public void TestGetHostByName() {

+                SubTestGetHostByName(site1Name, site1Dot);

+                SubTestGetHostByName(site2Name, site2Dot);

+                try {

+                        Dns.GetHostByName(noneExistingSite);

+                        Fail("Should raise a SocketException (assuming that '" + noneExistingSite + "' does not exist)");

+                } catch (SocketException) {

+                } 

+                try {

+                        Dns.GetHostByName(null);

+                        Fail("Should raise an ArgumentNullException");

+                } catch (ArgumentNullException) {

+                } 

+        }

+        

+        private void SubTestGetHostByAddressStringFormatException(string addr) {

+                try {

+                        Dns.GetHostByAddress(addr);

+                        Fail("Should raise a FormatException");

+                } catch (FormatException) {

+                } 

+        }

+        

+        private void SubTestGetHostByAddressString(string addr) {

+                IPHostEntry h = Dns.GetHostByAddress(addr);

+                SubTestValidIPHostEntry(h);

+        }

+        

+        public void TestGetHostByAddressString() {

+                try {

+                        String addr = null;

+                        Dns.GetHostByAddress(addr);

+                        Fail("Should raise an ArgumentNullException");

+                } catch (ArgumentNullException) {

+                }

+                SubTestGetHostByAddressStringFormatException("123.255.23");

+                SubTestGetHostByAddressStringFormatException("123.256.34.10");

+                SubTestGetHostByAddressStringFormatException("not an IP address");

+                SubTestGetHostByAddressString(site1Dot);

+                SubTestGetHostByAddressString(site2Dot);

+        }

+        

+        private void SubTestGetHostByAddressIPAddress(IPAddress addr) {

+                IPHostEntry h = Dns.GetHostByAddress(addr);

+                SubTestValidIPHostEntry(h);

+                Assert(h.AddressList[0].ToString() == addr.ToString());

+        }

+        

+        public void TestGetHostByAddressIPAddress() {

+                try {

+                        IPAddress addr = null;

+                        Dns.GetHostByAddress(addr);

+                        Fail("Should raise an ArgumentNullException");

+                } catch (ArgumentNullException) {

+                }

+                SubTestGetHostByAddressIPAddress(new IPAddress(IPAddress.NetworkToHostOrder((int)site1IP)));

+                SubTestGetHostByAddressIPAddress(new IPAddress(IPAddress.NetworkToHostOrder((int)site2IP)));

+        }

+        

+        private void SubTestResolve(string addr) {

+                IPHostEntry h = Dns.Resolve(addr);

+                SubTestValidIPHostEntry(h);

+        }

+        

+        public void TestResolve() {

+                SubTestResolve(site1Name);

+                SubTestResolve(site2Name);

+                SubTestResolve(site1Dot);

+                SubTestResolve(site2Dot);

+        }

+        

+        private void SubTestValidIPHostEntry(IPHostEntry h) {

+                Assert(h.HostName != null);

+                Assert(h.AddressList != null);

+                Assert(h.AddressList.Length > 0);

+        }

+        

+        private static void printIPHostEntry(IPHostEntry h)

+        {

+                Console.WriteLine("----------------------------------------------------");

+                Console.WriteLine("Host name:");

+                Console.WriteLine(h.HostName);

+                Console.WriteLine("IP addresses:");

+                IPAddress[] list = h.AddressList;

+                for(int i = 0; i < list.Length; ++i)

+                        Console.WriteLine(list[i]);

+                Console.WriteLine("Aliases:");

+                string[] aliases = h.Aliases;

+                for(int i = 0; i < aliases.Length; ++i)

+                        Console.WriteLine(aliases[i]);

+                Console.WriteLine("----------------------------------------------------");

+        }

+}

+

+}

diff --git a/mcs/class/System/Test/System.Net/FileWebRequestTest.cs b/mcs/class/System/Test/System.Net/FileWebRequestTest.cs
new file mode 100644
index 00000000000..ae99aa076a0
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/FileWebRequestTest.cs
@@ -0,0 +1,306 @@
+//

+// FileWebRequestTest.cs - NUnit Test Cases for System.Net.FileWebRequest

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.IO;

+using System.Net;

+using System.Collections;

+using System.Security;

+using System.Security.Permissions;

+

+namespace MonoTests.System.Net

+{

+

+public class FileWebRequestTest : TestCase

+{

+        public FileWebRequestTest () :

+                base ("[MonoTests.System.Net.FileWebRequestTest]") {}

+

+        public FileWebRequestTest (string name) : base (name) {}

+

+        protected override void SetUp () {}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (FileWebRequestTest));

+                }

+        }

+        

+        

+        public void TestAsync ()

+        {

+		string tmpFilename = GetFilename ();

+		if (tmpFilename == null) {

+			Console.WriteLine ("\n\nSet environment variable TMPDIR to a temporary directory to test FileWebRequest\n");

+			return;

+		}

+		

+		try {

+			if (File.Exists (tmpFilename)) 

+				File.Delete (tmpFilename);

+			

+			Uri uri = new Uri ("file:///" + tmpFilename);

+			

+			WebRequest req = WebRequest.Create (uri);

+			req.Method = "PUT";

+			

+			req.Timeout = 2 * 1000;

+			IAsyncResult async = req.BeginGetRequestStream (null, null);

+			try {

+				req.BeginGetRequestStream (null, null);

+				Fail ("#1 should've failed");

+			} catch (InvalidOperationException) { 

+				//Console.WriteLine ("GOT1: " + e.Message + "\n" + e.StackTrace);				

+				// Cannot re-call BeginGetRequestStream/BeginGetResponse while

+				// a previous call is still in progress

+			}

+			/*

+			try {

+				req.BeginGetResponse (null, null);

+				Fail ("#2 should've failed");

+			} catch (InvalidOperationException) { }

+			*/

+			try {

+				req.GetRequestStream ();

+				Fail ("#3 should've failed");

+			} catch (InvalidOperationException) { 

+				// Console.WriteLine ("GOT3: " + e.Message + "\n" + e.StackTrace);

+				// Cannot re-call BeginGetRequestStream/BeginGetResponse while

+				// a previous call is still in progress

+			}

+

+			try {

+				req.GetResponse ();

+				Fail ("#4 should've failed");

+			} catch (WebException) { 

+				// Console.WriteLine ("4: " + e.Message + "\n" + e.StackTrace);				

+				// The operation has timed out

+			}

+

+			try {

+				IAsyncResult async0 = req.BeginGetResponse (null, null);

+				req.EndGetResponse (async0);

+				// Console.WriteLine ("X5c");

+				Fail ("#5 should've failed");

+			} catch (InvalidOperationException) { 

+				// Console.WriteLine ("5e: " + e.Message + "\n" + e.StackTrace);

+				// Cannot re-call BeginGetRequestStream/BeginGetResponse while

+				// a previous call is still in progress

+			}

+			

+			// Console.WriteLine ("WEBHEADERS: " + req.Headers);

+			

+			Stream wstream = req.EndGetRequestStream (async);

+			AssertEquals ("#1r", false, wstream.CanRead);

+			AssertEquals ("#1w", true, wstream.CanWrite);

+			AssertEquals ("#1s", true, wstream.CanSeek);

+

+			wstream.WriteByte (72);

+			wstream.WriteByte (101);

+			wstream.WriteByte (108);

+			wstream.WriteByte (108);

+			wstream.WriteByte (111);

+			wstream.Close ();

+			

+			// stream written

+

+			req = WebRequest.Create (uri);

+			WebResponse res = req.GetResponse ();	

+			

+			try {

+				req.BeginGetRequestStream (null, null);

+				Fail ("#20: should've failed");

+			} catch (InvalidOperationException) { 

+				// Console.WriteLine ("20: " + e.Message + "\n" + e.StackTrace);				

+				// Cannot send a content-body with this verb-type

+			}

+			

+			try {

+				req.Method = "PUT";

+				req.BeginGetRequestStream (null, null);

+				Fail ("#21: should've failed");

+			} catch (InvalidOperationException) { 

+				// Console.WriteLine ("21: " + e.Message + "\n" + e.StackTrace);				

+				// This operation cannot be perfomed after the request has been submitted.

+			}

+			

+			try {

+				//IAsyncResult async2 = req.BeginGetResponse (null, null);

+				//Console.WriteLine ("OK!");

+				req.GetResponse ();

+				//Fail ("#22: should've failed");

+			} catch (InvalidOperationException) { 

+				//Console.WriteLine ("22: " + e.Message + "\n" + e.StackTrace);

+				// Cannot re-call BeginGetRequestStream/BeginGetResponse while

+				// a previous call is still in progress

+				Fail ("#22: should not have failed");

+			}			

+			

+			try {

+				IAsyncResult async2 = req.BeginGetResponse (null, null);

+				

+				// this succeeds !!

+				

+				try {

+					WebResponse res2 = req.EndGetResponse (async2);

+										

+					// and this succeeds

+					

+					AssertEquals ("#23", res, res2) ;

+					

+					//Fail ("#23: should've failed");

+				} catch (InvalidOperationException) { 

+					//Console.WriteLine ("22: " + e.Message + "\n" + e.StackTrace);				

+					// Cannot re-call BeginGetRequestStream/BeginGetResponse while

+					// a previous call is still in progress

+				}				

+				

+				// Fail ("#22: should've failed");

+			} catch (InvalidOperationException) { 

+			}			

+

+			AssertEquals ("#2 len", (long) 5, res.ContentLength);

+			AssertEquals ("#2 type", "binary/octet-stream", res.ContentType);

+			AssertEquals ("#2 scheme", "file", res.ResponseUri.Scheme);

+			

+			Stream rstream = res.GetResponseStream ();			

+			AssertEquals ("#3r", true, rstream.CanRead);

+			AssertEquals ("#3w", false, rstream.CanWrite);

+			AssertEquals ("#3s", true, rstream.CanSeek);

+			

+			AssertEquals ("#4a", 72, rstream.ReadByte ());

+			AssertEquals ("#4b", 101, rstream.ReadByte ());

+			AssertEquals ("#4c", 108, rstream.ReadByte ());

+

+			rstream.Close ();

+			// res.Close ();

+			

+			try {

+				long len = res.ContentLength;

+				AssertEquals ("#5", (long) 5, len);

+			} catch (ObjectDisposedException) {

+				Fail ("#disposed contentlength");				

+			}

+			try {

+				WebHeaderCollection w = res.Headers;

+			} catch (ObjectDisposedException) {

+				Fail ("#disposed headers");				

+			}			

+			try {

+				res.Close ();				

+			} catch (ObjectDisposedException) {

+				Fail ("#disposed close");				

+			}

+		} catch (Exception) {

+			// Console.WriteLine ("ERROR! : " + ee.Message + "\n" + ee.StackTrace);

+		} finally {

+			try {

+				// known bug #24940

+				File.Delete (tmpFilename);

+			} catch (Exception) { 

+				// Console.WriteLine ("ERROR2! : " + ee2.Message + "\n" + ee2.StackTrace);

+			}

+		}

+	}	        

+        

+        public void TestSync ()

+        {

+		string tmpFilename = GetFilename ();

+		if (tmpFilename == null)

+			return;

+		

+		try {		

+			if (File.Exists (tmpFilename)) 

+				File.Delete (tmpFilename);

+			

+			Uri uri = new Uri ("file:///" + tmpFilename);

+			

+			WebRequest req = WebRequest.Create (uri);

+			

+			try {

+				Stream stream = req.GetRequestStream ();

+				Fail ("should throw exception");

+			} catch (ProtocolViolationException) {}

+			

+			req.Method = "PUT";

+			

+			Stream wstream = req.GetRequestStream ();

+			AssertEquals ("#1r", false, wstream.CanRead);

+			AssertEquals ("#1w", true, wstream.CanWrite);

+			AssertEquals ("#1s", true, wstream.CanSeek);

+

+			wstream.WriteByte (72);

+			wstream.WriteByte (101);

+			wstream.WriteByte (108);

+			wstream.WriteByte (108);

+			wstream.WriteByte (111);

+			wstream.Close ();

+			

+			// stream written

+			

+			req = WebRequest.Create (uri);

+			WebResponse res = req.GetResponse ();			

+			AssertEquals ("#2 len", (long) 5, res.ContentLength);

+			AssertEquals ("#2 type", "binary/octet-stream", res.ContentType);

+			AssertEquals ("#2 scheme", "file", res.ResponseUri.Scheme);

+			

+			Stream rstream = res.GetResponseStream ();			

+			AssertEquals ("#3r", true, rstream.CanRead);

+			AssertEquals ("#3w", false, rstream.CanWrite);

+			AssertEquals ("#3s", true, rstream.CanSeek);

+			

+			AssertEquals ("#4a", 72, rstream.ReadByte ());

+			AssertEquals ("#4b", 101, rstream.ReadByte ());

+			AssertEquals ("#4c", 108, rstream.ReadByte ());

+			

+			rstream.Close ();

+			// res.Close ();

+			

+			try {

+				long len = res.ContentLength;

+				AssertEquals ("#5", (long) 5, len);

+			} catch (ObjectDisposedException) {

+				Fail ("#disposed contentlength");				

+			}

+			try {

+				WebHeaderCollection w = res.Headers;

+			} catch (ObjectDisposedException) {

+				Fail ("#disposed headers");				

+			}			

+			try {

+				res.Close ();				

+			} catch (ObjectDisposedException) {

+				Fail ("#disposed close");				

+			}

+			

+		} finally {

+			try {

+				File.Delete (tmpFilename);

+			} catch (Exception) { }

+		}

+	}	

+	

+	private string GetFilename ()

+	{

+		string tmpdir = Environment.GetEnvironmentVariable ("TMPDIR");

+		if (tmpdir == null || tmpdir.Length == 0) {

+			return null;

+		}

+		

+		tmpdir = tmpdir.Replace ('\\', '/');

+		if (tmpdir [tmpdir.Length - 1] != '/')

+			tmpdir += "/";

+		return tmpdir + "FileWebRequestTest.tmp";

+	}

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs b/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
new file mode 100644
index 00000000000..bbbba624b7f
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/HttpWebRequestTest.cs
@@ -0,0 +1,101 @@
+//

+// HttpWebRequestTest.cs - NUnit Test Cases for System.Net.HttpWebRequest

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Net;

+using System.Collections;

+

+namespace MonoTests.System.Net

+{

+

+public class HttpWebRequestTest : TestCase

+{

+        public HttpWebRequestTest () :

+                base ("[MonoTests.System.Net.HttpWebRequestTest]") {}

+

+        public HttpWebRequestTest (string name) : base (name) {}

+

+        protected override void SetUp () {}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (HttpWebRequestTest));

+                }

+        }

+        

+        public void TestSync ()

+        {

+		try {

+			HttpWebRequest req = (HttpWebRequest) WebRequest.Create ("http://www.google.com");

+			req.UserAgent = "MonoClient v1.0";

+			Console.WriteLine ("req:If Modified Since: " + req.IfModifiedSince);

+			WriteHeaders ("req:", req.Headers);		

+

+			HttpWebResponse res = (HttpWebResponse) req.GetResponse ();

+			Console.WriteLine ("res:HttpStatusCode: " + res.StatusCode);

+			Console.WriteLine ("res:HttpStatusDescription: " + res.StatusDescription);

+			

+			WriteHeaders ("res:", res.Headers);		

+			Console.WriteLine("Last Modified: " + res.LastModified);

+			

+			WriteCookies ("res:", res.Cookies);

+				

+			WriteHeaders ("req:", req.Headers);		

+				

+			res.Close ();

+		} catch (WebException e) {

+			Console.WriteLine("\nThe following Exception was raised : {0}", e.Message);

+		}

+	}

+	

+        public void TestAsync ()

+        {

+	}

+	

+	public void TestAddRange ()

+	{

+		HttpWebRequest req = (HttpWebRequest) WebRequest.Create ("http://www.google.com");

+		req.AddRange (10);

+		req.AddRange (50, 90);

+		req.AddRange ("bytes", 100); 

+		req.AddRange ("bytes", 100, 120);

+		AssertEquals ("#1", "bytes=10-,50-90,100-,100-120", req.Headers ["Range"]);

+		try {

+			req.AddRange ("bits", 2000);

+			Fail ("#2");

+		} catch (InvalidOperationException) {}

+	}

+	

+	private void WriteHeaders (string label, WebHeaderCollection col) 

+	{

+		label += "Headers";

+		if (col.Count == 0)

+			Console.WriteLine (label + "Nothing in web headers collection\n");

+		else

+			Console.WriteLine (label);

+		for (int i = 0; i < col.Count; i++)

+			Console.WriteLine ("\t" + col.GetKey (i) + ": " + col.Get (i));

+	}

+	

+	private void WriteCookies (string label, CookieCollection col) 

+	{

+		label += "Cookies";

+		if (col.Count == 0)

+			Console.WriteLine (label + "Nothing in cookies collection\n");

+		else

+			Console.WriteLine (label);

+		for (int i = 0; i < col.Count; i++)

+			Console.WriteLine ("\t" + col [i]);

+	}

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Net/IPAddressTest.cs b/mcs/class/System/Test/System.Net/IPAddressTest.cs
new file mode 100644
index 00000000000..6e82828ad22
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/IPAddressTest.cs
@@ -0,0 +1,234 @@
+//
+// IPAddressTest.cs - NUnit Test Cases for System.Net.IPAddress
+//
+// Author:
+//   Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using NUnit.Framework;
+using System;
+using System.Net;
+using System.Runtime.InteropServices;
+
+namespace MonoTests.System.Net
+{
+
+public class IPAddressTest : TestCase
+{
+	public IPAddressTest () : 
+		base ("[MonoTests.System.Net.IPAddressTest]") {}
+
+	public IPAddressTest (string name) : base (name) {}
+
+	protected override void SetUp () {}
+	
+	protected override void TearDown() {}
+
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(IPAddressTest)); 
+		}
+	}
+
+	public void TestPublicFields ()
+	{
+		AssertEquals ("Any", IPAddress.Any.Address, (long) 0);
+		AssertEquals ("Broadcast", IPAddress.Broadcast.Address, (long) 0xFFFFFFFF);
+		long loopback = IPAddress.HostToNetworkOrder (BitConverter.IsLittleEndian ? 
+							      0x7f000001 : 
+							      0x0100007f);
+		AssertEquals ("Loopback", IPAddress.Loopback.Address, loopback);
+		AssertEquals ("None", IPAddress.None.Address, (long) 0xFFFFFFFF);
+	}
+
+	public void TestToString ()
+	{
+		IPAddress ip = IPAddress.Parse ("192.168.1.1");
+		AssertEquals ("ToString #1", "192.168.1.1", ip.ToString ());
+		AssertEquals ("ToString #2", "0.0.0.0", IPAddress.Any.ToString ());
+		AssertEquals ("ToString #3", "255.255.255.255", IPAddress.Broadcast.ToString ());
+		AssertEquals ("ToString #4", "127.0.0.1", IPAddress.Loopback.ToString ());
+		AssertEquals ("ToString #5", "255.255.255.255", IPAddress.None.ToString ());
+	}
+	
+	public void TestIsLoopback ()
+	{
+		IPAddress ip = IPAddress.Parse ("127.0.0.1");
+		AssertEquals ("IsLoopback #1", true, IPAddress.IsLoopback (ip));
+	}
+	
+	public void TestAddress ()
+	{
+		// hm, lame, anything is accepted by ms.net
+		/*
+		try {
+			IPAddress ip1 = new IPAddress (0x0000000100000000);
+			Fail ("#1");
+		} catch (ArgumentOutOfRangeException) {}
+		IPAddress ip = IPAddress.Parse ("127.0.0.1");
+		ip.Address = 0;
+		ip.Address = 0xffffffff;
+		try {
+			ip.Address = -1;
+			Fail ("#2");
+		} catch (ArgumentOutOfRangeException) {}
+		try {
+			ip.Address = 0x0000000100000000;
+			Fail ("#3");
+		} catch (ArgumentOutOfRangeException) {}
+		*/
+	}
+
+	public void TestParseOk ()
+	{
+		IPAddress ip = IPAddress.Parse ("192.168.1.1");
+		Assert ("Parse #1", ip.ToString () == "192.168.1.1");
+
+		ip = IPAddress.Parse ("0xff.0x7f.0x20.0x01");
+		Assert ("Parse #1b", ip.ToString () == "255.127.32.1");
+
+		ip = IPAddress.Parse ("0xff.0x7f.0x20.0xf");
+		Assert ("Parse #1c", ip.ToString () == "255.127.32.15");
+
+		ip = IPAddress.Parse ("0.0.0.0");
+		AssertEquals ("Parse #2", ip, IPAddress.Any);
+
+		ip = IPAddress.Parse ("255.255.255.255");
+		AssertEquals ("Parse #3", ip, IPAddress.Broadcast);
+		AssertEquals ("Parse #4", ip, IPAddress.None);
+
+		ip = IPAddress.Parse ("127.0.0.1");
+		AssertEquals ("Parse #5", IPAddress.IsLoopback (ip), true);
+
+		ip = IPAddress.Parse ("12.1.1.3 ");
+		AssertEquals ("Parse #6", IPAddress.Parse ("12.1.1.3"), ip);
+
+		ip = IPAddress.Parse (" 12.1.1.1");
+		AssertEquals ("Parse #7", IPAddress.Parse ("0.0.0.0"), ip);
+
+		ip = IPAddress.Parse ("12.1 .1.2");
+		AssertEquals ("Parse #8", IPAddress.Parse ("12.0.0.1"), ip);
+
+		ip = IPAddress.Parse (".1.1.6");
+		AssertEquals ("Parse #9", IPAddress.Parse ("0.1.1.6"), ip);
+
+		ip = IPAddress.Parse ("12.1.7");
+		AssertEquals ("Parse #10", IPAddress.Parse ("12.1.0.7"), ip);
+
+		ip = IPAddress.Parse ("12.1.8. ");
+		AssertEquals ("Parse #11", IPAddress.Parse ("12.1.8.0"), ip);
+
+		ip = IPAddress.Parse ("12");
+		AssertEquals ("Parse #12", IPAddress.Parse ("0.0.0.12"), ip);	
+
+		ip = IPAddress.Parse ("12.1 foo.1.2.3.4.5.bar");
+		AssertEquals ("Parse #13", IPAddress.Parse ("12.0.0.1"), ip);			
+
+		ip = IPAddress.Parse ("12.1.2. ");
+		AssertEquals ("Parse #14", IPAddress.Parse ("12.1.2.0"), ip);			
+
+		ip = IPAddress.Parse ("12.. .");
+		AssertEquals ("Parse #15", IPAddress.Parse ("12.0.0.0"), ip);			
+
+		ip = IPAddress.Parse (" ");
+		AssertEquals ("Parse #16", IPAddress.Parse ("0.0.0.0"), ip);			
+
+		ip = IPAddress.Parse (" foo");
+		AssertEquals ("Parse #17", IPAddress.Parse ("0.0.0.0"), ip);			
+	}
+
+	public void TestParseWrong ()
+	{
+		IPAddress ip = IPAddress.None;
+		try {
+			ip = IPAddress.Parse ("12.+1.1.4");
+                        Fail("Should raise a FormatException #1");
+		} catch (FormatException) {
+		} catch (Exception e) {
+			Fail ("ParseWrong #1:" + e.ToString());
+		}
+
+		try {
+			ip = IPAddress.Parse ("12.1.-1.5");
+                        Fail("Should raise a FormatException #2");
+		} catch (FormatException) {
+		} catch (Exception e) {
+			Fail ("ParseWrong #2:" + e.ToString());
+		}
+
+		try {
+			ip = IPAddress.Parse ("257.1.1.9");
+                        Fail("Should raise a FormatException #3");
+		} catch (FormatException) {
+		} catch (Exception e) {
+			Fail ("ParseWrong #3:" + e.ToString());
+		}
+
+		try {
+			ip = IPAddress.Parse (null);
+                        Fail("Should raise a ArgumentNullException #1");
+		} catch (ArgumentNullException) {
+		} catch (Exception e) {
+			Fail ("ParseWrong #4:" + e.ToString());
+		}
+
+		try {
+			ip = IPAddress.Parse ("12.");
+			Fail ("ParseWrong #5: Should raise a FormatException");
+		} catch (FormatException) {}
+
+		try {
+			ip = IPAddress.Parse ("12.1.2.");
+			Fail ("ParseWrong #6: Should raise a FormatException");
+		} catch (FormatException) {}		
+
+		try {
+			ip = IPAddress.Parse ("12...");
+			Fail ("ParseWrong #7: Should raise a FormatException");
+		} catch (FormatException) {}		
+	}
+
+	public void TestNetworkHost ()
+	{
+		long [] tested = new long [] { 0, 1, 1, 1};
+		long [] expectedLE = new long [] {0, 256, 16777216, 72057594037927936 };
+		long [] expected;
+		
+		expected = BitConverter.IsLittleEndian ? expectedLE : tested;
+
+		short short0 = IPAddress.NetworkToHostOrder ((short) tested [0]);
+		AssertEquals ("NetworkToHostOrder #1", short0, (short) expected [0]);
+		short0 = IPAddress.HostToNetworkOrder (short0);
+		AssertEquals ("HostToNetworkOrder #1", short0, (short) tested [0]);
+
+		int int0 = IPAddress.NetworkToHostOrder ((int) tested [0]);
+		AssertEquals ("NetworkToHostOrder #2", int0, (int) expected [0]);
+		int0 = IPAddress.HostToNetworkOrder (int0);
+		AssertEquals ("HostToNetworkOrder #2", int0, (int) tested [0]);
+		
+		long long0 = IPAddress.NetworkToHostOrder (tested [0]);
+		AssertEquals ("NetworkToHostOrder #3", long0, expected [0]);
+		long0 = IPAddress.HostToNetworkOrder (long0);
+		AssertEquals ("HostToNetworkOrder #3", long0, tested [0]);
+
+		short0 = IPAddress.NetworkToHostOrder ((short) tested [1]);
+		AssertEquals ("NetworkToHostOrder #4", short0, (short) expected [1]);
+		short0 = IPAddress.HostToNetworkOrder (short0);
+		AssertEquals ("HostToNetworkOrder #4", short0, (short) tested [1]);
+		
+		int0 = IPAddress.NetworkToHostOrder ((int) tested [2]);
+		AssertEquals ("NetworkToHostOrder #5", int0, (int) expected [2]);
+		int0 = IPAddress.HostToNetworkOrder (int0);
+		AssertEquals ("HostToNetworkOrder #5", int0, (int) tested [2]);
+		
+		long0 = IPAddress.NetworkToHostOrder (tested [3]);
+		AssertEquals ("NetworkToHostOrder #6", long0, expected [3]);
+		long0 = IPAddress.HostToNetworkOrder (long0);
+		AssertEquals ("HostToNetworkOrder #6", long0, tested [3]);
+	}
+}
+
+}
+
diff --git a/mcs/class/System/Test/System.Net/IPEndPointTest.cs b/mcs/class/System/Test/System.Net/IPEndPointTest.cs
new file mode 100644
index 00000000000..fd29c5cac05
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/IPEndPointTest.cs
@@ -0,0 +1,134 @@
+//
+// IPEndPointTest.cs - NUnit Test Cases for System.Net.IPEndPoint
+//
+// Author:
+//   Lawrence Pit (loz@cable.a2000.nl)
+//
+
+using NUnit.Framework;
+using System;
+using System.Net;
+using System.Runtime.InteropServices;
+
+namespace MonoTests.System.Net
+{
+
+public class IPEndPointTest : TestCase
+{
+        private const int MyPort = 42;
+        private const int MyMaxPort = 65535;
+        private const int MyMinPort = 0;
+        private const string MyIPAddressString = "192.168.1.1";
+
+        private IPAddress ipAddress;
+        private long ip;
+        private IPEndPoint endPoint1;
+        private IPEndPoint endPoint2;
+
+        public IPEndPointTest () :
+                base ("[MonoTests.System.Net.IPEndPointTest]") {}
+
+        public IPEndPointTest (string name) : base (name) {}
+
+        protected override void SetUp ()
+        {
+                ipAddress = IPAddress.Parse (MyIPAddressString);
+                ip = ipAddress.Address;
+                endPoint1 = new IPEndPoint (ipAddress, MyPort);
+                endPoint2 = new IPEndPoint (ip, MyPort);
+        }
+
+        protected override void TearDown () {}
+
+        public static ITest Suite
+        {
+                get {
+                        return new TestSuite (typeof (IPEndPointTest));
+                }
+        }
+
+        public void TestPublicFields ()
+        {
+                AssertEquals ("MinPort", IPEndPoint.MinPort, MyMinPort);
+                AssertEquals ("MaxPort", IPEndPoint.MaxPort, MyMaxPort);
+        }
+
+        public void TestConstructors ()
+        {
+                try {
+                        new IPEndPoint (null, 0);
+                        Fail ("Should raise an ArgumentNullException");
+                } catch (ArgumentNullException) {
+                }
+                try {
+                        new IPEndPoint (ipAddress, MyMinPort - 1);
+                        Fail ("Should raise an ArgumentOutOfRangeException #1");
+                } catch (ArgumentOutOfRangeException) {
+                }
+                try {
+                        new IPEndPoint (ipAddress, MyMaxPort + 1);
+                        Fail ("Should raise an ArgumentOutOfRangeException #2");
+                } catch (ArgumentOutOfRangeException) {
+                }
+
+                try {
+                        new IPEndPoint (ip, MyMinPort -1);
+                        Fail ("Should raise an ArgumentOutOfRangeException #3");
+                } catch (ArgumentOutOfRangeException) {
+                }
+                try {
+                        new IPEndPoint (ip, MyMaxPort + 1);
+                        Fail ("Should raise an ArgumentOutOfRangeException #4");
+                } catch (ArgumentOutOfRangeException) {
+                }
+        }
+
+        public void TestPortProperty ()
+        {
+                try {
+                        endPoint1.Port = MyMinPort - 1;
+                        Fail ("Should raise an ArgumentOutOfRangeException #1");
+                } catch (ArgumentOutOfRangeException) {
+                }
+                try {
+                        endPoint1.Port = MyMaxPort + 1;
+                        Fail ("Should raise an ArgumentOutOfRangeException #2");
+                } catch (ArgumentOutOfRangeException) {
+                }
+        }
+
+        public void TestCreateAndSerialize()
+        {
+		SocketAddress addr = endPoint1.Serialize ();
+		EndPoint endPoint3 = endPoint2.Create (addr);
+		Assert ("#1", endPoint1.Equals (endPoint3));
+
+		IPAddress ipAddress = IPAddress.Parse ("255.255.255.255");
+                IPEndPoint endPoint4 = new IPEndPoint (ipAddress, MyMaxPort);
+		addr = endPoint4.Serialize ();
+		EndPoint endPoint5 = endPoint2.Create(addr);
+		Assert ("#2", endPoint4.Equals (endPoint5));
+		AssertEquals ("#3", endPoint5.ToString (), "255.255.255.255:" + MyMaxPort);
+	}
+
+        public void TestEquals ()
+        {
+                Assert("Equals", endPoint1.Equals (endPoint2));
+                Assert("Not Equals", !endPoint1.Equals (new IPEndPoint (ip, MyPort + 1)));
+        }
+
+        public void TestGetHashCode ()
+        {
+                AssertEquals(endPoint1.GetHashCode(), endPoint2.GetHashCode());
+        }
+
+        public void TestToString ()
+        {
+                AssertEquals("ToString #1", endPoint1.ToString (), MyIPAddressString + ":" + MyPort);
+                AssertEquals("ToString #2", endPoint2.ToString (), MyIPAddressString + ":" + MyPort);
+        }
+
+}
+
+}
+
diff --git a/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs b/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs
new file mode 100644
index 00000000000..bfc595af118
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/ServicePointManagerTest.cs
@@ -0,0 +1,113 @@
+//

+// ServicePointManagerTest.cs - NUnit Test Cases for System.Net.ServicePointManager

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Collections;

+using System.IO;

+using System.Net;

+using System.Threading;

+

+namespace MonoTests.System.Net

+{

+

+public class ServicePointManagerTest : TestCase

+{

+	private Uri googleUri;

+	private Uri yahooUri;

+	private Uri apacheUri;

+	

+        public ServicePointManagerTest () :

+                base ("[MonoTests.System.Net.ServicePointManagerTest]") {}

+

+        public ServicePointManagerTest (string name) : base (name) {}

+

+        protected override void SetUp () {

+		googleUri = new Uri ("http://www.google.com");

+		yahooUri = new Uri ("http://www.yahoo.com");

+		apacheUri = new Uri ("http://www.apache.org");

+	}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (ServicePointManagerTest));

+                }

+        }

+        

+        public void TestMaxServicePointManagers ()

+        {

+		try {

+			AssertEquals ("#1", 0, ServicePointManager.MaxServicePoints);

+			

+			DoWebRequest (googleUri);

+			Thread.Sleep (100);

+			DoWebRequest (yahooUri);

+			Thread.Sleep (100);

+			DoWebRequest (apacheUri);

+			Thread.Sleep (100);

+			

+			ServicePoint sp = ServicePointManager.FindServicePoint (googleUri);

+			WriteServicePoint (sp);

+			sp = ServicePointManager.FindServicePoint (yahooUri);

+			WriteServicePoint (sp);

+			sp = ServicePointManager.FindServicePoint (apacheUri);

+			WriteServicePoint (sp);

+			

+			ServicePointManager.MaxServicePoints = 1;

+

+			sp = ServicePointManager.FindServicePoint (googleUri);

+			WriteServicePoint (sp);

+			sp = ServicePointManager.FindServicePoint (yahooUri);

+			WriteServicePoint (sp);

+			sp = ServicePointManager.FindServicePoint (apacheUri);

+			WriteServicePoint (sp);

+			

+			GC.Collect ();

+			

+			// hmm... aparently ms.net still has the service points even

+			// though I set it to a max of 1.

+			

+			// this should force an exception then...		

+			sp = ServicePointManager.FindServicePoint (new Uri ("http://www.microsoft.com"));

+			WriteServicePoint (sp);

+			

+		} catch (Exception e) {

+			Console.WriteLine("\nThe following Exception was raised : {0}", e.Message);

+		}

+	}

+	

+	public void TestFindServicePoint ()

+	{

+		ServicePoint sp = ServicePointManager.FindServicePoint (googleUri, new WebProxy (apacheUri));

+		AssertEquals ("#1", apacheUri, sp.Address);

+		AssertEquals ("#2", 2, sp.ConnectionLimit);

+		AssertEquals ("#3", "http", sp.ConnectionName);

+	}

+	

+	private void DoWebRequest (Uri uri)

+	{

+		WebRequest.Create (uri).GetResponse ().Close ();

+	}

+	

+	private void WriteServicePoint (ServicePoint sp)

+	{

+		Console.WriteLine ("\nAddress: " + sp.Address);

+		Console.WriteLine ("ConnectionLimit: " + sp.ConnectionLimit);

+		Console.WriteLine ("ConnectionName: " + sp.ConnectionName);

+		Console.WriteLine ("CurrentConnections: " + sp.CurrentConnections);

+		Console.WriteLine ("IdleSince: " + sp.IdleSince);

+		Console.WriteLine ("MaxIdletime: " + sp.MaxIdleTime);

+		Console.WriteLine ("ProtocolVersion: " + sp.ProtocolVersion);

+		Console.WriteLine ("SupportsPipelining: " + sp.SupportsPipelining);		

+	}

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Net/ServicePointTest.cs b/mcs/class/System/Test/System.Net/ServicePointTest.cs
new file mode 100644
index 00000000000..92290f1854d
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/ServicePointTest.cs
@@ -0,0 +1,171 @@
+//

+// ServicePointTest.cs - NUnit Test Cases for System.Net.ServicePoint

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Collections;

+using System.IO;

+using System.Net;

+using System.Threading;

+

+namespace MonoTests.System.Net

+{

+

+public class ServicePointTest : TestCase

+{

+        public ServicePointTest () :

+                base ("[MonoTests.System.Net.ServicePointTest]") {}

+

+        public ServicePointTest (string name) : base (name) {}

+

+        protected override void SetUp () {}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (ServicePointTest));

+                }

+        }

+        

+        public void TestAll ()

+        {

+		try {

+			ServicePoint p = ServicePointManager.FindServicePoint (new Uri ("mailto:xx@yyy.com"));

+			WriteServicePoint ("A servicepoint that isn't really", p);			

+			

+			ServicePointManager.MaxServicePoints = 2;

+			ServicePoint google = ServicePointManager.FindServicePoint (new Uri ("http://www.google.com"));

+			try {			

+				ServicePoint slashdot = ServicePointManager.FindServicePoint (new Uri ("http://www.slashdot.org"));

+				Fail ("#1");

+			} catch (InvalidOperationException) { }

+			ServicePointManager.MaxServicePoints = 0;

+			

+			WriteServicePoint ("google before getting a webrequest", google);

+			

+			HttpWebRequest req = (HttpWebRequest) WebRequest.Create ("http://www.google.com");

+			HttpWebResponse res = (HttpWebResponse) req.GetResponse ();			

+			

+			WriteServicePoint ("google after getting a response", google);

+			ServicePoint google2 = ServicePointManager.FindServicePoint (new Uri ("http://www.google.com/dilbert.html"));

+			AssertEquals ("#equals", google, google2);

+			res.Close ();

+			

+			// in both instances property CurrentConnections is 0 according to ms.net.

+			// let's see what it says when we do async operations...

+			

+			HttpWebRequest req2 = (HttpWebRequest) WebRequest.Create ("http://www.google.com");

+			req2.Method = "PUT";

+			IAsyncResult async = req2.BeginGetRequestStream (null, null);

+			WriteServicePoint ("after async BeginGetRequestStream", google);

+			// CurrentConnections: 1

+			Stream stream2 = req2.EndGetRequestStream (async);

+			WriteServicePoint ("after async EndGetRequestStream", google);

+			// CurrentConnections: 1

+			stream2.Close ();

+			

+			req2 = (HttpWebRequest) WebRequest.Create ("http://www.google.com");

+			async = req2.BeginGetResponse (null, null);

+			WriteServicePoint ("after async BeginGetResponse", google);

+			// CurrentConnections: 2

+			WebResponse res2 = req2.EndGetResponse (async);

+			WriteServicePoint ("after async EndGetResponse", google);

+			// CurrentConnections: 0			

+			// curious that after you get the webresponse object CurrentConnections is set to 0.

+			// you'd think that you'd still be connected until you close the webresponse..

+			Console.WriteLine ("ContentLength: " + res2.ContentLength);

+			res2.Close ();

+			

+			

+			// unless of course some buffering is taking place.. let's check

+			Uri uri2 = new Uri ("http://www.apache.org/dist/httpd/httpd-2.0.36.tar.gz");

+			ServicePoint sp2 = ServicePointManager.FindServicePoint (uri2);

+			req2 = (HttpWebRequest) WebRequest.Create (uri2);

+			async = req2.BeginGetResponse (null, null);

+			WriteServicePoint ("Large file: after async BeginGetResponse", sp2);

+			// CurrentConnections: 1

+			res2 = req2.EndGetResponse (async);

+			WriteServicePoint ("Large file: after async EndGetResponse", sp2);

+			// CurrentConnections: 1

+			// and so it shows

+			Console.WriteLine ("ContentLength: " + res2.ContentLength);

+			res2.Close ();

+			

+			

+			// what's the limit of the cache?

+			req2 = (HttpWebRequest) WebRequest.Create ("http://www.apache.org/");

+			res2 = req2.GetResponse ();

+			sp2 = ServicePointManager.FindServicePoint (new Uri("http://www.apache.org/"));

+			WriteServicePoint ("apache", sp2);

+			Console.WriteLine ("ContentLength: " + res2.ContentLength);

+			// CurrentConnections: 1

+			res2.Close ();

+			// curious other effect: address is actually the full Uri of the previous request

+			// anyways, buffer is probably 4096 bytes

+

+			

+		} catch (WebException e) {

+			Console.WriteLine("\nThe following Exception was raised : {0}", e.Message);

+		}

+	}

+

+	// try getting the stream to 5 web response objects	

+	// while ConnectionLimit equals 2

+	/*

+	public void TestConnectionLimit ()

+	{		

+		try {

+			// the default is already 2, just in case it isn't..

+			ServicePointManager.DefaultConnectionLimit = 2;

+			

+			Uri uri = new Uri ("http://www.apache.org/dist/httpd/httpd-2.0.36.tar.gz");

+			ServicePoint sp = ServicePointManager.FindServicePoint (uri);			

+			WebResponse [] res = new WebResponse [5];

+			for (int i = 0; i < 5; i++) {

+				Console.WriteLine ("GOT1 : " + i);

+				HttpWebRequest req = (HttpWebRequest) WebRequest.Create (uri);

+				Console.WriteLine ("GOT2 : " + i);

+				res [i] = req.GetResponse ();

+				WriteServicePoint ("after getting " + (i + 1) + " web response objects", sp);

+			}

+			

+			for (int i = 0; i < 5; i++) {

+				Stream stream = res [i].GetResponseStream();

+				Console.WriteLine ("Reading stream: " + i + " : " + stream);

+				int len = 0;

+				while (stream.ReadByte () != -1)

+					len++;

+				Console.WriteLine ("Finished reading: " + len + " bytes");

+			}

+			

+			for (int i = 0; i < 5; i++) {

+				res [i].Close ();

+			}

+		} catch (WebException e) {

+			Console.WriteLine("\nThe following Exception was raised : {0}", e.Message);

+		}		

+	}

+	*/

+	

+	private void WriteServicePoint (string label, ServicePoint sp)

+	{

+		Console.WriteLine ("\n" + label);

+		Console.WriteLine ("Address: " + sp.Address);

+		Console.WriteLine ("ConnectionLimit: " + sp.ConnectionLimit);

+		Console.WriteLine ("ConnectionName: " + sp.ConnectionName);

+		Console.WriteLine ("CurrentConnections: " + sp.CurrentConnections);

+		Console.WriteLine ("IdleSince: " + sp.IdleSince);

+		Console.WriteLine ("MaxIdletime: " + sp.MaxIdleTime);

+		Console.WriteLine ("ProtocolVersion: " + sp.ProtocolVersion);

+		Console.WriteLine ("SupportsPipelining: " + sp.SupportsPipelining);		

+	}

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Net/SocketPermissionTest.cs b/mcs/class/System/Test/System.Net/SocketPermissionTest.cs
new file mode 100644
index 00000000000..36137fdee8d
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/SocketPermissionTest.cs
@@ -0,0 +1,113 @@
+//

+// SocketPermissionTest.cs - NUnit Test Cases for System.Net.SocketPermission

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Net;

+using System.Collections;

+using System.Security;

+using System.Security.Permissions;

+

+namespace MonoTests.System.Net

+{

+

+public class SocketPermissionTest : TestCase

+{

+	SocketPermission s1;

+	SocketPermission s2;

+	

+        public SocketPermissionTest () :

+                base ("[MonoTests.System.Net.SocketPermissionTest]") {}

+

+        public SocketPermissionTest (string name) : base (name) {}

+

+        protected override void SetUp () 

+        {

+		s1 = new SocketPermission(NetworkAccess.Connect, TransportType.Tcp, "12.13.14.15", 80);

+		//s1.AddPermission(NetworkAccess.Accept, TransportType.All, "localhost", 8080);

+		//s1.AddPermission(NetworkAccess.Accept, TransportType.All, "123", SocketPermission.AllPorts);

+		//s1.AddPermission(NetworkAccess.Accept, TransportType.All, "www.ximian.com", SocketPermission.AllPorts);

+		//s1.AddPermission(NetworkAccess.Accept, TransportType.All, "120.4.3.2", SocketPermission.AllPorts);

+		//s1.AddPermission(NetworkAccess.Accept, TransportType.Tcp, "www.google.com", 80);

+		//s1.AddPermission(NetworkAccess.Accept, TransportType.All, "1.*.10.*.99", SocketPermission.AllPorts);

+		//s1.AddPermission(NetworkAccess.Accept, TransportType.All, "128.0.0.1", SocketPermission.AllPorts);

+		//s1.AddPermission(NetworkAccess.Accept, TransportType.All, "0.0.0.0", SocketPermission.AllPorts);

+		s1.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.4.*", SocketPermission.AllPorts);

+

+		s2 = new SocketPermission(NetworkAccess.Connect, TransportType.All, "12.13.14.15", 80);

+		//s2.AddPermission(NetworkAccess.Accept, TransportType.All, "localhost", 8080);

+		//s2.AddPermission(NetworkAccess.Accept, TransportType.All, "123", 8080);

+		//s2.AddPermission(NetworkAccess.Accept, TransportType.Tcp, "www.google.com", SocketPermission.AllPorts);

+		s2.AddPermission(NetworkAccess.Accept, TransportType.All, "213.*.*.*", SocketPermission.AllPorts);

+		//s2.AddPermission(NetworkAccess.Accept, TransportType.All, "128.0.0.1", 9090);

+		s2.AddPermission(NetworkAccess.Accept, TransportType.Tcp, "216.239.*.*", SocketPermission.AllPorts);

+		//s2.AddPermission(NetworkAccess.Accept, TransportType.All, "128.0.0.1", SocketPermission.AllPorts);

+		//s2.AddPermission(NetworkAccess.Accept, TransportType.Tcp, "120.4.3.2", 80);

+		//s2.AddPermission(NetworkAccess.Accept, TransportType.All, "196.*.*.*", SocketPermission.AllPorts);

+		//s2.AddPermission(NetworkAccess.Accept, TransportType.All, "1.*.*.*.99", SocketPermission.AllPorts);

+		s2.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.*.*", 9090);

+		//s2.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.4.7", SocketPermission.AllPorts);		

+	}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (SocketPermissionTest));

+                }

+        }

+        

+        public void TestIsSubsetOf ()

+        {

+		s1 = new SocketPermission(NetworkAccess.Connect, TransportType.Tcp, "12.13.14.15", 80);

+		s1.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.4.*", SocketPermission.AllPorts);

+		s2 = new SocketPermission(NetworkAccess.Connect, TransportType.All, "12.13.14.15", 80);

+		s2.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.*.*", 9090);

+		

+		Assert ("#1", !s1.IsSubsetOf (s2));

+		Assert ("#2", !s2.IsSubsetOf (s1));

+

+		s1 = new SocketPermission(NetworkAccess.Connect, TransportType.Tcp, "12.13.14.15", 80);

+		s1.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.4.*", 9090);

+		s2 = new SocketPermission(NetworkAccess.Connect, TransportType.All, "12.13.14.15", 80);

+		s2.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.*.*", 9090);

+		

+		Assert ("#3: bug in MS.Net", s1.IsSubsetOf (s2));

+		Assert ("#4", !s2.IsSubsetOf (s1));

+		

+		s1 = new SocketPermission(NetworkAccess.Connect, TransportType.Tcp, "12.13.*.*", 80);

+		s2 = new SocketPermission(NetworkAccess.Connect, TransportType.All, "12.13.14.*", 80);

+		Assert ("#5", !s1.IsSubsetOf (s2));

+		Assert ("#6", !s2.IsSubsetOf (s1));

+

+		s1 = new SocketPermission(NetworkAccess.Connect, TransportType.Tcp, "12.13.14.15", 80);

+		s1.AddPermission(NetworkAccess.Accept, TransportType.Tcp, "10.11.*.*", 9090);

+		s2 = new SocketPermission(NetworkAccess.Connect, TransportType.Tcp, "12.13.14.15", 80);

+		s2.AddPermission(NetworkAccess.Accept, TransportType.All, "10.11.4.*", SocketPermission.AllPorts);

+		Assert ("#7", !s1.IsSubsetOf (s2));

+		Assert ("#8", !s2.IsSubsetOf (s1));

+	}

+	

+	public void TestIntersect ()

+	{

+	}

+	

+	public void TestUnion ()

+	{

+	}

+	

+	public void TestXml ()

+	{

+		SecurityElement elem = s2.ToXml ();

+		s1.FromXml (elem);

+		Assert ("#1", s2.IsSubsetOf (s1) && s1.IsSubsetOf (s2));

+	}

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Net/WebHeaderCollectionTest.cs b/mcs/class/System/Test/System.Net/WebHeaderCollectionTest.cs
new file mode 100644
index 00000000000..32d22cb30f3
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/WebHeaderCollectionTest.cs
@@ -0,0 +1,213 @@
+//

+// WebHeaderCollectionTest.cs - NUnit Test Cases for System.Net.WebHeaderCollection

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Net;

+using System.Collections;

+

+namespace MonoTests.System.Net

+{

+

+public class WebHeaderCollectionTest : TestCase

+{

+	WebHeaderCollection col;

+	

+        public WebHeaderCollectionTest () :

+                base ("[MonoTests.System.Net.WebHeaderCollectionTest]") {}

+

+        public WebHeaderCollectionTest (string name) : base (name) {}

+

+        protected override void SetUp () 

+        {

+		col = new WebHeaderCollection ();	

+		col.Add ("Name1: Value1");

+		col.Add ("Name2: Value2");

+	}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (WebHeaderCollectionTest));

+                }

+        }

+        

+        public void TestAdd ()

+        {

+		try {

+			col.Add (null);

+			Fail ("#1");

+		} catch (ArgumentNullException) {}

+		try {

+			col.Add ("");

+			Fail ("#2");

+		} catch (ArgumentException) {}

+		try {

+			col.Add ("  ");

+			Fail ("#3");

+		} catch (ArgumentException) {}

+		try {

+			col.Add (":");

+			Fail ("#4");

+		} catch (ArgumentException) {}

+		try {

+			col.Add (" : ");

+			Fail ("#5");

+		} catch (ArgumentException) {}

+

+		try {

+			col.Add ("XHost: foo");

+		} catch (ArgumentException) {

+			Fail ("#7");			

+		}

+

+		// invalid values

+		try {

+			col.Add ("XHost" + ((char) 0xa9) + ": foo");

+			Fail ("#8");

+		} catch (ArgumentException) {}

+		try {

+			col.Add ("XHost: foo" + (char) 0xa9);

+		} catch (ArgumentException) {

+			Fail ("#9");			

+		}

+		try {

+			col.Add ("XHost: foo" + (char) 0x7f);

+			Fail ("#10");

+		} catch (ArgumentException) {

+			

+		}

+

+		try {

+			col.Add ("XHost", null);

+		} catch (ArgumentException) {

+			Fail ("#11");

+		}		

+		try {

+			col.Add ("XHost:");			

+		} catch (ArgumentException) {

+			Fail ("#12");			

+		}				

+		

+		// restricted

+		/*

+		// this can only be tested in namespace System.Net

+		try {

+			WebHeaderCollection col2 = new WebHeaderCollection (true);

+			col2.Add ("Host: foo");

+			Fail ("#13: should fail according to spec");

+		} catch (ArgumentException) {}		

+		*/

+	}

+	

+	public void TestGetValues ()

+	{			

+		WebHeaderCollection w = new WebHeaderCollection ();

+		w.Add ("Hello", "H1");

+		w.Add ("Hello", "H2");

+		w.Add ("Hello", "H3,H4");

+		

+		string [] sa = w.GetValues ("Hello");

+		AssertEquals ("#1", 3, sa.Length);

+		AssertEquals ("#2", "H1,H2,H3,H4", w.Get ("Hello"));

+

+		w = new WebHeaderCollection ();

+		w.Add ("Accept", "H1");

+		w.Add ("Accept", "H2");

+		w.Add ("Accept", "H3,H4");		

+		AssertEquals ("#3a", 3, w.GetValues (0).Length);

+		AssertEquals ("#3b", 4, w.GetValues ("Accept").Length);

+		AssertEquals ("#4", "H1,H2,H3,H4", w.Get ("Accept"));

+

+		w = new WebHeaderCollection ();

+		w.Add ("Allow", "H1");

+		w.Add ("Allow", "H2");

+		w.Add ("Allow", "H3,H4");		

+		sa = w.GetValues ("Allow");		

+		AssertEquals ("#5", 4, sa.Length);

+		AssertEquals ("#6", "H1,H2,H3,H4", w.Get ("Allow"));

+

+		w = new WebHeaderCollection ();

+		w.Add ("AUTHorization", "H1, H2, H3");

+		sa = w.GetValues ("authorization");		

+		AssertEquals ("#9", 3, sa.Length);

+

+		w = new WebHeaderCollection ();

+		w.Add ("proxy-authenticate", "H1, H2, H3");

+		sa = w.GetValues ("Proxy-Authenticate");		

+		AssertEquals ("#9", 3, sa.Length);

+

+		w = new WebHeaderCollection ();

+		w.Add ("expect", "H1,\tH2,   H3  ");

+		sa = w.GetValues ("EXPECT");		

+		AssertEquals ("#10", 3, sa.Length);

+		AssertEquals ("#11", "H2", sa [1]);

+		AssertEquals ("#12", "H3", sa [2]);

+		

+		try {

+			w.GetValues (null);

+			Fail ("#13");

+		} catch (ArgumentNullException) {}

+		AssertEquals ("#14", null, w.GetValues (""));

+		AssertEquals ("#15", null, w.GetValues ("NotExistent"));

+	}

+	

+	public void TestIndexers ()

+	{

+		AssertEquals ("#1", "Value1", col [0]);

+		AssertEquals ("#2", "Value1", col ["Name1"]);

+		AssertEquals ("#3", "Value1", col ["NAME1"]);

+	}

+	

+	public void TestRemove ()

+	{

+		col.Remove ("Name1");

+		col.Remove ("NameNotExist");

+		AssertEquals ("#1", 1, col.Count);

+		

+		/*

+		// this can only be tested in namespace System.Net

+		try {

+			WebHeaderCollection col2 = new WebHeaderCollection (true);

+			col2.Add ("Host", "foo");

+			col2.Remove ("Host");

+			Fail ("#2: should fail according to spec");

+		} catch (ArgumentException) {}

+		*/

+	}

+	

+	public void TestSet ()

+	{

+		col.Add ("Name1", "Value1b");

+		col.Set ("Name1", "\t  X  \t");

+		AssertEquals ("#1", "X", col.Get ("Name1"));

+	}

+	

+	public void TestIsRestricted ()

+	{

+		Assert ("#1", !WebHeaderCollection.IsRestricted ("Xhost"));

+		Assert ("#2", WebHeaderCollection.IsRestricted ("Host"));

+		Assert ("#3", WebHeaderCollection.IsRestricted ("HOST"));

+		Assert ("#4", WebHeaderCollection.IsRestricted ("Transfer-Encoding"));

+		Assert ("#5", WebHeaderCollection.IsRestricted ("user-agent"));

+		Assert ("#6", WebHeaderCollection.IsRestricted ("accept"));

+		Assert ("#7", !WebHeaderCollection.IsRestricted ("accept-charset"));

+	}

+	

+	public void TestToString ()

+	{

+		col.Add ("Name1", "Value1b");

+		col.Add ("Name3", "Value3a\r\n Value3b");

+		col.Add ("Name4", "   Value4   ");

+		AssertEquals ("#1", "Name1: Value1,Value1b\r\nName2: Value2\r\nName3: Value3a\r\n Value3b\r\nName4: Value4\r\n\r\n", col.ToString ());

+	}

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Net/WebProxyTest.cs b/mcs/class/System/Test/System.Net/WebProxyTest.cs
new file mode 100644
index 00000000000..866a7a414a3
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/WebProxyTest.cs
@@ -0,0 +1,180 @@
+//

+// WebProxyTest.cs - NUnit Test Cases for System.Net.WebProxy

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Collections;

+using System.IO;

+using System.Net;

+using System.Threading;

+

+namespace MonoTests.System.Net

+{

+

+public class WebProxyTest : TestCase

+{

+	private Uri googleUri;

+	private Uri yahooUri;

+	private Uri apacheUri;

+	

+        public WebProxyTest () :

+                base ("[MonoTests.System.Net.WebProxyTest]") {}

+

+        public WebProxyTest (string name) : base (name) {}

+

+        protected override void SetUp () {

+		googleUri = new Uri ("http://www.google.com");

+		yahooUri = new Uri ("http://www.yahoo.com");

+		apacheUri = new Uri ("http://www.apache.org");

+	}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (WebProxyTest));

+                }

+        }

+        

+        public void TestConstructors ()

+        {

+		WebProxy p = new WebProxy ();

+		Assert("#1", p.Address == null);

+		AssertEquals ("#2", 0, p.BypassArrayList.Count);

+		AssertEquals ("#3", 0, p.BypassList.Length);

+		AssertEquals ("#4", false, p.BypassProxyOnLocal);

+		try {

+			p.BypassList = null;

+			Fail ("#5 not spec'd, but should follow ms.net implementation");

+		} catch (ArgumentNullException) {}

+

+		p = new WebProxy ("webserver.com", 8080);

+		AssertEquals ("#6", new Uri ("http://webserver.com:8080/"), p.Address);

+		

+		p = new WebProxy ("webserver");

+		AssertEquals ("#7", new Uri ("http://webserver"), p.Address);

+

+		p = new WebProxy ("webserver.com");

+		AssertEquals ("#8", new Uri ("http://webserver.com"), p.Address);

+

+		p = new WebProxy ("http://webserver.com");

+		AssertEquals ("#9", new Uri ("http://webserver.com"), p.Address);

+

+		p = new WebProxy ("file://webserver");

+		AssertEquals ("#10", new Uri ("file://webserver"), p.Address);		

+		

+		p = new WebProxy ("http://www.contoso.com", true, null, null);

+		AssertEquals ("#11", 0, p.BypassList.Length);

+		AssertEquals ("#12", 0, p.BypassArrayList.Count);

+		

+		try {

+			p = new WebProxy ("http://contoso.com", true, 

+				new string [] {"?^!@#$%^&}{]["}, null);

+			Fail ("#13: illegal regular expression");

+		} catch (ArgumentException) {

+		}

+	}

+	

+	public void TestBypassArrayList ()

+	{

+		Uri proxy1 = new Uri("http://proxy.contoso.com");

+		Uri proxy2 = new Uri ("http://proxy2.contoso.com");

+		

+		WebProxy p = new WebProxy (proxy1, true);

+		p.BypassArrayList.Add ("http://proxy2.contoso.com");

+		p.BypassArrayList.Add ("http://proxy2.contoso.com");		

+		AssertEquals ("#1", 2, p.BypassList.Length);

+		Assert ("#2", !p.IsBypassed (new Uri ("http://www.google.com")));

+		Assert ("#3", p.IsBypassed (proxy2));

+		AssertEquals ("#4", proxy2, p.GetProxy (proxy2));

+

+		p.BypassArrayList.Add ("?^!@#$%^&}{][");

+		AssertEquals ("#10", 3, p.BypassList.Length);

+		try {

+			Assert ("#11", !p.IsBypassed (proxy2));

+			Assert ("#12", !p.IsBypassed (new Uri ("http://www.x.com")));		

+			AssertEquals ("#13", proxy1, p.GetProxy (proxy2));

+			// hmm... although #11 and #13 succeeded before (#3 resp. #4), 

+			// it now fails to bypass, and the IsByPassed and GetProxy 

+			// methods do not fail.. so when an illegal regular 

+			// expression is added through this property it's ignored. 

+			// probably an ms.net bug?? :(

+		} catch (ArgumentException) {

+			Fail ("#15: illegal regular expression");

+		}		

+	}

+	

+	public void TestBypassList ()

+	{

+		Uri proxy1 = new Uri("http://proxy.contoso.com");

+		Uri proxy2 = new Uri ("http://proxy2.contoso.com");

+		

+		WebProxy p = new WebProxy (proxy1, true);

+		try {

+			p.BypassList = new string [] {"http://proxy2.contoso.com", "?^!@#$%^&}{]["};		

+			Fail ("#1");

+		} catch (ArgumentException) {

+			// weird, this way invalid regex's fail again..

+		}

+		

+		AssertEquals ("#2", 2, p.BypassList.Length);

+		// but it did apparenly store the regex's !

+

+		p.BypassList = new string [] {"http://www.x.com"};		

+		AssertEquals ("#3", 1, p.BypassList.Length);

+

+		try {

+			p.BypassList = null;

+			Fail ("#4");

+		} catch (ArgumentNullException) {}

+		

+		AssertEquals ("#4", 1, p.BypassList.Length);		

+	}

+	

+	public void TestGetProxy ()

+	{

+	}	

+	

+	public void TestIsByPassed ()

+	{

+		WebProxy p = new WebProxy ("http://proxy.contoso.com", true);

+		Assert ("#1", !p.IsBypassed (new Uri ("http://www.google.com")));

+		Assert ("#2", p.IsBypassed (new Uri ("http://localhost/index.html")));

+		Assert ("#3", p.IsBypassed (new Uri ("http://localhost:8080/index.html")));

+		Assert ("#4", p.IsBypassed (new Uri ("http://loopback:8080/index.html")));

+		Assert ("#5", p.IsBypassed (new Uri ("http://127.0.0.01:8080/index.html")));

+		Assert ("#6", p.IsBypassed (new Uri ("http://webserver/index.html")));

+		Assert ("#7", !p.IsBypassed (new Uri ("http://webserver.com/index.html")));

+		try {

+			p.IsBypassed (null);

+			Fail ("#8 not spec'd, but should follow ms.net implementation");

+		} catch (NullReferenceException) {}

+		

+		p = new WebProxy ("http://proxy.contoso.com", false);

+		Assert ("#11", !p.IsBypassed (new Uri ("http://www.google.com")));

+		Assert ("#12: lamespec of ms.net", p.IsBypassed (new Uri ("http://localhost/index.html")));

+		Assert ("#13: lamespec of ms.net", p.IsBypassed (new Uri ("http://localhost:8080/index.html")));

+		Assert ("#14: lamespec of ms.net", p.IsBypassed (new Uri ("http://loopback:8080/index.html")));

+		Assert ("#15: lamespec of ms.net", p.IsBypassed (new Uri ("http://127.0.0.01:8080/index.html")));

+		Assert ("#16", !p.IsBypassed (new Uri ("http://webserver/index.html")));

+		

+		p.BypassList = new string [] { "google.com", "contoso.com" };

+		Assert ("#20", p.IsBypassed (new Uri ("http://www.google.com")));

+		Assert ("#21", p.IsBypassed (new Uri ("http://www.GOOGLE.com")));

+		Assert ("#22", p.IsBypassed (new Uri ("http://www.contoso.com:8080/foo/bar/index.html")));

+		Assert ("#23", !p.IsBypassed (new Uri ("http://www.contoso2.com:8080/foo/bar/index.html")));

+		Assert ("#24", !p.IsBypassed (new Uri ("http://www.foo.com:8080/contoso.com.html")));

+		

+		p.BypassList = new string [] { "https" };		

+		Assert ("#30", !p.IsBypassed (new Uri ("http://www.google.com")));

+		Assert ("#31", p.IsBypassed (new Uri ("https://www.google.com")));

+	}

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Net/WebRequestTest.cs b/mcs/class/System/Test/System.Net/WebRequestTest.cs
new file mode 100644
index 00000000000..e3f640e936d
--- /dev/null
+++ b/mcs/class/System/Test/System.Net/WebRequestTest.cs
@@ -0,0 +1,122 @@
+//

+// WebRequestTest.cs - NUnit Test Cases for System.Net.WebRequest

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Net;

+using System.Collections;

+using System.Security;

+using System.Security.Permissions;

+

+namespace MonoTests.System.Net

+{

+

+public class WebRequestTest : TestCase

+{

+        public WebRequestTest () :

+                base ("[MonoTests.System.Net.WebRequestTest]") {}

+

+        public WebRequestTest (string name) : base (name) {}

+

+        protected override void SetUp () {}

+

+        protected override void TearDown () {}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (WebRequestTest));

+                }

+        }

+        

+        public void TestAll ()

+        {

+		WebRequest req = WebRequest.Create ("http://www.contoso.com");

+		Assert ("#1", req is HttpWebRequest);

+		req = WebRequest.Create ("https://www.contoso.com");

+		Assert ("#2", req is HttpWebRequest);

+		req = WebRequest.Create ("file://www.contoso.com");

+		Assert ("#3", req is FileWebRequest);

+		

+		WebRequest.RegisterPrefix ("http://www.contoso.com", new TestWebRequestCreator ());

+		bool ret = WebRequest.RegisterPrefix ("http://WWW.contoso.com", new TestWebRequestCreator ());

+		AssertEquals ("#4a", false, ret);

+		ret = WebRequest.RegisterPrefix ("http://www.contoso.com/foo/bar", new TestWebRequestCreator2 ());

+		AssertEquals ("#4b", true, ret);

+		ret = WebRequest.RegisterPrefix ("http://www", new TestWebRequestCreator3 ());

+		AssertEquals ("#4c", true, ret);

+

+		req = WebRequest.Create ("http://WWW.contoso.com");

+		Assert ("#5", req is TestWebRequest); 

+

+		req = WebRequest.Create ("http://WWW.contoso.com/foo/bar/index.html");

+		Assert ("#6", req is TestWebRequest2); 

+		

+		req = WebRequest.Create ("http://WWW.x.com");

+		Assert ("#7", req is TestWebRequest3); 

+

+		req = WebRequest.Create ("http://WWW.c");

+		Assert ("#8", req is TestWebRequest3); 

+

+		req = WebRequest.CreateDefault (new Uri("http://WWW.contoso.com"));

+		Assert ("#9", req is HttpWebRequest);

+

+		try {

+			req = WebRequest.Create ("tcp://www.contoso.com");

+			Fail ("#10 should have failed with NotSupportedException");			

+		} catch (NotSupportedException) {			

+		}		

+	}

+	

+	internal class TestWebRequestCreator : IWebRequestCreate

+	{

+		internal TestWebRequestCreator () { }

+		

+		public WebRequest Create (Uri uri)

+		{

+			return new TestWebRequest ();

+		}

+	}

+	

+	internal class TestWebRequest : WebRequest

+	{

+		internal TestWebRequest () { }

+	}

+

+	internal class TestWebRequestCreator2 : IWebRequestCreate

+	{

+		internal TestWebRequestCreator2 () { }

+		

+		public WebRequest Create (Uri uri)

+		{

+			return new TestWebRequest2 ();

+		}

+	}

+	

+	internal class TestWebRequest2 : WebRequest

+	{

+		internal TestWebRequest2 () { }

+	}

+

+	internal class TestWebRequestCreator3 : IWebRequestCreate

+	{

+		internal TestWebRequestCreator3 () { }

+		

+		public WebRequest Create (Uri uri)

+		{

+			return new TestWebRequest3 ();

+		}

+	}

+	

+	internal class TestWebRequest3 : WebRequest

+	{

+		internal TestWebRequest3 () { }

+	}

+}

+

+}

+

diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/AllTests.cs b/mcs/class/System/Test/System.Text.RegularExpressions/AllTests.cs
new file mode 100644
index 00000000000..6016eeef70a
--- /dev/null
+++ b/mcs/class/System/Test/System.Text.RegularExpressions/AllTests.cs
@@ -0,0 +1,26 @@
+//

+// assembly:	System_test

+// namespace:	MonoTests.System.Text.RegularExpressions

+// file:	AllTests.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using NUnit.Framework;

+

+namespace MonoTests.System.Text.RegularExpressions {

+	

+	public class AllTests : TestCase {

+		public AllTests (string name) : base (name) { }

+

+		public static ITest Suite {

+			get {

+				TestSuite suite = new TestSuite ();

+				suite.AddTest (PerlTest.Suite);

+

+				return suite;

+			}

+		}

+	}

+}

diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/PerlTest.cs b/mcs/class/System/Test/System.Text.RegularExpressions/PerlTest.cs
new file mode 100644
index 00000000000..f09681a91cc
--- /dev/null
+++ b/mcs/class/System/Test/System.Text.RegularExpressions/PerlTest.cs
@@ -0,0 +1,40 @@
+//

+// assembly:	System_test

+// namespace:	MonoTests.System.Text.RegularExpressions

+// file:	PerlTest.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System;

+using System.Text.RegularExpressions;

+

+using NUnit.Framework;

+

+namespace MonoTests.System.Text.RegularExpressions {

+	

+	public class PerlTest : TestCase {

+		public static ITest Suite {

+			get { return new TestSuite (typeof (PerlTest)); }

+		}

+

+		public PerlTest () : this ("System.Text.RegularExpressions Perl testsuite") { }

+		public PerlTest (string name) : base (name) { }

+

+		public void TestTrials () {

+			foreach (RegexTrial trial in PerlTrials.trials) {

+				string actual = trial.Execute ();

+				if (actual != trial.Expected) {

+					Assertion.Fail (

+						trial.ToString () +

+						"Expected " + trial.Expected +

+						" but got " + actual

+					);

+				}

+			}

+		}

+

+		protected override void SetUp () { }

+		protected override void TearDown () { }

+	}

+}

diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/PerlTrials.cs b/mcs/class/System/Test/System.Text.RegularExpressions/PerlTrials.cs
new file mode 100644
index 00000000000..eecb7a454c5
--- /dev/null
+++ b/mcs/class/System/Test/System.Text.RegularExpressions/PerlTrials.cs
@@ -0,0 +1,746 @@
+//

+// assembly:	System_test

+// namespace:	MonoTests.System.Text.RegularExpressions

+// file:	PerlTrials.cs

+//

+// author:	Dan Lewis (dlewis@gmx.co.uk)

+// 		(c) 2002

+

+using System.Text.RegularExpressions;

+

+namespace MonoTests.System.Text.RegularExpressions {

+

+	class PerlTrials {

+		// ported from perl-5.6.1/t/op/re_tests

+

+		public static RegexTrial[] trials = new RegexTrial[] {

+			new RegexTrial (@"abc", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"abc", RegexOptions.None, "xbc", "Fail."),

+			new RegexTrial (@"abc", RegexOptions.None, "axc", "Fail."),

+			new RegexTrial (@"abc", RegexOptions.None, "abx", "Fail."),

+			new RegexTrial (@"abc", RegexOptions.None, "xabcy", "Pass. Group[0]=(1,3)"),

+			new RegexTrial (@"abc", RegexOptions.None, "ababc", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"ab*c", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab*bc", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab*bc", RegexOptions.None, "abbc", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"ab*bc", RegexOptions.None, "abbbbc", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@".{1}", RegexOptions.None, "abbbbc", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@".{3,4}", RegexOptions.None, "abbbbc", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"ab{0,}bc", RegexOptions.None, "abbbbc", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab+bc", RegexOptions.None, "abbc", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"ab+bc", RegexOptions.None, "abc", "Fail."),

+			new RegexTrial (@"ab+bc", RegexOptions.None, "abq", "Fail."),

+			new RegexTrial (@"ab{1,}bc", RegexOptions.None, "abq", "Fail."),

+			new RegexTrial (@"ab+bc", RegexOptions.None, "abbbbc", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab{1,}bc", RegexOptions.None, "abbbbc", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab{1,3}bc", RegexOptions.None, "abbbbc", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab{3,4}bc", RegexOptions.None, "abbbbc", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab{4,5}bc", RegexOptions.None, "abbbbc", "Fail."),

+			new RegexTrial (@"ab?bc", RegexOptions.None, "abbc", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"ab?bc", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab{0,1}bc", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab?bc", RegexOptions.None, "abbbbc", "Fail."),

+			new RegexTrial (@"ab?c", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab{0,1}c", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"^abc$", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"^abc$", RegexOptions.None, "abcc", "Fail."),

+			new RegexTrial (@"^abc", RegexOptions.None, "abcc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"^abc$", RegexOptions.None, "aabc", "Fail."),

+			new RegexTrial (@"abc$", RegexOptions.None, "aabc", "Pass. Group[0]=(1,3)"),

+			new RegexTrial (@"abc$", RegexOptions.None, "aabcd", "Fail."),

+			new RegexTrial (@"^", RegexOptions.None, "abc", "Pass. Group[0]=(0,0)"),

+			new RegexTrial (@"$", RegexOptions.None, "abc", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"a.c", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a.c", RegexOptions.None, "axc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a.*c", RegexOptions.None, "axyzc", "Pass. Group[0]=(0,5)"),

+			new RegexTrial (@"a.*c", RegexOptions.None, "axyzd", "Fail."),

+			new RegexTrial (@"a[bc]d", RegexOptions.None, "abc", "Fail."),

+			new RegexTrial (@"a[bc]d", RegexOptions.None, "abd", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[b-d]e", RegexOptions.None, "abd", "Fail."),

+			new RegexTrial (@"a[b-d]e", RegexOptions.None, "ace", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[b-d]", RegexOptions.None, "aac", "Pass. Group[0]=(1,2)"),

+			new RegexTrial (@"a[-b]", RegexOptions.None, "a-", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"a[b-]", RegexOptions.None, "a-", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"a[b-a]", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"a[]b", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"a[", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"a]", RegexOptions.None, "a]", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"a[]]b", RegexOptions.None, "a]b", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[^bc]d", RegexOptions.None, "aed", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[^bc]d", RegexOptions.None, "abd", "Fail."),

+			new RegexTrial (@"a[^-b]c", RegexOptions.None, "adc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[^-b]c", RegexOptions.None, "a-c", "Fail."),

+			new RegexTrial (@"a[^]b]c", RegexOptions.None, "a]c", "Fail."),

+			new RegexTrial (@"a[^]b]c", RegexOptions.None, "adc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"\ba\b", RegexOptions.None, "a-", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"\ba\b", RegexOptions.None, "-a", "Pass. Group[0]=(1,1)"),

+			new RegexTrial (@"\ba\b", RegexOptions.None, "-a-", "Pass. Group[0]=(1,1)"),

+			new RegexTrial (@"\by\b", RegexOptions.None, "xy", "Fail."),

+			new RegexTrial (@"\by\b", RegexOptions.None, "yz", "Fail."),

+			new RegexTrial (@"\by\b", RegexOptions.None, "xyz", "Fail."),

+			new RegexTrial (@"\Ba\B", RegexOptions.None, "a-", "Fail."),

+			new RegexTrial (@"\Ba\B", RegexOptions.None, "-a", "Fail."),

+			new RegexTrial (@"\Ba\B", RegexOptions.None, "-a-", "Fail."),

+			new RegexTrial (@"\By\b", RegexOptions.None, "xy", "Pass. Group[0]=(1,1)"),

+			new RegexTrial (@"\by\B", RegexOptions.None, "yz", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"\By\B", RegexOptions.None, "xyz", "Pass. Group[0]=(1,1)"),

+			new RegexTrial (@"\w", RegexOptions.None, "a", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"\w", RegexOptions.None, "-", "Fail."),

+			new RegexTrial (@"\W", RegexOptions.None, "a", "Fail."),

+			new RegexTrial (@"\W", RegexOptions.None, "-", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"a\sb", RegexOptions.None, "a b", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a\sb", RegexOptions.None, "a-b", "Fail."),

+			new RegexTrial (@"a\Sb", RegexOptions.None, "a b", "Fail."),

+			new RegexTrial (@"a\Sb", RegexOptions.None, "a-b", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"\d", RegexOptions.None, "1", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"\d", RegexOptions.None, "-", "Fail."),

+			new RegexTrial (@"\D", RegexOptions.None, "1", "Fail."),

+			new RegexTrial (@"\D", RegexOptions.None, "-", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"[\w]", RegexOptions.None, "a", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"[\w]", RegexOptions.None, "-", "Fail."),

+			new RegexTrial (@"[\W]", RegexOptions.None, "a", "Fail."),

+			new RegexTrial (@"[\W]", RegexOptions.None, "-", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"a[\s]b", RegexOptions.None, "a b", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[\s]b", RegexOptions.None, "a-b", "Fail."),

+			new RegexTrial (@"a[\S]b", RegexOptions.None, "a b", "Fail."),

+			new RegexTrial (@"a[\S]b", RegexOptions.None, "a-b", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"[\d]", RegexOptions.None, "1", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"[\d]", RegexOptions.None, "-", "Fail."),

+			new RegexTrial (@"[\D]", RegexOptions.None, "1", "Fail."),

+			new RegexTrial (@"[\D]", RegexOptions.None, "-", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"ab|cd", RegexOptions.None, "abc", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"ab|cd", RegexOptions.None, "abcd", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"()ef", RegexOptions.None, "def", "Pass. Group[0]=(1,2) Group[1]=(1,0)"),

+			new RegexTrial (@"*a", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"(*)b", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"$b", RegexOptions.None, "b", "Fail."),

+			new RegexTrial (@"a\", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"a\(b", RegexOptions.None, "a(b", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a\(*b", RegexOptions.None, "ab", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"a\(*b", RegexOptions.None, "a((b", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"a\\b", RegexOptions.None, "a\\b", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"abc)", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"(abc", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"((a))", RegexOptions.None, "abc", "Pass. Group[0]=(0,1) Group[1]=(0,1) Group[2]=(0,1)"),

+			new RegexTrial (@"(a)b(c)", RegexOptions.None, "abc", "Pass. Group[0]=(0,3) Group[1]=(0,1) Group[2]=(2,1)"),

+			new RegexTrial (@"a+b+c", RegexOptions.None, "aabbabc", "Pass. Group[0]=(4,3)"),

+			new RegexTrial (@"a{1,}b{1,}c", RegexOptions.None, "aabbabc", "Pass. Group[0]=(4,3)"),

+			new RegexTrial (@"a**", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"a.+?c", RegexOptions.None, "abcabc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"(a+|b)*", RegexOptions.None, "ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)(1,1)"),

+			new RegexTrial (@"(a+|b){0,}", RegexOptions.None, "ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)(1,1)"),

+			new RegexTrial (@"(a+|b)+", RegexOptions.None, "ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)(1,1)"),

+			new RegexTrial (@"(a+|b){1,}", RegexOptions.None, "ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)(1,1)"),

+			new RegexTrial (@"(a+|b)?", RegexOptions.None, "ab", "Pass. Group[0]=(0,1) Group[1]=(0,1)"),

+			new RegexTrial (@"(a+|b){0,1}", RegexOptions.None, "ab", "Pass. Group[0]=(0,1) Group[1]=(0,1)"),

+			new RegexTrial (@")(", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"[^ab]*", RegexOptions.None, "cde", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"abc", RegexOptions.None, "", "Fail."),

+			new RegexTrial (@"a*", RegexOptions.None, "", "Pass. Group[0]=(0,0)"),

+			new RegexTrial (@"([abc])*d", RegexOptions.None, "abbbcd", "Pass. Group[0]=(0,6) Group[1]=(0,1)(1,1)(2,1)(3,1)(4,1)"),

+			new RegexTrial (@"([abc])*bcd", RegexOptions.None, "abcd", "Pass. Group[0]=(0,4) Group[1]=(0,1)"),

+			new RegexTrial (@"a|b|c|d|e", RegexOptions.None, "e", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"(a|b|c|d|e)f", RegexOptions.None, "ef", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"abcd*efg", RegexOptions.None, "abcdefg", "Pass. Group[0]=(0,7)"),

+			new RegexTrial (@"ab*", RegexOptions.None, "xabyabbbz", "Pass. Group[0]=(1,2)"),

+			new RegexTrial (@"ab*", RegexOptions.None, "xayabbbz", "Pass. Group[0]=(1,1)"),

+			new RegexTrial (@"(ab|cd)e", RegexOptions.None, "abcde", "Pass. Group[0]=(2,3) Group[1]=(2,2)"),

+			new RegexTrial (@"[abhgefdc]ij", RegexOptions.None, "hij", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"^(ab|cd)e", RegexOptions.None, "abcde", "Fail."),

+			new RegexTrial (@"(abc|)ef", RegexOptions.None, "abcdef", "Pass. Group[0]=(4,2) Group[1]=(4,0)"),

+			new RegexTrial (@"(a|b)c*d", RegexOptions.None, "abcd", "Pass. Group[0]=(1,3) Group[1]=(1,1)"),

+			new RegexTrial (@"(ab|ab*)bc", RegexOptions.None, "abc", "Pass. Group[0]=(0,3) Group[1]=(0,1)"),

+			new RegexTrial (@"a([bc]*)c*", RegexOptions.None, "abc", "Pass. Group[0]=(0,3) Group[1]=(1,2)"),

+			new RegexTrial (@"a([bc]*)(c*d)", RegexOptions.None, "abcd", "Pass. Group[0]=(0,4) Group[1]=(1,2) Group[2]=(3,1)"),

+			new RegexTrial (@"a([bc]+)(c*d)", RegexOptions.None, "abcd", "Pass. Group[0]=(0,4) Group[1]=(1,2) Group[2]=(3,1)"),

+			new RegexTrial (@"a([bc]*)(c+d)", RegexOptions.None, "abcd", "Pass. Group[0]=(0,4) Group[1]=(1,1) Group[2]=(2,2)"),

+			new RegexTrial (@"a[bcd]*dcdcde", RegexOptions.None, "adcdcde", "Pass. Group[0]=(0,7)"),

+			new RegexTrial (@"a[bcd]+dcdcde", RegexOptions.None, "adcdcde", "Fail."),

+			new RegexTrial (@"(ab|a)b*c", RegexOptions.None, "abc", "Pass. Group[0]=(0,3) Group[1]=(0,2)"),

+			new RegexTrial (@"((a)(b)c)(d)", RegexOptions.None, "abcd", "Pass. Group[0]=(0,4) Group[1]=(0,3) Group[2]=(0,1) Group[3]=(1,1) Group[4]=(3,1)"),

+			new RegexTrial (@"[a-zA-Z_][a-zA-Z0-9_]*", RegexOptions.None, "alpha", "Pass. Group[0]=(0,5)"),

+			new RegexTrial (@"^a(bc+|b[eh])g|.h$", RegexOptions.None, "abh", "Pass. Group[0]=(1,2) Group[1]="),

+			new RegexTrial (@"(bc+d$|ef*g.|h?i(j|k))", RegexOptions.None, "effgz", "Pass. Group[0]=(0,5) Group[1]=(0,5) Group[2]="),

+			new RegexTrial (@"(bc+d$|ef*g.|h?i(j|k))", RegexOptions.None, "ij", "Pass. Group[0]=(0,2) Group[1]=(0,2) Group[2]=(1,1)"),

+			new RegexTrial (@"(bc+d$|ef*g.|h?i(j|k))", RegexOptions.None, "effg", "Fail."),

+			new RegexTrial (@"(bc+d$|ef*g.|h?i(j|k))", RegexOptions.None, "bcdd", "Fail."),

+			new RegexTrial (@"(bc+d$|ef*g.|h?i(j|k))", RegexOptions.None, "reffgz", "Pass. Group[0]=(1,5) Group[1]=(1,5) Group[2]="),

+			new RegexTrial (@"((((((((((a))))))))))", RegexOptions.None, "a", "Pass. Group[0]=(0,1) Group[1]=(0,1) Group[2]=(0,1) Group[3]=(0,1) Group[4]=(0,1) Group[5]=(0,1) Group[6]=(0,1) Group[7]=(0,1) Group[8]=(0,1) Group[9]=(0,1) Group[10]=(0,1)"),

+			new RegexTrial (@"((((((((((a))))))))))\10", RegexOptions.None, "aa", "Pass. Group[0]=(0,2) Group[1]=(0,1) Group[2]=(0,1) Group[3]=(0,1) Group[4]=(0,1) Group[5]=(0,1) Group[6]=(0,1) Group[7]=(0,1) Group[8]=(0,1) Group[9]=(0,1) Group[10]=(0,1)"),

+			new RegexTrial (@"((((((((((a))))))))))!", RegexOptions.None, "aa", "Fail."),

+			new RegexTrial (@"((((((((((a))))))))))!", RegexOptions.None, "a!", "Pass. Group[0]=(0,2) Group[1]=(0,1) Group[2]=(0,1) Group[3]=(0,1) Group[4]=(0,1) Group[5]=(0,1) Group[6]=(0,1) Group[7]=(0,1) Group[8]=(0,1) Group[9]=(0,1) Group[10]=(0,1)"),

+			new RegexTrial (@"(((((((((a)))))))))", RegexOptions.None, "a", "Pass. Group[0]=(0,1) Group[1]=(0,1) Group[2]=(0,1) Group[3]=(0,1) Group[4]=(0,1) Group[5]=(0,1) Group[6]=(0,1) Group[7]=(0,1) Group[8]=(0,1) Group[9]=(0,1)"),

+			new RegexTrial (@"multiple words of text", RegexOptions.None, "uh-uh", "Fail."),

+			new RegexTrial (@"multiple words", RegexOptions.None, "multiple words, yeah", "Pass. Group[0]=(0,14)"),

+			new RegexTrial (@"(.*)c(.*)", RegexOptions.None, "abcde", "Pass. Group[0]=(0,5) Group[1]=(0,2) Group[2]=(3,2)"),

+			new RegexTrial (@"\((.*), (.*)\)", RegexOptions.None, "(a, b)", "Pass. Group[0]=(0,6) Group[1]=(1,1) Group[2]=(4,1)"),

+			new RegexTrial (@"[k]", RegexOptions.None, "ab", "Fail."),

+			new RegexTrial (@"abcd", RegexOptions.None, "abcd", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"a(bc)d", RegexOptions.None, "abcd", "Pass. Group[0]=(0,4) Group[1]=(1,2)"),

+			new RegexTrial (@"a[-]?c", RegexOptions.None, "ac", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"(abc)\1", RegexOptions.None, "abcabc", "Pass. Group[0]=(0,6) Group[1]=(0,3)"),

+			new RegexTrial (@"([a-c]*)\1", RegexOptions.None, "abcabc", "Pass. Group[0]=(0,6) Group[1]=(0,3)"),

+			new RegexTrial (@"\1", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"\2", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"(a)|\1", RegexOptions.None, "a", "Pass. Group[0]=(0,1) Group[1]=(0,1)"),

+			new RegexTrial (@"(a)|\1", RegexOptions.None, "x", "Fail."),

+			new RegexTrial (@"(a)|\2", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"(([a-c])b*?\2)*", RegexOptions.None, "ababbbcbc", "Pass. Group[0]=(0,5) Group[1]=(0,3)(3,2) Group[2]=(0,1)(3,1)"),

+			new RegexTrial (@"(([a-c])b*?\2){3}", RegexOptions.None, "ababbbcbc", "Pass. Group[0]=(0,9) Group[1]=(0,3)(3,3)(6,3) Group[2]=(0,1)(3,1)(6,1)"),

+			new RegexTrial (@"((\3|b)\2(a)x)+", RegexOptions.None, "aaxabxbaxbbx", "Fail."),

+			new RegexTrial (@"((\3|b)\2(a)x)+", RegexOptions.None, "aaaxabaxbaaxbbax", "Pass. Group[0]=(12,4) Group[1]=(12,4) Group[2]=(12,1) Group[3]=(14,1)"),

+			new RegexTrial (@"((\3|b)\2(a)){2,}", RegexOptions.None, "bbaababbabaaaaabbaaaabba", "Pass. Group[0]=(15,9) Group[1]=(15,3)(18,3)(21,3) Group[2]=(15,1)(18,1)(21,1) Group[3]=(17,1)(20,1)(23,1)"),

+			new RegexTrial (@"abc", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"abc", RegexOptions.IgnoreCase, "XBC", "Fail."),

+			new RegexTrial (@"abc", RegexOptions.IgnoreCase, "AXC", "Fail."),

+			new RegexTrial (@"abc", RegexOptions.IgnoreCase, "ABX", "Fail."),

+			new RegexTrial (@"abc", RegexOptions.IgnoreCase, "XABCY", "Pass. Group[0]=(1,3)"),

+			new RegexTrial (@"abc", RegexOptions.IgnoreCase, "ABABC", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"ab*c", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab*bc", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab*bc", RegexOptions.IgnoreCase, "ABBC", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"ab*?bc", RegexOptions.IgnoreCase, "ABBBBC", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab{0,}?bc", RegexOptions.IgnoreCase, "ABBBBC", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab+?bc", RegexOptions.IgnoreCase, "ABBC", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"ab+bc", RegexOptions.IgnoreCase, "ABC", "Fail."),

+			new RegexTrial (@"ab+bc", RegexOptions.IgnoreCase, "ABQ", "Fail."),

+			new RegexTrial (@"ab{1,}bc", RegexOptions.IgnoreCase, "ABQ", "Fail."),

+			new RegexTrial (@"ab+bc", RegexOptions.IgnoreCase, "ABBBBC", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab{1,}?bc", RegexOptions.IgnoreCase, "ABBBBC", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab{1,3}?bc", RegexOptions.IgnoreCase, "ABBBBC", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab{3,4}?bc", RegexOptions.IgnoreCase, "ABBBBC", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"ab{4,5}?bc", RegexOptions.IgnoreCase, "ABBBBC", "Fail."),

+			new RegexTrial (@"ab??bc", RegexOptions.IgnoreCase, "ABBC", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"ab??bc", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab{0,1}?bc", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab??bc", RegexOptions.IgnoreCase, "ABBBBC", "Fail."),

+			new RegexTrial (@"ab??c", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab{0,1}?c", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"^abc$", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"^abc$", RegexOptions.IgnoreCase, "ABCC", "Fail."),

+			new RegexTrial (@"^abc", RegexOptions.IgnoreCase, "ABCC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"^abc$", RegexOptions.IgnoreCase, "AABC", "Fail."),

+			new RegexTrial (@"abc$", RegexOptions.IgnoreCase, "AABC", "Pass. Group[0]=(1,3)"),

+			new RegexTrial (@"^", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,0)"),

+			new RegexTrial (@"$", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"a.c", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a.c", RegexOptions.IgnoreCase, "AXC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a.*?c", RegexOptions.IgnoreCase, "AXYZC", "Pass. Group[0]=(0,5)"),

+			new RegexTrial (@"a.*c", RegexOptions.IgnoreCase, "AXYZD", "Fail."),

+			new RegexTrial (@"a[bc]d", RegexOptions.IgnoreCase, "ABC", "Fail."),

+			new RegexTrial (@"a[bc]d", RegexOptions.IgnoreCase, "ABD", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[b-d]e", RegexOptions.IgnoreCase, "ABD", "Fail."),

+			new RegexTrial (@"a[b-d]e", RegexOptions.IgnoreCase, "ACE", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[b-d]", RegexOptions.IgnoreCase, "AAC", "Pass. Group[0]=(1,2)"),

+			new RegexTrial (@"a[-b]", RegexOptions.IgnoreCase, "A-", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"a[b-]", RegexOptions.IgnoreCase, "A-", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"a[b-a]", RegexOptions.IgnoreCase, "-", "Error."),

+			new RegexTrial (@"a[]b", RegexOptions.IgnoreCase, "-", "Error."),

+			new RegexTrial (@"a[", RegexOptions.IgnoreCase, "-", "Error."),

+			new RegexTrial (@"a]", RegexOptions.IgnoreCase, "A]", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"a[]]b", RegexOptions.IgnoreCase, "A]B", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[^bc]d", RegexOptions.IgnoreCase, "AED", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[^bc]d", RegexOptions.IgnoreCase, "ABD", "Fail."),

+			new RegexTrial (@"a[^-b]c", RegexOptions.IgnoreCase, "ADC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a[^-b]c", RegexOptions.IgnoreCase, "A-C", "Fail."),

+			new RegexTrial (@"a[^]b]c", RegexOptions.IgnoreCase, "A]C", "Fail."),

+			new RegexTrial (@"a[^]b]c", RegexOptions.IgnoreCase, "ADC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"ab|cd", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"ab|cd", RegexOptions.IgnoreCase, "ABCD", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"()ef", RegexOptions.IgnoreCase, "DEF", "Pass. Group[0]=(1,2) Group[1]=(1,0)"),

+			new RegexTrial (@"*a", RegexOptions.IgnoreCase, "-", "Error."),

+			new RegexTrial (@"(*)b", RegexOptions.IgnoreCase, "-", "Error."),

+			new RegexTrial (@"$b", RegexOptions.IgnoreCase, "B", "Fail."),

+			new RegexTrial (@"a\", RegexOptions.IgnoreCase, "-", "Error."),

+			new RegexTrial (@"a\(b", RegexOptions.IgnoreCase, "A(B", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a\(*b", RegexOptions.IgnoreCase, "AB", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"a\(*b", RegexOptions.IgnoreCase, "A((B", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"a\\b", RegexOptions.IgnoreCase, "A\\B", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"abc)", RegexOptions.IgnoreCase, "-", "Error."),

+			new RegexTrial (@"(abc", RegexOptions.IgnoreCase, "-", "Error."),

+			new RegexTrial (@"((a))", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,1) Group[1]=(0,1) Group[2]=(0,1)"),

+			new RegexTrial (@"(a)b(c)", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3) Group[1]=(0,1) Group[2]=(2,1)"),

+			new RegexTrial (@"a+b+c", RegexOptions.IgnoreCase, "AABBABC", "Pass. Group[0]=(4,3)"),

+			new RegexTrial (@"a{1,}b{1,}c", RegexOptions.IgnoreCase, "AABBABC", "Pass. Group[0]=(4,3)"),

+			new RegexTrial (@"a**", RegexOptions.IgnoreCase, "-", "Error."),

+			new RegexTrial (@"a.+?c", RegexOptions.IgnoreCase, "ABCABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a.*?c", RegexOptions.IgnoreCase, "ABCABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"a.{0,5}?c", RegexOptions.IgnoreCase, "ABCABC", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"(a+|b)*", RegexOptions.IgnoreCase, "AB", "Pass. Group[0]=(0,2) Group[1]=(0,1)(1,1)"),

+			new RegexTrial (@"(a+|b){0,}", RegexOptions.IgnoreCase, "AB", "Pass. Group[0]=(0,2) Group[1]=(0,1)(1,1)"),

+			new RegexTrial (@"(a+|b)+", RegexOptions.IgnoreCase, "AB", "Pass. Group[0]=(0,2) Group[1]=(0,1)(1,1)"),

+			new RegexTrial (@"(a+|b){1,}", RegexOptions.IgnoreCase, "AB", "Pass. Group[0]=(0,2) Group[1]=(0,1)(1,1)"),

+			new RegexTrial (@"(a+|b)?", RegexOptions.IgnoreCase, "AB", "Pass. Group[0]=(0,1) Group[1]=(0,1)"),

+			new RegexTrial (@"(a+|b){0,1}", RegexOptions.IgnoreCase, "AB", "Pass. Group[0]=(0,1) Group[1]=(0,1)"),

+			new RegexTrial (@"(a+|b){0,1}?", RegexOptions.IgnoreCase, "AB", "Pass. Group[0]=(0,0) Group[1]="),

+			new RegexTrial (@")(", RegexOptions.IgnoreCase, "-", "Error."),

+			new RegexTrial (@"[^ab]*", RegexOptions.IgnoreCase, "CDE", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"abc", RegexOptions.IgnoreCase, "", "Fail."),

+			new RegexTrial (@"a*", RegexOptions.IgnoreCase, "", "Pass. Group[0]=(0,0)"),

+			new RegexTrial (@"([abc])*d", RegexOptions.IgnoreCase, "ABBBCD", "Pass. Group[0]=(0,6) Group[1]=(0,1)(1,1)(2,1)(3,1)(4,1)"),

+			new RegexTrial (@"([abc])*bcd", RegexOptions.IgnoreCase, "ABCD", "Pass. Group[0]=(0,4) Group[1]=(0,1)"),

+			new RegexTrial (@"a|b|c|d|e", RegexOptions.IgnoreCase, "E", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"(a|b|c|d|e)f", RegexOptions.IgnoreCase, "EF", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"abcd*efg", RegexOptions.IgnoreCase, "ABCDEFG", "Pass. Group[0]=(0,7)"),

+			new RegexTrial (@"ab*", RegexOptions.IgnoreCase, "XABYABBBZ", "Pass. Group[0]=(1,2)"),

+			new RegexTrial (@"ab*", RegexOptions.IgnoreCase, "XAYABBBZ", "Pass. Group[0]=(1,1)"),

+			new RegexTrial (@"(ab|cd)e", RegexOptions.IgnoreCase, "ABCDE", "Pass. Group[0]=(2,3) Group[1]=(2,2)"),

+			new RegexTrial (@"[abhgefdc]ij", RegexOptions.IgnoreCase, "HIJ", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"^(ab|cd)e", RegexOptions.IgnoreCase, "ABCDE", "Fail."),

+			new RegexTrial (@"(abc|)ef", RegexOptions.IgnoreCase, "ABCDEF", "Pass. Group[0]=(4,2) Group[1]=(4,0)"),

+			new RegexTrial (@"(a|b)c*d", RegexOptions.IgnoreCase, "ABCD", "Pass. Group[0]=(1,3) Group[1]=(1,1)"),

+			new RegexTrial (@"(ab|ab*)bc", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3) Group[1]=(0,1)"),

+			new RegexTrial (@"a([bc]*)c*", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3) Group[1]=(1,2)"),

+			new RegexTrial (@"a([bc]*)(c*d)", RegexOptions.IgnoreCase, "ABCD", "Pass. Group[0]=(0,4) Group[1]=(1,2) Group[2]=(3,1)"),

+			new RegexTrial (@"a([bc]+)(c*d)", RegexOptions.IgnoreCase, "ABCD", "Pass. Group[0]=(0,4) Group[1]=(1,2) Group[2]=(3,1)"),

+			new RegexTrial (@"a([bc]*)(c+d)", RegexOptions.IgnoreCase, "ABCD", "Pass. Group[0]=(0,4) Group[1]=(1,1) Group[2]=(2,2)"),

+			new RegexTrial (@"a[bcd]*dcdcde", RegexOptions.IgnoreCase, "ADCDCDE", "Pass. Group[0]=(0,7)"),

+			new RegexTrial (@"a[bcd]+dcdcde", RegexOptions.IgnoreCase, "ADCDCDE", "Fail."),

+			new RegexTrial (@"(ab|a)b*c", RegexOptions.IgnoreCase, "ABC", "Pass. Group[0]=(0,3) Group[1]=(0,2)"),

+			new RegexTrial (@"((a)(b)c)(d)", RegexOptions.IgnoreCase, "ABCD", "Pass. Group[0]=(0,4) Group[1]=(0,3) Group[2]=(0,1) Group[3]=(1,1) Group[4]=(3,1)"),

+			new RegexTrial (@"[a-zA-Z_][a-zA-Z0-9_]*", RegexOptions.IgnoreCase, "ALPHA", "Pass. Group[0]=(0,5)"),

+			new RegexTrial (@"^a(bc+|b[eh])g|.h$", RegexOptions.IgnoreCase, "ABH", "Pass. Group[0]=(1,2) Group[1]="),

+			new RegexTrial (@"(bc+d$|ef*g.|h?i(j|k))", RegexOptions.IgnoreCase, "EFFGZ", "Pass. Group[0]=(0,5) Group[1]=(0,5) Group[2]="),

+			new RegexTrial (@"(bc+d$|ef*g.|h?i(j|k))", RegexOptions.IgnoreCase, "IJ", "Pass. Group[0]=(0,2) Group[1]=(0,2) Group[2]=(1,1)"),

+			new RegexTrial (@"(bc+d$|ef*g.|h?i(j|k))", RegexOptions.IgnoreCase, "EFFG", "Fail."),

+			new RegexTrial (@"(bc+d$|ef*g.|h?i(j|k))", RegexOptions.IgnoreCase, "BCDD", "Fail."),

+			new RegexTrial (@"(bc+d$|ef*g.|h?i(j|k))", RegexOptions.IgnoreCase, "REFFGZ", "Pass. Group[0]=(1,5) Group[1]=(1,5) Group[2]="),

+			new RegexTrial (@"((((((((((a))))))))))", RegexOptions.IgnoreCase, "A", "Pass. Group[0]=(0,1) Group[1]=(0,1) Group[2]=(0,1) Group[3]=(0,1) Group[4]=(0,1) Group[5]=(0,1) Group[6]=(0,1) Group[7]=(0,1) Group[8]=(0,1) Group[9]=(0,1) Group[10]=(0,1)"),

+			new RegexTrial (@"((((((((((a))))))))))\10", RegexOptions.IgnoreCase, "AA", "Pass. Group[0]=(0,2) Group[1]=(0,1) Group[2]=(0,1) Group[3]=(0,1) Group[4]=(0,1) Group[5]=(0,1) Group[6]=(0,1) Group[7]=(0,1) Group[8]=(0,1) Group[9]=(0,1) Group[10]=(0,1)"),

+			new RegexTrial (@"((((((((((a))))))))))!", RegexOptions.IgnoreCase, "AA", "Fail."),

+			new RegexTrial (@"((((((((((a))))))))))!", RegexOptions.IgnoreCase, "A!", "Pass. Group[0]=(0,2) Group[1]=(0,1) Group[2]=(0,1) Group[3]=(0,1) Group[4]=(0,1) Group[5]=(0,1) Group[6]=(0,1) Group[7]=(0,1) Group[8]=(0,1) Group[9]=(0,1) Group[10]=(0,1)"),

+			new RegexTrial (@"(((((((((a)))))))))", RegexOptions.IgnoreCase, "A", "Pass. Group[0]=(0,1) Group[1]=(0,1) Group[2]=(0,1) Group[3]=(0,1) Group[4]=(0,1) Group[5]=(0,1) Group[6]=(0,1) Group[7]=(0,1) Group[8]=(0,1) Group[9]=(0,1)"),

+			new RegexTrial (@"(?:(?:(?:(?:(?:(?:(?:(?:(?:(a))))))))))", RegexOptions.IgnoreCase, "A", "Pass. Group[0]=(0,1) Group[1]=(0,1)"),

+			new RegexTrial (@"(?:(?:(?:(?:(?:(?:(?:(?:(?:(a|b|c))))))))))", RegexOptions.IgnoreCase, "C", "Pass. Group[0]=(0,1) Group[1]=(0,1)"),

+			new RegexTrial (@"multiple words of text", RegexOptions.IgnoreCase, "UH-UH", "Fail."),

+			new RegexTrial (@"multiple words", RegexOptions.IgnoreCase, "MULTIPLE WORDS, YEAH", "Pass. Group[0]=(0,14)"),

+			new RegexTrial (@"(.*)c(.*)", RegexOptions.IgnoreCase, "ABCDE", "Pass. Group[0]=(0,5) Group[1]=(0,2) Group[2]=(3,2)"),

+			new RegexTrial (@"\((.*), (.*)\)", RegexOptions.IgnoreCase, "(A, B)", "Pass. Group[0]=(0,6) Group[1]=(1,1) Group[2]=(4,1)"),

+			new RegexTrial (@"[k]", RegexOptions.IgnoreCase, "AB", "Fail."),

+			new RegexTrial (@"abcd", RegexOptions.IgnoreCase, "ABCD", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"a(bc)d", RegexOptions.IgnoreCase, "ABCD", "Pass. Group[0]=(0,4) Group[1]=(1,2)"),

+			new RegexTrial (@"a[-]?c", RegexOptions.IgnoreCase, "AC", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"(abc)\1", RegexOptions.IgnoreCase, "ABCABC", "Pass. Group[0]=(0,6) Group[1]=(0,3)"),

+			new RegexTrial (@"([a-c]*)\1", RegexOptions.IgnoreCase, "ABCABC", "Pass. Group[0]=(0,6) Group[1]=(0,3)"),

+			new RegexTrial (@"a(?!b).", RegexOptions.None, "abad", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"a(?=d).", RegexOptions.None, "abad", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"a(?=c|d).", RegexOptions.None, "abad", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"a(?:b|c|d)(.)", RegexOptions.None, "ace", "Pass. Group[0]=(0,3) Group[1]=(2,1)"),

+			new RegexTrial (@"a(?:b|c|d)*(.)", RegexOptions.None, "ace", "Pass. Group[0]=(0,3) Group[1]=(2,1)"),

+			new RegexTrial (@"a(?:b|c|d)+?(.)", RegexOptions.None, "ace", "Pass. Group[0]=(0,3) Group[1]=(2,1)"),

+			new RegexTrial (@"a(?:b|c|d)+?(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,3) Group[1]=(2,1)"),

+			new RegexTrial (@"a(?:b|c|d)+(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,8) Group[1]=(7,1)"),

+			new RegexTrial (@"a(?:b|c|d){2}(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,4) Group[1]=(3,1)"),

+			new RegexTrial (@"a(?:b|c|d){4,5}(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,7) Group[1]=(6,1)"),

+			new RegexTrial (@"a(?:b|c|d){4,5}?(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,6) Group[1]=(5,1)"),

+			new RegexTrial (@"((foo)|(bar))*", RegexOptions.None, "foobar", "Pass. Group[0]=(0,6) Group[1]=(0,3)(3,3) Group[2]=(0,3) Group[3]=(3,3)"),

+			new RegexTrial (@":(?:", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"a(?:b|c|d){6,7}(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,8) Group[1]=(7,1)"),

+			new RegexTrial (@"a(?:b|c|d){6,7}?(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,8) Group[1]=(7,1)"),

+			new RegexTrial (@"a(?:b|c|d){5,6}(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,8) Group[1]=(7,1)"),

+			new RegexTrial (@"a(?:b|c|d){5,6}?(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,7) Group[1]=(6,1)"),

+			new RegexTrial (@"a(?:b|c|d){5,7}(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,8) Group[1]=(7,1)"),

+			new RegexTrial (@"a(?:b|c|d){5,7}?(.)", RegexOptions.None, "acdbcdbe", "Pass. Group[0]=(0,7) Group[1]=(6,1)"),

+			new RegexTrial (@"a(?:b|(c|e){1,2}?|d)+?(.)", RegexOptions.None, "ace", "Pass. Group[0]=(0,3) Group[1]=(1,1) Group[2]=(2,1)"),

+			new RegexTrial (@"^(.+)?B", RegexOptions.None, "AB", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"^([^a-z])|(\^)$", RegexOptions.None, ".", "Pass. Group[0]=(0,1) Group[1]=(0,1) Group[2]="),

+			new RegexTrial (@"^[<>]&", RegexOptions.None, "<&OUT", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"^(a\1?){4}$", RegexOptions.None, "aaaaaaaaaa", "Pass. Group[0]=(0,10) Group[1]=(0,1)(1,2)(3,3)(6,4)"),

+			new RegexTrial (@"^(a\1?){4}$", RegexOptions.None, "aaaaaaaaa", "Fail."),

+			new RegexTrial (@"^(a\1?){4}$", RegexOptions.None, "aaaaaaaaaaa", "Fail."),

+			new RegexTrial (@"^(a(?(1)\1)){4}$", RegexOptions.None, "aaaaaaaaaa", "Pass. Group[0]=(0,10) Group[1]=(0,1)(1,2)(3,3)(6,4)"),

+			new RegexTrial (@"^(a(?(1)\1)){4}$", RegexOptions.None, "aaaaaaaaa", "Fail."),

+			new RegexTrial (@"^(a(?(1)\1)){4}$", RegexOptions.None, "aaaaaaaaaaa", "Fail."),

+			new RegexTrial (@"((a{4})+)", RegexOptions.None, "aaaaaaaaa", "Pass. Group[0]=(0,8) Group[1]=(0,8) Group[2]=(0,4)(4,4)"),

+			new RegexTrial (@"(((aa){2})+)", RegexOptions.None, "aaaaaaaaaa", "Pass. Group[0]=(0,8) Group[1]=(0,8) Group[2]=(0,4)(4,4) Group[3]=(0,2)(2,2)(4,2)(6,2)"),

+			new RegexTrial (@"(((a{2}){2})+)", RegexOptions.None, "aaaaaaaaaa", "Pass. Group[0]=(0,8) Group[1]=(0,8) Group[2]=(0,4)(4,4) Group[3]=(0,2)(2,2)(4,2)(6,2)"),

+			new RegexTrial (@"(?:(f)(o)(o)|(b)(a)(r))*", RegexOptions.None, "foobar", "Pass. Group[0]=(0,6) Group[1]=(0,1) Group[2]=(1,1) Group[3]=(2,1) Group[4]=(3,1) Group[5]=(4,1) Group[6]=(5,1)"),

+			new RegexTrial (@"(?<=a)b", RegexOptions.None, "ab", "Pass. Group[0]=(1,1)"),

+			new RegexTrial (@"(?<=a)b", RegexOptions.None, "cb", "Fail."),

+			new RegexTrial (@"(?<=a)b", RegexOptions.None, "b", "Fail."),

+			new RegexTrial (@"(?<!c)b", RegexOptions.None, "ab", "Pass. Group[0]=(1,1)"),

+			new RegexTrial (@"(?<!c)b", RegexOptions.None, "cb", "Fail."),

+			new RegexTrial (@"(?<!c)b", RegexOptions.None, "b", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"(?<!c)b", RegexOptions.None, "b", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"(?<%)b", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"(?:..)*a", RegexOptions.None, "aba", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"(?:..)*?a", RegexOptions.None, "aba", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"^(?:b|a(?=(.)))*\1", RegexOptions.None, "abc", "Pass. Group[0]=(0,2) Group[1]=(1,1)"),

+			new RegexTrial (@"^(){3,5}", RegexOptions.None, "abc", "Pass. Group[0]=(0,0) Group[1]=(0,0)(0,0)(0,0)"),

+			new RegexTrial (@"^(a+)*ax", RegexOptions.None, "aax", "Pass. Group[0]=(0,3) Group[1]=(0,1)"),

+			new RegexTrial (@"^((a|b)+)*ax", RegexOptions.None, "aax", "Pass. Group[0]=(0,3) Group[1]=(0,1) Group[2]=(0,1)"),

+			new RegexTrial (@"^((a|bc)+)*ax", RegexOptions.None, "aax", "Pass. Group[0]=(0,3) Group[1]=(0,1) Group[2]=(0,1)"),

+			new RegexTrial (@"(a|x)*ab", RegexOptions.None, "cab", "Pass. Group[0]=(1,2) Group[1]="),

+			new RegexTrial (@"(a)*ab", RegexOptions.None, "cab", "Pass. Group[0]=(1,2) Group[1]="),

+			new RegexTrial (@"(?:(?i)a)b", RegexOptions.None, "ab", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"((?i)a)b", RegexOptions.None, "ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"(?:(?i)a)b", RegexOptions.None, "Ab", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"((?i)a)b", RegexOptions.None, "Ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"(?:(?i)a)b", RegexOptions.None, "aB", "Fail."),

+			new RegexTrial (@"((?i)a)b", RegexOptions.None, "aB", "Fail."),

+			new RegexTrial (@"(?i:a)b", RegexOptions.None, "ab", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"((?i:a))b", RegexOptions.None, "ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"(?i:a)b", RegexOptions.None, "Ab", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"((?i:a))b", RegexOptions.None, "Ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"(?i:a)b", RegexOptions.None, "aB", "Fail."),

+			new RegexTrial (@"((?i:a))b", RegexOptions.None, "aB", "Fail."),

+			new RegexTrial (@"(?:(?-i)a)b", RegexOptions.IgnoreCase, "ab", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"((?-i)a)b", RegexOptions.IgnoreCase, "ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"(?:(?-i)a)b", RegexOptions.IgnoreCase, "aB", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"((?-i)a)b", RegexOptions.IgnoreCase, "aB", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"(?:(?-i)a)b", RegexOptions.IgnoreCase, "Ab", "Fail."),

+			new RegexTrial (@"((?-i)a)b", RegexOptions.IgnoreCase, "Ab", "Fail."),

+			new RegexTrial (@"(?:(?-i)a)b", RegexOptions.IgnoreCase, "aB", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"((?-i)a)b", RegexOptions.IgnoreCase, "aB", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"(?:(?-i)a)b", RegexOptions.IgnoreCase, "AB", "Fail."),

+			new RegexTrial (@"((?-i)a)b", RegexOptions.IgnoreCase, "AB", "Fail."),

+			new RegexTrial (@"(?-i:a)b", RegexOptions.IgnoreCase, "ab", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"((?-i:a))b", RegexOptions.IgnoreCase, "ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"(?-i:a)b", RegexOptions.IgnoreCase, "aB", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"((?-i:a))b", RegexOptions.IgnoreCase, "aB", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"(?-i:a)b", RegexOptions.IgnoreCase, "Ab", "Fail."),

+			new RegexTrial (@"((?-i:a))b", RegexOptions.IgnoreCase, "Ab", "Fail."),

+			new RegexTrial (@"(?-i:a)b", RegexOptions.IgnoreCase, "aB", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"((?-i:a))b", RegexOptions.IgnoreCase, "aB", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"(?-i:a)b", RegexOptions.IgnoreCase, "AB", "Fail."),

+			new RegexTrial (@"((?-i:a))b", RegexOptions.IgnoreCase, "AB", "Fail."),

+			new RegexTrial (@"((?-i:a.))b", RegexOptions.IgnoreCase, "a\nB", "Fail."),

+			new RegexTrial (@"((?s-i:a.))b", RegexOptions.IgnoreCase, "a\nB", "Pass. Group[0]=(0,3) Group[1]=(0,2)"),

+			new RegexTrial (@"((?s-i:a.))b", RegexOptions.IgnoreCase, "B\nB", "Fail."),

+			new RegexTrial (@"(?:c|d)(?:)(?:a(?:)(?:b)(?:b(?:))(?:b(?:)(?:b)))", RegexOptions.None, "cabbbb", "Pass. Group[0]=(0,6)"),

+			new RegexTrial (@"(?:c|d)(?:)(?:aaaaaaaa(?:)(?:bbbbbbbb)(?:bbbbbbbb(?:))(?:bbbbbbbb(?:)(?:bbbbbbbb)))", RegexOptions.None, "caaaaaaaabbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb", "Pass. Group[0]=(0,41)"),

+			new RegexTrial (@"(ab)\d\1", RegexOptions.IgnoreCase, "Ab4ab", "Pass. Group[0]=(0,5) Group[1]=(0,2)"),

+			new RegexTrial (@"(ab)\d\1", RegexOptions.IgnoreCase, "ab4Ab", "Pass. Group[0]=(0,5) Group[1]=(0,2)"),

+			new RegexTrial (@"foo\w*\d{4}baz", RegexOptions.None, "foobar1234baz", "Pass. Group[0]=(0,13)"),

+			new RegexTrial (@"x(~~)*(?:(?:F)?)?", RegexOptions.None, "x~~", "Pass. Group[0]=(0,3) Group[1]=(1,2)"),

+			new RegexTrial (@"^a(?#xxx){3}c", RegexOptions.None, "aaac", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"(?<![cd])b", RegexOptions.None, "dbcb", "Fail."),

+			new RegexTrial (@"(?<![cd])[ab]", RegexOptions.None, "dbaacb", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"(?<!(c|d))b", RegexOptions.None, "dbcb", "Fail."),

+			new RegexTrial (@"(?<!(c|d))[ab]", RegexOptions.None, "dbaacb", "Pass. Group[0]=(2,1) Group[1]="),

+			new RegexTrial (@"(?<!cd)[ab]", RegexOptions.None, "cdaccb", "Pass. Group[0]=(5,1)"),

+			new RegexTrial (@"^(?:a?b?)*$", RegexOptions.None, "a--", "Fail."),

+			new RegexTrial (@"((?s)^a(.))((?m)^b$)", RegexOptions.None, "a\nb\nc\n", "Pass. Group[0]=(0,3) Group[1]=(0,2) Group[2]=(1,1) Group[3]=(2,1)"),

+			new RegexTrial (@"((?m)^b$)", RegexOptions.None, "a\nb\nc\n", "Pass. Group[0]=(2,1) Group[1]=(2,1)"),

+			new RegexTrial (@"(?m)^b", RegexOptions.None, "a\nb\n", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"(?m)^(b)", RegexOptions.None, "a\nb\n", "Pass. Group[0]=(2,1) Group[1]=(2,1)"),

+			new RegexTrial (@"((?m)^b)", RegexOptions.None, "a\nb\n", "Pass. Group[0]=(2,1) Group[1]=(2,1)"),

+			new RegexTrial (@"\n((?m)^b)", RegexOptions.None, "a\nb\n", "Pass. Group[0]=(1,2) Group[1]=(2,1)"),

+			new RegexTrial (@"((?s).)c(?!.)", RegexOptions.None, "a\nb\nc\n", "Pass. Group[0]=(3,2) Group[1]=(3,1)"),

+			new RegexTrial (@"((?s).)c(?!.)", RegexOptions.None, "a\nb\nc\n", "Pass. Group[0]=(3,2) Group[1]=(3,1)"),

+			new RegexTrial (@"((?s)b.)c(?!.)", RegexOptions.None, "a\nb\nc\n", "Pass. Group[0]=(2,3) Group[1]=(2,2)"),

+			new RegexTrial (@"((?s)b.)c(?!.)", RegexOptions.None, "a\nb\nc\n", "Pass. Group[0]=(2,3) Group[1]=(2,2)"),

+			new RegexTrial (@"^b", RegexOptions.None, "a\nb\nc\n", "Fail."),

+			new RegexTrial (@"()^b", RegexOptions.None, "a\nb\nc\n", "Fail."),

+			new RegexTrial (@"((?m)^b)", RegexOptions.None, "a\nb\nc\n", "Pass. Group[0]=(2,1) Group[1]=(2,1)"),

+			new RegexTrial (@"(x)?(?(1)a|b)", RegexOptions.None, "a", "Fail."),

+			new RegexTrial (@"(x)?(?(1)b|a)", RegexOptions.None, "a", "Pass. Group[0]=(0,1) Group[1]="),

+			new RegexTrial (@"()?(?(1)b|a)", RegexOptions.None, "a", "Pass. Group[0]=(0,1) Group[1]="),

+			new RegexTrial (@"()(?(1)b|a)", RegexOptions.None, "a", "Fail."),

+			new RegexTrial (@"()?(?(1)a|b)", RegexOptions.None, "a", "Pass. Group[0]=(0,1) Group[1]=(0,0)"),

+			new RegexTrial (@"^(\()?blah(?(1)(\)))$", RegexOptions.None, "(blah)", "Pass. Group[0]=(0,6) Group[1]=(0,1) Group[2]=(5,1)"),

+			new RegexTrial (@"^(\()?blah(?(1)(\)))$", RegexOptions.None, "blah", "Pass. Group[0]=(0,4) Group[1]= Group[2]="),

+			new RegexTrial (@"^(\()?blah(?(1)(\)))$", RegexOptions.None, "blah)", "Fail."),

+			new RegexTrial (@"^(\()?blah(?(1)(\)))$", RegexOptions.None, "(blah", "Fail."),

+			new RegexTrial (@"^(\(+)?blah(?(1)(\)))$", RegexOptions.None, "(blah)", "Pass. Group[0]=(0,6) Group[1]=(0,1) Group[2]=(5,1)"),

+			new RegexTrial (@"^(\(+)?blah(?(1)(\)))$", RegexOptions.None, "blah", "Pass. Group[0]=(0,4) Group[1]= Group[2]="),

+			new RegexTrial (@"^(\(+)?blah(?(1)(\)))$", RegexOptions.None, "blah)", "Fail."),

+			new RegexTrial (@"^(\(+)?blah(?(1)(\)))$", RegexOptions.None, "(blah", "Fail."),

+			new RegexTrial (@"(?(1)a|b|c)", RegexOptions.None, "a", "Error."),

+			new RegexTrial (@"(?(?!a)a|b)", RegexOptions.None, "a", "Fail."),

+			new RegexTrial (@"(?(?!a)b|a)", RegexOptions.None, "a", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"(?(?=a)b|a)", RegexOptions.None, "a", "Fail."),

+			new RegexTrial (@"(?(?=a)a|b)", RegexOptions.None, "a", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"(?=(a+?))(\1ab)", RegexOptions.None, "aaab", "Pass. Group[0]=(1,3) Group[1]=(1,1) Group[2]=(1,3)"),

+			new RegexTrial (@"^(?=(a+?))\1ab", RegexOptions.None, "aaab", "Fail."),

+			new RegexTrial (@"(\w+:)+", RegexOptions.None, "one:", "Pass. Group[0]=(0,4) Group[1]=(0,4)"),

+			new RegexTrial (@"$(?<=^(a))", RegexOptions.None, "a", "Pass. Group[0]=(1,0) Group[1]=(0,1)"),

+			new RegexTrial (@"(?=(a+?))(\1ab)", RegexOptions.None, "aaab", "Pass. Group[0]=(1,3) Group[1]=(1,1) Group[2]=(1,3)"),

+			new RegexTrial (@"^(?=(a+?))\1ab", RegexOptions.None, "aaab", "Fail."),

+			new RegexTrial (@"([\w:]+::)?(\w+)$", RegexOptions.None, "abcd:", "Fail."),

+			new RegexTrial (@"([\w:]+::)?(\w+)$", RegexOptions.None, "abcd", "Pass. Group[0]=(0,4) Group[1]= Group[2]=(0,4)"),

+			new RegexTrial (@"([\w:]+::)?(\w+)$", RegexOptions.None, "xy:z:::abcd", "Pass. Group[0]=(0,11) Group[1]=(0,7) Group[2]=(7,4)"),

+			new RegexTrial (@"^[^bcd]*(c+)", RegexOptions.None, "aexycd", "Pass. Group[0]=(0,5) Group[1]=(4,1)"),

+			new RegexTrial (@"(a*)b+", RegexOptions.None, "caab", "Pass. Group[0]=(1,3) Group[1]=(1,2)"),

+			new RegexTrial (@"([\w:]+::)?(\w+)$", RegexOptions.None, "abcd:", "Fail."),

+			new RegexTrial (@"([\w:]+::)?(\w+)$", RegexOptions.None, "abcd", "Pass. Group[0]=(0,4) Group[1]= Group[2]=(0,4)"),

+			new RegexTrial (@"([\w:]+::)?(\w+)$", RegexOptions.None, "xy:z:::abcd", "Pass. Group[0]=(0,11) Group[1]=(0,7) Group[2]=(7,4)"),

+			new RegexTrial (@"^[^bcd]*(c+)", RegexOptions.None, "aexycd", "Pass. Group[0]=(0,5) Group[1]=(4,1)"),

+			new RegexTrial (@"(>a+)ab", RegexOptions.None, "aaab", "Fail."),

+			new RegexTrial (@"(?>a+)b", RegexOptions.None, "aaab", "Pass. Group[0]=(0,4)"),

+			new RegexTrial (@"([[:]+)", RegexOptions.None, "a:[b]:", "Pass. Group[0]=(1,2) Group[1]=(1,2)"),

+			new RegexTrial (@"([[=]+)", RegexOptions.None, "a=[b]=", "Pass. Group[0]=(1,2) Group[1]=(1,2)"),

+			new RegexTrial (@"([[.]+)", RegexOptions.None, "a.[b].", "Pass. Group[0]=(1,2) Group[1]=(1,2)"),

+			new RegexTrial (@"[a[:]b[:c]", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"[a[:]b[:c]", RegexOptions.None, "abc", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"((?>a+)b)", RegexOptions.None, "aaab", "Pass. Group[0]=(0,4) Group[1]=(0,4)"),

+			new RegexTrial (@"(?>(a+))b", RegexOptions.None, "aaab", "Pass. Group[0]=(0,4) Group[1]=(0,3)"),

+			new RegexTrial (@"((?>[^()]+)|\([^()]*\))+", RegexOptions.None, "((abc(ade)ufh()()x", "Pass. Group[0]=(2,16) Group[1]=(2,3)(5,5)(10,3)(13,2)(15,2)(17,1)"),

+			new RegexTrial (@"(?<=x+)", RegexOptions.None, "xxxxy", "Pass. Group[0]=(1,0)"),

+			new RegexTrial (@"a{37,17}", RegexOptions.None, "-", "Error."),

+			new RegexTrial (@"\Z", RegexOptions.None, "a\nb\n", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"\z", RegexOptions.None, "a\nb\n", "Pass. Group[0]=(4,0)"),

+			new RegexTrial (@"$", RegexOptions.None, "a\nb\n", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"\Z", RegexOptions.None, "b\na\n", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"\z", RegexOptions.None, "b\na\n", "Pass. Group[0]=(4,0)"),

+			new RegexTrial (@"$", RegexOptions.None, "b\na\n", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"\Z", RegexOptions.None, "b\na", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"\z", RegexOptions.None, "b\na", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"$", RegexOptions.None, "b\na", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"\Z", RegexOptions.Multiline, "a\nb\n", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"\z", RegexOptions.Multiline, "a\nb\n", "Pass. Group[0]=(4,0)"),

+			new RegexTrial (@"$", RegexOptions.Multiline, "a\nb\n", "Pass. Group[0]=(1,0)"),

+			new RegexTrial (@"\Z", RegexOptions.Multiline, "b\na\n", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"\z", RegexOptions.Multiline, "b\na\n", "Pass. Group[0]=(4,0)"),

+			new RegexTrial (@"$", RegexOptions.Multiline, "b\na\n", "Pass. Group[0]=(1,0)"),

+			new RegexTrial (@"\Z", RegexOptions.Multiline, "b\na", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"\z", RegexOptions.Multiline, "b\na", "Pass. Group[0]=(3,0)"),

+			new RegexTrial (@"$", RegexOptions.Multiline, "b\na", "Pass. Group[0]=(1,0)"),

+			new RegexTrial (@"a\Z", RegexOptions.None, "a\nb\n", "Fail."),

+			new RegexTrial (@"a\z", RegexOptions.None, "a\nb\n", "Fail."),

+			new RegexTrial (@"a$", RegexOptions.None, "a\nb\n", "Fail."),

+			new RegexTrial (@"a\Z", RegexOptions.None, "b\na\n", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"a\z", RegexOptions.None, "b\na\n", "Fail."),

+			new RegexTrial (@"a$", RegexOptions.None, "b\na\n", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"a\Z", RegexOptions.None, "b\na", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"a\z", RegexOptions.None, "b\na", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"a$", RegexOptions.None, "b\na", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"a\z", RegexOptions.Multiline, "a\nb\n", "Fail."),

+			new RegexTrial (@"a$", RegexOptions.Multiline, "a\nb\n", "Pass. Group[0]=(0,1)"),

+			new RegexTrial (@"a\Z", RegexOptions.Multiline, "b\na\n", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"a\z", RegexOptions.Multiline, "b\na\n", "Fail."),

+			new RegexTrial (@"a$", RegexOptions.Multiline, "b\na\n", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"a\Z", RegexOptions.Multiline, "b\na", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"a\z", RegexOptions.Multiline, "b\na", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"a$", RegexOptions.Multiline, "b\na", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"aa\Z", RegexOptions.None, "aa\nb\n", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.None, "aa\nb\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.None, "aa\nb\n", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.None, "b\naa\n", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"aa\z", RegexOptions.None, "b\naa\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.None, "b\naa\n", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"aa\Z", RegexOptions.None, "b\naa", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"aa\z", RegexOptions.None, "b\naa", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"aa$", RegexOptions.None, "b\naa", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"aa\z", RegexOptions.Multiline, "aa\nb\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.Multiline, "aa\nb\n", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"aa\Z", RegexOptions.Multiline, "b\naa\n", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"aa\z", RegexOptions.Multiline, "b\naa\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.Multiline, "b\naa\n", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"aa\Z", RegexOptions.Multiline, "b\naa", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"aa\z", RegexOptions.Multiline, "b\naa", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"aa$", RegexOptions.Multiline, "b\naa", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"aa\Z", RegexOptions.None, "ac\nb\n", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.None, "ac\nb\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.None, "ac\nb\n", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.None, "b\nac\n", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.None, "b\nac\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.None, "b\nac\n", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.None, "b\nac", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.None, "b\nac", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.None, "b\nac", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.Multiline, "ac\nb\n", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.Multiline, "ac\nb\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.Multiline, "ac\nb\n", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.Multiline, "b\nac\n", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.Multiline, "b\nac\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.Multiline, "b\nac\n", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.Multiline, "b\nac", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.Multiline, "b\nac", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.Multiline, "b\nac", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.None, "ca\nb\n", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.None, "ca\nb\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.None, "ca\nb\n", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.None, "b\nca\n", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.None, "b\nca\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.None, "b\nca\n", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.None, "b\nca", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.None, "b\nca", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.None, "b\nca", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.Multiline, "ca\nb\n", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.Multiline, "ca\nb\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.Multiline, "ca\nb\n", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.Multiline, "b\nca\n", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.Multiline, "b\nca\n", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.Multiline, "b\nca\n", "Fail."),

+			new RegexTrial (@"aa\Z", RegexOptions.Multiline, "b\nca", "Fail."),

+			new RegexTrial (@"aa\z", RegexOptions.Multiline, "b\nca", "Fail."),

+			new RegexTrial (@"aa$", RegexOptions.Multiline, "b\nca", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.None, "ab\nb\n", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.None, "ab\nb\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.None, "ab\nb\n", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.None, "b\nab\n", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"ab\z", RegexOptions.None, "b\nab\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.None, "b\nab\n", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"ab\Z", RegexOptions.None, "b\nab", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"ab\z", RegexOptions.None, "b\nab", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"ab$", RegexOptions.None, "b\nab", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"ab\z", RegexOptions.Multiline, "ab\nb\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.Multiline, "ab\nb\n", "Pass. Group[0]=(0,2)"),

+			new RegexTrial (@"ab\Z", RegexOptions.Multiline, "b\nab\n", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"ab\z", RegexOptions.Multiline, "b\nab\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.Multiline, "b\nab\n", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"ab\Z", RegexOptions.Multiline, "b\nab", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"ab\z", RegexOptions.Multiline, "b\nab", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"ab$", RegexOptions.Multiline, "b\nab", "Pass. Group[0]=(2,2)"),

+			new RegexTrial (@"ab\Z", RegexOptions.None, "ac\nb\n", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.None, "ac\nb\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.None, "ac\nb\n", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.None, "b\nac\n", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.None, "b\nac\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.None, "b\nac\n", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.None, "b\nac", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.None, "b\nac", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.None, "b\nac", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.Multiline, "ac\nb\n", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.Multiline, "ac\nb\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.Multiline, "ac\nb\n", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.Multiline, "b\nac\n", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.Multiline, "b\nac\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.Multiline, "b\nac\n", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.Multiline, "b\nac", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.Multiline, "b\nac", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.Multiline, "b\nac", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.None, "ca\nb\n", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.None, "ca\nb\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.None, "ca\nb\n", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.None, "b\nca\n", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.None, "b\nca\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.None, "b\nca\n", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.None, "b\nca", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.None, "b\nca", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.None, "b\nca", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.Multiline, "ca\nb\n", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.Multiline, "ca\nb\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.Multiline, "ca\nb\n", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.Multiline, "b\nca\n", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.Multiline, "b\nca\n", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.Multiline, "b\nca\n", "Fail."),

+			new RegexTrial (@"ab\Z", RegexOptions.Multiline, "b\nca", "Fail."),

+			new RegexTrial (@"ab\z", RegexOptions.Multiline, "b\nca", "Fail."),

+			new RegexTrial (@"ab$", RegexOptions.Multiline, "b\nca", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.None, "abb\nb\n", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.None, "abb\nb\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.None, "abb\nb\n", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.None, "b\nabb\n", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"abb\z", RegexOptions.None, "b\nabb\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.None, "b\nabb\n", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"abb\Z", RegexOptions.None, "b\nabb", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"abb\z", RegexOptions.None, "b\nabb", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"abb$", RegexOptions.None, "b\nabb", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"abb\z", RegexOptions.Multiline, "abb\nb\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.Multiline, "abb\nb\n", "Pass. Group[0]=(0,3)"),

+			new RegexTrial (@"abb\Z", RegexOptions.Multiline, "b\nabb\n", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"abb\z", RegexOptions.Multiline, "b\nabb\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.Multiline, "b\nabb\n", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"abb\Z", RegexOptions.Multiline, "b\nabb", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"abb\z", RegexOptions.Multiline, "b\nabb", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"abb$", RegexOptions.Multiline, "b\nabb", "Pass. Group[0]=(2,3)"),

+			new RegexTrial (@"abb\Z", RegexOptions.None, "ac\nb\n", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.None, "ac\nb\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.None, "ac\nb\n", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.None, "b\nac\n", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.None, "b\nac\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.None, "b\nac\n", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.None, "b\nac", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.None, "b\nac", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.None, "b\nac", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.Multiline, "ac\nb\n", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.Multiline, "ac\nb\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.Multiline, "ac\nb\n", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.Multiline, "b\nac\n", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.Multiline, "b\nac\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.Multiline, "b\nac\n", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.Multiline, "b\nac", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.Multiline, "b\nac", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.Multiline, "b\nac", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.None, "ca\nb\n", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.None, "ca\nb\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.None, "ca\nb\n", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.None, "b\nca\n", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.None, "b\nca\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.None, "b\nca\n", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.None, "b\nca", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.None, "b\nca", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.None, "b\nca", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.Multiline, "ca\nb\n", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.Multiline, "ca\nb\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.Multiline, "ca\nb\n", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.Multiline, "b\nca\n", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.Multiline, "b\nca\n", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.Multiline, "b\nca\n", "Fail."),

+			new RegexTrial (@"abb\Z", RegexOptions.Multiline, "b\nca", "Fail."),

+			new RegexTrial (@"abb\z", RegexOptions.Multiline, "b\nca", "Fail."),

+			new RegexTrial (@"abb$", RegexOptions.Multiline, "b\nca", "Fail."),

+			new RegexTrial (@"(^|x)(c)", RegexOptions.None, "ca", "Pass. Group[0]=(0,1) Group[1]=(0,0) Group[2]=(0,1)"),

+			new RegexTrial (@"a*abc?xyz+pqr{3}ab{2,}xy{4,5}pq{0,6}AB{0,}zz", RegexOptions.None, "x", "Fail."),

+			new RegexTrial (@"round\(((?>[^()]+))\)", RegexOptions.None, "_I(round(xs * sz),1)", "Pass. Group[0]=(3,14) Group[1]=(9,7)"),

+			new RegexTrial (@"foo.bart", RegexOptions.None, "foo.bart", "Pass. Group[0]=(0,8)"),

+			new RegexTrial (@"^d[x][x][x]", RegexOptions.Multiline, "abcd\ndxxx", "Pass. Group[0]=(5,4)"),

+			new RegexTrial (@".X(.+)+X", RegexOptions.None, "bbbbXcXaaaaaaaa", "Pass. Group[0]=(3,4) Group[1]=(5,1)"),

+			new RegexTrial (@".X(.+)+XX", RegexOptions.None, "bbbbXcXXaaaaaaaa", "Pass. Group[0]=(3,5) Group[1]=(5,1)"),

+			new RegexTrial (@".XX(.+)+X", RegexOptions.None, "bbbbXXcXaaaaaaaa", "Pass. Group[0]=(3,5) Group[1]=(6,1)"),

+			new RegexTrial (@".X(.+)+X", RegexOptions.None, "bbbbXXaaaaaaaaa", "Fail."),

+			new RegexTrial (@".X(.+)+XX", RegexOptions.None, "bbbbXXXaaaaaaaaa", "Fail."),

+			new RegexTrial (@".XX(.+)+X", RegexOptions.None, "bbbbXXXaaaaaaaaa", "Fail."),

+			new RegexTrial (@".X(.+)+[X]", RegexOptions.None, "bbbbXcXaaaaaaaa", "Pass. Group[0]=(3,4) Group[1]=(5,1)"),

+			new RegexTrial (@".X(.+)+[X][X]", RegexOptions.None, "bbbbXcXXaaaaaaaa", "Pass. Group[0]=(3,5) Group[1]=(5,1)"),

+			new RegexTrial (@".XX(.+)+[X]", RegexOptions.None, "bbbbXXcXaaaaaaaa", "Pass. Group[0]=(3,5) Group[1]=(6,1)"),

+			new RegexTrial (@".X(.+)+[X]", RegexOptions.None, "bbbbXXaaaaaaaaa", "Fail."),

+			new RegexTrial (@".X(.+)+[X][X]", RegexOptions.None, "bbbbXXXaaaaaaaaa", "Fail."),

+			new RegexTrial (@".XX(.+)+[X]", RegexOptions.None, "bbbbXXXaaaaaaaaa", "Fail."),

+			new RegexTrial (@".[X](.+)+[X]", RegexOptions.None, "bbbbXcXaaaaaaaa", "Pass. Group[0]=(3,4) Group[1]=(5,1)"),

+			new RegexTrial (@".[X](.+)+[X][X]", RegexOptions.None, "bbbbXcXXaaaaaaaa", "Pass. Group[0]=(3,5) Group[1]=(5,1)"),

+			new RegexTrial (@".[X][X](.+)+[X]", RegexOptions.None, "bbbbXXcXaaaaaaaa", "Pass. Group[0]=(3,5) Group[1]=(6,1)"),

+			new RegexTrial (@".[X](.+)+[X]", RegexOptions.None, "bbbbXXaaaaaaaaa", "Fail."),

+			new RegexTrial (@".[X](.+)+[X][X]", RegexOptions.None, "bbbbXXXaaaaaaaaa", "Fail."),

+			new RegexTrial (@".[X][X](.+)+[X]", RegexOptions.None, "bbbbXXXaaaaaaaaa", "Fail."),

+			new RegexTrial (@"tt+$", RegexOptions.None, "xxxtt", "Pass. Group[0]=(3,2)"),

+			new RegexTrial (@"([\d-z]+)", RegexOptions.None, "a0-za", "Pass. Group[0]=(1,3) Group[1]=(1,3)"),

+			new RegexTrial (@"([\d-\s]+)", RegexOptions.None, "a0- z", "Pass. Group[0]=(1,3) Group[1]=(1,3)"),

+			new RegexTrial (@"\GX.*X", RegexOptions.None, "aaaXbX", "Fail."),

+			new RegexTrial (@"(\d+\.\d+)", RegexOptions.None, "3.1415926", "Pass. Group[0]=(0,9) Group[1]=(0,9)"),

+			new RegexTrial (@"(\ba.{0,10}br)", RegexOptions.None, "have a web browser", "Pass. Group[0]=(5,8) Group[1]=(5,8)"),

+			new RegexTrial (@"\.c(pp|xx|c)?$", RegexOptions.IgnoreCase, "Changes", "Fail."),

+			new RegexTrial (@"\.c(pp|xx|c)?$", RegexOptions.IgnoreCase, "IO.c", "Pass. Group[0]=(2,2) Group[1]="),

+			new RegexTrial (@"(\.c(pp|xx|c)?$)", RegexOptions.IgnoreCase, "IO.c", "Pass. Group[0]=(2,2) Group[1]=(2,2) Group[2]="),

+			new RegexTrial (@"^([a-z]:)", RegexOptions.None, "C:/", "Fail."),

+			new RegexTrial (@"^\S\s+aa$", RegexOptions.Multiline, "\nx aa", "Pass. Group[0]=(1,4)"),

+			new RegexTrial (@"(^|a)b", RegexOptions.None, "ab", "Pass. Group[0]=(0,2) Group[1]=(0,1)"),

+			new RegexTrial (@"^([ab]*?)(b)?(c)$", RegexOptions.None, "abac", "Pass. Group[0]=(0,4) Group[1]=(0,3) Group[2]= Group[3]=(3,1)"),

+			new RegexTrial (@"(\w)?(abc)\1b", RegexOptions.None, "abcab", "Fail."),

+			new RegexTrial (@"^(?:.,){2}c", RegexOptions.None, "a,b,c", "Pass. Group[0]=(0,5)"),

+			new RegexTrial (@"^(.,){2}c", RegexOptions.None, "a,b,c", "Pass. Group[0]=(0,5) Group[1]=(0,2)(2,2)"),

+			new RegexTrial (@"^(?:[^,]*,){2}c", RegexOptions.None, "a,b,c", "Pass. Group[0]=(0,5)"),

+			new RegexTrial (@"^([^,]*,){2}c", RegexOptions.None, "a,b,c", "Pass. Group[0]=(0,5) Group[1]=(0,2)(2,2)"),

+			new RegexTrial (@"^([^,]*,){3}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]*,){3,}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]*,){0,3}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]{1,3},){3}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]{1,3},){3,}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]{1,3},){0,3}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]{1,},){3}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]{1,},){3,}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]{1,},){0,3}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]{0,3},){3}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]{0,3},){3,}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"^([^,]{0,3},){0,3}d", RegexOptions.None, "aaa,b,c,d", "Pass. Group[0]=(0,9) Group[1]=(0,4)(4,2)(6,2)"),

+			new RegexTrial (@"(?i)", RegexOptions.None, "", "Pass. Group[0]=(0,0)"),

+			new RegexTrial (@"(?!\A)x", RegexOptions.Multiline, "a\nxb\n", "Pass. Group[0]=(2,1)"),

+			new RegexTrial (@"^(a(b)?)+$", RegexOptions.None, "aba", "Pass. Group[0]=(0,3) Group[1]=(0,2)(2,1) Group[2]=(1,1)"),

+			new RegexTrial (@"^(aa(bb)?)+$", RegexOptions.None, "aabbaa", "Pass. Group[0]=(0,6) Group[1]=(0,4)(4,2) Group[2]=(2,2)"),

+			new RegexTrial (@"^.{9}abc.*\n", RegexOptions.Multiline, "123\nabcabcabcabc\n", "Pass. Group[0]=(4,13)"),

+			new RegexTrial (@"^(a)?a$", RegexOptions.None, "a", "Pass. Group[0]=(0,1) Group[1]="),

+			new RegexTrial (@"^(a)?(?(1)a|b)+$", RegexOptions.None, "a", "Fail."),

+			new RegexTrial (@"^(a\1?)(a\1?)(a\2?)(a\3?)$", RegexOptions.None, "aaaaaa", "Pass. Group[0]=(0,6) Group[1]=(0,1) Group[2]=(1,2) Group[3]=(3,1) Group[4]=(4,2)"),

+			new RegexTrial (@"^(a\1?){4}$", RegexOptions.None, "aaaaaa", "Pass. Group[0]=(0,6) Group[1]=(0,1)(1,2)(3,1)(4,2)"),

+			new RegexTrial (@"^(0+)?(?:x(1))?", RegexOptions.None, "x1", "Pass. Group[0]=(0,2) Group[1]= Group[2]=(1,1)"),

+			new RegexTrial (@"^([0-9a-fA-F]+)(?:x([0-9a-fA-F]+)?)(?:x([0-9a-fA-F]+))?", RegexOptions.None, "012cxx0190", "Pass. Group[0]=(0,10) Group[1]=(0,4) Group[2]= Group[3]=(6,4)"),

+			new RegexTrial (@"^(b+?|a){1,2}c", RegexOptions.None, "bbbac", "Pass. Group[0]=(0,5) Group[1]=(0,3)(3,1)"),

+			new RegexTrial (@"^(b+?|a){1,2}c", RegexOptions.None, "bbbbac", "Pass. Group[0]=(0,6) Group[1]=(0,4)(4,1)"),

+			new RegexTrial (@"\((\w\. \w+)\)", RegexOptions.None, "cd. (A. Tw)", "Pass. Group[0]=(4,7) Group[1]=(5,5)"),

+			new RegexTrial (@"((?:aaaa|bbbb)cccc)?", RegexOptions.None, "aaaacccc", "Pass. Group[0]=(0,8) Group[1]=(0,8)"),

+			new RegexTrial (@"((?:aaaa|bbbb)cccc)?", RegexOptions.None, "bbbbcccc", "Pass. Group[0]=(0,8) Group[1]=(0,8)")

+		};

+	}

+}

diff --git a/mcs/class/System/Test/System.Text.RegularExpressions/RegexTrial.cs b/mcs/class/System/Test/System.Text.RegularExpressions/RegexTrial.cs
new file mode 100644
index 00000000000..73fc6876f09
--- /dev/null
+++ b/mcs/class/System/Test/System.Text.RegularExpressions/RegexTrial.cs
@@ -0,0 +1,98 @@
+using System;
+using System.Text.RegularExpressions;
+
+namespace MonoTests.System.Text.RegularExpressions {
+
+	class RegexTrial {
+		public string pattern;
+		public RegexOptions options;
+		public string input;
+
+		public string expected;
+
+		public RegexTrial (string pattern, RegexOptions options, string input, string expected) {
+			this.pattern = pattern;
+			this.options = options;
+			this.input = input;
+			this.expected = expected;
+		}
+
+		public string Expected {
+			get { return expected; }
+		}
+
+		public string Execute () {
+			string result;
+			try {
+				Regex re = new Regex (pattern, options);
+				Match m = re.Match (input);
+
+				if (m.Success) {
+					result = "Pass.";
+
+					for (int i = 0; i < m.Groups.Count; ++ i) {
+						Group group = m.Groups[i];
+						
+						result += " Group[" + i + "]=";
+						foreach (Capture cap in group.Captures) {
+							result += "(" + cap.Index + "," + cap.Length + ")";
+						}
+					}
+				}
+				else
+					result = "Fail.";
+			}
+			catch (Exception) {
+				result = "Error.";
+			}
+
+			return result;
+		}
+
+		public override string ToString () {
+			return
+				"Matching input '" + input +
+				"' against pattern '" + pattern +
+				"' with options '" + options + "'.";
+		}
+	}
+
+	class Checksum {
+		public Checksum () {
+			this.sum = 0;
+		}
+
+		public uint Value {
+			get { return sum; }
+		}
+
+		public void Add (string str) {
+			for (int i = 0; i < str.Length; ++ i)
+				Add (str[i], 16);
+		}
+
+		public void Add (uint n) {
+			Add (n, 32);
+		}
+
+		public void Add (ulong n, int bits) {
+			ulong mask = 1ul << (bits - 1);
+			for (int i = 0; i < bits; ++ i) {
+				Add ((n & mask) != 0);
+				mask >>= 1;
+			}
+		}
+
+		public void Add (bool bit) {
+			bool top = (sum & 0x80000000) != 0;
+			sum <<= 1;
+			sum ^= bit ? (uint)1 : (uint)0;
+
+			if (top)
+				sum ^= key;
+		}
+
+		private uint sum;
+		private readonly uint key = 0x04c11db7;
+	}
+}
diff --git a/mcs/class/System/Test/System/AllTests.cs b/mcs/class/System/Test/System/AllTests.cs
new file mode 100644
index 00000000000..9a4718fbda6
--- /dev/null
+++ b/mcs/class/System/Test/System/AllTests.cs
@@ -0,0 +1,29 @@
+//

+// MonoTests.System.AllTests, System.dll

+//

+// Author:

+//   Lawrence Pit <loz@cable.a2000nl>

+//

+

+using NUnit.Framework;

+using System;

+

+namespace MonoTests.System  {

+	

+	public class AllTests : TestCase {

+

+		public AllTests (string name) : base (name)

+		{

+		}

+

+		public static ITest Suite {

+			get {

+				TestSuite suite = new TestSuite ();

+				suite.AddTest (UriTest.Suite);

+				suite.AddTest (UriBuilderTest.Suite);

+				return suite;

+			}

+		}

+	}

+}

+

diff --git a/mcs/class/System/Test/System/ChangeLog b/mcs/class/System/Test/System/ChangeLog
new file mode 100644
index 00000000000..1a02de68c3d
--- /dev/null
+++ b/mcs/class/System/Test/System/ChangeLog
@@ -0,0 +1,17 @@
+2002-05-28  Lawrence Pit <loz@cable.a2000.nl>
+
+	* UriTest.cs: added tests ctor UriTest (baseUri, relativeUri)
+
+2002-05-22  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Added UriTest.MakeRelative
+
+2002-05-12  Lawrence Pit <loz@cable.a2000.nl>
+
+	* Added UriTest.TestLocalPath
+	
+2002-05-05  Lawrence Pit <loz@cable.a2000.nl>
+
+	* UriTest.cs: added
+	* UriBuilderTest.cs: added
+	* AllTests.cs: added
diff --git a/mcs/class/System/Test/System/UriBuilderTest.cs b/mcs/class/System/Test/System/UriBuilderTest.cs
new file mode 100644
index 00000000000..53c9a8970c7
--- /dev/null
+++ b/mcs/class/System/Test/System/UriBuilderTest.cs
@@ -0,0 +1,147 @@
+//

+// UriBuilderTest.cs - NUnit Test Cases for System.UriBuilder

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+

+namespace MonoTests.System

+{

+

+	public class UriBuilderTest : TestCase

+	{

+		private UriBuilder b, b2, b3;

+		

+		public UriBuilderTest () :

+			base ("[MonoTests.System.UriBuilderTest]") {}

+

+		public UriBuilderTest (string name) : base (name) {}

+

+		protected override void SetUp () 

+		{

+			b = new UriBuilder ("http://", "www.ximian.com", 80, "foo/bar/index.html");

+		}

+

+		protected override void TearDown () {}

+

+		public static ITest Suite

+		{

+			get {

+				return new TestSuite (typeof (UriBuilderTest));

+			}

+		}

+		

+		public void TestConstructors ()

+		{

+			b = new UriBuilder ();

+			AssertEquals ("#1", "http", b.Scheme);

+			AssertEquals ("#2", "loopback", b.Host);

+			AssertEquals ("#3", -1, b.Port);

+			

+			try {

+				b = new UriBuilder ("http://", "www.ximian.com", 80, "foo/bar/index.html", "extras");

+				Fail ("#4 should have thrown an ArgumentException because extraValue must start with '?' or '#' character.");

+			} catch (ArgumentException) {}

+			

+			b = new UriBuilder ("http://", "www.ximian.com", 80, "foo/bar/index.html", "#extras");

+		}

+		

+		public void TestUserInfo ()

+		{			

+			b = new UriBuilder ("mailto://myname:mypwd@contoso.com?subject=hello");

+			AssertEquals ("#1", "myname", b.UserName);

+			AssertEquals ("#2", "mypwd", b.Password);

+			

+			b = new UriBuilder ("mailto:", "contoso.com");

+			b.UserName = "myname";

+			b.Password = "mypwd";

+			AssertEquals ("#3: known to fail with ms.net.", "myname:mypwd", b.Uri.UserInfo);

+		}

+

+		public void TestPath ()

+		{			

+			b.Path = ((char) 0xa9) + " 2002";

+			AssertEquals ("#1: known to fail with ms.net, should at least return a slash.", "/%A9%202002", b.Path);			

+		}	

+		

+		public void TestPort ()

+		{

+			try {

+				b.Port = -12345;

+				Fail ("#1 should've failed, illegal port.");

+			} catch (ArgumentOutOfRangeException) {}

+			try {

+				b.Port = 123456789;

+				Fail ("#2 should've failed, illegal port.");

+			} catch (ArgumentOutOfRangeException) {}

+			try {

+				b.Port = -1;

+				AssertEquals ("#3", -1, b.Port);

+			} catch (ArgumentOutOfRangeException) {

+				Fail ("#4: spec should allow -1 as value.");

+			}

+		}

+		

+		public void TestQuery ()

+		{

+			b.Query = ((char) 0xa9) + " 2002";

+			AssertEquals ("#1: known to fail with ms.net, should've been escaped.", "?%A9%202002", b.Query);			

+			AssertEquals ("#2", String.Empty, b.Fragment);

+			b.Query = "?test";

+			AssertEquals ("#3", "??test", b.Query);

+			b.Query = null;

+			AssertEquals ("#4", String.Empty, b.Query);

+		}

+		

+		public void TestFragment ()

+		{

+			b.Fragment = ((char) 0xa9) + " 2002";

+			AssertEquals ("#1: known to fail with ms.net, should've been escaped.", "#%A9%202002", b.Fragment);

+			AssertEquals ("#2", String.Empty, b.Query);

+			b.Fragment = "#test";

+			AssertEquals ("#3", "##test", b.Fragment);

+			b.Fragment = null;

+			AssertEquals ("#4", String.Empty, b.Fragment);

+		}

+		

+		public void TestScheme ()

+		{

+			b.Scheme = "http";

+			AssertEquals ("#1", b.Scheme, "http");

+			b.Scheme = "http:";

+			AssertEquals ("#2", b.Scheme, "http");

+			b.Scheme = "http://";

+			AssertEquals ("#3", b.Scheme, "http");

+			b.Scheme = "http://foo/bar";

+			AssertEquals ("#4", b.Scheme, "http");

+			b.Scheme = "mailto:";

+			AssertEquals ("#5", b.Scheme, "mailto");

+			b.Scheme = "unknown";

+			AssertEquals ("#6", b.Scheme, "unknown");

+			b.Scheme = "unknown://";

+			AssertEquals ("#7", b.Scheme, "unknown");

+		}

+		

+		public void TestEquals ()

+		{

+			b = new UriBuilder ("http://", "www.ximian.com", 80, "foo/bar/index.html?item=1");

+			b2 = new UriBuilder ("http", "www.ximian.com", 80, "/foo/bar/index.html", "?item=1");

+			b3 = new UriBuilder (new Uri ("http://www.ximian.com/foo/bar/index.html?item=1"));

+			

+			Assert ("#1", b.Equals (b2));

+			Assert ("#2", b.Uri.Equals (b2.Uri));

+			Assert ("#3", b.Equals (b3));

+			Assert ("#4", b2.Equals (b3));

+			Assert ("#5", b3.Equals (b));

+		}

+		

+		public void TestToString ()

+		{

+			AssertEquals ("#1 known to fail with ms.net, should've been canonicalized.", b.Uri.ToString (), b.ToString ());

+		}

+	}

+}

+

diff --git a/mcs/class/System/Test/System/UriTest.cs b/mcs/class/System/Test/System/UriTest.cs
new file mode 100644
index 00000000000..a70407d5796
--- /dev/null
+++ b/mcs/class/System/Test/System/UriTest.cs
@@ -0,0 +1,537 @@
+//

+// UriTest.cs - NUnit Test Cases for System.Uri

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.IO;

+

+namespace MonoTests.System

+{

+

+	public class UriTest : TestCase

+	{

+		public UriTest () :

+			base ("[MonoTests.System.UriTest]") {}

+

+		public UriTest (string name) : base (name) {}

+

+		protected override void SetUp () {}

+

+		protected override void TearDown () {}

+

+		public static ITest Suite

+		{

+			get {

+				return new TestSuite (typeof (UriTest));

+			}

+		}

+		

+		public void TestConstructors ()

+		{

+			Uri uri = null;

+			

+			/*

+			uri = new Uri ("http://www.ximian.com/foo" + ((char) 0xa9) + "/bar/index.cgi?a=1&b=" + ((char) 0xa9) + "left#fragm?ent2");

+			Print (uri);

+

+			uri = new Uri ("http://www.ximian.com/foo/xxx\"()-._;<=>@{|}~-,.`_^]\\[xx/" + ((char) 0xa9) + "/bar/index.cgi#fra+\">=@[gg]~gment2");

+			Print (uri);

+

+			uri = new Uri("http://11.22.33.588:9090");

+			Print (uri);

+

+			uri = new Uri("http://[11:22:33::88]:9090");

+			Print (uri);

+			

+			uri = new Uri("http://[::127.11.22.33]:8080");

+			Print (uri);

+			

+			uri = new Uri("http://[abcde::127.11.22.33]:8080");

+			Print (uri);			

+			*/

+			

+			/*

+			uri = new Uri ("http://www.contoso.com:1234/foo/bar/");

+			Print (uri);

+

+			uri = new Uri ("http://www.contoso.com:1234/foo/bar");

+			Print (uri);

+			

+			uri = new Uri ("http://www.contoso.com:1234/");

+			Print (uri);

+

+			uri = new Uri ("http://www.contoso.com:1234");

+			Print (uri);

+			*/

+			

+			uri = new Uri ("http://contoso.com?subject=uri");

+			AssertEquals ("#k1", "/", uri.AbsolutePath);

+			AssertEquals ("#k2", "http://contoso.com/?subject=uri", uri.AbsoluteUri);

+			AssertEquals ("#k3", "contoso.com", uri.Authority);

+			AssertEquals ("#k4", "", uri.Fragment);

+			AssertEquals ("#k5", "contoso.com", uri.Host);

+			AssertEquals ("#k6", UriHostNameType.Dns, uri.HostNameType);

+			AssertEquals ("#k7", true, uri.IsDefaultPort);

+			AssertEquals ("#k8", false, uri.IsFile);

+			AssertEquals ("#k9", false, uri.IsLoopback);

+			AssertEquals ("#k10", false, uri.IsUnc);

+			AssertEquals ("#k11", "/", uri.LocalPath);

+			AssertEquals ("#k12", "/?subject=uri", uri.PathAndQuery);

+			AssertEquals ("#k13", 80, uri.Port);

+			AssertEquals ("#k14", "?subject=uri", uri.Query);

+			AssertEquals ("#k15", "http", uri.Scheme);

+			AssertEquals ("#k16", false, uri.UserEscaped);

+			AssertEquals ("#k17", "", uri.UserInfo);

+

+			uri = new Uri ("mailto:user:pwd@contoso.com?subject=uri");

+			AssertEquals ("#m1", "", uri.AbsolutePath);

+			AssertEquals ("#m2", "mailto:user:pwd@contoso.com?subject=uri", uri.AbsoluteUri);

+			AssertEquals ("#m3", "contoso.com", uri.Authority);

+			AssertEquals ("#m4", "", uri.Fragment);

+			AssertEquals ("#m5", "contoso.com", uri.Host);

+			AssertEquals ("#m6", UriHostNameType.Dns, uri.HostNameType);

+			AssertEquals ("#m7", true, uri.IsDefaultPort);

+			AssertEquals ("#m8", false, uri.IsFile);

+			AssertEquals ("#m9", false, uri.IsLoopback);

+			AssertEquals ("#m10", false, uri.IsUnc);

+			AssertEquals ("#m11", "", uri.LocalPath);

+			AssertEquals ("#m12", "?subject=uri", uri.PathAndQuery);

+			AssertEquals ("#m13", 25, uri.Port);

+			AssertEquals ("#m14", "?subject=uri", uri.Query);

+			AssertEquals ("#m15", "mailto", uri.Scheme);

+			AssertEquals ("#m16", false, uri.UserEscaped);

+			AssertEquals ("#m17", "user:pwd", uri.UserInfo);

+			

+			uri = new Uri (@"\\myserver\mydir\mysubdir\myfile.ext");

+			AssertEquals ("#n1", "/mydir/mysubdir/myfile.ext", uri.AbsolutePath);

+			AssertEquals ("#n2", "file://myserver/mydir/mysubdir/myfile.ext", uri.AbsoluteUri);

+			AssertEquals ("#n3", "myserver", uri.Authority);

+			AssertEquals ("#n4", "", uri.Fragment);

+			AssertEquals ("#n5", "myserver", uri.Host);

+			AssertEquals ("#n6", UriHostNameType.Dns, uri.HostNameType);

+			AssertEquals ("#n7", true, uri.IsDefaultPort);

+			AssertEquals ("#n8", true, uri.IsFile);

+			AssertEquals ("#n9", false, uri.IsLoopback);

+			AssertEquals ("#n10", true, uri.IsUnc);

+			AssertEquals ("#n11", @"\\myserver\mydir\mysubdir\myfile.ext", uri.LocalPath);

+			AssertEquals ("#n12", "/mydir/mysubdir/myfile.ext", uri.PathAndQuery);

+			AssertEquals ("#n13", -1, uri.Port);

+			AssertEquals ("#n14", "", uri.Query);

+			AssertEquals ("#n15", "file", uri.Scheme);

+			AssertEquals ("#n16", false, uri.UserEscaped);

+			AssertEquals ("#n17", "", uri.UserInfo);

+			

+			uri = new Uri (new Uri("http://www.contoso.com"), "Hello World.htm", true);

+			AssertEquals ("#rel1a", "http://www.contoso.com/Hello World.htm", uri.AbsoluteUri);

+			AssertEquals ("#rel1b", true, uri.UserEscaped);

+			uri = new Uri (new Uri("http://www.contoso.com"), "Hello World.htm", false);

+			AssertEquals ("#rel2a", "http://www.contoso.com/Hello%20World.htm", uri.AbsoluteUri);

+			AssertEquals ("#rel2b", false, uri.UserEscaped);

+			uri = new Uri (new Uri("http://www.contoso.com"), "http://www.xxx.com/Hello World.htm", false);

+			AssertEquals ("#rel3", "http://www.xxx.com/Hello%20World.htm", uri.AbsoluteUri);

+			//uri = new Uri (new Uri("http://www.contoso.com"), "foo:8080/bar/Hello World.htm", false);

+			//AssertEquals ("#rel4", "foo:8080/bar/Hello%20World.htm", uri.AbsoluteUri);

+			uri = new Uri (new Uri("http://www.contoso.com"), "foo/bar/Hello World.htm?x=0:8", false);

+			AssertEquals ("#rel5", "http://www.contoso.com/foo/bar/Hello%20World.htm?x=0:8", uri.AbsoluteUri);

+			uri = new Uri (new Uri("http://www.contoso.com/xxx/yyy/index.htm"), "foo/bar/Hello World.htm?x=0:8", false);

+			AssertEquals ("#rel6", "http://www.contoso.com/xxx/yyy/foo/bar/Hello%20World.htm?x=0:8", uri.AbsoluteUri);

+			uri = new Uri (new Uri("http://www.contoso.com/xxx/yyy/index.htm"), "/foo/bar/Hello World.htm?x=0:8", false);

+			AssertEquals ("#rel7", "http://www.contoso.com/foo/bar/Hello%20World.htm?x=0:8", uri.AbsoluteUri);

+			uri = new Uri (new Uri("http://www.contoso.com/xxx/yyy/index.htm"), "../foo/bar/Hello World.htm?x=0:8", false);

+			AssertEquals ("#rel8", "http://www.contoso.com/xxx/foo/bar/Hello%20World.htm?x=0:8", uri.AbsoluteUri);

+			uri = new Uri (new Uri("http://www.contoso.com/xxx/yyy/index.htm"), "../../../foo/bar/Hello World.htm?x=0:8", false);

+			AssertEquals ("#rel9", "http://www.contoso.com/../foo/bar/Hello%20World.htm?x=0:8", uri.AbsoluteUri);

+			uri = new Uri (new Uri("http://www.contoso.com/xxx/yyy/index.htm"), "./foo/bar/Hello World.htm?x=0:8", false);

+			AssertEquals ("#rel10", "http://www.contoso.com/xxx/yyy/foo/bar/Hello%20World.htm?x=0:8", uri.AbsoluteUri);

+

+			try {

+				uri = new Uri (null, "http://www.contoso.com/index.htm", false);

+				Fail ("#rel20");

+			} catch (NullReferenceException) {

+			}

+			try {

+				uri = new Uri (new Uri("http://www.contoso.com"), null, false);

+				Fail ("#rel21");

+			} catch (NullReferenceException) {

+			}

+			try {

+				uri = new Uri (new Uri("http://www.contoso.com/foo/bar/index.html?x=0"), String.Empty, false);

+				AssertEquals("#22", "http://www.contoso.com/foo/bar/index.html?x=0", uri.ToString ());

+			} catch (NullReferenceException) {

+			}			

+			try {

+				uri = new Uri ("http://www.contoso.com:12345678/foo/bar/");

+				Fail ("#30: known to fail with ms.net, should have failed because of invalid port");

+			} catch (UriFormatException) { }

+		}

+		

+		public void TestLocalPath ()

+		{

+			bool isWin32 = (Path.DirectorySeparatorChar == '\\');

+			

+			Uri uri = new Uri ("c:\\tmp\\hello.txt");

+			AssertEquals ("#1a", "file:///c:/tmp/hello.txt", uri.ToString ());

+			AssertEquals ("#1b", "c:\\tmp\\hello.txt", uri.LocalPath);

+			AssertEquals ("#1c", "file", uri.Scheme);

+			AssertEquals ("#1d", "", uri.Host);

+			AssertEquals ("#1e", "c:/tmp/hello.txt", uri.AbsolutePath);

+					

+			uri = new Uri ("file:////////cygwin/tmp/hello.txt");

+			AssertEquals ("#3a", "file://cygwin/tmp/hello.txt", uri.ToString ());

+			if (isWin32)

+				AssertEquals ("#3b win32", "\\\\cygwin\\tmp\\hello.txt", uri.LocalPath);

+			else

+				AssertEquals ("#3b *nix", "//cygwin/tmp/hello.txt", uri.LocalPath);

+			AssertEquals ("#3c", "file", uri.Scheme);

+			AssertEquals ("#3d", "cygwin", uri.Host);

+			AssertEquals ("#3e", "/tmp/hello.txt", uri.AbsolutePath);

+

+			uri = new Uri ("file://mymachine/cygwin/tmp/hello.txt");

+			AssertEquals ("#4a", "file://mymachine/cygwin/tmp/hello.txt", uri.ToString ());

+			if (isWin32)

+				AssertEquals ("#4b win32", "\\\\mymachine\\cygwin\\tmp\\hello.txt", uri.LocalPath);

+			else

+				AssertEquals ("#4b *nix", "//mymachine/cygwin/tmp/hello.txt", uri.LocalPath);

+			AssertEquals ("#4c", "file", uri.Scheme);

+			AssertEquals ("#4d", "mymachine", uri.Host);

+			AssertEquals ("#4e", "/cygwin/tmp/hello.txt", uri.AbsolutePath);

+			

+			uri = new Uri ("file://///c:/cygwin/tmp/hello.txt");

+			AssertEquals ("#5a", "file:///c:/cygwin/tmp/hello.txt", uri.ToString ());

+			AssertEquals ("#5b", "c:\\cygwin\\tmp\\hello.txt", uri.LocalPath);

+			AssertEquals ("#5c", "file", uri.Scheme);

+			AssertEquals ("#5d", "", uri.Host);

+			AssertEquals ("#5e", "c:/cygwin/tmp/hello.txt", uri.AbsolutePath);			

+		}

+		

+		public void TestUnc ()

+		{

+			Uri uri = new Uri ("http://www.contoso.com");

+			Assert ("#1", !uri.IsUnc);

+			

+			uri = new Uri ("news:123456@contoso.com");

+			Assert ("#2", !uri.IsUnc);

+

+			uri = new Uri ("file://server/filename.ext");

+			Assert ("#3", uri.IsUnc);

+

+			try {

+				uri = new Uri ("file:/filename.ext");

+				Assert ("#4", uri.IsUnc);

+			} catch (UriFormatException) {

+				Fail ("#5: known to fail with ms.net");

+			}			

+

+			uri = new Uri (@"\\server\share\filename.ext");			

+			Assert ("#6", uri.IsUnc);

+		}

+		

+		public void TestFromHex () 

+		{

+			AssertEquals ("#1", 0, Uri.FromHex ('0'));

+			AssertEquals ("#2", 9, Uri.FromHex ('9'));

+			AssertEquals ("#3", 10, Uri.FromHex ('a'));

+			AssertEquals ("#4", 15, Uri.FromHex ('f'));

+			AssertEquals ("#5", 10, Uri.FromHex ('A'));

+			AssertEquals ("#6", 15, Uri.FromHex ('F'));

+			try {

+				Uri.FromHex ('G');

+				Fail ("#7");

+			} catch (ArgumentException) {}

+			try {

+				Uri.FromHex (' ');

+				Fail ("#8");

+			} catch (ArgumentException) {}

+			try {

+				Uri.FromHex ('%');

+				Fail ("#8");

+			} catch (ArgumentException) {}

+		}

+

+		public void TestHexEscape () 

+		{

+			AssertEquals ("#1","%20", Uri.HexEscape (' ')); 

+			AssertEquals ("#2","%A9", Uri.HexEscape ((char) 0xa9)); 

+			AssertEquals ("#3","%41", Uri.HexEscape ('A')); 

+			try {

+				Uri.HexEscape ((char) 0x0369);

+				Fail ("#4");

+			} catch (ArgumentOutOfRangeException) {}

+		}

+

+		public void TestHexUnescape () 

+		{

+			int i = 0;

+			AssertEquals ("#1", ' ', Uri.HexUnescape ("%20", ref i));

+			AssertEquals ("#2", 3, i);

+			i = 4;

+			AssertEquals ("#3", (char) 0xa9, Uri.HexUnescape ("test%a9test", ref i));

+			AssertEquals ("#4", 7, i);

+			AssertEquals ("#5", 't', Uri.HexUnescape ("test%a9test", ref i));

+			AssertEquals ("#6", 8, i);

+			i = 4;

+			AssertEquals ("#5", '%', Uri.HexUnescape ("test%a", ref i));

+			AssertEquals ("#6", 5, i);

+			AssertEquals ("#7", '%', Uri.HexUnescape ("testx%xx", ref i));

+			AssertEquals ("#8", 6, i);

+		}

+

+		public void TestIsHexDigit () 

+		{

+			Assert ("#1", Uri.IsHexDigit ('a'));	

+			Assert ("#2", Uri.IsHexDigit ('f'));

+			Assert ("#3", !Uri.IsHexDigit ('g'));

+			Assert ("#4", Uri.IsHexDigit ('0'));

+			Assert ("#5", Uri.IsHexDigit ('9'));

+			Assert ("#6", Uri.IsHexDigit ('A'));

+			Assert ("#7", Uri.IsHexDigit ('F'));

+			Assert ("#8", !Uri.IsHexDigit ('G'));

+		}

+

+		public void TestIsHexEncoding () 

+		{

+			Assert ("#1", Uri.IsHexEncoding ("test%a9test", 4));

+			Assert ("#2", !Uri.IsHexEncoding ("test%a9test", 3));

+			Assert ("#3", Uri.IsHexEncoding ("test%a9", 4));

+			Assert ("#4", !Uri.IsHexEncoding ("test%a", 4));

+		}

+		

+		public void TestGetLeftPart ()

+		{

+			Uri uri = new Uri ("http://www.contoso.com/index.htm#main");

+			AssertEquals ("#1", "http://", uri.GetLeftPart (UriPartial.Scheme));

+			AssertEquals ("#2", "http://www.contoso.com", uri.GetLeftPart (UriPartial.Authority));

+			AssertEquals ("#3", "http://www.contoso.com/index.htm", uri.GetLeftPart (UriPartial.Path));

+			

+			uri = new Uri ("mailto:user@contoso.com?subject=uri");

+			AssertEquals ("#4", "mailto:", uri.GetLeftPart (UriPartial.Scheme));

+			AssertEquals ("#5", "", uri.GetLeftPart (UriPartial.Authority));

+			AssertEquals ("#6", "mailto:user@contoso.com", uri.GetLeftPart (UriPartial.Path));

+

+			uri = new Uri ("nntp://news.contoso.com/123456@contoso.com");

+			AssertEquals ("#7", "nntp://", uri.GetLeftPart (UriPartial.Scheme));

+			AssertEquals ("#8", "nntp://news.contoso.com", uri.GetLeftPart (UriPartial.Authority));

+			AssertEquals ("#9", "nntp://news.contoso.com/123456@contoso.com", uri.GetLeftPart (UriPartial.Path));			

+			

+			uri = new Uri ("news:123456@contoso.com");

+			AssertEquals ("#10", "news:", uri.GetLeftPart (UriPartial.Scheme));

+			AssertEquals ("#11", "", uri.GetLeftPart (UriPartial.Authority));

+			AssertEquals ("#12", "news:123456@contoso.com", uri.GetLeftPart (UriPartial.Path));			

+

+			uri = new Uri ("file://server/filename.ext");

+			AssertEquals ("#13", "file://", uri.GetLeftPart (UriPartial.Scheme));

+			AssertEquals ("#14", "file://server", uri.GetLeftPart (UriPartial.Authority));

+			AssertEquals ("#15", "file://server/filename.ext", uri.GetLeftPart (UriPartial.Path));			

+

+			try {

+				uri = new Uri ("file:/filename.ext");

+				AssertEquals ("#16", "file://", uri.GetLeftPart (UriPartial.Scheme));

+				AssertEquals ("#17", "", uri.GetLeftPart (UriPartial.Authority));

+				AssertEquals ("#18", "file:///filename.ext", uri.GetLeftPart (UriPartial.Path));			

+			} catch (UriFormatException) {

+				Fail ("#19: known to fail with ms.net (it's their own example!)");

+			}			

+

+			uri = new Uri (@"\\server\share\filename.ext");

+			AssertEquals ("#20", "file://", uri.GetLeftPart (UriPartial.Scheme));

+			AssertEquals ("#21", "file://server", uri.GetLeftPart (UriPartial.Authority));

+			AssertEquals ("#22", "file://server/share/filename.ext", uri.GetLeftPart (UriPartial.Path));

+			

+			uri = new Uri ("http://www.contoso.com:8080/index.htm#main");

+			AssertEquals ("#23", "http://", uri.GetLeftPart (UriPartial.Scheme));

+			AssertEquals ("#24", "http://www.contoso.com:8080", uri.GetLeftPart (UriPartial.Authority));

+			AssertEquals ("#25", "http://www.contoso.com:8080/index.htm", uri.GetLeftPart (UriPartial.Path));

+		}

+		

+		public void TestCheckHostName ()

+		{

+			AssertEquals ("#1", UriHostNameType.Unknown, Uri.CheckHostName (null));

+			AssertEquals ("#2", UriHostNameType.Unknown, Uri.CheckHostName (""));

+			AssertEquals ("#3", UriHostNameType.Unknown, Uri.CheckHostName ("^&()~`!@"));

+			AssertEquals ("#4", UriHostNameType.Dns, Uri.CheckHostName ("x"));

+			AssertEquals ("#5", UriHostNameType.IPv4, Uri.CheckHostName ("1.2.3.4"));

+			AssertEquals ("#6", UriHostNameType.IPv4, Uri.CheckHostName ("0001.002.03.4"));

+			AssertEquals ("#7", UriHostNameType.Dns, Uri.CheckHostName ("0001.002.03.256"));

+			AssertEquals ("#8", UriHostNameType.Dns, Uri.CheckHostName ("9001.002.03.4"));

+			AssertEquals ("#9", UriHostNameType.Dns, Uri.CheckHostName ("www.contoso.com"));

+			AssertEquals ("#10", UriHostNameType.Unknown, Uri.CheckHostName (".www.contoso.com"));

+			AssertEquals ("#11: known to fail with ms.net: this is not a valid domain address", UriHostNameType.Unknown, Uri.CheckHostName ("www.contoso.com."));	

+			AssertEquals ("#12", UriHostNameType.Dns, Uri.CheckHostName ("www.con-toso.com"));	

+			AssertEquals ("#13", UriHostNameType.Dns, Uri.CheckHostName ("www.con_toso.com"));	

+			AssertEquals ("#14", UriHostNameType.Unknown, Uri.CheckHostName ("www.con,toso.com"));	

+			

+			// test IPv6

+			AssertEquals ("#15", UriHostNameType.IPv6, Uri.CheckHostName ("11:22:33:44:55:66:77:88"));

+			AssertEquals ("#16", UriHostNameType.IPv6, Uri.CheckHostName ("11::33:44:55:66:77:88"));

+			AssertEquals ("#17", UriHostNameType.IPv6, Uri.CheckHostName ("::22:33:44:55:66:77:88"));

+			AssertEquals ("#18", UriHostNameType.IPv6, Uri.CheckHostName ("11:22:33:44:55:66:77::"));

+			AssertEquals ("#19", UriHostNameType.IPv6, Uri.CheckHostName ("11::88"));

+			AssertEquals ("#20", UriHostNameType.IPv6, Uri.CheckHostName ("11::77:88"));

+			AssertEquals ("#21", UriHostNameType.IPv6, Uri.CheckHostName ("11:22::88"));

+			AssertEquals ("#22", UriHostNameType.IPv6, Uri.CheckHostName ("11::"));

+			AssertEquals ("#23", UriHostNameType.IPv6, Uri.CheckHostName ("::88"));

+			AssertEquals ("#24", UriHostNameType.IPv6, Uri.CheckHostName ("::1"));

+			AssertEquals ("#25", UriHostNameType.IPv6, Uri.CheckHostName ("::"));

+			AssertEquals ("#26", UriHostNameType.IPv6, Uri.CheckHostName ("0:0:0:0:0:0:127.0.0.1"));

+			AssertEquals ("#27", UriHostNameType.IPv6, Uri.CheckHostName ("::127.0.0.1"));

+			AssertEquals ("#28", UriHostNameType.IPv6, Uri.CheckHostName ("::ffFF:169.32.14.5"));

+			AssertEquals ("#29", UriHostNameType.IPv6, Uri.CheckHostName ("2001:03A0::/35"));

+			AssertEquals ("#30", UriHostNameType.IPv6, Uri.CheckHostName ("[2001:03A0::/35]"));

+

+			AssertEquals ("#31", UriHostNameType.Unknown, Uri.CheckHostName ("2001::03A0::/35"));

+			AssertEquals ("#32", UriHostNameType.Unknown, Uri.CheckHostName ("2001:03A0::/35a"));

+			AssertEquals ("#33 known to fail with ms.net: this is not a valid IPv6 address.", UriHostNameType.Unknown, Uri.CheckHostName ("2001::03A0:1.2.3.4"));

+			AssertEquals ("#34", UriHostNameType.Unknown, Uri.CheckHostName ("::ffff:123.256.155.43"));

+			AssertEquals ("#35", UriHostNameType.Unknown, Uri.CheckHostName (":127.0.0.1"));

+			AssertEquals ("#36 known to fail with ms.net: this is not a valid IPv6 address.", UriHostNameType.Unknown, Uri.CheckHostName (":11:22:33:44:55:66:77:88"));

+			AssertEquals ("#37", UriHostNameType.Unknown, Uri.CheckHostName ("::11:22:33:44:55:66:77:88"));

+			AssertEquals ("#38", UriHostNameType.Unknown, Uri.CheckHostName ("11:22:33:44:55:66:77:88::"));

+			AssertEquals ("#39", UriHostNameType.Unknown, Uri.CheckHostName ("11:22:33:44:55:66:77:88:"));

+			AssertEquals ("#40", UriHostNameType.Unknown, Uri.CheckHostName ("::acbde"));

+			AssertEquals ("#41", UriHostNameType.Unknown, Uri.CheckHostName ("::abce:"));

+			AssertEquals ("#42", UriHostNameType.Unknown, Uri.CheckHostName ("::abcg"));

+			AssertEquals ("#43", UriHostNameType.Unknown, Uri.CheckHostName (":::"));

+			AssertEquals ("#44", UriHostNameType.Unknown, Uri.CheckHostName (":"));

+		}

+		

+		public void TestIsLoopback ()

+		{

+			Uri uri = new Uri("http://loopback:8080");

+			AssertEquals ("#1", true, uri.IsLoopback);

+			uri = new Uri("http://localhost:8080");

+			AssertEquals ("#2", true, uri.IsLoopback);

+			uri = new Uri("http://127.0.0.1:8080");

+			AssertEquals ("#3", true, uri.IsLoopback);

+			uri = new Uri("http://127.0.0.001:8080");

+			AssertEquals ("#4", true, uri.IsLoopback);

+			uri = new Uri("http://[::1]");

+			AssertEquals ("#5", true, uri.IsLoopback);

+			uri = new Uri("http://[::1]:8080");

+			AssertEquals ("#6", true, uri.IsLoopback);

+			uri = new Uri("http://[::0001]:8080");

+			AssertEquals ("#7", true, uri.IsLoopback);

+			uri = new Uri("http://[0:0:0:0::1]:8080");

+			AssertEquals ("#8", true, uri.IsLoopback);

+			uri = new Uri("http://[0:0:0:0::127.0.0.1]:8080");

+			AssertEquals ("#9", true, uri.IsLoopback);

+			uri = new Uri("http://[0:0:0:0::127.11.22.33]:8080");

+			AssertEquals ("#10: known to fail with ms.net", true, uri.IsLoopback);

+			uri = new Uri("http://[::ffff:127.11.22.33]:8080");

+			AssertEquals ("#11: known to fail with ms.net", true, uri.IsLoopback);

+			uri = new Uri("http://[::ff00:7f11:2233]:8080");

+			AssertEquals ("#12", false, uri.IsLoopback);

+			uri = new Uri("http://[1:0:0:0::1]:8080");

+			AssertEquals ("#13", false, uri.IsLoopback);

+		}

+		

+		public void TestEquals ()

+		{

+			Uri uri1 = new Uri ("http://www.contoso.com/index.htm#main");

+			Uri uri2 = new Uri ("http://www.contoso.com/index.htm#fragment");

+			Assert ("#1", uri1.Equals (uri2));

+			uri2 = new Uri ("http://www.contoso.com/index.htm?x=1");

+			Assert ("#2 known to fail with ms.net", !uri1.Equals (uri2));

+			Assert ("#3", !uri2.Equals ("http://www.contoso.com/index.html?x=1"));

+			Assert ("#4: known to fail with ms.net", !uri1.Equals ("http://www.contoso.com:8080/index.htm?x=1"));

+		}

+		

+		public void TestGetHashCode () 

+		{

+			Uri uri1 = new Uri ("http://www.contoso.com/index.htm#main");

+			Uri uri2 = new Uri ("http://www.contoso.com/index.htm#fragment");

+			AssertEquals ("#1", uri1.GetHashCode (), uri2.GetHashCode ());

+			uri2 = new Uri ("http://www.contoso.com/index.htm?x=1");

+			Assert ("#2", uri1.GetHashCode () != uri2.GetHashCode ());

+			uri2 = new Uri ("http://www.contoso.com:80/index.htm");

+			AssertEquals ("#3", uri1.GetHashCode (), uri2.GetHashCode ());			

+			uri2 = new Uri ("http://www.contoso.com:8080/index.htm");

+			Assert ("#4", uri1.GetHashCode () != uri2.GetHashCode ());			

+		}

+		

+		public void TestMakeRelative ()

+		{

+			Uri uri1 = new Uri ("http://www.contoso.com/index.htm?x=2");

+			Uri uri2 = new Uri ("http://www.contoso.com/foo/bar/index.htm#fragment");

+			Uri uri3 = new Uri ("http://www.contoso.com/bar/foo/index.htm?y=1");

+			Uri uri4 = new Uri ("http://www.contoso.com/bar/foo2/index.htm?x=0");

+			Uri uri5 = new Uri ("https://www.contoso.com/bar/foo/index.htm?y=1");

+			Uri uri6 = new Uri ("http://www.contoso2.com/bar/foo/index.htm?x=0");

+			Uri uri7 = new Uri ("http://www.contoso2.com/bar/foo/foobar.htm?z=0&y=5");

+			Uri uri8 = new Uri ("http://www.xxx.com/bar/foo/foobar.htm?z=0&y=5" + (char) 0xa9);

+

+			AssertEquals ("#1", "foo/bar/index.htm", uri1.MakeRelative (uri2));

+			AssertEquals ("#2", "../../index.htm", uri2.MakeRelative (uri1));

+			

+			AssertEquals ("#3", "../../bar/foo/index.htm", uri2.MakeRelative (uri3));

+			AssertEquals ("#4", "../../foo/bar/index.htm", uri3.MakeRelative (uri2));			

+

+			AssertEquals ("#5", "../foo2/index.htm", uri3.MakeRelative (uri4));

+			AssertEquals ("#6", "../foo/index.htm", uri4.MakeRelative (uri3));

+			

+			AssertEquals ("#7", "https://www.contoso.com/bar/foo/index.htm?y=1", 

+				            uri4.MakeRelative (uri5));

+

+			AssertEquals ("#8", "http://www.contoso2.com/bar/foo/index.htm?x=0", 

+					    uri4.MakeRelative (uri6));

+

+			AssertEquals ("#9", "", uri6.MakeRelative (uri6));

+			AssertEquals ("#10", "foobar.htm", uri6.MakeRelative (uri7));

+			

+			Uri uri10 = new Uri ("mailto:xxx@xxx.com");

+			Uri uri11 = new Uri ("mailto:xxx@xxx.com?subject=hola");

+			AssertEquals ("#11", "", uri10.MakeRelative (uri11));

+			

+			Uri uri12 = new Uri ("mailto:xxx@mail.xxx.com?subject=hola");

+			AssertEquals ("#12", "mailto:xxx@mail.xxx.com?subject=hola", uri10.MakeRelative (uri12));

+						

+			Uri uri13 = new Uri ("mailto:xxx@xxx.com/foo/bar");

+			AssertEquals ("#13", "/foo/bar", uri10.MakeRelative (uri13));

+			

+			AssertEquals ("#14", "http://www.xxx.com/bar/foo/foobar.htm?z=0&y=5" + (char) 0xa9, uri1.MakeRelative (uri8));

+		}

+		

+		public void TestToString ()

+		{			

+			Uri uri = new Uri ("dummy://xxx");

+			AssertEquals ("#1", "dummy://xxx/", uri.ToString ());

+		}

+

+		public static void Print (Uri uri)

+		{

+			Console.WriteLine ("ToString: " + uri.ToString ());	

+

+			Console.WriteLine ("AbsolutePath: " + uri.AbsolutePath);

+			Console.WriteLine ("AbsoluteUri: " + uri.AbsoluteUri);

+			Console.WriteLine ("Authority: " + uri.Authority);

+			Console.WriteLine ("Fragment: " + uri.Fragment);

+			Console.WriteLine ("Host: " + uri.Host);

+			Console.WriteLine ("HostNameType: " + uri.HostNameType);

+			Console.WriteLine ("IsDefaultPort: " + uri.IsDefaultPort);

+			Console.WriteLine ("IsFile: " + uri.IsFile);

+			Console.WriteLine ("IsLoopback: " + uri.IsLoopback);

+			Console.WriteLine ("IsUnc: " + uri.IsUnc);

+			Console.WriteLine ("LocalPath: " + uri.LocalPath);

+			Console.WriteLine ("PathAndQuery: " + uri.PathAndQuery);

+			Console.WriteLine ("Port: " + uri.Port);

+			Console.WriteLine ("Query: " + uri.Query);

+			Console.WriteLine ("Scheme: " + uri.Scheme);

+			Console.WriteLine ("UserEscaped: " + uri.UserEscaped);

+			Console.WriteLine ("UserInfo: " + uri.UserInfo);

+

+			Console.WriteLine ("Segments:");

+			string [] segments = uri.Segments;

+			if (segments == null) 

+				Console.WriteLine ("\tNo Segments");

+			else 

+				for (int i = 0; i < segments.Length; i++) 

+					Console.WriteLine ("\t" + segments[i]);					

+			Console.WriteLine ("");

+		}

+

+	}

+}

+

diff --git a/mcs/class/System/Test/System_test.build b/mcs/class/System/Test/System_test.build
new file mode 100644
index 00000000000..ba514d19d82
--- /dev/null
+++ b/mcs/class/System/Test/System_test.build
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for System_test.dll -->
+<!-- Target build (default) builds tests -->
+<!-- Target test runs tests -->
+
+<project name="System_test" default="build">
+	<property name="debug" value="false"/>
+	<property name="nunit_home" value="..\..\..\nunit"/>
+
+	<target name="build">
+	</target>
+
+	<target name="assemblies">
+		<csc target="library" output="System_test.dll" debug="${debug}">
+			<sources>
+				<includes name="**/*.cs"/>
+				<excludes name="TheTests.cs"/>
+			</sources>
+			<references basedir="..\..\..\nunit">
+				<includes name="NUnitCore.dll"/>
+			</references>
+
+			<arg value="/noconfig"/>
+			<arg value="/r:.\System.dll"/>
+		</csc>
+
+		<csc target="exe" output="RunTests.System.exe" debug="${debug}">
+			<sources>
+				<includes name="**/*.cs"/>
+				<excludes name="**/AllTests.cs"/>
+				<excludes name="**/MartinTests.cs"/>
+			</sources>
+			<references basedir="..\..\..\nunit">
+				<includes name="NUnitBase.dll"/>
+			</references>
+			<references basedir=".">
+				<includes name="System.dll"/>
+			</references>
+			<arg value="/nowarn:1595"/>
+			<arg value="/noconfig"/>
+			<arg value="/r:.\System.dll"/>
+		</csc>
+
+	</target>
+
+	<target name="test" depends="assemblies">
+		<exec program="..\..\..\nunit\NUnitConsole" commandline="MonoTests.AllTests,System_test.dll" failonerror="false"/>
+	</target>
+
+	<target name="clean">
+		<delete file="System_test.dll" failonerror="false"/>
+	</target>
+</project>
diff --git a/mcs/class/System/Test/TheTests.cs b/mcs/class/System/Test/TheTests.cs
new file mode 100644
index 00000000000..34f596b523d
--- /dev/null
+++ b/mcs/class/System/Test/TheTests.cs
@@ -0,0 +1,74 @@
+using NUnit.Framework;
+using System;
+using System.Threading;
+using System.Globalization;
+
+namespace MonoTests.System
+{
+	public class RunDnsTest : Net.DnsTest
+	{
+		protected override void RunTest ()
+		{
+			TestAsyncGetHostByName ();
+			TestAsyncResolve ();
+			TestGetHostName ();
+			TestGetHostByName ();
+			TestGetHostByAddressString ();
+			TestGetHostByAddressIPAddress ();
+			TestResolve ();
+		}
+	}
+}
+
+namespace MonoTests.System.Collections.Specialized.Collections.Specialized
+{
+	public class RunStringCollectionTest : StringCollectionTest
+	{
+		protected override void RunTest ()
+		{
+			TestSimpleCount ();
+			TestSimpleIsReadOnly ();
+			TestSimpleIsSynchronized ();
+			TestSimpleItemGet ();
+			TestSimpleItemSet ();
+			TestSimpleSyncRoot ();
+			TestSimpleAdd ();
+			TestSimpleAddRange ();
+			TestSimpleClear ();
+			TestSimpleContains ();
+			TestSimpleCopyTo ();
+			TestSimpleGetEnumerator ();
+			TestSimpleIndexOf ();
+			TestSimpleInsert ();
+			TestSimpleRemove ();
+			TestSimpleRemoveAt ();
+		}
+	}
+}
+
+namespace MonoTests
+{
+	public class RunAllTests
+	{
+		public static void AddAllTests (TestSuite suite)
+		{
+			suite.AddTest (new MonoTests.System.RunDnsTest ());
+			suite.AddTest (new MonoTests.System.Collections.Specialized.Collections.Specialized.RunStringCollectionTest ());
+		}
+	}
+}
+
+class MainApp
+{
+	public static void Main()
+	{
+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US");
+
+		TestResult result = new TestResult ();
+		TestSuite suite = new TestSuite ();
+		MonoTests.RunAllTests.AddAllTests (suite);
+		suite.Run (result);
+		MonoTests.MyTestRunner.Print (result);
+	}
+}
+
diff --git a/mcs/class/System/list b/mcs/class/System/list
new file mode 100755
index 00000000000..ae221e5b734
--- /dev/null
+++ b/mcs/class/System/list
@@ -0,0 +1,142 @@
+-r System.Xml --noconfig

+System\TODOAttribute.cs

+System\Uri.cs

+System\UriFormatException.cs

+System\UriHostNameType.cs

+System\UriPartial.cs

+System.Collections.Specialized\BitVector32.cs

+System.Collections.Specialized\ListDictionary.cs

+System.Collections.Specialized\NameObjectCollectionBase.cs

+System.Collections.Specialized\NameValueCollection.cs

+System.Collections.Specialized\StringCollection.cs

+System.Collections.Specialized\StringDictionary.cs

+System.Collections.Specialized\StringEnumerator.cs

+System.ComponentModel\BrowsableAttribute.cs

+System.ComponentModel\CategoryAttribute.cs

+System.ComponentModel\CollectionChangeAction.cs

+System.ComponentModel\CollectionChangeEventArgs.cs

+System.ComponentModel\CollectionChangeEventHandler.cs

+System.ComponentModel\Component.cs

+System.ComponentModel\ComponentCollection.cs

+System.ComponentModel\Container.cs

+System.ComponentModel\DerivedPropertyDescriptor.cs

+System.ComponentModel\DescriptionAttribute.cs

+System.ComponentModel\DesignerSerializationVisibility.cs

+System.ComponentModel\DesignerSerializationVisibilityAttribute.cs

+System.ComponentModel\DesignOnlyAttribute.cs

+System.ComponentModel\EnumConverter.cs

+System.ComponentModel\EventHandlerList.cs

+System.ComponentModel\IBindingList.cs

+System.ComponentModel\IComponent.cs

+System.ComponentModel\IContainer.cs

+System.ComponentModel\IListSource.cs

+System.ComponentModel\ISite.cs

+System.ComponentModel\ISupportInitialize.cs

+System.ComponentModel\ISynchronizeInvoke.cs

+System.ComponentModel\ITypeDescriptorContext.cs

+System.ComponentModel\ITypedList.cs

+System.ComponentModel\ListChangedEventArgs.cs

+System.ComponentModel\ListChangedEventHandler.cs

+System.ComponentModel\ListChangedType.cs

+System.ComponentModel\ListSortDirection.cs

+System.ComponentModel\LocalizableAttribute.cs

+System.ComponentModel\MarshalByValueComponent.cs

+System.ComponentModel\MemberDescriptor.cs

+System.ComponentModel\PropertyChangedEventArgs.cs

+System.ComponentModel\PropertyDescriptor.cs

+System.ComponentModel\PropertyDescriptorCollection.cs

+System.ComponentModel\TypeConverter.cs

+System.ComponentModel\Win32Exception.cs

+System.Configuration\ConfigurationException.cs

+System.Configuration\ConfigurationSettings.cs

+System.Configuration\DictionarySectionHandler.cs

+System.Configuration\IConfigurationSectionHandler.cs

+System.Configuration\IgnoreSectionHandler.cs

+System.Configuration\NameValueSectionHandler.cs

+System.Configuration\SingleTagSectionHandler.cs

+System.Diagnostics\BooleanSwitch.cs

+System.Diagnostics\Debug.cs

+System.Diagnostics\DefaultTraceListener.cs

+System.Diagnostics\DiagnosticsConfigurationHandler.cs

+System.Diagnostics\FileVersionInfo.cs

+System.Diagnostics\Process.cs

+System.Diagnostics\ProcessModule.cs

+System.Diagnostics\ProcessModuleCollection.cs

+System.Diagnostics\ProcessPriorityClass.cs

+System.Diagnostics\ProcessStartInfo.cs

+System.Diagnostics\ProcessThread.cs

+System.Diagnostics\ProcessThreadCollection.cs

+System.Diagnostics\ProcessWindowStyle.cs

+System.Diagnostics\TextWriterTraceListener.cs

+System.Diagnostics\ThreadPriorityLevel.cs

+System.Diagnostics\ThreadState.cs

+System.Diagnostics\ThreadWaitReason.cs

+System.Diagnostics\Trace.cs

+System.Diagnostics\TraceImpl.cs

+System.Diagnostics\TraceLevel.cs

+System.Diagnostics\TraceListenerCollection.cs

+System.Diagnostics\TraceSwitch.cs

+System.Globalization\Locale.cs

+System.Net\Authorization.cs

+System.Net\ConnectionModes.cs

+System.Net\Cookie.cs

+System.Net\CookieCollection.cs

+System.Net\CookieException.cs

+System.Net\Dns.cs

+System.Net\DnsPermission.cs

+System.Net\DnsPermissionAttribute.cs

+System.Net\EndPoint.cs

+System.Net\EndpointPermission.cs

+System.Net\HttpStatusCode.cs

+System.Net\ICredentialLookup.cs

+System.Net\IPAddress.cs

+System.Net\IPEndPoint.cs

+System.Net\IPHostEntry.cs

+System.Net\NetworkAccess.cs

+System.Net\NetworkCredential.cs

+System.Net\ProtocolViolationException.cs

+System.Net\ProxyUseType.cs

+System.Net\SocketAddress.cs

+System.Net\SocketPermission.cs

+System.Net\SocketPermissionAttribute.cs

+System.Net\TransportType.cs

+System.Net\WebExceptionStatus.cs

+System.Net\WebStatus.cs

+System.Net.Sockets\AddressFamily.cs

+System.Net.Sockets\LingerOption.cs

+System.Net.Sockets\MulticastOption.cs

+System.Net.Sockets\NetworkStream.cs

+System.Net.Sockets\ProtocolFamily.cs

+System.Net.Sockets\ProtocolType.cs

+System.Net.Sockets\SelectMode.cs

+System.Net.Sockets\Socket.cs

+System.Net.Sockets\SocketException.cs

+System.Net.Sockets\SocketFlags.cs

+System.Net.Sockets\SocketOptionLevel.cs

+System.Net.Sockets\SocketOptionName.cs

+System.Net.Sockets\SocketShutdown.cs

+System.Net.Sockets\SocketType.cs

+System.Net.Sockets\TcpClient.cs

+System.Net.Sockets\TcpListener.cs

+System.Net.Sockets\UdpClient.cs

+System.Text.RegularExpressions\arch.cs

+System.Text.RegularExpressions\cache.cs

+System.Text.RegularExpressions\category.cs

+System.Text.RegularExpressions\collections.cs

+System.Text.RegularExpressions\compiler.cs

+System.Text.RegularExpressions\debug.cs

+System.Text.RegularExpressions\interpreter.cs

+System.Text.RegularExpressions\interval.cs

+System.Text.RegularExpressions\match.cs

+System.Text.RegularExpressions\parser.cs

+System.Text.RegularExpressions\quicksearch.cs

+System.Text.RegularExpressions\regex.cs

+System.Text.RegularExpressions\RegexRunner.cs

+System.Text.RegularExpressions\RegexRunnerFactory.cs

+System.Text.RegularExpressions\replace.cs

+System.Text.RegularExpressions\syntax.cs

+System.Threading\ThreadExceptionEventArgs.cs

+System.Threading\ThreadExceptionEventHandler.cs

+System.Diagnostics\Switch.cs

+System.Diagnostics\TraceListener.cs

+System.Net\IPv6Address.cs

diff --git a/mcs/class/System/list.unix b/mcs/class/System/list.unix
new file mode 100755
index 00000000000..eb6c68f92f1
--- /dev/null
+++ b/mcs/class/System/list.unix
@@ -0,0 +1,310 @@
+-r mscorlib -r System.Xml -r System.Drawing --noconfig --target library -o System.dll
+System.Collections.Specialized/StringEnumerator.cs
+System.Collections.Specialized/StringDictionary.cs
+System.Collections.Specialized/StringCollection.cs
+System.Collections.Specialized/NameObjectCollectionBase.cs
+System.Collections.Specialized/BitVector32.cs
+System.Collections.Specialized/CollectionsUtil.cs
+System.Collections.Specialized/HybridDictionary.cs
+System.Collections.Specialized/ListDictionary.cs
+System.Collections.Specialized/NameValueCollection.cs
+System.CodeDom/CodeAssignStatement.cs
+System.CodeDom/CodeStatementCollection.cs
+System.CodeDom/CodeAttributeDeclaration.cs
+System.CodeDom/CodeParameterDeclarationExpressionCollection.cs
+System.CodeDom/CodeComment.cs
+System.CodeDom/CodeBinaryOperatorType.cs
+System.CodeDom/CodeBaseReferenceExpression.cs
+System.CodeDom/CodeBinaryOperatorExpression.cs
+System.CodeDom/CodeCompileUnit.cs
+System.CodeDom/CodeTypeConstructor.cs
+System.CodeDom/CodeTypeDeclaration.cs
+System.CodeDom/CodeDirectionExpression.cs
+System.CodeDom/CodeExpressionStatement.cs
+System.CodeDom/CodeDelegateCreateExpression.cs
+System.CodeDom/CodeCommentStatement.cs
+System.CodeDom/CodeTypeDelegate.cs
+System.CodeDom/CodeConditionStatement.cs
+System.CodeDom/CodeTypeReference.cs
+System.CodeDom/CodeDelegateInvokeExpression.cs
+System.CodeDom/CodeEntryPointMethod.cs
+System.CodeDom/CodeIterationStatement.cs
+System.CodeDom/CodeObject.cs
+System.CodeDom/CodeFieldReferenceExpression.cs
+System.CodeDom/CodeMemberEvent.cs
+System.CodeDom/CodeExpression.cs
+System.CodeDom/CodeEventReferenceExpression.cs
+System.CodeDom/CodeMemberField.cs
+System.CodeDom/CodeTypeDeclarationCollection.cs
+System.CodeDom/CodeMemberProperty.cs
+System.CodeDom/CodeGotoStatement.cs
+System.CodeDom/CodeIndexerExpression.cs
+System.CodeDom/CodeTypeMemberCollection.cs
+System.CodeDom/MemberAttributes.cs
+System.CodeDom/CodeMethodInvokeExpression.cs
+System.CodeDom/CodeMethodReferenceExpression.cs
+System.CodeDom/CodePrimitiveExpression.cs
+System.CodeDom/CodeMethodReturnStatement.cs
+System.CodeDom/CodeNamespaceImport.cs
+System.CodeDom/CodeSnippetCompileUnit.cs
+System.CodeDom/CodeNamespaceImportCollection.cs
+System.CodeDom/CodeObjectCreateExpression.cs
+System.CodeDom/CodeParameterDeclarationExpression.cs
+System.CodeDom/CodeTypeReferenceCollection.cs
+System.CodeDom/CodePropertyReferenceExpression.cs
+System.CodeDom/CodePropertySetValueReferenceExpression.cs
+System.CodeDom/CodeRemoveEventStatement.cs
+System.CodeDom/CodeThisReferenceExpression.cs
+System.CodeDom/CodeThrowExceptionStatement.cs
+System.CodeDom/CodeTryCatchFinallyStatement.cs
+System.CodeDom/CodeCastExpression.cs
+System.CodeDom/CodeArgumentReferenceExpression.cs
+System.CodeDom/CodeArrayIndexerExpression.cs
+System.CodeDom/CodeAttributeArgument.cs
+System.CodeDom/CodeAttachEventStatement.cs
+System.CodeDom/CodeLabeledStatement.cs
+System.CodeDom/CodeLinePragma.cs
+System.CodeDom/CodeSnippetExpression.cs
+System.CodeDom/CodeSnippetStatement.cs
+System.CodeDom/CodeSnippetTypeMember.cs
+System.CodeDom/CodeStatement.cs
+System.CodeDom/CodeTypeMember.cs
+System.CodeDom/CodeTypeOfExpression.cs
+System.CodeDom/CodeTypeReferenceExpression.cs
+System.CodeDom/CodeVariableDeclarationStatement.cs
+System.CodeDom/CodeVariableReferenceExpression.cs
+System.CodeDom/FieldDirection.cs
+System.CodeDom/CodeArrayCreateExpression.cs
+System.CodeDom/CodeAttributeArgumentCollection.cs
+System.CodeDom/CodeAttributeDeclarationCollection.cs
+System.CodeDom/CodeCatchClause.cs
+System.CodeDom/CodeCatchClauseCollection.cs
+System.CodeDom/CodeCommentStatementCollection.cs
+System.CodeDom/CodeConstructor.cs
+System.CodeDom/CodeExpressionCollection.cs
+System.CodeDom/CodeMemberMethod.cs
+System.CodeDom/CodeNamespace.cs
+System.CodeDom/CodeNamespaceCollection.cs
+System.CodeDom.Compiler/CodeDomProvider.cs
+System.CodeDom.Compiler/CodeGenerator.cs
+System.CodeDom.Compiler/CodeGeneratorOptions.cs
+System.CodeDom.Compiler/CompilerError.cs
+System.CodeDom.Compiler/CompilerErrorCollection.cs
+System.CodeDom.Compiler/CompilerOptions.cs
+System.CodeDom.Compiler/CompilerParameters.cs
+System.CodeDom.Compiler/CompilerResults.cs
+System.CodeDom.Compiler/GeneratorSupport.cs
+System.CodeDom.Compiler/ICodeCompiler.cs
+System.CodeDom.Compiler/ICodeGenerator.cs
+System.CodeDom.Compiler/ICodeParser.cs
+System.CodeDom.Compiler/IndentedTextWriter.cs
+System.CodeDom.Compiler/LanguageOptions.cs
+System.CodeDom.Compiler/TempFileCollection.cs
+System.Net/CookieContainer.cs
+System.Net/EndPoint.cs
+System.Net/CookieCollection.cs
+System.Net/IPAddress.cs
+System.Net/Cookie.cs
+System.Net/CookieException.cs
+System.Net/HttpStatusCode.cs
+System.Net/NetworkAccess.cs
+System.Net/TransportType.cs
+System.Net/WebExceptionStatus.cs
+System.Net/ConnectionModes.cs
+System.Net/ProxyUseType.cs
+System.Net/WebStatus.cs
+System.Net/IPHostEntry.cs
+System.Net/EndpointPermission.cs
+System.Net/Dns.cs
+System.Net/ProtocolViolationException.cs
+System.Net/IWebProxy.cs
+System.Net/ICredentialLookup.cs
+System.Net/NetworkCredential.cs
+System.Net/SocketPermissionAttribute.cs
+System.Net/DnsPermissionAttribute.cs
+System.Net/Authorization.cs
+System.Net/CredentialCache.cs
+System.Net/HttpContinueDelegate.cs
+System.Net/HttpVersion.cs
+System.Net/ICertificatePolicy.cs
+System.Net/IPv6Address.cs
+System.Net/SocketAddress.cs
+System.Net/IWebRequestCreate.cs
+System.Net/WebException.cs
+System.Net/GlobalProxySelection.cs
+System.Net/WebHeaderCollection.cs
+System.Net/WebRequest.cs
+System.Net/WebResponse.cs
+System.Net/IPEndPoint.cs
+System.Net/FileWebRequest.cs
+System.Net/FileWebResponse.cs
+System.Net/ServicePoint.cs
+System.Net/ServicePointManager.cs
+System.Net/WebClient.cs
+System.Net/WebProxy.cs
+System.Net/DnsPermission.cs
+System.Net/HttpWebRequest.cs
+System.Net/HttpWebResponse.cs
+System.Net/MonoHttpDate.cs
+System.Net/SocketPermission.cs
+System.Net.Sockets/AddressFamily.cs
+System.Net.Sockets/TcpListener.cs
+System.Net.Sockets/TcpClient.cs
+System.Net.Sockets/UdpClient.cs
+System.Net.Sockets/ProtocolType.cs
+System.Net.Sockets/SelectMode.cs
+System.Net.Sockets/SocketException.cs
+System.Net.Sockets/SocketFlags.cs
+System.Net.Sockets/SocketOptionLevel.cs
+System.Net.Sockets/SocketOptionName.cs
+System.Net.Sockets/SocketShutdown.cs
+System.Net.Sockets/SocketType.cs
+System.Net.Sockets/LingerOption.cs
+System.Net.Sockets/MulticastOption.cs
+System.Net.Sockets/Socket.cs
+System.Net.Sockets/ProtocolFamily.cs
+System.Net.Sockets/NetworkStream.cs
+System.ComponentModel/ITypedList.cs
+System.ComponentModel/Component.cs
+System.ComponentModel/ComponentCollection.cs
+System.ComponentModel/DefaultEventAttribute.cs
+System.ComponentModel/DefaultPropertyAttribute.cs
+System.ComponentModel/IContainer.cs
+System.ComponentModel/BindableAttribute.cs
+System.ComponentModel/BindableSupport.cs
+System.ComponentModel/BrowsableAttribute.cs
+System.ComponentModel/DescriptionAttribute.cs
+System.ComponentModel/ExpandableObjectConverter.cs
+System.ComponentModel/IBindingList.cs
+System.ComponentModel/DesignerSerializationVisibility.cs
+System.ComponentModel/PropertyChangedEventArgs.cs
+System.ComponentModel/LocalizableAttribute.cs
+System.ComponentModel/ListChangedEventArgs.cs
+System.ComponentModel/ListChangedEventHandler.cs
+System.ComponentModel/ListChangedType.cs
+System.ComponentModel/ListSortDirection.cs
+System.ComponentModel/NotifyParentPropertyAttribute.cs
+System.ComponentModel/AttributeCollection.cs
+System.ComponentModel/DesignerSerializationVisibilityAttribute.cs
+System.ComponentModel/PropertyDescriptor.cs
+System.ComponentModel/Container.cs
+System.ComponentModel/DesignOnlyAttribute.cs
+System.ComponentModel/EventHandlerList.cs
+System.ComponentModel/MemberDescriptor.cs
+System.ComponentModel/PropertyDescriptorCollection.cs
+System.ComponentModel/RecommendedAsConfigurableAttribute.cs
+System.ComponentModel/ISynchronizeInvoke.cs
+System.ComponentModel/CategoryAttribute.cs
+System.ComponentModel/CollectionChangeAction.cs
+System.ComponentModel/CollectionChangeEventArgs.cs
+System.ComponentModel/CollectionChangeEventHandler.cs
+System.ComponentModel/DerivedPropertyDescriptor.cs
+System.ComponentModel/EnumConverter.cs
+System.ComponentModel/IListSource.cs
+System.ComponentModel/ISupportInitialize.cs
+System.ComponentModel/ICustomTypeDescriptor.cs
+System.ComponentModel/IDataErrorInfo.cs
+System.ComponentModel/IEditableObject.cs
+System.ComponentModel/EventDescriptor.cs
+System.ComponentModel/DefaultValueAttribute.cs
+System.ComponentModel/EditorBrowsableAttribute.cs
+System.ComponentModel/EditorBrowsableState.cs
+System.ComponentModel/EventDescriptorCollection.cs
+System.ComponentModel/IComponent.cs
+System.ComponentModel/ISite.cs
+System.ComponentModel/MarshalByValueComponent.cs
+System.ComponentModel/ReadOnlyAttribute.cs
+System.ComponentModel/Win32Exception.cs
+System.ComponentModel/ITypeDescriptorContext.cs
+System.ComponentModel/ToolboxItemAttribute.cs
+System.ComponentModel/TypeConverter.cs
+System.ComponentModel/TypeConverterAttribute.cs
+System.ComponentModel/TypeDescriptor.cs
+System.ComponentModel/RefreshEventHandler.cs
+System.ComponentModel/RefreshEventArgs.cs
+System.ComponentModel/StringConverter.cs
+System/UriPartial.cs
+System/TODOAttribute.cs
+System/UriFormatException.cs
+System/UriBuilder.cs
+System/UriHostNameType.cs
+System/Uri.cs
+System.Configuration/IConfigurationSectionHandler.cs
+System.Configuration/IgnoreSectionHandler.cs
+System.Configuration/NameValueSectionHandler.cs
+System.Configuration/ConfigurationException.cs
+System.Configuration/ConfigurationSettings.cs
+System.Configuration/DictionarySectionHandler.cs
+System.Configuration/SingleTagSectionHandler.cs
+System.Diagnostics/BooleanSwitch.cs
+System.Diagnostics/Switch.cs
+System.Diagnostics/TraceLevel.cs
+System.Diagnostics/EntryWrittenEventArgs.cs
+System.Diagnostics/TraceSwitch.cs
+System.Diagnostics/Debug.cs
+System.Diagnostics/DiagnosticsConfigurationHandler.cs
+System.Diagnostics/ProcessStartInfo.cs
+System.Diagnostics/DefaultTraceListener.cs
+System.Diagnostics/TextWriterTraceListener.cs
+System.Diagnostics/Trace.cs
+System.Diagnostics/TraceListenerCollection.cs
+System.Diagnostics/EventLogEntry.cs
+System.Diagnostics/EventLog.cs
+System.Diagnostics/TraceImpl.cs
+System.Diagnostics/EntryWrittenEventHandler.cs
+System.Diagnostics/EventLogEntryCollection.cs
+System.Diagnostics/EventLogEntryType.cs
+System.Diagnostics/EventLogInstaller.cs
+System.Diagnostics/EventLogPermission.cs
+System.Diagnostics/EventLogPermissionEntry.cs
+System.Diagnostics/ProcessModule.cs
+System.Diagnostics/ProcessPriorityClass.cs
+System.Diagnostics/EventLogPermissionAccess.cs
+System.Diagnostics/FileVersionInfo.cs
+System.Diagnostics/EventLogPermissionAttribute.cs
+System.Diagnostics/EventLogTraceListener.cs
+System.Diagnostics/Process.cs
+System.Diagnostics/ProcessModuleCollection.cs
+System.Diagnostics/ICollectData.cs
+System.Diagnostics/ProcessThread.cs
+System.Diagnostics/ProcessThreadCollection.cs
+System.Diagnostics/ProcessWindowStyle.cs
+System.Diagnostics/ThreadPriorityLevel.cs
+System.Diagnostics/ThreadState.cs
+System.Diagnostics/ThreadWaitReason.cs
+System.Diagnostics/EventLogPermissionEntryCollection.cs
+System.Diagnostics/TraceListener.cs
+System.IO/ErrorEventArgs.cs
+System.IO/ErrorEventHandler.cs
+System.IO/FileSystemEventArgs.cs
+System.IO/FileSystemEventHandler.cs
+System.IO/FileSystemWatcher.cs
+System.IO/InternalBufferOverflowException.cs
+System.IO/IODescriptionAttribute.cs
+System.IO/NotifyFilters.cs
+System.IO/RenamedEventArgs.cs
+System.IO/RenamedEventHandler.cs
+System.IO/WaitForChangedResult.cs
+System.IO/WatcherChangeTypes.cs
+System.Threading/ThreadExceptionEventArgs.cs
+System.Threading/ThreadExceptionEventHandler.cs
+System.Globalization/Locale.cs
+System.Text.RegularExpressions/arch.cs
+System.Text.RegularExpressions/collections.cs
+System.Text.RegularExpressions/interpreter.cs
+System.Text.RegularExpressions/category.cs
+System.Text.RegularExpressions/match.cs
+System.Text.RegularExpressions/regex.cs
+System.Text.RegularExpressions/compiler.cs
+System.Text.RegularExpressions/debug.cs
+System.Text.RegularExpressions/interval.cs
+System.Text.RegularExpressions/quicksearch.cs
+System.Text.RegularExpressions/replace.cs
+System.Text.RegularExpressions/syntax.cs
+System.Text.RegularExpressions/parser.cs
+System.Text.RegularExpressions/RegexRunner.cs
+System.Text.RegularExpressions/RegexRunnerFactory.cs
+System.Text.RegularExpressions/cache.cs
+System.Security.Cryptography.X509Certificates/X509CertificateCollection.cs
+Microsoft.CSharp/CSharpCodeGenerator.cs
+Microsoft.CSharp/CSharpCodeProvider.cs
diff --git a/mcs/class/System/makefile.gnu b/mcs/class/System/makefile.gnu
new file mode 100644
index 00000000000..f1bb109f4f1
--- /dev/null
+++ b/mcs/class/System/makefile.gnu
@@ -0,0 +1,21 @@
+topdir = ../..
+
+LIBRARY = ../lib/System.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r corlib -r System.Xml -r mscorlib
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=\
+	./Test*	\
+	./System.CodeDom/Code-X-Collection.cs	\
+	./System.Net/IAuthenticationModule.cs	\
+	./System.Net/AuthenticationManager.cs	\
+	./System.Diagnostics/Performance*.cs	\
+	./System.Diagnostics/Counter*.cs	\
+	./System.Diagnostics/InstanceData*.cs
+
+
+export MONO_PATH_PREFIX = ../lib:
+
+include ../library.make
diff --git a/mcs/class/corlib/.cvsignore b/mcs/class/corlib/.cvsignore
new file mode 100644
index 00000000000..e89609bdd0a
--- /dev/null
+++ b/mcs/class/corlib/.cvsignore
@@ -0,0 +1,4 @@
+corlib.dll
+corlib.pdb
+.makefrag
+.response
diff --git a/mcs/class/corlib/ChangeLog b/mcs/class/corlib/ChangeLog
new file mode 100644
index 00000000000..c7a22fc84be
--- /dev/null
+++ b/mcs/class/corlib/ChangeLog
@@ -0,0 +1,143 @@
+2002-08-15  Tim Coleman <tim@timcoleman.com>
+	* unix.args: 
+		Add System.Globalization/TextInfo.cs
+		Add System.Runtime.Serialization/FormatterConverter.cs
+
+2002-07-31  Rodrigo Moya <rodrigo@ximian.com>
+
+	* unix.args: added new files from System.Runtime.Remoting.Channels.
+
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+
+	* unix.args: Added interfaces and enumerations from
+	System.Runtime.Remoting.Channels. 
+
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+
+	* unix.args: Added new classes in
+	System.Runtime.Remoting.Contexts.
+	
+
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+
+	* unix.args: Added new Exceptions, Interfaces and various
+	TypeEntries from System.Runtime.Remoting.
+
+2002-07-29  Martin Baulig  <martin@gnome.org>
+
+	* list: Removed, this isn't used anymore and people are already
+	getting confused which file to use.
+
+2002-07-24  Duncan Mak  <duncan@ximian.com>
+
+	* unix.args: Added files from Remoting.Lifetime and
+	Remoting.Metadata.
+
+	* ChangeLog: Moved entries from System.Runtime.Remoting.Activation
+	and System.Runtime.Remoting.Proxies to their own ChangeLog.
+
+2002-07-23  Duncan Mak  <duncan@ximian.com>
+
+	* list: 
+	* unix.args: Added new Attributes in
+	System.Runtime.CompilerServices and System.Runtime.Remoting.Messaging.
+
+2002-07-22  Tim Coleman <tim@timcoleman.com>
+	* list:
+	* unix.args:
+		Added System.Security.Permission/ReflectionPermission.cs and
+		System.Security.Permission/EnvironmentPermission.cs and
+
+2002-07-10  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* list:
+	* unix.args: added IObjectHandle.cs.
+
+2002-06-20  Martin Baulig  <martin@gnome.org>
+
+	* unix.args: New file.  This is a mcs response file to compile
+	corlib on GNU/Linux (which doesn't work yet).
+
+2002-04-30  Daniel Stodden  <stodden@in.tum.de>
+
+	* System/Delegate.cs: Implemented Remove()
+	* System/MulticastDelegate.cs: Implementation of RemoveImpl()
+	done. Plus a fix for Equals().
+	* Test/System/MulticastDelegate.cs: Added. Should reflect above
+	changes.
+	
+2002-04-27  Martin Baulig  <martin@gnome.org>
+
+	* corlib.build: Added new "mcs-build" target to compile corlib
+	with mcs. This doesn't work yet - it's just to test mcs to find
+	and fix the remaining bugs.
+
+2002-03-27  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* corlib.build: removed seperate windows/linux builds. excluded
+	wrapper and PAL classes from all builds.
+
+2002-03-03  Nick Drochak  <ndrochak@gol.com>
+
+	* corlib.build: Exclude a bunch of interfaces from corlib_res.dll
+	that were preventing the tests from running on Windows.
+
+2002-01-25  Mark Crichton  <crichton@gimp.org>
+
+	* System.Security.Cryptography/RijndaelManaged.cs: added
+	
+	* System.Security.Cryptography/Rijndael.cs: changed constructor
+	to set default values.  Hopefully I did it correctly.
+
+2002-01-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* Unix/Errno.cs: Added
+
+	* Unix/Wrapper.cs: Updated to new Wrapper
+
+2002-01-19  Nick Drochak  <ndrochak@gol.com>
+	
+	* corlib.build: exclude Delegate from corlib_cmp.
+
+2002-01-09  Nick Drochak  <ndrochak@gol.com>
+
+	* corlib.build: Exclude Security Attribute classes that need mcs
+	magic to get them to compile.
+
+2002-01-06  Duco Fijma <duco@lorentz.xs4all.nl>
+	* corlib.build: Removed <excludes> for System.Resources
+
+2002-01-05  Nick Drochak  <ndrochak@gol.com>
+
+	* corlib.build: Have the clean target remove any .pdb files that
+	might be around if we compiled with debug on.
+
+2002-01-05  Nick Drochak  <ndrochak@gol.com>
+
+	* corlib.build: Make new build of corlib_cmp.dll.  This is the same
+	as corlib.dll without Object and ValueType.  It is used by 
+	/mcs/tools/corcompare.exe to compare with mscorlib.
+
+2002-01-03  Nick Drochak  <ndrochak@gol.com>
+
+	* corlib.build: Put the linux target at the top.  I keep changing the 
+	build for windows 'cause it's at the top.  Then when I do make, nothing
+	changes.  It seems like it always takes me half a day to remember
+	that the linux target comes second.  Old age I guess.
+
+	* .cvsignore: ignore corlib.pdb for times when it's built with debug on.
+
+2002-01-02  Nick Drochak  <ndrochak@gol.com>
+
+	* corlib.build: Removed "exclude CodeAccessPermission.cs"
+
+2001-12-11  Duncan Mak  <duncan@ximian.com>
+
+	* ChangeLog: Added "System.Resources" to the exclude list.
+
+2001-12-05  Nick Drochak <ndrochak@gol.com>
+
+	* ChangeLog: Add the change log to this directory
+
+	* corlib.build: Add dependancy on linux target to test target. Need to have the dll before we can test it, right?  Plus is encourages other to try 'make test'.
+
diff --git a/mcs/class/corlib/Linux/ChangeLog b/mcs/class/corlib/Linux/ChangeLog
new file mode 100644
index 00000000000..96eb5e7cded
--- /dev/null
+++ b/mcs/class/corlib/Linux/ChangeLog
@@ -0,0 +1,27 @@
+2002-03-18  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* Linux.cs: Removed math methods (now in System.Math).
+
+2002-01-23  Dick Porter  <dick@ximian.com>
+
+	* Linux.cs: GetFileTime and SetFileTime need to be static
+
+Tue Jan 22 22:50:29 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Linux.cs: comment out call to Debug.Assert(): stuff from the System
+	assembly cannot be used in corlib.
+
+2001-12-11  Dick Porter  <dick@ximian.com>
+
+	* Linux.cs: IO implemented with file handles with internal calls,
+	rather than casting file descriptors for C library p/invokes.
+	Implemented Get/Set Creation/LastAccess/LastWrite TimeFile
+	functions.
+
+Wed Nov 14 16:30:27 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Linux.cs: a '/' is a valid char in a file path.
+
+2001-11-10  Sean MacIsaac  <macisaac@ximian.com>
+
+	* Linux.cs (GetCurrentDirectory): implemented
diff --git a/mcs/class/corlib/Linux/Linux.cs b/mcs/class/corlib/Linux/Linux.cs
new file mode 100644
index 00000000000..86a1cfc475a
--- /dev/null
+++ b/mcs/class/corlib/Linux/Linux.cs
@@ -0,0 +1,484 @@
+/*---------------------------------------------------------------------
+
+		 XX		   X		    XXX
+				  XX		     XX
+		XXX	XX XXX	 XXXXX		     XX
+		 XX	XXX XX	  XX		     XX
+		 XX	XX  XX	  XX	  XXXXX	     XX
+		 XX	XX  XX	  XX XX	 XX    X     XX
+		XXXX	XX  XX	   XXX	 XXXXXXX    XXXX
+					 XX
+					  XXXXX
+
+Copyright (c) 2001 Intel Corporation.  All Rights Reserved.
+
+CREATED: August	22, 2001
+OWNER: Scott D Smith, Joel Marcey
+VERSION: 1.0
+---------------------------------------------------------------------*/
+	    
+using System;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.IO;
+using System.Collections;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace System.PAL
+{
+	/// <summary>
+	///	Class that implements IOperatingSystem,	providing the requested	functionality through calls into APIs available	in Linux 
+	/// </summary>
+	internal class OpSys
+	{
+		private Hashtable _environment = null;
+
+		//----------------------------------
+		//	       Class Constants
+		//----------------------------------
+		private	const int EOF =	-1; // TODO: Linux: Is this true?
+	
+
+		// For StdInputStream and StdOutputStream
+		private IntPtr Stdin;
+		private IntPtr Stdout;
+		private IntPtr Stderr;
+
+		//----------------------------------
+		//		Class Fields
+		//----------------------------------
+
+		//----------------------------------
+		//		Class Constructor
+		//----------------------------------
+		public OpSys()
+		{
+			Stdin=GetStdHandle(0);
+			Stdout=GetStdHandle(1);
+			Stderr=GetStdHandle(2);
+		}
+
+
+		//-------------------------------------------------
+		//		Environment Services 
+		//-------------------------------------------------
+
+		public string NewLineSequence
+		{
+			get
+			{
+				return "\n";
+			}
+		}
+
+		public char DirectorySeparator
+		{
+			get
+			{
+				return '/';
+			}
+		}
+
+		public char AltDirectorySeparator
+		{
+			get
+			{
+				return '\\';
+			}
+		}
+
+		public char VolumeSeparator
+		{
+			get
+			{
+				return '/';
+			}
+		}
+
+		public char PathSeparator
+		{
+			get
+			{
+				return ':';
+			}
+		}
+
+		public char[] InvalidPathChars
+		{
+			get
+			{
+				return new char[] { '\0' };
+			}
+		}
+
+		public char[] DirVolSeparatorChars
+		{
+			get
+			{
+				return new char[] { this.DirectorySeparator, this.AltDirectorySeparator, this.VolumeSeparator};
+			}
+		}
+		public char ExtensionCharacter
+		{
+			get
+			{
+				return '.';
+			}
+		}
+
+		public string GetEnvironmentVariable(string eVar)
+		{
+			return EnvironmentVariables[eVar].ToString();
+		}
+
+		public IDictionary EnvironmentVariables
+		{
+			get
+			{
+				if (_environment == null) {
+					IntPtr pp = _getEnviron(); // pointer to	an array of char*
+					_environment = new Hashtable();
+			
+					if (pp != IntPtr.Zero) {
+						IntPtr p;
+						bool done = false;
+						char[] delimiter = { '=' };
+				
+						while (!done) 
+						{
+							p = Marshal.ReadIntPtr(pp);
+							if (p != IntPtr.Zero) 
+							{
+								string str = Marshal.PtrToStringAuto(p);
+								string[] ar = str.Split(delimiter, 2);
+								switch(ar.Length) 
+								{
+									case 1:
+										_environment.Add(ar[0], "");
+										break;
+									case 2:
+										_environment.Add(ar[0], ar[1]);
+										break;
+									default:
+										//System.Diagnostics/.Debug.Assert(false);	// this	shouldn't happen
+										break;
+								}
+							} 
+							else 
+							{
+								done = true;
+							}
+						}
+					} 
+				}			
+				return _environment;
+			}
+		}
+
+		public string CommandLine
+		{
+			get
+			{
+				string path = Path.Combine(Path.Combine("/proc", _getPid().ToString()), "cmdline");
+				StreamReader stream = File.OpenText(path);
+				string res = stream.ReadToEnd();
+				stream.Close();
+				return res;
+			}
+		}
+
+		public string MachineName
+		{
+			get
+			{
+				return GetEnvironmentVariable("HOSTNAME");
+			}
+		}
+
+		public OperatingSystem OSVersion
+		{
+			get
+			{
+				return null;
+			}
+		}
+
+		// System.Path services
+
+		public string ChangeExtension(string path, string extension)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:ChangeExtension(System.String, System.String): Stub Method");
+			return null;
+		}
+
+		public string GetExtension(string path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetExtension(System.String): Stub Method");
+			return null;
+		}
+
+		public string GetFileName(string path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetFileName(System.String): Stub Method");
+			return null;
+		}
+	
+		public string GetFileNameWithoutExtension(string path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetFileNameWithoutExtension(System.String): Stub Method");
+			return null;
+		}
+
+		public string GetFullPath(string path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetFullPath(System.String): Stub Method");
+			return null;
+		}
+
+		public string GetPathRoot(string path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetPathRoot(System.String): Stub Method");
+			return null;
+
+		}
+	
+		public string GetTempFileName()
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetTempFileName(): Stub Method");
+			return null;
+		}
+	
+		public string GetTempPath()
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetTempPath(): Stub Method");
+			return null;
+		}
+
+		public bool HasExtension(string	path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:HasExtension(System.String): Stub Method");
+			return false;
+		}
+
+		public bool IsPathRooted(string	path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:IsPathRooted(System.String): Stub Method");
+			return false;
+		}
+
+
+
+		// System.Directory services
+
+		public void DeleteDirectory(string path, bool recursive)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:DeleteDirectory(System.String, System.Boolean): Stub Method");
+		}
+
+		public bool ExistsDirectory(string path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:ExistsDirectory(System.String): Stub Method");
+			return false;
+		}
+
+		public DateTime	GetCreationTimeDirectory(string	path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetCreationTimeDirectory(System.String): Stub	Method");
+			return new DateTime(0);
+		}
+
+		[System.Runtime.CompilerServices.MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public extern string GetCurrentDirectory();
+
+		public string[]	GetDirectories(string path, string searchPattern)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetDirectories(System.String,System.String): Stub Method");
+			return null;
+		}
+
+		public string[]	GetFiles(string	path, string searchPattern)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetFiles(System.String, System.String): Stub Method");
+			return null;
+		}
+
+		public string[]	GetFileSystemEntries(string path, string searchPattern)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetFileSystemEntries(System.String, System.String): Stub Method");
+			return null;
+		}
+
+		public DateTime	GetLastAccessTimeDirectory(string path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetLastAccessTimeDirectory(System.String): Stub Method");
+			return new DateTime(0);
+		}
+
+		public DateTime	GetLastWriteTimeDirectory(string path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:GetLastWriteTimeDirectory(System.String): Stub Method");
+			return new DateTime(0);
+		}
+
+		public void MoveDirectory(string sourceDirName,	string destDirName)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:MoveDirectory(System.String, System.String): Stub Method");
+		}
+
+		public void SetCreationTimeDirectory(string path, DateTime creationTime)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:SetCreationTimeDirectory(System.String, System.DateTime): Stub Method");
+		}
+
+		public void SetCurrentDirectory(string path)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:SetCurrentDirectory(System.String): Stub Method");
+		}
+
+		public void SetLastAccessTimeDirectory(string path, DateTime lastAccessTime)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:SetLastAccessTimeDirectory(System.String, System.DateTime): Stub Method");
+		}
+
+		public void SetLastWriteTimeDirectory(string path, DateTime lastWriteTime)
+		{
+			//System.Diagnostics/.Debug.WriteLine("Linux:SetLastWriteTimeDirectory(System.String, System.DateTime): Stub Method");
+		}
+
+		//-----------------------------------
+		//		I/O Services
+		//-----------------------------------
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		private extern IntPtr GetStdHandle(int fd);
+
+		public IntPtr StdinHandle {
+			get {
+				return(Stdin);
+			}
+		}
+
+		public IntPtr StdoutHandle {
+			get {
+				return(Stdout);
+			}
+		}
+
+		public IntPtr StderrHandle {
+			get {
+				return(Stderr);
+			}
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public extern void DeleteFile(string path);
+	
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public extern bool ExistsFile(string path);
+
+		/* The long time parameters in GetFileTime and
+		 * SetFileTime correspond to Windows file times (ticks
+		 * from DateTime(1/1/1601 00:00 GMT))
+		 */
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		private extern static bool GetFileTime(IntPtr handle, out long creat, out long lastaccess, out long lastwrite);
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		private extern static bool SetFileTime(IntPtr handle, long creat, long lastaccess, long lastwrite);
+	
+		public DateTime	GetCreationTimeFile(string path)
+		{
+			long creat, lastaccess, lastwrite;
+			bool ret;
+			FileStream s = new FileStream(path, FileMode.Open, FileAccess.Read);
+			
+			ret=GetFileTime(s.Handle, out creat, out lastaccess, out lastwrite);
+			s.Close();
+			
+			return DateTime.FromFileTime(creat);
+		}
+	
+		public DateTime	GetLastAccessTimeFile(string path)
+		{
+			long creat, lastaccess, lastwrite;
+			bool ret;
+			FileStream s = new FileStream(path, FileMode.Open, FileAccess.Read);
+			
+			ret=GetFileTime(s.Handle, out creat, out lastaccess, out lastwrite);
+			s.Close();
+			
+			return DateTime.FromFileTime(lastaccess);
+		}
+	
+		public DateTime	GetLastWriteTimeFile(string path)
+		{
+			long creat, lastaccess, lastwrite;
+			bool ret;
+			FileStream s = new FileStream(path, FileMode.Open, FileAccess.Read);
+			
+			ret=GetFileTime(s.Handle, out creat, out lastaccess, out lastwrite);
+			s.Close();
+			
+			return DateTime.FromFileTime(lastwrite);
+		}
+	
+		public void SetCreationTimeFile(string path, DateTime creationTime)
+		{
+			long creat, lastaccess, lastwrite;
+			bool ret;
+			FileStream s = new FileStream(path, FileMode.Open, FileAccess.ReadWrite);
+			
+			// Get the existing times first
+			ret=GetFileTime(s.Handle, out creat, out lastaccess, out lastwrite);
+
+			creat=creationTime.ToFileTime();
+			
+			ret=SetFileTime(s.Handle, creat, lastaccess, lastwrite);
+			s.Close();
+		}
+	
+		public void SetLastAccessTimeFile(string path, DateTime	lastAccessTime)
+		{
+			long creat, lastaccess, lastwrite;
+			bool ret;
+			FileStream s = new FileStream(path, FileMode.Open, FileAccess.ReadWrite);
+			
+			// Get the existing times first
+			ret=GetFileTime(s.Handle, out creat, out lastaccess, out lastwrite);
+
+			lastaccess=lastAccessTime.ToFileTime();
+			
+			ret=SetFileTime(s.Handle, creat, lastaccess, lastwrite);
+			s.Close();
+		}
+	
+		public void SetLastWriteTimeFile(string	path, DateTime lastWriteTime)
+		{
+			long creat, lastaccess, lastwrite;
+			bool ret;
+			FileStream s = new FileStream(path, FileMode.Open, FileAccess.ReadWrite);
+			
+			// Get the existing times first
+			ret=GetFileTime(s.Handle, out creat, out lastaccess, out lastwrite);
+
+			lastwrite=lastWriteTime.ToFileTime();
+			
+			ret=SetFileTime(s.Handle, creat, lastaccess, lastwrite);
+			s.Close();
+		}
+
+
+		public long FileLength(string path)
+		{
+			return 0;
+		}
+
+		// Private implementation details
+		[DllImport("monowrapper", EntryPoint="mono_wrapper_environ", CharSet=CharSet.Ansi)]
+		private unsafe static extern IntPtr _getEnviron();
+
+		[DllImport("libc", EntryPoint="getpid")]
+		private unsafe static extern int _getPid();
+	}
+}
diff --git a/mcs/class/corlib/System.Collections/ArrayList.cs b/mcs/class/corlib/System.Collections/ArrayList.cs
new file mode 100644
index 00000000000..71c9752383e
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/ArrayList.cs
@@ -0,0 +1,1009 @@
+//

+// System.Collections.ArrayList

+//

+// Author:

+//    Vladimir Vukicevic (vladimir@pobox.com)

+//    Duncan Mak (duncan@ximian.com)

+//

+// (C) 2001 Vladimir Vukicevic

+// (C) 2002 Ximian, Inc.

+//

+

+using System;

+

+namespace System.Collections {

+

+	[MonoTODO ("add versioning, changing the arraylist should invalidate all enumerators")]

+	[Serializable]

+	public class ArrayList : IList, ICollection, IEnumerable, ICloneable {

+

+		// Keep these three fields in sync with mono-reflection.h.

+		private int count = 0;

+		private int capacity = defaultCapacity;

+		private object[] dataArray;

+		

+		// constructors

+		public ArrayList () {

+			dataArray = new object[capacity];

+		}

+

+		public ArrayList (ICollection c) {

+			if (null == c)

+				throw new ArgumentNullException();

+

+			//Emulate MS.NET behavior. Throw RankException when passed a

+			// multi-dimensional Array.

+			Array arr = c as Array;

+			if (null != arr && arr.Rank > 1)

+				throw new RankException ();

+

+			this.capacity = (c.Count == 0) ? defaultCapacity : c.Count;

+			dataArray = new object [capacity];

+			foreach (object o in c) 

+				Add (o);

+		}

+

+		public ArrayList (int capacity) {

+			if (capacity < 0)

+				throw new ArgumentOutOfRangeException ("capacity", capacity, "Value must be greater than or equal to zero.");

+

+			if (capacity > 0)

+				this.capacity = capacity;

+			// else if capacity == 0 then use defaultCapacity

+

+			dataArray = new object[this.capacity];

+		}

+

+		private ArrayList (object[] dataArray, int count, int capacity,

+				   bool fixedSize, bool readOnly, bool synchronized)

+		{

+			this.dataArray = (object []) dataArray.Clone();

+			this.count = count;

+			this.capacity = capacity;

+			this.fixedSize = fixedSize;

+			this.readOnly = readOnly;

+			this.synchronized = synchronized;

+		}

+

+		public static ArrayList ReadOnly (ArrayList list)

+		{

+			if (list == null)

+				throw new ArgumentNullException ();

+			return new ArrayList (list.ToArray (), list.Count, list.Capacity,

+					      list.IsFixedSize, true, list.IsSynchronized);

+		}

+

+		public static IList ReadOnly (IList list)

+		{

+			if (list == null)

+				throw new ArgumentNullException ();

+

+			ArrayList al = new ArrayList ();

+

+			foreach (object o in list)

+				al.Add (o);

+

+			return (IList) ArrayList.ReadOnly (al);

+		}

+

+		public static ArrayList Synchronized (ArrayList list)

+		{

+			if (list == null)

+				throw new ArgumentNullException ();

+

+			return new ArrayList (list.ToArray (), list.Count, list.Capacity,

+					      list.IsFixedSize, list.IsReadOnly, true);

+		}

+

+		public static IList Synchronized (IList list)

+		{

+			if (list == null)

+				throw new ArgumentNullException ();

+

+			ArrayList al = new ArrayList ();

+

+			foreach (object o in list)

+				al.Add (o);

+

+			return (IList) ArrayList.Synchronized (al);

+		}

+

+		public static ArrayList FixedSize (ArrayList list)

+		{

+			if (list == null)

+				throw new ArgumentNullException ();

+

+			return new ArrayList (list.ToArray (), list.Count, list.Capacity,

+					      true, list.IsReadOnly, list.IsSynchronized);

+		}

+

+		public static IList FixedSize (IList list)

+		{

+			if (list == null)

+				throw new ArgumentNullException ();

+

+			ArrayList al = new ArrayList ();

+

+			foreach (object o in list)

+				al.Add (o);

+

+			return (IList) ArrayList.FixedSize (al);			

+		}

+

+		public static ArrayList Repeat (object value, int count)

+		{

+			ArrayList al = new ArrayList (count);

+			for (int i = 0; i < count; i++) {

+				al.dataArray[i] = value;

+			}

+			al.count = count;

+

+			return al;

+		}

+

+		[Serializable]

+		private class ListWrapper : ArrayList

+		{

+			IList list;

+

+			public ListWrapper (IList list)

+			{

+				if (null == list)

+					throw new ArgumentNullException();

+

+				this.list = list;

+				count = ((ICollection) list).Count;

+			}

+			

+			// ArrayList

+			[MonoTODO]

+			public override int Capacity {

+				get { return list.Count; }

+				set { throw new NotSupportedException (); }

+			}

+

+			[MonoTODO]

+			public override void AddRange (ICollection collection)

+			{

+				if (collection == null)

+					throw new ArgumentNullException ("colllection");

+				if (IsFixedSize || IsReadOnly)

+					throw new NotSupportedException ();

+			}

+

+			[MonoTODO]

+			public override int BinarySearch (object value)

+			{

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			public override int BinarySearch (object value, IComparer comparer)

+			{

+				throw new NotImplementedException ();

+			}

+

+			[MonoTODO]

+			public override int BinarySearch (int index, int count, object value,

+							  IComparer comparer)

+			{

+				throw new NotImplementedException ();

+			}

+

+			public override void CopyTo (Array array)

+			{

+				if (null == array)

+					throw new ArgumentNullException("array");

+				if (array.Rank > 1)

+					throw new ArgumentException("array cannot be multidimensional");

+

+				CopyTo (array, 0);

+			}

+

+			[MonoTODO]

+			public override void CopyTo (int index, Array array,

+						     int arrayIndex, int count)

+			{

+				if (array == null)

+					throw new ArgumentNullException ();

+				if (index < 0 || arrayIndex < 0 || count < 0)

+					throw new ArgumentOutOfRangeException ();

+				if (array.Rank > 1 || index >= Count || Count > (array.Length - arrayIndex))

+					throw new ArgumentException ();

+				// FIXME: handle casting error here

+			}

+

+			public override ArrayList GetRange (int index, int count)

+			{

+				if (index < 0 || count < 0)

+					throw new ArgumentOutOfRangeException ();

+				if (Count < (index + count))

+					throw new ArgumentException ();

+				

+				ArrayList result = new ArrayList (count);

+

+				for (int i = 0; i < count; i++)

+					result.Add (list [i]);

+

+				return result;

+			}

+

+			[MonoTODO]

+			public override void InsertRange (int index, ICollection col)

+			{

+				if (col == null)

+					throw new ArgumentNullException ();

+				if (index < 0 || index > Count)

+					throw new ArgumentOutOfRangeException ();

+				if (IsReadOnly || IsFixedSize)

+					throw new NotSupportedException ();

+

+				if (index == Count) {

+					foreach (object element in col)

+						list.Add (element);

+

+				} //else if ((index + count) < Count) {

+// 					for (int i = index; i < (index + count); i++)

+// 						list [i] = col [i];

+

+// 				} else {

+// 					int added = Count - (index + count);

+// 					for (int i = index; i < Count; i++)

+// 						list [i] = col [i];

+// 					for (int i = 0; i < added; i++)

+// 						list.Add (col [Count +i]);

+// 				}

+			}

+

+			public override int LastIndexOf (object value)

+			{

+				return LastIndexOf (value, Count, 0);

+			}

+

+			public override int LastIndexOf (object value, int startIndex)

+			{

+				return LastIndexOf (value, startIndex, 0);

+			}

+

+			public override int LastIndexOf (object value, int startIndex, int count)

+			{

+				if (null == value){

+					return -1;

+				}

+

+				if (startIndex > Count || count < 0 || (startIndex + count > Count))

+					throw new ArgumentOutOfRangeException ();

+				

+				int length = startIndex - count + 1;

+

+				for (int i = startIndex; i >= length; i--)

+					if (list [i] == value)

+						return i;

+				return -1;

+			}

+

+			public override void RemoveRange (int index, int count)

+			{

+				if ((index < 0) || (count < 0))

+					throw new ArgumentOutOfRangeException ();

+				if ((index > Count) || (index + count) > Count)

+					throw new ArgumentException ();

+				if (IsReadOnly || IsFixedSize)

+					throw new NotSupportedException ();

+

+				for (int i  = 0; i < count; i++)

+					list.RemoveAt (index);

+			}

+

+			public override void Reverse ()

+			{

+				Reverse (0, Count);

+			}

+

+			public override void Reverse (int index, int count)

+			{

+				if ((index < 0) || (count < 0))

+					throw new ArgumentOutOfRangeException ();

+				if ((index > Count) || (index + count) > Count)

+					throw new ArgumentException ();

+				if (IsReadOnly)

+					throw new NotSupportedException ();

+

+				object tmp = null;

+

+				for (int i = index; i < count; i++) {

+					tmp = list [i];

+					list [i] = list [count - i];

+					list [count - i] = tmp;

+				}

+			}

+

+			public override void SetRange (int index, ICollection col)

+			{

+				if (index < 0 || (index + col.Count) > Count)

+					throw new ArgumentOutOfRangeException ();

+				if (col == null)

+					throw new ArgumentNullException ();

+				if (IsReadOnly)

+					throw new NotSupportedException ();

+

+				for (int i = index; i < col.Count; i++)

+					foreach (object o in col)

+						list [i] = o;

+			}

+

+			[MonoTODO]

+			public override void Sort ()

+			{

+			}

+

+			[MonoTODO]

+			public override void Sort (IComparer comparer)

+			{

+			}

+

+			[MonoTODO]

+			public override void Sort (int index, int count, IComparer comparer)

+			{

+			}

+

+			public override object [] ToArray ()

+			{

+				return (object []) ToArray (typeof (object));

+			}

+

+			public override Array ToArray (Type type)

+			{

+				int count = Count;

+				Array result = Array.CreateInstance (type, count);

+

+				for (int i = 0; i < count; i++)

+					result.SetValue (list [i], i);

+

+				return result;

+			}

+

+			[MonoTODO]

+			public override void TrimToSize ()

+			{

+			}

+

+			// IList

+			public override bool IsFixedSize {

+				get { return list.IsFixedSize; }

+			}

+

+			public override bool IsReadOnly {

+				get { return list.IsReadOnly; }

+			}

+

+			public override object this [int index] {

+				get { return list [index]; }

+				set { list [index] = value; }

+			}

+

+			public override int Add (object value)

+			{

+				return list.Add (value);

+			}

+

+			public override void Clear ()

+			{

+				list.Clear ();

+			}

+

+			public override bool Contains (object value)

+			{

+				return list.Contains (value);

+			}

+

+			public override int IndexOf (object value)

+			{

+				return list.IndexOf (value);

+			}

+

+			public override void Insert (int index, object value)

+			{

+				list.Insert (index, value);

+			}

+

+			public override void Remove (object value)

+			{

+				list.Remove (value);

+			}

+

+			public override void RemoveAt (int index)

+			{

+				list.RemoveAt (index);

+			}

+

+			// ICollection			

+			public override int Count {

+				get { return count; }

+			}

+

+			public override bool IsSynchronized {

+				get { return ((ICollection) list).IsSynchronized; }

+			}

+

+			public override object SyncRoot {

+				get { return ((ICollection) list).SyncRoot; }

+			}

+

+			public override void CopyTo (Array array, int index)

+			{

+				((ICollection) list).CopyTo (array, index);

+			}

+

+			// ICloneable

+			public override object Clone ()

+			{

+				return new ListWrapper (list);

+			}

+

+			// IEnumerable

+			public override IEnumerator GetEnumerator ()

+			{

+				return ((IEnumerable) list).GetEnumerator ();

+			}

+		}

+

+		[MonoTODO]

+		public static ArrayList Adapter (IList list)

+		{

+			return new ListWrapper (list);

+		}

+

+		// properties

+

+		private bool fixedSize = false;

+		private bool readOnly = false;

+		private bool synchronized = false;

+

+		private long version = 0;

+		private ArrayList source = null;

+

+		private const int defaultCapacity = 16;

+

+		private void copyDataArray (object[] outArray) {

+			for (int i = 0; i < count; i++) {

+				outArray[i] = dataArray[i];

+			}

+		}

+

+		private void setSize (int newSize) {

+			if (newSize == capacity) 

+				return;

+			

+			capacity = (newSize == 0) ? defaultCapacity : newSize;

+

+			// note that this assumes that we've already sanity-checked

+			// the new size

+			object[] newDataArray = new object[newSize];

+			copyDataArray (newDataArray);

+			dataArray = newDataArray;

+		}

+

+		// note that this DOES NOT update count

+		private void shiftElements (int startIndex, int numshift) {

+			if (numshift == 0) { 

+				return;

+			}

+

+			if (count + numshift > capacity) {

+				setSize (capacity * 2);

+				shiftElements (startIndex, numshift);

+			} else {

+				if (numshift > 0) {

+					int numelts = count - startIndex;

+					for (int i = numelts-1; i >= 0; i--) {

+						dataArray[startIndex + numshift + i] = dataArray[startIndex + i];

+					}

+

+					for (int i = startIndex; i < startIndex + numshift; i++) {

+						dataArray[i] = null;

+					}

+				} else {

+					int numelts = count - startIndex + numshift;

+					for (int i = 0; i < numelts; i++) {

+						dataArray [i + startIndex] = dataArray [i + startIndex - numshift];

+					}

+					for (int i = count + numshift; i < count; i++) {

+						dataArray[i] = null;

+					}

+				}

+			}

+		}

+

+		public virtual int Capacity {

+			get {

+				return capacity;

+			}

+

+			set {

+				if (readOnly) {

+					throw new NotSupportedException

+						("Collection is read-only.");

+				}

+

+				if (value < count) {

+					throw new ArgumentOutOfRangeException

+						("ArrayList Capacity being set to less than Count");

+				}

+

+				if (fixedSize && value != capacity) {

+					throw new NotSupportedException

+						("Collection is fixed size.");

+				}

+

+				setSize (value);

+			}

+		}

+

+		private void CheckSourceVersion() {

+			if (null != this.source && this.version != this.source.version) {

+				throw new InvalidOperationException();

+			}

+		}

+

+		public virtual int Count {

+			get {

+				CheckSourceVersion();

+				return count;

+			}

+		}

+

+		public virtual bool IsFixedSize {

+			get {

+				return fixedSize;

+			}

+		}

+

+		public virtual bool IsReadOnly {

+			get {

+				return readOnly;

+			}

+		}

+

+		public virtual bool IsSynchronized {

+			get {

+				return synchronized;

+			}

+		}

+

+		public virtual object this[int index] {

+			get {

+				CheckSourceVersion();

+

+				if (index < 0) {

+					throw new ArgumentOutOfRangeException ("index < 0");

+				}

+

+				if (index >= count) {

+					throw new ArgumentOutOfRangeException ("index out of range");

+				}

+

+				return dataArray[index];

+			}

+			set {

+				if (index < 0) {

+					throw new ArgumentOutOfRangeException ("index < 0");

+				}

+

+				if (index >= count) {

+					throw new ArgumentOutOfRangeException ("index out of range");

+				}

+

+				if (readOnly) {

+					throw new NotSupportedException ("Collection is read-only.");

+				}

+

+				dataArray[index] = value;

+				version++;

+			}

+		}

+

+		[MonoTODO]

+		public virtual object SyncRoot {

+			get {

+				throw new NotImplementedException ("System.Collections.ArrayList.SyncRoot.get");

+			}

+		}

+

+

+		// methods

+

+		public virtual int Add (object value) {

+			if (readOnly)

+				throw new NotSupportedException ("ArrayList is read-only.");

+			if (fixedSize)

+				throw new NotSupportedException ("ArrayList is fixed size.");

+

+			if (count + 1 >= capacity)

+				setSize (capacity * 2);

+

+			dataArray[count] = value;

+			version++;

+			return count++;

+		}

+

+		public virtual void AddRange (ICollection c) {

+			if (null == c)

+				throw new ArgumentNullException ("c");

+			if (readOnly || fixedSize)

+				throw new NotSupportedException ();

+

+			int cc = c.Count;

+			if (count + cc >= capacity)

+				Capacity = cc < count? count * 2: count + cc + 1;

+			c.CopyTo (dataArray, count);

+			count += cc;

+			version++;

+		}

+

+		public virtual int BinarySearch (object value) {

+			return BinarySearch (0, count, value, null);

+		}

+

+		public virtual int BinarySearch (object value, IComparer comparer) {

+			return BinarySearch (0, count, value, comparer);

+		}

+

+		public virtual int BinarySearch (int index, int count,

+						 object value, IComparer comparer) {

+			return Array.BinarySearch (dataArray, index, count, value, comparer);

+		}

+

+		public virtual void Clear () {

+			if (readOnly || fixedSize)

+				throw new NotSupportedException();

+

+			count = 0;

+			version++;

+		}

+

+		public virtual object Clone () {

+			return new ArrayList (dataArray, count, capacity,

+					      fixedSize, readOnly, synchronized);

+		}

+

+		public virtual bool Contains (object item) {

+			for (int i = 0; i < count; i++) {

+				if (Object.Equals (dataArray[i], item)) {

+					return true;

+				}

+			}

+

+			return false;

+		}

+

+		public virtual void CopyTo (Array array) {

+			if (null == array)

+				throw new ArgumentNullException("array");

+			if (array.Rank > 1)

+				throw new ArgumentException("array cannot be multidimensional");

+

+			System.Array.Copy (dataArray, 0, array, 0, this.count);

+		}

+

+		public virtual void CopyTo (Array array, int arrayIndex) {

+			if (null == array)

+				throw new ArgumentNullException("array");

+			if (arrayIndex < 0)

+				throw new ArgumentOutOfRangeException("arrayIndex");

+			if (array.Rank > 1)

+				throw new ArgumentException("array cannot be multidimensional");

+			if (this.count > array.Length - arrayIndex)

+				throw new ArgumentException("this ArrayList has more items than the space available in array from arrayIndex to the end of array");

+			

+			System.Array.Copy (dataArray, 0, array, arrayIndex, this.count);

+		}

+

+		public virtual void CopyTo (int index, Array array,

+					    int arrayIndex, int count) {

+			if (null == array)

+				throw new ArgumentNullException("array");

+			if (arrayIndex < 0)

+				throw new ArgumentOutOfRangeException("arrayIndex");

+			if (index < 0)

+				throw new ArgumentOutOfRangeException("index");

+			if (count < 0)

+				throw new ArgumentOutOfRangeException("count");

+			if (index >= this.count)

+				throw new ArgumentException("index is greater than or equal to the source ArrayList.Count");

+			if (array.Rank > 1)

+				throw new ArgumentException("array cannot be multidimensional");

+			if (arrayIndex >= array.Length)

+				throw new ArgumentException("arrayIndex is greater than or equal to array's length");

+			if (this.count > array.Length - arrayIndex)

+				throw new ArgumentException("this ArrayList has more items than the space available in array from arrayIndex to the end of array");

+

+			System.Array.Copy (dataArray, index, array, arrayIndex, count);

+		}

+

+		[Serializable]

+		private class ArrayListEnumerator : IEnumerator {

+			private object[] data;

+			private int idx;

+			private int start;

+			private int num;

+

+			internal ArrayListEnumerator(int index, int count, object[] items) {

+				data = items;

+				start = index;

+				num = count;

+				idx = start - 1;

+			}

+

+			public object Clone ()

+			{

+				return new ArrayListEnumerator (start, num, data);

+			}

+

+			public virtual object Current {

+				get {

+					return data [idx];

+				}

+			}

+			public virtual bool MoveNext() {

+				if (++idx < start + num)

+					return true;

+				return false;

+			}

+			public virtual void Reset() {

+				idx = start - 1;

+			}

+		}

+

+		public virtual IEnumerator GetEnumerator () {

+			return new ArrayListEnumerator(0, this.Count, dataArray);

+		}

+

+		private void ValidateRange(int index, int count) {

+			if (index < 0) {

+				throw new ArgumentOutOfRangeException("index", index, "Must be equal to or greater than zero");

+			}

+			if (count < 0) {

+				throw new ArgumentOutOfRangeException("count", count, "Must be equal to or greater than zero");

+			}

+			if (index > this.count - 1) {

+				throw new ArgumentException();

+			}

+			if (index + count > this.count - 1) {

+				throw new ArgumentException();

+			}

+		}

+

+		public virtual IEnumerator GetEnumerator (int index, int count) {

+			ValidateRange(index, count);

+			return new ArrayListEnumerator(index, count, dataArray);

+		}

+

+		public virtual ArrayList GetRange (int index, int count) {

+			ValidateRange(index, count);

+			ArrayList retVal = new ArrayList(count);

+

+			for (int i = index; i < count + index; i++) {

+				retVal.Add(this[i]);

+			}

+			retVal.version = this.version;

+			retVal.source = this;

+			return retVal;

+		}

+

+		public virtual int IndexOf (object value) {

+			return IndexOf (value, 0, count);

+		}

+

+		public virtual int IndexOf (object value, int startIndex) {

+			return IndexOf (value, startIndex, count - startIndex);

+		}

+

+		public virtual int IndexOf (object value, int startIndex, int count) {

+			if (startIndex < 0 || startIndex + count > this.count || count < 0) {

+				throw new ArgumentOutOfRangeException ("IndexOf arguments out of range");

+			}

+			for (int i = startIndex; i < (startIndex + count); i++) {

+				if (Object.Equals (dataArray[i], value)) {

+					return i;

+				}

+			}

+

+			return -1;

+		}

+

+		public virtual void Insert (int index, object value) {

+			if (readOnly) {

+				throw new NotSupportedException

+					("Collection is read-only.");

+			}

+

+			if (fixedSize) {

+				throw new NotSupportedException

+					("Collection is fixed size.");

+			}

+

+			if (index < 0 || index >= capacity) {

+				throw new ArgumentOutOfRangeException ("index < 0 or index >= capacity");

+			}

+

+			shiftElements (index, 1);

+			dataArray[index] = value;

+			count++;

+			version++;

+		}

+

+		public virtual void InsertRange (int index, ICollection c) {

+

+			if (c == null)

+				throw new ArgumentNullException ();

+

+			if (index < 0 || index > count)

+				throw new ArgumentOutOfRangeException ();

+

+			if (IsReadOnly || IsFixedSize)

+				throw new NotSupportedException ();

+

+			shiftElements (index, c.Count);

+			count += c.Count;

+

+			IEnumerator en = c.GetEnumerator();

+			while (en.MoveNext())

+				dataArray[index++] = en.Current;

+

+			version++;

+		}

+

+		public virtual int LastIndexOf (object value) {

+			return LastIndexOf (value, count - 1, count);

+		}

+

+		public virtual int LastIndexOf (object value, int startIndex) {

+			if (startIndex < 0 || startIndex > count - 1) {

+				throw new ArgumentOutOfRangeException("startIndex", startIndex, "");

+			}

+			return LastIndexOf (value, startIndex, startIndex + 1);

+		}

+

+		public virtual int LastIndexOf (object value, int startIndex,

+						int count)

+		{

+			if (null == value){

+				return -1;

+			}

+			if (startIndex >= this.count)

+				throw new ArgumentOutOfRangeException ("startIndex >= Count");

+			if (count < 0)

+				throw new ArgumentOutOfRangeException ("count < 0");

+			if (startIndex + 1 < count)

+				throw new ArgumentOutOfRangeException ("startIndex + 1 < count");

+			

+			int EndIndex = startIndex - count + 1;

+			for (int i = startIndex; i >= EndIndex; i--) {

+				if (Object.Equals (dataArray[i], value)) {

+					return i;

+				}

+			}

+

+			return -1;

+		}

+

+		public virtual void Remove (object obj) {

+

+			if (IsFixedSize || IsReadOnly)

+				throw new NotSupportedException ();

+			

+			int objIndex = IndexOf (obj);

+

+			if (objIndex == -1) {

+				// shouldn't an exception be thrown here??

+				// the MS docs don't indicate one, and testing

+				// with the MS .net framework doesn't indicate one

+				return;

+			}

+

+			RemoveRange (objIndex, 1);

+		}

+

+		public virtual void RemoveAt (int index) {

+			RemoveRange (index, 1);

+		}

+

+		public virtual void RemoveRange (int index, int count) {

+			if (readOnly) {

+				throw new NotSupportedException

+					("Collection is read-only.");

+			}

+

+			if (fixedSize) {

+				throw new NotSupportedException

+					("Collection is fixed size.");

+			}

+

+			if (index < 0 || index >= this.count || index + count > this.count) {

+				throw new ArgumentOutOfRangeException

+					("index/count out of range");

+			}

+

+			shiftElements (index, - count);

+			this.count -= count;

+			version++;

+		}

+

+		public virtual void Reverse () {

+			Reverse (0, count);

+		}

+

+		public virtual void Reverse (int index, int count) {

+			if (readOnly) {

+				throw new NotSupportedException

+					("Collection is read-only.");

+			}

+

+			if (index < 0 || index + count > this.count) {

+				throw new ArgumentOutOfRangeException

+					("index/count out of range");

+			}

+

+			Array.Reverse (dataArray, index, count);

+			version++;

+		}

+

+		public virtual void SetRange (int index, ICollection c)

+		{

+			if (c == null)

+				throw new ArgumentNullException ();

+			if (readOnly)

+				throw new NotSupportedException ();

+			if (index < 0 || (index + c.Count) > count)

+				throw new ArgumentOutOfRangeException ();

+

+			c.CopyTo(dataArray, index);

+		}

+

+		public virtual void Sort () {

+			Sort (0, count, null);

+		}

+

+		public virtual void Sort (IComparer comparer) {

+			Sort (0, count, comparer);

+		}

+

+		public virtual void Sort (int index, int count, IComparer comparer) {

+			if (readOnly) {

+				throw new NotSupportedException

+					("Collection is read-only.");

+			}

+

+			if (index < 0 || index + count > this.count) {

+				throw new ArgumentOutOfRangeException

+					("index/count out of range");

+			}

+            

+			Array.Sort (dataArray, index, count, comparer);

+			version++;

+		}

+

+		public virtual object[] ToArray() {

+			object[] outArray = new object[count];

+			Array.Copy (dataArray, outArray, count);

+			return outArray;

+		}

+

+		public virtual Array ToArray (Type type) {

+			Array outArray = Array.CreateInstance (type, count);

+			Array.Copy (dataArray, outArray, count);

+			return outArray;

+		}

+

+		public virtual void TrimToSize () {

+

+			if (IsReadOnly || IsFixedSize)

+				throw new NotSupportedException ();

+			

+			setSize(count);

+

+			version++;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Collections/BitArray.cs b/mcs/class/corlib/System.Collections/BitArray.cs
new file mode 100644
index 00000000000..1fc6b156c0d
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/BitArray.cs
@@ -0,0 +1,499 @@
+using System;
+
+namespace System.Collections
+{
+  // do we really need to specify IEnumerable since ICollection extends it?
+  [Serializable]
+  public sealed class BitArray : ICollection, IEnumerable, ICloneable
+  {
+    private Int32[] m_array;
+    private int m_length;
+    private int m_modCount = 0;
+    
+    private static void clearJunk(Int32[] arr, int numbits)
+    {
+      int numjunkbits = 32 - (numbits%32);
+      UInt32 mask = (~0U >> numjunkbits);
+      arr[arr.Length - 1] &= (int)mask;
+    }
+
+    private static int bitsToInts(int bits)
+    {
+      int retval = bits/32;
+      if (bits % 32 != 0)
+	retval++;
+
+      return retval;
+    }
+
+    private static int bitsToBytes(int bits)
+    {
+      int retval = bits/8;
+      if (bits % 8 != 0)
+	retval++;
+
+      return retval;
+    }
+
+
+    private void setBit(int bitIndex, bool value)
+    {
+      int index = bitIndex/32;
+      int shift = bitIndex%32;
+
+      Int32 theBit = 1 << shift;
+
+      if(value)
+	m_array[index] |= theBit;
+      else
+	m_array[index] &= ~theBit;
+      
+      m_modCount++;
+    }
+
+    private bool getBit(int bitIndex)
+    {
+      int index = bitIndex/32;
+      int shift = bitIndex%32;
+
+      Int32 theBit = m_array[index] & (1 << shift);
+
+      return (theBit == 0) ? false : true;
+    }
+
+    private byte getByte(int byteIndex)
+    {
+      int index = byteIndex/4;
+      int shift = (byteIndex%4)*8;
+
+      Int32 theByte = m_array[index] & (0xff << shift);
+
+      return (byte)((theByte >> shift)&0xff);
+    }
+
+    private void setByte(int byteIndex, byte value)
+    {
+      int index = byteIndex/4;
+      int shift = (byteIndex%4)*8;
+
+      Int32 orig = m_array[index];
+
+      // clear the byte
+      orig &= ~(0xff << shift);
+      // or in the new byte
+      orig |= value << shift;
+      
+      m_array[index] = orig;
+
+      m_modCount++;
+    }
+
+    /* --- Constructors --- */
+    public BitArray(BitArray orig)
+    {
+      m_length = orig.m_length;
+      
+      int numInts = bitsToInts(m_length);
+      m_array = new Int32[numInts];
+      Array.Copy(orig.m_array, m_array, numInts);
+    }
+
+    public BitArray(bool[] bits)
+    {
+      m_length = bits.Length;
+
+      int numInts = bitsToInts(m_length);
+      m_array = new Int32[numInts];
+      for (int i=0; i < bits.Length; i++)
+	setBit(i, bits[i]);
+    }
+
+    public BitArray(byte[] bytes)
+    {
+      m_length = bytes.Length * 8;
+
+      m_array = new Int32[bitsToInts(m_length)];
+      for (int i=0; i < bytes.Length; i++)
+	setByte(i, bytes[i]);
+    }
+
+    public BitArray(int capacity)
+    {
+      m_length = capacity;
+      m_array = new Int32[bitsToInts(m_length)];
+    }
+    
+    public BitArray(int[] words)
+    {
+      int arrlen = words.Length;
+      m_length = arrlen*32;
+      m_array = new Int32[arrlen];
+      Array.Copy(words, m_array, arrlen);
+    }
+    
+    public BitArray(int capacity, bool value) : this(capacity)
+    {
+      if (value)
+      {
+	// FIXME:  Maybe you can create an array pre filled?
+	for (int i = 0; i < m_array.Length; i++)
+	  m_array[i] = ~0;
+      }
+    }
+
+    private BitArray(Int32 [] array, int length)
+    {
+      m_array = array;
+      m_length = length;
+    }
+    
+
+    /* --- Public properties --- */
+    public int Count
+    {
+      get
+      {
+	return m_length;
+      }
+    }
+
+    public bool IsReadOnly
+    {
+      get
+      {
+	return false;
+      }
+    }
+
+    public bool IsSynchronized
+    {
+      get
+      {
+	return false;
+      }
+    }
+
+    public bool this[int index]
+    {
+      get
+      {
+        return Get(index);
+      }
+      set
+      {
+        Set(index, value);
+      }
+
+    }
+
+    public int Length
+    {
+      get
+      {
+	return m_length;
+      }
+      set
+      {
+	if (value < 0)
+	  throw new ArgumentOutOfRangeException();
+
+	int newLen = value;
+	if (m_length != newLen)
+	{
+	  int numints = bitsToInts(newLen);
+	  Int32 [] newArr = new Int32[numints];
+	  int copylen = (numints > m_array.Length ? m_array.Length : numints);
+	  Array.Copy(m_array, newArr, copylen);
+	  
+	  // clear out the junk bits at the end:
+	  clearJunk(newArr, newLen);
+
+	  // set the internal state
+	  m_array = newArr;
+	  m_length = newLen;
+	  m_modCount++;
+	}
+      }
+    }
+
+    public object SyncRoot
+    {
+      get
+      {
+	return this;
+      }
+    }
+
+    /* --- Public methods --- */
+    public BitArray And(BitArray operand)
+    {
+      if (operand == null)
+        throw new ArgumentNullException();
+      if (operand.m_length != m_length)
+        throw new ArgumentException();
+      
+      Int32 [] newarr = new Int32[m_array.Length];
+      for (int i=0; i < m_array.Length; i++)
+        newarr[i] = m_array[i] & operand.m_array[i];
+
+      return new BitArray(newarr, m_length);
+    }
+
+    public object Clone()
+    {
+      // FIXME: according to the doc, this should be a shallow copy.
+      // But the MS implementation seems to do a deep copy.
+      return new BitArray((Int32 [])m_array.Clone(), m_length);
+    }
+
+    [MonoTODO]	 
+    public void CopyTo(Array array, int index)
+    {
+      if (array == null)
+	throw new ArgumentNullException();
+      if (index < 0)
+	throw new ArgumentOutOfRangeException();
+      
+      // FIXME: Throw ArgumentException if array is multidimensional
+      if (index >= array.Length)
+	throw new ArgumentException();
+
+      // in each case, check to make sure enough space in array
+
+      if (array is bool[])
+      {
+	if (index + m_length >= array.Length)
+	  throw new ArgumentException();
+
+	bool [] barray = (bool []) array;
+
+	// Copy the bits into the array
+	for (int i = 0; i < m_length; i++)
+	  barray[index + i] = getBit(i);
+      }
+      else if (array is byte[])
+      {
+	int numbytes = bitsToBytes(m_length);
+	if (index + numbytes >= array.Length)
+	  throw new ArgumentException();
+
+	byte [] barray = (byte []) array;
+	// Copy the bytes into the array
+	for (int i = 0; i < numbytes; i++)
+	  barray[index + i] = getByte(i);
+      }
+      else if (array is int[])
+      {
+	int numints = bitsToInts(m_length);
+	if (index + numints >= array.Length)
+	  throw new ArgumentException();
+	Array.Copy(m_array, 0, array, index, numints);
+      }
+      else
+      {
+	throw new InvalidCastException();
+      }
+    }
+
+      
+    /*
+     * All this code for nothing... Apparently, The MS BitArray doesn't
+     * override Equals!
+     *public override bool Equals(object obj)
+    {
+      // If it's not a BitArray, then it can't be equal to us.
+      if (!(obj is BitArray))
+	return false;
+
+      // If the references are equal, then clearly the instances are equal
+      if (this == obj)
+	return true;
+
+      // If its length is different, than it can't be equal.
+      BitArray b = (BitArray) obj;
+      if (m_length != b.m_length)
+	return false;
+
+
+      // Now compare the bits.
+      // This is a little tricky, because if length doesn't divide 32,
+      // then we shouldn't compare the unused bits in the last element 
+      // of m_array.
+
+      // Compare all full ints.  If any differ, then we are not equal.
+      int numints = m_length/32;
+      for (int i = 0; i < numints; i++)
+      {
+	if (b.m_array[i] != m_array[i])
+	  return false;
+      }
+      
+      // Compare the left over bits (if any)
+      int extrabits = m_length%32;
+      if (extrabits != 0)
+      {
+	// our mask is the "extrabits" least significant bits set to 1.
+	UInt32 comparemask = ~0U >> (32 - extrabits);
+
+	// numints is rounded down, so it's safe to use as an index here,
+	// as long as extrabits > 0.
+	if ((b.m_array[numints] & comparemask) 
+	    != (m_array[numints] & comparemask))
+	  return false;
+      }
+      
+      // We passed through all the above, so we are equal.
+      return true;
+
+    }
+    *  End comment out of Equals()
+    */
+
+    public bool Get(int index)
+    {
+      if (index < 0 || index >= m_length)
+        throw new ArgumentOutOfRangeException();
+      return getBit(index);
+    }
+
+    public IEnumerator GetEnumerator()
+    {      
+      return new BitArrayEnumerator(this);
+    }
+
+    /*
+     *  Since MS doesn't appear to override Equals/GetHashCode, we don't.
+     *public override int GetHashCode()
+    {
+      // We could make this a constant time function 
+      // by just picking a constant number of bits, spread out
+      // evenly across the entire array.  For now, this will suffice.
+
+      int retval = m_length;
+
+      // Add in each array element, except for the leftover bits.
+      int numints = m_length/32;
+      for (int i = 0; i < numints; i++)
+	retval += (int)m_array[i];
+
+      // That's enough.  Adding in the leftover bits is tiring.
+
+      return retval;
+    }
+    * End comment out of GetHashCode()
+    */
+
+    public BitArray Not()
+    {
+      Int32 [] newarr = new Int32[m_array.Length];
+      for (int i=0; i < m_array.Length; i++)
+        newarr[i] = ~m_array[i];
+
+      return new BitArray(newarr, m_length);
+    }
+
+    public BitArray Or(BitArray operand)
+    {
+      if (operand == null)
+        throw new ArgumentNullException();
+      if (operand.m_length != m_length)
+        throw new ArgumentException();
+      
+      Int32 [] newarr = new Int32[m_array.Length];
+      for (int i=0; i < m_array.Length; i++)
+        newarr[i] = m_array[i] | operand.m_array[i];
+
+      return new BitArray(newarr, m_length);
+    }
+
+    public void Set(int index, bool value)
+    {
+      if (index < 0 || index >= m_length)
+        throw new ArgumentOutOfRangeException();
+      setBit(index, value);
+    }
+
+    public void SetAll(bool value)
+    {
+      if (value)
+      {
+	for (int i = 0; i < m_array.Length; i++)
+	  m_array[i] = ~0;
+	
+	// clear out the junk bits that we might have set
+	clearJunk(m_array, m_length);
+      }
+      else
+	Array.Clear(m_array, 0, m_array.Length);
+
+
+      m_modCount++;
+    }
+    
+    public BitArray Xor(BitArray operand)
+    {
+      if (operand == null)
+        throw new ArgumentNullException();
+      if (operand.m_length != m_length)
+        throw new ArgumentException();
+      
+      Int32 [] newarr = new Int32[m_array.Length];
+      for (int i=0; i < m_array.Length; i++)
+        newarr[i] = m_array[i] ^ operand.m_array[i];
+
+      return new BitArray(newarr, m_length);
+    }
+
+    class BitArrayEnumerator : IEnumerator
+    {
+      BitArray m_bitArray;
+      private bool m_current;
+      private int m_index;
+      private int m_max;
+      private int m_modCount;
+     
+      public BitArrayEnumerator(BitArray ba)
+      {
+	m_index = -1;
+	m_bitArray = ba;
+	m_max = ba.m_length;
+	m_modCount = ba.m_modCount;
+      }
+      
+      public object Current
+      {
+	get
+	{
+	  if (m_index < 0 || m_index >= m_max)
+	    throw new InvalidOperationException();
+	  return m_current;
+	}
+      }
+      
+      public bool MoveNext()
+      {
+	if (m_modCount != m_bitArray.m_modCount)
+	  throw new InvalidOperationException();
+	
+	if (m_index + 1 >= m_max)
+	  return false;
+
+	m_index++;
+	m_current = m_bitArray[m_index];
+	return true;
+      }
+      
+      public void Reset()
+      {
+	if (m_modCount != m_bitArray.m_modCount)
+	  throw new InvalidOperationException();
+	m_index = -1;
+      }
+    }
+  }
+}
+
+
+
+
+
diff --git a/mcs/class/corlib/System.Collections/CaseInsensitiveComparer.cs b/mcs/class/corlib/System.Collections/CaseInsensitiveComparer.cs
new file mode 100644
index 00000000000..b04c89aa11d
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/CaseInsensitiveComparer.cs
@@ -0,0 +1,77 @@
+//

+// System.Collections.CaseInsensitiveComparer

+//

+// Author:

+//   Sergey Chaban (serge@wildwestsoftware.com)

+//

+

+

+

+using System;

+using System.Collections;

+

+

+

+namespace System.Collections {

+

+	[Serializable]

+	public class CaseInsensitiveComparer : IComparer {

+

+		private static CaseInsensitiveComparer singleton;

+

+

+		// Class constructor

+

+		static CaseInsensitiveComparer ()

+		{

+			singleton=new CaseInsensitiveComparer ();

+		}

+

+

+		// Public instance constructor

+

+		public CaseInsensitiveComparer ()

+		{

+		}

+

+

+

+		//

+		// Public static properties

+		//

+

+		public static CaseInsensitiveComparer Default {

+			get {

+				return singleton;

+			}

+		}

+

+

+		//

+		// Instance methods

+		//

+

+		//

+		// IComparer

+		//

+

+		public int Compare (object a, object b)

+		{

+			string str1 = a as string;

+			string str2 = b as string;

+

+

+			int res = 0;

+

+			if (str1 != null && str2 != null) {

+				res = String.Compare (str1, str2, true);

+			}

+

+			return res;

+		}

+

+

+

+	} // CaseInsensitiveComparer

+}

+

diff --git a/mcs/class/corlib/System.Collections/CaseInsensitiveHashCodeProvider.cs b/mcs/class/corlib/System.Collections/CaseInsensitiveHashCodeProvider.cs
new file mode 100644
index 00000000000..8359e7883ab
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/CaseInsensitiveHashCodeProvider.cs
@@ -0,0 +1,95 @@
+//

+// System.Collections.CaseInsensitiveHashCodeProvider

+//

+// Author:

+//   Sergey Chaban (serge@wildwestsoftware.com)

+//

+

+

+

+using System;

+using System.Collections;

+using System.Globalization;

+

+namespace System.Collections {

+

+	[Serializable]

+	public class CaseInsensitiveHashCodeProvider : IHashCodeProvider {

+

+		private static CaseInsensitiveHashCodeProvider singleton;

+

+

+		// Class constructor

+

+		static CaseInsensitiveHashCodeProvider ()

+		{

+			singleton=new CaseInsensitiveHashCodeProvider ();

+		}

+

+

+

+		// Public instance constructor

+

+		public CaseInsensitiveHashCodeProvider ()

+		{

+		}

+

+		public CaseInsensitiveHashCodeProvider (CultureInfo culture)

+		{

+		}

+

+

+

+		//

+		// Public static properties

+		//

+

+		public static CaseInsensitiveHashCodeProvider Default {

+			get {

+				return singleton;

+			}

+		}

+

+

+		//

+		// Instance methods

+		//

+

+		//

+		// IHashCodeProvider

+		//

+

+		[MonoTODO]

+		public int GetHashCode (object obj)

+		{

+			if (obj == null) {

+				throw new ArgumentNullException ("obj is null");

+			}

+

+			string str = obj as string;

+

+			if (str == null) {

+				// FIXME:

+				return 0;

+			}

+

+			int h = 0;

+			char c;

+

+			if (str.Length > 0) {

+				for (int i = 0;i<str.Length;i++) {

+					c = str [i];

+

+					if (Char.IsLetter (c))

+						c = Char.ToLower (c);

+

+					h = h * 31 + c;

+				}

+			}

+

+			return h;

+		}

+

+	} // CaseInsensitiveHashCodeProvider

+}

+

diff --git a/mcs/class/corlib/System.Collections/ChangeLog b/mcs/class/corlib/System.Collections/ChangeLog
new file mode 100644
index 00000000000..04f2b0de14c
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/ChangeLog
@@ -0,0 +1,306 @@
+2002-07-22  Tim Coleman  <tim@timcoleman.com>
+	* CaseInsensitiveHashCodeProvider.cs: Added missing constructor
+		which was breaking System.Web build on linux
+
+2002-07-05  Sergey Chaban <serge@wildwestsoftware.com>
+
+	* SortedList.cs: Implemented thread-safe wrapper. Changed some
+	args to camelCase.
+
+2002-07-02  Nick Drochak  <ndrochak@gol.com>
+
+	* SortedList.cs: Constructors should use the capacity given regardless 
+	how small. After a Clear() the Capacit should be 16. Since a Dictionary
+	might be used in the constructor, make sure we trap exceptions thrown
+	by the Comparer, like in Add().
+
+2002-06-30  Nick Drochak  <ndrochak@gol.com>
+
+	* SortedList.cs: Many fixed. A lot of checking for null and throwing
+	exceptions.  A few logic bugs fixed as well
+
+2002-06-25   Nick Drochak  <ndrochak@gol.com>
+
+	* Queue.cs (CopyTo): Fix logic for copying the circular array.
+	(Enqueue): Use actual length of array to determine when to grow
+	(QueueEnumerator) Fixed Current to use array length, not capacity, and
+	fixed off-by-one errror in MoveNext().
+
+Tue Jun 4 13:08:43 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ArrayList.cs: fixed RemoveAt() implementation.
+
+2002-05-27  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayList.cs (LastIndexOf): Return -1 if searching for null, also
+	fix check of parameters sent to make sure we don't search beyond the
+	beginning of the list.
+	(ListWrapper): Throw exception if called with null.
+	We now pass all unit tests.
+
+2002-05-23  Duncan Mak  <duncan@ximian.com>
+
+	* ArrayList.cs (Wrapper): Preliminary implementation of
+	ArrayList.Wrapper (IList).
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* ArrayList.cs: Made count, capacity and dataArray the first three
+	fields in the class.  They're read by the reflection library.
+
+2002-05-21  Lawrence Pit  <loz@cable.a2000.nl>
+
+	* ArrayList.cs: Fixed bug where a capacity of 0 could be reached, 
+	thereby causing problems when trying to add elements.
+
+2002-05-06  Duncan Mak  <duncan@ximian.com>
+
+	* Queue.cs (TrimToSize): Implemented.
+	
+2002-05-05  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayList.cs: Throw RankException when constructing from a 
+	multi-dimensional array. Confirmed behavior from MS.NET
+
+Thu May 2 15:18:11 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ArrayList.cs: make mcs compile again: it's allowed to
+	call arraylist.CopyTo(array, 0) when the length of the array
+	is also 0.
+
+Wed May 1 17:05:40 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* SortedList.cs: fix RemoveAt () to use the correct length in
+	Array.Copy.
+
+2002-05-01  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayList.cs (Add & AddRange) : Throw exceptions where needed.
+
+2002/05/01  Nick Drochak <ndrochak@gol.com>
+
+	* ArrayList.cs (CopyTo) : Check parameters and throw exceptions
+	where needed.
+
+2002/04/30  Nick Drochak <ndrochak@gol.com>
+
+	* ArrayList.cs (Clear) : Throw exception if ReadOnly or FixedSize.
+		(InsertRange) : Implement.
+		(SetRange) : Implement.
+
+2002-04-30  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayList.cs (TrimToSize) : Implement.
+
+2002-04-28  Duncan Mak  <duncan@ximian.com>
+
+	* ArrayList.cs (InsertRange): 
+	(SetRange):
+	(Remove):
+	(TrimToSize): Throw exceptions where needed.
+
+2002-04-29  Nick Drochak  <ndrochak@gol.com>
+
+	* Hashtable.cs (CopyTo): Throw exceptions where needed.
+
+2002-04-28  Duncan Mak  <duncan@ximian.com>
+
+	* ArrayList.cs (ReadOnly):
+	(IList.ReadOnly): Implemented.
+
+	(Synchronized):
+	(IList.Synchronized): Implemented.
+
+	(ixedSize):
+	(IList.FixedSize): Implemented.
+
+2002-03-24  Duncan Mak  <duncan@ximian.com>
+
+	* SortedList.cs (Synchronized): Stubbed out a missing method
+	pointed out by Jakk Simm's test suite.
+
+2002-03-14  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayList.cs (FixedSize(ArrayList)): should return an ArrayList. The
+	other FixedSize() methods returns an IList.
+
+2002-03-13  Duncan Mak  <duncan@ximian.com>
+
+	* ArrayList.cs (FixedSize): Changed the return type to IList if
+	the argument is an IList.
+	(Synchronized): Ditto here.
+
+2002-03-08  Sergey Chaban <serge@wildwestsoftware.com>
+
+	* Hashtable.cs: Fixed ToPrime () bug. Removed ALLOC_GRAIN.
+	Removed unused code from static constructor.
+	GetObjectData () - Version is the same as modificationCount.
+
+2002-02-20  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayList.cs: Add MonoTODO's where necessary. Fix bugs discovered
+	by Bucky's tests. Implement a couple of things that were left undone.
+
+Mon Feb 11 19:49:25 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ArrayList.cs: Dick's fix to contructor.
+
+2002-02-07  Duncan Mak  <duncan@ximian.com>
+
+	* Hashtable.cs: Implemented parts of the ISerializable
+	interface. GetObjectData () is good, but serialization constructor
+	needs some more love.
+
+Sat Jan 5 15:56:54 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Hashtable.cs: the IDictionaryEnumerator returns DictionaryEntries.
+
+2002-01-04  Ravi Pratap  <ravi@ximian.com>
+
+	* Correct name to MonoTODO everywhere.
+
+2002-01-04  Ravi Pratap  <ravi@ximian.com>
+
+	* ArrayList.cs : Setting an index does not implicitly
+	extend the arraylist : remove FIXME.
+
+	Decorate incomplete elements with the TODO attribute.
+
+	* BitArray.cs : Insert TODO attributes where appropriate.
+
+	* CaseInsensitiveHashcodeProvider.cs: Ditto.
+
+	* Hashtable.cs, SortedList.cs : Ditto.
+	
+Thu Dec 13 20:17:08 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* ArrayList.cs: implemented AddRange(), CopyTo().
+
+2001-11-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* DictionaryBase.cs: Implemented.
+
+Wed Nov 14 16:45:49 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* ArrayList.cs: implement ArrayListEnumerator.
+	* Hashtable.cs: hardcode the prime number table.
+
+2001-11-06 Nick Drochak <ndrochak@gol.com>
+	* Queue.cs: Fixes from Ricardardo.  QueueTest also updated.
+
+2001-11-04 Nick Drochak <ndrochak@gol.com>
+	* Queue.cs: Fixed small syntax errors that were preventing the compile.
+	I changed the build file to include Queue.cs as well.
+
+2001-11-04 Nick Drochak <ndrochak@gol.com>
+	* ArrayList.cs: Fixed "off by one" error when shifting left the array when
+	items are removed.
+
+	* CollectionBase.cs: Added OnValidate(), OnRemove() and OnRemoveComplete()
+	hook methods to the RemoveAt() method.
+
+2001-11-04 Nick Drochak <ndrochak@gol.com>
+	* ArrayList.cs: Added private enumerator class and make GetEnumerator()
+	methods return an instance of it.
+
+Tue Sep 25 18:52:48 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* ArrayList.cs: fix Insert () to check capacity, not count.
+
+Tue Sep 25 16:54:54 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* DictionaryEntry.cs: added.
+
+2001-08-10  Dietmar Maurer  <dietmar@ximian.com>
+
+	* common.src: removed duplicate entries
+
+2001-08-08 Nick Drochak <ndrochak@gol.com>
+
+         * ReadOnlyCollectionBase.cs: Initialized private member.
+         * CollectionBase.cs: Initialized private member.
+	 * common.src : Added ReadOnlyCollectionBase.cs and CollectionBase.cs
+	 * /mcs/class/makefile: Used $(SYSTEMROOT) instead of hard coded //c/winnt
+	 * /mcs/makefile: Used $(SYSTEMROOT) instead of hard coded //c/winnt
+
+2001-08-08 Nick Drochak <nick@jobdragon.com>
+
+         * CollectionBase.cs: Add
+         * ReadOnlyCollectionBase.cs: Add
+         * CollectionBaseTest.cs: Add
+         * ReadOnlyCollectionBaseTest.cs: Add
+
+2001-07-31 Garrett Rooney <rooneg@electricjellyfish.net>
+
+	* StackTest.cs: Add Test case for System.Collections.Stack.  
+	Contributed by Chris Hynes <chrish@assistedsolutions.com>
+
+2001-07-30 Garrett Rooney <rooneg@electricjellyfish.net>
+
+	* Stack.cs: Clone() doesn't need to check if it's synchronized, since 
+	we override it in SyncStack anyway...  
+
+	* Stack.cs: Pop() now shrinks the array if we drop below 1/4 full, to 
+	avoid using massive amounts of memory that are not necessary.  We only 
+	drop to half the current size, which I hope will avoid the 'ping-pong' 
+	effect.
+
+	* Stack.cs: SyncStack.IsReadOnly should return stack.IsReadOnly 
+	instead of just returning false, since we may have a ReadOnly wrapper 
+	in the future (although i can't imagine why).  Thanks to David 
+	Menestrina <dmenest@yahoo.com> for pointing this out.
+
+2001-07-23  Sergey Chaban <serge@wildwestsoftware.com>
+
+	*  Hashtable.cs: Fixed bug in Clear(), the Count wasn't zeroed.
+           From now, Clear() increases modification count.
+           Fixed HCP bug in GetHash(object) - hcp.GetHashCode() was used
+           instead of hcp.GetHashCode(key). This was resulted in the
+           insanely long lookup times when HashCodeProvider was used to
+           construct Hashtable. Added thread-safe wrapper.
+
+2001-07-16  David Menestrina <dmenest@yahoo.com>
+
+         * BitArray.cs: Add
+         * BitArrayTest.cs: Add
+
+2001-07-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* IDictionary.cs (Collections): IDictionary implements ICollection
+	as well.  Thanks Sergey!
+
+2001-07-18  Garrett Rooney  <rooneg@electricjellyfish.net>
+
+	* Stack.cs Removed unnecessary locking from many methods of 
+	SyncStack, removed SyncEnumerator because it was unnecessary, 
+	added a modCount member to Stack and Stack.Enumerator, to 
+	ensure that the Stack has not been modified out form under the 
+	Enumerator, and changed the Enumerator to use a reference to the 
+	stack rather than copying over the contents array.
+
+2001-07-17  David Menestrina  <dmenest@yahoo.com>
+
+        * Added implementation of BitArray.
+
+2001-07-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* Hashtable.cs: Removed call to d.Count in the Hashtable
+	constructor that takes an IDictionary as IDictionary does not
+	provide a Count field.
+
+2001-07-15  Sean MacIsaac  <macisaac@ximian.com>
+
+	* IDictionary.cs: Clear was clear.
+
+2001-07-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* All files: Renamespace things to System.
+
+2001-07-05  Vladimir Vukicevic  <vladimir@ximian.com>
+
+	* ArrayList.cs: initial checkin and implementation
+
+	* ICollection.cs, IComprarer.cs, IDictionary.cs,
+	  IDictionaryEnumerator.cs, IEnumerable.cs, IHashCodeProvider.cs,
+	  IList.cs: initial checkin
+
diff --git a/mcs/class/corlib/System.Collections/CollectionBase.cs b/mcs/class/corlib/System.Collections/CollectionBase.cs
new file mode 100644
index 00000000000..743888a3849
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/CollectionBase.cs
@@ -0,0 +1,137 @@
+//

+// System.Collections.CollectionBase.cs

+//

+// Author:

+//   Nick Drochak II (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak II

+//

+

+using System;

+

+namespace System.Collections {

+

+	[Serializable]

+	public abstract class CollectionBase : IList, ICollection, IEnumerable {

+

+		// private instance properties

+		private ArrayList myList;

+		

+		// public instance properties

+		public int Count { get { return InnerList.Count; } }

+		

+		// Public Instance Methods

+		public IEnumerator GetEnumerator() { return InnerList.GetEnumerator(); }

+		public void Clear() { 

+			OnClear();

+			InnerList.Clear(); 

+			OnClearComplete();

+		}

+		public void RemoveAt (int index) {

+			object objectToRemove;

+			objectToRemove = InnerList[index];

+			OnValidate(objectToRemove);

+			OnRemove(index, objectToRemove);

+			InnerList.RemoveAt(index);

+			OnRemoveComplete(index, objectToRemove);

+		}

+		

+		// Protected Instance Constructors

+		protected CollectionBase() { 

+			this.myList = new ArrayList();

+		}

+		

+		// Protected Instance Properties

+		protected ArrayList InnerList {get { return this.myList; } }

+		protected IList List {get { return this; } }

+		

+		// Protected Instance Methods

+		protected virtual void OnClear() { }

+		protected virtual void OnClearComplete() { }

+		

+		protected virtual void OnInsert(int index, object value) { }

+		protected virtual void OnInsertComplete(int index, object value) { }

+

+		protected virtual void OnRemove(int index, object value) { }

+		protected virtual void OnRemoveComplete(int index, object value) { }

+

+		protected virtual void OnSet(int index, object oldValue, object newValue) { }

+		protected virtual void OnSetComplete(int index, object oldValue, object newValue) { }

+

+		protected virtual void OnValidate(object value) {

+			if (null == value) {

+				throw new System.ArgumentNullException("CollectionBase.OnValidate: Invalid parameter value passed to method: null");

+			}

+		}

+		

+		// ICollection methods

+		void ICollection.CopyTo(Array array, int index) {

+			InnerList.CopyTo(array, index);

+		}

+		object ICollection.SyncRoot {

+			get { return InnerList.SyncRoot; }

+		}

+		bool ICollection.IsSynchronized {

+			get { return InnerList.IsSynchronized; }

+		}

+

+		// IList methods

+		int IList.Add (object value) {

+			int newPosition;

+			OnValidate(value);

+			newPosition = InnerList.Count;

+			OnInsert(newPosition, value);

+			InnerList.Add(value);

+			OnInsertComplete(newPosition, value);

+			return newPosition;

+		}

+		

+		bool IList.Contains (object value) {

+			return InnerList.Contains(value);

+		}

+

+		int IList.IndexOf (object value) {

+			return InnerList.IndexOf(value);

+		}

+

+		void IList.Insert (int index, object value) {

+			OnValidate(value);

+			OnInsert(index, value);

+			InnerList.Insert(index, value);

+			OnInsertComplete(index, value);

+		}

+

+		void IList.Remove (object value) {

+			int removeIndex;

+			OnValidate(value);

+			removeIndex = InnerList.IndexOf(value);

+			OnRemove(removeIndex, value);

+			InnerList.Remove(value);

+			OnRemoveComplete(removeIndex, value);

+		}

+

+		// IList properties

+		bool IList.IsFixedSize { 

+			get { return InnerList.IsFixedSize; }

+		}

+

+		bool IList.IsReadOnly { 

+			get { return InnerList.IsReadOnly; }

+		}

+

+		object IList.this[int index] { 

+			get { return InnerList[index]; }

+			set { 

+				object oldValue;

+				// make sure we have been given a valid value

+				OnValidate(value);

+				// save a reference to the object that is in the list now

+				oldValue = InnerList[index];

+				

+				OnSet(index, oldValue, value);

+				InnerList[index] = value;

+				OnSetComplete(index, oldValue, value);

+			}

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Collections/Comparer.cs b/mcs/class/corlib/System.Collections/Comparer.cs
new file mode 100644
index 00000000000..6591c70334c
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/Comparer.cs
@@ -0,0 +1,56 @@
+//

+// System.Collections.Comparer

+//

+// Author:

+//   Sergey Chaban (serge@wildwestsoftware.com)

+//

+

+

+using System;

+using System.Collections;

+

+

+namespace System.Collections {

+

+	[Serializable]

+	public sealed class Comparer : IComparer {

+

+		public static readonly Comparer Default;

+

+

+		// Class constructor

+

+		static Comparer ()

+		{

+			Default = new Comparer ();

+		}

+

+

+

+		// Public instance constructor

+

+		private Comparer ()

+		{

+		}

+

+

+

+		// IComparer

+

+		public int Compare (object a, object b)

+		{

+			if (a == b)
+				return 0;
+			else if (a == null)
+				return -1;
+			else if (b == null)
+				return 1;
+			else if (a is IComparable)
+				return (a as IComparable).CompareTo (b);
+			else if (b is IComparable)
+				return -(b as IComparable).CompareTo (a);
+
+			throw new ArgumentException ("Neither a nor b IComparable");
+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Collections/DictionaryBase.cs b/mcs/class/corlib/System.Collections/DictionaryBase.cs
new file mode 100755
index 00000000000..ba01e9cdace
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/DictionaryBase.cs
@@ -0,0 +1,372 @@
+//
+// System.Collections.DictionaryBase.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System.Collections {
+
+	/// <summary>
+	///   An abstract class that provides a simple way to monitor changes to a
+	///   Hashtable.  Derived classes overwrite one or more of the `On' methods
+	///   to track the changes to the Hashtable.
+	/// </summary>
+	///
+	/// <remarks>
+	///   This class is a base class that can simplify the development of
+	///   strongly typed collections.  The idea being that the insertion of elements
+	///   into the Hashtable can be forced to be of a given type.
+	///
+	///   The `On' members are protected and designed to be used only by derived
+	///   classes.
+	/// </remarks>
+	[Serializable]
+	public abstract class DictionaryBase : IDictionary, ICollection, IEnumerable {
+
+		Hashtable dictionary;
+		
+		protected DictionaryBase ()
+		{
+			dictionary = new Hashtable ();
+		}
+
+		/// <summary>
+		///   Clears the contents of the dictionary
+		/// </summary>
+		public void Clear ()
+		{
+			OnClear ();
+			dictionary.Clear ();
+			OnClearComplete ();
+		}
+
+		/// <summary>
+		///   Returns the number of items in the dictionary
+		/// </summary>
+		public int Count {
+			get {
+				return dictionary.Count;
+			}
+		}
+
+		/// <summary>
+		///   The collection contained as an IDictionary
+		/// </summary>
+		protected IDictionary Dictionary {
+			get {
+				return dictionary;
+			}
+		}
+
+		/// <summary>
+		///   The internal Hashtable representation for this dictionary
+		/// </summary>
+		protected Hashtable InnerHashtable {
+			get {
+				return dictionary;
+			}
+		}
+
+		/// <summary>
+		///   Copies the contents of the Dictionary into the target array
+		/// </summary>
+		/// <param name="array">
+		///   The array to copy the contents of the dictionary to.  The
+		///   array must have a zero-based indexing
+		/// </param>
+		/// <param name="index">
+		///   Starting index within the array where to copy the objects
+		///   to.
+		/// </param>
+		public void CopyTo (Array array, int index)
+		{
+			if (array == null)
+				throw new ArgumentNullException ("array");
+			if (index < 0)
+				throw new ArgumentOutOfRangeException ("index must be possitive");
+			if (array.Rank > 1)
+				throw new ArgumentException ("array is multidimensional");
+			int size = array.Length;
+			if (index > size)
+				throw new ArgumentException ("index is larger than array size");
+			if (index + Count > size)
+				throw new ArgumentException ("Copy will overlflow array");
+
+			DoCopy (array, index);
+		}
+
+		/// <summary>
+		///   Internal routine called by CopyTo to perform the actual
+		///   copying of the data
+		/// </summary>
+		private void DoCopy (Array array, int index)
+		{
+			foreach (DictionaryEntry de in dictionary)
+				array.SetValue (de, index++);
+		}
+
+		/// <summary>
+		///   Returns an enumerator for the dictionary
+		/// </summary>
+		public IDictionaryEnumerator GetEnumerator ()
+		{
+			return dictionary.GetEnumerator ();
+		}
+
+		/// <summary>
+		///   Hook invoked before the clear operation
+		///   is performed on the DictionaryBase
+		/// </summary>
+		protected virtual void OnClear ()
+		{
+		}
+
+		/// <summary>
+		///   Hook invoked after the clear operation
+		///   is performed on the DictionaryBase
+		/// </summary>
+		///
+		/// <remarks>
+		///   The default implementation does nothing, derived classes
+		///   can override this method to be notified of changes
+		/// </remarks>
+		protected virtual void OnClearComplete ()
+		{
+		}
+
+		/// <summary>
+		///   Hook invoked while fetching data from the DictionaryBase.
+		/// </summary>
+		///
+		/// <remarks>
+		///   This method is provided as a simple way to override the values
+		///   returned by the DictionaryBase. 
+		/// </remarks>
+		///
+		/// <param name="key">Key of the object to retrieve</param>
+		/// <param name="current_value">Current value of the object associated with
+		/// <paramref name="key"/></param>
+		protected virtual object OnGet (object key, object current_value)
+		{
+			return current_value;
+		}
+
+		/// <summary>
+		///   Hook invoked before inserting data into the DictionaryBase.
+		/// </summary>
+		///
+		/// <remarks>
+		///   Derived classes can override this method and perform some
+		///   action before the <paramref name="current_value"/> is inserted
+		///   into the dictionary.
+		///
+		///   The default implementation does nothing, derived classes
+		///   can override this method to be notified of changes
+		/// </remarks>
+		///
+		/// <param name="key">Key of the object to insert</param>
+		/// <param name="current_value">Current value of the object associated with
+		/// <paramref name="key"/></param>
+		protected virtual void OnInsert (object key, object current_value)
+		{
+		}
+		
+		/// <summary>
+		///   Hook invoked after inserting the data into the DictionaryBase
+		/// </summary>
+		///
+		/// <remarks>
+		///   The default implementation does nothing, derived classes
+		///   can override this method to be notified of changes
+		/// </remarks>
+		///
+		/// <param name="key">Key of the object to insert</param>
+		/// <param name="current_value">Current value of the object associated with
+		/// <paramref name="key"/></param>
+		protected virtual void OnInsertComplete (object key, object current_value)
+		{
+		}
+
+		/// <summary>
+		///   Hook invoked before changing a value for a key in the DictionaryBase.
+		/// </summary>
+		///
+		/// <remarks>
+		///   Derived classes can override this method and perform some
+		///   action before the <paramref name="current_value"/> is changed
+		///   in the dictionary.  
+		/// </remarks>
+		///
+		/// <param name="key">Key of the object to change</param>
+		/// <param name="current_value">Current value of the object associated with
+		/// <paramref name="key"/></param>
+		protected virtual void OnSet (object key, object current_value, object new_value)
+		{
+		}
+		
+		/// <summary>
+		///   Hook invoked after changing a value for a key in the DictionaryBase.
+		/// </summary>
+		///
+		/// <remarks>
+		///   The default implementation does nothing, derived classes
+		///   can override this method to be notified of changes
+		/// </remarks>
+		///
+		/// <param name="key">Key of the object to change</param>
+		/// <param name="current_value">Current value of the object associated with
+		/// <paramref name="key"/></param>
+		protected virtual void OnSetComplete (object key, object current_value, object new_value)
+		{
+		}
+
+		/// <summary>
+		///   Hook invoked before removing a key/value from the DictionaryBase.
+		/// </summary>
+		///
+		/// <remarks>
+		///   Derived classes can override this method and perform some
+		///   action before the <paramref name="current_value"/> is removed
+		///   from the dictionary.  
+		/// </remarks>
+		///
+		/// <param name="key">Key of the object to remove</param>
+		/// <param name="current_value">Current value of the object associated with
+		/// <paramref name="key"/></param>
+		protected virtual void OnRemove (object key, object current_value)
+		{
+		}
+		
+		/// <summary>
+		///   Hook invoked after removing a key/value from the DictionaryBase.
+		/// </summary>
+		///
+		/// <remarks>
+		///   The default implementation does nothing, derived classes
+		///   can override this method to be notified of changes.
+		/// </remarks>
+		///
+		/// <param name="key">Key of the object to remove</param>
+		/// <param name="current_value">Current value of the object associated with
+		/// <paramref name="key"/></param>
+		protected virtual void OnRemoveComplete (object key, object current_value)
+		{
+		}
+		
+		/// <summary>
+		///   Hook invoked after the value has been validated
+		/// </summary>
+		///
+		/// <remarks>
+		///   The default implementation does nothing, derived classes
+		///   can override this method to monitor the DictionaryBase.
+		/// </remarks>
+		///
+		/// <param name="key">Key of the object to retrieve</param>
+		/// <param name="current_value">Current value of the object associated with
+		/// <paramref name="key"/></param>
+		protected virtual void OnValidate (object key, object current_value)
+		{
+		}
+
+		bool IDictionary.IsFixedSize {
+			get {
+				return false;
+			}
+		}
+
+		bool IDictionary.IsReadOnly {
+			get {
+				return false;
+			}
+		}
+
+		object IDictionary.this [object key] {
+			get {
+				object value = dictionary [key];
+
+				OnGet (key, value);
+				return value;
+			}
+
+			set {
+				if (dictionary.ContainsKey (key)){
+					object current_value = dictionary [key];
+					OnSet (key, current_value, value);
+					dictionary [key] = value;
+					OnSetComplete (key, current_value, value);
+				} else {
+					OnInsert (key, value);
+					dictionary [key] = value;
+					OnInsertComplete (key, value);
+				}
+			}
+		}
+
+		ICollection IDictionary.Keys {
+			get {
+				return dictionary.Keys;
+			}
+		}
+
+		ICollection IDictionary.Values {
+			get {
+				return dictionary.Values;
+			}
+		}
+
+		/// <summary>
+		///   Adds a key/value pair to the dictionary.
+		/// </summary>
+		void IDictionary.Add (object key, object value)
+		{
+			OnInsert (key, value);
+			dictionary.Add (key, value);
+			OnInsertComplete (key, value);
+		}
+
+		/// <summary>
+		///   Removes a Dictionary Entry based on its key
+		/// </summary>
+		void IDictionary.Remove (object key)
+		{
+			if (! dictionary.ContainsKey (key))
+				return;
+
+			object value = dictionary [key];
+			OnRemove (key, value);
+			dictionary.Remove (key);
+			OnRemoveComplete (key, value);
+		}
+
+		/// <summary>
+		///   Tests whether the dictionary contains an entry
+		/// </summary>
+		bool IDictionary.Contains (object key)
+		{
+			return dictionary.Contains (key);
+		}
+
+		bool ICollection.IsSynchronized {
+			get {
+				return dictionary.IsSynchronized;
+			}
+		}
+
+		object ICollection.SyncRoot {
+			get {
+				return dictionary.SyncRoot;
+			}
+		}
+
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			return dictionary.GetEnumerator ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Collections/DictionaryEntry.cs b/mcs/class/corlib/System.Collections/DictionaryEntry.cs
new file mode 100644
index 00000000000..e6cafab7cda
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/DictionaryEntry.cs
@@ -0,0 +1,24 @@
+using System;
+
+namespace System.Collections {
+
+	[Serializable]
+	public struct DictionaryEntry {
+		private object key;
+		private object val;
+
+		public DictionaryEntry( object k, object value) {
+			key = k;
+			val = value;
+		}
+		
+		public object Key {
+			get {return key;}
+			set {key = value;}
+		}
+		public object Value {
+			get {return val;}
+			set {val = value;}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Collections/Hashtable.cs b/mcs/class/corlib/System.Collections/Hashtable.cs
new file mode 100644
index 00000000000..4557d15ab16
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/Hashtable.cs
@@ -0,0 +1,1046 @@
+//

+// System.Collections.Hashtable

+//

+// Author:

+//   Sergey Chaban (serge@wildwestsoftware.com)

+//

+

+

+

+using System;

+using System.Collections;

+using System.Runtime.Serialization;

+

+

+// TODO: Interfaces to implement: ISerializable and IDeserializationCallback;

+

+

+namespace System.Collections {

+

+	[MonoTODO]

+	[Serializable]

+	public class Hashtable : IDictionary, ICollection, 

+		IEnumerable, ICloneable, ISerializable, IDeserializationCallback

+	{

+

+		internal struct Slot {

+			internal Object key;

+

+			internal Object value;

+

+			// Hashcode. Chains are also marked through this.

+			internal int hashMix;

+		}

+

+		//

+		// Private data

+		//

+

+		private readonly static int CHAIN_MARKER  = ~Int32.MaxValue;

+

+

+		// Used as indicator for the removed parts of a chain.

+		private readonly static Object REMOVED_MARKER = new Object ();

+

+

+		private int inUse;

+		private int modificationCount;

+		private float loadFactor;

+		private Slot [] table;

+		private int threshold;

+

+		private IHashCodeProvider hcpRef;

+		private IComparer comparerRef;

+

+		private static int [] primeTbl = {

+			11,

+			19,

+			37,

+			73,

+			109,

+			163,

+			251,

+			367,

+			557,

+			823,

+			1237,

+			1861,

+			2777,

+			4177,

+			6247,

+			9371,

+			14057,

+			21089,

+			31627,

+			47431,

+			71143,

+			106721,

+			160073,

+			240101,

+			360163,

+			540217,

+			810343,

+			1215497,

+			1823231,

+			2734867,

+			4102283,

+			6153409,

+			9230113,

+			13845163

+		};

+

+		// Class constructor

+

+		static Hashtable () {

+			// NOTE: previously this static constructor was used

+			//       to calculate primeTbl, now primeTbl is

+			//       hardcoded and constructor does nothing

+			//       useful except for forcing compiler to

+			//       eliminate beforefieldinit from signature.

+		}

+

+

+		//

+		// Constructors

+		//

+

+		public Hashtable () : this (0, 1.0f) {}

+

+

+		public Hashtable (int capacity, float loadFactor, IHashCodeProvider hcp, IComparer comparer) {

+			if (capacity<0)

+				throw new ArgumentOutOfRangeException ("negative capacity");

+

+			if (loadFactor<0.1 || loadFactor>1)

+				throw new ArgumentOutOfRangeException ("load factor");

+

+			if (capacity == 0) ++capacity;

+			this.loadFactor = 0.75f*loadFactor;

+			int size = (int) (capacity/this.loadFactor);

+			size = ToPrime (size);

+			this.SetTable (new Slot [size]);

+

+			this.hcp = hcp;

+			this.comparer = comparer;

+

+			this.inUse = 0;

+			this.modificationCount = 0;

+

+		}

+

+		public Hashtable (int capacity, float loadFactor) :

+			this (capacity, loadFactor, null, null)

+		{

+		}

+

+		public Hashtable (int capacity) : this (capacity, 1.0f)

+		{

+		}

+

+		public Hashtable (int capacity, 

+		                  IHashCodeProvider hcp, 

+		                  IComparer comparer)

+			: this (capacity, 1.0f, hcp, comparer)

+		{

+		}

+

+

+		public Hashtable (IDictionary d, float loadFactor, 

+		                  IHashCodeProvider hcp, IComparer comparer)

+			: this (d!=null ? d.Count : 0,

+		                loadFactor, hcp, comparer)

+		{

+

+			if (d  ==  null)

+				throw new ArgumentNullException ("dictionary");

+

+			IDictionaryEnumerator it = d.GetEnumerator ();

+			while (it.MoveNext ()) {

+				Add (it.Key, it.Value);

+			}

+			

+		}

+

+		public Hashtable (IDictionary d, float loadFactor)

+		       : this (d, loadFactor, null, null)

+		{

+		}

+

+

+		public Hashtable (IDictionary d) : this (d, 1.0f)

+		{

+		}

+

+		public Hashtable (IDictionary d, IHashCodeProvider hcp, IComparer comparer)

+		                 : this (d, 1.0f, hcp, comparer)

+		{

+		}

+

+		public Hashtable (IHashCodeProvider hcp, IComparer comparer)

+		                 : this (1, 1.0f, hcp, comparer)

+		{

+		}

+

+		[MonoTODO]

+		protected Hashtable (SerializationInfo info, StreamingContext context)

+		{

+//			loadFactor = info.GetValue ("LoadFactor", Type.GetType ("System.Float"));

+//			comparerRef = info.GetValue ("Comparer", typeof (object));

+//			hcpRef = info.GetValue ("HashCodeProvider", typeof (object));

+//			this.Count = info.GetValue ("HashSize");

+// 			this.Keys = info.GetValue ("Keys");

+// 			this.Values = info.GetValue ("Values");

+ 		}

+

+		//

+		// Properties

+		//

+

+		protected IComparer comparer {

+			set {

+				comparerRef = value;

+			}

+			get {

+				return comparerRef;

+			}

+		}

+

+		protected IHashCodeProvider hcp {

+			set {

+				hcpRef = value;

+			}

+			get {

+				return hcpRef;

+			}

+		}

+

+		// ICollection

+

+		public virtual int Count {

+			get {

+				return inUse;

+			}

+		}

+

+		public virtual bool IsSynchronized {

+			get {

+				return false;

+			}

+		}

+

+		public virtual Object SyncRoot {

+			get {

+				return this;

+			}

+		}

+

+

+

+		// IDictionary

+

+		public virtual bool IsFixedSize {

+			get {

+				return false;

+			}

+		}

+

+

+		public virtual bool IsReadOnly {

+			get {

+				return false;

+			}

+		}

+

+		public virtual ICollection Keys {

+			get {

+				return new HashKeys (this);

+			}

+		}

+

+		public virtual ICollection Values {

+			get {

+				return new HashValues (this);

+			}

+		}

+

+

+

+		public virtual Object this [Object key] {

+			get {

+				return GetImpl (key);

+			}

+			set {

+				PutImpl (key, value, true);

+			}

+		}

+

+

+

+

+		//

+		// Interface methods

+		//

+

+

+		// IEnumerable

+

+		IEnumerator IEnumerable.GetEnumerator ()

+		{

+			return new Enumerator (this, EnumeratorMode.KEY_MODE);

+		}

+

+

+		// ICollection

+		public virtual void CopyTo (Array array, int arrayIndex)

+		{

+			if (null == array)

+				throw new ArgumentNullException ("array");

+			

+			if (arrayIndex < 0)

+				throw new ArgumentOutOfRangeException ("arrayIndex");

+

+			if (array.Rank > 1)

+				throw new ArgumentException ("array is multidimensional");

+

+			if (arrayIndex >= array.Length)

+				throw new ArgumentException ("arrayIndex is equal to or greater than array.Length");

+			

+			if (arrayIndex + this.inUse > array.Length)

+				throw new ArgumentException ("Not enough room from arrayIndex to end of array for this Hashtable");

+			

+			IDictionaryEnumerator it = GetEnumerator ();

+			int i = arrayIndex;

+

+			while (it.MoveNext ()) {

+				array.SetValue (it.Entry, i++);

+			}

+		}

+

+

+		// IDictionary

+

+		public virtual void Add (Object key, Object value)

+		{

+			PutImpl (key, value, false);

+		}

+

+		public virtual void Clear () 

+		{

+			for (int i = 0;i<table.Length;i++) {

+				table [i].key = null;

+				table [i].value = null;

+				table [i].hashMix = 0;

+			}

+

+			inUse = 0;

+			modificationCount++;

+		}

+

+		public virtual bool Contains (Object key)

+		{

+			return (Find (key) >= 0);

+		}

+

+		public virtual IDictionaryEnumerator GetEnumerator ()

+		{

+			return new Enumerator (this, EnumeratorMode.ENTRY_MODE);

+		}

+

+		public virtual void Remove (Object key)

+		{

+			int i = Find (key);

+			Slot [] table = this.table;

+			if (i >= 0) {

+				int h = table [i].hashMix;

+				h &= CHAIN_MARKER;

+				table [i].hashMix = h;

+				table [i].key = (h != 0)

+				              ? REMOVED_MARKER

+				              : null;

+				table [i].value = null;

+				--inUse;

+				++modificationCount;

+			}

+		}

+

+

+

+

+		public virtual bool ContainsKey (object key)

+		{

+			return Contains (key);

+		}

+

+		public virtual bool ContainsValue (object value)

+		{

+			int size = this.table.Length;

+			Slot [] table = this.table;

+

+			for (int i = 0; i < size; i++) {

+				Slot entry = table [i];

+				if (entry.key != null && entry.key!= REMOVED_MARKER

+				    && value.Equals (entry.value)) {

+					return true;

+				}

+			}

+			return false;

+		}

+

+

+		// ICloneable

+

+		public virtual object Clone ()

+		{

+			Hashtable ht = new Hashtable (Count, hcp, comparer);

+			ht.modificationCount = this.modificationCount;

+			ht.inUse = this.inUse;

+			ht.AdjustThreshold ();

+

+			// FIXME: maybe it's faster to simply

+			//        copy the back-end array?

+

+			IDictionaryEnumerator it = GetEnumerator ();

+			while (it.MoveNext ()) {

+				ht [it.Key] = it.Value;

+			}

+

+			return ht;

+		}

+

+		[MonoTODO]

+		public virtual void GetObjectData (SerializationInfo info, StreamingContext context)

+		{

+			info.AddValue ("LoadFactor", loadFactor);

+			info.AddValue ("Version", modificationCount);

+			info.AddValue ("Comparer", comparerRef);

+			info.AddValue ("HashCodeProvider", hcpRef);

+			info.AddValue ("HashSize", this.Count );

+			info.AddValue ("Keys", this.Keys);

+			info.AddValue ("Values", this.Values);

+		}

+

+		[MonoTODO]

+		public virtual void OnDeserialization (object sender)
+		{
+			throw new NotImplementedException ();
+		}
+

+		/// <summary>

+		///  Returns a synchronized (thread-safe)

+		///  wrapper for the Hashtable.

+		/// </summary>

+		public static Hashtable Synchronized (Hashtable table)

+		{

+			return new SynchedHashtable (table);

+		}

+

+

+

+		//

+		// Protected instance methods

+		//

+

+		/// <summary>Returns the hash code for the specified key.</summary>

+		protected virtual int GetHash (Object key)

+		{

+			IHashCodeProvider hcp = this.hcp;

+			return (hcp!= null)

+			        ? hcp.GetHashCode (key)

+			        : key.GetHashCode ();

+		}

+

+		/// <summary>

+		///  Compares a specific Object with a specific key

+		///  in the Hashtable.

+		/// </summary>

+		protected virtual bool KeyEquals (Object item, Object key)

+		{

+			IComparer c = this.comparer;

+			if (c!= null)

+				return (c.Compare (item, key) == 0);

+			else

+				return item.Equals (key);

+		}

+

+

+

+		//

+		// Private instance methods

+		//

+

+		private void AdjustThreshold ()

+		{

+			int size = table.Length;

+

+			threshold = (int) (size*loadFactor);

+			if (this.threshold >= size)

+				threshold = size-1;

+		}

+

+		private void SetTable (Slot [] table)

+		{

+			if (table == null)

+				throw new ArgumentNullException ("table");

+

+			this.table = table;

+			AdjustThreshold ();

+		}

+

+		private Object GetImpl (Object key)

+		{

+			int i = Find (key);

+

+			if (i >= 0)

+				return table [i].value;

+			else

+				return null;

+		}

+

+

+		private int Find (Object key)

+		{

+			if (key == null)

+				throw new ArgumentNullException ("null key");

+

+			uint size = (uint) this.table.Length;

+			int h = this.GetHash (key) & Int32.MaxValue;

+			uint spot = (uint)h;

+			uint step = (uint) ((h >> 5)+1) % (size-1)+1;

+			Slot[] table = this.table;

+

+			for (int i = 0; i < size;i++) {

+				int indx = (int) (spot % size);

+				Slot entry = table [indx];

+				Object k = entry.key;

+				if (k == null)

+					return -1;

+				if ((entry.hashMix & Int32.MaxValue) == h

+				    && this.KeyEquals (key, k)) {

+					return indx;

+				}

+

+				if ((entry.hashMix & CHAIN_MARKER) == 0)

+					return -1;

+

+				spot+= step;

+			}

+			return -1;

+		}

+

+

+		private void Rehash ()

+		{

+			int oldSize = this.table.Length;

+

+			// From the SDK docs:

+			//   Hashtable is automatically increased

+			//   to the smallest prime number that is larger

+			//   than twice the current number of Hashtable buckets

+			uint newSize = (uint)ToPrime ((oldSize<<1)|1);

+

+

+			Slot [] newTable = new Slot [newSize];

+			Slot [] table = this.table;

+

+			for (int i = 0;i<oldSize;i++) {

+				Slot s = table [i];

+				if (s.key!= null) {

+					int h = s.hashMix & Int32.MaxValue;

+					uint spot = (uint)h;

+					uint step = ((uint) (h>>5)+1)% (newSize-1)+1;

+					for (uint j = spot%newSize;;spot+= step, j = spot%newSize) {

+						// No check for REMOVED_MARKER here, 

+						// because the table is just allocated.

+						if (newTable [j].key == null) {

+							newTable [j].key = s.key;

+							newTable [j].value = s.value;

+							newTable [j].hashMix |= h;

+							break;

+						} else {

+							newTable [j].hashMix |= CHAIN_MARKER;

+						}

+					}

+				}

+			}

+

+			++this.modificationCount;

+

+			this.SetTable (newTable);

+		}

+

+

+		private void PutImpl (Object key, Object value, bool overwrite)

+		{

+			if (key == null)

+				throw new ArgumentNullException ("null key");

+

+			uint size = (uint)this.table.Length;

+			if (this.inUse >= this.threshold) {

+				this.Rehash ();

+				size = (uint)this.table.Length;

+			}

+

+			int h = this.GetHash (key) & Int32.MaxValue;

+			uint spot = (uint)h;

+			uint step = (uint) ((spot>>5)+1)% (size-1)+1;

+			Slot [] table = this.table;

+			Slot entry;

+

+			int freeIndx = -1;

+			for (int i = 0; i < size; i++) {

+				int indx = (int) (spot % size);

+				entry = table [indx];

+

+				if (freeIndx == -1

+				    && entry.key == REMOVED_MARKER

+				    && (entry.hashMix & CHAIN_MARKER)!= 0)

+					freeIndx = indx;

+

+				if (entry.key == null ||

+				    (entry.key == REMOVED_MARKER

+				     && (entry.hashMix & CHAIN_MARKER)!= 0)) {

+

+					if (freeIndx == -1)

+						freeIndx = indx;

+					break;

+				}

+

+				if ((entry.hashMix & Int32.MaxValue) == h && KeyEquals (key, entry.key)) {

+					if (overwrite) {

+						table [indx].value = value;

+						++this.modificationCount;

+					} else {

+						// Handle Add ():

+						// An entry with the same key already exists in the Hashtable.

+						throw new ArgumentException ("Key duplication");

+					}

+					return;

+				}

+

+				if (freeIndx == -1) {

+					table [indx].hashMix |= CHAIN_MARKER;

+				}

+

+				spot+= step;

+

+			}

+

+			if (freeIndx!= -1) {

+				table [freeIndx].key = key;

+				table [freeIndx].value = value;

+				table [freeIndx].hashMix |= h;

+

+				++this.inUse;

+				++this.modificationCount;

+			}

+

+		}

+

+		private void  CopyToArray (Array arr, int i, 

+					   EnumeratorMode mode)

+		{

+			IEnumerator it = new Enumerator (this, mode);

+

+			while (it.MoveNext ()) {

+				arr.SetValue (it.Current, i++);

+			}

+		}

+

+

+

+		//

+		// Private static methods

+		//

+		private static bool TestPrime (int x)

+		{

+			if ((x & 1) != 0) {

+				for (int n = 3; n< (int)Math.Sqrt (x); n += 2) {

+					if ((x % n) == 0)

+						return false;

+				}

+				return true;

+			}

+			// There is only one even prime - 2.

+			return (x == 2);

+		}

+

+		private static int CalcPrime (int x)

+		{

+			for (int i = (x & (~1))-1; i< Int32.MaxValue; i += 2) {

+				if (TestPrime (i)) return i;

+			}

+			return x;

+		}

+

+		private static int ToPrime (int x)

+		{

+			for (int i = 0; i < primeTbl.Length; i++) {

+				if (x <= primeTbl [i])

+					return primeTbl [i];

+			}

+			return CalcPrime (x);

+		}

+

+

+

+

+		//

+		// Inner classes

+		//

+

+		public enum EnumeratorMode : int {KEY_MODE = 0, VALUE_MODE, ENTRY_MODE};

+

+		protected sealed class Enumerator : IDictionaryEnumerator, IEnumerator {

+

+			private Hashtable host;

+			private int stamp;

+			private int pos;

+			private int size;

+			private EnumeratorMode mode;

+

+			private Object currentKey;

+			private Object currentValue;

+

+			private readonly static string xstr = "Hashtable.Enumerator: snapshot out of sync.";

+

+			public Enumerator (Hashtable host, EnumeratorMode mode) {

+				this.host = host;

+				stamp = host.modificationCount;

+				size = host.table.Length;

+				this.mode = mode;

+				Reset ();

+			}

+

+			public Enumerator (Hashtable host)

+			           : this (host, EnumeratorMode.KEY_MODE) {}

+

+

+			private void FailFast ()

+			{

+				if (host.modificationCount != stamp) {

+					throw new InvalidOperationException (xstr);

+				}

+			}

+

+			public void Reset ()

+			{

+				FailFast ();

+

+				pos = -1;

+				currentKey = null;

+				currentValue = null;

+			}

+

+			public bool MoveNext ()

+			{

+				FailFast ();

+

+				if (pos < size) {

+					while (++pos < size) {

+						Slot entry = host.table [pos];

+

+						if (entry.key != null && entry.key != REMOVED_MARKER) {

+							currentKey = entry.key;

+							currentValue = entry.value;

+							return true;

+						}

+					}

+				}

+

+				currentKey = null;

+				currentValue = null;

+				return false;

+			}

+

+			public DictionaryEntry Entry

+			{

+				get {

+					FailFast ();

+					return new DictionaryEntry (currentKey, currentValue);

+				}

+			}

+

+			public Object Key {

+				get {

+					FailFast ();

+					return currentKey;

+				}

+			}

+

+			public Object Value {

+				get {

+					FailFast ();

+					return currentValue;

+				}

+			}

+

+			public Object Current {

+				get {

+					FailFast ();

+					switch (mode) {

+					case EnumeratorMode.KEY_MODE:

+						return currentKey;

+					case EnumeratorMode.VALUE_MODE:

+						return currentValue;

+					case EnumeratorMode.ENTRY_MODE:

+						return new DictionaryEntry (currentKey, currentValue);

+					}

+					throw new Exception ("should never happen");

+				}

+			}

+		}

+

+

+

+		protected class HashKeys : ICollection, IEnumerable {

+

+			private Hashtable host;

+			private int count;

+

+			public HashKeys (Hashtable host) {

+				if (host == null)

+					throw new ArgumentNullException ();

+

+				this.host = host;

+				this.count = host.Count;

+			}

+

+			// ICollection

+

+			public virtual int Count {

+				get {

+					return count;

+				}

+			}

+

+			public virtual bool IsSynchronized {

+				get {

+					return host.IsSynchronized;

+				}

+			}

+

+			public virtual Object SyncRoot {

+				get {return host.SyncRoot;}

+			}

+

+			public virtual void CopyTo (Array array, int arrayIndex)

+			{

+				host.CopyToArray (array, arrayIndex, EnumeratorMode.KEY_MODE);

+			}

+

+			// IEnumerable

+

+			public virtual IEnumerator GetEnumerator ()

+			{

+				return new Hashtable.Enumerator (host, EnumeratorMode.KEY_MODE);

+			}

+		}

+

+

+		protected class HashValues : ICollection, IEnumerable {

+

+			private Hashtable host;

+			private int count;

+

+			public HashValues (Hashtable host) {

+				if (host == null)

+					throw new ArgumentNullException ();

+

+				this.host = host;

+				this.count = host.Count;

+			}

+

+			// ICollection

+

+			public virtual int Count {

+				get {

+					return count;

+				}

+			}

+

+			public virtual bool IsSynchronized {

+				get {

+					return host.IsSynchronized;

+				}

+			}

+

+			public virtual Object SyncRoot {

+				get {

+					return host.SyncRoot;

+				}

+			}

+

+			public virtual void CopyTo (Array array, int arrayIndex)

+			{

+				host.CopyToArray (array, arrayIndex, EnumeratorMode.VALUE_MODE);

+			}

+

+			// IEnumerable

+

+			public virtual IEnumerator GetEnumerator ()

+			{

+				return new Hashtable.Enumerator (host, EnumeratorMode.VALUE_MODE);

+			}

+		}

+

+

+

+		protected class SynchedHashtable : Hashtable, IEnumerable {

+

+			private Hashtable host;

+

+			public SynchedHashtable (Hashtable host) {

+				if (host == null)

+					throw new ArgumentNullException ();

+

+				this.host = host;

+			}

+

+			// ICollection

+

+			public override int Count {

+				get {

+					return host.Count;

+				}

+			}

+

+			public override bool IsSynchronized {

+				get {

+					return true;

+				}

+			}

+

+			public override Object SyncRoot {

+				get {

+					return host.SyncRoot;

+				}

+			}

+

+

+

+			// IDictionary

+

+			public override bool IsFixedSize {

+				get {

+					return host.IsFixedSize;

+				}     

+			}

+

+

+			public override bool IsReadOnly {

+				get {

+					return host.IsReadOnly;

+				}

+			}

+

+			public override ICollection Keys {

+				get {

+					ICollection keys = null;

+					lock (host.SyncRoot) {

+						keys = host.Keys;

+					}

+					return keys;

+				}

+			}

+

+			public override ICollection Values {

+				get {

+					ICollection vals = null;

+					lock (host.SyncRoot) {

+						vals = host.Values;

+					}

+					return vals;

+				}

+			}

+

+

+

+			public override Object this [Object key] {

+				get {

+					return host.GetImpl (key);

+				}

+				set {

+					lock (host.SyncRoot) {

+						host.PutImpl (key, value, true);

+					}

+				}

+			}

+

+			// IEnumerable

+

+			IEnumerator IEnumerable.GetEnumerator ()

+			{

+				return new Enumerator (host, EnumeratorMode.KEY_MODE);

+			}

+

+

+

+

+			// ICollection

+

+			public override void CopyTo (Array array, int arrayIndex)

+			{

+				host.CopyTo (array, arrayIndex);

+			}

+

+

+			// IDictionary

+

+			public override void Add (Object key, Object value)

+			{

+				lock (host.SyncRoot) {

+					host.PutImpl (key, value, false);

+				}

+			}

+

+			public override void Clear () 

+			{

+				lock (host.SyncRoot) {

+					host.Clear ();

+				}

+			}

+

+			public override bool Contains (Object key)

+			{

+				return (host.Find (key) >= 0);

+			}

+

+			public override IDictionaryEnumerator GetEnumerator ()

+			{

+				return new Enumerator (host, EnumeratorMode.ENTRY_MODE);

+			}

+

+			public override void Remove (Object key)

+			{

+				lock (host.SyncRoot) {

+					host.Remove (key);

+				}

+			}

+

+

+

+			public override bool ContainsKey (object key)

+			{

+				return host.Contains (key);

+			}

+

+			public override bool ContainsValue (object value)

+			{

+				return host.ContainsValue (value);

+			}

+

+

+			// ICloneable

+

+			public override object Clone ()

+			{

+				return (host.Clone () as Hashtable);

+			}

+

+		} // SynchedHashtable

+

+

+	} // Hashtable

+

+}

+

diff --git a/mcs/class/corlib/System.Collections/ICollection.cs b/mcs/class/corlib/System.Collections/ICollection.cs
new file mode 100644
index 00000000000..2189931cae8
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/ICollection.cs
@@ -0,0 +1,24 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+//
+// System.Collections.ICollection
+//
+// Author:
+//    Vladimir Vukicevic (vladimir@pobox.com)
+//
+// (C) 2001 Vladimir Vukicevic
+//
+
+using System;
+
+namespace System.Collections {
+
+	public interface ICollection : IEnumerable {
+		int Count { get; }
+
+		bool IsSynchronized { get; }
+
+		object SyncRoot { get; }
+
+		void CopyTo (Array array, int index);
+	}
+}
diff --git a/mcs/class/corlib/System.Collections/IComparer.cs b/mcs/class/corlib/System.Collections/IComparer.cs
new file mode 100644
index 00000000000..3d1ee2ef609
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/IComparer.cs
@@ -0,0 +1,19 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+//
+// System.Collections.IComparer
+//
+// Author:
+//    Vladimir Vukicevic (vladimir@pobox.com)
+//
+// (C) 2001 Vladimir Vukicevic
+//
+
+using System;
+
+namespace System.Collections {
+
+	public interface IComparer {
+		int Compare (object x, object y);
+	}
+
+}
diff --git a/mcs/class/corlib/System.Collections/IDictionary.cs b/mcs/class/corlib/System.Collections/IDictionary.cs
new file mode 100644
index 00000000000..a03ab07d904
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/IDictionary.cs
@@ -0,0 +1,40 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+//
+// System.Collections.IDictionary
+//
+// Author:
+//    Vladimir Vukicevic (vladimir@pobox.com)
+//
+// (C) 2001 Vladimir Vukicevic
+//
+
+using System;
+
+namespace System.Collections {
+
+	public interface IDictionary : ICollection {
+		// properties
+
+		bool IsFixedSize { get; }
+
+		bool IsReadOnly { get; }
+
+		object this[object key] { get; set; }
+
+		ICollection Keys { get; }
+
+		ICollection Values { get; }
+
+		// methods
+
+		void Add (object key, object value);
+
+		void Clear ();
+
+		bool Contains (object key);
+
+		new IDictionaryEnumerator GetEnumerator ();
+
+		void Remove (object key);
+	}
+}
diff --git a/mcs/class/corlib/System.Collections/IDictionaryEnumerator.cs b/mcs/class/corlib/System.Collections/IDictionaryEnumerator.cs
new file mode 100644
index 00000000000..fb1998d55f0
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/IDictionaryEnumerator.cs
@@ -0,0 +1,20 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+//
+// System.Collections.IDictionaryEnumerator
+//
+// Author:
+//    Vladimir Vukicevic (vladimir@pobox.com)
+//
+// (C) 2001 Vladimir Vukicevic
+//
+
+using System;
+
+namespace System.Collections {
+
+	public interface IDictionaryEnumerator : IEnumerator {
+		DictionaryEntry Entry { get; }
+		object Key { get; }
+		object Value { get; }
+	}
+}
diff --git a/mcs/class/corlib/System.Collections/IEnumerable.cs b/mcs/class/corlib/System.Collections/IEnumerable.cs
new file mode 100644
index 00000000000..de0a57475dc
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/IEnumerable.cs
@@ -0,0 +1,18 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+//
+// System.Collections.IEnumerable
+//
+// Author:
+//    Vladimir Vukicevic (vladimir@pobox.com)
+//
+// (C) 2001 Vladimir Vukicevic
+//
+
+using System;
+
+namespace System.Collections {
+
+	public interface IEnumerable {
+		IEnumerator GetEnumerator();
+	}
+}
diff --git a/mcs/class/corlib/System.Collections/IEnumerator.cs b/mcs/class/corlib/System.Collections/IEnumerator.cs
new file mode 100644
index 00000000000..06d250c8b7e
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/IEnumerator.cs
@@ -0,0 +1,22 @@
+//
+// System.Collections.IEnumerator
+//
+// Author:
+//    Vladimir Vukicevic (vladimir@pobox.com)
+//
+// (C) 2001 Vladimir Vukicevic
+//
+
+using System;
+
+namespace System.Collections {
+
+    public interface IEnumerator {
+	object Current { get; }
+
+	bool MoveNext ();
+
+	void Reset ();
+    }
+
+}
diff --git a/mcs/class/corlib/System.Collections/IHashCodeProvider.cs b/mcs/class/corlib/System.Collections/IHashCodeProvider.cs
new file mode 100644
index 00000000000..15fc4df45bf
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/IHashCodeProvider.cs
@@ -0,0 +1,18 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+//
+// System.Collections.IHashCodeProvider
+//
+// Author:
+//    Vladimir Vukicevic (vladimir@pobox.com)
+//
+// (C) 2001 Vladimir Vukicevic
+//
+
+using System;
+
+namespace System.Collections {
+
+	public interface IHashCodeProvider {
+		int GetHashCode (object obj);
+	}
+}
diff --git a/mcs/class/corlib/System.Collections/IList.cs b/mcs/class/corlib/System.Collections/IList.cs
new file mode 100644
index 00000000000..e039a8358c3
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/IList.cs
@@ -0,0 +1,40 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-
+//
+// System.Collections.IList
+//
+// Author:
+//    Vladimir Vukicevic (vladimir@pobox.com)
+//
+// (C) 2001 Vladimir Vukicevic
+//
+
+using System;
+
+namespace System.Collections {
+
+	public interface IList : ICollection, IEnumerable {
+		// properties
+
+		bool IsFixedSize { get; }
+
+		bool IsReadOnly { get; }
+
+		object this[int index] { get; set; }
+
+		// methods
+
+		int Add (object value);
+
+		void Clear ();
+
+		bool Contains (object value);
+
+		int IndexOf (object value);
+
+		void Insert (int index, object value);
+
+		void Remove (object value);
+
+		void RemoveAt (int index);
+	}
+}
diff --git a/mcs/class/corlib/System.Collections/Queue.cs b/mcs/class/corlib/System.Collections/Queue.cs
new file mode 100644
index 00000000000..e416eac87ed
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/Queue.cs
@@ -0,0 +1,342 @@
+//

+// System.Collections.Queue

+//

+// Author:

+//    Ricardo Fernández Pascual

+//

+// (C) 2001 Ricardo Fernández Pascual

+//

+

+using System;

+using System.Collections;

+

+namespace System.Collections {

+

+	[Serializable]

+	public class Queue : ICollection, IEnumerable, ICloneable {

+

+		private object[] contents;

+		private int head = 0;   // points to the first used slot

+		private int count = 0;

+		private int capacity = 16;

+		private float growFactor = 2.0F;

+		private int modCount = 0;

+

+		public Queue () {

+			contents = new object[capacity];

+		}

+

+		public Queue (ICollection collection) {

+			capacity = collection.Count;

+			contents = new object[capacity];

+			count = capacity;

+			collection.CopyTo (contents, 0);

+		}

+

+		public Queue (int initialCapacity) {

+			capacity = initialCapacity;

+			contents = new object[capacity];

+		}

+

+		public Queue (int initialCapacity, float growFactor) {

+			capacity = initialCapacity;

+			contents = new object[capacity];

+			// LAMESPEC: The spec says nothing, but I think this 

+			// should throw an exception if growFactor <= 1.0

+			this.growFactor = growFactor;

+		}

+		

+		// from ICollection

+

+		public virtual int Count {

+			get { return count; }

+		}

+

+		public virtual bool IsSynchronized {

+			get { return false; }

+		}

+

+		public virtual object SyncRoot {

+			get { return this; }

+		}

+

+		public virtual void CopyTo (Array array, int index) {

+			if (array == null) {

+				throw new ArgumentNullException ();

+			}

+

+			if (index < 0) {

+				throw new ArgumentOutOfRangeException ();

+			}

+

+			if (array.Rank > 1 

+			    || index >= array.Length 

+			    || count > array.Length - index) {

+				throw new ArgumentException ();

+			}

+			

+			int contents_length = contents.Length;

+			int length_from_head = contents_length - head;

+			// copy the contents of the circular array

+			Array.Copy (contents, head, array, index,

+				    Math.Min (count, length_from_head));

+			if (count >  length_from_head)

+				Array.Copy (contents, 0, array, 

+					    index + length_from_head,

+					    count - length_from_head);

+		}

+

+		// from IEnumerable

+		

+		public virtual IEnumerator GetEnumerator () {

+			return new QueueEnumerator (this);

+		}

+

+		// from ICloneable

+		

+		public virtual object Clone () {

+			Queue newQueue;

+			

+			newQueue = new Queue (); // FIXME: improve this...

+			

+			newQueue.contents = new object[this.contents.Length];

+			Array.Copy (this.contents, 0, newQueue.contents, 0,

+				    this.contents.Length);

+			newQueue.head = this.head;

+			newQueue.count = this.count;

+			newQueue.capacity = this.capacity;

+			newQueue.growFactor = this.growFactor;

+

+			return newQueue;

+		}

+

+		// FIXME: should override Equals?

+

+		// from Queue spec

+

+/*

+		public virtual bool IsReadOnly {

+			get { return false; }

+		}

+*/

+

+		public virtual void Clear () {

+			modCount++;

+			head = 0;

+			count = 0;

+			// FIXME: Should allocate a new contents array? 

+			//        Should null the current array?

+		}

+

+		public virtual bool Contains (object obj) {

+			int tail = head + count;

+			if (obj == null) {

+				for (int i = head; i < tail; i++) {

+					if (contents[i % capacity] == null) 

+						return true;

+				}

+			} else {

+				for (int i = head; i < tail; i++) {

+					if (obj.Equals (contents[i % capacity]))

+						return true;

+				}

+			}

+			return false;

+		}

+		

+		public virtual object Dequeue ()

+		{

+			modCount++;

+			if (count < 1)

+				throw new InvalidOperationException ();

+			object result = contents[head];

+			head = (head + 1) % capacity;

+			count--;

+			return result;

+		}

+

+		public virtual void Enqueue (object obj) {

+			modCount++;

+			if (count == contents.Length) 

+				grow ();

+			contents[(head + count) % contents.Length] = obj;

+			count++;

+		}

+

+		public virtual object Peek () {

+			if (count < 1)

+				throw new InvalidOperationException ();

+			return contents[head];

+		}

+

+		public static Queue Synchronized (Queue queue) {

+			if (queue == null) {

+				throw new ArgumentNullException ();

+			}

+			return new SyncQueue (queue);

+		}

+

+		public virtual object[] ToArray () {

+			object[] ret = new object[count];

+			CopyTo (ret, 0);

+			return ret;

+		}

+

+		public virtual void TrimToSize() {

+			object[] trimmed = new object [count];

+			CopyTo (trimmed, 0);

+			contents = trimmed;

+		}

+

+		// private methods

+

+		private void grow () {

+			int newCapacity = (int) Math.Ceiling

+				(contents.Length * growFactor);

+			object[] newContents = new object[newCapacity];

+			CopyTo (newContents, 0);

+			contents = newContents;

+			head = 0;

+		}

+

+		// private classes

+

+		private class SyncQueue : Queue {

+			Queue queue;

+			

+			internal SyncQueue (Queue queue) {

+				this.queue = queue;

+			}

+			

+			public override int Count {

+				get { 

+					lock (queue) {

+						return queue.count; 

+					}

+				}

+			}

+

+			public override bool IsSynchronized {

+				get { 

+					lock (queue) {

+						return queue.IsSynchronized;

+					}

+				}

+			}

+

+			public override object SyncRoot {

+				get { 

+					return queue.SyncRoot; 

+				}

+			}

+

+			public override void CopyTo (Array array, int index) {

+				lock (queue) {

+					queue.CopyTo (array, index);

+				}

+			}

+			

+			public override IEnumerator GetEnumerator () {

+				lock (queue) {

+					return queue.GetEnumerator ();

+				}

+			}

+			

+			public override object Clone () {

+				lock (queue) {

+					return queue.Clone ();

+				}

+			}

+			

+/*

+			public override bool IsReadOnly {

+				get { 

+					lock (queue) {

+						return queue.IsReadOnly;

+					}

+				}

+			}

+*/

+

+			public override void Clear () {

+				lock (queue) {

+					queue.Clear ();

+				}

+			}

+

+			public override bool Contains (object obj) {

+				lock (queue) {

+					return queue.Contains (obj);

+				}

+			}

+		

+			public override object Dequeue () {

+				lock (queue) {

+					return queue.Dequeue ();

+				}

+			}

+			

+			public override void Enqueue (object obj) {

+				lock (queue) {

+					queue.Enqueue (obj);

+				}

+			}

+

+			public override object Peek () {

+				lock (queue) {

+					return queue.Peek ();

+				}

+			}

+

+			public override object[] ToArray () {

+				lock (queue) {

+					return queue.ToArray ();

+				}

+			}

+		}

+

+		[Serializable]

+		private class QueueEnumerator : IEnumerator {

+			Queue queue;

+			private int modCount;

+			private int current;

+

+			internal QueueEnumerator (Queue q) {

+				queue = q;

+				modCount = q.modCount;

+				current = -1;  // one element before the head

+			}

+

+			public virtual object Current {

+				get {

+					if (modCount != queue.modCount 

+					    || current < 0

+					    || current >= queue.count)

+						throw new InvalidOperationException ();

+					return queue.contents[(queue.head + current) % queue.contents.Length];

+				}

+			}

+

+			public virtual bool MoveNext () {

+				if (modCount != queue.modCount) {

+					throw new InvalidOperationException ();

+				}

+

+				if (current >= queue.count - 1) {

+					return false;

+				} else {

+					current++;

+					return true;

+				}

+			}

+

+			public virtual void Reset () {

+				if (modCount != queue.modCount) {

+					throw new InvalidOperationException();

+				}

+				current = -1;

+			}

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Collections/ReadOnlyCollectionBase.cs b/mcs/class/corlib/System.Collections/ReadOnlyCollectionBase.cs
new file mode 100644
index 00000000000..9aafb5ff282
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/ReadOnlyCollectionBase.cs
@@ -0,0 +1,45 @@
+//

+// System.Collections.ReadOnlyCollectionBase.cs

+//

+// Author:

+//   Nick Drochak II (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak II

+//

+

+using System;

+

+namespace System.Collections {

+

+	[Serializable]

+	public abstract class ReadOnlyCollectionBase : ICollection,	IEnumerable {

+

+		// private instance properties

+		private System.Collections.ArrayList myList;

+		

+		// public instance properties

+		public int Count { get { return InnerList.Count; } }

+		

+		// Public Instance Methods

+		public System.Collections.IEnumerator GetEnumerator() { return InnerList.GetEnumerator(); }

+		

+		// Protected Instance Constructors

+		protected ReadOnlyCollectionBase() {

+			this.myList = new System.Collections.ArrayList();

+		}

+		

+		// Protected Instance Properties

+		protected System.Collections.ArrayList InnerList {get { return this.myList; } }

+		

+		// ICollection methods

+		void ICollection.CopyTo(Array array, int index) {

+			lock (InnerList) { InnerList.CopyTo(array, index); }

+		}

+		object ICollection.SyncRoot {

+				get { return InnerList.SyncRoot; }

+			}

+		bool ICollection.IsSynchronized {

+			get { return InnerList.IsSynchronized; }

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Collections/SortedList.cs b/mcs/class/corlib/System.Collections/SortedList.cs
new file mode 100644
index 00000000000..e36500a2845
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/SortedList.cs
@@ -0,0 +1,1134 @@
+// 

+// System.Collections.SortedList

+// 

+// Author:

+//   Sergey Chaban (serge@wildwestsoftware.com)

+// 

+

+

+using System;

+using System.Collections;

+using System.Globalization;

+

+namespace System.Collections {

+

+	/// <summary>

+	///  Represents a collection of associated keys and values

+	///  that are sorted by the keys and are accessible by key

+	///  and by index.

+	/// </summary>

+	[Serializable]

+	public class SortedList : IDictionary, ICollection,

+	                          IEnumerable, ICloneable {

+

+

+		internal struct Slot {

+			internal Object key;

+			internal Object value;

+		}

+

+		private readonly static int INITIAL_SIZE = 16;

+

+		public enum EnumeratorMode : int {KEY_MODE = 0, VALUE_MODE}

+

+		private int inUse;

+		private int modificationCount;

+		private Slot[] table;

+		private IComparer comparer;

+

+		//

+		// Constructors

+		//

+		public SortedList () : this (INITIAL_SIZE)

+		{

+		}

+

+		public SortedList (int initialCapacity)

+			: this (null, initialCapacity)

+		{

+		}

+

+		public SortedList (IComparer comparer, int initialCapacity)

+		{

+			if (initialCapacity < 0)

+				throw new ArgumentOutOfRangeException();

+

+			this.comparer = comparer;

+			InitTable (initialCapacity, true);

+		}

+

+		public SortedList (IComparer comparer)

+		{

+			this.comparer = comparer;

+			InitTable (INITIAL_SIZE, true);

+		}

+

+

+		public SortedList (IDictionary d) : this (d, null)

+		{

+		}

+

+		public SortedList (IDictionary d, IComparer comparer)

+		{

+			if (d  ==  null)

+				throw new ArgumentNullException ("dictionary");

+

+			InitTable (d.Count, true);

+			this.comparer = comparer;

+

+			IDictionaryEnumerator it = d.GetEnumerator ();

+			while (it.MoveNext ()) {

+				if (it.Key is IComparable) {

+					Add (it.Key, it.Value);

+				} else {

+					throw new InvalidCastException("!IComparable");

+				}

+			}

+		}

+

+		//

+		// Properties

+		//

+

+		// ICollection

+

+		public virtual int Count {

+			get {

+				return inUse;

+			}

+		}

+

+		public virtual bool IsSynchronized {

+			get {

+				return false;

+			}

+		}

+

+		public virtual Object SyncRoot {

+			get {

+				return this;

+			}

+		}

+

+

+		// IDictionary

+

+		public virtual bool IsFixedSize {

+			get {

+				return false;

+			}

+		}

+

+

+		public virtual bool IsReadOnly {

+			get {

+				return false;

+			}

+		}

+

+		public virtual ICollection Keys {

+			get {

+				return new ListKeys (this);

+			}

+		}

+

+		public virtual ICollection Values {

+			get {

+				return new ListValues (this);

+			}

+		}

+

+

+

+		public virtual Object this [Object key] {

+			get {

+				if (key == null)

+					throw new ArgumentNullException();

+				return GetImpl (key);

+			}

+			set {

+				if (key == null)

+					throw new ArgumentNullException();

+				if (IsReadOnly)

+					throw new NotSupportedException("SortedList is Read Only.");

+				if (Find(key) < 0 && IsFixedSize)

+					throw new NotSupportedException("Key not found and SortedList is fixed size.");

+

+				PutImpl (key, value, true);

+			}

+		}

+

+		public virtual int Capacity {

+			get {

+				return table.Length;

+			}

+			set {

+				Slot [] table = this.table;

+				int current = table.Length;

+

+				if (inUse > value)

+					throw new ArgumentOutOfRangeException("capacity too small");

+

+				if (value > current) {

+					Slot [] newTable = new Slot [value];

+					Array.Copy (table, newTable, current);

+					this.table = newTable;

+				}

+			}

+		}

+

+		//

+		// Public instance methods.

+		//

+

+		// IEnumerable

+

+		IEnumerator IEnumerable.GetEnumerator ()

+		{

+			return new Enumerator (this, EnumeratorMode.KEY_MODE);

+		}

+

+

+		// IDictionary

+

+		public virtual void Add (object key, object value)

+		{

+			PutImpl (key, value, false);

+		}

+

+

+		public virtual void Clear () 

+		{

+			this.table = new Slot [INITIAL_SIZE];

+			inUse = 0;

+			modificationCount++;

+		}

+

+		public virtual bool Contains (object key)

+		{

+			if (null == key)

+				throw new ArgumentNullException();

+

+			try {

+				return (Find (key) >= 0);

+			} catch (Exception) {

+				throw new InvalidOperationException();

+			}

+		}

+

+

+		public virtual IDictionaryEnumerator GetEnumerator ()

+		{

+			return new Enumerator (this, EnumeratorMode.KEY_MODE);

+		}

+

+		public virtual void Remove (object key)

+		{

+			int i = IndexOfKey (key);

+			if (i >= 0) RemoveAt (i);

+		}

+

+

+		// ICollection

+

+		public virtual void CopyTo (Array array, int arrayIndex)

+		{

+			if (null == array)

+				throw new ArgumentNullException();

+

+			if (arrayIndex < 0)

+				throw new ArgumentOutOfRangeException();

+			

+			if (array.Rank > 1)

+				throw new ArgumentException("array is multi-dimensional");

+			if (arrayIndex >= array.Length)

+				throw new ArgumentNullException("arrayIndex is greater than or equal to array.Length");

+			if (Count > (array.Length - arrayIndex))

+				throw new ArgumentNullException("Not enough space in array from arrayIndex to end of array");

+

+			IDictionaryEnumerator it = GetEnumerator ();

+			int i = arrayIndex;

+

+			while (it.MoveNext ()) {

+				array.SetValue (it.Entry, i++);

+			}

+		}

+

+

+

+		// ICloneable

+

+		public virtual object Clone ()

+		{

+			SortedList sl = new SortedList (this, comparer);

+			sl.modificationCount = this.modificationCount;

+			return sl;

+		}

+

+

+

+

+		//

+		// SortedList

+		//

+

+		public virtual IList GetKeyList ()

+		{

+			return new ListKeys (this);

+		}

+

+

+		public virtual IList GetValueList ()

+		{

+			return new ListValues (this);

+		}

+

+

+		public virtual void RemoveAt (int index)

+		{

+			Slot [] table = this.table;

+			int cnt = Count;

+			if (index >= 0 && index < cnt) {

+				if (index != cnt - 1) {

+					Array.Copy (table, index+1, table, index, cnt-1-index);

+				} else {

+					table [index].key = null;

+					table [index].value = null;

+				}

+				--inUse;

+				++modificationCount;

+			} else {

+				throw new ArgumentOutOfRangeException("index out of range");

+			}

+		}

+

+		public virtual int IndexOfKey (object key)

+		{

+			if (null == key)

+				throw new ArgumentNullException();

+

+			int indx = 0;

+			try {

+				indx = Find (key);

+			} catch (Exception) {

+				throw new InvalidOperationException();

+			}

+

+			return (indx | (indx >> 31));

+		}

+

+

+		public virtual int IndexOfValue (object value)

+		{

+			if (null == value)

+				return -1;

+

+			Slot [] table = this.table;

+			int len = table.Length;

+

+			for (int i=0; i < len; i++) {

+				object trialValue = table[i].value;

+				if ((null != trialValue) && (trialValue.Equals (value))) {

+					return i;

+				}

+			}

+

+			return -1;

+		}

+

+

+		public virtual bool ContainsKey (object key)

+		{

+			if (null == key)

+				throw new ArgumentNullException();

+

+			try {

+				return Contains (key);   

+			} catch (Exception) {

+				throw new InvalidOperationException();

+			}

+		}

+

+

+		public virtual bool ContainsValue (object value)

+		{

+			return IndexOfValue (value) >= 0;

+		}

+

+

+		public virtual object GetByIndex (int index)

+		{

+			if (index >= 0 && index < Count) {

+				return table [index].value;

+			} else {

+				throw new ArgumentOutOfRangeException("index out of range");

+			}

+		}

+

+

+		public virtual void SetByIndex (int index, object value)

+		{

+			if (index >= 0 && index < Count) {

+				table [index].value = value;

+			} else {

+				throw new ArgumentOutOfRangeException("index out of range");

+			}

+		}

+

+

+		public virtual object GetKey (int index)

+		{

+			if (index >= 0 && index < Count) {

+				return table [index].key;

+			} else {

+				throw new ArgumentOutOfRangeException("index out of range");

+			}

+		}

+

+		public static SortedList Synchronized (SortedList list)

+		{

+			if (list == null)

+				throw new ArgumentNullException (Locale.GetText ("Base list is null."));

+			return new SynchedSortedList (list);

+		}

+

+		public virtual void TrimToSize ()

+		{

+			// From Beta2:

+			// Trimming an empty SortedList sets the capacity

+			// of the SortedList to the default capacity,

+			// not zero.

+			if (Count == 0) Resize (INITIAL_SIZE, false);

+			else Resize (Count, true);

+		}

+

+

+		//

+		// Private methods

+		//

+

+

+		private void Resize (int n, bool copy)

+		{

+			Slot [] table = this.table;

+			Slot [] newTable = new Slot [n];

+			if (copy) Array.Copy (table, 0, newTable, 0, n);

+			this.table = newTable;

+		}

+

+

+		private void EnsureCapacity (int n, int free)

+		{

+			Slot [] table = this.table;

+			Slot [] newTable = null;

+			int cap = Capacity;

+			bool gap = (free >=0 && free < Count);

+

+			if (n > cap) {

+				newTable = new Slot [n << 1];

+			}

+

+			if (newTable != null) {

+				if (gap) {

+					int copyLen = free;

+					if (copyLen > 0) {

+						Array.Copy (table, 0, newTable, 0, copyLen);

+					}

+					copyLen = Count - free;

+					if (copyLen > 0) {

+						Array.Copy (table, free, newTable, free+1, copyLen);

+					}

+				} else {

+					// Just a resizing, copy the entire table.

+					Array.Copy (table, newTable, Count);

+				}

+				this.table = newTable;

+			} else if (gap) {

+				Array.Copy (table, free, table, free+1, Count - free);

+			}

+		}

+

+

+		private void PutImpl (object key, object value, bool overwrite)

+		{

+			if (key == null)

+				throw new ArgumentNullException ("null key");

+

+			Slot [] table = this.table;

+

+			int freeIndx = -1;

+

+			try {

+				freeIndx = Find (key);

+			} catch (Exception) {

+				throw new InvalidOperationException();

+			}

+

+			if (freeIndx >= 0) {

+				if (!overwrite)

+					throw new ArgumentException("element already exists");

+

+				table [freeIndx].value = value;

+				return;

+			}

+

+			freeIndx = ~freeIndx;

+

+			if (freeIndx > Capacity + 1)

+				throw new Exception ("SortedList::internal error ("+key+", "+value+") at ["+freeIndx+"]");

+

+

+			EnsureCapacity (Count+1, freeIndx);

+

+			table = this.table;

+			table [freeIndx].key = key;

+			table [freeIndx].value = value;

+

+			++inUse;

+			++modificationCount;

+

+		}

+

+

+		private object GetImpl (object key)

+		{

+			int i = Find (key);

+

+			if (i >= 0)

+				return table [i].value;

+			else

+				return null;

+		}

+

+		private void InitTable (int capacity)

+		{

+			InitTable (capacity, false);

+		}

+

+		private void InitTable (int capacity, bool forceSize) {

+			if (!forceSize && (capacity < INITIAL_SIZE)) capacity = INITIAL_SIZE;

+			this.table = new Slot [capacity];

+			this.inUse = 0;

+			this.modificationCount = 0;

+		}

+

+		private void  CopyToArray (Array arr, int i, 

+					   EnumeratorMode mode)

+		{

+			IEnumerator it = new Enumerator (this, mode);

+

+			while (it.MoveNext ()) {

+				arr.SetValue (it.Current, i++);

+			}

+		}

+

+

+		private int Find (object key)

+		{

+			Slot [] table = this.table;

+			int len = Count;

+

+			if (len == 0) return ~0;

+

+			IComparer comparer = (this.comparer == null)

+			                      ? Comparer.Default

+			                      : this.comparer;

+

+			int left = 0;

+			int right = len-1;

+

+			while (left <= right) {

+				int guess = (left + right) >> 1;

+

+				int cmp = comparer.Compare (key, table[guess].key);

+				if (cmp == 0) return guess;

+

+				if (cmp >  0) left = guess+1;

+				else right = guess-1;

+			}

+

+			return ~left;

+		}

+

+

+

+		//

+		// Inner classes

+		//

+

+

+		protected sealed class Enumerator : IDictionaryEnumerator,

+		                                    IEnumerator {

+

+			private SortedList host;

+			private int stamp;

+			private int pos;

+			private int size;

+			private EnumeratorMode mode;

+

+			private object currentKey;

+			private object currentValue;

+

+			private readonly static string xstr = "SortedList.Enumerator: snapshot out of sync.";

+

+			public Enumerator (SortedList host, EnumeratorMode mode)

+			{

+				this.host = host;

+				stamp = host.modificationCount;

+				size = host.Count;

+				this.mode = mode;

+				Reset ();

+			}

+

+			public Enumerator (SortedList host)

+			: this (host, EnumeratorMode.KEY_MODE)

+			{

+			}

+

+

+			private void FailFast ()

+			{

+				if (host.modificationCount != stamp) {

+					throw new InvalidOperationException (xstr);

+				}

+			}

+

+			public void Reset ()

+			{

+				FailFast ();

+

+				pos = -1;

+				currentKey = null;

+				currentValue = null;

+			}

+

+			public bool MoveNext ()

+			{

+				FailFast ();

+

+				Slot [] table = host.table;

+

+				if (++pos < size) {

+					Slot entry = table [pos];

+

+					currentKey = entry.key;

+					currentValue = entry.value;

+					return true;

+				}

+

+				currentKey = null;

+				currentValue = null;

+				return false;

+			}

+

+			public DictionaryEntry Entry

+			{

+				get {

+					FailFast ();

+					return new DictionaryEntry (currentKey,

+					                            currentValue);

+				}

+			}

+

+			public Object Key {

+				get {

+					FailFast ();

+					return currentKey;

+				}

+			}

+

+			public Object Value {

+				get {

+					FailFast ();

+					return currentValue;

+				}

+			}

+

+			public Object Current {

+				get {

+					FailFast ();

+					return (mode == EnumeratorMode.KEY_MODE)

+					        ? currentKey

+					        : currentValue;

+				}

+			}

+		}

+

+

+		protected class ListKeys : IList, IEnumerable {

+

+			private SortedList host;

+

+

+			public ListKeys (SortedList host)

+			{

+				if (host == null)

+					throw new ArgumentNullException ();

+

+				this.host = host;

+			}

+

+			//

+			// ICollection

+			//

+

+			public virtual int Count {

+				get {

+					return host.Count;

+				}

+			}

+

+			public virtual bool IsSynchronized {

+				get {

+					return host.IsSynchronized;

+				}

+			}

+

+			public virtual Object SyncRoot {

+				get {

+					return host.SyncRoot;

+				}

+			}

+

+			public virtual void CopyTo (Array array, int arrayIndex)

+			{

+				host.CopyToArray (array, arrayIndex, EnumeratorMode.KEY_MODE);

+			}

+

+

+			//

+			// IList

+			//

+

+			public virtual bool IsFixedSize {

+				get {

+					return true;

+				}

+			}

+

+			public virtual bool IsReadOnly {

+				get {

+					return true;

+				}

+			}

+

+

+			public virtual object this [int index] {

+				get {

+					return host.GetKey (index);

+				}

+				set {

+					throw new NotSupportedException("attempt to modify a key");

+				}

+			}

+

+			public virtual int Add (object value)

+			{

+				throw new NotSupportedException("IList::Add not supported");

+			}

+

+			public virtual void Clear ()

+			{

+				throw new NotSupportedException("IList::Clear not supported");

+			}

+

+			public virtual bool Contains (object key)

+			{

+				return host.Contains (key);

+			}

+

+

+			public virtual int IndexOf (object key)

+			{

+				return host.IndexOfKey (key);

+			}

+

+

+			public virtual void Insert (int index, object value)

+			{

+				throw new NotSupportedException("IList::Insert not supported");

+			}

+

+

+			public virtual void Remove (object value)

+			{

+				throw new NotSupportedException("IList::Remove not supported");

+			}

+

+

+			public virtual void RemoveAt (int index)

+			{

+				throw new NotSupportedException("IList::RemoveAt not supported");

+			}

+

+

+			//

+			// IEnumerable

+			//

+

+			public virtual IEnumerator GetEnumerator ()

+			{

+				return new SortedList.Enumerator (host, EnumeratorMode.KEY_MODE);

+			}

+

+

+		}

+

+

+		protected class ListValues : IList, IEnumerable {

+

+			private SortedList host;

+

+

+			public ListValues (SortedList host)

+			{

+				if (host == null)

+					throw new ArgumentNullException ();

+

+				this.host = host;

+			}

+

+			//

+			// ICollection

+			//

+

+			public virtual int Count {

+				get {

+					return host.Count;

+				}

+			}

+

+			public virtual bool IsSynchronized {

+				get {

+					return host.IsSynchronized;

+				}

+			}

+

+			public virtual Object SyncRoot {

+				get {

+					return host.SyncRoot;

+				}

+			}

+

+			public virtual void CopyTo (Array array, int arrayIndex)

+			{

+				host.CopyToArray (array, arrayIndex, EnumeratorMode.VALUE_MODE);

+			}

+

+

+			//

+			// IList

+			//

+

+			public virtual bool IsFixedSize {

+				get {

+					return true;

+				}

+			}

+

+			public virtual bool IsReadOnly {

+				get {

+					return true;

+				}

+			}

+

+

+			[MonoTODO]

+			public virtual object this [int index] {

+				get {

+					return host.GetByIndex (index);

+				}

+				set {

+					// FIXME: It seems (according to tests)

+					// that modifications are allowed

+					// in Beta2.

+					// ? host.SetByIndex (index, value);

+					throw new NotSupportedException("attempt to modify a value");

+				}

+			}

+

+			public virtual int Add (object value)

+			{

+				throw new NotSupportedException("IList::Add not supported");

+			}

+

+			public virtual void Clear ()

+			{

+				throw new NotSupportedException("IList::Clear not supported");

+			}

+

+			public virtual bool Contains (object value)

+			{

+				return host.ContainsValue (value);

+			}

+

+

+			public virtual int IndexOf (object value)

+			{

+				return host.IndexOfValue (value);

+			}

+

+

+			public virtual void Insert (int index, object value)

+			{

+				throw new NotSupportedException("IList::Insert not supported");

+			}

+

+

+			public virtual void Remove (object value)

+			{

+				throw new NotSupportedException("IList::Remove not supported");

+			}

+

+

+			public virtual void RemoveAt (int index)

+			{

+				throw new NotSupportedException("IList::RemoveAt not supported");

+			}

+

+

+			//

+			// IEnumerable

+			//

+

+			public virtual IEnumerator GetEnumerator ()

+			{

+				return new SortedList.Enumerator (host, EnumeratorMode.VALUE_MODE);

+			}

+

+		}

+

+		protected class SynchedSortedList : SortedList {

+

+			private SortedList host;

+

+			public SynchedSortedList (SortedList host)

+			{

+				if (host == null)

+					throw new ArgumentNullException ();

+				this.host = host;

+			}

+

+			// ICollection

+

+			public override int Count {

+				get {

+					return host.Count;

+				}

+			}

+

+			public override bool IsSynchronized {

+				get {

+					return true;

+				}

+			}

+

+			public override Object SyncRoot {

+				get {

+					return host.SyncRoot;

+				}

+			}

+

+

+

+			// IDictionary

+

+			public override bool IsFixedSize {

+				get {

+					return host.IsFixedSize;

+				}     

+			}

+

+

+			public override bool IsReadOnly {

+				get {

+					return host.IsReadOnly;

+				}

+			}

+

+			public override ICollection Keys {

+				get {

+					ICollection keys = null;

+					lock (host.SyncRoot) {

+						keys = host.Keys;

+					}

+					return keys;

+				}

+			}

+

+			public override ICollection Values {

+				get {

+					ICollection vals = null;

+					lock (host.SyncRoot) {

+						vals = host.Values;

+					}

+					return vals;

+				}

+			}

+

+

+

+			public override Object this [object key] {

+				get {

+					lock (host.SyncRoot) {

+						return host.GetImpl (key);

+					}

+				}

+				set {

+					lock (host.SyncRoot) {

+						host.PutImpl (key, value, true);

+					}

+				}

+			}

+

+

+

+			// ICollection

+

+			public override void CopyTo (Array array, int arrayIndex)

+			{

+				lock (host.SyncRoot) {

+					host.CopyTo (array, arrayIndex);

+				}

+			}

+

+

+			// IDictionary

+

+			public override void Add (object key, object value)

+			{

+				lock (host.SyncRoot) {

+					host.PutImpl (key, value, false);

+				}

+			}

+

+			public override void Clear () 

+			{

+				lock (host.SyncRoot) {

+					host.Clear ();

+				}

+			}

+

+			public override bool Contains (object key)

+			{

+				lock (host.SyncRoot) {

+					return (host.Find (key) >= 0);

+				}

+			}

+

+			public override IDictionaryEnumerator GetEnumerator ()

+			{

+				lock (host.SyncRoot) {

+					return host.GetEnumerator();

+				}

+			}

+

+			public override void Remove (object key)

+			{

+				lock (host.SyncRoot) {

+					host.Remove (key);

+				}

+			}

+

+

+

+			public override bool ContainsKey (object key)

+			{

+				lock (host.SyncRoot) {

+					return host.Contains (key);

+				}

+			}

+

+			public override bool ContainsValue (object value)

+			{

+				lock (host.SyncRoot) {

+					return host.ContainsValue (value);

+				}

+			}

+

+

+			// ICloneable

+

+			public override object Clone ()

+			{

+				lock (host.SyncRoot) {

+					return (host.Clone () as SortedList);

+				}

+			}

+

+

+

+			//

+			// SortedList overrides

+			//

+

+			public override Object GetByIndex (int index)

+			{

+				lock (host.SyncRoot) {

+					return host.GetByIndex (index);

+				}

+			}

+

+			public override Object GetKey (int index)

+			{

+				lock (host.SyncRoot) {

+					return host.GetKey (index);

+				}

+			}

+

+			public override IList GetKeyList ()

+			{

+				lock (host.SyncRoot) {

+					return new ListKeys (host);

+				}

+			}

+

+

+			public override IList GetValueList ()

+			{

+				lock (host.SyncRoot) {

+					return new ListValues (host);

+				}

+			}

+

+			public override void RemoveAt (int index)

+			{

+				lock (host.SyncRoot) {

+					host.RemoveAt (index);

+				}

+			}

+

+			public override int IndexOfKey (object key)

+			{

+				lock (host.SyncRoot) {

+					return host.IndexOfKey (key);

+				}

+			}

+

+			public override int IndexOfValue (Object val)

+			{

+				lock (host.SyncRoot) {

+					return host.IndexOfValue (val);

+				}

+			}

+

+			public override void SetByIndex (int index, object value)

+			{

+				lock (host.SyncRoot) {

+					host.SetByIndex (index, value);

+				}

+			}

+

+			public override void TrimToSize()

+			{

+				lock (host.SyncRoot) {

+					host.TrimToSize();

+				}

+			}

+

+

+		} // SynchedSortedList

+

+	} // SortedList

+

+} // System.Collections

diff --git a/mcs/class/corlib/System.Collections/Stack.cs b/mcs/class/corlib/System.Collections/Stack.cs
new file mode 100644
index 00000000000..392ab6fcd00
--- /dev/null
+++ b/mcs/class/corlib/System.Collections/Stack.cs
@@ -0,0 +1,321 @@
+//

+// System.Collections.Stack

+//

+// Author:

+//    Garrett Rooney (rooneg@electricjellyfish.net)

+//

+// (C) 2001 Garrett Rooney

+//

+

+namespace System.Collections {

+

+	[Serializable]

+	public class Stack : ICollection, IEnumerable, ICloneable {

+

+		// properties

+		private object[] contents;

+		private int current = -1;

+		private int count = 0;

+		private int capacity = 16;

+		private int modCount = 0;

+

+		private void Resize(int ncapacity) {

+			object[] ncontents = new object[ncapacity];

+

+			Array.Copy(contents, ncontents, count);

+

+			capacity = ncapacity;

+			contents = ncontents;

+		}

+

+		public Stack() {

+			contents = new object[capacity];

+		}

+

+		public Stack(ICollection collection) {

+			capacity = collection.Count;

+			contents = new object[capacity];

+			current = capacity - 1;

+			count = capacity;

+

+			collection.CopyTo(contents, 0);

+		}

+

+		public Stack(int c) {

+			capacity = c;

+			contents = new object[capacity];

+		}

+

+		[Serializable]

+		private class SyncStack : Stack {

+

+			Stack stack;

+

+			internal SyncStack(Stack s) {

+				stack = s;

+			}

+			

+			public override int Count {

+				get { 

+					lock (stack) {

+						return stack.Count; 

+					}

+				}

+			}

+			

+/*
+			public override bool IsReadOnly {

+				get { 

+					lock (stack) {

+						return stack.IsReadOnly; 

+					}

+				}

+			}

+*/
+			

+			public override bool IsSynchronized {

+				get { return true; }

+			}

+			

+			public override object SyncRoot {

+				get { return stack.SyncRoot; }

+			}

+

+			public override void Clear() {

+				lock(stack) { stack.Clear(); }

+			}

+

+			public override object Clone() {

+				lock (stack) { 

+					return Stack.Synchronized((Stack)stack.Clone()); 

+				}

+			}

+

+			public override bool Contains(object obj) {

+				lock (stack) { return stack.Contains(obj); }

+			}

+

+			public override void CopyTo(Array array, int index) {

+				lock (stack) { stack.CopyTo(array, index); }

+			}

+

+			public override IEnumerator GetEnumerator() {

+				lock (stack) { 

+					return new Enumerator(stack); 

+				}

+			}

+

+			public override object Peek() {

+				lock (stack) { return stack.Peek(); }

+			}

+

+			public override object Pop() {

+				lock (stack) { return stack.Pop(); }

+			}

+

+			public override void Push(object obj) {

+				lock (stack) { stack.Push(obj); }

+			}

+

+			public override object[] ToArray() {

+				lock (stack) { return stack.ToArray(); }

+			}

+		}

+

+		public static Stack Synchronized(Stack s) {

+			if (s == null) {

+				throw new ArgumentNullException();

+			}

+

+			return new SyncStack(s);

+		}

+

+		public virtual int Count {

+			get { return count; }

+		}

+

+/*
+		public virtual bool IsReadOnly {

+			get { return false; }

+		}

+*/
+

+		public virtual bool IsSynchronized {

+			get { return false; }

+		}

+

+		public virtual object SyncRoot {

+			get { return this; }

+		}

+

+		public virtual void Clear() {

+			modCount++;

+

+			for (int i = 0; i < count; i++) {

+				contents[i] = null;

+			}

+

+			count = 0;

+			current = -1;

+		}

+

+		public virtual object Clone() {

+			Stack stack;

+

+			stack = new Stack();

+

+			stack.current = current;

+			stack.contents = contents;

+			stack.count = count;

+			stack.capacity = capacity;

+

+			return stack;

+		}

+

+		public virtual bool Contains(object obj) {

+			if (count == 0)

+				return false;

+

+			for (int i = 0; i < count; i++) {

+				if (contents[i].Equals(obj))

+					return true; 

+			}

+

+			return false;

+		}

+

+		public virtual void CopyTo (Array array, int index) {

+			if (array == null) {

+				throw new ArgumentNullException();

+			}

+

+			if (index < 0) {

+				throw new ArgumentOutOfRangeException();

+			}

+

+			if (array.Rank > 1 || 

+			    index >= array.Length || 

+			    count > array.Length - index) {

+				throw new ArgumentException();

+			}

+

+			for (int i = current; i != -1; i--) {

+				array.SetValue(contents[i], 

+					       count - (i + 1) + index);

+			}

+		}

+

+		private class Enumerator : IEnumerator {

+

+			Stack stack;

+			private int modCount;

+			private int current;

+

+			internal Enumerator(Stack s) {

+				// this is odd.  it seems that you need to 

+				// start one further ahead than current, since 

+				// MoveNext() gets called first when using an 

+				// Enumeration...

+				stack = s;

+				modCount = s.modCount;

+				current = s.current + 1;

+			}

+

+			public virtual object Current {

+				get {

+					if (modCount != stack.modCount 

+					    || current == -1 

+					    || current > stack.count)

+						throw new InvalidOperationException();

+					return stack.contents[current];

+				}

+			}

+

+			public virtual bool MoveNext() {

+				if (modCount != stack.modCount 

+				    || current == -1) {

+					throw new InvalidOperationException();

+				}

+

+				current--;

+

+				if (current == -1) {

+					return false;

+				} else {

+					return true;

+				}

+			}

+

+			public virtual void Reset() {

+				if (modCount != stack.modCount) {

+					throw new InvalidOperationException();

+				}

+

+				// start one ahead of stack.current, so the 

+				// first MoveNext() will put us at the top

+				current = stack.current + 1;

+			}

+		}

+

+		public virtual IEnumerator GetEnumerator() {

+			return new Enumerator(this);

+		}

+

+		public virtual object Peek() {

+			if (current == -1) {

+				throw new InvalidOperationException();

+			} else {

+				return contents[current];

+			}

+		}

+

+		public virtual object Pop() {

+			if (current == -1) {

+				throw new InvalidOperationException();

+			} else {

+				modCount++;

+

+				object ret = contents[current];

+		

+				count--;

+				current--;

+

+				// if we're down to capacity/4, go back to a 

+				// lower array size.  this should keep us from 

+				// sucking down huge amounts of memory when 

+				// putting large numbers of items in the Stack.

+				// if we're lower than 16, don't bother, since 

+				// it will be more trouble than it's worth.

+				if (count <= (capacity/4) && count > 16) {

+					Resize(capacity/2);

+				}

+

+				return ret;

+			}

+		}

+

+		public virtual void Push(Object o) {

+			modCount++;

+

+			if (capacity == count) {

+				Resize(capacity * 2);

+			}

+

+			count++;

+			current++;

+

+			contents[current] = o;

+		}

+

+		public virtual object[] ToArray() {

+			object[] ret = new object[count];

+

+			Array.Copy(contents, ret, count);

+

+			// ret needs to be in LIFO order

+			Array.Reverse(ret);

+

+			return ret;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Configuration.Assemblies/AssemblyHash.cs b/mcs/class/corlib/System.Configuration.Assemblies/AssemblyHash.cs
new file mode 100644
index 00000000000..ffa152e6399
--- /dev/null
+++ b/mcs/class/corlib/System.Configuration.Assemblies/AssemblyHash.cs
@@ -0,0 +1,71 @@
+

+//

+// AssemblyHash.cs

+//

+//    Implementation of the 

+//    System.Configuration.Assemblies.AssemblyHash

+//    class for the Mono Class Library

+//

+// Author:

+//    Tomas Restrepo (tomasr@mvps.org)

+//

+

+namespace System.Configuration.Assemblies {

+   

+	[Serializable]

+   public struct AssemblyHash : System.ICloneable

+   {

+      private AssemblyHashAlgorithm _algorithm;

+      private byte[] _value;

+

+      public static readonly AssemblyHash Empty = 

+         new AssemblyHash(AssemblyHashAlgorithm.None,null);

+

+

+      //

+      // properties

+      //

+      public AssemblyHashAlgorithm Algorithm {

+         get { return _algorithm; }

+         set { _algorithm = value; }

+      }

+

+

+      //

+      // construction

+      //

+      public AssemblyHash ( AssemblyHashAlgorithm algorithm, byte[] value )

+      {

+         _algorithm = algorithm;

+         _value = null;

+         if ( value != null )

+         {

+            int size = value.Length;

+            _value = new byte[size];

+            System.Array.Copy ( value, _value, size );

+         }

+      }

+

+      public AssemblyHash ( byte[] value )

+         : this(AssemblyHashAlgorithm.SHA1, value)

+      {

+      }

+

+      public object Clone()

+      {

+         return new AssemblyHash(_algorithm,_value);

+      }

+

+      public byte[] GetValue()

+      {

+         return _value;

+      }

+      public void SetValue ( byte[] value )

+      {

+         _value = value;

+      }

+

+   } // class AssemblyHash

+

+} // namespace System.Configuration.Assemblies

+

diff --git a/mcs/class/corlib/System.Configuration.Assemblies/AssemblyHashAlgorithm.cs b/mcs/class/corlib/System.Configuration.Assemblies/AssemblyHashAlgorithm.cs
new file mode 100644
index 00000000000..f144df7bf79
--- /dev/null
+++ b/mcs/class/corlib/System.Configuration.Assemblies/AssemblyHashAlgorithm.cs
@@ -0,0 +1,33 @@
+// AssemblyHashAlgorithm.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:38:03 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Configuration.Assemblies {
+
+
+	/// <summary>
+	/// </summary>
+	public enum AssemblyHashAlgorithm {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		MD5 = 32771,
+
+		/// <summary>
+		/// </summary>
+		SHA1 = 32772,
+	} // AssemblyHashAlgorithm
+
+} // System.Configuration.Assemblies
diff --git a/mcs/class/corlib/System.Configuration.Assemblies/AssemblyVersionCompatibility.cs b/mcs/class/corlib/System.Configuration.Assemblies/AssemblyVersionCompatibility.cs
new file mode 100644
index 00000000000..5e13d56fdf1
--- /dev/null
+++ b/mcs/class/corlib/System.Configuration.Assemblies/AssemblyVersionCompatibility.cs
@@ -0,0 +1,33 @@
+// AssemblyVersionCompatibility.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:38:13 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Configuration.Assemblies {
+
+
+	/// <summary>
+	/// </summary>
+	public enum AssemblyVersionCompatibility {
+
+		/// <summary>
+		/// </summary>
+		SameMachine = 1,
+
+		/// <summary>
+		/// </summary>
+		SameProcess = 2,
+
+		/// <summary>
+		/// </summary>
+		SameDomain = 3,
+	} // AssemblyVersionCompatibility
+
+} // System.Configuration.Assemblies
diff --git a/mcs/class/corlib/System.Configuration.Assemblies/ChangeLog b/mcs/class/corlib/System.Configuration.Assemblies/ChangeLog
new file mode 100644
index 00000000000..d9e7f8ea889
--- /dev/null
+++ b/mcs/class/corlib/System.Configuration.Assemblies/ChangeLog
@@ -0,0 +1,6 @@
+2001-07-13 Tomas Restrepo (tomasr@mvps.org)
+
+	   * AssemblyHash finished
+	   * AssemblyHashAlgorithm finished
+	   * AssemblyVersion finished
+	
\ No newline at end of file
diff --git a/mcs/class/corlib/System.Configuration.Assemblies/ProcessorID.cs b/mcs/class/corlib/System.Configuration.Assemblies/ProcessorID.cs
new file mode 100755
index 00000000000..10cb2e9fe5d
--- /dev/null
+++ b/mcs/class/corlib/System.Configuration.Assemblies/ProcessorID.cs
@@ -0,0 +1,101 @@
+// ProcessorID.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:38:23 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Configuration.Assemblies {
+
+
+	/// <summary>
+	/// </summary>
+	public enum ProcessorID {
+
+		/// <summary>
+		/// </summary>
+		INTEL_386 = 386,
+
+		/// <summary>
+		/// </summary>
+		INTEL_486 = 486,
+
+		/// <summary>
+		/// </summary>
+		INTEL_PENTIUM = 586,
+
+		/// <summary>
+		/// </summary>
+		MIPS_R4000 = 4000,
+
+		/// <summary>
+		/// </summary>
+		ALPHA_21064 = 21064,
+
+		/// <summary>
+		/// </summary>
+		PPC_601 = 601,
+
+		/// <summary>
+		/// </summary>
+		PPC_603 = 603,
+
+		/// <summary>
+		/// </summary>
+		PPC_604 = 604,
+
+		/// <summary>
+		/// </summary>
+		PPC_620 = 620,
+
+		/// <summary>
+		/// </summary>
+		HITACHI_SH3 = 10003,
+
+		/// <summary>
+		/// </summary>
+		HITACHI_SH3E = 10004,
+
+		/// <summary>
+		/// </summary>
+		HITACHI_SH4 = 10005,
+
+		/// <summary>
+		/// </summary>
+		MOTOROLA_821 = 821,
+
+		/// <summary>
+		/// </summary>
+		SHx_SH3 = 103,
+
+		/// <summary>
+		/// </summary>
+		SHx_SH4 = 104,
+
+		/// <summary>
+		/// </summary>
+		STRONGARM = 2577,
+
+		/// <summary>
+		/// </summary>
+		ARM720 = 1824,
+
+		/// <summary>
+		/// </summary>
+		ARM820 = 2080,
+
+		/// <summary>
+		/// </summary>
+		ARM920 = 2336,
+
+		/// <summary>
+		/// </summary>
+		ARM_7TDMI = 70001,
+	} // ProcessorID
+
+} // System.Configuration.Assemblies
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/ChangeLog b/mcs/class/corlib/System.Diagnostics.SymbolStore/ChangeLog
new file mode 100644
index 00000000000..4c57a305185
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/ChangeLog
@@ -0,0 +1,29 @@
+2002-03-20  Martin Baulig  <martin@gnome.org>
+
+	* SymbolToken.cs (GetToken): Implemented.
+
+2002-03-05  Duncan Mak  <duncan@ximian.com>
+
+	* ISymbolWriter.cs:
+	(DefineParameter) corrected typo in argument type.
+	(SetMethodSourceRange): Fixed typo in method name.
+
+	* ISymbolDocument.cs:
+	(CheckSumAlgorithmId) Fixed typo.
+
+	* ISymbolNamespace.cs:
+	(GetVariable) Added missing method.
+
+2002-02-05  Duncan Mak  <duncan@ximian.com>
+
+	* SymDocumentType.cs: 	
+	* SymLanguageType.cs: 
+	* SymLanguageVendor.cs: Added to CVS. 
+
+2002-01-07  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Finilized SymAddressKind enum
+
+2002-01-06  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Created SymAddressKind enum
+	* Created all interfaces 
+	* Created dummy implementation for SymbolToken struct
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolBinder.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolBinder.cs
new file mode 100755
index 00000000000..ea1779ca15c
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolBinder.cs
@@ -0,0 +1,19 @@
+//
+// System.Diagnostics.SymbolStore.ISymbolBinder
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+// 
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public interface ISymbolBinder {
+
+	ISymbolReader GetReader (int importer, string filename, string searchPath);
+
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolDocument.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolDocument.cs
new file mode 100755
index 00000000000..4725e34db06
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolDocument.cs
@@ -0,0 +1,30 @@
+//
+// System.Diagnostics.SymbolStore.ISymbolDocument
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+// 
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public interface ISymbolDocument {
+	
+	Guid CheckSumAlgorithmId {get; }
+	Guid DocumentType {get; }
+	bool HasEmbeddedSource {get; }
+	Guid Language {get; }	
+	Guid LanguageVendor {get; }
+	int SourceLength {get; }
+	string URL {get; }
+	
+
+	int FindClosestLine (int line);
+	byte[] GetCheckSum ();
+	byte[] GetSourceRange (int startLine, int startColumn, int endLine, int endColumn);
+
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolDocumentWriter.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolDocumentWriter.cs
new file mode 100755
index 00000000000..855b1a5cefc
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolDocumentWriter.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public interface ISymbolDocumentWriter {
+
+	void SetCheckSum (Guid algorithmId, byte[] checkSum);
+	void SetSource (byte[] source);
+
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolMethod.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolMethod.cs
new file mode 100755
index 00000000000..768ace15710
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolMethod.cs
@@ -0,0 +1,38 @@
+//
+// System.Diagnostics.SymbolStore.ISymbolMethod
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+// 
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public interface ISymbolMethod {
+
+	ISymbolScope RootScope {get; }
+	int SequencePointCount {get; }
+	SymbolToken Token {get; }
+
+	ISymbolNamespace GetNamespace ();
+	int GetOffset (ISymbolDocument document, int line, int column);
+	ISymbolVariable[] GetParameters ();
+	int[] GetRanges (ISymbolDocument document, int line, int column);
+	ISymbolScope GetScope (int offset);
+	void GetSequencePoints (
+		int[] offsets,
+		ISymbolDocument[] documents,
+		int[] lines,
+		int[] columns,
+		int[] endLines,
+		int[] endColumns);
+	bool GetSourceStartEnd (
+		ISymbolDocument[] docs,
+		int[] lines,
+		int[] columns); 
+
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolNamespace.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolNamespace.cs
new file mode 100755
index 00000000000..394fecddc01
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolNamespace.cs
@@ -0,0 +1,21 @@
+//
+// System.Diagnostics.SymbolStore.ISymbolNamespace
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+// 
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public interface ISymbolNamespace {
+
+	string Name {get ;}
+
+	ISymbolNamespace[] GetNamespaces ();
+	ISymbolVariable[] GetVariables ();
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolReader.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolReader.cs
new file mode 100755
index 00000000000..ee04f2b64b1
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolReader.cs
@@ -0,0 +1,38 @@
+//
+// System.Diagnostics.SymbolStore.ISymbolReader
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+// 
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public interface ISymbolReader {
+
+	SymbolToken UserEntryPoint {get; }
+
+	ISymbolDocument GetDocument (
+		string url,
+		Guid language,
+		Guid languageVendor,
+		Guid documentType);
+	ISymbolDocument[] GetDocuments ();
+	ISymbolVariable[] GetGlobalVariables ();
+
+	ISymbolMethod GetMethod (SymbolToken method);
+	ISymbolMethod GetMethod (SymbolToken method, int version);
+
+	ISymbolMethod GetMethodFromDocumentPosition (
+		ISymbolDocument document,
+		int line,
+		int column);
+	ISymbolNamespace[] GetNamespaces ();
+	byte[] GetSymAttribute (SymbolToken parent, string name);
+	ISymbolVariable[] GetVariables (SymbolToken parent);
+
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolScope.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolScope.cs
new file mode 100755
index 00000000000..6c3179ba67a
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolScope.cs
@@ -0,0 +1,26 @@
+//
+// System.Diagnostics.SymbolStore.ISymbolScope
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+// 
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public interface ISymbolScope {
+
+	int EndOffset {get ;}
+	ISymbolMethod Method {get; }
+	ISymbolScope Parent {get ;}
+	int StartOffset {get ;}
+
+	ISymbolScope[] GetChildren ();
+	ISymbolVariable[] GetLocals ();
+	ISymbolNamespace[] GetNamespaces ();
+
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolVariable.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolVariable.cs
new file mode 100755
index 00000000000..11d4ee5f25d
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolVariable.cs
@@ -0,0 +1,28 @@
+//
+// System.Diagnostics.SymbolStore.ISymbolVariable
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+// 
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public interface ISymbolVariable {
+
+	int AddressField1 {get; }
+	int AddressField2 {get; }
+	int AddressField3 {get; }
+	SymAddressKind AddressKind {get ;}
+	object Attributes {get ;}
+	int EndOffset {get; }
+	string Name {get; }
+	int StartOffset {get; }
+	
+	byte[] GetSignature ();
+
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolWriter.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolWriter.cs
new file mode 100755
index 00000000000..ee347fbfbfa
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/ISymbolWriter.cs
@@ -0,0 +1,88 @@
+//
+// System.Diagnostics.SymbolStore.ISymbolWriter
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+// 
+
+using System.Reflection;
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public interface ISymbolWriter {
+
+	void Close ();
+	void CloseMethod ();
+	void CloseNamespace ();
+	void CloseScope (int endOffset);
+	ISymbolDocumentWriter DefineDocument(
+		string url,
+		Guid language,
+		Guid languageVendor,
+		Guid documentType);
+	void DefineField (
+		SymbolToken parent,
+		string name,
+		FieldAttributes attributes,
+		byte[] signature,
+		SymAddressKind addrKind,
+		int addr1,
+		int addr2,
+		int addr3);
+	void DefineGlobalVariable (
+		string name,
+		FieldAttributes attributes,
+		byte[] signature,
+		SymAddressKind addrKind,
+		int addr1,
+		int addr2,
+		int addr3);
+	void DefineLocalVariable (
+		string name,
+		FieldAttributes attributes,
+		byte[] signature,
+		SymAddressKind addrKind,
+		int addr1,
+		int addr2,
+		int addr3,
+		int startOffset,
+		int endOffset);
+	void DefineParameter (
+		string name,
+		ParameterAttributes attributes,
+		int sequence,
+		SymAddressKind addrKind,
+		int addr1,
+		int addr2,
+		int addr3);
+	void DefineSequencePoints (
+		ISymbolDocumentWriter document,
+		int[] offsets,
+		int[] lines,
+		int[] columns,
+		int[] endLines,
+		int[] endColumns);
+	void Initialize (IntPtr emitter, string filename, bool fFullBuild);
+	void OpenMethod (SymbolToken method);
+	void OpenNamespace (string name);
+	int OpenScope (int startOffset);
+	void SetMethodSourceRange (
+		ISymbolDocumentWriter startDoc,
+		int startLine,
+		int startColumn,
+		ISymbolDocumentWriter endDoc,
+		int endLine,
+		int endColumn);
+	void SetScopeRange (int scopeID, int startOffset, int endOffset);
+	void SetSymAttribute (SymbolToken parent, string name, byte[] data);
+	void SetUnderlyingWriter (IntPtr underlyingWriter);
+	void SetUserEntryPoint (SymbolToken entryMethod);
+	void UsingNamespace (string fullName);
+	
+
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/SymAddressKind.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/SymAddressKind.cs
new file mode 100755
index 00000000000..af3e5b32ef5
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/SymAddressKind.cs
@@ -0,0 +1,25 @@
+//
+// System.Diagnostics.SymbolStore.SymAddressKind
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+// 
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public enum SymAddressKind {
+	ILOffset = 1,
+	NativeRVA = 2,
+	NativeRegister = 3,
+	NativeRegisterRelative = 4,
+	NativeOffset = 5,
+	NativeRegisterRegister = 6,
+	NativeRegisterStack = 7,
+	NativeStackRegister = 8,
+	BitField = 9
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/SymDocumentType.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/SymDocumentType.cs
new file mode 100644
index 00000000000..6bbabef32d6
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/SymDocumentType.cs
@@ -0,0 +1,21 @@
+//
+// System.Diagnostics.SymbolStore.SymDocumentType.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Diagnostics.SymbolStore
+{
+	public class SymDocumentType
+	{
+		// Constructors
+		public SymDocumentType ()
+		{
+		}
+
+		// Fields
+		public static readonly Guid Text;
+	}
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/SymLanguageType.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/SymLanguageType.cs
new file mode 100644
index 00000000000..6dd232f081e
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/SymLanguageType.cs
@@ -0,0 +1,31 @@
+//
+// System.Diagnostics.SymbolStore.SymLanguageType.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Diagnostics.SymbolStore
+{
+	public class SymLanguageType
+	{
+		// Constructors
+		public SymLanguageType ()
+		{
+		}
+
+		// Fields
+		public static readonly Guid Basic;
+		public static readonly Guid C;
+		public static readonly Guid Cobol;
+		public static readonly Guid CPlusPlus;
+		public static readonly Guid CSharp;
+		public static readonly Guid ILAssembly;
+		public static readonly Guid Java;
+		public static readonly Guid JScript;
+		public static readonly Guid MCPlusPlus;
+		public static readonly Guid Pascal;
+		public static readonly Guid SMC;
+	}
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/SymLanguageVendor.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/SymLanguageVendor.cs
new file mode 100644
index 00000000000..a9b439eb3e5
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/SymLanguageVendor.cs
@@ -0,0 +1,21 @@
+//
+// System.Diagnostics.SymbolStore.SymLanguageVendor.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Diagnostics.SymbolStore
+{
+	public class SymLanguageVendor
+	{
+		// Constructors
+		public SymLanguageVendor ()
+		{
+		}
+
+		// Fields
+		public static readonly Guid Microsoft;
+	}
+}
diff --git a/mcs/class/corlib/System.Diagnostics.SymbolStore/SymbolToken.cs b/mcs/class/corlib/System.Diagnostics.SymbolStore/SymbolToken.cs
new file mode 100755
index 00000000000..7d355ac244e
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics.SymbolStore/SymbolToken.cs
@@ -0,0 +1,29 @@
+//
+// System.Diagnostics.SymbolStore.SymbolToken
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+// 
+
+namespace System.Diagnostics.SymbolStore
+{
+
+public struct SymbolToken {
+
+	private int _val;
+
+	public SymbolToken (int val) { _val = val; }
+
+	[MonoTODO]
+	public override bool Equals (object obj) { return false; }
+
+	[MonoTODO]
+	public override int GetHashCode() { return 0; }
+
+	public int GetToken() { return _val; }
+	
+}
+
+}
diff --git a/mcs/class/corlib/System.Diagnostics/ChangeLog b/mcs/class/corlib/System.Diagnostics/ChangeLog
new file mode 100644
index 00000000000..eb7ade24517
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics/ChangeLog
@@ -0,0 +1,67 @@
+2002-06-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* StackTrace.cs: impl. remaining constructors.
+
+2002-06-18  Dietmar Maurer  <dietmar@ximian.com>
+
+	* StackTrace.cs: use new internal call for constructors, use MS like
+	trace format.
+
+	* StackFrame.cs: impl. constructors using a new internal call.
+
+2002-05-01  Duncan Mak  <duncan@ximian.com>
+
+	* DebuggableAttribute.cs: Added missing AttributeUsage attribute.
+
+2002-04-08  Jonathan Pryor  <jonpryor@vt.edu>
+
+	* Debugger.cs: Added [MonoTODO] attribute to methods; modified IsLogging() 
+		and Log() so that System.Diagnostics.DefaultTraceListener could use them
+		without having NotImplementedException's thrown, as the functionality
+		DefaultTraceListener is using is non-critical.
+
+2002-04-08  Nick Drochak  <ndrochak@gol.com>
+
+	* ConditionalAttribute.cs: Add AttributeUsage attribute for methods.
+
+2002-01-23  Duncan Mak  <duncan@ximian.com>
+
+	* DebuggerStepThroughAttribute.cs:
+	* DebuggerHiddenAttribte.cs: Add to CVS.
+
+2002-01-04  Ravi Pratap <ravi@ximian.com>
+
+	* StackFrame.cs : Use the MonoTODO attribute to mark
+	incomplete code.
+
+	StackTrace.cs : Ditto.
+
+2002-01-04  John R. Hicks <angryjohn69@nc.rr.com>
+	* Moved TraceListener, TextWriterTraceListener, and
+	DefaultTraceListener to System assembly....oops.
+
+2002-01-04  John R. Hicks  <angryjohn69@nc.rr.com>
+
+	* Added TextWriterTraceListener.cs, TraceListener.cs, and 
+	DefaultTraceListener.cs to the build.
+
+2002-01-04  John R. Hicks  <angryjohn69@nc.rr.com>
+
+	* Added Debugger.cs to the build.
+
+2001-09-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* Moved BooleanSwitch, Switch, TraceLevel and TraceSwitch to the
+	System assembly.
+
+	* Added StackFrame.cs and StackTrace.cs to the build.
+
+2001-08-21  Nick Drochak <ndrochak@gol.com>
+
+	* Implemented ConditionalAttribute.cs and DebuggableAttribute.cs
+	
+2001-08-29  Alexander Klyubin <klyubin@aqris.com>
+  
+	* Skeletal implementation of StackFrame and StackTrace classes.
+	The classes must be somehow connected to runtime environment in
+	order to generate proper traces.
diff --git a/mcs/class/corlib/System.Diagnostics/ConditionalAttribute.cs b/mcs/class/corlib/System.Diagnostics/ConditionalAttribute.cs
new file mode 100644
index 00000000000..ea808ac500e
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics/ConditionalAttribute.cs
@@ -0,0 +1,30 @@
+//

+// System.Collections.DebuggableAttribute.cs

+//

+// Author:

+//   Nick Drochak II (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak II

+//

+

+namespace System.Diagnostics 

+{

+

+	[Serializable]

+	[AttributeUsage(AttributeTargets.Method)]

+	public sealed class ConditionalAttribute : System.Attribute 

+	{

+

+		private string myCondition;

+

+		// Public Instance Constructors

+		public ConditionalAttribute(string conditionString) 

+		{

+			myCondition = conditionString;

+		}

+		

+		// Public Instance Properties

+		public string ConditionString { get { return myCondition; } 

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Diagnostics/DebuggableAttribute.cs b/mcs/class/corlib/System.Diagnostics/DebuggableAttribute.cs
new file mode 100644
index 00000000000..08ede85557c
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics/DebuggableAttribute.cs
@@ -0,0 +1,29 @@
+//

+// System.Collections.DebuggableAttribute.cs

+//

+// Author:

+//   Nick Drochak II (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak II

+//

+

+namespace System.Diagnostics {

+	

+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Module)]

+	public sealed class DebuggableAttribute : System.Attribute {

+

+		private bool JITTrackingEnabledFlag;

+		private bool JITOptimizerDisabledFlag;

+

+		// Public Instance Constructors

+		public DebuggableAttribute(bool isJITTrackingEnabled, bool isJITOptimizerDisabled) {

+			JITTrackingEnabledFlag = isJITTrackingEnabled;

+			JITOptimizerDisabledFlag = isJITOptimizerDisabled;

+		}

+		

+		// Public Instance Properties

+		public bool IsJITTrackingEnabled { get { return JITTrackingEnabledFlag; } }

+		

+		public bool IsJITOptimizerDisabled { get { return JITOptimizerDisabledFlag; } }

+	}

+}

diff --git a/mcs/class/corlib/System.Diagnostics/Debugger.cs b/mcs/class/corlib/System.Diagnostics/Debugger.cs
new file mode 100644
index 00000000000..8b5c6789799
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics/Debugger.cs
@@ -0,0 +1,94 @@
+//

+// System.Diagnostics.Debugger.cs

+//

+// Author:

+//	John R. Hicks (angryjohn69@nc.rr.com)

+//

+// (C) 2001

+//

+using System;

+

+namespace System.Diagnostics

+{

+	/// <summary>

+	/// Enables communication with a debugger.

+	/// </summary>

+	[MonoTODO]

+	public sealed class Debugger

+	{

+		private static bool isAttached;

+		

+		/// <summary>

+		/// Represents the default category of a message with a constant.

+		/// </summary>

+		public static readonly string DefaultCategory = "";

+		

+		/// <summary>

+		/// Returns a Boolean indicating whether a debugger is attached to a process.

+		/// </summary>

+		/// <value>

+		/// true if debugger is attached; otherwise, false.

+		/// </value>

+		public static bool IsAttached

+		{

+			get

+			{

+				return isAttached;

+			}

+		}

+		

+		/// <summary>

+		/// Causes a breakpoint to be signaled to an attached debugger.

+		/// </summary>

+		[MonoTODO]

+		public static void Break()

+		{

+			throw new NotImplementedException();

+		}

+		

+		/// <summary>

+		/// Checks to see if logging is enabled by an attached debugger.

+		/// </summary>

+		[MonoTODO]

+		public static bool IsLogging()

+		{

+			// Return false. DefaultTraceListener invokes this method, so throwing

+			// a NotImplementedException wouldn't be appropriate.

+      return false;

+

+		}

+		

+		/// <summary>

+		/// Launches and attaches a debugger to the process.

+		/// </summary>

+		[MonoTODO]

+		public static bool Launch()

+		{

+			throw new NotImplementedException();

+		}

+		

+		/// <summary>

+		/// Posts a message for the attached debugger.

+		/// </summary>

+		/// <param name="level">

+		/// A description of the importance of this message

+		/// </param>

+		/// <param name="category">

+		/// A string describing the category of this message.

+		/// </param>

+		/// <param name="message">

+		/// A string representing the message to show.

+		/// </param>

+		[MonoTODO]

+		public static void Log(int level, string category, string message)

+		{

+			// Do nothing. DefaultTraceListener invokes this method, so throwing

+			// a NotImplementedException wouldn't be appropriate.

+		}

+		

+		public Debugger()

+		{

+			isAttached = false;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Diagnostics/DebuggerHiddenAttribute.cs b/mcs/class/corlib/System.Diagnostics/DebuggerHiddenAttribute.cs
new file mode 100644
index 00000000000..b57db27cb8b
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics/DebuggerHiddenAttribute.cs
@@ -0,0 +1,25 @@
+//
+// System.Diagnostics.DebuggerHiddenAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Diagnostics
+{
+	[AttributeUsage (AttributeTargets.Constructor |
+			 AttributeTargets.Method | AttributeTargets.Property)]
+	[Serializable]
+	public sealed class DebuggerHiddenAttribute : Attribute
+	{
+		public DebuggerHiddenAttribute ()
+			: base ()
+			{
+			}
+	}
+}
+
+
diff --git a/mcs/class/corlib/System.Diagnostics/DebuggerStepThroughAttribute.cs b/mcs/class/corlib/System.Diagnostics/DebuggerStepThroughAttribute.cs
new file mode 100644
index 00000000000..27d81891a1d
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics/DebuggerStepThroughAttribute.cs
@@ -0,0 +1,23 @@
+//
+// System.Diagnostics.DebuggerStepThroughAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Diagnostics
+{
+	[AttributeUsage (AttributeTargets.Constructor |
+			 AttributeTargets.Method | AttributeTargets.Property)]
+	[Serializable]
+	public sealed class DebuggerStepThroughAttribute : Attribute
+	{
+		public DebuggerStepThroughAttribute ()
+			: base ()
+			{
+			}
+	}
+}
diff --git a/mcs/class/corlib/System.Diagnostics/StackFrame.cs b/mcs/class/corlib/System.Diagnostics/StackFrame.cs
new file mode 100644
index 00000000000..f27256fbde5
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics/StackFrame.cs
@@ -0,0 +1,321 @@
+//
+// System.Diagnostics.StackFrame.cs
+//
+// Author:
+//      Alexander Klyubin (klyubin@aqris.com)
+//      Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) 2001
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace System.Diagnostics {
+        /// <summary>
+        ///   Stack frame.
+        /// </summary>
+
+	[Serializable]
+        public class StackFrame {
+                /// <value>
+                ///   Constant returned when the native or IL offset is unknown.
+                /// </value>
+                public const int OFFSET_UNKNOWN = -1;
+                
+                /// <value>
+                ///   Offset from the start of the IL code for the method
+                ///   being executed.
+                /// </value>
+                private int ilOffset = OFFSET_UNKNOWN;
+                
+                /// <value>
+                ///   Offset from the start of the native code for the method
+                ///   being executed.
+                /// </value>
+                private int nativeOffset = OFFSET_UNKNOWN;
+
+                /// <value>
+                ///   Method associated with this stack frame.
+                /// </value>
+                private MethodBase methodBase;
+                
+                /// <value>
+                ///   File name.
+                /// </value>
+                private string fileName;
+                
+                /// <value>
+                ///   Line number.
+                /// </value>
+                private int lineNumber;
+                
+                /// <value>
+                ///   Column number.
+                /// </value>
+                private int columnNumber;
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		extern static bool get_frame_info (int skip, bool needFileInfo, out MethodBase method,
+						   out int iloffset, out int native_offset,
+						   out string file, out int line, out int column);
+
+                /// <summary>
+                ///   Initializes a new StackFrame object corresponding to the
+                ///   active stack frame.
+                /// </summary>
+                public StackFrame() {
+			get_frame_info (2, false, out methodBase, out ilOffset,
+					out nativeOffset, out fileName, out lineNumber,
+					out columnNumber);			
+                }
+                
+                /// <summary>
+                ///   Initializes a new StackFrame object corresponding to the
+                ///   active stack frame.
+                /// </summary>
+                /// <param name="needFileInfo">
+                ///   TODO:
+                /// </param>
+                public StackFrame(bool needFileInfo) : this() {
+			get_frame_info (2, needFileInfo, out methodBase, out ilOffset,
+					out nativeOffset, out fileName, out lineNumber,
+					out columnNumber);			
+                }
+                
+                /// <summary>
+                ///   Initializes a new StackFrame object corresponding to the
+                ///   active stack frame.
+                /// </summary>
+                /// <param name="skipFrames">
+                ///   The number of frames up the stack to skip.
+                /// </param>
+                public StackFrame(int skipFrames) {
+			get_frame_info (skipFrames + 2, false, out methodBase, out ilOffset,
+					out nativeOffset, out fileName, out lineNumber,
+					out columnNumber);			
+                }
+                
+                /// <summary>
+                ///   Initializes a new StackFrame object corresponding to the
+                ///   active stack frame.
+                /// </summary>
+                /// <param name="skipFrames">
+                ///   The number of frames up the stack to skip.
+                /// </param>
+                /// <param name="needFileInfo">
+                ///   TODO:
+                /// </param>
+                public StackFrame(int skipFrames, bool needFileInfo) {
+			get_frame_info (skipFrames + 2, needFileInfo, out methodBase, out ilOffset,
+					out nativeOffset, out fileName, out lineNumber,
+					out columnNumber);
+                }
+                
+                /// <summary>
+                ///   Constructs a fake stack frame that just contains the
+                ///   given file name and line number. Use this constructor
+                ///   when you do not want to use the debugger's line mapping
+                ///   logic.
+                /// </summary>
+                /// <param name="fileName">
+                ///   The given file name.
+                /// </param>
+                /// <param name="lineNumber">
+                ///   The line number in the specified file.
+                /// </param>
+                public StackFrame(string fileName, int lineNumber)
+                : this (fileName, lineNumber, 0) {}
+                
+                /// <summary>
+                ///   Constructs a fake stack frame that just contains the
+                ///   given file name and line number. Use this constructor
+                ///   when you do not want to use the debugger's line mapping
+                ///   logic.
+                /// </summary>
+                /// <param name="fileName">
+                ///   The given file name.
+                /// </param>
+                /// <param name="lineNumber">
+                ///   The line number in the specified file.
+                /// </param>
+                /// <param name="colNumber">
+                ///   The column number in the specified file.
+                /// </param>
+                public StackFrame(string fileName,
+                                  int lineNumber,
+                                  int colNumber) {
+                        this.methodBase = null;
+                        this.fileName = fileName;
+                        this.lineNumber = lineNumber;
+                        this.columnNumber = colNumber;
+                }
+                                  
+                              
+                /// <summary>
+                ///   Gets the line number in the file containing the code
+                ///   being executed. This information is typically extracted
+                ///   from the debugging symbols for the executable.
+                /// </summary>
+                /// <returns>
+                ///   The file line number or zero if it cannot be determined.
+                /// </returns>
+                public virtual int GetFileLineNumber()
+                {
+                        return lineNumber;
+                }
+                
+                /// <summary>
+                ///   Gets the column number in the file containing the code
+                ///   being executed. This information is typically extracted
+                ///   from the debugging symbols for the executable.
+                /// </summary>
+                /// <returns>
+                ///   The file column number or zero if it cannot be determined.
+                /// </returns>
+                public virtual int GetFileColumnNumber()
+                {
+                        return columnNumber;
+                }
+                
+                /// <summary>
+                ///   Gets the file name containing the code being executed.
+                ///   This information is typically extracted from the
+                ///   debugging symbols for the executable.
+                /// </summary>
+                /// <returns>
+                ///   The file name or null if it cannot be determined.
+                /// </returns> 
+                public virtual string GetFileName()
+                {
+                        return fileName;
+                }
+                
+                /// <summary>
+                ///   Gets the offset from the start of the IL code for the
+                ///   method being executed. This offset may be approximate
+                ///   depending on whether the JIT compiler is generating
+                ///   debugging code or not.
+                /// </summary>
+                /// <returns>
+                ///   The offset from the start of the IL code for the method
+                ///   being executed.
+                /// </returns>
+                public virtual int GetILOffset()
+                {
+                        return ilOffset;
+                }
+                
+                /// <summary>
+                ///   Gets the method in which the frame is executing.
+                /// </summary>
+                /// <returns>
+                ///   The method the frame is executing in.
+                /// </returns>
+                public virtual MethodBase GetMethod()
+                {
+                        return methodBase;
+                }
+                
+                /// <summary>
+                ///   Gets the offset from the start of the native
+                ///   (JIT-compiled) code for the method being executed.
+                /// </summary>
+                /// <returns>
+                ///   The offset from the start of the native (JIT-compiled)
+                ///   code or the method being executed.
+                /// </returns>
+                public virtual int GetNativeOffset()
+                {
+                        return nativeOffset;                        
+                }
+                
+                /// <summary>
+                ///   Builds a readable representation of the stack frame.
+                /// </summary>
+                /// <returns>
+                ///   A readable representation of the stack frame.
+                /// </returns>
+                public override string ToString() {
+                        string methodNameString =
+                                (GetMethod() == null)
+                                        ? "<unknown method>"
+                                          : GetMethod().Name;
+                        string offsetString =
+                                (GetILOffset() == OFFSET_UNKNOWN)
+                                        ? "<unknown offset>"
+                                          : "offset " + GetILOffset();
+                        string fileNameString =
+                                (GetFileName() == null)
+                                        ? "<filename unknown>" : GetFileName();
+                        return methodNameString + " at " + offsetString
+                                + " in file:line:column " + fileNameString
+                                + ":" + GetFileLineNumber()
+                                + ":" + GetFileColumnNumber();
+                }
+                
+                public override bool Equals(Object obj) {
+                        if ((obj == null) || (!(obj is StackFrame))) {
+                                return false;
+                        }
+                        
+                        StackFrame rhs = (StackFrame) obj;
+                        
+                        if (!ObjectsEqual(GetMethod(), rhs.GetMethod())) {
+                                return false;
+                        }
+                        
+                        if (!ObjectsEqual(GetFileName(), rhs.GetFileName())) {
+                                return false;
+                        }
+                        
+                        if (GetFileLineNumber() != rhs.GetFileLineNumber()) {
+                                return false;
+                        }
+                        
+                        if (GetFileColumnNumber() != rhs.GetFileColumnNumber()) {
+                                return false;
+                        }
+                        
+                        if (GetILOffset() != rhs.GetILOffset()) {
+                                return false;
+                        }
+                        
+                        if (GetNativeOffset() != rhs.GetNativeOffset()) {
+                                return false;
+                        }
+                        
+                        return true;
+                        
+                }
+                
+                public override int GetHashCode() {
+                        return GetFileLineNumber();
+                }
+                
+                /// <summary>
+                ///   Checks whether two objects are equal.
+                ///   The objects are assumed equal if and only if either
+                ///   both of the references are <code>null</code> or they
+                ///   equal via <code>Equals</code> method.
+                /// </summary>
+                /// <param name="obj1">
+                ///   First object.
+                /// </param>
+                /// <param name="obj2">
+                ///   Second object.
+                /// </param>
+                /// <returns>
+                ///   <code>true</code> if the two objects are equal,
+                ///   </code>false</code> otherwise.
+                /// </returns>
+                private static bool ObjectsEqual(Object obj1, Object obj2) {
+                        if (obj1 == null) {
+                                return (obj2 == null);
+                        } else {
+                                return obj1.Equals(obj2);
+                        }
+                }
+         }
+}
diff --git a/mcs/class/corlib/System.Diagnostics/StackTrace.cs b/mcs/class/corlib/System.Diagnostics/StackTrace.cs
new file mode 100644
index 00000000000..c8ac9ca51bd
--- /dev/null
+++ b/mcs/class/corlib/System.Diagnostics/StackTrace.cs
@@ -0,0 +1,281 @@
+//
+// System.Diagnostics.StackTrace.cs
+//
+// Author:
+//      Alexander Klyubin (klyubin@aqris.com)
+//      Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) 2001
+//
+
+using System;
+using System.Reflection;
+using System.Threading;
+using System.Runtime.CompilerServices;
+using System.Collections;
+
+namespace System.Diagnostics {
+        /// <summary>
+        ///   Stack trace.
+        ///   TODO: more information.
+        /// </summary>
+        [Serializable]
+	public class StackTrace {
+                /// <value>
+                ///   Uses a constant to define the number of methods that are
+                ///   to be omitted from the stack trace.
+                /// </value>
+                public const int METHODS_TO_SKIP = 0;
+                
+                /// <value>
+                ///   Frames. First frame is the last stack frame pushed.
+                /// </value>
+                private StackFrame[] frames;
+
+                /// <summary>
+                ///   Initializes a new instance of the StackTrace class.
+                /// </summary>
+		[MonoTODO]
+                public StackTrace() {
+			init_frames (METHODS_TO_SKIP, false);
+		}
+                
+                /// <summary>
+                ///   Initializes a new instance of the StackTrace class.
+                /// </summary>
+                /// <param name="needFileInfo">
+                ///   TODO:
+                /// </param>
+                public StackTrace(bool needFileInfo) {
+			init_frames (METHODS_TO_SKIP, needFileInfo);
+		}
+
+                /// <summary>
+                ///   Initializes a new instance of the StackTrace class
+                ///   from the current location, in a caller's frame.
+                /// </summary>
+                /// <param name="skipFrames">
+                ///   The number of frames up the stack to start the trace
+                ///   from.
+                /// </param>
+                public StackTrace(int skipFrames) {
+			init_frames (skipFrames, false);
+		}
+
+		/// <summary>
+                ///   Initializes a new instance of the StackTrace class
+                ///   from the current location, in a caller's frame.
+                /// </summary>
+                /// <param name="skipFrames">
+                ///   The number of frames up the stack to start the trace
+                ///   from.
+                /// </param>
+                /// <param name="needFileInfo">
+                ///   TODO:
+                /// </param>
+                public StackTrace(int skipFrames, bool needFileInfo) {
+			init_frames (skipFrames, needFileInfo);
+		}
+
+		void init_frames (int skipFrames, bool needFileInfo)
+		{
+			StackFrame sf;
+			ArrayList al = new ArrayList ();
+
+			skipFrames += 2;
+			
+			while ((sf = new StackFrame (skipFrames, needFileInfo)) != null &&
+			       sf.GetMethod () != null) {
+				
+				al.Add (sf);
+				skipFrames++;
+			};
+
+                        frames = (StackFrame [])al.ToArray (typeof (StackFrame));	
+		}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		extern static StackFrame [] get_trace (Exception e, int skipFrames, bool needFileInfo);
+
+                /// <summary>
+                ///   Initializes a new instance of the StackTrace class.
+                /// </summary>
+                /// <param name="e">
+                ///   TODO:
+                /// </param>
+                public StackTrace(Exception e) {
+                        frames = get_trace (e, METHODS_TO_SKIP, false);
+                }
+                                
+                /// <summary>
+                ///   Initializes a new instance of the StackTrace class,
+                ///   using the provided exception object. The resulting stack
+                ///   trace describes the stack at the time of the exception.
+                /// </summary>
+                /// <param name="e">
+                ///   TODO:
+                /// </param>
+                /// <param name="needFileInfo">
+                ///   TODO:
+                /// </param>
+                public StackTrace(Exception e, bool needFileInfo) {
+                        frames = get_trace (e, METHODS_TO_SKIP, needFileInfo);
+		}
+                
+                /// <summary>
+                ///   Initializes a new instance of the StackTrace class,
+                ///   using the provided exception object. The resulting stack
+                ///   trace describes the stack at the time of the exception.
+                /// </summary>
+                /// <param name="e">
+                ///   Exception.
+                /// </param>
+                /// <param name="skipFrames">
+                ///   The number of frames up the stack to start the trace
+                ///   from.
+                /// </param>
+                public StackTrace(Exception e, int skipFrames) {
+                        frames = get_trace (e, skipFrames, false);
+                }
+                
+                /// <summary>
+                ///   Initializes a new instance of the StackTrace class,
+                ///   using the provided exception object. The resulting stack
+                ///   trace describes the stack at the time of the exception.
+                /// </summary>
+                /// <param name="e">
+                ///   Exception.
+                /// </param>
+                /// <param name="skipFrames">
+                ///   The number of frames up the stack to start the trace
+                ///   from.
+                /// </param>
+                /// <param name="needFileInfo">
+                ///   TODO:
+                /// </param>
+                public StackTrace(Exception e, int skipFrames, bool needFileInfo) {
+                        frames = get_trace (e, skipFrames, needFileInfo);
+		}
+                              
+                /// <summary>
+                ///   Initializes a new instance of the StackTrace class
+                ///   containing a single frame.
+                /// </summary>
+                /// <param name="frame">
+                ///   The frame that the StackTrace object should contain.
+                /// </param>
+                public StackTrace(StackFrame frame) {
+                        this.frames = new StackFrame[1];
+                        this.frames[0] = frame;
+                }
+                               
+                /// <summary>
+                ///   Initializes a new instance of the StackTrace class.
+                /// </summary>
+                /// <param name="targetThread">
+                ///   TODO:
+                /// </param>
+                /// <param name="needFileInfo">
+                ///   TODO:
+                /// </param>
+		[MonoTODO]
+                public StackTrace(Thread targetThread, bool needFileInfo) {
+                        throw new NotImplementedException();
+                }
+               
+                /// <summary>
+                ///   Holds the number of frames in the stack trace.
+                /// </summary>
+                public virtual int FrameCount {
+                        get {
+                                return (frames == null) ? 0 : frames.Length;
+                        }
+                }             
+                              
+                /// <summary>
+                ///   Gets the specified stack frame.
+                /// </summary>
+                /// <param name="index">
+                ///   The index of the stack frame requested.
+                /// </param>
+                /// <returns>
+                ///   The specified stack frame. Returns <code>null</code> if
+                ///   frame with specified index does not exist in this stack
+                ///   trace.
+                /// </returns>
+                /// <remarks>
+                ///   Stack frames are numbered starting at zero, which is the
+                ///   last stack frame pushed.
+                /// </remarks>
+                public virtual StackFrame GetFrame(int index) {
+                        if ((index < 0) || (index >= FrameCount)) {
+                                return null;
+                        }
+                        
+                        return frames[index];
+                }              
+                
+                /// <summary>
+                ///   Builds a readable representation of the stack trace.
+                /// </summary>
+                /// <returns>
+                ///   A readable representation of the stack trace.
+                /// </returns>
+                public override string ToString() {
+                        string result = "";
+                        for (int i = 0; i < FrameCount; i++) {
+                                StackFrame frame = GetFrame(i);
+                                result += "\n\tat " + FrameToString(frame);
+                        }
+                        
+                        return result;
+                }
+                
+                public override bool Equals(Object obj) {
+                        if ((obj == null) || (!(obj is StackTrace))) {
+                                return false;
+                        }
+                        
+                        StackTrace rhs = (StackTrace) obj;
+                        
+                        if (FrameCount != rhs.FrameCount) {
+                                return false;
+                        }
+                        
+                        for (int i = 0; i < FrameCount; i++) {
+                                if (!GetFrame(i).Equals(rhs.GetFrame(i))) {
+                                        return false;
+                                }
+                        }
+                        
+                        return true;
+                }
+                
+                public override int GetHashCode() {
+                        return FrameCount;
+                }
+                
+                /// <summary>
+                ///   Converts single stack frame to string to be used in
+                ///   ToString method.
+                /// </summary>
+                /// <param name="frame">
+                ///   Frame to convert.
+                /// </param>
+                /// <returns>
+                ///   A readable representation of stack frame for using
+                ///   ToString.
+                /// </returns>
+                private static String FrameToString(StackFrame frame) {
+			MethodBase method = frame.GetMethod();
+                        if (method != null) {
+                                // Method information available
+                                return  method.DeclaringType.FullName
+                                        + "." + method.Name + "()";
+                        } else {
+                                // Method information not available
+                                return "<unknown method>";
+                        }
+                }
+        }
+}
diff --git a/mcs/class/corlib/System.Globalization/Calendar.cs b/mcs/class/corlib/System.Globalization/Calendar.cs
new file mode 100644
index 00000000000..8b36614dd27
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/Calendar.cs
@@ -0,0 +1,917 @@
+// Calendar.cs
+//
+// (C) Ulrich Kunitz 2002
+//
+
+namespace System.Globalization {
+
+using System;
+using System.IO;
+
+/// <remarks>
+/// The class serves as a base class for calendar classes.
+/// </remarks>
+[Serializable]
+public abstract class Calendar {
+	/// <value>An protected integer property that gives the number of
+	/// days in a week. It might be overridden.</value>
+	internal virtual int M_DaysInWeek
+	{
+		get { return 7; }
+	}
+
+	/// <summary>
+	/// The protected method creates the string used in the
+	/// <see cref="T:System.ArgumentOutOfRangeException"/>
+	/// </summary>
+	/// <param name="a">An object that represents the smallest 
+	/// allowable value.</param>
+	/// <param name="b">An object that represents the greatest allowable
+	/// value.</param>
+	/// <returns>The string used in the
+	/// <see cref="T:System.ArgumentOutOfRangeException"/>
+	/// </returns>
+	internal string M_ValidValues(object a, object b)
+	{
+		StringWriter sw = new StringWriter();
+		sw.Write("Valid values are between {0} and {1}, inclusive.",
+			a, b);
+		return sw.ToString();
+	}
+
+	/// <summary>
+	/// The protected method checks wether the parameter
+	/// <paramref name="arg"/> is in the allowed range.
+	/// </summary>
+	/// <param name="param">A string that gives the name of the
+	/// parameter to check.</param>
+	/// <param name="arg">An integer that gives the value to check.
+	/// </param>
+	/// <param name="a">An integer that represents the smallest allowed
+	/// value.</param>
+	/// <param name="b">An integer that represents the greatest allowed
+	/// value.</param>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the <paramref name="arg"/> is outside
+	/// the allowed range.
+	/// </exception>
+	internal void M_ArgumentInRange(string param, int arg, int a, int b)
+	{
+		if (a <= arg && arg <= b)
+			return;
+		throw new ArgumentOutOfRangeException(param, M_ValidValues(a, b));
+	}
+
+	/// <summary>
+	/// The protected method, that checks whether
+	/// <paramref name="hour"/>, <paramref name="minute"/>,
+	/// <paramref name="second"/>, and <parameref name="millisecond"/>
+	/// are in their valid ranges
+	/// </summary>
+	/// <param name="hour">An integer that represents a hour, 
+	/// should be between 0 and 23.</param>
+	/// <param name="minute">An integer that represents a minute,
+	/// should be between 0 and 59.</param>
+	/// <param name="second">An integer that represents a second,
+	/// should be between 0 and 59.</param>
+	/// <param name="milliseconds">An integer that represents a number
+	/// of milliseconds, should be between 0 and 999999.</param>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The Exception is thrown, if one of the parameter is outside the
+	/// allowed the range.
+	/// </exception>
+	internal void M_CheckHMSM(int hour, int minute, int second,
+		int milliseconds)
+	{
+		M_ArgumentInRange("hour", hour, 0, 23);
+		M_ArgumentInRange("minute", minute, 0, 59);
+		M_ArgumentInRange("second", second, 0, 59);
+		M_ArgumentInRange("milliseconds", milliseconds, 0, 999999);
+	}
+
+	/// <value>
+	/// A represantation of the CurrentEra.
+	/// </value>
+	public const int CurrentEra = 0;
+
+	/// <value>When overridden gives the eras supported by the
+	/// calendar as an array of integers.
+	/// </value>
+	public abstract int[] Eras { get; }
+
+	/// <summary>
+	/// The protected member stores the value for the
+	/// <see cref="P:TwoDigitYearMax"/>
+	/// property.
+	/// </summary>
+	internal int M_TwoDigitYearMax;
+	
+
+	/// <summary>
+	/// Private field containing the maximum year for the calendar.
+	/// </summary>
+	private int M_MaxYearValue = 0;
+
+	/// <value>
+	/// Get-only property returing the maximum allowed year for this
+	/// class.
+	/// </value>
+	internal virtual int M_MaxYear {
+		get {
+			if (M_MaxYearValue == 0) {
+				M_MaxYearValue = GetYear(DateTime.MaxValue);
+			}
+			return M_MaxYearValue;
+		}
+	}
+
+	/// <summary>
+	/// Checks whether the year is the era is valid, if era = CurrentEra
+	/// the right value is set.
+	/// </summary>
+	/// <param name="year">The year to check.</param>
+	/// <param name="era">The era to check.</Param>
+	/// <exception cref="T:ArgumentOutOfRangeException">
+	/// The exception will be thrown, if the year is not valid.
+	/// </exception>
+	internal abstract void M_CheckYE(int year, ref int era);
+
+	/// <value>
+	/// <para>The property gives the maximum value for years with two
+	/// digits. If the property has the value 2029, than the two-digit
+	/// integer 29 results in the year 2029 and 30 in the 
+	/// year 1930.</para>
+	/// <para>It might be overridden.</para>
+	/// </value>
+	public virtual int TwoDigitYearMax {
+		get { return M_TwoDigitYearMax; }
+		set {
+			M_ArgumentInRange("year", value, 100, M_MaxYear);
+			int era = CurrentEra;
+			M_CheckYE(value, ref era);
+			M_TwoDigitYearMax = value;
+		}
+	}
+
+	/// <summary>
+	/// The virtual method adds days to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// days.
+	/// </param>
+	/// <param name="days">The number of days to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="days"/> to the specified
+	/// DateTime.</returns>
+	public virtual DateTime AddDays(DateTime time, int days) {
+		return time.Add(TimeSpan.FromDays(days));
+	}
+
+	/// <summary>
+	/// The virtual method adds hours to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// hours.
+	/// </param>
+	/// <param name="hours">The number of hours to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="hours"/> to the specified
+	/// DateTime.</returns>
+	public virtual DateTime AddHours(DateTime time, int hours) {
+		return time.Add(TimeSpan.FromHours(hours));
+	}
+
+	/// <summary>
+	/// The virtual method adds milliseconds to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// milliseconds.
+	/// </param>
+	/// <param name="milliseconds">The number of milliseconds given as
+	/// double to add. Keep in mind the 100 nanosecond resolution of 
+	/// <see cref="T:System.DateTime"/>.
+	/// </param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="milliseconds"/> to the specified
+	/// DateTime.</returns>
+	public virtual DateTime AddMilliseconds(DateTime time,
+		double milliseconds)
+	{
+		return time.Add(TimeSpan.FromMilliseconds(milliseconds));
+	}
+
+	/// <summary>
+	/// The virtual method adds minutes to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// minutes.
+	/// </param>
+	/// <param name="minutes">The number of minutes to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="minutes"/> to the specified
+	/// DateTime.</returns>
+	public virtual DateTime AddMinutes(DateTime time, int minutes) {
+		return time.Add(TimeSpan.FromMinutes(minutes));
+	}
+
+	/// <summary>
+	/// When overrideden adds months to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="months">The number of months to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="months"/> to the specified
+	/// DateTime.</returns>
+	public abstract DateTime AddMonths(DateTime time, int months);
+
+	/// <summary>
+	/// The virtual method adds seconds to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// seconds.
+	/// </param>
+	/// <param name="seconds">The number of seconds to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="seconds"/> to the specified
+	/// DateTime.</returns>
+	public virtual DateTime AddSeconds(DateTime time, int seconds) {
+		return time.Add(TimeSpan.FromSeconds(seconds));
+	}
+
+	/// <summary>
+	/// A wirtual method that adds weeks to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// weeks.
+	/// </param>
+	/// <param name="weeks">The number of weeks to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="weeks"/> to the specified
+	/// DateTime.</returns>
+	public virtual DateTime AddWeeks(DateTime time, int weeks) {
+		return time.AddDays(weeks * M_DaysInWeek);
+	}
+
+	/// <summary>
+	/// When overrideden adds years to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// years.
+	/// </param>
+	/// <param name="years">The number of years to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="years"/> to the specified
+	/// DateTime.</returns>
+	public abstract DateTime AddYears(DateTime time, int years);
+
+	/// <summary>
+	/// When overriden gets the day of the month from
+	/// <paramref name="time"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public abstract int GetDayOfMonth(DateTime time);
+
+	/// <summary>
+	/// When overriden gets the day of the week from the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public abstract DayOfWeek GetDayOfWeek(DateTime time);
+
+	/// <summary>
+	/// When overridden gives the number of the day in the year.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the day of the year,
+	/// starting with 1.</returns>
+	public abstract int GetDayOfYear(DateTime time);
+
+	/// <summary>
+	/// A virtual method that gives the number of days of the specified
+	/// month of the <paramref name="year"/> and the
+	/// <see cref="P:CurrentEra"/>.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the current
+	/// era.</param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if <paramref name="month"/> or
+	/// <paramref name="year"/> is outside the allowed range.
+	/// </exception>
+	public virtual int GetDaysInMonth(int year, int month) {
+		return GetDaysInMonth(year, month, CurrentEra);
+	}
+
+	/// <summary>
+	/// When overridden gives the number of days in the specified month
+	/// of the given year and era.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <param name="era">An intger that gives the era of the specified
+	/// year.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if <paramref name="month"/>,
+	/// <paramref name="year"/> ,or <paramref name="era"/> is outside
+	/// the allowed range.
+	/// </exception>
+	public abstract int GetDaysInMonth(int year, int month, int era);
+
+	/// <summary>
+	/// A virtual method that gives the number of days of the specified
+	/// year of the <see cref="P:CurrentEra"/>.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the current
+	/// era.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if
+	/// <paramref name="year"/> is outside the allowed range.
+	/// </exception>
+	public virtual int GetDaysInYear(int year) {
+		return GetDaysInYear(year, CurrentEra);
+	}
+
+	/// <summary>
+	/// When overridden gives the number of days of the specified
+	/// year of the given era.. 
+	/// </summary>
+	/// <param name="year">An integer that specifies the year. 
+	/// </param>
+	/// <param name="era">An ineger that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeExceiption">
+	/// The exception is thrown, if
+	/// <paramref name="year"/> is outside the allowed range.
+	/// </exception>
+	public abstract int GetDaysInYear(int year, int era);
+
+	/// <summary>
+	/// When overridden gives the era of the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the era of the calendar.
+	/// </returns>
+	public abstract int GetEra(DateTime time);
+
+	/// <summary>
+	/// Virtual method that gives the hour of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the hour of the specified time,
+	/// starting with 0.</returns>
+	public virtual int GetHour(DateTime time) {
+		return time.TimeOfDay.Hours;
+	}
+
+	/// <summary>
+	/// Virtual method that gives the milliseconds in the current second
+	/// of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the milliseconds in the seconds
+	/// of the specified time, starting with 0.</returns>
+	public virtual double GetMilliseconds(DateTime time) {
+		return time.TimeOfDay.Milliseconds;
+	}
+
+	/// <summary>
+	/// Virtual method that gives the minute of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the minute of the specified time,
+	/// starting with 0.</returns>
+	public virtual int GetMinute(DateTime time) {
+		return time.TimeOfDay.Minutes;
+	}
+
+	/// <summary>
+	/// When overridden gives the number of the month of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the month, 
+	/// starting with 1.</returns>
+	public abstract int GetMonth(DateTime time);
+
+	/// <summary>
+	/// Virtual method that gives the number of months of the specified
+	/// year of the <see cref="M:CurrentEra"/>.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// current era.
+	/// </param>
+	/// <returns>An integer that gives the number of the months in the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year is not allowed in the
+	/// current era.
+	/// </exception>
+	public virtual int GetMonthsInYear(int year) {
+		return GetMonthsInYear(year, CurrentEra);
+	}
+
+	/// <summary>
+	/// When overridden gives the number of months in the specified year 
+	/// and era.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of the months in the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or the era are not valid.
+	/// </exception>
+	public abstract int GetMonthsInYear(int year, int era);
+
+	/// <summary>
+	/// Virtual method that gives the second of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the second of the specified time,
+	/// starting with 0.</returns>
+	public virtual int GetSecond(DateTime time) {
+		return time.TimeOfDay.Seconds;
+	}
+
+	/// <summary>
+	/// A protected method to calculate the number of days between two
+	/// dates.
+	/// </summary>
+	/// <param name="timeA">A <see cref="T:System.DateTime"/>
+	/// representing the first date.
+	/// </param>
+	/// <param name="timeB">A <see cref="T:System.DateTime"/>
+	/// representing the second date.
+	/// </param>
+	/// <returns>An integer that represents the difference of days
+	/// between <paramref name="timeA"/> and <paramref name="timeB"/>.
+	/// </returns>
+	internal int M_DiffDays(DateTime timeA, DateTime timeB) {
+		long diff = timeA.Ticks - timeB.Ticks;
+
+		if (diff >= 0) {
+			return (int)(diff/TimeSpan.TicksPerDay);
+		}
+
+		diff += 1;
+		return -1 + (int)(diff/TimeSpan.TicksPerDay);
+	}
+
+	/// <summary>
+	/// A protected method that gives the first day of the second week of
+	/// the year.
+	/// </summary>
+	/// <param name="year">An integer that represents the year.</param>
+	/// <param name="rule">The
+	/// <see cref="T:System.Globalization.CalendarWeekRule"/>
+	/// to be used for the calculation.
+	/// </param>
+	/// <param name="firstDayOfWeek">
+	/// The <see cref="T:System.Globalization.DayOfWeek"/>
+	/// specifying the first day in a week.
+	/// </param>
+	/// <returns>The <see cref="T:System.DateTime"/> representing 
+	/// the first day of the second week of the year.
+	/// </returns>
+	internal DateTime M_GetFirstDayOfSecondWeekOfYear(
+		int year, CalendarWeekRule rule, DayOfWeek firstDayOfWeek)
+	{
+		DateTime d1 = ToDateTime(year, 1, 1, 0, 0, 0, 0);
+		int dow1 = (int)GetDayOfWeek(d1);
+		int fdow = (int)firstDayOfWeek;
+		int d = 0;
+
+		switch (rule) {
+		case CalendarWeekRule.FirstDay:
+			if (fdow > dow1) {
+				d += fdow - dow1;
+			}
+			else {
+				d += fdow + M_DaysInWeek - dow1;
+			}
+			break;
+		case CalendarWeekRule.FirstFullWeek:
+			d = M_DaysInWeek;
+			if (fdow >= dow1) {
+				d += fdow - dow1;
+			}
+			else {
+				d += fdow + M_DaysInWeek - dow1;
+			}
+			break;
+		case CalendarWeekRule.FirstFourDayWeek:
+			int dow4 = (dow1 + 3)%M_DaysInWeek;
+
+			d = 3;
+			if (fdow > dow4) {
+				d += fdow - dow4;
+			}
+			else {
+				d += fdow + M_DaysInWeek - dow4;
+			}
+			break;
+		}
+
+		return AddDays(d1, d);
+	}
+
+	/// <summary>
+	/// A virtual method that gives the number of the week in the year.
+	/// </summary>
+	/// <param name="time">A 
+	/// <see cref="T:System.DateTime"/> representing the date.
+	/// </param>
+	/// <param name="rule">The
+	/// <see cref="T:System.Globalization.CalendarWeekRule"/>
+	/// to be used for the calculation.
+	/// </param>
+	/// <param name="firstDayOfWeek">
+	/// The <see cref="T:System.Globalization.DayOfWeek"/>
+	/// specifying the first day in a week.
+	/// </param>
+	/// <returns>An integer representing the number of the week in the
+	/// year, starting with 1.
+	/// </returns>
+	public virtual int GetWeekOfYear(DateTime time,
+		CalendarWeekRule rule, 
+		DayOfWeek firstDayOfWeek)
+	{
+		if (firstDayOfWeek < DayOfWeek.Sunday ||
+		    DayOfWeek.Saturday < firstDayOfWeek)
+		{
+		    	throw new ArgumentOutOfRangeException("firstDayOfWeek",
+				"Value is not a valid day of week.");
+		}
+		int year = GetYear(time);
+
+		int days;
+
+		while (true) {
+			DateTime secondWeek = M_GetFirstDayOfSecondWeekOfYear(
+				year, rule, firstDayOfWeek);
+			days = M_DiffDays(time, secondWeek) + M_DaysInWeek;
+			if (days >= 0)
+				break;
+			year -= 1;
+		}
+
+		return 1 + days/M_DaysInWeek;
+	}
+
+	/// <summary>
+	/// When overridden gives the number of the year of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the year, 
+	/// starting with 1.</returns>
+	public abstract int GetYear(DateTime time);
+
+	/// <summary>
+	/// A virtual method that tells whether the given day in the
+	/// <see cref="M:CurrentEra"/> is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// current era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month or day is not valid
+	/// the current era.
+	/// </exception>
+	public virtual bool IsLeapDay(int year, int month, int day) {
+		return IsLeapDay(year, month, day, CurrentEra);
+	}
+
+	/// <summary>
+	/// Tells when overridden whether the given day 
+	/// is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, day, or era is not
+	/// valid.
+	/// </exception>
+	public abstract bool IsLeapDay(int year, int month, int day, int era);
+
+	/// <summary>
+	/// A virtual method that tells whether the given month of the
+	/// specified year in the
+	/// <see cref="M:CurrentEra"/> is a leap month.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// current era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <returns>A boolean that tells whether the given month is a leap
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or month is not valid
+	/// the current era.
+	/// </exception>
+	public virtual bool IsLeapMonth(int year, int month) {
+		return IsLeapMonth(year, month, CurrentEra);
+	}
+
+	/// <summary>
+	/// Tells when overridden whether the given month 
+	/// is a leap month.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given month is a leap
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, or era is not
+	/// valid.
+	/// </exception>
+	public abstract bool IsLeapMonth(int year, int month, int era);
+
+	/// <summary>
+	/// A virtual method that tells whether the given year
+	/// in the
+	/// <see cref="M:CurrentEra"/> is a leap year.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// current era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given year is a leap
+	/// year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year is not valid
+	/// the current era.
+	/// </exception>
+	public virtual bool IsLeapYear(int year) {
+		return IsLeapYear(year, CurrentEra);
+	}
+
+	/// <summary>
+	/// Tells when overridden whether the given year
+	/// is a leap year.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given year is a leap
+	/// year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or era is not
+	/// valid.
+	/// </exception>
+	public abstract bool IsLeapYear(int year, int era);
+
+	/// <summary>
+	/// A virtual method that creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the
+	/// <see cref="M:CurrentEra"/>.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <returns>A
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if at least one of the parameters
+	/// is out of range.
+	/// </exception>
+	public virtual DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds)
+	{
+		return ToDateTime(year, month, day, hour, minute, second, 
+			milliseconds, CurrentEra);
+	}
+
+
+	/// <summary>
+	/// When overridden creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the
+	/// <paramref name="era"/>.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if at least one of the parameters
+	/// is out of range.
+	/// </exception>
+	public abstract DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds,
+		int era);
+
+	/// <summary>
+	/// A virtual method that converts a two-digit year to a four-digit
+	/// year. It uses the <see cref="M:TwoDigitYearMax"/> property.
+	/// </summary>
+	/// <param name="year">An integer that gives the two-digit year.
+	/// </param>
+	/// <returns>An integer giving the four digit year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the year is negative or the resulting 
+	/// year is invalid.
+	/// </exception>
+	public virtual int ToFourDigitYear(int year) {
+		if (year < 0)
+			throw new ArgumentOutOfRangeException(
+				"year", "Non-negative number required.");
+		/* seems not to be the right thing to do, but .NET is
+		 * doing it this way.
+		 */
+		if (year <= 99) {
+			int year2 = TwoDigitYearMax%100;
+			int d = year - year2;
+			year = TwoDigitYearMax + d + (d <= 0 ? 0 : -100); 
+		}
+		int era = CurrentEra;
+		M_CheckYE(year, ref era);
+		return year;
+	}
+
+	// TwoDigitYearMax: Windows reads it from the Registry, we
+	// should have an XML file with the defaults
+	/// <summary>
+	/// The default constructor, is sets the TwoDigitYearMax to 2029.
+	/// </summary>
+	/// <remarks>
+	/// The .NET framework reads the value from the registry.
+	/// We should implement it here. Currently I set the default values
+	/// in the ctors of the derived classes, if it is 99.
+	/// </remarks>
+	protected Calendar() {
+		M_TwoDigitYearMax = 99;
+	}
+
+	/// <summary>Protected field storing the abbreviated era names.
+	/// </summary>
+	internal string[] M_AbbrEraNames;
+	/// <summary>Protected field storing the era names.
+	/// </summary>
+	internal string[] M_EraNames;
+
+	/// <value>
+	/// The property stores the era names. It might be overwritten by
+	/// CultureInfo.
+	/// </value>
+	internal string[] AbbreviatedEraNames {
+		get {
+			if (M_AbbrEraNames == null ||
+			    M_AbbrEraNames.Length != Eras.Length)
+				throw new Exception(
+					"Internal: M_AbbrEraNames " +
+					"wrong initialized!");
+			return (string[])M_AbbrEraNames.Clone();
+		}
+		set {
+			if (value.Length != Eras.Length) {
+				StringWriter sw = new StringWriter();
+				sw.Write("Array length must be equal Eras " +
+					"length {0}.", Eras.Length);
+				throw new ArgumentException(
+					sw.ToString());
+			} 
+			M_AbbrEraNames = (string[])value.Clone();
+		}
+	}
+
+	/// <value>
+	/// The property stores the era names. It might be overwritten by
+	/// CultureInfo.
+	/// </value>
+	internal string[] EraNames {
+		get {
+			if (M_EraNames == null ||
+			    M_EraNames.Length != Eras.Length)
+				throw new Exception(
+					"Internal: M_EraNames " +
+					"not initialized!");
+			return (string[])M_EraNames.Clone();
+		}
+		set {
+			if (value.Length != Eras.Length) {
+				StringWriter sw = new StringWriter();
+				sw.Write("Array length must be equal Eras " +
+					"length {0}.", Eras.Length);
+				throw new ArgumentException(
+					sw.ToString());
+			} 
+			M_EraNames = (string[])value.Clone();
+		}
+	}
+} // class Calendar
+	
+} // namespace System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/CalendarWeekRule.cs b/mcs/class/corlib/System.Globalization/CalendarWeekRule.cs
new file mode 100644
index 00000000000..936a56e8469
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/CalendarWeekRule.cs
@@ -0,0 +1,28 @@
+// ::MONO
+//
+// System.Globalization.CalendarWeekRule.cs
+//
+// Copyright (C) Wictor Wilén 2001 (wictor@iBizkit.se)
+//
+// Contributors: Wictor Wilén
+//
+// Revisions
+// 2001-09-14:	First draft
+// 2001-09-15:	First release
+
+using System;
+
+namespace System.Globalization
+{
+	/// <summary>
+	/// The System.Globalization.CalendarWeekRule enumeration
+	/// </summary>
+	public enum CalendarWeekRule
+	{
+		FirstDay = 0,
+		FirstFullWeek = 1,
+		FirstFourDayWeek = 2
+
+	}
+
+}
diff --git a/mcs/class/corlib/System.Globalization/CalendricalCalculations.cs b/mcs/class/corlib/System.Globalization/CalendricalCalculations.cs
new file mode 100644
index 00000000000..3f493f2cc2e
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/CalendricalCalculations.cs
@@ -0,0 +1,2120 @@
+// CalendricalCalculations.cs
+//
+// (C) Ulrich Kunitz 2002
+//
+
+namespace System.Globalization {
+
+using System.Collections;
+
+/// <summary>A class that provides mathematical functions.</summary>
+/// <remarks>
+/// <para>
+/// We are breaking the .Net
+/// naming conventions to be compatible to the "Calendrical Calculations"
+/// bool. 
+/// </para>
+/// </remarks>
+internal class CCMath {
+	/// <summary>
+	/// A static method which rounds a double value.
+	/// </summary>
+	/// <param name="x">The double value to round.</param>
+	/// <returns>The rounded double.</returns>
+	public static double round(double x) {
+		return System.Math.Floor(x+0.5);
+	}
+
+	/// <summary>
+	/// A static method that computes the remainder of the division
+	/// of two doubles.
+	/// </summary>
+	/// <param name="x">The double value which is divided.</param>
+	/// <param name="y">The divisor.</param>
+	/// <returns>The remainder as double value.</returns>
+	public static double mod(double x, double y) {
+		return x - y * System.Math.Floor(x/y);
+	}
+
+	/// <summary>
+	/// The static method divides two integers.
+	/// </summary>
+	/// <param name="x">The integer x value.</param>
+	/// <param name="y">The integer y value.</param>
+	/// <returns>The qotient of x and y defined by floor(x/y).
+	/// </returns>
+	/// <remarks>
+	/// Please notify that the function is not compatible to the standard
+	/// integer divide operation /.
+	/// </remarks>
+	public static int div(int x, int y) {
+		return (int)System.Math.Floor((double)x/(double)y);
+	}
+
+	/// <summary>
+	/// The static method computes the remainder of two integers.
+	/// </summary>
+	/// <param name="x">The integer value which will be divided.</param>
+	/// <param name="y">The divisor integer value.</param>
+	/// <returns> The remainder as integer value.</returns>
+	/// <remarks>
+	/// Please notify that the method is not compatible to the C#
+	/// remainder operation %.
+	/// </remarks>
+	public static int mod(int x, int y) {
+		return x - y * div(x, y);
+	}
+
+	/// <summary>
+	/// A static method that combines integer division and remainder
+	/// computation.
+	/// </summary>
+	/// <param name="remainder">Remainder integer output value.
+	/// </param>
+	/// <param name="x">Integer to be divided.</param>
+	/// <param name="y">Divisor integer value.</param>
+	/// <returns>The quotient as integer.</returns>
+	/// <seealso cref="M:div"/>
+	/// <seealso cref="M:mod"/>
+	public static int div_mod(out int remainder, int x, int y) {
+		int d = div(x, y);
+		remainder = x - y * d;
+		return d;
+	}
+
+	/// <summary>
+	/// A static method returning the sign of the argument.
+	/// </summary>
+	/// <param name="x">The double argument.</param>
+	/// <returns>An integer value: -1 for a negative argument;
+	/// 0 for a zero argument, and 1 for a positive argument.
+	/// </returns>
+	public static int signum(double x) {
+		if (x < 0.0)
+			return -1;
+		if (x == 0.0)
+			return 0;
+		return 1;
+	}
+
+	/// <summary>
+	/// A static method returning the sign of the integer
+	/// argument.
+	/// </summary>
+	/// <param name="x">The integer argument.</param>
+	/// <returns>An integer value: -1 for a negative argument;
+	/// 0 for a zero argument, and 1 for a positive argument.
+	/// </returns>
+	public static int signum(int x) {
+		if (x < 0)
+			return -1;
+		if (x == 0)
+			return 0;
+		return 1;
+	}
+
+	/// <summary>
+	/// An adjusted remainder function as defined in "Calendrical
+	/// Calculations".
+	/// </summary>
+	/// <param name="x">The double x argument.</param>
+	/// <param name="y">The double y argument, the divisor.</param>
+	/// <returns>A double value representing remainder; but instead 0.0
+	/// the divisor y is returned.
+	/// </returns>
+	public static double amod(double x, double y) {
+		double d = mod(x, y);
+		return (d == 0.0) ? y : d;
+	}
+
+	/// <summary>
+	/// The adjusted remainder functions for integers as defined in
+	/// "Calendrical Calculations".
+	/// </summary>
+	/// <param name="x">The integer argument to be divided.</param>
+	/// <param name="y">The integer divisor argument.</param>
+	/// <returns>The remainder as an integer; however instead 0 
+	/// is the divisor y returned.
+	/// </returns>
+	public static int amod(int x, int y) {
+		int i = mod(x, y);
+		return (i == 0) ? y : i;
+	}
+}
+
+/// <summary>The class implements methods to handle the fixed date value from
+/// the "Calendrical Calculations" books.
+/// </summary>
+/// <remarks>
+/// <para>
+/// For implementing the Calendar classes I used the algorithms from the
+/// book "Calendrical Calculations" by Nachum Dershowitz and Edward M.
+/// Rheingold, second reprint 1998. Trying to prevent the introduction of new
+/// bugs, I implemented their algorithms in the
+/// <see cref="N:CalendricalCalculations"/>
+/// namespace and wrapped it in the calendar classes.
+/// </para>
+/// <para>
+/// The fixed day number is also known as R.D. - rata die.
+/// Midnight at the onset of Monday,
+/// January 1, year 1 (Gregorian) is R.D. 1.
+/// </para>
+/// <para>Here are all my references:</para>
+/// <list type="table">
+/// <item><description>
+/// [1] Nachum Dershowitz and Edward M. Rheingold: "Calendrical Calculations";
+/// Cambridge University Press; second reprint 1998.
+/// </description></item>
+/// <item><description>
+/// [2] P. Kenneth Seidelmann (ed.): "Explanatory Supplement to the Astronomical
+/// Almanac"; University Science Books, Sausalito; 1992 
+/// </description></item>
+/// <item><description>
+/// [3] F. Richard Stephenson: "Historical Eclipses and Earth Rotation";
+/// Cambridge University Press; 1997
+/// </description></item>
+/// </list>
+/// </remarks>
+internal class CCFixed {
+	/// <summary>The method computes the
+	/// <see cref="T:System.DateTime"/>
+	/// from a fixed day number.
+	/// </summary>
+	/// <param name="date">A integer representing the fixed day number.
+	/// </param>
+	/// <returns>The <see cref="T:System.DateTime"/> representing
+	/// the date.
+	/// </returns>
+	public static System.DateTime ToDateTime(int date) {
+		long ticks = (date - 1) * System.TimeSpan.TicksPerDay;
+		return new System.DateTime(ticks);
+	}
+
+	/// <summary>The method computes the
+	/// <see cref="T:System.DateTime"/>
+	/// from a fixed day number and time arguments.
+	/// </summary>
+	/// <param name="date">An integer representing the fixed day number.
+	/// </param>
+	/// <param name="hour">An integer argument specifying the hour.
+	/// </param>
+	/// <param name="minute">An integer argument specifying the minute.
+	/// </param>
+	/// <param name="second">An integer argument giving the second.
+	/// </param>
+	/// <param name="milliseconds">An double argument specifying
+	/// the milliseconds. Notice that
+	/// <see cref="T:System.DateTime"/> has 100 nanosecond resolution.
+	/// </param>
+	/// <returns>The <see cref="T:System.DateTime"/> representing
+	/// the date.
+	/// </returns>
+	public static System.DateTime ToDateTime(int date,
+		int hour, int minute, int second, double milliseconds)
+	{
+		System.DateTime time = ToDateTime(date);
+		time = time.AddHours(hour);
+		time = time.AddMinutes(minute);
+		time = time.AddSeconds(second);
+		return time.AddMilliseconds(milliseconds);
+	}
+
+	/// <summary>
+	/// A static method computing the fixed day number from a 
+	/// <see cref="T:System.DateTime"/> value.
+	/// </summary>
+	/// <param name="time">A
+	/// <see cref="T:System.DateTime"/> value representing the date.
+	/// </param>
+	/// <returns>The fixed day number as integer representing the date.
+	/// </returns>
+	public static int FromDateTime(System.DateTime time) {
+		return 1 + (int)(time.Ticks / System.TimeSpan.TicksPerDay);
+	}
+
+	/// <summary>
+	/// The static method computes the <see cref="T:DayOfWeek"/>.
+	/// </summary>
+	/// <param name="date">An integer representing the fixed day number.
+	/// </param>
+	/// <returns>The day of week.</returns>
+	public static DayOfWeek day_of_week(int date) {
+		return (DayOfWeek)CCMath.mod(date, 7);
+	}
+
+	/// <summary>
+	/// The static method computes the date of a day of week on or before
+	/// a particular date.
+	/// </summary>
+	/// <param name="date">An integer representing the date as
+	/// fixed day number.
+	/// </param>
+	/// <param name="k">An integer representing the day of the week,
+	/// starting with 0 for sunday.
+	/// </param>
+	/// <returns>The fixed day number of the day of week specified by k
+	/// on or before the given date.
+	/// </returns>
+	public static int kday_on_or_before(int date, int k) {
+		return date - (int)day_of_week(date-k);
+	}
+
+	/// <summary>
+	/// The static method computes the date of a day of week on or after
+	/// a particular date.
+	/// </summary>
+	/// <param name="date">An integer representing the date as
+	/// fixed day number.
+	/// </param>
+	/// <param name="k">An integer representing the day of the week,
+	/// starting with 0 for sunday.
+	/// </param>
+	/// <returns>The fixed day number of the day of week specified by k
+	/// on or after the given date.
+	/// </returns>
+	public static int kday_on_or_after(int date, int k) {
+		return kday_on_or_before(date+6, k);
+	}
+
+	/// <summary>
+	/// The static method computes the date of a day of week that is
+	/// nearest to a particular date.
+	/// </summary>
+	/// <param name="date">An integer representing the date as
+	/// fixed day number.
+	/// </param>
+	/// <param name="k">An integer representing the day of the week,
+	/// starting with 0 for sunday.
+	/// </param>
+	/// <returns>The fixed day number of the day of week neares to the
+	/// given date.
+	/// </returns>
+	public static int kd_nearest(int date, int k) {
+		return kday_on_or_before(date+3, k);
+	}
+
+	/// <summary>
+	/// The static method computes the date of a day of week after
+	/// a particular date.
+	/// </summary>
+	/// <param name="date">An integer representing the date as
+	/// fixed day number.
+	/// </param>
+	/// <param name="k">An integer representing the day of the week,
+	/// starting with 0 for sunday.
+	/// </param>
+	/// <returns>The fixed day number of the day of week specified by k
+	/// after the given date.
+	/// </returns>
+	public static int kday_after(int date, int k) {
+		return kday_on_or_before(date+7, k);
+	}
+
+	/// <summary>
+	/// The static method computes the date of a day of week before
+	/// a particular date.
+	/// </summary>
+	/// <param name="date">An integer representing the date as
+	/// fixed day number.
+	/// </param>
+	/// <param name="k">An integer representing the day of the week,
+	/// starting with 0 for sunday.
+	/// </param>
+	/// <returns>The fixed day number of the day of week specified by k
+	/// before the given date.
+	/// </returns>
+	public static int kday_before(int date, int k) {
+		return kday_on_or_before(date-1, k);
+	}
+} // class CCFixed
+
+/// <summary>
+/// A class encapsulating the functions of the Gregorian calendar as static
+/// methods.
+/// </summary>
+/// <remarks>
+/// <para>
+/// This class is not compatible to
+/// <see cref="T:System.Globalization.GregorianCalendar"/>.
+/// </para>
+/// <para>
+/// The fixed day number is also known as R.D. - rata die.
+/// Midnight at the onset of Monday,
+/// January 1, year 1 (Gregorian) is R.D. 1.
+/// </para>
+/// <seealso cref="T:CCFixed"/>
+/// </remarks>
+internal class CCGregorianCalendar {
+	/// <summary>An integer defining the epoch of the Gregorian calendar
+	/// as fixed day number.</summary>
+	/// <remarks>The epoch is January 3, 1 C.E. (Julian).</remarks>
+	const int epoch = 1;
+
+	/// <summary>The enumeration defines the months of the Gregorian
+	/// calendar.
+	/// </summary>
+	public enum Month {
+		/// <summary>
+		/// January.
+		/// </summary>
+		january = 1,
+		/// <summary>
+		/// February.
+		/// </summary>
+		february,
+		/// <summary>
+		/// March.
+		/// </summary>
+		march,
+		/// <summary>
+		/// April.
+		/// </summary>
+		april,
+		/// <summary>
+		/// May.
+		/// </summary>
+		may,
+		/// <summary>
+		/// June.
+		/// </summary>
+		june,
+		/// <summary>
+		/// July.
+		/// </summary>
+		july,
+		/// <summary>
+		/// August.
+		/// </summary>
+		august,
+		/// <summary>
+		/// September.
+		/// </summary>
+		september,
+		/// <summary>
+		/// October.
+		/// </summary>
+		october,
+		/// <summary>
+		/// November.
+		/// </summary>
+		november,
+		/// <summary>
+		/// December.
+		/// </summary>
+		december
+	};
+
+
+	/// <summary>
+	/// The method tells whether the year is a leap year.
+	/// </summary>
+	/// <param name="year">An integer representing the Gregorian year.
+	/// </param>
+	/// <returns>A boolean which is true if <paramref name="year"/> is
+	/// a leap year.
+	/// </returns>
+	public static bool is_leap_year(int year) {
+		if (CCMath.mod(year, 4) != 0)
+			return false;
+		switch (CCMath.mod(year, 400)) {
+			case 100: 
+				return false;
+			case 200:
+				return false;
+			case 300:
+				return false;
+		}
+		return true;
+	}
+
+	/// <summary>
+	/// The method returns the fixed day number of the given Gregorian
+	/// date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Gregorian year.
+	/// </param>
+	/// <param name="year">An integer representing the Gregorian year.
+	/// Non-positive values are allowed also.
+	/// </param>
+	/// <returns>An integer value representing the fixed day number.
+	/// </returns>
+	public static int fixed_from_dmy(int day, int month, int year) {
+		int k = epoch - 1;
+		k += 365 * (year-1);
+		k += CCMath.div(year-1, 4);
+		k -= CCMath.div(year-1, 100);
+		k += CCMath.div(year-1, 400);
+		k += CCMath.div(367*month-362, 12);
+		if (month > 2) {
+			k += is_leap_year(year) ? -1 : -2;
+		}
+
+		k += day;
+
+		return k;
+	}
+
+	/// <summary>
+	/// The method computes the Gregorian year from a fixed day number.
+	/// </summary>
+	/// <param name="date">The fixed day number.
+	/// </param>
+	/// <returns>An integer value giving the Gregorian year of the date.
+	/// </returns>
+	public static int year_from_fixed(int date) {
+		int d		= date - epoch;
+		int n_400	= CCMath.div_mod(out d, d, 146097);
+		int n_100	= CCMath.div_mod(out d, d, 36524);
+		int n_4		= CCMath.div_mod(out d, d, 1461);
+		int n_1		= CCMath.div(d, 365);
+
+		int year = 400*n_400 + 100*n_100 + 4*n_4 + n_1;
+		return (n_100 == 4 || n_1 == 4) ? year : year + 1;
+	}
+
+	/// <summary>
+	/// The method computes the Gregorian year and month from a fixed day
+	/// number.
+	/// </summary>
+	/// <param name="month">The output value giving the Gregorian month.
+	/// </param>
+	/// <param name="year">The output value giving the Gregorian year.
+	/// </param>
+	/// <param name="date">An integer value specifying the fixed day
+	/// number.</param>
+	public static void my_from_fixed(out int month, out int year,
+		int date)
+	{
+		year = year_from_fixed(date);
+
+		int prior_days = date - fixed_from_dmy(1, (int)Month.january,
+			year);
+		
+		int correction;
+		if (date < fixed_from_dmy(1, (int)Month.march, year)) {
+			correction = 0;
+		} else if (is_leap_year(year)) {
+			correction = 1;
+		} else {
+			correction = 2;
+		}
+
+		month = CCMath.div(12 * (prior_days + correction) + 373, 367);
+
+	}
+
+	/// <summary>
+	/// The method computes the Gregorian year, month, and day from a
+	/// fixed day number.
+	/// </summary>
+	/// <param name="day">The output value returning the day of the
+	/// month.
+	/// </param>
+	/// <param name="month">The output value giving the Gregorian month.
+	/// </param>
+	/// <param name="year">The output value giving the Gregorian year.
+	/// </param>
+	/// <param name="date">An integer value specifying the fixed day
+	/// number.</param>
+	public static void dmy_from_fixed(out int day, out int month,
+		out int year,
+		int date)
+	{
+		my_from_fixed(out month, out year, date);
+		day = date - fixed_from_dmy(1, month, year) + 1;
+	}
+
+	/// <summary>A method computing the Gregorian month from a fixed
+	/// day number.
+	/// </summary>
+	/// <param name="date">An integer specifying the fixed day number.
+	/// </param>
+	/// <returns>An integer value representing the Gregorian month.
+	/// </returns>
+	public static int month_from_fixed(int date) {
+		int month, year;
+
+		my_from_fixed(out month, out year, date);
+		return month;
+	}
+
+	/// <summary>
+	/// A method computing the day of the month from a fixed day number.
+	/// </summary>
+	/// <param name="date">An integer specifying the fixed day number.
+	/// </param>
+	/// <returns>An integer value representing the day of the month.
+	/// </returns>
+	public static int day_from_fixed(int date) {
+		int day, month, year;
+
+		dmy_from_fixed(out day, out month, out year, date);
+		return day;
+	}
+
+	/// <summary>
+	/// The method computes the difference between two Gregorian dates.
+	/// </summary>
+	/// <param name="dayA">The integer parameter gives the day of month
+	/// of the first date.
+	/// </param>
+	/// <param name="monthA">The integer parameter gives the Gregorian
+	/// month of the first date.
+	/// </param>
+	/// <param name="yearA">The integer parameter gives the Gregorian
+	/// year of the first date.
+	/// </param>
+	/// <param name="dayB">The integer parameter gives the day of month
+	/// of the second date.
+	/// </param>
+	/// <param name="monthB">The integer parameter gives the Gregorian
+	/// month of the second date.
+	/// </param>
+	/// <param name="yearB">The integer parameter gives the Gregorian
+	/// year of the second date.
+	/// </param>
+	/// <returns>An integer giving the difference of days from the first
+	/// the second date.
+	/// </returns>
+	public static int date_difference(int dayA, int monthA, int yearA,
+		int dayB, int monthB, int yearB)
+	{
+		return	fixed_from_dmy(dayB, monthB, yearB) -
+			fixed_from_dmy(dayA, monthA, yearA);
+	}
+
+	/// <summary>
+	/// The method computes the number of the day in the year from
+	/// a Gregorian date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Gregorian year.
+	/// </param>
+	/// <param name="year">An integer representing the Gregorian year.
+	/// Non-positive values are allowed also.
+	/// </param>
+	/// <returns>An integer value giving the number of the day in the
+	/// Gregorian year, counting from 1.
+	/// </returns>
+	public static int day_number(int day, int month, int year) {
+		return date_difference(31, (int)Month.december, year-1,
+			day, month, year);
+	}
+
+	/// <summary>
+	/// The method computes the days remaining in the given Gregorian
+	/// year from a Gregorian date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Gregorian year.
+	/// </param>
+	/// <param name="year">An integer representing the Gregorian year.
+	/// Non-positive values are allowed also.
+	/// </param>
+	/// <returns>An integer value giving the number of days remaining in
+	/// the Gregorian year.
+	/// </returns>
+	public static int days_remaining(int day, int month, int year) {
+		return date_difference(day, month, year,
+			31, (int)Month.december, year);
+	}
+
+	// Helper functions for the Gregorian calendars.
+
+	/// <summary>
+	/// Adds months to the given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="months">The number of months to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="months"/> to the specified
+	/// DateTime.</returns>
+	public static System.DateTime AddMonths(System.DateTime time,
+		int months)
+	{
+		int rd = CCFixed.FromDateTime(time);
+		int day, month, year;
+		dmy_from_fixed(out day, out month, out year, rd);
+		month += months;
+		rd = fixed_from_dmy(day, month, year);
+		System.DateTime t = CCFixed.ToDateTime(rd);
+		return t.Add(time.TimeOfDay);
+	}
+
+	/// <summary>
+	/// Adds years to the given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="years">The number of years to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="years"/> to the specified
+	/// DateTime.</returns>
+	public static System.DateTime AddYears(System.DateTime time,
+		int years)
+	{
+		int rd = CCFixed.FromDateTime(time);
+		int day, month, year;
+		dmy_from_fixed(out day, out month, out year, rd);
+		year += years;
+		rd = fixed_from_dmy(day, month, year);
+		System.DateTime t = CCFixed.ToDateTime(rd);
+		return t.Add(time.TimeOfDay);
+	}
+
+	/// <summary>
+	/// Gets the of the month from <paramref name="time"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public static int GetDayOfMonth(System.DateTime time) {
+		return day_from_fixed(CCFixed.FromDateTime(time));
+	}
+
+	/// <summary>
+	/// The method gives the number of the day in the year.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the day of the year,
+	/// starting with 1.</returns>
+	public static int GetDayOfYear(System.DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		int year = year_from_fixed(rd);
+		int rd1_1 = fixed_from_dmy(1, 1, year);
+		return rd - rd1_1 + 1;
+	}
+
+	/// <summary>
+	/// A method that gives the number of days of the specified
+	/// month of the <paramref name="year"/>.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the current
+	/// era.</param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	public static int GetDaysInMonth(int year, int month) {
+		int rd1 = fixed_from_dmy(1, month, year);
+		int rd2 = fixed_from_dmy(1, month+1, year);
+		return rd2 - rd1;
+	}
+
+	/// <summary>
+	/// The method gives the number of days in the specified year.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	public static int GetDaysInYear(int year) {
+		int rd1 = fixed_from_dmy(1, 1, year);
+		int rd2 = fixed_from_dmy(1, 1, year+1);
+		return rd2 - rd1;
+	}
+
+	/// <summary>
+	/// The method gives the number of the month of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the month, 
+	/// starting with 1.</returns>
+	public static int GetMonth(System.DateTime time) {
+		return month_from_fixed(CCFixed.FromDateTime(time));
+	}
+
+	/// <summary>
+	/// The method gives the number of the year of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the year. 
+	/// </returns>
+	public static int GetYear(System.DateTime time) {
+		return year_from_fixed(CCFixed.FromDateTime(time));
+	}
+
+	/// <summary>
+	/// A virtual method that tells whether the given day
+	/// is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	public static bool IsLeapDay(int year, int month, int day) {
+		return is_leap_year(year) && month == 2 && day == 29;
+	}
+
+	/// <summary>
+	/// A method that creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <returns>A
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	public static System.DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds)
+	{
+		return CCFixed.ToDateTime(fixed_from_dmy(day, month, year),
+			hour, minute, second, milliseconds);
+	}
+} // class CCGregorianCalendar
+
+/// <summary>
+/// A class encapsulating the functions of the Julian calendar as static
+/// methods.
+/// </summary>
+/// <remarks>
+/// <para>The algorithms don't support a year 0. Years before Common Era
+/// (B.C.E. or B.C.) are negative and years of Common Era (C.E. or A.D.)
+/// are positive.
+/// </para>
+/// <para>
+/// This class is not compatible to
+/// <see cref="T:System.Globalization.JulianCalendar"/>.
+/// </para>
+/// <seealso cref="T:CCFixed"/>
+/// </remarks>
+internal class CCJulianCalendar {
+	/// <summary>An integer defining the epoch of the Julian calendar
+	/// as fixed day number.</summary>
+	/// <remarks>The epoch is December 30, 0 (Gregorian).</remarks>
+	const int epoch = -1; // 30. 12. 0 Gregorian
+
+	/// <summary>The enumeration defines the months of the Julian
+	/// calendar.
+	/// </summary>
+	public enum Month {
+		/// <summary>
+		/// January.
+		/// </summary>
+		january = 1,
+		/// <summary>
+		/// February.
+		/// </summary>
+		february,
+		/// <summary>
+		/// March.
+		/// </summary>
+		march,
+		/// <summary>
+		/// April.
+		/// </summary>
+		april,
+		/// <summary>
+		/// May.
+		/// </summary>
+		may,
+		/// <summary>
+		/// June.
+		/// </summary>
+		june,
+		/// <summary>
+		/// July.
+		/// </summary>
+		july,
+		/// <summary>
+		/// August.
+		/// </summary>
+		august,
+		/// <summary>
+		/// September.
+		/// </summary>
+		september,
+		/// <summary>
+		/// October.
+		/// </summary>
+		october,
+		/// <summary>
+		/// November.
+		/// </summary>
+		november,
+		/// <summary>
+		/// December.
+		/// </summary>
+		december
+	};
+
+	/// <summary>
+	/// The method tells whether the year is a leap year.
+	/// </summary>
+	/// <param name="year">An integer representing the Julian year.
+	/// </param>
+	/// <returns>A boolean which is true if <paramref name="year"/> is
+	/// a leap year.
+	/// </returns>
+	public static bool is_leap_year(int year) {
+		return CCMath.mod(year, 4) == (year > 0 ? 0 : 3);
+	}
+
+	/// <summary>
+	/// The method returns the fixed day number of the given Julian
+	/// date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Julian year.
+	/// </param>
+	/// <param name="year">An integer representing the Julian year.
+	/// Positive and Negative values are allowed.
+	/// </param>
+	/// <returns>An integer value representing the fixed day number.
+	/// </returns>
+	public static int fixed_from_dmy(int day, int month, int year) {
+		int y = year < 0 ? year+1 : year;
+		int k = epoch - 1;
+		k += 365 * (y-1);
+		k += CCMath.div(y-1, 4);
+		k += CCMath.div(367*month-362, 12);
+		if (month > 2) {
+			k += is_leap_year(year) ? -1 : -2;
+		}
+		k += day;
+
+		return k;
+	}
+
+	/// <summary>
+	/// The method computes the Julian year from a fixed day number.
+	/// </summary>
+	/// <param name="date">The fixed day number.
+	/// </param>
+	/// <returns>An integer value giving the Julian year of the date.
+	/// </returns>
+	public static int year_from_fixed(int date) {
+		int approx = CCMath.div(4*(date-epoch)+1464, 1461);
+		return approx <= 0 ? approx - 1 : approx;
+	}
+
+	/// <summary>
+	/// The method computes the Julian year and month from a fixed day
+	/// number.
+	/// </summary>
+	/// <param name="month">The output value giving the Julian month.
+	/// </param>
+	/// <param name="year">The output value giving the Julian year.
+	/// </param>
+	/// <param name="date">An integer value specifying the fixed day
+	/// number.</param>
+	public static void my_from_fixed(out int month, out int year, int date)
+	{
+		year = year_from_fixed(date);
+
+		int prior_days = date - fixed_from_dmy(1, (int)Month.january,
+			year);
+		
+		int correction;
+		if (date < fixed_from_dmy(1, (int)Month.march, year)) {
+			correction = 0;
+		} else if (is_leap_year(year)) {
+			correction = 1;
+		} else {
+			correction = 2;
+		}
+
+		month = CCMath.div(12 * (prior_days + correction) + 373, 367);
+	}
+	
+
+	/// <summary>
+	/// The method computes the Julian year, month, and day from a
+	/// fixed day number.
+	/// </summary>
+	/// <param name="day">The output value returning the day of the
+	/// month.
+	/// </param>
+	/// <param name="month">The output value giving the Julian month.
+	/// </param>
+	/// <param name="year">The output value giving the Julian year.
+	/// </param>
+	/// <param name="date">An integer value specifying the fixed day
+	/// number.</param>
+	public static void dmy_from_fixed(out int day, out int month,
+		out int year, int date)
+	{
+		my_from_fixed(out month, out year, date);
+		day = date - fixed_from_dmy(1, month, year) + 1;
+	}
+
+	/// <summary>A method computing the Julian month from a fixed
+	/// day number.
+	/// </summary>
+	/// <param name="date">An integer specifying the fixed day number.
+	/// </param>
+	/// <returns>An integer value representing the Julian month.
+	/// </returns>
+	public static int month_from_fixed(int date) {
+		int month, year;
+
+		my_from_fixed(out month, out year, date);
+		return month;
+	}
+
+	/// <summary>
+	/// A method computing the day of the month from a fixed day number.
+	/// </summary>
+	/// <param name="date">An integer specifying the fixed day number.
+	/// </param>
+	/// <returns>An integer value representing the day of the month.
+	/// </returns>
+	public static int day_from_fixed(int date) {
+		int day;
+		int month;
+		int year;
+
+		dmy_from_fixed(out day, out month, out year, date);
+		return day;
+	}
+
+	/// <summary>
+	/// The method computes the difference between two Julian dates.
+	/// </summary>
+	/// <param name="dayA">The integer parameter gives the day of month
+	/// of the first date.
+	/// </param>
+	/// <param name="monthA">The integer parameter gives the Julian
+	/// month of the first date.
+	/// </param>
+	/// <param name="yearA">The integer parameter gives the Julian
+	/// year of the first date.
+	/// </param>
+	/// <param name="dayB">The integer parameter gives the day of month
+	/// of the second date.
+	/// </param>
+	/// <param name="monthB">The integer parameter gives the Julian
+	/// month of the second date.
+	/// </param>
+	/// <param name="yearB">The integer parameter gives the Julian
+	/// year of the second date.
+	/// </param>
+	/// <returns>An integer giving the difference of days from the first
+	/// the second date.
+	/// </returns>
+	public static int date_difference(int dayA, int monthA, int yearA,
+		int dayB, int monthB, int yearB)
+	{
+		return	fixed_from_dmy(dayB, monthB, yearB) -
+			fixed_from_dmy(dayA, monthA, yearA);
+	}
+
+	/// <summary>
+	/// The method computes the number of the day in the year from
+	/// a Julian date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Julian year.
+	/// </param>
+	/// <param name="year">An integer representing the Julian year.
+	/// Negative values are allowed also.
+	/// </param>
+	/// <returns>An integer value giving the number of the day in the
+	/// Julian year, counting from 1.
+	/// </returns>
+	public static int day_number(int day, int month, int year) {
+		return date_difference(31, (int)Month.december, year-1,
+			day, month, year);
+	}
+
+	/// <summary>
+	/// The method computes the days remaining in the given Julian
+	/// year from a Julian date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Julian year.
+	/// </param>
+	/// <param name="year">An integer representing the Julian year.
+	/// Negative values are allowed also.
+	/// </param>
+	/// <returns>An integer value giving the number of days remaining in
+	/// the Julian year.
+	/// </returns>
+	public static int days_remaining(int day, int month, int year) {
+		return date_difference(day, month, year,
+			31, (int)Month.december, year);
+	}
+} // class CCJulianCalendar
+
+/// <summary>
+/// A class encapsulating the functions of the Hebrew calendar as static
+/// methods.
+/// </summary>
+/// <remarks>
+/// <para>
+/// This class is not compatible to
+/// <see cref="T:System.Globalization.HebrewCalendar"/>.
+/// </para>
+/// <seealso cref="T:CCFixed"/>
+/// </remarks>
+internal class CCHebrewCalendar {
+	/// <summary>An integer defining the epoch of the Hebrew calendar
+	/// as fixed day number.</summary>
+	/// <remarks>The epoch is October 10, 3761 B.C.E. (Julian).</remarks>
+	const int epoch = -1373427;
+
+	/// <summary>The enumeration defines the months of the Gregorian
+	/// calendar.
+	/// </summary>
+	/// <remarks>
+	/// The enumaration differs from .NET which defines Tishri as month 1.
+	/// </remarks>
+	public enum Month {
+		/// <summary>
+		/// Nisan.
+		/// </summary>
+		nisan	 = 1,
+		/// <summary>
+		/// Iyyar.
+		/// </summary>
+		iyyar,
+		/// <summary>
+		/// Sivan.
+		/// </summary>
+		sivan,
+		/// <summary>
+		/// Tammuz.
+		/// </summary>
+		tammuz,
+		/// <summary>
+		/// Av.
+		/// </summary>
+		av,
+		/// <summary>
+		/// Elul.
+		/// </summary>
+		elul,
+		/// <summary>
+		/// Tishri.
+		/// </summary>
+		tishri,
+		/// <summary>
+		/// Heshvan.
+		/// </summary>
+		heshvan,
+		/// <summary>
+		/// Kislev.
+		/// </summary>
+		kislev,
+		/// <summary>
+		/// Teveth.
+		/// </summary>
+		teveth,
+		/// <summary>
+		/// Shevat.
+		/// </summary>
+		shevat,
+		/// <summary>
+		/// Adar.
+		/// </summary>
+		adar,
+		/// <summary>
+		/// Adar I. Only in years with Adar II.
+		/// </summary>
+		adar_I = 12,
+		/// <summary>
+		/// Adar II. Only in years wirh Adar I.
+		/// </summary>
+		adar_II = 13,
+	};
+
+	/// <summary>
+	/// The method tells whether the year is a leap year.
+	/// </summary>
+	/// <param name="year">An integer representing the Hebrew year.
+	/// </param>
+	/// <returns>A boolean which is true if <paramref name="year"/> is
+	/// a leap year.
+	/// </returns>
+	public static bool is_leap_year(int year) {
+		return CCMath.mod(7*year+1, 19) < 7; 
+	}
+
+	/// <summary>
+	/// The Method gives the number of the last month in a year, which
+	/// is equal with the number of month in a Hebrew year.
+	/// </summary>
+	/// <param name="year">An integer representing the Hebrew year.
+	/// </param>
+	/// <returns>An integer giving the number of the last month of the 
+	/// Hebrew year, which is the same as the numbers of month in the
+	/// year.
+	/// </returns>
+	public static int last_month_of_year(int year) {
+		return is_leap_year(year) ? 13 : 12;
+	}
+
+	
+	/// <summary>The method is a helper function.</summary>
+	/// <param name="year">An integer specifying the Hebrew year.
+	/// </param>
+	/// <returns>An integer representing the number of elapsed days
+	/// until the Hebrew year.</returns>
+	public static int elapsed_days(int year) {
+		int months_elapsed = CCMath.div(235*year-234, 19);
+		int r;
+		int d = CCMath.div_mod(out r, months_elapsed, 1080);
+		int parts_elapsed = 204 + 793 * r;
+		int hours_elapsed = 11 + 12 * months_elapsed +
+				    793 * d + CCMath.div(parts_elapsed, 1080);
+
+		int day = 29*months_elapsed + CCMath.div(hours_elapsed, 24);
+
+		if (CCMath.mod(3*(day+1), 7) < 3) {
+			day += 1;
+		}
+
+		return day;
+	}
+
+	/// <summary>A method computing the delay of new year for the given
+	/// Hebrew year.
+	/// </summary>
+	/// <param name="year">An integer that gives the Hebrew year.
+	/// </param>
+	/// <returns>The new year delay in days of the given Hebrew year.
+	/// </returns>
+	public static int new_year_delay(int year) {
+		int ny1 = elapsed_days(year);
+		int ny2 = elapsed_days(year+1);
+
+		if (ny2 - ny1 == 356) {
+			return 2;
+		}
+		int ny0 = elapsed_days(year-1);
+		if (ny1 - ny0 == 382) {
+			return 1;
+		}
+		return 0;
+	}
+
+	/// <summary>
+	/// The method computes the last day of month (nummer of days in a
+	/// month) of the given Hebrew year.
+	/// </summary>
+	/// <param name="month">The Hebrew month, allowed value between
+	/// One and Thirteen.
+	/// </param>
+	/// <param name="year">An integer that gives the Hebrew year.
+	/// </param>
+	/// <returns>The number of the last day of the month of the given
+	/// Hebrew year, which gives automatically the number of days in the
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRange.Exception">
+	/// The exception is thrown if month not between One and Thirteen.
+	/// </exception>
+	public static int last_day_of_month(int month, int year) {
+		if (month < 1 || month > 13)
+			throw new System.ArgumentOutOfRangeException("month",
+				"Month should be between One and Thirteen.");
+		switch (month) {
+			case 2: return 29;
+			case 4: return 29;
+			case 6: return 29;
+			case 8:
+				if (!long_heshvan(year))
+					return 29;
+				break;
+			case 9:
+				if (short_kislev(year))
+					return 29;
+				break;
+			case 10: return 29;
+			case 12:
+				if (!is_leap_year(year))
+					return 29;
+				break;
+			case 13: return 29;
+		}
+		return 30;
+	}
+	
+	/// <summary>
+	/// The functions checks whether the month Heshvan is a long one
+	/// in the given Hebrew year.
+	/// </summary>
+	/// <param name="year">An integer that gives the Hebrew year.
+	/// </param>
+	/// <returns>A boolean value: true if there is a long Heshvan
+	/// in the given Hebrew year; false otherwise.
+	/// </returns>
+	public static bool long_heshvan(int year) {
+		return CCMath.mod(days_in_year(year), 10) == 5;
+	}
+
+	/// <summary>
+	/// The functions checks whether the month Kislev is a short one
+	/// in the given Hebrew year.
+	/// </summary>
+	/// <param name="year">An integer that gives the Hebrew year.
+	/// </param>
+	/// <returns>A boolean value: true if there is a short Kislev
+	/// in the given Hebrew year; false otherwise.
+	/// </returns>
+	public static bool short_kislev(int year) {
+		return CCMath.mod(days_in_year(year), 10) == 3;
+	}
+
+	/// <summary>
+	/// The functions gives the number of days in the specified Hebrew
+	/// year.
+	/// </summary>
+	/// <param name="year">An integer that gives the Hebrew year.
+	/// </param>
+	/// <returns>The days of the Hebrew year as integer.
+	/// </returns>
+	public static int days_in_year(int year) {
+		return	fixed_from_dmy(1, 7, year+1) -
+			fixed_from_dmy(1, 7, year);
+	}
+
+	/// <summary>
+	/// The method returns the fixed day number of the given Hebrew
+	/// date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Hebrew year.
+	/// </param>
+	/// <param name="year">An integer representing the Hebrew year.
+	/// Non-positive values are allowed also.
+	/// </param>
+	/// <returns>An integer value representing the fixed day number.
+	/// </returns>
+	public static int fixed_from_dmy(int day, int month, int year) {
+		int m;
+		int k = epoch-1;
+		k += elapsed_days(year);
+		k += new_year_delay(year);
+
+		if (month < 7) {
+			int l = last_month_of_year(year);
+			for (m = 7; m <= l; m++) {
+				k += last_day_of_month(m, year);
+			}
+			for (m = 1; m < month; m++) {
+				k += last_day_of_month(m, year);
+			}
+		}
+		else {
+			for (m = 7; m < month; m++) {
+				k += last_day_of_month(m, year);
+			}
+		}
+		
+		k += day;
+
+		return k;
+	}
+
+	/// <summary>
+	/// The method computes the Hebrew year from a fixed day number.
+	/// </summary>
+	/// <param name="date">The fixed day number.
+	/// </param>
+	/// <returns>An integer value giving the Hebrew year of the date.
+	/// </returns>
+	public static int year_from_fixed(int date) {
+		int approx = (int)System.Math.Floor(
+			((double)(date - epoch))/(35975351.0/98496.0));
+		int y;
+		for (y = approx; date >= fixed_from_dmy(1, 7, y); y++) {} 
+		return y-1;
+	}
+
+	/// <summary>
+	/// The method computes the Hebrew year and month from a fixed day
+	/// number.
+	/// </summary>
+	/// <param name="month">The output value giving the Hebrew month.
+	/// </param>
+	/// <param name="year">The output value giving the Hebrew year.
+	/// </param>
+	/// <param name="date">An integer value specifying the fixed day
+	/// number.</param>
+	public static void my_from_fixed(out int month, out int year,
+		int date)
+	{
+		year = year_from_fixed(date);
+
+		int start = date < fixed_from_dmy(1, 1, year) ? 7 : 1;
+
+		for (month = start;
+		     date > fixed_from_dmy(last_day_of_month(month, year),
+		     				month, year);
+		     month++)
+		{}
+	}
+
+	/// <summary>
+	/// The method computes the Hebrew year, month, and day from a
+	/// fixed day number.
+	/// </summary>
+	/// <param name="day">The output value returning the day of the
+	/// month.
+	/// </param>
+	/// <param name="month">The output value giving the Hebrew month.
+	/// </param>
+	/// <param name="year">The output value giving the Hebrew year.
+	/// </param>
+	/// <param name="date">An integer value specifying the fixed day
+	/// number.</param>
+	public static void dmy_from_fixed(out int day, out int month,
+		out int year, int date)
+	{
+		my_from_fixed(out month, out year, date);
+		day = date - fixed_from_dmy(1, month, year) + 1;
+	}
+
+	/// <summary>A method computing the Hebrew month from a fixed
+	/// day number.
+	/// </summary>
+	/// <param name="date">An integer specifying the fixed day number.
+	/// </param>
+	/// <returns>An integer value representing the Hebrew month.
+	/// </returns>
+	public static int month_from_fixed(int date) {
+		int month, year;
+
+		my_from_fixed(out month, out year, date);
+		return month;
+	}
+
+	/// <summary>
+	/// A method computing the day of the month from a fixed day number.
+	/// </summary>
+	/// <param name="date">An integer specifying the fixed day number.
+	/// </param>
+	/// <returns>An integer value representing the day of the month.
+	/// </returns>
+	public static int day_from_fixed(int date) {
+		int day, month, year;
+		
+		dmy_from_fixed(out day, out month, out year, date);
+		return day;
+	}
+
+	/// <summary>
+	/// The method computes the difference between two Hebrew dates.
+	/// </summary>
+	/// <param name="dayA">The integer parameter gives the day of month
+	/// of the first date.
+	/// </param>
+	/// <param name="monthA">The integer parameter gives the Hebrew
+	/// month of the first date.
+	/// </param>
+	/// <param name="yearA">The integer parameter gives the Hebrew
+	/// year of the first date.
+	/// </param>
+	/// <param name="dayB">The integer parameter gives the day of month
+	/// of the second date.
+	/// </param>
+	/// <param name="monthB">The integer parameter gives the Hebrew
+	/// month of the second date.
+	/// </param>
+	/// <param name="yearB">The integer parameter gives the Hebrew
+	/// year of the second date.
+	/// </param>
+	/// <returns>An integer giving the difference of days from the first
+	/// the second date.
+	/// </returns>
+	public static int date_difference(int dayA, int monthA, int yearA,
+		int dayB, int monthB, int yearB)
+	{
+		return	fixed_from_dmy(dayB, monthB, yearB) -
+			fixed_from_dmy(dayA, monthA, yearA);
+	}
+
+	/// <summary>
+	/// The method computes the number of the day in the year from
+	/// a Hebrew date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Hebrew year.
+	/// </param>
+	/// <param name="year">An integer representing the Hebrew year.
+	/// </param>
+	/// <returns>An integer value giving the number of the day in the
+	/// Hebrew year, counting from 1.
+	/// </returns>
+	public static int day_number(int day, int month, int year) {
+		return date_difference(1, 7, year,
+			day, month, year) + 1;
+	}
+
+	/// <summary>
+	/// The method computes the days remaining in the given Hebrew
+	/// year from a Hebrew date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Hebrew year.
+	/// </param>
+	/// <param name="year">An integer representing the Hebrew year.
+	/// </param>
+	/// <returns>An integer value giving the number of days remaining in
+	/// the Hebrew year.
+	/// </returns>
+	public static int days_remaining(int day, int month, int year) {
+		return date_difference(day, month, year,
+			1, 7, year+1)-1;
+	}
+} // class HebrewCalendar
+
+
+/// <summary>
+/// A class encapsulating the functions of the Islamic calendar as static
+/// methods.
+/// </summary>
+/// <remarks>
+/// <para>There is no difference here in using Hijri or Islamic calendar.
+/// </para>
+/// <para>The epoch of the Islamic calendar isn't fixed, because we cannot
+/// surely say today, when the crescent of the new moon has been observed 
+/// around the July 16, 622 C.E. Julian. Even today the start and end of 
+/// the month Ramadan is defined by religous authorities. So the calendar
+/// can be offset by two days.
+/// </para> 
+/// <para>
+/// We don't support the offset here, however we changed the epoch from
+/// "Calendrical Calculations" to value, that .Net seems to be using.
+/// </para>
+/// <para>
+/// This class is not compatible to
+/// <see cref="T:System.Globalization.HijriCalendar"/>.
+/// </para>
+/// <seealso cref="T:CCFixed"/>
+/// </remarks>
+public class CCHijriCalendar {
+	/// <summary>An integer defining the epoch of the Gregorian calendar
+	/// as fixed day number.</summary>
+	/// <remarks>
+	/// <para>
+	/// The epoch is given as 16 July 622 C.E. Julian (R.D. 227015)
+	/// in Calendrical Calculations, the approximate date of
+	/// the emigration of
+	/// Muhammed to Medina. However there is no way to determine today
+	/// the observation of the crescent of the new moon in July 622 C.E.
+	/// (Julian). So there is some variability in the epoch.
+	/// Religous authorities determine the epoch by observing the
+	/// crescent of the new moon for the month Ramadan, so there might
+	/// be an offsets by two days of the epoch.
+	/// </para>
+	/// <para>Windows
+	/// supports an AddHijriDate parameter in the registry to adapt
+	/// for it. It seems that the .NET implementation of
+	/// HijriCalendar uses an epoch of 227014, so we use it here. The
+	/// ArgumentOutOfRangeException gives July, 18 622 as epoch,
+	/// which is 227014 supporting our theory.
+	/// </para>
+	/// </remarks>
+	const int epoch = 227014;
+
+	/// <summary>The enumeration defines the months of the Islamic
+	/// calendar.
+	/// </summary>
+	public enum Month {
+		/// <summary>
+		/// Muharram.
+		/// </summary>
+		muharram = 1,
+		/// <summary>
+		/// Safar.
+		/// </summary>
+		safar,
+		/// <summary>
+		/// Rabi I.
+		/// </summary>
+		rabi_I,
+		/// <summary>
+		/// Rabi II.
+		/// </summary>
+		rabi_II,
+		/// <summary>
+		/// Jumada I.
+		/// </summary>
+		jumada_I,
+		/// <summary>
+		/// Jumada II.
+		/// </summary>
+		jumada_II,
+		/// <summary>
+		/// Rajab.
+		/// </summary>
+		rajab,
+		/// <summary>
+		/// Shaban.
+		/// </summary>
+		shaban,
+		/// <summary>
+		/// Ramadan.
+		/// </summary>
+		ramadan,
+		/// <summary>
+		/// Shawwal.
+		/// </summary>
+		shawwal,
+		/// <summary>
+		/// Dhu Al-Quada.
+		/// </summary>
+		dhu_al_quada,
+		/// <summary>
+		/// Dhu Al-Hijja.
+		/// </summary>
+		dhu_al_hijja,
+	};
+
+	/// <summary>
+	/// The method tells whether the year is a leap year.
+	/// </summary>
+	/// <param name="year">An integer representing the Islamic year.
+	/// </param>
+	/// <returns>A boolean which is true if <paramref name="year"/> is
+	/// a leap year.
+	/// </returns>
+	public static bool is_leap_year(int year) {
+		return CCMath.mod(14+11*year, 30) < 11;
+	}
+
+	/// <summary>
+	/// The method returns the fixed day number of the given Islamic
+	/// date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Islamic year.
+	/// </param>
+	/// <param name="year">An integer representing the Islamic year.
+	/// Non-positive values are allowed also.
+	/// </param>
+	/// <returns>An integer value representing the fixed day number.
+	/// </returns>
+	public static int fixed_from_dmy(int day, int month, int year) {
+		int k = epoch - 1;
+		k += 354 * (year-1);
+		k += CCMath.div(3+11*year, 30);
+		k += (int)System.Math.Ceiling(29.5 * (double)(month-1));
+		k += day;
+
+		return k;
+	}
+
+	/// <summary>
+	/// The method computes the Islamic year from a fixed day number.
+	/// </summary>
+	/// <param name="date">The fixed day number.
+	/// </param>
+	/// <returns>An integer value giving the Islamic year of the date.
+	/// </returns>
+	public static int year_from_fixed(int date) {
+		return CCMath.div(30*(date-epoch)+10646, 10631);
+	}
+
+	/// <summary>
+	/// The method computes the Islamic year and month from a fixed day
+	/// number.
+	/// </summary>
+	/// <param name="month">The output value giving the Islamic month.
+	/// </param>
+	/// <param name="year">The output value giving the Islamic year.
+	/// </param>
+	/// <param name="date">An integer value specifying the fixed day
+	/// number.</param>
+	public static void my_from_fixed(out int month, out int year, int date)
+	{
+		year = year_from_fixed(date);
+
+		int m = 1+(int)System.Math.Ceiling(
+			((double)(date-29-fixed_from_dmy(1,1,year)))/29.5);
+
+		month = m < 12 ? m : 12;
+	}
+	
+	/// <summary>
+	/// The method computes the Islamic year, month, and day from a
+	/// fixed day number.
+	/// </summary>
+	/// <param name="day">The output value returning the day of the
+	/// month.
+	/// </param>
+	/// <param name="month">The output value giving the Islamic month.
+	/// </param>
+	/// <param name="year">The output value giving the Islamic year.
+	/// </param>
+	/// <param name="date">An integer value specifying the fixed day
+	/// number.</param>
+	public static void dmy_from_fixed(out int day, out int month,
+		out int year, int date)
+	{
+		my_from_fixed(out month, out year, date);
+		day = date - fixed_from_dmy(1, month, year) + 1;
+	}
+
+	/// <summary>A method computing the Islamic month from a fixed
+	/// day number.
+	/// </summary>
+	/// <param name="date">An integer specifying the fixed day number.
+	/// </param>
+	/// <returns>An integer value representing the Islamic month.
+	/// </returns>
+	public static int month_from_fixed(int date) {
+		int month, year;
+
+		my_from_fixed(out month, out year, date);
+		return month;
+	}
+
+	/// <summary>
+	/// A method computing the day of the month from a fixed day number.
+	/// </summary>
+	/// <param name="date">An integer specifying the fixed day number.
+	/// </param>
+	/// <returns>An integer value representing the day of the month.
+	/// </returns>
+	public static int day_from_fixed(int date) {
+		int day;
+		int month;
+		int year;
+
+		dmy_from_fixed(out day, out month, out year, date);
+		return day;
+	}
+
+	/// <summary>
+	/// The method computes the difference between two Islamic dates.
+	/// </summary>
+	/// <param name="dayA">The integer parameter gives the day of month
+	/// of the first date.
+	/// </param>
+	/// <param name="monthA">The integer parameter gives the Islamic
+	/// month of the first date.
+	/// </param>
+	/// <param name="yearA">The integer parameter gives the Islamic
+	/// year of the first date.
+	/// </param>
+	/// <param name="dayB">The integer parameter gives the day of month
+	/// of the second date.
+	/// </param>
+	/// <param name="monthB">The integer parameter gives the Islamic
+	/// month of the second date.
+	/// </param>
+	/// <param name="yearB">The integer parameter gives the Islamic
+	/// year of the second date.
+	/// </param>
+	/// <returns>An integer giving the difference of days from the first
+	/// the second date.
+	/// </returns>
+	public static int date_difference(int dayA, int monthA, int yearA,
+		int dayB, int monthB, int yearB)
+	{
+		return	fixed_from_dmy(dayB, monthB, yearB) -
+			fixed_from_dmy(dayA, monthA, yearA);
+	}
+
+	/// <summary>
+	/// The method computes the number of the day in the year from
+	/// a Islamic date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Islamic year.
+	/// </param>
+	/// <param name="year">An integer representing the Islamic year.
+	/// </param>
+	/// <returns>An integer value giving the number of the day in the
+	/// Islamic year, counting from 1.
+	/// </returns>
+	public static int day_number(int day, int month, int year) {
+		return date_difference(31, 12, year-1, day, month, year);
+	}
+
+	/// <summary>
+	/// The method computes the days remaining in the given Islamic
+	/// year from a Islamic date.
+	/// </summary>
+	/// <param name="day">An integer representing the day of the month,
+	/// counting from 1.
+	/// </param>
+	/// <param name="month">An integer representing the month in the
+	/// Islamic year.
+	/// </param>
+	/// <param name="year">An integer representing the Islamic year.
+	/// Non-positive values are allowed also.
+	/// </param>
+	/// <returns>An integer value giving the number of days remaining in
+	/// the Islamic year.
+	/// </returns>
+	public static int days_remaining(int day, int month, int year) {
+		return date_difference(day, month, year,31, 12, year);
+	}
+} // class CCHijriCalendar
+
+/// <summary>
+/// A class that supports the Gregorian based calendars with other eras
+/// (e.g. <see cref="T:System.Gloablization.JapaneseCalendar"/>).
+/// </summary>
+[System.Serializable]
+public class CCGregorianEraHandler {
+	/// <summary>
+	/// A struct that represents a single era.
+	/// </summary>
+	[System.Serializable]
+	struct Era {
+		/// <summary>
+		/// The integer number identifying the era.
+		/// </summary>
+		private int _nr;
+
+		/// <value>
+		/// A get-only property that gives the era integer number.
+		/// </value>
+		public int Nr { get { return _nr; } }
+
+		/// <summary>This integer gives the first day of the era as
+		/// fixed day number.
+		/// </summary>
+		private int _start; // inclusive
+		/// <summary>
+		/// This integer gives the gregorian year of the
+		/// <see cref="M:_start"/> value.
+		/// </summary>
+		private int _gregorianYearStart;
+		/// <summary>
+		/// This integer gives the last day of the era as fixed day
+		/// number.
+		/// </summary>
+		private int _end;   // inclusive	
+		/// <summary>
+		/// This integer gives the largest year number of this era.
+		/// </summary>
+		private int _maxYear;
+
+		/// <summary>
+		/// This constructor creates the era structure.
+		/// </summary>
+		/// <param name="nr">The integer number of the era.
+		/// </param>
+		/// <param name="start">The fixed day number defining the
+		/// first day of the era.
+		/// </param>
+		/// <param name="end">The fixed day number that defines the
+		/// last day of the era.
+		/// </param>
+		public Era(int nr, int start, int end) {
+			if (nr == 0)
+				throw new System.ArgumentException(
+					"Era number shouldn't be zero.");
+			_nr = nr;
+			if (start > end) {
+				throw new System.ArgumentException(
+					"Era should start before end.");
+			}
+			_start = start;
+			_end = end;
+
+			_gregorianYearStart =
+				CCGregorianCalendar.year_from_fixed(_start);
+			int gregorianYearEnd =
+				CCGregorianCalendar.year_from_fixed(_end);
+			_maxYear = gregorianYearEnd - _gregorianYearStart + 1;
+		}
+
+		/// <summary>
+		/// This method computes the Gregorian year from the year
+		/// of this era.
+		/// </summary>
+		/// <param name="year">An integer giving the year in the
+		/// era.
+		/// </param>
+		/// <returns>
+		/// The Gregorian year as integer.
+		/// </returns>
+		/// <exception cref="T:System.ArgumentOutOfRangeException">
+		/// The exception is thrown if the year isn't valid in this
+		/// era.
+		/// </exception>
+		public int GregorianYear(int year) {
+			if (year < 1 || year > _maxYear) {
+				System.IO.StringWriter sw = 
+					new System.IO.StringWriter();
+				sw.Write(
+					"Valid Values are between " +
+					"{0} and {1}, inclusive.",
+					1, _maxYear);
+				throw new System.ArgumentOutOfRangeException(
+					"year", sw.ToString());
+			}
+			return year + _gregorianYearStart - 1;
+		}
+
+		/// <summary>
+		/// This function checks wether the given fixed day number is
+		/// ion the time span of the era.
+		/// </summary>
+		/// <param name="date">An integer giving the fixed day
+		/// number.
+		/// </param>
+		/// <returns>A boolean: true if the argument is in the time
+		/// span of the era.
+		/// </returns>
+		public bool Covers(int date) {
+			return _start <= date && date <= _end;
+		}
+
+		/// <summary>
+		/// This function returns the year of the era and sets
+		/// the era in an output parameter.
+		/// </summary>
+		/// <param name="era">An output parameter returning the
+		/// era number.
+		/// </param>
+		/// <param name="date">An integer giving the fixed day
+		/// number.
+		/// </param>
+		/// <returns>An integer giving the year of the era.
+		/// </returns>
+		/// <exception cref="T:System.ArgumentOutOfRangeException">
+		/// The exception is thrown if date is outside of the time
+		/// span of the era.
+		/// </exception>
+		public int EraYear(out int era, int date) {
+			if (!Covers(date))
+				throw new System.ArgumentOutOfRangeException(
+					"date", 
+					"Time was out of Era range.");
+			int gregorianYear =
+				CCGregorianCalendar.year_from_fixed(date);
+			era = _nr;
+			return gregorianYear - _gregorianYearStart + 1;
+		}
+	} // struct Era
+
+	/// <summary>
+	/// A private member storing the eras in a
+	/// <see cref="T:System.Collections.SortedList"/>.
+	/// </summary>
+	private SortedList _Eras;
+
+	/// <value>
+	/// The property returns the era numbers as an array of integers.
+	/// </value>
+	public int[] Eras {
+		get {
+			int[] a = new int[_Eras.Count];
+
+			for (int i = 0; i < _Eras.Count; i++) {
+				Era e = (Era)_Eras.GetByIndex(i);
+				a[i] = e.Nr;
+			}
+
+			return a;
+		}
+	}
+
+	/// <summary>
+	/// Constructor.
+	/// </summary>
+	public CCGregorianEraHandler() {
+		_Eras = new SortedList();
+	}
+
+	/// <summary>
+	/// Method adds an era to the GregorianEraHandler instance.
+	/// </summary>
+	/// <param name="nr">The integer number of the era.
+	/// </param>
+	/// <param name="rd_start">The fixed day number defining the
+	/// first day of the era.
+	/// </param>
+	/// <param name="rd_end">The fixed day number that defines the
+	/// last day of the era.
+	/// </param>
+	public void appendEra(int nr, int rd_start, int rd_end) {
+		Era era = new Era(nr, rd_start, rd_end);
+		_Eras[(System.Object)nr] = era;
+	}
+	/// <summary>
+	/// Method adds a yet not-ended era to the GregorianEraHandler
+	/// instance.
+	/// </summary>
+	/// <param name="nr">The integer number of the era.
+	/// </param>
+	/// <param name="rd_start">The fixed day number defining the
+	/// first day of the era.
+	/// </param>
+	public void appendEra(int nr, int rd_start) {
+		appendEra(nr, rd_start,
+			CCFixed.FromDateTime(DateTime.MaxValue));
+	}
+
+	/// <summary>
+	/// This method computes the Gregorian year from the year
+	/// of the given era.
+	/// </summary>
+	/// <param name="year">An integer giving the year in the
+	/// era.
+	/// </param>
+	/// <param name="era">An integer giving the era number.
+	/// </param>
+	/// <returns>
+	/// The Gregorian year as integer.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the year isn't valid in this
+	/// era.
+	/// </exception>
+	public int GregorianYear(int year, int era) {
+		Era e = (Era)_Eras[(System.Object)era];
+		return e.GregorianYear(year);
+	}
+
+	/// <summary>
+	/// This function returns the year of the era and sets
+	/// the era in an output parameter.
+	/// </summary>
+	/// <param name="era">An output parameter returning the
+	/// era number.
+	/// </param>
+	/// <param name="date">An integer giving the fixed day
+	/// number.
+	/// </param>
+	/// <returns>An integer giving the year of the era.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the fixed day number is outside of the
+	/// time spans of all eras.
+	/// </exception>
+	public int EraYear(out int era, int date)
+	{
+		IList list = _Eras.GetValueList();
+
+		foreach (Era e in list) {
+			if (e.Covers(date))
+				return e.EraYear(out era, date);
+		}
+
+		throw new System.ArgumentOutOfRangeException("date",
+			"Time value was out of era range.");
+	}
+
+	/// <summary>
+	/// The method checks whether a given
+	/// <see cref="T:System.DateTime"/> is covered by any era.
+	/// </summary>
+	/// <param name="time">A 
+	/// <see cref="T:System.DateTime"/> giving the date and time.
+	/// </param>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the argument isn't inside the time
+	/// span of any era.
+	/// </exception>
+	public void CheckDateTime(System.DateTime time) {
+		int date = CCFixed.FromDateTime(time);
+
+		if (!ValidDate(date))
+			throw new System.ArgumentOutOfRangeException("time",
+				"Time value was out of era range.");
+	}
+		
+	/// <summary>
+	/// The method tests whether a given
+	/// fixed day number is covered by any era.
+	/// </summary>
+	/// <param name="date">An integer representing the fixed day number.
+	/// </param>
+	/// <returns> A boolean is returned: true if the argument is inside
+	/// the time span of one era; false otherwise.
+	/// </returns>
+	public bool ValidDate(int date) {
+		IList list = _Eras.GetValueList();
+
+		foreach (Era e in list) {
+			if (e.Covers(date))
+				return true;
+		}
+
+		return false;
+	}
+
+	/// <summary>
+	/// The method tests, whether the era number does exist.
+	/// </summary>
+	/// <param name="era">An integer giving the era number.
+	/// </param>
+	/// <returns>A boole value: True if the era number does exist;
+	/// false otherwise.
+	/// </returns>
+	public bool ValidEra(int era) {
+		return _Eras.Contains((System.Object)era);
+	}
+} // class CCGregorianEraHandler
+
+} // namespace System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/ChangeLog b/mcs/class/corlib/System.Globalization/ChangeLog
new file mode 100644
index 00000000000..8c20c6e1bae
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/ChangeLog
@@ -0,0 +1,120 @@
+2002-08-15  Tim Coleamn <tim@timcoleman.com>
+	* CompareInfo.cs:
+		Stubbed out some methods.
+
+2002-08-14  Dick Porter  <dick@ximian.com>
+
+	* CultureInfo.cs: Implement Name, stub out all the other missing
+	methods.
+
+	* TextInfo.cs: Stubbed out this class
+
+2002-06-12  Nick Drochak  <ndrochak@gol.com>
+
+	* DateTimeFormatInfo.cs: Reformat.
+
+2002-06-11  Nick Drochak  <ndrochak@gol.com>
+
+	* NumberFormatInfo.cs: Make NumberNegativePattern = 1 for the ctor
+
+2002-06-07  Nick Drochak  <ndrochak@gol.com>
+
+	* NumberFormatInfo.cs: Make InvariantInfo.NumberNegativePattern = 1
+
+2002-05-07  Rodrigo Moya <rodrigo@ximian.com>
+
+	* CompareInfo.cs: new basic stub (compiles on Linux, so I assume
+	it does not break the build on windows. Sorry if it does).
+
+2002-04-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* NumberFormatInfo.cs: always set the values for the invariant culture
+	until there are more cultures supported.
+
+2002-04-22  Nick Drochak  <ndrochak@gol.com>
+
+	* NumberStyles.cs: Add [Serializable].
+
+2002-04-08  Nick Drochak  <ndrochak@gol.com>
+
+	* UnicodeCategory.cs: Fix typos in enum names.
+
+2002-03-04  Nick Drochak  <ndrochak@gol.com>
+
+	* JulianCalendar.cs: JulianEra should be field, not a property.
+	Thanks CorCompare (and Piers).
+
+2002-02-12  Duncan Mak  <duncan@ximian.com>
+
+	* CultureInfo.cs: Added the Calendar property to make the TimeZone
+	class build. It's marked as MonoTODO.
+
+2002-02-12  Nick Drochak  <ndrochak@gol.com>
+
+	* UnicodeCategory.cs: Fix typo.
+
+2002-02-01  Radek Doulik  <rodo@ximian.com>
+
+	* RegionInfo.cs: started work on RegionInfo
+	implemented RegionInfo (string) constructor
+
+	* CultureInfo.cs: added internal static function,
+	which could be used from RegionInfo.cs
+
+2002-01-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* CultureInfo.cs: Completed the tables.   Now we need to actually
+	fill it in.
+
+2002-01-15  Duncan Mak  <duncan@ximian.com>
+
+	* CultureInfo.cs: Convert it to unix text.
+
+2002-01-04  Ravi Pratap  <ravi@ximian.com>
+
+	* GreogrianCalendar.cs : The same old MonoTODO attribute.
+
+2001-11-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* Locale.cs: New file, a place holder for Locale.GetText.
+
+Wed Nov 14 16:47:07 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Calendar.cs: CLSCompliant updates.
+
+2001-11-04  Martin Weindel <martin.weindel@t-online.de>
+        * NumberFormatInfo.cs: fixed minor bug in Clone with readonly flag
+
+        * DateTimeFormatInfo.cs: added
+
+        * CultureInfo.cs: some changed needed for compiling DateTimeFormatInfo.cs
+
+2001-10-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* NumberFormatInfo.cs: Provide an internal constructor that takes
+	as an argument a CultureInfo ID (LCID) so that we can construct
+	different ones here.
+
+	* CultureInfo.cs: Begun implementation.
+
+2001-10-09  Derek Holden  <dholden@draper.com>
+
+	* NumberFormatInfo.cs: Small typo in PercentPositivePattern
+	and CurrencyPositivePattern
+
+2001-09-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* Calendar.cs: Implement a bunch of missing features.
+
+2001-07-24  Derek Holden  <dholden@draper.com>
+
+	* NumberStyles.cs: Added ECMA values for Allow types and default
+	styles.
+
+2001-07-18  Michael Lambert <michaellambert@email.com>
+
+        * DateTimeStyles.cs, NumberStyles.cs: Add.
+
+2001-07-06  Joe Shaw  <joe@ximian.com>
+
+	* UnicodeCategory.cs: Added.
diff --git a/mcs/class/corlib/System.Globalization/CompareInfo.cs b/mcs/class/corlib/System.Globalization/CompareInfo.cs
new file mode 100644
index 00000000000..d0ecec3cd21
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/CompareInfo.cs
@@ -0,0 +1,155 @@
+//
+// System.Globalization.CompareInfo
+//
+// Authors:
+//   Rodrigo Moya (rodrigo@ximian.com)
+//
+// (C) Ximian, Inc. 2002
+//
+
+using System.Runtime.Serialization;
+
+namespace System.Globalization
+{
+	public class CompareInfo : IDeserializationCallback
+	{
+
+		public virtual int Compare (string string1, string string2)
+		{
+			return Compare (string1, string2, CompareOptions.None);
+		}
+
+		[MonoTODO]
+		public virtual int Compare (string string1, string string2, CompareOptions options)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual int Compare (string string1, int offset1, string string2, int offset2)
+		{
+			return Compare (string1, offset1, string2, offset2, CompareOptions.None);
+		}
+
+		[MonoTODO]
+		public virtual int Compare (string string1, int offset1, string string2, int offset2, CompareOptions options)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual int Compare (string string1, int offset1, int length1, string string2, int offset2, int length2)
+		{
+			return Compare (string1, offset1, length1, string2, offset2, length2, CompareOptions.None);
+		}
+
+		[MonoTODO]
+		public virtual int Compare (string string1, int offset1, int length1, string string2, int offset2, int length2, CompareOptions options)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual int IndexOf (string source, char value)
+		{
+			if (source == null)
+				throw new ArgumentNullException ();
+			return IndexOf (source, value, CompareOptions.None);
+		}
+
+		public virtual int IndexOf (string source, string value)
+		{
+			if (source == null)
+				throw new ArgumentNullException ();
+			if (value == null)
+				throw new ArgumentNullException ();
+			return IndexOf (source, value, CompareOptions.None);
+		}
+
+		[MonoTODO]
+		public virtual int IndexOf (string source, char value, CompareOptions options)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual int IndexOf (string source, char value, int startIndex)
+		{
+			if (source == null)
+				throw new ArgumentNullException ();
+			if (startIndex < 0 || startIndex > source.Length)
+				throw new ArgumentOutOfRangeException ();
+			return IndexOf (source, value, startIndex, CompareOptions.None);
+		}
+		
+		[MonoTODO]
+		public virtual int IndexOf (string source, string value, CompareOptions options)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual int IndexOf (string source, string value, int startIndex)
+		{
+			if (source == null)
+				throw new ArgumentNullException ();
+			if (value == null)
+				throw new ArgumentNullException ();
+			if (startIndex < 0 || startIndex > source.Length)
+				throw new ArgumentOutOfRangeException ();
+			return IndexOf (source, value, startIndex, CompareOptions.None);
+		}
+
+		[MonoTODO]
+		public virtual int IndexOf (string source, char value, int startIndex, CompareOptions options)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual int IndexOf (string source, char value, int startIndex, int count)
+		{
+			if (source == null)
+				throw new ArgumentNullException ();
+			if (startIndex < 0 || startIndex > source.Length)
+				throw new ArgumentOutOfRangeException ();
+			if (count < 0)
+				throw new ArgumentOutOfRangeException ();
+			return IndexOf (source, value, startIndex, count, CompareOptions.None);
+		}
+
+		public virtual int IndexOf (string source, string value, int startIndex, CompareOptions options)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual int IndexOf (string source, string value, int startIndex, int count)
+		{
+			if (source == null)
+				throw new ArgumentNullException ();
+			if (value == null)
+				throw new ArgumentNullException ();
+			if (startIndex < 0 || startIndex > source.Length)
+				throw new ArgumentOutOfRangeException ();
+			if (count < 0)
+				throw new ArgumentOutOfRangeException ();
+			return IndexOf (source, value, startIndex, count, CompareOptions.None);
+		}
+		
+		[MonoTODO]
+		public virtual int IndexOf (string source, char value, int startIndex, int count, CompareOptions options)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual int IndexOf (string source, string value, int startIndex, int count, CompareOptions options)
+		{
+			throw new NotImplementedException ();
+		}
+
+
+		[MonoTODO]
+		void IDeserializationCallback.OnDeserialization(object sender)
+		{
+			throw new NotImplementedException ();
+		}
+		       
+	}
+}
diff --git a/mcs/class/corlib/System.Globalization/CompareOptions.cs b/mcs/class/corlib/System.Globalization/CompareOptions.cs
new file mode 100755
index 00000000000..81be8d94504
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/CompareOptions.cs
@@ -0,0 +1,54 @@
+// CompareOptions.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:34:52 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Globalization {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum CompareOptions {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		IgnoreCase = 1,
+
+		/// <summary>
+		/// </summary>
+		IgnoreNonSpace = 2,
+
+		/// <summary>
+		/// </summary>
+		IgnoreSymbols = 4,
+
+		/// <summary>
+		/// </summary>
+		IgnoreKanaType = 8,
+
+		/// <summary>
+		/// </summary>
+		IgnoreWidth = 16,
+
+		/// <summary>
+		/// </summary>
+		StringSort = 536870912,
+
+		/// <summary>
+		/// </summary>
+		Ordinal = 1073741824,
+	} // CompareOptions
+
+} // System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/CultureInfo.cs b/mcs/class/corlib/System.Globalization/CultureInfo.cs
new file mode 100644
index 00000000000..da81c6f0ba5
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/CultureInfo.cs
@@ -0,0 +1,1413 @@
+//
+// System.Globalization.CultureInfo
+//
+// Miguel de Icaza (miguel@ximian.com)
+// Dick Porter (dick@ximian.com)
+//
+// (C) 2001, 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System.Threading;
+
+namespace System.Globalization
+{
+	[Serializable]
+	public class CultureInfo : ICloneable, IFormatProvider
+	{
+		static CultureInfo invariant_culture_info;
+		bool is_read_only;
+		int  lcid;
+		bool use_user_override;
+		NumberFormatInfo number_format;
+		DateTimeFormatInfo datetime_format;
+
+		private static readonly string MSG_READONLY = "This instance is read only";
+		
+		// <summary>
+		//   Returns the Invariant Culture Information ("iv")
+		// </summary>
+		static public CultureInfo InvariantCulture {
+			get {
+				if (invariant_culture_info != null)
+					return invariant_culture_info;
+				
+				invariant_culture_info = new CultureInfo (0x07f, false);
+				invariant_culture_info.is_read_only = true;
+				
+				return invariant_culture_info;
+			}
+		}
+
+		//
+		// Initializes the CultureInfo object for the specific culture_id
+		//
+		void InitializeByID (int culture_id, bool use_user_override)
+		{
+			switch (culture_id){
+			case 0x0001: // ar Arabic
+			case 0x0401: // ar-SA Arabic (Saudi Arabia)
+			case 0x0801: // ar-IQ Arabic (Iraq)
+			case 0x0C01: // ar-EG Arabic (Egypt)
+			case 0x1001: // ar-LY Arabic (Libya)
+			case 0x1401: // ar-DZ Arabic (Algeria)
+			case 0x1801: // ar-MA Arabic (Morocco)
+			case 0x1C01: // ar-TN Arabic (Tunisia)
+			case 0x2001: // ar-OM Arabic (Oman)
+			case 0x2401: // ar-YE Arabic (Yemen)
+			case 0x2801: // ar-SY Arabic (Syria)
+			case 0x2C01: // ar-JO Arabic (Jordan)
+			case 0x3001: // ar-LB Arabic (Lebanon)
+			case 0x3401: // ar-KW Arabic (Kuwait)
+			case 0x3801: // ar-AE Arabic (U.A.E.)
+			case 0x3C01: // ar-BH Arabic (Bahrain)
+			case 0x4001: // ar-QA Arabic (Qatar)
+			case 0x0002: // bg Bulgarian
+			case 0x0402: // bg-BG Bulgarian (Bulgaria)
+			case 0x0003: // ca Catalan
+			case 0x0403: // ca-ES Catalan (Spain)
+			case 0x0004: // zh-CHS Chinese (Simplified)
+			case 0x0404: // zh-TW Chinese (Taiwan)
+			case 0x0804: // zh-CN Chinese (People's Republic of China)
+			case 0x0C04: // zh-HK Chinese (Hong Kong S.A.R.)
+			case 0x1004: // zh-SG Chinese (Singapore)
+			case 0x1404: // zh-MO Chinese (Macau S.A.R.)
+			case 0x7C04: // zh-CHT Chinese (Traditional)
+			case 0x0005: // cs Czech
+			case 0x0405: // cs-CZ Czech (Czech Republic)
+			case 0x0006: // da Danish
+			case 0x0406: // da-DK Danish (Denmark)
+			case 0x0007: // de German
+			case 0x0407: // de-DE German (Germany)
+			case 0x0807: // de-CH German (Switzerland)
+			case 0x0C07: // de-AT German (Austria)
+			case 0x1007: // de-LU German (Luxembourg)
+			case 0x1407: // de-LI German (Liechtenstein)
+			case 0x0008: // el Greek
+			case 0x0408: // el-GR Greek (Greece)
+			case 0x0009: // en English
+			case 0x0409: // en-US English (United States)
+			case 0x0809: // en-GB English (United Kingdom)
+			case 0x0C09: // en-AU English (Australia)
+			case 0x1009: // en-CA English (Canada)
+			case 0x1409: // en-NZ English (New Zealand)
+			case 0x1809: // en-IE English (Ireland)
+			case 0x1C09: // en-ZA English (South Africa)
+			case 0x2009: // en-JM English (Jamaica)
+			case 0x2409: // en-CB English (Caribbean)
+			case 0x2809: // en-BZ English (Belize)
+			case 0x2C09: // en-TT English (Trinidad and Tobago)
+			case 0x3009: // en-ZW English (Zimbabwe)
+			case 0x3409: // en-PH English (Republic of the Philippines)
+			case 0x000A: // es Spanish
+			case 0x080A: // es-MX Spanish (Mexico)
+			case 0x0C0A: // es-ES Spanish (Spain)
+			case 0x100A: // es-GT Spanish (Guatemala)
+			case 0x140A: // es-CR Spanish (Costa Rica)
+			case 0x180A: // es-PA Spanish (Panama)
+			case 0x1C0A: // es-DO Spanish (Dominican Republic)
+			case 0x200A: // es-VE Spanish (Venezuela)
+			case 0x240A: // es-CO Spanish (Colombia)
+			case 0x280A: // es-PE Spanish (Peru)
+			case 0x2C0A: // es-AR Spanish (Argentina)
+			case 0x300A: // es-EC Spanish (Ecuador)
+			case 0x340A: // es-CL Spanish (Chile)
+			case 0x380A: // es-UY Spanish (Uruguay)
+			case 0x3C0A: // es-PY Spanish (Paraguay)
+			case 0x400A: // es-BO Spanish (Bolivia)
+			case 0x440A: // es-SV Spanish (El Salvador)
+			case 0x480A: // es-HN Spanish (Honduras)
+			case 0x4C0A: // es-NI Spanish (Nicaragua)
+			case 0x500A: // es-PR Spanish (Puerto Rico)
+			case 0x000B: // fi Finnish
+			case 0x040B: // fi-FI Finnish (Finland)
+			case 0x000C: // fr French
+			case 0x040C: // fr-FR French (France)
+			case 0x080C: // fr-BE French (Belgium)
+			case 0x0C0C: // fr-CA French (Canada)
+			case 0x100C: // fr-CH French (Switzerland)
+			case 0x140C: // fr-LU French (Luxembourg)
+			case 0x180C: // fr-MC French (Principality of Monaco)
+			case 0x000D: // he Hebrew
+			case 0x040D: // he-IL Hebrew (Israel)
+			case 0x000E: // hu Hungarian
+			case 0x040E: // hu-HU Hungarian (Hungary)
+			case 0x000F: // is Icelandic
+			case 0x040F: // is-IS Icelandic (Iceland)
+			case 0x0010: // it Italian
+			case 0x0410: // it-IT Italian (Italy)
+			case 0x0810: // it-CH Italian (Switzerland)
+			case 0x0011: // ja Japanese
+			case 0x0411: // ja-JP Japanese (Japan)
+			case 0x0012: // ko Korean
+			case 0x0412: // ko-KR Korean (Korea)
+			case 0x0013: // nl Dutch
+			case 0x0413: // nl-NL Dutch (Netherlands)
+			case 0x0813: // nl-BE Dutch (Belgium)
+			case 0x0014: // no Norwegian
+			case 0x0414: // nb-NO Norwegian (Bokmål) (Norway)
+			case 0x0814: // nn-NO Norwegian (Nynorsk) (Norway)
+			case 0x0015: // pl Polish
+			case 0x0415: // pl-PL Polish (Poland)
+			case 0x0016: // pt Portuguese
+			case 0x0416: // pt-BR Portuguese (Brazil)
+			case 0x0816: // pt-PT Portuguese (Portugal)
+			case 0x0018: // ro Romanian
+			case 0x0418: // ro-RO Romanian (Romania)
+			case 0x0019: // ru Russian
+			case 0x0419: // ru-RU Russian (Russia)
+			case 0x001A: // hr Croatian
+			case 0x041A: // hr-HR Croatian (Croatia)
+			case 0x081A: // Lt-sr-SP Serbian (Latin) (Serbia)
+			case 0x0C1A: // Cy-sr-SP Serbian (Cyrillic) (Serbia)
+			case 0x001B: // sk Slovak
+			case 0x041B: // sk-SK Slovak (Slovakia)
+			case 0x001C: // sq Albanian
+			case 0x041C: // sq-AL Albanian (Albania)
+			case 0x001D: // sv Swedish
+			case 0x041D: // sv-SE Swedish (Sweden)
+			case 0x081D: // sv-FI Swedish (Finland)
+			case 0x001E: // th Thai
+			case 0x041E: // th-TH Thai (Thailand)
+			case 0x001F: // tr Turkish
+			case 0x041F: // tr-TR Turkish (Turkey)
+			case 0x0020: // ur Urdu
+			case 0x0420: // ur-PK Urdu (Islamic Republic of Pakistan)
+			case 0x0021: // id Indonesian
+			case 0x0421: // id-ID Indonesian (Indonesia)
+			case 0x0022: // uk Ukrainian
+			case 0x0422: // uk-UA Ukrainian (Ukraine)
+			case 0x0023: // be Belarusian
+			case 0x0423: // be-BY Belarusian (Belarus)
+			case 0x0024: // sl Slovenian
+			case 0x0424: // sl-SI Slovenian (Slovenia)
+			case 0x0025: // et Estonian
+			case 0x0425: // et-EE Estonian (Estonia)
+			case 0x0026: // lv Latvian
+			case 0x0426: // lv-LV Latvian (Latvia)
+			case 0x0027: // lt Lithuanian
+			case 0x0427: // lt-LT Lithuanian (Lithuania)
+			case 0x0029: // fa Farsi
+			case 0x0429: // fa-IR Farsi (Iran)
+			case 0x002A: // vi Vietnamese
+			case 0x042A: // vi-VN Vietnamese (Viet Nam)
+			case 0x002B: // hy Armenian
+			case 0x042B: // hy-AM Armenian (Armenia)
+			case 0x002C: // az Azeri
+			case 0x042C: // Lt-az-AZ Azeri (Latin) (Azerbaijan)
+			case 0x082C: // Cy-az-AZ Azeri (Cyrillic) (Azerbaijan)
+			case 0x002D: // eu Basque
+			case 0x042D: // eu-ES Basque (Spain)
+			case 0x002F: // mk FYRO Macedonian
+			case 0x042F: // mk-MK FYRO Macedonian (Former Yugoslav Republic of Macedonia)
+			case 0x0036: // af Afrikaans
+			case 0x0436: // af-ZA Afrikaans (South Africa)
+			case 0x0037: // ka Georgian
+			case 0x0437: // ka-GE Georgian (Georgia)
+			case 0x0038: // fo Faeroese
+			case 0x0438: // fo-FO Faeroese (Faeroe Islands)
+			case 0x0039: // hi Hindi
+			case 0x0439: // hi-IN Hindi (India)
+			case 0x003E: // ms Malay
+			case 0x043E: // ms-MY Malay (Malaysia)
+			case 0x083E: // ms-BN Malay (Brunei Darussalam)
+			case 0x003F: // kk Kazakh
+			case 0x043F: // kk-KZ Kazakh (Kazakhstan)
+			case 0x0040: // ky Kyrgyz
+			case 0x0440: // ky-KZ Kyrgyz (Kyrgyzstan)
+			case 0x0041: // sw Swahili
+			case 0x0441: // sw-KE Swahili (Kenya)
+			case 0x0043: // uz Uzbek
+			case 0x0443: // Lt-uz-UZ Uzbek (Latin) (Uzbekistan)
+			case 0x0843: // Cy-uz-UZ Uzbek (Cyrillic) (Uzbekistan)
+			case 0x0044: // tt Tatar
+			case 0x0444: // tt-TA Tatar (Tatarstan)
+			case 0x0046: // pa Punjabi
+			case 0x0446: // pa-IN Punjabi (India)
+			case 0x0047: // gu Gujarati
+			case 0x0447: // gu-IN Gujarati (India)
+			case 0x0049: // ta Tamil
+			case 0x0449: // ta-IN Tamil (India)
+			case 0x004A: // te Telugu
+			case 0x044A: // te-IN Telugu (India)
+			case 0x004B: // kn Kannada
+			case 0x044B: // kn-IN Kannada (India)
+			case 0x004E: // mr Marathi
+			case 0x044E: // mr-IN Marathi (India)
+			case 0x004F: // sa Sanskrit
+			case 0x044F: // sa-IN Sanskrit (India)
+			case 0x0050: // mn Mongolian
+			case 0x0450: // mn-MN Mongolian (Mongolia)
+			case 0x0056: // gl Galician
+			case 0x0456: // gl-ES Galician (Spain)
+			case 0x0057: // kok Konkani
+			case 0x0457: // kok-IN Konkani (India)
+			case 0x005A: // syr Syriac
+			case 0x045A: // syr-SY Syriac (Syria)
+			case 0x0065: // div Divehi
+			case 0x0465: // div-MV Divehi (Maldives)
+			case 0x007F: //  Invariant Language (Invariant Country)
+				break;
+
+			default:
+				throw new ArgumentException ("CultureInfoCode");
+			}
+			lcid = culture_id;
+			this.use_user_override = use_user_override;
+		}
+
+		//
+		// Maps a name to a culture id
+		//
+		static int NameToID (string name)
+		{
+			switch (name){
+			case "ar":
+				return 0x0001;
+			case "ar-SA":
+				return 0x0401;
+			case "ar-IQ":
+				return 0x0801;
+			case "ar-EG":
+				return 0x0C01;
+			case "ar-LY":
+				return 0x1001;
+			case "ar-DZ":
+				return 0x1401;
+			case "ar-MA":
+				return 0x1801;
+			case "ar-TN":
+				return 0x1C01;
+			case "ar-OM":
+				return 0x2001;
+			case "ar-YE":
+				return 0x2401;
+			case "ar-SY":
+				return 0x2801;
+			case "ar-JO":
+				return 0x2C01;
+			case "ar-LB":
+				return 0x3001;
+			case "ar-KW":
+				return 0x3401;
+			case "ar-AE":
+				return 0x3801;
+			case "ar-BH":
+				return 0x3C01;
+			case "ar-QA":
+				return 0x4001;
+			case "bg":
+				return 0x0002;
+			case "bg-BG":
+				return 0x0402;
+			case "ca":
+				return 0x0003;
+			case "ca-ES":
+				return 0x0403;
+			case "zh-CHS":
+				return 0x0004;
+			case "zh-TW":
+				return 0x0404;
+			case "zh-CN":
+				return 0x0804;
+			case "zh-HK":
+				return 0x0C04;
+			case "zh-SG":
+				return 0x1004;
+			case "zh-MO":
+				return 0x1404;
+			case "zh-CHT":
+				return 0x7C04;
+			case "cs":
+				return 0x0005;
+			case "cs-CZ":
+				return 0x0405;
+			case "da":
+				return 0x0006;
+			case "da-DK":
+				return 0x0406;
+			case "de":
+				return 0x0007;
+			case "de-DE":
+				return 0x0407;
+			case "de-CH":
+				return 0x0807;
+			case "de-AT":
+				return 0x0C07;
+			case "de-LU":
+				return 0x1007;
+			case "de-LI":
+				return 0x1407;
+			case "el":
+				return 0x0008;
+			case "el-GR":
+				return 0x0408;
+			case "en":
+				return 0x0009;
+			case "en-US":
+				return 0x0409;
+			case "en-GB":
+				return 0x0809;
+			case "en-AU":
+				return 0x0C09;
+			case "en-CA":
+				return 0x1009;
+			case "en-NZ":
+				return 0x1409;
+			case "en-IE":
+				return 0x1809;
+			case "en-ZA":
+				return 0x1C09;
+			case "en-JM":
+				return 0x2009;
+			case "en-CB":
+				return 0x2409;
+			case "en-BZ":
+				return 0x2809;
+			case "en-TT":
+				return 0x2C09;
+			case "en-ZW":
+				return 0x3009;
+			case "en-PH":
+				return 0x3409;
+			case "es":
+				return 0x000A;
+			case "es-MX":
+				return 0x080A;
+			case "es-ES":
+				return 0x0C0A;
+			case "es-GT":
+				return 0x100A;
+			case "es-CR":
+				return 0x140A;
+			case "es-PA":
+				return 0x180A;
+			case "es-DO":
+				return 0x1C0A;
+			case "es-VE":
+				return 0x200A;
+			case "es-CO":
+				return 0x240A;
+			case "es-PE":
+				return 0x280A;
+			case "es-AR":
+				return 0x2C0A;
+			case "es-EC":
+				return 0x300A;
+			case "es-CL":
+				return 0x340A;
+			case "es-UY":
+				return 0x380A;
+			case "es-PY":
+				return 0x3C0A;
+			case "es-BO":
+				return 0x400A;
+			case "es-SV":
+				return 0x440A;
+			case "es-HN":
+				return 0x480A;
+			case "es-NI":
+				return 0x4C0A;
+			case "es-PR":
+				return 0x500A;
+			case "fi":
+				return 0x000B;
+			case "fi-FI":
+				return 0x040B;
+			case "fr":
+				return 0x000C;
+			case "fr-FR":
+				return 0x040C;
+			case "fr-BE":
+				return 0x080C;
+			case "fr-CA":
+				return 0x0C0C;
+			case "fr-CH":
+				return 0x100C;
+			case "fr-LU":
+				return 0x140C;
+			case "fr-MC":
+				return 0x180C;
+			case "he":
+				return 0x000D;
+			case "he-IL":
+				return 0x040D;
+			case "hu":
+				return 0x000E;
+			case "hu-HU":
+				return 0x040E;
+			case "is":
+				return 0x000F;
+			case "is-IS":
+				return 0x040F;
+			case "it":
+				return 0x0010;
+			case "it-IT":
+				return 0x0410;
+			case "it-CH":
+				return 0x0810;
+			case "ja":
+				return 0x0011;
+			case "ja-JP":
+				return 0x0411;
+			case "ko":
+				return 0x0012;
+			case "ko-KR":
+				return 0x0412;
+			case "nl":
+				return 0x0013;
+			case "nl-NL":
+				return 0x0413;
+			case "nl-BE":
+				return 0x0813;
+			case "no":
+				return 0x0014;
+			case "nb-NO":
+				return 0x0414;
+			case "nn-NO":
+				return 0x0814;
+			case "pl":
+				return 0x0015;
+			case "pl-PL":
+				return 0x0415;
+			case "pt":
+				return 0x0016;
+			case "pt-BR":
+				return 0x0416;
+			case "pt-PT":
+				return 0x0816;
+			case "ro":
+				return 0x0018;
+			case "ro-RO":
+				return 0x0418;
+			case "ru":
+				return 0x0019;
+			case "ru-RU":
+				return 0x0419;
+			case "hr":
+				return 0x001A;
+			case "hr-HR":
+				return 0x041A;
+			case "Lt-sr-SP":
+				return 0x081A;
+			case "Cy-sr-SP":
+				return 0x0C1A;
+			case "sk":
+				return 0x001B;
+			case "sk-SK":
+				return 0x041B;
+			case "sq":
+				return 0x001C;
+			case "sq-AL":
+				return 0x041C;
+			case "sv":
+				return 0x001D;
+			case "sv-SE":
+				return 0x041D;
+			case "sv-FI":
+				return 0x081D;
+			case "th":
+				return 0x001E;
+			case "th-TH":
+				return 0x041E;
+			case "tr":
+				return 0x001F;
+			case "tr-TR":
+				return 0x041F;
+			case "ur":
+				return 0x0020;
+			case "ur-PK":
+				return 0x0420;
+			case "id":
+				return 0x0021;
+			case "id-ID":
+				return 0x0421;
+			case "uk":
+				return 0x0022;
+			case "uk-UA":
+				return 0x0422;
+			case "be":
+				return 0x0023;
+			case "be-BY":
+				return 0x0423;
+			case "sl":
+				return 0x0024;
+			case "sl-SI":
+				return 0x0424;
+			case "et":
+				return 0x0025;
+			case "et-EE":
+				return 0x0425;
+			case "lv":
+				return 0x0026;
+			case "lv-LV":
+				return 0x0426;
+			case "lt":
+				return 0x0027;
+			case "lt-LT":
+				return 0x0427;
+			case "fa":
+				return 0x0029;
+			case "fa-IR":
+				return 0x0429;
+			case "vi":
+				return 0x002A;
+			case "vi-VN":
+				return 0x042A;
+			case "hy":
+				return 0x002B;
+			case "hy-AM":
+				return 0x042B;
+			case "az":
+				return 0x002C;
+			case "Lt-az-AZ":
+				return 0x042C;
+			case "Cy-az-AZ":
+				return 0x082C;
+			case "eu":
+				return 0x002D;
+			case "eu-ES":
+				return 0x042D;
+			case "mk":
+				return 0x002F;
+			case "mk-MK":
+				return 0x042F;
+			case "af":
+				return 0x0036;
+			case "af-ZA":
+				return 0x0436;
+			case "ka":
+				return 0x0037;
+			case "ka-GE":
+				return 0x0437;
+			case "fo":
+				return 0x0038;
+			case "fo-FO":
+				return 0x0438;
+			case "hi":
+				return 0x0039;
+			case "hi-IN":
+				return 0x0439;
+			case "ms":
+				return 0x003E;
+			case "ms-MY":
+				return 0x043E;
+			case "ms-BN":
+				return 0x083E;
+			case "kk":
+				return 0x003F;
+			case "kk-KZ":
+				return 0x043F;
+			case "ky":
+				return 0x0040;
+			case "ky-KZ":
+				return 0x0440;
+			case "sw":
+				return 0x0041;
+			case "sw-KE":
+				return 0x0441;
+			case "uz":
+				return 0x0043;
+			case "Lt-uz-UZ":
+				return 0x0443;
+			case "Cy-uz-UZ":
+				return 0x0843;
+			case "tt":
+				return 0x0044;
+			case "tt-TA":
+				return 0x0444;
+			case "pa":
+				return 0x0046;
+			case "pa-IN":
+				return 0x0446;
+			case "gu":
+				return 0x0047;
+			case "gu-IN":
+				return 0x0447;
+			case "ta":
+				return 0x0049;
+			case "ta-IN":
+				return 0x0449;
+			case "te":
+				return 0x004A;
+			case "te-IN":
+				return 0x044A;
+			case "kn":
+				return 0x004B;
+			case "kn-IN":
+				return 0x044B;
+			case "mr":
+				return 0x004E;
+			case "mr-IN":
+				return 0x044E;
+			case "sa":
+				return 0x004F;
+			case "sa-IN":
+				return 0x044F;
+			case "mn":
+				return 0x0050;
+			case "mn-MN":
+				return 0x0450;
+			case "gl":
+				return 0x0056;
+			case "gl-ES":
+				return 0x0456;
+			case "kok":
+				return 0x0057;
+			case "kok-IN":
+				return 0x0457;
+			case "syr":
+				return 0x005A;
+			case "syr-SY":
+				return 0x045A;
+			case "div":
+				return 0x0065;
+			case "div-MV":
+				return 0x0465;
+			case "":
+				return 0x007F;
+			}
+			return -1;
+		}
+		
+		// <summary>
+		//   Creates a CultureInfo for a specific ID
+		// </summary>
+		public static CultureInfo CreateSpecificCulture (string name)
+		{
+			if (name == null)
+				throw new ArgumentNullException ();
+			
+			int id = NameToID (name);
+
+			if (id == -1)
+				throw new ArgumentException ("name");
+
+			return new CultureInfo (id, false);
+		}
+
+		/// <summary>
+		/// CultureInfo instance that represents the culture used by the current thread
+		/// </summary>
+		public static CultureInfo CurrentCulture 
+		{
+			get 
+			{
+				return Thread.CurrentThread.CurrentCulture;
+			}
+			
+			/* FIXME: the set method isnt listed in the spec */
+			set 
+			{
+				Thread.CurrentThread.CurrentCulture = value;
+			}
+		}
+
+		/// <summary>
+		/// CultureInfo instance that represents the current culture used by the ResourceManager to look up culture-specific resources at run time
+		/// </summary>
+		public static CultureInfo CurrentUICulture 
+		{
+			get 
+			{
+				return Thread.CurrentThread.CurrentUICulture;
+			}
+			
+			/* FIXME: the set method isnt listed in the spec */
+			set 
+			{
+				Thread.CurrentThread.CurrentUICulture =	value;
+			}
+		}
+
+
+		public virtual int LCID {
+			get {
+				return lcid;
+			}
+		}
+
+		// <summary>
+		//   Gets the string-encoded name of the culture
+		// </summary>
+		public virtual string Name {
+			get {
+				/* FIXME: This long switch should be
+				 * moved into a hash, initialised in
+				 * the static class constructor
+				 */
+				switch (lcid){
+				case 0x007f:
+					return "iv";
+				case 0x0036:
+					return "af";
+				case 0x0436:
+					return "af-ZA";
+				case 0x001c:
+					return "sq";
+				case 0x041c:
+					return "sq-AL";
+				case 0x0001:
+					return "ar";
+				case 0x1401:
+					return "ar-DZ";
+				case 0x3c01:
+					return "ar-BH";
+				case 0x0c01:
+					return "ar-EG";
+				case 0x0801:
+					return "ar-IQ";
+				case 0x2c01:
+					return "ar-JO";
+				case 0x3401:
+					return "ar-KW";
+				case 0x3001:
+					return "ar-LB";
+				case 0x1001:
+					return "ar-LY";
+				case 0x1801:
+					return "ar-MA";
+				case 0x2001:
+					return "ar-OM";
+				case 0x4001:
+					return "ar-QA";
+				case 0x0401:
+					return "ar-SA";
+				case 0x2801:
+					return "ar-SY";
+				case 0x1c01:
+					return "ar-TN";
+				case 0x3801:
+					return "ar-AE";
+				case 0x2401:
+					return "ar-YE";
+				case 0x002b:
+					return "hy";
+				case 0x042b:
+					return "hy-AM";
+				case 0x002c:
+					return "az";
+				case 0x082c:
+					return "Cy-az-AZ";
+				case 0x042c:
+					return "Lt-az-AZ";
+				case 0x002d:
+					return "eu";
+				case 0x042d:
+					return "eu-ES";
+				case 0x0023:
+					return "be";
+				case 0x0423:
+					return "be-BY";
+				case 0x0002:
+					return "bg";
+				case 0x0402:
+					return "bg-BG";
+				case 0x0003:
+					return "ca";
+				case 0x0403:
+					return "ca-ES";
+				case 0x0c04:
+					return "zh-HK";
+				case 0x1404:
+					return "zh-MO";
+				case 0x0804:
+					return "zh-CN";
+				case 0x0004:
+					return "zh-CHS";
+				case 0x1004:
+					return "zh-SG";
+				case 0x0404:
+					return "zh-TW";
+				case 0x7c04:
+					return "zh-CHT";
+				case 0x001a:
+					return "hr";
+				case 0x041a:
+					return "hr-HR";
+				case 0x0005:
+					return "cs";
+				case 0x0405:
+					return "cs-CZ";
+				case 0x0006:
+					return "da";
+				case 0x0406:
+					return "da-DK";
+				case 0x0065:
+					return "div";
+				case 0x0465:
+					return "div-MV";
+				case 0x0013:
+					return "nl";
+				case 0x0813:
+					return "nl-BE";
+				case 0x0413:
+					return "nl-NL";
+				case 0x0009:
+					return "en";
+				case 0x0c09:
+					return "en-AU";
+				case 0x2809:
+					return "en-BZ";
+				case 0x1009:
+					return "en-CA";
+				case 0x2409:
+					return "en-CB";
+				case 0x1809:
+					return "en-IE";
+				case 0x2009:
+					return "en-JM";
+				case 0x1409:
+					return "en-NZ";
+				case 0x3409:
+					return "en-PH";
+				case 0x1c09:
+					return "en-ZA";
+				case 0x2c09:
+					return "en-TT";
+				case 0x0809:
+					return "en-GB";
+				case 0x0409:
+					return "en-US";
+				case 0x3009:
+					return "en-ZW";
+				case 0x0025:
+					return "et";
+				case 0x0425:
+					return "et-EE";
+				case 0x0038:
+					return "fo";
+				case 0x0438:
+					return "fo-FO";
+				case 0x0029:
+					return "fa";
+				case 0x0429:
+					return "fa-IR";
+				case 0x000b:
+					return "fi";
+				case 0x040b:
+					return "fi-FI";
+				case 0x000c:
+					return "fr";
+				case 0x080c:
+					return "fr-BE";
+				case 0x0c0c:
+					return "fr-CA";
+				case 0x040c:
+					return "fr-FR";
+				case 0x140c:
+					return "fr-LU";
+				case 0x180c:
+					return "fr-MC";
+				case 0x100c:
+					return "fr-CH";
+				case 0x0056:
+					return "gl";
+				case 0x0456:
+					return "gl-ES";
+				case 0x0037:
+					return "ka";
+				case 0x0437:
+					return "ka-GE";
+				case 0x0007:
+					return "de";
+				case 0x0c07:
+					return "de-AT";
+				case 0x0407:
+					return "de-DE";
+				case 0x1407:
+					return "de-LI";
+				case 0x1007:
+					return "de-LU";
+				case 0x0807:
+					return "de-CH";
+				case 0x0008:
+					return "el";
+				case 0x0408:
+					return "el-GR";
+				case 0x0047:
+					return "gu";
+				case 0x0447:
+					return "gu-IN";
+				case 0x000d:
+					return "he";
+				case 0x040d:
+					return "he-IL";
+				case 0x0039:
+					return "hi";
+				case 0x0439:
+					return "hi-IN";
+				case 0x000e:
+					return "hu";
+				case 0x040e:
+					return "hu-HU";
+				case 0x000f:
+					return "is";
+				case 0x040f:
+					return "is-IS";
+				case 0x0021:
+					return "id";
+				case 0x0421:
+					return "id-ID";
+				case 0x0010:
+					return "it";
+				case 0x0410:
+					return "it-IT";
+				case 0x0810:
+					return "it-CH";
+				case 0x0011:
+					return "ja";
+				case 0x0411:
+					return "ja-JP";
+				case 0x004b:
+					return "kn";
+				case 0x044b:
+					return "kn-IN";
+				case 0x003f:
+					return "kk";
+				case 0x043f:
+					return "kk-KZ";
+				case 0x0057:
+					return "kok";
+				case 0x0457:
+					return "kok-IN";
+				case 0x0012:
+					return "ko";
+				case 0x0412:
+					return "ko-KR";
+				case 0x0040:
+					return "ky";
+				case 0x0440:
+					return "ky-KZ";
+				case 0x0026:
+					return "lv";
+				case 0x0426:
+					return "lv-LV";
+				case 0x0027:
+					return "lt";
+				case 0x0427:
+					return "lt-LT";
+				case 0x002f:
+					return "mk";
+				case 0x042f:
+					return "mk-MK";
+				case 0x003e:
+					return "ms";
+				case 0x083e:
+					return "ms-BN";
+				case 0x043e:
+					return "ms-MY";
+				case 0x004e:
+					return "mr";
+				case 0x044e:
+					return "mr-IN";
+				case 0x0050:
+					return "mn";
+				case 0x0450:
+					return "mn-MN";
+				case 0x0014:
+					return "no";
+				case 0x0414:
+					return "nb-NO";
+				case 0x0814:
+					return "nn-NO";
+				case 0x0015:
+					return "pl";
+				case 0x0415:
+					return "pl-PL";
+				case 0x0016:
+					return "pt";
+				case 0x0416:
+					return "pt-BR";
+				case 0x0816:
+					return "pt-PT";
+				case 0x0046:
+					return "pa";
+				case 0x0446:
+					return "pa-IN";
+				case 0x0018:
+					return "ro";
+				case 0x0418:
+					return "ro-RO";
+				case 0x0019:
+					return "ru";
+				case 0x0419:
+					return "ru-RU";
+				case 0x004f:
+					return "sa";
+				case 0x044f:
+					return "sa-IN";
+				case 0x0c1a:
+					return "Cy-sr-SP";
+				case 0x081a:
+					return "Lt-sr-SP";
+				case 0x001b:
+					return "sk";
+				case 0x041b:
+					return "sk-SK";
+				case 0x0024:
+					return "sl";
+				case 0x0424:
+					return "sl-SI";
+				case 0x000a:
+					return "es";
+				case 0x2c0a:
+					return "es-AR";
+				case 0x400a:
+					return "es-BO";
+				case 0x340a:
+					return "es-CL";
+				case 0x240a:
+					return "es-CO";
+				case 0x140a:
+					return "es-CR";
+				case 0x1c0a:
+					return "es-DO";
+				case 0x300a:
+					return "es-EC";
+				case 0x440a:
+					return "es-SV";
+				case 0x100a:
+					return "es-GT";
+				case 0x480a:
+					return "es-HN";
+				case 0x080a:
+					return "es-MX";
+				case 0x4c0a:
+					return "es-NI";
+				case 0x180a:
+					return "es-PA";
+				case 0x3c0a:
+					return "es-PY";
+				case 0x280a:
+					return "es-PE";
+				case 0x500a:
+					return "es-PR";
+				case 0x0c0a:
+					return "es-ES";
+				case 0x380a:
+					return "es-UY";
+				case 0x200a:
+					return "es-VE";
+				case 0x0041:
+					return "sw";
+				case 0x0441:
+					return "sw-KE";
+				case 0x001d:
+					return "sv";
+				case 0x081d:
+					return "sv-FI";
+				case 0x041d:
+					return "sv-SE";
+				case 0x005a:
+					return "syr";
+				case 0x045a:
+					return "syr-SY";
+				case 0x0049:
+					return "ta";
+				case 0x0449:
+					return "ta-IN";
+				case 0x0044:
+					return "tt";
+				case 0x0444:
+					return "tt-RU";
+				case 0x004a:
+					return "te";
+				case 0x044a:
+					return "te-IN";
+				case 0x001e:
+					return "th";
+				case 0x041e:
+					return "th-TH";
+				case 0x001f:
+					return "tr";
+				case 0x041f:
+					return "tr-TR";
+				case 0x0022:
+					return "uk";
+				case 0x0422:
+					return "uk-UA";
+				case 0x0020:
+					return "ur";
+				case 0x0420:
+					return "ur-PK";
+				case 0x0043:
+					return "uz";
+				case 0x0843:
+					return "Cy-uz-UZ";
+				case 0x0443:
+					return "Lt-uz-UZ";
+				case 0x002a:
+					return "vi";
+				case 0x042a:
+					return "vi-VN";
+				}
+				throw new Exception ("Miss constructed object for LCID: " + lcid);
+			}
+		}
+
+		[MonoTODO]
+		public virtual string NativeName
+		{
+			get {
+				return("");
+			}
+		}
+		
+
+		[MonoTODO]
+		public virtual Calendar Calendar
+		{
+			get { return null; }
+		}
+
+		[MonoTODO]
+		public virtual Calendar[] OptionalCalendars
+		{
+			get {
+				return(null);
+			}
+		}
+
+		[MonoTODO]
+		public virtual CultureInfo Parent
+		{
+			get {
+				return(CultureInfo.InvariantCulture);
+			}
+		}
+
+		[MonoTODO]
+		public virtual TextInfo TextInfo
+		{
+			get {
+				return(null);
+			}
+		}
+
+		[MonoTODO]
+		public virtual string ThreeLetterISOLanguageName
+		{
+			get {
+				return("");
+			}
+		}
+
+		[MonoTODO]
+		public virtual string ThreeLetterWindowsLanguageName
+		{
+			get {
+				return("");
+			}
+		}
+
+		[MonoTODO]
+		public virtual string TwoLetterISOLanguageName
+		{
+			get {
+				return("");
+			}
+		}
+
+		[MonoTODO]
+		public bool UseUserOverride
+		{
+			get {
+				return(false);
+			}
+		}
+
+		[MonoTODO]
+		public void ClearCachedData()
+		{
+		}
+
+		[MonoTODO]
+		public virtual object Clone()
+		{
+			return(null);
+		}
+
+		/*
+		[MonoTODO]
+		public override bool Equals(object value)
+		{
+			return(false);
+		}
+		*/
+
+		[MonoTODO]
+		public static CultureInfo[] GetCultures(CultureTypes types)
+		{
+			return(null);
+		}
+
+		/*
+		[MonoTODO]
+		public override int GetHashCode()
+		{
+			return(0);
+		}
+		*/
+
+		[MonoTODO]
+		public static CultureInfo ReadOnly(CultureInfo ci)
+		{
+			if(ci==null) {
+				throw new ArgumentNullException("CultureInfo is null");
+			}
+			
+			return(null);
+		}
+
+		public override string ToString()
+		{
+			return(this.Name);
+		}
+		
+		
+		[MonoTODO]
+		public virtual CompareInfo CompareInfo
+		{
+			get {
+				return null;
+			}
+		}
+
+		internal static bool IsIDNeutralCulture (int lcid) {
+			return (lcid & 0xff00) == 0;
+		}
+
+		// <summary>
+		//   Returns whether the current culture is neutral (neutral cultures
+		//   only specify a language, not a country.
+		// </summary>
+		public virtual bool IsNeutralCulture {
+			get {
+				return IsIDNeutralCulture (lcid);
+			}
+		}
+		// <summary>
+		//   Returns the NumberFormat for the current lcid
+		// </summary>
+		public virtual NumberFormatInfo NumberFormat {
+			get {
+				if (number_format == null){
+					lock (this){
+						if (number_format == null)
+							number_format = new NumberFormatInfo (lcid);
+					}
+				}
+
+				return number_format;
+			}
+
+			set {
+				if (is_read_only) throw new InvalidOperationException(MSG_READONLY);
+
+				if (value == null)
+					throw new ArgumentNullException ("NumberFormat");
+				
+				number_format = value;
+			}
+		}
+
+		public virtual DateTimeFormatInfo DateTimeFormat
+		{
+			get 
+			{
+				if (datetime_format == null)
+				{
+					lock (this)
+					{
+						if (datetime_format == null)
+							datetime_format = new DateTimeFormatInfo(); 
+					}
+				}
+
+				return datetime_format;
+			}
+
+			set 
+			{
+				if (is_read_only) throw new InvalidOperationException(MSG_READONLY);
+
+				if (value == null)
+					throw new ArgumentNullException ("DateTimeFormat");
+				
+				datetime_format = value;
+			}
+		}
+
+		[MonoTODO]
+		public virtual string DisplayName
+		{
+			get {
+				return("");
+			}
+		}
+
+		[MonoTODO]
+		public virtual string EnglishName
+		{
+			get {
+				return("");
+			}
+		}
+
+		[MonoTODO]
+		public static CultureInfo InstalledUICulture
+		{
+			get {
+				return(null);
+			}
+		}
+
+		public bool IsReadOnly 
+		{
+			get {
+				return(is_read_only);
+			}
+		}
+		
+
+		// 
+		// IFormatProvider implementation
+		//
+		public virtual object GetFormat( Type formatType )
+		{
+			object format = null;
+
+			if ( formatType == typeof(NumberFormatInfo) )
+				format = NumberFormat;
+			else if ( formatType == typeof(DateTimeFormatInfo) )
+				format = DateTimeFormat;
+			
+			return format;
+		}
+
+		//
+		// Constructors
+		//
+		public CultureInfo (int culture, bool use_user_override)
+		{
+			if (culture < 0)
+				throw new ArgumentOutOfRangeException ();
+			
+			InitializeByID (culture, use_user_override);
+		}
+
+		public CultureInfo (int culture) : this (culture, false)
+		{
+		}
+		
+		public CultureInfo (string name, bool use_user_override)
+		{
+			if (name == null)
+				throw new ArgumentNullException ();
+			
+			InitializeByID (NameToID (name), use_user_override);
+		}
+
+		public CultureInfo (string name) : this (name, false) {} 
+	}
+}
diff --git a/mcs/class/corlib/System.Globalization/CultureTypes.cs b/mcs/class/corlib/System.Globalization/CultureTypes.cs
new file mode 100755
index 00000000000..7218b10150e
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/CultureTypes.cs
@@ -0,0 +1,39 @@
+// CultureTypes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:35:02 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Globalization {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum CultureTypes {
+
+		/// <summary>
+		/// </summary>
+		NeutralCultures = 1,
+
+		/// <summary>
+		/// </summary>
+		SpecificCultures = 2,
+
+		/// <summary>
+		/// </summary>
+		InstalledWin32Cultures = 4,
+
+		/// <summary>
+		/// </summary>
+		AllCultures = 7,
+
+	} // CultureTypes
+
+} // System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/DateTimeFormatInfo.cs b/mcs/class/corlib/System.Globalization/DateTimeFormatInfo.cs
new file mode 100644
index 00000000000..82ecd5ec3fe
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/DateTimeFormatInfo.cs
@@ -0,0 +1,609 @@
+// System.Globalization.DateTimeFormatInfo

+//

+// Some useful functions are missing in the ECMA specs.

+// They have been added following MS SDK Beta2

+//

+// Martin Weindel (martin.weindel@t-online.de)

+//

+// (C) Martin Weindel (martin.weindel@t-online.de)

+

+using System;
+

+using System.Threading;
+
+

+namespace System.Globalization 

+{
+

+	[Serializable]
+	

+	public sealed class DateTimeFormatInfo : ICloneable, IFormatProvider {
+

+		private static readonly string MSG_READONLY = "This instance is read only";

+		private static readonly string MSG_ARRAYSIZE_MONTH = "An array with exactly 13 elements is needed";

+		private static readonly string MSG_ARRAYSIZE_DAY = "An array with exactly 7 elements is needed";

+		private static readonly string[] INVARIANT_ABBREVIATED_DAY_NAMES

+			= new string[7] { "Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"};

+		private static readonly string[] INVARIANT_DAY_NAMES

+			= new string[7] { "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"};

+		private static readonly string[] INVARIANT_ABBREVIATED_MONTH_NAMES

+			= new string[13] { "Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", ""};

+		private static readonly string[] INVARIANT_MONTH_NAMES

+			= new string[13] { "January", "February", "March", "April", "May", "June", "July", "August", "September", "October", "November", "December", ""};

+

+		public static DateTimeFormatInfo theInvariantDateTimeFormatInfo;
+

+		private bool readOnly;
+		

+		private string _AMDesignator;
+		

+		private string _PMDesignator;
+		

+		private string _DateSeparator;
+		

+		private string _TimeSeparator;
+		

+		private string _ShortDatePattern;
+		

+		private string _LongDatePattern;
+		

+		private string _ShortTimePattern;
+		

+		private string _LongTimePattern;
+		

+		private string _MonthDayPattern;
+		

+		private string _YearMonthPattern;
+		

+		private string _FullDateTimePattern;
+		

+		private string _RFC1123Pattern;
+		

+		private string _SortableDateTimePattern;
+		

+		private string _UniversalSortableDateTimePattern;
+		

+		private DayOfWeek _FirstDayOfWeek;
+		

+		private Calendar _Calendar;
+		

+		private CalendarWeekRule _CalendarWeekRule;
+		

+		private string[] _AbbreviatedDayNames;
+		

+		private string[] _DayNames;
+		

+		private string[] _MonthNames;
+		

+		private string[] _AbbreviatedMonthNames;
+
+		

+		public DateTimeFormatInfo()
+		

+		{
+			

+			readOnly = false;
+			

+			_AMDesignator = "AM";
+			

+			_PMDesignator = "PM";
+			

+			_DateSeparator = "/";
+			

+			_TimeSeparator = ":";
+			

+			_ShortDatePattern = "MM/dd/yyyy";
+			

+			_LongDatePattern = "dddd, dd MMMM yyyy";
+			

+			_ShortTimePattern = "HH:mm";
+			

+			_LongTimePattern = "HH:mm:ss";
+			

+			_MonthDayPattern = "MMMM dd";
+			

+			_YearMonthPattern = "yyyy MMMM";
+			

+			_FullDateTimePattern = "dddd, dd MMMM yyyy HH:mm:ss";

+

+			// FIXME for the following three pattern:  "The default value of this property is 

+			//derived from the calendar that is set for CultureInfo.CurrentCulture or the default 

+			//calendar of CultureInfo.CurrentCulture."
+			

+			_RFC1123Pattern = "ddd, dd MMM yyyy HH':'mm':'ss 'GMT'"; 
+			

+			_SortableDateTimePattern = "yyyy'-'MM'-'dd'T'HH':'mm':'ss";
+			

+			_UniversalSortableDateTimePattern = "yyyy'-'MM'-'dd HH':'mm':'ss'Z'";
+
+			

+

+			_FirstDayOfWeek = DayOfWeek.Sunday;
+			

+			_Calendar = new GregorianCalendar();
+			

+			_CalendarWeekRule = CalendarWeekRule.FirstDay;
+
+			

+			_AbbreviatedDayNames = INVARIANT_ABBREVIATED_DAY_NAMES;
+			

+			_DayNames = INVARIANT_DAY_NAMES;
+			

+			_AbbreviatedMonthNames = INVARIANT_ABBREVIATED_MONTH_NAMES;
+			

+			_MonthNames = INVARIANT_MONTH_NAMES;
+		

+		}
+				
+		

+		

+		// LAMESPEC: this is not in ECMA specs
+		

+		public static DateTimeFormatInfo GetInstance(IFormatProvider provider)
+		

+		{
+			

+			if (provider != null) {
+				

+				DateTimeFormatInfo dtfi;
+				

+				dtfi = (DateTimeFormatInfo)provider.GetFormat(typeof(DateTimeFormatInfo));
+				

+				if (dtfi != null)
+					

+					return dtfi;
+			

+			}
+			
+			

+			return CurrentInfo;
+		

+		}
+
+		

+		

+		public bool IsReadOnly {
+			

+			get {
+				

+				return readOnly;
+			

+			}
+		

+		}
+
+		

+		

+		public static DateTimeFormatInfo ReadOnly(DateTimeFormatInfo dtfi)
+		

+		{
+			

+			DateTimeFormatInfo copy = (DateTimeFormatInfo)dtfi.Clone();
+			

+			copy.readOnly = true;
+			

+			return copy;
+		

+		}			
+
+		

+		

+		public object Clone () 
+		

+		{
+			

+			DateTimeFormatInfo clone = (DateTimeFormatInfo) MemberwiseClone();
+			

+			// clone is not read only
+			

+			clone.readOnly = false;
+			

+			return clone;
+		

+		}
+
+		

+		

+		public object GetFormat(Type formatType)

+		{

+			return (formatType == GetType()) ? this : null;

+		}

+

+		public string GetAbbreviatedEraName(int era) 

+		{

+			if (era < _Calendar.Eras.Length || era >= _Calendar.Eras.Length)

+				throw new ArgumentOutOfRangeException();

+			notImplemented();

+			//FIXME: implement me

+			return null;

+		}

+

+		public string GetAbbreviatedMonthName(int month) 

+		{

+			if (month < 1 || month > 13) throw new ArgumentOutOfRangeException();

+			return _AbbreviatedMonthNames[month-1];

+		}

+

+		public int GetEra(string eraName)

+		{

+			if (eraName == null) throw new ArgumentNullException();

+			eraName = eraName.ToUpper();

+			notImplemented();

+			//FIXME: implement me

+			return -1;

+		}

+

+		public string GetEraName(int era)

+		{

+			if (era < _Calendar.Eras.Length || era >= _Calendar.Eras.Length)

+				throw new ArgumentOutOfRangeException();

+			notImplemented();

+			//FIXME: implement me

+			return null;

+		}

+

+		public string GetMonthName(int month)

+		{

+			if (month < 1 || month > 13) throw new ArgumentOutOfRangeException();

+			return _MonthNames[month-1];

+		}

+

+		public string[] AbbreviatedDayNames

+		{

+			get 

+			{

+				return (string[]) _AbbreviatedDayNames.Clone();

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				if (value.GetLength(0) != 7) throw new ArgumentException(MSG_ARRAYSIZE_DAY);

+				_AbbreviatedDayNames = (string[]) value.Clone();

+			}

+		} 

+

+		public string[] AbbreviatedMonthNames

+		{

+			get 

+			{

+				return (string[]) _AbbreviatedMonthNames.Clone();

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				if (value.GetLength(0) != 13) throw new ArgumentException(MSG_ARRAYSIZE_MONTH);

+				_AbbreviatedMonthNames = (string[]) value.Clone();

+			}

+		} 

+

+		public string[] DayNames

+		{

+			get 

+			{

+				return (string[]) _DayNames.Clone();

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				if (value.GetLength(0) != 7) throw new ArgumentException(MSG_ARRAYSIZE_DAY);

+				_DayNames = (string[]) value.Clone();

+			}

+		} 

+

+		public string[] MonthNames

+		{

+			get 

+			{

+				return (string[]) _MonthNames.Clone();

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				if (value.GetLength(0) != 13) throw new ArgumentException(MSG_ARRAYSIZE_MONTH);

+				_MonthNames = (string[]) value.Clone();

+			}

+		} 

+

+		public string AMDesignator

+		{

+			get 

+			{

+				return _AMDesignator;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_AMDesignator = value;

+			}

+		} 

+

+		public string PMDesignator

+		{

+			get 

+			{

+				return _PMDesignator;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_PMDesignator = value;

+			}

+		} 

+

+		public string DateSeparator

+		{

+			get 

+			{

+				return _DateSeparator;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_DateSeparator = value;

+			}

+		} 

+

+		public string TimeSeparator

+		{

+			get 

+			{

+				return _TimeSeparator;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_TimeSeparator = value;

+			}

+		} 

+

+		public string LongDatePattern

+		{

+			get 

+			{

+				return _LongDatePattern;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_LongDatePattern = value;

+			}

+		} 

+

+		public string ShortDatePattern

+		{

+			get 

+			{

+				return _ShortDatePattern;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_ShortDatePattern = value;

+			}

+		} 

+

+		public string ShortTimePattern

+		{

+			get 

+			{

+				return _ShortTimePattern;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_ShortTimePattern = value;

+			}

+		} 

+

+		public string LongTimePattern

+		{

+			get 

+			{

+				return _LongTimePattern;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_LongTimePattern = value;

+			}

+		} 

+

+		public string MonthDayPattern 

+		{

+			get 

+			{

+				return _MonthDayPattern;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_MonthDayPattern = value;

+			}

+		} 

+

+		public string YearMonthPattern 

+		{

+			get 

+			{

+				return _YearMonthPattern;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_YearMonthPattern = value;

+			}

+		} 

+

+		public string FullDateTimePattern

+		{

+			get 

+			{

+				return _FullDateTimePattern;

+			}

+			

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_FullDateTimePattern = value;

+			}

+		} 

+

+		public static DateTimeFormatInfo CurrentInfo

+		{

+			get

+			{

+				return Thread.CurrentThread.CurrentCulture.DateTimeFormat;

+			}

+		} 

+

+		public static DateTimeFormatInfo InvariantInfo

+		{

+			get

+			{

+				if (theInvariantDateTimeFormatInfo == null)

+				{

+					theInvariantDateTimeFormatInfo = 

+						DateTimeFormatInfo.ReadOnly(new DateTimeFormatInfo());

+				}

+				return theInvariantDateTimeFormatInfo;

+			}

+		} 

+

+		// LAMESPEC: this is not in ECMA specs

+		public DayOfWeek FirstDayOfWeek

+		{

+			get

+			{

+				return _FirstDayOfWeek;

+			}

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if ((int) value < 0 || (int) value > 6) throw new ArgumentOutOfRangeException();

+				_FirstDayOfWeek = value;

+			}

+		}

+

+		// LAMESPEC: this is not in ECMA specs

+		public Calendar Calendar 

+		{

+			get

+			{

+				return _Calendar;

+			}

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				if (value == null) throw new ArgumentNullException();

+				_Calendar = value;

+			}

+		}

+

+		public CalendarWeekRule CalendarWeekRule 

+		{

+			get

+			{

+				return _CalendarWeekRule;

+			}

+			set

+			{

+				if (IsReadOnly) throw new InvalidOperationException(MSG_READONLY);

+				_CalendarWeekRule = value;

+			}

+		}

+

+		// LAMESPEC: this is not in ECMA specs

+		public string RFC1123Pattern

+		{

+			get

+			{

+				return _RFC1123Pattern;

+			}

+		}

+

+		// LAMESPEC: this is not in ECMA specs

+		public string SortableDateTimePattern

+		{

+			get

+			{

+				return _SortableDateTimePattern;

+			}

+		}

+

+		// LAMESPEC: this is not in ECMA specs

+		public string UniversalSortableDateTimePattern

+		{

+			get

+			{

+				return _UniversalSortableDateTimePattern;

+			}

+		}

+

+		// LAMESPEC: this is not in ECMA specs

+		public string[] GetAllDateTimePatterns()

+		{

+			notImplemented();

+			//FIXME: implement me

+			return null;

+		}

+

+		// LAMESPEC: this is not in ECMA specs

+		public string[] GetAllDateTimePatterns(char format)

+		{

+			notImplemented();

+			//FIXME: implement me

+			return null;

+		}

+

+		// LAMESPEC: this is not in ECMA specs

+		public string GetDayName(DayOfWeek dayofweek)

+		{

+			int index = (int) dayofweek;

+			if (index < 0 || index > 6) throw new ArgumentOutOfRangeException();

+			return _DayNames[index];

+		}

+

+		// LAMESPEC: this is not in ECMA specs

+		public string GetAbbreviatedDayName(DayOfWeek dayofweek)

+		{

+			int index = (int) dayofweek;

+			if (index < 0 || index > 6) throw new ArgumentOutOfRangeException();

+			return _AbbreviatedDayNames[index];

+		}

+

+		private static void notImplemented()

+		{

+			throw new Exception("Not implemented");

+		}

+	}
+

+}
diff --git a/mcs/class/corlib/System.Globalization/DateTimeStyles.cs b/mcs/class/corlib/System.Globalization/DateTimeStyles.cs
new file mode 100644
index 00000000000..0e65c4d966d
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/DateTimeStyles.cs
@@ -0,0 +1,50 @@
+// DateTimeStyles.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:32:07 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Globalization {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum DateTimeStyles {
+
+		/// <summary>
+		/// </summary>
+		None = 0x00000000,
+
+		/// <summary>
+		/// </summary>
+		AllowLeadingWhite = 0x00000001,
+
+		/// <summary>
+		/// </summary>
+		AllowTrailingWhite = 0x00000002,
+
+		/// <summary>
+		/// </summary>
+		AllowInnerWhite = 0x00000004,
+
+		/// <summary>
+		/// </summary>
+		AllowWhiteSpaces = AllowLeadingWhite | AllowTrailingWhite | AllowInnerWhite,
+
+		/// <summary>
+		/// </summary>
+		NoCurrentDateDefault = 0x00000008,
+
+		/// <summary>
+		/// </summary>
+		AdjustToUniversal = 0x00000010,
+	} // DateTimeStyles
+
+} // System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/DaylightTime.cs b/mcs/class/corlib/System.Globalization/DaylightTime.cs
new file mode 100755
index 00000000000..64fc092f94f
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/DaylightTime.cs
@@ -0,0 +1,51 @@
+//
+// System.Globalization.DaylightTime
+//
+// Author:
+//   Chris Hynes (chrish@assistedsolutions.com)
+//
+// (C) 2001 Chris Hynes
+//
+
+using System.Globalization;
+
+namespace System.Globalization
+{
+	[Serializable]
+	public class DaylightTime
+	{
+		DateTime start, end;
+		TimeSpan delta;
+
+		public DaylightTime(DateTime start, DateTime end, TimeSpan delta)
+		{
+			this.start = start;
+			this.end = end;
+			this.delta = delta;
+		}
+
+		public DateTime Start
+		{
+			get
+			{
+				return start;
+			}
+		}
+
+		public DateTime End
+		{
+			get
+			{
+				return end;
+			}
+		}
+
+		public TimeSpan Delta
+		{
+			get
+			{
+				return delta;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Globalization/GregorianCalendar.cs b/mcs/class/corlib/System.Globalization/GregorianCalendar.cs
new file mode 100644
index 00000000000..54c9f44de49
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/GregorianCalendar.cs
@@ -0,0 +1,448 @@
+// GregorianCalendar.cs
+//
+// (C) Ulrich Kunitz 2002
+//
+
+namespace System.Globalization {
+
+using System;
+
+/// <summary>
+/// This is the Gregorian calendar.
+/// </summary>
+/// <remarks>
+/// <para>The Gregorian calendar supports only the Common Era from
+/// the Gregorian year 1 to the Gregorian year 9999.
+/// </para>
+/// <para>The implementation uses the
+/// <see cref="N:CalendricalCalculations"/> namespace.
+/// </para>
+/// </remarks>
+[Serializable]
+public class GregorianCalendar : Calendar {
+	/// <summary>
+	/// The era number for the Common Era (C.E.) or Anno Domini (A.D.)
+	/// respective.
+	/// </summary>
+	public const int ADEra = 1;
+
+	/// <value>Overridden. Gives the eras supported by the Gregorian
+	/// calendar as an array of integers.
+	/// </value>
+	public override int[] Eras {
+		get {
+			return new int[] { ADEra }; 
+		}
+	}
+
+	/// <summary>
+	/// A protected member storing the
+	/// <see cref="T:System.Globalization.GregorianCalendarTypes"/>.
+	/// </summary>
+	internal GregorianCalendarTypes M_CalendarType;
+
+	/// <value>
+	/// The property stores the 
+	/// <see cref="T:System.Globalization.GregorianCalendarTypes"/>.
+	/// </value>
+	public virtual GregorianCalendarTypes CalendarType {
+		get { return M_CalendarType; }
+		set { 
+			// mscorlib 1:0:33000:0 doesn't check anything here
+			M_CalendarType = value;
+		}
+	}
+
+	/// <summary>
+	/// A protected method checking the era number.
+	/// </summary>
+	/// <param name="era">The era number.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="M:ADEra"/>.
+	/// </exception>
+	internal void M_CheckEra(ref int era) {
+		if (era == CurrentEra)
+			era = ADEra;
+		if (era != ADEra)
+			throw new ArgumentException("Era value was not valid.");
+	}
+
+	/// <summary>
+	/// A protected method checking calendar year and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="M:ADEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year is outside of
+	/// the allowed range.
+	/// </exception>
+	internal override void M_CheckYE(int year, ref int era) {
+		M_CheckEra(ref era);
+		M_ArgumentInRange("year", year, 1, 9999);
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar year, month, and
+	/// era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="M:ADEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year or month is
+	/// outside of the allowed range.
+	/// </exception>
+	internal void M_CheckYME(int year, int month, ref int era) {
+		M_CheckYE(year, ref era);
+		if (month < 1 || month > 12)
+			throw new ArgumentOutOfRangeException("month",
+				"Month must be between one and twelve.");
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar day, month, and year
+	/// and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="day">An integer giving the calendar day.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="M:ADEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year, month, or day is
+	/// outside of the allowed range.
+	/// </exception>
+	internal void M_CheckYMDE(int year, int month, int day, ref int era)
+	{
+		M_CheckYME(year, month, ref era);
+		M_ArgumentInRange("day", day, 1,
+			GetDaysInMonth(year, month, era));
+	}
+
+	/// <summary>
+	/// Overridden. Adds months to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="months">The number of months to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="months"/> to the specified
+	/// DateTime.</returns>
+	public override DateTime AddMonths(DateTime time, int months) {
+		return CCGregorianCalendar.AddMonths(time, months);
+	}
+
+	/// <summary>
+	/// Overridden. Adds years to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// years.
+	/// </param>
+	/// <param name="years">The number of years to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="years"/> to the specified
+	/// DateTime.</returns>
+	public override DateTime AddYears(DateTime time, int years) {
+		return CCGregorianCalendar.AddYears(time, years);
+	}
+		
+	/// <summary>
+	/// Overridden. Gets the day of the month from
+	/// <paramref name="time"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public override int GetDayOfMonth(DateTime time) {
+		return CCGregorianCalendar.GetDayOfMonth(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gets the day of the week from the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public override DayOfWeek GetDayOfWeek(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		return (DayOfWeek)CCFixed.day_of_week(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the day in the year.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the day of the year,
+	/// starting with 1.</returns>
+	public override int GetDayOfYear(DateTime time) {
+		return CCGregorianCalendar.GetDayOfYear(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days in the specified month
+	/// of the given year and era.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <param name="era">An intger that gives the era of the specified
+	/// year.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if <paramref name="month"/>,
+	/// <paramref name="year"/> ,or <paramref name="era"/> is outside
+	/// the allowed range.
+	/// </exception>
+	public override int GetDaysInMonth(int year, int month, int era) {
+		// mscorlib doesn't check year, probably a bug; we do
+		M_CheckYME(year, month, ref era);
+		return CCGregorianCalendar.GetDaysInMonth(year, month);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days of the specified
+	/// year of the given era. 
+	/// </summary>
+	/// <param name="year">An integer that specifies the year. 
+	/// </param>
+	/// <param name="era">An ineger that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeExceiption">
+	/// The exception is thrown, if
+	/// <paramref name="year"/> is outside the allowed range.
+	/// </exception>
+	public override int GetDaysInYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return CCGregorianCalendar.GetDaysInYear(year);
+	}
+		
+
+	/// <summary>
+	/// Overridden. Gives the era of the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the era of the calendar.
+	/// </returns>
+	public override int GetEra(DateTime time) {
+		return ADEra;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the month of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the month, 
+	/// starting with 1.</returns>
+	public override int GetMonth(DateTime time) {
+		return CCGregorianCalendar.GetMonth(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of months in the specified year 
+	/// and era.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of the months in the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or the era are not valid.
+	/// </exception>
+	public override int GetMonthsInYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return 12;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the year of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the year, 
+	/// starting with 1.</returns>
+	public override int GetYear(DateTime time) {
+		return CCGregorianCalendar.GetYear(time);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given day 
+	/// is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, day, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapDay(int year, int month, int day, int era)
+	{
+		M_CheckYMDE(year, month, day, ref era);
+		return CCGregorianCalendar.IsLeapDay(year, month, day);
+	}
+
+
+	/// <summary>
+	/// Overridden. Tells whether the given month 
+	/// is a leap month.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given month is a leap
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapMonth(int year, int month, int era) {
+		M_CheckYME(year, month, ref era);
+		return false;
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given year
+	/// is a leap year.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given year is a leap
+	/// year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return CCGregorianCalendar.is_leap_year(year);
+	}
+
+	/// <summary>
+	/// Overridden. Creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the
+	/// <paramref name="era"/>.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if at least one of the parameters
+	/// is out of range.
+	/// </exception>
+	public override DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds,
+		int era)
+	{
+		M_CheckYMDE(year, month, day, ref era);
+		M_CheckHMSM(hour, minute, second, milliseconds);
+		return CCGregorianCalendar.ToDateTime(
+			year, month, day,
+			hour, minute, second, milliseconds);
+	}
+					
+	/// <summary>
+	/// Constructor that sets the
+	/// Gregorian calendar type (
+	/// <see cref="T:System.Globalization.GregorianCalendarTypes"/>).
+	/// </summary>
+	/// <param name="type">The parameter specifies the Gregorian 
+	/// calendar type.
+	/// </param>
+	public GregorianCalendar(GregorianCalendarTypes type) {
+		CalendarType = type;
+		M_AbbrEraNames = new string[] {"C.E."};
+		M_EraNames = new string[] {"Common Era"};
+		if (M_TwoDigitYearMax == 99)
+			M_TwoDigitYearMax = 2029;
+	}
+	
+	/// <summary>
+	/// Default constructor. Sets the Gregorian calendar type to 
+	/// <see
+	/// cref="F:System.Globalization.GregorianCalendarTypes.Localized"/>.
+	/// </summary>
+	public GregorianCalendar() : this(GregorianCalendarTypes.Localized) {}
+} // class GregorianCalendar
+	
+} // namespace System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/GregorianCalendarTypes.cs b/mcs/class/corlib/System.Globalization/GregorianCalendarTypes.cs
new file mode 100755
index 00000000000..2d571fdd13b
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/GregorianCalendarTypes.cs
@@ -0,0 +1,45 @@
+// GregorianCalendarTypes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:35:19 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Globalization {
+
+
+	/// <summary>
+	/// </summary>
+	public enum GregorianCalendarTypes {
+
+		/// <summary>
+		/// </summary>
+		Localized = 1,
+
+		/// <summary>
+		/// </summary>
+		USEnglish = 2,
+
+		/// <summary>
+		/// </summary>
+		MiddleEastFrench = 9,
+
+		/// <summary>
+		/// </summary>
+		Arabic = 10,
+
+		/// <summary>
+		/// </summary>
+		TransliteratedEnglish = 11,
+
+		/// <summary>
+		/// </summary>
+		TransliteratedFrench = 12,
+	} // GregorianCalendarTypes
+
+} // System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/HebrewCalendar.cs b/mcs/class/corlib/System.Globalization/HebrewCalendar.cs
new file mode 100644
index 00000000000..0162fd580bf
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/HebrewCalendar.cs
@@ -0,0 +1,861 @@
+// HebrewCalendar.cs
+//
+// (C) Ulrich Kunitz 2002
+//
+
+namespace System.Globalization {
+
+using System;
+using System.IO;
+
+/// <summary>
+/// This is the Hebrew calendar.
+/// </summary>
+/// <remarks>
+/// <para>The Hebrew calendar supports only years between 5343 A.M. and
+/// 6000 A.M. This has been done to be compatible with .NET.
+/// </para>
+/// <para>The implementation uses the
+/// <see cref="N:CalendricalCalculations"/> namespace.
+/// </para>
+/// </remarks>
+[Serializable]
+public class HebrewCalendar : Calendar {
+	/// <summary>
+	/// Constructor.
+	/// </summary>
+	public HebrewCalendar() {
+		M_AbbrEraNames = new string[] {"A.M."};
+		M_EraNames = new string[] {"Anno Mundi"};
+		if (M_TwoDigitYearMax == 99)
+			M_TwoDigitYearMax = 5790;
+	}
+
+	/// <summary>
+	/// The era number for the Anno Mundi (A.M.) era, called
+	/// plain HebrewEra.
+	/// </summary>
+	public static readonly int HebrewEra = 1;
+
+	/// <summary>
+	/// The
+	/// <see cref="T:System.DateTime"/> ticks for first day of year
+	/// 5343 A.M.
+	/// </summary>
+	internal const long M_MinTicks = 499147488000000000L;
+	/// <summary>
+	/// The number of
+	/// <see cref="T:System.DateTime"/> ticks for the last day of year
+	/// 6000 A.M.
+	/// </summary>
+	internal const long M_MaxTicks = 706783967999999999L;
+	/// <summary>
+	/// The minimum year in the A.M. era supported.
+	/// </summary>
+	internal const int M_MinYear = 5343;
+	/// <summary>
+	/// The maximum year supported in the A.M. era.
+	/// </summary>
+	internal override int M_MaxYear {
+		get { return 6000; }
+	}
+
+	/// <value>Overridden. Gives the eras supported by the Gregorian
+	/// calendar as an array of integers.
+	/// </value>
+	public override int[] Eras {
+		get {
+			return new int[] { HebrewEra }; 
+		}
+	}
+
+	/// <summary>
+	/// A protected member checking a
+	/// <see cref="T:System.DateTime"/> value.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/>
+	/// to check.
+	/// </param>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	internal void M_CheckDateTime(DateTime time) {
+		if (time.Ticks < M_MinTicks || time.Ticks > M_MaxTicks)
+			throw new ArgumentOutOfRangeException(
+				"time",
+				"Only hebrew years between 5343 and 6000," +
+				" inclusive, are supported.");
+	}
+
+	/// <summary>
+	/// A protected method checking the era number.
+	/// </summary>
+	/// <param name="era">The era number.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="F:HebrewEra"/>.
+	/// </exception>
+	internal void M_CheckEra(ref int era) {
+		if (era == CurrentEra)
+			era = HebrewEra;
+		if (era != HebrewEra)
+			throw new ArgumentException("Era value was not valid.");
+	}
+
+	/// <summary>
+	/// A protected method checking calendar year and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="F:HebrewEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year is outside of
+	/// the allowed range.
+	/// </exception>
+	internal override void M_CheckYE(int year, ref int era) {
+		M_CheckEra(ref era);
+		if (year < M_MinYear || year > M_MaxYear)
+			throw new ArgumentOutOfRangeException(
+				"year",
+				"Only hebrew years between 5343 and 6000," +
+				" inclusive, are supported.");
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar year, month, and
+	/// era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="F:HebrewEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year or month is
+	/// outside of the allowed range.
+	/// </exception>
+	internal void M_CheckYME(int year, int month, ref int era) {
+		M_CheckYE(year, ref era);
+		int l = CCHebrewCalendar.last_month_of_year(year);
+		if (month < 1 || month > l) {
+			StringWriter sw = new StringWriter();
+			sw.Write("Month must be between 1 and {0}.", l);
+			throw new ArgumentOutOfRangeException("month",
+				sw.ToString());
+		}
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar day, month, and year
+	/// and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="day">An integer giving the calendar day.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="F:HebrewEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year, month, or day is
+	/// outside of the allowed range.
+	/// </exception>
+	internal void M_CheckYMDE(int year, int month, int day,
+		ref int era)
+	{
+		M_CheckYME(year, month, ref era);
+		M_ArgumentInRange("day", day, 1, GetDaysInMonth(year, month,
+			era));
+	}
+
+	/// <summary>
+	/// Overridden. Adds days to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// days.
+	/// </param>
+	/// <param name="days">The number of days to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="days"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override DateTime AddDays(DateTime time, int days) {
+		DateTime t = base.AddDays(time, days);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds hours to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// hours.
+	/// </param>
+	/// <param name="hours">The number of hours to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="hours"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override DateTime AddHours(DateTime time, int hours) {
+		DateTime t = base.AddHours(time, hours);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds milliseconds to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// milliseconds.
+	/// </param>
+	/// <param name="milliseconds">The number of milliseconds given as
+	/// double to add. Keep in mind the 100 nanosecond resolution of 
+	/// <see cref="T:System.DateTime"/>.
+	/// </param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="milliseconds"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override DateTime AddMilliseconds(DateTime time,
+		double milliseconds)
+	{
+		DateTime t = base.AddMilliseconds(time, milliseconds);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds minutes to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// minutes.
+	/// </param>
+	/// <param name="minutes">The number of minutes to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="minutes"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override DateTime AddMinutes(DateTime time, int minutes) {
+		DateTime t = base.AddMinutes(time, minutes);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds seconds to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// seconds.
+	/// </param>
+	/// <param name="seconds">The number of seconds to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="seconds"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override DateTime AddSeconds(DateTime time, int seconds) {
+		DateTime t = base.AddSeconds(time, seconds);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds weeks to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// weeks.
+	/// </param>
+	/// <param name="weeks">The number of weeks to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="weeks"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override DateTime AddWeeks(DateTime time, int weeks) {
+		DateTime t = base.AddWeeks(time, weeks);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the hour of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the hour of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override int GetHour(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetHour(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the milliseconds in the current second
+	/// of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the milliseconds in the seconds
+	/// of the specified time, starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override double GetMilliseconds(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMilliseconds(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the minute of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the minute of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override int GetMinute(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMinute(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the second of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the second of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override int GetSecond(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMinute(time);
+	}
+
+	/// <summary>
+	/// Overrideden. Adds months to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="months">The number of months to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="months"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override DateTime AddMonths(DateTime time, int months) {
+		int y, m, d;
+		DateTime t;
+
+		if (months == 0) {
+			t = time;
+		} else {
+			int rd = CCFixed.FromDateTime(time);
+			CCHebrewCalendar.dmy_from_fixed(
+				out d, out m, out y, rd);
+			m = M_Month(m, y);
+			if (months < 0) {
+				while (months < 0) {
+					if (m+months > 0) {
+						m += months;
+						months = 0;
+					} else {
+						months += m;
+						y -= 1;
+						m = GetMonthsInYear(y);
+					}
+				}
+			}
+			else {
+				while (months > 0) {
+					int my = GetMonthsInYear(y);
+					if (m+months <= my) {
+						m += months;
+						months = 0;
+					} else {
+						months -= my-m+1;
+						m = 1;
+						y += 1;
+					}
+				}
+			}
+			t = ToDateTime(y, m, d, 0, 0, 0, 0);
+			t = t.Add(time.TimeOfDay);
+		}
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds years to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// years.
+	/// </param>
+	/// <param name="years">The number of years to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="years"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override DateTime AddYears(DateTime time, int years) {
+		int rd = CCFixed.FromDateTime(time);
+		int day, month, year;
+		CCHebrewCalendar.dmy_from_fixed(
+			out day, out month, out year, rd);
+		year += years;
+		rd = CCHebrewCalendar.fixed_from_dmy(day, month, year);
+		DateTime t = CCFixed.ToDateTime(rd);
+		t = t.Add(time.TimeOfDay);
+		M_CheckDateTime(t);
+		return t;
+	}
+		
+	/// <summary>
+	/// Overriden. Gets the day of the month from
+	/// <paramref name="time"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override int GetDayOfMonth(DateTime time) {
+		M_CheckDateTime(time);
+		int rd = CCFixed.FromDateTime(time);
+		return CCHebrewCalendar.day_from_fixed(rd);
+	}
+
+	/// <summary>
+	/// Overriden. Gets the day of the week from the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override DayOfWeek GetDayOfWeek(DateTime time) {
+		M_CheckDateTime(time);
+		int rd = CCFixed.FromDateTime(time);
+		return (DayOfWeek)CCFixed.day_of_week(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the day in the year.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the day of the year,
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override int GetDayOfYear(DateTime time) {
+		M_CheckDateTime(time);
+		int rd = CCFixed.FromDateTime(time);
+		int year = CCHebrewCalendar.year_from_fixed(rd);
+		int rd1_7 = CCHebrewCalendar.fixed_from_dmy(1, 7, year);
+		return rd - rd1_7 + 1;
+	}
+
+	/// <summary>
+	/// The method maps a .NET Hebrew month to a Calencdrical
+	/// Calculations Hebrew month. 
+	/// </summary>
+	/// <param name="month">An integer representing a month in .NET
+	/// counting (starting with Tishri).
+	/// </param>
+	/// <param name="year">An integer representing the Hebrew year.
+	/// </param>
+	/// <returns>The Hebrew month in Calendrical Calculations counting,
+	/// staring with the Hebrew month Nisan.
+	/// </returns>
+	/// <remarks>
+	/// <para>
+	/// In .NET the month counting starts with the Hebrew month Tishri.
+	/// Calendrical Calculations starts with the month Tisan. So we must
+	/// map here.
+	/// </para>
+	/// </remarks>
+	internal int M_CCMonth(int month, int year) {
+		if (month <= 6) {
+			return 6+month;
+		}
+		else {
+			int l = CCHebrewCalendar.last_month_of_year(year);
+			if (l == 12) {
+				return month-6;
+			}
+			else {
+				return month <= 7 ? 6+month : month-7;  
+			}
+		}
+	}
+
+	/// <summary>
+	/// The method maps a Calendrical Calculations Hebrew month
+	/// to a .NET Hebrew month. 
+	/// </summary>
+	/// <param name="ccmonth">An integer representing a month in
+	/// Calendrical Calculations counting, starting with Nisan.
+	/// </param>
+	/// <param name="year">An integer representing the Hebrew year.
+	/// </param>
+	/// <returns>The Hebrew month in .NET counting,
+	/// staring with the Hebrew month Tishri.
+	/// </returns>
+	/// <remarks>
+	/// <para>
+	/// In .NET the month counting starts with the Hebrew month Tishri.
+	/// Calendrical Calculations starts with the month Tisan. So we must
+	/// map here.
+	/// </para>
+	/// </remarks>
+	internal int M_Month(int ccmonth, int year) {
+		if (ccmonth >= 7) {
+			return ccmonth - 6;
+		} else {
+			int l = CCHebrewCalendar.last_month_of_year(year);
+			return ccmonth + (l == 12 ? 6 : 7);
+		}
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days in the specified month
+	/// of the given year and era.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <param name="era">An integer that gives the era of the specified
+	/// year.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if <paramref name="month"/>,
+	/// <paramref name="year"/> ,or <paramref name="era"/> is outside
+	/// the allowed range.
+	/// </exception>
+	public override int GetDaysInMonth(int year, int month, int era) {
+		M_CheckYME(year, month, ref era);
+		int ccmonth = M_CCMonth(month, year); 
+		int rd1 = CCHebrewCalendar.fixed_from_dmy(1, ccmonth, year);
+		int rd2 = CCHebrewCalendar.fixed_from_dmy(1, ccmonth+1, year);
+		return rd2 - rd1;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days of the specified
+	/// year of the given era. 
+	/// </summary>
+	/// <param name="year">An integer that specifies the year. 
+	/// </param>
+	/// <param name="era">An ineger that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeExceiption">
+	/// The exception is thrown, if
+	/// <paramref name="year"/> or <paramref name="era"/> are outside the
+	/// allowed range.
+	/// </exception>
+	public override int GetDaysInYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		int rd1 = CCHebrewCalendar.fixed_from_dmy(1, 7, year);
+		int rd2 = CCHebrewCalendar.fixed_from_dmy(1, 7, year+1);
+		return rd2 - rd1;
+	}
+		
+
+	/// <summary>
+	/// Overridden. Gives the era of the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the era of the calendar.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override int GetEra(DateTime time) {
+		M_CheckDateTime(time);
+		return HebrewEra;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the month of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the month, 
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override int GetMonth(DateTime time) {
+		M_CheckDateTime(time);
+		int rd = CCFixed.FromDateTime(time);
+		int ccmonth, year;
+		CCHebrewCalendar.my_from_fixed(out ccmonth, out year, rd);
+		return M_Month(ccmonth, year);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of months in the specified year 
+	/// and era.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of the months in the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or the era are not valid.
+	/// </exception>
+	public override int GetMonthsInYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return CCHebrewCalendar.last_month_of_year(year);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the year of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the year, 
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the years
+	/// between 5343 A.M. and 6000 A.M., inclusive.
+	/// </exception>
+	public override int GetYear(DateTime time) {
+		M_CheckDateTime(time);
+		int rd = CCFixed.FromDateTime(time);
+		return CCHebrewCalendar.year_from_fixed(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given day 
+	/// is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, day, or era is not
+	/// valid.
+	/// </exception>
+	/// <remarks>All days in Adar II are viewed as leap days and the
+	/// last day of Adar I.
+	/// </remarks>
+	public override bool IsLeapDay(int year, int month, int day, int era)
+	{
+		M_CheckYMDE(year, month, day, ref era);
+		return IsLeapYear(year) &&
+			(month == 7 || (month == 6 && day == 30)); 
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given month 
+	/// is a leap month.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given month is a leap
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, or era is not
+	/// valid.
+	/// </exception>
+	/// <remarks>
+	/// Adar II is viewed as leap month.
+	/// </remarks>
+	public override bool IsLeapMonth(int year, int month, int era) {
+		M_CheckYME(year, month, ref era);
+		return IsLeapYear(year) && month == 7; 
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given year
+	/// is a leap year.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given year is a leap
+	/// year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return CCHebrewCalendar.is_leap_year(year);
+	}
+
+	/// <summary>
+	/// Overridden. Creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the
+	/// <paramref name="era"/>.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if at least one of the parameters
+	/// is out of range.
+	/// </exception>
+	public override DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds,
+		int era)
+	{
+		M_CheckYMDE(year, month, day, ref era);
+		M_CheckHMSM(hour, minute, second, milliseconds);
+		int ccm = M_CCMonth(month, year);
+		int rd = CCHebrewCalendar.fixed_from_dmy(day, ccm, year);
+		return CCFixed.ToDateTime(rd,
+			hour, minute, second, milliseconds);
+	}
+} // class HebrewCalendar
+	
+} // namespace System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/HijriCalendar.cs b/mcs/class/corlib/System.Globalization/HijriCalendar.cs
new file mode 100644
index 00000000000..9df3b005a3a
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/HijriCalendar.cs
@@ -0,0 +1,870 @@
+// HijriCalendar.cs
+//
+// (C) Ulrich Kunitz 2002
+//
+
+namespace System.Globalization {
+
+using System;
+using System.IO;
+
+/// <summary>
+/// This is the Hijri calendar which might be called Islamic calendar. 
+/// </summary>
+/// <remarks>
+/// <para>The calendar supports only dates in the HijriEra starting with the 
+/// epoch.
+/// </para>
+/// <para>
+/// The epoch of the Hijri Calendar might be adjusted by the 
+/// <see cref="F:System.Globalization.HijriCalendar.AddHijriDate"/>
+/// property. See the discussion of the
+/// <see cref="F:CalendricalCalculations.HijriCalendar.epoch">
+/// epoch
+/// </see>
+/// of the Hijri calendar.
+/// </para>
+/// <para>The implementation uses the
+/// <see cref="N:CalendricalCalculations"/> namespace.
+/// </para>
+/// </remarks>
+[Serializable]
+public class HijriCalendar : Calendar {
+	/// <summary>
+	/// Constructor.
+	/// </summary>
+	public HijriCalendar() {
+		M_AbbrEraNames = new string[] {"A.H."};
+		M_EraNames = new string[] {"Anno Hegirae"};
+		if (M_TwoDigitYearMax == 99)
+			M_TwoDigitYearMax = 1451;
+	}
+
+	/// <summary>
+	/// The era number for the Anno Hegirae (A.H.) era.
+	/// </summary>
+	public static readonly int HijriEra = 1;
+
+	/// <summary>
+	/// The minimum fixed day number supported by the Hijri calendar.
+	/// </summary>
+	internal static readonly int M_MinFixed =
+		CCHijriCalendar.fixed_from_dmy(1, 1, 1);
+	/// <summary>
+	/// The maximum fixed day number supported by the Hijri calendar.
+	/// </summary>
+	internal static readonly int M_MaxFixed =
+		CCGregorianCalendar.fixed_from_dmy(31, 12, 9999);
+
+	/// <value>Overridden. Gives the eras supported by the Gregorian
+	/// calendar as an array of integers.
+	/// </value>
+	public override int[] Eras {
+		get {
+			return new int[] { HijriEra }; 
+		}
+	}
+
+	/// <summary>
+	/// Protected field storing the
+	/// <see cref="F:AddHijriDate"/>.
+	/// </summary>
+	internal int M_AddHijriDate = 0;
+
+	// TODO: I don't know currently, which sign to use with the parameter.
+	/// <value>An integer property representing the adjustment to the epoch
+	/// of the Hijri calendar. Not supported by .NET.
+	/// </value>
+	public virtual int AddHijriDate {
+		get {
+			return M_AddHijriDate;
+		}
+		set {
+			if (value < -3 && value > 3)
+				throw new ArgumentOutOfRangeException(
+					"AddHijriDate",
+					"Value should be between -3 and 3.");
+			M_AddHijriDate = value;
+		}
+	}
+	
+	/// <summary>
+	/// A protected method checking an
+	/// <see cref="F:AddHijriDate"/> adjusted fixed day number.
+	/// </summary>
+	/// <param name="param">A string giving the name of the parameter
+	/// to check.</param>
+	/// <param name="rdHijri">An integer giving the AddHijriDate adjusted
+	/// fixed day number.
+	/// </param>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// Exception is thrown, if the AddHijriDate adjusted fixed day
+	/// number is outside the supported range.
+	/// </exception>
+	internal void M_CheckFixedHijri(string param, int rdHijri) {
+		if (rdHijri < M_MinFixed || rdHijri > M_MaxFixed-AddHijriDate) {
+			StringWriter sw = new StringWriter();
+			int day, month, year;
+			CCHijriCalendar.dmy_from_fixed(out day, out month,
+				out year, M_MaxFixed-AddHijriDate);
+			if (AddHijriDate != 0) {
+				sw.Write("This HijriCalendar " +
+					"(AddHijriDate {0})" +
+					" allows dates from 1. 1. 1 to " +
+					"{1}. {2}. {3}.",
+					AddHijriDate,
+					day, month, year);
+			} else {
+				sw.Write("HijriCalendar allows dates from " +
+					"1.1.1 to {0}.{1}.{2}.",
+					day, month, year);
+			}
+			throw new ArgumentOutOfRangeException(param,
+				sw.ToString());
+		}
+	}
+
+	/// <summary>
+	/// A protected member checking a
+	/// <see cref="T:System.DateTime"/> value.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/>
+	/// to check.
+	/// </param>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the supported 
+	/// range of the Hijri calendar.
+	/// </exception>
+	internal void M_CheckDateTime(DateTime time) {
+		int rd = CCFixed.FromDateTime(time) - AddHijriDate;
+		M_CheckFixedHijri("time", rd);
+	}
+
+	/// <summary>
+	/// Protected member which computes the
+	/// <see cref="F:AddHijriDate"/>
+	/// adjusted fixed day number from a
+	/// <see cref="T:System.DateTime"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/>
+	/// to convert.
+	/// </param>
+	/// <returns>The
+	/// <see cref="F:AddHijriDate"/> adjusted fixed day number.
+	/// </returns>
+	internal int M_FromDateTime(DateTime time) {
+		return CCFixed.FromDateTime(time) - AddHijriDate;
+	}
+
+	/// <summary>
+	/// Protected member which converts the
+	/// <see cref="F:AddHijriDate"/>
+	/// adjusted fixed day number the a
+	/// <see cref="T:System.DateTime"/> value.
+	/// </summary>
+	/// <param name="rd">The
+	/// <see cref="F:AddHijriDate"/> adjusted fixed day number.
+	/// </param>
+	/// <returns>The converted
+	/// <see cref="T:System.DateTime"/> value.
+	/// </returns>
+	internal DateTime M_ToDateTime(int rd) {
+		return CCFixed.ToDateTime(rd+AddHijriDate);
+	}
+
+	/// <summary>
+	/// Protected member which converts the
+	/// <see cref="F:AddHijriDate"/>
+	/// adjusted fixed day number the a
+	/// <see cref="T:System.DateTime"/> value using a number
+	/// of time parameters.
+	/// </summary>
+	/// <param name="date">The
+	/// <see cref="F:AddHijriDate"/> adjusted fixed day number.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <returns>The converted
+	/// <see cref="T:System.DateTime"/> value.
+	/// </returns>
+	internal DateTime M_ToDateTime(int date,
+		int hour, int minute, int second, int milliseconds)
+	{
+		return CCFixed.ToDateTime(date+AddHijriDate,
+			hour, minute, second, milliseconds);
+	}
+
+	/// <summary>
+	/// A protected method checking the era number.
+	/// </summary>
+	/// <param name="era">The era number.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="F:HijriEra"/>.
+	/// </exception>
+	internal void M_CheckEra(ref int era) {
+		if (era == CurrentEra)
+			era = HijriEra;
+		if (era != HijriEra)
+			throw new ArgumentException("Era value was not valid.");
+	}
+
+	/// <summary>
+	/// A protected method checking calendar year and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="F:HijriEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year is outside of
+	/// the allowed range.
+	/// </exception>
+	internal override void M_CheckYE(int year, ref int era) {
+		M_CheckEra(ref era);
+		M_ArgumentInRange("year", year, 1, 9666);
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar year, month, and
+	/// era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="F:HijriEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year or month is
+	/// outside of the allowed range.
+	/// </exception>
+	internal void M_CheckYME(int year, int month, ref int era) {
+		M_CheckYE(year, ref era);
+		if (month < 1 || month > 12)
+			throw new ArgumentOutOfRangeException("month",
+				"Month must be between one and twelve.");
+		if (year == 9666) {
+			int rd = CCHijriCalendar.fixed_from_dmy(1, month, year);
+			M_CheckFixedHijri("month", rd);
+		}
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar day, month, and year
+	/// and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="day">An integer giving the calendar day.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="F:HijriEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year, month, or day is
+	/// outside of the allowed range.
+	/// </exception>
+	internal void M_CheckYMDE(int year, int month, int day, ref int era)
+	{
+		M_CheckYME(year, month, ref era);
+		M_ArgumentInRange("day", day, 1,
+			GetDaysInMonth(year, month, HijriEra));
+		if (year == 9666) {
+			int rd = CCHijriCalendar.fixed_from_dmy(day, month,
+				year);
+			M_CheckFixedHijri("day", rd);
+		}
+	}
+
+	/// <summary>
+	/// Overridden. Adds days to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// days.
+	/// </param>
+	/// <param name="days">The number of days to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="days"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override DateTime AddDays(DateTime time, int days) {
+		DateTime t = base.AddDays(time, days);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds hours to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// hours.
+	/// </param>
+	/// <param name="hours">The number of hours to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="hours"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override DateTime AddHours(DateTime time, int hours) {
+		DateTime t = base.AddHours(time, hours);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds milliseconds to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// milliseconds.
+	/// </param>
+	/// <param name="milliseconds">The number of milliseconds given as
+	/// double to add. Keep in mind the 100 nanosecond resolution of 
+	/// <see cref="T:System.DateTime"/>.
+	/// </param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="milliseconds"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override DateTime AddMilliseconds(DateTime time,
+		double milliseconds)
+	{
+		DateTime t = base.AddMilliseconds(time, milliseconds);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds minutes to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// minutes.
+	/// </param>
+	/// <param name="minutes">The number of minutes to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="minutes"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override DateTime AddMinutes(DateTime time, int minutes) {
+		DateTime t = base.AddMinutes(time, minutes);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds seconds to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// seconds.
+	/// </param>
+	/// <param name="seconds">The number of seconds to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="seconds"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override DateTime AddSeconds(DateTime time, int seconds) {
+		DateTime t = base.AddSeconds(time, seconds);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds weeks to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// weeks.
+	/// </param>
+	/// <param name="weeks">The number of weeks to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="weeks"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override DateTime AddWeeks(DateTime time, int weeks) {
+		DateTime t = base.AddWeeks(time, weeks);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the hour of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the hour of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override int GetHour(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetHour(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the milliseconds in the current second
+	/// of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the milliseconds in the seconds
+	/// of the specified time, starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override double GetMilliseconds(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMilliseconds(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the minute of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the minute of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override int GetMinute(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMinute(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the second of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the second of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override int GetSecond(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMinute(time);
+	}
+
+	/// <summary>
+	/// Overrideden. Adds months to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="months">The number of months to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="months"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override DateTime AddMonths(DateTime time, int months) {
+		int rd = M_FromDateTime(time);
+		int day, month, year;
+		CCHijriCalendar.dmy_from_fixed(
+			out day, out month, out year, rd);
+		month += months;
+		year += CCMath.div_mod(out month, month, 12);
+		rd = CCHijriCalendar.fixed_from_dmy(day, month, year);
+		M_CheckFixedHijri("time", rd);
+		DateTime t = M_ToDateTime(rd);
+		return t.Add(time.TimeOfDay);
+	}
+
+	/// <summary>
+	/// Overrideden. Adds years to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// years.
+	/// </param>
+	/// <param name="years">The number of years to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="years"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override DateTime AddYears(DateTime time, int years) {
+		int rd = M_FromDateTime(time);
+		int day, month, year;
+		CCHijriCalendar.dmy_from_fixed(
+			out day, out month, out year, rd);
+		year += years;
+		rd = CCHijriCalendar.fixed_from_dmy(day, month, year);
+		M_CheckFixedHijri("time", rd);
+		DateTime t = M_ToDateTime(rd);
+		return t.Add(time.TimeOfDay);
+	}
+		
+	/// <summary>
+	/// Overriden. Gets the day of the month from
+	/// <paramref name="time"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override int GetDayOfMonth(DateTime time) {
+		int rd = M_FromDateTime(time);
+		M_CheckFixedHijri("time", rd);
+		return CCHijriCalendar.day_from_fixed(rd);
+	}
+
+	/// <summary>
+	/// Overriden. Gets the day of the week from the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override DayOfWeek GetDayOfWeek(DateTime time) {
+		int rd = M_FromDateTime(time);
+		M_CheckFixedHijri("time", rd);
+		return (DayOfWeek)CCFixed.day_of_week(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the day in the year.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the day of the year,
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override int GetDayOfYear(DateTime time) {
+		int rd = M_FromDateTime(time);
+		M_CheckFixedHijri("time", rd);
+		int year = CCHijriCalendar.year_from_fixed(rd);
+		int rd1_1 = CCHijriCalendar.fixed_from_dmy(1, 1, year);
+		return rd - rd1_1 + 1;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days in the specified month
+	/// of the given year and era.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <param name="era">An intger that gives the era of the specified
+	/// year.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if <paramref name="month"/>,
+	/// <paramref name="year"/> ,or <paramref name="era"/> is outside
+	/// the allowed range.
+	/// </exception>
+	public override int GetDaysInMonth(int year, int month, int era) {
+		M_CheckYME(year, month, ref era);
+		int rd1 = CCHijriCalendar.fixed_from_dmy(1, month, year);
+		int rd2 = CCHijriCalendar.fixed_from_dmy(1, month+1, year);
+		return rd2 - rd1;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days of the specified
+	/// year of the given era. 
+	/// </summary>
+	/// <param name="year">An integer that specifies the year. 
+	/// </param>
+	/// <param name="era">An ineger that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeExceiption">
+	/// The exception is thrown, if
+	/// <paramref name="year"/> is outside the allowed range.
+	/// </exception>
+	public override int GetDaysInYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		int rd1 = CCHijriCalendar.fixed_from_dmy(1, 1, year);
+		int rd2 = CCHijriCalendar.fixed_from_dmy(1, 1, year+1);
+		return rd2 - rd1;
+	}
+		
+
+	/// <summary>
+	/// Overridden. Gives the era of the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the era of the calendar.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override int GetEra(DateTime time) {
+		M_CheckDateTime(time);
+		return HijriEra;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the month of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the month, 
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override int GetMonth(DateTime time) {
+		int rd = M_FromDateTime(time);
+		M_CheckFixedHijri("time", rd);
+		return CCHijriCalendar.month_from_fixed(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of months in the specified year 
+	/// and era.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of the months in the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or the era are not valid.
+	/// </exception>
+	public override int GetMonthsInYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return 12;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the year of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the year, 
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is not in the
+	/// supported range of the Hijri calendar.
+	/// </exception>
+	public override int GetYear(DateTime time) {
+		int rd = M_FromDateTime(time);
+		M_CheckFixedHijri("time", rd);
+		return CCHijriCalendar.year_from_fixed(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given day 
+	/// is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, day, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapDay(int year, int month, int day, int era)
+	{
+		M_CheckYMDE(year, month, day, ref era);
+		return IsLeapYear(year) && month == 12 && day == 30;
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given month 
+	/// is a leap month.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given month is a leap
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapMonth(int year, int month, int era) {
+		M_CheckYME(year, month, ref era);
+		return false;
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given year
+	/// is a leap year.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given year is a leap
+	/// year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return CCHijriCalendar.is_leap_year(year);
+	}
+
+	/// <summary>
+	/// Overridden. Creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the
+	/// <paramref name="era"/>.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if at least one of the parameters
+	/// is out of range.
+	/// </exception>
+	public override DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds,
+		int era)
+	{
+		M_CheckYMDE(year, month, day, ref era);
+		M_CheckHMSM(hour, minute, second, milliseconds);
+		int rd = CCHijriCalendar.fixed_from_dmy(day, month, year);
+		return M_ToDateTime(rd,
+			hour, minute, second, milliseconds);
+	}
+} // class HijriCalendar
+	
+} // namespace System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/JapaneseCalendar.cs b/mcs/class/corlib/System.Globalization/JapaneseCalendar.cs
new file mode 100644
index 00000000000..52b994158f1
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/JapaneseCalendar.cs
@@ -0,0 +1,783 @@
+// JapaneseCalendar.cs
+//
+// (C) Ulrich Kunitz 2002
+//
+
+namespace System.Globalization {
+
+using System;
+
+/// <summary>
+/// This is the Japanese calendar. It differs from the Gregorian calendar
+/// only in the years.
+/// </summary>
+/// <remarks>
+/// <para>The Japanese calendar support four eras.</para>
+/// <list type="table">
+/// <listheader>
+/// <term>era number</term>
+/// <term>Gregorian start date</term>
+/// <term>Gregorian end date</term>
+/// </listheader>
+/// <item>
+/// <term>1</term>
+/// <term>September 8, 1868</term>
+/// <term>July 29, 1912</term>
+/// </item>
+/// <item>
+/// <term>2</term>
+/// <term>July 30, 1912</term>
+/// <term>December 24, 1926</term>
+/// </item>
+/// <item>
+/// <term>3</term>
+/// <term>December 25, 1926</term>
+/// <term>January 7, 1989</term>
+/// </item>
+/// <item>
+/// <term>4</term>
+/// <term>January 8, 1989</term>
+/// <term>present</term>
+/// </item>
+/// </list>
+/// <para>The implementation uses the
+/// <see cref="N:CalendricalCalculations"/> namespace.
+/// </para>
+/// </remarks>
+[Serializable]
+public class JapaneseCalendar : Calendar {
+	/// <summary>
+	/// Static protected field storing the
+	/// <see cref="T:CalendricalCalculations.GregorianEraHandler"/>.
+	/// </summary>
+	internal static readonly CCGregorianEraHandler M_EraHandler;
+
+	/// <summary>
+	/// Static constructor, who creates and initializes
+	/// <see cref="F:M_EraHandler"/>.
+	/// </summary>
+	static JapaneseCalendar() {
+		M_EraHandler = new CCGregorianEraHandler();
+		M_EraHandler.appendEra(1,
+			CCGregorianCalendar.fixed_from_dmy(8, 9, 1868),
+			CCGregorianCalendar.fixed_from_dmy(29, 7, 1912));
+		M_EraHandler.appendEra(2,
+			CCGregorianCalendar.fixed_from_dmy(30, 7, 1912),
+			CCGregorianCalendar.fixed_from_dmy(24, 12, 1926));
+		M_EraHandler.appendEra(3,
+			CCGregorianCalendar.fixed_from_dmy(25, 12, 1926),
+			CCGregorianCalendar.fixed_from_dmy(7, 1, 1989));
+		M_EraHandler.appendEra(4,
+			CCGregorianCalendar.fixed_from_dmy(8, 1, 1989));
+	}
+
+	/// <summary>
+	/// Default constructor.
+	/// </summary>
+	public JapaneseCalendar() {
+		M_AbbrEraNames = new string[] { "M", "T", "S", "H" };
+		M_EraNames = new string[] { "Meiji", "Taisho", "Showa",
+			"Heisei" };
+	}
+		
+
+	/// <value>Overridden. Gives the eras supported by the
+	/// calendar as an array of integers.
+	/// </value>
+	public override int[] Eras {
+		get {
+			return (int[])M_EraHandler.Eras.Clone();
+		}
+	}
+
+	/// <summary>
+	/// A protected member checking a
+	/// <see cref="T:System.DateTime"/> value.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/>
+	/// to check.
+	/// </param>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	internal void M_CheckDateTime(DateTime time) {
+		M_EraHandler.CheckDateTime(time);
+	}
+
+	/// <summary>
+	/// A protected method checking the era number.
+	/// </summary>
+	/// <param name="era">The era number as reference. It is set
+	/// to <see cref="F:CurrentEra"/>, if the input value is 0.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	internal void M_CheckEra(ref int era) {
+		if (era == CurrentEra)
+			era = 4;
+		if (!M_EraHandler.ValidEra(era))
+			throw new ArgumentException("Era value was not valid.");
+	}
+
+	/// <summary>
+	/// A protected method checking calendar year and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year is outside of
+	/// the supported range.
+	/// </exception>
+	internal int M_CheckYEG(int year, ref int era) {
+		M_CheckEra(ref era);
+		return M_EraHandler.GregorianYear(year, era);
+	}
+
+	/// <summary>
+	/// Checks whether the year is the era is valid, if era = CurrentEra
+	/// the right value is set.
+	/// </summary>
+	/// <param name="year">The year to check.</param>
+	/// <param name="era">The era to check.</Param>
+	/// <exception cref="T:ArgumentOutOfRangeException">
+	/// The exception will be thrown, if the year is not valid.
+	/// </exception>
+	internal override void M_CheckYE(int year, ref int era) {
+		M_CheckYEG(year, ref era);
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar year, month, and
+	/// era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year or month is
+	/// outside of the supported range.
+	/// </exception>
+	internal int M_CheckYMEG(int year, int month, ref int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		if (month < 1 || month > 12)
+			throw new ArgumentOutOfRangeException("month",
+				"Month must be between one and twelve.");
+		return gregorianYear;
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar day, month, and year
+	/// and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="day">An integer giving the calendar day.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year, month, or day is
+	/// outside of the supported range.
+	/// </exception>
+	internal int M_CheckYMDEG(int year, int month, int day, ref int era)
+	{
+		int gregorianYear = M_CheckYMEG(year, month, ref era);
+		M_ArgumentInRange("day", day, 1, GetDaysInMonth(year, month, era));
+		return gregorianYear;
+	}
+
+
+	/// <summary>
+	/// Overridden. Adds days to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// days.
+	/// </param>
+	/// <param name="days">The number of days to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="days"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddDays(DateTime time, int days) {
+		DateTime t = base.AddDays(time, days);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds hours to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// hours.
+	/// </param>
+	/// <param name="hours">The number of hours to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="hours"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddHours(DateTime time, int hours) {
+		DateTime t = base.AddHours(time, hours);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds milliseconds to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// milliseconds.
+	/// </param>
+	/// <param name="milliseconds">The number of milliseconds given as
+	/// double to add. Keep in mind the 100 nanosecond resolution of 
+	/// <see cref="T:System.DateTime"/>.
+	/// </param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="milliseconds"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddMilliseconds(DateTime time,
+		double milliseconds)
+	{
+		DateTime t = base.AddMilliseconds(time, milliseconds);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds minutes to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// minutes.
+	/// </param>
+	/// <param name="minutes">The number of minutes to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="minutes"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddMinutes(DateTime time, int minutes) {
+		DateTime t = base.AddMinutes(time, minutes);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds seconds to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// seconds.
+	/// </param>
+	/// <param name="seconds">The number of seconds to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="seconds"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddSeconds(DateTime time, int seconds) {
+		DateTime t = base.AddSeconds(time, seconds);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+
+	/// <summary>
+	/// Overridden. Adds weeks to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// weeks.
+	/// </param>
+	/// <param name="weeks">The number of weeks to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="weeks"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddWeeks(DateTime time, int weeks) {
+		DateTime t = base.AddWeeks(time, weeks);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the hour of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the hour of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetHour(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetHour(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the milliseconds in the current second
+	/// of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the milliseconds in the seconds
+	/// of the specified time, starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override double GetMilliseconds(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMilliseconds(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the minute of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the minute of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetMinute(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMinute(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the second of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the second of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetSecond(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMinute(time);
+	}
+
+	/// <summary>
+	/// Overrideden. Adds months to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="months">The number of months to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="months"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddMonths(DateTime time, int months) {
+		DateTime t = CCGregorianCalendar.AddMonths(time, months);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds years to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// years.
+	/// </param>
+	/// <param name="years">The number of years to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="years"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddYears(DateTime time, int years) {
+		DateTime t = CCGregorianCalendar.AddYears(time, years);
+		M_CheckDateTime(t);
+		return t;
+	}
+		
+	/// <summary>
+	/// Overriden. Gets the day of the month from
+	/// <paramref name="time"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetDayOfMonth(DateTime time) {
+		M_CheckDateTime(time);
+		return CCGregorianCalendar.GetDayOfMonth(time);
+	}
+
+	/// <summary>
+	/// Overriden. Gets the day of the week from the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override DayOfWeek GetDayOfWeek(DateTime time) {
+		M_CheckDateTime(time);
+		int rd = CCFixed.FromDateTime(time);
+		return (DayOfWeek)CCFixed.day_of_week(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the day in the year.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the day of the year,
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetDayOfYear(DateTime time) {
+		M_CheckDateTime(time);
+		return CCGregorianCalendar.GetDayOfYear(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days in the specified month
+	/// of the given year and era.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <param name="era">An integer that gives the era of the specified
+	/// year.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if <paramref name="month"/>,
+	/// <paramref name="year"/> ,or <paramref name="era"/> is outside
+	/// the allowed range.
+	/// </exception>
+	public override int GetDaysInMonth(int year, int month, int era) {
+		int gregorianYear = M_CheckYMEG(year, month, ref era);
+		return CCGregorianCalendar.GetDaysInMonth(gregorianYear, month);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days of the specified
+	/// year of the given era. 
+	/// </summary>
+	/// <param name="year">An integer that specifies the year. 
+	/// </param>
+	/// <param name="era">An ineger that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeExceiption">
+	/// The exception is thrown, if
+	/// <paramref name="year"/> or <paramref name="era"/> are outside the
+	/// allowed range.
+	/// </exception>
+	public override int GetDaysInYear(int year, int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		return CCGregorianCalendar.GetDaysInYear(gregorianYear);
+	}
+		
+
+	/// <summary>
+	/// Overridden. Gives the era of the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the era of the calendar.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetEra(DateTime time) {
+		// M_CheckDateTime not needed, because EraYear does the
+		// right thing.
+		int rd = CCFixed.FromDateTime(time);
+		int era;
+		M_EraHandler.EraYear(out era, rd);
+		return era;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the month of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the month, 
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetMonth(DateTime time) {
+		M_CheckDateTime(time);
+		return CCGregorianCalendar.GetMonth(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of months in the specified year 
+	/// and era.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of the months in the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or the era are not valid.
+	/// </exception>
+	public override int GetMonthsInYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return 12;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the year of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the year, 
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetYear(DateTime time) {
+		// M_CheckDateTime not needed, because EraYeat does the
+		// right thing.
+		int rd = CCFixed.FromDateTime(time);
+		int era;
+		return M_EraHandler.EraYear(out era, rd);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given day 
+	/// is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, day, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapDay(int year, int month, int day, int era)
+	{
+		int gregorianYear = M_CheckYMDEG(year, month, day, ref era);
+		return CCGregorianCalendar.IsLeapDay(gregorianYear, month, day);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given month 
+	/// is a leap month.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given month is a leap
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapMonth(int year, int month, int era) {
+		M_CheckYMEG(year, month, ref era);
+		return false;
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given year
+	/// is a leap year.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given year is a leap
+	/// year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapYear(int year, int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		return CCGregorianCalendar.is_leap_year(gregorianYear);
+	}
+
+	/// <summary>
+	/// Overridden. Creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the
+	/// <paramref name="era"/>.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if at least one of the parameters
+	/// is out of range.
+	/// </exception>
+	public override DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds,
+		int era)
+	{
+		int gregorianYear = M_CheckYMDEG(year, month, day, ref era);
+		M_CheckHMSM(hour, minute, second, milliseconds);
+		return CCGregorianCalendar.ToDateTime(
+			gregorianYear, month, day,
+			hour, minute, second, milliseconds);
+	}
+
+
+	/// <summary>
+	/// This functions returns simply the year for the Japanese calendar.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <returns>The same argument as the year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the year is negative or the resulting 
+	/// year is invalid.
+	/// </exception>
+	public override int ToFourDigitYear(int year) {
+		if (year < 0)
+			throw new ArgumentOutOfRangeException(
+				"year", "Non-negative number required.");
+		int era = CurrentEra;
+		M_CheckYE(year, ref era);
+		return year;
+	}
+} // class JapaneseCalendar
+	
+} // namespace System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/JulianCalendar.cs b/mcs/class/corlib/System.Globalization/JulianCalendar.cs
new file mode 100644
index 00000000000..8d1c98f21c7
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/JulianCalendar.cs
@@ -0,0 +1,443 @@
+// JulianCalendar.cs
+//
+// (C) Ulrich Kunitz 2002
+//
+
+namespace System.Globalization {
+
+using System;
+
+/// <summary>
+/// This is the Julian calendar.
+/// </summary>
+/// <remarks>
+/// <para>The Julian calendar supports only the Common Era from
+/// January 1, 1 (Gregorian) to December 31, 9999 (Gregorian).
+/// </para>
+/// <para>The implementation uses the
+/// <see cref="N:CalendricalCalculations"/> namespace.
+/// </para>
+/// </remarks>
+[Serializable]
+public class JulianCalendar : Calendar {
+	/// <summary>
+	/// Default constructor.
+	/// </summary>
+	public JulianCalendar() {
+		M_AbbrEraNames = new string[] {"C.E."};
+		M_EraNames = new string[] {"Common Era"};
+		if (M_TwoDigitYearMax == 99)
+			M_TwoDigitYearMax = 2029;
+	}
+		
+	/// <summary>
+	/// The era number for the Common Era (C.E.) or Anno Domini (A.D.)
+	/// respective.
+	/// </summary>
+	public static readonly int JulianEra = 1;
+
+	/// <value>Overridden. Gives the eras supported by the Julian
+	/// calendar as an array of integers.
+	/// </value>
+	public override int[] Eras {
+		get {
+			return new int[] { JulianEra }; 
+		}
+	}
+
+	/// <summary>
+	/// A protected method checking the era number.
+	/// </summary>
+	/// <param name="era">The era number.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="M:JulianEra"/>.
+	/// </exception>
+	internal void M_CheckEra(ref int era) {
+		if (era == CurrentEra)
+			era = JulianEra;
+		if (era != JulianEra)
+			throw new ArgumentException("Era value was not valid.");
+	}
+
+	/// <summary>
+	/// A protected method checking calendar year and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="M:JulianEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year is outside of
+	/// the allowed range.
+	/// </exception>
+	internal override void M_CheckYE(int year, ref int era) {
+		M_CheckEra(ref era);
+		M_ArgumentInRange("year", year, 1, 9999);
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar year, month, and
+	/// era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="M:JulianEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year or month is
+	/// outside of the allowed range.
+	/// </exception>
+	internal void M_CheckYME(int year, int month, ref int era) {
+		M_CheckYE(year, ref era);
+		if (month < 1 || month > 12)
+			throw new ArgumentOutOfRangeException("month",
+				"Month must be between one and twelve.");
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar day, month, and year
+	/// and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="day">An integer giving the calendar day.
+	/// </param>
+	/// <param name="era">The era number.</param>
+	/// <exception cref="T:System.ArgumentException">
+	/// The exception is thrown if the era is not equal
+	/// <see cref="M:JulianEra"/>.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year, month, or day is
+	/// outside of the allowed range.
+	/// </exception>
+	internal void M_CheckYMDE(int year, int month, int day, ref int era)
+	{
+		M_CheckYME(year, month, ref era);
+		M_ArgumentInRange("day", day, 1,
+			GetDaysInMonth(year, month, era));
+		if (year == 9999 && ((month == 10 && day > 19) || month > 10))
+			throw new ArgumentOutOfRangeException(
+				"The maximum Julian date is 19. 10. 9999.");
+	}
+
+	/// <summary>
+	/// Overridden. Adds months to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="months">The number of months to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="months"/> to the specified
+	/// DateTime.</returns>
+	public override DateTime AddMonths(DateTime time, int months) {
+		int rd = CCFixed.FromDateTime(time);
+		int day, month, year;
+		CCJulianCalendar.dmy_from_fixed(
+			out day, out month, out year, rd);
+		month += months;
+		rd = CCJulianCalendar.fixed_from_dmy(day, month, year);
+		DateTime t = CCFixed.ToDateTime(rd);
+		return t.Add(time.TimeOfDay);
+	}
+
+	/// <summary>
+	/// Overridden. Adds years to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// years.
+	/// </param>
+	/// <param name="years">The number of years to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="years"/> to the specified
+	/// DateTime.</returns>
+	public override DateTime AddYears(DateTime time, int years) {
+		int rd = CCFixed.FromDateTime(time);
+		int day, month, year;
+		CCJulianCalendar.dmy_from_fixed(
+			out day, out month, out year, rd);
+		year += years;
+		rd = CCJulianCalendar.fixed_from_dmy(day, month, year);
+		DateTime t = CCFixed.ToDateTime(rd);
+		return t.Add(time.TimeOfDay);
+	}
+		
+	/// <summary>
+	/// Overridden. Gets the day of the month from
+	/// <paramref name="time"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public override int GetDayOfMonth(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		return CCJulianCalendar.day_from_fixed(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gets the day of the week from the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public override DayOfWeek GetDayOfWeek(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		return (DayOfWeek)CCFixed.day_of_week(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the day in the year.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the day of the year,
+	/// starting with 1.</returns>
+	public override int GetDayOfYear(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		int year = CCJulianCalendar.year_from_fixed(rd);
+		int rd1_1 = CCJulianCalendar.fixed_from_dmy(1, 1, year);
+		return rd - rd1_1 + 1;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days in the specified month
+	/// of the given year and era.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <param name="era">An intger that gives the era of the specified
+	/// year.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if <paramref name="month"/>,
+	/// <paramref name="year"/> ,or <paramref name="era"/> is outside
+	/// the allowed range.
+	/// </exception>
+	public override int GetDaysInMonth(int year, int month, int era) {
+		M_CheckYME(year, month, ref era);
+		int rd1 = CCJulianCalendar.fixed_from_dmy(1, month, year);
+		int rd2 = CCJulianCalendar.fixed_from_dmy(1, month+1, year);
+		return rd2 - rd1;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days of the specified
+	/// year of the given era. 
+	/// </summary>
+	/// <param name="year">An integer that specifies the year. 
+	/// </param>
+	/// <param name="era">An ineger that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeExceiption">
+	/// The exception is thrown, if
+	/// <paramref name="year"/> is outside the allowed range.
+	/// </exception>
+	public override int GetDaysInYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		int rd1 = CCJulianCalendar.fixed_from_dmy(1, 1, year);
+		int rd2 = CCJulianCalendar.fixed_from_dmy(1, 1, year+1);
+		return rd2 - rd1;
+	}
+		
+
+	/// <summary>
+	/// Overridden. Gives the era of the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the era of the calendar.
+	/// </returns>
+	public override int GetEra(DateTime time) {
+		// should change, if more than one era is supported
+		return JulianEra;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the month of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the month, 
+	/// starting with 1.</returns>
+	public override int GetMonth(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		return CCJulianCalendar.month_from_fixed(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of months in the specified year 
+	/// and era.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of the months in the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or the era are not valid.
+	/// </exception>
+	public override int GetMonthsInYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return 12;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the year of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the year, 
+	/// starting with 1.</returns>
+	public override int GetYear(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		return CCJulianCalendar.year_from_fixed(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given day 
+	/// is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, day, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapDay(int year, int month, int day, int era)
+	{
+		M_CheckYMDE(year, month, day, ref era);
+		return IsLeapYear(year) && month == 2 && day == 29;
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given month 
+	/// is a leap month.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given month is a leap
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapMonth(int year, int month, int era) {
+		M_CheckYME(year, month, ref era);
+		return false;
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given year
+	/// is a leap year.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given year is a leap
+	/// year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return CCJulianCalendar.is_leap_year(year);
+	}
+
+	/// <summary>
+	/// Overridden. Creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the
+	/// <paramref name="era"/>.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if at least one of the parameters
+	/// is out of range.
+	/// </exception>
+	public override DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds,
+		int era)
+	{
+		M_CheckYMDE(year, month, day, ref era);
+		M_CheckHMSM(hour, minute, second, milliseconds);
+		int rd = CCJulianCalendar.fixed_from_dmy(day, month, year);
+		return CCFixed.ToDateTime(rd,
+			hour, minute, second, milliseconds);
+	}
+} // class JulianCalendar
+	
+} // namespace System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/KoreanCalendar.cs b/mcs/class/corlib/System.Globalization/KoreanCalendar.cs
new file mode 100644
index 00000000000..dd14c2a309a
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/KoreanCalendar.cs
@@ -0,0 +1,444 @@
+// KoreanCalendar.cs
+//
+// (C) Ulrich Kunitz 2002
+//
+
+namespace System.Globalization {
+
+using System;
+
+/// <summary>
+/// This is the Korean calendar. It differs from the Gegorian calendar only
+/// in the year counting.
+/// </summary>
+/// <remarks>
+/// <para>The implementation uses the
+/// <see cref="N:CalendricalCalculations"/> namespace.
+/// </para>
+/// </remarks>
+[Serializable]
+public class KoreanCalendar : Calendar {
+	/// <summary>
+	/// Static protected field storing the
+	/// <see cref="T:CalendricalCalculations.GregorianEraHandler"/>.
+	/// </summary>
+	internal static readonly CCGregorianEraHandler M_EraHandler;
+
+	/// <variable>
+	/// The standard era for the <see cref="T:KoreanCalendar"/>.
+	/// </variable>
+	public const int KoreanEra = 1;
+
+	/// <summary>
+	/// Static constructor, who creates and initializes
+	/// <see cref="F:M_EraHandler"/>.
+	/// </summary>
+	static KoreanCalendar() {
+		M_EraHandler = new CCGregorianEraHandler();
+		M_EraHandler.appendEra(KoreanEra,
+			CCGregorianCalendar.fixed_from_dmy(1, 1, -2332));
+	}
+
+	/// <summary>
+	/// Default constructor.
+	/// </summary>
+	public KoreanCalendar() {
+		M_AbbrEraNames = new string[] {"K.C.E."};
+		M_EraNames = new string[] {"Korean Current Era"};
+		if (M_TwoDigitYearMax == 99)
+			M_TwoDigitYearMax = 4362;
+	}
+
+	/// <value>Overridden. Gives the eras supported by the
+	/// calendar as an array of integers.
+	/// </value>
+	public override int[] Eras {
+		get {
+			return (int[])M_EraHandler.Eras.Clone();
+		}
+	}
+
+	/// <summary>
+	/// A protected method checking the era number.
+	/// </summary>
+	/// <param name="era">The era number as reference. It is set
+	/// to <see cref="F:CurrentEra"/>, if the input value is 0.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	internal void M_CheckEra(ref int era) {
+		if (era == CurrentEra)
+			era = KoreanEra;
+		if (!M_EraHandler.ValidEra(era))
+			throw new ArgumentException("Era value was not valid.");
+	}
+
+	/// <summary>
+	/// A protected method checking calendar year and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year is outside of
+	/// the supported range.
+	/// </exception>
+	internal int M_CheckYEG(int year, ref int era) {
+		M_CheckEra(ref era);
+		return M_EraHandler.GregorianYear(year, era);
+	}
+
+	/// <summary>
+	/// Checks whether the year is the era is valid, if era = CurrentEra
+	/// the right value is set.
+	/// </summary>
+	/// <param name="year">The year to check.</param>
+	/// <param name="era">The era to check.</Param>
+	/// <exception cref="T:ArgumentOutOfRangeException">
+	/// The exception will be thrown, if the year is not valid.
+	/// </exception>
+	internal override void M_CheckYE(int year, ref int era) {
+		M_CheckYEG(year, ref era);
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar year, month, and
+	/// era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year or month is
+	/// outside of the supported range.
+	/// </exception>
+	internal int M_CheckYMEG(int year, int month, ref int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		if (month < 1 || month > 12)
+			throw new ArgumentOutOfRangeException("month",
+				"Month must be between one and twelve.");
+		return gregorianYear;
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar day, month, and year
+	/// and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="day">An integer giving the calendar day.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year, month, or day is
+	/// outside of the supported range.
+	/// </exception>
+	internal int M_CheckYMDEG(int year, int month, int day, ref int era)
+	{
+		int gregorianYear = M_CheckYMEG(year, month, ref era);
+		M_ArgumentInRange("day", day, 1,
+			GetDaysInMonth(year, month, era));
+		return gregorianYear;
+	}
+
+	/// <summary>
+	/// Overrideden. Adds months to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="months">The number of months to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="months"/> to the specified
+	/// DateTime.</returns>
+	public override DateTime AddMonths(DateTime time, int months) {
+		return CCGregorianCalendar.AddMonths(time, months);
+	}
+
+	/// <summary>
+	/// Overridden. Adds years to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// years.
+	/// </param>
+	/// <param name="years">The number of years to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="years"/> to the specified
+	/// DateTime.</returns>
+	public override DateTime AddYears(DateTime time, int years) {
+		return CCGregorianCalendar.AddYears(time, years);
+	}
+		
+	/// <summary>
+	/// Overriden. Gets the day of the month from
+	/// <paramref name="time"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public override int GetDayOfMonth(DateTime time) {
+		return CCGregorianCalendar.GetDayOfMonth(time);
+	}
+
+	/// <summary>
+	/// Overriden. Gets the day of the week from the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public override DayOfWeek GetDayOfWeek(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		return (DayOfWeek)CCFixed.day_of_week(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the day in the year.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the day of the year,
+	/// starting with 1.</returns>
+	public override int GetDayOfYear(DateTime time) {
+		return CCGregorianCalendar.GetDayOfYear(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days in the specified month
+	/// of the given year and era.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <param name="era">An integer that gives the era of the specified
+	/// year.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if <paramref name="month"/>,
+	/// <paramref name="year"/> ,or <paramref name="era"/> is outside
+	/// the allowed range.
+	/// </exception>
+	public override int GetDaysInMonth(int year, int month, int era) {
+		int gregorianYear = M_CheckYMEG(year, month, ref era);
+		return CCGregorianCalendar.GetDaysInMonth(gregorianYear, month);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days of the specified
+	/// year of the given era. 
+	/// </summary>
+	/// <param name="year">An integer that specifies the year. 
+	/// </param>
+	/// <param name="era">An ineger that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeExceiption">
+	/// The exception is thrown, if
+	/// <paramref name="year"/> or <paramref name="era"/> are outside the
+	/// allowed range.
+	/// </exception>
+	public override int GetDaysInYear(int year, int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		return CCGregorianCalendar.GetDaysInYear(gregorianYear);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the era of the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the era of the calendar.
+	/// </returns>
+	public override int GetEra(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		int era;
+		M_EraHandler.EraYear(out era, rd);
+		return era;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the month of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the month, 
+	/// starting with 1.</returns>
+	public override int GetMonth(DateTime time) {
+		return CCGregorianCalendar.GetMonth(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of months in the specified year 
+	/// and era.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of the months in the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or the era are not valid.
+	/// </exception>
+	public override int GetMonthsInYear(int year, int era) {
+		M_CheckYEG(year, ref era);
+		return 12;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the year of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the year, 
+	/// starting with 1.</returns>
+	public override int GetYear(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		int era;
+		return M_EraHandler.EraYear(out era, rd);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given day 
+	/// is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, day, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapDay(int year, int month, int day, int era)
+	{
+		int gregorianYear = M_CheckYMDEG(year, month, day, ref era);
+		return CCGregorianCalendar.IsLeapDay(gregorianYear, month, day);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given month 
+	/// is a leap month.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given month is a leap
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapMonth(int year, int month, int era) {
+		M_CheckYMEG(year, month, ref era);
+		return false;
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given year
+	/// is a leap year.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given year is a leap
+	/// year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapYear(int year, int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		return CCGregorianCalendar.is_leap_year(gregorianYear);
+	}
+
+	/// <summary>
+	/// Overridden. Creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the
+	/// <paramref name="era"/>.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if at least one of the parameters
+	/// is out of range.
+	/// </exception>
+	public override DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds,
+		int era)
+	{
+		int gregorianYear = M_CheckYMDEG(year, month, day, ref era);
+		M_CheckHMSM(hour, minute, second, milliseconds);
+		return CCGregorianCalendar.ToDateTime(gregorianYear,
+			month, day, hour, minute, second, milliseconds);
+	}
+} // class KoreanCalendar
+	
+} // namespace System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/Locale.cs b/mcs/class/corlib/System.Globalization/Locale.cs
new file mode 100755
index 00000000000..539184dbde4
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/Locale.cs
@@ -0,0 +1,22 @@
+//
+// System.Globalization.Locale.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+
+namespace System.Globalization {
+
+	internal class Locale {
+
+		/// <summary>
+		///   Returns the translated message for the current locale
+		/// </summary>
+		public static string GetText (string msg)
+		{
+			return msg;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Globalization/NumberFormatInfo.cs b/mcs/class/corlib/System.Globalization/NumberFormatInfo.cs
new file mode 100644
index 00000000000..5e6b21c479d
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/NumberFormatInfo.cs
@@ -0,0 +1,676 @@
+//
+// System.Globalization.NumberFormatInfo.cs
+//
+// Author:
+//   Derek Holden (dholden@draper.com)
+//   Bob Smith    (bob@thestuff.net)
+//
+// (C) Derek Holden
+// (C) Bob Smith     http://www.thestuff.net
+//
+
+//
+// NumberFormatInfo. One can only assume it is the class gotten
+// back from a GetFormat() method from an IFormatProvider / 
+// IFormattable implementer. There are some discrepencies with the
+// ECMA spec and the SDK docs, surprisingly. See my conversation
+// with myself on it at:
+// http://lists.ximian.com/archives/public/mono-list/2001-July/000794.html
+// 
+// Other than that this is totally ECMA compliant.
+//
+
+namespace System.Globalization {
+
+	[Serializable]
+	public sealed class NumberFormatInfo : ICloneable, IFormatProvider {
+		private bool readOnly;
+		
+		// Currency Related Format Info
+		private int currencyDecimalDigits;
+		private string currencyDecimalSeparator;
+		private string currencyGroupSeparator;
+		private int[] currencyGroupSizes;
+		private int currencyNegativePattern;
+		private int currencyPositivePattern;
+		private string currencySymbol;
+
+		private string naNSymbol;
+		private string negativeInfinitySymbol;
+		private string negativeSign;
+
+		// Number Related Format Info
+		private int numberDecimalDigits;
+		private string numberDecimalSeparator;
+		private string numberGroupSeparator;
+		private int[] numberGroupSizes;
+		private int numberNegativePattern;
+
+		// Percent Related Format Info
+		private int percentDecimalDigits;
+		private string percentDecimalSeparator;
+		private string percentGroupSeparator;
+		private int[] percentGroupSizes;
+		private int percentNegativePattern;
+		private int percentPositivePattern;
+		private string percentSymbol;
+
+		private string perMilleSymbol;
+		private string positiveInfinitySymbol;
+		private string positiveSign;
+
+		internal NumberFormatInfo (int lcid)
+		{
+			//FIXME: should add more LCID
+			// CultureInfo uses this one also.
+			if (lcid != 0x007F)
+				lcid = 0x007F;
+			
+			switch (lcid){
+
+				// The Invariant Culture Info ID.
+			case 0x007f:
+				readOnly = false;
+				
+				// Currency Related Format Info
+				currencyDecimalDigits =       2;
+				currencyDecimalSeparator =    ".";
+				currencyGroupSeparator =      ",";
+				currencyGroupSizes =          new int[1] { 3 };
+				currencyNegativePattern =     0;
+				currencyPositivePattern =     0;
+				currencySymbol =              "$";
+				
+				naNSymbol =                   "NaN";
+				negativeInfinitySymbol =      "-Infinity";
+				negativeSign =                "-";
+				
+				// Number Related Format Info
+				numberDecimalDigits =         2;
+				numberDecimalSeparator =      ".";
+				numberGroupSeparator =        ",";
+				numberGroupSizes =            new int[1] { 3 };
+				numberNegativePattern =       1;
+				
+				// Percent Related Format Info
+				percentDecimalDigits =        2;
+				percentDecimalSeparator =     ".";
+				percentGroupSeparator =       ",";
+				percentGroupSizes =           new int[1] { 3 };
+				percentNegativePattern =      0;
+				percentPositivePattern =      0;
+				percentSymbol=                "%";
+				
+				perMilleSymbol =              "\u2030";
+				positiveInfinitySymbol =      "Infinity";
+				positiveSign =                "+";
+				break;
+			}
+		}
+		
+		public NumberFormatInfo () : this (0x007f)
+		{
+		}
+				
+		// =========== Currency Format Properties =========== //
+
+		public int CurrencyDecimalDigits {
+			get {
+				return currencyDecimalDigits;
+			}
+			
+			set {
+				if (value < 0 || value > 99) 
+					throw new ArgumentOutOfRangeException
+					("The value specified for the property is less than 0 or greater than 99");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+
+				currencyDecimalDigits = value;
+			}
+		}
+
+		public string CurrencyDecimalSeparator {
+			get {
+				return currencyDecimalSeparator;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+				
+				currencyDecimalSeparator = value;
+			}
+		}
+
+
+		public string CurrencyGroupSeparator {
+			get {
+				return currencyGroupSeparator;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+			
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");	
+				
+				currencyGroupSeparator = value;
+			}
+		}
+
+		public int[] CurrencyGroupSizes {
+			get {
+				return currencyGroupSizes;
+			}
+			
+			set {
+				if (value == null || value.Length == 0) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+				
+				// All elements except last need to be in range 1 - 9, last can be 0.
+				int last = value.Length - 1;
+
+				for (int i = 0; i < last; i++)
+					if (value[i] < 1 || value[i] > 9)
+						throw new ArgumentOutOfRangeException
+						("One of the elements in the array specified is not between 1 and 9");
+
+				if (value[last] < 0 || value[last] > 9)
+					throw new ArgumentOutOfRangeException
+					("Last element in the array specified is not between 0 and 9");
+				
+				currencyGroupSizes = (int[]) value.Clone();
+			}
+		}
+
+		public int CurrencyNegativePattern {
+			get {
+				// See ECMA NumberFormatInfo page 8
+				return currencyNegativePattern;
+			}
+			
+			set {
+				if (value < 0 || value > 15) 
+					throw new ArgumentOutOfRangeException
+					("The value specified for the property is less than 0 or greater than 15");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+
+				currencyNegativePattern = value;
+			}
+		}
+
+		public int CurrencyPositivePattern {
+			get {
+				// See ECMA NumberFormatInfo page 11 
+				return currencyPositivePattern;
+			}
+			
+			set {
+				if (value < 0 || value > 3) 
+					throw new ArgumentOutOfRangeException
+					("The value specified for the property is less than 0 or greater than 3");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+
+				currencyPositivePattern = value;
+			}
+		}
+
+		public string CurrencySymbol {
+			get {
+				return currencySymbol;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+			
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");	
+				
+				currencySymbol = value;
+			}
+		}
+
+		// =========== Static Read-Only Properties =========== //
+
+		public static NumberFormatInfo CurrentInfo {
+			get {
+				// This should be culture specific
+				NumberFormatInfo nfi = new NumberFormatInfo ();
+				nfi.readOnly = true;
+				return nfi;
+			}		       
+		}
+
+		public static NumberFormatInfo InvariantInfo {
+			get {
+				// This uses invariant info, which is same as in the constructor
+				NumberFormatInfo nfi = new NumberFormatInfo ();
+				nfi.NumberNegativePattern = 1;
+				nfi.readOnly = true;
+				return nfi;
+			}		       
+		}
+
+		public bool IsReadOnly {
+			get {
+				return readOnly;
+			}
+		}
+
+
+
+		public string NaNSymbol {
+			get {
+				return naNSymbol;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+			
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");	
+				
+				naNSymbol = value;
+			}
+		}
+		
+		public string NegativeInfinitySymbol {
+			get {
+				return negativeInfinitySymbol;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+			
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");	
+				
+				negativeInfinitySymbol = value;
+			}
+		}
+
+		public string NegativeSign {
+			get {
+				return negativeSign;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+			
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");	
+				
+				negativeSign = value;
+			}
+		}
+		
+		// =========== Number Format Properties =========== //
+
+		public int NumberDecimalDigits {
+			get {
+				return numberDecimalDigits;
+			}
+			
+			set {
+				if (value < 0 || value > 99) 
+					throw new ArgumentOutOfRangeException
+					("The value specified for the property is less than 0 or greater than 99");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+
+				numberDecimalDigits = value;
+			}
+		}		
+
+		public string NumberDecimalSeparator {
+			get {
+				return numberDecimalSeparator;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+				
+				numberDecimalSeparator = value;
+			}
+		}
+
+
+		public string NumberGroupSeparator {
+			get {
+				return numberGroupSeparator;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+			
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");	
+				
+				numberGroupSeparator = value;
+			}
+		}
+
+		public int[] NumberGroupSizes {
+			get {
+				return numberGroupSizes;
+			}
+			
+			set {
+				if (value == null || value.Length == 0) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+				
+				// All elements except last need to be in range 1 - 9, last can be 0.
+				int last = value.Length - 1;
+
+				for (int i = 0; i < last; i++)
+					if (value[i] < 1 || value[i] > 9)
+						throw new ArgumentOutOfRangeException
+						("One of the elements in the array specified is not between 1 and 9");
+
+				if (value[last] < 0 || value[last] > 9)
+					throw new ArgumentOutOfRangeException
+					("Last element in the array specified is not between 0 and 9");
+				
+				numberGroupSizes = (int[]) value.Clone();
+			}
+		}
+
+		public int NumberNegativePattern {
+			get {
+				// See ECMA NumberFormatInfo page 27
+				return numberNegativePattern;
+			}
+			
+			set {
+				if (value < 0 || value > 4) 
+					throw new ArgumentOutOfRangeException
+					("The value specified for the property is less than 0 or greater than 15");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+
+				numberNegativePattern = value;
+			}
+		}
+
+		// =========== Percent Format Properties =========== //
+
+		public int PercentDecimalDigits {
+			get {
+				return percentDecimalDigits;
+			}
+			
+			set {
+				if (value < 0 || value > 99) 
+					throw new ArgumentOutOfRangeException
+					("The value specified for the property is less than 0 or greater than 99");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+
+				percentDecimalDigits = value;
+			}
+		}
+
+		public string PercentDecimalSeparator {
+			get {
+				return percentDecimalSeparator;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+				
+				percentDecimalSeparator = value;
+			}
+		}
+
+
+		public string PercentGroupSeparator {
+			get {
+				return percentGroupSeparator;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+			
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");	
+				
+				percentGroupSeparator = value;
+			}
+		}
+
+		public int[] PercentGroupSizes {
+			get {
+				return percentGroupSizes;
+			}
+			
+			set {
+				if (value == null || value.Length == 0) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+				
+				// All elements except last need to be in range 1 - 9, last can be 0.
+				int last = value.Length - 1;
+
+				for (int i = 0; i < last; i++)
+					if (value[i] < 1 || value[i] > 9)
+						throw new ArgumentOutOfRangeException
+						("One of the elements in the array specified is not between 1 and 9");
+
+				if (value[last] < 0 || value[last] > 9)
+					throw new ArgumentOutOfRangeException
+					("Last element in the array specified is not between 0 and 9");
+				
+				percentGroupSizes = (int[]) value.Clone();
+			}
+		}
+
+		public int PercentNegativePattern {
+			get {
+				// See ECMA NumberFormatInfo page 8
+				return percentNegativePattern;
+			}
+			
+			set {
+				if (value < 0 || value > 2) 
+					throw new ArgumentOutOfRangeException
+					("The value specified for the property is less than 0 or greater than 15");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+
+				percentNegativePattern = value;
+			}
+		}
+
+		public int PercentPositivePattern {
+			get {
+				// See ECMA NumberFormatInfo page 11 
+				return percentPositivePattern;
+			}
+			
+			set {
+				if (value < 0 || value > 2) 
+					throw new ArgumentOutOfRangeException
+					("The value specified for the property is less than 0 or greater than 3");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+
+				percentPositivePattern = value;
+			}
+		}
+
+		public string PercentSymbol {
+			get {
+				return percentSymbol;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+			
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");	
+				
+				percentSymbol = value;
+			}
+		}
+
+		public string PerMilleSymbol {
+			get {
+				return perMilleSymbol;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+				
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");
+				
+				perMilleSymbol = value;
+			}
+		}
+
+		public string PositiveInfinitySymbol {
+			get {
+				return positiveInfinitySymbol;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+			
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");	
+				
+				positiveInfinitySymbol = value;
+			}
+		}
+
+		public string PositiveSign {
+			get {
+				return positiveSign;
+			}
+			
+			set {
+				if (value == null) 
+					throw new ArgumentNullException
+					("The value specified for the property is a null reference");
+			
+				if (readOnly)
+					throw new InvalidOperationException
+					("The current instance is read-only and a set operation was attempted");	
+				
+				positiveSign = value;
+			}
+		}
+
+		public object GetFormat (Type formatType) 
+		{
+			return (formatType == GetType()) ? this : null;
+		}
+		
+		public object Clone () 
+		{
+			NumberFormatInfo clone = (NumberFormatInfo) MemberwiseClone();
+			// clone is not read only
+			clone.readOnly = false;
+			return clone;
+		}
+
+		public static NumberFormatInfo ReadOnly (NumberFormatInfo nfi)
+		{
+			NumberFormatInfo copy = (NumberFormatInfo)nfi.Clone();
+			copy.readOnly = true;
+			return copy;
+		}			
+
+		public static NumberFormatInfo GetInstance(IFormatProvider provider)
+		{
+			if (provider != null) {
+				NumberFormatInfo nfi;
+				nfi = (NumberFormatInfo)provider.GetFormat(typeof(NumberFormatInfo));
+				if (nfi != null)
+					return nfi;
+			}
+			
+			return CurrentInfo;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Globalization/NumberStyles.cs b/mcs/class/corlib/System.Globalization/NumberStyles.cs
new file mode 100644
index 00000000000..fbbccc86427
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/NumberStyles.cs
@@ -0,0 +1,46 @@
+//------------------------------------------------------------------------------
+// 
+// System.Globalization.NumberStyles.cs 
+//
+// Copyright (C) 2001 Michael Lambert, All Rights Reserved
+// 
+// Author:         Michael Lambert, michaellambert@email.com
+// Created:        Thu 07/18/2001 
+//
+// Modified:       7/20/01, Derek Holden (dholden@draper.com)
+//                 Added ECMA values for allows and masks for data types
+//
+//------------------------------------------------------------------------------
+
+namespace System.Globalization {
+
+	[Flags]
+	[Serializable]
+	public enum NumberStyles {
+		None                 = 0x00000000,
+		AllowLeadingWhite    = 0x00000001,
+		AllowTrailingWhite   = 0x00000002,
+		AllowLeadingSign     = 0x00000004,
+		AllowTrailingSign    = 0x00000008,
+		AllowParentheses     = 0x00000010,
+		AllowDecimalPoint    = 0x00000020,
+		AllowThousands       = 0x00000040,
+		AllowExponent        = 0x00000080,
+		AllowCurrencySymbol  = 0x00000100,
+		AllowHexSpecifier    = 0x00000200,
+
+		Integer   = ( AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign ),
+		HexNumber = ( AllowLeadingWhite | AllowTrailingWhite | AllowHexSpecifier ),
+		Number    = ( AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign | 
+			      AllowTrailingSign | AllowDecimalPoint  | AllowThousands ), 
+		Float     = ( AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign | 
+			      AllowDecimalPoint | AllowExponent ), 	     
+		Currency  = ( AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign | 
+			      AllowTrailingSign | AllowParentheses   | AllowDecimalPoint |
+			      AllowThousands    | AllowCurrencySymbol ), 
+		Any 	  = ( AllowLeadingWhite | AllowTrailingWhite | AllowLeadingSign | 
+			      AllowTrailingSign | AllowParentheses   | AllowDecimalPoint |
+			      AllowThousands    | AllowExponent      | AllowCurrencySymbol ), 
+	}
+
+} // Namespace
diff --git a/mcs/class/corlib/System.Globalization/RegionInfo.cs b/mcs/class/corlib/System.Globalization/RegionInfo.cs
new file mode 100644
index 00000000000..c5b21ab4451
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/RegionInfo.cs
@@ -0,0 +1,1689 @@
+using System.Globalization;
+
+namespace System.Globalization {
+
+	[Serializable]
+	public class RegionInfo {
+		int NLS_id;
+
+		public RegionInfo (int culture) {
+
+			if (CultureInfo.IsIDNeutralCulture (culture))
+				throw new ArgumentException ("Culture ID " + culture
+							 + " (0x" + culture.ToString ("X4")
+							 + ") is a neutral culture. A region can not be created from it.");
+
+			switch (culture) {
+			case 0x0401: // ar-SA Arabic (Saudi Arabia)
+				NLS_id = 682;
+				break;
+			case 0x0801: // ar-IQ Arabic (Iraq)
+				NLS_id = 368;
+				break;
+			case 0x0C01: // ar-EG Arabic (Egypt)
+				NLS_id = 818;
+				break;
+			case 0x1001: // ar-LY Arabic (Libya)
+				NLS_id = 434;
+				break;
+			case 0x1401: // ar-DZ Arabic (Algeria)
+				NLS_id = 12;
+				break;
+			case 0x1801: // ar-MA Arabic (Morocco)
+				NLS_id = 504;
+				break;
+			case 0x1C01: // ar-TN Arabic (Tunisia)
+				NLS_id = 788;
+				break;
+			case 0x2001: // ar-OM Arabic (Oman)
+				NLS_id = 512;
+				break;
+			case 0x2401: // ar-YE Arabic (Yemen)
+				NLS_id = 887;
+				break;
+			case 0x2801: // ar-SY Arabic (Syria)
+				NLS_id = 760;
+				break;
+			case 0x2C01: // ar-JO Arabic (Jordan)
+				NLS_id = 400;
+				break;
+			case 0x3001: // ar-LB Arabic (Lebanon)
+				NLS_id = 422;
+				break;
+			case 0x3401: // ar-KW Arabic (Kuwait)
+				NLS_id = 414;
+				break;
+			case 0x3801: // ar-AE Arabic (U.A.E.)
+				NLS_id = 784;
+				break;
+			case 0x3C01: // ar-BH Arabic (Bahrain)
+				NLS_id = 48;
+				break;
+			case 0x4001: // ar-QA Arabic (Qatar)
+				NLS_id = 634;
+				break;
+			case 0x0402: // bg-BG Bulgarian (Bulgaria)
+				NLS_id = 100;
+				break;
+			case 0x0403: // ca-ES Catalan (Spain)
+				NLS_id = 724;
+				break;
+			case 0x0404: // zh-TW Chinese (Taiwan)
+				NLS_id = 158;
+				break;
+			case 0x0804: // zh-CN Chinese (People's Republic of China)
+				NLS_id = 156;
+				break;
+			case 0x0C04: // zh-HK Chinese (Hong Kong S.A.R.)
+				NLS_id = 344;
+				break;
+			case 0x1004: // zh-SG Chinese (Singapore)
+				NLS_id = 702;
+				break;
+			case 0x1404: // zh-MO Chinese (Macau S.A.R.)
+				NLS_id = 446;
+				break;
+			case 0x0405: // cs-CZ Czech (Czech Republic)
+				NLS_id = 203;
+				break;
+			case 0x0406: // da-DK Danish (Denmark)
+				NLS_id = 208;
+				break;
+			case 0x0407: // de-DE German (Germany)
+				NLS_id = 276;
+				break;
+			case 0x0807: // de-CH German (Switzerland)
+				NLS_id = 756;
+				break;
+			case 0x0C07: // de-AT German (Austria)
+				NLS_id = 40;
+				break;
+			case 0x1007: // de-LU German (Luxembourg)
+				NLS_id = 442;
+				break;
+			case 0x1407: // de-LI German (Liechtenstein)
+				NLS_id = 438;
+				break;
+			case 0x0408: // el-GR Greek (Greece)
+				NLS_id = 300;
+				break;
+			case 0x0409: // en-US English (United States)
+				NLS_id = 840;
+				break;
+			case 0x0809: // en-GB English (United Kingdom)
+				NLS_id = 826;
+				break;
+			case 0x0C09: // en-AU English (Australia)
+				NLS_id = 36;
+				break;
+			case 0x1009: // en-CA English (Canada)
+				NLS_id = 124;
+				break;
+			case 0x1409: // en-NZ English (New Zealand)
+				NLS_id = 554;
+				break;
+			case 0x1809: // en-IE English (Ireland)
+				NLS_id = 372;
+				break;
+			case 0x1C09: // en-ZA English (South Africa)
+				NLS_id = 710;
+				break;
+			case 0x2009: // en-JM English (Jamaica)
+				NLS_id = 388;
+				break;
+			case 0x2809: // en-BZ English (Belize)
+				NLS_id = 84;
+				break;
+			case 0x2C09: // en-TT English (Trinidad and Tobago)
+				NLS_id = 780;
+				break;
+			case 0x3009: // en-ZW English (Zimbabwe)
+				NLS_id = 716;
+				break;
+			case 0x3409: // en-PH English (Republic of the Philippines)
+				NLS_id = 608;
+				break;
+			case 0x080A: // es-MX Spanish (Mexico)
+				NLS_id = 484;
+				break;
+			case 0x0C0A: // es-ES Spanish (Spain)
+				NLS_id = 724;
+				break;
+			case 0x100A: // es-GT Spanish (Guatemala)
+				NLS_id = 320;
+				break;
+			case 0x140A: // es-CR Spanish (Costa Rica)
+				NLS_id = 188;
+				break;
+			case 0x180A: // es-PA Spanish (Panama)
+				NLS_id = 591;
+				break;
+			case 0x1C0A: // es-DO Spanish (Dominican Republic)
+				NLS_id = 214;
+				break;
+			case 0x200A: // es-VE Spanish (Venezuela)
+				NLS_id = 862;
+				break;
+			case 0x240A: // es-CO Spanish (Colombia)
+				NLS_id = 170;
+				break;
+			case 0x280A: // es-PE Spanish (Peru)
+				NLS_id = 604;
+				break;
+			case 0x2C0A: // es-AR Spanish (Argentina)
+				NLS_id = 32;
+				break;
+			case 0x300A: // es-EC Spanish (Ecuador)
+				NLS_id = 218;
+				break;
+			case 0x340A: // es-CL Spanish (Chile)
+				NLS_id = 152;
+				break;
+			case 0x380A: // es-UY Spanish (Uruguay)
+				NLS_id = 858;
+				break;
+			case 0x3C0A: // es-PY Spanish (Paraguay)
+				NLS_id = 600;
+				break;
+			case 0x400A: // es-BO Spanish (Bolivia)
+				NLS_id = 68;
+				break;
+			case 0x440A: // es-SV Spanish (El Salvador)
+				NLS_id = 222;
+				break;
+			case 0x480A: // es-HN Spanish (Honduras)
+				NLS_id = 340;
+				break;
+			case 0x4C0A: // es-NI Spanish (Nicaragua)
+				NLS_id = 558;
+				break;
+			case 0x500A: // es-PR Spanish (Puerto Rico)
+				NLS_id = 630;
+				break;
+			case 0x040B: // fi-FI Finnish (Finland)
+				NLS_id = 246;
+				break;
+			case 0x040C: // fr-FR French (France)
+				NLS_id = 250;
+				break;
+			case 0x080C: // fr-BE French (Belgium)
+				NLS_id = 56;
+				break;
+			case 0x0C0C: // fr-CA French (Canada)
+				NLS_id = 124;
+				break;
+			case 0x100C: // fr-CH French (Switzerland)
+				NLS_id = 756;
+				break;
+			case 0x140C: // fr-LU French (Luxembourg)
+				NLS_id = 442;
+				break;
+			case 0x180C: // fr-MC French (Principality of Monaco)
+				NLS_id = 492;
+				break;
+			case 0x040D: // he-IL Hebrew (Israel)
+				NLS_id = 376;
+				break;
+			case 0x040E: // hu-HU Hungarian (Hungary)
+				NLS_id = 348;
+				break;
+			case 0x040F: // is-IS Icelandic (Iceland)
+				NLS_id = 352;
+				break;
+			case 0x0410: // it-IT Italian (Italy)
+				NLS_id = 380;
+				break;
+			case 0x0810: // it-CH Italian (Switzerland)
+				NLS_id = 756;
+				break;
+			case 0x0411: // ja-JP Japanese (Japan)
+				NLS_id = 392;
+				break;
+			case 0x0412: // ko-KR Korean (Korea)
+				NLS_id = 410;
+				break;
+			case 0x0413: // nl-NL Dutch (Netherlands)
+				NLS_id = 528;
+				break;
+			case 0x0813: // nl-BE Dutch (Belgium)
+				NLS_id = 56;
+				break;
+			case 0x0414: // nb-NO Norwegian (Bokm†l) (Norway)
+				NLS_id = 578;
+				break;
+			case 0x0814: // nn-NO Norwegian (Nynorsk) (Norway)
+				NLS_id = 578;
+				break;
+			case 0x0415: // pl-PL Polish (Poland)
+				NLS_id = 616;
+				break;
+			case 0x0416: // pt-BR Portuguese (Brazil)
+				NLS_id = 76;
+				break;
+			case 0x0816: // pt-PT Portuguese (Portugal)
+				NLS_id = 620;
+				break;
+			case 0x0418: // ro-RO Romanian (Romania)
+				NLS_id = 642;
+				break;
+			case 0x0419: // ru-RU Russian (Russia)
+				NLS_id = 643;
+				break;
+			case 0x041A: // hr-HR Croatian (Croatia)
+				NLS_id = 191;
+				break;
+			case 0x041B: // sk-SK Slovak (Slovakia)
+				NLS_id = 703;
+				break;
+			case 0x041C: // sq-AL Albanian (Albania)
+				NLS_id = 8;
+				break;
+			case 0x041D: // sv-SE Swedish (Sweden)
+				NLS_id = 752;
+				break;
+			case 0x081D: // sv-FI Swedish (Finland)
+				NLS_id = 246;
+				break;
+			case 0x041E: // th-TH Thai (Thailand)
+				NLS_id = 764;
+				break;
+			case 0x041F: // tr-TR Turkish (Turkey)
+				NLS_id = 792;
+				break;
+			case 0x0420: // ur-PK Urdu (Islamic Republic of Pakistan)
+				NLS_id = 586;
+				break;
+			case 0x0421: // id-ID Indonesian (Indonesia)
+				NLS_id = 360;
+				break;
+			case 0x0422: // uk-UA Ukrainian (Ukraine)
+				NLS_id = 804;
+				break;
+			case 0x0423: // be-BY Belarusian (Belarus)
+				NLS_id = 112;
+				break;
+			case 0x0424: // sl-SI Slovenian (Slovenia)
+				NLS_id = 705;
+				break;
+			case 0x0425: // et-EE Estonian (Estonia)
+				NLS_id = 233;
+				break;
+			case 0x0426: // lv-LV Latvian (Latvia)
+				NLS_id = 428;
+				break;
+			case 0x0427: // lt-LT Lithuanian (Lithuania)
+				NLS_id = 440;
+				break;
+			case 0x0429: // fa-IR Farsi (Iran)
+				NLS_id = 364;
+				break;
+			case 0x042A: // vi-VN Vietnamese (Viet Nam)
+				NLS_id = 704;
+				break;
+			case 0x042B: // hy-AM Armenian (Armenia)
+				NLS_id = 51;
+				break;
+			case 0x042C: // Lt-az-AZ Azeri (Latin) (Azerbaijan)
+				NLS_id = 31;
+				break;
+			case 0x082C: // Cy-az-AZ Azeri (Cyrillic) (Azerbaijan)
+				NLS_id = 31;
+				break;
+			case 0x042D: // eu-ES Basque (Spain)
+				NLS_id = 724;
+				break;
+			case 0x042F: // mk-MK FYRO Macedonian (Former Yugoslav Republic of Macedonia)
+				NLS_id = 807;
+				break;
+			case 0x0436: // af-ZA Afrikaans (South Africa)
+				NLS_id = 710;
+				break;
+			case 0x0437: // ka-GE Georgian (Georgia)
+				NLS_id = 268;
+				break;
+			case 0x0438: // fo-FO Faeroese (Faeroe Islands)
+				NLS_id = 234;
+				break;
+			case 0x0439: // hi-IN Hindi (India)
+				NLS_id = 356;
+				break;
+			case 0x043E: // ms-MY Malay (Malaysia)
+				NLS_id = 458;
+				break;
+			case 0x083E: // ms-BN Malay (Brunei Darussalam)
+				NLS_id = 96;
+				break;
+			case 0x043F: // kk-KZ Kazakh (Kazakhstan)
+				NLS_id = 398;
+				break;
+			case 0x0440: // ky-KZ Kyrgyz (Kyrgyzstan)
+				NLS_id = 398;
+				break;
+			case 0x0441: // sw-KE Swahili (Kenya)
+				NLS_id = 404;
+				break;
+			case 0x0443: // Lt-uz-UZ Uzbek (Latin) (Uzbekistan)
+				NLS_id = 860;
+				break;
+			case 0x0843: // Cy-uz-UZ Uzbek (Cyrillic) (Uzbekistan)
+				NLS_id = 860;
+				break;
+			case 0x0446: // pa-IN Punjabi (India)
+				NLS_id = 356;
+				break;
+			case 0x0447: // gu-IN Gujarati (India)
+				NLS_id = 356;
+				break;
+			case 0x0449: // ta-IN Tamil (India)
+				NLS_id = 356;
+				break;
+			case 0x044A: // te-IN Telugu (India)
+				NLS_id = 356;
+				break;
+			case 0x044B: // kn-IN Kannada (India)
+				NLS_id = 356;
+				break;
+			case 0x044E: // mr-IN Marathi (India)
+				NLS_id = 356;
+				break;
+			case 0x044F: // sa-IN Sanskrit (India)
+				NLS_id = 356;
+				break;
+			case 0x0450: // mn-MN Mongolian (Mongolia)
+				NLS_id = 496;
+				break;
+			case 0x0456: // gl-ES Galician (Spain)
+				NLS_id = 724;
+				break;
+			case 0x0457: // kok-IN Konkani (India)
+				NLS_id = 356;
+				break;
+			case 0x045A: // syr-SY Syriac (Syria)
+				NLS_id = 760;
+				break;
+			case 0x0465: // div-MV Divehi (Maldives)
+				NLS_id = 462;
+				break;
+			case 0x007F: //  Invariant Language (Invariant Country)
+				throw new ArgumentException ("There is no region associated with the Invariant Culture (Culture ID: 0x7F).");
+			default:
+				throw new ArgumentException ("Culture ID " + culture + " (0x" + culture.ToString ("X4")
+							 + ") is not a supported culture.");
+			}
+		}
+
+		public RegionInfo (string name) {
+			switch (name.ToUpper ()) {
+			case "AF": // Afghanistan
+				NLS_id = 004;
+				break;
+			case "AL": // Albania
+				NLS_id = 008;
+				break;
+			case "DZ": // Algeria
+				NLS_id = 012;
+				break;
+			case "AS": // American Samoa
+				NLS_id = 016;
+				break;
+			case "AD": // Andorra
+				NLS_id = 020;
+				break;
+			case "AO": // Angola
+				NLS_id = 024;
+				break;
+			case "AI": // Anguilla
+				NLS_id = 660;
+				break;
+			case "AQ": // Antarctica
+				NLS_id = 010;
+				break;
+			case "AG": // Antigua and Barbuda
+				NLS_id = 028;
+				break;
+			case "AR": // Argentina
+				NLS_id = 032;
+				break;
+			case "AM": // Armenia
+				NLS_id = 051;
+				break;
+			case "AW": // Aruba
+				NLS_id = 533;
+				break;
+			case "AU": // Australia
+				NLS_id = 036;
+				break;
+			case "AT": // Austria
+				NLS_id = 040;
+				break;
+			case "AZ": // Azerbaijan
+				NLS_id = 031;
+				break;
+			case "BS": // Bahamas
+				NLS_id = 044;
+				break;
+			case "BH": // Bahrain
+				NLS_id = 048;
+				break;
+			case "BD": // Bangladesh
+				NLS_id = 050;
+				break;
+			case "BB": // Barbados
+				NLS_id = 052;
+				break;
+			case "BY": // Belarus
+				NLS_id = 112;
+				break;
+			case "BE": // Belgium
+				NLS_id = 056;
+				break;
+			case "BZ": // Belize
+				NLS_id = 084;
+				break;
+			case "BJ": // Benin
+				NLS_id = 204;
+				break;
+			case "BM": // Bermuda
+				NLS_id = 060;
+				break;
+			case "BT": // Bhutan
+				NLS_id = 064;
+				break;
+			case "BO": // Bolivia
+				NLS_id = 068;
+				break;
+			case "BA": // Bosnia and Herzegowina
+				NLS_id = 070;
+				break;
+			case "BW": // Botswana
+				NLS_id = 072;
+				break;
+			case "BV": // Bouvet Island
+				NLS_id = 074;
+				break;
+			case "BR": // Brazil
+				NLS_id = 076;
+				break;
+			case "IO": // British Indian Ocean Territory
+				NLS_id = 086;
+				break;
+			case "BN": // Brunei Darussalam
+				NLS_id = 096;
+				break;
+			case "BG": // Bulgaria
+				NLS_id = 100;
+				break;
+			case "BF": // Burkina Faso
+				NLS_id = 854;
+				break;
+			case "BI": // Burundi
+				NLS_id = 108;
+				break;
+			case "KH": // Cambodia
+				NLS_id = 116;
+				break;
+			case "CM": // Cameroon
+				NLS_id = 120;
+				break;
+			case "CA": // Canada
+				NLS_id = 124;
+				break;
+			case "CV": // Cape Verde
+				NLS_id = 132;
+				break;
+			case "KY": // Cayman Islands
+				NLS_id = 136;
+				break;
+			case "CF": // Central African Republic
+				NLS_id = 140;
+				break;
+			case "TD": // Chad
+				NLS_id = 148;
+				break;
+			case "CL": // Chile
+				NLS_id = 152;
+				break;
+			case "CN": // China
+				NLS_id = 156;
+				break;
+			case "CX": // Christmas Island
+				NLS_id = 162;
+				break;
+			case "CC": // Cocos (Keeling) Islands
+				NLS_id = 166;
+				break;
+			case "CO": // Colombia
+				NLS_id = 170;
+				break;
+			case "KM": // Comoros
+				NLS_id = 174;
+				break;
+			case "CG": // Congo
+				NLS_id = 178;
+				break;
+			case "CK": // Cook Islands
+				NLS_id = 184;
+				break;
+			case "CR": // Costa Rica
+				NLS_id = 188;
+				break;
+			case "CI": // Cote D'Ivoire
+				NLS_id = 384;
+				break;
+			case "HR": // Croatia (Local Name: Hrvatska)
+				NLS_id = 191;
+				break;
+			case "CU": // Cuba
+				NLS_id = 192;
+				break;
+			case "CY": // Cyprus
+				NLS_id = 196;
+				break;
+			case "CZ": // Czech Republic
+				NLS_id = 203;
+				break;
+			case "DK": // Denmark
+				NLS_id = 208;
+				break;
+			case "DJ": // Djibouti
+				NLS_id = 262;
+				break;
+			case "DM": // Dominica
+				NLS_id = 212;
+				break;
+			case "DO": // Dominican Republic
+				NLS_id = 214;
+				break;
+			case "TP": // East Timor
+				NLS_id = 626;
+				break;
+			case "EC": // Ecuador
+				NLS_id = 218;
+				break;
+			case "EG": // Egypt
+				NLS_id = 818;
+				break;
+			case "SV": // El Salvador
+				NLS_id = 222;
+				break;
+			case "GQ": // Equatorial Guinea
+				NLS_id = 226;
+				break;
+			case "ER": // Eritrea
+				NLS_id = 232;
+				break;
+			case "EE": // Estonia
+				NLS_id = 233;
+				break;
+			case "ET": // Ethiopia
+				NLS_id = 231;
+				break;
+			case "FK": // Falkland Islands (Malvinas)
+				NLS_id = 238;
+				break;
+			case "FO": // Faroe Islands
+				NLS_id = 234;
+				break;
+			case "FJ": // Fiji
+				NLS_id = 242;
+				break;
+			case "FI": // Finland
+				NLS_id = 246;
+				break;
+			case "FR": // France
+				NLS_id = 250;
+				break;
+			case "FX": // France, Metropolitan
+				NLS_id = 249;
+				break;
+			case "GF": // French Guiana
+				NLS_id = 254;
+				break;
+			case "PF": // French Polynesia
+				NLS_id = 258;
+				break;
+			case "TF": // French Southern Territories
+				NLS_id = 260;
+				break;
+			case "GA": // Gabon
+				NLS_id = 266;
+				break;
+			case "GM": // Gambia
+				NLS_id = 270;
+				break;
+			case "GE": // Georgia
+				NLS_id = 268;
+				break;
+			case "DE": // Germany
+				NLS_id = 276;
+				break;
+			case "GH": // Ghana
+				NLS_id = 288;
+				break;
+			case "GI": // Gibraltar
+				NLS_id = 292;
+				break;
+			case "GR": // Greece
+				NLS_id = 300;
+				break;
+			case "GL": // Greenland
+				NLS_id = 304;
+				break;
+			case "GD": // Grenada
+				NLS_id = 308;
+				break;
+			case "GP": // Guadeloupe
+				NLS_id = 312;
+				break;
+			case "GU": // Guam
+				NLS_id = 316;
+				break;
+			case "GT": // Guatemala
+				NLS_id = 320;
+				break;
+			case "GN": // Guinea
+				NLS_id = 324;
+				break;
+			case "GW": // Guinea-Bissau
+				NLS_id = 624;
+				break;
+			case "GY": // Guyana
+				NLS_id = 328;
+				break;
+			case "HT": // Haiti
+				NLS_id = 332;
+				break;
+			case "HM": // Heard and Mc Donald Islands
+				NLS_id = 334;
+				break;
+			case "VA": // Holy See (Vatican City State)
+				NLS_id = 336;
+				break;
+			case "HN": // Honduras
+				NLS_id = 340;
+				break;
+			case "HK": // Hong Kong
+				NLS_id = 344;
+				break;
+			case "HU": // Hungary
+				NLS_id = 348;
+				break;
+			case "IS": // Iceland
+				NLS_id = 352;
+				break;
+			case "IN": // India
+				NLS_id = 356;
+				break;
+			case "ID": // Indonesia
+				NLS_id = 360;
+				break;
+			case "IR": // Iran (Islamic Republic of)
+				NLS_id = 364;
+				break;
+			case "IQ": // Iraq
+				NLS_id = 368;
+				break;
+			case "IE": // Ireland
+				NLS_id = 372;
+				break;
+			case "IL": // Israel
+				NLS_id = 376;
+				break;
+			case "IT": // Italy
+				NLS_id = 380;
+				break;
+			case "JM": // Jamaica
+				NLS_id = 388;
+				break;
+			case "JP": // Japan
+				NLS_id = 392;
+				break;
+			case "JO": // Jordan
+				NLS_id = 400;
+				break;
+			case "KZ": // Kazakhstan
+				NLS_id = 398;
+				break;
+			case "KE": // Kenya
+				NLS_id = 404;
+				break;
+			case "KI": // Kiribati
+				NLS_id = 296;
+				break;
+			case "KP": // Korea, Democratic People's Republic of
+				NLS_id = 408;
+				break;
+			case "KR": // Korea, Republic of
+				NLS_id = 410;
+				break;
+			case "KW": // Kuwait
+				NLS_id = 414;
+				break;
+			case "KG": // Kyrgyzstan
+				NLS_id = 417;
+				break;
+			case "LA": // Lao People's Democratic Republic
+				NLS_id = 418;
+				break;
+			case "LV": // Latvia
+				NLS_id = 428;
+				break;
+			case "LB": // Lebanon
+				NLS_id = 422;
+				break;
+			case "LS": // Lesotho
+				NLS_id = 426;
+				break;
+			case "LR": // Liberia
+				NLS_id = 430;
+				break;
+			case "LY": // Libyan Arab Jamahiriya
+				NLS_id = 434;
+				break;
+			case "LI": // Liechtenstein
+				NLS_id = 438;
+				break;
+			case "LT": // Lithuania
+				NLS_id = 440;
+				break;
+			case "LU": // Luxembourg
+				NLS_id = 442;
+				break;
+			case "MO": // Macau
+				NLS_id = 446;
+				break;
+			case "MK": // Macedonia, The Former Yugoslav Republic of
+				NLS_id = 807;
+				break;
+			case "MG": // Madagascar
+				NLS_id = 450;
+				break;
+			case "MW": // Malawi
+				NLS_id = 454;
+				break;
+			case "MY": // Malaysia
+				NLS_id = 458;
+				break;
+			case "MV": // Maldives
+				NLS_id = 462;
+				break;
+			case "ML": // Mali
+				NLS_id = 466;
+				break;
+			case "MT": // Malta
+				NLS_id = 470;
+				break;
+			case "MH": // Marshall Islands
+				NLS_id = 584;
+				break;
+			case "MQ": // Martinique
+				NLS_id = 474;
+				break;
+			case "MR": // Mauritania
+				NLS_id = 478;
+				break;
+			case "MU": // Mauritius
+				NLS_id = 480;
+				break;
+			case "YT": // Mayotte
+				NLS_id = 175;
+				break;
+			case "MX": // Mexico
+				NLS_id = 484;
+				break;
+			case "FM": // Micronesia, Federated States of
+				NLS_id = 583;
+				break;
+			case "MD": // Moldova, Republic of
+				NLS_id = 498;
+				break;
+			case "MC": // Monaco
+				NLS_id = 492;
+				break;
+			case "MN": // Mongolia
+				NLS_id = 496;
+				break;
+			case "MS": // Montserrat
+				NLS_id = 500;
+				break;
+			case "MA": // Morocco
+				NLS_id = 504;
+				break;
+			case "MZ": // Mozambique
+				NLS_id = 508;
+				break;
+			case "MM": // Myanmar
+				NLS_id = 104;
+				break;
+			case "NA": // Namibia
+				NLS_id = 516;
+				break;
+			case "NR": // Nauru
+				NLS_id = 520;
+				break;
+			case "NP": // Nepal
+				NLS_id = 524;
+				break;
+			case "NL": // Netherlands
+				NLS_id = 528;
+				break;
+			case "AN": // Netherlands Antilles
+				NLS_id = 530;
+				break;
+			case "NC": // New Caledonia
+				NLS_id = 540;
+				break;
+			case "NZ": // New Zealand
+				NLS_id = 554;
+				break;
+			case "NI": // Nicaragua
+				NLS_id = 558;
+				break;
+			case "NE": // Niger
+				NLS_id = 562;
+				break;
+			case "NG": // Nigeria
+				NLS_id = 566;
+				break;
+			case "NU": // Niue
+				NLS_id = 570;
+				break;
+			case "NF": // Norfolk Island
+				NLS_id = 574;
+				break;
+			case "MP": // Northern Mariana Islands
+				NLS_id = 580;
+				break;
+			case "NO": // Norway
+				NLS_id = 578;
+				break;
+			case "OM": // Oman
+				NLS_id = 512;
+				break;
+			case "PK": // Pakistan
+				NLS_id = 586;
+				break;
+			case "PW": // Palau
+				NLS_id = 585;
+				break;
+			case "PA": // Panama
+				NLS_id = 591;
+				break;
+			case "PG": // Papua New Guinea
+				NLS_id = 598;
+				break;
+			case "PY": // Paraguay
+				NLS_id = 600;
+				break;
+			case "PE": // Peru
+				NLS_id = 604;
+				break;
+			case "PH": // Philippines
+				NLS_id = 608;
+				break;
+			case "PN": // Pitcairn
+				NLS_id = 612;
+				break;
+			case "PL": // Poland
+				NLS_id = 616;
+				break;
+			case "PT": // Portugal
+				NLS_id = 620;
+				break;
+			case "PR": // Puerto Rico
+				NLS_id = 630;
+				break;
+			case "QA": // Qatar
+				NLS_id = 634;
+				break;
+			case "RE": // Reunion
+				NLS_id = 638;
+				break;
+			case "RO": // Romania
+				NLS_id = 642;
+				break;
+			case "RU": // Russian Federation
+				NLS_id = 643;
+				break;
+			case "RW": // Rwanda
+				NLS_id = 646;
+				break;
+			case "KN": // Saint Kitts and Nevis
+				NLS_id = 659;
+				break;
+			case "LC": // Saint Lucia
+				NLS_id = 662;
+				break;
+			case "VC": // Saint Vincent and The Grenadines
+				NLS_id = 670;
+				break;
+			case "WS": // Samoa
+				NLS_id = 882;
+				break;
+			case "SM": // San Marino
+				NLS_id = 674;
+				break;
+			case "ST": // Sao Tome and Principe
+				NLS_id = 678;
+				break;
+			case "SA": // Saudi Arabia
+				NLS_id = 682;
+				break;
+			case "SN": // Senegal
+				NLS_id = 686;
+				break;
+			case "SC": // Seychelles
+				NLS_id = 690;
+				break;
+			case "SL": // Sierra Leone
+				NLS_id = 694;
+				break;
+			case "SG": // Singapore
+				NLS_id = 702;
+				break;
+			case "SK": // Slovakia (Slovak Republic)
+				NLS_id = 703;
+				break;
+			case "SI": // Slovenia
+				NLS_id = 705;
+				break;
+			case "SB": // Solomon Islands
+				NLS_id = 090;
+				break;
+			case "SO": // Somalia
+				NLS_id = 706;
+				break;
+			case "ZA": // South Africa
+				NLS_id = 710;
+				break;
+			case "GS": // South Georgia and The South Sandwich Islands
+				NLS_id = 239;
+				break;
+			case "ES": // Spain
+				NLS_id = 724;
+				break;
+			case "LK": // Sri Lanka
+				NLS_id = 144;
+				break;
+			case "SH": // St. Helena
+				NLS_id = 654;
+				break;
+			case "PM": // St. Pierre and Miquelon
+				NLS_id = 666;
+				break;
+			case "SD": // Sudan
+				NLS_id = 736;
+				break;
+			case "SR": // Suriname
+				NLS_id = 740;
+				break;
+			case "SJ": // Svalbard and Jan Mayen Islands
+				NLS_id = 744;
+				break;
+			case "SZ": // Swaziland
+				NLS_id = 748;
+				break;
+			case "SE": // Sweden
+				NLS_id = 752;
+				break;
+			case "CH": // Switzerland
+				NLS_id = 756;
+				break;
+			case "SY": // Syrian Arab Republic
+				NLS_id = 760;
+				break;
+			case "TW": // Taiwan, Province of China
+				NLS_id = 158;
+				break;
+			case "TJ": // Tajikistan
+				NLS_id = 762;
+				break;
+			case "TZ": // Tanzania, United Republic of
+				NLS_id = 834;
+				break;
+			case "TH": // Thailand
+				NLS_id = 764;
+				break;
+			case "TG": // Togo
+				NLS_id = 768;
+				break;
+			case "TK": // Tokelau
+				NLS_id = 772;
+				break;
+			case "TO": // Tonga
+				NLS_id = 776;
+				break;
+			case "TT": // Trinidad and Tobago
+				NLS_id = 780;
+				break;
+			case "TN": // Tunisia
+				NLS_id = 788;
+				break;
+			case "TR": // Turkey
+				NLS_id = 792;
+				break;
+			case "TM": // Turkmenistan
+				NLS_id = 795;
+				break;
+			case "TC": // Turks and Caicos Islands
+				NLS_id = 796;
+				break;
+			case "TV": // Tuvalu
+				NLS_id = 798;
+				break;
+			case "UG": // Uganda
+				NLS_id = 800;
+				break;
+			case "UA": // Ukraine
+				NLS_id = 804;
+				break;
+			case "AE": // United Arab Emirates
+				NLS_id = 784;
+				break;
+			case "GB": // United Kingdom
+				NLS_id = 826;
+				break;
+			case "US": // United States
+				NLS_id = 840;
+				break;
+			case "UM": // United States Minor Outlying Islands
+				NLS_id = 581;
+				break;
+			case "UY": // Uruguay
+				NLS_id = 858;
+				break;
+			case "UZ": // Uzbekistan
+				NLS_id = 860;
+				break;
+			case "VU": // Vanuatu
+				NLS_id = 548;
+				break;
+			case "VE": // Venezuela
+				NLS_id = 862;
+				break;
+			case "VN": // Viet Nam
+				NLS_id = 704;
+				break;
+			case "VG": // Virgin Islands (British)
+				NLS_id = 092;
+				break;
+			case "VI": // Virgin Islands (U.S.)
+				NLS_id = 850;
+				break;
+			case "WF": // Wallis and Futuna Islands
+				NLS_id = 876;
+				break;
+			case "EH": // Western Sahara
+				NLS_id = 732;
+				break;
+			case "YE": // Yemen
+				NLS_id = 887;
+				break;
+			case "YU": // Yugoslavia
+				NLS_id = 891;
+				break;
+			case "ZR": // Zaire
+				NLS_id = 180;
+				break;
+			case "ZM": // Zambia
+				NLS_id = 894;
+				break;
+			case "ZW": // Zimbabwe
+				NLS_id = 716;
+				break;
+			default:
+				throw new ArgumentException ("Region name " + name + " is not supported.");
+			}
+		}
+
+                public virtual string CurrencySymbol {
+			get {
+				switch (NLS_id) {
+				default:
+					throw new Exception ("Dunno what is currency symbol for " + NLS_id + " Region. FIXME.");
+				}
+			}
+		}
+
+		[MonoTODO]
+		public static RegionInfo CurrentRegion {
+			get {
+				return null;
+			}
+		}
+
+		public virtual string DisplayName {
+			get {
+				switch (NLS_id) {
+				case 203: // Czech republic
+					return "Èeská republika";
+				case 840: // United States
+					return "United States";
+				default:
+					throw new Exception ("FIXME. Please add your region name in language used in this region.");
+				}
+			}
+		}
+
+		public virtual string EnglishName {
+			get {
+				switch (NLS_id) {
+				case 004:
+					return "Afghanistan";
+				case 008:
+					return "Albania";
+				case 012:
+					return "Algeria";
+				case 016:
+					return "American Samoa";
+				case 020:
+					return "Andorra";
+				case 024:
+					return "Angola";
+				case 660:
+					return "Anguilla";
+				case 010:
+					return "Antarctica";
+				case 028:
+					return "Antigua and Barbuda";
+				case 032:
+					return "Argentina";
+				case 051:
+					return "Armenia";
+				case 533:
+					return "Aruba";
+				case 036:
+					return "Australia";
+				case 040:
+					return "Austria";
+				case 031:
+					return "Azerbaijan";
+				case 044:
+					return "Bahamas";
+				case 048:
+					return "Bahrain";
+				case 050:
+					return "Bangladesh";
+				case 052:
+					return "Barbados";
+				case 112:
+					return "Belarus";
+				case 056:
+					return "Belgium";
+				case 084:
+					return "Belize";
+				case 204:
+					return "Benin";
+				case 060:
+					return "Bermuda";
+				case 064:
+					return "Bhutan";
+				case 068:
+					return "Bolivia";
+				case 070:
+					return "Bosnia and Herzegowina";
+				case 072:
+					return "Botswana";
+				case 074:
+					return "Bouvet Island";
+				case 076:
+					return "Brazil";
+				case 086:
+					return "British Indian Ocean Territory";
+				case 096:
+					return "Brunei Darussalam";
+				case 100:
+					return "Bulgaria";
+				case 854:
+					return "Burkina Faso";
+				case 108:
+					return "Burundi";
+				case 116:
+					return "Cambodia";
+				case 120:
+					return "Cameroon";
+				case 124:
+					return "Canada";
+				case 132:
+					return "Cape Verde";
+				case 136:
+					return "Cayman Islands";
+				case 140:
+					return "Central African Republic";
+				case 148:
+					return "Chad";
+				case 152:
+					return "Chile";
+				case 156:
+					return "China";
+				case 162:
+					return "Christmas Island";
+				case 166:
+					return "Cocos (Keeling) Islands";
+				case 170:
+					return "Colombia";
+				case 174:
+					return "Comoros";
+				case 178:
+					return "Congo";
+				case 184:
+					return "Cook Islands";
+				case 188:
+					return "Costa Rica";
+				case 384:
+					return "Cote D'Ivoire";
+				case 191:
+					return "Croatia (Local Name: Hrvatska)";
+				case 192:
+					return "Cuba";
+				case 196:
+					return "Cyprus";
+				case 203:
+					return "Czech Republic";
+				case 208:
+					return "Denmark";
+				case 262:
+					return "Djibouti";
+				case 212:
+					return "Dominica";
+				case 214:
+					return "Dominican Republic";
+				case 626:
+					return "East Timor";
+				case 218:
+					return "Ecuador";
+				case 818:
+					return "Egypt";
+				case 222:
+					return "El Salvador";
+				case 226:
+					return "Equatorial Guinea";
+				case 232:
+					return "Eritrea";
+				case 233:
+					return "Estonia";
+				case 231:
+					return "Ethiopia";
+				case 238:
+					return "Falkland Islands (Malvinas)";
+				case 234:
+					return "Faroe Islands";
+				case 242:
+					return "Fiji";
+				case 246:
+					return "Finland";
+				case 250:
+					return "France";
+				case 249:
+					return "France, Metropolitan";
+				case 254:
+					return "French Guiana";
+				case 258:
+					return "French Polynesia";
+				case 260:
+					return "French Southern Territories";
+				case 266:
+					return "Gabon";
+				case 270:
+					return "Gambia";
+				case 268:
+					return "Georgia";
+				case 276:
+					return "Germany";
+				case 288:
+					return "Ghana";
+				case 292:
+					return "Gibraltar";
+				case 300:
+					return "Greece";
+				case 304:
+					return "Greenland";
+				case 308:
+					return "Grenada";
+				case 312:
+					return "Guadeloupe";
+				case 316:
+					return "Guam";
+				case 320:
+					return "Guatemala";
+				case 324:
+					return "Guinea";
+				case 624:
+					return "Guinea-Bissau";
+				case 328:
+					return "Guyana";
+				case 332:
+					return "Haiti";
+				case 334:
+					return "Heard and Mc Donald Islands";
+				case 336:
+					return "Holy See (Vatican City State)";
+				case 340:
+					return "Honduras";
+				case 344:
+					return "Hong Kong";
+				case 348:
+					return "Hungary";
+				case 352:
+					return "Iceland";
+				case 356:
+					return "India";
+				case 360:
+					return "Indonesia";
+				case 364:
+					return "Iran (Islamic Republic of)";
+				case 368:
+					return "Iraq";
+				case 372:
+					return "Ireland";
+				case 376:
+					return "Israel";
+				case 380:
+					return "Italy";
+				case 388:
+					return "Jamaica";
+				case 392:
+					return "Japan";
+				case 400:
+					return "Jordan";
+				case 398:
+					return "Kazakhstan";
+				case 404:
+					return "Kenya";
+				case 296:
+					return "Kiribati";
+				case 408:
+					return "Korea, Democratic People's Republic of";
+				case 410:
+					return "Korea, Republic of";
+				case 414:
+					return "Kuwait";
+				case 417:
+					return "Kyrgyzstan";
+				case 418:
+					return "Lao People's Democratic Republic";
+				case 428:
+					return "Latvia";
+				case 422:
+					return "Lebanon";
+				case 426:
+					return "Lesotho";
+				case 430:
+					return "Liberia";
+				case 434:
+					return "Libyan Arab Jamahiriya";
+				case 438:
+					return "Liechtenstein";
+				case 440:
+					return "Lithuania";
+				case 442:
+					return "Luxembourg";
+				case 446:
+					return "Macau";
+				case 807:
+					return "Macedonia, The Former Yugoslav Republic of";
+				case 450:
+					return "Madagascar";
+				case 454:
+					return "Malawi";
+				case 458:
+					return "Malaysia";
+				case 462:
+					return "Maldives";
+				case 466:
+					return "Mali";
+				case 470:
+					return "Malta";
+				case 584:
+					return "Marshall Islands";
+				case 474:
+					return "Martinique";
+				case 478:
+					return "Mauritania";
+				case 480:
+					return "Mauritius";
+				case 175:
+					return "Mayotte";
+				case 484:
+					return "Mexico";
+				case 583:
+					return "Micronesia, Federated States of";
+				case 498:
+					return "Moldova, Republic of";
+				case 492:
+					return "Monaco";
+				case 496:
+					return "Mongolia";
+				case 500:
+					return "Montserrat";
+				case 504:
+					return "Morocco";
+				case 508:
+					return "Mozambique";
+				case 104:
+					return "Myanmar";
+				case 516:
+					return "Namibia";
+				case 520:
+					return "Nauru";
+				case 524:
+					return "Nepal";
+				case 528:
+					return "Netherlands";
+				case 530:
+					return "Netherlands Antilles";
+				case 540:
+					return "New Caledonia";
+				case 554:
+					return "New Zealand";
+				case 558:
+					return "Nicaragua";
+				case 562:
+					return "Niger";
+				case 566:
+					return "Nigeria";
+				case 570:
+					return "Niue";
+				case 574:
+					return "Norfolk Island";
+				case 580:
+					return "Northern Mariana Islands";
+				case 578:
+					return "Norway";
+				case 512:
+					return "Oman";
+				case 586:
+					return "Pakistan";
+				case 585:
+					return "Palau";
+				case 591:
+					return "Panama";
+				case 598:
+					return "Papua New Guinea";
+				case 600:
+					return "Paraguay";
+				case 604:
+					return "Peru";
+				case 608:
+					return "Philippines";
+				case 612:
+					return "Pitcairn";
+				case 616:
+					return "Poland";
+				case 620:
+					return "Portugal";
+				case 630:
+					return "Puerto Rico";
+				case 634:
+					return "Qatar";
+				case 638:
+					return "Reunion";
+				case 642:
+					return "Romania";
+				case 643:
+					return "Russian Federation";
+				case 646:
+					return "Rwanda";
+				case 659:
+					return "Saint Kitts and Nevis";
+				case 662:
+					return "Saint Lucia";
+				case 670:
+					return "Saint Vincent and The Grenadines";
+				case 882:
+					return "Samoa";
+				case 674:
+					return "San Marino";
+				case 678:
+					return "Sao Tome and Principe";
+				case 682:
+					return "Saudi Arabia";
+				case 686:
+					return "Senegal";
+				case 690:
+					return "Seychelles";
+				case 694:
+					return "Sierra Leone";
+				case 702:
+					return "Singapore";
+				case 703:
+					return "Slovakia (Slovak Republic)";
+				case 705:
+					return "Slovenia";
+				case 090:
+					return "Solomon Islands";
+				case 706:
+					return "Somalia";
+				case 710:
+					return "South Africa";
+				case 239:
+					return "South Georgia and The South Sandwich Islands";
+				case 724:
+					return "Spain";
+				case 144:
+					return "Sri Lanka";
+				case 654:
+					return "St. Helena";
+				case 666:
+					return "St. Pierre and Miquelon";
+				case 736:
+					return "Sudan";
+				case 740:
+					return "Suriname";
+				case 744:
+					return "Svalbard and Jan Mayen Islands";
+				case 748:
+					return "Swaziland";
+				case 752:
+					return "Sweden";
+				case 756:
+					return "Switzerland";
+				case 760:
+					return "Syrian Arab Republic";
+				case 158:
+					return "Taiwan, Province of China";
+				case 762:
+					return "Tajikistan";
+				case 834:
+					return "Tanzania, United Republic of";
+				case 764:
+					return "Thailand";
+				case 768:
+					return "Togo";
+				case 772:
+					return "Tokelau";
+				case 776:
+					return "Tonga";
+				case 780:
+					return "Trinidad and Tobago";
+				case 788:
+					return "Tunisia";
+				case 792:
+					return "Turkey";
+				case 795:
+					return "Turkmenistan";
+				case 796:
+					return "Turks and Caicos Islands";
+				case 798:
+					return "Tuvalu";
+				case 800:
+					return "Uganda";
+				case 804:
+					return "Ukraine";
+				case 784:
+					return "United Arab Emirates";
+				case 826:
+					return "United Kingdom";
+				case 840:
+					return "United States";
+				case 581:
+					return "United States Minor Outlying Islands";
+				case 858:
+					return "Uruguay";
+				case 860:
+					return "Uzbekistan";
+				case 548:
+					return "Vanuatu";
+				case 862:
+					return "Venezuela";
+				case 704:
+					return "Viet Nam";
+				case 092:
+					return "Virgin Islands (British)";
+				case 850:
+					return "Virgin Islands (U.S.)";
+				case 876:
+					return "Wallis and Futuna Islands";
+				case 732:
+					return "Western Sahara";
+				case 887:
+					return "Yemen";
+				case 891:
+					return "Yugoslavia";
+				case 180:
+					return "Zaire";
+				case 894:
+					return "Zambia";
+				case 716:
+					return "Zimbabwe";
+				default:
+					throw new Exception ("This code should not be reached.");
+				}
+			}
+		}
+
+		public virtual bool IsMetric {
+			get {
+				switch (NLS_id) {
+				case 203: // Czech Republic
+					return true;
+				case 840: // United States
+					return false;
+				default:
+					throw new Exception ("FIXME. Please define.");
+				}
+			}
+		}
+
+		public virtual string ISOCurrencySymbol {
+			get {
+				switch (NLS_id) {
+				default:
+					throw new Exception ("This code should not be reached.");
+				}
+			}
+		}
+
+		//
+		// methods
+
+                public override bool Equals(object value) {
+			return value == this;
+		}
+
+                public override int GetHashCode () {
+			return NLS_id.GetHashCode ();
+		}
+	}
+
+}
diff --git a/mcs/class/corlib/System.Globalization/TaiwanCalendar.cs b/mcs/class/corlib/System.Globalization/TaiwanCalendar.cs
new file mode 100644
index 00000000000..f744e2bd0b0
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/TaiwanCalendar.cs
@@ -0,0 +1,745 @@
+// TaiwanCalendar.cs
+//
+// (C) Ulrich Kunitz 2002
+//
+
+namespace System.Globalization {
+
+using System;
+
+/// <summary>
+/// This is the Japanese calendar. It differs from the Gregorian calendar
+/// only in the years.
+/// </summary>
+/// <remarks>
+/// <para>The Japanese calendar support a single era starting at January 1,
+/// 1912</para>
+/// <para>The implementation uses the
+/// <see cref="N:CalendricalCalculations"/> namespace.
+/// </para>
+/// </remarks>
+[Serializable]
+public class TaiwanCalendar : Calendar {
+	/// <summary>
+	/// Static protected field storing the
+	/// <see cref="T:CalendricalCalculations.GregorianEraHandler"/>.
+	/// </summary>
+	internal static readonly CCGregorianEraHandler M_EraHandler;
+
+	/// <summary>
+	/// Static constructor, who creates and initializes
+	/// <see cref="F:M_EraHandler"/>.
+	/// </summary>
+	static TaiwanCalendar() {
+		M_EraHandler = new CCGregorianEraHandler();
+		M_EraHandler.appendEra(1,
+			CCGregorianCalendar.fixed_from_dmy(1, 1, 1912));
+	}
+
+	/// <summary>
+	/// Default constructor.
+	/// </summary>
+	public TaiwanCalendar() {
+		M_AbbrEraNames = new string[] {"T.C.E."};
+		M_EraNames =  new string[] {"Taiwan current era"};
+	}
+
+	/// <value>Overridden. Gives the eras supported by the
+	/// calendar as an array of integers.
+	/// </value>
+	public override int[] Eras {
+		get {
+			return (int[])M_EraHandler.Eras.Clone();
+		}
+	}
+
+	/// <summary>
+	/// A protected member checking a
+	/// <see cref="T:System.DateTime"/> value.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/>
+	/// to check.
+	/// </param>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	internal void M_CheckDateTime(DateTime time) {
+		M_EraHandler.CheckDateTime(time);
+	}
+
+	/// <summary>
+	/// A protected method checking the era number.
+	/// </summary>
+	/// <param name="era">The era number as reference. It is set
+	/// to <see cref="F:CurrentEra"/>, if the input value is 0.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	internal void M_CheckEra(ref int era) {
+		if (era == CurrentEra)
+			era = 1;
+		if (!M_EraHandler.ValidEra(era))
+			throw new ArgumentException("Era value was not valid.");
+	}
+
+	/// <summary>
+	/// A protected method checking calendar year and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year is outside of
+	/// the supported range.
+	/// </exception>
+	internal int M_CheckYEG(int year, ref int era) {
+		M_CheckEra(ref era);
+		return M_EraHandler.GregorianYear(year, era);
+	}
+
+	/// <summary>
+	/// Checks whether the year is the era is valid, if era = CurrentEra
+	/// the right value is set.
+	/// </summary>
+	/// <param name="year">The year to check.</param>
+	/// <param name="era">The era to check.</Param>
+	/// <exception cref="T:ArgumentOutOfRangeException">
+	/// The exception will be thrown, if the year is not valid.
+	/// </exception>
+	internal override void M_CheckYE(int year, ref int era) {
+		M_CheckYEG(year, ref era);
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar year, month, and
+	/// era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year or month is
+	/// outside of the supported range.
+	/// </exception>
+	internal int M_CheckYMEG(int year, int month, ref int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		if (month < 1 || month > 12)
+			throw new ArgumentOutOfRangeException("month",
+				"Month must be between one and twelve.");
+		return gregorianYear;
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar day, month, and year
+	/// and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="day">An integer giving the calendar day.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year, month, or day is
+	/// outside of the supported range.
+	/// </exception>
+	internal int M_CheckYMDEG(int year, int month, int day, ref int era)
+	{
+		int gregorianYear = M_CheckYMEG(year, month, ref era);
+		M_ArgumentInRange("day", day, 1,
+			GetDaysInMonth(year, month, era));
+		return gregorianYear;
+	}
+
+	/// <summary>
+	/// Overridden. Adds days to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// days.
+	/// </param>
+	/// <param name="days">The number of days to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="days"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddDays(DateTime time, int days) {
+		DateTime t = base.AddDays(time, days);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds hours to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// hours.
+	/// </param>
+	/// <param name="hours">The number of hours to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="hours"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddHours(DateTime time, int hours) {
+		DateTime t = base.AddHours(time, hours);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds milliseconds to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// milliseconds.
+	/// </param>
+	/// <param name="milliseconds">The number of milliseconds given as
+	/// double to add. Keep in mind the 100 nanosecond resolution of 
+	/// <see cref="T:System.DateTime"/>.
+	/// </param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="milliseconds"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddMilliseconds(DateTime time,
+		double milliseconds)
+	{
+		DateTime t = base.AddMilliseconds(time, milliseconds);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds minutes to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// minutes.
+	/// </param>
+	/// <param name="minutes">The number of minutes to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="minutes"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddMinutes(DateTime time, int minutes) {
+		DateTime t = base.AddMinutes(time, minutes);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds seconds to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// seconds.
+	/// </param>
+	/// <param name="seconds">The number of seconds to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="seconds"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddSeconds(DateTime time, int seconds) {
+		DateTime t = base.AddSeconds(time, seconds);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+
+	/// <summary>
+	/// Overridden. Adds weeks to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// weeks.
+	/// </param>
+	/// <param name="weeks">The number of weeks to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="weeks"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddWeeks(DateTime time, int weeks) {
+		DateTime t = base.AddWeeks(time, weeks);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the hour of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the hour of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetHour(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetHour(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the milliseconds in the current second
+	/// of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the milliseconds in the seconds
+	/// of the specified time, starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override double GetMilliseconds(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMilliseconds(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the minute of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the minute of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetMinute(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMinute(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the second of the specified time.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies the
+	/// time.
+	/// </param>
+	/// <returns>An integer that gives the second of the specified time,
+	/// starting with 0.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetSecond(DateTime time) {
+		M_CheckDateTime(time);
+		return base.GetMinute(time);
+	}
+
+	/// <summary>
+	/// Overrideden. Adds months to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="months">The number of months to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="months"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddMonths(DateTime time, int months) {
+		DateTime t = CCGregorianCalendar.AddMonths(time, months);
+		M_CheckDateTime(t);
+		return t;
+	}
+
+	/// <summary>
+	/// Overridden. Adds years to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// years.
+	/// </param>
+	/// <param name="years">The number of years to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="years"/> to the specified
+	/// DateTime.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if
+	/// <see cref="T:System.DateTime"/> return value is outside all
+	/// supported eras.
+	/// </exception>
+	public override DateTime AddYears(DateTime time, int years) {
+		DateTime t = CCGregorianCalendar.AddYears(time, years);
+		M_CheckDateTime(t);
+		return t;
+	}
+		
+	/// <summary>
+	/// Overriden. Gets the day of the month from
+	/// <paramref name="time"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetDayOfMonth(DateTime time) {
+		M_CheckDateTime(time);
+		return CCGregorianCalendar.GetDayOfMonth(time);
+	}
+
+	/// <summary>
+	/// Overriden. Gets the day of the week from the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override DayOfWeek GetDayOfWeek(DateTime time) {
+		M_CheckDateTime(time);
+		int rd = CCFixed.FromDateTime(time);
+		return (DayOfWeek)CCFixed.day_of_week(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the day in the year.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the day of the year,
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetDayOfYear(DateTime time) {
+		M_CheckDateTime(time);
+		return CCGregorianCalendar.GetDayOfYear(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days in the specified month
+	/// of the given year and era.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <param name="era">An integer that gives the era of the specified
+	/// year.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if <paramref name="month"/>,
+	/// <paramref name="year"/> ,or <paramref name="era"/> is outside
+	/// the allowed range.
+	/// </exception>
+	public override int GetDaysInMonth(int year, int month, int era) {
+		int gregorianYear = M_CheckYMEG(year, month, ref era);
+		return CCGregorianCalendar.GetDaysInMonth(gregorianYear, month);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days of the specified
+	/// year of the given era. 
+	/// </summary>
+	/// <param name="year">An integer that specifies the year. 
+	/// </param>
+	/// <param name="era">An ineger that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeExceiption">
+	/// The exception is thrown, if
+	/// <paramref name="year"/> or <paramref name="era"/> are outside the
+	/// allowed range.
+	/// </exception>
+	public override int GetDaysInYear(int year, int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		return CCGregorianCalendar.GetDaysInYear(gregorianYear);
+	}
+		
+
+	/// <summary>
+	/// Overridden. Gives the era of the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the era of the calendar.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetEra(DateTime time) {
+		// M_CheckDateTime not needed, because EraYear does the
+		// right thing.
+		int rd = CCFixed.FromDateTime(time);
+		int era;
+		M_EraHandler.EraYear(out era, rd);
+		return era;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the month of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the month, 
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetMonth(DateTime time) {
+		M_CheckDateTime(time);
+		return CCGregorianCalendar.GetMonth(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of months in the specified year 
+	/// and era.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of the months in the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or the era are not valid.
+	/// </exception>
+	public override int GetMonthsInYear(int year, int era) {
+		M_CheckYEG(year, ref era);
+		return 12;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the year of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the year, 
+	/// starting with 1.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the
+	/// <see cref="T:System.DateTime"/> parameter is outside all
+	/// supported eras.
+	/// </exception>
+	public override int GetYear(DateTime time) {
+		// M_CheckDateTime not needed, because EraYeat does the
+		// right thing.
+		int rd = CCFixed.FromDateTime(time);
+		int era;
+		return M_EraHandler.EraYear(out era, rd);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given day 
+	/// is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, day, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapDay(int year, int month, int day, int era)
+	{
+		int gregorianYear = M_CheckYMDEG(year, month, day, ref era);
+		return CCGregorianCalendar.IsLeapDay(gregorianYear, month, day);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given month 
+	/// is a leap month.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given month is a leap
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapMonth(int year, int month, int era) {
+		M_CheckYMEG(year, month, ref era);
+		return false;
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given year
+	/// is a leap year.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given year is a leap
+	/// year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapYear(int year, int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		return CCGregorianCalendar.is_leap_year(gregorianYear);
+	}
+
+	/// <summary>
+	/// Overridden. Creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the
+	/// <paramref name="era"/>.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if at least one of the parameters
+	/// is out of range.
+	/// </exception>
+	public override DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds,
+		int era)
+	{
+		int gregorianYear = M_CheckYMDEG(year, month, day, ref era);
+		M_CheckHMSM(hour, minute, second, milliseconds);
+		return CCGregorianCalendar.ToDateTime(
+			gregorianYear, month, day,
+			hour, minute, second, milliseconds);
+	}
+
+	/// <summary>
+	/// This functions returns simply the year for the Taiwan calendar.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <returns>The same argument as the year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the year is negative or the resulting 
+	/// year is invalid.
+	/// </exception>
+	public override int ToFourDigitYear(int year) {
+		if (year < 0)
+			throw new ArgumentOutOfRangeException(
+				"year", "Non-negative number required.");
+		int era = CurrentEra;
+		M_CheckYE(year, ref era);
+		return year;
+	}
+} // class TaiwanCalendar
+	
+} // namespace System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/TextInfo.cs b/mcs/class/corlib/System.Globalization/TextInfo.cs
new file mode 100755
index 00000000000..c44b1365cfb
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/TextInfo.cs
@@ -0,0 +1,126 @@
+//
+// System.Globalization.TextInfo.cs
+//
+// Author:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Globalization {
+
+	[Serializable]
+	public class TextInfo: IDeserializationCallback {
+
+		[MonoTODO]
+		public virtual int ANSICodePage
+		{
+			get {
+				return(0);
+			}
+		}
+
+		[MonoTODO]
+		public virtual int EBCDICCodePage
+		{
+			get {
+				return(0);
+			}
+		}
+		
+		[MonoTODO]
+		public virtual string ListSeparator 
+		{
+			get {
+				return(",");
+			}
+		}
+
+		[MonoTODO]
+		public virtual int MacCodePage
+		{
+			get {
+				return(0);
+			}
+		}
+		
+		[MonoTODO]
+		public virtual int OEMCodePage
+		{
+			get {
+				return(0);
+			}
+		}
+
+		/*
+		[MonoTODO]
+		public override bool Equals(object obj)
+		{
+			return(false);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode()
+		{
+			return(0);
+		}
+		*/
+
+		[MonoTODO]
+		public virtual char ToLower(char c)
+		{
+			return('X');
+		}
+		
+		[MonoTODO]
+		public virtual string ToLower(string str)
+		{
+			if(str==null) {
+				throw new ArgumentNullException("string is null");
+			}
+			
+			return("");
+		}
+		
+		[MonoTODO]
+		public override string ToString()
+		{
+			return("TextInfo");
+		}
+
+		[MonoTODO]
+		public string ToTitleCase(string str)
+		{
+			if(str==null) {
+				throw new ArgumentNullException("string is null");
+			}
+			
+			return("");
+		}
+
+		[MonoTODO]
+		public virtual char ToUpper(char c)
+		{
+			return('X');
+		}
+
+		[MonoTODO]
+		public virtual string ToUpper(string str)
+		{
+			if(str==null) {
+				throw new ArgumentNullException("string is null");
+			}
+			
+			return("");
+		}
+
+		/* IDeserialization interface */
+		[MonoTODO]
+		void IDeserializationCallback.OnDeserialization(object sender)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Globalization/ThaiBuddhistCalendar.cs b/mcs/class/corlib/System.Globalization/ThaiBuddhistCalendar.cs
new file mode 100644
index 00000000000..e6a5cc5dff7
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/ThaiBuddhistCalendar.cs
@@ -0,0 +1,445 @@
+// ThaiBuddhistCalendar.cs
+//
+// (C) Ulrich Kunitz 2002
+//
+
+namespace System.Globalization {
+
+using System;
+
+/// <summary>
+/// This is the ThaiBudhist calendar. It differs from the Gegorian calendar
+/// only in the year counting.
+/// </summary>
+/// <remarks>
+/// <para>The implementation uses the
+/// <see cref="N:CalendricalCalculations"/> namespace.
+/// </para>
+/// </remarks>
+[Serializable]
+public class ThaiBuddhistCalendar : Calendar {
+	/// <summary>
+	/// Static protected field storing the
+	/// <see cref="T:CalendricalCalculations.GregorianEraHandler"/>.
+	/// </summary>
+	internal static readonly CCGregorianEraHandler M_EraHandler;
+
+	/// <value>
+	/// The standard era for this calendar.
+	/// </value>
+	public const int ThaiBuddhistEra = 1;
+	
+	/// <summary>
+	/// Static constructor, who creates and initializes
+	/// <see cref="F:M_EraHandler"/>.
+	/// </summary>
+	static ThaiBuddhistCalendar() {
+		M_EraHandler = new CCGregorianEraHandler();
+		M_EraHandler.appendEra(ThaiBuddhistEra,
+			CCGregorianCalendar.fixed_from_dmy(1, 1, -542));
+	}
+
+	/// <summary>
+	/// Default constructor.
+	/// </summary>
+	public ThaiBuddhistCalendar() {
+		M_AbbrEraNames = new string[] {"T.B.C.E."};
+		M_EraNames = new string[] {"ThaiBuddhist current era"};
+		if (M_TwoDigitYearMax == 99)
+			M_TwoDigitYearMax = 2572;
+	}
+
+	/// <value>Overridden. Gives the eras supported by the
+	/// calendar as an array of integers.
+	/// </value>
+	public override int[] Eras {
+		get {
+			return (int[])M_EraHandler.Eras.Clone();
+		}
+	}
+
+	/// <summary>
+	/// A protected method checking the era number.
+	/// </summary>
+	/// <param name="era">The era number as reference. It is set
+	/// to <see cref="F:CurrentEra"/>, if the input value is 0.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	internal void M_CheckEra(ref int era) {
+		if (era == CurrentEra)
+			era = ThaiBuddhistEra;
+		if (!M_EraHandler.ValidEra(era))
+			throw new ArgumentException("Era value was not valid.");
+	}
+
+	/// <summary>
+	/// A protected method checking calendar year and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year is outside of
+	/// the supported range.
+	/// </exception>
+	internal int M_CheckYEG(int year, ref int era) {
+		M_CheckEra(ref era);
+		return M_EraHandler.GregorianYear(year, era);
+	}
+
+	/// <summary>
+	/// Checks whether the year is the era is valid, if era = CurrentEra
+	/// the right value is set.
+	/// </summary>
+	/// <param name="year">The year to check.</param>
+	/// <param name="era">The era to check.</Param>
+	/// <exception cref="T:ArgumentOutOfRangeException">
+	/// The exception will be thrown, if the year is not valid.
+	/// </exception>
+	internal override void M_CheckYE(int year, ref int era) {
+		M_CheckYEG(year, ref era);
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar year, month, and
+	/// era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year or month is
+	/// outside of the supported range.
+	/// </exception>
+	internal int M_CheckYMEG(int year, int month, ref int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		if (month < 1 || month > 12)
+			throw new ArgumentOutOfRangeException("month",
+				"Month must be between one and twelve.");
+		return gregorianYear;
+	}
+
+	/// <summary>
+	/// A protected method checking the calendar day, month, and year
+	/// and the era number.
+	/// </summary>
+	/// <param name="year">An integer representing the calendar year.
+	/// </param>
+	/// <param name="month">An integer giving the calendar month.
+	/// </param>
+	/// <param name="day">An integer giving the calendar day.
+	/// </param>
+	/// <param name="era">The era number as reference.</param>
+	/// <exception name="T:System.ArgumentException">
+	/// The exception is thrown if the era is not supported by the class.
+	/// </exception>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown if the calendar year, month, or day is
+	/// outside of the supported range.
+	/// </exception>
+	internal int M_CheckYMDEG(int year, int month, int day, ref int era)
+	{
+		int gregorianYear = M_CheckYMEG(year, month, ref era);
+		M_ArgumentInRange("day", day, 1,
+			GetDaysInMonth(year, month, era));
+		return gregorianYear;
+	}
+
+	/// <summary>
+	/// Overrideden. Adds months to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// months.
+	/// </param>
+	/// <param name="months">The number of months to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="months"/> to the specified
+	/// DateTime.</returns>
+	public override DateTime AddMonths(DateTime time, int months) {
+		return CCGregorianCalendar.AddMonths(time, months);
+	}
+
+	/// <summary>
+	/// Overridden. Adds years to a given date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> to which to add
+	/// years.
+	/// </param>
+	/// <param name="years">The number of years to add.</param>
+	/// <returns>A new <see cref="T:System.DateTime"/> value, that
+	/// results from adding <paramref name="years"/> to the specified
+	/// DateTime.</returns>
+	public override DateTime AddYears(DateTime time, int years) {
+		return CCGregorianCalendar.AddYears(time, years);
+	}
+		
+	/// <summary>
+	/// Overriden. Gets the day of the month from
+	/// <paramref name="time"/>.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public override int GetDayOfMonth(DateTime time) {
+		return CCGregorianCalendar.GetDayOfMonth(time);
+	}
+
+	/// <summary>
+	/// Overriden. Gets the day of the week from the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer giving the day of months, starting with 1.
+	/// </returns>
+	public override DayOfWeek GetDayOfWeek(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		return (DayOfWeek)CCFixed.day_of_week(rd);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the day in the year.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the day of the year,
+	/// starting with 1.</returns>
+	public override int GetDayOfYear(DateTime time) {
+		return CCGregorianCalendar.GetDayOfYear(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days in the specified month
+	/// of the given year and era.
+	/// </summary>
+	/// <param name="year">An integer that gives the year.
+	/// </param>
+	/// <param name="month">An integer that gives the month, starting
+	/// with 1.</param>
+	/// <param name="era">An integer that gives the era of the specified
+	/// year.</param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified month.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if <paramref name="month"/>,
+	/// <paramref name="year"/> ,or <paramref name="era"/> is outside
+	/// the allowed range.
+	/// </exception>
+	public override int GetDaysInMonth(int year, int month, int era) {
+		int gregorianYear = M_CheckYMEG(year, month, ref era);
+		return CCGregorianCalendar.GetDaysInMonth(gregorianYear, month);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of days of the specified
+	/// year of the given era. 
+	/// </summary>
+	/// <param name="year">An integer that specifies the year. 
+	/// </param>
+	/// <param name="era">An ineger that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of days of the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeExceiption">
+	/// The exception is thrown, if
+	/// <paramref name="year"/> or <paramref name="era"/> are outside the
+	/// allowed range.
+	/// </exception>
+	public override int GetDaysInYear(int year, int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		return CCGregorianCalendar.GetDaysInYear(gregorianYear);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the era of the specified date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the era of the calendar.
+	/// </returns>
+	public override int GetEra(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		int era;
+		M_EraHandler.EraYear(out era, rd);
+		return era;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the month of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the month, 
+	/// starting with 1.</returns>
+	public override int GetMonth(DateTime time) {
+		return CCGregorianCalendar.GetMonth(time);
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of months in the specified year 
+	/// and era.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>An integer that gives the number of the months in the
+	/// specified year.</returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or the era are not valid.
+	/// </exception>
+	public override int GetMonthsInYear(int year, int era) {
+		M_CheckYE(year, ref era);
+		return 12;
+	}
+
+	/// <summary>
+	/// Overridden. Gives the number of the year of the specified
+	/// date.
+	/// </summary>
+	/// <param name="time">The
+	/// <see cref="T:System.DateTime"/> that specifies a
+	/// date.
+	/// </param>
+	/// <returns>An integer representing the year, 
+	/// starting with 1.</returns>
+	public override int GetYear(DateTime time) {
+		int rd = CCFixed.FromDateTime(time);
+		int era;
+		return M_EraHandler.EraYear(out era, rd);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given day 
+	/// is a leap day.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given day is a leap
+	/// day.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, day, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapDay(int year, int month, int day, int era)
+	{
+		int gregorianYear = M_CheckYMDEG(year, month, day, ref era);
+		return CCGregorianCalendar.IsLeapDay(gregorianYear, month, day);
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given month 
+	/// is a leap month.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given month is a leap
+	/// month.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year, month, or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapMonth(int year, int month, int era) {
+		M_CheckYMEG(year, month, ref era);
+		return false;
+	}
+
+	/// <summary>
+	/// Overridden. Tells whether the given year
+	/// is a leap year.
+	/// </summary>
+	/// <param name="year">An integer that specifies the year in the
+	/// given era.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A boolean that tells whether the given year is a leap
+	/// year.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if the year or era is not
+	/// valid.
+	/// </exception>
+	public override bool IsLeapYear(int year, int era) {
+		int gregorianYear = M_CheckYEG(year, ref era);
+		return CCGregorianCalendar.is_leap_year(gregorianYear);
+	}
+
+	/// <summary>
+	/// Overridden. Creates the
+	/// <see cref="T:System.DateTime"/> from the parameters.
+	/// </summary>
+	/// <param name="year">An integer that gives the year in the
+	/// <paramref name="era"/>.
+	/// </param>
+	/// <param name="month">An integer that specifies the month.
+	/// </param>
+	/// <param name="day">An integer that specifies the day.
+	/// </param>
+	/// <param name="hour">An integer that specifies the hour.
+	/// </param>
+	/// <param name="minute">An integer that specifies the minute.
+	/// </param>
+	/// <param name="second">An integer that gives the second.
+	/// </param>
+	/// <param name="milliseconds">An integer that gives the
+	/// milliseconds.
+	/// </param>
+	/// <param name="era">An integer that specifies the era.
+	/// </param>
+	/// <returns>A
+	/// <see cref="T:system.DateTime"/> representig the date and time.
+	/// </returns>
+	/// <exception cref="T:System.ArgumentOutOfRangeException">
+	/// The exception is thrown, if at least one of the parameters
+	/// is out of range.
+	/// </exception>
+	public override DateTime ToDateTime(int year, int month, int day,
+		int hour, int minute, int second, int milliseconds,
+		int era)
+	{
+		int gregorianYear = M_CheckYMDEG(year, month, day, ref era);
+		M_CheckHMSM(hour, minute, second, milliseconds);
+		return CCGregorianCalendar.ToDateTime(
+			gregorianYear, month, day,
+			hour, minute, second, milliseconds);
+	}
+} // class ThaiBuddhistCalendar
+	
+} // namespace System.Globalization
diff --git a/mcs/class/corlib/System.Globalization/UnicodeCategory.cs b/mcs/class/corlib/System.Globalization/UnicodeCategory.cs
new file mode 100644
index 00000000000..2db258b3743
--- /dev/null
+++ b/mcs/class/corlib/System.Globalization/UnicodeCategory.cs
@@ -0,0 +1,44 @@
+//
+// System.Globalization.UnicodeCategory.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Globalization {
+
+	public enum UnicodeCategory {
+		UppercaseLetter         =  0,
+		LowercaseLetter         =  1,
+		TitlecaseLetter         =  2,
+		ModifierLetter          =  3,
+		OtherLetter             =  4,
+		NonSpacingMark          =  5,
+		SpacingCombiningMark    =  6,
+		EnclosingMark           =  7,
+		DecimalDigitNumber      =  8,
+		LetterNumber            =  9,
+		OtherNumber             = 10,
+		SpaceSeparator          = 11,
+		LineSeparator           = 12,
+		ParagraphSeparator      = 13,
+		Control                 = 14,
+		Format                  = 15,
+		Surrogate               = 16,
+		PrivateUse              = 17,
+		ConnectorPunctuation    = 18,
+		DashPunctuation         = 19,
+		OpenPunctuation         = 20,
+		ClosePunctuation        = 21,
+		InitialQuotePunctuation = 22,
+		FinalQuotePunctuation   = 23,
+		OtherPunctuation        = 24,
+		MathSymbol              = 25,
+		CurrencySymbol          = 26,
+		ModifierSymbol          = 27,
+		OtherSymbol             = 28,
+		OtherNotAssigned        = 29,
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog b/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog
new file mode 100644
index 00000000000..da93dff9265
--- /dev/null
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/ChangeLog
@@ -0,0 +1,19 @@
+2002-02-19  Duncan Mak  <duncan@ximian.com>
+
+	* IsolatedStorageFileStream.cs: Added MonoTODO here. This class
+	is completely stubbed out (over the summer) and didn't get
+	properly MonoTODO'd.
+
+2002-02-08  Duncan Mak  <duncan@ximian.com>
+
+	* IsolatedStorage.cs: Looked at MemberInfo.cs, another fellow
+	abstract class. Oh, that's what it means! Removed unnesscessary
+	MonoTODO attributes.
+
+2002-02-07  Duncan Mak  <duncan@ximian.com>
+
+	* IsolatedStorage.cs: Added to CVS, stubbed out the API.
+	* IsolatedStorageException.cs: Implemented.
+
+2002-01-07  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Created INormalizeForIsolatedStorage
diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/INormalizeForIsolatedStorage.cs b/mcs/class/corlib/System.IO.IsolatedStorage/INormalizeForIsolatedStorage.cs
new file mode 100644
index 00000000000..56d9069d48e
--- /dev/null
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/INormalizeForIsolatedStorage.cs
@@ -0,0 +1,18 @@
+//
+// System.IO.IsolatedStorage.INormalizeForIsolatedStorage
+//
+// author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (c) 2002 Duco Fijma
+//
+
+namespace System.IO.IsolatedStorage {
+
+public interface INormalizeForIsolatedStorage {
+
+	object Normalize ();
+
+}
+
+}
diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs
new file mode 100644
index 00000000000..8a73db56cd8
--- /dev/null
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorage.cs
@@ -0,0 +1,78 @@
+//

+// System.IO.IsolatedStorage.cs

+//

+// Author: Duncan Mak (duncan@ximian.com)

+//

+// (C) Ximian, Inc. http://www.ximian.com

+//

+

+using System.Security;

+using System.Security.Permissions;

+

+namespace System.IO.IsolatedStorage

+{

+	public abstract class IsolatedStorage : MarshalByRefObject

+	{

+		// Constructor

+		protected IsolatedStorage ()

+			: base ()

+		{

+		}

+

+		// Properties

+		[MonoTODO]

+		public object AssemblyIdentity

+		{

+			get { return null; }

+		}

+

+		[CLSCompliant (false)]

+		[MonoTODO]

+		public virtual ulong CurrentSize

+		{

+			get { return 0; }

+		}

+

+		[MonoTODO]

+		public object DomainIdentity

+		{

+			get { return null; }

+		}

+

+		[CLSCompliant (false)]

+		[MonoTODO]

+		public virtual ulong MaximumSize

+		{

+			get { return 0; }

+		}

+

+		[MonoTODO]

+		public IsolatedStorageScope Scope

+		{

+			get { return 0; }

+		}

+

+		[MonoTODO]

+		protected virtual char SeparatorExternal

+		{

+			get { return Char.MinValue; }

+		}

+

+		[MonoTODO]

+		protected virtual char SeparatorInternal

+		{

+			get { return Char.MinValue; }

+		}

+

+		// Methods

+		protected abstract IsolatedStoragePermission GetPermission (PermissionSet ps);

+

+		[MonoTODO]

+		protected void InitStore (IsolatedStorageScope scope, Type domainEvidenceType,

+					  Type assemblyEvidenceType)

+		{

+		}

+

+		public abstract void Remove ();

+	}

+}

diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageException.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageException.cs
new file mode 100644
index 00000000000..51268d65550
--- /dev/null
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageException.cs
@@ -0,0 +1,37 @@
+//
+// System.IO.IsolatedStorage.IsolatedstorageException
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) 2002, Ximian, Inc. http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.IO.IsolatedStorage
+{
+	[Serializable]
+		public class IsolatedStorageException : Exception
+	{
+		public IsolatedStorageException ()
+			: base (Locale.GetText ("An Isolated storage operation failed."))
+		{
+		}
+
+		public IsolatedStorageException (string message)
+			: base (message)
+		{
+		}
+
+		public IsolatedStorageException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected IsolatedStorageException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs
new file mode 100644
index 00000000000..a8ca0e96fe7
--- /dev/null
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageFileStream.cs
@@ -0,0 +1,19 @@
+// System.IO.IsolatedStorage.IsolatedStorageFileStream
+//
+// Sean MacIsaac (macisaac@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+
+using System.IO;
+
+namespace System.IO.IsolatedStorage
+{
+	[MonoTODO]
+	public class IsolatedStorageFileStream : FileStream
+	{
+		public IsolatedStorageFileStream (string name, FileMode mode)
+			: base(name, mode)
+		{
+		}	
+	}
+}
diff --git a/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs
new file mode 100755
index 00000000000..84bb413c45c
--- /dev/null
+++ b/mcs/class/corlib/System.IO.IsolatedStorage/IsolatedStorageScope.cs
@@ -0,0 +1,38 @@
+// IsolatedStorageScope.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:41:21 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.IO.IsolatedStorage {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum IsolatedStorageScope {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		User = 1,
+
+		/// <summary>
+		/// </summary>
+		Domain = 2,
+
+		/// <summary>
+		/// </summary>
+		Assembly = 4,
+	} // IsolatedStorageScope
+
+} // System.IO.IsolatedStorage
diff --git a/mcs/class/corlib/System.IO/BinaryReader.cs b/mcs/class/corlib/System.IO/BinaryReader.cs
new file mode 100644
index 00000000000..99440967b74
--- /dev/null
+++ b/mcs/class/corlib/System.IO/BinaryReader.cs
@@ -0,0 +1,386 @@
+//
+// System.IO.BinaryReader
+//
+// Author:
+//   Matt Kimball (matt@kimball.net)
+//   Dick Porter (dick@ximian.com)
+//
+
+using System;
+using System.Text;
+using System.Globalization;
+
+namespace System.IO {
+	public class BinaryReader : IDisposable {
+		Stream m_stream;
+		Encoding m_encoding;
+		int m_encoding_max_byte;
+
+		byte[] m_buffer;
+
+		public BinaryReader(Stream input) : this(input, Encoding.UTF8) {
+		}
+
+		public BinaryReader(Stream input, Encoding encoding) {
+			if (input == null || encoding == null) 
+				throw new ArgumentNullException(Locale.GetText ("Input or Encoding is a null reference."));
+			if (!input.CanRead)
+				throw new ArgumentException(Locale.GetText ("The stream doesn't support reading."));
+
+			m_stream = input;
+			m_encoding = encoding;
+			m_encoding_max_byte = m_encoding.GetMaxByteCount(1);
+			m_buffer = new byte [32];
+		}
+
+		public virtual Stream BaseStream {
+			get {
+				return m_stream;
+			}
+		}
+
+		public virtual void Close() {
+			Dispose (true);
+		}
+		
+		protected virtual void Dispose (bool disposing)
+		{
+			if (disposing)
+				m_stream.Close ();
+
+			m_buffer = null;
+		}
+
+		void IDisposable.Dispose() 
+		{
+			Dispose (true);
+		}
+
+		protected virtual void FillBuffer(int bytes) {
+			if(m_stream==null) {
+				throw new IOException("Stream is invalid");
+			}
+			
+			CheckBuffer(bytes);
+
+			/* Cope with partial reads */
+			int pos=0;
+			while(pos<bytes) {
+				int n=m_stream.Read(m_buffer, pos, bytes-pos);
+				if(n==0) {
+					throw new EndOfStreamException();
+				}
+
+				pos+=n;
+			}
+		}
+
+		public virtual int PeekChar() {
+			if(m_stream==null) {
+				throw new IOException("Stream is invalid");
+			}
+
+			if(!m_stream.CanSeek) {
+				return(-1);
+			}
+
+			long pos=m_stream.Position;
+			int ch=Read();
+			m_stream.Position=pos;
+
+			return(ch);
+		}
+
+		public virtual int Read() {
+			char[] decode = new char[1];
+
+			int count=Read(decode, 0, 1);
+			if(count==0) {
+				/* No chars available */
+				return(-1);
+			}
+			
+			return decode[0];
+		}
+
+		public virtual int Read(byte[] buffer, int index, int count) {
+			if(m_stream==null) {
+				throw new IOException("Stream is invalid");
+			}
+			
+			if (buffer == null) {
+				throw new ArgumentNullException("buffer is null");
+			}
+			if (buffer.Length - index < count) {
+				throw new ArgumentException("buffer is too small");
+			}
+			if (index < 0) {
+				throw new ArgumentOutOfRangeException("index is less than 0");
+			}
+			if (count < 0) {
+				throw new ArgumentOutOfRangeException("count is less than 0");
+			}
+
+			int bytes_read=m_stream.Read(buffer, index, count);
+
+			return(bytes_read);
+		}
+
+		public virtual int Read(char[] buffer, int index, int count) {
+			if(m_stream==null) {
+				throw new IOException("Stream is invalid");
+			}
+			
+			if (buffer == null) {
+				throw new ArgumentNullException("buffer is null");
+			}
+			if (buffer.Length - index < count) {
+				throw new ArgumentException("buffer is too small");
+			}
+			if (index < 0) {
+				throw new ArgumentOutOfRangeException("index is less than 0");
+			}
+			if (count < 0) {
+				throw new ArgumentOutOfRangeException("count is less than 0");
+			}
+
+			int chars_read=0;
+			int bytes_read=0;
+			
+			while(chars_read < count) {
+				CheckBuffer(bytes_read);
+
+				int read_byte=m_stream.ReadByte();
+				if(read_byte==-1) {
+					/* EOF */
+					return(chars_read);
+				}
+
+				m_buffer[bytes_read]=(byte)read_byte;
+				bytes_read++;
+				
+				chars_read=m_encoding.GetChars(m_buffer, 0,
+							       bytes_read,
+							       buffer, index);
+				
+			}
+
+			return(chars_read);
+		}
+
+		protected int Read7BitEncodedInt() {
+			int ret = 0;
+			int shift = 0;
+			byte b;
+
+			do {
+				b = ReadByte();
+				
+				ret = ret | ((b & 0x7f) << shift);
+				shift += 7;
+			} while ((b & 0x80) == 0x80);
+
+			return ret;
+		}
+
+		public virtual bool ReadBoolean() {
+			FillBuffer(1);
+
+			// Return value:
+			//  true if the byte is non-zero; otherwise false.
+			return(m_buffer[0] != 0);
+		}
+
+		public virtual byte ReadByte() {
+			FillBuffer(1);
+
+			return(m_buffer[0]);
+		}
+
+		public virtual byte[] ReadBytes(int count) {
+			if(m_stream==null) {
+				throw new IOException("Stream is invalid");
+			}
+			
+			if (count < 0) {
+				throw new ArgumentOutOfRangeException("count is less than 0");
+			}
+
+			/* Can't use FillBuffer() here, because it's OK to
+			 * return fewer bytes than were requested
+			 */
+
+			byte[] buf = new byte[count];
+			int pos=0;
+			
+			while(pos < count) {
+				int n=m_stream.Read(buf, pos, count-pos);
+				if(n==0) {
+					/* EOF */
+					break;
+				}
+
+				pos+=n;
+			}
+				
+			if (pos!=count) {
+				byte[] new_buffer=new byte[pos];
+				Array.Copy(buf, new_buffer, pos);
+				return(new_buffer);
+			}
+			
+			return(buf);
+		}
+
+		public virtual char ReadChar() {
+			int ch=Read();
+
+			if(ch==-1) {
+				throw new EndOfStreamException();
+			}
+
+			return((char)ch);
+		}
+
+		public virtual char[] ReadChars(int count) {
+			if (count < 0) {
+				throw new ArgumentOutOfRangeException("count is less than 0");
+			}
+
+			char[] full = new char[count];
+			int chars = Read(full, 0, count);
+			
+			if (chars == 0) {
+				throw new EndOfStreamException();
+			} else if (chars != full.Length) {
+				char[] ret = new char[chars];
+				Array.Copy(full, 0, ret, 0, chars);
+				return ret;
+			} else {
+				return full;
+			}
+		}
+
+		unsafe public virtual decimal ReadDecimal() {
+			FillBuffer(16);
+
+			decimal ret;
+			byte* ret_ptr = (byte *)&ret;
+			for (int i = 0; i < 16; i++) {
+				ret_ptr[i] = m_buffer[i];
+			}
+
+			return ret;
+		}
+
+		public virtual double ReadDouble() {
+			FillBuffer(8);
+
+			return(BitConverter.ToDouble(m_buffer, 0));
+		}
+
+		public virtual short ReadInt16() {
+			FillBuffer(2);
+
+			return((short) (m_buffer[0] | (m_buffer[1] << 8)));
+		}
+
+		public virtual int ReadInt32() {
+			FillBuffer(4);
+
+			return(m_buffer[0] | (m_buffer[1] << 8) |
+			       (m_buffer[2] << 16) | (m_buffer[3] << 24));
+		}
+
+		public virtual long ReadInt64() {
+			FillBuffer(8);
+
+			uint ret_low  = (uint) (m_buffer[0]            |
+			                       (m_buffer[1] << 8)  |
+			                       (m_buffer[2] << 16) |
+			                       (m_buffer[3] << 24)
+			                       );
+			uint ret_high = (uint) (m_buffer[4]        |
+			                       (m_buffer[5] << 8)  |
+			                       (m_buffer[6] << 16) |
+			                       (m_buffer[7] << 24)
+			                       );
+			return (long) ((((ulong) ret_high) << 32) | ret_low);
+		}
+
+		[CLSCompliant(false)]
+		public virtual sbyte ReadSByte() {
+			FillBuffer(1);
+
+			return((sbyte)m_buffer[0]);
+		}
+
+		public virtual string ReadString() {
+			/* Inspection of BinaryWriter-written files
+			 * shows that the length is given in bytes,
+			 * not chars
+			 */
+			int len = Read7BitEncodedInt();
+
+			FillBuffer(len);
+			
+			char[] str = m_encoding.GetChars(m_buffer, 0, len);
+
+			return(new String(str));
+		}
+
+		public virtual float ReadSingle() {
+			FillBuffer(4);
+
+			return(BitConverter.ToSingle(m_buffer, 0));
+		}
+
+		[CLSCompliant(false)]
+		public virtual ushort ReadUInt16() {
+			FillBuffer(2);
+
+			return((ushort) (m_buffer[0] | (m_buffer[1] << 8)));
+		}
+
+		[CLSCompliant(false)]
+		public virtual uint ReadUInt32() {
+			FillBuffer(4);
+				
+
+			return((uint) (m_buffer[0] |
+				       (m_buffer[1] << 8) |
+				       (m_buffer[2] << 16) |
+				       (m_buffer[3] << 24)));
+		}
+
+		[CLSCompliant(false)]
+		public virtual ulong ReadUInt64() {
+			FillBuffer(8);
+
+			uint ret_low  = (uint) (m_buffer[0]            |
+			                       (m_buffer[1] << 8)  |
+			                       (m_buffer[2] << 16) |
+			                       (m_buffer[3] << 24)
+			                       );
+			uint ret_high = (uint) (m_buffer[4]        |
+			                       (m_buffer[5] << 8)  |
+			                       (m_buffer[6] << 16) |
+			                       (m_buffer[7] << 24)
+			                       );
+			return (((ulong) ret_high) << 32) | ret_low;
+		}
+
+		/* Ensures that m_buffer is at least length bytes
+		 * long, growing it if necessary
+		 */
+		private void CheckBuffer(int length)
+		{
+			if(m_buffer.Length <= length) {
+				byte[] new_buffer=new byte[length];
+				Array.Copy(m_buffer, new_buffer,
+					   m_buffer.Length);
+				m_buffer=new_buffer;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.IO/BinaryWriter.cs b/mcs/class/corlib/System.IO/BinaryWriter.cs
new file mode 100755
index 00000000000..273077d98c2
--- /dev/null
+++ b/mcs/class/corlib/System.IO/BinaryWriter.cs
@@ -0,0 +1,206 @@
+//
+// System.IO.BinaryWriter
+//
+// Author:
+//   Matt Kimball (matt@kimball.net)
+//
+
+using System;
+using System.Text;
+using System.Globalization;
+
+namespace System.IO {
+	[Serializable]
+	public class BinaryWriter : IDisposable {
+
+		// Null is a BinaryWriter with no backing store.
+		public static readonly BinaryWriter Null;
+
+		protected Stream OutStream;
+		private Encoding m_encoding;
+		private byte [] buffer;
+
+		static BinaryWriter() {
+			Null = new BinaryWriter();
+		}
+
+		protected BinaryWriter() : this (Stream.Null, Encoding.UTF8) {
+		}
+
+		public BinaryWriter(Stream output) : this(output, Encoding.UTF8) {
+		}
+
+		public BinaryWriter(Stream output, Encoding encoding) {
+			if (output == null || encoding == null) 
+				throw new ArgumentNullException(Locale.GetText ("Output or Encoding is a null reference."));
+			if (!output.CanWrite)
+				throw new ArgumentException(Locale.GetText ("Stream does not support writing or already closed."));
+
+			OutStream = output;
+			m_encoding = encoding;
+			buffer = new byte [16];
+		}
+
+		public virtual Stream BaseStream {
+			get {
+				return OutStream;
+			}
+		}
+
+		public virtual void Close() {
+			Dispose (true);
+		}
+
+		void IDisposable.Dispose() {
+			Dispose (true);
+		}
+
+		protected virtual void Dispose (bool disposing)
+		{
+			if (disposing)
+			{
+				OutStream.Close();
+				//OutStream.Dispose();			
+			}
+		}
+
+		public virtual void Flush() {
+			OutStream.Flush();
+		}
+
+		public virtual long Seek(int offset, SeekOrigin origin) {
+			return OutStream.Seek(offset, origin);
+		}
+
+		public virtual void Write(bool value) {
+			buffer [0] = (byte) (value ? 1 : 0);
+			OutStream.Write(buffer, 0, 1);
+		}
+
+		public virtual void Write(byte value) {
+			OutStream.WriteByte(value);
+		}
+
+		public virtual void Write(byte[] value) {
+			if (value == null)
+				throw new ArgumentNullException(Locale.GetText ("Byte buffer is a null reference."));
+			OutStream.Write(value, 0, value.Length);
+		}
+
+		public virtual void Write(byte[] value, int offset, int length) {
+			if (value == null)
+				throw new ArgumentNullException(Locale.GetText ("Byte buffer is a null reference."));
+			OutStream.Write(value, offset, length);
+		}
+
+		public virtual void Write(char value) {
+			char[] dec = new char[1];
+			dec[0] = value;
+			byte[] enc = m_encoding.GetBytes(dec, 0, 1);
+			OutStream.Write(enc, 0, enc.Length);
+		}
+		
+		public virtual void Write(char[] value) {
+			if (value == null)
+				throw new ArgumentNullException(Locale.GetText ("Chars is a null reference."));
+			byte[] enc = m_encoding.GetBytes(value, 0, value.Length);
+			OutStream.Write(enc, 0, enc.Length);
+		}
+
+		public virtual void Write(char[] value, int offset, int length) {
+			if (value == null)
+				throw new ArgumentNullException(Locale.GetText ("Chars is a null reference."));
+			byte[] enc = m_encoding.GetBytes(value, offset, length);
+			OutStream.Write(enc, 0, enc.Length);
+		}
+
+		unsafe public virtual void Write(decimal value) {
+			byte* value_ptr = (byte *)&value;
+			for (int i = 0; i < 16; i++) {
+				buffer [i] = value_ptr [i];
+			}
+
+			OutStream.Write(buffer, 0, 16);
+		}
+
+		public virtual void Write(double value) {
+			OutStream.Write(BitConverter.GetBytes(value), 0, 8);
+		}
+		
+		public virtual void Write(short value) {
+			buffer [0] = (byte) value;
+			buffer [1] = (byte) (value >> 8);
+			OutStream.Write(buffer, 0, 2);
+		}
+		
+		public virtual void Write(int value) {
+			buffer [0] = (byte) value;
+			buffer [1] = (byte) (value >> 8);
+			buffer [2] = (byte) (value >> 16);
+			buffer [3] = (byte) (value >> 24);
+			OutStream.Write(buffer, 0, 4);
+		}
+
+		public virtual void Write(long value) {
+			for (int i = 0, sh = 0; i < 8; i++, sh += 8)
+				buffer [i] = (byte) (value >> sh);
+			OutStream.Write(buffer, 0, 8);
+		}
+
+		[CLSCompliant(false)]
+		public virtual void Write(sbyte value) {
+			buffer [0] = (byte) value;
+			OutStream.Write(buffer, 0, 1);
+		}
+
+		public virtual void Write(float value) {
+			OutStream.Write(BitConverter.GetBytes(value), 0, 4);
+		}
+
+		public virtual void Write(string value) {
+			/* The length field is the byte count, not the
+			 * char count
+			 */
+			byte[] enc = m_encoding.GetBytes(value);
+			Write7BitEncodedInt(enc.Length);
+			OutStream.Write(enc, 0, enc.Length);
+		}
+
+		[CLSCompliant(false)]
+		public virtual void Write(ushort value) {
+			buffer [0] = (byte) value;
+			buffer [1] = (byte) (value >> 8);
+			OutStream.Write(buffer, 0, 2);
+		}
+
+		[CLSCompliant(false)]
+		public virtual void Write(uint value) {
+			buffer [0] = (byte) value;
+			buffer [1] = (byte) (value >> 8);
+			buffer [2] = (byte) (value >> 16);
+			buffer [3] = (byte) (value >> 24);
+			OutStream.Write(buffer, 0, 4);
+		}
+
+		[CLSCompliant(false)]
+		public virtual void Write(ulong value) {
+			for (int i = 0, sh = 0; i < 8; i++, sh += 8)
+				buffer [i] = (byte) (value >> sh);
+			OutStream.Write(buffer, 0, 8);
+		}
+
+		protected void Write7BitEncodedInt(int value) {
+			do {
+				int high = (value >> 7) & 0x01ffffff;
+				byte b = (byte)(value & 0x7f);
+
+				if (high != 0) {
+					b = (byte)(b | 0x80);
+				}
+
+				Write(b);
+				value = high;
+			} while(value != 0);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.IO/BufferedStream.cs b/mcs/class/corlib/System.IO/BufferedStream.cs
new file mode 100644
index 00000000000..12039be8b75
--- /dev/null
+++ b/mcs/class/corlib/System.IO/BufferedStream.cs
@@ -0,0 +1,162 @@
+//
+// System.IO.BufferedStream
+//
+// Author:
+//   Matt Kimball (matt@kimball.net)
+//
+
+namespace System.IO {
+	public sealed class BufferedStream : Stream {
+		Stream m_stream;
+		byte[] m_buffer;
+		int m_buffer_pos;
+		int m_buffer_read_ahead;
+		bool m_buffer_reading;
+
+		public BufferedStream(Stream stream) : this(stream, 4096) {
+		}
+
+		public BufferedStream(Stream stream, int buffer_size) {
+			m_stream = stream;
+			m_buffer = new byte[buffer_size];
+		}
+
+		public override bool CanRead {
+			get {
+				return m_stream.CanRead;
+			}
+		}
+
+		public override bool CanWrite {
+			get {
+				return m_stream.CanWrite;
+			}
+		}
+
+		public override bool CanSeek {
+			get {
+				return m_stream.CanSeek;
+			}
+		}
+
+		public override long Length {
+			get {
+				return m_stream.Length;
+			}
+		}
+		
+		public override long Position {
+			get {
+				return m_stream.Position - m_buffer_read_ahead + m_buffer_pos;
+			}
+
+			set {
+				Flush();
+				m_stream.Position = value;
+			}
+		}
+
+		public override void Close() {
+			Flush();
+			m_stream.Close();
+			m_stream = null;
+			m_buffer = null;
+		}
+
+		public override void Flush() {
+			if (m_buffer_reading) {
+				m_stream.Position = Position;
+			} else {
+				m_stream.Write(m_buffer, 0, m_buffer_pos);
+			}
+
+			m_buffer_read_ahead = 0;
+			m_buffer_pos = 0;
+		}
+
+		public override long Seek(long offset, SeekOrigin origin) {
+			Flush();
+			return m_stream.Seek(offset, origin);
+		}
+
+		public override void SetLength(long value) {
+			m_stream.SetLength(value);
+		}
+
+		public override int ReadByte() {
+			byte[] b = new byte[1];
+
+			if (Read(b, 0, 1) == 1) {
+				return b[0];
+			} else {
+				return -1;
+			}
+		}
+
+		public override void WriteByte(byte value) {
+			byte[] b = new byte[1];
+
+			b[0] = value;
+			Write(b, 0, 1);
+		}
+
+		public override int Read(byte[] array, int offset, int count) {
+			if (!m_buffer_reading) {
+				Flush();
+				m_buffer_reading = true;
+			}
+
+			if (count <= m_buffer_read_ahead - m_buffer_pos) {
+				Array.Copy(m_buffer, m_buffer_pos, array, offset, count);
+
+				m_buffer_pos += count;
+				if (m_buffer_pos == m_buffer_read_ahead) {
+					m_buffer_pos = 0;
+					m_buffer_read_ahead = 0;
+				}
+
+				return count;
+			}
+
+			int ret = m_buffer_read_ahead - m_buffer_pos;
+			Array.Copy(m_buffer, m_buffer_pos, array, offset, ret);
+			m_buffer_pos = 0;
+			m_buffer_read_ahead = 0;
+			offset += ret;
+			count -= ret;
+
+			if (count >= m_buffer.Length) {
+				ret += m_stream.Read(array, offset, count);
+			} else {
+				m_buffer_read_ahead = m_stream.Read(m_buffer, 0, m_buffer.Length);
+				
+				if (count < m_buffer_read_ahead) {
+					Array.Copy(m_buffer, 0, array, offset, count);
+					m_buffer_pos = count;
+					ret += count;
+				} else {
+					Array.Copy(m_buffer, 0, array, offset, m_buffer_read_ahead);
+					ret += m_buffer_read_ahead;
+					m_buffer_read_ahead = 0;
+				}
+			}
+
+			return ret;
+		}
+
+		public override void Write(byte[] array, int offset, int count) {
+			if (m_buffer_reading) {
+				Flush();
+				m_buffer_reading = false;
+			}
+
+			if (m_buffer_pos + count >= m_buffer.Length) {
+				Flush();
+				m_stream.Write(array, offset, count);
+			} else {
+				Array.Copy(array, offset, m_buffer, m_buffer_pos, count);
+				m_buffer_pos += count;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.IO/ChangeLog b/mcs/class/corlib/System.IO/ChangeLog
new file mode 100644
index 00000000000..013597d664e
--- /dev/null
+++ b/mcs/class/corlib/System.IO/ChangeLog
@@ -0,0 +1,494 @@
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* FileLoadException.cs: implemented ToString.
+
+	* StreamWriter.cs: added Null field and implemented Write (char) and
+	Write (char []).
+
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* StreamReader.cs: implemented NullStreamReader.
+
+2002-08-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* Path.cs (GetDirectoryName): Fix for filenames with size = 1
+
+	* File.cs: Removed all references that threw exceptions when the
+	paths contains a colon, as this is a valid part of an identifier
+	on Unix.
+
+	Everywhere: The String.Empty return from GetDirectoryName means
+	that there is no directory information about the path.
+
+2002-08-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* FileNotFoundException.cs: use Message and InnerException from base
+	class. Changed Message and ToString ().
+
+2002-08-19  Dick Porter  <dick@ximian.com>
+
+	* BinaryWriter.cs: The length of a string is counted in bytes, not
+	chars
+
+2002-08-18  Dick Porter  <dick@ximian.com>
+
+	* BinaryReader.cs: Fixed buffering
+
+2002-08-09  Nick Drochak  <ndrochak@gol.com>
+
+	* BinaryReader.cs: added virtual to Dispose(bool).
+
+2002-08-03  Jason Diamond  <jason@injektilo.org>
+
+	* StringWriter.cs: Return UnicodeEncoding for Encoding property.
+
+2002-08-03  Jason Diamond  <jason@injektilo.org>
+
+	* StreamWriter.cs: Use GetByteCount() to get exact length instead
+	of GetMaxByteCount when converting chars to bytes.
+
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+
+	* StreamReader.cs: 
+	(Dispose): Added and implmented.
+
+	* StreamWriter.cs: 
+	(Dispose): Fixed visibility.
+	(Initialize): Fixed visibility, made internal.
+
+	* BinaryReader.cs:
+	(Dispose): Fixed visibility.
+
+2002-07-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* File.cs:
+	(Create): allow file names without path.
+
+Fri Jul 26 15:45:04 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* FileStream.cs: patch from erik@bagfors.nu to add
+	Name property support.
+
+2002-07-20  Dick Porter  <dick@ximian.com>
+
+	* MonoIO.cs: Added icall to CreatePipe
+
+2002-07-18  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* FileInfo.cs: fixes buglet #27940
+
+2002-07-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Path.cs: removed unneeded line from GetExtension.
+
+2002-07-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* FileStream.cs:
+	(.ctor): call MonoIO.GetException with the file name.
+
+2002-07-02  Mike Kestner  <mkestner@speakeasy.net>
+
+	* StreamReader.cs: Guard against ^\n lines as pointed out by Gonzalo.
+
+2002-07-02  Mike Kestner  <mkestner@speakeasy.net>
+
+	* StreamReader.cs: Revert the last Peek change and fix the ReadLine
+	end of line detection code instead.
+
+2002-07-02  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* StreamReader.cs:
+	(Peek): no need to have seek capabilitites. 
+
+2002-06-17  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Path.cs (ChangeExtension): handle some special cases (fixes bug #25319)
+
+	* File.cs (Delete): only call Directory.Exists() if DirName != ""
+
+2002-06-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Directory.cs: fixed bug #26133 and also test if the directory exist
+	before performing the search.
+
+2002-06-12  Nick Drochak  <ndrochak@gol.com>
+
+	* StringReader.cs (ReadLine): Return null when we get to end of the
+	string.
+
+2002-05-22  Lawrence Pit  <loz@cable.a2000.nl>
+
+	* StreamWriter.cs: added ability to write null value
+	
+2002-05-19  Lawrence Pit  <loz@cable.a2000.nl>
+
+	* Stream.cs: NullStream.ReadByte now returns -1 instead of 0 to
+	prevent endless loops.
+
+2002-05-17  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* FileStream.cs: Enforce lower bound on buffer size.
+
+2002-05-16  Piers Haken <piersh@friskit.com>
+
+	* Stream.cs: Implement synchronous {Begin|End}{Read|Write}() methods.
+
+2002-05-17  Nick Drochak  <ndrochak@gol.com>
+
+	* StreamWriter.cs: Implement buffering.  Also implemented dispose
+	pattern as recommended by the MS docs.  Must call Close() now
+	to ensure the buffer is flushed.
+
+2002-05-15  Nick Drochak  <ndrochak@gol.com>
+
+	* Path.cs (GetDirectoryName): Return String.Empty if there is no
+	directory
+
+	* StreamReader.cs: Add some parameter checking on file names.
+
+	* StreamWriter.cs: Add some parameter checking on file names.
+
+2002-05-14 Nick Drochak  <ndrochak@gol.com>
+
+	* File.cs: Add parameter checks to most methods. Not completely done,
+	but all current unit tests pass.
+
+	* Path.cs: Implement GetTempFileName().
+
+2002-05-10  Nick Drochak  <ndrochak@gol.com>
+
+	* StreamWriter.cs (Flush): Throw proper exception if internal stream
+	has already been closed when we try to flush.
+
+2002/05/10  Nick Drochak <ndrochak@gol.com>
+
+	* FileNotFoundException.cs (ToString): Don't try to use the inner
+	exception, because it might be null.  Use the message instead.
+
+2002-05-09  Nick Drochak  <ndrochak@gol.com>
+
+	* File.cs (Delete): Do not throw an exception if the file does not
+	exist.
+
+2002-05-08  Mike Gray     <mikeg@mikegray.org>
+
+	* File.cs: According to ECMA spec and MS docs Copy(src, dest)
+        should not overwrite dest by default.
+
+2002-05-08  Nick Drochak  <ndrochak@gol.com>
+
+	* StreamWriter.cs: Add paramter check to constructors and throw
+	exceptions where appropriate.
+
+Tue May 7 11:47:46 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* StreamReader.cs: return the number of chars read even if we diddn't
+	fill the whole buffer (makes Sergey's ilasm work with mono).
+
+2002-05-07  Mike Gray     <mikeg_us@hotmail.com> 
+
+	* FileInfo.cs (Create): Implement missing method.
+
+2002-05-07  Mike Gray     <mikeg_us@hotmail.com>
+
+	* File.cs: Implemented CreateText method, and fixed dst compares
+	to compare against "" instead of null twice.
+
+2002-05-05  Nick Drochak  <ndrochak@gol.com>
+
+	* StreamReader.cs: Throw exceptions where needed. Changed Null field to
+	use new internal class since null cannot be passed to constructor 
+	anymore. Also, fix a coule of small bugs.
+
+2002-05-03  Nick Drochak  <ndrochak@gol.com>
+
+	* MemoryStream.cs: Refrain from allocating array until the space is
+	really needed. This fixes a bug in the Length property when the
+	constructor without the byte array is used.
+
+2002-05-01  Duncan Mak  <duncan@ximian.com>
+
+	* DirectoryNotFoundException.cs (constructor): Added missing
+	serialization constructor.
+
+2002-04-30  Duncan Mak  <duncan@ximian.com>
+
+	* FileLoadException.cs (constructors): Added missing (string,
+	string) ctor, as well as (string, string, Exception) ctor.
+
+	(Message): Added more info to the error message
+
+	(ToString): Added. We'll need to add the StackTrace stuff when
+	that works.
+
+	* FileShare.cs: Add a missing field, Inheritable.
+	
+	* TextReader.cs: Renamed Synchronised method to Synchronized.
+
+	* TextWriter.cs: Renamed Synchronised method to Synchronized.
+	Renamed protected member coreNewLine to CoreNewLine.
+
+2002-04-30  Sergey Chaban  <serge@wildwestsoftware.com>
+
+	* BinaryReader.cs: Allocate buffer before its first use.
+	Handle end of stream properly. Methods to read native types
+	(ReadInt* etc.) are little-endian (see Compact Framework docs).
+
+	* BinaryWriter.cs: Store data in little-endian format.
+	Use internal buffer for conversions.
+
+2002-03-31  Dick Porter  <dick@ximian.com>
+
+	* Directory.cs: Strip out "." and ".." from returned list
+
+	* FileAttributes.cs: Get the right enum values
+
+2002-03-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* TextWriter.cs (write): added check for null
+
+2002-03-28  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* Directory.cs: Throws DirectoryNotFoundException.
+	* MonoIO.cs: Fixed to work around enum problem.
+
+2002-03-27  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* StreamReader.cs: Implemented ReadLine() and ReadEnd().
+
+2002-03-27  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* Directory.cs, File.cs, FileSystemInfo.cs, FileInfo.cs,
+	DirectoryInfo.cs, Path.cs: Modified to use MonoIO class instead of
+	wrapper and PAL classes.
+
+	* MonoIO.cs, MonoIOStat.cs, MonoIOError.cs: Added.
+
+2002-03-25  Mike Kestner <mkestner@speakeasy.net>
+
+	* MemoryStream.cs (Read): Fixed bug in exception throw.
+
+2002-03-24  Mike Kestner <mkestner@speakeasy.net>
+
+	* StreamReader.cs (ReadBuffer): Fix buffer merging bugs.
+
+2002-03-23  Martin Baulig  <martin@gnome.org>
+
+	* StreamReader.cs: Always do buffered reading, use 4k blocks.
+	(Read (char[], int, int)): Implemented.
+	(DiscardBufferedData): Implemented.
+
+2002-03-21  Mike Kestner <mkestner@speakeasy.net>
+
+	* StreamReader.cs : Fill out, add buffering, and use encoding.
+
+2002-03-19  Martin Baulig  <martin@gnome.org>
+
+	* StreamWriter.cs (StreamWriter (string)): The default is to override
+	the file, not to append to it.
+	(StreamWriter (string path, bool append)): When appending, seek to the
+	end of the file, otherwise truncate the file to zero length.
+	(Dispose (bool)): Close the internalStream.
+	(Flush): Flush the interalStream.
+	(Write (char[], int, int)): Flush the internalStream in auto-flush-mode.
+
+2002-03-19  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* FileStream.cs: Flush buffer before FileSetLength.
+
+2002-02-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* Stream.cs (NullStream): Do not track position, this beast does
+	nothing in practice.
+
+2002-03-15  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* SearchPattern.cs: New class. Glob matching code for Directory.
+	* Directory.cs: Changed to use SearchPattern instead of mono_glob_*()
+
+2002/03/15 Nick Drochak <ndrochak@gol.com>
+
+	* DirectoryInfo.cs: Fixed the overloaded GetDirectories and GetFiles.
+	This code seemed to be copied from somewhere, and it was close,
+	but didn't match the docs.  This was the last bit needed to get
+	NAnt to compile with our class libs.
+
+2002-03-12  Duncan Mak  <duncan@ximian.com>
+
+	* EndOfStreamException.cs:
+	* FileLoadException.cs:
+	* FileNotFoundException.cs:
+	* PathTooLongException.cs: Changed the base classes to IOException
+	instead of SystemException.
+
+	* IOException.cs: Added missing constructors.
+	
+2002-03-07  Nick Drochak  <ndrochak@gol.com>
+
+	* FileMode.cs: Docs don't say this should be explicitly derived from
+	int, so just make it a normal Enum.
+
+2002-03-02  Jason Diamond  <jason@injektilo.org>
+
+	* StringReader.cs: Fixed off-by-one error in Peek() and Read().
+
+2002-02-12  Nick Drochak  <ndrochak@gol.com>
+
+	* PathTooLongException.cs: put it in the correct namespace
+	* EndOfStreamException.cs: put it in the correct namespace
+
+Thu Jan 31 17:32:32 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Directory.cs: handle opendir() return NULL and absolute filenames.
+
+2002-01-31  Duncan Mak  <duncan@ximian.com>
+
+	* FileLoadException.cs:
+	* FileNotFoundException: Added missing bits for serialization.
+
+Thu Jan 24 17:42:54 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Directory.cs: allow directories in GetFiles() mask.
+
+2002-01-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* FileInfo.c (CopyTo, MoveTo): Implement.
+
+	* FileStream.cs: Add argument checking to the constructor.
+
+	* File.cs: Rewrote most of the file.  Implement Copy, Open, Create,
+	OpenText, OpenWrite, Move.  Made pending methods flagged as MonoTODO. 
+	
+	* Directory.cs (Delete): reimplement without using DirectoryInfo.
+	(Delete): Implement the recursive version.
+	(GetCreationTime, GetLastWriteTime, GetLastAccessTime): Implement.
+	(Move): Reimplement.
+	(getNames): dead code removal.
+
+	* Path.cs: define an internal DirectorySeparatorStr that we use in
+	a few spots.
+
+	* Wrapper.cs: Updated to new version.
+	
+	* DirectoryInfo (Delete): Implement using the Directory API.
+
+	* DirectoryInfo.cs (GetFiles, GetDirectories, GetFileSystemInfos,
+	Delete, Create, Parent, Exists, MoveTo): Implement. 
+
+	* Directory.cs (GetListing): implement new utility function.
+	(GetDirectories): Implement.
+	(GetFileSystemEntries): Implement.
+	(GetFiles): Implement.
+
+	* CheckArgument.cs (Path): Do not allow null by default.
+
+Tue Jan 22 22:53:23 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* DirectoryInfo.cs, FileInfo.cs: do not use Debug from the system
+	assembly in corlib.
+
+2002-01-20 Nick Drochak  <ndrochak@gol.com>
+
+	* SeekOrigin.cs: Added Serializable attribute.
+
+2002-01-19  Duncan Mak  <duncan@ximian.com>
+
+	* PathTooLongException.cs: 
+	* EndOfStreamException.cs: Added to CVS.
+
+Thu Jan 10 12:06:46 MST 2002 Matt Kimball <matt@kimball.net>
+
+	* BufferedStream.cs: Initial implemenation.  The synchronous
+	methods for both reading and writing are implemented.  I'll do the
+	asynchronous methods in a bit.
+	
+Wed Jan  9 16:04:39 MST 2002 Matt Kimball <matt@kimball.net>
+
+	* BinaryWriter.cs: Initial implementation.  And it's all there.
+
+	* BinaryReader.cs: The constructor now uses the passed in encoding,
+	not UTF8 always.
+
+Wed Jan  9 13:54:28 MST 2002 Matt Kimball <matt@kimbal.net>
+
+	* BinaryReader.cs: Initial implementation.  I think it's complete.
+
+2002-01-04  Ravi Pratap  <ravi@ximian.com>
+
+	* CheckArgument.cs, CheckPermission.cs, Directory.cs: MonoTODO
+	attribute decorations.
+
+	* DirectoryInfo.cs, File.cs, FileInfo.cs, FileSystemInfo.cs,
+	Path.cs, TextReader.cs, TextWriter.cs : Ditto.
+
+	* FileLoadException.cs, FileNotFoundException.cs, StreamReader.cs: 
+	Ditto.
+
+2001-12-11  Dick Porter  <dick@ximian.com>
+
+	* FileStream.cs: Use handles rather than casting file descriptors.
+	Added Handle property.
+
+Wed Nov 14 16:47:47 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* CheckPermission.cs: disable ModeAccess() code: it's wrong.
+	* FileStream.cs: only trow an exception if the read failed in ReadByte().
+	* StreamReader.cs: implement Peek and Read.
+	* TextWriter.cs: CLSCompliant updates.
+
+2001-11-10  Sean MacIsaac  <macisaac@ximian.com>
+
+	* FileNotFoundException.cs: Added some constructors
+
+	* Path.cs (GetFullPath): Fixed implementation
+
+Fri Nov 2 18:27:58 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* DirectoryNotFoundException.cs: implemented.
+
+Tue Sep 25 18:54:06 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* File.cs: fix signatures of the Open() and OpenRead() functions
+	(they are static).
+
+Thu Sep 13 18:04:23 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* FileLoadException.cs, FileNotFoundException.cs: added.
+
+2001-08-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* TextReader.cs: implemented the Read method
+
+	* StreamReader.cs: impl. stubs
+
+	* StreamWriter.cs: impl.
+
+	* TextWriter.cs: implemented Write and WriteLine methods
+
+Sun Aug 26 23:01:41 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* FileAccess.cs, FileMode.cs: change values to be compatible with
+	the ms ones.
+	
+Sun Aug 26 11:47:56 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* IOException.cs: Implemented System.IO.Exception.
+
+2001-07-18  Michael Lambert <michaellambert@email.com>
+
+        *SeekOrigin.cs.cs, FileShare.cs, FileMode.cs, FileAccess.cs: Add.
+
+2001-07-19  Marcin Szczepanski <marcins@zipworld.com.au>
+
+	* System.IO.MemoryStream.cs: Added.  Had quite a few cases of
+	"LAMESPEC", but the tests work against the MS implementation so
+	the major functions are right (ie. Read/Write/Seek).  Some more
+	tests required for the various constructors and exceptions.
+
+2001-07-16  Marcin Szczepanski <marcins@zipworld.com.au>
+
+	* StringReader.cs, StringWriter.cs, TextReader.cs, TextWriter.cs:
+	New class implemenations.
+
+	* StringReaderTest.cs, StringWriterTest.cs: Test suite for the above.
+
diff --git a/mcs/class/corlib/System.IO/CheckArgument.cs b/mcs/class/corlib/System.IO/CheckArgument.cs
new file mode 100644
index 00000000000..eaf20c0002e
--- /dev/null
+++ b/mcs/class/corlib/System.IO/CheckArgument.cs
@@ -0,0 +1,167 @@
+//------------------------------------------------------------------------------
+// 
+// System.IO.CheckArgument.cs 
+//
+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved
+// 
+// Author:         Jim Richardson, develop@wtfo-guru.com
+// Created:        Saturday, August 25, 2001 
+//
+// NOTE: All contributors can freely add to this class or make modifications
+//       that do not break existing usage of methods 
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.IO;
+
+namespace System.IO
+{
+	/// <summary>
+	/// A utility class to assist with various argument validations in System.IO
+	/// </summary>
+	internal sealed class CheckArgument
+	{
+		/// <summary>
+		/// Generates and exception if arg contains whitepace only
+		/// </summary>
+		public static void WhitespaceOnly (string arg, string desc)
+		{
+			if (arg != null && arg.Length > 0)
+			{
+				string temp = arg;
+				temp.Trim ();
+				if (temp.Length == 0)
+				{
+					throw new ArgumentException (desc);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Generates and exception if arg contains whitepace only
+		/// </summary>
+		public static void WhitespaceOnly (string arg)
+		{
+			WhitespaceOnly (arg, "Argument string consists of whitespace characters only.");
+		}
+		
+		/// <summary>
+		/// Generates and exception if arg is empty
+		/// </summary>
+		public static void Empty (string arg, string desc)
+		{
+			if (arg != null && arg.Length == 0)
+			{
+				throw new ArgumentException (desc);
+			}
+		}
+		
+		/// <summary>
+		/// Generates and exception if arg is empty
+		/// </summary>
+		public static void Empty (string arg)
+		{
+			Empty (arg, "Argument string is empty.");
+		}
+		
+		/// <summary>
+		/// Generates and exception if arg is null
+		/// </summary>
+		public static void Null (Object arg, string desc)
+		{
+			if (arg == null)
+			{
+				throw new ArgumentNullException (desc);
+			}
+		}
+		
+		/// <summary>
+		/// Generates and exception if arg is null
+		/// </summary>
+		public static void Null (Object arg)
+		{
+			if (arg == null)
+			{
+				throw new ArgumentNullException ();
+			}
+		}
+		
+		/// <summary>
+		/// Generates and exception if path contains invalid path characters
+		/// </summary>
+		public static void PathChars (string path, string desc)
+		{
+			if (path != null)
+			{
+				if (path.IndexOfAny (System.IO.Path.InvalidPathChars) > -1)
+				{
+					throw new ArgumentException (desc);
+				}
+			}
+		}
+		
+		/// <summary>
+		/// Generates and exception if path contains invalid path characters
+		/// </summary>
+		public static void PathChars (string path)
+		{
+			PathChars (path, "Path contains invalid characters");
+		}
+		
+		/// <summary>
+		/// Generates and exception if path too long
+		/// </summary>
+		[MonoTODO]
+		public static void PathLength (string path, string desc)
+		{
+		 	//TODO: find out how long is too long
+		}
+		
+		/// <summary>
+		/// Generates and exception if path too long
+		/// </summary>
+		public static void PathLength (string path)
+		{
+			PathLength (path);
+		}
+		
+		/// <summary>
+		/// Generates and exception if path is illegal
+		/// </summary>
+		public static void Path (string path, bool bAllowNull, bool bLength)
+		{
+			if (path != null) //allow null
+			{
+				Empty (path, "Path cannot be the empty string");	// path can't be empty
+				WhitespaceOnly (path, "Path cannot be all whitespace");	// path can't be all whitespace
+				PathChars (path);	// path can't contain invalid characters
+				if (bLength)
+				{
+					PathLength ("Path too long");
+				}
+			}
+			else if (!bAllowNull)
+			{
+				throw new ArgumentNullException ("Parameter name: path");
+			}
+		}
+		
+		/// <summary>
+		/// Generates and exception if path is illegal
+		/// </summary>
+		public static void Path (string path, bool bAllowNull)
+		{
+			Path (path, bAllowNull, false);
+		}
+		
+		/// <summary>
+		/// Generates and exception if path is illegal
+		/// </summary>
+		public static void Path (string path)
+		{
+			Path (path, false, false);
+		}
+
+	}
+}	// namespace System.IO.Private
diff --git a/mcs/class/corlib/System.IO/CheckPermission.cs b/mcs/class/corlib/System.IO/CheckPermission.cs
new file mode 100644
index 00000000000..3418850c065
--- /dev/null
+++ b/mcs/class/corlib/System.IO/CheckPermission.cs
@@ -0,0 +1,87 @@
+//------------------------------------------------------------------------------
+// 
+// System.IO.CheckPermission.cs 
+//
+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved
+// 
+// Author:         Jim Richardson, develop@wtfo-guru.com
+// Created:        Saturday, August 25, 2001 
+//
+// NOTE: All contributors can freely add to this class or make modifications
+//       that do not break existing usage of methods 
+//------------------------------------------------------------------------------
+
+
+using System;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.IO
+{
+	/// <summary>
+	/// A utility class to assist with various permission validation in System.IO
+	/// </summary>
+	internal sealed class CheckPermission
+	{
+		/// <summary>
+		/// Generates and exception if caller doesn't have flags access to filesystem item specified by path
+		/// </summary>
+		[MonoTODO]
+		public static void Demand(FileIOPermissionAccess flags, string path)
+		{
+			FileIOPermission ioPerm = new FileIOPermission(flags, path);
+			// FIXME: FileIOPermission is not yet implemented
+			//ioPerm.Demand();
+		}		
+		
+		public static void Access(FileAccess access, string path)
+		{
+			switch(access)
+			{
+			case FileAccess.Read:
+				Demand(FileIOPermissionAccess.Read, path);
+				break;
+			case FileAccess.Write:
+				Demand(FileIOPermissionAccess.Write, path);
+				break;
+			case FileAccess.ReadWrite:
+				Demand(FileIOPermissionAccess.Read | FileIOPermissionAccess.Write, path);
+				break;
+			default:
+				// TODO: determine what best to do here
+				throw new ArgumentException("Invalid FileAccess parameter");
+			}
+		}
+
+		[MonoTODO]
+		public static void ModeAccess(FileMode mode, FileAccess access, string path, bool exists)
+		{
+#if false
+			// TODO: this logic isn't entirely complete and accurate, yet
+			if((mode & (FileMode.CreateNew | FileMode.Create)) != 0)
+			{
+				CheckPermission.Demand(FileIOPermissionAccess.Write, Path.GetDirectoryName(path));
+			}
+			else if((mode & FileMode.OpenOrCreate) != 0)
+			{
+				if(!exists)
+				{
+					CheckPermission.Demand(FileIOPermissionAccess.Write, Path.GetDirectoryName(path));
+				}
+				else
+				{
+					CheckPermission.Access(access, path);
+				}
+			}
+			else if(exists)
+			{
+				CheckPermission.Access(access, path);
+			}
+			else
+			{
+				throw new FileNotFoundException();
+			}
+#endif
+		}
+	}
+}	// namespace System.IO.Private
diff --git a/mcs/class/corlib/System.IO/Directory.cs b/mcs/class/corlib/System.IO/Directory.cs
new file mode 100644
index 00000000000..a31b74adbd8
--- /dev/null
+++ b/mcs/class/corlib/System.IO/Directory.cs
@@ -0,0 +1,242 @@
+// 

+// System.IO.Directory.cs 

+//

+// Authors:

+//   Jim Richardson  (develop@wtfo-guru.com)

+//   Miguel de Icaza (miguel@ximian.com)

+//   Dan Lewis       (dihlewis@yahoo.co.uk)

+//

+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved

+// Copyright (C) 2002 Ximian, Inc.

+// 

+// Created:        Monday, August 13, 2001 

+//

+//------------------------------------------------------------------------------

+

+using System;

+using System.Security.Permissions;

+using System.Collections;

+

+namespace System.IO

+{

+	public sealed class Directory : Object

+	{

+		private Directory () {}
+
+		public static DirectoryInfo CreateDirectory (string path)

+		{

+			if (path == null)

+				throw new ArgumentNullException ();

+			if (path == "" || path.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException ();

+

+			if (!MonoIO.CreateDirectory (path))

+				throw MonoIO.GetException ();

+

+			return new DirectoryInfo (path);

+		}

+

+		public static void Delete (string path)

+		{

+			if (path == null)

+				throw new ArgumentNullException ();

+			if (path == "" || path.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException ();

+

+			if (!MonoIO.RemoveDirectory (path))

+				throw MonoIO.GetException ();

+		}

+

+		static void RecursiveDelete (string path)

+		{

+			foreach (string dir in GetDirectories (path))

+				RecursiveDelete (dir);

+

+			foreach (string file in GetFiles (path))

+				File.Delete (file);

+

+			Directory.Delete (path);

+		}

+		

+		public static void Delete (string path, bool recurse)

+		{

+			if (path == null)

+				throw new ArgumentNullException ();

+			if (path.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException ("Path contains invalid characters");

+

+			if (recurse == false){

+				Delete (path);

+				return;

+			}

+

+			RecursiveDelete (path);

+		}

+		

+		public static bool Exists (string path)

+		{

+			return MonoIO.ExistsDirectory (path);

+		}

+

+		public static DateTime GetLastAccessTime (string path)

+		{

+			return File.GetLastAccessTime (path);

+		}

+		

+		public static DateTime GetLastWriteTime (string path)

+		{

+			return File.GetLastWriteTime (path);

+		}

+		

+		public static DateTime GetCreationTime (string path)

+		{

+			return File.GetLastWriteTime (path);

+		}

+		

+		public static string GetCurrentDirectory ()

+		{

+			/*

+			// Implementation complete 08/25/2001 14:24 except for

+			// LAMESPEC: documentation specifies invalid exceptions (i think)

+			//           also shouldn't need Write to getcurrrent should we?

+			string str = Environment.CurrentDirectory;

+			CheckPermission.Demand (FileIOPermissionAccess.Read & FileIOPermissionAccess.Write, str);

+			*/

+			return Environment.CurrentDirectory;

+		}

+		

+		public static string [] GetDirectories (string path)

+		{

+			return GetDirectories (path, "*");

+		}

+		

+		public static string [] GetDirectories (string path, string pattern)

+		{

+			return GetFileSystemEntries (path, pattern, FileAttributes.Directory, FileAttributes.Directory);

+		}

+		

+		public static string GetDirectoryRoot (string path)

+		{

+			return "" + Path.DirectorySeparatorChar;

+		}

+		

+		public static string [] GetFiles (string path)

+		{

+			return GetFiles (path, "*");

+		}

+		

+		public static string [] GetFiles (string path, string pattern)

+		{

+			return GetFileSystemEntries (path, pattern, FileAttributes.Directory, 0);

+		}

+

+		public static string [] GetFileSystemEntries (string path)

+		{	

+			return GetFileSystemEntries (path, "*");

+		}

+

+		public static string [] GetFileSystemEntries (string path, string pattern)

+		{

+			return GetFileSystemEntries (path, pattern, 0, 0);

+		}

+		

+		public static string[] GetLogicalDrives ()

+		{	

+			return new string [] { "A:\\", "C:\\" };

+		}

+

+		public static DirectoryInfo GetParent (string path)

+		{

+			return new DirectoryInfo (Path.GetDirectoryName (path));

+		}

+

+		public static void Move (string src, string dest)

+		{

+			File.Move (src, dest);

+		}

+

+		public static void SetCreationTime (string path, DateTime creation_time)

+		{

+			File.SetCreationTime (path, creation_time);

+		}

+		

+		public static void SetCurrentDirectory (string path)

+		{

+			/*

+			// Implementation complete 08/25/2001 14:24 except for

+			// LAMESPEC: documentation specifies invalid exceptions IOException (i think)

+			CheckArgument.Path (path, true);

+			CheckPermission.Demand (FileIOPermissionAccess.Read & FileIOPermissionAccess.Write, path);	

+			*/

+			if (!Exists (path))

+			{

+				throw new DirectoryNotFoundException ("Directory \"" + path + "\" not found.");

+			}

+			Environment.CurrentDirectory = path;

+		}

+

+		public static void SetLastAccessTime (string path, DateTime last_access_time)

+		{

+			File.SetLastAccessTime (path, last_access_time);

+		}

+		

+		public static void SetLastWriteTime (string path, DateTime last_write_time)

+		{

+			File.SetLastWriteTime (path, last_write_time);

+		}

+		

+		// private

+

+		private static string [] GetFileSystemEntries (string path, string pattern, FileAttributes mask, FileAttributes attrs)

+		{

+			SearchPattern search;

+			MonoIOStat stat;

+			IntPtr find;

+

+			if (path.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException ("Path contains invalid characters.");

+

+			if (!Directory.Exists (path))
+				throw new DirectoryNotFoundException ("Directory '" + path + "' not found.");
+
+			search = new SearchPattern (pattern);

+

+			find = MonoIO.FindFirstFile (Path.Combine (path , "*"), out stat);

+			if (find == MonoIO.InvalidHandle) {

+				switch (MonoIO.GetLastError ()) {

+				case MonoIOError.ERROR_FILE_NOT_FOUND:

+				case MonoIOError.ERROR_PATH_NOT_FOUND:

+					string message = String.Format ("Could not find a part of the path \"{0}\"", path);

+					throw new DirectoryNotFoundException (message);

+				case MonoIOError.ERROR_NO_MORE_FILES:
+					return new string [0];
+

+				default:

+					throw MonoIO.GetException (path);

+				}

+			}

+			

+			ArrayList entries = new ArrayList ();

+

+			while (true) {

+				// Ignore entries of "." and ".." -
+				// the documentation doesn't mention
+				// it (surprise!) but empirical
+				// testing indicates .net never
+				// returns "." or ".." in a
+				// GetDirectories() list.
+				if ((stat.Attributes & mask) == attrs &&
+				    search.IsMatch (stat.Name) &&
+				    stat.Name != "." &&
+				    stat.Name != "..")

+					entries.Add (Path.Combine (path, stat.Name));

+

+				if (!MonoIO.FindNextFile (find, out stat))

+					break;

+			}

+			MonoIO.FindClose (find);

+

+			return (string []) entries.ToArray (typeof (string));

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.IO/DirectoryInfo.cs b/mcs/class/corlib/System.IO/DirectoryInfo.cs
new file mode 100644
index 00000000000..21d0329b5a9
--- /dev/null
+++ b/mcs/class/corlib/System.IO/DirectoryInfo.cs
@@ -0,0 +1,135 @@
+// 

+// System.IO.DirectoryInfo.cs 

+//

+// Author:

+//   Miguel de Icaza, miguel@ximian.com

+//   Jim Richardson, develop@wtfo-guru.com

+//   Dan Lewis, dihlewis@yahoo.co.uk

+//

+// Copyright (C) 2002 Ximian, Inc.

+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved

+// 

+

+using System;

+using System.Collections;

+

+namespace System.IO {

+	

+	[Serializable]
+	public sealed class DirectoryInfo : FileSystemInfo {

+	

+		public DirectoryInfo (string path) {

+			CheckPath (path);

+		

+			OriginalPath = path;

+			FullPath = Path.GetFullPath (path);

+		}

+

+		// properties

+

+		public override bool Exists {

+			get {

+				Refresh (false);

+

+				if (stat.Attributes == MonoIO.InvalidFileAttributes)

+					return false;

+

+				if ((stat.Attributes & FileAttributes.Directory) == 0)

+					return false;

+

+				return true;

+			}

+		}

+

+		public override string Name {

+			get {

+				return Path.GetFileName (FullPath);

+			}

+		}

+

+		public DirectoryInfo Parent {

+			get {

+				return new DirectoryInfo (Path.GetDirectoryName (FullPath));

+			}

+		}

+

+		public DirectoryInfo Root {

+			get {

+				return new DirectoryInfo (Path.GetPathRoot (FullPath));

+			}

+		}

+

+		// creational methods

+

+		public void Create () {

+			Directory.CreateDirectory (FullPath);

+		}

+

+		public DirectoryInfo CreateSubdirectory (string name) {

+			string path = Path.Combine (FullPath, Path.GetFileName (name));

+			Directory.CreateDirectory (path);

+

+			return new DirectoryInfo (path);

+		}

+

+		// directory listing methods

+

+		public FileInfo [] GetFiles () {

+			return GetFiles ("*");

+		}

+

+		public FileInfo [] GetFiles (string pattern) {

+			string [] names = Directory.GetFiles (FullPath, pattern);

+

+			ArrayList infos = new ArrayList ();

+			foreach (string name in names)

+				infos.Add (new FileInfo (name));

+

+			return (FileInfo []) infos.ToArray (typeof (FileInfo));

+		}

+

+		public DirectoryInfo [] GetDirectories () {

+			return GetDirectories ("*");

+		}

+

+		public DirectoryInfo [] GetDirectories (string pattern) {

+			string [] names = Directory.GetDirectories (FullPath, pattern);

+

+			ArrayList infos = new ArrayList ();

+			foreach (string name in names)

+				infos.Add (new DirectoryInfo (name));

+

+			return (DirectoryInfo []) infos.ToArray (typeof (DirectoryInfo));

+		}

+

+		public FileSystemInfo [] GetFileSystemInfos () {

+			return GetFileSystemInfos ("*");

+		}

+

+		public FileSystemInfo [] GetFileSystemInfos (string pattern) {

+			ArrayList infos = new ArrayList ();

+			infos.AddRange (GetDirectories (pattern));

+			infos.AddRange (GetFiles (pattern));

+

+			return (FileSystemInfo []) infos.ToArray (typeof (FileSystemInfo));

+		}

+

+		// directory management methods

+

+		public override void Delete () {

+			Delete (false);

+		}

+

+		public void Delete (bool recurse) {

+			Directory.Delete (FullPath, recurse);

+		}

+

+		public void MoveTo (string dest) {

+			Directory.Move (FullPath, dest);

+		}

+

+		public override string ToString () {

+			return OriginalPath;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.IO/DirectoryNotFoundException.cs b/mcs/class/corlib/System.IO/DirectoryNotFoundException.cs
new file mode 100755
index 00000000000..1332758d48f
--- /dev/null
+++ b/mcs/class/corlib/System.IO/DirectoryNotFoundException.cs
@@ -0,0 +1,38 @@
+//
+// System.IO.DirectoryNotFoundException.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+
+namespace System.IO {
+
+	[Serializable]
+	public class DirectoryNotFoundException : IOException {
+		
+		// Constructors
+		public DirectoryNotFoundException ()
+			: base ("Directory not found")
+		{
+		}
+
+		public DirectoryNotFoundException (string message)
+			: base (message)
+		{
+		}
+
+		public DirectoryNotFoundException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected DirectoryNotFoundException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.IO/EndOfStreamException.cs b/mcs/class/corlib/System.IO/EndOfStreamException.cs
new file mode 100644
index 00000000000..88f8460d87a
--- /dev/null
+++ b/mcs/class/corlib/System.IO/EndOfStreamException.cs
@@ -0,0 +1,43 @@
+//	
+// System.IO.EndOfStreamException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Runtime.Serialization;
+
+namespace System.IO
+{
+	   [Serializable]
+	   public class EndOfStreamException : IOException
+	   {
+			 // Constructors
+			 public EndOfStreamException ()
+				    : base (Locale.GetText ("Failed to read past end of stream."))
+			 {
+			 }
+
+			 public EndOfStreamException (string message)
+				    : base (message)
+			 {
+			 }
+			 
+			 protected EndOfStreamException (SerializationInfo info,
+				    StreamingContext context)
+				    : base (info, context)
+			 {
+			 }
+
+			 public EndOfStreamException (string message, Exception innerException)
+				    :base (message, innerException)
+			 {
+			 }
+				    
+	   }
+}
diff --git a/mcs/class/corlib/System.IO/File.cs b/mcs/class/corlib/System.IO/File.cs
new file mode 100644
index 00000000000..b4d20e6802a
--- /dev/null
+++ b/mcs/class/corlib/System.IO/File.cs
@@ -0,0 +1,253 @@
+// 

+// System.IO.FIle.cs 

+//

+// 

+// Authors:

+//   Miguel de Icaza (miguel@ximian.com)

+//   Jim Richardson  (develop@wtfo-guru.com)

+//   Dan Lewis       (dihlewis@yahoo.co.uk)

+//

+// Copyright 2002 Ximian, Inc. http://www.ximian.com

+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved

+//

+

+using System;

+

+namespace System.IO

+{

+	/// <summary>

+	/// 

+	/// </summary>

+	public sealed class File

+	{

+		private File () {}
+
+		

+		

+		public static StreamWriter AppendText (string path)

+		{	

+			return new StreamWriter (path, true);

+		}

+

+		[MonoTODO("Security Permision Checks")]

+		public static void Copy (string sourceFilename, string destFilename)

+		{

+			Copy (sourceFilename, destFilename, false);

+		}

+

+		public static void Copy (string src, string dest, bool overwrite)

+		{	

+			if (src == null)

+				throw new ArgumentNullException ("src");

+			if (dest == null)

+				throw new ArgumentNullException ("dest");

+			if (src.Trim () == "" || src.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException ("src");

+			if (dest.Trim () == "" || dest.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException ("dest");

+			if (!Exists (src))
+				throw new FileNotFoundException (src + " does not exist");

+
+			if ((GetAttributes(src) & FileAttributes.Directory) == FileAttributes.Directory){
+				throw new ArgumentException(src + " is a directory");
+			}
+			
+			if (Exists (dest)) {

+				if ((GetAttributes(dest) & FileAttributes.Directory) == FileAttributes.Directory){

+					throw new ArgumentException(dest + " is a directory");	

+				}

+				if (!overwrite)

+					throw new IOException (dest + " already exists");

+			}

+

+			string DirName = Path.GetDirectoryName(dest);

+			if (DirName != String.Empty && !Directory.Exists (DirName))
+				throw new DirectoryNotFoundException("Destination directory not found: " + DirName);
+

+			if (!MonoIO.CopyFile (src, dest, overwrite))

+				throw MonoIO.GetException ();

+		}

+

+		public static FileStream Create (string path)

+		{

+			return Create (path, 8192);

+		}

+

+		public static FileStream Create (string path, int buffersize)

+		{

+			if (null == path)

+				throw new ArgumentNullException("path");

+			if (String.Empty == path.Trim() || path.IndexOfAny(Path.InvalidPathChars) >= 0)

+				throw new ArgumentException("path");

+

+			string DirName = Path.GetDirectoryName(path);

+			if (DirName != String.Empty && !Directory.Exists (DirName))

+				throw new DirectoryNotFoundException("Destination directory not found: " + DirName);

+			if (Exists(path)){

+				if ((GetAttributes(path) & FileAttributes.ReadOnly) == FileAttributes.ReadOnly){

+					throw new UnauthorizedAccessException(path + " is a read-only");	

+				}

+			}

+

+			return new FileStream (path, FileMode.Create, FileAccess.ReadWrite,

+					       FileShare.None, buffersize);

+		}

+
+		public static StreamWriter CreateText(string path)
+		

+		{

+			return new StreamWriter (path, false);
+		

+		}
+		
+		

+		

+		public static void Delete (string path)

+		{

+			if (null == path)

+				throw new ArgumentNullException("path");

+			if (String.Empty == path.Trim() || path.IndexOfAny(Path.InvalidPathChars) >= 0)

+				throw new ArgumentException("path");

+			if (Directory.Exists (path))

+				throw new UnauthorizedAccessException("path is a directory");

+

+			string DirName = Path.GetDirectoryName(path);

+			if (DirName != String.Empty && !Directory.Exists (DirName))

+				throw new DirectoryNotFoundException("Destination directory not found: " + DirName);

+

+			if (!MonoIO.DeleteFile (path)){

+				Exception e = MonoIO.GetException ();

+				if (! (e is FileNotFoundException))

+					throw e;

+			}

+		}

+		

+		public static bool Exists (string path)

+		{

+			// For security reasons no exceptions are thrown, only false is returned if there

+			// is any problem with the path or permissions.  Minimizes what information can be

+			// discovered by using this method.

+			if (null == path || String.Empty == path.Trim() 

+			    || path.IndexOfAny(Path.InvalidPathChars) >= 0)
+				return false;

+

+			return MonoIO.ExistsFile (path);

+		}

+

+		public static FileAttributes GetAttributes (string path)

+		{

+			if (null == path)

+				throw new ArgumentNullException("path");

+			if (String.Empty == path.Trim() || path.IndexOfAny(Path.InvalidPathChars) >= 0)

+				throw new ArgumentException("path");

+

+			return MonoIO.GetFileAttributes (path);

+		}

+

+		public static DateTime GetCreationTime (string path)

+		{

+			MonoIOStat stat;

+

+			MonoIO.GetFileStat (path, out stat);

+			return DateTime.FromFileTime (stat.CreationTime);

+		}

+

+		public static DateTime GetLastAccessTime (string path)

+		{

+			MonoIOStat stat;

+

+			MonoIO.GetFileStat (path, out stat);

+			return DateTime.FromFileTime (stat.LastAccessTime);

+		}

+

+		public static DateTime GetLastWriteTime (string path)

+		{

+			MonoIOStat stat;

+

+			MonoIO.GetFileStat (path, out stat);

+			return DateTime.FromFileTime (stat.LastWriteTime);

+		}

+

+		public static void Move (string src, string dest)

+		{

+			if (src == null)

+				throw new ArgumentNullException ("src");

+			if (dest == null)

+				throw new ArgumentNullException ("dest");

+			if (src.Trim () == "" || src.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException ("src");

+			if (dest.Trim () == "" || dest.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException ("dest");

+			if (!Exists (src))

+				throw new FileNotFoundException (src + " does not exist");

+			if (Exists (dest) && ((GetAttributes(dest) & FileAttributes.Directory) == FileAttributes.Directory))

+					throw new ArgumentException(dest + " is a directory");	

+

+			string DirName;

+			DirName = Path.GetDirectoryName(src);

+			if (DirName != String.Empty && !Directory.Exists (DirName))

+				throw new DirectoryNotFoundException("Source directory not found: " + DirName);

+			DirName = Path.GetDirectoryName(dest);

+			if (DirName != String.Empty && !Directory.Exists (DirName))

+				throw new DirectoryNotFoundException("Destination directory not found: " + DirName);

+

+			if (!MonoIO.MoveFile (src, dest))

+				throw MonoIO.GetException ();

+		}

+		

+		public static FileStream Open (string path, FileMode mode)

+		{	

+			return new FileStream (path, mode, FileAccess.ReadWrite, FileShare.None);

+		}

+		

+		public static FileStream Open (string path, FileMode mode, FileAccess access)

+		{	

+			return new FileStream (path, mode, access, FileShare.None);

+		}

+

+		public static FileStream Open (string path, FileMode mode, FileAccess access,

+					       FileShare share)

+		{

+			return new FileStream (path, mode, access, share);

+		}

+		

+		public static FileStream OpenRead (string path)

+		{	

+			return new FileStream (path, FileMode.Open, FileAccess.Read, FileShare.Read);

+		}

+

+		public static StreamReader OpenText (string path)

+		{

+			return new StreamReader (path);

+		}

+

+		public static FileStream OpenWrite (string path)

+		{

+			return new FileStream(path, FileMode.OpenOrCreate, FileAccess.Write, FileShare.None);

+		}

+

+		public static void SetAttributes (string path, FileAttributes attributes)

+		{

+			if (!MonoIO.SetFileAttributes (path, attributes))

+				throw MonoIO.GetException (path);

+		}

+

+		public static void SetCreationTime (string path, DateTime creation_time)

+		{

+			if (!MonoIO.SetFileTime (path, creation_time.Ticks, -1, -1))

+				throw MonoIO.GetException (path);

+		}

+

+		public static void SetLastAccessTime (string path, DateTime last_access_time)

+		{

+			if (!MonoIO.SetFileTime (path, -1, last_access_time.Ticks, -1))

+				throw MonoIO.GetException (path);

+		}

+

+		public static void SetLastWriteTime (string path, DateTime last_write_time)

+		{

+			if (!MonoIO.SetFileTime (path, -1, -1, last_write_time.Ticks))

+				throw MonoIO.GetException (path);

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.IO/FileAccess.cs b/mcs/class/corlib/System.IO/FileAccess.cs
new file mode 100644
index 00000000000..c6eefb3aa6f
--- /dev/null
+++ b/mcs/class/corlib/System.IO/FileAccess.cs
@@ -0,0 +1,34 @@
+// FileAccess.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:32:20 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.IO {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum FileAccess : int {
+
+		/// <summary>
+		/// </summary>
+		Read = 0x00000001,
+
+		/// <summary>
+		/// </summary>
+		Write = 0x00000002,
+
+		/// <summary>
+		/// </summary>
+		ReadWrite = Read | Write,
+	} // FileAccess
+
+} // System.IO
diff --git a/mcs/class/corlib/System.IO/FileAttributes.cs b/mcs/class/corlib/System.IO/FileAttributes.cs
new file mode 100644
index 00000000000..3f187be6910
--- /dev/null
+++ b/mcs/class/corlib/System.IO/FileAttributes.cs
@@ -0,0 +1,35 @@
+//------------------------------------------------------------------------------
+// 
+// System.IO.FileAttributes.cs 
+//
+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved
+// 
+// Author:         Jim Richardson, develop@wtfo-guru.com
+// Created:        Monday, August 13, 2001 
+//
+//------------------------------------------------------------------------------
+
+
+namespace System.IO
+{
+	[Flags]
+	[Serializable]
+	public enum FileAttributes : int
+	{
+		Archive = 0x00020,
+		Compressed = 0x00800, 
+		Device = 0x00040, // Reserved for future use (NOT the w32 value). 
+		Directory = 0x00010,
+		Encrypted = 0x04000, // NOT the w32 value
+		Hidden = 0x00002,
+		Normal = 0x00080,
+		NotContentIndexed = 0x02000,
+		Offline = 0x01000,
+		ReadOnly = 0x00001,
+		ReparsePoint = 0x00400,
+		SparseFile = 0x00200,
+		System = 0x00004,
+		Temporary = 0x00100 
+	}
+
+}
diff --git a/mcs/class/corlib/System.IO/FileInfo.cs b/mcs/class/corlib/System.IO/FileInfo.cs
new file mode 100644
index 00000000000..8c73a09c9d6
--- /dev/null
+++ b/mcs/class/corlib/System.IO/FileInfo.cs
@@ -0,0 +1,141 @@
+//------------------------------------------------------------------------------

+// 

+// System.IO.FileInfo.cs 

+//

+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved

+// 

+// Author:         Jim Richardson, develop@wtfo-guru.com

+//                 Dan Lewis (dihlewis@yahoo.co.uk)

+// Created:        Monday, August 13, 2001 

+//

+//------------------------------------------------------------------------------

+

+using System;

+

+namespace System.IO {

+

+	[Serializable]
+	public sealed class FileInfo : FileSystemInfo {

+	

+		public FileInfo (string path) {

+			CheckPath (path);

+		

+			OriginalPath = path;

+			FullPath = Path.GetFullPath (path);

+		}

+

+		// public properties

+

+		public override bool Exists {

+			get {

+				Refresh (false);

+

+				if (stat.Attributes == MonoIO.InvalidFileAttributes)

+					return false;

+

+				if ((stat.Attributes & FileAttributes.Directory) != 0)

+					return false;

+

+				return File.Exists (FullPath);

+			}

+		}

+

+		public override string Name {

+			get {

+				return Path.GetFileName (FullPath);

+			}

+		}

+

+		public long Length {

+			get {

+				if (!Exists)

+					throw new FileNotFoundException ("Could not find file \"" + OriginalPath + "\".");

+

+				return stat.Length;

+			}

+		}

+

+		public string DirectoryName {

+			get {

+				return Path.GetDirectoryName (FullPath);

+			}

+		}

+

+		public DirectoryInfo Directory {

+			get {

+				return new DirectoryInfo (DirectoryName);

+			}

+		}

+

+		// streamreader methods

+

+		public StreamReader OpenText () {

+			return new StreamReader (Open (FileMode.Open, FileAccess.Read));

+		}

+

+		public StreamWriter CreateText () {

+			return new StreamWriter (Open (FileMode.Create, FileAccess.Write));

+		}

+		

+		public StreamWriter AppendText () {

+			return new StreamWriter (Open (FileMode.Append, FileAccess.Write));

+		}

+

+		// filestream methods

+
+		public FileStream Create ()
+		{
+			return File.Create (FullPath);
+		}
+		
+		

+		public FileStream OpenRead () {

+			return Open (FileMode.Open, FileAccess.Read);

+		}

+

+		public FileStream OpenWrite () {

+			return Open (FileMode.OpenOrCreate, FileAccess.Write);

+		}

+

+		public FileStream Open (FileMode mode) {

+			return Open (mode, FileAccess.ReadWrite);

+		}

+

+		public FileStream Open (FileMode mode, FileAccess access) {

+			return Open (mode, access, FileShare.None);

+		}

+

+		public FileStream Open (FileMode mode, FileAccess access, FileShare share) {

+			return new FileStream (FullPath, mode, access, share);

+		}

+

+		// file methods

+

+		public override void Delete () {

+			if (!MonoIO.Exists (FullPath))		// a weird MS.NET behaviour

+				return;

+		

+			if (!MonoIO.DeleteFile (FullPath))

+				throw MonoIO.GetException (OriginalPath);

+		}

+		

+		public void MoveTo (string dest) {

+			File.Move (FullPath, dest);

+		}

+

+		public FileInfo CopyTo (string path) {

+			return CopyTo (path, false);

+		}

+

+		public FileInfo CopyTo (string path, bool overwrite) {

+			string dest = Path.GetFullPath (path);

+			File.Copy (FullPath, dest);

+		

+			return new FileInfo (dest);

+		}

+

+		public override string ToString () {

+			return OriginalPath;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.IO/FileLoadException.cs b/mcs/class/corlib/System.IO/FileLoadException.cs
new file mode 100755
index 00000000000..2ee1546b36c
--- /dev/null
+++ b/mcs/class/corlib/System.IO/FileLoadException.cs
@@ -0,0 +1,106 @@
+//
+// System.IO.FileLoadException.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.IO;
+using System.Runtime.Serialization;
+
+namespace System.IO {
+	[Serializable]
+	public class FileLoadException : IOException {
+
+		// Fields
+		string msg;
+		Exception inner;
+		string fileName;
+		string fusionLog;
+		
+		// Constructors
+		public FileLoadException ()
+			: base (Locale.GetText ("I/O Error"))
+		{
+			msg = Locale.GetText ("I/O Error");
+		}
+
+		public FileLoadException (string message)
+			: base (message)
+		{
+			msg = message;
+		}
+
+		public FileLoadException (string message, string fileName)
+			: base (message)
+		{
+			this.msg = message;
+			this.fileName = fileName;
+		}		
+
+		public FileLoadException (string message, Exception inner)
+			: base (message, inner)
+		{
+			msg = message;
+			this.inner = inner;
+		}
+
+		public FileLoadException (string message, string fileName, Exception inner)
+			: base (message, inner)
+		{
+			this.msg = message;
+			this.fileName = fileName;
+			this.inner = inner;
+		}
+
+		protected FileLoadException (SerializationInfo info, StreamingContext context)
+		{
+			fileName = info.GetString ("FileLoad_FileName");
+			fusionLog = info.GetString ("FileLoad_FusionLog");
+		}
+
+		// Properties
+		public override string Message
+		{
+			get {
+				if (fileName != null)
+					return Locale.GetText (msg + ": " + fileName);
+				else
+					return msg;
+			}
+		}
+
+		public string FileName
+		{
+			get { return fileName; }
+		}
+		
+		public string FusionLog
+		{
+			get { return fusionLog; }
+		}
+
+		// Methods
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("FileLoad_FileName", fileName);
+			info.AddValue ("FileLoad_FusionLog", fusionLog);
+		}
+
+		public override string ToString ()
+		{
+			string result = GetType ().FullName + ": " + Message;
+			if (this.InnerException != null)
+				result +=" ----> " + InnerException;
+			if (this.StackTrace != null)
+				result += '\n' + StackTrace;
+
+			return result;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.IO/FileMode.cs b/mcs/class/corlib/System.IO/FileMode.cs
new file mode 100644
index 00000000000..c32a53408bf
--- /dev/null
+++ b/mcs/class/corlib/System.IO/FileMode.cs
@@ -0,0 +1,45 @@
+// FileMode.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:32:13 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.IO {
+
+
+	/// <summary>
+	/// </summary>
+	public enum FileMode {
+
+		/// <summary>
+		/// </summary>
+		CreateNew = 1,
+
+		/// <summary>
+		/// </summary>
+		Create = 2,
+
+		/// <summary>
+		/// </summary>
+		Open = 3,
+
+		/// <summary>
+		/// </summary>
+		OpenOrCreate = 4,
+
+		/// <summary>
+		/// </summary>
+		Truncate = 5,
+
+		/// <summary>
+		/// </summary>
+		Append = 6,
+	} // FileMode
+
+} // System.IO
diff --git a/mcs/class/corlib/System.IO/FileNotFoundException.cs b/mcs/class/corlib/System.IO/FileNotFoundException.cs
new file mode 100755
index 00000000000..e6b8f75a5ce
--- /dev/null
+++ b/mcs/class/corlib/System.IO/FileNotFoundException.cs
@@ -0,0 +1,97 @@
+//
+// System.IO.FileNotFoundException.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+using System.Globalization;
+using System.IO;
+using System.Runtime.Serialization;
+
+namespace System.IO {
+
+	[Serializable]
+	public class FileNotFoundException : IOException {
+		private string fileName;
+		private string fusionLog;
+
+		// Constructors
+		public FileNotFoundException ()
+			: base (Locale.GetText ("File not found"))
+		{
+		}
+
+		public FileNotFoundException (string message)
+			: base (message)
+		{
+		}
+
+		public FileNotFoundException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		public FileNotFoundException (string message, string fileName)
+			: base (message)
+		{
+			this.fileName = fileName;
+		}
+
+		public FileNotFoundException (string message, string fileName, Exception innerException)
+			: base (message, innerException)
+		{
+			this.fileName = fileName;
+		}
+
+		protected FileNotFoundException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+			fileName = info.GetString ("FileNotFound_FileName");
+			fusionLog = info.GetString ("FileNotFound_FusionLog");
+		}
+
+		public string FileName
+		{
+			get { return fileName; }
+		}
+
+		public string FusionLog
+		{
+			get { return fusionLog; }
+		}
+
+		public override string Message
+		{
+			get {
+				if (base.Message == null)
+					return "File not found";
+
+				if (fileName == null)
+					return base.Message;
+				
+				return "File '" + fileName + "' not found.";
+			}
+		}
+
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			info.AddValue ("FileNotFound_FileName", fileName);
+			info.AddValue ("FileNotFound_FusionLog", fusionLog);
+		}
+
+		public override string ToString ()
+		{
+			string result = GetType ().FullName + ": " + Message;
+			if (InnerException != null)
+				result += " ----> " + InnerException.ToString ();
+
+			if (StackTrace != null)
+				result += "\n" + StackTrace;
+
+			return result;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.IO/FileShare.cs b/mcs/class/corlib/System.IO/FileShare.cs
new file mode 100644
index 00000000000..8e4fac4eef7
--- /dev/null
+++ b/mcs/class/corlib/System.IO/FileShare.cs
@@ -0,0 +1,28 @@
+// FileShare.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:32:26 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.IO {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum FileShare : int {
+
+		None = 0,
+		Read = 1,
+		Write = 2,
+		ReadWrite = 3,
+		Inheritable = 16,
+	} // FileShare
+
+} // System.IO
diff --git a/mcs/class/corlib/System.IO/FileStream.cs b/mcs/class/corlib/System.IO/FileStream.cs
new file mode 100644
index 00000000000..58ebe46783b
--- /dev/null
+++ b/mcs/class/corlib/System.IO/FileStream.cs
@@ -0,0 +1,348 @@
+//

+// System.IO/FileStream.cs

+//

+// Authors:

+//   Dietmar Maurer (dietmar@ximian.com)

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2001 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+using System.Runtime.CompilerServices;

+

+// FIXME: emit the correct exceptions everywhere. add error handling.

+

+namespace System.IO

+{

+

+	public class FileStream : Stream

+	{

+		// construct from handle

+		

+		public FileStream (IntPtr handle, FileAccess access)

+			: this (handle, access, true, DefaultBufferSize, false) {}

+

+		public FileStream (IntPtr handle, FileAccess access, bool ownsHandle)

+			: this (handle, access, ownsHandle, DefaultBufferSize, false) {}

+		

+		public FileStream (IntPtr handle, FileAccess access, bool ownsHandle, int bufferSize)

+			: this (handle, access, ownsHandle, bufferSize, false) {}

+		

+		public FileStream (IntPtr handle, FileAccess access, bool ownsHandle, int bufferSize, bool isAsync)

+		{

+			this.handle = handle;

+			this.access = access;

+			this.owner = ownsHandle;

+			this.async = isAsync;

+

+			InitBuffer (bufferSize);

+		}

+

+		// construct from filename

+		

+		public FileStream (string name, FileMode mode)

+			: this (name, mode, FileAccess.ReadWrite, FileShare.ReadWrite, DefaultBufferSize, false) { }

+

+		public FileStream (string name, FileMode mode, FileAccess access)

+			: this (name, mode, access, FileShare.ReadWrite, DefaultBufferSize, false) { }

+

+		public FileStream (string name, FileMode mode, FileAccess access, FileShare share)

+			: this (name, mode, access, share, DefaultBufferSize, false) { }

+		

+		public FileStream (string name, FileMode mode, FileAccess access, FileShare share, int bufferSize)

+			: this (name, mode, access, share, bufferSize, false) { }

+

+		public FileStream (string name, FileMode mode, FileAccess access, FileShare share, int bufferSize, bool isAsync)

+		{

+			if (name == null)

+				throw new ArgumentNullException ();

+			if (name == "" || name.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException ();

+

+			this.name = name;

+

+			// TODO: demand permissions

+

+			this.handle = MonoIO.Open (name, mode, access, share);

+			if (handle == MonoIO.InvalidHandle)

+				throw MonoIO.GetException (name);

+			

+			this.access = access;

+			this.owner = true;

+			this.async = isAsync;

+			

+			InitBuffer (bufferSize);

+		}

+

+		// properties

+		

+		public override bool CanRead {

+			get {

+				return access == FileAccess.Read ||

+				       access == FileAccess.ReadWrite;

+			}

+		}

+

+                public override bool CanWrite {

+                        get {

+				return access == FileAccess.Write ||

+				       access == FileAccess.ReadWrite;

+                        }

+                }

+

+		public override bool CanSeek {

+                        get {

+                                return true;	// FIXME: false for pipes & streams

+                        }

+                }

+

+		public string Name {

+			get {

+				return name; 

+			}

+		}

+

+		public override long Length {

+			get { return MonoIO.GetLength (handle); }

+		}

+

+		public override long Position {

+			get { return buf_start + buf_offset; }

+			set { Seek (value, SeekOrigin.Begin); }

+		}

+

+		public virtual IntPtr Handle {

+			get { return handle; }

+		}

+

+		// methods

+

+		public override int ReadByte ()

+		{

+			if (buf_offset >= buf_length) {

+				RefillBuffer ();

+

+				if (buf_length == 0)

+					return -1;

+			}

+

+			return buf [buf_offset ++];

+		}

+

+		public override void WriteByte (byte value)

+		{

+			if (buf_offset == buf_size)

+				FlushBuffer ();

+

+			buf [buf_offset ++] = value;

+			if (buf_offset > buf_length)

+				buf_length = buf_offset;

+

+			buf_dirty = true;

+		}

+

+		public override int Read (byte[] dest, int dest_offset, int count)

+		{

+			int copied = 0;

+			while (count > 0) {

+				int n = ReadSegment (dest, dest_offset + copied, count);

+				copied += n;

+				count -= n;

+

+				if (count == 0)

+					break;

+

+				if (count > buf_size) {	// shortcut for long reads

+					FlushBuffer ();

+

+					MonoIO.Seek (handle, buf_start, SeekOrigin.Begin);

+					n = MonoIO.Read (handle, dest, dest_offset + copied, count);

+

+					copied += n;

+					buf_start += n;

+					break;

+				}

+

+				RefillBuffer ();

+				if (buf_length == 0)

+					break;

+			}

+

+			return copied;

+		}

+

+		public override void Write (byte[] src, int src_offset, int count)

+		{

+			int copied = 0;

+			while (count > 0) {

+				int n = WriteSegment (src, src_offset + copied, count);

+				copied += n;

+				count -= n;

+

+				if (count == 0)

+					break;

+

+				FlushBuffer ();

+

+				if (count > buf_size) {	// shortcut for long writes

+					MonoIO.Write (handle, src, src_offset + copied, count);

+					buf_start += count;

+					break;

+				}

+			}

+		}

+

+		public override long Seek (long offset, SeekOrigin origin)

+		{

+			long pos;

+

+			// make absolute

+		

+			switch (origin) {

+			case SeekOrigin.End:

+				pos = Length - offset;

+				break;

+			

+			case SeekOrigin.Current:

+				pos = Position + offset;

+				break;

+				

+			case SeekOrigin.Begin: default:

+				pos = offset;

+				break;

+			}

+

+			if (pos >= buf_start && pos <= buf_start + buf_length) {

+				buf_offset = (int) (pos - buf_start);

+				return pos;

+			}

+

+			FlushBuffer ();

+			buf_start = MonoIO.Seek (handle, pos, SeekOrigin.Begin);

+

+			return buf_start;

+		}

+

+		public override void SetLength (long length)

+		{

+			Flush ();

+			MonoIO.SetLength (handle, length);

+		}

+

+		public override void Flush ()

+		{

+			FlushBuffer ();

+			MonoIO.Flush (handle);

+		}

+

+		public override void Close ()

+		{

+			Dispose (true);

+			GC.SuppressFinalize (this);	// remove from finalize queue

+		}

+

+		// protected

+

+		~FileStream ()

+		{

+			Dispose (false);

+		}

+

+		protected virtual void Dispose (bool disposing) {

+			if (handle != MonoIO.InvalidHandle) {

+				Flush ();

+				MonoIO.Close (handle);

+

+				handle = MonoIO.InvalidHandle;

+			}

+

+			if (disposing)

+				buf = null;

+		}

+

+		// private

+

+		private int ReadSegment (byte [] dest, int dest_offset, int count)

+		{

+			if (count > buf_length - buf_offset)

+				count = buf_length - buf_offset;

+

+			if (count > 0) {

+				Buffer.BlockCopy (buf, buf_offset, dest, dest_offset, count);

+				buf_offset += count;

+			}

+

+			return count;

+		}

+

+		private int WriteSegment (byte [] src, int src_offset, int count)

+		{

+			if (count > buf_size - buf_offset)

+				count = buf_size - buf_offset;

+

+			if (count > 0) {

+				Buffer.BlockCopy (src, src_offset, buf, buf_offset, count);

+				buf_offset += count;

+				if (buf_offset > buf_length)

+					buf_length = buf_offset;

+

+				buf_dirty = true;

+			}

+

+			return count;

+		}

+

+		private void FlushBuffer ()

+		{

+			if (buf_dirty) {

+				MonoIO.Seek (handle, buf_start, SeekOrigin.Begin);

+				MonoIO.Write (handle, buf, 0, buf_length);

+			}

+

+			buf_start += buf_length;

+			buf_offset = buf_length = 0;

+			buf_dirty = false;

+		}

+

+		private void RefillBuffer ()

+		{

+			FlushBuffer ();

+			

+			MonoIO.Seek (handle, buf_start, SeekOrigin.Begin);

+			buf_length = MonoIO.Read (handle, buf, 0, buf_size);

+		}

+

+		private void InitBuffer (int size)

+		{

+			if (size < 0)

+				throw new ArgumentOutOfRangeException ("Buffer size cannot be negative.");

+			if (size < 8)

+				size = 8;

+		

+			buf = new byte [size];

+			buf_size = size;

+			buf_start = 0;

+			buf_offset = buf_length = 0;

+			buf_dirty = false;

+		}

+

+		// fields

+

+		private static int DefaultBufferSize = 8192;

+

+		private FileAccess access;

+		private bool owner;

+		private bool async;

+

+		private byte [] buf;			// the buffer

+		private int buf_size;			// capacity in bytes

+		private int buf_length;			// number of valid bytes in buffer

+		private int buf_offset;			// position of next byte

+		private bool buf_dirty;			// true if buffer has been written to

+		private long buf_start;			// location of buffer in file

+		private string name = "[Unknown]";	// name of file.

+

+		IntPtr handle;				// handle to underlying file

+	}

+}

diff --git a/mcs/class/corlib/System.IO/FileSystemInfo.cs b/mcs/class/corlib/System.IO/FileSystemInfo.cs
new file mode 100644
index 00000000000..b03e43395cd
--- /dev/null
+++ b/mcs/class/corlib/System.IO/FileSystemInfo.cs
@@ -0,0 +1,133 @@
+//------------------------------------------------------------------------------
+// 
+// System.IO.FileSystemInfo.cs 
+//
+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved
+// 
+// Author:         Jim Richardson, develop@wtfo-guru.com
+//                 Dan Lewis (dihlewis@yahoo.co.uk)
+// Created:        Monday, August 13, 2001 
+//
+//------------------------------------------------------------------------------
+
+using System;
+
+namespace System.IO {
+	
+	[Serializable]
+	public abstract class FileSystemInfo : MarshalByRefObject {
+		// public properties
+
+		public abstract bool Exists { get; }
+
+		public abstract string Name { get; }
+
+		public virtual string FullName {
+			get {
+				return FullPath;
+			}
+		}
+
+		public string Extension {
+			get {
+				return Path.GetExtension (Name);
+			}
+		}
+
+		public FileAttributes Attributes {
+			get {
+				Refresh (false);
+				return stat.Attributes;
+			}
+
+			set {
+				if (!MonoIO.SetFileAttributes (FullName, value))
+					throw MonoIO.GetException ();
+			}
+		}
+
+		public DateTime CreationTime {
+			get {
+				Refresh (false);
+				return DateTime.FromFileTime (stat.CreationTime);
+			}
+
+			set {
+				long filetime = value.ToFileTime ();
+			
+				if (!MonoIO.SetFileTime (FullName, filetime, -1, -1))
+					throw MonoIO.GetException ();
+			}
+		}
+
+		public DateTime LastAccessTime {
+			get {
+				Refresh (false);
+				return DateTime.FromFileTime (stat.LastAccessTime);
+			}
+
+			set {
+				long filetime = value.ToFileTime ();
+
+				if (!MonoIO.SetFileTime (FullName, -1, filetime, -1))
+					throw MonoIO.GetException ();
+			}
+		}
+
+		public DateTime LastWriteTime {
+			get {
+				Refresh (false);
+				return DateTime.FromFileTime (stat.LastWriteTime);
+			}
+
+			set {
+				long filetime = value.ToFileTime ();
+
+				if (!MonoIO.SetFileTime (FullName, -1, -1, filetime))
+					throw MonoIO.GetException ();
+			}
+		}
+
+		// public methods
+
+		public abstract void Delete ();
+
+		public void Refresh ()
+		{
+			Refresh (true);
+		}
+
+		// protected
+
+		protected FileSystemInfo ()
+		{
+			this.valid = false;
+			this.FullPath = null;
+		}
+
+		protected string FullPath;
+		protected string OriginalPath;
+
+		// internal
+
+		internal void Refresh (bool force)
+		{
+			if (valid && !force)
+				return;
+
+			MonoIO.GetFileStat (FullName, out stat);
+			valid = true;
+		}
+
+		internal void CheckPath (string path)
+		{
+			if (path == null)
+				throw new ArgumentNullException ();
+			if (path.IndexOfAny (Path.InvalidPathChars) != -1)
+				throw new ArgumentException ("Invalid characters in path.");
+		}
+
+		internal MonoIOStat stat;
+		internal bool valid;
+	}
+}
diff --git a/mcs/class/corlib/System.IO/IOException.cs b/mcs/class/corlib/System.IO/IOException.cs
new file mode 100644
index 00000000000..74593cd03cf
--- /dev/null
+++ b/mcs/class/corlib/System.IO/IOException.cs
@@ -0,0 +1,43 @@
+//
+// System.IO.IOException.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+
+namespace System.IO {
+	[Serializable]
+	public class IOException : SystemException {
+
+		// Constructors
+		public IOException ()
+			: base ("I/O Error")
+		{
+		}
+
+		public IOException (string message)
+			: base (message)
+		{
+		}
+
+		public IOException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected IOException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+
+		public IOException (string message, int hresult)
+			: base (message)
+		{
+			this.HResult = hresult;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.IO/MemoryStream.cs b/mcs/class/corlib/System.IO/MemoryStream.cs
new file mode 100644
index 00000000000..2d0ba613512
--- /dev/null
+++ b/mcs/class/corlib/System.IO/MemoryStream.cs
@@ -0,0 +1,409 @@
+//

+// System.IO.MemoryStream 

+//

+// Author: Marcin Szczepanski (marcins@zipworld.com.au)

+//

+// TODO: Clarify some of the lamespec issues

+//

+

+namespace System.IO {

+		[Serializable]

+        public class MemoryStream : Stream {

+                private bool canRead;

+                private bool canSeek;

+                private bool canWrite;

+                

+                private bool allowGetBuffer;

+

+                private int capacity;

+

+                private byte[] internalBuffer;

+

+                private int initialLength;

+                private bool expandable;

+

+                private bool streamClosed = false;

+

+                private long position = 0;

+                

+                public MemoryStream() {

+                        canRead = true;

+                        canSeek = true;

+                        canWrite = true;

+

+                        capacity = 0;

+

+                        internalBuffer = new byte[0];   

+

+                        allowGetBuffer = true;

+                        expandable = true;

+                }

+

+                public MemoryStream( byte[] buffer ) {

+                        InternalConstructor( buffer, 0, buffer.Length, true, false );                        

+                }

+

+                public MemoryStream( int capacity ) {

+                        

+                        canRead = true;

+                        canSeek = true;

+                        canWrite = true;

+                        

+                        this.capacity = capacity;

+                        initialLength = 0;

+                        internalBuffer = new byte[ 0 ];

+

+                        expandable = true;

+                        allowGetBuffer = true;

+                }

+

+                public MemoryStream( byte[] buffer, bool writeable ) {

+                        if( buffer == null ) {

+                                throw new ArgumentNullException();

+                        }

+

+                        InternalConstructor( buffer, 0, buffer.Length, writeable, true );

+

+                }

+ 

+                public MemoryStream( byte[] buffer, int index, int count ) { 

+                        if( buffer == null ) {

+                                throw new ArgumentNullException();

+                        }

+                        

+                        InternalConstructor( buffer, index, count, true, false );                                        

+                }

+                

+                public MemoryStream( byte[] buffer, int index, int count, bool writeable ) { 

+                        

+                        if( buffer == null ) {

+                                throw new ArgumentNullException();

+                        }

+                        

+                        InternalConstructor( buffer, index, count, writeable, true );        

+                }

+

+                public MemoryStream( byte[] buffer, int index, int count, bool writeable, bool publicallyVisible ) {

+                        InternalConstructor( buffer, index, count, writeable, publicallyVisible );

+                }

+

+                private void InternalConstructor( byte[] buffer, int index, int count, bool writeable, bool publicallyVisible ) {

+                

+                        if( buffer == null ) {

+                                throw new ArgumentNullException();

+                        } else if ( index < 0 || count < 0 ) {

+                                throw new ArgumentOutOfRangeException();

+                        } else if ( buffer.Length - index < count ) {

+                                throw new ArgumentException();

+                        }

+

+                        // LAMESPEC: The spec says to throw an UnauthorisedAccessException if

+                        // publicallyVisibile is fale?!  Doesn't that defy the point of having

+                        // it there in the first place.  I'll leave it out for now.

+                        

+                        canRead = true;

+                        canSeek = true;

+                        canWrite = writeable;

+

+                        initialLength = count;

+

+                        internalBuffer = new byte[ count ];

+                        capacity = count;

+

+                        Array.Copy( buffer, index, internalBuffer, 0, count );

+

+                        allowGetBuffer = publicallyVisible;

+                        expandable = false;                

+                 }

+

+                 public override bool CanRead {

+                        get {

+                                return this.canRead;

+                        }

+                }

+

+                public override bool CanSeek {

+                        get {

+                                return this.canSeek;

+                        }

+                }

+

+                public override bool CanWrite {

+                        get {

+                                return this.canWrite;

+                        }

+                }

+

+                public virtual int Capacity {

+                        get {

+                                return this.capacity;

+                        }

+

+                        set {

+                                if( value < 0 || value < capacity ) {

+                                        throw new ArgumentOutOfRangeException( "New capacity cannot be negative or less than the current capacity" );

+                                } else if( !expandable ) {

+                                        throw new NotSupportedException( "Cannot expand this MemoryStream" );

+                                }

+

+                                byte[] newBuffer = new byte[ value ];

+                                Array.Copy( internalBuffer, 0, newBuffer, 0, capacity );

+                                capacity = value;

+                        }

+                }

+

+                public override long Length {

+                        get {

+                                // LAMESPEC: The spec says to throw an IOException if the

+                                // stream is closed and an ObjectDisposedException if

+                                // "methods were called after the stream was closed".  What

+                                // is the difference?

+

+                                if( streamClosed ) {

+                                        throw new IOException( "MemoryStream is closed" );

+                                }

+                                

+                                return internalBuffer.Length;

+                        }

+                }

+

+                public override long Position {

+                        get {

+                                if( streamClosed ) {

+                                        throw new IOException( "MemoryStream is closed" );

+                                }

+

+                                return position;

+                        }

+

+                        set {

+

+                                if( position < 0 ) {

+                                        throw new ArgumentOutOfRangeException( "Position cannot be negative" );

+                                } else if( streamClosed ) {

+                                        throw new IOException( "MemoryStream is closed" );

+                                }

+                                

+                                position = value;

+

+                                if( position > internalBuffer.Length + 1 ) {

+                                        position = internalBuffer.Length + 1;

+                                }

+                        }

+                }

+                

+                public override void Close() {

+                        if( streamClosed ) {

+                                throw new IOException( "MemoryStream already closed" );

+                        }

+

+                        streamClosed = true;

+                }

+

+                public override void Flush() { }

+

+                public virtual byte[] GetBuffer() {

+                        if( !allowGetBuffer ) {

+                                throw new UnauthorizedAccessException();

+                        }  

+

+                        return internalBuffer;

+                }

+

+                public override int Read( byte[] buffer, int offset, int count ) {

+                        if( buffer == null ) {

+                                throw new ArgumentNullException();

+                        } else if( offset < 0 || count < 0 ) {

+                                throw new ArgumentOutOfRangeException();

+                        } else if( buffer.Length - offset < count ) {

+                                throw new ArgumentException();

+                        } else if ( streamClosed ) {

+                                throw new ObjectDisposedException( "MemoryStream" );

+                        }

+

+                        long ReadTo;

+

+                        if( position + count > internalBuffer.Length ) {

+                                ReadTo = internalBuffer.Length;

+                        } else {

+                                ReadTo = position + (long)count;

+                        }

+

+                        Array.Copy( internalBuffer, (int)position, buffer, offset, (int)(ReadTo - position) );

+

+                        int bytesRead = (int)(ReadTo - position);

+

+                        position = ReadTo;

+

+                        return bytesRead;

+                }

+

+                public override int ReadByte( ) {

+                        if( streamClosed ) {

+                                throw new ObjectDisposedException( "MemoryStream" );

+                        }

+

+

+                        // LAMESPEC: What happens if we're at the end of the stream?  It's unspecified in the

+                        // docs but tests against the MS impl. show it returns -1

+                        //

+

+                        if( position >= internalBuffer.Length ) {

+                                return -1;

+                        } else {

+                                return internalBuffer[ position++ ];

+                        }

+                }

+                 

+                public override long Seek( long offset, SeekOrigin loc ) { 

+                        long refPoint;

+

+                        if( streamClosed ) {

+                                throw new ObjectDisposedException( "MemoryStream" );

+                        }

+

+                        switch( loc ) {

+                                case SeekOrigin.Begin:

+                                        refPoint = 0;

+                                        break;

+                                case SeekOrigin.Current:

+                                        refPoint = position;

+                                        break;

+                                case SeekOrigin.End:

+                                        refPoint = internalBuffer.Length;

+                                        break;

+                                default:

+                                        throw new ArgumentException( "Invalid SeekOrigin" );

+                        }

+

+                        // LAMESPEC: My goodness, how may LAMESPECs are there in this

+                        // class! :)  In the spec for the Position property it's stated

+                        // "The position must not be more than one byte beyond the end of the stream."

+                        // In the spec for seek it says "Seeking to any location beyond the length of the 

+                        // stream is supported."  That's a contradiction i'd say.

+                        // I guess seek can go anywhere but if you use position it may get moved back.

+

+                        if( refPoint + offset < 0 ) {

+                                throw new IOException( "Attempted to seek before start of MemoryStream" );

+                        } else if( offset > internalBuffer.Length ) {

+                                throw new ArgumentOutOfRangeException( "Offset cannot be greater than length of MemoryStream" );

+                        }

+

+                        position = refPoint + offset;

+

+                        return position;

+                }

+                

+                

+                public override void SetLength( long value ) { 

+                        if( streamClosed ) {

+                                throw new ObjectDisposedException( "MemoryStream" );                        

+                        } else if( !expandable && value > capacity ) {

+                                throw new NotSupportedException( "Expanding this MemoryStream is not supported" );

+                        } else if( !canWrite ) {

+                                throw new IOException( "Cannot write to this MemoryStream" );

+                        } else if( value < 0 ) {

+

+                                // LAMESPEC: AGAIN! It says to throw this exception if value is

+                                // greater than "the maximum length of the MemoryStream".  I haven't

+                                // seen anywhere mention what the maximum length of a MemoryStream is and

+                                // since we're this far this memory stream is expandable.

+

+                                throw new ArgumentOutOfRangeException();

+                        } 

+

+                        byte[] newBuffer;

+			newBuffer = new byte[ value ];

+                        

+                        if (value < internalBuffer.Length) {

+                                // truncate

+                                Array.Copy( internalBuffer, 0, newBuffer, 0, (int)value );                              

+                        } else {

+                                // expand

+                                 Array.Copy( internalBuffer, 0, newBuffer, 0, internalBuffer.Length );

+                        }

+                        internalBuffer = newBuffer;

+                        capacity = (int)value;

+

+                }

+                

+                

+                public virtual byte[] ToArray() { 

+                

+                        if( streamClosed ) {

+                                throw new ArgumentException( "The MemoryStream has been closed" );

+                        }

+                              

+                        byte[] outBuffer = new byte[capacity];

+                        Array.Copy( internalBuffer, 0, outBuffer, 0, capacity);

+                        return outBuffer; 

+                }

+

+                // LAMESPEC: !!  It says that "offset" is "offset in buffer at which

+                // to begin writing", I presume this should be "offset in buffer at which

+                // to begin reading"

+

+                public override void Write( byte[] buffer, int offset, int count ) { 

+                        if( buffer == null ) {

+                                throw new ArgumentNullException();

+                        } else if( !canWrite ) {

+                                throw new NotSupportedException();

+                        } else if( buffer.Length - offset < count ) {

+                                throw new ArgumentException();

+                        } else if( offset < 0 || count < 0 ) {

+                                throw new ArgumentOutOfRangeException();

+                        } else if( streamClosed ) {

+                                throw new ObjectDisposedException( "MemoryStream" );

+                        }

+

+			if( position + count > capacity ) {

+				if( expandable ) {

+					// expand the buffer

+					SetLength( position + count );                       

+				} else {

+					// only write as many bytes as will fit

+					count = (int)((long)capacity - position);

+				}

+			}

+

+			// internal buffer may not be allocated all the way up to capacity

+			// count will already be limited to capacity above if non-expandable

+			if( position + count >= internalBuffer.Length )

+				SetLength( position + count );

+

+                        Array.Copy( buffer, offset, internalBuffer, (int)position, count );

+                        position += count;

+                

+                }

+

+

+                public override void WriteByte( byte value ) { 

+                        if ( streamClosed )

+                                throw new ObjectDisposedException( "MemoryStream" );

+			else if( !canWrite || (position >= capacity && !expandable))

+                                throw new NotSupportedException();

+

+                        if ( position >= capacity )

+                                SetLength( capacity + 1 );

+

+			if( position >= internalBuffer.Length )

+				SetLength ( position + 1 );

+

+			internalBuffer[ position++ ] = value;

+                }

+                

+

+                public virtual void WriteTo( Stream stream ) { 

+                        if( stream == null ) {

+                                throw new ArgumentNullException();

+                        }

+

+                        stream.Write( internalBuffer, 0, internalBuffer.Length );

+                

+                }

+                               

+                       

+        }               

+

+

+}                      

diff --git a/mcs/class/corlib/System.IO/MonoIO.cs b/mcs/class/corlib/System.IO/MonoIO.cs
new file mode 100644
index 00000000000..ae7e5d16625
--- /dev/null
+++ b/mcs/class/corlib/System.IO/MonoIO.cs
@@ -0,0 +1,228 @@
+//
+// System.IO.MonoIO.cs: static interface to native filesystem.
+//
+// Author:
+//   Dan Lewis (dihlewis@yahoo.co.uk)
+//   Dick Porter (dick@ximian.com)
+//
+// (C) 2002
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.IO
+{
+	internal sealed class MonoIO {
+		public static readonly FileAttributes
+			InvalidFileAttributes = (FileAttributes)(-1);
+
+		public static readonly IntPtr
+			InvalidHandle = (IntPtr)(-1);
+
+		// error methods
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static MonoIOError GetLastError ();
+
+		public static Exception GetException ()
+		{
+			return GetException (String.Empty);
+		}
+
+		public static Exception GetException (string path)
+		{
+			MonoIOError error = GetLastError ();
+			string message;
+
+			switch (error) {
+			// FIXME: add more exception mappings here
+			case MonoIOError.ERROR_FILE_NOT_FOUND:
+				message = String.Format ("Could not find file \"{0}\"", path);
+				return new FileNotFoundException (message);
+
+			case MonoIOError.ERROR_PATH_NOT_FOUND:
+				message = String.Format ("Could not find a part of the path \"{0}\"", path);
+				return new DirectoryNotFoundException (message);
+
+			case MonoIOError.ERROR_ACCESS_DENIED:
+				message = String.Format ("Access to the path \"{0}\" is denied.", path);
+				return new UnauthorizedAccessException (message);
+
+			default:
+				message = String.Format ("Win32 IO returned {0}", error);
+				return new IOException (message);
+			}
+		}
+
+		// directory methods
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool CreateDirectory (string path);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool RemoveDirectory (string path);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static IntPtr FindFirstFile (string path, out MonoIOStat stat);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool FindNextFile (IntPtr find, out MonoIOStat stat);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool FindClose (IntPtr find);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static string GetCurrentDirectory ();
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool SetCurrentDirectory (string path);
+
+		// file methods
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool MoveFile (string path, string dest);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool CopyFile (string path, string dest, bool overwrite);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool DeleteFile (string path);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static FileAttributes GetFileAttributes (string path);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool SetFileAttributes (string path, FileAttributes attrs);
+
+		public static bool Exists (string path)
+		{
+			FileAttributes attrs = GetFileAttributes (path);
+			if (attrs == InvalidFileAttributes)
+				return false;
+
+			return true;
+		}
+
+		public static bool ExistsFile (string path)
+		{
+			FileAttributes attrs = GetFileAttributes (path);
+			if (attrs == InvalidFileAttributes)
+				return false;
+
+			if ((attrs & FileAttributes.Directory) != 0)
+				return false;
+
+			return true;
+		}
+
+		public static bool ExistsDirectory (string path)
+		{
+			FileAttributes attrs = GetFileAttributes (path);
+			if (attrs == InvalidFileAttributes)
+				return false;
+
+			if ((attrs & FileAttributes.Directory) == 0)
+				return false;
+
+			return true;
+		}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool GetFileStat (string path, out MonoIOStat stat);
+
+		// handle methods
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static IntPtr Open (string filename, FileMode mode, FileAccess access, FileShare share);
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool Close (IntPtr handle);
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static int Read (IntPtr handle, byte [] dest, int dest_offset, int count);
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static int Write (IntPtr handle, byte [] src, int src_offset, int count);
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static long Seek (IntPtr handle, long offset, SeekOrigin origin);
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool Flush (IntPtr handle);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static long GetLength (IntPtr handle);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool SetLength (IntPtr handle, long length);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool SetFileTime (IntPtr handle, long creation_time, long last_access_time, long last_write_time);
+
+		public static bool SetFileTime (string path, long creation_time, long last_access_time, long last_write_time)
+		{
+			IntPtr handle;
+			bool result;
+
+			handle = Open (path, FileMode.Open, FileAccess.ReadWrite, FileShare.ReadWrite);
+			if (handle == IntPtr.Zero)
+				return false;
+
+			result = SetFileTime (handle, creation_time, last_access_time, last_write_time);
+			Close (handle);
+			
+			return result;
+		}
+
+		// console handles
+
+		public extern static IntPtr ConsoleOutput {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		public extern static IntPtr ConsoleInput {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		public extern static IntPtr ConsoleError {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		// pipe handles
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static bool CreatePipe (out IntPtr read_handle, out IntPtr write_handle);
+
+		// path characters
+
+		public extern static char VolumeSeparatorChar {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		public extern static char DirectorySeparatorChar {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		public extern static char AltDirectorySeparatorChar {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		public extern static char PathSeparator {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		public extern static char [] InvalidPathChars {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/System.IO/MonoIOError.cs b/mcs/class/corlib/System.IO/MonoIOError.cs
new file mode 100644
index 00000000000..6996b6b1253
--- /dev/null
+++ b/mcs/class/corlib/System.IO/MonoIOError.cs
@@ -0,0 +1,1798 @@
+//

+// System.IO.MonoIOError.cs: Win32 error codes. Yuck.

+//

+// Author:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+

+using System;

+

+namespace System.IO

+{

+	internal enum MonoIOError {

+		ERROR_SUCCESS = 0,

+		ERROR_INVALID_FUNCTION = 1,

+		ERROR_FILE_NOT_FOUND = 2,

+		ERROR_PATH_NOT_FOUND = 3,

+		ERROR_TOO_MANY_OPEN_FILES = 4,

+		ERROR_ACCESS_DENIED = 5,

+		ERROR_INVALID_HANDLE = 6,

+		ERROR_ARENA_TRASHED = 7,

+		ERROR_NOT_ENOUGH_MEMORY = 8,

+		ERROR_INVALID_BLOCK = 9,

+		ERROR_BAD_ENVIRONMENT = 10,

+		ERROR_BAD_FORMAT = 11,

+		ERROR_INVALID_ACCESS = 12,

+		ERROR_INVALID_DATA = 13,

+		ERROR_OUTOFMEMORY = 14,

+		ERROR_INVALID_DRIVE = 15,

+		ERROR_CURRENT_DIRECTORY = 16,

+		ERROR_NOT_SAME_DEVICE = 17,

+		ERROR_NO_MORE_FILES = 18,

+		ERROR_WRITE_PROTECT = 19,

+		ERROR_BAD_UNIT = 20,

+		ERROR_NOT_READY = 21,

+		ERROR_BAD_COMMAND = 22,

+		ERROR_CRC = 23,

+		ERROR_BAD_LENGTH = 24,

+		ERROR_SEEK = 25,

+		ERROR_NOT_DOS_DISK = 26,

+		ERROR_SECTOR_NOT_FOUND = 27,

+		ERROR_OUT_OF_PAPER = 28,

+		ERROR_WRITE_FAULT = 29,

+		ERROR_READ_FAULT = 30,

+		ERROR_GEN_FAILURE = 31,

+		ERROR_SHARING_VIOLATION = 32,

+		ERROR_LOCK_VIOLATION = 33,

+		ERROR_WRONG_DISK = 34,

+		ERROR_SHARING_BUFFER_EXCEEDED = 36,

+		ERROR_HANDLE_EOF = 38,

+		ERROR_HANDLE_DISK_FULL = 39,

+		ERROR_NOT_SUPPORTED = 50,

+		ERROR_REM_NOT_LIST = 51,

+		ERROR_DUP_NAME = 52,

+		ERROR_BAD_NETPATH = 53,

+		ERROR_NETWORK_BUSY = 54,

+		ERROR_DEV_NOT_EXIST = 55,

+		ERROR_TOO_MANY_CMDS = 56,

+		ERROR_ADAP_HDW_ERR = 57,

+		ERROR_BAD_NET_RESP = 58,

+		ERROR_UNEXP_NET_ERR = 59,

+		ERROR_BAD_REM_ADAP = 60,

+		ERROR_PRINTQ_FULL = 61,

+		ERROR_NO_SPOOL_SPACE = 62,

+		ERROR_PRINT_CANCELLED = 63,

+		ERROR_NETNAME_DELETED = 64,

+		ERROR_NETWORK_ACCESS_DENIED = 65,

+		ERROR_BAD_DEV_TYPE = 66,

+		ERROR_BAD_NET_NAME = 67,

+		ERROR_TOO_MANY_NAMES = 68,

+		ERROR_TOO_MANY_SESS = 69,

+		ERROR_SHARING_PAUSED = 70,

+		ERROR_REQ_NOT_ACCEP = 71,

+		ERROR_REDIR_PAUSED = 72,

+		ERROR_FILE_EXISTS = 80,

+		ERROR_CANNOT_MAKE = 82,

+		ERROR_FAIL_I24 = 83,

+		ERROR_OUT_OF_STRUCTURES = 84,

+		ERROR_ALREADY_ASSIGNED = 85,

+		ERROR_INVALID_PASSWORD = 86,

+		ERROR_INVALID_PARAMETER = 87,

+		ERROR_NET_WRITE_FAULT = 88,

+		ERROR_NO_PROC_SLOTS = 89,

+		ERROR_TOO_MANY_SEMAPHORES = 100,

+		ERROR_EXCL_SEM_ALREADY_OWNED = 101,

+		ERROR_SEM_IS_SET = 102,

+		ERROR_TOO_MANY_SEM_REQUESTS = 103,

+		ERROR_INVALID_AT_INTERRUPT_TIME = 104,

+		ERROR_SEM_OWNER_DIED = 105,

+		ERROR_SEM_USER_LIMIT = 106,

+		ERROR_DISK_CHANGE = 107,

+		ERROR_DRIVE_LOCKED = 108,

+		ERROR_BROKEN_PIPE = 109,

+		ERROR_OPEN_FAILED = 110,

+		ERROR_BUFFER_OVERFLOW = 111,

+		ERROR_DISK_FULL = 112,

+		ERROR_NO_MORE_SEARCH_HANDLES = 113,

+		ERROR_INVALID_TARGET_HANDLE = 114,

+		ERROR_INVALID_CATEGORY = 117,

+		ERROR_INVALID_VERIFY_SWITCH = 118,

+		ERROR_BAD_DRIVER_LEVEL = 119,

+		ERROR_CALL_NOT_IMPLEMENTED = 120,

+		ERROR_SEM_TIMEOUT = 121,

+		ERROR_INSUFFICIENT_BUFFER = 122,

+		ERROR_INVALID_NAME = 123,

+		ERROR_INVALID_LEVEL = 124,

+		ERROR_NO_VOLUME_LABEL = 125,

+		ERROR_MOD_NOT_FOUND = 126,

+		ERROR_PROC_NOT_FOUND = 127,

+		ERROR_WAIT_NO_CHILDREN = 128,

+		ERROR_CHILD_NOT_COMPLETE = 129,

+		ERROR_DIRECT_ACCESS_HANDLE = 130,

+		ERROR_NEGATIVE_SEEK = 131,

+		ERROR_SEEK_ON_DEVICE = 132,

+		ERROR_IS_JOIN_TARGET = 133,

+		ERROR_IS_JOINED = 134,

+		ERROR_IS_SUBSTED = 135,

+		ERROR_NOT_JOINED = 136,

+		ERROR_NOT_SUBSTED = 137,

+		ERROR_JOIN_TO_JOIN = 138,

+		ERROR_SUBST_TO_SUBST = 139,

+		ERROR_JOIN_TO_SUBST = 140,

+		ERROR_SUBST_TO_JOIN = 141,

+		ERROR_BUSY_DRIVE = 142,

+		ERROR_SAME_DRIVE = 143,

+		ERROR_DIR_NOT_ROOT = 144,

+		ERROR_DIR_NOT_EMPTY = 145,

+		ERROR_IS_SUBST_PATH = 146,

+		ERROR_IS_JOIN_PATH = 147,

+		ERROR_PATH_BUSY = 148,

+		ERROR_IS_SUBST_TARGET = 149,

+		ERROR_SYSTEM_TRACE = 150,

+		ERROR_INVALID_EVENT_COUNT = 151,

+		ERROR_TOO_MANY_MUXWAITERS = 152,

+		ERROR_INVALID_LIST_FORMAT = 153,

+		ERROR_LABEL_TOO_LONG = 154,

+		ERROR_TOO_MANY_TCBS = 155,

+		ERROR_SIGNAL_REFUSED = 156,

+		ERROR_DISCARDED = 157,

+		ERROR_NOT_LOCKED = 158,

+		ERROR_BAD_THREADID_ADDR = 159,

+		ERROR_BAD_ARGUMENTS = 160,

+		ERROR_BAD_PATHNAME = 161,

+		ERROR_SIGNAL_PENDING = 162,

+		ERROR_MAX_THRDS_REACHED = 164,

+		ERROR_LOCK_FAILED = 167,

+		ERROR_BUSY = 170,

+		ERROR_CANCEL_VIOLATION = 173,

+		ERROR_ATOMIC_LOCKS_NOT_SUPPORTED = 174,

+		ERROR_INVALID_SEGMENT_NUMBER = 180,

+		ERROR_INVALID_ORDINAL = 182,

+		ERROR_ALREADY_EXISTS = 183,

+		ERROR_INVALID_FLAG_NUMBER = 186,

+		ERROR_SEM_NOT_FOUND = 187,

+		ERROR_INVALID_STARTING_CODESEG = 188,

+		ERROR_INVALID_STACKSEG = 189,

+		ERROR_INVALID_MODULETYPE = 190,

+		ERROR_INVALID_EXE_SIGNATURE = 191,

+		ERROR_EXE_MARKED_INVALID = 192,

+		ERROR_BAD_EXE_FORMAT = 193,

+		ERROR_ITERATED_DATA_EXCEEDS_64k = 194,

+		ERROR_INVALID_MINALLOCSIZE = 195,

+		ERROR_DYNLINK_FROM_INVALID_RING = 196,

+		ERROR_IOPL_NOT_ENABLED = 197,

+		ERROR_INVALID_SEGDPL = 198,

+		ERROR_AUTODATASEG_EXCEEDS_64k = 199,

+		ERROR_RING2SEG_MUST_BE_MOVABLE = 200,

+		ERROR_RELOC_CHAIN_XEEDS_SEGLIM = 201,

+		ERROR_INFLOOP_IN_RELOC_CHAIN = 202,

+		ERROR_ENVVAR_NOT_FOUND = 203,

+		ERROR_NO_SIGNAL_SENT = 205,

+		ERROR_FILENAME_EXCED_RANGE = 206,

+		ERROR_RING2_STACK_IN_USE = 207,

+		ERROR_META_EXPANSION_TOO_LONG = 208,

+		ERROR_INVALID_SIGNAL_NUMBER = 209,

+		ERROR_THREAD_1_INACTIVE = 210,

+		ERROR_LOCKED = 212,

+		ERROR_TOO_MANY_MODULES = 214,

+		ERROR_NESTING_NOT_ALLOWED = 215,

+		ERROR_EXE_MACHINE_TYPE_MISMATCH = 216,

+		ERROR_BAD_PIPE = 230,

+		ERROR_PIPE_BUSY = 231,

+		ERROR_NO_DATA = 232,

+		ERROR_PIPE_NOT_CONNECTED = 233,

+		ERROR_MORE_DATA = 234,

+		ERROR_VC_DISCONNECTED = 240,

+		ERROR_INVALID_EA_NAME = 254,

+		ERROR_EA_LIST_INCONSISTENT = 255,

+		WAIT_TIMEOUT = 258,

+		ERROR_NO_MORE_ITEMS = 259,

+		ERROR_CANNOT_COPY = 266,

+		ERROR_DIRECTORY = 267,

+		ERROR_EAS_DIDNT_FIT = 275,

+		ERROR_EA_FILE_CORRUPT = 276,

+		ERROR_EA_TABLE_FULL = 277,

+		ERROR_INVALID_EA_HANDLE = 278,

+		ERROR_EAS_NOT_SUPPORTED = 282,

+		ERROR_NOT_OWNER = 288,

+		ERROR_TOO_MANY_POSTS = 298,

+		ERROR_PARTIAL_COPY = 299,

+		ERROR_OPLOCK_NOT_GRANTED = 300,

+		ERROR_INVALID_OPLOCK_PROTOCOL = 301,

+		ERROR_DISK_TOO_FRAGMENTED = 302,

+		ERROR_DELETE_PENDING = 303,

+		ERROR_MR_MID_NOT_FOUND = 317,

+		ERROR_INVALID_ADDRESS = 487,

+		ERROR_ARITHMETIC_OVERFLOW = 534,

+		ERROR_PIPE_CONNECTED = 535,

+		ERROR_PIPE_LISTENING = 536,

+		ERROR_EA_ACCESS_DENIED = 994,

+		ERROR_OPERATION_ABORTED = 995,

+		ERROR_IO_INCOMPLETE = 996,

+		ERROR_IO_PENDING = 997,

+		ERROR_NOACCESS = 998,

+		ERROR_SWAPERROR = 999,

+		ERROR_STACK_OVERFLOW = 1001,

+		ERROR_INVALID_MESSAGE = 1002,

+		ERROR_CAN_NOT_COMPLETE = 1003,

+		ERROR_INVALID_FLAGS = 1004,

+		ERROR_UNRECOGNIZED_VOLUME = 1005,

+		ERROR_FILE_INVALID = 1006,

+		ERROR_FULLSCREEN_MODE = 1007,

+		ERROR_NO_TOKEN = 1008,

+		ERROR_BADDB = 1009,

+		ERROR_BADKEY = 1010,

+		ERROR_CANTOPEN = 1011,

+		ERROR_CANTREAD = 1012,

+		ERROR_CANTWRITE = 1013,

+		ERROR_REGISTRY_RECOVERED = 1014,

+		ERROR_REGISTRY_CORRUPT = 1015,

+		ERROR_REGISTRY_IO_FAILED = 1016,

+		ERROR_NOT_REGISTRY_FILE = 1017,

+		ERROR_KEY_DELETED = 1018,

+		ERROR_NO_LOG_SPACE = 1019,

+		ERROR_KEY_HAS_CHILDREN = 1020,

+		ERROR_CHILD_MUST_BE_VOLATILE = 1021,

+		ERROR_NOTIFY_ENUM_DIR = 1022,

+		ERROR_DEPENDENT_SERVICES_RUNNING = 1051,

+		ERROR_INVALID_SERVICE_CONTROL = 1052,

+		ERROR_SERVICE_REQUEST_TIMEOUT = 1053,

+		ERROR_SERVICE_NO_THREAD = 1054,

+		ERROR_SERVICE_DATABASE_LOCKED = 1055,

+		ERROR_SERVICE_ALREADY_RUNNING = 1056,

+		ERROR_INVALID_SERVICE_ACCOUNT = 1057,

+		ERROR_SERVICE_DISABLED = 1058,

+		ERROR_CIRCULAR_DEPENDENCY = 1059,

+		ERROR_SERVICE_DOES_NOT_EXIST = 1060,

+		ERROR_SERVICE_CANNOT_ACCEPT_CTRL = 1061,

+		ERROR_SERVICE_NOT_ACTIVE = 1062,

+		ERROR_FAILED_SERVICE_CONTROLLER_CONNECT = 1063,

+		ERROR_EXCEPTION_IN_SERVICE = 1064,

+		ERROR_DATABASE_DOES_NOT_EXIST = 1065,

+		ERROR_SERVICE_SPECIFIC_ERROR = 1066,

+		ERROR_PROCESS_ABORTED = 1067,

+		ERROR_SERVICE_DEPENDENCY_FAIL = 1068,

+		ERROR_SERVICE_LOGON_FAILED = 1069,

+		ERROR_SERVICE_START_HANG = 1070,

+		ERROR_INVALID_SERVICE_LOCK = 1071,

+		ERROR_SERVICE_MARKED_FOR_DELETE = 1072,

+		ERROR_SERVICE_EXISTS = 1073,

+		ERROR_ALREADY_RUNNING_LKG = 1074,

+		ERROR_SERVICE_DEPENDENCY_DELETED = 1075,

+		ERROR_BOOT_ALREADY_ACCEPTED = 1076,

+		ERROR_SERVICE_NEVER_STARTED = 1077,

+		ERROR_DUPLICATE_SERVICE_NAME = 1078,

+		ERROR_DIFFERENT_SERVICE_ACCOUNT = 1079,

+		ERROR_CANNOT_DETECT_DRIVER_FAILURE = 1080,

+		ERROR_CANNOT_DETECT_PROCESS_ABORT = 1081,

+		ERROR_NO_RECOVERY_PROGRAM = 1082,

+		ERROR_SERVICE_NOT_IN_EXE = 1083,

+		ERROR_NOT_SAFEBOOT_SERVICE = 1084,

+		ERROR_END_OF_MEDIA = 1100,

+		ERROR_FILEMARK_DETECTED = 1101,

+		ERROR_BEGINNING_OF_MEDIA = 1102,

+		ERROR_SETMARK_DETECTED = 1103,

+		ERROR_NO_DATA_DETECTED = 1104,

+		ERROR_PARTITION_FAILURE = 1105,

+		ERROR_INVALID_BLOCK_LENGTH = 1106,

+		ERROR_DEVICE_NOT_PARTITIONED = 1107,

+		ERROR_UNABLE_TO_LOCK_MEDIA = 1108,

+		ERROR_UNABLE_TO_UNLOAD_MEDIA = 1109,

+		ERROR_MEDIA_CHANGED = 1110,

+		ERROR_BUS_RESET = 1111,

+		ERROR_NO_MEDIA_IN_DRIVE = 1112,

+		ERROR_NO_UNICODE_TRANSLATION = 1113,

+		ERROR_DLL_INIT_FAILED = 1114,

+		ERROR_SHUTDOWN_IN_PROGRESS = 1115,

+		ERROR_NO_SHUTDOWN_IN_PROGRESS = 1116,

+		ERROR_IO_DEVICE = 1117,

+		ERROR_SERIAL_NO_DEVICE = 1118,

+		ERROR_IRQ_BUSY = 1119,

+		ERROR_MORE_WRITES = 1120,

+		ERROR_COUNTER_TIMEOUT = 1121,

+		ERROR_FLOPPY_ID_MARK_NOT_FOUND = 1122,

+		ERROR_FLOPPY_WRONG_CYLINDER = 1123,

+		ERROR_FLOPPY_UNKNOWN_ERROR = 1124,

+		ERROR_FLOPPY_BAD_REGISTERS = 1125,

+		ERROR_DISK_RECALIBRATE_FAILED = 1126,

+		ERROR_DISK_OPERATION_FAILED = 1127,

+		ERROR_DISK_RESET_FAILED = 1128,

+		ERROR_EOM_OVERFLOW = 1129,

+		ERROR_NOT_ENOUGH_SERVER_MEMORY = 1130,

+		ERROR_POSSIBLE_DEADLOCK = 1131,

+		ERROR_MAPPED_ALIGNMENT = 1132,

+		ERROR_SET_POWER_STATE_VETOED = 1140,

+		ERROR_SET_POWER_STATE_FAILED = 1141,

+		ERROR_TOO_MANY_LINKS = 1142,

+		ERROR_OLD_WIN_VERSION = 1150,

+		ERROR_APP_WRONG_OS = 1151,

+		ERROR_SINGLE_INSTANCE_APP = 1152,

+		ERROR_RMODE_APP = 1153,

+		ERROR_INVALID_DLL = 1154,

+		ERROR_NO_ASSOCIATION = 1155,

+		ERROR_DDE_FAIL = 1156,

+		ERROR_DLL_NOT_FOUND = 1157,

+		ERROR_NO_MORE_USER_HANDLES = 1158,

+		ERROR_MESSAGE_SYNC_ONLY = 1159,

+		ERROR_SOURCE_ELEMENT_EMPTY = 1160,

+		ERROR_DESTINATION_ELEMENT_FULL = 1161,

+		ERROR_ILLEGAL_ELEMENT_ADDRESS = 1162,

+		ERROR_MAGAZINE_NOT_PRESENT = 1163,

+		ERROR_DEVICE_REINITIALIZATION_NEEDED = 1164,

+		ERROR_DEVICE_REQUIRES_CLEANING = 1165,

+		ERROR_DEVICE_DOOR_OPEN = 1166,

+		ERROR_DEVICE_NOT_CONNECTED = 1167,

+		ERROR_NOT_FOUND = 1168,

+		ERROR_NO_MATCH = 1169,

+		ERROR_SET_NOT_FOUND = 1170,

+		ERROR_POINT_NOT_FOUND = 1171,

+		ERROR_NO_TRACKING_SERVICE = 1172,

+		ERROR_NO_VOLUME_ID = 1173,

+		ERROR_UNABLE_TO_REMOVE_REPLACED = 1175,

+		ERROR_UNABLE_TO_MOVE_REPLACEMENT = 1176,

+		ERROR_UNABLE_TO_MOVE_REPLACEMENT_2 = 1177,

+		ERROR_JOURNAL_DELETE_IN_PROGRESS = 1178,

+		ERROR_JOURNAL_NOT_ACTIVE = 1179,

+		ERROR_POTENTIAL_FILE_FOUND = 1180,

+		ERROR_JOURNAL_ENTRY_DELETED = 1181,

+		ERROR_BAD_DEVICE = 1200,

+		ERROR_CONNECTION_UNAVAIL = 1201,

+		ERROR_DEVICE_ALREADY_REMEMBERED = 1202,

+		ERROR_NO_NET_OR_BAD_PATH = 1203,

+		ERROR_BAD_PROVIDER = 1204,

+		ERROR_CANNOT_OPEN_PROFILE = 1205,

+		ERROR_BAD_PROFILE = 1206,

+		ERROR_NOT_CONTAINER = 1207,

+		ERROR_EXTENDED_ERROR = 1208,

+		ERROR_INVALID_GROUPNAME = 1209,

+		ERROR_INVALID_COMPUTERNAME = 1210,

+		ERROR_INVALID_EVENTNAME = 1211,

+		ERROR_INVALID_DOMAINNAME = 1212,

+		ERROR_INVALID_SERVICENAME = 1213,

+		ERROR_INVALID_NETNAME = 1214,

+		ERROR_INVALID_SHARENAME = 1215,

+		ERROR_INVALID_PASSWORDNAME = 1216,

+		ERROR_INVALID_MESSAGENAME = 1217,

+		ERROR_INVALID_MESSAGEDEST = 1218,

+		ERROR_SESSION_CREDENTIAL_CONFLICT = 1219,

+		ERROR_REMOTE_SESSION_LIMIT_EXCEEDED = 1220,

+		ERROR_DUP_DOMAINNAME = 1221,

+		ERROR_NO_NETWORK = 1222,

+		ERROR_CANCELLED = 1223,

+		ERROR_USER_MAPPED_FILE = 1224,

+		ERROR_CONNECTION_REFUSED = 1225,

+		ERROR_GRACEFUL_DISCONNECT = 1226,

+		ERROR_ADDRESS_ALREADY_ASSOCIATED = 1227,

+		ERROR_ADDRESS_NOT_ASSOCIATED = 1228,

+		ERROR_CONNECTION_INVALID = 1229,

+		ERROR_CONNECTION_ACTIVE = 1230,

+		ERROR_NETWORK_UNREACHABLE = 1231,

+		ERROR_HOST_UNREACHABLE = 1232,

+		ERROR_PROTOCOL_UNREACHABLE = 1233,

+		ERROR_PORT_UNREACHABLE = 1234,

+		ERROR_REQUEST_ABORTED = 1235,

+		ERROR_CONNECTION_ABORTED = 1236,

+		ERROR_RETRY = 1237,

+		ERROR_CONNECTION_COUNT_LIMIT = 1238,

+		ERROR_LOGIN_TIME_RESTRICTION = 1239,

+		ERROR_LOGIN_WKSTA_RESTRICTION = 1240,

+		ERROR_INCORRECT_ADDRESS = 1241,

+		ERROR_ALREADY_REGISTERED = 1242,

+		ERROR_SERVICE_NOT_FOUND = 1243,

+		ERROR_NOT_AUTHENTICATED = 1244,

+		ERROR_NOT_LOGGED_ON = 1245,

+		ERROR_CONTINUE = 1246,

+		ERROR_ALREADY_INITIALIZED = 1247,

+		ERROR_NO_MORE_DEVICES = 1248,

+		ERROR_NO_SUCH_SITE = 1249,

+		ERROR_DOMAIN_CONTROLLER_EXISTS = 1250,

+		ERROR_ONLY_IF_CONNECTED = 1251,

+		ERROR_OVERRIDE_NOCHANGES = 1252,

+		ERROR_BAD_USER_PROFILE = 1253,

+		ERROR_NOT_SUPPORTED_ON_SBS = 1254,

+		ERROR_SERVER_SHUTDOWN_IN_PROGRESS = 1255,

+		ERROR_HOST_DOWN = 1256,

+		ERROR_NON_ACCOUNT_SID = 1257,

+		ERROR_NON_DOMAIN_SID = 1258,

+		ERROR_APPHELP_BLOCK = 1259,

+		ERROR_ACCESS_DISABLED_BY_POLICY = 1260,

+		ERROR_REG_NAT_CONSUMPTION = 1261,

+		ERROR_CSCSHARE_OFFLINE = 1262,

+		ERROR_PKINIT_FAILURE = 1263,

+		ERROR_SMARTCARD_SUBSYSTEM_FAILURE = 1264,

+		ERROR_DOWNGRADE_DETECTED = 1265,

+		SEC_E_SMARTCARD_CERT_REVOKED = 1266,

+		SEC_E_ISSUING_CA_UNTRUSTED = 1267,

+		SEC_E_REVOCATION_OFFLINE_C = 1268,

+		SEC_E_PKINIT_CLIENT_FAILUR = 1269,

+		SEC_E_SMARTCARD_CERT_EXPIRED = 1270,

+		ERROR_MACHINE_LOCKED = 1271,

+		ERROR_CALLBACK_SUPPLIED_INVALID_DATA = 1273,

+		ERROR_SYNC_FOREGROUND_REFRESH_REQUIRED = 1274,

+		ERROR_DRIVER_BLOCKED = 1275,

+		ERROR_INVALID_IMPORT_OF_NON_DLL = 1276,

+		ERROR_NOT_ALL_ASSIGNED = 1300,

+		ERROR_SOME_NOT_MAPPED = 1301,

+		ERROR_NO_QUOTAS_FOR_ACCOUNT = 1302,

+		ERROR_LOCAL_USER_SESSION_KEY = 1303,

+		ERROR_NULL_LM_PASSWORD = 1304,

+		ERROR_UNKNOWN_REVISION = 1305,

+		ERROR_REVISION_MISMATCH = 1306,

+		ERROR_INVALID_OWNER = 1307,

+		ERROR_INVALID_PRIMARY_GROUP = 1308,

+		ERROR_NO_IMPERSONATION_TOKEN = 1309,

+		ERROR_CANT_DISABLE_MANDATORY = 1310,

+		ERROR_NO_LOGON_SERVERS = 1311,

+		ERROR_NO_SUCH_LOGON_SESSION = 1312,

+		ERROR_NO_SUCH_PRIVILEGE = 1313,

+		ERROR_PRIVILEGE_NOT_HELD = 1314,

+		ERROR_INVALID_ACCOUNT_NAME = 1315,

+		ERROR_USER_EXISTS = 1316,

+		ERROR_NO_SUCH_USER = 1317,

+		ERROR_GROUP_EXISTS = 1318,

+		ERROR_NO_SUCH_GROUP = 1319,

+		ERROR_MEMBER_IN_GROUP = 1320,

+		ERROR_MEMBER_NOT_IN_GROUP = 1321,

+		ERROR_LAST_ADMIN = 1322,

+		ERROR_WRONG_PASSWORD = 1323,

+		ERROR_ILL_FORMED_PASSWORD = 1324,

+		ERROR_PASSWORD_RESTRICTION = 1325,

+		ERROR_LOGON_FAILURE = 1326,

+		ERROR_ACCOUNT_RESTRICTION = 1327,

+		ERROR_INVALID_LOGON_HOURS = 1328,

+		ERROR_INVALID_WORKSTATION = 1329,

+		ERROR_PASSWORD_EXPIRED = 1330,

+		ERROR_ACCOUNT_DISABLED = 1331,

+		ERROR_NONE_MAPPED = 1332,

+		ERROR_TOO_MANY_LUIDS_REQUESTED = 1333,

+		ERROR_LUIDS_EXHAUSTED = 1334,

+		ERROR_INVALID_SUB_AUTHORITY = 1335,

+		ERROR_INVALID_ACL = 1336,

+		ERROR_INVALID_SID = 1337,

+		ERROR_INVALID_SECURITY_DESCR = 1338,

+		ERROR_BAD_INHERITANCE_ACL = 1340,

+		ERROR_SERVER_DISABLED = 1341,

+		ERROR_SERVER_NOT_DISABLED = 1342,

+		ERROR_INVALID_ID_AUTHORITY = 1343,

+		ERROR_ALLOTTED_SPACE_EXCEEDED = 1344,

+		ERROR_INVALID_GROUP_ATTRIBUTES = 1345,

+		ERROR_BAD_IMPERSONATION_LEVEL = 1346,

+		ERROR_CANT_OPEN_ANONYMOUS = 1347,

+		ERROR_BAD_VALIDATION_CLASS = 1348,

+		ERROR_BAD_TOKEN_TYPE = 1349,

+		ERROR_NO_SECURITY_ON_OBJECT = 1350,

+		ERROR_CANT_ACCESS_DOMAIN_INFO = 1351,

+		ERROR_INVALID_SERVER_STATE = 1352,

+		ERROR_INVALID_DOMAIN_STATE = 1353,

+		ERROR_INVALID_DOMAIN_ROLE = 1354,

+		ERROR_NO_SUCH_DOMAIN = 1355,

+		ERROR_DOMAIN_EXISTS = 1356,

+		ERROR_DOMAIN_LIMIT_EXCEEDED = 1357,

+		ERROR_INTERNAL_DB_CORRUPTION = 1358,

+		ERROR_INTERNAL_ERROR = 1359,

+		ERROR_GENERIC_NOT_MAPPED = 1360,

+		ERROR_BAD_DESCRIPTOR_FORMAT = 1361,

+		ERROR_NOT_LOGON_PROCESS = 1362,

+		ERROR_LOGON_SESSION_EXISTS = 1363,

+		ERROR_NO_SUCH_PACKAGE = 1364,

+		ERROR_BAD_LOGON_SESSION_STATE = 1365,

+		ERROR_LOGON_SESSION_COLLISION = 1366,

+		ERROR_INVALID_LOGON_TYPE = 1367,

+		ERROR_CANNOT_IMPERSONATE = 1368,

+		ERROR_RXACT_INVALID_STATE = 1369,

+		ERROR_RXACT_COMMIT_FAILURE = 1370,

+		ERROR_SPECIAL_ACCOUNT = 1371,

+		ERROR_SPECIAL_GROUP = 1372,

+		ERROR_SPECIAL_USER = 1373,

+		ERROR_MEMBERS_PRIMARY_GROUP = 1374,

+		ERROR_TOKEN_ALREADY_IN_USE = 1375,

+		ERROR_NO_SUCH_ALIAS = 1376,

+		ERROR_MEMBER_NOT_IN_ALIAS = 1377,

+		ERROR_MEMBER_IN_ALIAS = 1378,

+		ERROR_ALIAS_EXISTS = 1379,

+		ERROR_LOGON_NOT_GRANTED = 1380,

+		ERROR_TOO_MANY_SECRETS = 1381,

+		ERROR_SECRET_TOO_LONG = 1382,

+		ERROR_INTERNAL_DB_ERROR = 1383,

+		ERROR_TOO_MANY_CONTEXT_IDS = 1384,

+		ERROR_LOGON_TYPE_NOT_GRANTED = 1385,

+		ERROR_NT_CROSS_ENCRYPTION_REQUIRED = 1386,

+		ERROR_NO_SUCH_MEMBER = 1387,

+		ERROR_INVALID_MEMBER = 1388,

+		ERROR_TOO_MANY_SIDS = 1389,

+		ERROR_LM_CROSS_ENCRYPTION_REQUIRED = 1390,

+		ERROR_NO_INHERITANCE = 1391,

+		ERROR_FILE_CORRUPT = 1392,

+		ERROR_DISK_CORRUPT = 1393,

+		ERROR_NO_USER_SESSION_KEY = 1394,

+		ERROR_LICENSE_QUOTA_EXCEEDED = 1395,

+		ERROR_WRONG_TARGET_NAME = 1396,

+		ERROR_MUTUAL_AUTH_FAILED = 1397,

+		ERROR_TIME_SKEW = 1398,

+		ERROR_CURRENT_DOMAIN_NOT_ALLOWED = 1399,

+		ERROR_INVALID_WINDOW_HANDLE = 1400,

+		ERROR_INVALID_MENU_HANDLE = 1401,

+		ERROR_INVALID_CURSOR_HANDLE = 1402,

+		ERROR_INVALID_ACCEL_HANDLE = 1403,

+		ERROR_INVALID_HOOK_HANDLE = 1404,

+		ERROR_INVALID_DWP_HANDLE = 1405,

+		ERROR_TLW_WITH_WSCHILD = 1406,

+		ERROR_CANNOT_FIND_WND_CLASS = 1407,

+		ERROR_WINDOW_OF_OTHER_THREAD = 1408,

+		ERROR_HOTKEY_ALREADY_REGISTERED = 1409,

+		ERROR_CLASS_ALREADY_EXISTS = 1410,

+		ERROR_CLASS_DOES_NOT_EXIST = 1411,

+		ERROR_CLASS_HAS_WINDOWS = 1412,

+		ERROR_INVALID_INDEX = 1413,

+		ERROR_INVALID_ICON_HANDLE = 1414,

+		ERROR_PRIVATE_DIALOG_INDEX = 1415,

+		ERROR_LISTBOX_ID_NOT_FOUND = 1416,

+		ERROR_NO_WILDCARD_CHARACTERS = 1417,

+		ERROR_CLIPBOARD_NOT_OPEN = 1418,

+		ERROR_HOTKEY_NOT_REGISTERED = 1419,

+		ERROR_WINDOW_NOT_DIALOG = 1420,

+		ERROR_CONTROL_ID_NOT_FOUND = 1421,

+		ERROR_INVALID_COMBOBOX_MESSAGE = 1422,

+		ERROR_WINDOW_NOT_COMBOBOX = 1423,

+		ERROR_INVALID_EDIT_HEIGHT = 1424,

+		ERROR_DC_NOT_FOUND = 1425,

+		ERROR_INVALID_HOOK_FILTER = 1426,

+		ERROR_INVALID_FILTER_PROC = 1427,

+		ERROR_HOOK_NEEDS_HMOD = 1428,

+		ERROR_GLOBAL_ONLY_HOOK = 1429,

+		ERROR_JOURNAL_HOOK_SET = 1430,

+		ERROR_HOOK_NOT_INSTALLED = 1431,

+		ERROR_INVALID_LB_MESSAGE = 1432,

+		ERROR_SETCOUNT_ON_BAD_LB = 1433,

+		ERROR_LB_WITHOUT_TABSTOPS = 1434,

+		ERROR_DESTROY_OBJECT_OF_OTHER_THREAD = 1435,

+		ERROR_CHILD_WINDOW_MENU = 1436,

+		ERROR_NO_SYSTEM_MENU = 1437,

+		ERROR_INVALID_MSGBOX_STYLE = 1438,

+		ERROR_INVALID_SPI_VALUE = 1439,

+		ERROR_SCREEN_ALREADY_LOCKED = 1440,

+		ERROR_HWNDS_HAVE_DIFF_PARENT = 1441,

+		ERROR_NOT_CHILD_WINDOW = 1442,

+		ERROR_INVALID_GW_COMMAND = 1443,

+		ERROR_INVALID_THREAD_ID = 1444,

+		ERROR_NON_MDICHILD_WINDOW = 1445,

+		ERROR_POPUP_ALREADY_ACTIVE = 1446,

+		ERROR_NO_SCROLLBARS = 1447,

+		ERROR_INVALID_SCROLLBAR_RANGE = 1448,

+		ERROR_INVALID_SHOWWIN_COMMAND = 1449,

+		ERROR_NO_SYSTEM_RESOURCES = 1450,

+		ERROR_NONPAGED_SYSTEM_RESOURCES = 1451,

+		ERROR_PAGED_SYSTEM_RESOURCES = 1452,

+		ERROR_WORKING_SET_QUOTA = 1453,

+		ERROR_PAGEFILE_QUOTA = 1454,

+		ERROR_COMMITMENT_LIMIT = 1455,

+		ERROR_MENU_ITEM_NOT_FOUND = 1456,

+		ERROR_INVALID_KEYBOARD_HANDLE = 1457,

+		ERROR_HOOK_TYPE_NOT_ALLOWED = 1458,

+		ERROR_REQUIRES_INTERACTIVE_WINDOWSTATION = 1459,

+		ERROR_TIMEOUT = 1460,

+		ERROR_INVALID_MONITOR_HANDLE = 1461,

+		ERROR_EVENTLOG_FILE_CORRUPT = 1500,

+		ERROR_EVENTLOG_CANT_START = 1501,

+		ERROR_LOG_FILE_FULL = 1502,

+		ERROR_EVENTLOG_FILE_CHANGED = 1503,

+		ERROR_INSTALL_SERVICE_FAILURE = 1601,

+		ERROR_INSTALL_USEREXIT = 1602,

+		ERROR_INSTALL_FAILURE = 1603,

+		ERROR_INSTALL_SUSPEND = 1604,

+		ERROR_UNKNOWN_PRODUCT = 1605,

+		ERROR_UNKNOWN_FEATURE = 1606,

+		ERROR_UNKNOWN_COMPONENT = 1607,

+		ERROR_UNKNOWN_PROPERTY = 1608,

+		ERROR_INVALID_HANDLE_STATE = 1609,

+		ERROR_BAD_CONFIGURATION = 1610,

+		ERROR_INDEX_ABSENT = 1611,

+		ERROR_INSTALL_SOURCE_ABSENT = 1612,

+		ERROR_INSTALL_PACKAGE_VERSION = 1613,

+		ERROR_PRODUCT_UNINSTALLED = 1614,

+		ERROR_BAD_QUERY_SYNTAX = 1615,

+		ERROR_INVALID_FIELD = 1616,

+		ERROR_DEVICE_REMOVED = 1617,

+		ERROR_INSTALL_ALREADY_RUNNING = 1618,

+		ERROR_INSTALL_PACKAGE_OPEN_FAILED = 1619,

+		ERROR_INSTALL_PACKAGE_INVALID = 1620,

+		ERROR_INSTALL_UI_FAILURE = 1621,

+		ERROR_INSTALL_LOG_FAILURE = 1622,

+		ERROR_INSTALL_LANGUAGE_UNSUPPORTED = 1623,

+		ERROR_INSTALL_TRANSFORM_FAILURE = 1624,

+		ERROR_INSTALL_PACKAGE_REJECTED = 1625,

+		ERROR_FUNCTION_NOT_CALLED = 1626,

+		ERROR_FUNCTION_FAILED = 1627,

+		ERROR_INVALID_TABLE = 1628,

+		ERROR_DATATYPE_MISMATCH = 1629,

+		ERROR_UNSUPPORTED_TYPE = 1630,

+		ERROR_CREATE_FAILED = 1631,

+		ERROR_INSTALL_TEMP_UNWRITABLE = 1632,

+		ERROR_INSTALL_PLATFORM_UNSUPPORTED = 1633,

+		ERROR_INSTALL_NOTUSED = 1634,

+		ERROR_PATCH_PACKAGE_OPEN_FAILED = 1635,

+		ERROR_PATCH_PACKAGE_INVALID = 1636,

+		ERROR_PATCH_PACKAGE_UNSUPPORTED = 1637,

+		ERROR_PRODUCT_VERSION = 1638,

+		ERROR_INVALID_COMMAND_LINE = 1639,

+		ERROR_INSTALL_REMOTE_DISALLOWED = 1640,

+		ERROR_SUCCESS_REBOOT_INITIATED = 1641,

+		ERROR_PATCH_TARGET_NOT_FOUND = 1642,

+		ERROR_PATCH_PACKAGE_REJECTED = 1643,

+		ERROR_INSTALL_TRANSFORM_REJECTED = 1644,

+		RPC_S_INVALID_STRING_BINDING = 1700,

+		RPC_S_WRONG_KIND_OF_BINDING = 1701,

+		RPC_S_INVALID_BINDING = 1702,

+		RPC_S_PROTSEQ_NOT_SUPPORTED = 1703,

+		RPC_S_INVALID_RPC_PROTSEQ = 1704,

+		RPC_S_INVALID_STRING_UUID = 1705,

+		RPC_S_INVALID_ENDPOINT_FORMAT = 1706,

+		RPC_S_INVALID_NET_ADDR = 1707,

+		RPC_S_NO_ENDPOINT_FOUND = 1708,

+		RPC_S_INVALID_TIMEOUT = 1709,

+		RPC_S_OBJECT_NOT_FOUND = 1710,

+		RPC_S_ALREADY_REGISTERED = 1711,

+		RPC_S_TYPE_ALREADY_REGISTERED = 1712,

+		RPC_S_ALREADY_LISTENING = 1713,

+		RPC_S_NO_PROTSEQS_REGISTERED = 1714,

+		RPC_S_NOT_LISTENING = 1715,

+		RPC_S_UNKNOWN_MGR_TYPE = 1716,

+		RPC_S_UNKNOWN_IF = 1717,

+		RPC_S_NO_BINDINGS = 1718,

+		RPC_S_NO_PROTSEQS = 1719,

+		RPC_S_CANT_CREATE_ENDPOINT = 1720,

+		RPC_S_OUT_OF_RESOURCES = 1721,

+		RPC_S_SERVER_UNAVAILABLE = 1722,

+		RPC_S_SERVER_TOO_BUSY = 1723,

+		RPC_S_INVALID_NETWORK_OPTIONS = 1724,

+		RPC_S_NO_CALL_ACTIVE = 1725,

+		RPC_S_CALL_FAILED = 1726,

+		RPC_S_CALL_FAILED_DNE = 1727,

+		RPC_S_PROTOCOL_ERROR = 1728,

+		RPC_S_UNSUPPORTED_TRANS_SYN = 1730,

+		RPC_S_UNSUPPORTED_TYPE = 1732,

+		RPC_S_INVALID_TAG = 1733,

+		RPC_S_INVALID_BOUND = 1734,

+		RPC_S_NO_ENTRY_NAME = 1735,

+		RPC_S_INVALID_NAME_SYNTAX = 1736,

+		RPC_S_UNSUPPORTED_NAME_SYNTAX = 1737,

+		RPC_S_UUID_NO_ADDRESS = 1739,

+		RPC_S_DUPLICATE_ENDPOINT = 1740,

+		RPC_S_UNKNOWN_AUTHN_TYPE = 1741,

+		RPC_S_MAX_CALLS_TOO_SMALL = 1742,

+		RPC_S_STRING_TOO_LONG = 1743,

+		RPC_S_PROTSEQ_NOT_FOUND = 1744,

+		RPC_S_PROCNUM_OUT_OF_RANGE = 1745,

+		RPC_S_BINDING_HAS_NO_AUTH = 1746,

+		RPC_S_UNKNOWN_AUTHN_SERVICE = 1747,

+		RPC_S_UNKNOWN_AUTHN_LEVEL = 1748,

+		RPC_S_INVALID_AUTH_IDENTITY = 1749,

+		RPC_S_UNKNOWN_AUTHZ_SERVICE = 1750,

+		EPT_S_INVALID_ENTRY = 1751,

+		EPT_S_CANT_PERFORM_OP = 1752,

+		EPT_S_NOT_REGISTERED = 1753,

+		RPC_S_NOTHING_TO_EXPORT = 1754,

+		RPC_S_INCOMPLETE_NAME = 1755,

+		RPC_S_INVALID_VERS_OPTION = 1756,

+		RPC_S_NO_MORE_MEMBERS = 1757,

+		RPC_S_NOT_ALL_OBJS_UNEXPORTED = 1758,

+		RPC_S_INTERFACE_NOT_FOUND = 1759,

+		RPC_S_ENTRY_ALREADY_EXISTS = 1760,

+		RPC_S_ENTRY_NOT_FOUND = 1761,

+		RPC_S_NAME_SERVICE_UNAVAILABLE = 1762,

+		RPC_S_INVALID_NAF_ID = 1763,

+		RPC_S_CANNOT_SUPPORT = 1764,

+		RPC_S_NO_CONTEXT_AVAILABLE = 1765,

+		RPC_S_INTERNAL_ERROR = 1766,

+		RPC_S_ZERO_DIVIDE = 1767,

+		RPC_S_ADDRESS_ERROR = 1768,

+		RPC_S_FP_DIV_ZERO = 1769,

+		RPC_S_FP_UNDERFLOW = 1770,

+		RPC_S_FP_OVERFLOW = 1771,

+		RPC_X_NO_MORE_ENTRIES = 1772,

+		RPC_X_SS_CHAR_TRANS_OPEN_FAIL = 1773,

+		RPC_X_SS_CHAR_TRANS_SHORT_FILE = 1774,

+		RPC_X_SS_IN_NULL_CONTEXT = 1775,

+		RPC_X_SS_CONTEXT_DAMAGED = 1777,

+		RPC_X_SS_HANDLES_MISMATCH = 1778,

+		RPC_X_SS_CANNOT_GET_CALL_HANDLE = 1779,

+		RPC_X_NULL_REF_POINTER = 1780,

+		RPC_X_ENUM_VALUE_OUT_OF_RANGE = 1781,

+		RPC_X_BYTE_COUNT_TOO_SMALL = 1782,

+		RPC_X_BAD_STUB_DATA = 1783,

+		ERROR_INVALID_USER_BUFFER = 1784,

+		ERROR_UNRECOGNIZED_MEDIA = 1785,

+		ERROR_NO_TRUST_LSA_SECRET = 1786,

+		ERROR_NO_TRUST_SAM_ACCOUNT = 1787,

+		ERROR_TRUSTED_DOMAIN_FAILURE = 1788,

+		ERROR_TRUSTED_RELATIONSHIP_FAILURE = 1789,

+		ERROR_TRUST_FAILURE = 1790,

+		RPC_S_CALL_IN_PROGRESS = 1791,

+		ERROR_NETLOGON_NOT_STARTED = 1792,

+		ERROR_ACCOUNT_EXPIRED = 1793,

+		ERROR_REDIRECTOR_HAS_OPEN_HANDLES = 1794,

+		ERROR_PRINTER_DRIVER_ALREADY_INSTALLED = 1795,

+		ERROR_UNKNOWN_PORT = 1796,

+		ERROR_UNKNOWN_PRINTER_DRIVER = 1797,

+		ERROR_UNKNOWN_PRINTPROCESSOR = 1798,

+		ERROR_INVALID_SEPARATOR_FILE = 1799,

+		ERROR_INVALID_PRIORITY = 1800,

+		ERROR_INVALID_PRINTER_NAME = 1801,

+		ERROR_PRINTER_ALREADY_EXISTS = 1802,

+		ERROR_INVALID_PRINTER_COMMAND = 1803,

+		ERROR_INVALID_DATATYPE = 1804,

+		ERROR_INVALID_ENVIRONMENT = 1805,

+		RPC_S_NO_MORE_BINDINGS = 1806,

+		ERROR_NOLOGON_INTERDOMAIN_TRUST_ACCOUNT = 1807,

+		ERROR_NOLOGON_WORKSTATION_TRUST_ACCOUNT = 1808,

+		ERROR_NOLOGON_SERVER_TRUST_ACCOUNT = 1809,

+		ERROR_DOMAIN_TRUST_INCONSISTENT = 1810,

+		ERROR_SERVER_HAS_OPEN_HANDLES = 1811,

+		ERROR_RESOURCE_DATA_NOT_FOUND = 1812,

+		ERROR_RESOURCE_TYPE_NOT_FOUND = 1813,

+		ERROR_RESOURCE_NAME_NOT_FOUND = 1814,

+		ERROR_RESOURCE_LANG_NOT_FOUND = 1815,

+		ERROR_NOT_ENOUGH_QUOTA = 1816,

+		RPC_S_NO_INTERFACES = 1817,

+		RPC_S_CALL_CANCELLED = 1818,

+		RPC_S_BINDING_INCOMPLETE = 1819,

+		RPC_S_COMM_FAILURE = 1820,

+		RPC_S_UNSUPPORTED_AUTHN_LEVEL = 1821,

+		RPC_S_NO_PRINC_NAME = 1822,

+		RPC_S_NOT_RPC_ERROR = 1823,

+		RPC_S_UUID_LOCAL_ONLY = 1824,

+		RPC_S_SEC_PKG_ERROR = 1825,

+		RPC_S_NOT_CANCELLED = 1826,

+		RPC_X_INVALID_ES_ACTION = 1827,

+		RPC_X_WRONG_ES_VERSION = 1828,

+		RPC_X_WRONG_STUB_VERSION = 1829,

+		RPC_X_INVALID_PIPE_OBJECT = 1830,

+		RPC_X_WRONG_PIPE_ORDER = 1831,

+		RPC_X_WRONG_PIPE_VERSION = 1832,

+		RPC_S_GROUP_MEMBER_NOT_FOUND = 1898,

+		EPT_S_CANT_CREATE = 1899,

+		RPC_S_INVALID_OBJECT = 1900,

+		ERROR_INVALID_TIME = 1901,

+		ERROR_INVALID_FORM_NAME = 1902,

+		ERROR_INVALID_FORM_SIZE = 1903,

+		ERROR_ALREADY_WAITING = 1904,

+		ERROR_PRINTER_DELETED = 1905,

+		ERROR_INVALID_PRINTER_STATE = 1906,

+		ERROR_PASSWORD_MUST_CHANGE = 1907,

+		ERROR_DOMAIN_CONTROLLER_NOT_FOUND = 1908,

+		ERROR_ACCOUNT_LOCKED_OUT = 1909,

+		OR_INVALID_OXID = 1910,

+		OR_INVALID_OID = 1911,

+		OR_INVALID_SET = 1912,

+		RPC_S_SEND_INCOMPLETE = 1913,

+		RPC_S_INVALID_ASYNC_HANDLE = 1914,

+		RPC_S_INVALID_ASYNC_CALL = 1915,

+		RPC_X_PIPE_CLOSED = 1916,

+		RPC_X_PIPE_DISCIPLINE_ERROR = 1917,

+		RPC_X_PIPE_EMPTY = 1918,

+		ERROR_NO_SITENAME = 1919,

+		ERROR_CANT_ACCESS_FILE = 1920,

+		ERROR_CANT_RESOLVE_FILENAME = 1921,

+		RPC_S_ENTRY_TYPE_MISMATCH = 1922,

+		RPC_S_NOT_ALL_OBJS_EXPORTED = 1923,

+		RPC_S_INTERFACE_NOT_EXPORTED = 1924,

+		RPC_S_PROFILE_NOT_ADDED = 1925,

+		RPC_S_PRF_ELT_NOT_ADDED = 1926,

+		RPC_S_PRF_ELT_NOT_REMOVED = 1927,

+		RPC_S_GRP_ELT_NOT_ADDED = 1928,

+		RPC_S_GRP_ELT_NOT_REMOVED = 1929,

+		ERROR_KM_DRIVER_BLOCKED = 1930,

+		ERROR_CONTEXT_EXPIRED = 1931,

+		ERROR_INVALID_PIXEL_FORMAT = 2000,

+		ERROR_BAD_DRIVER = 2001,

+		ERROR_INVALID_WINDOW_STYLE = 2002,

+		ERROR_METAFILE_NOT_SUPPORTED = 2003,

+		ERROR_TRANSFORM_NOT_SUPPORTED = 2004,

+		ERROR_CLIPPING_NOT_SUPPORTED = 2005,

+		ERROR_INVALID_CMM = 2010,

+		ERROR_INVALID_PROFILE = 2011,

+		ERROR_TAG_NOT_FOUND = 2012,

+		ERROR_TAG_NOT_PRESENT = 2013,

+		ERROR_DUPLICATE_TAG = 2014,

+		ERROR_PROFILE_NOT_ASSOCIATED_WITH_DEVICE = 2015,

+		ERROR_PROFILE_NOT_FOUND = 2016,

+		ERROR_INVALID_COLORSPACE = 2017,

+		ERROR_ICM_NOT_ENABLED = 2018,

+		ERROR_DELETING_ICM_XFORM = 2019,

+		ERROR_INVALID_TRANSFORM = 2020,

+		ERROR_COLORSPACE_MISMATCH = 2021,

+		ERROR_INVALID_COLORINDEX = 2022,

+		ERROR_CONNECTED_OTHER_PASSWORD = 2108,

+		ERROR_CONNECTED_OTHER_PASSWORD_DEFAULT = 2109,

+		ERROR_BAD_USERNAME = 2202,

+		ERROR_NOT_CONNECTED = 2250,

+		ERROR_OPEN_FILES = 2401,

+		ERROR_ACTIVE_CONNECTIONS = 2402,

+		ERROR_DEVICE_IN_USE = 2404,

+		ERROR_UNKNOWN_PRINT_MONITOR = 3000,

+		ERROR_PRINTER_DRIVER_IN_USE = 3001,

+		ERROR_SPOOL_FILE_NOT_FOUND = 3002,

+		ERROR_SPL_NO_STARTDOC = 3003,

+		ERROR_SPL_NO_ADDJOB = 3004,

+		ERROR_PRINT_PROCESSOR_ALREADY_INSTALLED = 3005,

+		ERROR_PRINT_MONITOR_ALREADY_INSTALLED = 3006,

+		ERROR_INVALID_PRINT_MONITOR = 3007,

+		ERROR_PRINT_MONITOR_IN_USE = 3008,

+		ERROR_PRINTER_HAS_JOBS_QUEUED = 3009,

+		ERROR_SUCCESS_REBOOT_REQUIRED = 3010,

+		ERROR_SUCCESS_RESTART_REQUIRED = 3011,

+		ERROR_PRINTER_NOT_FOUND = 3012,

+		ERROR_PRINTER_DRIVER_WARNED = 3013,

+		ERROR_PRINTER_DRIVER_BLOCKED = 3014,

+		ERROR_WINS_INTERNAL = 4000,

+		ERROR_CAN_NOT_DEL_LOCAL_WINS = 4001,

+		ERROR_STATIC_INIT = 4002,

+		ERROR_INC_BACKUP = 4003,

+		ERROR_FULL_BACKUP = 4004,

+		ERROR_REC_NON_EXISTENT = 4005,

+		ERROR_RPL_NOT_ALLOWED = 4006,

+		ERROR_DHCP_ADDRESS_CONFLICT = 4100,

+		ERROR_WMI_GUID_NOT_FOUND = 4200,

+		ERROR_WMI_INSTANCE_NOT_FOUND = 4201,

+		ERROR_WMI_ITEMID_NOT_FOUND = 4202,

+		ERROR_WMI_TRY_AGAIN = 4203,

+		ERROR_WMI_DP_NOT_FOUND = 4204,

+		ERROR_WMI_UNRESOLVED_INSTANCE_REF = 4205,

+		ERROR_WMI_ALREADY_ENABLED = 4206,

+		ERROR_WMI_GUID_DISCONNECTED = 4207,

+		ERROR_WMI_SERVER_UNAVAILABLE = 4208,

+		ERROR_WMI_DP_FAILED = 4209,

+		ERROR_WMI_INVALID_MOF = 4210,

+		ERROR_WMI_INVALID_REGINFO = 4211,

+		ERROR_WMI_ALREADY_DISABLED = 4212,

+		ERROR_WMI_READ_ONLY = 4213,

+		ERROR_WMI_SET_FAILURE = 4214,

+		ERROR_INVALID_MEDIA = 4300,

+		ERROR_INVALID_LIBRARY = 4301,

+		ERROR_INVALID_MEDIA_POOL = 4302,

+		ERROR_DRIVE_MEDIA_MISMATCH = 4303,

+		ERROR_MEDIA_OFFLINE = 4304,

+		ERROR_LIBRARY_OFFLINE = 4305,

+		ERROR_EMPTY = 4306,

+		ERROR_NOT_EMPTY = 4307,

+		ERROR_MEDIA_UNAVAILABLE = 4308,

+		ERROR_RESOURCE_DISABLED = 4309,

+		ERROR_INVALID_CLEANER = 4310,

+		ERROR_UNABLE_TO_CLEAN = 4311,

+		ERROR_OBJECT_NOT_FOUND = 4312,

+		ERROR_DATABASE_FAILURE = 4313,

+		ERROR_DATABASE_FULL = 4314,

+		ERROR_MEDIA_INCOMPATIBLE = 4315,

+		ERROR_RESOURCE_NOT_PRESENT = 4316,

+		ERROR_INVALID_OPERATION = 4317,

+		ERROR_MEDIA_NOT_AVAILABLE = 4318,

+		ERROR_DEVICE_NOT_AVAILABLE = 4319,

+		ERROR_REQUEST_REFUSED = 4320,

+		ERROR_INVALID_DRIVE_OBJECT = 4321,

+		ERROR_LIBRARY_FULL = 4322,

+		ERROR_MEDIUM_NOT_ACCESSIBLE = 4323,

+		ERROR_UNABLE_TO_LOAD_MEDIUM = 4324,

+		ERROR_UNABLE_TO_INVENTORY_DRIVE = 4325,

+		ERROR_UNABLE_TO_INVENTORY_SLOT = 4326,

+		ERROR_UNABLE_TO_INVENTORY_TRANSPORT = 4327,

+		ERROR_TRANSPORT_FULL = 4328,

+		ERROR_CONTROLLING_IEPORT = 4329,

+		ERROR_UNABLE_TO_EJECT_MOUNTED_MEDIA = 4330,

+		ERROR_CLEANER_SLOT_SET = 4331,

+		ERROR_CLEANER_SLOT_NOT_SET = 4332,

+		ERROR_CLEANER_CARTRIDGE_SPENT = 4333,

+		ERROR_UNEXPECTED_OMID = 4334,

+		ERROR_CANT_DELETE_LAST_ITEM = 4335,

+		ERROR_MESSAGE_EXCEEDS_MAX_SIZE = 4336,

+		ERROR_VOLUME_CONTAINS_SYS_FILES = 4337,

+		ERROR_INDIGENOUS_TYPE = 4338,

+		ERROR_NO_SUPPORTING_DRIVES = 4339,

+		ERROR_CLEANER_CARTRIDGE_INSTALLED = 4340,

+		ERROR_FILE_OFFLINE = 4350,

+		ERROR_REMOTE_STORAGE_NOT_ACTIVE = 4351,

+		ERROR_REMOTE_STORAGE_MEDIA_ERROR = 4352,

+		ERROR_NOT_A_REPARSE_POINT = 4390,

+		ERROR_REPARSE_ATTRIBUTE_CONFLICT = 4391,

+		ERROR_INVALID_REPARSE_DATA = 4392,

+		ERROR_REPARSE_TAG_INVALID = 4393,

+		ERROR_REPARSE_TAG_MISMATCH = 4394,

+		ERROR_VOLUME_NOT_SIS_ENABLED = 4500,

+		ERROR_DEPENDENT_RESOURCE_EXISTS = 5001,

+		ERROR_DEPENDENCY_NOT_FOUND = 5002,

+		ERROR_DEPENDENCY_ALREADY_EXISTS = 5003,

+		ERROR_RESOURCE_NOT_ONLINE = 5004,

+		ERROR_HOST_NODE_NOT_AVAILABLE = 5005,

+		ERROR_RESOURCE_NOT_AVAILABLE = 5006,

+		ERROR_RESOURCE_NOT_FOUND = 5007,

+		ERROR_SHUTDOWN_CLUSTER = 5008,

+		ERROR_CANT_EVICT_ACTIVE_NODE = 5009,

+		ERROR_OBJECT_ALREADY_EXISTS = 5010,

+		ERROR_OBJECT_IN_LIST = 5011,

+		ERROR_GROUP_NOT_AVAILABLE = 5012,

+		ERROR_GROUP_NOT_FOUND = 5013,

+		ERROR_GROUP_NOT_ONLINE = 5014,

+		ERROR_HOST_NODE_NOT_RESOURCE_OWNER = 5015,

+		ERROR_HOST_NODE_NOT_GROUP_OWNER = 5016,

+		ERROR_RESMON_CREATE_FAILED = 5017,

+		ERROR_RESMON_ONLINE_FAILED = 5018,

+		ERROR_RESOURCE_ONLINE = 5019,

+		ERROR_QUORUM_RESOURCE = 5020,

+		ERROR_NOT_QUORUM_CAPABLE = 5021,

+		ERROR_CLUSTER_SHUTTING_DOWN = 5022,

+		ERROR_INVALID_STATE = 5023,

+		ERROR_RESOURCE_PROPERTIES_STORED = 5024,

+		ERROR_NOT_QUORUM_CLASS = 5025,

+		ERROR_CORE_RESOURCE = 5026,

+		ERROR_QUORUM_RESOURCE_ONLINE_FAILED = 5027,

+		ERROR_QUORUMLOG_OPEN_FAILED = 5028,

+		ERROR_CLUSTERLOG_CORRUPT = 5029,

+		ERROR_CLUSTERLOG_RECORD_EXCEEDS_MAXSIZE = 5030,

+		ERROR_CLUSTERLOG_EXCEEDS_MAXSIZE = 5031,

+		ERROR_CLUSTERLOG_CHKPOINT_NOT_FOUND = 5032,

+		ERROR_CLUSTERLOG_NOT_ENOUGH_SPACE = 5033,

+		ERROR_QUORUM_OWNER_ALIVE = 5034,

+		ERROR_NETWORK_NOT_AVAILABLE = 5035,

+		ERROR_NODE_NOT_AVAILABLE = 5036,

+		ERROR_ALL_NODES_NOT_AVAILABLE = 5037,

+		ERROR_RESOURCE_FAILED = 5038,

+		ERROR_CLUSTER_INVALID_NODE = 5039,

+		ERROR_CLUSTER_NODE_EXISTS = 5040,

+		ERROR_CLUSTER_JOIN_IN_PROGRESS = 5041,

+		ERROR_CLUSTER_NODE_NOT_FOUND = 5042,

+		ERROR_CLUSTER_LOCAL_NODE_NOT_FOUND = 5043,

+		ERROR_CLUSTER_NETWORK_EXISTS = 5044,

+		ERROR_CLUSTER_NETWORK_NOT_FOUND = 5045,

+		ERROR_CLUSTER_NETINTERFACE_EXISTS = 5046,

+		ERROR_CLUSTER_NETINTERFACE_NOT_FOUND = 5047,

+		ERROR_CLUSTER_INVALID_REQUEST = 5048,

+		ERROR_CLUSTER_INVALID_NETWORK_PROVIDER = 5049,

+		ERROR_CLUSTER_NODE_DOWN = 5050,

+		ERROR_CLUSTER_NODE_UNREACHABLE = 5051,

+		ERROR_CLUSTER_NODE_NOT_MEMBER = 5052,

+		ERROR_CLUSTER_JOIN_NOT_IN_PROGRESS = 5053,

+		ERROR_CLUSTER_INVALID_NETWORK = 5054,

+		ERROR_CLUSTER_NODE_UP = 5056,

+		ERROR_CLUSTER_IPADDR_IN_USE = 5057,

+		ERROR_CLUSTER_NODE_NOT_PAUSED = 5058,

+		ERROR_CLUSTER_NO_SECURITY_CONTEXT = 5059,

+		ERROR_CLUSTER_NETWORK_NOT_INTERNAL = 5060,

+		ERROR_CLUSTER_NODE_ALREADY_UP = 5061,

+		ERROR_CLUSTER_NODE_ALREADY_DOWN = 5062,

+		ERROR_CLUSTER_NETWORK_ALREADY_ONLINE = 5063,

+		ERROR_CLUSTER_NETWORK_ALREADY_OFFLINE = 5064,

+		ERROR_CLUSTER_NODE_ALREADY_MEMBER = 5065,

+		ERROR_CLUSTER_LAST_INTERNAL_NETWORK = 5066,

+		ERROR_CLUSTER_NETWORK_HAS_DEPENDENTS = 5067,

+		ERROR_INVALID_OPERATION_ON_QUORUM = 5068,

+		ERROR_DEPENDENCY_NOT_ALLOWED = 5069,

+		ERROR_CLUSTER_NODE_PAUSED = 5070,

+		ERROR_NODE_CANT_HOST_RESOURCE = 5071,

+		ERROR_CLUSTER_NODE_NOT_READY = 5072,

+		ERROR_CLUSTER_NODE_SHUTTING_DOWN = 5073,

+		ERROR_CLUSTER_JOIN_ABORTED = 5074,

+		ERROR_CLUSTER_INCOMPATIBLE_VERSIONS = 5075,

+		ERROR_CLUSTER_MAXNUM_OF_RESOURCES_EXCEEDED = 5076,

+		ERROR_CLUSTER_SYSTEM_CONFIG_CHANGED = 5077,

+		ERROR_CLUSTER_RESOURCE_TYPE_NOT_FOUND = 5078,

+		ERROR_CLUSTER_RESTYPE_NOT_SUPPORTED = 5079,

+		ERROR_CLUSTER_RESNAME_NOT_FOUND = 5080,

+		ERROR_CLUSTER_NO_RPC_PACKAGES_REGISTERED = 5081,

+		ERROR_CLUSTER_OWNER_NOT_IN_PREFLIST = 5082,

+		ERROR_CLUSTER_DATABASE_SEQMISMATCH = 5083,

+		ERROR_RESMON_INVALID_STATE = 5084,

+		ERROR_CLUSTER_GUM_NOT_LOCKER = 5085,

+		ERROR_QUORUM_DISK_NOT_FOUND = 5086,

+		ERROR_DATABASE_BACKUP_CORRUPT = 5087,

+		ERROR_CLUSTER_NODE_ALREADY_HAS_DFS_ROOT = 5088,

+		ERROR_RESOURCE_PROPERTY_UNCHANGEABLE = 5089,

+		ERROR_CLUSTER_MEMBERSHIP_INVALID_STATE = 5890,

+		ERROR_CLUSTER_QUORUMLOG_NOT_FOUND = 5891,

+		ERROR_CLUSTER_MEMBERSHIP_HALT = 5892,

+		ERROR_CLUSTER_INSTANCE_ID_MISMATCH = 5893,

+		ERROR_CLUSTER_NETWORK_NOT_FOUND_FOR_IP = 5894,

+		ERROR_CLUSTER_PROPERTY_DATA_TYPE_MISMATCH = 5895,

+		ERROR_CLUSTER_EVICT_WITHOUT_CLEANUP = 5896,

+		ERROR_CLUSTER_PARAMETER_MISMATCH = 5897,

+		ERROR_NODE_CANNOT_BE_CLUSTERED = 5898,

+		ERROR_CLUSTER_WRONG_OS_VERSION = 5899,

+		ERROR_CLUSTER_CANT_CREATE_DUP_CLUSTER_NAME = 5900,

+		ERROR_ENCRYPTION_FAILED = 6000,

+		ERROR_DECRYPTION_FAILED = 6001,

+		ERROR_FILE_ENCRYPTED = 6002,

+		ERROR_NO_RECOVERY_POLICY = 6003,

+		ERROR_NO_EFS = 6004,

+		ERROR_WRONG_EFS = 6005,

+		ERROR_NO_USER_KEYS = 6006,

+		ERROR_FILE_NOT_ENCRYPTED = 6007,

+		ERROR_NOT_EXPORT_FORMAT = 6008,

+		ERROR_FILE_READ_ONLY = 6009,

+		ERROR_DIR_EFS_DISALLOWED = 6010,

+		ERROR_EFS_SERVER_NOT_TRUSTED = 6011,

+		ERROR_BAD_RECOVERY_POLICY = 6012,

+		ERROR_EFS_ALG_BLOB_TOO_BIG = 6013,

+		ERROR_VOLUME_NOT_SUPPORT_EFS = 6014,

+		ERROR_EFS_DISABLED = 6015,

+		ERROR_EFS_VERSION_NOT_SUPPORT = 6016,

+		ERROR_NO_BROWSER_SERVERS_FOUND = 6118,

+		SCHED_E_SERVICE_NOT_LOCALSYSTEM = 6200,

+		ERROR_CTX_WINSTATION_NAME_INVALID = 7001,

+		ERROR_CTX_INVALID_PD = 7002,

+		ERROR_CTX_PD_NOT_FOUND = 7003,

+		ERROR_CTX_WD_NOT_FOUND = 7004,

+		ERROR_CTX_CANNOT_MAKE_EVENTLOG_ENTRY = 7005,

+		ERROR_CTX_SERVICE_NAME_COLLISION = 7006,

+		ERROR_CTX_CLOSE_PENDING = 7007,

+		ERROR_CTX_NO_OUTBUF = 7008,

+		ERROR_CTX_MODEM_INF_NOT_FOUND = 7009,

+		ERROR_CTX_INVALID_MODEMNAME = 7010,

+		ERROR_CTX_MODEM_RESPONSE_ERROR = 7011,

+		ERROR_CTX_MODEM_RESPONSE_TIMEOUT = 7012,

+		ERROR_CTX_MODEM_RESPONSE_NO_CARRIER = 7013,

+		ERROR_CTX_MODEM_RESPONSE_NO_DIALTONE = 7014,

+		ERROR_CTX_MODEM_RESPONSE_BUSY = 7015,

+		ERROR_CTX_MODEM_RESPONSE_VOICE = 7016,

+		ERROR_CTX_TD_ERROR = 7017,

+		ERROR_CTX_WINSTATION_NOT_FOUND = 7022,

+		ERROR_CTX_WINSTATION_ALREADY_EXISTS = 7023,

+		ERROR_CTX_WINSTATION_BUSY = 7024,

+		ERROR_CTX_BAD_VIDEO_MODE = 7025,

+		ERROR_CTX_GRAPHICS_INVALID = 7035,

+		ERROR_CTX_LOGON_DISABLED = 7037,

+		ERROR_CTX_NOT_CONSOLE = 7038,

+		ERROR_CTX_CLIENT_QUERY_TIMEOUT = 7040,

+		ERROR_CTX_CONSOLE_DISCONNECT = 7041,

+		ERROR_CTX_CONSOLE_CONNECT = 7042,

+		ERROR_CTX_SHADOW_DENIED = 7044,

+		ERROR_CTX_WINSTATION_ACCESS_DENIED = 7045,

+		ERROR_CTX_INVALID_WD = 7049,

+		ERROR_CTX_SHADOW_INVALID = 7050,

+		ERROR_CTX_SHADOW_DISABLED = 7051,

+		ERROR_CTX_CLIENT_LICENSE_IN_USE = 7052,

+		ERROR_CTX_CLIENT_LICENSE_NOT_SET = 7053,

+		ERROR_CTX_LICENSE_NOT_AVAILABLE = 7054,

+		ERROR_CTX_LICENSE_CLIENT_INVALID = 7055,

+		ERROR_CTX_LICENSE_EXPIRED = 7056,

+		ERROR_CTX_SHADOW_NOT_RUNNING = 7057,

+		ERROR_CTX_SHADOW_ENDED_BY_MODE_CHANGE = 7058,

+		FRS_ERR_INVALID_API_SEQUENCE = 8001,

+		FRS_ERR_STARTING_SERVICE = 8002,

+		FRS_ERR_STOPPING_SERVICE = 8003,

+		FRS_ERR_INTERNAL_API = 8004,

+		FRS_ERR_INTERNAL = 8005,

+		FRS_ERR_SERVICE_COMM = 8006,

+		FRS_ERR_INSUFFICIENT_PRIV = 8007,

+		FRS_ERR_AUTHENTICATION = 8008,

+		FRS_ERR_PARENT_INSUFFICIENT_PRIV = 8009,

+		FRS_ERR_PARENT_AUTHENTICATION = 8010,

+		FRS_ERR_CHILD_TO_PARENT_COMM = 8011,

+		FRS_ERR_PARENT_TO_CHILD_COMM = 8012,

+		FRS_ERR_SYSVOL_POPULATE = 8013,

+		FRS_ERR_SYSVOL_POPULATE_TIMEOUT = 8014,

+		FRS_ERR_SYSVOL_IS_BUSY = 8015,

+		FRS_ERR_SYSVOL_DEMOTE = 8016,

+		FRS_ERR_INVALID_SERVICE_PARAMETER = 8017,

+		ERROR_DS_NOT_INSTALLED = 8200,

+		ERROR_DS_MEMBERSHIP_EVALUATED_LOCALLY = 8201,

+		ERROR_DS_NO_ATTRIBUTE_OR_VALUE = 8202,

+		ERROR_DS_INVALID_ATTRIBUTE_SYNTAX = 8203,

+		ERROR_DS_ATTRIBUTE_TYPE_UNDEFINED = 8204,

+		ERROR_DS_ATTRIBUTE_OR_VALUE_EXISTS = 8205,

+		ERROR_DS_BUSY = 8206,

+		ERROR_DS_UNAVAILABLE = 8207,

+		ERROR_DS_NO_RIDS_ALLOCATED = 8208,

+		ERROR_DS_NO_MORE_RIDS = 8209,

+		ERROR_DS_INCORRECT_ROLE_OWNER = 8210,

+		ERROR_DS_RIDMGR_INIT_ERROR = 8211,

+		ERROR_DS_OBJ_CLASS_VIOLATION = 8212,

+		ERROR_DS_CANT_ON_NON_LEAF = 8213,

+		ERROR_DS_CANT_ON_RDN = 8214,

+		ERROR_DS_CANT_MOD_OBJ_CLASS = 8215,

+		ERROR_DS_CROSS_DOM_MOVE_ERROR = 8216,

+		ERROR_DS_GC_NOT_AVAILABLE = 8217,

+		ERROR_SHARED_POLICY = 8218,

+		ERROR_POLICY_OBJECT_NOT_FOUND = 8219,

+		ERROR_POLICY_ONLY_IN_DS = 8220,

+		ERROR_PROMOTION_ACTIVE = 8221,

+		ERROR_NO_PROMOTION_ACTIVE = 8222,

+		ERROR_DS_OPERATIONS_ERROR = 8224,

+		ERROR_DS_PROTOCOL_ERROR = 8225,

+		ERROR_DS_TIMELIMIT_EXCEEDED = 8226,

+		ERROR_DS_SIZELIMIT_EXCEEDED = 8227,

+		ERROR_DS_ADMIN_LIMIT_EXCEEDED = 8228,

+		ERROR_DS_COMPARE_FALSE = 8229,

+		ERROR_DS_COMPARE_TRUE = 8230,

+		ERROR_DS_AUTH_METHOD_NOT_SUPPORTED = 8231,

+		ERROR_DS_STRONG_AUTH_REQUIRED = 8232,

+		ERROR_DS_INAPPROPRIATE_AUTH = 8233,

+		ERROR_DS_AUTH_UNKNOWN = 8234,

+		ERROR_DS_REFERRAL = 8235,

+		ERROR_DS_UNAVAILABLE_CRIT_EXTENSION = 8236,

+		ERROR_DS_CONFIDENTIALITY_REQUIRED = 8237,

+		ERROR_DS_INAPPROPRIATE_MATCHING = 8238,

+		ERROR_DS_CONSTRAINT_VIOLATION = 8239,

+		ERROR_DS_NO_SUCH_OBJECT = 8240,

+		ERROR_DS_ALIAS_PROBLEM = 8241,

+		ERROR_DS_INVALID_DN_SYNTAX = 8242,

+		ERROR_DS_IS_LEAF = 8243,

+		ERROR_DS_ALIAS_DEREF_PROBLEM = 8244,

+		ERROR_DS_UNWILLING_TO_PERFORM = 8245,

+		ERROR_DS_LOOP_DETECT = 8246,

+		ERROR_DS_NAMING_VIOLATION = 8247,

+		ERROR_DS_OBJECT_RESULTS_TOO_LARGE = 8248,

+		ERROR_DS_AFFECTS_MULTIPLE_DSAS = 8249,

+		ERROR_DS_SERVER_DOWN = 8250,

+		ERROR_DS_LOCAL_ERROR = 8251,

+		ERROR_DS_ENCODING_ERROR = 8252,

+		ERROR_DS_DECODING_ERROR = 8253,

+		ERROR_DS_FILTER_UNKNOWN = 8254,

+		ERROR_DS_PARAM_ERROR = 8255,

+		ERROR_DS_NOT_SUPPORTED = 8256,

+		ERROR_DS_NO_RESULTS_RETURNED = 8257,

+		ERROR_DS_CONTROL_NOT_FOUND = 8258,

+		ERROR_DS_CLIENT_LOOP = 8259,

+		ERROR_DS_REFERRAL_LIMIT_EXCEEDED = 8260,

+		ERROR_DS_SORT_CONTROL_MISSING = 8261,

+		ERROR_DS_OFFSET_RANGE_ERROR = 8262,

+		ERROR_DS_ROOT_MUST_BE_NC = 8301,

+		ERROR_DS_ADD_REPLICA_INHIBITED = 8302,

+		ERROR_DS_ATT_NOT_DEF_IN_SCHEMA = 8303,

+		ERROR_DS_MAX_OBJ_SIZE_EXCEEDED = 8304,

+		ERROR_DS_OBJ_STRING_NAME_EXISTS = 8305,

+		ERROR_DS_NO_RDN_DEFINED_IN_SCHEMA = 8306,

+		ERROR_DS_RDN_DOESNT_MATCH_SCHEMA = 8307,

+		ERROR_DS_NO_REQUESTED_ATTS_FOUND = 8308,

+		ERROR_DS_USER_BUFFER_TO_SMALL = 8309,

+		ERROR_DS_ATT_IS_NOT_ON_OBJ = 8310,

+		ERROR_DS_ILLEGAL_MOD_OPERATION = 8311,

+		ERROR_DS_OBJ_TOO_LARGE = 8312,

+		ERROR_DS_BAD_INSTANCE_TYPE = 8313,

+		ERROR_DS_MASTERDSA_REQUIRED = 8314,

+		ERROR_DS_OBJECT_CLASS_REQUIRED = 8315,

+		ERROR_DS_MISSING_REQUIRED_ATT = 8316,

+		ERROR_DS_ATT_NOT_DEF_FOR_CLASS = 8317,

+		ERROR_DS_ATT_ALREADY_EXISTS = 8318,

+		ERROR_DS_CANT_ADD_ATT_VALUES = 8320,

+		ERROR_DS_SINGLE_VALUE_CONSTRAINT = 8321,

+		ERROR_DS_RANGE_CONSTRAINT = 8322,

+		ERROR_DS_ATT_VAL_ALREADY_EXISTS = 8323,

+		ERROR_DS_CANT_REM_MISSING_ATT = 8324,

+		ERROR_DS_CANT_REM_MISSING_ATT_VAL = 8325,

+		ERROR_DS_ROOT_CANT_BE_SUBREF = 8326,

+		ERROR_DS_NO_CHAINING = 8327,

+		ERROR_DS_NO_CHAINED_EVAL = 8328,

+		ERROR_DS_NO_PARENT_OBJECT = 8329,

+		ERROR_DS_PARENT_IS_AN_ALIAS = 8330,

+		ERROR_DS_CANT_MIX_MASTER_AND_REPS = 8331,

+		ERROR_DS_CHILDREN_EXIST = 8332,

+		ERROR_DS_OBJ_NOT_FOUND = 8333,

+		ERROR_DS_ALIASED_OBJ_MISSING = 8334,

+		ERROR_DS_BAD_NAME_SYNTAX = 8335,

+		ERROR_DS_ALIAS_POINTS_TO_ALIAS = 8336,

+		ERROR_DS_CANT_DEREF_ALIAS = 8337,

+		ERROR_DS_OUT_OF_SCOPE = 8338,

+		ERROR_DS_OBJECT_BEING_REMOVED = 8339,

+		ERROR_DS_CANT_DELETE_DSA_OBJ = 8340,

+		ERROR_DS_GENERIC_ERROR = 8341,

+		ERROR_DS_DSA_MUST_BE_INT_MASTER = 8342,

+		ERROR_DS_CLASS_NOT_DSA = 8343,

+		ERROR_DS_INSUFF_ACCESS_RIGHTS = 8344,

+		ERROR_DS_ILLEGAL_SUPERIOR = 8345,

+		ERROR_DS_ATTRIBUTE_OWNED_BY_SAM = 8346,

+		ERROR_DS_NAME_TOO_MANY_PARTS = 8347,

+		ERROR_DS_NAME_TOO_LONG = 8348,

+		ERROR_DS_NAME_VALUE_TOO_LONG = 8349,

+		ERROR_DS_NAME_UNPARSEABLE = 8350,

+		ERROR_DS_NAME_TYPE_UNKNOWN = 8351,

+		ERROR_DS_NOT_AN_OBJECT = 8352,

+		ERROR_DS_SEC_DESC_TOO_SHORT = 8353,

+		ERROR_DS_SEC_DESC_INVALID = 8354,

+		ERROR_DS_NO_DELETED_NAME = 8355,

+		ERROR_DS_SUBREF_MUST_HAVE_PARENT = 8356,

+		ERROR_DS_NCNAME_MUST_BE_NC = 8357,

+		ERROR_DS_CANT_ADD_SYSTEM_ONLY = 8358,

+		ERROR_DS_CLASS_MUST_BE_CONCRETE = 8359,

+		ERROR_DS_INVALID_DMD = 8360,

+		ERROR_DS_OBJ_GUID_EXISTS = 8361,

+		ERROR_DS_NOT_ON_BACKLINK = 8362,

+		ERROR_DS_NO_CROSSREF_FOR_NC = 8363,

+		ERROR_DS_SHUTTING_DOWN = 8364,

+		ERROR_DS_UNKNOWN_OPERATION = 8365,

+		ERROR_DS_INVALID_ROLE_OWNER = 8366,

+		ERROR_DS_COULDNT_CONTACT_FSMO = 8367,

+		ERROR_DS_CROSS_NC_DN_RENAME = 8368,

+		ERROR_DS_CANT_MOD_SYSTEM_ONLY = 8369,

+		ERROR_DS_REPLICATOR_ONLY = 8370,

+		ERROR_DS_OBJ_CLASS_NOT_DEFINED = 8371,

+		ERROR_DS_OBJ_CLASS_NOT_SUBCLASS = 8372,

+		ERROR_DS_NAME_REFERENCE_INVALID = 8373,

+		ERROR_DS_CROSS_REF_EXISTS = 8374,

+		ERROR_DS_CANT_DEL_MASTER_CROSSREF = 8375,

+		ERROR_DS_SUBTREE_NOTIFY_NOT_NC_HEAD = 8376,

+		ERROR_DS_NOTIFY_FILTER_TOO_COMPLEX = 8377,

+		ERROR_DS_DUP_RDN = 8378,

+		ERROR_DS_DUP_OID = 8379,

+		ERROR_DS_DUP_MAPI_ID = 8380,

+		ERROR_DS_DUP_SCHEMA_ID_GUID = 8381,

+		ERROR_DS_DUP_LDAP_DISPLAY_NAME = 8382,

+		ERROR_DS_SEMANTIC_ATT_TEST = 8383,

+		ERROR_DS_SYNTAX_MISMATCH = 8384,

+		ERROR_DS_EXISTS_IN_MUST_HAVE = 8385,

+		ERROR_DS_EXISTS_IN_MAY_HAVE = 8386,

+		ERROR_DS_NONEXISTENT_MAY_HAVE = 8387,

+		ERROR_DS_NONEXISTENT_MUST_HAVE = 8388,

+		ERROR_DS_AUX_CLS_TEST_FAIL = 8389,

+		ERROR_DS_NONEXISTENT_POSS_SUP = 8390,

+		ERROR_DS_SUB_CLS_TEST_FAIL = 8391,

+		ERROR_DS_BAD_RDN_ATT_ID_SYNTAX = 8392,

+		ERROR_DS_EXISTS_IN_AUX_CLS = 8393,

+		ERROR_DS_EXISTS_IN_SUB_CLS = 8394,

+		ERROR_DS_EXISTS_IN_POSS_SUP = 8395,

+		ERROR_DS_RECALCSCHEMA_FAILED = 8396,

+		ERROR_DS_TREE_DELETE_NOT_FINISHED = 8397,

+		ERROR_DS_CANT_DELETE = 8398,

+		ERROR_DS_ATT_SCHEMA_REQ_ID = 8399,

+		ERROR_DS_BAD_ATT_SCHEMA_SYNTAX = 8400,

+		ERROR_DS_CANT_CACHE_ATT = 8401,

+		ERROR_DS_CANT_CACHE_CLASS = 8402,

+		ERROR_DS_CANT_REMOVE_ATT_CACHE = 8403,

+		ERROR_DS_CANT_REMOVE_CLASS_CACHE = 8404,

+		ERROR_DS_CANT_RETRIEVE_DN = 8405,

+		ERROR_DS_MISSING_SUPREF = 8406,

+		ERROR_DS_CANT_RETRIEVE_INSTANCE = 8407,

+		ERROR_DS_CODE_INCONSISTENCY = 8408,

+		ERROR_DS_DATABASE_ERROR = 8409,

+		ERROR_DS_GOVERNSID_MISSING = 8410,

+		ERROR_DS_MISSING_EXPECTED_ATT = 8411,

+		ERROR_DS_NCNAME_MISSING_CR_REF = 8412,

+		ERROR_DS_SECURITY_CHECKING_ERROR = 8413,

+		ERROR_DS_SCHEMA_NOT_LOADED = 8414,

+		ERROR_DS_SCHEMA_ALLOC_FAILED = 8415,

+		ERROR_DS_ATT_SCHEMA_REQ_SYNTAX = 8416,

+		ERROR_DS_GCVERIFY_ERROR = 8417,

+		ERROR_DS_DRA_SCHEMA_MISMATCH = 8418,

+		ERROR_DS_CANT_FIND_DSA_OBJ = 8419,

+		ERROR_DS_CANT_FIND_EXPECTED_NC = 8420,

+		ERROR_DS_CANT_FIND_NC_IN_CACHE = 8421,

+		ERROR_DS_CANT_RETRIEVE_CHILD = 8422,

+		ERROR_DS_SECURITY_ILLEGAL_MODIFY = 8423,

+		ERROR_DS_CANT_REPLACE_HIDDEN_REC = 8424,

+		ERROR_DS_BAD_HIERARCHY_FILE = 8425,

+		ERROR_DS_BUILD_HIERARCHY_TABLE_FAILED = 8426,

+		ERROR_DS_CONFIG_PARAM_MISSING = 8427,

+		ERROR_DS_COUNTING_AB_INDICES_FAILED = 8428,

+		ERROR_DS_HIERARCHY_TABLE_MALLOC_FAILED = 8429,

+		ERROR_DS_INTERNAL_FAILURE = 8430,

+		ERROR_DS_UNKNOWN_ERROR = 8431,

+		ERROR_DS_ROOT_REQUIRES_CLASS_TOP = 8432,

+		ERROR_DS_REFUSING_FSMO_ROLES = 8433,

+		ERROR_DS_MISSING_FSMO_SETTINGS = 8434,

+		ERROR_DS_UNABLE_TO_SURRENDER_ROLES = 8435,

+		ERROR_DS_DRA_GENERIC = 8436,

+		ERROR_DS_DRA_INVALID_PARAMETER = 8437,

+		ERROR_DS_DRA_BUSY = 8438,

+		ERROR_DS_DRA_BAD_DN = 8439,

+		ERROR_DS_DRA_BAD_NC = 8440,

+		ERROR_DS_DRA_DN_EXISTS = 8441,

+		ERROR_DS_DRA_INTERNAL_ERROR = 8442,

+		ERROR_DS_DRA_INCONSISTENT_DIT = 8443,

+		ERROR_DS_DRA_CONNECTION_FAILED = 8444,

+		ERROR_DS_DRA_BAD_INSTANCE_TYPE = 8445,

+		ERROR_DS_DRA_OUT_OF_MEM = 8446,

+		ERROR_DS_DRA_MAIL_PROBLEM = 8447,

+		ERROR_DS_DRA_REF_ALREADY_EXISTS = 8448,

+		ERROR_DS_DRA_REF_NOT_FOUND = 8449,

+		ERROR_DS_DRA_OBJ_IS_REP_SOURCE = 8450,

+		ERROR_DS_DRA_DB_ERROR = 8451,

+		ERROR_DS_DRA_NO_REPLICA = 8452,

+		ERROR_DS_DRA_ACCESS_DENIED = 8453,

+		ERROR_DS_DRA_NOT_SUPPORTED = 8454,

+		ERROR_DS_DRA_RPC_CANCELLED = 8455,

+		ERROR_DS_DRA_SOURCE_DISABLED = 8456,

+		ERROR_DS_DRA_SINK_DISABLED = 8457,

+		ERROR_DS_DRA_NAME_COLLISION = 8458,

+		ERROR_DS_DRA_SOURCE_REINSTALLED = 8459,

+		ERROR_DS_DRA_MISSING_PARENT = 8460,

+		ERROR_DS_DRA_PREEMPTED = 8461,

+		ERROR_DS_DRA_ABANDON_SYNC = 8462,

+		ERROR_DS_DRA_SHUTDOWN = 8463,

+		ERROR_DS_DRA_INCOMPATIBLE_PARTIAL_SET = 8464,

+		ERROR_DS_DRA_SOURCE_IS_PARTIAL_REPLICA = 8465,

+		ERROR_DS_DRA_EXTN_CONNECTION_FAILED = 8466,

+		ERROR_DS_INSTALL_SCHEMA_MISMATCH = 8467,

+		ERROR_DS_DUP_LINK_ID = 8468,

+		ERROR_DS_NAME_ERROR_RESOLVING = 8469,

+		ERROR_DS_NAME_ERROR_NOT_FOUND = 8470,

+		ERROR_DS_NAME_ERROR_NOT_UNIQUE = 8471,

+		ERROR_DS_NAME_ERROR_NO_MAPPING = 8472,

+		ERROR_DS_NAME_ERROR_DOMAIN_ONLY = 8473,

+		ERROR_DS_NAME_ERROR_NO_SYNTACTICAL_MAPPING = 8474,

+		ERROR_DS_CONSTRUCTED_ATT_MOD = 8475,

+		ERROR_DS_WRONG_OM_OBJ_CLASS = 8476,

+		ERROR_DS_DRA_REPL_PENDING = 8477,

+		ERROR_DS_DS_REQUIRED = 8478,

+		ERROR_DS_INVALID_LDAP_DISPLAY_NAME = 8479,

+		ERROR_DS_NON_BASE_SEARCH = 8480,

+		ERROR_DS_CANT_RETRIEVE_ATTS = 8481,

+		ERROR_DS_BACKLINK_WITHOUT_LINK = 8482,

+		ERROR_DS_EPOCH_MISMATCH = 8483,

+		ERROR_DS_SRC_NAME_MISMATCH = 8484,

+		ERROR_DS_SRC_AND_DST_NC_IDENTICAL = 8485,

+		ERROR_DS_DST_NC_MISMATCH = 8486,

+		ERROR_DS_NOT_AUTHORITIVE_FOR_DST_NC = 8487,

+		ERROR_DS_SRC_GUID_MISMATCH = 8488,

+		ERROR_DS_CANT_MOVE_DELETED_OBJECT = 8489,

+		ERROR_DS_PDC_OPERATION_IN_PROGRESS = 8490,

+		ERROR_DS_CROSS_DOMAIN_CLEANUP_REQD = 8491,

+		ERROR_DS_ILLEGAL_XDOM_MOVE_OPERATION = 8492,

+		ERROR_DS_CANT_WITH_ACCT_GROUP_MEMBERSHPS = 8493,

+		ERROR_DS_NC_MUST_HAVE_NC_PARENT = 8494,

+		ERROR_DS_DST_DOMAIN_NOT_NATIVE = 8496,

+		ERROR_DS_MISSING_INFRASTRUCTURE_CONTAINER = 8497,

+		ERROR_DS_CANT_MOVE_ACCOUNT_GROUP = 8498,

+		ERROR_DS_CANT_MOVE_RESOURCE_GROUP = 8499,

+		ERROR_DS_INVALID_SEARCH_FLAG = 8500,

+		ERROR_DS_NO_TREE_DELETE_ABOVE_NC = 8501,

+		ERROR_DS_COULDNT_LOCK_TREE_FOR_DELETE = 8502,

+		ERROR_DS_COULDNT_IDENTIFY_OBJECTS_FOR_TREE_DELETE = 8503,

+		ERROR_DS_SAM_INIT_FAILURE = 8504,

+		ERROR_DS_SENSITIVE_GROUP_VIOLATION = 8505,

+		ERROR_DS_CANT_MOD_PRIMARYGROUPID = 8506,

+		ERROR_DS_ILLEGAL_BASE_SCHEMA_MOD = 8507,

+		ERROR_DS_NONSAFE_SCHEMA_CHANGE = 8508,

+		ERROR_DS_SCHEMA_UPDATE_DISALLOWED = 8509,

+		ERROR_DS_CANT_CREATE_UNDER_SCHEMA = 8510,

+		ERROR_DS_INSTALL_NO_SRC_SCH_VERSION = 8511,

+		ERROR_DS_INSTALL_NO_SCH_VERSION_IN_INIFILE = 8512,

+		ERROR_DS_INVALID_GROUP_TYPE = 8513,

+		ERROR_DS_NO_NEST_GLOBALGROUP_IN_MIXEDDOMAIN = 8514,

+		ERROR_DS_NO_NEST_LOCALGROUP_IN_MIXEDDOMAIN = 8515,

+		ERROR_DS_GLOBAL_CANT_HAVE_LOCAL_MEMBER = 8516,

+		ERROR_DS_GLOBAL_CANT_HAVE_UNIVERSAL_MEMBER = 8517,

+		ERROR_DS_UNIVERSAL_CANT_HAVE_LOCAL_MEMBER = 8518,

+		ERROR_DS_GLOBAL_CANT_HAVE_CROSSDOMAIN_MEMBER = 8519,

+		ERROR_DS_LOCAL_CANT_HAVE_CROSSDOMAIN_LOCAL_MEMBER = 8520,

+		ERROR_DS_HAVE_PRIMARY_MEMBERS = 8521,

+		ERROR_DS_STRING_SD_CONVERSION_FAILED = 8522,

+		ERROR_DS_NAMING_MASTER_GC = 8523,

+		ERROR_DS_LOOKUP_FAILURE = 8524,

+		ERROR_DS_COULDNT_UPDATE_SPNS = 8525,

+		ERROR_DS_CANT_RETRIEVE_SD = 8526,

+		ERROR_DS_KEY_NOT_UNIQUE = 8527,

+		ERROR_DS_WRONG_LINKED_ATT_SYNTAX = 8528,

+		ERROR_DS_SAM_NEED_BOOTKEY_PASSWORD = 8529,

+		ERROR_DS_SAM_NEED_BOOTKEY_FLOPPY = 8530,

+		ERROR_DS_CANT_START = 8531,

+		ERROR_DS_INIT_FAILURE = 8532,

+		ERROR_DS_NO_PKT_PRIVACY_ON_CONNECTION = 8533,

+		ERROR_DS_SOURCE_DOMAIN_IN_FOREST = 8534,

+		ERROR_DS_DESTINATION_DOMAIN_NOT_IN_FOREST = 8535,

+		ERROR_DS_DESTINATION_AUDITING_NOT_ENABLED = 8536,

+		ERROR_DS_CANT_FIND_DC_FOR_SRC_DOMAIN = 8537,

+		ERROR_DS_SRC_OBJ_NOT_GROUP_OR_USER = 8538,

+		ERROR_DS_SRC_SID_EXISTS_IN_FOREST = 8539,

+		ERROR_DS_SRC_AND_DST_OBJECT_CLASS_MISMATCH = 8540,

+		ERROR_SAM_INIT_FAILURE = 8541,

+		ERROR_DS_DRA_SCHEMA_INFO_SHIP = 8542,

+		ERROR_DS_DRA_SCHEMA_CONFLICT = 8543,

+		ERROR_DS_DRA_EARLIER_SCHEMA_CONLICT = 8544,

+		ERROR_DS_DRA_OBJ_NC_MISMATCH = 8545,

+		ERROR_DS_NC_STILL_HAS_DSAS = 8546,

+		ERROR_DS_GC_REQUIRED = 8547,

+		ERROR_DS_LOCAL_MEMBER_OF_LOCAL_ONLY = 8548,

+		ERROR_DS_NO_FPO_IN_UNIVERSAL_GROUPS = 8549,

+		ERROR_DS_CANT_ADD_TO_GC = 8550,

+		ERROR_DS_NO_CHECKPOINT_WITH_PDC = 8551,

+		ERROR_DS_SOURCE_AUDITING_NOT_ENABLED = 8552,

+		ERROR_DS_CANT_CREATE_IN_NONDOMAIN_NC = 8553,

+		ERROR_DS_INVALID_NAME_FOR_SPN = 8554,

+		ERROR_DS_FILTER_USES_CONTRUCTED_ATTRS = 8555,

+		ERROR_DS_UNICODEPWD_NOT_IN_QUOTES = 8556,

+		ERROR_DS_MACHINE_ACCOUNT_QUOTA_EXCEEDED = 8557,

+		ERROR_DS_MUST_BE_RUN_ON_DST_DC = 8558,

+		ERROR_DS_SRC_DC_MUST_BE_SP4_OR_GREATER = 8559,

+		ERROR_DS_CANT_TREE_DELETE_CRITICAL_OBJ = 8560,

+		ERROR_DS_INIT_FAILURE_CONSOLE = 8561,

+		ERROR_DS_SAM_INIT_FAILURE_CONSOLE = 8562,

+		ERROR_DS_FOREST_VERSION_TOO_HIGH = 8563,

+		ERROR_DS_DOMAIN_VERSION_TOO_HIGH = 8564,

+		ERROR_DS_FOREST_VERSION_TOO_LOW = 8565,

+		ERROR_DS_DOMAIN_VERSION_TOO_LOW = 8566,

+		ERROR_DS_INCOMPATIBLE_VERSION = 8567,

+		ERROR_DS_LOW_DSA_VERSION = 8568,

+		ERROR_DS_NO_BEHAVIOR_VERSION_IN_MIXEDDOMAIN = 8569,

+		ERROR_DS_NOT_SUPPORTED_SORT_ORDER = 8570,

+		ERROR_DS_NAME_NOT_UNIQUE = 8571,

+		ERROR_DS_MACHINE_ACCOUNT_CREATED_PRENT4 = 8572,

+		ERROR_DS_OUT_OF_VERSION_STORE = 8573,

+		ERROR_DS_INCOMPATIBLE_CONTROLS_USED = 8574,

+		ERROR_DS_NO_REF_DOMAIN = 8575,

+		ERROR_DS_RESERVED_LINK_ID = 8576,

+		ERROR_DS_LINK_ID_NOT_AVAILABLE = 8577,

+		ERROR_DS_AG_CANT_HAVE_UNIVERSAL_MEMBER = 8578,

+		ERROR_DS_MODIFYDN_DISALLOWED_BY_INSTANCE_TYPE = 8579,

+		ERROR_DS_NO_OBJECT_MOVE_IN_SCHEMA_NC = 8580,

+		ERROR_DS_MODIFYDN_DISALLOWED_BY_FLAG = 8581,

+		ERROR_DS_MODIFYDN_WRONG_GRANDPARENT = 8582,

+		ERROR_DS_NAME_ERROR_TRUST_REFERRAL = 8583,

+		ERROR_NOT_SUPPORTED_ON_STANDARD_SERVER = 8584,

+		ERROR_DS_CANT_ACCESS_REMOTE_PART_OF_AD = 8585,

+		ERROR_DS_CR_IMPOSSIBLE_TO_VALIDATE = 8586,

+		ERROR_DS_THREAD_LIMIT_EXCEEDED = 8587,

+		ERROR_DS_NOT_CLOSEST = 8588,

+		ERROR_DS_CANT_DERIVE_SPN_WITHOUT_SERVER_REF = 8589,

+		ERROR_DS_SINGLE_USER_MODE_FAILED = 8590,

+		ERROR_DS_NTDSCRIPT_SYNTAX_ERROR = 8591,

+		ERROR_DS_NTDSCRIPT_PROCESS_ERROR = 8592,

+		ERROR_DS_DIFFERENT_REPL_EPOCHS = 8593,

+		ERROR_DS_DRS_EXTENSIONS_CHANGED = 8594,

+		ERROR_DS_REPLICA_SET_CHANGE_NOT_ALLOWED_ON_DISABLED_CR = 8595,

+		ERROR_DS_NO_MSDS_INTID = 8596,

+		ERROR_DS_DUP_MSDS_INTID = 8597,

+		ERROR_DS_EXISTS_IN_RDNATTID = 8598,

+		ERROR_DS_AUTHORIZATION_FAILED = 8599,

+		ERROR_DS_INVALID_SCRIPT = 8600,

+		ERROR_DS_REMOTE_CROSSREF_OP_FAILED = 8601,

+		DNS_ERROR_RCODE_FORMAT_ERROR = 9001,

+		DNS_ERROR_RCODE_SERVER_FAILURE = 9002,

+		DNS_ERROR_RCODE_NAME_ERROR = 9003,

+		DNS_ERROR_RCODE_NOT_IMPLEMENTED = 9004,

+		DNS_ERROR_RCODE_REFUSED = 9005,

+		DNS_ERROR_RCODE_YXDOMAIN = 9006,

+		DNS_ERROR_RCODE_YXRRSET = 9007,

+		DNS_ERROR_RCODE_NXRRSET = 9008,

+		DNS_ERROR_RCODE_NOTAUTH = 9009,

+		DNS_ERROR_RCODE_NOTZONE = 9010,

+		DNS_ERROR_RCODE_BADSIG = 9016,

+		DNS_ERROR_RCODE_BADKEY = 9017,

+		DNS_ERROR_RCODE_BADTIME = 9018,

+		DNS_INFO_NO_RECORDS = 9501,

+		DNS_ERROR_BAD_PACKET = 9502,

+		DNS_ERROR_NO_PACKET = 9503,

+		DNS_ERROR_RCODE = 9504,

+		DNS_ERROR_UNSECURE_PACKET = 9505,

+		DNS_ERROR_INVALID_TYPE = 9551,

+		DNS_ERROR_INVALID_IP_ADDRESS = 9552,

+		DNS_ERROR_INVALID_PROPERTY = 9553,

+		DNS_ERROR_TRY_AGAIN_LATER = 9554,

+		DNS_ERROR_NOT_UNIQUE = 9555,

+		DNS_ERROR_NON_RFC_NAME = 9556,

+		DNS_STATUS_FQDN = 9557,

+		DNS_STATUS_DOTTED_NAME = 9558,

+		DNS_STATUS_SINGLE_PART_NAME = 9559,

+		DNS_ERROR_INVALID_NAME_CHAR = 9560,

+		DNS_ERROR_NUMERIC_NAME = 9561,

+		DNS_ERROR_NOT_ALLOWED_ON_ROOT_SERVER = 9562,

+		DNS_ERROR_ZONE_DOES_NOT_EXIST = 9601,

+		DNS_ERROR_NO_ZONE_INFO = 9602,

+		DNS_ERROR_INVALID_ZONE_OPERATION = 9603,

+		DNS_ERROR_ZONE_CONFIGURATION_ERROR = 9604,

+		DNS_ERROR_ZONE_HAS_NO_SOA_RECORD = 9605,

+		DNS_ERROR_ZONE_HAS_NO_NS_RECORDS = 9606,

+		DNS_ERROR_ZONE_LOCKED = 9607,

+		DNS_ERROR_ZONE_CREATION_FAILED = 9608,

+		DNS_ERROR_ZONE_ALREADY_EXISTS = 9609,

+		DNS_ERROR_AUTOZONE_ALREADY_EXISTS = 9610,

+		DNS_ERROR_INVALID_ZONE_TYPE = 9611,

+		DNS_ERROR_SECONDARY_REQUIRES_MASTER_IP = 9612,

+		DNS_ERROR_ZONE_NOT_SECONDARY = 9613,

+		DNS_ERROR_NEED_SECONDARY_ADDRESSES = 9614,

+		DNS_ERROR_WINS_INIT_FAILED = 9615,

+		DNS_ERROR_NEED_WINS_SERVERS = 9616,

+		DNS_ERROR_NBSTAT_INIT_FAILED = 9617,

+		DNS_ERROR_SOA_DELETE_INVALID = 9618,

+		DNS_ERROR_FORWARDER_ALREADY_EXISTS = 9619,

+		DNS_ERROR_ZONE_REQUIRES_MASTER_IP = 9620,

+		DNS_ERROR_ZONE_IS_SHUTDOWN = 9621,

+		DNS_ERROR_PRIMARY_REQUIRES_DATAFILE = 9651,

+		DNS_ERROR_INVALID_DATAFILE_NAME = 9652,

+		DNS_ERROR_DATAFILE_OPEN_FAILURE = 9653,

+		DNS_ERROR_FILE_WRITEBACK_FAILED = 9654,

+		DNS_ERROR_DATAFILE_PARSING = 9655,

+		DNS_ERROR_RECORD_DOES_NOT_EXIST = 9701,

+		DNS_ERROR_RECORD_FORMAT = 9702,

+		DNS_ERROR_NODE_CREATION_FAILED = 9703,

+		DNS_ERROR_UNKNOWN_RECORD_TYPE = 9704,

+		DNS_ERROR_RECORD_TIMED_OUT = 9705,

+		DNS_ERROR_NAME_NOT_IN_ZONE = 9706,

+		DNS_ERROR_CNAME_LOOP = 9707,

+		DNS_ERROR_NODE_IS_CNAME = 9708,

+		DNS_ERROR_CNAME_COLLISION = 9709,

+		DNS_ERROR_RECORD_ONLY_AT_ZONE_ROOT = 9710,

+		DNS_ERROR_RECORD_ALREADY_EXISTS = 9711,

+		DNS_ERROR_SECONDARY_DATA = 9712,

+		DNS_ERROR_NO_CREATE_CACHE_DATA = 9713,

+		DNS_ERROR_NAME_DOES_NOT_EXIST = 9714,

+		DNS_WARNING_PTR_CREATE_FAILED = 9715,

+		DNS_WARNING_DOMAIN_UNDELETED = 9716,

+		DNS_ERROR_DS_UNAVAILABLE = 9717,

+		DNS_ERROR_DS_ZONE_ALREADY_EXISTS = 9718,

+		DNS_ERROR_NO_BOOTFILE_IF_DS_ZONE = 9719,

+		DNS_INFO_AXFR_COMPLETE = 9751,

+		DNS_ERROR_AXFR = 9752,

+		DNS_INFO_ADDED_LOCAL_WINS = 9753,

+		DNS_STATUS_CONTINUE_NEEDED = 9801,

+		DNS_ERROR_NO_TCPIP = 9851,

+		DNS_ERROR_NO_DNS_SERVERS = 9852,

+		DNS_ERROR_DP_DOES_NOT_EXIST = 9901,

+		DNS_ERROR_DP_ALREADY_EXISTS = 9902,

+		DNS_ERROR_DP_NOT_ENLISTED = 9903,

+		DNS_ERROR_DP_ALREADY_ENLISTED = 9904,

+		WSAEINTR = 10004,

+		WSAEBADF = 10009,

+		WSAEACCES = 10013,

+		WSAEFAULT = 10014,

+		WSAEINVAL = 10022,

+		WSAEMFILE = 10024,

+		WSAEWOULDBLOCK = 10035,

+		WSAEINPROGRESS = 10036,

+		WSAEALREADY = 10037,

+		WSAENOTSOCK = 10038,

+		WSAEDESTADDRREQ = 10039,

+		WSAEMSGSIZE = 10040,

+		WSAEPROTOTYPE = 10041,

+		WSAENOPROTOOPT = 10042,

+		WSAEPROTONOSUPPORT = 10043,

+		WSAESOCKTNOSUPPORT = 10044,

+		WSAEOPNOTSUPP = 10045,

+		WSAEPFNOSUPPORT = 10046,

+		WSAEAFNOSUPPORT = 10047,

+		WSAEADDRINUSE = 10048,

+		WSAEADDRNOTAVAIL = 10049,

+		WSAENETDOWN = 10050,

+		WSAENETUNREACH = 10051,

+		WSAENETRESET = 10052,

+		WSAECONNABORTED = 10053,

+		WSAECONNRESET = 10054,

+		WSAENOBUFS = 10055,

+		WSAEISCONN = 10056,

+		WSAENOTCONN = 10057,

+		WSAESHUTDOWN = 10058,

+		WSAETOOMANYREFS = 10059,

+		WSAETIMEDOUT = 10060,

+		WSAECONNREFUSED = 10061,

+		WSAELOOP = 10062,

+		WSAENAMETOOLONG = 10063,

+		WSAEHOSTDOWN = 10064,

+		WSAEHOSTUNREACH = 10065,

+		WSAENOTEMPTY = 10066,

+		WSAEPROCLIM = 10067,

+		WSAEUSERS = 10068,

+		WSAEDQUOT = 10069,

+		WSAESTALE = 10070,

+		WSAEREMOTE = 10071,

+		WSASYSNOTREADY = 10091,

+		WSAVERNOTSUPPORTED = 10092,

+		WSANOTINITIALISED = 10093,

+		WSAEDISCON = 10101,

+		WSAENOMORE = 10102,

+		WSAECANCELLED = 10103,

+		WSAEINVALIDPROCTABLE = 10104,

+		WSAEINVALIDPROVIDER = 10105,

+		WSAEPROVIDERFAILEDINIT = 10106,

+		WSASYSCALLFAILURE = 10107,

+		WSASERVICE_NOT_FOUND = 10108,

+		WSATYPE_NOT_FOUND = 10109,

+		WSA_E_NO_MORE = 10110,

+		WSA_E_CANCELLED = 10111,

+		WSAEREFUSED = 10112,

+		WSAHOST_NOT_FOUND = 11001,

+		WSATRY_AGAIN = 11002,

+		WSANO_RECOVERY = 11003,

+		WSANO_DATA = 11004,

+		WSA_QOS_RECEIVERS = 11005,

+		WSA_QOS_SENDERS = 11006,

+		WSA_QOS_NO_SENDERS = 11007,

+		WSA_QOS_NO_RECEIVERS = 11008,

+		WSA_QOS_REQUEST_CONFIRMED = 11009,

+		WSA_QOS_ADMISSION_FAILURE = 11010,

+		WSA_QOS_POLICY_FAILURE = 11011,

+		WSA_QOS_BAD_STYLE = 11012,

+		WSA_QOS_BAD_OBJECT = 11013,

+		WSA_QOS_TRAFFIC_CTRL_ERROR = 11014,

+		WSA_QOS_GENERIC_ERROR = 11015,

+		WSA_QOS_ESERVICETYPE = 11016,

+		WSA_QOS_EFLOWSPEC = 11017,

+		WSA_QOS_EPROVSPECBUF = 11018,

+		WSA_QOS_EFILTERSTYLE = 11019,

+		WSA_QOS_EFILTERTYPE = 11020,

+		WSA_QOS_EFILTERCOUNT = 11021,

+		WSA_QOS_EOBJLENGTH = 11022,

+		WSA_QOS_EFLOWCOUNT = 11023,

+		WSA_QOS_EUNKNOWNPSOBJ = 11024,

+		WSA_QOS_EPOLICYOBJ = 11025,

+		WSA_QOS_EFLOWDESC = 11026,

+		WSA_QOS_EPSFLOWSPEC = 11027,

+		WSA_QOS_EPSFILTERSPEC = 11028,

+		WSA_QOS_ESDMODEOBJ = 11029,

+		WSA_QOS_ESHAPERATEOBJ = 11030,

+		WSA_QOS_RESERVED_PETYPE = 11031,

+		ERROR_IPSEC_QM_POLICY_EXISTS = 13000,

+		ERROR_IPSEC_QM_POLICY_NOT_FOUND = 13001,

+		ERROR_IPSEC_QM_POLICY_IN_USE = 13002,

+		ERROR_IPSEC_MM_POLICY_EXISTS = 13003,

+		ERROR_IPSEC_MM_POLICY_NOT_FOUND = 13004,

+		ERROR_IPSEC_MM_POLICY_IN_USE = 13005,

+		ERROR_IPSEC_MM_FILTER_EXISTS = 13006,

+		ERROR_IPSEC_MM_FILTER_NOT_FOUND = 13007,

+		ERROR_IPSEC_TRANSPORT_FILTER_EXISTS = 13008,

+		ERROR_IPSEC_TRANSPORT_FILTER_NOT_FOUND = 13009,

+		ERROR_IPSEC_MM_AUTH_EXISTS = 13010,

+		ERROR_IPSEC_MM_AUTH_NOT_FOUND = 13011,

+		ERROR_IPSEC_MM_AUTH_IN_USE = 13012,

+		ERROR_IPSEC_DEFAULT_MM_POLICY_NOT_FOUND = 13013,

+		ERROR_IPSEC_DEFAULT_MM_AUTH_NOT_FOUND = 13014,

+		ERROR_IPSEC_DEFAULT_QM_POLICY_NOT_FOUND = 13015,

+		ERROR_IPSEC_TUNNEL_FILTER_EXISTS = 13016,

+		ERROR_IPSEC_TUNNEL_FILTER_NOT_FOUND = 13017,

+		ERROR_IPSEC_MM_FILTER_PENDING_DELETION = 13018,

+		ERROR_IPSEC_TRANSPORT_FILTER_PENDING_DELETION = 13019,

+		ERROR_IPSEC_TUNNEL_FILTER_PENDING_DELETION = 13020,

+		ERROR_IPSEC_MM_POLICY_PENDING_DELETION = 13021,

+		ERROR_IPSEC_MM_AUTH_PENDING_DELETION = 13022,

+		ERROR_IPSEC_QM_POLICY_PENDING_DELETION = 13023,

+		ERROR_IPSEC_IKE_AUTH_FAIL = 13801,

+		ERROR_IPSEC_IKE_ATTRIB_FAIL = 13802,

+		ERROR_IPSEC_IKE_NEGOTIATION_PENDING = 13803,

+		ERROR_IPSEC_IKE_GENERAL_PROCESSING_ERROR = 13804,

+		ERROR_IPSEC_IKE_TIMED_OUT = 13805,

+		ERROR_IPSEC_IKE_NO_CERT = 13806,

+		ERROR_IPSEC_IKE_SA_DELETED = 13807,

+		ERROR_IPSEC_IKE_SA_REAPED = 13808,

+		ERROR_IPSEC_IKE_MM_ACQUIRE_DROP = 13809,

+		ERROR_IPSEC_IKE_QM_ACQUIRE_DROP = 13810,

+		ERROR_IPSEC_IKE_QUEUE_DROP_MM = 13811,

+		ERROR_IPSEC_IKE_QUEUE_DROP_NO_MM = 13812,

+		ERROR_IPSEC_IKE_DROP_NO_RESPONSE = 13813,

+		ERROR_IPSEC_IKE_MM_DELAY_DROP = 13814,

+		ERROR_IPSEC_IKE_QM_DELAY_DROP = 13815,

+		ERROR_IPSEC_IKE_ERROR = 13816,

+		ERROR_IPSEC_IKE_CRL_FAILED = 13817,

+		ERROR_IPSEC_IKE_INVALID_KEY_USAGE = 13818,

+		ERROR_IPSEC_IKE_INVALID_CERT_TYPE = 13819,

+		ERROR_IPSEC_IKE_NO_PRIVATE_KEY = 13820,

+		ERROR_IPSEC_IKE_DH_FAIL = 13822,

+		ERROR_IPSEC_IKE_INVALID_HEADER = 13824,

+		ERROR_IPSEC_IKE_NO_POLICY = 13825,

+		ERROR_IPSEC_IKE_INVALID_SIGNATURE = 13826,

+		ERROR_IPSEC_IKE_KERBEROS_ERROR = 13827,

+		ERROR_IPSEC_IKE_NO_PUBLIC_KEY = 13828,

+		ERROR_IPSEC_IKE_PROCESS_ERR = 13829,

+		ERROR_IPSEC_IKE_PROCESS_ERR_SA = 13830,

+		ERROR_IPSEC_IKE_PROCESS_ERR_PROP = 13831,

+		ERROR_IPSEC_IKE_PROCESS_ERR_TRANS = 13832,

+		ERROR_IPSEC_IKE_PROCESS_ERR_KE = 13833,

+		ERROR_IPSEC_IKE_PROCESS_ERR_ID = 13834,

+		ERROR_IPSEC_IKE_PROCESS_ERR_CERT = 13835,

+		ERROR_IPSEC_IKE_PROCESS_ERR_CERT_REQ = 13836,

+		ERROR_IPSEC_IKE_PROCESS_ERR_HASH = 13837,

+		ERROR_IPSEC_IKE_PROCESS_ERR_SIG = 13838,

+		ERROR_IPSEC_IKE_PROCESS_ERR_NONCE = 13839,

+		ERROR_IPSEC_IKE_PROCESS_ERR_NOTIFY = 13840,

+		ERROR_IPSEC_IKE_PROCESS_ERR_DELETE = 13841,

+		ERROR_IPSEC_IKE_PROCESS_ERR_VENDOR = 13842,

+		ERROR_IPSEC_IKE_INVALID_PAYLOAD = 13843,

+		ERROR_IPSEC_IKE_LOAD_SOFT_SA = 13844,

+		ERROR_IPSEC_IKE_SOFT_SA_TORN_DOWN = 13845,

+		ERROR_IPSEC_IKE_INVALID_COOKIE = 13846,

+		ERROR_IPSEC_IKE_NO_PEER_CERT = 13847,

+		ERROR_IPSEC_IKE_PEER_CRL_FAILED = 13848,

+		ERROR_IPSEC_IKE_POLICY_CHANGE = 13849,

+		ERROR_IPSEC_IKE_NO_MM_POLICY = 13850,

+		ERROR_IPSEC_IKE_NOTCBPRIV = 13851,

+		ERROR_IPSEC_IKE_SECLOADFAIL = 13852,

+		ERROR_IPSEC_IKE_FAILSSPINIT = 13853,

+		ERROR_IPSEC_IKE_FAILQUERYSSP = 13854,

+		ERROR_IPSEC_IKE_SRVACQFAIL = 13855,

+		ERROR_IPSEC_IKE_SRVQUERYCRED = 13856,

+		ERROR_IPSEC_IKE_GETSPIFAIL = 13857,

+		ERROR_IPSEC_IKE_INVALID_FILTER = 13858,

+		ERROR_IPSEC_IKE_OUT_OF_MEMORY = 13859,

+		ERROR_IPSEC_IKE_ADD_UPDATE_KEY_FAILED = 13860,

+		ERROR_IPSEC_IKE_INVALID_POLICY = 13861,

+		ERROR_IPSEC_IKE_UNKNOWN_DOI = 13862,

+		ERROR_IPSEC_IKE_INVALID_SITUATION = 13863,

+		ERROR_IPSEC_IKE_DH_FAILURE = 13864,

+		ERROR_IPSEC_IKE_INVALID_GROUP = 13865,

+		ERROR_IPSEC_IKE_ENCRYPT = 13866,

+		ERROR_IPSEC_IKE_DECRYPT = 13867,

+		ERROR_IPSEC_IKE_POLICY_MATCH = 13868,

+		ERROR_IPSEC_IKE_UNSUPPORTED_ID = 13869,

+		ERROR_IPSEC_IKE_INVALID_HASH = 13870,

+		ERROR_IPSEC_IKE_INVALID_HASH_ALG = 13871,

+		ERROR_IPSEC_IKE_INVALID_HASH_SIZE = 13872,

+		ERROR_IPSEC_IKE_INVALID_ENCRYPT_ALG = 13873,

+		ERROR_IPSEC_IKE_INVALID_AUTH_ALG = 13874,

+		ERROR_IPSEC_IKE_INVALID_SIG = 13875,

+		ERROR_IPSEC_IKE_LOAD_FAILED = 13876,

+		ERROR_IPSEC_IKE_RPC_DELETE = 13877,

+		ERROR_IPSEC_IKE_BENIGN_REINIT = 13878,

+		ERROR_IPSEC_IKE_INVALID_RESPONDER_LIFETIME_NOTIFY = 13879,

+		ERROR_IPSEC_IKE_INVALID_CERT_KEYLEN = 13881,

+		ERROR_IPSEC_IKE_MM_LIMIT = 13882,

+		ERROR_IPSEC_IKE_NEGOTIATION_DISABLED = 13883,

+		ERROR_IPSEC_IKE_NEG_STATUS_END = 13884,

+		ERROR_SXS_SECTION_NOT_FOUND = 14000,

+		ERROR_SXS_CANT_GEN_ACTCTX = 14001,

+		ERROR_SXS_INVALID_ACTCTXDATA_FORMAT = 14002,

+		ERROR_SXS_ASSEMBLY_NOT_FOUND = 14003,

+		ERROR_SXS_MANIFEST_FORMAT_ERROR = 14004,

+		ERROR_SXS_MANIFEST_PARSE_ERROR = 14005,

+		ERROR_SXS_ACTIVATION_CONTEXT_DISABLED = 14006,

+		ERROR_SXS_KEY_NOT_FOUND = 14007,

+		ERROR_SXS_VERSION_CONFLICT = 14008,

+		ERROR_SXS_WRONG_SECTION_TYPE = 14009,

+		ERROR_SXS_THREAD_QUERIES_DISABLED = 14010,

+		ERROR_SXS_PROCESS_DEFAULT_ALREADY_SET = 14011,

+		ERROR_SXS_UNKNOWN_ENCODING_GROUP = 14012,

+		ERROR_SXS_UNKNOWN_ENCODING = 14013,

+		ERROR_SXS_INVALID_XML_NAMESPACE_URI = 14014,

+		ERROR_SXS_ROOT_MANIFEST_DEPENDENCY_NOT_INSTALLED = 14015,

+		ERROR_SXS_LEAF_MANIFEST_DEPENDENCY_NOT_INSTALLED = 14016,

+		ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE = 14017,

+		ERROR_SXS_MANIFEST_MISSING_REQUIRED_DEFAULT_NAMESPACE = 14018,

+		ERROR_SXS_MANIFEST_INVALID_REQUIRED_DEFAULT_NAMESPACE = 14019,

+		ERROR_SXS_PRIVATE_MANIFEST_CROSS_PATH_WITH_REPARSE_POINT = 14020,

+		ERROR_SXS_DUPLICATE_DLL_NAME = 14021,

+		ERROR_SXS_DUPLICATE_WINDOWCLASS_NAME = 14022,

+		ERROR_SXS_DUPLICATE_CLSID = 14023,

+		ERROR_SXS_DUPLICATE_IID = 14024,

+		ERROR_SXS_DUPLICATE_TLBID = 14025,

+		ERROR_SXS_DUPLICATE_PROGID = 14026,

+		ERROR_SXS_DUPLICATE_ASSEMBLY_NAME = 14027,

+		ERROR_SXS_FILE_HASH_MISMATCH = 14028,

+		ERROR_SXS_POLICY_PARSE_ERROR = 14029,

+		ERROR_SXS_XML_E_MISSINGQUOTE = 14030,

+		ERROR_SXS_XML_E_COMMENTSYNTAX = 14031,

+		ERROR_SXS_XML_E_BADSTARTNAMECHAR = 14032,

+		ERROR_SXS_XML_E_BADNAMECHAR = 14033,

+		ERROR_SXS_XML_E_BADCHARINSTRING = 14034,

+		ERROR_SXS_XML_E_XMLDECLSYNTAX = 14035,

+		ERROR_SXS_XML_E_BADCHARDATA = 14036,

+		ERROR_SXS_XML_E_MISSINGWHITESPACE = 14037,

+		ERROR_SXS_XML_E_EXPECTINGTAGEND = 14038,

+		ERROR_SXS_XML_E_MISSINGSEMICOLON = 14039,

+		ERROR_SXS_XML_E_UNBALANCEDPAREN = 14040,

+		ERROR_SXS_XML_E_INTERNALERROR = 14041,

+		ERROR_SXS_XML_E_UNEXPECTED_WHITESPACE = 14042,

+		ERROR_SXS_XML_E_INCOMPLETE_ENCODING = 14043,

+		ERROR_SXS_XML_E_MISSING_PAREN = 14044,

+		ERROR_SXS_XML_E_EXPECTINGCLOSEQUOTE = 14045,

+		ERROR_SXS_XML_E_MULTIPLE_COLONS = 14046,

+		ERROR_SXS_XML_E_INVALID_DECIMAL = 14047,

+		ERROR_SXS_XML_E_INVALID_HEXIDECIMAL = 14048,

+		ERROR_SXS_XML_E_INVALID_UNICODE = 14049,

+		ERROR_SXS_XML_E_WHITESPACEORQUESTIONMARK = 14050,

+		ERROR_SXS_XML_E_UNEXPECTEDENDTAG = 14051,

+		ERROR_SXS_XML_E_UNCLOSEDTAG = 14052,

+		ERROR_SXS_XML_E_DUPLICATEATTRIBUTE = 14053,

+		ERROR_SXS_XML_E_MULTIPLEROOTS = 14054,

+		ERROR_SXS_XML_E_INVALIDATROOTLEVEL = 14055,

+		ERROR_SXS_XML_E_BADXMLDECL = 14056,

+		ERROR_SXS_XML_E_MISSINGROOT = 14057,

+		ERROR_SXS_XML_E_UNEXPECTEDEOF = 14058,

+		ERROR_SXS_XML_E_BADPEREFINSUBSET = 14059,

+		ERROR_SXS_XML_E_UNCLOSEDSTARTTAG = 14060,

+		ERROR_SXS_XML_E_UNCLOSEDENDTAG = 14061,

+		ERROR_SXS_XML_E_UNCLOSEDSTRING = 14062,

+		ERROR_SXS_XML_E_UNCLOSEDCOMMENT = 14063,

+		ERROR_SXS_XML_E_UNCLOSEDDECL = 14064,

+		ERROR_SXS_XML_E_UNCLOSEDCDATA = 14065,

+		ERROR_SXS_XML_E_RESERVEDNAMESPACE = 14066,

+		ERROR_SXS_XML_E_INVALIDENCODING = 14067,

+		ERROR_SXS_XML_E_INVALIDSWITCH = 14068,

+		ERROR_SXS_XML_E_BADXMLCASE = 14069,

+		ERROR_SXS_XML_E_INVALID_STANDALONE = 14070,

+		ERROR_SXS_XML_E_UNEXPECTED_STANDALONE = 14071,

+		ERROR_SXS_XML_E_INVALID_VERSION = 14072,

+		ERROR_SXS_XML_E_MISSINGEQUALS = 14073,

+		ERROR_SXS_PROTECTION_RECOVERY_FAILED = 14074,

+		ERROR_SXS_PROTECTION_PUBLIC_KEY_TOO_SHORT = 14075,

+		ERROR_SXS_PROTECTION_CATALOG_NOT_VALID = 14076,

+		ERROR_SXS_UNTRANSLATABLE_HRESULT = 14077,

+		ERROR_SXS_PROTECTION_CATALOG_FILE_MISSING = 14078,

+		ERROR_SXS_MISSING_ASSEMBLY_IDENTITY_ATTRIBUTE = 14079,

+		ERROR_SXS_INVALID_ASSEMBLY_IDENTITY_ATTRIBUTE_NAME = 14080

+	}

+}

diff --git a/mcs/class/corlib/System.IO/MonoIOStat.cs b/mcs/class/corlib/System.IO/MonoIOStat.cs
new file mode 100644
index 00000000000..caf4ccc6e5c
--- /dev/null
+++ b/mcs/class/corlib/System.IO/MonoIOStat.cs
@@ -0,0 +1,22 @@
+//

+// System.IO.MonoIOStat.cs: Idealized structure for file information.

+//

+// Author:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+

+using System;

+

+namespace System.IO

+{

+	internal struct MonoIOStat {

+		public string Name;

+		public FileAttributes Attributes;

+		public long Length;

+		public long CreationTime;

+		public long LastAccessTime;

+		public long LastWriteTime;

+	}

+}

diff --git a/mcs/class/corlib/System.IO/Path.cs b/mcs/class/corlib/System.IO/Path.cs
new file mode 100644
index 00000000000..8e9b5945320
--- /dev/null
+++ b/mcs/class/corlib/System.IO/Path.cs
@@ -0,0 +1,264 @@
+//------------------------------------------------------------------------------
+// 
+// System.IO.Path.cs 
+//
+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved
+// 
+// Author:         Jim Richardson, develop@wtfo-guru.com
+//                 Dan Lewis (dihlewis@yahoo.co.uk)
+// Created:        Saturday, August 11, 2001 
+//
+//------------------------------------------------------------------------------
+
+using System;
+
+namespace System.IO
+{
+	public sealed class Path
+	{
+		public static readonly char AltDirectorySeparatorChar;
+		public static readonly char DirectorySeparatorChar;
+		public static readonly char[] InvalidPathChars;
+		public static readonly char PathSeparator;
+		internal static readonly string DirectorySeparatorStr;
+		public static readonly char VolumeSeparatorChar;
+
+		private static readonly char[] PathSeparatorChars;
+
+		private Path () {}
+
+		// class methods
+		public static string ChangeExtension (string path, string extension)
+		{
+			if (path == null)
+			{
+				return null;
+			}
+
+			int iExt = findExtension (path);
+
+			if (extension != null) {
+				if (extension [0] != '.')
+					extension = "." + extension;
+			} else
+				extension = "";
+			
+			if (iExt < 0) {
+				return path + extension;
+			} else if (iExt > 0) {
+				string temp = path.Substring (0, iExt);
+				return temp + extension;
+			}
+
+			return extension;
+		}
+
+		[MonoTODO]
+		public static string Combine (string path1, string path2)
+		{
+			if (path1 == null || path2 == null)
+			{
+				return null;
+			}
+
+			CheckArgument.Empty (path2);
+
+			// TODO: Check for invalid DirectoryInfo characters
+			//       although I don't think it is necesary for linux
+
+			// TODO: Verify functionality further after NUnit tests written
+			//		 since the documentation was rather sketchy
+
+			if (IsPathRooted (path2))
+			{
+				if (path1.Equals (string.Empty))
+				{
+					return path2;
+				}
+				throw new ArgumentException ("Rooted path");
+			}
+			
+			string dirSep = new string (DirectorySeparatorChar, 1);
+			string altSep = new string (AltDirectorySeparatorChar, 1);
+			
+			bool b1 = path1.EndsWith (dirSep) || path1.EndsWith (dirSep);
+			bool b2 = path2.StartsWith (dirSep) || path2.StartsWith (altSep);
+			if (b1 && b2)
+			{
+				throw new ArgumentException ("Invalid combination");
+			}
+			
+			if (!b1 && !b2)
+			{
+				return path1 + dirSep + path2;
+			}
+
+			return path1 + path2;
+		}
+
+		public static string GetDirectoryName (string path)
+		{
+			if (path != null)
+			{
+				CheckArgument.Empty (path);
+				CheckArgument.WhitespaceOnly (path);
+				CheckArgument.PathChars (path);
+
+				if (path.Length > 0)
+				{
+					int nLast = path.LastIndexOfAny (PathSeparatorChars);
+
+					if (nLast > 0)
+						return path.Substring (0, nLast);
+					else
+						return String.Empty;
+				} 
+			}
+			return path;
+		}
+
+		public static string GetExtension (string path)
+		{
+			if (path == null)
+			{
+				return string.Empty;
+			}
+
+			CheckArgument.Empty (path);
+			CheckArgument.WhitespaceOnly (path);
+			
+			int iExt = findExtension (path);
+
+			if (iExt > -1)
+			{	// okay it has an extension
+				return path.Substring (iExt);
+			}
+			return string.Empty;
+		}
+
+		public static string GetFileName (string path)
+		{
+			if (path == null)
+			{
+				return string.Empty;
+			}
+
+			CheckArgument.Empty (path);
+			CheckArgument.WhitespaceOnly (path);
+
+			int nLast = path.LastIndexOfAny (PathSeparatorChars);
+
+			if (nLast > 0)
+			{
+				return path.Substring (nLast + 1);
+			}
+
+			return nLast == 0 ? null : path;
+		}
+
+		public static string GetFileNameWithoutExtension (string path)
+		{
+			return ChangeExtension (GetFileName (path), null);
+		}
+
+		public static string GetFullPath (string path)
+		{
+			if (path == null)
+				throw (new ArgumentNullException (
+					"path",
+					"You must specify a path when calling System.IO.Path.GetFullPath"));
+
+			if (path.StartsWith (new string (DirectorySeparatorChar, 1)) ||
+						path.StartsWith (new string (AltDirectorySeparatorChar, 1)))
+				return path;
+
+			return Directory.GetCurrentDirectory () + new string (DirectorySeparatorChar, 1) + path;
+		}
+
+		public static string GetPathRoot (string path)
+		{
+			if (path != null || 
+				(path.StartsWith (new string (DirectorySeparatorChar, 1)) ||
+					path.StartsWith (new string (AltDirectorySeparatorChar, 1))))
+			{
+				return path.Substring (0, 1);
+			}
+			return null;
+		}
+
+		public static string GetTempFileName ()
+		{
+			string path;
+			Random rnd;
+			int num;
+			rnd = new Random ();
+			num = rnd.Next ();
+			path = GetTempPath() + DirectorySeparatorChar + "tmp" + num.ToString("x");
+			while (File.Exists(path) || Directory.Exists(path)) {    
+				num = rnd.Next ();
+				path = GetTempPath() + DirectorySeparatorChar + "tmp" + num.ToString("x");
+			}
+			FileStream f = File.Create(path);
+			f.Close();
+			return path;
+		}
+
+		/// <summary>
+		/// Returns the path of the current systems temp directory
+		/// </summary>
+		[MonoTODO]
+		public static string GetTempPath ()
+		{	// TODO: This might vary with distribution and there
+			//       might be an api to provide it. Research is needed
+			return "/tmp";
+		}
+
+		public static bool HasExtension (string path)
+		{  
+			CheckArgument.Null (path);
+			CheckArgument.Empty (path);
+			CheckArgument.WhitespaceOnly (path);
+			
+			return findExtension (path) > -1;
+		}
+
+		public static bool IsPathRooted (string path)
+		{
+			return path.StartsWith (new string (VolumeSeparatorChar,1));
+		}
+
+		// private class methods
+
+		private static int findExtension (string path)
+		{
+			// method should return the index of the path extension
+			// start or -1 if no valid extension
+			if (path != null){
+				int iLastDot = path.LastIndexOf (".");
+				int iLastSep = path.LastIndexOfAny ( PathSeparatorChars );
+
+				if (iLastDot > iLastSep)
+					return iLastDot;
+			}
+			return -1;
+		}
+
+		static Path () {
+			VolumeSeparatorChar = MonoIO.VolumeSeparatorChar;
+			DirectorySeparatorChar = MonoIO.DirectorySeparatorChar;
+			AltDirectorySeparatorChar = MonoIO.AltDirectorySeparatorChar;
+
+			PathSeparator = MonoIO.PathSeparator;
+			InvalidPathChars = MonoIO.InvalidPathChars;
+
+			// internal fields
+
+			DirectorySeparatorStr = DirectorySeparatorChar.ToString ();
+			PathSeparatorChars = new char [] {
+				DirectorySeparatorChar,
+				AltDirectorySeparatorChar,
+				VolumeSeparatorChar
+			};
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.IO/PathTooLongException.cs b/mcs/class/corlib/System.IO/PathTooLongException.cs
new file mode 100644
index 00000000000..5f5f5229a18
--- /dev/null
+++ b/mcs/class/corlib/System.IO/PathTooLongException.cs
@@ -0,0 +1,43 @@
+//	
+// System.IO.PathTooLongException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.IO;
+using System.Runtime.Serialization;
+
+namespace System.IO
+{
+	   [Serializable]
+	   public class PathTooLongException : IOException
+	   {
+			 // Constructors
+			 public PathTooLongException ()
+				    : base (Locale.GetText ("Pathname is longer than the maximum length"))
+			 {
+			 }
+
+			 public PathTooLongException (string message)
+				    : base (message)
+			 {
+			 }
+			 
+			 protected PathTooLongException (SerializationInfo info,
+				    StreamingContext context)
+				    : base (info, context)
+			 {
+			 }
+
+			 public PathTooLongException (string message, Exception innerException)
+				    :base (message, innerException)
+			 {
+			 }
+				    
+	   }
+}
diff --git a/mcs/class/corlib/System.IO/SearchPattern.cs b/mcs/class/corlib/System.IO/SearchPattern.cs
new file mode 100644
index 00000000000..4db60d2fadc
--- /dev/null
+++ b/mcs/class/corlib/System.IO/SearchPattern.cs
@@ -0,0 +1,169 @@
+//

+// System.IO.SearchPattern.cs: Filename glob support.

+//

+// Author:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+

+using System;

+

+namespace System.IO {

+

+	// FIXME: there's a complication with this algorithm under windows.

+	// the pattern '*.*' matches all files (i think . matches the extension),

+	// whereas under UNIX it should only match files containing the '.' character.

+

+	class SearchPattern {

+		public SearchPattern (string pattern) : this (pattern, false) { }

+

+		public SearchPattern (string pattern, bool ignore)

+		{

+			this.ignore = ignore;

+			Compile (pattern);

+		}

+

+		public bool IsMatch (string text)

+		{

+			return Match (ops, text, 0);

+		}

+

+		// private

+

+		private Op ops;		// the compiled pattern

+		private bool ignore;	// ignore case

+

+		private void Compile (string pattern)

+		{

+			if (pattern == null || pattern.IndexOfAny (InvalidChars) >= 0)

+				throw new ArgumentException ("Invalid search pattern.");

+

+			if (pattern == "*") {	// common case

+				ops = new Op (OpCode.True);

+				return;

+			}

+

+			ops = null;

+

+			int ptr = 0;

+			Op last_op = null;

+			while (ptr < pattern.Length) {

+				Op op;

+			

+				switch (pattern [ptr]) {

+				case '?':

+					op = new Op (OpCode.AnyChar);

+					++ ptr;

+					break;

+

+				case '*':

+					op = new Op (OpCode.AnyString);

+					++ ptr;

+					break;

+					

+				default:

+					op = new Op (OpCode.ExactString);

+					int end = pattern.IndexOfAny (WildcardChars, ptr);

+					if (end < 0)

+						end = pattern.Length;

+

+					op.Argument = pattern.Substring (ptr, end - ptr);

+					if (ignore)

+						op.Argument = op.Argument.ToLower ();

+

+					ptr = end;

+					break;

+				}

+

+				if (last_op == null)

+					ops = op;

+				else

+					last_op.Next = op;

+

+				last_op = op;

+			}

+

+			if (last_op == null)

+				ops = new Op (OpCode.End);

+			else

+				last_op.Next = new Op (OpCode.End);

+		}

+

+		private bool Match (Op op, string text, int ptr)

+		{

+			while (op != null) {

+				switch (op.Code) {

+				case OpCode.True:

+					return true;

+

+				case OpCode.End:

+					if (ptr == text.Length)

+						return true;

+

+					return false;

+				

+				case OpCode.ExactString:

+					int length = op.Argument.Length;

+					if (ptr + length > text.Length)

+						return false;

+

+					string str = text.Substring (ptr, length);

+					if (ignore)

+						str = str.ToLower ();

+

+					if (str != op.Argument)

+						return false;

+

+					ptr += length;

+					break;

+

+				case OpCode.AnyChar:

+					if (++ ptr > text.Length)

+						return false;

+					break;

+

+				case OpCode.AnyString:

+					while (ptr <= text.Length) {

+						if (Match (op.Next, text, ptr))

+							return true;

+

+						++ ptr;

+					}

+

+					return false;

+				}

+

+				op = op.Next;

+			}

+

+			return true;

+		}

+

+		// private static

+

+		private static readonly char [] WildcardChars = { '*', '?' };

+		private static readonly char [] InvalidChars = { Path.DirectorySeparatorChar, Path.AltDirectorySeparatorChar };

+

+		private class Op {

+			public Op (OpCode code)

+			{

+				this.Code = code;

+				this.Argument = null;

+				this.Next = null;

+			}

+		

+			public OpCode Code;

+			public string Argument;

+			public Op Next;

+		}

+

+		private enum OpCode {

+			ExactString,		// literal

+			AnyChar,		// ?

+			AnyString,		// *

+			End,			// end of pattern

+			True			// always succeeds

+		};

+	}

+}

diff --git a/mcs/class/corlib/System.IO/SeekOrigin.cs b/mcs/class/corlib/System.IO/SeekOrigin.cs
new file mode 100644
index 00000000000..1cd2cf84165
--- /dev/null
+++ b/mcs/class/corlib/System.IO/SeekOrigin.cs
@@ -0,0 +1,34 @@
+// SeekOrigin.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:32:32 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.IO {
+
+
+	/// <summary>
+	/// </summary>
+	[Serializable]
+	public enum SeekOrigin : int {
+
+		/// <summary>
+		/// </summary>
+		Begin = 0,
+
+		/// <summary>
+		/// </summary>
+		Current = 1,
+
+		/// <summary>
+		/// </summary>
+		End = 2,
+	} // SeekOrigin
+
+} // System.IO
diff --git a/mcs/class/corlib/System.IO/Stream.cs b/mcs/class/corlib/System.IO/Stream.cs
new file mode 100755
index 00000000000..244585e8e96
--- /dev/null
+++ b/mcs/class/corlib/System.IO/Stream.cs
@@ -0,0 +1,323 @@
+//
+// System.IO/Stream.cs
+//
+// Authors:
+//   Dietmar Maurer (dietmar@ximian.com)
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001, 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Threading;
+
+namespace System.IO
+{
+	[Serializable]
+	public abstract class Stream : MarshalByRefObject, IDisposable
+	{
+		public static readonly Stream Null;
+
+		static Stream ()
+		{
+			Null = new NullStream ();
+		}
+
+		protected Stream ()
+		{
+		}
+
+		public abstract bool CanRead
+		{
+			get;
+		}
+
+		public abstract bool CanSeek
+		{
+			get;
+		}
+
+		public abstract bool CanWrite
+		{
+			get;
+		}
+
+		public abstract long Length
+		{
+			get;
+		}
+
+		public abstract long Position
+		{
+			get;
+			set;
+		}
+
+
+		public virtual void Close ()
+		{
+			Flush ();
+		}
+
+		void IDisposable.Dispose ()
+		{
+			Close ();
+		}
+
+		protected virtual WaitHandle CreateWaitHandle()
+		{
+			return new ManualResetEvent (false);
+		}
+		
+		public abstract void Flush ();
+
+		public abstract int Read (byte[] buffer,
+					  int offset,
+					  int count);
+
+		public virtual int ReadByte ()
+		{
+			byte[] buffer = new byte [1];
+
+			if (Read (buffer, 0, 1) == 1)
+				return buffer [0];
+			
+			return -1;
+		}
+
+		public abstract long Seek (long offset,
+					   SeekOrigin origin);
+
+		public abstract void SetLength (long value);
+
+		public abstract void Write (byte[] buffer,
+					    int offset,
+					    int count);
+
+		public virtual void WriteByte (byte value)
+		{
+			byte[] buffer = new byte [1];
+
+			buffer [0] = value;
+
+			Write (buffer, 0, 1);
+		}
+
+		delegate int ReadDelegate (byte [] buffer, int offset, int count);
+
+		public virtual IAsyncResult
+		BeginRead (byte [] buffer, int offset, int count, AsyncCallback cback, object state)
+		{
+			if (!CanRead)
+				throw new NotSupportedException ("This stream does not support reading");
+
+			SyncReadResult srr = new SyncReadResult (state);
+			try
+			{
+				srr.Complete (Read (buffer, offset, count));
+			}
+			catch (IOException e)
+			{
+				srr._exception = e;
+			}
+
+			if (cback != null)
+				cback (srr);
+
+			return srr;
+		}
+
+		public virtual IAsyncResult
+		BeginWrite (byte [] buffer, int offset, int count, AsyncCallback cback, object state)
+		{
+			if (!CanWrite)
+				throw new NotSupportedException ("This stream does not support reading");
+
+			SyncWriteResult swr = new SyncWriteResult (state);
+			try
+			{
+				Write (buffer, offset, count);
+				swr.Complete ();
+			}
+			catch (IOException e)
+			{
+				swr._exception = e;
+			}
+
+			if (cback != null)
+				cback (swr);
+
+			return swr;
+		}
+		
+		public virtual int EndRead (IAsyncResult async_result)
+		{
+			if (async_result == null)
+				throw new ArgumentNullException ("async_result");
+			SyncReadResult srr = async_result as SyncReadResult;
+			if (srr == null)
+				throw new ArgumentException ("async_result is invalid");
+			if (srr._fEndCalled)
+				throw new InvalidOperationException ("EndRead called twice");
+			srr._fEndCalled = true;
+			if (srr._exception != null)
+				throw srr._exception;
+			return srr._cbRead;
+		}
+
+		public virtual void EndWrite (IAsyncResult async_result)
+		{
+			if (async_result == null)
+				throw new ArgumentNullException ("async_result");
+			SyncWriteResult swr = async_result as SyncWriteResult;
+			if (swr == null)
+				throw new ArgumentException ("async_result is invalid");
+			if (swr._fEndCalled)
+				throw new InvalidOperationException ("EndRead called twice");
+			swr._fEndCalled = true;
+			if (swr._exception != null)
+				throw swr._exception;
+		}
+
+		// this class implements the synchronous IASyncResult for the obove methods
+		private class SyncResult : IAsyncResult
+		{
+			object _objState;		// client-supplied state
+			bool _fComplete;		// if the IO operation completed successfully
+			ManualResetEvent _hWait;		// the wait event
+			public bool _fEndCalled;		// true iff the End method was called already
+			public Exception _exception;	// holds any exception throw during IO operation
+
+			public SyncResult (object objState)
+			{
+				_objState = objState;
+				_hWait = new ManualResetEvent (false);
+			}
+
+			public void Complete ()
+			{
+				_fComplete = true;
+				_hWait.Set ();
+			}
+
+			// IAsyncResult members
+			object IAsyncResult.AsyncState
+			{
+				get { return _objState; }
+			}
+
+			WaitHandle IAsyncResult.AsyncWaitHandle
+			{
+				get { return _hWait; }
+			}
+
+			bool IAsyncResult.CompletedSynchronously
+			{
+				get { return true; }
+			}
+
+			bool IAsyncResult.IsCompleted
+			{
+				get { return _fComplete; }
+			}
+		}
+		private class SyncReadResult : SyncResult
+		{
+			public int _cbRead;		// the number of bytes read
+
+			public SyncReadResult (object objState) : base (objState) {}
+
+			public void Complete (int cbRead)
+			{
+				_cbRead = cbRead;
+				Complete ();
+			}
+		}
+		private class SyncWriteResult : SyncResult
+		{
+			public SyncWriteResult (object objState) : base (objState) {}
+		}
+	}
+
+	class NullStream : Stream
+	{
+		public override bool CanRead
+		{
+			get {
+				return true;
+			}
+		}
+
+		public override bool CanSeek
+		{
+                        get {
+                                return true;
+                        }
+                }
+
+                public override bool CanWrite
+		{
+                        get {
+                                return true;
+                        }
+                }
+
+		public override long Length
+		{
+			get {
+				return 0;
+			}
+		}
+
+		public override long Position
+		{
+			get {
+				return 0;
+			}
+			set {
+			}
+		}
+
+		public override void Flush ()
+		{
+		}
+
+		public override int Read (byte[] buffer,
+					  int offset,
+					  int count)
+		{
+			return 0;
+		}
+
+		public override int ReadByte ()
+		{
+			return -1;
+		}
+
+		public override long Seek (long offset,
+					   SeekOrigin origin)
+		{
+			return 0;
+		}
+
+		public override void SetLength (long value)
+		{
+		}
+
+		public override void Write (byte[] buffer,
+					    int offset,
+					    int count)
+		{
+		}
+
+		public override void WriteByte (byte value)
+		{
+		}
+	}
+}
+
+
+
+
+
+
+
diff --git a/mcs/class/corlib/System.IO/StreamReader.cs b/mcs/class/corlib/System.IO/StreamReader.cs
new file mode 100644
index 00000000000..a13ef1809cb
--- /dev/null
+++ b/mcs/class/corlib/System.IO/StreamReader.cs
@@ -0,0 +1,307 @@
+//

+// System.IO.StreamReader.cs

+//

+// Author:

+//   Dietmar Maurer (dietmar@ximian.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+using System.Text;

+

+namespace System.IO {

+	[Serializable]

+	public class StreamReader : TextReader {

+

+		private const int DefaultBufferSize = 1024;

+		private const int DefaultFileBufferSize = 4096;

+		private const int MinimumBufferSize = 128;

+

+		// buffering members

+		private byte [] rgbEncoded;

+//		private int cbEncoded;

+		private char [] rgchDecoded;

+		private int cchDecoded;

+

+		private int pos;

+

+

+		private Encoding internalEncoding;

+		private Decoder decoder;

+

+		private Stream internalStream;

+

+		private class NullStreamReader : StreamReader {

+			public override int Peek ()

+			{

+				return -1;

+			}

+

+			public override int Read ()

+			{

+				return -1;

+			}

+

+			public override int Read (char[] buffer, int index, int count)

+			{

+				return 0;

+			}

+

+			public override string ReadLine ()

+			{

+				return null;

+			}

+

+			public override string ReadToEnd ()

+			{

+				return String.Empty;

+			}

+

+			public override Stream BaseStream

+			{

+				get { return Stream.Null; }

+			}

+

+			public override Encoding CurrentEncoding

+			{

+				get { return Encoding.Unicode; }

+			}

+		}

+

+		public new static readonly StreamReader Null = (StreamReader)(new NullStreamReader());

+

+		internal StreamReader() {}

+

+		public StreamReader(Stream stream)

+			: this (stream, null, false, DefaultBufferSize) { }

+

+		public StreamReader(Stream stream, bool detectEncodingFromByteOrderMarks)

+			: this (stream, null, detectEncodingFromByteOrderMarks, DefaultBufferSize) { }

+

+		public StreamReader(Stream stream, Encoding encoding)

+			: this (stream, encoding, false, DefaultBufferSize) { }

+

+		public StreamReader(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks)

+			: this (stream, encoding, detectEncodingFromByteOrderMarks, DefaultBufferSize) { }

+		

+		public StreamReader(Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize)

+		{

+			Initialize (stream, encoding, detectEncodingFromByteOrderMarks, bufferSize);

+		}

+

+		public StreamReader(string path)

+			: this (path, null, false, DefaultFileBufferSize) { }

+

+		public StreamReader(string path, bool detectEncodingFromByteOrderMarks)

+			: this (path, null, detectEncodingFromByteOrderMarks, DefaultFileBufferSize) { }

+

+		public StreamReader(string path, Encoding encoding)

+			: this (path, encoding, false, DefaultFileBufferSize) { }

+

+		public StreamReader(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks)

+			: this (path, encoding, detectEncodingFromByteOrderMarks, DefaultFileBufferSize) { }

+		

+		[MonoTODO]

+		public StreamReader(string path, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize)

+		{

+			if (null == path)

+				throw new ArgumentNullException();

+			if (String.Empty == path)

+				throw new ArgumentException();

+			if (path.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException("path contains invalid characters");

+

+			string DirName = Path.GetDirectoryName(path);

+			if (DirName != String.Empty && !Directory.Exists(DirName))

+				throw new DirectoryNotFoundException();

+			if (!File.Exists(path))

+				throw new FileNotFoundException(path);

+

+			Stream stream = (Stream) File.OpenRead (path);

+			Initialize (stream, encoding, detectEncodingFromByteOrderMarks, bufferSize);

+		}

+

+		[MonoTODO]

+		protected void Initialize (Stream stream, Encoding encoding, bool detectEncodingFromByteOrderMarks, int bufferSize)

+		{

+			if (null == stream)

+				throw new ArgumentNullException();

+			if (!stream.CanRead)

+				throw new ArgumentException("Cannot read stream");

+

+			internalStream = stream;

+

+			// use detect encoding flag

+			if (encoding == null) {

+				internalEncoding = Encoding.UTF8;

+				decoder = Encoding.UTF8.GetDecoder ();

+			} else {

+				internalEncoding = encoding;

+				decoder = encoding.GetDecoder ();

+			}

+

+			if (bufferSize < MinimumBufferSize)

+				bufferSize = MinimumBufferSize;

+

+			rgbEncoded = new byte [bufferSize];

+			rgchDecoded = new char [internalEncoding.GetMaxCharCount (bufferSize)];

+			pos = 0;

+			cchDecoded = 0;

+		}

+

+		public virtual Stream BaseStream

+		{

+			get {

+				return internalStream;

+			}

+		}

+

+		public virtual Encoding CurrentEncoding

+		{

+			get {

+				return internalEncoding;

+			}

+		}

+

+		public override void Close ()

+		{

+			Dispose (true);

+		}

+

+		protected override void Dispose (bool disposing)

+		{

+			if (disposing)

+				internalStream.Close ();

+			

+			rgbEncoded = null;

+			rgchDecoded = null;

+		}

+

+		public void DiscardBufferedData ()

+		{

+			pos = 0;

+			cchDecoded = 0;

+

+/* I'm sure there's no need to do all this

+			if ((cchDecoded == null) || (pos == cchDecoded.Length))

+				return;

+

+			if (!internalStream.CanSeek)

+				return;

+

+			int seek_back = pos - cchDecoded.Length;

+			internalStream.Seek (seek_back, SeekOrigin.Current);

+*/

+		}

+

+

+		// the buffer is empty, fill it again

+		[MonoTODO ("handle byte order marks here")]

+		private int ReadBuffer ()

+		{

+			pos = 0;

+			int cbEncoded = 0;

+			cchDecoded = 0;

+			do	// keep looping until the decoder gives us some chars

+			{

+				cbEncoded = internalStream.Read (rgbEncoded, 0, rgbEncoded.Length);

+				// TODO: remove this line when iconv is fixed

+				int bufcnt = decoder.GetCharCount (rgbEncoded, 0, cbEncoded);

+

+				if (cbEncoded == 0)

+					return 0;

+				// TODO: remove byte order marks here

+				cchDecoded += decoder.GetChars (rgbEncoded, 0, cbEncoded, rgchDecoded, 0);

+			} while (cchDecoded == 0);

+

+			return cchDecoded;

+		}

+

+		public override int Peek ()

+		{

+			if (!internalStream.CanSeek)

+				return -1;

+

+			if (pos >= cchDecoded && ReadBuffer () == 0)

+				return -1;

+

+			return rgchDecoded [pos];

+		}

+

+		public override int Read ()

+		{

+			if (pos >= cchDecoded && ReadBuffer () == 0)

+				return -1;

+

+			return rgchDecoded [pos++];

+		}

+

+		public override int Read (char[] dest_buffer, int index, int count)

+		{

+			if (dest_buffer == null)

+				throw new ArgumentException ();

+

+			if ((index < 0) || (count < 0))

+				throw new ArgumentOutOfRangeException ();

+

+			if (index + count > dest_buffer.Length)

+				throw new ArgumentException ();

+

+			int cchRead = 0;

+			while (count > 0)

+			{

+				if (pos >= cchDecoded && ReadBuffer () == 0)

+					return cchRead > 0? cchRead: -1;

+

+				int cch = Math.Min (cchDecoded - pos, count);

+				Array.Copy (rgchDecoded, pos, dest_buffer, index, cch);

+				pos += cch;

+				index += cch;

+				count -= cch;

+				cchRead += cch;

+			}

+			return cchRead;

+		}

+

+		public override string ReadLine()

+		{

+			StringBuilder text = new StringBuilder ();

+

+			while (true) {

+				int c = Read ();

+

+				if (c == -1) {				// end of stream

+					if (text.Length == 0)

+						return null;

+

+					break;

+				}

+

+				if (c == '\n') {			// newline

+					if ((text.Length > 0) && (text [text.Length - 1] == '\r'))

+						text.Length--;

+					break;

+				}

+

+				text.Append ((char) c);

+			}

+

+			return text.ToString ();

+		}

+

+		public override string ReadToEnd()

+		{

+			StringBuilder text = new StringBuilder ();

+

+			int c;

+			while ((c = Read ()) != -1) {

+				text.Append ((char) c);

+			}

+

+			if (text.Length == 0)

+				return String.Empty;

+			return text.ToString ();

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.IO/StreamWriter.cs b/mcs/class/corlib/System.IO/StreamWriter.cs
new file mode 100644
index 00000000000..0d1a42dfee0
--- /dev/null
+++ b/mcs/class/corlib/System.IO/StreamWriter.cs
@@ -0,0 +1,216 @@
+//

+// System.IO.StreamWriter.cs

+//

+// Author:

+//   Dietmar Maurer (dietmar@ximian.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+//

+

+using System.Text;

+using System;

+

+namespace System.IO {

+	

+	[Serializable]

+	public class StreamWriter : TextWriter {

+

+		private Encoding internalEncoding;

+

+		private Stream internalStream;

+		private bool closed = false;

+

+		private bool iflush;

+		

+		private const int DefaultBufferSize = 1024;

+		private const int DefaultFileBufferSize = 4096;

+		private const int MinimumBufferSize = 2;

+

+		private int pos;

+		private int BufferSize;

+		private byte[] TheBuffer;

+

+		private bool DisposedAlready = false;

+

+		public new static readonly StreamWriter Null = new StreamWriter (Stream.Null, Encoding.UTF8, 0);

+

+		public StreamWriter (Stream stream)

+			: this (stream, Encoding.UTF8, DefaultBufferSize) {}

+

+		public StreamWriter (Stream stream, Encoding encoding)

+			: this (stream, encoding, DefaultBufferSize) {}

+

+		internal void Initialize(Encoding encoding, int bufferSize) {

+			internalEncoding = encoding;

+			pos = 0;

+			BufferSize = Math.Max(bufferSize, MinimumBufferSize);

+			TheBuffer = new byte[BufferSize];

+		}

+

+		//[MonoTODO("Nothing is done with bufferSize")]

+		public StreamWriter (Stream stream, Encoding encoding, int bufferSize) {

+			if (null == stream)

+				throw new ArgumentNullException("stream");

+			if (null == encoding)

+				throw new ArgumentNullException("encoding");

+			if (bufferSize < 0)

+				throw new ArgumentOutOfRangeException("bufferSize");

+			if (!stream.CanWrite)

+				throw new ArgumentException("bufferSize");

+

+			internalStream = stream;

+

+			Initialize(encoding, bufferSize);

+		}

+

+		public StreamWriter (string path)

+			: this (path, false, Encoding.UTF8, DefaultFileBufferSize) {}

+

+		public StreamWriter (string path, bool append)

+			: this (path, append, Encoding.UTF8, DefaultFileBufferSize) {}

+

+		public StreamWriter (string path, bool append, Encoding encoding)

+			: this (path, append, encoding, DefaultFileBufferSize) {}

+		

+		public StreamWriter (string path, bool append, Encoding encoding, int bufferSize) {

+			if (null == path)

+				throw new ArgumentNullException("path");

+			if (String.Empty == path)

+				throw new ArgumentException("path cannot be empty string");

+			if (path.IndexOfAny (Path.InvalidPathChars) != -1)

+				throw new ArgumentException("path contains invalid characters");

+

+			if (null == encoding)

+				throw new ArgumentNullException("encoding");

+			if (bufferSize < 0)

+				throw new ArgumentOutOfRangeException("bufferSize");

+

+			string DirName = Path.GetDirectoryName(path);

+			if (DirName != String.Empty && !Directory.Exists(DirName))

+				throw new DirectoryNotFoundException();

+

+			FileMode mode;

+

+			if (append)

+				mode = FileMode.Append;

+			else

+				mode = FileMode.Create;

+			

+			internalStream = new FileStream (path, mode, FileAccess.Write);

+

+			if (append)

+				internalStream.Position = internalStream.Length;

+			else

+				internalStream.SetLength (0);

+

+			Initialize(encoding, bufferSize);

+		}

+

+		public virtual bool AutoFlush {

+			get {

+				return iflush;

+			}

+			set {

+				iflush = value;

+			}

+		}

+

+		public virtual Stream BaseStream {

+			get {

+				return internalStream;

+			}

+		}

+

+		public override Encoding Encoding {

+			get {

+				return internalEncoding;

+			}

+		}

+

+		void Dispose() {

+			Dispose(true);

+			// Take yourself off of the Finalization queue 

+			// to prevent finalization code for this object

+			// from executing a second time.

+			GC.SuppressFinalize(this);

+		}

+

+		protected override void Dispose (bool disposing) {

+			if (!DisposedAlready && disposing && internalStream != null) {

+				Flush();

+				internalStream.Close ();

+				internalStream = null;

+				TheBuffer = null;

+			}

+			DisposedAlready = true;

+		}

+

+		public override void Flush () {

+			if (DisposedAlready)

+				throw new ObjectDisposedException("StreamWriter");

+

+			if (pos > 0) {

+				internalStream.Write (TheBuffer, 0, pos);

+				internalStream.Flush ();

+				pos = 0;

+			}

+		}

+		

+		public override void Write (char[] buffer, int index, int count) {

+			if (DisposedAlready)

+				throw new ObjectDisposedException("StreamWriter");

+

+			byte[] res = new byte [internalEncoding.GetByteCount (buffer)];

+			int len;

+			int BytesToBuffer;

+			int resPos = 0;

+

+			len = internalEncoding.GetBytes (buffer, index, count, res, 0);

+

+			// if they want AutoFlush, don't bother buffering

+			if (iflush) {

+				Flush();

+				internalStream.Write (res, 0, len);

+				internalStream.Flush ();

+			} else {

+				// otherwise use the buffer.

+				// NOTE: this logic is not optimized for performance.

+				while (resPos < len) {

+					// fill the buffer if we've got more bytes than will fit

+					BytesToBuffer = Math.Min(BufferSize - pos, len - resPos);

+					Array.Copy(res, resPos, TheBuffer, pos, BytesToBuffer);

+					resPos += BytesToBuffer;

+					pos += BytesToBuffer;

+					// if the buffer is full, flush it out.

+					if (pos == BufferSize) Flush();

+				}

+			}

+		}

+

+		public override void Write (char value)

+		{

+			Write (new char [] {value}, 0, 1);

+		}

+

+		public override void Write (char [] value)

+		{

+			Write (value, 0, value.Length);

+		}

+

+		public override void Write(string value) {

+			if (DisposedAlready)

+				throw new ObjectDisposedException("StreamWriter");

+

+			if (value != null)

+				Write (value.ToCharArray (), 0, value.Length);

+		}

+

+		public override void Close() {

+			Dispose();

+		}

+

+		~StreamWriter() {

+			Dispose(false);

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.IO/StringReader.cs b/mcs/class/corlib/System.IO/StringReader.cs
new file mode 100644
index 00000000000..faa665ec009
--- /dev/null
+++ b/mcs/class/corlib/System.IO/StringReader.cs
@@ -0,0 +1,131 @@
+//
+// System.IO.StringReader
+//
+// Author: Marcin Szczepanski (marcins@zipworld.com.au)
+//
+
+
+using System;
+
+namespace System.IO {
+	[Serializable]
+	public class StringReader : TextReader {
+
+		private string source;
+		private char[] sourceChars;
+
+		private int nextChar;
+		private int sourceLength;
+
+		public StringReader( string s ) {
+			this.source = s;
+			nextChar = 0;
+			sourceLength = s.Length;
+			sourceChars = s.ToCharArray();
+		}
+
+		public override void Close() {
+			Dispose( true );
+		}
+
+		protected override void Dispose( bool disposing ) {
+			return;
+		}
+
+		public override int Peek() {
+			if( nextChar >= sourceLength ) {
+				return -1;
+			} else {
+				return (int)source[ nextChar ];
+			}
+		}
+
+		public override int Read() {
+			if( nextChar >= sourceLength ) {
+				return -1;
+			} else {
+				return (int)source[ nextChar++ ];
+			}
+		}
+
+
+		// The method will read up to count characters from the StringReader
+		// into the buffer character array starting at position index. Returns
+		// the actual number of characters read, or zero if the end of the string
+		// has been reached and no characters are read.
+
+		public override int Read( char[] buffer, int index, int count ) {
+
+			if( buffer == null ) {
+				throw new ArgumentNullException();
+			} else if( buffer.Length - index < count ) {
+				throw new ArgumentException();
+			} else if( index < 0 || count < 0 ) {
+				throw new ArgumentOutOfRangeException();
+			}
+
+			int charsToRead;
+
+			if( nextChar + count > sourceLength ) {
+				charsToRead = sourceLength - nextChar;
+			} else {
+				charsToRead = count;
+			}
+
+			Array.Copy(sourceChars, nextChar, buffer, index, charsToRead );
+
+			nextChar += count;
+
+			return charsToRead;
+		}
+
+		public override string ReadLine() {
+			// Reads until next \r or \n or \r\n, otherwise return null
+
+                        // LAMESPEC:
+                        // The Beta 2 SDK help says that the ReadLine method returns
+                        // "The next line from the input stream [...] A line is defined as a sequence of
+                        // characters followed by a carriage return (\r), a line feed (\n), or a carriage
+                        // return immediately followed by a line feed (\r\n). [...]
+                        // The returned value is a null reference if the end of the input stream has been reached."
+                        //
+                        // HOWEVER, the MS implementation returns the rest of the string if no \r and/or \n is found
+                        // in the string
+
+			if (nextChar == source.Length)
+				return null;
+
+			int nextCR = source.IndexOf( '\r', nextChar );
+                        int nextLF = source.IndexOf( '\n', nextChar );
+
+                        if( nextCR == -1 && nextLF == -1 ) {
+                                return ReadToEnd();
+                        }
+
+                        int readTo;
+
+                        if( nextCR == -1 ) {
+                                readTo = nextLF;
+                        } else {
+                                readTo = nextCR;
+                        }
+
+                        string nextLine = source.Substring( nextChar, readTo - nextChar );
+
+                        if( nextLF == nextCR + 1 ) {
+		                nextChar = readTo + 2;
+                        } else {
+                                nextChar = readTo + 1;
+                        }
+
+			return nextLine;
+		}
+
+                public override string ReadToEnd() {
+                        string toEnd = source.Substring( nextChar, sourceLength - nextChar );
+                        nextChar = sourceLength;
+                        return toEnd;
+                }
+
+	}
+}
diff --git a/mcs/class/corlib/System.IO/StringWriter.cs b/mcs/class/corlib/System.IO/StringWriter.cs
new file mode 100644
index 00000000000..607c67e1097
--- /dev/null
+++ b/mcs/class/corlib/System.IO/StringWriter.cs
@@ -0,0 +1,79 @@
+//

+// System.IO.StringWriter

+//

+// Author: Marcin Szczepanski (marcins@zipworld.com.au)

+//

+

+using System.Text;

+

+namespace System.IO {

+		[Serializable]

+        public class StringWriter : TextWriter {

+                

+                private StringBuilder internalString;

+

+                public StringWriter() {

+                        internalString = new StringBuilder();

+                }

+

+                public StringWriter( IFormatProvider formatProvider ) {

+                        internalFormatProvider = formatProvider;

+                }

+

+                public StringWriter( StringBuilder sb ) {

+                        internalString = sb;

+                }

+

+                public StringWriter( StringBuilder sb, IFormatProvider formatProvider ) {

+                        internalString = sb;

+                        internalFormatProvider = formatProvider;

+                }

+

+                public override System.Text.Encoding Encoding {

+                        get {

+                                return System.Text.Encoding.Unicode;

+                        }

+                }

+

+                public override void Close() {

+                        Dispose( true );

+                }

+

+                protected override void Dispose( bool disposing ) { }

+

+                public virtual StringBuilder GetStringBuilder() {

+                        return internalString;

+                }

+

+                public override string ToString() {

+                        return internalString.ToString();

+                }

+

+                public override void Write( char value ) {

+                        internalString.Append( value );

+                }

+

+                public override void Write( string value ) {

+                        internalString.Append( value );

+                }

+

+                public override void Write( char[] buffer, int index, int count ) {

+                        if( buffer == null ) {

+                                throw new ArgumentNullException();

+                        } else if( index < 0 || count < 0 ) {

+                                throw new ArgumentOutOfRangeException();

+                        } else if( index > buffer.Length || index + count > buffer.Length ) {

+                                throw new ArgumentException();

+                        }

+                        

+                        char[] writeBuffer = new char[ count ];

+

+                        Array.Copy( buffer, index, writeBuffer, 0, count );

+

+                        internalString.Append( writeBuffer );

+                }

+                          

+        }

+}

+                        

+                        

diff --git a/mcs/class/corlib/System.IO/TextReader.cs b/mcs/class/corlib/System.IO/TextReader.cs
new file mode 100644
index 00000000000..25251b8229c
--- /dev/null
+++ b/mcs/class/corlib/System.IO/TextReader.cs
@@ -0,0 +1,84 @@
+//

+// System.IO.TextReader

+//

+// Author: Marcin Szczepanski (marcins@zipworld.com.au)

+//

+// TODO: Implement the Thread Safe stuff

+//

+

+using System;

+

+namespace System.IO {

+

+	[MonoTODO] [Serializable]

+	public abstract class TextReader : MarshalByRefObject, IDisposable {

+		

+		protected TextReader() { }

+		

+		public static readonly TextReader Null;

+		

+		public virtual void Close()

+		{ 

+			Dispose(true);

+		}

+

+		void System.IDisposable.Dispose()

+		{

+			Dispose(true);

+		}

+

+		protected virtual void Dispose( bool disposing )

+		{

+			return;

+		}

+		

+		public virtual int Peek()

+		{

+			return -1;

+		}

+		

+		public virtual int Read()

+		{

+			return -1;

+		}

+		

+		// LAMESPEC:  The Beta2 docs say this should be Read( out char[] ...

+		// whereas the MS implementation is just Read( char[] ... )

+		// Not sure which one is right, we'll see in Beta3 :)

+

+		public virtual int Read (char[] buffer, int index, int count)

+		{

+			int c, i;

+			

+			for (i = 0; i < count; i++) {

+				if ((c = Read ()) == -1)

+					return i;

+				buffer [index + i] = (char)c;

+			}

+			

+			return i;

+		}

+		

+		public virtual int ReadBlock( char[] buffer, int index, int count )

+		{ 

+			return 0;

+		}

+

+		public virtual string ReadLine()

+		{ 

+			return String.Empty;

+		}

+

+		public virtual string ReadToEnd()

+		{ 

+			return String.Empty;

+		}

+

+		[MonoTODO]

+		public static TextReader Synchronized( TextReader reader )

+		{

+                        // TODO: Implement

+			return Null;

+		}	

+	}

+}

diff --git a/mcs/class/corlib/System.IO/TextWriter.cs b/mcs/class/corlib/System.IO/TextWriter.cs
new file mode 100644
index 00000000000..1be3b382822
--- /dev/null
+++ b/mcs/class/corlib/System.IO/TextWriter.cs
@@ -0,0 +1,271 @@
+//

+// System.IO.TextWriter

+//

+// Author: Marcin Szczepanski (marcins@zipworld.com.au)

+//

+// TODO: Implement the Thread Safe stuff

+

+namespace System.IO {

+

+	[MonoTODO] [Serializable]

+	public abstract class TextWriter : MarshalByRefObject, IDisposable {

+                

+                protected TextWriter() {

+			CoreNewLine = "\n".ToCharArray ();

+		}

+                

+                protected TextWriter( IFormatProvider formatProvider ) {

+                        internalFormatProvider = formatProvider;

+                }

+

+                protected char[] CoreNewLine;

+

+                internal IFormatProvider internalFormatProvider;

+

+                public static readonly TextWriter Null;

+

+                public abstract System.Text.Encoding Encoding { get; }

+

+                public virtual IFormatProvider FormatProvider { 

+                        get {

+                                return internalFormatProvider;

+                        } 

+                }

+

+                public virtual string NewLine { 

+                        get {

+                                return new String(CoreNewLine);

+                        }

+                        

+                        set {

+                                CoreNewLine = value.ToCharArray();

+                        }

+                }

+

+                public virtual void Close () { 

+                        Dispose (true);

+                }

+

+                protected virtual void Dispose (bool disposing) { }

+                

+		void System.IDisposable.Dispose () {

+			Dispose (true);

+		}

+

+

+                public virtual void Flush()

+		{

+			// do nothing

+		}

+

+		[MonoTODO]

+                public static TextWriter Synchronized (TextWriter writer)

+		{

+                        // TODO: Implement.

+

+                        return Null;

+                }

+

+                public virtual void Write (bool value)

+		{

+			Write (value.ToString ());

+		}

+		

+                public virtual void Write (char value)

+		{

+			Write (value.ToString (internalFormatProvider));

+		}

+

+                public virtual void Write (char[] value)

+		{

+			Write (new String (value));

+		}

+		

+                public virtual void Write (decimal value)

+		{

+			Write (value.ToString (internalFormatProvider));

+		}

+		

+                public virtual void Write (double value)

+		{

+			Write (value.ToString (internalFormatProvider));

+		}

+

+                public virtual void Write (int value)

+		{

+			Write (value.ToString (internalFormatProvider));

+		}

+		

+                public virtual void Write (long value)

+		{

+			Write (value.ToString (internalFormatProvider));

+		}

+		

+                public virtual void Write (object value)

+		{

+			Write (value != null ? value.ToString () : String.Empty);

+		}

+		

+                public virtual void Write (float value)

+		{

+			Write (value.ToString (internalFormatProvider));

+		}

+		

+                public virtual void Write (string value)

+		{

+			// do nothing

+		}

+		

+		[CLSCompliant(false)]

+                public virtual void Write (uint value)

+		{

+			Write (value.ToString (internalFormatProvider));

+		}

+		

+		[CLSCompliant(false)]

+                public virtual void Write (ulong value)

+		{

+			Write (value.ToString (internalFormatProvider));

+		}

+		

+                public virtual void Write (string format, object arg0)

+		{

+			Write (String.Format (format, arg0));

+		}

+		

+                public virtual void Write (string format, params object[] arg)

+		{

+			Write (String.Format (format, arg));

+		}

+		

+                public virtual void Write (char[] buffer, int index, int count)

+		{

+			Write (new String (buffer, index, count));

+		}

+		

+                public virtual void Write (string format, object arg0, object arg1)

+		{

+			Write (String.Format (format, arg0, arg1));

+		}

+		

+                public virtual void Write (string format, object arg0, object arg1, object arg2 )

+		{

+			Write (String.Format (format, arg0, arg1, arg2));

+		}

+                

+                public virtual void WriteLine ()

+		{

+			Write (NewLine);

+		}

+		

+                public virtual void WriteLine (bool value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (char value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (char[] value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (decimal value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (double value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (int value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (long value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (object value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (float value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (string value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+		[CLSCompliant(false)]

+                public virtual void WriteLine (uint value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+		[CLSCompliant(false)]

+                public virtual void WriteLine (ulong value)

+		{

+			Write (value);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (string format, object arg0)

+		{

+			Write (format, arg0);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (string format, params object[] arg)

+		{

+			Write (format, arg);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (char[] buffer, int index, int count)

+		{

+			Write (buffer, index, count);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (string format, object arg0, object arg1)

+		{

+			Write (format, arg0, arg1);

+			WriteLine();

+		}

+		

+                public virtual void WriteLine (string format, object arg0, object arg1, object arg2)

+		{

+			Write (format, arg0, arg1, arg2);

+			WriteLine();

+		}

+

+        }

+}

+

+

+

+

+

diff --git a/mcs/class/corlib/System.PAL/IOperatingSystem.cs b/mcs/class/corlib/System.PAL/IOperatingSystem.cs
new file mode 100644
index 00000000000..15c57faae36
--- /dev/null
+++ b/mcs/class/corlib/System.PAL/IOperatingSystem.cs
@@ -0,0 +1,194 @@
+/*---------------------------------------------------------------------

+

+		 XX		   X		    XXX

+				  XX		     XX

+		XXX	XX XXX	 XXXXX		     XX

+		 XX	XXX XX	  XX		     XX

+		 XX	XX  XX	  XX	  XXXXX	     XX

+		 XX	XX  XX	  XX XX	 XX    X     XX

+		XXXX	XX  XX	   XXX	 XXXXXXX    XXXX

+					 XX

+					  XXXXX

+

+Copyright (c) 2001 Intel Corporation.  All Rights Reserved.

+

+CREATED: August	08, 2001

+OWNER: Scott D Smith, Joel Marcey

+VERSION: 1.0

+---------------------------------------------------------------------*/

+	    

+

+using System;

+using System.IO;

+using System.Collections;

+

+namespace System.PlatformAbstractionLayer

+{

+	/// <summary>

+	///	Definition of functionality needed by the library that can only	be provided by the underlying OS. 

+	/// </summary>

+	internal interface IOperatingSystem

+	{

+	

+		// System.IO services

+	

+		int ReadStdInput(byte[]	buffer,	int offset, int	count);

+

+		void FlushStdOutput(byte[] byteBuf);

+

+

+

+		//  System.File	services

+

+		int ReadFile(IntPtr handle, byte[] buffer, int offset, int count);

+

+		int WriteFile(IntPtr handle, byte[] buffer, int offset, int count);

+	

+		void FlushFile(IntPtr handle, byte[] byteBuf);

+	

+		int SetLengthFile(IntPtr handle, long length);

+

+		IntPtr OpenFile(string path, FileMode mode, FileAccess access, FileShare share);

+	

+		void CloseFile(IntPtr handle);

+	

+		long SeekFile(IntPtr handle, long offset, SeekOrigin origin);

+	

+		IntPtr CreateFile(string path, FileMode	mode, FileAccess access, FileShare share);

+	

+		void DeleteFile(string path);

+	

+		bool ExistsFile(string path);

+	

+		DateTime GetCreationTimeFile(string path);

+	

+		DateTime GetLastAccessTimeFile(string path);

+	

+		DateTime GetLastWriteTimeFile(string path);

+	

+		void SetCreationTimeFile(string	path, DateTime creationTime);

+	

+		void SetLastAccessTimeFile(string path,	DateTime lastAccessTime);

+	

+		void SetLastWriteTimeFile(string path, DateTime	lastWriteTime);

+

+		long FileLength(string path);

+

+		long FileLength(IntPtr handle);

+	

+

+		//  System.Environment services

+		

+		string NewLineSequence {get;}

+	

+		char DirectorySeparator	{get;}

+	

+		char AltDirectorySeparator {get;}

+	

+		char PathSeparator {get;}

+	

+		char VolumeSeparator {get;}

+	

+		char[] DirVolSeparatorChars {get;}

+	

+		char[] InvalidPathChars	{get;}

+	

+		string GetEnvironmentVariable(string eVar);

+	

+		char ExtensionCharacter	{get;}

+

+		string CommandLine {get;}

+

+		IDictionary EnvironmentVariables {get;}

+

+		string MachineName {get;}

+	

+		OperatingSystem	OSVersion {get;}

+

+		//  System.Path	services

+		// Note: Although some of these	do not require direct acccess to the OS,

+		// some	platforms don't	support	some of	these methods

+	

+		string ChangeExtension(string path, string extension);

+	

+		string GetExtension(string path);

+       

+		string GetFileName(string path);

+	

+		string GetFileNameWithoutExtension(string path);

+	

+		string GetPathRoot(string path);

+	

+		string GetTempFileName();

+	

+		string GetTempPath();

+	

+		bool HasExtension(string path);

+	

+		bool IsPathRooted(string path);

+	

+		string GetFullPath(string path);

+	

+	

+		//  System.Directory services

+	

+		void DeleteDirectory(string path, bool recursive);

+	

+		bool ExistsDirectory(string path);

+	

+		DateTime GetCreationTimeDirectory(string path);

+	

+		string GetCurrentDirectory();

+	

+		string[] GetDirectories(string path, string searchPattern);

+	

+		string[] GetFiles(string path, string searchPattern);

+	

+		string[] GetFileSystemEntries(string path, string searchPattern);

+	

+		DateTime GetLastAccessTimeDirectory(string path);

+	

+		DateTime GetLastWriteTimeDirectory(string path);

+	

+		void MoveDirectory(string sourceDirName, string	destDirName);

+	

+		void SetCreationTimeDirectory(string path, DateTime creationTime);

+	

+		void SetCurrentDirectory(string	path);

+	

+		void SetLastAccessTimeDirectory(string path, DateTime lastAccessTime);

+	

+		void SetLastWriteTimeDirectory(string path, DateTime lastWriteTime);

+

+		double Acos(double d);

+

+		double Asin(double d);

+

+		double Atan(double d);

+

+		double Atan2(double y, double x);

+

+		double Cos(double d);

+

+		double Cosh(double value);

+

+		double Exp(dobule d);

+

+		double Log(double d);

+

+		double Log10(double d);

+

+		double Pow(double x, double y);

+

+		double Sin(double d);

+

+		double Sinh(double d);

+

+		double Sqrt(double d);

+

+		double Tan(double d);

+

+		double Tanh(double d);

+		

+	}

+}

diff --git a/mcs/class/corlib/System.PAL/Platform.cs b/mcs/class/corlib/System.PAL/Platform.cs
new file mode 100644
index 00000000000..bfaa276dbc5
--- /dev/null
+++ b/mcs/class/corlib/System.PAL/Platform.cs
@@ -0,0 +1,23 @@
+// Sean MacIsaac
+// Only want to have 1 OperatingSystemObject around.
+// We get the correct one from compile time.
+
+namespace System.PAL
+{
+	internal class Platform
+	{
+		private static OpSys _os;
+
+		public static OpSys OS
+		{
+
+			get
+			{
+				if (_os == null) {
+					_os = new OpSys ();
+				}
+				return _os;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
new file mode 100755
index 00000000000..8bc264e8029
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilder.cs
@@ -0,0 +1,299 @@
+//
+// System.Reflection.Emit/AssemblyBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Resources;
+using System.IO;
+using System.Security.Policy;
+using System.Runtime.Serialization;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Collections;
+
+namespace System.Reflection.Emit {
+
+	internal struct MonoResource {
+		public byte[] data;
+		public string name;
+		public string filename;
+		public ResourceAttributes attrs;
+	}
+
+	public sealed class AssemblyBuilder : Assembly {
+		private IntPtr dynamic_assembly;
+		private MethodInfo entry_point;
+		private ModuleBuilder[] modules;
+		private string name;
+		private string dir;
+		private CustomAttributeBuilder[] cattrs;
+		private MonoResource[] resources;
+		internal Type corlib_object_type = typeof (System.Object);
+		internal Type corlib_value_type = typeof (System.ValueType);
+		internal Type corlib_enum_type = typeof (System.Enum);
+		private int[] table_indexes;
+		internal ArrayList methods;
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern void basic_init (AssemblyBuilder ab);
+		
+		internal AssemblyBuilder (AssemblyName n, string directory, AssemblyBuilderAccess access) {
+			name = n.Name;
+			dir = directory;
+			basic_init (this);
+		}
+
+		internal int get_next_table_index (object obj, int table, bool inc) {
+			if (table_indexes == null) {
+				table_indexes = new int [64];
+				for (int i=0; i < 64; ++i)
+					table_indexes [i] = 1;
+				/* allow room for .<Module> in TypeDef table */
+				table_indexes [0x02] = 2;
+			}
+			// Console.WriteLine ("getindex for table "+table.ToString()+" got "+table_indexes [table].ToString());
+			if (inc) {
+				if ((table == 0x06) && (methods != null))
+					methods.Add (obj);
+				return table_indexes [table]++;
+			}
+			return table_indexes [table];
+		}
+
+		public override string CodeBase {
+			get {
+				return null;
+			}
+		}
+		
+		public override MethodInfo EntryPoint {
+			get {
+				return entry_point;
+			}
+		}
+
+		public override string Location {
+			get {
+				return null;
+			}
+		}
+
+		public void AddResourceFile (string name, string fileName)
+		{
+			AddResourceFile (name, fileName, ResourceAttributes.Public);
+		}
+
+		public void AddResourceFile (string name, string fileName, ResourceAttributes attribute)
+		{
+			if (resources != null) {
+				MonoResource[] new_r = new MonoResource [resources.Length + 1];
+				System.Array.Copy(resources, new_r, resources.Length);
+				resources = new_r;
+			} else {
+				resources = new MonoResource [1];
+			}
+			int p = resources.Length - 1;
+			resources [p].name = name;
+			resources [p].filename = fileName;
+			resources [p].attrs = attribute;
+		}
+
+		public void EmbedResourceFile (string name, string fileName)
+		{
+			EmbedResourceFile (name, fileName, ResourceAttributes.Public);
+		}
+
+		public void EmbedResourceFile (string name, string fileName, ResourceAttributes attribute)
+		{
+			if (resources != null) {
+				MonoResource[] new_r = new MonoResource [resources.Length + 1];
+				System.Array.Copy(resources, new_r, resources.Length);
+				resources = new_r;
+			} else {
+				resources = new MonoResource [1];
+			}
+			int p = resources.Length - 1;
+			resources [p].name = name;
+			resources [p].attrs = attribute;
+			try {
+				FileStream s = new FileStream (fileName, FileMode.Open, FileAccess.Read);
+				long len = s.Length;
+				resources [p].data = new byte [len];
+				s.Read (resources [p].data, 0, (int)len);
+				s.Close ();
+			} catch {
+				/* do something */
+			}
+		}
+
+		public ModuleBuilder DefineDynamicModule (string name)
+		{
+			return DefineDynamicModule (name, name, false);
+		}
+
+		public ModuleBuilder DefineDynamicModule (string name, bool emitSymbolInfo)
+		{
+			return DefineDynamicModule (name, name, emitSymbolInfo);
+		}
+
+		public ModuleBuilder DefineDynamicModule(string name, string fileName)
+		{
+			return DefineDynamicModule (name, fileName, false);
+		}
+
+		public ModuleBuilder DefineDynamicModule (string name, string fileName,
+							  bool emitSymbolInfo)
+		{
+			ModuleBuilder r = new ModuleBuilder (this, name, fileName, emitSymbolInfo);
+
+			if (modules != null) {
+				ModuleBuilder[] new_modules = new ModuleBuilder [modules.Length + 1];
+				System.Array.Copy(modules, new_modules, modules.Length);
+				new_modules [modules.Length] = r;
+				modules = new_modules;
+			} else {
+				modules = new ModuleBuilder [1];
+				modules [0] = r;
+			}
+			return r;
+		}
+
+		public IResourceWriter DefineResource (string name, string description, string fileName)
+		{
+			return DefineResource (name, description, fileName, ResourceAttributes.Public);
+		}
+
+		public IResourceWriter DefineResource (string name, string description,
+						       string fileName, ResourceAttributes attribute)
+		{
+			return null;
+		}
+
+		public void DefineUnmanagedResource (byte[] resource)
+		{
+		}
+
+		public void DefineUnmanagedResource (string resourceFileName)
+		{
+		}
+
+		public void DefineVersionInfoResource ()
+		{
+		}
+
+		public void DefineVersionInfoResource (string product, string productVersion,
+						       string company, string copyright, string trademark)
+		{
+		}
+
+		public ModuleBuilder GetDynamicModule (string name)
+		{
+			return null;
+		}
+
+		public override Type[] GetExportedTypes ()
+		{
+			return null;
+		}
+
+		public override FileStream GetFile (string name)
+		{
+			return null;
+		}
+
+		/*public virtual FileStream[] GetFiles() {
+			return null;
+		}
+		public override FileStream[] GetFiles(bool getResourceModules) {
+			return null;
+		}*/
+
+		/*public virtual ManifestResourceInfo GetManifestResourceInfo(string resourceName)
+		  {
+			return null;
+		}
+		public virtual string[] GetManifestResourceNames() {
+			return null;
+		}
+		public virtual Stream GetManifestResourceStream(string name) {
+			return null;
+		}
+		public virtual Stream GetManifestResourceStream(Type type, string name) {
+			return null;
+		}*/
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern int getUSIndex (AssemblyBuilder ab, string str);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern int getToken (AssemblyBuilder ab, MemberInfo member);
+
+		internal int GetToken (string str) {
+			return getUSIndex (this, str);
+		}
+		
+		internal int GetToken (MemberInfo member) {
+			return getToken (this, member);
+		}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern int getDataChunk (AssemblyBuilder ab, byte[] buf, int offset);
+
+		public void Save (string assemblyFileName)
+		{
+			byte[] buf = new byte [65536];
+			FileStream file;
+			int count, offset;
+
+			if (dir != null) {
+				assemblyFileName = String.Format ("{0}{1}{2}", dir, System.IO.Path.DirectorySeparatorChar, assemblyFileName);
+			}
+
+			file = new FileStream (assemblyFileName, FileMode.Create, FileAccess.Write);
+
+			offset = 0;
+			while ((count = getDataChunk (this, buf, offset)) != 0) {
+				file.Write (buf, 0, count);
+				offset += count;
+			}
+			file.Close ();
+		}
+
+		public void SetEntryPoint (MethodInfo entryMethod)
+		{
+			entry_point = entryMethod;
+		}
+
+		public void SetEntryPoint (MethodInfo entryMethod, PEFileKinds fileKind)
+		{
+			entry_point = entryMethod;
+		}
+
+		public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+			if (cattrs != null) {
+				CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
+				cattrs.CopyTo (new_array, 0);
+				new_array [cattrs.Length] = customBuilder;
+				cattrs = new_array;
+			} else {
+				cattrs = new CustomAttributeBuilder [1];
+				cattrs [0] = customBuilder;
+			}
+		}
+		public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+			SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
+		}
+
+		public void SetCorlibTypeBuilders (Type corlib_object_type, Type corlib_value_type, Type corlib_enum_type) {
+			this.corlib_object_type = corlib_object_type;
+			this.corlib_value_type = corlib_value_type;
+			this.corlib_enum_type = corlib_enum_type;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilderAccess.cs b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilderAccess.cs
new file mode 100644
index 00000000000..2c6a97d9aca
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/AssemblyBuilderAccess.cs
@@ -0,0 +1,16 @@
+//--------------------------
+// System.Reflection.Emit
+// Author: Mandar Nanivadekar
+//
+// Created: 29/08/2001
+//------------------------------
+
+namespace System.Reflection.Emit
+{
+  public enum AssemblyBuilderAccess
+  {
+    Run = 1,
+    Save = 2,
+    RunAndSave = 3
+  }
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/ChangeLog b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
new file mode 100644
index 00000000000..3ddee6f2183
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/ChangeLog
@@ -0,0 +1,473 @@
+
+Wed Aug 14 17:38:41 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* TypeBuilder.cs: ReflectedType and CreateType fixes.
+
+Thu Aug 8 10:25:51 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: added API to embed managed resources.
+
+2002-08-03  Martin Baulig  <martin@gnome.org>
+
+	* TypeBuilder.cs (TypeBuilder.DeclaringType): Implemented.
+
+Thu Jul 25 13:57:46 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: support linking external resources.
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	* ILGenerator.cs (Emit (OpCode, LocalBuilder)): Throw an exception
+	when trying to emit a local that was defined in a different ILGenerator.
+
+	* LocalBuilder.cs (LocalBuilder): Added `ILGenetator' argument to
+	the constructor.
+
+Tue Jul 16 19:32:08 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: stack size check fix.
+
+Sat Jul 13 17:30:51 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: add also the enum_type for compiling corlib.
+	* TypeBuilder.cs: complete IsValueType.
+
+Sat Jul 13 15:08:12 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* TypeBuilder.cs: better IsValueType.
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* CustomAttributeBuilder.cs: removed compile warning.
+
+Fri Jul 12 11:34:58 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: fixup typebuilder tokens as well.
+
+Tue Jul 9 19:03:03 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* TypeBuilder.cs: special case SerializarionAttribute.
+	Tweaks to get correct code in corlib.
+
+2002-07-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* ILGenerator.cs (ILGenerator.Emit): For doubles and floats, swap
+	the bytes on big endian systems. 
+
+2002-07-03  Martin Baulig  <martin@gnome.org>
+
+	* AssemblyBuilder.cs (corlib_object_type, corlib_value_type): Moved
+	these fields up after the last entry in MonoReflectionAssemblyBuilder
+	in reflection.h.
+
+	* TypeBuilder.cs (IsValueTypeImpl): Use the AssemblyBuilder's
+	`corlib_value_type' instead of `typeof (System.ValueType)'.
+	(DefineNestedType): Use the AssemblyBuilder's `corlib_object_type'
+	instead of `typeof (object)'.
+
+2002-07-02  Martin Baulig  <martin@gnome.org>
+
+	* AssemblyBuilder.cs (corlib_object_type, corlib_value_type): New
+	internal fields.  When compiling corlib, they point to the newly
+	created System.Object and System.ValueType types.
+	(SetCorlibTypeBuilders): New public function.  This will be
+	dynamically called from MCS when compiling corlib.
+
+	* TypeBuilder.cs (DefineInitializedData): Use the AssemblyBuilder's
+	`corlib_value_type' as parent type instead of `typeof (System.ValueType)'
+	to make it work when compiling corlib.
+
+	* ModuleBuilder.cs (assemblyb): Made this field internal, not private.
+
+Tue Jul 2 18:34:49 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* TypeBuilder.cs: implemented AssemblyQualifiedName.
+	* MethodBuilder.cs, ConstructorBuilder.cs: special case custom attr.
+
+Mon Jul 1 16:17:29 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* TypeBuilder.cs: implemented AddInterfaceImplementation().
+
+2002-06-28  Martin Baulig  <martin@gnome.org>
+
+	* MethodBuilder.cs (GetParameters): Return all parameters, not all
+	but the last one.
+
+2002-06-27  Martin Baulig  <martin@gnome.org>
+
+	* ConstructorBuilder.cs (GetParameters): Implemented.
+
+Mon Jun 17 14:55:43 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ModuleBuilder.cs, TypeBuilder.cs: fixes for nested types handling.
+
+Fri Jun 14 16:21:54 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* CustomAttributeBuilder.cs: added custom attribute related internal
+	helper methods.
+	* FieldBuilder.cs, ParameterBuilder.cs: handle MarshalAs attribute.
+	* UnmanagedMarshal.cs: implemented.
+
+Mon Jun 10 18:58:18 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* PropertyBuilder.cs: implemented ReflectedType and DeclaringType
+	properties.
+
+2002-06-07  Martin Baulig  <martin@gnome.org>
+
+	* TypeBuilder.cs (TypeBuilder): Added `PackingSize packing_size' and
+	`int type_size' fields to the constructor.
+	(DefineNestedType): Pass packing_size and type_size to the constructor.
+
+	* ModuleBuilder.cs (DefineType): Pass the packing_size and type_size
+	fields to the TypeBuilder's constructor.
+
+2002-06-07  Martin Baulig  <martin@gnome.org>
+
+	* TypeBuilder.cs (DefineNestedType): There is no overload for this
+	method which takes 5 args in the specs, removed it.
+
+Fri Jun 7 17:04:06 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: updates for PE/COFF rewrite.
+
+2002-05-30  Martin Baulig  <martin@gnome.org>
+
+	* AssemblyBuilder.cs (methods): Made this internal and don't
+	initialize it.  It will be initialized by the ModuleBuilder's
+	GetSymbolWriter() method.
+	(get_next_table_index): Only store the method in the `methods'
+	array if it's not null.
+
+	* ModuleBuilder.cs (GetSymbolWriter): Initialize the AssemblyBuilder's
+	`methods' field if necessary and pass it as third argument to the
+	symbol writer's constructor.
+
+2002-05-25  Martin Baulig  <martin@gnome.org>
+
+	* TypeBuilder.cs (TypeToken): Implemented.
+
+2002-05-24  Martin Baulig  <martin@gnome.org>
+
+	* ModuleBuilder.cs (symwriter_define_local): New private variable.
+	(GetSymbolWriter): Look for a custom version of "DefineLocalVariable"
+	and store it in `symwriter_define_local'.
+	(SymWriter_DefineLocalVariable): New internal method to call the
+	symbol writer's custom DefineLocalVariable() method.  It is safe to
+	call this method if there's no symbol writer.
+
+	* LocalBuilder.cs (SetLocalSymInfo): Use the MethodBuilder'snew
+	SymWriter_DefineLocalVariable().
+
+	* MethodBuilder.cs (GetParameters): Implemented.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* ModuleBuilder.cs (GetSymbolWriter): Pass the this pointer to the
+	symbol writer's constructor.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* AssemblyBuilder.cs (methods): New field.
+	(get_next_table_index): Record all methods and constructors
+	(table 0x06) in the `methods' array.  This is read by the
+	Mono.CSharp.Debugger.MonoSymbolWriter::get_method interncall to
+	get the MethodBuilder / ConstructorBuilder back from the token.
+
+	* *Builder.cs (get_next_table_index): Added `object obj' argument.
+	(<constructors>): pass the this pointer to get_next_table_index ().
+
+2002-05-20  Martin Baulig  <martin@gnome.org>
+
+	* TypeBuilder.cs (DefineField): Call the new `create_internal_class'
+	interncall after adding the first field.  This is used when creating
+	enum types to set `klass->enum_basetype'.
+
+Thu May 16 16:09:51 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* TypeBuilder.cs: complete special acse support for CharSet, Size and
+	Pack named args in StructLayout attribute.
+
+Tue May 14 17:13:48 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MethodBuilder.cs: revert change in accessibility of
+	GetILGenerator(int).
+
+Tue May 14 13:31:17 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* FieldBuilder.cs, ParameterBuilder.cs: more special-casing of
+	attributes.
+
+Fri May 10 20:57:27 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* CustomAttributeBuilder.cs: expose internal data for use in
+	reflection.
+	* FieldBuilder.cs, TypeBuilder.cs: special case FieldOffset and
+	StructLayout attributes.
+
+Fri May 10 16:30:57 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MethodBuilder.cs, ConstructorBuilder.cs: implemented InitLocals
+	property.
+
+2002-04-26  Martin Baulig  <martin@gnome.org>
+
+	* ModuleBuilder.cs (DefineDocument): Implemented.
+
+Tue Apr 16 13:02:28 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: pad output file to file alignment.
+	* FieldBuilder.cs: ReflectedType.
+	* ModuleBuilder.cs: added guid generation and array method creation.
+	* MonoArrayMethod.cs: array method support code.
+	
+Wed Apr 10 12:57:31 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: use a stack to keep track of exception blocks.
+
+Mon Apr  8 06:19:01  2002 Piers Haken <piersh@friskit.com>
+
+	* ILGenerator.cs: added LabelField.label_base to allow for
+	arbitrary offsets (for switch statement)
+
+Fri Apr 5 15:41:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: simpler protocol wih the runtime to
+	get the assembly data.
+
+Tue Mar 26 20:10:24 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: use FileMode.Create.
+	* ILGenerator.cs: optimize localbuilder related opcodes.
+	Track parameters to adjust maxstack.
+	* LocalBuilder.cS: use unsigned for position.
+
+2002-03-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* LocalBuilder.cs: Drop the symbol_writer as LocalBuilder fields.
+	Do this lazily in SetLocalSymInfo.
+	
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* ModuleBuilder.cs (GetSymbolWriter): The MonoSymbolWriter's constructor
+	now takes a `string assembly_filename' argument, pass it our fully
+	qualified assembly name.
+
+2002-03-24  Nick Drochak  <ndrochak@gol.com>
+
+	* ILGenerator.cs: Use #if-#endif instead of if(false){} to disable
+	code.  This way there is no compiler warning.
+
+	* TypeBuilder.cs: Removed the returns that came after the throws.
+	This removes a few more compiler warnings. Also marked with MonoTODO
+	all places where we throw NotImplemented exceptions.
+
+2002-03-23  Martin Baulig  <martin@gnome.org>
+
+	* SignatureHelper.cs (GetFieldSignatureHelper, GetLocalSignatureHelper):
+	Implemented.
+
+	* LocalBuilder.cs (LocalBuilder): This internal constructor now takes
+	a ModuleBuilder argument instead of a ISymbolWriter one.
+	(SetLocalSymInfo): Create and pass type signature to DefineLocalVariable.
+
+2002-03-23  Martin Baulig  <martin@gnome.org>
+
+	* ILGenerator.cs (BeginScope, EndScope): Implemented.
+
+2002-03-20  Martin Baulig  <martin@gnome.org>
+
+	* ModuleBuilder.cs (GetSymbolWriter): New internal function. Dynamically
+	loads the default symbol writer, catch all possible exceptions and return
+	null on failure.
+	(ModuleBuilder): Added `bool emitSymbolInfo' argument to this internal
+	constructor; if set, call GetSymbolWriter ().
+	(GetSymWriter): Implemented.
+
+	* LocalBuilder.cs (LocalBuilder): Added ISymbolWriter argument to this
+	internal method.
+	(SetLocalSymInfo): Implemented, call ISymbolWriter.DefineLocalVariable ()
+	if the symbol writer is not null.
+
+	* ILGenerator.cs (ILGenerator): Call ModuleBuilder.GetSymWriter () to get
+	and store the symbol writer.
+	(DeclareLocal): Pass the symbol writer to LocalBuilder's constructor.
+	(MarkSequencePoint): Implemented, call ISymbolWriter.DefineSequencePoints ()
+	if the symbol writer is not null.
+
+	* AssemblyBuilder.cs (DefineDynamicModule): Pass the `bool emitSymbolInfo'
+	to ModuleBuilder's constructor.
+
+Sat Mar 16 19:11:47 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ModuleBuilder.cs: handle modified types correctly.
+
+Thu Mar 7 17:10:42 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: allow saving bigger assemblies.
+	* ILGenerator.cs: add fixup table for fields and methods, since
+	at the end of the compile they may end up with a different table
+	index.
+	* ModuleBuilder.cs: add cache for type names to speed up the type
+	lookups from the compiler.
+	* TypeBuilder.cs: GetInterfaces () returns only interfaces in the
+	current type, not in parents (the docs are wrong).
+
+Tue Mar 5 18:09:34 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* EventBuilder.cs: implemented.
+	* TypeBuilder.cs: implemented DefineEvent() method and UnderlyingSystemType
+	property.
+
+Mon Mar 4 20:34:52 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: make enough room in the byte array for string
+	tokens.
+	* TypeBuilder.cs: fixed GetInterfaces().
+
+Mon Mar 4 11:30:40 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* TypeBuilder.cs: implemented GetConstructors(), GetFields(),
+	GetMethods(), GetProperties().
+
+Thu Feb 28 19:15:10 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: call into the runtime to init some basic
+	assembly stuff. Reserve slot 1 of typedef table for .<Module>.
+	* ModuleBuilder.cs: call into the runtime if we need to create a
+	modief type, such as arrays, byref etc.
+	* TypeBuilder.cs: call into the runtime to create the MonoClass
+	representation for the type. Throw exceptions with not implemented
+	stuff.
+
+Wed Feb 27 18:48:47 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: fix nested exception blocks.
+
+Wed Feb 20 22:30:49 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: upped compiled assembly size limit.
+	Implemented SetCustomAttribute () methods.
+	* CustomAttributeBuilder.cs: implemented the needed constructor
+	stuff.
+	* Cosntructorbuilder.cs, EnumBuilder.cs, FieldBuilder.cs,
+	MethodBuilder.cs, ModuleBuilder.cs, ParameterBuilder.cs,
+	PropertyBuilder.cs, TypeBuilder.cs: Implemented SetCustomAttribute () methods.
+
+Wed Feb 20 14:54:01 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: add SetCustomAttribute () to keep the compiler
+	going.
+
+Fri Feb 15 18:15:04 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: finally block support and fixes.
+
+Thu Feb 14 18:55:52 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* FieldBuilder.cs: Add SetRVAData().
+	* ILGenerator.cs: speed up code array growth.
+	* TypeBuilder.cs: fix IsValueTypeImpl(). Add class_size member.
+	Implement DefineInitializedData().
+
+Tue Jan 22 23:01:11 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* EnumBuilder.cs, TypeBuilder.cs: updates for changes in Type.cs.
+	* ModuleBuilder.cs: fix lookup of nested types.
+
+Tue Jan 15 22:46:21 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: implement some of the exception support methods.
+
+Mon Jan 14 17:07:32 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ModulerBuilder.cs: search also for subtypes in GetTypes().
+	* TypeBuilder.cs: bugfix in FullName. Implemented DefineNestedType().
+
+Fri Jan 11 19:00:29 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MethodBuilder.cs, ConstructorBuilder.cs: save parameter info.
+
+Thu Jan 10 21:07:54 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: handle type tokens (used for box opcode).
+
+Wed Jan 9 19:37:55 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: emit float and doubles.
+	* ModuleBuilder.cs: off-by-one error fix and GetType()
+	implementations.
+	* TypeBuilder.cs: AttributesImpl added.
+	* UnmanagedMarshal.cs: stubbed out class.
+
+Sat Jan 5 15:59:05 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: fix emission of two-bytes opcodes.
+	Missing slot for locals array. Throw exceptions on unimplemented
+	methods.
+	* OpCode.cs: add a comment: the Value property is useless.
+	* OpCodes.cs: fix name of tail opcode (Tail -> Tailcall).
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* ConstructorBuilder.cs : Use the MonoTODO attribute.
+
+	* ILGenerator.cs, Label.cs, MethodBuilder.cs, ModuleBuilder.cs,
+	ParameterBuilder.cs, TypeBuilder.cs : Ditto.
+	
+Thu Jan 3 23:26:15 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ILGenerator.cs: typo fix.
+
+Mon Dec 24 17:21:30 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* TypeBuilder.cs: added DefineMethodOverride().
+	* MethodBuilder.cs: add override_method member and setter.
+
+Mon Nov 19 13:58:01 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: add method to register a string in the "#US"
+	stream.
+	* EnumBuilder.cs, SignatureHelper.cs: added stubs.
+	* ILGenerator.cs: more stuff implemented.
+	* LocalBuilder.cs: keep track of local var index.
+
+Thu Nov 15 18:11:23 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* ConstructorBuilder.cs: implement the interesting methods.
+	* ILGenerator.cs: adapt for use with both a MethodBuilder and a
+	ConstructorBuilder.
+	* MethodBuilder.cs: add ImplAttributes.
+	* ParameterBuilder.cs: adapt for ConstructorBuilder.
+	* TypeBuilder.cs: add constructors handling.
+
+Wed Nov 14 17:01:45 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* ConstructorBuilder.cs: added missing stubs and some implementation.
+	* CustomAttributeBuilder.cs: added.
+	* EventBuilder.cs: added.
+	* FieldBuilder.cs: updates.
+	* MethodBuilder.cs: stuff to implement P/Invoke methods.
+	* ModuleBuilder.cs: added GetArrayMethod() stub.
+	* ParameterBuilder.cs, PropertyBuilder.cs: updates.
+	* TypeBuilder.cs: updates and stubs.
+
+2001-11-10  Sean MacIsaac  <macisaac@ximian.com>
+
+	* TypeBuilder.cs: Added implementation for TypeHandle.
+
+Tue Nov 6 09:13:45 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* AssemblyBuilder.cs: define an internal constructor.
+
+2001-10-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* AssemblyBuilder.cs: Reformatted.
+
+	Added override keywords to those that needed them.
+
+	Removed methods that we do not override, but just inherit
+
+Tue Sep 25 16:53:08 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* TypeBuilder.cs, ConstructorBuilder.cs, ModuleBuilder.cs: added.
diff --git a/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
new file mode 100644
index 00000000000..80ef14a0c84
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/ConstructorBuilder.cs
@@ -0,0 +1,163 @@
+//
+// System.Reflection.Emit/ConstructorBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Reflection.Emit {
+	public sealed class ConstructorBuilder : ConstructorInfo {
+		private ILGenerator ilgen;
+		private Type[] parameters;
+		private MethodAttributes attrs;
+		private MethodImplAttributes iattrs;
+		private int table_idx;
+		private CallingConventions call_conv;
+		private TypeBuilder type;
+		private ParameterBuilder[] pinfo;
+		private CustomAttributeBuilder[] cattrs;
+		private bool init_locals = true;
+
+		internal ConstructorBuilder (TypeBuilder tb, MethodAttributes attributes, CallingConventions callingConvention, Type[] parameterTypes) {
+			attrs = attributes;
+			call_conv = callingConvention;
+			if (parameterTypes != null) {
+				this.parameters = new Type [parameterTypes.Length];
+				System.Array.Copy (parameterTypes, this.parameters, parameterTypes.Length);
+			}
+			type = tb;
+			table_idx = get_next_table_index (this, 0x06, true);
+		}
+		
+		public bool InitLocals {
+			get {return init_locals;}
+			set {init_locals = value;}
+		}
+
+		internal TypeBuilder TypeBuilder {
+			get {return type;}
+		}
+		
+		public override MethodImplAttributes GetMethodImplementationFlags() {
+			return iattrs;
+		}
+		public override ParameterInfo[] GetParameters() {
+			if ((parameters == null) || (pinfo == null))
+				return null;
+
+			ParameterInfo[] retval = new ParameterInfo [parameters.Length];
+			for (int i = 0; i < parameters.Length; i++) {
+				if (pinfo [i+1] == null)
+					return null;
+
+				retval [i] = new ParameterInfo (pinfo [i+1], parameters [i], this);
+			}
+
+			return retval;
+		}
+		public override Object Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) {
+			return null;
+		}
+		public override object Invoke(BindingFlags invokeAttr, Binder binder, object[] parameters, CultureInfo culture) {
+			return null;
+		}
+
+		public override RuntimeMethodHandle MethodHandle { get {return new RuntimeMethodHandle ();} }
+		public override MethodAttributes Attributes { 
+			get {return attrs;} 
+		}
+		public override Type ReflectedType { get {return type;}}
+		public override Type DeclaringType { get {return type;}}
+		public Type ReturnType { get {return null;}}
+		public override string Name { 
+			get {return (attrs & MethodAttributes.Static) != 0 ? ".cctor" : ".ctor";}
+		}
+		public string Signature {
+			get {return "constructor signature";}
+		}
+
+		public void AddDeclarativeSecurity( SecurityAction action, PermissionSet pset) {
+		}
+
+		[MonoTODO]
+		public ParameterBuilder DefineParameter(int iSequence, ParameterAttributes attributes, string strParamName)
+		{
+			ParameterBuilder pb = new ParameterBuilder (this, iSequence, attributes, strParamName);
+			// check iSequence
+			if (pinfo == null)
+				pinfo = new ParameterBuilder [parameters.Length + 1];
+			pinfo [iSequence] = pb;
+			return pb;
+		}
+
+		public override bool IsDefined (Type attribute_type, bool inherit) {return false;}
+
+		public override object [] GetCustomAttributes (bool inherit) {return null;}
+
+		public override object [] GetCustomAttributes (Type attribute_type, bool inherit) {return null;}
+
+		public ILGenerator GetILGenerator () {
+			return GetILGenerator (256);
+		}
+		internal ILGenerator GetILGenerator (int size) {
+			ilgen = new ILGenerator (this, size);
+			return ilgen;
+		}
+
+		public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+			string attrname = customBuilder.Ctor.ReflectedType.FullName;
+			if (attrname == "System.Runtime.CompilerServices.MethodImplAttribute") {
+				byte[] data = customBuilder.Data;
+				int impla; // the (stupid) ctor takes a short or an int ... 
+				impla = (int)data [2];
+				impla |= ((int)data [3]) << 8;
+				SetImplementationFlags ((MethodImplAttributes)impla);
+				return;
+			}
+			if (cattrs != null) {
+				CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
+				cattrs.CopyTo (new_array, 0);
+				new_array [cattrs.Length] = customBuilder;
+				cattrs = new_array;
+			} else {
+				cattrs = new CustomAttributeBuilder [1];
+				cattrs [0] = customBuilder;
+			}
+		}
+		public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+			SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
+		}
+		public void SetImplementationFlags( MethodImplAttributes attributes) {
+			iattrs = attributes;
+		}
+		public Module GetModule() {
+			return null;
+		}
+		public MethodToken GetToken() {
+			return new MethodToken (0x06000000 | table_idx);
+		}
+		public void SetSymCustomAttribute( string name, byte[] data) {
+		}
+		public override string ToString() {
+			return "constructor";
+		}
+
+		internal void fixup () {
+			if (ilgen != null)
+				ilgen.label_fixup ();
+		}
+		internal override int get_next_table_index (object obj, int table, bool inc) {
+			return type.get_next_table_index (obj, table, inc);
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/CustomAttributeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/CustomAttributeBuilder.cs
new file mode 100755
index 00000000000..c77bec598fe
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/CustomAttributeBuilder.cs
@@ -0,0 +1,123 @@
+
+//
+// System.Reflection.Emit/CustomAttributeBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection.Emit {
+	public class CustomAttributeBuilder {
+		ConstructorInfo ctor;
+		byte[] data;
+
+		internal ConstructorInfo Ctor {
+			get {return ctor;}
+		}
+
+		internal byte[] Data {
+			get {return data;}
+		}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		static extern byte[] GetBlob(ConstructorInfo con, object[] constructorArgs, PropertyInfo[] namedProperties, object[] propertyValues, FieldInfo[] namedFields, object[] fieldValues);
+		
+		internal CustomAttributeBuilder( ConstructorInfo con, byte[] cdata) {
+			ctor = con;
+			data = (byte[])cdata.Clone ();
+			/* should we check that the user supplied data is correct? */
+		}
+		
+		public CustomAttributeBuilder( ConstructorInfo con, object[] constructorArgs)
+			: this (con, constructorArgs, null, null, null, null) {
+		}
+		public CustomAttributeBuilder( ConstructorInfo con, object[] constructorArgs, FieldInfo[] namedFields, object[] fieldValues)
+			: this (con, constructorArgs, null, null, namedFields, fieldValues) {
+		}
+		public CustomAttributeBuilder( ConstructorInfo con, object[] constructorArgs, PropertyInfo[] namedProperties, object[] propertyValues)
+			: this (con, constructorArgs, namedProperties, propertyValues, null, null) {
+		}
+		public CustomAttributeBuilder( ConstructorInfo con, object[] constructorArgs, PropertyInfo[] namedProperties, object[] propertyValues, FieldInfo[] namedFields, object[] fieldValues) {
+			ctor = con;
+			data = GetBlob (con, constructorArgs, namedProperties, propertyValues, namedFields, fieldValues);
+		}
+
+		/* helper methods */
+		internal static int decode_len (byte[] data, int pos, out int rpos) {
+			int len = 0;
+			if ((data [pos] & 0x80) == 0) {
+				len = (int)(data [pos++] & 0x7f);
+			} else if ((data [pos] & 0x40) == 0) {
+				len = ((data [pos] & 0x3f) << 8) + data [pos + 1];
+				pos += 2;
+			} else {
+				len = ((data [pos] & 0x1f) << 24) + (data [pos + 1] << 16) + (data [pos + 2] << 8) + data [pos + 3];
+				pos += 4;
+			}
+			rpos = pos;
+			return len;
+		}
+
+		internal static string string_from_bytes (byte[] data, int pos, int len) {
+			char[] chars = new char [len];
+			// FIXME: use a utf8 decoder here
+			for (int i = 0; i < len; ++i)
+				chars [i] = (char)data [pos + i];
+			return new String (chars);
+		}
+
+		internal static UnmanagedMarshal get_umarshal (CustomAttributeBuilder customBuilder, bool is_field) {
+			byte[] data = customBuilder.Data;
+			UnmanagedType subtype = UnmanagedType.I4;
+			int value;
+			int utype; /* the (stupid) ctor takes a short or an enum ... */
+			utype = (int)data [2];
+			utype |= ((int)data [3]) << 8;
+
+			string first_type_name = customBuilder.Ctor.GetParameters()[0].ParameterType.FullName;
+			int pos = 6;
+			if (first_type_name == "System.Int16")
+				pos = 4;
+			int nnamed = (int)data [pos++];
+			nnamed |= ((int)data [pos++]) << 8;
+			
+			for (int i = 0; i < nnamed; ++i) {
+				byte type = data [pos++];
+				int len = decode_len (data, pos, out pos);
+				string named_name = string_from_bytes (data, pos, len);
+				pos += len;
+				switch (named_name) {
+				case "ArraySubType":
+					value = (int)data [pos++];
+					value |= ((int)data [pos++]) << 8;
+					value |= ((int)data [pos++]) << 16;
+					value |= ((int)data [pos++]) << 24;
+					subtype = (UnmanagedType)value;
+					break;
+				default:
+					break;
+				}
+			}
+
+			switch ((UnmanagedType)utype) {
+			case UnmanagedType.LPArray:
+				return UnmanagedMarshal.DefineLPArray (subtype);
+			case UnmanagedType.SafeArray:
+				return UnmanagedMarshal.DefineSafeArray (subtype);
+			case UnmanagedType.ByValArray:
+			case UnmanagedType.ByValTStr:
+			default:
+				return UnmanagedMarshal.DefineUnmanagedMarshal ((UnmanagedType)utype);
+			}
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs
new file mode 100755
index 00000000000..d82d116ad84
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/EnumBuilder.cs
@@ -0,0 +1,188 @@
+
+//
+// System.Reflection.Emit/EnumBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System.Reflection.Emit {
+	public sealed class EnumBuilder : Type {
+		CustomAttributeBuilder[] cattrs;
+
+		public override Assembly Assembly {
+			get {return null;}
+		}
+		public override string AssemblyQualifiedName {
+			get {return null;}
+		}
+		public override Type BaseType {
+			get {return null;}
+		}
+		public override Type DeclaringType {
+			get {return null;}
+		}
+		public override string FullName {
+			get {return null;}
+		}
+		public override Guid GUID {
+			get {return Guid.Empty;}
+		}
+		public override Module Module {
+			get {return null;}
+		}
+		public override string Name {
+			get {return null;}
+		}
+		public override string Namespace {
+			get {return null;}
+		}
+		public override Type ReflectedType {
+			get {return null;}
+		}
+		public override RuntimeTypeHandle TypeHandle {
+			get {return new RuntimeTypeHandle ();}
+		}
+		public TypeToken TypeToken {
+			get {return new TypeToken ();}
+		}
+		public FieldBuilder UnderlyingField {
+			get {return null;}
+		}
+		public override Type UnderlyingSystemType {
+			get {return null;}
+		}
+/* no need to override
+		public override MemberTypes MemberType {
+			get {return MemberTypes.TypeInfo;}
+		}
+*/
+
+		internal EnumBuilder (ModuleBuilder mb, string name, TypeAttributes visibility, Type underlyingType) {
+		}
+		public Type CreateType() {
+			return null;
+		}
+		public FieldBuilder DefineLiteral( string literalName, object literalValue) {
+			return null;
+		}
+		protected override TypeAttributes GetAttributeFlagsImpl() {
+			return (TypeAttributes)0;
+		}
+		protected override ConstructorInfo GetConstructorImpl( BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) {
+			return null;
+		}
+		public override ConstructorInfo[] GetConstructors( BindingFlags bindingAttr) {
+			return null;
+		}
+		public override object[] GetCustomAttributes(bool inherit) {
+			return null;
+		}
+		public override object[] GetCustomAttributes(Type attributeType, bool inherit) {
+			return null;
+		}
+		public override Type GetElementType() {
+			throw new NotSupportedException ();
+		}
+		public override EventInfo GetEvent( string name, BindingFlags bindingAttr) {
+			return null;
+		}
+		public override EventInfo[] GetEvents() {
+			return null;
+		}
+		public override EventInfo[] GetEvents( BindingFlags bindingAttr) {
+			return null;
+		}
+		public override FieldInfo GetField( string name, BindingFlags bindingAttr) {
+			return null;
+		}
+		public override FieldInfo[] GetFields( BindingFlags bindingAttr) {
+			return null;
+		}
+		public override Type GetInterface( string name, bool ignoreCase) {
+			return null;
+		}
+		public override InterfaceMapping GetInterfaceMap( Type interfaceType) {
+			throw new NotImplementedException ();
+		}
+		public override Type[] GetInterfaces() {
+			return null;
+		}
+		public override MemberInfo[] GetMember( string name, MemberTypes type, BindingFlags bindingAttr) {
+			return null;
+		}
+		public override MemberInfo[] GetMembers( BindingFlags bindingAttr) {
+			return null;
+		}
+		protected override MethodInfo GetMethodImpl( string name, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) {
+			// FIXME
+			return null;
+		}
+		
+		public override MethodInfo[] GetMethods( BindingFlags bindingAttr) {
+			return null;
+		}
+		public override Type GetNestedType( string name, BindingFlags bindingAttr) {
+			return null;
+		}
+		public override Type[] GetNestedTypes( BindingFlags bindingAttr) {
+			return null;
+		}
+		public override PropertyInfo[] GetProperties( BindingFlags bindingAttr) {
+			return null;
+		}
+		protected override PropertyInfo GetPropertyImpl( string name, BindingFlags bindingAttr, Binder binder, Type returnType, Type[] types, ParameterModifier[] modifiers) {
+			return null;
+		}
+		protected override bool HasElementTypeImpl() {
+			throw new NotSupportedException ();
+		}
+		public override object InvokeMember( string name, BindingFlags invokeAttr, Binder binder, object target, object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters)  {
+			return null;
+		}
+		protected override bool IsArrayImpl() {
+			return false;
+		}
+		protected override bool IsByRefImpl() {
+			return false;
+		}
+		protected override bool IsCOMObjectImpl() {
+			return false;
+		}
+		protected override bool IsPointerImpl() {
+			return false;
+		}
+		protected override bool IsPrimitiveImpl() {
+			return false;
+		}
+		protected override bool IsValueTypeImpl() {
+			return true;
+		}
+		public override bool IsDefined( Type attributeType, bool inherit) {
+			return false;
+		}
+		
+		public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+			if (cattrs != null) {
+				CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
+				cattrs.CopyTo (new_array, 0);
+				new_array [cattrs.Length] = customBuilder;
+				cattrs = new_array;
+			} else {
+				cattrs = new CustomAttributeBuilder [1];
+				cattrs [0] = customBuilder;
+			}
+		}
+		public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+			SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/EventBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/EventBuilder.cs
new file mode 100755
index 00000000000..507620a4764
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/EventBuilder.cs
@@ -0,0 +1,85 @@
+
+//
+// System.Reflection.Emit/EventBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection.Emit {
+	public sealed class EventBuilder {
+		string name;
+		Type type;
+		TypeBuilder typeb;
+		CustomAttributeBuilder[] cattrs;
+		MethodBuilder add_method;
+		MethodBuilder remove_method;
+		MethodBuilder raise_method;
+		MethodBuilder[] other_methods;
+		EventAttributes attrs;
+		int table_idx;
+
+		internal EventBuilder (TypeBuilder tb, string eventName, EventAttributes eventAttrs, Type eventType) {
+			name = eventName;
+			attrs = eventAttrs;
+			type = eventType;
+			typeb = tb;
+			table_idx = get_next_table_index (this, 0x14, true);
+		}
+
+		internal int get_next_table_index (object obj, int table, bool inc) {
+			return typeb.get_next_table_index (obj, table, inc);
+		}
+
+		public void AddOtherMethod( MethodBuilder mdBuilder) {
+			if (other_methods != null) {
+				MethodBuilder[] newv = new MethodBuilder [other_methods.Length + 1];
+				other_methods.CopyTo (newv, 0);
+				other_methods = newv;
+			} else {
+				other_methods = new MethodBuilder [1];
+			}
+			other_methods [other_methods.Length - 1] = mdBuilder;
+		}
+		
+		public EventToken GetEventToken () {
+			return new EventToken (0x14000000 | table_idx);
+		}
+		public void SetAddOnMethod( MethodBuilder mdBuilder) {
+			add_method = mdBuilder;
+		}
+		public void SetRaiseMethod( MethodBuilder mdBuilder) {
+			raise_method = mdBuilder;
+		}
+		public void SetRemoveOnMethod( MethodBuilder mdBuilder) {
+			remove_method = mdBuilder;
+		}
+
+		public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+			if (cattrs != null) {
+				CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
+				cattrs.CopyTo (new_array, 0);
+				new_array [cattrs.Length] = customBuilder;
+				cattrs = new_array;
+			} else {
+				cattrs = new CustomAttributeBuilder [1];
+				cattrs [0] = customBuilder;
+			}
+		}
+		public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+			SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
+		}
+
+
+	}
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/EventToken.cs b/mcs/class/corlib/System.Reflection.Emit/EventToken.cs
new file mode 100644
index 00000000000..4cc97be7ea1
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/EventToken.cs
@@ -0,0 +1,70 @@
+// EventToken.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+
+	/// <summary>
+	///  Represents the Token returned by the metadata to represent a Event.
+	/// </summary>
+	[Serializable]
+	public struct EventToken {
+
+		internal int tokValue;
+
+		public static readonly EventToken Empty;
+
+
+		static EventToken ()
+		{
+			Empty = new EventToken ();
+		}
+
+
+		internal EventToken (int val)
+		{
+			tokValue = val;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public override bool Equals (object obj)
+		{
+			bool res = obj is EventToken;
+
+			if (res) {
+				EventToken that = (EventToken) obj;
+				res = (this.tokValue == that.tokValue);
+			}
+
+			return res;
+		}
+
+
+		/// <summary>
+		///  Tests whether the given object is an instance of
+		///  EventToken and has the same token value.
+		/// </summary>
+		public override int GetHashCode ()
+		{
+			return tokValue;
+		}
+
+
+		/// <summary>
+		///  Returns the metadata token for this Event.
+		/// </summary>
+		public int Token {
+			get {
+				return tokValue;
+			}
+		}
+
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/FieldBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/FieldBuilder.cs
new file mode 100755
index 00000000000..2ebe66f7ee5
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/FieldBuilder.cs
@@ -0,0 +1,128 @@
+
+//
+// System.Reflection.Emit/FieldBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001-2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection.Emit {
+	public sealed class FieldBuilder : FieldInfo {
+		private FieldAttributes attrs;
+		private Type type;
+		private String name;
+		private object def_value;
+		private int offset;
+		private int table_idx;
+		internal TypeBuilder typeb;
+		private byte[] rva_data;
+		private CustomAttributeBuilder[] cattrs;
+		private UnmanagedMarshal marshal_info;
+
+		internal FieldBuilder (TypeBuilder tb, string fieldName, Type type, FieldAttributes attributes) {
+			attrs = attributes;
+			name = fieldName;
+			this.type = type;
+			offset = -1;
+			typeb = tb;
+			table_idx = tb.get_next_table_index (this, 0x04, true);
+		}
+
+		public override FieldAttributes Attributes {
+			get {return attrs;}
+		}
+		public override Type DeclaringType {
+			get {return typeb;}
+		}
+		public override RuntimeFieldHandle FieldHandle {
+			get {return new RuntimeFieldHandle();}
+		}
+		public override Type FieldType {
+			get {return type;}
+		}
+		public override string Name {
+			get {return name;}
+		}
+		public override Type ReflectedType {
+			get {return typeb;}
+		}
+
+		public override object[] GetCustomAttributes(bool inherit) {
+			return null;
+		}
+		public override object[] GetCustomAttributes(Type attributeType, bool inherit) {
+			return null;
+		}
+		public FieldToken GetToken() {
+			return new FieldToken (0x04000000 | table_idx);
+		}
+		public override object GetValue(object obj) {
+			return null;
+		}
+		public override bool IsDefined( Type attributeType, bool inherit) {
+			return false;
+		}
+		internal void SetRVAData (byte[] data) {
+			rva_data = (byte[])data.Clone ();
+		}
+		public void SetConstant( object defaultValue) {
+			/*if (defaultValue.GetType() != type)
+				throw new ArgumentException ("Constant doesn't match field type");*/
+			def_value = defaultValue;
+		}
+
+		public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+			string attrname = customBuilder.Ctor.ReflectedType.FullName;
+			if (attrname == "System.Runtime.InteropServices.FieldOffsetAttribute") {
+				byte[] data = customBuilder.Data;
+				offset = (int)data [2];
+				offset |= ((int)data [3]) << 8;
+				offset |= ((int)data [4]) << 16;
+				offset |= ((int)data [5]) << 24;
+				return;
+			} else if (attrname == "System.NonSerializedAttribute") {
+				attrs |= FieldAttributes.NotSerialized;
+				return;
+			} else if (attrname == "System.Runtime.InteropServices.MarshalAsAttribute") {
+				marshal_info = CustomAttributeBuilder.get_umarshal (customBuilder, true);
+				/* FIXME: check for errors */
+				return;
+			}
+			if (cattrs != null) {
+				CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
+				cattrs.CopyTo (new_array, 0);
+				new_array [cattrs.Length] = customBuilder;
+				cattrs = new_array;
+			} else {
+				cattrs = new CustomAttributeBuilder [1];
+				cattrs [0] = customBuilder;
+			}
+		}
+
+		public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+			SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
+		}
+
+		public void SetMarshal( UnmanagedMarshal unmanagedMarshal) {
+			marshal_info = unmanagedMarshal;
+			attrs |= FieldAttributes.HasFieldMarshal;
+		}
+
+		public void SetOffset( int iOffset) {
+			offset = iOffset;
+		}
+		public override void SetValue( object obj, object val, BindingFlags invokeAttr, Binder binder, CultureInfo culture) {
+		}
+
+	}
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/FieldToken.cs b/mcs/class/corlib/System.Reflection.Emit/FieldToken.cs
new file mode 100644
index 00000000000..b3f5a5dade1
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/FieldToken.cs
@@ -0,0 +1,70 @@
+// FieldToken.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+
+	/// <summary>
+	///  Represents the Token returned by the metadata to represent a Field.
+	/// </summary>
+	[Serializable]
+	public struct FieldToken {
+
+		internal int tokValue;
+
+		public static readonly FieldToken Empty;
+
+
+		static FieldToken ()
+		{
+			Empty = new FieldToken ();
+		}
+
+
+		internal FieldToken (int val)
+		{
+			tokValue = val;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public override bool Equals (object obj)
+		{
+			bool res = obj is FieldToken;
+
+			if (res) {
+				FieldToken that = (FieldToken) obj;
+				res = (this.tokValue == that.tokValue);
+			}
+
+			return res;
+		}
+
+
+		/// <summary>
+		///  Tests whether the given object is an instance of
+		///  FieldToken and has the same token value.
+		/// </summary>
+		public override int GetHashCode ()
+		{
+			return tokValue;
+		}
+
+
+		/// <summary>
+		///  Returns the metadata token for this Field.
+		/// </summary>
+		public int Token {
+			get {
+				return tokValue;
+			}
+		}
+
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/FlowControl.cs b/mcs/class/corlib/System.Reflection.Emit/FlowControl.cs
new file mode 100644
index 00000000000..b714362cb11
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/FlowControl.cs
@@ -0,0 +1,63 @@
+// FlowControl.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+
+namespace System.Reflection.Emit {
+
+	/// <summary>
+	///  Describes how an instruction alters the flow of control.
+	/// </summary>
+	public enum FlowControl {
+
+		/// <summary>
+		/// Branch instruction (ex: br, leave).
+		/// </summary>
+		Branch = 0,
+
+		/// <summary>
+		///  Break instruction (ex: break).
+		/// </summary>
+		Break = 1,
+
+		/// <summary>
+		///  Call instruction (ex: jmp, call, callvirt).
+		/// </summary>
+		Call = 2,
+
+		/// <summary>
+		///  Conditional branch instruction (ex: brtrue, brfalse).
+		/// </summary>
+		Cond_Branch = 3,
+
+		/// <summary>
+		///  Changes the behaviour of or provides additional
+		///  about a subsequent instruction. 
+		///  (ex: prefixes such as volatile, unaligned).
+		/// </summary>
+		Meta = 4,
+
+		/// <summary>
+		///  Transition to the next instruction.
+		/// </summary>
+		Next = 5,
+
+		/// <summary>
+		///  Annotation for ann.phi instruction.
+		/// </summary>
+		Phi = 6,
+
+		/// <summary>
+		///  Return instruction.
+		/// </summary>
+		Return = 7,
+
+		/// <summary>
+		///  Throw instruction.
+		/// </summary>
+		Throw = 8
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/ILGenerator.cs b/mcs/class/corlib/System.Reflection.Emit/ILGenerator.cs
new file mode 100644
index 00000000000..554ad58fd08
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/ILGenerator.cs
@@ -0,0 +1,635 @@
+
+//
+// System.Reflection.Emit/ILGenerator.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics.SymbolStore;
+
+namespace System.Reflection.Emit {
+
+	internal struct ILExceptionBlock {
+		public const int CATCH = 0;
+		public const int FILTER = 1;
+		public const int FINALLY = 2;
+		public const int FAULT = 4;
+
+		internal Type extype;
+		internal int type;
+		internal int start;
+		internal int len;
+		internal int filter_offset;
+		
+		internal void Debug () {
+#if NO
+			System.Console.Write ("\ttype="+type.ToString()+" start="+start.ToString()+" len="+len.ToString());
+			if (extype != null)
+				System.Console.WriteLine (" extype="+extype.ToString());
+			else
+				System.Console.WriteLine ("");
+#endif
+		}
+	}
+	internal struct ILExceptionInfo {
+		ILExceptionBlock[] handlers;
+		internal int start;
+		int len;
+		internal Label end;
+
+		internal int NumHandlers () {
+			return handlers.Length;
+		}
+		
+		internal void AddCatch (Type extype, int offset) {
+			int i;
+			End (offset);
+			add_block (offset);
+			i = handlers.Length - 1;
+			handlers [i].type = ILExceptionBlock.CATCH;
+			handlers [i].start = offset;
+			handlers [i].extype = extype;
+		}
+
+		internal void AddFinally (int offset) {
+			int i;
+			End (offset);
+			add_block (offset);
+			i = handlers.Length - 1;
+			handlers [i].type = ILExceptionBlock.FINALLY;
+			handlers [i].start = offset;
+			handlers [i].extype = null;
+		}
+
+		internal void End (int offset) {
+			if (handlers == null)
+				return;
+			int i = handlers.Length - 1;
+			if (i >= 0)
+				handlers [i].len = offset - handlers [i].start;
+		}
+
+		internal int LastClauseType () {
+			if (handlers != null)
+				return handlers [handlers.Length-1].type;
+			else
+				return ILExceptionBlock.CATCH;
+		}
+
+		internal void Debug (int b) {
+#if NO
+			System.Console.WriteLine ("Handler {0} at {1}, len: {2}", b, start, len);
+			for (int i = 0; i < handlers.Length; ++i)
+				handlers [i].Debug ();
+#endif
+		}
+
+		void add_block (int offset) {
+			if (handlers != null) {
+				int i = handlers.Length;
+				ILExceptionBlock[] new_b = new ILExceptionBlock [i + 1];
+				System.Array.Copy (handlers, new_b, i);
+				handlers = new_b;
+				handlers [i].len = offset - handlers [i].start;
+			} else {
+				handlers = new ILExceptionBlock [1];
+				len = offset - start;
+			}
+		}
+	}
+	
+	internal struct ILTokenInfo {
+		public MemberInfo member;
+		public int code_pos;
+	}
+
+	public class ILGenerator: Object {
+		private struct LabelFixup {
+			public int size;
+			public int pos;			// the location of the fixup
+			public int label_base;	// the base address for this fixup
+			public int label_idx;
+		};
+		static Type void_type = typeof (void);
+		private byte[] code;
+		private MethodBase mbuilder; /* a MethodBuilder or ConstructorBuilder */
+		private int code_len;
+		private int max_stack;
+		private int cur_stack;
+		private LocalBuilder[] locals;
+		private ILExceptionInfo[] ex_handlers;
+		private int num_token_fixups;
+		private ILTokenInfo[] token_fixups;
+		private int[] label_to_addr;
+		private int num_labels;
+		private LabelFixup[] fixups;
+		private int num_fixups;
+		private ModuleBuilder module;
+		private AssemblyBuilder abuilder;
+		private ISymbolWriter sym_writer;
+		private Stack scopes;
+		private int cur_block;
+		private Stack open_blocks;
+
+		internal ILGenerator (MethodBase mb, int size) {
+			if (size < 0)
+				size = 256;
+			code_len = 0;
+			code = new byte [size];
+			mbuilder = mb;
+			cur_stack = max_stack = 0;
+			num_fixups = num_labels = 0;
+			label_to_addr = new int [16];
+			fixups = new LabelFixup [16];
+			token_fixups = new ILTokenInfo [16];
+			scopes = new Stack ();
+			num_token_fixups = 0;
+			if (mb is MethodBuilder) {
+				module = (ModuleBuilder)((MethodBuilder)mb).TypeBuilder.Module;
+			} else if (mb is ConstructorBuilder) {
+				module = (ModuleBuilder)((ConstructorBuilder)mb).TypeBuilder.Module;
+			}
+			abuilder = (AssemblyBuilder)module.Assembly;
+			sym_writer = module.GetSymWriter ();
+			open_blocks = new Stack ();
+		}
+
+		private void add_token_fixup (MemberInfo mi) {
+			if (num_token_fixups == token_fixups.Length) {
+				ILTokenInfo[] ntf = new ILTokenInfo [num_token_fixups * 2];
+				token_fixups.CopyTo (ntf, 0);
+				token_fixups = ntf;
+			}
+			token_fixups [num_token_fixups].member = mi;
+			token_fixups [num_token_fixups++].code_pos = code_len;
+		}
+
+		private void make_room (int nbytes) {
+			if (code_len + nbytes < code.Length)
+				return;
+			byte[] new_code = new byte [(code_len + nbytes) * 2 + 128];
+			System.Array.Copy (code, 0, new_code, 0, code.Length);
+			code = new_code;
+		}
+		private void emit_int (int val) {
+			code [code_len++] = (byte) (val & 0xFF);
+			code [code_len++] = (byte) ((val >> 8) & 0xFF);
+			code [code_len++] = (byte) ((val >> 16) & 0xFF);
+			code [code_len++] = (byte) ((val >> 24) & 0xFF);
+		}
+		/* change to pass by ref to avoid copy */
+		private void ll_emit (OpCode opcode) {
+			/* 
+			 * there is already enough room allocated in code.
+			 */
+			// access op1 and op2 directly since the Value property is useless
+			if (opcode.Size == 2)
+				code [code_len++] = opcode.op1;
+			code [code_len++] = opcode.op2;
+			/*
+			 * We should probably keep track of stack needs here.
+			 * Or we may want to run the verifier on the code before saving it
+			 * (this may be needed anyway when the ILGenerator is not used...).
+			 */
+			switch (opcode.StackBehaviourPush) {
+			case StackBehaviour.Push1:
+			case StackBehaviour.Pushi:
+			case StackBehaviour.Pushi8:
+			case StackBehaviour.Pushr4:
+			case StackBehaviour.Pushr8:
+			case StackBehaviour.Pushref:
+			case StackBehaviour.Varpush: /* again we are conservative and assume it pushes 1 */
+				cur_stack ++;
+				break;
+			case StackBehaviour.Push1_push1:
+				cur_stack += 2;
+				break;
+			}
+			if (max_stack < cur_stack)
+				max_stack = cur_stack;
+			/* 
+			 * Note that we adjust for the pop behaviour _after_ setting max_stack.
+			 */
+			switch (opcode.StackBehaviourPop) {
+			case StackBehaviour.Varpop:
+				break; /* we are conservative and assume it doesn't decrease the stack needs */
+			case StackBehaviour.Pop1:
+			case StackBehaviour.Popi:
+			case StackBehaviour.Popref:
+				cur_stack --;
+				break;
+			case StackBehaviour.Pop1_pop1:
+			case StackBehaviour.Popi_pop1:
+			case StackBehaviour.Popi_popi:
+			case StackBehaviour.Popi_popi8:
+			case StackBehaviour.Popi_popr4:
+			case StackBehaviour.Popi_popr8:
+			case StackBehaviour.Popref_pop1:
+			case StackBehaviour.Popref_popi:
+				cur_stack -= 2;
+				break;
+			case StackBehaviour.Popi_popi_popi:
+			case StackBehaviour.Popref_popi_popi:
+			case StackBehaviour.Popref_popi_popi8:
+			case StackBehaviour.Popref_popi_popr4:
+			case StackBehaviour.Popref_popi_popr8:
+			case StackBehaviour.Popref_popi_popref:
+				cur_stack -= 3;
+				break;
+			}
+		}
+
+		private static int target_len (OpCode opcode) {
+			if (opcode.operandType == OperandType.InlineBrTarget)
+				return 4;
+			return 1;
+		}
+
+		private void InternalEndClause () {
+			switch (ex_handlers [cur_block].LastClauseType ()) {
+			case ILExceptionBlock.CATCH:
+				// how could we optimize code size here?
+				Emit (OpCodes.Leave, ex_handlers [cur_block].end);
+				break;
+			case ILExceptionBlock.FAULT:
+			case ILExceptionBlock.FINALLY:
+				Emit (OpCodes.Endfinally);
+				break;
+			case ILExceptionBlock.FILTER:
+				Emit (OpCodes.Endfilter);
+				break;
+			}
+		}
+
+		public virtual void BeginCatchBlock (Type exceptionType) {
+			if (open_blocks.Count <= 0)
+				throw new NotSupportedException ("Not in an exception block");
+			InternalEndClause ();
+			ex_handlers [cur_block].AddCatch (exceptionType, code_len);
+			//System.Console.WriteLine ("Begin catch Block: "+exceptionType.ToString());
+			//throw new NotImplementedException ();
+		}
+		public virtual void BeginExceptFilterBlock () {
+			throw new NotImplementedException ();
+		}
+		public virtual Label BeginExceptionBlock () {
+			//System.Console.WriteLine ("Begin Block");
+			
+			if (ex_handlers != null) {
+				cur_block = ex_handlers.Length;
+				ILExceptionInfo[] new_ex = new ILExceptionInfo [cur_block + 1];
+				System.Array.Copy (ex_handlers, new_ex, cur_block);
+				ex_handlers = new_ex;
+			} else {
+				ex_handlers = new ILExceptionInfo [1];
+				cur_block = 0;
+			}
+			open_blocks.Push (cur_block);
+			ex_handlers [cur_block].start = code_len;
+			return ex_handlers [cur_block].end = DefineLabel ();
+		}
+		public virtual void BeginFaultBlock() {
+			if (open_blocks.Count <= 0)
+				throw new NotSupportedException ("Not in an exception block");
+			//System.Console.WriteLine ("Begin fault Block");
+			//throw new NotImplementedException ();
+		}
+		public virtual void BeginFinallyBlock() {
+			if (open_blocks.Count <= 0)
+				throw new NotSupportedException ("Not in an exception block");
+			InternalEndClause ();
+			//System.Console.WriteLine ("Begin finally Block");
+			ex_handlers [cur_block].AddFinally (code_len);
+		}
+		public virtual void BeginScope () {
+			if (sym_writer != null)
+				scopes.Push (sym_writer.OpenScope (code_len));
+		}
+		public LocalBuilder DeclareLocal (Type localType) {
+			LocalBuilder res = new LocalBuilder (module, localType, this);
+			if (locals != null) {
+				LocalBuilder[] new_l = new LocalBuilder [locals.Length + 1];
+				System.Array.Copy (locals, new_l, locals.Length);
+				new_l [locals.Length] = res;
+				locals = new_l;
+			} else {
+				locals = new LocalBuilder [1];
+				locals [0] = res;
+			}
+			res.position = (uint)(locals.Length - 1);
+			return res;
+		}
+		public virtual Label DefineLabel () {
+			if (num_labels >= label_to_addr.Length) {
+				int[] new_l = new int [label_to_addr.Length * 2];
+				System.Array.Copy (label_to_addr, new_l, label_to_addr.Length);
+				label_to_addr = new_l;
+			}
+			label_to_addr [num_labels] = -1;
+			return new Label (num_labels++);
+		}
+		public virtual void Emit (OpCode opcode) {
+			make_room (2);
+			ll_emit (opcode);
+		}
+		public virtual void Emit (OpCode opcode, Byte val) {
+			make_room (3);
+			ll_emit (opcode);
+			code [code_len++] = val;
+		}
+		public virtual void Emit (OpCode opcode, ConstructorInfo constructor) {
+			int token = abuilder.GetToken (constructor);
+			make_room (6);
+			ll_emit (opcode);
+			if (constructor is ConstructorBuilder)
+				add_token_fixup (constructor);
+			emit_int (token);
+			ParameterInfo[] mparams = constructor.GetParameters();
+			if (mparams != null)
+				cur_stack -= mparams.Length;
+		}
+		public virtual void Emit (OpCode opcode, double val) {
+			byte[] s = System.BitConverter.GetBytes (val);
+			make_room (10);
+			ll_emit (opcode);
+			if (BitConverter.IsLittleEndian){
+				System.Array.Copy (s, 0, code, code_len, 8);
+				code_len += 8;
+			} else {
+				code [code_len++] = s [7];
+				code [code_len++] = s [6];
+				code [code_len++] = s [5];
+				code [code_len++] = s [4];
+				code [code_len++] = s [3];
+				code [code_len++] = s [2];
+				code [code_len++] = s [1];
+				code [code_len++] = s [0];				
+			}
+		}
+		public virtual void Emit (OpCode opcode, FieldInfo field) {
+			int token = abuilder.GetToken (field);
+			make_room (6);
+			ll_emit (opcode);
+			if (field is FieldBuilder)
+				add_token_fixup (field);
+			emit_int (token);
+		}
+		public virtual void Emit (OpCode opcode, Int16 val) {
+			make_room (4);
+			ll_emit (opcode);
+			code [code_len++] = (byte) (val & 0xFF);
+			code [code_len++] = (byte) ((val >> 8) & 0xFF);
+		}
+		public virtual void Emit (OpCode opcode, int val) {
+			make_room (6);
+			ll_emit (opcode);
+			emit_int (val);
+		}
+		public virtual void Emit (OpCode opcode, long val) {
+			make_room (10);
+			ll_emit (opcode);
+			code [code_len++] = (byte) (val & 0xFF);
+			code [code_len++] = (byte) ((val >> 8) & 0xFF);
+			code [code_len++] = (byte) ((val >> 16) & 0xFF);
+			code [code_len++] = (byte) ((val >> 24) & 0xFF);
+			code [code_len++] = (byte) ((val >> 32) & 0xFF);
+			code [code_len++] = (byte) ((val >> 40) & 0xFF);
+			code [code_len++] = (byte) ((val >> 48) & 0xFF);
+			code [code_len++] = (byte) ((val >> 56) & 0xFF);
+		}
+		public virtual void Emit (OpCode opcode, Label label) {
+			int tlen = target_len (opcode);
+			make_room (6);
+			ll_emit (opcode);
+			if (num_fixups >= fixups.Length) {
+				LabelFixup[] newf = new LabelFixup [fixups.Length + 16];
+				System.Array.Copy (fixups, newf, fixups.Length);
+				fixups = newf;
+			}
+			fixups [num_fixups].size = tlen;
+			fixups [num_fixups].pos = code_len;
+			fixups [num_fixups].label_base = code_len;
+			fixups [num_fixups].label_idx = label.label;
+			num_fixups++;
+			code_len += tlen;
+
+		}
+		public virtual void Emit (OpCode opcode, Label[] labels) {
+			/* opcode needs to be switch. */
+			int count = labels.Length;
+			make_room (6 + count * 4);
+			ll_emit (opcode);
+			int switch_base = code_len + count*4;
+			emit_int (count);
+			if (num_fixups + count >= fixups.Length) {
+				LabelFixup[] newf = new LabelFixup [fixups.Length + count + 16];
+				System.Array.Copy (fixups, newf, fixups.Length);
+				fixups = newf;
+			}
+			for (int i = 0; i < count; ++i) {
+				fixups [num_fixups].size = 4;
+				fixups [num_fixups].pos = code_len;
+				fixups [num_fixups].label_base = switch_base;
+				fixups [num_fixups].label_idx = labels [i].label;
+				num_fixups++;
+				code_len += 4;
+			}
+		}
+		public virtual void Emit (OpCode opcode, LocalBuilder lbuilder) {
+			uint pos = lbuilder.position;
+			bool load_addr = false;
+			bool is_store = false;
+			make_room (6);
+
+			if (lbuilder.ilgen != this)
+				throw new Exception ("Trying to emit a local from a different ILGenerator.");
+
+			/* inline the code from ll_emit () to optimize il code size */
+			if (opcode.StackBehaviourPop == StackBehaviour.Pop1) {
+				cur_stack --;
+				is_store = true;
+			} else {
+				cur_stack++;
+				if (cur_stack > max_stack)
+					max_stack = cur_stack;
+				load_addr = opcode.StackBehaviourPush == StackBehaviour.Pushi;
+			}
+			if (load_addr) {
+				if (pos < 256) {
+					code [code_len++] = (byte)0x12;
+					code [code_len++] = (byte)pos;
+				} else {
+					code [code_len++] = (byte)0xfe;
+					code [code_len++] = (byte)0x0d;
+					code [code_len++] = (byte)(pos & 0xff);
+					code [code_len++] = (byte)((pos >> 8) & 0xff);
+				}
+			} else {
+				if (is_store) {
+					if (pos < 4) {
+						code [code_len++] = (byte)(0x0a + pos);
+					} else if (pos < 256) {
+						code [code_len++] = (byte)0x13;
+						code [code_len++] = (byte)pos;
+					} else {
+						code [code_len++] = (byte)0xfe;
+						code [code_len++] = (byte)0x0e;
+						code [code_len++] = (byte)(pos & 0xff);
+						code [code_len++] = (byte)((pos >> 8) & 0xff);
+					}
+				} else {
+					if (pos < 4) {
+						code [code_len++] = (byte)(0x06 + pos);
+					} else if (pos < 256) {
+						code [code_len++] = (byte)0x11;
+						code [code_len++] = (byte)pos;
+					} else {
+						code [code_len++] = (byte)0xfe;
+						code [code_len++] = (byte)0x0c;
+						code [code_len++] = (byte)(pos & 0xff);
+						code [code_len++] = (byte)((pos >> 8) & 0xff);
+					}
+				}
+			}
+		}
+		public virtual void Emit (OpCode opcode, MethodInfo method) {
+			int token = abuilder.GetToken (method);
+			make_room (6);
+			ll_emit (opcode);
+			if (method is MethodBuilder)
+				add_token_fixup (method);
+			emit_int (token);
+			if (method.ReturnType != void_type)
+				cur_stack ++;
+			ParameterInfo[] mparams = method.GetParameters();
+			if (mparams != null)
+				cur_stack -= mparams.Length;
+		}
+		[CLSCompliant(false)]
+		public void Emit (OpCode opcode, sbyte val) {
+			make_room (3);
+			ll_emit (opcode);
+			code [code_len++] = (byte)val;
+		}
+
+		[MonoTODO]
+		public virtual void Emit (OpCode opcode, SignatureHelper shelper) {
+			int token = 0; // FIXME: request a token from the modulebuilder
+			make_room (6);
+			ll_emit (opcode);
+			emit_int (token);
+		}
+		public virtual void Emit (OpCode opcode, float val) {
+			byte[] s = System.BitConverter.GetBytes (val);
+			make_room (6);
+			ll_emit (opcode);
+			if (BitConverter.IsLittleEndian){
+				System.Array.Copy (s, 0, code, code_len, 4);
+				code_len += 4;
+			} else {
+				code [code_len++] = s [3];
+				code [code_len++] = s [2];
+				code [code_len++] = s [1];
+				code [code_len++] = s [0];				
+			}
+		}
+		public virtual void Emit (OpCode opcode, string val) {
+			int token = abuilder.GetToken (val);
+			make_room (6);
+			ll_emit (opcode);
+			emit_int (token);
+		}
+		public virtual void Emit (OpCode opcode, Type type) {
+			make_room (6);
+			ll_emit (opcode);
+			if (type is TypeBuilder)
+				add_token_fixup (type);
+			emit_int (abuilder.GetToken (type));
+		}
+
+		public void EmitCall (OpCode opcode, MethodInfo methodinfo, Type[] optionalParamTypes) {
+			throw new NotImplementedException ();
+		}
+		public void EmitCalli (OpCode opcode, CallingConventions call_conv, Type returnType, Type[] paramTypes, Type[] optionalParamTypes) {
+			throw new NotImplementedException ();
+		}
+
+		public virtual void EmitWriteLine (FieldInfo field) {
+			throw new NotImplementedException ();
+		}
+		public virtual void EmitWriteLine (LocalBuilder lbuilder) {
+			throw new NotImplementedException ();
+		}
+		public virtual void EmitWriteLine (string val) {
+			throw new NotImplementedException ();
+		}
+
+		public virtual void EndExceptionBlock () {
+			if (open_blocks.Count <= 0)
+				throw new NotSupportedException ("Not in an exception block");
+			InternalEndClause ();
+			MarkLabel (ex_handlers [cur_block].end);
+			ex_handlers [cur_block].End (code_len);
+			ex_handlers [cur_block].Debug (cur_block);
+			//System.Console.WriteLine ("End Block {0} (handlers: {1})", cur_block, ex_handlers [cur_block].NumHandlers ());
+			open_blocks.Pop ();
+			if (open_blocks.Count > 0)
+				cur_block = (int)open_blocks.Peek ();
+			//Console.WriteLine ("curblock restored to {0}", cur_block);
+			//throw new NotImplementedException ();
+		}
+		public virtual void EndScope () {
+			if (sym_writer != null) {
+				sym_writer.CloseScope (code_len);
+				scopes.Pop ();
+			}
+		}
+		public virtual void MarkLabel (Label loc) {
+			if (loc.label < 0 || loc.label >= num_labels)
+				throw new System.ArgumentException ("The label is not valid");
+			if (label_to_addr [loc.label] >= 0)
+				throw new System.ArgumentException ("The label was already defined");
+			label_to_addr [loc.label] = code_len;
+		}
+		public virtual void MarkSequencePoint (ISymbolDocumentWriter document, int startLine,
+						       int startColumn, int endLine, int endColumn) {
+			if (sym_writer == null)
+				return;
+
+			int[] offsets = { code_len };
+			int[] startLines = { startLine };
+			int[] startColumns = { startColumn };
+			int[] endLines = { endLine };
+			int[] endColumns = { endColumn };
+
+			sym_writer.DefineSequencePoints (document, offsets, startLines, startColumns,
+							 endLines, endColumns);
+		}
+		public virtual void ThrowException (Type exceptionType) {
+			throw new NotImplementedException ();
+		}
+		public void UsingNamespace (String usingNamespace) {
+			throw new NotImplementedException ();
+		}
+
+		internal void label_fixup () {
+			int i;
+			for (i = 0; i < num_fixups; ++i) {
+				int diff = label_to_addr [fixups [i].label_idx] - fixups [i].label_base;
+				if (fixups [i].size == 1) {
+					code [fixups [i].pos] = (byte)((sbyte) diff - 1);
+				} else {
+					int old_cl = code_len;
+					code_len = fixups [i].pos;
+					emit_int (diff - 4);
+					code_len = old_cl;
+				}
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/Label.cs b/mcs/class/corlib/System.Reflection.Emit/Label.cs
new file mode 100644
index 00000000000..19be26c6dea
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/Label.cs
@@ -0,0 +1,29 @@
+//
+// System.Reflection.Emit/Label.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Reflection.Emit {
+	[Serializable]
+	public struct Label {
+		internal int label;
+
+		internal Label (int val) {
+			label = val;
+		}
+
+		[MonoTODO]
+		public override bool Equals (object obj) {
+			/* FIXME */
+			return false;
+		}
+
+		public override int GetHashCode () {
+			return label.GetHashCode ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/LocalBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/LocalBuilder.cs
new file mode 100755
index 00000000000..9e8fd9dabd1
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/LocalBuilder.cs
@@ -0,0 +1,64 @@
+
+//
+// System.Reflection.Emit/LocalBuilder.cs
+//
+// Authors:
+//   Paolo Molaro (lupus@ximian.com)
+//   Martin Baulig (martin@gnome.org)
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001, 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Diagnostics.SymbolStore;
+
+namespace System.Reflection.Emit {
+	public sealed class LocalBuilder {
+		//
+		// These are kept in sync with reflection.h
+		//
+		#region Sync with reflection.h
+		private Type type;
+		private string name;
+		#endregion
+		
+		//
+		// Order does not matter after here
+		//
+		private ModuleBuilder module;
+		internal uint position;
+		internal ILGenerator ilgen;
+
+		internal LocalBuilder (ModuleBuilder m, Type t, ILGenerator ilgen)
+		{
+			this.module = m;
+			this.type = t;
+			this.ilgen = ilgen;
+		}
+		public void SetLocalSymInfo (string lname, int startOffset, int endOffset)
+		{
+			this.name = lname;
+
+			module.SymWriter_DefineLocalVariable (lname, this, FieldAttributes.Private,
+							      (int) position, startOffset, endOffset);
+		}
+
+		public void SetLocalSymInfo (string lname)
+		{
+			SetLocalSymInfo (lname, 0, 0);
+		}
+
+
+		public Type LocalType
+		{
+			get {
+				return type;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
new file mode 100755
index 00000000000..e00a3b99ba0
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/MethodBuilder.cs
@@ -0,0 +1,182 @@
+
+//
+// System.Reflection.Emit/MethodBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection.Emit {
+	public sealed class MethodBuilder : MethodInfo {
+		private RuntimeMethodHandle mhandle;
+		private Type rtype;
+		private Type[] parameters;
+		private MethodAttributes attrs;
+		private MethodImplAttributes iattrs;
+		private string name;
+		private int table_idx;
+		private byte[] code;
+		private ILGenerator ilgen;
+		private TypeBuilder type;
+		private ParameterBuilder[] pinfo;
+		private CustomAttributeBuilder[] cattrs;
+		private MethodInfo override_method;
+		private string pi_dll;
+		private string pi_entry;
+		private CharSet ncharset;
+		private CallingConvention native_cc;
+		private CallingConventions call_conv;
+		private bool init_locals = true;
+
+		internal MethodBuilder (TypeBuilder tb, string name, MethodAttributes attributes, CallingConventions callingConvention, Type returnType, Type[] parameterTypes) {
+			this.name = name;
+			this.attrs = attributes;
+			this.call_conv = callingConvention;
+			this.rtype = returnType;
+			if (parameterTypes != null) {
+				this.parameters = new Type [parameterTypes.Length];
+				System.Array.Copy (parameterTypes, this.parameters, parameterTypes.Length);
+			}
+			type = tb;
+			table_idx = get_next_table_index (this, 0x06, true);
+			//Console.WriteLine ("index for "+name+" set to "+table_idx.ToString());
+		}
+
+		internal MethodBuilder (TypeBuilder tb, string name, MethodAttributes attributes, 
+			CallingConventions callingConvention, Type returnType, Type[] parameterTypes, 
+			String dllName, String entryName, CallingConvention nativeCConv, CharSet nativeCharset) 
+			: this (tb, name, attributes, callingConvention, returnType, parameterTypes) {
+			pi_dll = dllName;
+			pi_entry = entryName;
+			native_cc = nativeCConv;
+			ncharset = nativeCharset;
+		}
+
+		public bool InitLocals {
+			get {return init_locals;}
+			set {init_locals = value;}
+		}
+
+		internal TypeBuilder TypeBuilder {
+			get {return type;}
+		}
+		
+		public override Type ReturnType {get {return rtype;}}
+		public override Type ReflectedType {get {return type;}}
+		public override Type DeclaringType {get {return type;}}
+		public override string Name {get {return name;}}
+		public override RuntimeMethodHandle MethodHandle {get {return mhandle;}}
+		public override MethodAttributes Attributes {get {return attrs;}}
+		public override ICustomAttributeProvider ReturnTypeCustomAttributes {
+			get {return null;}
+		}
+		public MethodToken GetToken() {
+			return new MethodToken(0x06000000 | table_idx);
+		}
+		
+		public override MethodInfo GetBaseDefinition() {
+			return null;
+		}
+		public override MethodImplAttributes GetMethodImplementationFlags() {
+			return iattrs;
+		}
+		public override ParameterInfo[] GetParameters() {
+			if ((parameters == null) || (pinfo == null))
+				return null;
+
+			ParameterInfo[] retval = new ParameterInfo [parameters.Length];
+			for (int i = 1; i < parameters.Length + 1; i++) {
+				if (pinfo [i] == null)
+					return null;
+
+				retval [i - 1] = new ParameterInfo (pinfo [i], parameters [i - 1], this);
+			}
+
+			return retval;
+		}
+		
+		public void CreateMethodBody( byte[] il, int count) {
+			code = new byte [count];
+			System.Array.Copy(il, code, count);
+		}
+		public override Object Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) {
+			return null;
+		}
+		public override bool IsDefined (Type attribute_type, bool inherit) {
+			return false;
+		}
+		public override object[] GetCustomAttributes( bool inherit) {
+			return null;
+		}
+		public override object[] GetCustomAttributes( Type attributeType, bool inherit) {
+			return null;
+		}
+		public ILGenerator GetILGenerator () {
+			return GetILGenerator (256);
+		}
+		public ILGenerator GetILGenerator (int size) {
+			ilgen = new ILGenerator (this, size);
+			return ilgen;
+		}
+		
+		[MonoTODO]
+		public ParameterBuilder DefineParameter (int position, ParameterAttributes attributes, string strParamName)
+		{
+			ParameterBuilder pb = new ParameterBuilder (this, position, attributes, strParamName);
+			// check position
+			if (pinfo == null)
+				pinfo = new ParameterBuilder [parameters.Length + 1];
+			pinfo [position] = pb;
+			return pb;
+		}
+
+		internal void fixup () {
+			if (ilgen != null)
+				ilgen.label_fixup ();
+		}
+
+		public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+			string attrname = customBuilder.Ctor.ReflectedType.FullName;
+			if (attrname == "System.Runtime.CompilerServices.MethodImplAttribute") {
+				byte[] data = customBuilder.Data;
+				int impla; // the (stupid) ctor takes a short or an int ... 
+				impla = (int)data [2];
+				impla |= ((int)data [3]) << 8;
+				SetImplementationFlags ((MethodImplAttributes)impla);
+				return;
+			}
+			if (cattrs != null) {
+				CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
+				cattrs.CopyTo (new_array, 0);
+				new_array [cattrs.Length] = customBuilder;
+				cattrs = new_array;
+			} else {
+				cattrs = new CustomAttributeBuilder [1];
+				cattrs [0] = customBuilder;
+			}
+		}
+		public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+			SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
+		}
+		public void SetImplementationFlags( MethodImplAttributes attributes) {
+			iattrs = attributes;
+		}
+		internal override int get_next_table_index (object obj, int table, bool inc) {
+			return type.get_next_table_index (obj, table, inc);
+		}
+
+		internal void set_override (MethodInfo mdecl) {
+			override_method = mdecl;
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/MethodToken.cs b/mcs/class/corlib/System.Reflection.Emit/MethodToken.cs
new file mode 100644
index 00000000000..a08d4247571
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/MethodToken.cs
@@ -0,0 +1,70 @@
+// MethodToken.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+
+	/// <summary>
+	///  Represents the Token returned by the metadata to represent a Method.
+	/// </summary>
+	[Serializable]
+	public struct MethodToken {
+
+		internal int tokValue;
+
+		public static readonly MethodToken Empty;
+
+
+		static MethodToken ()
+		{
+			Empty = new MethodToken ();
+		}
+
+
+		internal MethodToken (int val)
+		{
+			tokValue = val;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public override bool Equals (object obj)
+		{
+			bool res = obj is MethodToken;
+
+			if (res) {
+				MethodToken that = (MethodToken) obj;
+				res = (this.tokValue == that.tokValue);
+			}
+
+			return res;
+		}
+
+
+		/// <summary>
+		///  Tests whether the given object is an instance of
+		///  MethodToken and has the same token value.
+		/// </summary>
+		public override int GetHashCode ()
+		{
+			return tokValue;
+		}
+
+
+		/// <summary>
+		///  Returns the metadata token for this Method.
+		/// </summary>
+		public int Token {
+			get {
+				return tokValue;
+			}
+		}
+
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
new file mode 100644
index 00000000000..3186d949cfd
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/ModuleBuilder.cs
@@ -0,0 +1,294 @@
+
+//
+// System.Reflection.Emit/ModuleBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Diagnostics.SymbolStore;
+using System.IO;
+
+namespace System.Reflection.Emit {
+	public class ModuleBuilder : Module {
+		private TypeBuilder[] types;
+		private CustomAttributeBuilder[] cattrs;
+		private byte[] guid;
+		private int table_idx;
+		internal AssemblyBuilder assemblyb;
+		private ISymbolWriter symbol_writer;
+		private MethodInfo symwriter_define_local;
+		Hashtable name_cache;
+
+		internal ModuleBuilder (AssemblyBuilder assb, string name, string fullyqname, bool emitSymbolInfo) {
+			this.name = this.scopename = name;
+			this.fqname = fullyqname;
+			this.assembly = this.assemblyb = assb;
+			guid = Guid.NewGuid().ToByteArray ();
+			table_idx = get_next_table_index (this, 0x00, true);
+			name_cache = new Hashtable ();
+
+			if (emitSymbolInfo)
+				GetSymbolWriter (fullyqname);
+		}
+
+		internal void GetSymbolWriter (string filename)
+		{
+			Assembly assembly;
+			try {
+				assembly = Assembly.Load ("Mono.CSharp.Debugger");
+			} catch (FileNotFoundException) {
+				return;
+			}
+
+			Type type = assembly.GetType ("Mono.CSharp.Debugger.MonoSymbolWriter");
+			if (type == null)
+				return;
+
+			if (assemblyb.methods == null)
+				assemblyb.methods = new ArrayList ();
+
+			// First get the constructor.
+			{
+				Type[] arg_types = new Type [3];
+				arg_types [0] = typeof (ModuleBuilder);
+				arg_types [1] = typeof (string);
+				arg_types [2] = typeof (ArrayList);
+				ConstructorInfo constructor = type.GetConstructor (arg_types);
+
+				object[] args = new object [3];
+				args [0] = this;
+				args [1] = filename;
+				args [2] = assemblyb.methods;
+
+				if (constructor == null)
+					return;
+
+				Object instance = constructor.Invoke (args);
+				if (instance == null)
+					return;
+
+				if (!(instance is ISymbolWriter))
+					return;
+
+				symbol_writer = (ISymbolWriter) instance;
+			}
+
+			// Get the DefineLocalVariable method.
+			{
+				Type[] arg_types = new Type [6];
+				arg_types [0] = typeof (string);
+				arg_types [1] = typeof (LocalBuilder);
+				arg_types [2] = typeof (FieldAttributes);
+				arg_types [3] = typeof (int);
+				arg_types [4] = typeof (int);
+				arg_types [5] = typeof (int);
+
+				symwriter_define_local = type.GetMethod ("DefineLocalVariable", arg_types);
+
+				if (symwriter_define_local == null)
+					throw new NotSupportedException ();
+			}
+		}
+
+		internal void SymWriter_DefineLocalVariable (string name, LocalBuilder local,
+							     FieldAttributes attributes,
+							     int position, int startOffset, int endOffset)
+		{
+			if ((symbol_writer == null) || (symwriter_define_local == null))
+				return;
+
+			object[] args = new object [6];
+			args [0] = name;
+			args [1] = local;
+			args [2] = attributes;
+			args [3] = position;
+			args [4] = startOffset;
+			args [5] = endOffset;
+
+			symwriter_define_local.Invoke (symbol_writer, args);
+		}							     
+	
+		public override string FullyQualifiedName {get { return fqname;}}
+
+		[MonoTODO]
+		public TypeBuilder DefineType (string name) {
+			// FIXME: LAMESPEC: what other attributes should we use here as default?
+			return DefineType (name, TypeAttributes.Public, typeof(object), null);
+		}
+
+		public TypeBuilder DefineType (string name, TypeAttributes attr) {
+			return DefineType (name, attr, typeof(object), null);
+		}
+
+		public TypeBuilder DefineType (string name, TypeAttributes attr, Type parent) {
+			return DefineType (name, attr, parent, null);
+		}
+
+		private TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, Type[] interfaces, PackingSize packsize, int typesize) {
+			TypeBuilder res = new TypeBuilder (this, name, attr, parent, interfaces, packsize, typesize);
+			if (types != null) {
+				TypeBuilder[] new_types = new TypeBuilder [types.Length + 1];
+				System.Array.Copy (types, new_types, types.Length);
+				new_types [types.Length] = res;
+				types = new_types;
+			} else {
+				types = new TypeBuilder [1];
+				types [0] = res;
+			}
+			name_cache.Add (name, res);
+			return res;
+		}
+
+		public TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, Type[] interfaces) {
+			return DefineType (name, attr, parent, interfaces, PackingSize.Unspecified, TypeBuilder.UnspecifiedTypeSize);
+		}
+
+		public TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, int typesize) {
+			return DefineType (name, attr, parent, null, PackingSize.Unspecified, TypeBuilder.UnspecifiedTypeSize);
+		}
+
+		public TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, PackingSize packsize) {
+			return DefineType (name, attr, parent, null, packsize, TypeBuilder.UnspecifiedTypeSize);
+		}
+
+		public TypeBuilder DefineType (string name, TypeAttributes attr, Type parent, PackingSize packsize, int typesize) {
+			return DefineType (name, attr, parent, null, packsize, typesize);
+		}
+
+		public MethodInfo GetArrayMethod( Type arrayClass, string methodName, CallingConventions callingConvention, Type returnType, Type[] parameterTypes) {
+			return new MonoArrayMethod (arrayClass, methodName, callingConvention, returnType, parameterTypes);
+		}
+
+		public EnumBuilder DefineEnum( string name, TypeAttributes visibility, Type underlyingType) {
+			EnumBuilder eb = new EnumBuilder (this, name, visibility, underlyingType);
+			return eb;
+		}
+
+		public override Type GetType( string className) {
+			return GetType (className, false, false);
+		}
+		
+		public override Type GetType( string className, bool ignoreCase) {
+			return GetType (className, false, ignoreCase);
+		}
+
+		private TypeBuilder search_in_array (TypeBuilder[] arr, string className, bool ignoreCase) {
+			int i;
+			if (arr == types && !ignoreCase)
+				return (TypeBuilder)name_cache [className];
+			for (i = 0; i < arr.Length; ++i) {
+				if (String.Compare (className, arr [i].FullName, ignoreCase) == 0) {
+					return arr [i];
+				}
+			}
+			return null;
+		}
+
+		private TypeBuilder search_nested_in_array (TypeBuilder[] arr, string className, bool ignoreCase) {
+			int i;
+			for (i = 0; i < arr.Length; ++i) {
+				if (String.Compare (className, arr [i].Name, ignoreCase) == 0)
+					return arr [i];
+			}
+			return null;
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern Type create_modified_type (TypeBuilder tb, string modifiers);
+
+		static char[] type_modifiers = {'&', '[', '*'};
+
+		private TypeBuilder GetMaybeNested (TypeBuilder t, string className, bool ignoreCase) {
+			int subt;
+			string pname, rname;
+
+			subt = className.IndexOf ('+');
+			if (subt < 0) {
+				if (t.subtypes != null)
+					return search_nested_in_array (t.subtypes, className, ignoreCase);
+				return null;
+			}
+			if (t.subtypes != null) {
+				pname = className.Substring (0, subt);
+				rname = className.Substring (subt + 1);
+				TypeBuilder result = search_nested_in_array (t.subtypes, pname, ignoreCase);
+				if (result != null)
+					return GetMaybeNested (result, rname, ignoreCase);
+			}
+			return null;
+		}
+		
+		public override Type GetType( string className, bool throwOnError, bool ignoreCase) {
+			int subt;
+			string orig = className;
+			string modifiers;
+			TypeBuilder result = null;
+
+			if (types == null && throwOnError)
+				throw new TypeLoadException (className);
+
+			subt = className.IndexOfAny (type_modifiers);
+			if (subt >= 0) {
+				modifiers = className.Substring (subt);
+				className = className.Substring (0, subt);
+			} else
+				modifiers = null;
+			
+			subt = className.IndexOf ('+');
+			if (subt < 0) {
+				if (types != null)
+					result = search_in_array (types, className, ignoreCase);
+			} else {
+				string pname, rname;
+				pname = className.Substring (0, subt);
+				rname = className.Substring (subt + 1);
+				result = search_in_array (types, pname, ignoreCase);
+				if (result != null)
+					result = GetMaybeNested (result, rname, ignoreCase);
+			}
+			if ((result == null) && throwOnError)
+				throw new TypeLoadException (orig);
+			if (result != null && (modifiers != null))
+				return create_modified_type (result, modifiers);
+			return result;
+		}
+
+		internal int get_next_table_index (object obj, int table, bool inc) {
+			return assemblyb.get_next_table_index (obj, table, inc);
+		}
+
+		public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+			if (cattrs != null) {
+				CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
+				cattrs.CopyTo (new_array, 0);
+				new_array [cattrs.Length] = customBuilder;
+				cattrs = new_array;
+			} else {
+				cattrs = new CustomAttributeBuilder [1];
+				cattrs [0] = customBuilder;
+			}
+		}
+		public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+			SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
+		}
+
+		public ISymbolWriter GetSymWriter () {
+			return symbol_writer;
+		}
+
+		public ISymbolDocumentWriter DefineDocument (string url, Guid language, Guid languageVendor, Guid documentType) {
+			if (symbol_writer == null)
+				throw new InvalidOperationException ();
+
+			return symbol_writer.DefineDocument (url, language, languageVendor, documentType);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/MonoArrayMethod.cs b/mcs/class/corlib/System.Reflection.Emit/MonoArrayMethod.cs
new file mode 100755
index 00000000000..130cd3e5623
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/MonoArrayMethod.cs
@@ -0,0 +1,111 @@
+//
+// System.Reflection/MonoMethod.cs
+// The class used to represent methods from the mono runtime.
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection {
+	internal class MonoArrayMethod: MethodInfo {
+		internal RuntimeMethodHandle mhandle;
+		internal Type parent;
+		internal Type ret;
+		internal Type[] parameters;
+		internal string name;
+		internal int table_idx;
+		internal CallingConventions call_conv;
+
+		internal MonoArrayMethod (Type arrayClass, string methodName, CallingConventions callingConvention, Type returnType, Type[] parameterTypes) {
+			name = methodName;
+			parent = arrayClass;
+			ret = returnType;
+			parameters = (Type[])parameterTypes.Clone();
+			call_conv = callingConvention;
+		}
+		
+		[MonoTODO]
+		public override MethodInfo GetBaseDefinition() {
+			return this; /* FIXME */
+		}
+		public override Type ReturnType {
+			get {
+				return ret;
+			}
+		}
+		[MonoTODO]
+		public override ICustomAttributeProvider ReturnTypeCustomAttributes { 
+			get {return null;}
+		}
+		
+		[MonoTODO]
+		public override MethodImplAttributes GetMethodImplementationFlags() {
+			return (MethodImplAttributes)0;
+		}
+
+		[MonoTODO]
+		public override ParameterInfo[] GetParameters() {
+			return new ParameterInfo [0];
+		}
+
+		[MonoTODO]
+		public override Object Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) {
+			throw new NotImplementedException ();
+		}
+
+		public override RuntimeMethodHandle MethodHandle { 
+			get {return mhandle;} 
+		}
+		[MonoTODO]
+		public override MethodAttributes Attributes { 
+			get {
+				return (MethodAttributes)0;
+			} 
+		}
+		
+		public override Type ReflectedType {
+			get {
+				return parent;
+			}
+		}
+		public override Type DeclaringType {
+			get {
+				return parent;
+			}
+		}
+		public override string Name {
+			get {
+				return name;
+			}
+		}
+		
+		public override bool IsDefined (Type attributeType, bool inherit) {
+			return MonoCustomAttrs.IsDefined (this, attributeType, inherit);
+		}
+
+		public override object[] GetCustomAttributes( bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, inherit);
+		}
+		public override object[] GetCustomAttributes( Type attributeType, bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
+		}
+
+		public override string ToString () {
+			string parms = "";
+			ParameterInfo[] p = GetParameters ();
+			for (int i = 0; i < p.Length; ++i) {
+				if (i > 0)
+					parms = parms + ", ";
+				parms = parms + p [i].ParameterType.Name;
+			}
+			return ReturnType.Name+" "+Name+"("+parms+")";
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/OpCode.cs b/mcs/class/corlib/System.Reflection.Emit/OpCode.cs
new file mode 100644
index 00000000000..239091fbaa2
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/OpCode.cs
@@ -0,0 +1,129 @@
+//
+// System.Reflection.Emit.OpCode
+//
+// Author:
+//   Sergey Chaban (serge@wildwestsoftware.com)
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+
+namespace System.Reflection.Emit {
+
+	public struct OpCode {
+
+		internal string name;
+		internal int size;
+		internal OpCodeType type;
+		internal OperandType operandType;
+		internal StackBehaviour pop;
+		internal StackBehaviour push;
+		internal FlowControl flowCtrl;
+		internal byte op1;
+		internal byte op2;
+
+		internal OpCode (string name, int size,
+		                 OpCodeType opcodeType,
+		                 OperandType operandType,
+                                 StackBehaviour pop,
+                                 StackBehaviour push,
+		                 FlowControl flowCtrl,
+		                 byte op1, byte op2)
+		{
+			this.name = name;
+			this.size = size;
+			this.type = opcodeType;
+			this.operandType = operandType;
+			this.pop = pop;
+			this.push = push;
+			this.flowCtrl = flowCtrl;
+			this.op1 = op1;
+			this.op2 = op2;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public string Name {
+			get {
+				return name;
+			}
+		}
+
+		/// <summary>
+		/// </summary>
+		public int Size {
+			get {
+				return size;
+			}
+		}
+
+
+		/// <summary>
+		/// </summary>
+		public OpCodeType OpCodeType {
+			get {
+				return type;
+			}
+		}
+
+		/// <summary>
+		/// </summary>
+		public OperandType OperandType {
+			get {
+				return operandType;
+			}
+		}
+
+		/// <summary>
+		/// </summary>
+		public FlowControl FlowControl {
+			get {
+				return flowCtrl;
+			}
+		}
+
+
+		/// <summary>
+		/// </summary>
+		public StackBehaviour StackBehaviourPop {
+			get {
+				return pop;
+			}
+		}
+
+
+		/// <summary>
+		/// </summary>
+		public StackBehaviour StackBehaviourPush {
+			get {
+				return push;
+			}
+		}
+
+
+		/// <summary>
+		/// </summary>
+		public short Value {
+			get {
+				if (size == 1) {
+					return op2;
+				} else {
+					// two byte instruction - combine
+					// give the same values as the mscorlib impl
+					// this makes the Value property useless
+					return (short) ((op1 << 2) | op2);
+				}
+			}
+		}
+
+		public override string ToString()
+		{
+			return Name;
+		}
+	} // OpCode
+
+} // System.Reflection.Emit
diff --git a/mcs/class/corlib/System.Reflection.Emit/OpCodeType.cs b/mcs/class/corlib/System.Reflection.Emit/OpCodeType.cs
new file mode 100644
index 00000000000..2733369ecbe
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/OpCodeType.cs
@@ -0,0 +1,49 @@
+// OpCodeType.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+	/// <summary>
+	///  Describes the types of MSIL instructions.
+	/// </summary>
+	public enum OpCodeType {
+
+		/// <summary>
+		///  "Ignorable" instruction.
+		///  Such instruction are used to supply
+		///  additional information to particular
+		///  MSIL processor.
+		/// </summary>
+		Annotation = 0,
+
+		/// <summary>
+		///  Denotes "shorthand" instruction.
+		///  Such instructions take less space
+		///  than their full-size equivalents
+		///  (ex. ldarg.0 vs. ldarg 0).
+		/// </summary>
+		Macro = 1,
+
+		/// <summary>
+		///  Denotes instruction reserved for internal use.
+		/// </summary>
+		Nternal = 2,
+
+		/// <summary>
+		///  Denotes instruction to deal with objects.
+		///  (ex. ldobj).
+		/// </summary>
+		Objmodel = 3,
+
+		/// <summary>
+		/// </summary>
+		Prefix = 4,
+
+		/// <summary>
+		/// </summary>
+		Primitive = 5
+	}
+
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs b/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs
new file mode 100644
index 00000000000..1626d3f4ddb
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/OpCodes.cs
@@ -0,0 +1,486 @@
+// OpCodes.cs
+// Mechanically generated  - DO NOT EDIT!
+//
+// (C) Sergey Chaban (serge@wildwestsoftware.com)
+
+using System;
+using System.Reflection.Emit;
+
+namespace System.Reflection.Emit {
+
+
+	public class OpCodes {
+		public static readonly OpCode Add;
+  		public static readonly OpCode Add_Ovf;
+  		public static readonly OpCode Add_Ovf_Un;
+  		public static readonly OpCode And;
+  		public static readonly OpCode Arglist;
+  		public static readonly OpCode Beq;
+  		public static readonly OpCode Beq_S;
+  		public static readonly OpCode Bge;
+  		public static readonly OpCode Bge_S;
+  		public static readonly OpCode Bge_Un;
+  		public static readonly OpCode Bge_Un_S;
+  		public static readonly OpCode Bgt;
+  		public static readonly OpCode Bgt_S;
+  		public static readonly OpCode Bgt_Un;
+  		public static readonly OpCode Bgt_Un_S;
+  		public static readonly OpCode Ble;
+  		public static readonly OpCode Ble_S;
+  		public static readonly OpCode Ble_Un;
+  		public static readonly OpCode Ble_Un_S;
+  		public static readonly OpCode Blt;
+  		public static readonly OpCode Blt_S;
+  		public static readonly OpCode Blt_Un;
+  		public static readonly OpCode Blt_Un_S;
+  		public static readonly OpCode Bne_Un;
+  		public static readonly OpCode Bne_Un_S;
+  		public static readonly OpCode Box;
+  		public static readonly OpCode Boxval;
+  		public static readonly OpCode Br;
+  		public static readonly OpCode Br_S;
+  		public static readonly OpCode Break;
+  		public static readonly OpCode Brfalse;
+  		public static readonly OpCode Brfalse_S;
+  		public static readonly OpCode Brtrue;
+  		public static readonly OpCode Brtrue_S;
+  		public static readonly OpCode Call;
+  		public static readonly OpCode Calli;
+  		public static readonly OpCode Callvirt;
+  		public static readonly OpCode Castclass;
+  		public static readonly OpCode Ceq;
+  		public static readonly OpCode Cgt;
+  		public static readonly OpCode Cgt_Un;
+  		public static readonly OpCode Ckfinite;
+  		public static readonly OpCode Clt;
+  		public static readonly OpCode Clt_Un;
+  		public static readonly OpCode Conv_I;
+  		public static readonly OpCode Conv_I1;
+  		public static readonly OpCode Conv_I2;
+  		public static readonly OpCode Conv_I4;
+  		public static readonly OpCode Conv_I8;
+  		public static readonly OpCode Conv_Ovf_I;
+  		public static readonly OpCode Conv_Ovf_I_Un;
+  		public static readonly OpCode Conv_Ovf_I1;
+  		public static readonly OpCode Conv_Ovf_I1_Un;
+  		public static readonly OpCode Conv_Ovf_I2;
+  		public static readonly OpCode Conv_Ovf_I2_Un;
+  		public static readonly OpCode Conv_Ovf_I4;
+  		public static readonly OpCode Conv_Ovf_I4_Un;
+  		public static readonly OpCode Conv_Ovf_I8;
+  		public static readonly OpCode Conv_Ovf_I8_Un;
+  		public static readonly OpCode Conv_Ovf_U;
+  		public static readonly OpCode Conv_Ovf_U_Un;
+  		public static readonly OpCode Conv_Ovf_U1;
+  		public static readonly OpCode Conv_Ovf_U1_Un;
+  		public static readonly OpCode Conv_Ovf_U2;
+  		public static readonly OpCode Conv_Ovf_U2_Un;
+  		public static readonly OpCode Conv_Ovf_U4;
+  		public static readonly OpCode Conv_Ovf_U4_Un;
+  		public static readonly OpCode Conv_Ovf_U8;
+  		public static readonly OpCode Conv_Ovf_U8_Un;
+  		public static readonly OpCode Conv_R_Un;
+  		public static readonly OpCode Conv_R4;
+  		public static readonly OpCode Conv_R8;
+  		public static readonly OpCode Conv_U;
+  		public static readonly OpCode Conv_U1;
+  		public static readonly OpCode Conv_U2;
+  		public static readonly OpCode Conv_U4;
+  		public static readonly OpCode Conv_U8;
+  		public static readonly OpCode Cpblk;
+  		public static readonly OpCode Cpobj;
+  		public static readonly OpCode Div;
+  		public static readonly OpCode Div_Un;
+  		public static readonly OpCode Dup;
+  		public static readonly OpCode Endfilter;
+  		public static readonly OpCode Endfinally;
+  		public static readonly OpCode Initblk;
+  		public static readonly OpCode Initobj;
+  		public static readonly OpCode Isinst;
+  		public static readonly OpCode Jmp;
+  		public static readonly OpCode Ldarg;
+  		public static readonly OpCode Ldarg_0;
+  		public static readonly OpCode Ldarg_1;
+  		public static readonly OpCode Ldarg_2;
+  		public static readonly OpCode Ldarg_3;
+  		public static readonly OpCode Ldarg_S;
+  		public static readonly OpCode Ldarga;
+  		public static readonly OpCode Ldarga_S;
+  		public static readonly OpCode Ldc_I4;
+  		public static readonly OpCode Ldc_I4_0;
+  		public static readonly OpCode Ldc_I4_1;
+  		public static readonly OpCode Ldc_I4_2;
+  		public static readonly OpCode Ldc_I4_3;
+  		public static readonly OpCode Ldc_I4_4;
+  		public static readonly OpCode Ldc_I4_5;
+  		public static readonly OpCode Ldc_I4_6;
+  		public static readonly OpCode Ldc_I4_7;
+  		public static readonly OpCode Ldc_I4_8;
+  		public static readonly OpCode Ldc_I4_M1;
+  		public static readonly OpCode Ldc_I4_S;
+  		public static readonly OpCode Ldc_I8;
+  		public static readonly OpCode Ldc_R4;
+  		public static readonly OpCode Ldc_R8;
+  		public static readonly OpCode Ldelem_I;
+  		public static readonly OpCode Ldelem_I1;
+  		public static readonly OpCode Ldelem_I2;
+  		public static readonly OpCode Ldelem_I4;
+  		public static readonly OpCode Ldelem_I8;
+  		public static readonly OpCode Ldelem_R4;
+  		public static readonly OpCode Ldelem_R8;
+  		public static readonly OpCode Ldelem_Ref;
+  		public static readonly OpCode Ldelem_U1;
+  		public static readonly OpCode Ldelem_U2;
+  		public static readonly OpCode Ldelem_U4;
+  		public static readonly OpCode Ldelema;
+  		public static readonly OpCode Ldfld;
+  		public static readonly OpCode Ldflda;
+  		public static readonly OpCode Ldftn;
+  		public static readonly OpCode Ldind_I;
+  		public static readonly OpCode Ldind_I1;
+  		public static readonly OpCode Ldind_I2;
+  		public static readonly OpCode Ldind_I4;
+  		public static readonly OpCode Ldind_I8;
+  		public static readonly OpCode Ldind_R4;
+  		public static readonly OpCode Ldind_R8;
+  		public static readonly OpCode Ldind_Ref;
+  		public static readonly OpCode Ldind_U1;
+  		public static readonly OpCode Ldind_U2;
+  		public static readonly OpCode Ldind_U4;
+  		public static readonly OpCode Ldlen;
+  		public static readonly OpCode Ldloc;
+  		public static readonly OpCode Ldloc_0;
+  		public static readonly OpCode Ldloc_1;
+  		public static readonly OpCode Ldloc_2;
+  		public static readonly OpCode Ldloc_3;
+  		public static readonly OpCode Ldloc_S;
+  		public static readonly OpCode Ldloca;
+  		public static readonly OpCode Ldloca_S;
+  		public static readonly OpCode Ldnull;
+  		public static readonly OpCode Ldobj;
+  		public static readonly OpCode Ldsfld;
+  		public static readonly OpCode Ldsflda;
+  		public static readonly OpCode Ldstr;
+  		public static readonly OpCode Ldtoken;
+  		public static readonly OpCode Ldvirtftn;
+  		public static readonly OpCode Leave;
+  		public static readonly OpCode Leave_S;
+  		public static readonly OpCode Localloc;
+  		public static readonly OpCode Mkrefany;
+  		public static readonly OpCode Mul;
+  		public static readonly OpCode Mul_Ovf;
+  		public static readonly OpCode Mul_Ovf_Un;
+  		public static readonly OpCode Neg;
+  		public static readonly OpCode Newarr;
+  		public static readonly OpCode Newobj;
+  		public static readonly OpCode Nop;
+  		public static readonly OpCode Not;
+  		public static readonly OpCode Or;
+  		public static readonly OpCode Pop;
+  		public static readonly OpCode Prefix1;
+  		public static readonly OpCode Prefix2;
+  		public static readonly OpCode Prefix3;
+  		public static readonly OpCode Prefix4;
+  		public static readonly OpCode Prefix5;
+  		public static readonly OpCode Prefix6;
+  		public static readonly OpCode Prefix7;
+  		public static readonly OpCode Prefixref;
+  		public static readonly OpCode Refanytype;
+  		public static readonly OpCode Refanyval;
+  		public static readonly OpCode Rem;
+  		public static readonly OpCode Rem_Un;
+  		public static readonly OpCode Ret;
+  		public static readonly OpCode Rethrow;
+  		public static readonly OpCode Shl;
+  		public static readonly OpCode Shr;
+  		public static readonly OpCode Shr_Un;
+  		public static readonly OpCode Sizeof;
+  		public static readonly OpCode Starg;
+  		public static readonly OpCode Starg_S;
+  		public static readonly OpCode Stelem_I;
+  		public static readonly OpCode Stelem_I1;
+  		public static readonly OpCode Stelem_I2;
+  		public static readonly OpCode Stelem_I4;
+  		public static readonly OpCode Stelem_I8;
+  		public static readonly OpCode Stelem_R4;
+  		public static readonly OpCode Stelem_R8;
+  		public static readonly OpCode Stelem_Ref;
+  		public static readonly OpCode Stfld;
+  		public static readonly OpCode Stind_I;
+  		public static readonly OpCode Stind_I1;
+  		public static readonly OpCode Stind_I2;
+  		public static readonly OpCode Stind_I4;
+  		public static readonly OpCode Stind_I8;
+  		public static readonly OpCode Stind_R4;
+  		public static readonly OpCode Stind_R8;
+  		public static readonly OpCode Stind_Ref;
+  		public static readonly OpCode Stloc;
+  		public static readonly OpCode Stloc_0;
+  		public static readonly OpCode Stloc_1;
+  		public static readonly OpCode Stloc_2;
+  		public static readonly OpCode Stloc_3;
+  		public static readonly OpCode Stloc_S;
+  		public static readonly OpCode Stobj;
+  		public static readonly OpCode Stsfld;
+  		public static readonly OpCode Sub;
+  		public static readonly OpCode Sub_Ovf;
+  		public static readonly OpCode Sub_Ovf_Un;
+  		public static readonly OpCode Switch;
+  		public static readonly OpCode Tailcall;
+  		public static readonly OpCode Throw;
+  		public static readonly OpCode Unaligned;
+  		public static readonly OpCode Unbox;
+  		public static readonly OpCode Volatile;
+  		public static readonly OpCode Xor;
+  
+
+		private OpCodes () {}
+
+		static OpCodes ()
+		{
+
+			Nop = new OpCode("nop", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x0);
+  			Arglist = new OpCode("arglist", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0x0);
+  			Break = new OpCode("break", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Break, 0xFF, 0x1);
+  			Ceq = new OpCode("ceq", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0x1);
+  			Starg_S = new OpCode("starg.s", 1, OpCodeType.Macro, OperandType.ShortInlineVar, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x10);
+  			Ldloc_S = new OpCode("ldloc.s", 1, OpCodeType.Macro, OperandType.ShortInlineVar, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x11);
+  			Endfilter = new OpCode("endfilter", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Push0, FlowControl.Return, 0xFE, 0x11);
+  			Ldloca_S = new OpCode("ldloca.s", 1, OpCodeType.Macro, OperandType.ShortInlineVar, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x12);
+  			Unaligned = new OpCode("unaligned.", 2, OpCodeType.Prefix, OperandType.ShortInlineI, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFE, 0x12);
+  			Stloc_S = new OpCode("stloc.s", 1, OpCodeType.Macro, OperandType.ShortInlineVar, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x13);
+  			Volatile = new OpCode("volatile.", 2, OpCodeType.Prefix, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFE, 0x13);
+  			Ldnull = new OpCode("ldnull", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushref, FlowControl.Next, 0xFF, 0x14);
+  			Tailcall = new OpCode("tail.", 2, OpCodeType.Prefix, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFE, 0x14);
+  			Ldc_I4_M1 = new OpCode("ldc.i4.m1", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x15);
+  			Initobj = new OpCode("initobj", 2, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popi, StackBehaviour.Push0, FlowControl.Next, 0xFE, 0x15);
+  			Ldc_I4_0 = new OpCode("ldc.i4.0", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x16);
+  			Ldc_I4_1 = new OpCode("ldc.i4.1", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x17);
+  			Cpblk = new OpCode("cpblk", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi_popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFE, 0x17);
+  			Ldc_I4_2 = new OpCode("ldc.i4.2", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x18);
+  			Initblk = new OpCode("initblk", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi_popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFE, 0x18);
+  			Ldc_I4_3 = new OpCode("ldc.i4.3", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x19);
+  			Ldc_I4_4 = new OpCode("ldc.i4.4", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x1A);
+  			Rethrow = new OpCode("rethrow", 2, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Throw, 0xFE, 0x1A);
+  			Ldc_I4_5 = new OpCode("ldc.i4.5", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x1B);
+  			Ldc_I4_6 = new OpCode("ldc.i4.6", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x1C);
+  			Sizeof = new OpCode("sizeof", 2, OpCodeType.Primitive, OperandType.InlineType, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0x1C);
+  			Ldc_I4_7 = new OpCode("ldc.i4.7", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x1D);
+  			Refanytype = new OpCode("refanytype", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0x1D);
+  			Ldc_I4_8 = new OpCode("ldc.i4.8", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x1E);
+  			Ldc_I4_S = new OpCode("ldc.i4.s", 1, OpCodeType.Macro, OperandType.ShortInlineI, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x1F);
+  			Ldarg_0 = new OpCode("ldarg.0", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x2);
+  			Cgt = new OpCode("cgt", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0x2);
+  			Ldc_I4 = new OpCode("ldc.i4", 1, OpCodeType.Primitive, OperandType.InlineI, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x20);
+  			Ldc_I8 = new OpCode("ldc.i8", 1, OpCodeType.Primitive, OperandType.InlineI8, StackBehaviour.Pop0, StackBehaviour.Pushi8, FlowControl.Next, 0xFF, 0x21);
+  			Ldc_R4 = new OpCode("ldc.r4", 1, OpCodeType.Primitive, OperandType.ShortInlineR, StackBehaviour.Pop0, StackBehaviour.Pushr4, FlowControl.Next, 0xFF, 0x22);
+  			Ldc_R8 = new OpCode("ldc.r8", 1, OpCodeType.Primitive, OperandType.InlineR, StackBehaviour.Pop0, StackBehaviour.Pushr8, FlowControl.Next, 0xFF, 0x23);
+  			Dup = new OpCode("dup", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Push1_push1, FlowControl.Next, 0xFF, 0x25);
+  			Pop = new OpCode("pop", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x26);
+  			Jmp = new OpCode("jmp", 1, OpCodeType.Primitive, OperandType.InlineMethod, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Call, 0xFF, 0x27);
+  			Call = new OpCode("call", 1, OpCodeType.Primitive, OperandType.InlineMethod, StackBehaviour.Varpop, StackBehaviour.Varpush, FlowControl.Call, 0xFF, 0x28);
+  			Calli = new OpCode("calli", 1, OpCodeType.Primitive, OperandType.InlineSig, StackBehaviour.Varpop, StackBehaviour.Varpush, FlowControl.Call, 0xFF, 0x29);
+  			Ret = new OpCode("ret", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Varpop, StackBehaviour.Push0, FlowControl.Return, 0xFF, 0x2A);
+  			Br_S = new OpCode("br.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Branch, 0xFF, 0x2B);
+  			Brfalse_S = new OpCode("brfalse.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Popi, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x2C);
+  			Brtrue_S = new OpCode("brtrue.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Popi, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x2D);
+  			Beq_S = new OpCode("beq.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x2E);
+  			Bge_S = new OpCode("bge.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x2F);
+  			Ldarg_1 = new OpCode("ldarg.1", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x3);
+  			Cgt_Un = new OpCode("cgt.un", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0x3);
+  			Bgt_S = new OpCode("bgt.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x30);
+  			Ble_S = new OpCode("ble.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x31);
+  			Blt_S = new OpCode("blt.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x32);
+  			Bne_Un_S = new OpCode("bne.un.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x33);
+  			Bge_Un_S = new OpCode("bge.un.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x34);
+  			Bgt_Un_S = new OpCode("bgt.un.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x35);
+  			Ble_Un_S = new OpCode("ble.un.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x36);
+  			Blt_Un_S = new OpCode("blt.un.s", 1, OpCodeType.Macro, OperandType.ShortInlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x37);
+  			Br = new OpCode("br", 1, OpCodeType.Primitive, OperandType.InlineBrTarget, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Branch, 0xFF, 0x38);
+  			Brfalse = new OpCode("brfalse", 1, OpCodeType.Primitive, OperandType.InlineBrTarget, StackBehaviour.Popi, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x39);
+  			Brtrue = new OpCode("brtrue", 1, OpCodeType.Primitive, OperandType.InlineBrTarget, StackBehaviour.Popi, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x3A);
+  			Beq = new OpCode("beq", 1, OpCodeType.Macro, OperandType.InlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x3B);
+  			Bge = new OpCode("bge", 1, OpCodeType.Macro, OperandType.InlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x3C);
+  			Bgt = new OpCode("bgt", 1, OpCodeType.Macro, OperandType.InlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x3D);
+  			Ble = new OpCode("ble", 1, OpCodeType.Macro, OperandType.InlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x3E);
+  			Blt = new OpCode("blt", 1, OpCodeType.Macro, OperandType.InlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x3F);
+  			Ldarg_2 = new OpCode("ldarg.2", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x4);
+  			Clt = new OpCode("clt", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0x4);
+  			Bne_Un = new OpCode("bne.un", 1, OpCodeType.Macro, OperandType.InlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x40);
+  			Bge_Un = new OpCode("bge.un", 1, OpCodeType.Macro, OperandType.InlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x41);
+  			Bgt_Un = new OpCode("bgt.un", 1, OpCodeType.Macro, OperandType.InlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x42);
+  			Ble_Un = new OpCode("ble.un", 1, OpCodeType.Macro, OperandType.InlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x43);
+  			Blt_Un = new OpCode("blt.un", 1, OpCodeType.Macro, OperandType.InlineBrTarget, StackBehaviour.Pop1_pop1, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x44);
+  			Switch = new OpCode("switch", 1, OpCodeType.Primitive, OperandType.InlineSwitch, StackBehaviour.Popi, StackBehaviour.Push0, FlowControl.Cond_Branch, 0xFF, 0x45);
+  			Ldind_I1 = new OpCode("ldind.i1", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x46);
+  			Ldind_U1 = new OpCode("ldind.u1", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x47);
+  			Ldind_I2 = new OpCode("ldind.i2", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x48);
+  			Ldind_U2 = new OpCode("ldind.u2", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x49);
+  			Ldind_I4 = new OpCode("ldind.i4", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x4A);
+  			Ldind_U4 = new OpCode("ldind.u4", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x4B);
+  			Ldind_I8 = new OpCode("ldind.i8", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushi8, FlowControl.Next, 0xFF, 0x4C);
+  			Ldind_I = new OpCode("ldind.i", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x4D);
+  			Ldind_R4 = new OpCode("ldind.r4", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushr4, FlowControl.Next, 0xFF, 0x4E);
+  			Ldind_R8 = new OpCode("ldind.r8", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushr8, FlowControl.Next, 0xFF, 0x4F);
+  			Ldarg_3 = new OpCode("ldarg.3", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x5);
+  			Clt_Un = new OpCode("clt.un", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0x5);
+  			Ldind_Ref = new OpCode("ldind.ref", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushref, FlowControl.Next, 0xFF, 0x50);
+  			Stind_Ref = new OpCode("stind.ref", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x51);
+  			Stind_I1 = new OpCode("stind.i1", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x52);
+  			Stind_I2 = new OpCode("stind.i2", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x53);
+  			Stind_I4 = new OpCode("stind.i4", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x54);
+  			Stind_I8 = new OpCode("stind.i8", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi_popi8, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x55);
+  			Stind_R4 = new OpCode("stind.r4", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi_popr4, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x56);
+  			Stind_R8 = new OpCode("stind.r8", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi_popr8, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x57);
+  			Add = new OpCode("add", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x58);
+  			Sub = new OpCode("sub", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x59);
+  			Mul = new OpCode("mul", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x5A);
+  			Div = new OpCode("div", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x5B);
+  			Div_Un = new OpCode("div.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x5C);
+  			Rem = new OpCode("rem", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x5D);
+  			Rem_Un = new OpCode("rem.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x5E);
+  			And = new OpCode("and", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x5F);
+  			Ldloc_0 = new OpCode("ldloc.0", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x6);
+  			Ldftn = new OpCode("ldftn", 2, OpCodeType.Primitive, OperandType.InlineMethod, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0x6);
+  			Or = new OpCode("or", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x60);
+  			Xor = new OpCode("xor", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x61);
+  			Shl = new OpCode("shl", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x62);
+  			Shr = new OpCode("shr", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x63);
+  			Shr_Un = new OpCode("shr.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x64);
+  			Neg = new OpCode("neg", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x65);
+  			Not = new OpCode("not", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x66);
+  			Conv_I1 = new OpCode("conv.i1", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x67);
+  			Conv_I2 = new OpCode("conv.i2", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x68);
+  			Conv_I4 = new OpCode("conv.i4", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x69);
+  			Conv_I8 = new OpCode("conv.i8", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi8, FlowControl.Next, 0xFF, 0x6A);
+  			Conv_R4 = new OpCode("conv.r4", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushr4, FlowControl.Next, 0xFF, 0x6B);
+  			Conv_R8 = new OpCode("conv.r8", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushr8, FlowControl.Next, 0xFF, 0x6C);
+  			Conv_U4 = new OpCode("conv.u4", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x6D);
+  			Conv_U8 = new OpCode("conv.u8", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi8, FlowControl.Next, 0xFF, 0x6E);
+  			Callvirt = new OpCode("callvirt", 1, OpCodeType.Objmodel, OperandType.InlineMethod, StackBehaviour.Varpop, StackBehaviour.Varpush, FlowControl.Call, 0xFF, 0x6F);
+  			Ldloc_1 = new OpCode("ldloc.1", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x7);
+  			Ldvirtftn = new OpCode("ldvirtftn", 2, OpCodeType.Primitive, OperandType.InlineMethod, StackBehaviour.Popref, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0x7);
+  			Cpobj = new OpCode("cpobj", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x70);
+  			Ldobj = new OpCode("ldobj", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popi, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x71);
+  			Ldstr = new OpCode("ldstr", 1, OpCodeType.Objmodel, OperandType.InlineString, StackBehaviour.Pop0, StackBehaviour.Pushref, FlowControl.Next, 0xFF, 0x72);
+  			Newobj = new OpCode("newobj", 1, OpCodeType.Objmodel, OperandType.InlineMethod, StackBehaviour.Varpop, StackBehaviour.Pushref, FlowControl.Call, 0xFF, 0x73);
+  			Castclass = new OpCode("castclass", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popref, StackBehaviour.Pushref, FlowControl.Next, 0xFF, 0x74);
+  			Isinst = new OpCode("isinst", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popref, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x75);
+  			Conv_R_Un = new OpCode("conv.r.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushr8, FlowControl.Next, 0xFF, 0x76);
+  			Unbox = new OpCode("unbox", 1, OpCodeType.Primitive, OperandType.InlineType, StackBehaviour.Popref, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x79);
+  			Throw = new OpCode("throw", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref, StackBehaviour.Push0, FlowControl.Throw, 0xFF, 0x7A);
+  			Ldfld = new OpCode("ldfld", 1, OpCodeType.Objmodel, OperandType.InlineField, StackBehaviour.Popref, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x7B);
+  			Ldflda = new OpCode("ldflda", 1, OpCodeType.Objmodel, OperandType.InlineField, StackBehaviour.Popref, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x7C);
+  			Stfld = new OpCode("stfld", 1, OpCodeType.Objmodel, OperandType.InlineField, StackBehaviour.Popref_pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x7D);
+  			Ldsfld = new OpCode("ldsfld", 1, OpCodeType.Objmodel, OperandType.InlineField, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x7E);
+  			Ldsflda = new OpCode("ldsflda", 1, OpCodeType.Objmodel, OperandType.InlineField, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x7F);
+  			Ldloc_2 = new OpCode("ldloc.2", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x8);
+  			Stsfld = new OpCode("stsfld", 1, OpCodeType.Objmodel, OperandType.InlineField, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x80);
+  			Stobj = new OpCode("stobj", 1, OpCodeType.Primitive, OperandType.InlineType, StackBehaviour.Popi_pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x81);
+  			Conv_Ovf_I1_Un = new OpCode("conv.ovf.i1.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x82);
+  			Conv_Ovf_I2_Un = new OpCode("conv.ovf.i2.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x83);
+  			Conv_Ovf_I4_Un = new OpCode("conv.ovf.i4.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x84);
+  			Conv_Ovf_I8_Un = new OpCode("conv.ovf.i8.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi8, FlowControl.Next, 0xFF, 0x85);
+  			Conv_Ovf_U1_Un = new OpCode("conv.ovf.u1.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x86);
+  			Conv_Ovf_U2_Un = new OpCode("conv.ovf.u2.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x87);
+  			Conv_Ovf_U4_Un = new OpCode("conv.ovf.u4.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x88);
+  			Conv_Ovf_U8_Un = new OpCode("conv.ovf.u8.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi8, FlowControl.Next, 0xFF, 0x89);
+  			Conv_Ovf_I_Un = new OpCode("conv.ovf.i.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x8A);
+  			Conv_Ovf_U_Un = new OpCode("conv.ovf.u.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x8B);
+  			Boxval = new OpCode("boxval", 1, OpCodeType.Primitive, OperandType.InlineType, StackBehaviour.Pop1, StackBehaviour.Pushref, FlowControl.Next, 0xFF, 0x8C);
+  			Box = new OpCode("box", 1, OpCodeType.Primitive, OperandType.InlineType, StackBehaviour.Pop1, StackBehaviour.Pushref, FlowControl.Next, 0xFF, 0x8C);
+  			Newarr = new OpCode("newarr", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popi, StackBehaviour.Pushref, FlowControl.Next, 0xFF, 0x8D);
+  			Ldlen = new OpCode("ldlen", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x8E);
+  			Ldelema = new OpCode("ldelema", 1, OpCodeType.Objmodel, OperandType.InlineType, StackBehaviour.Popref_popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x8F);
+  			Ldloc_3 = new OpCode("ldloc.3", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0x9);
+  			Ldarg = new OpCode("ldarg", 2, OpCodeType.Primitive, OperandType.InlineVar, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFE, 0x9);
+  			Ldelem_I1 = new OpCode("ldelem.i1", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x90);
+  			Ldelem_U1 = new OpCode("ldelem.u1", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x91);
+  			Ldelem_I2 = new OpCode("ldelem.i2", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x92);
+  			Ldelem_U2 = new OpCode("ldelem.u2", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x93);
+  			Ldelem_I4 = new OpCode("ldelem.i4", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x94);
+  			Ldelem_U4 = new OpCode("ldelem.u4", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x95);
+  			Ldelem_I8 = new OpCode("ldelem.i8", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushi8, FlowControl.Next, 0xFF, 0x96);
+  			Ldelem_I = new OpCode("ldelem.i", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0x97);
+  			Ldelem_R4 = new OpCode("ldelem.r4", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushr4, FlowControl.Next, 0xFF, 0x98);
+  			Ldelem_R8 = new OpCode("ldelem.r8", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushr8, FlowControl.Next, 0xFF, 0x99);
+  			Ldelem_Ref = new OpCode("ldelem.ref", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi, StackBehaviour.Pushref, FlowControl.Next, 0xFF, 0x9A);
+  			Stelem_I = new OpCode("stelem.i", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x9B);
+  			Stelem_I1 = new OpCode("stelem.i1", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x9C);
+  			Stelem_I2 = new OpCode("stelem.i2", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x9D);
+  			Stelem_I4 = new OpCode("stelem.i4", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x9E);
+  			Stelem_I8 = new OpCode("stelem.i8", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popi8, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0x9F);
+  			Stloc_0 = new OpCode("stloc.0", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xA);
+  			Ldarga = new OpCode("ldarga", 2, OpCodeType.Primitive, OperandType.InlineVar, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0xA);
+  			Stelem_R4 = new OpCode("stelem.r4", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popr4, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xA0);
+  			Stelem_R8 = new OpCode("stelem.r8", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popr8, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xA1);
+  			Stelem_Ref = new OpCode("stelem.ref", 1, OpCodeType.Objmodel, OperandType.InlineNone, StackBehaviour.Popref_popi_popref, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xA2);
+  			Stloc_1 = new OpCode("stloc.1", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xB);
+  			Starg = new OpCode("starg", 2, OpCodeType.Primitive, OperandType.InlineVar, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFE, 0xB);
+  			Conv_Ovf_I1 = new OpCode("conv.ovf.i1", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xB3);
+  			Conv_Ovf_U1 = new OpCode("conv.ovf.u1", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xB4);
+  			Conv_Ovf_I2 = new OpCode("conv.ovf.i2", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xB5);
+  			Conv_Ovf_U2 = new OpCode("conv.ovf.u2", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xB6);
+  			Conv_Ovf_I4 = new OpCode("conv.ovf.i4", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xB7);
+  			Conv_Ovf_U4 = new OpCode("conv.ovf.u4", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xB8);
+  			Conv_Ovf_I8 = new OpCode("conv.ovf.i8", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi8, FlowControl.Next, 0xFF, 0xB9);
+  			Conv_Ovf_U8 = new OpCode("conv.ovf.u8", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi8, FlowControl.Next, 0xFF, 0xBA);
+  			Stloc_2 = new OpCode("stloc.2", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xC);
+  			Ldloc = new OpCode("ldloc", 2, OpCodeType.Primitive, OperandType.InlineVar, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFE, 0xC);
+  			Refanyval = new OpCode("refanyval", 1, OpCodeType.Primitive, OperandType.InlineType, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xC2);
+  			Ckfinite = new OpCode("ckfinite", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushr8, FlowControl.Next, 0xFF, 0xC3);
+  			Mkrefany = new OpCode("mkrefany", 1, OpCodeType.Primitive, OperandType.InlineType, StackBehaviour.Popi, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0xC6);
+  			Stloc_3 = new OpCode("stloc.3", 1, OpCodeType.Macro, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xD);
+  			Ldloca = new OpCode("ldloca", 2, OpCodeType.Primitive, OperandType.InlineVar, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0xD);
+  			Ldtoken = new OpCode("ldtoken", 1, OpCodeType.Primitive, OperandType.InlineTok, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xD0);
+  			Conv_U2 = new OpCode("conv.u2", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xD1);
+  			Conv_U1 = new OpCode("conv.u1", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xD2);
+  			Conv_I = new OpCode("conv.i", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xD3);
+  			Conv_Ovf_I = new OpCode("conv.ovf.i", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xD4);
+  			Conv_Ovf_U = new OpCode("conv.ovf.u", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xD5);
+  			Add_Ovf = new OpCode("add.ovf", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0xD6);
+  			Add_Ovf_Un = new OpCode("add.ovf.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0xD7);
+  			Mul_Ovf = new OpCode("mul.ovf", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0xD8);
+  			Mul_Ovf_Un = new OpCode("mul.ovf.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0xD9);
+  			Sub_Ovf = new OpCode("sub.ovf", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0xDA);
+  			Sub_Ovf_Un = new OpCode("sub.ovf.un", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1_pop1, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0xDB);
+  			Endfinally = new OpCode("endfinally", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Return, 0xFF, 0xDC);
+  			Leave = new OpCode("leave", 1, OpCodeType.Primitive, OperandType.InlineBrTarget, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Branch, 0xFF, 0xDD);
+  			Leave_S = new OpCode("leave.s", 1, OpCodeType.Primitive, OperandType.ShortInlineBrTarget, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Branch, 0xFF, 0xDE);
+  			Stind_I = new OpCode("stind.i", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi_popi, StackBehaviour.Push0, FlowControl.Next, 0xFF, 0xDF);
+  			Ldarg_S = new OpCode("ldarg.s", 1, OpCodeType.Macro, OperandType.ShortInlineVar, StackBehaviour.Pop0, StackBehaviour.Push1, FlowControl.Next, 0xFF, 0xE);
+  			Stloc = new OpCode("stloc", 2, OpCodeType.Primitive, OperandType.InlineVar, StackBehaviour.Pop1, StackBehaviour.Push0, FlowControl.Next, 0xFE, 0xE);
+  			Conv_U = new OpCode("conv.u", 1, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Pop1, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xE0);
+  			Ldarga_S = new OpCode("ldarga.s", 1, OpCodeType.Macro, OperandType.ShortInlineVar, StackBehaviour.Pop0, StackBehaviour.Pushi, FlowControl.Next, 0xFF, 0xF);
+  			Localloc = new OpCode("localloc", 2, OpCodeType.Primitive, OperandType.InlineNone, StackBehaviour.Popi, StackBehaviour.Pushi, FlowControl.Next, 0xFE, 0xF);
+  			Prefix7 = new OpCode("prefix7", 1, OpCodeType.Nternal, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFF, 0xF8);
+  			Prefix6 = new OpCode("prefix6", 1, OpCodeType.Nternal, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFF, 0xF9);
+  			Prefix5 = new OpCode("prefix5", 1, OpCodeType.Nternal, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFF, 0xFA);
+  			Prefix4 = new OpCode("prefix4", 1, OpCodeType.Nternal, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFF, 0xFB);
+  			Prefix3 = new OpCode("prefix3", 1, OpCodeType.Nternal, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFF, 0xFC);
+  			Prefix2 = new OpCode("prefix2", 1, OpCodeType.Nternal, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFF, 0xFD);
+  			Prefix1 = new OpCode("prefix1", 1, OpCodeType.Nternal, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFF, 0xFE);
+  			Prefixref = new OpCode("prefixref", 1, OpCodeType.Nternal, OperandType.InlineNone, StackBehaviour.Pop0, StackBehaviour.Push0, FlowControl.Meta, 0xFF, 0xFF);
+  
+
+		}
+
+		public static bool TakesSingleByteArgument (OpCode inst)
+		{
+			OperandType t = inst.OperandType;
+
+			// check for short-inline instructions
+			return (   t == OperandType.ShortInlineBrTarget
+			        || t == OperandType.ShortInlineI
+			        || t == OperandType.ShortInlineR
+			        || t == OperandType.ShortInlineVar
+			       );
+		}
+	}
+
+
+
+  
+
+
+} // namespace System.Reflection.Emit
diff --git a/mcs/class/corlib/System.Reflection.Emit/OperandType.cs b/mcs/class/corlib/System.Reflection.Emit/OperandType.cs
new file mode 100644
index 00000000000..669ca53277e
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/OperandType.cs
@@ -0,0 +1,87 @@
+// OperandType.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+	/// <summary>
+	///  Describes the operand types of MSIL instructions.
+	/// </summary>
+	public enum OperandType {
+
+		/// <summary>
+		/// </summary>
+		InlineBrTarget = 0,
+
+		/// <summary>
+		/// </summary>
+		InlineField = 1,
+
+		/// <summary>
+		/// </summary>
+		InlineI = 2,
+
+		/// <summary>
+		/// </summary>
+		InlineI8 = 3,
+
+		/// <summary>
+		/// </summary>
+		InlineMethod = 4,
+
+		/// <summary>
+		/// </summary>
+		InlineNone = 5,
+
+		/// <summary>
+		/// </summary>
+		InlinePhi = 6,
+
+		/// <summary>
+		/// </summary>
+		InlineR = 7,
+
+		/// <summary>
+		/// </summary>
+		InlineSig = 9,
+
+		/// <summary>
+		/// </summary>
+		InlineString = 0x0A,
+
+		/// <summary>
+		/// </summary>
+		InlineSwitch = 0x0B,
+
+		/// <summary>
+		/// </summary>
+		InlineTok = 0x0C,
+
+		/// <summary>
+		/// </summary>
+		InlineType = 0x0D,
+
+		/// <summary>
+		/// </summary>
+		InlineVar = 0x0E,
+
+		/// <summary>
+		/// </summary>
+		ShortInlineBrTarget = 0x0F,
+
+		/// <summary>
+		/// </summary>
+		ShortInlineI = 0x10,
+
+		/// <summary>
+		/// </summary>
+		ShortInlineR = 0x11,
+
+		/// <summary>
+		/// </summary>
+		ShortInlineVar = 0x12
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/PEFileKinds.cs b/mcs/class/corlib/System.Reflection.Emit/PEFileKinds.cs
new file mode 100644
index 00000000000..0677897bc82
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/PEFileKinds.cs
@@ -0,0 +1,8 @@
+namespace System.Reflection.Emit {
+	public enum PEFileKinds {
+		Dll = 1,
+		ConsoleApplication = 2,
+		WindowApplication = 3
+	}
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/PackingSize.cs b/mcs/class/corlib/System.Reflection.Emit/PackingSize.cs
new file mode 100644
index 00000000000..82c74276386
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/PackingSize.cs
@@ -0,0 +1,41 @@
+// PackingSize.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+	/// <summary>
+	///  Specifies the packing size (data alignment) of a type.
+	/// </summary>
+	public enum PackingSize {
+
+		/// <summary>
+		///  The packing size is unspecified.
+		/// </summary>
+		Unspecified = 0,
+
+		/// <summary>
+		/// </summary>
+		Size1 = 1,
+
+		/// <summary>
+		/// </summary>
+		Size2 = 2,
+
+		/// <summary>
+		/// </summary>
+		Size4 = 4,
+
+		/// <summary>
+		/// </summary>
+		Size8 = 8,
+
+		/// <summary>
+		/// </summary>
+		Size16 = 16
+	}
+
+}
+
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/ParameterBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/ParameterBuilder.cs
new file mode 100755
index 00000000000..02ba64986cd
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/ParameterBuilder.cs
@@ -0,0 +1,102 @@
+
+
+//
+// System.Reflection.Emit/ParameterBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection.Emit {
+	public class ParameterBuilder {
+		private MethodBase methodb; /* MethodBuilder or ConstructorBuilder */
+		private string name;
+		private CustomAttributeBuilder[] cattrs;
+		private UnmanagedMarshal marshal_info;
+		private ParameterAttributes attrs;
+		private int position;
+		private int table_idx;
+		
+		internal ParameterBuilder (MethodBase mb, int pos, ParameterAttributes attributes, string strParamName) {
+			name = strParamName;
+			position = pos;
+			attrs = attributes;
+			methodb = mb;
+			table_idx = mb.get_next_table_index (this, 0x08, true);
+		}
+
+		public virtual int Attributes {
+			get {return (int)attrs;}
+		}
+		public bool IsIn {
+			get {return ((int)attrs & (int)ParameterAttributes.In) != 0;}
+		}
+		public bool IsOut {
+			get {return ((int)attrs & (int)ParameterAttributes.Out) != 0;}
+		}
+		public bool IsOptional {
+			get {return ((int)attrs & (int)ParameterAttributes.Optional) != 0;}
+		}
+		public virtual string Name {
+			get {return name;}
+		}
+		public virtual int Position {
+			get {return position;}
+		}
+
+		public virtual ParameterToken GetToken() {
+			return new ParameterToken (0x08 | table_idx);
+		}
+
+		[MonoTODO]
+		public virtual void SetConstant( object defaultValue) {
+			/* FIXME */
+		}
+		
+		public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+			string attrname = customBuilder.Ctor.ReflectedType.FullName;
+			if (attrname == "System.Runtime.InteropServices.InAttribute") {
+				attrs |= ParameterAttributes.In;
+				return;
+			} else if (attrname == "System.Runtime.InteropServices.OutAttribute") {
+				attrs |= ParameterAttributes.Out;
+				return;
+			} else if (attrname == "System.Runtime.InteropServices.OptionalAttribute") {
+				attrs |= ParameterAttributes.Optional;
+				return;
+			} else if (attrname == "System.Runtime.InteropServices.MarshalAsAttribute") {
+				marshal_info = CustomAttributeBuilder.get_umarshal (customBuilder, true);
+				/* FIXME: check for errors */
+				return;
+			}
+			if (cattrs != null) {
+				CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
+				cattrs.CopyTo (new_array, 0);
+				new_array [cattrs.Length] = customBuilder;
+				cattrs = new_array;
+			} else {
+				cattrs = new CustomAttributeBuilder [1];
+				cattrs [0] = customBuilder;
+			}
+		}
+		public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+			SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
+		}
+
+		public virtual void SetMarshal( UnmanagedMarshal unmanagedMarshal) {
+			marshal_info = unmanagedMarshal;
+			attrs |= ParameterAttributes.HasFieldMarshal;
+		}
+
+	}
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/ParameterToken.cs b/mcs/class/corlib/System.Reflection.Emit/ParameterToken.cs
new file mode 100644
index 00000000000..21d1895747d
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/ParameterToken.cs
@@ -0,0 +1,70 @@
+// ParameterToken.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+
+	/// <summary>
+	///  Represents the Token returned by the metadata to represent a Parameter.
+	/// </summary>
+	[Serializable]
+	public struct ParameterToken {
+
+		internal int tokValue;
+
+		public static readonly ParameterToken Empty;
+
+
+		static ParameterToken ()
+		{
+			Empty = new ParameterToken ();
+		}
+
+
+		internal ParameterToken (int val)
+		{
+			tokValue = val;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public override bool Equals (object obj)
+		{
+			bool res = obj is ParameterToken;
+
+			if (res) {
+				ParameterToken that = (ParameterToken) obj;
+				res = (this.tokValue == that.tokValue);
+			}
+
+			return res;
+		}
+
+
+		/// <summary>
+		///  Tests whether the given object is an instance of
+		///  ParameterToken and has the same token value.
+		/// </summary>
+		public override int GetHashCode ()
+		{
+			return tokValue;
+		}
+
+
+		/// <summary>
+		///  Returns the metadata token for this Parameter.
+		/// </summary>
+		public int Token {
+			get {
+				return tokValue;
+			}
+		}
+
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/PropertyBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/PropertyBuilder.cs
new file mode 100755
index 00000000000..d006a4ac142
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/PropertyBuilder.cs
@@ -0,0 +1,124 @@
+
+//
+// System.Reflection.Emit/PropertyBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System.Reflection.Emit {
+	public sealed class PropertyBuilder : PropertyInfo {
+		private PropertyAttributes attrs;
+		private string name;
+		private Type type;
+		private Type[] parameters;
+		private CustomAttributeBuilder[] cattrs;
+		private object def_value;
+		private MethodBuilder set_method;
+		private MethodBuilder get_method;
+		private int table_idx = 0;
+		internal TypeBuilder typeb;
+		
+		internal PropertyBuilder (TypeBuilder tb, string name, PropertyAttributes attributes, Type returnType, Type[] parameterTypes) {
+			this.name = name;
+			this.attrs = attributes;
+			this.type = returnType;
+			if (parameterTypes != null) {
+				this.parameters = new Type [parameterTypes.Length];
+				System.Array.Copy (parameterTypes, this.parameters, this.parameters.Length);
+			}
+			typeb = tb;
+			table_idx = tb.get_next_table_index (this, 0x17, true);
+		}
+
+		public override PropertyAttributes Attributes {
+			get {return attrs;}
+		}
+		public override bool CanRead {
+			get {return get_method != null;}
+		}
+		public override bool CanWrite {
+			get {return set_method != null;}
+		}
+		public override Type DeclaringType {
+			get {return typeb;}
+		}
+		public override string Name {
+			get {return name;}
+		}
+		public PropertyToken PropertyToken {
+			get {return new PropertyToken ();}
+		}
+		public override Type PropertyType {
+			get {return type;}
+		}
+		public override Type ReflectedType {
+			get {return typeb;}
+		}
+		public void AddOtherMethod( MethodBuilder mdBuilder) {
+		}
+		public override MethodInfo[] GetAccessors( bool nonPublic) {
+			return null;
+		}
+		public override object[] GetCustomAttributes(bool inherit) {
+			return null;
+		}
+		public override object[] GetCustomAttributes(Type attributeType, bool inherit) {
+			return null;
+		}
+		public override MethodInfo GetGetMethod( bool nonPublic) {
+			return get_method;
+		}
+		public override ParameterInfo[] GetIndexParameters() {
+			return null;
+		}
+		public override MethodInfo GetSetMethod( bool nonPublic) {
+			return set_method;
+		}
+		public override object GetValue(object obj, object[] index) {
+			return null;
+		}
+		public override object GetValue( object obj, BindingFlags invokeAttr, Binder binder, object[] index, CultureInfo culture) {
+			return null;
+		}
+		public override bool IsDefined( Type attributeType, bool inherit) {
+			return false;
+		}
+		public void SetConstant( object defaultValue) {
+			def_value = defaultValue;
+		}
+		public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+			if (cattrs != null) {
+				CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
+				cattrs.CopyTo (new_array, 0);
+				new_array [cattrs.Length] = customBuilder;
+				cattrs = new_array;
+			} else {
+				cattrs = new CustomAttributeBuilder [1];
+				cattrs [0] = customBuilder;
+			}
+		}
+		public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+			SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
+		}
+		public void SetGetMethod( MethodBuilder mdBuilder) {
+			get_method = mdBuilder;
+		}
+		public void SetSetMethod( MethodBuilder mdBuilder) {
+			set_method = mdBuilder;
+		}
+		public override void SetValue( object obj, object value, object[] index) {
+		}
+		public override void SetValue( object obj, object value, BindingFlags invokeAttr, Binder binder, object[] index, CultureInfo culture) {
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/PropertyToken.cs b/mcs/class/corlib/System.Reflection.Emit/PropertyToken.cs
new file mode 100644
index 00000000000..38216a23996
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/PropertyToken.cs
@@ -0,0 +1,70 @@
+// PropertyToken.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+
+	/// <summary>
+	///  Represents the Token returned by the metadata to represent a Property.
+	/// </summary>
+	[Serializable]
+	public struct PropertyToken {
+
+		internal int tokValue;
+
+		public static readonly PropertyToken Empty;
+
+
+		static PropertyToken ()
+		{
+			Empty = new PropertyToken ();
+		}
+
+
+		internal PropertyToken (int val)
+		{
+			tokValue = val;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public override bool Equals (object obj)
+		{
+			bool res = obj is PropertyToken;
+
+			if (res) {
+				PropertyToken that = (PropertyToken) obj;
+				res = (this.tokValue == that.tokValue);
+			}
+
+			return res;
+		}
+
+
+		/// <summary>
+		///  Tests whether the given object is an instance of
+		///  PropertyToken and has the same token value.
+		/// </summary>
+		public override int GetHashCode ()
+		{
+			return tokValue;
+		}
+
+
+		/// <summary>
+		///  Returns the metadata token for this Property.
+		/// </summary>
+		public int Token {
+			get {
+				return tokValue;
+			}
+		}
+
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/SignatureHelper.cs b/mcs/class/corlib/System.Reflection.Emit/SignatureHelper.cs
new file mode 100755
index 00000000000..40e3b566a22
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/SignatureHelper.cs
@@ -0,0 +1,121 @@
+
+//
+// System.Reflection.Emit/SignatureHelper.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection.Emit {
+	[Serializable]
+	public sealed class SignatureHelper {
+		internal enum SignatureHelperType {
+			HELPER_FIELD,
+			HELPER_LOCAL,
+			HELPER_METHOD,
+			HELPER_PROPERTY
+		}
+
+		private ModuleBuilder module;
+		private Type[] arguments;
+		private SignatureHelperType type;
+
+		internal SignatureHelper (ModuleBuilder module, SignatureHelperType type)
+		{
+			this.type = type;
+			this.module = module;
+		}
+
+		public static SignatureHelper GetFieldSigHelper (Module mod)
+		{
+			if (!(mod is ModuleBuilder))
+				throw new NotImplementedException ();
+
+			return new SignatureHelper ((ModuleBuilder) mod, SignatureHelperType.HELPER_FIELD);
+		}
+		public static SignatureHelper GetLocalVarSigHelper (Module mod)
+		{
+			if (!(mod is ModuleBuilder))
+				throw new NotImplementedException ();
+
+			return new SignatureHelper ((ModuleBuilder) mod, SignatureHelperType.HELPER_LOCAL);
+		}
+		[MonoTODO]
+		public static SignatureHelper GetMethodSigHelper( Module mod, CallingConventions callingConvention, Type returnType)
+		{
+			throw new NotImplementedException ();
+		}
+		[MonoTODO]
+		public static SignatureHelper GetMethodSigHelper( Module mod, Type returnType, Type[] parameterTypes)
+		{
+			throw new NotImplementedException ();
+		}
+		[MonoTODO]
+		public static SignatureHelper GetPropertySigHelper( Module mod, Type returnType, Type[] parameterTypes)
+		{
+			throw new NotImplementedException ();
+		}
+		public void AddArgument (Type clsArgument)
+		{
+			if (arguments != null) {
+				Type[] new_a = new Type [arguments.Length + 1];
+				System.Array.Copy (arguments, new_a, arguments.Length);
+				new_a [arguments.Length] = clsArgument;
+				arguments = new_a;
+			} else {
+				arguments = new Type [1];
+				arguments [0] = clsArgument;
+			}
+		}
+		[MonoTODO]
+		public void AddSentinel ()
+		{
+			throw new NotImplementedException ();
+		}
+		[MonoTODO]
+		public override bool Equals (object obj)
+		{
+			throw new NotImplementedException ();
+		}
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal extern byte[] get_signature_local ();
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal extern byte[] get_signature_field ();
+
+		public byte[] GetSignature ()
+		{
+			switch (type) {
+			case SignatureHelperType.HELPER_LOCAL:
+				return get_signature_local ();
+			case SignatureHelperType.HELPER_FIELD:
+				return get_signature_field ();
+			default:
+				throw new NotImplementedException ();
+			}
+		}
+
+		public override string ToString() {
+			return "SignatureHelper";
+		}
+
+
+
+	}
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/SignatureToken.cs b/mcs/class/corlib/System.Reflection.Emit/SignatureToken.cs
new file mode 100644
index 00000000000..b8e7aa67bb5
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/SignatureToken.cs
@@ -0,0 +1,70 @@
+// SignatureToken.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+
+	/// <summary>
+	///  Represents the Token returned by the metadata to represent a Signature.
+	/// </summary>
+	[Serializable]
+	public struct SignatureToken {
+
+		internal int tokValue;
+
+		public static readonly SignatureToken Empty;
+
+
+		static SignatureToken ()
+		{
+			Empty = new SignatureToken ();
+		}
+
+
+		internal SignatureToken (int val)
+		{
+			tokValue = val;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public override bool Equals (object obj)
+		{
+			bool res = obj is SignatureToken;
+
+			if (res) {
+				SignatureToken that = (SignatureToken) obj;
+				res = (this.tokValue == that.tokValue);
+			}
+
+			return res;
+		}
+
+
+		/// <summary>
+		///  Tests whether the given object is an instance of
+		///  SignatureToken and has the same token value.
+		/// </summary>
+		public override int GetHashCode ()
+		{
+			return tokValue;
+		}
+
+
+		/// <summary>
+		///  Returns the metadata token for this Signature.
+		/// </summary>
+		public int Token {
+			get {
+				return tokValue;
+			}
+		}
+
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/StackBehaviour.cs b/mcs/class/corlib/System.Reflection.Emit/StackBehaviour.cs
new file mode 100644
index 00000000000..78cb915e7a6
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/StackBehaviour.cs
@@ -0,0 +1,126 @@
+// StackBehaviour.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+	/// <summary>
+	///  Describes how values are pushed onto or popped off a stack.
+	/// </summary>
+	public enum StackBehaviour {
+
+		/// <summary>
+		/// </summary>
+		Pop0 = 0,
+
+		/// <summary>
+		/// </summary>
+		Pop1 = 1,
+
+		/// <summary>
+		/// </summary>
+		Pop1_pop1 = 2,
+
+		/// <summary>
+		/// </summary>
+		Popi = 3,
+
+		/// <summary>
+		/// </summary>
+		Popi_pop1 = 4,
+
+		/// <summary>
+		/// </summary>
+		Popi_popi = 5,
+
+		/// <summary>
+		/// </summary>
+		Popi_popi8 = 6,
+
+		/// <summary>
+		/// </summary>
+		Popi_popi_popi = 7,
+
+		/// <summary>
+		/// </summary>
+		Popi_popr4 = 8,
+
+		/// <summary>
+		/// </summary>
+		Popi_popr8 = 9,
+
+		/// <summary>
+		/// </summary>
+		Popref = 0x0A,
+
+		/// <summary>
+		/// </summary>
+		Popref_pop1 = 0x0B,
+
+		/// <summary>
+		/// </summary>
+		Popref_popi = 0x0C,
+
+		/// <summary>
+		/// </summary>
+		Popref_popi_popi = 0x0D,
+
+		/// <summary>
+		/// </summary>
+		Popref_popi_popi8 = 0x0E,
+
+		/// <summary>
+		/// </summary>
+		Popref_popi_popr4 = 0x0F,
+
+		/// <summary>
+		/// </summary>
+		Popref_popi_popr8 = 0x10,
+
+		/// <summary>
+		/// </summary>
+		Popref_popi_popref = 0x11,
+
+		/// <summary>
+		/// </summary>
+		Push0 = 0x12,
+
+		/// <summary>
+		/// </summary>
+		Push1 = 0x13,
+
+		/// <summary>
+		/// </summary>
+		Push1_push1 = 0x14,
+
+		/// <summary>
+		/// </summary>
+		Pushi = 0x15,
+
+		/// <summary>
+		/// </summary>
+		Pushi8 = 0x16,
+
+		/// <summary>
+		/// </summary>
+		Pushr4 = 0x17,
+
+		/// <summary>
+		/// </summary>
+		Pushr8 = 0x18,
+
+		/// <summary>
+		/// </summary>
+		Pushref = 0x19,
+
+		/// <summary>
+		/// </summary>
+		Varpop = 0x1A,
+
+		/// <summary>
+		/// </summary>
+		Varpush = 0x1B
+	}
+
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/StringToken.cs b/mcs/class/corlib/System.Reflection.Emit/StringToken.cs
new file mode 100644
index 00000000000..a872b8967bd
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/StringToken.cs
@@ -0,0 +1,70 @@
+// StringToken.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+
+	/// <summary>
+	///  Represents the Token returned by the metadata to represent a String.
+	/// </summary>
+	[Serializable]
+	public struct StringToken {
+
+		internal int tokValue;
+
+		public static readonly StringToken Empty;
+
+
+		static StringToken ()
+		{
+			Empty = new StringToken ();
+		}
+
+
+		internal StringToken (int val)
+		{
+			tokValue = val;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public override bool Equals (object obj)
+		{
+			bool res = obj is StringToken;
+
+			if (res) {
+				StringToken that = (StringToken) obj;
+				res = (this.tokValue == that.tokValue);
+			}
+
+			return res;
+		}
+
+
+		/// <summary>
+		///  Tests whether the given object is an instance of
+		///  StringToken and has the same token value.
+		/// </summary>
+		public override int GetHashCode ()
+		{
+			return tokValue;
+		}
+
+
+		/// <summary>
+		///  Returns the metadata token for this String.
+		/// </summary>
+		public int Token {
+			get {
+				return tokValue;
+			}
+		}
+
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
new file mode 100644
index 00000000000..91f3ed2b9ea
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeBuilder.cs
@@ -0,0 +1,742 @@
+//
+// System.Reflection.Emit/TypeBuilder.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Globalization;
+using System.Collections;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Reflection.Emit {
+	public sealed class TypeBuilder : Type {
+	private string tname;
+	private string nspace;
+	private Type parent;
+	private Type nesting_type;
+	private Type[] interfaces;
+	private MethodBuilder[] methods;
+	private ConstructorBuilder[] ctors;
+	private PropertyBuilder[] properties;
+	private FieldBuilder[] fields;
+	private EventBuilder[] events;
+	private CustomAttributeBuilder[] cattrs;
+	internal TypeBuilder[] subtypes;
+	private TypeAttributes attrs;
+	private int table_idx;
+	private ModuleBuilder pmodule;
+	private int class_size;
+	private PackingSize packing_size;
+	private Type created;
+
+	public const int UnspecifiedTypeSize = -1;
+
+		protected override TypeAttributes GetAttributeFlagsImpl () {
+			return attrs;
+		}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern void setup_internal_class (TypeBuilder tb);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern void create_internal_class (TypeBuilder tb);
+		
+		internal TypeBuilder (ModuleBuilder mb, string name, TypeAttributes attr, Type parent, Type[] interfaces, PackingSize packing_size, int type_size) {
+			int sep_index;
+			this.parent = parent;
+			this.attrs = attr;
+			this.class_size = type_size;
+			this.packing_size = packing_size;
+			sep_index = name.LastIndexOf('.');
+			if (sep_index != -1) {
+				this.tname = name.Substring (sep_index + 1);
+				this.nspace = name.Substring (0, sep_index);
+			} else {
+				this.tname = name;
+				this.nspace = "";
+			}
+			if (interfaces != null) {
+				this.interfaces = new Type[interfaces.Length];
+				System.Array.Copy (interfaces, this.interfaces, interfaces.Length);
+			}
+			pmodule = mb;
+			// skip .<Module> ?
+			table_idx = mb.get_next_table_index (this, 0x02, true);
+			setup_internal_class (this);
+		}
+
+		public override Assembly Assembly {
+			get {return pmodule.Assembly;}
+		}
+		public override string AssemblyQualifiedName {
+			get {
+				return FullName + ", " + Assembly.ToString();
+			}
+		}
+		public override Type BaseType {
+			get {
+				return parent;
+			}
+		}
+		public override Type DeclaringType {get {return nesting_type;}}
+		public override Type UnderlyingSystemType {
+			get {
+				if (fields != null) {
+					foreach (FieldBuilder f in fields) {
+						if ((f.Attributes & FieldAttributes.Static) == 0)
+							return f.FieldType;
+					}
+				}
+				throw new InvalidOperationException (String.Format ("typebuilder: {0}", this));
+			}
+		}
+
+		public override string FullName {
+			get {
+				if (nesting_type != null)
+					return String.Concat (nesting_type.FullName, "+", tname);
+				if ((nspace != null) && (nspace.Length > 0))
+					return String.Concat (nspace, ".", tname);
+				return tname;
+			}
+		}
+	
+		public override Guid GUID {
+			get {return Guid.Empty;}
+		}
+
+		public override Module Module {
+			get {return pmodule;}
+		}
+		public override string Name {
+			get {return tname;}
+		}
+		public override string Namespace {
+			get {return nspace;}
+		}
+		public PackingSize PackingSize {
+			get {return packing_size;}
+		}
+		public override Type ReflectedType {get {return nesting_type;}}
+		public override MemberTypes MemberType { 
+			get {return MemberTypes.TypeInfo;}
+		}
+
+		[MonoTODO]
+		public void AddDeclarativeSecurity( SecurityAction action, PermissionSet pset) {
+			throw new NotImplementedException ();
+		}
+
+		public void AddInterfaceImplementation( Type interfaceType) {
+			if (interfaces != null) {
+				Type[] ifnew = new Type [interfaces.Length + 1];
+				interfaces.CopyTo (ifnew, 0);
+				ifnew [interfaces.Length] = interfaceType;
+				interfaces = ifnew;
+			} else {
+				interfaces = new Type [1];
+				interfaces [0] = interfaceType;
+			}
+		}
+
+		[MonoTODO]
+		protected override ConstructorInfo GetConstructorImpl (BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) {
+			throw new NotImplementedException ();
+		}
+
+		public override bool IsDefined( Type attributeType, bool inherit) {
+			return false;
+		}
+		public override object[] GetCustomAttributes(bool inherit) {
+			return null;
+		}
+		public override object[] GetCustomAttributes(Type attributeType, bool inherit) {
+			return null;
+		}
+
+		[MonoTODO]
+		public TypeBuilder DefineNestedType (string name) {
+			// FIXME: LAMESPEC: what other attributes should we use here as default?
+			return DefineNestedType (name, TypeAttributes.Public, pmodule.assemblyb.corlib_object_type, null);
+		}
+
+		public TypeBuilder DefineNestedType (string name, TypeAttributes attr) {
+			return DefineNestedType (name, attr, pmodule.assemblyb.corlib_object_type, null);
+		}
+
+		public TypeBuilder DefineNestedType (string name, TypeAttributes attr, Type parent) {
+			return DefineNestedType (name, attr, parent, null);
+		}
+
+		private TypeBuilder DefineNestedType (string name, TypeAttributes attr, Type parent, Type[] interfaces, PackingSize packsize, int typesize) {
+			TypeBuilder res = new TypeBuilder (pmodule, name, attr, parent, interfaces, packsize, typesize);
+			res.nesting_type = this;
+			if (subtypes != null) {
+				TypeBuilder[] new_types = new TypeBuilder [subtypes.Length + 1];
+				System.Array.Copy (subtypes, new_types, subtypes.Length);
+				new_types [subtypes.Length] = res;
+				subtypes = new_types;
+			} else {
+				subtypes = new TypeBuilder [1];
+				subtypes [0] = res;
+			}
+			return res;
+		}
+
+		public TypeBuilder DefineNestedType (string name, TypeAttributes attr, Type parent, Type[] interfaces) {
+			return DefineNestedType (name, attr, parent, interfaces, PackingSize.Unspecified, UnspecifiedTypeSize);
+		}
+
+		public TypeBuilder DefineNestedType (string name, TypeAttributes attr, Type parent, int typesize) {
+			return DefineNestedType (name, attr, parent, null, PackingSize.Unspecified, typesize);
+		}
+
+		public TypeBuilder DefineNestedType (string name, TypeAttributes attr, Type parent, PackingSize packsize) {
+			return DefineNestedType (name, attr, parent, null, packsize, UnspecifiedTypeSize);
+		}
+
+		public ConstructorBuilder DefineConstructor( MethodAttributes attributes, CallingConventions callingConvention, Type[] parameterTypes) {
+			ConstructorBuilder cb = new ConstructorBuilder (this, attributes, callingConvention, parameterTypes);
+			if (ctors != null) {
+				ConstructorBuilder[] new_ctors = new ConstructorBuilder [ctors.Length+1];
+				System.Array.Copy (ctors, new_ctors, ctors.Length);
+				new_ctors [ctors.Length] = cb;
+				ctors = new_ctors;
+			} else {
+				ctors = new ConstructorBuilder [1];
+				ctors [0] = cb;
+			}
+			return cb;
+		}
+
+		public ConstructorBuilder DefineDefaultConstructor( MethodAttributes attributes) {
+			return DefineConstructor (attributes, CallingConventions.Standard, null);
+		}
+
+		public MethodBuilder DefineMethod( string name, MethodAttributes attributes, Type returnType, Type[] parameterTypes) {
+			return DefineMethod (name, attributes, CallingConventions.Standard, returnType, parameterTypes);
+		}
+
+		private void append_method (MethodBuilder mb) {
+			if (methods != null) {
+				MethodBuilder[] new_methods = new MethodBuilder [methods.Length+1];
+				System.Array.Copy (methods, new_methods, methods.Length);
+				new_methods [methods.Length] = mb;
+				methods = new_methods;
+			} else {
+				methods = new MethodBuilder [1];
+				methods [0] = mb;
+			}
+		}
+
+		public MethodBuilder DefineMethod( string name, MethodAttributes attributes, CallingConventions callingConvention, Type returnType, Type[] parameterTypes) {
+			MethodBuilder res = new MethodBuilder (this, name, attributes, callingConvention, returnType, parameterTypes);
+			append_method (res);
+			return res;
+		}
+
+		public MethodBuilder DefinePInvokeMethod (string name, string dllName, string entryName, MethodAttributes attributes, CallingConventions callingConvention, Type returnType, Type[] parameterTypes, CallingConvention nativeCallConv, CharSet nativeCharSet) {
+			MethodBuilder res = new MethodBuilder (this, name, attributes, callingConvention, returnType, parameterTypes,
+				dllName, entryName, nativeCallConv, nativeCharSet);
+			append_method (res);
+			return res;
+		}
+
+		public MethodBuilder DefinePInvokeMethod (string name, string dllName, MethodAttributes attributes, CallingConventions callingConvention, Type returnType, Type[] parameterTypes, CallingConvention nativeCallConv, CharSet nativeCharSet) {
+			return DefinePInvokeMethod (name, dllName, name, attributes, callingConvention, returnType, parameterTypes,
+				nativeCallConv, nativeCharSet);
+		}
+
+		public void DefineMethodOverride( MethodInfo methodInfoBody, MethodInfo methodInfoDeclaration) {
+			if (methodInfoBody is MethodBuilder) {
+				MethodBuilder mb = (MethodBuilder)methodInfoBody;
+				mb.set_override (methodInfoDeclaration);
+			}
+		}
+
+		public FieldBuilder DefineField( string fieldName, Type type, FieldAttributes attributes) {
+			FieldBuilder res = new FieldBuilder (this, fieldName, type, attributes);
+			if (fields != null) {
+				FieldBuilder[] new_fields = new FieldBuilder [fields.Length+1];
+				System.Array.Copy (fields, new_fields, fields.Length);
+				new_fields [fields.Length] = res;
+				fields = new_fields;
+			} else {
+				fields = new FieldBuilder [1];
+				fields [0] = res;
+				create_internal_class (this);
+			}
+			return res;
+		}
+
+		public PropertyBuilder DefineProperty( string name, PropertyAttributes attributes, Type returnType, Type[] parameterTypes) {
+			PropertyBuilder res = new PropertyBuilder (this, name, attributes, returnType, parameterTypes);
+
+			if (properties != null) {
+				PropertyBuilder[] new_properties = new PropertyBuilder [properties.Length+1];
+				System.Array.Copy (properties, new_properties, properties.Length);
+				new_properties [properties.Length] = res;
+				properties = new_properties;
+			} else {
+				properties = new PropertyBuilder [1];
+				properties [0] = res;
+			}
+			return res;
+		}
+
+		[MonoTODO]
+		public ConstructorBuilder DefineTypeInitializer() {
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern Type create_runtime_class (TypeBuilder tb);
+		
+		public Type CreateType() {
+			/* handle nesting_type */
+			if (created != null)
+				throw new InvalidOperationException ("type already created");
+			if (methods != null) {
+				foreach (MethodBuilder method in methods) {
+					method.fixup ();
+				}
+			}
+			if (ctors != null) {
+				foreach (ConstructorBuilder ctor in ctors) {
+					ctor.fixup ();
+				}
+			}
+			created = create_runtime_class (this);
+
+			return this;
+		}
+
+		public override ConstructorInfo[] GetConstructors (BindingFlags bindingAttr) {
+			if (ctors == null)
+				return new ConstructorInfo [0];
+			ArrayList l = new ArrayList ();
+			bool match;
+			MethodAttributes mattrs;
+			
+			foreach (ConstructorBuilder c in ctors) {
+				match = false;
+				mattrs = c.Attributes;
+				if ((mattrs & MethodAttributes.MemberAccessMask) == MethodAttributes.Public) {
+					if ((bindingAttr & BindingFlags.Public) != 0)
+						match = true;
+				} else {
+					if ((bindingAttr & BindingFlags.NonPublic) != 0)
+						match = true;
+				}
+				if (!match)
+					continue;
+				match = false;
+				if ((mattrs & MethodAttributes.Static) != 0) {
+					if ((bindingAttr & BindingFlags.Static) != 0)
+						match = true;
+				} else {
+					if ((bindingAttr & BindingFlags.Instance) != 0)
+						match = true;
+				}
+				if (!match)
+					continue;
+				l.Add (c);
+			}
+			ConstructorInfo[] result = new ConstructorInfo [l.Count];
+			l.CopyTo (result);
+			return result;
+		}
+
+		public override Type GetElementType () { return null; }
+
+		[MonoTODO]
+		public override EventInfo GetEvent (string name, BindingFlags bindingAttr) {
+			throw new NotImplementedException ();
+		}
+
+		public override EventInfo[] GetEvents (BindingFlags bindingAttr) {
+			return new EventInfo [0];
+		}
+
+		[MonoTODO]
+		public override FieldInfo GetField( string name, BindingFlags bindingAttr) {
+			//FIXME
+			throw new NotImplementedException ();
+		}
+
+		public override FieldInfo[] GetFields (BindingFlags bindingAttr) {
+			if (fields == null)
+				return new FieldInfo [0];
+			ArrayList l = new ArrayList ();
+			bool match;
+			FieldAttributes mattrs;
+			
+			foreach (FieldInfo c in fields) {
+				match = false;
+				mattrs = c.Attributes;
+				if ((mattrs & FieldAttributes.FieldAccessMask) == FieldAttributes.Public) {
+					if ((bindingAttr & BindingFlags.Public) != 0)
+						match = true;
+				} else {
+					if ((bindingAttr & BindingFlags.NonPublic) != 0)
+						match = true;
+				}
+				if (!match)
+					continue;
+				match = false;
+				if ((mattrs & FieldAttributes.Static) != 0) {
+					if ((bindingAttr & BindingFlags.Static) != 0)
+						match = true;
+				} else {
+					if ((bindingAttr & BindingFlags.Instance) != 0)
+						match = true;
+				}
+				if (!match)
+					continue;
+				l.Add (c);
+			}
+			FieldInfo[] result = new FieldInfo [l.Count];
+			l.CopyTo (result);
+			return result;
+		}
+
+		[MonoTODO]
+		public override Type GetInterface (string name, bool ignoreCase) {
+			throw new NotImplementedException ();
+		}
+		
+		public override Type[] GetInterfaces () {
+			if (interfaces != null) {
+				Type[] ret = new Type [interfaces.Length];
+				interfaces.CopyTo (ret, 0);
+				return ret;
+			} else {
+				return Type.EmptyTypes;
+			}
+		}
+
+		[MonoTODO]
+		public override MemberInfo[] GetMembers( BindingFlags bindingAttr) {
+			// FIXME
+			throw new NotImplementedException ();
+		}
+
+		public override MethodInfo[] GetMethods (BindingFlags bindingAttr) {
+			if (methods == null)
+				return new MethodInfo [0];
+			ArrayList l = new ArrayList ();
+			bool match;
+			MethodAttributes mattrs;
+
+			foreach (MethodInfo c in methods) {
+				match = false;
+				mattrs = c.Attributes;
+				if ((mattrs & MethodAttributes.MemberAccessMask) == MethodAttributes.Public) {
+					if ((bindingAttr & BindingFlags.Public) != 0)
+						match = true;
+				} else {
+					if ((bindingAttr & BindingFlags.NonPublic) != 0)
+						match = true;
+				}
+				if (!match)
+					continue;
+				match = false;
+				if ((mattrs & MethodAttributes.Static) != 0) {
+					if ((bindingAttr & BindingFlags.Static) != 0)
+						match = true;
+				} else {
+					if ((bindingAttr & BindingFlags.Instance) != 0)
+						match = true;
+				}
+				if (!match)
+					continue;
+				l.Add (c);
+			}
+			MethodInfo[] result = new MethodInfo [l.Count];
+			l.CopyTo (result);
+			return result;
+		}
+
+		[MonoTODO]
+		protected override MethodInfo GetMethodImpl( string name, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) {
+			// FIXME
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public override Type GetNestedType( string name, BindingFlags bindingAttr) {
+			// FIXME
+			throw new NotImplementedException ();
+		}
+
+		public override Type[] GetNestedTypes (BindingFlags bindingAttr) {
+			bool match;
+			ArrayList result = new ArrayList ();
+		
+			if (subtypes == null)
+				return Type.EmptyTypes;
+			foreach (TypeBuilder t in subtypes) {
+				match = false;
+				if ((t.attrs & TypeAttributes.VisibilityMask) == TypeAttributes.NestedPublic) {
+					if ((bindingAttr & BindingFlags.Public) != 0)
+						match = true;
+				} else {
+					if ((bindingAttr & BindingFlags.NonPublic) != 0)
+						match = true;
+				}
+				if (!match)
+					continue;
+				result.Add (t);
+			}
+			Type[] r = new Type [result.Count];
+			result.CopyTo (r);
+			return r;
+		}
+
+		public override PropertyInfo[] GetProperties( BindingFlags bindingAttr) {
+			if (properties == null)
+				return new PropertyInfo [0];
+			ArrayList l = new ArrayList ();
+			bool match;
+			MethodAttributes mattrs;
+			MethodInfo accessor;
+			
+			foreach (PropertyInfo c in properties) {
+				match = false;
+				accessor = c.GetGetMethod (true);
+				if (accessor == null)
+					accessor = c.GetSetMethod (true);
+				if (accessor == null)
+					continue;
+				mattrs = accessor.Attributes;
+				if ((mattrs & MethodAttributes.MemberAccessMask) == MethodAttributes.Public) {
+					if ((bindingAttr & BindingFlags.Public) != 0)
+						match = true;
+				} else {
+					if ((bindingAttr & BindingFlags.NonPublic) != 0)
+						match = true;
+				}
+				if (!match)
+					continue;
+				match = false;
+				if ((mattrs & MethodAttributes.Static) != 0) {
+					if ((bindingAttr & BindingFlags.Static) != 0)
+						match = true;
+				} else {
+					if ((bindingAttr & BindingFlags.Instance) != 0)
+						match = true;
+				}
+				if (!match)
+					continue;
+				l.Add (c);
+			}
+			PropertyInfo[] result = new PropertyInfo [l.Count];
+			l.CopyTo (result);
+			return result;
+		}
+		
+		[MonoTODO]
+		protected override PropertyInfo GetPropertyImpl( string name, BindingFlags bindingAttr, Binder binder, Type returnType, Type[] types, ParameterModifier[] modifiers) {
+			// FIXME
+			throw new NotImplementedException ();
+		}
+
+		protected override bool HasElementTypeImpl () {
+			return IsArrayImpl() || IsByRefImpl() || IsPointerImpl ();
+		}
+
+		[MonoTODO]
+		public override object InvokeMember( string name, BindingFlags invokeAttr, Binder binder, object target, object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters) {
+			// FIXME
+			throw new NotImplementedException ();
+		}
+
+		protected override bool IsArrayImpl () {
+			return type_is_subtype_of (this, typeof (System.Array), false);
+		}
+		protected override bool IsByRefImpl () {
+			// FIXME
+			return false;
+		}
+		protected override bool IsCOMObjectImpl () {
+			return false;
+		}
+		protected override bool IsPointerImpl () {
+			// FIXME
+			return false;
+		}
+		protected override bool IsPrimitiveImpl () {
+			// FIXME
+			return false;
+		}
+		protected override bool IsValueTypeImpl () {
+			return ((type_is_subtype_of (this, pmodule.assemblyb.corlib_value_type, false) || type_is_subtype_of (this, typeof(System.ValueType), false)) &&
+				this != pmodule.assemblyb.corlib_value_type &&
+				this != pmodule.assemblyb.corlib_enum_type);
+		}
+		
+		public override RuntimeTypeHandle TypeHandle { get { return _impl; } }
+
+		private static int decode_len (byte[] data, int pos, out int rpos) {
+			int len = 0;
+			if ((data [pos] & 0x80) == 0) {
+				len = (int)(data [pos++] & 0x7f);
+			} else if ((data [pos] & 0x40) == 0) {
+				len = ((data [pos] & 0x3f) << 8) + data [pos + 1];
+				pos += 2;
+			} else {
+				len = ((data [pos] & 0x1f) << 24) + (data [pos + 1] << 16) + (data [pos + 2] << 8) + data [pos + 3];
+				pos += 4;
+			}
+			rpos = pos;
+			return len;
+		}
+
+		private static string string_from_bytes (byte[] data, int pos, int len) {
+			char[] chars = new char [len];
+			// FIXME: use a utf8 decoder here
+			for (int i = 0; i < len; ++i)
+				chars [i] = (char)data [pos + i];
+			return new String (chars);
+		}
+
+		public void SetCustomAttribute( CustomAttributeBuilder customBuilder) {
+			string attrname = customBuilder.Ctor.ReflectedType.FullName;
+			if (attrname == "System.Runtime.InteropServices.StructLayoutAttribute") {
+				byte[] data = customBuilder.Data;
+				int layout_kind; /* the (stupid) ctor takes a short or an int ... */
+				layout_kind = (int)data [2];
+				layout_kind |= ((int)data [3]) << 8;
+				attrs &= ~TypeAttributes.LayoutMask;
+				switch ((LayoutKind)layout_kind) {
+				case LayoutKind.Auto:
+					attrs |= TypeAttributes.AutoLayout;
+					break;
+				case LayoutKind.Explicit:
+					attrs |= TypeAttributes.ExplicitLayout;
+					break;
+				case LayoutKind.Sequential:
+					attrs |= TypeAttributes.SequentialLayout;
+					break;
+				default:
+					// we should ignore it since it can be any value anyway...
+					throw new Exception ("Error in customattr");
+				}
+				string first_type_name = customBuilder.Ctor.GetParameters()[0].ParameterType.FullName;
+				int pos = 6;
+				if (first_type_name == "System.Int16")
+					pos = 4;
+				int nnamed = (int)data [pos++];
+				nnamed |= ((int)data [pos++]) << 8;
+				for (int i = 0; i < nnamed; ++i) {
+					byte type = data [pos++];
+					int len = decode_len (data, pos, out pos);
+					string named_name = string_from_bytes (data, pos, len);
+					pos += len;
+					/* all the fields are integers in StructLayout */
+					int value = (int)data [pos++];
+					value |= ((int)data [pos++]) << 8;
+					value |= ((int)data [pos++]) << 16;
+					value |= ((int)data [pos++]) << 24;
+					switch (named_name) {
+					case "CharSet":
+						switch ((CharSet)value) {
+						case CharSet.None:
+						case CharSet.Ansi:
+							break;
+						case CharSet.Unicode:
+							attrs |= TypeAttributes.UnicodeClass;
+							break;
+						case CharSet.Auto:
+							attrs |= TypeAttributes.AutoClass;
+							break;
+						default:
+							break; // error out...
+						}
+						break;
+					case "Pack":
+						packing_size = (PackingSize)value;
+						break;
+					case "Size":
+						class_size = value;
+						break;
+					default:
+						break; // error out...
+					}
+				}
+				return;
+			} else if (attrname == "System.SerializableAttribute") {
+				attrs |= TypeAttributes.Serializable;
+				return;
+			}
+			if (cattrs != null) {
+				CustomAttributeBuilder[] new_array = new CustomAttributeBuilder [cattrs.Length + 1];
+				cattrs.CopyTo (new_array, 0);
+				new_array [cattrs.Length] = customBuilder;
+				cattrs = new_array;
+			} else {
+				cattrs = new CustomAttributeBuilder [1];
+				cattrs [0] = customBuilder;
+			}
+		}
+		public void SetCustomAttribute( ConstructorInfo con, byte[] binaryAttribute) {
+			SetCustomAttribute (new CustomAttributeBuilder (con, binaryAttribute));
+		}
+
+		public EventBuilder DefineEvent( string name, EventAttributes attributes, Type eventtype) {
+			EventBuilder res = new EventBuilder (this, name, attributes, eventtype);
+			if (events != null) {
+				EventBuilder[] new_events = new EventBuilder [events.Length+1];
+				System.Array.Copy (events, new_events, events.Length);
+				new_events [events.Length] = res;
+				events = new_events;
+			} else {
+				events = new EventBuilder [1];
+				events [0] = res;
+			}
+			return res;
+		}
+
+		static int InitializedDataCount = 0;
+		
+		public FieldBuilder DefineInitializedData( string name, byte[] data, FieldAttributes attributes) {
+			TypeBuilder datablobtype = pmodule.DefineType ("$ArrayType$"+InitializedDataCount.ToString(),
+				TypeAttributes.Public|TypeAttributes.ExplicitLayout|TypeAttributes.Sealed,
+				pmodule.assemblyb.corlib_value_type, PackingSize.Size1, data.Length);
+			datablobtype.packing_size = PackingSize.Size1;
+			datablobtype.class_size = data.Length;
+			datablobtype.CreateType ();
+			FieldBuilder res = DefineField (name, datablobtype, attributes|FieldAttributes.Assembly|FieldAttributes.Static|FieldAttributes.HasFieldRVA);
+			res.SetRVAData (data);
+			InitializedDataCount++;
+			return res;
+		}
+
+		[MonoTODO]
+		public FieldBuilder DefineUninitializedData( string name, int size, FieldAttributes attributes) {
+			throw new NotImplementedException ();
+		}
+
+		public TypeToken TypeToken {
+			get {
+				return new TypeToken (0x02000000 | table_idx);
+			}
+		}
+		public void SetParent (Type parentType) {
+			parent = parentType;
+		}
+		internal int get_next_table_index (object obj, int table, bool inc) {
+			return pmodule.get_next_table_index (obj, table, inc);
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection.Emit/TypeToken.cs b/mcs/class/corlib/System.Reflection.Emit/TypeToken.cs
new file mode 100644
index 00000000000..8fd6ae493b3
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/TypeToken.cs
@@ -0,0 +1,70 @@
+// TypeToken.cs
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection.Emit {
+
+
+	/// <summary>
+	///  Represents the Token returned by the metadata to represent a Type.
+	/// </summary>
+	[Serializable]
+	public struct TypeToken {
+
+		internal int tokValue;
+
+		public static readonly TypeToken Empty;
+
+
+		static TypeToken ()
+		{
+			Empty = new TypeToken ();
+		}
+
+
+		internal TypeToken (int val)
+		{
+			tokValue = val;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public override bool Equals (object obj)
+		{
+			bool res = obj is TypeToken;
+
+			if (res) {
+				TypeToken that = (TypeToken) obj;
+				res = (this.tokValue == that.tokValue);
+			}
+
+			return res;
+		}
+
+
+		/// <summary>
+		///  Tests whether the given object is an instance of
+		///  TypeToken and has the same token value.
+		/// </summary>
+		public override int GetHashCode ()
+		{
+			return tokValue;
+		}
+
+
+		/// <summary>
+		///  Returns the metadata token for this Type.
+		/// </summary>
+		public int Token {
+			get {
+				return tokValue;
+			}
+		}
+
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Reflection.Emit/UnmanagedMarshal.cs b/mcs/class/corlib/System.Reflection.Emit/UnmanagedMarshal.cs
new file mode 100755
index 00000000000..1c0d8bf5280
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection.Emit/UnmanagedMarshal.cs
@@ -0,0 +1,75 @@
+
+//
+// System.Reflection.Emit/UnmanagedMarshal.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001-2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Reflection.Emit;
+using System.Runtime.InteropServices;
+using System;
+
+namespace System.Reflection.Emit {
+
+	[Serializable]
+	public sealed class UnmanagedMarshal {
+		private int count;
+		private UnmanagedType t;
+		private UnmanagedType tbase;
+		
+		private UnmanagedMarshal (UnmanagedType maint, int cnt) {
+			count = cnt;
+			t = maint;
+			tbase = maint;
+		}
+		private UnmanagedMarshal (UnmanagedType maint, UnmanagedType elemt) {
+			count = 0;
+			t = maint;
+			tbase = elemt;
+		}
+		
+		public UnmanagedType BaseType {
+			get {
+				if (t == UnmanagedType.LPArray || t == UnmanagedType.SafeArray)
+					throw new ArgumentException ();
+				return tbase;
+			}
+		}
+
+		public int ElementCount {
+			get {return count;}
+		}
+
+		public UnmanagedType GetUnmanagedType {
+			get {return t;}
+		}
+
+		public Guid IIDGuid {
+			get {return Guid.Empty;}
+		}
+
+		public static UnmanagedMarshal DefineByValArray( int elemCount) {
+			return new UnmanagedMarshal (UnmanagedType.ByValArray, elemCount);
+		}
+
+		public static UnmanagedMarshal DefineByValTStr( int elemCount) {
+			return new UnmanagedMarshal (UnmanagedType.ByValTStr, elemCount);
+		}
+
+		public static UnmanagedMarshal DefineLPArray( UnmanagedType elemType) {
+			return new UnmanagedMarshal (UnmanagedType.LPArray, elemType);
+		}
+
+		public static UnmanagedMarshal DefineSafeArray( UnmanagedType elemType) {
+			return new UnmanagedMarshal (UnmanagedType.SafeArray, elemType);
+		}
+
+		public static UnmanagedMarshal DefineUnmanagedMarshal( UnmanagedType unmanagedType) {
+			return new UnmanagedMarshal (unmanagedType, unmanagedType);
+		}
+		
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AmbiguousMatchException.cs b/mcs/class/corlib/System.Reflection/AmbiguousMatchException.cs
new file mode 100755
index 00000000000..3bfc25fccd2
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AmbiguousMatchException.cs
@@ -0,0 +1,32 @@
+//
+// System.Reflection.AmbiguousMatchException.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System.Reflection {
+
+	[Serializable]
+	public sealed class AmbiguousMatchException : SystemException {
+		// Constructors
+		public AmbiguousMatchException ()
+			: base ("Ambiguous matching in method resolution")
+		{
+		}
+
+		public AmbiguousMatchException (string message)
+			: base (message)
+		{
+		}
+
+		public AmbiguousMatchException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/Assembly.cs b/mcs/class/corlib/System.Reflection/Assembly.cs
new file mode 100644
index 00000000000..359c78cbbf2
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/Assembly.cs
@@ -0,0 +1,314 @@
+//
+// System.Reflection/Assembly.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Security.Policy;
+using System.Runtime.Serialization;
+using System.Reflection.Emit;
+using System.IO;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System.Reflection {
+
+	[Serializable]
+	public class Assembly : System.Reflection.ICustomAttributeProvider,
+		System.Security.IEvidenceFactory, System.Runtime.Serialization.ISerializable {
+		private IntPtr _mono_assembly;
+
+		internal Assembly () {}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private extern string get_code_base ();
+		
+		public virtual string CodeBase {
+			get {
+				return get_code_base ();
+			}
+		}
+
+		internal virtual string CopiedCodeBase {
+			get {
+				return get_code_base ();
+			}
+		} 
+
+		public virtual string FullName {
+			get {
+				//
+				// FIXME: This is wrong, but it gets us going
+				// in the compiler for now
+				//
+				return GetName (false).ToString ();
+			}
+		}
+
+		public virtual extern MethodInfo EntryPoint {
+			[MethodImplAttribute (MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		public virtual Evidence Evidence {
+			get {
+				return null;
+			}
+		}
+
+		public virtual String Location {
+			get {
+				return null;
+			}
+		}
+
+		public virtual void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+		}
+
+		public virtual bool IsDefined (Type attributeType, bool inherit)
+		{
+			return MonoCustomAttrs.IsDefined (this, attributeType, inherit);
+		}
+
+		public virtual object [] GetCustomAttributes (bool inherit)
+		{
+			return MonoCustomAttrs.GetCustomAttributes (this, inherit);
+		}
+
+		public virtual object [] GetCustomAttributes (Type attributeType, bool inherit)
+		{
+			return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
+		}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private extern object GetFilesInternal (String name);
+
+		public virtual FileStream[] GetFiles ()
+		{
+			string[] names = (string[])GetFilesInternal (null);
+			FileStream[] res = new FileStream [names.Length];
+			for (int i = 0; i < names.Length; ++i)
+				res [i] = new FileStream (names [i], FileMode.Open, FileAccess.Read);
+			return res;
+		}
+
+		public virtual FileStream GetFile (String name)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			string filename = (string)GetFilesInternal (name);
+			if (filename != null)
+				return new FileStream (filename, FileMode.Open, FileAccess.Read);
+			else
+				return null;
+		}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private extern object GetManifestResourceInternal (String name);
+
+		public virtual Stream GetManifestResourceStream (String name)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			object data = GetManifestResourceInternal (name);
+			string filename = data as string;
+			if (data == null)
+				return null;
+			if (filename != null) {
+				return new FileStream (filename, FileMode.Open, FileAccess.Read);
+			} else {
+				return new MemoryStream ((byte[])data, false);
+			}
+		}
+
+		public virtual Stream GetManifestResourceStream (Type type, String name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private extern Type[] GetTypes (bool exportedOnly);
+		
+		public virtual Type[] GetTypes ()
+		{
+			return GetTypes (false);
+		}
+
+		public virtual Type[] GetExportedTypes ()
+		{
+			return GetTypes (true);
+		}
+
+		public virtual Type GetType (String name, Boolean throwOnError)
+		{
+			return GetType (name, throwOnError, false);
+		}
+
+		public virtual Type GetType (String name) {
+			return GetType (name, false, false);
+		}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern Type GetType (String name, Boolean throwOnError, Boolean ignoreCase);
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		static extern void FillName (Assembly ass, AssemblyName aname);
+		
+		public virtual AssemblyName GetName (Boolean copiedName)
+		{
+			AssemblyName aname = new AssemblyName ();
+			FillName (this, aname);
+			return aname;
+		}
+
+		public virtual AssemblyName GetName ()
+		{
+			return GetName (false);
+		}
+
+		public override String ToString ()
+		{
+			return GetName ().Name;
+		}
+
+		[MonoTODO]
+		public static String CreateQualifiedName (String assemblyName, String typeName) 
+		{
+			return typeName + "," + assemblyName;
+		}
+
+		public static Assembly GetAssembly (Type type)
+		{
+			if (type != null)
+				return type.Assembly;
+			throw new ArgumentNullException ("type");
+		}
+
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public static extern Assembly GetEntryAssembly();
+
+		[MonoTODO]
+		public Assembly GetSatelliteAssembly (CultureInfo culture)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public Assembly GetSatelliteAssembly (CultureInfo culture, Version version)
+		{
+			throw new NotImplementedException ();
+		}
+		
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static Assembly LoadFrom (String assemblyFile);
+
+		public static Assembly Load (String assemblyString)
+		{
+			return AppDomain.CurrentDomain.Load (assemblyString);
+		}
+		
+		public static Assembly Load (String assemblyString, Evidence assemblySecurity)
+		{
+			return AppDomain.CurrentDomain.Load (assemblyString, assemblySecurity);
+		}
+
+		public static Assembly Load (AssemblyName assemblyRef)
+		{
+			return AppDomain.CurrentDomain.Load (assemblyRef);
+		}
+
+		public static Assembly Load (AssemblyName assemblyRef, Evidence assemblySecurity)
+		{
+			return AppDomain.CurrentDomain.Load (assemblyRef, assemblySecurity);
+		}
+
+		public static Assembly Load (Byte[] rawAssembly)
+		{
+			return AppDomain.CurrentDomain.Load (rawAssembly);
+		}
+
+		public static Assembly Load (Byte[] rawAssembly, Byte[] rawSymbolStore)
+		{
+			return AppDomain.CurrentDomain.Load (rawAssembly, rawSymbolStore);
+		}
+
+		public static Assembly Load (Byte[] rawAssembly, Byte[] rawSymbolStore,
+					     Evidence securityEvidence)
+		{
+			return AppDomain.CurrentDomain.Load (rawAssembly, rawSymbolStore, securityEvidence);
+		}
+
+		public static Assembly LoadWithPartialName (string partialName)
+		{
+			return LoadWithPartialName (partialName, null);
+		}
+
+		[MonoTODO]
+		public static Assembly LoadWithPartialName (string partialName, Evidence securityEvidence)
+		{
+			return AppDomain.CurrentDomain.Load (partialName, securityEvidence);
+		}
+
+
+		public Object CreateInstance (String typeName) 
+		{
+			return CreateInstance (typeName, false);
+		}
+
+		public Object CreateInstance (String typeName, Boolean ignoreCase)
+		{
+			Type t = GetType (typeName, true, ignoreCase);
+			return Activator.CreateInstance (t);
+		}
+
+		public Object CreateInstance (String typeName, Boolean ignoreCase,
+					      BindingFlags bindingAttr, Binder binder,
+					      Object[] args, CultureInfo culture,
+					      Object[] activationAttributes)
+		{
+			Type t = GetType (typeName, true, ignoreCase);
+			return Activator.CreateInstance (t, bindingAttr, binder, args, culture, activationAttributes);
+		}
+
+		public Module[] GetLoadedModules ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public Module[] GetModules ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public Module GetModule (String name)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern virtual String[] GetManifestResourceNames ();
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static Assembly GetExecutingAssembly ();
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static Assembly GetCallingAssembly ();
+
+		public AssemblyName[] GetReferencedAssemblies ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual ManifestResourceInfo GetManifestResourceInfo (String resourceName)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyAlgorithmIdAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyAlgorithmIdAttribute.cs
new file mode 100644
index 00000000000..39bd0c369a4
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyAlgorithmIdAttribute.cs
@@ -0,0 +1,39 @@
+//
+// System.Reflection.AssemblyAlgorithmIdAttribute.cs
+//
+// Author: Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Configuration.Assemblies;
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyAlgorithmIdAttribute : Attribute
+	{
+		// Field
+		private uint id;
+		
+		// Constructor
+		public AssemblyAlgorithmIdAttribute (AssemblyHashAlgorithm algorithmId)
+		{
+			id = (uint) algorithmId;
+		}
+		
+		[CLSCompliant (false)]
+		public AssemblyAlgorithmIdAttribute (uint algorithmId)
+		{
+			id = algorithmId;
+		}
+		
+		// Property
+		[CLSCompliant (false)]
+		public uint AlgorithmId
+		{
+			get { return id; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyCompanyAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyCompanyAttribute.cs
new file mode 100644
index 00000000000..b6dc24687a9
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyCompanyAttribute.cs
@@ -0,0 +1,31 @@
+//
+// System.Reflection.AssemblyCompanyAttribute.cs
+//
+// Author: Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyCompanyAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyCompanyAttribute (string company)
+		{
+			name = company;
+		}
+		
+		// Properties
+		public string Company
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyConfigurationAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyConfigurationAttribute.cs
new file mode 100644
index 00000000000..8e48b485d2d
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyConfigurationAttribute.cs
@@ -0,0 +1,31 @@
+//
+// System.Reflection.AssemblyConfigurationAttribute.cs
+//
+// Author: Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyConfigurationAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyConfigurationAttribute (string configuration)
+		{
+			name = configuration;
+		}
+		
+		// Properties
+		public string Configuration
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyCopyrightAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyCopyrightAttribute.cs
new file mode 100644
index 00000000000..264a905f0ef
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyCopyrightAttribute.cs
@@ -0,0 +1,31 @@
+//
+// System.Reflection.AssemblyCopyrightAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyCopyrightAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyCopyrightAttribute (string copyright)
+		{
+			name = copyright;
+		}
+		
+		// Properties
+		public string Copyright
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyCultureAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyCultureAttribute.cs
new file mode 100644
index 00000000000..16ce1f96cc4
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyCultureAttribute.cs
@@ -0,0 +1,31 @@
+//
+// System.Reflection.AssemblyCultureAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyCultureAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyCultureAttribute (string culture)
+		{
+			name = culture;
+		}
+		
+		// Properties
+		public string Culture
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyDefaultAliasAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyDefaultAliasAttribute.cs
new file mode 100644
index 00000000000..f91c9314917
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyDefaultAliasAttribute.cs
@@ -0,0 +1,31 @@
+//
+// System.Reflection.AssemblyDefaultAliasAttribute.cs
+//
+// Author: Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyDefaultAliasAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyDefaultAliasAttribute (string defaultAlias)
+		{
+			name = defaultAlias;
+		}
+		
+		// Properties
+		public string DefaultAlias
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyDelaySignAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyDelaySignAttribute.cs
new file mode 100644
index 00000000000..cec22e69659
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyDelaySignAttribute.cs
@@ -0,0 +1,32 @@
+//
+// System.Reflection.AssemblyDelaySignAttribute.cs
+//
+// Author: Duncan Mak <duncan@ximian.com>
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyDelaySignAttribute : Attribute
+	{
+		// Field
+		private bool delay;
+		
+		// Constructor
+		public AssemblyDelaySignAttribute (bool delaySign)
+		{
+			delay = delaySign;
+		}
+
+		// Property
+		public bool DelaySign
+		{
+			get { return delay; }
+		}
+	}
+}
+
+       
diff --git a/mcs/class/corlib/System.Reflection/AssemblyDescriptionAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyDescriptionAttribute.cs
new file mode 100644
index 00000000000..00beee47ec4
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyDescriptionAttribute.cs
@@ -0,0 +1,30 @@
+//
+// System.Reflection.AssemblyDescriptionAttribute.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyDescriptionAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyDescriptionAttribute (string description)
+		{
+			name = description;
+		}
+
+		// Property
+		public string Description
+		{
+			get { return name; }
+		}
+	}
+		
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyFileVersionAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyFileVersionAttribute.cs
new file mode 100644
index 00000000000..c94407ff708
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyFileVersionAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.Reflection.AssemblyFileVersionAttribute.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyFileVersionAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyFileVersionAttribute (string version)
+		{
+			name = version;
+		}
+
+		// Property
+		public string Version
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyFlagsAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyFlagsAttribute.cs
new file mode 100644
index 00000000000..7a9589dde9f
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyFlagsAttribute.cs
@@ -0,0 +1,31 @@
+//
+// System.Reflection.AssemblyFlagsAttribute.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyFlagsAttribute : Attribute
+	{
+		// Field
+		private uint flags;
+		
+		// Constructor
+		[CLSCompliant (false)]
+		public AssemblyFlagsAttribute (uint flags)
+		{
+			this.flags = flags;
+		}
+
+		// Property
+ 		[CLSCompliant (false)]
+		public uint Flags
+		{
+			get { return flags; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyInformationalVersionAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyInformationalVersionAttribute.cs
new file mode 100644
index 00000000000..e3a5742f539
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyInformationalVersionAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.Reflection.AssemblyInformationalVersionAttribute.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyInformationalVersionAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyInformationalVersionAttribute (string informationalVersion)
+		{
+			name = informationalVersion;
+		}
+
+		// Property
+		public string InformationalVersion
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyKeyFileAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyKeyFileAttribute.cs
new file mode 100644
index 00000000000..0e92688493e
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyKeyFileAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.Reflection.AssemblyKeyFileAttribute.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyKeyFileAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyKeyFileAttribute (string keyFile)
+		{
+			name = keyFile;
+		}
+
+		// Property
+		public string KeyFile
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyKeyNameAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyKeyNameAttribute.cs
new file mode 100644
index 00000000000..3323b14ed79
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyKeyNameAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.Reflection.AssemblyKeyNameAttribute.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyKeyNameAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyKeyNameAttribute (string keyName)
+		{
+			name = keyName;
+		}
+
+		// Property
+		public string KeyName
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyName.cs b/mcs/class/corlib/System.Reflection/AssemblyName.cs
new file mode 100755
index 00000000000..2402485734a
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyName.cs
@@ -0,0 +1,174 @@
+
+//
+// System.Reflection/AssemblyName.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Globalization;
+using System.Configuration.Assemblies;
+using System.Runtime.Serialization;
+
+namespace System.Reflection {
+
+	[Serializable]
+	public sealed class AssemblyName  : ISerializable // ICloneable, , IDeserializationCallback
+	{
+		string name = "";
+		string codebase;
+		int major, minor, build, revision;
+		CultureInfo cultureinfo;
+		AssemblyNameFlags flags;
+		AssemblyHashAlgorithm hashalg;
+		StrongNameKeyPair keypair;
+		AssemblyVersionCompatibility versioncompat;
+		
+		public AssemblyName ()
+		{
+		}
+
+		internal AssemblyName (SerializationInfo si, StreamingContext sc)
+		{
+			name = si.GetString ("_Name");
+			codebase = si.GetString ("_CodeBase");
+			Version = (Version)si.GetValue ("_Version", typeof (Version));
+		}
+
+		public string Name {
+			get {
+				return name;
+			}
+			set {
+				name = value;
+			}
+		}
+
+		public string CodeBase {
+			get {
+				return codebase;
+			}
+
+			set {
+				codebase = value;
+			}
+		}
+
+		[MonoTODO]
+		public string EscapedCodeBase {
+			get {
+				return codebase;
+			}
+		}
+
+		public CultureInfo CultureInfo {
+			get {
+				return cultureinfo;
+			}
+
+			set {
+				cultureinfo = value;
+			}
+		}
+
+		public AssemblyNameFlags Flags {
+			get {
+				return flags;
+			}
+
+			set {
+				flags = value;
+			}
+		}
+
+		[MonoTODO]
+		public string FullName {
+			get {
+				return name;
+			}
+		}
+
+		public AssemblyHashAlgorithm HashAlgorithm {
+			get {
+				return hashalg;
+			}
+
+			set {
+				hashalg = value;
+			}
+		}
+
+		public StrongNameKeyPair KeyPair {
+			get {
+				return keypair;
+			}
+
+			set {
+				keypair = value;
+			}
+		}
+
+		public Version Version {
+			get {
+				return new Version (major, minor, build, revision);
+			}
+
+			set {
+				major = value.Major;
+				minor = value.Minor;
+				build = value.Build;
+				revision = value.Revision;
+			}
+		}
+
+		public AssemblyVersionCompatibility VersionCompatibility {
+			get {
+				return versioncompat;
+			}
+
+			set {
+				versioncompat = value;
+			}
+		}
+		
+		public override int GetHashCode ()
+		{
+			return name.GetHashCode ();
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.Reflection.AssemblyName))
+				return false;
+
+			AssemblyName an = (AssemblyName)o;
+
+			if (an.name == this.name)
+				return true;
+			
+			return false;
+		}
+
+		public override string ToString ()
+		{
+			string name = FullName;
+			return (name != null) ? name : base.ToString ();
+		}
+
+		[MonoTODO]
+		public byte[] GetPublicKeyToken() {
+			return new byte[0];
+		}
+
+		public void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			info.AddValue ("_Name", name);
+			info.AddValue ("_CodeBase", codebase);
+			info.AddValue ("_Version", Version);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyNameFlags.cs b/mcs/class/corlib/System.Reflection/AssemblyNameFlags.cs
new file mode 100755
index 00000000000..daa3cd97148
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyNameFlags.cs
@@ -0,0 +1,33 @@
+// AssemblyNameFlags.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:38:33 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	[Serializable]
+	public enum AssemblyNameFlags {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		///  Not sure about the ECMA spec, but this is what is in mscorlib...
+		///  Perhaps this has changed since the beta.
+		/// </summary>
+		PublicKey = 1,
+	} // AssemblyNameFlags
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/AssemblyNameProxy.cs b/mcs/class/corlib/System.Reflection/AssemblyNameProxy.cs
new file mode 100644
index 00000000000..cc02533a741
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyNameProxy.cs
@@ -0,0 +1,27 @@
+//
+// System.Reflection.AssemblyNameProxy.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Reflection
+{
+	public class AssemblyNameProxy : MarshalByRefObject
+	{
+		// Constructor
+		public AssemblyNameProxy ()
+		{
+		}
+
+		// Method
+		[MonoTODO]
+		public AssemblyName GetAssemblyName (string assemblyFile)
+		{
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyProductAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyProductAttribute.cs
new file mode 100644
index 00000000000..67c85f9421b
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyProductAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.Reflection.AssemblyProductAttribute.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyProductAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyProductAttribute (string product)
+		{
+			name = product;
+		}
+
+		// Property
+		public string Product
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyTitleAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyTitleAttribute.cs
new file mode 100644
index 00000000000..f3ac196a789
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyTitleAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.Reflection.AssemblyTitleAttribute.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyTitleAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyTitleAttribute (string title)
+		{
+			name = title;
+		}
+
+		// Property
+		public string Title
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyTradeMarkAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyTradeMarkAttribute.cs
new file mode 100644
index 00000000000..7c2bcc8e712
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyTradeMarkAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.Reflection.AssemblyTrademarkAttribute.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyTrademarkAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyTrademarkAttribute (string trademark)
+		{
+			name = trademark;
+		}
+
+		// Property
+		public string Trademark
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/AssemblyVersionAttribute.cs b/mcs/class/corlib/System.Reflection/AssemblyVersionAttribute.cs
new file mode 100644
index 00000000000..d5f46894698
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/AssemblyVersionAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.Reflection.AssemblyVersionAttribute.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class AssemblyVersionAttribute : Attribute
+	{
+		// Field
+		private string name;
+		
+		// Constructor
+		public AssemblyVersionAttribute (string version)
+		{
+			name = version;
+		}
+
+		// Property
+		public string Version
+		{
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/Binder.cs b/mcs/class/corlib/System.Reflection/Binder.cs
new file mode 100644
index 00000000000..876556102e5
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/Binder.cs
@@ -0,0 +1,13 @@
+// System.Reflection.Binder
+//
+// Sean MacIsaac (macisaac@ximian.com)
+//
+// (C) Ximian, Inc. 2001
+
+namespace System.Reflection
+{
+	[Serializable]
+	public abstract class Binder
+	{
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/BindingFlags.cs b/mcs/class/corlib/System.Reflection/BindingFlags.cs
new file mode 100644
index 00000000000..6d02cfeb196
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/BindingFlags.cs
@@ -0,0 +1,92 @@
+// BindingFlags.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:33:54 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum BindingFlags {
+
+		Default = 0,
+
+		/// <summary>
+		/// </summary>
+		IgnoreCase = 0x00000001,
+
+		/// <summary>
+		/// </summary>
+		DeclaredOnly = 0x00000002,
+
+		/// <summary>
+		/// </summary>
+		Instance = 0x00000004,
+
+		/// <summary>
+		/// </summary>
+		Static = 0x00000008,
+
+		/// <summary>
+		/// </summary>
+		Public = 0x00000010,
+
+		/// <summary>
+		/// </summary>
+		NonPublic = 0x00000020,
+
+		FlattenHierarchy = 0x00000040,
+		
+		/// <summary>
+		/// </summary>
+		InvokeMethod = 0x00000100,
+
+		/// <summary>
+		/// </summary>
+		CreateInstance = 0x00000200,
+
+		/// <summary>
+		/// </summary>
+		GetField = 0x00000400,
+
+		/// <summary>
+		/// </summary>
+		SetField = 0x00000800,
+
+		/// <summary>
+		/// </summary>
+		GetProperty = 0x00001000,
+
+		/// <summary>
+		/// </summary>
+		SetProperty = 0x00002000,
+	       
+		PutDispProperty = 0x00004000,
+
+		PutRefDispProperty = 0x00008000,
+
+		/// <summary>
+		/// </summary>
+		ExactBinding = 0x00010000,
+
+		/// <summary>
+		/// </summary>
+		SuppressChangeType = 0x00020000,
+
+		/// <summary>
+		/// </summary>
+		OptionalParamBinding = 0x00040000,
+
+		IgnoreReturn = 0x01000000
+	} // BindingFlags
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/CallingConventions.cs b/mcs/class/corlib/System.Reflection/CallingConventions.cs
new file mode 100755
index 00000000000..c42c2471c9d
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/CallingConventions.cs
@@ -0,0 +1,42 @@
+// CallingConventions.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:38:43 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum CallingConventions {
+
+		/// <summary>
+		/// </summary>
+		Standard = 1,
+
+		/// <summary>
+		/// </summary>
+		VarArgs = 2,
+
+		/// <summary>
+		/// </summary>
+		Any = 3,
+
+		/// <summary>
+		/// </summary>
+		HasThis = 32,
+
+		/// <summary>
+		/// </summary>
+		ExplicitThis = 64,
+	} // CallingConventions
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/ChangeLog b/mcs/class/corlib/System.Reflection/ChangeLog
new file mode 100644
index 00000000000..0339c846130
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/ChangeLog
@@ -0,0 +1,317 @@
+2002-08-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* MonoField.cs: GetValue renamed to GetValueInternal. Added check for
+	null.
+
+Wed Aug 21 13:03:25 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Assembly.cs: GetEntryAssembly patch by Tomi Pakarinen 
+	<tomi.pakarinen@welho.com>.
+
+2002-08-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Assembly.cs: FullName now returns a proper string instead of
+	something like 'file://...'.
+
+	* AssemblyName.cs: added missing ToString method.
+
+2002-08-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* FieldInfo.cs: implemented SetValue.
+
+Wed Aug 14 17:37:30 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoEvent.cs, MonoMethod.cs: implemented ReflectedType.
+
+2002-08-14  Dick Porter  <dick@ximian.com>
+
+	* Assembly.cs: Stub out GetSatelliteAssembly
+
+2002-08-12  Tim Coleman <tim@timcoleman.com>
+	* MonoProperty.cs:
+		Allow multiple parameters for GetValue ()
+
+Thu Aug 8 13:05:44 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Assembly.cs: implemented GetFile() and GetFiles().
+
+Mon Aug 5 21:19:41 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Assembly.cs: implemented EntryPoint and a few 
+	resource related methods.
+
+Wed Jul 24 13:08:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MethodBase.cs: implemented GetCurrentMethod.
+	* Assembly.cs: implemented GetExecutingAssembly and
+	GetCallingassembly.
+
+Mon Jul 1 18:01:49 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoProperty.cs: handle properties with only a set method.
+
+2002-05-24  Martin Baulig  <martin@gnome.org>
+
+	* ParameterInfo.cs: Added internal constructor.
+
+Thu May 23 17:18:46 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Assembly.cs: implemented CreateInstance ().
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* MethodBase.cs (get_next_table_index): Added `object obj' argument.
+
+Tue May 21 12:07:40 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* EventInfo.cs: more implementation.
+
+Mon May 20 17:37:39 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoEvent.cs: fill-in the implementation.
+
+Sat May 4 15:00:39 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Assembly.cs, AssemblyName.cs: updates and fixes.
+
+2002-04-24	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* MonoProperty.cs (GetValue) : basic implementation to support nunit
+	* PropertyInfo.cs (GetValue) : call MonoProperty::GetValue instead of returning null
+
+Thu Apr 18 16:40:54 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoMethod.c: cache the method name.
+
+2002-04-12  Duncan Mak  <duncan@ximian.com>
+
+	* AssemblyAlgorithmIdAttribute.cs: Fixed typo in AlgorithmId
+	property.
+
+	* AssemblyDelaySignAttribute.cs: Fixed type in DelaySign
+	attribute.
+
+	* AssemblyFileVersionAttribute.cs: Renamed FileVersion property to
+	Version.
+
+	* BindingFlags.cs: Added missing value "PutRefDispProperty".
+
+	* FieldAttributes.cs: Removed value "HasSecurity".
+
+	* ManifestResourceInfo.cs: Added missing properties FileName,
+	ReferencedAssembly and ResourceLocation.
+
+	* TargetInvocationException.cs: Added the missing constructors.
+
+Fri Apr 12 18:32:34 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoMethod.cs: make Name property an icall.
+
+2002-04-08  Nick Drochak  <ndrochak@gol.com>
+
+	* DefaultMemberAttribute.cs: Add AttributeUsage attribute for class,
+	struct and interface.
+
+Fri Apr 5 15:40:24 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoEvent.cs: remove unused code.
+	* MonoProperty: implement ToString().
+
+Wed Apr 3 17:59:26 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Assembly.cs: implement GetTypes() and GetExportedTypes().
+
+Mon Mar 25 18:54:58 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoEvent.cs: added the needed fields.
+
+2002-03-20  Martin Baulig  <martin@gnome.org>
+
+	* ConstructorInfo.cs (Invoke): Implemented, call the abstract Invoke.
+
+	* MonoMethod.cs (MonoCMethod.Invoke): Implemented, call InternalInvoke.
+
+2002-03-14  Dietmar Maurer  <dietmar@ximian.com>
+
+	* MonoMethod.cs (Invoke): call InternalInvoke
+
+	* MethodBase.cs (Invoke): call virtual invoke function 
+
+Thu Mar 7 17:14:20 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* EventInfo.cs: add compiler needed methods.
+	* MonoMethod.cs: make ToString() return the return type name, too.
+
+2002-03-07  Nick Drochak  <ndrochak@gol.com>
+
+	* BindingFlags.cs: Add missing enum values.  Thanks CorCompare.
+
+Tue Mar 5 20:33:14 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* TypeAttributes.cs, MethodImplAttributes.cs: updates to latest spec.
+
+2002-02-26  Duncan Mak  <duncan@ximian.com>
+
+	* StrongNameKeyPair.cs: Committed for Kevin Winchester (kwin@ns.sympatico.ca>.
+
+2002-02-24 Nick Drochak  <ndrochak@gol.com>
+
+	* AssemblyNameFlags.cs: Use proper member name.  Thanks corcompare!
+
+Fri Feb 22 18:54:13 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoField.cs: implement GetValue as an internalcall.
+	Implemented ToString().
+
+Tue Feb 19 20:36:04 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Assembly.cs, Module.cs, MonoField.cs, MonoMethod.cs,
+	MonoProperty.cs, ParameterInfo.cs: Implemented custom attributes
+	related methods.
+
+Thu Feb 14 18:55:23 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* TypeAttributes.cs: update to latest spec.
+
+Mon Feb 11 19:50:27 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Assembly.cs: handle throwOnError in GetType() call.
+
+2002-02-07  Duncan Mak  <duncan@ximian.com>
+
+	* AssemblyName.cs: Implemented ISerializable interface for the
+	fields that we have.
+
+2002-02-05  Duncan Mak  <duncan@ximian.com>
+	
+	* Missing.cs: 
+	* TargetException.cs: Added in CVS.
+
+2002-01-31  Duncan Mak  <duncan@ximian.com>
+
+	* ReflectionTypeLoadException.cs: Added missing bits.
+
+2002-01-23  Duncan Mak  <duncan@ximian.com>
+
+	* AssemblyAlgorithmIdAttribute.cs:
+	* AssemblyCompanyAttribute.cs:
+	* AssemblyConfigurationAttribute.cs:
+	* AssemblyCopyrightAttribute.cs:
+	* AssemblyCultureAttribute.cs:
+	* AssemblyDefaultAliasAttribute.cs:
+	* AssemblyDelaySignAttribute.cs:
+	* AssemblyDescriptionAttribute.cs:
+	* AssemblyFileVersionAttribute.cs:
+	* AssemblyFlagsAttribute.cs:
+	* AssemblyInformationalVersionAttribute.cs:
+	* AssemblyKeyFileAttribute.cs:
+	* AssemblyKeyNameAttribute.cs:
+	* AssemblyNameProxy.cs:
+	* AssemblyProductAttribute.cs:
+	* AssemblyTitleAttribute.cs:
+	* AssemblyTradeMarkAttribute.cs:
+	* AssemblyVersionAttribute.cs:
+	* CustomAttributeFormatException.cs:
+	* InvalidFilterCriteriaException.cs:
+	* TargetParameterCountException.cs: Added.
+
+2002-01-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* Assembly.cs (Assembly.CodeBase): Implement.
+	(Assembly.FullName): simplistic and broken implementation.  Gets
+	us where we were yesterday.
+
+	Code style fix.
+
+Tue Jan 22 22:54:18 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* IReflect.cs: corrected GetMember() return type.
+	* InterfaceMapping.cs, TypeDelegator.cs: implemented.
+
+Wed Jan 9 19:37:14 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoMethod.cs: ToString () implementation.
+
+2002-01-04  Ravi Pratap  <ravi@ximian.com>
+
+	* Assembly.cs : Decorate missing bits with the MonoTODO
+	attribute.
+
+	* ConstructorInfo.cs, MonoMethod.cs, MonoProperty.cs, ParameterInfo.cs,
+	ReflectionTypeLoadException.cs : Ditto.
+
+	* FieldInfo.cs : Ditto.
+	
+Thu Jan 3 23:25:34 CET 2002 Paolo Molaro <lupus@ximian.com>
+	
+	* Assembly.cs: trow unimplemented exceptions.
+
+Tue Dec 18 18:46:22 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* MonoMethod.cs: implemented GetParameters().
+	* MonoProperty.cs: PropertyInfo implementation.
+	* ParameterInfo.cs: implemented.
+	* PropertyInfo.cs: fixes.
+
+Thu Dec 13 20:18:05 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* FieldInfo.cs: implemented some Is* propeties.
+	* MethodBase.cs: fixed attribute accessors.
+	* MonoField.cs: runtime object to represent a field.
+	* MonoMethod.cs: runtime object to represent a method.
+	* AssemblyBuilder.cs: GetToken() methods to get tokens for
+	strings, fields, methods...
+	* ILGenerator.cs: handle tokens for methods.
+
+Mon Nov 19 13:56:55 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* MethodBase.cs: add internal get_next_table_index() for use in
+	Reflection.Emit.
+
+Wed Nov 14 16:53:28 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Assembly.cs: implement some of the Load() methods.
+	* ConstructorInfo.cs: some missing stubs and fields.
+	* FieldInfo.cs: IsInitOnly property.
+	* ParameterInfo.cs: stubs for missing properties.
+	* ParameterModifier.cs: implemented class.
+
+2001-11-10  Sean MacIsaac  <macisaac@ximian.com>
+
+	* Assembly.cs: Filled in some stub implementations
+
+	* ConstructorInfo.cs: Added some stub functions for NUnit
+
+Fri Nov 2 18:29:36 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* AmbiguousMatchException.cs, 
+	* Assembly.cs, Module.cs: updates.
+	* FieldInfo.cs: better compliance to the spec.
+	* MethodBase.cs: move call_conv out of the way.
+	* AssemblyBuilder.cs:  don't use internalcalls, more stuff supported.
+	* FieldBuilder.cs: implemented.
+	* ILGenerator.cs: implemented some opcode handling.
+	* Label.cs: add constructor.
+	* LocalBuilder.cs: implemented.
+	* MethodBuilder.cs: don't use internalcalls, more implemented stuff.
+	* ModuleBuilder.cs: don't use internalcalls, more meat here, too.
+	* ParameterBuilder.cs: implemented.
+	* PropertyBuilder.cs: implemented.
+	* TypeBuilder.cs: don't use internalcalls, more stuff working.
+
+Tue Sep 25 16:48:50 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* ConstructorInfo.cs, MemberFilter.cs, Module.cs: added.
+
+Fri Sep 14 16:12:08 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* MethodBase.cs, MethodInfo.cs: added.
+
+Thu Sep 13 18:05:16 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Assembly.cs: added stub code.
+
+2001-07-18  Michael Lambert <michaellambert@email.com>
+
+	* BindingFlags.cs: Add.
+>>>>>>> 1.52
diff --git a/mcs/class/corlib/System.Reflection/ConstructorInfo.cs b/mcs/class/corlib/System.Reflection/ConstructorInfo.cs
new file mode 100644
index 00000000000..936f50ef8df
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/ConstructorInfo.cs
@@ -0,0 +1,39 @@
+//
+// System.Reflection/ConstructorInfo.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Globalization;
+
+namespace System.Reflection {
+	[Serializable]
+	public abstract class ConstructorInfo : MethodBase {
+		public static readonly string ConstructorName = ".ctor";
+		public static readonly string TypeConstructorName = ".cctor";
+
+		protected ConstructorInfo() {
+		}
+		
+		public override MemberTypes MemberType {
+			get {return MemberTypes.Constructor;}
+		}
+
+		public object Invoke (object[] parameters)
+		{
+			if (parameters == null)
+				parameters = new object [0];
+
+			return Invoke (BindingFlags.CreateInstance, null, parameters, null);
+		}
+
+		public abstract object Invoke (BindingFlags invokeAttr, Binder binder, object[] parameters,
+					       CultureInfo culture);
+		
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/CustomAttributeFormatException.cs b/mcs/class/corlib/System.Reflection/CustomAttributeFormatException.cs
new file mode 100644
index 00000000000..0e1c5c3692e
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/CustomAttributeFormatException.cs
@@ -0,0 +1,38 @@
+//
+// System.Reflection.CustomAttributeFormatException.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc. http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Reflection
+{
+	[Serializable]
+	public class CustomAttributeFormatException : FormatException
+	{
+		// Constructors
+		public CustomAttributeFormatException ()
+			: base (Locale.GetText ("The Binary format of the custom attribute is invalid."))
+			{
+			}
+		public CustomAttributeFormatException (string message)
+			: base (message)
+			{
+			}
+
+		public CustomAttributeFormatException (string message, Exception inner)
+			: base (message, inner)
+			{
+			}
+
+		protected CustomAttributeFormatException (SerializationInfo info,
+						       StreamingContext context)
+			{
+			}
+	}       
+}
+
diff --git a/mcs/class/corlib/System.Reflection/DefaultMemberAttribute.cs b/mcs/class/corlib/System.Reflection/DefaultMemberAttribute.cs
new file mode 100644
index 00000000000..855cff8ed7d
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/DefaultMemberAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.Reflection.DefaultMemberAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Reflection {
+
+	[Serializable]
+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct |
+		AttributeTargets.Interface)]
+	public sealed class DefaultMemberAttribute : Attribute {
+		string member_name;
+		
+		public DefaultMemberAttribute (string member_name)
+		{
+			this.member_name = member_name;
+		}
+
+		public string MemberName {
+			get {
+				return member_name;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/EventAttributes.cs b/mcs/class/corlib/System.Reflection/EventAttributes.cs
new file mode 100755
index 00000000000..efb1154e21c
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/EventAttributes.cs
@@ -0,0 +1,37 @@
+// EventAttributes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:39:03 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	public enum EventAttributes {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		SpecialName = 512,
+
+		/// <summary>
+		/// </summary>
+		ReservedMask = 1024,
+
+		/// <summary>
+		/// </summary>
+		RTSpecialName = 1024,
+	} // EventAttributes
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/EventInfo.cs b/mcs/class/corlib/System.Reflection/EventInfo.cs
new file mode 100755
index 00000000000..0cbd6620592
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/EventInfo.cs
@@ -0,0 +1,87 @@
+//
+// System.Reflection/EventInfo.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+
+namespace System.Reflection {
+	public abstract class EventInfo : MemberInfo {
+
+		public abstract EventAttributes Attributes {get;}
+
+		public Type EventHandlerType {
+			get {
+				ParameterInfo[] p;
+				MethodInfo add = GetAddMethod (true);
+				p = add.GetParameters ();
+				if (p.Length > 0) {
+					Type t = p [0].ParameterType;
+					/* is it alwasys the first arg?
+					if (!t.IsSubclassOf (typeof (System.Delegate)))
+						throw new Exception ("no delegate in event");*/
+					return t;
+				} else
+					return null;
+			}
+		}
+		public bool IsMulticast {get {return true;}}
+		public bool IsSpecialName {get {return false;}}
+		public override MemberTypes MemberType {
+			get {return MemberTypes.Event;}
+		}
+
+		protected EventInfo() {
+		}
+
+		public void AddEventHandler( object target, Delegate handler) {
+		}
+		public MethodInfo GetAddMethod() {
+			return GetAddMethod (false);
+		}
+		public abstract MethodInfo GetAddMethod(bool nonPublic);
+		public MethodInfo GetRaiseMethod() {
+			return GetRaiseMethod (false);
+		}
+		public abstract MethodInfo GetRaiseMethod( bool nonPublic);
+		public MethodInfo GetRemoveMethod() {
+			return GetRemoveMethod (false);
+		}
+		public abstract MethodInfo GetRemoveMethod( bool nonPublic);
+		public void RemoveEventHandler( object target, Delegate handler) {
+		}
+
+		public override bool IsDefined (Type attributeType, bool inherit) {
+			return MonoCustomAttrs.IsDefined (this, attributeType, inherit);
+		}
+
+		public override object[] GetCustomAttributes( bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, inherit);
+		}
+		public override object[] GetCustomAttributes( Type attributeType, bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
+		}
+		public override Type ReflectedType {
+			get {
+				return null;
+			}
+		}
+		public override Type DeclaringType {
+			get {
+				return null;
+			}
+		}
+
+		public override String Name {
+			get {
+				return "Eventname";
+			}
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/FieldAttributes.cs b/mcs/class/corlib/System.Reflection/FieldAttributes.cs
new file mode 100755
index 00000000000..5462fc2b102
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/FieldAttributes.cs
@@ -0,0 +1,102 @@
+// FieldAttributes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:39:12 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	public enum FieldAttributes {
+
+		/// <summary>
+		/// </summary>
+		FieldAccessMask = 7,
+
+		/// <summary>
+		/// </summary>
+		PrivateScope = 0x0,
+
+		/// <summary>
+		/// </summary>
+		Private = 0x1,
+
+		/// <summary>
+		/// </summary>
+		FamANDAssem = 0x2,
+
+		/// <summary>
+		/// </summary>
+		Assembly = 0x3,
+
+		/// <summary>
+		/// </summary>
+		Family = 0x4,
+
+		/// <summary>
+		/// </summary>
+		FamORAssem = 0x5,
+
+		/// <summary>
+		/// </summary>
+		Public = 0x6,
+
+		/// <summary>
+		/// </summary>
+		Static = 0x10,
+
+		/// <summary>
+		/// </summary>
+		InitOnly = 0x20,
+
+		/// <summary>
+		/// </summary>
+		Literal = 0x40,
+
+		/// <summary>
+		/// </summary>
+		NotSerialized = 0x80,
+
+		/// <summary>
+		/// </summary>
+		HasFieldRVA = 0x100,
+
+		/// <summary>
+		/// </summary>
+		SpecialName = 0x200,
+
+		/// <summary>
+		/// </summary>
+		RTSpecialName = 0x400,
+
+		/// <summary>
+		/// </summary>
+		HasFieldMarshal = 0x1000,	
+
+		/// <summary>
+		/// </summary>
+		PinvokeImpl = 0x2000,
+
+		/// <summary>
+		/// </summary>
+		// HasSecurity = 0x4000,
+
+		/// <summary>
+		/// </summary>
+		HasDefault = 0x8000,
+
+		/// <summary>
+		/// </summary>
+		ReservedMask = HasDefault | HasFieldMarshal | RTSpecialName | HasFieldRVA,
+
+	} // FieldAttributes
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/FieldInfo.cs b/mcs/class/corlib/System.Reflection/FieldInfo.cs
new file mode 100755
index 00000000000..1488514b5c3
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/FieldInfo.cs
@@ -0,0 +1,122 @@
+//
+// System.Reflection.FieldInfo.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+// TODO: Mucho left to implement.
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System.Reflection {
+
+	[Serializable]
+	public abstract class FieldInfo : MemberInfo {
+
+		public abstract FieldAttributes Attributes {get;}
+		public abstract RuntimeFieldHandle FieldHandle {get;}
+
+		public abstract Type FieldType { get; }
+
+		public abstract object GetValue(object obj);
+
+		public override MemberTypes MemberType {
+			get { return MemberTypes.Field;}
+		}
+
+		public bool IsLiteral
+		{
+			get {return (Attributes & FieldAttributes.Literal) != 0;}
+		} 
+
+		public bool IsStatic
+		{
+			get {return (Attributes & FieldAttributes.Static) != 0;}
+		} 
+
+		public bool IsInitOnly
+		{
+			get {return (Attributes & FieldAttributes.InitOnly) != 0;}
+		} 
+		public Boolean IsPublic
+		{ 
+			get
+			{
+				return (Attributes & FieldAttributes.FieldAccessMask) == FieldAttributes.Public;
+			}
+		}
+		public Boolean IsPrivate
+		{
+			get
+			{
+				return (Attributes & FieldAttributes.FieldAccessMask) == FieldAttributes.Private;
+			}
+		}
+		public Boolean IsFamily
+		{
+			get
+			{
+				return (Attributes & FieldAttributes.FieldAccessMask) == FieldAttributes.Family;
+			}
+		}
+		public Boolean IsAssembly
+		{
+			get
+			{
+				return (Attributes & FieldAttributes.FieldAccessMask) == FieldAttributes.Assembly;
+			}
+		}
+		public Boolean IsFamilyAndAssembly
+		{
+			get {
+				return (Attributes & FieldAttributes.FieldAccessMask) == FieldAttributes.FamANDAssem;
+			}
+		}
+		public Boolean IsFamilyOrAssembly
+		{
+			get
+			{
+				return (Attributes & FieldAttributes.FieldAccessMask) == FieldAttributes.FamORAssem;
+			}
+		}
+		public Boolean IsPinvokeImpl
+		{
+			get
+			{
+				return (Attributes & FieldAttributes.PinvokeImpl) == FieldAttributes.PinvokeImpl;
+			}
+		}
+		public Boolean IsSpecialName
+		{
+			get
+			{
+				return (Attributes & FieldAttributes.SpecialName) == FieldAttributes.SpecialName;
+			}
+		}
+		public Boolean IsNotSerialized
+		{
+			get
+			{
+				return (Attributes & FieldAttributes.NotSerialized) == FieldAttributes.NotSerialized;
+			}
+		}
+
+		public abstract void SetValue (object obj, object val, BindingFlags invokeAttr, Binder binder, CultureInfo culture);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern void SetValueInternal (FieldInfo fi, object obj, object value);
+
+		public void SetValue (object obj, object value)
+		{
+			//FIXME: when Binder.BindToField works, use it to check conversion
+			SetValueInternal (this, obj, value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/ICustomAttributeProvider.cs b/mcs/class/corlib/System.Reflection/ICustomAttributeProvider.cs
new file mode 100755
index 00000000000..c0c06c274ac
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/ICustomAttributeProvider.cs
@@ -0,0 +1,25 @@
+//
+// System.Reflection.ICustomAttributeProvider.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+// TODO: Mucho left to implement.
+//
+
+namespace System.Reflection {
+
+	public interface ICustomAttributeProvider {
+
+		object [] GetCustomAttributes (bool inherit);
+		object [] GetCustomAttributes (Type attribute_type, bool inherit);
+
+		/// <summary>
+		///   Probes whether one or more `attribute_type' types are
+		///   defined by this member
+		/// </summary>
+		bool IsDefined (Type attribute_type, bool inherit);
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/IReflect.cs b/mcs/class/corlib/System.Reflection/IReflect.cs
new file mode 100755
index 00000000000..e89c3298a69
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/IReflect.cs
@@ -0,0 +1,44 @@
+//
+// System.Reflection.IReflect.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+// TODO: Mucho left to implement.
+//
+
+using System.Globalization;
+
+namespace System.Reflection {
+
+	public interface IReflect {
+
+		Type UnderlyingSystemType {
+			get;
+		}
+
+		FieldInfo    GetField   (string name, BindingFlags binding_attr);
+		FieldInfo [] GetFields  (BindingFlags binding_attr);
+		MemberInfo[] GetMember  (string name, BindingFlags binding_attr);
+		MemberInfo[] GetMembers (BindingFlags binding_attr);
+		MethodInfo   GetMethod  (string name, BindingFlags binding_attr);
+		MethodInfo   GetMethod  (string name, BindingFlags binding_attr,
+					 Binder binder, Type [] types, ParameterModifier [] modifiers);
+		MethodInfo[] GetMethods (BindingFlags binding_attr);
+
+		PropertyInfo [] GetProperties (BindingFlags binding_attr);
+		PropertyInfo    GetProperty   (string name, BindingFlags binding_attr);
+		PropertyInfo    GetProperty   (string name, BindingFlags binding_attr,
+					       Binder binder, Type return_type, Type [] types,
+					       ParameterModifier [] modifiers);
+
+		object InvokeMember (string name, BindingFlags invoke_attr,
+				     Binder binder, object target, object [] args,
+				     ParameterModifier [] modifiers,
+				     CultureInfo culture,
+				     string [] named_parameters);
+				     
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/InterfaceMapping.cs b/mcs/class/corlib/System.Reflection/InterfaceMapping.cs
new file mode 100755
index 00000000000..8da05148398
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/InterfaceMapping.cs
@@ -0,0 +1,10 @@
+
+namespace System.Reflection {
+
+	public struct InterfaceMapping {
+		public MethodInfo[] InterfaceMethods;
+		public Type InterfaceType;
+		public MethodInfo[] TargetMethods;
+		public Type TargetType;
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/InvalidFilterCriteriaException.cs b/mcs/class/corlib/System.Reflection/InvalidFilterCriteriaException.cs
new file mode 100644
index 00000000000..f1a73377a28
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/InvalidFilterCriteriaException.cs
@@ -0,0 +1,37 @@
+//
+// System.Reflection.InvalidFilterCriteriaException.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Reflection
+{
+	[Serializable]
+	public class InvalidFilterCriteriaException : ApplicationException
+	{
+		public InvalidFilterCriteriaException ()
+			: base (Locale.GetText ("Filter Criteria is not valid."))
+			{
+			}
+		public InvalidFilterCriteriaException (string message)
+			: base (message)
+		{
+		}
+
+		public InvalidFilterCriteriaException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected InvalidFilterCriteriaException (SerializationInfo info,
+						       StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/ManifestResourceInfo.cs b/mcs/class/corlib/System.Reflection/ManifestResourceInfo.cs
new file mode 100644
index 00000000000..76a359fa5a1
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/ManifestResourceInfo.cs
@@ -0,0 +1,37 @@
+// System.Reflection.ManifestResourceInfo
+//
+// Sean MacIsaac (macisaac@ximian.com)
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc. 2001
+
+namespace System.Reflection
+{
+	public class ManifestResourceInfo
+	{
+		private Assembly _assembly;
+		private string _filename;
+		private ResourceLocation _location;
+
+		internal ManifestResourceInfo (Assembly assembly, string filename, ResourceLocation location)
+		{
+			_assembly = assembly;
+			_filename = filename;
+			_location = location;
+		}
+		[MonoTODO]
+		public virtual string FileName {
+			get { return _filename; }
+		}
+
+		[MonoTODO]
+		public virtual Assembly ReferencedAssembly {
+			get { return _assembly; }
+		}
+
+		[MonoTODO]
+		public virtual ResourceLocation ResourceLocation {
+			get { return _location; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/MemberFilter.cs b/mcs/class/corlib/System.Reflection/MemberFilter.cs
new file mode 100644
index 00000000000..74e73a69ce3
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MemberFilter.cs
@@ -0,0 +1,7 @@
+using System;
+using System.Reflection;
+
+namespace System.Reflection {
+	public delegate bool MemberFilter( MemberInfo m, object filterCriteria);
+
+}
diff --git a/mcs/class/corlib/System.Reflection/MemberInfo.cs b/mcs/class/corlib/System.Reflection/MemberInfo.cs
new file mode 100755
index 00000000000..9e3c52b8038
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MemberInfo.cs
@@ -0,0 +1,39 @@
+//
+// System.Reflection.MemberInfo.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+// TODO: Mucho left to implement.
+//
+
+namespace System.Reflection {
+
+	[Serializable]
+	public abstract class MemberInfo : ICustomAttributeProvider {
+
+		public abstract Type DeclaringType {
+			get;
+		}
+
+		public abstract MemberTypes MemberType {
+			get;
+		}
+
+		public abstract string Name {
+			get;
+		}
+
+		public abstract Type ReflectedType {
+			get;
+		}
+
+		public abstract bool IsDefined (Type attribute_type, bool inherit);
+
+		public abstract object [] GetCustomAttributes (bool inherit);
+
+		public abstract object [] GetCustomAttributes (Type attribute_type, bool inherit);
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/MemberTypes.cs b/mcs/class/corlib/System.Reflection/MemberTypes.cs
new file mode 100755
index 00000000000..00a1234ef36
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MemberTypes.cs
@@ -0,0 +1,57 @@
+// MemberTypes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:38:53 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	public enum MemberTypes {
+
+		/// <summary>
+		/// </summary>
+		Constructor = 1,
+
+		/// <summary>
+		/// </summary>
+		Event = 2,
+
+		/// <summary>
+		/// </summary>
+		Field = 4,
+
+		/// <summary>
+		/// </summary>
+		Method = 8,
+
+		/// <summary>
+		/// </summary>
+		Property = 16,
+
+		/// <summary>
+		/// </summary>
+		TypeInfo = 32,
+
+		/// <summary>
+		/// </summary>
+		Custom = 64,
+
+		/// <summary>
+		/// </summary>
+		NestedType = 128,
+
+		/// <summary>
+		/// </summary>
+		All = 191,
+	} // MemberTypes
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/MethodAttributes.cs b/mcs/class/corlib/System.Reflection/MethodAttributes.cs
new file mode 100755
index 00000000000..51ac6f18a6a
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MethodAttributes.cs
@@ -0,0 +1,113 @@
+// MethodAttributes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:39:32 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	public enum MethodAttributes {
+
+		/// <summary>
+		/// </summary>
+		MemberAccessMask = 7,
+
+		/// <summary>
+		/// </summary>
+		PrivateScope = 0,
+
+		/// <summary>
+		/// </summary>
+		Private = 1,
+
+		/// <summary>
+		/// </summary>
+		FamANDAssem = 2,
+
+		/// <summary>
+		/// </summary>
+		Assembly = 3,
+
+		/// <summary>
+		/// </summary>
+		Family = 4,
+
+		/// <summary>
+		/// </summary>
+		FamORAssem = 5,
+
+		/// <summary>
+		/// </summary>
+		Public = 6,
+
+		/// <summary>
+		/// </summary>
+		Static = 16,
+
+		/// <summary>
+		/// </summary>
+		Final = 32,
+
+		/// <summary>
+		/// </summary>
+		Virtual = 64,
+
+		/// <summary>
+		/// </summary>
+		HideBySig = 128,
+
+		/// <summary>
+		/// </summary>
+		VtableLayoutMask = 256,
+
+		/// <summary>
+		/// </summary>
+		ReuseSlot = 0,
+
+		/// <summary>
+		/// </summary>
+		NewSlot = 256,
+
+		/// <summary>
+		/// </summary>
+		Abstract = 1024,
+
+		/// <summary>
+		/// </summary>
+		SpecialName = 2048,
+
+		/// <summary>
+		/// </summary>
+		PinvokeImpl = 8192,
+
+		/// <summary>
+		/// </summary>
+		UnmanagedExport = 8,
+
+		/// <summary>
+		/// </summary>
+		RTSpecialName = 4096,
+
+		/// <summary>
+		/// </summary>
+		ReservedMask = 53248,
+
+		/// <summary>
+		/// </summary>
+		HasSecurity = 16384,
+
+		/// <summary>
+		/// </summary>
+		RequireSecObject = 32768,
+	} // MethodAttributes
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/MethodBase.cs b/mcs/class/corlib/System.Reflection/MethodBase.cs
new file mode 100644
index 00000000000..fda971d8d95
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MethodBase.cs
@@ -0,0 +1,126 @@
+//
+// System.Reflection/MethodBase.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+
+namespace System.Reflection {
+
+	[Serializable]
+	public abstract class MethodBase: MemberInfo {
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static MethodBase GetCurrentMethod ();
+
+		public static MethodBase GetMethodFromHandle(RuntimeMethodHandle handle)
+		{
+			return null;
+		}
+
+		public abstract MethodImplAttributes GetMethodImplementationFlags();
+
+		public abstract ParameterInfo[] GetParameters();
+		
+		public Object Invoke(Object obj, Object[] parameters) {
+			return Invoke (obj, 0, null, parameters, null);
+		}
+
+		public abstract Object Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture);
+
+		protected MethodBase()
+		{
+		}
+
+		public abstract RuntimeMethodHandle MethodHandle { get; }
+		public abstract MethodAttributes Attributes { get; }
+		public virtual CallingConventions CallingConvention { get {return CallingConventions.Standard;} }
+		public Boolean IsPublic { 
+			get {
+				return (Attributes & MethodAttributes.MemberAccessMask) == MethodAttributes.Public;
+			}
+		}
+		public Boolean IsPrivate {
+			get {
+				return (Attributes & MethodAttributes.MemberAccessMask) == MethodAttributes.Private;
+			}
+		}
+		public Boolean IsFamily {
+			get {
+				return (Attributes & MethodAttributes.MemberAccessMask) == MethodAttributes.Family;
+			}
+		}
+		public Boolean IsAssembly {
+			get {
+				return (Attributes & MethodAttributes.MemberAccessMask) == MethodAttributes.Assembly;
+			}
+		}
+		public Boolean IsFamilyAndAssembly {
+			get {
+				return (Attributes & MethodAttributes.MemberAccessMask) == MethodAttributes.FamANDAssem;
+			}
+		}
+		public Boolean IsFamilyOrAssembly {
+			get {
+				return (Attributes & MethodAttributes.MemberAccessMask) == MethodAttributes.FamORAssem;
+			}
+		}
+		public Boolean IsStatic {
+			get {
+				return (Attributes & MethodAttributes.Static) != 0;
+			}
+		}
+		public Boolean IsFinal {
+			get {
+				return (Attributes & MethodAttributes.Final) != 0;
+			}
+		}
+		public Boolean IsVirtual {
+			get {
+				return (Attributes & MethodAttributes.Virtual) != 0;
+			}
+		}
+		public Boolean IsHideBySig {
+			get {
+				return (Attributes & MethodAttributes.HideBySig) != 0;
+			}
+		}
+		public Boolean IsAbstract {
+			get {
+				return (Attributes & MethodAttributes.Abstract) != 0;
+			}
+		}
+		public Boolean IsSpecialName {
+			get {
+				int attr = (int)Attributes;
+				return (attr & (int)MethodAttributes.SpecialName) != 0;
+			}
+		}
+		public Boolean IsConstructor {
+			get {
+				int attr = (int)Attributes;
+				return ((attr & (int)MethodAttributes.RTSpecialName) != 0
+					&& (Name == ".ctor"));
+			}
+		}
+
+		internal virtual int get_next_table_index (object obj, int table, bool inc) {
+			if (this is MethodBuilder) {
+				MethodBuilder mb = (MethodBuilder)this;
+				return mb.get_next_table_index (obj, table, inc);
+			}
+			if (this is ConstructorBuilder) {
+				ConstructorBuilder mb = (ConstructorBuilder)this;
+				return mb.get_next_table_index (obj, table, inc);
+			}
+			throw new Exception ("Method is not a builder method");
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/MethodImplAttributes.cs b/mcs/class/corlib/System.Reflection/MethodImplAttributes.cs
new file mode 100755
index 00000000000..aaa243ab6d3
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MethodImplAttributes.cs
@@ -0,0 +1,77 @@
+// MethodImplAttributes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:39:42 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	public enum MethodImplAttributes {
+
+		/// <summary>
+		/// </summary>
+		CodeTypeMask = 3,
+
+		/// <summary>
+		/// </summary>
+		IL = 0,
+
+		/// <summary>
+		/// </summary>
+		Native = 1,
+
+		/// <summary>
+		/// </summary>
+		OPTIL = 2,
+
+		/// <summary>
+		/// </summary>
+		Runtime = 3,
+
+		/// <summary>
+		/// </summary>
+		ManagedMask = 4,
+
+		/// <summary>
+		/// </summary>
+		Unmanaged = 4,
+
+		/// <summary>
+		/// </summary>
+		Managed = 0,
+
+		/// <summary>
+		/// </summary>
+		ForwardRef = 16,
+
+		/// <summary>
+		/// </summary>
+		PreserveSig = 128,
+
+		/// <summary>
+		/// </summary>
+		InternalCall = 4096,
+
+		/// <summary>
+		/// </summary>
+		Synchronized = 32,
+
+		/// <summary>
+		/// </summary>
+		NoInlining = 8,
+
+		/// <summary>
+		/// </summary>
+		MaxMethodImplVal = 65535,
+	} // MethodImplAttributes
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/MethodInfo.cs b/mcs/class/corlib/System.Reflection/MethodInfo.cs
new file mode 100644
index 00000000000..505a9b626bd
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MethodInfo.cs
@@ -0,0 +1,26 @@
+//
+// System.Reflection/MethodInfo.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System.Reflection {
+
+	[Serializable]
+	public abstract class MethodInfo: MethodBase {
+
+		public abstract MethodInfo GetBaseDefinition();
+
+		protected MethodInfo() {
+		}
+		public override MemberTypes MemberType { get {return MemberTypes.Method;} }
+		public abstract Type ReturnType { get; }
+		public abstract ICustomAttributeProvider ReturnTypeCustomAttributes { get; } 
+	}
+
+}
diff --git a/mcs/class/corlib/System.Reflection/Missing.cs b/mcs/class/corlib/System.Reflection/Missing.cs
new file mode 100644
index 00000000000..dfce32dae3e
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/Missing.cs
@@ -0,0 +1,17 @@
+//
+// System.Reflection.Missing.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Reflection
+{
+	public sealed class Missing
+	{
+		public static readonly Missing Value;
+
+		internal Missing () {}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/Module.cs b/mcs/class/corlib/System.Reflection/Module.cs
new file mode 100644
index 00000000000..2d1c8005446
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/Module.cs
@@ -0,0 +1,103 @@
+//
+// System.Reflection/Module.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Security.Cryptography.X509Certificates;
+
+namespace System.Reflection {
+	[Serializable]
+	public class Module : ISerializable, ICustomAttributeProvider {
+
+		public static readonly TypeFilter FilterTypeName;
+		public static readonly TypeFilter FilterTypeNameIgnoreCase;
+
+		private IntPtr _impl; /* a pointer to a MonoImage */
+		internal Assembly assembly;
+		internal string fqname;
+		internal string name;
+		internal string scopename;
+
+		internal Module () {}
+
+		public Assembly Assembly {get {return assembly;}}
+		public virtual string FullyQualifiedName {get {return fqname;}}
+		public string Name {get {return name;}}
+		public string ScopeName {get {return scopename;}}
+
+
+		public virtual Type[] FindTypes(TypeFilter filter, object filterCriteria) {
+			return null;
+		}
+		public virtual object[] GetCustomAttributes(bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, inherit);
+		}
+		public virtual object[] GetCustomAttributes(Type attributeType, bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
+		}
+		public FieldInfo GetField(string name) {
+			return null;
+		}
+		public FieldInfo GetField(string name, BindingFlags flags) {
+			return null;
+		}
+		public FieldInfo[] GetFields() {
+			return null;
+		}
+
+		public MethodInfo GetMethod(string name) {
+			return null;
+		}
+		public MethodInfo GetMethod(string name, Type[] types) {
+			return null;
+		}
+		public MethodInfo GetMethod( string name, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) {
+			return null;
+		}
+		protected virtual MethodInfo GetMethodImpl( string name, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) {
+			return null;
+		}
+		public MethodInfo[] GetMethods() {
+			return null;
+		}
+		public virtual void GetObjectData( SerializationInfo info, StreamingContext context) {}
+		public X509Certificate GetSignerCertificate() {
+			return null;
+		}
+		public virtual Type GetType(string className) {
+			return null;
+		}
+		public virtual Type GetType(string className, bool ignoreCase) {
+			return null;
+		}
+		public virtual Type GetType(string className, bool throwOnError, bool ignoreCase) {
+			return null;
+		}
+		public virtual Type[] GetTypes() {
+			return null;
+		}
+		public virtual bool IsDefined( Type attributeType, bool inherit) {
+			return MonoCustomAttrs.IsDefined (this, attributeType, inherit);
+		}
+		public bool IsResource() {
+			return false;
+		}
+		public override string ToString() {
+			return "Reflection.Module: " + name;
+		}
+
+
+
+
+
+
+	}
+
+}
diff --git a/mcs/class/corlib/System.Reflection/MonoEvent.cs b/mcs/class/corlib/System.Reflection/MonoEvent.cs
new file mode 100755
index 00000000000..9fc6b3d8b2c
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MonoEvent.cs
@@ -0,0 +1,85 @@
+//
+// System.Reflection/MonoEvent.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection {
+	internal struct MonoEventInfo {
+		public Type parent;
+		public String name;
+		public MethodInfo add_method;
+		public MethodInfo remove_method;
+		public MethodInfo raise_method;
+		public EventAttributes attrs;
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal static extern void get_event_info (MonoEvent ev, out MonoEventInfo info);
+	}
+
+	internal sealed class MonoEvent: EventInfo {
+		IntPtr klass;
+		IntPtr handle;
+
+		public override EventAttributes Attributes {
+			get {
+				MonoEventInfo info;
+				MonoEventInfo.get_event_info (this, out info);
+				
+				return info.attrs;
+			}
+		}
+
+		public override MethodInfo GetAddMethod(bool nonPublic) {
+			MonoEventInfo info;
+			MonoEventInfo.get_event_info (this, out info);
+				
+			return info.add_method;
+		}
+		public override MethodInfo GetRaiseMethod( bool nonPublic) {
+			MonoEventInfo info;
+			MonoEventInfo.get_event_info (this, out info);
+				
+			return info.raise_method;
+		}
+		public override MethodInfo GetRemoveMethod( bool nonPublic) {
+			MonoEventInfo info;
+			MonoEventInfo.get_event_info (this, out info);
+				
+			return info.remove_method;
+		}
+
+		public override Type DeclaringType {
+			get {
+				MonoEventInfo info;
+				MonoEventInfo.get_event_info (this, out info);
+				
+				return info.parent;
+			}
+		}
+		public override Type ReflectedType {
+			get {
+				MonoEventInfo info;
+				MonoEventInfo.get_event_info (this, out info);
+				
+				return info.parent;
+			}
+		}
+		public override string Name {
+			get {
+				MonoEventInfo info;
+				MonoEventInfo.get_event_info (this, out info);
+				
+				return info.name;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/MonoField.cs b/mcs/class/corlib/System.Reflection/MonoField.cs
new file mode 100755
index 00000000000..dd74e5a625b
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MonoField.cs
@@ -0,0 +1,107 @@
+
+//
+// System.Reflection/MonoField.cs
+// The class used to represent Fields from the mono runtime.
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection {
+	
+	internal struct MonoFieldInfo {
+		public Type parent;
+		public Type type;
+		public String name;
+		public FieldAttributes attrs;
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal static extern void get_field_info (MonoField field, out MonoFieldInfo info);
+	}
+
+	internal class MonoField : FieldInfo {
+		internal IntPtr klass;
+		internal RuntimeFieldHandle fhandle;
+		
+		public override FieldAttributes Attributes {
+			get {
+				MonoFieldInfo info;
+				MonoFieldInfo.get_field_info (this, out info);
+				return info.attrs;
+			}
+		}
+		public override RuntimeFieldHandle FieldHandle {
+			get {return fhandle;}
+		}
+
+		public override Type FieldType { 
+			get {
+				MonoFieldInfo info;
+				MonoFieldInfo.get_field_info (this, out info);
+				return info.type;
+			}
+		}
+
+		public override Type ReflectedType {
+			get {
+				MonoFieldInfo info;
+				MonoFieldInfo.get_field_info (this, out info);
+				return info.parent;
+			}
+		}
+		public override Type DeclaringType {
+			get {
+				MonoFieldInfo info;
+				MonoFieldInfo.get_field_info (this, out info);
+				return info.parent;
+			}
+		}
+		public override string Name {
+			get {
+				MonoFieldInfo info;
+				MonoFieldInfo.get_field_info (this, out info);
+				return info.name;
+			}
+		}
+
+		public override bool IsDefined (Type attributeType, bool inherit) {
+			return MonoCustomAttrs.IsDefined (this, attributeType, inherit);
+		}
+
+		public override object[] GetCustomAttributes( bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, inherit);
+		}
+		public override object[] GetCustomAttributes( Type attributeType, bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern object GetValueInternal (object obj);
+
+		public override object GetValue (object obj)
+		{
+			if (obj == null)
+				throw new ArgumentNullException ("obj");
+
+			return GetValueInternal (obj);
+		}
+
+		public override string ToString () {
+			MonoFieldInfo info;
+			MonoFieldInfo.get_field_info (this, out info);
+			return String.Format ("{0} {1}", info.type, info.name);
+		}
+
+		[MonoTODO]
+		public override void SetValue (object obj, object val, BindingFlags invokeAttr, Binder binder, CultureInfo culture)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/MonoMethod.cs b/mcs/class/corlib/System.Reflection/MonoMethod.cs
new file mode 100755
index 00000000000..ee86caf8d07
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MonoMethod.cs
@@ -0,0 +1,203 @@
+//
+// System.Reflection/MonoMethod.cs
+// The class used to represent methods from the mono runtime.
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection {
+	internal struct MonoMethodInfo {
+		internal Type parent;
+		internal Type ret;
+		internal MethodAttributes attrs;
+		internal MethodImplAttributes iattrs;
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal static extern void get_method_info (RuntimeMethodHandle handle, out MonoMethodInfo info);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal static extern ParameterInfo[] get_parameter_info (RuntimeMethodHandle handle);
+	};
+	
+	/*
+	 * Note: most of this class needs to be duplicated for the contructor, since
+	 * the .NET reflection class hierarchy is so broken.
+	 */
+	internal class MonoMethod : MethodInfo {
+		internal RuntimeMethodHandle mhandle;
+		string name;
+		Type reftype;
+		
+		[MonoTODO]
+		public override MethodInfo GetBaseDefinition() {
+			return this; /* FIXME */
+		}
+		public override Type ReturnType {
+			get {
+				MonoMethodInfo info;
+				MonoMethodInfo.get_method_info (mhandle, out info);
+				return info.ret;
+			}
+		}
+		public override ICustomAttributeProvider ReturnTypeCustomAttributes { 
+			get {return null;}
+		}
+		
+		public override MethodImplAttributes GetMethodImplementationFlags() {
+			MonoMethodInfo info;
+			MonoMethodInfo.get_method_info (mhandle, out info);
+			return info.iattrs;
+		}
+
+		public override ParameterInfo[] GetParameters() {
+			return MonoMethodInfo.get_parameter_info (mhandle);
+		}
+
+		/*
+		 * InternalInvoke() receives the parameters corretcly converted by the binder
+		 * to match the types of the method signature.
+		 */
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal extern Object InternalInvoke (Object obj, Object[] parameters);
+		
+		[MonoTODO]
+		public override Object Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) {
+			// fixme: consider all other parameters
+			return InternalInvoke (obj, parameters);
+		}
+
+		public override RuntimeMethodHandle MethodHandle { 
+			get {return mhandle;} 
+		}
+		public override MethodAttributes Attributes { 
+			get {
+				MonoMethodInfo info;
+				MonoMethodInfo.get_method_info (mhandle, out info);
+				return info.attrs;
+			} 
+		}
+		
+		public override Type ReflectedType {
+			get {
+				return reftype;
+			}
+		}
+		public override Type DeclaringType {
+			get {
+				MonoMethodInfo info;
+				MonoMethodInfo.get_method_info (mhandle, out info);
+				return info.parent;
+			}
+		}
+		public override string Name {
+			get {
+				return name;
+			}
+		}
+		
+		public override bool IsDefined (Type attributeType, bool inherit) {
+			return MonoCustomAttrs.IsDefined (this, attributeType, inherit);
+		}
+
+		public override object[] GetCustomAttributes( bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, inherit);
+		}
+		public override object[] GetCustomAttributes( Type attributeType, bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
+		}
+
+		public override string ToString () {
+			string parms = "";
+			ParameterInfo[] p = GetParameters ();
+			for (int i = 0; i < p.Length; ++i) {
+				if (i > 0)
+					parms = parms + ", ";
+				parms = parms + p [i].ParameterType.Name;
+			}
+			return ReturnType.Name+" "+Name+"("+parms+")";
+		}
+	}
+	
+	internal class MonoCMethod : ConstructorInfo {
+		internal RuntimeMethodHandle mhandle;
+		string name;
+		Type reftype;
+		
+		public override MethodImplAttributes GetMethodImplementationFlags() {
+			MonoMethodInfo info;
+			MonoMethodInfo.get_method_info (mhandle, out info);
+			return info.iattrs;
+		}
+
+		public override ParameterInfo[] GetParameters() {
+			return MonoMethodInfo.get_parameter_info (mhandle);
+		}
+
+		/*
+		 * InternalInvoke() receives the parameters corretcly converted by the binder
+		 * to match the types of the method signature.
+		 */
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal extern Object InternalInvoke (Object obj, Object[] parameters);
+		
+		public override Object Invoke(Object obj, BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) {
+			throw new NotImplementedException ();
+		}
+
+		public override Object Invoke(BindingFlags invokeAttr, Binder binder, Object[] parameters, CultureInfo culture) {
+			return InternalInvoke (null, parameters);
+		}
+
+		public override RuntimeMethodHandle MethodHandle { 
+			get {return mhandle;} 
+		}
+		public override MethodAttributes Attributes { 
+			get {
+				MonoMethodInfo info;
+				MonoMethodInfo.get_method_info (mhandle, out info);
+				return info.attrs;
+			} 
+		}
+		
+		public override Type ReflectedType {
+			get {
+				return reftype;
+			}
+		}
+		public override Type DeclaringType {
+			get {
+				MonoMethodInfo info;
+				MonoMethodInfo.get_method_info (mhandle, out info);
+				return info.parent;
+			}
+		}
+		public override string Name {
+			get {
+				return name;
+			}
+		}
+
+		[MonoTODO]
+		public override bool IsDefined (Type attribute_type, bool inherit) {
+			return false;
+		}
+
+		[MonoTODO]
+		public override object[] GetCustomAttributes (bool inherit) {
+			return null;
+		}
+
+		[MonoTODO]
+		public override object[] GetCustomAttributes (Type attributeType, bool inherit) {
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/MonoProperty.cs b/mcs/class/corlib/System.Reflection/MonoProperty.cs
new file mode 100755
index 00000000000..cbf0c3230c3
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/MonoProperty.cs
@@ -0,0 +1,163 @@
+//
+// System.Reflection/MonoProperty.cs
+// The class used to represent Properties from the mono runtime.
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//   Patrik Torstensson (patrik.torstensson@labs2.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Reflection {
+	
+	internal struct MonoPropertyInfo {
+		public Type parent;
+		public String name;
+		public MethodInfo get_method;
+		public MethodInfo set_method;
+		public PropertyAttributes attrs;
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal static extern void get_property_info (MonoProperty prop, out MonoPropertyInfo info);
+	}
+
+	internal class MonoProperty : PropertyInfo {
+		internal IntPtr klass;
+		internal IntPtr prop;
+		
+		public override PropertyAttributes Attributes {
+			get {
+				MonoPropertyInfo info;
+				MonoPropertyInfo.get_property_info (this, out info);
+				return info.attrs;
+			}
+		}
+		public override bool CanRead {
+			get {
+				MonoPropertyInfo info;
+				MonoPropertyInfo.get_property_info (this, out info);
+				return (info.get_method != null);
+			}
+		}
+		public override bool CanWrite {
+			get {
+				MonoPropertyInfo info;
+				MonoPropertyInfo.get_property_info (this, out info);
+				return (info.set_method != null);
+			}
+		}
+
+		public override Type PropertyType {
+			get {
+				MonoPropertyInfo info;
+				MonoPropertyInfo.get_property_info (this, out info);
+				
+				if (info.get_method != null) {
+					return info.get_method.ReturnType;
+				} else {
+					ParameterInfo[] parameters = info.set_method.GetParameters();
+					
+					return parameters [parameters.Length - 1].ParameterType;
+				}
+			}
+		}
+		public override Type ReflectedType {
+			get {
+				MonoPropertyInfo info;
+				MonoPropertyInfo.get_property_info (this, out info);
+				return info.parent;
+			}
+		}
+		public override Type DeclaringType {
+			get {
+				MonoPropertyInfo info;
+				MonoPropertyInfo.get_property_info (this, out info);
+				return info.parent;
+			}
+		}
+		public override string Name {
+			get {
+				MonoPropertyInfo info;
+				MonoPropertyInfo.get_property_info (this, out info);
+				return info.name;
+			}
+		}
+
+		[MonoTODO]
+		public override MethodInfo[] GetAccessors( bool nonPublic) {
+			// FIXME: check nonPublic
+			MonoPropertyInfo info;
+			int n = 0;
+			MonoPropertyInfo.get_property_info (this, out info);
+			if (info.set_method != null)
+				n++;
+			if (info.get_method != null)
+				n++;
+			MethodInfo[] res = new MethodInfo [n];
+			n = 0;
+			if (info.set_method != null)
+				res [n++] = info.set_method;
+			if (info.get_method != null)
+				res [n++] = info.get_method;
+			return res;
+		}
+
+		[MonoTODO]
+		public override MethodInfo GetGetMethod( bool nonPublic) {
+			// FIXME: check nonPublic
+			MonoPropertyInfo info;
+			MonoPropertyInfo.get_property_info (this, out info);
+			return info.get_method;
+		}
+		public override ParameterInfo[] GetIndexParameters() {
+			MonoPropertyInfo info;
+			MonoPropertyInfo.get_property_info (this, out info);
+			if (info.get_method != null)
+				return info.get_method.GetParameters ();
+			return new ParameterInfo [0];
+		}
+		public override MethodInfo GetSetMethod( bool nonPublic) {
+			// FIXME: check nonPublic
+			MonoPropertyInfo info;
+			MonoPropertyInfo.get_property_info (this, out info);
+			return info.set_method;
+		}
+		public override bool IsDefined (Type attributeType, bool inherit) {
+			return MonoCustomAttrs.IsDefined (this, attributeType, inherit);
+		}
+
+		public override object[] GetCustomAttributes( bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, inherit);
+		}
+		public override object[] GetCustomAttributes( Type attributeType, bool inherit) {
+			return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
+		}
+
+		public override object GetValue( object obj, BindingFlags invokeAttr, Binder binder, object[] index, CultureInfo culture) {
+			object ret = null;
+
+			MethodInfo method = GetGetMethod (false);
+			
+			if (index == null || index.Length == 0) 
+				ret = method.Invoke (obj, invokeAttr, binder, null, culture);
+			else
+				ret = method.Invoke (obj, invokeAttr, binder, index, culture);
+
+			return ret;
+		}
+
+		public override void SetValue( object obj, object value, BindingFlags invokeAttr, Binder binder, object[] index, CultureInfo culture) {
+		}
+
+		public override string ToString () {
+			return PropertyType.ToString () + " " + Name;
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/System.Reflection/ParameterAttributes.cs b/mcs/class/corlib/System.Reflection/ParameterAttributes.cs
new file mode 100755
index 00000000000..eaf409d8b1c
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/ParameterAttributes.cs
@@ -0,0 +1,66 @@
+// ParameterAttributes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:39:52 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum ParameterAttributes {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		In = 1,
+
+		/// <summary>
+		/// </summary>
+		Out = 2,
+
+		/// <summary>
+		/// </summary>
+		Lcid = 4,
+
+		/// <summary>
+		/// </summary>
+		Retval = 8,
+
+		/// <summary>
+		/// </summary>
+		Optional = 16,
+
+		/// <summary>
+		/// </summary>
+		ReservedMask = 61440,
+
+		/// <summary>
+		/// </summary>
+		HasDefault = 4096,
+
+		/// <summary>
+		/// </summary>
+		HasFieldMarshal = 8192,
+
+		/// <summary>
+		/// </summary>
+		Reserved3 = 16384,
+
+		/// <summary>
+		/// </summary>
+		Reserved4 = 32768,
+	} // ParameterAttributes
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/ParameterInfo.cs b/mcs/class/corlib/System.Reflection/ParameterInfo.cs
new file mode 100644
index 00000000000..52702c9a9fc
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/ParameterInfo.cs
@@ -0,0 +1,88 @@
+// System.Reflection.ParameterInfo
+//
+// Sean MacIsaac (macisaac@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+
+using System.Reflection.Emit;
+
+namespace System.Reflection
+{
+	[Serializable]
+	public class ParameterInfo : ICustomAttributeProvider
+	{
+		protected Type ClassImpl;
+		protected object DefaultValueImpl;
+		protected MemberInfo MemberImpl;
+		protected string NameImpl;
+		protected int PositionImpl;
+		protected ParameterAttributes AttrsImpl;
+
+		protected ParameterInfo () {
+		}
+
+		internal ParameterInfo (ParameterBuilder pb, Type type, MemberInfo member) {
+			this.ClassImpl = type;
+			this.MemberImpl = member;
+			this.NameImpl = pb.Name;
+			this.PositionImpl = pb.Position;
+			this.AttrsImpl = (ParameterAttributes) pb.Attributes;
+		}
+		
+		public virtual Type ParameterType {
+			get {return ClassImpl;}
+		}
+		public virtual ParameterAttributes Attributes {
+			get {return AttrsImpl;}
+		}
+		public virtual object DefaultValue {
+			get {return DefaultValueImpl;}
+		}
+
+		public bool IsIn {
+			get {return (AttrsImpl & ParameterAttributes.In) != 0;}
+		}
+
+		public bool IsLcid {
+			get {return (AttrsImpl & ParameterAttributes.Lcid) != 0;}
+		}
+
+		public bool IsOptional {
+			get {return (AttrsImpl & ParameterAttributes.Optional) != 0;}
+		}
+
+		public bool IsOut {
+			get {return (AttrsImpl & ParameterAttributes.Out) != 0;}
+		}
+
+		public bool IsRetval {
+			get {return (AttrsImpl & ParameterAttributes.Retval) != 0;}
+		}
+
+		public virtual MemberInfo Member {
+			get {return MemberImpl;}
+		}
+
+		public virtual string Name {
+			get {return NameImpl;}
+		}
+
+		public virtual int Position {
+			get {return PositionImpl;}
+		}
+
+		public virtual object[] GetCustomAttributes (bool inherit)
+		{
+			return MonoCustomAttrs.GetCustomAttributes (this, inherit);
+		}
+
+		public virtual object[] GetCustomAttributes (Type attributeType, bool inherit)
+		{
+			return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
+		}
+
+		public virtual bool IsDefined( Type attributeType, bool inherit) {
+			return MonoCustomAttrs.IsDefined (this, attributeType, inherit);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/ParameterModifier.cs b/mcs/class/corlib/System.Reflection/ParameterModifier.cs
new file mode 100755
index 00000000000..4615e1931dd
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/ParameterModifier.cs
@@ -0,0 +1,26 @@
+//
+// System.Reflection/ParameterModifier.cs
+//
+// Author:
+// Paolo Molaro (lupus@ximian.com)
+//
+// Copyright (c) 2001 Ximian, Inc
+
+using System;
+
+namespace System.Reflection {
+	public struct ParameterModifier {
+		private bool[] data;
+		
+		public ParameterModifier (int paramaterCount) {
+			data = new bool [paramaterCount];
+		}
+
+		public bool this [int index] {
+			get {return data [index];} 
+			set {data [index] = value;}
+		}
+
+	}
+
+}
diff --git a/mcs/class/corlib/System.Reflection/PropertyAttributes.cs b/mcs/class/corlib/System.Reflection/PropertyAttributes.cs
new file mode 100755
index 00000000000..7cb7359dba0
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/PropertyAttributes.cs
@@ -0,0 +1,54 @@
+// PropertyAttributes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:40:02 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum PropertyAttributes {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		SpecialName = 512,
+
+		/// <summary>
+		/// </summary>
+		ReservedMask = 62464,
+
+		/// <summary>
+		/// </summary>
+		RTSpecialName = 1024,
+
+		/// <summary>
+		/// </summary>
+		HasDefault = 4096,
+
+		/// <summary>
+		/// </summary>
+		Reserved2 = 8192,
+
+		/// <summary>
+		/// </summary>
+		Reserved3 = 16384,
+
+		/// <summary>
+		/// </summary>
+		Reserved4 = 32768,
+	} // PropertyAttributes
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/PropertyInfo.cs b/mcs/class/corlib/System.Reflection/PropertyInfo.cs
new file mode 100755
index 00000000000..383bef59fc8
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/PropertyInfo.cs
@@ -0,0 +1,55 @@
+//
+// System.Reflection/PropertyInfo.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Globalization;
+
+namespace System.Reflection {
+	[Serializable]
+	public abstract class PropertyInfo : MemberInfo {
+
+		public abstract PropertyAttributes Attributes {get;}
+		public abstract bool CanRead {get;}
+		public abstract bool CanWrite {get;}
+
+		public bool IsSpecialName {
+			get {return (Attributes & PropertyAttributes.SpecialName) != 0;}
+		}
+
+		public override MemberTypes MemberType {
+			get {return MemberTypes.Property;}
+		}
+		public abstract Type PropertyType {get;}
+	
+		protected PropertyInfo() {
+		}
+
+		public MethodInfo[] GetAccessors() {
+			return GetAccessors (false);
+		}
+		public abstract MethodInfo[] GetAccessors( bool nonPublic);
+		public MethodInfo GetGetMethod() {
+			return GetGetMethod (false);
+		}
+		public abstract MethodInfo GetGetMethod( bool nonPublic);
+		public abstract ParameterInfo[] GetIndexParameters();
+		public MethodInfo GetSetMethod() {
+			return GetSetMethod (false);
+		}
+		public abstract MethodInfo GetSetMethod( bool nonPublic);
+		public virtual object GetValue( object obj, object[] index) {
+			return GetValue(obj, BindingFlags.Default, null, index, null);
+		}
+		public abstract object GetValue( object obj, BindingFlags invokeAttr, Binder binder, object[] index, CultureInfo culture);
+		public virtual void SetValue( object obj, object value, object[] index) {
+		}
+		public abstract void SetValue( object obj, object value, BindingFlags invokeAttr, Binder binder, object[] index, CultureInfo culture);
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/ReflectionTypeLoadException.cs b/mcs/class/corlib/System.Reflection/ReflectionTypeLoadException.cs
new file mode 100644
index 00000000000..7680b4c37b5
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/ReflectionTypeLoadException.cs
@@ -0,0 +1,62 @@
+//
+// System.Reflection.ReflectionTypeLoadException
+//
+// Sean MacIsaac (macisaac@ximian.com)
+// Dunan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Reflection
+{
+	[Serializable]
+	public sealed class ReflectionTypeLoadException : SystemException
+	{
+		// Fields
+		private Exception[] loaderExceptions;
+		private Type[] types;
+		
+		// Constructors
+		public ReflectionTypeLoadException (Type[] classes, Exception[] exceptions)
+			: base (Locale.GetText ("The classes in the module cannot be loaded."))
+		{
+			loaderExceptions = exceptions;
+			types = classes;
+		}
+
+		public ReflectionTypeLoadException (Type[] classes, Exception[] exceptions, string message)
+			: base (message)
+		{
+			loaderExceptions = exceptions;
+			types = classes;
+		}
+			
+		// Properties
+		public Type[] Types
+		{
+			get { return types; }
+		}
+
+		public Exception[] LoaderExceptions
+		{
+			get { return loaderExceptions; }
+		}
+
+		// Method
+		[MonoTODO]
+		//
+		// This one is a bit tough because need to serialize two arrays.
+		// The serialization output comes out as
+		// <Types href="#ref-4" /> 
+                // <Exceptions href="#ref-5" />
+		// and then goes on and appends new SOAP-ENCs, etc...
+		//
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+		}
+	
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/ResourceAttributes.cs b/mcs/class/corlib/System.Reflection/ResourceAttributes.cs
new file mode 100755
index 00000000000..ab02d11805d
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/ResourceAttributes.cs
@@ -0,0 +1,30 @@
+// ResourceAttributes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:40:12 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum ResourceAttributes {
+
+		/// <summary>
+		/// </summary>
+		Public = 1,
+
+		/// <summary>
+		/// </summary>
+		Private = 2,
+	} // ResourceAttributes
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/ResourceLocation.cs b/mcs/class/corlib/System.Reflection/ResourceLocation.cs
new file mode 100755
index 00000000000..611c61828b5
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/ResourceLocation.cs
@@ -0,0 +1,34 @@
+// ResourceLocation.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:39:22 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum ResourceLocation {
+
+		/// <summary>
+		/// </summary>
+		Embedded = 1,
+
+		/// <summary>
+		/// </summary>
+		ContainedInAnotherAssembly = 2,
+
+		/// <summary>
+		/// </summary>
+		ContainedInManifestFile = 4,
+	} // ResourceLocation
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/StrongNameKeyPair.cs b/mcs/class/corlib/System.Reflection/StrongNameKeyPair.cs
new file mode 100755
index 00000000000..cd16be2df68
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/StrongNameKeyPair.cs
@@ -0,0 +1,39 @@
+//

+// System.Reflection.StrongNameKeyPair.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+using System.IO;

+

+namespace System.Reflection {

+

+	[Serializable]

+	public class StrongNameKeyPair 

+	{		

+		private byte[] keyPair;

+

+		public StrongNameKeyPair (byte[] keyPairArray) 

+		{

+			keyPair = keyPairArray;

+		}

+		

+		public StrongNameKeyPair (FileStream keyPairFile) 

+		{

+			

+		}

+		

+		public StrongNameKeyPair (string keyPairContainer) 

+		{

+			

+		}

+		

+		public byte[] PublicKey 

+		{

+			get { return keyPair; }

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Reflection/TargetException.cs b/mcs/class/corlib/System.Reflection/TargetException.cs
new file mode 100644
index 00000000000..071bd091771
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/TargetException.cs
@@ -0,0 +1,37 @@
+//
+// System.Reflection.TargetException.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Reflection
+{
+	[Serializable]
+	public class TargetException : ApplicationException
+	{
+		public TargetException ()
+			: base (Locale.GetText ("Unable to invoke and invalid target."))
+		{
+		}
+
+		public TargetException (string message)
+			: base (message)
+		{
+		}
+
+		public TargetException (string message, Exception innerException)
+			: base (message, innerException)
+		{
+		}
+
+		protected TargetException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/TargetInvocationException.cs b/mcs/class/corlib/System.Reflection/TargetInvocationException.cs
new file mode 100644
index 00000000000..b5ec55d2cb8
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/TargetInvocationException.cs
@@ -0,0 +1,23 @@
+// System.Reflection.TargetInvocationException
+//
+// Sean MacIsaac (macisaac@ximian.com)
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+
+namespace System.Reflection
+{
+	[Serializable]
+	public sealed class TargetInvocationException : ApplicationException
+	{
+		public TargetInvocationException (Exception inner)
+			: base (inner.Message, inner)
+		{			
+		}
+
+		public TargetInvocationException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}		
+	}	
+}
diff --git a/mcs/class/corlib/System.Reflection/TargetParameterCountException.cs b/mcs/class/corlib/System.Reflection/TargetParameterCountException.cs
new file mode 100644
index 00000000000..38a4528743f
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/TargetParameterCountException.cs
@@ -0,0 +1,38 @@
+//
+// System.Reflection.TargetParameterCountException.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+using System.Globalization;
+
+namespace System.Reflection
+{
+	[Serializable]
+	public sealed class TargetParameterCountException : ApplicationException
+	{
+		public TargetParameterCountException ()
+			: base (Locale.GetText ("Number of parameter does not match expected count."))
+		{
+		}
+
+		public TargetParameterCountException (string message)
+			: base (message)
+		{
+		}
+
+		public TargetParameterCountException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		internal TargetParameterCountException (SerializationInfo info,
+						       StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/TypeAttributes.cs b/mcs/class/corlib/System.Reflection/TypeAttributes.cs
new file mode 100755
index 00000000000..5647b709857
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/TypeAttributes.cs
@@ -0,0 +1,138 @@
+// TypeAttributes.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:40:22 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum TypeAttributes {
+
+		/// <summary>
+		/// </summary>
+		VisibilityMask = 7,
+
+		/// <summary>
+		/// </summary>
+		NotPublic = 0,
+
+		/// <summary>
+		/// </summary>
+		Public = 1,
+
+		/// <summary>
+		/// </summary>
+		NestedPublic = 2,
+
+		/// <summary>
+		/// </summary>
+		NestedPrivate = 3,
+
+		/// <summary>
+		/// </summary>
+		NestedFamily = 4,
+
+		/// <summary>
+		/// </summary>
+		NestedAssembly = 5,
+
+		/// <summary>
+		/// </summary>
+		NestedFamANDAssem = 6,
+
+		/// <summary>
+		/// </summary>
+		NestedFamORAssem = 7,
+
+		/// <summary>
+		/// </summary>
+		LayoutMask = 24,
+
+		/// <summary>
+		/// </summary>
+		AutoLayout = 0,
+
+		/// <summary>
+		/// </summary>
+		SequentialLayout = 8,
+
+		/// <summary>
+		/// </summary>
+		ExplicitLayout = 16,
+
+		/// <summary>
+		/// </summary>
+		ClassSemanticsMask = 32,
+
+		/// <summary>
+		/// </summary>
+		Class = 0,
+
+		/// <summary>
+		/// </summary>
+		Interface = 32,
+
+		/// <summary>
+		/// </summary>
+		Abstract = 128,
+
+		/// <summary>
+		/// </summary>
+		Sealed = 256,
+
+		/// <summary>
+		/// </summary>
+		SpecialName = 1024,
+
+		/// <summary>
+		/// </summary>
+		Import = 4096,
+
+		/// <summary>
+		/// </summary>
+		Serializable = 8192,
+
+		/// <summary>
+		/// </summary>
+		StringFormatMask = 196608,
+
+		/// <summary>
+		/// </summary>
+		AnsiClass = 0,
+
+		/// <summary>
+		/// </summary>
+		UnicodeClass = 65536,
+
+		/// <summary>
+		/// </summary>
+		AutoClass = 131072,
+
+		/// <summary>
+		/// </summary>
+		BeforeFieldInit = 1048576,
+
+		/// <summary>
+		/// </summary>
+		ReservedMask = 264192,
+
+		/// <summary>
+		/// </summary>
+		RTSpecialName = 2048,
+
+		/// <summary>
+		/// </summary>
+		HasSecurity = 262144,
+	} // TypeAttributes
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Reflection/TypeDelegator.cs b/mcs/class/corlib/System.Reflection/TypeDelegator.cs
new file mode 100755
index 00000000000..b25962a4660
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/TypeDelegator.cs
@@ -0,0 +1,204 @@
+// System.Reflection/TypeDelegator.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+using System.Reflection;
+using System.Globalization;
+
+namespace System.Reflection {
+
+	[Serializable]
+	public class TypeDelegator : Type {
+		protected Type typeImpl;
+	
+		protected TypeDelegator () {
+		}
+
+		public TypeDelegator( Type delegatingType) {
+			if (delegatingType == null)
+				throw new ArgumentNullException ("delegatingType must be non-null");
+			typeImpl = delegatingType;
+		}
+
+		public override Assembly Assembly {
+			get {return typeImpl.Assembly;}
+		}
+
+		public override string AssemblyQualifiedName {
+			get {return typeImpl.AssemblyQualifiedName;}
+		}
+
+		public override Type BaseType {
+			get {return typeImpl.BaseType;}
+		}
+
+		public override string FullName {
+			get {return typeImpl.FullName;}
+		}
+
+		public override Guid GUID {
+			get {return typeImpl.GUID;}
+		}
+
+		public override Module Module {
+			get {return typeImpl.Module;}
+		}
+
+		public override string Name {
+			get {return typeImpl.Name;}
+		}
+
+		public override string Namespace {
+			get {return typeImpl.Namespace;}
+		}
+
+		public override RuntimeTypeHandle TypeHandle {
+			get {return typeImpl.TypeHandle;}
+		}
+
+		public override Type UnderlyingSystemType {
+			get {return typeImpl.UnderlyingSystemType;}
+		}
+
+		protected override TypeAttributes GetAttributeFlagsImpl () {
+			throw new NotImplementedException ();
+			//return typeImpl.GetAttributeFlagsImpl ();
+		}
+		
+		protected override ConstructorInfo GetConstructorImpl (BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) {
+			throw new NotImplementedException ();
+			//return typeImpl.GetConstructorImpl (bindingAttr, binder, callConvention, types, modifiers);
+		}
+
+		public override ConstructorInfo[] GetConstructors( BindingFlags bindingAttr) {
+			return typeImpl.GetConstructors (bindingAttr);
+		}
+
+		public override object[] GetCustomAttributes (bool inherit)
+		{
+			return typeImpl.GetCustomAttributes (inherit);
+		}
+
+		public override object[] GetCustomAttributes (Type attributeType, bool inherit)
+		{
+			return typeImpl.GetCustomAttributes (attributeType, inherit);
+		}
+
+		public override Type GetElementType() {
+			return typeImpl.GetElementType ();
+		}
+
+		public override EventInfo GetEvent( string name, BindingFlags bindingAttr) {
+			return typeImpl.GetEvent (name, bindingAttr);
+		}
+
+		public override EventInfo[] GetEvents() {
+			return GetEvents (BindingFlags.Public);
+		}
+
+		public override EventInfo[] GetEvents( BindingFlags bindingAttr) {
+			return typeImpl.GetEvents (bindingAttr);
+		}
+
+		public override FieldInfo GetField( string name, BindingFlags bindingAttr) {
+			return typeImpl.GetField (name, bindingAttr);
+		}
+
+		public override FieldInfo[] GetFields( BindingFlags bindingAttr) {
+			return typeImpl.GetFields (bindingAttr);
+		}
+
+		public override Type GetInterface( string name, bool ignoreCase) {
+			return typeImpl.GetInterface (name, ignoreCase);
+		}
+
+		public override InterfaceMapping GetInterfaceMap( Type interfaceType) {
+			return typeImpl.GetInterfaceMap (interfaceType);
+		}
+		
+		public override Type[] GetInterfaces() {
+			return typeImpl.GetInterfaces ();
+		}
+
+		public override MemberInfo[] GetMember( string name, MemberTypes type, BindingFlags bindingAttr) {
+			return typeImpl.GetMember (name, type, bindingAttr);
+		}
+
+		public override MemberInfo[] GetMembers( BindingFlags bindingAttr) {
+			return typeImpl.GetMembers (bindingAttr);
+		}
+
+		protected override MethodInfo GetMethodImpl( string name, BindingFlags bindingAttr, Binder binder, CallingConventions callConvention, Type[] types, ParameterModifier[] modifiers) {
+			throw new NotImplementedException ();
+			//return typeImpl.GetMethodImpl (name, bindingAttr, binder, callConvention, types, modifiers);
+		}
+
+		public override MethodInfo[] GetMethods( BindingFlags bindingAttr) {
+			return typeImpl.GetMethods (bindingAttr);
+		}
+
+		public override Type GetNestedType( string name, BindingFlags bindingAttr) {
+			return typeImpl.GetNestedType (name, bindingAttr);
+		}
+
+		public override Type[] GetNestedTypes( BindingFlags bindingAttr) {
+			return typeImpl.GetNestedTypes (bindingAttr);
+		}
+
+		public override PropertyInfo[] GetProperties( BindingFlags bindingAttr) {
+			return typeImpl.GetProperties (bindingAttr);
+		}
+
+		protected override PropertyInfo GetPropertyImpl( string name, BindingFlags bindingAttr, Binder binder, Type returnType, Type[] types, ParameterModifier[] modifiers) {
+			throw new NotImplementedException ();
+			//return typeImpl.GetPropertyImpl (name, bindingAttr, bindingAttr, returnType, types, modifiers);
+		}
+
+		protected override bool HasElementTypeImpl() {
+			throw new NotImplementedException ();
+			//return typeImpl.HasElementTypeImpl ();
+		}
+
+		public override object InvokeMember( string name, BindingFlags invokeAttr, Binder binder, object target, object[] args, ParameterModifier[] modifiers, CultureInfo culture, string[] namedParameters) {
+			return typeImpl.InvokeMember (name, invokeAttr, binder, target, args, modifiers, culture, namedParameters);
+		}
+
+		protected override bool IsArrayImpl() {
+			throw new NotImplementedException ();
+			//return typeImpl.IsArrayImpl ();
+		}
+
+		protected override bool IsByRefImpl() {
+			throw new NotImplementedException ();
+			//return typeImpl.IsByRefImpl ();
+		}
+
+		protected override bool IsCOMObjectImpl() {
+			throw new NotImplementedException ();
+			//return typeImpl.IsCOMObjectImpl ();
+		}
+
+		public override bool IsDefined( Type attributeType, bool inherit) {
+			return typeImpl.IsDefined (attributeType, inherit);
+		}
+
+		protected override bool IsPointerImpl() {
+			throw new NotImplementedException ();
+			//return typeImpl.IsPointerImpl ();
+		}
+
+		protected override bool IsPrimitiveImpl() {
+			throw new NotImplementedException ();
+			//return typeImpl.IsPrimitiveImpl ();
+		}
+
+		protected override bool IsValueTypeImpl() {
+			throw new NotImplementedException ();
+			//return typeImpl.IsValueTypeImpl ();
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Reflection/TypeFilter.cs b/mcs/class/corlib/System.Reflection/TypeFilter.cs
new file mode 100644
index 00000000000..a7fb8baf957
--- /dev/null
+++ b/mcs/class/corlib/System.Reflection/TypeFilter.cs
@@ -0,0 +1,13 @@
+// TypeAttributes.cs
+//
+// Sean MacIsaac (macisaac@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Reflection {
+
+
+	public delegate bool TypeFilter (Type m, object filterCriteria);
+
+} // System.Reflection
diff --git a/mcs/class/corlib/System.Resources/ChangeLog b/mcs/class/corlib/System.Resources/ChangeLog
new file mode 100644
index 00000000000..9026a5a93f8
--- /dev/null
+++ b/mcs/class/corlib/System.Resources/ChangeLog
@@ -0,0 +1,146 @@
+2002-08-19  Dick Porter  <dick@ximian.com>
+
+	* ResourceWriter.cs: Implemented all methods
+
+	* ResourceReader.cs: Cope with our ResourceSet class name, as well
+	as theirs
+
+2002-08-18  Dick Porter  <dick@ximian.com>
+
+	* ResourceReader.cs: Finished basic implementation.  Some
+	optimisation in conjunction with ResourceSet still possible though
+
+2002-08-14  Dick Porter  <dick@ximian.com>
+
+	* ResourceSet.cs: Throw the correct exceptions
+
+	* ResourceManager.cs: Implemented all unfinished methods
+
+2002-03-12  Duncan Mak  <duncan@ximian.com>
+
+	* MissingManifestResourceException.cs: This should inherit from
+	SystemException, not Exception.
+
+2002-01-26  Nick Drochak  <ndrochak@gol.com>
+
+	* ResourceReader.cs: Finsished reading resource files with just strings
+	in them.  Need to figure out other types, and also resources with
+	multiple types in the same file.
+
+2002-01-24  Nick Drochak  <ndrochak@gol.com>
+
+	* ResourceReader.cs: Implemented constructors. Started on the 
+	GetEnumerator() method.  Not done yet, but comitting for 
+	'disaster recovery' purposes.
+
+2002-01-19  Duncan Mak  <duncan@ximian.com>
+
+	* *.cs: Fixed indentation. There was a stupid bug in my .emacs file.
+
+2002-1-17  Duncan Mak  <duncan@duncan@ximian.com>
+
+	* ResourceSet.cs: Implemented GetObject (string, bool) and GetString
+	(string, bool). ResourceSet has no more MonoTODOs! Also added in the
+	Serializable attribute.
+	
+	* *.cs: convert to Miguel's brace style.
+
+2002-01-17  Duncan Mak  <duncan@ximian.com>
+
+	* ResourceManager.cs: Fixed GetNeutralResourcesLanguage () and added
+	new attributes documented in 1.0 SDK.
+
+2002-01-17  Duncan Mak  <duncan@ximian.com>
+
+	* ResourceWriter.cs: Added MonoTODO decorations.
+
+	* SatelliteContractVersionAttribute.cs: added new attributes in 1.0 SDK.
+
+	* NeutralResoucesLanguageAttribute.cs: added new attributes in 1.0 SDK
+	
+2002-01-16  Duncan Mak  <duncan@ximian.com>
+
+	* ResourceReader.cs: Fixed some typos.
+
+	* ResourceManager.cs: After reading the tutorial from the SDK,
+	finished all the ResourceManager constructors and removed those
+	MonoTODO tags.
+	
+	Removed MonoTODO from GetNeutralResourcesLanguage (Assembly)
+	because Miguel just implemented the whole class, including the
+	constructor that I needed (CultureInfo (string)).
+
+	Updated fields after reading the new docs from the final SDK.
+
+	* ResXFileRef.cs, ResXResourceReader.cs: Removed. They are part of
+	Windows.Forms and require System.Xml, which we don't have access to.
+
+2002-01-13  Duncan Mak  <duncan@ximian.com>
+
+	* ResourceManager.cs: Added more MonoTODOs and cleaned up some 
+	indenting.
+
+2002-01-09  Duncan Mak  <duncan@ximian.com>
+
+	* ResourceManager.cs: Fixed the GetSatelliteContractVersion()
+	method. It was missing a cast before. Removed MonoTODO
+	attribute. ;-) It was tested by John Barnette, so this shouldn't break
+	the build.
+
+	* ResourceManager.cs: Removed MonoTODO attribute on GetString
+	(string), as I believe it's correct. However, GetString
+	(string, CultureInfo) is definitely broken, so I'm marking it with
+	MonoTODO there. I also added MonoTODO to IntenalGetResourceSet().
+
+2002-01-06  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Finalizing IResourceReader and IResourceWriter interfaces: 
+          Added "new"-modifier to IResourceReader.GetEnumerator
+	* Fixed compilation issues in other *.cs, so that the 
+          System.Resources namespaces can be included in the corlib build.
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* ResourceManager.cs : MonoTODO attribute decoration.
+	
+Tue Dec 18 13:18:32 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* *.cs: fixed some of the compilation issues: missing
+	using directives, typos.
+
+2001-12-11  Duncan Mak  <duncan@ximian.com>
+
+	* Checked in to CVS.
+
+2001-12-10  Duncan Mak  <duncan@ximian.com>
+
+	* ResourceManager.cs (GetNeutralResourcesLanguage):
+	(GetSatelliteContractVersion): Implemented.
+	
+2001-12-09  Duncan Mak  <duncan@ximian.com>
+
+	* ResXResourceReader.cs: Initial attempt.
+
+	* ResXFileRef.cs: Initial attempt.
+
+	* ResourceWriter.cs: Initial attempt.
+
+	* ResourceSet.cs (ReadResources): Implemented, with help from Radek Doulik.
+
+2001-11-28  Duncan Mak <duncan@ximian.com>	
+
+	* ResourceManager.cs: First attempt.
+
+2001-11-27  Duncan Mak <duncan@ximian.com>
+
+	* ResourceSet.cs:
+	First attempt, can't continue until ResourceReader and ResourceWriter are implemented.
+		
+	* SatelliteContractVersionAttribute.cs: First attempt. The spec is quite amibiguous here.
+
+	* NeutralResoucesLanguageAttribute.cs: Complete.
+
+	* MissingManifestResourceException.cs: Complete.
+
+	* IResourceReader.cs: Complete.
+
+	* IResourceWriter.cs: Complete.
diff --git a/mcs/class/corlib/System.Resources/IResourceReader.cs b/mcs/class/corlib/System.Resources/IResourceReader.cs
new file mode 100644
index 00000000000..871f202cfff
--- /dev/null
+++ b/mcs/class/corlib/System.Resources/IResourceReader.cs
@@ -0,0 +1,20 @@
+//
+// System.Resources.IResourceReader.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Collections;
+
+namespace System.Resources
+{
+	public interface IResourceReader : IEnumerable, IDisposable
+	{
+		void Close();
+		new IDictionaryEnumerator GetEnumerator();
+	}
+}
diff --git a/mcs/class/corlib/System.Resources/IResourceWriter.cs b/mcs/class/corlib/System.Resources/IResourceWriter.cs
new file mode 100644
index 00000000000..ec847784749
--- /dev/null
+++ b/mcs/class/corlib/System.Resources/IResourceWriter.cs
@@ -0,0 +1,25 @@
+//
+// System.Resources.IResourceWriter.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Resources
+{
+
+	public interface IResourceWriter : IDisposable
+	{
+		void AddResource (string name, byte[] value);
+		void AddResource (string name, object value);
+		void AddResource (string name, string value);
+		
+		void Close();
+		
+		void Generate();
+	}
+}
diff --git a/mcs/class/corlib/System.Resources/MissingManifestResourceException.cs b/mcs/class/corlib/System.Resources/MissingManifestResourceException.cs
new file mode 100644
index 00000000000..b6b22b80c99
--- /dev/null
+++ b/mcs/class/corlib/System.Resources/MissingManifestResourceException.cs
@@ -0,0 +1,42 @@
+//
+// System.Resources.MissingManifestResourceException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.		http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Resources
+{
+
+	[Serializable]
+	public class MissingManifestResourceException: SystemException
+	{
+		private string param;
+		
+		// Constructors
+		public MissingManifestResourceException ()
+			: base (Locale.GetText ("The assembly does not contain the resources for the required culture."))
+			{
+			}
+		
+		public MissingManifestResourceException (string message)
+			:base (message)
+			{
+			}
+		
+		protected MissingManifestResourceException (SerializationInfo info, StreamingContext context)
+				    :base (info, context)
+			{
+			}
+		
+		public MissingManifestResourceException (String message, Exception e)
+			:base (message, e)
+			{
+			}
+	}
+}
diff --git a/mcs/class/corlib/System.Resources/NeutralResourcesLanguageAttribute.cs b/mcs/class/corlib/System.Resources/NeutralResourcesLanguageAttribute.cs
new file mode 100755
index 00000000000..74e2e11776b
--- /dev/null
+++ b/mcs/class/corlib/System.Resources/NeutralResourcesLanguageAttribute.cs
@@ -0,0 +1,32 @@
+//
+// System.Resources.NeutralResourcesLanguageAttribute.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.		http://www.ximian.com
+//
+
+namespace System.Resources
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class NeutralResourcesLanguageAttribute : Attribute
+	{
+		
+		private string culture;
+		
+		// Constructors
+		public NeutralResourcesLanguageAttribute (string cultureName)
+		{
+			if(cultureName==null) {
+				throw new ArgumentNullException("culture is null");
+			}
+			
+			culture = cultureName;
+		}
+		public string CultureName
+		{
+				get { return culture; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Resources/ResourceManager.cs b/mcs/class/corlib/System.Resources/ResourceManager.cs
new file mode 100644
index 00000000000..7e55ff27a99
--- /dev/null
+++ b/mcs/class/corlib/System.Resources/ResourceManager.cs
@@ -0,0 +1,359 @@
+//	
+// System.Resources.ResourceManager.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2001, 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System.Collections;
+using System.Reflection;
+using System.Globalization;
+using System.IO;
+
+namespace System.Resources
+{
+	[Serializable]
+	public class ResourceManager
+	{
+		public static readonly int HeaderVersionNumber = 1;
+		public static readonly int MagicNumber = unchecked((int)0xBEEFCACE);
+
+		protected string BaseNameField;
+		protected Assembly MainAssembly;
+		// Maps cultures to ResourceSet objects
+		protected Hashtable ResourceSets;
+		
+		private bool ignoreCase;
+		private Type resourceSetType;
+		private String resourceDir;
+		
+		/* Recursing through culture parents stops here */
+		private CultureInfo neutral_culture;
+		
+		// constructors
+		protected ResourceManager () {
+			ResourceSets=new Hashtable();
+			ignoreCase=false;
+			resourceSetType=typeof(ResourceSet);
+			resourceDir=null;
+			neutral_culture=null;
+		}
+		
+		public ResourceManager (Type resourceSource) : this()
+		{
+			if (resourceSource == null)
+				throw new ArgumentNullException ("resourceSource is null.");
+			
+			BaseNameField = resourceSource.FullName;
+			MainAssembly = resourceSource.Assembly;
+			resourceSetType = resourceSource;
+			neutral_culture = GetNeutralResourcesLanguage(MainAssembly);
+		}
+		
+		public ResourceManager (string baseName, Assembly assembly) : this()
+		{
+			if (baseName == null)
+				throw new ArgumentNullException ("baseName is null.");
+			if(assembly == null)
+				throw new ArgumentNullException ("assembly is null.");
+			
+			BaseNameField = baseName;
+			MainAssembly = assembly;
+			neutral_culture = GetNeutralResourcesLanguage(MainAssembly);
+		}
+			 
+		private Type CheckResourceSetType(Type usingResourceSet)
+		{
+			if(usingResourceSet==null) {
+				return(typeof(ResourceSet));
+			} else {
+				if (!usingResourceSet.IsSubclassOf (typeof (ResourceSet)))
+					throw new ArgumentException ("Type must be from ResourceSet.");
+				
+				return(usingResourceSet);
+			}
+		}
+		
+		public ResourceManager (string baseName, Assembly assembly, Type usingResourceSet) : this()
+		{
+			if (baseName == null)
+				throw new ArgumentNullException ("baseName is null.");
+			if(assembly == null)
+				throw new ArgumentNullException ("assembly is null.");
+			
+			BaseNameField = baseName;
+			MainAssembly = assembly;
+			resourceSetType = CheckResourceSetType(usingResourceSet);
+			neutral_culture = GetNeutralResourcesLanguage(MainAssembly);
+		}
+		
+		/* Private constructor for CreateFileBasedResourceManager */
+		private ResourceManager(String baseName, String resourceDir, Type usingResourceSet) : this()
+		{
+			if(baseName==null) {
+				throw new ArgumentNullException("The base name is null");
+			}
+			if(baseName.EndsWith(".resources")) {
+				throw new ArgumentException("The base name ends in '.resources'");
+			}
+			if(resourceDir==null) {
+				throw new ArgumentNullException("The resourceDir is null");
+			}
+
+			BaseNameField = baseName;
+			MainAssembly = null;
+			resourceSetType = CheckResourceSetType(usingResourceSet);
+			this.resourceDir = resourceDir;
+		}
+		
+		public static ResourceManager CreateFileBasedResourceManager (string baseName,
+						      string resourceDir, Type usingResourceSet)
+		{
+			return new ResourceManager(baseName, resourceDir, usingResourceSet);
+		}
+
+		public virtual string BaseName
+		{
+			get { return BaseNameField; }
+		}
+
+		public virtual bool IgnoreCase
+		{
+			get { return ignoreCase; }
+			set { ignoreCase = value; }
+		}
+
+		public virtual Type ResourceSetType
+		{
+			get { return resourceSetType; }
+		}
+
+		public virtual object GetObject(string name)
+		{
+			return(GetObject(name, null));
+		}
+
+		public virtual object GetObject(string name, CultureInfo culture)
+		{
+			if(name==null) {
+				throw new ArgumentNullException("name is null");
+			}
+
+			if(culture==null) {
+				culture=CultureInfo.CurrentUICulture;
+			}
+
+			lock(this) {
+				ResourceSet set=InternalGetResourceSet(culture, true, true);
+				object obj=null;
+				
+				if(set != null) {
+					obj=set.GetObject(name, ignoreCase);
+					if(obj != null) {
+						return(obj);
+					}
+				}
+				
+				/* Try parent cultures */
+
+				do {
+					culture=culture.Parent;
+
+					set=InternalGetResourceSet(culture, true, true);
+					if(set!=null) {
+						obj=set.GetObject(name, ignoreCase);
+						if(obj != null) {
+							return(obj);
+						}
+					}
+				} while(!culture.Equals(neutral_culture) &&
+					!culture.Equals(CultureInfo.InvariantCulture));
+			}
+			
+			return(null);
+		}
+		
+		
+		public virtual ResourceSet GetResourceSet (CultureInfo culture,
+					   bool createIfNotExists, bool tryParents)
+			
+		{
+			if (culture == null) {
+				throw new ArgumentNullException ("CultureInfo is a null reference.");
+			}
+
+			lock(this) {
+				return(InternalGetResourceSet(culture, createIfNotExists, tryParents));
+			}
+		}
+		
+		public virtual string GetString (string name)
+		{
+			return(GetString(name, null));
+		}
+
+		public virtual string GetString (string name, CultureInfo culture)
+		{
+			if (name == null) {
+				throw new ArgumentNullException ("Name is null.");
+			}
+
+			if(culture==null) {
+				culture=CultureInfo.CurrentUICulture;
+			}
+
+			lock(this) {
+				ResourceSet set=InternalGetResourceSet(culture, true, true);
+				string str=null;
+
+				if(set!=null) {
+					str=set.GetString(name, ignoreCase);
+					if(str!=null) {
+						return(str);
+					}
+				}
+
+				/* Try parent cultures */
+
+				do {
+					culture=culture.Parent;
+
+					set=InternalGetResourceSet(culture, true, true);
+					if(set!=null) {
+						str=set.GetString(name, ignoreCase);
+						if(str!=null) {
+							return(str);
+						}
+					}
+				} while(!culture.Equals(neutral_culture) &&
+					!culture.Equals(CultureInfo.InvariantCulture));
+			}
+			
+			return(null);
+		}
+
+		protected virtual string GetResourceFileName (CultureInfo culture)
+		{
+			if(culture.Equals(CultureInfo.InvariantCulture)) {
+				return(BaseNameField + ".resources");
+			} else {
+				return(BaseNameField + culture.Name + ".resources");
+			}
+		}
+		
+		protected virtual ResourceSet InternalGetResourceSet (CultureInfo culture, bool Createifnotexists, bool tryParents)
+		{
+			ResourceSet set;
+			
+			/* if we already have this resource set, return it */
+			set=(ResourceSet)ResourceSets[culture];
+			if(set!=null) {
+				return(set);
+			}
+
+			if(MainAssembly != null) {
+				/* Assembly resources */
+				Stream stream;
+				string filename=GetResourceFileName(culture);
+				
+				stream=MainAssembly.GetManifestResourceStream(filename);
+				if(stream==null) {
+					/* Try a satellite assembly */
+					Version sat_version=GetSatelliteContractVersion(MainAssembly);
+					Assembly a=MainAssembly.GetSatelliteAssembly(culture, sat_version);
+					stream=a.GetManifestResourceStream(filename);
+				}
+
+				if(stream!=null && Createifnotexists==true) {
+					object[] args=new Object[1];
+
+					args[0]=stream;
+					
+					/* should we catch
+					 * MissingMethodException, or
+					 * just let someone else deal
+					 * with it?
+					 */
+					set=(ResourceSet)Activator.CreateInstance(resourceSetType, args);
+				}
+			} else if(resourceDir != null) {
+				/* File resources */
+				string filename=Path.Combine(resourceDir, this.GetResourceFileName(culture));
+				if(File.Exists(filename) &&
+				   Createifnotexists==true) {
+					object[] args=new Object[1];
+
+					args[0]=filename;
+					
+					/* should we catch
+					 * MissingMethodException, or
+					 * just let someone else deal
+					 * with it?
+					 */
+					set=(ResourceSet)Activator.CreateInstance(resourceSetType, args);
+				}
+			}
+
+			if(set==null && tryParents==true) {
+				set=this.InternalGetResourceSet(culture.Parent, Createifnotexists, tryParents);
+			}
+
+			if(set!=null) {
+				ResourceSets.Add(culture, set);
+			}
+			
+			return(set);
+		}
+		   
+		public virtual void ReleaseAllResources ()
+		{
+			lock(this) 
+			{
+				foreach (ResourceSet r in ResourceSets)
+					r.Close();
+				ResourceSets.Clear();
+			}
+		}
+
+		protected static CultureInfo GetNeutralResourcesLanguage (Assembly a)
+		{
+			object[] attrs;
+
+			attrs=a.GetCustomAttributes(typeof(NeutralResourcesLanguageAttribute), false);
+
+			if(attrs.Length==0) {
+				return(CultureInfo.InvariantCulture);
+			} else {
+				NeutralResourcesLanguageAttribute res_attr=(NeutralResourcesLanguageAttribute)attrs[0];
+				
+				return(new CultureInfo(res_attr.CultureName));
+			}
+		}
+
+		protected static Version GetSatelliteContractVersion (Assembly a)
+		{
+			object[] attrs;
+			
+			attrs=a.GetCustomAttributes(typeof(SatelliteContractVersionAttribute), false);
+
+			if(attrs.Length==0) {
+				return(null);
+			} else {
+				SatelliteContractVersionAttribute sat_attr=(SatelliteContractVersionAttribute)attrs[0];
+
+				/* Version(string) can throw
+				 * ArgumentException if the version is
+				 * invalid, but the spec for
+				 * GetSatelliteContractVersion says we
+				 * can throw the same exception for
+				 * the same reason, so dont bother to
+				 * catch it.
+				 */
+				return(new Version(sat_attr.Version));
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Resources/ResourceReader.cs b/mcs/class/corlib/System.Resources/ResourceReader.cs
new file mode 100644
index 00000000000..33acd8e18af
--- /dev/null
+++ b/mcs/class/corlib/System.Resources/ResourceReader.cs
@@ -0,0 +1,401 @@
+//
+// System.Resources.ResourceReader.cs
+//
+// Authors: 
+// 	Duncan Mak <duncan@ximian.com>
+//	Nick Drochak <ndrochak@gol.com>
+//	Dick Porter <dick@ximian.com>
+//
+// (C) 2001, 2002 Ximian Inc, http://www.ximian.com
+//
+
+using System.Collections;
+using System.Resources;
+using System.IO;
+using System.Text;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+
+namespace System.Resources
+{
+	public sealed class ResourceReader : IResourceReader, IEnumerable, IDisposable
+	{
+		BinaryReader reader;
+		IFormatter formatter;
+		internal int resourceCount = 0;
+		int typeCount = 0;
+		Type[] types;
+		int[] hashes;
+		long[] positions;
+		int dataSectionOffset;
+		long nameSectionOffset;
+		
+		// Constructors
+		public ResourceReader (Stream stream)
+		{
+			if (stream == null)
+				throw new ArgumentNullException ("Value cannot be null.");
+			
+			if (!stream.CanRead)
+				throw new ArgumentException ("Stream was not readable.");
+
+			reader = new BinaryReader(stream, Encoding.UTF8);
+			formatter = new BinaryFormatter(null, new StreamingContext(StreamingContextStates.File|StreamingContextStates.Persistence));
+			
+			ReadHeaders();
+		}
+		
+		public ResourceReader (string fileName)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("Path cannot be null.");
+
+			if (!System.IO.File.Exists (fileName)) 
+				throw new FileNotFoundException ("Could not find file " + Path.GetFullPath(fileName));
+
+			reader = new BinaryReader (new FileStream(fileName, FileMode.Open, FileAccess.Read, FileShare.Read));
+			formatter = new BinaryFormatter(null, new StreamingContext(StreamingContextStates.File|StreamingContextStates.Persistence));
+
+			ReadHeaders();
+		}
+		
+		/* Read the ResourceManager header and the
+		 * ResourceReader header.
+		 */
+		private void ReadHeaders()
+		{
+			try {
+				int manager_magic = reader.ReadInt32();
+
+				if(manager_magic != ResourceManager.MagicNumber) {
+					throw new ArgumentException("Stream is not a valid .resources file!");
+				}
+
+				int manager_ver = reader.ReadInt32();
+				int manager_len = reader.ReadInt32();
+				
+				/* We know how long the header is, even if
+				 * the version number is too new
+				 */
+				if(manager_ver > ResourceManager.HeaderVersionNumber) {
+					reader.BaseStream.Seek(manager_len, SeekOrigin.Current);
+				} else {
+					string reader_class=reader.ReadString();
+					if(!reader_class.StartsWith("System.Resources.ResourceReader")) {
+						throw new NotSupportedException("This .resources file requires reader class " + reader_class);
+					}
+					
+					string set_class=reader.ReadString();
+					if(!set_class.StartsWith(typeof(ResourceSet).FullName) && !set_class.StartsWith("System.Resources.RuntimeResourceSet")) {
+						throw new NotSupportedException("This .resources file requires set class " + set_class);
+					}
+				}
+
+				/* Now read the ResourceReader header */
+				int reader_ver = reader.ReadInt32();
+
+				if(reader_ver != 1) {
+					throw new NotSupportedException("This .resources file requires unsupported set class version: " + reader_ver.ToString());
+				}
+
+				resourceCount = reader.ReadInt32();
+				typeCount = reader.ReadInt32();
+				
+				types=new Type[typeCount];
+				for(int i=0; i<typeCount; i++) {
+					string type_name=reader.ReadString();
+
+					/* FIXME: Should we ask for
+					 * type loading exceptions
+					 * here?
+					 */
+					types[i]=Type.GetType(type_name);
+					if(types[i]==null) {
+						throw new ArgumentException("Could not load type {0}", type_name);
+					}
+				}
+
+				/* There are between 0 and 7 bytes of
+				 * padding here, consisting of the
+				 * letters PAD.  The next item (Hash
+				 * values for each resource name) need
+				 * to be aligned on an 8-byte
+				 * boundary.
+				 */
+
+				int pad_align=(int)(reader.BaseStream.Position & 7);
+				int pad_chars=0;
+
+				if(pad_align!=0) {
+					pad_chars=8-pad_align;
+				}
+
+				for(int i=0; i<pad_chars; i++) {
+					byte pad_byte=reader.ReadByte();
+					if(pad_byte!="PAD"[i%3]) {
+						throw new ArgumentException("Malformed .resources file (padding values incorrect)");
+					}
+				}
+
+				/* Read in the hash values for each
+				 * resource name.  These can be used
+				 * by ResourceSet (calling internal
+				 * methods) to do a fast compare on
+				 * resource names without doing
+				 * expensive string compares (but we
+				 * dont do that yet, so far we only
+				 * implement the Enumerator interface)
+				 */
+				hashes=new int[resourceCount];
+				for(int i=0; i<resourceCount; i++) {
+					hashes[i]=reader.ReadInt32();
+				}
+				
+				/* Read in the virtual offsets for
+				 * each resource name
+				 */
+				positions=new long[resourceCount];
+				for(int i=0; i<resourceCount; i++) {
+					positions[i]=reader.ReadInt32();
+				}
+				
+				dataSectionOffset = reader.ReadInt32();
+				nameSectionOffset = reader.BaseStream.Position;
+			} catch(EndOfStreamException e) {
+				throw new ArgumentException("Stream is not a valied .resources file!  It was possibly truncated.", e);
+			}
+		}
+
+		/* Cut and pasted from BinaryReader, because it's
+		 * 'protected' there
+		 */
+		private int Read7BitEncodedInt() {
+			int ret = 0;
+			int shift = 0;
+			byte b;
+
+			do {
+				b = reader.ReadByte();
+				
+				ret = ret | ((b & 0x7f) << shift);
+				shift += 7;
+			} while ((b & 0x80) == 0x80);
+
+			return ret;
+		}
+
+		private string ResourceName(int index)
+		{
+			lock(this) 
+			{
+				long pos=positions[index]+nameSectionOffset;
+				reader.BaseStream.Seek(pos, SeekOrigin.Begin);
+
+				/* Read a 7-bit encoded byte length field */
+				int len=Read7BitEncodedInt();
+				byte[] str=new byte[len];
+
+				reader.Read(str, 0, len);
+				return Encoding.Unicode.GetString(str);
+			}
+		}
+
+		private object ResourceValue(int index)
+		{
+			lock(this)
+			{
+				long pos=positions[index]+nameSectionOffset;
+				reader.BaseStream.Seek(pos, SeekOrigin.Begin);
+
+				/* Read a 7-bit encoded byte length field */
+				long len=Read7BitEncodedInt();
+				/* ... and skip that data to the info
+				 * we want, the offset into the data
+				 * section
+				 */
+				reader.BaseStream.Seek(len, SeekOrigin.Current);
+
+				long data_offset=reader.ReadInt32();
+				reader.BaseStream.Seek(data_offset+dataSectionOffset, SeekOrigin.Begin);
+				int type_index=Read7BitEncodedInt();
+				Type type=types[type_index];
+				
+				if (type==typeof(Byte)) {
+					return(reader.ReadByte());
+				/* for some reason Char is serialized */
+				/*} else if (type==typeof(Char)) {
+					return(reader.ReadChar());*/
+				} else if (type==typeof(Decimal)) {
+					return(reader.ReadDecimal());
+				} else if (type==typeof(DateTime)) {
+					return(new DateTime(reader.ReadInt64()));
+				} else if (type==typeof(Double)) {
+					return(reader.ReadDouble());
+				} else if (type==typeof(Int16)) {
+					return(reader.ReadInt16());
+				} else if (type==typeof(Int32)) {
+					return(reader.ReadInt32());
+				} else if (type==typeof(Int64)) {
+					return(reader.ReadInt64());
+				} else if (type==typeof(SByte)) {
+					return(reader.ReadSByte());
+				} else if (type==typeof(Single)) {
+					return(reader.ReadSingle());
+				} else if (type==typeof(String)) {
+					return(reader.ReadString());
+				} else if (type==typeof(TimeSpan)) {
+					return(new TimeSpan(reader.ReadInt64()));
+				} else if (type==typeof(UInt16)) {
+					return(reader.ReadUInt16());
+				} else if (type==typeof(UInt32)) {
+					return(reader.ReadUInt32());
+				} else if (type==typeof(UInt64)) {
+					return(reader.ReadUInt64());
+				} else {
+					/* non-intrinsic types are
+					 * serialized
+					 */
+					object obj=formatter.Deserialize(reader.BaseStream);
+					if(obj.GetType() != type) {
+						/* We got a bogus
+						 * object.  This
+						 * exception is the
+						 * best match I could
+						 * find.  (.net seems
+						 * to throw
+						 * BadImageFormatException,
+						 * which the docs
+						 * state is used when
+						 * file or dll images
+						 * cant be loaded by
+						 * the runtime.)
+						 */
+						throw new InvalidOperationException("Deserialized object is wrong type");
+					}
+					
+					return(obj);
+				}
+			}
+		}
+
+		public void Close ()
+		{
+			Dispose(true);
+		}
+		
+		public IDictionaryEnumerator GetEnumerator () {
+			if (reader == null){
+				throw new InvalidOperationException("ResourceReader is closed.");
+			}
+			else {
+				return new ResourceEnumerator (this);
+			}
+		}
+		
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			return ((IResourceReader) this).GetEnumerator();
+		}
+		
+		void IDisposable.Dispose ()
+		{
+			Dispose(true);
+		}
+
+		private void Dispose (bool disposing)
+		{
+			if(disposing) {
+				if(reader!=null) {
+					reader.Close();
+				}
+			}
+
+			reader=null;
+			hashes=null;
+			positions=null;
+			types=null;
+		}
+		
+		internal class ResourceEnumerator : IDictionaryEnumerator
+		{
+			private ResourceReader reader;
+			private int index = -1;
+			private bool finished = false;
+			
+			internal ResourceEnumerator(ResourceReader readerToEnumerate){
+				reader = readerToEnumerate;
+			}
+
+			public virtual DictionaryEntry Entry
+			{
+				get {
+					if (reader.reader == null)
+						throw new InvalidOperationException("ResourceReader is closed.");
+					if (index < 0)
+						throw new InvalidOperationException("Enumeration has not started. Call MoveNext.");
+
+					DictionaryEntry entry = new DictionaryEntry();
+					entry.Key = Key;
+					entry.Value = Value;
+					return entry; 
+				}
+			}
+			
+			public virtual object Key
+			{
+				get { 
+					if (reader.reader == null)
+						throw new InvalidOperationException("ResourceReader is closed.");
+					if (index < 0)
+						throw new InvalidOperationException("Enumeration has not started. Call MoveNext.");
+					return (reader.ResourceName(index)); 
+				}
+			}
+			
+			public virtual object Value
+			{
+				get { 
+					if (reader.reader == null)
+						throw new InvalidOperationException("ResourceReader is closed.");
+					if (index < 0)
+						throw new InvalidOperationException("Enumeration has not started. Call MoveNext.");
+					return(reader.ResourceValue(index));
+				}
+			}
+			
+			public virtual object Current
+			{
+				get {
+					/* Entry does the checking, no
+					 * need to repeat it here
+					 */
+					return Entry; 
+				}
+			}
+			
+			public virtual bool MoveNext ()
+			{
+				if (reader.reader == null)
+					throw new InvalidOperationException("ResourceReader is closed.");
+				if (finished) {
+					return false;
+				}
+				
+				if (++index < reader.resourceCount){
+					return true;
+				}
+				else {
+					finished=true;
+					return false;
+				}
+			}
+			
+			public void Reset () {
+				if (reader.reader == null)
+					throw new InvalidOperationException("ResourceReader is closed.");
+				index = -1;
+				finished = false;
+			}
+		} // internal class ResourceEnumerator
+	}  // public sealed class ResourceReader
+} // namespace System.Resources
diff --git a/mcs/class/corlib/System.Resources/ResourceSet.cs b/mcs/class/corlib/System.Resources/ResourceSet.cs
new file mode 100644
index 00000000000..14a954c8e2e
--- /dev/null
+++ b/mcs/class/corlib/System.Resources/ResourceSet.cs
@@ -0,0 +1,148 @@
+//
+// System.Resources.ResourceSet.cs
+//
+// Authors:
+//	Duncan Mak (duncan@ximian.com)
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2001, 2002 Ximian, Inc.		http://www.ximian.com
+//
+
+using System.Collections;
+using System.IO;
+
+namespace System.Resources
+{
+	[Serializable]
+	public class ResourceSet : IDisposable
+	{
+
+		protected IResourceReader Reader;
+		protected Hashtable Table;
+
+		// Constructors
+		protected ResourceSet () {}
+
+		public ResourceSet (IResourceReader reader)
+		{
+			if (reader == null)
+				throw new ArgumentNullException ("The reader is null.");
+			Reader = reader;
+		}
+
+		public ResourceSet (Stream stream)
+		{
+			if(stream==null) {
+				throw new ArgumentNullException("stream is null");
+			}
+
+			if(!stream.CanRead) {
+				throw new ArgumentException("stream is not readable");
+			}
+			
+			Reader = new ResourceReader (stream);
+		}
+
+		public ResourceSet (String fileName)
+		{
+			if(fileName==null) {
+				throw new ArgumentNullException("filename is null");
+			}
+			
+			Reader = new ResourceReader (fileName);
+		}
+
+		public virtual void Close ()
+		{
+			Dispose (true);
+		}
+
+		public void Dispose()
+		{
+			Dispose (true);
+		}
+
+		protected virtual void Dispose (bool disposing)
+		{
+			if (disposing) {
+				if(Reader!=null) {
+					Reader.Close();
+				}
+			}
+
+			Reader = null;
+			Table = null;
+		}
+
+		public virtual Type GetDefaultReader ()
+		{
+			return (typeof (ResourceReader));
+		} 
+		public virtual Type GetDefaultWriter ()
+		{
+			return (typeof (ResourceWriter));
+		}
+
+		public virtual object GetObject (string name)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("The name parameter is null.");
+			if (Reader == null)
+				throw new InvalidOperationException ("The ResourceSet has been closed.");
+
+			if (Table == null) { 
+				ReadResources ();
+			}
+			
+			return(Table[name]);
+		}
+
+		public virtual object GetObject (string name, bool ignoreCase)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("The name parameter is null.");
+			if (Reader == null)
+				throw new InvalidOperationException ("ResourceSet has been closed.");
+			if (Table == null)
+				ReadResources ();
+
+			if (ignoreCase) {
+				foreach (DictionaryEntry de in Table) {
+					string key = (string) de.Key;
+					if (String.Compare (key, name, true) == 0)
+						return de.Value;
+				}
+				return null;
+			} else
+				return Table[name];
+		}
+
+		public virtual string GetString (string name)
+		{
+			Object o = GetObject (name);
+			if (o is string)
+				return (string) o;
+			throw new InvalidOperationException("Not a string");
+		}
+
+		public virtual string GetString (string name, bool ignoreCase)
+		{
+			Object o = GetObject (name, ignoreCase);
+			if (o is string)
+				return (string) o;
+			throw new InvalidOperationException("Not a string");
+		}
+
+		protected virtual void ReadResources ()
+		{
+			IDictionaryEnumerator i = Reader.GetEnumerator();
+
+			if (Table == null)
+				Table = new Hashtable ();
+			i.Reset ();
+
+			while (i.MoveNext ()) 
+				Table.Add (i.Key, i.Value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Resources/ResourceWriter.cs b/mcs/class/corlib/System.Resources/ResourceWriter.cs
new file mode 100644
index 00000000000..1875b2b995c
--- /dev/null
+++ b/mcs/class/corlib/System.Resources/ResourceWriter.cs
@@ -0,0 +1,335 @@
+//
+// System.Resources.ResourceWriter.cs
+//
+// Authors:
+//	Duncan Mak <duncan@ximian.com>
+//	Dick Porter <dick@ximian.com>
+//
+// (C) 2001, 2002 Ximian, Inc. 	http://www.ximian.com
+//
+
+using System.IO;
+using System.Collections;
+using System.Text;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Binary;
+
+namespace System.Resources
+{
+	public sealed class ResourceWriter : IResourceWriter, IDisposable
+	{
+		Hashtable resources;
+		Stream stream;
+		
+		public ResourceWriter (Stream stream)
+		{
+			if (stream == null)
+				throw new ArgumentNullException ("stream is null");
+			if (stream.CanWrite == false)
+				throw new ArgumentException ("stream is not writable.");
+
+			this.stream=stream;
+			resources=new Hashtable(CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default);
+		}
+		
+		public ResourceWriter (String fileName)
+		{
+			if (fileName == null)
+				throw new ArgumentNullException ("fileName is null.");
+
+			stream=new FileStream(fileName, FileMode.Create, FileAccess.Write);
+			resources=new Hashtable(CaseInsensitiveHashCodeProvider.Default, CaseInsensitiveComparer.Default);
+		}
+		
+		public void AddResource (string name, byte[] value)
+		{
+			if (name == null) {
+				throw new ArgumentNullException ("name is null");
+			}
+			if (value == null) {
+				throw new ArgumentNullException ("value is null");
+			}
+			if(resources==null) {
+				throw new InvalidOperationException ("ResourceWriter has been closed");
+			}
+			if(resources[name]!=null) {
+				throw new ArgumentException ("Resource already present: " + name);
+			}
+
+			resources.Add(name, value);
+		}
+		
+		public void AddResource (string name, object value)
+		{			 
+			if (name == null) {
+				throw new ArgumentNullException ("name is null");
+			}
+			if (value == null) {
+				throw new ArgumentNullException ("value is null");
+			}
+			if(resources==null) {
+				throw new InvalidOperationException ("ResourceWriter has been closed");
+			}
+			if(resources[name]!=null) {
+				throw new ArgumentException ("Resource already present: " + name);
+			}
+
+			resources.Add(name, value);
+		}
+		
+		public void AddResource (string name, string value)
+		{
+			if (name == null) {
+				throw new ArgumentNullException ("name is null");
+			}
+			if (value == null) {
+				throw new ArgumentNullException ("value is null");
+			}
+			if(resources==null) {
+				throw new InvalidOperationException ("ResourceWriter has been closed");
+			}
+			if(resources[name]!=null) {
+				throw new ArgumentException ("Resource already present: " + name);
+			}
+
+			resources.Add(name, value);
+		}
+
+		public void Close () {
+			Dispose(true);
+		}
+		
+		public void Dispose ()
+		{
+			Dispose(true);
+		}
+
+		private void Dispose (bool disposing)
+		{
+			if(disposing) {
+				if(resources.Count>0 && generated==false) {
+					Generate();
+				}
+				if(stream!=null) {
+					stream.Close();
+				}
+			}
+			resources=null;
+			stream=null;
+		}
+		
+		private bool generated=false;
+		
+		public void Generate () {
+			BinaryWriter writer;
+			IFormatter formatter;
+
+			if(resources==null) {
+				throw new InvalidOperationException ("ResourceWriter has been closed");
+			}
+
+			if(generated) {
+				throw new InvalidOperationException ("ResourceWriter can only Generate() once");
+			}
+			generated=true;
+			
+			writer=new BinaryWriter(stream, Encoding.UTF8);
+			formatter=new BinaryFormatter(null, new StreamingContext(StreamingContextStates.File|StreamingContextStates.Persistence));
+
+			/* The ResourceManager header */
+			
+			writer.Write(ResourceManager.MagicNumber);
+			writer.Write(ResourceManager.HeaderVersionNumber);
+			
+			/* Build the rest of the ResourceManager
+			 * header in memory, because we need to know
+			 * how long it is in advance
+			 */
+			MemoryStream resman_stream=new MemoryStream();
+			BinaryWriter resman=new BinaryWriter(resman_stream,
+							     Encoding.UTF8);
+
+			resman.Write(typeof(ResourceReader).AssemblyQualifiedName);
+			resman.Write(typeof(ResourceSet).AssemblyQualifiedName);
+
+			/* Only space for 32 bits of header len in the
+			 * resource file format
+			 */
+			int resman_len=(int)resman_stream.Length;
+			writer.Write(resman_len);
+			writer.Write(resman_stream.GetBuffer(), 0, resman_len);
+
+			/* We need to build the ResourceReader name
+			 * and data sections simultaneously
+			 */
+			MemoryStream res_name_stream=new MemoryStream();
+			BinaryWriter res_name=new BinaryWriter(res_name_stream, Encoding.Unicode);
+
+			MemoryStream res_data_stream=new MemoryStream();
+			BinaryWriter res_data=new BinaryWriter(res_data_stream,
+							       Encoding.UTF8);
+
+			/* Not sure if this is the best collection to
+			 * use, I just want an unordered list of
+			 * objects with fast lookup, but without
+			 * needing a key.  (I suppose a hashtable with
+			 * key==value would work, but I need to find
+			 * the index of each item later)
+			 */
+			ArrayList types=new ArrayList();
+			int[] hashes=new int[resources.Count];
+			int[] name_offsets=new int[resources.Count];
+			int count=0;
+			
+			IDictionaryEnumerator res_enum=resources.GetEnumerator();
+			while(res_enum.MoveNext()) {
+				Type type=res_enum.Value.GetType();
+
+				/* Keep a list of unique types */
+				if(!types.Contains(type)) {
+					types.Add(type);
+				}
+
+				/* Hash the name */
+				hashes[count]=GetHash((string)res_enum.Key);
+
+				/* Record the offsets */
+				name_offsets[count]=(int)res_name.BaseStream.Position;
+
+				/* Write the name section */
+				res_name.Write((string)res_enum.Key);
+				res_name.Write((int)res_data.BaseStream.Position);
+
+				/* Write the data section */
+				Write7BitEncodedInt(res_data, types.IndexOf(type));
+				/* Strangely, Char is serialized
+				 * rather than just written out
+				 */
+				if(type==typeof(Byte)) {
+					res_data.Write((Byte)res_enum.Value);
+				} else if (type==typeof(Decimal)) {
+					res_data.Write((Decimal)res_enum.Value);
+				} else if (type==typeof(DateTime)) {
+					res_data.Write(((DateTime)res_enum.Value).Ticks);
+				} else if (type==typeof(Double)) {
+					res_data.Write((Double)res_enum.Value);
+				} else if (type==typeof(Int16)) {
+					res_data.Write((Int16)res_enum.Value);
+				} else if (type==typeof(Int32)) {
+					res_data.Write((Int32)res_enum.Value);
+				} else if (type==typeof(Int64)) {
+					res_data.Write((Int64)res_enum.Value);
+				} else if (type==typeof(SByte)) {
+					res_data.Write((SByte)res_enum.Value);
+				} else if (type==typeof(Single)) {
+					res_data.Write((Single)res_enum.Value);
+				} else if (type==typeof(String)) {
+					res_data.Write((String)res_enum.Value);
+				} else if (type==typeof(TimeSpan)) {
+					res_data.Write(((TimeSpan)res_enum.Value).Ticks);
+				} else if (type==typeof(UInt16)) {
+					res_data.Write((UInt16)res_enum.Value);
+				} else if (type==typeof(UInt32)) {
+					res_data.Write((UInt32)res_enum.Value);
+				} else if (type==typeof(UInt64)) {
+					res_data.Write((UInt64)res_enum.Value);
+				} else {
+					/* non-intrinsic types are
+					 * serialized
+					 */
+					formatter.Serialize(res_data.BaseStream, res_enum.Value);
+				}
+
+				count++;
+			}
+
+			/* Sort the hashes, keep the name offsets
+			 * matching up
+			 */
+			Array.Sort(hashes, name_offsets);
+			
+			/* now do the ResourceReader header */
+
+			writer.Write(1);
+			writer.Write(resources.Count);
+			writer.Write(types.Count);
+
+			/* Write all of the unique types */
+			foreach(Type type in types) {
+				writer.Write(type.AssemblyQualifiedName);
+			}
+
+			/* Pad the next fields (hash values) on an 8
+			 * byte boundary, using the letters "PAD"
+			 */
+			int pad_align=(int)(writer.BaseStream.Position & 7);
+			int pad_chars=0;
+
+			if(pad_align!=0) {
+				pad_chars=8-pad_align;
+			}
+
+			for(int i=0; i<pad_chars; i++) {
+				writer.Write((byte)"PAD"[i%3]);
+			}
+
+			/* Write the hashes */
+			for(int i=0; i<resources.Count; i++) {
+				writer.Write(hashes[i]);
+			}
+
+			/* and the name offsets */
+			for(int i=0; i<resources.Count; i++) {
+				writer.Write(name_offsets[i]);
+			}
+
+			/* Write the data section offset */
+			int data_offset=(int)writer.BaseStream.Position +
+				(int)res_name_stream.Length + 4;
+			writer.Write(data_offset);
+
+			/* The name section goes next */
+			writer.Write(res_name_stream.GetBuffer(), 0,
+				     (int)res_name_stream.Length);
+			/* The data section is last */
+			writer.Write(res_data_stream.GetBuffer(), 0,
+				     (int)res_data_stream.Length);
+
+			res_name.Close();
+			res_data.Close();
+
+			/* Don't close writer, according to the spec */
+			writer.Flush();
+		}
+
+		private int GetHash(string name)
+		{
+			uint hash=5381;
+
+			for(int i=0; i<name.Length; i++) {
+				hash=((hash<<5)+hash)^name[i];
+			}
+			
+			return((int)hash);
+		}
+
+		/* Cut and pasted from BinaryWriter, because it's
+		 * 'protected' there.
+		 */
+		private void Write7BitEncodedInt(BinaryWriter writer,
+						 int value)
+		{
+			do {
+				int high = (value >> 7) & 0x01ffffff;
+				byte b = (byte)(value & 0x7f);
+
+				if (high != 0) {
+					b = (byte)(b | 0x80);
+				}
+
+				writer.Write(b);
+				value = high;
+			} while(value != 0);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Resources/SatelliteContractVersionAttribute.cs b/mcs/class/corlib/System.Resources/SatelliteContractVersionAttribute.cs
new file mode 100644
index 00000000000..a0bf1bd0614
--- /dev/null
+++ b/mcs/class/corlib/System.Resources/SatelliteContractVersionAttribute.cs
@@ -0,0 +1,27 @@
+//
+// System.Resources.SatelliteContractVersionAttribute.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.		http://www.ximian.com
+//
+
+namespace System.Resources
+{
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class SatelliteContractVersionAttribute : Attribute
+	{
+		private Version ver; 
+		
+		// Constructor
+		public SatelliteContractVersionAttribute (string version)
+		{
+				ver = new Version(version);
+		}
+		public string Version
+		{
+				get { return ver.ToString(); }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/AccessedThroughPropertyAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/AccessedThroughPropertyAttribute.cs
new file mode 100644
index 00000000000..8343f11197a
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/AccessedThroughPropertyAttribute.cs
@@ -0,0 +1,25 @@
+//
+// System.Runtime.CompilerServices.AccessedThroughPropertyAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+	[AttributeUsage (AttributeTargets.Field)]
+	public sealed class AccessedThroughPropertyAttribute : Attribute
+	{
+		string name;
+		public AccessedThroughPropertyAttribute (string propertyName)
+		{
+			name = propertyName;
+		}
+
+		public string PropertyName {
+			get { return name; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/ChangeLog b/mcs/class/corlib/System.Runtime.CompilerServices/ChangeLog
new file mode 100644
index 00000000000..f1b5b303caa
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/ChangeLog
@@ -0,0 +1,53 @@
+2002-08-23  Nick Drochak  <ndrochak@gol.com>

+

+	* IsVolatile.cs: No _public_ members, but if we don't put a private

+	ctor, the complier will give us a public one.

+

+2002-08-23  Nick Drochak  <ndrochak@gol.com>

+

+	* IsVolatile.cs: This class has no members, not even an empty ctor.

+

+2002-07-24  Duncan Mak  <duncan@ximian.com>

+

+	* AccessedThroughPropertyAttribute.cs:

+	* CompilationRelaxationsAttribute.cs: 

+	* CompilerGlobalScopeAttribute.cs: 

+	* DateTimeConstantAttribute.cs: 

+	* DecimalConstantAttribute.cs: 

+	* IDispatchConstantAttribute.cs:

+	* IsVolatile.cs:

+	* IUnknownConstantAttribute.cs: 

+	* RequiredAttributeAttribute.cs: Visibility changes.

+

+2002-07-23  Duncan Mak  <duncan@ximian.com>

+

+	* AccessedThroughPropertyAttribute.cs: 

+	* CompilationRelaxationsAttribute.cs: 

+	* CompilerGlobalScopeAttribute.cs: 

+	* CustomConstantAttribute.cs: 

+	* DateTimeConstantAttribute.cs: 

+	* DecimalConstantAttribute.cs: 

+	* DiscardableAttribute.cs: 

+	* IDispatchConstantAttribute.cs: 

+	* IUnknownConstantAttribute.cs: 

+	* RequiredAttributeAttribute.cs: Added all the missing Attributes

+

+	* IsVolatile.cs: Added to CVS.

+

+	* MethodImplOptions.cs: Added the PreserveSig flag.

+

+2002-04-15  Dan Lewis <dihlewis@yahoo.co.uk>

+

+	* MethodImplAttribute.cs: added constructor usage.

+

+Fri Feb 22 15:36:19 CET 2002 Paolo Molaro <lupus@ximian.com>

+

+	* RuntimeHelpers.cs: added OffsetToStringData() property.

+

+Mon Nov 5 19:50:11 CET 2001 Paolo Molaro <lupus@ximian.com>

+

+	* RuntimeHelpers.cs: make InitializeArray an internalcall.

+

+2001-07-18  Michael Lambert <michaellambert@email.com>

+

+	* MethodCodeType.cs, MethodImplOptions.cs: Add.

diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/CompilationRelaxationsAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/CompilationRelaxationsAttribute.cs
new file mode 100644
index 00000000000..71e3e4835d9
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/CompilationRelaxationsAttribute.cs
@@ -0,0 +1,25 @@
+//
+// System.Runtime.CompilerServices.CompilationRelaxationsAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+	[AttributeUsage (AttributeTargets.Module)] [Serializable]
+	public class CompilationRelaxationsAttribute : Attribute
+	{
+		int relax;
+		public CompilationRelaxationsAttribute (int relaxations)
+		{
+			relax = relaxations;
+		}
+
+		public int CompilationRelaxations {
+			get { return relax; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute.cs
new file mode 100644
index 00000000000..a317cb52b0d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/CompilerGlobalScopeAttribute.cs
@@ -0,0 +1,19 @@
+//
+// System.Runtime.CompilerServices.CompilerGlobalScopeAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+	[AttributeUsage (AttributeTargets.Class)] [Serializable]
+	public class CompilerGlobalScopeAttribute : Attribute
+	{
+		public CompilerGlobalScopeAttribute ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/CustomConstantAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/CustomConstantAttribute.cs
new file mode 100644
index 00000000000..cdfadad31ec
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/CustomConstantAttribute.cs
@@ -0,0 +1,21 @@
+//
+// System.Runtime.CompilerServices.CustomConstantAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+	[AttributeUsage (AttributeTargets.Class)] [Serializable]
+	public abstract class CustomConstantAttribute : Attribute
+	{
+		protected CustomConstantAttribute ()
+		{
+		}
+
+		public abstract object Value { get; }
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/DateTimeConstantAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/DateTimeConstantAttribute.cs
new file mode 100644
index 00000000000..7bb937e3bf6
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/DateTimeConstantAttribute.cs
@@ -0,0 +1,27 @@
+//
+// System.Runtime.CompilerServices.DateTimeConstantAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+	[Serializable]
+	[AttributeUsage (AttributeTargets.Field | AttributeTargets.Parameter)]
+	public sealed class DateTimeConstantAttribute : CustomConstantAttribute
+	{
+		long ticks;
+		
+		public DateTimeConstantAttribute (long ticks)
+		{
+			this.ticks = ticks;
+		}
+
+		public override object Value {
+			get { return ticks; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/DecimalConstantAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/DecimalConstantAttribute.cs
new file mode 100644
index 00000000000..0d242a55484
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/DecimalConstantAttribute.cs
@@ -0,0 +1,35 @@
+//
+// System.Runtime.CompilerServices.DecimalConstantAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+	[Serializable] [CLSCompliant (false)]
+	[AttributeUsage (AttributeTargets.Field | AttributeTargets.Parameter)]
+	public sealed class DecimalConstantAttribute : Attribute
+	{
+		byte scale;
+		bool sign;
+		int hi;
+		int mid;
+		int low;
+		
+		public DecimalConstantAttribute (byte scale, byte sign, uint hi, uint mid, uint low)
+		{
+			this.scale = scale;
+			this.sign  = Convert.ToBoolean (sign);
+			this.hi    = (int) hi;
+			this.mid   = (int) mid;
+			this.low   = (int) low;
+		}
+
+		public Decimal Value {
+			get { return new Decimal (low, mid, hi, sign, scale); }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/DiscardableAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/DiscardableAttribute.cs
new file mode 100644
index 00000000000..2271065ad98
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/DiscardableAttribute.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.CompilerServices.DiscardableAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+	public class DiscardableAttribute : Attribute
+	{
+		public DiscardableAttribute ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/IDispatchConstantAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/IDispatchConstantAttribute.cs
new file mode 100644
index 00000000000..f0a2cad5b1b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/IDispatchConstantAttribute.cs
@@ -0,0 +1,24 @@
+//
+// System.Runtime.CompilerServices.IDispatchConstantAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+	[Serializable]
+	[AttributeUsage (AttributeTargets.Field | AttributeTargets.Parameter)]
+	public sealed class IDispatchConstantAttribute : CustomConstantAttribute
+	{
+		public IDispatchConstantAttribute ()
+		{
+		}
+
+		public override object Value {
+			get { return null; } // this is correct.
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/IUnknownConstantAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/IUnknownConstantAttribute.cs
new file mode 100644
index 00000000000..c8808ff4ba5
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/IUnknownConstantAttribute.cs
@@ -0,0 +1,24 @@
+//
+// System.Runtime.CompilerServices.IUnknownConstantAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+	[Serializable]
+	[AttributeUsage (AttributeTargets.Field | AttributeTargets.Parameter)]
+	public sealed class IUnknownConstantAttribute : CustomConstantAttribute
+	{
+		public IUnknownConstantAttribute ()
+		{
+		}
+
+		public override object Value {
+			get { return null; } // this is correct.
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/IndexerNameAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/IndexerNameAttribute.cs
new file mode 100755
index 00000000000..cf61a66b979
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/IndexerNameAttribute.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.CompilerServices.IndexerNameAttributecs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Runtime.CompilerServices {
+
+	[AttributeUsage(AttributeTargets.Property, Inherited=false)] [Serializable]
+	public sealed class IndexerNameAttribute : Attribute {
+		public IndexerNameAttribute (string indexer_name)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/IsVolatile.cs b/mcs/class/corlib/System.Runtime.CompilerServices/IsVolatile.cs
new file mode 100644
index 00000000000..f8a26c17dd0
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/IsVolatile.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.CompilerServices.IsVolatile.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+	public sealed class IsVolatile
+	{
+		private IsVolatile() 
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/MethodCodeType.cs b/mcs/class/corlib/System.Runtime.CompilerServices/MethodCodeType.cs
new file mode 100644
index 00000000000..3608120e516
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/MethodCodeType.cs
@@ -0,0 +1,23 @@
+//------------------------------------------------------------------------------

+// 

+// System.Runtime.CompilerServices.MethodCodeType.cs 

+//

+// Copyright (C) 2001 Michael Lambert, All Rights Reserved

+// 

+// Author:         Michael Lambert, michaellambert@email.com

+// Created:        Thu 07/18/2001 

+//

+//------------------------------------------------------------------------------

+

+namespace System.Runtime.CompilerServices

+{

+ 

+public enum MethodCodeType

+{

+    IL,

+    Native,

+    OPTIL,

+    Runtime,

+}

+

+} // Namespace

diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/MethodImplAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/MethodImplAttribute.cs
new file mode 100644
index 00000000000..41aed97dcab
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/MethodImplAttribute.cs
@@ -0,0 +1,40 @@
+//
+// System.Runtime.CompilerServices.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.Runtime.CompilerServices {
+
+	[AttributeUsage(AttributeTargets.Method | AttributeTargets.Constructor, Inherited=false)] [Serializable]
+	public sealed class MethodImplAttribute : Attribute {
+		MethodImplOptions impl_options;
+		
+		public MethodImplAttribute ()
+		{
+		}
+
+		public MethodImplAttribute (short options)
+		{
+			impl_options = (MethodImplOptions) options;
+		}
+
+		public MethodImplAttribute (MethodImplOptions options)
+		{
+			impl_options = options;
+		}
+
+		public MethodCodeType MethodCodeType;
+
+		public MethodImplOptions Value {
+			get {
+				return impl_options;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/MethodImplOptions.cs b/mcs/class/corlib/System.Runtime.CompilerServices/MethodImplOptions.cs
new file mode 100644
index 00000000000..45a98baeb79
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/MethodImplOptions.cs
@@ -0,0 +1,46 @@
+// MethodImplOptions.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:33:23 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.CompilerServices {
+
+
+	/// <summary>
+	/// </summary>
+	public enum MethodImplOptions {
+
+		/// <summary>
+		/// </summary>
+		Unmanaged = 4,
+
+		/// <summary>
+		/// </summary>
+		ForwardRef = 16,
+
+		/// <summary>
+		/// </summary>
+		InternalCall = 4096,
+
+		/// <summary>
+		/// </summary>
+		Synchronized = 32,
+
+		/// <summary>
+		/// </summary>
+		NoInlining = 8,
+
+		/// <summary>
+		/// </summary>
+		PreserveSig = 128,
+
+	} // MethodImplOptions
+
+} // System.Runtime.CompilerServices
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/RequiredAttributeAttribute.cs b/mcs/class/corlib/System.Runtime.CompilerServices/RequiredAttributeAttribute.cs
new file mode 100644
index 00000000000..1489b1b32f3
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/RequiredAttributeAttribute.cs
@@ -0,0 +1,25 @@
+//
+// System.Runtime.CompilerServices.RequiredAttributeAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian Inc.
+
+using System;
+
+namespace System.Runtime.CompilerServices {
+
+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct |
+			AttributeTargets.Enum | AttributeTargets.Interface)]
+	[Serializable]
+	public sealed class RequiredAttributeAttribute : Attribute
+	{
+		public RequiredAttributeAttribute (Type requiredContract)
+		{
+		}
+
+		public Type RequiredContract {
+			get { throw new NotSupportedException (); }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.CompilerServices/RuntimeHelpers.cs b/mcs/class/corlib/System.Runtime.CompilerServices/RuntimeHelpers.cs
new file mode 100644
index 00000000000..c87eb39d915
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.CompilerServices/RuntimeHelpers.cs
@@ -0,0 +1,26 @@
+// System.Runtime.CompilerServices.RuntimeHelpers
+//
+// Sean MacIsaac (macisaac@ximian.com)
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) Ximian, Inc. 2001
+
+namespace System.Runtime.CompilerServices
+{
+	[Serializable]
+	public sealed class RuntimeHelpers
+	{
+		private RuntimeHelpers () {}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public static extern void InitializeArray (Array array, RuntimeFieldHandle fldHandle);
+
+		public static int OffsetToStringData {
+			get {
+				// FIXME: this requires the reimplementation of String
+				// as of my mail a few months ago, dum de dum
+				throw new NotImplementedException ();
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/AssemblyRegistrationFlags.cs b/mcs/class/corlib/System.Runtime.InteropServices/AssemblyRegistrationFlags.cs
new file mode 100755
index 00000000000..479122692c7
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/AssemblyRegistrationFlags.cs
@@ -0,0 +1,18 @@
+//

+// System.Runtime.InteropServices.AssemblyRegistrationFlags.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+namespace System.Runtime.InteropServices

+{

+	[Flags]

+	[Serializable]

+	public enum AssemblyRegistrationFlags {

+		None = 0,

+		SetCodeBase,

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/AutomationProxyAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/AutomationProxyAttribute.cs
new file mode 100755
index 00000000000..3dfdc572adb
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/AutomationProxyAttribute.cs
@@ -0,0 +1,28 @@
+//
+// System.Runtime.InteropServices.AutomationProxyAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Interface)]
+	public sealed class AutomationProxyAttribute : Attribute
+	{
+		bool val;
+		
+		public AutomationProxyAttribute (bool val)
+		{
+			this.val = val;
+		}
+
+		public bool Value {
+			get { return val; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/BINDPTR.cs b/mcs/class/corlib/System.Runtime.InteropServices/BINDPTR.cs
new file mode 100755
index 00000000000..7bb93ac6769
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/BINDPTR.cs
@@ -0,0 +1,20 @@
+
+// System.Runtime.InteropServices/BINDPTR.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+
+namespace System.Runtime.InteropServices
+{
+
+	[ComVisible(false)]
+	public struct BINDPTR {
+		public IntPtr lpfuncdesc;
+		public IntPtr lptcomp;
+		public IntPtr lpvardesc;
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/CallingConvention.cs b/mcs/class/corlib/System.Runtime.InteropServices/CallingConvention.cs
new file mode 100644
index 00000000000..7f2c24d2b0c
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/CallingConvention.cs
@@ -0,0 +1,41 @@
+// CallingConvention.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:33:29 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.InteropServices {
+
+
+	/// <summary>
+	/// </summary>
+	public enum CallingConvention {
+
+		/// <summary>
+		/// </summary>
+		Winapi = 1,
+
+		/// <summary>
+		/// </summary>
+		Cdecl = 2,
+
+		/// <summary>
+		/// </summary>
+		StdCall = 3,
+
+		/// <summary>
+		/// </summary>
+		ThisCall = 4,
+
+		/// <summary>
+		/// </summary>
+		FastCall = 5,
+	} // CallingConvention
+
+} // System.Runtime.InteropServices
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
new file mode 100644
index 00000000000..784fa523cc6
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ChangeLog
@@ -0,0 +1,166 @@
+2002-08-22  Nick Drochak  <ndrochak@gol.com>
+
+	* OutAttribute.cs: TypeID isn't overriden from Attribute here.
+	* PInvokeMap.cs: Non-existent enum.  Must be from beta days.
+
+2002-06-24  root  <dietmar@ximian.com>
+
+	* Marshal.cs: impl. Copy()
+
+Fri Jun 14 16:18:50 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* UnmanagedType.cs, Marshal.cs: minor fixes.
+
+Wed Jun 12 16:32:13 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Marshal.c: stubbed out all the methods and filled in some
+	implementation.
+	* BINDPTR.cs, ComMemberType.cs, DESCKIND.cs, DISPPARAMS.cs,
+	EXCEPINFO.cs, INVOKEKIND.cs, TYPEKIND.cs, UCOMTypeInfo.cs,
+	UCOMTypeLib.cs: enums, interfaces and structs needed in Marshal class.
+
+Tue Jun 4 18:05:30 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* GCHandle.cs: changed to fit spec and implementation needs.
+
+Tue May 14 16:35:13 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* CharSet.cs: added missing None enum item.
+
+2002-04-26  Joe Shaw  <joe@ximian.com>
+
+	* Marshal.cs (StructureToPtr): stub this out.
+
+2002-04-23  Joe Shaw  <joe@ximian.com>
+
+	* Marshal.cs: Stub out a few functions to get gtk# to build.
+
+2002-04-22  Duncan Mak  <duncan@ximian.com>
+
+	* ImporterEventKind.cs: 
+	* TypeLibFuncFlags.cs:
+	* TypeLibTypeFlags.cs:
+	* TypeLibVarFlags.cs: Fixed various typos and added missing elements.
+
+	* ComConventionLossAttribute.cs: Removed, there's a typo.
+	* ComConversionLossAttribute.cs: Same attribute, slight change of name.
+
+	* PreserveSigAttribute.cs:
+	* ImportedFromTypeLibAttribute.cs: Added missing AttributeUsage
+	attribute.
+
+	* TypeLibFuncAttribute.cs:
+	* TypeLibTypeAttribute.cs:
+	* TypeLibVarAttribute.cs: Added missing constructors. 
+	
+	
+2002-04-22  Duncan Mak  <duncan@ximian.com>
+
+	* AutomationProxyAttribute.cs: 
+	* CoClassAttribute.cs: 
+	* ComAliasNameAttribute.cs: 
+	* ComConventionLossAttribute.cs: 
+	* ComEventInterfaceAttribute.cs: 
+	* ComImportAttribute.cs: 
+	* ComRegisterFunctionAttribute.cs: 
+	* ComUnregisterFunctionAttribute.cs: 
+	* DispIdAttribute.cs: 
+	* ImportedFromTypeLibAttribute.cs: 
+	* LCIDConversionAttribute.cs: 
+	* PreserveSigAttribute.cs: 
+	* PrimaryInteropAssemblyAttribute.cs: 
+	* ProgIdAttribute.cs: 
+	* TypeLibFuncAttribute.cs: 
+	* TypeLibFuncFlags.cs: 
+	* TypeLibTypeAttribute.cs: 
+	* TypeLibTypeFlags.cs: 
+	* TypeLibVarAttribute.cs: 
+	* TypeLibVarFlags.cs:  Added to CVS.
+
+2002-04-08  Nick Drochak  <ndrochak@gol.com>
+
+	* Marshal.cs: Make class public.
+	* ComVisible.cs: New File.
+
+2002-03-24  Nick Drochak  <ndrochak@gol.com>
+
+	* ClassInterfaceAttribute.cs:
+	* ClassInterfaceType.cs: New Files.
+
+2002-02-27  Duncan Mak  <duncan@ximian.com>
+
+	* ExporterEventKind.cs:
+	* ITypeLibConverter.cs:
+	* ITypeLibImporterNotifySink.cs: Added to CVS for Kevin Winchester <kwin@ns.sympatico.ca>.
+
+2002-02-26  Duncan Mak  <duncan@ximian.com>
+
+	* ComInterfaceType.cs: Added to CVS.
+
+	* AssemblyRegistrationFlags.cs:
+	* GuidAttribute.cs:
+	* ICustomAdapter.cs:
+	* ICustomFactory.cs:
+	* ICustomMarshaler.cs: 
+	* IRegistrationServices.cs:
+	* ITypeLibExporterNameProvider.cs:
+	* ITypeLibImporterNotifySink.cs:
+	* InterfaceTypeAttribute.cs:
+	* TypeLibExporterFlags.cs: Committed for Kevin Winchester <kwin@ns.sympatico.ca>.
+	
+	* GCHandle.cs: Added to CVS. Patch from Ajay kumar Dwivedi.
+
+	* GCHandleType.cs: Committed patch from Ajay.
+
+	* ImporterEventKind.cs: Added to CVS.
+
+2002-01-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* StructLayoutAttribute.cs: Flag attribute as targetting structs
+	or classes. 
+	
+	* InAttribute.cs: Flag attribute as targettting a paramter
+
+	* OutAttribute.cs: ditto.
+	
+	* DllImportAttribute.cs: Flag attribute as targetting methods.
+	
+	* MarshalAsAttribute.cs: Flag attribute as targetting fields,
+	parameters and returnvalues.
+
+2002-01-23  Dick Porter  <dick@ximian.com>
+
+	* Marshal.cs: Added GetLastWin32Error()
+
+	* ExternalException.cs: Implemented
+
+2002-01-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* ExternalException.cs: Add ExternalException.
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* OutAttribute.cs : Decorate with MonoTODO.
+	
+Thu Dec 20 15:46:31 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* FieldOffsetAttribute.cs, InAttribute.cs, MarshalAsAttribute.cs,
+	OptionalAttribute.cs, StructLayoutAttribute.cs, VarEnum.cs:
+	more stuff needed by the compiler.
+
+Thu Dec 13 20:22:18 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* DllImportAttribute.cs: added.
+	* MethodImplOptions.cs: removed: this is already in CompilerServices.
+
+Wed Nov 14 17:02:57 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* CallingConvention.cs: add missing Winapi.
+
+2001-07-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* OutAttribute.cs: New file.
+
+2001-07-18  Michael Lambert <michaellambert@email.com>
+
+	* CallingConvention.cs.cs, CharSet.cs, GCHandleType.cs, LayoutKind.cs: Add.
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/CharSet.cs b/mcs/class/corlib/System.Runtime.InteropServices/CharSet.cs
new file mode 100644
index 00000000000..27ae60765e6
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/CharSet.cs
@@ -0,0 +1,35 @@
+// CharSet.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:33:35 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.InteropServices {
+
+
+	/// <summary>
+	/// </summary>
+	public enum CharSet {
+
+		None = 1,
+
+		/// <summary>
+		/// </summary>
+		Ansi = 2,
+
+		/// <summary>
+		/// </summary>
+		Unicode = 3,
+
+		/// <summary>
+		/// </summary>
+		Auto = 4,
+	} // CharSet
+
+} // System.Runtime.InteropServices
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ClassInterfaceAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/ClassInterfaceAttribute.cs
new file mode 100644
index 00000000000..47aa4ebed92
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ClassInterfaceAttribute.cs
@@ -0,0 +1,30 @@
+//
+// System.Runtime.InteropServices.ClassInterfaceAttribute.cs
+//
+// Author:
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2002 Nick Drochak
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class)]
+	public sealed class ClassInterfaceAttribute : Attribute {
+		private ClassInterfaceType ciType;
+		
+		public ClassInterfaceAttribute ( short classInterfaceType ) {
+			ciType = (ClassInterfaceType)classInterfaceType;
+		}
+
+		public ClassInterfaceAttribute ( ClassInterfaceType classInterfaceType ) {
+			ciType = classInterfaceType;
+		}
+
+		public ClassInterfaceType Value {
+			get {return ciType;}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ClassInterfaceType.cs b/mcs/class/corlib/System.Runtime.InteropServices/ClassInterfaceType.cs
new file mode 100644
index 00000000000..963c2880a1a
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ClassInterfaceType.cs
@@ -0,0 +1,24 @@
+//
+// System.Runtime.InteropServices.ClassInterfaceType.cs
+//
+// Author:
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2002 Nick Drochak
+//
+
+
+namespace System.Runtime.InteropServices {
+
+	[Serializable]
+	public enum ClassInterfaceType 
+	{
+		None = 0,
+  
+		AutoDispatch = 1,
+ 
+		AutoDual = 2
+
+	} // ClassInterfaceType
+
+} // System.Runtime.InteropServices
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/CoClassAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/CoClassAttribute.cs
new file mode 100755
index 00000000000..c947887612d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/CoClassAttribute.cs
@@ -0,0 +1,26 @@
+//
+// System.Runtime.InteropServices.CoClassAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Interface)]
+	public sealed class CoClassAttribute : Attribute
+	{
+
+		Type klass;
+		
+		public CoClassAttribute (Type coClass)
+		{
+			klass = coClass;
+		}
+
+		public Type CoClass {
+			get { return klass; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ComAliasNameAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/ComAliasNameAttribute.cs
new file mode 100755
index 00000000000..60119849175
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ComAliasNameAttribute.cs
@@ -0,0 +1,27 @@
+//
+// System.Runtime.InteropServices.ComAliasNameAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+	[AttributeUsage (AttributeTargets.Property | AttributeTargets.Field |
+			 AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
+	public sealed class ComAliasNameAttribute : Attribute
+	{
+		string val;
+		
+		public ComAliasNameAttribute (string alias)
+		{
+			val = alias;
+		}
+
+		public string Value {
+			get { return val; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ComConversionLossAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/ComConversionLossAttribute.cs
new file mode 100755
index 00000000000..2260d5ae488
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ComConversionLossAttribute.cs
@@ -0,0 +1,21 @@
+//
+// System.Runtime.InteropServices.ComConversionLossAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.All)]
+	public sealed class ComConversionLossAttribute : Attribute
+	{
+		public ComConversionLossAttribute ()
+		{
+		}
+	}
+	
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ComEventInterfaceAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/ComEventInterfaceAttribute.cs
new file mode 100755
index 00000000000..f03e371c898
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ComEventInterfaceAttribute.cs
@@ -0,0 +1,34 @@
+//
+// System.Runtime.InteropServices.ComEventInterfaceAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Interface)]
+	public sealed class ComEventInterfaceAttribute : Attribute
+	{
+		Type si, ep;
+		
+		public ComEventInterfaceAttribute (Type SourceInterface,
+						   Type EventProvider)
+		{
+			si = SourceInterface;
+			ep = EventProvider;
+		}
+
+		public Type EventProvider {
+			get { return ep; }
+		}
+
+		public Type SourceInterface {
+			get { return si; }
+		}
+	}
+}
+		
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ComImportAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/ComImportAttribute.cs
new file mode 100755
index 00000000000..325c5091f7b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ComImportAttribute.cs
@@ -0,0 +1,21 @@
+//
+// System.Runtime.InteropServices.ComImportAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Class |
+			 AttributeTargets.Interface)]
+	public sealed class ComImportAttribute : Attribute
+	{
+		public ComImportAttribute ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ComInterfaceType.cs b/mcs/class/corlib/System.Runtime.InteropServices/ComInterfaceType.cs
new file mode 100755
index 00000000000..8d7c7a6b669
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ComInterfaceType.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.InteropServices.ComInterfaceType.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Runtime.InteropServices
+{
+	[Serializable] public enum ComInterfaceType
+	{
+		InterfaceIsDual = 0,
+		InterfaceIsIUnknown = 1,
+		InterfaceIsIDispatch = 2,		
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ComMemberType.cs b/mcs/class/corlib/System.Runtime.InteropServices/ComMemberType.cs
new file mode 100755
index 00000000000..8e66ff211d1
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ComMemberType.cs
@@ -0,0 +1,19 @@
+
+// System.Runtime.InteropServices/ComMemberType.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+
+namespace System.Runtime.InteropServices
+{
+	[Serializable]
+	public enum ComMemberType {
+		Method  = 0,
+		PropGet = 1,
+		PropSet = 2
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ComRegisterFunctionAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/ComRegisterFunctionAttribute.cs
new file mode 100755
index 00000000000..27a27076213
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ComRegisterFunctionAttribute.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.InteropServices.ComRegisterFunctionAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class ComRegisterFunctionAttribute : Attribute
+	{
+		public ComRegisterFunctionAttribute ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ComUnregisterFunctionAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/ComUnregisterFunctionAttribute.cs
new file mode 100755
index 00000000000..6d2fc1ed2e1
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ComUnregisterFunctionAttribute.cs
@@ -0,0 +1,20 @@
+//
+// System.Runtime.InteropServices.ComUnregisterFunctionAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class ComUnregisterFunctionAttribute : Attribute
+	{
+		public ComUnregisterFunctionAttribute ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ComVisible.cs b/mcs/class/corlib/System.Runtime.InteropServices/ComVisible.cs
new file mode 100644
index 00000000000..ad22b254c23
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ComVisible.cs
@@ -0,0 +1,25 @@
+//
+// System.Runtime.InteropServices.ComVisible.cs
+//
+// Author:
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2002 Nick Drochak
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class
+		| AttributeTargets.Struct | AttributeTargets.Enum |
+		AttributeTargets.Method | AttributeTargets.Property |
+		AttributeTargets.Field | AttributeTargets.Interface |
+		AttributeTargets.Delegate)]
+	public sealed class ComVisibleAttribute : Attribute 
+	{
+		private bool Visible = false;
+		public ComVisibleAttribute(bool value) {Visible = value;}
+		public bool Value { get {return Visible;} }
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/DESCKIND.cs b/mcs/class/corlib/System.Runtime.InteropServices/DESCKIND.cs
new file mode 100755
index 00000000000..b312119c6f1
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/DESCKIND.cs
@@ -0,0 +1,24 @@
+
+// System.Runtime.InteropServices/DESCKIND.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+
+namespace System.Runtime.InteropServices
+{
+
+	[Serializable]
+	[ComVisible(false)]
+	public enum DESCKIND {
+		DESCKIND_NONE = 0,
+		DESCKIND_FUNCDESC = 1,
+		DESCKIND_VARDESC = 2,
+		DESCKIND_TYPECOMP = 3,
+		DESCKIND_IMPLICITAPPOBJ = 4,
+		DESCKIND_MAX = 5
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/DISPPARAMS.cs b/mcs/class/corlib/System.Runtime.InteropServices/DISPPARAMS.cs
new file mode 100755
index 00000000000..c84dde79aa8
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/DISPPARAMS.cs
@@ -0,0 +1,21 @@
+
+// System.Runtime.InteropServices/DISPPARAMS.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+
+namespace System.Runtime.InteropServices
+{
+
+	[ComVisible(false)]
+	public struct DISPPARAMS {
+		public int cArgs;
+		public int cNamedArgs;
+		public IntPtr rgdispidNamedArgs;
+		public IntPtr rgvarg;
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/DispIdAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/DispIdAttribute.cs
new file mode 100755
index 00000000000..139c331bb53
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/DispIdAttribute.cs
@@ -0,0 +1,25 @@
+//
+// System.Runtime.InteropServices.DispIdAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Method | AttributeTargets.Property |
+			 AttributeTargets.Field | AttributeTargets.Event)]
+	public sealed class DispIdAttribute : Attribute
+	{
+		int id;
+		
+		public DispIdAttribute (int dispId)
+		{
+			id = dispId;
+		}
+
+		public int Value {
+			get { return id; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/DllImportAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/DllImportAttribute.cs
new file mode 100755
index 00000000000..9d6466527ea
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/DllImportAttribute.cs
@@ -0,0 +1,33 @@
+//
+// System.Runtime.InteropServices/DllImportAttribute.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class DllImportAttribute: Attribute {
+		public CallingConvention CallingConvention;
+		public CharSet CharSet;
+		public string EntryPoint;
+		public bool ExactSpelling;
+		public bool PreserveSig;
+		public bool SetLastError;
+		private string Dll;
+		
+		public string Value {
+			get {return Dll;}
+		}
+		
+		public DllImportAttribute (string dllName) {
+			Dll = dllName;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs b/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs
new file mode 100755
index 00000000000..1c29b3223a6
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/EXCEPINFO.cs
@@ -0,0 +1,25 @@
+
+// System.Runtime.InteropServices/EXCEPINFO.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+
+namespace System.Runtime.InteropServices
+{
+
+	[ComVisible(false)]
+	public struct EXCEPINFO {
+		public string bstrDescription;
+		public string bstrHelpFile;
+		public string bstrSource;
+		public int dwHelpContext;
+		public IntPtr pfnDeferredFillIn;
+		public IntPtr pvReserved;
+		public short wCode;
+		public short wReserved;
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ExporterEventKind.cs b/mcs/class/corlib/System.Runtime.InteropServices/ExporterEventKind.cs
new file mode 100644
index 00000000000..d80e2ed847d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ExporterEventKind.cs
@@ -0,0 +1,18 @@
+//

+// System.Runtime.InteropServices.ExporterEventKind.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+namespace System.Runtime.InteropServices

+{

+	[Serializable] public enum ExporterEventKind

+	{

+		NOTIF_TYPECONVERTED = 0,

+		NOTIF_CONVERTWARNING = 1,

+		ERROR_REFTOINVALIDASSEMBLY = 2,	      

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs b/mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs
new file mode 100755
index 00000000000..014074cef21
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ExternalException.cs
@@ -0,0 +1,50 @@
+//
+// System.Runtime.InteropServices.ExternalException.cs
+//
+// Author:
+//   Miguel De Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+using System.Globalization;
+
+namespace System.Runtime.InteropServices {
+	[Serializable]
+	public class ExternalException : SystemException {
+		private int error_code;
+		
+		// Constructors
+		public ExternalException ()
+			: base (Locale.GetText ("External exception"))
+		{
+		}
+
+		public ExternalException (string message)
+			: base (message)
+		{
+		}
+
+		protected ExternalException(SerializationInfo info, StreamingContext context)
+			: base (info, context) {
+		}
+		
+		public ExternalException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		public ExternalException (string message, int errorCode)
+			: base (message)
+		{
+			error_code = errorCode;
+		}
+
+		public virtual int ErrorCode {
+			get {
+				return error_code;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/FieldOffsetAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/FieldOffsetAttribute.cs
new file mode 100755
index 00000000000..a5deebb0675
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/FieldOffsetAttribute.cs
@@ -0,0 +1,17 @@
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Field)]
+	public sealed class FieldOffsetAttribute : Attribute {
+		private int val;
+		
+		public FieldOffsetAttribute( int offset) {
+			val = offset;
+		}
+		public int Value {
+			get {return val;}
+		}
+		
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/GCHandle.cs b/mcs/class/corlib/System.Runtime.InteropServices/GCHandle.cs
new file mode 100755
index 00000000000..cd277c63a53
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/GCHandle.cs
@@ -0,0 +1,108 @@
+//
+// System.Runtime.InteropServices/GCHandle.cs
+//
+// Authors:
+//   Ajay kumar Dwivedi (adwiv@yahoo.com) ??
+//   Paolo Molaro (lupus@ximian.com)
+//
+
+using System;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+
+namespace System.Runtime.InteropServices
+{
+	/// <summary>
+	/// Summary description for GCHandle.
+	/// </summary>
+	public struct GCHandle 
+	{
+		// fields
+		private int handle;
+
+		private GCHandle(IntPtr h)
+		{
+			handle = (int)h;
+		}
+		
+		// Constructors
+		private GCHandle(object obj)
+			: this(obj, GCHandleType.Normal)
+		{}
+
+		private GCHandle(object value, GCHandleType type)
+		{
+			handle = GetTargetHandle (value, 0, type);
+		}
+
+		// Properties
+
+		public bool IsAllocated 
+		{ 
+			get
+			{
+				return (handle != 0);
+			}
+		}
+
+		public object Target
+		{ 
+			get
+			{
+				return GetTarget (handle);
+			} 
+			set
+			{
+				handle = GetTargetHandle (value, handle, (GCHandleType)(-1));
+			} 
+		}
+
+		// Methods
+		public IntPtr AddrOfPinnedObject()
+		{
+			IntPtr res = GetAddrOfPinnedObject(handle);
+			if (res == IntPtr.Zero)
+				throw new InvalidOperationException("The handle is not of Pinned type");
+			return res;
+		}
+
+		public static System.Runtime.InteropServices.GCHandle Alloc(object value)
+		{
+			return new GCHandle (value);
+		}
+
+		public static System.Runtime.InteropServices.GCHandle Alloc(object value, GCHandleType type)
+		{
+			return new GCHandle (value,type);
+		}
+
+		public void Free()
+		{
+			FreeHandle(handle);
+			handle = 0;
+		}
+		
+		public static explicit operator IntPtr (GCHandle value)
+		{
+			return (IntPtr) value.handle;
+		}
+		
+		public static explicit operator GCHandle(IntPtr value)
+		{
+			return new GCHandle (value);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static object GetTarget(int handle);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static int GetTargetHandle(object obj, int handle, GCHandleType type);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void FreeHandle(int handle);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static IntPtr GetAddrOfPinnedObject(int handle);
+	} 
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/GCHandleType.cs b/mcs/class/corlib/System.Runtime.InteropServices/GCHandleType.cs
new file mode 100644
index 00000000000..bee7c8b8436
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/GCHandleType.cs
@@ -0,0 +1,38 @@
+// GCHandleType.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:33:42 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.InteropServices {
+
+
+	/// <summary>
+	/// </summary>
+	public enum GCHandleType {
+
+		
+		/// <summary>
+		/// </summary>
+		Weak = 0,
+  
+		/// <summary>
+		/// </summary>
+		WeakTrackResurrection = 1,
+ 
+		/// <summary>
+		/// </summary>
+		Normal = 2,
+
+		/// <summary>
+		/// </summary>
+		Pinned = 3,
+	} // GCHandleType
+
+} // System.Runtime.InteropServices
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/GuidAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/GuidAttribute.cs
new file mode 100755
index 00000000000..1fd1a44f85e
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/GuidAttribute.cs
@@ -0,0 +1,25 @@
+//

+// System.Runtime.InteropServices.InAttribute.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+namespace System.Runtime.InteropServices {

+

+	[AttributeUsage(AttributeTargets.Assembly | AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Interface | AttributeTargets.Delegate)]

+	public sealed class GuidAttribute : Attribute {

+		

+		private string guidValue;

+		

+		public GuidAttribute (string guid) {

+			guidValue = guid;	

+		}

+		

+		public string Value {

+			get {return guidValue;}

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ICustomAdapter.cs b/mcs/class/corlib/System.Runtime.InteropServices/ICustomAdapter.cs
new file mode 100755
index 00000000000..edde7b22cc0
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ICustomAdapter.cs
@@ -0,0 +1,15 @@
+//

+// System.Runtime.InteropServices.ICustomAdapter.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+namespace System.Runtime.InteropServices {

+

+	public interface ICustomAdapter {

+		object GetUnderlyingObject ();

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ICustomFactory.cs b/mcs/class/corlib/System.Runtime.InteropServices/ICustomFactory.cs
new file mode 100755
index 00000000000..c5f1cb23eea
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ICustomFactory.cs
@@ -0,0 +1,15 @@
+//

+// System.Runtime.InteropServices.ICustomFactory.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+namespace System.Runtime.InteropServices {

+

+	public interface ICustomFactory {

+		MarshalByRefObject CreateInstance (Type serverType);

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ICustomMarshaler.cs b/mcs/class/corlib/System.Runtime.InteropServices/ICustomMarshaler.cs
new file mode 100755
index 00000000000..90a2b29b619
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ICustomMarshaler.cs
@@ -0,0 +1,19 @@
+//

+// System.Runtime.InteropServices.ICustomMarshaler.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+namespace System.Runtime.InteropServices {

+

+	public interface ICustomMarshaler {

+		void CleanUpManagedData (object ManagedObj);

+		void CleanUpNativeData (IntPtr pNativeData);

+		int GetNativeDataSize ();

+		IntPtr MarshalManagedToNative (object ManagedObj);

+		object MarshalNativeToManaged (IntPtr pNativeData);

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/INVOKEKIND.cs b/mcs/class/corlib/System.Runtime.InteropServices/INVOKEKIND.cs
new file mode 100755
index 00000000000..4c318507e5f
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/INVOKEKIND.cs
@@ -0,0 +1,22 @@
+
+// System.Runtime.InteropServices/INVOKEKIND.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+
+namespace System.Runtime.InteropServices
+{
+
+	[Serializable]
+	[ComVisible(false)]
+	public enum INVOKEKIND {
+		INVOKE_FUNC = 1,
+		INVOKE_PROPERTYGET = 2,
+		INVOKE_PROPERTYPUT = 4,
+		INVOKE_PROPERTYPUTREF = 8
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/IRegistrationServices.cs b/mcs/class/corlib/System.Runtime.InteropServices/IRegistrationServices.cs
new file mode 100755
index 00000000000..a42e935895c
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/IRegistrationServices.cs
@@ -0,0 +1,25 @@
+//

+// System.Runtime.InteropServices.IRegistrationServices.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+using System.Reflection;

+

+namespace System.Runtime.InteropServices {

+

+	//[Guid("")]

+	public interface IRegistrationServices {

+		Guid GetManagedCategoryGuid ();

+		string GetProgIdForType (Type type);

+		Type[] GetRegistrableTypesInAssembly (Assembly assembly);

+		bool RegisterAssembly (Assembly assembly, AssemblyRegistrationFlags flags);

+		void RegisterTypeForComClients (Type type, ref Guid g);

+		bool TypeRepresentsComType (Type type);

+		bool TypeRequiresRegistration (Type type);

+		bool UnregisterAssembly (Assembly assembly);

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibConverter.cs b/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibConverter.cs
new file mode 100644
index 00000000000..78be2912f6b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibConverter.cs
@@ -0,0 +1,22 @@
+//

+// System.Runtime.InteropServices.ITypeLibConverter.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+using System.Reflection;

+using System.Reflection.Emit;

+

+namespace System.Runtime.InteropServices {

+

+	//[Guid("")]

+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]

+	public interface ITypeLibConverter {

+		object ConvertAssemblyToTypeLib (Assembly assembly, string typeLibName, TypeLibExporterFlags flags, ITypeLibExporterNotifySink notifySink);

+		AssemblyBuilder ConvertTypeLibToAssembly (object typeLib, string asmFileName, int flags, ITypeLibImporterNotifySink notifySink, byte[] publicKey, StrongNameKeyPair keyPair, bool unsafeInterfaces);

+		bool GetPrimaryInteropAssembly (Guid g, int major, int minor, int lcid, out string asmName, out string asmCodeBase);

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibExporterNameProvider.cs b/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibExporterNameProvider.cs
new file mode 100755
index 00000000000..3e937ae4b22
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibExporterNameProvider.cs
@@ -0,0 +1,18 @@
+//

+// System.Runtime.InteropServices.ITypeLibExporterNameProvider.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+namespace System.Runtime.InteropServices {

+

+	//[Guid("")]

+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]

+	public interface ITypeLibExporterNameProvider {

+		string[] GetNames ();

+

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibExporterNotifySink.cs b/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibExporterNotifySink.cs
new file mode 100644
index 00000000000..547b87d73d3
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibExporterNotifySink.cs
@@ -0,0 +1,20 @@
+//

+// System.Runtime.InteropServices.ITypeLibExporterNotifySink.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+using System.Reflection;

+

+namespace System.Runtime.InteropServices {

+

+	//[Guid("")]

+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]

+	public interface ITypeLibExporterNotifySink {

+		void ReportEvent (ExporterEventKind eventKind, int eventCode, string eventMsg);

+		object ResolveRef (Assembly assembly);

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibImporterNotifySink.cs b/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibImporterNotifySink.cs
new file mode 100755
index 00000000000..3c9199e4063
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ITypeLibImporterNotifySink.cs
@@ -0,0 +1,20 @@
+//

+// System.Runtime.InteropServices.ITypeLibImporterNotifySink.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+using System.Reflection;

+

+namespace System.Runtime.InteropServices {

+

+	//[Guid("")]

+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]

+	public interface ITypeLibImporterNotifySink {

+		void ReportEvent(ImporterEventKind eventKind, int eventCode, string eventMsg);

+		Assembly ResolveRef(object typeLib);

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ImportedFromTypeLibAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/ImportedFromTypeLibAttribute.cs
new file mode 100755
index 00000000000..f4403eb8c27
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ImportedFromTypeLibAttribute.cs
@@ -0,0 +1,26 @@
+//
+// System.Runtime.InteropServices.ImportedFromTypeLibAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+	
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class ImportedFromTypeLibAttribute : Attribute
+	{
+		string TlbFile;
+		public ImportedFromTypeLibAttribute (string tlbFile)
+		{
+			TlbFile = tlbFile;
+		}
+
+		public string Value {
+			get { return TlbFile; }
+		}
+	} 
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ImporterEventKind.cs b/mcs/class/corlib/System.Runtime.InteropServices/ImporterEventKind.cs
new file mode 100755
index 00000000000..c896b7e053f
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ImporterEventKind.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.InteropServices.ImporterEventKind.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Runtime.InteropServices
+{
+	[Serializable] public enum ImporterEventKind
+	{
+		NOTIF_TYPECONVERTED = 0,
+		NOTIF_CONVERTWARNING = 1,
+		ERROR_REFTOINVALIDTYPELIB = 2,	      
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/InAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/InAttribute.cs
new file mode 100755
index 00000000000..b141d9dbc49
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/InAttribute.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.InteropServices.InAttribute.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Parameter)]
+	public sealed class InAttribute : Attribute {
+		public InAttribute () {
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/InterfaceTypeAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/InterfaceTypeAttribute.cs
new file mode 100755
index 00000000000..e8cbd5ae9b7
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/InterfaceTypeAttribute.cs
@@ -0,0 +1,29 @@
+//

+// System.Runtime.InteropServices.InterfaceTypeAttribute.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+namespace System.Runtime.InteropServices {

+

+	[AttributeUsage(AttributeTargets.Interface)]

+	public sealed class InterfaceTypeAttribute : Attribute {

+		

+		private ComInterfaceType intType;

+		

+		public InterfaceTypeAttribute (ComInterfaceType interfaceType){

+			intType = interfaceType;

+		}

+

+		public InterfaceTypeAttribute (short interfaceType) {

+			intType = (ComInterfaceType)interfaceType;

+		}

+		

+		public ComInterfaceType Value {

+			get {return intType;}

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/LCIDConversionAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/LCIDConversionAttribute.cs
new file mode 100755
index 00000000000..af04cccc1e4
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/LCIDConversionAttribute.cs
@@ -0,0 +1,27 @@
+//
+// System.Runtime.InteropServices.LCIDConversionAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class LCIDConversionAttribute : Attribute
+	{
+		int id;
+		
+		public LCIDConversionAttribute (int lcid)
+		{
+			id = lcid;
+		}
+
+		public int Value {
+			get { return id; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/LayoutKind.cs b/mcs/class/corlib/System.Runtime.InteropServices/LayoutKind.cs
new file mode 100644
index 00000000000..960cc3d551e
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/LayoutKind.cs
@@ -0,0 +1,33 @@
+// LayoutKind.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:33:48 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.InteropServices {
+
+
+	/// <summary>
+	/// </summary>
+	public enum LayoutKind {
+
+		/// <summary>
+		/// </summary>
+		Sequential = 0,
+
+		/// <summary>
+		/// </summary>
+		Explicit = 2,
+
+		/// <summary>
+		/// </summary>
+		Auto = 3,
+	} // LayoutKind
+
+} // System.Runtime.InteropServices
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
new file mode 100644
index 00000000000..57f67135308
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/Marshal.cs
@@ -0,0 +1,556 @@
+// System.Runtime.InteropServices.Marshal
+//
+// Sean MacIsaac (macisaac@ximian.com)
+// Paolo Molaro (lupus@ximian.com)
+// Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) 2001-2002 Ximian, Inc.
+
+using System.Runtime.CompilerServices;
+using System;
+using System.Reflection;
+using System.Threading;
+
+namespace System.Runtime.InteropServices
+{
+	public sealed class Marshal
+	{
+		/* fields */
+		public static readonly int SystemMaxDBCSCharSize = 2; // don't know what this is
+		public static readonly int SystemDefaultCharSize = 2;
+		
+		private Marshal () {}
+
+		[MonoTODO]
+		public static int AddRef (IntPtr pUnk) {
+			throw new NotImplementedException ();
+		}
+		[MonoTODO]
+		public static IntPtr AllocCoTaskMem (int cb) {
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static IntPtr AllocHGlobal (IntPtr cb);
+
+		public static IntPtr AllocHGlobal (int cb) {
+			return AllocHGlobal ((IntPtr)cb);
+		}
+
+		[MonoTODO]
+		public static object BindToMoniker (string monikerName) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static void ChangeWrapperHandleStrength (object otp, bool fIsWeak) {
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		extern static void copy_to_unmanaged (Array source, int startIndex,
+						      IntPtr destination, int length);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		extern static void copy_from_unmanaged (IntPtr source, int startIndex,
+							Array destination, int length);
+
+		public static void Copy (byte[] source, int startIndex, IntPtr destination, int length) {
+			copy_to_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (char[] source, int startIndex, IntPtr destination, int length) {
+			copy_to_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (short[] source, int startIndex, IntPtr destination, int length) {
+			copy_to_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (int[] source, int startIndex, IntPtr destination, int length) {
+			copy_to_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (long[] source, int startIndex, IntPtr destination, int length) {
+			copy_to_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (float[] source, int startIndex, IntPtr destination, int length) {
+			copy_to_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (double[] source, int startIndex, IntPtr destination, int length) {
+			copy_to_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (IntPtr source, byte[] destination, int startIndex, int length) {
+			copy_from_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (IntPtr source, char[] destination, int startIndex, int length) {
+			copy_from_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (IntPtr source, short[] destination, int startIndex, int length) {
+			copy_from_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (IntPtr source, int[] destination, int startIndex, int length) {
+			copy_from_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (IntPtr source, long[] destination, int startIndex, int length) {
+			copy_from_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (IntPtr source, float[] destination, int startIndex, int length) {
+			copy_from_unmanaged (source, startIndex, destination, length);
+		}
+
+		public static void Copy (IntPtr source, double[] destination, int startIndex, int length) {
+			copy_from_unmanaged (source, startIndex, destination, length);
+		}
+
+		[MonoTODO]
+		public static object CreateWrapperOfType (object o, Type t) {
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static void DestroyStructure (IntPtr ptr, Type structuretype);
+
+		[MonoTODO]
+		public static void FreeBSTR (IntPtr ptr) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static void FreeCoTaskMem (IntPtr ptr) {
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static void FreeHGlobal (IntPtr hglobal);
+
+		[MonoTODO]
+		public static Guid GenerateGuidForType (Type type) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static string GenerateProgIdForType (Type type) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static object GetActiveObject (string progID) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr GetComInterfaceForObject (object o, Type T) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static object GetComObjectData (object obj, object key) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static int GetComSlotForMethodInfo (MemberInfo m) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static int GetEndComSlot (Type t) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static int GetExceptionCode() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr GetExceptionPointers() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr GetHINSTANCE (Module m) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static int GetHRForException (Exception e) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static int GetHRForLastWin32Error() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr GetIDispatchForObject (object o) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr GetITypeInfoForType (Type t) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr GetIUnknownForObject (object o) {
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public static extern int GetLastWin32Error();
+
+		[MonoTODO]
+		public static IntPtr GetManagedThunkForUnmanagedMethodPtr (IntPtr pfnMethodToWrap, IntPtr pbSignature, int cbSignature) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static MemberInfo GetMethodInfoForComSlot (Type t, int slot, ref ComMemberType memberType) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static void GetNativeVariantForObject (object obj, IntPtr pDstNativeVariant) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static object GetObjectForIUnknown (IntPtr pUnk) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static object GetObjectForNativeVariant (IntPtr pSrcNativeVariant) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static object[] GetObjectsForNativeVariants (IntPtr aSrcNativeVariant, int cVars) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static int GetStartComSlot (Type t) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static Thread GetThreadFromFiberCookie (int cookie) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static object GetTypedObjectForIUnknown (IntPtr pUnk, Type t) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static Type GetTypeForITypeInfo (IntPtr piTypeInfo) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static string GetTypeInfoName (UCOMITypeInfo pTI) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static Guid GetTypeLibGuid (UCOMITypeLib pTLB) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static Guid GetTypeLibGuidForAssembly (Assembly asm) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static int GetTypeLibLcid (UCOMITypeLib pTLB) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static string GetTypeLibName (UCOMITypeLib pTLB) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr GetUnmanagedThunkForManagedMethodPtr (IntPtr pfnMethodToWrap, IntPtr pbSignature, int cbSignature) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static bool IsComObject (object o) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static bool IsTypeVisibleFromCom (Type t) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static int NumParamBytes (MethodInfo m) {
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static IntPtr OffsetOf (Type t, string fieldName);
+
+		[MonoTODO]
+		public static void Prelink (MethodInfo m) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static void PrelinkAll (Type c) {
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static string PtrToStringAnsi (IntPtr ptr);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static string PtrToStringAnsi (IntPtr ptr, int len);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static string PtrToStringAuto (IntPtr ptr);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static string PtrToStringAuto (IntPtr ptr, int len);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static string PtrToStringUni (IntPtr ptr);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static string PtrToStringUni (IntPtr ptr, int len);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static string PtrToStringBSTR (IntPtr ptr);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static void PtrToStructure (IntPtr ptr, object structure);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static object PtrToStructure (IntPtr ptr, Type structureType);
+
+		[MonoTODO]
+		public static int QueryInterface (IntPtr pUnk, ref Guid iid, out IntPtr ppv) {
+			throw new NotImplementedException ();
+		}
+
+		public static byte ReadByte (IntPtr ptr) {
+			return ReadByte (ptr, 0);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static byte ReadByte (IntPtr ptr, int ofs);
+
+		[MonoTODO]
+		public static byte ReadByte (object ptr, int ofs) {
+			throw new NotImplementedException ();
+		}
+
+		public static short ReadInt16 (IntPtr ptr) {
+			return ReadInt16 (ptr, 0);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static short ReadInt16 (IntPtr ptr, int ofs);
+
+		[MonoTODO]
+		public static short ReadInt16 (object ptr, int ofs) {
+			throw new NotImplementedException ();
+		}
+
+		public static int ReadInt32 (IntPtr ptr) {
+			return ReadInt32 (ptr, 0);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static int ReadInt32 (IntPtr ptr, int ofs);
+
+		[MonoTODO]
+		public static int ReadInt32 (object ptr, int ofs) {
+			throw new NotImplementedException ();
+		}
+
+		public static long ReadInt64 (IntPtr ptr) {
+			return ReadInt64 (ptr, 0);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static long ReadInt64 (IntPtr ptr, int ofs);
+
+		[MonoTODO]
+		public static long ReadInt64(object ptr, int ofs) {
+			throw new NotImplementedException ();
+		}
+
+		public static IntPtr ReadIntPtr (IntPtr ptr) {
+			return ReadIntPtr (ptr, 0);
+		}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static IntPtr ReadIntPtr (IntPtr ptr, int ofs);
+
+		[MonoTODO]
+		public static IntPtr ReadIntPtr(object ptr, int ofs) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr ReAllocCoTaskMem (IntPtr pv, int cb) {
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static IntPtr ReAllocHGlobal (IntPtr pv, IntPtr cb);
+
+		[MonoTODO]
+		public static int Release (IntPtr pUnk) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static int ReleaseComObject (object o) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static void ReleaseThreadCache() {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static bool SetComObjectData (object obj, object key, object data) {
+			throw new NotImplementedException ();
+		}
+
+		public static int SizeOf (object structure) {
+			return SizeOf (structure.GetType ());
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static int SizeOf (Type t);
+
+		[MonoTODO]
+		public static IntPtr StringToBSTR (string s) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr StringToCoTaskMemAnsi (string s) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr StringToCoTaskMemAuto (string s) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr StringToCoTaskMemUni (string s) {
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static IntPtr StringToHGlobalAnsi (string s);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static IntPtr StringToHGlobalAuto (string s);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static IntPtr StringToHGlobalUni (string s);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static void StructureToPtr (object structure, IntPtr ptr, bool fDeleteOld);
+
+		[MonoTODO]
+		public static void ThrowExceptionForHR (int errorCode) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static void ThrowExceptionForHR (int errorCode, IntPtr errorInfo) {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IntPtr UnsafeAddrOfPinnedArrayElement (Array arr, int index) {
+			throw new NotImplementedException ();
+		}
+
+		public static void WriteByte (IntPtr ptr, byte val) {
+			WriteByte (ptr, 0, val);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static void WriteByte (IntPtr ptr, int ofs, byte val);
+
+		[MonoTODO]
+		public static void WriteByte(object ptr, int ofs, byte val) {
+			throw new NotImplementedException ();
+		}
+
+		public static void WriteInt16 (IntPtr ptr, short val) {
+			WriteInt16 (ptr, 0, val);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static void WriteInt16 (IntPtr ptr, int ofs, short val);
+
+		[MonoTODO]
+		public static void WriteInt16(object ptr, int ofs, short val) {
+			throw new NotImplementedException ();
+		}
+
+		public static void WriteInt32 (IntPtr ptr, int val) {
+			WriteInt32 (ptr, 0, val);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static void WriteInt32 (IntPtr ptr, int ofs, int val);
+
+		[MonoTODO]
+		public static void WriteInt32(object ptr, int ofs, int val) {
+			throw new NotImplementedException ();
+		}
+
+		public static void WriteInt64 (IntPtr ptr, long val) {
+			WriteInt64 (ptr, 0, val);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static void WriteInt64 (IntPtr ptr, int ofs, long val);
+
+		[MonoTODO]
+		public static void WriteInt64(object ptr, int ofs, long val) {
+			throw new NotImplementedException ();
+		}
+
+		public static void WriteIntPtr (IntPtr ptr, IntPtr val) {
+			WriteIntPtr (ptr, 0, val);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static void WriteIntPtr (IntPtr ptr, int ofs, IntPtr val);
+
+		[MonoTODO]
+		public static void WriteIntPtr(object ptr, int ofs, IntPtr val) {
+			throw new NotImplementedException ();
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/MarshalAsAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/MarshalAsAttribute.cs
new file mode 100755
index 00000000000..48e9f523d07
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/MarshalAsAttribute.cs
@@ -0,0 +1,27 @@
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Field | AttributeTargets.Parameter | AttributeTargets.ReturnValue)]
+	public sealed class MarshalAsAttribute : Attribute {
+		private UnmanagedType utype;
+		public UnmanagedType ArraySubType;
+		public string MarshalCookie;
+		public string MarshalType;
+		public Type MarshalTypeRef;
+		public VarEnum SafeArraySubType;
+		public int SizeConst;
+		public short SizeParamIndex;
+
+		public MarshalAsAttribute (short unmanagedType) {
+			utype = (UnmanagedType)unmanagedType;
+		}
+		public MarshalAsAttribute( UnmanagedType unmanagedType) {
+			utype = unmanagedType;
+		}
+		public UnmanagedType Value {
+			get {return utype;}
+		}
+		
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/OptionalAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/OptionalAttribute.cs
new file mode 100755
index 00000000000..d53f5291fa0
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/OptionalAttribute.cs
@@ -0,0 +1,10 @@
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Parameter)]
+	public sealed class OptionalAttribute : Attribute {
+		public OptionalAttribute () {
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/OutAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/OutAttribute.cs
new file mode 100644
index 00000000000..98b843497ac
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/OutAttribute.cs
@@ -0,0 +1,19 @@
+//
+// System.Runtime.InteropServices.OutAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Parameter)]
+	public sealed class OutAttribute : Attribute {
+
+		public OutAttribute ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/PreserveSigAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/PreserveSigAttribute.cs
new file mode 100755
index 00000000000..691cef7c7df
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/PreserveSigAttribute.cs
@@ -0,0 +1,19 @@
+// System.Runtime.InteropServices.PreserveSigAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class PreserveSigAttribute : Attribute
+	{
+		public PreserveSigAttribute ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/PrimaryInteropAssemblyAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/PrimaryInteropAssemblyAttribute.cs
new file mode 100755
index 00000000000..b39858e6cde
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/PrimaryInteropAssemblyAttribute.cs
@@ -0,0 +1,32 @@
+//
+// System.Runtime.InteropServices.PrimaryInteropAssemblyAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Assembly)]
+	public sealed class PrimaryInteropAssemblyAttribute : Attribute
+	{
+		int major, minor;
+		
+		public PrimaryInteropAssemblyAttribute (int major, int minor)
+		{
+			this.major = major;
+			this.minor = minor;
+		}
+
+		public int MajorVersion {
+			get { return major; }
+		}
+
+		public int MinorVersion {
+			get { return minor; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/ProgIdAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/ProgIdAttribute.cs
new file mode 100755
index 00000000000..7db764fef0c
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/ProgIdAttribute.cs
@@ -0,0 +1,28 @@
+//
+// System.Runtime.InteropServices.ProgIdAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Class)]
+	public sealed class ProgIdAttribute : Attribute
+	{
+		string pid;
+		
+		public ProgIdAttribute (string progId)
+		{
+			pid = progId;
+		}
+
+		public string Value {
+			get { return pid; }
+		}
+	}
+
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/StructLayoutAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/StructLayoutAttribute.cs
new file mode 100755
index 00000000000..420e70efa0c
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/StructLayoutAttribute.cs
@@ -0,0 +1,23 @@
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct)]
+	public sealed class StructLayoutAttribute : Attribute {
+		public CharSet CharSet = CharSet.Auto;
+		public int Pack = 8;
+		public int Size = 0;
+		private LayoutKind lkind;
+		
+		public StructLayoutAttribute( short layoutKind) {
+			lkind = (LayoutKind)layoutKind;
+		}
+		public StructLayoutAttribute( LayoutKind layoutKind) {
+			lkind = layoutKind;
+		}
+		public LayoutKind Value {
+			get {return lkind;}
+		}
+		
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TYPEKIND.cs b/mcs/class/corlib/System.Runtime.InteropServices/TYPEKIND.cs
new file mode 100755
index 00000000000..58c91af6788
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/TYPEKIND.cs
@@ -0,0 +1,27 @@
+
+// System.Runtime.InteropServices/TYPEKIND.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+
+namespace System.Runtime.InteropServices
+{
+
+	[Serializable]
+	[ComVisible(false)]
+	public enum TYPEKIND { 
+		TKIND_ENUM = 0,
+		TKIND_RECORD = 1,
+		TKIND_MODULE = 2,
+		TKIND_INTERFACE = 3,
+		TKIND_DISPATCH = 4,
+		TKIND_COCLASS = 5,
+		TKIND_ALIAS = 6,
+		TKIND_UNION = 7,
+		TKIND_MAX = 8
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TypeLibExporterFlags.cs b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibExporterFlags.cs
new file mode 100755
index 00000000000..7f7c7695412
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibExporterFlags.cs
@@ -0,0 +1,16 @@
+//

+// System.Runtime.InteropServices.TypeLibExporterFlags.cs

+//

+// Author:

+//   Kevin Winchester (kwin@ns.sympatico.ca)

+//

+// (C) 2002 Kevin Winchester

+//

+

+namespace System.Runtime.InteropServices

+{

+	[Flags] [Serializable]

+	public enum TypeLibExporterFlags {

+		OnlyReferenceRegistered = 1,

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TypeLibFuncAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibFuncAttribute.cs
new file mode 100755
index 00000000000..c58eaccbec2
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibFuncAttribute.cs
@@ -0,0 +1,32 @@
+//
+// System.Runtime.InteropServices.TypeLibFuncAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class TypeLibFuncAttribute : Attribute
+	{
+		TypeLibFuncFlags flags;
+		
+		public TypeLibFuncAttribute (short flags)
+		{
+			this.flags = (TypeLibFuncFlags) flags;
+		}
+
+		public TypeLibFuncAttribute (TypeLibFuncFlags flags)
+		{
+			this.flags = flags;
+		}
+
+		public TypeLibFuncFlags Value {
+			get { return flags; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TypeLibFuncFlags.cs b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibFuncFlags.cs
new file mode 100755
index 00000000000..b0768bca301
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibFuncFlags.cs
@@ -0,0 +1,25 @@
+// System.Runtime.InteropServices.TypeLibFuncFlags.cs
+// 
+// Name: Duncan Mak  (duncan@ximian.com)
+// 
+// (C) Ximian, Inc.
+// 
+
+namespace System.Runtime.InteropServices {
+	[Flags] [Serializable]
+	public enum TypeLibFuncFlags {
+		FRestricted = 1,
+		FSource = 2,
+		FBindable = 4,
+		FRequestEdit = 8,
+		FDisplayBind = 16,
+		FDefaultBind = 32,
+		FHidden = 64,
+		FUsesGetLastError = 128,
+		FDefaultCollelem = 256,
+		FUiDefault = 512,
+		FNonBrowsable = 1024,
+		FReplaceable = 2048,
+		FImmediateBind = 4096,
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TypeLibTypeAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibTypeAttribute.cs
new file mode 100755
index 00000000000..d76bfcd814b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibTypeAttribute.cs
@@ -0,0 +1,32 @@
+//
+// System.Runtime.InteropServices.TypeLibTypeAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class TypeLibTypeAttribute : Attribute
+	{
+		TypeLibTypeFlags flags;
+		
+		public TypeLibTypeAttribute (short flags)
+		{
+			this.flags = (TypeLibTypeFlags) flags;
+		}
+
+		public TypeLibTypeAttribute (TypeLibTypeFlags flags)
+		{
+			this.flags = flags;
+		}
+
+		public TypeLibTypeFlags Value {
+			get { return flags; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TypeLibTypeFlags.cs b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibTypeFlags.cs
new file mode 100755
index 00000000000..adf5297698a
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibTypeFlags.cs
@@ -0,0 +1,26 @@
+// System.Runtime.InteropServices.TypeLibTypeFlags.cs
+// 
+// Name: Duncan Mak  (duncan@ximian.com)
+// 
+// (C) Ximian, Inc.
+// 
+
+namespace System.Runtime.InteropServices {
+	[Flags] [Serializable]
+	public enum TypeLibTypeFlags {
+		FAppObject = 1,
+		FCanCreate = 2,
+		FLicensed = 4,
+		FPreDeclId = 8,
+		FHidden= 16,
+		FControl = 32,
+		FDual = 64,
+		FNonExtensible = 128,
+		FOleAutomation = 256,
+		FRestricted = 512,
+		FAggregatable = 1024,
+		FReplaceable = 2048,
+		FDispatchable = 4096,
+		FReverseBind = 8192,
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TypeLibVarAttribute.cs b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibVarAttribute.cs
new file mode 100755
index 00000000000..1e5f2a4792c
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibVarAttribute.cs
@@ -0,0 +1,32 @@
+//
+// System.Runtime.InteropServices.TypeLibTypeAttribute.cs
+//
+// Name: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.InteropServices {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class TypeLibVarAttribute : Attribute
+	{
+		TypeLibVarFlags flags;
+		
+		public TypeLibVarAttribute (short flags)
+		{
+			this.flags = (TypeLibVarFlags) flags;
+		}
+
+		public TypeLibVarAttribute (TypeLibVarFlags flags)
+		{
+			this.flags = flags;
+		}
+
+		public TypeLibVarFlags Value {
+			get { return flags; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/TypeLibVarFlags.cs b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibVarFlags.cs
new file mode 100755
index 00000000000..5bf60e5a03a
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/TypeLibVarFlags.cs
@@ -0,0 +1,26 @@
+// System.Runtime.InteropServices.TypeLibVarFlags.cs
+// 
+// Name: Duncan Mak  (duncan@ximian.com)
+// 
+// (C) Ximian, Inc.
+// 
+
+namespace System.Runtime.InteropServices {
+	
+	[Flags] [Serializable]
+	public enum TypeLibVarFlags {
+		FReadOnly = 1,
+		FSource = 2,
+		FBindable = 4,
+		FRequestEdit = 8,
+		FDisplayBind = 16,
+		FDefaultBind = 32,
+		FHidden = 64,
+		FRestricted = 128,
+		FDefaultCollelem = 256,
+		FUiDefault = 512,
+		FNonBrowsable = 1024,
+		FReplaceable = 2048,
+		FImmediateBind = 4096,
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMTypeComp.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMTypeComp.cs
new file mode 100755
index 00000000000..8bb02c82f49
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMTypeComp.cs
@@ -0,0 +1,20 @@
+
+// System.Runtime.InteropServices/UCOMITypeComp.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+
+namespace System.Runtime.InteropServices
+{
+
+	//[Guid("")]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface UCOMITypeComp {
+		void Bind( string szName, int lHashVal, short wFlags, out UCOMITypeInfo ppTInfo, out DESCKIND pDescKind, out BINDPTR pBindPtr);
+		void BindType( string szName, int lHashVal, out UCOMITypeInfo ppTInfo, out UCOMITypeComp ppTComp);
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMTypeInfo.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMTypeInfo.cs
new file mode 100755
index 00000000000..1e36703c46d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMTypeInfo.cs
@@ -0,0 +1,37 @@
+
+// System.Runtime.InteropServices/UCOMITypeInfo.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+
+namespace System.Runtime.InteropServices
+{
+
+	//[Guid("")]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface UCOMITypeInfo {
+		void AddressOfMember (int memid, INVOKEKIND invKind, out IntPtr ppv); 
+		void CreateInstance (object pUnkOuter, ref Guid riid, out object ppvObj);
+		void GetContainingTypeLib (out UCOMITypeLib ppTLB, out int pIndex);
+		void GetDllEntry (int memid, INVOKEKIND invKind, out string pBstrDllName, out string pBstrName, out short pwOrdinal);
+		void GetDocumentation (int index, out string strName, out string strDocString, out int dwHelpContext, out string strHelpFile);
+		void GetFuncDesc (int index, out IntPtr ppFuncDesc);
+		void GetIDsOfNames (string[] rgszNames, int cNames, int[] pMemId);
+		void GetImplTypeFlags (int index, out int pImplTypeFlags);
+		void GetMops (int memid, out string pBstrMops);
+		void GetNames (int memid, string[] rgBstrNames, int cMaxNames, out int pcNames);
+		void GetRefTypeInfo (int hRef, out UCOMITypeInfo ppTI);
+		void GetRefTypeOfImplType (int index, out int href);
+		void GetTypeAttr (out IntPtr ppTypeAttr);
+		void GetTypeComp (out UCOMITypeComp ppTComp);
+		void GetVarDesc (int index, out IntPtr ppVarDesc);
+		void Invoke (object pvInstance, int memid, short wFlags, ref DISPPARAMS pDispParams, out object pVarResult, out EXCEPINFO pExcepInfo, out int puArgErr);
+		void ReleaseFuncDesc (IntPtr pFuncDesc);
+		void ReleaseTypeAttr (IntPtr pTypeAttr);
+		void ReleaseVarDesc (IntPtr pVarDesc);
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UCOMTypeLib.cs b/mcs/class/corlib/System.Runtime.InteropServices/UCOMTypeLib.cs
new file mode 100755
index 00000000000..73a2d29570f
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UCOMTypeLib.cs
@@ -0,0 +1,27 @@
+
+// System.Runtime.InteropServices/UCOMITypeLib.cs
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+
+using System;
+
+namespace System.Runtime.InteropServices
+{
+
+	//[Guid("")]
+	[InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+	public interface UCOMITypeLib { 
+		void FindName( string szNameBuf, int lHashVal, UCOMITypeInfo[] ppTInfo, int[] rgMemId, ref short pcFound);
+		void GetDocumentation( int index, out string strName, out string strDocString, out int dwHelpContext, out string strHelpFile);
+		void GetLibAttr( out IntPtr ppTLibAttr);
+		void GetTypeComp( out UCOMITypeComp ppTComp); 
+		void GetTypeInfo( int index, out UCOMITypeInfo ppTI);
+		void GetTypeInfoOfGuid( ref Guid guid, out UCOMITypeInfo ppTInfo);
+		void GetTypeInfoType( int index, out TYPEKIND pTKind);
+		bool IsName( string szNameBuf, int lHashVal);
+		void ReleaseTLibAttr( IntPtr pTLibAttr);
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs b/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs
new file mode 100755
index 00000000000..b6f0fe5a7c8
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/UnmanagedType.cs
@@ -0,0 +1,170 @@
+// UnmanagedType.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.InteropServices {
+
+
+	/// <summary>
+	/// </summary>
+	public enum UnmanagedType {
+
+		/// <summary>
+		/// </summary>
+		Bool = 2,
+
+		/// <summary>
+		/// </summary>
+		I1 = 3,
+
+		/// <summary>
+		/// </summary>
+		U1 = 4,
+
+		/// <summary>
+		/// </summary>
+		I2 = 5,
+
+		/// <summary>
+		/// </summary>
+		U2 = 6,
+
+		/// <summary>
+		/// </summary>
+		I4 = 7,
+
+		/// <summary>
+		/// </summary>
+		U4 = 8,
+
+		/// <summary>
+		/// </summary>
+		I8 = 9,
+
+		/// <summary>
+		/// </summary>
+		U8 = 10,
+
+		/// <summary>
+		/// </summary>
+		R4 = 11,
+
+		/// <summary>
+		/// </summary>
+		R8 = 12,
+
+		Currency = 15,
+
+		/// <summary>
+		/// </summary>
+		BStr = 19,
+
+		/// <summary>
+		/// </summary>
+		LPStr = 20,
+
+		/// <summary>
+		/// </summary>
+		LPWStr = 21,
+
+		/// <summary>
+		/// </summary>
+		LPTStr = 22,
+
+		/// <summary>
+		/// </summary>
+		ByValTStr = 23,
+
+		/// <summary>
+		/// </summary>
+		IUnknown = 25,
+
+		/// <summary>
+		/// </summary>
+		IDispatch = 26,
+
+		/// <summary>
+		/// </summary>
+		Struct = 27,
+
+		/// <summary>
+		/// </summary>
+		Interface = 28,
+
+		/// <summary>
+		/// </summary>
+		SafeArray = 29,
+
+		/// <summary>
+		/// </summary>
+		ByValArray = 30,
+
+		/// <summary>
+		/// </summary>
+		SysInt = 31,
+
+		/// <summary>
+		/// </summary>
+		SysUInt = 32,
+
+		/// <summary>
+		/// </summary>
+		VBByRefStr = 34,
+
+		/// <summary>
+		/// </summary>
+		AnsiBStr = 35,
+
+		/// <summary>
+		/// </summary>
+		TBStr = 36,
+
+		/// <summary>
+		/// </summary>
+		VariantBool = 37,
+
+		/// <summary>
+		/// </summary>
+		FunctionPtr = 38,
+
+		/// <summary>
+		/// </summary>
+		// LPVoid = 39,
+
+		/// <summary>
+		/// </summary>
+		AsAny = 40,
+
+		/// <summary>
+		/// </summary>
+		//RPrecise = 41,
+
+		/// <summary>
+		/// </summary>
+		LPArray = 42,
+
+		/// <summary>
+		/// </summary>
+		LPStruct = 43,
+
+		/// <summary>
+		/// </summary>
+		CustomMarshaler = 44,
+
+		/// <summary>
+		/// </summary>
+		Error = 45,
+
+		/// <summary>
+		/// </summary>
+		//NativeTypeMax = 80,
+	} // UnmanagedType
+
+} // System.Runtime.InteropServices
diff --git a/mcs/class/corlib/System.Runtime.InteropServices/VarEnum.cs b/mcs/class/corlib/System.Runtime.InteropServices/VarEnum.cs
new file mode 100755
index 00000000000..4a8dc4168c1
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.InteropServices/VarEnum.cs
@@ -0,0 +1,50 @@
+using System;
+
+namespace System.Runtime.InteropServices {
+	public enum VarEnum {
+		VT_EMPTY = 0,
+		VT_NULL = 1,
+		VT_I2 = 2,
+		VT_I4 = 3,
+		VT_R4 = 4,
+		VT_R8 = 5,
+		VT_CY = 6,
+		VT_DATE = 7,
+		VT_BSTR = 8,
+		VT_DISPATCH = 9,
+		VT_ERROR = 10,
+		VT_BOOL = 11,
+		VT_VARIANT = 12,
+		VT_UNKNOWN = 13,
+		VT_DECIMAL = 14,
+		VT_I1 = 16,
+		VT_UI1 = 17,
+		VT_UI2 = 18,
+		VT_UI4 = 19,
+		VT_I8 = 20,
+		VT_UI8 = 21,
+		VT_INT = 22,
+		VT_UINT = 23,
+		VT_VOID = 24,
+		VT_HRESULT = 25,
+		VT_PTR = 26,
+		VT_SAFEARRAY = 27,
+		VT_CARRAY = 28,
+		VT_USERDEFINED = 29,
+		VT_LPSTR = 30,
+		VT_LPWSTR = 31,
+		VT_RECORD = 36,
+		VT_FILETIME = 64,
+		VT_BLOB = 65,
+		VT_STREAM = 66,
+		VT_STORAGE = 67,
+		VT_STREAMED_OBJECT = 68,
+		VT_STORED_OBJECT = 69,
+		VT_BLOB_OBJECT = 70,
+		VT_CF = 71,
+		VT_CLSID = 72,
+		VT_VECTOR = 4096,
+		VT_ARRAY = 8192,
+		VT_BYREF = 16384
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Activation/ActivatorLevel.cs b/mcs/class/corlib/System.Runtime.Remoting.Activation/ActivatorLevel.cs
new file mode 100644
index 00000000000..574f2de52bf
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Activation/ActivatorLevel.cs
@@ -0,0 +1,19 @@
+//
+// System.Runtime.Remoting.Contexts.ActivatorLevel..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Runtime.Remoting.Activation {
+
+	public enum ActivatorLevel  {
+		Construction = 4,
+		Context = 8,
+		AppDomain = 12,
+		Process = 16,
+		Machine = 20,
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Activation/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Activation/ChangeLog
new file mode 100644
index 00000000000..cee93a33f3e
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Activation/ChangeLog
@@ -0,0 +1,6 @@
+2002-07-24  Duncan Mak  <duncan@ximian.com>	
+
+	* System.Runtime.Remoting.Activation/UrlAttribute.cs: Add to CVS.
+
+	* System.Runtime.Remoting.Activation/IConstructionCallMessage.cs:
+	This implements IMessage, IMethodCallMessage and IMethodMessage.
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Activation/IActivator.cs b/mcs/class/corlib/System.Runtime.Remoting.Activation/IActivator.cs
new file mode 100644
index 00000000000..60bf6be961c
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Activation/IActivator.cs
@@ -0,0 +1,24 @@
+//
+// System.Runtime.Remoting.Contexts.IActivator..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Runtime.Remoting.Activation {
+
+	public interface IActivator {
+		ActivatorLevel Level {
+			get;
+		}
+
+		IActivator NextActivator {
+			get; set;
+		}
+
+		IConstructionReturnMessage Activate (IConstructionCallMessage msg);
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Activation/IConstructionCallMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Activation/IConstructionCallMessage.cs
new file mode 100644
index 00000000000..3405967465d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Activation/IConstructionCallMessage.cs
@@ -0,0 +1,37 @@
+//
+// System.Runtime.Remoting.Activation.IConstructionCallMessage.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Collections;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Activation {
+
+	public interface IConstructionCallMessage : IMessage, IMethodCallMessage, IMethodMessage {
+		Type ActivationType {
+			get;
+		}
+
+		string ActivationTypeName {
+			get;
+		}
+
+		IActivator Activator {
+			get;
+			set;
+		}
+
+		object [] CallSiteActivationAttributes {
+			get;
+		}
+
+		IList ContextProperties {
+			get;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Activation/IConstructionReturnMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Activation/IConstructionReturnMessage.cs
new file mode 100644
index 00000000000..495736f8c44
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Activation/IConstructionReturnMessage.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.Contexts.IConstructionReturnMessage..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Activation {
+
+	public interface IConstructionReturnMessage :IMethodReturnMessage, IMethodMessage, IMessage {
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Activation/UrlAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Activation/UrlAttribute.cs
new file mode 100644
index 00000000000..ae3744f1d79
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Activation/UrlAttribute.cs
@@ -0,0 +1,54 @@
+//
+// System.Runtime.Remoting.Activation.UrlAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright, Ximian, Inc.
+//
+
+using System.Runtime.Remoting.Contexts;
+
+namespace System.Runtime.Remoting.Activation {
+
+	[Serializable]
+	public sealed class UrlAttribute : ContextAttribute
+	{
+		string url;
+		
+		public UrlAttribute (string callsiteURL)
+			: base (callsiteURL)
+		{
+			url = callsiteURL;
+		}
+
+		public string UrlValue {
+			get { return url; }
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is UrlAttribute))
+				return false;
+			
+			return (((UrlAttribute) o).UrlValue == url);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void GetPropertiesForNewContext (IConstructionCallMessage ctorMsg)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsContextOK (Context ctx, IConstructionCallMessage msg)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs
new file mode 100644
index 00000000000..e1a51b8cc19
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels.Tcp/TcpClientChannel.cs
@@ -0,0 +1,68 @@
+//
+// System.Runtime.Remoting.Channels.Tcp.TcpClientChannel.cs
+//
+// Author: Dietmar Maurer (dietmar@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+using System.Runtime.Remoting.Messaging;
+using System.Runtime.Remoting.Channels;
+
+namespace System.Runtime.Remoting.Channels.Tcp
+{
+	public class TcpClientChannel : IChannelSender, IChannel
+	{
+		int priority = 1;					
+		string name = "tcp";
+		IClientChannelSinkProvider sink_provider;
+		
+		public TcpClientChannel ()
+	        {
+			sink_provider = null;
+		}
+
+		public TcpClientChannel (IDictionary properties, IClientChannelSinkProvider sinkProvider)
+		{
+			priority = 1;
+			sink_provider = sinkProvider;
+		}
+
+		public TcpClientChannel (string name, IClientChannelSinkProvider sinkProvider)
+		{
+			priority = 1;		
+			this.name = name;
+			sink_provider = sinkProvider;
+		}
+		
+		public string ChannelName
+		{
+			get {
+				return name;
+			}
+		}
+
+		public int ChannelPriority
+		{
+			get {
+				return priority;
+			}
+		}
+
+		[MonoTODO]
+		public IMessageSink CreateMessageSink (string url,
+						       object remoteChannelData,
+						       out string objectURI)
+	        {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string Parse (string url, out string objectURI)
+		{
+			throw new NotImplementedException ();
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties.cs
new file mode 100644
index 00000000000..1bc48f3c52d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties.cs
@@ -0,0 +1,108 @@
+//
+// System.Runtime.Remoting.Channels.BaseChannelObjectWithProperties.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Channels
+{
+
+	public abstract class BaseChannelObjectWithProperties :
+		IDictionary, ICollection, IEnumerable
+	{
+		[MonoTODO]
+		public BaseChannelObjectWithProperties ()
+		{
+		}
+
+	        public virtual int Count
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		public virtual bool IsFixedSize
+		{
+			get { throw new NotImplementedException (); }
+		}
+		
+		public virtual bool IsReadOnly
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		public virtual bool IsSynchronized
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		public virtual object this[object key]
+		{
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		public virtual ICollection Keys
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		public virtual IDictionary Properties
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		public virtual object SyncRoot
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		public virtual ICollection Values
+		{
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual void Add (object key, object value)
+		{
+			// .NET says this method must not implemented
+			throw new NotSupportedException ();
+		}
+
+		public virtual void Clear ()
+		{
+			// .NET says this method must not implemented
+			throw new NotSupportedException ();
+		}
+
+		public virtual bool Contains (object key)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual void CopyTo (Array array, int index)
+	        {
+			// .NET says this method must not implemented
+			throw new NotSupportedException ();
+		}
+		
+		public virtual IDictionaryEnumerator GetEnumerator ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		IEnumerator IEnumerable.GetEnumerator ()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		public virtual void Remove (object key)
+		{
+			// .NET says this method must not implemented
+			throw new NotSupportedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties.cs
new file mode 100644
index 00000000000..98bcbf05b44
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties.cs
@@ -0,0 +1,22 @@
+//
+// System.Runtime.Remoting.Channels.BaseChannelSyncWithProperties.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels
+{
+	
+	public abstract class BaseChannelSinkWithProperties
+		: BaseChannelObjectWithProperties
+	{
+		
+		[MonoTODO]
+		protected BaseChannelSinkWithProperties ()
+	        {
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/BaseChannelWithProperties.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/BaseChannelWithProperties.cs
new file mode 100644
index 00000000000..24738ff1438
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/BaseChannelWithProperties.cs
@@ -0,0 +1,30 @@
+//
+// System.Runtime.Remoting.Channels.BaseChannelWithProperties.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public abstract class BaseChannelWithProperties :
+		BaseChannelObjectWithProperties
+	{
+		protected IChannelSinkBase SinksWithProperties;
+		
+		[MonoTODO]
+		protected BaseChannelWithProperties ()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		public override IDictionary Properties
+		{
+			[MonoTODO]
+			get { throw new NotImplementedException (); }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChangeLog
new file mode 100644
index 00000000000..1ee2cc22ebe
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChangeLog
@@ -0,0 +1,74 @@
+2002-08-13  Rodrigo Moya <rodrigo@ximian.com>
+
+	* SoapClientFormatterSink.cs:
+	* SoapServerFormatterSinkProvider.cs:
+	* SinkProviderData.cs: new classes.
+
+2002-08-10  Rodrigo Moya <rodrigo@ximian.com>
+
+	* CommonTransportKeys.cs:
+	* ServerChannelSinkStack.cs: new classes.
+
+2002-08-05  Rodrigo Moya <rodrigo@ximian.com>
+
+	* ChannelServices.cs:
+	* ChannelDataStore.cs:
+	* ClientChannelSinkStack.cs: new classes with some implementation.
+
+2002-08-03  Rodrigo Moya <rodrigo@ximian.com>
+
+	* BinaryServerFormatterSinkProvider.cs:
+	* BinaryClientFormatterSinkProvider.cs: new stubs.
+
+2002-08-03  Duncan Mak  <duncan@ximian.com>
+
+	* BinaryClientFormatterSink.cs: 
+	* IClientChannelSink.cs: Fixed signature for AsyncProcessResponse.
+
+2002-08-01  Rodrigo Moya <rodrigo@ximian.com>
+
+	* BinaryClientFormatterSink.cs:
+	* BaseChannelWithProperties.cs: new stubs.
+
+2002-08-02  Duncan Mak  <duncan@ximian.com>
+
+	* IChannel.cs: 
+	* IChannelReceiver.cs: 
+	* IChannelReceiverHook.cs: 
+	* IClientChannelSink.cs: 
+	* IClientChannelSinkStack.cs: 
+	* IServerChannelSink.cs: 
+	* IServerChannelSinkProvider.cs: 
+	* IServerChannelSinkStack.cs: Fixed various typos, cut-n-paste
+	errors.
+
+2002-07-31  Rodrigo Moya <rodrigo@ximian.com>
+
+	* BaseChannelSinkWithProperties.cs:
+	* BaseChannelObjectWithProperties.cs: new stubs.
+
+2002-08-01  Duncan Mak  <duncan@ximian.com>
+
+	* IChannel.cs:
+	(Parse): Added.
+
+	* BinaryServerFormatterSink.cs: 
+	* SoapServerFormatterSink.cs: Fixed typo.
+
+	* IServerChannelSink.cs:
+	(ProcessMessage): Fixed definition.
+
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+
+	* BinaryServerFormatterSink.cs:
+	* SoapServerFormatterSink.cs: Added.
+
+	* IChannelReceiverHook.cs: 
+	* IClientFormatterSink.cs: Various compilation fixes.
+
+2002-07-31  Duncan Mak  <duncan@ximian.com>	
+
+	* *.cs: Added all the interfaces in this namespace.
+
+	* ServerProcessing.cs: Added.
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelDataStore.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelDataStore.cs
new file mode 100644
index 00000000000..6c5c7c13fe1
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelDataStore.cs
@@ -0,0 +1,43 @@
+//
+// System.Runtime.Remoting.Channels.ChannelDataStore.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class ChannelDataStore : IChannelDataStore
+	{
+		private string[] channelUris;
+		
+		public ChannelDataStore (string[] uris)
+		{
+			channelUris = uris;
+		}
+
+		public string[] ChannelUris
+		{
+			get {
+				return channelUris;
+			}
+			set {
+				channelUris = value;
+			}
+		}
+
+		public object this[object key]
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs
new file mode 100644
index 00000000000..0f67ed4c0a4
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ChannelServices.cs
@@ -0,0 +1,93 @@
+//
+// System.Runtime.Remoting.Channels.ChannelServices.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public sealed class ChannelServices
+	{
+		private static ArrayList registeredChannels = new ArrayList ();
+		
+		public static IChannel[] RegisteredChannels
+		{
+			get {
+				IChannel[] channels = new IChannel[registeredChannels.Count];
+
+				for (int i = 0; i < registeredChannels.Count; i++)
+					channels[i] = (IChannel) registeredChannels[i];
+
+				return channels;
+			}
+		}
+
+		[MonoTODO]
+		public static IMessageCtrl AsyncDispatchMessage (IMessage msg,
+								 IMessageSink replySink)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IServerChannelSink CreateServerChannelSinkChain (
+			IServerChannelSinkProvider provider,
+			IChannelReceiver channel)
+	        {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static ServerProcessing DispatchMessage (
+			IServerChannelSinkStack sinkStack,
+			IMessage msg,
+			out IMessage replyMsg)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IChannel GetChannel (string name)
+	        {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static IDictionary GetChannelSinkProperties (object obj)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static string[] GetUrlsForObject (MarshalByRefObject obj)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static void RegisterChannel (IChannel chnl)
+	        {
+			registeredChannels.Add ((object) chnl);
+		}
+
+		[MonoTODO]
+		public static IMessage SyncDispatchMessage (IMessage msg)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static void UnregisterChannel (IChannel chnl)
+		{
+			if (chnl == null)
+				throw new ArgumentNullException ();
+			if (!registeredChannels.Contains ((object) chnl))
+				throw new RemotingException ();
+
+			registeredChannels.Remove ((object) chnl);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ClientChannelSinkStack.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/ClientChannelSinkStack.cs
new file mode 100644
index 00000000000..d53c907003c
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ClientChannelSinkStack.cs
@@ -0,0 +1,59 @@
+//
+// System.Runtime.Remoting.Channels.ClientChannelSinkStack.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class ClientChannelSinkStack : IClientChannelSinkStack,
+		IClientResponseChannelSinkStack
+	{
+		private IMessageSink replySink = null;
+		
+		public ClientChannelSinkStack ()
+		{
+		}
+
+		public ClientChannelSinkStack (IMessageSink sink)
+		{
+			replySink = sink;
+		}
+
+		[MonoTODO]
+		public void AsyncProcessResponse (ITransportHeaders headers,
+						  Stream stream)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void DispatchException (Exception e)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void DispatchReplyMessage (IMessage msg)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public object Pop (IClientChannelSink sink)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Push (IClientChannelSink sink, object state)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannel.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannel.cs
new file mode 100644
index 00000000000..19edea45586
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannel.cs
@@ -0,0 +1,19 @@
+//
+// System.Runtime.Remoting.Channels.IChannel.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IChannel
+	{
+		string ChannelName { get; }
+
+		int ChannelPriority { get; }
+
+		string Parse (string url, out string objectURI);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelDataStore.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelDataStore.cs
new file mode 100644
index 00000000000..39646636392
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelDataStore.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.Channels.IChannelDataStore.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IChannelDataStore
+	{
+		string [] ChannelUris { get;}
+
+		object this [object key] { get; set; }
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelReceiver.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelReceiver.cs
new file mode 100644
index 00000000000..a976caaedb1
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelReceiver.cs
@@ -0,0 +1,21 @@
+//
+// System.Runtime.Remoting.Channels.IChannelReceiver.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IChannelReceiver : IChannel
+	{
+		object ChannelData { get; }
+
+		string [] GetUrlsForUri (string objectUri);
+
+		void StartListening (object data);
+
+		void StopListening (object data);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelReceiverHook.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelReceiverHook.cs
new file mode 100644
index 00000000000..11540e74716
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelReceiverHook.cs
@@ -0,0 +1,22 @@
+//
+// System.Runtime.Remoting.Channels.IChannelReceiverHook.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IChannelReceiverHook
+	{
+		string ChannelScheme { get; }
+
+		IServerChannelSink ChannelSinkChain { get; }
+
+		bool WantsToListen { get; }
+
+		void AddHookChannelUri (string channelUri);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelSender.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelSender.cs
new file mode 100644
index 00000000000..5f5d4b00362
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelSender.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.Channels.IChannelSender.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IChannelSender : IChannel
+	{
+		IMessageSink CreateMessageSink (string url, object remoteChannelData, out string objectURI);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelSinkBase.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelSinkBase.cs
new file mode 100644
index 00000000000..7c4445a8236
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IChannelSinkBase.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.Channels.IChannelSinkBase.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IChannelSinkBase
+	{
+		IDictionary Properties { get; }
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientChannelSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientChannelSink.cs
new file mode 100644
index 00000000000..f4413f9e3e5
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientChannelSink.cs
@@ -0,0 +1,29 @@
+//
+// System.Runtime.Remoting.Channels.IClientChannelSink.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IClientChannelSink : IChannelSinkBase
+	{
+		IClientChannelSink NextChannelSink { get; }
+
+		void AsyncProcessRequest (IClientChannelSinkStack sinkStack, IMessage msg,
+					  ITransportHeaders headers, Stream stream);
+
+		void AsyncProcessResponse (IClientResponseChannelSinkStack sinkStack, object state,
+					   ITransportHeaders headers, Stream stream);
+
+		Stream GetRequestStream (IMessage msg, ITransportHeaders headers);
+
+		void ProcessMessage (IMessage msg, ITransportHeaders requestHeaders, Stream requestStream,
+				     out ITransportHeaders responseHeaders, out Stream responseStream);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientChannelSinkProvider.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientChannelSinkProvider.cs
new file mode 100644
index 00000000000..8876858bf90
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientChannelSinkProvider.cs
@@ -0,0 +1,20 @@
+//
+// System.Runtime.Remoting.Channels.IClientChannelSinkProvider.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IClientChannelSinkProvider
+	{
+		IClientChannelSinkProvider Next { get;  set; }
+
+		IClientChannelSink CreateSink (IChannelSender channel,  string url, object remoteChannelData);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientChannelSinkStack.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientChannelSinkStack.cs
new file mode 100644
index 00000000000..b7ad75737e9
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientChannelSinkStack.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.Channels.IClientChannelSinkStack.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IClientChannelSinkStack : IClientResponseChannelSinkStack
+	{
+		object Pop (IClientChannelSink sink);
+
+		void Push (IClientChannelSink sink, object state);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientFormatterSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientFormatterSink.cs
new file mode 100644
index 00000000000..a43eee1a7b6
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientFormatterSink.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.Channels.IClientFormatterSink.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IClientFormatterSink : IMessageSink, IClientChannelSink, IChannelSinkBase
+	{
+		
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientFormatterSinkProvider.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientFormatterSinkProvider.cs
new file mode 100644
index 00000000000..312d7835158
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientFormatterSinkProvider.cs
@@ -0,0 +1,15 @@
+//
+// System.Runtime.Remoting.Channels.IClientFormatterSinkProvider.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IClientFormatterSinkProvider :  IClientChannelSinkProvider
+	{
+
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientResponseChannelSinkStack.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientResponseChannelSinkStack.cs
new file mode 100644
index 00000000000..d9d5c583376
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IClientResponseChannelSinkStack.cs
@@ -0,0 +1,23 @@
+//
+// System.Runtime.Remoting.Channels.IClientResponseChannelSinkStack.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IClientResponseChannelSinkStack
+	{
+		void AsyncProcessResponse (ITransportHeaders headers, Stream stream);
+
+		void DispatchException (Exception e);
+
+		void DispatchReplyMessage (IMessage msg);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerChannelSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerChannelSink.cs
new file mode 100644
index 00000000000..aee55502b4d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerChannelSink.cs
@@ -0,0 +1,28 @@
+//
+// System.Runtime.Remoting.Channels.IServerChannelSink.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IServerChannelSink : IChannelSinkBase
+	{
+		IServerChannelSink NextChannelSink { get; }
+
+		void AsyncProcessResponse (IServerResponseChannelSinkStack sinkStack, object state,
+					   IMessage msg, ITransportHeaders headers, Stream stream);
+
+		Stream GetResponseStream (IServerResponseChannelSinkStack sinkStack, object state,
+					  IMessage msg, ITransportHeaders headers);
+
+		ServerProcessing ProcessMessage (IServerChannelSinkStack sinkStack,
+						 IMessage requestMsg, ITransportHeaders requestHeaders, Stream requestStream,
+						 out IMessage responseMsg, out ITransportHeaders responseHeaders, out Stream responseStream);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerChannelSinkProvider.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerChannelSinkProvider.cs
new file mode 100644
index 00000000000..1accfd56d0c
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerChannelSinkProvider.cs
@@ -0,0 +1,19 @@
+//
+// System.Runtime.Remoting.Channels.IServerChannelSinkProvider.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IServerChannelSinkProvider
+	{
+		IServerChannelSinkProvider Next { get;  set; }
+
+		IServerChannelSink CreateSink (IChannelReceiver channel);
+
+		void GetChannelData (IChannelDataStore channelData);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerChannelSinkStack.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerChannelSinkStack.cs
new file mode 100644
index 00000000000..cb5b64ce00e
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerChannelSinkStack.cs
@@ -0,0 +1,25 @@
+//
+// System.Runtime.Remoting.Channels.IServerChannelSinkStack.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Runtime.Remoting;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IServerChannelSinkStack : IServerResponseChannelSinkStack
+	{
+		object Pop (IServerChannelSink sink);
+
+		void Push (IServerChannelSink sink, object state);
+
+		void ServerCallback (IAsyncResult ar);
+
+		void Store (IServerChannelSink sink, object state);
+
+		void StoreAndDispatch (IServerChannelSink sink, object state);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerFormatterSinkProvider.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerFormatterSinkProvider.cs
new file mode 100644
index 00000000000..c352de9de78
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerFormatterSinkProvider.cs
@@ -0,0 +1,15 @@
+//
+// System.Runtime.Remoting.Channels.IServerFormatterSinkProvider.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IServerFormatterSinkProvider :  IServerChannelSinkProvider
+	{
+
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerResponseChannelSinkStack.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerResponseChannelSinkStack.cs
new file mode 100644
index 00000000000..63f1c35d8d7
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/IServerResponseChannelSinkStack.cs
@@ -0,0 +1,20 @@
+//
+// System.Runtime.Remoting.Channels.IServerResponseChannelSinkStack.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface IServerResponseChannelSinkStack
+	{
+		void AsyncProcessResponse (IMessage msg, ITransportHeaders headers, Stream stream);
+
+		Stream GetResponseStream (IMessage msg, ITransportHeaders headers);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ITransportHeaders.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/ITransportHeaders.cs
new file mode 100644
index 00000000000..f81446a25dc
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ITransportHeaders.cs
@@ -0,0 +1,19 @@
+//
+// System.Runtime.Remoting.Channels.ITransportHeaders.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Channels {
+
+	public interface ITransportHeaders
+	{
+		object this [object key] { get; set; }
+
+		IEnumerator GetEnumerator();
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ServerChannelSinkStack.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/ServerChannelSinkStack.cs
new file mode 100644
index 00000000000..877f2db0070
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ServerChannelSinkStack.cs
@@ -0,0 +1,64 @@
+//
+// System.Runtime.Remoting.Channels.ServerChannelSinkStack.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class ServerChannelSinkStack : IServerChannelSinkStack,
+		IServerResponseChannelSinkStack
+	{
+		public ServerChannelSinkStack ()
+		{
+		}
+
+		[MonoTODO]
+		public Stream GetResponseStream (IMessage msg,
+						 ITransportHeaders headers)
+	        {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public object Pop (IServerChannelSink sink)
+	        {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Push (IServerChannelSink sink, object state)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void ServerCallback (IAsyncResult ar)
+	        {
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void Store (IServerChannelSink sink, object state)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void StoreAndDispatch (IServerChannelSink sink, object state)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void AsyncProcessResponse (IMessage msg, ITransportHeaders headers, Stream stream)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/ServerProcessing.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/ServerProcessing.cs
new file mode 100644
index 00000000000..01056192294
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/ServerProcessing.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.Remoting.Channels.ServerProcessing.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Channels {
+
+	[Serializable]
+	public enum ServerProcessing
+	{
+		Complete = 0,
+		OneWay = 1,
+		Async = 2,
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/SinkProviderData.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/SinkProviderData.cs
new file mode 100644
index 00000000000..02882ef4c4a
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/SinkProviderData.cs
@@ -0,0 +1,45 @@
+//
+// System.Runtime.Remoting.Channels.SinkProviderData.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class SinkProviderData
+	{
+		private string sinkName;
+		
+		public SinkProviderData (string name)
+		{
+			sinkName = name;
+		}
+
+		public IList Children
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+
+		public string Name
+	        {
+			get {
+				return sinkName;
+			}
+		}
+
+		public IDictionary Properties
+		{
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Channels/TransportHeaders.cs b/mcs/class/corlib/System.Runtime.Remoting.Channels/TransportHeaders.cs
new file mode 100644
index 00000000000..acfecbf5dbc
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Channels/TransportHeaders.cs
@@ -0,0 +1,40 @@
+//
+// System.Runtime.Remoting.Channels.TransportHeaders.cs
+//
+// Author: Rodrigo Moya (rodrigo@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Channels
+{
+	public class TransportHeaders : ITransportHeaders
+	{
+		[MonoTODO]
+		public TransportHeaders ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public object this[object key]
+	        {
+			[MonoTODO]
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			[MonoTODO]
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public IEnumerator GetEnumerator ()
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Contexts/ChangeLog
new file mode 100644
index 00000000000..01f9b2f4c91
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/ChangeLog
@@ -0,0 +1,25 @@
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+
+	* SynchronizationAttribute.cs: Added more interfaces, it
+	implements them (via CorCompare), but they're not listed in the docs.
+
+	* ContextProperty.cs: 
+	* CrossContextDelegate.cs: Added to CVS.
+
+	* ContextAttribute.cs: Added missing constructor.
+
+2002-07-29  Duncan Mak  <duncan@ximian.com>
+
+	* IContributeServerContentSink.cs: Removed.
+	* IContributeServerContextSink.cs: Replaces IContributeServerContentSink.
+
+2002-07-24  Duncan Mak  <duncan@ximian.com>
+
+	* SynchronizationAttribute.cs: Added missing attributes.
+
+	* IContextPropertyActivator.cs: 
+	* IContributeClientContextSink.cs: 
+	* IContributeDynamicSink.cs: 
+	* IContributeEnvoySink.cs: 
+	* IContributeObjectSink.cs: 
+	* IContributeServerContentSink.cs: Added the missing interfaces.
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs
new file mode 100644
index 00000000000..6a923ac52b2
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/Context.cs
@@ -0,0 +1,72 @@
+//
+// System.Runtime.Remoting.Contexts.Context..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Contexts {
+
+	public class Context {
+		static Context default_context;
+		ArrayList context_properties;
+		int context_id;
+		bool frozen;
+		static int global_count;
+		
+		static Context ()
+		{
+			default_context = new Context ();
+			default_context.frozen = true;
+		}
+		
+		public Context ()
+		{
+			context_id = global_count++;
+		}
+
+		public static Context DefaultContext {
+			get {
+				return default_context;
+			}
+		}
+
+		public virtual int ContextID {
+			get {
+				return context_id;
+			}
+		}
+
+		public virtual IContextProperty GetProperty (string name)
+		{
+			if (context_properties == null)
+				return null;
+
+			foreach (IContextProperty p in context_properties)
+				if (p.Name == name)
+					return p;
+			
+			return null;
+		}
+
+		public virtual void SetProperty (IContextProperty prop)
+		{
+			if (prop == null)
+				throw new ArgumentNullException ("IContextProperty");
+			if (this == default_context)
+				throw new InvalidOperationException ("Can not add properties to " +
+								     "default context");
+			if (frozen)
+				throw new InvalidOperationException ("Context is Frozen");
+			
+			if (context_properties == null)
+				context_properties = new ArrayList ();
+
+			context_properties.Add (prop);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/ContextAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/ContextAttribute.cs
new file mode 100644
index 00000000000..761bcbc7a5a
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/ContextAttribute.cs
@@ -0,0 +1,105 @@
+//
+// System.Runtime.Remoting.Contexts.ContextAttribute..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Remoting.Activation;
+using System.Collections;
+
+namespace System.Runtime.Remoting.Contexts {
+
+	[AttributeUsage (AttributeTargets.Class)]
+	[Serializable]
+	public class ContextAttribute : Attribute, IContextAttribute, IContextProperty {
+		protected string AttributeName;
+
+		public ContextAttribute ()
+		{
+		}
+
+		public ContextAttribute (string name)
+		{
+			AttributeName = name;
+		}
+
+		public virtual string Name {
+			get {
+				return AttributeName;
+			}
+		}
+
+		public override bool Equals (object o)
+		{
+			if (o == null)
+				return false;
+
+			if (!(o is ContextAttribute))
+				return false;
+
+			ContextAttribute ca = (ContextAttribute) o;
+			
+			if (ca.AttributeName != AttributeName)
+				return false;
+
+			return true;
+		}
+
+		public virtual void Freeze (Context ctx)
+		{
+		}
+
+		public override int GetHashCode ()
+		{
+			if (AttributeName == null)
+				return 0;
+			
+			return AttributeName.GetHashCode ();
+		}
+
+		/// <summary>
+		///    Adds the current context property to the IConstructionCallMessage
+		/// </summary>
+		public virtual void GetPropertiesForNewContext (IConstructionCallMessage msg)
+		{
+			if (msg == null)
+				throw new ArgumentNullException ("IConstructionCallMessage");
+
+			IList list = msg.ContextProperties;
+
+			list.Add (this);
+		}
+
+		// <summary>
+		//   True whether the context arguments satisfies the requirements
+		//   of the current context.
+		// </summary>
+		public virtual bool IsContextOK (Context ctx, IConstructionCallMessage msg)
+		{
+			if (msg == null)
+				throw new ArgumentNullException ("IConstructionCallMessage");
+			if (ctx == null)
+				throw new ArgumentNullException ("Context");
+
+			if (!msg.ActivationType.IsContextful)
+				return true;
+
+			IContextProperty p = ctx.GetProperty (AttributeName);
+			if (p == null)
+				return false;
+
+			if (this != p)
+				return false;
+				
+			return true;
+		}
+
+		public virtual bool IsNewContextOK (Context ctx)
+		{
+			return true;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/ContextProperty.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/ContextProperty.cs
new file mode 100644
index 00000000000..a053cef5b45
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/ContextProperty.cs
@@ -0,0 +1,25 @@
+//
+// System.Runtime.Remoting.Contexts.ContextProperty..cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System.Runtime.Remoting.Contexts {
+
+	public class ContextProperty
+	{
+		[MonoTODO]
+		public virtual string Name {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object Property {
+			get { throw new NotImplementedException (); }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/CrossContextDelegate.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/CrossContextDelegate.cs
new file mode 100644
index 00000000000..2d16213f2de
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/CrossContextDelegate.cs
@@ -0,0 +1,13 @@
+//
+// System.Runtime.Remoting.Contexts.CrossContextDelegate.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Contexts {
+
+	[Serializable]
+	public delegate void CrossContextDelegate ();
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContextAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContextAttribute.cs
new file mode 100644
index 00000000000..b998062642c
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContextAttribute.cs
@@ -0,0 +1,20 @@
+//
+// System.Runtime.Remoting.Contexts.IContextAttribute..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Remoting.Activation;
+
+namespace System.Runtime.Remoting.Contexts {
+
+	public interface IContextAttribute {
+
+		void GetPropertiesForNewContext (IConstructionCallMessage msg);
+
+		bool IsContextOK (Context ctx, IConstructionCallMessage msg);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContextProperty.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContextProperty.cs
new file mode 100644
index 00000000000..7230c19b029
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContextProperty.cs
@@ -0,0 +1,23 @@
+//
+// System.Runtime.Remoting.Contexts.IContextProperty..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Runtime.Remoting.Contexts {
+
+	public interface IContextProperty {
+
+		string Name {
+			get;
+		}
+
+		void Freeze (Context ctx);
+
+		bool IsNewContextOK (Context ctx);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContextPropertyActivator.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContextPropertyActivator.cs
new file mode 100644
index 00000000000..69efa1d3151
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContextPropertyActivator.cs
@@ -0,0 +1,21 @@
+//
+// System.Runtime.Remoting.Contexts.IContextPropertyActivator..cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Runtime.Remoting.Activation;
+
+namespace System.Runtime.Remoting.Contexts {
+
+	public interface IContextPropertyActivator
+	{
+		void CollectFromClientContext (IConstructionCallMessage msg);
+		void CollectFromServerContext (IConstructionReturnMessage msg);
+		bool DeliverClientContextToServerContext (IConstructionCallMessage msg);
+		bool DeliverServerContextToClientContext (IConstructionReturnMessage msg);
+		bool IsOKToActivate (IConstructionCallMessage msg);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeClientContextSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeClientContextSink.cs
new file mode 100644
index 00000000000..a18c8b04961
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeClientContextSink.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.Contexts.IContributeClientContextSink.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Contexts {
+
+	public interface IContributeClientContextSink
+	{
+		IMessageSink GetClientContextSink (IMessageSink nextSink);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeDynamicSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeDynamicSink.cs
new file mode 100644
index 00000000000..a215e7e40c9
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeDynamicSink.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.Contexts.IContributeDynamicSink.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System.Runtime.Remoting.Contexts;
+
+namespace System.Runtime.Remoting.Contexts {
+
+	public interface IContributeDynamicSink
+	{
+		IDynamicMessageSink GetDynamicSink ();
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeEnvoySink.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeEnvoySink.cs
new file mode 100644
index 00000000000..13e118ec35d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeEnvoySink.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.Remoting.Contexts.IContributeEnvoySink.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Contexts {
+
+	public interface IContributeEnvoySink
+	{
+		IMessageSink GetEnvoySink (MarshalByRefObject obj, IMessageSink nextSink);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeObjectSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeObjectSink.cs
new file mode 100644
index 00000000000..a33df42617b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeObjectSink.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.Remoting.Contexts.IContributeObjectSink.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Contexts {
+	
+	public interface IContributeObjectSink
+	{
+		IMessageSink GetObjectSink (MarshalByRefObject obj, IMessageSink nextSink);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeServerContextSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeServerContextSink.cs
new file mode 100644
index 00000000000..dbe0dddda31
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IContributeServerContextSink.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.Remoting.Contexts.IContributeServerContextSink.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Contexts {
+	
+	public interface IContributeServerContextSink
+	{
+		IMessageSink GetServerContextSink (IMessageSink nextSink);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/IDynamicMessageSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IDynamicMessageSink.cs
new file mode 100644
index 00000000000..daf169559d8
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IDynamicMessageSink.cs
@@ -0,0 +1,20 @@
+//
+// System.Runtime.Remoting.Contexts.IDynamicMessageSink..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting.Contexts {
+
+	public interface IDynamicMessageSink {
+
+		void ProcessMessageFinish (IMessage reply_msg, bool client_site, bool async);
+
+		void ProcessMessageStart  (IMessage req_msg, bool client_site, bool async);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Contexts/IDynamicProperty.cs b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IDynamicProperty.cs
new file mode 100644
index 00000000000..e469e24b6f1
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Contexts/IDynamicProperty.cs
@@ -0,0 +1,19 @@
+//
+// System.Runtime.Remoting.Contexts.IDynamicProperty..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Runtime.Remoting.Contexts {
+
+	public interface IDynamicProperty {
+
+		string Name {
+			get;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ChangeLog
new file mode 100644
index 00000000000..b210b598895
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ChangeLog
@@ -0,0 +1,20 @@
+2002-07-30  Duncan Mak  <duncan@ximian.com>
+
+	* LeaseState.cs: Fixed namespace.
+
+2002-07-29  Duncan Mak  <duncan@ximian.com>
+
+	* ILease.cs: Add the method part of the interface and renamed the
+	CurrentState property to it proper name.
+
+2002-07-24  Duncan Mak  <duncan@ximian.com>
+
+	* LeaseState.cs: Moved here from System.Runtime.Remoting.
+
+	* ClientSponsor.cs: 
+	* LifetimeServices.cs: Stubbed out
+
+	* ILease.cs: 
+	* ISponsor.cs: Added to CVS.
+	
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ClientSponsor.cs b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ClientSponsor.cs
new file mode 100644
index 00000000000..c6400477f75
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ClientSponsor.cs
@@ -0,0 +1,73 @@
+//
+// System.Runtime.Remoting.Lifetime.ClientSponsor.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Remoting.Lifetime;
+
+namespace System.Runtime.Remoting.Lifetime {
+
+	public class ClientSponsor : MarshalByRefObject, ISponsor
+	{
+		TimeSpan renewal_time;
+
+		public ClientSponsor ()
+		{
+			renewal_time = new TimeSpan (0, 2, 0); // default is 2 mins
+		}
+
+		public ClientSponsor (TimeSpan time)
+		{
+			renewal_time = time;
+		}
+
+		public TimeSpan RenewalTime {
+			get {
+				return renewal_time;
+			}
+
+			set {
+				renewal_time = value;
+			}
+		}
+
+		[MonoTODO]
+		public void Close ()
+		{
+		}
+
+		[MonoTODO]
+		~ClientSponsor ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override object InitializeLifetimeService ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public bool Register (MarshalByRefObject obj)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public TimeSpan Renewal (ILease lease)
+		{
+			throw new NotImplementedException ();
+		}
+		       
+		[MonoTODO]
+		public void Unregister (MarshalByRefObject obj)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ILease.cs b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ILease.cs
new file mode 100644
index 00000000000..b8d86e30370
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ILease.cs
@@ -0,0 +1,27 @@
+//
+// System.Runtime.Remoting.Lifetime.ILease.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Remoting.Lifetime;
+
+namespace System.Runtime.Remoting.Lifetime {
+
+	public interface ILease
+	{
+		TimeSpan CurrentLeaseTime { get; }
+		LeaseState CurrentState { get; }
+		TimeSpan InitialLeaseTime { get; set; }
+		TimeSpan RenewOnCallTime { get; set; }
+		TimeSpan SponsorshipTimeout {get; set; }
+
+		void Register (ISponsor obj);
+		void Register (ISponsor obj, TimeSpan renewalTime);
+		TimeSpan Renew (TimeSpan renewalTime);
+		void Unregister (ISponsor obj);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ISponsor.cs b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ISponsor.cs
new file mode 100644
index 00000000000..68ae88e3fe3
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/ISponsor.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.Remoting.Lifetime.ISponsor.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Remoting.Lifetime;
+
+namespace System.Runtime.Remoting.Lifetime {
+
+	public interface ISponsor
+	{
+		TimeSpan Renewal (ILease lease);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/LeaseState.cs b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/LeaseState.cs
new file mode 100644
index 00000000000..4e8218699fd
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/LeaseState.cs
@@ -0,0 +1,41 @@
+// LeaseState.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:40:41 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Remoting.Lifetime {
+
+
+	/// <summary>
+	/// </summary>
+	public enum LeaseState {
+
+		/// <summary>
+		/// </summary>
+		Null = 0,
+
+		/// <summary>
+		/// </summary>
+		Initial = 1,
+
+		/// <summary>
+		/// </summary>
+		Active = 2,
+
+		/// <summary>
+		/// </summary>
+		Renewing = 3,
+
+		/// <summary>
+		/// </summary>
+		Expired = 4,
+	} // LeaseState
+
+} // System.Runtime.Remoting.Lifetime
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Lifetime/LifetimeServices.cs b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/LifetimeServices.cs
new file mode 100644
index 00000000000..64d532edc85
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Lifetime/LifetimeServices.cs
@@ -0,0 +1,65 @@
+//
+// System.Runtime.Remoting.Lifetime.LifetimeServices.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.Remoting.Lifetime {
+
+	public class LifetimeServices
+	{
+		[MonoTODO]
+		public LifetimeServices ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static TimeSpan LeaseManagerPollTime {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static TimeSpan LeaseTime {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static TimeSpan RenewOnCallTime {
+			get {
+				throw new NotImplementedException ();
+			}
+			
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public static TimeSpan SponsorshipTimeout {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/AsyncResult.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/AsyncResult.cs
new file mode 100644
index 00000000000..7c619950c0d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/AsyncResult.cs
@@ -0,0 +1,105 @@
+// 
+// System.Runtime.Remoting.Messaging/AsyncResult.cs 
+//
+// Authors:
+//   Joe Shaw (joe@ximian.com)
+//   Martin Baulig (martin@gnome.org)
+//   Dietmar Maurer (dietmar@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Threading;
+using System.Runtime.CompilerServices;
+
+namespace System.Runtime.Remoting.Messaging {
+
+public class AsyncResult : IAsyncResult, IMessageSink {
+
+	object async_state;
+	WaitHandle handle;
+	object async_delegate;
+	IntPtr data;
+	bool sync_completed;
+	bool completed;
+	bool endinvoke_called;
+		
+	public virtual object AsyncState
+	{
+		get {
+			return async_state;
+		}
+	}
+
+	public virtual WaitHandle AsyncWaitHandle
+	{
+		get {
+			return handle;
+		}
+	}
+
+	public virtual bool CompletedSynchronously
+	{
+		get {
+			return sync_completed;
+		}
+	}
+
+	public virtual bool IsCompleted
+	{
+		get {
+			return completed;
+		}
+	}
+		
+	public bool EndInvokeCalled
+	{
+		get {
+			return endinvoke_called;
+		}
+		set {
+			endinvoke_called = value;
+		}
+	}
+		
+	public virtual object AsyncDelegate
+	{
+		get {
+			return async_delegate;
+		}
+	}
+
+	[MonoTODO]
+	public IMessageSink NextSink {
+		get {
+			throw new NotImplementedException ();
+		}
+	}
+
+	[MonoTODO]
+	public virtual IMessageCtrl AsyncProcessMessage (IMessage msg, IMessageSink replySink)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public virtual IMessage GetReplyMessage()
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public virtual void SetMessageCtrl (IMessageCtrl mc)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	public virtual IMessage SyncProcessMessage (IMessage msg)
+	{
+		throw new NotImplementedException ();
+	}
+}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
new file mode 100644
index 00000000000..c160bc14531
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ChangeLog
@@ -0,0 +1,70 @@
+2002-08-22  Nick Drochak  <ndrochak@gol.com>
+
+	* RemotingSurrogateSelector.cs (SetRootObject): Function should return
+	void, not object.
+
+2002-08-03  Duncan Mak  <duncan@ximian.com>
+
+	* MethodCall.cs: 
+	* MethodResponse.cs: More visibility fixes. Hopefully this is the
+	last of it.
+
+2002-08-02  Duncan Mak  <duncan@ximian.com>
+
+	* MethodCall.cs: 
+	* MethodCallMessageWrapper.cs: 
+	* MethodReturnMessageWrapper.cs: Various visibility fixes.
+
+	* RemotingSurrogateSelector.cs: Added, replaced RemoteSurrogateSelector.
+
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+	
+	* MethodCallMessageWrapper.cs:
+	* MethodReturnMessageWrapper.cs: Revert the last patch and made it
+	work. Thanks to Gonzalo for reminding me to chain the constructors.
+
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+
+	* MethodCallMessageWrapper.cs:
+	* MethodReturnMessageWrapper.cs: Remove reference to
+	InternalMessageWrapper. It's probably an MS private class, even
+	though it's visible in the documentation.
+
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+
+	* InternalMessageWrapper.cs: 
+	* MessageSurrogateFilter.cs: 
+	* MethodCall.cs: 
+	* MethodCallMessageWrapper.cs: 
+	* MethodResponse.cs: 
+	* MethodReturnMessageWrapper.cs: 
+
+	* RemoteSurrogateSelector.cs: Added to CVS. 
+
+	* MonoMethodMessage.cs: 
+	* ReturnMessage.cs: Add set in the Uri property.
+
+2002-07-24  Duncan Mak  <duncan@ximian.com>
+
+	* OneWayAttribute.cs: Added to CVS.
+
+2002-07-23  Duncan Mak  <duncan@ximian.com>
+
+	* HeaderHandler.cs: Added.
+
+	* IRemotingFormatter.cs: Added to CVS.
+
+	* IMethodMessage.cs: IMethodMessage inherits from IMessage.
+
+Thu Apr 4 13:13:20 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* IMethodReturnMessage.cs: added IMethodMessage, IMessage interfaces.
+	* ReturnMessage.cs: stubbed out Properties property.
+
+2002-03-21  Dietmar Maurer  <dietmar@ximian.com>
+
+	* AsyncResult.cs: impl.
+
+2002/03/04  Nick Drochak  <ndrochak@gol.com>
+
+	* Header.cs: Change properties into fields where they should be.
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/Header.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/Header.cs
new file mode 100644
index 00000000000..0b08bfd3eb8
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/Header.cs
@@ -0,0 +1,50 @@
+//

+// System.Runtime.Remoting.Messaging.Header.cs

+//

+// Author:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+

+using System.Collections;

+

+namespace System.Runtime.Remoting.Messaging {

+

+	[Serializable]

+	public class Header {

+		public Header (string name, object value) :

+			this (name, value, true)

+		{

+		}

+

+		public Header (string name, object value, bool must_understand) :

+			this (name, value, must_understand, null)

+		{

+		}

+

+		public Header (string name, object value, bool must_understand, string header_namespace) {

+			this.name = name;

+			this.value = value;

+			this.must_understand = must_understand;

+			this.header_namespace = header_namespace;

+		}

+

+		// fields

+

+		public string HeaderNamespace;

+

+		public bool MustUnderstand;

+

+		public string Name;

+

+		public object Value;

+

+		// private

+

+		private string name;

+		private object value;

+		private bool must_understand;

+		private string header_namespace;

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/HeaderHandler.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/HeaderHandler.cs
new file mode 100644
index 00000000000..bb482f559a6
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/HeaderHandler.cs
@@ -0,0 +1,13 @@
+//
+// System.Runtime.Remoting.Messaging.HeaderHandler.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Copyright Ximian, Inc. 2002
+//
+
+namespace System.Runtime.Remoting.Messaging {
+
+	[Serializable]
+	public delegate object HeaderHandler (Header[] headers);
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMessage.cs
new file mode 100644
index 00000000000..d1a5c0c1207
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMessage.cs
@@ -0,0 +1,20 @@
+//
+// System.Runtime.Remoting.Messaging.IMessage.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Collections;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	public interface IMessage {
+
+		IDictionary Properties {
+			get;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMessageCtrl.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMessageCtrl.cs
new file mode 100644
index 00000000000..5fe21c32232
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMessageCtrl.cs
@@ -0,0 +1,19 @@
+//
+// System.Runtime.Remoting.Messaging.IMessageSink.cs
+//
+// Author:
+//   Piers Haken (piersh@friskit.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Remoting;
+
+namespace System.Runtime.Remoting.Messaging
+{
+    public interface IMessageCtrl
+    {
+        void Cancel (int msToCancel);
+    }
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMessageSink.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMessageSink.cs
new file mode 100644
index 00000000000..8c25aac6b24
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMessageSink.cs
@@ -0,0 +1,21 @@
+//
+// System.Runtime.Remoting.Messaging.IMessageSink.cs
+//
+// Author:
+//   Piers Haken (piersh@friskit.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Remoting;
+
+namespace System.Runtime.Remoting.Messaging
+{
+    public interface IMessageSink
+    {
+        IMessage SyncProcessMessage (IMessage msg);
+        IMessageCtrl AsyncProcessMessage (IMessage msg, IMessageSink replySink);
+        IMessageSink NextSink { get; }
+    }
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodCallMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodCallMessage.cs
new file mode 100644
index 00000000000..0f0846ca663
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodCallMessage.cs
@@ -0,0 +1,28 @@
+//
+// System.Runtime.Remoting.Messaging.IMethodCallMessage.cs
+//
+// Author:
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Reflection;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	public interface IMethodCallMessage : IMethodMessage, IMessage {
+
+		int InArgCount {
+			get;
+		}
+		
+		object [] InArgs {
+			get;
+		}
+		
+		object GetInArg (int arg_num);
+		string GetInArgName (int arg_num);
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodMessage.cs
new file mode 100644
index 00000000000..4bb33473022
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodMessage.cs
@@ -0,0 +1,55 @@
+//
+// System.Runtime.Remoting.Messaging.IMethodMessage..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Reflection;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	public interface IMethodMessage : IMessage {
+		int       ArgCount        {
+			get;
+		}
+		
+		object [] Args            {
+			get;
+		}
+		
+		bool      HasVarArgs      {
+			get;
+		}
+
+		LogicalCallContext LogicalCallContext {
+			get;
+		}
+
+		MethodBase MethodBase {
+			get;
+		}
+
+		string MethodName {
+			get;
+		}
+
+		object MethodSignature {
+			get;
+		}
+
+		string TypeName {
+			get;
+		}
+
+		string Uri {
+			get;
+		}
+
+		object GetArg     (int arg_num);
+		string GetArgName (int arg_num);
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodReturnMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodReturnMessage.cs
new file mode 100644
index 00000000000..d059ce9b5fc
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IMethodReturnMessage.cs
@@ -0,0 +1,22 @@
+//
+// System.Runtime.Remoting.Messaging.IMethodReturnMessage..cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Runtime.Remoting.Messaging {
+
+	public interface IMethodReturnMessage : IMethodMessage, IMessage {
+
+		Exception Exception   { get; }
+		int       OutArgCount { get; }
+		object [] OutArgs     { get; }
+		object    ReturnValue { get; }
+
+		object GetOutArg      (int arg_num);
+		string GetOutArgName  (int arg_num);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/IRemotingFormatter.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IRemotingFormatter.cs
new file mode 100644
index 00000000000..ac3af52b2dd
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/IRemotingFormatter.cs
@@ -0,0 +1,20 @@
+//
+// System.Runtime.Remoting.Messaging.IRemotingFormatter..cs
+//
+// Author:
+//   Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.IO;
+using System.Reflection;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	public interface IRemotingFormatter : IFormatter {
+		object Deserialize (Stream serializationStream, HeaderHandler handler);
+		void Serialize (Stream serializationStream, object graph, Header [] handlers); 
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/InternalMessageWrapper.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/InternalMessageWrapper.cs
new file mode 100644
index 00000000000..1303f595c77
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/InternalMessageWrapper.cs
@@ -0,0 +1,22 @@
+//
+// System.Runtime.Remoting.Messaging.InternalMessageWrapper.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	public class InternalMessageWrapper
+	{
+		public InternalMessageWrapper (IMessage msg)
+		{
+			WrappedMessage = msg;
+		}
+
+		protected IMessage WrappedMessage;
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
new file mode 100644
index 00000000000..a9e44a0ca4b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/LogicalCallContext.cs
@@ -0,0 +1,43 @@
+//

+// System.Runtime.Remoting.Messaging.LogicalCallContext.cs

+//

+// Author:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+// Stubbed.

+//

+

+using System.Runtime.Serialization;

+

+namespace System.Runtime.Remoting.Messaging {

+

+	[MonoTODO]

+	[Serializable]
+	public sealed class LogicalCallContext : ISerializable, ICloneable {

+
+		internal LogicalCallContext () {}
+
+		public bool HasInfo {

+			get { return false; }

+		}

+

+		public void FreeNamedDataSlot (string name) {

+		}

+

+		public object GetData (string name) {

+			return null;

+		}

+

+		public void GetObjectData (SerializationInfo info, StreamingContext context) {

+		}

+

+		public void SetData (string name, object data) {

+		}

+

+		public object Clone () {

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MessageSurrogateFilter.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MessageSurrogateFilter.cs
new file mode 100644
index 00000000000..df77f3b30d0
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MessageSurrogateFilter.cs
@@ -0,0 +1,13 @@
+//
+// System.Runtime.Remoting.Messaging.MessageSurrogateFilter.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) 2002, Copyright. Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Messaging {
+
+	[Serializable]
+	public delegate bool MessageSurrogateFilter (string key, object value);
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
new file mode 100644
index 00000000000..3c007d4ec15
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCall.cs
@@ -0,0 +1,145 @@
+//
+// System.Runtime.Remoting.Messaging.MethodCall.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	[Serializable] [CLSCompliant (false)]
+	public class MethodCall : IMethodCallMessage, IMethodMessage, IMessage, ISerializable
+	{
+		public MethodCall (Header [] headers)
+		{
+		}
+
+		public MethodCall (IMessage msg)
+		{
+		}
+
+		protected IDictionary ExternalProperties;
+		protected IDictionary InternalProperties;
+
+		[MonoTODO]
+		public int ArgCount {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public object[] Args {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public bool HasVarArgs {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public int InArgCount {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public object[] InArgs {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public LogicalCallContext LogicalCallContext {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public MethodBase MethodBase {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public string MethodName {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public object MethodSignature {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public virtual IDictionary Properties {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public string TypeName {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public string Uri {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public object GetArg (int argNum)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string GetArgName (int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public object GetInArg (int argNum)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string GetInArgName (int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		} 
+
+		[MonoTODO]
+		public virtual object HeaderHandler (Header[] h)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void Init ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void ResolveMethod ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RootSetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		} 
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs
new file mode 100644
index 00000000000..382e730a100
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs
@@ -0,0 +1,109 @@
+//
+// System.Runtime.Remoting.Messaging.MethodCallMessageWrapper.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	public class MethodCallMessageWrapper : InternalMessageWrapper, IMethodCallMessage, IMethodMessage, IMessage
+	{
+		public MethodCallMessageWrapper (IMethodCallMessage msg)
+			: base (msg)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public virtual int ArgCount {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object [] Args {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public virtual bool HasVarArgs {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual int InArgCount {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object [] InArgs {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public virtual LogicalCallContext LogicalCallContext {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public virtual MethodBase MethodBase {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual string MethodName {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object MethodSignature {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public virtual IDictionary Properties {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual string TypeName {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual string Uri {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object GetArg (int argNum)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual string GetArgName (int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual object GetInArg (int argNum)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual string GetInArgName (int index)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
new file mode 100644
index 00000000000..5aed0278e78
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodResponse.cs
@@ -0,0 +1,139 @@
+//
+// System.Runtime.Remoting.Messaging.MethodResponse.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	[Serializable] [CLSCompliant (false)]
+	public class MethodResponse : IMethodReturnMessage, IMethodMessage, IMessage, ISerializable
+	{
+		public MethodResponse (Header[] headers, IMethodCallMessage mcm)
+		{
+		}
+
+		protected IDictionary ExternalProperties;
+		protected IDictionary InternalProperties;
+
+		[MonoTODO]
+		public int ArgCount {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public object[] Args {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public Exception Exception {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public bool HasVarArgs {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public LogicalCallContext LogicalCallContext {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public MethodBase MethodBase {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public string MethodName {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public object MethodSignature {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public int OutArgCount {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public object[] OutArgs {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual IDictionary Properties {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public object ReturnValue {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public string TypeName {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public string Uri {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public object GetArg (int argNum)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string GetArgName (int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		} 
+
+		[MonoTODO]
+		public object GetOutArg (int argNum)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string GetOutArgName (int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual object HeaderHandler (Header[] h)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RootSetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		} 
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs
new file mode 100644
index 00000000000..a6058e512f7
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs
@@ -0,0 +1,142 @@
+//
+// System.Runtime.Remoting.Messaging.MethodReturnMessageWrapper.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	public class MethodReturnMessageWrapper : InternalMessageWrapper, IMethodReturnMessage, IMethodMessage, IMessage
+	{
+
+		[MonoTODO]
+		public MethodReturnMessageWrapper (IMethodReturnMessage msg)
+			: base (msg)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual int ArgCount {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object[] Args {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual Exception Exception {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public virtual bool HasVarArgs {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public virtual LogicalCallContext LogicalCallContext {
+			get { throw new NotImplementedException (); }
+		}
+		
+		[MonoTODO]
+		public virtual MethodBase MethodBase {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual string MethodName {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object MethodSignature {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual int OutArgCount {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object[] OutArgs {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual IDictionary Properties {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object ReturnValue {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual string TypeName {
+			get { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public string Uri {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual object GetArg (int argNum)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual string GetArgName (int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		} 
+
+		[MonoTODO]
+		public virtual object GetOutArg (int argNum)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual string GetOutArgName (int index)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual object HeaderHandler (Header[] h)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void RootSetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		} 
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
new file mode 100644
index 00000000000..5f496b8faf4
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
@@ -0,0 +1,235 @@
+//
+// System.Runtime.Remoting.Messaging.MonoMethodMessage.cs
+//
+// Author:
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace System.Runtime.Remoting.Messaging {
+	
+	internal class MonoMethodMessage : IMethodCallMessage, IMethodReturnMessage {
+
+		MonoMethod method;
+
+		object []  args;
+
+		string []  names;
+
+		byte [] arg_types; /* 1 == IN; 2 == OUT ; 3 = INOUT */
+
+		public LogicalCallContext ctx;
+
+		public object rval;
+
+		public Exception exc;
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal extern void InitMessage (MonoMethod method, object [] out_args);
+
+		public MonoMethodMessage (MonoMethod method, object [] out_args)
+		{
+			InitMessage (method, out_args);			
+		}
+		
+		public IDictionary Properties {
+			get {
+				return null;
+			}
+		}
+
+		public int ArgCount {
+			get {
+				return args.Length;
+			}
+		}
+		
+		public object [] Args {
+			get {
+				return args;
+			}
+		}
+		
+		public bool HasVarArgs {
+			get {
+				return false;
+			}
+		}
+
+		public LogicalCallContext LogicalCallContext {
+			get {
+				return ctx;
+			}
+		}
+
+		public MethodBase MethodBase {
+			get {
+				return method;
+			}
+		}
+
+		public string MethodName {
+			get {
+				return method.Name;
+			}
+		}
+
+		public object MethodSignature {
+			get {
+				return null;
+			}
+		}
+
+		public string TypeName {
+			get {
+				return null;
+			}
+		}
+
+		public string Uri {
+			get {
+				return null;
+			}
+
+			set {
+			}
+		}
+
+		public object GetArg (int arg_num)
+		{
+			return args [arg_num];
+		}
+		
+		public string GetArgName (int arg_num)
+		{
+			return names [arg_num];
+		}
+
+		public int InArgCount {
+			get {
+				int count = 0;
+
+				foreach (byte t in arg_types) {
+					if ((t & 1) != 0) count++;
+						
+				}
+				return count;
+			}
+		}
+		
+		public object [] InArgs {
+			get {
+				int i, j, count = InArgCount;
+				object [] inargs = new object [count];
+
+				i = j = 0;
+				foreach (byte t in arg_types) {
+					if ((t & 1) != 0)
+						inargs [j++] = args [i];
+					i++;
+				}
+				
+				return inargs;
+			}
+		}
+		
+		public object GetInArg (int arg_num)
+		{
+			int i = 0, j = 0;
+			foreach (byte t in arg_types) {
+				if ((t & 1) != 0) {
+					if (j++ == arg_num)
+						return args [i]; 
+				}
+				i++;
+			}
+			return null;
+		}
+		
+		public string GetInArgName (int arg_num)
+		{
+			int i = 0, j = 0;
+			foreach (byte t in arg_types) {
+				if ((t & 1) != 0) {
+					if (j++ == arg_num)
+						return names [i]; 
+				}
+				i++;
+			}
+			return null;
+		}
+
+		public Exception Exception {
+			get {
+				return exc;
+			}
+		}
+		
+		public int OutArgCount {
+			get {
+				int count = 0;
+
+				foreach (byte t in arg_types) {
+					if ((t & 2) != 0) count++;
+						
+				}
+				return count;
+			}
+		}
+		
+		public object [] OutArgs {
+			get {
+				int i, j, count = OutArgCount;
+				object [] outargs = new object [count];
+
+				i = j = 0;
+				foreach (byte t in arg_types) {
+					if ((t & 2) != 0)
+						outargs [j++] = args [i];
+					i++;
+				}
+				
+				return outargs;
+			}
+		}
+		
+		public object ReturnValue {
+			get {
+				return rval;
+			}
+		}
+
+		public object GetOutArg (int arg_num)
+		{
+			int i = 0, j = 0;
+			foreach (byte t in arg_types) {
+				if ((t & 2) != 0) {
+					if (j++ == arg_num)
+						return args [i]; 
+				}
+				i++;
+			}
+			return null;
+		}
+		
+		public string GetOutArgName (int arg_num)
+		{
+			int i = 0, j = 0;
+			foreach (byte t in arg_types) {
+				if ((t & 2) != 0) {
+					if (j++ == arg_num)
+						return names [i]; 
+				}
+				i++;
+			}
+			return null;
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/OneWayAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/OneWayAttribute.cs
new file mode 100644
index 00000000000..54910723b0a
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/OneWayAttribute.cs
@@ -0,0 +1,20 @@
+//
+// System.Runtime.Remoting.Messaging.OneWayAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	public class OneWayAttribute : Attribute
+	{
+		public OneWayAttribute ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs
new file mode 100644
index 00000000000..d3ae17f2914
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs
@@ -0,0 +1,66 @@
+//
+// System.Runtime.Remoting.Messaging.RemotingSurrogateSelector.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	public class RemotingSurrogateSelector : ISurrogateSelector
+	{
+		public RemotingSurrogateSelector ()
+		{
+		}
+		
+		[MonoTODO]
+		public MessageSurrogateFilter Filter {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public virtual void ChainSelector (ISurrogateSelector selector)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual ISurrogateSelector GetNextSelector()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public object GetRootObject ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual ISerializationSurrogate GetSurrogate (
+			Type type, StreamingContext context, out ISurrogateSelector ssout)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void SetRootObject (object obj)
+		{
+			if (obj == null)
+				throw new ArgumentNullException ();
+			
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public virtual void UseSoapFormat ()
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
new file mode 100644
index 00000000000..7206ab6e090
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Messaging/ReturnMessage.cs
@@ -0,0 +1,150 @@
+//
+// System.Runtime.Remoting.Messaging.ReturnMessage.cs
+//
+// Author:
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+
+namespace System.Runtime.Remoting.Messaging {
+
+	public class ReturnMessage : IMethodReturnMessage, IMethodMessage {
+
+		MonoMethodMessage msg;
+		IMethodCallMessage request;
+		
+		public ReturnMessage (object returnValue, object [] outArgs,
+			       int outArgCount, LogicalCallContext callCtx,
+			       IMethodCallMessage request)
+		{
+			// fixme: why do we need outArgCount?
+			msg = new MonoMethodMessage ((MonoMethod)request.MethodBase, outArgs);
+			this.request = request;
+			msg.rval = returnValue;
+			msg.ctx = callCtx;
+		}
+
+		public ReturnMessage (Exception exc, IMethodCallMessage request)
+		{
+			msg = new MonoMethodMessage ((MonoMethod)request.MethodBase, null);
+			this.request = request;
+			msg.exc = exc;
+			msg.ctx = request.LogicalCallContext;
+		}
+		
+		public int ArgCount {
+			get {
+				return msg.ArgCount;
+			}
+		}
+		
+		public object [] Args {
+			get {
+				return msg.Args;
+			}
+		}
+		
+		public bool HasVarArgs {
+			get {
+				return msg.HasVarArgs;
+			}
+		}
+
+		public LogicalCallContext LogicalCallContext {
+			get {
+				return msg.ctx;
+			}
+		}
+
+		public MethodBase MethodBase {
+			get {
+				return msg.MethodBase;
+			}
+		}
+
+		public string MethodName {
+			get {
+				return msg.MethodName;
+			}
+		}
+
+		public object MethodSignature {
+			get {
+				return msg.MethodSignature;
+			}
+		}
+
+		[MonoTODO]
+		public virtual IDictionary Properties {
+			get {
+				return null;
+			}
+		}
+
+		public string TypeName {
+			get {
+				return msg.TypeName;
+			}
+		}
+
+		public string Uri {
+			get {
+				return msg.Uri;
+			}
+
+			set {
+				msg.Uri = value;
+			}
+		}
+
+		public object GetArg (int arg_num)
+		{
+			return msg.GetArg (arg_num);
+		}
+		
+		public string GetArgName (int arg_num)
+		{
+			return msg.GetArgName (arg_num);
+		}
+
+		public Exception Exception {
+			get {
+				return msg.exc;
+			}
+		}
+
+		public int OutArgCount {
+			get {
+				return msg.OutArgCount;
+			}
+		}
+
+		public object [] OutArgs {
+			get {
+				return msg.OutArgs;
+			}
+		}
+
+		public virtual object ReturnValue {
+			get {
+				return msg.rval;
+			}
+		}
+
+		public object GetOutArg (int arg_num)
+		{
+			return msg.GetOutArg (arg_num);
+		}
+
+		public string GetOutArgName (int arg_num)
+		{
+			return msg.GetOutArgName (arg_num);
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Metadata/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Metadata/ChangeLog
new file mode 100644
index 00000000000..9669e4ef58a
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Metadata/ChangeLog
@@ -0,0 +1,16 @@
+2002-07-29  Duncan Mak  <duncan@ximian.com>
+
+	* SoapAttribute.cs: Fixed typo, renamed ReflectionInfo to ReflectInfo.
+
+	* SoapOption.cs: Fix the namespace.
+
+2002-07-24  Duncan Mak  <duncan@ximian.com>
+
+	* SoapAttribute.cs: 
+	* SoapFieldAttribute.cs: 
+	* SoapMethodAttribute.cs: 
+	* SoapParameterAttribute.cs: 
+	* SoapTypeAttribute.cs: Stubbed out.
+
+	* SoapOption.cs: 
+	* XmlFieldOrderOption.cs: Moved here from System.Runtime.Remoting
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapAttribute.cs
new file mode 100644
index 00000000000..c84d8d8bfe4
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapAttribute.cs
@@ -0,0 +1,55 @@
+//
+// System.Runtime.Remoting.Metadata.SoapAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.Remoting.Metadata {
+
+	public class SoapAttribute : Attribute
+	{
+		public SoapAttribute ()
+		{
+		}
+
+		protected string ProtXmlNamespace;
+		protected object ReflectInfo;
+
+		[MonoTODO]
+		public virtual bool Embedded {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public virtual bool UseAttribute {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public virtual string XmlNamespace {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapFieldAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapFieldAttribute.cs
new file mode 100644
index 00000000000..8809748b259
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapFieldAttribute.cs
@@ -0,0 +1,48 @@
+//
+// System.Runtime.Remoting.Metadata.SoapFieldAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Runtime.Remoting.Metadata;
+
+namespace System.Runtime.Remoting.Metadata {
+
+	[AttributeUsage (AttributeTargets.Field)]
+	public sealed class SoapFieldAttribute : SoapAttribute
+	{
+		public SoapFieldAttribute ()
+		{
+		}
+
+		[MonoTODO]
+		public int Order {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+		
+		[MonoTODO]
+		public string XmlElementName {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public bool IsInteropXmlElement ()
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapMethodAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapMethodAttribute.cs
new file mode 100644
index 00000000000..a3b39de29fa
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapMethodAttribute.cs
@@ -0,0 +1,87 @@
+//
+// System.Runtime.Remoting.Metadata.SoapMethodAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Remoting.Metadata;
+
+namespace System.Runtime.Remoting.Metadata {
+
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class SoapMethodAttribute : SoapAttribute
+	{
+		public SoapMethodAttribute ()
+		{
+		}
+
+		[MonoTODO]
+		public string ResponseXmlElementName {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+		
+		[MonoTODO]
+		public string ResponseXmlNamespace {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public string ReturnXmlElementName {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public string SoapAction {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public override bool UseAttribute {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public override string XmlNamespace {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapOption.cs b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapOption.cs
new file mode 100644
index 00000000000..2957bd3f66b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapOption.cs
@@ -0,0 +1,47 @@
+// SoapOption.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:41:11 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Remoting.Metadata {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum SoapOption {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		AlwaysIncludeTypes = 1,
+
+		/// <summary>
+		/// </summary>
+		XsdString = 2,
+
+		/// <summary>
+		/// </summary>
+		EmbedAll = 4,
+
+		/// <summary>
+		/// </summary>
+		Option1 = 8,
+
+		/// <summary>
+		/// </summary>
+		Option2 = 16,
+
+	} // SoapOption
+
+} // System.Runtime.Remoting.Metadata
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapParameterAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapParameterAttribute.cs
new file mode 100644
index 00000000000..8c53067b1f2
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapParameterAttribute.cs
@@ -0,0 +1,20 @@
+//
+// System.Runtime.Remoting.Metadata.SoapParameterAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Runtime.Remoting.Metadata;
+
+namespace System.Runtime.Remoting.Metadata {
+
+	[AttributeUsage (AttributeTargets.Parameter)]
+	public sealed class SoapParameterAttribute : SoapAttribute
+	{
+		public SoapParameterAttribute ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapTypeAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapTypeAttribute.cs
new file mode 100644
index 00000000000..2e015537312
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Metadata/SoapTypeAttribute.cs
@@ -0,0 +1,99 @@
+//
+// System.Runtime.Remoting.Metadata.SoapTypeAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Remoting.Metadata;
+
+namespace System.Runtime.Remoting.Metadata {
+
+	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct |
+			 AttributeTargets.Enum | AttributeTargets.Interface)]
+	public sealed class SoapTypeAttribute : SoapAttribute
+	{
+		public SoapTypeAttribute ()
+		{
+		}
+
+		[MonoTODO]
+		public SoapOption SoapOptions {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public override bool UseAttribute {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public string XmlElementName {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public XmlFieldOrderOption XmlFieldOrder {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public override string XmlNamespace {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public string XmlTypeName {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+
+		[MonoTODO]
+		public string XmlTypeNamespace {
+			get {
+				throw new NotImplementedException ();
+			}
+
+			set {
+				throw new NotImplementedException ();
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Metadata/XmlFieldOrderOption.cs b/mcs/class/corlib/System.Runtime.Remoting.Metadata/XmlFieldOrderOption.cs
new file mode 100644
index 00000000000..cb7719c926a
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Metadata/XmlFieldOrderOption.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.Metadata.XmlFieldOrderOption.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+namespace System.Runtime.Remoting.Metadata {
+
+	public enum XmlFieldOrderOption
+	{
+		All = 0,
+		Sequence = 1,
+		Choice = 2,
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Proxies/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Proxies/ChangeLog
new file mode 100644
index 00000000000..951464c0c62
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Proxies/ChangeLog
@@ -0,0 +1,10 @@
+2002-07-24  Duncan Mak  <duncan@ximian.com>
+
+	* ProxyAttribute.cs: Revert the last commit.
+
+	* System.Runtime.Remoting.Proxies/ProxyAttribute.cs: This
+	implements IContextAttribute.
+
+2002-07-23  Duncan Mak  <duncan@ximian.com>	
+	
+	* System.Runtime.Remoting.Proxies/ProxyAttribute.cs: Added.
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Proxies/ProxyAttribute.cs b/mcs/class/corlib/System.Runtime.Remoting.Proxies/ProxyAttribute.cs
new file mode 100644
index 00000000000..34314255574
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Proxies/ProxyAttribute.cs
@@ -0,0 +1,48 @@
+//
+// System.Runtime.Remoting.Proxies.ProxyAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// Copyright (C) Ximian, Inc 2002.
+//
+
+using System;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Activation;
+using System.Runtime.Remoting.Contexts;
+
+namespace System.Runtime.Remoting.Proxies {
+
+	[AttributeUsage (AttributeTargets.Class)]
+	public class ProxyAttribute : Attribute, IContextAttribute
+	{
+		public ProxyAttribute ()
+		{
+		}
+
+		[MonoTODO]
+		public virtual MarshalByRefObject CreateInstance (Type serverType)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public virtual RealProxy CreateProxy (ObjRef objref, Type serverType, object serverObject, Context serverContext)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void GetPropertiesForNewContext (IConstructionCallMessage msg)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public bool IsContextOK (Context ctx, IConstructionCallMessage msg)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
new file mode 100644
index 00000000000..16131866bc4
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RealProxy.cs
@@ -0,0 +1,56 @@
+//
+// System.Runtime.Remoting.Proxies.RealProxy.cs
+//
+// Authors:
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.Remoting.Messaging;
+using System.Runtime.CompilerServices;
+
+
+namespace System.Runtime.Remoting.Proxies
+{
+	internal class TransparentProxy {
+		public RealProxy _rp;
+		IntPtr _class;
+	}
+	
+	public abstract class RealProxy {
+
+		Type class_to_proxy;
+
+		protected RealProxy () {
+			throw new NotImplementedException ();
+		}
+
+		protected RealProxy (Type classToProxy) {
+			this.class_to_proxy = classToProxy;
+		}
+
+		protected RealProxy (Type classToProxy, IntPtr stub, object stubData) {
+			throw new NotImplementedException ();
+		}
+
+		public abstract IMessage Invoke (IMessage msg);
+
+		/* this is called from unmanaged code */
+		internal static object PrivateInvoke (RealProxy rp, IMessage msg, out Exception exc,
+						      out object [] out_args)
+		{
+			IMethodReturnMessage res_msg = (IMethodReturnMessage)rp.Invoke (msg);
+
+			exc = res_msg.Exception;
+			out_args = res_msg.OutArgs;
+			return res_msg.ReturnValue;
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern virtual object GetTransparentProxy ();
+		
+	}
+
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Proxies/RemotingProxy.cs b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RemotingProxy.cs
new file mode 100644
index 00000000000..06eeb0dbae6
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Proxies/RemotingProxy.cs
@@ -0,0 +1,35 @@
+//
+// System.Runtime.Remoting.Proxies.RemotingProxy.cs
+//
+// Authors:
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.Remoting.Messaging;
+using System.Runtime.Remoting.Channels;
+using System.Runtime.CompilerServices;
+
+
+namespace System.Runtime.Remoting.Proxies
+{
+
+	public class RemotingProxy : RealProxy {
+
+		IMessageSink sink;
+		
+		
+		public RemotingProxy (Type type, IMessageSink sink) : base (type)
+		{
+			this.sink = sink;
+		}
+
+		public override IMessage Invoke (IMessage request)
+		{
+			return sink.SyncProcessMessage (request);
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Services/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting.Services/ChangeLog
new file mode 100644
index 00000000000..de655e4b575
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Services/ChangeLog
@@ -0,0 +1,3 @@
+2002-07-30  Duncan Mak  <duncan@ximian.com>
+
+	* ITrackingHandler.cs: Added to CVS.
diff --git a/mcs/class/corlib/System.Runtime.Remoting.Services/ITrackingHandler.cs b/mcs/class/corlib/System.Runtime.Remoting.Services/ITrackingHandler.cs
new file mode 100644
index 00000000000..4b59184d0e9
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting.Services/ITrackingHandler.cs
@@ -0,0 +1,19 @@
+//
+// System.Runtime.Remoting.Services.ITrackingHandler.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System.Runtime.Remoting;
+
+namespace System.Runtime.Remoting.Services {
+	public interface ITrackingHandler
+	{
+		void DisconnectedObject (object obj);
+		void MarshaledObject (object obj, ObjRef or);
+		void UnmarshaledObject (object obj, ObjRef or);
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting/ActivatedClientTypeEntry.cs b/mcs/class/corlib/System.Runtime.Remoting/ActivatedClientTypeEntry.cs
new file mode 100644
index 00000000000..404f2f9e86c
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/ActivatedClientTypeEntry.cs
@@ -0,0 +1,54 @@
+//
+// System.Runtime.Remoting.ActivatedClientTypeEntry.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Contexts;
+
+namespace System.Runtime.Remoting {
+
+	public class ActivatedClientTypeEntry : TypeEntry
+	{
+		string applicationUrl;
+		Type obj_type;
+		
+		public ActivatedClientTypeEntry (Type type, string appUrl)
+		{
+			AssemblyName = type.Assembly.FullName;
+			TypeName = type.FullName;
+			applicationUrl = appUrl;
+			obj_type = type;
+		}
+
+		public ActivatedClientTypeEntry (string typeName, string assemblyName, string appUrl)
+		{
+			AssemblyName = assemblyName;
+			TypeName = typeName;
+			applicationUrl = appUrl;
+		}
+
+		public string ApplicationUrl {
+			get { return applicationUrl; }
+		}
+
+		public IContextAttribute [] ContextAttributes {
+			get { return null; }
+			set { } // This is not implemented in the MS runtime yet.
+		}
+
+		public Type ObjectType {
+			get { return obj_type; }
+		}
+
+		[MonoTODO]
+		public override string ToString ()
+		{
+			return TypeName + AssemblyName + ApplicationUrl;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/ActivatedServiceTypeEntry.cs b/mcs/class/corlib/System.Runtime.Remoting/ActivatedServiceTypeEntry.cs
new file mode 100644
index 00000000000..bf0365cbfb6
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/ActivatedServiceTypeEntry.cs
@@ -0,0 +1,50 @@
+//
+// System.Runtime.Remoting.ActivatedServiceTypeEntry.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Contexts;
+
+namespace System.Runtime.Remoting {
+
+	public class ActivatedServiceTypeEntry : TypeEntry
+	{
+		Type obj_type;
+		
+		public ActivatedServiceTypeEntry (Type type)			
+		{
+			AssemblyName = type.Assembly.FullName;
+			TypeName = type.FullName;
+			obj_type = type;
+		}
+
+		public ActivatedServiceTypeEntry (string typeName, string assemblyName)
+		{
+			AssemblyName = assemblyName;
+			TypeName = typeName;
+			Assembly a = Assembly.Load (assemblyName);
+			obj_type = a.GetType (typeName);
+		}
+		
+		public IContextAttribute [] ContextAttributes {
+			get { return null; }
+			set { } // This is not implemented in the MS runtime yet.
+		}
+
+		public Type ObjectType {
+			get { return obj_type; }
+		}
+
+		[MonoTODO]
+		public override string ToString ()
+		{
+			return AssemblyName + TypeName;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/ChangeLog b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
new file mode 100755
index 00000000000..a5aa4d122da
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/ChangeLog
@@ -0,0 +1,47 @@
+2002-08-20  Dietmar Maurer  <dietmar@ximian.com>
+
+	* RemotingServices.cs: Connect impl. 
+
+2002-08-02  Duncan Mak  <duncan@ximian.com>
+
+	* ActivatedClientTypeEntry.cs:
+	* ActivatedServiceTypeEntry.cs:
+	* WellKnownClientTypeEntry.cs:
+	* WellKnownServiceTypeEntry.cs: Various visibility fixes.
+
+2002-07-31  Duncan Mak  <duncan@ximian.com>
+
+	* TypeEntry.cs:
+	* ActivatedClientTypeEntry.cs:
+	* ActivatedServiceTypeEntry.cs:
+	* WellKnownClientTypeEntry.cs:
+	* WellKnownServiceTypeEntry.cs: Added all the classes derived from TypeEntry.
+
+	* RemotingException.cs: 
+	* RemotingTimeoutException.cs: 
+	* ServerException.cs: Added missing exceptions.
+
+	* IChannelInfo.cs: 
+	* IEnvoyInfo.cs: 
+	* IRemotingTypeInfo.cs: Added missing interfaces.
+
+2002-07-24  Duncan Mak  <duncan@ximian.com>
+
+	* LeaseState.cs: Moved to System.Runtime.Remoting.Lifetime.
+
+	* SoapMethodOption.cs: 
+	* SoapOption.cs: Removed and merged into System.Runtime.Remoting.Metadata.SoapOption.
+
+2002-07-09  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IObjectHandle.cs: New file.
+	* ObjectHandle.cs: implemented constructor and Unwrap.
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* ObjRef.cs : Strew the MonoTODO attribute.
+
+2001-09-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* ObjRef.cs: Include System.Runtime.Serialization
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting/IChannelInfo.cs b/mcs/class/corlib/System.Runtime.Remoting/IChannelInfo.cs
new file mode 100644
index 00000000000..643d56955f0
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/IChannelInfo.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.IChannelInfo.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.Remoting {
+
+	public interface IChannelInfo
+	{
+		object[] ChannelData { get; set; }
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/IEnvoyInfo.cs b/mcs/class/corlib/System.Runtime.Remoting/IEnvoyInfo.cs
new file mode 100644
index 00000000000..d66709ae621
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/IEnvoyInfo.cs
@@ -0,0 +1,17 @@
+//
+// System.Runtime.Remoting.IEnvoyInfo.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting {
+
+	public interface IEnvoyInfo
+	{
+		IMessageSink EnvoySinks { get; set; }
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/IObjectHandle.cs b/mcs/class/corlib/System.Runtime.Remoting/IObjectHandle.cs
new file mode 100644
index 00000000000..20bf4bc4907
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/IObjectHandle.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.Remoting.IObjectHandle.cs
+//
+// Authors:
+//	Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Runtime.Remoting
+{
+	public interface IObjectHandle
+	{
+		object Unwrap ();
+	}
+	
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Remoting/IRemotingTypeInfo.cs b/mcs/class/corlib/System.Runtime.Remoting/IRemotingTypeInfo.cs
new file mode 100644
index 00000000000..eb4e9d314f8
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/IRemotingTypeInfo.cs
@@ -0,0 +1,18 @@
+//
+// System.Runtime.Remoting.IRemotingTypeInfo.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Remoting {
+
+	public interface IRemotingTypeInfo
+	{
+		string TypeName { get; set; }
+		bool CanCastTo (Type fromType, object o);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs b/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs
new file mode 100644
index 00000000000..6f564878969
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/ObjRef.cs
@@ -0,0 +1,72 @@
+//
+// System.Runtime.Remoting.ObjRef.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+// FIXME: This is just a skeleton for practical purposes.
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Remoting {
+
+	[Serializable]
+	public class ObjRef : IObjectReference, ISerializable {
+		MarshalByRefObject mbr;
+		SerializationInfo si;
+		Type type;
+		
+		public ObjRef ()
+		{
+		}
+		
+		public ObjRef (MarshalByRefObject mbr, Type type)
+		{
+			this.mbr = mbr;
+			this.type = type;
+		}
+
+		[MonoTODO]
+		protected ObjRef (SerializationInfo si, StreamingContext sc)
+		{
+			// FIXME: Implement.
+			//
+			// This encarnates the object from serialized data.
+		}
+
+		[MonoTODO]
+		public virtual void GetObjectData (SerializationInfo si, StreamingContext sc)
+		{
+			// FIXME:
+		}
+
+		[MonoTODO]
+		public virtual object GetRealObject (StreamingContext sc)
+		{
+			// FIXME:
+			
+			return null;
+		}
+
+		[MonoTODO]
+		public bool IsFromThisAppDomain ()
+		{
+			// FIXME:
+			
+			return true;
+		}
+
+		[MonoTODO]
+		public bool IsFromThisProcess ()
+		{
+			// FIXME:
+			
+			return true;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/ObjectHandle.cs b/mcs/class/corlib/System.Runtime.Remoting/ObjectHandle.cs
new file mode 100644
index 00000000000..ed080a105c2
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/ObjectHandle.cs
@@ -0,0 +1,37 @@
+//
+// System.Runtime.Remoting.ObjectHandle.cs
+//
+// Authors:
+//   Dietmar Maurer (dietmar@ximian.com)
+//   Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Remoting {
+
+	public class ObjectHandle : MarshalByRefObject, IObjectHandle {
+		private object _wrapped;
+		
+		public ObjectHandle (object o)
+		{
+			_wrapped = o;
+		}
+
+		[MonoTODO]
+		public override object InitializeLifetimeService ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public object Unwrap ()
+		{
+			return _wrapped;
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingException.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingException.cs
new file mode 100644
index 00000000000..5e099f38d89
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingException.cs
@@ -0,0 +1,37 @@
+//
+// System.Runtime.Remoting.RemotingException.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Remoting {
+
+	[Serializable]
+	public class RemotingException : SystemException
+	{
+		public RemotingException ()
+			: base ()
+		{
+		}
+
+		public RemotingException (string message)
+			: base (message)
+		{
+		}
+
+		protected RemotingException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+
+		public RemotingException (string message, Exception ex)
+			: base (message, ex)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
new file mode 100644
index 00000000000..a7f3a887959
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingServices.cs
@@ -0,0 +1,78 @@
+//
+// System.Runtime.Remoting.RemotingServices.cs
+//
+// Authors:
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.Remoting.Messaging;
+using System.Runtime.Remoting.Proxies;
+using System.Runtime.Remoting.Channels;
+using System.Runtime.CompilerServices;
+
+namespace System.Runtime.Remoting
+{
+	public sealed class RemotingServices {
+
+		private RemotingServices () {}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal extern static object InternalExecute (MonoMethod method, Object obj,
+							       Object[] parameters, out object [] out_args);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static bool IsTransparentProxy (object proxy);
+		
+		public static IMethodReturnMessage ExecuteMessage (
+		        MarshalByRefObject target, IMethodCallMessage reqMsg)
+		{
+			ReturnMessage result;
+			
+			MonoMethod method = (MonoMethod)reqMsg.MethodBase;
+
+			try {
+				object [] out_args;
+				object rval = InternalExecute (method, target, reqMsg.Args, out out_args);
+				result = new ReturnMessage (rval, out_args, out_args.Length,
+							    reqMsg.LogicalCallContext, reqMsg);
+			
+			} catch (Exception e) {
+				result = new ReturnMessage (e, reqMsg);
+			}
+
+			return result;
+		}
+
+		public static object Connect (Type classToProxy, string url)
+		{
+			IMessageSink sink = null;
+			string uri;
+			
+			IChannel [] channels = ChannelServices.RegisteredChannels;
+
+			foreach (IChannel c in channels) {
+				IChannelSender sender = c as IChannelSender;
+				
+				if (sender != null) {
+					sink = sender.CreateMessageSink (url, null, out uri);
+
+					if (sink != null)
+						break;
+				}
+			}
+
+			if (sink == null) {
+				string msg = String.Format ("Cannot create channel sink to connect to URL {0}.", url); 
+				throw new RemotingException (msg);
+			}
+
+			RemotingProxy real_proxy = new RemotingProxy (classToProxy, sink);
+
+			return real_proxy.GetTransparentProxy ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/RemotingTimeoutException.cs b/mcs/class/corlib/System.Runtime.Remoting/RemotingTimeoutException.cs
new file mode 100644
index 00000000000..af2f4462c03
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/RemotingTimeoutException.cs
@@ -0,0 +1,32 @@
+//
+// System.Runtime.Remoting.RemotingTimeoutException.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Remoting {
+
+	[Serializable]
+	public class RemotingTimeoutException : RemotingException
+	{
+		public RemotingTimeoutException ()
+			: base ()
+		{
+		}
+
+		public RemotingTimeoutException (string message)
+			: base (message)
+		{
+		}
+
+		public RemotingTimeoutException (string message, Exception ex)
+			: base (message, ex)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/ServerException.cs b/mcs/class/corlib/System.Runtime.Remoting/ServerException.cs
new file mode 100644
index 00000000000..becfb5d6c6e
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/ServerException.cs
@@ -0,0 +1,32 @@
+//
+// System.Runtime.Remoting.ServerException.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Remoting {
+
+	[Serializable]
+	public class ServerException : SystemException
+	{
+		public ServerException ()
+			: base ()
+		{
+		}
+
+		public ServerException (string message)
+			: base (message)
+		{
+		}
+
+		public ServerException (string message, Exception ex)
+			: base (message, ex)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/TypeEntry.cs b/mcs/class/corlib/System.Runtime.Remoting/TypeEntry.cs
new file mode 100644
index 00000000000..a39e848f7fc
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/TypeEntry.cs
@@ -0,0 +1,32 @@
+//
+// System.Runtime.Remoting.TypeEntry.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+
+namespace System.Runtime.Remoting {
+
+	public class TypeEntry
+	{
+		string assembly_name;
+		string type_name;
+		
+		protected TypeEntry ()
+		{
+		}
+
+		public string AssemblyName {
+			get { return assembly_name; }
+			set { assembly_name = value; }
+		}
+
+		public string TypeName {
+			get { return type_name; }
+			set { type_name = value; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/WellKnownClientTypeEntry.cs b/mcs/class/corlib/System.Runtime.Remoting/WellKnownClientTypeEntry.cs
new file mode 100644
index 00000000000..e361bb5a758
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/WellKnownClientTypeEntry.cs
@@ -0,0 +1,57 @@
+//
+// System.Runtime.Remoting.WellKnownClientTypeEntry.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Reflection;
+
+namespace System.Runtime.Remoting {
+
+	public class WellKnownClientTypeEntry : TypeEntry
+	{
+		Type obj_type;
+		string obj_url;
+		string app_url = null;
+		
+		public WellKnownClientTypeEntry (Type type, string objectUrl )
+		{
+			AssemblyName = type.Assembly.FullName;
+			TypeName = type.FullName;
+			obj_type = type;
+			obj_url = objectUrl;
+		}
+
+		public WellKnownClientTypeEntry (string typeName, string assemblyName, string objectUrl)
+		{
+			AssemblyName = assemblyName;
+			TypeName = typeName;
+			Assembly a = Assembly.Load (assemblyName);
+			obj_type = a.GetType (typeName);
+		}
+
+		public string ApplicationUrl {
+			get { return app_url; }
+			set { app_url = value; }
+		}
+
+		public Type ObjectType {
+			get { return obj_type; }
+		}
+
+		public string ObjectUrl {
+			get { return obj_url; }
+		}
+
+		public override string ToString ()
+		{
+			if (ApplicationUrl != null)
+				return TypeName + AssemblyName + ObjectUrl + ApplicationUrl;
+			else
+				return TypeName + AssemblyName + ObjectUrl;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Remoting/WellKnownObjectMode.cs b/mcs/class/corlib/System.Runtime.Remoting/WellKnownObjectMode.cs
new file mode 100755
index 00000000000..24898ead85e
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/WellKnownObjectMode.cs
@@ -0,0 +1,29 @@
+// WellKnownObjectMode.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:40:51 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Remoting {
+
+
+	/// <summary>
+	/// </summary>
+	public enum WellKnownObjectMode {
+
+		/// <summary>
+		/// </summary>
+		Singleton = 1,
+
+		/// <summary>
+		/// </summary>
+		SingleCall = 2,
+	} // WellKnownObjectMode
+
+} // System.Runtime.Remoting
diff --git a/mcs/class/corlib/System.Runtime.Remoting/WellKnownServiceTypeEntry.cs b/mcs/class/corlib/System.Runtime.Remoting/WellKnownServiceTypeEntry.cs
new file mode 100644
index 00000000000..e97b5038ba5
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Remoting/WellKnownServiceTypeEntry.cs
@@ -0,0 +1,64 @@
+//
+// System.Runtime.Remoting.WellKnownServiceTypeEntry.cs
+//
+// AUthor: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright. Ximian, Inc.
+//
+
+using System;
+using System.Reflection;
+using System.Runtime.Remoting.Contexts;
+
+namespace System.Runtime.Remoting {
+
+	public class WellKnownServiceTypeEntry : TypeEntry
+	{
+		Type obj_type;
+		string obj_uri;
+		WellKnownObjectMode obj_mode;
+		
+		public WellKnownServiceTypeEntry (Type type, string objectUri, WellKnownObjectMode mode)			
+		{
+			AssemblyName = type.Assembly.FullName;
+			TypeName = type.FullName;
+			obj_type = type;
+			obj_uri = objectUri;
+			obj_mode = mode;
+		}
+
+		public WellKnownServiceTypeEntry (string typeName, string assemblyName,
+						  string objectUri, WellKnownObjectMode mode)			
+		{
+			AssemblyName = assemblyName;
+			TypeName = typeName;
+			Assembly a = Assembly.Load (assemblyName);
+			obj_type = a.GetType (typeName);
+			obj_uri = objectUri;
+			obj_mode = mode;
+		}
+
+		public IContextAttribute [] ContextAttributes {
+			get { return null; }
+			set { } // This is not implemented in the MS runtime yet.
+		}
+
+		public WellKnownObjectMode Mode {
+			get { return obj_mode; }
+		}
+
+		public Type ObjectType {
+			get { return obj_type; }
+		}
+
+		public string ObjectUri {
+			get { return obj_uri; }
+		}
+
+		[MonoTODO]
+		public override string ToString ()
+		{
+			return TypeName + AssemblyName + ObjectUri;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.cs
new file mode 100755
index 00000000000..a969c926374
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.cs
@@ -0,0 +1,142 @@
+// BinaryFormatter.cs
+//
+// Author:
+//	Dick Porter (dick@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  http://www.ximian.com
+
+using System.Runtime.Serialization.Formatters;
+using System.Runtime.Serialization;
+using System.IO;
+using System.Runtime.Remoting.Messaging;
+
+namespace System.Runtime.Serialization.Formatters.Binary {
+	public sealed class BinaryFormatter : IRemotingFormatter, IFormatter 
+	{
+		private FormatterAssemblyStyle assembly_format;
+		private SerializationBinder binder;
+		private StreamingContext context;
+		private ISurrogateSelector surrogate_selector;
+		private FormatterTypeStyle type_format;
+		
+		public BinaryFormatter()
+		{
+			surrogate_selector=null;
+			context=new StreamingContext(StreamingContextStates.All);
+		}
+		
+		public BinaryFormatter(ISurrogateSelector selector, StreamingContext context)
+		{
+			surrogate_selector=selector;
+			this.context=context;
+		}
+
+		public FormatterAssemblyStyle AssemblyFormat
+		{
+			get {
+				return(assembly_format);
+			}
+			set {
+				assembly_format=value;
+			}
+		}
+
+		public SerializationBinder Binder
+		{
+			get {
+				return(binder);
+			}
+			set {
+				binder=value;
+			}
+		}
+
+		public StreamingContext Context 
+		{
+			get {
+				return(context);
+			}
+			set {
+				context=value;
+			}
+		}
+		
+		public ISurrogateSelector SurrogateSelector 
+		{
+			get {
+				return(surrogate_selector);
+			}
+			set {
+				surrogate_selector=value;
+			}
+		}
+		
+		public FormatterTypeStyle TypeFormat 
+		{
+			get {
+				return(type_format);
+			}
+			set {
+				type_format=value;
+			}
+		}
+
+		[MonoTODO]
+		public object Deserialize(Stream serializationStream)
+		{
+			if(serializationStream==null) {
+				throw new ArgumentNullException("serializationStream is null");
+			}
+			if(serializationStream.CanSeek &&
+			   serializationStream.Length==0) {
+				throw new SerializationException("serializationStream supports seeking, but its length is 0");
+			}
+			
+			return(null);
+		}
+
+		[MonoTODO]
+		public object Deserialize(Stream serializationStream, HeaderHandler handler) 
+		{
+			if(serializationStream==null) {
+				throw new ArgumentNullException("serializationStream is null");
+			}
+			if(serializationStream.CanSeek &&
+			   serializationStream.Length==0) {
+				throw new SerializationException("serializationStream supports seeking, but its length is 0");
+			}
+			
+			return(null);
+		}
+		
+		[MonoTODO]
+		public object DeserializeMethodResponse(Stream serializationStream, HeaderHandler handler, IMethodCallMessage methodCallmessage)
+		{
+			if(serializationStream==null) {
+				throw new ArgumentNullException("serializationStream is null");
+			}
+			if(serializationStream.CanSeek &&
+			   serializationStream.Length==0) {
+				throw new SerializationException("serializationStream supports seeking, but its length is 0");
+			}
+			
+			return(null);
+		}
+
+		[MonoTODO]
+		public void Serialize(Stream serializationStream, object graph)
+		{
+			if(serializationStream==null) {
+				throw new ArgumentNullException("serializationStream is null");
+			}
+		}
+
+		[MonoTODO]
+		public void Serialize(Stream serializationStream, object graph, Header[] headers)
+		{
+			if(serializationStream==null) {
+				throw new ArgumentNullException("serializationStream is null");
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
new file mode 100755
index 00000000000..6e41c6d0981
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters.Binary/ChangeLog
@@ -0,0 +1,10 @@
+2002-08-22  Nick Drochak  <ndrochak@gol.com>
+
+	* BinaryArrayTypeEnum.cs: Removed Non-existent enum (must have been
+	from beta days)
+
+2002-08-18  Dick Porter  <dick@ximian.com>
+
+	* BinaryFormatter.cs: Stubbed out
+	
+
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/ChangeLog b/mcs/class/corlib/System.Runtime.Serialization.Formatters/ChangeLog
new file mode 100644
index 00000000000..8354cf9555b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/ChangeLog
@@ -0,0 +1,20 @@
+2002-08-22  Nick Drochak  <ndrochak@gol.com>
+
+	* SoapFault.cs: Serialization ctr should be private
+
+2002-08-14  Cesar Octavio Lopez Nataren <cesar@ciencias.unam.mx>
+
+	* SoapFault.cs: Added the ctr for ISerializable implementation and
+	implemented GetObjectData.
+
+2002-07-30  Duncan Mak  <duncan@ximian.com>
+
+	* ServerFault.cs: 
+	* SoapFault.cs: 
+	* SoapMessage.cs: Added missing classes.
+
+2002-01-21  David Dawkins <david@dawkins.st>
+
+	* IFieldInfo.cs : New file
+	* ISoapMessage.cs : New file
+
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.cs
new file mode 100755
index 00000000000..944f8a68d2f
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.cs
@@ -0,0 +1,29 @@
+// FormatterAssemblyStyle.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:43:19 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum FormatterAssemblyStyle {
+
+		/// <summary>
+		/// </summary>
+		Simple = 0,
+
+		/// <summary>
+		/// </summary>
+		Full = 1,
+	} // FormatterAssemblyStyle
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterTopObjectStyle.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterTopObjectStyle.cs
new file mode 100755
index 00000000000..2bba90aaafa
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterTopObjectStyle.cs
@@ -0,0 +1,29 @@
+// FormatterTopObjectStyle.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:42:59 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum FormatterTopObjectStyle {
+
+		/// <summary>
+		/// </summary>
+		Object = 0,
+
+		/// <summary>
+		/// </summary>
+		SoapMessage = 1,
+	} // FormatterTopObjectStyle
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterTypeStyle.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterTypeStyle.cs
new file mode 100755
index 00000000000..c719b3eea56
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/FormatterTypeStyle.cs
@@ -0,0 +1,33 @@
+// FormatterTypeStyle.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:43:09 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum FormatterTypeStyle {
+
+		/// <summary>
+		/// </summary>
+		TypesWhenNeeded = 0,
+
+		/// <summary>
+		/// </summary>
+		TypesAlways = 1,
+
+		/// <summary>
+		/// </summary>
+		XsdString = 2,
+	} // FormatterTypeStyle
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/IFieldInfo.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/IFieldInfo.cs
new file mode 100644
index 00000000000..1aba9e2cd14
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/IFieldInfo.cs
@@ -0,0 +1,30 @@
+//

+// System.Runtime.Serialization.Formatters.IFieldInfo

+//

+// Author:

+//   David Dawkins (david@dawkins.st)

+//

+// (C) David Dawkins

+//

+

+namespace System.Runtime.Serialization.Formatters {

+

+	/// <summary>

+	/// Interface for querying field information on serialized objects.</summary>

+	public interface IFieldInfo {

+

+		/// <summary>

+		/// Get or set the field names for serialized objects.</summary>

+		string[] FieldNames {

+			get;

+			set;

+		}

+

+		/// <summary>

+		/// Get or set the field types for serialized objects.</summary>

+		Type[] FieldTypes {

+			get;

+			set;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/ISoapMessage.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/ISoapMessage.cs
new file mode 100644
index 00000000000..f43d55a6a73
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/ISoapMessage.cs
@@ -0,0 +1,60 @@
+//

+// System.Runtime.Serialization.Formatters.ISoapMessage

+//

+// Author:

+//   David Dawkins (david@dawkins.st)

+//

+// (C) David Dawkins

+//

+

+using System.Runtime.Remoting.Messaging;

+

+namespace System.Runtime.Serialization.Formatters {

+

+	/// <summary>

+	/// Interface for making SOAP method calls</summary>

+	public interface ISoapMessage {

+

+		/// <summary>

+		/// Get or set the headers ("out-of-band" data) for the method call</summary>

+		Header[] Headers {

+			get;

+			set;

+		}

+

+		/// <summary>

+		/// Get or set the method name</summary>

+		string MethodName {

+			get;

+			set;

+		}

+

+		/// <summary>

+		/// Get or set the method parameter names</summary

+		string[] ParamNames {

+			get;

+			set;

+		}

+

+		/// <summary>

+		/// Get or set the method parameter types</summary

+		Type[] ParamTypes {

+			get;

+			set;

+		}

+

+		/// <summary>

+		/// Get or set the method parameter values</summary

+		object[]  ParamValues {

+			get;

+			set;

+		}

+

+		/// <summary>

+		/// Get or set the XML namespace for the location of the called object</summary

+		string XmlNameSpace {

+			get;

+			set;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalArrayTypeE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalArrayTypeE.cs
new file mode 100755
index 00000000000..5c8f704520e
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalArrayTypeE.cs
@@ -0,0 +1,41 @@
+// InternalArrayTypeE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:43:29 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalArrayTypeE {
+
+		/// <summary>
+		/// </summary>
+		Empty = 0,
+
+		/// <summary>
+		/// </summary>
+		Single = 1,
+
+		/// <summary>
+		/// </summary>
+		Jagged = 2,
+
+		/// <summary>
+		/// </summary>
+		Rectangular = 3,
+
+		/// <summary>
+		/// </summary>
+		Base64 = 4,
+	} // InternalArrayTypeE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalElementTypeE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalElementTypeE.cs
new file mode 100755
index 00000000000..2112390e67d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalElementTypeE.cs
@@ -0,0 +1,33 @@
+// InternalElementTypeE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:43:49 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalElementTypeE {
+
+		/// <summary>
+		/// </summary>
+		ObjectBegin = 0,
+
+		/// <summary>
+		/// </summary>
+		ObjectEnd = 1,
+
+		/// <summary>
+		/// </summary>
+		Member = 2,
+	} // InternalElementTypeE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalMemberTypeE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalMemberTypeE.cs
new file mode 100755
index 00000000000..4854703471e
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalMemberTypeE.cs
@@ -0,0 +1,37 @@
+// InternalMemberTypeE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:44:09 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalMemberTypeE {
+
+		/// <summary>
+		/// </summary>
+		Empty = 0,
+
+		/// <summary>
+		/// </summary>
+		Header = 1,
+
+		/// <summary>
+		/// </summary>
+		Field = 2,
+
+		/// <summary>
+		/// </summary>
+		Item = 3,
+	} // InternalMemberTypeE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalMemberValueE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalMemberValueE.cs
new file mode 100755
index 00000000000..3459d9e43b5
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalMemberValueE.cs
@@ -0,0 +1,41 @@
+// InternalMemberValueE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:44:18 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalMemberValueE {
+
+		/// <summary>
+		/// </summary>
+		Empty = 0,
+
+		/// <summary>
+		/// </summary>
+		InlineValue = 1,
+
+		/// <summary>
+		/// </summary>
+		Nested = 2,
+
+		/// <summary>
+		/// </summary>
+		Reference = 3,
+
+		/// <summary>
+		/// </summary>
+		Null = 4,
+	} // InternalMemberValueE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalNameSpaceE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalNameSpaceE.cs
new file mode 100755
index 00000000000..6074981b751
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalNameSpaceE.cs
@@ -0,0 +1,61 @@
+// InternalNameSpaceE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:44:28 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalNameSpaceE {
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+
+		/// <summary>
+		/// </summary>
+		Soap = 1,
+
+		/// <summary>
+		/// </summary>
+		XdrPrimitive = 2,
+
+		/// <summary>
+		/// </summary>
+		XdrString = 3,
+
+		/// <summary>
+		/// </summary>
+		UrtSystem = 4,
+
+		/// <summary>
+		/// </summary>
+		UrtUser = 5,
+
+		/// <summary>
+		/// </summary>
+		UserNameSpace = 6,
+
+		/// <summary>
+		/// </summary>
+		MemberName = 7,
+
+		/// <summary>
+		/// </summary>
+		Interop = 8,
+
+		/// <summary>
+		/// </summary>
+		CallElement = 9,
+	} // InternalNameSpaceE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalObjectPositionE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalObjectPositionE.cs
new file mode 100755
index 00000000000..9229202af82
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalObjectPositionE.cs
@@ -0,0 +1,37 @@
+// InternalObjectPositionE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:44:38 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalObjectPositionE {
+
+		/// <summary>
+		/// </summary>
+		Empty = 0,
+
+		/// <summary>
+		/// </summary>
+		Top = 1,
+
+		/// <summary>
+		/// </summary>
+		Child = 2,
+
+		/// <summary>
+		/// </summary>
+		Headers = 3,
+	} // InternalObjectPositionE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalObjectTypeE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalObjectTypeE.cs
new file mode 100755
index 00000000000..986b6bd4bc1
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalObjectTypeE.cs
@@ -0,0 +1,33 @@
+// InternalObjectTypeE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:44:48 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalObjectTypeE {
+
+		/// <summary>
+		/// </summary>
+		Empty = 0,
+
+		/// <summary>
+		/// </summary>
+		Object = 1,
+
+		/// <summary>
+		/// </summary>
+		Array = 2,
+	} // InternalObjectTypeE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalParseStateE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalParseStateE.cs
new file mode 100755
index 00000000000..87627fcc2bb
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalParseStateE.cs
@@ -0,0 +1,37 @@
+// InternalParseStateE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:44:58 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalParseStateE {
+
+		/// <summary>
+		/// </summary>
+		Initial = 0,
+
+		/// <summary>
+		/// </summary>
+		Object = 1,
+
+		/// <summary>
+		/// </summary>
+		Member = 2,
+
+		/// <summary>
+		/// </summary>
+		MemberChild = 3,
+	} // InternalParseStateE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalParseTypeE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalParseTypeE.cs
new file mode 100755
index 00000000000..9747bffcbe8
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalParseTypeE.cs
@@ -0,0 +1,73 @@
+// InternalParseTypeE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:45:08 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalParseTypeE {
+
+		/// <summary>
+		/// </summary>
+		Empty = 0,
+
+		/// <summary>
+		/// </summary>
+		SerializedStreamHeader = 1,
+
+		/// <summary>
+		/// </summary>
+		Object = 2,
+
+		/// <summary>
+		/// </summary>
+		Member = 3,
+
+		/// <summary>
+		/// </summary>
+		ObjectEnd = 4,
+
+		/// <summary>
+		/// </summary>
+		MemberEnd = 5,
+
+		/// <summary>
+		/// </summary>
+		Headers = 6,
+
+		/// <summary>
+		/// </summary>
+		HeadersEnd = 7,
+
+		/// <summary>
+		/// </summary>
+		SerializedStreamHeaderEnd = 8,
+
+		/// <summary>
+		/// </summary>
+		Envelope = 9,
+
+		/// <summary>
+		/// </summary>
+		EnvelopeEnd = 10,
+
+		/// <summary>
+		/// </summary>
+		Body = 11,
+
+		/// <summary>
+		/// </summary>
+		BodyEnd = 12,
+	} // InternalParseTypeE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalPrimitiveTypeE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalPrimitiveTypeE.cs
new file mode 100755
index 00000000000..09adef22214
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalPrimitiveTypeE.cs
@@ -0,0 +1,89 @@
+// InternalPrimitiveTypeE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:43:39 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalPrimitiveTypeE {
+
+		/// <summary>
+		/// </summary>
+		Invalid = 0,
+
+		/// <summary>
+		/// </summary>
+		Boolean = 1,
+
+		/// <summary>
+		/// </summary>
+		Byte = 2,
+
+		/// <summary>
+		/// </summary>
+		Char = 3,
+
+		/// <summary>
+		/// </summary>
+		Currency = 4,
+
+		/// <summary>
+		/// </summary>
+		Decimal = 5,
+
+		/// <summary>
+		/// </summary>
+		Double = 6,
+
+		/// <summary>
+		/// </summary>
+		Int16 = 7,
+
+		/// <summary>
+		/// </summary>
+		Int32 = 8,
+
+		/// <summary>
+		/// </summary>
+		Int64 = 9,
+
+		/// <summary>
+		/// </summary>
+		SByte = 10,
+
+		/// <summary>
+		/// </summary>
+		Single = 11,
+
+		/// <summary>
+		/// </summary>
+		TimeSpan = 12,
+
+		/// <summary>
+		/// </summary>
+		DateTime = 13,
+
+		/// <summary>
+		/// </summary>
+		UInt16 = 14,
+
+		/// <summary>
+		/// </summary>
+		UInt32 = 15,
+
+		/// <summary>
+		/// </summary>
+		UInt64 = 16,
+	} // InternalPrimitiveTypeE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalSerializerTypeE.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalSerializerTypeE.cs
new file mode 100755
index 00000000000..51f70341f93
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/InternalSerializerTypeE.cs
@@ -0,0 +1,29 @@
+// InternalSerializerTypeE.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:43:59 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization.Formatters {
+
+
+	/// <summary>
+	/// </summary>
+	public enum InternalSerializerTypeE {
+
+		/// <summary>
+		/// </summary>
+		Soap = 1,
+
+		/// <summary>
+		/// </summary>
+		Binary = 2,
+	} // InternalSerializerTypeE
+
+} // System.Runtime.Serialization.Formatters
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs
new file mode 100644
index 00000000000..3da1932cd78
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/ServerFault.cs
@@ -0,0 +1,45 @@
+//
+// System.Runtime.Serialization.Formatters.ServerFault.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Serialization.Formatters {
+
+	[Serializable]
+	public sealed class ServerFault
+	{
+		string ex_type;
+		string ex_message;
+		string stacktrace;
+		ServerFault serverFault;
+
+		public ServerFault (string exceptionType, string message,
+				  string stackTrace)
+		{
+			ex_type = exceptionType;
+			ex_message = message;
+			stacktrace = stackTrace;
+		}
+
+		public string ExceptionType {
+			get { return ex_type; }
+			set { ex_type = value; }
+		}
+
+		public string ExceptionMessage {
+			get { return ex_message; }
+			set { ex_message = value; }
+		}
+
+		public string StackTrace {
+			get { return stacktrace; }
+			set { stacktrace = value; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapFault.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapFault.cs
new file mode 100644
index 00000000000..709d5e99efa
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapFault.cs
@@ -0,0 +1,73 @@
+//
+// System.Runtime.Serialization.Formatters.SoapFault.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Serialization.Formatters {
+
+	[Serializable]
+	public sealed class SoapFault : ISerializable
+	{
+		string code;
+		string actor;
+		string faultString;
+		ServerFault serverFault;
+
+		[MonoTODO]
+		public SoapFault ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		private SoapFault (SerializationInfo info, StreamingContext context)
+		{
+			FaultCode = info.GetString ("faultcode");
+			FaultString = info.GetString ("faultstring");
+			Detail = info.GetValue ("detail", typeof (object));
+		}
+
+		public SoapFault (string faultCode, string faultString,
+				  string faultActor, ServerFault serverFault)
+		{
+			this.code = faultCode;
+			this.actor = faultActor;
+			this.faultString = faultString;
+			this.serverFault = serverFault;
+		}
+		
+		[MonoTODO]
+		public object Detail {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		public string FaultActor {
+			get { return actor; }
+			set { actor = value; }
+		}
+
+		public string FaultCode {
+			get { return code; }
+			set { code = value; }
+		}
+
+		public string FaultString {
+			get { return faultString; }
+			set { faultString = value; }
+		}
+		
+		public void GetObjectData (SerializationInfo info,
+					   StreamingContext context)
+		{
+			info.AddValue ("faultcode", FaultCode, typeof (string));
+			info.AddValue ("faultstring", FaultString, typeof (string));
+			info.AddValue ("detail", Detail, typeof (object));
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapMessage.cs b/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapMessage.cs
new file mode 100644
index 00000000000..286b0644eef
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization.Formatters/SoapMessage.cs
@@ -0,0 +1,59 @@
+//
+// System.Runtime.Serialization.Formatters.SoapMessage.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// 2002 (C) Copyright, Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Remoting.Messaging;
+using System.Runtime.Serialization.Formatters;
+
+namespace System.Runtime.Serialization.Formatters {
+
+	[Serializable]
+	public class SoapMessage : ISoapMessage
+	{
+		[MonoTODO]
+		public SoapMessage ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public Header[] Headers {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public string MethodName {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public string [] ParamNames {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public Type [] ParamTypes {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public object [] ParamValues {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+
+		[MonoTODO]
+		public string XmlNameSpace {
+			get { throw new NotImplementedException (); }
+			set { throw new NotImplementedException (); }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/ChangeLog b/mcs/class/corlib/System.Runtime.Serialization/ChangeLog
new file mode 100644
index 00000000000..b6126c1b865
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/ChangeLog
@@ -0,0 +1,125 @@
+2002-08-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* FormatterServices.cs: implemented GetUninitializedObject.
+	PopulateObjectMembers needs a working FieldInfo.SetValue (it's
+	not implemented right now).
+
+2002-08-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* FormatterServices.cs:a implemented GetSerializableMembers ().
+
+2002-08-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* FormatterServices.cs: New file with some implementation.
+
+2002-08-16  Dietmar Maurer  <dietmar@ximian.com>
+
+	* SerializationInfo.cs: special case for null values.
+	use the converter everywhere.
+
+2002-08-14  Dietmar Maurer  <dietmar@ximian.com>
+
+	* SerializationInfo.cs: added new function to support the runtime
+
+2002-07-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Formatter.cs: added namespace.
+
+2002-06-10  Duncan Mak  <duncan@ximian.com>
+
+	* Formatter.cs: Addd to CVS.
+
+	* FormatterConverter.cs: Added to CVS.
+
+	* SerializationInfo.cs (AddValue): Removed extra CLSCompliant attribute.
+
+2002-04-12  Duncan Mak  <duncan@ximian.com>
+
+	* SerializationException.cs: Added missing constructor for serialization.
+
+2002-03-12  Duncan Mak  <duncan@ximian.com>
+
+	* IFormatter.cs: Fix the return type of the Serialize method.
+
+2002/03/07  Nick Drochak <ndrochak@gol.com>
+
+	* StreamingContextStates.cs: Add missing value (CrossAppDomain) and
+	adjust All value accordingly.
+
+2002-03-01  Duncan Mak  <duncan@ximian.com>
+
+	* ObjectIDGenerator.cs: Implemented.
+
+2002-02-19  Duncan Mak  <duncan@ximian.com>
+
+	* SurrogateSelector.cs: Implemented.	
+
+	* SerializationInfoEnumerator.cs: oh, and simplified the Current
+	property too.
+	
+	* SerializationInfo.cs: Forgot to finish up GetEnumerator ().
+
+2002-02-18  Duncan Mak  <duncan@ximian.com>
+
+	* SerializationInfo.cs: Converted Type.GetType calls to the faster
+	typeof operator.
+
+2002-02-16  Duncan Mak  <duncan@ximian.com>
+
+	* SurrogateSelector.cs: Stubbed out. Gonna be working on this
+	tomorrow.
+
+2002-02-15  Duncan Mak  <duncan@ximian.com>
+
+	* SerializationEntry.cs: Added internal constructor for writing
+	bits in SerializationInfoEnumerator.
+	* SerializationInfo.cs: Completed.
+	* SerializationInfoEnumerator.cs: Implemented. Piggybacking on
+	Hashtable's GetEnumerator method.
+
+2002-02-13  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* SerializationInfoEnumerator.cs: New file (stub)
+
+2002-02-12  Duncan Mak  <duncan@ximian.com>
+	
+	* SerializationBinder.cs: Implemented.
+	* SerializationEntry.cs: Implemented.
+	* SerializationInfo.cs: Fixed the get portion of the AssemblyName
+	property. Implemented the FullTypename property.
+	
+2002-01-06  David Dawkins <david@dawkins.st>
+
+	* IFormatter.cs : New file
+	* ISerializationSurrogate.cs : New file
+	* ISurrogateSelector.cs : New file
+
+2002-05-01  Ravi Pratap  <ravi@ximian.com>
+
+	* SerializationInfo.cs : Insert MonoTODO attribute.
+
+2001-08-24  Nick Drochak  <ndrochak@gol.com>
+
+	* IDeserializationCallback.cs: New File
+
+Wed Nov 14 17:03:30 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* IFormatterConverter.cs, SerializationInfo.cs: CLSCompliant updates.
+
+Fri Nov 2 18:40:12 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* SerializationException.cs: implemented.
+
+2001-08-24  Nick Drochak  <ndrochak@gol.com>
+
+	* SerializationInfo.cs: Added all the public methods so that the compile would not break
+
+2001-07-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* SerializationInfo.cs: New file.
+
+	* IFormatterConverter.cs: New file.
+
+	* ISerializable.cs: New file.
+	
+
diff --git a/mcs/class/corlib/System.Runtime.Serialization/Formatter.cs b/mcs/class/corlib/System.Runtime.Serialization/Formatter.cs
new file mode 100755
index 00000000000..5faf5773be6
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/Formatter.cs
@@ -0,0 +1,105 @@
+//
+// System.Runtime.Serialization.Formatter.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.IO;
+
+namespace System.Runtime.Serialization
+{
+[CLSCompliant (false)]
+[Serializable]
+public abstract class Formatter : IFormatter
+{
+	protected Formatter ()
+	{
+	}
+	
+	protected ObjectIDGenerator m_idGenerator;
+	protected Queue m_objectQueue;
+
+	public abstract SerializationBinder Binder {
+		get;
+		set;
+	}
+
+	public abstract StreamingContext Context {
+		get;
+		set;
+	}
+
+	public abstract ISurrogateSelector SurrogateSelector {
+		get;
+		set;
+	}
+
+	public abstract object Deserialize (Stream serializationStream);
+
+	[MonoTODO]
+	protected virtual object GetNext (out long objID)
+	{
+		throw new NotImplementedException ();
+	}
+
+	[MonoTODO]
+	protected virtual long Schedule (object obj)
+	{
+		throw new NotImplementedException ();
+	}
+
+	public abstract void Serialize (Stream serializationStream, object graph);
+	 
+	protected abstract void WriteArray (object obj, string name, Type memberType);
+	 
+	protected abstract void WriteBoolean (bool val, string name);
+	 
+	protected abstract void WriteByte (byte val, string name);
+	 
+	protected abstract void WriteChar (char val, string name);
+	 
+	protected abstract void WriteDateTime (DateTime val, string name);
+
+	protected abstract void WriteDecimal (Decimal val, string name);
+
+	protected abstract void WriteDouble (double val, string name);
+
+	protected abstract void WriteInt16 (short val, string name);
+
+	protected abstract void WriteInt32 (int val, string name);
+
+	protected abstract void WriteInt64 (long val, string name);
+
+	[MonoTODO]
+	protected virtual void WriteMember (string memberName, object data)
+	{
+		throw new NotImplementedException ();
+	}
+
+	protected abstract void WriteObjectRef (object obj, string name, Type memberType);
+
+
+	protected abstract void WriteSByte (sbyte val, string name);
+
+
+	protected abstract void WriteSingle (float val, string name);
+	
+	protected abstract void WriteTimeSpan (TimeSpan val, string name);
+
+	[CLSCompliant (false)]
+	protected abstract void WriteUInt16 (ushort val, string name);
+
+	[CLSCompliant (false)]
+	protected abstract void WriteUInt32 (uint val, string name);
+
+	[CLSCompliant (false)]
+	protected abstract void WriteUInt64 (ulong val, string name);
+
+	[CLSCompliant (false)]
+	protected abstract void WriteValueType (object obj, string name, Type memberType);	
+}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/FormatterConverter.cs b/mcs/class/corlib/System.Runtime.Serialization/FormatterConverter.cs
new file mode 100755
index 00000000000..d478ac77d15
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/FormatterConverter.cs
@@ -0,0 +1,153 @@
+//
+// System.Runtime.Serialization.Formatter.cs
+//
+// Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Serialization {
+	public class FormatterConverter : IFormatterConverter {
+
+		public FormatterConverter ()
+		{
+		}
+
+		public object Convert (object value, Type type)
+		{
+			return System.Convert.ChangeType (value, type);
+		}
+
+		public object Convert (object value, TypeCode typeCode)
+		{
+			return System.Convert.ChangeType (value, typeCode);
+		}
+
+		public bool ToBoolean (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+		
+			return System.Convert.ToBoolean (value);
+		}
+
+		public byte ToByte (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToByte (value);
+		}
+
+		public char ToChar (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToChar (value);
+		}
+
+		public DateTime ToDateTime (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToDateTime (value);
+		}
+
+		public decimal ToDecimal (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToDecimal (value);
+		}
+
+		public double ToDouble (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToDouble (value);
+		}
+
+		public short ToInt16 (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToInt16 (value);
+		}
+
+		public int ToInt32 (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToInt32 (value);
+		}
+
+		public long ToInt64 (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToInt64 (value);
+		}
+
+		public float ToSingle (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToSingle (value);
+		}
+
+		public string ToString (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToString (value);
+		}
+
+		[CLSCompliant (false)]
+		public sbyte ToSByte (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToSByte (value);
+		}
+
+		[CLSCompliant (false)]
+		public ushort ToUInt16 (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToUInt16 (value);
+		}
+
+		[CLSCompliant (false)]
+		public uint ToUInt32 (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToUInt32 (value);
+		}
+
+		[CLSCompliant (false)]
+		public ulong ToUInt64 (object value)
+		{
+			if (value == null)
+				throw new ArgumentNullException ("value is null.");
+
+			return System.Convert.ToUInt64 (value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/FormatterServices.cs b/mcs/class/corlib/System.Runtime.Serialization/FormatterServices.cs
new file mode 100644
index 00000000000..6243e88d59b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/FormatterServices.cs
@@ -0,0 +1,142 @@
+//
+// System.Runtime.Serialization.FormatterServices
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace System.Runtime.Serialization
+{
+	public sealed class FormatterServices
+	{
+		private const BindingFlags fieldFlags = BindingFlags.Public |
+							BindingFlags.Instance |
+							BindingFlags.NonPublic |
+							BindingFlags.DeclaredOnly;
+
+		private FormatterServices ()
+		{
+		}
+
+		public static object [] GetObjectData (object obj, MemberInfo [] members)
+		{
+			if (obj == null)
+				throw new ArgumentNullException ("obj");
+
+			if (members == null)
+				throw new ArgumentNullException ("members");
+
+			int n = members.Length;
+			object [] result = new object [n];
+			for (int i = 0; i < n; i++) {
+				MemberInfo member = members [i];
+				if (member == null)
+					throw new ArgumentNullException (String.Format ("members[{0}]", i));
+
+				if (member.MemberType != MemberTypes.Field)
+					throw new SerializationException (
+							String.Format ("members [{0}] is not a field.", i));
+
+				FieldInfo fi = member as FieldInfo; //FIXME: Can fi be null?
+				result [i] = fi.GetValue (obj);
+			}
+
+			return result;
+		}
+
+		public static MemberInfo [] GetSerializableMembers (Type type)
+		{
+			StreamingContext st = new StreamingContext (StreamingContextStates.All);
+			return GetSerializableMembers (type, st);
+		}
+
+		public static MemberInfo [] GetSerializableMembers (Type type, StreamingContext context)
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type");
+
+			//FIXME: context?
+			ArrayList fields = new ArrayList ();
+			Type t = type;
+			while (t != null) {
+				GetFields (t, fields);
+				t = t.BaseType;
+			}
+
+			MemberInfo [] result = new MemberInfo [fields.Count];
+			fields.CopyTo (result);
+			return result;
+		}
+
+		private static void GetFields (Type type, ArrayList fields)
+		{
+			FieldInfo [] fs = type.GetFields (fieldFlags);
+			foreach (FieldInfo field in fs)
+				if (!(field.IsNotSerialized))
+					fields.Add (field);
+		}
+
+		public static Type GetTypeFromAssembly (Assembly assem, string name)
+		{
+			if (assem == null)
+				throw new ArgumentNullException ("assem");
+
+			if (name == null)
+				throw new ArgumentNullException ("name");
+
+			return assem.GetType (name);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern object GetUninitializedObjectInternal (Type type);
+
+		public static object GetUninitializedObject (Type type)
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type");
+
+			if (type == typeof (string))
+				throw new ArgumentException ("Uninitialized Strings cannot be created.");
+
+			return GetUninitializedObjectInternal (type);
+		}
+
+		public static object PopulateObjectMembers (object obj, MemberInfo [] members, object [] data)
+		{
+			if (obj == null)
+				throw new ArgumentNullException ("obj");
+
+			if (members == null)
+				throw new ArgumentNullException ("members");
+
+			if (data == null)
+				throw new ArgumentNullException ("data");
+
+			int length = members.Length;
+			if (length != data.Length)
+				throw new ArgumentException ("different length in members and data");
+
+			for (int i = 0; i < length; i++) {
+				MemberInfo member = members [i];
+				if (member == null)
+					throw new ArgumentNullException (String.Format ("members[{0}]", i));
+					
+				if (member.MemberType != MemberTypes.Field)
+					throw new SerializationException (
+							String.Format ("members [{0}] is not a field.", i));
+
+				FieldInfo fi = member as FieldInfo; //FIXME: can fi be null?
+				fi.SetValue (obj, data [i]);
+			}
+
+			return obj;
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Serialization/IDeserializationCallback.cs b/mcs/class/corlib/System.Runtime.Serialization/IDeserializationCallback.cs
new file mode 100644
index 00000000000..a889303f51b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/IDeserializationCallback.cs
@@ -0,0 +1,14 @@
+//

+// System.Runtime.Serialization.IDeserializationCallback.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+namespace System.Runtime.Serialization {

+	public interface IDeserializationCallback {

+		void OnDeserialization(object sender);

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/corlib/System.Runtime.Serialization/IFormatter.cs b/mcs/class/corlib/System.Runtime.Serialization/IFormatter.cs
new file mode 100644
index 00000000000..214f720093e
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/IFormatter.cs
@@ -0,0 +1,66 @@
+//

+// System.Runtime.Serialization.IFormatter

+//

+// Author:

+//   David Dawkins (david@dawkins.st)

+//

+// (C) David Dawkins

+//

+

+using System.IO;

+

+namespace System.Runtime.Serialization {

+

+	/// <summary>

+	/// Formatting for serialized objects</summary>

+	public interface IFormatter {

+

+		//

+		// Properties

+		//

+

+		/// <summary>

+		/// Get or set the SerializationBinder used

+		/// for looking up types during deserialization</summary>

+		SerializationBinder Binder 

+		{

+			get; 

+			set; 

+		}

+

+		/// <summary>

+		/// Get or set the StreamingContext used for serialization

+		/// and deserialization</summary>

+		StreamingContext Context 

+		{ 

+			get; 

+			set; 

+		}

+

+		/// <summary>

+		/// Get or set the SurrogateSelector used by the current

+		/// formatter</summary>

+		ISurrogateSelector SurrogateSelector 

+		{ 

+			get; 

+			set; 

+		}

+

+		/// <summary>

+		/// Deserialize data from the specified stream, rebuilding

+		/// the object hierarchy</summary>

+		object Deserialize(

+			Stream serializationStream

+		);		

+

+		/// <summary>

+		/// Serialize the specified object to the specified stream.

+		/// Object may be the root of a graph of objects to be

+		/// serialized</summary>

+		void Serialize( 

+			Stream serializationStream,

+			object graph

+		);

+	}

+

+}

diff --git a/mcs/class/corlib/System.Runtime.Serialization/IFormatterConverter.cs b/mcs/class/corlib/System.Runtime.Serialization/IFormatterConverter.cs
new file mode 100644
index 00000000000..b902ec339a5
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/IFormatterConverter.cs
@@ -0,0 +1,33 @@
+//
+// System.Runtime.Serialization.IFormatterConverter.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+namespace System.Runtime.Serialization {
+	[CLSCompliant(false)]
+	public interface IFormatterConverter {
+		object Convert (object o, Type t);
+		object Convert (object o, TypeCode tc);
+		
+		bool        ToBoolean  (object o);
+		byte        ToByte     (object o);
+		char        ToChar     (object o);
+		DateTime    ToDateTime (object o);
+		Decimal     ToDecimal  (object o);
+		double      ToDouble   (object o);
+		Int16       ToInt16    (object o);
+		Int32       ToInt32    (object o);
+		Int64       ToInt64    (object o);
+		sbyte       ToSByte    (object o);
+		float       ToSingle   (object o);
+		string      ToString   (object o);
+		UInt16      ToUInt16   (object o);
+		UInt32      ToUInt32   (object o);
+		UInt64      ToUInt64   (object o);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/IObjectReference.cs b/mcs/class/corlib/System.Runtime.Serialization/IObjectReference.cs
new file mode 100644
index 00000000000..59f5a0200b4
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/IObjectReference.cs
@@ -0,0 +1,16 @@
+//
+// System.Runtime.Serialization.IObjectReference.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Runtime.Serialization {
+
+	public interface IObjectReference {
+		object GetRealObject (StreamingContext context);
+	}
+}
+
diff --git a/mcs/class/corlib/System.Runtime.Serialization/ISerializable.cs b/mcs/class/corlib/System.Runtime.Serialization/ISerializable.cs
new file mode 100644
index 00000000000..64773514eba
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/ISerializable.cs
@@ -0,0 +1,15 @@
+//
+// System.Runtime.Serialization.ISerializable.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+namespace System.Runtime.Serialization {
+	public interface ISerializable {
+		void GetObjectData (SerializationInfo info, StreamingContext context);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/ISerializationSurrogate.cs b/mcs/class/corlib/System.Runtime.Serialization/ISerializationSurrogate.cs
new file mode 100644
index 00000000000..21b4ecbb7dd
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/ISerializationSurrogate.cs
@@ -0,0 +1,43 @@
+//

+// System.Runtime.Serialization.ISerializationSurrogate

+//

+// Author:

+//   David Dawkins (david@dawkins.st)

+//

+// (C) David Dawkins

+//

+

+namespace System.Runtime.Serialization {

+

+	/// <summary>

+	/// Interface for serialization surrogates</summary>

+	public interface ISerializationSurrogate {

+

+		/// <summary>

+		/// Get the SerializationInfo necessary to serialize

+		/// the specified object </summary>

+		/// <param name="obj">Object to be serialized</param>

+		/// <param name="info">SerializationInfo to be populated</param>

+		/// <param name="context">Destination for serialization</param>

+		void GetObjectData(

+			object obj,

+			SerializationInfo info,

+			StreamingContext context

+		);	

+

+		/// <summary>

+		/// Populate an object using the specified SerializationInfo </summary>

+		/// <param name="obj">Object to be populated</param>

+		/// <param name="info">Data used for populating object</param>

+		/// <param name="context">Source for deserialization of object</param>

+		/// <param name="selector>Starting point for searching for compatible surrogates</param>

+		/// <returns>The deserialized object</returns>

+		object SetObjectData(

+			object obj,

+			SerializationInfo info,

+			StreamingContext context,

+			ISurrogateSelector selector

+		);

+	}

+

+}

diff --git a/mcs/class/corlib/System.Runtime.Serialization/ISurrogateSelector.cs b/mcs/class/corlib/System.Runtime.Serialization/ISurrogateSelector.cs
new file mode 100644
index 00000000000..442b01789ed
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/ISurrogateSelector.cs
@@ -0,0 +1,40 @@
+//

+// System.Runtime.Serialization.ISurrogateSelector

+//

+// Author:

+//   David Dawkins (david@dawkins.st)

+//

+// (C) David Dawkins

+//

+

+namespace System.Runtime.Serialization {

+

+	/// <summary>

+	/// Creation of serialization surrogate selectors</summary>

+	public interface ISurrogateSelector {

+

+		/// <summary>

+		/// Insert specified selector into available surrogates</summary>

+		void ChainSelector( ISurrogateSelector selector );

+

+		/// <summary>

+		/// Return next surrogate in the surrogate chain</summary>

+		ISurrogateSelector GetNextSelector();

+

+		/// <summary>

+		/// Fetch the surrogate according the specified type, starting

+		/// the search from the surrogate selector for the specified

+		/// StreamingContext</summary>

+		/// <param name="type">Type of the object to be serialized</param>

+		/// <param name="context">Context for the serialization/deserialization</para,>

+		/// <param name="selector">Upon return, contains a reference to the selector where the returned surrogate was found</param>

+		/// <returns>The surrogate for the specified type and context</returns>

+		ISerializationSurrogate GetSurrogate(

+			Type type,

+			StreamingContext context,

+			out ISurrogateSelector selector

+		);

+

+	}

+

+}

diff --git a/mcs/class/corlib/System.Runtime.Serialization/ObjectIDGenerator.cs b/mcs/class/corlib/System.Runtime.Serialization/ObjectIDGenerator.cs
new file mode 100755
index 00000000000..c2821892a26
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/ObjectIDGenerator.cs
@@ -0,0 +1,62 @@
+//
+// System.Runtime.Serialization.ObjectIDGenerator.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Serialization
+{
+	[Serializable]
+	public class ObjectIDGenerator
+	{
+		// Private field
+		Hashtable table;
+		long current; // this is the current ID, starts at 1
+		
+		// constructor
+		public ObjectIDGenerator ()
+			: base ()
+		{
+			table = new Hashtable ();
+			current = 1;
+		}
+
+		// Methods
+		public virtual long GetId (object obj, out bool firstTime)
+		{
+			if (obj == null)
+				throw new ArgumentNullException ("The obj parameter is null.");
+
+			if (table.ContainsKey (obj)) {
+				firstTime = false;
+				return (long) table [obj];
+
+			} else {
+				firstTime = true;
+				table.Add (obj, current);
+				return current ++; 
+			}
+		}
+
+		public virtual long HasId (object obj, out bool firstTime)
+		{
+			if (obj == null)
+				throw new ArgumentNullException ("The obj parameter is null.");
+
+			if (table.ContainsKey (obj)) {
+				firstTime = false;
+				return (long) table [obj];
+
+			} else {				
+				firstTime = true;
+				return 0L; // 0 is the null ID
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/SerializationBinder.cs b/mcs/class/corlib/System.Runtime.Serialization/SerializationBinder.cs
new file mode 100644
index 00000000000..30eef514b4d
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/SerializationBinder.cs
@@ -0,0 +1,22 @@
+//
+// System.Runtime.Serialization.SerializationBinder.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+namespace System.Runtime.Serialization
+{
+	[Serializable]
+	public abstract class SerializationBinder
+	{
+		// Constructor
+		protected SerializationBinder ()
+			: base ()
+		{
+		}
+
+		public abstract Type BindToType (string assemblyName, string typeName);
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/SerializationEntry.cs b/mcs/class/corlib/System.Runtime.Serialization/SerializationEntry.cs
new file mode 100644
index 00000000000..8221509892f
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/SerializationEntry.cs
@@ -0,0 +1,40 @@
+//
+// System.Runtime.Serialization.SerializationEntry.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Runtime.Serialization
+{
+	public struct SerializationEntry
+	{
+		string name;
+		Type objectType;
+		object value;
+		
+		// Properties
+		public string Name
+		{
+			get { return name; }
+		}
+
+		public Type ObjectType
+		{
+			get { return objectType; }
+		}
+
+		public object Value
+		{
+			get { return value; }
+		}
+
+		internal SerializationEntry (string name, Type type, object value)
+		{
+			this.name = name;
+			this.objectType = type;
+			this.value = value;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/SerializationException.cs b/mcs/class/corlib/System.Runtime.Serialization/SerializationException.cs
new file mode 100755
index 00000000000..e5d9196745b
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/SerializationException.cs
@@ -0,0 +1,39 @@
+//
+// System.Runtime.Serialization/SerializationException.cd
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Serialization {
+
+	[Serializable]
+	public class SerializationException : SystemException {
+		// Constructors
+		public SerializationException ()
+			: base ("An error occurred during (de)serialization")
+		{
+		}
+
+		public SerializationException (string message)
+			: base (message)
+		{
+		}
+
+		public SerializationException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected SerializationException (SerializationInfo info,
+					       StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/SerializationInfo.cs b/mcs/class/corlib/System.Runtime.Serialization/SerializationInfo.cs
new file mode 100644
index 00000000000..412da99b4f4
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/SerializationInfo.cs
@@ -0,0 +1,313 @@
+//
+// System.Runtime.Serialization.SerializationInfo.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+using System;
+using System.Collections;
+
+namespace System.Runtime.Serialization
+{
+	public sealed class SerializationInfo
+	{
+		Hashtable serialized = new Hashtable ();
+		string assemblyName; // the assembly being serialized
+		string fullTypeName; // the type being serialized.
+
+		[CLSCompliant (false)] IFormatterConverter converter;
+		
+		/* used by the runtime */
+		private SerializationInfo (Type type)
+		{
+			assemblyName = type.Assembly.FullName;
+			fullTypeName = type.FullName;
+			converter = new FormatterConverter ();
+		}
+		
+		/* used by the runtime */
+		private SerializationInfo (Type type, SerializationEntry [] data)
+		{
+			int len = data.Length;
+
+			assemblyName = type.Assembly.FullName;
+			fullTypeName = type.FullName;
+			converter = new FormatterConverter ();
+
+			for (int i = 0; i < len; i++)
+				serialized.Add (data [i].Name, data [i]);
+		}
+
+		// Constructor
+		[CLSCompliant (false)]
+		public SerializationInfo (Type type, IFormatterConverter converter)
+		{
+			if (type == null && converter == null)
+				throw new ArgumentNullException ("Null arguments.");
+			
+			this.converter = converter;
+			assemblyName = type.Assembly.FullName;
+			fullTypeName = type.FullName;
+		}
+
+		// Properties
+		public string AssemblyName
+		{
+			get { return assemblyName; }
+			
+			set {
+				if (value == null)
+					throw new ArgumentNullException ("Argument is null.");
+				assemblyName = value;
+			}
+		}
+		
+		public string FullTypeName
+		{
+			get { return fullTypeName; }
+			
+			set {
+				if ( value == null)
+					throw new ArgumentNullException ("Argument is null.");
+				fullTypeName = value;
+			}
+		}
+		
+		public int MemberCount
+		{
+			get { return serialized.Count; }
+		}
+
+		// Methods
+		public void AddValue (string name, object value, Type type)
+		{
+			if (serialized.ContainsKey (name))
+				throw new SerializationException ("Value has been serialized already.");
+			
+			SerializationEntry values = new SerializationEntry (name, type, value);
+			serialized.Add (name, values);
+		}
+
+		public object GetValue (string name, Type type)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name is null.");
+			if (!serialized.ContainsKey (name))
+				throw new SerializationException ("No element named " + name + " could be found.");
+                        			
+			SerializationEntry values = (SerializationEntry) serialized [name];
+
+			if (values.Value != null && values.ObjectType != type)
+				throw new InvalidCastException ("Invalid Type casting.");
+			
+			return values.Value;
+		}
+
+		public void SetType (Type type)
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type is null.");
+
+			fullTypeName = type.FullName;
+			assemblyName = type.Assembly.FullName;
+		}
+
+		public SerializationInfoEnumerator GetEnumerator ()
+		{
+			return new SerializationInfoEnumerator (serialized);
+		}
+		
+		public void AddValue (string name, short value)
+		{
+			AddValue (name, value, typeof (System.Int16));
+		}
+
+		[CLSCompliant(false)]
+		public void AddValue (string name, UInt16 value)
+		{
+			AddValue (name, value, typeof (System.UInt16));
+		}
+		
+		public void AddValue (string name, int value)
+		{
+			AddValue (name, value, typeof (System.Int32));
+		}
+		
+		public void AddValue (string name, byte value)
+		{
+			AddValue (name, value, typeof (System.Byte));
+		}
+		
+		public void AddValue (string name, bool value)
+		{
+			AddValue (name, value, typeof (System.Boolean));
+		}
+	       
+	        public void AddValue (string name, char value)
+		{
+			AddValue (name, value, typeof (System.Char));
+		}
+
+		[CLSCompliant(false)]
+	        public void AddValue (string name, SByte value)
+		{
+			AddValue (name, value, typeof (System.SByte));
+		}
+		
+	        public void AddValue (string name, double value)
+		{
+			AddValue (name, value, typeof (System.Double));
+		}
+		
+	        public void AddValue (string name, Decimal value)
+		{
+			AddValue (name, value, typeof (System.Decimal));
+		}
+		
+	        public void AddValue (string name, DateTime value)
+		{
+			AddValue (name, value, typeof (System.DateTime));
+		}
+		
+	        public void AddValue (string name, float value)
+		{
+			AddValue (name, value, typeof (System.Single));
+		}
+
+		[CLSCompliant(false)]
+	        public void AddValue (string name, UInt32 value)
+		{
+			AddValue (name, value, typeof (System.UInt32));
+		}
+	       
+	        public void AddValue (string name, long value)
+		{
+			AddValue (name, value, typeof (System.Int64));
+		}
+
+		[CLSCompliant(false)]
+	        public void AddValue (string name, UInt64 value)
+		{
+			AddValue (name, value, typeof (System.UInt64));
+		}
+		
+	        public void AddValue (string name, object value)
+		{
+			if (value == null)
+				AddValue (name, value, typeof (System.Object));
+			else
+				AddValue (name, value, value.GetType ());
+		}		
+		
+		public bool GetBoolean (string name)
+		{
+			object value = GetValue (name, typeof (System.Boolean));
+			return converter.ToBoolean (value);
+		}
+		
+	        public byte GetByte (string name)
+		{
+			object value = GetValue (name, typeof (System.Byte));
+			return converter.ToByte (value);
+		}
+		
+	        public char GetChar (string name)
+		{
+			object value = GetValue (name, typeof (System.Char));
+			return converter.ToChar (value);
+		}
+
+	        public DateTime GetDateTime (string name)
+		{
+			object value = GetValue (name, typeof (System.DateTime));
+			return converter.ToDateTime (value);
+		}
+		
+		public Decimal GetDecimal (string name)
+		{
+			object value = GetValue (name, typeof (System.Decimal));
+			return converter.ToDecimal (value);
+		}
+		
+		public double GetDouble (string name)
+		{
+			object value = GetValue (name, typeof (System.Double));
+			return converter.ToDouble (value);
+		}
+						
+		public short GetInt16 (string name)
+		{
+			object value = GetValue (name, typeof (System.Int16));
+			return converter.ToInt16 (value);
+		}
+		
+		public int GetInt32 (string name)
+		{
+			object value = GetValue (name, typeof (System.Int32));
+			return converter.ToInt32 (value);
+		}
+	       
+		public long GetInt64 (string name)
+		{
+			object value = GetValue (name, typeof (System.Int64));
+			return converter.ToInt64 (value);
+		}
+
+		[CLSCompliant(false)]
+		public SByte GetSByte (string name)
+		{
+			object value = GetValue (name, typeof (System.SByte));
+			return converter.ToSByte (value);
+		}
+		
+		public float GetSingle (string name)
+		{
+			object value = GetValue (name, typeof (System.Single));
+			return converter.ToSingle (value);
+		}
+		
+		public string GetString (string name)
+		{
+			object value = GetValue (name, typeof (System.String));
+			return converter.ToString (value);
+		}
+
+		[CLSCompliant(false)]
+		public UInt16 GetUInt16 (string name)
+		{
+			object value = GetValue (name, typeof (System.UInt16));
+			return converter.ToUInt16 (value);
+		}
+		
+		[CLSCompliant(false)]
+		public UInt32 GetUInt32 (string name)
+		{
+			object value = GetValue (name, typeof (System.UInt32));
+			return converter.ToUInt32 (value);
+		}
+		[CLSCompliant(false)]
+		public UInt64 GetUInt64 (string name)
+		{
+			object value = GetValue (name, typeof (System.UInt64));
+			return converter.ToUInt64 (value);
+		}
+
+		/* used by the runtime */
+		private SerializationEntry [] get_entries ()
+		{
+			SerializationEntry [] res = new SerializationEntry [this.MemberCount];
+			int i = 0;
+			
+			foreach (SerializationEntry e in this)
+				res [i++] = e;
+			
+			return res;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/SerializationInfoEnumerator.cs b/mcs/class/corlib/System.Runtime.Serialization/SerializationInfoEnumerator.cs
new file mode 100644
index 00000000000..a4d50af1d70
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/SerializationInfoEnumerator.cs
@@ -0,0 +1,62 @@
+//
+// System.Runtime.Serialization.SerializationInfoEnumerator.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Runtime.Serialization;
+
+namespace System.Runtime.Serialization
+{
+	public sealed class SerializationInfoEnumerator : IEnumerator
+	{
+		IDictionaryEnumerator ide;
+
+		// Constructor
+		internal SerializationInfoEnumerator (Hashtable collection)
+		{
+			ide = collection.GetEnumerator ();
+		}
+		
+		// Properties
+		public SerializationEntry Current
+		{
+			get { return (SerializationEntry) ide.Value; }
+		}
+
+		object IEnumerator.Current
+		{			
+			get { return ide.Value; }
+		}
+
+		public string Name
+		{
+			get { return this.Current.Name; }
+		}
+
+		public Type ObjectType
+		{
+			get  { return this.Current.ObjectType; }
+		}
+
+		public object Value
+		{			
+			get { return this.Current.Value; }
+		}
+
+		// Methods
+		public bool MoveNext ()
+		{
+			return ide.MoveNext ();
+		}
+
+		public void Reset ()
+		{
+			ide.Reset ();
+		}
+	}	
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/StreamingContext.cs b/mcs/class/corlib/System.Runtime.Serialization/StreamingContext.cs
new file mode 100644
index 00000000000..c1b5a530fde
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/StreamingContext.cs
@@ -0,0 +1,58 @@
+//
+// System.Runtime.Serialization.StreamingContext.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Runtime.Serialization {
+
+	[Serializable]
+	public struct StreamingContext {
+		StreamingContextStates state;
+		object additional;
+		
+		public StreamingContext (StreamingContextStates state)
+		{
+			this.state = state;
+			additional = null;
+		}
+
+		public StreamingContext (StreamingContextStates state, object additional)
+		{
+			this.state = state;
+			this.additional = additional;
+		}
+
+		public object Context {
+			get {
+				return additional;
+			}
+		}
+
+		public StreamingContextStates State {
+			get {
+				return state;
+			}
+		}
+
+		override public bool Equals (Object o)
+		{
+			StreamingContext other;
+			
+			if (!(o is StreamingContext))
+				return false;
+
+			other = (StreamingContext) o;
+
+			return (other.state == this.state) && (other.additional == this.additional);
+		}
+
+		override public int GetHashCode ()
+		{
+			return (int) state;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Runtime.Serialization/StreamingContextStates.cs b/mcs/class/corlib/System.Runtime.Serialization/StreamingContextStates.cs
new file mode 100644
index 00000000000..d5a3858d310
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/StreamingContextStates.cs
@@ -0,0 +1,56 @@
+// StreamingContextStates.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:45:18 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Runtime.Serialization {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum StreamingContextStates {
+
+		/// <summary>
+		/// </summary>
+		CrossProcess = 1,
+
+		/// <summary>
+		/// </summary>
+		CrossMachine = 2,
+
+		/// <summary>
+		/// </summary>
+		File = 4,
+
+		/// <summary>
+		/// </summary>
+		Persistence = 8,
+
+		/// <summary>
+		/// </summary>
+		Remoting = 16,
+
+		/// <summary>
+		/// </summary>
+		Other = 32,
+
+		/// <summary>
+		/// </summary>
+		Clone = 64,
+
+		CrossAppDomain = 128,
+
+		/// <summary>
+		/// </summary>
+		All = 255,
+	} // StreamingContextStates
+
+} // System.Runtime.Serialization
diff --git a/mcs/class/corlib/System.Runtime.Serialization/SurrogateSelector.cs b/mcs/class/corlib/System.Runtime.Serialization/SurrogateSelector.cs
new file mode 100644
index 00000000000..ec01dfe4d20
--- /dev/null
+++ b/mcs/class/corlib/System.Runtime.Serialization/SurrogateSelector.cs
@@ -0,0 +1,92 @@
+//
+// System.Runtime.Serialization.SurrogateSelector.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+
+namespace System.Runtime.Serialization
+{
+	public class SurrogateSelector : ISurrogateSelector
+	{
+		// Fields
+		Hashtable Surrogates = new Hashtable ();
+		string currentKey = null; // current key of Surrogates
+
+		internal struct Bundle
+		{
+			public ISerializationSurrogate surrogate;
+			public ArrayList selectors;
+
+			public Bundle (ISerializationSurrogate surrogate)
+			{
+				this.surrogate = surrogate;
+				selectors = new ArrayList ();
+			}
+		}
+		
+		// Constructor
+		public SurrogateSelector()
+			: base ()
+		{
+		}
+
+		// Methods
+		public virtual void AddSurrogate (Type type,
+			  StreamingContext context, ISerializationSurrogate surrogate)
+		{
+			if (type == null || surrogate == null)
+				throw new ArgumentNullException ("Null reference.");
+
+			currentKey = type.FullName + "#" + context.ToString ();
+
+			if (Surrogates.ContainsKey (currentKey))
+				throw new ArgumentException ("A surrogate for " + type.FullName + " already exists.");
+
+			Bundle values = new Bundle (surrogate);
+			
+			Surrogates.Add (currentKey, values);
+		}
+
+		public virtual void ChainSelector (ISurrogateSelector selector)
+		{
+			if (selector == null)
+				throw new ArgumentNullException ("Selector is null.");
+			
+			Bundle current = (Bundle) Surrogates [currentKey];
+			current.selectors.Add (selector);
+		}
+
+		public virtual ISurrogateSelector GetNextSelector ()
+		{
+			Bundle current = (Bundle) Surrogates [currentKey];
+			return (ISurrogateSelector) current.selectors [current.selectors.Count];
+		}
+
+		public virtual ISerializationSurrogate GetSurrogate (Type type,
+			     StreamingContext context, out ISurrogateSelector selector)
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type is null.");
+			
+			string key = type.FullName + "#" + context.ToString ();			
+			Bundle current = (Bundle) Surrogates [key];
+			selector = (ISurrogateSelector) current.selectors [current.selectors.Count - 1];
+			
+			return (ISerializationSurrogate) current.surrogate;
+		}
+
+		public virtual void RemoveSurrogate (Type type, StreamingContext context)
+		{
+			if (type == null)
+				throw new ArgumentNullException ("type is null.");
+
+			string key = type.FullName + "#" + context.ToString ();
+			Surrogates.Remove (key);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Cryptography/AsymmetricAlgorithm.cs b/mcs/class/corlib/System.Security.Cryptography/AsymmetricAlgorithm.cs
new file mode 100755
index 00000000000..7910e6e8b8c
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/AsymmetricAlgorithm.cs
@@ -0,0 +1,108 @@
+//

+// System.Security.Cryptography AsymmetricAlgorithm Class implementation

+//

+// Authors:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Abstract base class for all cryptographic asymmetric algorithms.

+	/// Available algorithms include:

+	/// RSA, DSA

+	/// </summary>

+	public abstract class AsymmetricAlgorithm {

+		protected int KeySizeValue; // The size of the secret key used by the symmetric algorithm in bits. 

+		protected KeySizes[] LegalKeySizesValue; // Specifies the key sizes that are supported by the symmetric algorithm. 

+

+		/// <summary>

+		/// Called from constructor of derived class.

+		/// </summary>

+		protected AsymmetricAlgorithm () {

+		  throw new CryptographicException();

+		}

+		

+		/// <summary>

+		/// Gets the key exchange algorithm

+		/// </summary>

+		public abstract string KeyExchangeAlgorithm {get;}

+		

+		/// <summary>

+		/// Gets or sets the actual key size

+		/// </summary>

+		public virtual int KeySize {

+			get {

+				return this.KeySizeValue;

+			}

+			set {

+				if (!IsLegalKeySize(this.LegalKeySizesValue, value))

+					throw new CryptographicException("key size not supported by algorithm");

+				

+				this.KeySizeValue = value;

+			}

+		}

+

+		/// <summary>

+		/// Gets all legal key sizes

+		/// </summary>

+		public virtual KeySizes[] LegalKeySizes {

+			get {

+				return this.LegalKeySizesValue;

+			}

+		}

+

+		/// <summary>

+		/// Gets the signature algorithm

+		/// </summary>

+		public abstract string SignatureAlgorithm {get;}

+

+		/// <summary>

+		/// Reconstructs the AsymmetricAlgorithm Object from an XML-string

+		/// </summary>

+		public abstract void FromXmlString(string xmlString);

+		

+		/// <summary>

+		/// Returns an XML string representation the current AsymmetricAlgorithm object

+		/// </summary>

+		public abstract string ToXmlString(bool includePrivateParameters);		

+		

+		private bool IsLegalKeySize(KeySizes[] LegalKeys, int Size) {

+			foreach (KeySizes LegalKeySize in LegalKeys) {

+				for (int i=LegalKeySize.MinSize; i<=LegalKeySize.MaxSize; i+=LegalKeySize.SkipSize) {

+					if (i == Size)

+						return true;

+				}

+			}

+			return false;

+		}

+		

+		/// <summary>

+		/// Checks wether the given keyLength is valid for the current algorithm

+		/// </summary>

+		/// <param name="bitLength">the given keyLength</param>

+		public bool ValidKeySize(int bitLength) {

+			return IsLegalKeySize(LegalKeySizesValue, bitLength);

+		}

+		

+		/// <summary>

+		/// Creates the default implementation of the default asymmetric algorithm (RSA).

+		/// </summary>

+		public static AsymmetricAlgorithm Create () {

+			return RSA.Create();

+		}

+	

+		/// <summary>

+		/// Creates a specific implementation of the given asymmetric algorithm.

+		/// </summary>

+		/// <param name="algName">the given algorithm</param>

+		[MonoTODO]

+		public static AsymmetricAlgorithm Create (string algName) {

+			// TODO: use reflection to create a new instance of the given algorithm

+			return null;

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/AsymmetricKeyExchangeDeformatter.cs b/mcs/class/corlib/System.Security.Cryptography/AsymmetricKeyExchangeDeformatter.cs
new file mode 100755
index 00000000000..78ee4ce669c
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/AsymmetricKeyExchangeDeformatter.cs
@@ -0,0 +1,45 @@
+//

+// System.Security.Cryptography AsymmetricKeyExchangeDeformatter Class implementation

+//

+// Authors:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+using System.Security;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Abstract base class for all asymmetric key exchange deformatter.

+	/// Available derived classes:

+	/// RSAOAEPKeyExchangeDeformatter, RSAPKCS1KeyExchangeDeformatter

+	/// </summary>

+	public abstract class AsymmetricKeyExchangeDeformatter {

+		

+		/// <summary>

+		/// constructor, no idea why it is here (abstract class)  :-)

+		/// just for compatibility with MS

+		/// </summary>

+		public AsymmetricKeyExchangeDeformatter() {

+		}

+		

+		/// <summary>

+		/// XML string containing the parameters of an asymmetric key exchange operation

+		/// </summary>

+		public abstract string Parameters {get; set;}

+		

+		/// <summary>

+		/// get secret data

+		/// </summary>

+		public abstract byte[] DecryptKeyExchange(byte[] rgb);

+		

+		/// <summary>

+		/// set the private key

+		/// </summary>

+		public abstract void SetKey(AsymmetricAlgorithm key);

+		

+	} // AsymmetricKeyExchangeDeformatter

+	

+} // System.Security.Cryptography

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/AsymmetricKeyExchangeFormatter.cs b/mcs/class/corlib/System.Security.Cryptography/AsymmetricKeyExchangeFormatter.cs
new file mode 100755
index 00000000000..e1b5c0f16de
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/AsymmetricKeyExchangeFormatter.cs
@@ -0,0 +1,50 @@
+//

+// System.Security.Cryptography AsymmetricKeyExchangeFormatter Class implementation

+//

+// Authors:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+using System.Security;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Abstract base class for all asymmetric key exchange formatter.

+	/// Available derived classes:

+	/// RSAOAEPKeyExchangeFormatter, RSAPKCS1KeyExchangeFormatter

+	/// </summary>

+	public abstract class AsymmetricKeyExchangeFormatter {

+		

+		/// <summary>

+		/// constructor, no idea why it is here (abstract class)  :-)

+		/// just for compatibility with MS

+		/// </summary>

+		public AsymmetricKeyExchangeFormatter() {

+		}

+		

+		/// <summary>

+		/// XML string containing the parameters of an asymmetric key exchange operation

+		/// </summary>

+		public abstract string Parameters {get;}

+		

+		/// <summary>

+		/// create encrypted key exchange data

+		/// </summary>

+		public abstract byte[] CreateKeyExchange(byte[] data);

+

+		/// <summary>

+		/// create encrypted key exchange data

+		/// </summary>

+		public abstract byte[] CreateKeyExchange(byte[] data, Type symAlgType);

+

+		/// <summary>

+		/// set the private key

+		/// </summary>

+		public abstract void SetKey(AsymmetricAlgorithm key);

+		

+	} // AsymmetricKeyExchangeFormatter

+	

+} // System.Security.Cryptography

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/AsymmetricSignatureDeformatter.cs b/mcs/class/corlib/System.Security.Cryptography/AsymmetricSignatureDeformatter.cs
new file mode 100755
index 00000000000..55abce71c5c
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/AsymmetricSignatureDeformatter.cs
@@ -0,0 +1,52 @@
+//

+// System.Security.Cryptography AsymmetricSignatureDeformatter Class implementation

+//

+// Authors:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+using System.Security;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Abstract base class for all asymmetric signature deformatter.

+	/// Available derived classes:

+	/// DSASignatureDeformatter, RSAPKCS1SignatureDeformatter

+	/// </summary>

+	public abstract class AsymmetricSignatureDeformatter {

+		

+		/// <summary>

+		/// constructor, no idea why it is here (abstract class)  :-)

+		/// just for compatibility with MS

+		/// </summary>

+		public AsymmetricSignatureDeformatter() {

+		}

+		

+		/// <summary>

+		/// Sets the hash algorithm used for verifying a signature

+		/// </summary>

+		public abstract void SetHashAlgorithm(string strName);		

+		

+		/// <summary>

+		/// set the private key

+		/// </summary>

+		public abstract void SetKey(AsymmetricAlgorithm key);

+		

+		/// <summary>

+		/// Verifies the given Signature

+		/// </summary>

+		public abstract bool VerifySignature(byte[] rgbHash, byte[] rgbSignature);

+

+		/// <summary>

+		/// Verifies the given Signature with the given hash algorithm

+		/// </summary>

+		public virtual bool VerifySignature(HashAlgorithm hash, byte[] rgbSignature) {

+			return VerifySignature(hash.Hash, rgbSignature);

+		}

+		

+	} // AsymmetricSignatureDeformatter

+	

+} // System.Security.Cryptography

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/AsymmetricSignatureFormatter.cs b/mcs/class/corlib/System.Security.Cryptography/AsymmetricSignatureFormatter.cs
new file mode 100755
index 00000000000..541b8a4faa3
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/AsymmetricSignatureFormatter.cs
@@ -0,0 +1,52 @@
+//

+// System.Security.Cryptography AsymmetricSignatureFormatter Class implementation

+//

+// Authors:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+using System.Security;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Abstract base class for all asymmetric signature formatter.

+	/// Available derived classes:

+	/// DSASignatureFormatter, RSAPKCS1SignatureFormatter

+	/// </summary>

+	public abstract class AsymmetricSignatureFormatter {

+		

+		/// <summary>

+		/// constructor, no idea why it is here (abstract class)  :-)

+		/// just for compatibility with MS

+		/// </summary>

+		public AsymmetricSignatureFormatter() {

+		}

+		

+		/// <summary>

+		/// Sets the hash algorithm used for verifying a signature

+		/// </summary>

+		public abstract void SetHashAlgorithm(string strName);		

+		

+		/// <summary>

+		/// set the private key

+		/// </summary>

+		public abstract void SetKey(AsymmetricAlgorithm key);

+		

+		/// <summary>

+		/// Create a signature from the given data

+		/// </summary>

+		public abstract byte[] CreateSignature(byte[] rgbHash);

+

+		/// <summary>

+		/// Create a signature from data with the specified hash algorithm

+		/// </summary>

+		public virtual byte[] CreateSignature(HashAlgorithm hash) {

+			return CreateSignature(hash.Hash);

+		}

+		

+	} // AsymmetricSignatureFormatter

+	

+} // System.Security.Cryptography

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/ChangeLog b/mcs/class/corlib/System.Security.Cryptography/ChangeLog
new file mode 100644
index 00000000000..fe803598698
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/ChangeLog
@@ -0,0 +1,100 @@
+2002-06-29  Martin Baulig  <martin@gnome.org>
+
+	* AsymmetricAlgorithm.cs: Removed a duplicate semicolon to make it compile.
+
+2002-05-19  Martin Baulig  <martin@gnome.org>
+
+	* FromBase64Transform.cs (TransformFinalBlock): The return value of
+	`DoTransform' tells us the number of bytes actually written - if it's
+	smaller than `res', copy it to a smaller array.
+
+2002-02-21  Mark Crichton <crichton@gimp.org>
+
+	* RNGCryptoServiceProvider.cs: New file.
+	* RandomNumberGenerator.cs: Constructor is now marked public.
+
+2002-02-13  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* DSACryptoServiceProvider.cs, SHA384Managed.cs, SHA512Managed.cs,
+	Rijndael.cs, RSA.cs, RSAParameters.cs : New files (stubs)
+
+Mon Feb 11 13:26:17 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* X509Certificates: dummy class.
+
+2002-01-10  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Create (trivial) implementation of RandomNumberGenerator
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* CryptoAPITransform.cs, DESCryptoProvider.cs : MonoTODO attribute
+	decoration.
+
+	* HashAlgorithm.cs, MD5.cs, SHA1.cs, SHA256.cs, SHA384.cs : Ditto.
+
+	* SHA512.cs, SymmetricAlgorithm.cs, ToBase64Transform.cs, 
+	AsymmetricAlgorithm.cs, CryptoStream.cs, DSA.cs, DSASignatureDeformatter.cs,
+	DSASignatureFormatter.cs, SignatureDescription.cs : Ditto.
+	
+Wed Nov 14 17:04:30 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* MD5CryptoServiceProvider.cs, SHA1CryptoServiceProvider.cs,
+	SHA256Managed.cs: CLSCompliant updates.
+
+2001-10-11  Thomas Neidhart <tome@sbox.tugraz.at>
+
+	* CryptoAPITransform.cs: Initial version
+	* CryptoStream.cs: Initial version
+	* CspParameter.cs: Initial version
+	* CspProviderFlags.cs: Initial version
+	* DSA.cs: Initial version
+	* DSAParameters.cs: Initial version
+	* DSASignatureDeformatter.cs: Initial version
+	* DSASignatureFormatter.cs: Initial version
+	* DeriveBytes.cs: Initial version
+
+2001-10-06  Thomas Neidhart <tome@sbox.tugraz.at>
+
+    * AsymmetricAlgorithm.cs: Inital version
+	* AsymmetricKeyExchangeDeformatter.cs: Initial version
+	* AsymmetricKeyExchangeFormatter.cs: Initial version
+	* AsymmetricSignatureDeformatter.cs: Initial version
+	* AsymmetricSignatureFormatter.cs: Initial version
+	* PaddingMode.cs: Added PaddingMode.None
+	* SignatureDescription.cs: Initial version
+    * CryptographicException.cs: Initial version
+	* CryptographicUnknownOperationException.cs: Initial version
+	* SymmetricAlgorithm.cs: Implemented CreateDecryptor, CreateEncryptor
+	  and Create() methods.
+	
+2001-08-20  Sergey Chaban <serge@wildwestsoftware.com>
+
+	* DES.cs encryption core is about 30% faster than previous version.
+	* DESCryptoServiceProvider.cs added PKCS-5 padding.
+
+2001-08-09  Sergey Chaban <serge@wildwestsoftware.com>
+
+	* ToBase64Transform.cs: Base64Table now supports both encoding
+	  and decoding tables. As a result Table was renamed to EncodeTable
+	  and DecodeTable was added.
+	* FromBase64Transform.cs: Initial check-in.
+	* DES.cs: Initial check-in.
+	* DESCryptoServiceProvider.cs: Initial check-in.
+
+2001-08-01  Matthew S. Ford  <Matthew.S.Ford@Rose-Hulman.Edu>
+
+	* CipherMode.cs: Initial version.
+	* CryptoStreamMode.cs: Initial version.
+	* HashAlgorithm.cs: Initial version.
+	* ICryptoTransform.cs: Initial version.
+	* KeySizes.cs: Initial version.
+	* MD5.cs: Initial version.
+	* MD5CryptoServiceProvider.cs: Initial version.
+	* PaddingMode.cs: Initial version.
+	* SHA1.cs: Initial version.
+	* SHA1CryptoServiceProvider.cs: Initial version.
+	* SHA256.cs: Initial version.
+	* SHA256Managed.cs: Initial version.
+	* SHA384.cs: Initial version.
+	* SHA512.cs: Initial version.
+
diff --git a/mcs/class/corlib/System.Security.Cryptography/CipherMode.cs b/mcs/class/corlib/System.Security.Cryptography/CipherMode.cs
new file mode 100644
index 00000000000..b64fe175111
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/CipherMode.cs
@@ -0,0 +1,24 @@
+//

+// System.Security.Cryptography CipherMode enumeration

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+namespace System.Security.Cryptography {

+

+	/// <summary>

+	/// Block cipher modes of operation.

+	/// </summary>

+	public enum CipherMode {

+		CBC = 0x1, // Cipher Block Chaining

+		ECB, // Electronic Codebook

+		OFB, // Output Feedback

+		CFB, // Cipher Feedback

+		CTS, // Cipher Text Stealing

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoAPITransform.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoAPITransform.cs
new file mode 100755
index 00000000000..ea16089740e
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/CryptoAPITransform.cs
@@ -0,0 +1,77 @@
+//

+// System.Security.Cryptography CryptoAPITransform.cs

+//

+// Author:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+using System.IO;

+

+namespace System.Security.Cryptography

+{

+

+	public sealed class CryptoAPITransform : ICryptoTransform

+	{

+		public CryptoAPITransform() 

+		{

+		}

+		

+		/// <summary>

+		/// Indicates if the Transform object can transform multiple blocks

+		/// </summary>

+		[MonoTODO]

+		public bool CanTransformMultipleBlocks

+		{

+			get 

+			{

+				// FIXME: should not be always true

+				return true;

+			}

+		}

+

+		[MonoTODO]

+		public int InputBlockSize

+		{

+			get {

+				// TODO: implement

+				return 0;

+			}

+		}

+

+		[MonoTODO]

+		public IntPtr KeyHandle 

+		{

+			get {

+				// TODO: implement

+				return IntPtr.Zero;

+			}

+		}

+

+		[MonoTODO]

+		public int OutputBlockSize 

+		{

+			get {

+				// TODO: implement

+				return 0;

+			}

+		}

+

+		[MonoTODO]

+		public int TransformBlock(byte[] inputBuffer, int inputOffset, 

+		                          int inputCount, byte[] outputBuffer, int outputOffset)

+		{

+			// TODO: implement

+			return 0;

+		}

+

+		[MonoTODO]

+		public byte[] TransformFinalBlock(byte[] inputBuffer, int inputOffset, int inputCount)

+		{

+			// TODO: implement

+			return null;

+		}

+		

+	} // CryptoAPITransform

+	

+} // System.Security.Cryptography

diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
new file mode 100755
index 00000000000..6dad1ca628d
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/CryptoStream.cs
@@ -0,0 +1,120 @@
+//

+// System.Security.Cryptography CryptoStream.cs

+//

+// Author:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+using System.IO;

+

+namespace System.Security.Cryptography

+{

+

+	public class CryptoStream : Stream

+	{

+		private CryptoStreamMode _mode;

+		

+		public CryptoStream(Stream stream, ICryptoTransform transform, CryptoStreamMode mode) 

+		{

+			_mode = mode;

+		}

+		

+		public override bool CanRead

+		{

+			get {

+				switch (_mode) {

+					case CryptoStreamMode.Read:

+						return true;

+					

+					case CryptoStreamMode.Write:

+						return false;

+					

+					default:

+						return false;

+				}

+			}

+		}

+

+		public override bool CanSeek

+		{

+			get {

+				return false;

+			}

+		}

+

+		public override bool CanWrite

+		{

+			get {

+				switch (_mode) {

+					case CryptoStreamMode.Read:

+						return false;

+					

+					case CryptoStreamMode.Write:

+						return true;

+					

+					default:

+						return false;

+				}

+			}

+		}

+		

+		public override long Length

+		{

+			get {

+				throw new NotSupportedException("Length property not supported by CryptoStream");

+			}

+		}

+

+		public override long Position

+		{

+			get {

+				throw new NotSupportedException("Position property not supported by CryptoStream");

+			}

+			set {

+				throw new NotSupportedException("Position property not supported by CryptoStream");

+			}

+		}

+

+		[MonoTODO]

+		public override int Read(byte[] buffer, int offset, int count)

+		{

+			// TODO: implement

+			return 0;

+		}

+

+		[MonoTODO]

+		public override void Write(byte[] buffer, int offset, int count)

+		{

+			// TODO: implement

+		}

+

+		[MonoTODO]

+		public override void Flush()

+		{

+			// TODO: implement

+		}

+

+		[MonoTODO]

+		public void FlushFinalBlock()

+		{

+			if (_mode != CryptoStreamMode.Write)

+				throw new NotSupportedException("cannot flush a non-writeable CryptoStream");

+			

+			// TODO: implement

+		}

+

+		public override long Seek(long offset, SeekOrigin origin)

+		{

+			throw new NotSupportedException("cannot seek a CryptoStream");

+		}

+		

+		public override void SetLength(long value)

+		{

+			// LAMESPEC: should throw NotSupportedException like Seek??

+			return;

+		}

+		

+	} // CryptoStream

+	

+} // System.Security.Cryptography

diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptoStreamMode.cs b/mcs/class/corlib/System.Security.Cryptography/CryptoStreamMode.cs
new file mode 100644
index 00000000000..6e08107b7d2
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/CryptoStreamMode.cs
@@ -0,0 +1,20 @@
+//

+// System.Security.Cryptography CryptoStreamMode enumeration

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by authors.

+//

+

+namespace System.Security.Cryptography {

+

+	/// <summary>

+	/// FIXME (the comment): Whether the crypto-stream is in read mode or write mode?

+	/// </summary>

+	public enum CryptoStreamMode {

+		Read,

+		Write

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptographicException.cs b/mcs/class/corlib/System.Security.Cryptography/CryptographicException.cs
new file mode 100755
index 00000000000..676a1b8ff02
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/CryptographicException.cs
@@ -0,0 +1,40 @@
+//

+// System.Security.Cryptography.CryptographicException.cs

+//

+// Author:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+

+namespace System.Security.Cryptography {

+

+	[Serializable]

+	public class CryptographicException : SystemException {

+		// Constructors

+		public CryptographicException ()

+			: base ("Error occured during a cryptographic operation.")

+		{

+		}

+

+		public CryptographicException (int hr)

+		{

+			HResult = hr;

+		}

+

+		public CryptographicException (string message)

+			: base (message)

+		{

+		}

+

+		public CryptographicException (string message, Exception inner)

+			: base (message, inner)

+		{

+		}

+

+		public CryptographicException (string format, string insert)

+			: base (String.Format(format, insert))

+		{

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Cryptography/CryptographicUnexpectedOperationExcpetion.cs b/mcs/class/corlib/System.Security.Cryptography/CryptographicUnexpectedOperationExcpetion.cs
new file mode 100755
index 00000000000..7beeea48132
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/CryptographicUnexpectedOperationExcpetion.cs
@@ -0,0 +1,35 @@
+//

+// System.Security.Cryptography.CryptographicUnexpectedOperationException.cs

+//

+// Author:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+

+namespace System.Security.Cryptography {

+

+	[Serializable]

+	public class CryptographicUnexpectedOperationException : CryptographicException {

+		// Constructors

+		public CryptographicUnexpectedOperationException ()

+			: base ("Error occured during a cryptographic operation.")

+		{

+		}

+

+		public CryptographicUnexpectedOperationException (string message)

+			: base (message)

+		{

+		}

+

+		public CryptographicUnexpectedOperationException (string message, Exception inner)

+			: base (message, inner)

+		{

+		}

+

+		public CryptographicUnexpectedOperationException (string format, string insert)

+			: base (String.Format(format, insert))

+		{

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Cryptography/CspParameters.cs b/mcs/class/corlib/System.Security.Cryptography/CspParameters.cs
new file mode 100755
index 00000000000..7c84eaff8af
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/CspParameters.cs
@@ -0,0 +1,57 @@
+//

+// System.Security.Cryptography CspParameters.cs

+//

+// Author:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+

+namespace System.Security.Cryptography

+{

+

+	/// <summary>

+	/// Contains information passed to Crypto Service Providers (CSP)

+	/// </summary>

+	public sealed class CspParameters

+	{

+		private CspProviderFlags _Flags;

+	

+		public CspParameters() : this(1) {}

+		

+		public CspParameters(int dwTypeIn) : this(dwTypeIn, null) {}

+		

+		public CspParameters(int dwTypeIn, string strProviderNameIn) : this(dwTypeIn, null, null) {}

+		

+		public CspParameters(int dwTypeIn, string strProviderNameIn, string strContainerNameIn)

+		{

+			ProviderType = dwTypeIn;

+			ProviderName = strProviderNameIn;

+			KeyContainerName = strContainerNameIn;

+			

+			// not defined in specs, only tested from M$ impl

+			KeyNumber = -1;

+		}

+		

+		public string KeyContainerName;

+		

+		public int KeyNumber;

+		

+		public string ProviderName;

+		

+		public int ProviderType;

+		

+		public CspProviderFlags Flags 

+		{

+			get {

+				return _Flags;

+			}

+			

+			set {

+				_Flags = value;

+			}

+		}

+		

+	} // CspParameters

+	

+} // System.Security.Cryptography

diff --git a/mcs/class/corlib/System.Security.Cryptography/CspProviderFlags.cs b/mcs/class/corlib/System.Security.Cryptography/CspProviderFlags.cs
new file mode 100755
index 00000000000..ca882069417
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/CspProviderFlags.cs
@@ -0,0 +1,20 @@
+//

+// System.Security.Cryptography CspProviderFlags enumeration

+//

+// Authors:

+//   Thomas Neidhart <tome@sbox.tugraz.at>

+//

+

+

+namespace System.Security.Cryptography {

+

+	/// <summary>

+	/// CSP Provider Flags

+	/// </summary>

+	[Flags]
+	public enum CspProviderFlags {

+		UseMachineKeyStore = 1,

+		UseDefaultKeyContainer,

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/DES.cs b/mcs/class/corlib/System.Security.Cryptography/DES.cs
new file mode 100644
index 00000000000..f2d344f21c2
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/DES.cs
@@ -0,0 +1,587 @@
+//
+// System.Security.Cryptography.DES
+//
+// Author:
+//   Sergey Chaban (serge@wildwestsoftware.com)
+//
+
+using System;
+using System.Security.Cryptography;
+
+// References: FIPS PUB 46-3
+
+namespace System.Security.Cryptography {
+
+	internal sealed class DESCore {
+
+		internal static readonly int KEY_BIT_SIZE = 64;
+		internal static readonly int KEY_BYTE_SIZE = KEY_BIT_SIZE / 8;
+		internal static readonly int BLOCK_BIT_SIZE = 64;
+		internal static readonly int BLOCK_BYTE_SIZE = BLOCK_BIT_SIZE / 8;
+
+		private byte [] keySchedule;
+		private byte [] byteBuff;
+		private uint [] dwordBuff;
+
+		internal delegate void DESCall (byte [] block, byte [] output);
+
+
+		// Ek(Ek(m)) = m
+		internal static ulong [] weakKeys = {
+			0x0101010101010101, /* 0000000 0000000 */
+			0xFEFEFEFEFEFEFEFE, /* FFFFFFF FFFFFFF */
+			0x1F1F1F1FE0E0E0E0, /* 0000000 FFFFFFF */
+			0xE0E0E0E01F1F1F1F  /* FFFFFFF 0000000 */
+		};
+
+		// Ek1(Ek2(m)) = m
+		internal static ulong [] semiweakKeys = {
+			0x01FE01FE01FE01FE, 0xFE01FE01FE01FE01,
+			0x1FE01FE00EF10EF1, 0xE01FE01FF10EF10E,
+			0x01E001E001F101F1, 0xE001E001F101F101,
+			0x1FFE1FFE0EFE0EFE, 0xFE1FFE1FFE0EFE0E,
+			0x011F011F010E010E, 0x1F011F010E010E01,
+			0xE0FEE0FEF1FEF1FE, 0xFEE0FEE0FEF1FEF1
+		};
+
+
+
+		// S-boxes from FIPS 46-3, Appendix 1, page 17
+		private static byte [] sBoxes = {
+						/* S1 */
+			14,  4, 13,  1,  2, 15, 11,  8,  3, 10,  6, 12,  5,  9,  0,  7,
+			 0, 15,  7,  4, 14,  2, 13,  1, 10,  6, 12, 11,  9,  5,  3,  8,
+			 4,  1, 14,  8, 13,  6,  2, 11, 15, 12,  9,  7,  3, 10,  5,  0,
+			15, 12,  8,  2,  4,  9,  1,  7,  5, 11,  3, 14, 10,  0,  6, 13,
+
+						/* S2 */
+			15,  1,  8, 14,  6, 11,  3,  4,  9,  7,  2, 13, 12,  0,  5, 10,
+			 3, 13,  4,  7, 15,  2,  8, 14, 12,  0,  1, 10,  6,  9, 11,  5,
+			 0, 14,  7, 11, 10,  4, 13,  1,  5,  8, 12,  6,  9,  3,  2, 15,
+			13,  8, 10,  1,  3, 15,  4,  2, 11,  6,  7, 12,  0,  5, 14,  9,
+
+						/* S3 */
+			10,  0,  9, 14,  6,  3, 15,  5,  1, 13, 12,  7, 11,  4,  2,  8,
+			13,  7,  0,  9,  3,  4,  6, 10,  2,  8,  5, 14, 12, 11, 15,  1,
+			13,  6,  4,  9,  8, 15,  3,  0, 11,  1,  2, 12,  5, 10, 14,  7,
+			 1, 10, 13,  0,  6,  9,  8,  7,  4, 15, 14,  3, 11,  5,  2, 12,
+
+						/* S4 */
+			 7, 13, 14,  3,  0,  6,  9, 10,  1,  2,  8,  5, 11, 12,  4, 15,
+			13,  8, 11,  5,  6, 15,  0,  3,  4,  7,  2, 12,  1, 10, 14,  9,
+			10,  6,  9,  0, 12, 11,  7, 13, 15,  1,  3, 14,  5,  2,  8,  4,
+			 3, 15,  0,  6, 10,  1, 13,  8,  9,  4,  5, 11, 12,  7,  2, 14,
+
+						/* S5 */
+			 2, 12,  4,  1,  7, 10, 11,  6,  8,  5,  3, 15, 13,  0, 14,  9,
+			14, 11,  2, 12,  4,  7, 13,  1,  5,  0, 15, 10,  3,  9,  8,  6,
+			 4,  2,  1, 11, 10, 13,  7,  8, 15,  9, 12,  5,  6,  3,  0, 14,
+			11,  8, 12,  7,  1, 14,  2, 13,  6, 15,  0,  9, 10,  4,  5,  3,
+
+						/* S6 */
+			12,  1, 10, 15,  9,  2,  6,  8,  0, 13,  3,  4, 14,  7,  5, 11,
+			10, 15,  4,  2,  7, 12,  9,  5,  6,  1, 13, 14,  0, 11,  3,  8,
+			 9, 14, 15,  5,  2,  8, 12,  3,  7,  0,  4, 10,  1, 13, 11,  6,
+			 4,  3,  2, 12,  9,  5, 15, 10, 11, 14,  1,  7,  6,  0,  8, 13,
+
+						/* S7 */
+			 4, 11,  2, 14, 15,  0,  8, 13,  3, 12,  9,  7,  5, 10,  6,  1,
+			13,  0, 11,  7,  4,  9,  1, 10, 14,  3,  5, 12,  2, 15,  8,  6,
+			 1,  4, 11, 13, 12,  3,  7, 14, 10, 15,  6,  8,  0,  5,  9,  2,
+			 6, 11, 13,  8,  1,  4, 10,  7,  9,  5,  0, 15, 14,  2,  3, 12,
+
+						/* S8 */
+			13,  2,  8,  4,  6, 15, 11,  1, 10,  9,  3, 14,  5,  0, 12,  7,
+			 1, 15, 13,  8, 10,  3,  7,  4, 12,  5,  6, 11,  0, 14,  9,  2,
+			 7, 11,  4,  1,  9, 12, 14,  2,  0,  6, 10, 13, 15,  3,  5,  8,
+			 2,  1, 14,  7,  4, 10,  8, 13, 15, 12,  9,  0,  3,  5,  6, 11
+		};
+
+
+		// P table from page 15, also in Appendix 1, page 18
+		private static byte [] pTab = {	
+			16-1,  7-1, 20-1, 21-1,
+			29-1, 12-1, 28-1, 17-1,
+			 1-1, 15-1, 23-1, 26-1,
+			 5-1, 18-1, 31-1, 10-1,
+			 2-1,  8-1, 24-1, 14-1,
+			32-1, 27-1,  3-1,  9-1,
+			19-1, 13-1, 30-1,  6-1,
+			22-1, 11-1,  4-1, 25-1
+		};
+
+
+		// Permuted choice 1 table, PC-1, page 19
+		// Translated to zero-based format.
+		private static byte [] PC1 = {
+			57-1, 49-1, 41-1, 33-1, 25-1, 17-1,  9-1,
+			 1-1, 58-1, 50-1, 42-1, 34-1, 26-1, 18-1,
+			10-1,  2-1, 59-1, 51-1, 43-1, 35-1, 27-1,
+			19-1, 11-1,  3-1, 60-1, 52-1, 44-1, 36-1,
+
+			63-1, 55-1, 47-1, 39-1, 31-1, 23-1, 15-1,
+			 7-1, 62-1, 54-1, 46-1, 38-1, 30-1, 22-1,
+			14-1,  6-1, 61-1, 53-1, 45-1, 37-1, 29-1,
+			21-1, 13-1,  5-1, 28-1, 20-1, 12-1,  4-1
+		};
+
+
+		private static byte [] leftRot = {
+			1, 1, 2, 2, 2, 2, 2, 2, 1, 2, 2, 2, 2, 2, 2, 1
+		};
+
+		private static byte [] leftRotTotal;
+
+
+
+		// Permuted choice 2 table, PC-2, page 21
+		// Translated to zero-based format.
+		private static byte [] PC2 = {
+			14-1, 17-1, 11-1, 24-1,  1-1,  5-1,
+			 3-1, 28-1, 15-1,  6-1, 21-1, 10-1,
+			23-1, 19-1, 12-1,  4-1, 26-1,  8-1,
+			16-1,  7-1, 27-1, 20-1, 13-1,  2-1,
+			41-1, 52-1, 31-1, 37-1, 47-1, 55-1,
+			30-1, 40-1, 51-1, 45-1, 33-1, 48-1,
+			44-1, 49-1, 39-1, 56-1, 34-1, 53-1,
+			46-1, 42-1, 50-1, 36-1, 29-1, 32-1
+		};
+
+
+		// Initial permutation IP, page 10.
+		// Transposed to 0-based format.
+		private static byte [] ipBits = {
+			58-1, 50-1, 42-1, 34-1, 26-1, 18-1, 10-1,  2-1,
+			60-1, 52-1, 44-1, 36-1, 28-1, 20-1, 12-1,  4-1,
+			62-1, 54-1, 46-1, 38-1, 30-1, 22-1, 14-1,  6-1,
+			64-1, 56-1, 48-1, 40-1, 32-1, 24-1, 16-1,  8-1,
+			57-1, 49-1, 41-1, 33-1, 25-1, 17-1,  9-1,  1-1,
+			59-1, 51-1, 43-1, 35-1, 27-1, 19-1, 11-1,  3-1,
+			61-1, 53-1, 45-1, 37-1, 29-1, 21-1, 13-1,  5-1,
+			63-1, 55-1, 47-1, 39-1, 31-1, 23-1, 15-1,  7-1
+		};
+
+
+		// Final permutation FP = IP^(-1), page 10.
+		// Transposed to 0-based format.
+		private static byte [] fpBits = {
+			40-1,  8-1, 48-1, 16-1, 56-1, 24-1, 64-1, 32-1,
+			39-1,  7-1, 47-1, 15-1, 55-1, 23-1, 63-1, 31-1,
+			38-1,  6-1, 46-1, 14-1, 54-1, 22-1, 62-1, 30-1,
+			37-1,  5-1, 45-1, 13-1, 53-1, 21-1, 61-1, 29-1,
+			36-1,  4-1, 44-1, 12-1, 52-1, 20-1, 60-1, 28-1,
+			35-1,  3-1, 43-1, 11-1, 51-1, 19-1, 59-1, 27-1,
+			34-1,  2-1, 42-1, 10-1, 50-1, 18-1, 58-1, 26-1,
+			33-1,  1-1, 41-1,  9-1, 49-1, 17-1, 57-1, 25-1
+		};
+
+
+
+		private static uint [] spBoxes;
+		private static int [] ipTab;
+		private static int [] fpTab;
+
+
+		static DESCore ()
+		{
+			spBoxes = new uint [64 * 8];
+
+			int [] pBox = new int [32];
+
+			for (int p = 0; p < 32; p++) {
+				for (int i = 0; i < 32; i++) {
+					if (p == pTab [i]) {
+						pBox [p] = i;
+						break;
+					}
+				}
+			}
+
+
+			for (int s = 0; s < 8; s++) { // for each S-box
+				int sOff = s << 6;
+
+				for (int i = 0; i < 64; i++) { // inputs
+					uint sp=0;
+
+					int indx = (i & 0x20) | ((i & 1) << 4) | ((i >> 1) & 0xF);
+
+					for (int j = 0; j < 4; j++) { // for each bit in the output
+						if ((sBoxes [sOff + indx] & (8 >> j)) != 0) {
+							sp |= (uint) (1 << (31 - pBox [(s << 2) + j]));
+						}
+					}
+
+					spBoxes [sOff + i] = sp;
+				}
+			}
+
+
+			leftRotTotal = new byte [leftRot.Length];
+
+
+			for (int i = 0; i < leftRot.Length; i++) {
+				int r = 0;
+				for (int j = 0; j <= i; r += leftRot [j++]);
+				leftRotTotal [i]  = (byte) r;
+			}
+
+
+			InitPermutationTable (ipBits, out ipTab);
+			InitPermutationTable (fpBits, out fpTab);
+
+		} // class constructor
+
+
+
+		// Default constructor.
+		internal DESCore ()
+		{
+			keySchedule = new byte [KEY_BYTE_SIZE * 16];
+			byteBuff = new byte [BLOCK_BYTE_SIZE];
+			dwordBuff = new uint [BLOCK_BYTE_SIZE / 4];
+		}
+
+
+
+
+		private static void InitPermutationTable (byte [] pBits, out int [] permTab)
+		{
+			permTab = new int [8*2 * 8*2 * (64/32)];
+
+			for (int i = 0; i < 16; i++) {
+				for (int j = 0; j < 16; j++) {
+					int offs = (i << 5) + (j << 1);
+					for (int n = 0; n < 64; n++) {
+						int bitNum = (int) pBits [n];
+						if ((bitNum >> 2 == i) &&
+						    0 != (j & (8 >> (bitNum & 3)))) {
+							permTab [offs + (n >> (3+2))] |= (int) ((0x80808080 & (0xFF << (n & (3 << 3)))) >> (n & 7));
+						}
+					}
+				}
+			}
+		}
+
+
+
+		internal static ulong PackKey (byte [] key)
+		{
+			ulong res = 0;
+			for (int i = 0, sh = 8*KEY_BYTE_SIZE; (sh = sh - 8) >= 0; i++) {
+				res |= (ulong) key [i] << sh;
+			}
+			return res;
+		}
+
+
+
+		internal static byte [] UnpackKey (ulong key)
+		{
+			byte [] res = new byte [KEY_BYTE_SIZE];
+			for (int i = 0, sh = 8*KEY_BYTE_SIZE; (sh = sh - 8) >= 0; i++) {
+				res [i] = (byte) (key >> sh);
+			}
+			return res;
+		}
+
+
+
+		internal static bool IsValidKeySize (byte [] key)
+		{
+			return (key.Length == KEY_BYTE_SIZE);
+		}
+
+
+
+		private uint CipherFunct(uint r, int n)
+		{
+			uint res = 0;
+			byte [] subkey = keySchedule;
+			int i = n << 3;
+
+			uint rt = (r >> 1) | (r << 31); // ROR32(r)
+			res |= spBoxes [0*64 + (((rt >> 26) ^ subkey [i++]) & 0x3F)];
+			res |= spBoxes [1*64 + (((rt >> 22) ^ subkey [i++]) & 0x3F)];
+			res |= spBoxes [2*64 + (((rt >> 18) ^ subkey [i++]) & 0x3F)];
+			res |= spBoxes [3*64 + (((rt >> 14) ^ subkey [i++]) & 0x3F)];
+			res |= spBoxes [4*64 + (((rt >> 10) ^ subkey [i++]) & 0x3F)];
+			res |= spBoxes [5*64 + (((rt >>  6) ^ subkey [i++]) & 0x3F)];
+			res |= spBoxes [6*64 + (((rt >>  2) ^ subkey [i++]) & 0x3F)];
+			rt = (r << 1) | (r >> 31); // ROL32(r)
+			res |= spBoxes [7*64 + ((rt ^ subkey [i]) & 0x3F)];
+
+			return res;
+		}
+
+
+		private static void Permutation (byte [] input, byte [] _output, int [] permTab, bool preSwap)
+		{
+
+			if (preSwap) BSwap (input);
+
+			byte [] output = _output;
+
+			int offs1 = (((int)(input [0]) >> 4)) << 1;
+			int offs2 = (1 << 5) + ((((int)input [0]) & 0xF) << 1);
+
+			int d1 = permTab [offs1++] | permTab [offs2++];
+			int d2 = permTab [offs1]   | permTab [offs2];
+
+
+			int max = BLOCK_BYTE_SIZE << 1;
+			for (int i = 2, indx = 1; i < max; i += 2, indx++) {
+				int ii = (int) input [indx];
+				offs1 = (i << 5) + ((ii >> 4) << 1);
+				offs2 = ((i + 1) << 5) + ((ii & 0xF) << 1);
+
+				d1 |= permTab [offs1++] | permTab [offs2++];
+				d2 |= permTab [offs1]   | permTab [offs2];
+			}
+
+			if (preSwap) {
+				output [0] = (byte) (d1);
+				output [1] = (byte) (d1 >> 8);
+				output [2] = (byte) (d1 >> 16);
+				output [3] = (byte) (d1 >> 24);
+				output [4] = (byte) (d2);
+				output [5] = (byte) (d2 >> 8);
+				output [6] = (byte) (d2 >> 16);
+				output [7] = (byte) (d2 >> 24);
+			} else {
+				output [0] = (byte) (d1 >> 24);
+				output [1] = (byte) (d1 >> 16);
+				output [2] = (byte) (d1 >> 8);
+				output [3] = (byte) (d1);
+				output [4] = (byte) (d2 >> 24);
+				output [5] = (byte) (d2 >> 16);
+				output [6] = (byte) (d2 >> 8);
+				output [7] = (byte) (d2);
+			}
+		}
+
+
+
+
+		private static void BSwap (byte [] byteBuff)
+		{
+			byte t;
+
+			t = byteBuff [0];
+			byteBuff [0] = byteBuff [3];
+			byteBuff [3] = t;
+
+			t = byteBuff [1];
+			byteBuff [1] = byteBuff [2];
+			byteBuff [2] = t;
+
+			t = byteBuff [4];
+			byteBuff [4] = byteBuff [7];
+			byteBuff [7] = t;
+
+			t = byteBuff [5];
+			byteBuff [5] = byteBuff [6];
+			byteBuff [6] = t;
+		}
+
+
+
+		internal void SetKey (byte [] key)
+		{
+			// NOTE: see Fig. 3, Key schedule calculation, at page 20.
+
+			Array.Clear (keySchedule, 0, keySchedule.Length);
+
+			int keyBitSize = PC1.Length;
+
+			byte [] keyPC1 = new byte [keyBitSize]; // PC1-permuted key
+			byte [] keyRot = new byte [keyBitSize]; // PC1 & rotated
+
+			int indx = 0;
+
+			foreach (byte bitPos in PC1) {
+				keyPC1 [indx++] = (byte)((key [(int)bitPos >> 3] >> (7 ^ (bitPos & 7))) & 1);
+			}
+
+
+
+
+			int j;
+			for (int i = 0; i < KEY_BYTE_SIZE*2; i++) {
+				int b = keyBitSize >> 1;
+
+				for (j = 0; j < b; j++) {
+					int s = j + (int) leftRotTotal [i];
+					keyRot [j] = keyPC1 [s < b ? s : s - b];
+				}
+
+				for (j = b; j < keyBitSize; j++) {
+					int s = j + (int) leftRotTotal [i];
+					keyRot [j] = keyPC1 [s < keyBitSize ? s : s - b];
+				}
+
+				int keyOffs = i * KEY_BYTE_SIZE;
+
+				j = 0;
+				foreach (byte bitPos in PC2) {
+					if (keyRot [(int)bitPos] != 0) {
+						keySchedule [keyOffs + (j/6)] |= (byte) (0x80 >> ((j % 6) + 2));
+					}
+					j++;
+				}
+			}
+
+		}
+
+
+
+		internal void Encrypt (byte [] block, byte [] output)
+		{
+			byte [] dest = (output == null ? block : output);
+
+			byte [] byteBuff = this.byteBuff;
+			uint [] dwordBuff = this.dwordBuff;
+
+			Permutation (block, byteBuff, ipTab, false);
+
+			Buffer.BlockCopy (byteBuff, 0, dwordBuff, 0, BLOCK_BYTE_SIZE);
+
+			uint d0 = dwordBuff[0];
+			uint d1 = dwordBuff[1];
+
+			// 16 rounds
+			d0 ^= CipherFunct (d1,  0);
+			d1 ^= CipherFunct (d0,  1);
+			d0 ^= CipherFunct (d1,  2);
+			d1 ^= CipherFunct (d0,  3);
+			d0 ^= CipherFunct (d1,  4);
+			d1 ^= CipherFunct (d0,  5);
+			d0 ^= CipherFunct (d1,  6);
+			d1 ^= CipherFunct (d0,  7);
+			d0 ^= CipherFunct (d1,  8);
+			d1 ^= CipherFunct (d0,  9);
+			d0 ^= CipherFunct (d1, 10);
+			d1 ^= CipherFunct (d0, 11);
+			d0 ^= CipherFunct (d1, 12);
+			d1 ^= CipherFunct (d0, 13);
+			d0 ^= CipherFunct (d1, 14);
+			d1 ^= CipherFunct (d0, 15);
+
+
+			dwordBuff [0] = d1;
+			dwordBuff [1] = d0;
+			Buffer.BlockCopy (dwordBuff, 0, byteBuff, 0, BLOCK_BYTE_SIZE);
+
+			Permutation (byteBuff, dest, fpTab, true);
+		}
+
+
+		internal void Decrypt (byte [] block, byte [] output)
+		{
+			byte [] dest = (output == null ? block : output);
+
+			byte [] byteBuff = this.byteBuff;
+			uint [] dwordBuff = this.dwordBuff;
+
+			Permutation (block, byteBuff, ipTab, false);
+
+			Buffer.BlockCopy (byteBuff, 0, dwordBuff, 0, BLOCK_BYTE_SIZE);
+
+			uint d1 = dwordBuff [0];
+			uint d0 = dwordBuff [1];
+
+			// 16 rounds in reverse order
+			d1 ^= CipherFunct (d0, 15);
+			d0 ^= CipherFunct (d1, 14);
+			d1 ^= CipherFunct (d0, 13);
+			d0 ^= CipherFunct (d1, 12);
+			d1 ^= CipherFunct (d0, 11);
+			d0 ^= CipherFunct (d1, 10);
+			d1 ^= CipherFunct (d0,  9);
+			d0 ^= CipherFunct (d1,  8);
+			d1 ^= CipherFunct (d0,  7);
+			d0 ^= CipherFunct (d1,  6);
+			d1 ^= CipherFunct (d0,  5);
+			d0 ^= CipherFunct (d1,  4);
+			d1 ^= CipherFunct (d0,  3);
+			d0 ^= CipherFunct (d1,  2);
+			d1 ^= CipherFunct (d0,  1);
+			d0 ^= CipherFunct (d1,  0);
+
+			dwordBuff [0] = d0;
+			dwordBuff [1] = d1;
+
+
+			Buffer.BlockCopy (dwordBuff, 0, byteBuff, 0, BLOCK_BYTE_SIZE);
+
+			Permutation (byteBuff, dest, fpTab, true);
+		}
+
+
+	} // DESCore
+
+
+
+
+	public abstract class DES : SymmetricAlgorithm {
+		private byte [] key;
+
+		public DES ()
+		{
+		}
+
+		[MonoTODO]
+		public static new DES Create()
+		{
+			// TODO: implement
+			return null;
+		}
+
+		[MonoTODO]
+		public static new DES Create(string name)
+		{
+			// TODO: implement
+			return null;
+		}
+
+
+		public static bool IsWeakKey (byte [] rgbKey)
+		{
+			if (!DESCore.IsValidKeySize (rgbKey)) {
+				throw new CryptographicException ();
+			}
+
+			ulong lk = DESCore.PackKey (rgbKey);
+			foreach (ulong wk in DESCore.weakKeys) {
+				if (lk == wk) return true;
+			}
+			return false;
+		}
+
+
+		public static bool IsSemiWeakKey (byte [] rgbKey)
+		{
+			if (!DESCore.IsValidKeySize (rgbKey)) {
+				throw new CryptographicException ();
+			}
+
+			ulong lk = DESCore.PackKey (rgbKey);
+			foreach (ulong swk in DESCore.semiweakKeys) {
+				if (lk == swk) return true;
+			}
+			return false;
+		}
+
+		public override byte[] Key {
+			get {
+				return this.key;
+			}
+			set {
+				this.key = new byte [DESCore.KEY_BYTE_SIZE];
+				Array.Copy (value, 0, this.key, 0, DESCore.KEY_BYTE_SIZE);
+			}
+		}
+
+	} // DES
+
+} // System.Security.Cryptography
diff --git a/mcs/class/corlib/System.Security.Cryptography/DESCryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/DESCryptoServiceProvider.cs
new file mode 100644
index 00000000000..e04c3d36227
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/DESCryptoServiceProvider.cs
@@ -0,0 +1,250 @@
+//
+// System.Security.Cryptography.DESCryptoServiceProvider
+//
+// Author:
+//   Sergey Chaban (serge@wildwestsoftware.com)
+//
+
+
+
+using System;
+using System.Security.Cryptography;
+
+
+namespace System.Security.Cryptography {
+
+
+	internal class DESTransformBase : ICryptoTransform {
+
+		internal enum Mode : int {
+			ENCRYPTOR = 0,
+			DECRYPTOR = 1
+		}
+
+		protected delegate void Filter (byte [] workBuff);
+
+		private DESCore core;
+
+		private DESCore.DESCall cryptFn;
+		private Filter preprocess;
+		private Filter postprocess;
+
+		private byte [] iv;
+		private byte [] tmpBlock;
+
+		protected DESTransformBase (Mode mode, byte [] key, byte [] iv)
+		{
+			core = new DESCore ();
+
+			if (mode == Mode.ENCRYPTOR) {
+				cryptFn = new DESCore.DESCall (core.Encrypt);
+				preprocess = new Filter (this.EncPreprocess);
+				postprocess = new Filter (this.EncPostprocess);
+			} else {
+				cryptFn = new DESCore.DESCall (core.Decrypt);
+				preprocess = new Filter (this.DecPreprocess);
+				postprocess = new Filter (this.DecPostprocess);
+			}
+
+			core.SetKey (key);
+			this.iv = new byte [DESCore.BLOCK_BYTE_SIZE];
+			Array.Copy (iv, 0, this.iv, 0, DESCore.BLOCK_BYTE_SIZE);
+
+			tmpBlock = new byte [DESCore.BLOCK_BYTE_SIZE];
+		}
+
+
+		public virtual bool CanTransformMultipleBlocks {
+			get {
+				return true;
+			}
+		}
+
+
+		public virtual int InputBlockSize {
+			get {
+				return DESCore.BLOCK_BYTE_SIZE;
+			}
+		}
+
+		public virtual int OutputBlockSize {
+			get {
+				return DESCore.BLOCK_BYTE_SIZE;
+			}
+		}
+
+		private void EncPreprocess (byte [] workBuff)
+		{
+			byte [] iv = this.iv;
+			for (int i = 0; i < DESCore.BLOCK_BYTE_SIZE; i++) {
+				workBuff [i] ^= iv [i];
+			}
+		}
+
+		private void EncPostprocess (byte [] workBuff)
+		{
+			Array.Copy (workBuff, 0, iv, 0, DESCore.BLOCK_BYTE_SIZE);
+		}
+
+
+		private void DecPreprocess (byte [] workBuff)
+		{
+			Array.Copy (workBuff, 0, tmpBlock, 0, DESCore.BLOCK_BYTE_SIZE);
+		}
+
+		private void DecPostprocess (byte [] workBuff)
+		{
+			EncPreprocess (workBuff);
+			Array.Copy (tmpBlock, 0, iv, 0, DESCore.BLOCK_BYTE_SIZE);
+		}
+
+
+
+		private void Transform (byte [] workBuff)
+		{
+			preprocess (workBuff);
+			cryptFn (workBuff, null);
+			postprocess (workBuff);
+		}
+
+
+		public virtual int TransformBlock (byte [] inputBuffer, int inputOffset, int inputCount, byte [] outputBuffer, int outputOffset)
+		{
+			if ((inputCount & (DESCore.BLOCK_BYTE_SIZE-1)) != 0)
+				throw new CryptographicException ("Invalid input block size.");
+
+			if (outputOffset + inputCount > outputBuffer.Length)
+				throw new CryptographicException ("Insufficient output buffer size.");
+
+			int step = InputBlockSize;
+			int offs = inputOffset;
+			int full = inputCount / step;
+
+			byte [] workBuff = new byte [step];
+
+			for (int i = 0; i < full; i++) {
+				Array.Copy (inputBuffer, offs, workBuff, 0, step);
+				Transform (workBuff);
+				Array.Copy (workBuff, 0, outputBuffer, outputOffset, step);
+				offs += step;
+				outputOffset += step;
+			}
+
+			return (full * step);
+		}
+
+
+		[MonoTODO]
+		public virtual byte [] TransformFinalBlock (byte [] inputBuffer, int inputOffset, int inputCount)
+		{
+			// TODO: add decryption support
+
+			int num = (inputCount + DESCore.BLOCK_BYTE_SIZE) & (~(DESCore.BLOCK_BYTE_SIZE-1));
+			byte [] res = new byte [num];
+			int full = num - DESCore.BLOCK_BYTE_SIZE;
+
+			TransformBlock (inputBuffer, inputOffset, full, res, 0);
+
+			int rem = inputCount & (DESCore.BLOCK_BYTE_SIZE-1);
+
+			// PKCS-5 padding
+			for (int i = num; --i >= (num - rem);) {
+				res [i] = (byte) rem;
+			}
+
+			Array.Copy (inputBuffer, inputOffset + full, res, full, rem);
+
+			// the last padded block will be transformed in-place
+			TransformBlock (res, full, DESCore.BLOCK_BYTE_SIZE, res, full);
+
+			/*
+			byte [] workBuff = new byte [DESCore.BLOCK_BYTE_SIZE];
+			Array.Copy (res, full, workBuff, 0, DESCore.BLOCK_BYTE_SIZE);
+			preprocess (workBuff);
+			cryptFn (workBuff, null);
+			Array.Copy (workBuff, 0, res, full, DESCore.BLOCK_BYTE_SIZE);
+			*/
+
+			return res;
+		}
+
+
+	} // DESTransformBase
+
+
+	internal sealed class DESEncryptor : DESTransformBase {
+		internal DESEncryptor (byte [] key, byte [] iv)
+		: base (DESTransformBase.Mode.ENCRYPTOR, key, iv)
+		{
+		}
+	} // DESEncryptor
+
+
+	internal sealed class DESDecryptor : DESTransformBase {
+		internal DESDecryptor (byte [] key, byte [] iv)
+		: base (DESTransformBase.Mode.DECRYPTOR, key, iv)
+		{
+		}
+	} // DESDecryptor
+
+
+	public sealed class DESCryptoServiceProvider {
+		private byte [] iv;
+		private byte [] key;
+
+		public DESCryptoServiceProvider ()
+		{
+		}
+
+
+		//
+		// Factories
+		//
+
+		public ICryptoTransform CreateEncryptor()
+		{
+			return new DESEncryptor (key, iv);
+		}
+
+		public ICryptoTransform CreateDecryptor()
+		{
+			return new DESDecryptor (key, iv);
+		}
+
+
+
+		// FIXME: Ought to be in DES.cs
+
+		[MonoTODO ("Ought to be in DES.cs")]
+		public /*override*/ byte[] Key {
+			get {
+				return this.key;
+			}
+			set {
+				this.key = new byte [DESCore.KEY_BYTE_SIZE];
+				Array.Copy (value, 0, this.key, 0, DESCore.KEY_BYTE_SIZE);
+			}
+		}
+
+		public byte[] IV {
+			get {
+				return this.iv;
+			}
+			set {
+				this.iv = new byte [DESCore.KEY_BYTE_SIZE];
+				Array.Copy (value, 0, this.iv, 0, DESCore.KEY_BYTE_SIZE);
+			}
+		}
+
+
+
+
+
+		public override string ToString ()
+		{
+			return "mono::System.Security.Cryptography.DESCryptoServiceProvider";
+		}
+
+	} // DESCryptoServiceProvider
+
+} // System.Security.Cryptography
diff --git a/mcs/class/corlib/System.Security.Cryptography/DSA.cs b/mcs/class/corlib/System.Security.Cryptography/DSA.cs
new file mode 100755
index 00000000000..26f366888a0
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/DSA.cs
@@ -0,0 +1,101 @@
+//

+// System.Security.Cryptography DSA.cs

+//

+// Author:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+using System.Text;

+

+namespace System.Security.Cryptography

+{

+

+	/// <summary>

+	/// Abstract base class for all implementations of the DSA algorithm

+	/// </summary>

+	public abstract class DSA : AsymmetricAlgorithm

+	{

+		internal DSA () {}
+	

+		public static new DSA Create()

+		{

+			return new DSACryptoServiceProvider();

+		}

+

+		[MonoTODO]

+		public static new DSA Create(string algName)

+		{

+			// TODO: implement

+			return null;

+		}

+		

+		public abstract byte[] CreateSignature(byte[] rgbHash);

+		

+		public abstract DSAParameters ExportParameters(bool includePrivateParameters);

+

+		[MonoTODO]

+		public override void FromXmlString(string xmlString) 

+		{

+			if (xmlString == null)

+				throw new ArgumentNullException();

+			

+			// TODO: implement

+		}

+		

+		public abstract void ImportParameters(DSAParameters parameters);

+

+		public override string ToXmlString(bool includePrivateParameters)

+		{

+			DSAParameters dsaParams = ExportParameters(includePrivateParameters);

+			

+			StringBuilder sb = new StringBuilder();

+			

+			sb.Append("<DSAKeyValue>");

+			

+			sb.Append("<P>");

+			sb.Append(Convert.ToBase64String(dsaParams.P));

+			sb.Append("</P>");

+			

+			sb.Append("<Q>");

+			sb.Append(Convert.ToBase64String(dsaParams.Q));

+			sb.Append("</Q>");

+

+			sb.Append("<G>");

+			sb.Append(Convert.ToBase64String(dsaParams.G));

+			sb.Append("</G>");

+

+			sb.Append("<Y>");

+			sb.Append(Convert.ToBase64String(dsaParams.Y));

+			sb.Append("</Y>");

+

+			sb.Append("<J>");

+			sb.Append(Convert.ToBase64String(dsaParams.J));

+			sb.Append("</J>");

+			

+			sb.Append("<Seed>");

+			sb.Append(Convert.ToBase64String(dsaParams.Seed));

+			sb.Append("</Seed>");

+			

+			sb.Append("<PgenCounter>");

+			string cnt = Convert.ToString(dsaParams.Counter);

+			byte[] inArr = new ASCIIEncoding().GetBytes(cnt);

+			sb.Append(Convert.ToBase64String(inArr));

+			sb.Append("</PgenCounter>");

+

+			if (dsaParams.X != null)  {

+				sb.Append("<X>");

+				sb.Append(Convert.ToBase64String(dsaParams.X));

+				sb.Append("</X>");

+			}

+

+			sb.Append("</DSAKeyValue>");

+			

+			return sb.ToString();

+		}

+		

+		public abstract bool VerifySignature(byte[] rgbHash, byte[] rgbSignature);

+		

+	} // DSA

+	

+} // System.Security.Cryptography

diff --git a/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs
new file mode 100644
index 00000000000..c7c7158fb67
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/DSACryptoServiceProvider.cs
@@ -0,0 +1,87 @@
+//

+// System.Security.Cryptography.DSACryptoServiceProvider.cs

+//

+// Authors:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+// Stubbed.

+//

+

+using System;

+using System.IO;

+

+namespace System.Security.Cryptography {

+	

+	[MonoTODO]

+	public class DSACryptoServiceProvider : DSA {

+		public DSACryptoServiceProvider () { }

+		public DSACryptoServiceProvider (CspParameters parameters) { }

+		public DSACryptoServiceProvider (int key_size) { }

+		public DSACryptoServiceProvider (int key_size, CspParameters parameters) { }

+

+		public override string KeyExchangeAlgorithm {

+			get { return null; }

+		}

+

+		public override int KeySize {

+			get { return 0; }

+		}

+

+		public override KeySizes[] LegalKeySizes {

+			get { return null; }

+		}

+

+		public override string SignatureAlgorithm {

+			get { return null; }

+		}

+

+		public bool PersistKeyInCsp {

+			get { return false; }

+			set { }

+		}

+		

+		public override byte[] CreateSignature (byte[] rgb) {

+			return null;

+		}

+		

+		public override bool VerifySignature(byte[] hash, byte[] sig) {

+			return false;

+		}

+

+		public byte[] SignData (byte[] data) {

+			return SignData (data, 0, data.Length);

+		}

+

+		public byte[] SignData (byte[] data, int offset, int count) {

+			return null;

+		}

+

+		public byte[] SignData (Stream data) {

+			return null;

+		}

+

+		public byte[] SignHash (byte[] hash, string str) {

+			return null;

+		}

+

+		public bool VerifyData (byte[] data, byte[] sig) {

+			return false;

+		}

+

+		public override DSAParameters ExportParameters (bool include) {

+			return new DSAParameters ();

+		}

+

+		public override void ImportParameters (DSAParameters parameters) {

+		}

+

+		public override void FromXmlString(string xmlString) {

+		}

+

+		public override string ToXmlString(bool includePrivateParameters) {

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Cryptography/DSAParameters.cs b/mcs/class/corlib/System.Security.Cryptography/DSAParameters.cs
new file mode 100755
index 00000000000..cc8560ddcf2
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/DSAParameters.cs
@@ -0,0 +1,38 @@
+//

+// System.Security.Cryptography DSAParameters.cs

+//

+// Author:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+

+namespace System.Security.Cryptography

+{

+

+	/// <summary>

+	/// DSA Parameters

+	/// </summary>

+	[Serializable]

+	public struct DSAParameters

+	{

+		public int Counter;

+		

+		public byte[] G;

+		

+		public byte[] J;

+		

+		public byte[] P;

+		

+		public byte[] Q;

+		

+		public byte[] Seed;

+		

+		[NonSerialized]

+		public byte[] X;

+		

+		public byte[] Y;

+		

+	} // DSAParameters

+	

+} // System.Security.Cryptography

diff --git a/mcs/class/corlib/System.Security.Cryptography/DSASignatureDeformatter.cs b/mcs/class/corlib/System.Security.Cryptography/DSASignatureDeformatter.cs
new file mode 100755
index 00000000000..999381a9afe
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/DSASignatureDeformatter.cs
@@ -0,0 +1,51 @@
+//

+// System.Security.Cryptography DSASignatureDeformatter.cs

+//

+// Author:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+

+namespace System.Security.Cryptography

+{

+

+	/// <summary>

+	/// DSA Signature Deformatter

+	/// </summary>

+	public class DSASignatureDeformatter : AsymmetricSignatureDeformatter

+	{

+		[MonoTODO]

+		public DSASignatureDeformatter()

+		{

+			// TODO: implement

+		}

+

+		[MonoTODO]

+		public DSASignatureDeformatter(AsymmetricAlgorithm key)

+		{

+			// TODO: implement

+		}

+

+		

+		public override void SetHashAlgorithm(string strName)

+		{

+			throw new CryptographicException("This method is not used");

+		}

+

+		[MonoTODO]

+		public override void SetKey(AsymmetricAlgorithm key)

+		{

+			// TODO: implement

+		}

+

+		[MonoTODO]

+		public override bool VerifySignature(byte[] rgbHash, byte[] rgbSignature)

+		{

+			// TODO: implement

+			return false;

+		}

+		

+	} // DSASignatureDeformatter

+	

+} // System.Security.Cryptography

diff --git a/mcs/class/corlib/System.Security.Cryptography/DSASignatureFormatter.cs b/mcs/class/corlib/System.Security.Cryptography/DSASignatureFormatter.cs
new file mode 100755
index 00000000000..2d1a241a8f7
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/DSASignatureFormatter.cs
@@ -0,0 +1,52 @@
+//

+// System.Security.Cryptography DSASignatureFormatter.cs

+//

+// Author:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+

+namespace System.Security.Cryptography

+{

+

+	/// <summary>

+	/// DSA Signature Formatter

+	/// </summary>

+	public class DSASignatureFormatter : AsymmetricSignatureFormatter

+	{

+

+		[MonoTODO]

+		public DSASignatureFormatter() 

+		{

+			// TODO: implement

+		}

+

+		[MonoTODO]

+		public DSASignatureFormatter(AsymmetricAlgorithm key)

+		{

+			// TODO: implement

+		}

+

+		[MonoTODO]

+		public override byte[] CreateSignature(byte[] rgbHash)

+		{

+			// TODO: implement

+			return null;

+		}

+

+		[MonoTODO]

+		public override void SetHashAlgorithm(string strName)

+		{

+			// TODO: implement

+		}

+

+		[MonoTODO]

+		public override void SetKey(AsymmetricAlgorithm key)

+		{

+			// TODO: implement

+		}

+		

+	} // DSASignatureFormatter

+	

+} // System.Security.Cryptography

diff --git a/mcs/class/corlib/System.Security.Cryptography/DeriveBytes.cs b/mcs/class/corlib/System.Security.Cryptography/DeriveBytes.cs
new file mode 100755
index 00000000000..048c4182cd7
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/DeriveBytes.cs
@@ -0,0 +1,27 @@
+//

+// System.Security.Cryptography DeriveBytes.cs

+//

+// Author:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+

+namespace System.Security.Cryptography

+{

+

+	/// <summary>

+	/// Abstract base class for all classes that derive byte information from an integer

+	/// </summary>

+	public abstract class DeriveBytes

+	{

+	

+		protected DeriveBytes() {}

+		

+		public abstract byte[] GetBytes(int cb);

+

+		public abstract void Reset();

+		

+	} // DeriveBytes

+	

+} // System.Security.Cryptography

diff --git a/mcs/class/corlib/System.Security.Cryptography/FromBase64Transform.cs b/mcs/class/corlib/System.Security.Cryptography/FromBase64Transform.cs
new file mode 100644
index 00000000000..5fbf6acaa2c
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/FromBase64Transform.cs
@@ -0,0 +1,271 @@
+//
+// System.Security.Cryptography.FromBase64Transform
+//
+// Author:
+//   Sergey Chaban (serge@wildwestsoftware.com)
+//
+
+using System;
+using System.Security.Cryptography;
+
+
+namespace System.Security.Cryptography {
+
+	public enum FromBase64TransformMode : int {
+		IgnoreWhiteSpaces,
+		DoNotIgnoreWhiteSpaces
+	}
+
+	public class FromBase64Transform : ICryptoTransform {
+
+		private FromBase64TransformMode mode;
+		private byte [] accumulator;
+		private byte [] filterBuffer;
+		private int accPtr;
+
+
+		/// <summary>
+		///  Creates a new instance of the decoder
+		///  with the default transformation mode (IgnoreWhiteSpaces).
+		/// </summary>
+		public FromBase64Transform ()
+		: this (FromBase64TransformMode.IgnoreWhiteSpaces)
+		{
+		}
+
+
+		/// <summary>
+		///  Creates a new instance of the decoder
+		///  with the specified transformation mode.
+		/// </summary>
+		public FromBase64Transform (FromBase64TransformMode mode)
+		{
+			this.mode = mode;
+			accumulator = new byte [4];
+			filterBuffer = new byte [4];
+			accPtr = 0;
+		}
+
+
+		/// <summary>
+		/// </summary>
+		public bool CanTransformMultipleBlocks {
+			get {
+				return false;
+			}
+		}
+
+
+		/// <summary>
+		///  Returns the input block size for the Base64 decoder.
+		/// </summary>
+		/// <remarks>
+		///  The input block size for Base64 decoder is always 1 byte.
+		/// </remarks>
+		public int InputBlockSize {
+			get {
+				return 1;
+			}
+		}
+
+
+		/// <summary>
+		///  Returns the output block size for the Base64 decoder.
+		/// </summary>
+		/// <remarks>
+		///  The value returned by this property is always 3.
+		/// </remarks>
+		public int OutputBlockSize {
+			get {
+				return 3;
+			}
+		}
+
+
+
+		private int Filter (byte [] buffer, int offset, int count)
+		{
+			int end = offset + count;
+			int len = filterBuffer.Length;
+			int ptr = 0;
+			byte [] filter = this.filterBuffer;
+
+			for (int i = offset; i < end; i++) {
+				byte b = buffer [i];
+				if (!Char.IsWhiteSpace ((char) b)) {
+					if (ptr >= len) {
+						len <<= 1;
+						this.filterBuffer = new byte [len];
+						Array.Copy(filter, 0, this.filterBuffer, 0, len >> 1);
+						filter = this.filterBuffer;
+					}
+					filter [ptr++] = b;
+				}
+			}
+
+			return ptr;
+		}
+
+
+
+
+		private int DoTransform (byte [] inputBuffer,
+		                         int inputOffset,
+		                         int inputCount,
+		                         byte [] outputBuffer,
+		                         int outputOffset)
+		{
+			int full = inputCount >> 2;
+			if (full == 0) return 0;
+
+			int rem = 0;
+
+			if (inputBuffer[inputCount - 1] == (byte)'=') {
+				++rem;
+				--full;
+			}
+
+			if (inputBuffer[inputCount - 2] == (byte)'=') ++rem;
+
+			byte [] lookup = Base64Table.DecodeTable;
+			int b0,b1,b2,b3;
+
+			for (int i = 0; i < full; i++) {
+				b0 = lookup [inputBuffer [inputOffset++]];
+				b1 = lookup [inputBuffer [inputOffset++]];
+				b2 = lookup [inputBuffer [inputOffset++]];
+				b3 = lookup [inputBuffer [inputOffset++]];
+
+				outputBuffer [outputOffset++] = (byte) ((b0 << 2) | (b1 >> 4));
+				outputBuffer [outputOffset++] = (byte) ((b1 << 4) | (b2 >> 2));
+				outputBuffer [outputOffset++] = (byte) ((b2 << 6) | b3);
+			}
+
+			int res = full * 3;
+
+			switch (rem) {
+			case 0:
+				break;
+			case 1:
+				b0 = lookup [inputBuffer [inputOffset++]];
+				b1 = lookup [inputBuffer [inputOffset++]];
+				b2 = lookup [inputBuffer [inputOffset++]];
+				outputBuffer [outputOffset++] = (byte) ((b0 << 2) | (b1 >> 4));
+				outputBuffer [outputOffset++] = (byte) ((b1 << 4) | (b2 >> 2));
+				res += 2;
+				break;
+			case 2:
+				b0 = lookup [inputBuffer [inputOffset++]];
+				b1 = lookup [inputBuffer [inputOffset++]];
+				outputBuffer [outputOffset++] = (byte) ((b0 << 2) | (b1 >> 4));
+				++res;
+				break;
+			default:
+				break;
+			}
+
+			return res;
+		}
+
+
+		/// <summary>
+		/// </summary>
+		public int TransformBlock (byte [] inputBuffer,
+		                                   int inputOffset,
+		                                   int inputCount,
+		                                   byte [] outputBuffer,
+		                                   int outputOffset)
+		{
+			int n;
+			byte [] src;
+			int srcOff;
+			int res = 0;
+
+			if (mode == FromBase64TransformMode.IgnoreWhiteSpaces) {
+				n = Filter (inputBuffer, inputOffset, inputCount);
+				src = filterBuffer;
+				srcOff = 0;
+			} else {
+				n = inputCount;
+				src = inputBuffer;
+				srcOff = inputOffset;
+			}
+
+
+			int count = accPtr + n;
+
+			if (count < 4) {
+				Array.Copy (src, srcOff, accumulator, accPtr, n);
+				accPtr = count;
+			} else {
+				byte [] tmpBuff = new byte [count];
+				Array.Copy (accumulator, 0, tmpBuff, 0, accPtr);
+				Array.Copy (src, srcOff, tmpBuff, accPtr, n);
+				accPtr = count & 3;
+				Array.Copy (src, srcOff + (n - accPtr), accumulator, 0, accPtr);
+				res = DoTransform (tmpBuff, 0, count & (~3), outputBuffer, outputOffset);
+			}
+
+
+			return res;
+		}
+
+
+
+
+
+		/// <summary>
+		/// </summary>
+		public byte [] TransformFinalBlock (byte [] inputBuffer,
+		                                            int inputOffset,
+		                                            int inputCount)
+		{
+			byte [] src;
+			int srcOff;
+			int n;
+
+			if (mode == FromBase64TransformMode.IgnoreWhiteSpaces) {
+				n = Filter (inputBuffer, inputOffset, inputCount);
+				src = filterBuffer;
+				srcOff = 0;
+			} else {
+				n = inputCount;
+				src = inputBuffer;
+				srcOff = inputOffset;
+			}
+
+
+			int dataLen = accPtr + n;
+			byte [] tmpBuf = new byte [dataLen];
+
+			int resLen = ((dataLen) >> 2) * 3;
+			byte [] res = new byte [resLen];
+
+			Array.Copy (accumulator, 0, tmpBuf, 0, accPtr);
+			Array.Copy (src, srcOff, tmpBuf, accPtr, n);
+
+			int actLen = DoTransform (tmpBuf, 0, dataLen, res, 0);
+
+			accPtr = 0;
+
+			if (actLen < resLen) {
+				byte [] newres = new byte [actLen];
+
+				Array.Copy (res, newres, actLen);
+				return newres;
+			} else
+			return res;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public override string ToString ()
+		{
+			return "mono::System.Security.Cryptography.FromBase64Transform";
+		}
+
+	} // FromBase64Transform
+
+} // System.Security.Cryptography
diff --git a/mcs/class/corlib/System.Security.Cryptography/HashAlgorithm.cs b/mcs/class/corlib/System.Security.Cryptography/HashAlgorithm.cs
new file mode 100644
index 00000000000..c2564eb236e
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/HashAlgorithm.cs
@@ -0,0 +1,157 @@
+//

+// System.Security.Cryptography HashAlgorithm Class implementation

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography {

+	public abstract class HashAlgorithm : ICryptoTransform {

+		protected byte[] HashValue; // Caches the hash after it is calculated.  Accessed through the Hash property.

+		protected int HashSizeValue; // The size of the hash in bits.

+		protected int State;  // nonzero when in use;  zero when not in use

+

+		/// <summary>

+		/// Called from constructor of derived class.

+		/// </summary>

+		protected HashAlgorithm () {

+		

+		}

+	

+

+		/// <summary>

+		/// FIXME: Always true for hashes?

+		/// Get whether or not the hash can transform multiple blocks at a time.

+		/// </summary>

+		[MonoTODO]

+		public virtual bool CanTransformMultipleBlocks {

+			get {

+				return true;

+			}

+		}

+	

+		/// <summary>

+		/// Computes the entire hash of all the bytes in the byte array.

+		/// </summary>

+		public byte[] ComputeHash (byte[] input) {

+			// inputData = input.Clone();

+			HashCore (input, 0, input.Length);

+			HashValue = HashFinal ();

+			Initialize ();

+			

+			return HashValue;

+		}

+	

+		/// <summary>

+		/// Creates the default implementation of the default hash algorithm (SHA1).

+		/// </summary>

+		public static HashAlgorithm Create () {

+			return SHA1.Create ();

+		}

+	

+		/// <summary>

+		/// Creates a specific implementation of the general hash idea.

+		/// </summary>

+		/// <param name="st">FIXME: No clue.  Specifies which derived class to create.</param>

+		[MonoTODO]

+		public static HashAlgorithm Create (string st) {

+			return Create ();

+		}

+	

+		/// <summary>

+		/// Gets the previously computed hash.

+		/// </summary>

+		public virtual byte[] Hash {

+			get {

+				return HashValue;

+			}

+		}

+	

+		/// <summary>

+		/// When overridden in a derived class, drives the hashing function.

+		/// </summary>

+		/// <param name="rgb"></param>

+		/// <param name="start"></param>

+		/// <param name="size"></param>

+		protected abstract void HashCore (byte[] rgb, int start, int size);

+

+		/// <summary>

+		/// When overridden in a derived class, this pads and hashes whatever data might be left in the buffers and then returns the hash created.

+		/// </summary>

+		protected abstract byte[] HashFinal ();

+

+		/// <summary>

+		/// Returns the size in bits of the hash.

+		/// </summary>

+		public virtual int HashSize {

+			get {

+				return HashSizeValue;

+			}

+		}

+	

+		/// <summary>

+		/// When overridden in a derived class, initializes the object to prepare for hashing.

+		/// </summary>

+		public abstract void Initialize ();

+	

+		/// <summary>

+		/// FIXME: Not quire valid for the hashes?  Returns 1?

+		/// </summary>

+		[MonoTODO]

+		public virtual int InputBlockSize {

+			get {

+				return 1;

+			}

+		}

+	

+		/// <summary>

+		/// FIXME: Not quire valid for the hashes?  Returns 1?

+		/// </summary>

+		[MonoTODO]

+		public virtual int OutputBlockSize {

+			get {

+				return 1;

+			}

+		}

+		

+		/// <summary>

+		/// Used for stream chaining.  Computes hash as data passes through it.

+		/// </summary>

+		/// <param name="inputBuffer">The buffer from which to grab the data to be copied.</param>

+		/// <param name="inputOffset">The offset into the input buffer to start reading at.</param>

+		/// <param name="inputCount">The number of bytes to be copied.</param>

+		/// <param name="outputBuffer">The buffer to write the copied data to.</param>

+		/// <param name="outputOffset">At what point in the outputBuffer to write the data at.</param>

+		public int TransformBlock (byte[] inputBuffer, int inputOffset, int inputCount, byte[] outputBuffer, int outputOffset) {

+

+			Buffer.BlockCopy (inputBuffer, inputOffset, outputBuffer, outputOffset, inputCount);

+			HashCore (inputBuffer, inputOffset, inputCount);

+

+			return inputCount;

+		}

+	

+		/// <summary>

+		/// Used for stream chaining.  Computes hash as data passes through it.  Finishes off the hash.

+		/// </summary>

+		/// <param name="inputBuffer">The buffer from which to grab the data to be copied.</param>

+		/// <param name="inputOffset">The offset into the input buffer to start reading at.</param>

+		/// <param name="inputCount">The number of bytes to be copied.</param>

+		public byte[] TransformFinalBlock (byte[] inputBuffer, int inputOffset, int inputCount) {

+			byte[] outputBuffer = new byte[inputCount];

+			

+			Buffer.BlockCopy (inputBuffer, inputOffset, outputBuffer, 0, inputCount);

+			

+			HashCore (inputBuffer, inputOffset, inputCount);

+			HashValue = HashFinal ();

+			Initialize ();

+			

+			return outputBuffer;

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/ICryptoTransform.cs b/mcs/class/corlib/System.Security.Cryptography/ICryptoTransform.cs
new file mode 100644
index 00000000000..f3d1f0e0df8
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/ICryptoTransform.cs
@@ -0,0 +1,49 @@
+//

+// System.Security.Cryptography ICryptoTransform interface

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography {

+

+	/// <summary>

+	/// Crytographic functions that can process a stream of bytes implement this interface.

+	/// This works by stringing together one or more ICryptoTransform classes with a stream.

+	/// Data is passed from one to the next without the need of outside buffering/intervention.

+	/// </summary>

+	public interface ICryptoTransform {

+	

+		/// <summary>

+		/// Whether the function can transform multiple blocks at a time.

+		/// </summary>

+		bool CanTransformMultipleBlocks {get;}

+

+		/// <summary>

+		/// Size of input blocks for the function.

+		/// </summary>

+		int InputBlockSize {get;}

+

+		/// <summary>

+		/// Size of the output blocks of the function.

+		/// </summary>

+		int OutputBlockSize {get;}

+

+		/// <summary>

+		/// FIXME: Process some data.  A block at a time?  Less than a block at a time?

+		/// </summary>

+		int TransformBlock (byte[] inputBuffer, int inputOffset, int inputCount, byte[] outputBuffer, int outputOffset);

+

+		/// <summary>

+		/// Processes the final part of the data.  Also finalizes the function if needed.

+		/// </summary>

+		byte[] TransformFinalBlock (byte[] inputBuffer, int inputOffset, int inputCount);

+

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/KeySizes.cs b/mcs/class/corlib/System.Security.Cryptography/KeySizes.cs
new file mode 100644
index 00000000000..5fef7ec0908
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/KeySizes.cs
@@ -0,0 +1,61 @@
+//

+// System.Security.Cryptography KeySizes Class implementation

+//

+// Author:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// This class represents valid ranges of key sizes for ciphers.  It is also used to represent block sizes in the same fashion for block ciphers.

+	/// </summary>

+	public class KeySizes {

+		private int _maxSize;

+		private int _minSize;

+		private int _skipSize;

+

+		/// <summary>

+		/// Creates a new KeySizes object.

+		/// </summary>

+		/// <param name="minSize">The minimum size key allowed for this cipher.</param>

+		/// <param name="maxSize">The maximum size key allowed for this cipher.</param>

+		/// <param name="skipSize">The jump/skip between the valid key sizes.</param>

+		public KeySizes (int minSize, int maxSize, int skipSize) {

+			_maxSize = maxSize;

+			_minSize = minSize;

+			_skipSize = skipSize;

+		}

+		

+		/// <summary>

+		/// Returns the maximum valid key size;

+		/// </summary>

+		public int MaxSize {

+			get {

+				return _maxSize;

+			}

+		}

+		

+		/// <summary>

+		/// Returns the minimum valid key size;

+		/// </summary>

+		public int MinSize {

+			get {

+				return _minSize;

+			}

+		}

+		

+		/// <summary>

+		/// Returns the skip between valid key sizes;

+		/// </summary>

+		public int SkipSize {

+			get {

+				return _skipSize;

+			}

+		}		

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/MD5.cs b/mcs/class/corlib/System.Security.Cryptography/MD5.cs
new file mode 100644
index 00000000000..039a3f4bb1d
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/MD5.cs
@@ -0,0 +1,44 @@
+//

+// System.Security.Cryptography MD5 Class implementation

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Common base class for all derived MD5 iplementations.

+	/// </summary>

+	public abstract class MD5 : HashAlgorithm {

+		

+		/// <summary>

+		/// Called from constructor of derived class.

+		/// </summary>

+		protected MD5 () {

+		

+		}

+	

+		/// <summary>

+		/// Creates the default derived class.

+		/// </summary>

+		public static new MD5 Create () {

+			return new MD5CryptoServiceProvider();

+		}

+	

+		/// <summary>

+		/// Creates a new derived implementation.

+		/// </summary>

+		/// <param name="st">FIXME: No clue.  Specifies which derived class to create?</param>

+		[MonoTODO]

+		public static new MD5 Create (string st) {

+			return Create();

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/MD5CryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/MD5CryptoServiceProvider.cs
new file mode 100644
index 00000000000..6a9dca05e25
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/MD5CryptoServiceProvider.cs
@@ -0,0 +1,482 @@
+//

+// System.Security.Cryptography MD5CryptoServiceProvider Class implementation

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography {

+

+	/// <summary>

+	/// C# implementation of the MD5 cryptographic hash function.

+	/// </summary>

+	public class MD5CryptoServiceProvider : MD5 {

+		private const int BLOCK_SIZE_BYTES =  64;

+		private const int HASH_SIZE_BYTES  =  16;

+		private const int HASH_SIZE_BITS   = 128;

+		[CLSCompliant(false)] protected uint[] _H;

+		[CLSCompliant(false)] protected uint count;

+		private byte[] _ProcessingBuffer;   // Used to start data when passed less than a block worth.

+		private int _ProcessingBufferCount; // Counts how much data we have stored that still needs processed.

+	

+		/// <summary>

+		/// Creates a new MD5CryptoServiceProvider.

+		/// </summary>

+		public MD5CryptoServiceProvider () {

+			_H = new uint[4];

+			HashSizeValue = HASH_SIZE_BITS;

+			_ProcessingBuffer = new byte[BLOCK_SIZE_BYTES];

+

+			Initialize();

+		}

+

+		/// <summary>

+		/// Drives the hashing function.

+		/// </summary>

+		/// <param name="rgb">Byte array containing the data to hash.</param>

+		/// <param name="start">Where in the input buffer to start.</param>

+		/// <param name="size">Size in bytes of the data in the buffer to hash.</param>

+		protected override void HashCore (byte[] rgb, int start, int size) {

+			int i;

+			State = 1;

+

+			if (_ProcessingBufferCount != 0) {

+				if (size < (BLOCK_SIZE_BYTES - _ProcessingBufferCount)) {

+					System.Buffer.BlockCopy (rgb, start, _ProcessingBuffer, _ProcessingBufferCount, size);

+					_ProcessingBufferCount += size;

+					return;

+				}

+				else {

+					i = (BLOCK_SIZE_BYTES - _ProcessingBufferCount);

+					System.Buffer.BlockCopy (rgb, start, _ProcessingBuffer, _ProcessingBufferCount, i);

+					ProcessBlock (_ProcessingBuffer, 0);

+					_ProcessingBufferCount = 0;

+					start += i;

+					size -= i;

+				}

+			}

+

+			for (i=0; i<size-size%BLOCK_SIZE_BYTES; i += BLOCK_SIZE_BYTES) {

+				ProcessBlock (rgb, start+i);

+			}

+

+			if (size%BLOCK_SIZE_BYTES != 0) {

+				System.Buffer.BlockCopy (rgb, size-size%BLOCK_SIZE_BYTES+start, _ProcessingBuffer, 0, size%BLOCK_SIZE_BYTES);

+				_ProcessingBufferCount = size%BLOCK_SIZE_BYTES;

+			}

+		}

+	

+		/// <summary>

+		/// This finalizes the hash.  Takes the data from the chaining variables and returns it.

+		/// </summary>

+		protected override byte[] HashFinal () {

+			byte[] hash = new byte[16];

+			int i, j;

+

+			ProcessFinalBlock(_ProcessingBuffer, 0, _ProcessingBufferCount);

+

+			for (i=0; i<4; i++) {

+				for (j=0; j<4; j++) {

+					hash[i*4+j] = (byte)(_H[i] >> j*8);

+				}

+			}

+

+			return hash;

+		}

+

+		/// <summary>

+		/// Resets the class after use.  Called automatically after hashing is done.

+		/// </summary>

+		public override void Initialize () {

+			count = 0;

+			_ProcessingBufferCount = 0;

+

+			_H[0] = 0x67452301;

+			_H[1] = 0xefcdab89;

+			_H[2] = 0x98badcfe;

+			_H[3] = 0x10325476;

+		}

+

+		/// <summary>

+		/// This is the meat of the hash function.  It is what processes each block one at a time.

+		/// </summary>

+		/// <param name="inputBuffer">Byte array to process data from.</param>

+		/// <param name="inputOffset">Where in the byte array to start processing.</param>

+		private void ProcessBlock(byte[] inputBuffer, int inputOffset) {

+			uint[] buff = new uint[16];

+			uint a, b, c, d;

+			int i;

+		

+			count += BLOCK_SIZE_BYTES;

+		

+			for (i=0; i<16; i++) {

+				buff[i] = (uint)(inputBuffer[inputOffset+4*i])

+					| (((uint)(inputBuffer[inputOffset+4*i+1])) <<  8)

+					| (((uint)(inputBuffer[inputOffset+4*i+2])) << 16)

+					| (((uint)(inputBuffer[inputOffset+4*i+3])) << 24);

+			}

+		

+			a = _H[0];

+			b = _H[1];

+			c = _H[2];

+			d = _H[3];

+		

+			// This function was unrolled because it seems to be doubling our performance with current compiler/VM.

+			// Possibly roll up if this changes.

+

+

+			// ---- Round 1 --------

+

+			a += (((c ^ d) & b) ^ d) + (uint) Constants.C0 + buff [0];

+			a = (a << 7) | (a >> 25);

+			a += b;

+

+			d += (((b ^ c) & a) ^ c) + (uint) Constants.C1 + buff [1];

+			d = (d << 12) | (d >> 20);

+			d += a;

+

+			c += (((a ^ b) & d) ^ b) + (uint) Constants.C2 + buff [2];

+			c = (c << 17) | (c >> 15);

+			c += d;

+

+			b += (((d ^ a) & c) ^ a) + (uint) Constants.C3 + buff [3];

+			b = (b << 22) | (b >> 10);

+			b += c;

+

+			a += (((c ^ d) & b) ^ d) + (uint) Constants.C4 + buff [4];

+			a = (a << 7) | (a >> 25);

+			a += b;

+

+			d += (((b ^ c) & a) ^ c) + (uint) Constants.C5 + buff [5];

+			d = (d << 12) | (d >> 20);

+			d += a;

+

+			c += (((a ^ b) & d) ^ b) + (uint) Constants.C6 + buff [6];

+			c = (c << 17) | (c >> 15);

+			c += d;

+

+			b += (((d ^ a) & c) ^ a) + (uint) Constants.C7 + buff [7];

+			b = (b << 22) | (b >> 10);

+			b += c;

+

+			a += (((c ^ d) & b) ^ d) + (uint) Constants.C8 + buff [8];

+			a = (a << 7) | (a >> 25);

+			a += b;

+

+			d += (((b ^ c) & a) ^ c) + (uint) Constants.C9 + buff [9];

+			d = (d << 12) | (d >> 20);

+			d += a;

+

+			c += (((a ^ b) & d) ^ b) + (uint) Constants.C10 + buff [10];

+			c = (c << 17) | (c >> 15);

+			c += d;

+

+			b += (((d ^ a) & c) ^ a) + (uint) Constants.C11 + buff [11];

+			b = (b << 22) | (b >> 10);

+			b += c;

+

+			a += (((c ^ d) & b) ^ d) + (uint) Constants.C12 + buff [12];

+			a = (a << 7) | (a >> 25);

+			a += b;

+

+			d += (((b ^ c) & a) ^ c) + (uint) Constants.C13 + buff [13];

+			d = (d << 12) | (d >> 20);

+			d += a;

+

+			c += (((a ^ b) & d) ^ b) + (uint) Constants.C14 + buff [14];

+			c = (c << 17) | (c >> 15);

+			c += d;

+

+			b += (((d ^ a) & c) ^ a) + (uint) Constants.C15 + buff [15];

+			b = (b << 22) | (b >> 10);

+			b += c;

+

+

+			// ---- Round 2 --------

+  

+			a += (((b ^ c) & d) ^ c) + (uint) Constants.C16 + buff [1];

+			a = (a << 5) | (a >> 27);

+			a += b;

+

+			d += (((a ^ b) & c) ^ b) + (uint) Constants.C17 + buff [6];

+			d = (d << 9) | (d >> 23);

+			d += a;

+

+			c += (((d ^ a) & b) ^ a) + (uint) Constants.C18 + buff [11];

+			c = (c << 14) | (c >> 18);

+			c += d;

+

+			b += (((c ^ d) & a) ^ d) + (uint) Constants.C19 + buff [0];

+			b = (b << 20) | (b >> 12);

+			b += c;

+

+			a += (((b ^ c) & d) ^ c) + (uint) Constants.C20 + buff [5];

+			a = (a << 5) | (a >> 27);

+			a += b;

+

+			d += (((a ^ b) & c) ^ b) + (uint) Constants.C21 + buff [10];

+			d = (d << 9) | (d >> 23);

+			d += a;

+

+			c += (((d ^ a) & b) ^ a) + (uint) Constants.C22 + buff [15];

+			c = (c << 14) | (c >> 18);

+			c += d;

+

+			b += (((c ^ d) & a) ^ d) + (uint) Constants.C23 + buff [4];

+			b = (b << 20) | (b >> 12);

+			b += c;

+

+			a += (((b ^ c) & d) ^ c) + (uint) Constants.C24 + buff [9];

+			a = (a << 5) | (a >> 27);

+			a += b;

+

+			d += (((a ^ b) & c) ^ b) + (uint) Constants.C25 + buff [14];

+			d = (d << 9) | (d >> 23);

+			d += a;

+

+			c += (((d ^ a) & b) ^ a) + (uint) Constants.C26 + buff [3];

+			c = (c << 14) | (c >> 18);

+			c += d;

+

+			b += (((c ^ d) & a) ^ d) + (uint) Constants.C27 + buff [8];

+			b = (b << 20) | (b >> 12);

+			b += c;

+

+			a += (((b ^ c) & d) ^ c) + (uint) Constants.C28 + buff [13];

+			a = (a << 5) | (a >> 27);

+			a += b;

+

+			d += (((a ^ b) & c) ^ b) + (uint) Constants.C29 + buff [2];

+			d = (d << 9) | (d >> 23);

+			d += a;

+

+			c += (((d ^ a) & b) ^ a) + (uint) Constants.C30 + buff [7];

+			c = (c << 14) | (c >> 18);

+			c += d;

+

+			b += (((c ^ d) & a) ^ d) + (uint) Constants.C31 + buff [12];

+			b = (b << 20) | (b >> 12);

+			b += c;

+

+

+			// ---- Round 3 --------

+  

+			a += (b ^ c ^ d) + (uint) Constants.C32 + buff [5];

+			a = (a << 4) | (a >> 28);

+			a += b;

+

+			d += (a ^ b ^ c) + (uint) Constants.C33 + buff [8];

+			d = (d << 11) | (d >> 21);

+			d += a;

+

+			c += (d ^ a ^ b) + (uint) Constants.C34 + buff [11];

+			c = (c << 16) | (c >> 16);

+			c += d;

+

+			b += (c ^ d ^ a) + (uint) Constants.C35 + buff [14];

+			b = (b << 23) | (b >> 9);

+			b += c;

+

+			a += (b ^ c ^ d) + (uint) Constants.C36 + buff [1];

+			a = (a << 4) | (a >> 28);

+			a += b;

+

+			d += (a ^ b ^ c) + (uint) Constants.C37 + buff [4];

+			d = (d << 11) | (d >> 21);

+			d += a;

+

+			c += (d ^ a ^ b) + (uint) Constants.C38 + buff [7];

+			c = (c << 16) | (c >> 16);

+			c += d;

+

+			b += (c ^ d ^ a) + (uint) Constants.C39 + buff [10];

+			b = (b << 23) | (b >> 9);

+			b += c;

+

+			a += (b ^ c ^ d) + (uint) Constants.C40 + buff [13];

+			a = (a << 4) | (a >> 28);

+			a += b;

+

+			d += (a ^ b ^ c) + (uint) Constants.C41 + buff [0];

+			d = (d << 11) | (d >> 21);

+			d += a;

+

+			c += (d ^ a ^ b) + (uint) Constants.C42 + buff [3];

+			c = (c << 16) | (c >> 16);

+			c += d;

+

+			b += (c ^ d ^ a) + (uint) Constants.C43 + buff [6];

+			b = (b << 23) | (b >> 9);

+			b += c;

+

+			a += (b ^ c ^ d) + (uint) Constants.C44 + buff [9];

+			a = (a << 4) | (a >> 28);

+			a += b;

+

+			d += (a ^ b ^ c) + (uint) Constants.C45 + buff [12];

+			d = (d << 11) | (d >> 21);

+			d += a;

+

+			c += (d ^ a ^ b) + (uint) Constants.C46 + buff [15];

+			c = (c << 16) | (c >> 16);

+			c += d;

+

+			b += (c ^ d ^ a) + (uint) Constants.C47 + buff [2];

+			b = (b << 23) | (b >> 9);

+			b += c;

+

+

+			// ---- Round 4 --------

+  

+			a += (((~d) | b) ^ c) + (uint) Constants.C48 + buff [0];

+			a = (a << 6) | (a >> 26);

+			a += b;

+

+			d += (((~c) | a) ^ b) + (uint) Constants.C49 + buff [7];

+			d = (d << 10) | (d >> 22);

+			d += a;

+

+			c += (((~b) | d) ^ a) + (uint) Constants.C50 + buff [14];

+			c = (c << 15) | (c >> 17);

+			c += d;

+

+			b += (((~a) | c) ^ d) + (uint) Constants.C51 + buff [5];

+			b = (b << 21) | (b >> 11);

+			b += c;

+

+			a += (((~d) | b) ^ c) + (uint) Constants.C52 + buff [12];

+			a = (a << 6) | (a >> 26);

+			a += b;

+

+			d += (((~c) | a) ^ b) + (uint) Constants.C53 + buff [3];

+			d = (d << 10) | (d >> 22);

+			d += a;

+

+			c += (((~b) | d) ^ a) + (uint) Constants.C54 + buff [10];

+			c = (c << 15) | (c >> 17);

+			c += d;

+

+			b += (((~a) | c) ^ d) + (uint) Constants.C55 + buff [1];

+			b = (b << 21) | (b >> 11);

+			b += c;

+

+			a += (((~d) | b) ^ c) + (uint) Constants.C56 + buff [8];

+			a = (a << 6) | (a >> 26);

+			a += b;

+

+			d += (((~c) | a) ^ b) + (uint) Constants.C57 + buff [15];

+			d = (d << 10) | (d >> 22);

+			d += a;

+

+			c += (((~b) | d) ^ a) + (uint) Constants.C58 + buff [6];

+			c = (c << 15) | (c >> 17);

+			c += d;

+

+			b += (((~a) | c) ^ d) + (uint) Constants.C59 + buff [13];

+			b = (b << 21) | (b >> 11);

+			b += c;

+

+			a += (((~d) | b) ^ c) + (uint) Constants.C60 + buff [4];

+			a = (a << 6) | (a >> 26);

+			a += b;

+

+			d += (((~c) | a) ^ b) + (uint) Constants.C61 + buff [11];

+			d = (d << 10) | (d >> 22);

+			d += a;

+

+			c += (((~b) | d) ^ a) + (uint) Constants.C62 + buff [2];

+			c = (c << 15) | (c >> 17);

+			c += d;

+

+			b += (((~a) | c) ^ d) + (uint) Constants.C63 + buff [9];

+			b = (b << 21) | (b >> 11);

+			b += c;

+

+

+			_H[0] += a;

+			_H[1] += b;

+			_H[2] += c;

+			_H[3] += d;

+		}

+		

+		/// <summary>

+		/// Pads and then processes the final block.

+		/// </summary>

+		/// <param name="inputBuffer">Buffer to grab data from.</param>

+		/// <param name="inputOffset">Position in buffer in bytes to get data from.</param>

+		/// <param name="inputCount">How much data in bytes in the buffer to use.</param>

+		private void ProcessFinalBlock(byte[] inputBuffer, int inputOffset, int inputCount) {

+			byte[] fooBuffer;

+			int paddingSize;

+			int i;

+			uint size;

+

+			paddingSize = (int)(56 - (inputCount + count) % BLOCK_SIZE_BYTES);

+

+			if (paddingSize < 1)

+				paddingSize += BLOCK_SIZE_BYTES;

+

+

+			fooBuffer = new byte[inputCount+paddingSize+8];

+

+			for (i=0; i<inputCount; i++) {

+				fooBuffer[i] = inputBuffer[i+inputOffset];

+			}

+

+			fooBuffer[inputCount] = 0x80;

+			for (i=inputCount+1; i<inputCount+paddingSize; i++) {

+				fooBuffer[i] = 0x00;

+			}

+

+			size = (uint)(count+inputCount);

+			size *= 8;

+			fooBuffer[inputCount+paddingSize] = (byte)((size) >>  0);

+			fooBuffer[inputCount+paddingSize+1] = (byte)((size) >>  8);

+			fooBuffer[inputCount+paddingSize+2] = (byte)((size) >> 16);

+			fooBuffer[inputCount+paddingSize+3] = (byte)((size) >> 24);

+

+			fooBuffer[inputCount+paddingSize+4]   = 0x00;

+			fooBuffer[inputCount+paddingSize+5] = 0x00;

+			fooBuffer[inputCount+paddingSize+6] = 0x00;

+			fooBuffer[inputCount+paddingSize+7] = 0x00;

+

+			ProcessBlock(fooBuffer, 0);

+

+			if (inputCount+paddingSize+8 == 128) {

+				ProcessBlock(fooBuffer, 64);

+			}

+		}

+		

+		private enum Constants : uint {

+			 C0 = 0xd76aa478, C1 = 0xe8c7b756, C2 = 0x242070db,

+			 C3 = 0xc1bdceee, C4 = 0xf57c0faf, C5 = 0x4787c62a,

+			 C6 = 0xa8304613, C7 = 0xfd469501, C8 = 0x698098d8,

+			 C9 = 0x8b44f7af,C10 = 0xffff5bb1,C11 = 0x895cd7be,

+			C12 = 0x6b901122,C13 = 0xfd987193,C14 = 0xa679438e,

+			C15 = 0x49b40821,C16 = 0xf61e2562,C17 = 0xc040b340,

+			C18 = 0x265e5a51,C19 = 0xe9b6c7aa,C20 = 0xd62f105d,

+			C21 = 0x02441453,C22 = 0xd8a1e681,C23 = 0xe7d3fbc8,

+			C24 = 0x21e1cde6,C25 = 0xc33707d6,C26 = 0xf4d50d87,

+			C27 = 0x455a14ed,C28 = 0xa9e3e905,C29 = 0xfcefa3f8,

+			C30 = 0x676f02d9,C31 = 0x8d2a4c8a,C32 = 0xfffa3942,

+			C33 = 0x8771f681,C34 = 0x6d9d6122,C35 = 0xfde5380c,

+			C36 = 0xa4beea44,C37 = 0x4bdecfa9,C38 = 0xf6bb4b60,

+			C39 = 0xbebfbc70,C40 = 0x289b7ec6,C41 = 0xeaa127fa,

+			C42 = 0xd4ef3085,C43 = 0x04881d05,C44 = 0xd9d4d039,

+			C45 = 0xe6db99e5,C46 = 0x1fa27cf8,C47 = 0xc4ac5665,

+			C48 = 0xf4292244,C49 = 0x432aff97,C50 = 0xab9423a7,

+			C51 = 0xfc93a039,C52 = 0x655b59c3,C53 = 0x8f0ccc92,

+			C54 = 0xffeff47d,C55 = 0x85845dd1,C56 = 0x6fa87e4f,

+			C57 = 0xfe2ce6e0,C58 = 0xa3014314,C59 = 0x4e0811a1,

+			C60 = 0xf7537e82,C61 = 0xbd3af235,C62 = 0x2ad7d2bb,

+			C63 = 0xeb86d391

+		}

+

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/PaddingMode.cs b/mcs/class/corlib/System.Security.Cryptography/PaddingMode.cs
new file mode 100644
index 00000000000..7f3fa793a43
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/PaddingMode.cs
@@ -0,0 +1,22 @@
+//

+// System.Security.Cryptography PaddingMode enumeration

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// How to pad the message processed by block ciphers when they don't come out to the being the size of the block.

+	/// </summary>

+	public enum PaddingMode {

+		None = 0x1,

+		PKCS7, // Each byte contains the value of the number of padding bytes.

+		Zeros  // Append zeros to the message.

+	}

+}

+	

diff --git a/mcs/class/corlib/System.Security.Cryptography/RNGCryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/RNGCryptoServiceProvider.cs
new file mode 100644
index 00000000000..bf71a10bb17
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/RNGCryptoServiceProvider.cs
@@ -0,0 +1,52 @@
+//
+// System.Security.Cryptography.RNGCryptoServiceProvider
+//
+// Author: Mark Crichton (crichton@gimp.org)
+//
+// (C) 2002
+//
+
+// "In the beginning there was Chaos,
+// and within this Chaos was Power,
+// Great Power without form."
+// -- The Verrah Rubicon of Verena, Book One
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Security.Cryptography {
+	
+	public class RNGCryptoServiceProvider : RandomNumberGenerator {
+		
+		[MonoTODO]
+		public RNGCryptoServiceProvider () {
+			// This will get some meaning when I figure out what the other
+			// three constructors do.
+		}
+		
+		[MonoTODO]
+		public RNGCryptoServiceProvider (byte[] rgb) {
+			// Ok, not called by app code... someone must call it, though.
+		}
+		
+		[MonoTODO]
+		public RNGCryptoServiceProvider (CspParameters cspParams) {
+			// Why do I have this feeling this is the MS CryptAPI...
+		}
+		
+		[MonoTODO]
+		public RNGCryptoServiceProvider (string str) {
+			// More !application code.  Interesting...
+		}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override void GetBytes (byte[] data);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override void GetNonZeroBytes (byte[] data);
+		
+		~RNGCryptoServiceProvider () {
+			// FIN?
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Cryptography/RSA.cs b/mcs/class/corlib/System.Security.Cryptography/RSA.cs
new file mode 100644
index 00000000000..a02dd19cc2b
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/RSA.cs
@@ -0,0 +1,36 @@
+//

+// System.Security.Cryptography.RSA.cs

+//

+// Authors:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+// Stubbed.

+//

+

+using System;

+

+namespace System.Security.Cryptography {

+	

+	[MonoTODO]

+	public abstract class RSA : AsymmetricAlgorithm {

+		public static new RSA Create () { return null; }

+		public static new RSA Create (string alg) { return Create (); }

+	

+		public RSA () { }

+

+		public abstract byte[] EncryptValue (byte[] rgb);

+		public abstract byte[] DecryptValue (byte[] rgb);

+

+		public abstract RSAParameters ExportParameters (bool include);

+		public abstract void ImportParameters (RSAParameters parameters);

+

+		public override void FromXmlString (string xml) {

+		}

+

+		public override string ToXmlString (bool include) {

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Cryptography/RSAParameters.cs b/mcs/class/corlib/System.Security.Cryptography/RSAParameters.cs
new file mode 100644
index 00000000000..6bc4aafca59
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/RSAParameters.cs
@@ -0,0 +1,36 @@
+//

+// System.Security.Cryptography.RSAParameters.cs

+//

+// Authors:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+// Stubbed.

+//

+

+using System;

+

+namespace System.Security.Cryptography {

+	

+	[MonoTODO]

+	[Serializable]

+	public struct RSAParameters {

+		[NonSerialized]

+		public byte[] P;

+		[NonSerialized]

+		public byte[] Q;

+		[NonSerialized]

+		public byte[] D;

+		[NonSerialized]

+		public byte[] DP;

+		[NonSerialized]

+		public byte[] DQ;

+		[NonSerialized]

+		public byte[] InverseQ;

+		[NonSerialized]

+

+		public byte[] Modulus;

+		public byte[] Exponent;

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Cryptography/RandomNumberGenerator.cs b/mcs/class/corlib/System.Security.Cryptography/RandomNumberGenerator.cs
new file mode 100755
index 00000000000..f6bc1c51608
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/RandomNumberGenerator.cs
@@ -0,0 +1,36 @@
+//
+// System.Security.Cryptography.RandomNumberGenerator
+//
+// author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (C) 2002 Duco Fijma
+//
+
+using System.Globalization;
+
+namespace System.Security.Cryptography {
+	
+public abstract class RandomNumberGenerator  {
+	
+	public RandomNumberGenerator () {
+	}
+
+	public static RandomNumberGenerator Create () {
+		// create the default random number generator
+		return Create ("System.Security.Cryptography.RandomNumberGenerator");
+	}
+
+	[MonoTODO]
+	public static RandomNumberGenerator Create (string rngName) {
+		return null;
+		// return (RandomNumberGenerator) (CryptoConfig.CreateFromName (rngName));
+	}
+
+	public abstract void GetBytes (byte[] data);
+
+	public abstract void GetNonZeroBytes (byte[] data);
+	
+}
+
+}
diff --git a/mcs/class/corlib/System.Security.Cryptography/Rijndael.cs b/mcs/class/corlib/System.Security.Cryptography/Rijndael.cs
new file mode 100644
index 00000000000..e4412164e82
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/Rijndael.cs
@@ -0,0 +1,25 @@
+//

+// System.Security.Cryptography.Rijndael.cs

+//

+// Authors: Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+//

+

+using System;

+

+namespace System.Security.Cryptography {

+	

+	[MonoTODO]

+	public abstract class Rijndael : SymmetricAlgorithm {

+		public static new Rijndael Create () { return null; }

+		public static new Rijndael Create (string alg) { return Create (); }

+		

+		public Rijndael () {

+			KeySizeValue = 256;

+			BlockSizeValue = 128;

+			FeedbackSizeValue = 128;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Cryptography/RijndaelManaged.cs b/mcs/class/corlib/System.Security.Cryptography/RijndaelManaged.cs
new file mode 100644
index 00000000000..9b2428f13d9
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/RijndaelManaged.cs
@@ -0,0 +1,744 @@
+//

+// System.Security.Cryptography.RijndaelManaged.cs

+//

+// Authors: Mark Crichton (crichton@gimp.org)

+//

+// (C) 2002

+//

+//

+

+

+using System;

+using System.Security.Cryptography;

+

+

+/// <summary>

+/// TODO - Add class summary

+/// </summary>

+/// <remarks>

+/// 	created by - crichton

+/// 	created on - 2/23/2002 6:21:44 PM

+/// </remarks>

+namespace System.Security.Cryptography {

+	public sealed class RijndaelManaged : Rijndael {

+		

+		/// <summary>

+		/// RijndaelManaged constructor.

+		/// </summary>

+		public RijndaelManaged() {

+		}

+		

+		/// <summary>

+		/// Generates a random IV for block feedback modes

+		/// </summary>

+		/// <remarks>

+		/// Method is inherited from SymmetricAlgorithm

+		///

+		/// </remarks>

+		[MonoTODO]

+		public override void GenerateIV() {

+			throw new System.NotImplementedException();

+		}

+		

+		/// <summary>

+		/// Generates a random key for Rijndael.  Uses the current KeySize.

+		/// </summary>

+		/// <remarks>

+		/// Inherited method from base class SymmetricAlgorithm

+		///

+		/// </remarks>

+		[MonoTODO]

+		public override void GenerateKey() {

+			throw new System.NotImplementedException();

+		}

+		

+		/// <summary>

+		/// Creates a symmetric Rijndael decryptor object

+		/// </summary>

+		/// <remarks>

+		/// Inherited method from base class SymmetricAlgorithm

+		///

+		/// </remarks>

+		/// <param name='rgbKey'>Key for Rijndael</param>

+		/// <param name='rgbIV'>IV for chaining mode</param>

+		[MonoTODO]

+		public override ICryptoTransform CreateDecryptor(byte[] rgbKey, byte[] rgbIV) {

+			throw new System.NotImplementedException();

+		}

+		

+		/// <summary>

+		/// Creates a symmetric Rijndael encryptor object

+		/// </summary>

+		/// <remarks>

+		/// Inherited method from base class SymmetricAlgorithm

+		///

+		/// </remarks>

+		/// <param name='rgbKey'>Key for Rijndael</param>

+		/// <param name='rgbIV'>IV for chaining mode</param>

+		[MonoTODO]

+		public override ICryptoTransform CreateEncryptor(byte[] rgbKey, byte[] rgbIV) {

+			throw new System.NotImplementedException();

+		}

+		

+		

+		// Note, the following tables are autogenerated.

+		// DO NOT EDIT.

+		// These are the 5 T boxes needed for Rijndael

+		

+		

+		

+		internal static uint [,] ft_tab = {{

+			0xc66363a5, 0xf87c7c84, 0xee777799, 0xf67b7b8d,

+			0xfff2f20d, 0xd66b6bbd, 0xde6f6fb1, 0x91c5c554,

+			0x60303050, 0x02010103, 0xce6767a9, 0x562b2b7d,

+			0xe7fefe19, 0xb5d7d762, 0x4dababe6, 0xec76769a,

+			0x8fcaca45, 0x1f82829d, 0x89c9c940, 0xfa7d7d87,

+			0xeffafa15, 0xb25959eb, 0x8e4747c9, 0xfbf0f00b,

+			0x41adadec, 0xb3d4d467, 0x5fa2a2fd, 0x45afafea,

+			0x239c9cbf, 0x53a4a4f7, 0xe4727296, 0x9bc0c05b,

+			0x75b7b7c2, 0xe1fdfd1c, 0x3d9393ae, 0x4c26266a,

+			0x6c36365a, 0x7e3f3f41, 0xf5f7f702, 0x83cccc4f,

+			0x6834345c, 0x51a5a5f4, 0xd1e5e534, 0xf9f1f108,

+			0xe2717193, 0xabd8d873, 0x62313153, 0x2a15153f,

+			0x0804040c, 0x95c7c752, 0x46232365, 0x9dc3c35e,

+			0x30181828, 0x379696a1, 0x0a05050f, 0x2f9a9ab5,

+			0x0e070709, 0x24121236, 0x1b80809b, 0xdfe2e23d,

+			0xcdebeb26, 0x4e272769, 0x7fb2b2cd, 0xea75759f,

+			0x1209091b, 0x1d83839e, 0x582c2c74, 0x341a1a2e,

+			0x361b1b2d, 0xdc6e6eb2, 0xb45a5aee, 0x5ba0a0fb,

+			0xa45252f6, 0x763b3b4d, 0xb7d6d661, 0x7db3b3ce,

+			0x5229297b, 0xdde3e33e, 0x5e2f2f71, 0x13848497,

+			0xa65353f5, 0xb9d1d168, 0x00000000, 0xc1eded2c,

+			0x40202060, 0xe3fcfc1f, 0x79b1b1c8, 0xb65b5bed,

+			0xd46a6abe, 0x8dcbcb46, 0x67bebed9, 0x7239394b,

+			0x944a4ade, 0x984c4cd4, 0xb05858e8, 0x85cfcf4a,

+			0xbbd0d06b, 0xc5efef2a, 0x4faaaae5, 0xedfbfb16,

+			0x864343c5, 0x9a4d4dd7, 0x66333355, 0x11858594,

+			0x8a4545cf, 0xe9f9f910, 0x04020206, 0xfe7f7f81,

+			0xa05050f0, 0x783c3c44, 0x259f9fba, 0x4ba8a8e3,

+			0xa25151f3, 0x5da3a3fe, 0x804040c0, 0x058f8f8a,

+			0x3f9292ad, 0x219d9dbc, 0x70383848, 0xf1f5f504,

+			0x63bcbcdf, 0x77b6b6c1, 0xafdada75, 0x42212163,

+			0x20101030, 0xe5ffff1a, 0xfdf3f30e, 0xbfd2d26d,

+			0x81cdcd4c, 0x180c0c14, 0x26131335, 0xc3ecec2f,

+			0xbe5f5fe1, 0x359797a2, 0x884444cc, 0x2e171739,

+			0x93c4c457, 0x55a7a7f2, 0xfc7e7e82, 0x7a3d3d47,

+			0xc86464ac, 0xba5d5de7, 0x3219192b, 0xe6737395,

+			0xc06060a0, 0x19818198, 0x9e4f4fd1, 0xa3dcdc7f,

+			0x44222266, 0x542a2a7e, 0x3b9090ab, 0x0b888883,

+			0x8c4646ca, 0xc7eeee29, 0x6bb8b8d3, 0x2814143c,

+			0xa7dede79, 0xbc5e5ee2, 0x160b0b1d, 0xaddbdb76,

+			0xdbe0e03b, 0x64323256, 0x743a3a4e, 0x140a0a1e,

+			0x924949db, 0x0c06060a, 0x4824246c, 0xb85c5ce4,

+			0x9fc2c25d, 0xbdd3d36e, 0x43acacef, 0xc46262a6,

+			0x399191a8, 0x319595a4, 0xd3e4e437, 0xf279798b,

+			0xd5e7e732, 0x8bc8c843, 0x6e373759, 0xda6d6db7,

+			0x018d8d8c, 0xb1d5d564, 0x9c4e4ed2, 0x49a9a9e0,

+			0xd86c6cb4, 0xac5656fa, 0xf3f4f407, 0xcfeaea25,

+			0xca6565af, 0xf47a7a8e, 0x47aeaee9, 0x10080818,

+			0x6fbabad5, 0xf0787888, 0x4a25256f, 0x5c2e2e72,

+			0x381c1c24, 0x57a6a6f1, 0x73b4b4c7, 0x97c6c651,

+			0xcbe8e823, 0xa1dddd7c, 0xe874749c, 0x3e1f1f21,

+			0x964b4bdd, 0x61bdbddc, 0x0d8b8b86, 0x0f8a8a85,

+			0xe0707090, 0x7c3e3e42, 0x71b5b5c4, 0xcc6666aa,

+			0x904848d8, 0x06030305, 0xf7f6f601, 0x1c0e0e12,

+			0xc26161a3, 0x6a35355f, 0xae5757f9, 0x69b9b9d0,

+			0x17868691, 0x99c1c158, 0x3a1d1d27, 0x279e9eb9,

+			0xd9e1e138, 0xebf8f813, 0x2b9898b3, 0x22111133,

+			0xd26969bb, 0xa9d9d970, 0x078e8e89, 0x339494a7,

+			0x2d9b9bb6, 0x3c1e1e22, 0x15878792, 0xc9e9e920,

+			0x87cece49, 0xaa5555ff, 0x50282878, 0xa5dfdf7a,

+			0x038c8c8f, 0x59a1a1f8, 0x09898980, 0x1a0d0d17,

+			0x65bfbfda, 0xd7e6e631, 0x844242c6, 0xd06868b8,

+			0x824141c3, 0x299999b0, 0x5a2d2d77, 0x1e0f0f11,

+			0x7bb0b0cb, 0xa85454fc, 0x6dbbbbd6, 0x2c16163a,

+		},{

+			0xa5c66363, 0x84f87c7c, 0x99ee7777, 0x8df67b7b,

+			0x0dfff2f2, 0xbdd66b6b, 0xb1de6f6f, 0x5491c5c5,

+			0x50603030, 0x03020101, 0xa9ce6767, 0x7d562b2b,

+			0x19e7fefe, 0x62b5d7d7, 0xe64dabab, 0x9aec7676,

+			0x458fcaca, 0x9d1f8282, 0x4089c9c9, 0x87fa7d7d,

+			0x15effafa, 0xebb25959, 0xc98e4747, 0x0bfbf0f0,

+			0xec41adad, 0x67b3d4d4, 0xfd5fa2a2, 0xea45afaf,

+			0xbf239c9c, 0xf753a4a4, 0x96e47272, 0x5b9bc0c0,

+			0xc275b7b7, 0x1ce1fdfd, 0xae3d9393, 0x6a4c2626,

+			0x5a6c3636, 0x417e3f3f, 0x02f5f7f7, 0x4f83cccc,

+			0x5c683434, 0xf451a5a5, 0x34d1e5e5, 0x08f9f1f1,

+			0x93e27171, 0x73abd8d8, 0x53623131, 0x3f2a1515,

+			0x0c080404, 0x5295c7c7, 0x65462323, 0x5e9dc3c3,

+			0x28301818, 0xa1379696, 0x0f0a0505, 0xb52f9a9a,

+			0x090e0707, 0x36241212, 0x9b1b8080, 0x3ddfe2e2,

+			0x26cdebeb, 0x694e2727, 0xcd7fb2b2, 0x9fea7575,

+			0x1b120909, 0x9e1d8383, 0x74582c2c, 0x2e341a1a,

+			0x2d361b1b, 0xb2dc6e6e, 0xeeb45a5a, 0xfb5ba0a0,

+			0xf6a45252, 0x4d763b3b, 0x61b7d6d6, 0xce7db3b3,

+			0x7b522929, 0x3edde3e3, 0x715e2f2f, 0x97138484,

+			0xf5a65353, 0x68b9d1d1, 0x00000000, 0x2cc1eded,

+			0x60402020, 0x1fe3fcfc, 0xc879b1b1, 0xedb65b5b,

+			0xbed46a6a, 0x468dcbcb, 0xd967bebe, 0x4b723939,

+			0xde944a4a, 0xd4984c4c, 0xe8b05858, 0x4a85cfcf,

+			0x6bbbd0d0, 0x2ac5efef, 0xe54faaaa, 0x16edfbfb,

+			0xc5864343, 0xd79a4d4d, 0x55663333, 0x94118585,

+			0xcf8a4545, 0x10e9f9f9, 0x06040202, 0x81fe7f7f,

+			0xf0a05050, 0x44783c3c, 0xba259f9f, 0xe34ba8a8,

+			0xf3a25151, 0xfe5da3a3, 0xc0804040, 0x8a058f8f,

+			0xad3f9292, 0xbc219d9d, 0x48703838, 0x04f1f5f5,

+			0xdf63bcbc, 0xc177b6b6, 0x75afdada, 0x63422121,

+			0x30201010, 0x1ae5ffff, 0x0efdf3f3, 0x6dbfd2d2,

+			0x4c81cdcd, 0x14180c0c, 0x35261313, 0x2fc3ecec,

+			0xe1be5f5f, 0xa2359797, 0xcc884444, 0x392e1717,

+			0x5793c4c4, 0xf255a7a7, 0x82fc7e7e, 0x477a3d3d,

+			0xacc86464, 0xe7ba5d5d, 0x2b321919, 0x95e67373,

+			0xa0c06060, 0x98198181, 0xd19e4f4f, 0x7fa3dcdc,

+			0x66442222, 0x7e542a2a, 0xab3b9090, 0x830b8888,

+			0xca8c4646, 0x29c7eeee, 0xd36bb8b8, 0x3c281414,

+			0x79a7dede, 0xe2bc5e5e, 0x1d160b0b, 0x76addbdb,

+			0x3bdbe0e0, 0x56643232, 0x4e743a3a, 0x1e140a0a,

+			0xdb924949, 0x0a0c0606, 0x6c482424, 0xe4b85c5c,

+			0x5d9fc2c2, 0x6ebdd3d3, 0xef43acac, 0xa6c46262,

+			0xa8399191, 0xa4319595, 0x37d3e4e4, 0x8bf27979,

+			0x32d5e7e7, 0x438bc8c8, 0x596e3737, 0xb7da6d6d,

+			0x8c018d8d, 0x64b1d5d5, 0xd29c4e4e, 0xe049a9a9,

+			0xb4d86c6c, 0xfaac5656, 0x07f3f4f4, 0x25cfeaea,

+			0xafca6565, 0x8ef47a7a, 0xe947aeae, 0x18100808,

+			0xd56fbaba, 0x88f07878, 0x6f4a2525, 0x725c2e2e,

+			0x24381c1c, 0xf157a6a6, 0xc773b4b4, 0x5197c6c6,

+			0x23cbe8e8, 0x7ca1dddd, 0x9ce87474, 0x213e1f1f,

+			0xdd964b4b, 0xdc61bdbd, 0x860d8b8b, 0x850f8a8a,

+			0x90e07070, 0x427c3e3e, 0xc471b5b5, 0xaacc6666,

+			0xd8904848, 0x05060303, 0x01f7f6f6, 0x121c0e0e,

+			0xa3c26161, 0x5f6a3535, 0xf9ae5757, 0xd069b9b9,

+			0x91178686, 0x5899c1c1, 0x273a1d1d, 0xb9279e9e,

+			0x38d9e1e1, 0x13ebf8f8, 0xb32b9898, 0x33221111,

+			0xbbd26969, 0x70a9d9d9, 0x89078e8e, 0xa7339494,

+			0xb62d9b9b, 0x223c1e1e, 0x92158787, 0x20c9e9e9,

+			0x4987cece, 0xffaa5555, 0x78502828, 0x7aa5dfdf,

+			0x8f038c8c, 0xf859a1a1, 0x80098989, 0x171a0d0d,

+			0xda65bfbf, 0x31d7e6e6, 0xc6844242, 0xb8d06868,

+			0xc3824141, 0xb0299999, 0x775a2d2d, 0x111e0f0f,

+			0xcb7bb0b0, 0xfca85454, 0xd66dbbbb, 0x3a2c1616,

+		},{

+			0x63a5c663, 0x7c84f87c, 0x7799ee77, 0x7b8df67b,

+			0xf20dfff2, 0x6bbdd66b, 0x6fb1de6f, 0xc55491c5,

+			0x30506030, 0x01030201, 0x67a9ce67, 0x2b7d562b,

+			0xfe19e7fe, 0xd762b5d7, 0xabe64dab, 0x769aec76,

+			0xca458fca, 0x829d1f82, 0xc94089c9, 0x7d87fa7d,

+			0xfa15effa, 0x59ebb259, 0x47c98e47, 0xf00bfbf0,

+			0xadec41ad, 0xd467b3d4, 0xa2fd5fa2, 0xafea45af,

+			0x9cbf239c, 0xa4f753a4, 0x7296e472, 0xc05b9bc0,

+			0xb7c275b7, 0xfd1ce1fd, 0x93ae3d93, 0x266a4c26,

+			0x365a6c36, 0x3f417e3f, 0xf702f5f7, 0xcc4f83cc,

+			0x345c6834, 0xa5f451a5, 0xe534d1e5, 0xf108f9f1,

+			0x7193e271, 0xd873abd8, 0x31536231, 0x153f2a15,

+			0x040c0804, 0xc75295c7, 0x23654623, 0xc35e9dc3,

+			0x18283018, 0x96a13796, 0x050f0a05, 0x9ab52f9a,

+			0x07090e07, 0x12362412, 0x809b1b80, 0xe23ddfe2,

+			0xeb26cdeb, 0x27694e27, 0xb2cd7fb2, 0x759fea75,

+			0x091b1209, 0x839e1d83, 0x2c74582c, 0x1a2e341a,

+			0x1b2d361b, 0x6eb2dc6e, 0x5aeeb45a, 0xa0fb5ba0,

+			0x52f6a452, 0x3b4d763b, 0xd661b7d6, 0xb3ce7db3,

+			0x297b5229, 0xe33edde3, 0x2f715e2f, 0x84971384,

+			0x53f5a653, 0xd168b9d1, 0x00000000, 0xed2cc1ed,

+			0x20604020, 0xfc1fe3fc, 0xb1c879b1, 0x5bedb65b,

+			0x6abed46a, 0xcb468dcb, 0xbed967be, 0x394b7239,

+			0x4ade944a, 0x4cd4984c, 0x58e8b058, 0xcf4a85cf,

+			0xd06bbbd0, 0xef2ac5ef, 0xaae54faa, 0xfb16edfb,

+			0x43c58643, 0x4dd79a4d, 0x33556633, 0x85941185,

+			0x45cf8a45, 0xf910e9f9, 0x02060402, 0x7f81fe7f,

+			0x50f0a050, 0x3c44783c, 0x9fba259f, 0xa8e34ba8,

+			0x51f3a251, 0xa3fe5da3, 0x40c08040, 0x8f8a058f,

+			0x92ad3f92, 0x9dbc219d, 0x38487038, 0xf504f1f5,

+			0xbcdf63bc, 0xb6c177b6, 0xda75afda, 0x21634221,

+			0x10302010, 0xff1ae5ff, 0xf30efdf3, 0xd26dbfd2,

+			0xcd4c81cd, 0x0c14180c, 0x13352613, 0xec2fc3ec,

+			0x5fe1be5f, 0x97a23597, 0x44cc8844, 0x17392e17,

+			0xc45793c4, 0xa7f255a7, 0x7e82fc7e, 0x3d477a3d,

+			0x64acc864, 0x5de7ba5d, 0x192b3219, 0x7395e673,

+			0x60a0c060, 0x81981981, 0x4fd19e4f, 0xdc7fa3dc,

+			0x22664422, 0x2a7e542a, 0x90ab3b90, 0x88830b88,

+			0x46ca8c46, 0xee29c7ee, 0xb8d36bb8, 0x143c2814,

+			0xde79a7de, 0x5ee2bc5e, 0x0b1d160b, 0xdb76addb,

+			0xe03bdbe0, 0x32566432, 0x3a4e743a, 0x0a1e140a,

+			0x49db9249, 0x060a0c06, 0x246c4824, 0x5ce4b85c,

+			0xc25d9fc2, 0xd36ebdd3, 0xacef43ac, 0x62a6c462,

+			0x91a83991, 0x95a43195, 0xe437d3e4, 0x798bf279,

+			0xe732d5e7, 0xc8438bc8, 0x37596e37, 0x6db7da6d,

+			0x8d8c018d, 0xd564b1d5, 0x4ed29c4e, 0xa9e049a9,

+			0x6cb4d86c, 0x56faac56, 0xf407f3f4, 0xea25cfea,

+			0x65afca65, 0x7a8ef47a, 0xaee947ae, 0x08181008,

+			0xbad56fba, 0x7888f078, 0x256f4a25, 0x2e725c2e,

+			0x1c24381c, 0xa6f157a6, 0xb4c773b4, 0xc65197c6,

+			0xe823cbe8, 0xdd7ca1dd, 0x749ce874, 0x1f213e1f,

+			0x4bdd964b, 0xbddc61bd, 0x8b860d8b, 0x8a850f8a,

+			0x7090e070, 0x3e427c3e, 0xb5c471b5, 0x66aacc66,

+			0x48d89048, 0x03050603, 0xf601f7f6, 0x0e121c0e,

+			0x61a3c261, 0x355f6a35, 0x57f9ae57, 0xb9d069b9,

+			0x86911786, 0xc15899c1, 0x1d273a1d, 0x9eb9279e,

+			0xe138d9e1, 0xf813ebf8, 0x98b32b98, 0x11332211,

+			0x69bbd269, 0xd970a9d9, 0x8e89078e, 0x94a73394,

+			0x9bb62d9b, 0x1e223c1e, 0x87921587, 0xe920c9e9,

+			0xce4987ce, 0x55ffaa55, 0x28785028, 0xdf7aa5df,

+			0x8c8f038c, 0xa1f859a1, 0x89800989, 0x0d171a0d,

+			0xbfda65bf, 0xe631d7e6, 0x42c68442, 0x68b8d068,

+			0x41c38241, 0x99b02999, 0x2d775a2d, 0x0f111e0f,

+			0xb0cb7bb0, 0x54fca854, 0xbbd66dbb, 0x163a2c16,

+		},{

+			0x6363a5c6, 0x7c7c84f8, 0x777799ee, 0x7b7b8df6,

+			0xf2f20dff, 0x6b6bbdd6, 0x6f6fb1de, 0xc5c55491,

+			0x30305060, 0x01010302, 0x6767a9ce, 0x2b2b7d56,

+			0xfefe19e7, 0xd7d762b5, 0xababe64d, 0x76769aec,

+			0xcaca458f, 0x82829d1f, 0xc9c94089, 0x7d7d87fa,

+			0xfafa15ef, 0x5959ebb2, 0x4747c98e, 0xf0f00bfb,

+			0xadadec41, 0xd4d467b3, 0xa2a2fd5f, 0xafafea45,

+			0x9c9cbf23, 0xa4a4f753, 0x727296e4, 0xc0c05b9b,

+			0xb7b7c275, 0xfdfd1ce1, 0x9393ae3d, 0x26266a4c,

+			0x36365a6c, 0x3f3f417e, 0xf7f702f5, 0xcccc4f83,

+			0x34345c68, 0xa5a5f451, 0xe5e534d1, 0xf1f108f9,

+			0x717193e2, 0xd8d873ab, 0x31315362, 0x15153f2a,

+			0x04040c08, 0xc7c75295, 0x23236546, 0xc3c35e9d,

+			0x18182830, 0x9696a137, 0x05050f0a, 0x9a9ab52f,

+			0x0707090e, 0x12123624, 0x80809b1b, 0xe2e23ddf,

+			0xebeb26cd, 0x2727694e, 0xb2b2cd7f, 0x75759fea,

+			0x09091b12, 0x83839e1d, 0x2c2c7458, 0x1a1a2e34,

+			0x1b1b2d36, 0x6e6eb2dc, 0x5a5aeeb4, 0xa0a0fb5b,

+			0x5252f6a4, 0x3b3b4d76, 0xd6d661b7, 0xb3b3ce7d,

+			0x29297b52, 0xe3e33edd, 0x2f2f715e, 0x84849713,

+			0x5353f5a6, 0xd1d168b9, 0x00000000, 0xeded2cc1,

+			0x20206040, 0xfcfc1fe3, 0xb1b1c879, 0x5b5bedb6,

+			0x6a6abed4, 0xcbcb468d, 0xbebed967, 0x39394b72,

+			0x4a4ade94, 0x4c4cd498, 0x5858e8b0, 0xcfcf4a85,

+			0xd0d06bbb, 0xefef2ac5, 0xaaaae54f, 0xfbfb16ed,

+			0x4343c586, 0x4d4dd79a, 0x33335566, 0x85859411,

+			0x4545cf8a, 0xf9f910e9, 0x02020604, 0x7f7f81fe,

+			0x5050f0a0, 0x3c3c4478, 0x9f9fba25, 0xa8a8e34b,

+			0x5151f3a2, 0xa3a3fe5d, 0x4040c080, 0x8f8f8a05,

+			0x9292ad3f, 0x9d9dbc21, 0x38384870, 0xf5f504f1,

+			0xbcbcdf63, 0xb6b6c177, 0xdada75af, 0x21216342,

+			0x10103020, 0xffff1ae5, 0xf3f30efd, 0xd2d26dbf,

+			0xcdcd4c81, 0x0c0c1418, 0x13133526, 0xecec2fc3,

+			0x5f5fe1be, 0x9797a235, 0x4444cc88, 0x1717392e,

+			0xc4c45793, 0xa7a7f255, 0x7e7e82fc, 0x3d3d477a,

+			0x6464acc8, 0x5d5de7ba, 0x19192b32, 0x737395e6,

+			0x6060a0c0, 0x81819819, 0x4f4fd19e, 0xdcdc7fa3,

+			0x22226644, 0x2a2a7e54, 0x9090ab3b, 0x8888830b,

+			0x4646ca8c, 0xeeee29c7, 0xb8b8d36b, 0x14143c28,

+			0xdede79a7, 0x5e5ee2bc, 0x0b0b1d16, 0xdbdb76ad,

+			0xe0e03bdb, 0x32325664, 0x3a3a4e74, 0x0a0a1e14,

+			0x4949db92, 0x06060a0c, 0x24246c48, 0x5c5ce4b8,

+			0xc2c25d9f, 0xd3d36ebd, 0xacacef43, 0x6262a6c4,

+			0x9191a839, 0x9595a431, 0xe4e437d3, 0x79798bf2,

+			0xe7e732d5, 0xc8c8438b, 0x3737596e, 0x6d6db7da,

+			0x8d8d8c01, 0xd5d564b1, 0x4e4ed29c, 0xa9a9e049,

+			0x6c6cb4d8, 0x5656faac, 0xf4f407f3, 0xeaea25cf,

+			0x6565afca, 0x7a7a8ef4, 0xaeaee947, 0x08081810,

+			0xbabad56f, 0x787888f0, 0x25256f4a, 0x2e2e725c,

+			0x1c1c2438, 0xa6a6f157, 0xb4b4c773, 0xc6c65197,

+			0xe8e823cb, 0xdddd7ca1, 0x74749ce8, 0x1f1f213e,

+			0x4b4bdd96, 0xbdbddc61, 0x8b8b860d, 0x8a8a850f,

+			0x707090e0, 0x3e3e427c, 0xb5b5c471, 0x6666aacc,

+			0x4848d890, 0x03030506, 0xf6f601f7, 0x0e0e121c,

+			0x6161a3c2, 0x35355f6a, 0x5757f9ae, 0xb9b9d069,

+			0x86869117, 0xc1c15899, 0x1d1d273a, 0x9e9eb927,

+			0xe1e138d9, 0xf8f813eb, 0x9898b32b, 0x11113322,

+			0x6969bbd2, 0xd9d970a9, 0x8e8e8907, 0x9494a733,

+			0x9b9bb62d, 0x1e1e223c, 0x87879215, 0xe9e920c9,

+			0xcece4987, 0x5555ffaa, 0x28287850, 0xdfdf7aa5,

+			0x8c8c8f03, 0xa1a1f859, 0x89898009, 0x0d0d171a,

+			0xbfbfda65, 0xe6e631d7, 0x4242c684, 0x6868b8d0,

+			0x4141c382, 0x9999b029, 0x2d2d775a, 0x0f0f111e,

+			0xb0b0cb7b, 0x5454fca8, 0xbbbbd66d, 0x16163a2c,

+		},{

+			0x63636363, 0x7c7c7c7c, 0x77777777, 0x7b7b7b7b,

+			0xf2f2f2f2, 0x6b6b6b6b, 0x6f6f6f6f, 0xc5c5c5c5,

+			0x30303030, 0x01010101, 0x67676767, 0x2b2b2b2b,

+			0xfefefefe, 0xd7d7d7d7, 0xabababab, 0x76767676,

+			0xcacacaca, 0x82828282, 0xc9c9c9c9, 0x7d7d7d7d,

+			0xfafafafa, 0x59595959, 0x47474747, 0xf0f0f0f0,

+			0xadadadad, 0xd4d4d4d4, 0xa2a2a2a2, 0xafafafaf,

+			0x9c9c9c9c, 0xa4a4a4a4, 0x72727272, 0xc0c0c0c0,

+			0xb7b7b7b7, 0xfdfdfdfd, 0x93939393, 0x26262626,

+			0x36363636, 0x3f3f3f3f, 0xf7f7f7f7, 0xcccccccc,

+			0x34343434, 0xa5a5a5a5, 0xe5e5e5e5, 0xf1f1f1f1,

+			0x71717171, 0xd8d8d8d8, 0x31313131, 0x15151515,

+			0x04040404, 0xc7c7c7c7, 0x23232323, 0xc3c3c3c3,

+			0x18181818, 0x96969696, 0x05050505, 0x9a9a9a9a,

+			0x07070707, 0x12121212, 0x80808080, 0xe2e2e2e2,

+			0xebebebeb, 0x27272727, 0xb2b2b2b2, 0x75757575,

+			0x09090909, 0x83838383, 0x2c2c2c2c, 0x1a1a1a1a,

+			0x1b1b1b1b, 0x6e6e6e6e, 0x5a5a5a5a, 0xa0a0a0a0,

+			0x52525252, 0x3b3b3b3b, 0xd6d6d6d6, 0xb3b3b3b3,

+			0x29292929, 0xe3e3e3e3, 0x2f2f2f2f, 0x84848484,

+			0x53535353, 0xd1d1d1d1, 0x00000000, 0xedededed,

+			0x20202020, 0xfcfcfcfc, 0xb1b1b1b1, 0x5b5b5b5b,

+			0x6a6a6a6a, 0xcbcbcbcb, 0xbebebebe, 0x39393939,

+			0x4a4a4a4a, 0x4c4c4c4c, 0x58585858, 0xcfcfcfcf,

+			0xd0d0d0d0, 0xefefefef, 0xaaaaaaaa, 0xfbfbfbfb,

+			0x43434343, 0x4d4d4d4d, 0x33333333, 0x85858585,

+			0x45454545, 0xf9f9f9f9, 0x02020202, 0x7f7f7f7f,

+			0x50505050, 0x3c3c3c3c, 0x9f9f9f9f, 0xa8a8a8a8,

+			0x51515151, 0xa3a3a3a3, 0x40404040, 0x8f8f8f8f,

+			0x92929292, 0x9d9d9d9d, 0x38383838, 0xf5f5f5f5,

+			0xbcbcbcbc, 0xb6b6b6b6, 0xdadadada, 0x21212121,

+			0x10101010, 0xffffffff, 0xf3f3f3f3, 0xd2d2d2d2,

+			0xcdcdcdcd, 0x0c0c0c0c, 0x13131313, 0xecececec,

+			0x5f5f5f5f, 0x97979797, 0x44444444, 0x17171717,

+			0xc4c4c4c4, 0xa7a7a7a7, 0x7e7e7e7e, 0x3d3d3d3d,

+			0x64646464, 0x5d5d5d5d, 0x19191919, 0x73737373,

+			0x60606060, 0x81818181, 0x4f4f4f4f, 0xdcdcdcdc,

+			0x22222222, 0x2a2a2a2a, 0x90909090, 0x88888888,

+			0x46464646, 0xeeeeeeee, 0xb8b8b8b8, 0x14141414,

+			0xdededede, 0x5e5e5e5e, 0x0b0b0b0b, 0xdbdbdbdb,

+			0xe0e0e0e0, 0x32323232, 0x3a3a3a3a, 0x0a0a0a0a,

+			0x49494949, 0x06060606, 0x24242424, 0x5c5c5c5c,

+			0xc2c2c2c2, 0xd3d3d3d3, 0xacacacac, 0x62626262,

+			0x91919191, 0x95959595, 0xe4e4e4e4, 0x79797979,

+			0xe7e7e7e7, 0xc8c8c8c8, 0x37373737, 0x6d6d6d6d,

+			0x8d8d8d8d, 0xd5d5d5d5, 0x4e4e4e4e, 0xa9a9a9a9,

+			0x6c6c6c6c, 0x56565656, 0xf4f4f4f4, 0xeaeaeaea,

+			0x65656565, 0x7a7a7a7a, 0xaeaeaeae, 0x08080808,

+			0xbabababa, 0x78787878, 0x25252525, 0x2e2e2e2e,

+			0x1c1c1c1c, 0xa6a6a6a6, 0xb4b4b4b4, 0xc6c6c6c6,

+			0xe8e8e8e8, 0xdddddddd, 0x74747474, 0x1f1f1f1f,

+			0x4b4b4b4b, 0xbdbdbdbd, 0x8b8b8b8b, 0x8a8a8a8a,

+			0x70707070, 0x3e3e3e3e, 0xb5b5b5b5, 0x66666666,

+			0x48484848, 0x03030303, 0xf6f6f6f6, 0x0e0e0e0e,

+			0x61616161, 0x35353535, 0x57575757, 0xb9b9b9b9,

+			0x86868686, 0xc1c1c1c1, 0x1d1d1d1d, 0x9e9e9e9e,

+			0xe1e1e1e1, 0xf8f8f8f8, 0x98989898, 0x11111111,

+			0x69696969, 0xd9d9d9d9, 0x8e8e8e8e, 0x94949494,

+			0x9b9b9b9b, 0x1e1e1e1e, 0x87878787, 0xe9e9e9e9,

+			0xcececece, 0x55555555, 0x28282828, 0xdfdfdfdf,

+			0x8c8c8c8c, 0xa1a1a1a1, 0x89898989, 0x0d0d0d0d,

+			0xbfbfbfbf, 0xe6e6e6e6, 0x42424242, 0x68686868,

+			0x41414141, 0x99999999, 0x2d2d2d2d, 0x0f0f0f0f,

+			0xb0b0b0b0, 0x54545454, 0xbbbbbbbb, 0x16161616,

+		}};

+		

+		internal static uint [,] it_tab = {{

+			0x51f4a750, 0x7e416553, 0x1a17a4c3, 0x3a275e96,

+			0x3bab6bcb, 0x1f9d45f1, 0xacfa58ab, 0x4be30393,

+			0x2030fa55, 0xad766df6, 0x88cc7691, 0xf5024c25,

+			0x4fe5d7fc, 0xc52acbd7, 0x26354480, 0xb562a38f,

+			0xdeb15a49, 0x25ba1b67, 0x45ea0e98, 0x5dfec0e1,

+			0xc32f7502, 0x814cf012, 0x8d4697a3, 0x6bd3f9c6,

+			0x038f5fe7, 0x15929c95, 0xbf6d7aeb, 0x955259da,

+			0xd4be832d, 0x587421d3, 0x49e06929, 0x8ec9c844,

+			0x75c2896a, 0xf48e7978, 0x99583e6b, 0x27b971dd,

+			0xbee14fb6, 0xf088ad17, 0xc920ac66, 0x7dce3ab4,

+			0x63df4a18, 0xe51a3182, 0x97513360, 0x62537f45,

+			0xb16477e0, 0xbb6bae84, 0xfe81a01c, 0xf9082b94,

+			0x70486858, 0x8f45fd19, 0x94de6c87, 0x527bf8b7,

+			0xab73d323, 0x724b02e2, 0xe31f8f57, 0x6655ab2a,

+			0xb2eb2807, 0x2fb5c203, 0x86c57b9a, 0xd33708a5,

+			0x302887f2, 0x23bfa5b2, 0x02036aba, 0xed16825c,

+			0x8acf1c2b, 0xa779b492, 0xf307f2f0, 0x4e69e2a1,

+			0x65daf4cd, 0x0605bed5, 0xd134621f, 0xc4a6fe8a,

+			0x342e539d, 0xa2f355a0, 0x058ae132, 0xa4f6eb75,

+			0x0b83ec39, 0x4060efaa, 0x5e719f06, 0xbd6e1051,

+			0x3e218af9, 0x96dd063d, 0xdd3e05ae, 0x4de6bd46,

+			0x91548db5, 0x71c45d05, 0x0406d46f, 0x605015ff,

+			0x1998fb24, 0xd6bde997, 0x894043cc, 0x67d99e77,

+			0xb0e842bd, 0x07898b88, 0xe7195b38, 0x79c8eedb,

+			0xa17c0a47, 0x7c420fe9, 0xf8841ec9, 0x00000000,

+			0x09808683, 0x322bed48, 0x1e1170ac, 0x6c5a724e,

+			0xfd0efffb, 0x0f853856, 0x3daed51e, 0x362d3927,

+			0x0a0fd964, 0x685ca621, 0x9b5b54d1, 0x24362e3a,

+			0x0c0a67b1, 0x9357e70f, 0xb4ee96d2, 0x1b9b919e,

+			0x80c0c54f, 0x61dc20a2, 0x5a774b69, 0x1c121a16,

+			0xe293ba0a, 0xc0a02ae5, 0x3c22e043, 0x121b171d,

+			0x0e090d0b, 0xf28bc7ad, 0x2db6a8b9, 0x141ea9c8,

+			0x57f11985, 0xaf75074c, 0xee99ddbb, 0xa37f60fd,

+			0xf701269f, 0x5c72f5bc, 0x44663bc5, 0x5bfb7e34,

+			0x8b432976, 0xcb23c6dc, 0xb6edfc68, 0xb8e4f163,

+			0xd731dcca, 0x42638510, 0x13972240, 0x84c61120,

+			0x854a247d, 0xd2bb3df8, 0xaef93211, 0xc729a16d,

+			0x1d9e2f4b, 0xdcb230f3, 0x0d8652ec, 0x77c1e3d0,

+			0x2bb3166c, 0xa970b999, 0x119448fa, 0x47e96422,

+			0xa8fc8cc4, 0xa0f03f1a, 0x567d2cd8, 0x223390ef,

+			0x87494ec7, 0xd938d1c1, 0x8ccaa2fe, 0x98d40b36,

+			0xa6f581cf, 0xa57ade28, 0xdab78e26, 0x3fadbfa4,

+			0x2c3a9de4, 0x5078920d, 0x6a5fcc9b, 0x547e4662,

+			0xf68d13c2, 0x90d8b8e8, 0x2e39f75e, 0x82c3aff5,

+			0x9f5d80be, 0x69d0937c, 0x6fd52da9, 0xcf2512b3,

+			0xc8ac993b, 0x10187da7, 0xe89c636e, 0xdb3bbb7b,

+			0xcd267809, 0x6e5918f4, 0xec9ab701, 0x834f9aa8,

+			0xe6956e65, 0xaaffe67e, 0x21bccf08, 0xef15e8e6,

+			0xbae79bd9, 0x4a6f36ce, 0xea9f09d4, 0x29b07cd6,

+			0x31a4b2af, 0x2a3f2331, 0xc6a59430, 0x35a266c0,

+			0x744ebc37, 0xfc82caa6, 0xe090d0b0, 0x33a7d815,

+			0xf104984a, 0x41ecdaf7, 0x7fcd500e, 0x1791f62f,

+			0x764dd68d, 0x43efb04d, 0xccaa4d54, 0xe49604df,

+			0x9ed1b5e3, 0x4c6a881b, 0xc12c1fb8, 0x4665517f,

+			0x9d5eea04, 0x018c355d, 0xfa877473, 0xfb0b412e,

+			0xb3671d5a, 0x92dbd252, 0xe9105633, 0x6dd64713,

+			0x9ad7618c, 0x37a10c7a, 0x59f8148e, 0xeb133c89,

+			0xcea927ee, 0xb761c935, 0xe11ce5ed, 0x7a47b13c,

+			0x9cd2df59, 0x55f2733f, 0x1814ce79, 0x73c737bf,

+			0x53f7cdea, 0x5ffdaa5b, 0xdf3d6f14, 0x7844db86,

+			0xcaaff381, 0xb968c43e, 0x3824342c, 0xc2a3405f,

+			0x161dc372, 0xbce2250c, 0x283c498b, 0xff0d9541,

+			0x39a80171, 0x080cb3de, 0xd8b4e49c, 0x6456c190,

+			0x7bcb8461, 0xd532b670, 0x486c5c74, 0xd0b85742,

+		},{

+			0x5051f4a7, 0x537e4165, 0xc31a17a4, 0x963a275e,

+			0xcb3bab6b, 0xf11f9d45, 0xabacfa58, 0x934be303,

+			0x552030fa, 0xf6ad766d, 0x9188cc76, 0x25f5024c,

+			0xfc4fe5d7, 0xd7c52acb, 0x80263544, 0x8fb562a3,

+			0x49deb15a, 0x6725ba1b, 0x9845ea0e, 0xe15dfec0,

+			0x02c32f75, 0x12814cf0, 0xa38d4697, 0xc66bd3f9,

+			0xe7038f5f, 0x9515929c, 0xebbf6d7a, 0xda955259,

+			0x2dd4be83, 0xd3587421, 0x2949e069, 0x448ec9c8,

+			0x6a75c289, 0x78f48e79, 0x6b99583e, 0xdd27b971,

+			0xb6bee14f, 0x17f088ad, 0x66c920ac, 0xb47dce3a,

+			0x1863df4a, 0x82e51a31, 0x60975133, 0x4562537f,

+			0xe0b16477, 0x84bb6bae, 0x1cfe81a0, 0x94f9082b,

+			0x58704868, 0x198f45fd, 0x8794de6c, 0xb7527bf8,

+			0x23ab73d3, 0xe2724b02, 0x57e31f8f, 0x2a6655ab,

+			0x07b2eb28, 0x032fb5c2, 0x9a86c57b, 0xa5d33708,

+			0xf2302887, 0xb223bfa5, 0xba02036a, 0x5ced1682,

+			0x2b8acf1c, 0x92a779b4, 0xf0f307f2, 0xa14e69e2,

+			0xcd65daf4, 0xd50605be, 0x1fd13462, 0x8ac4a6fe,

+			0x9d342e53, 0xa0a2f355, 0x32058ae1, 0x75a4f6eb,

+			0x390b83ec, 0xaa4060ef, 0x065e719f, 0x51bd6e10,

+			0xf93e218a, 0x3d96dd06, 0xaedd3e05, 0x464de6bd,

+			0xb591548d, 0x0571c45d, 0x6f0406d4, 0xff605015,

+			0x241998fb, 0x97d6bde9, 0xcc894043, 0x7767d99e,

+			0xbdb0e842, 0x8807898b, 0x38e7195b, 0xdb79c8ee,

+			0x47a17c0a, 0xe97c420f, 0xc9f8841e, 0x00000000,

+			0x83098086, 0x48322bed, 0xac1e1170, 0x4e6c5a72,

+			0xfbfd0eff, 0x560f8538, 0x1e3daed5, 0x27362d39,

+			0x640a0fd9, 0x21685ca6, 0xd19b5b54, 0x3a24362e,

+			0xb10c0a67, 0x0f9357e7, 0xd2b4ee96, 0x9e1b9b91,

+			0x4f80c0c5, 0xa261dc20, 0x695a774b, 0x161c121a,

+			0x0ae293ba, 0xe5c0a02a, 0x433c22e0, 0x1d121b17,

+			0x0b0e090d, 0xadf28bc7, 0xb92db6a8, 0xc8141ea9,

+			0x8557f119, 0x4caf7507, 0xbbee99dd, 0xfda37f60,

+			0x9ff70126, 0xbc5c72f5, 0xc544663b, 0x345bfb7e,

+			0x768b4329, 0xdccb23c6, 0x68b6edfc, 0x63b8e4f1,

+			0xcad731dc, 0x10426385, 0x40139722, 0x2084c611,

+			0x7d854a24, 0xf8d2bb3d, 0x11aef932, 0x6dc729a1,

+			0x4b1d9e2f, 0xf3dcb230, 0xec0d8652, 0xd077c1e3,

+			0x6c2bb316, 0x99a970b9, 0xfa119448, 0x2247e964,

+			0xc4a8fc8c, 0x1aa0f03f, 0xd8567d2c, 0xef223390,

+			0xc787494e, 0xc1d938d1, 0xfe8ccaa2, 0x3698d40b,

+			0xcfa6f581, 0x28a57ade, 0x26dab78e, 0xa43fadbf,

+			0xe42c3a9d, 0x0d507892, 0x9b6a5fcc, 0x62547e46,

+			0xc2f68d13, 0xe890d8b8, 0x5e2e39f7, 0xf582c3af,

+			0xbe9f5d80, 0x7c69d093, 0xa96fd52d, 0xb3cf2512,

+			0x3bc8ac99, 0xa710187d, 0x6ee89c63, 0x7bdb3bbb,

+			0x09cd2678, 0xf46e5918, 0x01ec9ab7, 0xa8834f9a,

+			0x65e6956e, 0x7eaaffe6, 0x0821bccf, 0xe6ef15e8,

+			0xd9bae79b, 0xce4a6f36, 0xd4ea9f09, 0xd629b07c,

+			0xaf31a4b2, 0x312a3f23, 0x30c6a594, 0xc035a266,

+			0x37744ebc, 0xa6fc82ca, 0xb0e090d0, 0x1533a7d8,

+			0x4af10498, 0xf741ecda, 0x0e7fcd50, 0x2f1791f6,

+			0x8d764dd6, 0x4d43efb0, 0x54ccaa4d, 0xdfe49604,

+			0xe39ed1b5, 0x1b4c6a88, 0xb8c12c1f, 0x7f466551,

+			0x049d5eea, 0x5d018c35, 0x73fa8774, 0x2efb0b41,

+			0x5ab3671d, 0x5292dbd2, 0x33e91056, 0x136dd647,

+			0x8c9ad761, 0x7a37a10c, 0x8e59f814, 0x89eb133c,

+			0xeecea927, 0x35b761c9, 0xede11ce5, 0x3c7a47b1,

+			0x599cd2df, 0x3f55f273, 0x791814ce, 0xbf73c737,

+			0xea53f7cd, 0x5b5ffdaa, 0x14df3d6f, 0x867844db,

+			0x81caaff3, 0x3eb968c4, 0x2c382434, 0x5fc2a340,

+			0x72161dc3, 0x0cbce225, 0x8b283c49, 0x41ff0d95,

+			0x7139a801, 0xde080cb3, 0x9cd8b4e4, 0x906456c1,

+			0x617bcb84, 0x70d532b6, 0x74486c5c, 0x42d0b857,

+		},{

+			0xa75051f4, 0x65537e41, 0xa4c31a17, 0x5e963a27,

+			0x6bcb3bab, 0x45f11f9d, 0x58abacfa, 0x03934be3,

+			0xfa552030, 0x6df6ad76, 0x769188cc, 0x4c25f502,

+			0xd7fc4fe5, 0xcbd7c52a, 0x44802635, 0xa38fb562,

+			0x5a49deb1, 0x1b6725ba, 0x0e9845ea, 0xc0e15dfe,

+			0x7502c32f, 0xf012814c, 0x97a38d46, 0xf9c66bd3,

+			0x5fe7038f, 0x9c951592, 0x7aebbf6d, 0x59da9552,

+			0x832dd4be, 0x21d35874, 0x692949e0, 0xc8448ec9,

+			0x896a75c2, 0x7978f48e, 0x3e6b9958, 0x71dd27b9,

+			0x4fb6bee1, 0xad17f088, 0xac66c920, 0x3ab47dce,

+			0x4a1863df, 0x3182e51a, 0x33609751, 0x7f456253,

+			0x77e0b164, 0xae84bb6b, 0xa01cfe81, 0x2b94f908,

+			0x68587048, 0xfd198f45, 0x6c8794de, 0xf8b7527b,

+			0xd323ab73, 0x02e2724b, 0x8f57e31f, 0xab2a6655,

+			0x2807b2eb, 0xc2032fb5, 0x7b9a86c5, 0x08a5d337,

+			0x87f23028, 0xa5b223bf, 0x6aba0203, 0x825ced16,

+			0x1c2b8acf, 0xb492a779, 0xf2f0f307, 0xe2a14e69,

+			0xf4cd65da, 0xbed50605, 0x621fd134, 0xfe8ac4a6,

+			0x539d342e, 0x55a0a2f3, 0xe132058a, 0xeb75a4f6,

+			0xec390b83, 0xefaa4060, 0x9f065e71, 0x1051bd6e,

+			0x8af93e21, 0x063d96dd, 0x05aedd3e, 0xbd464de6,

+			0x8db59154, 0x5d0571c4, 0xd46f0406, 0x15ff6050,

+			0xfb241998, 0xe997d6bd, 0x43cc8940, 0x9e7767d9,

+			0x42bdb0e8, 0x8b880789, 0x5b38e719, 0xeedb79c8,

+			0x0a47a17c, 0x0fe97c42, 0x1ec9f884, 0x00000000,

+			0x86830980, 0xed48322b, 0x70ac1e11, 0x724e6c5a,

+			0xfffbfd0e, 0x38560f85, 0xd51e3dae, 0x3927362d,

+			0xd9640a0f, 0xa621685c, 0x54d19b5b, 0x2e3a2436,

+			0x67b10c0a, 0xe70f9357, 0x96d2b4ee, 0x919e1b9b,

+			0xc54f80c0, 0x20a261dc, 0x4b695a77, 0x1a161c12,

+			0xba0ae293, 0x2ae5c0a0, 0xe0433c22, 0x171d121b,

+			0x0d0b0e09, 0xc7adf28b, 0xa8b92db6, 0xa9c8141e,

+			0x198557f1, 0x074caf75, 0xddbbee99, 0x60fda37f,

+			0x269ff701, 0xf5bc5c72, 0x3bc54466, 0x7e345bfb,

+			0x29768b43, 0xc6dccb23, 0xfc68b6ed, 0xf163b8e4,

+			0xdccad731, 0x85104263, 0x22401397, 0x112084c6,

+			0x247d854a, 0x3df8d2bb, 0x3211aef9, 0xa16dc729,

+			0x2f4b1d9e, 0x30f3dcb2, 0x52ec0d86, 0xe3d077c1,

+			0x166c2bb3, 0xb999a970, 0x48fa1194, 0x642247e9,

+			0x8cc4a8fc, 0x3f1aa0f0, 0x2cd8567d, 0x90ef2233,

+			0x4ec78749, 0xd1c1d938, 0xa2fe8cca, 0x0b3698d4,

+			0x81cfa6f5, 0xde28a57a, 0x8e26dab7, 0xbfa43fad,

+			0x9de42c3a, 0x920d5078, 0xcc9b6a5f, 0x4662547e,

+			0x13c2f68d, 0xb8e890d8, 0xf75e2e39, 0xaff582c3,

+			0x80be9f5d, 0x937c69d0, 0x2da96fd5, 0x12b3cf25,

+			0x993bc8ac, 0x7da71018, 0x636ee89c, 0xbb7bdb3b,

+			0x7809cd26, 0x18f46e59, 0xb701ec9a, 0x9aa8834f,

+			0x6e65e695, 0xe67eaaff, 0xcf0821bc, 0xe8e6ef15,

+			0x9bd9bae7, 0x36ce4a6f, 0x09d4ea9f, 0x7cd629b0,

+			0xb2af31a4, 0x23312a3f, 0x9430c6a5, 0x66c035a2,

+			0xbc37744e, 0xcaa6fc82, 0xd0b0e090, 0xd81533a7,

+			0x984af104, 0xdaf741ec, 0x500e7fcd, 0xf62f1791,

+			0xd68d764d, 0xb04d43ef, 0x4d54ccaa, 0x04dfe496,

+			0xb5e39ed1, 0x881b4c6a, 0x1fb8c12c, 0x517f4665,

+			0xea049d5e, 0x355d018c, 0x7473fa87, 0x412efb0b,

+			0x1d5ab367, 0xd25292db, 0x5633e910, 0x47136dd6,

+			0x618c9ad7, 0x0c7a37a1, 0x148e59f8, 0x3c89eb13,

+			0x27eecea9, 0xc935b761, 0xe5ede11c, 0xb13c7a47,

+			0xdf599cd2, 0x733f55f2, 0xce791814, 0x37bf73c7,

+			0xcdea53f7, 0xaa5b5ffd, 0x6f14df3d, 0xdb867844,

+			0xf381caaf, 0xc43eb968, 0x342c3824, 0x405fc2a3,

+			0xc372161d, 0x250cbce2, 0x498b283c, 0x9541ff0d,

+			0x017139a8, 0xb3de080c, 0xe49cd8b4, 0xc1906456,

+			0x84617bcb, 0xb670d532, 0x5c74486c, 0x5742d0b8,

+		},{

+			0xf4a75051, 0x4165537e, 0x17a4c31a, 0x275e963a,

+			0xab6bcb3b, 0x9d45f11f, 0xfa58abac, 0xe303934b,

+			0x30fa5520, 0x766df6ad, 0xcc769188, 0x024c25f5,

+			0xe5d7fc4f, 0x2acbd7c5, 0x35448026, 0x62a38fb5,

+			0xb15a49de, 0xba1b6725, 0xea0e9845, 0xfec0e15d,

+			0x2f7502c3, 0x4cf01281, 0x4697a38d, 0xd3f9c66b,

+			0x8f5fe703, 0x929c9515, 0x6d7aebbf, 0x5259da95,

+			0xbe832dd4, 0x7421d358, 0xe0692949, 0xc9c8448e,

+			0xc2896a75, 0x8e7978f4, 0x583e6b99, 0xb971dd27,

+			0xe14fb6be, 0x88ad17f0, 0x20ac66c9, 0xce3ab47d,

+			0xdf4a1863, 0x1a3182e5, 0x51336097, 0x537f4562,

+			0x6477e0b1, 0x6bae84bb, 0x81a01cfe, 0x082b94f9,

+			0x48685870, 0x45fd198f, 0xde6c8794, 0x7bf8b752,

+			0x73d323ab, 0x4b02e272, 0x1f8f57e3, 0x55ab2a66,

+			0xeb2807b2, 0xb5c2032f, 0xc57b9a86, 0x3708a5d3,

+			0x2887f230, 0xbfa5b223, 0x036aba02, 0x16825ced,

+			0xcf1c2b8a, 0x79b492a7, 0x07f2f0f3, 0x69e2a14e,

+			0xdaf4cd65, 0x05bed506, 0x34621fd1, 0xa6fe8ac4,

+			0x2e539d34, 0xf355a0a2, 0x8ae13205, 0xf6eb75a4,

+			0x83ec390b, 0x60efaa40, 0x719f065e, 0x6e1051bd,

+			0x218af93e, 0xdd063d96, 0x3e05aedd, 0xe6bd464d,

+			0x548db591, 0xc45d0571, 0x06d46f04, 0x5015ff60,

+			0x98fb2419, 0xbde997d6, 0x4043cc89, 0xd99e7767,

+			0xe842bdb0, 0x898b8807, 0x195b38e7, 0xc8eedb79,

+			0x7c0a47a1, 0x420fe97c, 0x841ec9f8, 0x00000000,

+			0x80868309, 0x2bed4832, 0x1170ac1e, 0x5a724e6c,

+			0x0efffbfd, 0x8538560f, 0xaed51e3d, 0x2d392736,

+			0x0fd9640a, 0x5ca62168, 0x5b54d19b, 0x362e3a24,

+			0x0a67b10c, 0x57e70f93, 0xee96d2b4, 0x9b919e1b,

+			0xc0c54f80, 0xdc20a261, 0x774b695a, 0x121a161c,

+			0x93ba0ae2, 0xa02ae5c0, 0x22e0433c, 0x1b171d12,

+			0x090d0b0e, 0x8bc7adf2, 0xb6a8b92d, 0x1ea9c814,

+			0xf1198557, 0x75074caf, 0x99ddbbee, 0x7f60fda3,

+			0x01269ff7, 0x72f5bc5c, 0x663bc544, 0xfb7e345b,

+			0x4329768b, 0x23c6dccb, 0xedfc68b6, 0xe4f163b8,

+			0x31dccad7, 0x63851042, 0x97224013, 0xc6112084,

+			0x4a247d85, 0xbb3df8d2, 0xf93211ae, 0x29a16dc7,

+			0x9e2f4b1d, 0xb230f3dc, 0x8652ec0d, 0xc1e3d077,

+			0xb3166c2b, 0x70b999a9, 0x9448fa11, 0xe9642247,

+			0xfc8cc4a8, 0xf03f1aa0, 0x7d2cd856, 0x3390ef22,

+			0x494ec787, 0x38d1c1d9, 0xcaa2fe8c, 0xd40b3698,

+			0xf581cfa6, 0x7ade28a5, 0xb78e26da, 0xadbfa43f,

+			0x3a9de42c, 0x78920d50, 0x5fcc9b6a, 0x7e466254,

+			0x8d13c2f6, 0xd8b8e890, 0x39f75e2e, 0xc3aff582,

+			0x5d80be9f, 0xd0937c69, 0xd52da96f, 0x2512b3cf,

+			0xac993bc8, 0x187da710, 0x9c636ee8, 0x3bbb7bdb,

+			0x267809cd, 0x5918f46e, 0x9ab701ec, 0x4f9aa883,

+			0x956e65e6, 0xffe67eaa, 0xbccf0821, 0x15e8e6ef,

+			0xe79bd9ba, 0x6f36ce4a, 0x9f09d4ea, 0xb07cd629,

+			0xa4b2af31, 0x3f23312a, 0xa59430c6, 0xa266c035,

+			0x4ebc3774, 0x82caa6fc, 0x90d0b0e0, 0xa7d81533,

+			0x04984af1, 0xecdaf741, 0xcd500e7f, 0x91f62f17,

+			0x4dd68d76, 0xefb04d43, 0xaa4d54cc, 0x9604dfe4,

+			0xd1b5e39e, 0x6a881b4c, 0x2c1fb8c1, 0x65517f46,

+			0x5eea049d, 0x8c355d01, 0x877473fa, 0x0b412efb,

+			0x671d5ab3, 0xdbd25292, 0x105633e9, 0xd647136d,

+			0xd7618c9a, 0xa10c7a37, 0xf8148e59, 0x133c89eb,

+			0xa927eece, 0x61c935b7, 0x1ce5ede1, 0x47b13c7a,

+			0xd2df599c, 0xf2733f55, 0x14ce7918, 0xc737bf73,

+			0xf7cdea53, 0xfdaa5b5f, 0x3d6f14df, 0x44db8678,

+			0xaff381ca, 0x68c43eb9, 0x24342c38, 0xa3405fc2,

+			0x1dc37216, 0xe2250cbc, 0x3c498b28, 0x0d9541ff,

+			0xa8017139, 0x0cb3de08, 0xb4e49cd8, 0x56c19064,

+			0xcb84617b, 0x32b670d5, 0x6c5c7448, 0xb85742d0,

+		},{

+			0x52525252, 0x09090909, 0x6a6a6a6a, 0xd5d5d5d5,

+			0x30303030, 0x36363636, 0xa5a5a5a5, 0x38383838,

+			0xbfbfbfbf, 0x40404040, 0xa3a3a3a3, 0x9e9e9e9e,

+			0x81818181, 0xf3f3f3f3, 0xd7d7d7d7, 0xfbfbfbfb,

+			0x7c7c7c7c, 0xe3e3e3e3, 0x39393939, 0x82828282,

+			0x9b9b9b9b, 0x2f2f2f2f, 0xffffffff, 0x87878787,

+			0x34343434, 0x8e8e8e8e, 0x43434343, 0x44444444,

+			0xc4c4c4c4, 0xdededede, 0xe9e9e9e9, 0xcbcbcbcb,

+			0x54545454, 0x7b7b7b7b, 0x94949494, 0x32323232,

+			0xa6a6a6a6, 0xc2c2c2c2, 0x23232323, 0x3d3d3d3d,

+			0xeeeeeeee, 0x4c4c4c4c, 0x95959595, 0x0b0b0b0b,

+			0x42424242, 0xfafafafa, 0xc3c3c3c3, 0x4e4e4e4e,

+			0x08080808, 0x2e2e2e2e, 0xa1a1a1a1, 0x66666666,

+			0x28282828, 0xd9d9d9d9, 0x24242424, 0xb2b2b2b2,

+			0x76767676, 0x5b5b5b5b, 0xa2a2a2a2, 0x49494949,

+			0x6d6d6d6d, 0x8b8b8b8b, 0xd1d1d1d1, 0x25252525,

+			0x72727272, 0xf8f8f8f8, 0xf6f6f6f6, 0x64646464,

+			0x86868686, 0x68686868, 0x98989898, 0x16161616,

+			0xd4d4d4d4, 0xa4a4a4a4, 0x5c5c5c5c, 0xcccccccc,

+			0x5d5d5d5d, 0x65656565, 0xb6b6b6b6, 0x92929292,

+			0x6c6c6c6c, 0x70707070, 0x48484848, 0x50505050,

+			0xfdfdfdfd, 0xedededed, 0xb9b9b9b9, 0xdadadada,

+			0x5e5e5e5e, 0x15151515, 0x46464646, 0x57575757,

+			0xa7a7a7a7, 0x8d8d8d8d, 0x9d9d9d9d, 0x84848484,

+			0x90909090, 0xd8d8d8d8, 0xabababab, 0x00000000,

+			0x8c8c8c8c, 0xbcbcbcbc, 0xd3d3d3d3, 0x0a0a0a0a,

+			0xf7f7f7f7, 0xe4e4e4e4, 0x58585858, 0x05050505,

+			0xb8b8b8b8, 0xb3b3b3b3, 0x45454545, 0x06060606,

+			0xd0d0d0d0, 0x2c2c2c2c, 0x1e1e1e1e, 0x8f8f8f8f,

+			0xcacacaca, 0x3f3f3f3f, 0x0f0f0f0f, 0x02020202,

+			0xc1c1c1c1, 0xafafafaf, 0xbdbdbdbd, 0x03030303,

+			0x01010101, 0x13131313, 0x8a8a8a8a, 0x6b6b6b6b,

+			0x3a3a3a3a, 0x91919191, 0x11111111, 0x41414141,

+			0x4f4f4f4f, 0x67676767, 0xdcdcdcdc, 0xeaeaeaea,

+			0x97979797, 0xf2f2f2f2, 0xcfcfcfcf, 0xcececece,

+			0xf0f0f0f0, 0xb4b4b4b4, 0xe6e6e6e6, 0x73737373,

+			0x96969696, 0xacacacac, 0x74747474, 0x22222222,

+			0xe7e7e7e7, 0xadadadad, 0x35353535, 0x85858585,

+			0xe2e2e2e2, 0xf9f9f9f9, 0x37373737, 0xe8e8e8e8,

+			0x1c1c1c1c, 0x75757575, 0xdfdfdfdf, 0x6e6e6e6e,

+			0x47474747, 0xf1f1f1f1, 0x1a1a1a1a, 0x71717171,

+			0x1d1d1d1d, 0x29292929, 0xc5c5c5c5, 0x89898989,

+			0x6f6f6f6f, 0xb7b7b7b7, 0x62626262, 0x0e0e0e0e,

+			0xaaaaaaaa, 0x18181818, 0xbebebebe, 0x1b1b1b1b,

+			0xfcfcfcfc, 0x56565656, 0x3e3e3e3e, 0x4b4b4b4b,

+			0xc6c6c6c6, 0xd2d2d2d2, 0x79797979, 0x20202020,

+			0x9a9a9a9a, 0xdbdbdbdb, 0xc0c0c0c0, 0xfefefefe,

+			0x78787878, 0xcdcdcdcd, 0x5a5a5a5a, 0xf4f4f4f4,

+			0x1f1f1f1f, 0xdddddddd, 0xa8a8a8a8, 0x33333333,

+			0x88888888, 0x07070707, 0xc7c7c7c7, 0x31313131,

+			0xb1b1b1b1, 0x12121212, 0x10101010, 0x59595959,

+			0x27272727, 0x80808080, 0xecececec, 0x5f5f5f5f,

+			0x60606060, 0x51515151, 0x7f7f7f7f, 0xa9a9a9a9,

+			0x19191919, 0xb5b5b5b5, 0x4a4a4a4a, 0x0d0d0d0d,

+			0x2d2d2d2d, 0xe5e5e5e5, 0x7a7a7a7a, 0x9f9f9f9f,

+			0x93939393, 0xc9c9c9c9, 0x9c9c9c9c, 0xefefefef,

+			0xa0a0a0a0, 0xe0e0e0e0, 0x3b3b3b3b, 0x4d4d4d4d,

+			0xaeaeaeae, 0x2a2a2a2a, 0xf5f5f5f5, 0xb0b0b0b0,

+			0xc8c8c8c8, 0xebebebeb, 0xbbbbbbbb, 0x3c3c3c3c,

+			0x83838383, 0x53535353, 0x99999999, 0x61616161,

+			0x17171717, 0x2b2b2b2b, 0x04040404, 0x7e7e7e7e,

+			0xbabababa, 0x77777777, 0xd6d6d6d6, 0x26262626,

+			0xe1e1e1e1, 0x69696969, 0x14141414, 0x63636363,

+			0x55555555, 0x21212121, 0x0c0c0c0c, 0x7d7d7d7d,

+		}};

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA1.cs b/mcs/class/corlib/System.Security.Cryptography/SHA1.cs
new file mode 100644
index 00000000000..605c4d9baa9
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA1.cs
@@ -0,0 +1,44 @@
+//

+// System.Security.Cryptography SHA1 Class implementation

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Common base class for all derived SHA1 iplementations.

+	/// </summary>

+	public abstract class SHA1 : HashAlgorithm {

+		/// <summary>

+		/// Called from constructor of derived class.

+		/// </summary>

+		protected SHA1 () {

+		

+		}

+

+	

+		/// <summary>

+		/// Creates the default derived class.

+		/// </summary>

+		public static new SHA1 Create () {

+			return new SHA1CryptoServiceProvider();

+		}

+	

+		/// <summary>

+		/// Creates a new derived class.

+		/// </summary>

+		/// <param name="st">FIXME: No clue.  Specifies which derived class to create?</param>

+		[MonoTODO]

+		public static new SHA1 Create (string st) {

+			return Create();

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA1CryptoServiceProvider.cs b/mcs/class/corlib/System.Security.Cryptography/SHA1CryptoServiceProvider.cs
new file mode 100644
index 00000000000..d7061e496ae
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA1CryptoServiceProvider.cs
@@ -0,0 +1,455 @@
+//

+// System.Security.Cryptography SHA1CryptoServiceProvider Class implementation

+//

+// Author:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography {

+

+	/// <summary>

+	/// C# implementation of the SHA1 cryptographic hash function.

+	/// LAMESPEC?: Basically the same thing as SHA1Managed except for how its implemented.

+	/// </summary>

+	public sealed class SHA1CryptoServiceProvider : SHA1 {

+		private const int BLOCK_SIZE_BYTES =  64;

+		private const int HASH_SIZE_BYTES  =  20;

+		private const int HASH_SIZE_BITS   = 160;

+		[CLSCompliant(false)] private uint[] _H;  // these are my chaining variables

+		[CLSCompliant(false)] private uint count;

+		private byte[] _ProcessingBuffer;   // Used to start data when passed less than a block worth.

+		private int _ProcessingBufferCount; // Counts how much data we have stored that still needs processed.

+	

+		/// <summary>

+		/// Creates a new SHA1CryptoServiceProvider.

+		/// </summary>

+		public SHA1CryptoServiceProvider () {

+			_H = new uint[5];

+			HashSizeValue = HASH_SIZE_BITS;

+			_ProcessingBuffer = new byte[BLOCK_SIZE_BYTES];

+			

+			Initialize();

+		}

+

+		/// <summary>

+		/// Drives the hashing function.

+		/// </summary>

+		/// <param name="rgb">Byte array containing the data to hash.</param>

+		/// <param name="start">Where in the input buffer to start.</param>

+		/// <param name="size">Size in bytes of the data in the buffer to hash.</param>

+		protected override void HashCore (byte[] rgb, int start, int size) {

+			int i;

+			State = 1;

+

+			if (_ProcessingBufferCount != 0) {

+				if (size < (BLOCK_SIZE_BYTES - _ProcessingBufferCount)) {

+					System.Buffer.BlockCopy (rgb, start, _ProcessingBuffer, _ProcessingBufferCount, size);

+					_ProcessingBufferCount += size;

+					return;

+				}

+				else {

+					i = (BLOCK_SIZE_BYTES - _ProcessingBufferCount);

+					System.Buffer.BlockCopy (rgb, start, _ProcessingBuffer, _ProcessingBufferCount, i);

+					ProcessBlock (_ProcessingBuffer, 0);

+					_ProcessingBufferCount = 0;

+					start += i;

+					size -= i;

+				}

+			}

+

+			for (i=0; i<size-size%BLOCK_SIZE_BYTES; i += BLOCK_SIZE_BYTES) {

+				ProcessBlock (rgb, start+i);

+			}

+

+			if (size%BLOCK_SIZE_BYTES != 0) {

+				System.Buffer.BlockCopy (rgb, size-size%BLOCK_SIZE_BYTES+start, _ProcessingBuffer, 0, size%BLOCK_SIZE_BYTES);

+				_ProcessingBufferCount = size%BLOCK_SIZE_BYTES;

+			}

+		}

+	

+		/// <summary>

+		/// This finalizes the hash.  Takes the data from the chaining variables and returns it.

+		/// </summary>

+		protected override byte[] HashFinal () {

+			byte[] hash = new byte[20];

+			int i, j;

+

+			ProcessFinalBlock(_ProcessingBuffer, 0, _ProcessingBufferCount);

+

+			for (i=0; i<5; i++) {

+				for (j=0; j<4; j++) {

+					hash[i*4+j] = (byte)(_H[i] >> (8*(3-j)));

+				}

+			}

+

+			State = 0;

+			return hash;

+		}

+

+		

+		/// <summary>

+		/// Resets the class after use.  Called automatically after hashing is done.

+		/// </summary>

+		public override void Initialize () {

+			count = 0;

+			_ProcessingBufferCount = 0;

+

+			_H[0] = 0x67452301;

+			_H[1] = 0xefcdab89;

+			_H[2] = 0x98badcfe;

+			_H[3] = 0x10325476;

+			_H[4] = 0xC3D2E1F0;

+		}

+

+		/// <summary>

+		/// This is the meat of the hash function.  It is what processes each block one at a time.

+		/// </summary>

+		/// <param name="inputBuffer">Byte array to process data from.</param>

+		/// <param name="inputOffset">Where in the byte array to start processing.</param>

+		private void ProcessBlock(byte[] inputBuffer, int inputOffset) {

+			uint[] buff = new uint[80];

+			uint a, b, c, d, e;

+			int i;

+

+			count += BLOCK_SIZE_BYTES;

+		

+			for (i=0; i<16; i++) {

+				buff[i] = ((uint)(inputBuffer[inputOffset+4*i]) << 24)

+					| ((uint)(inputBuffer[inputOffset+4*i+1]) << 16)

+					| ((uint)(inputBuffer[inputOffset+4*i+2]) <<  8)

+					| ((uint)(inputBuffer[inputOffset+4*i+3]));

+			}

+

+			for (i=16; i<80; i++) {

+				buff[i] = ((buff[i-3] ^ buff[i-8] ^ buff[i-14] ^ buff[i-16]) << 1)

+					| ((buff[i-3] ^ buff[i-8] ^ buff[i-14] ^ buff[i-16]) >> 31);

+			}

+		

+			a = _H[0];

+			b = _H[1];

+			c = _H[2];

+			d = _H[3];

+			e = _H[4];

+

+

+			// This function was unrolled because it seems to be doubling our performance with current compiler/VM.

+			// Possibly roll up if this changes.

+	

+			// ---- Round 1 --------

+  

+			e += ((a << 5) | (a >> 27)) + (((c ^ d) & b) ^ d) + 0x5A827999 + buff[0];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (((b ^ c) & a) ^ c) + 0x5A827999 + buff[1];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (((a ^ b) & e) ^ b) + 0x5A827999 + buff[2];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (((e ^ a) & d) ^ a) + 0x5A827999 + buff[3];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (((d ^ e) & c) ^ e) + 0x5A827999 + buff[4];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + (((c ^ d) & b) ^ d) + 0x5A827999 + buff[5];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (((b ^ c) & a) ^ c) + 0x5A827999 + buff[6];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (((a ^ b) & e) ^ b) + 0x5A827999 + buff[7];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (((e ^ a) & d) ^ a) + 0x5A827999 + buff[8];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (((d ^ e) & c) ^ e) + 0x5A827999 + buff[9];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + (((c ^ d) & b) ^ d) + 0x5A827999 + buff[10];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (((b ^ c) & a) ^ c) + 0x5A827999 + buff[11];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (((a ^ b) & e) ^ b) + 0x5A827999 + buff[12];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (((e ^ a) & d) ^ a) + 0x5A827999 + buff[13];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (((d ^ e) & c) ^ e) + 0x5A827999 + buff[14];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + (((c ^ d) & b) ^ d) + 0x5A827999 + buff[15];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (((b ^ c) & a) ^ c) + 0x5A827999 + buff[16];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (((a ^ b) & e) ^ b) + 0x5A827999 + buff[17];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (((e ^ a) & d) ^ a) + 0x5A827999 + buff[18];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (((d ^ e) & c) ^ e) + 0x5A827999 + buff[19];

+			c = (c << 30) | (c >> 2);

+

+

+

+			// ---- Round 2 --------

+  

+			e += ((a << 5) | (a >> 27)) + (b ^ c ^ d) + 0x6ED9EBA1 + buff[20];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (a ^ b ^ c) + 0x6ED9EBA1 + buff[21];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (e ^ a ^ b) + 0x6ED9EBA1 + buff[22];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (d ^ e ^ a) + 0x6ED9EBA1 + buff[23];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (c ^ d ^ e) + 0x6ED9EBA1 + buff[24];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + (b ^ c ^ d) + 0x6ED9EBA1 + buff[25];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (a ^ b ^ c) + 0x6ED9EBA1 + buff[26];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (e ^ a ^ b) + 0x6ED9EBA1 + buff[27];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (d ^ e ^ a) + 0x6ED9EBA1 + buff[28];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (c ^ d ^ e) + 0x6ED9EBA1 + buff[29];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + (b ^ c ^ d) + 0x6ED9EBA1 + buff[30];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (a ^ b ^ c) + 0x6ED9EBA1 + buff[31];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (e ^ a ^ b) + 0x6ED9EBA1 + buff[32];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (d ^ e ^ a) + 0x6ED9EBA1 + buff[33];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (c ^ d ^ e) + 0x6ED9EBA1 + buff[34];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + (b ^ c ^ d) + 0x6ED9EBA1 + buff[35];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (a ^ b ^ c) + 0x6ED9EBA1 + buff[36];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (e ^ a ^ b) + 0x6ED9EBA1 + buff[37];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (d ^ e ^ a) + 0x6ED9EBA1 + buff[38];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (c ^ d ^ e) + 0x6ED9EBA1 + buff[39];

+			c = (c << 30) | (c >> 2);

+

+

+

+			// ---- Round 3 --------

+  

+			e += ((a << 5) | (a >> 27)) + ((b&c) | (b&d) | (c&d)) + 0x8F1BBCDC + buff[40];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + ((a&b) | (a&c) | (b&c)) + 0x8F1BBCDC + buff[41];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + ((e&a) | (e&b) | (a&b)) + 0x8F1BBCDC + buff[42];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + ((d&e) | (d&a) | (e&a)) + 0x8F1BBCDC + buff[43];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + ((c&d) | (c&e) | (d&e)) + 0x8F1BBCDC + buff[44];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + ((b&c) | (b&d) | (c&d)) + 0x8F1BBCDC + buff[45];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + ((a&b) | (a&c) | (b&c)) + 0x8F1BBCDC + buff[46];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + ((e&a) | (e&b) | (a&b)) + 0x8F1BBCDC + buff[47];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + ((d&e) | (d&a) | (e&a)) + 0x8F1BBCDC + buff[48];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + ((c&d) | (c&e) | (d&e)) + 0x8F1BBCDC + buff[49];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + ((b&c) | (b&d) | (c&d)) + 0x8F1BBCDC + buff[50];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + ((a&b) | (a&c) | (b&c)) + 0x8F1BBCDC + buff[51];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + ((e&a) | (e&b) | (a&b)) + 0x8F1BBCDC + buff[52];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + ((d&e) | (d&a) | (e&a)) + 0x8F1BBCDC + buff[53];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + ((c&d) | (c&e) | (d&e)) + 0x8F1BBCDC + buff[54];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + ((b&c) | (b&d) | (c&d)) + 0x8F1BBCDC + buff[55];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + ((a&b) | (a&c) | (b&c)) + 0x8F1BBCDC + buff[56];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + ((e&a) | (e&b) | (a&b)) + 0x8F1BBCDC + buff[57];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + ((d&e) | (d&a) | (e&a)) + 0x8F1BBCDC + buff[58];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + ((c&d) | (c&e) | (d&e)) + 0x8F1BBCDC + buff[59];

+			c = (c << 30) | (c >> 2);

+

+

+

+			// ---- Round 4 --------

+  

+			e += ((a << 5) | (a >> 27)) + (b ^ c ^ d) + 0xCA62C1D6 + buff[60];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (a ^ b ^ c) + 0xCA62C1D6 + buff[61];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (e ^ a ^ b) + 0xCA62C1D6 + buff[62];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (d ^ e ^ a) + 0xCA62C1D6 + buff[63];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (c ^ d ^ e) + 0xCA62C1D6 + buff[64];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + (b ^ c ^ d) + 0xCA62C1D6 + buff[65];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (a ^ b ^ c) + 0xCA62C1D6 + buff[66];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (e ^ a ^ b) + 0xCA62C1D6 + buff[67];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (d ^ e ^ a) + 0xCA62C1D6 + buff[68];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (c ^ d ^ e) + 0xCA62C1D6 + buff[69];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + (b ^ c ^ d) + 0xCA62C1D6 + buff[70];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (a ^ b ^ c) + 0xCA62C1D6 + buff[71];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (e ^ a ^ b) + 0xCA62C1D6 + buff[72];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (d ^ e ^ a) + 0xCA62C1D6 + buff[73];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (c ^ d ^ e) + 0xCA62C1D6 + buff[74];

+			c = (c << 30) | (c >> 2);

+

+			e += ((a << 5) | (a >> 27)) + (b ^ c ^ d) + 0xCA62C1D6 + buff[75];

+			b = (b << 30) | (b >> 2);

+

+			d += ((e << 5) | (e >> 27)) + (a ^ b ^ c) + 0xCA62C1D6 + buff[76];

+			a = (a << 30) | (a >> 2);

+

+			c += ((d << 5) | (d >> 27)) + (e ^ a ^ b) + 0xCA62C1D6 + buff[77];

+			e = (e << 30) | (e >> 2);

+

+			b += ((c << 5) | (c >> 27)) + (d ^ e ^ a) + 0xCA62C1D6 + buff[78];

+			d = (d << 30) | (d >> 2);

+

+			a += ((b << 5) | (b >> 27)) + (c ^ d ^ e) + 0xCA62C1D6 + buff[79];

+			c = (c << 30) | (c >> 2);

+

+

+			_H[0] += a;

+			_H[1] += b;

+			_H[2] += c;

+			_H[3] += d;

+			_H[4] += e;

+		}

+	

+		/// <summary>

+		/// Pads and then processes the final block.

+		/// Non-standard.

+		/// </summary>

+		/// <param name="inputBuffer">Buffer to grab data from.</param>

+		/// <param name="inputOffset">Position in buffer in bytes to get data from.</param>

+		/// <param name="inputCount">How much data in bytes in the buffer to use.</param>

+		private void ProcessFinalBlock(byte[] inputBuffer, int inputOffset, int inputCount) {

+			byte[] fooBuffer;

+			int paddingSize;

+			int i;

+			uint size;

+

+			paddingSize = (int)(56 - (inputCount + count) % BLOCK_SIZE_BYTES);

+

+			if (paddingSize < 1)

+				paddingSize += BLOCK_SIZE_BYTES;

+

+			fooBuffer = new byte[inputCount+paddingSize+8];

+

+			for (i=0; i<inputCount; i++) {

+				fooBuffer[i] = inputBuffer[i+inputOffset];

+			}

+

+			fooBuffer[inputCount] = 0x80;

+			for (i=inputCount+1; i<inputCount+paddingSize; i++) {

+				fooBuffer[i] = 0x00;

+			}

+

+			size = (uint)(count+inputCount);

+			size *= 8;  // I deal in bytes.  They algorythm deals in bits.

+

+			fooBuffer[inputCount+paddingSize]   = 0x00;

+			fooBuffer[inputCount+paddingSize+1] = 0x00;

+			fooBuffer[inputCount+paddingSize+2] = 0x00;

+			fooBuffer[inputCount+paddingSize+3] = 0x00;

+

+			fooBuffer[inputCount+paddingSize+4] = (byte)((size) >> 24);

+			fooBuffer[inputCount+paddingSize+5] = (byte)((size) >> 16);

+			fooBuffer[inputCount+paddingSize+6] = (byte)((size) >>  8);

+			fooBuffer[inputCount+paddingSize+7] = (byte)((size) >>  0);

+

+			ProcessBlock(fooBuffer, 0);

+

+			if (inputCount+paddingSize+8 == 128) {

+				ProcessBlock(fooBuffer, 64);

+			}

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA256.cs b/mcs/class/corlib/System.Security.Cryptography/SHA256.cs
new file mode 100644
index 00000000000..c3fbb573e07
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA256.cs
@@ -0,0 +1,45 @@
+//

+// System.Security.Cryptography SHA256 Class implementation

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Common base class for all derived SHA256 iplementations.

+	/// Abstract.

+	/// </summary>

+	public abstract class SHA256 : HashAlgorithm {

+		

+		/// <summary>

+		/// Called from constructor of derived class.

+		/// </summary>

+		public SHA256 () {

+		

+		}

+	

+		/// <summary>

+		/// Creates the default derived class.

+		/// </summary>

+		public static new SHA256 Create () {

+			return new SHA256Managed ();

+		}

+	

+		/// <summary>

+		/// Creates a new derived class.

+		/// </summary>

+		/// <param name="st">FIXME: No clue.  Specifies which derived class to create?</param>

+		[MonoTODO]

+		public static new SHA256 Create (string st) {

+			return Create ();

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA256Managed.cs b/mcs/class/corlib/System.Security.Cryptography/SHA256Managed.cs
new file mode 100644
index 00000000000..bcfd16b3479
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA256Managed.cs
@@ -0,0 +1,290 @@
+//

+// System.Security.Cryptography SHA256Managed Class implementation

+//

+// Author:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// (C) 2001 

+//

+

+

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// C# implementation of the SHA1 cryptographic hash function.

+	/// LAMESPEC?: Basically the same thing as SHA1Managed except for how its implemented.

+	/// </summary>

+	public class SHA256Managed : SHA256 {

+		private const int BLOCK_SIZE_BYTES =  64;

+		private const int HASH_SIZE_BYTES  =  32;

+		private const int HASH_SIZE_BITS   = 256;

+		[CLSCompliant(false)] protected uint[] _H;

+		[CLSCompliant(false)] private uint[] K;

+		[CLSCompliant(false)] protected uint count;

+		private byte[] _ProcessingBuffer;   // Used to start data when passed less than a block worth.

+		private int _ProcessingBufferCount; // Counts how much data we have stored that still needs processed.

+	

+		/// <summary>

+		/// Creates a new SHA256Managed class.

+		/// </summary>

+		public SHA256Managed () {

+			_H = new uint[8];

+			HashSizeValue = HASH_SIZE_BITS;

+			_ProcessingBuffer = new byte[BLOCK_SIZE_BYTES];

+

+			K = new uint[64];

+			K[0]  = 0x428A2F98;  K[1]  = 0x71374491;  K[2]  = 0xB5C0FBCF;  K[3]  = 0xE9B5DBA5;

+			K[4]  = 0x3956C25B;  K[5]  = 0x59F111F1;  K[6]  = 0x923F82A4;  K[7]  = 0xAB1C5ED5;

+			K[8]  = 0xD807AA98;  K[9]  = 0x12835B01;  K[10] = 0x243185BE;  K[11] = 0x550C7DC3;

+			K[12] = 0x72BE5D74;  K[13] = 0x80DEB1FE;  K[14] = 0x9BDC06A7;  K[15] = 0xC19BF174;

+			K[16] = 0xE49B69C1;  K[17] = 0xEFBE4786;  K[18] = 0x0FC19DC6;  K[19] = 0x240CA1CC;

+			K[20] = 0x2DE92C6F;  K[21] = 0x4A7484AA;  K[22] = 0x5CB0A9DC;  K[23] = 0x76F988DA;

+			K[24] = 0x983E5152;  K[25] = 0xA831C66D;  K[26] = 0xB00327C8;  K[27] = 0xBF597FC7;

+			K[28] = 0xC6E00BF3;  K[29] = 0xD5A79147;  K[30] = 0x06CA6351;  K[31] = 0x14292967;

+			K[32] = 0x27B70A85;  K[33] = 0x2E1B2138;  K[34] = 0x4D2C6DFC;  K[35] = 0x53380D13;

+			K[36] = 0x650A7354;  K[37] = 0x766A0ABB;  K[38] = 0x81C2C92E;  K[39] = 0x92722C85;

+			K[40] = 0xA2BFE8A1;  K[41] = 0xA81A664B;  K[42] = 0xC24B8B70;  K[43] = 0xC76C51A3;

+			K[44] = 0xD192E819;  K[45] = 0xD6990624;  K[46] = 0xF40E3585;  K[47] = 0x106AA070;

+			K[48] = 0x19A4C116;  K[49] = 0x1E376C08;  K[50] = 0x2748774C;  K[51] = 0x34B0BCB5;

+			K[52] = 0x391C0CB3;  K[53] = 0x4ED8AA4A;  K[54] = 0x5B9CCA4F;  K[55] = 0x682E6FF3;

+			K[56] = 0x748F82EE;  K[57] = 0x78A5636F;  K[58] = 0x84C87814;  K[59] = 0x8CC70208;

+			K[60] = 0x90BEFFFA;  K[61] = 0xA4506CEB;  K[62] = 0xBEF9A3F7;  K[63] = 0xC67178F2;

+	

+			Initialize();

+		}

+

+

+		/// <summary>

+		/// Internal function handling a subset of the algorithm.

+		/// </summary>

+		private uint Ch (uint u, uint v, uint w) {

+			return (u&v) ^ (~u&w);

+		}

+

+		/// <summary>

+		/// Internal function handling a subset of the algorithm.

+		/// </summary>

+		private uint Maj (uint u, uint v, uint w) {

+			return (u&v) ^ (u&w) ^ (v&w);

+		}

+

+		/// <summary>

+		/// Internal function handling a subset of the algorithm.

+		/// </summary>

+		private uint Ro0 (uint x) {

+			return ((x >> 7) | (x << 25))

+				^ ((x >> 18) | (x << 14))

+				^ (x >> 3);

+		}

+

+		/// <summary>

+		/// Internal function handling a subset of the algorithm.

+		/// </summary>

+		private uint Ro1 (uint x) {

+			return ((x >> 17) | (x << 15))

+				^ ((x >> 19) | (x << 13))

+				^ (x >> 10);

+		}

+

+		/// <summary>

+		/// Internal function handling a subset of the algorithm.

+		/// </summary>

+		private uint Sig0 (uint x) {

+			return ((x >> 2) | (x << 30))

+				^ ((x >> 13) | (x << 19))

+				^ ((x >> 22) | (x << 10));

+		}

+

+		/// <summary>

+		/// Internal function handling a subset of the algorithm.

+		/// </summary>

+		private uint Sig1 (uint x) {

+			return ((x >> 6) | (x << 26))

+				^ ((x >> 11) | (x << 21))

+				^ ((x >> 25) | (x << 7));

+		}

+

+		/// <summary>

+		/// Drives the hashing function.

+		/// </summary>

+		/// <param name="rgb">Byte array containing the data to hash.</param>

+		/// <param name="start">Where in the input buffer to start.</param>

+		/// <param name="size">Size in bytes of the data in the buffer to hash.</param>

+		protected override void HashCore (byte[] rgb, int start, int size) {

+			int i;

+			State = 1;

+

+			if (_ProcessingBufferCount != 0) {

+				if (size < (BLOCK_SIZE_BYTES - _ProcessingBufferCount)) {

+					System.Buffer.BlockCopy (rgb, start, _ProcessingBuffer, _ProcessingBufferCount, size);

+					_ProcessingBufferCount += size;

+					return;

+				}

+				else {

+					i = (BLOCK_SIZE_BYTES - _ProcessingBufferCount);

+					System.Buffer.BlockCopy (rgb, start, _ProcessingBuffer, _ProcessingBufferCount, i);

+					ProcessBlock (_ProcessingBuffer, 0);

+					_ProcessingBufferCount = 0;

+					start += i;

+					size -= i;

+				}

+			}

+

+			for (i=0; i<size-size%BLOCK_SIZE_BYTES; i += BLOCK_SIZE_BYTES) {

+				ProcessBlock (rgb, start+i);

+			}

+

+			if (size%BLOCK_SIZE_BYTES != 0) {

+				System.Buffer.BlockCopy (rgb, size-size%BLOCK_SIZE_BYTES+start, _ProcessingBuffer, 0, size%BLOCK_SIZE_BYTES);

+				_ProcessingBufferCount = size%BLOCK_SIZE_BYTES;

+			}

+		}

+	

+		/// <summary>

+		/// This finalizes the hash.  Takes the data from the chaining variables and returns it.

+		/// </summary>

+		protected override byte[] HashFinal () {

+			byte[] hash = new byte[32];

+			int i, j;

+

+			ProcessFinalBlock(_ProcessingBuffer, 0, _ProcessingBufferCount);

+

+			for (i=0; i<8; i++) {

+				for (j=0; j<4; j++) {

+					hash[i*4+j] = (byte)(_H[i] >> (24-j*8));

+				}

+			}

+

+			State = 0;

+			return hash;

+		}

+

+		/// <summary>

+		/// Resets the class after use.  Called automatically after hashing is done.

+		/// </summary>

+		public override void Initialize () {

+			count = 0;

+			_ProcessingBufferCount = 0;

+		

+			_H[0] = 0x6A09E667;

+			_H[1] = 0xBB67AE85;

+			_H[2] = 0x3C6EF372;

+			_H[3] = 0xA54FF53A;

+			_H[4] = 0x510E527F;

+			_H[5] = 0x9B05688C;

+			_H[6] = 0x1F83D9AB;

+			_H[7] = 0x5BE0CD19;

+		}

+

+		/// <summary>

+		/// This is the meat of the hash function.  It is what processes each block one at a time.

+		/// </summary>

+		/// <param name="inputBuffer">Byte array to process data from.</param>

+		/// <param name="inputOffset">Where in the byte array to start processing.</param>

+		public void ProcessBlock(byte[] inputBuffer, int inputOffset) {

+			uint a, b, c, d, e, f, g, h;

+			uint t1, t2;

+			int i;

+			uint[] buff;

+		

+			count += BLOCK_SIZE_BYTES;

+		

+			buff = new uint[64];

+

+			for (i=0; i<16; i++) {

+				buff[i] = ((uint)(inputBuffer[inputOffset+4*i]) << 24)

+					| ((uint)(inputBuffer[inputOffset+4*i+1]) << 16)

+					| ((uint)(inputBuffer[inputOffset+4*i+2]) <<  8)

+					| ((uint)(inputBuffer[inputOffset+4*i+3]));

+			}

+

+		

+			for (i=16; i<64; i++) {

+				buff[i] = Ro1(buff[i-2]) + buff[i-7] + Ro0(buff[i-15]) + buff[i-16];

+			}

+

+			a = _H[0];

+			b = _H[1];

+			c = _H[2];

+			d = _H[3];

+			e = _H[4];

+			f = _H[5];

+			g = _H[6];

+			h = _H[7];

+

+			for (i=0; i<64; i++) {

+				t1 = h + Sig1(e) + Ch(e,f,g) + K[i] + buff[i];

+				t2 = Sig0(a) + Maj(a,b,c);

+				h = g;

+				g = f;

+				f = e;

+				e = d + t1;

+				d = c;

+				c = b;

+				b = a;

+				a = t1 + t2;

+			}

+

+			_H[0] += a;

+			_H[1] += b;

+			_H[2] += c;

+			_H[3] += d;

+			_H[4] += e;

+			_H[5] += f;

+			_H[6] += g;

+			_H[7] += h;

+		}

+	

+		/// <summary>

+		/// Pads and then processes the final block.

+		/// Non-standard.

+		/// </summary>

+		/// <param name="inputBuffer">Buffer to grab data from.</param>

+		/// <param name="inputOffset">Position in buffer in bytes to get data from.</param>

+		/// <param name="inputCount">How much data in bytes in the buffer to use.</param>

+		public void ProcessFinalBlock(byte[] inputBuffer, int inputOffset, int inputCount) {

+			byte[] fooBuffer;

+			int paddingSize;

+			int i;

+			uint size;

+

+			paddingSize = (int)(56 - (inputCount + count) % BLOCK_SIZE_BYTES);

+

+			if (paddingSize < 1)

+				paddingSize += BLOCK_SIZE_BYTES;

+

+			fooBuffer = new byte[inputCount+paddingSize+8];

+

+			for (i=0; i<inputCount; i++) {

+				fooBuffer[i] = inputBuffer[i+inputOffset];

+			}

+

+			fooBuffer[inputCount] = 0x80;

+			for (i=inputCount+1; i<inputCount+paddingSize; i++) {

+				fooBuffer[i] = 0x00;

+			}

+

+			size = (uint)(count+inputCount);

+			size *= 8;

+

+			fooBuffer[inputCount+paddingSize]   = 0x00;

+			fooBuffer[inputCount+paddingSize+1] = 0x00;

+			fooBuffer[inputCount+paddingSize+2] = 0x00;

+			fooBuffer[inputCount+paddingSize+3] = 0x00;

+

+			fooBuffer[inputCount+paddingSize+4] = (byte)((size) >> 24);

+			fooBuffer[inputCount+paddingSize+5] = (byte)((size) >> 16);

+			fooBuffer[inputCount+paddingSize+6] = (byte)((size) >>  8);

+			fooBuffer[inputCount+paddingSize+7] = (byte)((size) >>  0);

+

+			ProcessBlock(fooBuffer, 0);

+

+			if (inputCount+paddingSize+8 == 128) {

+				ProcessBlock(fooBuffer, 64);

+			}

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA384.cs b/mcs/class/corlib/System.Security.Cryptography/SHA384.cs
new file mode 100644
index 00000000000..368d5d76ada
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA384.cs
@@ -0,0 +1,45 @@
+//

+// System.Security.Cryptography SHA384 Class implementation

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Common base class for all derived SHA384 iplementations.

+	/// </summary>

+	public abstract class SHA384 : HashAlgorithm {

+		

+		/// <summary>

+		/// Called from constructor of derived class.

+		/// </summary>

+		public SHA384 () {

+		

+		}

+

+	

+		/// <summary>

+		/// Creates the default derived class.

+		/// </summary>

+		public static new SHA384 Create () {

+			return new SHA384Managed();

+		}

+	

+		/// <summary>

+		/// Creates a new derived class.

+		/// </summary>

+		/// <param name="st">FIXME: No clue.  Specifies which derived class to create?</param>

+		[MonoTODO]

+		public static new SHA384 Create (string st) {

+			return Create();

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA384Managed.cs b/mcs/class/corlib/System.Security.Cryptography/SHA384Managed.cs
new file mode 100644
index 00000000000..d5679038c80
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA384Managed.cs
@@ -0,0 +1,33 @@
+//

+// System.Security.Cryptography.SHA384Managed.cs

+//

+// Authors:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+// Stubbed.

+//

+

+using System;

+

+namespace System.Security.Cryptography {

+	

+	[MonoTODO]

+	public class SHA384Managed : SHA384 {

+		public SHA384Managed () {

+		}

+

+		public override void Initialize () {

+		}

+

+		// protected

+

+		protected override void HashCore (byte[] rgb, int start, int count) {

+		}

+

+		protected override byte[] HashFinal () {

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA512.cs b/mcs/class/corlib/System.Security.Cryptography/SHA512.cs
new file mode 100644
index 00000000000..49f266701e7
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA512.cs
@@ -0,0 +1,45 @@
+//

+// System.Security.Cryptography SHA512 Class implementation

+//

+// Authors:

+//   Matthew S. Ford (Matthew.S.Ford@Rose-Hulman.Edu)

+//

+// Copyright 2001 by Matthew S. Ford.

+//

+

+

+using System.Security.Cryptography;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Common base class for all derived SHA512 iplementations.

+	/// </summary>

+	public abstract class SHA512 : HashAlgorithm {

+		

+		/// <summary>

+		/// Called from constructor of derived class.

+		/// </summary>

+		public SHA512 () {

+		

+		}

+

+	

+		/// <summary>

+		/// Creates the default derived class.

+		/// </summary>

+		public static new SHA512 Create () {

+			return new SHA512Managed();

+		}

+	

+		/// <summary>

+		/// Creates a new derived class.

+		/// </summary>

+		/// <param name="st">FIXME: No clue.  Specifies which derived class to create?</param>

+		[MonoTODO]

+		public static new SHA512 Create (string st) {

+			return Create();

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/SHA512Managed.cs b/mcs/class/corlib/System.Security.Cryptography/SHA512Managed.cs
new file mode 100644
index 00000000000..3b3a010a2fe
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/SHA512Managed.cs
@@ -0,0 +1,33 @@
+//

+// System.Security.Cryptography.SHA512Managed.cs

+//

+// Authors:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+// Stubbed.

+//

+

+using System;

+

+namespace System.Security.Cryptography {

+	

+	[MonoTODO]

+	public class SHA512Managed : SHA512 {

+		public SHA512Managed () {

+		}

+

+		public override void Initialize () {

+		}

+

+		// protected

+

+		protected override void HashCore (byte[] rgb, int start, int count) {

+		}

+

+		protected override byte[] HashFinal () {

+			return null;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Cryptography/SignatureDescription.cs b/mcs/class/corlib/System.Security.Cryptography/SignatureDescription.cs
new file mode 100755
index 00000000000..f867f763316
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/SignatureDescription.cs
@@ -0,0 +1,107 @@
+//

+// System.Security.Cryptography SignatureDescription Class implementation

+//

+// Authors:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+// LAMESPEC: documentation of this class is completely missing in the sdk doc

+// TODO: Implement AsymmetricSignatureFormatter & AsymmetricSignatureDeformatter methods

+

+using System;

+using System.Security;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// LAMESPEC: no sdk doc available for this class by the time of beta 2

+	/// </summary>

+	[MonoTODO]

+	public class SignatureDescription {

+		private string _DeformatterAlgorithm;

+		private string _DigestAlgorithm;		

+		private string _FormatterAlgorithm;		

+		private string _KeyAlgorithm;		

+		

+		/// <summary>

+		/// LAMESPEC: no idea what param el should do??

+		/// </summary>

+		public SignatureDescription (SecurityElement el) {

+			if (el == null)

+				throw new CryptographicException();

+		}

+		

+

+		/// <summary>

+		/// LAMESPEC: what to do if setting null values?

+		/// </summary>

+		public string DeformatterAlgorithm {

+			get {

+				return _DeformatterAlgorithm;

+			}

+			set {

+				_DeformatterAlgorithm = value;

+			}

+		}

+

+		/// <summary>

+		/// LAMESPEC: what to do if setting null values?

+		/// </summary>

+		public string DigestAlgorithm {

+			get {

+				return _DigestAlgorithm;

+			}

+			set {

+				_DigestAlgorithm = value;

+			}

+		}

+

+		/// <summary>

+		/// LAMESPEC: what to do if setting null values?

+		/// </summary>

+		public string FormatterAlgorithm {

+			get {

+				return _FormatterAlgorithm;

+			}

+			set {

+				_FormatterAlgorithm = value;

+			}

+		}

+

+		/// <summary>

+		/// LAMESPEC: what to do if setting null values?

+		/// </summary>

+		public string KeyAlgorithm {

+			get {

+				return _KeyAlgorithm;

+			}

+			set {

+				_KeyAlgorithm = value;

+			}

+		}

+

+		[MonoTODO]

+		public virtual AsymmetricSignatureDeformatter CreateDeformatter(AsymmetricAlgorithm key) 

+		{

+			// TODO: Implement

+			return null;

+		}

+		

+		/// <summary>

+		/// Create the hash algorithm assigned with this object

+		/// </summary>

+		public virtual HashAlgorithm CreateDigest()

+		{

+			return HashAlgorithm.Create(_DigestAlgorithm);

+		}

+

+		[MonoTODO]

+		public virtual AsymmetricSignatureFormatter CreateFormatter(AsymmetricAlgorithm key)

+		{

+			// TODO: Implement

+			return null;

+		}

+		

+	} // SignatureDescription

+	

+} // System.Security.Cryptography

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/SymmetricAlgorithm.cs b/mcs/class/corlib/System.Security.Cryptography/SymmetricAlgorithm.cs
new file mode 100755
index 00000000000..508c25d5810
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/SymmetricAlgorithm.cs
@@ -0,0 +1,256 @@
+//

+// System.Security.Cryptography SymmetricAlgorithm Class implementation

+//

+// Authors:

+//   Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+

+namespace System.Security.Cryptography {

+	

+	/// <summary>

+	/// Abstract base class for all cryptographic symmetric algorithms.

+	/// Available algorithms include:

+	/// DES, RC2, Rijndael, TripleDES

+	/// </summary>

+	public abstract class SymmetricAlgorithm {

+		protected int BlockSizeValue; // The block size of the cryptographic operation in bits. 

+		protected int FeedbackSizeValue; // The feedback size of the cryptographic operation in bits. 

+		protected byte[] IVValue; // The initialization vector ( IV) for the symmetric algorithm. 

+		protected int KeySizeValue; // The size of the secret key used by the symmetric algorithm in bits. 

+		protected byte[] KeyValue; // The secret key for the symmetric algorithm. 

+		protected KeySizes[] LegalBlockSizesValue; // Specifies the block sizes that are supported by the symmetric algorithm. 

+		protected KeySizes[] LegalKeySizesValue; // Specifies the key sizes that are supported by the symmetric algorithm. 

+		protected CipherMode ModeValue; // Represents the cipher mode used in the symmetric algorithm. 

+		protected PaddingMode PaddingValue; // Represents the padding mode used in the symmetric algorithm. 

+

+		/// <summary>

+		/// Called from constructor of derived class.

+		/// </summary>

+		public SymmetricAlgorithm () {

+		  throw new CryptographicException();

+		}

+		

+		/// <summary>

+		/// Called from constructor of derived class.

+		/// </summary>

+		~SymmetricAlgorithm () {

+			if (KeyValue != null) {

+				Array.Clear(KeyValue, 0, KeyValue.Length);

+				KeyValue = null;

+			}

+		}

+

+		/// <summary>

+		/// Gets or sets the actual BlockSize

+		/// </summary>

+		public virtual int BlockSize {

+			get {

+				return this.BlockSizeValue;

+			}

+			set {

+				if (IsLegalKeySize(this.LegalBlockSizesValue, value))

+					this.BlockSizeValue = value;

+				else

+					throw new CryptographicException("block size not supported by algorithm");

+			}

+		}

+

+		/// <summary>

+		/// Gets or sets the actual FeedbackSize

+		/// </summary>

+		public virtual int FeedbackSize {

+			get {

+				return this.FeedbackSizeValue;

+			}

+			set {

+				if (value > this.BlockSizeValue)

+					throw new CryptographicException("feedback size larger than block size");

+				else

+					this.FeedbackSizeValue = value;

+			}

+		}

+		

+		/// <summary>

+		/// Gets or sets the actual Initial Vector

+		/// </summary>

+		[MonoTODO]

+		public virtual byte[] IV {

+			get {

+				if (this.IVValue == null)

+					GenerateIV();

+

+				return this.IVValue;

+			}

+			set {

+				if (value == null)

+					throw new ArgumentNullException("tried setting initial vector to null");

+					

+				// FIXME: dont know if to compare with block or key size	

+				if (value.Length != this.KeySizeValue)

+					throw new CryptographicException("tried setting initial vector with illegal size");

+				

+				this.IVValue = new byte [value.Length];

+				System.Array.Copy (value, 0, this.IVValue, 0, value.Length);

+			}

+		}

+

+		/// <summary>

+		/// Gets or sets the actual key

+		/// </summary>

+		public virtual byte[] Key {

+			get {

+				if (this.KeyValue == null)

+					GenerateKey();

+

+				return this.KeyValue;

+			}

+			set {

+				if (value == null)

+					throw new ArgumentNullException("tried setting key to null");

+

+				if (!IsLegalKeySize(this.LegalKeySizesValue, value.Length))

+					throw new CryptographicException("key size not supported by algorithm");

+

+				this.KeySizeValue = value.Length;

+				this.KeyValue = new byte [this.KeySizeValue];

+				System.Array.Copy (value, 0, this.KeyValue, 0, this.KeySizeValue);

+			}

+		}

+		

+		/// <summary>

+		/// Gets or sets the actual key size

+		/// </summary>

+		public virtual int KeySize {

+			get {

+				return this.KeySizeValue;

+			}

+			set {

+				if (!IsLegalKeySize(this.LegalKeySizesValue, value))

+					throw new CryptographicException("key size not supported by algorithm");

+				

+				this.KeyValue = null;

+				this.KeySizeValue = value;

+			}

+		}

+

+		/// <summary>

+		/// Gets all legal block sizes

+		/// </summary>

+		public virtual KeySizes[] LegalBlockSizes {

+			get {

+				return this.LegalBlockSizesValue;

+			}

+		}

+

+		/// <summary>

+		/// Gets all legal key sizes

+		/// </summary>

+		public virtual KeySizes[] LegalKeySizes {

+			get {

+				return this.LegalKeySizesValue;

+			}

+		}

+

+		/// <summary>

+		/// Gets or sets the actual cipher mode

+		/// </summary>

+		public virtual CipherMode Mode {

+			get {

+				return this.ModeValue;

+			}

+			set {

+				if (Enum.IsDefined(ModeValue.GetType(), value))

+					this.ModeValue = value;

+				else

+					throw new CryptographicException("padding mode not available");

+			}

+		}

+

+		/// <summary>

+		/// Gets or sets the actual padding

+		/// </summary>

+		public virtual PaddingMode Padding {

+			get {

+				return this.PaddingValue;

+			}

+			set {

+				if (Enum.IsDefined(PaddingValue.GetType(), value))

+					this.PaddingValue = value;

+				else

+					throw new CryptographicException("padding mode not available");

+			}

+		}

+

+		/// <summary>

+		/// Gets an Decryptor transform object to work with a CryptoStream

+		/// </summary>

+		public virtual ICryptoTransform CreateDecryptor() {

+			return CreateDecryptor(Key, IV);

+		}

+

+		/// <summary>

+		/// Gets an Decryptor transform object to work with a CryptoStream

+		/// </summary>

+		public abstract ICryptoTransform CreateDecryptor(byte[] rgbKey, byte[] rgbIV);

+

+		/// <summary>

+		/// Gets an Encryptor transform object to work with a CryptoStream

+		/// </summary>

+		public virtual ICryptoTransform CreateEncryptor() {

+			return CreateEncryptor(Key, IV);

+		}

+

+		/// <summary>

+		/// Gets an Encryptor transform object to work with a CryptoStream

+		/// </summary>

+		public abstract ICryptoTransform CreateEncryptor(byte[] rgbKey, byte[] rgbIV);

+

+		/// <summary>

+		/// used to generate an inital vector if none is specified

+		/// </summary>

+		public abstract void GenerateIV();

+

+		/// </summary>

+		/// used to generate a random key if none is specified

+		/// </summary>

+		public abstract void GenerateKey();

+

+		internal bool IsLegalKeySize(KeySizes[] LegalKeys, int Size) {

+			foreach (KeySizes LegalKeySize in LegalKeys) {

+				for (int i=LegalKeySize.MinSize; i<=LegalKeySize.MaxSize; i+=LegalKeySize.SkipSize) {

+					if (i == Size)

+						return true;

+				}

+			}

+			return false;

+		}

+		

+		/// <summary>

+		/// Checks wether the given keyLength is valid for the current algorithm

+		/// </summary>

+		/// <param name="bitLength">the given keyLength</param>

+		public bool ValidKeySize(int bitLength) {

+			return IsLegalKeySize(LegalKeySizesValue, bitLength);

+		}

+		

+		/// <summary>

+		/// Creates the default implementation of the default symmetric algorithm (RC2).

+		/// </summary>

+		public static SymmetricAlgorithm Create () {

+			return Rijndael.Create();

+		}

+	

+		/// <summary>

+		/// Creates a specific implementation of the given symmetric algorithm.

+		/// </summary>

+		/// <param name="algName">the given algorithm</param>

+		[MonoTODO]

+		public static SymmetricAlgorithm Create (string algName) {

+			// TODO: Use Reflection to create a new algorithm instance

+			return null;

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System.Security.Cryptography/ToBase64Transform.cs b/mcs/class/corlib/System.Security.Cryptography/ToBase64Transform.cs
new file mode 100644
index 00000000000..8f72bbee4ee
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/ToBase64Transform.cs
@@ -0,0 +1,234 @@
+//
+// System.Security.Cryptography.ToBase64Transform
+//
+// Author:
+//   Sergey Chaban (serge@wildwestsoftware.com)
+//
+
+using System;
+using System.Security.Cryptography;
+
+
+namespace System.Security.Cryptography {
+
+	public class ToBase64Transform : ICryptoTransform {
+
+
+		/// <summary>
+		///  Default constructor.
+		/// </summary>
+		public ToBase64Transform ()
+		{
+		}
+
+
+		/// <summary>
+		/// </summary>
+		public bool CanTransformMultipleBlocks {
+			get {
+				return false;
+			}
+		}
+
+
+		/// <summary>
+		///  Returns the input block size for the Base64 encoder.
+		/// </summary>
+		/// <remarks>
+		///  The returned value is always 3.
+		/// </remarks>
+		public int InputBlockSize {
+			get {
+				return 3;
+			}
+		}
+
+
+		/// <summary>
+		///  Returns the output block size for the Base64 encoder.
+		/// </summary>
+		/// <remarks>
+		///  The value returned by this property is always 4.
+		/// </remarks>
+		public int OutputBlockSize {
+			get {
+				return 4;
+			}
+		}
+
+
+		/// <summary>
+		/// </summary>
+		public int TransformBlock (byte [] inputBuffer,
+		                                   int inputOffset,
+		                                   int inputCount,
+		                                   byte [] outputBuffer,
+		                                   int outputOffset)
+		{
+			if (inputCount != this.InputBlockSize)
+				throw new CryptographicException();
+
+			byte [] lookup = Base64Table.EncodeTable;
+
+			int b1 = inputBuffer [inputOffset];
+			int b2 = inputBuffer [inputOffset + 1];
+			int b3 = inputBuffer [inputOffset + 2];
+
+			outputBuffer [outputOffset] = lookup [b1 >> 2];
+			outputBuffer [outputOffset+1] = lookup [((b1 << 4) & 0x30) | (b2 >> 4)];
+			outputBuffer [outputOffset+2] = lookup [((b2 << 2) & 0x3c) | (b3 >> 6)];
+			outputBuffer [outputOffset+3] = lookup [b3 & 0x3f];
+
+			return this.OutputBlockSize;
+		}
+
+
+
+
+		// LAMESPEC: It's not clear from Beta2 docs what should be
+		// happening here if inputCount > InputBlockSize.
+		// It just "Converts the specified region of the specified
+		// byte array" and that's all.
+		// Beta2 implementation throws some strange (and undocumented)
+		// exception in such case. The exception is thrown by
+		// System.Convert and not the method itself.
+		// Anyhow, this implementation just encodes blocks of any size,
+		// like any usual Base64 encoder.
+
+		/// <summary>
+		/// </summary>
+		public byte [] TransformFinalBlock (byte [] inputBuffer,
+		                                            int inputOffset,
+		                                            int inputCount)
+		{
+			int blockLen = this.InputBlockSize;
+			int outLen = this.OutputBlockSize;
+			int fullBlocks = inputCount / blockLen;
+			int tail = inputCount % blockLen;
+
+			byte [] res = new byte [(inputCount != 0)
+			                        ? ((inputCount + 2) / blockLen) * outLen
+			                        : 0];
+
+			int outputOffset = 0;
+
+			for (int i = 0; i < fullBlocks; i++) {
+
+				TransformBlock (inputBuffer, inputOffset,
+				                blockLen, res, outputOffset);
+
+				inputOffset += blockLen;
+				outputOffset += outLen;
+			}
+
+
+			byte [] lookup = Base64Table.EncodeTable;
+			int b1,b2;
+
+
+			// When fewer than 24 input bits are available
+			// in an input group, zero bits are added
+			// (on the right) to form an integral number of
+			// 6-bit groups.
+			switch (tail) {
+			case 0:
+				break;
+			case 1:
+				b1 = inputBuffer [inputOffset];
+				res [outputOffset] = lookup [b1 >> 2];
+				res [outputOffset+1] = lookup [(b1 << 4) & 0x30];
+
+				// padding
+				res [outputOffset+2] = (byte)'=';
+				res [outputOffset+3] = (byte)'=';
+				break;
+
+			case 2:
+				b1 = inputBuffer [inputOffset];
+				b2 = inputBuffer [inputOffset + 1];
+				res [outputOffset] = lookup [b1 >> 2];
+				res [outputOffset+1] = lookup [((b1 << 4) & 0x30) | (b2 >> 4)];
+				res [outputOffset+2] = lookup [(b2 << 2) & 0x3c];
+
+				// one-byte padding
+				res [outputOffset+3] = (byte)'=';
+				break;
+
+			default:
+				break;
+			}
+
+			return res;
+		}
+
+
+
+		/// <summary>
+		/// </summary>
+		public override string ToString ()
+		{
+			return "mono::System.Security.Cryptography.ToBase64Transform";
+		}
+
+	} // ToBase64Transform
+
+
+
+	
+	[MonoTODO ("Put me in a separate file")]
+	internal sealed class Base64Table {
+
+		// This is the Base64 alphabet as described in RFC 2045
+		// (Table 1, page 25).
+		private static string ALPHABET =
+			"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+		private static byte[] encodeTable;
+		private static byte[] decodeTable;
+
+
+		static Base64Table ()
+		{
+			int len = ALPHABET.Length;
+
+			encodeTable = new byte [len];
+
+			for (int i=0; i < len; i++) {
+				encodeTable [i] = (byte) ALPHABET [i];
+			}
+
+
+			decodeTable = new byte [1 + (int)'z'];
+
+			for (int i=0; i < decodeTable.Length; i++) {
+				decodeTable [i] = Byte.MaxValue;
+			}
+
+			for (int i=0; i < len; i++) {
+				char ch = ALPHABET [i];
+				decodeTable [(int)ch] = (byte) i;
+			}
+		}
+
+
+		private Base64Table ()
+		{
+			// Never instantiated.
+		}
+
+
+		internal static byte [] EncodeTable {
+			get {
+				return encodeTable;
+			}
+		}
+
+		internal static byte [] DecodeTable {
+			get {
+				return decodeTable;
+			}
+		}
+
+	} // Base64Table
+
+} // System.Security.Cryptography
diff --git a/mcs/class/corlib/System.Security.Cryptography/X509Certificates.cs b/mcs/class/corlib/System.Security.Cryptography/X509Certificates.cs
new file mode 100755
index 00000000000..342b0cacf31
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Cryptography/X509Certificates.cs
@@ -0,0 +1,10 @@
+using System.Security.Cryptography;
+
+namespace System.Security.Cryptography.X509Certificates {
+
+	[Serializable]
+	public class X509Certificate {
+		internal X509Certificate () {}
+	}
+}
+
diff --git a/mcs/class/corlib/System.Security.Permissions/ChangeLog b/mcs/class/corlib/System.Security.Permissions/ChangeLog
new file mode 100644
index 00000000000..d5e5fc8f88a
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/ChangeLog
@@ -0,0 +1,87 @@
+2002-08-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>

+

+	* ZoneIdentityPermission.cs: New file. Implemented.

+

+2002-07-22  Tim Coleman <tim@timcoleman.com>

+	* ReflectionPermission.cs:

+	* EnvironmentPermission.cs:

+		bad place for an override keyword :(

+

+2002-07-22  Tim Coleman <tim@timcoleman.com>

+	* ReflectionPermission.cs:

+	* EnvironmentPermission.cs:

+		Stubbs added because these are referenced

+		in System.Web.

+

+2002-07-13  Jonathan Pryor  <jonpryor@vt.edu>

+	* ResourcePermissionBase.cs: Stubbed out

+	* ResourcePermissionBaseEntry.cs: Implemented.

+

+2002-03-12  Duncan Mak  <duncan@ximian.com>

+

+	* SiteIdentityPermissionAttribute.cs: 

+	* UIPermissionAttribute.cs: These should inherit from

+	CodeAccessSecurityAttribute, not IsolatedStoragePermissionAttribute.

+

+2002-02-17  Duncan Mak  <duncan@ximian.com>

+

+	* FileDialogPermissionAccess.cs: Add in namespace declaration, so

+	that this one little unique enum wouldn't show up in the System

+	namespace when we ildasm corlib.dll ;-) Oops, my bad.

+

+2002-02-13  Dan Lewis	<dihlewis@yahoo.co.uk>

+

+	* SecurityPermission.cs,

+	IsolatedStoragePermissionAttribute.cs: New files

+

+2002-01-23  Duncan Mak  <duncan@ximian.com>

+

+	* FileDialogPermissionAccess.cs: Add to CVS.

+

+2002-01-20  Duncan Mak  <duncan@ximian.com>

+

+	* *Attribute.cs: Implemented all the properties in the attributes

+	and removed the relevent MonoTODO attributes.

+

+	* *Attribute.cs: Fixed indentation.

+

+2002-01-18  Duncan Mak  <duncan@ximian.com>

+

+	* EnvironmentPermissionAttribute.cs: 

+	* FileDialogPermissionAttribute.cs: 

+	* FileIOPermissionAttribute.cs: 

+	* IsolatedStorageAttribute.cs: 

+	* IsolatedStorageFilePermissionAttribute.cs: 

+	* PermissionSetAttribute.cs: 

+	* PrinciplePermissionAttribute.cs: 

+	* ReflectionPermissionAttribute.cs: 

+	* RegistryPermissionAttribute.cs: 

+	* SiteIdentityPermissionAttribute.cs: 

+	* StrongNamePermissionAttribute.cs: 

+	* UIPermissionAttribute.cs: 

+	* UrlIdentityPermissionAttribute.cs: 

+	* ZoneIdentityPermissionAttribute.cs: New files. Stubbed out with MonoTODOs

+

+	* Note: These are all the Attributes in the

+	System.Security.Permissions namespace. The only missing one is

+	PublishIdentityPermissionAttribute.cs because we don't have

+	anything for the X509Certificate class.

+

+2002-01-14  Nick Drochak  <ndrochak@gol.com>

+

+	* FileIOPermission.cs: New file.  Implemented.

+

+2002-01-08  Nick Drochak  <ndrochak@gol.com>

+

+	* CodeAccessSecurityAttribute.cs, SecurityAttribute.cs, 

+	SecurityPermissionAttribute.cs: New Files

+

+	* SecurityPermissionFlag.cs: Add missing enum values

+

+2002-01-02  Nick Drochak  <ndrochak@gol.com>

+

+	* IUnrestrictedPermission.cs: Added missing interface class

+

+2001-07-18  Michael Lambert <michaellambert@email.com>

+

+	* EnvironmentPermissionAccess.cs, FileIOPermissionAccess.cs, ReflectionPermissionFlag.cs: Add.

diff --git a/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs b/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs
new file mode 100644
index 00000000000..ced28962930
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/CodeAccessSecurityAttribute.cs
@@ -0,0 +1,33 @@
+//------------------------------------------------------------------------------

+// 

+// System.Security.Permissions.SecurityPermissionAttribute.cs 

+//

+// Copyright (C) 2001 Nick Drochak, All Rights Reserved

+// 

+// Author:         Nick Drochak, ndrochak@gol.com

+// Created:        2002-01-06 

+//

+//------------------------------------------------------------------------------

+

+using System;

+using System.Security.Permissions;

+

+namespace System.Security.Permissions

+{

+	[System.AttributeUsage(

+		System.AttributeTargets.Assembly 

+		| System.AttributeTargets.Class 

+		| System.AttributeTargets.Struct 

+		| System.AttributeTargets.Constructor 

+		| System.AttributeTargets.Method, 

+		AllowMultiple=true, 

+		Inherited=false)

+	]

+	[Serializable]
+	public abstract class CodeAccessSecurityAttribute : SecurityAttribute {

+

+		public CodeAccessSecurityAttribute(SecurityAction action) : base(action) {}

+

+	}  // public abstract class CodeAccessSecurityAttribute

+}  // namespace System.Security.Permissions
+
diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs
new file mode 100644
index 00000000000..bd1b15b5f3f
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermission.cs
@@ -0,0 +1,103 @@
+//
+// System.Security.Permissions.EnvironmentPermission.cs
+//
+// Tim Coleman <tim@timcoleman.com>
+//
+// Copyright (C) 2002, Tim Coleman
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[Serializable]
+	public sealed class EnvironmentPermission : CodeAccessPermission, IUnrestrictedPermission
+	{
+		#region Fields
+
+		EnvironmentPermissionAccess flags;
+		PermissionState state;
+		string pathList;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		public EnvironmentPermission (PermissionState state)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public EnvironmentPermission (EnvironmentPermissionAccess flag, string pathList)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Constructors
+
+		#region Methods
+
+		[MonoTODO]
+		public void AddPathList (EnvironmentPermissionAccess flag, string pathList)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Copy ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void FromXml (SecurityElement esd)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public string GetPathList (EnvironmentPermissionAccess flag)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Intersect (IPermission target)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsSubsetOf (IPermission target)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public bool IsUnrestricted ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public void SetPathList (EnvironmentPermissionAccess flag, string pathList)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override SecurityElement ToXml ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Union (IPermission other)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAccess.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAccess.cs
new file mode 100644
index 00000000000..06517ebc7c6
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAccess.cs
@@ -0,0 +1,38 @@
+// EnvironmentPermissionAccess.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:29:59 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Security.Permissions {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum EnvironmentPermissionAccess {
+
+		/// <summary>
+		/// </summary>
+		NoAccess = 0x00000000,
+
+		/// <summary>
+		/// </summary>
+		Read = 0x00000001,
+
+		/// <summary>
+		/// </summary>
+		Write = 0x00000002,
+
+		/// <summary>
+		/// </summary>
+		AllAccess = Read | Write,
+	} // EnvironmentPermissionAccess
+
+} // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs
new file mode 100644
index 00000000000..3b16e90eb16
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/EnvironmentPermissionAttribute.cs
@@ -0,0 +1,53 @@
+//
+// System.Security.Permissions.EnvironmentPermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class EnvironmentPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private string all;
+		private string read;
+		private string write;
+		
+		// Constructor
+		public EnvironmentPermissionAttribute (SecurityAction action) : base (action) {}
+		
+		// Properties
+		public string All
+		{
+			set { all = value; }
+		}
+
+		public string Read
+		{
+			get { return read; }
+			set { read = value; }
+		}
+
+		public string Write
+		{
+			get { return write; }
+			set { write = value; }
+		}
+
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAccess.cs b/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAccess.cs
new file mode 100644
index 00000000000..d2196cba0b3
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAccess.cs
@@ -0,0 +1,21 @@
+//
+// System.Security.Permissions.FileDialogPermissionAccess
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+
+namespace System.Security.Permissions
+{
+	[Flags]	[Serializable]
+	public enum FileDialogPermissionAccess
+	{
+		None = 0,
+		Open = 1,
+		Save = 2,
+		OpenSave = 3,
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs
new file mode 100644
index 00000000000..58ee4a5fe0a
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/FileDialogPermissionAttribute.cs
@@ -0,0 +1,47 @@
+//
+// System.Security.Permissions.FileDialogPermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc.			http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class FileDialogPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private bool canOpen;
+		private bool canSave;
+		
+		// Constructor
+		public FileDialogPermissionAttribute (SecurityAction action) : base (action) {}
+
+		// Properties
+		public bool Open
+		{
+				get { return canOpen; }
+				set { canOpen = value; }
+		} 
+
+		public bool Save
+		{
+				get { return canSave; }
+				set { canSave = value; }
+		}
+
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+				return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/FileIOPermission.cs b/mcs/class/corlib/System.Security.Permissions/FileIOPermission.cs
new file mode 100644
index 00000000000..57a7ede89bc
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/FileIOPermission.cs
@@ -0,0 +1,411 @@
+//------------------------------------------------------------------------------

+// 

+// System.Security.Permissions.FileIOPermission.cs 

+//

+// Copyright (C) 2001 Nick Drochak, All Rights Reserved

+// 

+// Author:         Nick Drochak, ndrochak@gol.com

+// Created:        2002-01-09 

+//

+//------------------------------------------------------------------------------

+

+using System.Collections;

+using System.Text;

+using System.Security.Permissions;

+using System.IO;

+

+namespace System.Security.Permissions {

+

+	[SerializableAttribute()]

+	public sealed class FileIOPermission : CodeAccessPermission, IUnrestrictedPermission {

+

+		private static char[] m_badCharacters = {'\"','<', '>', '|', '*', '?'};

+		private bool m_Unrestricted = false;

+		private Hashtable m_PathList = new Hashtable();

+		private FileIOPermissionAccess m_AllFilesAccess = FileIOPermissionAccess.NoAccess;

+		private FileIOPermissionAccess m_AllLocalFilesAccess = FileIOPermissionAccess.NoAccess;

+

+		public FileIOPermission(PermissionState state) {

+			if (!Enum.IsDefined(typeof(PermissionState), state)){

+				throw new ArgumentException("Invalid permission state.", "state");

+			}

+			m_Unrestricted = (PermissionState.Unrestricted == state);

+			if (m_Unrestricted) {

+				m_AllFilesAccess = FileIOPermissionAccess.AllAccess;

+				m_AllLocalFilesAccess = FileIOPermissionAccess.AllAccess;

+			}

+		}

+

+		public FileIOPermission(FileIOPermissionAccess access, string path){

+			if ((FileIOPermissionAccess.AllAccess & access) != access){

+				throw new ArgumentException("Illegal enum value: "+access.ToString()+".");

+			}

+

+			if (path.LastIndexOfAny(m_badCharacters) >= 0){

+				throw new ArgumentException("Illegal characters found in input.  Security checks can not contain wild card characters.", "path");

+			}

+			

+			AddPathList(access, path);

+		}

+

+		public FileIOPermission(FileIOPermissionAccess access, string[] pathList){

+			if ((FileIOPermissionAccess.AllAccess & access) != access){

+				throw new ArgumentException("Illegal enum value: "+access.ToString()+".");

+			}

+

+			AddPathList(access, pathList);

+		}

+

+		public FileIOPermissionAccess AllFiles {

+			get {

+				return m_AllFilesAccess;

+			} 

+			set {

+				// if we are already set to unrestricted, don't change this property

+				if (!m_Unrestricted){

+					m_AllFilesAccess = value;

+				}

+			}

+		}

+

+		public FileIOPermissionAccess AllLocalFiles {

+			get {

+				return m_AllLocalFilesAccess;

+			} 

+			set {

+				// if we are already set to unrestricted, don't change this property

+				if (!m_Unrestricted){

+					m_AllLocalFilesAccess = value;

+				}

+			}

+		}

+

+		public void AddPathList(FileIOPermissionAccess access, string path){

+			if ((FileIOPermissionAccess.AllAccess & access) != access){

+				throw new ArgumentException("Illegal enum value: {0}.",access.ToString());

+			}

+

+			if (path.LastIndexOfAny(m_badCharacters) >= 0){

+				throw new ArgumentException("Invalid characters in path: '{0}'", path);

+			}

+

+			// LAMESPEC: docs don't say it must be a rooted path, but the MS implementation enforces it, so we will too.

+			if(!Path.IsPathRooted(path)) {

+				throw new ArgumentException("Absolute path information is required.");

+			}

+

+			// don't add the same path twice, instead overwrite access entry for that path

+			if (m_PathList.ContainsKey(path)) {

+				FileIOPermissionAccess currentPermission = (FileIOPermissionAccess)m_PathList[path];

+				currentPermission |= access;

+				m_PathList[path] = currentPermission;

+			}

+			else {

+				m_PathList.Add(path, access);

+			}

+		}

+

+		public void AddPathList(FileIOPermissionAccess access, string[] pathList	){

+			foreach(string path in pathList){

+				AddPathList(access, path);

+			}

+			

+		}

+

+		// private constructor used by Copy() method

+		private FileIOPermission(Hashtable pathList, FileIOPermissionAccess allFiles, 

+						FileIOPermissionAccess allLocalFiles, bool unrestricted){

+			m_PathList = pathList;

+			m_AllFilesAccess = allFiles;

+			m_AllLocalFilesAccess = allLocalFiles;

+			m_Unrestricted = unrestricted;

+		}

+

+		public override IPermission Copy(){

+			if (m_Unrestricted) {

+				return new FileIOPermission(PermissionState.Unrestricted);

+			}

+			else{

+				FileIOPermission retVal = new FileIOPermission(m_PathList, m_AllFilesAccess, m_AllLocalFilesAccess, m_Unrestricted);

+				return retVal;

+			}

+		}

+

+		/*  XML Schema for FileIOPermission

+				<IPermission class=”FileIOPermission” 

+								 version=”1”

+								 (

+								 Read=”[list of files or folders]” | 

+								 Write=”[list of files or folders]” |

+								 Append=”[list of files or folders]”   

+								 ) v Unrestricted=”true” 

+								 />

+		*/

+		public override void FromXml(SecurityElement esd){

+			if (null == esd) {

+				throw new ArgumentNullException();

+			}

+			if (esd.Tag != "IPermission" || (string)esd.Attributes["class"] != "FileIOPermission"

+					|| (string)esd.Attributes["version"] != "1"){

+				throw new ArgumentException("Not a valid permission element");

+			}

+			m_PathList.Clear();

+			if ("true" == (string)esd.Attributes["Unrestricted"]){

+				m_Unrestricted = true;

+			}

+			else{

+				m_Unrestricted = false;

+				string fileList;

+				fileList = (string)esd.Attributes["Read"];

+				string[] files;

+				if (fileList != null){

+					files = fileList.Split(';');

+					AddPathList(FileIOPermissionAccess.Read, files);

+				}

+				fileList = (string)esd.Attributes["Write"];

+				if (fileList != null){

+					files = fileList.Split(';');

+					AddPathList(FileIOPermissionAccess.Write, files);

+				}

+				fileList = (string)esd.Attributes["Append"];

+				if (fileList != null){

+					files = fileList.Split(';');

+					AddPathList(FileIOPermissionAccess.Append, files);

+				}

+			}

+		}

+

+		public string[] GetPathList(FileIOPermissionAccess access){

+			//LAMESPEC: docs says it returns (semicolon separated) list, but return

+			//type is array.  I think docs are wrong and it just returns an array

+			if ((FileIOPermissionAccess.AllAccess & access) != access){

+				throw new ArgumentException("Illegal enum value: "+access.ToString()+".");

+			}

+

+			ArrayList matchingPaths = new ArrayList();

+			System.Collections.IDictionaryEnumerator pathListIterator = m_PathList.GetEnumerator();

+			while (pathListIterator.MoveNext()) {

+				if (((FileIOPermissionAccess)pathListIterator.Value & access) != 0) {

+					matchingPaths.Add((string)pathListIterator.Key);

+				}

+			}

+			if (matchingPaths.Count == 0) {

+				return null;

+			}

+			else {

+				return (string[])matchingPaths.ToArray(typeof(string));

+			}

+		}

+

+		public override IPermission Intersect(IPermission target){ 

+			if (null == target){

+				return null;

+			}

+			else {

+				if (target.GetType() != typeof(FileIOPermission)){

+					throw new ArgumentException();

+				}

+			}

+			FileIOPermission FIOPTarget = (FileIOPermission)target;

+			if (FIOPTarget.IsUnrestricted() && m_Unrestricted){

+				return new FileIOPermission(PermissionState.Unrestricted);

+			}

+			else if (FIOPTarget.IsUnrestricted()){

+				return Copy();

+			}

+			else if (m_Unrestricted){

+				return FIOPTarget.Copy();

+			}

+			else{

+				FileIOPermission retVal = new FileIOPermission(PermissionState.None);

+				retVal.AllFiles = m_AllFilesAccess & FIOPTarget.AllFiles;

+				retVal.AllLocalFiles = m_AllLocalFilesAccess & FIOPTarget.AllLocalFiles;

+

+				string[] paths;

+				paths = FIOPTarget.GetPathList(FileIOPermissionAccess.Append);

+				if (null != paths) {

+					foreach (string path in paths){

+						if (m_PathList.ContainsKey(path) 

+							&& ((FileIOPermissionAccess)m_PathList[path] & FileIOPermissionAccess.Append) != 0){

+							retVal.AddPathList(FileIOPermissionAccess.Append, path);

+						}

+					}

+				}

+

+				paths = FIOPTarget.GetPathList(FileIOPermissionAccess.Read);

+				if (null != paths) {

+					foreach (string path in paths){

+						if (m_PathList.ContainsKey(path) 

+							&& ((FileIOPermissionAccess)m_PathList[path] & FileIOPermissionAccess.Read) != 0){

+							retVal.AddPathList(FileIOPermissionAccess.Read, path);

+						}

+					}

+				}

+

+				paths = FIOPTarget.GetPathList(FileIOPermissionAccess.Write);

+				if (null != paths) {

+					foreach (string path in paths){

+						if (m_PathList.ContainsKey(path) 

+							&& ((FileIOPermissionAccess)m_PathList[path] & FileIOPermissionAccess.Write) != 0){

+							retVal.AddPathList(FileIOPermissionAccess.Write, path);

+						}

+					}

+				}

+

+				return retVal;

+			}

+		}

+

+

+		public override bool IsSubsetOf(IPermission target){

+			// X.IsSubsetOf(Y) is true if permission Y includes everything allowed by X.

+			if (target != null && target.GetType() != typeof(FileIOPermission)){

+				throw new ArgumentException();

+			}

+			FileIOPermission FIOPTarget = (FileIOPermission)target;

+			if (FIOPTarget.IsUnrestricted()){

+				return true;

+			}

+			else if (m_Unrestricted){

+				return false;

+			}

+			else if ((m_AllFilesAccess & FIOPTarget.AllFiles) != m_AllFilesAccess) {

+				return false;

+			}

+			else if ((m_AllLocalFilesAccess & FIOPTarget.AllLocalFiles) != m_AllLocalFilesAccess) {

+				return false;

+			}

+			else{

+				string[] pathsNeeded;

+				string[] pathsInTarget;

+

+				pathsNeeded = GetPathList(FileIOPermissionAccess.Append);

+				if (null != pathsNeeded) {

+					pathsInTarget = FIOPTarget.GetPathList(FileIOPermissionAccess.Append);

+					foreach (string path in pathsNeeded){

+						if (Array.IndexOf(pathsInTarget, path) <0) {

+							return false;

+						}

+					}

+				}

+

+				pathsNeeded = GetPathList(FileIOPermissionAccess.Read);

+				if (null != pathsNeeded) {

+					pathsInTarget = FIOPTarget.GetPathList(FileIOPermissionAccess.Read);

+					foreach (string path in pathsNeeded){

+						if (Array.IndexOf(pathsInTarget, path) <0) {

+							return false;

+						}

+					}

+				}

+

+				pathsNeeded = GetPathList(FileIOPermissionAccess.Write);

+				if (null != pathsNeeded) {

+					pathsInTarget = FIOPTarget.GetPathList(FileIOPermissionAccess.Write);

+					foreach (string path in pathsNeeded){

+						if (Array.IndexOf(pathsInTarget, path) <0) {

+							return false;

+						}

+					}

+				}

+

+				return true;

+			}

+		}

+

+		public bool IsUnrestricted(){

+			return m_Unrestricted;

+		}

+

+		public void SetPathList(FileIOPermissionAccess access, string path){

+			if ((FileIOPermissionAccess.AllAccess & access) != access){

+				throw new ArgumentException("Illegal enum value: "+access.ToString()+".");

+			}

+			if (path.LastIndexOfAny(m_badCharacters) >= 0){

+				throw new ArgumentException("Invalid characters in path: '{0}'", path);

+			}

+

+			m_PathList.Clear();

+			AddPathList(access, path);

+		}

+		

+		public void SetPathList(FileIOPermissionAccess access, string[] pathList){

+			if ((FileIOPermissionAccess.AllAccess & access) != access){

+				throw new ArgumentException("Illegal enum value: "+access.ToString()+".");

+			}

+			foreach(string path in pathList){

+				if (path.LastIndexOfAny(m_badCharacters) >= 0){

+					throw new ArgumentException("Invalid characters in path entry: '{0}'", path);

+				}

+			}

+

+			m_PathList.Clear();

+			AddPathList(access, pathList);

+		}

+

+		public override SecurityElement ToXml(){

+			//Encode the the current permission to XML using the 

+			//security element class.

+			SecurityElement element = new SecurityElement("IPermission");

+			Type type = this.GetType();

+			StringBuilder AsmName = new StringBuilder(type.Assembly.ToString());

+			AsmName.Replace('\"', '\'');

+			element.AddAttribute("class", type.FullName + ", " + AsmName);

+			element.AddAttribute("version", "1");

+			if(m_Unrestricted){

+				element.AddAttribute("Unrestricted", "true");

+			}

+			else {

+				string[] paths;

+				paths = GetPathList(FileIOPermissionAccess.Append);

+				if (null != paths && paths.Length >0){

+					element.AddAttribute("Append", String.Join(";",paths));

+				}

+				paths = GetPathList(FileIOPermissionAccess.Read);

+				if (null != paths && paths.Length >0){

+					element.AddAttribute("Read", String.Join(";",paths));

+				}

+				paths = GetPathList(FileIOPermissionAccess.Write);

+				if (null != paths && paths.Length >0){

+					element.AddAttribute("Write", String.Join(";",paths));

+				}

+			}

+			return element;

+		}

+

+		public override IPermission Union(IPermission other){

+			if (null == other){

+				return null;

+			}

+			else {

+				if (other.GetType() != typeof(FileIOPermission)){

+					throw new ArgumentException();

+				}

+			}

+			FileIOPermission FIOPTarget = (FileIOPermission)other;

+			if (FIOPTarget.IsUnrestricted() || m_Unrestricted){

+				return new FileIOPermission(PermissionState.Unrestricted);

+			}

+			else{

+				FileIOPermission retVal = (FileIOPermission)Copy();

+				retVal.AllFiles |= FIOPTarget.AllFiles;

+				retVal.AllLocalFiles |= FIOPTarget.AllLocalFiles;

+				string[] paths;

+				paths = FIOPTarget.GetPathList(FileIOPermissionAccess.Append);

+				if (null != paths){

+						retVal.AddPathList(FileIOPermissionAccess.Append, paths);

+				}

+				paths = FIOPTarget.GetPathList(FileIOPermissionAccess.Read);

+				if (null != paths){

+					retVal.AddPathList(FileIOPermissionAccess.Read, paths);

+				}

+				paths = FIOPTarget.GetPathList(FileIOPermissionAccess.Write);

+				if (null != paths){

+					retVal.AddPathList(FileIOPermissionAccess.Write, paths);

+				}

+				return retVal;

+			}

+		}

+

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAccess.cs b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAccess.cs
new file mode 100644
index 00000000000..dd255cd3b1c
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAccess.cs
@@ -0,0 +1,46 @@
+// FileIOPermissionAccess.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:30:11 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Security.Permissions {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum FileIOPermissionAccess {
+
+		/// <summary>
+		/// </summary>
+		NoAccess = 0x00000000,
+
+		/// <summary>
+		/// </summary>
+		Read = 0x00000001,
+
+		/// <summary>
+		/// </summary>
+		Write = 0x00000002,
+
+		/// <summary>
+		/// </summary>
+		Append = 0x00000004,
+
+		/// <summary>
+		/// </summary>
+		PathDiscovery = 0x00000008,
+
+		/// <summary>
+		/// </summary>
+		AllAccess = Read | Write | Append | PathDiscovery,
+	} // FileIOPermissionAccess
+
+} // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs
new file mode 100644
index 00000000000..64540caf30a
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/FileIOPermissionAttribute.cs
@@ -0,0 +1,68 @@
+//
+// System.Security.Permissions.FileIOPermissionAttribute.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// (C) 2002 Ximian, Inc.		http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class FileIOPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private string all;
+		private string append;
+		private string path;
+		private string read;
+		private string write;
+		
+		// Constructor
+		public FileIOPermissionAttribute (SecurityAction action) : base (action) {}
+		
+		// Properties
+		public string All
+		{
+			 set { all = value; }
+		}
+
+		public string Append
+		{
+			get { return append; }
+			set { append = value; }
+		}
+
+		public string PathDiscovery
+		{
+			get { return path; }
+			set { path = value; }
+		}
+
+		public string Read
+		{
+			get { return read; }
+			set { read = value; }
+		}				    
+		
+		public string Write
+		{
+			get { return write; }
+			set { write = value; }
+		}
+			 
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			return null;
+		}
+	}
+}	   
diff --git a/mcs/class/corlib/System.Security.Permissions/IUnrestrictedPermission.cs b/mcs/class/corlib/System.Security.Permissions/IUnrestrictedPermission.cs
new file mode 100644
index 00000000000..f9b6b9eae0e
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/IUnrestrictedPermission.cs
@@ -0,0 +1,15 @@
+//

+// System.Security.Permissions.IUnrestrictedPermission.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+namespace System.Security.Permissions {

+

+	public interface IUnrestrictedPermission {

+		bool IsUnrestricted();

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStorageContainment.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStorageContainment.cs
new file mode 100755
index 00000000000..391e3e7dc7b
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStorageContainment.cs
@@ -0,0 +1,27 @@
+// IsolatedStorageContainment.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:41:57 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Security.Permissions {
+
+	[Serializable]
+	public enum IsolatedStorageContainment
+	{
+		None = 0x00,
+		DomainIsolationByUser = 0x10,
+		AssemblyIsolationByUser = 0x20,
+		DomainIsolationByRoamingUser = 0x50,
+		AssemblyIsolationByRoamingUser = 0x60,
+		AdministerIsolatedStorageByUser = 0x70,
+		UnrestrictedIsolatedStorage = 0xF0,
+	};
+
+} // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermissionAttribute.cs
new file mode 100644
index 00000000000..a9a879f06fc
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStorageFilePermissionAttribute.cs
@@ -0,0 +1,34 @@
+//
+// System.Security.Permissions.IsolatedStorageFilePermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc.			http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class IsolatedStorageFilePermissionAttribute : IsolatedStoragePermissionAttribute
+	{
+		// Constructor
+		public IsolatedStorageFilePermissionAttribute (SecurityAction action)
+			: base (action)
+		{
+		}
+
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs
new file mode 100644
index 00000000000..907d7de3615
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermission.cs
@@ -0,0 +1,84 @@
+//
+// System.Security.Permissions.IsolatedStoragePermission.cs
+//
+// Piers Haken <piersh@friskit.com>
+//
+// (C) 2002 Ximian, Inc.			http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[Serializable]
+	public abstract class IsolatedStoragePermission : CodeAccessPermission, IUnrestrictedPermission
+	{
+		internal long m_userQuota;
+		internal long m_machineQuota;
+		internal long m_expirationDays;
+		internal bool m_permanentData;
+		internal IsolatedStorageContainment m_allowed;
+
+		public IsolatedStoragePermission (PermissionState state)
+		{
+			if (state == PermissionState.None)
+			{
+				m_userQuota = 0;
+				m_machineQuota = 0;
+				m_expirationDays = 0;
+				m_permanentData = false;
+				m_allowed = IsolatedStorageContainment.None;
+			}
+			else if (state == PermissionState.Unrestricted)
+			{
+				m_userQuota = Int64.MaxValue;
+				m_machineQuota = Int64.MaxValue;
+				m_expirationDays = Int64.MaxValue ;
+				m_permanentData = true;
+				m_allowed = IsolatedStorageContainment.UnrestrictedIsolatedStorage;
+			}
+			else
+			{
+				throw new ArgumentException("Invalid Permission state");
+			}
+		}
+
+		public long UserQuota
+		{
+			set { m_userQuota = value; }
+			get { return m_userQuota; }
+		}
+
+
+		public IsolatedStorageContainment UsageAllowed
+		{
+			set { m_allowed = value; }
+			get { return m_allowed; }
+		}
+
+
+		public bool IsUnrestricted ()
+		{
+			return IsolatedStorageContainment.UnrestrictedIsolatedStorage == m_allowed;
+		}
+
+		[MonoTODO]
+		public override SecurityElement ToXml ()
+		{
+			throw new NotImplementedException ();
+		}
+
+
+		[MonoTODO]
+		public override void FromXml (SecurityElement esd)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
+
+
+
+
+
diff --git a/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs
new file mode 100644
index 00000000000..21563b6b516
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/IsolatedStoragePermissionAttribute.cs
@@ -0,0 +1,44 @@
+//

+// System.Security.Permissions.IsolatedStoragePermissionAttributes.cs

+//

+// Author:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+

+using System;

+using System.Security.Permissions;

+

+namespace System.Security.Permissions {

+	

+	[AttributeUsage ( AttributeTargets.Assembly | AttributeTargets.Class |

+		AttributeTargets.Struct | AttributeTargets.Constructor |

+		AttributeTargets.Method)]

+	[Serializable]

+	public abstract class IsolatedStoragePermissionAttribute : CodeAccessSecurityAttribute {

+		

+		public IsolatedStoragePermissionAttribute (SecurityAction action) : base (action) {

+		}

+

+		public IsolatedStorageContainment UsageAllowed {

+			get { return usage_allowed; }

+			set { usage_allowed = value; }

+		}

+

+		public long UserQuota {

+			get { return user_quota; }

+			set { user_quota = value; }

+		}

+

+		[MonoTODO]

+		public override IPermission CreatePermission () {

+			return null;

+		}

+

+		// private

+

+		private IsolatedStorageContainment usage_allowed;

+		private long user_quota;

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs b/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs
new file mode 100644
index 00000000000..ee654f7e00b
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/PermissionSetAttribute.cs
@@ -0,0 +1,69 @@
+//
+// System.Security.Permissions.PermissionSetAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class PermissionSetAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private string file;
+		private string name;
+		private bool isUnicodeEncoded;
+		private string xml;
+		
+		// Constructor
+		public PermissionSetAttribute (SecurityAction action)
+			: base (action)
+		{
+		}
+		
+		// Properties
+		public string File
+		{
+			get { return file; }
+			set { file = value; }
+		}
+
+		public string Name
+		{
+			get { return name; }
+			set { name = value; }
+		}
+
+		public bool UnicodeEncoded
+		{
+			get { return isUnicodeEncoded; }
+			set { isUnicodeEncoded = value; }
+		}
+
+		public string XML
+		{
+			get { return xml; }
+			set { xml = value; }
+		 }
+		
+		// Methods
+		public override IPermission CreatePermission ()
+		{
+			return null; 	  // Not used, used for inheritance from SecurityAttribute
+		}
+
+		[MonoTODO]
+		public PermissionSet CreatePermissionSet ()
+		{
+			    return null;
+		}
+	}
+}		    
diff --git a/mcs/class/corlib/System.Security.Permissions/PermissionState.cs b/mcs/class/corlib/System.Security.Permissions/PermissionState.cs
new file mode 100755
index 00000000000..66c3d03eb6f
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/PermissionState.cs
@@ -0,0 +1,29 @@
+// PermissionState.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:30:05 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Security.Permissions {
+
+
+	/// <summary>
+	/// </summary>
+	public enum PermissionState {
+
+		/// <summary>
+		/// </summary>
+		Unrestricted = 1,
+
+		/// <summary>
+		/// </summary>
+		None = 0,
+	} // PermissionState
+
+} // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs
new file mode 100644
index 00000000000..fee707d002d
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/PrincipalPermissionAttribute.cs
@@ -0,0 +1,60 @@
+//
+// System.Security.Permissions.PrincipalPermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class PrincipalPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private bool authenticated;
+		private string name;
+		private string role;
+		
+		// Constructor
+		public PrincipalPermissionAttribute (SecurityAction action)
+			: base (action)
+		{
+		}
+
+		// Properties
+		[MonoTODO]
+		public bool Authenticated
+		{
+			get { return authenticated; }
+			set { authenticated = value; }
+		}
+			 			 
+		[MonoTODO]
+		public string Name
+		{
+			get { return name; }
+			set { name = value; }
+		}
+			 
+		[MonoTODO]
+		public string Role
+		{
+			get { return role; }
+			set { role = value; }
+		}
+
+		// Method
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs
new file mode 100644
index 00000000000..74d74c5102d
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermission.cs
@@ -0,0 +1,94 @@
+//
+// System.Security.Permissions.ReflectionPermission.cs
+//
+// Tim Coleman <tim@timcoleman.com>
+//
+// Copyright (C) 2002, Tim Coleman
+//
+
+using System;
+
+namespace System.Security.Permissions
+{
+	[Serializable]
+	public sealed class ReflectionPermission : CodeAccessPermission, IUnrestrictedPermission
+	{
+		#region Fields
+
+		ReflectionPermissionFlag flags;
+		PermissionState state;
+
+		#endregion // Fields
+
+		#region Constructors
+
+		public ReflectionPermission (PermissionState state)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public ReflectionPermission (ReflectionPermissionFlag flag)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Constructors
+
+		#region Properties
+
+		public ReflectionPermissionFlag Flags {
+			[MonoTODO]
+			get { throw new NotImplementedException (); }
+			[MonoTODO]
+			set { throw new NotImplementedException (); }
+		}
+
+		#endregion // Properties
+
+		#region Methods
+
+		[MonoTODO]
+		public override IPermission Copy ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override void FromXml (SecurityElement esd)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Intersect (IPermission target)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override bool IsSubsetOf (IPermission target)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public bool IsUnrestricted ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override SecurityElement ToXml ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public override IPermission Union (IPermission other)
+		{
+			throw new NotImplementedException ();
+		}
+
+		#endregion // Methods
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
new file mode 100644
index 00000000000..b7a94b4c29d
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionAttribute.cs
@@ -0,0 +1,61 @@
+//
+// System.Security.Permissions.ReflectionPermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class ReflectionPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private ReflectionPermissionFlag flags;
+		private bool memberAccess;
+		private bool reflectionEmit;
+		private bool typeInfo;
+		
+		//Constructor
+		public ReflectionPermissionAttribute (SecurityAction action) : base (action) {}
+		
+		// Properties
+		public ReflectionPermissionFlag Flags
+		{
+			get { return flags; }
+			set { flags = value; }
+		}
+		
+		public bool MemberAccess
+		{
+			get { return memberAccess; }
+			set { memberAccess = value; }
+		}
+		
+		public bool ReflectionEmit
+		{
+			get { return reflectionEmit; }
+			set { reflectionEmit = value; }
+		}  
+
+		public bool TypeInformation
+		{
+			get { return typeInfo; }
+			set { typeInfo = value; }
+		}
+		
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs
new file mode 100644
index 00000000000..21d29d46254
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/ReflectionPermissionFlag.cs
@@ -0,0 +1,42 @@
+// ReflectionPermissionFlag.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:31:14 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Security.Permissions {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum ReflectionPermissionFlag {
+
+		/// <summary>
+		/// </summary>
+		NoFlags = 0x00000000,
+
+		/// <summary>
+		/// </summary>
+		TypeInformation = 0x00000001,
+
+		/// <summary>
+		/// </summary>
+		MemberAccess = 0x00000002,
+
+		/// <summary>
+		/// </summary>
+		ReflectionEmit = 0x4,
+
+		/// <summary>
+		/// </summary>
+		AllFlags = TypeInformation | MemberAccess | ReflectionEmit,
+	} // ReflectionPermissionFlag
+
+} // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAccess.cs b/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAccess.cs
new file mode 100755
index 00000000000..f45f481390a
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAccess.cs
@@ -0,0 +1,42 @@
+// RegistryPermissionAccess.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:42:13 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Security.Permissions {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum RegistryPermissionAccess {
+
+		/// <summary>
+		/// </summary>
+		NoAccess = 0,
+
+		/// <summary>
+		/// </summary>
+		Read = 1,
+
+		/// <summary>
+		/// </summary>
+		Write = 2,
+
+		/// <summary>
+		/// </summary>
+		Create = 4,
+
+		/// <summary>
+		/// </summary>
+		AllAccess = 7,
+	} // RegistryPermissionAccess
+
+} // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAttribute.cs
new file mode 100644
index 00000000000..3ab3eeb160d
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/RegistryPermissionAttribute.cs
@@ -0,0 +1,60 @@
+//
+// System.Security.Permissions.RegistryPermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class RegistryPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private string all;
+		private string create;
+		private string read;
+		private string write;
+		       
+		// Constructor
+		public RegistryPermissionAttribute (SecurityAction action) : base (action) {}
+		
+		// Properties
+		public string All
+		{
+			set { all = value; }
+		}
+		
+		public string Create
+		{
+			get { return create; }
+			set { create = value; }
+		}
+
+		public string Read
+		{ 
+			get { return read; }
+			set { read = value; }
+		}
+
+		public string Write
+		{
+			get { return write; }
+			set { write = value; }
+		}
+
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs b/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs
new file mode 100755
index 00000000000..7cd81e1c500
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityAction.cs
@@ -0,0 +1,57 @@
+// SecurityAction.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:29:52 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Security.Permissions {
+
+
+	/// <summary>
+	/// </summary>
+	public enum SecurityAction {
+
+		/// <summary>
+		/// </summary>
+		Demand = 2,
+
+		/// <summary>
+		/// </summary>
+		Assert = 3,
+
+		/// <summary>
+		/// </summary>
+		Deny = 4,
+
+		/// <summary>
+		/// </summary>
+		PermitOnly = 5,
+
+		/// <summary>
+		/// </summary>
+		LinkDemand = 6,
+
+		/// <summary>
+		/// </summary>
+		InheritanceDemand = 7,
+
+		/// <summary>
+		/// </summary>
+		RequestMinimum = 8,
+
+		/// <summary>
+		/// </summary>
+		RequestOptional = 9,
+
+		/// <summary>
+		/// </summary>
+		RequestRefuse = 10,
+	} // SecurityAction
+
+} // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs b/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs
new file mode 100644
index 00000000000..d914835f140
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityAttribute.cs
@@ -0,0 +1,59 @@
+//------------------------------------------------------------------------------

+// 

+// System.Security.Permissions.SecurityPermissionAttribute.cs 

+//

+// Copyright (C) 2001 Nick Drochak, All Rights Reserved

+// 

+// Author:         Nick Drochak, ndrochak@gol.com

+// Created:        2002-01-06 

+//

+//------------------------------------------------------------------------------

+

+using System;

+using System.Security;

+using System.Security.Permissions;

+

+namespace System.Security.Permissions {

+	[System.AttributeUsage(

+		System.AttributeTargets.Assembly 

+		| System.AttributeTargets.Class 

+		| System.AttributeTargets.Struct 

+		| System.AttributeTargets.Constructor 

+		| System.AttributeTargets.Method, 

+		AllowMultiple=true, 

+		Inherited=false)

+	]

+

+	[Serializable]

+	public abstract class SecurityAttribute : Attribute {

+

+		private SecurityAction m_Action;

+		private bool m_Unrestricted;

+

+		public SecurityAttribute(SecurityAction action) {

+			if (!SecurityAction.IsDefined(typeof(SecurityAction), action)) {

+				throw new System.ArgumentException();

+			}

+		}

+

+		public abstract IPermission CreatePermission();

+

+		public bool Unrestricted {

+			get {

+				return m_Unrestricted;

+			}

+			set {

+				m_Unrestricted = value;

+			}

+		}

+

+		public SecurityAction Action {

+			get {

+				return m_Action;

+			}

+			set {

+				m_Action = value;

+			}

+		}

+	} // public abstract class SecurityAttribute

+}  // namespace System.Security.Permissions

diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs
new file mode 100644
index 00000000000..9a6a32ab25f
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermission.cs
@@ -0,0 +1,66 @@
+//

+// System.Security.Permissions.SecurityPermission.cs

+//

+// Author:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+// Stubbed.

+//

+

+using System;

+using System.Security.Permissions;

+

+namespace System.Security.Permissions {

+	

+	[MonoTODO]

+	[Serializable]

+	public sealed class SecurityPermission :

+		CodeAccessPermission, IUnrestrictedPermission

+	{

+		public SecurityPermission (PermissionState state) {

+			this.flags = SecurityPermissionFlag.NoFlags;

+		}

+

+		public SecurityPermission (SecurityPermissionFlag flags) {

+			this.flags = flags;

+		}

+

+		public SecurityPermissionFlag Flags {

+			get { return flags; }

+			set { flags = value; }

+		}

+

+		public bool IsUnrestricted () {

+			return false;

+		}

+

+		public override IPermission Copy () {

+			return null;

+		}

+

+		public override IPermission Intersect (IPermission target) {

+			return null;

+		}

+

+		public override IPermission Union (IPermission target) {

+			return null;

+		}

+

+		public override bool IsSubsetOf (IPermission target) {

+			return false;

+		}

+

+		public override void FromXml (SecurityElement e) {

+		}

+

+		public override SecurityElement ToXml () {

+			return null;

+		}

+

+		// private 

+		

+		private SecurityPermissionFlag flags;

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs
new file mode 100644
index 00000000000..868b199f267
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionAttribute.cs
@@ -0,0 +1,216 @@
+//------------------------------------------------------------------------------

+// 

+// System.Security.Permissions.SecurityPermissionAttribute.cs 

+//

+// Copyright (C) 2001 Nick Drochak, All Rights Reserved

+// 

+// Author:         Nick Drochak, ndrochak@gol.com

+// Created:        2002-01-06 

+//

+//------------------------------------------------------------------------------

+

+using System;

+using System.Security;

+using System.Security.Permissions;

+

+namespace System.Security.Permissions {

+	[System.AttributeUsage(

+		System.AttributeTargets.Assembly

+		| System.AttributeTargets.Class 

+		| System.AttributeTargets.Struct 

+		| System.AttributeTargets.Constructor 

+		| System.AttributeTargets.Method, 

+		AllowMultiple=true, 

+		Inherited=false)

+	]

+	public sealed class SecurityPermissionAttribute : CodeAccessSecurityAttribute {

+		private SecurityPermissionFlag m_Flags = SecurityPermissionFlag.NoFlags;

+

+		public SecurityPermissionAttribute(SecurityAction action) : base(action) {

+			if (!SecurityAction.IsDefined(typeof(SecurityAction), action)) {

+				throw new System.ArgumentException(); 

+			}

+		}

+

+		public bool Assertion {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.Assertion) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.Assertion;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.Assertion;

+				}

+			}

+		}

+

+		public bool ControlAppDomain {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.ControlAppDomain) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.ControlAppDomain;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.ControlAppDomain;

+				}

+			}

+		}

+

+		public bool ControlDomainPolicy {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.ControlDomainPolicy) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.ControlDomainPolicy;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.ControlDomainPolicy;

+				}

+			}

+		}

+

+		public bool ControlEvidence {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.ControlEvidence) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.ControlEvidence;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.ControlEvidence;

+				}

+			}

+		}

+		

+		public bool ControlPolicy {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.ControlPolicy) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.ControlPolicy;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.ControlPolicy;

+				}

+			}

+		}

+		

+		public bool ControlPrincipal {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.ControlPrincipal) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.ControlPrincipal;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.ControlPrincipal;

+				}

+			}

+		}

+

+		public bool ControlThread {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.ControlThread) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.ControlThread;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.ControlThread;

+				}

+			}

+		}

+

+		public bool Execution {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.Execution) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.Execution;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.Execution;

+				}

+			}

+		}

+

+		public bool Infrastructure {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.Infrastructure) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.Infrastructure;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.Infrastructure;

+				}

+			}

+		}

+

+		public bool RemotingConfiguration {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.RemotingConfiguration) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.RemotingConfiguration;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.RemotingConfiguration;

+				}

+			}

+		}

+		

+		public bool SerializationFormatter {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.SerializationFormatter) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.SerializationFormatter;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.SerializationFormatter;

+				}

+			}

+		}

+		

+		public bool SkipVerification {

+			get{

+				return ((m_Flags & SecurityPermissionFlag.SkipVerification) != 0);

+			}

+			set{

+				if (value){

+					m_Flags |= SecurityPermissionFlag.SkipVerification;

+				}

+				else{

+					m_Flags -= SecurityPermissionFlag.SkipVerification;

+				}

+			}

+		}

+

+		public override IPermission CreatePermission() {

+			return new SecurityPermission(m_Flags);

+		}

+

+		public SecurityPermissionFlag Flags {

+			get {

+				return m_Flags;

+			}

+			set {

+				m_Flags = value;

+			}

+		}

+	}  // public sealed class SecurityPermissionAttribute 

+}  // namespace System.Security.Permissions

diff --git a/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
new file mode 100755
index 00000000000..dbd51caecfe
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/SecurityPermissionFlag.cs
@@ -0,0 +1,68 @@
+// SecurityPermissionFlag.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:30:18 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Security.Permissions {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum SecurityPermissionFlag {
+
+		/// <summary>
+		/// </summary>
+		NoFlags = 0x00000000,
+
+		/// <summary>
+		/// </summary>
+		Assertion = 0x00000001,
+
+		/// <summary>
+		/// </summary>
+		UnmanagedCode = 0x00000002,
+
+		/// <summary>
+		/// </summary>
+		SkipVerification = 0x00000004,
+
+		/// <summary>
+		/// </summary>
+		Execution = 0x00000008,
+
+		/// <summary>
+		/// </summary>
+		ControlThread = 0x00000010,
+
+		ControlEvidence = 0x00000020,
+
+		ControlPolicy = 0x00000040,
+
+		SerializationFormatter = 0x00000080,
+
+		ControlDomainPolicy = 0x00000100,
+
+		ControlPrincipal = 0x00000200,
+
+		ControlAppDomain = 0x00000400,
+
+		RemotingConfiguration = 0x00000800,
+
+		Infrastructure = 0x00001000,
+
+		/// <summary>
+		/// </summary>
+		AllFlags = Assertion | UnmanagedCode | SkipVerification | Execution | ControlThread
+			| ControlAppDomain | ControlDomainPolicy | ControlEvidence | ControlPolicy
+			| ControlPrincipal | Infrastructure | RemotingConfiguration | SerializationFormatter,
+	} // SecurityPermissionFlag
+
+} // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermissionAttribute.cs
new file mode 100644
index 00000000000..d5bbbe06e42
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/SiteIdentityPermissionAttribute.cs
@@ -0,0 +1,43 @@
+//
+// System.Security.Permissions.SiteIdentityPermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc.			http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class SiteIdentityPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private string site;
+		
+		// Constructor
+		public SiteIdentityPermissionAttribute (SecurityAction action)
+			: base (action)
+		{
+		}
+		
+		// Properties
+		public string Site
+		{
+			get { return site; }
+			set { site = value; }
+		}
+		
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			return null;
+		}
+	   }
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs
new file mode 100644
index 00000000000..6fa4d197bf9
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/StrongNamePermissionAttribute.cs
@@ -0,0 +1,56 @@
+//
+// System.Security.Permissions.StrongNameIdentityPermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc.			http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class StrongNameIdentityPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private string name;
+		private string key;
+		private string version;
+		
+		// Constructor
+		public StrongNameIdentityPermissionAttribute (SecurityAction action) : base (action) {}
+		
+		// Properties
+		public string Name
+		{
+			get { return name; }
+			set { name = value; }
+		}
+
+		public string PublicKey
+		{
+			get { return key; }
+			set { key = value; }
+		}
+
+		public string Version
+		{
+			get { return version; }
+			set { version = value; }
+		}
+			 
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		 {
+			 return null;
+		 }
+	}
+	
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs
new file mode 100644
index 00000000000..6b998eea3b5
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/UIPermissionAttribute.cs
@@ -0,0 +1,48 @@
+//
+// System.Security.Permissions.UIPermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc.			http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class UIPermissionAttribute : CodeAccessSecurityAttribute
+	{
+
+		// Fields
+		private UIPermissionClipboard clipboard;
+		private UIPermissionWindow window;
+		
+		// Constructor
+		public UIPermissionAttribute (SecurityAction action) : base (action) {}
+		
+		// Properties
+		public UIPermissionClipboard Clipboard
+		{
+			get { return clipboard; }
+			set { clipboard = value; }
+		}
+
+		public UIPermissionWindow Window
+		{
+			get { return window; }
+			set { window = value; }
+		}
+
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/UIPermissionClipboard.cs b/mcs/class/corlib/System.Security.Permissions/UIPermissionClipboard.cs
new file mode 100755
index 00000000000..6ae9a795dc0
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/UIPermissionClipboard.cs
@@ -0,0 +1,33 @@
+// UIPermissionClipboard.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:42:40 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Security.Permissions {
+
+
+	/// <summary>
+	/// </summary>
+	public enum UIPermissionClipboard {
+
+		/// <summary>
+		/// </summary>
+		NoClipboard = 0,
+
+		/// <summary>
+		/// </summary>
+		OwnClipboard = 1,
+
+		/// <summary>
+		/// </summary>
+		AllClipboard = 2,
+	} // UIPermissionClipboard
+
+} // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Permissions/UIPermissionWindow.cs b/mcs/class/corlib/System.Security.Permissions/UIPermissionWindow.cs
new file mode 100755
index 00000000000..4d65080e744
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/UIPermissionWindow.cs
@@ -0,0 +1,37 @@
+// UIPermissionWindow.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:42:30 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Security.Permissions {
+
+
+	/// <summary>
+	/// </summary>
+	public enum UIPermissionWindow {
+
+		/// <summary>
+		/// </summary>
+		NoWindows = 0,
+
+		/// <summary>
+		/// </summary>
+		SafeSubWindows = 1,
+
+		/// <summary>
+		/// </summary>
+		SafeTopLevelWindows = 2,
+
+		/// <summary>
+		/// </summary>
+		AllWindows = 3,
+	} // UIPermissionWindow
+
+} // System.Security.Permissions
diff --git a/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermissionAttribute.cs
new file mode 100644
index 00000000000..29f4006cdc3
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/UrlIdentityPermissionAttribute.cs
@@ -0,0 +1,40 @@
+//
+// System.Security.Permissions.UrlIdentityPermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class UrlIdentityPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private string url;
+		
+		// Constructor
+		public UrlIdentityPermissionAttribute (SecurityAction action) : base (action) {}
+		
+		// Properties
+		public string Url
+		{
+			get { return url; }
+			set { url = value; }
+		}
+		
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs b/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs
new file mode 100644
index 00000000000..d92409f1fee
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermission.cs
@@ -0,0 +1,119 @@
+//
+// System.Security.Permissions.ZoneIdentityPermission
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Security;
+
+namespace System.Security.Permissions
+{
+	public sealed class ZoneIdentityPermission : CodeAccessPermission
+	{
+		SecurityZone zone;
+
+		public ZoneIdentityPermission (PermissionState state)
+		{
+			if (state == PermissionState.Unrestricted)
+				throw new ArgumentException ("unrestricted not allowed");
+
+			if (state != PermissionState.None)
+				throw new ArgumentException ("invalid state");
+
+			zone = SecurityZone.NoZone;
+		}
+
+		public ZoneIdentityPermission (SecurityZone zone)
+		{
+			this.zone = zone;
+		}
+
+		public override IPermission Copy ()
+		{
+			return new ZoneIdentityPermission (zone);
+		}
+
+		public override bool IsSubsetOf (IPermission target)
+		{
+			if (target == null)
+				return zone == SecurityZone.NoZone;
+
+			if (!(target is ZoneIdentityPermission))
+				throw new ArgumentException ();
+
+			return zone != ((ZoneIdentityPermission) target).zone;
+		}
+
+		public override IPermission Union (IPermission target)
+		{
+			if (target == null)
+				return (zone == SecurityZone.NoZone) ? null : Copy ();
+
+			if (!(target is ZoneIdentityPermission))
+				throw new ArgumentException ();
+
+			ZoneIdentityPermission se = (ZoneIdentityPermission) target;
+			if (zone == se.zone || se.zone == SecurityZone.NoZone)
+				return Copy ();
+
+			if (zone == SecurityZone.NoZone)
+				return se.Copy ();
+
+			return null;
+		}
+
+		public override IPermission Intersect (IPermission target)
+		{
+			if (target == null || zone == SecurityZone.NoZone)
+				return null;
+
+			if (!(target is ZoneIdentityPermission))
+				throw new ArgumentException ();
+
+			if (zone == ((ZoneIdentityPermission) target).zone)
+				return Copy ();
+
+			return null;
+		}
+
+		public override void FromXml (SecurityElement esd)
+		{
+			if (esd == null)
+				throw new ArgumentException ("esd is null");
+
+			if (esd.Attribute ("version") != "1")
+				throw new ArgumentException ("version attributte is wrong");
+				
+			string zoneName = esd.Attribute ("Zone");
+			zone = (SecurityZone) Enum.Parse (typeof (SecurityZone), zoneName);
+		}
+
+		public override SecurityElement ToXml ()
+		{
+			SecurityElement se = new SecurityElement ("IPermission");
+			se.AddAttribute ("version", "1");
+			Type t = GetType ();
+			se.AddAttribute("class", t.FullName + ", " + t.Module.Assembly.FullName);
+
+			return se;
+		}
+
+		public SecurityZone SecurityZone
+		{
+			get {
+				return zone;
+			}
+
+			set {
+				if (!Enum.IsDefined (typeof (SecurityZone), value))
+					throw new ArgumentException ("invalid zone");
+				zone = value;
+			}
+		}
+	}
+
+}
+
diff --git a/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermissionAttribute.cs b/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermissionAttribute.cs
new file mode 100644
index 00000000000..48b97970ac2
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Permissions/ZoneIdentityPermissionAttribute.cs
@@ -0,0 +1,40 @@
+//
+// System.Security.Permissions.ZoneIdentityPermissionAttribute.cs
+//
+// Duncan Mak <duncan@ximian.com>
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Security.Permissions;
+
+namespace System.Security.Permissions
+{
+	[AttributeUsage (AttributeTargets.Assembly | AttributeTargets.Class |
+			 AttributeTargets.Struct | AttributeTargets.Constructor |
+			 AttributeTargets.Method)]
+	[Serializable]
+	public sealed class ZoneIdentityPermissionAttribute : CodeAccessSecurityAttribute
+	{
+		// Fields
+		private SecurityZone zone;
+		
+		// Constructor
+		public ZoneIdentityPermissionAttribute (SecurityAction action) : base (action) {}
+		
+		// Properties
+		public SecurityZone Zone
+		{
+			get { return zone; }
+			set { zone = value; }
+		}
+		
+		// Methods
+		[MonoTODO]
+		public override IPermission CreatePermission ()
+		{
+			return null;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Policy/AllMembershipCondition.cs b/mcs/class/corlib/System.Security.Policy/AllMembershipCondition.cs
new file mode 100755
index 00000000000..858ef857c00
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/AllMembershipCondition.cs
@@ -0,0 +1,86 @@
+//
+// System.Security.Policy.AllMembershipCondition.cs
+//
+// Author:
+//   Ajay kumar Dwivedi (adwiv@yahoo.com)
+//
+
+using System;
+using System.Security;
+
+
+namespace System.Security.Policy
+{
+	/// <summary>
+	/// Summary description for AllMembershipCondition.
+	/// </summary>
+	[Serializable]
+	public sealed class AllMembershipCondition : IMembershipCondition,
+		ISecurityEncodable, ISecurityPolicyEncodable
+	{
+		// Tag for Xml Data
+		private static readonly string XmlTag = "IMembershipCondition";
+
+		public AllMembershipCondition()
+		{}
+
+		//Always returns true
+		public bool Check(Evidence evidence)
+		{
+			return true;
+		}
+
+		public IMembershipCondition Copy()
+		{
+			return new AllMembershipCondition();
+		}
+
+		public override bool Equals(object o)
+		{
+			if(o is System.Security.Policy.AllMembershipCondition)
+				return true;
+			return false;
+		}
+ 
+		public void FromXml(SecurityElement e)
+		{
+			FromXml(e, null);
+		}
+
+		//Fixme: is there a need for all this????
+		public void FromXml(SecurityElement e, PolicyLevel level)
+		{
+			if(e == null)
+				throw new ArgumentNullException("e");
+			if(e.Tag != XmlTag)
+				throw new ArgumentException("e","The Tag of SecurityElement must be "
+					+ AllMembershipCondition.XmlTag);
+		}
+
+		//What's the use of a hashcode here. Equals is always true.
+		public override int GetHashCode()
+		{
+			return 0;
+		}
+
+		public override string ToString()
+		{
+			return "All Code";
+		}
+
+		public SecurityElement ToXml()
+		{
+			return ToXml(null);
+		}
+
+		public SecurityElement ToXml(PolicyLevel level)
+		{
+			SecurityElement se = new SecurityElement(XmlTag);
+			Type type = this.GetType();
+			string classString = type.FullName + ", " + type.Assembly;
+			se.AddAttribute("class",classString);
+			se.AddAttribute("version","1");
+			return se;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Policy/ApplicationDirectoryMembershipCondition.cs b/mcs/class/corlib/System.Security.Policy/ApplicationDirectoryMembershipCondition.cs
new file mode 100644
index 00000000000..0bae803ce0e
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/ApplicationDirectoryMembershipCondition.cs
@@ -0,0 +1,66 @@
+// System.Security.Policy.ApplicationDirectoryMembershipCondition

+//

+// Author(s):

+//   Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2002 Nick Drochak, All rights reserved.

+

+using System.Security;

+

+namespace System.Security.Policy

+{

+

+	// FIXME: This class is mostly just method stubs.

+

+	[Serializable]

+	public sealed class ApplicationDirectoryMembershipCondition :

+		IMembershipCondition, 

+		ISecurityEncodable, 

+		ISecurityPolicyEncodable

+	{

+		// Methods

+		[MonoTODO]

+		public bool Check(Evidence evidence) { 

+			throw new NotImplementedException (); 

+		}

+

+		[MonoTODO]

+		public IMembershipCondition Copy() { 

+			throw new NotImplementedException (); 

+		}

+		

+		public override bool Equals(object o) { 

+			return o is ApplicationDirectoryMembershipCondition; 

+		}

+		

+		[MonoTODO]

+		public void FromXml(SecurityElement e) { 

+			throw new NotImplementedException (); 

+		}

+		

+		[MonoTODO]

+		public void FromXml(SecurityElement e, PolicyLevel level) { 

+			throw new NotImplementedException (); 

+		}

+		

+		[MonoTODO]

+		public override int GetHashCode() { 

+			throw new NotImplementedException (); 

+		}

+		

+		[MonoTODO]

+		public override string ToString() { 

+			throw new NotImplementedException (); 

+		}

+		

+		[MonoTODO]

+		public SecurityElement ToXml() { 

+			throw new NotImplementedException (); 

+		}

+		

+		[MonoTODO]

+		public SecurityElement ToXml(PolicyLevel level) { 

+			throw new NotImplementedException (); 

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/class/corlib/System.Security.Policy/ChangeLog b/mcs/class/corlib/System.Security.Policy/ChangeLog
new file mode 100644
index 00000000000..3e70e836b50
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/ChangeLog
@@ -0,0 +1,69 @@
+2002-08-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IBuiltInEvidence.cs: New file.
+	* Zone.cs: New file. Implemented.
+
+2002-06-10  Duncan Mak  <duncan@ximian.com>
+
+	* IMembershipCondition.cs (Equals): Add missing methods.
+
+2002-03-17  Nick Drochak  <ndrochak@gol.com>
+
+	* ApplicationDirectoryMembershipCondition.cs: New file (stub)
+
+2002-02-14  Nick Drochak  <ndrochak@gol.com>
+
+	* FileCodeGroup.cs: Finish Equals()
+
+2002-02-13  Dan Lewis	<dihlewis@yahoo.co.uk>
+
+	* PolicyStatement: New file (stub)
+
+2002-02-09  Nick Drochak  <ndrochak@gol.com>
+
+	* FileCodeGroup.cs: New file. All done except for GetHashCode and 
+	Resolve.
+	* CodeGroup.cs: Fix small bug in ToXml()
+	* Evidence.cs: Added method stub needed by FileCodeGroup.cs.  Added 
+	MonoTODO's too.
+
+2002-02-07  Nick Drochak  <ndrochak@gol.com>
+
+	* CodeGroup.cs: Went as far as I can for now.  Need to look at
+	the (To|From)XML methods when I understand PolicyLevels better.
+
+2002-02-02  Nick Drochak  <ndrochak@gol.com>
+
+	* CodeGroup.cs: Not done, but checking in now just in case
+
+2002-01-30  Nick Drochak  <ndrochak@gol.com>
+
+	* CodeGroup.cs: New file.  Not nearly done with this, but saving it
+	in cvs just in case.
+	* PolicyLevel.cs: Sarted just a bit on this then relized i need CodeGroup
+	first (among others).  Checking in for disaster recovery.
+
+2002-01-29  Nick Drochak  <ndrochak@gol.com>
+
+	* PolicyStatementAttribute.cs: New file.
+	* PolicyException.cs: Use correct namespace
+	* PolicyLevel.cs: Add [Serializable] to class
+
+2002-01-19  Duncan Mak  <duncan@ximian.com>
+
+	* PolicyException.cs: New File.
+
+2002-01-03  Nick Drochak  <ndrochak@gol.com>
+
+	* IIdentityPermissionFactory.cs: New File
+	* IMembershipCondition: New File
+
+2001-12-29  Nick Drochak  <ndrochak@gol.com>
+
+	* PolicyLevel.cs: New file
+
+2001-12-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* SecurityElement.cs, CodeAccessPermission.cs IPermission.cs
+	IStackWalk.cs SecurityElement.cs ISecurityEncodable.cs: New files.
+	
diff --git a/mcs/class/corlib/System.Security.Policy/CodeGroup.cs b/mcs/class/corlib/System.Security.Policy/CodeGroup.cs
new file mode 100644
index 00000000000..f2103476096
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/CodeGroup.cs
@@ -0,0 +1,252 @@
+// System.Security.Policy.CodeGroup
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001 Nick Drochak, All rights reserved.
+
+using System.Security.Policy;
+using System.Security.Permissions;

+using System.Collections;
+using System;  // for MonoTODO attribute
+
+namespace System.Security.Policy
+{
+	[Serializable]
+	public abstract class CodeGroup
+	{
+		PolicyStatement m_policy = null;
+		IMembershipCondition m_membershipCondition = null;
+		string m_description = null;
+		string m_name = null;
+		ArrayList m_children = new ArrayList();
+		PolicyLevel m_level;
+
+		public CodeGroup(IMembershipCondition membershipCondition,
+					PolicyStatement policy)
+		{
+			if (null == membershipCondition)
+				throw new ArgumentNullException("Value cannot be null.");
+			m_policy = policy;
+			m_membershipCondition = membershipCondition;
+		}
+
+		public abstract CodeGroup Copy();
+		public abstract string MergeLogic {get;}
+		public abstract PolicyStatement Resolve(	Evidence evidence);
+		public abstract CodeGroup ResolveMatchingCodeGroups(Evidence evidence);
+
+		public PolicyStatement PolicyStatement
+		{
+			get
+			{
+				return m_policy;
+			}
+			set
+			{
+				m_policy = value;
+			}
+		}
+
+		public string Description
+		{
+			get
+			{
+				return m_description;
+			}
+			set
+			{
+				m_description = value;
+			}
+		}
+
+		public IMembershipCondition MembershipCondition 
+		{
+			get
+			{
+				return m_membershipCondition;
+			}
+			set
+			{
+				if (null == value)
+					throw new ArgumentException("Value cannot be null");
+				m_membershipCondition = value;
+			}
+		}
+
+		public string Name 
+		{
+			get
+			{
+				return m_name;
+			}
+			set
+			{
+				m_name = value;
+			}
+		}
+
+		public IList Children
+		{
+			get
+			{
+				return m_children;
+			}
+			set
+			{
+				if (null == value)
+					throw new ArgumentException("Value cannot be null");
+				m_children = new ArrayList(value);
+			}
+		}
+
+		public virtual string AttributeString
+		{
+			get
+			{
+				if (null != m_policy)
+					return m_policy.AttributeString;
+
+				return null;
+			}
+		}
+
+		public virtual string PermissionSetName
+		{
+			get
+			{
+				if (m_policy.PermissionSet is Security.NamedPermissionSet)
+					return ((NamedPermissionSet)(m_policy.PermissionSet)).Name;
+
+				return null;
+			}
+		}
+
+		public void AddChild(CodeGroup group)
+		{
+			if (null == group)
+				throw new ArgumentNullException("The group parameter cannot be null");
+			m_children.Add(group);
+		}
+
+		public override bool Equals(object o)
+		{
+			if (!(o is CodeGroup))
+				return false;
+
+			return Equals((CodeGroup)o, false);
+		}
+
+		public bool Equals(CodeGroup cg, bool compareChildren)
+		{
+			if (cg.Name != this.Name)
+				return false;
+
+			if (cg.Description != this.Description)
+				return false;
+
+			if (cg.MembershipCondition != this.MembershipCondition)
+				return false;
+
+			if (compareChildren)
+			{
+				int childCount = cg.Children.Count;
+				if (this.Children.Count != childCount)
+					return false;
+
+				for (int index = 0; index < childCount; index++)
+				{
+					// LAMESPEC: are we supposed to check child equality recursively?
+					//		The docs imply 'no' but it seems natural to do a 'deep' compare.
+					//		Will check the children's children, and so-on unless we find out that
+					//		we shouldn't
+					if (!((CodeGroup)(this.Children[index])).Equals((CodeGroup)(cg.Children[index]), true))
+						return false;
+				}
+			}
+
+			return true;
+
+		}
+
+		public void RemoveChild(CodeGroup group)
+		{
+			if (!m_children.Contains(group))
+				throw new ArgumentException();
+
+			m_children.Remove(group);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode()
+		{
+			return 42;
+		}
+
+		public void FromXml(SecurityElement e)
+		{
+			FromXml(e, (PolicyLevel)null);
+		}
+
+		[MonoTODO]
+		public void FromXml(SecurityElement e, PolicyLevel level	)
+		{
+			if (null == e)
+				throw new ArgumentNullException("e");
+
+			// Not sure what might be serialized in this XML, so just do the strings for now
+			// and null's for everything else
+			m_children = null;
+			m_policy = null;
+			m_membershipCondition = null;
+
+			m_name = e.Attribute("Name");
+			m_description = e.Attribute("Description");
+
+			// seems like we might need this to Resolve() in subclasses
+			m_level = level;
+
+			ParseXml(e, level);
+		}
+
+		protected virtual void ParseXml(SecurityElement e, PolicyLevel level)
+		{
+		}
+		
+		public SecurityElement ToXml()
+		{
+			return ToXml(null);
+		}
+
+		[MonoTODO("Not sure what to do with PolicyLevel parameter")]
+		 public SecurityElement ToXml(PolicyLevel level)

+		{
+			SecurityElement e = new SecurityElement("CodeGroup");
+			e.AddAttribute("class", this.GetType().AssemblyQualifiedName);
+			e.AddAttribute("version", "1");
+
+			if (null != Name)
+				e.AddAttribute("Name", Name);
+
+			if (null != Description)
+				e.AddAttribute("Description", Description);
+
+			if (null != MembershipCondition)
+				e.AddChild(MembershipCondition.ToXml());
+
+			if (null != PolicyStatement)
+				e.AddChild(PolicyStatement.PermissionSet.ToXml());
+
+			foreach (CodeGroup child in Children)
+				e.AddChild(child.ToXml());
+
+			CreateXml(e, level);
+			return e;
+		}
+		
+		protected virtual void CreateXml(SecurityElement element, PolicyLevel level)
+		{
+		}
+	}  // public abstract class CodeGroup
+
+}  // namespace System.Security.Policy
\ No newline at end of file
diff --git a/mcs/class/corlib/System.Security.Policy/Evidence.cs b/mcs/class/corlib/System.Security.Policy/Evidence.cs
new file mode 100644
index 00000000000..701d1d4344d
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/Evidence.cs
@@ -0,0 +1,27 @@
+// System.Security.Policy.Evidence
+//
+// Authors:
+//  Sean MacIsaac (macisaac@ximian.com)
+//  Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001 Ximian, Inc.
+
+using System.Collections;
+
+namespace System.Security.Policy
+{
+	[MonoTODO]
+	[Serializable]
+	public sealed class Evidence
+	{
+		
+		[MonoTODO]
+		public Evidence () {
+		}
+
+		[MonoTODO]
+		public IEnumerator GetHostEnumerator() {
+			throw new NotImplementedException();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Policy/FileCodeGroup.cs b/mcs/class/corlib/System.Security.Policy/FileCodeGroup.cs
new file mode 100644
index 00000000000..debd7d3543a
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/FileCodeGroup.cs
@@ -0,0 +1,135 @@
+// System.Security.Policy.FileCodeGroup
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001 Nick Drochak, All rights reserved.
+
+using System.Security.Policy;
+using System.Security.Permissions;

+using System.Collections;
+using System;  // for MonoTODO attribute
+
+namespace System.Security.Policy
+{
+	[Serializable]
+	public sealed class FileCodeGroup : CodeGroup
+	{
+		FileIOPermissionAccess m_access;
+
+		[MonoTODO("Check if membershipCondition is valid")]
+		public FileCodeGroup(IMembershipCondition membershipCondition,
+					FileIOPermissionAccess access) 
+			: base(membershipCondition, null)
+		{
+			if (!Enum.IsDefined(typeof(FileIOPermissionAccess), access))
+				throw new ArgumentException("Value not defined for FileIOPermissionAccess","access");
+			
+			m_access = access;
+		}
+
+		public override CodeGroup Copy()
+		{
+			FileCodeGroup copy = new FileCodeGroup(MembershipCondition, m_access);
+			foreach (CodeGroup child in Children)
+			{
+				AddChild(child.Copy());
+			}
+
+			return copy;
+		}
+		
+		public override string MergeLogic
+		{
+			get
+			{
+				return "Union";
+			}
+		}
+
+		[MonoTODO]
+		public override PolicyStatement Resolve(	Evidence evidence)
+		{
+			if (null == evidence)
+				throw new ArgumentNullException("evidence");
+
+			if (null == PolicyStatement)
+				throw new PolicyException();
+
+			if (!MembershipCondition.Check(evidence))
+				return null;
+
+			IEnumerator hostEnumerator = evidence.GetHostEnumerator();
+			while (hostEnumerator.MoveNext())
+			{
+				// FIXME: not sure what to do here
+				//  How do we check the URL and make a PolicyStatement?
+			}
+			throw new NotImplementedException();
+		}
+
+		public override CodeGroup ResolveMatchingCodeGroups(Evidence evidence)
+		{
+			if (null == evidence)
+				throw new ArgumentNullException("evidence");
+
+			if (!MembershipCondition.Check(evidence))
+				return null;
+
+			FileCodeGroup matchRoot = new FileCodeGroup(MembershipCondition, m_access);
+
+			foreach (CodeGroup child in Children)
+			{
+				CodeGroup childMatchingCodeGroup = child.ResolveMatchingCodeGroups(evidence);
+				if (childMatchingCodeGroup != null)
+					AddChild(childMatchingCodeGroup);
+			}
+
+			return matchRoot;
+		}
+
+		public override string AttributeString
+		{
+			get
+			{
+				return null;
+			}
+		}
+
+		public override string PermissionSetName
+		{
+			get
+			{
+				return "Same directory FileIO - " + m_access.ToString();
+			}
+		}
+
+		public override bool Equals(object o)
+		{
+			if (!(o is FileCodeGroup))
+				return false;
+
+			if (this.m_access != ((FileCodeGroup)o).m_access)
+				return false;
+
+			return Equals((CodeGroup)o, false);
+		}
+
+		[MonoTODO]
+		public override int GetHashCode()
+		{
+			throw new NotImplementedException();
+		}
+
+		protected override void ParseXml(SecurityElement e, PolicyLevel level)
+		{
+			m_access = (FileIOPermissionAccess)Enum.Parse(typeof(FileIOPermissionAccess), e.Attribute("Access"), true);
+		}
+		
+		protected override void CreateXml(SecurityElement element, PolicyLevel level)
+		{
+			element.AddAttribute("Access", m_access.ToString());
+		}
+	}  // public abstract class CodeGroup
+
+}  // namespace System.Security.Policy
\ No newline at end of file
diff --git a/mcs/class/corlib/System.Security.Policy/IBuiltInEvidence.cs b/mcs/class/corlib/System.Security.Policy/IBuiltInEvidence.cs
new file mode 100644
index 00000000000..98a2f97d262
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/IBuiltInEvidence.cs
@@ -0,0 +1,20 @@
+//
+// System.Security.Policy.IBuiltInEvidence
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+
+namespace System.Security.Policy
+{
+	interface IBuiltInEvidence
+	{
+		int GetRequiredSize (bool verbose);
+		int InitFromBuffer (char [] buffer, int position);
+		int OutputToBuffer (char [] buffer, int position, bool verbose);
+	}
+}
+
diff --git a/mcs/class/corlib/System.Security.Policy/IIdentityPermissionFactory.cs b/mcs/class/corlib/System.Security.Policy/IIdentityPermissionFactory.cs
new file mode 100644
index 00000000000..5b82d9d934a
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/IIdentityPermissionFactory.cs
@@ -0,0 +1,13 @@
+// System.Security.Policy.IIdentityPermissionFactory

+//

+// Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak

+

+namespace System.Security.Policy

+{

+	public interface IIdentityPermissionFactory

+	{

+		IPermission CreateIdentityPermission(Evidence evidence);

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Policy/IMembershipCondition.cs b/mcs/class/corlib/System.Security.Policy/IMembershipCondition.cs
new file mode 100644
index 00000000000..64eb3eba352
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/IMembershipCondition.cs
@@ -0,0 +1,17 @@
+// System.Security.Policy.IMembershipCondition.cs

+//

+// Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak

+

+namespace System.Security.Policy

+{

+	public interface IMembershipCondition : ISecurityEncodable, ISecurityPolicyEncodable

+		{

+			bool Check (Evidence evidence);

+			IMembershipCondition Copy ();

+			bool Equals (object obj);

+			string ToString ();

+		}

+}

+

diff --git a/mcs/class/corlib/System.Security.Policy/PolicyException.cs b/mcs/class/corlib/System.Security.Policy/PolicyException.cs
new file mode 100644
index 00000000000..3fc12347231
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/PolicyException.cs
@@ -0,0 +1,42 @@
+//	
+// System.PolicyException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System.Security.Policy
+{
+	   [Serializable]
+	   public class PolicyException : SystemException
+	   {
+			 // Constructors
+			 public PolicyException ()
+				    : base (Locale.GetText ("Cannot run because of policy."))
+			 {
+			 }
+
+			 public PolicyException (string message)
+				    : base (message)
+			 {
+			 }
+			 
+			 protected PolicyException (SerializationInfo info,
+				    StreamingContext context)
+				    : base (info, context)
+			 {
+			 }
+
+			 public PolicyException (string message, Exception innerException)
+				    :base (message, innerException)
+			 {
+			 }
+				    
+	   }
+}
diff --git a/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs b/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs
new file mode 100644
index 00000000000..215b42c23b4
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/PolicyLevel.cs
@@ -0,0 +1,62 @@
+// System.Security.Policy.PolicyLevel
+//
+// Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001 Nick Drochak
+
+using System.Collections; // for IList
+
+namespace System.Security.Policy
+{
+	[MonoTODO]
+	[Serializable]
+	public sealed class PolicyLevel
+	{
+		internal PolicyLevel () {}
+
+		public IList FullTrustAssemblies
+		{
+			get
+			{
+				return (IList)null;
+			}
+		}
+
+		public string Label
+		{
+			get 
+			{
+				return "";
+			}
+		}
+
+		public IList NamedPermissionSets
+		{
+			get
+			{
+				return (IList)null;
+			}
+		}
+
+		public CodeGroup RootCodeGroup
+		{
+			get
+			{
+				return (CodeGroup)null;
+			}
+			
+			set
+			{
+				
+			}
+		}
+
+		public string StoreLocation
+		{
+			get
+			{
+				return "";
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Policy/PolicyStatement.cs b/mcs/class/corlib/System.Security.Policy/PolicyStatement.cs
new file mode 100644
index 00000000000..95a37d39b56
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/PolicyStatement.cs
@@ -0,0 +1,61 @@
+//

+// System.Security.Policy.PolicyStatement

+//

+// Author:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+

+namespace System.Security.Policy {

+

+	[Serializable]

+	public sealed class PolicyStatement : ISecurityEncodable, ISecurityPolicyEncodable {

+		public PolicyStatement (PermissionSet perms) :

+			this (perms, PolicyStatementAttribute.Nothing)

+		{

+		}

+

+		public PolicyStatement (PermissionSet perms, PolicyStatementAttribute attrs) {

+			this.perms = perms;

+			this.attrs = attrs;

+		}

+		

+		public PermissionSet PermissionSet {

+			get { return perms; }

+			set { perms = value; }

+		}

+		

+		public PolicyStatementAttribute Attributes {

+			get { return attrs; }

+			set { attrs = value; }

+		}

+

+		public string AttributeString {

+			get { return attrs.ToString ("F"); }

+		}

+

+		// ISecurityEncodable

+

+		[MonoTODO]

+		public void FromXml (SecurityElement e) {

+		}

+

+		[MonoTODO]

+		public void FromXml (SecurityElement e, PolicyLevel level) {

+		}

+		

+		[MonoTODO]

+		public SecurityElement ToXml () {

+			return null;

+		}

+

+		[MonoTODO]

+		public SecurityElement ToXml (PolicyLevel level) {

+			return null;

+		}

+

+		private PermissionSet perms;

+		private PolicyStatementAttribute attrs;

+	}

+}

diff --git a/mcs/class/corlib/System.Security.Policy/PolicyStatementAttribute.cs b/mcs/class/corlib/System.Security.Policy/PolicyStatementAttribute.cs
new file mode 100644
index 00000000000..be194224be9
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/PolicyStatementAttribute.cs
@@ -0,0 +1,17 @@
+// System.Security.Policy.PolicyStatementAttribute
+//
+// Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001 Nick Drochak
+
+namespace System.Security.Policy
+{
+	[Flags]
+	[Serializable]
+	public enum PolicyStatementAttribute	{
+		Nothing = 0,
+		Exclusive = 1,
+		LevelFinal = 2,
+		All = 3
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Policy/Zone.cs b/mcs/class/corlib/System.Security.Policy/Zone.cs
new file mode 100644
index 00000000000..7c62fd992c9
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Policy/Zone.cs
@@ -0,0 +1,90 @@
+//
+// System.Security.Policy.Zone
+//
+// Authors:
+//	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc (http://www.ximian.com)
+//
+using System;
+using System.Security;
+using System.Security.Permissions;
+
+namespace System.Security.Policy
+{
+	public sealed class Zone : IIdentityPermissionFactory, IBuiltInEvidence
+	{
+		SecurityZone zone;
+		
+		public Zone (SecurityZone zone)
+		{
+			if (!Enum.IsDefined (typeof (SecurityZone), zone))
+				throw new ArgumentException ("invalid zone");
+
+			this.zone = zone;
+		}
+
+		public object Copy ()
+		{
+			return new Zone (zone);
+		}
+
+		public IPermission CreateIdentityPermission (Evidence evidence)
+		{
+			return new ZoneIdentityPermission (zone);
+		}
+
+		[MonoTODO("This depends on zone configuration in IE")]
+		public static Zone CreateFromUrl (string url)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is Zone))
+				return false;
+
+			return (((Zone) o).zone == zone);
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int) zone;
+		}
+
+		public override string ToString ()
+		{
+			SecurityElement se = new SecurityElement (GetType ().FullName);
+			se.AddAttribute ("version", "1");
+			se.AddChild (new SecurityElement ("Zone", zone.ToString ()));
+
+			return se.ToString ();
+		}
+
+		int IBuiltInEvidence.GetRequiredSize (bool verbose)
+		{
+			return 3;
+		}
+
+		int IBuiltInEvidence.InitFromBuffer (char [] buffer, int position) {
+			int new_zone = (int) buffer [position++];
+			new_zone += buffer [position++];
+			return position;
+		}
+
+		int IBuiltInEvidence.OutputToBuffer (char [] buffer, int position, bool verbose)
+		{
+			buffer [position++] = '\x0003';
+			buffer [position++] = (char) (((int) zone) >> 16);
+			buffer [position++] = (char) (((int) zone) & 0x0FFFF);
+			return position;
+		}
+
+		public SecurityZone SecurityZone
+		{
+			get { return zone; }
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/System.Security.Principal/ChangeLog b/mcs/class/corlib/System.Security.Principal/ChangeLog
new file mode 100644
index 00000000000..237503f15d2
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Principal/ChangeLog
@@ -0,0 +1,9 @@
+2002/07/10  Nick Drochak <ndrochak@gol.com>

+

+	* WindowsAccountType.cs:

+	* WindowsBuiltInRole.cs:

+		Make these enums public instead of internal.

+

+2002-01-07  Nick Drochak  <ndrochak@gol.com>

+

+	* PrincipalPolicy.cs: made enum public like it should be to get _AppDomain to compile.

diff --git a/mcs/class/corlib/System.Security.Principal/GenericIdentity.cs b/mcs/class/corlib/System.Security.Principal/GenericIdentity.cs
new file mode 100644
index 00000000000..0b5aea58c8a
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Principal/GenericIdentity.cs
@@ -0,0 +1,46 @@
+//
+// System.Security.Principal.GenericIdentity.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Security.Principal {
+
+	[Serializable]
+	public class GenericIdentity : IIdentity {
+		string user_name;
+		string authentication_type;
+		
+		public GenericIdentity (string user_name, string authentication_type)
+		{
+			this.user_name = user_name;
+			this.authentication_type = authentication_type;
+		}
+
+		public GenericIdentity (string name)
+		{
+			this.user_name = user_name;
+		}
+
+		public virtual string AuthenticationType {
+			get {
+				return authentication_type;
+			}
+		}
+
+		public virtual string Name {
+			get {
+				return user_name;
+			}
+		}
+
+		public virtual bool IsAuthenticated {
+			get {
+				return true;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Principal/GenericPrincipal.cs b/mcs/class/corlib/System.Security.Principal/GenericPrincipal.cs
new file mode 100644
index 00000000000..5fa85b9e72b
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Principal/GenericPrincipal.cs
@@ -0,0 +1,38 @@
+//
+// System.Security.Principal.GenericPrincipal.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Security.Principal {
+
+	[Serializable]
+	public class GenericPrincipal : IPrincipal {
+		IIdentity identity;
+		string [] roles;
+		
+		public GenericPrincipal (IIdentity identity, string [] roles)
+		{
+			this.identity = identity;
+			this.roles = roles;
+		}
+
+		public virtual IIdentity Identity {
+			get {
+				return identity;
+			}
+		}
+
+		public virtual bool IsInRole (string role)
+		{
+			foreach (string r in roles)
+				if (role == r)
+					return true;
+
+			return false;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Principal/IIdentity.cs b/mcs/class/corlib/System.Security.Principal/IIdentity.cs
new file mode 100644
index 00000000000..e31f8eddd34
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Principal/IIdentity.cs
@@ -0,0 +1,26 @@
+//
+// System.Security.Principal.IIdentity.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Security.Principal {
+
+	public interface IIdentity {
+
+		string AuthenticationType {
+			get;
+		}
+
+		bool IsAuthenticated {
+			get;
+		}
+
+		string Name {
+			get;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Principal/IPrincipal.cs b/mcs/class/corlib/System.Security.Principal/IPrincipal.cs
new file mode 100644
index 00000000000..55aece3a4dc
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Principal/IPrincipal.cs
@@ -0,0 +1,20 @@
+//
+// System.Security.Principal.IPrincipal.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Security.Principal {
+
+	public interface IPrincipal {
+
+		IIdentity Identity {
+			get;
+		}
+
+		bool IsInRole (string role);
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Principal/PrincipalPolicy.cs b/mcs/class/corlib/System.Security.Principal/PrincipalPolicy.cs
new file mode 100644
index 00000000000..0fc36b14087
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Principal/PrincipalPolicy.cs
@@ -0,0 +1,17 @@
+//
+// System.Security.Principal.PrincipalPolicy.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Security.Principal {
+
+	public enum PrincipalPolicy {
+		UnauthenticatedPrincipal,
+		NoPrincipal,
+		WindowsPrincipal
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Principal/WindowsAccountType.cs b/mcs/class/corlib/System.Security.Principal/WindowsAccountType.cs
new file mode 100644
index 00000000000..4387c215ff8
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Principal/WindowsAccountType.cs
@@ -0,0 +1,18 @@
+//
+// System.Security.Principal.WindowsAccountType.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Security.Principal {
+
+	public enum WindowsAccountType {
+		Normal,
+		Guest,
+		System,
+		Anonymous
+	}
+}
diff --git a/mcs/class/corlib/System.Security.Principal/WindowsBuiltInRole.cs b/mcs/class/corlib/System.Security.Principal/WindowsBuiltInRole.cs
new file mode 100644
index 00000000000..d2420eb2c02
--- /dev/null
+++ b/mcs/class/corlib/System.Security.Principal/WindowsBuiltInRole.cs
@@ -0,0 +1,23 @@
+//
+// System.Security.Principal.WindowsBuiltInRole.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System.Security.Principal {
+
+	public enum WindowsBuiltInRole {
+		Administrator = 544,
+		User = 545,
+		Guest = 546,
+		PowerUser = 547,
+		AccountOperator = 548,
+		SystemOperator = 549,
+		PrintOperator = 550,
+		BackupOperator = 551,
+		Replicator = 552,
+	}
+}
diff --git a/mcs/class/corlib/System.Security/ChangeLog b/mcs/class/corlib/System.Security/ChangeLog
new file mode 100755
index 00000000000..87c3fade5f0
--- /dev/null
+++ b/mcs/class/corlib/System.Security/ChangeLog
@@ -0,0 +1,67 @@
+2002-06-10  Duncan Mak  <duncan@ximian.com>
+
+	* IEvidenceFactory.cs (Evidence): Added missing method.
+	
+	* SuppressUnmanagedCodeSecurityAttribute.cs:
+	* UnverifiableCodeAttribute.cs: Added missing
+	AttributeUsage attribute.
+
+2002-06-05  Nick Drochak  <ndrochak@gol.com>
+
+	* SecurityElement.cs: Fixed couple of hard to spot typos which were
+	causing valid names and keys to be rejected.
+
+2002-04-28  Lawrence Pit <loz@cable.a2000.nl>
+
+	* CodeAccessPermission.cs : implemented ToString method
+
+2002-04-27  Lawrence Pit <loz@cable.a2000.nl>
+
+	* SecurityElement.cs: fixed bugs, implemented several methods
+
+2002-03-12  Duncan Mak  <duncan@ximian.com>
+
+	* SecurityException.cs: Inherit from SystemException, not Exception.
+
+2002-02-23  Nick Drochak  <ndrochak@gol.com>
+
+	* SecurityElement.cs: fixed typo
+
+2002-02-13  Dan Lewis <dihlewis@yahoo.co.uk>
+	
+	* NamedPermissionSet.cs: New file (stub)
+
+2002-02-07  Duncan Mak  <duncan@ximian.com>
+
+	* SecurityException.cs: Reformatted to fit the form of other
+	Exceptions. Added serialization bits.
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* SecurityElement.cs : Insert MonoTODO attribute.
+
+2002-01-02  Nick Drochak  <ndrochak@gol.com>
+
+	* CodeAccessPermission.cs: Fix syntax error hidden by exclusion in .build file
+
+2001-12-30  Nick Drochak  <ndrochak@gol.com>
+
+	* PermissionSet.cs SecurityManager.cs: New Files
+	* CodeAccessPermission.cs: Add Skeleton code
+	* IPermission.cs: Make public and inherit from ISecurityEncodable 
+	* ISecurityEncodable.cs: Make interface public
+	* ISecurityPolicyEncodable.cs: Ditto
+	* IStackWalk.cs: Ditto
+
+2001-12-29  Nick Drochak  <ndrochak@gol.com>
+
+	* ISecurityPolicyEncodable.cs, PolicyLevelType.cs, 
+	SecurityZone.cs, SecurityException.cs, UnverifiableCodeAttribute.cs,
+	SuppressUnmanagedCodeSecurityAttribute.cs,
+	VerificationException.cs, XmlSyntaxException.cs: New files
+
+2001-12-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* SecurityElement.cs, CodeAccessPermission.cs IPermission.cs
+	IStackWalk.cs SecurityElement.cs ISecurityEncodable.cs: New files.
+	
diff --git a/mcs/class/corlib/System.Security/CodeAccessPermission.cs b/mcs/class/corlib/System.Security/CodeAccessPermission.cs
new file mode 100755
index 00000000000..3994f785dcf
--- /dev/null
+++ b/mcs/class/corlib/System.Security/CodeAccessPermission.cs
@@ -0,0 +1,86 @@
+//
+// System.Security.CodeAccessPermission.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Security {
+
+	[Serializable]
+	public abstract class CodeAccessPermission : IPermission, ISecurityEncodable, IStackWalk
+	{
+		///<summary>Constructs a new instance of the System.Security.CodeAccessPermission class.</summary>
+		protected CodeAccessPermission(){}
+
+		///<summary> Asserts that calling code can access the resource identified by the current instance through the code that      calls this method, even if callers have not been granted permission to      access the resource. </summary>
+		///<exception cref="System.Security.SecurityException">The calling code does not have System.Security.Permissions.SecurityPermissionFlag.Assertion. </exception>
+		public void Assert()
+		{
+		}
+
+		///<summary> Returns a System.Security.CodeAccessPermission containing the same values as the current instance.</summary>
+		///<returns> A new System.Security.CodeAccessPermission instance that is value equal to the current instance.</returns>
+		public abstract IPermission Copy();
+
+		///<summary>Forces a System.Security.SecurityException if all callers do not have the permission specified by the current instance.</summary>
+		///<exception cref="System.Security.SecurityException"> A caller does not have the permission specified by the current instance. A caller has called System.Security.CodeAccessPermission.Deny for the resource protected by the current instance. </exception>
+		public void Demand()
+		{
+		}
+
+		///<summary> Denies access to the resources specified by the current instance through the code that calls this method.</summary>
+		public void Deny(){}
+
+		///<summary> Reconstructs the state of a System.Security.CodeAccessPermission object using the specified XML encoding.</summary>
+		///<param name="elem">A System.Security.SecurityElement instance containing the XML encoding to use to reconstruct the state of a System.Security.CodeAccessPermission object.</param>
+		///<exception cref="System.ArgumentException">elem does not contain the XML encoding for a instance of the same type as the current instance.The version number of elem is not valid.</exception>
+		public abstract void FromXml(SecurityElement elem);
+
+		///<summary> Returns a System.Security.CodeAccessPermission object that is the intersection of the current instance and the specified object.</summary>
+		///<param name="target">A System.Security.CodeAccessPermission instance to intersect with the current instance.</param>
+		///<returns> A new System.Security.CodeAccessPermission instance that represents the intersection of the current instance andtarget. If the intersection is empty or target is null, returns null. If the  current instance is unrestricted, returns a copy of target. Iftarget is unrestricted, returns a copy of the current instance.</returns>
+		///<exception cref="System.ArgumentException">target is not null and is not a System.Security.CodeAccessPermission object.</exception>
+		public abstract IPermission Intersect(IPermission target);
+
+		///<summary>Determines whether the current instance is a subset of the specified      object.</summary>
+		///<param name="target">A System.Security.CodeAccessPermission instance that is to be tested for the subset relationship.</param>
+		///<returns>true if the current instance is a   subset of target; otherwise, false. If the current   instance is unrestricted, and target is not, returnsfalse. If target is unrestricted, returns true.</returns>
+		///<exception cref="System.ArgumentException">target is not null and is not of type System.Security.CodeAccessPermission.</exception>
+		public abstract bool IsSubsetOf(IPermission target);
+
+		///<summary> Returns the XML representation of the state of the current instance.</summary>
+		///<returns> A System.String containing the XML  representation of the state of the current instance.</returns>
+		public override string ToString()
+		{
+			SecurityElement elem = ToXml ();
+			return elem == null ? null : elem.ToString ();
+		}
+
+		///<summary> Returns the XML encoding of the current instance.</summary>
+		///<returns>A System.Security.SecurityElement containing an XML encoding of the state of the current instance.</returns>
+		public abstract SecurityElement ToXml();
+
+		///<summary> Returns a System.Security.CodeAccessPermission object that is the union of the current instance and the specified object.</summary>
+		///<param name="other">A System.Security.IPermission object of the same type as the current instance to be combined with the current instance.</param>
+		///<returns>If other is null, returns a copy of the current  instance using the System.Security.IPermission.Copy method.</returns>
+		///<exception cref="System.ArgumentException">other is not of type System.Security.CodeAccessPermission.</exception>
+		///<exception cref="System.NotSupportedException">other is not null.</exception>
+		public virtual IPermission Union(IPermission other)
+		{
+		    if (!(other is System.Security.CodeAccessPermission))
+		    {
+			throw new System.ArgumentException(); // other is not of type System.Security.CodeAccessPermission.
+		    }
+		    if (null != other)
+		    {
+			throw new System.NotSupportedException(); // other is not null.
+		    }
+		    return null;
+		}
+
+		public void PermitOnly(){}
+	}
+}
diff --git a/mcs/class/corlib/System.Security/IEvidenceFactory.cs b/mcs/class/corlib/System.Security/IEvidenceFactory.cs
new file mode 100644
index 00000000000..ed9fc23e2e8
--- /dev/null
+++ b/mcs/class/corlib/System.Security/IEvidenceFactory.cs
@@ -0,0 +1,15 @@
+// System.Security.IEvidenceFactory
+//
+// Sean MacIsaac (macisaac@ximian.com)
+//
+// (C) Ximian, Inc. 2001
+
+using System.Security.Policy;
+
+namespace System.Security
+{
+	public interface IEvidenceFactory
+	{
+		Evidence Evidence { get; }
+	}
+}
diff --git a/mcs/class/corlib/System.Security/IPermission.cs b/mcs/class/corlib/System.Security/IPermission.cs
new file mode 100755
index 00000000000..63aabfd4c4a
--- /dev/null
+++ b/mcs/class/corlib/System.Security/IPermission.cs
@@ -0,0 +1,24 @@
+//
+// System.Security.IPermission.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Security {
+
+	public interface IPermission : ISecurityEncodable {
+
+		IPermission Copy ();
+
+		void Demand ();
+
+		IPermission Intersect (IPermission target);
+
+		bool IsSubsetOf (IPermission target);
+
+		IPermission Union (IPermission target);
+	}
+}
diff --git a/mcs/class/corlib/System.Security/ISecurityEncodable.cs b/mcs/class/corlib/System.Security/ISecurityEncodable.cs
new file mode 100755
index 00000000000..55b9ebe2f55
--- /dev/null
+++ b/mcs/class/corlib/System.Security/ISecurityEncodable.cs
@@ -0,0 +1,18 @@
+//
+// System.Security.ISecurityEncodable.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Security {
+
+	public interface ISecurityEncodable {
+
+		void FromXml (SecurityElement e);
+
+		SecurityElement ToXml ();
+	}
+}
diff --git a/mcs/class/corlib/System.Security/ISecurityPolicyEncodable.cs b/mcs/class/corlib/System.Security/ISecurityPolicyEncodable.cs
new file mode 100644
index 00000000000..66418ab91d0
--- /dev/null
+++ b/mcs/class/corlib/System.Security/ISecurityPolicyEncodable.cs
@@ -0,0 +1,20 @@
+//
+// System.Security.ISecurityPolicyEncodable.cs
+//
+// Author:
+//   Nick Drochak(ndrochak@gol.com)
+//
+// (C) Nick Drochak
+//
+
+using System.Security.Policy;
+
+namespace System.Security {
+
+	public interface ISecurityPolicyEncodable {
+
+		void FromXml (SecurityElement e, PolicyLevel level);
+
+		SecurityElement ToXml (PolicyLevel level);
+	}
+}
diff --git a/mcs/class/corlib/System.Security/IStackWalk.cs b/mcs/class/corlib/System.Security/IStackWalk.cs
new file mode 100755
index 00000000000..f5b717ac57a
--- /dev/null
+++ b/mcs/class/corlib/System.Security/IStackWalk.cs
@@ -0,0 +1,22 @@
+//
+// System.Security.IStackWalk.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System.Security {
+
+	public interface IStackWalk {
+
+		void Assert ();
+
+		void Demand ();
+
+		void Deny ();
+
+		void PermitOnly ();
+	}
+}
diff --git a/mcs/class/corlib/System.Security/NamedPermissionSet.cs b/mcs/class/corlib/System.Security/NamedPermissionSet.cs
new file mode 100644
index 00000000000..0f500e6de98
--- /dev/null
+++ b/mcs/class/corlib/System.Security/NamedPermissionSet.cs
@@ -0,0 +1,66 @@
+//

+// System.Security.NamedPermissionSet

+//

+// Author:

+//   Dan Lewis (dihlewis@yahoo.co.uk)

+//

+// (C) 2002

+//

+// Stubbed.

+//

+

+using System;

+using System.Security.Permissions;

+

+namespace System.Security {

+	

+	[MonoTODO]

+	[Serializable]

+	public sealed class NamedPermissionSet : PermissionSet {

+		public NamedPermissionSet (string name, PermissionSet set) : base (set) {

+			this.name = name;

+			this.description = "";

+		}

+

+		public NamedPermissionSet (string name, PermissionState state) : base (state) {

+			this.name = name;

+			this.description = "";

+		}

+

+		public NamedPermissionSet (NamedPermissionSet set) : this (set.name, set) {

+		}

+

+		public NamedPermissionSet (string name) : this (name, PermissionState.None) {

+		}

+

+		public string Description {

+			get { return description; }

+			set { description = value; }

+		}

+

+		public string Name {

+			get { return name; }

+			set { name = value; }

+		}

+

+		public override PermissionSet Copy () {

+			return null;

+		}

+

+		public NamedPermissionSet Copy (string name) {

+			return null;

+		}

+

+		public override void FromXml (SecurityElement e) {

+		}

+

+		public override SecurityElement ToXml () {

+			return null;

+		}

+

+		// private

+

+		private string name;

+		private string description;

+	}

+}

diff --git a/mcs/class/corlib/System.Security/PermissionSet.cs b/mcs/class/corlib/System.Security/PermissionSet.cs
new file mode 100644
index 00000000000..96c9667b9be
--- /dev/null
+++ b/mcs/class/corlib/System.Security/PermissionSet.cs
@@ -0,0 +1,202 @@
+//

+// System.Security.PermissionSet.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+using System;

+using System.Collections;

+using System.Security.Permissions;

+using System.Security;

+using System.Runtime.Serialization;

+

+namespace System.Security

+{

+    ///<summary> Represents a collection that can contain different kinds of permissions and perform security      operations.</summary>

+	[Serializable]

+    public class PermissionSet: ISecurityEncodable, ICollection, IEnumerable, IStackWalk, IDeserializationCallback

+    {

+        ///<summary> Constructs a new instance of the System.Security.PermissionSet class with the   specified   value.</summary>

+        ///<param name="state">A System.Security.Permissions.PermissionState value. This value is either System.Security.Permissions.PermissionState.None or System.Security.Permissions.PermissionState.Unrestricted, to specify fully restricted or fully unrestricted access. </param>

+        ///<exception cref="System.ArgumentException">state is not a valid System.Security.Permissions.PermissionState value.</exception>

+        public PermissionSet(PermissionState state)

+        {

+            if (!Enum.IsDefined(typeof(System.Security.Permissions.PermissionState), state))

+            {

+                throw new System.ArgumentException(); // state is not a valid System.Security.Permissions.PermissionState value.

+            }

+        }

+

+        ///<summary> Constructs a new instance of the System.Security.PermissionSet class with the values of the specified System.Security.PermissionSet instance. </summary>

+        ///<param name="permSet">The System.Security.PermissionSet instance with which to initialize the values of the new instance, or null to initialize an empty permission set.</param>

+        ///<exception cref="System.ArgumentException">permSet is not an instance of System.Security.PermissionSet.</exception>

+        public PermissionSet(PermissionSet permSet)

+        {

+		// LAMESPEC: This would be handled by the compiler.  No way permSet is not a PermissionSet.

+	        //if (false)

+		//{

+		//	throw new System.ArgumentException(); // permSet is not an instance of System.Security.PermissionSet.

+		//}

+        }

+

+        ///<summary> Adds the specified System.Security.IPermission object to   the current instance if that permission does not already exist in the current instance.</summary>

+        ///<param name="perm">The System.Security.IPermission object to add.</param>

+        ///<returns>The System.Security.IPermission is added if perm is notnull and a permission of the same type as perm does    not already exist in the current instance. If perm is null,   returns null. If a permission of the same type asperm already exists in the current instance, the union of the existing    permission and perm is added to the current instance and is returned.</returns>

+        ///<exception cref="System.ArgumentException">perm is not a System.Security.IPermission object.</exception>

+        public virtual IPermission AddPermission(IPermission perm)

+        {

+		// LAMESPEC: This would be handled by the compiler.  No way perm is not an IPermission.

+		//if (false)

+		//{

+		//	throw new System.ArgumentException(); // perm is not a System.Security.IPermission object.

+		//}

+		return null;

+        }

+

+        ///<summary>Asserts that calling code can access the resources identified by the permissions contained in the current      instance through the code that calls this method, even if callers have not been      granted permission to access the resource. </summary>

+        ///<exception cref="System.Security.SecurityException">The asserting code does not have sufficient permission to call this method.-or-This method was called with permissions already asserted for the current stack frame.</exception>

+        public virtual void Assert()

+        {

+                throw new System.Security.SecurityException(); // The asserting code does not have sufficient permission to call this method.-or-This method was called with permissions already asserted for the current stack frame.

+        }

+

+        ///<summary>Returns a new System.Security.PermissionSet containing copies of the objects in the current instance.</summary>

+        ///<returns>A new System.Security.PermissionSet that is value equal to the current instance.</returns>

+        public virtual PermissionSet Copy()

+        {

+            return null;

+        }

+

+        ///<summary>Copies the permission objects in the current instance to the specified      location in the specified System.Array.</summary>

+        ///<param name="array">The destination System.Array.</param>

+        ///<param name="index">A System.Int32 that specifies the zero-based starting position in the array at which to begin copying.</param>

+        ///<exception cref="System.ArgumentException">array has more than one dimension.</exception>

+        ///<exception cref="System.IndexOutOfRangeException">index is outside the range of allowable values for array.</exception>

+        ///<exception cref="System.ArgumentNullException">array is null.</exception>

+        public virtual void CopyTo(Array array, int index)

+        {

+            if (array.Rank > 1)

+            {

+                throw new System.ArgumentException("Array has more than one dimension"); // array has more than one dimension.

+            }

+            if (index < 0 || index >= array.Length)

+            {

+                throw new System.IndexOutOfRangeException(); // index is outside the range of allowable values for array.

+            }

+            if (null == array)

+            {

+                throw new System.ArgumentNullException(); // array is null.

+            }

+        }

+

+        ///<summary>Forces a System.Security.SecurityException if all callers do    not have the permissions specified by the objects   contained in the current instance.</summary>

+        ///<exception cref="System.Security.SecurityException">A caller does not have the permission specified by the current instance.</exception>

+        public virtual void Demand()

+        {

+                throw new System.Security.SecurityException(); // A caller does not have the permission specified by the current instance.

+        }

+

+        ///<summary>Denies access to the resources secured by the objects contained in the current instance through the      code that calls this method.</summary>

+        ///<exception cref="System.Security.SecurityException">A previous call to Deny has already restricted the permissions for the current stack frame.</exception>

+        public virtual void Deny()

+        {

+                throw new System.Security.SecurityException(); // A previous call to Deny has already restricted the permissions for the current stack frame.

+        }

+

+        ///<summary>Reconstructs the state of a System.Security.PermissionSet object using the specified XML   encoding.</summary>

+        ///<param name="et">A System.Security.SecurityElement instance containing the XML encoding to use to reconstruct the state of a System.Security.PermissionSet object.</param>

+        ///<exception cref="System.ArgumentNullException">et is null.</exception>

+        ///<exception cref="System.ArgumentException">et does not contain an XML encoding for a System.Security.PermissionSet instance.An error occurred while reconstructing et.</exception>

+        public virtual void FromXml(SecurityElement et)

+        {

+            if (null == et)

+            {

+                throw new System.ArgumentNullException("et"); // et is null.

+            }

+            if (true)

+            {

+                throw new System.ArgumentException("et does not contain an XML encoding for a System.Security.PermissionSet instance."); // et does not contain an XML encoding for a System.Security.PermissionSet instance.An error occurred while reconstructing et.

+            }

+        }

+

+        ///<summary> Returns an enumerator used to iterate      over the permissions in the current instance.</summary>

+        ///<returns>A System.Collections.IEnumerator object   for the permissions of the   set.</returns>

+        public virtual IEnumerator GetEnumerator()

+        {

+            return null;

+        }

+

+        ///<summary> Determines whether the current instance is a subset of      the specified object.</summary>

+        ///<param name="target">A System.Security.PermissionSet instance that is to be tested for the subset relationship. </param>

+        ///<returns>true if the current instance is a subset of target;   otherwise, false. If the current instance is unrestricted, andtarget is not, returns false. If target is    unrestricted, returns true.</returns>

+        public virtual bool IsSubsetOf(PermissionSet target)

+        {

+            return false;

+        }

+

+        ///<summary> Specifies that only the resources described by the current      instance can be accessed by calling code, even if the code has      been granted permission to access other resources.</summary>

+        ///<exception cref="System.Security.SecurityException">A previous call to PermitOnly has already set the permissions for the current stack frame.</exception>

+        public virtual void PermitOnly()

+        {

+            if (true)

+            {

+                throw new System.Security.SecurityException(); // A previous call to PermitOnly has already set the permissions for the current stack frame.

+            }

+        }

+

+        ///<summary> Returns a System.String representation of the state   of the current instance.</summary>

+        ///<returns>A System.Stringcontaining the XML representation of the state of the current instance.</returns>

+        public override string ToString()

+        {

+            return null;

+        }

+

+        ///<summary>Returns the XML encoding of the current instance.</summary>

+        ///<returns>A System.Security.SecurityElement containing an XML encoding of the state of the   current instance.</returns>

+        public virtual SecurityElement ToXml()

+        {

+            return null;

+        }

+

+        ///<summary> Returns a System.Security.PermissionSet object that is the union of the current instance and   the specified object.</summary>

+        ///<param name="other">A System.Security.PermissionSet instance to be combined with the current instance.</param>

+        ///<returns> A new System.Security.PermissionSet instance that represents the   union of the current instance and other. If the current   instance or other is unrestricted, returns a System.Security.PermissionSet   instance that is unrestricted.</returns>

+        public virtual PermissionSet Union(PermissionSet other)

+        {

+            return null;

+        }

+

+        ///<summary>Implemented to support the System.Collections.ICollection interface. [Note: For more information, see System.Collections.ICollection.Count.]</summary>

+        int ICollection.Count 

+        {

+            get

+            {

+                return 0;

+            }

+        }

+

+        ///<summary>Implemented to support the System.Collections.ICollection interface. [Note: For more information, see System.Collections.ICollection.IsSynchronized.]</summary>

+        bool ICollection.IsSynchronized 

+        {

+            get

+            {

+                return false;

+            }

+        }

+

+        ///<summary>Implemented to support the System.Collections.ICollection interface. [Note: For more information, see System.Collections.ICollection.SyncRoot.]</summary>

+        object ICollection.SyncRoot 

+        {

+            get

+            {

+                return null;

+            }

+        }

+

+	void IDeserializationCallback.OnDeserialization(object sender){}

+

+    }

+}

diff --git a/mcs/class/corlib/System.Security/PolicyLevelType.cs b/mcs/class/corlib/System.Security/PolicyLevelType.cs
new file mode 100644
index 00000000000..a7414010104
--- /dev/null
+++ b/mcs/class/corlib/System.Security/PolicyLevelType.cs
@@ -0,0 +1,18 @@
+//

+// System.Security.PolicyLevelType.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+namespace System.Security {

+

+	public enum PolicyLevelType {

+		User = 0x0,

+		Machine,

+		Enterprise,

+		AppDomain,

+	}

+}

diff --git a/mcs/class/corlib/System.Security/SecurityElement.cs b/mcs/class/corlib/System.Security/SecurityElement.cs
new file mode 100755
index 00000000000..4aeb033328b
--- /dev/null
+++ b/mcs/class/corlib/System.Security/SecurityElement.cs
@@ -0,0 +1,340 @@
+//
+// System.Security.SecurityElement.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Lawrence Pit (loz@cable.a2000.nl)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+
+using System.Globalization;
+using System.Collections;
+using System.Text;
+
+namespace System.Security 
+{
+	[Serializable]
+	public sealed class SecurityElement 
+	{
+		string text;
+		string tag;
+		Hashtable attributes;
+		ArrayList children;
+		
+		// these values are determined by a simple test program against the MS.Net implementation:
+		//	for (int i = 0; i < 256; i++) {
+		//		if (!SecurityElement.IsValidTag ("" + ((char) i))) {
+		//			System.Console.WriteLine ("TAG: " + i);
+		//		}
+		//	}		
+		// note: this is actually an incorrect implementation of MS, as for example the &
+		// character is not a valid character in tag names.
+		private static char [] invalid_tag_chars = new char [] { ' ', '<', '>' };
+		private static char [] invalid_text_chars = new char [] { '<', '>' };
+		private static char [] invalid_attr_name_chars = new char [] { ' ', '<', '>' };
+		private static char [] invalid_attr_value_chars = new char [] { '"', '<', '>' };
+		private static char [] invalid_chars = new char [] { '<', '>', '"', '\'', '&' };
+		
+		public SecurityElement (string tag) : this (tag, null)
+		{
+		}
+		
+		public SecurityElement (string tag, string text)
+		{
+			this.Tag = tag;
+			this.Text = (text == null) ? String.Empty : text;
+		}
+		
+		public Hashtable Attributes {
+			get {
+				if (attributes == null) 
+					return null;
+					
+				Hashtable result = new Hashtable ();
+				IDictionaryEnumerator e = attributes.GetEnumerator ();
+				while (e.MoveNext ())
+					result.Add (e.Key, e.Value);
+				return result;
+			}
+
+			set {				
+				if (value == null || value.Count == 0) {
+					attributes = null;
+					return;
+				}
+				
+				Hashtable result = new Hashtable ();
+				IDictionaryEnumerator e = value.GetEnumerator ();
+				while (e.MoveNext ()) {
+					string key = (string) e.Key;
+					string val = (string) e.Value;
+					if (!IsValidAttributeName (key))
+						throw new ArgumentException (Locale.GetText ("Invalid XML string") + ": " + key);
+
+					if (!IsValidAttributeValue (val))
+						throw new ArgumentException (Locale.GetText ("Invalid XML string") + ": " + key);
+
+					result.Add (key, val);
+				}
+				attributes = result;
+			}
+		}
+
+		public ArrayList Children {
+			get {
+				return children;
+			}
+
+			set {
+				if (value != null) {
+					foreach (object o in value) {
+						if (o == null)
+							throw new ArgumentNullException ();
+						// shouldn't we also throw an exception 
+						// when o isn't an instance of SecurityElement?
+					}
+				}
+				children = value;
+			}
+		}
+
+		public string Tag {
+			get {
+				return tag;
+			}
+			set {
+				if (value == null)
+					throw new ArgumentNullException ();
+				if (!IsValidTag (value))
+					throw new ArgumentException (Locale.GetText ("Invalid XML string") + ": " + value);
+				tag = value;
+			}
+		}
+
+		public string Text {
+			get {
+				return text;
+			}
+
+			set {
+				if (!IsValidText (value))
+					throw new ArgumentException (Locale.GetText ("Invalid XML string") + ": " + text);				
+				text = value;
+			}
+		}
+
+		public void AddAttribute (string name, string value)
+		{
+			if (name == null || value == null)
+				throw new ArgumentNullException ();
+
+			if (attributes == null)
+				attributes = new Hashtable ();
+
+			//
+			// The hashtable will throw ArgumentException if name is already there
+			//
+
+			if (!IsValidAttributeName (name))
+				throw new ArgumentException (Locale.GetText ("Invalid XML string") + ": " + name);
+
+			if (!IsValidAttributeValue (value))
+				throw new ArgumentException (Locale.GetText ("Invalid XML string") + ": " + value);
+			
+			attributes.Add (name, value);
+		}
+
+		public void AddChild (SecurityElement child)
+		{
+			if (child == null)
+				throw new ArgumentNullException ();
+
+			if (children == null)
+				children = new ArrayList ();
+
+			children.Add (child);
+		}
+
+		public string Attribute (string name)
+		{
+			if (name == null)
+				throw new ArgumentNullException ();
+
+			if (attributes != null)
+				return (string) attributes [name];
+			else
+				return null;
+		}
+
+		public bool Equal (SecurityElement other)
+		{
+			if (other == null)
+				return false;
+				
+			if (this == other)
+				return true;
+
+			if (this.text != other.text)
+				return false;
+
+			if (this.tag != other.tag)
+				return false;
+
+			if (this.attributes == null && other.attributes != null && other.attributes.Count != 0)
+				return false;
+				
+			if (other.attributes == null && this.attributes != null && this.attributes.Count != 0)
+				return false;
+
+			if (this.attributes != null && other.attributes != null) {
+				if (this.attributes.Count != other.attributes.Count) 
+					return false;
+				IDictionaryEnumerator e = attributes.GetEnumerator ();
+				while (e.MoveNext ()) 
+					if (other.attributes [e.Key] != e.Value)
+						return false;
+			}
+			
+			if (this.children == null && other.children != null && other.children.Count != 0)
+				return false;
+					
+			if (other.children == null && this.children != null && this.children.Count != 0)
+				return false;
+				
+			if (this.children != null && other.children != null) {
+				if (this.children.Count != other.children.Count)
+					return false;
+				for (int i = 0; i < this.children.Count; i++) 
+					if (!((SecurityElement) this.children [i]).Equal ((SecurityElement) other.children [i]))
+						return false;
+			}
+			
+			return true;
+		}
+
+		public static string Escape (string str)
+		{
+			StringBuilder sb;
+			
+			if (str.IndexOfAny (invalid_chars) == -1)
+				return str;
+
+			sb = new StringBuilder ();
+			int len = str.Length;
+			
+			for (int i = 0; i < len; i++) {
+				char c = str [i];
+
+				switch (c) {
+				case '<':  sb.Append ("&lt;"); break;
+				case '>':  sb.Append ("&gt;"); break;
+				case '"':  sb.Append ("&quot;"); break;
+				case '\'': sb.Append ("&apos;"); break;
+				case '&':  sb.Append ("&amp;"); break;
+				default:   sb.Append (c); break;
+				}
+			}
+
+			return sb.ToString ();
+		}
+
+		public static bool IsValidAttributeName (string name)
+		{
+			return name != null && name.IndexOfAny (invalid_attr_name_chars) == -1;
+		}
+
+		public static bool IsValidAttributeValue (string value)
+		{
+			return value != null && value.IndexOfAny (invalid_attr_value_chars) == -1;
+		}
+
+		public static bool IsValidTag (string value)
+		{
+			return value != null && value.IndexOfAny (invalid_tag_chars) == -1;
+		}
+
+		public static bool IsValidText (string value)
+		{
+			return value != null && value.IndexOfAny (invalid_text_chars) == -1;
+		}
+
+		public SecurityElement SearchForChildByTag (string tag) 
+		{
+			if (tag == null)
+				throw new ArgumentNullException ("tag");
+				
+			if (this.children == null)
+				return null;
+				
+			for (int i = 0; i < children.Count; i++) {
+				SecurityElement elem = (SecurityElement) children [i];
+				if (elem.tag == tag)
+					return elem;
+			}
+			return null;
+		}			
+
+		public string SearchForTextOfTag (string tag) 
+		{
+			if (tag == null)
+				throw new ArgumentNullException ("tag");
+				
+			if (this.tag == tag)
+				return this.text;
+				
+			if (this.children == null)
+				return null;
+			
+			for (int i = 0; i < children.Count; i++) {
+				string result = ((SecurityElement) children [i]).SearchForTextOfTag (tag);
+				if (result != null) 
+					return result;
+			}
+
+			return null;			
+		}
+		
+		public override string ToString ()
+		{
+			StringBuilder s = new StringBuilder ();
+			ToXml (ref s, 0);
+			return s.ToString ();
+		}
+		
+		private void ToXml(ref StringBuilder s, int level)
+		{
+			s.Append (' ', level << 2);
+			s.Append ("<");
+			s.Append (tag);
+			
+			if (attributes != null) {
+				IDictionaryEnumerator e = attributes.GetEnumerator ();				
+				while (e.MoveNext ()) {
+					s.Append (" ")
+					 .Append (e.Key)
+					 .Append ("=\"")
+					 .Append (e.Value)
+					 .Append ("\"");
+				}
+			}
+			
+			if ((text == null || text == String.Empty) && 
+			    (children == null || children.Count == 0))
+				s.Append ("/>");
+			else {
+				s.Append (">").Append (text);
+				if (children != null) {
+					foreach (SecurityElement child in children) {
+						s.Append (Environment.NewLine);
+						child.ToXml (ref s, level + 1);
+					}
+				}
+				s.Append (Environment.NewLine)
+				 .Append (' ', level << 2)
+				 .Append ("</")
+				 .Append (tag)
+				 .Append (">");
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Security/SecurityException.cs b/mcs/class/corlib/System.Security/SecurityException.cs
new file mode 100644
index 00000000000..aaa0086bbe2
--- /dev/null
+++ b/mcs/class/corlib/System.Security/SecurityException.cs
@@ -0,0 +1,79 @@
+//

+// System.Security.SecurityException.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+using System.Runtime.Serialization;

+using System.Globalization;

+

+namespace System.Security {

+	[Serializable]

+	public class SecurityException : SystemException {

+

+		// Fields

+		string permissionState;

+		Type permissionType;

+

+		// Properties

+		public string PermissionState

+		{

+			get { return permissionState; }

+		}

+

+		public Type PermissionType

+		{

+			get { return permissionType; }

+		}

+

+		// Constructors

+		public SecurityException ()

+			: base (Locale.GetText ("A security error has been detected."))

+		{

+		}

+

+		public SecurityException (string message) 

+			: base (message)

+		{

+		}

+		

+		protected SecurityException (SerializationInfo info, StreamingContext context) 

+			: base (info, context)

+		{

+			permissionState = info.GetString ("permissionState");

+		}

+		

+		public SecurityException (string message, Exception inner) 

+			: base (message, inner)

+		{

+		}

+		

+		public SecurityException (string message, Type type) 

+			:  base (message) 

+		{

+			permissionType = type;

+		}

+		

+		public SecurityException (string message, Type type, string state) 

+			: base (message) 

+		{

+			permissionType = type;

+			permissionState = state;

+		}

+

+		// Methods

+		public override void GetObjectData (SerializationInfo info, StreamingContext context)

+		{

+			base.GetObjectData (info, context);

+			info.AddValue ("PermissionState", permissionState);

+		}

+

+		public override string ToString ()

+		{

+			return permissionType.FullName + ": " + permissionState;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System.Security/SecurityManager.cs b/mcs/class/corlib/System.Security/SecurityManager.cs
new file mode 100644
index 00000000000..d29a2845c63
--- /dev/null
+++ b/mcs/class/corlib/System.Security/SecurityManager.cs
@@ -0,0 +1,88 @@
+//

+// System.Security.SecurityManager.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+using System.Security.Policy;

+using System.Collections;

+

+namespace System.Security {

+

+	public sealed class SecurityManager  {

+		private static bool checkExecutionRights;

+		private static bool securityEnabled;

+
+		private SecurityManager () {}
+

+		public static bool CheckExecutionRights {

+			get{

+				return checkExecutionRights;

+			}

+			set{

+				checkExecutionRights = value;

+			}

+		}

+

+		public static bool SecurityEnabled {

+			get{

+				return securityEnabled;

+			}

+			set{

+				securityEnabled = value;

+			}

+		}

+

+		public static bool IsGranted(IPermission perm){

+			return false;

+		}

+

+		public static PolicyLevel LoadPolicyLevelFromFile(

+			string path, 

+			PolicyLevelType type)

+		{

+			return null;

+		}

+

+		public static PolicyLevel LoadPolicyLevelFromString(

+			string str, 

+			PolicyLevelType type)

+		{

+			if (null == str){    

+				throw new ArgumentNullException("str");

+			}

+			return null;

+		}

+

+		public static IEnumerator PolicyHierarchy(){

+			return null;

+		}

+

+		public static PermissionSet ResolvePolicy(Evidence evidence){

+			return null;

+		}

+

+		public static PermissionSet ResolvePolicy(

+			Evidence evidence,

+			PermissionSet reqdPset,

+			PermissionSet optPset,

+			PermissionSet denyPset,

+			out PermissionSet denied)

+		{

+			denied = null;

+			return null;

+		}

+

+		public static IEnumerator ResolvePolicyGroups(Evidence evidence){

+			return null;

+		}

+

+		public static void SavePolicy(){}

+

+		public static void SavePolicyLevel(PolicyLevel level){}

+

+	}

+}
diff --git a/mcs/class/corlib/System.Security/SecurityZone.cs b/mcs/class/corlib/System.Security/SecurityZone.cs
new file mode 100644
index 00000000000..68a7014d5d4
--- /dev/null
+++ b/mcs/class/corlib/System.Security/SecurityZone.cs
@@ -0,0 +1,20 @@
+//

+// System.Security.SecurityZone.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+namespace System.Security {

+

+	public enum SecurityZone {

+		MyComputer = 0x0,

+		Intranet,

+		Trusted,

+		Internet,

+		Untrusted,

+		NoZone = -1,

+	}

+}

diff --git a/mcs/class/corlib/System.Security/SuppressUnmanagedCodeSecurityAttribute.cs b/mcs/class/corlib/System.Security/SuppressUnmanagedCodeSecurityAttribute.cs
new file mode 100644
index 00000000000..58ac28dcec5
--- /dev/null
+++ b/mcs/class/corlib/System.Security/SuppressUnmanagedCodeSecurityAttribute.cs
@@ -0,0 +1,15 @@
+//

+// System.Security.SuppressUnmanagedCodeSecurityAttribute.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+namespace System.Security {

+

+	[AttributeUsage (AttributeTargets.Class | AttributeTargets.Method |

+			 AttributeTargets.Interface)]

+	public sealed class SuppressUnmanagedCodeSecurityAttribute : Attribute {}

+}

diff --git a/mcs/class/corlib/System.Security/UnverifiableCodeAttribute.cs b/mcs/class/corlib/System.Security/UnverifiableCodeAttribute.cs
new file mode 100644
index 00000000000..6cfb5bda372
--- /dev/null
+++ b/mcs/class/corlib/System.Security/UnverifiableCodeAttribute.cs
@@ -0,0 +1,14 @@
+//

+// System.Security.UnverifiableCodeAttribute.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+namespace System.Security {

+

+	[AttributeUsage (AttributeTargets.Module)]

+	public sealed class UnverifiableCodeAttribute : Attribute {}

+}

diff --git a/mcs/class/corlib/System.Security/VerificationException.cs b/mcs/class/corlib/System.Security/VerificationException.cs
new file mode 100644
index 00000000000..277ea55cd37
--- /dev/null
+++ b/mcs/class/corlib/System.Security/VerificationException.cs
@@ -0,0 +1,26 @@
+//

+// System.Security.VerificationException.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+using System.Runtime.Serialization;

+using System.Globalization;

+

+namespace System.Security {

+	[Serializable]

+	public class VerificationException : SystemException {

+	

+		// Constructors

+		public VerificationException(){}

+		public VerificationException(string message) 

+			: base (message){}

+		protected VerificationException(SerializationInfo info, StreamingContext context) 

+			: base (info, context) {}

+		public VerificationException(string message, Exception inner) 

+			: base (message, inner) {}

+	}

+}

diff --git a/mcs/class/corlib/System.Security/XmlSyntaxException.cs b/mcs/class/corlib/System.Security/XmlSyntaxException.cs
new file mode 100644
index 00000000000..91e2c5bc9fa
--- /dev/null
+++ b/mcs/class/corlib/System.Security/XmlSyntaxException.cs
@@ -0,0 +1,27 @@
+//

+// System.Security.XmlSyntaxException.cs

+//

+// Author:

+//   Nick Drochak(ndrochak@gol.com)

+//

+// (C) Nick Drochak

+//

+

+using System.Globalization;

+

+namespace System.Security {

+	[Serializable]

+	public sealed class XmlSyntaxException : SystemException {

+	

+		// Constructors

+		public XmlSyntaxException(){}

+		public XmlSyntaxException(int lineNumber)

+			: base (Locale.GetText("Invalid syntax on line ") + lineNumber.ToString() + "."){}

+		public XmlSyntaxException(int lineNumber, string message)

+			: base (Locale.GetText("Invalid syntax on line ") + lineNumber.ToString() + " - " + message ){}

+		public XmlSyntaxException(string message) 

+			: base (message){}

+		public XmlSyntaxException(string message, Exception inner) 

+			: base (message, inner) {}

+	}

+}

diff --git a/mcs/class/corlib/System.Text/ASCIIEncoding.cs b/mcs/class/corlib/System.Text/ASCIIEncoding.cs
new file mode 100755
index 00000000000..3b8509604c2
--- /dev/null
+++ b/mcs/class/corlib/System.Text/ASCIIEncoding.cs
@@ -0,0 +1,360 @@
+/*
+ * ASCIIEncoding.cs - Implementation of the "System.Text.ASCIIEncoding" class.
+ *
+ * Copyright (c) 2001  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace System.Text
+{
+
+using System;
+
+public class ASCIIEncoding : Encoding
+{
+	// Magic number used by Windows for "ASCII".
+	internal const int ASCII_CODE_PAGE = 20127;
+
+	// Constructor.
+	public ASCIIEncoding() : base(ASCII_CODE_PAGE) {}
+
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount(char[] chars, int index, int count)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(index < 0 || index > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (chars.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				return count;
+			}
+
+	// Convenience wrappers for "GetByteCount".
+	public override int GetByteCount(String s)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				return s.Length;
+			}
+
+	// Get the bytes that result from encoding a character buffer.
+	public override int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+				if(charCount < 0 || charCount > (chars.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_Array"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if((bytes.Length - byteIndex) < charCount)
+				{
+					throw new ArgumentException
+						(_("Arg_InsufficientSpace"));
+				}
+				int count = charCount;
+				char ch;
+				while(count-- > 0)
+				{
+					ch = chars[charIndex++];
+					if(ch < (char)0x80)
+					{
+						bytes[byteIndex++] = (byte)ch;
+					}
+					else
+					{
+						bytes[byteIndex++] = (byte)'?';
+					}
+				}
+				return charCount;
+			}
+
+	// Convenience wrappers for "GetBytes".
+	public override int GetBytes(String s, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > s.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_StringIndex"));
+				}
+				if(charCount < 0 || charCount > (s.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_StringRange"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if((bytes.Length - byteIndex) < charCount)
+				{
+					throw new ArgumentException(_("Arg_InsufficientSpace"));
+				}
+				int count = charCount;
+				char ch;
+				while(count-- > 0)
+				{
+					ch = s[charIndex++];
+					if(ch < (char)0x80)
+					{
+						bytes[byteIndex++] = (byte)ch;
+					}
+					else
+					{
+						bytes[byteIndex++] = (byte)'?';
+					}
+				}
+				return charCount;
+			}
+
+	// Get the number of characters needed to decode a byte buffer.
+	public override int GetCharCount(byte[] bytes, int index, int count)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				return count;
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_Array"));
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+				if((chars.Length - charIndex) < byteCount)
+				{
+					throw new ArgumentException(_("Arg_InsufficientSpace"));
+				}
+				int count = byteCount;
+				while(count-- > 0)
+				{
+					chars[charIndex++] = (char)(bytes[byteIndex++]);
+				}
+				return byteCount;
+			}
+
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public override int GetMaxByteCount(int charCount)
+			{
+				if(charCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_NonNegative"));
+				}
+				return charCount;
+			}
+
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public override int GetMaxCharCount(int byteCount)
+			{
+				if(byteCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_NonNegative"));
+				}
+				return byteCount;
+			}
+
+	// Decode a buffer of bytes into a string.
+	public override String GetString(byte[] bytes, int index, int count)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				/*String s = String.NewString(count);
+				int posn = 0;
+				while(count-- > 0)
+				{
+					s.SetChar(posn++, (char)(bytes[index++]));
+				}
+				return s;*/
+				unsafe {
+					fixed (byte *ss = &bytes [0]) {
+						return new String ((sbyte*)ss, index, count);
+					}
+				}
+			}
+	public override String GetString(byte[] bytes)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				int count = bytes.Length;
+				/*int posn = 0;
+				String s = String.NewString(count);
+				while(count-- > 0)
+				{
+					s.SetChar(posn, (char)(bytes[posn]));
+					++posn;
+				}
+				return s;*/
+				unsafe {
+					fixed (byte *ss = &bytes [0]) {
+						return new String ((sbyte*)ss, 0, count);
+					}
+				}
+			}
+
+#if !ECMA_COMPAT
+
+	// Get the mail body name for this encoding.
+	public override String BodyName
+			{
+				get
+				{
+					return "us-ascii";
+				}
+			}
+
+	// Get the human-readable name for this encoding.
+	public override String EncodingName
+			{
+				get
+				{
+					return "US-ASCII";
+				}
+			}
+
+	// Get the mail agent header name for this encoding.
+	public override String HeaderName
+			{
+				get
+				{
+					return "us-ascii";
+				}
+			}
+
+	// Determine if this encoding can be displayed in a mail/news agent.
+	public override bool IsMailNewsDisplay
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be saved from a mail/news agent.
+	public override bool IsMailNewsSave
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Get the IANA-preferred Web name for this encoding.
+	public override String WebName
+			{
+				get
+				{
+					return "us-ascii";
+				}
+			}
+
+#endif // !ECMA_COMPAT
+
+}; // class ASCIIEncoding
+
+}; // namespace System.Text
diff --git a/mcs/class/corlib/System.Text/ChangeLog b/mcs/class/corlib/System.Text/ChangeLog
new file mode 100755
index 00000000000..f559e5d38e1
--- /dev/null
+++ b/mcs/class/corlib/System.Text/ChangeLog
@@ -0,0 +1,151 @@
+
+Wed Aug 21 20:02:04 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* *.cs: imported the code donated by Rhys Weatherley
+	<rweather@southern-storm.com.au>.
+
+2002-08-18  Dick Porter  <dick@ximian.com>
+
+	* Encoding.cs: Make GetString() return a useful representation of
+	the bytes, rather than "System.Char[]"
+
+2002-08-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* StringBuilder.cs: added IndexerName to indexer.
+
+2002-08-01  Jason Diamond <jason@injektilo.org>
+
+	* Encoding.cs: Use GetByteCount instead of GetMaxByteCount when
+	converting chars to bytes.
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* StringBuilder.cs: updated comments. MaxCapacity always returns
+	Int32.MaxValue.
+
+2002-06-21  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* StringBuilder.cs: implemented AppendFormat methods using
+	String.Format. Thanks Paolo!
+
+	This makes xsp generate correct C# output in linux :-). I still need
+	to do more testing, though.
+
+Mon Jun 3 12:58:40 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ASCIIEncoding.cs: fixed handling of 0 bytecount.
+
+2002-05-19  Martin Baulig  <martin@gnome.org>
+
+	* Encoder.cs (IConvEncoder.GetByteCount, IConvEncoder.GetBytes):
+	Added exception handling.
+
+	* Decoder.cs (IConvDecoder.GetCharCount, IConvDecoder.GetChars):
+	Added exception handling.
+
+2002/04/02  Nick Drochak <ndrochak@gol.com>
+
+	* StringBuilder.cs (Append): Removed obsolete overload.
+
+2002-03-21  Mike Kestner  <mkestner@speakeasy.net>
+
+	* ASCIIEncoding.cs : Fix off by one error in Get(Char|Byte)Count.
+
+Thu Mar 21 17:38:19 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* StringBuilder.cs: no need to intern the string returned by ToString().
+
+2002-03-17  Mike Kestner  <mkestner@speakeasy.net>
+
+	* ASCIIEncoding.cs: Implement all the overridden methods. No longer
+	  dependent on iconv icalls.
+	* Encoding.cs: Fix count bugs in GetBytes and GetChars. Add virtual
+	  to GetBytes.
+
+Wed Mar 13 00:26:29 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* StringBuilder.cs: make ToString() return a interned string, this
+	seems to be required to make switch on string work.
+
+Fri Mar 8 17:29:58 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* StringBuilder.cs: make Append(char) do the smart thing.
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* ASCIIEncoding.cs, Encoding.cs, UTF7Encoding.cs, 
+	UnicodeEncoding.cs: MonoTODO attribute marking.
+
+	* StringBuilder.cs : Ditto.
+	
+Wed Nov 14 17:05:22 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Encoding.cs: renamed some fields.
+	* StringBuilder.cs: CLSCompliant updates.
+
+2001-10-29  Nick Drochak  <ndrochak@gol.com>
+
+	* StringBuilder.cs: Throw exceptions when constructor paramter(s) are
+		invalid. Just like MS does (as best as I can tell).
+
+	Tests for these exceptions are now added to the unit tests as well.
+
+2001-10-25  Nick Drochak  <ndrochak@gol.com>
+
+	* StringBuilder.cs: Throw exception if they try to make a StringBuilder
+		whose capacity is greater than the MaxCapacity.
+
+	I added some tests for the constructors and the above exception. More
+	coming soon.
+
+2001-10-23  Nick Drochak  <ndrochak@gol.com>
+
+	* StringBuilder.cs: Refactored constructor code into just one
+	constructor. All the other construtors call it. Also supplied missing
+	constructors so the class has all those in the spec.
+
+	Added the MaxCapacity property as well, however this needs to be 
+	completed to return a value is related to the available system memory.
+
+2001-10-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* Encoding.cs, UTF8Encoding.cs, UTF7Encoding.cs, ASCIIEncoding.cs,
+	UnicodeEncoding.cs: Corrected API.
+
+	* UTF8Encoding.cs: Checked in changes from Rafael.
+
+2001-08-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* UTF8Encoding.cs: impl. clumsy GetBytes
+
+2001-07-16  Marcin Szczepanski <marcins@zipworld.com.au>
+
+	* StringBuilder.cs (Text): Fixed.
+
+	* StringBuilderTest.cs: Implement Test suite.
+
+2001-07-12  Marcin Szczepanski <marcins@zipworld.com.au>
+
+	* StringBuilder.cs: Implemented.
+
+	The only methods left unimplemented are the AppendFormat( ... )
+	ones just because it's probably better to wait until some of the
+	Format related classes are implemented.  I've put that as a TODO
+	comment at the top and created the methods with a "nop" body.
+
+2001-06-26  Sean MacIsaac  <macisaac@ximian.com>
+
+	* UnicodeEncoding.cs: Members added so that a clean compile is
+	possible.
+
+	* ASCIIEncoding.cs: Members added so that a clean compile is
+	possible.
+
+	* UTF7Encoding.cs: Members added so that a clean compile is
+	possible.
+
+	* UTF8Encoding.cs: Members added so that a clean compile is
+	possible.
+
+	* Encoding.cs: All public members included.  Most members
+	unimplemented.
diff --git a/mcs/class/corlib/System.Text/Decoder.cs b/mcs/class/corlib/System.Text/Decoder.cs
new file mode 100644
index 00000000000..a1752d349e9
--- /dev/null
+++ b/mcs/class/corlib/System.Text/Decoder.cs
@@ -0,0 +1,45 @@
+/*
+ * Decoder.cs - Implementation of the "System.Text.Decoder" class.
+ *
+ * Copyright (c) 2001  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace System.Text
+{
+
+using System;
+
+public abstract class Decoder
+{
+
+	// Constructor.
+	protected Decoder() {}
+
+	// Get the number of characters needed to decode a buffer.
+	public abstract int GetCharCount(byte[] bytes, int index, int count);
+
+	// Get the characters that result from decoding a buffer.
+	public abstract int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex);
+
+}; // class Decoder
+
+}; // namespace System.Text
diff --git a/mcs/class/corlib/System.Text/DefaultEncoding.cs b/mcs/class/corlib/System.Text/DefaultEncoding.cs
new file mode 100755
index 00000000000..1f312b75bfd
--- /dev/null
+++ b/mcs/class/corlib/System.Text/DefaultEncoding.cs
@@ -0,0 +1,307 @@
+/*
+ * DefaultEncoding.cs - Implementation of the
+ *		"System.Text.DefaultEncoding" class.
+ *
+ * Copyright (c) 2001  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace System.Text
+{
+
+using System;
+using System.Runtime.CompilerServices;
+
+internal sealed class DefaultEncoding : Encoding
+{
+	// Constructor.
+	public DefaultEncoding() : base(0) {}
+
+	// Get the number of bytes needed to encode a character buffer.
+	unsafe public override int GetByteCount(char[] chars, int index, int count)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(index < 0 || index > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (chars.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				return InternalGetByteCount(chars, index, count);
+			}
+
+	// Convenience wrappers for "GetByteCount".
+	public override int GetByteCount(String s)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				return InternalGetByteCount(s, 0, s.Length);
+			}
+
+	// Get the bytes that result from encoding a character buffer.
+	public override int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+				if(charCount < 0 || charCount > (chars.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_Array"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				int result = InternalGetBytes(chars, charIndex, charCount,
+											  bytes, byteIndex);
+				if(result != -1)
+				{
+					return result;
+				}
+				throw new ArgumentException(_("Arg_InsufficientSpace"));
+			}
+
+	// Convenience wrappers for "GetBytes".
+	public override int GetBytes(String s, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > s.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_StringIndex"));
+				}
+				if(charCount < 0 || charCount > (s.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_StringRange"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				int result = InternalGetBytes(s, charIndex, charCount,
+											  bytes, byteIndex);
+				if(result != -1)
+				{
+					return result;
+				}
+				throw new ArgumentException(_("Arg_InsufficientSpace"));
+			}
+	public override byte[] GetBytes(String s)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				byte[] bytes = new byte [InternalGetByteCount(s, 0, s.Length)];
+				InternalGetBytes(s, 0, s.Length, bytes, 0);
+				return bytes;
+			}
+
+	// Get the number of characters needed to decode a byte buffer.
+	public override int GetCharCount(byte[] bytes, int index, int count)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				return InternalGetCharCount(bytes, index, count);
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_Array"));
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+				int result = InternalGetChars(bytes, byteIndex, byteCount,
+											  chars, charIndex);
+				if(result != -1)
+				{
+					return result;
+				}
+				throw new ArgumentException(_("Arg_InsufficientSpace"));
+			}
+
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public override int GetMaxByteCount(int charCount)
+			{
+				if(charCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_NonNegative"));
+				}
+				return InternalGetMaxByteCount(charCount);
+			}
+
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public override int GetMaxCharCount(int byteCount)
+			{
+				if(byteCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_NonNegative"));
+				}
+				return InternalGetMaxCharCount(byteCount);
+			}
+
+	// Decode a buffer of bytes into a string.
+	public override String GetString(byte[] bytes, int index, int count)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				return InternalGetString(bytes, index, count);
+			}
+	public override String GetString(byte[] bytes)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				return InternalGetString(bytes, 0, bytes.Length);
+			}
+
+	// Internal methods that are used by the runtime engine to
+	// provide the default encoding.  These may assume that their
+	// arguments have been fully validated.
+
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern private static int InternalGetByteCount
+				(char[] chars, int index, int count);
+
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern private static int InternalGetByteCount
+				(String s, int index, int count);
+
+	// Returns -1 if insufficient space in "bytes".
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern private static int InternalGetBytes
+				(char[] chars, int charIndex, int charCount,
+				 byte[] bytes, int byteIndex);
+
+	// Returns -1 if insufficient space in "bytes".
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern private static int InternalGetBytes
+				(String s, int charIndex, int charCount,
+				 byte[] bytes, int byteIndex);
+
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern private static int InternalGetCharCount
+				(byte[] bytes, int index, int count);
+
+	// Returns -1 if insufficient space in "chars".
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern private static int InternalGetChars
+				(byte[] bytes, int byteIndex, int byteCount,
+				 char[] chars, int charIndex);
+
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern private static int InternalGetMaxByteCount(int charCount);
+
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern private static int InternalGetMaxCharCount(int byteCount);
+
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern private static String InternalGetString
+				(byte[] bytes, int index, int count);
+
+	// Get the default code page number.  Zero if unknown.
+	[MethodImpl(MethodImplOptions.InternalCall)]
+	extern internal static int InternalCodePage();
+
+}; // class DefaultEncoding
+
+}; // namespace System.Text
diff --git a/mcs/class/corlib/System.Text/Encoder.cs b/mcs/class/corlib/System.Text/Encoder.cs
new file mode 100644
index 00000000000..6bf3334e462
--- /dev/null
+++ b/mcs/class/corlib/System.Text/Encoder.cs
@@ -0,0 +1,46 @@
+/*
+ * Encoder.cs - Implementation of the "System.Text.Encoder" class.
+ *
+ * Copyright (c) 2001  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace System.Text
+{
+
+using System;
+
+public abstract class Encoder
+{
+
+	// Constructor.
+	protected Encoder() {}
+
+	// Get the number of bytes needed to encode a buffer.
+	public abstract int GetByteCount(char[] chars, int index,
+									 int count, bool flush);
+
+	// Get the bytes that result from decoding a buffer.
+	public abstract int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex, bool flush);
+
+}; // class Encoder
+
+}; // namespace System.Text
diff --git a/mcs/class/corlib/System.Text/Encoding.cs b/mcs/class/corlib/System.Text/Encoding.cs
new file mode 100755
index 00000000000..77b9c495799
--- /dev/null
+++ b/mcs/class/corlib/System.Text/Encoding.cs
@@ -0,0 +1,815 @@
+/*
+ * Encoding.cs - Implementation of the "System.Text.Encoding" class.
+ *
+ * Copyright (c) 2001, 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace System.Text
+{
+
+using System;
+using System.Reflection;
+using System.Globalization;
+using System.Security;
+
+public abstract class Encoding
+{
+	// Code page used by this encoding.
+	internal int codePage;
+
+	// Constructor.
+	protected Encoding()
+			{
+				codePage = 0;
+			}
+#if ECMA_COMPAT
+	protected internal
+#else
+	protected
+#endif
+	Encoding(int codePage)
+			{
+				this.codePage = codePage;
+			}
+
+	// until we change the callers:
+	internal static string _ (string arg) {
+		return arg;
+	}
+
+	// Convert between two encodings.
+	public static byte[] Convert(Encoding srcEncoding, Encoding dstEncoding,
+								 byte[] bytes)
+			{
+				if(srcEncoding == null)
+				{
+					throw new ArgumentNullException("srcEncoding");
+				}
+				if(dstEncoding == null)
+				{
+					throw new ArgumentNullException("dstEncoding");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				return dstEncoding.GetBytes(srcEncoding.GetChars
+							(bytes, 0, bytes.Length));
+			}
+	public static byte[] Convert(Encoding srcEncoding, Encoding dstEncoding,
+								 byte[] bytes, int index, int count)
+			{
+				if(srcEncoding == null)
+				{
+					throw new ArgumentNullException("srcEncoding");
+				}
+				if(dstEncoding == null)
+				{
+					throw new ArgumentNullException("dstEncoding");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || (bytes.Length - index) < count)
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				return dstEncoding.GetBytes(srcEncoding.GetChars
+							(bytes, index, count));
+			}
+
+	// Determine if two Encoding objects are equal.
+	public override bool Equals(Object obj)
+			{
+				Encoding enc = (obj as Encoding);
+				if(enc != null)
+				{
+					return (codePage == enc.codePage);
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+	// Get the number of characters needed to encode a character buffer.
+	public abstract int GetByteCount(char[] chars, int index, int count);
+
+	// Convenience wrappers for "GetByteCount".
+	public virtual int GetByteCount(String s)
+			{
+				if(s != null)
+				{
+					char[] chars = s.ToCharArray();
+					return GetByteCount(chars, 0, chars.Length);
+				}
+				else
+				{
+					throw new ArgumentNullException("s");
+				}
+			}
+	public virtual int GetByteCount(char[] chars)
+			{
+				if(chars != null)
+				{
+					return GetByteCount(chars, 0, chars.Length);
+				}
+				else
+				{
+					throw new ArgumentNullException("chars");
+				}
+			}
+
+	// Get the bytes that result from encoding a character buffer.
+	public abstract int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex);
+
+	// Convenience wrappers for "GetBytes".
+	public virtual int GetBytes(String s, int charIndex, int charCount,
+								byte[] bytes, int byteIndex)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				return GetBytes(s.ToCharArray(), charIndex, charCount,
+								bytes, byteIndex);
+			}
+	public virtual byte[] GetBytes(String s)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				char[] chars = s.ToCharArray();
+				int numBytes = GetByteCount(chars, 0, chars.Length);
+				byte[] bytes = new byte [numBytes];
+				GetBytes(chars, 0, chars.Length, bytes, 0);
+				return bytes;
+			}
+	public virtual byte[] GetBytes(char[] chars, int index, int count)
+			{
+				int numBytes = GetByteCount(chars, index, count);
+				byte[] bytes = new byte [numBytes];
+				GetBytes(chars, index, count, bytes, 0);
+				return bytes;
+			}
+	public virtual byte[] GetBytes(char[] chars)
+			{
+				int numBytes = GetByteCount(chars, 0, chars.Length);
+				byte[] bytes = new byte [numBytes];
+				GetBytes(chars, 0, chars.Length, bytes, 0);
+				return bytes;
+			}
+
+	// Get the number of characters needed to decode a byte buffer.
+	public abstract int GetCharCount(byte[] bytes, int index, int count);
+
+	// Convenience wrappers for "GetCharCount".
+	public virtual int GetCharCount(byte[] bytes)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				return GetCharCount(bytes, 0, bytes.Length);
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	public abstract int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex);
+
+	// Convenience wrappers for "GetChars".
+	public virtual char[] GetChars(byte[] bytes, int index, int count)
+			{
+				int numChars = GetCharCount(bytes, index, count);
+				char[] chars = new char [numChars];
+				GetChars(bytes, index, count, chars, 0);
+				return chars;
+			}
+	public virtual char[] GetChars(byte[] bytes)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				int numChars = GetCharCount(bytes, 0, bytes.Length);
+				char[] chars = new char [numChars];
+				GetChars(bytes, 0, bytes.Length, chars, 0);
+				return chars;
+			}
+
+	// Get a decoder that forwards requests to this object.
+	public virtual Decoder GetDecoder()
+			{
+				return new ForwardingDecoder(this);
+			}
+
+	// Get an encoder that forwards requests to this object.
+	public virtual Encoder GetEncoder()
+			{
+				return new ForwardingEncoder(this);
+			}
+
+	// Loaded copy of the "I18N" assembly.  We need to move
+	// this into a class in "System.Private" eventually.
+	private static Assembly i18nAssembly;
+	private static bool i18nDisabled;
+
+	// Invoke a specific method on the "I18N" manager object.
+	// Returns NULL if the method failed.
+	private static Object InvokeI18N(String name, params Object[] args)
+			{
+				lock(typeof(Encoding))
+				{
+					// Bail out if we previously detected that there
+					// is insufficent engine support for I18N handling.
+					if(i18nDisabled)
+					{
+						return null;
+					}
+
+					// Find or load the "I18N" assembly.
+					if(i18nAssembly == null)
+					{
+						try
+						{
+							try
+							{
+								i18nAssembly = Assembly.Load("I18N");
+							}
+							catch(NotImplementedException)
+							{
+								// Assembly loading unsupported by the engine.
+								i18nDisabled = true;
+								return null;
+							}
+							if(i18nAssembly == null)
+							{
+								return null;
+							}
+						}
+						catch(SystemException)
+						{
+							return null;
+						}
+					}
+
+					// Find the "I18N.Common.Manager" class.
+					Type managerClass;
+					try
+					{
+						managerClass =
+							i18nAssembly.GetType("I18N.Common.Manager");
+					}
+					catch(NotImplementedException)
+					{
+						// "GetType" is not supported by the engine.
+						i18nDisabled = true;
+						return null;
+					}
+					if(managerClass == null)
+					{
+						return null;
+					}
+
+					// Get the value of the "PrimaryManager" property.
+					Object manager;
+					try
+					{
+						manager = managerClass.InvokeMember
+								("PrimaryManager",
+								 BindingFlags.GetProperty |
+								 	BindingFlags.Static |
+									BindingFlags.Public,
+								 null, null, null, null, null, null);
+						if(manager == null)
+						{
+							return null;
+						}
+					}
+					catch(MissingMethodException)
+					{
+						return null;
+					}
+					catch(SecurityException)
+					{
+						return null;
+					}
+					catch(NotImplementedException)
+					{
+						// "InvokeMember" is not supported by the engine.
+						i18nDisabled = true;
+						return null;
+					}
+
+					// Invoke the requested method on the manager.
+					try
+					{
+						return managerClass.InvokeMember
+								(name,
+								 BindingFlags.InvokeMethod |
+								 	BindingFlags.Instance |
+									BindingFlags.Public,
+								 null, manager, args, null, null, null);
+					}
+					catch(MissingMethodException)
+					{
+						return null;
+					}
+					catch(SecurityException)
+					{
+						return null;
+					}
+				}
+			}
+
+	// Get an encoder for a specific code page.
+#if ECMA_COMPAT
+	private
+#else
+	public
+#endif
+	static Encoding GetEncoding(int codePage)
+			{
+				// Check for the builtin code pages first.
+				switch(codePage)
+				{
+					case 0: return Default;
+
+					case ASCIIEncoding.ASCII_CODE_PAGE:
+						return ASCII;
+
+					case UTF7Encoding.UTF7_CODE_PAGE:
+						return UTF7;
+
+					case UTF8Encoding.UTF8_CODE_PAGE:
+						return UTF8;
+
+					case UnicodeEncoding.UNICODE_CODE_PAGE:
+						return Unicode;
+
+					case UnicodeEncoding.BIG_UNICODE_CODE_PAGE:
+						return BigEndianUnicode;
+
+					case Latin1Encoding.ISOLATIN_CODE_PAGE:
+						return ISOLatin1;
+
+					default: break;
+				}
+
+				// Try to obtain a code page handler from the I18N handler.
+				Encoding enc = (Encoding)(InvokeI18N("GetEncoding", codePage));
+				if(enc != null)
+				{
+					return enc;
+				}
+
+#if false
+				// Build a code page class name.
+				String cpName = "System.Text.CP" + codePage.ToString();
+
+				// Look for a code page converter in this assembly.
+				Assembly assembly = Assembly.GetExecutingAssembly();
+				Type type = assembly.GetType(cpName);
+				if(type != null)
+				{
+					return (Encoding)(Activator.CreateInstance(type));
+				}
+
+				// Look in any assembly, in case the application
+				// has provided its own code page handler.
+				type = Type.GetType(cpName);
+				if(type != null)
+				{
+					return (Encoding)(Activator.CreateInstance(type));
+				}
+#endif
+
+				// We have no idea how to handle this code page.
+				throw new NotSupportedException
+					(String.Format
+						(_("NotSupp_CodePage"), codePage.ToString()));
+			}
+
+#if !ECMA_COMPAT
+
+	// Table of builtin web encoding names and the corresponding code pages.
+	private static readonly String[] encodingNames =
+		{"us-ascii", "utf-7", "utf-8", "utf-16",
+		 "unicodeFFFE", "iso-8859-1"};
+	private static readonly int[] encodingCodePages =
+		{ASCIIEncoding.ASCII_CODE_PAGE,
+		 UTF7Encoding.UTF7_CODE_PAGE,
+		 UTF8Encoding.UTF8_CODE_PAGE,
+		 UnicodeEncoding.UNICODE_CODE_PAGE,
+		 UnicodeEncoding.BIG_UNICODE_CODE_PAGE,
+		 Latin1Encoding.ISOLATIN_CODE_PAGE};
+
+	// Get an encoding object for a specific web encoding name.
+	public static Encoding GetEncoding(String name)
+			{
+				// Validate the parameters.
+				if(name == null)
+				{
+					throw new ArgumentNullException("name");
+				}
+
+				// Search the table for a name match.
+				int posn;
+				for(posn = 0; posn < encodingNames.Length; ++posn)
+				{
+					if(String.Compare(name, encodingNames[posn], true,
+									  CultureInfo.InvariantCulture) == 0)
+					{
+						return GetEncoding(encodingCodePages[posn]);
+					}
+				}
+
+				// Try to obtain a web encoding handler from the I18N handler.
+				Encoding enc = (Encoding)(InvokeI18N("GetEncoding", name));
+				if(enc != null)
+				{
+					return enc;
+				}
+
+#if false
+				// Build a web encoding class name.
+				String encName = "System.Text.ENC" +
+								 name.ToLower(CultureInfo.InvariantCulture)
+								 	.Replace('-', '_');
+
+				// Look for a code page converter in this assembly.
+				Assembly assembly = Assembly.GetExecutingAssembly();
+				Type type = assembly.GetType(encName);
+				if(type != null)
+				{
+					return (Encoding)(Activator.CreateInstance(type));
+				}
+
+				// Look in any assembly, in case the application
+				// has provided its own code page handler.
+				type = Type.GetType(encName);
+				if(type != null)
+				{
+					return (Encoding)(Activator.CreateInstance(type));
+				}
+#endif
+
+				// We have no idea how to handle this encoding name.
+				throw new NotSupportedException
+					(String.Format(_("NotSupp_EncodingName"), name));
+			}
+
+#endif // !ECMA_COMPAT
+
+	// Get a hash code for this instance.
+	public override int GetHashCode()
+			{
+				return codePage;
+			}
+
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public abstract int GetMaxByteCount(int charCount);
+
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public abstract int GetMaxCharCount(int byteCount);
+
+	// Get the identifying preamble for this encoding.
+	public virtual byte[] GetPreamble()
+			{
+				return new byte [0];
+			}
+
+	// Decode a buffer of bytes into a string.
+	public virtual String GetString(byte[] bytes, int index, int count)
+			{
+				return new String(GetChars(bytes, index, count));
+			}
+	public virtual String GetString(byte[] bytes)
+			{
+				return new String(GetChars(bytes));
+			}
+
+#if !ECMA_COMPAT
+
+	// Get the mail body name for this encoding.
+	public virtual String BodyName
+			{
+				get
+				{
+					return null;
+				}
+			}
+
+	// Get the code page represented by this object.
+	public virtual int CodePage
+			{
+				get
+				{
+					return codePage;
+				}
+			}
+
+	// Get the human-readable name for this encoding.
+	public virtual String EncodingName
+			{
+				get
+				{
+					return null;
+				}
+			}
+
+	// Get the mail agent header name for this encoding.
+	public virtual String HeaderName
+			{
+				get
+				{
+					return null;
+				}
+			}
+
+	// Determine if this encoding can be displayed in a Web browser.
+	public virtual bool IsBrowserDisplay
+			{
+				get
+				{
+					return false;
+				}
+			}
+
+	// Determine if this encoding can be saved from a Web browser.
+	public virtual bool IsBrowserSave
+			{
+				get
+				{
+					return false;
+				}
+			}
+
+	// Determine if this encoding can be displayed in a mail/news agent.
+	public virtual bool IsMailNewsDisplay
+			{
+				get
+				{
+					return false;
+				}
+			}
+
+	// Determine if this encoding can be saved from a mail/news agent.
+	public virtual bool IsMailNewsSave
+			{
+				get
+				{
+					return false;
+				}
+			}
+
+	// Get the IANA-preferred Web name for this encoding.
+	public virtual String WebName
+			{
+				get
+				{
+					return null;
+				}
+			}
+
+	// Get the Windows code page represented by this object.
+	public virtual int WindowsCodePage
+			{
+				get
+				{
+					// We make no distinction between normal and
+					// Windows code pages in this implementation.
+					return codePage;
+				}
+			}
+
+#endif // !ECMA_COMPAT
+
+	// Storage for standard encoding objects.
+	private static Encoding asciiEncoding = null;
+	private static Encoding bigEndianEncoding = null;
+	private static Encoding defaultEncoding = null;
+	private static Encoding utf7Encoding = null;
+	private static Encoding utf8Encoding = null;
+	private static Encoding unicodeEncoding = null;
+	private static Encoding isoLatin1Encoding = null;
+
+	// Get the standard ASCII encoding object.
+	public static Encoding ASCII
+			{
+				get
+				{
+					lock(typeof(Encoding))
+					{
+						if(asciiEncoding == null)
+						{
+							asciiEncoding = new ASCIIEncoding();
+						}
+						return asciiEncoding;
+					}
+				}
+			}
+
+	// Get the standard big-endian Unicode encoding object.
+	public static Encoding BigEndianUnicode
+			{
+				get
+				{
+					lock(typeof(Encoding))
+					{
+						if(bigEndianEncoding == null)
+						{
+							bigEndianEncoding = new UnicodeEncoding(true, true);
+						}
+						return bigEndianEncoding;
+					}
+				}
+			}
+
+	// Get the default encoding object.
+	public static Encoding Default
+			{
+				get
+				{
+					lock(typeof(Encoding))
+					{
+						if(defaultEncoding == null)
+						{
+							// See if the underlying system knows what
+							// code page handler we should be using.
+							int codePage = DefaultEncoding.InternalCodePage();
+							if(codePage != 0)
+							{
+								try
+								{
+									defaultEncoding = GetEncoding(codePage);
+								}
+								catch(NotSupportedException)
+								{
+									defaultEncoding = new DefaultEncoding();
+								}
+							}
+							else
+							{
+								defaultEncoding = new DefaultEncoding();
+							}
+						}
+						return defaultEncoding;
+					}
+				}
+			}
+
+	// Get the ISO Latin1 encoding object.
+	private static Encoding ISOLatin1
+			{
+				get
+				{
+					lock(typeof(Encoding))
+					{
+						if(isoLatin1Encoding == null)
+						{
+							isoLatin1Encoding = new Latin1Encoding();
+						}
+						return isoLatin1Encoding;
+					}
+				}
+			}
+
+	// Get the standard UTF-7 encoding object.
+#if ECMA_COMPAT
+	private
+#else
+	public
+#endif
+	static Encoding UTF7
+			{
+				get
+				{
+					lock(typeof(Encoding))
+					{
+						if(utf7Encoding == null)
+						{
+							utf7Encoding = new UTF7Encoding();
+						}
+						return utf7Encoding;
+					}
+				}
+			}
+
+	// Get the standard UTF-8 encoding object.
+	public static Encoding UTF8
+			{
+				get
+				{
+					lock(typeof(Encoding))
+					{
+						if(utf8Encoding == null)
+						{
+							utf8Encoding = new UTF8Encoding();
+						}
+						return utf8Encoding;
+					}
+				}
+			}
+
+	// Get the standard little-endian Unicode encoding object.
+	public static Encoding Unicode
+			{
+				get
+				{
+					lock(typeof(Encoding))
+					{
+						if(unicodeEncoding == null)
+						{
+							unicodeEncoding = new UnicodeEncoding();
+						}
+						return unicodeEncoding;
+					}
+				}
+			}
+
+	// Forwarding decoder implementation.
+	private sealed class ForwardingDecoder : Decoder
+	{
+		private Encoding encoding;
+
+		// Constructor.
+		public ForwardingDecoder(Encoding enc)
+				{
+					encoding = enc;
+				}
+
+		// Override inherited methods.
+		public override int GetCharCount(byte[] bytes, int index, int count)
+				{
+					return encoding.GetCharCount(bytes, index, count);
+				}
+		public override int GetChars(byte[] bytes, int byteIndex,
+									 int byteCount, char[] chars,
+									 int charIndex)
+				{
+					return encoding.GetChars(bytes, byteIndex, byteCount,
+											 chars, charIndex);
+				}
+
+	} // class ForwardingDecoder
+
+	// Forwarding encoder implementation.
+	private sealed class ForwardingEncoder : Encoder
+	{
+		private Encoding encoding;
+
+		// Constructor.
+		public ForwardingEncoder(Encoding enc)
+				{
+					encoding = enc;
+				}
+
+		// Override inherited methods.
+		public override int GetByteCount(char[] chars, int index,
+										 int count, bool flush)
+				{
+					return encoding.GetByteCount(chars, index, count);
+				}
+		public override int GetBytes(char[] chars, int charIndex,
+									 int charCount, byte[] bytes,
+									 int byteCount, bool flush)
+				{
+					return encoding.GetBytes(chars, charIndex, charCount,
+											 bytes, byteCount);
+				}
+
+	} // class ForwardingEncoder
+
+}; // class Encoding
+
+}; // namespace System.Text
diff --git a/mcs/class/corlib/System.Text/Latin1Encoding.cs b/mcs/class/corlib/System.Text/Latin1Encoding.cs
new file mode 100644
index 00000000000..6bd426761c3
--- /dev/null
+++ b/mcs/class/corlib/System.Text/Latin1Encoding.cs
@@ -0,0 +1,391 @@
+/*
+ * Latin1Encoding.cs - Implementation of the
+ *			"System.Text.Latin1Encoding" class.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace System.Text
+{
+
+using System;
+
+internal class Latin1Encoding : Encoding
+{
+	// Magic number used by Windows for the ISO Latin1 code page.
+	internal const int ISOLATIN_CODE_PAGE = 28591;
+
+	// Constructor.
+	public Latin1Encoding()
+			: base(ISOLATIN_CODE_PAGE)
+			{
+				// Nothing to do here.
+			}
+
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount(char[] chars, int index, int count)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(index < 0 || index > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (chars.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				return count;
+			}
+
+	// Convenience wrappers for "GetByteCount".
+	public override int GetByteCount(String s)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				return s.Length;
+			}
+
+	// Get the bytes that result from encoding a character buffer.
+	public override int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+				if(charCount < 0 || charCount > (chars.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_Array"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if((bytes.Length - byteIndex) < charCount)
+				{
+					throw new ArgumentException
+						(_("Arg_InsufficientSpace"));
+				}
+				int count = charCount;
+				char ch;
+				while(count-- > 0)
+				{
+					ch = chars[charIndex++];
+					if(ch < (char)0x0100)
+					{
+						bytes[byteIndex++] = (byte)ch;
+					}
+					else if(ch >= '\uFF01' && ch <= '\uFF5E')
+					{
+						bytes[byteIndex++] = (byte)(ch - 0xFEE0);
+					}
+					else
+					{
+						bytes[byteIndex++] = (byte)'?';
+					}
+				}
+				return charCount;
+			}
+
+	// Convenience wrappers for "GetBytes".
+	public override int GetBytes(String s, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > s.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_StringIndex"));
+				}
+				if(charCount < 0 || charCount > (s.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_StringRange"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if((bytes.Length - byteIndex) < charCount)
+				{
+					throw new ArgumentException(_("Arg_InsufficientSpace"));
+				}
+				int count = charCount;
+				char ch;
+				while(count-- > 0)
+				{
+					ch = s[charIndex++];
+					if(ch < (char)0x0100)
+					{
+						bytes[byteIndex++] = (byte)ch;
+					}
+					else if(ch >= '\uFF01' && ch <= '\uFF5E')
+					{
+						bytes[byteIndex++] = (byte)(ch - 0xFEE0);
+					}
+					else
+					{
+						bytes[byteIndex++] = (byte)'?';
+					}
+				}
+				return charCount;
+			}
+
+	// Get the number of characters needed to decode a byte buffer.
+	public override int GetCharCount(byte[] bytes, int index, int count)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				return count;
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_Array"));
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+				if((chars.Length - charIndex) < byteCount)
+				{
+					throw new ArgumentException(_("Arg_InsufficientSpace"));
+				}
+				int count = byteCount;
+				while(count-- > 0)
+				{
+					chars[charIndex++] = (char)(bytes[byteIndex++]);
+				}
+				return byteCount;
+			}
+
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public override int GetMaxByteCount(int charCount)
+			{
+				if(charCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_NonNegative"));
+				}
+				return charCount;
+			}
+
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public override int GetMaxCharCount(int byteCount)
+			{
+				if(byteCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_NonNegative"));
+				}
+				return byteCount;
+			}
+
+	// Decode a buffer of bytes into a string.
+	public override String GetString(byte[] bytes, int index, int count)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				/*String s = String.NewString(count);
+				int posn = 0;
+				while(count-- > 0)
+				{
+					s.SetChar(posn++, (char)(bytes[index++]));
+				}
+				return s;*/
+				unsafe {
+					fixed (byte *ss = &bytes [0]) {
+						return new String ((sbyte*)ss, index, count);
+					}
+				}
+			}
+	public override String GetString(byte[] bytes)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				int count = bytes.Length;
+				/*int posn = 0;
+				String s = String.NewString(count);
+				while(count-- > 0)
+				{
+					s.SetChar(posn, (char)(bytes[posn]));
+					++posn;
+				}
+				return s;*/
+				unsafe {
+					fixed (byte *ss = &bytes [0]) {
+						return new String ((sbyte*)ss, 0, count);
+					}
+				}
+			}
+
+#if !ECMA_COMPAT
+
+	// Get the mail body name for this encoding.
+	public override String BodyName
+			{
+				get
+				{
+					return "iso-8859-1";
+				}
+			}
+
+	// Get the human-readable name for this encoding.
+	public override String EncodingName
+			{
+				get
+				{
+					return "Western European (ISO)";
+				}
+			}
+
+	// Get the mail agent header name for this encoding.
+	public override String HeaderName
+			{
+				get
+				{
+					return "iso-8859-1";
+				}
+			}
+
+	// Determine if this encoding can be displayed in a Web browser.
+	public override bool IsBrowserDisplay
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be saved from a Web browser.
+	public override bool IsBrowserSave
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be displayed in a mail/news agent.
+	public override bool IsMailNewsDisplay
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be saved from a mail/news agent.
+	public override bool IsMailNewsSave
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Get the IANA-preferred Web name for this encoding.
+	public override String WebName
+			{
+				get
+				{
+					return "iso-8859-1";
+				}
+			}
+
+#endif // !ECMA_COMPAT
+
+}; // class Latin1Encoding
+
+}; // namespace System.Text
diff --git a/mcs/class/corlib/System.Text/StringBuilder.cs b/mcs/class/corlib/System.Text/StringBuilder.cs
new file mode 100644
index 00000000000..f5d594b5594
--- /dev/null
+++ b/mcs/class/corlib/System.Text/StringBuilder.cs
@@ -0,0 +1,616 @@
+// -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*-

+//

+// System.Text.StringBuilder

+//

+// Author: Marcin Szczepanski (marcins@zipworld.com.au)

+//

+// TODO: Make sure the coding complies to the ECMA draft, there's some

+// variable names that probably don't (like sString)

+//

+using System.Runtime.CompilerServices;

+

+namespace System.Text {

+	

+	[Serializable]

+	public sealed class StringBuilder {

+

+		private const int defaultCapacity = 16;

+

+		private int sCapacity;

+		private int sLength;

+		private char[] sString;

+		private int sMaxCapacity = Int32.MaxValue;

+

+		public StringBuilder(string value, int startIndex, int length, int capacity) {

+			// first, check the parameters and throw appropriate exceptions if needed

+			if(null==value) {

+				throw new System.ArgumentNullException("value");

+			}

+

+			// make sure startIndex is zero or positive

+			if(startIndex < 0) {

+				throw new System.ArgumentOutOfRangeException("startIndex", startIndex, "StartIndex cannot be less than zero.");

+			}

+

+			// make sure length is zero or positive

+			if(length < 0) {

+				throw new System.ArgumentOutOfRangeException("length", length, "Length cannot be less than zero.");

+			}

+

+			// make sure startIndex and length give a valid substring of value

+			if(startIndex + (length -1) > (value.Length - 1) ) {

+				throw new System.ArgumentOutOfRangeException("startIndex", startIndex, "StartIndex and length must refer to a location within the string.");

+			}

+			

+			// the capacity must be at least as big as the default capacity

+			sCapacity = Math.Max(capacity, defaultCapacity);

+

+			// LAMESPEC: what to do if capacity is too small to hold the substring?

+			// Like the MS implementation, double the capacity until it is large enough

+			while (sCapacity < length) {

+				// However, take care not to double if that would make the number

+				// larger than what an int can hold

+				if (sCapacity <= Int32.MaxValue / 2) {

+					sCapacity *= 2;

+				}

+				else{

+					sCapacity = Int32.MaxValue;

+				}

+			}

+

+			sString = new char[sCapacity];

+			sLength = length;

+

+			// if the length is not zero, then we have to copy some characters

+			if (sLength > 0) {

+				// Copy the correct number of characters into the internal array

+				char[] tString = value.ToCharArray(startIndex, sLength);

+				Array.Copy( tString, sString, sLength);

+			}

+		}

+

+		public StringBuilder() : this(String.Empty, 0, 0, 0) {}

+

+		public StringBuilder( int capacity ) : this("", 0, 0, capacity) {}

+

+		public StringBuilder( int capacity, int maxCapacity ) : this("", 0, 0, capacity) {

+			if(capacity > maxCapacity) {

+				throw new System.ArgumentOutOfRangeException("capacity", "Capacity exceeds maximum capacity.");

+			}

+			sMaxCapacity = maxCapacity;

+		}

+

+		public StringBuilder( string value ) : this(value, 0, value == null ? 0 : value.Length, value == null? 0 : value.Length) {

+		}

+	

+		public StringBuilder( string value, int capacity) : this(value, 0, value.Length, capacity) {}

+	

+		public int MaxCapacity {

+			get {

+				// MS runtime always returns Int32.MaxValue.

+				return sMaxCapacity;

+			}

+		}

+

+		public int Capacity {

+			get {

+				return sCapacity;

+			}

+

+			set {

+				if( value < sLength ) {

+					throw new ArgumentException( "Capacity must be > length" );

+				} else {

+					char[] tString = new char[value];	       

+					Array.Copy( sString, tString, sLength );

+					sString = tString;

+					sCapacity = sString.Length;

+				}

+			}

+		}

+

+

+		public int Length {

+			get {

+				return sLength;

+			}

+

+			set {

+				if( value < 0 || value > MaxCapacity) {

+					throw new ArgumentOutOfRangeException();

+				} else {

+					if( value < sLength ) {

+						// Truncate current string at value

+

+						// LAMESPEC:  The spec is unclear as to what to do

+						// with the capacity when truncating the string.

+						//

+						// Don't change the capacity, as this is what

+						// the MS implementation does.

+

+						sLength = value;

+					} else {

+						// Expand the capacity to the new length and

+						// pad the string with spaces.

+						

+						// LAMESPEC: The spec says to put the spaces on the

+						// left of the string however the MS implementation

+						// puts them on the right.  We'll do that for 

+						// compatibility (!)

+

+						char[] tString = new char[ value ];

+						int padLength = value - sLength;

+						

+						string padding = new String( ' ', padLength );

+						Array.Copy( sString, tString, sLength );

+						Array.Copy( padding.ToCharArray(), 0, tString, sLength, padLength );

+						sString = tString;

+						sLength = sString.Length;

+						sCapacity = value;

+					}

+				}

+			}

+		}

+

+		[IndexerName("Chars")]

+		public char this[ int index ] {

+			get {

+

+				if( index >= sLength || index < 0 ) {

+					throw new IndexOutOfRangeException();

+				}

+				return sString[ index ];

+			} 

+

+			set {

+				if( index >= sLength || index < 0 ) {

+					throw new IndexOutOfRangeException();

+				}

+				sString[ index ] = value;

+			}

+		}

+

+		public override string ToString() {

+			return ToString(0, sLength);

+		}

+

+		public string ToString( int startIndex, int length ) {

+			if( startIndex < 0 || length < 0 || startIndex + length > sLength ) {

+				throw new ArgumentOutOfRangeException();

+			}

+	

+			return new String( sString, startIndex, length );

+		}

+

+		public int EnsureCapacity( int capacity ) {

+			if( capacity < 0 ) {

+				throw new ArgumentOutOfRangeException( 

+					"Capacity must be greater than 0." );

+			}

+

+			if( capacity <= sCapacity ) {

+				return sCapacity;

+			} else {

+				Capacity = capacity;

+				return sCapacity;

+			}

+		}

+

+		public bool Equals( StringBuilder sb ) {

+			if( this.ToString() == sb.ToString() ) {

+				return true;

+			} else {

+				return false;

+			}

+		}

+

+		public StringBuilder Remove( int startIndex, int length ) {

+			if( startIndex < 0 || length < 0 || startIndex + length > sLength ) {

+				throw new ArgumentOutOfRangeException();

+			}

+

+			// Copy everything after the 'removed' part to the start 

+			// of the removed part and truncate the sLength

+

+			Array.Copy( sString, startIndex + length, sString, 

+				startIndex, length );

+

+			sLength -= length;

+			return this;

+		}			       

+

+		public StringBuilder Replace( char oldChar, char newChar ) {

+		

+			return Replace( oldChar, newChar, 0, sLength);

+		}

+

+		public StringBuilder Replace( char oldChar, char newChar, int startIndex, int count ) {

+			if( startIndex + count > sLength || startIndex < 0 || count < 0 ) {

+				throw new ArgumentOutOfRangeException();

+			}

+

+			for( int replaceIterate = startIndex; replaceIterate < startIndex + count; replaceIterate++ ) {

+				if( this[replaceIterate] == oldChar ) {

+					this[replaceIterate] = newChar;

+				}

+			}

+

+			return this;

+		}

+

+		public StringBuilder Replace( string oldValue, string newValue ) {

+			return Replace( oldValue, newValue, 0, sLength );

+		}

+

+		public StringBuilder Replace( string oldValue, string newValue, int startIndex, int count ) {

+			string startString = this.ToString();

+			StringBuilder newStringB = new StringBuilder();

+			string newString;

+

+			if( oldValue == null ) { 

+				throw new ArgumentNullException(

+					"The old value cannot be null.");

+			}

+

+			if( startIndex < 0 || count < 0 || startIndex + count > sLength ) {

+				throw new ArgumentOutOfRangeException();

+			}

+

+			if( oldValue.Length == 0 ) {

+				throw new ArgumentException(

+					"The old value cannot be zero length.");

+			}

+

+			int nextIndex = startIndex; // Where to start the next search

+			int lastIndex = nextIndex;  // Where the last search finished

+

+			while( nextIndex != -1 ) {

+				nextIndex = startString.IndexOf( oldValue, lastIndex);				  

+				if( nextIndex != -1 ) {

+					// The MS implementation won't replace a substring 

+					// if that substring goes over the "count"

+					// boundary, so we'll make sure the behaviour 

+					// here is the same.

+

+					if( nextIndex + oldValue.Length <= startIndex + count ) {

+

+						// Add everything to the left of the old 

+						// string

+						newStringB.Append( startString.Substring( lastIndex, nextIndex - lastIndex ) );

+	

+						// Add the replacement string

+						newStringB.Append( newValue );

+						

+						// Set the next start point to the 

+						// end of the last match

+						lastIndex = nextIndex + oldValue.Length;

+					} else {

+						// We're past the "count" we're supposed to replace within

+						nextIndex = -1;

+						newStringB.Append( 

+							startString.Substring( lastIndex ) );

+					}

+

+				} else {

+					// Append everything left over

+					newStringB.Append( startString.Substring( lastIndex ) );

+				}

+			} 

+

+			newString = newStringB.ToString();

+

+			EnsureCapacity( newString.Length );

+			sString = newString.ToCharArray();

+			sLength = newString.Length;

+			return this;

+		}

+

+		      

+		/* The Append Methods */

+

+		// TODO: Currently most of these methods convert the 

+		// parameter to a CharArray (via a String) and then pass

+		// it to Append( char[] ).  There might be a faster way

+		// of doing this, but it's probably adequate and anything else

+		// would make it too messy.

+		//

+		// As an example, a sample test run of appending a 100 character

+		// string to the StringBuilder, and loooping this 50,000 times

+		// results in an elapsed time of 2.4s using the MS StringBuilder

+		// and 2.7s using this StringBuilder.  Note that this results

+		// in a 5 million character string.  I believe MS uses a lot

+		// of "native" DLLs for the "meat" of the base classes.

+

+		[MonoTODO ("Look at all Append methods and complete them if necessary")]

+		public StringBuilder Append( char[] value ) {

+			if( sLength + value.Length > sCapacity ) {

+				// Need more capacity, double the capacity StringBuilder 

+				// and make sure we have at least enough for the value 

+				// if that's going to go over double. 

+					 

+				Capacity = value.Length + ( sCapacity + sCapacity);

+			}

+

+			Array.Copy( value, 0, sString, sLength, value.Length );

+			sLength += value.Length;

+

+			return this;

+		} 

+		

+		public StringBuilder Append( string value ) {

+			if( value != null ) {

+				return Append( value.ToCharArray() );

+			} else {

+				return null;

+			}

+		}

+

+		public StringBuilder Append( bool value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+		

+		public StringBuilder Append( byte value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Append( decimal value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Append( double value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Append( short value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Append( int value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Append( long value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Append( object value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		[CLSCompliant(false)]

+		public StringBuilder Append( sbyte value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Append( float value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		[CLSCompliant(false)]

+		public StringBuilder Append( ushort value ) {

+			return Append( value.ToString().ToCharArray() );

+		}	

+		

+		[CLSCompliant(false)]

+		public StringBuilder Append( uint value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		[CLSCompliant(false)]

+		public StringBuilder Append( ulong value ) {

+			return Append( value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Append( char value ) {

+			if( sLength + 1 > sCapacity ) {

+				// Need more capacity, double the capacity StringBuilder 

+				// and make sure we have at least enough for the value 

+				// if that's going to go over double. 

+					 

+				Capacity = 1 + ( sCapacity + sCapacity);

+			}

+			sString [sLength] = value;

+			sLength++;

+

+			return this;

+		}

+

+		public StringBuilder Append( char value, int repeatCount ) {

+			if( repeatCount < 0 ) {

+				throw new ArgumentOutOfRangeException();

+			}

+

+			return Append( new String( value, repeatCount) );

+		}

+

+		public StringBuilder Append( char[] value, int startIndex, int charCount ) {

+

+			if( (charCount < 0 || startIndex < 0) || 

+				( charCount + startIndex > value.Length ) ) {

+				throw new ArgumentOutOfRangeException();

+			}

+			

+			if( value == null ) {

+				if( !(startIndex == 0 && charCount == 0) ) {

+					throw new ArgumentNullException();

+				} else {

+					return this;

+				}

+			} else {

+				char[] appendChars = new char[ charCount ];

+			

+				Array.Copy( value, startIndex, appendChars, 0, charCount );

+				return Append( appendChars );

+			}

+		}

+

+		public StringBuilder Append( string value, int startIndex, int count ) {

+			if( (count < 0 || startIndex < 0) || 

+				( startIndex + count > value.Length ) ) { 

+				throw new ArgumentOutOfRangeException();

+			}

+

+			return Append( value.Substring( startIndex, count ).ToCharArray() );

+		}

+

+		public StringBuilder AppendFormat (string format, object arg0 )

+		{

+			string result = String.Format (format, arg0);

+			return Append (result);

+		}

+

+		public StringBuilder AppendFormat (string format, params object[] args )

+		{

+			string result = String.Format (format, args);

+			return Append (result);

+		}

+

+		public StringBuilder AppendFormat (IFormatProvider provider,

+						   string format,

+						   params object[] args)

+		{

+			string result = String.Format (provider, format, args);

+			return Append (result);

+		}

+

+		public StringBuilder AppendFormat (string format, object arg0, object arg1 )

+		{

+			string result = String.Format (format, arg0, arg1);

+			return Append (result);

+		}

+

+		public StringBuilder AppendFormat (string format, object arg0, object arg1, object arg2 )

+		{

+			string result = String.Format (format, arg0, arg1, arg2);

+			return Append (result);

+		}

+

+		/*  The Insert Functions */

+		

+		// Similarly to the Append functions, get everything down to a CharArray 

+		// and insert that.

+		

+		public StringBuilder Insert( int index, char[] value ) {

+			if( index > sLength || index < 0) {

+				throw new ArgumentOutOfRangeException();

+			}

+

+			if( value == null || value.Length == 0 ) {

+				return this;

+			} else {

+				// Check we have the capacity to insert this array

+				if( sCapacity < sLength + value.Length ) {

+					Capacity = value.Length + ( sCapacity + sCapacity );

+				}

+

+				// Move everything to the right of the insert point across

+				Array.Copy( sString, index, sString, index + value.Length, sLength - index);

+				

+				// Copy in stuff from the insert buffer

+				Array.Copy( value, 0, sString, index, value.Length );

+				

+				sLength += value.Length;

+				return this;

+			}

+		}

+				

+		public StringBuilder Insert( int index, string value ) {

+			return Insert( index, value.ToCharArray() );

+		}

+

+		public StringBuilder Insert( int index, bool value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+		

+		public StringBuilder Insert( int index, byte value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Insert( int index, char value) {

+			char[] insertChar = new char[1];

+			

+			insertChar[0] = value;

+			return Insert( index, insertChar );

+		}

+

+		public StringBuilder Insert( int index, decimal value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Insert( int index, double value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+		

+		public StringBuilder Insert( int index, short value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Insert( int index, int value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Insert( int index, long value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+	

+		public StringBuilder Insert( int index, object value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+		

+		[CLSCompliant(false)]

+		public StringBuilder Insert( int index, sbyte value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Insert( int index, float value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+

+		[CLSCompliant(false)]

+		public StringBuilder Insert( int index, ushort value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+

+		[CLSCompliant(false)]

+		public StringBuilder Insert( int index, uint value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+		

+		[CLSCompliant(false)]

+		public StringBuilder Insert( int index, ulong value ) {

+			return Insert( index, value.ToString().ToCharArray() );

+		}

+

+		public StringBuilder Insert( int index, string value, int count ) {

+			if ( count < 0 ) {

+				throw new ArgumentOutOfRangeException();

+			}

+

+			if( value != null ) {

+				if( value != "" ) {

+					for( int insertCount = 0; insertCount < count; 

+						insertCount++ ) {

+						Insert( index, value.ToCharArray() );	   

+					}

+				}

+			}

+			return this;

+		}

+

+		public StringBuilder Insert( int index, char[] value, int startIndex, 

+			int charCount ) {

+

+			if( value != null ) {

+				if( charCount < 0 || startIndex < 0 || startIndex + charCount > value.Length ) {

+					throw new ArgumentOutOfRangeException();

+				}

+					

+				char[] insertChars = new char[ charCount  ];

+				Array.Copy( value, startIndex, insertChars, 0, charCount );

+				return Insert( index, insertChars );

+			} else {

+				return this;

+			}

+		}

+	}

+}       

diff --git a/mcs/class/corlib/System.Text/UTF7Encoding.cs b/mcs/class/corlib/System.Text/UTF7Encoding.cs
new file mode 100755
index 00000000000..f7e7268c8e4
--- /dev/null
+++ b/mcs/class/corlib/System.Text/UTF7Encoding.cs
@@ -0,0 +1,801 @@
+/*
+ * UTF7Encoding.cs - Implementation of the
+ *		"System.Text.UTF7Encoding" class.
+ *
+ * Copyright (c) 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace System.Text
+{
+
+using System;
+
+#if ECMA_COMPAT
+internal
+#else
+public
+#endif
+class UTF7Encoding : Encoding
+{
+	// Magic number used by Windows for UTF-7.
+	internal const int UTF7_CODE_PAGE = 65000;
+
+	// Internal state.
+	private bool allowOptionals;
+
+	// Encoding rule table for 0x00-0x7F.
+	// 0 - full encode, 1 - direct, 2 - optional, 3 - encode plus.
+	private static readonly byte[] encodingRules = {
+		0, 0, 0, 0, 0, 0, 0, 0,   0, 1, 1, 0, 0, 1, 0, 0,	// 00
+		0, 0, 0, 0, 0, 0, 0, 0,   0, 0, 0, 0, 0, 0, 0, 0,	// 10
+		1, 2, 2, 2, 2, 2, 2, 1,   1, 1, 2, 3, 1, 1, 1, 1,	// 20
+		1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 2, 2, 2, 2, 1,	// 30
+
+		2, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,	// 40
+		1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 2, 0, 2, 2, 2,	// 50
+		2, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 1, 1, 1, 1, 1,	// 60
+		1, 1, 1, 1, 1, 1, 1, 1,   1, 1, 1, 2, 2, 2, 0, 0,	// 70
+	};
+
+	// Characters to use to encode 6-bit values in base64.
+	private const String base64Chars =
+		"ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
+
+	// Map bytes in base64 to 6-bit values.
+	private static readonly sbyte[] base64Values = {
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1, // 00
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1, // 10
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, 62, -1, -1, 63, // 20
+		52, 53, 54, 55, 56, 57, 58, 59,   60, 61, -1, -1, -1, -1, -1, -1, // 30
+
+		 0,  1,  2,  3,  4,  5,  6,  7,    8,  9, 10, 11, 12, 13, 14, 15, // 40
+		16, 17, 18, 19, 20, 21, 22, 23,   24, 25, -1, -1, -1, -1, -1, -1, // 50
+		26, 27, 28, 29, 30, 31, 32, 33,   34, 35, 36, 37, 38, 39, 40, 41, // 60
+		42, 43, 44, 45, 46, 47, 48, 49,   50, 51, -1, -1, -1, -1, -1, -1, // 70
+
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1, // 80
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1, // 90
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1, // A0
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1, // B0
+
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1, // C0
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1, // D0
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1, // E0
+		-1, -1, -1, -1, -1, -1, -1, -1,   -1, -1, -1, -1, -1, -1, -1, -1, // F0
+	};
+
+	// Constructors.
+	public UTF7Encoding()
+			: base(UTF7_CODE_PAGE)
+			{
+				allowOptionals = false;
+			}
+	public UTF7Encoding(bool allowOptionals)
+			: base(UTF7_CODE_PAGE)
+			{
+				this.allowOptionals = allowOptionals;
+			}
+
+	// Internal version of "GetByteCount" that can handle
+	// a rolling state between calls.
+	private static int InternalGetByteCount
+				(char[] chars, int index, int count, bool flush,
+				 int leftOver, bool allowOptionals)
+			{
+				// Validate the parameters.
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(index < 0 || index > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (chars.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+
+				// Determine the length of the output.
+				int length = 0;
+				int leftOverSize = (leftOver >> 8);
+				byte[] rules = encodingRules;
+				int ch, rule;
+				while(count > 0)
+				{
+					ch = (int)(chars[index++]);
+					--count;
+					if(ch < 0x0080)
+					{
+						rule = rules[ch];
+					}
+					else
+					{
+						rule = 0;
+					}
+					switch(rule)
+					{
+						case 0:
+						{
+							// Handle characters that must be fully encoded.
+							if(leftOverSize == 0)
+							{
+								++length;
+							}
+							leftOverSize += 16;
+							while(leftOverSize >= 6)
+							{
+								++length;
+								leftOverSize -= 6;
+							}
+						}
+						break;
+
+						case 1:
+						{
+							// The character is encoded as itself.
+							if(leftOverSize != 0)
+							{
+								// Flush the previous encoded sequence.
+								length += 2;
+								leftOverSize = 0;
+							}
+							++length;
+						}
+						break;
+
+						case 2:
+						{
+							// The character may need to be encoded.
+							if(allowOptionals)
+							{
+								goto case 1;
+							}
+							else
+							{
+								goto case 0;
+							}
+						}
+						// Not reached.
+
+						case 3:
+						{
+							// Encode the plus sign as "+-".
+							if(leftOverSize != 0)
+							{
+								// Flush the previous encoded sequence.
+								length += 2;
+								leftOverSize = 0;
+							}
+							length += 2;
+						}
+						break;
+					}
+				}
+				if(leftOverSize != 0 && flush)
+				{
+					length += 2;
+				}
+
+				// Return the length to the caller.
+				return length;
+			}
+
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount(char[] chars, int index, int count)
+			{
+				return InternalGetByteCount(chars, index, count,
+											true, 0, allowOptionals);
+			}
+
+	// Internal version of "GetBytes" that can handle a
+	// rolling state between calls.
+	private static int InternalGetBytes
+				(char[] chars, int charIndex, int charCount,
+				 byte[] bytes, int byteIndex, bool flush,
+				 ref int leftOver, bool allowOptionals)
+			{
+				// Validate the parameters.
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+				if(charCount < 0 || charCount > (chars.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_Array"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+
+				// Convert the characters.
+				int posn = byteIndex;
+				int byteLength = bytes.Length;
+				int leftOverSize = (leftOver >> 8);
+				int leftOverBits = (leftOver & 0xFF);
+				byte[] rules = encodingRules;
+				String base64 = base64Chars;
+				int ch, rule;
+				while(charCount > 0)
+				{
+					ch = (int)(chars[charIndex++]);
+					--charCount;
+					if(ch < 0x0080)
+					{
+						rule = rules[ch];
+					}
+					else
+					{
+						rule = 0;
+					}
+					switch(rule)
+					{
+						case 0:
+						{
+							// Handle characters that must be fully encoded.
+							if(leftOverSize == 0)
+							{
+								if(posn >= byteLength)
+								{
+									throw new ArgumentException
+										(_("Arg_InsufficientSpace"), "bytes");
+								}
+								bytes[posn++] = (byte)'+';
+							}
+							leftOverBits = ((leftOverBits << 16) | ch);
+							leftOverSize += 16;
+							while(leftOverSize >= 6)
+							{
+								if(posn >= byteLength)
+								{
+									throw new ArgumentException
+										(_("Arg_InsufficientSpace"), "bytes");
+								}
+								leftOverSize -= 6;
+								bytes[posn++] = (byte)(base64
+									[leftOverBits >> leftOverSize]);
+								leftOverBits &= ((1 << leftOverSize) - 1);
+							}
+						}
+						break;
+
+						case 1:
+						{
+							// The character is encoded as itself.
+							if(leftOverSize != 0)
+							{
+								// Flush the previous encoded sequence.
+								if((posn + 2) > byteLength)
+								{
+									throw new ArgumentException
+										(_("Arg_InsufficientSpace"), "bytes");
+								}
+								bytes[posn++] = (byte)(base64
+									[leftOverBits << (6 - leftOverSize)]);
+								bytes[posn++] = (byte)'-';
+								leftOverSize = 0;
+								leftOverBits = 0;
+							}
+							if(posn >= byteLength)
+							{
+								throw new ArgumentException
+									(_("Arg_InsufficientSpace"), "bytes");
+							}
+							bytes[posn++] = (byte)ch;
+						}
+						break;
+
+						case 2:
+						{
+							// The character may need to be encoded.
+							if(allowOptionals)
+							{
+								goto case 1;
+							}
+							else
+							{
+								goto case 0;
+							}
+						}
+						// Not reached.
+
+						case 3:
+						{
+							// Encode the plus sign as "+-".
+							if(leftOverSize != 0)
+							{
+								// Flush the previous encoded sequence.
+								if((posn + 2) > byteLength)
+								{
+									throw new ArgumentException
+										(_("Arg_InsufficientSpace"), "bytes");
+								}
+								bytes[posn++] = (byte)(base64
+									[leftOverBits << (6 - leftOverSize)]);
+								bytes[posn++] = (byte)'-';
+								leftOverSize = 0;
+								leftOverBits = 0;
+							}
+							if((posn + 2) > byteLength)
+							{
+								throw new ArgumentException
+									(_("Arg_InsufficientSpace"), "bytes");
+							}
+							bytes[posn++] = (byte)'+';
+							bytes[posn++] = (byte)'-';
+						}
+						break;
+					}
+				}
+				if(leftOverSize != 0 && flush)
+				{
+					if((posn + 2) > byteLength)
+					{
+						throw new ArgumentException
+							(_("Arg_InsufficientSpace"), "bytes");
+					}
+					bytes[posn++] = (byte)(base64
+						[leftOverBits << (6 - leftOverSize)]);
+					bytes[posn++] = (byte)'-';
+					leftOverSize = 0;
+					leftOverBits = 0;
+				}
+				leftOver = ((leftOverSize << 8) | leftOverBits);
+
+				// Return the length to the caller.
+				return posn - byteIndex;
+			}
+
+	// Get the bytes that result from encoding a character buffer.
+	public override int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				int leftOver = 0;
+				return InternalGetBytes(chars, charIndex, charCount,
+									    bytes, byteIndex, true,
+										ref leftOver, allowOptionals);
+			}
+
+	// Internal version of "GetCharCount" that can handle
+	// a rolling state between call.s
+	private static int InternalGetCharCount
+					(byte[] bytes, int index, int count, int leftOver)
+			{
+				// Validate the parameters.
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+
+				// Determine the length of the result.
+				int length = 0;
+				int byteval, b64value;
+				bool normal = ((leftOver & 0x01000000) == 0);
+				bool prevIsPlus = ((leftOver & 0x02000000) != 0);
+				int leftOverSize = ((leftOver >> 16) & 0xFF);
+				sbyte[] base64 = base64Values;
+				while(count > 0)
+				{
+					byteval = (int)(bytes[index++]);
+					--count;
+					if(normal)
+					{
+						if(byteval != '+')
+						{
+							// Directly-encoded character.
+							++length;
+						}
+						else
+						{
+							// Start of a base64-encoded character.
+							normal = false;
+							prevIsPlus = true;
+						}
+					}
+					else
+					{
+						// Process the next byte in a base64 sequence.
+						if(byteval == (int)'-')
+						{
+							// End of a base64 sequence.
+							if(prevIsPlus || leftOverSize > 0)
+							{
+								++length;
+								leftOverSize = 0;
+							}
+							normal = true;
+						}
+						else if((b64value = base64[byteval]) != -1)
+						{
+							// Extra character in a base64 sequence.
+							leftOverSize += 6;
+							if(leftOverSize >= 16)
+							{
+								++length;
+								leftOverSize -= 16;
+							}
+						}
+						else
+						{
+							// Normal character terminating a base64 sequence.
+							if(leftOverSize > 0)
+							{
+								++length;
+								leftOverSize = 0;
+							}
+							++length;
+							normal = true;
+						}
+						prevIsPlus = false;
+					}
+				}
+
+				// Return the final length to the caller.
+				return length;
+			}
+
+	// Get the number of characters needed to decode a byte buffer.
+	public override int GetCharCount(byte[] bytes, int index, int count)
+			{
+				return InternalGetCharCount(bytes, index, count, 0);
+			}
+
+	// Internal version of "GetChars" that can handle a
+	// rolling state between calls.
+	private static int InternalGetChars
+				(byte[] bytes, int byteIndex, int byteCount,
+				 char[] chars, int charIndex, ref int leftOver)
+			{
+				// Validate the parameters.
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_Array"));
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+
+				// Convert the bytes into characters.
+				int posn = charIndex;
+				int charLength = chars.Length;
+				int byteval, b64value;
+				bool normal = ((leftOver & 0x01000000) == 0);
+				bool prevIsPlus = ((leftOver & 0x02000000) != 0);
+				int leftOverSize = ((leftOver >> 16) & 0xFF);
+				int leftOverBits = (leftOver & 0xFFFF);
+				sbyte[] base64 = base64Values;
+				while(byteCount > 0)
+				{
+					byteval = (int)(bytes[byteIndex++]);
+					--byteCount;
+					if(normal)
+					{
+						if(byteval != '+')
+						{
+							// Directly-encoded character.
+							if(posn >= charLength)
+							{
+								throw new ArgumentException
+									(_("Arg_InsufficientSpace"), "chars");
+							}
+							chars[posn++] = (char)byteval;
+						}
+						else
+						{
+							// Start of a base64-encoded character.
+							normal = false;
+							prevIsPlus = true;
+						}
+					}
+					else
+					{
+						// Process the next byte in a base64 sequence.
+						if(byteval == (int)'-')
+						{
+							// End of a base64 sequence.
+							if(prevIsPlus)
+							{
+								if(posn >= charLength)
+								{
+									throw new ArgumentException
+										(_("Arg_InsufficientSpace"), "chars");
+								}
+								chars[posn++] = '+';
+							}
+							else if(leftOverSize > 0)
+							{
+								if(posn >= charLength)
+								{
+									throw new ArgumentException
+										(_("Arg_InsufficientSpace"), "chars");
+								}
+								chars[posn++] =
+									(char)(leftOverBits << (16 - leftOverSize));
+								leftOverSize = 0;
+								leftOverBits = 0;
+							}
+							normal = true;
+						}
+						else if((b64value = base64[byteval]) != -1)
+						{
+							// Extra character in a base64 sequence.
+							leftOverBits = (leftOverBits << 6) | b64value;
+							leftOverSize += 6;
+							if(leftOverSize >= 16)
+							{
+								if(posn >= charLength)
+								{
+									throw new ArgumentException
+										(_("Arg_InsufficientSpace"), "chars");
+								}
+								leftOverSize -= 16;
+								chars[posn++] =
+									(char)(leftOverBits >> leftOverSize);
+								leftOverBits &= ((1 << leftOverSize) - 1);
+							}
+						}
+						else
+						{
+							// Normal character terminating a base64 sequence.
+							if(leftOverSize > 0)
+							{
+								if(posn >= charLength)
+								{
+									throw new ArgumentException
+										(_("Arg_InsufficientSpace"), "chars");
+								}
+								chars[posn++] =
+									(char)(leftOverBits << (16 - leftOverSize));
+								leftOverSize = 0;
+								leftOverBits = 0;
+							}
+							if(posn >= charLength)
+							{
+								throw new ArgumentException
+									(_("Arg_InsufficientSpace"), "chars");
+							}
+							chars[posn++] = (char)byteval;
+							normal = true;
+						}
+						prevIsPlus = false;
+					}
+				}
+				leftOver = (leftOverBits | (leftOverSize << 16) |
+						    (normal ? 0 : 0x01000000) |
+						    (prevIsPlus ? 0x02000000 : 0));
+
+				// Return the final length to the caller.
+				return posn - charIndex;
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex)
+			{
+				int leftOver = 0;
+				return InternalGetChars(bytes, byteIndex, byteCount,
+										chars, charIndex, ref leftOver);
+			}
+
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public override int GetMaxByteCount(int charCount)
+			{
+				if(charCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_NonNegative"));
+				}
+				return charCount * 5;
+			}
+
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public override int GetMaxCharCount(int byteCount)
+			{
+				if(byteCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_NonNegative"));
+				}
+				return byteCount;
+			}
+
+	// Get a UTF7-specific decoder that is attached to this instance.
+	public override Decoder GetDecoder()
+			{
+				return new UTF7Decoder();
+			}
+
+	// Get a UTF7-specific encoder that is attached to this instance.
+	public override Encoder GetEncoder()
+			{
+				return new UTF7Encoder(allowOptionals);
+			}
+
+#if !ECMA_COMPAT
+
+	// Get the mail body name for this encoding.
+	public override String BodyName
+			{
+				get
+				{
+					return "utf-7";
+				}
+			}
+
+	// Get the human-readable name for this encoding.
+	public override String EncodingName
+			{
+				get
+				{
+					return "Unicode (UTF-7)";
+				}
+			}
+
+	// Get the mail agent header name for this encoding.
+	public override String HeaderName
+			{
+				get
+				{
+					return "utf-7";
+				}
+			}
+
+	// Determine if this encoding can be displayed in a mail/news agent.
+	public override bool IsMailNewsDisplay
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be saved from a mail/news agent.
+	public override bool IsMailNewsSave
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Get the IANA-preferred Web name for this encoding.
+	public override String WebName
+			{
+				get
+				{
+					return "utf-7";
+				}
+			}
+
+	// Get the Windows code page represented by this object.
+	public override int WindowsCodePage
+			{
+				get
+				{
+					return UnicodeEncoding.UNICODE_CODE_PAGE;
+				}
+			}
+
+#endif // !ECMA_COMPAT
+
+	// UTF-7 decoder implementation.
+	private sealed class UTF7Decoder : Decoder
+	{
+		// Internal state.
+		private int leftOver;
+
+		// Constructor.
+		public UTF7Decoder()
+				{
+					leftOver = 0;
+				}
+
+		// Override inherited methods.
+		public override int GetCharCount(byte[] bytes, int index, int count)
+				{
+					return InternalGetCharCount(bytes, index, count, leftOver);
+				}
+		public override int GetChars(byte[] bytes, int byteIndex,
+									 int byteCount, char[] chars,
+									 int charIndex)
+				{
+					return InternalGetChars(bytes, byteIndex, byteCount,
+											chars, charIndex, ref leftOver);
+				}
+
+	} // class UTF7Decoder
+
+	// UTF-7 encoder implementation.
+	private sealed class UTF7Encoder : Encoder
+	{
+		private bool allowOptionals;
+		private int leftOver;
+
+		// Constructor.
+		public UTF7Encoder(bool allowOptionals)
+				{
+					this.allowOptionals = allowOptionals;
+					this.leftOver = 0;
+				}
+
+		// Override inherited methods.
+		public override int GetByteCount(char[] chars, int index,
+										 int count, bool flush)
+				{
+					return InternalGetByteCount
+						(chars, index, count, flush, leftOver, allowOptionals);
+				}
+		public override int GetBytes(char[] chars, int charIndex,
+									 int charCount, byte[] bytes,
+									 int byteIndex, bool flush)
+				{
+					return InternalGetBytes(chars, charIndex, charCount,
+											bytes, byteIndex, flush,
+											ref leftOver, allowOptionals);
+				}
+
+	} // class UTF7Encoder
+
+}; // class UTF7Encoding
+
+}; // namespace System.Text
diff --git a/mcs/class/corlib/System.Text/UTF8Encoding.cs b/mcs/class/corlib/System.Text/UTF8Encoding.cs
new file mode 100755
index 00000000000..219f54acf93
--- /dev/null
+++ b/mcs/class/corlib/System.Text/UTF8Encoding.cs
@@ -0,0 +1,1039 @@
+/*
+ * UTF8Encoding.cs - Implementation of the "System.Text.UTF8Encoding" class.
+ *
+ * Copyright (c) 2001, 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace System.Text
+{
+
+using System;
+
+public class UTF8Encoding : Encoding
+{
+	// Magic number used by Windows for UTF-8.
+	internal const int UTF8_CODE_PAGE = 65001;
+
+	// Internal state.
+	private bool emitIdentifier;
+	private bool throwOnInvalid;
+
+	// Constructors.
+	public UTF8Encoding()
+			: this(false, false) {}
+	public UTF8Encoding(bool encoderShouldEmitUTF8Identifier)
+			: this(encoderShouldEmitUTF8Identifier, false) {}
+	public UTF8Encoding(bool encoderShouldEmitUTF8Identifier,
+						bool throwOnInvalidBytes)
+			: base(UTF8_CODE_PAGE)
+			{
+				emitIdentifier = encoderShouldEmitUTF8Identifier;
+				throwOnInvalid = throwOnInvalidBytes;
+			}
+
+	// Internal version of "GetByteCount" which can handle a rolling
+	// state between multiple calls to this method.
+	private static int InternalGetByteCount(char[] chars, int index,
+											int count, uint leftOver,
+											bool emitIdentifier, bool flush)
+			{
+				// Validate the parameters.
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(index < 0 || index > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (chars.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+
+				// Determine the lengths of all characters.
+				char ch;
+				int length = 0;
+				uint pair = leftOver;
+				while(count > 0)
+				{
+					ch = chars[index];
+					if(pair == 0)
+					{
+						if(ch < '\u0080')
+						{
+							++length;
+						}
+						else if(ch < '\u0800')
+						{
+							length += 2;
+						}
+						else if(ch >= '\uD800' && ch <= '\uDBFF')
+						{
+							// This is the start of a surrogate pair.
+							pair = (uint)ch;
+						}
+						else
+						{
+							length += 3;
+						}
+					}
+					else if(ch >= '\uDC00' && ch <= '\uDFFF')
+					{
+						// We have a surrogate pair.
+						length += 4;
+						pair = 0;
+					}
+					else
+					{
+						// We have a surrogate start followed by a
+						// regular character.  Technically, this is
+						// invalid, but we have to do something.
+						// We write out the surrogate start and then
+						// re-visit the current character again.
+						length += 3;
+						pair = 0;
+						continue;
+					}
+					++index;
+					--count;
+				}
+				if(flush && pair != 0)
+				{
+					// Flush the left-over surrogate pair start.
+					length += 3;
+				}
+
+				// Return the final length to the caller.
+				return length + (emitIdentifier ? 3 : 0);
+			}
+
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount(char[] chars, int index, int count)
+			{
+				return InternalGetByteCount(chars, index, count, 0,
+										    emitIdentifier, true);
+			}
+
+	// Convenience wrappers for "GetByteCount".
+	public override int GetByteCount(String s)
+			{
+				// Validate the parameters.
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+
+				// Determine the lengths of all characters.
+				char ch;
+				int index = 0;
+				int count = s.Length;
+				int length = 0;
+				uint pair;
+				while(count > 0)
+				{
+					ch = s[index++];
+					if(ch < '\u0080')
+					{
+						++length;
+					}
+					else if(ch < '\u0800')
+					{
+						length += 2;
+					}
+					else if(ch >= '\uD800' && ch <= '\uDBFF' && count > 1)
+					{
+						// This may be the start of a surrogate pair.
+						pair = (uint)(s[index]);
+						if(pair >= (uint)0xDC00 && pair <= (uint)0xDFFF)
+						{
+							length += 4;
+							++index;
+							--count;
+						}
+						else
+						{
+							length += 3;
+						}
+					}
+					else
+					{
+						length += 3;
+					}
+					--count;
+				}
+
+				// Return the final length to the caller.
+				return length + (emitIdentifier ? 3 : 0);
+			}
+
+	// Internal version of "GetBytes" which can handle a rolling
+	// state between multiple calls to this method.
+	private static int InternalGetBytes(char[] chars, int charIndex,
+									    int charCount, byte[] bytes,
+									    int byteIndex, ref uint leftOver,
+										bool emitIdentifier, bool flush)
+			{
+				// Validate the parameters.
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+				if(charCount < 0 || charCount > (chars.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_Array"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+
+				// Convert the characters into bytes.
+				char ch;
+				int length = bytes.Length;
+				uint pair;
+				uint left = leftOver;
+				int posn = byteIndex;
+				if(emitIdentifier)
+				{
+					if((posn + 3) > length)
+					{
+						throw new ArgumentException
+							(_("Arg_InsufficientSpace"), "bytes");
+					}
+					bytes[posn++] = (byte)0xEF;
+					bytes[posn++] = (byte)0xBB;
+					bytes[posn++] = (byte)0xBF;
+				}
+				while(charCount > 0)
+				{
+					// Fetch the next UTF-16 character pair value.
+					ch = chars[charIndex++];
+					--charCount;
+					if(left == 0)
+					{
+						if(ch >= '\uD800' && ch <= '\uDBFF')
+						{
+							// This is the start of a surrogate pair.
+							left = (uint)ch;
+							continue;
+						}
+						else
+						{
+							// This is a regular character.
+							pair = (uint)ch;
+						}
+					}
+					else if(ch >= '\uDC00' && ch <= '\uDFFF')
+					{
+						// We have a surrogate pair.
+						pair = ((left - (uint)0xD800) << 10) +
+							   (((uint)ch) - (uint)0xDC00) +
+							   (uint)0x10000;
+						left = 0;
+					}
+					else
+					{
+						// We have a surrogate start followed by a
+						// regular character.  Technically, this is
+						// invalid, but we have to do something.
+						// We write out the surrogate start and then
+						// re-visit the current character again.
+						pair = (uint)left;
+						left = 0;
+						--charIndex;
+						++charCount;
+					}
+
+					// Encode the character pair value.
+					if(pair < (uint)0x0080)
+					{
+						if(posn >= length)
+						{
+							throw new ArgumentException
+								(_("Arg_InsufficientSpace"), "bytes");
+						}
+						bytes[posn++] = (byte)pair;
+					}
+					else if(pair < (uint)0x0800)
+					{
+						if((posn + 2) > length)
+						{
+							throw new ArgumentException
+								(_("Arg_InsufficientSpace"), "bytes");
+						}
+						bytes[posn++] = (byte)(0xC0 | (pair >> 6));
+						bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+					}
+					else if(pair < (uint)0x10000)
+					{
+						if((posn + 3) > length)
+						{
+							throw new ArgumentException
+								(_("Arg_InsufficientSpace"), "bytes");
+						}
+						bytes[posn++] = (byte)(0xE0 | (pair >> 12));
+						bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
+						bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+					}
+					else
+					{
+						if((posn + 4) > length)
+						{
+							throw new ArgumentException
+								(_("Arg_InsufficientSpace"), "bytes");
+						}
+						bytes[posn++] = (byte)(0xF0 | (pair >> 18));
+						bytes[posn++] = (byte)(0x80 | ((pair >> 12) & 0x3F));
+						bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
+						bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+					}
+				}
+				if(flush && left != 0)
+				{
+					// Flush the left-over surrogate pair start.
+					if((posn + 3) > length)
+					{
+						throw new ArgumentException
+							(_("Arg_InsufficientSpace"), "bytes");
+					}
+					bytes[posn++] = (byte)(0xE0 | (left >> 12));
+					bytes[posn++] = (byte)(0x80 | ((left >> 6) & 0x3F));
+					bytes[posn++] = (byte)(0x80 | (left & 0x3F));
+					left = 0;
+				}
+				leftOver = left;
+
+				// Return the final count to the caller.
+				return posn - byteIndex;
+			}
+
+	// Get the bytes that result from encoding a character buffer.
+	public override int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				uint leftOver = 0;
+				return InternalGetBytes(chars, charIndex, charCount,
+									    bytes, byteIndex, ref leftOver,
+										emitIdentifier, true);
+			}
+
+	// Convenience wrappers for "GetBytes".
+	public override int GetBytes(String s, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				// Validate the parameters.
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > s.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_StringIndex"));
+				}
+				if(charCount < 0 || charCount > (s.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_StringRange"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+
+				// Convert the characters into bytes.
+				char ch;
+				int length = bytes.Length;
+				uint pair;
+				int posn = byteIndex;
+				if(emitIdentifier)
+				{
+					if((posn + 3) > length)
+					{
+						throw new ArgumentException
+							(_("Arg_InsufficientSpace"), "bytes");
+					}
+					bytes[posn++] = (byte)0xEF;
+					bytes[posn++] = (byte)0xBB;
+					bytes[posn++] = (byte)0xBF;
+				}
+				while(charCount > 0)
+				{
+					// Fetch the next UTF-16 character pair value.
+					ch = s[charIndex++];
+					--charCount;
+					if(ch >= '\uD800' && ch <= '\uDBFF' && charCount > 1)
+					{
+						// This may be the start of a surrogate pair.
+						pair = (uint)(s[charIndex]);
+						if(pair >= (uint)0xDC00 && pair <= (uint)0xDFFF)
+						{
+							pair = (pair - (uint)0xDC00) +
+								   ((((uint)ch) - (uint)0xD800) << 10) +
+								   (uint)0x10000;
+							++charIndex;
+							--charCount;
+						}
+						else
+						{
+							pair = (uint)ch;
+						}
+					}
+					else
+					{
+						pair = (uint)ch;
+					}
+
+					// Encode the character pair value.
+					if(pair < (uint)0x0080)
+					{
+						if(posn >= length)
+						{
+							throw new ArgumentException
+								(_("Arg_InsufficientSpace"), "bytes");
+						}
+						bytes[posn++] = (byte)pair;
+					}
+					else if(pair < (uint)0x0800)
+					{
+						if((posn + 2) > length)
+						{
+							throw new ArgumentException
+								(_("Arg_InsufficientSpace"), "bytes");
+						}
+						bytes[posn++] = (byte)(0xC0 | (pair >> 6));
+						bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+					}
+					else if(pair < (uint)0x10000)
+					{
+						if((posn + 3) > length)
+						{
+							throw new ArgumentException
+								(_("Arg_InsufficientSpace"), "bytes");
+						}
+						bytes[posn++] = (byte)(0xE0 | (pair >> 12));
+						bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
+						bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+					}
+					else
+					{
+						if((posn + 4) > length)
+						{
+							throw new ArgumentException
+								(_("Arg_InsufficientSpace"), "bytes");
+						}
+						bytes[posn++] = (byte)(0xF0 | (pair >> 18));
+						bytes[posn++] = (byte)(0x80 | ((pair >> 12) & 0x3F));
+						bytes[posn++] = (byte)(0x80 | ((pair >> 6) & 0x3F));
+						bytes[posn++] = (byte)(0x80 | (pair & 0x3F));
+					}
+				}
+
+				// Return the final count to the caller.
+				return posn - byteIndex;
+			}
+
+	// Internal version of "GetCharCount" which can handle a rolling
+	// state between multiple calls to this method.
+	private static int InternalGetCharCount(byte[] bytes, int index, int count,
+										   uint leftOverBits,
+										   uint leftOverCount,
+										   bool throwOnInvalid, bool flush)
+			{
+				// Validate the parameters.
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+
+				// Determine the number of characters that we have.
+				uint ch;
+				int length = 0;
+				uint leftBits = leftOverBits;
+				uint leftSoFar = (leftOverCount & (uint)0x0F);
+				uint leftSize = ((leftOverCount >> 4) & (uint)0x0F);
+				while(count > 0)
+				{
+					ch = (uint)(bytes[index++]);
+					--count;
+					if(leftSize == 0)
+					{
+						// Process a UTF-8 start character.
+						if(ch < (uint)0x0080)
+						{
+							// Single-byte UTF-8 character.
+							++length;
+						}
+						else if((ch & (uint)0xE0) == (uint)0xC0)
+						{
+							// Double-byte UTF-8 character.
+							leftBits = (ch & (uint)0x1F);
+							leftSoFar = 1;
+							leftSize = 2;
+						}
+						else if((ch & (uint)0xF0) == (uint)0xE0)
+						{
+							// Three-byte UTF-8 character.
+							leftBits = (ch & (uint)0x0F);
+							leftSoFar = 1;
+							leftSize = 3;
+						}
+						else if((ch & (uint)0xF8) == (uint)0xF0)
+						{
+							// Four-byte UTF-8 character.
+							leftBits = (ch & (uint)0x07);
+							leftSoFar = 1;
+							leftSize = 4;
+						}
+						else if((ch & (uint)0xFC) == (uint)0xF8)
+						{
+							// Five-byte UTF-8 character.
+							leftBits = (ch & (uint)0x03);
+							leftSoFar = 1;
+							leftSize = 5;
+						}
+						else if((ch & (uint)0xFC) == (uint)0xFC)
+						{
+							// Six-byte UTF-8 character.
+							leftBits = (ch & (uint)0x03);
+							leftSoFar = 1;
+							leftSize = 6;
+						}
+						else
+						{
+							// Invalid UTF-8 start character.
+							if(throwOnInvalid)
+							{
+								throw new ArgumentException
+									(_("Arg_InvalidUTF8"), "bytes");
+							}
+						}
+					}
+					else
+					{
+						// Process an extra byte in a multi-byte sequence.
+						if((ch & (uint)0xC0) == (uint)0x80)
+						{
+							leftBits = ((leftBits << 6) | (ch & (uint)0x3F));
+							if(++leftSoFar >= leftSize)
+							{
+								// We have a complete character now.
+								if(leftBits < (uint)0x10000)
+								{
+									if(leftBits != (uint)0xFEFF)
+									{
+										++length;
+									}
+								}
+								else if(leftBits < (uint)0x110000)
+								{
+									length += 2;
+								}
+								else if(throwOnInvalid)
+								{
+									throw new ArgumentException
+										(_("Arg_InvalidUTF8"), "bytes");
+								}
+								leftSize = 0;
+							}
+						}
+						else
+						{
+							// Invalid UTF-8 sequence: clear and restart.
+							if(throwOnInvalid)
+							{
+								throw new ArgumentException
+									(_("Arg_InvalidUTF8"), "bytes");
+							}
+							leftSize = 0;
+							--index;
+							++count;
+						}
+					}
+				}
+				if(flush && leftSize != 0 && throwOnInvalid)
+				{
+					// We had left-over bytes that didn't make up
+					// a complete UTF-8 character sequence.
+					throw new ArgumentException
+						(_("Arg_InvalidUTF8"), "bytes");
+				}
+
+				// Return the final length to the caller.
+				return length;
+			}
+
+	// Get the number of characters needed to decode a byte buffer.
+	public override int GetCharCount(byte[] bytes, int index, int count)
+			{
+				return InternalGetCharCount(bytes, index, count, 0, 0,
+											throwOnInvalid, true);
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	private static int InternalGetChars(byte[] bytes, int byteIndex,
+									   int byteCount, char[] chars,
+									   int charIndex, ref uint leftOverBits,
+									   ref uint leftOverCount,
+									   bool throwOnInvalid, bool flush)
+			{
+				// Validate the parameters.
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_Array"));
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+
+				// Convert the bytes into the output buffer.
+				uint ch;
+				int length = chars.Length;
+				int posn = charIndex;
+				uint leftBits = leftOverBits;
+				uint leftSoFar = (leftOverCount & (uint)0x0F);
+				uint leftSize = ((leftOverCount >> 4) & (uint)0x0F);
+				while(byteCount > 0)
+				{
+					// Fetch the next character from the byte buffer.
+					ch = (uint)(bytes[byteIndex++]);
+					--byteCount;
+					if(leftSize == 0)
+					{
+						// Process a UTF-8 start character.
+						if(ch < (uint)0x0080)
+						{
+							// Single-byte UTF-8 character.
+							if(posn >= length)
+							{
+								throw new ArgumentException
+									(_("Arg_InsufficientSpace"), "chars");
+							}
+							chars[posn++] = (char)ch;
+						}
+						else if((ch & (uint)0xE0) == (uint)0xC0)
+						{
+							// Double-byte UTF-8 character.
+							leftBits = (ch & (uint)0x1F);
+							leftSoFar = 1;
+							leftSize = 2;
+						}
+						else if((ch & (uint)0xF0) == (uint)0xE0)
+						{
+							// Three-byte UTF-8 character.
+							leftBits = (ch & (uint)0x0F);
+							leftSoFar = 1;
+							leftSize = 3;
+						}
+						else if((ch & (uint)0xF8) == (uint)0xF0)
+						{
+							// Four-byte UTF-8 character.
+							leftBits = (ch & (uint)0x07);
+							leftSoFar = 1;
+							leftSize = 4;
+						}
+						else if((ch & (uint)0xFC) == (uint)0xF8)
+						{
+							// Five-byte UTF-8 character.
+							leftBits = (ch & (uint)0x03);
+							leftSoFar = 1;
+							leftSize = 5;
+						}
+						else if((ch & (uint)0xFC) == (uint)0xFC)
+						{
+							// Six-byte UTF-8 character.
+							leftBits = (ch & (uint)0x03);
+							leftSoFar = 1;
+							leftSize = 6;
+						}
+						else
+						{
+							// Invalid UTF-8 start character.
+							if(throwOnInvalid)
+							{
+								throw new ArgumentException
+									(_("Arg_InvalidUTF8"), "bytes");
+							}
+						}
+					}
+					else
+					{
+						// Process an extra byte in a multi-byte sequence.
+						if((ch & (uint)0xC0) == (uint)0x80)
+						{
+							leftBits = ((leftBits << 6) | (ch & (uint)0x3F));
+							if(++leftSoFar >= leftSize)
+							{
+								// We have a complete character now.
+								if(leftBits < (uint)0x10000)
+								{
+									if(leftBits != (uint)0xFEFF)
+									{
+										if(posn >= length)
+										{
+											throw new ArgumentException
+												(_("Arg_InsufficientSpace"),
+												 "chars");
+										}
+										chars[posn++] = (char)leftBits;
+									}
+								}
+								else if(leftBits < (uint)0x110000)
+								{
+									if((posn + 2) > length)
+									{
+										throw new ArgumentException
+											(_("Arg_InsufficientSpace"),
+											 "chars");
+									}
+									leftBits -= (uint)0x10000;
+									chars[posn++] = (char)((leftBits >> 10) +
+														   (uint)0xD800);
+									chars[posn++] =
+										(char)((leftBits & (uint)0x3FF) +
+										       (uint)0xDC00);
+								}
+								else if(throwOnInvalid)
+								{
+									throw new ArgumentException
+										(_("Arg_InvalidUTF8"), "bytes");
+								}
+								leftSize = 0;
+							}
+						}
+						else
+						{
+							// Invalid UTF-8 sequence: clear and restart.
+							if(throwOnInvalid)
+							{
+								throw new ArgumentException
+									(_("Arg_InvalidUTF8"), "bytes");
+							}
+							leftSize = 0;
+							--byteIndex;
+							++byteCount;
+						}
+					}
+				}
+				if(flush && leftSize != 0 && throwOnInvalid)
+				{
+					// We had left-over bytes that didn't make up
+					// a complete UTF-8 character sequence.
+					throw new ArgumentException
+						(_("Arg_InvalidUTF8"), "bytes");
+				}
+				leftOverBits = leftBits;
+				leftOverCount = (leftSoFar | (leftSize << 4));
+
+				// Return the final length to the caller.
+				return posn - charIndex;
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex)
+			{
+				uint leftOverBits = 0;
+				uint leftOverCount = 0;
+				return InternalGetChars(bytes, byteIndex, byteCount,
+										chars, charIndex, ref leftOverBits,
+										ref leftOverCount, throwOnInvalid,
+										true);
+			}
+
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public override int GetMaxByteCount(int charCount)
+			{
+				if(charCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_NonNegative"));
+				}
+				return charCount * 4 + (emitIdentifier ? 3 : 0);
+			}
+
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public override int GetMaxCharCount(int byteCount)
+			{
+				if(byteCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_NonNegative"));
+				}
+				return byteCount;
+			}
+
+	// Get a UTF8-specific decoder that is attached to this instance.
+	public override Decoder GetDecoder()
+			{
+				return new UTF8Decoder(throwOnInvalid);
+			}
+
+	// Get a UTF8-specific encoder that is attached to this instance.
+	public override Encoder GetEncoder()
+			{
+				return new UTF8Encoder(emitIdentifier);
+			}
+
+	// Get the UTF8 preamble.
+	public override byte[] GetPreamble()
+			{
+				if(emitIdentifier)
+				{
+					byte[] pre = new byte [3];
+					pre[0] = (byte)0xEF;
+					pre[1] = (byte)0xBB;
+					pre[2] = (byte)0xBF;
+					return pre;
+				}
+				else
+				{
+					return new byte [0];
+				}
+			}
+
+	// Determine if this object is equal to another.
+	public override bool Equals(Object value)
+			{
+				UTF8Encoding enc = (value as UTF8Encoding);
+				if(enc != null)
+				{
+					return (codePage == enc.codePage &&
+							emitIdentifier == enc.emitIdentifier &&
+							throwOnInvalid == enc.throwOnInvalid);
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+	// Get the hash code for this object.
+	public override int GetHashCode()
+			{
+				return base.GetHashCode();
+			}
+
+#if !ECMA_COMPAT
+
+	// Get the mail body name for this encoding.
+	public override String BodyName
+			{
+				get
+				{
+					return "utf-8";
+				}
+			}
+
+	// Get the human-readable name for this encoding.
+	public override String EncodingName
+			{
+				get
+				{
+					return "Unicode (UTF-8)";
+				}
+			}
+
+	// Get the mail agent header name for this encoding.
+	public override String HeaderName
+			{
+				get
+				{
+					return "utf-8";
+				}
+			}
+
+	// Determine if this encoding can be displayed in a Web browser.
+	public override bool IsBrowserDisplay
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be saved from a Web browser.
+	public override bool IsBrowserSave
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be displayed in a mail/news agent.
+	public override bool IsMailNewsDisplay
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Determine if this encoding can be saved from a mail/news agent.
+	public override bool IsMailNewsSave
+			{
+				get
+				{
+					return true;
+				}
+			}
+
+	// Get the IANA-preferred Web name for this encoding.
+	public override String WebName
+			{
+				get
+				{
+					return "utf-8";
+				}
+			}
+
+	// Get the Windows code page represented by this object.
+	public override int WindowsCodePage
+			{
+				get
+				{
+					return UnicodeEncoding.UNICODE_CODE_PAGE;
+				}
+			}
+
+#endif // !ECMA_COMPAT
+
+	// UTF-8 decoder implementation.
+	private sealed class UTF8Decoder : Decoder
+	{
+		private bool throwOnInvalid;
+		private uint leftOverBits;
+		private uint leftOverCount;
+
+		// Constructor.
+		public UTF8Decoder(bool throwOnInvalid)
+				{
+					this.throwOnInvalid = throwOnInvalid;
+					leftOverBits = 0;
+					leftOverCount = 0;
+				}
+
+		// Override inherited methods.
+		public override int GetCharCount(byte[] bytes, int index, int count)
+				{
+					return InternalGetCharCount(bytes, index, count,
+												leftOverBits, leftOverCount,
+												throwOnInvalid, false);
+				}
+		public override int GetChars(byte[] bytes, int byteIndex,
+									 int byteCount, char[] chars,
+									 int charIndex)
+				{
+					return InternalGetChars(bytes, byteIndex, byteCount,
+											chars, charIndex,
+											ref leftOverBits,
+											ref leftOverCount,
+											throwOnInvalid, false);
+				}
+
+	} // class UTF8Decoder
+
+	// UTF-8 encoder implementation.
+	private sealed class UTF8Encoder : Encoder
+	{
+		private bool emitIdentifier;
+		private uint leftOver;
+
+		// Constructor.
+		public UTF8Encoder(bool emitIdentifier)
+				{
+					this.emitIdentifier = emitIdentifier;
+					leftOver = 0;
+				}
+
+		// Override inherited methods.
+		public override int GetByteCount(char[] chars, int index,
+										 int count, bool flush)
+				{
+					return InternalGetByteCount
+						(chars, index, count, leftOver,
+						 emitIdentifier, flush);
+				}
+		public override int GetBytes(char[] chars, int charIndex,
+									 int charCount, byte[] bytes,
+									 int byteCount, bool flush)
+				{
+					int result;
+					result = InternalGetBytes
+						(chars, charIndex, charCount, bytes, byteCount,
+						 ref leftOver, emitIdentifier, flush);
+					emitIdentifier = false;
+					return result;
+				}
+
+	} // class UTF8Encoder
+
+}; // class UTF8Encoding
+
+}; // namespace System.Text
diff --git a/mcs/class/corlib/System.Text/UnicodeEncoding.cs b/mcs/class/corlib/System.Text/UnicodeEncoding.cs
new file mode 100755
index 00000000000..bd6c6948d23
--- /dev/null
+++ b/mcs/class/corlib/System.Text/UnicodeEncoding.cs
@@ -0,0 +1,643 @@
+/*
+ * UnicodeEncoding.cs - Implementation of the
+ *		"System.Text.UnicodeEncoding" class.
+ *
+ * Copyright (c) 2001, 2002  Southern Storm Software, Pty Ltd
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining
+ * a copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included
+ * in all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR
+ * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+ * OTHER DEALINGS IN THE SOFTWARE.
+ */
+
+namespace System.Text
+{
+
+using System;
+
+public class UnicodeEncoding : Encoding
+{
+	// Magic numbers used by Windows for Unicode.
+	internal const int UNICODE_CODE_PAGE     = 1200;
+	internal const int BIG_UNICODE_CODE_PAGE = 1201;
+
+#if !ECMA_COMPAT
+	// Size of characters in this encoding.
+	public const int CharSize = 2;
+#endif
+
+	// Internal state.
+	private bool bigEndian;
+	private bool byteOrderMark;
+
+	// Constructors.
+	public UnicodeEncoding() : base(UNICODE_CODE_PAGE)
+			{
+				bigEndian = false;
+				byteOrderMark = true;
+			}
+	public UnicodeEncoding(bool bigEndian, bool byteOrderMark)
+			: base((bigEndian ? BIG_UNICODE_CODE_PAGE : UNICODE_CODE_PAGE))
+			{
+				this.bigEndian = bigEndian;
+				this.byteOrderMark = byteOrderMark;
+			}
+
+	// Get the number of bytes needed to encode a character buffer.
+	public override int GetByteCount(char[] chars, int index, int count)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(index < 0 || index > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (chars.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				return count * 2 + (byteOrderMark ? 2 : 0);
+			}
+
+	// Convenience wrappers for "GetByteCount".
+	public override int GetByteCount(String s)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				return s.Length * 2 + (byteOrderMark ? 2 : 0);
+			}
+
+	// Get the bytes that result from encoding a character buffer.
+	public override int GetBytes(char[] chars, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+				if(charCount < 0 || charCount > (chars.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_Array"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if((bytes.Length - byteIndex) <
+					(charCount * 2 + (byteOrderMark ? 2 : 0)))
+				{
+					throw new ArgumentException
+						(_("Arg_InsufficientSpace"));
+				}
+				int posn = byteIndex;
+				char ch;
+				if(bigEndian)
+				{
+					if(byteOrderMark)
+					{
+						bytes[posn++] = (byte)0xFE;
+						bytes[posn++] = (byte)0xFF;
+					}
+					while(charCount-- > 0)
+					{
+						ch = chars[charIndex++];
+						bytes[posn++] = (byte)(ch >> 8);
+						bytes[posn++] = (byte)ch;
+					}
+				}
+				else
+				{
+					if(byteOrderMark)
+					{
+						bytes[posn++] = (byte)0xFF;
+						bytes[posn++] = (byte)0xFE;
+					}
+					while(charCount-- > 0)
+					{
+						ch = chars[charIndex++];
+						bytes[posn++] = (byte)ch;
+						bytes[posn++] = (byte)(ch >> 8);
+					}
+				}
+				return posn - byteIndex;
+			}
+
+	// Convenience wrappers for "GetBytes".
+	public override int GetBytes(String s, int charIndex, int charCount,
+								 byte[] bytes, int byteIndex)
+			{
+				if(s == null)
+				{
+					throw new ArgumentNullException("s");
+				}
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(charIndex < 0 || charIndex > s.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_StringIndex"));
+				}
+				if(charCount < 0 || charCount > (s.Length - charIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_StringRange"));
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if((bytes.Length - byteIndex) <
+					(charCount * 2 + (byteOrderMark ? 2 : 0)))
+				{
+					throw new ArgumentException
+						(_("Arg_InsufficientSpace"));
+				}
+				int posn = byteIndex;
+				char ch;
+				if(bigEndian)
+				{
+					if(byteOrderMark)
+					{
+						bytes[posn++] = (byte)0xFE;
+						bytes[posn++] = (byte)0xFF;
+					}
+					while(charCount-- > 0)
+					{
+						ch = s[charIndex++];
+						bytes[posn++] = (byte)(ch >> 8);
+						bytes[posn++] = (byte)ch;
+					}
+				}
+				else
+				{
+					if(byteOrderMark)
+					{
+						bytes[posn++] = (byte)0xFF;
+						bytes[posn++] = (byte)0xFE;
+					}
+					while(charCount-- > 0)
+					{
+						ch = s[charIndex++];
+						bytes[posn++] = (byte)ch;
+						bytes[posn++] = (byte)(ch >> 8);
+					}
+				}
+				return posn - byteIndex;
+			}
+
+	// Get the number of characters needed to decode a byte buffer.
+	public override int GetCharCount(byte[] bytes, int index, int count)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(index < 0 || index > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("index", _("ArgRange_Array"));
+				}
+				if(count < 0 || count > (bytes.Length - index))
+				{
+					throw new ArgumentOutOfRangeException
+						("count", _("ArgRange_Array"));
+				}
+				if(count >= 2)
+				{
+					if((bytes[0] == (byte)0xFE && bytes[1] == (byte)0xFF) ||
+					   (bytes[0] == (byte)0xFF && bytes[1] == (byte)0xFE))
+					{
+						return ((count - 1) / 2);
+					}
+				}
+				return count / 2;
+			}
+
+	// Get the characters that result from decoding a byte buffer.
+	public override int GetChars(byte[] bytes, int byteIndex, int byteCount,
+								 char[] chars, int charIndex)
+			{
+				if(bytes == null)
+				{
+					throw new ArgumentNullException("bytes");
+				}
+				if(chars == null)
+				{
+					throw new ArgumentNullException("chars");
+				}
+				if(byteIndex < 0 || byteIndex > bytes.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteIndex", _("ArgRange_Array"));
+				}
+				if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_Array"));
+				}
+				if(charIndex < 0 || charIndex > chars.Length)
+				{
+					throw new ArgumentOutOfRangeException
+						("charIndex", _("ArgRange_Array"));
+				}
+
+				// Determine the byte order in the incoming buffer.
+				bool isBigEndian;
+				if(byteCount >= 2)
+				{
+					if(bytes[0] == (byte)0xFE && bytes[1] == (byte)0xFF)
+					{
+						isBigEndian = true;
+						byteCount -= 2;
+						byteIndex += 2;
+					}
+					else if(bytes[0] == (byte)0xFF && bytes[1] == (byte)0xFE)
+					{
+						isBigEndian = false;
+						byteCount -= 2;
+						byteIndex += 2;
+					}
+					else
+					{
+						isBigEndian = bigEndian;
+					}
+				}
+				else
+				{
+					isBigEndian = bigEndian;
+				}
+
+				// Validate that we have sufficient space in "chars".
+				if((chars.Length - charIndex) < (byteCount / 2))
+				{
+					throw new ArgumentException
+						(_("Arg_InsufficientSpace"));
+				}
+
+				// Convert the characters.
+				int posn = charIndex;
+				if(isBigEndian)
+				{
+					while(byteCount >= 2)
+					{
+						chars[posn++] =
+							((char)((((int)(bytes[byteIndex])) << 8) |
+									 ((int)(bytes[byteIndex + 1]))));
+						byteIndex += 2;
+						byteCount -= 2;
+					}
+				}
+				else
+				{
+					while(byteCount >= 2)
+					{
+						chars[posn++] =
+							((char)((((int)(bytes[byteIndex + 1])) << 8) |
+									 ((int)(bytes[byteIndex]))));
+						byteIndex += 2;
+						byteCount -= 2;
+					}
+				}
+				return posn - charIndex;
+			}
+
+	// Get the maximum number of bytes needed to encode a
+	// specified number of characters.
+	public override int GetMaxByteCount(int charCount)
+			{
+				if(charCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("charCount", _("ArgRange_NonNegative"));
+				}
+				return charCount * 2 + (byteOrderMark ? 2 : 0);
+			}
+
+	// Get the maximum number of characters needed to decode a
+	// specified number of bytes.
+	public override int GetMaxCharCount(int byteCount)
+			{
+				if(byteCount < 0)
+				{
+					throw new ArgumentOutOfRangeException
+						("byteCount", _("ArgRange_NonNegative"));
+				}
+				return byteCount / 2;
+			}
+
+	// Get a Unicode-specific decoder that is attached to this instance.
+	public override Decoder GetDecoder()
+			{
+				return new UnicodeDecoder(bigEndian);
+			}
+
+	// Get the Unicode preamble.
+	public override byte[] GetPreamble()
+			{
+				if(byteOrderMark)
+				{
+					byte[] preamble = new byte[2];
+					if(bigEndian)
+					{
+						preamble[0] = (byte)0xFE;
+						preamble[1] = (byte)0xFF;
+					}
+					else
+					{
+						preamble[0] = (byte)0xFF;
+						preamble[1] = (byte)0xFE;
+					}
+					return preamble;
+				}
+				else
+				{
+					return new byte [0];
+				}
+			}
+
+	// Determine if this object is equal to another.
+	public override bool Equals(Object value)
+			{
+				UnicodeEncoding enc = (value as UnicodeEncoding);
+				if(enc != null)
+				{
+					return (codePage == enc.codePage &&
+							bigEndian == enc.bigEndian &&
+							byteOrderMark == enc.byteOrderMark);
+				}
+				else
+				{
+					return false;
+				}
+			}
+
+	// Get the hash code for this object.
+	public override int GetHashCode()
+			{
+				return base.GetHashCode();
+			}
+
+#if !ECMA_COMPAT
+
+	// Get the mail body name for this encoding.
+	public override String BodyName
+			{
+				get
+				{
+					if(bigEndian)
+					{
+						return "unicodeFFFE";
+					}
+					else
+					{
+						return "utf-16";
+					}
+				}
+			}
+
+	// Get the human-readable name for this encoding.
+	public override String EncodingName
+			{
+				get
+				{
+					if(bigEndian)
+					{
+						return "Unicode (Big-Endian)";
+					}
+					else
+					{
+						return "Unicode";
+					}
+				}
+			}
+
+	// Get the mail agent header name for this encoding.
+	public override String HeaderName
+			{
+				get
+				{
+					if(bigEndian)
+					{
+						return "unicodeFFFE";
+					}
+					else
+					{
+						return "utf-16";
+					}
+				}
+			}
+
+	// Determine if this encoding can be saved from a Web browser.
+	public override bool IsBrowserSave
+			{
+				get
+				{
+					return !bigEndian;
+				}
+			}
+
+	// Get the IANA-preferred Web name for this encoding.
+	public override String WebName
+			{
+				get
+				{
+					if(bigEndian)
+					{
+						return "unicodeFFFE";
+					}
+					else
+					{
+						return "utf-16";
+					}
+				}
+			}
+
+	// Get the Windows code page represented by this object.
+	public override int WindowsCodePage
+			{
+				get
+				{
+					// Windows reports the same code page number for
+					// both the little-endian and big-endian forms.
+					return UNICODE_CODE_PAGE;
+				}
+			}
+
+#endif // !ECMA_COMPAT
+
+	// Unicode decoder implementation.
+	private sealed class UnicodeDecoder : Decoder
+	{
+		private bool bigEndian;
+		private int leftOverByte;
+
+		// Constructor.
+		public UnicodeDecoder(bool bigEndian)
+				{
+					this.bigEndian = bigEndian;
+					leftOverByte = -1;
+				}
+
+		// Override inherited methods.
+		public override int GetCharCount(byte[] bytes, int index, int count)
+				{
+					if(bytes == null)
+					{
+						throw new ArgumentNullException("bytes");
+					}
+					if(index < 0 || index > bytes.Length)
+					{
+						throw new ArgumentOutOfRangeException
+							("index", _("ArgRange_Array"));
+					}
+					if(count < 0 || count > (bytes.Length - index))
+					{
+						throw new ArgumentOutOfRangeException
+							("count", _("ArgRange_Array"));
+					}
+					if(leftOverByte != -1)
+					{
+						return (count + 1) / 2;
+					}
+					else
+					{
+						return count / 2;
+					}
+				}
+		public override int GetChars(byte[] bytes, int byteIndex,
+									 int byteCount, char[] chars,
+									 int charIndex)
+				{
+					if(bytes == null)
+					{
+						throw new ArgumentNullException("bytes");
+					}
+					if(chars == null)
+					{
+						throw new ArgumentNullException("chars");
+					}
+					if(byteIndex < 0 || byteIndex > bytes.Length)
+					{
+						throw new ArgumentOutOfRangeException
+							("byteIndex", _("ArgRange_Array"));
+					}
+					if(byteCount < 0 || byteCount > (bytes.Length - byteIndex))
+					{
+						throw new ArgumentOutOfRangeException
+							("byteCount", _("ArgRange_Array"));
+					}
+					if(charIndex < 0 || charIndex > chars.Length)
+					{
+						throw new ArgumentOutOfRangeException
+							("charIndex", _("ArgRange_Array"));
+					}
+	
+					// Convert the characters.
+					int posn = charIndex;
+					bool isBigEndian = bigEndian;
+					int leftOver = leftOverByte;
+					int length = chars.Length;
+					char ch;
+					while(byteCount > 0)
+					{
+						if(leftOver != -1)
+						{
+							if(isBigEndian)
+							{
+								ch = ((char)((leftOver << 8) |
+										    ((int)(bytes[byteIndex]))));
+							}
+							else
+							{
+								ch = ((char)(leftOver |
+									    	 (((int)(bytes[byteIndex])) << 8)));
+							}
+							leftOver = -1;
+							++byteIndex;
+							--byteCount;
+						}
+						else if(byteCount > 1)
+						{
+							if(isBigEndian)
+							{
+								ch = ((char)((((int)(bytes[byteIndex])) << 8) |
+											  ((int)(bytes[byteIndex + 1]))));
+							}
+							else
+							{
+								ch = ((char)((((int)(bytes[byteIndex + 1]))
+													<< 8) |
+										      ((int)(bytes[byteIndex]))));
+							}
+							byteIndex += 2;
+							byteCount -= 2;
+						}
+						else
+						{
+							leftOver = (int)(bytes[byteIndex]);
+							break;
+						}
+						if(ch == '\uFFFE')
+						{
+							// Switch byte orders.
+							bigEndian = !bigEndian;
+						}
+						else if(ch != '\uFEFF')
+						{
+							// Ordinary character.
+							if(posn < length)
+							{
+								chars[posn++] = ch;
+							}
+							else
+							{
+								throw new ArgumentException
+									(_("Arg_InsufficientSpace"));
+							}
+						}
+					}
+					leftOverByte = leftOver;
+					bigEndian = isBigEndian;
+
+					// Finished - return the converted length.
+					return posn - charIndex;
+				}
+
+	} // class UnicodeDecoder
+
+}; // class UnicodeEncoding
+
+}; // namespace System.Text
diff --git a/mcs/class/corlib/System.Threading/ApartmentState.cs b/mcs/class/corlib/System.Threading/ApartmentState.cs
new file mode 100755
index 00000000000..0dfc50785b4
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ApartmentState.cs
@@ -0,0 +1,18 @@
+//
+// System.Threading.ApartmentState.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public enum ApartmentState {
+		STA = 0,
+		MTA = 1,
+		Unknown = 2
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/AutoResetEvent.cs b/mcs/class/corlib/System.Threading/AutoResetEvent.cs
new file mode 100755
index 00000000000..3b5d71e63be
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/AutoResetEvent.cs
@@ -0,0 +1,35 @@
+//
+// System.Threading.AutoResetEvent.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//   Veronica De Santis (veron78@interfree.it)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Threading 
+{
+
+ 	public sealed class AutoResetEvent : WaitHandle 
+	{
+		// Constructor
+		public AutoResetEvent(bool initialState) {
+			os_handle = NativeEventCalls.CreateEvent_internal(false,initialState,null);
+		}
+
+		// Methods
+
+		public bool Set() {
+			return(NativeEventCalls.SetEvent_internal(os_handle));
+		}
+
+		public bool Reset() {
+			return(NativeEventCalls.ResetEvent_internal(os_handle));
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/ChangeLog b/mcs/class/corlib/System.Threading/ChangeLog
new file mode 100644
index 00000000000..7192699fbd9
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ChangeLog
@@ -0,0 +1,161 @@
+2002-08-14  Dick Porter  <dick@ximian.com>
+
+	* Thread.cs: Make CurrentUICulture act the same as CurrentCulture
+	for now.
+
+2002-08-12  Dietmar Maurer  <dietmar@ximian.com>
+
+	* ThreadAbortException.cs: impl. ExceptionState property.
+
+	* Thread.cs: moved all instance variables to the start of the
+	class. added support for Thread::Abort()
+
+2002-04-30  Dick Porter  <dick@ximian.com>
+
+	* Thread.cs: If LocalDataStoreSlot already has data set, remove it
+	before adding a new one.
+
+	Use the Thread object destructor to tell the runtime to close the
+	thread handle.
+
+2002-04-14 Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* Interlocked.cs: made all methods icalls.
+
+2002-04-14  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IOCompletionCallback.cs: added attributes to the delegate
+	(CLSCompliant(false) and Serializable).
+
+2002-04-14 Patrik Torstensson <patrik.torstensson@labs2.com>
+	* Thread.cs: Fixed IsThreadPoolThread to use a internal property instead of extending 
+				 the threadstate enum.
+	* ThreadPool.cs: Now using the internal Isthreadpoolthread property
+	* ThreadState.cs: removed non-standard enum (ThreadPoolThread)
+
+2002-04-14 Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* ThreadState.cs: Added enum for threadpool thread
+	* Thread.cs: changed the set/clr_state to be internal (used from threadpool)
+	* Thread.cs: Added IsThreadPoolThread
+	* ThreadPool.cs: Implementation of QueueUserWorkItem
+
+Wed Feb 13 21:51:30 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Thread.cs: implement CurrentCulture property needed by
+	Convert.ChangeType() (used when compiling enums).
+
+2002-01-23  Dick Porter  <dick@ximian.com>
+
+	* ManualResetEvent.cs: 
+	* AutoResetEvent.cs: Fixed DOS line endings
+
+2002-01-22  Veronica De Santis <veron78@interfree.it>   
+        
+	* NativeEventCalls : Class that contains internal calls shared by Auto 
+	  		     and Manual Reset Events
+	* AutoResetEvents.cs : Added class AutoResetEvents and its implementation
+	* ManualResetEvents.cs : Added class ManualResetEvents and its implementation
+
+2002-01-16  Veronica De Santis <veron78@interfree.it>   
+        
+	* WaitHandle.cs : Renamed handle to os_handle and make it protected
+	                  instead of private.
+	* Mutex.cs : Write the System.Threading.Mutex methods ( constructors 
+	             and the ReleaseMutex)
+
+2002-01-15  Dick Porter  <dick@ximian.com>
+
+	* WaitHandle.cs:
+	* Thread.cs: Make the runtime's idea of infinite timeouts coincide
+	with the class library's
+
+2002-01-10  Dick Porter  <dick@ximian.com>
+
+	* WaitHandle.cs: Added checks for too many handles and null
+	handles in WaitAll() and WaitAny
+	
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* AutoResetEvent.cs, ManualResetEvent.cs, Monitor.cs : MonoTODO
+	decoration.
+
+	* Mutex.cs, Overlapped.cs, ReaderWriterLock.cs, RegisteredWaitHandle.cs,
+	Thread.cs, ThreadAbortException.cs, ThreadPool.cs, Timer.cs, WaitHandler.cs : Ditto.
+
+2001-12-11  Dick Porter  <dick@ximian.com>
+
+	* WaitHandle.cs: Implemented WaitAll(), WaitAny() and WaitOne() as
+	internal calls.
+
+2001-11-26  Dick Porter  <dick@ximian.com>
+
+	* Thread.cs: DataSlot uses a single system TLS slot, and a
+	hashtable per thread.  Some minor changes to reflect the new
+	internal calls using the new IO library, and the newly-supported
+	bool returns from internal calls.
+
+	* Monitor.cs: Use bool returns from internal calls now they are
+	supported by the runtime.  Coalesce enter with the try_enter
+	internal call.
+
+Wed Nov 14 17:06:18 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Overlapped.cs, ThreadPool.cs, Timer.cs: CLSCompliant updates.
+
+2001-10-03  Dick Porter  <dick@ximian.com>
+
+	* Monitor.cs: Implemented all methods except the two Wait()
+	methods that take boolean parameters
+
+2001-09-28  Dick Porter  <dick@ximian.com>
+
+	* Thread.cs: Implemented AllocateDataSlot(),
+	AllocateNamedDataSlot(), FreeNamedDataSlot(), GetData(),
+	GetNamedDataSlot(), SetData(), IsBackground.  Reworked Thread()
+	and Start() to avoid a race condition. Added thread-safe state
+	changing private operations.
+
+	* Monitor.cs: Comment out the GetType() calls because it isn't implemented yet
+
+2001-09-25  Dick Porter  <dick@ximian.com>
+
+	* Thread.cs: Implement Join and timed Join, set correct state
+	around Start, Join and Sleep calls, implement IsAlive and
+	ThreadState properties.
+
+	* ThreadState.cs (Threading): Added StopRequested,
+	SuspendRequested, Suspended values
+
+2001-09-23  Dick Porter  <dick@ximian.com>
+
+	* Thread.cs: Implemented CurrentThread and Sleep (both versions)
+	with internal calls, and Name.
+
+2001-09-21  Dick Porter  <dick@ximian.com>
+
+	* Thread.cs: Implement Thread(ThreadStart) constructor and Start()
+	with an internal call
+
+	* WaitHandle.cs: Close calls Dispose(false)
+
+2001-09-13  Dick Porter  <dick@ximian.com>
+
+	* ApartmentState.cs (Threading): Set the correct enum values
+
+2001-09-13  Dick Porter  <dick@ximian.com>
+
+	* ApartmentState.cs, AutoResetEvent.cs, IOCompletionCallback.cs,
+	Interlocked.cs, LockCookie.cs, ManualResetEvent.cs, Monitor.cs,
+	Mutex.cs, NativeOverlapped.cs, Overlapped.cs, ReaderWriterLock.cs,
+	RegisteredWaitHandle.cs, SynchronizationLockException.cs,
+	Thread.cs, ThreadAbortException.cs, ThreadInterruptedException.cs,
+	ThreadPool.cs, ThreadStart.cs, ThreadStateException.cs,
+	Timeout.cs, Timer.cs, TimerCallback.cs, WaitCallback.cs,
+	WaitHandle.cs, WaitOrTimerCallback.cs: System.Threading class
+	stubs.
+	
+2001-07-18  Michael Lambert <michaellambert@email.com>
+
+	* ThreadPriority.cs, ThreadState.cs: Add.
diff --git a/mcs/class/corlib/System.Threading/IOCompletionCallback.cs b/mcs/class/corlib/System.Threading/IOCompletionCallback.cs
new file mode 100755
index 00000000000..d384f8a29b7
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/IOCompletionCallback.cs
@@ -0,0 +1,18 @@
+//
+// System.Threading.IOCompletionCallback.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	// 'unsafe' wasn't in the spec, but the compiler insists because of
+	// the pointer.
+	[Serializable]
+	[CLSCompliant(false)]
+	public unsafe delegate void IOCompletionCallback(uint errorCode, uint numBytes, NativeOverlapped *pOVERLAP);
+}
diff --git a/mcs/class/corlib/System.Threading/Interlocked.cs b/mcs/class/corlib/System.Threading/Interlocked.cs
new file mode 100755
index 00000000000..d5d6a28df3a
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/Interlocked.cs
@@ -0,0 +1,51 @@
+//
+// System.Threading.Interlocked.cs
+//
+// Author:
+//	  Patrik Torstensson (patrik.torstensson@labs2.com)
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Threading
+{
+	public sealed class Interlocked 
+	{
+		private Interlocked () {}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static int CompareExchange(ref int location1, int value, int comparand);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static object CompareExchange(ref object location1, object value, object comparand);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static float CompareExchange(ref float location1, float value, float comparand);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static int Decrement(ref int location);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static long Decrement(ref long location);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static int Increment(ref int location);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static long Increment(ref long location);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static int Exchange(ref int location1, int value);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static object Exchange(ref object location1, object value);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static float Exchange(ref float location1, float value);
+	}
+}
+
diff --git a/mcs/class/corlib/System.Threading/LockCookie.cs b/mcs/class/corlib/System.Threading/LockCookie.cs
new file mode 100755
index 00000000000..e3d226c8b0e
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/LockCookie.cs
@@ -0,0 +1,17 @@
+//
+// System.Threading.LockCookie.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	[Serializable]
+	public struct LockCookie
+		{
+		}
+}
diff --git a/mcs/class/corlib/System.Threading/ManualResetEvent.cs b/mcs/class/corlib/System.Threading/ManualResetEvent.cs
new file mode 100755
index 00000000000..a3a3be44112
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ManualResetEvent.cs
@@ -0,0 +1,38 @@
+//
+// System.Threading.ManualResetEvent.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//   Veronica De Santis (veron78@interfree.it)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Threading 
+{
+
+ 	public sealed class ManualResetEvent : WaitHandle 
+	{
+		// Constructor
+		public ManualResetEvent (bool initialState)
+		{
+			os_handle = NativeEventCalls.CreateEvent_internal (true, initialState, null);
+		}
+
+		// Methods
+
+		public bool Set()
+		{
+			return (NativeEventCalls.SetEvent_internal (os_handle));
+		}
+
+		public bool Reset()
+		{
+			return(NativeEventCalls.ResetEvent_internal (os_handle));
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/Monitor.cs b/mcs/class/corlib/System.Threading/Monitor.cs
new file mode 100755
index 00000000000..14fe105e6f1
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/Monitor.cs
@@ -0,0 +1,219 @@
+//
+// System.Threading.Monitor.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Threading
+{
+	public sealed class Monitor
+	{
+		private Monitor () {}
+
+		// Grabs the mutex on object 'obj', with a maximum
+		// wait time 'ms' but doesn't block - if it can't get
+		// the lock it returns false, true if it can
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static bool Monitor_try_enter(object obj, int ms);
+		public static void Enter(object obj) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			//if(obj.GetType().IsValueType==true) {
+			//	throw new ArgumentException("Value type");
+			//}
+
+			Monitor_try_enter(obj, Timeout.Infinite);
+		}
+
+		// Releases the mutex on object 'obj'
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Monitor_exit(object obj);
+
+		// Checks whether the current thread currently owns
+		// the lock on object 'obj'
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static bool Monitor_test_owner(object obj);
+		
+		public static void Exit(object obj) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			//if(obj.GetType().IsValueType==true) {
+			//	throw new ArgumentException("Value type");
+			//}
+
+			if(Monitor_test_owner(obj)==false) {
+				throw new SynchronizationLockException("The current thread does not own the lock");
+			}
+			
+			Monitor_exit(obj);
+		}
+
+		// Signals one of potentially many objects waiting on
+		// object 'obj'
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Monitor_pulse(object obj);
+
+		// Checks whether object 'obj' is currently synchronised
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static bool Monitor_test_synchronised(object obj);
+
+		public static void Pulse(object obj) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			if(Monitor_test_synchronised(obj)==false) {
+				throw new SynchronizationLockException("Object is not synchronised");
+			}
+
+			Monitor_pulse(obj);
+		}
+
+		// Signals all of potentially many objects waiting on
+		// object 'obj'
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Monitor_pulse_all(object obj);
+
+		public static void PulseAll(object obj) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			if(Monitor_test_synchronised(obj)==false) {
+				throw new SynchronizationLockException("Object is not synchronised");
+			}
+
+			Monitor_pulse_all(obj);
+		}
+
+		public static bool TryEnter(object obj) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			//if(obj.GetType().IsValueType==true) {
+			//	throw new ArgumentException("Value type");
+			//}
+			
+			return(Monitor_try_enter(obj, 0));
+		}
+
+		public static bool TryEnter(object obj, int millisecondsTimeout) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			//if(obj.GetType().IsValueType==true) {
+			//	throw new ArgumentException("Value type");
+			//}
+
+			// LAMESPEC: should throw an exception when ms<0, but
+			// Timeout.Infinite is -1
+			if(millisecondsTimeout == Timeout.Infinite) {
+				Enter(obj);
+				return(true);
+			}
+			
+			if(millisecondsTimeout<0) {
+				throw new ArgumentException("millisecondsTimeout negative");
+			}
+			
+			return(Monitor_try_enter(obj, millisecondsTimeout));
+		}
+
+		public static bool TryEnter(object obj, TimeSpan timeout) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			//if(obj.GetType().IsValueType==true) {
+			//	throw new ArgumentException("Value type");
+			//}
+
+			// LAMESPEC: should throw an exception when ms<0, but
+			// Timeout.Infinite is -1
+			if(timeout.Milliseconds == Timeout.Infinite) {
+				Enter(obj);
+				return(true);
+			}
+
+			if(timeout.Milliseconds < 0 ||
+			   timeout.Milliseconds > Int32.MaxValue) {
+				throw new ArgumentOutOfRangeException("timeout out of range");
+			}
+			
+			return(Monitor_try_enter(obj, timeout.Milliseconds));
+		}
+
+		// Waits for a signal on object 'obj' with maximum
+		// wait time 'ms'. Returns true if the object was
+		// signalled, false if it timed out
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static bool Monitor_wait(object obj, int ms);
+
+		public static bool Wait(object obj) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			if(Monitor_test_synchronised(obj)==false) {
+				throw new SynchronizationLockException("Object is not synchronised");
+			}
+
+			return(Monitor_wait(obj, 0));
+		}
+
+		public static bool Wait(object obj, int millisecondsTimeout) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			if(Monitor_test_synchronised(obj)==false) {
+				throw new SynchronizationLockException("Object is not synchronised");
+			}
+			// LAMESPEC: no mention of timeout sanity checking
+
+			return(Monitor_wait(obj, millisecondsTimeout));
+		}
+
+		public static bool Wait(object obj, TimeSpan timeout) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			// LAMESPEC: says to throw ArgumentException too
+			if(timeout.Milliseconds < 0 || timeout.Milliseconds > Int32.MaxValue) {
+				throw new ArgumentOutOfRangeException("timeout out of range");
+			}
+			if(Monitor_test_synchronised(obj)==false) {
+				throw new SynchronizationLockException("Object is not synchronised");
+			}
+
+			return(Monitor_wait(obj, timeout.Milliseconds));
+		}
+
+		[MonoTODO]
+		public static bool Wait(object obj, int millisecondsTimeout, bool exitContext) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			// FIXME when I understand what a
+			// "synchronisation domain" is and does
+			return(false);
+		}
+
+		[MonoTODO]
+		public static bool Wait(object obj, TimeSpan timeout, bool exitContext) {
+			if(obj==null) {
+				throw new ArgumentNullException("Object is null");
+			}
+			// LAMESPEC: says to throw ArgumentException too
+			if(timeout.Milliseconds < 0 || timeout.Milliseconds > Int32.MaxValue) {
+				throw new ArgumentOutOfRangeException("timeout out of range");
+			}
+			
+			// FIXME when I understand what a
+			// "synchronisation domain" is and does
+			return(false);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/Mutex.cs b/mcs/class/corlib/System.Threading/Mutex.cs
new file mode 100755
index 00000000000..f0926bf023a
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/Mutex.cs
@@ -0,0 +1,49 @@
+//
+// System.Threading.Mutex.cs
+//
+// Author:
+//
+//   Dick Porter (dick@ximian.com)
+//   Veronica De Santis (veron78@interfree.it)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Threading
+{
+	public sealed class Mutex : WaitHandle 
+	{
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern IntPtr  CreateMutex_internal(
+		                                         bool initiallyOwned,
+		                                         string name);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern void ReleaseMutex_internal(IntPtr handle);
+
+		public Mutex() {
+			os_handle=CreateMutex_internal(false,null);
+		}
+		
+		public Mutex(bool initiallyOwned) {
+			os_handle=CreateMutex_internal(initiallyOwned,null);
+		}
+
+		public Mutex(bool initiallyOwned, string name) {				
+			os_handle=CreateMutex_internal(initiallyOwned,name);	
+		}
+	
+
+		public Mutex(bool initiallyOwned, string name, out bool gotOwnership) {
+			os_handle=CreateMutex_internal(initiallyOwned,name);
+			gotOwnership=false;
+		}
+	
+		public void ReleaseMutex() {
+			ReleaseMutex_internal(os_handle);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/NativeEventCalls.cs b/mcs/class/corlib/System.Threading/NativeEventCalls.cs
new file mode 100755
index 00000000000..08dd8363f23
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/NativeEventCalls.cs
@@ -0,0 +1,28 @@
+//
+// System.Threading.AutoResetEvent.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//   Veronica De Santis (veron78@interfree.it)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System.Threading 
+{
+ 	internal sealed class NativeEventCalls
+	{
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public static extern IntPtr CreateEvent_internal(bool manual,bool initial,string name);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public static extern bool SetEvent_internal(IntPtr handle);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public static extern bool ResetEvent_internal(IntPtr handle);
+	
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/NativeOverlapped.cs b/mcs/class/corlib/System.Threading/NativeOverlapped.cs
new file mode 100755
index 00000000000..2f681fba4ba
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/NativeOverlapped.cs
@@ -0,0 +1,27 @@
+//
+// System.Threading.NativeOverlapped.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.InteropServices;
+
+namespace System.Threading
+{
+	public struct NativeOverlapped {
+		public int EventHandle;
+		public int InternalHigh;
+		public int InternalLow;
+		public int OffsetHigh;
+		public int OffsetLow;
+
+		// (fields disappeared beta2 -> 1.0)
+
+		// public GCHandle ReservedClassLib;
+		// public int ReservedCOR1;
+		// public GCHandle ReservedCOR2;
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/Overlapped.cs b/mcs/class/corlib/System.Threading/Overlapped.cs
new file mode 100755
index 00000000000..25f33bf8d5d
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/Overlapped.cs
@@ -0,0 +1,92 @@
+//
+// System.Threading.Overlapped.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public class Overlapped
+	{
+		[CLSCompliant(false)][MonoTODO]
+		unsafe public static void Free(NativeOverlapped *nativeOverlappedPtr) {
+			// FIXME
+		}
+
+		[CLSCompliant(false)][MonoTODO]
+		unsafe public static Overlapped Unpack(NativeOverlapped *nativeOverlappedPtr) {
+			// FIXME
+			return(new Overlapped());
+		}
+
+		[MonoTODO]
+		public Overlapped() {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public Overlapped(int offsetLo, int offsetHi, int hEvent, IAsyncResult ar) {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public IAsyncResult AsyncResult {
+			get {
+				// FIXME
+				return(null);
+			}
+			
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public int EventHandle {
+			get {
+				// FIXME
+				return(0);
+			}
+			
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public int OffsetHigh {
+			get {
+				// FIXME
+				return(0);
+			}
+			
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public int OffsetLow {
+			get {
+				// FIXME
+				return(0);
+			}
+			
+			set {
+			}
+		}
+
+		[CLSCompliant(false)][MonoTODO]
+		unsafe public NativeOverlapped *Pack(IOCompletionCallback iocb) {
+			// FIXME
+			return(null);
+		}
+		
+		[CLSCompliant(false)][MonoTODO]
+		unsafe public NativeOverlapped *UnsafePack(IOCompletionCallback iocb) {
+			// FIXME
+			return(null);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/ReaderWriterLock.cs b/mcs/class/corlib/System.Threading/ReaderWriterLock.cs
new file mode 100755
index 00000000000..95784811682
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ReaderWriterLock.cs
@@ -0,0 +1,109 @@
+//
+// System.Threading.ReaderWriterLock.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public sealed class ReaderWriterLock
+	{
+		[MonoTODO]
+		public ReaderWriterLock() {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public bool IsReaderLockHeld {
+			get {
+				// FIXME
+				return(false);
+			}
+		}
+
+		[MonoTODO]
+		public bool IsWriterLockHeld {
+			get {
+				// FIXME
+				return(false);
+			}
+		}
+
+		[MonoTODO]
+		public int WriterSeqNum {
+			get {
+				// FIXME
+				return(0);
+			}
+		}
+
+		
+		[MonoTODO]
+		public void AcquireReaderLock(int millisecondsTimeout) {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public void AcquireReaderLock(TimeSpan timeout) {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public void AcquireWriterLock(int millisecondsTimeout) {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public void AcquireWriterLock(TimeSpan timeout) {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public bool AnyWritersSince(int seqNum) {
+			// FIXME
+			return(false);
+		}
+
+		[MonoTODO]
+		public void DowngradeFromWriterLock(ref LockCookie lockCookie) {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public LockCookie ReleaseLock() {
+			// FIXME
+			return(new LockCookie());
+		}
+
+		[MonoTODO]
+		public void ReleaseReaderLock() {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public void ReleaseWriterLock() {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public void RestoreLock(ref LockCookie lockCookie) {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public LockCookie UpgradeToWriterLock(int millisecondsTimeout) {
+			// FIXME
+			return(new LockCookie());
+		}
+		
+		[MonoTODO]
+		public LockCookie UpgradeToWriterLock(TimeSpan timeout) {
+			// FIXME
+			return(new LockCookie());
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/RegisteredWaitHandle.cs b/mcs/class/corlib/System.Threading/RegisteredWaitHandle.cs
new file mode 100755
index 00000000000..8cf4d449da8
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/RegisteredWaitHandle.cs
@@ -0,0 +1,28 @@
+//
+// System.Threading.RegisteredWaitHandle.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public sealed class RegisteredWaitHandle : MarshalByRefObject
+	{
+		internal RegisteredWaitHandle () {}
+
+		[MonoTODO]
+		public bool Unregister(WaitHandle waitObject) {
+			// FIXME
+			return(false);
+		}
+
+		[MonoTODO]
+		~RegisteredWaitHandle() {
+			// FIXME
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/SynchronizationLockException.cs b/mcs/class/corlib/System.Threading/SynchronizationLockException.cs
new file mode 100755
index 00000000000..7d5c8090e17
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/SynchronizationLockException.cs
@@ -0,0 +1,33 @@
+//
+// System.Threading.SynchronizationLockException.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+
+namespace System.Threading
+{
+	[Serializable]
+	public class SynchronizationLockException : SystemException
+	{
+		public SynchronizationLockException()
+			: base ("Synchronization Error") {
+		}
+
+		public SynchronizationLockException(string message)
+			: base (message) {
+		}
+
+		protected SynchronizationLockException(SerializationInfo info, StreamingContext context)
+			: base (info, context) {
+		}
+
+		public SynchronizationLockException(string message, Exception innerException)
+			: base (message, innerException) {
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/Thread.cs b/mcs/class/corlib/System.Threading/Thread.cs
new file mode 100755
index 00000000000..3d331540435
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/Thread.cs
@@ -0,0 +1,436 @@
+//
+// System.Threading.Thread.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Remoting.Contexts;
+using System.Security.Principal;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+using System.Collections;
+
+namespace System.Threading
+{
+	public sealed class Thread
+	{
+		// stores a thread handle
+		private IntPtr system_thread_handle;
+		
+		private CultureInfo current_culture;
+		private bool threadpool_thread = false;
+		private ThreadState state = ThreadState.Unstarted;
+		private object abort_exc;
+		internal object abort_state;
+		
+		[MonoTODO]
+		public static Context CurrentContext {
+			get {
+				// FIXME -
+				// System.Runtime.Remoting.Context not
+				// yet implemented
+				return(null);
+			}
+		}
+
+		[MonoTODO]
+		public static IPrincipal CurrentPrincipal {
+			get {
+				// FIXME -
+				// System.Security.Principal.IPrincipal
+				// not yet implemented
+				return(null);
+			}
+			
+			set {
+			}
+		}
+
+		// Looks up the object associated with the current thread
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static Thread CurrentThread_internal();
+		
+		public static Thread CurrentThread {
+			get {
+				return(CurrentThread_internal());
+			}
+		}
+
+		// Looks up the slot hash for the current thread
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static Hashtable SlotHash_lookup();
+
+		// Stores the slot hash for the current thread
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void SlotHash_store(Hashtable slothash);
+
+		private static Hashtable GetTLSSlotHash() {
+			Hashtable slothash=SlotHash_lookup();
+			if(slothash==null) {
+				// Not synchronised, because this is
+				// thread specific anyway.
+				slothash=new Hashtable();
+				SlotHash_store(slothash);
+			}
+
+			return(slothash);
+		}
+
+		public static LocalDataStoreSlot AllocateDataSlot() {
+			LocalDataStoreSlot slot = new LocalDataStoreSlot();
+
+			return(slot);
+		}
+
+		// Stores a hash keyed by strings of LocalDataStoreSlot objects
+		static Hashtable datastorehash = Hashtable.Synchronized(new Hashtable());
+		
+		public static LocalDataStoreSlot AllocateNamedDataSlot(string name) {
+			LocalDataStoreSlot slot = (LocalDataStoreSlot)datastorehash[name];
+			if(slot!=null) {
+				// This exception isnt documented (of
+				// course) but .net throws it
+				throw new ArgumentException("Named data slot already added");
+			}
+			
+			slot = new LocalDataStoreSlot();
+
+			datastorehash.Add(name, slot);
+			
+			return(slot);
+		}
+
+		public static void FreeNamedDataSlot(string name) {
+			LocalDataStoreSlot slot=(LocalDataStoreSlot)datastorehash[name];
+
+			if(slot!=null) {
+				datastorehash.Remove(slot);
+			}
+		}
+
+		public static object GetData(LocalDataStoreSlot slot) {
+			Hashtable slothash=GetTLSSlotHash();
+			return(slothash[slot]);
+		}
+
+		[MonoTODO]
+		public static AppDomain GetDomain() {
+			// FIXME
+			return(null);
+		}
+
+		[MonoTODO]
+		public static int GetDomainID() {
+			// FIXME
+			return(0);
+		}
+
+		public static LocalDataStoreSlot GetNamedDataSlot(string name) {
+			LocalDataStoreSlot slot=(LocalDataStoreSlot)datastorehash[name];
+
+			if(slot==null) {
+				slot=AllocateNamedDataSlot(name);
+			}
+			
+			return(slot);
+		}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static void ResetAbort();
+
+		public static void SetData(LocalDataStoreSlot slot,
+					   object data) {
+			Hashtable slothash=GetTLSSlotHash();
+
+			if(slothash[slot]!=null) {
+				slothash.Remove(slot);
+			}
+			
+			slothash.Add(slot, data);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void Sleep_internal(int ms);
+
+		public static void Sleep(int millisecondsTimeout) {
+			if(millisecondsTimeout<0) {
+				throw new ArgumentException("Negative timeout");
+			}
+			Thread thread=CurrentThread;
+				
+			thread.set_state(ThreadState.WaitSleepJoin);
+				
+			Sleep_internal(millisecondsTimeout);
+			thread.clr_state(ThreadState.WaitSleepJoin);
+		}
+
+		public static void Sleep(TimeSpan timeout) {
+			// LAMESPEC: says to throw ArgumentException too
+			if(timeout.Milliseconds < 0 || timeout.Milliseconds > Int32.MaxValue) {
+				throw new ArgumentOutOfRangeException("Timeout out of range");
+			}
+
+			Thread thread=CurrentThread;
+				
+			thread.set_state(ThreadState.WaitSleepJoin);
+			Sleep_internal(timeout.Milliseconds);
+			thread.clr_state(ThreadState.WaitSleepJoin);
+		}
+
+		// Returns the system thread handle
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern IntPtr Thread_internal(ThreadStart start);
+
+		public Thread(ThreadStart start) {
+			if(start==null) {
+				throw new ArgumentNullException("Null ThreadStart");
+			}
+
+			// This is a two-stage thread launch.  Thread_internal
+			// creates the new thread, but blocks it until
+			// Start() is called later.
+			system_thread_handle=Thread_internal(start);
+
+			// Should throw an exception here if
+			// Thread_internal returns NULL
+		}
+
+		[MonoTODO]
+		public ApartmentState ApartmentState {
+			get {
+				// FIXME
+				return(ApartmentState.Unknown);
+			}
+			
+			set {
+			}
+		}
+
+		[MonoTODO]
+		public CultureInfo CurrentCulture {
+			get {
+				if (current_culture == null)
+					current_culture = new CultureInfo ("");
+				return current_culture;
+			}
+			
+			set {
+				current_culture = value;
+			}
+		}
+
+		[MonoTODO]
+		public CultureInfo CurrentUICulture {
+			get {
+				// FIXME
+				return(CurrentCulture);
+			}
+			
+			set {
+				// FIXME
+				CurrentCulture=value;
+			}
+		}
+
+		public bool IsThreadPoolThread {
+			get {
+				return IsThreadPoolThreadInternal;
+			}
+		}
+
+		internal bool IsThreadPoolThreadInternal {
+			get {
+				return threadpool_thread;
+			}
+			set {
+				threadpool_thread = value;
+			}
+		}
+
+		public bool IsAlive {
+			get {
+				// LAMESPEC: is a Stopped or Suspended
+				// thread dead?
+				ThreadState curstate=state;
+				
+				if((curstate & ThreadState.Aborted) != 0 ||
+				   (curstate & ThreadState.AbortRequested) != 0 ||
+				   (curstate & ThreadState.Unstarted) != 0) {
+					return(false);
+				} else {
+					return(true);
+				}
+			}
+		}
+
+		public bool IsBackground {
+			get {
+				if((state & ThreadState.Background) != 0) {
+					return(true);
+				} else {
+					return(false);
+				}
+			}
+			
+			set {
+				if(value==true) {
+					set_state(ThreadState.Background);
+				} else {
+					clr_state(ThreadState.Background);
+				}
+			}
+		}
+
+		private string thread_name=null;
+		
+		public string Name {
+			get {
+				return(thread_name);
+			}
+			
+			set {
+				thread_name=value;
+			}
+		}
+
+		[MonoTODO]
+		public ThreadPriority Priority {
+			get {
+				// FIXME
+				return(ThreadPriority.Lowest);
+			}
+			
+			set {
+			}
+		}
+
+		public ThreadState ThreadState {
+			get {
+				return(state);
+			}
+		}
+
+		public void Abort() {
+			Abort (null);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern void Abort (object stateInfo);
+
+		[MonoTODO]
+		public void Interrupt() {
+			// FIXME
+		}
+
+		// The current thread joins with 'this'. Set ms to 0 to block
+		// until this actually exits.
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern bool Join_internal(int ms, IntPtr handle);
+		
+		public void Join() {
+			if((state & ThreadState.Unstarted) != 0) {
+				throw new ThreadStateException("Thread has not been started");
+			}
+			
+			Thread thread=CurrentThread;
+				
+			thread.set_state(ThreadState.WaitSleepJoin);
+			Join_internal(Timeout.Infinite, system_thread_handle);
+			thread.clr_state(ThreadState.WaitSleepJoin);
+		}
+
+		public bool Join(int millisecondsTimeout) {
+			if(millisecondsTimeout<0) {
+				throw new ArgumentException("Timeout less than zero");
+			}
+			if((state & ThreadState.Unstarted) != 0) {
+				throw new ThreadStateException("Thread has not been started");
+			}
+
+			Thread thread=CurrentThread;
+				
+			thread.set_state(ThreadState.WaitSleepJoin);
+			bool ret=Join_internal(millisecondsTimeout,
+					       system_thread_handle);
+			thread.clr_state(ThreadState.WaitSleepJoin);
+
+			return(ret);
+		}
+
+		public bool Join(TimeSpan timeout) {
+			// LAMESPEC: says to throw ArgumentException too
+			if(timeout.Milliseconds < 0 || timeout.Milliseconds > Int32.MaxValue) {
+				throw new ArgumentOutOfRangeException("timeout out of range");
+			}
+			if((state & ThreadState.Unstarted) != 0) {
+				throw new ThreadStateException("Thread has not been started");
+			}
+
+			Thread thread=CurrentThread;
+
+			thread.set_state(ThreadState.WaitSleepJoin);
+			bool ret=Join_internal(timeout.Milliseconds,
+					       system_thread_handle);
+			thread.clr_state(ThreadState.WaitSleepJoin);
+
+			return(ret);
+		}
+
+		[MonoTODO]
+		public void Resume() {
+			// FIXME
+		}
+
+		// Launches the thread
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern void Start_internal(IntPtr handle);
+		
+		public void Start() {
+			if((state & ThreadState.Unstarted) == 0) {
+				throw new ThreadStateException("Thread has already been started");
+			}
+
+			// Mark the thread state as Running (which is
+			// all bits cleared). Therefore just remove
+			// the Unstarted bit
+			clr_state(ThreadState.Unstarted);
+				
+			// Launch this thread
+			Start_internal(system_thread_handle);
+		}
+
+		[MonoTODO]
+		public void Suspend() {
+			if((state & ThreadState.Unstarted) != 0 || !IsAlive) {
+				throw new ThreadStateException("Thread has not been started, or is dead");
+			}
+
+			set_state(ThreadState.SuspendRequested);
+			// FIXME - somehow let the interpreter know that
+			// this thread should now suspend
+		}
+
+		// Closes the system thread handle
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern void Thread_free_internal(IntPtr handle);
+
+		~Thread() {
+			// Free up the handle
+			Thread_free_internal(system_thread_handle);
+		}
+
+		private void set_state(ThreadState set) {
+			lock(this) {
+				state |= set;
+			}
+		}
+		private void clr_state(ThreadState clr) {
+			lock(this) {
+				state &= ~clr;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/ThreadAbortException.cs b/mcs/class/corlib/System.Threading/ThreadAbortException.cs
new file mode 100755
index 00000000000..107dcfe1c26
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ThreadAbortException.cs
@@ -0,0 +1,25 @@
+//
+// System.Threading.ThreadAbortException.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Threading
+{
+	[Serializable]
+	public sealed class ThreadAbortException : SystemException
+	{
+		private ThreadAbortException () : base ("Thread was being aborted") {}
+
+		public object ExceptionState {
+			get {
+				return Thread.CurrentThread.abort_state;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/ThreadInterruptedException.cs b/mcs/class/corlib/System.Threading/ThreadInterruptedException.cs
new file mode 100755
index 00000000000..f6a82ec6aad
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ThreadInterruptedException.cs
@@ -0,0 +1,33 @@
+//
+// System.Threading.ThreadInterruptedException.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+
+namespace System.Threading
+{
+	[Serializable]
+	public class ThreadInterruptedException : SystemException
+	{
+		public ThreadInterruptedException()
+			: base ("Thread interrupted") {
+		}
+
+		public ThreadInterruptedException(string message)
+			: base (message) {
+		}
+
+		protected ThreadInterruptedException(SerializationInfo info, StreamingContext context)
+			: base (info, context) {
+		}
+
+		public ThreadInterruptedException(string message, Exception innerException)
+			: base (message, innerException) {
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/ThreadPool.cs b/mcs/class/corlib/System.Threading/ThreadPool.cs
new file mode 100755
index 00000000000..af79eac307b
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ThreadPool.cs
@@ -0,0 +1,245 @@
+//
+// System.Threading.ThreadPool
+//
+// Author:
+//   Patrik Torstensson (patrik.torstensson@labs2.com)
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// (C) Patrik Torstensson
+//
+using System;
+using System.Collections;
+
+namespace System.Threading
+{
+   /// <summary> (Patrik T notes)
+   /// This threadpool is focused on saving resources not giving max performance. 
+   /// 
+   /// Note, this class is not perfect but it works. ;-) Should also replace
+   /// the queue with an internal one (performance)
+   /// 
+   /// This class should also use a specialized queue to increase performance..
+   /// </summary
+   /// 
+   public sealed class ThreadPool {
+      internal struct ThreadPoolWorkItem {
+         public WaitCallback _CallBack;
+         public object _Context;
+      }
+
+      private int _ThreadTimeout;
+
+      private long _MaxThreads;
+      private long _CurrentThreads;
+      private long _ThreadsInUse;
+      private long _RequestInQueue;
+      private long _ThreadCreateTriggerRequests;
+
+      private Thread _MonitorThread;
+      private Queue _RequestQueue;
+
+      private ArrayList _Threads;
+      private ManualResetEvent _DataInQueue; 
+
+      static ThreadPool _Threadpool;
+
+      static ThreadPool() {
+         _Threadpool = new ThreadPool();
+      }
+
+      private ThreadPool() {
+         // 30 sec timeout default
+         _ThreadTimeout = 30 * 1000; 
+
+         // Used to signal that there is data in the queue
+         _DataInQueue = new ManualResetEvent(false);
+         
+         _Threads = ArrayList.Synchronized(new ArrayList());
+
+         // Holds requests..
+         _RequestQueue = Queue.Synchronized(new Queue(128));
+
+         _MaxThreads = 64;
+         _CurrentThreads = 0;
+         _RequestInQueue = 0;
+         _ThreadsInUse = 0;
+         _ThreadCreateTriggerRequests = 5;
+
+         // Keeps track of requests in the queue and inreases the number of threads if neededs
+         _MonitorThread = new Thread(new ThreadStart(MonitorThread));
+         _MonitorThread.Start();
+      }
+
+      internal void RemoveThread() {
+         Interlocked.Decrement(ref _CurrentThreads);
+         _Threads.Remove(Thread.CurrentThread);
+      }
+
+      internal void CheckIfStartThread() {
+         bool bCreateThread = false;
+
+         if (_CurrentThreads == 0) {
+            bCreateThread = true;
+         }
+
+         if ((_MaxThreads == -1 || _CurrentThreads < _MaxThreads) && _ThreadsInUse > 0 && _RequestInQueue > _ThreadCreateTriggerRequests) {
+            bCreateThread = true;
+         }
+
+         if (bCreateThread) {
+            Interlocked.Increment(ref _CurrentThreads);
+      
+            Thread Start = new Thread(new ThreadStart(WorkerThread));
+            Start.Start();
+            Start.IsThreadPoolThreadInternal = true;
+            
+            _Threads.Add(Start);
+         }
+      }
+
+      internal void AddItem(ref ThreadPoolWorkItem Item) {
+         CheckIfStartThread();
+         
+         if (Interlocked.Increment(ref _RequestInQueue) == 1) {
+            _DataInQueue.Set();
+         }
+
+         _RequestQueue.Enqueue(Item);
+      }
+
+      // Work Thread main function
+      internal void WorkerThread() {
+         bool bWaitForData = true;
+
+         while (true) {
+            if (bWaitForData) {
+               if (!_DataInQueue.WaitOne(_ThreadTimeout, false)) {
+                  // timeout
+                  RemoveThread();
+                  return;
+               }
+            }
+
+            Interlocked.Increment(ref _ThreadsInUse);
+
+            try {
+               ThreadPoolWorkItem oItem = (ThreadPoolWorkItem) _RequestQueue.Dequeue();
+
+               if (Interlocked.Decrement(ref _RequestInQueue) == 0) {
+                  _DataInQueue.Reset();
+               }
+
+               oItem._CallBack(oItem._Context);
+            }
+            catch (InvalidOperationException) {
+               // Queue empty
+               bWaitForData = true;
+            }
+            catch (ThreadAbortException) {
+               // We will leave here.. (thread abort can't be handled)
+               RemoveThread();
+            }
+            finally {
+               Interlocked.Decrement(ref _ThreadsInUse);
+            }
+         }
+      }
+
+      internal void MonitorThread() {
+         while (true) {
+            Thread.Sleep(500);
+
+            CheckIfStartThread();
+         }
+      }
+
+      internal bool QueueUserWorkItemInternal(WaitCallback callback) {
+         return QueueUserWorkItem(callback, null);
+      }
+
+      internal bool QueueUserWorkItemInternal(WaitCallback callback, object context) {
+         ThreadPoolWorkItem Item = new ThreadPoolWorkItem();
+
+         Item._CallBack = callback;
+         Item._Context = context;
+
+         AddItem(ref Item);
+
+         // LAMESPEC: Return value? should use exception here if anything goes wrong
+         return true;
+      }
+
+      public static bool BindHandle(IntPtr osHandle) {
+         throw new NotSupportedException("This is a win32 specific method, not supported Mono");
+		}
+
+		public static bool QueueUserWorkItem(WaitCallback callback) {
+         return _Threadpool.QueueUserWorkItemInternal(callback);
+		}
+
+		public static bool QueueUserWorkItem(WaitCallback callback, object state) {
+         return _Threadpool.QueueUserWorkItemInternal(callback, state);
+		}
+
+      public static bool UnsafeQueueUserWorkItem(WaitCallback callback, object state) {
+         return _Threadpool.QueueUserWorkItemInternal(callback, state);
+      }
+
+      [MonoTODO]
+		public static RegisteredWaitHandle RegisterWaitForSingleObject(WaitHandle waitObject, WaitOrTimerCallback callback, object state, int millisecondsTimeOutInterval, bool executeOnlyOnce) {
+			if (millisecondsTimeOutInterval < -1) {
+				throw new ArgumentOutOfRangeException("timeout < -1");
+			}
+
+         throw new NotImplementedException();
+      }
+
+		[MonoTODO]
+		public static RegisteredWaitHandle RegisterWaitForSingleObject(WaitHandle waitObject, WaitOrTimerCallback callback, object state, long millisecondsTimeOutInterval, bool executeOnlyOnce) {
+			if (millisecondsTimeOutInterval < -1) {
+				throw new ArgumentOutOfRangeException("timeout < -1");
+			}
+		
+         throw new NotImplementedException();
+      }
+
+		[MonoTODO]
+		public static RegisteredWaitHandle RegisterWaitForSingleObject(WaitHandle waitObject, WaitOrTimerCallback callback, object state, TimeSpan timeout, bool executeOnlyOnce) {
+			// LAMESPEC: I assume it means "timeout" when it says "millisecondsTimeOutInterval"
+			if (timeout.Milliseconds < -1) {
+				throw new ArgumentOutOfRangeException("timeout < -1");
+			}
+			if (timeout.Milliseconds > Int32.MaxValue) {
+				throw new NotSupportedException("timeout too large");
+			}
+
+         throw new NotImplementedException();
+      }
+
+      [CLSCompliant(false)][MonoTODO]
+		public static RegisteredWaitHandle RegisterWaitForSingleObject(WaitHandle waitObject, WaitOrTimerCallback callback, object state, uint millisecondsTimeOutInterval, bool executeOnlyOnce) {
+         throw new NotImplementedException();
+      }
+
+		[MonoTODO]
+		public static RegisteredWaitHandle UnsafeRegisterWaitForSingleObject(WaitHandle waitObject, WaitOrTimerCallback callback, object state, int millisecondsTimeOutInterval, bool executeOnlyOnce) {
+         throw new NotImplementedException();
+      }
+
+		[MonoTODO]
+		public static RegisteredWaitHandle UnsafeRegisterWaitForSingleObject(WaitHandle waitObject, WaitOrTimerCallback callback, object state, long millisecondsTimeOutInterval, bool executeOnlyOnce) {
+         throw new NotImplementedException();
+		}
+
+		[MonoTODO]
+		public static RegisteredWaitHandle UnsafeRegisterWaitForSingleObject(WaitHandle waitObject, WaitOrTimerCallback callback, object state, TimeSpan timeout, bool executeOnlyOnce) {
+         throw new NotImplementedException();
+      }
+
+		[CLSCompliant(false)][MonoTODO]
+		public static RegisteredWaitHandle UnsafeRegisterWaitForSingleObject(WaitHandle waitObject, WaitOrTimerCallback callback, object state, uint millisecondsTimeOutInterval, bool executeOnlyOnce) {
+         throw new NotImplementedException();
+      }
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/ThreadPriority.cs b/mcs/class/corlib/System.Threading/ThreadPriority.cs
new file mode 100644
index 00000000000..ec7a32cae26
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ThreadPriority.cs
@@ -0,0 +1,41 @@
+// ThreadPriority.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:30:24 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Threading {
+
+
+	/// <summary>
+	/// </summary>
+	public enum ThreadPriority {
+
+		/// <summary>
+		/// </summary>
+		Lowest = 0,
+
+		/// <summary>
+		/// </summary>
+		BelowNormal = 1,
+
+		/// <summary>
+		/// </summary>
+		Normal = 2,
+
+		/// <summary>
+		/// </summary>
+		AboveNormal = 3,
+
+		/// <summary>
+		/// </summary>
+		Highest = 4,
+	} // ThreadPriority
+
+} // System.Threading
diff --git a/mcs/class/corlib/System.Threading/ThreadStart.cs b/mcs/class/corlib/System.Threading/ThreadStart.cs
new file mode 100755
index 00000000000..ebd6bc9f764
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ThreadStart.cs
@@ -0,0 +1,14 @@
+//
+// System.Threading.ThreadStart.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public delegate void ThreadStart();
+}
diff --git a/mcs/class/corlib/System.Threading/ThreadState.cs b/mcs/class/corlib/System.Threading/ThreadState.cs
new file mode 100644
index 00000000000..7693dae3c81
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ThreadState.cs
@@ -0,0 +1,55 @@
+// ThreadState.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:30:30 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System.Threading {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum ThreadState {
+
+		/// <summary>
+		/// </summary>
+		Running = 0x00000000,
+
+		StopRequested = 0x00000001,
+		SuspendRequested = 0x00000002,
+		
+		/// <summary>
+		/// </summary>
+		Background = 0x00000004,
+
+		/// <summary>
+		/// </summary>
+		Unstarted = 0x00000008,
+
+		/// <summary>
+		/// </summary>
+		Stopped = 0x00000010,
+
+		/// <summary>
+		/// </summary>
+		WaitSleepJoin = 0x00000020,
+
+		Suspended = 0x00000040,
+
+		/// <summary>
+		/// </summary>
+		AbortRequested = 0x00000080,
+
+		/// <summary>
+		/// </summary>
+		Aborted = 0x00000100,
+   } // ThreadState
+
+} // System.Threading
diff --git a/mcs/class/corlib/System.Threading/ThreadStateException.cs b/mcs/class/corlib/System.Threading/ThreadStateException.cs
new file mode 100755
index 00000000000..c359fe011b1
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/ThreadStateException.cs
@@ -0,0 +1,33 @@
+//
+// System.Threading.ThreadStateException.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+
+namespace System.Threading
+{
+	[Serializable]
+	public class ThreadStateException : SystemException
+	{
+		public ThreadStateException()
+			: base ("Thread State Error") {
+		}
+
+		public ThreadStateException(string message)
+			: base (message) {
+		}
+
+		protected ThreadStateException(SerializationInfo info, StreamingContext context)
+			: base (info, context) {
+		}
+
+		public ThreadStateException(string message, Exception innerException)
+			: base (message, innerException) {
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/Timeout.cs b/mcs/class/corlib/System.Threading/Timeout.cs
new file mode 100755
index 00000000000..397e213ddf7
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/Timeout.cs
@@ -0,0 +1,18 @@
+//
+// System.Threading.Timeout.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public sealed class Timeout
+	{
+		private Timeout () {}
+		public const int Infinite=-1;
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/Timer.cs b/mcs/class/corlib/System.Threading/Timer.cs
new file mode 100755
index 00000000000..f134d66612a
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/Timer.cs
@@ -0,0 +1,112 @@
+//
+// System.Threading.Timer.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public sealed class Timer : MarshalByRefObject, IDisposable
+	{
+		[MonoTODO]
+		public Timer(TimerCallback callback, object state, int dueTime, int period) {
+			if(dueTime < -1) {
+				throw new ArgumentOutOfRangeException("Due time < -1");
+			}
+			if(period < -1) {
+				throw new ArgumentOutOfRangeException("Period < -1");
+			}
+			
+			// FIXME
+		}
+
+		[MonoTODO]
+		public Timer(TimerCallback callback, object state, long dueTime, long period) {
+			if(dueTime < -1) {
+				throw new ArgumentOutOfRangeException("Due time < -1");
+			}
+			if(period < -1) {
+				throw new ArgumentOutOfRangeException("Period < -1");
+			}
+			// FIXME
+		}
+
+		[MonoTODO]
+		public Timer(TimerCallback callback, object state, TimeSpan dueTime, TimeSpan period) {
+			if(dueTime.Milliseconds < 0 || dueTime.Milliseconds > Int32.MaxValue) {
+				throw new ArgumentOutOfRangeException("Due time out of range");
+			}
+			if(period.Milliseconds < 0 || period.Milliseconds > Int32.MaxValue) {
+				throw new ArgumentOutOfRangeException("Period out of range");
+			}
+			// FIXME
+		}
+
+		[CLSCompliant(false)][MonoTODO]
+		public Timer(TimerCallback callback, object state, uint dueTime, uint period) {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public bool Change(int dueTime, int period) {
+			if(dueTime < -1) {
+				throw new ArgumentOutOfRangeException("Due time < -1");
+			}
+			if(period < -1) {
+				throw new ArgumentOutOfRangeException("Period < -1");
+			}
+			// FIXME
+			return(false);
+		}
+
+		[MonoTODO]
+		public bool Change(long dueTime, long period) {
+			if(dueTime < -1) {
+				throw new ArgumentOutOfRangeException("Due time < -1");
+			}
+			if(period < -1) {
+				throw new ArgumentOutOfRangeException("Period < -1");
+			}
+			if(dueTime > 4294967294) {
+				throw new NotSupportedException("Due time too large");
+			}
+			if(period > 4294967294) {
+				throw new NotSupportedException("Period too large");
+			}
+			// FIXME
+			return(false);
+		}
+
+		[MonoTODO]
+		public bool Change(TimeSpan dueTime, TimeSpan period) {
+			// FIXME
+			return(false);
+		}
+
+		[CLSCompliant(false)][MonoTODO]
+		public bool Change(uint dueTime, uint period) {
+			// FIXME
+			return(false);
+		}
+
+		[MonoTODO]
+		public void Dispose() {
+			// FIXME
+		}
+
+		[MonoTODO]
+		public bool Dispose(WaitHandle notifyObject) {
+			// FIXME
+			return(false);
+		}
+
+		[MonoTODO]
+		~Timer() {
+			// FIXME
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/TimerCallback.cs b/mcs/class/corlib/System.Threading/TimerCallback.cs
new file mode 100755
index 00000000000..3afe1fc71f2
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/TimerCallback.cs
@@ -0,0 +1,14 @@
+//
+// System.Threading.TimerCallback.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public delegate void TimerCallback(object state);
+}
diff --git a/mcs/class/corlib/System.Threading/WaitCallback.cs b/mcs/class/corlib/System.Threading/WaitCallback.cs
new file mode 100755
index 00000000000..ed1e39c0e28
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/WaitCallback.cs
@@ -0,0 +1,14 @@
+//
+// System.Threading.WaitCallback.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public delegate void WaitCallback(object state);
+}
diff --git a/mcs/class/corlib/System.Threading/WaitHandle.cs b/mcs/class/corlib/System.Threading/WaitHandle.cs
new file mode 100755
index 00000000000..1d6ec67ee80
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/WaitHandle.cs
@@ -0,0 +1,204 @@
+//
+// System.Threading.WaitHandle.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System.Threading
+{
+	public abstract class WaitHandle : MarshalByRefObject, IDisposable
+	{
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern bool WaitAll_internal(WaitHandle[] handles, int ms, bool exitContext);
+		
+		public static bool WaitAll(WaitHandle[] waitHandles) {
+			if(waitHandles.Length>64) {
+				throw new NotSupportedException("Too many handles");
+			}
+			for(int i=0; i<waitHandles.Length; i++) {
+				if(waitHandles[i]==null) {
+					throw new ArgumentNullException("null handle");
+				}
+			}
+			
+			return(WaitAll_internal(waitHandles, Timeout.Infinite,
+						false));
+		}
+
+		public static bool WaitAll(WaitHandle[] waitHandles,
+					   int millisecondsTimeout,
+					   bool exitContext) {
+			if(waitHandles.Length>64) {
+				throw new NotSupportedException("Too many handles");
+			}
+			for(int i=0; i<waitHandles.Length; i++) {
+				if(waitHandles[i]==null) {
+					throw new ArgumentNullException("null handle");
+				}
+			}
+			
+			return(WaitAll_internal(waitHandles, millisecondsTimeout, false));
+		}
+
+		public static bool WaitAll(WaitHandle[] waitHandles,
+					   TimeSpan timeout,
+					   bool exitContext) {
+			if(timeout.Milliseconds < 0 ||
+			   timeout.Milliseconds > Int32.MaxValue) {
+				throw new ArgumentOutOfRangeException("Timeout out of range");
+			}
+			if(waitHandles.Length>64) {
+				throw new NotSupportedException("Too many handles");
+			}
+			for(int i=0; i<waitHandles.Length; i++) {
+				if(waitHandles[i]==null) {
+					throw new ArgumentNullException("null handle");
+				}
+			}
+			
+			return(WaitAll_internal(waitHandles,
+						timeout.Milliseconds,
+						exitContext));
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern int WaitAny_internal(WaitHandle[] handles, int ms, bool exitContext);
+
+		// LAMESPEC: Doesn't specify how to signal failures
+		public static int WaitAny(WaitHandle[] waitHandles) {
+			if(waitHandles.Length>64) {
+				throw new NotSupportedException("Too many handles");
+			}
+			for(int i=0; i<waitHandles.Length; i++) {
+				if(waitHandles[i]==null) {
+					throw new ArgumentNullException("null handle");
+				}
+			}
+			
+			return(WaitAny_internal(waitHandles, Timeout.Infinite,
+						false));
+		}
+
+		public static int WaitAny(WaitHandle[] waitHandles,
+					  int millisecondsTimeout,
+					  bool exitContext) {
+			if(waitHandles.Length>64) {
+				throw new NotSupportedException("Too many handles");
+			}
+			for(int i=0; i<waitHandles.Length; i++) {
+				if(waitHandles[i]==null) {
+					throw new ArgumentNullException("null handle");
+				}
+			}
+			
+			return(WaitAny_internal(waitHandles,
+						millisecondsTimeout,
+						exitContext));
+		}
+
+		public static int WaitAny(WaitHandle[] waitHandles,
+					  TimeSpan timeout, bool exitContext) {
+			if(timeout.Milliseconds < 0 ||
+			   timeout.Milliseconds > Int32.MaxValue) {
+				throw new ArgumentOutOfRangeException("Timeout out of range");
+			}
+			if(waitHandles.Length>64) {
+				throw new NotSupportedException("Too many handles");
+			}
+			for(int i=0; i<waitHandles.Length; i++) {
+				if(waitHandles[i]==null) {
+					throw new ArgumentNullException("null handle");
+				}
+			}
+			
+			return(WaitAny_internal(waitHandles,
+						timeout.Milliseconds,
+						exitContext));
+		}
+
+		[MonoTODO]
+		public WaitHandle() {
+			// FIXME
+		}
+
+		public const int WaitTimeout = 258;
+
+		protected IntPtr os_handle = IntPtr.Zero;
+		
+		public virtual IntPtr Handle {
+			get {
+				return(os_handle);
+			}
+				
+			set {
+				os_handle=value;
+			}
+		}
+
+		public virtual void Close() {
+			Dispose(false);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		protected virtual extern bool WaitOne_internal(IntPtr handle, int ms, bool exitContext);
+
+		public virtual bool WaitOne() {
+			return(WaitOne_internal(os_handle, Timeout.Infinite,
+						false));
+		}
+
+		public virtual bool WaitOne(int millisecondsTimeout, bool exitContext) {
+			return(WaitOne_internal(os_handle,
+						millisecondsTimeout,
+						exitContext));
+		}
+
+		public virtual bool WaitOne(TimeSpan timeout, bool exitContext) {
+			return(WaitOne_internal(os_handle,
+						timeout.Milliseconds,
+						exitContext));
+		}
+
+		protected static readonly IntPtr InvalidHandle;
+
+		private bool disposed = false;
+
+		public void Dispose() {
+			Dispose(true);
+			// Take yourself off the Finalization queue
+			GC.SuppressFinalize(this);
+		}
+		
+		protected virtual void Dispose(bool explicitDisposing) {
+			// Check to see if Dispose has already been called.
+			if(!this.disposed) {
+				// If this is a call to Dispose,
+				// dispose all managed resources.
+				if(explicitDisposing) {
+					// Free up stuff here
+					//Components.Dispose();
+				}
+
+				// Release unmanaged resources
+				// Note that this is not thread safe.
+				// Another thread could start
+				// disposing the object after the
+				// managed resources are disposed, but
+				// before the disposed flag is set to
+				// true.
+				this.disposed=true;
+				//Release(handle);
+				//handle=IntPtr.Zero;
+			}
+		}
+
+		~WaitHandle() {
+			Dispose(false);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System.Threading/WaitOrTimerCallback.cs b/mcs/class/corlib/System.Threading/WaitOrTimerCallback.cs
new file mode 100755
index 00000000000..03a03d7a318
--- /dev/null
+++ b/mcs/class/corlib/System.Threading/WaitOrTimerCallback.cs
@@ -0,0 +1,14 @@
+//
+// System.Threading.WaitOrTimerCallback.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+
+namespace System.Threading
+{
+	public delegate void WaitOrTimerCallback(object state, bool timedOut);
+}
diff --git a/mcs/class/corlib/System/Activator.cs b/mcs/class/corlib/System/Activator.cs
new file mode 100644
index 00000000000..5953285480c
--- /dev/null
+++ b/mcs/class/corlib/System/Activator.cs
@@ -0,0 +1,214 @@
+//
+// System.Activator.cs
+//
+// Authors:
+//   Nick Drochak II (ndrochak@gol.com)
+//   Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) 2001 Nick Drochak II
+// (c) 2002 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System.Runtime.Remoting;
+using System.Reflection;
+using System.Globalization;
+using System.Security.Policy;
+
+namespace System 
+{
+	public sealed class Activator
+	{
+		private static BindingFlags _flags = BindingFlags.CreateInstance |
+						     BindingFlags.Public |
+						     BindingFlags.Instance;
+
+		private Activator () {}
+
+		[MonoTODO]
+		public static ObjectHandle CreateComInstanceFrom (string assemblyName, string typeName)
+		{
+			throw new NotImplementedException(); 
+		}
+
+		public static ObjectHandle CreateInstanceFrom (string assemblyFile, string typeName)
+		{
+			return CreateInstanceFrom (assemblyFile, typeName, null);
+		}
+
+		public static ObjectHandle CreateInstanceFrom (string assemblyFile,
+							       string typeName,
+							       object [] activationAttributes)
+		{
+			return Activator.CreateInstanceFrom (assemblyFile,
+							     typeName,
+							     false,
+							     _flags,
+							     null,
+							     null,
+							     null,
+							     activationAttributes,
+							     null);
+		}
+		
+		[MonoTODO]
+		public static ObjectHandle CreateInstanceFrom (string assemblyFile,
+							       string typeName,
+							       bool ignoreCase,
+							       BindingFlags bindingAttr,
+							       Binder binder,
+							       object [] args,
+							       CultureInfo culture,
+							       object [] activationAttributes,
+							       Evidence securityInfo)
+		{
+			//TODO: when Assembly implements security, use it.
+			//Assembly assembly = Assembly.LoadFrom (assemblyFile, securityInfo);
+			Assembly assembly = Assembly.LoadFrom (assemblyFile);
+			if (assembly == null)
+				return null;
+
+			Type type = assembly.GetType (typeName, true, ignoreCase);
+			if (type == null)
+				return null;
+
+			object obj = CreateInstance (type, bindingAttr, binder, args, culture, activationAttributes);
+			return (obj != null) ? new ObjectHandle (obj) : null;
+		}
+		
+		public static ObjectHandle CreateInstance (string assemblyName, string typeName)
+		{
+			return Activator.CreateInstance (assemblyName, typeName, null);
+		}
+		
+		public static ObjectHandle CreateInstance (string assemblyName,
+							   string typeName,
+							   object [] activationAttributes)
+		{
+			return Activator.CreateInstance (assemblyName,
+							 typeName,
+							 false,
+							 _flags,
+							 null,
+							 null,
+							 null,
+							 activationAttributes,
+							 null);
+		}
+		
+		[MonoTODO]
+		public static ObjectHandle CreateInstance (string assemblyName,
+							   string typeName,
+							   bool ignoreCase,
+							   BindingFlags bindingAttr,
+							   Binder binder,
+							   object [] args,
+							   CultureInfo culture,
+							   object [] activationAttributes,
+							   Evidence securityInfo)
+		{
+			//TODO: when Assembly implements security, use it.
+			//Assembly assembly = Assembly.Load (assemblyFile, securityInfo);
+			Assembly assembly = Assembly.Load (assemblyName);
+			Type type = assembly.GetType (typeName, true, ignoreCase);
+			object obj = CreateInstance (type, bindingAttr, binder, args, culture, activationAttributes);
+			return (obj != null) ? new ObjectHandle (obj) : null;
+		}
+		
+		public static object CreateInstance (Type type)
+		{
+			return CreateInstance (type, false);
+		}
+		
+		public static object CreateInstance (Type type, object [] args)
+		{
+			return CreateInstance (type, args, new object [0]);
+		}
+
+		[MonoTODO]
+		public static object CreateInstance (Type type, object [] args, object [] activationAttributes)
+		{
+			// activationAttributes?
+			if (type == null)
+				throw new ArgumentNullException ("type");
+
+			int length = 0;
+			if (args != null)
+				length = args.Length;
+
+			Type [] atypes = new Type [length];
+			for (int i = 0; i < length; ++i) {
+				atypes [i] = args [i].GetType ();
+			}
+			ConstructorInfo ctor = type.GetConstructor (atypes);
+			if (ctor == null)
+				return null;
+
+			return ctor.Invoke (args);
+		}
+
+		public static object CreateInstance (Type type,
+						     BindingFlags bindingAttr,
+						     Binder binder,
+						     object [] args,
+						     CultureInfo culture)
+		{
+			return CreateInstance (type, bindingAttr, binder, args, culture, new object [0]);
+		}
+
+		[MonoTODO]
+		public static object CreateInstance (Type type,
+						     BindingFlags bindingAttr,
+						     Binder binder,
+						     object [] args,
+						     CultureInfo culture,
+						     object [] activationAttributes)
+		{
+			// activationAttributes?
+			int length = 0;
+			if (args != null)
+				length = args.Length;
+
+			Type[] atypes = new Type [length];
+			for (int i = 0; i < length; ++i) {
+				atypes [i] = args [i].GetType ();
+			}
+			//FIXME: when GetConstructor works with this parameter list, use it
+			//ConstructorInfo ctor = type.GetConstructor (bindingAttr, binder, atypes, null);
+			ConstructorInfo ctor = type.GetConstructor (atypes);
+			if (ctor == null)
+				return null;
+
+			//FIXME: when Invoke allows this parameter list, use it
+			//return ctor.Invoke (args, bindingAttr, binder, args, culture);
+			return ctor.Invoke (args);
+		}
+
+		public static object CreateInstance (Type type, bool nonPublic)
+		{ 
+			if (type == null)
+				throw new ArgumentNullException ("type");
+				
+			ConstructorInfo ctor = type.GetConstructor (Type.EmptyTypes);
+			if (ctor.IsPublic && nonPublic == true)
+				return null;
+
+			if (ctor == null)
+				return null;
+
+			return ctor.Invoke (null);
+		}
+
+		[MonoTODO]
+		public static object GetObject (Type type, string url)
+		{
+			throw new NotImplementedException(); 
+		}
+
+		[MonoTODO]
+		public static object GetObject (Type type, string url, object state)
+		{ 
+			throw new NotImplementedException(); 
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/System/AppDomain.cs b/mcs/class/corlib/System/AppDomain.cs
new file mode 100755
index 00000000000..1dc498e42b1
--- /dev/null
+++ b/mcs/class/corlib/System/AppDomain.cs
@@ -0,0 +1,571 @@
+//
+// System/AppDomain.cs
+//
+// Authors:
+//   Paolo Molaro (lupus@ximian.com)
+//   Dietmar Maurer (dietmar@ximian.com)
+//   Miguel de Icaza (miguel@ximian.com)
+//   Gonzalo Paniagua (gonzalo@ximian.com)
+//
+// (C) 2001, 2002 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+using System.Runtime.Remoting;
+using System.Security.Principal;
+using System.Security.Policy;
+using System.Security;
+
+namespace System {
+
+	public sealed class AppDomain : MarshalByRefObject , _AppDomain , IEvidenceFactory {
+
+		IntPtr _mono_app_domain;
+
+		// Evidence evidence;
+
+		private AppDomain () {}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern AppDomainSetup getSetup ();
+
+		public AppDomainSetup SetupInformation {
+
+			get {
+				return getSetup ();
+			}
+		}
+
+		public string BaseDirectory {
+
+			get {
+				return SetupInformation.ApplicationBase;
+			}
+		}
+
+		public string RelativeSearchPath {
+
+			get {
+				return SetupInformation.PrivateBinPath;
+			}
+		}
+
+		public string DynamicDirectory {
+
+			get {
+				// fixme: dont know if this is right?
+				return SetupInformation.DynamicBase;
+			}
+		}
+
+		public bool ShadowCopyFiles {
+
+			get {
+				if (SetupInformation.ShadowCopyFiles == "true")
+					return true;
+				return false;
+			}
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern string getFriendlyName ();
+
+		public string FriendlyName {
+
+			get {
+				return getFriendlyName ();
+			}
+		}
+
+		public Evidence Evidence {
+
+			get {
+				return null;
+				//return evidence;
+			}
+		}
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private static extern AppDomain getCurDomain ();
+		
+		public static AppDomain CurrentDomain
+		{
+			get {
+				return getCurDomain ();
+			}
+		}
+
+		[MonoTODO]
+		public void AppendPrivatePath (string path)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public void ClearPrivatePath ()
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public void ClearShadowCopyPath ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public ObjectHandle CreateInstance (string assemblyName, string typeName)
+		{
+			if (assemblyName == null)
+				throw new ArgumentNullException ("assemblyName");
+
+			return Activator.CreateInstance (assemblyName, typeName);
+		}
+
+		public ObjectHandle CreateInstance (string assemblyName, string typeName,
+						    object[] activationAttributes)
+		{
+			if (assemblyName == null)
+				throw new ArgumentNullException ("assemblyName");
+
+			return Activator.CreateInstance (assemblyName, typeName, activationAttributes);
+		}
+		
+		public ObjectHandle CreateInstance (string assemblyName,
+						    string typeName,
+						    bool ignoreCase,
+						    BindingFlags bindingAttr,
+						    Binder binder,
+						    object[] args,
+						    CultureInfo culture,
+						    object[] activationAttributes,
+						    Evidence securityAttributes)
+		{
+			if (assemblyName == null)
+				throw new ArgumentNullException ("assemblyName");
+
+			return Activator.CreateInstance (assemblyName,
+							 typeName,
+							 ignoreCase,
+							 bindingAttr,
+							 binder,
+							 args,
+							 culture,
+							 activationAttributes,
+							 securityAttributes);
+		}
+
+		public object CreateInstanceAndUnwrap (string assemblyName, string typeName)
+		{
+			ObjectHandle oh = CreateInstance (assemblyName, typeName);
+			return (oh != null) ? oh.Unwrap () : null;
+		}
+		
+		public object CreateInstanceAndUnwrap (string assemblyName,
+						       string typeName,
+						       object [] activationAttributes)
+		{
+			ObjectHandle oh = CreateInstance (assemblyName, typeName, activationAttributes);
+			return (oh != null) ? oh.Unwrap () : null;
+		}
+
+		public object CreateInstanceAndUnwrap (string assemblyName,
+						       string typeName,
+						       bool ignoreCase,
+						       BindingFlags bindingAttr,
+						       Binder binder,
+						       object[] args,
+						       CultureInfo culture,
+						       object[] activationAttributes,
+						       Evidence securityAttributes)
+		{
+			ObjectHandle oh = CreateInstance (assemblyName,
+							  typeName,
+							  ignoreCase,
+							  bindingAttr,
+							  binder,
+							  args,
+							  culture,
+							  activationAttributes,
+							  securityAttributes);
+			return (oh != null) ? oh.Unwrap () : null;
+		}
+
+		public ObjectHandle CreateInstanceFrom (string assemblyName, string typeName)
+		{
+			if (assemblyName == null)
+				throw new ArgumentNullException ("assemblyName");
+
+			return Activator.CreateInstanceFrom (assemblyName, typeName);
+		}
+		
+		public ObjectHandle CreateInstanceFrom (string assemblyName, string typeName,
+							object[] activationAttributes)
+		{
+			if (assemblyName == null)
+				throw new ArgumentNullException ("assemblyName");
+
+			return Activator.CreateInstanceFrom (assemblyName, typeName, activationAttributes);
+		}
+		
+		public ObjectHandle CreateInstanceFrom (string assemblyName,
+							string typeName,
+							bool ignoreCase,
+							BindingFlags bindingAttr,
+							Binder binder,
+							object[] args,
+							CultureInfo culture,
+							object[] activationAttributes,
+							Evidence securityAttributes)
+		{
+			if (assemblyName == null)
+				throw new ArgumentNullException ("assemblyName");
+
+			return Activator.CreateInstanceFrom (assemblyName,
+							     typeName,
+							     ignoreCase,
+							     bindingAttr,
+							     binder,
+							     args,
+							     culture,
+							     activationAttributes,
+							     securityAttributes);
+		}
+
+		public object CreateInstanceFromAndUnwrap (string assemblyName, string typeName)
+		{
+			ObjectHandle oh = CreateInstanceFrom (assemblyName, typeName);
+			return (oh != null) ? oh.Unwrap () : null;
+		}
+		
+		public object CreateInstanceFromAndUnwrap (string assemblyName,
+							   string typeName,
+							   object [] activationAttributes)
+		{
+			ObjectHandle oh = CreateInstanceFrom (assemblyName, typeName, activationAttributes);
+			return (oh != null) ? oh.Unwrap () : null;
+		}
+
+		public object CreateInstanceFromAndUnwrap (string assemblyName,
+							   string typeName,
+							   bool ignoreCase,
+							   BindingFlags bindingAttr,
+							   Binder binder,
+							   object[] args,
+							   CultureInfo culture,
+							   object[] activationAttributes,
+							   Evidence securityAttributes)
+		{
+			ObjectHandle oh = CreateInstanceFrom (assemblyName,
+							      typeName,
+							      ignoreCase,
+							      bindingAttr,
+							      binder,
+							      args,
+							      culture,
+							      activationAttributes,
+							      securityAttributes);
+			return (oh != null) ? oh.Unwrap () : null;
+		}
+
+		public AssemblyBuilder DefineDynamicAssembly (AssemblyName name,
+							      AssemblyBuilderAccess access)
+		{
+			return DefineDynamicAssembly (name, access, null, null,
+						      null, null, null, false);
+		}
+
+		public AssemblyBuilder DefineDynamicAssembly (AssemblyName name,
+							      AssemblyBuilderAccess access,
+							      Evidence evidence)
+		{
+			return DefineDynamicAssembly (name, access, null, evidence,
+						      null, null, null, false);
+		}
+		
+		public AssemblyBuilder DefineDynamicAssembly (AssemblyName name,
+							      AssemblyBuilderAccess access,
+							      string dir)
+		{
+			return DefineDynamicAssembly (name, access, dir, null,
+						      null, null, null, false);
+		}
+		
+		public AssemblyBuilder DefineDynamicAssembly (AssemblyName name,
+							      AssemblyBuilderAccess access,
+							      string dir,
+							      Evidence evidence)
+		{
+			return DefineDynamicAssembly (name, access, dir, evidence,
+						      null, null, null, false);
+		}
+		
+		public AssemblyBuilder DefineDynamicAssembly (AssemblyName name,
+							      AssemblyBuilderAccess access,
+							      PermissionSet requiredPermissions,
+							      PermissionSet optionalPermissions,
+							      PermissionSet refusedPersmissions)
+		{
+			return DefineDynamicAssembly (name, access, null, null,
+						      requiredPermissions, optionalPermissions,
+						      refusedPersmissions, false);
+		}
+		
+		public AssemblyBuilder DefineDynamicAssembly (AssemblyName name,
+							      AssemblyBuilderAccess access,
+							      Evidence evidence,
+							      PermissionSet requiredPermissions,
+							      PermissionSet optionalPermissions,
+							      PermissionSet refusedPersmissions)
+		{
+			return DefineDynamicAssembly (name, access, null, evidence,
+						      requiredPermissions, optionalPermissions,
+						      refusedPersmissions, false);
+		}
+		
+		public AssemblyBuilder DefineDynamicAssembly (AssemblyName name,
+							      AssemblyBuilderAccess access,
+							      string dir,
+							      PermissionSet requiredPermissions,
+							      PermissionSet optionalPermissions,
+							      PermissionSet refusedPersmissions)
+		{
+			return DefineDynamicAssembly (name, access, dir, null,
+						      requiredPermissions, optionalPermissions,
+						      refusedPersmissions, false);
+		}
+		
+		public AssemblyBuilder DefineDynamicAssembly (AssemblyName name,
+							      AssemblyBuilderAccess access,
+							      string dir,
+							      Evidence evidence,
+							      PermissionSet requiredPermissions,
+							      PermissionSet optionalPermissions,
+							      PermissionSet refusedPersmissions)
+		{
+			return DefineDynamicAssembly (name, access, dir, evidence,
+						      requiredPermissions, optionalPermissions,
+						      refusedPersmissions, false);
+
+		}
+		
+		public AssemblyBuilder DefineDynamicAssembly (AssemblyName name,
+							      AssemblyBuilderAccess access,
+							      string dir,
+							      Evidence evidence,
+							      PermissionSet requiredPermissions,
+							      PermissionSet optionalPermissions,
+							      PermissionSet refusedPersmissions,
+							      bool isSynchronized)
+		{
+			// FIXME: examine all other parameters
+			
+			AssemblyBuilder ab = new AssemblyBuilder (name, dir, access);
+			return ab;
+		}
+
+
+		[MonoTODO]
+		public void DoCallBack (CrossAppDomainDelegate theDelegate)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		public override bool Equals (object other)
+		{
+			if (!(other is AppDomain))
+				return false;
+
+			return this._mono_app_domain == ((AppDomain)other)._mono_app_domain;
+		}
+
+		public int ExecuteAssembly (string assemblyFile)
+		{
+			return ExecuteAssembly (assemblyFile, new Evidence (), null);
+		}
+		
+		public int ExecuteAssembly (string assemblyFile, Evidence assemblySecurity)
+		{
+			return ExecuteAssembly (assemblyFile, new Evidence (), null);
+		}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern int ExecuteAssembly (string assemblyFile, Evidence assemblySecurity, string[] args);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern Assembly [] GetAssemblies ();
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern object GetData (string name);
+		
+		public override int GetHashCode ()
+		{
+			return (int)_mono_app_domain;
+		}
+
+		[MonoTODO]
+		public override object InitializeLifetimeService ()
+		{
+			throw new NotImplementedException ();			
+		}
+	
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private extern Assembly LoadAssembly (AssemblyName assemblyRef, Evidence securityEvidence);
+
+		public Assembly Load (AssemblyName assemblyRef)
+		{
+			return Load (assemblyRef, new Evidence ());
+		}
+
+		public Assembly Load (AssemblyName assemblyRef, Evidence assemblySecurity)
+		{
+			return LoadAssembly (assemblyRef, assemblySecurity);
+		}
+
+		public Assembly Load (string assemblyString)
+		{
+			AssemblyName an = new AssemblyName ();
+			an.Name = assemblyString;
+			
+			return Load (an, new Evidence ());			
+		}
+
+		public Assembly Load (string assemblyString, Evidence assemblySecurity)
+		{
+			AssemblyName an = new AssemblyName ();
+			an.Name = assemblyString;
+			
+			return Load (an, assemblySecurity);			
+		}
+
+		public Assembly Load (byte[] rawAssembly)
+		{
+			return Load (rawAssembly, null, new Evidence ());
+		}
+
+		public Assembly Load (byte[] rawAssembly, byte[] rawSymbolStore)
+		{
+			return Load (rawAssembly, rawSymbolStore, new Evidence ());
+		}
+
+		[MonoTODO]
+		public Assembly Load (byte[] rawAssembly, byte[] rawSymbolStore, Evidence securityEvidence)
+		{
+			throw new NotImplementedException ();
+		}
+			
+		[MonoTODO]
+		public void SetAppDomainPolicy (PolicyLevel domainPolicy)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		public void SetCachePath (string s)
+		{
+			SetupInformation.CachePath = s;
+		}
+		
+		[MonoTODO]
+		public void SetPrincipalPolicy (PrincipalPolicy policy)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public void SetShadowCopyPath (string s)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		[MonoTODO]
+		public void SetThreadPrincipal (IPrincipal principal)
+		{
+			throw new NotImplementedException ();
+		}
+		
+		public static AppDomain CreateDomain (string friendlyName)
+		{
+			return CreateDomain (friendlyName, new Evidence (), new AppDomainSetup ());
+		}
+		
+		public static AppDomain CreateDomain (string friendlyName, Evidence securityInfo)
+		{
+			return CreateDomain (friendlyName, securityInfo, new AppDomainSetup ());
+		}
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private static extern AppDomain createDomain (string friendlyName, AppDomainSetup info);
+
+		public static AppDomain CreateDomain (string friendlyName,
+						      Evidence securityInfo,
+						      AppDomainSetup info)
+		{
+			//TODO: treat securityInfo (can be null)
+			if (friendlyName == null)
+				throw new System.ArgumentNullException ("friendlyName");
+
+			if (info == null)
+				throw new System.ArgumentNullException ("info");
+
+			AppDomain ad = createDomain (friendlyName, info);
+
+			// ad.evidence = securityInfo;
+
+			return ad;
+		}
+
+		public static AppDomain CreateDomain (string friendlyName, Evidence securityInfo,
+						      string appBasePath, string appRelativeSearchPath,
+						      bool shadowCopyFiles)
+		{
+			AppDomainSetup info = new AppDomainSetup ();
+
+			info.ApplicationBase = appBasePath;
+			info.PrivateBinPath = appRelativeSearchPath;
+
+			if (shadowCopyFiles)
+				info.ShadowCopyFiles = "true";
+			else
+				info.ShadowCopyFiles = "false";
+
+			return CreateDomain (friendlyName, securityInfo, info);
+		}
+
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public static extern void Unload (AppDomain domain);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern void SetData (string name, object data);
+
+		[MonoTODO]
+		public static int GetCurrentThreadId ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public override string ToString () {
+			return getFriendlyName ();
+		}
+
+
+		public event AssemblyLoadEventHandler AssemblyLoad;
+		
+		public event ResolveEventHandler AssemblyResolve;
+		
+		public event EventHandler DomainUnload;
+
+		public event EventHandler ProcessExit;
+
+		public event ResolveEventHandler ResourceResolve;
+
+		public event ResolveEventHandler TypeResolve;
+
+		public event UnhandledExceptionEventHandler UnhandledException;
+    
+	}
+}
diff --git a/mcs/class/corlib/System/AppDomainSetup.cs b/mcs/class/corlib/System/AppDomainSetup.cs
new file mode 100755
index 00000000000..4006f95cd21
--- /dev/null
+++ b/mcs/class/corlib/System/AppDomainSetup.cs
@@ -0,0 +1,172 @@
+//
+// System/AppDomainSetup.cs
+//
+// Author:
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+
+	[Serializable]
+	public sealed class AppDomainSetup : IAppDomainSetup {
+		string application_base;
+		string application_name;
+		string cache_path;
+		string configuration_file;
+		string dynamic_base;
+		string license_file;
+		string private_bin_path;
+		string private_bin_path_probe;
+		string shadow_copy_directories;
+		string shadow_copy_files;
+		bool publisher_policy;
+		private LoaderOptimization loader_optimization;
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern AppDomainSetup InitAppDomainSetup (AppDomainSetup setup);
+
+		public AppDomainSetup ()
+		{
+			InitAppDomainSetup (this);
+		}
+		
+		public string ApplicationBase {
+
+			get {
+				return application_base;
+			}
+
+			set {
+				application_base = value;
+			}
+		}
+
+		public string ApplicationName {
+
+			get {
+				return application_name;
+			}
+
+			set {
+				application_name = value;
+			}
+		}
+
+		public string CachePath {
+
+			get {
+				return cache_path;
+			}
+
+			set {
+				cache_path = value;
+			}
+		}
+
+		public string ConfigurationFile {
+
+			get {
+				return configuration_file;
+			}
+
+			set {
+				configuration_file = value;
+			}
+		}
+
+		public bool DisallowPublisherPolicy {
+			get {
+				return publisher_policy;
+			}
+
+			set {
+				publisher_policy = value;
+			}
+		}
+		
+		public string DynamicBase {
+
+			get {
+				return dynamic_base;
+			}
+
+			set {
+				dynamic_base = value;
+			}
+		}
+
+		public string LicenseFile {
+
+			get {
+				return license_file;
+			}
+
+			set {
+				license_file = value;
+			}
+		}
+
+		[MonoTODO("--share-code")]
+		public LoaderOptimization LoaderOptimization
+		{
+			get {
+				return loader_optimization;
+			}
+
+			set { 
+				loader_optimization = value;
+			}
+		}
+
+		public string PrivateBinPath {
+
+			get {
+				return private_bin_path;
+			}
+
+			set {
+				private_bin_path = value;
+			}
+		}
+
+		public string PrivateBinPathProbe {
+
+			get {
+				return private_bin_path_probe;
+			}
+
+			set {
+				private_bin_path_probe = value;
+			}
+		}
+
+		public string ShadowCopyDirectories {
+
+			get {
+				return shadow_copy_directories;
+			}
+
+			set {
+				shadow_copy_directories = value;
+			}
+		}
+
+		public string ShadowCopyFiles {
+
+			get {
+				return shadow_copy_files;
+			}
+
+			set {
+				shadow_copy_files = value;
+			}
+		}
+		
+	}
+}
diff --git a/mcs/class/corlib/System/AppDomainUnloadedException.cs b/mcs/class/corlib/System/AppDomainUnloadedException.cs
new file mode 100644
index 00000000000..9ca65e65c9c
--- /dev/null
+++ b/mcs/class/corlib/System/AppDomainUnloadedException.cs
@@ -0,0 +1,42 @@
+//	
+// System.AppDomainUnloadedException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class AppDomainUnloadedException : SystemException
+	{
+		 // Constructors
+		 public AppDomainUnloadedException ()
+			    : base (Locale.GetText ("Can't access an unloaded application domain."))
+		 {
+		 }
+
+		 public AppDomainUnloadedException (string message)
+			    : base (message)
+		 {
+		 }
+			 
+		 protected AppDomainUnloadedException (SerializationInfo info,
+			    StreamingContext context)
+			    : base (info, context)
+		 {
+		 }
+
+		 public AppDomainUnloadedException (string message, Exception innerException)
+			    :base (message, innerException)
+		 {
+		 }
+			    
+	}
+}
diff --git a/mcs/class/corlib/System/ApplicationException.cs b/mcs/class/corlib/System/ApplicationException.cs
new file mode 100644
index 00000000000..9420c119430
--- /dev/null
+++ b/mcs/class/corlib/System/ApplicationException.cs
@@ -0,0 +1,42 @@
+//
+// System.ApplicationException.cs
+//
+// Authors:
+//   Joe Shaw (joe@ximian.com)
+//   Miguel de Icaza (miguel@ximian.com) 
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Reflection;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+
+	[Serializable]
+	public class ApplicationException : Exception
+	{
+		// Constructors
+		public ApplicationException ()
+			: base (Locale.GetText ("An application exception has occurred."))
+		{
+		}
+
+		public ApplicationException (string message)
+			: base (message)
+		{
+		}
+
+		public ApplicationException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected ApplicationException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/ArgumentException.cs b/mcs/class/corlib/System/ArgumentException.cs
new file mode 100644
index 00000000000..c5b4f26484e
--- /dev/null
+++ b/mcs/class/corlib/System/ArgumentException.cs
@@ -0,0 +1,78 @@
+//
+// System.ArgumentException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+using System.Runtime.Serialization;
+using System.Globalization;
+
+namespace System {
+
+	[Serializable]
+	public class ArgumentException : SystemException {
+		private string param_name;
+
+		// Constructors
+		public ArgumentException ()
+			: base (Locale.GetText ("An invalid argument was specified."))
+		{
+		}
+
+		public ArgumentException (string message)
+			: base (message)
+		{
+		}
+
+		public ArgumentException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		public ArgumentException (string message, string param_name)
+			: base (message)
+		{
+			this.param_name = param_name;
+		}
+
+		public ArgumentException (string message, string param_name, Exception inner)
+			: base (message, inner)
+		{
+			this.param_name = param_name;
+		}
+
+		protected ArgumentException (SerializationInfo info, StreamingContext sc)
+			: base (info, sc)
+		{
+			param_name = info.GetString ("ParamName");
+		}
+
+		// Properties		
+		public virtual string ParamName {
+			get {
+				return param_name;
+			}
+		}
+
+		public override string Message {
+			get {
+				string base_message = base.Message;
+				if (base_message == null)
+					base_message = Locale.GetText ("An invalid argument was specified.");
+
+				if (param_name == null)
+					return base_message;
+				else
+					return base_message + "\nParameter name: " + param_name;
+			}
+		}
+		
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("ParamName", param_name);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/ArgumentNullException.cs b/mcs/class/corlib/System/ArgumentNullException.cs
new file mode 100644
index 00000000000..40450067332
--- /dev/null
+++ b/mcs/class/corlib/System/ArgumentNullException.cs
@@ -0,0 +1,38 @@
+//
+// System.ArgumentNullException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+using System.Globalization;
+
+namespace System {
+
+	[Serializable]
+	public class ArgumentNullException : ArgumentException {
+		// Constructors
+		public ArgumentNullException ()
+			: base (Locale.GetText ("Argument cannot be null"))
+		{
+		}
+
+		public ArgumentNullException (string param_name)
+			: base (Locale.GetText ("Argument cannot be null"), param_name)
+		{
+		}
+
+		public ArgumentNullException (string param_name, string message)
+			: base (message, param_name)
+		{
+		}
+
+		protected ArgumentNullException (SerializationInfo info, StreamingContext sc)
+			: base (info, sc)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/ArgumentOutOfRangeException.cs b/mcs/class/corlib/System/ArgumentOutOfRangeException.cs
new file mode 100644
index 00000000000..e1253bb5ad1
--- /dev/null
+++ b/mcs/class/corlib/System/ArgumentOutOfRangeException.cs
@@ -0,0 +1,72 @@
+//
+// System.ArgumentOutOfRangeException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class ArgumentOutOfRangeException : ArgumentException {
+		private object actual_value;
+
+		// Constructors
+		public ArgumentOutOfRangeException ()
+			: base (Locale.GetText ("Argument is out of range"))
+		{
+		}
+
+		public ArgumentOutOfRangeException (string param_name)
+			: base (Locale.GetText ("Argument is out of range"), param_name)
+		{
+		}
+
+		public ArgumentOutOfRangeException (string param_name, string message)
+			: base (message, param_name)
+		{
+		}
+
+		public ArgumentOutOfRangeException (string param_name, object actual_value, string message)
+			: base (message, param_name)
+		{
+			this.actual_value = actual_value;
+		}
+
+		protected ArgumentOutOfRangeException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+			actual_value = info.GetString ("ActualValue");
+		}
+ 
+		// Properties
+		public virtual object ActualValue {
+			get {
+				return actual_value;
+			}
+		}
+
+		public override string Message {
+			get {
+				string basemsg = base.Message;
+				if (actual_value == null)
+					return basemsg;
+				return basemsg + '\n' + actual_value;
+			}
+		}
+
+		// Methods
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("ActualValue", actual_value);
+		}
+		
+	}
+}
diff --git a/mcs/class/corlib/System/ArithmeticException.cs b/mcs/class/corlib/System/ArithmeticException.cs
new file mode 100644
index 00000000000..ff6c98cbb35
--- /dev/null
+++ b/mcs/class/corlib/System/ArithmeticException.cs
@@ -0,0 +1,38 @@
+//
+// System.ArithmeticException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak  (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+	[Serializable]
+	public class ArithmeticException : SystemException {
+		// Constructors
+		public ArithmeticException ()
+			: base (Locale.GetText ("The arithmetic operation is not allowed"))
+		{
+		}
+
+		public ArithmeticException (string message)
+			: base (message)
+		{
+		}
+
+		public ArithmeticException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected ArithmeticException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/Array.cs b/mcs/class/corlib/System/Array.cs
new file mode 100644
index 00000000000..43e8344bcdc
--- /dev/null
+++ b/mcs/class/corlib/System/Array.cs
@@ -0,0 +1,838 @@
+
+// System.Array.cs
+//
+// Authors:
+//   Joe Shaw (joe@ximian.com)
+//   Martin Baulig (martin@gnome.org)
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+
+	[Serializable]
+	public abstract class Array : ICloneable, ICollection, IList, IEnumerable
+	{
+		// Constructor		
+		private Array ()
+		{
+			/* empty */
+		}
+		
+		// Properties
+		public int Length 
+		{
+			get 
+			{
+				int length = this.GetLength (0);
+
+				for (int i = 1; i < this.Rank; i++) {
+					length *= this.GetLength (i); 
+				}
+				
+				return length;
+			}
+		}
+
+		public int Rank 
+		{
+			get
+			{
+				return this.GetRank ();
+			}
+		}
+
+		// IList interface
+		object IList.this [int index] {
+			get {
+				return GetValueImpl (index);
+			} 
+			set {
+				SetValueImpl (value, index);
+			}
+		}
+
+		int IList.Add (object value) {
+			throw new NotSupportedException ();
+		}
+
+		void IList.Clear () {
+			Array.Clear (this, this.GetLowerBound(0), this.Length);
+		}
+
+		bool IList.Contains (object value) {
+			if (this.Rank > 1)
+				throw new RankException ("Only single dimension arrays are supported.");
+
+			int length = this.Length;
+			for (int i = 0; i < length; i++) {
+				if (value.Equals (this.GetValueImpl (i)))
+					return true;
+			}
+			return false;
+		}
+
+		int IList.IndexOf (object value) {
+			if (this.Rank > 1)
+				throw new RankException ();
+
+			int length = this.Length;
+			for (int i = 0; i < length; i++) {
+				if (value.Equals (this.GetValueImpl (i)))
+					// array index may not be zero-based.
+					// use lower bound
+					return i + this.GetLowerBound (0);
+			}
+
+			int retVal;
+			unchecked {
+				// lower bound may be MinValue
+				retVal = this.GetLowerBound (0) - 1;
+			}
+
+			return retVal;
+		}
+
+		void IList.Insert (int index, object value) {
+			throw new NotSupportedException ();
+		}
+
+		void IList.Remove (object value) {
+			throw new NotSupportedException ();
+		}
+
+		void IList.RemoveAt (int index) {
+			throw new NotSupportedException ();
+		}
+
+		// InternalCall Methods
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern int GetRank ();
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern int GetLength (int dimension);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern int GetLowerBound (int dimension);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern object GetValue (int[] idxs);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern void SetValue (object value, int[] idxs);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal extern object GetValueImpl (int pos);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal extern void SetValueImpl (object value, int pos);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal extern static void FastCopy (Array source, int source_idx, Array dest, int dest_idx, int length);

+

+		[MethodImplAttribute(MethodImplOptions.InternalCall)]

+		internal extern static Array CreateInstanceImpl(Type elementType, int[] lengths, int [] bounds);
+
+		// Properties
+		int ICollection.Count {
+			get {
+				return Length;
+			}
+		}
+
+		[MonoTODO]
+		public virtual bool IsSynchronized {
+			get {
+				// FIXME?
+				return false;
+			}
+		}
+
+		[MonoTODO]
+		public virtual object SyncRoot {
+			get {
+				// FIXME
+				return null;
+			}
+		}
+
+		public virtual bool IsFixedSize 
+		{
+			get {
+				return true;
+			}
+		}
+
+		public virtual bool IsReadOnly 
+		{
+			get{
+				return false;
+			}
+		}
+
+		public virtual IEnumerator GetEnumerator ()
+		{
+			return new SimpleEnumerator(this);
+		}
+
+		public int GetUpperBound (int dimension)
+		{
+			return GetLowerBound (dimension) +
+				GetLength (dimension) - 1;
+		}
+
+		public object GetValue (int idx)
+		{
+			int[] ind = new int [1];
+
+			ind [0] = idx;
+
+			return GetValue (ind);
+		}
+
+		public object GetValue (int idx1, int idx2)
+		{
+			int[] ind = new int [2];
+
+			ind [0] = idx1;
+			ind [1] = idx2;
+
+			return GetValue (ind);
+		}
+
+		public object GetValue (int idx1, int idx2, int idx3)
+		{
+			int[] ind = new int [3];
+
+			ind [0] = idx1;
+			ind [1] = idx2;
+			ind [2] = idx3;
+
+			return GetValue (ind);
+		}
+
+		// This function is currently unused, but just in case we need it later on ... */
+		internal int IndexToPos (int[] idxs)
+		{
+			if (idxs == null)
+				throw new ArgumentNullException ();
+
+			if ((idxs.Rank != 1) || (idxs.Length != Rank))
+				throw new ArgumentException ();
+
+			if ((idxs [0] < GetLowerBound (0)) || (idxs [0] > GetUpperBound (0)))
+				throw new IndexOutOfRangeException();
+
+			int pos = idxs [0] - GetLowerBound (0);
+			for (int i = 1; i < Rank; i++) {
+				if ((idxs [i] < GetLowerBound (i)) || (idxs [i] > GetUpperBound (i)))
+					throw new IndexOutOfRangeException();
+
+				pos *= GetLength (i);
+				pos += idxs [i] - GetLowerBound (i);
+			}
+
+			return pos;
+		}
+
+		public void SetValue (object value, int idx)
+		{
+			int[] ind = new int [1];
+
+			ind [0] = idx;
+
+			SetValue (value, ind);
+		}
+		
+		public void SetValue (object value, int idx1, int idx2)
+		{
+			int[] ind = new int [2];
+
+			ind [0] = idx1;
+			ind [1] = idx2;
+
+			SetValue (value, ind);
+		}
+
+		public void SetValue (object value, int idx1, int idx2, int idx3)
+		{
+			int[] ind = new int [3];
+
+			ind [0] = idx1;
+			ind [1] = idx2;
+			ind [2] = idx3;
+
+			SetValue (value, ind);
+		}
+
+		public static Array CreateInstance(Type elementType, int length)
+		{
+			int[] lengths = new int [1];
+			int[] bounds = null;
+			
+			lengths [0] = length;
+			
+			return CreateInstanceImpl (elementType, lengths, bounds);
+		}
+		
+		public static Array CreateInstance(Type elementType, int l1, int l2)
+		{
+			int[] lengths = new int [2];
+			int[] bounds = null;
+			
+			lengths [0] = l1;
+			lengths [1] = l2;
+			
+			return CreateInstanceImpl (elementType, lengths, bounds);
+		}
+
+		public static Array CreateInstance(Type elementType, int l1, int l2, int l3)
+		{
+			int[] lengths = new int [3];
+			int[] bounds = null;
+			
+			lengths [0] = l1;
+			lengths [1] = l2;
+			lengths [2] = l3;
+		
+			return CreateInstanceImpl (elementType, lengths, bounds);
+		}
+
+		public static Array CreateInstance(Type elementType, int[] lengths)
+		{
+			int[] bounds = null;
+			
+			return CreateInstanceImpl (elementType, lengths, bounds);
+		}
+
+		public static Array CreateInstance(Type elementType, int[] lengths, int [] bounds)
+		{
+			if (bounds == null)
+				throw new ArgumentNullException("bounds");
+
+			return CreateInstanceImpl (elementType, lengths, bounds);
+		}
+
+		
+		public static int BinarySearch (Array array, object value)
+		{
+			if (array == null)
+				throw new ArgumentNullException("array");
+
+			if (array.Rank > 1)
+				throw new RankException();
+
+			if (!(value is IComparable))
+				throw new ArgumentException("value does not support IComparable");
+
+			return BinarySearch (array, array.GetLowerBound (0), array.GetLength (0),
+					     value, null);
+		}
+
+		public static int BinarySearch (Array array, object value, IComparer comparer)
+		{
+			if (array == null)
+				throw new ArgumentNullException("array");
+
+			if (array.Rank > 1)
+				throw new RankException();
+
+			if ((comparer == null) && !(value is IComparable))
+				throw new ArgumentException("comparer is null and value does not support IComparable");
+
+			return BinarySearch (array, array.GetLowerBound (0), array.GetLength (0),
+					     value, comparer);
+		}
+
+		public static int BinarySearch (Array array, int index, int length, object value)
+		{
+			if (array == null)
+				throw new ArgumentNullException("array");
+
+			if (array.Rank > 1)
+				throw new RankException();
+
+			if (index < array.GetLowerBound (0))
+				throw new ArgumentOutOfRangeException("index is less than the lower bound of array.");
+			if (length < 0)
+				throw new ArgumentOutOfRangeException("length is less than zero.");
+
+			if (index + length > array.GetLowerBound (0) + array.GetLength (0))
+				throw new ArgumentException("index and length do not specify a valid range in array.");
+			if (!(value is IComparable))
+				throw new ArgumentException("value does not support IComparable");
+
+			return BinarySearch (array, index, length, value, null);
+		}
+
+		public static int BinarySearch (Array array, int index,
+						int length, object value,
+						IComparer comparer)
+		{
+			if (array == null)
+				throw new ArgumentNullException ("array");
+
+			if (array.Rank > 1)
+				throw new RankException ();
+
+			if (index < array.GetLowerBound (0))
+				throw new ArgumentOutOfRangeException("index is less than the lower bound of array.");
+			if (length < 0)
+				throw new ArgumentOutOfRangeException("length is less than zero.");
+
+			if (index + length > array.GetLowerBound (0) + array.GetLength (0))
+				throw new ArgumentException("index and length do not specify a valid range in array.");
+
+			if ((comparer == null) && !(value is IComparable))
+				throw new ArgumentException("comparer is null and value does not support IComparable");
+
+			// cache this in case we need it
+			IComparable valueCompare = value as IComparable;
+
+			int iMin = index;
+			int iMax = index + length;
+			int iCmp = 0;
+			try
+			{
+				// there's a subtle balance here between
+				// 1) the while condition
+				// 2) the rounding down of the '/ 2'
+				// 3) the asymetrical recursion
+				// 4) the fact that iMax starts beyond the end of the array
+				while (iMin < iMax)
+				{
+					int iMid = (iMin + iMax) / 2;
+					object elt = array.GetValueImpl (iMid);
+
+					// this order is from MSDN
+					if (comparer != null)
+						iCmp = comparer.Compare (value, elt);
+					else
+					{
+						IComparable eltCompare = elt as IComparable;
+						if (eltCompare != null)
+							iCmp = -eltCompare.CompareTo (value);
+						else
+							iCmp = valueCompare.CompareTo (elt);
+					}
+
+					if (iCmp == 0)
+						return iMid;
+					else if (iCmp < 0)
+						iMax = iMid;
+					else
+						iMin = iMid + 1;	// compensate for the rounding down
+				}
+			}
+			catch (InvalidCastException e)
+			{
+				throw new ArgumentException ("array", e);
+			}
+
+			if (iCmp > 0)
+				return ~iMax;
+			else
+				return ~iMin;
+		}
+
+		public static void Clear (Array array, int index, int length)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+
+			if (array.Rank > 1)
+				throw new RankException ();
+
+			if (index < array.GetLowerBound (0) || length < 0 ||
+				index + length > array.GetUpperBound (0) + 1)
+				throw new ArgumentOutOfRangeException ();
+
+			for (int i = 0; i < length; i++) 
+			{
+				array.SetValueImpl(null, index + i);
+			}
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public virtual extern object Clone ();
+
+		public static void Copy (Array source, Array dest, int length)
+		{
+			// need these checks here because we are going to use
+			// GetLowerBound() on source and dest.
+			if (source == null)
+				throw new ArgumentNullException ("null");
+
+			if (dest == null)
+				throw new ArgumentNullException ("dest");
+
+			Copy (source, source.GetLowerBound (0), dest, dest.GetLowerBound (0), length);			
+		}
+
+		public static void Copy (Array source, int source_idx, Array dest, int dest_idx, int length)
+		{
+			if (source == null)
+				throw new ArgumentNullException ("null");
+
+			if (dest == null)
+				throw new ArgumentNullException ("dest");
+
+			if (length < 0)
+				throw new ArgumentOutOfRangeException ("length");
+
+			if (source_idx < 0)
+				throw new ArgumentException ("source_idx");
+
+			if (dest_idx < 0)
+				throw new ArgumentException ("dest_idx");
+
+			int source_pos = source_idx - source.GetLowerBound (0);
+			int dest_pos = dest_idx - dest.GetLowerBound (0);
+
+
+			if (source_pos + length > source.Length || dest_pos + length > dest.Length)
+				throw new ArgumentException ("length");
+
+			if (source.Rank != dest.Rank)
+				throw new RankException ();
+
+			Type src_type = source.GetType ().GetElementType ();
+			Type dst_type = dest.GetType ().GetElementType ();
+
+			if (src_type == dst_type) {
+				FastCopy (source, source_pos, dest, dest_pos, length);
+				return;
+			}
+
+			if (!Object.ReferenceEquals (source, dest) || source_pos > dest_pos)
+			{
+				for (int i = 0; i < length; i++) 
+				{
+					Object srcval = source.GetValueImpl (source_pos + i);
+
+					try {
+						dest.SetValueImpl (srcval, dest_pos + i);
+					} catch {
+						if ((dst_type.IsValueType || dst_type.Equals (typeof (String))) &&
+							(src_type.Equals (typeof (Object))))
+							throw new InvalidCastException ();
+						else
+							throw new ArrayTypeMismatchException (
+								String.Format ("(Types: source={0};  target={1})", src_type.FullName, dst_type.FullName));
+					}
+				}
+			}
+			else
+			{
+				for (int i = length - 1; i >= 0; i--) 
+				{
+					Object srcval = source.GetValueImpl (source_pos + i);
+
+					try {
+						dest.SetValueImpl (srcval, dest_pos + i);
+					} catch {
+						if ((dst_type.IsValueType || dst_type.Equals (typeof (String))) &&
+							(src_type.Equals (typeof (Object))))
+							throw new InvalidCastException ();
+						else
+							throw new ArrayTypeMismatchException (
+								String.Format ("(Types: source={0};  target={1})", src_type.FullName, dst_type.FullName));
+					}
+				}
+			}
+		}
+		
+		public static int IndexOf (Array array, object value)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+	
+			return IndexOf (array, value, 0, array.Length);
+		}
+
+		public static int IndexOf (Array array, object value, int index)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+
+			return IndexOf (array, value, index, array.Length - index);
+		}
+		
+		public static int IndexOf (Array array, object value, int index, int length)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+	
+			if (array.Rank > 1)
+				throw new RankException ();
+
+			if (length < 0 || index < array.GetLowerBound (0) ||
+			    index+length-1 > array.GetUpperBound (0))
+				throw new ArgumentOutOfRangeException ();
+
+			for (int i = 0; i < length; i++)
+			{
+				if (array.GetValueImpl(index + i).Equals(value))
+					return index + i;
+			}
+
+			return array.GetLowerBound (0) - 1;
+		}
+
+		public static int LastIndexOf (Array array, object value)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+	
+			return LastIndexOf (array, value, array.Length-1);
+		}
+
+		public static int LastIndexOf (Array array, object value, int index)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+	
+			return LastIndexOf (array, value, index, index-array.GetLowerBound(0)+1);
+		}
+		
+		public static int LastIndexOf (Array array, object value, int index, int length)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+	
+			if (array.Rank > 1)
+				throw new RankException ();
+
+			if (length < 0 || index-length+1 < array.GetLowerBound (0) ||
+			    index > array.GetUpperBound (0))
+				throw new ArgumentOutOfRangeException ();
+
+			for (int i = index; i >= index-length+1; i--)
+			{
+				if (array.GetValueImpl(i).Equals(value))
+					return i;
+			}
+
+			return array.GetLowerBound (0) - 1;
+		}
+
+		public static void Reverse (Array array)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+
+			Reverse (array, array.GetLowerBound (0), array.GetLength (0));
+		}
+
+		public static void Reverse (Array array, int index, int length)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+
+			if (array.Rank > 1)
+				throw new RankException ();
+
+			if (index < array.GetLowerBound (0) || length < 0)
+				throw new ArgumentOutOfRangeException ();
+
+			if (index + length > array.GetUpperBound (0) + 1)
+				throw new ArgumentException ();
+
+			for (int i = 0; i < length/2; i++)
+			{
+				object tmp;
+
+				tmp = array.GetValueImpl (index + i);
+				array.SetValueImpl(array.GetValueImpl (index + length - i - 1), index + i);
+				array.SetValueImpl(tmp, index + length - i - 1);
+			}
+		}		
+		
+		public static void Sort (Array array)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+
+			Sort (array, null, array.GetLowerBound (0), array.GetLength (0), null);
+		}
+
+		public static void Sort (Array keys, Array items)
+		{
+			if (keys == null)
+				throw new ArgumentNullException ();
+
+			Sort (keys, items, keys.GetLowerBound (0), keys.GetLength (0), null);
+		}
+
+		public static void Sort (Array array, IComparer comparer)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+
+			Sort (array, null, array.GetLowerBound (0), array.GetLength (0), comparer);
+		}
+
+		public static void Sort (Array array, int index, int length)
+		{
+			Sort (array, null, index, length, null);
+		}
+
+		public static void Sort (Array keys, Array items, IComparer comparer)
+		{
+			if (keys == null)
+				throw new ArgumentNullException ();
+
+			Sort (keys, items, keys.GetLowerBound (0), keys.GetLength (0), comparer);
+		}
+
+		public static void Sort (Array keys, Array items, int index, int length)
+		{
+			Sort (keys, items, index, length, null);
+		}
+
+		public static void Sort (Array array, int index, int length, IComparer comparer)
+		{
+			Sort (array, null, index, length, comparer);
+		}
+
+		public static void Sort (Array keys, Array items, int index, int length, IComparer comparer)
+		{
+			int low0 = index;
+			int high0 = index + length - 1;
+
+			qsort (keys, items, index, index + length - 1, comparer);
+		}
+
+		private static void qsort (Array keys, Array items, int low0, int high0, IComparer comparer)
+		{
+			if (keys == null)
+				throw new ArgumentNullException ();
+
+			if (keys.Rank > 1 || (items != null && items.Rank > 1))
+				throw new RankException ();
+
+			if (low0 >= high0)
+				return;
+
+			int low = low0;
+			int high = high0;
+
+			object objPivot = keys.GetValueImpl ((low + high) / 2);
+
+			while (low <= high)
+			{
+				// Move the walls in
+				while (low < high0 && compare (keys.GetValueImpl (low), objPivot, comparer) < 0)
+					++low;
+				while (high > low0 && compare (objPivot, keys.GetValueImpl (high), comparer) < 0)
+					--high;
+
+				if (low <= high)
+				{
+					swap (keys, items, low, high);
+					++low;
+					--high;
+				}
+			}
+
+			if (low0 < high)
+				qsort (keys, items, low0, high, comparer);
+			if (low < high0)
+				qsort (keys, items, low, high0, comparer);
+		}
+
+		private static void swap (Array keys, Array items, int i, int j)
+		{
+			object tmp;
+
+			tmp = keys.GetValueImpl (i);
+			keys.SetValueImpl (keys.GetValue (j), i);
+			keys.SetValueImpl (tmp, j);
+
+			if (items != null)
+			{
+				tmp = items.GetValueImpl (i);
+				items.SetValueImpl (items.GetValueImpl (j), i);
+				items.SetValueImpl (tmp, j);
+			}
+		}
+
+		private static int compare (object value1, object value2, IComparer comparer)
+		{
+			if (comparer == null)
+				return ((IComparable) value1).CompareTo(value2);
+			else
+				return comparer.Compare(value1, value2);
+		}
+	
+		public virtual void CopyTo (Array array, int index)
+		{
+			if (array == null)
+				throw new ArgumentNullException ();
+
+			// The order of these exception checks may look strange,
+			// but that's how the microsoft runtime does it.
+			if (this.Rank > 1)
+				throw new RankException ();
+			if (index + this.GetLength (0) > array.GetLowerBound (0) + array.GetLength (0))
+				throw new ArgumentException ();
+			if (array.Rank > 1)
+				throw new RankException ();
+			if (index < 0)
+				throw new ArgumentOutOfRangeException ();
+
+			Copy (this, this.GetLowerBound(0), array, index, this.GetLength (0));
+		}
+
+		internal class SimpleEnumerator : IEnumerator {
+			Array enumeratee;
+			int currentpos;
+			int length;
+
+			public SimpleEnumerator (Array arrayToEnumerate) {
+				this.enumeratee = arrayToEnumerate;
+				this.currentpos = -1;
+				this.length = arrayToEnumerate.Length;
+			}
+
+			public object Current {
+				get {
+			 		// Exception messages based on MS implementation
+					if (currentpos < 0 ) {
+						throw new InvalidOperationException
+							("Enumeration has not started");
+					}
+					if  (currentpos >= length) {
+						throw new InvalidOperationException
+							("Enumeration has already ended");
+					}
+					// Current should not increase the position. So no ++ over here.
+					return enumeratee.GetValueImpl(currentpos);
+				}
+			}
+
+			public bool MoveNext() {
+				//The docs say Current should throw an exception if last
+				//call to MoveNext returned false. This means currentpos
+				//should be set to length when returning false.
+					if (currentpos < length) {
+						currentpos++;
+					}
+				if(currentpos < length)
+					return true;
+				else
+					return false;
+			}
+
+			public void Reset() {
+				currentpos= -1;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/ArrayTypeMismatchException.cs b/mcs/class/corlib/System/ArrayTypeMismatchException.cs
new file mode 100644
index 00000000000..2938300de61
--- /dev/null
+++ b/mcs/class/corlib/System/ArrayTypeMismatchException.cs
@@ -0,0 +1,38 @@
+//
+// System.ArrayTypeMismatchException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+	[Serializable]
+	public class ArrayTypeMismatchException : SystemException {
+		// Constructors
+		public ArrayTypeMismatchException ()
+			: base (Locale.GetText ("Source array type cannot be assigned to destination array type"))
+		{
+		}
+
+		public ArrayTypeMismatchException (string message)
+			: base (message)
+		{
+		}
+
+		public ArrayTypeMismatchException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected ArrayTypeMismatchException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+
+		
+	}
+}
diff --git a/mcs/class/corlib/System/AssemblyLoadEventArgs.cs b/mcs/class/corlib/System/AssemblyLoadEventArgs.cs
new file mode 100755
index 00000000000..dec3463c6aa
--- /dev/null
+++ b/mcs/class/corlib/System/AssemblyLoadEventArgs.cs
@@ -0,0 +1,34 @@
+//
+// System.AssemblyLoadEventArgs.cs 
+//
+// Author:
+//   Chris Hynes (chrish@assistedsolutions.com)
+//
+// (C) 2001 Chris Hynes
+//
+
+using System;
+using System.Reflection;
+
+namespace System 
+{
+	public class AssemblyLoadEventArgs: EventArgs
+	{
+		private Assembly m_loadedAssembly;
+
+		public AssemblyLoadEventArgs(Assembly loadedAssembly)
+		{
+			this.m_loadedAssembly = loadedAssembly;
+		}
+
+		public Assembly LoadedAssembly
+		{
+			get 
+			{
+				return m_loadedAssembly;
+			}
+		}
+	}
+}
+
+
diff --git a/mcs/class/corlib/System/AssemblyLoadEventHandler.cs b/mcs/class/corlib/System/AssemblyLoadEventHandler.cs
new file mode 100755
index 00000000000..46074f9523d
--- /dev/null
+++ b/mcs/class/corlib/System/AssemblyLoadEventHandler.cs
@@ -0,0 +1,10 @@
+// System.AssemblyLoadEventHandler.cs
+//
+// Paolo Molaro
+//
+// (C) 2002 Ximian, Inc.
+
+namespace System
+{
+	public delegate void AssemblyLoadEventHandler (object sender, AssemblyLoadEventArgs args);
+}
diff --git a/mcs/class/corlib/System/AsyncCallback.cs b/mcs/class/corlib/System/AsyncCallback.cs
new file mode 100644
index 00000000000..ba9ead8e6f2
--- /dev/null
+++ b/mcs/class/corlib/System/AsyncCallback.cs
@@ -0,0 +1,13 @@
+//
+// System/AsyncCallback.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+	public delegate void AsyncCallback (IAsyncResult ar);
+}
+
diff --git a/mcs/class/corlib/System/Attribute.cs b/mcs/class/corlib/System/Attribute.cs
new file mode 100644
index 00000000000..cdad17adbda
--- /dev/null
+++ b/mcs/class/corlib/System/Attribute.cs
@@ -0,0 +1,386 @@
+//

+// System.Attribute.cs

+//

+// Authors:

+//   Miguel de Icaza (miguel@ximian.com) - Original

+//   Nick D. Drochak II (ndrochak@gol.com) - Implemented most of the guts

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+using System.Globalization;

+

+namespace System {

+

+	[AttributeUsage(AttributeTargets.All)]

+	[Serializable]

+	public abstract class Attribute {

+

+		protected Attribute ()

+		{

+		}

+

+		public virtual object TypeId {

+			get {

+				// Derived classes should override this default behaviour as appropriate

+				return this.GetType ();

+			}

+		}

+

+		private static void CheckParameters (object element, Type attribute_type)

+		{

+			// neither parameter is allowed to be null

+			if (null == element) 

+			{

+				throw new ArgumentNullException ("element");

+			}

+

+			if (null == attribute_type) 

+			{

+				throw new ArgumentNullException ("attribute_type");

+			}

+		}

+

+		private static System.Attribute FindAttribute (object[] attributes)

+		{

+			// if there exists more than one attribute of the given type, throw an exception

+			if (attributes.Length > 1) {

+				throw new System.Reflection.AmbiguousMatchException (

+					Locale.GetText ("<element> has more than one attribute of type <attribute_type>"));

+			}

+

+			if (attributes.Length < 1) 

+				return null;

+

+			// tested above for '> 1' and and '< 1', so only '== 1' is left,

+			// i.e. we found the attribute

+			

+			return (System.Attribute) attributes[0];

+		}

+

+		private static void CheckAncestry (Type attribute_type)

+		{

+			// attribute_type must be derived from type System.Attribute

+			Type t = typeof (System.Attribute);

+			

+			/* fixme: thgi does not work for target monolib2

+			if (!attribute_type.IsSubclassOf (t))

+			{

+				throw new ArgumentException ("Parameter is not a type derived from System.Attribute", "attribute_type");

+			}

+			*/

+		}

+

+		public static Attribute GetCustomAttribute (System.Reflection.ParameterInfo element,

+							    Type attribute_type)

+		{

+			return GetCustomAttribute (element, attribute_type, true);

+		}

+

+		public static Attribute GetCustomAttribute (System.Reflection.MemberInfo element,

+							    Type attribute_type)

+		{

+			return GetCustomAttribute (element, attribute_type, true);

+		}

+

+		public static Attribute GetCustomAttribute (System.Reflection.Assembly element,

+							    Type attribute_type)

+		{

+			return GetCustomAttribute (element, attribute_type, true);

+		}

+

+		public static Attribute GetCustomAttribute (System.Reflection.Module element,

+							    Type attribute_type)

+		{

+			return GetCustomAttribute (element, attribute_type, true);

+		}

+

+		public static Attribute GetCustomAttribute (System.Reflection.Module element,

+							    Type attribute_type, bool inherit)

+		{

+			// neither parameter is allowed to be null

+			CheckParameters (element, attribute_type);

+

+			// attribute_type must be derived from type System.Attribute

+			CheckAncestry (attribute_type);

+

+			// Module inheritance hierarchies CAN NOT be searched for attributes, so the second

+			// parameter of GetCustomAttributes () is INGNORED.

+			object[] attributes = element.GetCustomAttributes (attribute_type, inherit);

+

+			return FindAttribute (attributes);

+		}

+

+		public static Attribute GetCustomAttribute (System.Reflection.Assembly element,

+							    Type attribute_type, bool inherit)

+		{

+			// neither parameter is allowed to be null

+			CheckParameters (element, attribute_type);

+

+			// attribute_type must be derived from type System.Attribute

+			CheckAncestry (attribute_type);

+

+			// Assembly inheritance hierarchies CAN NOT be searched for attributes, so the second

+			// parameter of GetCustomAttributes () is INGNORED.

+			object[] attributes = element.GetCustomAttributes (attribute_type, inherit);

+

+			return FindAttribute (attributes);

+		}

+

+		public static Attribute GetCustomAttribute (System.Reflection.ParameterInfo element,

+							    Type attribute_type, bool inherit)

+		{

+			// neither parameter is allowed to be null

+			CheckParameters (element, attribute_type);

+

+			// attribute_type must be derived from type System.Attribute

+			CheckAncestry (attribute_type);

+

+			// ParameterInfo inheritance hierarchies CAN NOT be searched for attributes, so the second

+			// parameter of GetCustomAttributes () is INGNORED.

+			object[] attributes = element.GetCustomAttributes (attribute_type, inherit);

+

+			return FindAttribute (attributes);

+		}

+

+		public static Attribute GetCustomAttribute (System.Reflection.MemberInfo element,

+							    Type attribute_type, bool inherit)

+		{

+			// neither parameter is allowed to be null

+			CheckParameters (element, attribute_type);

+

+			// attribute_type must be derived from type System.Attribute

+			CheckAncestry (attribute_type);

+

+			// MemberInfo inheritance hierarchies can be searched for attributes, so the second

+			// parameter of GetCustomAttributes () is respected.

+			object[] attributes = element.GetCustomAttributes (attribute_type, inherit);

+

+			return FindAttribute (attributes);

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.Assembly element)

+		{

+			return System.Attribute.GetCustomAttributes (element, true);

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.ParameterInfo element)

+		{

+			return System.Attribute.GetCustomAttributes (element, true);

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.MemberInfo element){

+			return System.Attribute.GetCustomAttributes (element, true);

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.Module element){

+			return System.Attribute.GetCustomAttributes (element, true);

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.Assembly element,

+							       Type attribute_type)

+		{

+			return System.Attribute.GetCustomAttributes (element, attribute_type, true);

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.Module element,

+							       Type attribute_type)

+		{

+			return System.Attribute.GetCustomAttributes (element, attribute_type, true);

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.ParameterInfo element,

+							       Type attribute_type)

+		{

+			return System.Attribute.GetCustomAttributes (element, attribute_type, true);

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.MemberInfo element,

+							       Type attribute_type)

+		{

+			return System.Attribute.GetCustomAttributes (element, attribute_type, true);

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.Assembly element,

+							       Type attribute_type, bool inherit)

+		{

+			// element parameter is not allowed to be null

+			CheckParameters (element, attribute_type);

+

+			// make a properly typed array to return containing the custom attributes

+			System.Attribute[] attributes;

+

+			attributes = (System.Attribute[]) element.GetCustomAttributes (

+				attribute_type, inherit);

+

+			return attributes;

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.ParameterInfo element,

+							       Type attribute_type, bool inherit)

+		{

+			// element parameter is not allowed to be null

+			CheckParameters (element, attribute_type);

+

+			// make a properly typed array to return containing the custom attributes

+			System.Attribute[] attributes = (System.Attribute[]) element.GetCustomAttributes (

+				attribute_type, inherit);

+

+			return attributes;

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.Module element,

+							       Type attribute_type, bool inherit)

+		{

+			// element parameter is not allowed to be null

+			CheckParameters (element, attribute_type);

+

+			// make a properly typed array to return containing the custom attributes

+			System.Attribute[] attributes = (System.Attribute[]) element.GetCustomAttributes (

+				attribute_type, inherit);

+

+			return attributes;

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.MemberInfo element,

+							       Type attribute_type, bool inherit)

+		{

+			// element parameter is not allowed to be null

+			CheckParameters (element, attribute_type);

+

+			// make a properly typed array to return containing the custom attributes

+			System.Attribute[] attributes = (System.Attribute[]) element.GetCustomAttributes (

+				attribute_type, inherit);

+

+			return attributes;

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.Module element,

+							       bool inherit)

+		{

+			// element parameter is not allowed to be null

+			CheckParameters (element, typeof (System.Attribute));

+

+			// make a properly typed array to return containing the custom attributes

+			System.Attribute[] attributes = (System.Attribute[]) element.GetCustomAttributes (

+				inherit);

+

+			return attributes;

+		}

+		

+		public static Attribute[] GetCustomAttributes (System.Reflection.Assembly element,

+							       bool inherit)

+		{

+			// element parameter is not allowed to be null

+			CheckParameters (element, typeof (System.Attribute));

+

+			// make a properly typed array to return containing the custom attributes

+			System.Attribute[] attributes = (System.Attribute[]) element.GetCustomAttributes (

+				inherit);

+

+			return attributes;

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.MemberInfo element,

+							       bool inherit)

+		{

+			// element parameter is not allowed to be null

+			CheckParameters (element, typeof (System.Attribute));

+

+			// make a properly typed array to return containing the custom attributes

+			System.Attribute[] attributes = (System.Attribute[]) element.GetCustomAttributes (

+				inherit);

+

+			return attributes;

+		}

+

+		public static Attribute[] GetCustomAttributes (System.Reflection.ParameterInfo element,

+							       bool inherit)

+		{

+			// element parameter is not allowed to be null

+			CheckParameters (element, typeof (System.Attribute));

+

+			// make a properly typed array to return containing the custom attributes

+			System.Attribute[] attributes = (System.Attribute[]) element.GetCustomAttributes (

+				inherit);

+

+			return attributes;

+		}

+

+		public override int GetHashCode ()

+		{

+			return ((Object) this).GetHashCode ();

+		}

+		

+		public virtual bool IsDefaultAttribute ()

+		{

+			// Derived classes should override this default behaviour as appropriate

+			return false;

+		}

+		

+		public static bool IsDefined (System.Reflection.Module element, Type attribute_type)

+		{

+			return (System.Attribute.GetCustomAttributes (element, attribute_type).Length > 0);

+		}

+

+		public static bool IsDefined (System.Reflection.ParameterInfo element, Type attribute_type)

+		{

+			return (System.Attribute.GetCustomAttributes (element, attribute_type).Length > 0);

+		}

+

+		public static bool IsDefined (System.Reflection.MemberInfo element, Type attribute_type)

+		{

+			return (System.Attribute.GetCustomAttributes (element, attribute_type).Length > 0);

+		}

+

+		public static bool IsDefined (System.Reflection.Assembly element, Type attribute_type)

+		{

+			return (System.Attribute.GetCustomAttributes (element, attribute_type).Length > 0);

+		}

+

+		public static bool IsDefined (System.Reflection.MemberInfo element, Type attribute_type,

+					      bool inherit)

+		{

+			return (System.Attribute.GetCustomAttributes (

+				element, attribute_type, inherit).Length > 0);

+		}

+

+		public static bool IsDefined (System.Reflection.Assembly element, Type attribute_type,

+					      bool inherit)

+		{

+			return (System.Attribute.GetCustomAttributes (

+				element, attribute_type, inherit).Length > 0);

+		}

+

+		public static bool IsDefined (System.Reflection.Module element, Type attribute_type,

+					      bool inherit)

+		{

+			return (System.Attribute.GetCustomAttributes (

+				element, attribute_type, inherit).Length > 0);

+		}

+

+		public static bool IsDefined (System.Reflection.ParameterInfo element,

+					      Type attribute_type, bool inherit)

+		{

+			return (System.Attribute.GetCustomAttributes (

+				element, attribute_type, inherit).Length > 0);

+		}

+		

+		public virtual bool Match (object obj)

+		{

+			// default action is the same as Equals.

+			// Derived classes should override as appropriate

+			

+			return this.Equals (obj);

+		}

+

+		public override bool Equals (object obj)

+		{

+			if (obj == null || !(obj is Attribute))

+				return false;

+

+			return ((Attribute) obj) == this;

+		}

+	}

+}

diff --git a/mcs/class/corlib/System/AttributeTargets.cs b/mcs/class/corlib/System/AttributeTargets.cs
new file mode 100644
index 00000000000..72505159938
--- /dev/null
+++ b/mcs/class/corlib/System/AttributeTargets.cs
@@ -0,0 +1,82 @@
+// AttributeTargets.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Fri, 7 Sep 2001 16:31:48 UTC
+// Source file: AllTypes.xml
+// URL: http://msdn.microsoft.com/net/ecma/AllTypes.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System {
+
+
+	/// <summary>
+	/// </summary>
+	[Flags]
+	public enum AttributeTargets {
+
+		/// <summary>
+		/// </summary>
+		Assembly = 0x00000001,
+
+		/// <summary>
+		/// </summary>
+		Module = 0x00000002,
+
+		/// <summary>
+		/// </summary>
+		Class = 0x00000004,
+
+		/// <summary>
+		/// </summary>
+		Struct = 0x00000008,
+
+		/// <summary>
+		/// </summary>
+		Enum = 0x00000010,
+
+		/// <summary>
+		/// </summary>
+		Constructor = 0x00000020,
+
+		/// <summary>
+		/// </summary>
+		Method = 0x00000040,
+
+		/// <summary>
+		/// </summary>
+		Property = 0x00000080,
+
+		/// <summary>
+		/// </summary>
+		Field = 0x00000100,
+
+		/// <summary>
+		/// </summary>
+		Event = 0x00000200,
+
+		/// <summary>
+		/// </summary>
+		Interface = 0x00000400,
+
+		/// <summary>
+		/// </summary>
+		Parameter = 0x00000800,
+
+		/// <summary>
+		/// </summary>
+		Delegate = 0x00001000,
+
+		/// <summary>
+		/// </summary>
+		ReturnValue = 0x00002000,
+
+		/// <summary>
+		/// </summary>
+		All = Assembly | Module | Class | Struct | Enum | Constructor | Method | Property | Field | Event | Interface | Parameter | Delegate | ReturnValue,
+	} // AttributeTargets
+
+} // System
diff --git a/mcs/class/corlib/System/AttributeUsage.cs b/mcs/class/corlib/System/AttributeUsage.cs
new file mode 100644
index 00000000000..c0bcb0616a2
--- /dev/null
+++ b/mcs/class/corlib/System/AttributeUsage.cs
@@ -0,0 +1,50 @@
+//

+// System.AttributeUsage.cs

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+//

+

+namespace System {

+

+	[AttributeUsage(AttributeTargets.All)]

+	[Serializable]

+	public sealed class AttributeUsageAttribute : Attribute {

+		AttributeTargets valid_on;

+		bool allow_multiple, inherited;

+		

+		public AttributeUsageAttribute (AttributeTargets validOn)

+		{

+			valid_on = validOn;

+		}

+

+		public bool AllowMultiple {

+			get {

+				return allow_multiple;

+			}

+

+			set {

+				allow_multiple = value;

+			}

+		}

+

+		public bool Inherited {

+			get {

+				return inherited;

+			}

+

+			set {

+				inherited = value;

+			}

+		}

+

+		public AttributeTargets ValidOn {

+			get {

+				return valid_on;

+			}

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/System/BadImageFormatException.cs b/mcs/class/corlib/System/BadImageFormatException.cs
new file mode 100644
index 00000000000..8ea5857f5fa
--- /dev/null
+++ b/mcs/class/corlib/System/BadImageFormatException.cs
@@ -0,0 +1,93 @@
+// System.BadImageFormatException
+//
+// Sean MacIsaac (macisaac@ximian.com)
+// Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class BadImageFormatException : SystemException
+	{
+		// Fields
+		private string msg; // we need this because System.Exception's message is private.
+		private Exception inner;
+		private string fileName;
+		private string fusionLog;
+		
+		// Constructors
+		public BadImageFormatException ()
+			: base (Locale.GetText ("Invalid file image."))
+		{
+			msg = "Invalid file image.";
+		}
+		
+		public BadImageFormatException (string message)
+			: base (message)
+		{
+			msg = message;
+		}
+
+		protected BadImageFormatException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+			fileName = info.GetString ("BadImageFormat_FileName");
+			fusionLog = info.GetString ("BadImageFormat_FusionLog");
+		}
+
+		public BadImageFormatException (string message, Exception inner)
+			: base (message, inner)
+		{
+			msg = message;
+			this.inner = inner;
+		}
+
+		public BadImageFormatException (string message, string fileName)
+			: base (message)
+		{
+			msg = message;
+			this.fileName = fileName;
+		}
+
+		public BadImageFormatException (string message, string fileName, Exception inner)
+			: base (message, inner)
+		{
+			msg = message;
+			this.inner = inner;
+			this.fileName = fileName;
+		}
+		    
+		// Properties
+		public override string Message
+		{
+			get { return Locale.GetText (msg); }
+		}
+
+		public string FileName
+		{
+			get { return fileName; }
+		}
+				
+		public string FusionLog
+		{
+			get { return fusionLog; }
+		}
+
+		// Methods
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("BadImageFormat_FileName", fileName);
+			info.AddValue ("BadImageFormat_FusionLog", fusionLog);
+		}
+
+		public override string ToString ()
+		{
+			return inner.ToString();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/BitConverter.cs b/mcs/class/corlib/System/BitConverter.cs
new file mode 100755
index 00000000000..6b6961d4bda
--- /dev/null
+++ b/mcs/class/corlib/System/BitConverter.cs
@@ -0,0 +1,270 @@
+//
+// System.BitConverter
+//
+// Author:
+//   Matt Kimball (matt@kimball.net)
+//
+
+using System;
+
+namespace System {
+	public sealed class BitConverter {
+
+		private BitConverter () {}
+
+		static bool AmILittleEndian()
+		{
+			byte[] one = GetBytes((int)1);
+			return (one[0] == 1);
+		}
+
+		public static readonly bool IsLittleEndian = AmILittleEndian ();
+
+		public static long DoubleToInt64Bits(double value)
+		{
+			return ToInt64(GetBytes(value), 0);
+		}
+
+		public static double Int64BitsToDouble(long value)
+		{
+			return ToDouble(GetBytes(value), 0);
+		}
+
+		unsafe static byte[] GetBytes(byte *ptr, int count)
+		{
+			byte[] ret = new byte[count];
+
+			for (int i = 0; i < count; i++) {
+				ret[i] = ptr[i];
+			}
+
+			return ret;
+		}
+
+		unsafe public static byte[] GetBytes(bool value)
+		{
+			return GetBytes((byte *)&value, 1);
+		}
+
+		unsafe public static byte[] GetBytes(char value)
+		{
+			return GetBytes((byte *)&value, 2);
+		}
+
+		unsafe public static byte[] GetBytes(short value)
+		{
+			return GetBytes((byte *)&value, 2);
+		}
+
+		unsafe public static byte[] GetBytes(int value)
+		{
+			return GetBytes((byte *)&value, 4);
+		}
+
+		unsafe public static byte[] GetBytes(long value)
+		{
+			return GetBytes((byte *)&value, 8);
+		}
+
+		[CLSCompliant(false)]
+		unsafe public static byte[] GetBytes(ushort value)
+		{
+			return GetBytes((byte *)&value, 2);
+		}
+
+		[CLSCompliant(false)]
+		unsafe public static byte[] GetBytes(uint value)
+		{
+			return GetBytes((byte *)&value, 4);
+		}
+
+		[CLSCompliant(false)]
+		unsafe public static byte[] GetBytes(ulong value)
+		{
+			return GetBytes((byte *)&value, 8);
+		}
+
+		unsafe public static byte[] GetBytes(float value)
+		{
+			return GetBytes((byte *)&value, 4);
+		}
+
+		unsafe public static byte[] GetBytes(double value)
+		{
+			return GetBytes((byte *)&value, 8);
+		}
+
+		unsafe static void PutBytes(byte *dst, byte[] src, int start_index, int count)
+		{
+			if (src == null) {
+				throw new ArgumentNullException();
+			}
+
+			if (src.Length < start_index + count) {
+				// LAMESPEC:
+				// the docs say it should be ArgumentOutOfRangeException, but
+				// the mscorlib throws an ArgumentException.
+				throw new ArgumentException();
+			}
+
+			for (int i = 0; i < count; i++) {
+				dst[i] = src[i + start_index];
+			}
+		}
+
+		unsafe public static bool ToBoolean(byte[] value, int start_index)
+		{
+			bool ret;
+
+			PutBytes((byte *)&ret, value, start_index, 1);
+
+			return ret;
+		}
+
+		unsafe public static char ToChar(byte[] value, int start_index)
+		{
+			char ret;
+
+			PutBytes((byte *)&ret, value, start_index, 2);
+
+			return ret;
+		}
+
+		unsafe public static short ToInt16(byte[] value, int start_index)
+		{
+			short ret;
+
+			PutBytes((byte *)&ret, value, start_index, 2);
+
+			return ret;
+		}
+
+		unsafe public static int ToInt32(byte[] value, int start_index)
+		{
+			int ret;
+
+			PutBytes((byte *)&ret, value, start_index, 4);
+
+			return ret;
+		}
+
+		unsafe public static long ToInt64(byte[] value, int start_index)
+		{
+			long ret;
+
+			PutBytes((byte *)&ret, value, start_index, 8);
+
+			return ret;
+		}
+
+		[CLSCompliant(false)]
+		unsafe public static ushort ToUInt16(byte[] value, int start_index)
+		{
+			ushort ret;
+
+			PutBytes((byte *)&ret, value, start_index, 2);
+
+			return ret;
+		}
+
+		[CLSCompliant(false)]
+		unsafe public static uint ToUInt32(byte[] value, int start_index)
+		{
+			uint ret;
+
+			PutBytes((byte *)&ret, value, start_index, 4);
+
+			return ret;
+		}
+
+		[CLSCompliant(false)]
+		unsafe public static ulong ToUInt64(byte[] value, int start_index)
+		{
+			ulong ret;
+
+			PutBytes((byte *)&ret, value, start_index, 8);
+
+			return ret;
+		}
+
+		unsafe public static float ToSingle(byte[] value, int start_index)
+		{
+			float ret;
+
+			PutBytes((byte *)&ret, value, start_index, 4);
+
+			return ret;
+		}
+
+		unsafe public static double ToDouble(byte[] value, int start_index)
+		{
+			double ret;
+
+			PutBytes((byte *)&ret, value, start_index, 8);
+
+			return ret;
+		}
+
+		public static string ToString(byte[] value)
+		{
+			if (value == null) {
+				throw new ArgumentNullException();
+			}
+
+			return ToString(value, 0, value.Length);
+		}
+
+		public static string ToString(byte[] value, int start_index)
+		{
+			if (value == null)
+				throw new ArgumentNullException("value");
+			if (start_index < 0 || start_index > value.Length - 1) 
+				throw new ArgumentOutOfRangeException("start_index");
+
+			return ToString(value, start_index, value.Length - start_index);
+		}
+
+		public static string ToString(byte[] value, int start_index, int length)
+		{
+			if (value == null) {
+				throw new ArgumentNullException();
+			}
+
+			// The 4th and last clause (start_index >= value.Length)
+			// was added as a small fix to a very obscure bug.
+			// It makes a small difference when start_index is
+			// outside the range and length==0. 
+			if (start_index < 0 || length < 0 || start_index + length > value.Length || start_index >= value.Length) {
+				throw new ArgumentOutOfRangeException();
+			}
+			string ret = "";
+			int end = start_index + length;
+
+			for (int i = start_index; i < end; i++) {
+				if (i > start_index)
+					ret = ret + '-';
+				
+				char high = (char)((value[i] >> 4) & 0x0f);
+				char low = (char)(value[i] & 0x0f);
+
+				if (high < 10) 
+					high += '0';
+				else {
+					high -= (char) 10;
+					high += 'A';
+				}
+
+				if (low < 10)
+					low += '0';
+				else {
+					low -= (char) 10;
+					low += 'A';
+				}
+
+				ret = ret + high + low;
+			}
+
+			return ret;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/Boolean.cs b/mcs/class/corlib/System/Boolean.cs
new file mode 100644
index 00000000000..741471bcdb1
--- /dev/null
+++ b/mcs/class/corlib/System/Boolean.cs
@@ -0,0 +1,266 @@
+//
+// System.Boolean.cs
+//
+// Author:
+//   Derek Holden (dholden@draper.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+//
+// I guess this is the Boolean class. This was written word for word
+// off the Library specification for System.Boolean in the ECMA
+// TC39 TG2 and TG3 working documents.
+//
+// The XML style documentation isn't that elegant, but it seems to 
+// be the standard way according to the poorly documented C# 
+// Programmer's Reference section on XML Documentation.
+//
+// This header and the one above it can be formatted however, just trying
+// to keep it consistent w/ the existing mcs headers.
+//
+// Even though it's not in the ECMA docs, the .NET Framework Class Library
+// says this implements IConvertible, but if it does it has some other
+// member functions to implement. 
+//
+
+using System.Globalization;
+namespace System {
+
+	/// <summary>
+	/// Represents the boolean values of logical true and false.
+	/// </summary>
+	[Serializable]
+	public struct Boolean : IComparable, IConvertible {
+		
+		/// <value>
+		/// The String representation of Boolean False
+		/// </value>	
+		public static readonly string FalseString;
+
+		/// <value>
+		/// The String representation of Boolean True
+		/// </value>	
+		public static readonly string TrueString;
+      
+		/// <value>
+		/// Internal bool value for for this instance
+		/// </value>
+		//
+		// HACK: we tag it as public, so the source will compile.		
+		public bool value;
+	
+		static Boolean () 
+		{
+			FalseString = "False";
+			TrueString = "True";
+		}
+
+		/// <summary>
+		/// Compares the current Boolean instance against another object.
+		/// </summary>
+		/// <remarks>
+		/// Throws an ArgumentException if <c>obj</c> isn't null or 
+		/// a Boolean.
+		/// </remarks>
+		/// <param name="obj">
+		/// The object to compare against
+		/// </param>
+		/// <returns>
+		/// An int reflecting the sort order of this instance as 
+		/// compared to <c>obj</c>
+		/// -1 if this instance is false and <c>obj</c> is true
+		///  0 if this instance is equal to <c>obj</c>
+		///  1 if this instance is true and <c>obj</c> is false, 
+		///    or <c>obj</c> is null
+		/// </returns>
+		public int CompareTo (object obj) 
+		{
+			if (obj == null)
+				return 1;
+			
+			if (!(obj is System.Boolean))
+				throw new ArgumentException
+				(Locale.GetText ("Object is not a Boolean and is not a null reference"));
+			
+			// for case #3
+			if (obj == null || (value == true && (bool)obj == false))
+				return 1;
+	    
+			// for case #2, else it's #1
+			return (value == (bool)obj) ? 0 : -1;
+		}
+	
+		/// <summary>
+		/// Determines whether this instance and another object represent the
+		/// same type and value.
+		/// </summary>
+		/// <param name="obj">
+		/// The object to check against
+		/// </param>
+		/// <returns>
+		/// true if this instnace and <c>obj</c> are same value, 
+		/// otherwise false if it is not or null
+		/// </returns>
+		public override bool Equals (Object obj) 
+		{
+			if (obj == null || !(obj is System.Boolean))
+				return false;
+
+			return ((bool)obj) == value;
+		}
+	
+		/// <summary>
+		/// Generates a hashcode for this object.
+		/// </summary>
+		/// <returns>
+		/// An Int32 value holding the hash code
+		/// </returns>
+		public override int GetHashCode () 
+		{
+			// Guess there's not too many ways to hash a Boolean
+			return value ? 1 : 0;
+		}
+
+		/// <summary>
+		/// Returns a given string as a boolean value. The string must be 
+		/// equivalent to either TrueString or FalseString, with leading and/or
+		/// trailing spaces, and is parsed case-insensitively.
+		/// </summary>
+		/// <remarks>
+		/// Throws an ArgumentNullException if <c>val</c> is null, or a 
+		/// FormatException if <c>val</c> doesn't match <c>TrueString</c> 
+		/// or <c>FalseString</c>
+		/// </remarks>
+		/// <param name="val">
+		/// The string value to parse
+		/// </param>
+		/// <returns>
+		/// true if <c>val</c> is equivalent to TrueString, 
+		/// otherwise false
+		/// </returns>
+		public static bool Parse (string val) 
+		{
+			if (val == null)
+				throw new ArgumentNullException (
+					Locale.GetText ("Value is a null reference"));
+	    
+			val = val.Trim ();
+	    
+			if (String.Compare (val, TrueString, true) == 0)
+				return true;
+	    
+			if (String.Compare (val, FalseString, true) == 0)
+				return false;
+	    
+			throw new FormatException (Locale.GetText (
+				"Value is not equivalent to either TrueString or FalseString"));
+		}
+
+		/// <summary>
+		/// Returns a string representation of this Boolean object.
+		/// </summary>
+		/// <returns>
+		/// <c>FalseString</c> if the instance value is false, otherwise 
+		/// <c>TrueString</c>
+		/// </returns>
+		public override string ToString () 
+		{
+			return value ? TrueString : FalseString;
+		}
+		
+		// =========== IConvertible Methods =========== //
+
+		public TypeCode GetTypeCode () 
+		{ 
+			return TypeCode.Boolean;
+		}
+
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			return System.Convert.ToType(value, conversionType, provider);
+		}
+		
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return value;
+		}
+		
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return System.Convert.ToByte(value);
+		}
+		
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			throw new InvalidCastException();
+		}
+		
+		[CLSCompliant(false)]
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			throw new InvalidCastException();
+		}
+		
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal(value);
+		}
+		
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble(value);
+		}
+		
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16(value);
+		}
+		
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32(value);
+		}
+		
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64(value);
+		}
+		
+		[CLSCompliant(false)] 
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte(value);
+		}
+		
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle(value);
+		}
+		
+		public string ToString (IFormatProvider provider)
+		{
+			return ToString();
+		}
+		
+		[CLSCompliant(false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16(value);
+		}
+		
+		[CLSCompliant(false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32(value);
+		}
+		
+		[CLSCompliant(false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64(value);
+		}
+		
+	} // System.Boolean
+
+} // Namespace System
diff --git a/mcs/class/corlib/System/Buffer.cs b/mcs/class/corlib/System/Buffer.cs
new file mode 100755
index 00000000000..ac0209fbd3f
--- /dev/null
+++ b/mcs/class/corlib/System/Buffer.cs
@@ -0,0 +1,70 @@
+//
+// System/Buffer.cs
+//
+// Authors:
+//   Paolo Molaro (lupus@ximian.com)
+//   Dan Lewis (dihlewis@yahoo.co.uk)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+	public sealed class Buffer {
+
+		private Buffer () {}
+
+		public static int ByteLength (Array array) {
+			// note: the other methods in this class also use ByteLength to test for
+			// null and non-primitive arguments as a side-effect.
+
+			if (array == null)
+				throw new ArgumentNullException ();	// default message
+
+			int length = ByteLengthInternal (array);
+			if (length < 0)
+				throw new ArgumentException ("Object must be array of primitives.");
+
+			return length;
+		}
+
+		public static byte GetByte (Array array, int index) {
+			if (index < 0 || index >= ByteLength (array))
+				throw new ArgumentOutOfRangeException ("Index was out of range. Must be non-negative and less than the size of the collection.");
+
+			return GetByteInternal (array, index);
+		}
+
+		public static void SetByte (Array array, int index, byte value) {
+			if (index < 0 || index >= ByteLength (array))
+				throw new ArgumentOutOfRangeException ("Index was out of range. Must be non-negative and less than the size of the collection.");
+
+			SetByteInternal (array, index, value);
+		}
+
+		public static void BlockCopy (Array src, int src_offset, Array dest, int dest_offset, int count) {
+			if (src_offset < 0 || dest_offset < 0 || count < 0)
+				throw new ArgumentOutOfRangeException ("Non-negative number required.");
+
+			if (src_offset + count > ByteLength (src) || dest_offset + count > ByteLength (dest))
+				throw new ArgumentException ("Offset and length were out of bounds for the array or count is greater than the number of elements from index to the end of the source collection.");
+
+			BlockCopyInternal (src, src_offset, dest, dest_offset, count);
+		}
+
+		// private
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private extern static int ByteLengthInternal (Array array);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private extern static byte GetByteInternal (Array array, int index);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private extern static void SetByteInternal (Array array, int index, int value);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		private extern static void BlockCopyInternal (Array src, int src_offset, Array dest, int dest_offset, int count);
+	}
+}
diff --git a/mcs/class/corlib/System/Byte.cs b/mcs/class/corlib/System/Byte.cs
new file mode 100644
index 00000000000..50f77ae0ac7
--- /dev/null
+++ b/mcs/class/corlib/System/Byte.cs
@@ -0,0 +1,251 @@
+//
+// System.Byte.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+
+namespace System {
+	
+	[Serializable]
+	public struct Byte : IComparable, IFormattable, IConvertible {
+		
+		public const byte MinValue = 0;
+		public const byte MaxValue = 255;
+		
+		// VES needs to know about value.  public is workaround
+		// so source will compile
+		public byte value;
+
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+
+			if (!(v is System.Byte))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Byte"));
+
+			byte xv = (byte) v;
+
+			if (value == xv)
+				return 0;
+			if (value > xv)
+				return 1;
+			else
+				return -1;
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.Byte))
+				return false;
+
+			return ((byte) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return value;
+		}
+
+		public static byte Parse (string s)
+		{
+			byte val = 0;
+			int len;
+			int i;
+			bool digits_seen = false;
+			
+			if (s == null)
+				throw new ArgumentNullException (Locale.GetText ("s is null"));
+
+			len = s.Length;
+
+			// look for the first non-whitespace character
+			char c;
+			for (i = 0; i < len; i++){
+				c = s [i];
+				if (!Char.IsWhiteSpace (c))
+					break;
+			}
+			
+			// if it's all whitespace, then throw exception
+			if (i == len)
+				throw new FormatException ();
+
+			// look for the optional '+' sign
+			if (s [i] == '+')
+				i++;
+
+			// we should just have numerals followed by whitespace now
+			for (; i < len; i++){
+				c = s [i];
+
+				if (c >= '0' && c <= '9'){
+					// shift left and accumulate every time we find a numeral
+					byte d = (byte) (c - '0');
+					
+					val = checked ((byte) (val * 10 + d));
+					digits_seen = true;
+				} else {
+					// after the last numeral, only whitespace is allowed
+					if (Char.IsWhiteSpace (c)){
+						for (i++; i < len; i++){
+							if (!Char.IsWhiteSpace (s [i]))
+								throw new FormatException ();
+						}
+						break;
+					} else
+						throw new FormatException ();
+				}
+			}
+
+			// if all we had was a '+' sign, then throw exception
+			if (!digits_seen)
+				throw new FormatException ();
+			
+			return val;
+		}
+
+		public static byte Parse (string s, IFormatProvider fp)
+		{
+			return Parse (s, NumberStyles.Integer, fp);
+		}
+
+		public static byte Parse (string s, NumberStyles style)
+		{
+			return Parse (s, style, null);
+		}
+
+		public static byte Parse (string s, NumberStyles style, IFormatProvider fp)
+		{
+			uint tmpResult = UInt32.Parse (s, style, fp);
+			if (tmpResult > Byte.MaxValue || tmpResult < Byte.MinValue)
+				throw new OverflowException ("Value too large or too small.");
+
+			return (byte) tmpResult;
+		}
+
+		public override string ToString ()
+		{
+			return ToString (null, null);
+		}
+
+		public string ToString (string format)
+		{
+			return ToString (format, null);
+		}
+
+		public string ToString (IFormatProvider provider)
+		{
+			return ToString (null, provider);
+		}
+
+		public string ToString (string format, IFormatProvider fp)
+		{
+			NumberFormatInfo nfi = NumberFormatInfo.GetInstance( fp );
+			
+			if ( format == null )
+				format = "G";
+			
+			return IntegerFormatter.NumberToString(format, nfi, value);
+		}
+
+		// =========== IConvertible Methods =========== //
+		
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.Byte;
+		}
+
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			return System.Convert.ToType(value, conversionType, provider);
+		}
+		
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return System.Convert.ToBoolean(value);
+		}
+		
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return value;
+		}
+		
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			return System.Convert.ToChar(value);
+		}
+		
+		[CLSCompliant(false)]
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			throw new InvalidCastException();
+		}
+		
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal(value);
+		}
+		
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble(value);
+		}
+		
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16(value);
+		}
+		
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32(value);
+		}
+		
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64(value);
+		}
+		
+		[CLSCompliant(false)] 
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte(value);
+		}
+		
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle(value);
+		}
+		
+/*
+		string IConvertible.ToString (IFormatProvider provider)
+		{
+			return ToString("G", provider);
+		}
+*/
+
+		[CLSCompliant(false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16(value);
+		}
+		
+		[CLSCompliant(false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32(value);
+		}
+		
+		[CLSCompliant(false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64(value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/CLSCompliantAttribute.cs b/mcs/class/corlib/System/CLSCompliantAttribute.cs
new file mode 100755
index 00000000000..aae9120a250
--- /dev/null
+++ b/mcs/class/corlib/System/CLSCompliantAttribute.cs
@@ -0,0 +1,35 @@
+//
+// System.CLSCompliantAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	/// <summary>
+	///   Used to indicate if an element of a program is CLS compliant.
+	/// </summary>
+	///
+	/// <remarks>
+	/// </remarks>
+	[AttributeUsage(AttributeTargets.All)]
+	[Serializable]
+	public sealed class CLSCompliantAttribute : Attribute {
+
+		bool is_compliant;
+
+		public CLSCompliantAttribute (bool is_compliant)
+		{
+			this.is_compliant = is_compliant;
+		}
+
+		public bool IsCompliant {
+			get {
+				return is_compliant;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/CannotUnloadAppDomainException.cs b/mcs/class/corlib/System/CannotUnloadAppDomainException.cs
new file mode 100644
index 00000000000..1cd03735a35
--- /dev/null
+++ b/mcs/class/corlib/System/CannotUnloadAppDomainException.cs
@@ -0,0 +1,41 @@
+//	
+// System.CannotUnloadAppDomainException
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class CannotUnloadAppDomainException : SystemException
+	{
+		// Constructors
+		public CannotUnloadAppDomainException ()
+			: base (Locale.GetText ("Attempt to unload application domain failed."))
+			{
+			}
+		
+		public CannotUnloadAppDomainException (string message)
+			: base (message)
+			{
+			}
+		
+		protected CannotUnloadAppDomainException (SerializationInfo info,
+							  StreamingContext context)
+			: base (info, context)
+			{
+			}
+		
+		public CannotUnloadAppDomainException (string message, Exception innerException)
+			:base (message, innerException)
+			{
+			}
+	}
+}
diff --git a/mcs/class/corlib/System/ChangeLog b/mcs/class/corlib/System/ChangeLog
new file mode 100644
index 00000000000..d28479bbea7
--- /dev/null
+++ b/mcs/class/corlib/System/ChangeLog
@@ -0,0 +1,2406 @@
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Double.cs: implemented TryParse.
+
+	* Math.cs: PowImpl is now private.
+
+	* MissingFieldException.cs: implemented Message.
+
+	* RuntimeMethodHandle.cs: stubbed GetFunctionPointer.
+
+	* _AppDomain.cs: Uncommented ToString.
+
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Type.cs:
+	(IsValueTypeImpl): it's virtual, not abstract. Implemented.
+
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ArgumentException.cs: use the field instead of the property for
+	param_name.
+
+	* ArgumentOutOfRangeException.cs: modified Message.
+
+	* DateTime.cs: 
+	(_DoParse): throw out of range exception for year. Removed check
+	for month (it's done in the constructor).
+
+2002-08-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* Environment.cs: Implemented OSVersion property.
+
+2002-08-21  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Exception.cs: set stack_trace to null
+
+Wed Aug 21 13:02:20 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* AppDomain.cs: implemented ToString().
+
+2002-08-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AppDomain.cs: securityInfo can be null in CreateDomain.
+
+2002-08-19  Dick Porter  <dick@ximian.com>
+
+	* MonoType.cs: Add a space before the Assembly name in
+	AssemblyQualifiedName (needed for resource files so the MS runtime
+	can load types)
+
+2002-08-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AppDomain.cs: parameter name when throwing ArgumentNullException.
+
+	* ArgumentException.cs: modified Message to do what MS does.
+
+	* ArgumentNullException.cs: don't use {0} in message.
+
+	* Exception.cs: use Message property in ToString ().
+
+2002-08-14  Cesar Octavio Lopez Nataren <cesar@ciencias.unam.mx>
+
+	* WeakReference.cs: Changed the constructor and GetObjectData
+	method needed for ISerializable implementation in order to be
+	compatible with SOAP generated by MS.
+
+Wed Aug 14 17:34:07 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoType.cs, Type.cs: DeclaringType/ReflectedType fixes.
+
+2002-08-12  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Exception.cs (ToString): changed the ouput format.
+
+2002-08-07  Dietmar Maurer  <dietmar@ximian.com>
+
+	* MonoType.cs: moved get_method icall to this class, we can
+	remove it as soon someone provides a full featured GetMethodImpl.
+
+	* Type.cs: use GetMethodImpl everywhere.
+
+	* Delegate.cs: new CreateDelegate implementations.
+
+2002-08-06  Tim Coleman <tim@timcoleman.com>
+	* MonoType.cs: 
+		Fix bug #28582.  Now checks parameters for properties
+		in GetPropertyImpl.
+
+2002-08-04  Nick Drochak  <ndrochak@gol.com>
+
+	* Buffer.cs: Throw correct exception in GetByte() and SetByte().
+
+2002-08-01  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* String.cs:
+	(FormatSpecifier): allow white space between the comman and the width
+	specifier.
+
+2002-07-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Int32.cs:
+	* Int64.cs:
+	* UInt32.cs:
+	* UInt64.cs: fixed bug #28050. May be a MS bug?
+
+Thu Jul 18 14:47:03 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoType.cs: fix IsArrayImpl.
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* String.cs: make ToLower (culture) and ToUpper (culture) use the
+	default ToLower and ToUpper and don't throw NotImplemented.
+
+Sat Jul 13 15:09:01 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Type.cs: make GettTypeCode an icall. Test implementation of
+	GetMember().
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* AppDomainSetup.cs: implemented LoaderOptimization.
+
+2002-07-10  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Activator.cs: some more intermediate results checking in
+	in CreateInstance and CreateInstanceFrom and use GetConstructor and
+	Invoke only with Type [] until the other overloaded versions work.
+
+2002-07-09  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Activator.cs: reformatted. Implemented CreateInstance* methods
+	that return ObjectHandle.
+
+	* AppDomain.cs: implemented CreateInstance*AndUnwrap methods.
+
+2002-07-03  Nick Drochak  <ndrochak@gol.com>
+
+	* Decimal.cs (Divide): Short cut the case where the dividend is 0 (and
+	the divisor is not) and avoid the icall, which seems to have a bug.
+
+2002-07-03  Nick Drochak  <ndrochak@gol.com>
+
+	* Double.cs (CompareTo): Correctly handle the case where the instance
+	is NaN. Also return 0 if the values are equal.
+
+2002/07/03  Nick Drochak <ndrochak@gol.com>
+
+	* MissingMethodException: Add missing Message property
+	* MissingMemberException: Add missing Message property
+
+2002-06-30  Nick Drochak  <ndrochak@gol.com>
+
+	* Double.cs (CompareTo): Just see which is bigger.  Don't use the
+	subtraction trick, it doesn't work when the values have a diference of
+	less than one.
+
+	* Single.cs (CompareTo): same
+
+2002-06-27  Martin Baulig  <martin@gnome.org>
+
+	* UIntPtr.cs (UIntPtr.Zero): Use an explicit `u' suffix in the
+	constructor argument.  [FIXME: The implicit conversion to an
+	unsigned integer doesn't work with mcs.]
+
+2002-06-26  Martin Baulig  <martin@gnome.org>
+
+	* DecimalFormatter.cs: Removed MSTEST stuff, use `System',
+	not `S = System'.  This file now compiles with mcs.
+
+	* String.cs: Removed the already ifdef-outed __arglist Concat function
+	to make it compile with mcs.
+
+2002-06-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IntegerFormatter.cs:
+	(FormatParse.FormatNumber): fixed custom format for negative numbers.
+
+2002-06-21  Martin Baulig  <martin@gnome.org>
+
+	* Double.cs: Replace the private `enum State' with constants since this
+	will avoid some bigger headaches in mcs.
+
+Thu Jun 20 17:51:44 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* TimeSpan.cs: do not pollute the namespace with the
+	System.Parser name.
+
+2002-06-18  Nick Drochak  <ndrochak@gol.com>
+
+	* ArgumentException.cs: Use the message given in the constructor when
+	accessing the Message property.  Thanks to Dietmar for the help with 
+	"base".
+
+2002-06-17  Dietmar Maurer  <dietmar@ximian.com>
+
+	* MonoType.cs: GetField is now a InternalCall
+
+2002-06-13  Nick Drochak  <ndrochak@gol.com>
+
+	* DateTime.cs: (Parse): Accept dates that have no hour,min,sec. in the
+	sortable format(s), e.g. "2002-02-25"
+
+2002/06/12  Nick Drochak <ndrochak@gol.com>
+
+	* Random.cs (Next): Fix math error.  Return a number within the range.
+
+2002-06-12  Nick Drochak  <ndrochak@gol.com>
+
+	* String.cs (IndexOf): Return -1 if start index is equal to string
+	length.
+
+2002-06-10  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs (ToDouble): Remove rounding in ToDouble (float).
+	(ToType): Added null field in conversionTable to avoid
+	IndexOutOfRangeException. Changed what exceptions we throw to match
+	the spec.
+	
+2002-06-11  Nick Drochak  <ndrochak@gol.com>
+
+	* Int64.cs (Parse): Added unique strings to the messages where we throw
+	a FormatException. Needed these to debug, so just left them in since
+	they might be useful later. Fixed Currency parsing where we weren't
+	looking at CurrencyDecimalSeparator, etc.
+
+2002-06-09  Lawrence Pit  <loz@cable.a2000.nl>

+

+	* DateTime.cs: fixes to pass tests M0 to M6:

+		if yy pattern then year values >= 30 are in 20th century

+		rfc1123 pattern is always in GMT, therefor useutc must be false

+	made GetNow() internal static so it can be called from TimeZone.

+	* TimeZone.cs: removed dependency on year 2002 from initialization of 

+	current timezone.

+

+2002-06-09  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs (ToType): Rearranged what Exceptions we throw to
+	match MS behavior.
+
+2002-06-08  Duncan Mak  <duncan@ximian.com>
+
+	* Decimal.cs: Added support for the IConvertible interface.
+
+2002-06-08  Martin Baulig  <martin@gnome.org>
+
+	* Enum.cs (IsDefined): `value' may be of the enum's type itself, it
+	doesn't necessarily need to be of the enum's underlying type.
+
+2002/06/07  Nick Drochak <ndrochak@gol.com>
+
+	* String.cs: Add [Serializable] to class
+	* SByte.cs (Parse): Add [CLSCompliant(false)] to all the overloads
+
+2002-06-04  Nick Drochak  <ndrochak@gol.com>
+
+	* Double.cs (Parse): Recognize the group separator string, but still we
+	don't check the format for the proper number of digits between
+	separators. Also throw OverflowException when we get Pos or Neg
+	Infinity from runtime.
+
+2002-06-03  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs (ToDouble): Fixed ToDouble (byte value).
+
+Mon Jun 3 12:18:18 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Type.cs: fixed GetTypeCode.
+
+2002-06-02  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs (ToInt16): use Convert.ToInt16 (int) instead of a direct
+	cast from an int so that we throw OverFlowException correctly.
+	
+	(ToInt64): Use a new 64bit version of ConvertToBase.
+	
+	(ConvertToBase): Add checks for overflow (checks Int32.MinValue
+	and Int32.MaxValue).
+
+	(ConvertFromBase64): New 64-bit version of ConvertFromBase.
+
+2002-06-02  Nick Drochak  <ndrochak@gol.com>
+
+	* Convert.cs (ToSByte): Check for special value.
+	* Single.cs (Parse): 
+	* UInt16.cs (Parse):
+	* UInt32.cs (Parse): Throw OverflowException if negative
+
+2002-06-02  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs (DBNull): Point it to DBNull.Value.
+	(IsDBNull): Instead of checking typecodes, just check to see if
+	it's the same as the DBNull field.
+
+2002-06-02  Nick Drochak  <ndrochak@gol.com>
+
+	* Convert.cs (ConvertFromBase): Detect bad digits correctly.
+
+2002-06-02  Duncan Mak  <duncan@ximian.com>
+
+	* Char.cs (Parse): Simplify the Exception handling.
+
+	* Convert.cs (ToDecimal): Remove call to Math.Round () when
+	converting from a float.
+
+2002-05-30  Martin Baulig  <martin@gnome.org>
+
+	* MonoType.cs (GetInterface): Implemented.
+
+Thu May 23 17:17:28 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Activator.cs: implemented CreateInstance ().
+
+2002-05-22  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs (ConvertToBase): Added new 64bit version.
+	(BuildConvertedString64): New 64bit version of
+	BuildConvertedString.
+
+	This fixes bug 25068.
+
+	(ConvertFromBase): Added additional test for checking if the
+	digits are valid. Thanks to Miguel for coming up with this test.
+
+	This fixes bug 25071.
+	
+2002-05-21  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs (ToType): Rearranged to fit the new layout of
+	conversionTable.
+
+	(conversionTable): Rearranged to fit the layout of the
+	System.TypeCode enum.
+
+	This should fix bug 25075.
+	
+2002-05-21  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs (ToString): Fixed the ToString methods. Previously I had
+	mixed up the two code paths, one for converting to a specific base
+	(this case), another from converting from a foreign base to base10
+	(used by ToInt16|32|64 (string, int)). This fixes bug 25068.
+
+	* Convert.cs (ToByte)
+	(ToSByte): Fixed bug 25074. Added more bits to ConvertFromBase so
+	that we won't confuse FormatException with OverflowException.
+
+2002-05-22  Lawrence Pit  <loz@cable.a2000.nl>
+
+	* Environment.cs: CommandLine missed spaces between arguments.
+	Implemented StackTrace. Returning MachineName in UserDomainName

+	instead of null.

+	

+Tue May 21 17:25:49 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoCustomAttrs.cs: handle inherit argument.
+
+2002-05-21  Nick Drochak  <ndrochak@gol.com>
+
+	* Math.cs (Pow): Change icall method name and insert parameter
+	checks in for infinities and NaN.
+
+2002-05-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* Double.cs (Parse): Reimplement by cleaning up the string first,
+	and then passing to strtof in the mono runtime.
+
+	* Single.cs (Parse): Use the Double implementation and cast to
+	float. 
+
+2002-05-21  Nick Drochak  <ndrochak@gol.com>
+
+	* Math.cs 
+		(Ceiling): Check for "special" values
+		(Floor): Check for "special" values
+		(Round): Fix off-by-one error on decimal shifting
+
+2002-05-20  Lawrence Pit  <loz@cable.a2000.nl>

+

+	* DateTime.cs: ToString () using "G" format specifier 

+

+2002-05-19  Martin Baulig  <martin@gnome.org>
+
+	* Convert.cs (FromBase64CharArray): Do correct exception handling.
+
+2002-05-19  Martin Baulig  <martin@gnome.org>
+
+	* Convert.cs (FromBase64CharArray): Convert the char array using
+	System.Text.UTF8Encoding, not UnicodeEncoding (which is UTF-16) to
+	a byte array.
+
+2002-05-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* MonoType.cs: Style changes.
+
+	* Type.cs: Style changes.
+
+2002-05-16  Piers Haken <piersh@friksit.com
+
+	* UInt64.cs: fix declaration of IConvertible.To* overrides.
+
+2002-05-16  Nick Drochak  <ndrochak@gol.com>
+
+	* BitConverter.cs (ToString): Add parameter check for invalid start 
+	index.
+
+	* Console.cs: Use AutoFlush on the StreamWriter for stdin and stdout
+	now that StreamWriter uses buffering
+
+2002-05-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* Double.cs: Oops.  Also handle exponents without finding a dot.
+
+2002-05-14  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* ChangeLog: removed empty entry at the top of the file.
+
+	* Int32.cs: made static functions used by Parse internal.
+
+	* Int64.cs:
+	* UInt32.cs:
+	* UInt64.cs: removed static fucntions used by Parse and use the ones
+	in Int32.cs
+
+2002-05-12  Daniel Morgan <danmorg@sc.rr.com>
+
+	* IServiceProvider.cs: added using System
+
+2002-05-09  Daniel Morgan <danmorg@sc.rr.com>
+
+	* Single.cs: copied ToString() and Parse() methods from 
+	Double to Single and modified a tiny bit for Single.  
+	There is still a FIXME for Double and Single about
+	passing the format and provider info to the icall too.

+
+2002-05-02  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Int32.cs:
+	* Int64.cs:
+	* UInt32.cs:
+	* UInt64.cs (Parse): don't use Char.IsNumber to test for hex digits.
+	Don't use a delegate to test for valid digits.
+
+2002-05-01  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs: 
+	* Math.cs: Added missing CLSCompliant attributes where necessary.
+	
+2002-04-30  Duncan Mak  <duncan@ximian.com>
+
+	* ArgumentException.cs (Message): 
+	* ArgumentOutOfRangeException.cs (Message): Added.
+
+2002-04-30  Nick Drochak  <ndrochak@gol.com>
+
+	* MonoType.cs: Remove unused variable and eliminate a compiler warning.
+
+Mon Apr 29 15:32:02 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Environment.cs: support for Exit(), CommandLine, CommandLineArgs ().
+
+2002-04-28  Duncan Mak  <duncan@ximian.com>
+
+	* DivideByZeroException.cs: Added missing serialization constructor.
+
+	* UnauthorizedAccessException.cs: Added the missing Serializable attribute.
+
+2002-04-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Math.cs: fix Floor () and Round (). Closes #23960.
+
+2002-04-27  Nick Drochak  <ndrochak@gol.com>
+
+	* Array.cs (IList.Contains): Should throw a RankException if this is 
+	called on a Rank > 1 array. Not in the docs, but this is what the 
+	MS.NET does.
+
+2002-04-26  Duncan Mak  <duncan@ximian.com>
+
+	* MissingMemberException.cs: Made the message variable 'protected'
+	instead of 'private', so that we can see it in
+	MissingMethodException and MissingFieldException.
+
+	* MissingFieldException.cs:
+	* MissingMethodException.cs: Added missing (string, string)
+	constructor, and also the Message property.
+
+2002-04-26  Martin Baulig  <martin@gnome.org>
+
+	* Enum.cs: Implemented the IConvertible methods.
+
+2002-04-25  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* SByte.cs: little change in Parse (string) to avoid incorrect
+	OverflowException thrown (reported by nickd).
+
+2002-04-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* ValueType.cs: Add Serializable attribute.
+
+	* String.cs: ifdef-out out the __arglist Concat function until I
+	add support for that to mcs.
+
+2002-04-24	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* AppDomain.cs (GetValue): usage of the correct icall (bug)
+
+Wed Apr 24 21:15:44 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* GC.cs: implement most of the methods as icalls.
+
+2002-04-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* DecimalFormatter.cs (ToString): return correct value when the
+	decimal number is 0.
+
+2002-04-24	Patrik Torstensson <patrik.torstensson@labs2.com>
+	
+	* Type.cs (GetProperty): fixed call syntax (needs an empty array not null)
+	* MonoType.cs (GetPropertyImpl) : basic implementation (ignores types, bindingAttr, modifiers)
+
+2002-04-24  Nick Drochak  <ndrochak@gol.com>
+
+	* Double.cs (Parse): Handle case where there are no digits before the 
+	decimal point, such as ".1".
+
+2002-04-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Int32.cs:
+	* UInt32.cs:
+	* Int64.cs:
+	* UInt64.cs: fixed bug #23738 (hex numbers parsed wrong).
+
+2002-04-23	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* String.cs (Split): fixed invalid split of count 0 and 1.
+	
+2002-04-23	Patrik Torstensson <patrik.torstensson@labs2.com>
+	
+	* String.cs (LastIndexOf): fixed argument checking.
+	* String.cs (Equals): made internal for performace.
+
+2002-04-23  Nick Drochak  <ndrochak@gol.com>
+
+	* String.cs (Join): check argument and throw exception if needed
+
+2002-04-23  Nick Drochak  <ndrochak@gol.com>
+
+	* String.cs (StartsWith): check argument and throw exception if needed
+
+2002-04-22  Nick Drochak  <ndrochak@gol.com>
+
+	* String.cs (IndexOfAny): check arguments and throw exceptions as
+	neccessary.  ALso remove some debug WriteLines.
+
+2002-04-20  Dietmar Maurer  <dietmar@ximian.com>
+
+	* String.cs: use internal constructors
+	buf fix in Concat.
+
+Thu Apr 18 17:16:15 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoType.cs: make GetElementType its own icall.
+
+2002-04-18  Nick Drochak <ndrochak@gol.com>
+
+	* String.cs: Modified file. Re-add methods needed by the unit tests.
+
+Thu Apr 18 12:38:32 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: some code speedups and restored GetTypeCode().
+
+2002-04-17	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* String.cs: New implementation using internal calls.
+	
+2002-04-16  Nick Drochak  <ndrochak@gol.com>
+
+	* DecimalFormatter.cs: Trim off excess null characters from the string
+	that decimal2string gives back.
+
+2002-04-16  Nick Drochak  <ndrochak@gol.com>
+
+	* String.cs (SubString): revert my change.  I can't reproduce the
+	problem anymore.
+
+2002-04-13  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Attribute.cs: added GetHashCode and Equals.
+
+2002-04-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Enum.cs: little improvements to Format ().
+
+Thu Apr 11 12:28:13 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: internalcall GetHashCode().
+	* Array.cS: optimize access to elements.
+
+Wed Apr 10 21:20:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: make IndexOfAny() use an internalcall.
+
+2002-04-10  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Int32.cs:
+	* UInt32.cs:
+	* Int64.cs: 
+	* UInt64.cs: fixed error when testing for validity of flags.
+
+2002-04-11  Nick Drochak  <ndrochak@gol.com>
+
+	* Double.cs: Use an internal call for ToString(). This is just a simple
+	implementation to get away from throwing a NotImplementedException.
+
+2002-04-10  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Int32.cs:
+	* UInt32.cs:
+	* Int64.cs: 
+	* UInt64.cs: changed Type.GetType () by typeof (), as suggested by
+	lupus.
+
+	* Int32.cs:
+	* Int64.cs: throw an OverFlowException when parsing a string 
+	containing a dot followed by any non '0' number.
+
+2002-04-10  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Byte.cs:
+	* UInt16.cs:
+	* UInt32.cs:
+	* UInt64.cs: added complex Parse ().
+
+2002-04-09  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* SByte.cs:
+	* Int16.cs:
+	* Int32.cs:
+	* Int64.cs: added complex Parse ().
+
+2002-04-09  Nick Drochak  <ndrochak@gol.com>
+
+	* Array.cs (BinarySearch): Add checks on paramters before using them
+	and throw exceptions as needed.
+
+	* Enum.cs (Format): Check if [Flags] is applied to enum and convert
+	"G" format to "F" if so.
+
+Tue Apr 9 13:12:09 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoCustomAttrs.cs: return arrays of type Attribute[]
+	instead of object[].
+
+2002/04/09  Nick Drochak <ndrochak@gol.com>
+
+	* String.cs (Substring): Copy only non-null characters to the new
+	string.
+
+2002-04-09  Nick Drochak  <ndrochak@gol.com>
+
+	* IntegerFormatter.cs: Don't use a format character to indicate a
+	custom format was passed in. It was using 'z' to indicate a custom
+	format, but really it should throw a format exception if the user
+	tries to use "z" as the format string. Now it does.
+
+	* Activator.cs: New File.
+
+2002-04-08  Nick Drochak  <ndrochak@gol.com>
+
+	* Enum.cs (ToString): Big ugly fix for the case where [Flags] is
+	applied to an enum. Need to handle the different possible integer
+	types of an enum somehow.  Can anyone say generics?
+
+Mon Apr  8 06:22:42  2002 Piers Haken <piersh@friskit.com>
+
+	* Convert.cs: switched the To*(object) methods to use
+	IConvertible directly instead of calling ChangeType
+
+Sat Apr 6 20:08:41 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ValueType.cs: make Equals() an internalcall.
+
+Fri Apr 5 15:38:54 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Type.cs: also look for nested types in FindMembers.
+	* MonoType.cs: make GetNestedTypes() an internalcall.
+
+2002-04-05  Nick Drochak  <ndrochak@gol.com>
+
+	* Enum.cs (Parse): Handle different underlying types.
+
+2002/04/04 Nick Drochak <ndrochak@gol.com>
+
+	* Enum.cs (IsDefined): Throw exception when type of value to look for
+	is not the correct one.  Attempt to have it work with string values
+	too, but not sure if the unit tests are getting that far yet.
+
+2002-04-04  Nick Drochak  <ndrochak@gol.com>
+
+	* Decimal.cs: Fix a couple of typos.
+
+Wed Apr 3 19:46:00 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Enum.cs: the values array is of the enum and not of the underlying
+	type. Updates and some bug fixes.
+	* MonoType.cs: make the internalcall return FullName instead of the
+	assembly qualified name.
+	* Type.cs: make ToString () simply return FullName.
+
+2002-04-03  Nick Drochak  <ndrochak@gol.com>
+
+	* Type.cs (GetTypeCode): provide some of the implementation for this
+	method.  It's still too simplistic to be considered complete.
+
+2002-04-02  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Object.cs: fixed FieldGetter/FieldSetter signature
+
+2002-04-02  Nick Drochak  <ndrochak@gol.com>
+
+	* Environment.cs: add MonoTODO's on parts that should have it.
+
+2002-04-01  Nick Drochak  <ndrochak@gol.com>
+
+	* Enum.cs: added reality checks (check parameters to most methods that
+	need them).
+
+2002-03-30  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Object.cs: added FieldGetter/FieldSetter
+
+2002-03-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IntegerFormatter.cs: fixed initialization error in static
+	constructor.
+
+2002-03-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Delegate.cs: added new field to store a trampoline function
+
+2002-03-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* IntegerFormatter.cs: added workaround for bug #22668. First patch to
+	make custom format strings work (not fully functional yet).
+
+2002/03/28  Nick Drochak <ndrochak@gol.com>
+
+	* IntegerFormatter.cs: Change class from internal to public.  Add
+	necessary [CLSCompliant(false)] attributes.
+
+2002-03-27  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* _AppDomain.cs, AppDomain.cs: renamed method GetDate to GetData
+	(was a typo)
+
+2002-03-28  Nick Drochak  <ndrochak@gol.com>
+
+	* Type.cs: Added MonoTODO tags on members that have FIXME, etc.
+
+2002-03-27  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* Console.cs: Modified to get std handles from MonoIO.
+	* Environment.cs: removed PAL dependencies.
+
+2002-03-25  Miguel de Icaza  <miguel@ximian.com>
+
+	* String.cs (System): Removed internal enumeration, because
+	bootstrapping the corlib at this point does not support
+	enumerations. 
+
+	* IntPtr.cs: Temporary work-around until I fix the assembly
+	attributes bug.
+
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* Enum.cs (GetValues): According to the docu this is sorted after
+	values, not names.
+
+	* String.cs (System): Removed enumeration, because it is pretty
+	hard to support enumerations in /nostdlib mode for the core types.
+
+Tue Mar 19 18:18:49 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Array.cs: move error handling in the catch block.
+	* MulticastDelegate.cs: remove == and != operators that were
+	removed with the delegate changes (when you add stuff, please do not
+	remove existing functionality!).
+	* Type.cs: if a property is not found in a type, search for it
+	in the parent types, too.
+
+2002-03-18  Dan Lewis <dihlewis@yahoo.co.uk>
+	
+	* Math.cs: changed to use icall instead of PAL.
+
+2002-03-18  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Double.cs: added check for NaN (Bug [22082])
+
+2002-03-19  Nick Drochak  <ndrochak@gol.com>
+
+	* Enum.cs (Equals): check for null and throw if it is.
+	* Enum.cs (Format): check for null parameters and throw if necessary.
+	This method still needs more argument checking.
+
+2002-03-18  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Enum.cs (Equals): check if Enums are of the same type
+
+2002-03-18  Nick Drochak  <ndrochak@gol.com>
+
+	* Double.cs: Explicitly handle comparisons in CompareTo() for
+	Positive/Negative Infinity and NaN. Unit Test now passes on Linux.
+
+	* Enum.cs(CompareTo): Check types of values before trying to compare.
+	Throw exceptions if types are invalid or don't match.
+
+2002-03-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* Array.cs: Add some extra debugging information.
+
+2002-03-15  Nick Drochak  <ndrochak@gol.com>
+
+	* Array.cs: Added IList and IEnumerable. 
+
+2002-03-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* UInt64.cs, UInt32.cs, UInt16.cs: Mark public parse methods as
+	NonCLSCompliant. 
+
+2002-03-14  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Delegate.cs (Equals): also compare method_ptr 
+	(GetHashCode): returm method_ptr as hash
+
+2002-03-13  Duco Fijma  <duco@lorentz.xs4all.n>
+	* TimeSpan.cs: removed the use of Custom Numeric Format Strings,
+	such as 42.ToString("0000000"), as these are (currently) not implemented
+	in System.IntegerFormatter. TimeSpan luckely can do with Standard
+	Numeric Format Strings, such as 42.ToString("D7").
+
+2002-03-12  Duncan Mak  <duncan@ximian.com>
+
+	* FieldAccessException.cs: 
+	* MethodAccessException.cs: 
+	* PlatformNotSupportedException.cs: Inherit from
+	MemberAccessException, not SystemException.
+
+	* ObsoleteAttribute.cs: Made Message and IsError properties
+	instead of fields.
+
+Tue Mar 12 19:21:18 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* GC.cs: make SuppressFinalize() a nop.
+	* Delegate.cs: fix == operator.
+
+2002-03-13  Nick Drochak  <ndrochak@gol.com>
+
+	* Enum.cs: Add IConvertible methods. Cyclic dependancy fixed in the
+	runtime that goes with this patch.
+
+2002-03-10  Martin Baulig  <martin@gnome.org>
+
+	* Int32.cs (Parse): Correctly parse negative numbers.
+
+2002-03-08  Martin Baulig  <martin@gnome.org>
+
+	* String.cs (Split): Really fix it this time. Also adding several new
+	testcase to the testsuite.	 
+
+2002-03-08  Martin Baulig  <martin@gnome.org>
+
+	* Array.cs (Copy): Optimized: removed duplicate null check, removed
+	two duplicate GetLowerBound() calls and one duplicate IsValueType.
+
+Fri Mar 8 18:49:19 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Object.cs: commit my hacked GetHashCode(): it's good enough for now.
+	* String.cs: use the dumb code for IndexOf(string): this is worth
+	15-20 % speedup in mcs compile with mint.
+
+Fri Mar 8 12:45:44 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: revert change to Split() that broke the compiler (hi martin!:-).
+
+2002-03-07  Martin Baulig  <martin@gnome.org>
+
+	* String.cs (Join): Throw an ArgumentNullException.
+	(LastIndexOf (string,int,int)): This method does a backwards search,
+	so startIndex points to the end of value, not to its beginning. Don't
+	throw an exception if startIndex equals this.Length. Always return -1
+	if startIndex is smaller than the length of value.
+	(Replace (string,string)): Replace all occurences of oldValue.
+	If newValue is null, all occurences of oldValue are to be removed.
+	(Split (char[],int)): Return an empty array if maxCount is zero, throw
+	an ArgumentOutOfRangeException if it's less than zero. Return maxValue
+	elements, not maxValue+1.
+
+Thu Mar 7 17:16:06 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoType.cs: make GetEvents() an internal call.
+	* MulticastDelegate.cs: copy the passed in array.
+
+2002-03-06  Martin Baulig  <martin@gnome.org>
+
+	* Array.cs (Copy): Use FastCopy when appropriate and do correct
+	exception handling.
+
+2002-03-06  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* CharEnumerator.cs: fixes to CharEnumertor.MoveNext, fixing 
+	some of the failures found be new tests (see ChangeLog in 
+	Test/System). Comments added to this method, based on
+	the representation invariant of this class, that (try to) explain
+	why it now should be correct.
+
+2002-03-06  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Int64.cs (Parse): bug fix for max. negative value. 
+
+2002-03-07  Nick Drochak  <ndrochak@gol.com>
+
+	* RuntimeTypeHandle.cs: Add Serializable attribute as the docs say.
+	I need to understand what the difference between the attribute and
+	the interface is.
+
+2002-03-06  Martin Baulig  <martin@gnome.org>
+
+	* Array.cs (Copy): Always throw an ArrayTypeMismatchException, not
+	an InvalidCastException if the widening conversion failed. See
+	testcases #M94-#M96.
+
+	* Array.cs (CopyTo): Bug fix from Ajay Dwivedi, correctly handle
+	arrays with non-zero lower bounds. Also adding testcases #F10-#F13
+	for this.
+
+	* Array.cs (CopyTo): Reverted my last change, it was incorrect.
+	(Copy): Actually allow copying multi-dimensional arrays.
+
+2002-03-05  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs:
+	(DBNull) Added the missing field.
+	(IsDBNull) Fixed typo.
+	(ToByte (string, int)) Implemented.
+	(ToString (byte, int)) Implemented.
+	(ConvertToBase)
+	(BuildConvertedString) internal functions used for converting values to
+	a specific base.
+
+	* Int16.cs: 
+	* Int32.cs:
+	* Int64.cs:
+	* Single.cs:
+	* UInt16.cs: 
+	* UInt32.cs: Implemented the IConvertible interface.	
+
+	* CharEnumerator.cs: Renamed to variables to be clearer and
+	changed some of the tests to conform to the 1.0 spec.
+
+2002-03-06  Martin Baulig  <martin@gnome.org>
+
+	* Array.cs (Copy): Calculate absolute array position here and use
+	GetValueImpl() and SetValueImpl() with that position. We can now
+	copy multi-dimensional arrays.
+	(CopyTo): Small bug fix.
+
+2002-03-05  Duco Fijma  <duco@lorentz.xs4all.nl>
+
+	* Version.cs: CompareTo changed according the LAMESPEC discovered by 
+	Nick (See VersionTest.cs).
+	* CharEnumerator.cs: fixed two bugs in MoveNext. It had an off-by-one
+	error comparing the current position (idx) against the length of the
+	string iterated and it set idx to an unrecognized special value (-2)
+
+Tue Mar 5 17:34:14 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* SByte.cs, UInt64.cs: implement IConvertible interface. Nobody wants
+	to do this dirty work, but someone has to do it (and I need it to pass
+	the "200 sample tests compiled on linux" mark).
+
+2002-03-06  Nick Drochak  <ndrochak@gol.com>
+
+	* Attribute.cs
+	* DecimalFormatter.cs
+	* Delegate.cs
+	* Double.cs
+	* GC.cs
+	* Int16.cs
+	* Int32.cs
+	* MonoType.cs
+	* RuntimeMethodHandle.cs
+	* RuntimeTypeHandle.cs
+	* String.cs
+	* Type.cs:
+		Add [MonoTODO]'s to places where we currently throw a
+		NotImplementedException.
+
+2002-03-05  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Int16.cs (Parse): do not overflow on max negative value
+
+	* Int32.cs (Parse): do not overflow on max negative value
+
+Mon Mar 4 20:36:05 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Type.cs: fixed IsClass.
+	* MonoType.cs: fixed MemberType, IsPrimitiveImpl, IsPointerImpl,
+	IsByRefImpl. Added GetInterfaces().
+	* IServiceProvider.cs: compilation fix.
+
+Mon Mar 4 18:37:03 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Array.cs: allow copying an empty array to an empty array.
+
+Mon Mar 4 17:59:16 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: fixed LastIndexOf (string) to do a bit of argument
+	checking.
+
+2002-03-04  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* Version.cs: many fixes to failures found by the newly created
+	test cases for this class. Specifically, the CompareTo member
+	returned wrong values due to the use of Int32.MaxValue as a special
+	value indicating an "undefined" version component. Also implemented the
+	missing operators (==, <, >, etc.), one missing constructor and
+	and some exception throwing.
+
+2002-03-04  Nick Drochak  <ndrochak@gol.com>
+
+	* IServiceProvider.cs: Add missing attribute: ComVisible(false)
+	* Attribute.cs: Add missing attributes: Serializable and
+	AttributeUsage(AttributeTargets.All)
+
+Mon Mar 4 11:26:49 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoType.cs: implemented GetConstructors(), GetFields(),
+	GetMethods(), GetProperties().
+	* Object.cs: added debugging icall obj_address().
+	* Type.cs: fixed the binding flags for some Get* methods.
+	Implemented FindMembers() as calls to the specific GetMember
+	methods.
+
+2002-03-01  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* BitConverter.cs: fixed one little bug: ToString(s, n, 0) 
+	should give an exception for n>=s.Length.
+
+2002-03-01  Martin Baulig  <martin@gnome.org>
+
+	* Array.cs: More argument checking and bug fixing.
+
+2002-03-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* BitConverter.cs: Indentation match
+
+	* AppDomain.cs: Added MonoTODOs to this too.
+
+	* Buffer.cs: Added MonoTODOs to this.
+
+2002-03-01  Martin Baulig  <martin@gnome.org>
+
+	* Array.cs: Added argument checking to all methods where it was missing.
+
+2002-03-01  Duco Fijma  <duco@lorentz.xs4all.nl>
+
+	* BitConverter.cs: Fixed bugs in ToString methods
+
+Fri Mar 1 15:20:00 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MulticastDelegate.cs: implement operators so mcs3 can be used on linux.
+
+2002-03-01  Nick Drochak  <ndrochak@gol.com>
+
+	* BitConverter.cs: Throw ArgumentException like mscorlib, instead of
+	ArgumentOutOfRangeException like the docs say.
+
+2002-03-01  Martin Baulig  <martin@gnome.org>
+
+	* Enum.cs (CompareTo): Correctly override this method from IComparable.
+
+	* Console.cs (setIn, setOut, setError): It's called SetIn, SetOut, SetError.
+
+2002-02-28  Martin Baulig  <martin@gnome.org>
+
+	* String.cs: This file now passes the testsuite on Linux :-)
+	
+	* String.cs (Intern, IsInterned): The interncalls are now called _Intern and _IsInterned;
+	make them private and provide C# wrappers which do proper argument checking.
+
+	* String.cs (Format): Correctly handle escaped brackets.
+
+	* String.cs (_CompareChar): New internal function which compares two chars.
+	(_Compare): Provide an internal compare method which can do all sorts of
+	comparision and call it from all the Compare() methods. Also fixed a lot of
+	bugs here, this code now actually passes the testsuite.
+
+2002-02-28  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs: Added the missing methods. The new class status page
+	kicks ass, it even found my typos! Woohoo!
+	(ConvertFromBase): Moved the Exception throwing in here and
+	removed the other occurances so it's all centralized now.
+	(ISDBNull): Implemented.
+	(GetTypeCode): Implemented.
+
+2002-02-27  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* Guid.cs: Guid.ToString("") and Guid.ToString(null) is now understood as Guid.ToString("D") 
+	just as in mscorlib. There is (probably) a documentation bug in the MS FrameWork SDK, which
+        states that a lacking format should be interpreted as "N".  
+	Also added [Serializable] attribute
+	* TimeSpan.cs: some formatting and added the [Serializable] attribute
+
+2002-02-26  Duncan Mak  <duncan@ximian.com>
+
+	* WeakReference.cs: Committed for Ajay Kumar Dwivedi.	
+
+2002-02-26  Martin Baulig  <martin@gnome.org>
+
+	* TimeZone.cs: Use an internal enum rather than magic numbers to access the
+	fields of the interncall GetTimeZoneData.
+
+	* DateTime.cs: Implemented Parse and fixed a few bugs.
+
+	* String.cs (TrimStart): Small fix.
+
+2002-02-26  Martin Baulig  <martin@gnome.org>
+
+	* DateTime.cs: ParseExact is now fully functional.
+
+	* String.cs (TrimEnd): Small fix.
+
+2002-02-26  Duco Fijma <duco@lorentz.xs4all.nl>
+	* TimeSpan.cs: Added method TimeSpan.FromMilliseconds, mysteriously 
+	missing for about six months.
+
+Tue Feb 26 14:21:19 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* UInt64.cs: fixed Parse method () to handle some of the NumberStyle flags.
+
+2002-02-26  Martin Baulig  <martin@gnome.org>
+
+	* DateTime.cs: Miguel already committed this, but there was still a
+	ChangeLog entry for this missing ....
+	We're now reusing functionality from TimeSpan, printing dates is
+	fully implemented, currently working on parsing.
+
+	* TimeZone.cs: Fully implemented this. There's a new InternCall in the
+	runtime for this.
+
+Fri Feb 22 18:47:08 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoType.cs: disable constructor.
+	* Object.cs: make GetType() an internalcall.
+	* Type.cs: added correct bindingflags to GetMethods ().
+	All such calls should be reviewed to use the correct flags.
+
+Thu Feb 21 19:23:46 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Type.cs, MonoType.cs: type_is_subtype_of () changed to include extra
+	argument.
+
+Thu Feb 21 16:56:51 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Type.cs: implemented IsAssignableFrom.
+
+2002-02-21  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Guid.cs: fixed Guid.Guid(string) ctor. Changed format:
+	"{0xdddddddd,0xdddd,0xdddd,{0xdd},{0xdd},{0xdd},{0xdd},{0xdd},{0xdd}}" 
+	to "{0xdddddddd,0xdddd,0xdddd,{0xdd,0xdd,0xdd,0xdd,0xdd,0xdd}}" 
+	The former is documented by Microsoft. The latter is how they
+	actually implemented it in mscorlib:-)
+
+Tue Feb 19 20:34:35 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoCustomAttrs.cs: hooks to get the custom attributes from the
+	runtime.
+	* MonoType.cs: Implemented custom attributes methods.
+
+
+2002-02-21  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Guid.cs: 
+
+Tue Feb 19 20:34:35 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoCustomAttrs.cs: hooks to get the custom attributes from the
+	runtime.
+	* MonoType.cs: Implemented custom attributes methods.
+
+2002-02-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Array.cs (CopyTo): use GetLength() instead of GetUpperBound() 
+
+2002-02-19  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs: Finished up the missing methods in Convert. Added a
+	new private method ConvertFromBase.
+
+2002-02-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* String.cs: impl. IConvertible interface
+
+2002-02-18  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Guid.cs: actual implementation for Guid.Guid(string) Ctor
+
+2002-02-18  Duncan Mak  <duncan@ximian.com>
+
+        * Convert.cs: Changed from using Type.GetType (string) to just
+        typeof (). Probably will speed things up a bit?		
+
+2002-02-18  Ajay Kumar Dwivedi <AjayKumar.Dwivedi@dresdner-bank.com>
+
+	* Array.cs:         
+	1. Fix for GetUpperBound to return correct values
+        2. made some Properties virtual
+        3. Adds IsFixedSize and IsReadOnly properties.
+        4. changes CreateInstance(Type,int[],int[]) to throw Exception
+	when third arg is null. InternalCall CreateInstance changed to  
+	CreateInstanceImpl
+        5. Fixed array.GetUpperBound at a couple of places
+        6. IndexOf and LastIndexOf now use Object.Equals instead of "=="
+        7. Added two FIXME's in BinarySearch functions.
+
+2002-02-17  Duncan Mak  <duncan@ximian.com>
+
+        * TimeZone.cs:	Applied the rest of Ajay's patch for	
+        IsDaylightSavingTime. Thanks a lot for the nice explanation of how
+        it works!
+
+2002-02-17  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* Guid.cs: added stub for Guid(string) ctor
+
+2002-02-17  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs: Near-complete implementation of Convert.cs
+
+	Added all the To* methods taking (object) and
+	(object, IFormatProvider) as parameters.
+
+	Added [CLSCompliant (false)] attributes to methods dealing with
+	unsigned types.
+
+	Added the missing section on converting to and from DateTime. Only
+	6 missing methods, all marked with MonoTODOs. Will tackle them later.		
+
+2002-02-16  Duncan Mak  <duncan@ximian.com>
+
+	* TimeZone.cs: patch from Ajay Kumar Dwivedi (adwiv@yahoo.com) to
+	make IsDaylightSavingTime (DateTime) call 
+	IsDaylightSavingTime (DateTime, DaylightTime).	
+	
+	Added internal class CurrentTimeZone from Ajay. It needs more work
+	to fill in the appropriate internal calls.
+	
+Sat Feb 16 12:41:41 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Type.cs: fix IsClass.
+
+Sat Feb 16 12:02:02 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: fix Trim().
+
+Fri Feb 15 21:02:46 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: fix more off by one errors.
+
+Thu Feb 14 18:54:09 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoType.cs: fix IsValueTypeImpl.
+	* Type.cs: fix IsEnum. Implement Equals methods.
+
+Wed Feb 13 21:50:13 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Int32.cs: implement IConvertible interface.
+	
+2002-02-12  Duncan Mak  <duncan@ximian.com>
+
+	* TimeZone.cs: Implemented and added to CVS.
+
+2002-02-11  Duncan Mak  <duncan@ximian.com>
+
+	* Convert.cs: Implemented the ChangeType () methods.
+
+Mon Feb 11 19:48:58 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Array.cs: make Clone() an internal call.
+
+2002-02-09  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Changed Guid.NewGuid so that it can use both System.Random and 
+          System.Security.Cryptography.RandomNumberGenerator
+
+2002-02-09  Duco Fijma <duco@lorentz.xs4all.nl>
+	* First version of Guid.NewGuid
+
+2002-02-08  Duncan Mak  <duncan@ximian.com>
+
+	* RuntimeArgumentHandle.cs: Added to CVS.
+
+Fri Feb 8 19:14:54 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* CrossAppDomainDelegate.cs, AssemblyLoadEventHandler.cs,
+	UnhandledExceptionEventHandler.cs: added delegates.
+
+Fri Feb 8 18:06:20 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MarshalByRefObject.cs: add ToString () method
+	(apparently needed by nunit).
+	* _AppDomain.cs: uncomment ToString(): dietmar fixed the bug triggered
+	by it in the runtime.
+
+2002-02-08  Dan Lewis <dihlewis@yahoo.co.uk>
+	
+	* String.cs (Format): implemented
+
+2002-02-07  Duncan Mak  <duncan@ximian.com>
+	
+	* DuplicateWaitObjectException:
+	* InvalidCastException:
+	* NotImplementedException:
+	* NotSupportedException:
+	* NullReferenceException:
+	* OutOfMemoryException:
+	* OverflowException:
+	* RankException:
+	* StackOverflowException.cs:
+	* UnauthorizedAccessException: Added missing constructor used for serialization.
+
+2002-02-07  Dietmar Maurer  <dietmar@ximian.com>
+
+	* String.cs (System.Compare): bug fix 
+
+2002-02-06  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Enum.cs (Parse,  GetHashCode): impl. 
+
+2002-02-05  Duncan Mak  <duncan@ximian.com>
+
+	* DBNull.cs: This is my first crack at the DBNull class. I think I
+	actually got most of the IConvertible methods right, but I haven't
+	done the research to test whether or not this is the correct
+	behavior. IConvertible.ToType () is the most iffy of all, IMHO.
+
+	* DllNotFoundException.cs: Inherits from TypeLoadException, not SystemException.
+
+2002-02-05  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Enum.cs: added more functionality (GetName, ToObject, Equals)
+
+2002-01-31  Duncan Mak  <duncan@ximian.com>
+
+	* InvalidOperationException.cs:
+	* NotFiniteNumberException.cs:
+	* ObjectDisposedException.cs:
+	* TypeInitializationException.cs: Added missing bits for serialization/
+	
+	* AppDomainUnloadedException.cs:
+	* ApplicationException.cs:
+	* ArgumentOutOfRangeException.cs:
+	* ArithmeticException.cs:
+	* ArrayTypeMismatchException:
+	* BadImageFormatException.cs:
+	* Exception.cs:
+	* MissingMemberException.cs:
+	* TypeLoadException.cs: Added missing bits for serialization.
+
+2002-01-30  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Guid.cs: implemented everything but Guid.NewGuid
+
+Tue Jan 29 22:32:36 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* _AppDomain.cs: remove ToString() method: it doesn't seem right 
+	to have it in this interface and it screws up the method vtable setup.
+
+2002-01-28  Andrei Zmievski <andrei@php.net>
+
+	* Double.cs: implemented IConvertible interface.
+
+2002-01-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* ArgumentException.cs: Implement serialization constructor.
+	(GetObjectData): Implement serializer.
+	
+	* ArgumentNullException.cs: Implement serialization constructor.
+
+	* Exception.cs: Implement serialization constructor.
+	(GetObjectData): Implement serializer.
+
+2002-01-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* DateTime.cs (UnixEpoch): The Begining of the Unix epoch.
+
+2002-01-23  Duncan Mak  <duncan@ximian.com>
+
+	* EntryPointNotFoundException.cs:
+	* FormatException: Added missing constructor and related bits.
+
+	* TypeLoadException: Added missing constructor, methods and properties.
+
+2002-01-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* AppDomain.cs (GetAssemblies): Use foreach construct instead of
+	manually getting the enumerator.
+
+	(AppDomain.AppDomain): Prime the loaded assemblies with the
+	assemblies loaded by the runtime in our behalf.
+
+	* AppDomainSetup.cs: Remove private keyword, that is the default.
+	Add a new property DisallowPublisherPolicy.
+
+	* AppDomain.cs (AppDomain.GetAssemblies): Implement.
+
+Tue Jan 22 22:51:48 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoType.cs, Type.cs: many updates, corrected implementation,
+	completed stubs.
+
+2002-01-20  Andrei Zmievski <andrei@php.net>
+
+	* Byte.cs:
+	* Char.cs: implemented IConvertible interface.
+
+	* Boolean.cs: use our own ToString() method directly.
+
+2002-01-20  Duncan Mak  <duncan@ximian.com>
+
+	* Files I commited recently: Fixed indentation style.
+
+2002-01-20 Nick Drochak  <ndrochak@gol.com>
+
+	* SerializableAttribute.cs: this attrib can be used on enums, structs, 
+	and delegates too. Added the appropriate usage flags.
+
+2002-01-18  Duncan Mak  <duncan@ximian.com>
+
+	* CharEnumerator.cs: Implemented.
+	* String.cs (System): Fixed the GetEnumerator () method(s).
+
+	* ObsoleteAttribute.cs:
+	* STAThreadAttribute.cs:
+	* MTAThreadAttribute.cs:
+	* ThreadStaticAttribute.cs:
+	* LoaderOptimizationAttribute.cs:
+	* PlatformNotSupportedException.cs:
+	* LoaderOptimization.cs: Added to CVS.
+
+2002-01-18  Duncan Mak  <duncan@ximian.com>
+
+	* AppDomainUnloadedException.cs:
+	* MethodAccessException.cs:
+	* ContextMarshalException.cs:
+	* CannotUnloadAppDomainException.cs:
+	* DllNotFoundException.cs:
+	* EntryPointNotFoundException.cs:
+	* FieldAccessException.cs:
+	* TypeUnloadedException.cs:
+	* MissingFieldException.cs: Added to CVS.
+
+	* ApplicationException.cs: 
+	* MemberAccessException.cs:
+	* MissingMemberException.cs
+	* MissingMethodException.cs:
+	* SystemException.cs: Added [Serializable] attribute.
+
+	* Exception.cs: Added [Serializable] attribute, made properties
+	'Message', 'Source' and 'StackTrace' virtual methods, per 1.0
+	spec.
+
+	* ContextStaticAttribute.cs: Added [Serializable] attribute and
+	put in the missing constructor.
+
+	* Environment.cs: Commented out references to
+	EnvironmentPermissionAttribute, because they're just stubbed out
+	right now and has no implementation.
+
+2002-01-16  Andrei Zmievski <andrei@php.net>
+
+	* Boolean.cs: implemented IConvertible interface
+
+2002-01-15  Nick Drochak  <ndrochak@gol.com>
+
+	* ResolveEventArgs.cs: class should derive from EventArgs.
+
+2002-01-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* String.cs (System): Use DefaultMemberName for the String class.
+
+Mon Jan 14 17:06:40 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: use IndexerName in index char accessor.
+
+Thu Jan 10 21:05:23 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MonoType.cs: add rank to MonoTypeInfo and implement GetArrayRank.
+	* String.c: eliminate 64k+ method calls in search.
+	* Type.cs: handle byref and array types in ToString ().
+
+2002-01-09  Duco Fijma <duco@lorentz.xs4all.nl>
+
+	* Guid.cs: created first version
+
+2002-01-10  Dietmar Maurer  <dietmar@ximian.com>
+
+	* MonoType.cs: added missing TypeAttributes to MonoTypeInfo 
+
+Wed Jan 9 19:35:07 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* MulticastDelegate.cs: add == and != operator stubs.
+	* String.cs: check for null in == operator.
+	* Type.cs: use a virtual method to get TypeAttributes.
+
+Tue Jan  8 23:30:19 EST 2002 Matt Kimball <matt@kimball.net>
+	* String.cs: Fixed several off-by-one errors in LastIndexOf* methods
+
+2002-01-09  Nick Drochak  <ndrochak@gol.com>
+	
+	* Environment.cs: Comment out Security attribute and put a MonoTODO
+	there as a reminder.  We need mcs magic to handle security attributes in
+	corlib.
+
+2002-01-07  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Created IAppDomainSetup.cs
+
+2002-01-06  Duco Fijma <duco@lorentz.xs4all.nl>
+	* Created System._AppDomain interface in _AppDomain.cs
+
+2002-01-06  Nick Drochak  <ndrochak@gol.com>
+
+	* ResolveEventArgs.cs: New File, completely implemented! ;)
+
+Sat Jan 5 15:53:50 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Enum.cs: dummy ToString impl.
+	* String.cs: dummy format implementations to get compiler errors
+	somewhat working.
+	* Type.cs: implemented filter delegates. FindMembers runs the filter, now.
+
+2002-01-05  Ravi Pratap  <ravi@ximian.com>
+
+	* TODOAttribute.cs : Augment some more; provide two constructors
+	with support for a comment too.
+
+2002-01-05  Nick Drochak  <ndrochak@gol.com>
+
+	* Uncommented those MonoTODO's now that Ravi's got
+	the class in there
+
+2001-01-04  Ravi Pratap  <ravi@ximian.com>
+
+	* TODOAttribute.cs : Actually add this time ;-)
+
+	Change name to MonoTODO.
+
+2002-01-04  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* String.cs (Trim): Fixed a few logic bugs in the code that
+	calculated how much to trim off the end of the string.
+
+2001-01-04  Nick Drochak  <ndrochak@gol.com>
+	
+	* Commented out the [TODO] attributes for now.  We don't have the
+	class written.  Also changed it to [MonoTODO]
+
+2002-01-04  Ravi Pratap  <ravi@ximian.com>
+
+	* TODOAttribute.cs : Add. We use this attribute to tag all bits in
+	our class libraries that are incomplete.
+
+	* Array.cs : Apply attribute wherever we find a FIXME which says
+	we need something to be implemented there.
+
+	* Int32.cs : Ditto.
+
+	* MulticastDelegate.cs : Ditto.
+
+	* RuntimeFieldHandler.cs, RuntimeMethodHandle.cs,
+	RuntimeTypeHandle.cs : Ditto.
+
+	* String.cs : Ditto.
+
+	* Type.cs : Ditto.
+
+	* Byte.cs, Char.cs, ContextBoundObject.cs, DateTime.cs, Delegate.cs : Ditto.
+
+	* Enum.cs, Environment.cs, Exception.cs, Int64.cs, SByte.cs, Single.cs, 
+	UInt16.cs, UInt32.cs, ValueType.cs: Ditto.
+
+	* Byte.cs, Char.cs, ContextBoundObject.cs, DateTime.cs,
+	Delegate.cs : Ditto.
+
+	* Enum.cs, Environment.cs, Exception.cs, Int64.cs, SByte.cs,
+	Single.cs, UInt16.cs, UInt32.cs, ValueType.cs: Ditto.
+	
+Thu Jan 3 23:24:04 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Delegate.cs: add Remove() stub.
+	* Enum.cs: add ToObject().
+	* Type.cs: add IsEnum property.
+
+2002-01-03  Kristian Rietveld  <kris@gtk.org>
+
+        * Convert.cs: add non-CLS-compliant ToBoolean methods for char,
+        DateTime and object.
+
+2001-12-30  Nick Drochak  <ndrochak@gol.com>
+
+	* Byte.cs (Parse): Add comments to aid in testing.
+
+2001-12-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* Char.cs (Parse): Implement.
+
+	* Byte.cs (Parse): Implement a fast parser.
+	
+	* SByte.cs (Parse): Implement a fast parser.
+
+	* UInt16.cs (Parse): Implement a fast parser.
+	
+	* Int16.cs (Parse): Implement a fast parser.
+
+	* UInt32.cs (Parse): Implement a fast parser.
+
+	* Int32.cs (Parse): Implement a fast parser.
+
+Fri Dec 21 15:14:52 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Array.cs: fix null ref in sort code.
+	* UInt64.cs: add bare-bones parse.
+
+Thu Dec 20 15:29:52 CET 2001 Paolo Molaro <lupus@ximian.com>
+	
+	* Byte.cs: removed use of Regexes.
+
+Tue Dec 18 18:39:54 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Enum.cs: implemented GetValues(), GetNames(), GetName(),
+	IsDefined(), GetUnderlyingType().
+	* String.cs: fix one instance of Compare().
+	* Type.cs: implemented GetProperties(), GetProperty().
+
+Thu Dec 13 20:10:57 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Array.cs: implement CopyTo ().
+	* Char.cs: implement ToString ().
+	* Exception.cs: bugfix.
+	* Int32.cs: bare-bones Parse ().
+	* MonoType.cs: query the needed info with an internalcall.
+	* String.cs: speedups, bugfixes, reduced copies.
+	* Type.cs: added missing fields. Implemented many of the Is*
+	properties. Implemented GetMethod(), GetConstructor(), GetMethods(),
+	GetFields(), FindMembers(), ToString().
+	
+2001-12-11  Dick Porter  <dick@ximian.com>
+
+	* DateTime.cs: Implemented FromFileTime() and ToFileTime()
+
+	* Console.cs: Use handles rather than casting file descriptors
+
+2001-12-08  Nick Drochak  <ndrochak@gol.com>
+
+	* Byte.cs (Parse): Start implementation. Parse(string) works, but
+	now we need to handle other formats
+
+2001-12-06  Dietmar Maurer  <dietmar@ximian.com>
+
+	* DateTime.cs: added an icall to GetNow()
+
+2001-12-04  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Double.cs: added the parse method from Bob Smith
+
+2001-11-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* UInt64.cs: ditto.
+
+	* UInt32.cs: ditto.
+
+	* Int32.cs (Int32.CompareTo): Fix because we can not just
+	substract the values.
+
+	Return possitive value if the object is null.
+
+	* Boolean.cs: (Boolean.CompareTo): ditto.
+
+	* Int16.cs (Int16.CompareTo): ditto.
+
+	* Byte.cs (Byte.CompareTo): ditto.
+
+	* SByte.cs (SByte.CompareTo): ditto.
+
+	* Char.cs (Char.CompareTo): ditto.
+	
+	* Decimal.cs (Decimal.CompareTo): ditto.
+
+	* Int64.cs (Int64.CompareTo): ditto.
+
+	* Single.cs: Ditto.
+
+	* UInt16.cs: Ditto.
+
+2001-11-28  Nick Drochak <ndrochak@gol.com>
+
+	* Byte.cs: Throw NotImplementedException for Parse.
+
+2001-11-27  Derek Holden  <dholden@draper.com>
+
+	* IntegerFormatter.cs: Formatting of type "Number" was not
+	using NumberFormatInfo.NumberNegativePattern.
+
+2001-11-26  Dick Porter  <dick@ximian.com>
+
+	* LocalDataStoreSlot.cs: No need to delete a system TLS slot in
+	the finalise routine any more
+
+2001-11-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* ApplicationException.cs: internationalize by adding calls to
+	Locale.GetText ().  And throw NotImplementedExceptions on calls
+	that we have to implement.
+
+	* Version.cs: Ditto.
+
+	* ValueType.cs: ditto.
+
+	* UnauthorizedAccessException.cs: ditto.
+
+	* UInt32.cs: ditto.
+
+	* UInt64.cs: ditto.
+
+	* UInt16.cs: ditto.
+
+	* TypeLoadException.cs: ditto
+
+	* TypeInitializationException.cs: ditto.
+
+	* Type.cs: ditto.
+
+	* TimeSpan.cs: ditto.
+
+	* SystemException.cs: ditto.
+
+	* String.cs: ditto.
+
+	* StackOverflowException.cs: ditto.x
+
+	* Single.cs: ditto.
+
+	* SByte.cs: ditto.
+
+	* RuntimeTypeHandle.cs: ditto.
+
+	* RuntimeMethodHandle.cs: ditto.
+
+	* RuntimeFieldHandle.cs: ditto.
+
+	* Random.cs: ditto.
+
+	* OutOfMemoryException.cs: ditto.
+
+	* OperatingSystem.cs: ditto.
+
+	* ObjectDisposedException.cs: ditto.
+
+	* NullReferenceException.cs: ditto.
+
+	* NotImplementedException.cs: ditto.
+
+	* NotFiniteNumberException.cs: ditto.o
+
+	* MulticastNotSupportedException.cs: ditto.
+
+	* MissingMethodException.cs: ditto.
+
+	* MemberAccessException.cs: ditto.
+
+	* Math.cs: ditto.
+
+	* InvalidCastException.cs: ditto.
+
+	* IntegerFormatter.cs: ditto.
+
+	* Int32.cs: ditto.
+
+	* Int16.cs: ditto.
+
+	* IndexOutOfRangeException.cs: ditto.
+
+	* Environment.cs: ditto
+
+	* Enum.cs: ditto.
+
+	* DuplicateWaitObjectException.cs: ditto.
+
+	* DivideByZeroException.cs: ditto.
+
+	* Delegate.cs: ditto
+
+	* DecimalFormatter.cs: ditto.
+
+	* Decimal.cs: ditto.
+
+	* DateTime.cs: ditto.
+
+	* Convert.cs: ditto.
+
+	* Char.cs: ditto.
+
+	* Byte.cs: ditto.
+
+	* Boolean.cs: ditto.
+
+	* ArrayTypeMismatchException.cs: ditto.
+
+	* ArithmeticException.cs: ditto.
+
+	* ArgumentOutOfRangeException.cs: ditto.
+
+	* ArgumentNullException.cs: ditto.
+
+	* Enum.cs: Make it derive from ValueType, add CompareTo method.
+
+	* Attribute.cs: Reformat.
+
+2001-11-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* Decimal.cs, Double.cs, Byte.cs, Char.cs, Int16, UInt16, Int32,
+	UInt32, Int64, UInt64, SByte, Single (CompareTo): Throw the
+	exception if the value is null too.
+
+	* Char.cs (CompareTo): ditto.
+
+	* ApplicationException.cs: Added constructor that does serialization.
+
+	* ParamArrayAttribute.cs: Define attribute correctly.
+
+Wed Nov 14 16:31:19 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* AppDomain.cs: rename dummy interface _AppDomain to AppDomain_Intf.
+	* Array.cs: fix Array.Copy.
+	* AssemblyLoadEventArgs.cs: rename field.
+	* CLSCompliantAttribute.cs: use correct name for the class.
+	* Char.cs: fix IsLetter.
+	* Console.cs, DateTime.cs, Decimal.cs, IConvertible.cs, Math.cs,
+	SByte.cs, UInt16.cs, UInt32.cs, UInt64.cs, UIntPtr.cs: CLSCompliant updates.
+	* Convert.cs: CLSCompliant updates, add ChangeType() methods.
+	* Delegate.cs: renamed target field to m_target.
+	* Enum.cs: added missing methods.
+	* MonoType.cs: add a constructor and some needed properties.
+	* Object.cs: implement GetType().
+	* String.cs: CLSCompliant updates. Fixes everywhere to remove the
+	ending 0 char.
+	* Type.cs: add missing methods/properties.
+
+2001-11-10  Sean MacIsaac  <macisaac@ximian.com>
+
+	* AttributeUseage.cs: Should define AttributeUsageAttribute.
+
+	* CLSCompliant.cs: Marked with AttributeUsage attribute.
+
+	* Decimal.cs: Fixed CLSCompliant attributes.
+
+	* Type.cs: changed _impl to internal (needs to be accessable by
+	subclasses).
+
+	(TypeHandle): Marked as abstract, implementation removed.
+
+	(IsNotPublic, IsPublic, GetMethods, GetPropery, GetConstructor,
+	GetMethod): Added stub implementations so NUnit would link against
+	corlib
+
+Tue Nov 6 09:11:43 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* AppDomain.cs: use an internal constructor for AssemblyBuilder.
+
+2001-11-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* NonSerializedAttribute.cs: Add AttributeUsage rules for this
+	attribute. 
+
+Fri Nov 2 18:23:15 CET 2001 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: fix a couple of bugs.
+	* AppDomain.cs: use new AppBuilder constructor.
+	* Buffer.cs, GC.cs, NonSerializedAttribute.cs,
+	NotImplementedException.cs, ObjectDisposedException.cs,
+	UnauthorizedAccessException.cs: add implementation.
+	* OverflowException.cs: fix class name.
+
+2001-10-28  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* String.cs: Don't use a terminating nil char for our internal
+	array.
+
+2001-10-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* Delegate.cs (Delegate.CombineImpl): Implement.
+	(Delegate.Combine): Implement.
+
+	* MulticastDelegate.cs (MulticastDelegate.Equals): Implement.
+
+	(MulticastDelegate.CombineImpl): This was not as trivial as I
+	thought. 
+
+	* ContextStaticAttribute.cs: Added AttributeUsage to
+	ContextStaticAttribute. 
+
+	* FlagsAttribute.cs: Add AttributeUsage to FlagsAttribute
+
+2001-10-15  Martin Weindel <martin.weindel@t-online.de>
+
+        * added Decimal.cs * added DecimalFormatter.cs (internal class
+	used from System.Decimal)
+
+2001-10-11  Thomas Neidhart <tome@sbox.tugraz.at>
+
+	* Convert.cs: Added methods for Base64 transforming just used the
+	  existing System.Security.Cryptography.ToBase64Transform, should
+	  be changed to use a stand-alone class, e.g. Base64Encoder
+	  
+2001-10-10  Derek Holden  <dholden@draper.com>
+
+	* IntegerFormatter.cs: Added. Implements ToString for all the
+	integer data types for all the format types.
+
+	* Byte.cs: Using IntegerFormatter for ToString's.
+
+	* SByte.cs: Using IntegerFormatter for ToString's.
+
+	* Int16.cs: Using IntegerFormatter for ToString's.
+
+	* Int32.cs: Using IntegerFormatter for ToString's.
+
+	* Int64.cs: Using IntegerFormatter for ToString's.
+
+	* UInt16.cs: Using IntegerFormatter for ToString's.
+
+	* UInt32.cs: Using IntegerFormatter for ToString's.
+
+	* UInt64.cs: Using IntegerFormatter for ToString's.
+
+2001-10-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* Exception.cs: Implement bits of serialization.
+
+	* RuntimeFieldHandle.cs: Implement Serialization features.
+
+	* Type.cs: Implement TypeHandle property.
+
+2001-09-28  Dick Porter  <dick@ximian.com>
+
+	* LocalDataStoreSlot.cs: Implemented
+
+Tue Sep 25 19:58:14 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: fix off-by-one error in Trim().
+
+Tue Sep 25 18:52:14 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Type.cs: added GetType () method.
+
+Tue Sep 25 17:29:02 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* MissingMethodException.cs, MissingMemberException.cs,
+	MemberAccessException.cs: added.
+
+Tue Sep 25 16:46:43 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: don't access the string array out of bounds in
+	LastIndexOf.  * Type.cs: fix return type of the Assembly property.
+
+Mon Sep 24 20:35:24 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* String.cs: make Intern and IsIntern internalcalls.
+
+2001-09-13  Dick Porter  <dick@ximian.com>
+
+	* Type.cs: Added a stub for the IsValueType property.
+
+	* SystemException.cs (System): Added the other constructor, so
+	that System.Threading exceptions can inherit it.
+
+2001-09-08  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* String.cs (TrimStart): Don't keep looping through the trimchars
+	once we've found a match.
+	(TrimEnd): Same here.
+	(Trim): And finally here.
+
+2001-09-07  Ravi Pratap  <ravi@ximian.com>
+
+	* Char.cs (IsLetterOrDigit): Implement.
+	(IsLower): Implement, but we need to be Unicode aware.
+	(IsNumber): Implement.
+	(IsPunctuation): Implement.
+	(IsWhiteSpace): Implement.
+	(ToUpper): Fix to subtract 32 from the ASCII value, not 33 :)
+	(ToLower): Same here.
+
+2001-09-04  Miguel de Icaza  <miguel@ximian.com>
+
+	* Object.cs: Shortcut, if (a == b) then return true.
+
+Fri Sep 7 18:34:48 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* Delegate.cs: we need a pointer to the method thunk in
+	the delegate object.
+
+Fri Sep 7 12:28:01 CEST 2001 Paolo Molaro <lupus@ximian.com>
+
+	* AsyncCallback.cs, common.src: add AsyncCallback delegate.
+
+2001-09-06  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* String.cs (System): Don't mix uint and int.
+
+2001-09-04  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* String.cs (BoyerMoore): Modified to not use pointers and to instead
+	use indexes.
+	(IndexOf): Use BoyerMoore.
+
+2001-09-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* All over: Use the autogenerated enumerations from the ECMA
+	documentation that Sergey wrote.
+	
+	* PlatformID.cs: Add Unix definition.
+
+	* OperatingSystem.cs: Use Unix instead of Linux here.
+
+	* MarshalByRefObject.cs: Mark class as [Serializable].
+
+2001-08-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Console.cs: impl. (write only)
+	implemented the stdin stuff
+
+	* Int32.cs: impl. real op_Equal
+
+2001-08-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* (common.src): Removed IAsyncResult as it is not on CVS yet.
+
+	* UIntPtr.cs: Removed CLSCompliant attribute before the namespace,
+	as it breaks the build.
+
+2001-08-23  Michael Lambert <michaellambert@email.com>
+
+	* IntPtr.cs: Optimized unsafe declaration, implemented GetObjectData, 
+	added CLSCompliant attribute
+
+	* IAsyncResult.cs: Added
+
+	* common.src: Added IAsyncResult.cs
+
+2001-08-23  Michael Lambert <michaellambert@email.com>
+
+	* UIntPtr.cs: Added
+
+	* common.src: Added UIntPtr.cs
+
+2001-08-20  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Attribute.cs: uncomment some code to make it compile again
+
+	* mono.src: removed duplicated Attribute.cs
+
+2001-08-16  Nick Drochak <ndrochak@gol.com>
+
+	* Attribute.cs: implemented all methods except GetHashCode()
+
+	* common.src: added Attribute.cs so it would compile in
+
+2001-08-10  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Object.cs: changed MemberWiseClone to MemberwiseClone, and
+	marked it as InternalCall
+	
+	* common.src: removed UriFormatException.cs because the file is
+	not there.
+
+	* RuntimeTypeHandle.cs: replaced IntrPtr with IntPtr
+	* Char.cs: replaced byte with char
+
+	* Array.cs: make it work with the mono interpreter
+
+2001-08-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* Version.cs: Make the class sealed
+
+2001-08-08  Bob Smith  <bob@thestuff.net>
+
+        * Random.cs: Many compile fixes.
+        * Random.cs: I read a bad spec. Class updated to match real spec.
+
+2001-08-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* IntPtr.cs: Added and Completed implementation.
+
+	* Uri.cs: Add a note.
+
+2001-08-06  Bob Smith  <bob@thestuff.net>
+
+        * Random.cs: Compile fix. Needs more testing.
+
+2001-08-06 Garrett Rooney <rooneg@electricjellyfish.net>
+
+	* Uri.cs: Initial Implementation.  Parsing needs to be fixed to take 
+	into account IPv6 addresses, url encoding needs to be implemented, and 
+	various minor methods need to be written, but this is a decent start.
+
+2001-08-06  Dietmar Maurer  <dietmar@ximian.com>
+
+	* common.src: added Object.cs
+
+	* mono.src: added ValueType.cs
+
+2001-08-02  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Math.cs: replaced libc with libm
+
+2001-08-02  Bob Smith  <bob@thestuff.net>
+
+        * Random.cs: Implemented. Needs testing.
+
+2001-08-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* IServiceProvider.cs, EventHandler.cs: New files.
+
+2001-08-02  Marcel Narings  <marcel@narings.nl>
+	
+	* DateTime.cs: Cleaned up a bit. Added the Add* family members.
+	Added exceptions. Added IConvertible. Still needs some platform 
+	dependend stuff, the Parse and ToString members
+
+2001-08-01  Dietmar Maurer  <dietmar@ximian.com>
+
+	* Type.cs (GetTypeFromHandle): added placeholder 
+
+2001-07-24  Derek Holden  <dholden@draper.com>
+
+	* Boolean.cs: Formatted to code style standard. Added GetTypeCode
+	which is really an IConvertible defined method.
+
+	* Byte.cs: Added a missing Parse method. Put in Parse and ToString
+	behavior, still need to do the main Parse and ToString.
+
+	* Char.cs: Added a bunch of missing ECMA methods. Commented a
+	specification discrepency. Still didn't any unicode stuff, though
+	every IsFoo(char c) method has an IsFoo(string, index)
+	counterpart, added wrappers for those.
+	
+	* Convert.cs: Fixed NaN/Inf checking and double/float
+	rounding. Added ToType for IConvertible classes
+
+	* Double.cs: Fixed ECMA min and max values. Added IsInfinity /
+	IsNaN methods. Changed Inf/NaN internals.
+
+	* IConvertible.cs: Added comments for using
+	Convert.ToType. Changed return values to draft base values.
+
+	* Int16.cs: Added a missing Parse statement. Put in behavior for
+	overloaded ToString and Parse methods.
+
+	* Int32.cs: Added a missing Parse statement. Put in behavior for
+	overloaded ToString and Parse methods.
+
+	* Int64.cs: Added a missing Parse statement. Put in behavior for
+	overloaded ToString and Parse methods.
+	
+	* Single.cs: Put in ECMA epsilon value. Added IsInfinity / IsNaN
+	methods. Changed Inf/NaN internals.
+
+	* SByte.cs: Added a missing Parse method. Put in Parse and
+	ToString behavior, still need to do the main Parse and ToString.
+
+	* UInt16.cs: Added a missing Parse statement. Put in behavior for
+	overloaded ToString and Parse methods.
+
+	* UInt32.cs: Added a missing Parse statement. Put in behavior for
+	overloaded ToString and Parse methods.
+
+	* UInt64.cs: Added a missing Parse statement. Put in behavior for
+	overloaded ToString and Parse methods.
+	
+2001-07-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* MulticastDelegate.cs: New File.
+
+	* Delegate.cs: New file.
+
+	* Enum.cs: New file.
+
+	* Attribute.cs: New file.
+
+	* Type.cs: New file.
+
+	* ParamArrayAttribute.cs: New file.
+
+	* RuntimeTypeHandle.cs: New file.
+
+	* MulticastDelegate.cs: Added.
+
+	* DateTime.cs: Added
+
+	* Delegate.cs: Added
+
+2001-07-18  Michael Lambert <michaellambert@email.com>
+
+        * AttributeTargets.cs: Add.
+
+2001-07-19  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* Char.cs: Made ToUpper and ToLower public methods.
+
+	* String.cs: Lots and lots of compile fixes - just need to write
+	DateTime.cs and this should build completely now.
+
+2001-07-19  Bob Smith (bob@thestuff.net)
+
+	* Math.cs: Implemented. 
+
+2001-07-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* String.cs: Removed tolower and toupper.
+
+	* Char.cs: Moved ToLower and ToUpper from string to here. 
+
+	* Convert.cs ToByte (float value), ToByte (double value) Use IsNan
+	instead of comparing the value to Nan.
+
+2001-07-19  Duco Fijma (duco@lorentz.xs4all.nl)
+
+	* TimeSpan.cs: New implementation.
+
+2001-07-18  Scott Sanders <scott@stonecobra.com>
+
+         * UriFormatExcpetion.cs: Add - 85% complete
+
+2001-07-17  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* String.cs (IndexOf): Slight optimization that allows skipping
+	over a few chars here and there. This isn't as good as using my
+	Boyer-Moore implementation, however, Boyer-Moore is only really
+	good for long strings (I plan on making the code decide which
+	string search algorithm it should use on-the-fly at some point).
+	(LastIndexOf): Fix to work correctly.
+	(BoyerMoore): Took out some unneeded code and fixed an edge-case.
+
+2001-07-16  Michael Lambert <michaellambert@email.com>
+
+	* EventArgs.cs: Add.
+	
+2001-07-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* Version.cs: Remove my buggy comment.
+
+2001-07-15  Sean MacIsaac  <macisaac@ximian.com>
+
+	* String.cs: Spelling error of IComparable, object's
+	MemberwiseClone cannot be overridden.  Made indexer valid for now,
+	but not sure what to do about this in the long run.  Seems to be a
+	couple bugs in csc.exe having to do with multiple pointer defs in
+	the same statement, and returning subclasses of a class in the
+	return type of an interface function implementation.  Also moved
+	operators inside of class definition.
+
+2001-07-14  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* String.cs: A tom of compile fixes, although we still don't compile.
+
+	* IConvertible.cs: The To*Int64() methods return *Int64's, not
+	*Int32's. Also, it's ToDateTime() not ToDateType().
+
+2001-07-14  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* String.cs: Apparently I needed to at least write stubs for the
+	IConvertible interfaces. *sigh*
+
+2001-07-14  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* String.cs: Many logic/other fixes and better usage of the
+	features of c#
+	(tolower): New convenience method to help condense code.
+	(toupper): Another new helper method.
+	(Compare): Use the new helper methods.
+	(ToLower): use tolower().
+	(ToUpper): use toupper().
+	(LastIndexOfAny): Implemented.
+	(BoyerMoore): New private helper method that implements a modified
+	version of the Boyer-Moore search algorithm. Noothing uses it yet
+	as I'm not 100% sure it even works properly with unicode strings
+	not to mention it uses a huge lookup-table :-)
+	(Split): Implemented.
+
+2001-07-13  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* TODO: Added things that need to be finished in System.String
+
+	* String.cs: New source file implementing the System.String class
+
+2001-07-12  Sean MacIsaac  <macisaac@ximian.com>
+
+	* TypeCode.cs: UInt64 was UInt63.
+
+	* Object.cs: Fixed a numer of compiler errors.
+
+	* Array.cs: Fixed some compiler errors.
+
+	* IComparable.cs: Fixed some compiler errors.
+
+	* ICloneable.cs: Fixed some compiler errors.
+
+	* IConvertible.cs: Fixed some compiler errors.
+
+	* IFormattable.cs: Fixed a compiler error.
+
+	* IFormatProvider.cs: Fixed a compiler error.
+
+	* IDisposable.cs: Fixed a compiler error.
+
+	* IFormatProvider.cs: Added public accesability type to
+	IFormatProvider.
+
+	* Exception.cs: Added a using statement to remove compile time
+	error.
+
+	* ApplicationException.cs: Removed a ; that was causing a compiler
+	error.
+
+	* Int16.cs: Fixed some compiler errors.
+
+	* Int32.cs: Fixed some compiler errors.
+
+	* Int64.cs: Fixed some compiler errors.
+
+	* SystemException.cs: Fixed a compiler error.
+
+	* UInt16.cs: Fixed some compiler errors.
+
+	* UInt32.cs: Fixed some compiler errors.
+
+	* UInt64.cs: Fixed some compiler errors.
+
+	* Void.cs: Fixed a compiler error.	
+
+2001-07-12  Joe Shaw  <joe@ximian.com>
+
+	* Array.cs: Fix backwards parameters to Array.SetValue()
+	throughout.
+	(BinarySearch): Fix backward logic surrounding whether to call
+	value.CompareTo or comparer.Compare.
+	(LastIndexOf): Stop being stupid. I am so not used to strongly
+	bounded arrays...
+	(Sort): Implement a quicksort.
+
+2001-07-11  Joe Shaw  <joe@ximian.com>
+
+	* Array.cs: Change all instances of trying to access an array with
+	the index operator to calls to GetValue and SetValue, and add
+	InternalGetValue and InternalSetValue which are internal calls
+	into the runtime. Ew.
+
+2001-07-10  Joe Shaw  <joe@ximian.com>
+
+	* Array.cs: Implemented everything but Sort().
+
+2001-07-09  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* Object.cs (Object::Equals): Object variable name is `o'.
+
+2001-07-06  Joe Shaw  <joe@ximian.com>
+
+	* Int16.cs, Int32.cs, Int64.cs, UInt16.cs, UInt32.cs, UInt64.cs:
+	Implement the IComparable and IFormattable interfaces. Fix a typo
+	(publig -> public)
+
+	* ApplicationException.cs, ArgumentException.cs,
+	ArgumentNullException.cs, ArgumentOutOfRangeException.cs,
+	ArtithmeticException.cs, ArrayTypeMismatchException.cs,
+	DivideByZeroException.cs, DuplicateWaitObjectException.cs,
+	ExecutionEngineException.cs, FormatException.cs,
+	IndexOutOfRangeException.cs, InvalidCastException.cs,
+	InvalidOperationException.cs, InvalidProgramException.cs,
+	MulticateNotSupportedException.cs, NotFiniteNumberException.cs,
+	NotSupportedException.cs, NullReferenceException.cs,
+	OutOfMemoryException.cs, OverflowException.cs, RankException.cs,
+	StackOverflowException.cs, SystemException.cs,
+	TypeInitializationException.cs: Added all of the exceptions
+	specified by the language spec. Mmmm... bloat.
+
+2001-07-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* Int64.cs, Int32.cs: Put.  Parsing and ToString missing.  Should
+	do a generic routine all of these guys use.
+
+	* Int16.cs: identified missing methods.
+
+	* UInt16.cs, UInt32.cs, UInt64.cs: Add.
+
+2001-06-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* TypeCode.cs: Implement
+
+	* Void.cs: Implement.
+
+	* TODO: Add file to keep track of pending tasks.
+
+	* Object.cs, ValueType.cs: Implement.
diff --git a/mcs/class/corlib/System/Char.cs b/mcs/class/corlib/System/Char.cs
new file mode 100644
index 00000000000..58e5dc33ab6
--- /dev/null
+++ b/mcs/class/corlib/System/Char.cs
@@ -0,0 +1,399 @@
+//
+// System.Char.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+// Note about the ToString()'s. ECMA says there's only a ToString() method, 
+// BUT it is just a wrapper for ToString(null). However there is no other ToString
+// in the docs. Turning to the NET framework sdk reveals that there is a 
+// ToString(formatprovider) method, as well as a 'static ToString (char c)' method, 
+// which appears to just be a Convert.ToString(char c) type method. ECMA also
+// doesn't list this class as implementing IFormattable.
+
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System {
+	
+	[Serializable]
+	public struct Char : IComparable, IConvertible { //, IFormattable {
+		public const char MaxValue = (char) 0xffff;
+		public const char MinValue = (char) 0;
+		
+		// VES needs to know about value.  public is workaround
+		// so source will compile
+		public char value;
+		
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+			
+			if (!(v is System.Char))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Char"));
+
+			char xv = (char) v;
+			if (value == xv)
+				return 0;
+
+			if (value > xv)
+				return 1;
+			else
+				return -1;
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.Char))
+				return false;
+
+			return ((Char) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return value;
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern double GetNumericValue (char c);
+
+		public static double GetNumericValue (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+					"The value of index is less than zero, or greater than or equal to the length of str"));
+					
+			
+			return GetNumericValue (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern UnicodeCategory GetUnicodeCategory (char c); 
+
+		public static UnicodeCategory GetUnicodeCategory (string str, int index) {
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText ("The value of index is less "+
+					                  "than zero, or greater than or equal to the length of str"));
+			
+			return GetUnicodeCategory (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsControl (char c);
+
+		public static bool IsControl (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("Str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+					"The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsControl (str[index]);
+		}
+		
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsDigit (char c);
+
+		public static bool IsDigit (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("Str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+				 "The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsDigit (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsLetter (char c);
+
+		public static bool IsLetter (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+			         "The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsLetter (str[index]);
+		}
+
+		public static bool IsLetterOrDigit (char c)
+		{
+			if (IsLetter (c) == false && IsDigit (c) == false)
+				return false;
+			else
+				return true;
+		}
+
+		public static bool IsLetterOrDigit (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+				 "The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsLetterOrDigit (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsLower (char c);
+		
+		public static bool IsLower (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+				 "The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsLower (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsNumber (char c);
+		
+		public static bool IsNumber (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+				"The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsNumber (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsPunctuation (char c);
+		
+		public static bool IsPunctuation (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+				 "The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsPunctuation (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsSeparator (char c);
+		
+		public static bool IsSeparator (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+				 "The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsSeparator (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsSurrogate (char c);
+		
+		public static bool IsSurrogate (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+			         "The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsSurrogate (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsSymbol (char c);
+		
+		public static bool IsSymbol (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+					"The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsSymbol (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsUpper (char c);
+		
+		public static bool IsUpper (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+				 "The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsUpper (str[index]);
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern bool IsWhiteSpace (char c);
+		
+		public static bool IsWhiteSpace (string str, int index)
+		{
+			if (str == null) 
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+			
+			if (index < 0 || index >= str.Length)
+				throw new ArgumentOutOfRangeException (Locale.GetText (
+					"The value of index is less than zero, or greater than or equal to the length of str"));
+			
+			return IsWhiteSpace (str[index]);
+		}
+
+		public static char Parse (string str)
+		{
+			if (str == null)
+				throw new ArgumentNullException (Locale.GetText ("str is a null reference"));
+
+			if (str.Length != 1)
+				throw new FormatException ("string contains more than one character.");
+			
+			return str [0];
+		}
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern char ToLower (char c);
+
+		[MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions.InternalCall)]
+		public static extern char ToUpper (char c);
+
+		public override string ToString ()
+		{
+			// LAMESPEC: ECMA draft lists this as returning ToString (null), 
+			// However it doesn't list another ToString() method.
+			return new String (value, 1);
+		}
+
+		public string ToString (IFormatProvider fp)
+		{
+			// LAMESPEC: ECMA draft doesn't say Char implements IFormattable
+			return new String (value, 1);
+		}
+
+		// =========== IConvertible Methods =========== //
+		
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.Char;
+		}	  
+
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			return System.Convert.ToType(value, conversionType, provider);
+		}
+		
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			throw new InvalidCastException();
+		}
+		
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return System.Convert.ToByte(value);
+		}
+		
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			return value;
+		}
+		
+		[CLSCompliant(false)]
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			throw new InvalidCastException();
+		}
+		
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			throw new InvalidCastException();
+		}
+		
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			throw new InvalidCastException();
+		}
+		
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16(value);
+		}
+		
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32(value);
+		}
+		
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64(value);
+		}
+		
+		[CLSCompliant(false)] 
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte(value);
+		}
+		
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			throw new InvalidCastException();
+		}
+		
+		string IConvertible.ToString (IFormatProvider provider)
+		{
+			return ToString(provider);
+		}
+
+		[CLSCompliant(false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16(value);
+		}
+		
+		[CLSCompliant(false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32(value);
+		}
+		
+		[CLSCompliant(false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64(value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/CharEnumerator.cs b/mcs/class/corlib/System/CharEnumerator.cs
new file mode 100644
index 00000000000..7689a5a3b4c
--- /dev/null
+++ b/mcs/class/corlib/System/CharEnumerator.cs
@@ -0,0 +1,90 @@
+//
+// System.CharEnumerator.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System.Collections;
+
+namespace System
+{
+	[Serializable]
+	public sealed class CharEnumerator : IEnumerator, ICloneable
+	{
+		private string str;
+		private int index;
+		private int length;
+		// Representation invariant:
+		// length == str.Length
+		// -1 <= index <= length
+		
+		// Constructor
+		internal CharEnumerator (string s)
+		{
+			 str = s;
+			 index = -1;
+			 length = s.Length;
+		}
+		
+		// Property
+		public char Current
+		{
+			get {
+				if (index == -1 || index == length)
+					throw new InvalidOperationException
+						("The position is not valid.");
+
+				return str [index];
+			}
+		}
+		
+		object IEnumerator.Current
+		{
+			get {
+				if (index == -1 || index == length)
+					throw new InvalidOperationException
+						("The position is not valid");
+
+				return str [index];
+			}
+		}
+		
+		// Methods
+		public object Clone ()
+		{
+			CharEnumerator x = new CharEnumerator (str);
+			x.index = index;
+			return x;
+		}
+		
+		public bool MoveNext ()
+		{
+			// Representation invariant holds: -1 <= index <= length
+
+			index ++;
+
+			// Now: 0 <= index <= length+1;
+			//   <=>
+			// 0 <= index < length (OK) || 
+			// length <= index <= length+1 (Out of bounds)
+			
+			if (index >= length) {
+				index = length;
+				// Invariant restored:
+				// length == index
+				//   =>
+				// -1 <= index <= length
+				return false;	
+			}
+			else
+				return true;
+		}
+		
+		public void Reset ()
+		{
+			index = -1;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/Console.cs b/mcs/class/corlib/System/Console.cs
new file mode 100644
index 00000000000..79951bfa149
--- /dev/null
+++ b/mcs/class/corlib/System/Console.cs
@@ -0,0 +1,319 @@
+//
+// System.Console.cs
+//
+// Author:
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.IO;
+
+namespace System {
+
+	public sealed class Console {
+
+		private static TextWriter stdout;
+		private static TextWriter stderr;
+		private static TextReader stdin;
+
+		static Console ()
+		{
+			stderr = new StreamWriter (OpenStandardError ());
+			((StreamWriter)stderr).AutoFlush = true;
+			stdout = new StreamWriter (OpenStandardOutput ());
+			((StreamWriter)stdout).AutoFlush = true;
+			stdin  = new StreamReader (OpenStandardInput ());
+		}
+
+		private Console () {}
+		
+		public static TextWriter Error
+		{
+			get {
+				return stderr;
+			}
+		}
+
+		public static TextWriter Out
+		{
+			get {
+				return stdout;
+			}
+		}
+
+		public static TextReader In
+		{
+			get {
+				return stdin;
+			}
+		}
+
+		public static Stream OpenStandardError ()
+		{
+			return OpenStandardError (0);
+		}
+		
+		public static Stream OpenStandardError (int bufferSize)
+		{
+			return new FileStream (MonoIO.ConsoleError,
+					       FileAccess.Write,
+					       false,  bufferSize);
+		}
+
+		public static Stream OpenStandardInput ()
+		{
+			return OpenStandardInput (0);
+		}
+		
+		public static Stream OpenStandardInput (int bufferSize)
+		{
+			return new FileStream (MonoIO.ConsoleInput,
+					       FileAccess.Read,
+					       false,  bufferSize);
+		}
+
+		public static Stream OpenStandardOutput ()
+		{
+			return OpenStandardOutput (0);
+		}
+		
+		public static Stream OpenStandardOutput (int bufferSize)
+		{
+			return new FileStream (MonoIO.ConsoleOutput,
+					       FileAccess.Write,
+					       false,  bufferSize);
+		}
+
+		public static void SetError (TextWriter newError)

+		{
+			if (newError == null)
+				throw new ArgumentNullException ();
+
+			stderr = newError;
+		}
+
+		public static void SetIn (TextReader newIn)

+		{
+			if (newIn == null)
+				throw new ArgumentNullException ();
+
+			stdin = newIn;
+		}
+
+		public static void SetOut (TextWriter newOut)

+		{
+			if (newOut == null)
+				throw new ArgumentNullException ();
+
+			stdout = newOut;
+		}
+
+                public static void Write (bool value)
+		{
+			stdout.Write (value);
+		}
+
+                public static void Write (char value)
+		{
+			stdout.Write (value);
+		}
+
+                public static void Write (char[] value)
+		{
+			stdout.Write (value);
+		}
+		
+                public static void Write (decimal value)
+		{
+			stdout.Write (value);
+		}
+		
+                public static void Write (double value)
+		{
+			stdout.Write (value);
+		}
+
+                public static void Write (int value)
+		{
+			stdout.Write (value);
+		}
+		
+                public static void Write (long value)
+		{
+			stdout.Write (value);
+		}
+		
+                public static void Write (object value)
+		{
+			stdout.Write (value);
+		}
+		
+                public static void Write (float value)
+		{
+			stdout.Write (value);
+		}
+		
+                public static void Write (string value)
+		{
+			stdout.Write (value);
+		}
+		
+		[CLSCompliant(false)]
+                public static void Write (uint value)
+		{
+			stdout.Write (value);
+		}
+		
+		[CLSCompliant(false)]
+                public static void Write (ulong value)
+		{
+			stdout.Write (value);
+		}
+		
+                public static void Write (string format, object arg0)
+		{
+			stdout.Write (format, arg0);
+		}
+		
+                public static void Write (string format, params object[] arg)
+		{
+			stdout.Write (format, arg);
+		}
+		
+                public static void Write (char[] buffer, int index, int count)
+		{
+			stdout.Write (buffer, index, count);
+		}
+		
+                public static void Write (string format, object arg0, object arg1)
+		{
+			stdout.Write (format, arg0, arg1);
+		}
+		
+                public static void Write (string format, object arg0, object arg1, object arg2 )
+		{
+			stdout.Write (format, arg0, arg1, arg2);
+		}
+                
+                public static void WriteLine ()
+		{
+			stdout.WriteLine ();
+		}
+		
+                public static void WriteLine (bool value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (char value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (char[] value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (decimal value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (double value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (int value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (long value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (object value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (float value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (string value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+		[CLSCompliant(false)]
+                public static void WriteLine (uint value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+		[CLSCompliant(false)]
+                public static void WriteLine (ulong value)
+		{
+			stdout.Write (value);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (string format, object arg0)
+		{
+			stdout.Write (format, arg0);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (string format, params object[] arg)
+		{
+			stdout.Write (format, arg);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (char[] buffer, int index, int count)
+		{
+			stdout.Write (buffer, index, count);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (string format, object arg0, object arg1)
+		{
+			stdout.Write (format, arg0, arg1);
+			stdout.WriteLine();
+		}
+		
+                public static void WriteLine (string format, object arg0, object arg1, object arg2)
+		{
+			stdout.Write (format, arg0, arg1, arg2);
+			stdout.WriteLine();
+		}
+
+		public static int Read ()
+		{
+			return stdin.Read ();
+		}
+		
+		public static string ReadLine ()
+		{
+			return stdin.ReadLine ();
+		}
+		
+	}
+}
diff --git a/mcs/class/corlib/System/ContextBoundObject.cs b/mcs/class/corlib/System/ContextBoundObject.cs
new file mode 100644
index 00000000000..92e95e454aa
--- /dev/null
+++ b/mcs/class/corlib/System/ContextBoundObject.cs
@@ -0,0 +1,25 @@
+//
+// System.ContextBoundObject.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+// TODO: Mucho left to implement.
+//
+
+namespace System {
+
+	/// <summary>
+	///   Base class for all the context-bound classes
+	/// </summary>
+	[MonoTODO]
+	[Serializable]
+	public abstract class ContextBoundObject : MarshalByRefObject {
+
+		protected ContextBoundObject ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/ContextMarshalException.cs b/mcs/class/corlib/System/ContextMarshalException.cs
new file mode 100644
index 00000000000..bb058cf2e09
--- /dev/null
+++ b/mcs/class/corlib/System/ContextMarshalException.cs
@@ -0,0 +1,42 @@
+//	
+// System.ContextMarshalException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class ContextMarshalException : SystemException
+	{
+		// Constructors
+		public ContextMarshalException ()
+			: base (Locale.GetText ("Attempt to marshal and object across a context failed."))
+			{
+			}
+		
+		public ContextMarshalException (string message)
+			: base (message)
+			{
+			}
+		
+		protected ContextMarshalException (SerializationInfo info,
+						   StreamingContext context)
+			: base (info, context)
+			{
+			}
+		
+		public ContextMarshalException (string message, Exception innerException)
+			:base (message, innerException)
+			{
+			}
+		
+	}
+}
diff --git a/mcs/class/corlib/System/ContextStaticAttribute.cs b/mcs/class/corlib/System/ContextStaticAttribute.cs
new file mode 100755
index 00000000000..054c9845e6f
--- /dev/null
+++ b/mcs/class/corlib/System/ContextStaticAttribute.cs
@@ -0,0 +1,28 @@
+//
+// System.ContextStaticAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	/// <summary>
+	///   The ContextStatic attribute is used to flag fields as being unique
+	/// </summary>
+	///
+	/// <remarks>
+	///   
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.Field)]
+	[Serializable]
+	public class ContextStaticAttribute : Attribute {
+
+		   public ContextStaticAttribute () : base ()
+		   {
+		   }
+		
+	}
+}
diff --git a/mcs/class/corlib/System/Convert.cs b/mcs/class/corlib/System/Convert.cs
new file mode 100644
index 00000000000..97b7800e9ac
--- /dev/null
+++ b/mcs/class/corlib/System/Convert.cs
@@ -0,0 +1,2463 @@
+//

+// System.Convert.cs

+//

+// Author:

+//   Derek Holden (dholden@draper.com)

+//   Duncan Mak (duncan@ximian.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+//

+

+//

+// System.Convert class. This was written word for word off the 

+// Library specification for System.Convert in the ECMA TC39 TG2 

+// and TG3 working documents. The first page of which has a table

+// for all legal conversion scenerios.

+//

+// This header and the one above it can be formatted however, just trying

+// to keep it consistent w/ the existing mcs headers.

+//

+// This Convert class could be written another way, with each type 

+// implementing IConvertible and defining their own conversion functions,

+// and this class just calling the type's implementation. Or, they can 

+// be defined here and the implementing type can use these functions when 

+// defining their IConvertible interface. Byte's ToBoolean() calls 

+// Convert.ToBoolean(byte), or Convert.ToBoolean(byte) calls 

+// byte.ToBoolean(). The first case is what is done here.

+//

+// See http://lists.ximian.com/archives/public/mono-list/2001-July/000525.html

+//

+// There are also conversion functions that are not defined in

+// the ECMA draft, such as there is no bool ToBoolean(DateTime value), 

+// and placing that somewhere won't compile w/ this Convert since the

+// function doesn't exist. However calling that when using Microsoft's

+// System.Convert doesn't produce any compiler errors, it just throws

+// an InvalidCastException at runtime.

+//

+// Whenever a decimal, double, or single is converted to an integer

+// based type, it is even rounded. This uses Math.Round which only 

+// has Round(decimal) and Round(double), so in the Convert from 

+// single cases the value is passed to Math as a double. This 

+// may not be completely necessary.

+//

+// The .NET Framework SDK lists DBNull as a member of this class

+// as 'public static readonly object DBNull;'. 

+//

+// It should also be decided if all the cast return values should be

+// returned as unchecked or not.

+//

+// All the XML function comments were auto generated which is why they

+// sound someone redundant.

+//

+// TYPE | BOOL BYTE CHAR DT DEC DBL I16 I32 I64 SBYT SNGL STR UI16 UI32 UI64

+// -----+--------------------------------------------------------------------

+// BOOL |   X    X           X   X   X   X   X    X    X   X    X    X    X

+// BYTE |   X    X    X      X   X   X   X   X    X    X   X    X    X    X

+// CHAR |        X    X              X   X   X    X        X    X    X    X

+// DT   |                 X                                X

+// DEC  |   X    X           X   X   X   X   X    X    X   X    X    X    X

+// DBL  |   X    X           X   X   X   X   X    X    X   X    X    X    X

+// I16  |   X    X    X      X   X   X   X   X    X    X   X    X    X    X

+// I32  |   X    X    X      X   X   X   X   X    X    X   X    X    X    X

+// I64  |   X    X    X      X   X   X   X   X    X    X   X    X    X    X

+// SBYT |   X    X    X      X   X   X   X   X    X    X   X    X    X    X

+// SNGL |   X    X           X   X   X   X   X    X    X   X    X    X    X

+// STR  |   X    X    X   X  X   X   X   X   X    X    X   X    X    X    X

+// UI16 |   X    X    X      X   X   X   X   X    X    X   X    X    X    X

+// UI32 |   X    X    X      X   X   X   X   X    X    X   X    X    X    X

+// UI64 |   X    X    X      X   X   X   X   X    X    X   X    X    X    X

+//

+

+using System.Globalization;

+using System.Security.Cryptography;

+using System.Text;

+

+namespace System {

+  

+//	[CLSCompliant(false)]

+	public sealed class Convert {

+

+		// Fields

+		public static readonly object DBNull = System.DBNull.Value;

+	

+		private Convert () {}

+

+		// ========== BASE 64 Conversions ========== //

+		// the BASE64 convert methods are using the Base64 converting methods

+		// from System.Security.Cryptography.ToBase64Transform and

+		// System.Security.Cryptography.FromBase64Transform

+		//

+		// should be changed to a stand-alone class Base64Encoder & Base64Decoder

+		

+		public static byte[] FromBase64CharArray(char[] inArray, int offset, int length)

+		{

+			if (inArray == null)

+				throw new ArgumentNullException();

+			

+			if ((offset < 0) || (length < 0) || (offset + length > inArray.Length))

+				throw new ArgumentOutOfRangeException();

+			

+			if (length < 4 || length % 4 != 0)

+				throw new FormatException();

+				

+			byte[] inArr = new System.Text.UTF8Encoding().GetBytes(inArray, offset, length);

+			FromBase64Transform t = new FromBase64Transform();

+			

+			return t.TransformFinalBlock(inArr, 0, inArr.Length);

+		}

+		

+		public static byte[] FromBase64String(string s)

+		{

+			if (s == null)

+				throw new ArgumentNullException();

+			

+			char[] inArr = s.ToCharArray();

+

+			return FromBase64CharArray(inArr, 0, inArr.Length);

+		}

+

+		public static TypeCode GetTypeCode (object value)

+		{

+			if (value == null)

+				return TypeCode.Empty;

+			else 

+				return Type.GetTypeCode (value.GetType ());

+		}

+

+		public static bool IsDBNull (object value)

+		{

+			if (value is DBNull)

+				return true;

+			else

+				return false;

+		}

+		

+		public static int ToBase64CharArray(byte[] inArray, int offsetIn, int length, 

+		                                    char[] outArray, int offsetOut)

+		{

+			if (inArray == null || outArray == null)

+				throw new ArgumentNullException();

+			

+			if (offsetIn < 0 || length < 0 || offsetOut < 0 || (offsetIn + length) > inArray.Length)

+				throw new ArgumentOutOfRangeException();

+			

+			ToBase64Transform t = new ToBase64Transform();

+			byte[] outArr = t.TransformFinalBlock(inArray, offsetIn, length);

+			

+			char[] cOutArr = new System.Text.ASCIIEncoding().GetChars(outArr);

+			

+			if ((offsetOut + cOutArr.Length) > outArray.Length)

+				throw new ArgumentOutOfRangeException();

+			

+			Array.Copy(cOutArr, 0, outArray, offsetOut, cOutArr.Length);

+			

+			return cOutArr.Length;

+		}

+		

+		public static string ToBase64String(byte[] inArray)

+		{

+			if (inArray == null)

+				throw new ArgumentNullException();

+

+			return ToBase64String(inArray, 0, inArray.Length);

+		}

+		

+		public static string ToBase64String(byte[] inArray, int offset, int length)

+		{

+			if (inArray == null)

+				throw new ArgumentNullException();

+			

+			if (offset < 0 || length < 0 || (offset + length) > inArray.Length)

+				throw new ArgumentOutOfRangeException();

+			

+			// FIXME: change to stand alone Base64 Encoder class

+			ToBase64Transform t = new ToBase64Transform();

+			byte[] outArr = t.TransformFinalBlock(inArray, offset, length);

+			

+			return (new System.Text.ASCIIEncoding().GetString(outArr));

+		}

+		

+		// ========== Boolean Conversions ========== //

+	

+		public static bool ToBoolean (bool value) 

+		{ 

+			return value; 

+		}

+

+		public static bool ToBoolean (byte value) 

+		{ 

+			return (value != 0); 

+		}

+ 

+		public static bool ToBoolean (char value)

+		{

+			throw new InvalidCastException (Locale.GetText ("Can't convert char to bool"));

+		}

+		

+		public static bool ToBoolean (DateTime value)

+		{

+			throw new InvalidCastException (Locale.GetText ("Can't convert date to bool"));

+		}

+		

+		public static bool ToBoolean (decimal value) 

+		{ 

+			return (value != 0M); 

+		}

+

+		public static bool ToBoolean (double value) 

+		{ 

+			return (value != 0); 

+		}

+

+		public static bool ToBoolean (float value) 

+		{ 

+			return (value != 0f); 

+		}

+

+		public static bool ToBoolean (int value) 

+		{ 

+			return (value != 0); 

+		}

+

+		public static bool ToBoolean (long value) 

+		{ 

+			return (value != 0); 

+		}

+

+		[CLSCompliant (false)]

+		public static bool ToBoolean (sbyte value) 

+		{ 

+			return (value != 0); 

+		}

+	

+		public static bool ToBoolean (short value) 

+		{ 

+			return (value != 0); 

+		}

+

+		public static bool ToBoolean (string value) 

+		{

+			return Boolean.Parse (value);

+		}

+

+		public static bool ToBoolean (string value, IFormatProvider provider)

+		{

+			return Boolean.Parse (value); // provider is ignored.

+		}

+

+		[CLSCompliant (false)]

+		public static bool ToBoolean (uint value) 

+		{ 

+			return (value != 0);

+		}

+

+		[CLSCompliant (false)]

+		public static bool ToBoolean (ulong value) 

+		{ 

+			return (value != 0); 

+		}

+

+		[CLSCompliant (false)]

+		public static bool ToBoolean (ushort value) 

+		{ 

+			return (value != 0); 

+		}

+

+		public static bool ToBoolean (object value)

+		{

+			return ToBoolean (value, null);

+		}

+

+		public static bool ToBoolean (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return false;

+			return ((IConvertible) value).ToBoolean (provider);

+		}

+

+		// ========== Byte Conversions ========== //

+	

+		public static byte ToByte (bool value) 

+		{ 

+			return (byte)(value ? 1 : 0); 

+		}

+	

+		public static byte ToByte (byte value) 

+		{ 

+			return value; 

+		}

+

+		public static byte ToByte (char value) 

+		{ 

+			if (value > Byte.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Byte.MaxValue"));

+

+			return (byte)value;

+		}

+

+		public static byte ToByte (DateTime value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+	

+		public static byte ToByte (decimal value)

+		{ 

+			if (value > Byte.MaxValue || value < Byte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Byte.MaxValue or less than Byte.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (byte)(Math.Round (value));

+		}

+	

+		public static byte ToByte (double value) 

+		{ 

+			if (value > Byte.MaxValue || value < Byte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Byte.MaxValue or less than Byte.MinValue"));

+	  

+			// This and the float version of ToByte are the only ones

+			// the spec listed as checking for .NaN and Infinity overflow

+			if (Double.IsNaN(value) || Double.IsInfinity(value))

+				throw new OverflowException (Locale.GetText (

+					"Value is equal to Double.NaN, Double.PositiveInfinity, or Double.NegativeInfinity"));

+

+			// Returned Even-Rounded

+			return (byte)(Math.Round (value));

+		}

+

+		public static byte ToByte (float value) 

+		{ 

+			if (value > Byte.MaxValue || value < Byte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Byte.MaxValue or less than Byte.Minalue"));

+

+			// This and the double version of ToByte are the only ones

+			// the spec listed as checking for .NaN and Infinity overflow

+			if (Single.IsNaN(value) || Single.IsInfinity(value))

+				throw new OverflowException (Locale.GetText (

+					"Value is equal to Single.NaN, Single.PositiveInfinity, or Single.NegativeInfinity"));

+	  

+			// Returned Even-Rounded, pass it as a double, could have this

+			// method just call Convert.ToByte ( (double)value)

+			return (byte)(Math.Round ( (double)value));

+		}

+

+		public static byte ToByte (int value) 

+		{ 

+			if (value > Byte.MaxValue || value < Byte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Byte.MaxValue or less than Byte.MinValue"));

+	  

+			return (byte)value; 

+		}

+

+		public static byte ToByte (long value) 

+		{ 

+			if (value > Byte.MaxValue || value < Byte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Byte.MaxValue or less than Byte.MinValue"));

+	  

+			return (byte)value;

+		}

+

+		[CLSCompliant (false)]

+		public static byte ToByte (sbyte value) 

+		{ 

+			if (value < Byte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is less than Byte.MinValue"));

+	  

+			return (byte)value;

+		}

+	

+		public static byte ToByte (short value) 

+		{ 

+			if (value > Byte.MaxValue || value < Byte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Byte.MaxValue or less than Byte.MinValue"));

+	  

+			return (byte)value; 

+		}

+

+		public static byte ToByte (string value) 

+		{

+			return Byte.Parse (value);

+		}

+

+		public static byte ToByte (string value, IFormatProvider provider) 

+		{

+			return Byte.Parse (value, provider);

+		}

+

+		public static byte ToByte (string value, int fromBase)

+		{

+

+			int retVal = ConvertFromBase (value, fromBase);

+

+			if (retVal < (int) Byte.MinValue || retVal > (int) Byte.MaxValue)

+				throw new OverflowException ();

+			else

+				return (byte) retVal;

+		}

+

+		[CLSCompliant (false)]

+		public static byte ToByte (uint value) 

+		{ 

+			if (value > Byte.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Byte.MaxValue"));

+

+			return (byte)value;

+		}

+

+		[CLSCompliant (false)]

+		public static byte ToByte (ulong value) 

+		{ 

+			if (value > Byte.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Byte.MaxValue"));

+

+			return (byte)value;

+		}

+

+		[CLSCompliant (false)]

+		public static byte ToByte (ushort value) 

+		{ 

+			if (value > Byte.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Byte.MaxValue"));

+

+			return (byte)value;

+		}

+

+		public static byte ToByte (object value)

+		{

+			return ToByte (value, null);

+		}

+

+		public static byte ToByte (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return 0;

+			return ((IConvertible) value).ToByte (provider);

+		}

+

+		// ========== Char Conversions ========== //

+

+		public static char ToChar (bool value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+		

+		public static char ToChar (byte value) 

+		{ 

+			return (char)value;

+		}

+

+		public static char ToChar (char value) 

+		{ 

+			return value;

+		}

+

+		public static char ToChar (DateTime value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static char ToChar (decimal value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static char ToChar (double value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+		

+		public static char ToChar (int value) 

+		{ 

+			if (value > Char.MaxValue || value < Char.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Char.MaxValue or less than Char.MinValue"));

+	  

+			return (char)value; 

+		}

+

+		public static char ToChar (long value) 

+		{ 

+			if (value > Char.MaxValue || value < Char.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Char.MaxValue or less than Char.MinValue"));

+	  

+			return (char)value; 

+		}

+

+		public static char ToChar (float value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		[CLSCompliant (false)]

+		public static char ToChar (sbyte value) 

+		{ 

+			if (value < Char.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is less than Char.MinValue"));

+	  

+			return (char)value; 

+		}

+	

+		public static char ToChar (short value) 

+		{ 

+			if (value < Char.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is less than Char.MinValue"));

+	  

+			return (char)value; 

+		}

+

+		public static char ToChar (string value) 

+		{

+			return Char.Parse (value);

+		}

+

+		public static char ToChar (string value, IFormatProvider provider)

+		{

+			return Char.Parse (value); // provider is ignored.

+		}

+

+		[CLSCompliant (false)]

+		public static char ToChar (uint value) 

+		{ 

+			if (value > Char.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Char.MaxValue"));

+	  

+			return (char)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static char ToChar (ulong value) 

+		{ 

+			if (value > Char.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Char.MaxValue"));

+	  

+			return (char)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static char ToChar (ushort value) 

+		{ 

+			if (value > Char.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Char.MaxValue"));

+	  

+			return (char)value; 

+		}

+

+		public static char ToChar (object value)

+		{

+			return ToChar (value, null);

+		}

+

+		public static char ToChar (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return (char) 0;

+			return ((IConvertible) value).ToChar (provider);

+		}

+

+		// ========== DateTime Conversions ========== //

+	

+		public static DateTime ToDateTime (string value) 

+		{ 

+			return DateTime.Parse (value);

+		}

+	

+		public static DateTime ToDateTime (string value, IFormatProvider provider) 

+		{

+			return DateTime.Parse (value, provider);

+		}

+

+		public static DateTime ToDateTime (bool value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static DateTime ToDateTime (byte value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static DateTime ToDateTime (char value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static DateTime ToDateTime (DateTime value)

+		{

+			return value;

+		}

+

+		public static DateTime ToDateTime (decimal value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static DateTime ToDateTime (double value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static DateTime ToDateTime (short value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static DateTime ToDateTime (int value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static DateTime ToDateTime (long value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static DateTime ToDateTime (float value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static DateTime ToDateTime (object value)

+		{

+			return ToDateTime (value, null);

+		}

+

+		public static DateTime ToDateTime (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return DateTime.MinValue;

+			return ((IConvertible) value).ToDateTime (provider);

+		}

+

+		[CLSCompliant (false)]

+		public static DateTime ToDateTime (sbyte value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+		[CLSCompliant (false)]

+		public static DateTime ToDateTime (ushort value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		[CLSCompliant (false)]

+		public static DateTime ToDateTime (uint value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		[CLSCompliant (false)]

+		public static DateTime ToDateTime (ulong value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		// ========== Decimal Conversions ========== //

+	

+		public static decimal ToDecimal (bool value) 

+		{ 

+			return value ? 1 : 0; 

+		}

+	

+		public static decimal ToDecimal (byte value) 

+		{ 

+			return (decimal)value; 

+		}

+

+		public static decimal ToDecimal (char value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static decimal ToDecimal (DateTime value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+				

+		public static decimal ToDecimal (decimal value) 

+		{ 

+			return value; 

+		}

+

+		public static decimal ToDecimal (double value) 

+		{ 

+			if (value > (double)Decimal.MaxValue || value < (double)Decimal.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Decimal.MaxValue or less than Decimal.MinValue"));

+

+			return (decimal)value; 

+		}

+

+		public static decimal ToDecimal (float value) 

+		{

+			return (decimal) value;

+		}

+

+		public static decimal ToDecimal (int value) 

+		{ 

+			return (decimal)value; 

+		}

+	

+		public static decimal ToDecimal (long value) 

+		{ 

+			return (decimal)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static decimal ToDecimal (sbyte value) 

+		{ 

+			return (decimal)value; 

+		}

+	

+		public static decimal ToDecimal (short value) 

+		{ 

+			return (decimal)value; 

+		}

+

+		public static decimal ToDecimal (string value) 

+		{

+			return Decimal.Parse (value);

+		}

+

+		public static decimal ToDecimal (string value, IFormatProvider provider) 

+		{

+			return Decimal.Parse (value, provider);

+		}

+

+		[CLSCompliant (false)]

+		public static decimal ToDecimal (uint value) 

+		{ 

+			return (decimal)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static decimal ToDecimal (ulong value) 

+		{ 

+			return (decimal)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static decimal ToDecimal (ushort value) 

+		{ 

+			return (decimal)value; 

+		}

+

+		public static decimal ToDecimal (object value)

+		{

+			return ToDecimal (value, null);

+		}

+

+		public static decimal ToDecimal (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return new Decimal (0);

+			return ((IConvertible) value).ToDecimal (provider);

+		}

+						 

+

+		// ========== Double Conversions ========== //

+	

+		public static double ToDouble (bool value) 

+		{ 

+			return value ? 1 : 0; 

+		}

+	

+		public static double ToDouble (byte value) 

+		{ 

+			return (double) value;

+		}

+

+		public static double ToDouble (char value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static double ToDouble (DateTime value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+	

+		public static double ToDouble (decimal value) 

+		{ 

+			return (double)value; 

+		}

+

+		public static double ToDouble (double value) 

+		{ 

+			return value; 

+		}

+

+		public static double ToDouble (float value) 

+		{ 

+			return (double) value;

+		}

+

+		public static double ToDouble (int value) 

+		{ 

+			return (double)value; 

+		}

+	

+		public static double ToDouble (long value) 

+		{ 

+			return (double)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static double ToDouble (sbyte value) 

+		{ 

+			return (double)value; 

+		}

+	

+		public static double ToDouble (short value) 

+		{ 

+			return (double)value; 

+		}

+

+		public static double ToDouble (string value) 

+		{

+			return Double.Parse (value);

+		}

+

+		public static double ToDouble (string value, IFormatProvider provider) 

+		{

+			return Double.Parse (value, provider);

+		}

+

+		[CLSCompliant (false)]

+		public static double ToDouble (uint value) 

+		{ 

+			return (double)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static double ToDouble (ulong value) 

+		{ 

+			return (double)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static double ToDouble (ushort value) 

+		{ 

+			return (double)value; 

+		}

+

+		public static double ToDouble (object value)

+		{

+			return ToDouble (value, null);

+		}

+

+		public static double ToDouble (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return 0.0;

+			return ((IConvertible) value).ToDouble (provider);

+		}

+

+		// ========== Int16 Conversions ========== //

+

+		public static short ToInt16 (bool value) 

+		{ 

+			return (short)(value ? 1 : 0); 

+		}

+	

+		public static short ToInt16 (byte value) 

+		{ 

+			return (short)value; 

+		}

+

+		public static short ToInt16 (char value) 

+		{

+			if (value > Int16.MaxValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int16.MaxValue"));

+

+			return (short)value;

+		}

+

+		public static short ToInt16 (DateTime value) 

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+	

+		public static short ToInt16 (decimal value) 

+		{ 

+			if (value > Int16.MaxValue || value < Int16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int16.MaxValue or less than Int16.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (short)(Math.Round (value));	  

+		}

+

+		public static short ToInt16 (double value) 

+		{ 

+			if (value > Int16.MaxValue || value < Int16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int16.MaxValue or less than Int16.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (short)(Math.Round (value));	  

+		}

+ 

+		public static short ToInt16 (float value) 

+		{ 

+			if (value > Int16.MaxValue || value < Int16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int16.MaxValue or less than Int16.MinValue"));

+	  

+			// Returned Even-Rounded, use Math.Round pass as a double.

+			return (short)Math.Round ( (double)value);

+		}

+

+		public static short ToInt16 (int value) 

+		{ 

+			if (value > Int16.MaxValue || value < Int16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int16.MaxValue or less than Int16.MinValue"));

+

+			return (short)value; 

+		}

+	

+		public static short ToInt16 (long value) 

+		{ 

+			if (value > Int16.MaxValue || value < Int16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int16.MaxValue or less than Int16.MinValue"));

+

+			return (short)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static short ToInt16 (sbyte value) 

+		{ 

+			return (short)value; 

+		}

+	

+		public static short ToInt16 (short value) 

+		{ 

+			return value; 

+		}

+

+		public static short ToInt16 (string value) 

+		{

+			return Int16.Parse (value);

+		}

+

+		public static short ToInt16 (string value, IFormatProvider provider) 

+		{

+			return Int16.Parse (value, provider);

+		}

+

+		

+		public static short ToInt16 (string value, int fromBase)

+		{

+			return Convert.ToInt16 (ConvertFromBase (value, fromBase));

+		}

+

+		[CLSCompliant (false)]

+		public static short ToInt16 (uint value) 

+		{ 

+			if (value > Int16.MaxValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int16.MaxValue"));

+

+			return (short)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static short ToInt16 (ulong value) 

+		{ 

+			if (value > (ulong)Int16.MaxValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int16.MaxValue"));

+			return (short)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static short ToInt16 (ushort value) 

+		{ 

+			if (value > Int16.MaxValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int16.MaxValue"));

+

+			return (short)value; 

+		}

+

+		public static short ToInt16 (object value)

+		{

+			return ToInt16 (value, null);

+		}

+

+		public static short ToInt16 (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return 0;

+			return ((IConvertible) value).ToInt16 (provider);

+		}

+	

+		// ========== Int32 Conversions ========== //

+

+		public static int ToInt32 (bool value) 

+		{ 

+			return value ? 1 : 0; 

+		}

+	

+		public static int ToInt32 (byte value) 

+		{ 

+			return (int)value; 

+		}

+

+		public static int ToInt32 (char value) 

+		{ 

+			return (int)value; 

+		}

+

+		public static int ToInt32 (DateTime value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+	

+		public static int ToInt32 (decimal value) 

+		{ 

+			if (value > Int32.MaxValue || value < Int32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int32.MaxValue or less than Int32.MinValue"));

+

+			// Returned Even-Rounded

+			return (int)(Math.Round (value));	  

+		}

+

+		public static int ToInt32 (double value) 

+		{ 

+			if (value > Int32.MaxValue || value < Int32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int32.MaxValue or less than Int32.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (int)(Math.Round (value));	  

+		}

+ 

+		public static int ToInt32 (float value) 

+		{ 

+			if (value > Int32.MaxValue || value < Int32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int32.MaxValue or less than Int32.MinValue"));

+	  

+			// Returned Even-Rounded, pass as a double, could just call

+			// Convert.ToInt32 ( (double)value);

+			return (int)(Math.Round ( (double)value));

+		}

+

+		public static int ToInt32 (int value) 

+		{ 

+			return value; 

+		}

+	

+		public static int ToInt32 (long value) 

+		{ 

+			if (value > Int32.MaxValue || value < Int32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int32.MaxValue or less than Int32.MinValue"));

+

+			return (int)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static int ToInt32 (sbyte value) 

+		{ 

+			return (int)value; 

+		}

+	

+		public static int ToInt32 (short value) 

+		{ 

+			return (int)value; 

+		}

+

+		public static int ToInt32 (string value) 

+		{

+			return Int32.Parse (value);

+		}

+

+		public static int ToInt32 (string value, IFormatProvider provider) 

+		{

+			return Int32.Parse (value, provider);

+		}

+

+		

+		public static int ToInt32 (string value, int fromBase)

+		{

+			return ConvertFromBase (value, fromBase);

+		}

+		

+		[CLSCompliant (false)]

+		public static int ToInt32 (uint value) 

+		{ 

+			if (value > Int32.MaxValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int32.MaxValue"));

+

+			return (int)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static int ToInt32 (ulong value) 

+		{ 

+			if (value > Int32.MaxValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int32.MaxValue"));

+

+			return (int)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static int ToInt32 (ushort value) 

+		{ 

+			return (int)value; 

+		}

+

+		public static int ToInt32 (object value)

+		{

+			return ToInt32 (value, null);

+		}

+

+		public static int ToInt32 (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return 0;

+			return ((IConvertible) value).ToInt32 (provider);

+		}

+

+		// ========== Int64 Conversions ========== //

+

+		public static long ToInt64 (bool value) 

+		{ 

+			return value ? 1 : 0; 

+		}

+	

+		public static long ToInt64 (byte value) 

+		{ 

+			return (long)(ulong)value; 

+		}

+

+		public static long ToInt64 (char value) 

+		{ 

+			return (long)value; 

+		}

+

+		public static long ToInt64 (DateTime value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+	

+		public static long ToInt64 (decimal value) 

+		{ 

+			if (value > Int64.MaxValue || value < Int64.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int64.MaxValue or less than Int64.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (long)(Math.Round (value));	  

+		}

+

+		public static long ToInt64 (double value) 

+		{ 

+			if (value > Int64.MaxValue || value < Int64.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int64.MaxValue or less than Int64.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (long)(Math.Round (value));

+		}

+ 

+		public static long ToInt64 (float value) 

+		{ 

+			if (value > Int64.MaxValue || value < Int64.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int64.MaxValue or less than Int64.MinValue"));

+	  

+			// Returned Even-Rounded, pass to Math as a double, could

+			// just call Convert.ToInt64 ( (double)value);

+			return (long)(Math.Round ( (double)value));

+		}

+

+		public static long ToInt64 (int value) 

+		{ 

+			return (long)value; 

+		}

+	

+		public static long ToInt64 (long value) 

+		{ 

+			return value; 

+		}

+

+		[CLSCompliant (false)]

+		public static long ToInt64 (sbyte value) 

+		{ 

+			return (long)value; 

+		}

+	

+		public static long ToInt64 (short value) 

+		{ 

+			return (long)value; 

+		}

+

+		public static long ToInt64 (string value) 

+		{

+			return Int64.Parse (value);

+		}

+

+		public static long ToInt64 (string value, IFormatProvider provider) 

+		{

+			return Int64.Parse (value, provider);

+		}

+

+		public static long ToInt64 (string value, int fromBase)

+		{

+			if (NotValidBase (fromBase))

+				throw new ArgumentException ("fromBase is not valid.");

+			

+			return ConvertFromBase64 (value, fromBase);

+		}

+

+		[CLSCompliant (false)]

+		public static long ToInt64 (uint value) 

+		{ 

+			return (long)(ulong)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static long ToInt64 (ulong value) 

+		{ 

+			if (value > Int64.MaxValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Int64.MaxValue"));

+

+			return (long)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static long ToInt64 (ushort value) 

+		{ 

+			return (long)(ulong)value; 

+		}

+

+		public static long ToInt64 (object value)

+		{

+			return ToInt64 (value, null);

+		}

+

+		public static long ToInt64 (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return 0;

+			return ((IConvertible) value).ToInt64 (provider);

+		}

+		

+		// ========== SByte Conversions ========== //

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (bool value) 

+		{ 

+			return (sbyte)(value ? 1 : 0); 

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (byte value) 

+		{ 

+			if (value > SByte.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue"));

+

+			return (sbyte)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (char value) 

+		{ 

+			if (value > SByte.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue"));

+

+			return (sbyte)value;

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (DateTime value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+		

+		[CLSCompliant (false)]	

+		public static sbyte ToSByte (decimal value) 

+		{ 

+			if (value > SByte.MaxValue || value < SByte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue or less than SByte.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (sbyte)(Math.Round (value));

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (double value) 

+		{ 

+			if (value > SByte.MaxValue || value < SByte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue or less than SByte.MinValue"));

+

+			// Returned Even-Rounded

+			return (sbyte)(Math.Round (value));

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (float value) 

+		{ 

+			if (value > SByte.MaxValue || value < SByte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue or less than SByte.Minalue"));

+

+			// Returned Even-Rounded, pass as double to Math

+			return (sbyte)(Math.Round ( (double)value));

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (int value) 

+		{ 

+			if (value > SByte.MaxValue || value < SByte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue or less than SByte.MinValue"));

+	  

+			return (sbyte)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (long value) 

+		{ 

+			if (value > SByte.MaxValue || value < SByte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue or less than SByte.MinValue"));

+	  

+			return (sbyte)value;

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (sbyte value) 

+		{ 

+			return value;

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (short value) 

+		{ 

+			if (value > SByte.MaxValue || value < SByte.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue or less than SByte.MinValue"));

+	  

+			return (sbyte)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (string value) 

+		{

+			return SByte.Parse (value);

+		}

+		

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (string value, IFormatProvider provider) 

+		{

+			return SByte.Parse (value, provider);

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (string value, int fromBase)

+		{

+			int retVal = ConvertFromBase (value, fromBase);

+

+			if (retVal == 255)

+				return (sbyte)-1;

+

+			if (retVal < (int) SByte.MinValue || retVal > (int) SByte.MaxValue)

+				throw new OverflowException ();

+			else

+				return (sbyte) retVal;

+		}

+		

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (uint value) 

+		{ 

+			if (value > SByte.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue"));

+

+			return (sbyte)value;

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (ulong value) 

+		{ 

+			if (value > (ulong)SByte.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue"));

+

+			return (sbyte)value;

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (ushort value) 

+		{ 

+			if (value > SByte.MaxValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than SByte.MaxValue"));

+

+			return (sbyte)value;

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (object value)

+		{

+			return ToSByte (value, null);

+		}

+

+		[CLSCompliant (false)]

+		public static sbyte ToSByte (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return 0;

+			return ((IConvertible) value).ToSByte (provider);

+		}

+

+		// ========== Single Conversions ========== //

+	

+		public static float ToSingle (bool value) 

+		{ 

+			return value ? 1 : 0; 

+		}

+	

+		public static float ToSingle (byte value) 

+		{ 

+			return (float)value; 

+		}

+

+		public static float ToSingle (Char value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		public static float ToSingle (DateTime value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+	

+		public static float ToSingle (decimal value) 

+		{ 

+			return (float)value; 

+		}

+

+		public static float ToSingle (double value) 

+		{ 

+			if (value > Single.MaxValue || value < Single.MinValue)

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than Single.MaxValue or less than Single.MinValue"));

+

+			return (float)value; 

+		}

+	

+		public static float ToSingle (float value) 

+		{ 

+			return value; 

+		}

+

+		public static float ToSingle (int value) 

+		{ 

+			return (float)value; 

+		}

+	

+		public static float ToSingle (long value) 

+		{ 

+			return (float)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static float ToSingle (sbyte value) 

+		{ 

+			return (float)value; 

+		}

+	

+		public static float ToSingle (short value) 

+		{ 

+			return (float)value; 

+		}

+

+		public static float ToSingle (string value) 

+		{

+			return Single.Parse (value);

+		}

+

+		public static float ToSingle (string value, IFormatProvider provider) 

+		{

+			return Single.Parse (value, provider);

+		}	       

+

+		[CLSCompliant (false)]

+		public static float ToSingle (uint value) 

+		{ 

+			return (float)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static float ToSingle (ulong value) 

+		{ 

+			return (float)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static float ToSingle (ushort value) 

+		{ 

+			return (float)value; 

+		}

+

+		public static float ToSingle (object value)

+		{

+			return ToSingle (value, null);

+		}

+

+//		[CLSCompliant (false)]

+		public static float ToSingle (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return 0;

+			return ((IConvertible) value).ToSingle (provider);

+		}

+

+		// ========== String Conversions ========== //

+	

+		public static string ToString (bool value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		public static string ToString (bool value, IFormatProvider provider)

+		{

+			return value.ToString (); // the same as ToString (bool).

+		}

+	

+		public static string ToString (byte value) 

+		{ 

+			return value.ToString (); 

+		}

+	

+		public static string ToString (byte value, IFormatProvider provider) 

+		{

+			return value.ToString (provider); 

+		}

+

+		public static string ToString (byte value, int toBase)

+		{

+			if (NotValidBase (toBase))

+				throw new ArgumentException ("toBase is not valid.");

+			

+			return ConvertToBase ((int) value, toBase);

+		}

+

+		public static string ToString (char value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		public static string ToString (char value, IFormatProvider provider)

+		{

+			return value.ToString (); // the same as ToString (char)

+		}

+

+		public static string ToString (DateTime value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		public static string ToString (DateTime value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider); 

+		}

+

+		public static string ToString (decimal value) 

+		{

+			return value.ToString ();

+		}

+

+		public static string ToString (decimal value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider); 

+		}

+	

+		public static string ToString (double value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		public static string ToString (double value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider);

+		}

+	

+		public static string ToString (float value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		public static string ToString (float value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider); 

+		}

+

+		public static string ToString (int value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		public static string ToString (int value, int toBase)

+		{

+			if (NotValidBase (toBase))

+				throw new ArgumentException ("toBase is not valid.");

+		

+			return ConvertToBase ((int) value, toBase);

+		}

+

+		public static string ToString (int value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider); 

+		}

+	

+		public static string ToString (long value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		public static string ToString (long value, int toBase)

+		{

+			if (NotValidBase (toBase))

+				throw new ArgumentException ("toBase is not valid.");

+			

+			return ConvertToBase (value, toBase);

+		}

+

+		public static string ToString (long value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider); 

+		}

+

+		public static string ToString (object value)

+		{

+			return ToString (value, null);

+		}		

+

+		public static string ToString (object value, IFormatProvider provider)

+		{

+			if (value is IConvertible)

+				return ((IConvertible) value).ToString (provider);

+			else if (value != null)

+				return value.ToString ();

+			return String.Empty;

+		}				

+

+		[CLSCompliant (false)]

+		public static string ToString (sbyte value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		[CLSCompliant (false)]				

+		public static string ToString (sbyte value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider); 

+		}

+	

+		public static string ToString (short value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		public static string ToString (short value, int toBase)

+		{

+			if (NotValidBase (toBase))

+				throw new ArgumentException ("toBase is not valid.");

+			

+			return ConvertToBase ((int) value, toBase);

+		}

+

+		public static string ToString (short value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider); 

+		}

+

+		public static string ToString (string value) 

+		{

+			return value;

+		}

+

+		public static string ToString (string value, IFormatProvider provider)

+		{

+			return value; // provider is ignored.

+		}

+

+		[CLSCompliant (false)]

+		public static string ToString (uint value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		[CLSCompliant (false)]

+		public static string ToString (uint value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider); 

+		}

+

+		[CLSCompliant (false)]

+		public static string ToString (ulong value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		[CLSCompliant (false)]

+		public static string ToString (ulong value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider); 

+		}

+

+		[CLSCompliant (false)]

+		public static string ToString (ushort value) 

+		{ 

+			return value.ToString (); 

+		}

+

+		[CLSCompliant (false)]

+		public static string ToString (ushort value, IFormatProvider provider) 

+		{ 

+			return value.ToString (provider); 

+		}

+		

+		// ========== UInt16 Conversions ========== //

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (bool value) 

+		{ 

+			return (ushort)(value ? 1 : 0); 

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (byte value) 

+		{ 

+			return (ushort)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (char value) 

+		{ 

+			return (ushort)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (DateTime value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (decimal value) 

+		{ 

+			if (value > UInt16.MaxValue || value < UInt16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt16.MaxValue or less than UInt16.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (ushort)(Math.Round (value));	  

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (double value) 

+		{ 

+			if (value > UInt16.MaxValue || value < UInt16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt16.MaxValue or less than UInt16.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (ushort)(Math.Round (value));

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (float value) 

+		{ 

+			if (value > UInt16.MaxValue || value < UInt16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt16.MaxValue or less than UInt16.MinValue"));

+	  

+			// Returned Even-Rounded, pass as double to Math

+			return (ushort)(Math.Round ( (double)value));

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (int value) 

+		{ 

+			if (value > UInt16.MaxValue || value < UInt16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt16.MaxValue or less than UInt16.MinValue"));

+

+			return (ushort)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (long value) 

+		{ 

+			if (value > UInt16.MaxValue || value < UInt16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt16.MaxValue or less than UInt16.MinValue"));

+

+			return (ushort)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (sbyte value) 

+		{ 

+			if (value < UInt16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is less than UInt16.MinValue"));

+

+			return (ushort)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (short value) 

+		{ 

+			if (value < UInt16.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is less than UInt16.MinValue"));

+

+			return (ushort)value; 

+		}

+		

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (string value) 

+		{

+			return UInt16.Parse (value);

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (string value, IFormatProvider provider) 

+		{

+			return UInt16.Parse (value, provider);

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (string value, int fromBase) 

+		{

+			return (ushort) ConvertFromBase (value, fromBase);

+		} 

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (uint value) 

+		{ 

+			if (value > UInt16.MaxValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt16.MaxValue"));

+

+			return (ushort)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (ulong value) 

+		{ 

+			if (value > (ulong)UInt16.MaxValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt16.MaxValue"));

+

+			return (ushort)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (ushort value) 

+		{ 

+			return value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (object value)

+		{

+			return ToUInt16 (value, null);

+		}

+

+		[CLSCompliant (false)]

+		public static ushort ToUInt16 (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return 0;

+			return ((IConvertible) value).ToUInt16 (provider);

+		}

+

+		// ========== UInt32 Conversions ========== //

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (bool value) 

+		{ 

+			return (uint)(value ? 1 : 0); 

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (byte value) 

+		{ 

+			return (uint)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (char value) 

+		{ 

+			return (uint)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (DateTime value)

+		{

+			throw new InvalidCastException ("This conversion is not supported.");

+		}

+		

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (decimal value) 

+		{ 

+			if (value > UInt32.MaxValue || value < UInt32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt32.MaxValue or less than UInt32.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (uint)(Math.Round (value));	  

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (double value) 

+		{ 

+			if (value > UInt32.MaxValue || value < UInt32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt32.MaxValue or less than UInt32.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (uint)(Math.Round (value));	  

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (float value) 

+		{ 

+			if (value > UInt32.MaxValue || value < UInt32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt32.MaxValue or less than UInt32.MinValue"));

+	  

+			// Returned Even-Rounded, pass as double to Math

+			return (uint)(Math.Round ( (double)value));

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (int value) 

+		{ 

+			if (value < UInt32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is less than UInt32.MinValue"));

+

+			return (uint)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (long value) 

+		{ 

+			if (value > UInt32.MaxValue || value < UInt32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt32.MaxValue or less than UInt32.MinValue"));

+

+			return (uint)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (sbyte value) 

+		{ 

+			if (value < UInt32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is less than UInt32.MinValue"));

+

+			return (uint)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (short value) 

+		{ 

+			if (value < UInt32.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is less than UInt32.MinValue"));

+

+			return (uint)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (string value) 

+		{

+			return UInt32.Parse (value);

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (string value, IFormatProvider provider) 

+		{

+			return UInt32.Parse (value, provider);

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (string value, int fromBase)

+		{

+			return (uint) ConvertFromBase (value, fromBase);

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (uint value) 

+		{ 

+			return value; 

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (ulong value) 

+		{ 

+			if (value > UInt32.MaxValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt32.MaxValue"));

+

+			return (uint)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (ushort value) 

+		{ 

+			return (uint)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (object value)

+		{

+			return ToUInt32 (value, null);

+		}		

+

+		[CLSCompliant (false)]

+		public static uint ToUInt32 (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return 0;

+			return ((IConvertible) value).ToUInt32 (provider);

+		}		

+		

+

+		// ========== UInt64 Conversions ========== //

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (bool value) 

+		{ 

+			return (ulong)(value ? 1 : 0); 

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (byte value) 

+		{ 

+			return (ulong)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (char value) 

+		{ 

+			return (ulong)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (DateTime value)

+		{

+			throw new InvalidCastException ("The conversion is not supported.");

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (decimal value) 

+		{ 

+			if (value > UInt64.MaxValue || value < UInt64.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt64.MaxValue or less than UInt64.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (ulong)(Math.Round (value));	  

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (double value) 

+		{ 

+			if (value > UInt64.MaxValue || value < UInt64.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt64.MaxValue or less than UInt64.MinValue"));

+	  

+			// Returned Even-Rounded

+			return (ulong)(Math.Round (value));	  

+		}

+		

+		[CLSCompliant (false)] 

+		public static ulong ToUInt64 (float value) 

+		{ 

+			if (value > UInt64.MaxValue || value < UInt64.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is greater than UInt64.MaxValue or less than UInt64.MinValue"));

+	  

+			// Returned Even-Rounded, pass as a double to Math

+			return (ulong)(Math.Round ( (double)value));

+		}

+		

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (int value) 

+		{ 

+			if (value < (int)UInt64.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is less than UInt64.MinValue"));

+

+			return (ulong)value; 

+		}

+		

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (long value) 

+		{ 

+			if (value < (long)UInt64.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is less than UInt64.MinValue"));

+

+			return (ulong)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (sbyte value) 

+		{ 

+			if (value < (sbyte)UInt64.MinValue) 

+				throw new OverflowException

+				("Value is less than UInt64.MinValue");

+

+			return (ulong)value; 

+		}

+		

+		[CLSCompliant (false)]	

+		public static ulong ToUInt64 (short value) 

+		{ 

+			if (value < (short)UInt64.MinValue) 

+				throw new OverflowException (Locale.GetText (

+					"Value is less than UInt64.MinValue"));

+

+			return (ulong)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (string value) 

+		{

+			return UInt64.Parse (value);

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (string value, IFormatProvider provider) 

+		{

+			return UInt64.Parse (value, provider);

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (string value, int fromBase)

+		{

+			return (ulong) ConvertFromBase (value, fromBase);

+		}					      

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (uint value) 

+		{ 

+			return (ulong)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (ulong value) 

+		{ 

+			return value; 

+		}

+		

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (ushort value) 

+		{ 

+			return (ulong)value; 

+		}

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (object value)

+		{

+			return ToUInt64 (value, null);

+		}		

+

+		[CLSCompliant (false)]

+		public static ulong ToUInt64 (object value, IFormatProvider provider)

+		{

+			if (value == null)

+				return 0;

+			return ((IConvertible) value).ToUInt64 (provider);

+		}		

+		

+

+		// ========== Conversion / Helper Functions ========== //

+

+		public static object ChangeType (object value, Type conversionType)

+		{

+			CultureInfo ci = CultureInfo.CurrentCulture;

+			NumberFormatInfo number = ci.NumberFormat;

+			return ToType (value, conversionType, number);

+		}

+		

+		public static object ChangeType (object value, TypeCode typeCode)

+		{

+			CultureInfo ci = CultureInfo.CurrentCulture;

+			Type conversionType = conversionTable [(int)typeCode];

+			NumberFormatInfo number = ci.NumberFormat;

+			return ToType (value, conversionType, number);

+		}

+

+		public static object ChangeType (object value, Type conversionType, IFormatProvider provider)

+		{

+			return ToType (value, conversionType, provider);

+		}

+		

+		public static object ChangeType (object value, TypeCode typeCode, IFormatProvider provider)

+		{

+			Type conversionType = conversionTable [(int)typeCode];

+			return ToType (value, conversionType, provider);

+		}

+

+		private static bool NotValidBase (int value)

+		{

+			if ((value == 2) || (value == 8) ||

+			   (value == 10) || (value == 16))

+				return false;

+			

+			return true;

+		}

+

+		private static int ConvertFromBase (string value, int fromBase)

+		{

+			if (NotValidBase (fromBase))

+				throw new ArgumentException ("fromBase is not valid.");

+

+			int chars = 0;

+			int result = 0;

+			int digitValue;

+

+			foreach (char c in value) {

+				if (Char.IsNumber (c))

+					digitValue = c - '0';

+				else if (Char.IsLetter (c))

+					digitValue = Char.ToLower(c) - 'a' + 10;

+				else

+					throw new FormatException ("This is an invalid string: " + value);

+

+				if (digitValue >= fromBase)

+					throw new FormatException ("the digits are invalid.");

+

+				result = (fromBase) * result + digitValue;

+				chars ++;

+			}

+

+			if (chars == 0)

+				throw new FormatException ("Could not find any digits.");

+

+			if (result > Int32.MaxValue || result < Int32.MinValue)

+				throw new OverflowException ("There is an overflow.");

+			

+			return result;

+		}

+

+		private static long ConvertFromBase64 (string value, int fromBase)

+		{

+			if (NotValidBase (fromBase))

+				throw new ArgumentException ("fromBase is not valid.");

+

+			int chars = 0;

+			int digitValue;

+			long result = 0;

+

+			foreach (char c in value) {

+				if (Char.IsNumber (c))

+					digitValue = c - '0';

+				else if (Char.IsLetter (c))

+					digitValue = Char.ToLower(c) - 'a' + 10;

+				else

+					throw new FormatException ("This is an invalid string: " + value);

+

+				if (digitValue >= fromBase)

+					throw new FormatException ("the digits are invalid.");

+

+				result = (fromBase) * result + digitValue;

+				chars ++;

+			}

+

+			if (chars == 0)

+				throw new FormatException ("Could not find any digits.");

+

+			if (result > Int64.MaxValue || result < Int64.MinValue)

+				throw new OverflowException ("There is an overflow.");

+			

+			return result;

+		}

+

+		private static string ConvertToBase (int value, int toBase)

+		{

+			StringBuilder sb = new StringBuilder ();

+			BuildConvertedString (sb, value, toBase);

+			return sb.ToString ();

+		}

+

+		private static string ConvertToBase (long value, int toBase)

+		{

+			StringBuilder sb = new StringBuilder ();

+			BuildConvertedString64 (sb, value, toBase);

+			return sb.ToString ();

+		}

+		

+

+		internal static void BuildConvertedString (StringBuilder sb, int value, int toBase)

+		{

+			int divided = value / toBase;

+			int reminder = value % toBase;		

+

+			if (divided > 0)

+				BuildConvertedString (sb, divided, toBase);

+		

+			if (reminder >= 10)

+				sb.Append ((char) (reminder + 'a' - 10));

+			else

+				sb.Append ((char) (reminder + '0'));

+		}

+

+		internal static void BuildConvertedString64 (StringBuilder sb, long value, int toBase)

+		{

+			long divided = value / toBase;

+			long reminder = value % toBase;		

+

+			if (divided > 0)

+				BuildConvertedString64 (sb, divided, toBase);

+		

+			if (reminder >= 10)

+				sb.Append ((char) (reminder + 'a' - 10));

+			else

+				sb.Append ((char) (reminder + '0'));

+		}

+		

+                // Lookup table for the conversion ToType method. Order

+		// is important! Used by ToType for comparing the target

+		// type, and uses hardcoded array indexes.

+		private static Type[] conversionTable = {

+			// Valid ICovnertible Types

+			null,              //  0 empty

+			typeof (object),   //  1 TypeCode.Object

+			typeof (DBNull),   //  2 TypeCode.DBNull

+			typeof (Boolean),  //  3 TypeCode.Boolean

+			typeof (Char),     //  4 TypeCode.Char

+			typeof (SByte),    //  5 TypeCode.SByte

+			typeof (Byte),     //  6 TypeCode.Byte

+			typeof (Int16),    //  7 TypeCode.Int16

+			typeof (UInt16),   //  8 TypeCode.UInt16

+			typeof (Int32),    //  9 TypeCode.Int32

+			typeof (UInt32),   // 10 TypeCode.UInt32

+			typeof (Int64),    // 11 TypeCode.Int64

+			typeof (UInt64),   // 12 TypeCode.UInt64

+			typeof (Single),   // 13 TypeCode.Single

+			typeof (Double),   // 14 TypeCode.Double

+			typeof (Decimal),  // 15 TypeCode.Decimal

+			typeof (DateTime), // 16 TypeCode.DateTime

+			null,              // 17 null.

+			typeof (String),   // 18 TypeCode.String

+		};

+

+		// Function to convert an object to another type and return

+		// it as an object. In place for the core data types to use

+		// when implementing IConvertible. Uses hardcoded indexes in 

+		// the conversionTypes array, so if modify carefully.

+		internal static object ToType (object value, Type conversionType, 

+					       IFormatProvider provider) 

+		{

+			if (value == null && conversionType == null)

+				return null;

+			

+			if (value == null)

+				throw new NullReferenceException ("Value is null.");

+			

+			if (value is IConvertible) {

+				IConvertible convertValue = (IConvertible) value;

+

+				if (conversionType == conversionTable[0]) // 0 Empty

+					throw new ArgumentNullException ();

+				

+				else if (conversionType == conversionTable[1]) // 1 TypeCode.Object

+					return (object) value;

+					

+				else if (conversionType == conversionTable[2]) // 2 TypeCode.DBNull

+					throw new InvalidCastException ();     // It's not IConvertible

+		  

+				else if (conversionType == conversionTable[3]) // 3 TypeCode.Boolean

+					return (object) convertValue.ToBoolean (provider);

+					

+				else if (conversionType == conversionTable[4]) // 4 TypeCode.Char

+					return (object) convertValue.ToChar (provider);

+		  

+				else if (conversionType == conversionTable[5]) // 5 TypeCode.SByte

+					return (object) convertValue.ToSByte (provider);

+

+				else if (conversionType == conversionTable[6]) // 6 TypeCode.Byte

+					return (object) convertValue.ToByte (provider);

+				

+				else if (conversionType == conversionTable[7]) // 7 TypeCode.Int16

+					return (object) convertValue.ToInt16 (provider);

+					

+				else if (conversionType == conversionTable[8]) // 8 TypeCode.UInt16

+					return (object) convertValue.ToUInt16 (provider);

+		  

+				else if (conversionType == conversionTable[9]) // 9 TypeCode.Int32

+					return (object) convertValue.ToInt32 (provider);

+			

+				else if (conversionType == conversionTable[10]) // 10 TypeCode.UInt32

+					return (object) convertValue.ToUInt32 (provider);

+		  

+				else if (conversionType == conversionTable[11]) // 11 TypeCode.Int64

+					return (object) convertValue.ToInt64 (provider);

+		  

+				else if (conversionType == conversionTable[12]) // 12 TypeCode.UInt64

+					return (object) convertValue.ToUInt64 (provider);

+		  

+				else if (conversionType == conversionTable[13]) // 13 TypeCode.Single

+					return (object) convertValue.ToSingle (provider);

+		  

+				else if (conversionType == conversionTable[14]) // 14 TypeCode.Double

+					return (object) convertValue.ToDouble (provider);

+

+				else if (conversionType == conversionTable[15]) // 15 TypeCode.Decimal

+					return (object) convertValue.ToDecimal (provider);

+

+				else if (conversionType == conversionTable[16]) // 16 TypeCode.DateTime

+					return (object) convertValue.ToDateTime (provider);

+				

+				else if (conversionType == conversionTable[18]) // 18 TypeCode.String

+					return (object) convertValue.ToString (provider);

+				else

+					throw new ArgumentException (Locale.GetText ("Unknown target conversion type"));

+			} else

+				// Not in the conversion table

+				throw new InvalidCastException ((Locale.GetText (

+					"Value is not a convertible object: " + value.GetType().ToString() + " to " + conversionType.FullName)));

+		}

+	}

+}

diff --git a/mcs/class/corlib/System/CrossAppDomainDelegate.cs b/mcs/class/corlib/System/CrossAppDomainDelegate.cs
new file mode 100755
index 00000000000..d8cded40afa
--- /dev/null
+++ b/mcs/class/corlib/System/CrossAppDomainDelegate.cs
@@ -0,0 +1,10 @@
+// System.CrossAppDomainDelegate.cs
+//
+// Paolo Molaro
+//
+// (C) 2002 Ximian, Inc.
+
+namespace System
+{
+	public delegate void CrossAppDomainDelegate ();
+}
diff --git a/mcs/class/corlib/System/DBNull.cs b/mcs/class/corlib/System/DBNull.cs
new file mode 100644
index 00000000000..f1a98085350
--- /dev/null
+++ b/mcs/class/corlib/System/DBNull.cs
@@ -0,0 +1,133 @@
+//
+// System.DBNull.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public sealed class DBNull : ISerializable, IConvertible
+	{
+		// Fields
+		public static readonly DBNull Value = new DBNull ();
+
+		// Private constructor
+		private DBNull () {}
+
+		// Methods
+		[MonoTODO]
+		public void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+		}
+
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.DBNull;
+		}
+
+		[MonoTODO]
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return false;
+		}			
+
+		[MonoTODO]
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return Byte.MinValue;
+		}
+
+		[MonoTODO]
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			return Char.MinValue;
+		}
+
+		[MonoTODO]
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			return DateTime.MinValue;
+		}
+
+		[MonoTODO]
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			return Decimal.MinValue;
+		}
+		
+		[MonoTODO]
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			return Double.MinValue;
+		}
+
+		[MonoTODO]
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return Int16.MinValue;
+		}
+
+		[MonoTODO]
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return Int32.MinValue;
+		}
+
+		[MonoTODO]
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return Int64.MinValue;
+		}
+
+		[MonoTODO]
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return SByte.MinValue;
+		}
+
+		[MonoTODO]
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return Single.MinValue;
+		}
+
+		[MonoTODO]
+		object IConvertible.ToType (Type type, IFormatProvider provider)
+		{
+			return null;
+		}
+
+		[MonoTODO]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return UInt16.MinValue;
+		}
+
+		[MonoTODO]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return UInt32.MinValue;
+		}
+
+		[MonoTODO]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return UInt64.MinValue;
+		}
+
+		public override string ToString ()
+		{
+			return String.Empty;
+		}
+
+		public string ToString (IFormatProvider provider)
+		{
+			return String.Empty;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/DateTime.cs b/mcs/class/corlib/System/DateTime.cs
new file mode 100644
index 00000000000..6e93dac6719
--- /dev/null
+++ b/mcs/class/corlib/System/DateTime.cs
@@ -0,0 +1,1473 @@
+//

+// System.DateTime.cs

+//

+// author:

+//   Marcel Narings (marcel@narings.nl)

+//   Martin Baulig (martin@gnome.org)

+//

+//   (C) 2001 Marcel Narings

+

+using System;

+using System.Globalization;

+using System.Runtime.CompilerServices;

+

+

+namespace System

+{

+	/// <summary>

+	/// The DateTime structure represents dates and time ranging from

+	/// 1-1-0001 12:00:00 AM to 31-12-9999 23:59:00 Common Era.

+	/// </summary>

+	/// 

+	[Serializable]

+	public struct DateTime : IComparable , IFormattable  , IConvertible

+	{

+		private TimeSpan ticks;

+

+		private const int dp400 = 146097;

+		private const int dp100 = 36524;

+		private const int dp4 = 1461;

+

+		// w32 file time starts counting from 1/1/1601 00:00 GMT

+		// which is the constant ticks from the .NET epoch

+		private const long w32file_epoch = 504911232000000000L;

+

+		//

+		// The UnixEpoch, it begins on Jan 1, 1970 at 0:0:0, expressed

+		// in Ticks

+		//

+		internal const long UnixEpoch = 621355968000000000L;

+		

+		public static readonly DateTime MaxValue = new DateTime (false,TimeSpan.MaxValue);

+		public static readonly DateTime MinValue = new DateTime (false,TimeSpan.MinValue);

+		

+		private enum Which 

+		{

+			Day,

+			DayYear,

+			Month,

+			Year

+		};

+	

+		private static int[] daysmonth = { 0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };	

+		private static int[] daysmonthleap = { 0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31 };	

+

+		private static int AbsoluteDays (int year, int month, int day)

+		{

+			int[] days;

+			int temp = 0, m=1 ;

+		

+			days = (IsLeapYear(year) ? daysmonthleap  : daysmonth);

+			

+			while (m < month)

+				temp += days[m++];

+			return ((day-1) + temp + (365* (year-1)) + ((year-1)/4) - ((year-1)/100) + ((year-1)/400));

+		}

+

+		private int FromTicks(Which what)

+		{

+			int num400, num100, num4, numyears; 

+			int M =1;

+

+			int[] days = daysmonth;

+			int totaldays = this.ticks.Days;

+

+			num400 = (totaldays / dp400);

+			totaldays -=  num400 * dp400;

+		

+			num100 = (totaldays / dp100);

+			if (num100 == 4)   // leap

+				num100 = 3;

+			totaldays -= (num100 * dp100);

+

+			num4 = totaldays / dp4;

+			totaldays -= (num4 * dp4);

+

+			numyears = totaldays / 365 ;

+

+			if (numyears == 4)  //leap

+				numyears =3 ;

+			if (what == Which.Year )

+				return num400*400 + num100*100 + num4*4 + numyears + 1;

+

+			totaldays -= (numyears * 365) ;

+			if (what == Which.DayYear )

+				return totaldays + 1;

+			

+			if  ((numyears==3) && ((num100 == 3) || !(num4 == 24)) ) //31 dec leapyear

+				days = daysmonthleap;

+			        

+			while (totaldays >= days[M])

+				totaldays -= days[M++];

+

+			if (what == Which.Month )

+				return M;

+

+			return totaldays +1; 

+		}

+

+

+		// Constructors

+		

+		/// <summary>

+		/// Constructs a DateTime for specified ticks

+		/// </summary>

+		/// 

+		public DateTime (long newticks)

+			// `local' must default to false here to avoid

+			// a recursion loop.

+			: this (false, newticks) {}

+

+		internal DateTime (bool local, long newticks)

+			: this (true, new TimeSpan (newticks))

+		{

+			if (local) {

+				TimeZone tz = TimeZone.CurrentTimeZone;

+

+				TimeSpan utcoffset = tz.GetUtcOffset (this);

+

+				ticks = ticks + utcoffset;

+			}

+		}

+

+		public DateTime (int year, int month, int day)

+			: this (year, month, day,0,0,0,0) {}

+

+		public DateTime (int year, int month, int day, int hour, int minute, int second)

+			: this (year, month, day, hour, minute, second, 0)	{}

+

+		public DateTime (int year, int month, int day, int hour, int minute, int second, int millisecond)

+			{

+			if ( year < 1 || year > 9999 || 

+				month < 1 || month >12  ||

+				day < 1 || day > DaysInMonth(year, month) ||

+				hour < 0 || hour > 23 ||

+				minute < 0 || minute > 59 ||

+				second < 0 || second > 59 )

+				throw new ArgumentOutOfRangeException ("Parameters describe an " +

+									"unrepresentable DateTime.");

+

+			ticks = new TimeSpan (AbsoluteDays(year,month,day), hour, minute, second, millisecond);

+		}

+

+		public DateTime (int year, int month, int day, Calendar calendar)

+			: this (year, month, day, 0, 0, 0, 0, calendar)	{}

+

+		

+		public DateTime (int year, int month, int day, int hour, int minute, int second, Calendar calendar)

+			: this (year, month, day, hour, minute, second, 0, calendar)	{}

+

+

+		public DateTime (int year, int month, int day, int hour, int minute, int second, int millisecond, Calendar calendar)

+			: this (year, month, day, hour, minute, second, millisecond) 

+		{

+			if (calendar == null)

+				throw new ArgumentNullException();

+		}

+

+		internal DateTime (bool check, TimeSpan value)

+		{

+			if (check && (value.Ticks < MinValue.Ticks || value.Ticks > MaxValue.Ticks))

+				throw new ArgumentOutOfRangeException ();

+

+			ticks = value;

+		}

+

+		/* Properties  */

+		 

+		public DateTime Date 

+		{

+			get	

+			{ 

+				return new DateTime (Year, Month, Day);

+			}

+		}

+        

+		public int Month 

+		{

+			get	

+			{ 

+				return FromTicks(Which.Month); 

+			}

+		}

+

+	       

+		public int Day

+		{

+			get 

+			{ 

+				return FromTicks(Which.Day); 

+			}

+		}

+

+		public DayOfWeek DayOfWeek 

+		{

+			get 

+			{ 

+				return ( (DayOfWeek) ((ticks.Days+1) % 7) ); 

+			}

+		}

+

+		public int DayOfYear 

+		{

+			get 

+			{ 

+				return FromTicks(Which.DayYear); 

+			}

+		}

+

+		public TimeSpan TimeOfDay 

+		{

+			get	

+			{ 

+				return new TimeSpan(ticks.Ticks % TimeSpan.TicksPerDay );

+			}

+			

+		}

+

+		public int Hour 

+		{

+			get 

+			{ 

+				return ticks.Hours;

+			}

+		}

+

+		public int Minute 

+		{

+			get 

+			{ 

+				return ticks.Minutes;

+			}

+		}

+

+		public int Second 

+		{

+			get	

+			{ 

+				return ticks.Seconds;

+			}

+		}

+

+		public int Millisecond 

+		{

+			get 

+			{ 

+				return ticks.Milliseconds;

+			}

+		}

+		

+		[MethodImplAttribute(MethodImplOptions.InternalCall)]

+		internal static extern long GetNow ();

+

+		public static DateTime Now 

+		{

+			get	

+			{

+				return new DateTime (true, GetNow ());

+			}

+		}

+

+		public long Ticks

+		{ 

+			get	

+			{ 

+				return ticks.Ticks;

+			}

+		}

+	

+		public static DateTime Today 

+		{

+			get	

+			{

+				return new DateTime (false, (GetNow () / TimeSpan.TicksPerDay) * TimeSpan.TicksPerDay);

+			}

+		}

+

+		public static DateTime UtcNow 

+		{

+			get {

+				return new DateTime (GetNow ());

+			}

+		}

+

+		public int Year 

+		{

+			get 

+			{ 

+				return FromTicks(Which.Year); 

+			}

+		}

+

+		/* methods */

+

+		public DateTime Add (TimeSpan ts)

+		{

+			return new DateTime (true, ticks) + ts;

+		}

+

+		public DateTime AddDays (double days)

+		{

+			return AddMilliseconds (days * 86400000);

+		}

+		

+		public DateTime AddTicks (long t)

+		{

+			return Add (new TimeSpan (t));

+		}

+

+		public DateTime AddHours (double hours)

+		{

+			return AddMilliseconds (hours * 3600000);

+		}

+

+		public DateTime AddMilliseconds (double ms)

+		{

+			long msticks;

+			

+			msticks = (long) (ms += ms > 0 ? 0.5 : -0.5) * TimeSpan.TicksPerMillisecond ; 

+

+			return AddTicks (msticks);

+		}

+

+		public DateTime AddMinutes (double minutes)

+		{

+			return AddMilliseconds (minutes * 60000);

+		}

+		

+		public DateTime AddMonths (int months)

+		{

+			int day, month, year,  maxday ;

+			DateTime temp ;

+

+			day = this.Day;

+			month = this.Month + (months % 12);

+			year = this.Year + months/12 ;

+			

+			if (month < 1)

+			{

+				month = 12 + month ;

+				year -- ;

+			}

+			else if (month>12) 

+			{

+				month = month -12;

+				year ++;

+			}

+			maxday = DaysInMonth(year, month);

+			if (day > maxday)

+				day = maxday;

+

+			temp = new DateTime (year, month, day);

+			return  temp.Add (this.TimeOfDay);

+		}

+

+		public DateTime AddSeconds (double seconds)

+		{

+			return AddMilliseconds (seconds*1000);

+		}

+

+		public DateTime AddYears (int years )

+		{

+			return AddMonths(years * 12);

+		}

+

+		public static int Compare (DateTime t1,	DateTime t2)

+		{

+			if (t1.ticks < t2.ticks) 

+				return -1;

+			else if (t1.ticks > t2.ticks) 

+				return 1;

+			else

+				return 0;

+		}

+

+		public int CompareTo (object v)

+		{

+			if ( v == null)

+				return 1;

+

+			if (!(v is System.DateTime))

+				throw new ArgumentException (Locale.GetText (

+					"Value is not a System.DateTime"));

+

+			return Compare (this, (DateTime) v);

+		}

+

+		public static int DaysInMonth (int year, int month)

+		{

+			int[] days ;

+

+			if (month < 1 || month >12)

+				throw new ArgumentOutOfRangeException ();

+

+			days = (IsLeapYear(year) ? daysmonthleap  : daysmonth);

+			return days[month];			

+		}

+		

+		public override bool Equals (object o)

+		{

+			if (!(o is System.DateTime))

+				return false;

+

+			return ((DateTime) o).ticks == ticks;

+		}

+

+		public static bool Equals (DateTime t1, DateTime t2 )

+		{

+			return (t1.ticks == t2.ticks );

+		}

+

+		public static DateTime FromFileTime (long fileTime) 

+		{

+			return new DateTime (w32file_epoch + fileTime);

+		}

+

+		// TODO: Implement me.

+		[MonoTODO]

+		public static DateTime FromOADate (double d)

+		{

+				return new DateTime(0);

+		}

+		

+		// TODO: Implement me.

+		[MonoTODO]

+		public string[] GetDateTimeFormats() 

+		{

+			return null;

+		}

+

+		//TODO: implement me

+		[MonoTODO]

+		public string[] GetDateTimeFormats(char format)

+		{

+			return null;

+		}

+		

+		// TODO: implement me

+		[MonoTODO]

+		public string[] GetDateTimeFormats(IFormatProvider provider)

+		{

+			return null;

+		}

+

+		//TODO: implement me 

+		[MonoTODO]

+		public string[] GetDateTimeFormats(char format,IFormatProvider provider	)

+		{

+			return null;

+		}

+

+		public override int GetHashCode ()

+		{

+			return (int) ticks.Ticks;

+		}

+

+		public TypeCode GetTypeCode ()

+		{

+			return TypeCode.DateTime;

+		}

+

+		public static bool IsLeapYear (int year)

+		{

+			return  ( (year % 4 == 0 && year % 100 != 0) || year % 400 == 0) ;

+		}

+

+		public static DateTime Parse (string s)

+		{

+			return Parse (s, null);

+		}

+

+		public static DateTime Parse (string s, IFormatProvider fp)

+		{

+			return Parse (s, null, DateTimeStyles.AllowWhiteSpaces);

+		}

+

+		public static DateTime Parse (string s, IFormatProvider fp, DateTimeStyles styles)

+		{

+			string[] formats = {

+				// Full date and time

+				"F", "G", "r", "s", "u", "U",

+				// Full date and time, but no seconds

+				"f", "g",

+				// Only date

+				"d", "D",

+				// Only time

+				"T", "t",

+				// Only date, but no year

+				"m",

+				// Only date, but no day

+				"y" 

+			};

+

+			return ParseExact (s, formats, fp, styles);

+		}

+

+		public static DateTime ParseExact (string s, string format, IFormatProvider fp)

+		{

+			return ParseExact (s, format, fp, DateTimeStyles.None);

+		}

+

+		internal static int _ParseNumber (string s, int digits, bool leadingzero,

+						  bool sloppy_parsing, out int num_parsed)

+		{

+			int number = 0, i;

+

+			if (sloppy_parsing)

+				leadingzero = false;

+

+			if (!leadingzero) {

+				int real_digits = 0;

+				for (i = 0; i < s.Length; i++) {

+					if (!Char.IsDigit (s[i]))

+						break;

+

+					real_digits++;

+				}

+

+				digits = real_digits;

+			}

+

+			if (s.Length < digits) {

+				num_parsed = -1;

+				return 0;

+			}

+

+			for (i = 0; i < digits; i++) {

+				char c = s[i];

+				if (!Char.IsDigit (c)) {

+					num_parsed = -1;

+					return 0;

+				}

+

+				number = number * 10 + (byte) (c - '0');

+			}

+

+			num_parsed = digits;

+			return number;

+		}

+

+		internal static int _ParseEnum (string s, string[] values, out int num_parsed)

+		{

+			int i;

+

+			for (i = 0; i < values.Length; i++) {

+				if (s.Length < values[i].Length)

+					continue;

+				String tmp = s.Substring (0, values[i].Length);

+				if (String.Compare (tmp, values[i], true) == 0) {

+					num_parsed = values[i].Length;

+					return i;

+				}

+			}

+

+			num_parsed = -1;

+			return -1;

+		}

+

+		internal static bool _ParseString (string s, int maxlength, string value, out int num_parsed)

+		{

+			if (maxlength > 0)

+				value = value.Substring (0, maxlength);

+

+			s = s.Substring (0, value.Length);

+

+			if (String.Compare (s, value, true) == 0) {

+				num_parsed = value.Length;

+				return true;

+			}

+

+			num_parsed = -1;

+			return false;

+		}

+

+		internal static bool _DoParse (string s, string format, bool exact,

+					       out DateTime result,

+					       DateTimeFormatInfo dfi,

+					       DateTimeStyles style)

+		{

+			bool useutc = false, use_localtime = true;

+			bool sloppy_parsing = false;

+

+			if (format.Length == 1)

+				format = _GetStandardPattern (format[0], dfi, out useutc);

+

+			if ((style & DateTimeStyles.AllowLeadingWhite) != 0) {

+				format = format.TrimStart (null);

+				s = s.TrimStart (null);

+			}

+

+			if ((style & DateTimeStyles.AllowTrailingWhite) != 0) {

+				format = format.TrimEnd (null);

+				s = s.TrimEnd (null);

+			}

+

+			if ((style & DateTimeStyles.AllowInnerWhite) != 0)

+				sloppy_parsing = true;

+

+			char[] chars = format.ToCharArray ();

+			int len = format.Length, pos = 0, num = 0;

+

+			int day = -1, dayofweek = -1, month = -1, year = -1;

+			int hour = -1, minute = -1, second = -1, millisecond = -1;

+			int ampm = -1;

+			int tzsign = -1, tzoffset = -1, tzoffmin = -1;

+

+			result = new DateTime (0);

+			while (pos+num < len)

+			{

+				if (s.Length == 0)

+					break;

+

+				if (Char.IsWhiteSpace (s[0])) {

+					s = s.Substring (1);

+

+					if (Char.IsWhiteSpace (chars[pos])) {

+						pos++;

+						continue;

+					}

+

+					if ((style & DateTimeStyles.AllowInnerWhite) == 0)

+						return false;

+				}

+

+				if (chars[pos] == '\'') {

+					num = 1;

+					while (pos+num < len) {

+						if (chars[pos+num] == '\'')

+							break;

+

+						if (s.Length == 0)

+							return false;

+						if (s[0] != chars[pos+num])

+							return false;

+						s = s.Substring (1);

+

+						num++;

+					}

+					if (pos+num > len)

+						return false;

+

+					pos += num + 1;

+					num = 0;

+					continue;

+				} else if (chars[pos] == '\\') {

+					if (pos+1 >= len)

+						return false;

+

+					if (s[0] != chars[pos+num])

+						return false;

+					s = s.Substring (1);

+					if (s.Length == 0)

+						return false;

+

+					pos++;

+					continue;

+				} else if (chars[pos] == '%') {

+					pos++;

+					continue;

+				}

+

+				if ((pos+num+1 < len) && (chars[pos+num+1] == chars[pos+num])) {

+					num++;

+					continue;

+				}

+

+				int num_parsed = 0;

+

+				switch (chars[pos])

+				{

+				case 'd':

+					if (day != -1)

+						return false;

+					if (num == 0)

+						day = _ParseNumber (s, 2, false, sloppy_parsing, out num_parsed);

+					else if (num == 1)

+						day = _ParseNumber (s, 2, true, sloppy_parsing, out num_parsed);

+					else if (num == 2)

+						dayofweek = _ParseEnum (s, dfi.AbbreviatedDayNames, out num_parsed);

+					else

+					{

+						dayofweek = _ParseEnum (s, dfi.DayNames, out num_parsed);

+						num = 3;

+					}

+					break;

+				case 'M':

+					if (month != -1)

+						return false;

+					if (num == 0)

+						month = _ParseNumber (s, 2, false, sloppy_parsing, out num_parsed);

+					else if (num == 1)

+						month = _ParseNumber (s, 2, true, sloppy_parsing, out num_parsed);

+					else if (num == 2)

+						month = _ParseEnum (s, dfi.AbbreviatedMonthNames , out num_parsed) + 1;

+					else

+					{

+						month = _ParseEnum (s, dfi.MonthNames, out num_parsed) + 1;

+						num = 3;

+					}

+					break;

+				case 'y':

+					if (year != -1)

+						return false;

+					if (num == 0) {

+						year = _ParseNumber (s, 2, false, sloppy_parsing, out num_parsed);

+						year += (year < 30) ? 2000 : 1900;

+					} else if (num < 3) {

+						year = _ParseNumber (s, 2, true, sloppy_parsing, out num_parsed);

+						year += (year < 30) ? 2000 : 1900;

+					} else {

+						year = _ParseNumber (s, 4, false, sloppy_parsing, out num_parsed);

+						num = 3;

+					}

+					

+					if (year < 1 || year > 9999)

+						throw new ArgumentOutOfRangeException ("year", "Valid " + 

+								"values are between 1 and 9999 inclusive");

+					break;

+				case 'h':

+					if (hour != -1)

+						return false;

+					if (num == 0)

+						hour = _ParseNumber (s, 2, false, sloppy_parsing, out num_parsed);

+					else

+					{

+						hour = _ParseNumber (s, 2, true, sloppy_parsing, out num_parsed);

+						num = 1;

+					}

+

+					if (hour >= 12)

+						return false;

+

+					break;

+				case 'H':

+					if ((hour != -1) || (ampm >= 0))

+						return false;

+					if (num == 0)

+						hour = _ParseNumber (s, 2, false, sloppy_parsing, out num_parsed);

+					else

+					{

+						hour = _ParseNumber (s, 2, true, sloppy_parsing, out num_parsed);

+						num = 1;

+					}

+					if (hour >= 24)

+						return false;

+

+					ampm = -2;

+					break;

+				case 'm':

+					if (minute != -1)

+						return false;

+					if (num == 0)

+						minute = _ParseNumber (s, 2, false, sloppy_parsing, out num_parsed);

+					else

+					{

+						minute = _ParseNumber (s, 2, true, sloppy_parsing, out num_parsed);

+						num = 1;

+					}

+					if (minute >= 60)

+						return false;

+

+					break;

+				case 's':

+					if (second != -1)

+						return false;

+					if (num == 0)

+						second = _ParseNumber (s, 2, false, sloppy_parsing, out num_parsed);

+					else

+					{

+						second = _ParseNumber (s, 2, true, sloppy_parsing, out num_parsed);

+						num = 1;

+					}

+					if (second >= 60)

+						return false;

+

+					break;

+				case 'f':

+					if (millisecond != -1)

+						return false;

+					num = Math.Min (num, 6);

+					millisecond = _ParseNumber (s, num+1, true, sloppy_parsing, out num_parsed);

+					if (millisecond >= 1000)

+						return false;

+					break;

+				case 't':

+					if (ampm != -1)

+						return false;

+					if (num == 0)

+					{

+						if (_ParseString (s, 1, dfi.AMDesignator, out num_parsed))

+							ampm = 0;

+						else if (_ParseString (s, 1, dfi.PMDesignator, out num_parsed))

+							ampm = 1;

+						else

+							return false;

+					}

+					else

+					{

+						if (_ParseString (s, 0, dfi.AMDesignator, out num_parsed))

+							ampm = 0;

+						else if (_ParseString (s, 0, dfi.PMDesignator, out num_parsed))

+							ampm = 1;

+						else

+							return false;

+						num = 1;

+					}

+					break;

+				case 'z':

+					if (tzsign != -1)

+						return false;

+					if (s[0] == '+')

+						tzsign = 0;

+					else if (s[0] == '-')

+						tzsign = 1;

+					else

+						return false;

+					s = s.Substring (1);

+					if (num == 0)

+						tzoffset = _ParseNumber (s, 2, false, sloppy_parsing, out num_parsed);

+					else if (num == 1)

+						tzoffset = _ParseNumber (s, 2, true, sloppy_parsing, out num_parsed);

+					else

+					{

+						tzoffset = _ParseNumber (s, 2, true, sloppy_parsing, out num_parsed);

+						if (num_parsed < 0)

+							return false;

+						s = s.Substring (num_parsed);

+						if (!_ParseString (s, 0, dfi.TimeSeparator, out num_parsed))

+							return false;

+						s = s.Substring (num_parsed);

+						tzoffmin = _ParseNumber (s, 2, true, sloppy_parsing, out num_parsed);

+						if (num_parsed < 0)

+							return false;

+						num = 2;

+					}

+					break;

+				case ':':

+					if (!_ParseString (s, 0, dfi.TimeSeparator, out num_parsed))

+						return false;

+					break;

+				case '/':

+					if (!_ParseString (s, 0, dfi.DateSeparator, out num_parsed))

+						return false;

+					break;

+				default:

+					if (s[0] != chars[pos])

+						return false;

+					num = 0;

+					num_parsed = 1;

+					break;

+				}

+

+				if (num_parsed < 0)

+					return false;

+

+				s = s.Substring (num_parsed);

+

+				pos = pos + num + 1;

+				num = 0;

+			}

+

+			if (hour == -1)

+				hour = 0;

+			if (minute == -1)

+				minute = 0;

+			if (second == -1)

+				second = 0;

+			if (millisecond == -1)

+				millisecond = 0;

+

+			// If no date was given

+			if ((day == -1) && (month == -1) && (year == -1)) {

+				if ((style & DateTimeStyles.NoCurrentDateDefault) != 0) {

+					day = 1;

+					month = 1;

+					year = 1;

+				} else {

+					day = Today.Day;

+					month = Today.Month;

+					year = Today.Year;

+				}

+			}

+

+			if (day == -1)

+				day = 1;

+			if (month == -1)

+				month = 1;

+			if (year == -1) {

+				if ((style & DateTimeStyles.NoCurrentDateDefault) != 0)

+					year = 1;

+				else

+					year = Today.Year;

+			}

+

+			if (ampm == 1)

+				hour = hour + 12;

+

+			result = new DateTime (year, month, day, hour, minute, second, millisecond);

+

+			if ((dayofweek != -1) && (dayofweek != (int) result.DayOfWeek))

+				throw new FormatException (Locale.GetText ("String was not recognized as valid DateTime because the day of week was incorrect."));

+

+			// If no timezone was specified, default to the local timezone.

+			TimeSpan utcoffset;

+			if (useutc)

+				utcoffset = new TimeSpan (0, 0, 0);

+			else if (tzsign == -1) {

+				TimeZone tz = TimeZone.CurrentTimeZone;

+				utcoffset = tz.GetUtcOffset (result);

+			} else {

+				if ((style & DateTimeStyles.AdjustToUniversal) != 0)

+					use_localtime = false;

+

+				if (tzoffmin == -1)

+					tzoffmin = 0;

+				if (tzoffset == -1)

+					tzoffset = 0;

+				if (tzsign == 1)

+					tzoffset = -tzoffset;

+

+				utcoffset = new TimeSpan (tzoffset, tzoffmin, 0);

+			}

+

+			long newticks = (result.ticks - utcoffset).Ticks;

+

+			result = new DateTime (use_localtime, newticks);

+

+			return true;

+		}

+

+

+		public static DateTime ParseExact (string s, string format,

+						   IFormatProvider fp, DateTimeStyles style)

+		{

+			string[] formats;

+

+			formats = new string [1];

+			formats[0] = format;

+

+			return ParseExact (s, formats, fp, style);

+		}

+

+		public static DateTime ParseExact (string s, string[] formats,

+						   IFormatProvider fp,

+						   DateTimeStyles style)

+		{

+			DateTimeFormatInfo dfi = DateTimeFormatInfo.GetInstance (fp);

+

+			if (s == null)

+				throw new ArgumentNullException (Locale.GetText ("s is null"));

+			if (formats.Length == 0)

+				throw new ArgumentNullException (Locale.GetText ("format is null"));

+

+			int i;

+			for (i = 0; i < formats.Length; i++)

+			{

+				DateTime result;

+

+				if (_DoParse (s, formats[i], true, out result, dfi, style))

+					return result;

+			}

+

+			throw new FormatException ();

+		}

+		

+		public TimeSpan Subtract(DateTime dt)

+		{   

+			return new TimeSpan(ticks.Ticks) - dt.ticks;

+		}

+

+		public DateTime Subtract(TimeSpan ts)

+		{

+			TimeSpan newticks;

+

+			newticks = (new TimeSpan (ticks.Ticks)) - ts;

+			return new DateTime(true,newticks);

+		}

+

+		public long ToFileTime()

+		{

+			if(ticks.Ticks < w32file_epoch) {

+				throw new ArgumentOutOfRangeException("file time is not valid");

+			}

+			

+			return(ticks.Ticks - w32file_epoch);

+		}

+

+		public string ToLongDateString()

+		{

+			return ToString ("D");

+		}

+

+		public string ToLongTimeString()

+		{

+			return ToString ("T");

+		}

+

+		[MonoTODO]

+		public double ToOADate()

+		{

+			// TODO implement me 

+			return 0;

+		}

+

+		public string ToShortDateString()

+		{

+			return ToString ("d");

+		}

+

+		public string ToShortTimeString()

+		{

+			return ToString ("t");

+		}

+		

+		public override string ToString ()

+		{

+			return ToString ("G", null);

+		}

+

+		public string ToString (IFormatProvider fp)

+		{

+			return ToString (null, fp);

+		}

+

+		public string ToString (string format)

+		{

+			return ToString (format, null);

+		}

+

+		internal static string _GetStandardPattern (char format, DateTimeFormatInfo dfi, out bool useutc)

+		{

+			String pattern;

+

+			useutc = false;

+

+			switch (format)

+			{

+			case 'd':

+				pattern = dfi.ShortDatePattern;

+				break;

+			case 'D':

+				pattern = dfi.LongDatePattern;

+				break;

+			case 'f':

+				pattern = dfi.LongDatePattern + " " + dfi.ShortTimePattern;

+				break;

+			case 'F':

+				pattern = dfi.FullDateTimePattern;

+				break;

+			case 'g':

+				pattern = dfi.ShortDatePattern + " " + dfi.ShortTimePattern;

+				break;

+			case 'G':

+				pattern = dfi.ShortDatePattern + " " + dfi.LongTimePattern;

+				break;

+			case 'm':

+			case 'M':

+				pattern = dfi.MonthDayPattern;

+				break;

+			case 'r':

+			case 'R':

+				pattern = dfi.RFC1123Pattern;

+				// commented by LP 09/jun/2002, rfc 1123 pattern is always in GMT

+				// useutc= true;

+				break;

+			case 's':

+				pattern = dfi.SortableDateTimePattern;

+				break;

+			case 't':

+				pattern = dfi.ShortTimePattern;

+				break;

+			case 'T':

+				pattern = dfi.LongTimePattern;

+				break;

+			case 'u':

+				pattern = dfi.UniversalSortableDateTimePattern;

+				useutc = true;

+				break;

+			case 'U':

+				pattern = dfi.LongDatePattern + " " + dfi.LongTimePattern;

+				useutc = true;

+				break;

+			case 'y':

+			case 'Y':

+				pattern = dfi.YearMonthPattern;

+				break;

+			default:

+				pattern = null;

+				break;

+			}

+

+			return pattern;

+		}

+

+		internal string _ToString (string format, DateTimeFormatInfo dfi)

+		{

+			String str = null, result = null;

+			char[] chars = format.ToCharArray ();

+			int len = format.Length, pos = 0, num = 0;

+

+			TimeZone tz = TimeZone.CurrentTimeZone;

+			TimeSpan utcoffset = tz.GetUtcOffset (this);

+

+			while (pos < len)

+			{

+				if (chars[pos] == '\'') {

+					num = 1;

+					while (pos+num <= len) {

+						if (chars[pos+num] == '\'')

+							break;

+

+						result += chars[pos+num];

+						num++;

+					}

+					if (pos+num > len)

+						throw new FormatException (Locale.GetText ("The specified format is invalid"));

+

+					pos += num+1;

+					num = 0;

+					continue;

+				} else if (chars[pos] == '\\') {

+					if (pos+1 >= len)

+						throw new FormatException (Locale.GetText ("The specified format is invalid"));

+

+					result += chars[pos+1];

+					pos += 2;

+					continue;

+				} else if (chars[pos] == '%') {

+					pos++;

+					continue;

+				}

+

+				if ((pos+num+1 < len) && (chars[pos+num+1] == chars[pos+num])) {

+					num++;

+					continue;

+				}

+

+				switch (chars[pos])

+				{

+				case 'd':

+					if (num == 0)

+						str = Day.ToString ("d");

+					else if (num == 1)

+						str = Day.ToString ("d02");

+					else if (num == 2)

+						str = dfi.GetAbbreviatedDayName (DayOfWeek);

+					else {

+						str = dfi.GetDayName (DayOfWeek);

+						num = 3;

+					}

+					break;

+				case 'M':

+					if (num == 0)

+						str = Month.ToString ("d");

+					else if (num == 1)

+						str = Month.ToString ("d02");

+					else if (num == 2)

+						str = dfi.GetAbbreviatedMonthName (Month);

+					else {

+						str = dfi.GetMonthName (Month);

+						num = 3;

+					}

+					break;

+				case 'y':

+					if (num == 0) {

+						int shortyear = Year % 100;

+						str = shortyear.ToString ("d");

+					} else if (num == 1) {

+						int shortyear = Year % 100;

+						str = shortyear.ToString ("d02");

+					} else {

+						str = Year.ToString ("d");

+						num = 3;

+					}

+					break;

+				case 'g':

+					// FIXME

+					break;

+				case 'f':

+					num = Math.Min (num, 6);

+

+					long ms = (long) Millisecond;

+					long exp = 10;

+					for (int i = 0; i < num; i++)

+						exp = exp * 10;

+					long maxexp = TimeSpan.TicksPerMillisecond;

+

+					exp = Math.Min (exp, maxexp);

+					ms = ms * exp / maxexp;

+

+					String prec = (num+1).ToString ("d02");

+					str = ms.ToString (String.Concat ("d", prec));

+

+					break;

+				case 'h':

+					if (num == 0) {

+						int shorthour = Hour % 12;

+						str = shorthour.ToString ("d");

+					} else {

+						int shorthour = Hour % 12;

+						str = shorthour.ToString ("d02");

+						num = 1;

+					}

+					break;

+				case 'H':

+					if (num == 0)

+						str = Hour.ToString ("d");

+					else {

+						str = Hour.ToString ("d02");

+						num = 1;

+					}

+					break;

+				case 'm':

+					if (num == 0)

+						str = Minute.ToString ("d");

+					else {

+						str = Minute.ToString ("d02");

+						num = 1;

+					}

+					break;

+				case 's':

+					if (num == 0)

+						str = Second.ToString ("d");

+					else {

+						str = Second.ToString ("d02");

+						num = 1;

+					}

+					break;

+				case 't':

+					if (Hour < 12)

+						str = dfi.AMDesignator;

+					else

+						str = dfi.PMDesignator;

+

+					if (num == 0)

+						str = str.Substring (0,1);

+					else

+						num = 1;

+					break;

+				case 'z':

+					if (num == 0) {

+						int offset = utcoffset.Hours;

+						str = offset.ToString ("d");

+						if (offset > 0)

+							str = String.Concat ("+", str);

+					} else if (num == 1) {

+						int offset = utcoffset.Hours;

+						str = offset.ToString ("d02");

+						if (offset > 0)

+							str = String.Concat ("+", str);

+					} else if (num == 2) {

+						int offhour = utcoffset.Hours;

+						int offminute = utcoffset.Minutes;

+						str = offhour.ToString ("d02");

+						str = String.Concat (str, dfi.TimeSeparator);

+						str = String.Concat (str, offminute.ToString ("d02"));

+						if (offhour > 0)

+							str = String.Concat ("+", str);

+						num = 2;

+					}

+					break;

+				case ':':

+					str = dfi.TimeSeparator;

+					num = 0;

+					break;

+				case '/':

+					str = dfi.DateSeparator;

+					num = 0;

+					break;

+				default:

+					str = String.Concat (chars [pos]);

+					num = 0;

+					break;

+				}

+

+				result = String.Concat (result, str);

+						

+				pos += num + 1;

+				num = 0;

+			}

+

+			return result;

+		}

+

+		public string ToString (string format, IFormatProvider fp)

+		{

+			DateTimeFormatInfo dfi = DateTimeFormatInfo.GetInstance(fp);

+

+			if (format == null)

+				format = dfi.FullDateTimePattern;

+

+			bool useutc = false;

+

+			if (format.Length == 1) {

+				char fchar = (format.ToCharArray ())[0];

+				format = _GetStandardPattern (fchar, dfi, out useutc);

+			}

+

+			if (useutc)

+				return this.ToUniversalTime ()._ToString (format, dfi);

+			else

+				return this._ToString (format, dfi);

+		}

+

+		public DateTime ToLocalTime()

+		{

+			TimeZone tz = TimeZone.CurrentTimeZone;

+

+			TimeSpan offset = tz.GetUtcOffset (this);

+

+			return new DateTime (true, ticks + offset);

+		}

+

+		public DateTime ToUniversalTime()

+		{

+			TimeZone tz = TimeZone.CurrentTimeZone;

+

+			TimeSpan offset = tz.GetUtcOffset (this);

+

+			return new DateTime (true, ticks - offset);

+		}

+

+		/*  OPERATORS */

+

+		public static DateTime operator +(DateTime d, TimeSpan t)

+		{

+			return new DateTime (true, d.ticks + t);

+		}

+

+		public static bool operator ==(DateTime d1, DateTime d2)

+		{

+			return (d1.ticks == d2.ticks);

+		}

+

+		public static bool operator >(DateTime t1,DateTime t2)

+		{

+			return (t1.ticks > t2.ticks);

+		}

+

+		public static bool operator >=(DateTime t1,DateTime t2)

+		{

+			return (t1.ticks >= t2.ticks);

+		}

+

+		public static bool operator !=(DateTime d1, DateTime d2)

+		{

+			return (d1.ticks != d2.ticks);

+		}

+

+		public static bool operator <(DateTime t1,	DateTime t2)

+		{

+			return (t1.ticks < t2.ticks );

+		}

+

+		public static bool operator <=(DateTime t1,DateTime t2)

+		{

+			return (t1.ticks <= t2.ticks);

+		}

+

+		public static TimeSpan operator -(DateTime d1,DateTime d2)

+		{

+			return new TimeSpan((d1.ticks - d2.ticks).Ticks);

+		}

+

+		public static DateTime operator -(DateTime d,TimeSpan t)

+		{

+			return new DateTime (true, d.ticks - t);

+		}

+

+		bool IConvertible.ToBoolean(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+		

+		byte IConvertible.ToByte(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+

+		char IConvertible.ToChar(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+

+		// TODO Implement me

+		[MonoTODO]

+		public System.DateTime ToDateTime(IFormatProvider provider)

+		{

+			return new System.DateTime(true,this.ticks);

+		} 

+		

+		decimal IConvertible.ToDecimal(IFormatProvider provider)

+		{

+			 throw new InvalidCastException();

+		}

+

+		double IConvertible.ToDouble(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+

+		Int16 IConvertible.ToInt16(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+

+		Int32 IConvertible.ToInt32(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+

+		Int64 IConvertible.ToInt64(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+

+		[CLSCompliant(false)]

+		SByte IConvertible.ToSByte(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+

+		Single IConvertible.ToSingle(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+

+		object IConvertible.ToType(Type conversionType,IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+

+		UInt16 IConvertible.ToUInt16(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+		

+		[CLSCompliant(false)]

+		UInt32 IConvertible.ToUInt32(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+

+		[CLSCompliant(false)]

+		UInt64 IConvertible.ToUInt64(IFormatProvider provider)

+		{

+			throw new InvalidCastException();

+		}

+	}

+}

+

+namespace System

+{

+	public enum DayOfWeek

+	{

+		Sunday,

+		Monday,

+		Tuesday,

+		Wednesday,

+		Thursday,

+		Friday,

+		Saturday

+	}

+}

diff --git a/mcs/class/corlib/System/Decimal.cs b/mcs/class/corlib/System/Decimal.cs
new file mode 100644
index 00000000000..74c8e64d3c9
--- /dev/null
+++ b/mcs/class/corlib/System/Decimal.cs
@@ -0,0 +1,1115 @@
+//

+// System.Decimal.cs

+//

+// Represents a floating-point decimal data type with up to 29 

+// significant digits, suitable for financial and commercial calculations.

+//

+// Author:

+//   Martin Weindel (martin.weindel@t-online.de)

+//

+// (C) 2001 Martin Weindel

+//

+

+using System;

+using System.Globalization;

+using System.Text;

+using System.Runtime.CompilerServices;

+#if MSTEST

+using System.Runtime.InteropServices;

+#endif

+

+

+namespace System

+{

+    /// <summary>

+    /// Represents a floating-point decimal data type with up to 29 significant

+    /// digits, suitable for financial and commercial calculations

+    /// </summary>

+	[Serializable]

+    public struct Decimal: IComparable, IFormattable, IConvertible

+    {

+        public static readonly Decimal MinValue = new Decimal(-1, -1, -1, true, 0);

+        public static readonly Decimal MaxValue = new Decimal(-1, -1, -1, false, 0);

+        public static readonly Decimal MinusOne = new Decimal(1, 0, 0, true, 0);

+        public static readonly Decimal One = new Decimal(1, 0, 0, false, 0);

+        public static readonly Decimal Zero = new Decimal(0, 0, 0, false, 0);

+

+        // maximal decimal value as double

+        private static readonly double dDecMaxValue = 7.922816251426433759354395033e28;

+        // epsilon decimal value as double

+        private static readonly double dDecEpsilon = 0.5e-28;  // == 0.5 * 1 / 10^28

+

+        // some constants

+        private const int DECIMAL_DIVIDE_BY_ZERO = 5;

+        private const uint MAX_SCALE = 28;

+        private const int iMAX_SCALE = 28;

+        private const uint SIGN_FLAG = 0x80000000;

+        private const uint SCALE_MASK = 0x00FF0000;

+        private const int SCALE_SHIFT = 16;

+        private const uint RESERVED_SS32_BITS = 0x7F00FFFF;

+

+        // internal representation of decimal

+        private uint ss32;

+        private uint hi32;

+        private uint lo32;

+        private uint mid32;

+

+        // LAMESPEC: this constructor is missing in specification

+        // but exists in MS Csharp implementation 

+        public Decimal(int lo, int mid, int hi, bool isNegative, byte scale)

+        {

+            unchecked 

+            {

+                lo32 = (uint) lo;

+                mid32 = (uint) mid;

+                hi32 = (uint) hi;

+            

+                if (scale > MAX_SCALE) 

+                {

+			throw new ArgumentOutOfRangeException (Locale.GetText ("scale must be between 0 and 28"));

+                }

+

+                ss32 = scale;

+                ss32 <<= SCALE_SHIFT;

+                if (isNegative) ss32 |= SIGN_FLAG;

+            }

+        }

+

+        public Decimal(int val) 

+        {

+            unchecked 

+            {

+                hi32 = mid32 = 0;

+                if (val < 0) 

+                {

+                    ss32 = SIGN_FLAG;

+                    lo32 = ((uint)~val) + 1;

+                }

+                else 

+                {

+                    ss32 = 0;

+                    lo32 = (uint) val;

+                }

+            }

+        }

+

+        [CLSCompliant(false)]

+        public Decimal(uint val) 

+        {

+            lo32 = val;

+            ss32 = hi32 = mid32 = 0;

+        }

+

+        public Decimal(long val) 

+        {

+            unchecked 

+            {

+                hi32 = 0;

+                if (val < 0) 

+                {

+                    ss32 = SIGN_FLAG;

+                    ulong u = ((ulong)~val) + 1;

+                    lo32 = (uint)u;

+                    mid32 = (uint)(u >> 32);

+                }

+                else 

+                {

+                    ss32 = 0;

+                    ulong u = (ulong)val;

+                    lo32 = (uint)u;

+                    mid32 = (uint)(u >> 32);

+                }

+            }

+        }

+

+        [CLSCompliant(false)]

+        public Decimal(ulong uval) 

+        {

+            unchecked 

+            {

+                ss32 = hi32 = 0;

+                lo32 = (uint)uval;

+                mid32 = (uint)(uval >> 32);

+            }

+        }

+

+        public Decimal(float val) 

+        {

+            if (double2decimal(out this, val, 7) != 0) 

+            {

+                throw new OverflowException();

+            }

+        }

+

+        public Decimal(double val) 

+        {

+            if (double2decimal(out this, val, 15) != 0) 

+            {

+                throw new OverflowException();

+            }

+        }

+

+        public Decimal(int[] bits) 

+        {

+            if (bits == null) 

+            {

+		throw new ArgumentNullException(Locale.GetText ("Bits is a null reference"));

+            }

+

+            if (bits.GetLength(0) != 4) 

+            {

+                throw new ArgumentException(Locale.GetText ("bits does not contain four values"));

+            }

+

+            unchecked {

+                lo32 = (uint) bits[0];

+                mid32 = (uint) bits[1];

+                hi32 = (uint) bits[2];

+                ss32 = (uint) bits[3];

+                byte scale = (byte)(ss32 >> SCALE_SHIFT);

+                if (scale > MAX_SCALE || (ss32 & RESERVED_SS32_BITS) != 0) 

+                {

+                    throw new ArgumentException(Locale.GetText ("Invalid bits[3]"));

+                }

+            }

+        }

+

+        public static int[] GetBits(Decimal d) 

+        {

+            unchecked 

+            {

+                return new int[] { (int)d.lo32, (int)d.mid32, (int)d.hi32, 

+                                     (int)d.ss32 };

+            }

+        }

+

+        public static Decimal Negate(Decimal d) 

+        {

+            d.ss32 ^= SIGN_FLAG;

+            return d;

+        }

+

+

+        public static Decimal Add(Decimal d1, Decimal d2) 

+        {

+            if (decimalIncr(ref d1, ref d2) == 0)

+                return d1;

+            else

+                throw new OverflowException(Locale.GetText ("Overflow on adding decimal number"));

+        }

+

+        public static Decimal Subtract(Decimal d1, Decimal d2) 

+        {

+            d2.ss32 ^= SIGN_FLAG;

+	    int result = decimalIncr(ref d1, ref d2);

+            if (result == 0)

+                return d1;

+            else

+                throw new OverflowException(Locale.GetText ("Overflow on subtracting decimal numbers ("+result+")"));

+        }

+

+        public override int GetHashCode() 

+        {

+            return (int)lo32;

+        }

+

+        public static Decimal operator +(Decimal d1, Decimal d2)

+        {

+            return Add(d1, d2);

+        }

+

+        public static Decimal operator --(Decimal d) 

+        {

+            return Add(d, MinusOne);

+        }

+

+        public static Decimal operator ++(Decimal d) 

+        {

+            return Add(d, One);

+        }

+

+        public static Decimal operator -(Decimal d1, Decimal d2) 

+        {

+            return Subtract(d1, d2);

+        }

+

+        public static Decimal operator -(Decimal d) 

+        {

+            return Negate(d);

+        }

+

+        public static Decimal operator +(Decimal d) 

+        {

+            return d;

+        }

+

+        public static Decimal operator *(Decimal d1, Decimal d2)

+        {

+            return Multiply(d1, d2);

+        }

+

+        public static Decimal operator /(Decimal d1, Decimal d2) 

+        {

+            return Divide(d1, d2);

+        }

+

+        public static Decimal operator %(Decimal d1, Decimal d2) 

+        {

+            return Remainder(d1, d2);

+        }

+

+        public static explicit operator byte(Decimal val)

+        {

+            ulong result;

+

+            if (decimal2UInt64(ref val, out result) != 0)

+            {

+                throw new System.OverflowException();

+            }

+

+            if (result > Byte.MaxValue || result < Byte.MinValue) 

+            {

+                throw new System.OverflowException();

+            }

+

+            return (byte) result;

+        }

+

+	[CLSCompliant(false)]

+        public static explicit operator sbyte(Decimal val) 

+        {

+            long result;

+

+            if (decimal2Int64(ref val, out result) != 0)

+            {

+                throw new System.OverflowException();

+            }

+

+            if (result > SByte.MaxValue || result < SByte.MinValue) 

+            {

+                throw new System.OverflowException();

+            }

+

+            return (sbyte) result;

+        }

+

+        public static explicit operator char(Decimal val) 

+        {

+            ulong result;

+

+            if (decimal2UInt64(ref val, out result) != 0)

+            {

+                throw new System.OverflowException();

+            }

+

+            if (result > Char.MaxValue || result < Char.MinValue) 

+            {

+                throw new System.OverflowException();

+            }

+

+            return (char) result;

+        }

+

+        public static explicit operator short(Decimal val) 

+        {

+            long result;

+

+            if (decimal2Int64(ref val, out result) != 0)

+            {

+                throw new System.OverflowException();

+            }

+

+            if (result > Int16.MaxValue || result < Int16.MinValue) 

+            {

+                throw new System.OverflowException();

+            }

+

+            return (short) result;

+        }

+

+	[CLSCompliant(false)]

+        public static explicit operator ushort(Decimal val) 

+        {

+            ulong result;

+

+            if (decimal2UInt64(ref val, out result) != 0)

+            {

+                throw new System.OverflowException();

+            }

+

+            if (result > UInt16.MaxValue || result < UInt16.MinValue) 

+            {

+                throw new System.OverflowException();

+            }

+

+            return (ushort) result;

+        }

+

+        public static explicit operator int(Decimal val) 

+        {

+            long result;

+

+            if (decimal2Int64(ref val, out result) != 0)

+            {

+                throw new System.OverflowException();

+            }

+

+            if (result > Int32.MaxValue || result < Int32.MinValue) 

+            {

+                throw new System.OverflowException();

+            }

+

+            return (int) result;

+        }

+

+	[CLSCompliant(false)]

+        public static explicit operator uint(Decimal val) 

+        {

+            ulong result;

+

+            if (decimal2UInt64(ref val, out result) != 0)

+            {

+                throw new System.OverflowException();

+            }

+

+            if (result > UInt32.MaxValue || result < UInt32.MinValue) 

+            {

+                throw new System.OverflowException();

+            }

+

+            return (uint) result;

+        }

+

+        public static explicit operator long(Decimal val) 

+        {

+            long result;

+

+            if (decimal2Int64(ref val, out result) != 0)

+            {

+                throw new System.OverflowException();

+            }

+

+            return result;

+        }

+

+	[CLSCompliant(false)]

+        public static explicit operator ulong(Decimal val) 

+        {

+            ulong result;

+

+            if (decimal2UInt64(ref val, out result) != 0)

+            {

+                throw new System.OverflowException();

+            }

+

+            return result;

+        }

+

+        public static implicit operator Decimal(byte val) 

+        {

+            return new Decimal(val);

+        }

+

+	[CLSCompliant(false)]

+        public static implicit operator Decimal(sbyte val) 

+        {

+            return new Decimal(val);

+        }

+

+        public static implicit operator Decimal(short val) 

+        {

+            return new Decimal(val);

+        }

+

+	[CLSCompliant(false)]

+        public static implicit operator Decimal(ushort val) 

+        {

+            return new Decimal(val);

+        }

+

+        public static implicit operator Decimal(char val) 

+        {

+            return new Decimal(val);

+        }

+

+        public static implicit operator Decimal(int val) 

+        {

+            return new Decimal(val);

+        }

+

+	[CLSCompliant(false)]

+        public static implicit operator Decimal(uint val) 

+        {

+            return new Decimal(val);

+        }

+

+        public static implicit operator Decimal(long val) 

+        {

+            return new Decimal(val);

+        }

+

+	[CLSCompliant(false)]

+        public static implicit operator Decimal(ulong val) 

+        {

+            return new Decimal(val);

+        }

+

+        public static explicit operator Decimal(float val) 

+        {

+            return new Decimal(val);

+        }

+

+        public static explicit operator Decimal(double val)

+        {

+            return new Decimal(val);

+        }

+

+        public static explicit operator float(Decimal val)

+        {

+            return (float) (double) val;

+        }

+

+        public static explicit operator double(Decimal val)

+        {

+            return decimal2double(ref val);

+        }

+

+

+        public static bool operator !=(Decimal d1, Decimal d2) 

+        {

+            return !Equals(d1, d2);

+        }

+

+        public static bool operator ==(Decimal d1, Decimal d2) 

+        {

+            return Equals(d1, d2);

+        }

+

+        public static bool operator >(Decimal d1, Decimal d2) 

+        {

+            return decimalCompare(ref d1, ref d2) > 0;

+        }

+

+        public static bool operator >=(Decimal d1, Decimal d2) 

+        {

+            return decimalCompare(ref d1, ref d2) >= 0;

+        }

+

+        public static bool operator <(Decimal d1, Decimal d2) 

+        {

+            return decimalCompare(ref d1, ref d2) < 0;

+        }

+

+        public static bool operator <=(Decimal d1, Decimal d2) 

+        {

+            return decimalCompare(ref d1, ref d2) <= 0;

+        }

+

+        public static bool Equals(Decimal d1, Decimal d2) 

+        {

+            return decimalCompare(ref d1, ref d2) == 0;

+        }

+

+        public override bool Equals(object o) 

+        {

+            if (!(o is Decimal))

+                return false;

+

+            return Equals((Decimal) o, this);

+        }

+

+        public static Decimal Floor(Decimal d) 

+        {

+            decimalFloorAndTrunc(ref d, 1);

+            return d;

+        }

+

+        public static Decimal Truncate(Decimal d) 

+        {

+            decimalFloorAndTrunc(ref d, 0);

+            return d;

+        }

+

+        public static Decimal Round(Decimal d, int decimals) 

+        {

+            if (decimals < 0 || decimals > iMAX_SCALE) 

+            {

+                throw new ArgumentOutOfRangeException(Locale.GetText ("decimals must be between 0 and 28"));

+            }

+

+            decimalRound(ref d, decimals);

+            return d;

+        }

+

+        public static Decimal Multiply(Decimal d1, Decimal d2) 

+        {

+            if (decimalMult(ref d1, ref d2) != 0) 

+            {

+                throw new OverflowException();

+            }

+

+            return d1;

+        }

+

+        public static Decimal Divide(Decimal d1, Decimal d2) 

+        {

+            if (d1 == 0 && d2 != 0) return 0;

+

+            Decimal d3;

+            int rc = decimalDiv(out d3, ref d1, ref d2);

+

+            if (rc != 0)

+            {

+                if (rc == DECIMAL_DIVIDE_BY_ZERO)

+                    throw new DivideByZeroException();

+                else 

+                    throw new OverflowException();

+            }

+

+            return d3;

+        }

+

+        public static Decimal Remainder(Decimal d1, Decimal d2) 

+        {

+            Decimal d3;

+            int rc = decimalIntDiv(out d3, ref d1, ref d2);

+

+            if (rc != 0)

+            {

+                if (rc == DECIMAL_DIVIDE_BY_ZERO)

+                    throw new DivideByZeroException();

+                else 

+                    throw new OverflowException();

+            }

+

+            return d1 - d3 * d2;

+        }

+

+        public static int Compare(Decimal d1, Decimal d2) 

+        {

+            return decimalCompare(ref d1, ref d2);

+        }

+

+        public int CompareTo(object val)

+        {

+	    if (val == null)

+		return 1;

+	    

+            if (!(val is Decimal))

+                throw new ArgumentException (Locale.GetText ("Value is not a System.Decimal"));

+

+            Decimal d2 = (Decimal)val;

+            return decimalCompare(ref this, ref d2);

+        }

+

+        public static Decimal Parse(string s) 

+        {

+            return Parse(s, NumberStyles.Number, null);

+        }

+

+        public static Decimal Parse(string s, NumberStyles style) 

+        {

+            return Parse(s, style, null);

+        }

+

+        public static Decimal Parse(string s, IFormatProvider provider) 

+        {

+            return Parse(s, NumberStyles.Number, provider);

+        }

+

+        private static NumberFormatInfo GetNumberFormatInfoFromIFormatProvider(IFormatProvider provider)

+        {

+            NumberFormatInfo nfi = null;

+

+            if (provider != null)

+            {

+                nfi = (NumberFormatInfo) provider.GetFormat(typeof(System.Decimal));

+                if (nfi == null && provider is NumberFormatInfo)

+                {

+                    nfi = (NumberFormatInfo) provider;

+                }

+            }

+

+            if (nfi == null)

+            {

+                nfi = NumberFormatInfo.CurrentInfo;

+            }

+

+            return nfi;

+        }

+

+        private static string stripStyles(string s, NumberStyles style, NumberFormatInfo nfi, 

+            out int decPos, out bool isNegative, out bool expFlag, out int exp)

+        {

+            string invalidChar = Locale.GetText ("Invalid character at position ");

+            string invalidExponent = Locale.GetText ("Invalid exponent");

+            isNegative = false;

+            expFlag = false;

+            exp = 0;

+            decPos = -1;

+

+            bool hasSign = false;

+            bool hasOpeningParentheses = false;

+            bool hasDecimalPoint = false;

+            bool allowedLeadingWhiteSpace = ((style & NumberStyles.AllowLeadingWhite) != 0);

+            bool allowedTrailingWhiteSpace = ((style & NumberStyles.AllowTrailingWhite) != 0);

+            bool allowedLeadingSign = ((style & NumberStyles.AllowLeadingSign) != 0);

+            bool allowedTrailingSign = ((style & NumberStyles.AllowTrailingSign) != 0);

+            bool allowedParentheses = ((style & NumberStyles.AllowParentheses) != 0);

+            bool allowedThousands = ((style & NumberStyles.AllowThousands) != 0);

+            bool allowedDecimalPoint = ((style & NumberStyles.AllowDecimalPoint) != 0);

+            bool allowedExponent = ((style & NumberStyles.AllowExponent) != 0);

+

+            /* get rid of currency symbol */

+            bool hasCurrency = false;

+            if ((style & NumberStyles.AllowCurrencySymbol) != 0)

+            {

+                int index = s.IndexOf(nfi.CurrencySymbol);

+                if (index >= 0) 

+                {

+                    s = s.Remove(index, nfi.CurrencySymbol.Length);

+                    hasCurrency = true;

+                }

+            }

+

+            string decimalSep = (hasCurrency) ? nfi.CurrencyDecimalSeparator : nfi.NumberDecimalSeparator;

+            string groupSep = (hasCurrency) ? nfi.CurrencyGroupSeparator : nfi.NumberGroupSeparator;

+

+            int pos = 0;

+            int len = s.Length;

+

+            StringBuilder sb = new StringBuilder(len);

+

+            // leading

+            while (pos < len) 

+            {

+                char ch = s[pos];

+                if (Char.IsDigit(ch)) 

+                {

+                    break; // end of leading

+                }

+                else if (allowedLeadingWhiteSpace && Char.IsWhiteSpace(ch)) 

+                {

+                    pos++;

+                }

+                else if (allowedParentheses && ch == '(' && !hasSign && !hasOpeningParentheses) 

+                {

+                    hasOpeningParentheses = true;

+                    hasSign = true;

+                    isNegative = true;

+                    pos++;

+                }

+                else if (allowedLeadingSign && ch == nfi.NegativeSign[0] && !hasSign) 

+                {

+                    int slen = nfi.NegativeSign.Length;

+                    if (slen == 1 || s.IndexOf(nfi.NegativeSign, pos, slen) == pos) 

+                    {

+                        hasSign = true;

+                        isNegative = true;

+                        pos += slen;

+                    }

+                }

+                else if (allowedLeadingSign && ch == nfi.PositiveSign[0] && !hasSign) 

+                {

+                    int slen = nfi.PositiveSign.Length;

+                    if (slen == 1 || s.IndexOf(nfi.PositiveSign, pos, slen) == pos) 

+                    {

+                        hasSign = true;

+                        pos += slen;

+                    }

+                }

+                else if (allowedDecimalPoint && ch == decimalSep[0])

+                {

+                    int slen = decimalSep.Length;

+                    if (slen != 1 && s.IndexOf(decimalSep, pos, slen) != pos) 

+                    {

+                        throw new FormatException(invalidChar + pos);

+                    }

+                    break;

+                }

+                else

+                {

+                    throw new FormatException(invalidChar + pos);

+                }

+            }

+

+            if (pos == len)

+		throw new FormatException(Locale.GetText ("No digits found"));

+

+            // digits 

+            while (pos < len)

+            {

+                char ch = s[pos];

+                if (Char.IsDigit(ch)) 

+                {

+                    sb.Append(ch);

+                    pos++;

+                }

+                else if (allowedThousands && ch == groupSep[0]) 

+                {

+                    int slen = groupSep.Length;

+                    if (slen != 1 && s.IndexOf(groupSep, pos, slen) != pos) 

+                    {

+                        throw new FormatException(invalidChar + pos);

+                    }

+                    pos += slen;

+                }

+                else if (allowedDecimalPoint && ch == decimalSep[0] && !hasDecimalPoint)

+                {

+                    int slen = decimalSep.Length;

+                    if (slen == 1 || s.IndexOf(decimalSep, pos, slen) == pos) 

+                    {

+                        decPos = sb.Length;

+                        hasDecimalPoint = true;

+                        pos += slen;

+                    }

+                }

+                else

+                {

+                    break;

+                }

+            }

+

+            // exponent

+            if (pos < len)

+            {

+                char ch = s[pos];

+                if (allowedExponent && Char.ToUpper(ch) == 'E')

+                {

+                    expFlag = true;

+                    pos++; if (pos >= len) throw new FormatException(invalidExponent);

+                    ch = s[pos];

+                    bool isNegativeExp = false;

+                    if (ch == nfi.PositiveSign[0])

+                    {

+                        int slen = nfi.PositiveSign.Length;

+                        if (slen == 1 || s.IndexOf(nfi.PositiveSign, pos, slen) == pos) 

+                        {

+                            pos += slen;  if (pos >= len) throw new FormatException(invalidExponent);

+                        }

+                    }

+                    else if (ch == nfi.NegativeSign[0])

+                    {

+                        int slen = nfi.NegativeSign.Length;

+                        if (slen == 1 || s.IndexOf(nfi.NegativeSign, pos, slen) == pos) 

+                        {

+                            pos += slen; if (pos >= len) throw new FormatException(invalidExponent);

+                            isNegativeExp = true;

+                        }

+                    }

+                    ch = s[pos];

+                    if (!Char.IsDigit(ch)) throw new FormatException(invalidExponent);

+                    exp = ch - '0';

+                    pos++;

+                    while (pos < len && Char.IsDigit(s[pos])) 

+                    {

+                        exp *= 10;

+                        exp += s[pos] - '0';

+                        pos++;

+                    }

+                    if (isNegativeExp) exp *= -1;

+                }

+            }

+

+            // trailing

+            while (pos < len)

+            {

+                char ch = s[pos];

+                if (allowedTrailingWhiteSpace && Char.IsWhiteSpace(ch)) 

+                {

+                    pos++;

+                }

+                else if (allowedParentheses && ch == ')' && hasOpeningParentheses) 

+                {

+                    hasOpeningParentheses = false;

+                    pos++;

+                }

+                else if (allowedTrailingSign && ch == nfi.NegativeSign[0] && !hasSign) 

+                {

+                    int slen = nfi.NegativeSign.Length;

+                    if (slen == 1 || s.IndexOf(nfi.NegativeSign, pos, slen) == pos) 

+                    {

+                        hasSign = true;

+                        isNegative = true;

+                        pos += slen;

+                    }

+                }

+                else if (allowedTrailingSign && ch == nfi.PositiveSign[0] && !hasSign) 

+                {

+                    int slen = nfi.PositiveSign.Length;

+                    if (slen == 1 || s.IndexOf(nfi.PositiveSign, pos, slen) == pos) 

+                    {

+                        hasSign = true;

+                        pos += slen;

+                    }

+                }

+                else

+                {

+                    throw new FormatException(invalidChar + pos);

+                }

+            }

+

+            if (hasOpeningParentheses) throw new FormatException (

+		    Locale.GetText ("Closing Parentheses not found"));

+	    

+            if (!hasDecimalPoint) decPos = sb.Length;

+

+            return sb.ToString();

+        }

+

+        public static Decimal Parse(string s, NumberStyles style, IFormatProvider provider) 

+        {

+            NumberFormatInfo nfi = GetNumberFormatInfoFromIFormatProvider(provider);

+

+            if (s == null) throw new ArgumentNullException (Locale.GetText ("string s"));

+

+            int iDecPos, exp;

+            bool isNegative, expFlag;

+            s = stripStyles(s, style, nfi, out iDecPos, out isNegative, out expFlag, out exp);

+

+            if (iDecPos < 0)

+		throw new Exception (Locale.GetText ("Error in System.Decimal.Parse"));

+            uint decPos = (uint) iDecPos;

+

+            Decimal d;

+            int digits = s.Length;

+            int sign = (isNegative) ? 1 : 0;

+            if (string2decimal(out d, s, decPos, sign) != 0)

+            {

+                throw new OverflowException();

+            }

+

+            if (expFlag)

+            {

+                if (decimalSetExponent(ref d, exp) != 0)

+                    throw new OverflowException();

+            }

+

+            return d;

+        }

+

+	public TypeCode GetTypeCode ()

+	{

+	    return TypeCode.Decimal;

+	}

+

+	object IConvertible.ToType (Type conversionType, IFormatProvider provider)

+	{

+	    return Convert.ToType (this, conversionType, provider);

+	}

+

+	bool IConvertible.ToBoolean (IFormatProvider provider)

+	{

+	    return Convert.ToBoolean (this);

+	}

+

+	byte IConvertible.ToByte (IFormatProvider provider)

+	{

+	    return Convert.ToByte (this);

+	}

+

+	char IConvertible.ToChar (IFormatProvider provider)

+	{

+	    throw new InvalidCastException ();

+	}

+

+	[CLSCompliant (false)]

+	DateTime IConvertible.ToDateTime (IFormatProvider provider)

+	{

+	    throw new InvalidCastException ();

+	}

+

+	decimal IConvertible.ToDecimal (IFormatProvider provider)

+	{

+	    return this;

+	}

+

+	double IConvertible.ToDouble (IFormatProvider provider)

+	{

+	    return Convert.ToDouble (this);

+	}

+

+	short IConvertible.ToInt16 (IFormatProvider provider)

+	{

+	    return Convert.ToInt16 (this);

+	}

+

+	int IConvertible.ToInt32 (IFormatProvider provider)

+	{

+	    return Convert.ToInt32 (this);

+	}

+

+	long IConvertible.ToInt64 (IFormatProvider provider)

+	{

+	    return Convert.ToInt64 (this);

+	}

+

+	[CLSCompliant (false)]

+	sbyte IConvertible.ToSByte (IFormatProvider provider)

+	{

+	    return Convert.ToSByte (this);

+	}

+

+	float IConvertible.ToSingle (IFormatProvider provider)

+	{

+	    return Convert.ToSingle (this);

+	}

+

+	[CLSCompliant (false)]

+	ushort IConvertible.ToUInt16 (IFormatProvider provider)

+	{

+	    return Convert.ToUInt16 (this);

+	}

+

+	[CLSCompliant (false)]

+	uint IConvertible.ToUInt32 (IFormatProvider provider)

+	{

+	    return Convert.ToUInt32 (this);

+	}

+

+	[CLSCompliant (false)]

+	ulong IConvertible.ToUInt64 (IFormatProvider provider)

+	{

+	    return Convert.ToUInt64 (this);

+	}

+

+        public string ToString(string format, IFormatProvider provider) 

+        {

+            NumberFormatInfo nfi = GetNumberFormatInfoFromIFormatProvider(provider);

+            

+            if (format == null) format = "G";	

+			

+            return DecimalFormatter.NumberToString(format, nfi, this);

+        }

+

+        public override string ToString() 

+        {

+            return ToString("G", null);

+        }

+

+        public string ToString(string format) 

+        {

+            return ToString(format, null);

+        }

+

+        public string ToString(IFormatProvider provider) 

+        {

+            return ToString("G", provider);

+        }

+

+#if !MSTEST

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern int decimal2UInt64(ref Decimal val, 

+            out ulong result);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern int decimal2Int64(ref Decimal val, 

+            out long result);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern int double2decimal(out Decimal erg, 

+            double val, int digits);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern int decimalIncr(ref Decimal d1, ref Decimal d2);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        internal static extern int decimal2string(ref Decimal val, 

+            int digits, int decimals, char[] bufDigits, int bufSize, out int decPos, out int sign);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        internal static extern int string2decimal(out Decimal val, String sDigits, uint decPos, int sign);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        internal static extern int decimalSetExponent(ref Decimal val, int exp);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern double decimal2double(ref Decimal val);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern void decimalFloorAndTrunc(ref Decimal val, 

+            int floorFlag);

+        

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern void decimalRound(ref Decimal val, int decimals);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern int decimalMult(ref Decimal pd1, ref Decimal pd2);

+        

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern int decimalDiv(out Decimal pc, ref Decimal pa, ref Decimal pb);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern int decimalIntDiv(out Decimal pc, ref Decimal pa, ref Decimal pb);

+

+        [MethodImplAttribute(MethodImplOptions.InternalCall)]

+        private static extern int decimalCompare(ref Decimal d1, ref Decimal d2);

+#else

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimal2UInt64")]

+        private static extern int decimal2UInt64(ref Decimal val, 

+            out ulong result);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimal2Int64")]

+        private static extern int decimal2Int64(ref Decimal val, 

+            out long result);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="double2decimal")]

+        private static extern int double2decimal(out Decimal erg, 

+            double val, int digits);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimalIncr")]

+        private static extern int decimalIncr(ref Decimal d1, ref Decimal d2);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimal2string")]

+        internal static extern int decimal2string(ref Decimal val, 

+            int digits, int decimals,

+            [MarshalAs(UnmanagedType.LPWStr)]StringBuilder bufDigits, 

+            int bufSize, out int decPos, out int sign);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="string2decimal")]

+        internal static extern int string2decimal(out Decimal val,

+            [MarshalAs(UnmanagedType.LPWStr)]String sDigits,

+            uint decPos, int sign);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimalSetExponent")]

+        internal static extern int decimalSetExponent(ref Decimal val, int exp);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimal2double")]

+        private static extern double decimal2double(ref Decimal val);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimalFloorAndTrunc")]

+        private static extern void decimalFloorAndTrunc(ref Decimal val, 

+            int floorFlag);

+        

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimalRound")]

+        private static extern void decimalRound(ref Decimal val, int decimals);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimalMult")]

+        private static extern int decimalMult(ref Decimal pd1, ref Decimal pd2);

+        

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimalDiv")]

+        private static extern int decimalDiv(out Decimal pc, ref Decimal pa, ref Decimal pb);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimalIntDiv")]

+        private static extern int decimalIntDiv(out Decimal pc, ref Decimal pa, ref Decimal pb);

+

+        //![MethodImplAttribute(MethodImplOptions.InternalCall)]

+        [DllImport("libdec", EntryPoint="decimalCompare")]

+        private static extern int decimalCompare(ref Decimal d1, ref Decimal d2);

+

+#endif

+    }

+}

diff --git a/mcs/class/corlib/System/DecimalFormatter.cs b/mcs/class/corlib/System/DecimalFormatter.cs
new file mode 100644
index 00000000000..7ad4bddb818
--- /dev/null
+++ b/mcs/class/corlib/System/DecimalFormatter.cs
@@ -0,0 +1,381 @@
+//
+// System.DecimalFormatter.cs
+//
+// Author:
+//   Martin Weindel (martin.weindel@t-online.de)
+//
+// (C) Martin Weindel, Derek Holden  dholden@draper.com
+//
+
+//
+// Internal class for formatting decimal numbers. 
+
+using System.Globalization;
+using System.Text;
+using System;
+
+namespace System 

+{
+
+    internal sealed class DecimalFormatter 

+    {
+
+        private static bool ParseFormat (string format, out char specifier,  out int precision)
+        {		 		 
+            precision = -1;
+            specifier = '\0';
+		    
+            int length = format.Length;
+            if (length < 1 || length > 3)
+                return false;
+		    
+            char[] chars = format.ToCharArray ();
+            specifier = Char.ToUpper(chars[0]);
+
+            if (length == 1) 
+                return true;
+		    
+            if (length == 2) 

+            {
+                if (chars[1] < '0' || chars[1] > '9')
+                    return false;
+			    
+                precision = chars[1] - '0';
+            } 

+            else 

+            {
+                if (chars[1] < '0' || chars[2] < '0' || chars[1] > '9' || chars[2] > '9')
+                    return false;
+			    
+                precision = (chars[1] - '0') * 10 + (chars[2] - '0');
+            }
+		    
+            return true;
+        }	 
+
+        public static string NumberToString(string format, NumberFormatInfo nfi, Decimal value)

+        {
+            char specifier;

+            int precision;

+            if (!DecimalFormatter.ParseFormat(format, out specifier, out precision)) 

+            {

+                throw new FormatException (Locale.GetText ("The specified format is invalid"));

+            }

+

+            int digits = -1;

+            int decimals = 0;

+            // first calculate number of digits or decimals needed for format

+            switch (specifier)

+            {

+                case 'C':

+                    decimals = (precision >= 0) ? precision : nfi.CurrencyDecimalDigits;

+                    break;

+                case 'F': goto case 'N'; 

+                case 'N':

+                    decimals = (precision >= 0) ? precision : nfi.NumberDecimalDigits;

+                    break;

+                case 'G':

+                    digits = (precision >= 0) ? precision : 0;

+                    break;

+                case 'E': 

+                    digits = (precision >= 0) ? precision+1 : 7;

+                    break;

+                case 'P': 

+                    decimals = (precision >= 0) ? precision+2 : nfi.PercentDecimalDigits+2;

+                    break;

+                case 'Z':

+                    digits = 0;

+                    break;

+            }

+

+            // get digit string

+            const int bufSize = 40;

+            int decPos = 0, sign = 0;

+            char[] buf = new char[bufSize];

+            if (Decimal.decimal2string(ref value, digits, decimals, buf, bufSize, out decPos, out sign) != 0) 

+            {

+                throw new FormatException(); // should never happen 

+            }

+

+		string TempString = new String(buf);
+		TempString = TempString.Trim(new char[] {(char)0x0});
+		StringBuilder sb = new StringBuilder(TempString, TempString.Length);

+

+	    if (sb.ToString () == String.Empty && decPos > 0 && sign == 0)
+		    sb.Append ('0');
+
+            // now build the format

+            switch (specifier)

+            {

+                case 'C': return FormatCurrency(nfi, sb, decimals, decPos, sign);

+                case 'N': return FormatNumber(nfi, sb, decimals, decPos, sign);

+                case 'F': return FormatFixedPoint(nfi, sb, decimals, decPos, sign);

+                case 'G': return FormatGeneral(nfi, sb, digits, decPos, sign, format[0]);

+                case 'E': return FormatExponential(nfi, sb, digits, decPos, sign, format[0], true);

+                case 'P': return FormatPercent(nfi, sb, decimals, decPos, sign);

+                case 'Z': return FormatNormalized(nfi, sb, digits, decPos, sign);

+                default: 

+                    throw new FormatException (Locale.GetText ("The specified format is invalid"));

+            }

+        }

+
+        private static string FormatFixedPoint(NumberFormatInfo nfi, StringBuilder sb, 
+            int decimals, int decPos, int sign)
+        {
+            if (decimals > 0)
+            {
+                sb.Insert((decPos <= 0) ? 1 : decPos, nfi.NumberDecimalSeparator);
+            }
+
+            if (sign != 0) 

+            {
+                sb.Insert(0, nfi.NegativeSign);
+            }
+
+            return sb.ToString();
+        }
+
+        private static string FormatExponential(NumberFormatInfo nfi, StringBuilder sb, 
+            int digits, int decPos, int sign, char echar, bool exp3flag)
+        {
+            // insert decimal separator
+            if (digits > 1 || (digits == 0 && sb.Length > 1)) 

+            {
+                sb.Insert(1, nfi.NumberDecimalSeparator);
+            }
+
+            // insert sign
+            if (sign != 0)
+            {
+                sb.Insert(0, nfi.NegativeSign);
+            }
+
+            // append exponent
+            sb.Append(echar);
+            decPos--;
+            sb.Append((decPos >= 0) ? nfi.PositiveSign : nfi.NegativeSign);
+            if (decPos < 0) decPos *= -1;
+            if (exp3flag) sb.Append('0');
+            sb.Append((char)('0' + decPos/10));
+            sb.Append((char)('0' + decPos%10));
+
+            return sb.ToString();
+        }
+
+        private static string FormatGeneral(NumberFormatInfo nfi, StringBuilder sb, 
+            int digits, int decPos, int sign, char gchar)
+        {
+            int dig = digits;
+            bool bFix = (digits == 0 && decPos >= -3) || (digits >= decPos && decPos >= -3 && digits != 0);
+
+            // remove trailing digits
+            while (sb.Length > 1 && (sb.Length > decPos || !bFix) && sb[sb.Length-1] == '0')
+            {
+                sb.Remove(sb.Length-1, 1);
+                if (dig != 0) dig--;
+            }
+
+            if (bFix)

+            {
+                while (decPos <= 0) 

+                {
+                    sb.Insert(0, '0');
+                    if (dig != 0 && decPos != 0) dig++;
+                    decPos++;
+                }
+                return FormatFixedPoint(nfi, sb, sb.Length - decPos, decPos, sign);
+            }
+            else

+            {
+                return FormatExponential(nfi, sb, dig, decPos, sign, (char)(gchar-2), false);
+            }
+        }
+
+        private static string FormatGroupAndDec(StringBuilder sb, int decimals, int decPos, 
+            int[] groupSizes, string groupSeparator, string decSeparator)
+        {
+            int offset = 0;
+
+            // Groups
+            if (decPos > 0) 

+            {
+                if (groupSizes != null) 

+                {
+                    int lastSize = 0;
+                    int digitCount = 0;
+                    for (int i = 0; i < groupSizes.GetLength(0); i++) 

+                    {
+                        int size = groupSizes[i];
+                        if (size > 0) 

+                        {
+                            digitCount += size;
+                            if (digitCount < decPos) 

+                            {
+                                sb.Insert(decPos - digitCount, groupSeparator);
+                                offset += groupSeparator.Length;
+                            }
+                        }
+                        lastSize = size;
+                    }
+
+                    if (lastSize > 0) 

+                    {
+                        while (true) 

+                        {
+                            digitCount +=lastSize;
+                            if (digitCount >= decPos) break;
+                            sb.Insert(decPos - digitCount, groupSeparator);
+                            offset += groupSeparator.Length;
+                        }
+                    }
+                }
+            }
+
+            if (decimals > 0)
+            {
+                sb.Insert(offset + ((decPos <= 0) ? 1 : decPos), decSeparator);
+            }
+
+            return sb.ToString();
+        }
+
+        private static string FormatNumber(NumberFormatInfo nfi, StringBuilder sb, 
+            int decimals, int decPos, int sign)
+        {
+            string s = FormatGroupAndDec(sb, decimals, decPos,
+                nfi.NumberGroupSizes, nfi.NumberGroupSeparator, nfi.NumberDecimalSeparator);
+
+            // sign
+            if (sign != 0) 

+            {
+                switch (nfi.NumberNegativePattern)

+                {
+                    case 0:
+                        return "(" + s + ")";
+                    case 1:
+                        return nfi.NegativeSign + s;
+                    case 2:
+                        return nfi.NegativeSign + " " + s;
+                    case 3:
+                        return s + nfi.NegativeSign;
+                    case 4:
+                        return s + " " + nfi.NegativeSign;
+                    default:
+                        throw new ArgumentException(Locale.GetText ("Invalid NumberNegativePattern"));
+                }
+            } 

+            else 

+            {

+                return s;

+            }

+        }
+
+        private static string FormatCurrency(NumberFormatInfo nfi, StringBuilder sb, 
+            int decimals, int decPos, int sign)
+        {
+            string s = FormatGroupAndDec(sb, decimals, decPos,
+                nfi.CurrencyGroupSizes, nfi.CurrencyGroupSeparator, nfi.CurrencyDecimalSeparator);
+
+            if (sign != 0) 

+            { // negative
+                switch (nfi.CurrencyNegativePattern) 

+                {
+                    case 0:
+                        return "(" + nfi.CurrencySymbol + s + ")";
+                    case 1:
+                        return nfi.NegativeSign + nfi.CurrencySymbol + s;
+                    case 2:
+                        return nfi.CurrencySymbol + nfi.NegativeSign + s;
+                    case 3:
+                        return nfi.CurrencySymbol + s + nfi.NegativeSign;
+                    case 4:
+                        return "(" + s + nfi.CurrencySymbol + ")";
+                    case 5:
+                        return nfi.NegativeSign + s + nfi.CurrencySymbol;
+                    case 6:
+                        return s + nfi.NegativeSign + nfi.CurrencySymbol;
+                    case 7:
+                        return s + nfi.CurrencySymbol + nfi.NegativeSign;
+                    case 8:
+                        return nfi.NegativeSign + s + " " + nfi.CurrencySymbol;
+                    case 9:
+                        return nfi.NegativeSign + nfi.CurrencySymbol + " " + s;
+                    case 10:
+                        return s + " " + nfi.CurrencySymbol + nfi.NegativeSign;
+                    case 11:
+                        return nfi.CurrencySymbol + " " + s + nfi.NegativeSign;
+                    case 12:
+                        return nfi.CurrencySymbol + " " + nfi.NegativeSign + s;
+                    case 13:
+                        return s + nfi.NegativeSign + " " + nfi.CurrencySymbol;
+                    case 14:
+                        return "(" + nfi.CurrencySymbol + " " + s + ")";
+                    case 15:
+                        return "(" + s + " " + nfi.CurrencySymbol + ")";
+                    default:
+                        throw new ArgumentException(Locale.GetText ("Invalid CurrencyNegativePattern"));
+                }
+            }
+            else 

+            {
+                switch (nfi.CurrencyPositivePattern) 

+                {
+                    case 0:
+                        return nfi.CurrencySymbol + s;
+                    case 1:
+                        return s + nfi.CurrencySymbol;
+                    case 2:
+                        return nfi.CurrencySymbol + " " + s;
+                    case 3:
+                        return s + " " + nfi.CurrencySymbol;
+                    default:
+                        throw new ArgumentException(Locale.GetText ("Invalid CurrencyPositivePattern"));
+                }
+            }
+        }
+
+        private static string FormatPercent(NumberFormatInfo nfi, StringBuilder sb, 
+            int decimals, int decPos, int sign)
+        {
+            string s = FormatGroupAndDec(sb, decimals, decPos+2, 
+                nfi.PercentGroupSizes, nfi.PercentGroupSeparator, nfi.PercentDecimalSeparator);
+
+            if (sign != 0) 

+            { // negative
+                switch (nfi.PercentNegativePattern) 

+                {
+                    case 0:
+                        return nfi.NegativeSign + s + " " + nfi.PercentSymbol;
+                    case 1:
+                        return nfi.NegativeSign + s + nfi.PercentSymbol;
+                    case 2:
+                        return nfi.NegativeSign + nfi.PercentSymbol + s;
+                    default:
+                        throw new ArgumentException(Locale.GetText ("Invalid PercentNegativePattern"));
+                }
+            }
+            else 

+            {
+                switch (nfi.PercentPositivePattern) 

+                {
+                    case 0:
+                        return s + " " + nfi.PercentSymbol;
+                    case 1:
+                        return s + nfi.PercentSymbol;
+                    case 2:
+                        return nfi.PercentSymbol + s;
+                    default:
+                        throw new ArgumentException("Invalid PercentPositivePattern");
+                }
+            }
+        }
+
+	[MonoTODO]
+        private static string FormatNormalized(NumberFormatInfo nfi, StringBuilder sb, 
+            int digits, int decPos, int sign)
+        {
+            //LAMESPEC: how should this format look like ? Is this a fixed point format ?
+	    throw new NotImplementedException ();
+        }
+    }
+}
diff --git a/mcs/class/corlib/System/Delegate.cs b/mcs/class/corlib/System/Delegate.cs
new file mode 100644
index 00000000000..8320f380cd9
--- /dev/null
+++ b/mcs/class/corlib/System/Delegate.cs
@@ -0,0 +1,263 @@
+//
+// System.Delegate.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Reflection;
+using System.Runtime.Serialization;
+using System.Runtime.CompilerServices;
+
+
+namespace System {
+
+	[MonoTODO]
+	public abstract class Delegate : ICloneable, ISerializable {
+		protected Type target_type;
+		protected object m_target;
+		protected string method_name;
+		protected IntPtr method_ptr;
+		protected IntPtr delegate_trampoline;
+		protected MethodInfo method_info;
+
+		protected Delegate (object target, string method)
+		{
+			if (target == null)
+				throw new ArgumentNullException (Locale.GetText ("Target object is null"));
+
+			if (method == null)
+				throw new ArgumentNullException (Locale.GetText ("method name is null"));
+
+			this.target_type = null;
+			this.method_ptr = IntPtr.Zero;
+			this.m_target = target;
+			this.method_name = method;
+		}
+
+		protected Delegate (Type target_type, string method)
+		{
+			if (m_target == null)
+				throw new ArgumentNullException (Locale.GetText ("Target type is null"));
+
+			if (method == null)
+				throw new ArgumentNullException (Locale.GetText ("method string is null"));
+
+			this.target_type = target_type;
+			this.method_ptr = IntPtr.Zero;
+			this.m_target = null;
+			this.method_name = method;
+		}
+
+		public MethodInfo Method {
+			get {
+				return method_info;
+			}
+		}
+
+		public object Target {
+			get {
+				return m_target;
+			}
+		}
+
+		//
+		// Methods
+		//
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal static extern Delegate CreateDelegate_internal (Type type, object target, MethodInfo info);
+
+		public static Delegate CreateDelegate (Type type, MethodInfo info)
+		{
+			if (type == null)
+				throw new ArgumentNullException (Locale.GetText ("Type is null"));
+
+			if (info == null)
+				throw new ArgumentNullException (Locale.GetText ("MethodInfo is null"));
+
+			return CreateDelegate_internal (type, null, info);
+		}
+		
+		public static Delegate CreateDelegate (Type type, object target, string method)
+		{
+			if (type == null)
+				throw new ArgumentNullException (Locale.GetText ("Type is null"));
+
+			if (target == null)
+				throw new ArgumentNullException (Locale.GetText ("Target object is null"));
+
+			if (method == null)
+				throw new ArgumentNullException (Locale.GetText ("method string is null"));
+
+			BindingFlags flags =  BindingFlags.Public | BindingFlags.Instance;
+			MethodInfo info = target.GetType ().GetMethod (method, flags);
+			return CreateDelegate_internal (type, target, info);
+		}
+
+ 		public static Delegate CreateDelegate (Type type, Type target, string method)
+		{
+			if (type == null)
+				throw new ArgumentNullException (Locale.GetText ("Type is null"));
+
+			if (target == null)
+				throw new ArgumentNullException (Locale.GetText ("Target type is null"));
+
+			if (method == null)
+				throw new ArgumentNullException (Locale.GetText ("method string is null"));
+
+			BindingFlags flags =  BindingFlags.Public | BindingFlags.Static;
+			MethodInfo info = target.GetMethod (method, flags);
+			return CreateDelegate_internal (type, null, info);
+		}
+
+		public static Delegate CreateDelegate (Type type, object target, string method, bool ignorecase)
+		{
+			if (type == null)
+				throw new ArgumentNullException (Locale.GetText ("Type is null"));
+
+			if (target == null)
+				throw new ArgumentNullException (Locale.GetText ("Target object is null"));
+
+			if (method == null)
+				throw new ArgumentNullException (Locale.GetText ("method string is null"));
+			
+			Type target_type = target.GetType ();
+			BindingFlags flags =  BindingFlags.Public | BindingFlags.Instance | BindingFlags.IgnoreCase;
+			MethodInfo info = target_type.GetMethod (method, flags);
+			return CreateDelegate_internal (type, target, info);			
+		}
+
+		public object DynamicInvoke( object[] args )
+		{
+			return DynamicInvokeImpl( args );
+		}
+
+		public virtual object DynamicInvokeImpl( object[] args )
+		{
+			if (Method == null) {
+				Type[] mtypes = new Type [args.Length];
+   				for (int i = 0; i < args.Length; ++i) {
+      				mtypes [i] = args [i].GetType ();
+         		}
+				method_info = m_target.GetType ().GetMethod (method_name, mtypes);
+			}
+			return Method.Invoke( m_target, args );
+		}
+
+		public virtual object Clone()
+		{
+			return MemberwiseClone();
+		}
+
+		public override bool Equals (object o)
+		{
+			if ( o == null )
+				return false;
+			
+			Delegate d = (Delegate) o;
+			if ((d.target_type == target_type) &&
+			    (d.m_target == m_target) &&
+			    (d.method_name == method_name) &&
+			    (d.method_ptr == method_ptr))
+				return true;
+
+			return false;
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int)method_ptr;
+		}
+
+		// This is from ISerializable
+		[MonoTODO]
+		public void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			// TODO: IMPLEMENT ME
+		}
+
+		public virtual Delegate[] GetInvocationList()
+		{
+			return new Delegate[] { this };
+		}
+
+		/// <symmary>
+		///   Returns a new MulticastDelegate holding the
+		///   concatenated invocation lists of MulticastDelegates a and b
+		/// </symmary>
+		public static Delegate Combine (Delegate a, Delegate b)
+		{
+			if (a == null){
+				if (b == null)
+					return null;
+				return b;
+			} else 
+				if (b == null)
+					return a;
+
+			if (a.GetType () != b.GetType ())
+				throw new ArgumentException (Locale.GetText ("Incompatible Delegate Types"));
+			
+			return a.CombineImpl (b);
+		}
+
+		/// <symmary>
+		///   Returns a new MulticastDelegate holding the
+		///   concatenated invocation lists of an Array of MulticastDelegates
+		/// </symmary>
+		public static Delegate Combine( Delegate[] delegates )
+		{
+			Delegate retval = null;
+
+			foreach ( Delegate next in delegates )
+				retval = Combine( retval, next );
+
+			return retval;
+		}
+
+
+		protected virtual Delegate CombineImpl (Delegate d)
+		{
+			throw new MulticastNotSupportedException ("");
+		}
+		
+		
+		public static Delegate Remove( Delegate source, Delegate value ) 
+		{
+			if ( source == null )
+				return null;
+				
+			return source.RemoveImpl( value );
+		}
+
+		protected virtual Delegate RemoveImpl( Delegate d )
+		{
+			if ( this.Equals( d ) )
+				return null;
+		       
+			return this;
+		}
+
+		public static bool operator ==( Delegate a, Delegate b )
+		{
+			if ((object)a == null) {
+				if ((object)b == null)
+					return true;
+				return false;
+			}
+			return a.Equals( b );
+		}
+
+		public static bool operator !=( Delegate a, Delegate b )
+		{
+			return !(a == b);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/DivideByZeroException.cs b/mcs/class/corlib/System/DivideByZeroException.cs
new file mode 100644
index 00000000000..74582bb361d
--- /dev/null
+++ b/mcs/class/corlib/System/DivideByZeroException.cs
@@ -0,0 +1,38 @@
+//
+// System.DivideByZeroException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class DivideByZeroException : ArithmeticException {
+		// Constructors
+		public DivideByZeroException ()
+			: base (Locale.GetText ("Division by zero"))
+		{
+		}
+
+		public DivideByZeroException (string message)
+			: base (message)
+		{
+		}
+
+		public DivideByZeroException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected DivideByZeroException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/DllNotFoundException.cs b/mcs/class/corlib/System/DllNotFoundException.cs
new file mode 100644
index 00000000000..cc332020623
--- /dev/null
+++ b/mcs/class/corlib/System/DllNotFoundException.cs
@@ -0,0 +1,42 @@
+//	
+// System.DllNotFoundException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class DllNotFoundException : TypeLoadException
+	{
+		// Constructors
+		public DllNotFoundException ()
+			: base (Locale.GetText ("DLL not found."))
+			{
+			}
+		
+		public DllNotFoundException (string message)
+			: base (message)
+			{
+			}
+		
+		protected DllNotFoundException (SerializationInfo info,
+					     StreamingContext context)
+			: base (info, context)
+			{
+			}
+		
+		public DllNotFoundException (string message, Exception innerException)
+			:base (message, innerException)
+			{
+			}
+		
+	}
+}
diff --git a/mcs/class/corlib/System/Double.cs b/mcs/class/corlib/System/Double.cs
new file mode 100644
index 00000000000..ea99f13a8ca
--- /dev/null
+++ b/mcs/class/corlib/System/Double.cs
@@ -0,0 +1,448 @@
+//
+// System.Double.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Bob Smith       (bob@thestuff.net)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// (C) Bob Smith.    http://www.thestuff.net
+//
+
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System {
+	
+	[Serializable]
+	public struct Double : IComparable, IFormattable, IConvertible {
+		public const double Epsilon = 4.9406564584124650e-324;
+		public const double MaxValue =  1.7976931348623157e308;
+		public const double MinValue = -1.7976931348623157e308;
+		public const double NaN = 0.0d / 0.0d;
+		public const double NegativeInfinity = -1.0d / 0.0d;
+		public const double PositiveInfinity = 1.0d / 0.0d;
+		
+		// VES needs to know about value.  public is workaround
+		// so source will compile
+		public double value;
+
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+			
+			if (!(v is System.Double))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Double"));
+
+			double dv = (double)v;
+
+			if (IsPositiveInfinity(value) && IsPositiveInfinity(dv))
+				return 0;
+
+			if (IsNegativeInfinity(value) && IsNegativeInfinity(dv))
+				return 0;
+
+			if (IsNaN(dv))
+				if (IsNaN(value))
+					return 0;
+				else
+					return 1;
+
+			if (IsNaN(value))
+				if (IsNaN(dv))
+					return 0;
+				else
+					return -1;
+
+			if (value > dv) return 1;
+			else if (value < dv) return -1;
+			else return 0;
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.Double))
+				return false;
+
+			if (IsNaN ((double)o)) {
+				if (IsNaN(value))
+					return true;
+				else
+					return false;
+			}
+
+			return ((double) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int) value;
+		}
+
+		public static bool IsInfinity (double d)
+		{
+			return (d == PositiveInfinity || d == NegativeInfinity);
+		}
+
+		public static bool IsNaN (double d)
+		{
+			return (d != d);
+		}
+
+		public static bool IsNegativeInfinity (double d)
+		{
+			return (d < 0.0d && (d == NegativeInfinity || d == PositiveInfinity));
+		}
+
+		public static bool IsPositiveInfinity (double d)
+		{
+			return (d > 0.0d && (d == NegativeInfinity || d == PositiveInfinity));
+		}
+
+		public static double Parse (string s)
+		{
+			return Parse (s, (NumberStyles.Float | NumberStyles.AllowThousands), null);
+		}
+
+		public static double Parse (string s, IFormatProvider fp)
+		{
+			return Parse (s, (NumberStyles.Float | NumberStyles.AllowThousands), fp);
+		}
+
+		public static double Parse (string s, NumberStyles style) 
+		{
+			return Parse (s, style, null);
+		}
+
+		// We're intentionally using constants here to avoid some bigger headaches in mcs.
+		// This struct must be compiled before System.Enum so we can't use enums here.
+		private const int State_AllowSign = 1;
+		private const int State_Digits = 2;
+		private const int State_Decimal = 3;
+		private const int State_ExponentSign = 4;
+		private const int State_Exponent = 5;
+		private const int State_ConsumeWhiteSpace = 6;
+		
+		[MonoTODO("check if digits are group in correct numbers between the group separators")]
+		public static double Parse (string s, NumberStyles style, IFormatProvider provider)
+		{
+			if (s == null) throw new ArgumentNullException();
+			if (style > NumberStyles.Any)
+			{
+				throw new ArgumentException();
+			}
+			NumberFormatInfo format = NumberFormatInfo.GetInstance(provider);
+			if (format == null) throw new Exception("How did this happen?");
+			if (s == format.NaNSymbol) return Double.NaN;
+			if (s == format.PositiveInfinitySymbol) return Double.PositiveInfinity;
+			if (s == format.NegativeInfinitySymbol) return Double.NegativeInfinity;
+
+			//
+			// validate and prepare string for C
+			//
+			int len = s.Length;
+			byte [] b = new byte [len + 1];
+			int didx = 0;
+			int sidx = 0;
+			char c;
+			
+			if ((style & NumberStyles.AllowLeadingWhite) != 0){
+				while (sidx < len && Char.IsWhiteSpace (c = s [sidx]))
+				       sidx++;
+
+				if (sidx == len)
+					throw new FormatException();
+			}
+
+			bool allow_trailing_white = ((style & NumberStyles.AllowTrailingWhite) != 0);
+
+			//
+			// Machine state
+			//
+			int state = State_AllowSign;
+
+			//
+			// Setup
+			//
+			string decimal_separator = null;
+			string group_separator = null;
+			int decimal_separator_len = 0;
+			int group_separator_len = 0;
+			if ((style & NumberStyles.AllowDecimalPoint) != 0){
+				decimal_separator = format.NumberDecimalSeparator;
+				decimal_separator_len = decimal_separator.Length;
+			}
+			if ((style & NumberStyles.AllowThousands) != 0){
+				group_separator = format.NumberGroupSeparator;
+				group_separator_len = group_separator.Length;
+			}
+			string positive = format.PositiveSign;
+			string negative = format.NegativeSign;
+			
+			for (; sidx < len; sidx++){
+				c = s [sidx];
+
+				switch (state){
+				case State_AllowSign:
+					if ((style & NumberStyles.AllowLeadingSign) != 0){
+						if (c == positive [0] &&
+						    s.Substring (sidx, positive.Length) == positive){
+							state = State_Digits;
+							sidx += positive.Length-1;
+							continue;
+						}
+
+						if (c == negative [0] &&
+						    s.Substring (sidx, negative.Length) == negative){
+							state = State_Digits;
+							b [didx++] = (byte) '-';
+							sidx += negative.Length-1;
+							continue;
+						}
+					}
+					state = State_Digits;
+					goto case State_Digits;
+					
+				case State_Digits:
+					if (Char.IsDigit (c)){
+						b [didx++] = (byte) c;
+						break;
+					}
+					if (c == 'e' || c == 'E')
+						goto case State_Decimal;
+					
+					if (decimal_separator != null &&
+					    decimal_separator [0] == c){
+						if (s.Substring (sidx, decimal_separator_len) ==
+						    decimal_separator){
+							b [didx++] = (byte) '.';
+							sidx += decimal_separator_len-1;
+							state = State_Decimal; 
+							break;
+						}
+					}
+					if (group_separator != null &&
+					    group_separator [0] == c){
+						if (s.Substring (sidx, group_separator_len) ==
+						    group_separator){
+							sidx += group_separator_len-1;
+							state = State_Digits; 
+							break;
+						}
+					}
+					
+					if (Char.IsWhiteSpace (c))
+						goto case State_ConsumeWhiteSpace;
+
+					throw new FormatException ("Unknown char: " + c);
+
+				case State_Decimal:
+					if (Char.IsDigit (c)){
+						b [didx++] = (byte) c;
+						break;
+					}
+
+					if (c == 'e' || c == 'E'){
+						if ((style & NumberStyles.AllowExponent) == 0)
+							throw new FormatException ("Unknown char: " + c);
+						b [didx++] = (byte) c;
+						state = State_ExponentSign;
+						break;
+					}
+					
+					if (Char.IsWhiteSpace (c))
+						goto case State_ConsumeWhiteSpace;
+					throw new FormatException ("Unknown char: " + c);
+
+				case State_ExponentSign:
+					if (Char.IsDigit (c)){
+						state = State_Exponent;
+						goto case State_Exponent;
+					}
+
+					if (c == positive [0] &&
+					    s.Substring (sidx, positive.Length) == positive){
+						state = State_Digits;
+						sidx += positive.Length-1;
+						continue;
+					}
+
+					if (c == negative [0] &&
+					    s.Substring (sidx, negative.Length) == negative){
+						state = State_Digits;
+						b [didx++] = (byte) '-';
+						sidx += negative.Length-1;
+						continue;
+					}
+
+					if (Char.IsWhiteSpace (c))
+						goto case State_ConsumeWhiteSpace;
+					
+					throw new FormatException ("Unknown char: " + c);
+
+				case State_Exponent:
+					if (Char.IsDigit (c)){
+						b [didx++] = (byte) c;
+						break;
+					}
+					
+					if (Char.IsWhiteSpace (c))
+						goto case State_ConsumeWhiteSpace;
+					throw new FormatException ("Unknown char: " + c);
+
+				case State_ConsumeWhiteSpace:
+					if (allow_trailing_white && Char.IsWhiteSpace (c))
+						break;
+					throw new FormatException ("Unknown char");
+				}
+			}
+
+			b [didx] = 0;
+			unsafe {
+				fixed (byte *p = &b [0]){
+					double retVal = ParseImpl (p);
+					if (IsPositiveInfinity(retVal) || IsNegativeInfinity(retVal))
+						throw new OverflowException();
+
+					return retVal;
+				}
+			}
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		unsafe private static extern double ParseImpl (byte *byte_ptr);
+		
+		public static bool TryParse (string s,
+					     NumberStyles style,
+					     IFormatProvider provider,
+					     ref double result)
+		{
+			try {
+				result = Parse (s, style, provider);
+				return true;
+			} catch {
+				return false;
+			}
+		}
+
+		public override string ToString ()
+		{
+			return ToString (null, null);
+		}
+
+		public string ToString (IFormatProvider fp)
+		{
+			return ToString (null, fp);
+		}
+
+		public string ToString (string format)
+		{
+			return ToString (format, null);
+		}
+
+		[MonoTODO]
+		public string ToString (string format, IFormatProvider fp)
+		{
+			// FIXME: Need to pass format and provider info to this call too.
+			return ToStringImpl(value);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern string ToStringImpl (double value);
+
+		// =========== IConvertible Methods =========== //
+
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.Double;
+		}
+
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			return System.Convert.ToType(value, conversionType, provider);
+		}
+		
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return System.Convert.ToBoolean(value);
+		}
+		
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return System.Convert.ToByte(value);
+		}
+		
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			throw new InvalidCastException();
+		}
+		
+		[CLSCompliant(false)]
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			throw new InvalidCastException();
+		}
+		
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal(value);
+		}
+		
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble(value);
+		}
+		
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16(value);
+		}
+		
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32(value);
+		}
+		
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64(value);
+		}
+		
+		[CLSCompliant(false)] 
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte(value);
+		}
+		
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle(value);
+		}
+		
+/*
+		string IConvertible.ToString (IFormatProvider provider)
+		{
+			return ToString(provider);
+		}
+*/
+
+		[CLSCompliant(false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16(value);
+		}
+		
+		[CLSCompliant(false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32(value);
+		}
+		
+		[CLSCompliant(false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64(value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/DuplicateWaitObjectException.cs b/mcs/class/corlib/System/DuplicateWaitObjectException.cs
new file mode 100644
index 00000000000..beddfd0c5ac
--- /dev/null
+++ b/mcs/class/corlib/System/DuplicateWaitObjectException.cs
@@ -0,0 +1,39 @@
+//
+// System.DuplicateWaitObjectException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class DuplicateWaitObjectException : ArgumentException {
+		// Constructors
+		public DuplicateWaitObjectException ()
+			: base (Locale.GetText ("Duplicate objects in argument"))
+		{
+		}
+
+		public DuplicateWaitObjectException (string param_name)
+			: base (Locale.GetText ("Duplicate objects in argument"), param_name)
+		{
+		}
+
+		public DuplicateWaitObjectException (string param_name, string message)
+			: base (message, param_name)
+		{
+		}
+
+		protected DuplicateWaitObjectException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/EntryPointNotFoundException.cs b/mcs/class/corlib/System/EntryPointNotFoundException.cs
new file mode 100644
index 00000000000..672d5261490
--- /dev/null
+++ b/mcs/class/corlib/System/EntryPointNotFoundException.cs
@@ -0,0 +1,42 @@
+//	
+// System.EntryPointNotFoundException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class EntryPointNotFoundException : TypeLoadException
+	{
+		// Constructors
+		public EntryPointNotFoundException ()
+			: base (Locale.GetText ("Cannot load class because of missing entry method."))
+			{
+			}
+		
+		public EntryPointNotFoundException (string message)
+			: base (message)
+			{
+			}
+		
+		protected EntryPointNotFoundException (SerializationInfo info,
+						       StreamingContext context)
+			: base (info, context)
+			{
+			}
+		
+		public EntryPointNotFoundException (string message, Exception innerException)
+			:base (message, innerException)
+			{
+			}
+		
+	}
+}
diff --git a/mcs/class/corlib/System/Enum.cs b/mcs/class/corlib/System/Enum.cs
new file mode 100644
index 00000000000..8f7d67fec04
--- /dev/null
+++ b/mcs/class/corlib/System/Enum.cs
@@ -0,0 +1,557 @@
+//
+// System.Enum.cs
+//
+// Authors:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+// TODO: Mucho left to implement.
+//
+
+using System.Collections;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System {
+	internal struct MonoEnumInfo {
+		internal Type utype;
+		internal Array values;
+		internal string[] names;
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern void get_enum_info (Type enumType, out MonoEnumInfo info);
+		
+		internal static void GetInfo (Type enumType, out MonoEnumInfo info) {
+			get_enum_info (enumType, out info);
+			Array.Sort (info.values, info.names);
+		}
+	};
+
+	[MonoTODO]
+	public abstract class Enum : ValueType, IComparable, IConvertible {
+
+		// IConvertible methods Start -->
+
+		[CLSCompliant(false)]
+		public TypeCode GetTypeCode () {
+			MonoEnumInfo info;
+			MonoEnumInfo.GetInfo (this.GetType (), out info);
+			return Type.GetTypeCode (info.utype);
+		}
+
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return Convert.ToBoolean (get_value (), provider);
+		}
+
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return Convert.ToByte (get_value (), provider);
+		}
+
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			return Convert.ToChar (get_value (), provider);
+		}
+
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			return Convert.ToDateTime (get_value (), provider);
+		}
+
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{	
+			return Convert.ToDecimal (get_value (), provider);
+		}
+
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{	
+			return Convert.ToDouble (get_value (), provider);
+		}
+
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return Convert.ToInt16 (get_value (), provider);
+		}
+
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return Convert.ToInt32 (get_value (), provider);
+		}
+
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return Convert.ToInt64 (get_value (), provider);
+		}
+
+    		[CLSCompliant(false)]
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return Convert.ToSByte (get_value (), provider);
+		}
+
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return Convert.ToSingle (get_value (), provider);
+		}
+
+		[MonoTODO]
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			throw new NotImplementedException ();
+		}
+		
+    		[CLSCompliant(false)]
+		public ushort ToUInt16 (IFormatProvider provider)
+		{
+			return Convert.ToUInt16 (get_value (), provider);
+		}
+
+    		[CLSCompliant(false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return Convert.ToUInt32 (get_value (), provider);
+		}
+
+    		[CLSCompliant(false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return Convert.ToUInt64 (get_value (), provider);
+		}
+
+		// <-- End IConvertible methods
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern object get_value ();
+		
+		public static Array GetValues (Type enumType) {
+			if (null == enumType)
+				throw new ArgumentNullException ("enumType cannot be null.");
+
+			if (!enumType.IsEnum)
+				throw new ArgumentException ("enumType is not an Enum type.");
+
+			MonoEnumInfo info;
+			MonoEnumInfo.GetInfo (enumType, out info);
+			return info.values;
+		}
+		
+		public static string[] GetNames (Type enumType) {
+			if (null == enumType)
+				throw new ArgumentNullException ("enumType cannot be null.");
+
+			if (!enumType.IsEnum)
+				throw new ArgumentException ("enumType is not an Enum type.");
+
+			MonoEnumInfo info;
+			MonoEnumInfo.GetInfo (enumType, out info);
+			return info.names;
+		}
+		
+		public static string GetName (Type enumType, object value) {
+			if (null == enumType)
+				throw new ArgumentNullException ("enumType cannot be null.");
+			if (null == value)
+				throw new ArgumentNullException ("value cannot be null.");
+
+			if (!enumType.IsEnum)
+				throw new ArgumentException ("enumType is not an Enum type.");
+
+			MonoEnumInfo info;
+			int i;
+			value = ToObject (enumType, value);
+			MonoEnumInfo.GetInfo (enumType, out info);
+			for (i = 0; i < info.values.Length; ++i) {				
+				if (value.Equals (info.values.GetValue (i)))
+					return info.names [i];
+			}
+			return null;
+		}
+		
+		public static bool IsDefined (Type enumType, object value) {
+			if (null == enumType)
+				throw new ArgumentNullException ("enumType cannot be null.");
+			if (null == value)
+				throw new ArgumentNullException ("value cannot be null.");
+
+			if (!enumType.IsEnum)
+				throw new ArgumentException ("enumType is not an Enum type.");
+
+			MonoEnumInfo info;
+			MonoEnumInfo.GetInfo (enumType, out info);
+
+			Type vType = value.GetType ();
+			if (vType == typeof(String)) {
+				return ((IList)(info.names)).Contains (value);
+			} else if ((vType == info.utype) || (vType == enumType)) {
+				int i;
+				value = ToObject (enumType, value);
+				MonoEnumInfo.GetInfo (enumType, out info);
+				for (i = 0; i < info.values.Length; ++i) {				
+					if (value.Equals (info.values.GetValue (i)))
+						return true;
+				}
+				return false;
+			} else {
+				throw new ArgumentException("The value parameter is not the correct type."
+					+ "It must be type String or the same type as the underlying type"
+					+ "of the Enum.");
+			}
+			
+
+		}
+		
+		public static Type GetUnderlyingType (Type enumType) {
+			if (null == enumType)
+				throw new ArgumentNullException ("enumType cannot be null.");
+
+			if (!enumType.IsEnum)
+				throw new ArgumentException ("enumType is not an Enum type.");
+
+			MonoEnumInfo info;
+			MonoEnumInfo.GetInfo (enumType, out info);
+			return info.utype;
+		}
+
+		public static object Parse (Type enumType, string value)
+		{
+			// Note: Parameters are checked in the other overload
+			return Parse (enumType, value, false);
+		}
+
+		public static object Parse (Type enumType, string value, bool ignoreCase)
+		{
+			if (null == enumType)
+				throw new ArgumentNullException ("enumType cannot be null.");
+
+			if (null == value)
+				throw new ArgumentNullException ("value cannot be null.");
+
+			if (!enumType.IsEnum)
+				throw new ArgumentException ("enumType is not an Enum type.");
+
+			if (String.Empty == value.Trim())
+				throw new ArgumentException ("value cannot be empty string.");
+
+			MonoEnumInfo info;
+			int i;
+			MonoEnumInfo.GetInfo (enumType, out info);
+
+			long retVal = 0;
+			string[] names = value.Split(new char[] {','});
+			TypeCode typeCode = ((Enum) info.values.GetValue (0)).GetTypeCode ();
+			foreach (string name in names) {
+				bool found = false;
+				for (i = 0; i < info.values.Length; ++i) {				
+					if (String.Compare (name, info.names [i], ignoreCase) == 0) {
+						switch (typeCode) {
+							case TypeCode.Byte:
+								retVal |= (long)((byte)info.values.GetValue (i));
+								break;
+							case TypeCode.SByte:
+								retVal |= (long)((SByte)info.values.GetValue (i));
+								break;
+							case TypeCode.Int16:
+								retVal |= (long)((short)info.values.GetValue (i));
+								break;
+							case TypeCode.Int32:
+								retVal |= (long)((int)info.values.GetValue (i));
+								break;
+							case TypeCode.Int64:
+								retVal |= (long)info.values.GetValue (i);
+								break;
+							case TypeCode.UInt16:
+								retVal |= (long)((UInt16)info.values.GetValue (i));
+								break;
+							case TypeCode.UInt32:
+								retVal |= (long)((UInt32)info.values.GetValue (i));
+								break;
+							case TypeCode.UInt64:
+								retVal |= (long)((UInt64)info.values.GetValue (i));
+								break;
+						}
+						found = true;
+						break;
+					}
+				}
+				if (!found)
+					throw new ArgumentException ("The requested value was not found");
+				
+			}
+			return ToObject(enumType, retVal);
+		}
+
+		/// <summary>
+		///   Compares the enum value with another enum value of the same type.
+		/// </summary>
+		///
+		/// <remarks>
+		///   
+		public int CompareTo (object obj)
+		{
+			Type thisType;
+
+			if (obj == null)
+				return 1;
+
+			thisType = this.GetType();
+			if (obj.GetType() != thisType){
+				throw new ArgumentException(
+					"Object must be the same type as the "
+					+ "enum. The type passed in was " 
+					+ obj.GetType().ToString()
+					+ "; the enum type was " 
+					+ thisType.ToString() + ".");
+			}
+
+			object value1, value2;
+
+			value1 = this.get_value ();
+			value2 = ((Enum)obj).get_value();
+
+			return ((IComparable)value1).CompareTo (value2);
+		}
+		
+		public override string ToString ()
+		{
+			return ToString ("G", null);
+		}
+
+		public string ToString (IFormatProvider provider)
+		{
+			return ToString ("G", provider);
+		}
+
+		public string ToString (String format)
+		{
+			return ToString (format, null);
+		}
+
+		[MonoTODO]
+		public string ToString (String format, IFormatProvider provider)
+		{
+			// provider is not used for Enums
+
+			if (format == String.Empty || format == null){
+				format = "G";
+			}
+			return Format (this.GetType(), this.get_value (), format);
+		}
+
+		public static object ToObject(Type enumType, byte value)
+		{
+			return ToObject (enumType, (object)value);
+		}
+		
+		public static object ToObject(Type enumType, short value)
+		{
+			return ToObject (enumType, (object)value);
+		}
+		public static object ToObject(Type enumType, int value)
+		{
+			return ToObject (enumType, (object)value);
+		}
+		public static object ToObject(Type enumType, long value)
+		{
+			return ToObject (enumType, (object)value);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public static extern object ToObject(Type enumType, object value);
+
+		[CLSCompliant(false)]
+		public static object ToObject(Type enumType, sbyte value)
+		{
+			return ToObject (enumType, (object)value);
+		}
+		[CLSCompliant(false)]
+		public static object ToObject(Type enumType, ushort value)
+		{
+			return ToObject (enumType, (object)value);
+		}
+		[CLSCompliant(false)]
+		public static object ToObject(Type enumType, uint value)
+		{
+			return ToObject (enumType, (object)value);
+		}
+		[CLSCompliant(false)]
+		public static object ToObject(Type enumType, ulong value)
+		{
+			return ToObject (enumType, (object)value);
+		}
+
+		public override bool Equals (object obj)
+		{
+			if (null == obj)
+				return false;
+
+			if (obj.GetType() != this.GetType())
+				return false;
+
+			object v1 = this.get_value ();
+			object v2 = ((Enum)obj).get_value ();
+
+			return v1.Equals (v2);
+		}
+
+		public override int GetHashCode ()
+		{
+			object v = this.get_value ();
+			return v.GetHashCode ();
+		}
+
+		[MonoTODO]
+		public static string Format (Type enumType, object value, string format)
+		{
+			if (null == enumType)
+				throw new ArgumentNullException("enumType cannot be null");
+			if (null == value)
+				throw new ArgumentNullException("value cannot be null");
+			if (null == format)
+				throw new ArgumentNullException("format cannot be null");
+
+			if (!enumType.IsEnum)
+				throw new ArgumentException("enumType is not an Enum Type");
+			
+			Type vType = value.GetType();
+			if (vType != enumType && vType != Enum.GetUnderlyingType(enumType))
+				throw new ArgumentException();
+
+
+			if (format.Length != 1)
+				throw new FormatException ("Format String can be only \"G\",\"g\",\"X\"," + 
+							  "\"x\",\"F\",\"f\",\"D\" or \"d\".");
+
+			char formatChar = format [0];
+			if ((formatChar == 'G' || formatChar == 'g') 
+				&& Attribute.IsDefined(enumType, typeof(FlagsAttribute)))
+				formatChar = 'F';
+
+			string retVal = "";
+			switch (formatChar) {
+			    case 'G':
+			    case 'g':
+				retVal = GetName (enumType, value);
+				if (retVal == null)
+					retVal = value.ToString();
+				break;
+			    case 'X':
+			    case 'x':
+				retVal = value.ToString();
+				long xValue = Int64.Parse(retVal);
+				// FIXME: Not sure if padding should always be with precision
+				// 8, if it's culture specific, or what.  This works for me.
+				retVal = xValue.ToString("x8");
+				break;
+			    case 'D':
+			    case 'd':
+				retVal = value.ToString();
+				break;
+			    case 'F':
+			    case 'f':
+				MonoEnumInfo info;
+				MonoEnumInfo.GetInfo (enumType, out info);
+				// This is ugly, yes.  We need to handle the different integer
+				// types for enums.  If someone else has a better idea, be my guest.
+				switch (((Enum)info.values.GetValue (0)).GetTypeCode()) {
+					case TypeCode.Byte:
+						byte byteFlag = (byte)value;
+						byte byteenumValue;
+						for (int i = info.values.Length-1; i>=0 && byteFlag != 0; i--) {
+							byteenumValue = (byte)info.values.GetValue (i);
+							if ((byteenumValue & byteFlag) == byteenumValue){
+								retVal = info.names[i] + (retVal == String.Empty ? "" : ", ") + retVal;
+								byteFlag -= byteenumValue;
+							}
+						}
+						break;
+					case TypeCode.SByte:
+						SByte sbyteFlag = (SByte)value;
+						SByte sbyteenumValue;
+						for (int i = info.values.Length-1; i>=0 && sbyteFlag != 0; i--) {
+							sbyteenumValue = (SByte)info.values.GetValue (i);
+							if ((sbyteenumValue & sbyteFlag) == sbyteenumValue){
+								retVal = info.names[i] + (retVal == String.Empty ? "" : ", ") + retVal;
+								sbyteFlag -= sbyteenumValue;
+							}
+						}
+						break;
+					case TypeCode.Int16:
+						short Int16Flag = (short)value;
+						short Int16enumValue;
+						for (int i = info.values.Length-1; i>=0 && Int16Flag != 0; i--) {
+							Int16enumValue = (short)info.values.GetValue (i);
+							if ((Int16enumValue & Int16Flag) == Int16enumValue){
+								retVal = info.names[i] + (retVal == String.Empty ? "" : ", ") + retVal;
+								Int16Flag -= Int16enumValue;
+							}
+						}
+						break;
+					case TypeCode.Int32:
+						int Int32Flag = (int)value;
+						int Int32enumValue;
+						for (int i = info.values.Length-1; i>=0 && Int32Flag != 0; i--) {
+							Int32enumValue = (int)info.values.GetValue (i);
+							if ((Int32enumValue & Int32Flag) == Int32enumValue){
+								retVal = info.names[i] + (retVal == String.Empty ? "" : ", ") + retVal;
+								Int32Flag -= Int32enumValue;
+							}
+						}
+						break;
+					case TypeCode.Int64:
+						long Int64Flag = (long)value;
+						long Int64enumValue;
+						for (int i = info.values.Length-1; i>=0 && Int64Flag != 0; i--) {
+							Int64enumValue = (long)info.values.GetValue (i);
+							if ((Int64enumValue & Int64Flag) == Int64enumValue){
+								retVal = info.names[i] + (retVal == String.Empty ? "" : ", ") + retVal;
+								Int64Flag -= Int64enumValue;
+							}
+						}
+						break;
+					case TypeCode.UInt16:
+						UInt16 UInt16Flag = (UInt16)value;
+						UInt16 UInt16enumValue;
+						for (int i = info.values.Length-1; i>=0 && UInt16Flag != 0; i--) {
+							UInt16enumValue = (UInt16)info.values.GetValue (i);
+							if ((UInt16enumValue & UInt16Flag) == UInt16enumValue){
+								retVal = info.names[i] + (retVal == String.Empty ? "" : ", ") + retVal;
+								UInt16Flag -= UInt16enumValue;
+							}
+						}
+						break;
+					case TypeCode.UInt32:
+						UInt32 UInt32Flag = (UInt32)value;
+						UInt32 UInt32enumValue;
+						for (int i = info.values.Length-1; i>=0 && UInt32Flag != 0; i--) {
+							UInt32enumValue = (UInt32)info.values.GetValue (i);
+							if ((UInt32enumValue & UInt32Flag) == UInt32enumValue){
+								retVal = info.names[i] + (retVal == String.Empty ? "" : ", ") + retVal;
+								UInt32Flag -= UInt32enumValue;
+							}
+						}
+						break;
+					case TypeCode.UInt64:
+						UInt64 UInt64Flag = (UInt64)value;
+						UInt64 UInt64enumValue;
+						for (int i = info.values.Length-1; i>=0 && UInt64Flag != 0; i--) {
+							UInt64enumValue = (UInt64)info.values.GetValue (i);
+							if ((UInt64enumValue & UInt64Flag) == UInt64enumValue){
+								retVal = info.names[i] + (retVal == String.Empty ? "" : ", ") + retVal;
+								UInt64Flag -= UInt64enumValue;
+							}
+						}
+						break;
+				}
+				break;
+			    default:
+				throw new FormatException ("Format String can be only \"G\",\"g\",\"X\"," + 
+							  "\"x\",\"F\",\"f\",\"D\" or \"d\".");
+			}
+
+			return retVal;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/Environment.cs b/mcs/class/corlib/System/Environment.cs
new file mode 100644
index 00000000000..94483de627f
--- /dev/null
+++ b/mcs/class/corlib/System/Environment.cs
@@ -0,0 +1,303 @@
+//------------------------------------------------------------------------------

+// 

+// System.Environment.cs 

+//

+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved

+// 

+// Author:         Jim Richardson, develop@wtfo-guru.com

+//                 Dan Lewis (dihlewis@yahoo.co.uk)

+// Created:        Saturday, August 11, 2001 

+//

+//------------------------------------------------------------------------------

+

+using System;

+using System.IO;

+//using System.Diagnostics;

+using System.Collections;

+using System.Security;

+using System.Security.Permissions;

+using System.Runtime.CompilerServices;

+

+namespace System

+{

+	public sealed class Environment

+	{

+		private Environment () {}

+

+		[MonoTODO]

+		public enum SpecialFolder

+		{	// TODO: Determine if these windoze style folder identifiers 

+			//       have unix/linux counterparts

+			Programs = 0x02,

+			Personal = 0x05,

+			Favorites = 0x06,

+			Startup = 0x07,

+			Recent = 0x08,

+			SendTo = 0x09,

+			StartMenu = 0x0b,

+			DesktopDirectory = 0x10,

+			Templates = 0x15,

+			ApplicationData	= 0x1a,

+			LocalApplicationData = 0x1c,

+			InternetCache = 0x20,

+			Cookies = 0x21,

+			History = 0x22,

+			CommonApplicationData	= 0x23,

+			System = 0x25,

+			ProgramFiles = 0x26,

+			CommonProgramFiles = 0x2b,

+		}

+

+		// TODO: Make sure the security attributes do what I expect

+			

+		/// <summary>

+		/// Gets the command line for this process

+		/// </summary>

+		public static string CommandLine

+		{	// TODO: Coordinate with implementor of EnvironmentPermissionAttribute

+			// [EnvironmentPermissionAttribute(SecurityAction.Demand, Read = "COMMANDLINE")]

+			get

+			{

+				// FIXME: we may need to quote, but any sane person

+				// should use GetCommandLineArgs () instead.

+				return String.Join (" ", GetCommandLineArgs ());

+			}

+		}

+

+		/// <summary>

+		/// Gets or sets the current directory. Actually this is supposed to get

+		/// and/or set the process start directory acording to the documentation

+		/// but actually test revealed at beta2 it is just Getting/Setting the CurrentDirectory

+		/// </summary>

+		public static string CurrentDirectory

+		{

+			// originally it was my thought that the external call would be made in

+			// the directory class however that class has additional security requirements

+			// so the Directory class will call this class for its get/set current directory

+			

+			// [EnvironmentPermissionAttribute(SecurityAction.Demand, Unrestricted = true)]

+			get

+			{

+				return MonoIO.GetCurrentDirectory ();

+			}

+			[MonoTODO("disabled because of compile error. Need mcs magic.")]

+			//[SecurityPermissionAttribute(SecurityAction.Demand, Flags = SecurityPermissionFlag.UnmanagedCode)]

+			set

+			{

+				MonoIO.SetCurrentDirectory (value);

+			}

+		}

+

+		/// <summary>

+		/// Gets or sets the exit code of this process

+		/// </summary>

+		[MonoTODO]

+		public static int ExitCode

+		{	

+			get

+			{

+				throw new NotImplementedException ();

+			}

+			set

+			{

+				throw new NotImplementedException ();

+			}

+		}

+

+		/// <summary>

+		/// Gets the name of the local computer

+		/// </summary>

+		public extern static string MachineName {

+			[MethodImplAttribute (MethodImplOptions.InternalCall)]

+			get;

+		}

+

+		/// <summary>

+		/// Gets the standard new line value

+		/// </summary>

+		public extern static string NewLine {

+			[MethodImplAttribute (MethodImplOptions.InternalCall)]

+			get;

+		}

+

+

+		//

+		// Support methods and fields for OSVersion property

+		//

+		static OperatingSystem os;

+

+		static extern PlatformID Platform {

+			[MethodImplAttribute (MethodImplOptions.InternalCall)]

+			get;

+		}

+

+		/// <summary>

+		/// Gets the current OS version information

+		/// </summary>

+		public static OperatingSystem OSVersion {

+			get {

+				if (os == null)

+					os = new OperatingSystem (Platform, new Version (5,1,2600,0));

+

+				return os;

+			}

+		}

+

+		/// <summary>

+		/// Get StackTrace

+		/// </summary>

+		public static string StackTrace	{

+			get {

+				try {

+					throw new Exception ();

+				} catch (Exception e) {

+					return e.StackTrace;

+				}

+			}

+		}

+

+		/// <summary>

+		/// Get a fully qualified path to the system directory

+		/// </summary>

+		public static string SystemDirectory

+		{

+			get

+			{

+				return GetFolderPath(SpecialFolder.System);

+			}

+		}

+

+		/// <summary>

+		/// Get the number of milliseconds that have elapsed since the system was booted

+		/// </summary>

+		public extern static int TickCount {

+			[MethodImplAttribute (MethodImplOptions.InternalCall)]

+			get;

+		}

+

+		/// <summary>

+		/// Get UserDomainName

+		/// </summary>

+		[MonoTODO]

+		public static string UserDomainName {

+			get {

+				return MachineName;

+			}

+		}

+

+		/// <summary>

+		/// Gets a flag indicating whether the process is in interactive mode

+		/// </summary>

+		[MonoTODO]

+		public static bool UserInteractive

+		{

+			get

+			{

+				return false;

+			}

+		}

+

+		/// <summary>

+		/// Get the user name of current process is running under

+		/// </summary>

+		[MonoTODO]

+		public static string UserName

+		{

+			get

+			{

+				// TODO: needs more research/work/thought

+				string result = GetEnvironmentVariable("USERNAME");

+				if(result == null || result.Equals(string.Empty))

+				{

+					result = GetEnvironmentVariable("USER");

+				}

+				return result;

+			}

+		}

+

+		/// <summary>

+		/// Get the version of the common language runtime 

+		/// </summary>

+		[MonoTODO]

+		public static Version Version {

+			get {

+				return new Version();

+			}

+		}

+

+		/// <summary>

+		/// Get the amount of physical memory mapped to process

+		/// </summary>

+		[MonoTODO]

+		public static long WorkingSet

+		{

+			get

+			{

+				return 0;

+			}

+		}

+

+		[MethodImplAttribute (MethodImplOptions.InternalCall)]

+		public extern static void Exit(int exitCode);

+

+		/// <summary>

+		/// Substitute environment variables in the argument "name"

+		/// </summary>

+		[MonoTODO]

+		public static string ExpandEnvironmentVariables(string name)

+		{

+			return name;

+		}

+

+		/// <summary>

+		/// Return an array of the command line arguments of the current process

+		/// </summary>

+		[MethodImplAttribute (MethodImplOptions.InternalCall)]

+		public extern static string[] GetCommandLineArgs();

+

+		/// <summary>

+		/// Return a string containing the value of the environment

+		/// variable identifed by parameter "variable"

+		/// </summary>

+		[MethodImplAttribute (MethodImplOptions.InternalCall)]

+		public extern static string GetEnvironmentVariable (string name);

+

+		/// <summary>

+		/// Return a set of all environment variables and their values

+		/// </summary>

+	   

+		public static IDictionary GetEnvironmentVariables()

+		{

+			Hashtable vars = new Hashtable ();

+			foreach (string name in GetEnvironmentVariableNames ())

+				vars [name] = GetEnvironmentVariable (name);

+			

+			return vars;

+		}

+

+		/// <summary>

+		/// Returns the fully qualified path of the

+		/// folder specified by the "folder" parameter

+		/// </summary>

+		[MonoTODO]

+		public static string GetFolderPath(SpecialFolder folder)

+		{

+			return null;

+		}

+

+		/// <summary>

+		/// Returns an array of the logical drives

+		/// </summary>

+		[MonoTODO]

+		public static string[] GetLogicalDrives()

+		{

+			return null;

+		}

+

+		// private methods

+

+		[MethodImplAttribute (MethodImplOptions.InternalCall)]

+		private extern static string [] GetEnvironmentVariableNames ();

+

+	}

+}

diff --git a/mcs/class/corlib/System/EventArgs.cs b/mcs/class/corlib/System/EventArgs.cs
new file mode 100644
index 00000000000..c2460152d2e
--- /dev/null
+++ b/mcs/class/corlib/System/EventArgs.cs
@@ -0,0 +1,26 @@
+//------------------------------------------------------------------------------
+// 
+// System.EventArgs.cs 
+//
+// Copyright (C) 2001 Michael Lambert, All Rights Reserved
+// 
+// Author:         Michael Lambert, michaellambert@email.com
+// Created:        Mon 07/16/2001 
+//
+//------------------------------------------------------------------------------
+
+using System;
+
+namespace System {
+
+	[Serializable]
+	public class EventArgs
+	{
+		public static readonly EventArgs Empty = new EventArgs();
+	
+		public EventArgs() { }
+	}
+
+} // System
+
+
diff --git a/mcs/class/corlib/System/EventHandler.cs b/mcs/class/corlib/System/EventHandler.cs
new file mode 100644
index 00000000000..407255b604e
--- /dev/null
+++ b/mcs/class/corlib/System/EventHandler.cs
@@ -0,0 +1,16 @@
+//
+// System.EventHandler.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	public delegate void EventHandler (object sender, EventArgs e);
+
+}
+
+
diff --git a/mcs/class/corlib/System/Exception.cs b/mcs/class/corlib/System/Exception.cs
new file mode 100644
index 00000000000..0271313fc0b
--- /dev/null
+++ b/mcs/class/corlib/System/Exception.cs
@@ -0,0 +1,159 @@
+//
+// System.Exception.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+using System.Reflection;
+
+namespace System {
+
+	[Serializable]
+//	[ClassInterface (ClassInterfaceType.AutoDual)] (no implementation yet)
+	[MonoTODO]
+	public class Exception : ISerializable {
+		IntPtr [] trace_ips;
+		Exception inner_exception;
+		string message;
+		string help_link;
+		string class_name;
+		string stack_trace = null;
+		string remote_stack_trace = "TODO: Implement remote stack trace";
+		int remote_stack_index;
+		int hresult;
+		string source;
+		
+		public Exception ()
+		{
+			inner_exception = null;
+			message = "";
+		}
+
+		public Exception (string msg)
+		{
+			inner_exception = null;
+			message = msg;
+		}
+
+		protected Exception (SerializationInfo info, StreamingContext sc)
+		{
+			if (info == null)
+				throw new ArgumentNullException ("info");
+
+			class_name      = info.GetString ("ClassName");
+			message         = info.GetString ("Message");
+			inner_exception = (Exception) info.GetValue  ("InnerException", typeof (Exception));
+			help_link       = info.GetString ("HelpURL");
+			stack_trace     = info.GetString ("StackTraceString");
+			remote_stack_trace = info.GetString ("RemoteStackTrace");
+			remote_stack_index = info.GetInt32  ("RemoteStackIndex");
+			hresult            = info.GetInt32  ("HResult");
+			source             = info.GetString ("Source");
+		}
+
+		public Exception (string msg, Exception e)
+		{
+			inner_exception = e;
+			message = msg;
+		}
+
+		public Exception InnerException {
+			get {
+				return inner_exception;
+			}
+		}
+
+		public virtual string HelpLink {
+			get {
+				return help_link;
+			}
+
+			set {
+				help_link = value;
+			}
+		}
+
+		protected int HResult {
+			get {
+				return hresult;
+			}
+
+			set {
+				hresult = value;
+			}
+		}
+
+		public virtual string Message {
+			get {
+				return message;
+			}
+		}
+
+		[MonoTODO]
+		public virtual string Source {
+			get {
+				// TODO: if source is null, we must return
+				// the name of the assembly where the error
+				// originated.
+				return source;
+			}
+
+			set {
+				source = value;
+			}
+		}
+
+		public virtual string StackTrace {
+			get {
+				return stack_trace;
+			}
+		}
+
+		[MonoTODO]
+		public MethodBase TargetSite {
+			get {
+				// TODO: Implement this.
+				return null;
+			}
+		}
+
+		public virtual Exception GetBaseException ()
+		{
+			Exception inner = inner_exception;
+				
+			while (inner != null){
+				if (inner.InnerException != null)
+					inner = inner.InnerException;
+				else
+					return inner;
+			}
+
+			return this;
+		}
+
+		public virtual void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			info.AddValue ("ClassName", class_name);
+			info.AddValue ("Message",   message);
+			info.AddValue ("InnerException", inner_exception);
+			info.AddValue ("HelpURL",   help_link);
+			info.AddValue ("StackTraceString", stack_trace);
+			info.AddValue ("RemoteStackTrace", remote_stack_trace);
+			info.AddValue ("RemoteStackIndex", remote_stack_index);
+			info.AddValue ("HResult", hresult);
+			info.AddValue ("Source", source);
+		}
+
+		public override string ToString ()
+		{
+			return this.GetType ().FullName + ": " + Message + "\n" +
+				// GetBaseException ().GetType ().FullName +
+				stack_trace;
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/System/ExecutionEngineException.cs b/mcs/class/corlib/System/ExecutionEngineException.cs
new file mode 100644
index 00000000000..f005ecb70f0
--- /dev/null
+++ b/mcs/class/corlib/System/ExecutionEngineException.cs
@@ -0,0 +1,31 @@
+//
+// System.ExecutionEngineException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+namespace System {
+
+	[Serializable]
+	public sealed class ExecutionEngineException : SystemException {
+		// Constructors
+		public ExecutionEngineException ()
+			: base (Locale.GetText ("Internal error occurred")) // Haha. Nice.
+		{
+		}
+
+		public ExecutionEngineException (string message)
+			: base (message)
+		{
+		}
+
+		public ExecutionEngineException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/FieldAccessException.cs b/mcs/class/corlib/System/FieldAccessException.cs
new file mode 100644
index 00000000000..342a405ddd6
--- /dev/null
+++ b/mcs/class/corlib/System/FieldAccessException.cs
@@ -0,0 +1,41 @@
+//	
+// System.FieldAccessException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class FieldAccessException : MemberAccessException
+	{
+		// Constructors
+		public FieldAccessException ()
+			: base (Locale.GetText ("Attempt to access a private/protected field failed."))
+			{
+			}
+		
+		public FieldAccessException (string message)
+			: base (message)
+			{
+			}
+		
+		protected FieldAccessException (SerializationInfo info,
+					     StreamingContext context)
+			: base (info, context)
+			{
+			}
+		
+		public FieldAccessException (string message, Exception innerException)
+			:base (message, innerException)
+			{
+			}
+		
+	}
+}
diff --git a/mcs/class/corlib/System/FlagsAttribute.cs b/mcs/class/corlib/System/FlagsAttribute.cs
new file mode 100755
index 00000000000..8c2b40defa0
--- /dev/null
+++ b/mcs/class/corlib/System/FlagsAttribute.cs
@@ -0,0 +1,29 @@
+//
+// System.FlagsAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	/// <summary>
+	///   The FlagsAttribute tags enumerations as bitfields.
+	/// </summary>
+	///
+	/// <remarks>
+	///   The FlagsAttribute can be used to tag an enumeration to be 
+	///   a bit field.  This will allow the compiler and visual tools
+	///   to treat the bits in an enumeration as a set of flags.
+	/// </remarks>
+
+	[AttributeUsage (AttributeTargets.Enum)]
+	[Serializable]
+	public class FlagsAttribute : Attribute {
+
+		// No methods.
+		
+	}
+}
diff --git a/mcs/class/corlib/System/FormatException.cs b/mcs/class/corlib/System/FormatException.cs
new file mode 100644
index 00000000000..2140db44359
--- /dev/null
+++ b/mcs/class/corlib/System/FormatException.cs
@@ -0,0 +1,39 @@
+//
+// System.FormatException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class FormatException : SystemException {
+		// Constructors
+		public FormatException ()
+			: base (Locale.GetText ("Invalid format"))
+		{
+		}
+
+		public FormatException (string message)
+			: base (message)
+		{
+		}
+
+		public FormatException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected FormatException (SerializationInfo info,
+					StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/GC.cs b/mcs/class/corlib/System/GC.cs
new file mode 100755
index 00000000000..f478a1f1589
--- /dev/null
+++ b/mcs/class/corlib/System/GC.cs
@@ -0,0 +1,65 @@
+
+
+//
+// System/GC.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Runtime.CompilerServices;
+
+namespace System {
+	public sealed class GC {
+
+		private GC () {}
+
+		/* as long as we use Boehm... */
+		public static int MaxGeneration {
+			get {return 0;}
+		}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		extern static void InternalCollect (int generation);
+		
+		public static void Collect () {
+			InternalCollect (MaxGeneration);
+		}
+
+		public static void Collect (int generation) {
+			if (generation < 0 || generation > MaxGeneration)
+				throw new ArgumentOutOfRangeException ("generation");
+			InternalCollect (generation);
+		}
+
+		public static int GetGeneration (object obj) {
+			return 0;
+		}
+
+		public static int GetGeneration (WeakReference wo) {
+			if (!wo.IsAlive)
+				throw new ArgumentException ();
+			return 0;
+		}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static long GetTotalMemory (bool forceFullCollection);
+
+		/* this icall has weird semantics check the docs... */
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static void KeepAlive (object obj);
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static void ReRegisterForFinalize (object obj);
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static void SuppressFinalize (object obj);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+		public extern static void WaitForPendingFinalizers();
+		
+	}
+}
diff --git a/mcs/class/corlib/System/Guid.cs b/mcs/class/corlib/System/Guid.cs
new file mode 100755
index 00000000000..5f15c707ce0
--- /dev/null
+++ b/mcs/class/corlib/System/Guid.cs
@@ -0,0 +1,654 @@
+//
+// System.Guid
+//
+// author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (C) 2002 Duco Fijma
+//
+
+using System.Globalization;
+using System.Security.Cryptography;
+
+namespace System {
+
+[Serializable]
+public struct Guid  : IFormattable, IComparable  {
+
+	private uint _timeLow;
+	private ushort _timeMid;
+	private ushort _timeHighAndVersion;
+	private byte _clockSeqHiAndReserved;
+	private byte _clockSeqLow;
+	private byte _node0;
+	private byte _node1;
+	private byte _node2;
+	private byte _node3;
+	private byte _node4;
+	private byte _node5;
+
+	internal class GuidState {
+		protected Random _prnd; // Pseudo RNG
+		protected RandomNumberGenerator _rnd; // Strong RNG
+		protected bool _usePRnd; // 'true' for pseudo RNG
+		protected ushort _clockSeq;
+		protected ulong _lastTimestamp;
+		protected byte[] _mac;
+
+		public int NextInt(uint x)
+		 {
+			if (_usePRnd) {
+				return _prnd.Next ((int) x);
+			}
+			else {
+				byte[] b = new byte[4];
+				_rnd.GetBytes (b);
+
+				uint res = BitConverter.ToUInt32 (b, 0);
+				res = (res % x);
+				return (int) res;
+			}
+		}
+
+		public void NextBytes(byte[] b)
+		{
+			if ( _usePRnd ) {
+				_prnd . NextBytes (b);
+			}
+			else {
+				_rnd . GetBytes (b);
+			}
+		}
+	
+		[MonoTODO("Get real MAC address")]
+		public GuidState (bool usePRnd)
+		{
+			_usePRnd = usePRnd;
+			if ( _usePRnd ) {
+				_prnd = new Random (unchecked((int) DateTime.Now.Ticks));
+			}
+			else {
+				_rnd = RandomNumberGenerator.Create ();
+			}
+			_clockSeq = (ushort) NextInt (0x4000); // 14 bits
+			_lastTimestamp = 0ul;
+			_mac = new byte[6];
+			NextBytes (_mac);
+			_mac[0] |= 0x80;
+		}
+
+		public ulong NewTimestamp ()
+		{
+			ulong timestamp;
+
+			do {
+				timestamp = (ulong) (DateTime.UtcNow - new DateTime (1582, 10, 15, 0, 0, 0)).Ticks;
+				if (timestamp < _lastTimestamp) {
+					// clock moved backwards!
+					_clockSeq++;
+					_clockSeq = (ushort) (_clockSeq & 0x3fff);
+					return timestamp;
+				}
+				if (timestamp > _lastTimestamp) {
+					_lastTimestamp = timestamp;
+					return timestamp;
+				}
+			}
+			while (true);
+		}
+
+		public ushort ClockSeq {
+			get {
+				return _clockSeq;
+			}
+		}
+
+		public byte[] MAC {
+			get {
+				return _mac;
+			}
+			
+		}
+		
+	};
+
+	internal class GuidParser {
+
+		private string _src;
+		private int _length;
+		private int _cur;
+	
+		public GuidParser (string src)
+		{
+			_src = src;
+			Reset ();
+		}
+		
+		private void Reset ()
+		{
+			_cur = 0;
+			_length = _src.Length;
+		}
+	
+		private bool AtEnd ()
+		{
+			return _cur >= _length;
+		}
+	
+		private void ThrowFormatException ()
+		{
+			throw new FormatException (Locale.GetText ("Invalid format for Guid.Guid(string)"));
+		}
+	
+		private ulong ParseHex(int length, bool strictLength)
+		{
+			ulong res = 0;
+			int i;
+			bool end = false;
+		
+			for (i=0; (!end) && i<length; ++i) {
+				if (AtEnd ()) {
+					if (strictLength || i==0) {
+						ThrowFormatException ();
+					}
+					else {
+						end = true;
+					}
+				}
+				else {
+					char c = Char.ToLower (_src[_cur]);
+					if (Char.IsDigit (c)) {
+						res = res * 16 + c - '0';
+						_cur++;
+					}
+					else if (c >= 'a' && c <= 'f') {
+						res = res * 16 + c - 'a' + 10;
+						_cur++;
+					}
+					else {
+						if (strictLength || i==0) {
+							ThrowFormatException ();
+						}
+						else {
+							end = true;
+						}
+					}
+				}
+			}
+			
+			return res;
+		}
+	
+		private bool ParseOptChar (char c)
+		{
+			if (!AtEnd() && _src[_cur] == c) {
+				_cur++;
+				return true;
+			}
+			else {
+				return false;
+			}
+		}
+	
+		private void ParseChar (char c)
+		{
+			bool b = ParseOptChar (c);
+			if (!b) {
+				ThrowFormatException ();
+			}
+		}
+	
+		private Guid ParseGuid1 ()
+		{
+			bool openBrace; 
+			int a;
+			short b;
+			short c;
+			byte[] d = new byte[8];
+			int i;
+	
+			openBrace = ParseOptChar ('{');
+			a = (int) ParseHex(8, true);
+			ParseChar('-');
+			b = (short) ParseHex(4, true);
+			ParseChar('-');
+			c = (short) ParseHex(4, true);
+			ParseChar('-');
+			for (i=0; i<8; ++i) {
+				d[i] = (byte) ParseHex(2, true);
+				if (i == 1) {
+					ParseChar('-');
+				}	
+			}
+
+			if (openBrace && !ParseOptChar('}')) {
+				ThrowFormatException ();
+			}
+	
+			return new Guid(a, b, c, d);
+		}
+	
+		private void ParseHexPrefix ()
+		{
+			ParseChar ('0');
+			ParseChar ('x');
+		}
+	
+		private Guid ParseGuid2 ()
+		{
+			int a;
+			short b;
+			short c;
+			byte[] d = new byte [8];
+			int i;
+	
+			ParseChar ('{');
+			ParseHexPrefix ();
+			a = (int) ParseHex (8, false);
+			ParseChar (',');
+			ParseHexPrefix ();
+			b = (short) ParseHex (4, false);
+			ParseChar (',');
+			ParseHexPrefix ();
+			c = (short) ParseHex (4, false);
+			ParseChar (',');
+			ParseChar ('{');
+			for (i=0; i<8; ++i) {
+				ParseHexPrefix ();
+				d[i] = (byte) ParseHex (2, false);
+				if (i != 7) {
+					ParseChar (',');
+				}
+
+			}	
+			ParseChar ('}');
+			ParseChar ('}');
+	
+			return new Guid (a,b,c,d);			
+			
+		}
+	
+		public Guid Parse ()
+		{
+			Guid g;
+	
+			try {
+				g  = ParseGuid1 ();
+			}
+			catch (FormatException) {
+				Reset ();
+				g = ParseGuid2 (); 
+			}
+			if (!AtEnd () ) {
+				ThrowFormatException ();
+			}
+			return g;
+		}
+
+	}
+
+	private static GuidState _guidState = new GuidState ( true /* use pseudo RNG? */ ); 
+
+	private static void CheckNull (object o)
+	{
+		if (o == null) {
+			throw new ArgumentNullException (Locale.GetText ("Value cannot be null."));
+		}
+	}
+
+	private static void CheckLength (byte[] o, int l)
+	{
+		if (o . Length != l) {
+			throw new ArgumentException (String.Format (Locale.GetText ("Array should be exactly {0} bytes long."), l));
+		}
+	}
+
+	private static void CheckArray (byte[] o, int l)
+	{
+		CheckNull (o);
+		CheckLength (o, l);
+	}
+
+	public Guid (byte[] b)
+	{
+		CheckArray (b, 16);
+		_timeLow = System.BitConverter.ToUInt32 (b, 0);
+		_timeMid = System.BitConverter.ToUInt16 (b, 4);
+		_timeHighAndVersion = System.BitConverter.ToUInt16 (b, 6);
+		_clockSeqHiAndReserved = b[8];
+		_clockSeqLow = b[9];
+		_node0 = b[10];
+		_node1 = b[11];
+		_node2 = b[12];
+		_node3 = b[13];
+		_node4 = b[14];
+		_node5 = b[15];
+	}
+
+	public Guid (string g)
+	{
+		CheckNull (g);
+
+		GuidParser p = new GuidParser (g);
+		Guid guid = p.Parse();
+
+		this = guid;
+	}
+
+	public Guid (int a, short b, short c, byte[] d) 
+	{
+		CheckArray(d, 8);
+		_timeLow = (uint) a;
+		_timeMid = (ushort) b;
+		_timeHighAndVersion = (ushort) c;
+		_clockSeqHiAndReserved = d[0];
+		_clockSeqLow = d[1];
+		_node0 = d[2];
+		_node1 = d[3];
+		_node2 = d[4];
+		_node3 = d[5];
+		_node4 = d[6];
+		_node5 = d[7];
+	}
+
+	public Guid (
+		int a,
+		short b,
+		short c,
+		byte d,
+		byte e,
+		byte f,
+		byte g,
+		byte h,
+		byte i,
+		byte j,
+		byte k)
+		: this((uint) a, (ushort) b, (ushort) c, d, e, f, g, h, i, j, k) {}
+
+	[CLSCompliant(false)]
+	public Guid (
+		uint a,
+		ushort b,
+		ushort c,
+		byte d,
+		byte e,
+		byte f,
+		byte g,
+		byte h,
+		byte i,
+		byte j,
+		byte k)
+	{
+		_timeLow = a;
+		_timeMid = b;
+		_timeHighAndVersion = c;
+		_clockSeqHiAndReserved = d;
+		_clockSeqLow = e;
+		_node0 = f;
+		_node1 = g;
+		_node2 = h;
+		_node3 = i;
+		_node4 = j;
+		_node5 = k;
+	}
+
+	public static readonly Guid Empty = new Guid(0,0,0,0,0,0,0,0,0,0,0);
+
+	private static int Compare (uint x, uint y)
+	{
+		if (x < y) {
+			return -1;
+		}
+		else {
+			return 1;
+		}
+	}
+
+	public int CompareTo (object value )
+	{
+		if (value == null )
+			return 1;
+
+		if (!(value is Guid)) {
+			throw new ArgumentException (Locale.GetText (
+				"Argument of System.Guid.CompareTo should be a Guid"));
+		}
+
+		Guid v = (Guid) value;
+
+		if (_timeLow != v._timeLow ) {
+			return Compare(_timeLow, v._timeLow);
+		}
+		else if (_timeMid != v._timeMid) {
+			return Compare(_timeMid, v._timeMid);
+		}
+		else if (_timeHighAndVersion != v._timeHighAndVersion) {
+			return Compare(_timeHighAndVersion, v._timeHighAndVersion);
+		}
+		else if (_clockSeqHiAndReserved != v._clockSeqHiAndReserved) {
+			return Compare(_clockSeqHiAndReserved, v._clockSeqHiAndReserved);
+		}
+		else if (_clockSeqLow != v._clockSeqLow) {
+			return Compare(_clockSeqLow, v._clockSeqLow);
+		}
+		else if (_node0 != v._node0) {
+			return Compare(_node0, v._node0);
+		}
+		else if (_node1 != v._node1) {
+			return Compare(_node1, v._node1);
+		}
+		else if (_node2 != v._node2) {
+			return Compare(_node2, v._node2);
+		}
+		else if (_node3 != v._node3) {
+			return Compare(_node3, v._node3);
+		}
+		else if (_node4 != v._node4) {
+			return Compare(_node4, v._node4);
+		}
+		else if (_node5 != v._node5) {
+			return Compare(_node5, v._node5);
+		}
+
+		return 0;
+	}
+
+	public override bool Equals ( object o )
+	{
+		try {
+			return CompareTo (o) == 0;	
+		}
+		catch ( ArgumentException ) {
+			return false;
+		}
+	}
+
+	public override int GetHashCode ()
+	{
+		int res;
+
+		res = (int) _timeLow; 
+		res = res ^ ((int) _timeMid << 16 | _timeHighAndVersion);
+		res = res ^ ((int) _clockSeqHiAndReserved << 24);
+		res = res ^ ((int) _clockSeqLow << 16);
+		res = res ^ ((int) _node0 << 8);
+		res = res ^ ((int) _node1);
+		res = res ^ ((int) _node2 << 24);
+		res = res ^ ((int) _node3 << 16);
+		res = res ^ ((int) _node4 << 8);
+		res = res ^ ((int) _node5);
+
+		return res;
+	}
+
+	private static Guid NewTimeGuid()
+	{
+		ulong timestamp = _guidState.NewTimestamp ();
+
+		// Bit [31..0] (32 bits) for timeLow
+		uint timeLow = (uint) (timestamp & 0x00000000fffffffful);
+		// Bit [47..32] (16 bits) for timeMid
+		ushort timeMid = (ushort) ((timestamp & 0x0000ffff00000000ul) >> 32); 
+		// Bit [59..48] (12 bits) for timeHi
+		ushort timeHi = (ushort) ((timestamp & 0x0fff000000000000ul) >> 48);
+		// Bit [7..0] (8 bits) for clockSeqLo
+		byte clockSeqLow = (byte) (Guid._guidState.ClockSeq & 0x00ffu);
+		// Bit [13..8] (6 bits) for clockSeqHi
+		byte clockSeqHi = (byte) ((Guid._guidState.ClockSeq & 0x3f00u) >> 8);
+		byte[] mac = _guidState.MAC;
+
+		clockSeqHi = (byte) (clockSeqHi | 0x80u); // Bit[7] = 1, Bit[6] = 0 (Variant)
+		timeHi = (ushort) (timeHi | 0x1000u); // Bit[15..13] = 1 (Guid is time-based)
+
+		return new Guid(timeLow, timeMid, timeHi, clockSeqHi, clockSeqLow, mac[0], mac[1], mac[2], mac[3], mac[4], mac[5]);
+	}
+
+	private static Guid NewRandomGuid ()
+	{
+		byte[] b = new byte[16];
+
+		_guidState.NextBytes (b);
+
+		Guid res = new Guid(b);
+		// Mask in Variant 1-0 in Bit[7..6]
+		res._clockSeqHiAndReserved = (byte) ((res._clockSeqHiAndReserved & 0x3fu) | 0x80u);
+		// Mask in Version 4 (random based Guid) in Bits[15..13]
+		res._timeHighAndVersion = (ushort) ((res._timeHighAndVersion & 0x0fffu) | 0x4000u);
+		return res;
+	}
+
+	[MonoTODO]
+	public static Guid NewGuid ()
+	{
+		return NewRandomGuid();
+	}
+
+	public byte[] ToByteArray ()
+	{
+		byte[] res = new byte[16];
+		byte[] tmp;
+		int d = 0;
+		int s;
+
+		tmp = BitConverter.GetBytes(_timeLow);
+		for (s=0; s<4; ++s) {
+			res[d++] = tmp[s];
+		}
+
+		tmp = BitConverter.GetBytes(_timeMid);
+		for (s=0; s<2; ++s) {
+			res[d++] = tmp[s];
+		}
+
+		tmp = BitConverter.GetBytes(_timeHighAndVersion);
+		for (s=0; s<2; ++s) {
+			res[d++] = tmp[s];
+		}
+
+		res[8] = _clockSeqHiAndReserved;
+		res[9] = _clockSeqLow;
+		res[10] = _node0;
+		res[11] = _node1;
+		res[12] = _node2;
+		res[13] = _node3;
+		res[14] = _node4;
+		res[15] = _node5;
+
+		return res;
+	}
+
+	private string BaseToString(bool h, bool p, bool b)
+	{
+		string res = "";
+		
+		if (p) {
+			res += "(";
+		}
+		else if (b) {
+			res += "{";
+		}
+	
+		res += _timeLow.ToString ("x8");
+		if (h) {
+			res += "-";
+		}
+		res += _timeMid.ToString ("x4");
+		if (h) {
+			res += "-";
+		}
+		res += _timeHighAndVersion.ToString ("x4");
+		if (h) {
+			res += "-";
+		}
+		res += _clockSeqHiAndReserved.ToString ("x2");
+		res += _clockSeqLow.ToString ("x2");
+		if (h) {
+			res += "-";
+		}
+		res += _node0.ToString ("x2");
+		res += _node1.ToString ("x2");
+		res += _node2.ToString ("x2");
+		res += _node3.ToString ("x2");
+		res += _node4.ToString ("x2");
+		res += _node5.ToString ("x2");
+
+		if (p) {
+			res += ")";
+		}
+		else if (b) {
+			res += "}";
+		}
+	
+		return res;
+	}
+
+	public override string ToString ()
+	{
+		return BaseToString (true, false, false);
+	}
+
+	public string ToString (string format)
+	{
+		string f;
+		bool h = true;
+		bool p = false;
+		bool b = false;
+
+		if (format != null) {
+			f = format.ToLower();
+
+			if (f == "b") {
+				b = true;
+			}
+			else if (f == "p") {
+				p = true;
+			}
+			else if (f == "n") {
+				h = false;
+			}
+			else if (f != "d" && f != "") {
+				throw new FormatException ( Locale.GetText ("Argument to Guid.ToString(string format) should be \"b\", \"B\", \"d\", \"D\", \"n\", \"N\", \"p\" or \"P\""));
+			}
+		}
+
+		return BaseToString (h, p, b);
+	}
+
+	public string ToString (string format, IFormatProvider provider)
+	{
+		return ToString (format);
+	}
+
+	public static bool operator == (Guid a, Guid b)
+	{
+		return a.Equals(b);
+	}
+
+	public static bool operator != (Guid a, Guid b)
+	{
+		return !( a.Equals (b) );
+	}
+
+}
+
+}
diff --git a/mcs/class/corlib/System/IAppDomainSetup.cs b/mcs/class/corlib/System/IAppDomainSetup.cs
new file mode 100644
index 00000000000..31eddcd62b7
--- /dev/null
+++ b/mcs/class/corlib/System/IAppDomainSetup.cs
@@ -0,0 +1,37 @@
+
+//
+// System/IAppDomainSetup.cs
+//
+// Author:
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System {
+
+	public interface IAppDomainSetup {
+
+		string ApplicationBase { get; set; }
+
+		string ApplicationName { get; set; }
+
+		string CachePath { get; set; }
+
+		string ConfigurationFile { get; set; }
+
+		string DynamicBase { get; set; }
+
+		string LicenseFile { get; set; }
+
+		string PrivateBinPath { get; set; }
+
+		string PrivateBinPathProbe { get; set; }
+
+		string ShadowCopyDirectories { get; set; }
+
+		string ShadowCopyFiles { get; set; }
+	}
+}
diff --git a/mcs/class/corlib/System/IAsyncResult.cs b/mcs/class/corlib/System/IAsyncResult.cs
new file mode 100644
index 00000000000..74ec69b8c7a
--- /dev/null
+++ b/mcs/class/corlib/System/IAsyncResult.cs
@@ -0,0 +1,43 @@
+//------------------------------------------------------------------------------
+// 
+// System.IAsyncResult.cs 
+//
+// Copyright (C) 2001 Michael Lambert, All Rights Reserved
+// 
+// Author:         Michael Lambert, michaellambert@email.com
+// Created:        Mon 08/24/2001 
+//
+//------------------------------------------------------------------------------
+
+using System;
+using System.Threading;
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+	public interface IAsyncResult
+	{
+		object AsyncState
+		{
+			get;
+		}
+
+		WaitHandle AsyncWaitHandle
+		{
+			get;
+		}
+
+		bool CompletedSynchronously
+		{
+			get;
+		}
+
+		bool IsCompleted
+		{
+			get;
+		}
+	}
+	
+} // Namespace System
+
+
diff --git a/mcs/class/corlib/System/ICloneable.cs b/mcs/class/corlib/System/ICloneable.cs
new file mode 100644
index 00000000000..792550db1f5
--- /dev/null
+++ b/mcs/class/corlib/System/ICloneable.cs
@@ -0,0 +1,15 @@
+//
+// System.ICloneable.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	public interface ICloneable {
+		object Clone ();
+	}
+}
diff --git a/mcs/class/corlib/System/IComparable.cs b/mcs/class/corlib/System/IComparable.cs
new file mode 100644
index 00000000000..50af10d15e2
--- /dev/null
+++ b/mcs/class/corlib/System/IComparable.cs
@@ -0,0 +1,15 @@
+//
+// System.IComparable.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	public interface IComparable {
+		int CompareTo (object obj);
+	}
+}
diff --git a/mcs/class/corlib/System/IConvertible.cs b/mcs/class/corlib/System/IConvertible.cs
new file mode 100644
index 00000000000..95612b04c21
--- /dev/null
+++ b/mcs/class/corlib/System/IConvertible.cs
@@ -0,0 +1,55 @@
+//
+// System.IConvertible.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+//
+// Functions Implementing this interface should check out 
+// System.Convert. Most of these methods are implemented 
+// there for all these data types.
+//
+// System.Convert has ToType helper method for the object 
+// ToType (Type conversionType, IFormatProvider provider)
+// method. In most cases you can specify your ToType function
+// as calling 
+//
+// public Type value; // value of this data type
+// public object ToType(Type conversionType, IFormatProvider provider) {
+//    Convert.ToType (value, conversionType, provider);
+// } 
+// 
+// Which is just a wrapper for your ToType methods.
+//
+// See http://lists.ximian.com/archives/public/mono-list/2001-July/000525.html
+// for more discussion on the topic
+//
+
+namespace System {
+
+    [CLSCompliant(false)]
+    public interface IConvertible {
+	
+	TypeCode GetTypeCode ();
+	
+	bool     ToBoolean  (IFormatProvider provider);
+	byte     ToByte     (IFormatProvider provider);
+	char     ToChar     (IFormatProvider provider);
+	DateTime ToDateTime (IFormatProvider provider);
+	decimal  ToDecimal  (IFormatProvider provider);
+	double   ToDouble   (IFormatProvider provider);
+	short    ToInt16    (IFormatProvider provider);
+	int      ToInt32    (IFormatProvider provider);
+	long     ToInt64    (IFormatProvider provider);
+	sbyte    ToSByte    (IFormatProvider provider);
+	float    ToSingle   (IFormatProvider provider);
+	string   ToString   (IFormatProvider provider);
+	object   ToType     (Type conversionType, IFormatProvider provider);
+	ushort   ToUInt16   (IFormatProvider provider);
+	uint     ToUInt32   (IFormatProvider provider);
+	ulong    ToUInt64   (IFormatProvider provider);
+    }
+}
diff --git a/mcs/class/corlib/System/ICustomFormatter.cs b/mcs/class/corlib/System/ICustomFormatter.cs
new file mode 100644
index 00000000000..1c51ab9c025
--- /dev/null
+++ b/mcs/class/corlib/System/ICustomFormatter.cs
@@ -0,0 +1,15 @@
+//
+// System.ICustomFormatter.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	public interface ICustomFormatter {
+		string Format (string format, object arg, IFormatProvider formatProvider);
+	}
+}
diff --git a/mcs/class/corlib/System/IDisposable.cs b/mcs/class/corlib/System/IDisposable.cs
new file mode 100644
index 00000000000..6c3ca1b6367
--- /dev/null
+++ b/mcs/class/corlib/System/IDisposable.cs
@@ -0,0 +1,17 @@
+//
+// System.IDisposable.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	public interface IDisposable {
+
+		void Dispose ();
+		
+	}
+}
diff --git a/mcs/class/corlib/System/IFormatProvider.cs b/mcs/class/corlib/System/IFormatProvider.cs
new file mode 100644
index 00000000000..266c62d1295
--- /dev/null
+++ b/mcs/class/corlib/System/IFormatProvider.cs
@@ -0,0 +1,15 @@
+//
+// System.IFormatProvider.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	public interface IFormatProvider {
+		object GetFormat (Type format_type);
+	}
+}
diff --git a/mcs/class/corlib/System/IFormattable.cs b/mcs/class/corlib/System/IFormattable.cs
new file mode 100644
index 00000000000..1769f4034c0
--- /dev/null
+++ b/mcs/class/corlib/System/IFormattable.cs
@@ -0,0 +1,15 @@
+//
+// System.IFormattable.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	public interface IFormattable {
+		string ToString (string format, IFormatProvider format_provider);
+	}
+}
diff --git a/mcs/class/corlib/System/IServiceProvider.cs b/mcs/class/corlib/System/IServiceProvider.cs
new file mode 100644
index 00000000000..13992c20145
--- /dev/null
+++ b/mcs/class/corlib/System/IServiceProvider.cs
@@ -0,0 +1,20 @@
+//
+// System.IServiceProvider.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+
+namespace System {
+
+//	[ComVisible(false)]
+	public interface IServiceProvider {
+
+		object GetService (Type serviceType);
+
+	}
+}
diff --git a/mcs/class/corlib/System/IndexOutOfRangeException.cs b/mcs/class/corlib/System/IndexOutOfRangeException.cs
new file mode 100644
index 00000000000..7246ddefb7e
--- /dev/null
+++ b/mcs/class/corlib/System/IndexOutOfRangeException.cs
@@ -0,0 +1,31 @@
+//
+// System.IndexOutOfRangeException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+namespace System {
+
+	[Serializable]
+	public sealed class IndexOutOfRangeException : SystemException {
+		// Constructors
+		public IndexOutOfRangeException ()
+			: base (Locale.GetText ("Array index is out of range"))
+		{
+		}
+
+		public IndexOutOfRangeException (string message)
+			: base (message)
+		{
+		}
+
+		public IndexOutOfRangeException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/Int16.cs b/mcs/class/corlib/System/Int16.cs
new file mode 100644
index 00000000000..fdc85c6f54a
--- /dev/null
+++ b/mcs/class/corlib/System/Int16.cs
@@ -0,0 +1,237 @@
+//
+// System.Int16.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+
+namespace System {
+	
+	[Serializable]
+	public struct Int16 : IComparable, IFormattable, IConvertible {
+
+		public const short MaxValue =  32767;
+		public const short MinValue = -32768;
+		
+		// VES needs to know about value.  public is workaround
+		// so source will compile
+		public short value;
+
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+
+			if (!(v is System.Int16))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Int16"));
+
+			short xv = (short) v;
+			if (value == xv)
+				return 0;
+			if (value > xv)
+				return 1;
+			else
+				return -1;
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.Int16))
+				return false;
+
+			return ((short) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return value;
+		}
+
+		public static short Parse (string s)
+		{
+			short val = 0;
+			int len;
+			int i, sign = 1;
+			bool digits_seen = false;
+
+			if (s == null)
+				throw new ArgumentNullException (Locale.GetText ("s is null"));
+
+			len = s.Length;
+
+			char c;
+			for (i = 0; i < len; i++){
+				c = s [i];
+				if (!Char.IsWhiteSpace (c))
+					break;
+			}
+			
+			if (i == len)
+				throw new FormatException ();
+
+			c = s [i];
+			if (c == '+')
+				i++;
+			else if (c == '-'){
+				sign = -1;
+				i++;
+			}
+			
+			for (; i < len; i++){
+				c = s [i];
+
+				if (c >= '0' && c <= '9'){
+					val = checked ((short) (val * 10 + (c - '0') * sign));
+					digits_seen = true;
+				} else {
+					if (Char.IsWhiteSpace (c)){
+						for (i++; i < len; i++){
+							if (!Char.IsWhiteSpace (s [i]))
+								throw new FormatException ();
+						}
+						break;
+					} else
+						throw new FormatException ();
+				}
+			}
+			if (!digits_seen)
+				throw new FormatException ();
+			
+			return val;
+		}
+
+		public static short Parse (string s, IFormatProvider fp)
+		{
+			return Parse (s, NumberStyles.Integer, fp);
+		}
+
+		public static short Parse (string s, NumberStyles style)
+		{
+			return Parse (s, style, null);
+		}
+
+		public static short Parse (string s, NumberStyles style, IFormatProvider fp)
+		{
+			int tmpResult = Int32.Parse (s, style, fp);
+			if (tmpResult > Int16.MaxValue || tmpResult < Int16.MinValue)
+				throw new OverflowException ("Value too large or too small.");
+
+			return (short) tmpResult;
+		}
+
+		public override string ToString ()
+		{
+			return ToString (null, null);
+		}
+
+		public string ToString (IFormatProvider fp)
+		{
+			return ToString (null, fp);
+		}
+
+		public string ToString (string format)
+		{
+			return ToString (format, null);
+		}
+
+		public string ToString (string format, IFormatProvider fp)
+		{
+			NumberFormatInfo nfi = NumberFormatInfo.GetInstance( fp );
+			
+			if ( format == null )
+				format = "G";
+			
+			return IntegerFormatter.NumberToString(format, nfi, value);
+		}
+
+		// =========== IConvertible Methods =========== //
+
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.Int16;
+		}
+
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return System.Convert.ToBoolean (value);
+		}
+
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return System.Convert.ToByte (value);
+		}
+
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			return System.Convert.ToChar (value);
+		}
+
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			return System.Convert.ToDateTime (value);
+		}
+
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal (value);
+		}
+
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble (value);
+		}
+
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16 (value);
+		}
+
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32 (value);
+		}
+
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64 (value);
+		}
+
+		[CLSCompliant (false)]
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte (value);
+		}
+		
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle (value);
+		}
+
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			return System.Convert.ToType (value, conversionType, provider);
+		}
+
+		[CLSCompliant (false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16 (value);
+		}
+
+		[CLSCompliant (false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32 (value);
+		}
+
+		[CLSCompliant (false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64 (value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/Int32.cs b/mcs/class/corlib/System/Int32.cs
new file mode 100644
index 00000000000..5412db27aa8
--- /dev/null
+++ b/mcs/class/corlib/System/Int32.cs
@@ -0,0 +1,490 @@
+//
+// System.Int32.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Threading;
+
+namespace System {
+	
+	[Serializable]
+	public struct Int32 : IComparable, IFormattable, IConvertible {
+
+		public const int MaxValue = 0x7fffffff;
+		public const int MinValue = -2147483648;
+		
+		public int value;
+
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+			
+			if (!(v is System.Int32))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Int32"));
+
+			int xv = (int) v;
+			if (value == xv)
+				return 0;
+			if (value > xv)
+				return 1;
+			else
+				return -1;
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.Int32))
+				return false;
+
+			return ((int) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return value;
+		}
+
+		public static int Parse (string s)
+		{
+			int val = 0;
+			int len;
+			int i, sign = 1;
+			bool digits_seen = false;
+			
+			if (s == null)
+				throw new ArgumentNullException (Locale.GetText ("s is null"));
+
+			len = s.Length;
+
+			char c;
+			for (i = 0; i < len; i++){
+				c = s [i];
+				if (!Char.IsWhiteSpace (c))
+					break;
+			}
+			
+			if (i == len)
+				throw new FormatException ();
+
+			c = s [i];
+			if (c == '+')
+				i++;
+			else if (c == '-'){
+				sign = -1;
+				i++;
+			}
+			
+			for (; i < len; i++){
+				c = s [i];
+
+				if (c >= '0' && c <= '9'){
+					val = checked (val * 10 + (c - '0') * sign);
+					digits_seen = true;
+				} else {
+					if (Char.IsWhiteSpace (c)){
+						for (i++; i < len; i++){
+							if (!Char.IsWhiteSpace (s [i]))
+								throw new FormatException ();
+						}
+						break;
+					} else
+						throw new FormatException ();
+				}
+			}
+			if (!digits_seen)
+				throw new FormatException ();
+			
+			return val;
+		}
+
+		public static int Parse (string s, IFormatProvider fp)
+		{
+			return Parse (s, NumberStyles.Integer, fp);
+		}
+
+		public static int Parse (string s, NumberStyles style)
+		{
+			return Parse (s, style, null);
+		}
+
+		internal static void CheckStyle (NumberStyles style)
+		{
+			if ((style & NumberStyles.AllowHexSpecifier) != 0) {
+				NumberStyles ne = style ^ NumberStyles.AllowHexSpecifier;
+				if ((ne & NumberStyles.AllowLeadingWhite) != 0)
+					ne ^= NumberStyles.AllowLeadingWhite;
+				if ((ne & NumberStyles.AllowTrailingWhite) != 0)
+					ne ^= NumberStyles.AllowTrailingWhite;
+				if (ne != 0)
+					throw new ArgumentException (
+						"With AllowHexSpecifier only " + 
+						"AllowLeadingWhite and AllowTrailingWhite " + 
+						"are permitted.");
+			}
+		}
+		
+		internal static int JumpOverWhite (int pos, string s, bool excp)
+		{
+			while (pos < s.Length && Char.IsWhiteSpace (s [pos]))
+				pos++;
+
+			if (excp && pos >= s.Length)
+				throw new FormatException ("Input string was not in the correct format.");
+
+			return pos;
+		}
+
+		internal static void FindSign (ref int pos, string s, NumberFormatInfo nfi, 
+				      ref bool foundSign, ref bool negative)
+		{
+			if ((pos + nfi.NegativeSign.Length) <= s.Length &&
+			     s.Substring (pos, nfi.NegativeSign.Length) == nfi.NegativeSign) {
+				negative = true;
+				foundSign = true;
+				pos += nfi.NegativeSign.Length;
+			} 
+			else if ((pos + nfi.PositiveSign.Length) < s.Length &&
+			     s.Substring (pos, nfi.PositiveSign.Length) == nfi.PositiveSign) {
+				negative = false;
+				pos += nfi.PositiveSign.Length;
+				foundSign = true;
+			} 
+		}
+
+		internal static void FindCurrency (ref int pos,
+						 string s, 
+						 NumberFormatInfo nfi,
+						 ref bool foundCurrency)
+		{
+			if ((pos + nfi.CurrencySymbol.Length) <= s.Length &&
+			     s.Substring (pos, nfi.CurrencySymbol.Length) == nfi.CurrencySymbol) {
+				foundCurrency = true;
+				pos += nfi.CurrencySymbol.Length;
+			} 
+		}
+
+		internal static bool FindOther (ref int pos,
+					      string s, 
+					      string other)
+		{
+			if ((pos + other.Length) <= s.Length &&
+			     s.Substring (pos, other.Length) == other) {
+				pos += other.Length;
+				return true;
+			} 
+
+			return false;
+		}
+
+		internal static bool ValidDigit (char e, bool allowHex)
+		{
+			if (allowHex)
+				return Char.IsDigit (e) || (e >= 'A' && e <= 'F') || (e >= 'a' && e <= 'f');
+
+			return Char.IsDigit (e);
+		}
+		
+		public static int Parse (string s, NumberStyles style, IFormatProvider fp)
+		{
+			if (s == null)
+				throw new ArgumentNullException ();
+
+			if (s.Length == 0)
+				throw new FormatException ("Input string was not " + 
+							   "in the correct format.");
+
+			NumberFormatInfo nfi;
+			if (fp != null) {
+				Type typeNFI = typeof (System.Globalization.NumberFormatInfo);
+				nfi = (NumberFormatInfo) fp.GetFormat (typeNFI);
+			}
+			else
+				nfi = Thread.CurrentThread.CurrentCulture.NumberFormat;
+
+			CheckStyle (style);
+
+			bool AllowCurrencySymbol = (style & NumberStyles.AllowCurrencySymbol) != 0;
+			bool AllowExponent = (style & NumberStyles.AllowExponent) != 0;
+			bool AllowHexSpecifier = (style & NumberStyles.AllowHexSpecifier) != 0;
+			bool AllowThousands = (style & NumberStyles.AllowThousands) != 0;
+			bool AllowDecimalPoint = (style & NumberStyles.AllowDecimalPoint) != 0;
+			bool AllowParentheses = (style & NumberStyles.AllowParentheses) != 0;
+			bool AllowTrailingSign = (style & NumberStyles.AllowTrailingSign) != 0;
+			bool AllowLeadingSign = (style & NumberStyles.AllowLeadingSign) != 0;
+			bool AllowTrailingWhite = (style & NumberStyles.AllowTrailingWhite) != 0;
+			bool AllowLeadingWhite = (style & NumberStyles.AllowLeadingWhite) != 0;
+
+			int pos = 0;
+
+			if (AllowLeadingWhite)
+				pos = JumpOverWhite (pos, s, true);
+
+			bool foundOpenParentheses = false;
+			bool negative = false;
+			bool foundSign = false;
+			bool foundCurrency = false;
+
+			// Pre-number stuff
+			if (AllowParentheses && s [pos] == '(') {
+				foundOpenParentheses = true;
+				foundSign = true;
+				negative = true; // MS always make the number negative when there parentheses
+						 // even when NumberFormatInfo.NumberNegativePattern != 0!!!
+				pos++;
+				if (AllowLeadingWhite)
+					pos = JumpOverWhite (pos, s, true);
+
+				if (s.Substring (pos, nfi.NegativeSign.Length) == nfi.NegativeSign)
+					throw new FormatException ("Input string was not in the correct " +
+								   "format.");
+				if (s.Substring (pos, nfi.PositiveSign.Length) == nfi.PositiveSign)
+					throw new FormatException ("Input string was not in the correct " +
+								   "format.");
+			}
+
+			if (AllowLeadingSign && !foundSign) {
+				// Sign + Currency
+				FindSign (ref pos, s, nfi, ref foundSign, ref negative);
+				if (foundSign) {
+					if (AllowLeadingWhite)
+						pos = JumpOverWhite (pos, s, true);
+					if (AllowCurrencySymbol) {
+						FindCurrency (ref pos, s, nfi,
+							      ref foundCurrency);
+						if (foundCurrency && AllowLeadingWhite)
+							pos = JumpOverWhite (pos, s, true);
+					}
+				}
+			}
+			
+			if (AllowCurrencySymbol && !foundCurrency) {
+				// Currency + sign
+				FindCurrency (ref pos, s, nfi, ref foundCurrency);
+				if (foundCurrency) {
+					if (AllowLeadingWhite)
+						pos = JumpOverWhite (pos, s, true);
+					if (foundCurrency) {
+						if (!foundSign && AllowLeadingSign) {
+							FindSign (ref pos, s, nfi, ref foundSign,
+								  ref negative);
+							if (foundSign && AllowLeadingWhite)
+								pos = JumpOverWhite (pos, s, true);
+						}
+					}
+				}
+			}
+			
+			int number = 0;
+			int nDigits = 0;
+			bool decimalPointFound = false;
+			int digitValue;
+			char hexDigit;
+				
+			// Number stuff
+			do {
+
+				if (!ValidDigit (s [pos], AllowHexSpecifier)) {
+					if (AllowThousands &&
+					    FindOther (ref pos, s, nfi.NumberGroupSeparator))
+					    continue;
+					else
+					if (!decimalPointFound && AllowDecimalPoint &&
+					    FindOther (ref pos, s, nfi.NumberDecimalSeparator)) {
+					    decimalPointFound = true;
+					    continue;
+					}
+
+					break;
+				}
+				else if (AllowHexSpecifier) {
+					nDigits++;
+					hexDigit = s [pos++];
+					if (Char.IsDigit (hexDigit))
+						digitValue = (int) (hexDigit - '0');
+					else if (Char.IsLower (hexDigit))
+						digitValue = (int) (hexDigit - 'a' + 10);
+					else
+						digitValue = (int) (hexDigit - 'A' + 10);
+
+					number = checked (number * 16 - digitValue);
+				}
+				else if (decimalPointFound) {
+					nDigits++;
+					// Allows decimal point as long as it's only 
+					// followed by zeroes.
+					if (s [pos++] != '0')
+						throw new OverflowException ("Value too large or too " +
+									     "small.");
+				}
+				else {
+					nDigits++;
+
+					try {
+						// Calculations done as negative
+						// (abs (MinValue) > abs (MaxValue))
+						number = checked (
+							number * 10 - 
+							(int) (s [pos++] - '0')
+							);
+					} catch (OverflowException) {
+						throw new OverflowException ("Value too large or too " +
+									     "small.");
+					}
+				}
+			} while (pos < s.Length);
+
+			// Post number stuff
+			if (nDigits == 0)
+				throw new FormatException ("Input string was not in the correct format.");
+
+			if (AllowTrailingSign && !foundSign) {
+				// Sign + Currency
+				FindSign (ref pos, s, nfi, ref foundSign, ref negative);
+				if (foundSign) {
+					if (AllowTrailingWhite)
+						pos = JumpOverWhite (pos, s, true);
+					if (AllowCurrencySymbol)
+						FindCurrency (ref pos, s, nfi,
+							      ref foundCurrency);
+				}
+			}
+			
+			if (AllowCurrencySymbol && !foundCurrency) {
+				// Currency + sign
+				FindCurrency (ref pos, s, nfi, ref foundCurrency);
+				if (foundCurrency) {
+					if (AllowTrailingWhite)
+						pos = JumpOverWhite (pos, s, true);
+					if (!foundSign && AllowTrailingSign)
+						FindSign (ref pos, s, nfi, ref foundSign,
+							  ref negative);
+				}
+			}
+			
+			if (AllowTrailingWhite && pos < s.Length)
+				pos = JumpOverWhite (pos, s, false);
+
+			if (foundOpenParentheses) {
+				if (pos >= s.Length || s [pos++] != ')')
+					throw new FormatException ("Input string was not in the correct " +
+								   "format.");
+				if (AllowTrailingWhite && pos < s.Length)
+					pos = JumpOverWhite (pos, s, false);
+			}
+
+			if (pos < s.Length && s [pos] != '\u0000')
+				throw new FormatException ("Input string was not in the correct format.");
+
+			
+			if (!negative)
+				number = -number;
+
+			return number;
+		}
+
+		public override string ToString ()
+		{
+			return IntegerFormatter.FormatGeneral(value, 0, null, true);
+		}
+
+		public string ToString (IFormatProvider fp)
+		{
+			return ToString (null, fp);
+		}
+
+		public string ToString (string format)
+		{
+			return ToString (format, null);
+		}
+
+		public string ToString (string format, IFormatProvider fp )
+		{
+			NumberFormatInfo nfi = NumberFormatInfo.GetInstance( fp );
+			
+			if ( format == null )
+				format = "G";
+
+			return IntegerFormatter.NumberToString (format, nfi, value);
+		}
+
+		// =========== IConvertible Methods =========== //
+
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.Int32;
+		}
+		
+		bool IConvertible.ToBoolean  (IFormatProvider provider)
+		{
+			return System.Convert.ToBoolean (value);
+		}
+		byte IConvertible.ToByte     (IFormatProvider provider)
+		{
+			return System.Convert.ToByte (value);
+		}
+		char IConvertible.ToChar     (IFormatProvider provider)
+		{
+			return System.Convert.ToChar (value);
+		}
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			return System.Convert.ToDateTime (value);
+		}
+		decimal IConvertible.ToDecimal  (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal (value);
+		}
+		double IConvertible.ToDouble   (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble (value);
+		}
+		short IConvertible.ToInt16    (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16 (value);
+		}
+		int IConvertible.ToInt32    (IFormatProvider provider)
+		{
+			return value;
+		}
+		long IConvertible.ToInt64    (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64 (value);
+		}
+    		[CLSCompliant(false)]
+		sbyte IConvertible.ToSByte    (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte (value);
+		}
+		float IConvertible.ToSingle   (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle (value);
+		}
+
+		object IConvertible.ToType     (Type conversionType, IFormatProvider provider)
+		{
+			return System.Convert.ToType (value, conversionType, provider);
+		}
+		
+    		[CLSCompliant(false)]
+		ushort IConvertible.ToUInt16   (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16 (value);
+		}
+    		[CLSCompliant(false)]
+		uint IConvertible.ToUInt32   (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32 (value);
+		}
+    		[CLSCompliant(false)]
+		ulong IConvertible.ToUInt64   (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64 (value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/Int64.cs b/mcs/class/corlib/System/Int64.cs
new file mode 100644
index 00000000000..a7b61effc74
--- /dev/null
+++ b/mcs/class/corlib/System/Int64.cs
@@ -0,0 +1,432 @@
+//
+// System.Int64.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Threading;
+
+namespace System {
+	
+	[Serializable]
+	public struct Int64 : IComparable, IFormattable, IConvertible {
+
+		public const long MaxValue = 0x7fffffffffffffff;
+		public const long MinValue = -9223372036854775808;
+		
+		public long value;
+
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+			
+			if (!(v is System.Int64))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Int64"));
+
+			if (value == (long) v)
+				return 0;
+
+			if (value < (long) v)
+				return -1;
+
+			return 1;
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.Int64))
+				return false;
+
+			return ((long) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int)(value & 0xffffffff) ^ (int)(value >> 32);
+		}
+
+		public static long Parse (string s)
+		{
+			long val = 0;
+			int len;
+			int i;
+			int sign = 1;
+			bool digits_seen = false;
+			
+			if (s == null)
+				throw new ArgumentNullException (Locale.GetText ("s is null"));
+
+			len = s.Length;
+
+			char c;
+			for (i = 0; i < len; i++){
+				c = s [i];
+				if (!Char.IsWhiteSpace (c))
+					break;
+			}
+			
+			if (i == len)
+				throw new FormatException ();
+
+			c = s [i];
+			if (c == '+')
+				i++;
+			else if (c == '-'){
+				sign = -1;
+				i++;
+			}
+			
+			for (; i < len; i++){
+				c = s [i];
+
+				if (c >= '0' && c <= '9'){
+					val = checked (val * 10 + (c - '0') * sign);
+					digits_seen = true;
+				} else {
+					if (Char.IsWhiteSpace (c)){
+						for (i++; i < len; i++){
+							if (!Char.IsWhiteSpace (s [i]))
+								throw new FormatException ();
+						}
+						break;
+					} else
+						throw new FormatException ();
+				}
+			}
+			if (!digits_seen)
+				throw new FormatException ();
+			
+			return val;
+		}
+
+		public static long Parse (string s, IFormatProvider fp)
+		{
+			return Parse (s, NumberStyles.Integer, fp);
+		}
+
+		public static long Parse (string s, NumberStyles style)
+		{
+			return Parse (s, style, null);
+		}
+
+		public static long Parse (string s, NumberStyles style, IFormatProvider fp)
+		{
+			if (s == null)
+				throw new ArgumentNullException ();
+
+			if (s.Length == 0)
+				throw new FormatException ("Input string was not " + 
+							   "in the correct format: s.Length==0.");
+
+			NumberFormatInfo nfi;
+			if (fp != null) {
+				Type typeNFI = typeof (System.Globalization.NumberFormatInfo);
+				nfi = (NumberFormatInfo) fp.GetFormat (typeNFI);
+			}
+			else
+				nfi = Thread.CurrentThread.CurrentCulture.NumberFormat;
+
+			Int32.CheckStyle (style);
+
+			bool AllowCurrencySymbol = (style & NumberStyles.AllowCurrencySymbol) != 0;
+			bool AllowExponent = (style & NumberStyles.AllowExponent) != 0;
+			bool AllowHexSpecifier = (style & NumberStyles.AllowHexSpecifier) != 0;
+			bool AllowThousands = (style & NumberStyles.AllowThousands) != 0;
+			bool AllowDecimalPoint = (style & NumberStyles.AllowDecimalPoint) != 0;
+			bool AllowParentheses = (style & NumberStyles.AllowParentheses) != 0;
+			bool AllowTrailingSign = (style & NumberStyles.AllowTrailingSign) != 0;
+			bool AllowLeadingSign = (style & NumberStyles.AllowLeadingSign) != 0;
+			bool AllowTrailingWhite = (style & NumberStyles.AllowTrailingWhite) != 0;
+			bool AllowLeadingWhite = (style & NumberStyles.AllowLeadingWhite) != 0;
+
+			int pos = 0;
+
+			if (AllowLeadingWhite)
+				pos = Int32.JumpOverWhite (pos, s, true);
+
+			bool foundOpenParentheses = false;
+			bool negative = false;
+			bool foundSign = false;
+			bool foundCurrency = false;
+
+			// Pre-number stuff
+			if (AllowParentheses && s [pos] == '(') {
+				foundOpenParentheses = true;
+				foundSign = true;
+				negative = true; // MS always make the number negative when there parentheses
+						 // even when NumberFormatInfo.NumberNegativePattern != 0!!!
+				pos++;
+				if (AllowLeadingWhite)
+					pos = Int32.JumpOverWhite (pos, s, true);
+
+				if (s.Substring (pos, nfi.NegativeSign.Length) == nfi.NegativeSign)
+					throw new FormatException ("Input string was not in the correct " +
+								   "format: Has Negative Sign.");
+				if (s.Substring (pos, nfi.PositiveSign.Length) == nfi.PositiveSign)
+					throw new FormatException ("Input string was not in the correct " +
+								   "format: Has Positive Sign.");
+			}
+
+			if (AllowLeadingSign && !foundSign) {
+				// Sign + Currency
+				Int32.FindSign (ref pos, s, nfi, ref foundSign, ref negative);
+				if (foundSign) {
+					if (AllowLeadingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (AllowCurrencySymbol) {
+						Int32.FindCurrency (ref pos, s, nfi,
+								    ref foundCurrency);
+						if (foundCurrency && AllowLeadingWhite)
+							pos = Int32.JumpOverWhite (pos, s, true);
+					}
+				}
+			}
+			
+			if (AllowCurrencySymbol && !foundCurrency) {
+				// Currency + sign
+				Int32.FindCurrency (ref pos, s, nfi, ref foundCurrency);
+				if (foundCurrency) {
+					if (AllowLeadingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (foundCurrency) {
+						if (!foundSign && AllowLeadingSign) {
+							Int32.FindSign (ref pos, s, nfi, ref foundSign,
+									ref negative);
+							if (foundSign && AllowLeadingWhite)
+								pos = Int32.JumpOverWhite (pos, s, true);
+						}
+					}
+				}
+			}
+			
+			long number = 0;
+			int nDigits = 0;
+			bool decimalPointFound = false;
+			int digitValue;
+			char hexDigit;
+				
+			// Number stuff
+			do {
+
+				if (!Int32.ValidDigit (s [pos], AllowHexSpecifier)) {
+					if (AllowThousands &&
+					    (Int32.FindOther (ref pos, s, nfi.NumberGroupSeparator)
+						|| Int32.FindOther (ref pos, s, nfi.CurrencyGroupSeparator)))
+					    continue;
+					else
+					if (!decimalPointFound && AllowDecimalPoint &&
+					    (Int32.FindOther (ref pos, s, nfi.NumberDecimalSeparator)
+						|| Int32.FindOther (ref pos, s, nfi.CurrencyDecimalSeparator))) {
+					    decimalPointFound = true;
+					    continue;
+					}
+
+					break;
+				}
+				else if (AllowHexSpecifier) {
+					nDigits++;
+					hexDigit = s [pos++];
+					if (Char.IsDigit (hexDigit))
+						digitValue = (int) (hexDigit - '0');
+					else if (Char.IsLower (hexDigit))
+						digitValue = (int) (hexDigit - 'a' + 10);
+					else
+						digitValue = (int) (hexDigit - 'A' + 10);
+
+					number = checked (number * 16 - digitValue);
+				}
+				else if (decimalPointFound) {
+					nDigits++;
+					// Allows decimal point as long as it's only 
+					// followed by zeroes.
+					if (s [pos++] != '0')
+						throw new OverflowException ("Value too large or too " +
+									     "small.");
+				}
+				else {
+					nDigits++;
+
+					try {
+						// Calculations done as negative
+						// (abs (MinValue) > abs (MaxValue))
+						number = checked (
+							number * 10 - 
+							(long) (s [pos++] - '0')
+							);
+					} catch (OverflowException) {
+						throw new OverflowException ("Value too large or too " +
+									     "small.");
+					}
+				}
+			} while (pos < s.Length);
+
+			// Post number stuff
+			if (nDigits == 0)
+				throw new FormatException ("Input string was not in the correct format: nDigits == 0.");
+
+			if (AllowTrailingSign && !foundSign) {
+				// Sign + Currency
+				Int32.FindSign (ref pos, s, nfi, ref foundSign, ref negative);
+				if (foundSign) {
+					if (AllowTrailingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (AllowCurrencySymbol)
+						Int32.FindCurrency (ref pos, s, nfi,
+								    ref foundCurrency);
+				}
+			}
+			
+			if (AllowCurrencySymbol && !foundCurrency) {
+				// Currency + sign
+				if (nfi.CurrencyPositivePattern == 3 && s[pos++] != ' ')
+					throw new FormatException ("Input string was not in the correct format: no space between number and currency symbol.");
+
+				Int32.FindCurrency (ref pos, s, nfi, ref foundCurrency);
+				if (foundCurrency && pos < s.Length) {
+					if (AllowTrailingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (!foundSign && AllowTrailingSign)
+						Int32.FindSign (ref pos, s, nfi, ref foundSign,
+								ref negative);
+				}
+			}
+			
+			if (AllowTrailingWhite && pos < s.Length)
+				pos = Int32.JumpOverWhite (pos, s, false);
+
+			if (foundOpenParentheses) {
+				if (pos >= s.Length || s [pos++] != ')')
+					throw new FormatException ("Input string was not in the correct " +
+								   "format: No room for close parens.");
+				if (AllowTrailingWhite && pos < s.Length)
+					pos = Int32.JumpOverWhite (pos, s, false);
+			}
+
+			if (pos < s.Length && s [pos] != '\u0000')
+				throw new FormatException ("Input string was not in the correct format: Did not parse entire string. pos = " 
+										+ pos + " s.Length = " + s.Length);
+
+			
+			if (!negative)
+				number = -number;
+
+			return number;
+		}
+
+		public override string ToString ()
+		{
+			return ToString (null, null);
+		}
+
+		public string ToString (IFormatProvider fp)
+		{
+			return ToString (null, fp);
+		}
+
+		public string ToString (string format)
+		{
+			return ToString (format, null);
+		}
+
+		public string ToString (string format, IFormatProvider fp)
+		{
+			NumberFormatInfo nfi = NumberFormatInfo.GetInstance( fp );
+			
+			if ( format == null )
+				format = "G";
+			
+			return IntegerFormatter.NumberToString (format, nfi, value);
+		}
+
+		// =========== IConvertible Methods =========== //
+
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.Int64;
+		}
+
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return System.Convert.ToBoolean (value);
+		}
+
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return System.Convert.ToByte (value);
+		}
+
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			return System.Convert.ToChar (value);
+		}
+
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			return System.Convert.ToDateTime (value);
+		}
+
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal (value);
+		}
+
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble (value);
+		}
+
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16 (value);
+		}
+
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32 (value);
+		}
+
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64 (value);
+		}
+
+		[CLSCompliant (false)]
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte (value);
+		}
+		
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle (value);
+		}
+
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			return System.Convert.ToType (value, conversionType, provider);
+		}
+
+		[CLSCompliant (false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16 (value);
+		}
+
+		[CLSCompliant (false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32 (value);
+		}
+
+		[CLSCompliant (false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64 (value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/IntPtr.cs b/mcs/class/corlib/System/IntPtr.cs
new file mode 100644
index 00000000000..bb12f2482f1
--- /dev/null
+++ b/mcs/class/corlib/System/IntPtr.cs
@@ -0,0 +1,165 @@
+//
+// System.IntPtr.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// Maintainer:
+//	 Michael Lambert, michaellambert@email.com
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+// Remarks:			Requires '/unsafe' compiler option.  This class uses void*,
+//					in overloaded constructors, conversion, and cast members in 
+//					the public interface.  Using pointers is not valid CLS and 
+//					the methods in question have been marked with  the 
+//					CLSCompliant attribute that avoid compiler warnings.
+//
+// FIXME: How do you specify a native int in C#?  I am going to have to do some figuring out
+//
+
+using System;
+using System.Runtime.Serialization;
+
+#if __MonoCS__
+#else
+[
+    assembly: System.CLSCompliant(true)
+]
+#endif
+
+namespace System {
+
+	[
+		CLSCompliant(true)
+	]
+	[Serializable]
+	public unsafe struct IntPtr : ISerializable {
+
+		private void *value;
+
+		public static readonly IntPtr Zero;
+
+		static IntPtr ()
+		{
+			Zero.value = (void *) 0;
+		}
+		
+		public IntPtr (int i32)
+		{
+			value = (void *) i32;
+		}
+
+		public IntPtr (long i64)
+		{
+			value = (void *) i64;
+		}
+
+		[
+			CLSCompliant(false)
+		]
+		unsafe public IntPtr (void *ptr)
+		{
+			value = ptr;
+		}
+
+		public static int Size {
+			get {
+				return sizeof (void *);
+			}
+		}
+
+		public void GetObjectData (SerializationInfo si, StreamingContext sc)
+		{
+			if( si == null )
+				throw new ArgumentNullException( "si" );
+        
+			si.AddValue("value", (long) value);
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.IntPtr))
+				return false;
+
+			return ((IntPtr) o).value == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int) value;
+		}
+
+		public int ToInt32 ()
+		{
+			return (int) value;
+		}
+
+		public long ToInt64 ()
+		{
+			return (long) value;
+		}
+
+		[
+			CLSCompliant(false)
+		]
+		unsafe public void *ToPointer ()
+		{
+			return value;
+		}
+
+		override public string ToString ()
+		{
+			if (Size == 4)
+				return ((int) value).ToString ();
+			else
+				return ((long) value).ToString ();
+		}
+
+		public static bool operator == (IntPtr a, IntPtr b)
+		{
+			return (a.value == b.value);
+		}
+
+		public static bool operator != (IntPtr a, IntPtr b)
+		{
+			return (a.value != b.value);
+		}
+
+		public static explicit operator IntPtr (int value)
+		{
+			return new IntPtr (value);
+		}
+
+		public static explicit operator IntPtr (long value)
+		{
+			return new IntPtr (value);
+		}
+		
+		[
+			CLSCompliant(false)
+		]
+		unsafe public static explicit operator IntPtr (void *value)
+		{
+			return new IntPtr (value);
+		}
+
+		public static explicit operator int (IntPtr value)
+		{
+			return (int) value.value;
+		}
+
+		public static explicit operator long (IntPtr value)
+		{
+			return (long) value.value;
+		}
+
+		[
+			CLSCompliant(false)
+		]
+		unsafe public static explicit operator void * (IntPtr value)
+		{
+			return value.value;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/IntegerFormatter.cs b/mcs/class/corlib/System/IntegerFormatter.cs
new file mode 100644
index 00000000000..b53ad1f46b6
--- /dev/null
+++ b/mcs/class/corlib/System/IntegerFormatter.cs
@@ -0,0 +1,4030 @@
+//
+// System.IntegerFormatter.cs
+//
+// Author:
+//   Derek Holden  (dholden@draper.com)
+//
+// (C) Derek Holden  dholden@draper.com
+//
+
+//
+// Format integer types. Completely based off ECMA docs
+// for IFormattable specification. Has been tested w/ 
+// all integral types, from boundry to boundry, w/ all 
+// formats A## ("G", "G0" ... "G99", "P", "P0" ... "P99").
+//
+// If you make any changes, please make sure to check the
+// boundry format precisions (0, 99) and the min / max values
+// of the data types (Int32.[Max/Min]Value).
+//
+// Using int as an example, it is currently set up as
+//
+// Int32 {
+//   int value;
+//   public string ToString (string format, NumberFormatInfo nfi) {
+//      return IntegerFormatter.NumberToString (format, nfi, value);
+//   }
+//
+// IntegerFormatter {
+//   public string NumberToString (string format, NumberFormatInfo nfi, int value) {
+//      ParseFormat (format);
+//      switch (format type) {
+//        case 'G' FormatGeneral(value, precision);
+//        case 'R' throw Exception("Invalid blah blah");
+//        case 'C' FromatCurrency(value, precision, nfi);
+//        etc...
+//      }
+//   }
+// }
+//
+// There is a property in NumberFormatInfo for NegativeSign, though the 
+// definition of IFormattable just uses '-' in context. So all the 
+// hardcoded uses of '-' in here may need to be changed to nfi.NegativeSign
+//
+// For every integral type.
+//
+// Before every Format<Format Type> block there is a small paragraph
+// detailing its requirements, and a blurb of what I was thinking
+// at the time.
+//
+// Some speedup suggestions to be done when after this appears
+// to be working properly:
+//
+//   * Deal w/ out of range numbers better. Specifically with
+//     regards to boundry cases such as Long.MinValue etc.
+//     The previous way of if (value < 0) value = -value;
+//     fails under this assumption, since the largest
+//     possible MaxValue is < absolute value of the MinValue.
+//     I do the first iteration outside of the loop, and then
+//     convert the number to positive, then continue in the loop.
+//
+//   * Replace all occurances of max<Type>Length with their 
+//     numerical values. Plus the places where things are set
+//     to max<Type>Length - 1. Hardcode these to numbers.
+//
+//   * Move the code for all the NumberToString()'s into the
+//     the main ToString (string, NumberFormatInfo) method in
+//     the data types themselves. That way they'd be throwing
+//     their own exceptions on error and it'd save a function
+//     call.
+//
+//   * For integer to char buffer transformation, you could
+//     implement the calculations of the 10's and 100's place
+//     the same time w/ another table to shorten loop time.
+//
+//   * Someone smarter can prolly find a much more efficient 
+//     way of formatting the exponential notation. It's still
+//     done in pass, just may have too many repositioning
+//     calculations.
+//   
+//   * Decide whether it be better to have functions that
+//     handle formatting for all types, or just cast their
+//     values out and format them. Just if library size is
+//     more important than speed in saving a cast and a 
+//     function call.
+//
+
+using System;
+using System.Collections;
+using System.Globalization;
+
+namespace System {
+
+	public sealed class IntegerFormatter {
+
+		private static int maxByteLength = 4;
+		private static int maxShortLength = 6;
+		private static int maxIntLength = 12;
+		private static int maxLongLength = 22;
+
+		private static char[] digitLowerTable;
+/**
+ * This makes a TypeNotInitialized exception be thrown.
+ *		{ '0', '1', '2', '3', '4', '5', '6', '7', 
+ *		  '8', '9', 'a', 'b', 'c', 'd', 'e', 'f' };
+ */
+
+		private static char[] digitUpperTable;
+/*
+ *		{ '0', '1', '2', '3', '4', '5', '6', '7', 
+ *		  '8', '9', 'A', 'B', 'C', 'D', 'E', 'F' };
+ */
+
+		static IntegerFormatter ()
+		{
+			int i;
+
+			digitLowerTable = new char[16];
+			digitUpperTable = new char[16];
+
+			for (i = 0; i < 10; i++){
+				digitLowerTable[i] = (char) ('0' + i);
+				digitUpperTable[i] = (char) ('0' + i);
+			}
+
+			char lc = (char ) ('a' - i);
+			char uc = (char ) ('A' - i);
+			while (i < 16){
+				digitLowerTable[i] = (char) (lc + i);
+				digitUpperTable[i] = (char) (uc + i);
+				i++;
+			}
+		}
+
+		private static bool IsDigit (char c)
+		{
+			return !(c < '0' || c > '9'); 
+		}
+		
+		private static bool IsLetter (char c)
+		{
+			return (c >= 'a' && c <= 'z') || (c >= 'A' && c <= 'Z'); 
+		}
+ 
+		private static bool ParseFormat (string format, out char specifier,  out int precision, out bool custom)
+		{		 		 
+			precision = -1;
+			specifier = '\0';
+			custom = false;
+			
+			int length = format.Length;
+			// TODO: Could an empty string be a custom format string?
+			if (length < 1)
+				return false;
+			
+			char[] chars = format.ToCharArray ();
+			specifier = chars[0];
+
+			// TODO: IsLetter() and IsDigit() should be replaced by Char.Is*()
+			if (IsLetter(specifier) && length <= 3) {
+				switch (length){
+				case 1:
+					return true;
+				case 2:
+					if (IsDigit(chars[1])) {
+						precision = chars[1] - '0';
+						return true;
+					}
+					break;
+				case 3:
+					if (IsDigit(chars[1]) && IsDigit(chars[2])) {
+						precision = chars[1] - '0';
+						precision = precision * 10 + chars[2] - '0';
+						return true;
+					}
+					break;
+				}
+				
+			}
+			
+			// We've got a custom format string.
+			custom = true;
+			return true;
+		}	 
+
+		// ============ Public Interface to all the integer types ============ //
+		
+		public static string NumberToString (string format, NumberFormatInfo nfi, byte value)
+		{
+			char specifier;
+			int precision;
+			bool custom;
+
+			if (!ParseFormat (format, out specifier, out precision, out custom))
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			
+			if (custom){
+				return FormatCustom (format, value, nfi);
+			}
+
+			switch(specifier) {
+			case 'c': return FormatCurrency (value, precision, nfi);
+			case 'C': return FormatCurrency (value, precision, nfi);
+			case 'd': return FormatDecimal (value, precision);
+			case 'D': return FormatDecimal (value, precision);
+			case 'e': return FormatExponential (value, precision, false);
+			case 'E': return FormatExponential (value, precision, true);
+			case 'f': return FormatFixedPoint (value, precision, nfi);	
+			case 'F': return FormatFixedPoint (value, precision, nfi);	
+			case 'g': return FormatGeneral (value, precision, nfi, false);
+			case 'G': return FormatGeneral (value, precision, nfi, true);
+			case 'n': return FormatNumber (value, precision, nfi);
+			case 'N': return FormatNumber (value, precision, nfi);
+			case 'p': return FormatPercent (value, precision, nfi);
+			case 'P': return FormatPercent (value, precision, nfi);
+			case 'r': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'R': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'x': return FormatHexadecimal (value, precision, false);
+			case 'X': return FormatHexadecimal (value, precision, true);
+			default: 
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			}
+		}		
+
+		public static string NumberToString (string format, NumberFormatInfo nfi, short value)
+		{
+			char specifier;
+			int precision;
+			bool custom;
+			
+			if (!ParseFormat (format, out specifier, out precision, out custom))
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			
+			if (custom){
+				return FormatCustom (format, value, nfi);
+			}
+
+			switch(specifier) {
+			case 'c': return FormatCurrency (value, precision, nfi);
+			case 'C': return FormatCurrency (value, precision, nfi);
+			case 'd': return FormatDecimal (value, precision);
+			case 'D': return FormatDecimal (value, precision);
+			case 'e': return FormatExponential (value, precision, false);
+			case 'E': return FormatExponential (value, precision, true);
+			case 'f': return FormatFixedPoint (value, precision, nfi);	
+			case 'F': return FormatFixedPoint (value, precision, nfi);	
+			case 'g': return FormatGeneral (value, precision, nfi, false);
+			case 'G': return FormatGeneral (value, precision, nfi, true);
+			case 'n': return FormatNumber (value, precision, nfi);
+			case 'N': return FormatNumber (value, precision, nfi);
+			case 'p': return FormatPercent (value, precision, nfi);
+			case 'P': return FormatPercent (value, precision, nfi);
+			case 'r': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'R': throw new FormatException (Locale.GetText ("The specified format cannot be used in this insance"));
+			case 'x': return FormatHexadecimal (value, precision, false);
+			case 'X': return FormatHexadecimal (value, precision, true);
+			default: 
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			}
+		}
+
+		public static string NumberToString (string format, NumberFormatInfo nfi, int value)
+		{
+			char specifier;
+			int precision;
+			bool custom;
+			
+			if (!ParseFormat (format, out specifier, out precision, out custom))
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			
+			if (custom){
+				return FormatCustom (format, value, nfi);
+			}
+
+			switch(specifier) {
+			case 'c': return FormatCurrency (value, precision, nfi);	
+			case 'C': return FormatCurrency (value, precision, nfi);	
+			case 'd': return FormatDecimal (value, precision);
+			case 'D': return FormatDecimal (value, precision);
+			case 'e': return FormatExponential (value, precision, false);
+			case 'E': return FormatExponential (value, precision, true);
+			case 'f': return FormatFixedPoint (value, precision, nfi);	
+			case 'F': return FormatFixedPoint (value, precision, nfi);	
+			case 'g': return FormatGeneral (value, precision, nfi, false);
+			case 'G': return FormatGeneral (value, precision, nfi, true);
+			case 'n': return FormatNumber (value, precision, nfi);
+			case 'N': return FormatNumber (value, precision, nfi);
+			case 'p': return FormatPercent (value, precision, nfi);
+			case 'P': return FormatPercent (value, precision, nfi);
+			case 'r': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'R': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'x': return FormatHexadecimal (value, precision, false);
+			case 'X': return FormatHexadecimal (value, precision, true);
+			default: 
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			}
+		}
+
+		public static string NumberToString (string format, NumberFormatInfo nfi, long value)
+		{
+			char specifier;
+			int precision;
+			bool custom;
+			
+			if (!ParseFormat (format, out specifier, out precision, out custom))
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			
+			if (custom){
+				return FormatCustom (format, value, nfi);
+			}
+
+			switch(specifier) {
+			case 'c': return FormatCurrency (value, precision, nfi);
+			case 'C': return FormatCurrency (value, precision, nfi);
+			case 'd': return FormatDecimal (value, precision);
+			case 'D': return FormatDecimal (value, precision);
+			case 'e': return FormatExponential (value, precision, false);
+			case 'E': return FormatExponential (value, precision, true);
+			case 'f': return FormatFixedPoint (value, precision, nfi);	
+			case 'F': return FormatFixedPoint (value, precision, nfi);	
+			case 'g': return FormatGeneral (value, precision, nfi, false);
+			case 'G': return FormatGeneral (value, precision, nfi, true);
+			case 'n': return FormatNumber (value, precision, nfi);
+			case 'N': return FormatNumber (value, precision, nfi);
+			case 'p': return FormatPercent (value, precision, nfi);
+			case 'P': return FormatPercent (value, precision, nfi);
+			case 'r': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'R': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'x': return FormatHexadecimal (value, precision, false);
+			case 'X': return FormatHexadecimal (value, precision, true);
+			default: 
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			}			
+		}
+
+		[CLSCompliant (false)]
+		public static string NumberToString (string format, NumberFormatInfo nfi, sbyte value)
+		{
+			char specifier;
+			int precision;
+			bool custom;
+			
+			if (!ParseFormat (format, out specifier, out precision, out custom))
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			
+			if (custom){
+				return FormatCustom (format, value, nfi);
+			}
+			
+			switch(specifier) {
+			case 'c': return FormatCurrency (value, precision, nfi);
+			case 'C': return FormatCurrency (value, precision, nfi);
+			case 'd': return FormatDecimal (value, precision);
+			case 'D': return FormatDecimal (value, precision);
+			case 'e': return FormatExponential (value, precision, false);
+			case 'E': return FormatExponential (value, precision, true);
+			case 'f': return FormatFixedPoint (value, precision, nfi);	
+			case 'F': return FormatFixedPoint (value, precision, nfi);	
+			case 'g': return FormatGeneral (value, precision, nfi, false);
+			case 'G': return FormatGeneral (value, precision, nfi, true);
+			case 'n': return FormatNumber (value, precision, nfi);
+			case 'N': return FormatNumber (value, precision, nfi);
+			case 'p': return FormatPercent (value, precision, nfi);
+			case 'P': return FormatPercent (value, precision, nfi);
+			case 'r': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'R': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'x': return FormatHexadecimal (value, precision, false);
+			case 'X': return FormatHexadecimal (value, precision, true);
+			default: 
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			}
+		}
+
+		[CLSCompliant (false)]
+		public static string NumberToString (string format, NumberFormatInfo nfi, ushort value)
+		{
+			char specifier;
+			int precision;
+			bool custom;
+			
+			if (!ParseFormat (format, out specifier, out precision, out custom))
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			
+			if (custom){
+				return FormatCustom (format, value, nfi);
+			}
+			
+			switch(specifier) {
+			case 'c': return FormatCurrency (value, precision, nfi);
+			case 'C': return FormatCurrency (value, precision, nfi);
+			case 'd': return FormatDecimal (value, precision);
+			case 'D': return FormatDecimal (value, precision);
+			case 'e': return FormatExponential (value, precision, false);
+			case 'E': return FormatExponential (value, precision, true);
+			case 'f': return FormatFixedPoint (value, precision, nfi);	
+			case 'F': return FormatFixedPoint (value, precision, nfi);	
+			case 'g': return FormatGeneral (value, precision, nfi, false);
+			case 'G': return FormatGeneral (value, precision, nfi, true);
+			case 'n': return FormatNumber (value, precision, nfi);
+			case 'N': return FormatNumber (value, precision, nfi);
+			case 'p': return FormatPercent (value, precision, nfi);
+			case 'P': return FormatPercent (value, precision, nfi);
+			case 'r': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'R': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'x': return FormatHexadecimal (value, precision, false);
+			case 'X': return FormatHexadecimal (value, precision, true);
+			default: 
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			}
+		}
+
+		[CLSCompliant (false)]
+		public static string NumberToString (string format, NumberFormatInfo nfi, uint value)
+		{
+			char specifier;
+			int precision;
+			bool custom;
+			
+			if (!ParseFormat (format, out specifier, out precision, out custom))
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			
+			if (custom){
+				return FormatCustom (format, value, nfi);
+			}
+			
+			switch(specifier) {
+			case 'c': return FormatCurrency (value, precision, nfi);
+			case 'C': return FormatCurrency (value, precision, nfi);
+			case 'd': return FormatDecimal (value, precision);
+			case 'D': return FormatDecimal (value, precision);
+			case 'e': return FormatExponential (value, precision, false);
+			case 'E': return FormatExponential (value, precision, true);
+			case 'f': return FormatFixedPoint (value, precision, nfi);	
+			case 'F': return FormatFixedPoint (value, precision, nfi);	
+			case 'g': return FormatGeneral (value, precision, nfi, false);
+			case 'G': return FormatGeneral (value, precision, nfi, true);
+			case 'n': return FormatNumber (value, precision, nfi);
+			case 'N': return FormatNumber (value, precision, nfi);
+			case 'p': return FormatPercent (value, precision, nfi);
+			case 'P': return FormatPercent (value, precision, nfi);
+			case 'r': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'R': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'x': return FormatHexadecimal (value, precision, false);
+			case 'X': return FormatHexadecimal (value, precision, true);
+			default: 
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			}
+		}
+
+		[CLSCompliant (false)]
+		public static string NumberToString (string format, NumberFormatInfo nfi, ulong value)
+		{
+			char specifier;
+			int precision;
+			bool custom;
+			
+			if (!ParseFormat (format, out specifier, out precision, out custom))
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			
+			if (custom){
+				return FormatCustom (format, value, nfi);
+			}
+			
+			switch(specifier) {
+			case 'c': return FormatCurrency (value, precision, nfi);
+			case 'C': return FormatCurrency (value, precision, nfi);
+			case 'd': return FormatDecimal (value, precision);
+			case 'D': return FormatDecimal (value, precision);
+			case 'e': return FormatExponential (value, precision, false);
+			case 'E': return FormatExponential (value, precision, true);
+			case 'f': return FormatFixedPoint (value, precision, nfi);	
+			case 'F': return FormatFixedPoint (value, precision, nfi);	
+			case 'g': return FormatGeneral (value, precision, nfi, false);
+			case 'G': return FormatGeneral (value, precision, nfi, true);
+			case 'n': return FormatNumber (value, precision, nfi);
+			case 'N': return FormatNumber (value, precision, nfi);
+			case 'p': return FormatPercent (value, precision, nfi);
+			case 'P': return FormatPercent (value, precision, nfi);
+			case 'r': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'R': throw new FormatException (Locale.GetText ("The specified format cannot be used in this instance"));
+			case 'x': return FormatHexadecimal (value, precision, false);
+			case 'X': return FormatHexadecimal (value, precision, true);
+			default: 
+				throw new FormatException (Locale.GetText ("The specified format '" + format + "' is invalid"));
+			}
+		}
+
+		// ============ Currency Type Formating ============ //
+
+		//
+		//  Currency Format: Used for strings containing a monetary value. The
+		//  CurrencySymbol, CurrencyGroupSizes, CurrencyGroupSeparator, and
+		//  CurrencyDecimalSeparator members of a NumberFormatInfo supply
+		//  the currency symbol, size and separator for digit groupings, and
+		//  decimal separator, respectively.
+		//  CurrencyNegativePattern and CurrencyPositivePattern determine the
+		//  symbols used to represent negative and positive values. For example,
+		//  a negative value may be prefixed with a minus sign, or enclosed in
+		//  parentheses.
+		//  If the precision specifier is omitted
+		//  NumberFormatInfo.CurrencyDecimalDigits determines the number of
+		//  decimal places in the string. Results are rounded to the nearest
+		//  representable value when necessary.
+		//
+		//  The pattern of the NumberFormatInfo determines how the output looks, where
+		//  the dollar sign goes, where the negative sign goes, etc.
+		//  IFormattable documentation lists the patterns and their values,
+		//  I have them commented out in the large switch statement
+		//
+
+		private static string FormatCurrency (byte value, int precision, NumberFormatInfo nfi) 
+		{
+			return FormatCurrency ((uint)value, precision, nfi);
+		}
+
+		private static string FormatCurrency (short value, int precision, NumberFormatInfo nfi) 
+		{
+			return FormatCurrency ((int)value, precision, nfi);			
+		}
+			
+		private static string FormatCurrency (int value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+			bool negative = (value < 0);
+
+			char[] groupSeparator = nfi.CurrencyGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.CurrencyDecimalSeparator.ToCharArray ();
+			char[] currencySymbol = nfi.CurrencySymbol.ToCharArray ();
+			int[] groupSizes = nfi.CurrencyGroupSizes;
+			int pattern = negative ? nfi.CurrencyNegativePattern : nfi.CurrencyPositivePattern;
+			int symbolLength = currencySymbol.Length;
+			
+			int padding = (precision >= 0) ? precision : nfi.CurrencyDecimalDigits;	     
+			int size = maxIntLength + (groupSeparator.Length * maxIntLength) + padding + 2 + 
+			decimalSeparator.Length + symbolLength;	
+			char[] buffy = new char[size];
+			int position = size;
+
+			// set up the pattern from IFormattible
+			if (negative) {
+				i = symbolLength; 
+ 
+				switch (pattern) {
+				case 0: // ($nnn)
+					buffy[--position] = ')'; 
+					break;
+				// case 1: // -$nnn
+				//	break;
+				// case 2: // $-nnn
+				//	break;
+				case 3: // $nnn-
+					buffy[--position] = '-';
+					break;
+				case 4:	// (nnn$)
+					buffy[--position] = ')'; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 5:	// -nnn$
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 6:	// nnn-$
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = '-'; 
+					break;
+				case 7: // nnn$-
+					buffy[--position] = '-'; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 8: // -nnn $
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' '; 
+					break;
+				// case 9: // -$ nnn
+				//	break;
+				case 10: // nnn $-
+					buffy[--position] = '-'; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' '; 
+					break;
+				case 11: // $ nnn-
+					buffy[--position] = '-'; 
+					break;
+				// case 12: // $ -nnn
+				//	break;
+				case 13: // nnn- $
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' '; 
+					buffy[--position] = '-'; 
+					break;
+				case 14: // ($ nnn)
+					buffy[--position] = ')'; 
+					break;
+				case 15: // (nnn $)
+					buffy[--position] = ')'; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;				
+				}
+			} else {
+				i = symbolLength; 
+				switch (pattern) {
+				// case 0: // $nnn
+				//	break;
+				case 1: // nnn$
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				// case 2: // $ nnn
+				//	break;
+				case 3: // nnn $
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' '; 
+					break;
+				}
+			}
+			
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+
+			// put on decimal separator if we moved over and put a 0 
+			if (position < size && buffy[position] == '0') {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+
+			// just in place to take care of the negative boundries (Int32.MinValue)
+			if (negative) {
+				if (value <= -10) {
+					buffy[--position] = digitLowerTable[-(value % 10)];
+					value = value / -10;
+					
+					if (--k == 0) {
+						i = groupSeparator.Length; 
+						do {
+							buffy[--position] = groupSeparator[--i];
+						} while (i > 0);
+						
+						k = (j < groupSizes.Length) ? 
+						groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+					}
+				} else value = -value;
+			}
+
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			// end the pattern on the left hand side
+			if (negative) {
+				i = symbolLength; 
+ 
+				switch (pattern) {
+				case 0: // ($nnn)
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = '('; 
+					break;
+				case 1: // -$nnn
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = '-'; 
+					break;
+				case 2: // $-nnn
+					buffy[--position] = '-'; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 3: // $nnn-
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 4:	// (nnn$)
+					buffy[--position] = '('; 
+					break;
+				case 5:	// -nnn$
+					buffy[--position] = '-'; 
+					break;
+				// case 6: // nnn-$
+				//	break;
+				// case 7: // nnn$-
+				//	break;
+				case 8: // -nnn $
+					buffy[--position] = '-'; 
+					break;
+				// case 9: // -$ nnn
+				//	break;
+				// case 10: // nnn $-
+				//	break;
+				case 11: // $ nnn-
+					buffy[--position] = ' '; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 12: // $ -nnn
+					buffy[--position] = '-'; 
+					buffy[--position] = ' '; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				// case 13: // nnn- $
+				//	break;
+				case 14: // ($ nnn)
+					buffy[--position] = ' '; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = '('; 
+					break;
+				case 15: // (nnn $)
+					buffy[--position] = '('; 
+					break;				
+				}
+			} else {
+				i = symbolLength; 
+				switch (pattern) {
+				case 0: // $nnn
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				// case 1: // nnn$
+				//	break;
+				case 2: // $ nnn
+					buffy[--position] = ' '; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				// case 3: // nnn $
+				//	break;
+				}
+			}
+			
+			return new string (buffy, position, (size - position));
+		}
+
+		private static string FormatCurrency (long value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+			bool negative = (value < 0);
+
+			char[] groupSeparator = nfi.CurrencyGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.CurrencyDecimalSeparator.ToCharArray ();
+			char[] currencySymbol = nfi.CurrencySymbol.ToCharArray ();
+			int[] groupSizes = nfi.CurrencyGroupSizes;
+			int pattern = negative ? nfi.CurrencyNegativePattern : nfi.CurrencyPositivePattern;
+			int symbolLength = currencySymbol.Length;
+			
+			int padding = (precision >= 0) ? precision : nfi.CurrencyDecimalDigits;	     
+			int size = maxLongLength + (groupSeparator.Length * maxLongLength) + padding + 2 + 
+			decimalSeparator.Length + symbolLength;	
+			char[] buffy = new char[size];
+			int position = size;
+
+			// set up the pattern from IFormattible
+			if (negative) {
+				i = symbolLength; 
+ 
+				switch (pattern) {
+				case 0: // ($nnn)
+					buffy[--position] = ')'; 
+					break;
+				// case 1: // -$nnn
+				//	break;
+				// case 2: // $-nnn
+				//	break;
+				case 3: // $nnn-
+					buffy[--position] = '-';
+					break;
+				case 4:	// (nnn$)
+					buffy[--position] = ')'; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 5:	// -nnn$
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 6:	// nnn-$
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = '-'; 
+					break;
+				case 7: // nnn$-
+					buffy[--position] = '-'; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 8: // -nnn $
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' '; 
+					break;
+				// case 9: // -$ nnn
+				//	break;
+				case 10: // nnn $-
+					buffy[--position] = '-'; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' '; 
+					break;
+				case 11: // $ nnn-
+					buffy[--position] = '-'; 
+					break;
+				// case 12: // $ -nnn
+				//	break;
+				case 13: // nnn- $
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' '; 
+					buffy[--position] = '-'; 
+					break;
+				case 14: // ($ nnn)
+					buffy[--position] = ')'; 
+					break;
+				case 15: // (nnn $)
+					buffy[--position] = ')'; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;				
+				}
+			} else {
+				i = symbolLength; 
+				switch (pattern) {
+				// case 0: // $nnn
+				//	break;
+				case 1: // nnn$
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				// case 2: // $ nnn
+				//	break;
+				case 3: // nnn $
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' '; 
+					break;
+				}
+			}
+			
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+
+			// put on decimal separator if we moved over and put a 0 
+			if (position < size && buffy[position] == '0') {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+		       
+			if (negative) {
+				if (value <= -10) {
+					buffy[--position] = digitLowerTable[-(value % 10)];
+					value = value / -10;
+					
+					if (--k == 0) {
+						i = groupSeparator.Length; 
+						do {
+							buffy[--position] = groupSeparator[--i];
+						} while (i > 0);
+						
+						k = (j < groupSizes.Length) ? 
+						groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+					}
+				} else value = -value;
+			}
+
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			// end the pattern on the left hand side
+			if (negative) {
+				i = symbolLength; 
+ 
+				switch (pattern) {
+				case 0: // ($nnn)
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = '('; 
+					break;
+				case 1: // -$nnn
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = '-'; 
+					break;
+				case 2: // $-nnn
+					buffy[--position] = '-'; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 3: // $nnn-
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 4:	// (nnn$)
+					buffy[--position] = '('; 
+					break;
+				case 5:	// -nnn$
+					buffy[--position] = '-'; 
+					break;
+				// case 6: // nnn-$
+				//	break;
+				// case 7: // nnn$-
+				//	break;
+				case 8: // -nnn $
+					buffy[--position] = '-'; 
+					break;
+				// case 9: // -$ nnn
+				//	break;
+				// case 10: // nnn $-
+				//	break;
+				case 11: // $ nnn-
+					buffy[--position] = ' '; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				case 12: // $ -nnn
+					buffy[--position] = '-'; 
+					buffy[--position] = ' '; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				// case 13: // nnn- $
+				//	break;
+				case 14: // ($ nnn)
+					buffy[--position] = ' '; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					buffy[--position] = '('; 
+					break;
+				case 15: // (nnn $)
+					buffy[--position] = '('; 
+					break;				
+				}
+			} else {
+				i = symbolLength; 
+				switch (pattern) {
+				case 0: // $nnn
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				// case 1: // nnn$
+				//	break;
+				case 2: // $ nnn
+					buffy[--position] = ' '; 
+					do {
+						buffy[--position] = currencySymbol[--i];
+					} while (i > 0);
+					break;
+				// case 3: // nnn $
+				//	break;
+				}
+			}
+			
+			return new string (buffy, position, (size - position));
+		}
+
+		private static string FormatCurrency (sbyte value, int precision, NumberFormatInfo nfi) 
+		{
+			return FormatCurrency ((int)value, precision, nfi);
+		}
+
+		private static string FormatCurrency (ushort value, int precision, NumberFormatInfo nfi) 
+		{
+			return FormatCurrency ((uint)value, precision, nfi);			
+		}
+
+		private static string FormatCurrency (uint value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+
+			char[] groupSeparator = nfi.CurrencyGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.CurrencyDecimalSeparator.ToCharArray ();
+			char[] currencySymbol = nfi.CurrencySymbol.ToCharArray ();
+			int[] groupSizes = nfi.CurrencyGroupSizes;
+			int pattern = nfi.CurrencyPositivePattern;
+			int symbolLength = currencySymbol.Length;
+			
+			int padding = (precision >= 0) ? precision : nfi.CurrencyDecimalDigits;	     
+			int size = maxIntLength + (groupSeparator.Length * maxIntLength) + padding + 2 + 
+			decimalSeparator.Length + symbolLength;	
+			char[] buffy = new char[size];
+			int position = size;
+
+			// set up the pattern from IFormattible, no negative
+			i = symbolLength; 
+			switch (pattern) {
+			// case 0: // $nnn
+			//	break;
+			case 1: // nnn$
+				do {
+					buffy[--position] = currencySymbol[--i];
+				} while (i > 0);
+				break;
+			// case 2: // $ nnn
+			//	break;
+			case 3: // nnn $
+				do {
+					buffy[--position] = currencySymbol[--i];
+				} while (i > 0);
+				buffy[--position] = ' '; 
+				break;
+			}
+			
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+
+			// put on decimal separator if we moved over and put a 0 
+			if (position < size && buffy[position] == '0') {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+		       
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			// end the pattern on the left hand side
+			i = symbolLength; 
+			switch (pattern) {
+			case 0: // $nnn
+				do {
+					buffy[--position] = currencySymbol[--i];
+				} while (i > 0);
+				break;
+			// case 1: // nnn$
+			//	break;
+			case 2: // $ nnn
+				buffy[--position] = ' '; 
+				do {
+					buffy[--position] = currencySymbol[--i];
+				} while (i > 0);
+				break;
+			// case 3: // nnn $
+				//	break;
+			}
+			
+			return new string (buffy, position, (size - position));
+		}
+
+		private static string FormatCurrency (ulong value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+
+			char[] groupSeparator = nfi.CurrencyGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.CurrencyDecimalSeparator.ToCharArray ();
+			char[] currencySymbol = nfi.CurrencySymbol.ToCharArray ();
+			int[] groupSizes = nfi.CurrencyGroupSizes;
+			int pattern = nfi.CurrencyPositivePattern;
+			int symbolLength = currencySymbol.Length;
+			
+			int padding = (precision >= 0) ? precision : nfi.CurrencyDecimalDigits;	     
+			int size = maxLongLength + (groupSeparator.Length * maxLongLength) + padding + 2 + 
+			decimalSeparator.Length + symbolLength;	
+			char[] buffy = new char[size];
+			int position = size;
+
+			// set up the pattern from IFormattible, no negative
+			i = symbolLength; 
+			switch (pattern) {
+			// case 0: // $nnn
+			//	break;
+			case 1: // nnn$
+				do {
+					buffy[--position] = currencySymbol[--i];
+				} while (i > 0);
+				break;
+			// case 2: // $ nnn
+			//	break;
+			case 3: // nnn $
+				do {
+					buffy[--position] = currencySymbol[--i];
+				} while (i > 0);
+				buffy[--position] = ' '; 
+				break;
+			}
+			
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+
+			// put on decimal separator if we moved over and put a 0 
+			if (position < size && buffy[position] == '0') {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+		       
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			// end the pattern on the left hand side
+			i = symbolLength; 
+			switch (pattern) {
+			case 0: // $nnn
+				do {
+					buffy[--position] = currencySymbol[--i];
+				} while (i > 0);
+				break;
+			// case 1: // nnn$
+			//	break;
+			case 2: // $ nnn
+				buffy[--position] = ' '; 
+				do {
+					buffy[--position] = currencySymbol[--i];
+				} while (i > 0);
+				break;
+			// case 3: // nnn $
+				//	break;
+			}
+			
+			return new string (buffy, position, (size - position));
+		}
+		
+		// ============ Format Decimal Types ============ //
+
+		//
+		// Used only for integral data types. Negative values are 
+		// represented by using a '-' sign. The precision specifies
+		// how many digits are to appear in the string. If it is >
+		// how many digits we need, the left side is padded w/ 0's.
+		// If it is smaller than what we need, it is discarded.
+		//
+		// Fairly simple implementation. Fill the buffer from right
+		// to left w/ numbers, then if we still have precision left
+		// over, pad w/ zeros.
+		//
+
+		private static string FormatDecimal (byte value, int precision) 
+		{
+			return FormatDecimal ((uint)value, precision);
+		}
+
+		private static string FormatDecimal (short value, int precision) 
+		{
+			return FormatDecimal ((int)value, precision);
+		}
+	
+		private static string FormatDecimal (int value, int precision)
+		{
+			int size = (precision > 0) ? (maxIntLength + precision) : maxIntLength;
+			char[] buffy = new char[size];
+			int position = size;
+			bool negative = (value < 0);
+			
+			if (negative) 
+				if (value <= -10) {
+					buffy[--position] = digitLowerTable[-(value % 10)];
+					value = value / -10;
+				} else value = -value;
+			
+			// get our value into a buffer from right to left
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+			}
+				
+			buffy[--position] = digitLowerTable[value];
+
+			// if we have precision left over, fill with 0's
+			precision -= (size - position); 
+			while (precision-- > 0 && position > 1) 
+				buffy[--position] = '0';
+
+			if (negative) 
+				buffy[--position] = '-';
+			
+			return new string (buffy, position, (size - position));  
+		}
+
+		private static string FormatDecimal (long value, int precision)
+		{
+			int size = (precision > 0) ? (maxLongLength + precision) : maxLongLength;
+			char[] buffy = new char[size];
+			int position = size;
+			bool negative = (value < 0);
+
+			if (negative) 
+				if (value <= -10) {
+					buffy[--position] = digitLowerTable[-(value % 10)];
+					value = value / -10;
+				} else value = -value;
+
+			// get our value into a buffer from right to left
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+			}
+				
+			buffy[--position] = digitLowerTable[value];
+			
+			// if we have precision left over, fill with 0's
+			precision -= (size - position); 
+			while (precision-- > 0 && position > 1)
+				buffy[--position] = '0';
+
+			if (negative) 
+				buffy[--position] = '-';
+			
+			return new string (buffy, position, (size - position));  
+		}
+
+		private static string FormatDecimal (sbyte value, int precision) 
+		{
+			return FormatDecimal ((int)value, precision);
+		}
+
+		private static string FormatDecimal (ushort value, int precision) 
+		{
+			return FormatDecimal ((uint)value, precision);
+		}
+
+		private static string FormatDecimal (uint value, int precision)
+		{
+			int size = (precision > 0) ? (maxIntLength + precision) : maxIntLength;
+			char[] buffy = new char[size];
+			int position = size;
+
+			// get our value into a buffer from right to left
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+			}
+				
+			buffy[--position] = digitLowerTable[value];
+			
+			// if we have precision left over, fill with 0's
+			precision -= (size - position); 
+			while (precision-- > 0 && position > 1) 
+				buffy[--position] = '0';
+
+			return new string (buffy, position, (size - position));  
+		}
+
+		private static string FormatDecimal (ulong value, int precision)
+		{
+			int size = (precision > 0) ? (maxLongLength + precision) : maxLongLength;
+			char[] buffy = new char[size];
+			int position = size;
+
+			// get our value into a buffer from right to left
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+			}
+				
+			buffy[--position] = digitLowerTable[value];
+			
+			// if we have precision left over, fill with 0's
+			precision -= (size - position); 
+			while (precision-- > 0 && position > 1)
+				buffy[--position] = '0';
+
+			return new string (buffy, position, (size - position));  
+		}
+
+		// ============ Format Exponentials ============ //
+
+		//
+		// Used for strings in the format [-]M.DDDDDDe+XXX.
+		// Exaclty one non-zero digit must appear in M, w/ 
+		// a '-' sign if negative. The precision determines 
+		// number of decimal places, if not given go 6 places.
+		// If precision > the number of places we need, it
+		// is right padded w/ 0's. If it is smaller than what
+		// we need, we cut off and round. The format specifier
+		// decides whether we use an uppercase E or lowercase e.
+		// 
+		// Tried to do this in one pass of one buffer, but it
+		// wasn't happening. Get a buffer + 7 extra slots for
+		// the -, ., E, +, and XXX. Parse the value into another
+		// temp buffer, then build the new string. For the
+		// integral data types, there are a couple things that
+		// can be hardcoded. Since an int and a long can't be
+		// larger than 20 something spaces, the first X w/ 
+		// always be 0, and the the exponential value will only
+		// be 2 digits long. Also integer types w/ always
+		// have a positive exponential.
+		//
+		
+		private static string FormatExponential (byte value, int precision, bool upper) 
+		{
+			return FormatExponential ((uint)value, precision, upper);
+		}
+
+		private static string FormatExponential (short value, int precision, bool upper) 
+		{
+			return FormatExponential ((int)value, precision, upper);
+		}
+
+		private static string FormatExponential (int value, int precision, bool upper)
+		{
+			bool negative = (value < 0);
+			int padding = (precision >= 0) ? precision : 6;
+			char[] buffy = new char[(padding + 8)];
+			char[] tmp = new char [maxIntLength];
+			int exponent = 0, position = maxIntLength;
+			int exp = 0, idx = 0;
+			ulong pow = 10;
+
+			// ugly, but doing it since abs(Int32.MinValue) > Int.MaxValue
+			uint number = (negative) ? (uint)((-(value + 1)) + 1) : (uint)value;
+
+			// need to calculate the number of places to know if we need to round later
+			if (negative && value <= -10) {
+				value /= -10;
+				exp++;
+			}
+
+			while (value >= 10) {
+				value /= 10;
+				exp++;
+			}
+							
+			if (exp > padding) {
+
+				// highest number we should goto before we round
+				while (idx++ <= padding)
+					pow *= 10;
+
+				// get our value into a buffer
+				while (number > pow) {
+					tmp[--position] = digitLowerTable[(number % 10)];
+					number /= 10;
+					exponent++;
+				}
+			
+				number += 5;
+			}
+
+			while (number >= 10) {
+				tmp[--position] = digitLowerTable[(number% 10)];
+				number /= 10;
+				exponent++;
+			}		       
+
+			tmp[--position] = digitLowerTable[number];
+			idx = 0;
+			
+			// go left to right in filling up new string
+			if (negative)
+				buffy[idx++] = '-';
+
+			// we know we have at least one in there, followed 
+			// by a decimal point
+			buffy[idx++] = tmp[position++];
+			if (precision != 0)
+				buffy[idx++] = '.';
+
+			// copy over the remaining digits until we run out,
+			// or we've passed our specified precision
+			while (padding > 0 && position < maxIntLength) {
+				buffy[idx++] = tmp[position++];
+				padding--;
+			}
+			
+			// if we still have more precision to go, add some
+			// zeros
+			while (padding > 0) {
+				buffy[idx++] = '0';
+				padding--;
+			}
+			
+			// we know these next 3 spots
+			buffy[idx++] = upper ? 'E' : 'e';
+			buffy[idx++] = '+';
+			buffy[idx++] = '0';
+			
+			// next two digits depend on our length
+			if (exponent >= 10) {
+				buffy[idx++] = digitLowerTable[(exponent / 10)];
+				buffy[idx] = digitLowerTable[(exponent % 10)];
+			} else { 
+				buffy[idx++] = '0';
+				buffy[idx] = digitLowerTable[exponent];
+			}
+
+			return new string(buffy, 0, ++idx); 
+		}
+
+		private static string FormatExponential (long value, int precision, bool upper)
+		{
+			bool negative = (value < 0);
+			int padding = (precision >= 0) ? precision : 6;
+			char[] buffy = new char[(padding + 8)];
+			char[] tmp = new char [maxLongLength];
+			int exponent = 0, position = maxLongLength;
+			int exp = 0, idx = 0;
+			ulong pow = 10;
+
+			// ugly, but doing it since abs(Int32.MinValue) > Int.MaxValue
+			ulong number = (negative) ? (ulong)((-(value + 1)) + 1) : (ulong)value;
+
+			// need to calculate the number of places to know if we need to round later
+			if (negative && value <= -10) {
+				value /= -10;
+				exp++;
+			}
+
+			while (value >= 10) {
+				value /= 10;
+				exp++;
+			}
+							
+			if (exp > padding) {
+				
+				// highest number we should goto before we round
+				while (idx++ <= padding)
+					pow *= 10;
+				
+				// get our value into a buffer
+				while (number > pow) {
+					tmp[--position] = digitLowerTable[(number % 10)];
+					number /= 10;
+					exponent++;
+				}
+			
+				number += 5;
+			}
+
+			while (number >= 10) {
+				tmp[--position] = digitLowerTable[(number% 10)];
+				number /= 10;
+				exponent++;
+			}		       
+
+			tmp[--position] = digitLowerTable[number];
+			idx = 0;
+
+			// go left to right in filling up new string
+			if (negative)
+				buffy[idx++] = '-';
+
+			// we know we have at least one in there, followed 
+			// by a decimal point
+			buffy[idx++] = tmp[position++];
+			if (precision != 0)
+				buffy[idx++] = '.';
+
+			// copy over the remaining digits until we run out,
+			// or we've passed our specified precision
+			while (padding > 0 && position < maxLongLength) {
+				buffy[idx++] = tmp[position++];
+				padding--;
+			}
+			
+			// if we still have more precision to go, add some
+			// zeros
+			while (padding > 0) {
+				buffy[idx++] = '0';
+				padding--;
+			}
+			
+			// we know these next 3 spots
+			buffy[idx++] = upper ? 'E' : 'e';
+			buffy[idx++] = '+';
+			buffy[idx++] = '0';
+			
+			// next two digits depend on our length
+			if (exponent >= 10) {
+				buffy[idx++] = digitLowerTable[(exponent / 10)];
+				buffy[idx] = digitLowerTable[(exponent % 10)];
+			} else { 
+				buffy[idx++] = '0';
+				buffy[idx] = digitLowerTable[exponent];
+			}
+
+			return new string(buffy, 0, ++idx); 
+		}
+
+		private static string FormatExponential (sbyte value, int precision, bool upper) 
+		{
+			return FormatExponential ((int)value, precision, upper);
+		}
+
+		private static string FormatExponential (ushort value, int precision, bool upper) 
+		{
+			return FormatExponential ((uint)value, precision, upper);
+		}
+
+		private static string FormatExponential (uint value, int precision, bool upper)
+		{
+			int padding = (precision >= 0) ? precision : 6;
+			char[] buffy = new char[(padding + 8)];
+			char[] tmp = new char [maxIntLength];
+			int exponent = 0, position = maxIntLength;
+			int exp = 0, idx = 0;
+			ulong pow = 10;
+			ulong number = (ulong)value;
+
+			// need to calculate the number of places to know if we need to round later
+			while (value >= 10) {
+				value /= 10;
+				exp++;
+			}
+							
+			if (exp > padding) {
+
+				// highest number we should goto before we round
+				while (idx++ <= padding)
+					pow *= 10;
+				
+				// get our value into a buffer
+				while (number > pow) {
+					tmp[--position] = digitLowerTable[(number % 10)];
+					number /= 10;
+					exponent++;
+				}
+				
+				number += 5;
+			}
+
+			while (number >= 10) {
+				tmp[--position] = digitLowerTable[(number% 10)];
+				number /= 10;
+				exponent++;
+			}		       
+
+			tmp[--position] = digitLowerTable[number];
+			idx = 0;
+
+			// we know we have at least one in there, followed 
+			// by a decimal point
+			buffy[idx++] = tmp[position++];
+			if (precision != 0)
+				buffy[idx++] = '.';
+
+			// copy over the remaining digits until we run out,
+			// or we've passed our specified precision
+			while (padding > 0 && position < maxIntLength) {
+				buffy[idx++] = tmp[position++];
+				padding--;
+			}
+			
+			// if we still have more precision to go, add some
+			// zeros
+			while (padding > 0) {
+				buffy[idx++] = '0';
+				padding--;
+			}
+			
+			// we know these next 3 spots
+			buffy[idx++] = upper ? 'E' : 'e';
+			buffy[idx++] = '+';
+			buffy[idx++] = '0';
+			
+			// next two digits depend on our length
+			if (exponent >= 10) {
+				buffy[idx++] = digitLowerTable[(exponent / 10)];
+				buffy[idx] = digitLowerTable[(exponent % 10)];
+			} else { 
+				buffy[idx++] = '0';
+				buffy[idx] = digitLowerTable[exponent];
+			}
+
+			return new string(buffy, 0, ++idx); 
+		}
+
+		private static string FormatExponential (ulong value, int precision, bool upper)
+		{
+			int padding = (precision >= 0) ? precision : 6;
+			char[] buffy = new char[(padding + 8)];
+			char[] tmp = new char [maxLongLength];
+			int exponent = 0, position = maxLongLength;
+			int exp = 0, idx = 0;
+			ulong pow = 10;
+			ulong number = value;
+
+			// need to calculate the number of places to know if we need to round later
+			while (value >= 10) {
+				value /= 10;
+				exp++;
+			}
+							
+			if (exp > padding) {
+
+				// highest number we should goto before we round
+				while (idx++ <= padding)
+					pow *= 10;
+
+				// get our value into a buffer
+				while (number > pow) {
+					tmp[--position] = digitLowerTable[(number % 10)];
+					number /= 10;
+					exponent++;
+				}
+			
+				number += 5;
+			}
+
+			while (number >= 10) {
+				tmp[--position] = digitLowerTable[(number% 10)];
+				number /= 10;
+				exponent++;
+			}		       
+
+			tmp[--position] = digitLowerTable[number];
+			idx = 0;
+
+			// we know we have at least one in there, followed 
+			// by a decimal point
+			buffy[idx++] = tmp[position++];
+			if (precision != 0)
+				buffy[idx++] = '.';
+
+			// copy over the remaining digits until we run out,
+			// or we've passed our specified precision
+			while (padding > 0 && position < maxLongLength) {
+				buffy[idx++] = tmp[position++];
+				padding--;
+			}
+			
+			// if we still have more precision to go, add some
+			// zeros
+			while (padding > 0) {
+				buffy[idx++] = '0';
+				padding--;
+			}
+			
+			// we know these next 3 spots
+			buffy[idx++] = upper ? 'E' : 'e';
+			buffy[idx++] = '+';
+			buffy[idx++] = '0';
+			
+			// next two digits depend on our length
+			if (exponent >= 10) {
+				buffy[idx++] = digitLowerTable[(exponent / 10)];
+				buffy[idx] = digitLowerTable[(exponent % 10)];
+			} else { 
+				buffy[idx++] = '0';
+				buffy[idx] = digitLowerTable[exponent];
+			}
+
+			return new string(buffy, 0, ++idx); 
+		}
+
+		// ============ Format Fixed Points ============ //
+
+		//
+		// Used for strings in the following form "[-]M.DD...D"
+		// At least one non-zero digit precedes the '.', w/ a 
+		// '-' before that if negative. Precision specifies number
+		// of decimal places 'D' to go. If not given, use
+		// NumberFormatInfo.NumbeDecimalDigits. Results are rounded
+		// if necessary. 
+		//
+		// Fairly simple implementation for integral types. Going
+		// from right to left, fill up precision number of 0's,
+		// plop a . down, then go for our number. 
+		//
+
+		private static string FormatFixedPoint (byte value, int precision, NumberFormatInfo nfi)
+		{
+			return FormatFixedPoint ((uint)value, precision, nfi);
+		}
+
+		private static string FormatFixedPoint (short value, int precision, NumberFormatInfo nfi)
+		{
+			return FormatFixedPoint ((int)value, precision, nfi);
+		}
+
+		private static string FormatFixedPoint (int value, int precision, NumberFormatInfo nfi)
+		{
+			int padding = (precision >= 0) ? (precision + maxIntLength) : (nfi.NumberDecimalDigits + maxIntLength);
+			char[] buffy = new char[padding];
+			int position = padding;
+			bool negative = (value < 0);
+			
+			// fill up w/ precision # of 0's
+			while (position > (maxIntLength - 1)) 
+				buffy[--position] = '0';
+
+			if (precision != 0)
+				buffy[position--] = '.';
+
+			if (negative)
+				if (value <= -10) {
+					buffy[position--] = digitLowerTable[-(value % 10)];
+					value = value / -10;
+				} else value = -value;
+			
+			// fill up w/ the value
+			while (value >= 10) {
+				buffy[position--] = digitLowerTable[(value % 10)];
+				value = value / 10;
+			}
+
+			buffy[position] = digitLowerTable[value];
+
+			if (negative) 
+				buffy[--position] = '-';
+			
+			return new string (buffy, position, (padding - position));
+		}
+
+		private static string FormatFixedPoint (long value, int precision, NumberFormatInfo nfi)
+		{
+			int padding = (precision >= 0) ? (precision + maxLongLength) : (nfi.NumberDecimalDigits + maxLongLength);
+			char[] buffy = new char[padding];
+			int position = padding;
+			bool negative = (value < 0);
+			
+			// fill up w/ precision # of 0's
+			while (position > (maxLongLength - 1)) 
+				buffy[--position] = '0';
+
+			if (precision != 0)
+				buffy[position--] = '.';
+
+			if (negative)
+				if (value <= -10) {
+					buffy[position--] = digitLowerTable[-(value % 10)];
+					value = value / -10;
+				} else value = -value;
+			
+			// fill up w/ the value
+			while (value >= 10) {
+				buffy[position--] = digitLowerTable[(value % 10)];
+				value = value / 10;
+			}
+
+			buffy[position] = digitLowerTable[value];
+
+			if (negative) 
+				buffy[--position] = '-';
+			
+			return new string (buffy, position, (padding - position));
+		}
+
+		private static string FormatFixedPoint (sbyte value, int precision, NumberFormatInfo nfi)
+		{
+			return FormatFixedPoint ((int)value, precision, nfi);
+		}
+
+		private static string FormatFixedPoint (ushort value, int precision, NumberFormatInfo nfi)
+		{
+			return FormatFixedPoint ((uint)value, precision, nfi);
+		}
+
+		private static string FormatFixedPoint (uint value, int precision, NumberFormatInfo nfi)
+		{
+			int padding = (precision >= 0) ? (precision + maxIntLength) : (nfi.NumberDecimalDigits + maxIntLength);
+			char[] buffy = new char[padding];
+			int position = padding;
+
+			// fill up w/ precision # of 0's
+			while (position > (maxIntLength - 1)) 
+				buffy[--position] = '0';
+
+			if (precision != 0)
+				buffy[position--] = '.';
+
+			// fill up w/ the value
+			while (value >= 10) {
+				buffy[position--] = digitLowerTable[(value % 10)];
+				value = value / 10;
+			}
+
+			buffy[position] = digitLowerTable[value];
+			
+			return new string (buffy, position, (padding - position));
+		}
+
+		private static string FormatFixedPoint (ulong value, int precision, NumberFormatInfo nfi)
+		{
+			int padding = (precision >= 0) ? (precision + maxLongLength) : (nfi.NumberDecimalDigits + maxLongLength);
+			char[] buffy = new char[padding];
+			int position = padding;
+
+			// fill up w/ precision # of 0's
+			while (position > (maxLongLength - 1)) 
+				buffy[--position] = '0';
+
+			if (precision != 0)
+				buffy[position--] = '.';
+
+			// fill up w/ the value
+			while (value >= 10) {
+				buffy[position--] = digitLowerTable[(value % 10)];
+				value = value / 10;
+			}
+
+			buffy[position] = digitLowerTable[value];
+			
+			return new string (buffy, position, (padding - position));
+		}
+
+		// ============ Format General ============ //
+		
+		//
+		// Strings are formatted in either Fixed Point or Exponential
+		// format. Results are rounded when needed. If no precision is
+		// given, the defaults are:
+		//
+		// short & ushort: 5
+		// int & uint: 10
+		// long & ulong: 19
+		// float: 7
+		// double: 15
+		// decimal: 29
+		//
+		// The value is formatted using fixed-point if exponent >= -4
+		// and exponent < precision, where exponent is he exponenent of
+		// the value in exponential format. The decimal point and trailing
+		// zeros are removed when possible.
+		//
+		// For all other values, exponential format is used. The case of
+		// the format specifier determines whether 'e' or 'E' prefixes
+		// the exponent.
+		// 
+		// In either case, the number of digits that appear in the result
+		// (not including the exponent) will not exceed the value of the
+		// precision. The result is rounded as needed.
+		//
+		// Integral values are formatted using Fixed Point whenever
+		// precision is omitted. (This actually doesn't make sense when
+		// coupled w/ the 1st paragraph).
+		//		
+		// Okay, so the decimal point is removed along with any trailing
+		// zeros. So, ignoring the last paragraph, we can consider an int
+		// ToString() to format it w/ exponential format w/ a default
+		// precision of 10, but since it will just be .00000000, it's
+		// discarded.
+		//
+
+		internal static string FormatGeneral (byte value, int precision, NumberFormatInfo nfi, bool upper) {
+			return FormatGeneral ((uint)value, precision, nfi, upper);
+		}
+
+		internal static string FormatGeneral (short value, int precision, NumberFormatInfo nfi, bool upper) {
+			return FormatGeneral ((int)value, precision, nfi, upper);
+		}
+
+		internal static string FormatGeneral (int value, int precision, NumberFormatInfo nfi, bool upper) 
+		{
+			bool negative = (value < 0);
+			char[] tmp = new char [maxIntLength];
+			int exponent = 0;
+			int position = maxIntLength;
+			
+			// ugly, but doing it since abs(Int32.MinValue) > Int.MaxValue
+			uint number = (negative) ? (uint)((-(value + 1)) + 1) : (uint)value;
+
+			// get number into a buffer, going to be doing this no matter what
+			if (negative)
+				if (value <= -10) {
+					tmp[--position] = digitLowerTable[-(value % 10)];
+					value /= -10;
+					exponent++;
+				} else value = -value;
+
+			while (value >= 10) {
+				tmp[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+				exponent++;
+			}
+			
+			tmp[--position] = digitLowerTable[value];
+
+			// integral values are formatted using fixed point when precision
+			// is not specified. But also trailing decimal point and zeros are
+			// discared. So for int's it will always be .00, so just compute
+			// here and save the call to FormatFixedPoint & trim.
+			if (precision <= 0 || exponent < precision) {
+				if (negative) 
+					tmp[--position] = '-';
+				
+				return new string (tmp, position, (maxIntLength - position)); 
+			}
+
+			// else our exponent was > precision, use exponential format
+			// precision = number of digits to show. 
+			int idx = 0;
+			ulong pow = 1;
+
+			exponent = 0;
+			position = maxIntLength;
+			
+			// Loop through while our number is less than the 10 ^ precision, then
+			// add 5 to that to round it out, and keep continuing
+			while (idx++ <= precision)
+				pow *= 10;
+			
+			while (number > pow) {
+				tmp[--position] = digitLowerTable[(number % 10)];
+				number /= 10;
+				exponent++;
+			}
+
+			number += 5;
+
+			while (number >= 10) {
+				tmp[--position] = digitLowerTable[(number % 10)];
+				number /= 10;
+				exponent++;
+			}
+
+			tmp[--position] = digitLowerTable[number];
+
+			// finally, make our final buffer, at least precision + 6 for 'E+XX' and '-'
+			// and reuse pow for size
+			idx = position;
+			position = 0;
+			pow = (ulong)(precision + 6);
+			char[] buffy = new char[pow];
+
+			if (negative)
+				buffy[position++] = '-';
+			
+			buffy[position++] = tmp[idx++];
+			buffy[position] = '.';
+
+			// for the remaining precisions copy over rounded tmp
+			precision--;
+			while (precision-- > 0)
+				buffy[++position] = tmp[idx++];
+
+			// get rid of ending zeros
+			while (buffy[position] == '0')
+				position--;
+
+			// if we backed up all the way to the ., over write it
+			if (buffy[position] != '.')
+				position++;			
+
+			// ints can only be +, e or E depending on format, plus XX
+			buffy[position++] = upper ? 'E' : 'e';
+			buffy[position++] = '+';
+
+			if (exponent >= 10) {
+				buffy[position++] = digitLowerTable[(exponent / 10)];
+				buffy[position++] = digitLowerTable[(exponent % 10)];
+			} else { 
+				buffy[position++] = '0';
+				buffy[position++] = digitLowerTable[exponent];
+			}
+			
+			return new string (buffy, 0, position);
+		}
+
+		internal static string FormatGeneral (long value, int precision, NumberFormatInfo nfi, bool upper) 
+		{
+			bool negative = (value < 0);
+			char[] tmp = new char [maxLongLength];
+			int exponent = 0;
+			int position = maxLongLength;
+
+			// ugly, but doing it since abs(Int32.MinValue) > Int.MaxValue
+			ulong number = (negative) ? (ulong)(-(value + 1) + 1) : (ulong)value;
+
+			// get number into a buffer, going to be doing this no matter what
+			if (negative)
+				if (value <= -10) {
+					tmp[--position] = digitLowerTable[-(value % 10)];
+					value /= -10;
+				} else value = -value;
+
+			while (value >= 10) {
+				tmp[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+			}
+			
+			tmp[--position] = digitLowerTable[value];
+			exponent = (maxLongLength - position) - 1;
+
+			// integral values are formatted using fixed point when precision
+			// is not specified. But also trailing decimal point and zeros are
+			// discared. So for int's it will always be .00, so just compute
+			// here and save the call to FormatFixedPoint & trim.
+			if (precision <= 0 || exponent < precision) {
+				if (negative) 
+					tmp[--position] = '-';
+				
+				return new string (tmp, position, (maxLongLength - position)); 
+			}
+
+			// else our exponent was > precision, use exponential format
+			// precision = number of digits to show. 
+			int idx = 0;
+			ulong pow = 1;
+
+			exponent = 0;
+			position = maxLongLength;
+
+			// Loop through while our number is less than the 10 ^ precision, then
+			// add 5 to that to round it out, and keep continuing
+			while (idx++ <= precision)
+				pow *= 10;
+			
+			while (number > pow) {
+				tmp[--position] = digitLowerTable[(number % 10)];
+				number /= 10;
+				exponent++;
+			}
+
+			number += 5;
+
+			while (number >= 10) {
+				tmp[--position] = digitLowerTable[(number % 10)];
+				number /= 10;
+				exponent++;
+			}
+
+			tmp[--position] = digitLowerTable[number];
+
+			// finally, make our final buffer, at least precision + 6 for 'E+XX' and '-'
+			// and reuse pow for size
+			idx = position;
+			position = 0;
+			pow = (ulong)precision + 6;
+			char[] buffy = new char[pow];
+
+			if (negative)
+				buffy[position++] = '-';
+			
+			buffy[position++] = tmp[idx++];
+			buffy[position] = '.';
+
+			// for the remaining precisions copy over rounded tmp
+			precision--;
+			while (precision-- > 0)
+				buffy[++position] = tmp[idx++];
+
+			// get rid of ending zeros
+			while (buffy[position] == '0')
+				position--;
+
+			// if we backed up all the way to the ., over write it
+			if (buffy[position] != '.')
+				position++;			
+
+			// ints can only be +, e or E depending on format, plus XX
+			buffy[position++] = upper ? 'E' : 'e';
+			buffy[position++] = '+';
+
+			if (exponent >= 10) {
+				buffy[position++] = digitLowerTable[(exponent / 10)];
+				buffy[position++] = digitLowerTable[(exponent % 10)];
+			} else { 
+				buffy[position++] = '0';
+				buffy[position++] = digitLowerTable[exponent];
+			}
+			
+			return new string (buffy, 0, position);
+		}
+
+		internal static string FormatGeneral (sbyte value, int precision, NumberFormatInfo nfi, bool upper) {
+			return FormatGeneral ((int)value, precision, nfi, upper);
+		}
+
+		internal static string FormatGeneral (ushort value, int precision, NumberFormatInfo nfi, bool upper) {
+			return FormatGeneral ((uint)value, precision, nfi, upper);
+		}
+
+		internal static string FormatGeneral (uint value, int precision, NumberFormatInfo nfi, bool upper) 
+		{
+			char[] tmp = new char [maxIntLength];
+			int exponent = 0;
+			int position = maxIntLength;
+			ulong number = (ulong)value;
+
+			// get number into a buffer, going to be doing this no matter what
+			while (value >= 10) {
+				tmp[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+			}
+			
+			tmp[--position] = digitLowerTable[value];
+			exponent = (maxIntLength - position) - 1;
+
+			// integral values are formatted using fixed point when precision
+			// is not specified. But also trailing decimal point and zeros are
+			// discared. So for int's it will always be .00, so just compute
+			// here and save the call to FormatFixedPoint & trim.
+			if (precision <= 0 || exponent < precision) 
+				return new string (tmp, position, (maxIntLength - position)); 
+
+			// else our exponent was > precision, use exponential format
+			// precision = number of digits to show. 
+			int idx = 0;
+			ulong pow = 1;
+
+			exponent = 0;
+			position = maxIntLength;
+						
+			// Loop through while our number is less than the 10 ^ precision, then
+			// add 5 to that to round it out, and keep continuing
+			while (idx++ <= precision)
+				pow *= 10;
+
+			while (number > pow) {
+				tmp[--position] = digitLowerTable[(number % 10)];
+				number /= 10;
+				exponent++;
+			}
+
+			number += 5;
+
+			while (number >= 10) {
+				tmp[--position] = digitLowerTable[(number % 10)];
+				number /= 10;
+				exponent++;
+			}
+
+			tmp[--position] = digitLowerTable[number]; 	
+
+			// finally, make our final buffer, at least precision + 6 for 'E+XX' and '-'
+			// and reuse pow for size
+			idx = position;
+			position = 0;
+			pow = (ulong)(precision + 6);
+			char[] buffy = new char[pow];
+
+			buffy[position++] = tmp[idx++];
+			buffy[position] = '.';
+
+			// for the remaining precisions copy over rounded tmp
+			precision--;
+			while (precision-- > 0)
+				buffy[++position] = tmp[idx++];
+
+			// get rid of ending zeros
+			while (buffy[position] == '0')
+				position--;
+
+			// if we backed up all the way to the ., over write it
+			if (buffy[position] != '.')
+				position++;			
+
+			// ints can only be +, e or E depending on format, plus XX
+			buffy[position++] = upper ? 'E' : 'e';
+			buffy[position++] = '+';
+
+			if (exponent >= 10) {
+				buffy[position++] = digitLowerTable[(exponent / 10)];
+				buffy[position++] = digitLowerTable[(exponent % 10)];
+			} else { 
+				buffy[position++] = '0';
+				buffy[position++] = digitLowerTable[exponent];
+			}
+			
+			return new string (buffy, 0, position);
+		}
+
+		internal static string FormatGeneral (ulong value, int precision, NumberFormatInfo nfi, bool upper) 
+		{
+			char[] tmp = new char [maxLongLength];
+			int exponent = 0;
+			int position = maxLongLength;
+			ulong number = value;
+
+			// get number into a buffer, going to be doing this no matter what
+			while (value >= 10) {
+				tmp[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+				exponent++;
+			}
+			
+			tmp[--position] = digitLowerTable[value];
+
+			// integral values are formatted using fixed point when precision
+			// is not specified. But also trailing decimal point and zeros are
+			// discared. So for int's it will always be .00, so just compute
+			// here and save the call to FormatFixedPoint & trim.
+			if (precision <= 0 || exponent < precision) 
+				return new string (tmp, position, (maxLongLength - position)); 
+
+			// else our exponent was > precision, use exponential format
+			// precision = number of digits to show. 
+			int idx = 0;
+			ulong pow = 1;
+
+			exponent = 0;
+			position = maxLongLength;
+
+			// Loop through while our number is less than the 10 ^ precision, then
+			// add 5 to that to round it out, and keep continuing
+			while (idx++ <= precision)
+				pow *= 10;
+			
+			while (number > pow) {
+				tmp[--position] = digitLowerTable[(number % 10)];
+				number /= 10;
+				exponent++;
+			}
+
+			number += 5;
+
+			while (number >= 10) {
+				tmp[--position] = digitLowerTable[(number % 10)];
+				number /= 10;
+				exponent++;
+			}
+
+			tmp[--position] = digitLowerTable[number];
+
+			// finally, make our final buffer, at least precision + 6 for 'E+XX' and '-'
+			// and reuse pow for size
+			idx = position;
+			position = 0;
+			pow = (ulong)precision + 6;
+			char[] buffy = new char[pow];
+
+			buffy[position++] = tmp[idx++];
+			buffy[position] = '.';
+
+			// for the remaining precisions copy over rounded tmp
+			precision--;
+			while (precision-- > 0)
+				buffy[++position] = tmp[idx++];
+
+			// get rid of ending zeros
+			while (buffy[position] == '0')
+				position--;
+
+			// if we backed up all the way to the ., over write it
+			if (buffy[position] != '.')
+				position++;			
+
+			// ints can only be +, e or E depending on format, plus XX
+			buffy[position++] = upper ? 'E' : 'e';
+			buffy[position++] = '+';
+
+			if (exponent >= 10) {
+				buffy[position++] = digitLowerTable[(exponent / 10)];
+				buffy[position++] = digitLowerTable[(exponent % 10)];
+			} else { 
+				buffy[position++] = '0';
+				buffy[position++] = digitLowerTable[exponent];
+			}
+			
+			return new string (buffy, 0, position);
+		}
+
+		// ============ Format Number ============ //
+
+		// 
+		// Used for strings in the following form "[-]d,ddd,ddd.dd...d"
+		// The minus sign only appears if it is negative. At least one
+		// non-zero digit preceeds the decimal separator. The precision
+		// specifier determines the number of decimal places. If it is 
+		// not given, use NumberFormatInfo.NumberDecimalDigits.
+		// The NumberGroupSizes, NumberGroupSeparator, and NumberDecimalSeparator
+		// members of NumberFormatInfo supply the size and separator
+		// for digit groupings. See IFormattable.
+		//
+		// The group sizes is an array of ints that determine the grouping
+		// of numbers. All digits are in the range 1-9, with the last digit
+		// being between 0-9. The number formats the string backwards, with
+		// the last digit being the group size for the rest of (leftmost) the
+		// the string, 0 being none.
+		//
+		// For instance:
+		//		groupSizes = { 3, 2, 1, 0 }; 
+		//		int n = 1234567890 => "1234,5,67,890"
+		//		groupSizes = { 3, 2, 1 }; 
+		//		int n = 1234567890 => "1,2,3,4,5,67,890"
+		//		groupSizes = { 2, 0 };
+		//		int n = 1234567890 => "1234567,90";
+		//
+		// Not too difficult, jsut keep track of where you are in the array
+		// and when to print the separator
+		//
+		// The max size of the buffer is assume we have a separator every 
+		// number, plus the precision on the end, plus a spot for the negative
+		// and a spot for decimal separator.
+		//
+
+		private static string FormatNumber (byte value, int precision, NumberFormatInfo nfi) {
+			return FormatNumber ((uint)value, precision, nfi);
+		}
+
+		private static string FormatNumber (short value, int precision, NumberFormatInfo nfi) {
+			return FormatNumber ((int)value, precision, nfi);
+		}
+
+		private static string FormatNumber (int value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+			char[] groupSeparator = nfi.NumberGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.NumberDecimalSeparator.ToCharArray ();
+			int[] groupSizes = nfi.NumberGroupSizes;
+
+			int padding = (precision >= 0) ? precision : nfi.NumberDecimalDigits;
+			int pattern = nfi.NumberNegativePattern;
+			int size = maxIntLength + (maxIntLength * groupSeparator.Length) + padding +
+			decimalSeparator.Length + 4;
+			char[] buffy = new char[size];
+			int position = size;
+			bool negative = (value < 0);
+			
+			// pattern for negative values, defined in NumberFormatInfo
+			if (negative) {
+				switch (pattern) {
+				case 0: // (nnn)
+					buffy[--position] = ')'; 
+					break;
+				// case 1: // -nnn
+				//	break;
+				// case 2: // - nnn
+				//	break;
+				case 3: // nnn-
+					buffy[--position] = '-'; 
+					break;
+				case 4:	// nnn -
+					buffy[--position] = '-'; 
+					buffy[--position] = ' '; 
+					break;
+				}
+			}
+
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+
+			// put on decimal separator
+			if (position != size) {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+
+			// negative hack for numbers past MinValue
+			if (negative)
+				if (value <= -10) {
+					buffy[--position] = digitLowerTable[-(value % 10)];
+					value = value / -10;
+					
+					if (--k == 0) {
+						i = groupSeparator.Length; 
+						do {
+							buffy[--position] = groupSeparator[--i];
+						} while (i > 0);
+						
+						k = (j < groupSizes.Length) ? 
+						groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+					}
+				} else value = -value;
+
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			// pattern for negative values, defined in NumberFormatInfo
+			if (negative) {
+				switch (pattern) {
+				case 0: // (nnn)
+					buffy[--position] = '('; 
+					break;
+				case 1: // -nnn
+					buffy[--position] = '-'; 
+					break;
+				case 2: // - nnn
+					buffy[--position] = ' '; 
+					buffy[--position] = '-'; 
+					break;
+				// case 3: // nnn-
+				//	break;
+				// case 4: // nnn -
+				//	break;
+				}
+			}
+			
+			return new string (buffy, position, (size - position));
+		}
+
+		private static string FormatNumber (long value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+			char[] groupSeparator = nfi.NumberGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.NumberDecimalSeparator.ToCharArray ();
+			int[] groupSizes = nfi.NumberGroupSizes;
+
+			int padding = (precision >= 0) ? precision : nfi.NumberDecimalDigits;
+			int pattern = nfi.NumberNegativePattern;
+			int size = maxLongLength + (maxLongLength * groupSeparator.Length) + padding +
+			decimalSeparator.Length + 4;
+			char[] buffy = new char[size];
+			int position = size;
+			bool negative = (value < 0);
+			
+			// pattern for negative values, defined in NumberFormatInfo
+			if (negative) {
+				switch (pattern) {
+				case 0: // (nnn)
+					buffy[--position] = ')'; 
+					break;
+				// case 1: // -nnn
+				//	break;
+				// case 2: // - nnn
+				//	break;
+				case 3: // nnn-
+					buffy[--position] = '-'; 
+					break;
+				case 4:	// nnn -
+					buffy[--position] = '-'; 
+					buffy[--position] = ' '; 
+					break;
+				}
+			}
+
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+						
+			// put on decimal separator
+			if (position != size) {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+
+			// negative hack for numbers past MinValue
+			if (negative)
+				if (value <= -10) {
+					buffy[--position] = digitLowerTable[-(value % 10)];
+					value = value / -10;
+					
+					if (--k == 0) {
+						i = groupSeparator.Length; 
+						do {
+							buffy[--position] = groupSeparator[--i];
+						} while (i > 0);
+						
+						k = (j < groupSizes.Length) ? 
+						groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+					}
+				} else value = -value;
+
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			// pattern for negative values, defined in NumberFormatInfo
+			if (negative) {
+				switch (pattern) {
+				case 0: // (nnn)
+					buffy[--position] = '('; 
+					break;
+				case 1: // -nnn
+					buffy[--position] = '-'; 
+					break;
+				case 2: // - nnn
+					buffy[--position] = ' '; 
+					buffy[--position] = '-'; 
+					break;
+				// case 3: // nnn-
+				//	break;
+				// case 4: // nnn -
+				//	break;
+				}
+			}
+			
+			return new string (buffy, position, (size - position));
+		}
+
+		private static string FormatNumber (sbyte value, int precision, NumberFormatInfo nfi) {
+			return FormatNumber ((int)value, precision, nfi);
+		}
+
+		private static string FormatNumber (ushort value, int precision, NumberFormatInfo nfi) {
+			return FormatNumber ((uint)value, precision, nfi);
+		}
+
+		private static string FormatNumber (uint value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+			char[] groupSeparator = nfi.NumberGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.NumberDecimalSeparator.ToCharArray ();
+			int[] groupSizes = nfi.NumberGroupSizes;
+
+			int padding = (precision >= 0) ? precision : nfi.NumberDecimalDigits;
+			int size = maxIntLength + (maxIntLength * groupSeparator.Length) + padding +
+			decimalSeparator.Length + 2;
+			char[] buffy = new char[size];
+			int position = size;
+			
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+						
+			// put on decimal separator
+			if (position != size) {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			return new string (buffy, position, (size - position));
+		}
+
+		private static string FormatNumber (ulong value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+			char[] groupSeparator = nfi.NumberGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.NumberDecimalSeparator.ToCharArray ();
+			int[] groupSizes = nfi.NumberGroupSizes;
+
+			int padding = (precision >= 0) ? precision : nfi.NumberDecimalDigits;
+			int size = maxLongLength + (maxLongLength * groupSeparator.Length) + padding +
+			decimalSeparator.Length + 2;
+			char[] buffy = new char[size];
+			int position = size;
+			
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+			
+			// put on decimal separator
+			if (position != size) {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			return new string (buffy, position, (size - position));
+		}		
+
+		// ============ Percent Formatting ============ //
+
+		//
+		//  Percent Format: Used for strings containing a percentage. The
+		//  PercentSymbol, PercentGroupSizes, PercentGroupSeparator, and
+		//  PercentDecimalSeparator members of a NumberFormatInfo supply
+		//  the Percent symbol, size and separator for digit groupings, and
+		//  decimal separator, respectively.
+		//  PercentNegativePattern and PercentPositivePattern determine the
+		//  symbols used to represent negative and positive values. For example,
+		//  a negative value may be prefixed with a minus sign, or enclosed in
+		//  parentheses.
+		//  If no precision is specified, the number of decimal places in the result
+		//  is set by NumberFormatInfo.PercentDecimalDigits. Results are
+		//  rounded to the nearest representable value when necessary.
+		//  The result is scaled by 100 (.99 becomes 99%).
+		//
+		//  The pattern of the number determines how the output looks, where
+		//  the percent sign goes, where the negative sign goes, etc.
+		//  IFormattable documentation lists the patterns and their values,
+		//  I have them commented out in the switch statement
+		//
+
+		private static string FormatPercent (byte value, int precision, NumberFormatInfo nfi) 
+		{
+			return FormatPercent ((uint)value, precision, nfi);
+		}
+
+		private static string FormatPercent (short value, int precision, NumberFormatInfo nfi) 
+		{
+			return FormatPercent ((int)value, precision, nfi);
+		}
+
+		private static string FormatPercent (int value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+			bool negative = (value < 0);
+
+			char[] groupSeparator = nfi.PercentGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.PercentDecimalSeparator.ToCharArray ();
+			char[] percentSymbol = nfi.PercentSymbol.ToCharArray ();
+			int[] groupSizes = nfi.PercentGroupSizes;
+			int pattern = negative ? nfi.PercentNegativePattern : nfi.PercentPositivePattern;
+			int symbolLength = percentSymbol.Length;
+			
+			int padding = (precision >= 0) ? precision : nfi.PercentDecimalDigits;	     
+			int size = maxIntLength + (groupSeparator.Length * maxIntLength) + padding + 2 + 
+			decimalSeparator.Length + symbolLength;	
+			char[] buffy = new char[size];
+			int position = size;
+
+			// set up the pattern from IFormattible
+			if (negative) {
+				i = symbolLength; 
+ 
+				switch (pattern) {
+				case 0: // -nnn %
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' '; 
+					break;
+				case 1: // -nnn%
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					break;
+				// case 2: // -%nnn
+				//	break;
+				}
+			} else {
+				i = symbolLength; 
+				switch (pattern) {
+				case 0: // nnn %
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' ';					
+					break;
+				case 1: // nnn%
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					break;
+				// case 2: // %nnn
+				//	break;
+				}
+			}
+			
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+
+			// put on decimal separator if we moved over and put a 0 
+			if (position < size && buffy[position] == '0') {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+
+			// all values are multiplied by 100, so tack on two 0's
+			if (value != 0) 
+				for (int c = 0; c < 2; c++) {
+					buffy[--position] = '0';
+					
+					if (--k == 0) {
+						i = groupSeparator.Length; 
+						do {
+							buffy[--position] = groupSeparator[--i];
+						} while (i > 0);
+						
+						k = (j < groupSizes.Length) ? 
+						groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+					}
+				}
+
+			// negative hack for numbers past MinValue
+			if (negative)
+				if (value <= -10) {
+					buffy[--position] = digitLowerTable[-(value % 10)];
+					value = value / -10;
+					
+					if (--k == 0) {
+						i = groupSeparator.Length; 
+						do {
+							buffy[--position] = groupSeparator[--i];
+						} while (i > 0);
+						
+						k = (j < groupSizes.Length) ? 
+						groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+					}
+				} else value = -value;
+
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			// end the pattern on the left hand side
+			if (negative) {
+				i = symbolLength; 
+ 
+				switch (pattern) {
+				case 0: // -nnn %
+					buffy[--position] = '-'; 
+					break;
+				case 1: // -nnn%
+					buffy[--position] = '-'; 
+					break;
+				case 2: // -%nnn
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					buffy[--position] = '-'; 
+					break;
+				}
+			} else {
+				i = symbolLength; 
+				switch (pattern) {
+				// case 0: // nnn %
+				//	break;
+				// case 1: // nnn%
+				//	break;
+				case 2: // %nnn
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					break;
+				}
+			}
+			
+			return new string (buffy, position, (size - position));
+		}
+
+		private static string FormatPercent (long value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+			bool negative = (value < 0);
+
+			char[] groupSeparator = nfi.PercentGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.PercentDecimalSeparator.ToCharArray ();
+			char[] percentSymbol = nfi.PercentSymbol.ToCharArray ();
+			int[] groupSizes = nfi.PercentGroupSizes;
+			int pattern = negative ? nfi.PercentNegativePattern : nfi.PercentPositivePattern;
+			int symbolLength = percentSymbol.Length;
+			
+			int padding = (precision >= 0) ? precision : nfi.PercentDecimalDigits;	     
+			int size = maxLongLength + (groupSeparator.Length * maxLongLength) + padding + 2 + 
+			decimalSeparator.Length + symbolLength;	
+			char[] buffy = new char[size];
+			int position = size;
+
+			// set up the pattern from IFormattible
+			if (negative) {
+				i = symbolLength; 
+ 
+				switch (pattern) {
+				case 0: // -nnn %
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' '; 
+					break;
+				case 1: // -nnn%
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					break;
+				// case 2: // -%nnn
+				//	break;
+				}
+			} else {
+				i = symbolLength; 
+				switch (pattern) {
+				case 0: // nnn %
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					buffy[--position] = ' ';					
+					break;
+				case 1: // nnn%
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					break;
+				// case 2: // %nnn
+				//	break;
+				}
+			}
+			
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+
+			// put on decimal separator if we moved over and put a 0 
+			if (position < size && buffy[position] == '0') {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+
+			// all values are multiplied by 100, so tack on two 0's
+			if (value != 0) 
+				for (int c = 0; c < 2; c++) {
+					buffy[--position] = '0';
+					
+					if (--k == 0) {
+						i = groupSeparator.Length; 
+						do {
+							buffy[--position] = groupSeparator[--i];
+						} while (i > 0);
+						
+						k = (j < groupSizes.Length) ? 
+						groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+					}
+				}
+
+			// negative hack for numbers past MinValue
+			if (negative)
+				if (value <= -10) {
+					buffy[--position] = digitLowerTable[-(value % 10)];
+					value = value / -10;
+					
+					if (--k == 0) {
+						i = groupSeparator.Length; 
+						do {
+							buffy[--position] = groupSeparator[--i];
+						} while (i > 0);
+						
+						k = (j < groupSizes.Length) ? 
+						groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+					}
+				} else value = -value;
+
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			// end the pattern on the left hand side
+			if (negative) {
+				i = symbolLength; 
+ 
+				switch (pattern) {
+				case 0: // -nnn %
+					buffy[--position] = '-'; 
+					break;
+				case 1: // -nnn%
+					buffy[--position] = '-'; 
+					break;
+				case 2: // -%nnn
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					buffy[--position] = '-'; 
+					break;
+				}
+			} else {
+				i = symbolLength; 
+				switch (pattern) {
+				// case 0: // nnn %
+				//	break;
+				// case 1: // nnn%
+				//	break;
+				case 2: // %nnn
+					do {
+						buffy[--position] = percentSymbol[--i];
+					} while (i > 0);
+					break;
+				}
+			}
+			
+			return new string (buffy, position, (size - position));
+		}
+
+		private static string FormatPercent (sbyte value, int precision, NumberFormatInfo nfi) 
+		{
+			return FormatPercent ((int)value, precision, nfi);
+		}
+
+		private static string FormatPercent (ushort value, int precision, NumberFormatInfo nfi) 
+		{
+			return FormatPercent ((uint)value, precision, nfi);
+		}
+
+		private static string FormatPercent (uint value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+
+			char[] groupSeparator = nfi.PercentGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.PercentDecimalSeparator.ToCharArray ();
+			char[] percentSymbol = nfi.PercentSymbol.ToCharArray ();
+			int[] groupSizes = nfi.PercentGroupSizes;
+			int pattern = nfi.PercentPositivePattern;
+			int symbolLength = percentSymbol.Length;
+			
+			int padding = (precision >= 0) ? precision : nfi.PercentDecimalDigits;	     
+			int size = maxIntLength + (groupSeparator.Length * maxIntLength) + padding + 2 + 
+			decimalSeparator.Length + symbolLength;	
+			char[] buffy = new char[size];
+			int position = size;
+
+			// set up the pattern from IFormattible
+			i = symbolLength; 			
+			switch (pattern) {
+			case 0: // -nnn %
+				do {
+					buffy[--position] = percentSymbol[--i];
+				} while (i > 0);
+				buffy[--position] = ' '; 
+				break;
+			case 1: // -nnn%
+				do {
+					buffy[--position] = percentSymbol[--i];
+				} while (i > 0);
+				break;
+			// case 2: // -%nnn
+			//	break;
+			}
+
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+
+			// put on decimal separator if we moved over and put a 0 
+			if (position < size && buffy[position] == '0') {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+
+			if (value != 0) 
+				for (int c = 0; c < 2; c++) {
+					buffy[--position] = '0';
+					
+					if (--k == 0) {
+						i = groupSeparator.Length; 
+						do {
+							buffy[--position] = groupSeparator[--i];
+						} while (i > 0);
+						
+						k = (j < groupSizes.Length) ? 
+						groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+					}
+				}
+
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			i = symbolLength; 
+			switch (pattern) {
+			// case 0: // nnn %
+			//	break;
+			// case 1: // nnn%
+			//	break;
+			case 2: // %nnn
+				do {
+					buffy[--position] = percentSymbol[--i];
+				} while (i > 0);
+				break;
+			}
+			
+			return new string (buffy, position, (size - position));
+		}
+
+		private static string FormatPercent (ulong value, int precision, NumberFormatInfo nfi) 
+		{
+			int i, j, k;
+
+			char[] groupSeparator = nfi.PercentGroupSeparator.ToCharArray ();
+			char[] decimalSeparator = nfi.PercentDecimalSeparator.ToCharArray ();
+			char[] percentSymbol = nfi.PercentSymbol.ToCharArray ();
+			int[] groupSizes = nfi.PercentGroupSizes;
+			int pattern = nfi.PercentPositivePattern;
+			int symbolLength = percentSymbol.Length;
+			
+			int padding = (precision >= 0) ? precision : nfi.PercentDecimalDigits;	     
+			int size = maxLongLength + (groupSeparator.Length * maxLongLength) + padding + 2 + 
+			decimalSeparator.Length + symbolLength;	
+			char[] buffy = new char[size];
+			int position = size;
+
+			// set up the pattern from IFormattible
+			i = symbolLength; 			
+			switch (pattern) {
+			case 0: // -nnn %
+				do {
+					buffy[--position] = percentSymbol[--i];
+				} while (i > 0);
+				buffy[--position] = ' '; 
+				break;
+			case 1: // -nnn%
+				do {
+					buffy[--position] = percentSymbol[--i];
+				} while (i > 0);
+				break;
+			// case 2: // -%nnn
+			//	break;
+			}
+
+			// right pad it w/ precision 0's
+			while (padding-- > 0)
+				buffy[--position] = '0';
+
+			// put on decimal separator if we moved over and put a 0 
+			if (position < size && buffy[position] == '0') {
+				i = decimalSeparator.Length; 
+				do {
+					buffy[--position] = decimalSeparator[--i];
+				} while (i > 0);			
+			}
+
+			// loop through, keeping track of where you are in the
+			// group sizes array and putting out the group separator
+			// when needed
+			j = 0;
+			k = groupSizes[j++];
+
+			if (value != 0) 
+				for (int c = 0; c < 2; c++) {
+					buffy[--position] = '0';
+					
+					if (--k == 0) {
+						i = groupSeparator.Length; 
+						do {
+							buffy[--position] = groupSeparator[--i];
+						} while (i > 0);
+						
+						k = (j < groupSizes.Length) ? 
+						groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+					}
+				}
+			
+			while (value >= 10) {
+				buffy[--position] = digitLowerTable[(value % 10)];
+				value /= 10;
+
+				if (--k == 0) {
+					i = groupSeparator.Length; 
+					do {
+						buffy[--position] = groupSeparator[--i];
+					} while (i > 0);
+					
+					k = (j < groupSizes.Length) ? 
+					groupSizes[j++] : groupSizes[(groupSizes.Length - 1)];
+				}
+			}		 
+
+			buffy[--position] = digitLowerTable[value];
+
+			i = symbolLength; 
+			switch (pattern) {
+			// case 0: // nnn %
+			//	break;
+			// case 1: // nnn%
+			//	break;
+			case 2: // %nnn
+				do {
+					buffy[--position] = percentSymbol[--i];
+				} while (i > 0);
+				break;
+			}
+			
+			return new string (buffy, position, (size - position));
+		}
+
+		// ============ Format Hexadecimal ============ //
+
+		// 
+		// For strings in base 16. Only valid w/ integers. Precision 
+		// specifies number of digits in the string, if it specifies
+		// more digits than we need, left pad w/ 0's. The case of the
+		// the format specifier 'X' or 'x' determines lowercase or
+		// capital digits in the output.
+		//
+		// Whew. Straight forward Hex formatting, however only
+		// go 8 places max when dealing with an int (not counting
+		// precision padding) and 16 when dealing with a long. This
+		// is to cut off the loop when dealing with negative values,
+		// which will loop forever when you hit -1;
+		//
+
+		private static string FormatHexadecimal (byte value, int precision, bool upper)
+		{		     
+			if (precision < 0) precision = 0;
+			int size = maxByteLength + precision;
+			char[] buffy = new char[size];
+			char[] table = upper ? digitUpperTable : digitLowerTable;
+			int position = size;
+			ushort mask = (1 << 4) - 1;
+
+			// loop through right to left, shifting and looking up
+			// our value. Don't worry about negative
+			do {
+				buffy[--position] = table[(value & mask)];
+				value = (byte)(value >> 4);
+			} while (value != 0);
+
+			// pad w/ 0's if they want more length, if not, ignore
+			precision -= (size - position);				
+			while (precision > 0 && position > 1) {
+				buffy[--position] = '0';
+				precision--;
+			}
+			
+			return new string(buffy, position, (size - position));
+		}
+
+		private static string FormatHexadecimal (short value, int precision, bool upper)
+		{
+			if (precision < 0) precision = 0;
+			int size = maxShortLength + precision;
+			char[] buffy = new char[size];
+			char[] table = upper ? digitUpperTable : digitLowerTable;
+			int position = size;
+			short mask = (1 << 4) - 1;
+
+			// loop through right to left, shifting and looking up
+			// our value. If value is negavite stop after 4 F's
+			do {
+				buffy[--position] = table[(value & mask)];
+				value = (short)(value >> 4);
+			} while (value != 0 && position > (size - 4));
+
+			// pad w/ 0's if they want more length, if not, ignore
+			precision -= (size - position);				
+			while (precision > 0 && position > 1) {
+				buffy[--position] = '0';
+				precision--;
+			}
+			
+			return new string(buffy, position, (size - position));
+		}
+
+		private static string FormatHexadecimal (int value, int precision, bool upper)
+		{
+			if (precision < 0) precision = 0;
+			int size = maxIntLength + precision;
+			char[] buffy = new char[size];
+			char[] table = upper ? digitUpperTable : digitLowerTable;
+			int position = size;
+			int mask = (1 << 4) - 1;
+
+			// loop through right to left, shifting and looking up
+			// our value. If value is negavite stop after 8 F's
+			do {
+				buffy[--position] = table[(value & mask)];
+				value = value >> 4;
+			} while (value != 0 && position > (size - 8));
+
+			// pad w/ 0's if they want more length, if not, ignore
+			precision -= (size - position);				
+			while (precision > 0 && position > 1) {
+				buffy[--position] = '0';
+				precision--;
+			}
+			
+			return new string(buffy, position, (size - position));
+		}
+
+		private static string FormatHexadecimal (long value, int precision, bool upper)
+		{
+			if (precision < 0) precision = 0;
+			int size = maxLongLength + precision;
+			char[] buffy = new char[size];
+			char[] table = upper ? digitUpperTable : digitLowerTable;
+			int position = size;
+			long mask = (1 << 4) - 1;
+			
+			// loop through right to left, shifting and looking up
+			// our value. If value is negavite stop after 16 F's
+			do {
+				buffy[--position] = table[(value & mask)];
+				value = value >> 4;
+			} while (value != 0 && position > (size - 16));
+
+			// pad w/ 0's if they want more length, if not, ignore
+			precision -= (size - position);				
+			while (precision > 0 && position > 1) {
+				buffy[--position] = '0';
+				precision--;
+			}
+			
+			return new string(buffy, position, (size - position));
+		}
+
+		private static string FormatHexadecimal (sbyte value, int precision, bool upper)
+		{
+			if (precision < 0) precision = 0;
+			int size = maxByteLength + precision;
+			char[] buffy = new char[size];
+			char[] table = upper ? digitUpperTable : digitLowerTable;
+			int position = size;
+			short mask = (1 << 4) - 1;
+
+			// loop through right to left, shifting and looking up
+			// our value. If value is negavite stop after 2 F's
+			do {
+				buffy[--position] = table[(value & mask)];
+				value = (sbyte)(value >> 4);
+			} while (value != 0 && position > (size - 2));
+
+			// pad w/ 0's if they want more length, if not, ignore
+			precision -= (size - position);				
+			while (precision > 0 && position > 1) {
+				buffy[--position] = '0';
+				precision--;
+			}
+			
+			return new string(buffy, position, (size - position));
+		}
+
+		private static string FormatHexadecimal (ushort value, int precision, bool upper)
+		{			
+			if (precision < 0) precision = 0;
+			int size = maxShortLength + precision;
+			char[] buffy = new char[size];
+			char[] table = upper ? digitUpperTable : digitLowerTable;
+			int position = size;
+			int mask = (1 << 4) - 1;
+
+			// loop through right to left, shifting and looking up
+			// our value. Don't worry about negative
+			do {
+				buffy[--position] = table[(value & mask)];
+				value = (ushort)(value >> 4);
+			} while (value != 0);
+
+			// pad w/ 0's if they want more length, if not, ignore
+			precision -= (size - position);				
+			while (precision > 0 && position > 1) {
+				buffy[--position] = '0';
+				precision--;
+			}
+			
+			return new string(buffy, position, (size - position));
+		}
+
+		private static string FormatHexadecimal (uint value, int precision, bool upper)
+		{			
+			if (precision < 0) precision = 0;
+			int size = maxIntLength + precision;
+			char[] buffy = new char[size];
+			char[] table = upper ? digitUpperTable : digitLowerTable;
+			int position = size;
+			uint mask = (1 << 4) - 1;
+
+			// loop through right to left, shifting and looking up
+			// our value. Don't worry about negative
+			do {
+				buffy[--position] = table[(value & mask)];
+				value = value >> 4;
+			} while (value != 0);
+
+			// pad w/ 0's if they want more length, if not, ignore
+			precision -= (size - position);				
+			while (precision > 0 && position > 1) {
+				buffy[--position] = '0';
+				precision--;
+			}
+			
+			return new string(buffy, position, (size - position));
+		}
+
+		private static string FormatHexadecimal (ulong value, int precision, bool upper)
+		{			
+			if (precision < 0) precision = 0;
+			int size = maxLongLength + precision;
+			char[] buffy = new char[size];
+			char[] table = upper ? digitUpperTable : digitLowerTable;
+			int position = size;
+			ulong mask = (1 << 4) - 1;
+			
+			// loop through right to left, shifting and looking up
+			// our value. Don't worry about negative
+			do {
+				buffy[--position] = table[value & mask];
+				value = value >> 4;
+			} while (value != 0);
+			
+			// pad w/ 0's if they want more length, if not, ignore
+			precision -= (size - position);
+			while (precision > 0 && position > 1) {
+				buffy[--position] = '0';
+				precision--;
+			}
+
+			return new string(buffy, position, (size - position));
+		}
+
+		// ============ Format Custom ============ //
+
+		private static string FormatCustom (string format, sbyte number, NumberFormatInfo nfi)
+		{
+			string strnum = FormatGeneral (number, -1, nfi, true);
+			FormatParse fp = new FormatParse (format); // FIXME: use nfi!
+			int sign = (number < 0) ? -1 : (number > 0) ? 1 : 0;
+			return fp.FormatNumber (strnum, sign);
+		}
+
+		private static string FormatCustom (string format, short number, NumberFormatInfo nfi)
+		{
+			string strnum = FormatGeneral (number, -1, nfi, true);
+			FormatParse fp = new FormatParse (format); // FIXME: use nfi!
+			int sign = (number < 0) ? -1 : (number > 0) ? 1 : 0;
+			return fp.FormatNumber (strnum, sign);
+		}
+
+		private static string FormatCustom (string format, int number, NumberFormatInfo nfi)
+		{
+			string strnum = FormatGeneral (number, -1, nfi, true);
+			FormatParse fp = new FormatParse (format); // FIXME: use nfi!
+			int sign = (number < 0) ? -1 : (number > 0) ? 1 : 0;
+			return fp.FormatNumber (strnum, sign);
+		}
+
+		private static string FormatCustom (string format, long number, NumberFormatInfo nfi)
+		{
+			string strnum = FormatGeneral (number, -1, nfi, true);
+			FormatParse fp = new FormatParse (format); // FIXME: use nfi!
+			int sign = (number < 0) ? -1 : (number > 0) ? 1 : 0;
+			return fp.FormatNumber (strnum, sign);
+		}
+
+		private static string FormatCustom (string format, byte number, NumberFormatInfo nfi)
+		{
+			string strnum = FormatGeneral (number, -1, nfi, true);
+			FormatParse fp = new FormatParse (format); // FIXME: use nfi!
+			return fp.FormatNumber (strnum, (number == 0) ? 0 : 1);
+		}
+
+		private static string FormatCustom (string format, ushort number, NumberFormatInfo nfi)
+		{
+			string strnum = FormatGeneral (number, -1, nfi, true);
+			FormatParse fp = new FormatParse (format); // FIXME: use nfi!
+			return fp.FormatNumber (strnum, (number == 0) ? 0 : 1);
+		}
+
+		private static string FormatCustom (string format, uint number, NumberFormatInfo nfi)
+		{
+			string strnum = FormatGeneral (number, -1, nfi, true);
+			FormatParse fp = new FormatParse (format); // FIXME: use nfi!
+			return fp.FormatNumber (strnum, (number == 0) ? 0 : 1);
+		}
+
+		private static string FormatCustom (string format, ulong number, NumberFormatInfo nfi)
+		{
+			string strnum = FormatGeneral (number, -1, nfi, true);
+			FormatParse fp = new FormatParse (format); // FIXME: use nfi!
+			return fp.FormatNumber (strnum, (number == 0) ? 0 : 1);
+		}
+	}
+
+class FormatSection {
+	public int nph;
+	public int nphPreDot;
+	public int npercent;
+	public int ndividers;
+	public int ntokens;
+	public string [] tokens;
+	public int [] TokenTypes;
+	public bool HaveDot;
+	public bool HaveSci;
+	public bool sciSignAlways = false;
+	public int sciDigits;
+	public int numCommas;
+}
+
+class FormatParse {
+	const int AS_IS = 0;
+	const int PH_0 = 1;
+	const int PH_NUMBER = 2;
+	const int COMMA = 3;
+	const int PERCENT = 4;
+	const int DIVIDERS = 5;
+	const int DOT = 6;
+	const int ESCAPE_SEQ = 7;
+	const int SCIENTIFIC = 8;
+	const int NEW_SECTION = 9;
+	private FormatSection [] sections = new FormatSection[3];
+	private int nsections = 0;
+	private int pos; // Position in the format string
+	private int group = 0; // Used in FormatPlain to insert a comma between groups of digits
+	private bool isNegative;
+
+	private FormatParse ()
+	{
+	}
+	
+	public FormatParse (string format)
+	{
+		parseFormat (format);
+	}
+
+	private void FormatSci (char [] digits, ArrayList outputList, FormatSection sec)
+	{
+		int tokidx = sec.ntokens - 1;
+
+		// Output everything until we get to the SCIENTIFIC
+		while (tokidx >= 0 && sec.TokenTypes [tokidx] != SCIENTIFIC){
+			outputList.Add ((string) sec.tokens [tokidx--]);
+		}
+
+		// Exponent
+		int exponent = digits.Length - sec.nph;
+		outputList.Add ((string) exponent.ToString ());
+		if (sec.sciSignAlways && exponent > 0)
+			outputList.Add ("+");
+		outputList.Add ((string) sec.tokens [tokidx--]);
+
+		if (exponent < 0) {
+			char [] newDigits;
+			exponent = -exponent;
+			newDigits = new char [digits.Length + exponent];
+			Array.Copy (digits, 0, newDigits, exponent, digits.Length);
+			for (int i = 0; i < exponent; i++)
+				newDigits[i] = '0';
+			digits = newDigits;
+		}
+
+		// Now format the rest
+		int digitIdx = 0;
+		if (sec.HaveDot)
+			FormatDot (digits, ref digitIdx, outputList, sec, tokidx, 0);
+		else
+			FormatPlain (digits, ref digitIdx, outputList, sec, tokidx, 0, sec.numCommas > 0);
+	}
+
+	private void FormatDot (char [] digits, ref int digitIdx, ArrayList outputList, 
+				FormatSection sec, int lastToken, int firstToken)
+	{
+		int tokidx = lastToken;
+		int type;
+
+		while (tokidx >= firstToken) {
+			type = sec.TokenTypes [tokidx];
+			if (type == DOT || type == PH_NUMBER || type == PH_0)
+				break;
+			tokidx--;
+		}
+
+		if (tokidx > 0) {
+			char [] postDotDigits = new char [sec.nph - sec.nphPreDot];
+			int max = (postDotDigits.Length > digits.Length) ? digits.Length : postDotDigits.Length;
+			Array.Copy (digits, 0, postDotDigits, 0, max);
+			int postDotDigitsIdx = 0;
+			FormatPlain (postDotDigits, ref postDotDigitsIdx, outputList, sec, lastToken, tokidx, false);
+			tokidx--;
+			digitIdx += max;
+			FormatPlain (digits, ref digitIdx, outputList, sec, tokidx, 0, sec.numCommas > 0);
+		}
+	}
+
+	private void FormatPlain (char [] digits, ref int digitIdx, ArrayList outputList, 
+				FormatSection sec, int lastToken, int firstToken, bool insertComma)
+	{
+		int tokidx = lastToken;
+		int type;
+
+		while (tokidx >= firstToken) {
+			type = sec.TokenTypes [tokidx];
+			if (type == PH_0 || type == PH_NUMBER) {
+				//FIXME: PH_NUMBER should also check for significant digits
+				// Console.WriteLine ("group : {0}", group);
+				int i = sec.tokens [tokidx].Length - 1;
+				while (i >= 0) {
+					if (insertComma && group == 3) {
+						outputList.Add (","); // FIXME: from NumberFormatInfo
+						group = 0;
+					}
+
+					if (digitIdx < digits.Length)
+						outputList.Add ((string) digits[digitIdx++].ToString ());
+					else
+						outputList.Add ("0");
+					i--;
+					if (insertComma)
+						group++;
+					sec.nph--;
+					while (sec.nph == 0 && digitIdx < digits.Length) {
+						// Flush the numbers left
+						if (insertComma && group == 3){
+							outputList.Add (","); // FIXME: from NumberFormatInfo
+							group = 0;
+						}
+						outputList.Add ((string) digits [digitIdx++].ToString ());
+						if (insertComma)
+							group++;
+					}
+
+					if (sec.nph == 0 && isNegative)
+						outputList.Add ("-");
+				}
+			} else {
+				outputList.Add ((string) sec.tokens [tokidx]);
+			}
+			tokidx--;
+		}
+
+	}
+
+	private char [] AdjustDigits (string number, FormatSection sec)
+	{
+		char [] digits = number.ToCharArray ();
+		char [] newDigits = digits;
+		int decPointIdx = 0;
+		int postDot = 0;
+		
+		decPointIdx -= sec.ndividers * 3;
+		decPointIdx += sec.npercent * 2;
+		if (sec.HaveDot){
+			postDot = sec.nph - sec.nphPreDot;
+			decPointIdx += postDot;
+		}
+
+		if (decPointIdx > 0) {
+			newDigits = new char [digits.Length + decPointIdx];
+			Array.Copy (digits, 0, newDigits, 0, digits.Length);
+			for (int i = 0; i < decPointIdx; i++)
+				newDigits[digits.Length + i] = '0';
+		} else if (decPointIdx < 0) {
+			decPointIdx = -decPointIdx;
+			if (decPointIdx >= digits.Length) {
+				if (sec.HaveSci){
+				} else {
+					// The numbers turns into 0 when formatting applied
+					digits = new char [1] {'0'};
+				}
+			} else {
+				int newLength = digits.Length - decPointIdx + postDot - 1;
+				newDigits = new char [newLength];
+				int max = digits.Length >= newLength ? newLength : digits.Length;
+				Array.Copy (digits, 0, newDigits, 0, max);
+				if (newLength > digits.Length)
+					for (int i = 0; i < decPointIdx; i++)
+						newDigits[digits.Length + i] = '0';
+			}
+		}
+
+		return newDigits;
+	}
+
+	public string FormatNumber (string number, int signValue)
+	{
+		char [] digits;
+
+		isNegative = signValue < 0;
+		int section = 0;
+		if (signValue < 0 && nsections > 0)
+			section = 1;
+		if (signValue == 0 && nsections > 1)
+			section = 2;
+
+		if (number [0] == '-')
+			number = number.Substring (1);
+
+		FormatSection sec = sections [section];
+		digits = AdjustDigits (number.ToString (), sec);
+		if (digits.Length == 1 && digits [0] == '0')
+			if (nsections > 2)
+				sec = sections [2]; // Format as a 0
+			else
+				sec = sections [0]; // Format as positive
+
+		ArrayList outputList = new ArrayList ();
+
+		int digitIdx = 0;
+		Array.Reverse (digits);
+
+		if (sec.HaveSci)
+			FormatSci (digits, outputList, sec);
+		else if (sec.HaveDot)
+			FormatDot (digits, ref digitIdx, outputList, sec, sec.ntokens - 1, 0);
+		else
+			FormatPlain (digits, ref digitIdx, outputList, sec, sec.ntokens - 1, 0, sec.numCommas > 0);
+
+		string result = "";
+		for (int i = outputList.Count - 1; i >= 0; i--) {
+			result += (string) outputList[i];
+		}
+
+		return result;
+	}
+
+	private void parseFormat (string format)
+	{
+		char [] fmt_chars = format.ToCharArray ();
+		int fmtlen = fmt_chars.Length;
+		int type = AS_IS;
+		int prevType = AS_IS;
+		string token;
+
+		sections[0] = new FormatSection();
+		while (pos < fmtlen) {
+
+			token = getNextToken (fmt_chars, fmtlen, out type);
+			if (type == NEW_SECTION) {
+				nsections++;
+				if (nsections > 3)
+					break;
+				sections[nsections] = new FormatSection();
+			} else {
+				prevType = AddToken (token, type, prevType);
+			}			
+		}
+	}
+
+	private int AddToken (string token, int type, int prevType)
+	{
+		FormatSection sec = sections[nsections];
+		string [] newTokens = new string [sec.ntokens + 1];
+		int [] newTokenTypes = new int [sec.ntokens + 1];
+		for (int i = 0; i < sec.ntokens; i++) {
+			newTokens[i] = sec.tokens[i];
+			newTokenTypes[i] = sec.TokenTypes[i];
+		}
+
+		switch (type) {
+		case ESCAPE_SEQ :
+			type = AS_IS;
+			break;
+		case COMMA :
+			if (!sec.HaveDot && (prevType == PH_0 || prevType == PH_NUMBER)) {
+				sec.numCommas++;
+			} else
+				type = AS_IS;
+
+			token = "";
+			break;
+		case DOT :
+			if (!sec.HaveDot && (prevType == PH_0 || prevType == PH_NUMBER ||
+			    prevType == DIVIDERS || prevType == COMMA)) {
+				sec.HaveDot = true;
+				sec.nphPreDot = sec.nph;
+			} else
+				type = AS_IS;
+
+			break;
+		case PERCENT :
+			sec.npercent++;
+			break;
+		case DIVIDERS :
+			token = "";
+			if (!sec.HaveDot)
+				sec.ndividers = token.Length;
+			else
+				type = AS_IS;
+			break;
+		case PH_0 :
+			if (!sec.HaveSci)
+				sec.nph += token.Length;
+			else
+				type = AS_IS;
+			break;
+		case PH_NUMBER :
+			if (!sec.HaveSci)
+				sec.nph += token.Length;
+			else
+				type = AS_IS;
+			break;
+		case SCIENTIFIC :
+			if (!sec.HaveSci && sec.nph > 0) {
+				sec.HaveSci = true;
+				char [] sci = token.ToCharArray ();
+				sec.sciSignAlways = sci[1] == '+' ? true : false;
+				int expLen = sci[1] == '0' ? token.Length - 1 : token.Length - 2;
+				sec.sciDigits = expLen;
+				token = sci[0].ToString ();
+			} else {
+				type = AS_IS;
+			}
+			break;
+		}
+
+		newTokens[sec.ntokens] = token;
+		newTokenTypes[sec.ntokens] = type;
+		sec.tokens = newTokens;
+		sec.TokenTypes = newTokenTypes;
+		sec.ntokens++;
+		return type;
+	}
+	
+	private string getNextToken (char [] fmt_chars, int fmtlen, out int type)
+	{
+		int curpos = pos;
+		string result = null;
+		char current;
+		
+		type = AS_IS; // Default
+		current = fmt_chars[curpos];
+		if (current == ';'){
+			type = NEW_SECTION;
+			result = "NEW_SECTION";
+			pos++;
+		}
+		else if (current == '\'' || current == '"') {
+			char Quote = current;
+			curpos++;
+			int endpos = Array.IndexOf (fmt_chars, current, curpos);
+			if (endpos == -1)
+				endpos = fmtlen;
+			result = new string (fmt_chars, curpos, endpos - curpos);
+			pos = endpos + 1;
+		} 
+		else if (current == '\\') { //MS seems not to translate escape seqs!
+			type = ESCAPE_SEQ;
+			current = fmt_chars[++pos];
+			result = current.ToString ();
+			pos++;
+		}
+		else if (current == '%') {
+			type = PERCENT;
+			result = "%";
+			pos++;
+		}
+		else if (current == '.') {
+			type = DOT;
+			result = ".";
+			pos++;
+		}
+		else if (current == ',') {
+			int begpos = curpos;
+
+			while (++curpos < fmtlen && fmt_chars[curpos] == ',');
+			if (curpos == fmtlen || fmt_chars[curpos] == '.') {
+				// ,,,,
+				result = new string (fmt_chars, begpos, curpos - begpos);
+				type = DIVIDERS;
+				pos = curpos;
+			} else {
+				result = ",";
+				type = COMMA;
+				pos++;
+			}
+		}
+		else if (current == '0' || current == '#') {
+			char placeHolder = current;
+			int begpos = curpos;
+			type = placeHolder == '0' ? PH_0 : PH_NUMBER;
+			curpos++;
+			while (curpos < fmtlen && fmt_chars [curpos] == placeHolder)
+				curpos++;
+			result = new string (fmt_chars, begpos, curpos - begpos);
+			pos = curpos;
+		}
+		else if (current == 'e' || current == 'E') {
+			if (fmtlen <= curpos + 1){
+				result = current.ToString ();
+				pos++;
+			}
+			else {
+				char next1 = fmt_chars [curpos + 1];
+
+				if (next1 != '-' && next1 != '+' && next1 != '0') {
+					result = new string (fmt_chars, curpos, 2);
+					pos += 2;
+				}
+				else {
+					int begpos = curpos;
+
+					if (next1 == '-' || next1 == '+')
+						curpos++;
+
+					curpos++;
+
+					if (curpos < fmtlen && fmt_chars [curpos] == '0'){
+						type = SCIENTIFIC;
+						while (curpos < fmtlen && fmt_chars [curpos] == '0')
+							curpos++;
+					}
+
+					result = new string (fmt_chars, begpos, curpos - begpos);
+					pos = curpos;
+				}
+			}
+		}
+		else {
+			char [] format_spec = { '0', '#', ',', '.', '%', 'E', 'e', '"', '\'', '\\' };
+			int nextFE;
+
+			while (curpos < fmtlen) {
+				current = fmt_chars[curpos];
+				nextFE = Array.IndexOf (format_spec, current);
+				if (nextFE != -1)
+					break;
+				curpos++;
+			}
+
+			result = new string (fmt_chars, pos, curpos - pos);
+			pos = curpos;
+		}
+
+		return result;
+	}
+}
+
+}
diff --git a/mcs/class/corlib/System/InvalidCastException.cs b/mcs/class/corlib/System/InvalidCastException.cs
new file mode 100644
index 00000000000..1d16ad5ce4d
--- /dev/null
+++ b/mcs/class/corlib/System/InvalidCastException.cs
@@ -0,0 +1,39 @@
+//
+// System.InvalidCastException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class InvalidCastException : SystemException {
+		// Constructors
+		public InvalidCastException ()
+			: base (Locale.GetText ("Cannot cast from source type to destination type"))
+		{
+		}
+
+		public InvalidCastException (string message)
+			: base (message)
+		{
+		}
+
+		public InvalidCastException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected InvalidCastException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/InvalidOperationException.cs b/mcs/class/corlib/System/InvalidOperationException.cs
new file mode 100644
index 00000000000..fddef520eb6
--- /dev/null
+++ b/mcs/class/corlib/System/InvalidOperationException.cs
@@ -0,0 +1,38 @@
+//
+// System.InvalidOperationException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+	[Serializable]
+	public class InvalidOperationException : SystemException {
+		// Constructors
+		public InvalidOperationException ()
+			: base (Locale.GetText ("The requested operation cannot be performed"))
+		{
+		}
+
+		public InvalidOperationException (string message)
+			: base (message)
+		{
+		}
+
+		public InvalidOperationException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected InvalidOperationException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/InvalidProgramException.cs b/mcs/class/corlib/System/InvalidProgramException.cs
new file mode 100644
index 00000000000..da235f0bf8e
--- /dev/null
+++ b/mcs/class/corlib/System/InvalidProgramException.cs
@@ -0,0 +1,31 @@
+//
+// System.InvalidProgramException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+namespace System {
+
+	[Serializable]
+	public sealed class InvalidProgramException : SystemException {
+		// Constructors
+		public InvalidProgramException ()
+			: base (Locale.GetText ("Metadata is incorrect"))
+		{
+		}
+
+		public InvalidProgramException (string message)
+			: base (message)
+		{
+		}
+
+		public InvalidProgramException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/LoaderOptimization.cs b/mcs/class/corlib/System/LoaderOptimization.cs
new file mode 100644
index 00000000000..23b865a32e5
--- /dev/null
+++ b/mcs/class/corlib/System/LoaderOptimization.cs
@@ -0,0 +1,18 @@
+//
+// System.LoaderOptimization.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System
+{
+	public enum LoaderOptimization
+	{
+		NotSpecified = 0,
+		SingleDomain = 1,
+		MultiDomain = 2,
+		MultiDomainHost = 3
+	}
+}
diff --git a/mcs/class/corlib/System/LoaderOptimizationAttribute.cs b/mcs/class/corlib/System/LoaderOptimizationAttribute.cs
new file mode 100644
index 00000000000..5a531965306
--- /dev/null
+++ b/mcs/class/corlib/System/LoaderOptimizationAttribute.cs
@@ -0,0 +1,34 @@
+//
+// System.LoaderOptimizationAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System
+{
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class LoaderOptimizationAttribute : Attribute
+	{
+		private LoaderOptimization lo;
+		
+                // Constructors
+		public LoaderOptimizationAttribute (byte value) 
+		{
+			lo = (LoaderOptimization) value;
+		}
+
+		public LoaderOptimizationAttribute (LoaderOptimization value)
+		{
+			lo = value;
+		}
+
+		// Properties
+		public LoaderOptimization Value
+		{
+				get { return lo; }
+		}
+		   
+	}
+}
diff --git a/mcs/class/corlib/System/LocalDataStoreSlot.cs b/mcs/class/corlib/System/LocalDataStoreSlot.cs
new file mode 100755
index 00000000000..721d3ca880e
--- /dev/null
+++ b/mcs/class/corlib/System/LocalDataStoreSlot.cs
@@ -0,0 +1,18 @@
+//
+// System.LocalDataStoreSlot.cs
+//
+// Author:
+//   Dick Porter (dick@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+namespace System 
+{
+	public sealed class LocalDataStoreSlot
+	{
+	}
+}
diff --git a/mcs/class/corlib/System/MTAThreadAttribute.cs b/mcs/class/corlib/System/MTAThreadAttribute.cs
new file mode 100644
index 00000000000..514bca495a4
--- /dev/null
+++ b/mcs/class/corlib/System/MTAThreadAttribute.cs
@@ -0,0 +1,19 @@
+//
+// System.MTAThreadAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System
+{
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class MTAThreadAttribute : Attribute
+	{
+		// Constructors
+		public MTAThreadAttribute () : base ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/MarshalByRefObject.cs b/mcs/class/corlib/System/MarshalByRefObject.cs
new file mode 100644
index 00000000000..53051ceba32
--- /dev/null
+++ b/mcs/class/corlib/System/MarshalByRefObject.cs
@@ -0,0 +1,36 @@
+//
+// System.MarshalByRefObject.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Remoting;
+
+namespace System {
+
+	[Serializable]
+	public abstract class MarshalByRefObject {
+
+		public virtual ObjRef CreateObjRef (Type type)
+		{
+			return null;
+		}
+
+		public object GetLifetimeService ()
+		{
+			return null;
+		}
+
+		public virtual object InitializeLifetimeService ()
+		{
+			return null;
+		}
+
+		protected MarshalByRefObject ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/Math.cs b/mcs/class/corlib/System/Math.cs
new file mode 100644
index 00000000000..6a447226db3
--- /dev/null
+++ b/mcs/class/corlib/System/Math.cs
@@ -0,0 +1,375 @@
+//
+// System.Math.cs
+//
+// Author:
+//   Bob Smith (bob@thestuff.net)
+//   Dan Lewis (dihlewis@yahoo.co.uk)
+//
+// (C) 2001 Bob Smith.  http://www.thestuff.net
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System
+{
+//	[CLSCompliant(false)]
+        public sealed class Math
+        {
+                public const double E = 2.7182818284590452354;
+                public const double PI = 3.14159265358979323846;
+
+		private Math () {}
+
+                public static decimal Abs(decimal value)
+                {
+                        return (value < 0)? -value: value;
+                }
+                public static double Abs(double value)
+                {
+                        return (value < 0)? -value: value;
+                }
+                public static float Abs(float value)
+                {
+                        return (value < 0)? -value: value;
+                }
+                public static int Abs(int value)
+                {
+                        if (value == Int32.MinValue)
+                                throw new OverflowException (Locale.GetText (Locale.GetText ("Value is too small")));
+                        return (value < 0)? -value: value;
+                }
+                public static long Abs(long value)
+                {
+                        if (value == Int64.MinValue)
+                                throw new OverflowException(Locale.GetText ("Value is too small"));
+                        return (value < 0)? -value: value;
+                }
+		[CLSCompliant (false)]
+                public static sbyte Abs(sbyte value)
+                {
+                        if (value == SByte.MinValue)
+                                throw new OverflowException(Locale.GetText ("Value is too small"));
+                        return (sbyte)((value < 0)? -value: value);
+                }
+                public static short Abs(short value)
+                {
+                        if (value == Int16.MinValue)
+                                throw new OverflowException(Locale.GetText ("Value is too small"));
+                        return (short)((value < 0)? -value: value);
+                }
+
+                public static double Ceiling(double a)
+                {
+			if (Double.IsNaN(a)){
+				return Double.NaN;
+			}
+
+			if (Double.IsNegativeInfinity(a)){
+				return Double.NegativeInfinity;
+			}
+
+			if (Double.IsPositiveInfinity(a)){
+				return Double.PositiveInfinity;
+			}
+
+			double b = (double)((long)a);
+                        return (b < a)? b+1: b;
+                }
+                public static double Floor(double d) {
+			if (Double.IsNaN(d)){
+				return Double.NaN;
+			}
+
+			if (Double.IsNegativeInfinity(d)){
+				return Double.NegativeInfinity;
+			}
+
+			if (Double.IsPositiveInfinity(d)){
+				return Double.PositiveInfinity;
+			}
+
+			double b = (double)((long)d);
+			return (d < 0 && d != b) ? --b : b;
+                }
+                public static double IEEERemainder(double x, double y)
+                {
+                        double r;
+                        if (y == 0) return Double.NaN;
+                        r = x - (y * Math.Round(x/y));
+                        if (r != 0) return r;
+                        return (x > 0)? 0: -0;
+                }
+                public static double Log(double a, double newBase)
+                {
+                        if (a == 0) return Double.NegativeInfinity;
+                        else if (a < 0) return Double.NaN;
+                        return Log(a)/Log(newBase);
+                }
+
+                public static byte Max(byte val1, byte val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+                public static decimal Max(decimal val1, decimal val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+                public static double Max(double val1, double val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+                public static float Max(float val1, float val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+                public static int Max(int val1, int val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+                public static long Max(long val1, long val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+
+		[CLSCompliant (false)]
+                public static sbyte Max(sbyte val1, sbyte val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+                public static short Max(short val1, short val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+
+		[CLSCompliant (false)]
+                public static uint Max(uint val1, uint val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+
+		[CLSCompliant (false)]
+                public static ulong Max(ulong val1, ulong val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+
+		[CLSCompliant (false)]
+                public static ushort Max(ushort val1, ushort val2)
+                {
+                        return (val1 > val2)? val1: val2;
+                }
+                public static byte Min(byte val1, byte val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+                public static decimal Min(decimal val1, decimal val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+                public static double Min(double val1, double val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+                public static float Min(float val1, float val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+                public static int Min(int val1, int val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+                public static long Min(long val1, long val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+
+		[CLSCompliant (false)]
+                public static sbyte Min(sbyte val1, sbyte val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+                public static short Min(short val1, short val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+
+		[CLSCompliant (false)]
+                public static uint Min(uint val1, uint val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+
+		[CLSCompliant (false)]
+                public static ulong Min(ulong val1, ulong val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+
+		[CLSCompliant (false)]
+                public static ushort Min(ushort val1, ushort val2)
+                {
+                        return (val1 < val2)? val1: val2;
+                }
+
+                public static decimal Round(decimal d)
+                {
+                        decimal r = (decimal)((long)d);
+                        decimal a = Abs (d - r);
+                        if (a > .5M) return (r >= 0 ? ++r : --r);
+                        else if (a <.5M) return r;
+                        else
+                        {
+                                if (r%2 == 0) return r;
+                                else return ++r;
+                        }
+                }
+                public static decimal Round(decimal d, int decimals)
+                {
+                        long p = 1;
+                        int c;
+                        decimal retval = d;
+                        if (decimals < 0 || decimals > 15)
+                                throw new ArgumentOutOfRangeException(Locale.GetText (
+					"Value is too small or too big."));
+                        else if (decimals == 0)
+                                return Math.Round(d);
+                        for (c=0; c<decimals; c++) p*=10;
+                        retval*=p;
+                        retval=Math.Round(retval);
+                        retval/=p;
+                        return retval;
+                }
+                public static double Round(double d)
+                {
+                        double r = (double)((long)d);
+                        double a = Abs (d - r);
+                        if (a > .5) return (r >= 0 ? ++r : --r);
+                        else if (a <.5) return r;
+                        else
+                        {
+                                if (r%2 == 0) return r;
+                                else return ++r;
+                        }
+                }
+                public static double Round(double value, int digits) {
+                        long p = 1;
+                        int c;
+                        double retval = value;
+                        if (digits < 0 || digits > 15)
+                                throw new ArgumentOutOfRangeException(Locale.GetText (
+					"Value is too small or too big."));
+                        else if (digits == 0)
+                                return Math.Round(value);
+                        for (c=0; c<digits; c++) p*=10;
+                        retval*=p;
+                        retval=Math.Round(retval);
+                        retval/=p;
+                        return retval;
+                }
+                public static int Sign(decimal value)
+                {
+                        if (value > 0) return 1;
+                        return (value == 0)? 0: -1;
+                }
+                public static int Sign(double value)
+                {
+                        if (value > 0) return 1;
+                        return (value == 0)? 0: -1;
+                }
+                public static int Sign(float value)
+                {
+                        if (value > 0) return 1;
+                        return (value == 0)? 0: -1;
+                }
+                public static int Sign(int value)
+                {
+                        if (value > 0) return 1;
+                        return (value == 0)? 0: -1;
+                }
+                public static int Sign(long value)
+                {
+                        if (value > 0) return 1;
+                        return (value == 0)? 0: -1;
+                }
+
+		[CLSCompliant (false)]
+                public static int Sign(sbyte value)
+                {
+                        if (value > 0) return 1;
+                        return (value == 0)? 0: -1;
+                }
+                public static int Sign(short value)
+                {
+                        if (value > 0) return 1;
+                        return (value == 0)? 0: -1;
+                }
+
+		// internal calls 
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Sin (double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Cos (double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Tan (double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Sinh (double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Cosh (double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Tanh (double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Acos (double x);
+		
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Asin (double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Atan (double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Atan2 (double y, double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Exp (double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Log (double x);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Log10 (double x);
+
+		public static double Pow (double x, double y) {
+			if (Double.IsNaN (x) || Double.IsNaN (y))
+				return Double.NaN;
+			if (Double.IsNegativeInfinity (x))
+				if (((int)y & 1) == 1)
+					return Double.NegativeInfinity;
+				else
+					return Double.PositiveInfinity;
+			if (Double.IsPositiveInfinity (x))
+				if (Double.IsNegativeInfinity (y))
+					return 0;
+				else
+					return Double.PositiveInfinity;
+			if (Double.IsNegativeInfinity (y) || Double.IsPositiveInfinity (y))
+				return Double.NaN;
+			
+			return PowImpl (x, y);
+		}
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                private extern static double PowImpl (double x, double y);
+
+		[MethodImplAttribute (MethodImplOptions.InternalCall)]
+                public extern static double Sqrt (double x);
+        }
+}
diff --git a/mcs/class/corlib/System/MemberAccessException.cs b/mcs/class/corlib/System/MemberAccessException.cs
new file mode 100644
index 00000000000..97a556fb7e4
--- /dev/null
+++ b/mcs/class/corlib/System/MemberAccessException.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class MemberAccessException : SystemException {
+		
+		public MemberAccessException ()
+			: base (Locale.GetText ("A member access exception has occurred."))
+		{
+		}
+
+		public MemberAccessException (string message)
+			: base (message)
+		{
+		}
+
+		protected MemberAccessException (SerializationInfo info, StreamingContext context)
+			: base (info, context) {
+		}
+		
+		public MemberAccessException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/MethodAccessException.cs b/mcs/class/corlib/System/MethodAccessException.cs
new file mode 100644
index 00000000000..16295606174
--- /dev/null
+++ b/mcs/class/corlib/System/MethodAccessException.cs
@@ -0,0 +1,42 @@
+//	
+// System.MethodAccessException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class MethodAccessException : MemberAccessException
+	{
+		// Constructors
+		public MethodAccessException ()
+			: base (Locale.GetText ("Attempt to access a private/protected method failed."))
+			{
+			}
+		
+		public MethodAccessException (string message)
+			: base (message)
+			{
+			}
+		
+		protected MethodAccessException (SerializationInfo info,
+					      StreamingContext context)
+			: base (info, context)
+			{
+			}
+		
+		public MethodAccessException (string message, Exception innerException)
+			:base (message, innerException)
+			{
+			}
+		
+	}
+}
diff --git a/mcs/class/corlib/System/MissingFieldException.cs b/mcs/class/corlib/System/MissingFieldException.cs
new file mode 100644
index 00000000000..2a5196ea1c2
--- /dev/null
+++ b/mcs/class/corlib/System/MissingFieldException.cs
@@ -0,0 +1,56 @@
+//	
+// System.MissingFieldException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class MissingFieldException : MissingMemberException
+	{
+		// Constructors
+		public MissingFieldException ()
+			: base (Locale.GetText ("Field does not exist."))
+		{
+		}
+		
+		public MissingFieldException (string message)
+			: base (message)
+		{
+		}
+		
+		protected MissingFieldException (SerializationInfo info,
+						 StreamingContext context)
+			: base (info, context)
+		{
+		}
+		
+		public MissingFieldException (string message, Exception innerException)
+			: base (message, innerException)
+		{
+		}
+		
+		public MissingFieldException (string className, string fieldName)
+			: base (className, fieldName)
+		{
+		}
+
+		public override string Message
+		{
+			get {
+				if (ClassName == null)
+					return base.Message;
+
+				return "Field " + ClassName + "." + MemberName + " not found.";
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/MissingMemberException.cs b/mcs/class/corlib/System/MissingMemberException.cs
new file mode 100644
index 00000000000..a1e2414b917
--- /dev/null
+++ b/mcs/class/corlib/System/MissingMemberException.cs
@@ -0,0 +1,70 @@
+//
+// System.MissingMemberException.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class MissingMemberException : MemberAccessException {
+
+		// Fields
+		protected string ClassName;
+		protected string MemberName;
+		protected byte[] Signature;
+
+		public MissingMemberException ()
+			: base (Locale.GetText ("A missing member exception has occurred."))
+		{
+		}
+
+		public MissingMemberException (string message)
+			: base (message)
+		{
+		}
+
+		public MissingMemberException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected MissingMemberException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+			ClassName = info.GetString ("MMClassName");
+			MemberName = info.GetString ("MMMemberName");
+			Signature = (byte[]) info.GetValue ("MMSignature", Signature.GetType ());
+		}
+		
+		public MissingMemberException (string className, string memberName)
+		{
+			ClassName = className;
+			MemberName = memberName;
+		}
+
+		// Methods
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("MMClassName", ClassName);
+			info.AddValue ("MMMemberName", MemberName);
+			info.AddValue ("MMSignature", Signature);
+		}
+
+		public override string Message {
+			get {
+				if (ClassName == null)
+					return base.Message;
+				else
+					return "Member " + ClassName + "." + MemberName + " not found.";
+			}
+		}
+
+	}
+}
diff --git a/mcs/class/corlib/System/MissingMethodException.cs b/mcs/class/corlib/System/MissingMethodException.cs
new file mode 100644
index 00000000000..54e267f42e9
--- /dev/null
+++ b/mcs/class/corlib/System/MissingMethodException.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Runtime.Serialization;
+using System.Globalization;
+
+
+namespace System
+{
+     [Serializable]
+     public class MissingMethodException : MissingMemberException
+	{
+		
+		public MissingMethodException ()
+			: base (Locale.GetText ("A missing method exception has occurred."))
+		{
+		}
+
+		public MissingMethodException (string message)
+			: base (message)
+		{
+		}
+
+		protected MissingMethodException (SerializationInfo info, StreamingContext context)
+			: base (info, context) {
+		}
+		
+		public MissingMethodException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		public MissingMethodException (string className, string methodName)
+			: base (className, methodName)
+		{
+		}
+
+		public override string Message {
+			get {
+				if (ClassName == null)
+					return base.Message;
+				else
+					return "Method " + ClassName + "." + MemberName + " not found.";
+			}
+		}
+	}
+}
+
+
diff --git a/mcs/class/corlib/System/MonoCustomAttrs.cs b/mcs/class/corlib/System/MonoCustomAttrs.cs
new file mode 100755
index 00000000000..1954e2a293d
--- /dev/null
+++ b/mcs/class/corlib/System/MonoCustomAttrs.cs
@@ -0,0 +1,80 @@
+// System.MonoCustomAttrs.cs
+// Hooks into the runtime to get custom attributes for reflection handles
+//
+// Paolo Molaro (lupus@ximian.com)
+//
+// (c) 2002 Ximian, Inc.
+
+using System;
+using System.Reflection;
+using System.Collections;
+using System.Runtime.CompilerServices;
+
+namespace System {
+	internal class MonoCustomAttrs {
+
+		static Hashtable handle_to_attrs = new Hashtable ();
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal static extern object[] GetCustomAttributes (ICustomAttributeProvider obj);
+
+		private static object[] from_cache (ICustomAttributeProvider obj) {
+			object[] res = (object[])handle_to_attrs [obj];
+			if (res != null)
+				return res;
+			res = GetCustomAttributes (obj);
+			handle_to_attrs.Add (obj, res);
+			return res;
+		}
+
+		internal static object[] GetCustomAttributes (ICustomAttributeProvider obj, Type attributeType, bool inherit) {
+			object[] res = from_cache (obj);
+			// shortcut
+			if (res.Length == 1 && res[0].GetType () == attributeType)
+				return (object[])res.Clone ();
+			ArrayList a = new ArrayList ();
+			Type btype = obj as Type;
+			do {
+				foreach (object attr in res) {
+					if (attributeType.Equals (attr.GetType ()))
+						a.Add (attr);
+				}
+				if (btype != null && ((btype = btype.BaseType) != null)) {
+					res = from_cache (btype);
+				} else {
+					break;
+				}
+			} while (inherit && btype != null && ((btype = btype.BaseType) != null));
+			Attribute[] r = new Attribute [a.Count];
+			a.CopyTo (r);
+			return r;
+		}
+
+		internal static object[] GetCustomAttributes (ICustomAttributeProvider obj, bool inherit) {
+			Type btype = obj as Type;
+			if (!inherit || btype == null) {
+				return (Object[])from_cache (obj).Clone ();
+			} else {
+				ArrayList a = new ArrayList ();
+				a.AddRange (from_cache (obj));
+				while ((btype = btype.BaseType) != null) {
+					a.AddRange (from_cache (btype));
+				}
+				Attribute[] r = new Attribute [a.Count];
+				a.CopyTo (r);
+				return (object[])r;
+			}
+		}
+		internal static bool IsDefined (ICustomAttributeProvider obj, Type attributeType, bool inherit) {
+			object[] res = from_cache (obj);
+			foreach (object attr in res) {
+				if (attributeType.Equals (attr.GetType ()))
+					return true;
+			}
+			Type btype = obj as Type;
+			if (inherit && (btype != null) && ((btype = btype.BaseType) != null))
+				return IsDefined (btype, attributeType, inherit);
+			return false;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/MonoDummy.cs b/mcs/class/corlib/System/MonoDummy.cs
new file mode 100644
index 00000000000..6d79023ee44
--- /dev/null
+++ b/mcs/class/corlib/System/MonoDummy.cs
@@ -0,0 +1,20 @@
+//
+// System.MonoDummy.cs
+//
+// Author:
+//   Dietmar Maurer (dietmar@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	public class MonoDummy {
+
+		public MonoDummy ()
+		{
+			throw new ExecutionEngineException ();
+		}
+		
+	}
+}
diff --git a/mcs/class/corlib/System/MonoType.cs b/mcs/class/corlib/System/MonoType.cs
new file mode 100644
index 00000000000..5b6199b1401
--- /dev/null
+++ b/mcs/class/corlib/System/MonoType.cs
@@ -0,0 +1,364 @@
+//
+// System.MonoType
+//
+// Sean MacIsaac (macisaac@ximian.com)
+// Paolo Molaro (lupus@ximian.com)
+// Patrik Torstensson (patrik.torstensson@labs2.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System.Reflection;
+using System.Runtime.CompilerServices;
+using System.Globalization;
+
+namespace System
+{
+	internal struct MonoTypeInfo {
+		public string name;
+		public string name_space;
+		public Type parent;
+		public Type etype;
+		public Type nested_in;
+		public Assembly assembly;
+		public TypeAttributes attrs;
+		public int rank;
+		public bool isbyref;
+		public bool ispointer;
+		public bool isprimitive;
+	}
+
+	internal class MonoType : Type
+	{
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern void type_from_obj (MonoType type, Object obj);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern void get_type_info (RuntimeTypeHandle type, out MonoTypeInfo info);
+
+		[MonoTODO]
+		internal MonoType (Object obj)
+		{
+			// this should not be used - lupus
+			type_from_obj (this, obj);
+			
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern TypeAttributes get_attributes (Type type);
+	
+		protected override TypeAttributes GetAttributeFlagsImpl ()
+		{
+			return get_attributes (this);
+		}
+
+		[MonoTODO]
+		protected override ConstructorInfo GetConstructorImpl (BindingFlags bindingAttr,
+								       Binder binder,
+								       CallingConventions callConvention,
+								       Type[] types,
+								       ParameterModifier[] modifiers)
+		{
+			// FIXME
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override ConstructorInfo[] GetConstructors (BindingFlags bindingAttr);
+
+		[MonoTODO]
+		public override EventInfo GetEvent (string name, BindingFlags bindingAttr)
+		{
+			// FIXME
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override EventInfo[] GetEvents (BindingFlags bindingAttr);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override FieldInfo GetField (string name, BindingFlags bindingAttr);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override FieldInfo[] GetFields (BindingFlags bindingAttr);
+
+		public override Type GetInterface (string name, bool ignoreCase)
+		{
+			if (name == null)
+				throw new ArgumentNullException ();
+
+			Type[] interfaces = GetInterfaces();
+
+			foreach (Type type in interfaces)
+				if (String.Compare (type.Name, name, ignoreCase) == 0)
+					return type;
+
+			return null;
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		[MonoTODO]
+		public extern override Type[] GetInterfaces();
+		
+		public override MemberInfo[] GetMembers( BindingFlags bindingAttr)
+		{
+			// FIXME
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override MethodInfo[] GetMethods (BindingFlags bindingAttr);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern MethodInfo get_method (Type type, string name, Type[] types);
+
+
+		[MonoTODO]
+		protected override MethodInfo GetMethodImpl (string name, BindingFlags bindingAttr,
+							     Binder binder,
+							     CallingConventions callConvention,
+							     Type[] types, ParameterModifier[] modifiers)
+		{
+			return get_method (this, name, types);
+		}
+		
+		public override Type GetNestedType( string name, BindingFlags bindingAttr)
+		{
+			// FIXME
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override Type[] GetNestedTypes (BindingFlags bindingAttr);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override PropertyInfo[] GetProperties( BindingFlags bindingAttr);
+
+		[MonoTODO]
+		protected override PropertyInfo GetPropertyImpl (string name, BindingFlags bindingAttr,
+								 Binder binder, Type returnType,
+								 Type[] types,
+								 ParameterModifier[] modifiers)
+		{
+			// fixme: needs to use the binder, and send the modifiers to that binder
+			if (null == name || types == null)
+				throw new ArgumentNullException ();
+			
+			PropertyInfo ret = null;
+			PropertyInfo [] props = GetProperties(bindingAttr);
+
+			foreach (PropertyInfo info in props) {
+					if (info.Name != name) 
+						continue;
+
+					if (returnType != null)
+						if (info.GetGetMethod().ReturnType != returnType)
+							continue;
+
+					if (types.Length > 0) {
+						ParameterInfo[] parameterInfo = info.GetIndexParameters ();
+
+						if (parameterInfo.Length != types.Length)
+							continue;
+
+						int i;
+						bool match = true;
+
+						for (i = 0; i < types.Length; i ++)
+							if (parameterInfo [i].ParameterType != types [i]) {
+								match = false;
+								break;
+							}
+
+						if (!match)
+							continue;
+					}
+
+					if (null != ret)
+						throw new AmbiguousMatchException();
+
+					ret = info;
+			}
+
+			return ret;
+		}
+
+		protected override bool HasElementTypeImpl ()
+		{
+			return IsArrayImpl() || IsByRefImpl() || IsPointerImpl ();
+		}
+
+		protected override bool IsArrayImpl ()
+		{
+			return type_is_subtype_of (this, typeof (System.Array), false) && this != typeof (System.Array);
+		}
+
+		protected override bool IsByRefImpl ()
+		{
+			MonoTypeInfo info;
+
+			get_type_info (_impl, out info);
+			return info.isbyref;
+		}
+
+		protected override bool IsCOMObjectImpl ()
+		{
+			return false;
+		}
+
+		protected override bool IsPointerImpl ()
+		{
+			MonoTypeInfo info;
+
+			get_type_info (_impl, out info);
+			return info.ispointer;
+		}
+
+		protected override bool IsPrimitiveImpl ()
+		{
+			MonoTypeInfo info;
+
+			get_type_info (_impl, out info);
+			return info.isprimitive;
+		}
+
+		protected override bool IsValueTypeImpl ()
+		{
+			return type_is_subtype_of (this, typeof (System.ValueType), false) &&
+				this != typeof (System.ValueType) &&
+				this != typeof (System.Enum);
+		}
+		
+		public override object InvokeMember (string name, BindingFlags invokeAttr,
+						     Binder binder, object target, object[] args,
+						     ParameterModifier[] modifiers,
+						     CultureInfo culture, string[] namedParameters)
+		{
+			// FIXME
+			throw new NotImplementedException ();
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override Type GetElementType ();
+
+		public override Type UnderlyingSystemType {
+			get {
+				MonoTypeInfo info;
+				get_type_info (_impl, out info);
+				return info.etype;
+			}
+		}
+
+		public override Assembly Assembly {
+			get {
+				MonoTypeInfo info;
+				get_type_info (_impl, out info);
+				return info.assembly;
+			}
+		}
+
+		public override string AssemblyQualifiedName {
+			get {
+				return getFullName () + ", " + Assembly.ToString ();
+			}
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern string getFullName();
+
+		public override Type BaseType {
+			get {
+				MonoTypeInfo info;
+				get_type_info (_impl, out info);
+				return info.parent;
+			}
+		}
+
+		public override string FullName {
+			get {
+				return getFullName ();
+			}
+		}
+
+		public override Guid GUID {
+			get {
+				return Guid.Empty;
+			}
+		}
+
+		public override bool IsDefined (Type attributeType, bool inherit)
+		{
+			return MonoCustomAttrs.IsDefined (this, attributeType, inherit);
+		}
+
+		public override object[] GetCustomAttributes (bool inherit)
+		{
+			return MonoCustomAttrs.GetCustomAttributes (this, inherit);
+		}
+
+		public override object[] GetCustomAttributes (Type attributeType, bool inherit)
+		{
+			return MonoCustomAttrs.GetCustomAttributes (this, attributeType, inherit);
+		}
+
+		public override MemberTypes MemberType {
+			get {
+				return MemberTypes.TypeInfo;
+			}
+		}
+
+		public override string Name {
+			get {
+				MonoTypeInfo info;
+				get_type_info (_impl, out info);
+				return info.name;
+			}
+		}
+
+		public override string Namespace {
+			get {
+				MonoTypeInfo info;
+				get_type_info (_impl, out info);
+				return info.name_space;
+			}
+		}
+
+		public override Module Module {
+			get {
+				return null;
+			}
+		}
+
+		public override Type DeclaringType {
+			get {
+				MonoTypeInfo info;
+				get_type_info (_impl, out info);
+				return info.nested_in;
+			}
+		}
+
+		public override Type ReflectedType {
+			get {
+				MonoTypeInfo info;
+				get_type_info (_impl, out info);
+				return info.nested_in;
+			}
+		}
+
+		public override RuntimeTypeHandle TypeHandle {
+			get {
+				return _impl;
+			}
+		}
+
+		public override int GetArrayRank ()
+		{
+			MonoTypeInfo info;
+			
+			get_type_info (_impl, out info);
+			return info.rank;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/MulticastDelegate.cs b/mcs/class/corlib/System/MulticastDelegate.cs
new file mode 100644
index 00000000000..b7ececfd737
--- /dev/null
+++ b/mcs/class/corlib/System/MulticastDelegate.cs
@@ -0,0 +1,242 @@
+//
+// System.MultiCastDelegate.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Daniel Stodden (stodden@in.tum.de)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+// TODO: Remove Missing
+//
+
+using System.Globalization;
+
+namespace System {
+
+	public abstract class MulticastDelegate : Delegate
+	{
+		private MulticastDelegate prev;
+		private MulticastDelegate kpm_next;
+
+		protected MulticastDelegate (object target, string method)
+			: base (target, method)
+		{
+			prev = null;
+		}
+
+		protected MulticastDelegate (Type target_type, string method)
+			: base (target_type, method)
+		{
+			prev = null;
+		}
+
+#if NOTYET
+		private MulticastDelegate (Type target_type, string method, Delegate [] list)
+			: base (target_type, method)
+		{
+			invocation_list = (Delegate[])list.Clone ();
+		}
+#endif
+		
+#if NOTYET
+		public MethodInfo Method {
+			get {
+				return null;
+			}
+		}
+#endif
+
+		public override object DynamicInvokeImpl( object[] args )
+		{
+			if ( prev != null )
+				prev.DynamicInvokeImpl( args );
+
+			return base.DynamicInvokeImpl( args );
+		}
+
+		// <remarks>
+		//   Equals: two multicast delegates are equal if their base is equal
+		//   and their invocations list is equal.
+		// </remarks>
+		public override bool Equals (object o)
+		{
+			if ( ! base.Equals( o ) )
+				return false;
+
+			MulticastDelegate d = (MulticastDelegate) o;
+
+			if ( this.prev == null ) {
+				if ( d.prev == null )
+					return true;
+				else
+					return false;
+			}
+
+			return this.prev.Equals( d.prev );
+		}
+		
+		//
+		// FIXME: This could use some improvements.
+		//
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+		
+		// <summary>
+		//   Return, in order of invocation, the invocation list
+		//   of a MulticastDelegate
+		// </summary>
+		public override Delegate[] GetInvocationList()
+		{
+			throw new NotImplementedException();
+		}
+
+		// <summary>
+		//   Combines this MulticastDelegate with the (Multicast)Delegate `follow'.
+		//   This does _not_ combine with Delegates. ECMA states the whole delegate
+		//   thing should have better been a simple System.Delegate class.
+		//   Compiler generated delegates are always MulticastDelegates.
+		// </summary>
+		protected override Delegate CombineImpl( Delegate follow )
+		{
+			MulticastDelegate combined, orig, clone;
+			
+			if ( this.GetType() != follow.GetType() )
+				throw new ArgumentException( Locale.GetText("Incompatible Delegate Types") );
+
+			combined = (MulticastDelegate)follow.Clone();
+
+			for ( clone = combined, orig = ((MulticastDelegate)follow).prev;
+			      orig != null; orig = orig.prev ) {
+				
+				clone.prev = (MulticastDelegate)orig.Clone();
+				clone = clone.prev;
+			}
+
+			clone.prev = (MulticastDelegate)this.Clone();
+
+			for ( clone = clone.prev, orig = this.prev;
+			      orig != null; orig = orig.prev ) {
+
+				clone.prev = (MulticastDelegate)orig.Clone();
+				clone = clone.prev;
+			}
+
+			return combined;
+		}
+		
+		private bool BaseEquals( MulticastDelegate value )
+		{
+			return base.Equals( value );
+		}
+
+		/* 
+		 * Perform a slightly crippled version of
+		 * Knuth-Pratt-Morris over MulticastDelegate chains.
+		 * Border values are set as pointers in kpm_next;
+		 * Generally, KPM border arrays are length n+1 for
+		 * strings of n. This one works with length n at the
+		 * expense of a few additional comparisions.
+		 */
+		private static MulticastDelegate KPM( MulticastDelegate needle,
+						      MulticastDelegate haystack,
+						      out MulticastDelegate tail )
+		{ 
+			MulticastDelegate nx, hx;
+			
+			// preprocess
+			hx = needle;
+			nx = needle.kpm_next = null;
+			do {
+				while ( nx != null && !nx.BaseEquals(hx) )
+					nx = nx.kpm_next;
+
+				hx = hx.prev;
+				if (hx == null)
+					break;
+					
+				nx = nx == null ? needle : nx.prev;
+				if ( hx.BaseEquals(nx) )
+					hx.kpm_next = nx.kpm_next;
+				else
+					hx.kpm_next = nx;
+
+			} while (true);
+
+			// match
+			MulticastDelegate match = haystack;
+			nx = needle;
+			hx = haystack;
+			do {
+				while ( nx != null && !nx.BaseEquals(hx) ) {
+					nx = nx.kpm_next;
+					match = match.prev;
+				}
+
+				nx = nx == null ? needle : nx.prev;
+				if ( nx == null ) {
+					// bingo
+					tail = hx.prev;
+					return match;
+				}
+				
+				hx = hx.prev;
+			} while ( hx != null );
+
+			tail = null;
+			return null;
+		}
+
+		protected override Delegate RemoveImpl( Delegate value )
+		{
+			if ( value == null )
+				return this;
+
+			// match this with value
+			MulticastDelegate head, tail;
+			head = KPM((MulticastDelegate)value, this, out tail);
+			if ( head == null )
+				return this;
+			
+			// duplicate chain without head..tail
+			MulticastDelegate prev = null, retval = null, orig;
+			for ( orig = this; (object)orig != (object)head; orig = orig.prev ) {
+				MulticastDelegate clone = (MulticastDelegate)orig.Clone();
+				if ( prev != null )
+					prev.prev = clone;
+				else
+					retval = clone;
+				prev = clone;
+			}
+			for ( orig = tail; (object)orig != null; orig = orig.prev ) {
+				MulticastDelegate clone = (MulticastDelegate)orig.Clone();
+				if ( prev != null )
+					prev.prev = clone;
+				else
+					retval = clone;
+				prev = clone;
+			}
+			if ( prev != null )
+				prev.prev = null;
+
+			return retval;
+		}
+
+		public static bool operator == (MulticastDelegate a, MulticastDelegate b) 
+		{
+			if ((object)a == null) {
+				if ((object)b == null)
+					return true;
+				return false;
+			}
+			return a.Equals (b);
+		}
+		
+		public static bool operator != (MulticastDelegate a, MulticastDelegate b) 
+		{
+			return !(a == b);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/MulticastNotSupportedException.cs b/mcs/class/corlib/System/MulticastNotSupportedException.cs
new file mode 100644
index 00000000000..6417207fa72
--- /dev/null
+++ b/mcs/class/corlib/System/MulticastNotSupportedException.cs
@@ -0,0 +1,31 @@
+//
+// System.MulticastNotSupportedException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+namespace System {
+
+	[Serializable]
+	public sealed class MulticastNotSupportedException : SystemException {
+		// Constructors
+		public MulticastNotSupportedException ()
+			: base (Locale.GetText ("This operation cannot be performed with the specified delagates"))
+		{
+		}
+
+		public MulticastNotSupportedException (string message)
+			: base (message)
+		{
+		}
+
+		public MulticastNotSupportedException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/NonSerializedAttribute.cs b/mcs/class/corlib/System/NonSerializedAttribute.cs
new file mode 100755
index 00000000000..7ac82dfe67a
--- /dev/null
+++ b/mcs/class/corlib/System/NonSerializedAttribute.cs
@@ -0,0 +1,18 @@
+
+//
+// System/NonSerializedAttribute.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	[AttributeUsage(AttributeTargets.Field | AttributeTargets.Property)]
+	public sealed class NonSerializedAttribute : Attribute {
+		public NonSerializedAttribute() {
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/NotFiniteNumberException.cs b/mcs/class/corlib/System/NotFiniteNumberException.cs
new file mode 100644
index 00000000000..dd3cc054b48
--- /dev/null
+++ b/mcs/class/corlib/System/NotFiniteNumberException.cs
@@ -0,0 +1,67 @@
+//
+// System.NotFiniteNumberException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class NotFiniteNumberException : ArithmeticException {
+		double offending_number;
+
+		// Constructors
+		public NotFiniteNumberException ()
+			: base (Locale.GetText ("The number encountered was not a finite quantity"))
+		{
+		}
+
+		public NotFiniteNumberException (double offending_number)
+		{
+			this.offending_number = offending_number;
+		}
+
+		public NotFiniteNumberException (string message)
+			: base (message)
+		{
+		}
+
+		public NotFiniteNumberException (string message, double offending_number)
+		{
+			this.offending_number = offending_number;
+		}
+
+		public NotFiniteNumberException (string message, double offending_number, Exception inner)
+			: base (message, inner)
+		{
+			this.offending_number = offending_number;
+		}
+
+		protected NotFiniteNumberException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+			offending_number = info.GetDouble ("OffendingNumber");
+		}		
+
+		// Properties
+		public double OffendingNumber {
+			get {
+				return offending_number;
+			}
+		}
+
+		// Method
+
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("OffendingNumber", offending_number);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/NotImplementedException.cs b/mcs/class/corlib/System/NotImplementedException.cs
new file mode 100755
index 00000000000..5a7f80b3338
--- /dev/null
+++ b/mcs/class/corlib/System/NotImplementedException.cs
@@ -0,0 +1,39 @@
+//
+// System.NotImplementedException.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class NotImplementedException : SystemException {
+		// Constructors
+		public NotImplementedException ()
+			: base (Locale.GetText ("The requested feature is not yet implemented"))
+		{
+		}
+
+		public NotImplementedException (string message)
+			: base (message)
+		{
+		}
+
+		public NotImplementedException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected NotImplementedException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/NotSupportedException.cs b/mcs/class/corlib/System/NotSupportedException.cs
new file mode 100644
index 00000000000..de3fb785b5b
--- /dev/null
+++ b/mcs/class/corlib/System/NotSupportedException.cs
@@ -0,0 +1,39 @@
+//
+// System.NotSupportedException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class NotSupportedException : SystemException {
+		// Constructors
+		public NotSupportedException ()
+			: base (Locale.GetText ("Operation is not supported"))
+		{
+		}
+
+		public NotSupportedException (string message)
+			: base (message)
+		{
+		}
+
+		public NotSupportedException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected NotSupportedException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/NullReferenceException.cs b/mcs/class/corlib/System/NullReferenceException.cs
new file mode 100644
index 00000000000..009732ce07b
--- /dev/null
+++ b/mcs/class/corlib/System/NullReferenceException.cs
@@ -0,0 +1,39 @@
+//
+// System.NullReferenceException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class NullReferenceException : SystemException {
+		// Constructors
+		public NullReferenceException ()
+			: base (Locale.GetText ("A null value was found where an object instance was required"))
+		{
+		}
+
+		public NullReferenceException (string message)
+			: base (message)
+		{
+		}
+
+		public NullReferenceException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected NullReferenceException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/Object.cs b/mcs/class/corlib/System/Object.cs
new file mode 100644
index 00000000000..54850461227
--- /dev/null
+++ b/mcs/class/corlib/System/Object.cs
@@ -0,0 +1,108 @@
+//
+// System.Object.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+	public class Object {
+
+		// <summary>
+		//   Compares this object to the specified object.
+		//   Returns true if they are equal, false otherwise.
+		// </summary>
+		public virtual bool Equals (object o)
+		{
+			return this == o;
+		}
+
+		// <summary>
+		//   Compares two objects for equality
+		// </summary>
+		public static bool Equals (object a, object b)
+		{
+			if (a == b)
+				return true;
+			
+			if (a == null || b == null)
+				return false;
+
+			return a.Equals (b);
+		}
+
+		// <summary>
+		//   Initializes a new instance of the object class.
+		// </summary>
+		public Object ()
+		{
+		}
+
+		// <summary>
+		//   Object destructor. 
+		// </summary>
+		~Object ()
+		{
+		}
+
+		// <summary>
+		//   Returns a hashcode for this object.  Each derived
+		//   class should return a hash code that makes sense
+		//   for that particular implementation of the object.
+		// </summary>
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern virtual int GetHashCode ();
+
+		// <summary>
+		//   Returns the Type associated with the object.
+		// </summary>
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern Type GetType ();
+
+		// <summary>
+		//   Shallow copy of the object.
+		// </summary>
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		protected extern object MemberwiseClone ();
+
+		// <summary>
+		//   Returns a stringified representation of the object.
+		//   This is not supposed to be used for user presentation,
+		//   use Format() for that and IFormattable.
+		//
+		//   ToString is mostly used for debugging purposes. 
+		// </summary>
+		public virtual string ToString ()
+		{
+			return GetType().FullName;
+		}
+
+		// <summary>
+		//   Tests whether a is equal to b.
+		//   Can not figure out why this even exists
+		// </summary>
+		public static bool ReferenceEquals (object a, object b)
+		{
+			return (a == b);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal extern IntPtr obj_address ();
+ 
+		void FieldGetter (string typeName, string fieldName, ref object val)
+		{
+			/* never called */
+		}
+
+		void FieldSetter (string typeName, string fieldName, object val)
+		{
+			/* never called */
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/ObjectDisposedException.cs b/mcs/class/corlib/System/ObjectDisposedException.cs
new file mode 100755
index 00000000000..b1e390aa5be
--- /dev/null
+++ b/mcs/class/corlib/System/ObjectDisposedException.cs
@@ -0,0 +1,60 @@
+//
+// System.ObjectDisposedException.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class ObjectDisposedException : InvalidOperationException {
+		private string obj_name;
+		private string msg;
+
+                // Constructors
+		public ObjectDisposedException (string objectName)
+			: base (Locale.GetText ("The object was used after being disposed"))
+		{
+			obj_name = objectName;
+			msg = Locale.GetText ("The object was used after being disposed");
+		}
+
+		public ObjectDisposedException (string objectName, string message) 
+			: base (message)
+		{
+			obj_name = objectName;
+			msg = message;
+		}
+
+		protected ObjectDisposedException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+			obj_name = info.GetString ("ObjectName");
+		}
+
+		// Properties
+		public override string Message
+		{
+			get { return msg; }
+		}
+
+		public string ObjectName
+		{
+			get { return obj_name; }
+		}
+
+		
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("ObjectName", obj_name);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/ObsoleteAttribute.cs b/mcs/class/corlib/System/ObsoleteAttribute.cs
new file mode 100644
index 00000000000..6215c9379fd
--- /dev/null
+++ b/mcs/class/corlib/System/ObsoleteAttribute.cs
@@ -0,0 +1,48 @@
+//
+// System.ObsoleteAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System
+{
+     [AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct |
+		      AttributeTargets.Enum | AttributeTargets.Constructor |
+		      AttributeTargets.Method | AttributeTargets.Property |
+		      AttributeTargets.Field | AttributeTargets.Event |
+		      AttributeTargets.Interface | AttributeTargets.Delegate)]
+	     [Serializable]
+	     public sealed class ObsoleteAttribute : Attribute
+	     {
+		     private string message;
+		     private bool isError = false;
+		     
+		     //	 Constructors
+		     public ObsoleteAttribute ()
+			     : base ()
+		     {
+		     }
+		     
+		     public ObsoleteAttribute (string message)
+		     {
+			     this.message = message;
+		     }
+		     
+		     public ObsoleteAttribute (string message, bool error)
+		     {
+			     this.message = message;
+			     this.isError = error;
+		     }
+
+		     // Properties
+		     public string Message {
+			     get { return message; }
+		     }
+
+		     public bool IsError {
+			     get { return isError; }
+		     }
+	     }
+}
diff --git a/mcs/class/corlib/System/OperatingSystem.cs b/mcs/class/corlib/System/OperatingSystem.cs
new file mode 100644
index 00000000000..93729bb4a45
--- /dev/null
+++ b/mcs/class/corlib/System/OperatingSystem.cs
@@ -0,0 +1,106 @@
+//------------------------------------------------------------------------------

+// 

+// System.OperatingSystem.cs 

+//

+// Copyright (C) 2001 Moonlight Enterprises, All Rights Reserved

+// 

+// Author:         Jim Richardson, develop@wtfo-guru.com

+// Created:        Saturday, August 11, 2001 

+//

+//------------------------------------------------------------------------------

+

+using System;

+using System.Globalization;

+

+namespace System

+{

+	/// <summary>

+	/// Class representing a specific operating system version for a specific platform

+	/// </summary>

+	[Serializable]

+	public sealed class OperatingSystem : ICloneable

+	{

+		private System.PlatformID itsPlatform;

+		private Version itsVersion;

+

+		public OperatingSystem(PlatformID platform, Version version)

+		{

+			if(version == null)

+			{

+				throw new ArgumentNullException();

+			}

+			

+			itsPlatform = platform;

+			itsVersion = version;

+		}

+

+		/// <summary>

+		/// Get the PlatformID

+		/// </summary>

+		public PlatformID Platform

+		{

+			get

+			{

+				return itsPlatform;

+			}

+		}

+

+		/// <summary>

+		/// Gets the version object

+		/// </summary>

+		public Version Version

+		{

+			get

+			{

+				return itsVersion;

+			}

+		}

+

+		/// <summary>

+		/// Return a clone of this object

+		/// </summary>

+		public object Clone()

+		{

+			return new OperatingSystem(itsPlatform, itsVersion);

+		}

+

+		/// <summary>

+		/// Return true if obj equals this object

+		/// </summary>

+		public override bool Equals(object obj)

+		{

+			//Check for null and compare run-time types.

+			if (obj == null || GetType() != obj.GetType()) return false;

+			OperatingSystem os = (OperatingSystem)obj;

+			return (itsPlatform == os.itsPlatform) && 

+				(os.itsVersion.Equals(itsVersion));

+		}

+

+		/// <summary>

+		/// Return hash code

+		/// </summary>

+		public override int GetHashCode()

+		{	// this leave us enuf for 256 unique platforms which should suffice for a good while

+			return ((int)itsPlatform << 24) | itsVersion.GetHashCode() >> 8;

+		}

+

+		/// <summary>

+		/// Return a string reprentation of this instance

+		/// </summary>

+		public override string ToString()

+		{

+			string str;

+			

+			switch(itsPlatform)

+			{

+			case System.PlatformID.Win32NT: str = "Microsoft Windows NT"; break;

+			case System.PlatformID.Win32S: str = "Microsoft Win32S";  break;

+			case System.PlatformID.Win32Windows: str = "Microsoft Windows 98"; break;

+			case System.PlatformID.Unix: str = "Unix"; break;

+			default: str = Locale.GetText ("<unknown>"); break;

+			}

+

+			return str + " " + itsVersion.ToString();

+		}

+	}

+}

diff --git a/mcs/class/corlib/System/OutOfMemoryException.cs b/mcs/class/corlib/System/OutOfMemoryException.cs
new file mode 100644
index 00000000000..a4f2388390d
--- /dev/null
+++ b/mcs/class/corlib/System/OutOfMemoryException.cs
@@ -0,0 +1,39 @@
+//
+// System.OutOfMemoryException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class OutOfMemoryException : SystemException {
+		// Constructors
+		public OutOfMemoryException ()
+			: base (Locale.GetText ("There is insufficient memory to continue execution"))
+		{
+		}
+
+		public OutOfMemoryException (string message)
+			: base (message)
+		{
+		}
+
+		public OutOfMemoryException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected OutOfMemoryException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/OverflowException.cs b/mcs/class/corlib/System/OverflowException.cs
new file mode 100644
index 00000000000..61e63e1e3a1
--- /dev/null
+++ b/mcs/class/corlib/System/OverflowException.cs
@@ -0,0 +1,39 @@
+//
+// System.OverflowExceptionException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class OverflowException : ArithmeticException {
+		// Constructors
+		public OverflowException ()
+			: base (Locale.GetText ("Number overflow"))
+		{
+		}
+
+		public OverflowException (string message)
+			: base (message)
+		{
+		}
+
+		public OverflowException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected OverflowException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/ParamArrayAttribute.cs b/mcs/class/corlib/System/ParamArrayAttribute.cs
new file mode 100644
index 00000000000..322def26b8b
--- /dev/null
+++ b/mcs/class/corlib/System/ParamArrayAttribute.cs
@@ -0,0 +1,23 @@
+//
+// System.ParamArrayAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	/// <summary>
+	///   Used to flag that the method will take a variable number
+	///   of arguments
+	/// </summary>
+	[AttributeUsage(AttributeTargets.Parameter)]
+	public sealed class ParamArrayAttribute : Attribute {
+
+		public ParamArrayAttribute ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/PlatformID.cs b/mcs/class/corlib/System/PlatformID.cs
new file mode 100644
index 00000000000..56d2299e9fb
--- /dev/null
+++ b/mcs/class/corlib/System/PlatformID.cs
@@ -0,0 +1,37 @@
+// PlatformID.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:35:29 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System {
+
+
+	/// <summary>
+	/// </summary>
+	public enum PlatformID {
+
+		/// <summary>
+		/// </summary>
+		Win32S = 0,
+
+		/// <summary>
+		/// </summary>
+		Win32Windows = 1,
+
+		/// <summary>
+		/// </summary>
+		Win32NT = 2,
+
+		/// <summary>
+		/// </summary>
+		Unix = 128
+	} // PlatformID
+
+} // System
diff --git a/mcs/class/corlib/System/PlatformNotSupportedException.cs b/mcs/class/corlib/System/PlatformNotSupportedException.cs
new file mode 100644
index 00000000000..18960191d0a
--- /dev/null
+++ b/mcs/class/corlib/System/PlatformNotSupportedException.cs
@@ -0,0 +1,41 @@
+//	
+// System.PlatformNotSupportedException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class PlatformNotSupportedException : NotSupportedException
+	{
+		// Constructors
+		public PlatformNotSupportedException ()
+			: base (Locale.GetText ("This platform is not supported."))
+			{
+			}
+		
+		public PlatformNotSupportedException (string message)
+			: base (message)
+			{
+			}
+		
+		protected PlatformNotSupportedException (SerializationInfo info,
+						      StreamingContext context)
+			: base (info, context)
+			{
+			}
+		
+		public PlatformNotSupportedException (string message, Exception innerException)
+			:base (message, innerException)
+			{
+			}
+	}
+}
diff --git a/mcs/class/corlib/System/Random.cs b/mcs/class/corlib/System/Random.cs
new file mode 100644
index 00000000000..03f8c5edcca
--- /dev/null
+++ b/mcs/class/corlib/System/Random.cs
@@ -0,0 +1,83 @@
+//
+// System.Random.cs
+//
+// Author:
+//   Bob Smith (bob@thestuff.net)
+//
+// (C) 2001 Bob Smith.  http://www.thestuff.net
+//
+
+using System;
+using System.Globalization;
+
+namespace System
+{
+		[Serializable]
+        public class Random
+        {
+                private int S = 1;
+                private const int A = 16807;
+                private const int M = 2147483647;
+                private const int Q = 127773;
+                private const int R = 2836;
+
+                public Random()
+                {
+                        S = (int)(DateTime.Now.Ticks);
+                }
+
+                public Random(int Seed)
+                {
+                        S = Seed;
+                }
+
+                public virtual int Next()
+                {
+                        return (int)(this.Sample()*Int32.MaxValue);
+                }
+
+                public virtual int Next(int maxValue)
+                {
+                        if (maxValue < 0)
+                                throw new ArgumentOutOfRangeException(Locale.GetText (
+					"Max value is less then min value."));
+                        else if (maxValue == 0)
+                                return 0;
+                        return (int)(this.Sample()*maxValue);
+                }
+
+                public virtual int Next(int minValue, int maxValue)
+                {
+                        if (minValue > maxValue)
+                                throw new ArgumentOutOfRangeException(Locale.GetText (
+					"Min value is greater then max value."));
+                        else if (minValue == maxValue)
+                                return minValue;
+                        return (int)(this.Sample()*(maxValue - minValue))+minValue;
+                }
+                public virtual void NextBytes(byte[] buffer)
+                {
+                        int i, l;
+                        if (buffer == null)
+                                throw new ArgumentNullException();
+                        l = buffer.GetUpperBound(0);
+                        for (i = buffer.GetLowerBound(0); i < l; i++)
+                        {
+                                buffer[i] = (byte)(this.Sample()*Byte.MaxValue);
+                        }
+                }
+
+                public virtual double NextDouble ()
+                {
+                        return this.Sample();
+                }
+
+                protected virtual double Sample ()
+		{
+                        S = A*(S%Q)-R*(S/Q);
+                        if (S < 0)
+				S+=M;
+                        return S/(double)Int32.MaxValue;
+                }
+        }
+}
diff --git a/mcs/class/corlib/System/RankException.cs b/mcs/class/corlib/System/RankException.cs
new file mode 100644
index 00000000000..89813a4a123
--- /dev/null
+++ b/mcs/class/corlib/System/RankException.cs
@@ -0,0 +1,40 @@
+//
+// System.RankException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class RankException : SystemException {
+		// Constructors
+		public RankException ()
+			: base (Locale.GetText ("Two arrays must have the same number of dimensions"))
+		{
+		}
+
+		public RankException (string message)
+			: base (message)
+		{
+		}
+
+		public RankException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected RankException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+					
+	}
+}
diff --git a/mcs/class/corlib/System/ResolveEventArgs.cs b/mcs/class/corlib/System/ResolveEventArgs.cs
new file mode 100644
index 00000000000..e0c10a65950
--- /dev/null
+++ b/mcs/class/corlib/System/ResolveEventArgs.cs
@@ -0,0 +1,29 @@
+//------------------------------------------------------------------------------
+// 
+// System.ResolveEventArgs.cs 
+//
+// Copyright (C) 2001 Nick Drochak, All Rights Reserved
+// 
+// Author:         Nick Drochak, ndrochak@gol.com
+// Created:        2002-01-06 
+//
+//------------------------------------------------------------------------------
+
+using System;
+
+namespace System {
+
+	public class ResolveEventArgs : EventArgs
+	{
+		private string m_Name;
+		public string Name {get{return m_Name;}}
+	
+		public ResolveEventArgs(string name){
+			m_Name = name;
+		}
+
+	} // ResolveEventArgs
+
+} // System
+
+
diff --git a/mcs/class/corlib/System/ResolveEventHandler.cs b/mcs/class/corlib/System/ResolveEventHandler.cs
new file mode 100644
index 00000000000..36471295a85
--- /dev/null
+++ b/mcs/class/corlib/System/ResolveEventHandler.cs
@@ -0,0 +1,10 @@
+// System.ResolveEventHandler
+//
+// Sean MacIsaac
+//
+// (C) 2001 Ximian, Inc.
+
+namespace System
+{
+	public delegate Reflection.Assembly ResolveEventHandler (object sender, ResolveEventArgs args);
+}
diff --git a/mcs/class/corlib/System/RuntimeArgumentHandle.cs b/mcs/class/corlib/System/RuntimeArgumentHandle.cs
new file mode 100644
index 00000000000..790f3c1a24d
--- /dev/null
+++ b/mcs/class/corlib/System/RuntimeArgumentHandle.cs
@@ -0,0 +1,16 @@
+//
+// System.RuntimeArgumentHandle.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+namespace System
+{
+	public struct RuntimeArgumentHandle
+	{
+		// This class has no members, its only use is for supporting
+		// va_args from C and C++.
+	}
+}
diff --git a/mcs/class/corlib/System/RuntimeFieldHandle.cs b/mcs/class/corlib/System/RuntimeFieldHandle.cs
new file mode 100755
index 00000000000..f4536856af9
--- /dev/null
+++ b/mcs/class/corlib/System/RuntimeFieldHandle.cs
@@ -0,0 +1,45 @@
+//
+// System.RuntimeFieldHandle.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+using System.Globalization;
+
+namespace System {
+
+	[MonoTODO]
+	[Serializable]
+	public struct RuntimeFieldHandle : ISerializable {
+		IntPtr value;
+		
+		public IntPtr Value {
+			get {
+				return (IntPtr) value;
+			}
+		}
+
+		RuntimeFieldHandle (SerializationInfo info, StreamingContext context)
+		{
+			Type t;
+			
+			if (info == null)
+				throw new ArgumentNullException ("info");
+
+			t = (Type) info.GetValue ("TypeObj", typeof (Type));
+
+			value = t.TypeHandle.Value;
+			if (value == (IntPtr) 0)
+				throw new SerializationException (Locale.GetText ("Insufficient state"));
+		}
+		
+                public void GetObjectData (SerializationInfo info, StreamingContext context)
+                {
+			info.AddValue ("TypeObj", value, value.GetType ());
+                }
+	}
+}
diff --git a/mcs/class/corlib/System/RuntimeMethodHandle.cs b/mcs/class/corlib/System/RuntimeMethodHandle.cs
new file mode 100755
index 00000000000..a32c2953898
--- /dev/null
+++ b/mcs/class/corlib/System/RuntimeMethodHandle.cs
@@ -0,0 +1,39 @@
+//
+// System.RuntimeMethodHandle.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+using System.Globalization;
+
+namespace System {
+
+	//[MonoTODO]
+	[Serializable]
+	public struct RuntimeMethodHandle : ISerializable {
+		IntPtr value;
+		
+		public IntPtr Value {
+			get {
+				return (IntPtr) value;
+			}
+		}
+		
+                // This is from ISerializable
+		[MonoTODO]
+                public void GetObjectData (SerializationInfo info, StreamingContext context)
+                {
+			throw new NotImplementedException ();
+                }
+
+		[MonoTODO]
+		public IntPtr GetFunctionPointer ()
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/RuntimeTypeHandle.cs b/mcs/class/corlib/System/RuntimeTypeHandle.cs
new file mode 100644
index 00000000000..f81d5a3730d
--- /dev/null
+++ b/mcs/class/corlib/System/RuntimeTypeHandle.cs
@@ -0,0 +1,31 @@
+//
+// System.RuntimeTypeHandle.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+using System.Globalization;
+
+namespace System {
+	
+	[Serializable]
+	public struct RuntimeTypeHandle : ISerializable {
+		IntPtr value;
+		
+		public IntPtr Value {
+			get {
+				return (IntPtr) value;
+			}
+		}
+		
+		[MonoTODO]
+		public void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			throw new NotImplementedException ();
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/SByte.cs b/mcs/class/corlib/System/SByte.cs
new file mode 100644
index 00000000000..bdc15f7cec4
--- /dev/null
+++ b/mcs/class/corlib/System/SByte.cs
@@ -0,0 +1,232 @@
+//
+// System.SByte.cs
+//
+// Author:
+// Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System.Globalization;
+
+namespace System {
+
+	[CLSCompliant(false)]
+	[Serializable]
+	public struct SByte : IComparable, IFormattable, IConvertible {
+
+		public const sbyte MinValue = -128;
+		public const sbyte MaxValue = 127;
+
+		// VES needs to know about value. public is workaround
+		// so source will compile
+		public sbyte value;
+
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+
+			if (!(v is System.SByte))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.SByte"));
+
+			sbyte xv = (sbyte) v;
+			if (value == xv)
+				return 0;
+			if (value > xv)
+				return 1;
+			else
+				return -1;
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.SByte))
+				return false;
+
+			return ((sbyte) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return value;
+		}
+
+		[CLSCompliant(false)]
+		public static sbyte Parse (string s)
+		{
+			int ival = 0;
+			int len;
+			int i;
+			bool neg = false;
+			bool digits_seen = false;
+
+			if (s == null)
+				throw new ArgumentNullException (Locale.GetText ("s is null"));
+
+			len = s.Length;
+
+			char c;
+			for (i = 0; i < len; i++){
+				c = s [i];
+				if (!Char.IsWhiteSpace (c))
+					break;
+			}
+
+			if (i == len)
+				throw new FormatException ();
+
+			c = s [i];
+			if (c == '+')
+				i++;
+			else if (c == '-'){
+				neg = true;
+				i++;
+			}
+
+			for (; i < len; i++){
+				c = s [i];
+
+				if (c >= '0' && c <= '9'){
+					ival = checked (ival * 10 - (int) (c - '0'));
+					digits_seen = true;
+				} else {
+					if (Char.IsWhiteSpace (c)){
+						for (i++; i < len; i++){
+							if (!Char.IsWhiteSpace (s [i]))
+								throw new FormatException ();
+						}
+						break;
+					} else
+						throw new FormatException ();
+				}
+			}
+			if (!digits_seen)
+				throw new FormatException ();
+
+			ival = neg ? ival : -ival;
+			if (ival < SByte.MinValue || ival > SByte.MaxValue)
+				throw new OverflowException ();
+
+			return (sbyte) ival;
+		}
+
+		[CLSCompliant(false)]
+		public static sbyte Parse (string s, IFormatProvider fp)
+		{
+			return Parse (s, NumberStyles.Integer, fp);
+		}
+
+		[CLSCompliant(false)]
+		public static sbyte Parse (string s, NumberStyles style)
+		{
+			return Parse (s, style, null);
+		}
+
+		[CLSCompliant(false)]
+		public static sbyte Parse (string s, NumberStyles style, IFormatProvider fp)
+		{
+			int tmpResult = Int32.Parse (s, style, fp);
+			if (tmpResult > SByte.MaxValue || tmpResult < SByte.MinValue)
+				throw new OverflowException ("Value too large or too small.");
+
+			return (sbyte) tmpResult;
+		}
+
+		public override string ToString ()
+		{
+			return ToString (null, null);
+		}
+
+		public string ToString (IFormatProvider fp)
+		{
+			return ToString (null, fp);
+		}
+
+		public string ToString (string format)
+		{
+			return ToString (format, null);
+		}
+
+		public string ToString (string format, IFormatProvider fp)
+		{
+			NumberFormatInfo nfi = NumberFormatInfo.GetInstance( fp );
+
+			if ( format == null )
+				format = "G";
+
+			return IntegerFormatter.NumberToString(format, nfi, value);
+		}
+
+		// =========== ICovnertible Methods =========== //
+
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.SByte;
+		}
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return System.Convert.ToBoolean (value);
+		}
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return System.Convert.ToByte (value);
+		}
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			return System.Convert.ToChar (value);
+		}
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			throw new NotImplementedException ();
+		}
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal (value);
+		}
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble (value);
+		}
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16 (value);
+		}
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32 (value);
+		}
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64 (value);
+		}
+		[CLSCompliant(false)]
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return value;
+		}
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle (value);
+		}
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			throw new NotImplementedException ();
+		}
+		[CLSCompliant(false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16 (value);
+		}
+		[CLSCompliant(false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32 (value);
+		}
+		[CLSCompliant(false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64 (value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/STAThreadAttribute.cs b/mcs/class/corlib/System/STAThreadAttribute.cs
new file mode 100644
index 00000000000..da8e92cd0df
--- /dev/null
+++ b/mcs/class/corlib/System/STAThreadAttribute.cs
@@ -0,0 +1,19 @@
+//
+// System.STAThreadAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System
+{
+	[AttributeUsage (AttributeTargets.Method)]
+	public sealed class STAThreadAttribute : Attribute
+	{
+		   // Constructors
+		public STAThreadAttribute () : base ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/SerializableAttribute.cs b/mcs/class/corlib/System/SerializableAttribute.cs
new file mode 100755
index 00000000000..e283d4afc39
--- /dev/null
+++ b/mcs/class/corlib/System/SerializableAttribute.cs
@@ -0,0 +1,38 @@
+//
+// System.SerializableAttribute.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	/// <summary>
+	///   Serialization Attribute for classes. 
+	/// </summary>
+	
+	/// <remarks>
+	///   Use SerializableAttribute to mark classes that do not implement
+	///   the ISerializable interface but that want to be serialized.
+	///
+	///   Failing to do so will cause the system to throw an exception.
+	///
+	///   When a class is market with the SerializableAttribute, all the
+	///   fields are automatically serialized with the exception of those
+	///   that are tagged with the NonSerializedAttribute.
+	///
+	///   SerializableAttribute should only be used for classes that contain
+	///   simple data types that can be serialized and deserialized by the
+	///   runtime (typically you would use NonSerializedAttribute on data
+	///   that can be reconstructed at any point: like caches or precomputed
+	///   tables). 
+	/// </remarks>
+
+	[AttributeUsage(AttributeTargets.Class | AttributeTargets.Struct 
+		| AttributeTargets.Enum | AttributeTargets.Delegate, 
+		Inherited=false, AllowMultiple=false)]
+	public sealed class SerializableAttribute : Attribute {
+	}
+}
diff --git a/mcs/class/corlib/System/Single.cs b/mcs/class/corlib/System/Single.cs
new file mode 100644
index 00000000000..11b1f8758de
--- /dev/null
+++ b/mcs/class/corlib/System/Single.cs
@@ -0,0 +1,225 @@
+//
+// System.Single.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System {
+	
+	[Serializable]
+	public struct Single : IComparable, IFormattable, IConvertible {
+		public const float Epsilon = 1.4e-45f;
+		public const float MaxValue =  3.40282346638528859e38f;
+		public const float MinValue = -3.40282346638528859e38f;
+		public const float NaN = 0.0f / 0.0f;
+		public const float PositiveInfinity =  1.0f / 0.0f;
+		public const float NegativeInfinity = -1.0f / 0.0f;
+			
+		// VES needs to know about value.  public is workaround
+		// so source will compile
+		public float value;
+	       		
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+
+			if (!(v is System.Single))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.Single"));
+
+			float fv = (float)v;
+
+			if (this.value == fv) return 0;
+			else if (this.value > fv) return 1;
+			else return -1;
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.Single))
+				return false;
+
+			return ((float) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int) value;
+		}
+
+		public static bool IsInfinity (float f)
+		{
+			return (f == PositiveInfinity || f == NegativeInfinity);
+		}
+
+		public static bool IsNaN (float f)
+		{
+			return (f != f);
+		}
+
+		public static bool IsNegativeInfinity (float f)
+		{
+			return (f < 0.0f && (f == NegativeInfinity || f == PositiveInfinity));
+		}
+
+		public static bool IsPositiveInfinity (float f)
+		{
+			return (f > 0.0f && (f == NegativeInfinity || f == PositiveInfinity));
+		}
+
+		public static float Parse (string s)
+		{
+			double parsed_value = Double.Parse (
+				s, (NumberStyles.Float | NumberStyles.AllowThousands), null);
+			if (parsed_value > (double) float.MaxValue)
+				throw new OverflowException();
+			
+			return (float) parsed_value;
+		}
+
+		public static float Parse (string s, IFormatProvider fp)
+		{
+			double parsed_value = Double.Parse (
+				s, (NumberStyles.Float | NumberStyles.AllowThousands), fp);
+			if (parsed_value > (double) float.MaxValue)
+				throw new OverflowException();
+			
+			return (float) parsed_value;
+		}
+		
+		public static float Parse (string s, NumberStyles style)
+		{
+			double parsed_value = Double.Parse (s, style, null);
+			if (parsed_value > (double) float.MaxValue)
+				throw new OverflowException();
+			
+			return (float) parsed_value;
+		}
+
+		public static float Parse (string s, NumberStyles style, IFormatProvider fp) 
+		{
+			double parsed_value = Double.Parse (s, style, fp);
+			if (parsed_value > (double) float.MaxValue)
+				throw new OverflowException();
+			
+			return (float) parsed_value;
+		}
+
+		public override string ToString ()
+		{
+			return ToString (null, null);
+		}
+
+		public string ToString (IFormatProvider fp)
+		{
+			return ToString (null, fp);
+		}
+
+		public string ToString (string format)
+		{
+			return ToString (format, null);
+		}
+
+		[MonoTODO]
+		public string ToString (string format, IFormatProvider fp)
+		{
+			// FIXME: Need to pass format and provider info to this call too.
+			return ToStringImpl(value);
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern string ToStringImpl (float value);
+
+		// ============= IConvertible Methods ============ //
+
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.Single;
+		}
+
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return System.Convert.ToBoolean (value);
+		}
+
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return System.Convert.ToByte (value);
+		}
+
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			return System.Convert.ToChar (value);
+		}
+
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			return System.Convert.ToDateTime (value);
+		}
+
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal (value);
+		}
+
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble (value);
+		}
+
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16 (value);
+		}
+
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32 (value);
+		}
+
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64 (value);
+		}
+
+		[CLSCompliant (false)]
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte (value);
+		}
+		
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle (value);
+		}
+
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			return System.Convert.ToType (value, conversionType, provider);
+		}
+
+		[CLSCompliant (false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16 (value);
+		}
+
+		[CLSCompliant (false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32 (value);
+		}
+
+		[CLSCompliant (false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64 (value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/StackOverflowException.cs b/mcs/class/corlib/System/StackOverflowException.cs
new file mode 100644
index 00000000000..82edf55c607
--- /dev/null
+++ b/mcs/class/corlib/System/StackOverflowException.cs
@@ -0,0 +1,39 @@
+//
+// System.StackOverflowException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public sealed class StackOverflowException : SystemException {
+		// Constructors
+		public StackOverflowException ()
+			: base (Locale.GetText ("The requested operation caused a stack overflow"))
+		{
+		}
+
+		public StackOverflowException (string message)
+			: base (message)
+		{
+		}
+
+		public StackOverflowException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		internal StackOverflowException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/String.cs b/mcs/class/corlib/System/String.cs
new file mode 100644
index 00000000000..9b42261f5d6
--- /dev/null
+++ b/mcs/class/corlib/System/String.cs
@@ -0,0 +1,1097 @@
+//
+// System.String.cs
+//
+// Authors:
+//	  Patrik Torstensson (patrik.torstensson@labs2.com)
+//   Jeffrey Stedfast (fejj@ximian.com)
+//   Dan Lewis (dihlewis@yahoo.co.uk)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System;
+using System.Text;
+using System.Collections;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System {
+	[Serializable]
+	public sealed class String : IConvertible, IComparable, ICloneable, IEnumerable {
+		private int length;
+
+		public static readonly String Empty = "";
+
+		[CLSCompliant(false), MethodImplAttribute(MethodImplOptions.InternalCall)]
+		unsafe public extern String(char *value);
+
+		[CLSCompliant(false), MethodImplAttribute(MethodImplOptions.InternalCall)]
+		unsafe public extern String(char *value, int sindex, int length);
+    
+		[CLSCompliant(false), MethodImplAttribute(MethodImplOptions.InternalCall)]
+		unsafe public extern String(sbyte *value);
+
+		[CLSCompliant(false), MethodImplAttribute(MethodImplOptions.InternalCall)]
+		unsafe public extern String(sbyte *value, int sindex, int length);
+
+		[CLSCompliant(false), MethodImplAttribute(MethodImplOptions.InternalCall)]
+		unsafe public extern String(sbyte *value, int sindex, int length, Encoding enc);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern String(char [] val, int sindex, int length);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern String(char [] val);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern String(char c, int count);
+	
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override int GetHashCode();
+
+		public static bool Equals(String str1, String str2) {
+			if ((Object) str1 == (Object) str2)
+				return true;
+	    
+			if (null == (Object) str1 || null == (Object) str2)
+				return false;
+
+			if (str1.length != str2.length)
+				return false;
+    
+			return InternalEquals(str1, str2);
+		}
+
+		public static bool operator == (String str1, String str2) {
+			return Equals(str1, str2);
+		}
+
+		public static bool operator != (String str1, String str2) {
+			return !Equals(str1, str2);
+		}
+
+		public override bool Equals(Object obj) {
+			if (null == obj)
+				return false;
+
+			if (!(obj is String))
+				return false;
+
+			return InternalEquals(this, (String) obj);
+		}
+
+		public bool Equals(String value) {
+			if (null == value)
+				return false;
+
+			if (length != value.length)
+				return false;
+
+			return InternalEquals(this, value);
+		}
+
+		[IndexerName("Chars")]
+		public extern char this[int index] {
+			[MethodImplAttribute(MethodImplOptions.InternalCall)]
+			get;
+		}
+
+		public Object Clone() {
+			return this;
+		}
+
+		public TypeCode GetTypeCode () {
+			return TypeCode.String;
+		}
+
+		public void CopyTo(int sindex, char[] dest, int dindex, int count) {
+			// LAMESPEC: should I null-terminate?
+			
+			if (dest == null)
+				throw new ArgumentNullException();
+
+			if (sindex < 0 || dindex < 0 || count < 0)
+				throw new ArgumentOutOfRangeException (); 
+
+			if (sindex + count > Length)
+				throw new ArgumentOutOfRangeException ();
+
+			if (dindex + count > dest.Length)
+				throw new ArgumentOutOfRangeException ();
+
+			InternalCopyTo(sindex, dest, dindex, count);
+		}
+
+		public char[] ToCharArray() {
+			return ToCharArray(0, length);
+		}
+
+		public char[] ToCharArray(int sindex, int length) {
+			if (sindex < 0 || length < 0 || sindex + length > this.length)
+				throw new ArgumentOutOfRangeException (); 
+
+			char [] tmp = new char[length];
+
+			InternalCopyTo(sindex, tmp, 0, length);
+
+			return tmp;
+		}
+		
+		public String [] Split(params char [] separator) {
+			return Split(separator, Int32.MaxValue);
+		}
+
+		public String[] Split(char[] separator, int count) {
+			if (null == separator) {
+				separator = WhiteChars;
+			}
+
+			if (count < 0)
+				throw new ArgumentOutOfRangeException ();
+
+			if (count == 0) 
+				return new String[0];
+
+			if (count == 1) 
+				return new String[1] { ToString() };
+
+			return InternalSplit(separator, count);
+		}
+
+		public String Substring (int sindex) {
+			if (sindex < 0 || sindex > this.length) {
+				throw new ArgumentOutOfRangeException();
+			}
+
+			string tmp = InternalAllocateStr(this.length - sindex);
+			InternalStrcpy(tmp, 0, this, sindex, length - sindex);
+			
+			return tmp;
+		}
+
+		public String Substring (int sindex, int length) {
+			if (length < 0 || sindex < 0 || sindex + length > this.length) {
+				throw new ArgumentOutOfRangeException();
+			}
+
+			if (length == 0)
+				return String.Empty;
+
+			string tmp = InternalAllocateStr(length);
+			InternalStrcpy(tmp, 0, this, sindex, length);
+
+			return tmp;
+		}	
+
+		private static readonly char[] WhiteChars = {  (char) 0x9, (char) 0xA, (char) 0xB, (char) 0xC, (char) 0xD, (char) 0x20, (char) 0xA0, (char) 0x2000, (char) 0x2001, (char) 0x2002, (char) 0x2003, (char) 0x2004, (char) 0x2005,
+																	  (char) 0x2006, (char) 0x2007, (char) 0x2008, (char) 0x2009, (char) 0x200A, (char) 0x200B, (char) 0x3000, (char) 0xFEFF };
+
+		public String Trim(params char[] chars) {
+			if (null == chars || chars.Length == 0)
+				chars = WhiteChars;
+
+			return InternalTrim(chars, 0);
+		}
+
+		public String TrimStart(params char[] chars) {
+			if (null == chars || chars.Length == 0)
+				chars = WhiteChars;
+
+			return InternalTrim(chars, 1);
+		}
+
+		public String TrimEnd(params char[] chars) {
+			if (null == chars || chars.Length == 0)
+				chars = WhiteChars;
+
+			return InternalTrim(chars, 2);
+		}
+
+		public static int Compare(String s1, String s2) {
+			return Compare(s1, s2, false);
+		}
+
+		public static int Compare(String s1, String s2, bool inCase) {
+			if (null == s1) {
+				if (null == s2)
+					return 0;
+				else
+					return -1;
+			} else if (null == s2)
+				return 1;
+
+			return InternalCompare(s1, 0, s2, 0, Math.Max(s1.length, s2.length), inCase);
+		}
+		
+		[MonoTODO()]
+		public static int Compare(String s1, String s2, bool inCase, CultureInfo culture) {
+			return Compare(s1, s2, inCase);
+		}
+
+		public static int Compare(String s1, int i1, String s2, int i2, int length) {
+			return Compare(s1, i1, s2, i2, length, false);
+		}
+
+		public static int Compare(String s1, int i1, String s2, int i2, int length, bool inCase) {
+			if (null == s1) {
+				if (null == s2)
+					return 0;
+				else
+					return -1;
+			} else if (null == s2)
+				return 1;
+
+			if (length < 0 || i1 < 0 || i2 < 0)
+				throw new ArgumentOutOfRangeException ();
+
+			if (i1 > s1.length || i2 > s2.length)
+				throw new ArgumentOutOfRangeException ();
+
+			if (length == 0)
+				return 0;
+
+			return InternalCompare(s1, i1, s2, i2, length, inCase);
+		}
+
+		[MonoTODO()]
+		public static int Compare(String s1, int i1, String s2, int i2, int length, bool inCase, CultureInfo culture) {
+			return Compare(s1, i1, s2, i2, length, inCase);
+		}
+
+		public int CompareTo(Object value) {
+			if (null == value)
+				return 1;
+            
+			if (!(value is String))
+				throw new ArgumentException();
+
+			return String.Compare(this, (String) value, false);
+		}
+
+		public int CompareTo(String str) {
+			if (null == str)
+				return 1;
+
+			return Compare(this, str, false);
+		}
+
+		public static int CompareOrdinal(String s1, String s2) {
+			if (null == s1 || null == s2) {
+				if ((Object)s1 == (Object) s2) {
+					return 0;
+				}
+
+				return (s1 == null) ? -1 : 1;
+			}
+
+			return InternalCompare(s1, 0, s2, 0, Math.Max(s1.length, s2.length), false);
+		}
+
+		public static int CompareOrdinal(String s1, int i1, String s2, int i2, int length) {
+			if (null == s1 || null == s2) {
+				if ((Object)s1 == (Object) s2) {
+					return 0;
+				}
+
+				return (s1 == null) ? -1 : 1;
+			}
+
+			if (i1 < 0 || i2 < 0 || length < 0)
+				throw new ArgumentOutOfRangeException ();
+
+			if (i1 > s1.length || i2 > s2.length)
+				throw new ArgumentOutOfRangeException ();
+
+			return InternalCompare(s1, i1, s2, i2, length, false);
+		}
+
+		public bool EndsWith(String value) {
+			if (null == value)
+				throw new ArgumentNullException();
+
+			if (value.length > this.length) {
+				return false;
+			}
+
+			return (0 == Compare(this, length - value.length, value, 0, value.length));
+		}
+	
+		public int IndexOfAny(char [] arr) {
+			if (null == arr)
+				throw new ArgumentNullException();
+
+			return InternalIndexOfAny(arr, 0, this.length);
+		}
+
+		public int IndexOfAny(char [] arr, int sindex) {
+			if (null == arr)
+				throw new ArgumentNullException();
+			if (sindex < 0 || sindex >= this.length)
+				throw new ArgumentOutOfRangeException();
+
+			return InternalIndexOfAny(arr, sindex, this.length - sindex);
+		}
+
+		public int IndexOfAny(char [] arr, int sindex, int count) {
+			if (null == arr)
+				throw new ArgumentNullException();
+			if (sindex < 0 || count < 0 || sindex + count > this.length)
+				throw new ArgumentOutOfRangeException ();
+
+			return InternalIndexOfAny(arr, sindex, count);
+		}
+
+		public int IndexOf(char value) {
+			return InternalIndexOf(value, 0, this.length);
+		}
+
+		public int IndexOf(String value) {
+			return IndexOf(value, 0, this.length);
+		}
+
+		public int IndexOf(char value, int sindex) {
+			if (sindex < 0 || sindex > this.length) {
+				throw new ArgumentOutOfRangeException();
+			}
+
+			if (sindex == this.length)
+				return -1;
+
+			return InternalIndexOf(value, sindex, this.length - sindex);
+		}
+
+		public int IndexOf(String value, int sindex) {
+			if (sindex == this.length)
+				return -1;
+
+			return IndexOf(value, sindex, this.length - sindex);
+		}
+
+		public int IndexOf(char value, int sindex, int count) {
+			if (sindex < 0 || count < 0 || sindex + count > this.length)
+				throw new ArgumentOutOfRangeException ();
+			
+			if (sindex == 0 && this.length == 0)
+				return -1;			
+
+			return InternalIndexOf(value, sindex, count);
+		}
+		
+		public int IndexOf(String value, int sindex, int count) {
+			if (null == value) 
+				throw new ArgumentNullException();
+
+			if (sindex < 0 || count < 0 || sindex + count > this.length)
+				throw new ArgumentOutOfRangeException ();
+			
+			if (sindex == 0 && this.length == 0)
+				return -1;			
+
+			return InternalIndexOf(value, sindex, count);
+		}
+
+		public int LastIndexOfAny(char [] arr) {
+			if (null == arr) 
+				throw new ArgumentNullException();
+
+			return InternalLastIndexOfAny(arr, this.length - 1, this.length);
+		}
+
+		public int LastIndexOfAny(char [] arr, int sindex) {
+			if (null == arr) 
+				throw new ArgumentNullException();
+
+			if (sindex < 0 || sindex > this.length)
+				throw new ArgumentOutOfRangeException();
+
+			if (this.length == 0)
+				return -1;
+
+			return InternalLastIndexOfAny(arr, sindex, sindex + 1);
+		}
+
+		public int LastIndexOfAny(char [] arr, int sindex, int count) {
+			if (null == arr) 
+				throw new ArgumentNullException();
+
+			if (sindex < 0 || count < 0 || sindex > this.length || sindex - count < -1)
+				throw new ArgumentOutOfRangeException();
+
+			if (this.length == 0)
+				return -1;
+
+			return InternalLastIndexOfAny(arr, sindex, count);
+		}
+
+		public int LastIndexOf(char value) {
+			return InternalLastIndexOf(value, this.length - 1, this.length);
+		}
+
+		public int LastIndexOf(String value) {
+			if (null == value) 
+				throw new ArgumentNullException();
+			
+			if (value.length == 0)
+				return 0;
+
+			if (this.length == 0)
+				return -1;
+
+			return InternalLastIndexOf(value, this.length - 1, this.length);
+		}
+
+		public int LastIndexOf(char value, int sindex){
+			return LastIndexOf(value, sindex, sindex + 1);
+		}
+
+		public int LastIndexOf(String value, int sindex) {
+			return LastIndexOf(value, sindex, sindex + 1);
+		}
+
+		public int LastIndexOf(char value, int sindex, int count) {
+			if (sindex < 0 || count < 0)
+				throw new ArgumentOutOfRangeException ();
+
+			if (sindex >= this.length || sindex - count + 1 < 0)
+				throw new ArgumentOutOfRangeException ();
+
+			if (sindex == 0 && this.length == 0)
+				return -1;
+
+			return InternalLastIndexOf(value, sindex, count);
+		}
+
+		public int LastIndexOf(String value, int sindex, int count) {
+			if (null == value) 
+				throw new ArgumentNullException();
+
+			if (sindex < 0 || sindex > this.length)
+				throw new ArgumentOutOfRangeException ();
+
+			if (count < 0 || sindex - count + 1 < 0)
+				throw new ArgumentOutOfRangeException ();
+
+			if (value.length > sindex)
+				return -1;
+
+			if (value == String.Empty)
+				return sindex;
+
+			if (sindex == 0 && this.length == 0)
+				return -1;
+
+			return InternalLastIndexOf(value, sindex, count);
+		}
+
+		public String PadLeft(int width) {
+			return PadLeft(width, ' ');
+		}
+
+		public String PadLeft(int width, char chr) {
+			if (width < 0)
+				throw new ArgumentException();
+
+			if (width < this.length)
+				return String.Copy(this);
+
+			return InternalPad(width, chr, false);
+		}
+
+		public String PadRight(int width) {
+			return PadRight(width, ' ');
+		}
+
+		public String PadRight(int width, char chr) {
+			if (width < 0)
+				throw new ArgumentException();
+
+			if (width < this.length)
+				return String.Copy(this);
+
+			return InternalPad(width, chr, true);
+		}
+
+		public bool StartsWith(String value) {
+			if (null == value)
+				throw new ArgumentNullException();
+
+			if (this.length < value.length)
+				return false;
+
+			return (0 == Compare(this, 0, value, 0 , value.length));
+		}
+	
+    
+		public String Replace (char oldChar, char newChar) {
+			return InternalReplace(oldChar, newChar);
+		}
+
+		public String Replace(String oldValue, String newValue) {
+			if (null == oldValue)
+				throw new ArgumentNullException();
+
+			return InternalReplace(oldValue, newValue);
+		}
+
+		public String Remove(int sindex, int count) {
+			if (sindex < 0 || count < 0 || sindex + count > this.length)
+				throw new ArgumentOutOfRangeException ();
+
+			return InternalRemove(sindex, count);
+		}
+
+		public String ToLower() {
+			return InternalToLower();
+		}
+
+		[MonoTODO("By now, don't use culture info")]
+		public String ToLower(CultureInfo culture) {
+			return InternalToLower();
+		}
+
+		public String ToUpper() {
+			return InternalToUpper();
+		}
+
+		[MonoTODO("By now, don't use culture info")]
+		public String ToUpper(CultureInfo culture) {
+			return InternalToUpper();
+		}
+
+		public override String ToString() {
+			return this;
+		}
+
+		public String ToString(IFormatProvider provider) {
+			return this;
+		}
+
+		public String Trim() {
+			return Trim(null);
+		}
+
+		public static String Format(String format, Object arg0) {
+			return Format(null, format, new Object[] {arg0});
+		}
+
+		public static String Format(String format, Object arg0, Object arg1) {
+			return Format(null, format, new Object[] {arg0, arg1});
+		}
+
+		public static String Format(String format, Object arg0, Object arg1, Object arg2) {
+			return Format(null, format, new Object[] {arg0, arg1, arg2});
+		}
+
+		public static string Format (string format, params object[] args) {
+			return Format (null, format, args);
+		}
+	
+		public static string Format (IFormatProvider provider, string format, params object[] args) {
+			if (format == null || args == null)
+				throw new ArgumentNullException ();
+		
+			StringBuilder result = new StringBuilder ();
+
+			int ptr = 0;
+			int start = ptr;
+			while (ptr < format.length) {
+				char c = format[ptr ++];
+
+				if (c == '{') {
+					result.Append (format, start, ptr - start - 1);
+
+					// check for escaped open bracket
+
+					if (format[ptr] == '{') {
+						start = ptr ++;
+						continue;
+					}
+
+					// parse specifier
+				
+					int n, width;
+					bool left_align;
+					string arg_format;
+
+					ParseFormatSpecifier (format, ref ptr, out n, out width, out left_align, out arg_format);
+					if (n >= args.Length)
+						throw new FormatException ("Index (zero based) must be greater than or equal to zero and less than the size of the argument list.");
+
+					// format argument
+
+					object arg = args[n];
+
+					string str;
+					if (arg == null)
+						str = "";
+					else if (arg is IFormattable)
+						str = ((IFormattable)arg).ToString (arg_format, provider);
+					else
+						str = arg.ToString ();
+
+					// pad formatted string and append to result
+
+					if (width > str.length) {
+						string pad = new String (' ', width - str.length);
+
+						if (left_align) {
+							result.Append (str);
+							result.Append (pad);
+						}
+						else {
+							result.Append (pad);
+							result.Append (str);
+						}
+					}
+					else
+						result.Append (str);
+
+					start = ptr;
+				}
+				else if (c == '}' && format[ptr] == '}') {
+					result.Append (format, start, ptr - start - 1);
+					start = ptr ++;
+				}
+			}
+
+			if (start < format.length)
+				result.Append (format.Substring (start));
+
+			return result.ToString ();
+		}
+
+		public static String Copy (String str) {
+			if (str == null)
+				throw new ArgumentNullException ();
+
+			int length = str.length;
+
+			String tmp = InternalAllocateStr(length);
+			InternalStrcpy(tmp, 0, str);
+			return tmp;
+		}
+
+		public static String Concat(Object obj) {
+			if (null == obj)
+				return String.Empty;
+
+			return obj.ToString();
+		}
+
+		public static String Concat(Object obj1, Object obj2) {
+			if (null == obj1)
+				obj1 = String.Empty;
+    
+			if (null == obj2)
+				obj2 = String.Empty;
+
+			return Concat(obj1.ToString(), obj2.ToString());
+		}
+
+		public static String Concat(Object obj1, Object obj2, Object obj3) {
+			if (null == obj1)
+				obj1 = String.Empty;
+    
+			if (null == obj2)
+				obj2 = String.Empty;
+    
+			if (null == obj3)
+				obj3 = String.Empty;
+    
+			return Concat(obj1.ToString(), obj2.ToString(), obj3.ToString());
+		}
+
+		public static String Concat(String s1, String s2) {
+			if (null == s1) {
+				if (null == s2) { return String.Empty; }
+				return s2;
+			}
+
+			if (null == s2) { return s1; }
+
+			String tmp = InternalAllocateStr(s1.length + s2.length);
+            
+			InternalStrcpy(tmp, 0, s1);
+			InternalStrcpy(tmp, s1.length, s2);
+            
+			return tmp;
+		}
+
+		public static String Concat(String s1, String s2, String s3) {
+			if (null == s1 && null == s2 && null == s3) {
+				return String.Empty;
+			}
+
+			if (null == s1) { s1 = String.Empty; }
+			if (null == s2) { s2 = String.Empty; }
+			if (null == s3) { s3 = String.Empty; }
+
+			String tmp = InternalAllocateStr(s1.length + s2.length + s3.length);
+
+			InternalStrcpy(tmp, 0, s1);
+			InternalStrcpy(tmp, s1.length, s2);
+			InternalStrcpy(tmp, s1.length + s2.length, s3);
+
+			return tmp;
+		}
+
+		public static String Concat(String s1, String s2, String s3, String s4) {
+			if (null == s1 && null == s2 && null == s3 && null == s4) {
+				return String.Empty;
+			}
+
+			if (null == s1) { s1 = String.Empty; }
+			if (null == s2) { s2 = String.Empty; }
+			if (null == s3) { s3 = String.Empty; }
+			if (null == s4) { s4 = String.Empty; }
+
+			String tmp = InternalAllocateStr(s1.length + s2.length + s3.length + s4.length);
+
+			InternalStrcpy(tmp, 0, s1);
+			InternalStrcpy(tmp, s1.length, s2);
+			InternalStrcpy(tmp, s1.length + s2.length, s3);
+			InternalStrcpy(tmp, s1.length + s2.length + s3.length, s4);
+
+			return tmp;
+		}
+
+		public static String Concat(params Object[] args) {
+			string [] strings;
+			int len, i, currentpos;
+
+			if (null == args)
+				throw new ArgumentNullException ();
+
+			strings = new string [args.Length];
+			len = 0;
+			i = 0;
+			foreach (object arg in args) {
+				/* use Empty for each null argument */
+				if (arg == null)
+					strings[i] = String.Empty;
+				else
+					strings[i] = arg.ToString ();
+				len += strings[i].length;
+				i++;
+			}
+
+			if (len == 0)
+				return String.Empty;
+
+			currentpos = 0;
+
+			String tmp = InternalAllocateStr(len);
+			for (i = 0; i < strings.Length; i++) {
+				InternalStrcpy(tmp, currentpos, strings[i]);
+				currentpos += strings[i].length;
+			}
+
+			return tmp;
+		}
+
+		public static String Concat(params String[] values) {
+			int len, i, currentpos;
+
+			if (values == null)
+				throw new ArgumentNullException ();
+
+			len = 0;
+			foreach (string value in values)
+				len += value != null ? value.length : 0;
+
+			if (len == 0)
+				return String.Empty;
+
+			currentpos = 0;
+
+			String tmp = InternalAllocateStr(len);
+			for (i = 0; i < values.Length; i++) {
+				if (values[i] == null)
+					continue;
+
+				InternalStrcpy(tmp, currentpos, values[i]);
+				currentpos += values[i].length;
+			}	
+	
+			return tmp;
+		}
+
+		public String Insert(int sindex, String value) {
+			if (null == value)
+				throw new ArgumentNullException();
+
+			if (sindex < 0 || sindex > this.length)
+				throw new ArgumentOutOfRangeException();
+	
+			return InternalInsert(sindex, value);
+		}
+
+
+		public static string Intern (string str) {
+			if (null == str)
+				throw new ArgumentNullException ();
+
+			return InternalIntern(str);
+		}
+
+		public static string IsInterned (string str) {
+			if (null == str)
+				throw new ArgumentNullException();
+
+			return InternalIsInterned(str);
+		}
+	
+		public static string Join (string separator, string [] value) {
+			if (value == null)
+				throw new ArgumentNullException ();
+
+			return Join(separator, value, 0, value.Length);
+		}
+
+		public static string Join(string separator, string[] value, int sindex, int count) {
+			if (value == null)
+				throw new ArgumentNullException ();
+
+			if (sindex + count > value.Length)
+				throw new ArgumentOutOfRangeException ();
+
+			if (sindex == value.Length)
+				return String.Empty;
+
+			return InternalJoin(separator, value, sindex, count);
+		}
+
+		bool IConvertible.ToBoolean (IFormatProvider provider) {
+			return Convert.ToBoolean (this);
+		}
+		
+		byte IConvertible.ToByte (IFormatProvider provider) {
+			return Convert.ToByte (this);
+		}
+		
+		char IConvertible.ToChar (IFormatProvider provider) {
+			return Convert.ToChar (this);
+		}
+
+		DateTime IConvertible.ToDateTime (IFormatProvider provider) {
+			return Convert.ToDateTime (this);
+		}
+
+		decimal IConvertible.ToDecimal (IFormatProvider provider) {
+			return Convert.ToDecimal (this);
+		}
+
+		double IConvertible.ToDouble (IFormatProvider provider) {
+			return Convert.ToDouble (this);
+		}
+
+		short IConvertible.ToInt16 (IFormatProvider provider) {
+			return Convert.ToInt16 (this);
+		}
+
+		int IConvertible.ToInt32 (IFormatProvider provider) {
+			return Convert.ToInt32 (this);
+		}
+
+		long IConvertible.ToInt64 (IFormatProvider provider) {
+			return Convert.ToInt64 (this);
+		}
+	
+		[CLSCompliant(false)]
+		sbyte IConvertible.ToSByte (IFormatProvider provider) {
+			return Convert.ToSByte (this);
+		}
+
+		float IConvertible.ToSingle (IFormatProvider provider) {
+			return Convert.ToSingle (this);
+		}
+		string IConvertible.ToString (IFormatProvider format) {
+			return this;
+		}
+
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider) {
+			return Convert.ToType (this, conversionType,  provider);
+		}
+
+		[CLSCompliant(false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider) {
+			return Convert.ToUInt16 (this);
+		}
+
+		[CLSCompliant(false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider) {
+			return Convert.ToUInt32 (this);
+		}
+
+		[CLSCompliant(false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider) {
+			return Convert.ToUInt64 (this);
+		}
+
+		TypeCode IConvertible.GetTypeCode () {
+			return TypeCode.String;
+		}
+
+		public int Length {
+			get {
+				return length;
+			}
+		}
+
+		public CharEnumerator GetEnumerator () {
+			return new CharEnumerator (this);
+		}
+		
+		IEnumerator IEnumerable.GetEnumerator () {
+			return new CharEnumerator (this);
+		}
+
+		private static void ParseFormatSpecifier (string str, ref int ptr, out int n, out int width, out bool left_align, out string format) {
+			// parses format specifier of form:
+			//   N,[\ +[-]M][:F]}
+			//
+			// where:
+
+			try {
+				// N = argument number (non-negative integer)
+			
+				n = ParseDecimal (str, ref ptr);
+				if (n < 0)
+					throw new FormatException ("Input string was not in correct format.");
+				
+				// M = width (non-negative integer)
+
+				if (str[ptr] == ',') {
+					// White space between ',' and number or sign.
+					int start = ++ptr;
+					while (Char.IsWhiteSpace (str [ptr]))
+						++ptr;
+
+					format = str.Substring (start, ptr - start);
+
+					left_align = (str [ptr] == '-');
+					if (left_align)
+						++ ptr;
+
+					width = ParseDecimal (str, ref ptr);
+					if (width < 0)
+						throw new FormatException ("Input string was not in correct format.");
+				}
+				else {
+					width = 0;
+					left_align = false;
+					format = "";
+				}
+
+				// F = argument format (string)
+
+				if (str[ptr] == ':') {
+					int start = ++ ptr;
+					while (str[ptr] != '}')
+						++ ptr;
+
+					format += str.Substring (start, ptr - start);
+				}
+				else
+					format = null;
+
+				if (str[ptr ++] != '}')
+					throw new FormatException ("Input string was not in correct format.");
+			}
+			catch (IndexOutOfRangeException) {
+				throw new FormatException ("Input string was not in correct format.");
+			}
+		}
+
+		private static int ParseDecimal (string str, ref int ptr) {
+			int p = ptr;
+			int n = 0;
+			while (true) {
+				char c = str[p];
+				if (c < '0' || '9' < c)
+					break;
+
+				n = n * 10 + c - '0';
+				++ p;
+			}
+
+			if (p == ptr)
+				return -1;
+			
+			ptr = p;
+			return n;
+		}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static string InternalJoin(string separator, string[] value, int sindex, int count);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern String InternalInsert(int sindex, String value);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern String InternalReplace(char oldChar, char newChar);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern String InternalReplace(String oldValue, String newValue);
+    
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern String InternalRemove(int sindex, int count);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern void InternalCopyTo(int sindex, char[] dest, int dindex, int count);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern String[] InternalSplit(char[] separator, int count);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern String InternalTrim(char[] chars, int typ);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern int InternalIndexOf(char value, int sindex, int count);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern int InternalIndexOf(string value, int sindex, int count);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern int InternalIndexOfAny(char [] arr, int sindex, int count);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern int InternalLastIndexOf(char value, int sindex, int count);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern int InternalLastIndexOf(String value, int sindex, int count);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern int InternalLastIndexOfAny(char [] anyOf, int sindex, int count);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern String InternalPad(int width, char chr, bool right);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern String InternalToLower();
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern String InternalToUpper();
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static String InternalAllocateStr(int length);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void InternalStrcpy(String dest, int destPos, String src);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static void InternalStrcpy(String dest, int destPos, String src, int startPos, int count);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static string InternalIntern(string str);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static string InternalIsInterned(string str);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static int InternalCompare(String s1, int i1, String s2, int i2, int length, bool inCase);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private extern static bool InternalEquals(String s1, String s2);
+	}
+}
diff --git a/mcs/class/corlib/System/SystemException.cs b/mcs/class/corlib/System/SystemException.cs
new file mode 100644
index 00000000000..39a4f411296
--- /dev/null
+++ b/mcs/class/corlib/System/SystemException.cs
@@ -0,0 +1,39 @@
+//
+// System.SystemException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.Serialization;
+using System;
+using System.Globalization;
+
+namespace System {
+
+	[Serializable]
+	public class SystemException : Exception {
+		// Constructors
+		public SystemException ()
+			: base (Locale.GetText ("A system exception has occurred."))
+		{
+		}
+
+		public SystemException (string message)
+			: base (message)
+		{
+		}
+
+		protected SystemException(SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+		
+		public SystemException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/TODO b/mcs/class/corlib/System/TODO
new file mode 100644
index 00000000000..065809deedb
--- /dev/null
+++ b/mcs/class/corlib/System/TODO
@@ -0,0 +1,22 @@
+System.Object:
+	Need a mechanism for getting an object underlying type.
+
+System.ValueType:
+	Need to lock memory and "scan" the actual contents to compute
+	hash code and do comparissions.  Should be simple to do with
+	C#, the problem is figuring out the size of the object.
+
+System.String:
+	Need to implement the Format() and CompareOrdinal() methods 
+	as we all implement all of the methods that take into account 
+	CultureInfo or Encoding stuff.
+
+System.Array:
+	It's not possible to test to see if the whole thing works, as
+	GetValue() and SetValue() make calls into the runtime. However,
+	I've tried my implementations of things like BinarySearch() and
+	Sort() on the MS-provided System.Array and they seem to work fine.
+	According to the spec, System.Array implements the IList interface.
+	The spec doesn't have the methods for those interfaces, however,
+	the class doesn't (yet) implement that interface and those methods
+	are not (yet) written.
diff --git a/mcs/class/corlib/System/TODOAttribute.cs b/mcs/class/corlib/System/TODOAttribute.cs
new file mode 100644
index 00000000000..0920ce8f92d
--- /dev/null
+++ b/mcs/class/corlib/System/TODOAttribute.cs
@@ -0,0 +1,37 @@
+//
+// TODOAttribute.cs
+//
+// Author:
+//   Ravi Pratap (ravi@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+
+	/// <summary>
+	///   The TODO attribute is used to flag all incomplete bits in our class libraries
+	/// </summary>
+	///
+	/// <remarks>
+	///   Use this to decorate any element which you think is not complete
+	/// </remarks>
+	[AttributeUsage (AttributeTargets.All, AllowMultiple=true)]
+	public class MonoTODOAttribute : Attribute {
+
+		private string comment;
+		
+		public MonoTODOAttribute ()
+		{}
+
+		public MonoTODOAttribute (string comment)
+		{
+			this.comment = comment;
+		}
+
+		public string Comment
+		{
+			get { return comment; }
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/ThreadStaticAttribute.cs b/mcs/class/corlib/System/ThreadStaticAttribute.cs
new file mode 100644
index 00000000000..97d06667a6b
--- /dev/null
+++ b/mcs/class/corlib/System/ThreadStaticAttribute.cs
@@ -0,0 +1,20 @@
+//
+// System.ThreadStaticAttribute.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System
+{
+	[AttributeUsage (AttributeTargets.Field)]
+	[Serializable]
+	public class ThreadStaticAttribute : Attribute
+	{
+		// Constructors
+		public ThreadStaticAttribute () : base ()
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/TimeSpan.cs b/mcs/class/corlib/System/TimeSpan.cs
new file mode 100644
index 00000000000..e9976a3173d
--- /dev/null
+++ b/mcs/class/corlib/System/TimeSpan.cs
@@ -0,0 +1,551 @@
+//
+// System.TimeSpan.cs
+//
+// author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (C) 2001 Duco Fijma
+//
+
+using System.Globalization;
+
+namespace System {
+
+[Serializable]
+public struct TimeSpan :  IComparable  {
+
+	private long _ticks;
+
+	public TimeSpan (long value) { _ticks = value; }
+	public TimeSpan (int hours, int minutes, int seconds) 
+		: this(false, 0, hours, minutes, seconds, 0, 0) {}
+	public TimeSpan (int days, int hours, int minutes, int seconds) 
+		: this(false, days, hours, minutes, seconds, 0, 0) {}
+	public TimeSpan (int days, int hours, int minutes, int seconds, int milliseconds)
+		: this(false, days, hours, minutes, seconds, milliseconds, 0) {}
+
+	internal TimeSpan (bool sign, int days, int hours, int minutes, int seconds, int milliseconds, long ticks)
+	{
+		checked {
+			_ticks = TicksPerDay * days + 
+				TicksPerHour * hours +
+				TicksPerMinute * minutes +
+				TicksPerSecond * seconds +
+				TicksPerMillisecond * milliseconds +
+				ticks;
+			if ( sign ) {
+				_ticks = -_ticks;
+			}
+		}
+	}
+	
+	public static readonly TimeSpan MaxValue = new TimeSpan (long.MaxValue);
+	public static readonly TimeSpan MinValue = new TimeSpan (long.MinValue);
+	public const long TicksPerDay = 864000000000L;
+	public const long TicksPerHour = 36000000000L;
+	public const long TicksPerMillisecond = 10000L;
+	public const long TicksPerMinute = 600000000L;
+	public const long TicksPerSecond = 10000000L;
+	public static readonly TimeSpan Zero = new TimeSpan (0L);
+
+	public int Days
+	{
+		get {
+			return (int) TotalDays;
+		}
+	}
+
+	public int Hours
+	{
+		get {
+			return (int) (_ticks % TicksPerDay / TicksPerHour);
+		}
+	}
+
+	public int Milliseconds
+	{
+		get
+		{
+			return (int) (_ticks % TicksPerSecond / TicksPerMillisecond);
+		}
+	}
+
+	public int Minutes
+	{
+		get
+		{
+			return (int) (_ticks % TicksPerHour / TicksPerMinute);
+		}
+	}
+
+	public int Seconds
+	{
+		get
+		{
+			return (int) (_ticks % TicksPerMinute / TicksPerSecond);
+		}
+	}
+
+	public long Ticks
+	{ 
+		get
+		{
+			return _ticks;
+		}
+	}
+
+	public double TotalDays
+	{
+		get
+		{
+			return (double) _ticks / TicksPerDay;
+		}
+	}
+
+	public double TotalHours
+	{
+		get
+		{
+			return (double) _ticks / TicksPerHour;
+		}
+	}
+
+	public double TotalMilliseconds
+	{
+		get
+		{
+			return (double) _ticks  / TicksPerMillisecond;
+		}
+	}
+
+	public double TotalMinutes
+	{
+		get {
+			return (double) _ticks / TicksPerMinute;
+		}
+	}
+
+	public double TotalSeconds
+	{
+		get {
+			return (double) _ticks / TicksPerSecond;
+		}
+	}
+
+	public TimeSpan Add (TimeSpan ts)
+	{
+		checked {
+			return new TimeSpan (_ticks + ts.Ticks);
+		}
+	}
+
+	public static int Compare (TimeSpan t1, TimeSpan t2)
+	{
+		if (t1._ticks < t2._ticks) {
+			return -1;
+		}
+		else if (t1._ticks > t2._ticks) {
+			return 1;
+		}
+		else {
+			return 0;
+		}
+	}
+
+	public int CompareTo (object value)
+	{
+		if (value == null )
+			return 1;
+
+		if (!(value is TimeSpan)) {
+			throw new ArgumentException (Locale.GetText (
+				"Argument of System.TimeSpan.CompareTo should be a TimeSpan"));
+		}
+	
+		return Compare(this, (TimeSpan) value);
+	}
+
+	public TimeSpan Duration ()
+	{
+		checked {
+			return new TimeSpan (Math.Abs (_ticks));
+		}
+	}
+
+	public override bool Equals (object value)
+	{
+		if (!(value is TimeSpan)) {
+			return false;
+		}
+		return Equals (this, (TimeSpan) value);
+	}
+
+	public static bool Equals (TimeSpan t1, TimeSpan t2)
+	{
+		return t1._ticks == t2._ticks;
+	}
+
+	// Implementing FromDays -> FromHours -> FromMinutes -> FromSeconds ->
+	// FromMilliseconds as done here is probably not the most efficient
+	// way. 
+	public static TimeSpan FromDays (double value)
+	{
+		if (Double.IsNaN (value) || Double.IsNegativeInfinity (value)) {
+			return MinValue;
+		}
+
+		if (Double.IsPositiveInfinity (value)) {
+			return MaxValue;
+		}
+
+		return new TimeSpan ((int) value,0,0,0,0) + FromHours ((value - ((int) value)) * 24);
+	}
+
+	public static TimeSpan FromHours (double value)
+	{
+		if (Double.IsNaN (value) || Double.IsNegativeInfinity (value)) {
+			return MinValue;
+		}
+
+		if (Double.IsPositiveInfinity (value)) {
+			return MaxValue;
+		}
+
+		return new TimeSpan ((int) value,0,0) + FromMinutes ((value - ((int) value)) * 60);
+	}
+
+	public static TimeSpan FromMinutes (double value)
+	{
+		if (Double.IsNaN (value) || Double.IsNegativeInfinity (value)) {
+			return MinValue;
+		}
+
+		if (Double.IsPositiveInfinity (value)) {
+			return MaxValue;
+		}
+
+		return new TimeSpan (0, (int) value, 0) + FromSeconds((value - ((int) value)) * 60);
+	}
+
+	public static TimeSpan FromSeconds (double value)
+	{
+		if (Double.IsNaN (value) || Double.IsNegativeInfinity (value)) {
+			return MinValue;
+		}
+
+		if (Double.IsPositiveInfinity (value)) {
+			return MaxValue;
+		}
+
+		return new TimeSpan (0, 0, 0, (int) value) + FromMilliseconds((value - ((int) value)) * 1000);
+
+	}
+
+	public static TimeSpan FromMilliseconds (double value)
+	{
+		if (Double.IsNaN (value) || Double.IsNegativeInfinity (value)) {
+			return MinValue;
+		}
+
+		if (Double.IsPositiveInfinity (value)) {
+			return MaxValue;
+		}
+
+		return new TimeSpan (0, 0, 0, 0, (int) value);
+	}
+
+	public static TimeSpan FromTicks (long value)
+	{
+		return new TimeSpan (value);
+	}
+
+	public override int GetHashCode ()
+	{
+		return _ticks.GetHashCode ();
+	}
+
+	public TimeSpan Negate ()
+	{
+		checked {
+			return new TimeSpan (-_ticks);
+		}
+	}
+
+	public static TimeSpan Parse (string s)
+	{
+		if (s == null) {
+			throw new ArgumentNullException (
+				Locale.GetText ("null reference passed to TimeSpan.Parse"));
+		}
+
+		Parser p = new Parser (s); 
+		return p.Execute ();
+	}
+
+	public TimeSpan Subtract (TimeSpan ts)
+	{
+		checked {
+			return new TimeSpan (_ticks - ts.Ticks);
+		}
+	}
+
+	public override string ToString ()
+	{
+		string res = "";	
+
+		if (_ticks < 0) {
+			res += "-";
+		}
+
+		// We need to take absolute values of all components.
+		// Can't handle negative timespans by negating the TimeSpan
+		// as a whole. This would lead to an overflow for the 
+		// degenerate case "TimeSpan.MinValue.ToString()".
+		if (Days != 0) {
+			res += Math.Abs (Days) + "." ;
+		}
+
+		res += string.Format ("{0:D2}:{1:D2}:{2:D2}", Math.Abs(Hours), Math.Abs(Minutes), Math.Abs(Seconds));
+
+		int fractional = (int) Math.Abs (_ticks % TicksPerSecond);
+		if (fractional != 0) {
+			res += string.Format (".{0:D7}", fractional);
+		}
+ 
+		return res;
+	}
+
+	public static TimeSpan operator + (TimeSpan t1, TimeSpan t2)
+	{
+		return t1.Add (t2);
+	}
+
+	public static bool operator == (TimeSpan t1, TimeSpan t2)
+	{
+		return Compare (t1, t2) == 0;
+	}
+
+	public static bool operator > (TimeSpan t1, TimeSpan t2)
+	{
+		return Compare (t1, t2) == 1;
+	}
+
+	public static bool operator >= (TimeSpan t1, TimeSpan t2)
+	{
+		return Compare (t1, t2) != -1;
+	}
+
+	public static bool operator != (TimeSpan t1, TimeSpan t2)
+	{
+		return Compare (t1, t2) != 0;
+	}
+
+	public static bool operator < (TimeSpan t1, TimeSpan t2)
+	{
+		return Compare (t1, t2) == -1;
+	}
+
+	public static bool operator <= (TimeSpan t1, TimeSpan t2)
+	{
+		return Compare (t1, t2) != 1;
+	}
+
+	public static TimeSpan operator - (TimeSpan t1, TimeSpan t2)
+	{
+		return t1.Subtract (t2);
+	}
+
+	public static TimeSpan operator - (TimeSpan t)
+	{
+		return t.Negate ();
+	}
+
+	public static TimeSpan operator + (TimeSpan t)
+	{
+		return t;
+	}
+
+// Class Parser implements simple parser for TimeSpan::Parse
+internal class Parser {
+
+	private string _src;
+	private int _cur;
+	private int _length;
+
+	public Parser (string src)
+	{
+		_src = src;
+		Reset ();
+	}
+
+	public void Reset ()
+	{
+		_cur = 0;
+		_length = _src.Length;
+	}
+
+	public bool AtEnd
+	{
+		get {
+			return _cur >= _length;
+		}
+	}
+
+	private void ThrowFormatException() 
+	{
+		throw new FormatException (Locale.GetText ("Invalid format for TimeSpan.Parse"));
+	}
+
+	// All "Parse" functions throw a FormatException on syntax error.
+	// Their return value is semantic value of the item parsed.
+
+	// Range checking is spread over three different places:
+	// 1) When parsing "int" values, an exception is thrown immediately
+	//    when the value parsed exceeds the maximum value for an int.
+	// 2) An explicit check is built in that checks for hours > 23 and
+	//    for minutes and seconds > 59.
+	// 3) Throwing an exceptions for a final TimeSpan value > MaxValue
+	//    or < MinValue is left to the TimeSpan constructor called.
+
+	// Parse zero or more whitespace chars.
+	private void ParseWhiteSpace ()
+	{
+		while (!AtEnd && Char.IsWhiteSpace (_src, _cur)) {
+			_cur++; 
+		}
+	}
+
+	// Parse optional sign character.
+	private bool ParseSign () 
+	{
+		bool res = false;
+
+		if (!AtEnd && _src[_cur] == '-') { 
+			res = true;
+			_cur++;
+		}
+
+		return res;
+	}
+
+	// Parse simple int value
+	private int ParseInt ()
+	{
+		int res = 0;
+		int count = 0;
+
+		while (!AtEnd && Char.IsDigit (_src, _cur)) {
+			checked {
+				res = res*10 + _src[_cur] - '0';
+			}
+			_cur++;
+			count++;
+		}
+		
+		if (count == 0) {
+			ThrowFormatException ();
+		}
+
+		return res;
+	}
+
+	// Parse optional dot
+	private bool ParseOptDot ()
+	{
+		if (AtEnd) {
+			return false;
+		}
+		
+		if (_src[_cur] == '.') {
+			_cur++;
+			return true;
+		}
+		else {
+			return false;
+		}
+	}	
+	
+	// Parse NON-optional colon 
+	private void ParseColon ()
+	{
+		if (!AtEnd && _src[_cur] == ':') {
+			_cur++;
+		}
+		else {
+			ThrowFormatException ();
+		}
+	}
+
+	// Parse [1..7] digits, representing fractional seconds (ticks)
+	private long ParseTicks ()
+	{
+		long mag = 1000000;
+		long res = 0;
+		bool digitseen = false;
+		
+		while ( mag > 0 && !AtEnd && Char.IsDigit (_src, _cur) ) {
+			res = res + (_src[_cur] - '0') * mag;
+			_cur++;
+			mag = mag / 10;
+			digitseen = true;
+		}
+
+		if (!digitseen) {
+			ThrowFormatException ();
+		}
+
+		return res;
+	}
+
+	public TimeSpan Execute ()
+	{
+		bool sign;
+		int days;
+		int hours;
+		int minutes;
+		int seconds;
+		long ticks;
+
+		// Parse [ws][dd.]hh:mm:ss[.ff][ws]
+		ParseWhiteSpace ();
+		sign = ParseSign ();
+		days = ParseInt ();
+		if (ParseOptDot ()) {
+			hours = ParseInt ();
+		}
+		else {
+			hours = days;
+			days = 0;
+		}
+		ParseColon();
+		minutes = ParseInt ();
+		ParseColon();
+		seconds = ParseInt ();
+		if ( ParseOptDot () ) {
+			ticks = ParseTicks ();
+		}	
+		else {
+			ticks = 0;
+		}
+		ParseWhiteSpace ();
+
+		if ( !AtEnd ) {
+			ThrowFormatException ();
+		}
+
+		if ( hours > 23 || minutes > 59 || seconds > 59 ) {
+			throw new OverflowException (Locale.GetText (
+				"Value outside range in TimeSpan.Parse" ));
+		}
+
+		TimeSpan ts = new TimeSpan (sign, days, hours, minutes, seconds, 0, ticks);
+
+		return ts;
+	}	
+
+}
+
+} /* TimeSpan */
+}
+
+
diff --git a/mcs/class/corlib/System/TimeZone.cs b/mcs/class/corlib/System/TimeZone.cs
new file mode 100644
index 00000000000..62fd38ae5cd
--- /dev/null
+++ b/mcs/class/corlib/System/TimeZone.cs
@@ -0,0 +1,198 @@
+//
+// System.TimeZone.cs
+//
+// Author: Duncan Mak (duncan@ximian.com)
+// 	   Ajay Kumar Dwivedi (adwiv@yahoo.com)
+//         Martin Baulig (martin@gnome.org)
+//
+// (C) Ximian, Inc.
+//
+
+using System.Collections;
+using System.Globalization;
+using System.Runtime.CompilerServices;
+
+namespace System {
+	
+	[Serializable]
+	public abstract class TimeZone
+	{
+		// Fields
+		private static TimeZone currentTimeZone;
+		
+		// Constructor
+		protected TimeZone ()
+		{
+		}
+
+		// Properties
+		public static TimeZone CurrentTimeZone
+		{
+			get {
+				if (currentTimeZone == null)
+					currentTimeZone = new CurrentTimeZone ();
+
+				return currentTimeZone;
+			}
+		}
+		
+		public abstract string DaylightName
+		{
+			get;
+		}
+
+		public abstract string StandardName
+		{
+			get;
+		}
+
+		// Methods
+		public abstract DaylightTime GetDaylightChanges (int year);
+
+		public abstract TimeSpan GetUtcOffset (DateTime time);
+
+		public virtual bool IsDaylightSavingTime (DateTime time)
+		{
+			return IsDaylightSavingTime (time, GetDaylightChanges (time.Year));
+		}
+
+		public static bool IsDaylightSavingTime (DateTime time, DaylightTime daylightTimes)
+                {
+			if (daylightTimes == null)
+                                throw new ArgumentNullException ("daylightTimes");
+
+                        // If Start == End, then DST is off
+                        if (daylightTimes.Start.Ticks == daylightTimes.End.Ticks)
+                                return false;
+
+			//We are in the northern hemisphere.                           
+			if (daylightTimes.Start.Ticks < daylightTimes.End.Ticks) {
+                                if (daylightTimes.Start.Ticks < time.Ticks
+				    && daylightTimes.End.Ticks > time.Ticks)
+                                        return true; // time lies between Start and End
+
+			} else {  // We are in the southern hemisphere.
+				if (time.Year == daylightTimes.Start.Year && time.Year == daylightTimes.End.Year)
+                                        if (time.Ticks < daylightTimes.End.Ticks
+					    || time.Ticks > daylightTimes.Start.Ticks)
+                                                return true; // time is less than End OR more than Start 
+                        }
+
+			return false;
+                }
+		
+		public virtual DateTime ToLocalTime (DateTime time)
+		{
+			return time + GetUtcOffset (time);
+		}
+
+		public virtual DateTime ToUniversalTime (DateTime time)
+		{
+			return time - GetUtcOffset (time);
+		}
+	}
+
+	internal class CurrentTimeZone : TimeZone
+	{		
+		// Fields
+		private static string daylightName;
+                private static string standardName;
+
+                // A yearwise cache of DaylightTime.                 
+                private static Hashtable daylightCache = new Hashtable (1);
+		
+                // the offset when daylightsaving is not on.
+                private static TimeSpan utcOffsetWithOutDLS;
+
+                // the offset when daylightsaving is on.
+                private static TimeSpan utcOffsetWithDLS;
+
+		internal enum TimeZoneData {
+			DaylightSavingStartIdx,
+			DaylightSavingEndIdx,
+			UtcOffsetIdx,
+			AdditionalDaylightOffsetIdx
+		};
+
+		internal enum TimeZoneNames {
+			StandardNameIdx,
+			DaylightNameIdx
+		};
+
+		// Internal method to get timezone data.
+		//    data[0]:  start of daylight saving time (in DateTime ticks).
+		//    data[1]:  end of daylight saving time (in DateTime ticks).
+		//    data[2]:  utcoffset (in TimeSpan ticks).
+		//    data[3]:  additional offset when daylight saving (in TimeSpan ticks).
+		//    name[0]:  name of this timezone when not daylight saving.
+		//    name[1]:  name of this timezone when daylight saving.
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern bool GetTimeZoneData (int year,
+							    out Int64[] data,
+							    out string[] names);
+
+		// Constructor
+		internal CurrentTimeZone ()
+			: base ()
+		{
+			Int64[] data;
+			string[] names;
+
+			DateTime now = new DateTime(DateTime.GetNow ());			
+			if (!GetTimeZoneData (now.Year, out data, out names))
+				throw new NotSupportedException (Locale.GetText ("Can't get timezone name"));
+
+			standardName = Locale.GetText (names[(int)TimeZoneNames.StandardNameIdx]);
+			daylightName = Locale.GetText (names[(int)TimeZoneNames.DaylightNameIdx]);
+
+			utcOffsetWithOutDLS = new TimeSpan (data[(int)TimeZoneData.UtcOffsetIdx]);
+			utcOffsetWithDLS = new TimeSpan (data[(int)TimeZoneData.UtcOffsetIdx] + data[(int)TimeZoneData.AdditionalDaylightOffsetIdx]);
+		}
+
+		// Properties
+		public override string DaylightName
+                {
+                        get { return daylightName; }
+                }
+                
+                public override string StandardName 
+                {
+                        get { return standardName; }
+                }
+
+		// Methods
+		[MonoTODO]
+		public override DaylightTime GetDaylightChanges (int year)
+                {
+                        if (year < 1 || year > 9999)
+                                throw new ArgumentOutOfRangeException (year + " is not in a range between 1 and 9999.");
+
+                        if (daylightCache [year] == null) {
+				lock (this) {
+		                        if (daylightCache [year] == null) {
+						Int64[] data;
+						string[] names;
+
+						if (!GetTimeZoneData (year, out data, out names))
+							throw new ArgumentException (Locale.GetText ("Can't get timezone data for " + year));
+
+						DaylightTime dlt = new DaylightTime (new DateTime (data[(int)TimeZoneData.DaylightSavingStartIdx]),
+										     new DateTime (data[(int)TimeZoneData.DaylightSavingEndIdx]),
+										     new TimeSpan (data[(int)TimeZoneData.AdditionalDaylightOffsetIdx]));
+						daylightCache.Add (year, dlt);
+					};
+				};
+                        }
+
+			return (DaylightTime) daylightCache [year];
+                }
+
+		public override TimeSpan GetUtcOffset (DateTime time)
+		{
+                        if (IsDaylightSavingTime (time))
+                                return utcOffsetWithDLS;
+                        
+                        return utcOffsetWithOutDLS;
+                }
+	}
+}
diff --git a/mcs/class/corlib/System/Type.cs b/mcs/class/corlib/System/Type.cs
new file mode 100644
index 00000000000..9786a8b7d64
--- /dev/null
+++ b/mcs/class/corlib/System/Type.cs
@@ -0,0 +1,887 @@
+//
+// System.Type.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+// TODO: Mucho left to implement.
+//
+
+using System.Reflection;
+using System.Collections;
+using System.Runtime.CompilerServices;
+using System.Globalization;
+
+namespace System {
+
+	//
+	// FIXME: Implement the various IReflect dependencies
+	//
+
+	[MonoTODO]
+	[Serializable]
+	public abstract class Type : MemberInfo, IReflect {
+		
+		internal RuntimeTypeHandle _impl;
+
+		public static readonly char Delimiter = '.';
+		public static readonly Type[] EmptyTypes = {};
+		public static readonly MemberFilter FilterAttribute = new MemberFilter (FilterAttribute_impl);
+		public static readonly MemberFilter FilterName = new MemberFilter (FilterName_impl);
+		public static readonly MemberFilter FilterNameIgnoreCase = new MemberFilter (FilterNameIgnoreCase_impl);
+		public static readonly object Missing;
+
+		private const BindingFlags DefaultBindingFlags =
+		BindingFlags.Public | BindingFlags.Static | BindingFlags.Instance;
+
+		/* implementation of the delegates for MemberFilter */
+		static bool FilterName_impl (MemberInfo m, object filterCriteria)
+		{
+			string name = (string) filterCriteria;
+			return name.Equals (m.Name);
+		}
+		
+		static bool FilterNameIgnoreCase_impl (MemberInfo m, object filterCriteria)
+		{
+			string name = (string) filterCriteria;
+			return String.Compare (name, m.Name, true) == 0;
+		}
+		
+		[MonoTODO]
+		static bool FilterAttribute_impl (MemberInfo m, object filterCriteria)
+		{
+			throw new NotImplementedException ("FilterAttribute_impl");
+		}
+
+		protected Type ()
+		{
+		}
+
+		/// <summary>
+		///   The assembly where the type is defined.
+		/// </summary>
+		public abstract Assembly Assembly {
+			get;
+		}
+
+		/// <summary>
+		///   Gets the fully qualified name for the type including the
+		///   assembly name where the type is defined.
+		/// </summary>
+		public abstract string AssemblyQualifiedName {
+			get;
+		}
+
+		/// <summary>
+		///   Returns the Attributes associated with the type.
+		/// </summary>
+		public TypeAttributes Attributes {
+			get {
+				return GetAttributeFlagsImpl ();
+			}
+		}
+		
+		/// <summary>
+		///   Returns the basetype for this type
+		/// </summary>
+		public abstract Type BaseType {
+			get;
+		}
+			
+		/// <summary>
+		///   Returns the class that declares the member.
+		/// </summary>
+		public override Type DeclaringType {
+			get {
+				return null;
+			}
+		}
+
+		/// <summary>
+		///
+		/// </summary>
+		[MonoTODO]
+		public static Binder DefaultBinder {
+			get {
+				return null;
+			}
+		}
+		
+		/// <summary>
+		///    The full name of the type including its namespace
+		/// </summary>
+		public abstract string FullName {
+			get;
+		}
+
+		public abstract Guid GUID {
+			get;
+		}
+
+		public bool HasElementType {
+			get {
+				return HasElementTypeImpl ();
+			}
+		}
+
+		public bool IsAbstract {
+			get {
+				return (Attributes & TypeAttributes.Abstract) != 0;
+			}
+		}
+
+		public bool IsAnsiClass {
+			get {
+				return (Attributes & TypeAttributes.StringFormatMask)
+				== TypeAttributes.AnsiClass;
+			}
+		}
+
+		public bool IsArray {
+			get {
+				return IsArrayImpl ();
+			}
+		}
+
+		public bool IsAutoClass {
+			get {
+				return (Attributes & TypeAttributes.StringFormatMask) == TypeAttributes.AutoClass;
+			}
+		}
+
+		public bool IsAutoLayout {
+			get {
+				return (Attributes & TypeAttributes.LayoutMask) == TypeAttributes.AutoLayout;
+			}
+		}
+
+		public bool IsByRef {
+			get {
+				return IsByRefImpl ();
+			}
+		}
+
+		public bool IsClass {
+			get {
+				if (this == typeof (System.Enum) || this == typeof (System.ValueType))
+					return true;
+				if (IsInterface)
+					return false;
+				return !type_is_subtype_of (this, typeof (System.ValueType), false);
+			}
+		}
+
+		public bool IsCOMObject {
+			get {
+				return IsCOMObjectImpl ();
+			}
+		}
+
+		public bool IsContextful {
+			get {
+				return IsContextfulImpl ();
+			}
+		}
+
+		public bool IsEnum {
+			get {
+				return type_is_subtype_of (this, typeof (System.Enum), false) &&
+					this != typeof (System.Enum);
+			}
+		}
+
+		public bool IsExplicitLayout {
+			get {
+				return (Attributes & TypeAttributes.LayoutMask) == TypeAttributes.ExplicitLayout;
+			}
+		}
+
+		public bool IsImport {
+			get {
+				return (Attributes & TypeAttributes.Import) != 0;
+			}
+		}
+
+		public bool IsInterface {
+			get {
+				return (Attributes & TypeAttributes.ClassSemanticsMask) == TypeAttributes.Interface;
+			}
+		}
+
+		public bool IsLayoutSequential {
+			get {
+				return (Attributes & TypeAttributes.LayoutMask) == TypeAttributes.SequentialLayout;
+			}
+		}
+
+		public bool IsMarshalByRef {
+			get {
+				return IsMarshalByRefImpl ();
+			}
+		}
+
+		public bool IsNestedAssembly {
+			get {
+				return (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedAssembly;
+			}
+		}
+
+		public bool IsNestedFamANDAssem {
+			get {
+				return (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamANDAssem;
+			}
+		}
+
+		public bool IsNestedFamily {
+			get {
+				return (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamily;
+			}
+		}
+
+		public bool IsNestedFamORAssem {
+			get {
+				return (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedFamORAssem;
+			}
+		}
+
+		public bool IsNestedPrivate {
+			get {
+				return (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedPrivate;
+			}
+		}
+
+		public bool IsNestedPublic {
+			get {
+				return (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.NestedPublic;
+			}
+		}
+
+		public bool IsNotPublic {
+			get {
+				return !IsPublic;
+			}
+		}
+
+		public bool IsPointer {
+			get {
+				return IsPointerImpl ();
+			}
+		}
+
+		public bool IsPrimitive {
+			get {
+				return IsPrimitiveImpl ();
+			}
+		}
+
+		public bool IsPublic {
+			get {
+				return (Attributes & TypeAttributes.VisibilityMask) == TypeAttributes.Public;
+			}
+		}
+
+		public bool IsSealed {
+			get {
+				return (Attributes & TypeAttributes.Sealed) != 0;
+			}
+		}
+
+		public bool IsSerializable {
+			get {
+				return (Attributes & TypeAttributes.Serializable) != 0;
+			}
+		}
+
+		public bool IsSpecialName {
+			get {
+				return (Attributes & TypeAttributes.SpecialName) != 0;
+			}
+		}
+
+		public bool IsUnicodeClass {
+			get {
+				return (Attributes & TypeAttributes.StringFormatMask) == TypeAttributes.UnicodeClass;
+			}
+		}
+
+		public bool IsValueType {
+			get {
+				return IsValueTypeImpl ();
+			}
+		}
+
+		public override MemberTypes MemberType {
+			get {return MemberTypes.TypeInfo;}
+		}
+
+		public abstract Module Module {get;}
+	
+		public abstract string Namespace {get;}
+
+		public override Type ReflectedType {
+			get {
+				return null;
+			}
+		}
+
+		public abstract RuntimeTypeHandle TypeHandle {get;}
+
+		public ConstructorInfo TypeInitializer {
+			get {
+				return GetConstructorImpl (
+					BindingFlags.Public | BindingFlags.NonPublic | BindingFlags.Static,
+					null,
+					CallingConventions.Any,
+					EmptyTypes,
+					null);
+			}
+		}
+
+		public abstract Type UnderlyingSystemType {get;}
+
+		public override bool Equals (object o)
+		{
+			if (o == null)
+				return false;
+			
+			// TODO: return UnderlyingSystemType == o.UnderlyingSystemType;
+			Type cmp = o as Type;
+			if (cmp == null)
+				return false;
+			return Equals (cmp);
+		}
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern bool Equals (Type type);
+		
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern Type internal_from_handle (RuntimeTypeHandle handle);
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern Type internal_from_name (string name);
+		
+		public static Type GetType(string typeName)
+		{
+			return internal_from_name (typeName);
+		}
+
+		public static Type GetType(string typeName, bool throwOnError)
+		{
+			// LAMESPEC: what kinds of errors cause exception to be thrown?
+			return internal_from_name (typeName);
+		}
+
+		[MonoTODO]
+		public static Type GetType(string typeName, bool throwOnError, bool ignoreCase)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static Type[] GetTypeArray (object[] args) {
+			if (args == null)
+				throw new ArgumentNullException ("args");
+
+			Type[] ret;
+			ret = new Type [args.Length];
+			for (int i = 0; i < args.Length; ++i)
+				ret [i] = args[i].GetType ();
+			return ret;
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern static TypeCode GetTypeCode (Type type);
+
+		[MonoTODO]
+		public static Type GetTypeFromCLSID (Guid clsid)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static Type GetTypeFromCLSID (Guid clsid, bool throwOnError)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static Type GetTypeFromCLSID (Guid clsid, string server)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static Type GetTypeFromCLSID (Guid clsid, string server, bool throwOnError)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static Type GetTypeFromHandle (RuntimeTypeHandle handle)
+		{ 
+			return internal_from_handle (handle);
+		}
+
+		[MonoTODO]
+		public static Type GetTypeFromProgID (string progID)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static Type GetTypeFromProgID (string progID, bool throwOnError)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static Type GetTypeFromProgID (string progID, string server)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public static Type GetTypeFromProgID (string progID, string server, bool throwOnError)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public static RuntimeTypeHandle GetTypeHandle (object o)
+		{
+			return o.GetType().TypeHandle;
+		}
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		internal static extern bool type_is_subtype_of (Type a, Type b, bool check_interfaces);
+		
+		public virtual bool IsSubclassOf (Type c)
+		{
+			return type_is_subtype_of (this, c, false);
+		}
+
+		[MonoTODO]
+		public virtual Type[] FindInterfaces (TypeFilter filter, object filterCriteria)
+		{
+			// FIXME
+			throw new NotImplementedException ();
+		}
+		
+		public Type GetInterface (string name) {
+			return GetInterface (name, false);
+		}
+
+		public abstract Type GetInterface (string name, bool ignoreCase);
+
+		public virtual InterfaceMapping GetInterfaceMap (Type interfaceType) {
+			throw new NotImplementedException ();
+		}
+
+		public abstract Type[] GetInterfaces ();
+
+		[MonoTODO]
+		public virtual bool IsAssignableFrom (Type c)
+		{
+			// FIXME
+			return type_is_subtype_of (c, this, true);
+		}
+
+		public virtual bool IsInstanceOfType (object o) {
+			if (o != null) {
+				return o.GetType().IsSubclassOf (this);
+			}
+			return false;
+		}
+
+		public virtual int GetArrayRank ()
+		{
+			throw new NotSupportedException ();	// according to MSDN
+		}
+
+		public abstract Type GetElementType ();
+
+		public EventInfo GetEvent (string name)
+		{
+			return GetEvent (name, DefaultBindingFlags);
+		}
+
+		public abstract EventInfo GetEvent (string name, BindingFlags bindingAttr);
+
+		public virtual EventInfo[] GetEvents ()
+		{
+			return GetEvents (DefaultBindingFlags);
+		}
+
+		public abstract EventInfo[] GetEvents (BindingFlags bindingAttr);
+
+		public FieldInfo GetField( string name)
+		{
+			return GetField (name, DefaultBindingFlags);
+		}
+
+		public abstract FieldInfo GetField( string name, BindingFlags bindingAttr);
+
+		public FieldInfo[] GetFields ()
+		{
+			return GetFields (DefaultBindingFlags);
+		}
+
+		public abstract FieldInfo[] GetFields (BindingFlags bindingAttr);
+		
+		public override int GetHashCode()
+		{
+			return (int)_impl.Value;
+		}
+
+		public MemberInfo[] GetMember( string name)
+		{
+			return GetMember (name, DefaultBindingFlags);
+		}
+		
+		public virtual MemberInfo[] GetMember( string name, BindingFlags bindingAttr)
+		{
+			return GetMember (name, MemberTypes.All, bindingAttr);
+		}
+
+		public virtual MemberInfo[] GetMember (string name, MemberTypes type,
+						       BindingFlags bindingAttr)
+		{
+			return FindMembers (type, bindingAttr, FilterName, name);
+		}
+
+		public MemberInfo[] GetMembers()
+		{
+			return GetMembers (DefaultBindingFlags);
+		}
+
+		public abstract MemberInfo[] GetMembers (BindingFlags bindingAttr);
+
+		public MethodInfo GetMethod (string name)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			return GetMethodImpl (name, DefaultBindingFlags, null, CallingConventions.Any, null, null);
+		}
+
+		public MethodInfo GetMethod (string name, BindingFlags bindingAttr)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			
+			return GetMethodImpl (name, bindingAttr, null, CallingConventions.Any, null, null);
+		}
+		
+		[MonoTODO]
+		public MethodInfo GetMethod (string name, Type[] types)
+		{
+			return GetMethod (name, DefaultBindingFlags, null, CallingConventions.Any, types, null);
+		}
+
+		public MethodInfo GetMethod( string name, Type[] types, ParameterModifier[] modifiers)
+		{
+			return GetMethod (name, DefaultBindingFlags, null,
+					  CallingConventions.Any, types, modifiers);
+		}
+
+		public MethodInfo GetMethod (string name, BindingFlags bindingAttr, Binder binder,
+					     Type[] types, ParameterModifier[] modifiers)
+		{
+			
+			return GetMethod (name, bindingAttr, binder,
+					  CallingConventions.Any, types, modifiers);
+		}
+
+		public MethodInfo GetMethod (string name, BindingFlags bindingAttr,
+					     Binder binder, CallingConventions callConvention,
+					     Type[] types, ParameterModifier[] modifiers)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (types == null)
+				throw new ArgumentNullException ("types");
+
+			return GetMethodImpl (name, bindingAttr, binder, callConvention, types, modifiers);
+		}
+
+		protected abstract MethodInfo GetMethodImpl (string name, BindingFlags bindingAttr,
+							     Binder binder,
+							     CallingConventions callConvention,
+							     Type[] types, ParameterModifier[] modifiers);
+
+		public MethodInfo[] GetMethods ()
+		{
+			return GetMethods (DefaultBindingFlags);
+		}
+
+		public abstract MethodInfo[] GetMethods (BindingFlags bindingAttr);
+
+		public Type GetNestedType (string name)
+		{
+			return GetNestedType (name, DefaultBindingFlags);
+		}
+
+		public abstract Type GetNestedType (string name, BindingFlags bindingAttr);
+
+		public Type[] GetNestedTypes ()
+		{
+			return GetNestedTypes (DefaultBindingFlags);
+		}
+
+		public abstract Type[] GetNestedTypes (BindingFlags bindingAttr);
+
+
+		public PropertyInfo[] GetProperties ()
+		{
+			return GetProperties (DefaultBindingFlags);
+		}
+
+		public abstract PropertyInfo[] GetProperties (BindingFlags bindingAttr);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern PropertyInfo get_property (Type type, string name, Type[] types);
+		
+
+		public PropertyInfo GetProperty (string name)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+
+			return GetPropertyImpl (name, DefaultBindingFlags, null, null, new Type[0], null);
+		}
+
+		public PropertyInfo GetProperty (string name, BindingFlags bindingAttr)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			return GetPropertyImpl (name, bindingAttr, null, null, new Type[0], null);
+		}
+
+		public PropertyInfo GetProperty (string name, Type returnType)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			return GetPropertyImpl (name, DefaultBindingFlags, null, returnType, new Type[0], null);
+		}
+
+		[MonoTODO]
+		public PropertyInfo GetProperty (string name, Type[] types)
+		{
+			// TODO: return GetProperty (name, DefaultBindingFlags, null, null, types, null);
+			return get_property (this, name, types);
+		}
+
+		public PropertyInfo GetProperty (string name, Type returnType, Type[] types)
+		{
+			return GetProperty (name, DefaultBindingFlags, null, returnType, types, null);
+		}
+
+		public PropertyInfo GetProperty( string name, Type returnType, Type[] types,
+						 ParameterModifier[] modifiers)
+		{
+			return GetProperty (name, DefaultBindingFlags, null, returnType, types, modifiers);
+		}
+
+		public PropertyInfo GetProperty (string name, BindingFlags bindingAttr,
+						 Binder binder, Type returnType,
+						 Type[] types, ParameterModifier[] modifiers)
+		{
+			if (name == null)
+				throw new ArgumentNullException ("name");
+			if (types == null)
+				throw new ArgumentNullException ("types");
+
+			return GetPropertyImpl (name, bindingAttr, binder, returnType, types, modifiers);
+		}
+
+		protected abstract PropertyInfo GetPropertyImpl (string name,
+								 BindingFlags bindingAttr,
+								 Binder binder, Type returnType,
+								 Type[] types,
+								 ParameterModifier[] modifiers);
+
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		private static extern ConstructorInfo get_constructor (Type type, Type[] types);
+
+		protected abstract ConstructorInfo GetConstructorImpl (BindingFlags bindingAttr,
+								       Binder binder,
+								       CallingConventions callConvention,
+								       Type[] types,
+								       ParameterModifier[] modifiers);
+
+		protected abstract TypeAttributes GetAttributeFlagsImpl ();
+		protected abstract bool HasElementTypeImpl ();
+		protected abstract bool IsArrayImpl ();
+		protected abstract bool IsByRefImpl ();
+		protected abstract bool IsCOMObjectImpl ();
+		protected abstract bool IsPointerImpl ();
+		protected abstract bool IsPrimitiveImpl ();
+		
+		protected virtual bool IsValueTypeImpl ()
+		{
+			if (this == typeof (Enum) || this == typeof (ValueType))
+				return false;
+
+			return IsSubclassOf (typeof (ValueType));
+		}
+		
+		protected virtual bool IsContextfulImpl ()
+		{
+			return typeof (ContextBoundObject).IsAssignableFrom (this);
+		}
+
+		protected virtual bool IsMarshalByRefImpl ()
+		{
+			return typeof (MarshalByRefObject).IsAssignableFrom (this);
+		}
+
+		[MonoTODO]
+		public ConstructorInfo GetConstructor (Type[] types)
+		{
+			// TODO: return GetConstructor
+			// (BindingFlags.Public | BindingFlags.NonPublic, null, types, null);
+			
+			return get_constructor (this, types);
+		}
+
+		public ConstructorInfo GetConstructor (BindingFlags bindingAttr, Binder binder,
+						       Type[] types, ParameterModifier[] modifiers)
+		{
+			return GetConstructor (
+				bindingAttr, binder, CallingConventions.Any, types, modifiers);
+		}
+
+		public ConstructorInfo GetConstructor (BindingFlags bindingAttr, Binder binder,
+						       CallingConventions callConvention,
+						       Type[] types, ParameterModifier[] modifiers)
+		{
+			if (types == null)
+				throw new ArgumentNullException ("types");
+
+			return GetConstructorImpl (bindingAttr, binder, callConvention, types, modifiers);
+		}
+
+		public ConstructorInfo[] GetConstructors ()
+		{
+			return GetConstructors (BindingFlags.Public | BindingFlags.NonPublic);
+		}
+		
+		public abstract ConstructorInfo[] GetConstructors (BindingFlags bindingAttr);
+
+		[MonoTODO]
+		public virtual MemberInfo[] GetDefaultMembers ()
+		{
+			throw new NotImplementedException ();
+		}
+
+		public virtual MemberInfo[] FindMembers (MemberTypes memberType, BindingFlags bindingAttr,
+							 MemberFilter filter, object filterCriteria)
+		{
+			MemberInfo[] result;
+			ArrayList l = new ArrayList ();
+
+			// Console.WriteLine ("FindMembers for {0} (Type: {1}): {2}",
+			// this.FullName, this.GetType().FullName, this.obj_address());
+
+			if ((memberType & MemberTypes.Constructor) != 0) {
+				ConstructorInfo[] c = GetConstructors (bindingAttr);
+				if (filter != null) {
+					foreach (MemberInfo m in c) {
+						if (filter (m, filterCriteria))
+							l.Add (m);
+					}
+				} else {
+					l.AddRange (c);
+				}
+			}
+			if ((memberType & MemberTypes.Event) != 0) {
+				EventInfo[] c = GetEvents (bindingAttr);
+				if (filter != null) {
+					foreach (MemberInfo m in c) {
+						if (filter (m, filterCriteria))
+							l.Add (m);
+					}
+				} else {
+					l.AddRange (c);
+				}
+			}
+			if ((memberType & MemberTypes.Field) != 0) {
+				FieldInfo[] c = GetFields (bindingAttr);
+				if (filter != null) {
+					foreach (MemberInfo m in c) {
+						if (filter (m, filterCriteria))
+							l.Add (m);
+					}
+				} else {
+					l.AddRange (c);
+				}
+			}
+			if ((memberType & MemberTypes.Method) != 0) {
+				MethodInfo[] c = GetMethods (bindingAttr);
+				if (filter != null) {
+					foreach (MemberInfo m in c) {
+						if (filter (m, filterCriteria))
+							l.Add (m);
+					}
+				} else {
+					l.AddRange (c);
+				}
+			}
+			if ((memberType & MemberTypes.Property) != 0) {
+				PropertyInfo[] c;
+				int count = l.Count;
+				Type ptype;
+				if (filter != null) {
+					ptype = this;
+					while ((l.Count == count) && (ptype != null)) {
+						c = ptype.GetProperties (bindingAttr);
+						foreach (MemberInfo m in c) {
+							if (filter (m, filterCriteria))
+								l.Add (m);
+						}
+						ptype = ptype.BaseType;
+					}
+				} else {
+					c = GetProperties (bindingAttr);
+					l.AddRange (c);
+				}
+			}
+			if ((memberType & MemberTypes.NestedType) != 0) {
+				Type[] c = GetNestedTypes (bindingAttr);
+				if (filter != null) {
+					foreach (MemberInfo m in c) {
+						if (filter (m, filterCriteria)) {
+							l.Add (m);
+						}
+					}
+				} else {
+					l.AddRange (c);
+				}
+			}
+			result = new MemberInfo [l.Count];
+			l.CopyTo (result);
+			return result;
+		}
+
+		[MonoTODO]
+		public object InvokeMember (string name, BindingFlags invokeAttr, Binder binder,
+					    object target, object[] args)
+		{
+			throw new NotImplementedException ();
+		}
+
+		[MonoTODO]
+		public object InvokeMember (string name, BindingFlags invokeAttr, Binder binder,
+					    object target, object[] args, CultureInfo culture)
+		{
+			throw new NotImplementedException ();
+		}
+
+		public abstract object InvokeMember (string name, BindingFlags invokeAttr,
+						     Binder binder, object target, object[] args,
+						     ParameterModifier[] modifiers,
+						     CultureInfo culture, string[] namedParameters);
+
+		public override string ToString()
+		{
+			return FullName;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/TypeCode.cs b/mcs/class/corlib/System/TypeCode.cs
new file mode 100644
index 00000000000..e2ef3f4a746
--- /dev/null
+++ b/mcs/class/corlib/System/TypeCode.cs
@@ -0,0 +1,93 @@
+// TypeCode.cs
+//
+// This code was automatically generated from
+// ECMA CLI XML Library Specification.
+// Generator: libgen.xsl [1.0; (C) Sergey Chaban (serge@wildwestsoftware.com)]
+// Created: Wed, 5 Sep 2001 06:34:09 UTC
+// Source file: all.xml
+// URL: http://devresource.hp.com/devresource/Docs/TechPapers/CSharp/all.xml
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+
+
+namespace System {
+
+
+	/// <summary>
+	/// </summary>
+	public enum TypeCode {
+
+		/// <summary>
+		/// </summary>
+		Empty = 0,
+
+		/// <summary>
+		/// </summary>
+		Object = 1,
+
+		/// <summary>
+		/// </summary>
+		DBNull = 2,
+
+		/// <summary>
+		/// </summary>
+		Boolean = 3,
+
+		/// <summary>
+		/// </summary>
+		Char = 4,
+
+		/// <summary>
+		/// </summary>
+		SByte = 5,
+
+		/// <summary>
+		/// </summary>
+		Byte = 6,
+
+		/// <summary>
+		/// </summary>
+		Int16 = 7,
+
+		/// <summary>
+		/// </summary>
+		UInt16 = 8,
+
+		/// <summary>
+		/// </summary>
+		Int32 = 9,
+
+		/// <summary>
+		/// </summary>
+		UInt32 = 10,
+
+		/// <summary>
+		/// </summary>
+		Int64 = 11,
+
+		/// <summary>
+		/// </summary>
+		UInt64 = 12,
+
+		/// <summary>
+		/// </summary>
+		Single = 13,
+
+		/// <summary>
+		/// </summary>
+		Double = 14,
+
+		/// <summary>
+		/// </summary>
+		Decimal = 15,
+
+		/// <summary>
+		/// </summary>
+		DateTime = 16,
+
+		/// <summary>
+		/// </summary>
+		String = 18,
+	} // TypeCode
+
+} // System
diff --git a/mcs/class/corlib/System/TypeInitializationException.cs b/mcs/class/corlib/System/TypeInitializationException.cs
new file mode 100644
index 00000000000..cae537d64b5
--- /dev/null
+++ b/mcs/class/corlib/System/TypeInitializationException.cs
@@ -0,0 +1,40 @@
+//
+// System.TypeInitializationException.cs
+//
+// Author:
+//   Joe Shaw (joe@ximian.com)
+//   Duncan Mak (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+using System.Globalization;
+using System.Runtime.Serialization;
+namespace System {
+
+	[Serializable]
+	public sealed class TypeInitializationException : SystemException {
+		string type_name;
+
+		// Constructors
+		public TypeInitializationException (string type_name, Exception inner)
+			: base (Locale.GetText ("An exception was thrown by the type initializer for ") + type_name, inner)
+		{
+			this.type_name = type_name;
+		}
+
+		// Properties
+		public string TypeName {
+			get {
+				return type_name;
+			}
+		}
+
+		// Methods
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			base.GetObjectData (info, context);
+			info.AddValue ("TypeName", type_name);
+		}
+	}
+
+}
diff --git a/mcs/class/corlib/System/TypeLoadException.cs b/mcs/class/corlib/System/TypeLoadException.cs
new file mode 100644
index 00000000000..91458786b3a
--- /dev/null
+++ b/mcs/class/corlib/System/TypeLoadException.cs
@@ -0,0 +1,73 @@
+//
+// System.TypeLoadException
+//
+// Author:
+//   Sean MacIsaac (macisaac@ximian.com)
+//   Duncan Mak  (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class TypeLoadException : SystemException {
+
+		// Fields
+		private string msg;
+		private string type;
+		
+                // Constructors
+		public TypeLoadException ()
+			: base (Locale.GetText ("A type load exception has occurred."))
+		{
+			msg = Locale.GetText ("A type load exception has occured.");
+		}
+
+		public TypeLoadException (string message)
+			: base (message)
+		{
+			msg = message;
+		}
+
+		public TypeLoadException (string message, Exception inner)
+			: base (message, inner)
+		{
+			msg = message;
+		}
+
+		protected TypeLoadException (SerializationInfo info,
+					  StreamingContext context)
+			: base (info, context)
+		{
+		}
+
+		// Properties
+		public override string Message
+		{
+			get { return msg; }
+		}
+
+		public string TypeName
+		{
+			get { return type; }
+		}
+
+		// Methods
+		//
+		// It seems like this object serializes more fields than those described.
+		// Those fields are TypeLoadClassName, TypeLoadAssemblyName,
+		// TypeLoadMessageArg and TypeLoadResourceID.
+		//
+		[MonoTODO] 
+		public override void GetObjectData (SerializationInfo info, StreamingContext context)
+		{
+			if (info == null)
+				throw new ArgumentNullException ("info is null.");
+			base.GetObjectData (info, context);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/TypeUnloadedException.cs b/mcs/class/corlib/System/TypeUnloadedException.cs
new file mode 100644
index 00000000000..10929e3fe68
--- /dev/null
+++ b/mcs/class/corlib/System/TypeUnloadedException.cs
@@ -0,0 +1,43 @@
+//	
+// System.TypeUnloadedException.cs
+//
+// Author:
+//	Duncan Mak (duncan@ximian.com)
+//
+// 2002 (C) Ximian, Inc. http://www.ximian.com
+//
+
+using System;
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System
+{
+	[Serializable]
+	public class TypeUnloadedException : SystemException
+	{
+		// Constructors
+		public TypeUnloadedException ()
+			: base (Locale.GetText ("Cannot access an unloaded class."))
+			{
+			}
+		
+		public TypeUnloadedException (string message)
+			: base (message)
+			{
+			}
+		
+		protected TypeUnloadedException (SerializationInfo info,
+					      StreamingContext context)
+			: base (info, context)
+			{
+			}
+		
+		public TypeUnloadedException (string message, Exception innerException)
+			:base (message, innerException)
+			{
+			}
+		
+	}
+}
+
diff --git a/mcs/class/corlib/System/UInt16.cs b/mcs/class/corlib/System/UInt16.cs
new file mode 100644
index 00000000000..a8256a7e00c
--- /dev/null
+++ b/mcs/class/corlib/System/UInt16.cs
@@ -0,0 +1,241 @@
+//
+// System.UInt16.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+
+namespace System {
+
+	[CLSCompliant(false)]
+	[Serializable]
+	public struct UInt16 : IComparable, IFormattable, IConvertible {
+
+		public const ushort MaxValue = 0xffff;
+		public const ushort MinValue = 0;
+		
+		public ushort value;
+
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+			
+			if(!(v is System.UInt16))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.UInt16"));
+
+			return value - ((ushort) v);
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.UInt16))
+				return false;
+
+			return ((ushort) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return value;
+		}
+
+		[CLSCompliant(false)]
+		public static ushort Parse (string s)
+		{
+			ushort val = 0;
+			int len;
+			int i;
+			bool digits_seen = false;
+			bool has_negative_sign = false;
+			
+			if (s == null)
+				throw new ArgumentNullException (Locale.GetText ("s is null"));
+
+			len = s.Length;
+
+			char c;
+			for (i = 0; i < len; i++){
+				c = s [i];
+				if (!Char.IsWhiteSpace (c))
+					break;
+			}
+			
+			if (i == len)
+				throw new FormatException ();
+
+			if (s [i] == '+')
+				i++;
+			else
+				if (s[i] == '-'){
+					i++;
+					has_negative_sign = true;
+				}
+
+			for (; i < len; i++){
+				c = s [i];
+
+				if (c >= '0' && c <= '9'){
+					ushort d = (ushort) (c - '0');
+					
+					val = checked ((ushort) (val * 10 + d));
+					digits_seen = true;
+				} else {
+					if (Char.IsWhiteSpace (c)){
+						for (i++; i < len; i++){
+							if (!Char.IsWhiteSpace (s [i]))
+								throw new FormatException ();
+						}
+						break;
+					} else
+						throw new FormatException ();
+				}
+			}
+			if (!digits_seen)
+				throw new FormatException ();
+			
+			if (has_negative_sign)
+				throw new OverflowException ();
+
+			return val;
+
+		}
+
+		[CLSCompliant(false)]
+		public static ushort Parse (string s, IFormatProvider fp)
+		{
+			return Parse (s, NumberStyles.Integer, fp);
+		}
+
+		[CLSCompliant(false)]
+		public static ushort Parse (string s, NumberStyles style)
+		{
+			return Parse (s, style, null);
+		}
+
+		[CLSCompliant(false)]
+		public static ushort Parse (string s, NumberStyles style, IFormatProvider fp)
+		{
+			uint tmpResult = UInt32.Parse (s, style, fp);
+			if (tmpResult > UInt16.MaxValue || tmpResult < UInt16.MinValue)
+				throw new OverflowException ("Value too large or too small.");
+
+			return (ushort) tmpResult;
+		}
+
+		public override string ToString ()
+		{
+			return ToString (null, null);
+		}
+
+		public string ToString (IFormatProvider fp)
+		{
+			return ToString (null, fp);
+		}
+
+		public string ToString (string format)
+		{
+			return ToString (format, null);
+		}
+
+		public string ToString (string format, IFormatProvider fp)
+		{
+			NumberFormatInfo nfi = NumberFormatInfo.GetInstance( fp );
+			
+			if ( format == null )
+				format = "G";
+			
+			return IntegerFormatter.NumberToString(format, nfi, value);
+		}
+
+		// =========== IConvertible Methods =========== //
+
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.UInt16;
+		}
+
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return System.Convert.ToBoolean (value);
+		}
+
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return System.Convert.ToByte (value);
+		}
+
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			return System.Convert.ToChar (value);
+		}
+
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			return System.Convert.ToDateTime (value);
+		}
+
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal (value);
+		}
+
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble (value);
+		}
+
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16 (value);
+		}
+
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32 (value);
+		}
+
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64 (value);
+		}
+
+		[CLSCompliant (false)]
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte (value);
+		}
+		
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle (value);
+		}
+
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			return System.Convert.ToType (value, conversionType, provider);
+		}
+
+		[CLSCompliant (false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16 (value);
+		}
+
+		[CLSCompliant (false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32 (value);
+		}
+
+		[CLSCompliant (false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64 (value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/UInt32.cs b/mcs/class/corlib/System/UInt32.cs
new file mode 100644
index 00000000000..1f5653157b9
--- /dev/null
+++ b/mcs/class/corlib/System/UInt32.cs
@@ -0,0 +1,429 @@
+//
+// System.UInt32.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Threading;
+
+namespace System {
+
+	[CLSCompliant(false)]
+	[Serializable]
+	public struct UInt32 : IComparable, IFormattable, IConvertible {
+
+		public const uint MaxValue = 0xffffffff;
+		public const uint MinValue = 0;
+		
+		public uint value;
+
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+			
+			if (!(v is System.UInt32))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.UInt32"));
+
+			if (value == (uint) v)
+				return 0;
+
+			if (value < (uint) v)
+				return -1;
+
+			return 1;
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.UInt32))
+				return false;
+
+			return ((uint) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int) value;
+		}
+
+		[CLSCompliant(false)]
+		public static uint Parse (string s)
+		{
+			uint val = 0;
+			int len;
+			int i;
+			bool digits_seen = false;
+			bool has_negative_sign = false;
+			
+			if (s == null)
+				throw new ArgumentNullException (Locale.GetText ("s is null"));
+
+			len = s.Length;
+
+			char c;
+			for (i = 0; i < len; i++){
+				c = s [i];
+				if (!Char.IsWhiteSpace (c))
+					break;
+			}
+			
+			if (i == len)
+				throw new FormatException ();
+
+			if (s [i] == '+')
+				i++;
+			else
+				if (s[i] == '-'){
+					i++;
+					has_negative_sign = true;
+				}
+
+			for (; i < len; i++){
+				c = s [i];
+
+				if (c >= '0' && c <= '9'){
+					uint d = (uint) (c - '0');
+					
+					val = checked (val * 10 + d);
+					digits_seen = true;
+				} else {
+					if (Char.IsWhiteSpace (c)){
+						for (i++; i < len; i++){
+							if (!Char.IsWhiteSpace (s [i]))
+								throw new FormatException ();
+						}
+						break;
+					} else
+						throw new FormatException ();
+				}
+			}
+			if (!digits_seen)
+				throw new FormatException ();
+			
+			if (has_negative_sign)
+				throw new OverflowException ();
+
+			return val;
+		}
+
+		[CLSCompliant(false)]
+		public static uint Parse (string s, IFormatProvider fp)
+		{
+			return Parse (s, NumberStyles.Integer, fp);
+		}
+
+		[CLSCompliant(false)]
+		public static uint Parse (string s, NumberStyles style)
+		{
+			return Parse (s, style, null);
+		}
+
+		[CLSCompliant(false)]
+		public static uint Parse (string s, NumberStyles style, IFormatProvider fp)
+		{
+			if (s == null)
+				throw new ArgumentNullException ();
+
+			if (s.Length == 0)
+				throw new FormatException ("Input string was not in the correct format.");
+
+			NumberFormatInfo nfi;
+			if (fp != null) {
+				Type typeNFI = typeof (System.Globalization.NumberFormatInfo);
+				nfi = (NumberFormatInfo) fp.GetFormat (typeNFI);
+			}
+			else
+				nfi = Thread.CurrentThread.CurrentCulture.NumberFormat;
+
+			Int32.CheckStyle (style);
+
+			bool AllowCurrencySymbol = (style & NumberStyles.AllowCurrencySymbol) != 0;
+			bool AllowExponent = (style & NumberStyles.AllowExponent) != 0;
+			bool AllowHexSpecifier = (style & NumberStyles.AllowHexSpecifier) != 0;
+			bool AllowThousands = (style & NumberStyles.AllowThousands) != 0;
+			bool AllowDecimalPoint = (style & NumberStyles.AllowDecimalPoint) != 0;
+			bool AllowParentheses = (style & NumberStyles.AllowParentheses) != 0;
+			bool AllowTrailingSign = (style & NumberStyles.AllowTrailingSign) != 0;
+			bool AllowLeadingSign = (style & NumberStyles.AllowLeadingSign) != 0;
+			bool AllowTrailingWhite = (style & NumberStyles.AllowTrailingWhite) != 0;
+			bool AllowLeadingWhite = (style & NumberStyles.AllowLeadingWhite) != 0;
+
+			int pos = 0;
+
+			if (AllowLeadingWhite)
+				pos = Int32.JumpOverWhite (pos, s, true);
+
+			bool foundOpenParentheses = false;
+			bool negative = false;
+			bool foundSign = false;
+			bool foundCurrency = false;
+
+			// Pre-number stuff
+			if (AllowParentheses && s [pos] == '(') {
+				foundOpenParentheses = true;
+				foundSign = true;
+				negative = true; // MS always make the number negative when there parentheses
+						 // even when NumberFormatInfo.NumberNegativePattern != 0!!!
+				pos++;
+				if (AllowLeadingWhite)
+					pos = Int32.JumpOverWhite (pos, s, true);
+
+				if (s.Substring (pos, nfi.NegativeSign.Length) == nfi.NegativeSign)
+					throw new FormatException ("Input string was not in the correct format.");
+				if (s.Substring (pos, nfi.PositiveSign.Length) == nfi.PositiveSign)
+					throw new FormatException ("Input string was not in the correct format.");
+			}
+
+			if (AllowLeadingSign && !foundSign) {
+				// Sign + Currency
+				Int32.FindSign (ref pos, s, nfi, ref foundSign, ref negative);
+				if (foundSign) {
+					if (AllowLeadingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (AllowCurrencySymbol) {
+						Int32.FindCurrency (ref pos, s, nfi,
+								    ref foundCurrency);
+						if (foundCurrency && AllowLeadingWhite)
+							pos = Int32.JumpOverWhite (pos, s, true);
+					}
+				}
+			}
+			
+			if (AllowCurrencySymbol && !foundCurrency) {
+				// Currency + sign
+				Int32.FindCurrency (ref pos, s, nfi, ref foundCurrency);
+				if (foundCurrency) {
+					if (AllowLeadingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (foundCurrency) {
+						if (!foundSign && AllowLeadingSign) {
+							Int32.FindSign (ref pos, s, nfi, ref foundSign,
+									ref negative);
+							if (foundSign && AllowLeadingWhite)
+								pos = Int32.JumpOverWhite (pos, s, true);
+						}
+					}
+				}
+			}
+			
+			uint number = 0;
+			int nDigits = 0;
+			bool decimalPointFound = false;
+			uint digitValue;
+			char hexDigit;
+				
+			// Number stuff
+			// Just the same as Int32, but this one adds instead of substract
+			do {
+
+				if (!Int32.ValidDigit (s [pos], AllowHexSpecifier)) {
+					if (AllowThousands &&
+					    Int32.FindOther (ref pos, s, nfi.NumberGroupSeparator))
+					    continue;
+					else
+					if (!decimalPointFound && AllowDecimalPoint &&
+					    Int32.FindOther (ref pos, s, nfi.NumberDecimalSeparator)) {
+					    decimalPointFound = true;
+					    continue;
+					}
+
+					break;
+				}
+				else if (AllowHexSpecifier) {
+					nDigits++;
+					hexDigit = s [pos++];
+					if (Char.IsDigit (hexDigit))
+						digitValue = (uint) (hexDigit - '0');
+					else if (Char.IsLower (hexDigit))
+						digitValue = (uint) (hexDigit - 'a' + 10);
+					else
+						digitValue = (uint) (hexDigit - 'A' + 10);
+
+					number = checked (number * 16 + digitValue);
+				}
+				else if (decimalPointFound) {
+					nDigits++;
+					// Allows decimal point as long as it's only 
+					// followed by zeroes.
+					if (s [pos++] != '0')
+						throw new OverflowException ("Value too large or too small.");
+				}
+				else {
+					nDigits++;
+
+					try {
+						number = checked (
+							number * 10 + 
+							(uint) (s [pos++] - '0')
+							);
+					} catch (OverflowException) {
+						throw new OverflowException ("Value too large or too small.");
+					}
+				}
+			} while (pos < s.Length);
+
+			// Post number stuff
+			if (nDigits == 0)
+				throw new FormatException ("Input string was not in the correct format.");
+
+			if (AllowTrailingSign && !foundSign) {
+				// Sign + Currency
+				Int32.FindSign (ref pos, s, nfi, ref foundSign, ref negative);
+				if (foundSign) {
+					if (AllowTrailingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (AllowCurrencySymbol)
+						Int32. FindCurrency (ref pos, s, nfi,
+								     ref foundCurrency);
+				}
+			}
+			
+			if (AllowCurrencySymbol && !foundCurrency) {
+				// Currency + sign
+				Int32.FindCurrency (ref pos, s, nfi, ref foundCurrency);
+				if (foundCurrency) {
+					if (AllowTrailingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (!foundSign && AllowTrailingSign)
+						Int32.FindSign (ref pos, s, nfi, ref foundSign,
+								ref negative);
+				}
+			}
+			
+			if (AllowTrailingWhite && pos < s.Length)
+				pos = Int32.JumpOverWhite (pos, s, false);
+
+			if (foundOpenParentheses) {
+				if (pos >= s.Length || s [pos++] != ')')
+					throw new FormatException ("Input string was not in the correct " + 
+								   "format.");
+				if (AllowTrailingWhite && pos < s.Length)
+					pos = Int32.JumpOverWhite (pos, s, false);
+			}
+
+			if (pos < s.Length && s [pos] != '\u0000')
+				throw new FormatException ("Input string was not in the correct format.");
+
+			if (negative)
+				throw new OverflowException ( "Value too large or too small.");
+
+			return number;
+		}
+
+		public override string ToString ()
+		{
+			return ToString (null, null);
+		}
+
+		public string ToString (IFormatProvider fp)
+		{
+			return ToString (null, fp);
+		}
+
+		public string ToString (string format)
+		{
+			return ToString (format, null);
+		}
+
+		public string ToString (string format, IFormatProvider fp)
+		{
+			NumberFormatInfo nfi = NumberFormatInfo.GetInstance( fp );
+			
+			if ( format == null )
+				format = "G";
+			
+			return IntegerFormatter.NumberToString(format, nfi, value);
+		}
+
+		// =========== IConvertible Methods =========== //
+
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.UInt32;
+		}
+
+		bool IConvertible.ToBoolean (IFormatProvider provider)
+		{
+			return System.Convert.ToBoolean (value);
+		}
+
+		byte IConvertible.ToByte (IFormatProvider provider)
+		{
+			return System.Convert.ToByte (value);
+		}
+
+		char IConvertible.ToChar (IFormatProvider provider)
+		{
+			return System.Convert.ToChar (value);
+		}
+
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			return System.Convert.ToDateTime (value);
+		}
+
+		decimal IConvertible.ToDecimal (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal (value);
+		}
+
+		double IConvertible.ToDouble (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble (value);
+		}
+
+		short IConvertible.ToInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16 (value);
+		}
+
+		int IConvertible.ToInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32 (value);
+		}
+
+		long IConvertible.ToInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64 (value);
+		}
+
+		[CLSCompliant (false)]
+		sbyte IConvertible.ToSByte (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte (value);
+		}
+		
+		float IConvertible.ToSingle (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle (value);
+		}
+
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			return System.Convert.ToType (value, conversionType, provider);
+		}
+
+		[CLSCompliant (false)]
+		ushort IConvertible.ToUInt16 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16 (value);
+		}
+
+		[CLSCompliant (false)]
+		uint IConvertible.ToUInt32 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32 (value);
+		}
+
+		[CLSCompliant (false)]
+		ulong IConvertible.ToUInt64 (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt64 (value);
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/UInt64.cs b/mcs/class/corlib/System/UInt64.cs
new file mode 100644
index 00000000000..483b6b73ba6
--- /dev/null
+++ b/mcs/class/corlib/System/UInt64.cs
@@ -0,0 +1,359 @@
+//
+// System.UInt64.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Threading;
+
+namespace System {
+
+	[CLSCompliant(false)]
+	[Serializable]
+	public struct UInt64 : IComparable, IFormattable, IConvertible {
+		public const ulong MaxValue = 0xffffffffffffffff;
+		public const ulong MinValue = 0;
+		
+		public ulong value;
+
+		public int CompareTo (object v)
+		{
+			if (v == null)
+				return 1;
+
+			if (!(v is System.UInt64))
+				throw new ArgumentException (Locale.GetText ("Value is not a System.UInt64"));
+
+			if (value == (ulong) v)
+				return 0;
+
+			if (value < (ulong) v)
+				return -1;
+
+			return 1;
+		}
+
+		public override bool Equals (object o)
+		{
+			if (!(o is System.UInt64))
+				return false;
+
+			return ((ulong) o) == value;
+		}
+
+		public override int GetHashCode ()
+		{
+			return (int)(value & 0xffffffff) ^ (int)(value >> 32);
+		}
+
+		[CLSCompliant(false)]
+		public static ulong Parse (string s)
+		{
+			return Parse (s, NumberStyles.Integer, null);
+		}
+
+		[CLSCompliant(false)]
+		public static ulong Parse (string s, IFormatProvider fp)
+		{
+			return Parse (s, NumberStyles.Integer, fp);
+		}
+
+		[CLSCompliant(false)]
+		public static ulong Parse (string s, NumberStyles style)
+		{
+			return Parse (s, style, null);
+		}
+
+		[CLSCompliant(false)]
+		public static ulong Parse (string s, NumberStyles style, IFormatProvider fp)
+		{
+			if (s == null)
+				throw new ArgumentNullException ();
+
+			if (s.Length == 0)
+				throw new FormatException ("Input string was not in the correct format.");
+
+			NumberFormatInfo nfi;
+			if (fp != null) {
+				Type typeNFI = typeof (System.Globalization.NumberFormatInfo);
+				nfi = (NumberFormatInfo) fp.GetFormat (typeNFI);
+			}
+			else
+				nfi = Thread.CurrentThread.CurrentCulture.NumberFormat;
+
+			Int32.CheckStyle (style);
+
+			bool AllowCurrencySymbol = (style & NumberStyles.AllowCurrencySymbol) != 0;
+			bool AllowExponent = (style & NumberStyles.AllowExponent) != 0;
+			bool AllowHexSpecifier = (style & NumberStyles.AllowHexSpecifier) != 0;
+			bool AllowThousands = (style & NumberStyles.AllowThousands) != 0;
+			bool AllowDecimalPoint = (style & NumberStyles.AllowDecimalPoint) != 0;
+			bool AllowParentheses = (style & NumberStyles.AllowParentheses) != 0;
+			bool AllowTrailingSign = (style & NumberStyles.AllowTrailingSign) != 0;
+			bool AllowLeadingSign = (style & NumberStyles.AllowLeadingSign) != 0;
+			bool AllowTrailingWhite = (style & NumberStyles.AllowTrailingWhite) != 0;
+			bool AllowLeadingWhite = (style & NumberStyles.AllowLeadingWhite) != 0;
+
+			int pos = 0;
+
+			if (AllowLeadingWhite)
+				pos = Int32.JumpOverWhite (pos, s, true);
+
+			bool foundOpenParentheses = false;
+			bool negative = false;
+			bool foundSign = false;
+			bool foundCurrency = false;
+
+			// Pre-number stuff
+			if (AllowParentheses && s [pos] == '(') {
+				foundOpenParentheses = true;
+				foundSign = true;
+				negative = true; // MS always make the number negative when there parentheses
+						 // even when NumberFormatInfo.NumberNegativePattern != 0!!!
+				pos++;
+				if (AllowLeadingWhite)
+					pos = Int32.JumpOverWhite (pos, s, true);
+
+				if (s.Substring (pos, nfi.NegativeSign.Length) == nfi.NegativeSign)
+					throw new FormatException ("Input string was not in the correct format.");
+				if (s.Substring (pos, nfi.PositiveSign.Length) == nfi.PositiveSign)
+					throw new FormatException ("Input string was not in the correct format.");
+			}
+
+			if (AllowLeadingSign && !foundSign) {
+				// Sign + Currency
+				Int32.FindSign (ref pos, s, nfi, ref foundSign, ref negative);
+				if (foundSign) {
+					if (AllowLeadingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (AllowCurrencySymbol) {
+						Int32.FindCurrency (ref pos, s, nfi,
+								    ref foundCurrency);
+						if (foundCurrency && AllowLeadingWhite)
+							pos = Int32.JumpOverWhite (pos, s, true);
+					}
+				}
+			}
+			
+			if (AllowCurrencySymbol && !foundCurrency) {
+				// Currency + sign
+				Int32.FindCurrency (ref pos, s, nfi, ref foundCurrency);
+				if (foundCurrency) {
+					if (AllowLeadingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (foundCurrency) {
+						if (!foundSign && AllowLeadingSign) {
+							Int32.FindSign (ref pos, s, nfi, ref foundSign,
+									ref negative);
+							if (foundSign && AllowLeadingWhite)
+								pos = Int32.JumpOverWhite (pos, s, true);
+						}
+					}
+				}
+			}
+			
+			ulong number = 0;
+			int nDigits = 0;
+			bool decimalPointFound = false;
+			ulong digitValue;
+			char hexDigit;
+				
+			// Number stuff
+			// Just the same as Int32, but this one adds instead of substract
+			do {
+
+				if (!Int32.ValidDigit (s [pos], AllowHexSpecifier)) {
+					if (AllowThousands &&
+					    Int32.FindOther (ref pos, s, nfi.NumberGroupSeparator))
+					    continue;
+					else
+					if (!decimalPointFound && AllowDecimalPoint &&
+					    Int32.FindOther (ref pos, s, nfi.NumberDecimalSeparator)) {
+					    decimalPointFound = true;
+					    continue;
+					}
+
+					break;
+				}
+				else if (AllowHexSpecifier) {
+					nDigits++;
+					hexDigit = s [pos++];
+					if (Char.IsDigit (hexDigit))
+						digitValue = (ulong) (hexDigit - '0');
+					else if (Char.IsLower (hexDigit))
+						digitValue = (ulong) (hexDigit - 'a' + 10);
+					else
+						digitValue = (ulong) (hexDigit - 'A' + 10);
+
+					number = checked (number * 16 + digitValue);
+				}
+				else if (decimalPointFound) {
+					nDigits++;
+					// Allows decimal point as long as it's only 
+					// followed by zeroes.
+					if (s [pos++] != '0')
+						throw new OverflowException ("Value too large or too small.");
+				}
+				else {
+					nDigits++;
+
+					try {
+						number = checked (
+							number * 10 + 
+							(ulong) (s [pos++] - '0')
+							);
+					} catch (OverflowException) {
+						throw new OverflowException ("Value too large or too small.");
+					}
+				}
+			} while (pos < s.Length);
+
+			// Post number stuff
+			if (nDigits == 0)
+				throw new FormatException ("Input string was not in the correct format.");
+
+			if (AllowTrailingSign && !foundSign) {
+				// Sign + Currency
+				Int32.FindSign (ref pos, s, nfi, ref foundSign, ref negative);
+				if (foundSign) {
+					if (AllowTrailingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (AllowCurrencySymbol)
+						Int32.FindCurrency (ref pos, s, nfi,
+								    ref foundCurrency);
+				}
+			}
+			
+			if (AllowCurrencySymbol && !foundCurrency) {
+				// Currency + sign
+				Int32.FindCurrency (ref pos, s, nfi, ref foundCurrency);
+				if (foundCurrency) {
+					if (AllowTrailingWhite)
+						pos = Int32.JumpOverWhite (pos, s, true);
+					if (!foundSign && AllowTrailingSign)
+						Int32.FindSign (ref pos, s, nfi, ref foundSign,
+								ref negative);
+				}
+			}
+			
+			if (AllowTrailingWhite && pos < s.Length)
+				pos = Int32.JumpOverWhite (pos, s, false);
+
+			if (foundOpenParentheses) {
+				if (pos >= s.Length || s [pos++] != ')')
+					throw new FormatException ("Input string was not in the correct " + 
+								   "format.");
+				if (AllowTrailingWhite && pos < s.Length)
+					pos = Int32.JumpOverWhite (pos, s, false);
+			}
+
+			if (pos < s.Length && s [pos] != '\u0000')
+				throw new FormatException ("Input string was not in the correct format.");
+
+			if (negative)
+				throw new OverflowException ( "Value too large or too small.");
+
+			return number;
+		}
+
+		public override string ToString ()
+		{
+			return ToString (null, null);
+		}
+
+		public string ToString (IFormatProvider fp)
+		{
+			return ToString (null, fp);
+		}
+
+		public string ToString (string format)
+		{
+			return ToString (format, null);
+		}
+
+		public string ToString (string format, IFormatProvider fp)
+		{
+			NumberFormatInfo nfi = NumberFormatInfo.GetInstance( fp );
+			
+			if ( format == null )
+				format = "G";
+			
+			return IntegerFormatter.NumberToString(format, nfi, value);
+		}
+
+		// =========== IConvertible Methods =========== //
+
+		public TypeCode GetTypeCode ()
+		{
+			return TypeCode.UInt64;
+		}
+		bool     IConvertible.ToBoolean  (IFormatProvider provider)
+		{
+			return System.Convert.ToBoolean (value);
+		}
+		byte     IConvertible.ToByte     (IFormatProvider provider)
+		{
+			return System.Convert.ToByte (value);
+		}
+		char     IConvertible.ToChar     (IFormatProvider provider)
+		{
+			return System.Convert.ToChar (value);
+		}
+		DateTime IConvertible.ToDateTime (IFormatProvider provider)
+		{
+			throw new NotImplementedException ();
+		}
+		decimal  IConvertible.ToDecimal  (IFormatProvider provider)
+		{
+			return System.Convert.ToDecimal (value);
+		}
+		double   IConvertible.ToDouble   (IFormatProvider provider)
+		{
+			return System.Convert.ToDouble (value);
+		}
+		short    IConvertible.ToInt16    (IFormatProvider provider)
+		{
+			return System.Convert.ToInt16 (value);
+		}
+		int      IConvertible.ToInt32    (IFormatProvider provider)
+		{
+			return System.Convert.ToInt32 (value);
+		}
+		long     IConvertible.ToInt64    (IFormatProvider provider)
+		{
+			return System.Convert.ToInt64 (value);
+		}
+    		[CLSCompliant(false)]
+		sbyte    IConvertible.ToSByte    (IFormatProvider provider)
+		{
+			return System.Convert.ToSByte (value);
+		}
+		float    IConvertible.ToSingle   (IFormatProvider provider)
+		{
+			return System.Convert.ToSingle (value);
+		}
+		object IConvertible.ToType (Type conversionType, IFormatProvider provider)
+		{
+			throw new NotImplementedException ();
+		}
+    		[CLSCompliant(false)]
+		ushort   IConvertible.ToUInt16   (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt16 (value);
+		}
+    		[CLSCompliant(false)]
+		uint     IConvertible.ToUInt32   (IFormatProvider provider)
+		{
+			return System.Convert.ToUInt32 (value);
+		}
+    		[CLSCompliant(false)]
+		ulong    IConvertible.ToUInt64   (IFormatProvider provider)
+		{
+			return value;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/UIntPtr.cs b/mcs/class/corlib/System/UIntPtr.cs
new file mode 100644
index 00000000000..71d58a6d79a
--- /dev/null
+++ b/mcs/class/corlib/System/UIntPtr.cs
@@ -0,0 +1,180 @@
+//------------------------------------------------------------------------------
+// 
+// System.UIntPtr.cs 
+//
+// Copyright (C) 2001 Michael Lambert, All Rights Reserved
+// 
+// Author:          Michael Lambert, michaellambert@email.com
+// Created:         Thu 07/31/2001 
+//
+// Remarks:         Requires '/unsafe' compiler option.  This class uses void*,
+//                  ulong, and uint in overloaded constructors, conversion, and 
+//                  cast members in the public interface.  Using pointers is not 
+//                  valid CLS and the methods in question have been marked with  
+//                  the CLSCompliant attribute that avoid compiler warnings.
+//
+//------------------------------------------------------------------------------
+
+using System.Runtime.Serialization;
+using System.Runtime.InteropServices;
+
+
+namespace System
+{
+
+[
+    StructLayout(LayoutKind.Auto),
+    CLSCompliant(false)
+]
+[Serializable]
+public unsafe struct UIntPtr : ISerializable
+{
+    public static readonly UIntPtr Zero = new UIntPtr(0u);
+    private void* _pointer;
+
+    [
+        CLSCompliant(false)
+    ]
+    public UIntPtr(ulong value)
+    {
+        _pointer = (void*) value;
+    }
+    
+    [
+        CLSCompliant(false)
+    ]
+    public UIntPtr(uint value)
+    {
+        _pointer = (void*)value;
+    }
+
+    [
+        CLSCompliant(false)
+    ]
+    public unsafe UIntPtr(void* value)
+    {
+        _pointer = value;
+    }
+
+    public override bool Equals(object obj)
+    {
+        if( obj is UIntPtr )
+        {
+            UIntPtr obj2 = (UIntPtr)obj;
+            return this._pointer == obj2._pointer;
+        }   
+
+        return false;
+    }
+    public override int GetHashCode()
+    {
+        return (int)_pointer;
+    }
+    
+    [
+        CLSCompliant(false)
+    ]
+    public uint ToUInt32()
+    {
+        return (uint) _pointer;
+    }
+
+    [
+        CLSCompliant(false)
+    ]
+    public ulong ToUInt64()
+    {
+        return (ulong) _pointer;
+    }
+
+    [
+        CLSCompliant(false)
+    ]
+    public unsafe void* ToPointer()
+    {
+        return _pointer;
+    }
+    public override string ToString()
+    {
+        return ((uint) _pointer).ToString();
+    }
+
+    // Interface ISerializable
+    void ISerializable.GetObjectData(SerializationInfo info, StreamingContext context)
+    {
+        if( info == null )
+            throw new ArgumentNullException( "info" );
+        // if( context == null ) -- context is struct can't be null.
+        //    throw new ArgumentNullException( "context" );
+        
+        info.AddValue("pointer", (ulong)_pointer);
+    }
+
+    public static bool operator ==(UIntPtr value1, UIntPtr value2)
+    {
+        return value1._pointer == value2._pointer;
+    }
+    public static bool operator !=(UIntPtr value1, UIntPtr value2)
+    {
+        return value1._pointer != value2._pointer;
+    }
+
+    [
+        CLSCompliant(false)
+    ]
+    public static explicit operator ulong(UIntPtr value)
+    {
+        return (ulong)value._pointer;
+    }
+
+    [
+        CLSCompliant(false)
+    ]
+    public static explicit operator uint(UIntPtr value)
+    {
+        return (uint)value._pointer;
+    }
+    
+    [
+        CLSCompliant(false)
+    ]
+    public static explicit operator UIntPtr(ulong value)
+    {
+        return new UIntPtr(value);
+    }
+
+    [
+        CLSCompliant(false)
+    ]
+    public unsafe static explicit operator UIntPtr(void* value)
+    {
+        return new UIntPtr(value);
+    }
+
+    [
+        CLSCompliant(false)
+    ]
+    public unsafe static explicit operator void*(UIntPtr value)
+    {
+        return value.ToPointer();
+    }
+    
+    [
+        CLSCompliant(false)
+    ]
+    public static explicit operator UIntPtr(uint value)
+    {
+        return new UIntPtr(value);
+    }
+
+    public static int Size
+    {
+        get
+        {   
+            return sizeof(void*); 
+        }
+    }
+}
+
+} // Namespace
+
diff --git a/mcs/class/corlib/System/UnauthorizedAccessException.cs b/mcs/class/corlib/System/UnauthorizedAccessException.cs
new file mode 100755
index 00000000000..6059045f76b
--- /dev/null
+++ b/mcs/class/corlib/System/UnauthorizedAccessException.cs
@@ -0,0 +1,39 @@
+//
+// System.UnauthorizedAccessException.cs
+//
+// Author:
+//   Paolo Molaro (lupus@ximian.com)
+//   Duncan Mak  (duncan@ximian.com)
+//
+// (C) 2001 Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+using System.Runtime.Serialization;
+
+namespace System {
+
+	[Serializable]
+	public class UnauthorizedAccessException : SystemException {
+		// Constructors
+		public UnauthorizedAccessException ()
+			: base (Locale.GetText ("Access to the requested resource is not authorized"))
+		{
+		}
+
+		public UnauthorizedAccessException (string message)
+			: base (message)
+		{
+		}
+
+		public UnauthorizedAccessException (string message, Exception inner)
+			: base (message, inner)
+		{
+		}
+
+		protected UnauthorizedAccessException (SerializationInfo info, StreamingContext context)
+			: base (info, context)
+		{
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/UnhandledExceptionEventArgs.cs b/mcs/class/corlib/System/UnhandledExceptionEventArgs.cs
new file mode 100755
index 00000000000..81e318eeec4
--- /dev/null
+++ b/mcs/class/corlib/System/UnhandledExceptionEventArgs.cs
@@ -0,0 +1,43 @@
+//
+// System.UnhandledExceptionEventArgs.cs 
+//
+// Author:
+//   Chris Hynes (chrish@assistedsolutions.com)
+//
+// (C) 2001 Chris Hynes
+//
+
+using System;
+using System.Reflection;
+
+namespace System 
+{
+	[Serializable]
+	public class UnhandledExceptionEventArgs: EventArgs
+	{
+		private object exception;
+		private bool m_isTerminating;
+
+		public UnhandledExceptionEventArgs(object exception, bool isTerminating)
+		{
+			this.exception = exception;
+			this.m_isTerminating = isTerminating;
+		}
+
+		public object ExceptionObject
+		{
+			get 
+			{
+				return exception;
+			}
+		}
+
+		public bool IsTerminating
+		{
+			get
+			{
+				return m_isTerminating;
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/UnhandledExceptionEventHandler.cs b/mcs/class/corlib/System/UnhandledExceptionEventHandler.cs
new file mode 100755
index 00000000000..710af2b4713
--- /dev/null
+++ b/mcs/class/corlib/System/UnhandledExceptionEventHandler.cs
@@ -0,0 +1,10 @@
+// System.UnhandledExceptionEventHandler.cs
+//
+// Paolo Molaro
+//
+// (C) 2002 Ximian, Inc.
+
+namespace System
+{
+	public delegate void UnhandledExceptionEventHandler (object sender, UnhandledExceptionEventArgs args);
+}
diff --git a/mcs/class/corlib/System/ValueType.cs b/mcs/class/corlib/System/ValueType.cs
new file mode 100644
index 00000000000..733491f38b0
--- /dev/null
+++ b/mcs/class/corlib/System/ValueType.cs
@@ -0,0 +1,48 @@
+//
+// System.ValueType.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Runtime.CompilerServices;
+
+namespace System {
+
+	[Serializable]
+	public abstract class ValueType {
+
+		// <summary>
+		//   ValueType constructor
+		// </summary>
+		protected ValueType ()
+		{
+		}
+
+		// <summary>
+		//   True if this instance and o represent the same type
+		//   and have the same value.
+		// </summary>
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override bool Equals (object o);
+
+		// <summary>
+		//   Gets a hashcode for this value type using the
+		//   bits in the structure
+		// </summary>
+		[MethodImplAttribute(MethodImplOptions.InternalCall)]
+		public extern override int GetHashCode ();
+
+		// <summary>
+		//   Stringified representation of this ValueType.
+		//   Must be overriden for better results, by default
+		//   it just returns the Type name.
+		// </summary>
+		public override string ToString ()
+		{
+			return GetType().FullName;
+		}
+	}
+}
diff --git a/mcs/class/corlib/System/Version.cs b/mcs/class/corlib/System/Version.cs
new file mode 100644
index 00000000000..616e7d5d030
--- /dev/null
+++ b/mcs/class/corlib/System/Version.cs
@@ -0,0 +1,277 @@
+//
+// System.Version.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using System.Globalization;
+
+namespace System {
+	
+	[Serializable]
+	public sealed class Version : ICloneable, IComparable {
+
+		int major, minor, build, revision;
+
+		private const int UNDEFINED = -1;
+		
+		private void CheckedSet (int defined, int major, int minor, int build, int revision)
+		{
+			// defined should be 2, 3 or 4
+
+			if (major < 0) {
+				throw new ArgumentOutOfRangeException ("major");
+			}
+			this.major = major;
+
+			if (minor < 0) {
+				throw new ArgumentOutOfRangeException ("minor");
+			}
+			this.minor = minor;
+
+			if (defined == 2) {
+				this.build = UNDEFINED;
+				this.revision = UNDEFINED;
+				return;
+			}
+
+			if (build < 0) {
+				throw new ArgumentOutOfRangeException ("build");
+			}
+			this.build = build;
+
+			if (defined == 3) {
+				this.revision = UNDEFINED;
+				return;
+			}
+
+			if (revision < 0) {
+				throw new ArgumentOutOfRangeException ("revision");
+			}
+			this.revision = revision;
+		}
+
+		public Version ()
+		{
+			CheckedSet (2, 0, 0, -1, -1);
+		}
+			
+		public Version (string version)
+		{
+			int n;
+			string [] vals;
+			int major = -1, minor = -1, build = -1, revision = -1;
+			
+			if (version == null) {
+				throw new ArgumentNullException ("version");
+			}
+
+			vals = version.Split (new Char [] {'.'});
+			n = vals.Length;
+
+			if (n < 2 || n > 4) {
+				throw new ArgumentException (Locale.GetText ("There must be 2, 3 or 4 components in the version string"));
+			}
+	
+			if (n > 0)
+				major = int.Parse (vals [0]);
+			if (n > 1)
+				minor = int.Parse (vals [1]);
+			if (n > 2)
+				build = int.Parse (vals [2]);
+			if (n > 3)
+				revision = int.Parse (vals [3]);
+
+			CheckedSet (n, major, minor, build, revision);
+		}
+		
+		public Version (int major, int minor)
+		{
+			CheckedSet (2, major, minor, 0, 0);
+		}
+
+		public Version (int major, int minor, int build)
+		{
+			CheckedSet (3, major, minor, build, 0);
+		}
+
+		public Version (int major, int minor, int build, int revision)
+		{
+			CheckedSet (4, major, minor, build, revision);
+		}
+
+		public int Build {
+			get {
+				return build;
+			}
+		}
+
+		public int Major {
+			get {
+				return major;
+			}
+		}
+
+		public int Minor {
+			get {
+				return minor;
+			}
+		}
+
+		public int Revision {
+			get {
+				return revision;
+			}
+		}
+
+		public object Clone ()
+		{
+			return new Version (major, minor, build, revision);
+		}
+
+		public int CompareTo (object version)
+		{
+			Version v;
+			
+			// LAMESPEC: Docs are unclear whether an 
+			// ArgumentNullException should be thrown are 
+			// that a value > 0 should be returned.
+			if (version == null)
+				return 1;
+			//	throw new ArgumentNullException ("version");
+			
+			if (! (version is Version))
+				throw new ArgumentException (Locale.GetText ("Argument to Version.CompareTo must be a Version"));
+
+			v = version as Version;
+
+			if (this.major > v.major)
+				return 1;
+			else if (this.major < v.major)
+				return -1;
+
+			if (this.minor > v.minor)
+				return 1;
+			else if (this.minor < v.minor)
+				return -1;
+
+			if (this.build > v.build)
+				return 1;
+			else if (this.build < v.build)
+				return -1;
+
+			if (this.revision > v.revision)
+				return 1;
+			else if (this.revision < v.revision)
+				return -1;
+
+			return 0;
+		}
+
+		public override bool Equals (object obj)
+		{
+			Version x;
+			
+			if (obj == null || !(obj is Version))
+				return false;
+
+			x = (Version) obj;
+			
+			if ((x.major == major) &&
+			    (x.minor == minor) &&
+			    (x.build == build) &&
+			    (x.revision == revision))
+				return true;
+			return false;
+		}
+
+		public override int GetHashCode ()
+		{
+			return (revision << 24) | (build << 16) | (minor << 8) | major;
+		}
+
+		// <summary>
+		//   Returns a stringified representation of the version, format:
+		//   major.minor[.build[.revision]]
+		// </summary>
+		public override string ToString ()
+		{
+			string mm = major.ToString () + "." + minor.ToString ();
+			
+			if (build != UNDEFINED)
+				mm = mm + "." + build.ToString ();
+			if (revision != UNDEFINED)
+				mm = mm + "." + revision.ToString ();
+
+			return mm;
+		}
+
+		// <summary>
+		//    LAME: This API is lame, since there is no way of knowing
+		//    how many fields a Version object has, it is unfair to throw
+		//    an ArgumentException, but this is what the spec claims.
+		//
+		//    ie, Version a = new Version (1, 2);  a.ToString (3) should
+		//    throw the expcetion.
+		// </summary>
+		public string ToString (int fields)
+		{
+			if (fields == 0)
+				return "";
+			if (fields == 1)
+				return major.ToString ();
+			if (fields == 2)
+				return major.ToString () + "." + minor.ToString ();
+			if (fields == 3){
+				if (build == UNDEFINED)
+					throw new ArgumentException (Locale.GetText ("fields is larger than the number of components defined in this instance"));
+				return major.ToString () + "." + minor.ToString () + "." +
+					build.ToString ();
+			}
+			if (fields == 4){
+				if (build == UNDEFINED || revision == UNDEFINED)
+					throw new ArgumentException (Locale.GetText ("fields is larger than the number of components defined in this instance"));
+				return major.ToString () + "." + minor.ToString () + "." +
+					build.ToString () + "." + revision.ToString ();
+			}
+			throw new ArgumentException (Locale.GetText ("Invalid fields parameter: ") + fields.ToString());	
+		}
+
+		public static bool operator== (Version v1, Version v2) 
+		{
+			return v1.Equals (v2);
+		}
+
+		public static bool operator!= (Version v1, Version v2)
+		{
+			return !v1.Equals (v2);
+		}
+
+		public static bool operator> (Version v1, Version v2)
+		{
+			return v1.CompareTo (v2) > 0;
+		}
+
+		public static bool operator>= (Version v1, Version v2)
+		{
+			return v1.CompareTo (v2) >= 0;
+		}
+
+		public static bool operator< (Version v1, Version v2)
+		{
+			return v1.CompareTo (v2) < 0;
+		}
+
+		public static bool operator<= (Version v1, Version v2)
+		{
+			return v1.CompareTo (v2) <= 0;
+		}
+
+	}
+}
+
+
+
diff --git a/mcs/class/corlib/System/Void.cs b/mcs/class/corlib/System/Void.cs
new file mode 100644
index 00000000000..768d75e7141
--- /dev/null
+++ b/mcs/class/corlib/System/Void.cs
@@ -0,0 +1,15 @@
+//
+// System.Void.cs
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+namespace System {
+	
+	[Serializable]
+	public struct Void {
+	}
+}
diff --git a/mcs/class/corlib/System/WeakReference.cs b/mcs/class/corlib/System/WeakReference.cs
new file mode 100755
index 00000000000..c689a6e4f26
--- /dev/null
+++ b/mcs/class/corlib/System/WeakReference.cs
@@ -0,0 +1,114 @@
+//
+// System.WeakReference.cs
+//
+// Author:
+//   Ajay kumar Dwivedi (adwiv@yahoo.com)
+//
+
+using System.Runtime.Serialization;
+using System.Runtime.InteropServices;
+
+namespace System
+{
+	/// <summary>
+	/// Summary description for WeakReference.
+	/// </summary>
+	[Serializable]
+	public class WeakReference : ISerializable
+	{
+		//Fields
+		private bool isLongReference;
+		private GCHandle gcHandle;
+
+		// Helper method for constructors
+		//Should not be called from any other method.
+		private void AllocateHandle(Object target)
+		{
+			if(this.isLongReference)
+			{
+				this.gcHandle = GCHandle.Alloc(target, GCHandleType.WeakTrackResurrection);
+			}
+			else
+			{
+				this.gcHandle = GCHandle.Alloc(target, GCHandleType.Weak);
+			}
+		}		
+		
+		
+		//Constructors
+		public WeakReference(object target)
+			: this(target,false)
+		{}
+
+		
+		public WeakReference(object target, bool trackResurrection)
+		{
+			this.isLongReference = trackResurrection;
+			AllocateHandle(target);
+		}
+
+		
+		protected WeakReference(SerializationInfo info, StreamingContext context)
+		{
+			if (info == null)
+				throw new ArgumentNullException ("info");
+
+			this.isLongReference = info.GetBoolean ("TrackResurrection");
+			Object target = info.GetValue ("TrackedObject", typeof (System.Object));
+
+			AllocateHandle(target);
+		}
+
+		
+		// Properties
+		public virtual bool IsAlive 
+		{
+			get
+			{
+				//Target property takes care of the exception
+				return (Target != null);		
+			}
+		}
+
+		public virtual object Target 
+		{
+			get
+			{
+				//Exception is thrown by gcHandle's Target
+				return this.gcHandle.Target;
+			}
+			set
+			{
+				this.gcHandle.Target = value;
+			}
+		}
+
+		public virtual bool TrackResurrection 
+		{
+			get
+			{
+				return this.isLongReference;
+			}
+		}
+
+		//Methods
+		~WeakReference()
+		{
+			gcHandle.Free();
+		}
+
+		public virtual void GetObjectData(SerializationInfo info, StreamingContext context)
+		{
+			if (info == null)
+				throw new ArgumentNullException ("info");
+
+			info.AddValue ("TrackResurrection", TrackResurrection);
+			
+			try {
+				info.AddValue ("TrackedObject", Target);
+			} catch(Exception) {
+				info.AddValue("TrackedObject",null);
+			}
+		}
+	}
+}
\ No newline at end of file
diff --git a/mcs/class/corlib/System/_AppDomain.cs b/mcs/class/corlib/System/_AppDomain.cs
new file mode 100755
index 00000000000..ceeff566375
--- /dev/null
+++ b/mcs/class/corlib/System/_AppDomain.cs
@@ -0,0 +1,161 @@
+//
+// System._AppDomain
+//
+// Author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+
+using System.Security;
+using System.Security.Policy;
+using System.Security.Principal;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Globalization;
+using System.Runtime.Remoting;
+
+namespace System
+{
+
+[CLSCompliant(false)]
+public interface _AppDomain {
+
+	string BaseDirectory {get; }
+	string DynamicDirectory {get; }
+	Evidence Evidence {get; }
+	string FriendlyName {get; }
+	string RelativeSearchPath {get; }
+	bool ShadowCopyFiles {get; }
+
+	void AppendPrivatePath (string path);
+	void ClearPrivatePath ();
+	void ClearShadowCopyPath ();
+
+	ObjectHandle CreateInstance (string assemblyName, string typeName);
+	ObjectHandle CreateInstance (
+		string assemblyName,
+		string typeName,
+		object[] activationAttributes);
+	ObjectHandle CreateInstance (
+		string assemblyName,
+		string typeName,
+		bool ignoreCase,
+		BindingFlags bindingAttr,
+		Binder binder,
+		object[] args,
+		CultureInfo culture,
+		object[] activationAttributes,
+		Evidence securityAttribtutes);
+
+	ObjectHandle CreateInstanceFrom (string assemblyFile, string typeName);
+	ObjectHandle CreateInstanceFrom (
+		string assemblyName, string typeName,
+		object[] activationAttributes);
+	ObjectHandle CreateInstanceFrom (string assemblyName,
+		string typeName,
+		bool ignoreCase,
+		BindingFlags bindingAttr,
+		Binder binder,
+		object[] args,
+		CultureInfo culture,
+		object[] activationAttributes,
+		Evidence securityAttribtutes);
+
+	AssemblyBuilder DefineDynamicAssembly (
+		AssemblyName name,
+		AssemblyBuilderAccess access);
+	AssemblyBuilder DefineDynamicAssembly (
+		AssemblyName name,
+		AssemblyBuilderAccess access,
+		Evidence evidence);
+	AssemblyBuilder DefineDynamicAssembly (
+		AssemblyName name,
+		AssemblyBuilderAccess access, string dir);
+	AssemblyBuilder DefineDynamicAssembly (
+		AssemblyName name,
+		AssemblyBuilderAccess access,
+		string dir,
+		Evidence evidence);
+	AssemblyBuilder DefineDynamicAssembly (
+		AssemblyName name,
+		AssemblyBuilderAccess access,
+		PermissionSet requiredPermissions,
+		PermissionSet optionalPermissions,
+		PermissionSet refusedPersmissions);
+	AssemblyBuilder DefineDynamicAssembly (
+		AssemblyName name,
+		AssemblyBuilderAccess access,
+		Evidence evidence,
+		PermissionSet requiredPermissions,
+		PermissionSet optionalPermissions,
+		PermissionSet refusedPersmissions);
+	AssemblyBuilder DefineDynamicAssembly (
+		AssemblyName name,
+		AssemblyBuilderAccess access,
+		string dir,
+		PermissionSet requiredPermissions,
+		PermissionSet optionalPermissions,
+		PermissionSet refusedPersmissions);
+	AssemblyBuilder DefineDynamicAssembly (
+		AssemblyName name,
+		AssemblyBuilderAccess access,
+		string dir,
+		Evidence evidence,
+		PermissionSet requiredPermissions,
+		PermissionSet optionalPermissions,
+		PermissionSet refusedPersmissions);
+	AssemblyBuilder DefineDynamicAssembly (
+		AssemblyName name,
+		AssemblyBuilderAccess access,
+		string dir,
+		Evidence evidence,
+		PermissionSet requiredPermissions,
+		PermissionSet optionalPermissions,
+		PermissionSet refusedPersmissions,
+		bool isSynchronized);
+
+	void DoCallBack (CrossAppDomainDelegate theDelegate);
+	bool Equals (object other);
+
+	int ExecuteAssembly (string assemblyFile);
+	int ExecuteAssembly (string assemblyFile, Evidence assemblySecurity);
+	int ExecuteAssembly (
+		string assemblyFile,
+		Evidence assemblySecurity,
+		string[] args);
+
+	Assembly[] GetAssemblies ();
+	object GetData (string name);
+	int GetHashCode();
+	object GetLifetimeService ();
+	Type GetType ();
+	object InitializeLifetimeService ();
+
+	Assembly Load (AssemblyName assemblyRef);
+	Assembly Load (byte[] rawAssembly);
+	Assembly Load (string assemblyString);
+	Assembly Load (AssemblyName assemblyRef, Evidence assemblySecurity);
+	Assembly Load (byte[] rawAssembly, byte[] rawSymbolStore);
+	Assembly Load (string assemblyString, Evidence assemblySecurity);
+	Assembly Load (
+		byte[] rawAssembly,
+		byte[] rawSymbolStore,
+		Evidence securityEvidence);
+
+	void SetAppDomainPolicy (PolicyLevel domainPolicy);
+	void SetCachePath (string s);
+	void SetData (string name, object data);
+	void SetPrincipalPolicy (PrincipalPolicy policy);
+	void SetShadowCopyPath (string s);
+	void SetThreadPrincipal (IPrincipal principal);
+	string ToString ();
+
+	event AssemblyLoadEventHandler AssemblyLoad;
+	event ResolveEventHandler AssemblyResolve;
+	event EventHandler DomainUnload;
+	event EventHandler ProcessExit;
+	event ResolveEventHandler ResourceResolve;
+	event ResolveEventHandler TypeResolve;
+	event UnhandledExceptionEventHandler UnhandledException;
+}
+
+}
diff --git a/mcs/class/corlib/Test/.cvsignore b/mcs/class/corlib/Test/.cvsignore
new file mode 100644
index 00000000000..8128ad24ebb
--- /dev/null
+++ b/mcs/class/corlib/Test/.cvsignore
@@ -0,0 +1,6 @@
+*.dll
+*.pdb
+*.temp
+.makefrag
+.response
+NUnit.Prefs
diff --git a/mcs/class/corlib/Test/AllTests.cs b/mcs/class/corlib/Test/AllTests.cs
new file mode 100644
index 00000000000..e7a49c01fef
--- /dev/null
+++ b/mcs/class/corlib/Test/AllTests.cs
@@ -0,0 +1,39 @@
+//

+// Mono.Tests.AllTests.cs

+//

+// Author:

+//      Alexander Klyubin (klyubin@aqris.com)

+//

+// (C) 2001

+//

+

+using System;

+using NUnit.Framework;

+

+namespace MonoTests {

+        /// <summary>

+        ///   Combines all available unit tests into one test suite.

+        /// </summary>

+        public class AllTests : TestCase {

+                public AllTests(string name) : base(name) {}

+                

+                public static ITest Suite 

+                { 

+                        get 

+                        {

+                                TestSuite suite =  new TestSuite();

+                                suite.AddTest(System.AllTests.Suite);

+                                suite.AddTest(System.Collections.AllTests.Suite);

+                                suite.AddTest(System.Security.AllTests.Suite);

+                                suite.AddTest(System.Security.Cryptography.AllTests.Suite);

+                                suite.AddTest(System.IO.AllTests.Suite);

+                                suite.AddTest(System.Text.AllTests.Suite);

+                                suite.AddTest(System.Security.Permissions.AllTests.Suite);

+                                suite.AddTest(System.Resources.AllTests.Suite);

+				suite.AddTest(System.Runtime.Serialization.AllTests.Suite);

+//				suite.AddTest(System.Security.Policy.AllTests.Suite);

+				return suite;

+                        }

+                }

+        }

+}

diff --git a/mcs/class/corlib/Test/ChangeLog b/mcs/class/corlib/Test/ChangeLog
new file mode 100644
index 00000000000..0c6b438d7f1
--- /dev/null
+++ b/mcs/class/corlib/Test/ChangeLog
@@ -0,0 +1,240 @@
+2002-08-10  Jason Diamond  <jason@injektilo.org>
+
+	* makefile.gnu: Added test target. Please start using it.
+
+2002-07-24  Duncan Mak  <duncan@ximian.com>
+
+	* corlib_linux_test.args: Add Cesar's BufferTest to the list.
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	* makefile.gnu: Added makefile for self-hosting compile on GNU/Linux.
+	Don't add this to the top-level makefile.gnu, this must be run after
+	everything is compiled.
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	The test suite now compiles with MCS on GNU/Linux :-)
+
+	* corlib_linux_test.args: Added MCS command file to compile this.
+
+2002-07-11  Nick Drochak  <ndrochak@gol.com>

+

+	* .cvsignore: Ignore temp files too.

+

+2002-06-19  Nick Drochak  <ndrochak@gol.com>

+

+	* AllTests.cs: Add missing test: System.Runtime.Serialization.

+

+2002-06-01  Nick Drochak  <ndrochak@gol.com>

+

+	* corlib_test.build: Change the order of the builds.  Just makes it a 

+	bit faster for my testing since I need the linux dll.

+

+2002-05-19  Martin Baulig  <martin@gnome.org>
+
+	* Added System.Security.Cryptography.FromBase64TransformTest.cs.
+
+2002-05-19  Martin Baulig  <martin@gnome.org>
+
+	* TheTests.cs: Removed.
+
+	* MartinTests.cs: Removed.
+
+	* corlib_test.build: Don't create Runtest.corlib.exe anymore.
+
+2002/05/07  Nick Drochak <ndrochak@gol.com>

+

+	* AllTests.cs: Do not run the System.Net tests from here, they belong

+	in the System assembly tests.

+

+2002-04-27  Lawrence Pit <loz@cable.a2000.nl>

+

+	* System.Security/: added directory

+	* AllTests.cs: added Syste,Security suite.

+

+2002-04-15  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* System.Net/: added directory.
+	* AllTests.cs: added System.Net suite.
+
+2002/04/04 Nick Drochak <ndrochak@gol.com>

+

+ 	* corlib_test.build: Again; disable running of NUnit tests against mono 

+	corlib.  There are so many icalls now, that these tests need

+	to be run inside mint and mono.  Will change this soon to run

+	the tests using both.  It still runs the tests against the mscorlib

+	to validate the tests themselves.

+

+2002-03-31  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* corlib_test.build: don't exclude IntegerFormatterTest.
+
+	* System/AllTests.cs: added IntegerFormatterTest suite.
+
+	* System/IntegerFormatterTest.cs: totally reworked to use NUnit. Right
+	now it fails cause I haven't implemented Parse () methods yet. With
+	corlib_reference.dll runs ok.
+
+2002/03/28  Nick Drochak <ndrochak@gol.com>

+

+	* corlib_test.build: Re-exclude it in a couple of places where it was

+	breaking the build.  This test is not an NUnit test.  So, it doesn't 

+	belong in these dll's until it's made a proper NUnit test.

+

+2002-03-28  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* corlib_test.build: remove two more lines that excluded
+	IntegerFormatterTest.
+
+2002/03/28  Nick Drochak <ndrochak@gol.com>

+

+	* corlib_test.build: Don't exclude IntegerFormatterTest any more.

+

+2002-03-20  Nick Drochak  <ndrochak@gol.com>

+

+	* corlib_test.build: On 'clean' remove all the dll's and pdb's

+

+2002/03/19  Nick Drochak <ndrochak@gol.com>

+

+	* corlib_test.build: Re-include tests into the build.

+

+2002-03-18  Nick Drochak  <ndrochak@gol.com>

+

+	* corlib_test.build: build RunTests.corlib.exe with only mono class

+	libs. This tells what we are missing to run the tests.

+

+2002/03/18  Nick Drochak <ndrochak@gol.com>

+

+	* corlib_test.build: disable running of NUnit tests against mono 

+	corlib.  There are so many icalls now, that these tests need

+	to be run inside mint and mono.  Will change this soon to run

+	the tests using both.  It still runs the tests against the mscorlib

+	to validate the tests themselves.

+

+2002/03/07  Nick Drochak <ndrochak@gol.com>

+

+	* corlib_test.build: resolve chicken and egg problem. Only build and 

+	execute test assemblies when 'make test' is specified. Need to do a

+	'make' first now before 'make test'.

+

+2002-03-03  Nick Drochak  <ndrochak@gol.com>

+

+	* corlib_test.build: Turn on debug flag for complier so that...well...

+	debugging is easier.

+

+2002-03-01  Duncan Mak  <duncan@ximian.com>
+
+	* System.Runtime.Serialization/ObjectIDGeneratorTests.cs: Added
+	test for System.Runtime.Serialization.ObjectIDGenerator.
+
+2002-02-27  Martin Baulig  <martin@gnome.org>
+
+	* RunTests.cs: Removed. This is now in the nant directory.
+
+	* corlib_test.build: Don't link TheTests.cs into the dlls, renamed
+	RunTests.exe to RunTests.corlib.exe and link it against NUnitBase.dll.
+
+2002-02-27  Martin Baulig  <martin@gnome.org>
+
+	* scan-tests.pl: Moved to ../../../tools/.
+
+2002-02-26  Martin Baulig  <martin@gnome.org>
+
+	* MartinTests.cs: New file. This contains all the tests which already
+	work on Linux.
+
+	* RunTests.cs: A small custom testrunner to run the tests on Linux.
+
+	* scan-tests.pl: Call this perl script with either MartinTests.cs or
+	AllTests.cs as argument and redirect the output the TheTests.cs - it'll
+	create a file which calls all the tests.
+
+	* TheTests.cs: This is automatically generated from scan-tests.pl but
+	needs some manual editing, so it's in CVS.
+
+	* corlib_test.build: In addition to the libraries, create an executable
+	called RunTests.exe which contains all the tests and the custom test
+	runner. You can run this executable on Windows to test things with
+	mscorlib or on Linux using the mono runtime.
+
+2002-02-26  Martin Baulig  <martin@gnome.org>
+
+	* */*.cs: added zero-args constructors for all the test classes.
+
+2002-02-21  Mark Crichton <crichton@gimp.org>
+
+	* System.Security.Cryptography.RNGCryptoServiceProviderTest.cs:
+	Fixed typo
+
+2002-02-21  Mark Crichton <crichton@gimp.org>
+
+	* Addded System.Security.Cryptography.RNGCryptoServiceProviderTest.cs
+	* System.Security.Cryptography/AllTests.cs: Added
+	RNGCryptoServiceProviderTest.
+
+2002-02-17  Duco Fijma <duco@lorentz.xs4all.nl>

+	* Added System/GuidTest.cs

+

+2002-02-10  Nick Drochak  <ndrochak@gol.com>

+

+	* corlib_test.build: Remove duplicate excludes for 

+	* AllTests.cs: Add System.Security.Policy tests.  However, commented

+	this out because NUnit is throwing an exception.  Need to figure

+	that out first.

+	

+2002-02-09  Nick Drochak  <ndrochak@gol.com>

+

+	* corlib_test.build: compile with mscorlib to test the tests.  This

+	will be our "reference" check to make sure the tests work.

+

+2002-01-25  Nick Drochak  <ndrochak@gol.com>

+

+	* AllTests.cs: Add System.Resources.AllTests.Suite

+

+2002-01-14  Nick Drochak  <ndrochak@gol.com>

+

+	* AllTests.cs: Add System.Security.Permissions.AllTests.Suite

+

+2002-01-05  Nick Drochak  <ndrochak@gol.com>

+

+	* .cvsignore: ignore the debug files *.pdb

+

+2002-01-04   Duco Fijma <duco@lorentz.xs4all.nl>

+	* Added System/TimeSpanTest.cs

+

+2002-01-04  John R. Hicks <angryjohn69@nc.rr.com>

+	* Added DebugTest to System.Diagnostics tests.

+2001-11-08  Nick Drochak  <ndrochak@gol.com>

+

+	* corlib_test.build: Include test for Queue in the dll

+

+2001-10-15  Martin Weindel <martin.weindel@t-online.de>

+

+        * added System/DecimalTest.cs and System/DecimalTest2.cs

+

+2001-10-11  Jeffrey Stedfast  <fejj@ximian.com>

+

+	* System/StringTest.cs: Added.

+

+2001-10-10  Thomas Neidhart <tome@sbox.tugraz.at>

+

+	* added directory System.Security.Cryptography 

+	* added TestSuite for all Crypto classes 

+	* added tests for System.Security.Cryptography.AsymmetricAlgorithm 

+	and System.Security.Cryptography.SymmetricAlgorithm

+    

+2001-10-02  Martin Weindel <martin.weindel@t-online.de>

+

+	* added directory System 

+	* added tests for System.Int64

+

+2001-08-29  Alexander Klyubin <klyubin@aqris.com>

+  

+	* Added tests for System.Diagnostics.StackFrame and

+	System.Diagnostics.StackTrace. The tests only run against

+	Microsoft's implementation as StackTrace and StackFrame classes in

+	Mono are not yet properly implemented.

+    

+	Note that StackFrameTest runs properly only if compiled with

+	/debug switch.

diff --git a/mcs/class/corlib/Test/System.Collections/AllTests.cs b/mcs/class/corlib/Test/System.Collections/AllTests.cs
new file mode 100644
index 00000000000..70f735c6b7d
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/AllTests.cs
@@ -0,0 +1,39 @@
+// Testsuite.System.AllSystemTests.cs
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System.Collections {
+        /// <summary>
+        ///   Combines all available unit tests into one test suite.
+        /// </summary>
+        public class AllTests : TestCase {
+                public AllTests(string name) : base(name) {}
+                
+                public static ITest Suite 
+                { 
+                        get 
+                        {
+                                TestSuite suite =  new TestSuite();
+                                suite.AddTest(ArrayListTest.Suite);
+                                suite.AddTest(BitArrayTest.Suite);
+                                suite.AddTest(CaseInsensitiveComparerTest.Suite);
+                                suite.AddTest(CaseInsensitiveHashCodeProviderTest.Suite);
+                                suite.AddTest(CollectionBaseTest.Suite);
+                                suite.AddTest(ComparerTest.Suite);
+                                suite.AddTest(HashtableTest.Suite);
+                                suite.AddTest(QueueTest.Suite);
+                                suite.AddTest(ReadOnlyCollectionBaseTest.Suite);
+                                suite.AddTest(SortedListTest.Suite);
+                                suite.AddTest(StackTest.Suite);
+                                return suite;
+                        }
+                }
+        }
+}
+
diff --git a/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs b/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs
new file mode 100644
index 00000000000..49be77b17a8
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/ArrayListTest.cs
@@ -0,0 +1,1451 @@
+// ArrayListTest.cs - NUnit Test Cases for the System.Collections.ArrayList class

+//

+// David Brandt (bucky@keystreams.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+

+using System;

+using System.Collections;

+

+using NUnit.Framework;

+

+

+

+namespace MonoTests.System.Collections {

+

+

+/// <summary>ArrayList test.</summary>

+public class ArrayListTest : TestCase {

+	public ArrayListTest() : base ("MonoTests.System.ArrayListTest testsuite") {}

+	public ArrayListTest(string name) : base(name) {}

+

+	protected override void SetUp() 

+	{

+	}

+

+	protected override void TearDown() 

+	{

+	}

+

+	public static ITest Suite {

+		get { 

+			return new TestSuite(typeof(ArrayListTest)); 

+		}

+	}

+

+	public void TestCtor() {

+		{

+			ArrayList al1 = new ArrayList();

+			AssertNotNull("no basic ArrayList", al1);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null icollection error not thrown", 

+			       errorThrown);

+		}

+		{

+			// what can I say?  I like chars.  [--DB]

+			char[] coll = {'a', 'b', 'c', 'd'};

+			ArrayList al1 = new ArrayList(coll);

+			AssertNotNull("no icollection ArrayList", al1);

+			for (int i = 0; i < coll.Length; i++) {

+				AssertEquals(i + " not ctor'ed properly.",

+					     coll[i], al1[i]);

+			}

+		}

+		{

+			try {

+				Char[,] c1 = new Char[2,2];

+				ArrayList al1 = new ArrayList(c1);

+				Fail ("Should fail with multi-dimensional array in constructor.");

+			} catch (RankException) {

+			}

+		}

+

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList(-1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("negative capacity error not thrown", 

+			       errorThrown);

+		}

+	}

+

+	public void TestCapacity() {

+		for (int i = 1; i < 100; i++) {

+			ArrayList al1 = new ArrayList(i);

+			AssertEquals("Bad capacity of " + i,

+				     i, al1.Capacity);

+		}

+		{

+			ArrayList al1 = new ArrayList(0);

+			// LAMESPEC: 

+			// AssertEquals("Bad capacity when set to 0",

+			//	     16, al1.Capacity);

+			al1.Add ("?");			

+			AssertEquals("Bad capacity when set to 0",

+				     16, al1.Capacity);

+		}		

+		{

+			ArrayList al1 = new ArrayList();

+			AssertEquals("Bad default capacity",

+				     16, al1.Capacity);

+		}

+	}

+	

+	public void TestCount() {

+		{

+			ArrayList al1 = new ArrayList();

+			AssertEquals("Bad initial count",

+				     0, al1.Count);

+			for (int i = 1; i <= 100; i++) {

+				al1.Add(i);

+				AssertEquals("Bad count " + i,

+					     i, al1.Count);

+			}

+		}

+		for (int i = 0; i < 100; i++) {

+			char[] coll = new Char[i];

+			ArrayList al1 = new ArrayList(coll);

+			AssertEquals("Bad count for " + i,

+				     i, al1.Count);

+		}

+	}

+

+	public void TestIsFixed() {

+		ArrayList al1 = new ArrayList();

+		Assert("should not be fixed by default", !al1.IsFixedSize);

+		ArrayList al2 = ArrayList.FixedSize(al1);

+		Assert("fixed-size wrapper not working", al2.IsFixedSize);

+	}

+

+	public void TestIsReadOnly() {

+		ArrayList al1 = new ArrayList();

+		Assert("should not be ReadOnly by default", !al1.IsReadOnly);

+		ArrayList al2 = ArrayList.ReadOnly(al1);

+		Assert("read-only wrapper not working", al2.IsReadOnly);

+	}

+

+	public void TestIsSynchronized() {

+		ArrayList al1 = new ArrayList();

+		Assert("should not be synchronized by default", 

+		       !al1.IsSynchronized);

+		ArrayList al2 = ArrayList.Synchronized(al1);

+		Assert("synchronized wrapper not working", al2.IsSynchronized);

+	}

+

+	public void TestItem() {

+		ArrayList al1 = new ArrayList();

+		{

+			bool errorThrown = false;

+			try {

+				object o = al1[-1];

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("negative item error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				object o = al1[1];

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("past-end item error not thrown", 

+			       errorThrown);

+		}

+		for (int i = 0; i <= 100; i++) {

+			al1.Add(i);

+		}

+		for (int i = 0; i <= 100; i++) {

+			AssertEquals("item not fetched for " + i,

+				     i, al1[i]);

+		}

+	}

+

+	public void TestAdapter() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = ArrayList.Adapter(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("null adapter error not thrown", 

+			       errorThrown);

+		}

+		{		

+			char[] list = {'a', 'b', 'c', 'd'};

+			ArrayList al1 = ArrayList.Adapter(list);

+			AssertNotNull("Couldn't get an adapter", al1);

+			for (int i = 0; i < list.Length; i++) {

+				AssertEquals("adapter not adapting", list[i], al1[i]);

+			}

+			list[0] = 'z';

+			for (int i = 0; i < list.Length; i++) {

+				AssertEquals("adapter not adapting", list[i], al1[i]);

+			}

+		}

+		// TODO - test other adapter types?

+	}

+

+	public void TestAdd() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.FixedSize(new ArrayList());

+				al1.Add("Hi!");

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("add to fixed size error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList());

+				al1.Add("Hi!");

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			Assert("add to read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			ArrayList al1 = new ArrayList();

+			for (int i = 1; i <= 100; i++) {

+				al1.Add(i);

+				AssertEquals("add failed " + i,

+					     i, al1.Count);

+				AssertEquals("add failed " + i,

+					     i, al1[i-1]);

+				

+			}

+		}

+		{

+			string [] strArray = new string [] {};

+			ArrayList al1 = new ArrayList (strArray);

+			al1.Add ("Hi!");

+			al1.Add ("Hi!");

+			AssertEquals ("add failed", 2, al1.Count);

+		}

+	}

+	

+	public void TestAddRange() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.FixedSize(new ArrayList());

+				String[] s1 = {"Hi!"};

+				al1.AddRange(s1);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("add to fixed size error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList());

+				String[] s1 = {"Hi!"};

+				al1.AddRange(s1);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			Assert("add to read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList();

+				al1.AddRange(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 3: " + e.ToString());

+			}

+			Assert("add to read only error not thrown", 

+			       errorThrown);

+		}

+

+		{

+			ArrayList a1 = new ArrayList();

+			AssertEquals("ArrayList should start empty",

+				     0, a1.Count);

+			char[] coll = {'a', 'b', 'c'};

+			a1.AddRange(coll);

+			AssertEquals("ArrayList has wrong elements",

+				     3, a1.Count);

+			a1.AddRange(coll);

+			AssertEquals("ArrayList has wrong elements",

+				     6, a1.Count);

+		}

+	}

+

+	public void TestBinarySearch() {

+		{

+		bool errorThrown = false;

+		try {

+			ArrayList al1 = new ArrayList();

+			String[] s1 = {"This", "is", "a", "test"};

+			al1.AddRange(s1);

+			al1.BinarySearch(42);

+		} catch (InvalidOperationException) {

+			// this is what .NET throws

+			errorThrown = true;

+		} catch (ArgumentException) {

+			// this is what the docs say it should throw

+			errorThrown = true;

+		} catch (Exception e) {

+			Fail ("Incorrect exception thrown at 1: " + e.ToString());

+		}

+		Assert("search-for-wrong-type error not thrown", 

+		       errorThrown);

+		}

+		

+		{

+			char[] arr = {'a', 'b', 'b', 'c', 'c', 'c', 'd', 'd'};

+			ArrayList al1 = new ArrayList(arr);

+			Assert("couldn't find elem #1", 

+			       al1.BinarySearch('c') >= 3);

+			Assert("couldn't find elem #2", 

+			       al1.BinarySearch('c') < 6);

+		}

+		{

+			char[] arr = {'a', 'b', 'b', 'd', 'd', 'd', 'e', 'e'};

+			ArrayList al1 = new ArrayList(arr);

+			AssertEquals("couldn't find next-higher elem", 

+				     -4, al1.BinarySearch('c'));

+		}

+		{

+			char[] arr = {'a', 'b', 'b', 'c', 'c', 'c', 'd', 'd'};

+			ArrayList al1 = new ArrayList(arr);

+			AssertEquals("couldn't find end", 

+				     -9, al1.BinarySearch('e'));

+		}

+		

+	}

+

+	// TODO - BinarySearch with IComparer

+

+	public void TestClear() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.FixedSize(new ArrayList());

+				al1.Clear();

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("add to fixed size error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList());

+				al1.Clear();

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("add to read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			ArrayList al1 = new ArrayList();

+			al1.Add('c');

+			AssertEquals("should have one element",

+				     1, al1.Count);

+			al1.Clear();

+			AssertEquals("should be empty",

+				     0, al1.Count);

+		}

+		{

+			int[] i1 = {1,2,3,4};

+			ArrayList al1 = new ArrayList(i1);

+			AssertEquals("should have elements",

+				     i1.Length, al1.Count);

+			int capacity = al1.Capacity;

+			al1.Clear();

+			AssertEquals("should be empty again",

+				     0, al1.Count);

+			AssertEquals("capacity shouldn't have changed",

+				     capacity, al1.Capacity);

+		}

+	}

+

+	public void TestClone() {

+		{

+			char[] c1 = {'a', 'b', 'c'};

+			ArrayList al1 = new ArrayList(c1);

+			ArrayList al2 = (ArrayList)al1.Clone();

+			AssertEquals("ArrayList match", al1[0], al2[0]);

+			AssertEquals("ArrayList match", al1[1], al2[1]);

+			AssertEquals("ArrayList match", al1[2], al2[2]);

+		}

+		{

+			char[] d10 = {'a', 'b'};

+			char[] d11 = {'a', 'c'};

+			char[] d12 = {'b', 'c'};

+			char[][] d1 = {d10, d11, d12};

+			ArrayList al1 = new ArrayList(d1);

+			ArrayList al2 = (ArrayList)al1.Clone();

+			AssertEquals("Array match", al1[0], al2[0]);

+			AssertEquals("Array match", al1[1], al2[1]);

+			AssertEquals("Array match", al1[2], al2[2]);

+			

+			((char[])al1[0])[0] = 'z';

+			AssertEquals("shallow copy", al1[0], al2[0]);

+		}

+	}

+

+	public void TestContains() {

+		char[] c1 = {'a', 'b', 'c'};

+		ArrayList al1 = new ArrayList(c1);

+		Assert("never find a null", !al1.Contains(null));

+		Assert("can't find value", al1.Contains('b'));

+		Assert("shouldn't find value", !al1.Contains('?'));

+	}

+	

+	public void TestCopyTo() {

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				ArrayList al1 = new ArrayList(c1);

+				al1.CopyTo(null, 2);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("error not thrown 1", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				ArrayList al1 = new ArrayList(c1);

+				Char[,] c2 = new Char[2,2];

+				al1.CopyTo(c2, 2);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			Assert("error not thrown 2", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				// This appears to be a bug in the ArrayList Constructor.

+				// It throws a RankException if a multidimensional Array

+				// is passed. The docs imply that an IEnumerator is used

+				// to retrieve the items from the collection, so this should

+				// work.  In anycase this test is for CopyTo, so use what

+				// works on both platforms.

+				//Char[,] c1 = new Char[2,2];

+				Char[] c1 = new Char[2];

+				ArrayList al1 = new ArrayList(c1);

+				Char[] c2 = new Char[2];

+				al1.CopyTo(c2, 2);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 3: " + e.ToString());

+			}

+			Assert("error not thrown 3", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				ArrayList al1 = new ArrayList(c1);

+				Char[] c2 = new Char[2];

+				al1.CopyTo(c2, -1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 4: " + e.ToString());

+			}

+			Assert("error not thrown 4", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				ArrayList al1 = new ArrayList(c1);

+				Char[] c2 = new Char[2];

+				al1.CopyTo(c2, 3);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 5: " + e.ToString());

+			}

+			Assert("error not thrown 5", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				ArrayList al1 = new ArrayList(c1);

+				Char[] c2 = new Char[2];

+				al1.CopyTo(c2, 1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 6: " + e.ToString());

+			}

+			Assert("error not thrown 6", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				String[] c1 = {"String", "array"};

+				ArrayList al1 = new ArrayList(c1);

+				Char[] c2 = new Char[2];

+				al1.CopyTo(c2, 0);

+			} catch (InvalidCastException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 7: " + e.ToString());

+			}

+			Assert("error not thrown 7", errorThrown);

+		}

+

+		Char[] orig = {'a', 'b', 'c', 'd'};

+		ArrayList al = new ArrayList(orig);

+		Char[] copy = new Char[10];

+		Array.Clear(copy, 0, copy.Length);

+		al.CopyTo(copy, 3);

+		AssertEquals("Wrong CopyTo 0", (char)0, copy[0]);

+		AssertEquals("Wrong CopyTo 1", (char)0, copy[1]);

+		AssertEquals("Wrong CopyTo 2", (char)0, copy[2]);

+		AssertEquals("Wrong CopyTo 3", orig[0], copy[3]);

+		AssertEquals("Wrong CopyTo 4", orig[1], copy[4]);

+		AssertEquals("Wrong CopyTo 5", orig[2], copy[5]);

+		AssertEquals("Wrong CopyTo 6", orig[3], copy[6]);

+		AssertEquals("Wrong CopyTo 7", (char)0, copy[7]);

+		AssertEquals("Wrong CopyTo 8", (char)0, copy[8]);

+		AssertEquals("Wrong CopyTo 9", (char)0, copy[9]);

+	}

+

+	public void TestFixedSize() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = ArrayList.FixedSize(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null arg error not thrown", errorThrown);

+		}

+		{

+			ArrayList al1 = new ArrayList();

+			AssertEquals("arrays start un-fixed.",

+				     false, al1.IsFixedSize);

+			ArrayList al2 = ArrayList.FixedSize(al1);

+			AssertEquals("should be fixed.",

+				     true, al2.IsFixedSize);

+		}

+	}

+

+	public void TestGetEnumerator() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList();

+				IEnumerator en = a.GetEnumerator(-1,1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("negative index error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList();

+				IEnumerator en = a.GetEnumerator(1,-1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("negative index error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList();

+				IEnumerator en = a.GetEnumerator(1,1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("out-of-range index error not thrown", 

+			       errorThrown);

+		}

+		{

+			String[] s1 = {"this", "is", "a", "test"};

+			ArrayList al1 = new ArrayList(s1);

+			IEnumerator en = al1.GetEnumerator();

+			AssertNotNull("No enumerator", en);

+			

+			for (int i = 0; i < s1.Length; i++) {

+				en.MoveNext();

+				AssertEquals("Not enumerating", 

+					     al1[i], en.Current);

+			}

+		}

+		{

+			String[] s1 = {"this", "is", "a", "test"};

+			ArrayList al1 = new ArrayList(s1);

+			IEnumerator en = al1.GetEnumerator(1,2);

+			AssertNotNull("No enumerator", en);

+			

+			for (int i = 0; i < 2; i++) {

+				en.MoveNext();

+				AssertEquals("Not enumerating", 

+					     al1[i+1], en.Current);

+			}

+		}

+	}

+

+	public void TestGetRange() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList();

+				ArrayList b = a.GetRange(-1,1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("negative index error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList();

+				ArrayList b = a.GetRange(1,-1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("negative index error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList();

+				ArrayList b = a.GetRange(1,1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("out-of-range index error not thrown", 

+			       errorThrown);

+		}

+		{

+			char[] chars = {'a', 'b', 'c', 'd', 'e', 'f'};

+			ArrayList a = new ArrayList(chars);

+			ArrayList b = a.GetRange(1, 3);

+			AssertEquals("GetRange returned wrong size ArrayList", 3, b.Count);

+			for (int i = 0; i < b.Count; i++) {

+				AssertEquals("range didn't work",

+					     chars[i+1], b[i]);

+			}

+

+			a[2] = '?'; // should screw up ArrayList b.

+			bool errorThrown = false;

+			try {

+				int i = b.Count;

+			} catch (InvalidOperationException) {

+				errorThrown = true;

+			}

+			AssertEquals("Munging 'a' should mess up 'b'",

+				     true, errorThrown);

+		}

+	}

+

+	public void TestIndexOf() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList(1);

+				int i = a.IndexOf('a', -1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("negative indexof error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList(1);

+				int i = a.IndexOf('a', 2);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("past-end indexof error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList(1);

+				int i = a.IndexOf('a', 0, -1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("negative indexof error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList(1);

+				int i = a.IndexOf('a', 0, 2);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("past-end indexof error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList(2);

+				int i = a.IndexOf('a', 1, 2);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("past-end indexof error not thrown", 

+			       errorThrown);

+		}

+		{

+			char[] c = {'a', 'b', 'c', 'd', 'e'};

+			ArrayList a = new ArrayList(c);

+			AssertEquals("never find null", 

+				     -1, a.IndexOf(null));

+			AssertEquals("never find null", 

+				     -1, a.IndexOf(null, 0));

+			AssertEquals("never find null", 

+				     -1, a.IndexOf(null, 0, 5));

+			AssertEquals("can't find elem", 

+				     2, a.IndexOf('c'));

+			AssertEquals("can't find elem", 

+				     2, a.IndexOf('c', 2));

+			AssertEquals("can't find elem", 

+				     2, a.IndexOf('c', 2, 2));

+			AssertEquals("shouldn't find elem", 

+				     -1, a.IndexOf('c', 3, 2));

+			AssertEquals("shouldn't find", -1, a.IndexOf('?'));

+			AssertEquals("shouldn't find", -1, a.IndexOf(3));

+		}

+	}

+

+	public void TestInsert() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.FixedSize(new ArrayList());

+				al1.Insert(0, "Hi!");

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("insert to fixed size error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList());

+				al1.Insert(0, "Hi!");

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("insert to read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				al1.Insert(-1, "Hi!");

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("insert to read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				al1.Insert(4, "Hi!");

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("insert to read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			ArrayList al1 = new ArrayList();

+			AssertEquals("arraylist starts empty", 0, al1.Count);

+			al1.Insert(0, 'a');

+			al1.Insert(1, 'b');

+			al1.Insert(0, 'c');

+			AssertEquals("arraylist needs stuff", 3, al1.Count);

+			AssertEquals("arraylist got stuff", 'c', al1[0]);

+			AssertEquals("arraylist got stuff", 'a', al1[1]);

+			AssertEquals("arraylist got stuff", 'b', al1[2]);

+		}

+	}

+

+	public void TestInsertRange() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.FixedSize(new ArrayList());

+				string[] s = {"Hi!"};

+				al1.InsertRange(0, s);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("insert to fixed size error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList());

+				string[] s = {"Hi!"};

+				al1.InsertRange(0, s);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("insert to read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				string[] s = {"Hi!"};

+				al1.InsertRange(-1, s);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("negative index insert error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				string[] s = {"Hi!"};

+				al1.InsertRange(4, s);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("out-of-range insert error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				al1.InsertRange(0, null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null insert error not thrown", 

+			       errorThrown);

+		}

+		{

+			char[] c = {'a', 'b', 'c'};

+			ArrayList a = new ArrayList(c);

+			a.InsertRange(1, c);

+			AssertEquals("bad insert 1", 'a', a[0]);

+			AssertEquals("bad insert 2", 'a', a[1]);

+			AssertEquals("bad insert 3", 'b', a[2]);

+			AssertEquals("bad insert 4", 'c', a[3]);

+			AssertEquals("bad insert 5", 'b', a[4]);

+			AssertEquals("bad insert 6", 'c', a[5]);

+		}

+	}

+

+	public void TestLastIndexOf() {

+		//{

+		//bool errorThrown = false;

+		//try {

+		//ArrayList a = new ArrayList(1);

+		//int i = a.LastIndexOf('a', -1);

+		//} catch (ArgumentOutOfRangeException) {

+		//errorThrown = true;

+		//}

+		//Assert("first negative lastindexof error not thrown", 

+		//errorThrown);

+		//}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList a = new ArrayList(1);

+				int i = a.LastIndexOf('a', 2);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("past-end lastindexof error not thrown", 

+			       errorThrown);

+		}

+		//{

+		//bool errorThrown = false;

+		//try {

+		//ArrayList a = new ArrayList(1);

+		//int i = a.LastIndexOf('a', 0, -1);

+		//} catch (ArgumentOutOfRangeException) {

+		//errorThrown = true;

+		//}

+		//Assert("second negative lastindexof error not thrown", 

+		//errorThrown);

+		//}

+		//{

+		//bool errorThrown = false;

+		//try {

+		//ArrayList a = new ArrayList(1);

+		//int i = a.LastIndexOf('a', 0, 2);

+		//} catch (ArgumentOutOfRangeException) {

+		//errorThrown = true;

+		//}

+		//Assert("past-end lastindexof error not thrown", 

+		//errorThrown);

+		//}

+		//{

+		//bool errorThrown = false;

+		//try {

+		//ArrayList a = new ArrayList(2);

+		//int i = a.LastIndexOf('a', 0, 2);

+		//} catch (ArgumentOutOfRangeException) {

+		//errorThrown = true;

+		//}

+		//Assert("past-end lastindexof error not thrown", 

+		//errorThrown);

+		//}

+		int iTest = 0;

+		try {

+			char[] c = {'a', 'b', 'c', 'd', 'e'};

+			ArrayList a = new ArrayList(c);

+			AssertEquals("never find null", 

+				     -1, a.LastIndexOf(null));

+			iTest++;

+			AssertEquals("never find null", 

+				     -1, a.LastIndexOf(null, 4));

+			iTest++;

+			AssertEquals("never find null", 

+				     -1, a.LastIndexOf(null, 4, 5));

+			iTest++;

+			AssertEquals("can't find elem", 

+				     2, a.LastIndexOf('c'));

+			iTest++;

+			AssertEquals("can't find elem", 

+				     2, a.LastIndexOf('c', 4));

+			iTest++;

+			AssertEquals("can't find elem", 

+				     2, a.LastIndexOf('c', 3, 2));

+			iTest++;

+			AssertEquals("shouldn't find elem", 

+				     -1, a.LastIndexOf('c', 4, 2));

+			iTest++;

+			AssertEquals("shouldn't find", -1, a.LastIndexOf('?'));

+			iTest++;

+			AssertEquals("shouldn't find", -1, a.LastIndexOf(1));

+		} catch (Exception e) {

+			Fail ("Unexpected exception caught when iTest=" + iTest + ". e=" + e);

+		}

+	}

+

+	public void TestReadOnly() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = ArrayList.ReadOnly(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null arg error not thrown", errorThrown);

+		}

+		{

+			ArrayList al1 = new ArrayList();

+			AssertEquals("arrays start writeable.",

+				     false, al1.IsReadOnly);

+			ArrayList al2 = ArrayList.ReadOnly(al1);

+			AssertEquals("should be readonly.",

+				     true, al2.IsReadOnly);

+		}

+	}

+

+	public void TestRemove() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.FixedSize(new ArrayList(3));

+				al1.Remove(1);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("remove fixed size error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList(3));

+				al1.Remove(1);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("remove read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			char[] c = {'a','b','c'};

+			ArrayList a = new ArrayList(c);

+			a.Remove(1);

+			a.Remove('?');

+			AssertEquals("should be unchanged", c.Length, a.Count);

+			a.Remove('a');

+			AssertEquals("should be changed", 2, a.Count);

+			AssertEquals("should have shifted", 'b', a[0]);

+			AssertEquals("should have shifted", 'c', a[1]);

+		}

+	}

+

+	public void TestRemoveAt() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.FixedSize(new ArrayList(3));

+				al1.RemoveAt(1);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("remove from fixed size error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList(3));

+				al1.RemoveAt(1);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("remove from read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				al1.RemoveAt(-1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("remove at negative index error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				al1.RemoveAt(4);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("remove at out-of-range index error not thrown", 

+			       errorThrown);

+		}

+		{

+			char[] c = {'a','b','c'};

+			ArrayList a = new ArrayList(c);

+			a.RemoveAt(0);

+			AssertEquals("should be changed", 2, a.Count);

+			AssertEquals("should have shifted", 'b', a[0]);

+			AssertEquals("should have shifted", 'c', a[1]);

+		}

+	}

+

+	public void TestRemoveRange() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.FixedSize(new ArrayList(3));

+				al1.RemoveRange(0, 1);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("removerange from fixed size error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList(3));

+				al1.RemoveRange(0, 1);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("removerange from read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				al1.RemoveRange(-1, 1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("removerange at negative index error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				al1.RemoveRange(0, -1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("removerange at negative index error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				al1.RemoveRange(2, 3);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("removerange at bad range error not thrown", 

+			       errorThrown);

+		}

+		{

+			char[] c = {'a','b','c'};

+			ArrayList a = new ArrayList(c);

+			a.RemoveRange(1,2);

+			AssertEquals("should be changed", 1, a.Count);

+			AssertEquals("should have shifted", 'a', a[0]);

+		}

+	}

+

+	public void TestRepeat() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = ArrayList.Repeat('c', -1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("repeat negative copies error not thrown", 

+			       errorThrown);

+		}

+		{

+			ArrayList al1 = ArrayList.Repeat("huh?", 0);

+			AssertEquals("should be nothing in array", 

+				     0, al1.Count);

+		}		

+		{

+			ArrayList al1 = ArrayList.Repeat("huh?", 3);

+			AssertEquals("should be something in array", 

+				     3, al1.Count);

+			AssertEquals("array elem doesn't check",

+				     "huh?", al1[0]);

+			AssertEquals("array elem doesn't check",

+				     "huh?", al1[1]);

+			AssertEquals("array elem doesn't check",

+				     "huh?", al1[2]);

+		}

+	}

+

+	public void TestReverse() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList());

+				al1.Reverse();

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("reverse on read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				ArrayList al1 = new ArrayList(c);

+				al1.Reverse(0, 3);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				ArrayList al1 = new ArrayList(c);

+				al1.Reverse(3, 0);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("error not thrown", errorThrown);

+		}

+		{

+			char[] c = {'a', 'b', 'c', 'd', 'e'};

+			ArrayList al1 = new ArrayList(c);

+			al1.Reverse(2,1);

+			for (int i = 0; i < al1.Count; i++) {

+				AssertEquals("Should be no change yet",

+					     c[i], al1[i]);

+			}

+			al1.Reverse();

+			for (int i = 0; i < al1.Count; i++) {

+				AssertEquals("Should be reversed",

+					     c[i], al1[4-i]);

+			}

+			al1.Reverse();

+			for (int i = 0; i < al1.Count; i++) {

+				AssertEquals("Should be back to normal",

+					     c[i], al1[i]);

+			}

+			al1.Reverse(1,3);

+			AssertEquals("Should be back to normal", c[0], al1[0]);

+			AssertEquals("Should be back to normal", c[3], al1[1]);

+			AssertEquals("Should be back to normal", c[2], al1[2]);

+			AssertEquals("Should be back to normal", c[1], al1[3]);

+			AssertEquals("Should be back to normal", c[4], al1[4]);

+		}

+	}

+

+	public void TestSetRange() {

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList(3));

+				al1.SetRange(0, c);

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("setrange on read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				al1.SetRange(0, null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			Assert("setrange with null error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				ArrayList al1 = new ArrayList(3);

+				al1.SetRange(-1, c);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 3: " + e.ToString());

+			}

+			Assert("setrange with negative index error not thrown",

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				ArrayList al1 = new ArrayList(3);

+				al1.SetRange(2, c);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 4: " + e.ToString());

+			}

+			Assert("setrange with too much error not thrown",

+			       errorThrown);

+		}

+

+		{

+			char[] c = {'a', 'b', 'c'};

+			ArrayList al1 = ArrayList.Repeat('?', 3);

+			Assert("no match yet", c[0] != (char)al1[0]);

+			Assert("no match yet", c[1] != (char)al1[1]);

+			Assert("no match yet", c[2] != (char)al1[2]);

+			al1.SetRange(0, c);

+			AssertEquals("should match", c[0], al1[0]);

+			AssertEquals("should match", c[1], al1[1]);

+			AssertEquals("should match", c[2], al1[2]);

+		}

+	}

+

+	public void TestSort() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList());

+				al1.Sort();

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("sort on read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			char[] starter = {'d', 'b', 'f', 'e', 'a', 'c'};

+			ArrayList al1 = new ArrayList(starter);

+			al1.Sort();

+			AssertEquals("Should be sorted", 'a', al1[0]);

+			AssertEquals("Should be sorted", 'b', al1[1]);

+			AssertEquals("Should be sorted", 'c', al1[2]);

+			AssertEquals("Should be sorted", 'd', al1[3]);

+			AssertEquals("Should be sorted", 'e', al1[4]);

+			AssertEquals("Should be sorted", 'f', al1[5]);

+		}

+	}

+

+	// TODO - Sort with IComparers

+

+	// TODO - Synchronize

+

+	public void TestToArray() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = new ArrayList(3);

+				al1.ToArray(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("toarray with null error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				string s = "huh?";

+				ArrayList al1 = new ArrayList(c);

+				al1.ToArray(s.GetType());

+			} catch (InvalidCastException) {

+				errorThrown = true;

+			}

+			Assert("toarray with bad type error not thrown", 

+			       errorThrown);

+		}

+		{

+			char[] c1 = {'a', 'b', 'c', 'd', 'e'};

+			ArrayList al1 = new ArrayList(c1);

+			object[] o2 = al1.ToArray();

+			for (int i = 0; i < c1.Length; i++) {

+				AssertEquals("should be copy", c1[i], o2[i]);

+			}

+			Array c2 = al1.ToArray(c1[0].GetType());

+			for (int i = 0; i < c1.Length; i++) {

+				AssertEquals("should be copy", 

+					     c1[i], c2.GetValue(i));

+			}

+		}

+	}

+

+	public void TestTrimToSize() {

+		{

+			bool errorThrown = false;

+			try {

+				ArrayList al1 = 

+					ArrayList.ReadOnly(new ArrayList());

+				al1.TrimToSize();

+			} catch (NotSupportedException) {

+				errorThrown = true;

+			}

+			Assert("trim read only error not thrown", 

+			       errorThrown);

+		}

+		{

+			ArrayList al1 = new ArrayList();

+			int capacity = al1.Capacity;

+			int size = capacity / 2;

+			for (int i = 1; i <=size; i++) {

+				al1.Add('?');

+			}

+			al1.RemoveAt(0);

+			al1.TrimToSize();

+			AssertEquals("no capacity match", 

+				     size - 1, al1.Capacity);

+

+			al1.Clear();

+			al1.TrimToSize();

+			AssertEquals("no default capacity", 

+				     capacity, al1.Capacity);

+		}

+	}

+

+}

+ 

+}

diff --git a/mcs/class/corlib/Test/System.Collections/BitArrayTest.cs b/mcs/class/corlib/Test/System.Collections/BitArrayTest.cs
new file mode 100644
index 00000000000..7d29eb44911
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/BitArrayTest.cs
@@ -0,0 +1,300 @@
+//

+// BitArrayTest.cs - NUnit Test Cases for the System.Collections.BitArray class

+// 

+// Author: David Menestrina (dmenest@yahoo.com)

+//

+

+using NUnit.Framework;

+using System.Collections;

+using System;

+

+namespace MonoTests.System.Collections

+{

+

+public class BitArrayTest : TestCase 

+{

+  private BitArray testBa;

+  private bool [] testPattern;

+  private BitArray op1;

+  private BitArray op2;

+

+  public static ITest Suite

+  {

+    get {

+      return new TestSuite(typeof(BitArrayTest));

+    }

+  }

+

+  private void verifyPattern(BitArray ba, bool[] pattern)

+  {

+    AssertEquals(ba.Length, pattern.Length);

+    for (int i = 0; i < pattern.Length; i++)

+      AssertEquals(ba[i], pattern[i]);

+  }

+

+  public BitArrayTest() : base ("MonoTests.System.Collections.BitArrayTest testcase") {}

+  public BitArrayTest( string name ) : base(name) { }	

+  

+  protected override void SetUp()

+  {

+    testPattern = new bool[70];

+

+    int i;

+    for(i = 0; i < testPattern.Length/2; i++)

+      testPattern[i] = ((i % 2) == 0);

+    for(; i < testPattern.Length; i++)

+      testPattern[i] = ((i % 2) != 0);

+

+    testBa = new BitArray(70);

+    for(i = 0; i < testBa.Length/2; i++)

+      testBa[i] = ((i % 2) == 0);

+    for(; i < testBa.Length; i++)

+      testBa[i] = ((i % 2) != 0);

+

+    // for TestAnd, TestOr, TestNot, TestXor

+    op1 = new BitArray(new int[] { 0x33333333, 0x33333333 });

+    op2 = new BitArray(new int[] { 0x66666666, 0x66666666 });

+  }

+  

+  public void TestBoolConstructor()

+  {

+    BitArray ba = new BitArray(testPattern);

+    verifyPattern(ba, testPattern);

+  }

+

+  public void TestCopyConstructor() 

+  {

+    BitArray ba = new BitArray(testBa);

+

+    verifyPattern(ba, testPattern);

+  }

+

+  public void TestByteConstructor()

+  {

+    byte [] byteArr = new byte[] { 0xaa, 0x55, 0xaa, 0x55, 0x80 };

+    BitArray ba = new BitArray(byteArr);

+    

+    AssertEquals("Lengths not equal", ba.Length, byteArr.Length * 8);

+    

+    // spot check

+    Assert("7 not true", ba[7]);

+    Assert("6 not false", !ba[6]);

+    Assert("15 not false", !ba[15]);

+    Assert("14 not true", ba[14]);

+    Assert("39 not true", ba[39]);

+    Assert("35 not false", !ba[35]);

+

+  }

+

+  public void TestIntConstructor()

+  {

+    int [] intArr = new int[] { ~0x55555555, 0x55555551 };

+    BitArray ba = new BitArray(intArr);

+    

+    AssertEquals(ba.Length, intArr.Length * 32);

+    

+    // spot check

+    

+    Assert(ba[31]);

+    Assert(!ba[30]);

+    Assert(!ba[63]);

+    Assert(ba[62]);

+    Assert(ba[32]);

+    Assert(!ba[35]);

+  }

+

+  public void TestValConstructor()

+  {

+    BitArray ba = new BitArray(64, false);

+

+    AssertEquals(ba.Length, 64);

+    foreach (bool b in ba)

+      Assert(!b);

+

+    ba = new BitArray(64, true);

+

+    AssertEquals(ba.Length, 64);

+    foreach (bool b in ba)

+      Assert(b);

+  }

+

+  public void TestClone()

+  {

+    BitArray ba = (BitArray)testBa.Clone();

+

+    verifyPattern(ba, testPattern);

+

+    // ensure that changes in ba don't get propagated to testBa

+    ba[0] = false;

+    ba[1] = false;

+    ba[2] = false;

+    

+    verifyPattern(testBa, testPattern);

+  }

+  

+  public void TestSetLength()

+  {

+    int origLen = testBa.Length;

+    testBa.Length += 33;

+

+    AssertEquals(origLen + 33, testBa.Length);

+    for (int i = origLen; i < testBa.Length; i++)

+      testBa[i] = true;

+

+    testBa.Length -= 33;

+    verifyPattern(testBa, testPattern);

+  }

+

+  public void TestAnd()

+  {

+    BitArray result = op1.And(op2);

+    AssertEquals(result.Length, op1.Length);

+    for (int i = 0; i < result.Length; )

+    {

+      Assert(!result[i++]);

+      Assert(result[i++]);

+      Assert(!result[i++]);

+      Assert(!result[i++]);

+    }

+  }

+

+  public void TestOr()

+  {

+    BitArray result = op1.Or(op2);

+    AssertEquals(result.Length, op1.Length);

+    for (int i = 0; i < result.Length; )

+    {

+      Assert(result[i++]);

+      Assert(result[i++]);

+      Assert(result[i++]);

+      Assert(!result[i++]);

+    }

+  }

+

+  public void TestNot()

+  {

+    BitArray result = op1.Not();

+    AssertEquals(result.Length, op1.Length);

+    for (int i = 0; i < result.Length; )

+    {

+      Assert(!result[i++]);

+      Assert(!result[i++]);

+      Assert(result[i++]);

+      Assert(result[i++]);

+    }

+  }

+

+  public void TestXor()

+  {

+    BitArray result = op1.Xor(op2);

+    AssertEquals(result.Length, op1.Length);

+    for (int i = 0; i < result.Length; )

+    {

+      Assert(result[i++]);

+      Assert(!result[i++]);

+      Assert(result[i++]);

+      Assert(!result[i++]);

+    }

+  }

+

+  public void TestSetAll()

+  {

+    testBa.SetAll(false);

+    foreach(bool b in testBa)

+      Assert(!b);

+    testBa.SetAll(true);

+    foreach(bool b in testBa)

+      Assert(b);

+  }

+

+  public void TestCopyToBool()

+  {

+    try {

+	    bool[] barray = new bool[testBa.Length + 10];

+	    

+	    testBa.CopyTo(barray, 5);

+

+	    for (int i = 0; i < testBa.Length; i++)

+	      AssertEquals(testBa[i], barray[i+5]);

+    }

+    catch(Exception e){

+	Fail("Unexpected exception thrown: " + e.ToString());

+    }

+  }

+

+  public void TestCopyToByte()

+  {

+    try {

+	    testBa.Length = 34;

+	    byte[] barray = new byte[5 + 10];

+	    

+	    testBa.CopyTo(barray, 5);

+

+	    for (int i = 5; i < 9; i++)

+	      AssertEquals(0x55, barray[i] & 0xff);

+

+	    // FIXME: MS fails on the next line.  This is because

+	    // we truncated testBa.Length, and MS's internal array still

+	    // has the old bits set.  CopyTo() doesn't say specifically

+	    // whether the "junk" bits (bits past Length, but within Length

+	    // rounded up to 32) will be copied as 0, or if those bits are

+	    // undefined.

+	    //AssertEquals(0x01, barray[9] & 0xff);

+    }

+    catch(Exception e){

+	Fail("Unexpected exception thrown: " + e.ToString());

+    }

+  }

+

+  public void TestCopyToInt()

+  {

+    try {

+	    testBa.Length = 34;

+	    int[] iarray = new int[2 + 10];

+	    

+	    testBa.CopyTo(iarray, 5);

+

+	    AssertEquals(0x55555555, iarray[5]);

+	    // FIXME:  Same thing here as in TestCopyToByte

+	    //AssertEquals(0x01, iarray[6]);

+    }

+    catch(Exception e){

+	Fail("Unexpected exception thrown: " + e.ToString());

+    }

+  }

+

+  public void TestEnumerator()

+  {

+    

+    try {

+	    IEnumerator e = testBa.GetEnumerator();

+	    

+	    for (int i = 0; e.MoveNext(); i++)

+	      AssertEquals(e.Current, testPattern[i]);

+

+	    Assert(!e.MoveNext());

+	    // read, to make sure reading isn't considered a write.

+	    bool b = testBa[0];

+

+	    e.Reset();

+	    for (int i = 0; e.MoveNext(); i++)

+	      AssertEquals(e.Current, testPattern[i]);

+

+	    try

+	    {

+	      e.Reset();

+	      testBa[0] = !testBa[0];

+	      e.MoveNext();

+	      Fail("IEnumerator.MoveNext() should throw when collection modified.");

+	    }

+	    catch (InvalidOperationException)

+	    {

+	    }

+    }

+    catch(Exception ex){

+	Fail("Unexpected exception thrown: " + ex.ToString());

+    }

+  }

+}

+

+}

diff --git a/mcs/class/corlib/Test/System.Collections/CaseInsensitiveComparerTest.cs b/mcs/class/corlib/Test/System.Collections/CaseInsensitiveComparerTest.cs
new file mode 100644
index 00000000000..9bd8ba35ec9
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/CaseInsensitiveComparerTest.cs
@@ -0,0 +1,50 @@
+// CaseInsensitiveComparerTest

+

+using System;

+using System.Collections;

+

+using NUnit.Framework;

+

+

+

+namespace MonoTests.System.Collections {

+

+

+	/// <summary>CaseInsensitiveComparer test suite.</summary>

+	public class CaseInsensitiveComparerTest : TestCase {

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(CaseInsensitiveComparerTest));

+			}

+		}

+

+		public CaseInsensitiveComparerTest() : base ("MonoTests.System.Collections.CaseInsensitiveComparerTest testcase") {}

+

+		public CaseInsensitiveComparerTest(String name) : base(name)

+		{

+		}

+

+		protected override void SetUp ()

+		{

+		}

+

+		public void TestDefaultInstance ()

+		{

+			// Make sure the instance returned by Default

+			// is really a CaseInsensitiveComparer.

+			Assert((CaseInsensitiveComparer.Default

+			        as CaseInsensitiveComparer) != null);

+		}

+

+		public void TestCompare () {

+			CaseInsensitiveComparer cic = new CaseInsensitiveComparer ();

+

+			Assert(cic.Compare ("WILD WEST", "Wild West") == 0);

+			Assert(cic.Compare ("WILD WEST", "wild west") == 0);

+			Assert(cic.Compare ("Zeus", "Mars") > 0);

+			Assert(cic.Compare ("Earth", "Venus") < 0);

+		}

+			

+	}

+

+}

diff --git a/mcs/class/corlib/Test/System.Collections/CaseInsensitiveHashCodeProviderTest.cs b/mcs/class/corlib/Test/System.Collections/CaseInsensitiveHashCodeProviderTest.cs
new file mode 100644
index 00000000000..86419a02ce4
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/CaseInsensitiveHashCodeProviderTest.cs
@@ -0,0 +1,57 @@
+// CaseInsensitiveHashCodeProviderTest

+

+using System;

+using System.Collections;

+

+using NUnit.Framework;

+

+

+

+namespace MonoTests.System.Collections {

+

+

+	/// <summary>CaseInsensitiveHashCodeProvider test suite.</summary>

+	public class CaseInsensitiveHashCodeProviderTest : TestCase {

+		public CaseInsensitiveHashCodeProviderTest() : base ("MonoTests.System.Collections.CaseInsensitiveHashCodeProviderTest testcase") {}

+

+		public CaseInsensitiveHashCodeProviderTest(String name) : base(name)

+		{

+		}

+

+		protected override void SetUp ()

+		{

+		}

+

+		public static ITest Suite

+		{

+			get {

+				return new TestSuite(typeof(CaseInsensitiveHashCodeProviderTest));

+			}

+		}

+

+		public void TestDefaultInstance ()

+		{

+			// Make sure the instance returned by Default

+			// is really a CaseInsensitiveHashCodeProvider.

+			Assert((CaseInsensitiveHashCodeProvider.Default

+			        as CaseInsensitiveHashCodeProvider) != null);

+		}

+

+		public void TestHashCode () {

+			CaseInsensitiveHashCodeProvider cih = new CaseInsensitiveHashCodeProvider ();

+			int h1 = cih.GetHashCode ("Test String");

+			int h2 = cih.GetHashCode ("test string");

+			int h3 = cih.GetHashCode ("TEST STRING");

+

+			Assert("Mixed Case != lower case", h1 == h2);

+			Assert("Mixed Case != UPPER CASE", h1 == h3);

+

+			h1 = cih.GetHashCode ("one");

+			h2 = cih.GetHashCode ("another");

+			// Actually this is quite possible.

+			Assert(h1 != h2);

+		}

+			

+	}

+

+}

diff --git a/mcs/class/corlib/Test/System.Collections/ChangeLog b/mcs/class/corlib/Test/System.Collections/ChangeLog
new file mode 100644
index 00000000000..411545e770a
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/ChangeLog
@@ -0,0 +1,101 @@
+2002-07-02  Nick Drochak  <ndrochak@gol.com>

+

+	* SortedListTest.cs: Fix some expected/actual value parameters for

+	AssertEquals().

+

+2002-06-30  Nick Drochak  <ndrochak@gol.com>

+

+	* SortedListTest.cs: Fix some expected/actual value parameters in the

+	Assert()'s. Disable a part of test until the class is finished.

+

+2002-06-25  Nick Drochak  <ndrochak@gol.com>

+

+	* QueueTest.cs: Trap some unexpected exceptions and add a bit of

+	verbosity to some assert messages.

+

+2002-06-20  Nick Drochak  <ndrochak@gol.com>

+

+	* SortedListTest.cs: Make tests pass against ms.net.

+	* QueueTest.cs: Make tests pass against ms.net.

+

+2002-06-19  Nick Drochak  <ndrochak@gol.com>

+

+	* AllTests.cs: Sort names and include missing tests.

+	* SortedListTest.cs: Change Console.WriteLine() into Fail().

+

+2002-05-27  Nick Drochak  <ndrochak@gol.com>

+

+	* ArrayListTest.cs (TestLastIndexOf): Add try-catch block to report

+	where we are throwing.

+

+2002-05-21  Lawrence Pit  <loz@cable.a2000.nl>

+

+	* ArrayListTest.cs: Added several tests to test for 0 capacity

+

+2002-05-05  Nick Drochak  <ndrochak@gol.com>

+

+	* ArrayListTest.cs: Test for RankException when constructing from a 

+	multi-dimensional array. Confirmed behavior from MS.NET

+

+2002-05-01  Nick Drochak  <ndrochak@gol.com>

+

+	* ArrayListTest.cs (TestBinarySearch) : accomodate possible bug in

+	.NET runtime.

+

+2002/05/01  Nick Drochak <ndrochak@gol.com>

+

+	* ArrayListTest.cs (TestCopyTo) : Make assert messages unique and

+	avoid possible MS.NET bug when test is run on .NET.

+

+2002/04/30  Nick Drochak <ndrochak@gol.com>

+

+	* ArrayListTest.cs (TestInsertRange) : Make assert messages unique.

+

+2002-04-30  Nick Drochak  <ndrochak@gol.com>

+

+	* ArrayListTest.cs (TestTrimToSize): Change test so that it doesn't

+	rely on the specific timing of a capacity change.  Our corlib doubles

+	capacity sooner than the reference system does.

+

+2002-04-30  Nick Drochak  <ndrochak@gol.com>

+

+	* ArrayListTest.cs: Catch unexpected exception typs and report as

+	failures.

+

+2002-04-29  Nick Drochak  <ndrochak@gol.com>

+

+	* ArrayListTest.cs (TestBinarySearch): Catch the correct exception here.

+

+2002-04-29  Nick Drochak  <ndrochak@gol.com>

+

+	* ArrayListTest.cs (): Remove test on unsorted array.  Behavior is 

+	undefined according to docs. Re-added test that was commented out.

+

+2002-03-24  Duncan Mak  <duncan@ximian.com>

+

+	* SortedListTest.cs: Committed to CVS for Jaak Simm <jaaksimm@firm.ee>.

+

+2002-02-28  Nick Drochak  <ndrochak@gol.com>

+

+	* HashtableTest.cs: make the second test class public.  The was showing

+	as an error whe run against the mscorlib.  Might be because of the

+	new NUnit that was just checked in.

+

+2002-02-20  Nick Drochak  <ndrochak@gol.com>

+

+	* ArrayListTest.cs: Add a small assert for a bug that I found and fixed

+	in ArrayList.  Make sure it doesn't come up again.

+

+2002-02-10  Nick Drochak  <ndrochak@gol.com>

+

+	* QueueTest.cs: Put in correct namespace.

+

+2002-02-09  Nick Drochak  <ndrochak@gol.com>

+

+	* StackTest.cs: Removed test for IsReadonly.  Doesn't exist in .NET 1.0

+

+2002-01-20  Nick Drochak  <ndrochak@gol.com>

+

+	* BitArrayTest.cs: wrapped try-catch blocks around several of the tests. 

+	NUnit doesn't properly catch exception here anymore.  Must be something

+	to do with upgrading to .NET.1.0.
\ No newline at end of file
diff --git a/mcs/class/corlib/Test/System.Collections/CollectionBaseTest.cs b/mcs/class/corlib/Test/System.Collections/CollectionBaseTest.cs
new file mode 100644
index 00000000000..12ca737e391
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/CollectionBaseTest.cs
@@ -0,0 +1,236 @@
+//

+// System.Collections.CollectionBase

+// Test suite for System.Collections.CollectionBase

+//

+// Author:

+//    Nick D. Drochak II

+//

+// (C) 2001 Nick D. Drochak II

+//

+

+

+using System;

+using System.Collections;

+using NUnit.Framework;

+

+namespace MonoTests.System.Collections

+{

+

+public class CollectionBaseTest : TestCase 	

+{

+	public CollectionBaseTest () : base ("System.Collection.CollectionBase testsuite") {}

+	public CollectionBaseTest (String name) : base (name) {}

+

+	// We need a concrete class to test the abstract base class

+	public class ConcreteCollection : CollectionBase 

+	{

+		// These fields are used as markers to test the On* hooks.

+		public bool onClearFired;

+		public bool onClearCompleteFired;

+

+		public bool onInsertFired;

+		public int onInsertIndex;

+		public bool onInsertCompleteFired;

+		public int onInsertCompleteIndex;

+

+		public bool onRemoveFired;

+		public int onRemoveIndex;

+		public bool onRemoveCompleteFired;

+		public int onRemoveCompleteIndex;

+

+		public bool onSetFired;

+		public int onSetOldValue;

+		public int onSetNewValue;

+		public bool onSetCompleteFired;

+		public int onSetCompleteOldValue;

+		public int onSetCompleteNewValue;

+

+		// This constructor is used to test OnValid()

+		public ConcreteCollection()	

+		{

+			IList listObj;

+			listObj = this;

+			listObj.Add(null);

+		}

+

+		// This constructor puts consecutive integers into the list

+		public ConcreteCollection(int i) {

+			IList listObj;

+			listObj = this;

+

+			int j;

+			for (j = 0; j< i; j++) {

+				listObj.Add(j);

+			}

+		}

+

+		// A helper method to look at a value in the list at a specific index

+		public int PeekAt(int index)

+		{

+			IList listObj;

+			listObj = this;

+			return (int) listObj[index];

+		}

+

+		// Mark the flag if this hook is fired

+		protected override void OnClear() {

+			this.onClearFired = true;

+		}

+

+		// Mark the flag if this hook is fired

+		protected override void OnClearComplete() 

+		{

+			this.onClearCompleteFired = true;

+		}

+

+		// Mark the flag, and save the paramter if this hook is fired

+		protected override void OnInsert(int index, object value) 

+		{

+			this.onInsertFired = true;

+			this.onInsertIndex = index;

+		}

+

+		// Mark the flag, and save the paramter if this hook is fired

+		protected override void OnInsertComplete(int index, object value) 

+		{

+			this.onInsertCompleteFired = true;

+			this.onInsertCompleteIndex = index;

+		}

+		

+		// Mark the flag, and save the paramter if this hook is fired

+		protected override void OnRemove(int index, object value) 

+		{

+			this.onRemoveFired = true;

+			this.onRemoveIndex = index;

+		}

+		

+		// Mark the flag, and save the paramter if this hook is fired

+		protected override void OnRemoveComplete(int index, object value) 

+		{

+			this.onRemoveCompleteFired = true;

+			this.onRemoveCompleteIndex = index;

+		}

+		

+		// Mark the flag, and save the paramters if this hook is fired

+		protected override void OnSet(int index, object oldValue, object newValue) 

+		{

+			this.onSetFired = true;

+			this.onSetOldValue = (int) oldValue;

+			this.onSetNewValue = (int) newValue;

+		}

+		

+		// Mark the flag, and save the paramters if this hook is fired

+		protected override void OnSetComplete(int index, object oldValue, object newValue) 

+		{

+			this.onSetCompleteFired = true;

+			this.onSetCompleteOldValue = (int) oldValue;

+			this.onSetCompleteNewValue = (int) newValue;

+		}

+	}  // public class ConcreteCollection

+

+	public static ITest Suite {

+		get {

+			return new TestSuite (typeof(CollectionBaseTest));

+		}

+	}

+

+	// Check the count property

+	public void TestCount() {

+		ConcreteCollection myCollection;

+		myCollection = new ConcreteCollection(4);

+		Assert(4 == myCollection.Count);

+	}

+

+	// Make sure GetEnumerator returns an object

+	public void TestGetEnumerator() {

+		ConcreteCollection myCollection;

+		myCollection = new ConcreteCollection(4);

+		Assert(null != myCollection.GetEnumerator());

+	}

+

+	// OnValid disallows nulls

+	public void TestOnValid() {

+		ConcreteCollection myCollection;

+		try {

+			myCollection = new ConcreteCollection();

+		}

+		catch (ArgumentNullException) {

+		}

+	}

+

+	// Test various Insert paths

+	public void TestInsert() {

+		ConcreteCollection myCollection;

+		int numberOfItems;

+		numberOfItems = 3;

+		// The constructor inserts

+		myCollection = new ConcreteCollection(numberOfItems);

+		Assert(myCollection.onInsertFired);

+		Assert(myCollection.onInsertCompleteFired);

+

+		// Using the IList interface, check inserts in the middle

+		IList listObj = myCollection;

+		listObj.Insert(1, 9);

+		Assert(myCollection.onInsertIndex == 1);

+		Assert(myCollection.onInsertCompleteIndex == 1);

+		Assert(myCollection.PeekAt(1) == 9);

+	}

+

+	// Test Clear and it's hooks

+	public void TestClear() 

+	{

+		ConcreteCollection myCollection;

+		int numberOfItems;

+		numberOfItems = 1;

+		myCollection = new ConcreteCollection(numberOfItems);

+		myCollection.Clear();

+		Assert(myCollection.Count == 0);

+		Assert(myCollection.onClearFired);

+		Assert(myCollection.onClearCompleteFired);

+	}

+

+	// Test RemoveAt, other removes and the hooks

+	public void TestRemove() 

+	{

+		ConcreteCollection myCollection;

+		int numberOfItems;

+		numberOfItems = 3;

+		// Set up a test collection

+		myCollection = new ConcreteCollection(numberOfItems);

+

+		// The list is 0-based.  So if we remove the second one

+		myCollection.RemoveAt(1);

+

+		// We should see the original third one in it's place

+		Assert(myCollection.PeekAt(1) == 2);

+		Assert(myCollection.onRemoveFired);

+		Assert(myCollection.onRemoveIndex == 1);

+		Assert(myCollection.onRemoveCompleteFired);

+		Assert(myCollection.onRemoveCompleteIndex == 1);

+		IList listObj = myCollection;

+		listObj.Remove(0);

+		// Confirm parameters are being passed to the hooks

+		Assert(myCollection.onRemoveIndex == 0);

+		Assert(myCollection.onRemoveCompleteIndex == 0);

+	}

+

+	// Test the random access feature

+	public void TestSet() 

+	{

+		ConcreteCollection myCollection;

+		int numberOfItems;

+		numberOfItems = 3;

+		myCollection = new ConcreteCollection(numberOfItems);

+		IList listObj = myCollection;

+		listObj[0] = 99;

+		Assert((int) listObj[0] == 99);

+		Assert(myCollection.onSetFired);

+		Assert(myCollection.onSetCompleteFired);

+		Assert(myCollection.onSetOldValue == 0);

+		Assert(myCollection.onSetCompleteOldValue == 0);

+		Assert(myCollection.onSetNewValue == 99);

+		Assert(myCollection.onSetCompleteNewValue == 99);

+	}

+}

+

+}

diff --git a/mcs/class/corlib/Test/System.Collections/ComparerTest.cs b/mcs/class/corlib/Test/System.Collections/ComparerTest.cs
new file mode 100644
index 00000000000..38b78de39e7
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/ComparerTest.cs
@@ -0,0 +1,60 @@
+// ComparerTest

+

+using System;

+using System.Collections;

+

+using NUnit.Framework;

+

+

+

+namespace MonoTests.System.Collections {

+

+

+	/// <summary>Comparer test suite.</summary>

+	public class ComparerTest : TestCase {

+		public ComparerTest() : base ("MonoTests.System.Collections.ComparerTest testcase") {}

+		public ComparerTest(String name) : base(name)

+		{

+		}

+

+		protected override void SetUp ()

+		{

+		}

+

+		public static ITest Suite

+		{

+			get {

+				return new TestSuite(typeof(ComparerTest));

+			}

+		}

+

+		public void TestDefaultInstance ()

+		{

+			// Make sure the instance returned by Default

+			// is really a Comparer.

+			Assert((Comparer.Default as Comparer) != null);

+		}

+

+		public void TestCompare ()

+		{

+			Comparer c = Comparer.Default;

+

+			bool thrown = false;

+

+			try {

+				c.Compare (new Object (), new Object ());

+			} catch (ArgumentException) {

+				thrown = true;

+			}

+

+			Assert("ArgumentException expected", thrown);

+

+			Assert(c.Compare (1, 2) < 0);

+			Assert(c.Compare (2, 2) == 0);

+			Assert(c.Compare (3, 2) > 0);

+

+		}

+			

+	}

+

+}

diff --git a/mcs/class/corlib/Test/System.Collections/HashtableTest.cs b/mcs/class/corlib/Test/System.Collections/HashtableTest.cs
new file mode 100644
index 00000000000..b37b16ffd1b
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/HashtableTest.cs
@@ -0,0 +1,761 @@
+// HashtableTest.cs - NUnit Test Cases for the System.Collections.Hashtable class

+//

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+

+

+using System;

+using System.Collections;

+

+using NUnit.Framework;

+

+

+

+namespace MonoTests.System.Collections {

+

+

+/// <summary>Hashtable test.</summary>

+public class HashtableTest : TestCase {

+	public static ITest Suite {

+		get {

+			TestSuite suite = new TestSuite();

+			

+			suite.AddTest(new TestSuite(typeof(HashtableTest)));

+			suite.AddTest(new TestSuite(typeof(HashtableTest2)));

+			return suite;

+		}

+	}

+	

+	public void TestCtor1() {

+		Hashtable h = new Hashtable();

+		AssertNotNull("No hash table", h);

+	}

+	public void TestCtor2() {

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null hashtable error not thrown", 

+			       errorThrown);

+		}

+		{

+			string[] keys = {"this", "is", "a", "test"};

+			char[] values = {'a', 'b', 'c', 'd'};

+			Hashtable h1 = new Hashtable();

+			for (int i = 0; i < keys.Length; i++) {

+				h1[keys[i]] = values[i];

+			}

+			Hashtable h2 = new Hashtable(h1);

+			for (int i = 0; i < keys.Length; i++) {

+				AssertEquals("No match for key " + keys[i],

+					     values[i], h2[keys[i]]);

+			}

+		}

+	}

+	// TODO - Ctors for capacity and load (how to test? any access?)

+        // TODO - Ctors with IComparer, IHashCodeProvider, Serialization

+	

+	public void TestCount() {

+		Hashtable h = new Hashtable();

+		AssertEquals("new table - count zero", 0, h.Count);

+		int max = 100;

+		for (int i = 1; i <= max; i++) {

+			h[i] = i;

+			AssertEquals("Count wrong for " + i,

+				     i, h.Count);

+		}

+		for (int i = 1; i <= max; i++) {

+			h[i] = i * 2;

+			AssertEquals("Count shouldn't change at " + i,

+				     max, h.Count);

+		}

+	}

+

+	public void TestIsFixedSize() {

+		Hashtable h = new Hashtable();

+		AssertEquals("hashtable not fixed by default",

+			     false, h.IsFixedSize);

+		// TODO - any way to get a fixed-size hashtable?

+	}

+

+	public void TestIsReadOnly() {

+		Hashtable h = new Hashtable();

+		AssertEquals("hashtable not read-only by default",

+			     false, h.IsReadOnly);

+		// TODO - any way to get a read-only hashtable?

+	}

+

+	public void TestIsSynchronized() {

+		Hashtable h = new Hashtable();

+		Assert("hashtable not synced by default", !h.IsSynchronized);

+		Hashtable h2 = Hashtable.Synchronized(h);

+		Assert("hashtable should by synced", h2.IsSynchronized);

+	}

+

+	public void TestItem() {

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				Object o = h[null];

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null hashtable error not thrown", 

+			       errorThrown);

+		}

+		// TODO - if read-only and/or fixed-size is possible,

+		//        test 'NotSupportedException' here

+

+		{

+			Hashtable h = new Hashtable();

+			int max = 100;

+			for (int i = 1; i <= max; i++) {

+				h[i] = i;

+				AssertEquals("value wrong for " + i,

+					     i, h[i]);

+			}

+		}

+	}

+

+	public void TestKeys() {

+		string[] keys = {"this", "is", "a", "test"};

+		char[] values1 = {'a', 'b', 'c', 'd'};

+		char[] values2 = {'e', 'f', 'g', 'h'};

+		Hashtable h1 = new Hashtable();

+		for (int i = 0; i < keys.Length; i++) {

+			h1[keys[i]] = values1[i];

+		}

+		AssertEquals("keys wrong size",

+			     keys.Length, h1.Keys.Count);

+		for (int i = 0; i < keys.Length; i++) {

+			h1[keys[i]] = values2[i];

+		}

+		AssertEquals("keys wrong size 2",

+			     keys.Length, h1.Keys.Count);

+	}

+

+	// TODO - SyncRoot

+

+	public void TestValues() {

+		string[] keys = {"this", "is", "a", "test"};

+		char[] values1 = {'a', 'b', 'c', 'd'};

+		char[] values2 = {'e', 'f', 'g', 'h'};

+		Hashtable h1 = new Hashtable();

+		for (int i = 0; i < keys.Length; i++) {

+			h1[keys[i]] = values1[i];

+		}

+		AssertEquals("values wrong size",

+			     keys.Length, h1.Values.Count);

+		for (int i = 0; i < keys.Length; i++) {

+			h1[keys[i]] = values2[i];

+		}

+		AssertEquals("values wrong size 2",

+			     keys.Length, h1.Values.Count);

+	}

+	

+	public void TestAdd() {

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				h.Add(null, "huh?");

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null add error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				h.Add('a', 1);

+				h.Add('a', 2);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("re-add error not thrown", 

+			       errorThrown);

+		}

+		// TODO - hit NotSupportedException

+		{

+			Hashtable h = new Hashtable();

+			int max = 100;

+			for (int i = 1; i <= max; i++) {

+				h.Add(i, i);

+				AssertEquals("value wrong for " + i,

+					     i, h[i]);

+			}

+		}

+	}

+

+	public void TestClear() {

+		// TODO - hit NotSupportedException

+		Hashtable h = new Hashtable();

+		AssertEquals("new table - count zero", 0, h.Count);

+		int max = 100;

+		for (int i = 1; i <= max; i++) {

+			h[i] = i;

+		}

+		Assert("table don't gots stuff", h.Count > 0);

+		h.Clear();

+		AssertEquals("Table should be cleared",

+			     0, h.Count);

+	}

+

+	public void TestClone() {

+		{

+			char[] c1 = {'a', 'b', 'c'};

+			char[] c2 = {'d', 'e', 'f'};

+			Hashtable h1 = new Hashtable();

+			for (int i = 0; i < c1.Length; i++) {

+				h1[c1[i]] = c2[i];

+			}

+			Hashtable h2 = (Hashtable)h1.Clone();

+			AssertNotNull("got no clone!", h2);

+			AssertNotNull("clone's got nothing!", h2[c1[0]]);

+			for (int i = 0; i < c1.Length; i++) {

+				AssertEquals("Hashtable match", 

+					     h1[c1[i]], h2[c1[i]]);

+			}

+		}

+		{

+			char[] c1 = {'a', 'b', 'c'};

+			char[] c20 = {'1', '2'};

+			char[] c21 = {'3', '4'};

+			char[] c22 = {'5', '6'};

+			char[][] c2 = {c20, c21, c22};

+			Hashtable h1 = new Hashtable();

+			for (int i = 0; i < c1.Length; i++) {

+				h1[c1[i]] = c2[i];

+			}

+			Hashtable h2 = (Hashtable)h1.Clone();

+			AssertNotNull("got no clone!", h2);

+			AssertNotNull("clone's got nothing!", h2[c1[0]]);

+			for (int i = 0; i < c1.Length; i++) {

+				AssertEquals("Hashtable match", 

+					     h1[c1[i]], h2[c1[i]]);

+			}

+

+			((char[])h1[c1[0]])[0] = 'z';

+			AssertEquals("shallow copy", h1[c1[0]], h2[c1[0]]);

+		}

+	}

+

+	public void TestContains() {

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				bool result = h.Contains(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null add error not thrown", 

+			       errorThrown);

+		}

+		{

+			Hashtable h = new Hashtable();

+			h['a'] = "blue";

+			Assert("'a'? it's in there!", h.Contains('a'));

+			Assert("'b'? no way!", !h.Contains('b'));

+		}

+	}

+

+	public void TestContainsKey() {

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				bool result = h.ContainsKey(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null add error not thrown", 

+			       errorThrown);

+		}

+		{

+			Hashtable h = new Hashtable();

+			h['a'] = "blue";

+			Assert("'a'? it's in there!", h.ContainsKey('a'));

+			Assert("'b'? no way!", !h.ContainsKey('b'));

+		}

+	}

+	

+	public void TestContainsValue() {

+		{

+			Hashtable h = new Hashtable();

+			h['a'] = "blue";

+			Assert("blue? it's in there!", 

+			       h.ContainsValue("blue"));

+			Assert("green? no way!", 

+			       !h.ContainsValue("green"));

+		}

+	}

+

+	public void TestCopyTo() {

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				h.CopyTo(null, 0);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null hashtable error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				Object[] o = new Object[1];

+				h.CopyTo(o, -1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("out of range error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				Object[,] o = new Object[1,1];

+				h.CopyTo(o, 1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("multi-dim array error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				h['a'] = 1; // no error if table is empty

+				Object[] o = new Object[5];

+				h.CopyTo(o, 5);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("no room in array error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				h['a'] = 1;

+				h['b'] = 2;

+				h['c'] = 2;

+				Object[] o = new Object[2];

+				h.CopyTo(o, 0);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("table too big error not thrown", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				h["blue"] = 1;

+				h["green"] = 2;

+				h["red"] = 3;

+				Char[] o = new Char[3];

+				h.CopyTo(o, 0);

+			} catch (InvalidCastException) {

+				errorThrown = true;

+			}

+			Assert("invalid cast error not thrown", 

+			       errorThrown);

+		}

+

+		{

+			Hashtable h = new Hashtable();

+			h['a'] = 1;

+			h['b'] = 2;

+			DictionaryEntry[] o = new DictionaryEntry[2];

+			h.CopyTo(o,0);

+			AssertEquals("first copy fine.", 'a', o[0].Key);

+			AssertEquals("first copy fine.", 1, o[0].Value);

+			AssertEquals("second copy fine.", 'b', o[1].Key);

+			AssertEquals("second copy fine.", 2, o[1].Value);

+		}

+	}

+

+	public void TestGetEnumerator() {

+		String[] s1 = {"this", "is", "a", "test"};

+		Char[] c1 = {'a', 'b', 'c', 'd'};

+		Hashtable h1 = new Hashtable();

+		for (int i = 0; i < s1.Length; i++) {

+			h1[s1[i]] = c1[i];

+		}

+		IDictionaryEnumerator en = h1.GetEnumerator();

+		AssertNotNull("No enumerator", en);

+		

+		for (int i = 0; i < s1.Length; i++) {

+			en.MoveNext();

+			Assert("Not enumerating for " + en.Key, 

+			       Array.IndexOf(s1, en.Key) >= 0);

+			Assert("Not enumerating for " + en.Value, 

+			       Array.IndexOf(c1, en.Value) >= 0);

+		}

+	}

+

+	// TODO - GetObjectData

+	// TODO - OnDeserialization

+

+	public void TestRemove() {

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = new Hashtable();

+				h.Remove(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null hashtable error not thrown", 

+			       errorThrown);

+		}

+		{

+			string[] keys = {"this", "is", "a", "test"};

+			char[] values = {'a', 'b', 'c', 'd'};

+			Hashtable h = new Hashtable();

+			for (int i = 0; i < keys.Length; i++) {

+				h[keys[i]] = values[i];

+			}

+			AssertEquals("not enough in table",

+				     4, h.Count);

+			h.Remove("huh?");

+			AssertEquals("not enough in table",

+				     4, h.Count);

+			h.Remove("this");

+			AssertEquals("Wrong count in table",

+				     3, h.Count);

+			h.Remove("this");

+			AssertEquals("Wrong count in table",

+				     3, h.Count);

+		}

+	}

+

+	public void TestSynchronized() {

+		{

+			bool errorThrown = false;

+			try {

+				Hashtable h = Hashtable.Synchronized(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null hashtable error not thrown", 

+			       errorThrown);

+		}

+		{

+			Hashtable h = new Hashtable();

+			Assert("hashtable not synced by default", 

+			       !h.IsSynchronized);

+			Hashtable h2 = Hashtable.Synchronized(h);

+			Assert("hashtable should by synced", 

+			       h2.IsSynchronized);

+		}

+	}

+	

+	

+	protected Hashtable ht;

+	private static Random rnd;

+	

+	public HashtableTest() : base ("MonoTests.System.Collections.HashtableTest testcase") {}

+	public HashtableTest(String name) : base(name) {}

+	

+	protected override void SetUp() {

+		ht=new Hashtable();

+		rnd=new Random();

+	}

+	

+	private void SetDefaultData() {

+		ht.Clear();

+		ht.Add("k1","another");

+		ht.Add("k2","yet");

+		ht.Add("k3","hashtable");

+	}

+	

+	

+	public void TestAddRemoveClear() {

+		ht.Clear();

+		Assert(ht.Count==0);

+		

+		SetDefaultData();

+		Assert(ht.Count==3);

+		

+		bool thrown=false;

+		try {

+			ht.Add("k2","cool");

+		} catch (ArgumentException) {thrown=true;}

+		Assert("Must throw ArgumentException!",thrown);

+		

+		ht["k2"]="cool";

+		Assert(ht.Count==3);

+		Assert(ht["k2"].Equals("cool"));

+		

+	}

+	

+	public void TestCopyTo2() {

+		SetDefaultData();

+		Object[] entries=new Object[ht.Count];

+		ht.CopyTo(entries,0);

+		Assert("Not an entry.",entries[0] is DictionaryEntry);

+	}

+	

+	

+	public void TestUnderHeavyLoad() {

+		ht.Clear();

+		int max=100000;

+		String[] cache=new String[max*2];

+		int n=0;

+		

+		for (int i=0;i<max;i++) {

+			int id=rnd.Next()&0xFFFF;

+			String key=""+id+"-key-"+id;

+			String val="value-"+id;

+			if (ht[key]==null) {

+				ht[key]=val;

+				cache[n]=key;

+				cache[n+max]=val;

+				n++;

+			}

+		}

+		

+		Assert(ht.Count==n);

+		

+		for (int i=0;i<n;i++) {

+			String key=cache[i];

+			String val=ht[key] as String;

+			String err="ht[\""+key+"\"]=\""+val+

+				"\", expected \""+cache[i+max]+"\"";

+			Assert(err,val!=null && val.Equals(cache[i+max]));

+		}

+		

+		int r1=(n/3);

+		int r2=r1+(n/5);

+		

+		for (int i=r1;i<r2;i++) {

+			ht.Remove(cache[i]);

+		}

+		

+		

+		for (int i=0;i<n;i++) {

+			if (i>=r1 && i<r2) {

+				Assert(ht[cache[i]]==null);

+			} else {

+				String key=cache[i];

+				String val=ht[key] as String;

+				String err="ht[\""+key+"\"]=\""+val+

+					"\", expected \""+cache[i+max]+"\"";

+				Assert(err,val!=null && val.Equals(cache[i+max]));

+			}

+		}

+		

+		ICollection keys=ht.Keys;

+		int nKeys=0;

+		foreach (Object key in keys) {

+			Assert((key as String) != null);

+			nKeys++;

+		}

+		Assert(nKeys==ht.Count);

+

+		

+		ICollection vals=ht.Values;

+		int nVals=0;

+		foreach (Object val in vals) {

+			Assert((val as String) != null);

+			nVals++;

+		}

+		Assert(nVals==ht.Count);

+		

+	}

+

+	

+	public class  HashtableTest2 : TestCase {

+

+		protected Hashtable ht;

+		private static Random rnd;

+		

+		public HashtableTest2 (String name) : base(name)

+		{

+		}

+		

+		protected override void SetUp ()

+		{

+			ht=new Hashtable ();

+			rnd=new Random ();

+		}

+		

+		public static ITest Suite

+		{

+			get {

+				return new TestSuite (typeof(HashtableTest2));

+			}

+		}

+		

+		private void SetDefaultData ()

+		{

+			ht.Clear ();

+			ht.Add ("k1","another");

+			ht.Add ("k2","yet");

+			ht.Add ("k3","hashtable");

+		}

+		

+

+		public void TestAddRemoveClear ()

+		{

+			ht.Clear ();

+			Assert (ht.Count == 0);

+			

+			SetDefaultData ();

+			Assert (ht.Count == 3);

+

+			bool thrown=false;

+			try {

+				ht.Add ("k2","cool");

+			} catch (ArgumentException) {thrown=true;}

+			Assert("Must throw ArgumentException!",thrown);

+

+			ht["k2"]="cool";

+			Assert(ht.Count == 3);

+			Assert(ht["k2"].Equals("cool"));

+

+		}

+

+		public void TestCopyTo ()

+		{

+			SetDefaultData ();

+			Object[] entries=new Object[ht.Count];

+			ht.CopyTo (entries,0);

+			Assert("Not an entry.",entries[0] is DictionaryEntry);

+		}

+

+

+		public void TestUnderHeavyLoad ()

+		{

+			ht.Clear ();

+

+			int max=100000;

+			String[] cache=new String[max*2];

+			int n=0;

+

+			for (int i=0;i<max;i++) {

+				int id=rnd.Next()&0xFFFF;

+				String key=""+id+"-key-"+id;

+				String val="value-"+id;

+				if (ht[key]==null) {

+					ht[key]=val;

+					cache[n]=key;

+					cache[n+max]=val;

+					n++;

+				}

+			}

+

+			Assert(ht.Count==n);

+

+			for (int i=0;i<n;i++) {

+				String key=cache[i];

+				String val=ht[key] as String;

+				String err="ht[\""+key+"\"]=\""+val+

+				      "\", expected \""+cache[i+max]+"\"";

+				Assert(err,val!=null && val.Equals(cache[i+max]));

+			}

+

+			int r1=(n/3);

+			int r2=r1+(n/5);

+

+			for (int i=r1;i<r2;i++) {

+				ht.Remove(cache[i]);

+			}

+

+

+			for (int i=0;i<n;i++) {

+				if (i>=r1 && i<r2) {

+					Assert(ht[cache[i]]==null);

+				} else {

+					String key=cache[i];

+					String val=ht[key] as String;

+					String err="ht[\""+key+"\"]=\""+val+

+					      "\", expected \""+cache[i+max]+"\"";

+					Assert(err,val!=null && val.Equals(cache[i+max]));

+				}

+			}

+

+			ICollection keys=ht.Keys;

+			int nKeys=0;

+			foreach (Object key in keys) {

+				Assert((key as String) != null);

+				nKeys++;

+			}

+			Assert(nKeys==ht.Count);

+

+

+			ICollection vals=ht.Values;

+			int nVals=0;

+			foreach (Object val in vals) {

+				Assert((val as String) != null);

+				nVals++;

+			}

+			Assert(nVals==ht.Count);

+			

+		}

+		

+		/// <summary>

+		///  Test hashtable with CaseInsensitiveHashCodeProvider

+		///  and CaseInsensitive comparer.

+		/// </summary>

+		public void TestCaseInsensitive ()

+		{

+			// Not very meaningfull test, just to make

+			// sure that hcp is set properly set.

+			Hashtable ciHashtable = new Hashtable(11,1.0f,CaseInsensitiveHashCodeProvider.Default,CaseInsensitiveComparer.Default);

+			ciHashtable ["key1"] = "value";

+			ciHashtable ["key2"] = "VALUE";

+			Assert(ciHashtable ["key1"].Equals ("value"));

+			Assert(ciHashtable ["key2"].Equals ("VALUE"));

+

+			ciHashtable ["KEY1"] = "new_value";

+			Assert(ciHashtable ["key1"].Equals ("new_value"));

+

+		}

+

+

+		public void TestCopyConstructor ()

+		{

+			SetDefaultData ();

+

+			Hashtable htCopy = new Hashtable (ht);

+

+			Assert(ht.Count == htCopy.Count);

+		}

+

+

+		public void TestEnumerator ()

+		{

+			SetDefaultData ();

+

+			IEnumerator e = ht.GetEnumerator ();

+

+			while (e.MoveNext ()) {}

+

+			Assert (!e.MoveNext ());

+

+		}

+

+		

+	}

+	

+	

+}

+}

diff --git a/mcs/class/corlib/Test/System.Collections/QueueTest.cs b/mcs/class/corlib/Test/System.Collections/QueueTest.cs
new file mode 100644
index 00000000000..003c5384c79
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/QueueTest.cs
@@ -0,0 +1,182 @@
+//

+// System.Collections.QueueTest

+// Test suite for System.Collections.Queue

+//

+// Author:

+//    Ricardo Fernández Pascual

+//

+// (C) 2001 Ricardo Fernández Pascual

+//

+

+

+

+using System;

+using System.Collections;

+using NUnit.Framework;

+

+namespace MonoTests.System.Collections {

+

+	public class QueueTest : TestCase {

+

+		public QueueTest () 

+			: base ("System.Collection.Queue testsuite") {}

+		public QueueTest (String name) : base (name) {}

+

+		protected Queue q1;

+		protected Queue q2;

+		protected Queue emptyQueue;

+

+		protected override void SetUp () {

+			q1 = new Queue (10);

+			for (int i = 0; i < 100; i++)

+				q1.Enqueue (i);

+			

+			q2 = new Queue (50, 1.5f);

+			for (int i = 50; i < 100; i++)

+				q2.Enqueue (i);

+

+			emptyQueue = new Queue ();

+		}

+

+		public static ITest Suite {

+			get {

+				return new TestSuite (typeof (QueueTest));

+			}

+		}

+		

+		public void TestConstructors () {

+			Assert (q1.Count == 100);

+			Assert (q2.Count == 50);

+			Assert (emptyQueue.Count == 0);

+			// TODO: Test Queue (ICollection)

+		}

+

+		// TODO: should test all methods from ICollection, 

+		// but it should be done in ICollectionTest.cs... ??

+

+		public void TestCopyTo () {

+			int[] a1 = new int[100];

+			int[] a2 = new int[60];

+

+			string progress_marker = "";

+			try {

+				progress_marker = "before first CopyTo";

+				q1.CopyTo (a1, 0);

+				for (int i = 0; i < 100; i++)

+					AssertEquals (i, a1[i]);

+

+				// Remove some items from q2 and add other 

+				// items, to avoid having  an "easy" just created

+				// Queue

+				for (int i = 50; i < 60; i++)

+					Assert (i == (int) q2.Dequeue ());

+				for (int i = 100; i < 110; i++)

+					q2.Enqueue (i);

+				

+				progress_marker = "before second CopyTo";

+				q2.CopyTo (a2, 10);

+				for (int i = 60; i < 110; i++)

+					Assert (i == a2[i - 60 + 10]);

+				

+				// Copying an empty Queue should not modify the array

+				progress_marker = "before third CopyTo";

+				emptyQueue.CopyTo (a2, 10);

+				for (int i = 60; i < 110; i++)

+					Assert (i == a2[i - 60 + 10]);

+			} catch (Exception e) {

+				Fail ("Unexpected exception at marker <" + progress_marker + ">: e = " + e);

+			}

+

+		}

+

+		public void TestEnumerator () {

+			int i;

+			IEnumerator e;

+			e = q1.GetEnumerator ();

+			i = 0;

+			while (e.MoveNext ()) {

+				AssertEquals ("q1 at i=" + i, i, ((int) e.Current));

+				i++;

+			}

+			e = q2.GetEnumerator ();

+			i = 50;

+			while (e.MoveNext ()) {

+				AssertEquals (i, ((int) e.Current));

+				i++;

+			}

+			e = emptyQueue.GetEnumerator ();

+			if (e.MoveNext ())

+				Fail ("Empty Queue enumerator returning elements!");

+

+			e = q1.GetEnumerator ();

+			try {

+				e.MoveNext ();

+				q1.Enqueue (0);

+				e.MoveNext ();

+				Fail ("#1 Should have thrown InvalidOperationException");

+			} catch	(InvalidOperationException) { }

+			e = q1.GetEnumerator ();

+		}

+

+		public void TestClone () {

+			Queue q3 = (Queue) q2.Clone ();

+			Assert (q3.Count == q2.Count);

+			for (int i = 0; i < 50; i++)

+				Assert (q2.Dequeue ().Equals (q3.Dequeue ()));

+			Assert (q3.Count == 0);

+			Assert (q2.Count == 0);

+		}

+

+		public void ClearTest () {

+			q1.Clear ();

+			Assert (q1.Count == 0);

+			q2.Clear ();

+			Assert (q2.Count == 0);

+			emptyQueue.Clear ();

+			Assert (emptyQueue.Count == 0);

+		}

+

+		public void ContainsTest () {

+			for (int i = 0; i < 100; i++) {

+				Assert (q1.Contains (i));

+				Assert (!emptyQueue.Contains (i));

+				if (i < 50)

+					Assert (!q2.Contains (i));

+				else

+					Assert (q2.Contains (i));

+			}

+		}

+		

+		public void EnqueueDequeuePeekTest () {

+			int q1size = q1.Count;

+			int q2size = q2.Count;

+			q2.Enqueue (null);

+			Assert (q2.Count == ++q2size);

+			for (int i = 0; i < 50; i++) {

+				int k = (int) q1.Peek ();

+				Assert (q1.Count == q1size);

+				int j = (int) q1.Dequeue ();

+				Assert (q1.Count == --q1size);

+				Assert (i == j);

+				Assert (j == k);

+				q2.Enqueue (j);

+				Assert (q2.Count == ++q2size);

+			}

+			for (int i = 50; i < 100; i++) {

+				Assert (((int) q2.Dequeue ()) == i);

+				Assert (q2.Count == --q2size);

+			}

+			Assert (q2.Peek () == null);

+			Assert (q2.Dequeue () == null);

+			Assert (q2.Count == --q2size);

+			for (int i = 0; i < 50; i++) {

+				Assert (((int) q2.Dequeue ()) == i);

+				Assert (q2.Count == --q2size);

+			}

+		}

+		

+		// TODO: test Syncronized operation

+

+	}

+}

+

diff --git a/mcs/class/corlib/Test/System.Collections/ReadOnlyCollectionBaseTest.cs b/mcs/class/corlib/Test/System.Collections/ReadOnlyCollectionBaseTest.cs
new file mode 100644
index 00000000000..1ec201d2db2
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/ReadOnlyCollectionBaseTest.cs
@@ -0,0 +1,49 @@
+//

+// System.Collections.ReadOnlyCollectionBase

+// Test suite for System.Collections.ReadOnlyCollectionBase

+//

+// Author:

+//    Nick D. Drochak II

+//

+// (C) 2001 Nick D. Drochak II

+//

+

+

+using System;

+using System.Collections;

+using NUnit.Framework;

+

+namespace MonoTests.System.Collections {

+	public class ReadOnlyCollectionBaseTest : TestCase 	{

+		public ReadOnlyCollectionBaseTest () : base ("System.Collection.ReadOnlyCollectionBase testsuite") {}

+		public ReadOnlyCollectionBaseTest (String name) : base (name) {}

+

+		// We need a concrete class to test the abstract base class

+		public class ConcreteReadOnlyCollection : ReadOnlyCollectionBase 

+		{

+		}

+

+		public static ITest Suite 

+		{

+			get {

+				return new TestSuite (typeof(ReadOnlyCollectionBaseTest));

+			}

+		}

+

+		// Make sure that the Count is 0 for a new object

+		public void TestZeroCountOnNew() 

+		{

+			ConcreteReadOnlyCollection myCollection;

+			myCollection = new ConcreteReadOnlyCollection();

+			Assert(0 == myCollection.Count);

+		}

+

+		// Make sure we get an object from GetEnumerator()

+		public void TestGetEnumerator() 

+		{

+			ConcreteReadOnlyCollection myCollection;

+			myCollection = new ConcreteReadOnlyCollection();

+			Assert(null != myCollection.GetEnumerator());

+		}

+	}

+}

diff --git a/mcs/class/corlib/Test/System.Collections/SortedListTest.cs b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
new file mode 100755
index 00000000000..a27fab9aa2e
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/SortedListTest.cs
@@ -0,0 +1,623 @@
+// SortedListTest.cs - NUnit Test Cases for the System.Collections.SortedList class

+//

+// Jaak Simm

+//

+// Thanks go to David Brandt (bucky@keystreams.com),

+// because this file is based on his ArrayListTest.cs

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+// main TODO: additional tests for functions affected by

+//            fixedsize and read-only properties 

+

+

+using System;

+using System.Collections;

+

+using NUnit.Framework;

+

+

+namespace MonoTests.System.Collections {

+

+

+/// <summary>SortedList test.</summary>

+public class SortedListTest : TestCase {

+	public SortedListTest() : base ("MonoTests.System.SortedListTest testsuite") {}

+	public SortedListTest(string name) : base(name) {}

+

+	protected SortedList sl1;

+	protected SortedList sl2;

+	protected SortedList emptysl;

+	protected const int icap=16;

+		

+	protected override void SetUp() 

+	{

+	}

+

+	protected override void TearDown() 

+	{

+	}

+

+	public static ITest Suite {

+		get { 

+			return new TestSuite(typeof(SortedListTest)); 

+		}

+	}

+	

+	public void TestConstructor1() {

+		SortedList temp1 = new SortedList();

+		AssertNotNull("sl.constructor-1: returns null", temp1);

+		AssertEquals("sl.constructor-1: incorrect initial capacity", icap, temp1.Capacity);

+	}

+	

+	public void TestConstructor2() {

+		Comparer c = Comparer.Default;

+		SortedList temp1 = new SortedList(c);

+		AssertNotNull("sl.constructor-2: returns null", temp1);

+		AssertEquals("sl.constructor-2: incorrect initial capacity", icap, temp1.Capacity);

+	}

+

+	public void TestConstructor3() {

+		Hashtable d = new Hashtable();

+		d.Add("one", "Mircosoft");

+		d.Add("two", "will");

+		d.Add("three", "rule");

+		d.Add("four", "the world");

+		

+		SortedList temp1 = new SortedList(d);

+		AssertNotNull("sl.constructor-3: returns null", temp1);

+		AssertEquals("sl.constructor-3: incorrect initial capacity", 4, temp1.Capacity);

+		AssertEquals("sl.constructor-3: incorrect count", 4, temp1.Count);

+

+		try {

+			d=null;

+			temp1 = new SortedList(d);

+			Fail ("sl.constructor-3: does not throw ArgumentNullException");

+		} catch (ArgumentNullException) {}

+		try {

+			d = new Hashtable();

+			d.Add("one", "Mircosoft");

+			d.Add("two", "will");

+			d.Add("three", "rule");

+			d.Add("four", "the world");

+			d.Add(7987,"lkj");

+			temp1 = new SortedList(d);

+			Fail ("sl.constructor-3: does not throw InvalidCastException");

+		} catch (InvalidOperationException) {

+		} catch (Exception e) {

+			Fail ("Unexpected Exception throw: e=" + e);

+		}

+	}

+	

+	public void TestConstructor4() {

+		SortedList temp1 = new SortedList(17);

+		AssertNotNull("sl.constructor-4: returns null", temp1);

+		AssertEquals("sl.constructor-4: incorrect initial capacity", temp1.Capacity, 17);

+		try {

+			temp1 = new SortedList(-6);

+			Fail ("sl.constructor-4: does not throw ArgumentOutOfRangeException, with negative values");

+		} catch (ArgumentOutOfRangeException) {}

+		try {

+			temp1 = new SortedList(0);

+		} catch (ArgumentOutOfRangeException) {

+			Fail ("sl.constructor-4: throws ArgumentOutOfRangeException with 0");

+		}

+	}

+

+	public void TestConstructor5() {

+		Comparer c = Comparer.Default;

+		SortedList temp1 = new SortedList(c,27);

+		AssertNotNull("sl.constructor-5: returns null", temp1);

+		AssertEquals("sl.constructor-5: incorrect initial capacity", temp1.Capacity, 27);

+		try {

+			temp1 = new SortedList(-12);

+			Fail ("sl.constructor-5: does not throw ArgumentOutOfRangeException, with negative values");

+		} catch (ArgumentOutOfRangeException) {}

+	}

+

+/*

+	FIXME: Once this is done in the class, re-enable the test

+	public void TestIsSynchronized() {

+		SortedList sl1 = new SortedList();

+		Assert("sl: should not be synchronized by default", 

+		       !sl1.IsSynchronized);

+		SortedList sl2 = SortedList.Synchronized(sl1);

+		Assert("sl: synchronized wrapper not working", sl2.IsSynchronized);

+	}

+*/

+	public void TestCapacity() {

+		for (int i = 0; i < 100; i++) {

+			SortedList sl1 = new SortedList(i);

+			AssertEquals("Bad capacity of " + i,

+				     i, sl1.Capacity);

+		}

+	}

+

+	public void TestCount() {

+		{

+			SortedList sl1 = new SortedList();

+			AssertEquals("Bad initial count",

+				     0, sl1.Count);

+			for (int i = 1; i <= 100; i++) {

+				sl1.Add(""+i,""+i);

+				AssertEquals("Bad count " + i,

+					     i, sl1.Count);

+			}

+		}

+	}

+

+	public void TestIsFixed() {

+		SortedList sl1 = new SortedList();

+		Assert("should not be fixed by default", !sl1.IsFixedSize);

+	}

+

+	public void TestIsReadOnly() {

+		SortedList sl1 = new SortedList();

+		Assert("should not be ReadOnly by default", !sl1.IsReadOnly);

+	}

+

+

+	public void TestItem() {

+		SortedList sl1 = new SortedList();

+		string key = null;

+		{

+			try {

+				object o = sl1[-1];

+			} catch (ArgumentNullException) {

+				Fail ("sl.Item: throws ArgumentNullException with negative values");

+			}

+			try {

+				object o = sl1[key];

+				Fail ("sl.Item: does not throw ArgumentNullException with null key");

+			} catch (ArgumentNullException) {}

+		}

+

+		for (int i = 0; i <= 100; i++) {

+			sl1.Add("kala "+i,i);

+		}

+		for (int i = 0; i <= 100; i++) {

+			AssertEquals("sl.Item: item not fetched for " + i,

+				     i, sl1["kala "+i]);

+		}

+	}

+

+  public void TestSyncRoot()

+  {

+  	SortedList sl1 = new SortedList();

+		AssertEquals("sl.SyncRoot: does not function",false, sl1.SyncRoot == null);

+		/*

+		lock( sl1.SyncRoot ) {

+			foreach ( Object item in sl1 ) {

+				item="asdf";

+				Assert ("sl.SyncRoot: item not read-only",item.IsReadOnly);

+ 			}

+		}

+		*/

+  }

+

+	public void TestValues()

+	{

+  	SortedList sl1 = new SortedList();

+		ICollection ic1 = sl1.Values;

+		for (int i = 0; i <= 100; i++) {

+			sl1.Add("kala "+i,i);

+			AssertEquals("sl.Values: .Values has different count",ic1.Count,sl1.Count);

+		}

+	}

+	

+	

+	// TODO: Add with IComparer

+	public void TestAdd() {

+		// seems SortedList cannot be set fixedsize or readonly

+		SortedList sl1 = new SortedList();

+		string key = null;

+		{

+			try {

+				sl1.Add(key,"kala");

+				Fail ("sl.Add: does not throw ArgumentNullException with null key");

+			} catch (ArgumentNullException) {}

+		}

+

+		{

+			for (int i = 1; i <= 100; i++) {

+				sl1.Add("kala "+i,i);

+				AssertEquals("sl.Add: incorrect count",i,sl1.Count);

+				AssertEquals("sl.Add: incorrect value",i,sl1["kala "+i]);

+			}

+		}

+		{

+			try {

+				sl1.Add("kala",10);

+				sl1.Add("kala",11);

+				Fail ("sl.Add: does not throw ArgumentException when adding existing key");

+			} catch (ArgumentException) {}

+		}

+	}

+	

+	public void TestClear() {

+		SortedList sl1 = new SortedList(10);

+		sl1.Add("kala", 'c');

+		sl1.Add("kala2", 'd');

+		AssertEquals("sl.Clear: capacity is incorrect", 10, sl1.Capacity);

+		AssertEquals("sl.Clear: should have one element", 2, sl1.Count);

+		sl1.Clear();

+		AssertEquals("sl.Clear: is not cleared", 0, sl1.Count);

+		AssertEquals("sl.Clear: capacity is altered", 16, sl1.Capacity);

+	}

+

+	public void TestClone() {

+		{

+			SortedList sl1 = new SortedList(10);

+			for (int i = 0; i <= 50; i++) {sl1.Add("kala "+i,i);}

+			SortedList sl2 = (SortedList)sl1.Clone();

+			for (int i = 0; i <= 50; i++) {

+				AssertEquals("sl.Clone: copying failed @"+i, sl1["kala "+i], sl2["kala "+i]);

+			}

+		}

+		{

+			char[] d10 = {'a', 'b'};

+			char[] d11 = {'a', 'c'};

+			char[] d12 = {'b', 'c'};

+			//char[][] d1 = {d10, d11, d12};

+			SortedList sl1 = new SortedList();

+			sl1.Add("d1",d10);

+			sl1.Add("d2",d11);

+			sl1.Add("d3",d12);

+			SortedList sl2 = (SortedList)sl1.Clone();

+			AssertEquals("sl.Clone: Array not matching", sl1["d1"], sl2["d1"]);

+			AssertEquals("sl.Clone: Array not matching", sl1["d2"], sl2["d2"]);

+			AssertEquals("sl.Clone: Array not matching", sl1["d3"], sl2["d3"]);

+			

+			((char[])sl1["d1"])[0] = 'z';

+			AssertEquals("s1.Clone: shallow copy", sl1["d1"], sl2["d1"]);

+		}

+	}

+

+	public void TestContains() {

+		SortedList sl1 = new SortedList(55);

+		for (int i = 0; i <= 50; i++) {sl1.Add("kala "+i,i);}

+

+		try {

+			if (sl1.Contains(null)){}

+			Fail ("sl.Contains: does not throw ArgumentNullException with null key");

+		} catch (ArgumentNullException) {}

+		

+		Assert("sl.Contains: can't find existing key", sl1.Contains("kala 17"));

+		Assert("sl.Contains: finds non-existing key", !sl1.Contains("ohoo"));

+	}

+

+	public void TestContainsKey() {

+		SortedList sl1 = new SortedList(55);

+		for (int i = 0; i <= 50; i++) {sl1.Add("kala "+i,i);}

+

+		try {

+			if (sl1.ContainsKey(null)){}

+			Fail ("sl.ContainsKey: does not throw ArgumentNullException with null key");

+		} catch (ArgumentNullException) {}

+		

+		Assert("sl.ContainsKey: can't find existing key", sl1.ContainsKey("kala 17"));

+		Assert("sl.ContainsKey: finds non-existing key", !sl1.ContainsKey("ohoo"));

+	}

+

+	public void TestContainsValue() {

+		SortedList sl1 = new SortedList(55);

+    sl1.Add(0, "zero");

+    sl1.Add(1, "one");

+    sl1.Add(2, "two");

+    sl1.Add(3, "three");

+    sl1.Add(4, "four");

+		Assert("sl.ContainsValue: can't find existing value", sl1.ContainsValue("zero"));

+		Assert("sl.ContainsValue: finds non-existing value", !sl1.ContainsValue("ohoo"));

+		Assert("sl.ContainsValue: finds non-existing value", !sl1.ContainsValue(null));

+	}

+	

+	public void TestCopyTo() {

+		SortedList sl1 = new SortedList();

+		for (int i = 0; i <= 10; i++) {sl1.Add("kala "+i,i);}

+		{

+			try {

+				sl1.CopyTo(null, 2);

+				Fail("sl.CopyTo: does not throw ArgumentNullException when target null");

+			} catch (ArgumentNullException) {}

+		}

+		{

+			try {

+				Char[,] c2 = new Char[2,2];

+				sl1.CopyTo(c2, 2);

+				Fail("sl.CopyTo: does not throw ArgumentException when target is multiarray");

+			} catch (ArgumentException) {}

+		}

+		{

+			try {

+				Char[] c1 = new Char[2];

+				sl1.CopyTo(c1, -2);

+				Fail("sl.CopyTo: does not throw ArgumentOutOfRangeException when index is negative");

+			} catch (ArgumentOutOfRangeException) {}

+		}

+		{

+			try {

+				Char[] c1 = new Char[2];

+				sl1.CopyTo(c1, 3);

+				Fail("sl.CopyTo: does not throw ArgumentException when index is too large");

+			} catch (ArgumentException) {}

+		}

+		{

+			try {

+				Char[] c1 = new Char[2];

+				sl1.CopyTo(c1, 1);

+				Fail("sl.CopyTo: does not throw ArgumentException when SortedList too big for the array");

+			} catch (ArgumentException) {}

+		}

+		{

+			try {

+				Char[] c2 = new Char[15];

+				sl1.CopyTo(c2, 0);

+				Fail("sl.CopyTo: does not throw InvalidCastException when incompatible data types");

+			} catch (InvalidCastException) {}

+		}

+

+		// CopyTo function does not work well with SortedList

+		// even example at MSDN gave InvalidCastException

+		// thus, it is NOT tested here

+		/*

+				sl1.Clear();

+				for (int i = 0; i <= 5; i++) {sl1.Add(i,""+i);}

+		    Char[] copy = new Char[15];

+		    Array.Clear(copy,0,copy.Length);

+		    copy.SetValue( "The", 0 );

+		    copy.SetValue( "quick", 1 );

+		    copy.SetValue( "brown", 2 );

+		    copy.SetValue( "fox", 3 );

+		    copy.SetValue( "jumped", 4 );

+		    copy.SetValue( "over", 5 );

+		    copy.SetValue( "the", 6 );

+		    copy.SetValue( "lazy", 7 );

+		    copy.SetValue( "dog", 8 );

+				sl1.CopyTo(copy,1);

+				AssertEquals("sl.CopyTo: incorrect copy(1).","The", copy.GetValue(0));

+				AssertEquals("sl.CopyTo: incorrect copy(1).","quick", copy.GetValue(1));

+				for (int i=2; i<8; i++) AssertEquals("sl.CopyTo: incorrect copy(2).",sl1["kala "+(i-2)], copy.GetValue(i));

+				AssertEquals("sl.CopyTo: incorrect copy(3).","dog", copy.GetValue(8));

+		*/

+	}

+

+	public SortedList DefaultSL() {

+		SortedList sl1 = new SortedList();

+		sl1.Add( 1.0, "The" );

+		sl1.Add( 1.1, "quick" );

+		sl1.Add( 34.0, "brown" );

+		sl1.Add( -100.75, "fox" );

+		sl1.Add( 1.4, "jumped" );

+		sl1.Add( 1.5, "over" );

+		sl1.Add( 1.6, "the" );

+		sl1.Add( 1.7, "lazy" );

+		sl1.Add( 1.8, "dog" );

+		return sl1;

+	}

+	

+	public IList DefaultValues() {

+		IList il = new ArrayList();

+		il.Add( "fox" );

+		il.Add( "The" );

+		il.Add( "quick" );

+		il.Add( "jumped" );

+		il.Add( "over" );

+		il.Add( "the" );

+		il.Add( "lazy" );

+		il.Add( "dog" );

+		il.Add( "brown" );

+		return il;

+	}

+	

+	public void TestGetByIndex() {

+		SortedList sl1 = DefaultSL();

+		AssertEquals("cl.GetByIndex: failed(1)",sl1.GetByIndex(4),"over");

+		AssertEquals("cl.GetByIndex: failed(2)",sl1.GetByIndex(8),"brown");

+		try {

+			sl1.GetByIndex(-1);

+			Fail("sl.GetByIndex: does not throw ArgumentOutOfRangeException with negative index");

+		} catch (ArgumentOutOfRangeException) {}

+		try {

+			sl1.GetByIndex(100);

+			Fail("sl.GetByIndex: does not throw ArgumentOutOfRangeException with too large index");

+		} catch (ArgumentOutOfRangeException) {}

+	}

+

+	public void TestGetEnumerator() {

+		SortedList sl1 = DefaultSL();

+		IDictionaryEnumerator e = sl1.GetEnumerator();

+		AssertNotNull("sl.GetEnumerator: does not return enumerator", e);

+		AssertEquals("sl.GetEnumerator: enumerator not working(1)",e.MoveNext(),true);

+		AssertNotNull("sl.GetEnumerator: enumerator not working(2)",e.Current);

+	}

+

+	public void TestGetKey() {

+		SortedList sl1 = DefaultSL();

+		AssertEquals("sl.GetKey: failed(1)",sl1.GetKey(4),1.5);

+		AssertEquals("sl.GetKey: failed(2)",sl1.GetKey(8),34.0);

+		try {

+			sl1.GetKey(-1);

+			Fail("sl.GetKey: does not throw ArgumentOutOfRangeException with negative index");

+		} catch (ArgumentOutOfRangeException) {}

+		try {

+			sl1.GetKey(100);

+			Fail("sl.GetKey: does not throw ArgumentOutOfRangeException with too large index");

+		} catch (ArgumentOutOfRangeException) {}

+	}

+

+	public void TestGetKeyList() {

+		SortedList sl1 = DefaultSL();

+		IList keys = sl1.GetKeyList();

+		AssertNotNull("sl.GetKeyList: does not return keylist", keys);

+		Assert("sl.GetKeyList: keylist is not readonly", keys.IsReadOnly);

+		AssertEquals("sl.GetKeyList: incorrect keylist size",keys.Count,9);

+		AssertEquals("sl.GetKeyList: incorrect key(1)",keys[3],1.4);

+		sl1.Add(33.9,"ehhe");

+		AssertEquals("sl.GetKeyList: incorrect keylist size",keys.Count,10);

+		AssertEquals("sl.GetKeyList: incorrect key(2)",keys[8],33.9);

+	}

+

+	public void TestGetValueList() {

+		SortedList sl1 = DefaultSL();

+		IList originalvals = DefaultValues();

+		IList vals = sl1.GetValueList();

+		AssertNotNull("sl.GetValueList: does not return valuelist", vals);

+		Assert("sl.GetValueList: valuelist is not readonly", vals.IsReadOnly);

+		AssertEquals("sl.GetValueList: incorrect valuelist size",vals.Count,sl1.Count);

+		for (int i=0; i<sl1.Count; i++) {

+			AssertEquals("sl.GetValueList: incorrect key(1)",vals[i],originalvals[i]);

+		}

+

+		sl1.Add(0.01,"ehhe");

+		AssertEquals("sl.GetValueList: incorrect valuelist size",vals.Count,10);

+		AssertEquals("sl.GetValueList: incorrect value(2)",vals[8],"dog");

+	}

+

+	// TODO: IEnumerable.GetEnumerator [Explicit Interface Implementation]

+	/*

+	public void TestIEnumerable_GetEnumerator() {

+		SortedList sl1 = DefaultSL();

+		IEnumerator e = sl1.IEnumerable.GetEnumerator();

+		AssertNotNull("sl.GetEnumerator: does not return enumerator", e);

+		AssertEquals("sl.GetEnumerator: enumerator not working(1)",e.MoveNext(),true);

+		AssertNotNull("sl.GetEnumerator: enumerator not working(2)",e.Current);

+	}

+	*/

+

+	public void TestIndexOfKey() {

+		SortedList sl1 = new SortedList(24);

+		string s=null;

+		int t;

+		for (int i = 0; i <= 50; i++) {

+			s=string.Format("{0:D2}", i); 

+			sl1.Add("kala "+s,i);

+		}

+		AssertEquals("sl.IndexOfKey: does not return -1 for non-existing key", -1, sl1.IndexOfKey("kala "));

+		s=null;

+		try {

+			t=sl1.IndexOfKey(s);

+			Fail("sl.IndexOfKey: ArgumentNullException not caught, when key is null");

+		}

+		catch (ArgumentNullException) {}

+		try {

+			t=sl1.IndexOfKey(10);

+			Fail("sl.IndexOfKey: InvalidOperationException not caught, when key invalid");

+		}

+		catch (InvalidOperationException) {}

+		for (int i=0; i<=50; i++) {

+			s=string.Format("{0:D2}", i); 

+			AssertEquals("sl.IndexOfKey: incorrect index key", i, sl1.IndexOfKey("kala "+s));

+		}

+	}

+

+	public void TestIndexOfValue() {

+		SortedList sl1 = new SortedList(24);

+		string s=null;

+		for (int i = 0; i < 50; i++) {

+			s=string.Format("{0:D2}", i); 

+			sl1.Add("kala "+s,100+i*i);

+		}

+		for (int i = 0; i < 50; i++) {

+			s=string.Format("{0:D2}", i+50); 

+			sl1.Add("kala "+s,100+i*i);

+		}

+		AssertEquals("sl.IndexOfValue: does not return -1 for non-existing value(1)", -1, sl1.IndexOfValue(102));

+		AssertEquals("sl.IndexOfValue: does not return -1 for non-existing value(2)", -1, sl1.IndexOfValue(null));

+		for (int i=0; i<50; i++) {

+			AssertEquals("sl.IndexOfValue: incorrect index key", i, sl1.IndexOfValue(100+i*i));

+		}

+	}

+	

+

+	public void TestRemove() {

+		SortedList sl1 = new SortedList(24);

+		string s=null;

+		int k;

+		for (int i = 0; i < 50; i++) sl1.Add("kala "+i,i);

+		

+		try {

+			sl1.Remove(s);

+			Fail("sl.Remove: ArgumentNullException not caught, when key is null");

+		} catch (ArgumentNullException) {}

+		k=sl1.Count;

+		sl1.Remove("kala ");

+		AssertEquals("sl.Remove: removes an item, when non-existing key given",sl1.Count,k);

+		try {

+			sl1.Remove(15);

+			Fail("sl.Remove: IComparer exception is not thrown");

+		} catch (Exception) {}

+

+		for (int i=15; i<20; i++) sl1.Remove("kala "+i);

+		for (int i=45; i<55; i++) sl1.Remove("kala "+i);

+		

+		AssertEquals("sl.Remove: removing failed",sl1.Count,40);

+		for (int i=45; i<55; i++)

+			AssertEquals("sl.Remove: removing failed(2)",sl1["kala "+i],null);

+	}

+

+	public void TestRemoveAt() {

+		SortedList sl1 = new SortedList(24);

+		int k;

+		string s=null;

+		for (int i = 0; i < 50; i++) {

+			s=string.Format("{0:D2}", i); 

+			sl1.Add("kala "+s,i);

+		}

+		

+		try {

+			sl1.RemoveAt(-1);

+			Fail("sl.RemoveAt: ArgumentOutOfRangeException not caught, when key is out of range");

+		} catch (ArgumentOutOfRangeException) {}

+		try {

+			sl1.RemoveAt(100);

+			Fail("sl.RemoveAt: ArgumentOutOfRangeException not caught, when key is out of range");

+		} catch (ArgumentOutOfRangeException) {}

+		k=sl1.Count;

+

+		for (int i=0; i<20; i++) sl1.RemoveAt(9);

+		

+		AssertEquals("sl.RemoveAt: removing failed",sl1.Count,30);

+		for (int i=0; i<9; i++)

+			AssertEquals("sl.RemoveAt: removing failed(2)",sl1["kala "+string.Format("{0:D2}", i)],i);

+		for (int i=9; i<29; i++)

+			AssertEquals("sl.RemoveAt: removing failed(3)",sl1["kala "+string.Format("{0:D2}", i)],null);

+		for (int i=29; i<50; i++)

+			AssertEquals("sl.RemoveAt: removing failed(4)",sl1["kala "+string.Format("{0:D2}", i)],i);

+	}

+

+	public void TestSetByIndex() {

+		SortedList sl1 = new SortedList(24);

+		for (int i = 49; i>=0; i--) sl1.Add(100+i,i);

+		

+		try {

+			sl1.SetByIndex(-1,77);

+			Fail("sl.SetByIndex: ArgumentOutOfRangeException not caught, when key is out of range");

+		} catch (ArgumentOutOfRangeException) {}

+		try {

+			sl1.SetByIndex(100,88);

+			Fail("sl.SetByIndex: ArgumentOutOfRangeException not caught, when key is out of range");

+		} catch (ArgumentOutOfRangeException) {}

+

+		for(int i=5; i<25; i++) sl1.SetByIndex(i,-1);

+		for(int i=0; i<5; i++)

+			AssertEquals("sl.SetByIndex: set failed(1)",sl1[100+i],i);

+		for(int i=5; i<25; i++)

+			AssertEquals("sl.SetByIndex: set failed(2)",sl1[100+i],-1);

+		for(int i=25; i<50; i++)

+			AssertEquals("sl.SetByIndex: set failed(3)",sl1[100+i],i);

+

+	}

+

+	public void TestTrimToSize() {

+		SortedList sl1 = new SortedList(24);

+		

+		sl1.TrimToSize();

+		AssertEquals("sl.TrimToSize: incorrect capacity after trimming empty list",icap,sl1.Capacity);

+		

+		for (int i = 72; i>=0; i--) sl1.Add(100+i,i);

+		sl1.TrimToSize();

+		AssertEquals("sl.TrimToSize: incorrect capacity after trimming a list",73,sl1.Capacity);

+	}

+}

+

+}

diff --git a/mcs/class/corlib/Test/System.Collections/StackTest.cs b/mcs/class/corlib/Test/System.Collections/StackTest.cs
new file mode 100644
index 00000000000..fdcc3b07cce
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Collections/StackTest.cs
@@ -0,0 +1,270 @@
+//
+// StackTest.cs
+//
+// Author:
+//  Chris Hynes <chrish@assistedsolutions.com>
+//
+// (C) 2001 Chris Hynes
+//
+
+using System;
+
+using System.Collections;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Collections
+{
+	public class StackTest: TestCase
+	{
+                private Stack stack1;
+                private Stack stack2;
+                private Stack stackInt;
+
+                public void TestConstructor()
+                {
+                        AssertEquals(false, stack1 == null);
+                }
+                
+                public void TestICollectionConstructor()
+                {
+                        Stack stackTest = new Stack(new int[] {0, 1, 2, 3, 4});
+
+                        for (int i = 4; i >= 0; i--)
+                                AssertEquals(i, stackTest.Pop());
+
+                        AssertEquals(0, stackTest.Count);
+                }
+
+                public void TestIntConstructor()
+                {
+                        Stack stackTest = new Stack(50);
+
+                        AssertEquals(false, stackTest == null);
+                }
+
+                public void TestCount()
+                {
+                        Stack stackTest = new Stack();
+
+                        stackTest.Push(50);
+                        stackTest.Push(5);
+                        stackTest.Push(0);
+                        stackTest.Push(50);
+
+                        AssertEquals(4, stackTest.Count);
+                }
+
+                public void TestIsSyncronized()
+                {
+                        AssertEquals(false, stack1.IsSynchronized);
+                        AssertEquals(true, Stack.Synchronized(stack1).IsSynchronized);
+                }
+
+                public void TestSyncRoot()
+                {
+                        AssertEquals(false, stack1.SyncRoot == null);
+                }
+
+                public void TestGetEnumerator()
+                {
+                        stackInt.Pop();
+
+                        int j = 3;
+
+                        foreach (int i in stackInt)
+                        {
+                                AssertEquals(j--, i);
+                        }
+
+                        stackInt.Clear();
+
+                        IEnumerator e = stackInt.GetEnumerator();
+
+                        AssertEquals(false, e.MoveNext());
+                }
+
+                public void TestClear()
+                {
+                        stackInt.Clear();
+
+                        AssertEquals(0, stackInt.Count);
+                }
+
+                public void TestClone()
+                {
+                        Stack clone = (Stack)stackInt.Clone();
+
+                        while (stackInt.Count > 0)
+                        {
+                                AssertEquals(stackInt.Pop(), clone.Pop());
+                        }
+                }
+
+                public void TestContains()
+                {
+                        string toLocate = "test";
+
+                        stackInt.Push(toLocate);
+
+                        stackInt.Push("chaff");
+
+                        Assert(stackInt.Contains(toLocate));
+
+                        stackInt.Pop();
+
+                        Assert(stackInt.Contains(toLocate));
+
+                        stackInt.Pop();
+
+                        Assert(!stackInt.Contains(toLocate));
+                }
+
+                public void TestCopyTo()
+                {
+                        int[] arr = new int[stackInt.Count - 1];
+                        int[,] arrMulti;
+
+                        try 
+                        {
+                                stackInt.CopyTo(null, 0);
+                                Fail("Should throw an ArgumentNullException");
+                        } 
+                        catch (ArgumentNullException) {}
+
+                        try
+                        {
+                                stackInt.CopyTo(arr, -1);
+                                Fail("Should throw an ArgumentOutOfRangeException");
+                        } 
+                        catch (ArgumentOutOfRangeException) {}
+
+                        try
+                        {
+                                stackInt.CopyTo(arrMulti = new int[1, 1], 1);
+                                Fail("Should throw an ArgumentException");
+                        } 
+                        catch (ArgumentException) {}
+
+                        try
+                        {
+                                stackInt.CopyTo(arr = new int[2], 3);
+                                Fail("Should throw an ArgumentException");
+                        } 
+                        catch (ArgumentException) {}
+
+                        try
+                        {
+                                stackInt.CopyTo(arr = new int[3], 2);
+                                Fail("Should throw an ArgumentException");
+                        } 
+                        catch (ArgumentException) {}
+
+                        try
+                        {
+                                stackInt.CopyTo(arr = new int[2], 3);
+                                Fail("Should throw an ArgumentException");
+                        } 
+                        catch (ArgumentException) {}
+
+                        arr = new int[stackInt.Count];
+
+                        stackInt.CopyTo(arr, 0);
+
+                        int j = 4;
+
+                        for (int i = 0; i < 4; i++)
+                        {
+                               AssertEquals(j--, arr[i]);
+                        }
+                }
+
+                public void TestSyncronized()
+                {
+                        Stack syncStack = Stack.Synchronized(stackInt);
+
+                        syncStack.Push(5);
+
+                        for (int i = 5; i >= 0; i--)
+                                AssertEquals(i, syncStack.Pop());
+                }
+
+                public void TestPushPeekPop()
+                {
+                        stackInt.Pop();
+
+                        int topVal = (int)stackInt.Peek();
+
+                        AssertEquals(3, topVal);
+
+                        AssertEquals(4, stackInt.Count);
+
+                        AssertEquals(topVal, stackInt.Pop());
+
+                        AssertEquals(2, stackInt.Pop());
+
+                        Stack test = new Stack();
+                        test.Push(null);
+
+                        AssertEquals(null, test.Pop());
+                }
+
+                public void TestToArray()
+                {
+                        object[] arr = stackInt.ToArray();
+
+                        AssertEquals(stackInt.Count, arr.Length);                       
+
+                        for (int i = 0; i < 5; i++)
+                                AssertEquals(arr[i], stackInt.Pop());
+                }
+
+                static void Main(string[] args)
+		{
+      			//
+			// TODO: Add code to start application here
+			//
+		}
+
+                protected override void SetUp()
+                {
+                        stack1 = new Stack();
+                        stack2 = new Stack();
+
+                        stackInt = new Stack();
+    
+                        for (int i = 0; i < 5; i++)
+                                stackInt.Push(i);
+                }
+
+                public static ITest Suite 
+                { 
+                        get 
+                        {
+                                TestSuite stackSuite = new TestSuite(); 
+                                
+                                stackSuite.AddTest(new StackTest("TestConstructor"));
+                                stackSuite.AddTest(new StackTest("TestICollectionConstructor"));
+                                stackSuite.AddTest(new StackTest("TestIntConstructor"));
+
+                                stackSuite.AddTest(new StackTest("TestCount"));
+                                stackSuite.AddTest(new StackTest("TestIsSyncronized"));
+                                stackSuite.AddTest(new StackTest("TestSyncRoot"));
+
+                                stackSuite.AddTest(new StackTest("TestGetEnumerator"));
+                                stackSuite.AddTest(new StackTest("TestClear"));
+                                stackSuite.AddTest(new StackTest("TestClone"));
+                                stackSuite.AddTest(new StackTest("TestContains"));
+                                stackSuite.AddTest(new StackTest("TestPushPeekPop"));
+                                stackSuite.AddTest(new StackTest("TestCopyTo"));
+                                stackSuite.AddTest(new StackTest("TestSyncronized"));
+                                stackSuite.AddTest(new StackTest("TestToArray"));
+
+                                return stackSuite;
+                        }
+                }
+
+		public StackTest() : base ("MonoTests.System.Collections.StackTest testcase") {}

+                public StackTest(string name): base(name) {}
+        }
+}
diff --git a/mcs/class/corlib/Test/System.Diagnostics/AllTests.cs b/mcs/class/corlib/Test/System.Diagnostics/AllTests.cs
new file mode 100644
index 00000000000..d6eab84474c
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Diagnostics/AllTests.cs
@@ -0,0 +1,32 @@
+// Testsuite.System.AllSystemTests.cs

+//

+// Mario Martinez (mariom925@home.om)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+

+using System;

+using NUnit.Framework;

+

+namespace MonoTests.System.Diagnostics {

+        /// <summary>

+        ///   Combines all available unit tests into one test suite.

+        /// </summary>

+        public class AllTests : TestCase {

+                public AllTests(string name) : base(name) {}

+                

+                public static ITest Suite 

+                { 

+                        get 

+                        {

+                                TestSuite suite =  new TestSuite();

+                                suite.AddTest(DebugTest.Suite);

+                                suite.AddTest(StackTraceTest.Suite);

+                                suite.AddTest(StackFrameTest.Suite);

+                        	suite.AddTest(TextWriterTraceListenerTest.Suite);

+                                return suite;

+                        }

+                }

+        }

+}

+

diff --git a/mcs/class/corlib/Test/System.Diagnostics/ChangeLog b/mcs/class/corlib/Test/System.Diagnostics/ChangeLog
new file mode 100644
index 00000000000..cd80e678c90
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Diagnostics/ChangeLog
@@ -0,0 +1,8 @@
+2002-06-19  Nick Drochak  <ndrochak@gol.com>

+

+	* AllTests.cs: Add missing test: DebugTest

+

+2002-02-10  Nick Drochak  <ndrochak@gol.com>

+

+	* DebugTest.cs: Put in correct namespace.

+	* TextWriterTraceListenerTest.cs: Put in correct namespace.
\ No newline at end of file
diff --git a/mcs/class/corlib/Test/System.Diagnostics/DebugTest.cs b/mcs/class/corlib/Test/System.Diagnostics/DebugTest.cs
new file mode 100644
index 00000000000..5d620ea5813
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Diagnostics/DebugTest.cs
@@ -0,0 +1,89 @@
+//

+// MonoTests.System.Diagnostics.DebugTest.cs

+//

+// Author:

+//	John R. Hicks (angryjohn69@nc.rr.com)

+//

+// (C) 2002

+using System;

+using System.Diagnostics;

+using NUnit.Framework;

+

+namespace MonoTests.System.Diagnostics

+{

+	public class DebugTest

+	{

+		private DebugTest()

+		{

+			

+		}

+		

+		public static ITest Suite

+		{

+			get

+			{

+				TestSuite suite = new TestSuite();

+				suite.AddTest(DebugTest1.Suite);

+				return suite;

+			}

+		}

+		

+		private class DebugTest1 : TestCase

+		{

+			public DebugTest1(string name) : base(name)

+			{

+				

+			}

+			

+			internal static ITest Suite

+			{

+				get

+				{

+					return new TestSuite(typeof(DebugTest1));

+				}

+			}

+			

+			protected override void SetUp()

+			{

+				Debug.Listeners.Add(new TextWriterTraceListener(Console.Error));	

+			}

+			

+			protected override void TearDown()

+			{

+				

+			}

+			

+			public void TestAssert()

+			{

+				Debug.Assert(false, "Testing Assertions");

+			}

+			

+			public void TestFail()

+			{

+				Debug.Fail("Testing Fail method");

+			}

+			

+			public void TestWrite()

+			{

+				Debug.Write("Testing Write", "Testing the output of the Write method");

+			}

+			

+			public void TestWriteIf()

+			{

+				Debug.WriteIf(true, "Testing WriteIf");

+				Debug.WriteIf(false, "Testing WriteIf", "Passed false");

+			}

+			

+			public void TestWriteLine()

+			{

+				Debug.WriteLine("Testing WriteLine method");

+			}

+			

+			public void TestWriteLineIf()

+			{

+				Debug.WriteLineIf(true, "Testing WriteLineIf");

+				Debug.WriteLineIf(false, "Testing WriteLineIf", "Passed false");

+			}

+		}

+	}

+}

diff --git a/mcs/class/corlib/Test/System.Diagnostics/StackFrameTest.cs b/mcs/class/corlib/Test/System.Diagnostics/StackFrameTest.cs
new file mode 100644
index 00000000000..ce35039c1a4
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Diagnostics/StackFrameTest.cs
@@ -0,0 +1,350 @@
+//
+// MonoTests.System.Diagnostics.StackFrameTest.cs
+//
+// Author:
+//      Alexander Klyubin (klyubin@aqris.com)
+//
+// (C) 2001
+//
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using NUnit.Framework;
+
+namespace MonoTests.System.Diagnostics {
+        public class StackFrameTest {
+                private StackFrameTest() {}
+                public static ITest Suite 
+                { 
+                        get 
+                        {
+                                TestSuite suite =  new TestSuite();
+                                suite.AddTest(StackFrameTest1.Suite);
+                                suite.AddTest(StackFrameTest2.Suite);
+                                suite.AddTest(StackFrameTest3.Suite);
+                                return suite;
+                        }
+                }
+
+        /// <summary>
+        ///   Tests the case where StackFrame is created for specified file name and
+        ///   location inside it.
+        /// </summary>
+        private class StackFrameTest1 : TestCase {
+                public StackFrameTest1(string name) : base(name) {}
+                
+                private StackFrame frame1;
+                private StackFrame frame2;
+                
+                internal static ITest Suite 
+                { 
+                        get 
+                        {
+                                return  new TestSuite(typeof(StackFrameTest1));
+                        }
+                }
+                
+                protected override void SetUp() {
+                        frame1 = new StackFrame("dir/someFile", 13, 45);
+                        frame2 = new StackFrame("SomeFile2.cs", 24);
+                }
+                
+                protected override void TearDown() {
+                        frame1 = null;
+                        frame2 = null;
+                }
+                
+                
+                
+                /// <summary>
+                ///   Tests whether getting file name works.
+                /// </summary>
+                public void TestGetFileName() {
+                        AssertEquals("File name (1)",
+                                     "dir/someFile",
+                                     frame1.GetFileName());
+                                     
+                        AssertEquals("File name (2)",
+                                     "SomeFile2.cs",
+                                     frame2.GetFileName());
+                }
+                
+                /// <summary>
+                ///   Tests whether getting file line number works.
+                /// </summary>
+                public void TestGetFileLineNumber() {
+                        AssertEquals("Line number (1)",
+                                     13,
+                                     frame1.GetFileLineNumber());
+                                     
+                        AssertEquals("Line number (2)",
+                                     24,
+                                     frame2.GetFileLineNumber());
+                }
+                
+                /// <summary>
+                ///   Tests whether getting file column number works.
+                /// </summary>
+                public void TestGetFileColumnNumber() {
+                        AssertEquals("Column number (1)",
+                                     45,
+                                     frame1.GetFileColumnNumber());
+                                     
+                        AssertEquals("Column number (2)",
+                                     0,
+                                     frame2.GetFileColumnNumber());
+                }
+                
+                                
+                /// <summary>
+                ///   Tests whether getting method associated with frame works.
+                /// </summary>
+                public void TestGetMethod() {
+                        Assert("Method not null (1)", (frame1.GetMethod() != null));
+
+                        AssertEquals("Class declaring the method (1)",
+                                     this.GetType(),
+                                     frame1.GetMethod().DeclaringType);
+                        AssertEquals("Method name (1)",
+                                     "SetUp",
+                                     frame1.GetMethod().Name);
+                                     
+                        Assert("Method not null (2)", (frame2.GetMethod() != null));
+                        
+                        AssertEquals("Class declaring the method (2)",
+                                     this.GetType(),
+                                     frame2.GetMethod().DeclaringType);
+                        AssertEquals("Method name (2)",
+                                     "SetUp",
+                                     frame2.GetMethod().Name);
+                }
+        }
+        
+        /// <summary>
+        ///   Tests the case where StackFrame is created for current method.
+        /// </summary>
+        /// <remarks>
+        ///   FIXME: Must be compiled with /debug switch. Otherwise some file
+        ///   information will be incorrect for the following test cases.
+        ///   What's the best way to do both types of tests with and without
+        ///   debug information?
+        /// </remarks>
+        private class StackFrameTest2 : TestCase {
+                public StackFrameTest2(string name) : base(name) {}
+                
+                private StackFrame frame1;
+                private StackFrame frame2;
+                private StackFrame frame3;
+                
+                internal static ITest Suite 
+                { 
+                        get 
+                        {
+                                return  new TestSuite(typeof(StackFrameTest2));
+                        }
+                }
+                
+                protected override void SetUp() {
+                        frame1 = new StackFrame();
+                        frame2 = new StackFrame(true);
+                        frame3 = new StackFrame(0);
+                }
+                
+                protected override void TearDown() {
+                        frame1 = null;
+                        frame2 = null;
+                        frame3 = null;
+                }
+                
+                
+                
+                /// <summary>
+                ///   Tests whether getting file name works.
+                /// </summary>
+                public void TestGetFileName() {
+                        AssertNull("File name (1)",
+                                   frame1.GetFileName());
+                                     
+                        Assert("File name (2) " + frame2.GetFileName()
+                                        + " ends with StackFrameTest.cs",
+                               frame2.GetFileName().EndsWith("StackFrameTest.cs"));
+                }
+                
+                /// <summary>
+                ///   Tests whether getting file line number works.
+                /// </summary>
+                public void TestGetFileLineNumber() {
+                        AssertEquals("Line number (1)",
+                                     0,
+                                     frame1.GetFileLineNumber());
+                                     
+                        AssertEquals("Line number (2)",
+                                     154,
+                                     frame2.GetFileLineNumber());
+                                     
+                        AssertEquals("Line number (3)",
+                                     0,
+                                     frame3.GetFileLineNumber());
+                }
+                
+                /// <summary>
+                ///   Tests whether getting file column number works.
+                /// </summary>
+                public void TestGetFileColumnNumber() {
+                        AssertEquals("Column number (1)",
+                                     0,
+                                     frame1.GetFileColumnNumber());
+                                     
+                        AssertEquals("Column number (2)",
+                                     25,
+                                     frame2.GetFileColumnNumber());
+                        
+                        AssertEquals("Column number (3)",
+                                     0,
+                                     frame3.GetFileColumnNumber());
+                }
+                
+                                
+                /// <summary>
+                ///   Tests whether getting method associated with frame works.
+                /// </summary>
+                public void TestGetMethod() {
+                        Assert("Method not null (1)",
+                               (frame1.GetMethod() != null));
+
+                        AssertEquals("Class declaring the method (1)",
+                                     this.GetType(),
+                                     frame1.GetMethod().DeclaringType);
+                        AssertEquals("Method name (1)",
+                                     "SetUp",
+                                     frame1.GetMethod().Name);
+                                     
+                        Assert("Method not null (2)",
+                               (frame2.GetMethod() != null));
+                        
+                        AssertEquals("Class declaring the method (2)",
+                                     this.GetType(),
+                                     frame2.GetMethod().DeclaringType);
+                        AssertEquals("Method name (2)",
+                                     "SetUp",
+                                     frame2.GetMethod().Name);
+                                     
+                        Assert("Method not null (3)",
+                               (frame3.GetMethod() != null));
+
+                        AssertEquals("Class declaring the method (3)",
+                                     this.GetType(),
+                                     frame3.GetMethod().DeclaringType);
+                        AssertEquals("Method name (3)",
+                                     "SetUp",
+                                     frame3.GetMethod().Name);
+                }
+        }
+        
+        
+        /// <summary>
+        ///   Tests the case where StackFrame is created for current method but
+        ///   skipping some frames.
+        /// </summary>
+        /// <remarks>
+        ///   FIXME: Must be compiled with /debug switch. Otherwise some file
+        ///   information will be incorrect for the following test cases.
+        ///   What's the best way to do both types of tests with and without
+        ///   debug information?
+        /// </remarks>
+        private class StackFrameTest3 : TestCase {
+                public StackFrameTest3(string name) : base(name) {}
+                
+                private StackFrame frame1;
+                private StackFrame frame2;
+                
+                internal static ITest Suite 
+                { 
+                        get 
+                        {
+                                return  new TestSuite(typeof(StackFrameTest3));
+                        }
+                }
+                
+                protected override void SetUp() {
+                        // In order to get better test cases with stack traces
+                        NestedSetUp();
+                }
+                
+                private void NestedSetUp() {
+                        frame1 = new StackFrame(2);
+                        frame2 = new StackFrame(1, true);
+                }
+                
+                protected override void TearDown() {
+                        frame1 = null;
+                        frame2 = null;
+                }
+                
+                
+                
+                /// <summary>
+                ///   Tests whether getting file name works.
+                /// </summary>
+                public void TestGetFileName() {
+                        AssertNull("File name (1)",
+                                   frame1.GetFileName());
+                                     
+                        Assert("File name (2) " + frame2.GetFileName()
+                                        + " ends with StackFrameTest.cs",
+                               frame2.GetFileName().EndsWith("StackFrameTest.cs"));
+                }
+                
+                /// <summary>
+                ///   Tests whether getting file line number works.
+                /// </summary>
+                public void TestGetFileLineNumber() {
+                        AssertEquals("Line number (1)",
+                                     0,
+                                     frame1.GetFileLineNumber());
+                                     
+                        AssertEquals("Line number (2)",
+                                     277,
+                                     frame2.GetFileLineNumber());
+                }
+                
+                /// <summary>
+                ///   Tests whether getting file column number works.
+                /// </summary>
+                public void TestGetFileColumnNumber() {
+                        AssertEquals("Column number (1)",
+                                     0,
+                                     frame1.GetFileColumnNumber());
+                                     
+                        AssertEquals("Column number (2)",
+                                     17,
+                                     frame2.GetFileColumnNumber());
+                }
+                
+                                
+                /// <summary>
+                ///   Tests whether getting method associated with frame works.
+                /// </summary>
+                public void TestGetMethod() {
+                        Assert("Method not null (1)", (frame1.GetMethod() != null));
+
+                        AssertEquals("Class declaring the method (1)",
+                                     typeof(NUnit.Framework.TestCase),
+                                     frame1.GetMethod().DeclaringType);
+                        AssertEquals("Method name (1)",
+                                     "RunBare",
+                                     frame1.GetMethod().Name);
+                                     
+                        Assert("Method not null (2)", (frame2.GetMethod() != null));
+                        
+                        AssertEquals("Class declaring the method (2)",
+                                     this.GetType(),
+                                     frame2.GetMethod().DeclaringType);
+                        AssertEquals("Method name (2)",
+                                     "SetUp",
+                                     frame2.GetMethod().Name);
+                }
+	}
+        }
+}
diff --git a/mcs/class/corlib/Test/System.Diagnostics/StackTraceTest.cs b/mcs/class/corlib/Test/System.Diagnostics/StackTraceTest.cs
new file mode 100644
index 00000000000..84a7b4876a6
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Diagnostics/StackTraceTest.cs
@@ -0,0 +1,98 @@
+//
+// MonoTests.System.Diagnostics.StackTraceTest.cs
+//
+// Author:
+//      Alexander Klyubin (klyubin@aqris.com)
+//
+// (C) 2001
+//
+
+using System;
+using System.Diagnostics;
+using System.Reflection;
+using NUnit.Framework;
+
+namespace MonoTests.System.Diagnostics {
+        public class StackTraceTest {
+                private StackTraceTest() {}
+                public static ITest Suite 
+                { 
+                        get 
+                        {
+                                TestSuite suite =  new TestSuite();
+                                suite.AddTest(StackTraceTest1.Suite);
+                                return suite;
+                        }
+                }
+
+        /// <summary>
+        ///   Tests the case where StackTrace is created for specified
+        ///   stack frame.
+        /// </summary>
+        private class StackTraceTest1 : TestCase {
+                public StackTraceTest1(string name) : base(name) {}
+                
+                private StackTrace trace;
+                private StackFrame frame;
+                
+                internal static ITest Suite 
+                { 
+                        get 
+                        {
+                                return  new TestSuite(typeof(StackTraceTest1));
+                        }
+                }
+                
+                protected override void SetUp() {
+                        frame = new StackFrame("dir/someFile",
+                                               13,
+                                               45);
+                        trace = new StackTrace(frame);
+                }
+                
+                protected override void TearDown() {
+                        trace = null;
+                }
+                
+                
+                
+                /// <summary>
+                ///   Tests whether getting number of frames works.
+                /// </summary>
+                public void TestFrameCount() {
+                        AssertEquals("Frame count",
+                                     1,
+                                     trace.FrameCount);
+                }
+                
+                /// <summary>
+                ///   Tests whether getting frames by index which is out of
+                ///   range works.
+                /// </summary>
+                public void TestGetFrameOutOfRange() {
+                        Assert("Frame with index -1 == null",
+                               (trace.GetFrame(-1) == null));
+                        
+                        Assert("Frame with index -129 = null",
+                               (trace.GetFrame(-129) == null));
+                               
+                        Assert("Frame with index 1 = null",
+                               (trace.GetFrame(1) == null));
+                               
+                        Assert("Frame with index 145 = null",
+                               (trace.GetFrame(145) == null));
+
+                }
+        
+        
+                /// <summary>
+                ///   Tests whether getting frames by index works.
+                /// </summary>
+                public void TestGetFrame() {
+                        AssertEquals("Frame with index 0",
+                                     frame,
+                                     trace.GetFrame(0));
+                }                
+	}
+        }
+}
diff --git a/mcs/class/corlib/Test/System.Diagnostics/TextWriterTraceListenerTest.cs b/mcs/class/corlib/Test/System.Diagnostics/TextWriterTraceListenerTest.cs
new file mode 100644
index 00000000000..c7cc8e35b90
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Diagnostics/TextWriterTraceListenerTest.cs
@@ -0,0 +1,83 @@
+//

+// MonoTests.System.Diagnostics.TextWriterTraceListenerTest.cs

+//

+// Author:

+//	John R. Hicks (angryjohn69@nc.rr.com)

+//

+// (C) 2001

+

+using System;

+using System.IO;

+using System.Text;

+using System.Diagnostics;

+using NUnit.Framework;

+

+namespace MonoTests.System.Diagnostics

+{

+	

+	public class TextWriterTraceListenerTest

+	{

+		private TextWriterTraceListenerTest()

+		{

+			

+		}

+		

+		public static ITest Suite

+		{

+			get

+			{

+				TestSuite suite = new TestSuite();

+				suite.AddTest(TextWriterTraceListenerTest1.Suite);

+				return suite;

+			}

+		}

+		

+		private class TextWriterTraceListenerTest1 : TestCase

+		{

+			public TextWriterTraceListenerTest1(string name) : base(name)

+			{

+			}

+			

+			private TextWriterTraceListener listener;

+			

+			internal static ITest Suite

+			{

+				get

+				{

+					return new TestSuite(typeof(TextWriterTraceListenerTest1));

+				}

+			}

+			

+			protected override void SetUp()

+			{

+				listener = new TextWriterTraceListener();

+				listener.Writer = Console.Out;

+			}

+			

+			protected override void TearDown()

+			{

+				listener = null;

+			}

+			

+			public void TestWrite()

+			{

+				Assert("Null Listener", !(listener == null));

+				Assert("Null Writer", !(listener.Writer == null));

+				listener.Write("Test Message\n");

+				

+			}

+			

+			public void TestWriteLine()

+			{

+				Assert("Null Listener", !(listener == null));

+				Assert("Null Writer", !(listener.Writer == null));

+				listener.WriteLine("Test WriteLine Message");

+			}

+			

+			public void TestFlush()

+			{

+				listener.Flush();

+			}

+		}

+	}

+}

diff --git a/mcs/class/corlib/Test/System.Globalization/AllTests.cs b/mcs/class/corlib/Test/System.Globalization/AllTests.cs
new file mode 100644
index 00000000000..7d80e617556
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Globalization/AllTests.cs
@@ -0,0 +1,28 @@
+// System.Globalization/AllTests.cs
+//
+// (C) 2002 Ulrich Kunitz
+//
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System.Globalization {
+
+/// <summary>
+///   Combines all available unit tests into one test suite.
+/// </summary>
+public class AllTests : TestCase {
+	public AllTests(string name) : base(name) {}
+	
+	public static ITest Suite 
+	{ 
+		get 
+		{
+			TestSuite suite =  new TestSuite();
+			suite.AddTest(CalendarTest.Suite);
+			return suite;
+		}
+	}
+} // class AllTests
+
+} // namespace MonoTests.System.Globalization
diff --git a/mcs/class/corlib/Test/System.Globalization/CalendarTest.cs b/mcs/class/corlib/Test/System.Globalization/CalendarTest.cs
new file mode 100644
index 00000000000..83d6b68ea91
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Globalization/CalendarTest.cs
@@ -0,0 +1,602 @@
+// CalendarTest.cs
+//
+// (C) 2002 Ulrich Kunitz
+//
+
+using NUnit.Framework;
+using System;
+using System.Globalization;
+using System.IO;
+
+namespace MonoTests.System.Globalization
+{
+
+sealed class Date {
+	private int _day, _month, _year, _era;
+
+	public int Day {
+		get {
+			return _day;
+		}
+		set {
+			if (value < 1 || value > 31)
+				throw new ArgumentOutOfRangeException(
+					"Day",
+					"Day must be between 1 and 31.");
+			_day = value;
+		}
+	}
+
+	public int Month {
+		get {
+			return _month;
+		}
+		set {
+			if (value < 1 || value > 13)
+				throw new ArgumentOutOfRangeException(
+					"Month",
+					"Month must be between 1 and 13.");
+			_month = value;
+		}
+	}
+
+	public int Year {
+		get {
+			return _year;
+		}
+		set {
+			_year = value;
+		}
+	}
+
+	public int Era {
+		get {
+			return _era;
+		}
+		set {
+			if (value < 1 || value > 10)
+				throw new ArgumentOutOfRangeException(
+					"Era",
+					"Era must be between 1 and 10.");
+			_era = value;
+		}
+	}
+					
+	public Date(int day, int month, int year, int era) {
+		Day = day;
+		Month = month;
+		Year = year;
+		Era = era;
+	}
+	public Date(int day, int month, int year) : this(day,month,year,1) {}
+	public Date() : this(1,1,1,1) {}
+
+	public DateTime ToDateTime(Calendar cal) {
+		return cal.ToDateTime(Year,Month,Day,0,0,0,0,Era);
+	}
+
+	public void FromDateTime(Calendar cal, DateTime time) {
+		Date dmy = new Date();
+		dmy.Day = cal.GetDayOfMonth(time);
+		dmy.Month = cal.GetMonth(time);
+		dmy.Year = cal.GetYear(time);
+		dmy.Era = cal.GetEra(time);
+		Day = dmy.Day;
+		Month = dmy.Month;
+		Year = dmy.Year;
+		Era = dmy.Era;
+	}
+
+	public override string ToString() {
+		StringWriter sw = new StringWriter();
+		sw.Write("{0}.{1}.{2}", Day, Month, Year);
+		if (Era != 1) {
+			sw.Write(" era {0}", Era);
+		}
+		return sw.ToString();
+	}
+
+	public override bool Equals(Object b) {
+		if (b == null || GetType() != b.GetType())
+			return false;
+		return Equals(this, (Date)b);
+	}
+
+	public static bool Equals(Date a, Date b) {
+		if (a == b)
+			return true;
+		if (a.Year != b.Year)
+			return false;
+		if (a.Month != b.Month)
+			return false;
+		if (a.Day != b.Day)
+			return false;
+		if (a.Era != b.Era)
+			return false;
+		return true;
+	}
+
+	public override int GetHashCode() {
+		return ToString().GetHashCode();
+	}
+} // class Date
+
+public class CalendarTest : TestCase {
+	public CalendarTest() : base("System.Globalization.CalendarTest") {}
+	public CalendarTest(string name) : base(name) {}
+
+	public static ITest Suite {
+		get {
+			return new TestSuite(typeof(CalendarTest));
+		}
+	}
+
+	private Calendar[] acal;
+	private GregorianCalendar gcal;
+	private JulianCalendar jucal;
+	private HijriCalendar hical;
+	private HebrewCalendar hecal;
+	private JapaneseCalendar jacal;
+	private TaiwanCalendar tacal;
+	private KoreanCalendar kcal;
+	private ThaiBuddhistCalendar tbcal;
+
+	protected override void SetUp() {
+		gcal = new GregorianCalendar();
+		jucal = new JulianCalendar();
+		hical = new HijriCalendar();
+		hecal = new HebrewCalendar();
+		jacal = new JapaneseCalendar();
+		tacal = new TaiwanCalendar();
+		kcal = new KoreanCalendar();
+		tbcal = new ThaiBuddhistCalendar();
+		acal = new Calendar[] {
+			gcal, jucal, hical, hecal, jacal,
+			tacal, kcal, tbcal};
+	}
+
+	private void RowCheck(params Date[] adate) {
+		if (adate.Length != acal.Length)
+			throw new ArgumentException(
+				"Number of Date arguments doesn't match " +
+				"length of calendar array.");
+
+		DateTime timeG = adate[0].ToDateTime(gcal);
+		for (int i = 0; i < acal.Length; i++) {
+			Date date = adate[i];
+			if (date == null)
+				continue;
+			Calendar cal = acal[i];
+
+			DateTime time = date.ToDateTime(cal);
+			StringWriter sw = new StringWriter();
+			sw.Write("Calendar {0} computes wrong DateTime.",
+				cal);
+			AssertEquals(sw.ToString(), timeG, time);
+
+			sw = new StringWriter();
+			Date ndate = new Date();
+			ndate.FromDateTime(cal, time);
+			sw.Write("Calendar {0} computes wrong date", cal);
+			AssertEquals(sw.ToString(), date, ndate);
+		}
+	}
+
+	// We are testing the implementation against the reference dates in
+	// Calendrical Calcualation. Please note that the CLR uses another
+	// epoch for the HijriCalendar, which might be the perfect thing
+	// to do.
+	public void TestCCTable() {
+		// Gr Ju Hi He Ja Ta Ko TB
+		RowCheck(new Date(24,9,70,1),
+			new Date(26,9,70,1),
+			null,
+			null,
+			null,
+			null,
+			new Date(24,9,2403,1),
+			new Date(24,9,613,1));
+		RowCheck(new Date(2,10,135,1),
+			new Date(3,10,135,1),
+			null,
+			null,
+			null,
+			null,
+			new Date(2,10,2468,1),
+			new Date(2,10,678,1));
+		RowCheck(new Date(8,1,470,1),
+			new Date(7,1,470,1),
+			null,
+			null,
+			null,
+			null,
+			new Date(8,1,2803,1),
+			new Date(8,1,1013,1));
+		RowCheck(new Date(20,5,576,1),
+			new Date(18,5,576,1),
+			null,
+			null,
+			null,
+			null,
+			new Date(20,5,2909,1),
+			new Date(20,5,1119,1));
+		RowCheck(new Date(10,11,694,1),
+			new Date(7,11,694,1),
+			new Date(14,7,75,1),
+			null,
+			null,
+			null,
+			new Date(10,11,3027,1),
+			new Date(10,11,1237,1));
+		RowCheck(new Date(25,4,1013,1),
+			new Date(19,4,1013,1),
+			new Date(6,10,403,1),
+			null,
+			null,
+			null,
+			new Date(25,4,3346,1),
+			new Date(25,4,1556,1));
+		RowCheck(new Date(24,5,1096,1),
+			new Date(18,5,1096,1),
+			new Date(23,5,489,1),
+			null,
+			null,
+			null,
+			new Date(24,5,3429,1),
+			new Date(24,5,1639,1));
+		RowCheck(new Date(23,3,1190,1),
+			new Date(16,3,1190,1),
+			new Date(8,2,586,1),
+			null,
+			null,
+			null,
+			new Date(23,3,3523,1),
+			new Date(23,3,1733,1));
+		RowCheck(new Date(10,3,1240,1),
+			new Date(3,3,1240,1),
+			new Date(8,8,637,1),
+			null,
+			null,
+			null,
+			new Date(10,3,3573,1),
+			new Date(10,3,1783,1));
+		RowCheck(new Date(2,4,1288,1),
+			new Date(26,3,1288,1),
+			new Date(21,2,687,1),
+			null,
+			null,
+			null,
+			new Date(2,4,3621,1),
+			new Date(2,4,1831,1));
+		RowCheck(new Date(27,4,1298,1),
+			new Date(20,4,1298,1),
+			new Date(8,7,697,1),
+			null,
+			null,
+			null,
+			new Date(27,4,3631,1),
+			new Date(27,4,1841,1));
+		RowCheck(new Date(12,6,1391,1),
+			new Date(4,6,1391,1),
+			new Date(2,7,793,1),
+			null,
+			null,
+			null,
+			new Date(12,6,3724,1),
+			new Date(12,6,1934,1));
+		RowCheck(new Date(3,2,1436,1),
+			new Date(25,1,1436,1),
+			new Date(7,7,839,1),
+			null,
+			null,
+			null,
+			new Date(3,2,3769,1),
+			new Date(3,2,1979,1));
+		RowCheck(new Date(9,4,1492,1),
+			new Date(31,3,1492,1),
+			new Date(2,6,897,1),
+			null,
+			null,
+			null,
+			new Date(9,4,3825,1),
+			new Date(9,4,2035,1));
+		RowCheck(new Date(19,9,1553,1),
+			new Date(9,9,1553,1),
+			new Date(1,10,960,1),
+			null,
+			null,
+			null,
+			new Date(19,9,3886,1),
+			new Date(19,9,2096,1));
+		RowCheck(new Date(5,3,1560,1),
+			new Date(24,2,1560,1),
+			new Date(28,5,967,1),
+			null,
+			null,
+			null,
+			new Date(5,3,3893,1),
+			new Date(5,3,2103,1));
+		RowCheck(new Date(10,6,1648,1),
+			new Date(31,5,1648,1),
+			new Date(19,5,1058,1),
+			new Date(20,9,5408,1),
+			null,
+			null,
+			new Date(10,6,3981,1),
+			new Date(10,6,2191,1));
+		RowCheck(new Date(30,6,1680,1),
+			new Date(20,6,1680,1),
+			new Date(3,6,1091,1),
+			new Date(3,11,5440,1),
+			null,
+			null,
+			new Date(30,6,4013,1),
+			new Date(30,6,2223,1));
+		RowCheck(new Date(24,7,1716,1),
+			new Date(13,7,1716,1),
+			new Date(5,8,1128,1),
+			new Date(5,11,5476,1),
+			null,
+			null,
+			new Date(24,7,4049,1),
+			new Date(24,7,2259,1));
+		RowCheck(new Date(19,6,1768,1),
+			new Date(8,6,1768,1),
+			new Date(4,2,1182,1),
+			new Date(4,10,5528,1),
+			null,
+			null,
+			new Date(19,6,4101,1),
+			new Date(19,6,2311,1));
+		RowCheck(new Date(2,8,1819,1),
+			new Date(21,7,1819,1),
+			new Date(11,10,1234,1),
+			new Date(11,11,5579,1),
+			null,
+			null,
+			new Date(2,8,4152,1),
+			new Date(2,8,2362,1));
+		RowCheck(new Date(27,3,1839,1),
+			new Date(15,3,1839,1),
+			new Date(12,1,1255,1),
+			new Date(12,7,5599,1),
+			null,
+			null,
+			new Date(27,3,4172,1),
+			new Date(27,3,2382,1));
+		RowCheck(new Date(19,4,1903,1),
+			new Date(6,4,1903,1),
+			new Date(22,1,1321,1),
+			new Date(22,7,5663,1),
+			new Date(19,4,36,1),
+			null,
+			new Date(19,4,4236,1),
+			new Date(19,4,2446,1));
+		RowCheck(new Date(25,8,1929,1),
+			new Date(12,8,1929,1),
+			new Date(20,3,1348,1),
+			new Date(19,12,5689,1),
+			new Date(25,8,4,3),
+			new Date(25,8,18,1),
+			new Date(25,8,4262,1),
+			new Date(25,8,2472,1));
+		RowCheck(new Date(29,9,1941,1),
+			new Date(16,9,1941,1),
+			new Date(9,9,1360,1),
+			new Date(8,1,5702,1),
+			new Date(29,9,16,3),
+			new Date(29,9,30,1),
+			new Date(29,9,4274,1),
+			new Date(29,9,2484,1));
+		RowCheck(new Date(19,4,1943,1),
+			new Date(6,4,1943,1),
+			new Date(14,4,1362,1),
+			new Date(14,8,5703,1),
+			new Date(19,4,18,3),
+			new Date(19,4,32,1),
+			new Date(19,4,4276,1),
+			new Date(19,4,2486,1));
+		RowCheck(new Date(7,10,1943,1),
+			new Date(24,9,1943,1),
+			new Date(8,10,1362,1),
+			new Date(8,1,5704,1),
+			new Date(7,10,18,3),
+			new Date(7,10,32,1),
+			new Date(7,10,4276,1),
+			new Date(7,10,2486,1));
+		RowCheck(new Date(17,3,1992,1),
+			new Date(4,3,1992,1),
+			new Date(14,9,1412,1),
+			new Date(12,7,5752,1),
+			new Date(17,3,4,4),
+			new Date(17,3,81,1),
+			new Date(17,3,4325,1),
+			new Date(17,3,2535,1));
+		RowCheck(new Date(25,5,1996,1),
+			new Date(12,5,1996,1),
+			new Date(8,1,1417,1),
+			new Date(7,9,5756,1),
+			new Date(25,5,8,4),
+			new Date(25,5,85,1),
+			new Date(25,5,4329,1),
+			new Date(25,5,2539,1));
+		RowCheck(new Date(10,11,2038,1),
+			new Date(28,10,2038,1),
+			new Date(13,10,1460,1),
+			new Date(12,2,5799,1),
+			new Date(10,11,50,4),
+			new Date(10,11,127,1),
+			new Date(10,11,4371,1),
+			new Date(10,11,2581,1));
+		RowCheck(new Date(18,7,2094,1),
+			new Date(5,7,2094,1),
+			new Date(6,3,1518,1),
+			new Date(5,11,5854,1),
+			new Date(18,7,106,4),
+			new Date(18,7,183,1),
+			new Date(18,7,4427,1),
+			new Date(18,7,2637,1));
+	}
+
+	public void TestCalendarType() {
+		GregorianCalendar gc = new GregorianCalendar(
+			GregorianCalendarTypes.Arabic);
+		AssertEquals("A01 Gregorian ctor " +
+			"with GregorianCalendarTypes parameter",
+			GregorianCalendarTypes.Arabic,
+			gc.CalendarType);
+		gc.CalendarType = GregorianCalendarTypes.MiddleEastFrench;
+		AssertEquals("A02 GregorianCalendar.CalendarType",
+			GregorianCalendarTypes.MiddleEastFrench,
+			gc.CalendarType);
+	}
+
+	public void TestStandardEras() {
+		AssertEquals("B01 ADEra", 1, GregorianCalendar.ADEra);
+		AssertEquals("B02 HebrewEra", 1, HebrewCalendar.HebrewEra);
+		AssertEquals("B03 HjriEra", 1, HijriCalendar.HijriEra);
+		AssertEquals("B04 JulianEra", 1, JulianCalendar.JulianEra);
+		AssertEquals("B05 KoreanEra", 1, KoreanCalendar.KoreanEra);
+		AssertEquals("B06 ThaiBuddhistEra", 1,
+			ThaiBuddhistCalendar.ThaiBuddhistEra);
+	}
+
+	public void TestCurrentEra() {
+		AssertEquals("C01 GregorianCalendar.CurrentEra",
+			0, GregorianCalendar.CurrentEra);
+		AssertEquals("C02 HebrewCalendar.CurrentEra",
+			0, HebrewCalendar.CurrentEra);
+		AssertEquals("C03 HijriCalendar.CurrentEra",
+			0, HijriCalendar.CurrentEra);
+		AssertEquals("C04 JapaneseCalendar.CurrentEra",
+			0, JapaneseCalendar.CurrentEra);
+		AssertEquals("C05 JulianCalendar.CurrentEra",
+			0, JulianCalendar.CurrentEra);
+		AssertEquals("C06 KoreanCalendar.CurrentEra",
+			0, KoreanCalendar.CurrentEra);
+		AssertEquals("C07 TaiwanCalendar.CurrentEra",
+			0, TaiwanCalendar.CurrentEra);
+		AssertEquals("C08 ThaiBuddhistCalendar.CurrentEra",
+			0,
+			ThaiBuddhistCalendar.CurrentEra);
+	}
+
+	public void TestErasProperty() {
+		foreach (Calendar cal in acal) {
+			int check = 1;
+			if (cal is JapaneseCalendar)
+				check = 4;
+			AssertEquals(String.Format("D01 {0}.Eras.Length", cal),
+				check, cal.Eras.Length);
+			cal.Eras[0] = 29;
+			Assert(String.Format("D02 {0}.Eras readonly", cal),
+				cal.Eras[0] != 29);
+		}
+	}
+
+	public void TestTwoDigitYearMax() {
+		AssertEquals("E01 TwoDigitYearMax GregorianCalendar",
+			2029, gcal.TwoDigitYearMax);
+		AssertEquals("E02 TwoDigitYearMax HebrewCalendar",
+			5790, hecal.TwoDigitYearMax);
+		AssertEquals("E03 TwoDigitYearMax HijriCalendar",
+			1451, hical.TwoDigitYearMax);
+		AssertEquals("E04 TwoDigitYearMax JapaneseCalendar",
+			99, jacal.TwoDigitYearMax);
+		AssertEquals("E05 TwoDigitYearMax JulianCalendar",
+			2029, jucal.TwoDigitYearMax);
+		AssertEquals("E06 TwoDigitYearMax KoreanCalendar",
+			4362, kcal.TwoDigitYearMax);
+		AssertEquals("E07 TwoDigitYearMax TaiwanCalendar",
+			99, tacal.TwoDigitYearMax);
+		AssertEquals("E08 TwoDigitYearMax ThaiBuddhistCalendar",
+			2572, tbcal.TwoDigitYearMax);
+		foreach (Calendar cal in acal) {
+			bool exception = false;
+			try { 
+				cal.TwoDigitYearMax = 99;
+			}
+			catch (ArgumentOutOfRangeException) {
+				exception = true;
+			}
+			Assert(String.Format("E09 {0}.TwoDigitYearMax 99 " +
+					" out of range exception", cal),
+				exception);
+
+			exception = false;
+			int m = 10000;
+			try {
+				m = cal.GetYear(DateTime.MaxValue)+1;
+				cal.TwoDigitYearMax = m;
+			}
+			catch (ArgumentException) {
+				exception = true;
+			}
+			Assert(String.Format("E10 {0}.TwoDigitYearMax out " +
+					" of range exception value {1}",
+					cal, m),
+				exception);
+		}
+	}
+
+	/* UK TODO: breaks with current DateTime implementation.
+	 * I've a newer one that works, but that requires to much changes.
+	 * for now.
+	public void TestToFourDigitYear() {
+		foreach (Calendar cal in acal) {
+			bool working = true;
+			int mod = 2000;
+			if (cal is HebrewCalendar)
+				mod = 5500; 
+			if (cal is KoreanCalendar)
+				mod = 3000;
+			if (cal is JapaneseCalendar)
+				working = false;
+			if (cal is TaiwanCalendar)
+				working = false;
+			cal.TwoDigitYearMax = mod + 229;
+			AssertEquals(
+				String.Format("F01 {0}.TwoDigitYearMax", cal),
+					mod+229 , cal.TwoDigitYearMax);
+			AssertEquals(
+				String.Format("F02 {0}.ToFourDigitYear(29)",
+					cal),
+				working ? mod+229 : 29,
+				cal.ToFourDigitYear(29));
+			AssertEquals(
+				String.Format("F03 {0}.ToFourDigitYear(30)",
+					cal),
+				working ? mod+130 : 30,
+				cal.ToFourDigitYear(30));
+			AssertEquals(
+				String.Format("F04 {0}.ToFourDigitYear({1})",
+					cal, mod),
+				mod, cal.ToFourDigitYear(mod));
+			bool exception = false;
+			try {
+				cal.ToFourDigitYear(-1);
+			}
+			catch (ArgumentOutOfRangeException) {
+				exception = true;
+			}
+			Assert(String.Format(
+				"F05 {0}.ToFourDigitYear(-1) exception",
+				cal), exception);
+			exception = false;
+			try {
+				cal.ToFourDigitYear(15000);
+			}
+			catch (ArgumentOutOfRangeException) {
+				exception = true;
+			}
+			Assert(String.Format(
+				"F05 {0}.ToFourDigitYear(15000) exception",
+				cal), exception);
+		}
+	}
+	*/
+
+	// TODO: more tests :-)
+} // class CalendarTest
+	
+} // namespace MonoTests.System.Globalization
diff --git a/mcs/class/corlib/Test/System.IO/AllTests.cs b/mcs/class/corlib/Test/System.IO/AllTests.cs
new file mode 100644
index 00000000000..54e40afbb03
--- /dev/null
+++ b/mcs/class/corlib/Test/System.IO/AllTests.cs
@@ -0,0 +1,36 @@
+// Testsuite.System.AllSystemTests.cs
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System.IO {
+        /// <summary>
+        ///   Combines all available unit tests into one test suite.
+        /// </summary>
+        public class AllTests : TestCase {
+                public AllTests(string name) : base(name) {}
+                
+                public static ITest Suite 
+                { 
+                        get 
+                        {
+                                TestSuite suite =  new TestSuite ();
+                                suite.AddTest (BinaryReaderTest.Suite);
+                                suite.AddTest (FileTest.Suite);
+                                suite.AddTest (MemoryStreamTest.Suite);
+                                suite.AddTest (PathTest.Suite);
+                                suite.AddTest (StreamReaderTest.Suite);
+                                suite.AddTest (StreamWriterTest.Suite);
+                                suite.AddTest (StringReaderTest.Suite);
+                                suite.AddTest (StringWriterTest.Suite);
+                                return suite;
+                        }
+                }
+        }
+}
+
diff --git a/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs b/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs
new file mode 100644
index 00000000000..f0357b7da30
--- /dev/null
+++ b/mcs/class/corlib/Test/System.IO/BinaryReaderTest.cs
@@ -0,0 +1,249 @@
+// BinaryReaderTest.cs - NUnit Test Cases for the SystemIO.BinaryReader class
+//
+// Eduardo Garcia Cebollero (kiwnix@yahoo.es)
+//
+// (C) Eduardo Garcia Cebollero.
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+using NUnit.Framework;
+using System;
+using System.IO;
+using System.Text;
+
+namespace MonoTests.System.IO
+{
+	public class BinaryReaderTest : TestCase
+	{
+		public BinaryReaderTest () : 
+			base ("MonoTests.System.IO.BinaryReaderTest testsuite") {}
+
+		public BinaryReaderTest (string name) : base (name) {}
+			
+		protected override void SetUp () { }
+		
+		public static ITest Suite
+		{
+			get { 
+				return new TestSuite (typeof (BinaryReaderTest)); 
+			}
+		}
+		
+		private string _codeFileName = "resources" + Path.DirectorySeparatorChar + "AFile.txt";
+			
+		public void TestCtor1() 
+		{
+			{
+				bool errorThrown = false;
+				try {
+					BinaryReader r = new BinaryReader ((Stream) null);
+				} catch (ArgumentNullException) {
+					errorThrown = true;
+				}
+				Assert ("#01 null string error not thrown", errorThrown);
+			}
+			{
+				bool errorThrown = false;
+				FileStream f = new FileStream (_codeFileName, FileMode.Open, FileAccess.Write);
+				try {
+					BinaryReader r = new BinaryReader (f);
+					r.Close ();
+				} catch  (ArgumentException) {
+					errorThrown = true;
+				}
+				f.Close ();
+				Assert ("#02 no read error not thrown", errorThrown);
+			}
+			{
+				FileStream f = new FileStream (_codeFileName, 
+								FileMode.Open, 
+								FileAccess.Read);
+				BinaryReader r = new BinaryReader (f);
+				AssertNotNull ("#03 no binary reader created", r);
+				r.Close ();
+				f.Close ();
+			}
+				
+		}
+
+		public void TestCtor2 () 
+		{
+			{
+				bool errorThrown = false;
+				try {
+					BinaryReader r = new BinaryReader ((Stream) null, Encoding.ASCII);
+				} catch (ArgumentNullException) {
+					errorThrown = true;
+				} catch (Exception e) {
+					Fail ("#04 Incorrect exception thrown: " + e.ToString ());
+				}
+				Assert ("#05 null stream error not thrown", errorThrown);
+			}
+			{
+				bool errorThrown = false;
+				try {
+					BinaryReader r = new BinaryReader ((Stream) null, Encoding.Unicode);
+				} catch (ArgumentNullException) {
+					errorThrown = true;
+				} catch (Exception e) {
+					Fail ("#06 Incorrect exception thrown: " + e.ToString ());
+				}
+				Assert("#07 null stream error not thrown", errorThrown);
+			}
+			{
+				bool errorThrown = false;
+				try {
+					BinaryReader r = new BinaryReader ((Stream) null, Encoding.UTF7);
+				} catch (ArgumentNullException) {
+					errorThrown = true;
+				} catch (Exception e) {
+					Fail ("#08 Incorrect exception thrown: " + e.ToString ());
+				}
+				Assert ("#09 null stream error not thrown", errorThrown);
+			}
+			{
+				bool errorThrown = false;
+				try {
+					BinaryReader r = new BinaryReader ((Stream) null, Encoding.UTF8);
+				} catch (ArgumentNullException) {
+					errorThrown = true;
+				} catch (Exception e) {
+					Fail ("#0A Incorrect exception thrown: " + e.ToString ());
+				}
+				Assert ("#0B null stream error not thrown", errorThrown);
+			}
+		}
+
+		public void TestCtor3 ()
+		{
+			bool errorThrown = false;
+			byte [] b = new byte [30];
+			MemoryStream m = new MemoryStream (b);
+			try {
+				BinaryReader r = new BinaryReader (m, (Encoding) null);
+			} catch (ArgumentNullException) {
+				errorThrown = true;
+			} catch(Exception e) {
+				Fail ("#0C Incorrect Exception thrown: " + e.ToString ());
+			}
+			Assert ("#0D No exception trown: ", errorThrown);
+		}
+
+		//TODO: (TestCtor*) Verify the Use of a wrong Stream
+		//TODO: (TestClose*) Verify the Close Method
+		public void TestClose1 ()
+		{
+			{
+				byte [] b = new byte [30];
+				MemoryStream m = new MemoryStream (b);
+				try {
+					BinaryReader r = new BinaryReader (m);
+					r.Close ();
+				} catch (Exception e) {
+					Fail ("#0E Unhandled Exception: "+ e.ToString ());
+				}
+			}
+			{
+				//TODO Know what is the exact result of closing 2 times a Stream.
+				bool errorThrown = false;
+				byte [] b = new byte [30];
+				MemoryStream m = new MemoryStream (b);
+				try {
+					BinaryReader r = new BinaryReader (m);
+					r.Close ();
+					r.Close ();
+				} catch (IOException) {
+					errorThrown = true;
+				} catch (Exception) {
+					Fail ("#0F-1 Unexpected Exception Thrown");
+				}
+				Assert ("#0F No Exception Trown", errorThrown);
+			}
+		}
+
+		//TODO: (TestRead*) Verify Read Method
+		public void TestReadBoolean ()
+		{
+			bool [] a = {true, true, false};
+			byte [] arr_a = new byte [3];
+			int i = 0;
+			foreach (bool a1 in a) {
+				  arr_a [i] = Convert.ToByte (a1);
+				  i++;
+			}
+				  
+			bool b;
+			MemoryStream m = new MemoryStream (arr_a);
+			try {	
+				BinaryReader r = new BinaryReader (m);
+				b = r.ReadBoolean ();
+				AssertEquals ("#11 No well readed boolean: ", a [0], b);
+			} catch (Exception e) {
+				Fail ("#12 Unexpected exception thrown: " + e.ToString ());
+			}
+		}
+
+		public void TestReadByte ()
+		{
+			byte [] a = {0, 2, 3, 1, 5, 2};
+			byte b;
+			MemoryStream m = new MemoryStream (a);
+			try {
+				BinaryReader r = new BinaryReader (m);
+				b = r.ReadByte ();
+				AssertEquals ("#13 No well readed byte: ", a [0], b);
+			} catch (Exception e) {
+				Fail ("#14 Unexpected Exception thrown: " + e.ToString ());
+			}
+		}
+
+		public void TestReadChar()
+		{
+			char [] a = {'a','b','c','d','e'};
+			byte [] arr_a = new byte [5];
+			int i = 0;
+			char c;
+
+			foreach (char a1 in a) {
+			   arr_a [i] = Convert.ToByte (a1);
+			   i++;
+			}
+
+			MemoryStream m = new MemoryStream (arr_a);
+			BinaryReader r = new BinaryReader (m);
+			try {
+				c = r.ReadChar ();
+				AssertEquals ("#15 No well readed Char", a [0], c);
+			} catch (Exception e)  {
+				Fail ("#16 Unexpeted Exception: " + e.ToString ());
+			}
+		}
+
+		//-TODO: (TestRead[Type]*) Verify the ReadBoolean, ReadByte ....
+		// ReadBoolean, ReadByte, ReadChar Done
+		
+		//TODO: (TestFillBuffer*) Verify the FillBuffer Method
+		public void TestPeekChar ()
+		{
+			char char1, char2;
+			char [] b = {'A', 'B', 'C'};
+			byte [] arr_b = new byte [3];
+			int i = 0;
+
+			foreach (char b1 in b) {
+				arr_b [i] = Convert.ToByte (b1);
+				i++;
+			}
+				  
+			MemoryStream m = new MemoryStream (arr_b);
+			BinaryReader r = new BinaryReader (m);
+			try {	
+				char1 = (char) r.PeekChar ();
+				char2 = (char) r.PeekChar ();
+				AssertEquals ("#13 the stream pointer have been altered in peek", char1, char2);
+			} catch (Exception e) {
+				Fail ("#14 Unexpected exception thrown: " + e.ToString ());
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/Test/System.IO/ChangeLog b/mcs/class/corlib/Test/System.IO/ChangeLog
new file mode 100644
index 00000000000..060d16badde
--- /dev/null
+++ b/mcs/class/corlib/Test/System.IO/ChangeLog
@@ -0,0 +1,100 @@
+2002-08-17  Eduardo Garcia Cebollero <kiwnix@yahoo.es>
+
+	* AllTests.cs: added BinaryReaderTest.Suite.
+	* BinaryReaderTest.cs: New file.
+
+2002-06-12  Nick Drochak  <ndrochak@gol.com>
+
+	* StringReaderTest.cs: Regression test for a bug that we had were
+	ReadLine() was not returning null when the string ended with newline.
+
+2002-05-15  Nick Drochak  <ndrochak@gol.com>
+
+	* StreamReaderTest.cs: 
+	* StreamWriterTest.cs: 
+	Make sure invalid file name has invalid characters in it.  These are 
+	platform dependant.
+
+2002-05-14  Nick Drochak  <ndrochak@gol.com>
+
+	* FileTest.cs: Delete temporary files after each test method; Catch
+	unexpected exceptions and report them; Make some Assert messages
+	unique; Make sure temp files exist before trying Move and Delete, etc.
+
+2002-05-13  Mike Gray <mike@mikegray.org>
+
+	* FileTest.cs: Adding better tests for File.Delete, File.Move
+
+2002-05-12  Mike Gray <mike@mikegray.org>
+
+	* FileTest.cs: Adding better tests for File.Exists, File.Create,
+	and File.Copy
+
+2002-05-12  Nick Drochak  <ndrochak@gol.com>
+
+	* StringTest.cs: Add a couple more tests.
+	* PathTest.cs: Make tests work a bit better on W32 and Linux.
+
+2002/05/10  Nick Drochak <ndrochak@gol.com>
+
+	* StreamWriterTest.cs: Use "resources" directory and use OS friendly
+	directory separator characters.  This makes the tests run correctly
+	against MS.NET, but not yet in mono on Linux.
+
+2002/05/08  Nick Drochak <ndrochak@gol.com>
+
+	* FileTest.cs: Use "resources" directory and use OS friendly
+	directory separator characters.  This makes the tests run correctly
+	against MS.NET, but not yet in mono on Linux.
+
+2002-05-08  Nick Drochak  <ndrochak@gol.com>
+
+	* StreamWriter.cs: Wrap a try-catch around block of code to find out
+	what exception is being thrown when it shouldn't.
+
+2002-05-07  Nick Drochak  <ndrochak@gol.com>
+
+	* FileTest.cs: Added TestOpen() from Mike Gray.
+	* AllTests.cs: Added missing FileTest.Suite as pointed out by Mike 
+	as well.
+
+2002-05-05  Nick Drochak  <ndrochak@gol.com>
+
+	* StreamReaderTest.cs: Change location of sample file. In some places,
+	use memory stream instead of file stream to eliminate reliance on file 
+	io for now.  That area is still a bit immature. Added a bunch of 
+	markers to tell where errors were occuring.
+
+	* resources: New directory to hold files open/read, etc. by unit
+	tests.
+
+2002-05-01  Nick Drochak  <ndrochak@gol.com>
+
+	* StreamReaderTest.cs:
+	* StreamWriterTest.cs: Catch and display exception info where it wasn't
+	being caught before.
+
+2002-03-02  Jason Diamond  <jason@injektilo.org>
+
+	* StringReader.cs: Added test for peeking and reading at the end of
+	a string.
+
+2002-02-28  Nick Drochak  <ndrochak@gol.com>
+
+	* MemoryStreamTest.cs 
+	* StreamWriterTest.cs 
+	* StringReaderTest.cs: Fix test bugs found by running against mscorlib.
+	AssertEquals() requires the expected and atual values to be the same
+	type if they are to be considered equal.
+
+2002-02-05  Duncan Mak  <duncan@ximian.com>
+
+	* FileTest.cs: Added to CVS. However, this portion of the code
+	can't be tested right now.
+
+2002-01-20 Nick Drochak  <ndrochak@gol.com>
+
+	* AllTests.cs: removed duplicate MemoryStream test
+	* MemoryStreamTest.cs: wrapped try-catch blocks around read/write/seek
+	tests. These were throwing exceptions that NUnit wasn't catching.  I 
+	don't think it used to behave this way before .NET.1.0.
diff --git a/mcs/class/corlib/Test/System.IO/FileTest.cs b/mcs/class/corlib/Test/System.IO/FileTest.cs
new file mode 100644
index 00000000000..210e7f6eb85
--- /dev/null
+++ b/mcs/class/corlib/Test/System.IO/FileTest.cs
@@ -0,0 +1,441 @@
+//
+// FileTest.cs: Test cases for System.IO.File
+//
+// Author: Duncan Mak (duncan@ximian.com)
+//
+// (C) 2002 Ximian, Inc. http://www.ximian.com
+//
+
+using NUnit.Framework;
+using System;
+using System.IO;
+
+namespace MonoTests.System.IO
+{
+	public class FileTest : TestCase
+	{
+		public FileTest ()
+			: base ("System.IO.File testsuite")
+		{
+		}
+
+		public FileTest (string name)
+			: base (name)
+		{
+		}
+
+		protected override void SetUp ()
+		{
+		}
+
+		protected override void TearDown ()
+		{
+		        File.Delete ("resources" + Path.DirectorySeparatorChar + "baz");
+		        File.Delete ("resources" + Path.DirectorySeparatorChar + "bar");
+		        File.Delete ("resources" + Path.DirectorySeparatorChar + "foo");
+		}
+
+		public static ITest Suite
+		{
+			get { return new TestSuite (typeof (FileTest)); }
+		}
+
+		public void TestExists ()
+		{
+			int i = 0;
+			try {
+				Assert ("null filename should not exist", !File.Exists (null));
+				i++;
+				Assert ("empty filename should not exist", !File.Exists (""));
+				i++;
+				Assert ("whitespace filename should not exist", !File.Exists ("  \t\t  \t \n\t\n \n"));
+				i++;
+				Assert ("File resources" + Path.DirectorySeparatorChar + "AFile.txt should exist", File.Exists ("resources" + Path.DirectorySeparatorChar + "AFile.txt"));
+				i++;
+				Assert ("File resources" + Path.DirectorySeparatorChar + "doesnotexist should not exist", !File.Exists ("resources" + Path.DirectorySeparatorChar + "doesnotexist"));
+			} catch (Exception e) {
+				Fail ("Unexpected exception at i = " + i + ". e=" + e);
+			}
+		}
+
+		public void TestCreate ()
+		{
+			FileStream stream;
+
+			/* exception test: File.Create(null) */
+			try {
+				stream = File.Create (null);
+				Fail ("File.Create(null) should throw ArgumentNullException");
+			} catch (ArgumentNullException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Create(null) unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Create("") */
+			try {
+				stream = File.Create ("");
+				Fail ("File.Create('') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Create('') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Create(" ") */
+			try {
+				stream = File.Create (" ");
+				Fail ("File.Create(' ') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Create(' ') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Create(directory_not_found) */
+			try {
+				stream = File.Create ("directory_does_not_exist" + Path.DirectorySeparatorChar + "foo");
+				Fail ("File.Create(directory_does_not_exist) should throw DirectoryNotFoundException");
+			} catch (DirectoryNotFoundException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Create(directory_does_not_exist) unexpected exception caught: e=" + e.ToString());
+			}
+
+
+			/* positive test: create resources/foo */
+			try {
+				stream = File.Create ("resources" + Path.DirectorySeparatorChar + "foo");
+				Assert ("File should exist", File.Exists ("resources" + Path.DirectorySeparatorChar + "foo"));
+				stream.Close ();
+			} catch (Exception e) {
+				Fail ("File.Create(resources/foo) unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* positive test: repeat test above again to test for overwriting file */
+			try {
+				stream = File.Create ("resources" + Path.DirectorySeparatorChar + "foo");
+				Assert ("File should exist", File.Exists ("resources" + Path.DirectorySeparatorChar + "foo"));
+				stream.Close ();
+			} catch (Exception e) {
+				Fail ("File.Create(resources/foo) unexpected exception caught: e=" + e.ToString());
+			}
+		}
+
+		public void TestCopy ()
+		{
+			/* exception test: File.Copy(null, b) */
+			try {
+				File.Copy (null, "b");
+				Fail ("File.Copy(null, 'b') should throw ArgumentNullException");
+			} catch (ArgumentNullException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Copy(null, 'b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Copy(a, null) */
+			try {
+				File.Copy ("a", null);
+				Fail ("File.Copy('a', null) should throw ArgumentNullException");
+			} catch (ArgumentNullException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Copy('a', null) unexpected exception caught: e=" + e.ToString());
+			}
+
+
+			/* exception test: File.Copy("", b) */
+			try {
+				File.Copy ("", "b");
+				Fail ("File.Copy('', 'b') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Copy('', 'b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Copy(a, "") */
+			try {
+				File.Copy ("a", "");
+				Fail ("File.Copy('a', '') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Copy('a', '') unexpected exception caught: e=" + e.ToString());
+			}
+
+
+			/* exception test: File.Copy(" ", b) */
+			try {
+				File.Copy (" ", "b");
+				Fail ("File.Copy(' ', 'b') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Copy(' ', 'b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Copy(a, " ") */
+			try {
+				File.Copy ("a", " ");
+				Fail ("File.Copy('a', ' ') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Copy('a', ' ') unexpected exception caught: e=" + e.ToString());
+			}
+
+
+			/* exception test: File.Copy(doesnotexist, b) */
+			try {
+				File.Copy ("doesnotexist", "b");
+				Fail ("File.Copy('doesnotexist', 'b') should throw FileNotFoundException");
+			} catch (FileNotFoundException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Copy('doesnotexist', 'b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* positive test: copy resources/AFile.txt to resources/bar */
+			try {
+				File.Delete ("resources" + Path.DirectorySeparatorChar + "bar");
+				File.Copy ("resources" + Path.DirectorySeparatorChar + "AFile.txt", "resources" + Path.DirectorySeparatorChar + "bar");
+				Assert ("File AFile.txt should still exist", File.Exists ("resources" + Path.DirectorySeparatorChar + "AFile.txt"));
+				Assert ("File bar should exist after File.Copy", File.Exists ("resources" + Path.DirectorySeparatorChar + "bar"));
+			} catch (Exception e) {
+				Fail ("#1 File.Copy('resources/AFile.txt', 'resources/bar') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Copy(resources/AFile.txt, resources/bar) (default is overwrite == false) */
+			try {
+				File.Copy ("resources" + Path.DirectorySeparatorChar + "AFile.txt", "resources" + Path.DirectorySeparatorChar + "bar");
+				Fail ("File.Copy('resources/AFile.txt', 'resources/bar') should throw IOException");
+			} catch (IOException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("#2 File.Copy('resources/AFile.txt', 'resources/bar') unexpected exception caught: e=" + e.ToString());
+			}
+
+
+			/* positive test: copy resources/AFile.txt to resources/bar, overwrite */
+			try {
+				Assert ("File bar should exist before File.Copy", File.Exists ("resources" + Path.DirectorySeparatorChar + "bar"));
+				File.Copy ("resources" + Path.DirectorySeparatorChar + "AFile.txt", "resources" + Path.DirectorySeparatorChar + "bar", true);
+				Assert ("File AFile.txt should still exist", File.Exists ("resources" + Path.DirectorySeparatorChar + "AFile.txt"));
+				Assert ("File bar should exist after File.Copy", File.Exists ("resources" + Path.DirectorySeparatorChar + "bar"));
+			} catch (Exception e) {
+				Fail ("File.Copy('resources/AFile.txt', 'resources/bar', true) unexpected exception caught: e=" + e.ToString());
+			}
+
+
+		}
+		
+		public void TestDelete ()
+		{
+
+			/* exception test: File.Delete(null) */
+			try {
+				File.Delete (null);
+				Fail ("File.Delete(null) should throw ArgumentNullException");
+			} catch (ArgumentNullException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Delete(null) unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Delete("") */
+			try {
+				File.Delete ("");
+				Fail ("File.Delete('') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Delete('') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Delete(" ") */
+			try {
+				File.Delete (" ");
+				Fail ("File.Delete(' ') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Delete(' ') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Delete(directory_not_found) */
+			try {
+				File.Delete ("directory_does_not_exist" + Path.DirectorySeparatorChar + "foo");
+				Fail ("File.Delete(directory_does_not_exist) should throw DirectoryNotFoundException");
+			} catch (DirectoryNotFoundException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Delete(directory_does_not_exist) unexpected exception caught: e=" + e.ToString());
+			}
+
+			if (!File.Exists ("resources" + Path.DirectorySeparatorChar + "foo")) {
+				FileStream f = File.Create("resources" + Path.DirectorySeparatorChar + "foo");
+				f.Close();
+			}
+
+                        Assert ("File resources" + Path.DirectorySeparatorChar + "foo should exist for TestDelete to succeed", File.Exists ("resources" + Path.DirectorySeparatorChar + "foo"));
+                        try {
+                                File.Delete ("resources" + Path.DirectorySeparatorChar + "foo");
+                        } catch (Exception e) {
+                                Fail ("Unable to delete resources" + Path.DirectorySeparatorChar + "foo: e=" + e.ToString());
+                        }
+			Assert ("File resources" + Path.DirectorySeparatorChar + "foo should not exist after File.Delete", !File.Exists ("resources" + Path.DirectorySeparatorChar + "foo"));
+		}
+
+
+		public void TestMove ()
+		{
+			/* exception test: File.Move(null, b) */
+			try {
+				File.Move (null, "b");
+				Fail ("File.Move(null, 'b') should throw ArgumentNullException");
+			} catch (ArgumentNullException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Move(null, 'b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Move(a, null) */
+			try {
+				File.Move ("a", null);
+				Fail ("File.Move('a', null) should throw ArgumentNullException");
+			} catch (ArgumentNullException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Move('a', null) unexpected exception caught: e=" + e.ToString());
+			}
+
+
+			/* exception test: File.Move("", b) */
+			try {
+				File.Move ("", "b");
+				Fail ("File.Move('', 'b') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Move('', 'b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Move(a, "") */
+			try {
+				File.Move ("a", "");
+				Fail ("File.Move('a', '') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Move('a', '') unexpected exception caught: e=" + e.ToString());
+			}
+
+
+			/* exception test: File.Move(" ", b) */
+			try {
+				File.Move (" ", "b");
+				Fail ("File.Move(' ', 'b') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Move(' ', 'b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Move(a, " ") */
+			try {
+				File.Move ("a", " ");
+				Fail ("File.Move('a', ' ') should throw ArgumentException");
+			} catch (ArgumentException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Move('a', ' ') unexpected exception caught: e=" + e.ToString());
+			}
+
+
+			/* exception test: File.Move(doesnotexist, b) */
+			try {
+				File.Move ("doesnotexist", "b");
+				Fail ("File.Move('doesnotexist', 'b') should throw FileNotFoundException");
+			} catch (FileNotFoundException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Move('doesnotexist', 'b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Move(resources/foo, doesnotexist/b) */
+			File.Copy("resources" + Path.DirectorySeparatorChar + "AFile.txt", "resources" + Path.DirectorySeparatorChar + "foo", true);
+			try {
+				File.Move ("resources" + Path.DirectorySeparatorChar + "foo", "doesnotexist" + Path.DirectorySeparatorChar + "b");
+				Fail ("File.Move('resources/foo', 'b') should throw DirectoryNotFoundException");
+			} catch (DirectoryNotFoundException) {
+				// do nothing, this is what we expect
+			} catch (FileNotFoundException) {
+				// LAMESPEC
+				// do nothing, this is (kind of) what we expect
+			} catch (Exception e) {
+				Fail ("File.Move('resources/foo', 'doesnotexist/b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Move(doesnotexist/foo, b) */
+			try {
+				File.Move ("doesnotexist" + Path.DirectorySeparatorChar + "foo", "b");
+				Fail ("File.Move('doesnotexist/foo', 'b') should throw DirectoryNotFoundException");
+			} catch (DirectoryNotFoundException) {
+				// do nothing, this is what we expect
+			} catch (FileNotFoundException) {
+				// LAMESPEC
+				// do nothing, this is (kind of) what we expect
+			} catch (Exception e) {
+				Fail ("File.Move('doesnotexist/foo', 'b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* exception test: File.Move(resources/foo, resources) */
+			try {
+				File.Move ("resources" + Path.DirectorySeparatorChar + "foo", "resources");
+				Fail ("File.Move('resources/foo', 'resources') should throw IOException");
+			} catch (IOException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("File.Move('resources/foo', 'resources') unexpected exception caught: e=" + e.ToString());
+			}
+
+			/* positive test: File.Move(a, a) shouldn't throw exception */
+			try {
+				File.Move ("resources" + Path.DirectorySeparatorChar + "foo", "resources" + Path.DirectorySeparatorChar + "foo");
+			} catch (Exception e) {
+				Fail ("File.Move('doesnotexist/foo', 'b') unexpected exception caught: e=" + e.ToString());
+			}
+
+			if (!File.Exists ("resources" + Path.DirectorySeparatorChar + "bar")) {
+				FileStream f = File.Create("resources" + Path.DirectorySeparatorChar + "bar");
+				f.Close();
+			}
+			
+			Assert ("File resources" + Path.DirectorySeparatorChar + "bar should exist", File.Exists ("resources" + Path.DirectorySeparatorChar + "bar"));
+			File.Move ("resources" + Path.DirectorySeparatorChar + "bar", "resources" + Path.DirectorySeparatorChar + "baz");
+			Assert ("File resources" + Path.DirectorySeparatorChar + "bar should not exist", !File.Exists ("resources" + Path.DirectorySeparatorChar + "bar"));
+			Assert ("File resources" + Path.DirectorySeparatorChar + "baz should exist", File.Exists ("resources" + Path.DirectorySeparatorChar + "baz"));
+		}
+
+		public void TestOpen ()
+		{
+                        try {
+                                FileStream stream = File.Open ("resources" + Path.DirectorySeparatorChar + "AFile.txt", FileMode.Open);
+                        } catch (Exception e) {
+                                Fail ("Unable to open resources" + Path.DirectorySeparatorChar + "AFile.txt: e=" + e.ToString());
+                        }
+
+                        /* Exception tests */
+			try {
+				FileStream stream = File.Open ("filedoesnotexist", FileMode.Open);
+				Fail ("File 'filedoesnotexist' should not exist");
+			} catch (FileNotFoundException) {
+				// do nothing, this is what we expect
+			} catch (Exception e) {
+				Fail ("Unexpect exception caught: e=" + e.ToString());
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/Test/System.IO/MemoryStreamTest.cs b/mcs/class/corlib/Test/System.IO/MemoryStreamTest.cs
new file mode 100644
index 00000000000..c9ff831877d
--- /dev/null
+++ b/mcs/class/corlib/Test/System.IO/MemoryStreamTest.cs
@@ -0,0 +1,154 @@
+//

+// System.IO.StringWriter

+//

+// Author: Marcin Szczepanski (marcins@zipworld.com.au)

+//

+// TODO: Add some testing for exceptions

+//

+// TODO: Add some testing for the CanXXX properties, exceptions,

+// various different constructors.

+//

+

+using NUnit.Framework;

+using System.IO;

+using System;

+using System.Text;

+

+namespace MonoTests.System.IO

+{

+

+public class MemoryStreamTest : TestCase {

+	

+        private MemoryStream testStream;

+        private byte[] testStreamData;

+        

+	public MemoryStreamTest() : base ("MonoTests.System.IO.MemoryStream testcase") { }

+	public MemoryStreamTest( string name ): base(name) { }

+

+	public static ITest Suite {

+		get {

+			return new TestSuite(typeof(MemoryStreamTest));

+		}

+	}

+

+	protected override void SetUp() {

+                testStreamData = new byte[100];

+

+                for( int i = 0; i < 100; i++ ) {

+                        testStreamData[i] = (byte)(100 - i);

+                }

+

+                testStream = new MemoryStream( testStreamData );

+        }

+

+        // 

+        // Verify that the first count bytes in testBytes are the same as

+        // the count bytes from index start in testStreamData

+        //

+        private void VerifyTestData( byte[] testBytes, int start, int count) {

+                if( testBytes == null ) {

+                        throw new ArgumentNullException();

+                } else if( ( start < 0 || count < 0 ) || start + count > testStreamData.Length || start > testStreamData.Length ) {

+                        throw new ArgumentOutOfRangeException();

+                }

+

+                for( int test = 0; test < count; test++ ) {

+                        if( testBytes[ test ] != testStreamData[ start + test ] ) {

+                                string failStr = String.Format( "testByte {0} (testStream {1}) was <{2}>, expecting <{3}>", test, start+test, 

+                                        testBytes[ test ], testStreamData[ start+test] );

+                                Fail( failStr );

+                        }

+                }

+        }

+

+	public void TestConstructors() {

+                MemoryStream ms = new MemoryStream();

+

+                AssertEquals("A1", 0L, ms.Length );

+                AssertEquals("A2", 0, ms.Capacity );

+                AssertEquals("A3", true, ms.CanWrite );

+                

+                ms = new MemoryStream( 10 );

+

+                AssertEquals("A4", 0L, ms.Length );

+                AssertEquals("A5", 10, ms.Capacity );

+        }

+

+        public void TestRead() {

+                byte[] readBytes = new byte[20];

+

+		try {

+			/* Test simple read */

+			testStream.Read( readBytes, 0, 10 );

+			VerifyTestData( readBytes, 0, 10 );

+

+			/* Seek back to beginning */

+

+			testStream.Seek( 0, SeekOrigin.Begin );

+ 

+			/* Read again, bit more this time */

+			testStream.Read( readBytes, 0, 20 );

+			VerifyTestData( readBytes, 0, 20 );

+

+			/* Seek to 20 bytes from End */

+			testStream.Seek( -20, SeekOrigin.End );

+			testStream.Read( readBytes, 0, 20);

+			VerifyTestData( readBytes, 80, 20);

+

+			int readByte = testStream.ReadByte();

+			AssertEquals( -1, readByte );

+		}

+		catch(Exception e){

+			Fail("Threw an unexpected exception:"+e.ToString());

+			return;

+		}

+        }

+

+        public void TestWriteBytes() {

+                byte[] readBytes = new byte[100];

+

+		try {

+			MemoryStream ms = new MemoryStream( 100 );

+

+			for( int i = 0; i < 100; i++ ) {

+				ms.WriteByte( testStreamData[i] );

+			}

+

+			ms.Seek( 0, SeekOrigin.Begin); 

+			

+			testStream.Read( readBytes, 0, 100 );

+

+			VerifyTestData( readBytes, 0, 100 );

+		}

+		catch(Exception e){

+			Fail("Threw an unexpected exception:"+e.ToString());

+			return;

+		}

+        }               

+

+        public void TestWriteBlock() {

+                byte[] readBytes = new byte[100];

+

+		try {

+			MemoryStream ms = new MemoryStream( 100 );

+

+			ms.Write( testStreamData, 0, 100 );

+

+			ms.Seek( 0, SeekOrigin.Begin); 

+			

+			testStream.Read( readBytes, 0, 100 );

+

+			VerifyTestData( readBytes, 0, 100 );

+

+			byte[] arrayBytes = testStream.ToArray();

+

+			VerifyTestData( arrayBytes, 0, 100 );

+		}

+		catch(Exception e){

+			Fail("Threw an unexpected exception:"+e.ToString());

+			return;

+		}

+        }

+}

+

+}

diff --git a/mcs/class/corlib/Test/System.IO/PathTest.cs b/mcs/class/corlib/Test/System.IO/PathTest.cs
new file mode 100644
index 00000000000..2fd2c6da186
--- /dev/null
+++ b/mcs/class/corlib/Test/System.IO/PathTest.cs
@@ -0,0 +1,144 @@
+//

+// System.IO.Path Test Cases

+//

+// Author: Marcin Szczepanski (marcins@zipworld.com.au)

+//

+// TODO: Add a more thorough workout for some

+// of the "trickier" functions.

+

+using NUnit.Framework;

+using System.IO;

+using System;

+using System.Text;

+

+namespace MonoTests.System.IO

+{

+

+public class PathTest : TestCase {

+

+        string path1;

+	string path2;

+        string path3;

+     

+	public static ITest Suite {

+		get {

+			return new TestSuite(typeof(PathTest));

+		}

+	}

+

+	public PathTest() : base ("MonoTests.System.IO.PathTest testcase") { }

+	public PathTest( string name ): base(name) { }

+

+        protected override void SetUp() {

+		if ('/' == Path.VolumeSeparatorChar){

+			path1 = "/foo/test.txt";

+			path2 = "/etc";

+			path3 = "init.d";

+		} else {

+			path1 = "c:\\foo\\test.txt";

+			path2 = "c:\\winnt";

+			path3 = "system32";

+		}

+

+		// For Mac.  Figure this out when we need it

+		//path1 = "foo:test.txt";

+		//path2 = "foo";

+		//path3 = "bar";

+        }

+

+

+        public void TestChangeExtension() {

+                string testPath = Path.ChangeExtension( path1, "doc" );

+

+                #if WINDOWS

+                AssertEquals( "c:\\foo\\test.doc", testPath );

+                #elif UNIX

+                AssertEquals( "/foo/test.doc", testPath );

+                #elif MAC

+                AssertEquals( "foo:test.doc", testPath );

+                #endif

+        }

+

+        public void TestCombine() {

+                string testPath = Path.Combine( path2, path3 );

+

+                #if WINDOWS

+                AssertEquals( "c:\\winnt\\system32", testPath );

+                #elif UNIX

+                AssertEquals( "/etc/init.d", testPath );

+                #elif MAC

+                AssertEquals( "foo:bar", testPath );

+                #endif

+        }

+

+        public void TestDirectoryName() {

+                string testDirName = Path.GetDirectoryName( path1 );

+

+                #if WINDOWS

+                AssertEquals( "c:\\foo", testDirName );

+                #elif UNIX

+                AssertEquals( "/etc", testDirName );

+                #elif MAC

+                AssertEquals( "foo", testDirName );

+                #endif

+        }

+

+        public void TestGetExtension() {

+                string testExtn = Path.GetExtension( path1 );

+

+                AssertEquals( ".txt", testExtn );

+

+                testExtn = Path.GetExtension( path2 );

+

+                AssertEquals ( "", testExtn );

+        }

+

+        public void TestGetFileName() {

+                string testFileName = Path.GetFileName( path1 );

+

+                AssertEquals( "test.txt", testFileName );

+        }

+

+        public void TestGetFileNameWithoutExtension() {

+                string testFileName = Path.GetFileNameWithoutExtension( path1 );

+

+                AssertEquals( "test", testFileName );

+        }

+

+        public void TestGetFullPath() {

+                string testFullPath = Path.GetFullPath( "foo.txt" );

+         //       AssertEquals( "foo.txt", testFullPath );

+        }

+        

+        public void TestGetTempPath() {

+                string getTempPath = Path.GetTempPath();

+                Assert ("Temp Path should not be empty",  getTempPath != String.Empty);

+        }

+

+        public void TestGetTempFileName() {

+		string getTempFileName = "";

+		try {

+			getTempFileName = Path.GetTempFileName();

+			Assert ("Temp file name should not be empty", getTempFileName != String.Empty);

+			Assert ("File should exist", File.Exists(getTempFileName));

+		} finally {

+			if (getTempFileName != null && getTempFileName != String.Empty){

+				File.Delete(getTempFileName);

+			}

+		}

+        }

+

+        public void TestHasExtension() {

+                AssertEquals( true, Path.HasExtension( "foo.txt" ) );

+                AssertEquals( false, Path.HasExtension( "foo" ) );

+                AssertEquals( true, Path.HasExtension( path1 ) );

+                AssertEquals( false, Path.HasExtension( path2 ) );

+        }

+

+        public void TestRooted() {

+                Assert ("Path should be rooted", Path.IsPathRooted(path2));

+                Assert ("Path should NOT be rooted", !Path.IsPathRooted(path3));

+        }

+}

+

+}

diff --git a/mcs/class/corlib/Test/System.IO/StreamReaderTest.cs b/mcs/class/corlib/Test/System.IO/StreamReaderTest.cs
new file mode 100644
index 00000000000..5a07d426ccc
--- /dev/null
+++ b/mcs/class/corlib/Test/System.IO/StreamReaderTest.cs
@@ -0,0 +1,558 @@
+// StreamReaderTest.cs - NUnit Test Cases for the SystemIO.StreamReader class

+//

+// David Brandt (bucky@keystreams.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+

+using NUnit.Framework;

+using System;

+using System.IO;

+using System.Text;

+

+namespace MonoTests.System.IO

+{

+

+public class StreamReaderTest : TestCase

+{

+	public StreamReaderTest() : 

+		base ("MonoTests.System.StreamReaderTest testsuite") {}

+	public StreamReaderTest(string name) : base(name) {}

+

+	protected override void SetUp() 

+	{

+	}

+

+	protected override void TearDown() 

+	{

+	}

+

+	public static ITest Suite {

+		get { 

+			return new TestSuite(typeof(StreamReaderTest)); 

+		}

+	}

+

+	private string _codeFileName = "resources" + Path.DirectorySeparatorChar + "AFile.txt";

+

+	public void TestCtor1() {

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader((Stream)null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			FileStream f = new FileStream(_codeFileName, FileMode.Open, FileAccess.Write);

+			try {

+				StreamReader r = new StreamReader(f);

+				r.Close();

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			f.Close();

+			Assert("no read error not thrown", errorThrown);

+		}

+		{

+			// this is probably incestuous, but, oh well.

+			FileStream f = new FileStream(_codeFileName, 

+						      FileMode.Open, 

+						      FileAccess.Read);

+			StreamReader r = new StreamReader(f);

+			AssertNotNull("no stream reader", r);

+			r.Close();

+			f.Close();

+		}

+	}

+	public void TestCtor2() {

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("");

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("empty string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader((string)null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			Assert("null string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("nonexistentfile");

+			} catch (FileNotFoundException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 3: " + e.ToString());

+			}

+			Assert("fileNotFound error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("nonexistentdir/file");

+			} catch (DirectoryNotFoundException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 4: " + e.ToString());

+			}

+			Assert("dirNotFound error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("!$what? what? Huh? !$*#" + Path.InvalidPathChars[0]);

+			} catch (IOException) {

+				errorThrown = true;

+			} catch (ArgumentException) {

+				// FIXME - the spec says 'IOExc', but the

+				//   compiler says 'ArgExc'...

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 5: " + e.ToString());

+			}

+			Assert("invalid filename error not thrown", errorThrown);

+		}

+		{

+			// this is probably incestuous, but, oh well.

+			StreamReader r = new StreamReader(_codeFileName);

+			AssertNotNull("no stream reader", r);

+			r.Close();

+		}

+	}

+	public void TestCtor3() {

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader((Stream)null, false);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("null stream error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			FileStream f = new FileStream(_codeFileName, FileMode.Open, FileAccess.Write);

+			try {

+				StreamReader r = new StreamReader(f, false);

+				r.Close();

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			f.Close();

+			Assert("no read error not thrown", errorThrown);

+		}

+		{

+			// this is probably incestuous, but, oh well.

+			FileStream f = new FileStream(_codeFileName, 

+						      FileMode.Open, 

+						      FileAccess.Read);

+			StreamReader r = new StreamReader(f, false);

+			AssertNotNull("no stream reader", r);

+			r.Close();

+			f.Close();

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader((Stream)null, true);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 3: " + e.ToString());

+			}

+			Assert("null string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			FileStream f = new FileStream(_codeFileName, FileMode.Open, FileAccess.Write);

+			try {

+				StreamReader r = new StreamReader(f, true);

+				r.Close();

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 4: " + e.ToString());

+			}

+			f.Close();

+			Assert("no read error not thrown", errorThrown);

+		}

+		{

+			// this is probably incestuous, but, oh well.

+			FileStream f = new FileStream(_codeFileName, 

+						      FileMode.Open, 

+						      FileAccess.Read);

+			StreamReader r = new StreamReader(f, true);

+			AssertNotNull("no stream reader", r);

+			r.Close();

+			f.Close();

+		}

+	}

+	public void TestCtor4() {

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("", false);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("empty string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader((string)null, false);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			Assert("null string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("nonexistentfile", false);

+			} catch (FileNotFoundException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 3: " + e.ToString());

+			}

+			Assert("fileNotFound error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("nonexistentdir/file", false);

+			} catch (DirectoryNotFoundException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 4: " + e.ToString());

+			}

+			Assert("dirNotFound error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("!$what? what? Huh? !$*#" + Path.InvalidPathChars[0], false);

+			} catch (IOException) {

+				errorThrown = true;

+			} catch (ArgumentException) {

+				// FIXME - the spec says 'IOExc', but the

+				//   compiler says 'ArgExc'...

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 5: " + e.ToString());

+			}

+			Assert("invalid filename error not thrown", errorThrown);

+		}

+		{

+			// this is probably incestuous, but, oh well.

+			StreamReader r = new StreamReader(_codeFileName, false);

+			AssertNotNull("no stream reader", r);

+			r.Close();

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("", true);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 6: " + e.ToString());

+			}

+			Assert("empty string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader((string)null, true);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 7: " + e.ToString());

+			}

+			Assert("null string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("nonexistentfile", true);

+			} catch (FileNotFoundException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 8: " + e.ToString());

+			}

+			Assert("fileNotFound error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("nonexistentdir/file", true);

+			} catch (DirectoryNotFoundException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 9: " + e.ToString());

+			}

+			Assert("dirNotFound error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamReader r = new StreamReader("!$what? what? Huh? !$*#" + Path.InvalidPathChars[0], true);

+			} catch (IOException) {

+				errorThrown = true;

+			} catch (ArgumentException) {

+				// FIXME - the spec says 'IOExc', but the

+				//   compiler says 'ArgExc'...

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 10: " + e.ToString());

+			}

+			Assert("invalid filename error not thrown", errorThrown);

+		}

+		{

+			// this is probably incestuous, but, oh well.

+			StreamReader r = new StreamReader(_codeFileName, true);

+			AssertNotNull("no stream reader", r);

+			r.Close();

+		}

+	}

+

+	// TODO - Ctor with Encoding

+	

+	public void TestBaseStream() {

+		try {

+			Byte[] b = {};

+			MemoryStream m = new MemoryStream(b);

+			StreamReader r = new StreamReader(m);

+			AssertEquals("wrong base stream ", m, r.BaseStream);

+			r.Close();

+			m.Close();

+		} catch (Exception e) {

+			Fail ("Unexpected exception thrown: " + e.ToString());

+		}

+	}

+

+	public void TestCurrentEncoding() {

+		try {

+			Byte[] b = {};

+			MemoryStream m = new MemoryStream(b);

+			StreamReader r = new StreamReader(m);

+			AssertEquals("wrong encoding", 

+				     Encoding.UTF8, r.CurrentEncoding);

+		} catch (Exception e) {

+			Fail ("Unexpected exception thrown: " + e.ToString());

+		}

+	}

+

+	// TODO - Close - annoying spec - won't commit to any exceptions. How to test?

+	// TODO - DiscardBufferedData - I have no clue how to test this function.

+

+	public void TestPeek() {

+		// FIXME - how to get an IO Exception?

+		{

+			bool errorThrown = false;

+			try {

+				Byte[] b = {};

+				MemoryStream m = new MemoryStream(b);

+				StreamReader r = new StreamReader(m);

+				m.Close();

+				int nothing = r.Peek();

+			} catch (ObjectDisposedException) {

+				errorThrown = true;

+			}

+			Assert("nothing-to-peek-at error not thrown", errorThrown);

+		}

+		{

+			Byte[] b = {1, 2, 3, 4, 5, 6};

+			MemoryStream m = new MemoryStream(b);

+			

+			StreamReader r = new StreamReader(m);

+			for (int i = 1; i <= 6; i++) {

+				AssertEquals("peek incorrect", i, r.Peek());

+				r.Read();

+			}

+			AssertEquals("should be none left", -1, r.Peek());

+		}

+	}

+

+	public void TestRead() {

+		// FIXME - how to get an IO Exception?

+		{

+			bool errorThrown = false;

+			try {

+				Byte[] b = {};

+				MemoryStream m = new MemoryStream(b);

+				StreamReader r = new StreamReader(m);

+				m.Close();

+				int nothing = r.Read();

+			} catch (ObjectDisposedException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("nothing-to-read error not thrown", errorThrown);

+		}

+		{

+			Byte[] b = {1, 2, 3, 4, 5, 6};

+			MemoryStream m = new MemoryStream(b);

+			

+			StreamReader r = new StreamReader(m);

+			for (int i = 1; i <= 6; i++) {

+				AssertEquals("read incorrect", i, r.Read());

+			}

+			AssertEquals("Should be none left", -1, r.Read());

+		}

+

+		{

+			bool errorThrown = false;

+			try {

+				Byte[] b = {};

+				StreamReader r = new StreamReader(new MemoryStream(b));

+				r.Read(null, 0, 0);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			Assert("null buffer error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Byte[] b = {};

+				StreamReader r = new StreamReader(new MemoryStream(b));

+				Char[] c = new Char[1];

+				r.Read(c, 0, 2);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 3: " + e.ToString());

+			}

+			Assert("too-long range error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Byte[] b = {};

+				StreamReader r = new StreamReader(new MemoryStream(b));

+				Char[] c = new Char[1];

+				r.Read(c, -1, 2);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 4: " + e.ToString());

+			}

+			Assert("out of range error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Byte[] b = {};

+				StreamReader r = new StreamReader(new MemoryStream(b));

+				Char[] c = new Char[1];

+				r.Read(c, 0, -1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 5: " + e.ToString());

+			}

+			Assert("out of range error not thrown", errorThrown);

+		}

+		{

+			int ii = 1;

+			try {

+				Byte[] b = {(byte)'a', (byte)'b', (byte)'c', 

+					    (byte)'d', (byte)'e', (byte)'f', 

+					    (byte)'g'};

+				MemoryStream m = new MemoryStream(b);

+				ii++;

+				StreamReader r = new StreamReader(m);

+				ii++;

+

+				char[] buffer = new Char[7];

+				ii++;

+				char[] target = {'g','d','e','f','b','c','a'};

+				ii++;

+				r.Read(buffer, 6, 1);

+				ii++;

+				r.Read(buffer, 4, 2);

+				ii++;

+				r.Read(buffer, 1, 3);

+				ii++;

+				r.Read(buffer, 0, 1);

+				ii++;

+				for (int i = 0; i < target.Length; i++) {

+					AssertEquals("read no work", 

+						     target[i], buffer[i]);

+				i++;

+				}

+						    

+			} catch (Exception e) {

+				Fail ("Caught when ii=" + ii + ". e:" + e.ToString());

+			}

+		}

+	}

+

+	public void TestReadLine() {

+		// TODO Out Of Memory Exc? IO Exc?

+		Byte[] b = new Byte[8];

+		b[0] = (byte)'a';

+		b[1] = (byte)'\n';

+		b[2] = (byte)'b';

+		b[3] = (byte)'\n';

+		b[4] = (byte)'c';

+		b[5] = (byte)'\n';

+		b[6] = (byte)'d';

+		b[7] = (byte)'\n';

+		MemoryStream m = new MemoryStream(b);

+		StreamReader r = new StreamReader(m);

+		AssertEquals("line doesn't match", "a", r.ReadLine());

+		AssertEquals("line doesn't match", "b", r.ReadLine());

+		AssertEquals("line doesn't match", "c", r.ReadLine());

+		AssertEquals("line doesn't match", "d", r.ReadLine());

+		AssertEquals("line doesn't match", null, r.ReadLine());

+	}

+

+	public void TestReadToEnd() {

+		// TODO Out Of Memory Exc? IO Exc?

+		Byte[] b = new Byte[8];

+		b[0] = (byte)'a';

+		b[1] = (byte)'\n';

+		b[2] = (byte)'b';

+		b[3] = (byte)'\n';

+		b[4] = (byte)'c';

+		b[5] = (byte)'\n';

+		b[6] = (byte)'d';

+		b[7] = (byte)'\n';

+		MemoryStream m = new MemoryStream(b);

+		StreamReader r = new StreamReader(m);

+		AssertEquals("line doesn't match", "a\nb\nc\nd\n", r.ReadToEnd());

+		AssertEquals("line doesn't match", "", r.ReadToEnd());

+	}

+}

+}

diff --git a/mcs/class/corlib/Test/System.IO/StreamWriterTest.cs b/mcs/class/corlib/Test/System.IO/StreamWriterTest.cs
new file mode 100644
index 00000000000..232f1cfbc33
--- /dev/null
+++ b/mcs/class/corlib/Test/System.IO/StreamWriterTest.cs
@@ -0,0 +1,353 @@
+// StreamWriterTest.cs - NUnit Test Cases for the SystemIO.StreamWriter class

+//

+// David Brandt (bucky@keystreams.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+

+using NUnit.Framework;

+using System;

+using System.IO;

+using System.Text;

+

+namespace MonoTests.System.IO

+{

+

+public class StreamWriterTest : TestCase

+{

+	public StreamWriterTest() : 

+		base ("MonoTests.System.StreamWriterTest testsuite") {}

+	public StreamWriterTest(string name) : base(name) {}

+

+	protected override void SetUp() 

+	{

+	}

+

+	protected override void TearDown() 

+	{

+	}

+

+	public static ITest Suite {

+		get { 

+			return new TestSuite(typeof(StreamWriterTest)); 

+		}

+	}

+

+	private string _codeFileName = "StreamWriterTest.temp";

+	private string _thisCodeFileName = "resources" + Path.DirectorySeparatorChar + "AFile.txt";

+

+	// TODO - ctors

+	public void TestCtor1() {

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter((Stream)null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("null string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			FileStream f = new FileStream(_thisCodeFileName, 

+						      FileMode.Open, 

+						      FileAccess.Read);

+			try {

+				StreamWriter r = new StreamWriter(f);

+				r.Close();

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			f.Close();

+			Assert("no read error not thrown", errorThrown);

+		}

+		{

+			FileStream f = new FileStream(_codeFileName, 

+						      FileMode.Append, 

+						      FileAccess.Write);

+			StreamWriter r = new StreamWriter(f);

+			AssertNotNull("no stream writer", r);

+			r.Close();

+			f.Close();

+		}

+	}

+	public void TestCtor2() {

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter("");

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("empty string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter((string)null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			Assert("null string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter("nonexistentdir/file");

+			} catch (DirectoryNotFoundException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 3: " + e.ToString());

+			}

+			Assert("dirNotFound error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter("!$what? what? Huh? !$*#" + Path.InvalidPathChars[0]);

+			} catch (IOException) {

+				errorThrown = true;

+			} catch (ArgumentException) {

+				// FIXME - the spec says 'IOExc', but the

+				//   compiler says 'ArgExc'...

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 4: " + e.ToString());

+			}

+			Assert("1 invalid filename error not thrown", errorThrown);

+		}

+		// TODO - Security/Auth exceptions

+		{

+			StreamWriter r = new StreamWriter(_codeFileName);

+			AssertNotNull("no stream writer", r);

+			r.Close();

+		}

+	}

+	public void TestCtor3() {

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter("", false);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("empty string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter((string)null, false);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 2: " + e.ToString());

+			}

+			Assert("null string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter("nonexistentdir/file", false);

+			} catch (DirectoryNotFoundException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 3: " + e.ToString());

+			}

+			Assert("dirNotFound error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter("!$what? what? Huh? !$*#" + Path.InvalidPathChars[0], false);

+			} catch (IOException) {

+				errorThrown = true;

+			} catch (ArgumentException) {

+				// FIXME - the spec says 'IOExc', but the

+				//   compiler says 'ArgExc'...

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 4: " + e.ToString());

+			}

+			Assert("2 invalid filename error not thrown", errorThrown);

+		}

+		{

+			StreamWriter r = new StreamWriter(_codeFileName, false);

+			AssertNotNull("no stream writer", r);

+			r.Close();

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter("", true);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 5: " + e.ToString());

+			}

+			Assert("empty string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter((string)null, true);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 6: " + e.ToString());

+			}

+			Assert("null string error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter("nonexistentdir/file", true);

+			} catch (DirectoryNotFoundException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 7: " + e.ToString());

+			}

+			Assert("dirNotFound error not thrown", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				StreamWriter r = new StreamWriter("!$what? what? Huh? !$*#" + Path.InvalidPathChars[0], true);

+			} catch (IOException) {

+				errorThrown = true;

+			} catch (ArgumentException) {

+				// FIXME - the spec says 'IOExc', but the

+				//   compiler says 'ArgExc'...

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 8: " + e.ToString());

+			}

+			Assert("3 invalid filename error not thrown", errorThrown);

+		}

+		{

+			try {

+				StreamWriter r = new StreamWriter(_codeFileName, true);

+				AssertNotNull("no stream writer", r);

+				r.Close();

+			} catch (Exception e) {

+				Fail ("Unxpected exception e=" + e.ToString());

+			}

+		}

+	}

+

+	// TODO - ctors with Encoding

+

+	// TODO - AutoFlush

+	public void TestAutoFlush() {

+		{

+			MemoryStream m = new MemoryStream();

+			StreamWriter w = new StreamWriter(m);

+			w.AutoFlush = false;

+			w.Write(1);

+			w.Write(2);

+			w.Write(3);

+			w.Write(4);

+			AssertEquals("Should be nothing before flush",

+				     0L, m.Length);

+			w.Flush();

+			AssertEquals("Should be something after flush",

+				     4L, m.Length);

+		}		

+		{

+			MemoryStream m = new MemoryStream();

+			StreamWriter w = new StreamWriter(m);

+			w.AutoFlush = true;

+			w.Write(1);

+			w.Write(2);

+			w.Write(3);

+			w.Write(4);

+			AssertEquals("Should be something before flush",

+				     4L, m.Length);

+			w.Flush();

+			AssertEquals("Should be something after flush",

+				     4L, m.Length);

+		}		

+	}

+

+	public void TestBaseStream() {

+		FileStream f = new FileStream(_codeFileName, 

+					      FileMode.Append, 

+					      FileAccess.Write);

+		StreamWriter r = new StreamWriter(f);

+		AssertEquals("wrong base stream ", f, r.BaseStream);

+		r.Close();

+		f.Close();

+	}

+

+	public void TestEncoding() {

+		StreamWriter r = new StreamWriter(_codeFileName);

+		AssertEquals("wrong encoding", 

+			     Encoding.UTF8.GetType(), r.Encoding.GetType());

+		r.Close();

+	}

+

+	// TODO - Close - not entirely sure how to test Close

+	//public void TestClose() {

+	//{

+	//MemoryStream m = new MemoryStream();

+	//StreamWriter w = new StreamWriter(m);

+	//StreamReader r = new StreamReader(m);

+	//w.Write(1);

+	//w.Write(2);

+	//w.Write(3);

+	//w.Write(4);

+	//AssertEquals("Should be nothing before close",

+	//0, m.Length);

+	//AssertEquals("Should be nothing in reader",

+	//-1, r.Peek());

+	//w.Close();

+	//AssertEquals("Should be something after close",

+	//1, r.Peek());

+        //}		

+	//}

+

+	// TODO - Flush

+	public void TestFlush() {

+		{

+			bool errorThrown = false;

+			try {

+				FileStream f = new FileStream(_codeFileName, 

+							      FileMode.Append, 

+							      FileAccess.Write);

+				StreamWriter r = new StreamWriter(f);

+				r.Close();

+				r.Flush();

+			} catch (ObjectDisposedException) {

+				errorThrown = true;

+			} catch (Exception e) {

+				Fail ("Incorrect exception thrown at 1: " + e.ToString());

+			}

+			Assert("can't flush closed error not thrown", errorThrown);

+		}

+		{

+			MemoryStream m = new MemoryStream();

+			StreamWriter w = new StreamWriter(m);

+			w.Write(1);

+			w.Write(2);

+			w.Write(3);

+			w.Write(4);

+			AssertEquals("Should be nothing before flush",

+				     0L, m.Length);

+			w.Flush();

+			AssertEquals("Should be something after flush",

+				     4L, m.Length);

+		}		

+	}

+

+	// TODO - Write - test errors, functionality tested in TestFlush.

+}

+}

diff --git a/mcs/class/corlib/Test/System.IO/StringReaderTest.cs b/mcs/class/corlib/Test/System.IO/StringReaderTest.cs
new file mode 100644
index 00000000000..3391379baf7
--- /dev/null
+++ b/mcs/class/corlib/Test/System.IO/StringReaderTest.cs
@@ -0,0 +1,133 @@
+//
+// System.IO.StringWriter
+//
+// Author: Marcin Szczepanski (marcins@zipworld.com.au)
+//
+// TODO: Add some testing for exceptions
+//
+// TODO: Some of the tests could be a bit more thorough
+//
+
+using NUnit.Framework;
+using System.IO;
+using System;
+
+namespace MonoTests.System.IO {
+
+public class StringReaderTest : TestCase {
+
+	public static ITest Suite {
+		get {
+			return new TestSuite(typeof(StringReaderTest));
+		}
+	}
+
+	public StringReaderTest() : base ("MonoTests.System.IO.StringReaderTest testcase") { }
+	public StringReaderTest( string name ): base(name) { }
+
+	public  void TestReadLine() {
+		string testme = "a\nb\nc\n";
+		StringReader sr = new StringReader (testme);
+		string inputLine;
+		int lines = 0;
+		while ((inputLine = sr.ReadLine ()) != null)
+			lines++;
+		
+		AssertEquals ("Incorrect number of lines", 3, lines);
+	}
+
+	public void TestPeekRead() {
+		StringReader reader = new StringReader( "Test String" );
+
+		char c = (char)reader.Peek();
+		AssertEquals("A1", 'T', c );
+
+		char read = (char)reader.Read();
+
+		AssertEquals("A2", 'T', read );
+
+		c = (char)reader.Peek();
+
+		AssertEquals("A3", 'e', c );
+	}
+
+	public void TestPeekAndReadAtEndOfString() {
+		StringReader reader = new StringReader("x");
+
+		char c = (char)reader.Peek();
+		AssertEquals("A1", 'x', c );
+
+		c = (char)reader.Read();
+		AssertEquals("A2", 'x', c);
+
+		int i = reader.Peek();
+		AssertEquals("A3", -1, i);
+
+		i = reader.Read();
+		AssertEquals("A4", -1, i);
+
+		i = reader.Peek();
+		AssertEquals("A5", -1, i);
+	}
+
+	public void TestPeekAndReadEmptyString() {
+		StringReader reader = new StringReader("");
+
+		int i = reader.Peek();
+		AssertEquals("A1", -1, i);
+
+		i = reader.Read();
+		AssertEquals("A2", -1, i);
+	}
+
+	public void TestRead() {
+		StringReader reader = new StringReader( "Test String" );
+
+		/* Read from start of string */
+		char[] test = new char[5];
+
+		int charsRead = reader.Read( test, 0, 5 );
+
+		AssertEquals( 5, charsRead );
+		AssertEquals( "Test ", new String(test)  );
+
+		/* Read to end of string */
+		//reader = new StringReader( "Test String" );
+
+		test = new char[6];
+		charsRead = reader.Read( test, 0, 6 );
+		AssertEquals( 6, charsRead);
+		AssertEquals( "String", new String( test )  );
+
+		/* Read past end of string */
+
+		test = new char[6];
+		reader = new StringReader( "Foo" );
+		charsRead = reader.Read( test, 0, 6 );
+		AssertEquals( 3, charsRead );
+		AssertEquals(  "Foo\0\0\0", new String( test ) );
+
+	}
+
+        public void TestReadEOL() {
+                StringReader reader = new StringReader( "Line1\rLine2\r\nLine3\nLine4" );
+
+                string test = reader.ReadLine();
+
+                AssertEquals( "Line1", test );
+
+                test = reader.ReadLine();
+
+                AssertEquals( "Line2", test );
+
+                test = reader.ReadLine();
+
+                AssertEquals( "Line3", test );
+
+                test = reader.ReadLine();
+
+                AssertEquals( "Line4", test );
+        }
+}
+
+}
diff --git a/mcs/class/corlib/Test/System.IO/StringWriterTest.cs b/mcs/class/corlib/Test/System.IO/StringWriterTest.cs
new file mode 100644
index 00000000000..bf254ace832
--- /dev/null
+++ b/mcs/class/corlib/Test/System.IO/StringWriterTest.cs
@@ -0,0 +1,56 @@
+//

+// System.IO.StringWriter

+//

+// Author: Marcin Szczepanski (marcins@zipworld.com.au)

+//

+// TODO: Add some testing for exceptions

+//

+

+using NUnit.Framework;

+using System.IO;

+using System;

+using System.Text;

+

+namespace MonoTests.System.IO {

+

+public class StringWriterTest : TestCase {

+	

+	public static ITest Suite {

+		get {

+			return new TestSuite(typeof(StringWriterTest));

+		}

+	}

+

+	public StringWriterTest() : base ("MonoTests.System.IO.StringWriterTest testcase") { }

+	public StringWriterTest( string name ): base(name) { }

+

+	public void TestConstructors() {

+                StringBuilder sb = new StringBuilder("Test String");

+

+                StringWriter writer = new StringWriter( sb );

+                AssertEquals( sb, writer.GetStringBuilder() );

+        }

+

+        public void TestWrite() {

+                StringWriter writer = new StringWriter();

+

+                AssertEquals( String.Empty, writer.ToString() );

+                

+                writer.Write( 'A' );

+                AssertEquals( "A", writer.ToString() );

+

+                writer.Write( " foo" );

+                AssertEquals( "A foo", writer.ToString() );

+

+                

+                char[] testBuffer = "Test String".ToCharArray();

+

+                writer.Write( testBuffer, 0, 4 );

+                AssertEquals( "A fooTest", writer.ToString() );

+

+                writer.Write( testBuffer, 5, 6 );

+                AssertEquals( "A fooTestString", writer.ToString() );

+        }

+}

+

+}

diff --git a/mcs/class/corlib/Test/System.Resources/AllTests.cs b/mcs/class/corlib/Test/System.Resources/AllTests.cs
new file mode 100644
index 00000000000..66bbb159c4a
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Resources/AllTests.cs
@@ -0,0 +1,28 @@
+//

+// MonoTests.System.Resources.AllTests.cs

+//

+// Author:

+//   Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak II

+//

+

+using System;

+using NUnit.Framework;

+

+namespace MonoTests.System.Resources {

+        public class AllTests : TestCase {

+                public AllTests(string name) : base(name) {}

+                

+                public static ITest Suite 

+                { 

+                        get 

+                        {

+                                TestSuite suite =  new TestSuite();

+//FIXME: ResourceReader is not ready yet.

+//                                suite.AddTest(ResourceReaderTest.Suite);

+                                return suite;

+                        }

+                }

+        }

+}

diff --git a/mcs/class/corlib/Test/System.Resources/ChangeLog b/mcs/class/corlib/Test/System.Resources/ChangeLog
new file mode 100644
index 00000000000..538c52e81d3
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Resources/ChangeLog
@@ -0,0 +1,26 @@
+2002/06/14  Nick Drochak <ndrochak@gol.com>

+

+	* AllTests.cs: Disable ResourceReaderTest for now.  The class is not

+	ready yet.

+

+2002-05-22  Nick Drochak  <ndrochak@gol.com>

+

+	* ResourceReaderTest.cs: Fix path name to resource files (again).

+

+2002-02-09  Nick Drochak  <ndrochak@gol.com>

+

+	* ResourceReaderTest.cs: Fix path name to resource files

+

+2002-01-25  Nick Drochak  <ndrochak@gol.com>

+

+	* AllTests.cs:

+	* Empty.resources:

+	* MyResources.resources: Added files

+	* ResourceReaderTest.cs: Test the enumerator

+

+2002-01-24  Nick Drochak  <ndrochak@gol.com>

+

+	* ResourceReaderTest.cs: Add new file. This test is not done yet.

+	Wanted to save it in cvs for 'disaster recovery' purposes.

+	Just in case.

+

diff --git a/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs b/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
new file mode 100644
index 00000000000..9fc95af4f1e
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Resources/ResourceReaderTest.cs
@@ -0,0 +1,144 @@
+//

+// MonoTests.System.Resources.ResourceReaderTest.cs

+//

+// Author:

+//   Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak II

+//

+

+

+using System;

+using System.Resources;

+using System.IO;
+

+using System.Collections;

+using MonoTests.System.Resources;

+using NUnit.Framework;

+

+namespace MonoTests.System.Resources {

+

+	public class ResourceReaderTest : TestCase {

+		private static string m_ResourceFile = "resources" + Path.DirectorySeparatorChar + "MyResources.resources";

+		private static string m_BadResourceFile = "resources" + Path.DirectorySeparatorChar + "Empty.resources";

+		

+		public ResourceReaderTest() : base ("MonoTests.System.Resources.ResourceReaderTest testcase") { }

+		public ResourceReaderTest(String name) : base(name) {

+		}

+		

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(ResourceReaderTest));

+			}

+		}

+

+		protected override void SetUp() {

+		}

+

+		public void TestConstructorStringExceptions() {

+			ResourceReader r;

+			try {

+				r = new ResourceReader((String)null);

+				Fail("Should throw exception on null");

+			} catch{}

+			try {

+				r = new ResourceReader("");

+				Fail("Should throw exception on empty path");

+			} catch{}

+			try {

+				// use a file name that is *very* unlikely to exsist

+				r = new ResourceReader("j38f8axvnn9h38hfa9nxn93f8hav4zvag87vvah32o");

+				Fail("Should throw exception on file not found");

+			} catch{}

+			try {

+				r = new ResourceReader(m_BadResourceFile);

+				Fail("Should throw exception on bad resource file");

+			}

+			catch {}

+		}

+

+		public void TestConstructorString() {

+			if (!File.Exists(m_ResourceFile)) {

+				Fail("Resource file is not where it should be:" + Directory.GetCurrentDirectory()+ "\\" + m_ResourceFile);

+			}

+			ResourceReader r = null;

+			try {

+				r = new ResourceReader(m_ResourceFile);

+			}

+			catch {

+				Fail("Should have been able to open resource file.");

+			}

+			finally {

+				if (null != r)

+					r.Close();

+			}

+			Assert("String constructor should not be null", null != r);

+		}

+

+		public void TestConstructorStreamExceptions() {

+			ResourceReader r;

+			try {

+				r = new ResourceReader((Stream)null);

+				Fail("Should throw exception on null");

+			} catch{}

+

+			try {

+				Stream stream = new FileStream (m_ResourceFile, FileMode.Open);

+				stream.Close();

+				r = new ResourceReader(stream);

+				Fail("Should throw exception on cannot read");

+			} catch{}

+		}

+

+		public void TestStream(){

+			ResourceReader r = null;

+			try {

+				Stream stream = new FileStream (m_ResourceFile, FileMode.Open);

+				r = new ResourceReader(stream);

+			} 

+			catch{

+				Fail("Should not throw exception constructing from stream");

+			}

+			finally {

+				if (null != r) {

+					r.Close();

+				}

+			}

+		}

+

+		public void TestClose() {

+			ResourceReader r = null;

+			Stream stream = new FileStream (m_ResourceFile, FileMode.Open);

+			r = new ResourceReader(stream);

+			r.Close();

+			try {

+				stream = new FileStream (m_ResourceFile, FileMode.Open);

+			} 

+			catch{

+				Fail("Should be able to open the stream again after close");

+			}

+			finally {

+				if (null != stream) {

+					stream.Close();

+				}

+			}

+		}

+

+		public void TestEnumerator(){

+			ResourceReader reader = null;

+			Stream stream = new FileStream (m_ResourceFile, FileMode.Open);

+			reader = new ResourceReader(stream);

+			IDictionaryEnumerator en = reader.GetEnumerator();

+			// Goes through the enumerator, printing out the key and value pairs.

+			while (en.MoveNext()) {

+				DictionaryEntry de = (DictionaryEntry)en.Current;

+				Assert("Current.Key should not be empty",String.Empty != (string)de.Key);

+				Assert("Current.Value should not be empty",String.Empty != (string)de.Value);

+				Assert("Current.Value should not be empty",String.Empty != (string)de.Value);

+				Assert("Entry.Key should not be empty",String.Empty != (string)en.Key);

+				Assert("Entry.Value should not be empty",String.Empty != (string)en.Value);

+			}

+			reader.Close();

+		}

+	}  // class ResourceReaderTest

+}  // namespace MonoTests.System.Resources
\ No newline at end of file
diff --git a/mcs/class/corlib/Test/System.Runtime.Serialization/AllTests.cs b/mcs/class/corlib/Test/System.Runtime.Serialization/AllTests.cs
new file mode 100644
index 00000000000..e827b9aba08
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Runtime.Serialization/AllTests.cs
@@ -0,0 +1,29 @@
+//
+// MonoTests.System.Runtime.Serialization.AllTests
+//
+// Authors:
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) 2002 Ximian, Inc.  (http://www.ximian.com)
+// 
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System.Runtime.Serialization {
+        public class AllTests : TestCase
+	{
+                public AllTests (string name) : base(name) {}
+                
+                public static ITest Suite 
+                { 
+                        get {
+                                TestSuite suite =  new TestSuite ();
+                                suite.AddTest (ObjectIDGeneratorTests.Suite);
+                                suite.AddTest (FormatterServicesTests.Suite);
+                                return suite;
+                        }
+                }
+        }
+}
+
diff --git a/mcs/class/corlib/Test/System.Runtime.Serialization/ChangeLog b/mcs/class/corlib/Test/System.Runtime.Serialization/ChangeLog
new file mode 100644
index 00000000000..c2482491049
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Runtime.Serialization/ChangeLog
@@ -0,0 +1,10 @@
+2002-08-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>

+

+	* AllTests.cs: added FormatterServicesTests.

+	* FormatterServicesTests.cs: New file.

+

+2002-06-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>

+

+	* AllTests.cs: New file to make 'make test' work.

+	* ChangeLog: New file.

+

diff --git a/mcs/class/corlib/Test/System.Runtime.Serialization/FormatterServicesTests.cs b/mcs/class/corlib/Test/System.Runtime.Serialization/FormatterServicesTests.cs
new file mode 100644
index 00000000000..6b2f8d2222c
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Runtime.Serialization/FormatterServicesTests.cs
@@ -0,0 +1,142 @@
+//
+// System.Runtime.Serialization.FormatterServicesTests: NUnit test
+//
+// Authors: 
+// 	Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (c) 2002 Ximian Inc. (http://www.ximian.com)
+//
+
+using NUnit.Framework;
+using System;
+using System.Reflection;
+using System.Runtime.Serialization;
+
+namespace MonoTests.System.Runtime.Serialization
+{
+	public class FormatterServicesTests : TestCase
+	{
+		public static ITest Suite {
+			get {
+				return new TestSuite (typeof (FormatterServicesTests));
+			}
+		}
+
+		public FormatterServicesTests () :
+			base ("MonoTests.System.Runtime.Serialization.FormatterServicesTests testcase")
+		{
+		}
+
+		public FormatterServicesTests (string name) : base (name)
+		{
+		}
+
+		public void TestClass1 ()
+		{
+			DerivedClass1 derived = new DerivedClass1 ();
+			derived.anotherInt = 69;
+			MemberInfo [] members = FormatterServices.GetSerializableMembers (derived.GetType ());
+			Assert ("#01", members != null);
+			AssertEquals ("#02", 3, members.Length);
+
+			object [] data = FormatterServices.GetObjectData (derived, members);
+			Assert ("#03", data != null);
+			AssertEquals ("#04", 3, data.Length);
+
+			DerivedClass1 o = (DerivedClass1) FormatterServices.GetUninitializedObject (derived.GetType ());
+			Assert ("#05", o != null);
+
+			o = (DerivedClass1) FormatterServices.PopulateObjectMembers (o, members, data);
+			Assert ("#06", o != null);
+			AssertEquals ("#07", "hola", o.Hello);
+			AssertEquals ("#08", 21, o.IntBase);
+			AssertEquals ("#09", 1, o.IntDerived);
+			AssertEquals ("#10", 69, o.anotherInt);
+			AssertEquals ("#11", "hey", DerivedClass1.hey);
+		}
+	}
+
+	[Serializable]
+	class BaseClass1
+	{
+		public string hello = "hola";
+		static int intBase = 21;
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+
+		public override bool Equals (object o)
+		{
+			BaseClass1 bc = o  as BaseClass1;
+			if (o == null)
+				return false;
+
+			if (hello != "hola")
+				return false;
+
+			return (hello == bc.hello);
+		}
+
+		public string Hello
+		{
+			get {
+				return hello;
+			}
+		}
+
+		public int IntBase
+		{
+			get {
+				return intBase;
+			}
+		}
+	}
+	
+	[Serializable]
+	class DerivedClass1 : BaseClass1
+	{
+		private int intDerived = 1;
+		[NonSerialized] public int publicint = 2;
+		public int anotherInt = 22;
+		public static string hey = "hey";
+
+		public string Name 
+		{
+			get {
+				return "Ahem";
+			}
+		}
+
+		public void SomeMethod ()
+		{
+			/* Does nothing */
+		}
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+
+		public override bool Equals (object o)
+		{
+			DerivedClass1 dc = o  as DerivedClass1;
+			if (o == null)
+				return false;
+
+			if (anotherInt != 22 || hey != "hey")
+				return false;
+			
+			return (anotherInt == dc.anotherInt);
+		}
+
+		public int IntDerived
+		{
+			get {
+				return intDerived;
+			}
+		}
+	}
+}
+
diff --git a/mcs/class/corlib/Test/System.Runtime.Serialization/ObjectIDGeneratorTests.cs b/mcs/class/corlib/Test/System.Runtime.Serialization/ObjectIDGeneratorTests.cs
new file mode 100755
index 00000000000..fc53fe9234a
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Runtime.Serialization/ObjectIDGeneratorTests.cs
@@ -0,0 +1,91 @@
+//
+// System.Runtime.Serialization.ObjectIDGeneratorTests.cs
+//
+// Author: Duncan Mak  (duncan@ximian.com)
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Diagnostics;
+using System.Runtime.Serialization;
+
+using NUnit.Framework;
+
+namespace MonoTests.System.Runtime.Serialization
+{
+	public class ObjectIDGeneratorTests : TestCase
+	{
+		ObjectIDGenerator generator;
+
+		string obj1 = "obj1";
+		int obj2 = 42;		
+		long id;
+
+		public static ITest Suite {
+			get { return new TestSuite (typeof (ObjectIDGeneratorTests)); }
+		}
+		
+		public ObjectIDGeneratorTests (string name)
+			: base (name)
+		{
+		}
+
+		protected override void SetUp ()
+		{
+			generator = new ObjectIDGenerator ();
+		}
+
+		//
+		// Tests adding an ID for a new object
+		//
+		public void TestGetId1 ()
+		{
+			bool testBool1;
+			id = generator.GetId (obj1, out testBool1);
+
+			AssertEquals ("A1", 1L, id); // should start at 1
+			AssertEquals ("A2", true, testBool1);	// firstTime should be true
+		}
+
+		//
+		// Tests getting the ID for an existing object
+		//
+		public void TestGetId2 ()
+		{
+			bool testBool1;
+			bool testBool2;
+			id = generator.GetId (obj1, out testBool1);
+			long testId1 = generator.GetId (obj1, out testBool2);
+
+			AssertEquals ("B1", testId1, id); // same object, same ID
+			AssertEquals ("B2", false, testBool2); // no longer firstTime
+		}
+
+		//
+		// Tests getting the ID for an existing object
+		//
+		public void TestHasId1 ()
+		{
+			bool testBool1;
+			bool testBool3;
+			id = generator.GetId (obj1, out testBool1);
+			long testId2 = generator.HasId (obj1, out testBool3);
+
+			AssertEquals ("C1", false, testBool3); // this has been inserted before
+			AssertEquals ("C2", id, testId2); // we should get the same ID
+		}
+
+		//
+		// Tests getting the ID for a non-existent object
+		//
+		public void TestHasId2 ()
+		{
+			bool testBool4;
+			long testId3 = generator.HasId (obj2, out testBool4);
+
+			AssertEquals ("D1", 0L, testId3);
+			AssertEquals ("D2", true, testBool4);
+		}
+	}
+}
diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/AllTests.cs b/mcs/class/corlib/Test/System.Security.Cryptography/AllTests.cs
new file mode 100644
index 00000000000..90edff9d031
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/AllTests.cs
@@ -0,0 +1,31 @@
+//

+// TestSuite.System.Security.Cryptography.AllCryptoTests.cs

+//

+// Author:

+//      Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+using System;

+using NUnit.Framework;

+

+namespace MonoTests.System.Security.Cryptography {

+        /// <summary>

+        ///   Combines all available crypto unit tests into one test suite.

+        /// </summary>

+        public class AllTests : TestCase {

+                public AllTests(string name) : base(name) {}

+                

+                public static ITest Suite 

+                { 

+                        get 

+                        {

+                                TestSuite suite =  new TestSuite();

+                                suite.AddTest(SymmetricAlgorithmTest.Suite);

+				suite.AddTest(AsymmetricAlgorithmTest.Suite); 

+                        	suite.AddTest(RNGCryptoServiceProviderTest.Suite);

+				suite.AddTest(FromBase64TransformTest.Suite);

+                                return suite;

+                        }

+                }

+        }

+}

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/AsymmetricAlgorithmTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/AsymmetricAlgorithmTest.cs
new file mode 100755
index 00000000000..37da7bf16fe
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/AsymmetricAlgorithmTest.cs
@@ -0,0 +1,54 @@
+//

+// TestSuite.System.Security.Cryptography.AsymmetricAlgorithmTest.cs

+//

+// Author:

+//      Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+

+using System;

+using System.Security.Cryptography;

+

+using NUnit.Framework;

+

+namespace MonoTests.System.Security.Cryptography {

+

+	public class AsymmetricAlgorithmTest : TestCase {

+		private AsymmetricAlgorithm _algo;

+		

+		public AsymmetricAlgorithmTest() : base ("MonoTests.System.Security.Cryptography.AsymmetricAlgorithmTest testcase") {

+			_algo = null;

+		}

+		public AsymmetricAlgorithmTest(String name) : base(name) {

+			_algo = null;

+		}

+		

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(AsymmetricAlgorithmTest));

+			}

+		}

+

+		protected override void SetUp() {

+			_algo = AsymmetricAlgorithm.Create();

+		}

+

+		private void SetDefaultData() {

+		}

+		

+		public void TestProperties() {

+			Assert("Properties (1)", _algo != null);

+			

+			bool thrown = false;

+			try {

+				KeySizes[] keys = _algo.LegalKeySizes;

+				foreach (KeySizes myKey in keys) {

+					for (int i=myKey.MinSize; i<=myKey.MaxSize; i+=myKey.SkipSize) {

+						_algo.KeySize = i;

+					}

+				}

+			} catch (CryptographicException) {thrown=true;}

+			Assert("Properties (2)", !thrown);			

+		}

+	}

+}

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/FromBase64Transform.cs b/mcs/class/corlib/Test/System.Security.Cryptography/FromBase64Transform.cs
new file mode 100755
index 00000000000..34a7612e80f
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/FromBase64Transform.cs
@@ -0,0 +1,75 @@
+//

+// TestSuite.System.Security.Cryptography.FromBase64Transform.cs

+//

+// Author:

+//      Martin Baulig (martin@gnome.org)

+//

+// (C) 2002 Ximian, Inc.  http://www.ximian.com

+//

+

+using System;

+using System.Security.Cryptography;

+using NUnit.Framework;

+

+namespace MonoTests.System.Security.Cryptography {

+

+	public class FromBase64TransformTest : TestCase {

+		private FromBase64Transform _algo;

+

+		public FromBase64TransformTest() : base ("MonoTests.System.Security.Cryptography.FromBase64Transform testcase") {

+			_algo = null;

+		}

+		public FromBase64TransformTest(String name) : base(name)

+		{

+			_algo = null;

+		}

+		

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(FromBase64TransformTest));

+			}

+		}

+

+		protected override void SetUp() {

+			_algo = new FromBase64Transform ();

+		}

+

+		protected void TransformFinalBlock (string name, byte[] input, byte[] expected,

+						    int inputOffset, int inputCount)

+		{

+			byte[] output = _algo.TransformFinalBlock (input, inputOffset, inputCount);

+

+			AssertEquals (name, expected.Length, output.Length);

+			for (int i = 0; i < expected.Length; i++)

+				AssertEquals (name + "(" + i + ")", expected [i], output [i]);

+		}

+

+		protected void TransformFinalBlock (string name, byte[] input, byte[] expected)

+		{

+			TransformFinalBlock (name, input, expected, 0, input.Length);

+		}

+

+		public void TestFinalBlock ()

+		{

+			{

+				byte[] input = { 114, 108, 112, 55, 81, 115, 110, 69 };

+				byte[] expected = { 174, 90, 123, 66, 201, 196 };

+

+				TransformFinalBlock ("#A1", input, expected);

+			}

+			{

+				byte[] input = { 114, 108, 112, 55, 81, 115, 61, 61 };

+				byte[] expected = { 174, 90, 123, 66 };

+

+				TransformFinalBlock ("#A2", input, expected);

+			}

+			{

+				byte[] input = { 114, 108, 112, 55, 81, 115, 61, 61 };

+				byte[] expected = { 150, 158, 208 };

+

+				TransformFinalBlock ("#A3", input, expected, 1, 5);

+			}

+		}

+

+	}

+}

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/RNGCryptoServiceProviderTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/RNGCryptoServiceProviderTest.cs
new file mode 100644
index 00000000000..f9d16d58df1
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/RNGCryptoServiceProviderTest.cs
@@ -0,0 +1,55 @@
+//

+// TestSuite.System.Security.Cryptography.RNGCryptoServiceProviderTest.cs

+//

+// Author:

+//      Mark Crichton (crichton@gimp.org)

+//

+

+

+using System;

+using System.Security.Cryptography;

+

+using NUnit.Framework;

+

+namespace MonoTests.System.Security.Cryptography {

+

+	public class RNGCryptoServiceProviderTest : TestCase {

+		private RNGCryptoServiceProvider _algo;

+		

+		public RNGCryptoServiceProviderTest() : base ("MonoTests.System.Security.Cryptography.RNGCryptoServiceProviderTest testcase") {

+			_algo = null;

+		}

+		public RNGCryptoServiceProviderTest(String name) : base(name) {

+			_algo = null;

+		}

+		

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(RNGCryptoServiceProviderTest));

+			}

+		}

+

+		protected override void SetUp() {

+			_algo = new RNGCryptoServiceProvider();

+		}

+

+		private void SetDefaultData() {

+		}

+		

+		public void TestProperties() {

+			Assert("Properties (1)", _algo != null);

+			

+			byte[] random = new Byte[25];

+

+			// The C code doesn't throw an exception yet.

+			_algo.GetBytes(random);

+			

+			// This one we can check...

+			_algo.GetNonZeroBytes(random);

+			

+			foreach (Byte rnd_byte in random) {

+				Assert("Properties (2)", rnd_byte != 0);

+			}

+		}

+	}

+}

diff --git a/mcs/class/corlib/Test/System.Security.Cryptography/SymmetricAlgorithmTest.cs b/mcs/class/corlib/Test/System.Security.Cryptography/SymmetricAlgorithmTest.cs
new file mode 100755
index 00000000000..0c4c8786925
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Cryptography/SymmetricAlgorithmTest.cs
@@ -0,0 +1,65 @@
+//

+// TestSuite.System.Security.Cryptography.SymmetricAlgorithmTest.cs

+//

+// Author:

+//      Thomas Neidhart (tome@sbox.tugraz.at)

+//

+

+

+using System;

+using System.Security.Cryptography;

+

+using NUnit.Framework;

+

+namespace MonoTests.System.Security.Cryptography {

+

+	public class SymmetricAlgorithmTest : TestCase {

+		private SymmetricAlgorithm _algo;

+		

+		public SymmetricAlgorithmTest() : base ("MonoTests.System.Security.Cryptography.SymmetricAlgorithmTest testcase") {

+			_algo = null;

+		}

+		public SymmetricAlgorithmTest(String name) : base(name) {

+			_algo = null;

+		}

+		

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(SymmetricAlgorithmTest));

+			}

+		}

+

+		protected override void SetUp() {

+			_algo = SymmetricAlgorithm.Create();

+		}

+

+		private void SetDefaultData() {

+		}

+		

+		public void TestProperties() {

+			Assert("Properties (1)", _algo != null);

+			

+			bool thrown = false;

+			try 

+			{

+				// try setting an illegal blocksize -> must throw an exception

+				_algo.BlockSize = 12;

+			} catch (CryptographicException) {thrown = true;}

+			Assert("Properties (2)", thrown);

+			

+			byte[] key = _algo.Key;

+			Assert("Properties (3)", key != null);

+			

+			thrown = false;

+			try {

+				KeySizes[] keys = _algo.LegalKeySizes;

+				foreach (KeySizes myKey in keys) {

+					for (int i=myKey.MinSize; i<=myKey.MaxSize; i+=myKey.SkipSize) {

+						_algo.KeySize = i;

+					}

+				}

+			} catch (CryptographicException) {thrown=true;}

+			Assert("Properties (4)", !thrown);

+		}

+	}

+}

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/AllTests.cs b/mcs/class/corlib/Test/System.Security.Permissions/AllTests.cs
new file mode 100644
index 00000000000..95782000656
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Permissions/AllTests.cs
@@ -0,0 +1,27 @@
+//

+// MonoTests.System.Security.Permissions.AllTests.cs

+//

+// Author:

+//   Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak II

+//

+

+using System;

+using NUnit.Framework;

+

+namespace MonoTests.System.Security.Permissions {

+        public class AllTests : TestCase {

+                public AllTests(string name) : base(name) {}

+                

+                public static ITest Suite 

+                { 

+                        get 

+                        {

+                                TestSuite suite =  new TestSuite();

+                                suite.AddTest(FileIOPermissionTest.Suite);

+                                return suite;

+                        }

+                }

+        }

+}

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/ChangeLog b/mcs/class/corlib/Test/System.Security.Permissions/ChangeLog
new file mode 100644
index 00000000000..16d10adaf53
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Permissions/ChangeLog
@@ -0,0 +1,18 @@
+2002-06-18  Nick Drochak  <ndrochak@gol.com>

+

+	* FileIOPermissionTest.cs: Use Unix paths if it looks like we are not

+	running the tests on Windows. Need to expand this when we run the

+	tests on Mac OS's (and others I suppose).  Also consolidated some

+	redundant code.

+

+2002-02-09  Nick Drochak  <ndrochak@gol.com>

+

+	* FileIOPermissionTest.cs: Remove intersect test where it was trying

+	to intersect a permission with itself.  This throws an exception

+	with mscorlib.

+

+2002-01-14  Nick Drochak  <ndrochak@gol.com>

+

+	* FileIOPermissionTest.cs: New File.

+	* AllTests.cs: New File.

+

diff --git a/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionTest.cs b/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionTest.cs
new file mode 100644
index 00000000000..e4df95d0fd6
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Permissions/FileIOPermissionTest.cs
@@ -0,0 +1,297 @@
+//

+// MonoTests.System.Security.Permissions.FileIOPermissionTest.cs

+//

+// Author:

+//   Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2001-2002 Nick Drochak II

+//

+// Note: Only Unix and Windows file paths are tested.  To run the tests on Mac OS's

+// search for the "FIXME" notes below and adjust accordingly.

+

+using System;

+using System.Security;

+using System.Security.Permissions;

+using System.IO;

+

+using NUnit.Framework;

+

+namespace MonoTests.System.Security.Permissions {

+

+	public class FileIOPermissionTest : TestCase {

+		

+		public FileIOPermissionTest() : base ("MonoTests.System.Security.Permissions.FileIOPermissionTest testcase") { }

+		public FileIOPermissionTest(String name) : base(name) {

+		}

+		

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(FileIOPermissionTest));

+			}

+		}

+

+		string[] pathArrayGood;

+		string[] pathArrayBad;

+		FileIOPermission p;

+		FileIOPermission p2;

+		string[] pathsInPermission;

+		string[] pathArrayGood2;

+		FileIOPermission unrestricted;

+

+		protected override void SetUp() {

+			p = null;

+			pathsInPermission = null;

+			pathArrayGood = new string[2];

+			pathArrayBad = new string[2];

+			pathArrayGood2 = new string[3];

+			// FIXME: Adjust to run on Mac OS's

+			if (Path.VolumeSeparatorChar == ':') {

+				pathArrayGood[0] = "c:\\temp1";

+				pathArrayGood[1] = "d:\\temp2";

+				pathArrayBad[0] = "c:\\temp1";

+				pathArrayBad[1] = "d:\\temp*";

+				pathArrayGood2[0] = "c:\\temp1";

+				pathArrayGood2[1] = "d:\\temp2";

+				pathArrayGood2[2] = "z:\\something";

+			}

+			else {

+				pathArrayGood[0] = "/temp1";

+				pathArrayGood[1] = "/usr/temp2";

+				pathArrayBad[0] = "/temp1";

+				pathArrayBad[1] = "/usr/temp*";

+				pathArrayGood2[0] = "/temp1";

+				pathArrayGood2[1] = "/usr/temp2";

+				pathArrayGood2[2] = "/usr/bin/something";

+			}

+		}

+

+		private void SetDefaultData() {

+		}

+		

+		public void TestConstructorPermissionState() {

+			p = new FileIOPermission(PermissionState.None);

+			AssertEquals("Should be Restricted", false, p.IsUnrestricted());

+			p = new FileIOPermission(PermissionState.Unrestricted);

+			AssertEquals("Should be Unrestricted", true, p.IsUnrestricted());

+			try{

+				p = new FileIOPermission((PermissionState)77);

+				Fail("Should have thrown an exception on invalid PermissionState");

+			}

+			catch{

+				// we should be here if things are working.  nothing to do

+			}

+		}

+

+		public void TestConstructorString() {

+			try{

+				p = new FileIOPermission(FileIOPermissionAccess.Append, "this path is not rooted");

+				Fail("Should have thrown an exception on path not rooted");

+			}

+			catch{}

+

+			try{

+				p = new FileIOPermission(FileIOPermissionAccess.Append, "<this is not a valid path>");

+				Fail("Should have thrown an exception on invalid characters in path");

+			}

+			catch{}

+			

+			try{

+				p = new FileIOPermission(FileIOPermissionAccess.Append, "\\\\mycomputer\\test*");

+				Fail("Should have thrown an exception on wildcards not allowed in path");

+			}

+			catch{}

+

+			try{

+				p = new FileIOPermission((FileIOPermissionAccess)77, "c:\\temp");

+				Fail("Should have thrown an exception on invalid access value");

+			}

+			catch{}

+

+			string pathToAdd;

+			// FIXME: Adjust to run on Mac OS's

+			if (Path.VolumeSeparatorChar == ':')

+				pathToAdd = "c:\\temp";

+			else

+				pathToAdd = "/temp";

+

+			p = new FileIOPermission(FileIOPermissionAccess.Read, pathToAdd);

+			pathsInPermission = p.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Does not contain correct number of paths. Expected 1 but got: "+pathsInPermission.Length, pathsInPermission.Length == 1);

+			Assert("Does not contain expected path from constructor: "+pathToAdd, pathsInPermission[0] == pathToAdd);

+		}

+

+		public void TestConstructorStringArray() {

+			try{

+				p = new FileIOPermission(FileIOPermissionAccess.Append, pathArrayBad);

+				Fail("Should have thrown an exception on wildcards not allowed in path");

+			}

+			catch{}

+

+			try{

+				p = new FileIOPermission((FileIOPermissionAccess)77, pathArrayGood);

+				Fail("Should have thrown an exception on invalid access value");

+			}

+			catch{}

+

+			p = new FileIOPermission(FileIOPermissionAccess.Read, pathArrayGood);

+			pathsInPermission = p.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Does not contain correct number of paths. Expected 2 but got: "+pathsInPermission.Length, pathsInPermission.Length == 2);

+			foreach (string s in pathsInPermission){

+				Assert("Unexpected path in the Permission: " + s, Array.IndexOf(pathsInPermission, s) >=0);

+			}

+

+		}

+

+		public void TestAddPathListStringArray() {

+			p = new FileIOPermission(FileIOPermissionAccess.Read, pathArrayGood);

+			pathsInPermission = p.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Does not contain correct number of paths. Expected 2 but got: "+pathsInPermission.Length, pathsInPermission.Length == 2);

+			foreach (string s in pathsInPermission){

+				Assert("Unexpected path in the Permission: " + s, Array.IndexOf(pathsInPermission, s) >=0);

+			}

+

+			p.AddPathList(FileIOPermissionAccess.Append, pathArrayGood);

+			pathsInPermission = p.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Should still contain correct number Read paths. Expected 2 but got: "+pathsInPermission.Length, pathsInPermission.Length == 2);

+			foreach (string s in pathsInPermission){

+				Assert("Unexpected path in the Permission: " + s, Array.IndexOf(pathsInPermission, s) >=0);

+			}

+			pathsInPermission = p.GetPathList(FileIOPermissionAccess.Append);

+			Assert("Should contain correct number of Append paths. Expected 2 but got: "+pathsInPermission.Length, pathsInPermission.Length == 2);

+			foreach (string s in pathsInPermission){

+				Assert("Unexpected path in the Permission: " + s, Array.IndexOf(pathsInPermission, s) >=0);

+			}

+		}

+

+		public void TestIntersect() {

+			FileIOPermission intersection;

+

+			p = new FileIOPermission(FileIOPermissionAccess.Read, pathArrayGood);

+			p.AllFiles = FileIOPermissionAccess.Append;

+			p.AllLocalFiles = FileIOPermissionAccess.Write;

+			

+			unrestricted = new FileIOPermission(PermissionState.Unrestricted);

+			

+			intersection = (FileIOPermission)p.Intersect(unrestricted);

+			pathsInPermission = intersection.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Should contain correct number of Read paths. Expected 2 but got: "+pathsInPermission.Length, pathsInPermission.Length == 2);

+			Assert("Should have Append bit in AllFiles.", (intersection.AllFiles & FileIOPermissionAccess.Append) != 0);

+			Assert("Should have Write bit in AllLocalFiles.", (intersection.AllLocalFiles & FileIOPermissionAccess.Write) != 0);

+

+			intersection = (FileIOPermission)unrestricted.Intersect(p);

+			pathsInPermission = intersection.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Should contain correct number of Read paths. Expected 2 but got: "+pathsInPermission.Length, pathsInPermission.Length == 2);

+			Assert("Should have Append bit in AllFiles.", (intersection.AllFiles & FileIOPermissionAccess.Append) != 0);

+			Assert("Should have Write bit in AllLocalFiles.", (intersection.AllLocalFiles & FileIOPermissionAccess.Write) != 0);

+

+			p2 = new FileIOPermission(FileIOPermissionAccess.Append | FileIOPermissionAccess.Read, pathArrayGood2);

+			p2.AllFiles = FileIOPermissionAccess.Append | FileIOPermissionAccess.Write;

+			p2.AllLocalFiles = FileIOPermissionAccess.Write | FileIOPermissionAccess.Read;

+			intersection = (FileIOPermission)p.Intersect(p2);

+			pathsInPermission = intersection.GetPathList(FileIOPermissionAccess.Read);

+			AssertNotNull ("Should have some paths", pathsInPermission);

+			AssertEquals ("Should contain correct number of Read paths", 2, pathsInPermission.Length);

+			AssertEquals ("Should have only Append bit in AllFiles.",  FileIOPermissionAccess.Append, intersection.AllFiles);

+			AssertEquals ("Should have only Write bit in AllLocalFiles.",  FileIOPermissionAccess.Write, intersection.AllLocalFiles);

+

+			intersection = (FileIOPermission)p2.Intersect(p);

+			pathsInPermission = intersection.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Should contain correct number of Read paths. Expected 2 but got: "+pathsInPermission.Length, pathsInPermission.Length == 2);

+			Assert("Should have only Append bit in AllFiles.", intersection.AllFiles == FileIOPermissionAccess.Append);

+			Assert("Should have only Write bit in AllLocalFiles.", intersection.AllLocalFiles == FileIOPermissionAccess.Write);

+		}

+

+		public void TestIsSubsetOf() {

+			unrestricted = new FileIOPermission(PermissionState.Unrestricted);

+			Assert("IsSubsetOf reflective test failed", unrestricted.IsSubsetOf(unrestricted));

+

+			p = new FileIOPermission(FileIOPermissionAccess.Read, pathArrayGood);

+			p.AllFiles = FileIOPermissionAccess.Append;

+			p.AllLocalFiles = FileIOPermissionAccess.Write;

+			Assert("#1 IsSubsetOf reflective test failed", p.IsSubsetOf(p));

+			Assert("#1 IsSubsetOf false test failed", !unrestricted.IsSubsetOf(p));

+			Assert("#1 IsSubsetOf true test failed", p.IsSubsetOf(unrestricted));

+

+			p2 = new FileIOPermission(FileIOPermissionAccess.Append | FileIOPermissionAccess.Read, pathArrayGood2);

+			p2.AllFiles = FileIOPermissionAccess.Append | FileIOPermissionAccess.Write;

+			p2.AllLocalFiles = FileIOPermissionAccess.Write | FileIOPermissionAccess.Read;

+			Assert("#2 IsSubsetOf reflective test failed", p2.IsSubsetOf(p2));

+			Assert("#2 IsSubsetOf true test failed", p.IsSubsetOf(p2));

+			Assert("#2 IsSubsetOf false test failed", !p2.IsSubsetOf(p));

+		}

+

+		public void TestUnion() {

+			FileIOPermission union;

+

+			unrestricted = new FileIOPermission(PermissionState.Unrestricted);

+			p = new FileIOPermission(FileIOPermissionAccess.Read, pathArrayGood);

+			union = (FileIOPermission)unrestricted.Union(p);

+			pathsInPermission = union.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Should get an unrestricted permission", union.IsUnrestricted());

+			Assert("Path list should be empty", pathsInPermission == null);

+

+			union = (FileIOPermission)p.Union(unrestricted);

+			pathsInPermission = union.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Should get an unrestricted permission", union.IsUnrestricted());

+			Assert("Path list should be empty", pathsInPermission == null);

+

+			p2 = new FileIOPermission(FileIOPermissionAccess.Append, pathArrayGood2);

+

+			union = (FileIOPermission)p.Union(p2);

+			pathsInPermission = union.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Path list should have 2 for Read", pathsInPermission.Length == pathArrayGood.Length);

+			pathsInPermission = union.GetPathList(FileIOPermissionAccess.Append);

+			Assert("Path list should have 3 for Append", pathsInPermission.Length == pathArrayGood2.Length);

+

+			union = (FileIOPermission)p2.Union(p);

+			pathsInPermission = union.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Path list should have 2 for Read", pathsInPermission.Length == pathArrayGood.Length);

+			pathsInPermission = union.GetPathList(FileIOPermissionAccess.Append);

+			Assert("Path list should have 3 for Append", pathsInPermission.Length == pathArrayGood2.Length);

+		}

+

+		public void TestFromXML() {

+			p = new FileIOPermission(PermissionState.None);

+			SecurityElement esd;

+

+			esd = new SecurityElement("IPermission");

+			esd.AddAttribute("class", "FileIOPermission");

+			esd.AddAttribute("version", "1");

+			esd.AddAttribute("Unrestricted", "true");

+			p.FromXml(esd);

+			Assert("Should get an unrestricted permission", p.IsUnrestricted());

+

+			esd = new SecurityElement("IPermission");

+			esd.AddAttribute("class", "FileIOPermission");

+			esd.AddAttribute("version", "1");

+			// FIXME: Adjust to run on Mac OS's

+			if (Path.VolumeSeparatorChar == ':') {

+				esd.AddAttribute("Read", "c:\\temp;d:\\temp2");

+				esd.AddAttribute("Write", "c:\\temp;d:\\temp2;z:\\temp3");

+			}

+			else {

+				esd.AddAttribute("Read", "/temp;/usr/temp2");

+				esd.AddAttribute("Write", "/temp;/usr/temp2;/usr/bin/temp3");

+			}

+			p = new FileIOPermission(PermissionState.None);

+			p.FromXml(esd);

+			pathsInPermission = p.GetPathList(FileIOPermissionAccess.Read);

+			Assert("Path list should have 2 for Read", pathsInPermission.Length == 2);

+			pathsInPermission = p.GetPathList(FileIOPermissionAccess.Write);

+			Assert("Path list should have 2 for Write", pathsInPermission.Length == 3);

+		}

+

+		public void TestToXML() {

+			SecurityElement esd;

+			string read;

+			p = new FileIOPermission(FileIOPermissionAccess.Read, pathArrayGood);

+			esd = p.ToXml();

+			Assert("Esd tag incorrect", esd.Tag == "IPermission");

+			Assert("Esd version incorrect", (String)esd.Attributes["version"] == "1");

+			read = (String)esd.Attributes["Read"];

+			pathsInPermission = read.Split(';');

+			Assert("Path list should have 2 for Read", pathsInPermission.Length == 2);

+		}

+	}

+}

+

diff --git a/mcs/class/corlib/Test/System.Security.Policy/AllTests.cs b/mcs/class/corlib/Test/System.Security.Policy/AllTests.cs
new file mode 100644
index 00000000000..a0632fdd70c
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Policy/AllTests.cs
@@ -0,0 +1,27 @@
+//

+// MonoTests.System.Security.Policy.AllTests.cs

+//

+// Author:

+//   Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak II

+//

+

+using System;

+using NUnit.Framework;

+

+namespace MonoTests.System.Security.Policy {

+        public class AllTests : TestCase {

+                public AllTests(string name) : base(name) {}

+                

+                public static ITest Suite 

+                { 

+                        get 

+                        {

+                                TestSuite suite =  new TestSuite();

+                                suite.AddTest(CodeGroupTest.Suite);

+                                return suite;

+                        }

+                }

+        }

+}

diff --git a/mcs/class/corlib/Test/System.Security.Policy/ChangeLog b/mcs/class/corlib/Test/System.Security.Policy/ChangeLog
new file mode 100644
index 00000000000..51b9aae2eab
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Policy/ChangeLog
@@ -0,0 +1,15 @@
+2002-02-10  Nick Drochak  <ndrochak@gol.com>

+

+	* AllTests.cs: Add new file.

+

+2002-02-07  Nick Drochak  <ndrochak@gol.com>

+

+	* CodeGroupTest.cs: Tests everything except the (To|From)Xml methods.

+

+2002-02-01  Nick Drochak  <ndrochak@gol.com>

+

+	* CodeGroupTest.cs: Still not done, checking in now just in case

+

+2002-01-30  Nick Drochak  <ndrochak@gol.com>

+

+	* CodeGroupTest.cs: New File.  Not done, but checking in now just in case
\ No newline at end of file
diff --git a/mcs/class/corlib/Test/System.Security.Policy/CodeGroupTest.cs b/mcs/class/corlib/Test/System.Security.Policy/CodeGroupTest.cs
new file mode 100644
index 00000000000..73415017c3d
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security.Policy/CodeGroupTest.cs
@@ -0,0 +1,248 @@
+//

+// MonoTests.System.Security.Policy.CodeGroupTest

+//

+// Author(s):

+//   Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak, All rights reserved.
+

+using NUnit.Framework;

+using System;

+using System.Security;

+using System.Security.Policy;

+using System.Security.Permissions;

+

+namespace MonoTests.System.Security.Policy

+{

+

+	public class CodeGroupTest : TestCase 

+	{

+		

+		public CodeGroupTest( string name ): base(name)

+		{

+		}

+		

+		public CodeGroupTest() : base("CodeGroupTest")

+		{

+		}

+

+		public static ITest Suite

+		{

+			get

+			{

+				return new TestSuite(typeof(CodeGroupTest));

+			}

+		}

+

+		protected override void SetUp()

+		{

+		}

+

+		public class MyCodeGroup : CodeGroup

+		{

+			public MyCodeGroup(IMembershipCondition membershipCondition,
+				PolicyStatement policy) :base(membershipCondition, policy)
+			{
+			}
+
+			public override CodeGroup Copy()

+			{

+				return this;

+			}

+

+			public override string MergeLogic

+			{

+				get

+				{

+					return "";

+				}

+			}

+

+			public override PolicyStatement Resolve(	Evidence evidence)

+			{

+				return (PolicyStatement)null;

+			}

+

+			public override CodeGroup ResolveMatchingCodeGroups(Evidence evidence)

+			{

+				return this;

+			}

+		}

+

+		public void TestConstructorExceptions()

+		{

+			MyCodeGroup cg;

+			try

+			{

+				cg = new MyCodeGroup(null, null);

+				Fail("Constructor should throw exception on null paramters");

+			}

+			catch(Exception e)

+			{

+				Assert("Should have caught an ArgumentNull Exception", e is ArgumentNullException);

+			}

+		}

+

+		public void TestConstructor()

+		{

+			MyCodeGroup cg = null;

+			try

+			{

+				cg = new MyCodeGroup(new AllMembershipCondition(), new PolicyStatement(new PermissionSet(PermissionState.None)));

+				Assert("PolicyStatement property not set correctly by constructor.", cg.PolicyStatement != null);

+				Assert("MembershipCondition property not set correctly by constructor.", cg.MembershipCondition != null);

+			}

+			catch(Exception e)

+			{

+				Fail("Constructor failed. Exception caught was: " + e.ToString());

+			}

+		}

+

+		public void TestDescriptionProperty()

+		{

+			MyCodeGroup cg = null;

+			const string description = "Test Description";

+			cg = new MyCodeGroup(new AllMembershipCondition(), new PolicyStatement(new PermissionSet(PermissionState.None)));

+			cg.Description = description;

+			Assert("Description not the expected value", cg.Description == description);

+		}

+

+		public void TestNameProperty()

+		{

+			MyCodeGroup cg = null;

+			const string name = "Test Name";

+			cg = new MyCodeGroup(new AllMembershipCondition(), new PolicyStatement(new PermissionSet(PermissionState.None)));

+			cg.Name = name;

+			Assert("Description not the expected value", cg.Name == name);

+		}

+

+		public void TestChildren()

+		{

+			MyCodeGroup cg = null;

+			cg = new MyCodeGroup(new AllMembershipCondition(), new PolicyStatement(new PermissionSet(PermissionState.None)));

+			cg.AddChild(new MyCodeGroup(new AllMembershipCondition(), new PolicyStatement(new PermissionSet(PermissionState.Unrestricted))));

+			Assert("Unexpected number of children", cg.Children.Count == 1);

+		}

+

+		public void TestAttributeStringProperty()

+		{

+			MyCodeGroup cg = null;

+			PolicyStatementAttribute psa = PolicyStatementAttribute.LevelFinal;

+			PolicyStatement ps = new PolicyStatement(new PermissionSet(PermissionState.None));

+			ps.Attributes = psa;

+			cg = new MyCodeGroup(new AllMembershipCondition(), ps);

+			AssertEquals("AttributeString", psa.ToString(), cg.AttributeString);

+		}

+

+		public void TestPermissionSetNameProperty()

+		{

+			MyCodeGroup cg = null;

+			const string ps_Name = "TestName";

+			PolicyStatement ps = new PolicyStatement(new NamedPermissionSet(ps_Name));

+			cg = new MyCodeGroup(new AllMembershipCondition(), ps);

+			AssertEquals("AttributeString", ps_Name, cg.PermissionSetName);

+		}

+

+		public void TestEquals()

+		{

+			MyCodeGroup cg = null;

+			MyCodeGroup cg2 = null;

+			const string ps_Name = "TestName";

+			PolicyStatement ps = new PolicyStatement(new NamedPermissionSet(ps_Name));

+			cg = new MyCodeGroup(new AllMembershipCondition(), ps);

+			cg.Name = "SomeName";

+			cg.Description = "Some Description";

+			bool isEquals;

+			isEquals = cg.Equals(cg);

+			

+			isEquals = cg.Equals("Not Equal to this");

+			Assert("CodeGroup should not be equal to a non-CodeGroup type", !isEquals);

+

+			cg2 = new MyCodeGroup(new AllMembershipCondition(), ps);

+			cg2.Name = "SomeOtherName";

+			cg2.Description = "Some Other Description";

+

+			isEquals = cg.Equals(cg2);

+			Assert("CodeGroup should not be equal when Name or Description is different", !isEquals);

+

+			cg2 = new MyCodeGroup(new ApplicationDirectoryMembershipCondition(), ps);

+			cg2.Name = cg.Name;

+			cg2.Description = cg.Description;

+			isEquals = cg.Equals(cg2);

+			Assert("CodeGroup should not be equal when Membership Condition is different", !isEquals);

+		}

+

+		public void TestEqualsWithChildren()

+		{

+			MyCodeGroup cg = null;

+			MyCodeGroup cg2 = null;

+			MyCodeGroup cgChild = null;

+			const string ps_Name = "TestName";

+			bool isEquals;

+

+			PolicyStatement ps = new PolicyStatement(new NamedPermissionSet(ps_Name));

+			cg = new MyCodeGroup(new AllMembershipCondition(), ps);

+			cg.Name = "SomeName";

+			cg.Description = "Some Description";

+

+			cgChild = new MyCodeGroup(new ApplicationDirectoryMembershipCondition(), ps);

+			cgChild.Name = "ChildName";

+			cgChild.Description = "Child Descripiton";

+

+			cg.AddChild(cgChild);

+

+			cg2 = new MyCodeGroup(cg.MembershipCondition, cg.PolicyStatement);

+			cg2.Name = cg.Name;

+			cg2.Description = cg.Description;

+

+			isEquals = cg.Equals(cg2);

+			Assert("Should be equal when Children are ignored", isEquals);

+

+			isEquals = cg.Equals(cg2, true);

+			Assert("Should not be equal when Child count is different", !isEquals);

+

+			cg2.AddChild(cgChild);

+			isEquals = cg2.Equals(cg, true);

+			Assert("Should be equal when children are equal", isEquals);

+		}

+

+	

+		public void TestRemoveChild()

+		{

+			MyCodeGroup cg = null;

+			MyCodeGroup cgChild = null;

+			MyCodeGroup cgChild2 = null;

+			const string ps_Name = "TestName";

+

+			PolicyStatement ps = new PolicyStatement(new NamedPermissionSet(ps_Name));

+			cg = new MyCodeGroup(new AllMembershipCondition(), ps);

+			cg.Name = "SomeName";

+			cg.Description = "Some Description";

+

+			cgChild = new MyCodeGroup(new ApplicationDirectoryMembershipCondition(), ps);

+			cgChild.Name = "ChildName";

+			cgChild.Description = "Child Descripiton";

+

+			cg.AddChild(cgChild);

+

+			cgChild2 = new MyCodeGroup(new ApplicationDirectoryMembershipCondition(), ps);

+			cgChild2.Name = "ChildName2";

+			cgChild2.Description = "Child Descripiton 2";

+

+			cg.AddChild(cgChild2);

+

+			AssertEquals("Should be two children before the call to Remove()", 2, cg.Children.Count);

+

+			cg.RemoveChild(cgChild);

+

+			AssertEquals("Remaing child does not have correct name", "ChildName2", ((CodeGroup)cg.Children[0]).Name);

+			try

+			{

+				cg.RemoveChild(cgChild);

+				Fail("Should have throw error on trying to remove non-existant child");

+			}

+			catch{}

+		}

+	}  // public class CodeGroupTest 

+

+}  // namespace MonoTests.System.Security.Policy
\ No newline at end of file
diff --git a/mcs/class/corlib/Test/System.Security/AllTests.cs b/mcs/class/corlib/Test/System.Security/AllTests.cs
new file mode 100644
index 00000000000..5f32c30411d
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security/AllTests.cs
@@ -0,0 +1,27 @@
+//
+// TestSuite.System.Security.AllSecurityTests.cs
+//
+// Lawrence Pit <loz@cable.a2000.nl>
+// 
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System.Security {
+        /// <summary>
+        ///   Combines all available unit tests into one test suite.
+        /// </summary>
+        public class AllTests : TestCase {
+
+                public AllTests (string name) : base (name) {}
+                
+                public static ITest Suite { 
+                        get {
+                                TestSuite suite = new TestSuite ();
+                                suite.AddTest (SecurityElementTest.Suite);
+				return suite;
+                        }
+                }
+        }
+}
+
diff --git a/mcs/class/corlib/Test/System.Security/ChangeLog b/mcs/class/corlib/Test/System.Security/ChangeLog
new file mode 100644
index 00000000000..609aa291d8e
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security/ChangeLog
@@ -0,0 +1,10 @@
+2002-06-11  Nick Drochak  <ndrochak@gol.com>
+
+	* SecurityElementTest.cs: Catch and report unexpected exceptions.
+
+2002-04-27  Lawrence Pit <loz@cable.a2000.nl>
+
+	* ChangeLog: added
+	* AllTests.cs: added
+	* SecurityElementTest.cs: added
+
diff --git a/mcs/class/corlib/Test/System.Security/SecurityElementTest.cs b/mcs/class/corlib/Test/System.Security/SecurityElementTest.cs
new file mode 100644
index 00000000000..d4f58882a01
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Security/SecurityElementTest.cs
@@ -0,0 +1,228 @@
+//

+// SecurityElementTest.cs - NUnit Test Cases for System.Security.SecurityElement

+//

+// Author:

+//   Lawrence Pit (loz@cable.a2000.nl)

+//

+

+using NUnit.Framework;

+using System;

+using System.Collections;

+using System.Security;

+

+namespace MonoTests.System.Security

+{

+

+public class SecurityElementTest : TestCase

+{

+	SecurityElement elem;

+	

+        public SecurityElementTest () :

+                base ("[MonoTests.System.Security.SecurityElementTest]") {}

+

+        public SecurityElementTest (string name) : base (name) {}

+

+        protected override void SetUp () 

+        {

+		elem = CreateElement ();

+	}

+

+        protected override void TearDown () {}

+        

+        private SecurityElement CreateElement ()

+        {

+		SecurityElement elem = new SecurityElement ("IPermission");

+		elem.AddAttribute ("class", "System");

+		elem.AddAttribute ("version", "1");

+		

+		SecurityElement child = new SecurityElement ("ConnectAccess");		

+		elem.AddChild (child);

+		

+		SecurityElement grandchild = new SecurityElement ("ENDPOINT", "some text");		

+		grandchild.AddAttribute ("transport", "All");

+		grandchild.AddAttribute ("host", "localhost");

+		grandchild.AddAttribute ("port", "8080");

+		child.AddChild (grandchild);

+

+		SecurityElement grandchild2 = new SecurityElement ("ENDPOINT");		

+		grandchild2.AddAttribute ("transport", "Tcp");

+		grandchild2.AddAttribute ("host", "www.ximian.com");

+		grandchild2.AddAttribute ("port", "All");

+		child.AddChild (grandchild2);		

+		

+		return elem;		

+	}

+

+        public static ITest Suite

+        {

+                get {

+                        return new TestSuite (typeof (SecurityElementTest));

+                }

+        }

+

+        public void TestConstructors ()

+        {

+		

+	}

+	

+	public void TestAddAttribute ()

+	{

+		try {

+			elem.AddAttribute (null, "valid");

+			Fail ("#1");

+		} catch (ArgumentNullException) { }

+		try {

+			elem.AddAttribute ("valid", null);

+			Fail ("#2");

+		} catch (ArgumentNullException) { }

+		try {

+			elem.AddAttribute ("<invalid>", "valid");

+			Fail ("#3");

+		} catch (ArgumentException) { }

+		try {

+			elem.AddAttribute ("valid", "invalid\"");

+			Fail ("#4");

+		} catch (ArgumentException) { }

+		try {

+			elem.AddAttribute ("valid", "valid\'");			

+		} catch (ArgumentException) { Fail ("#5"); }

+		try {			

+			elem.AddAttribute ("valid", "valid&");

+			Fail ("#6");

+			// in xml world this is actually not considered valid

+			// but it is by MS.Net

+		} catch (ArgumentException) { }

+		try {

+			elem.AddAttribute ("valid", "<invalid>");

+			Fail ("#7"); 

+		} catch (ArgumentException) { }

+	}

+	

+	public void TestAttributes ()

+	{

+		Hashtable h = elem.Attributes;

+		

+		/*

+		// this will result in an InvalidCastException on MS.Net

+		// I have no clue why

+		

+		h.Add ("<invalid>", "valid");

+		try {

+			elem.Attributes = h;

+			Fail ("#1");

+		} catch (ArgumentException) { }

+                */

+                

+		h = elem.Attributes;

+		h.Add ("valid", "\"invalid\"");

+		try {

+			elem.Attributes = h;

+			Fail ("#2");

+		} catch (ArgumentException) { }

+		

+		h = elem.Attributes;

+		h.Add ("foo", "bar");

+		Assert ("#3", elem.Attributes.Count != h.Count);

+		

+		elem.Attributes = h;

+		Assert ("#4", elem.Attribute ("foo") != null);

+	}

+	

+	public void TestEqual ()

+	{

+		int iTest = 0;

+		try {

+			SecurityElement elem2 = CreateElement ();

+			iTest++;

+			Assert ("#1", elem.Equal (elem2));

+			iTest++;

+			SecurityElement child = (SecurityElement) elem2.Children [0];

+			iTest++;

+			child = (SecurityElement) child.Children [1];

+			iTest++;

+			child.Text = "some text";

+			iTest++;

+			Assert ("#2", !elem.Equal (elem2));

+		} catch (Exception e) {

+			Fail ("Unexpected Exception at iTest = " + iTest + ". e = " + e);

+		}

+	}

+	

+	public void TestEscape ()

+	{

+		AssertEquals ("#1", SecurityElement.Escape ("foo<>\"'& bar"), "foo&lt;&gt;&quot;&apos;&amp; bar");

+	}

+	

+	public void TestIsValidAttributeName ()

+	{

+		Assert ("#1", !SecurityElement.IsValidAttributeName ("x x")); 

+		Assert ("#2", !SecurityElement.IsValidAttributeName ("x<x")); 

+		Assert ("#3", !SecurityElement.IsValidAttributeName ("x>x"));

+		Assert ("#4", SecurityElement.IsValidAttributeName ("x\"x"));

+		Assert ("#5", SecurityElement.IsValidAttributeName ("x'x"));

+		Assert ("#6", SecurityElement.IsValidAttributeName ("x&x"));			

+	}

+

+	public void TestIsValidAttributeValue ()

+	{

+		Assert ("#1", SecurityElement.IsValidAttributeValue ("x x")); 

+		Assert ("#2", !SecurityElement.IsValidAttributeValue ("x<x")); 

+		Assert ("#3", !SecurityElement.IsValidAttributeValue ("x>x"));

+		Assert ("#4", !SecurityElement.IsValidAttributeValue ("x\"x"));

+		Assert ("#5", SecurityElement.IsValidAttributeValue ("x'x"));

+		Assert ("#6", SecurityElement.IsValidAttributeValue ("x&x"));		

+	}

+

+	public void TestIsValidTag ()

+	{

+		Assert ("#1", !SecurityElement.IsValidTag ("x x")); 

+		Assert ("#2", !SecurityElement.IsValidTag ("x<x")); 

+		Assert ("#3", !SecurityElement.IsValidTag ("x>x"));

+		Assert ("#4", SecurityElement.IsValidTag ("x\"x"));

+		Assert ("#5", SecurityElement.IsValidTag ("x'x"));

+		Assert ("#6", SecurityElement.IsValidTag ("x&x"));

+	}

+

+	public void TestIsValidText ()

+	{

+		Assert ("#1", SecurityElement.IsValidText ("x x")); 

+		Assert ("#2", !SecurityElement.IsValidText ("x<x")); 

+		Assert ("#3", !SecurityElement.IsValidText ("x>x"));

+		Assert ("#4", SecurityElement.IsValidText ("x\"x"));

+		Assert ("#5", SecurityElement.IsValidText ("x'x"));

+		Assert ("#6", SecurityElement.IsValidText ("x&x"));

+	}

+	

+	public void TestSearchForChildByTag ()

+	{

+		SecurityElement child = null;

+		try {

+			child = elem.SearchForChildByTag (null);

+			Fail ("#1 should have thrown an ArgumentNullException");

+		} catch (ArgumentNullException) { }

+

+		child = elem.SearchForChildByTag ("doesnotexist");

+		AssertEquals ("#2", child, null);

+		

+		child = elem.SearchForChildByTag ("ENDPOINT");

+		AssertEquals ("#3", child, null);

+		

+		child = (SecurityElement) elem.Children [0];

+		child = child.SearchForChildByTag ("ENDPOINT");

+		AssertEquals ("#4", child.Attribute ("transport"), "All");

+	}

+	

+	public void TestSearchForTextOfTag ()

+	{

+		try {

+			string t1 = elem.SearchForTextOfTag (null);

+			Fail ("#1 should have thrown an ArgumentNullException");

+		} catch (ArgumentNullException) { }

+		

+		string t2 = elem.SearchForTextOfTag ("ENDPOINT");

+		AssertEquals ("#2", t2, "some text");

+	}

+}

+

+}

+

diff --git a/mcs/class/corlib/Test/System.Text/ASCIIEncodingTest.cs b/mcs/class/corlib/Test/System.Text/ASCIIEncodingTest.cs
new file mode 100755
index 00000000000..971a37fc633
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Text/ASCIIEncodingTest.cs
@@ -0,0 +1,192 @@
+// ASCIIEncodingTest - NUnit Test Cases for the System.Text.ASCIIEncoding class

+// 

+// Author: Mike Kestner <mkestner@speakeasy.net>

+//

+// <c> 2002 Mike Kestner

+

+using NUnit.Framework;

+using System.Text;

+using System;

+

+

+namespace MonoTests.System.Text {

+

+	public class ASCIIEncodingTest : TestCase {

+

+		private char[] testchars;

+		private byte[] testbytes;

+

+		public static ITest Suite {

+			get {

+				TestSuite suite = new TestSuite ();

+				suite.AddTest (new ASCIIEncodingTest ("TestGetBytes1"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetBytes2"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetBytes3"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetBytes4"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetBytes5"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetBytes6"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetChars1"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetChars2"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetChars3"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetChars4"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetString1"));

+				suite.AddTest (new ASCIIEncodingTest ("TestGetString2"));

+				suite.AddTest (new ASCIIEncodingTest ("TestDecoder"));

+				suite.AddTest (new ASCIIEncodingTest ("TestEncoder"));

+				return suite;

+			}

+		}

+

+        	public ASCIIEncodingTest (string name) : base (name) {}

+

+		protected override void SetUp ()

+		{

+			testchars = new char[4];

+			testchars[0] = 'T';

+			testchars[1] = 'e';

+			testchars[2] = 's';

+			testchars[3] = 't';

+			testbytes = new byte[4];

+			testbytes[0] = (byte) 'T';

+			testbytes[1] = (byte) 'e';

+			testbytes[2] = (byte) 's';

+			testbytes[3] = (byte) 't';

+		}

+

+		// Test GetBytes(char[])

+		public void TestGetBytes1 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			byte[] bytes = ascii_encoding.GetBytes(testchars);

+			for (int i = 0; i < testchars.Length; i++)

+                		AssertEquals (testchars[i], (char) bytes[i]);

+        	}

+

+		// Test GetBytes(char[], int, int)

+		public void TestGetBytes2 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			byte[] bytes = ascii_encoding.GetBytes(testchars, 1, 1);

+                	AssertEquals (1, bytes.Length);

+                	AssertEquals (testchars[1], (char) bytes[0]);

+        	}

+

+		// Test non-ASCII char in char[]

+		public void TestGetBytes3 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			testchars[2] = (char) 0x80;

+			byte[] bytes = ascii_encoding.GetBytes(testchars);

+                	AssertEquals ('T', (char) bytes[0]);

+                	AssertEquals ('e', (char) bytes[1]);

+                	AssertEquals ('?', (char) bytes[2]);

+                	AssertEquals ('t', (char) bytes[3]);

+        	}

+

+		// Test GetBytes(char[], int, int, byte[], int)

+		public void TestGetBytes4 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			byte[] bytes = new Byte[1];

+			int cnt = ascii_encoding.GetBytes(testchars, 1, 1, bytes, 0);

+                	AssertEquals (1, cnt);

+                	AssertEquals (testchars[1], (char) bytes[0]);

+        	}

+

+		// Test GetBytes(string, int, int, byte[], int)

+		public void TestGetBytes5 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			byte[] bytes = new Byte[1];

+			int cnt = ascii_encoding.GetBytes("Test", 1, 1, bytes, 0);

+                	AssertEquals ('e', (char) bytes[0]);

+        	}

+

+		// Test GetBytes(string)

+		public void TestGetBytes6 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			byte[] bytes = ascii_encoding.GetBytes("Test");

+			for (int i = 0; i < testchars.Length; i++)

+                		AssertEquals (testchars[i], (char) bytes[i]);

+        	}

+

+		// Test GetChars(byte[])

+		public void TestGetChars1 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			char[] chars = ascii_encoding.GetChars(testbytes);

+			for (int i = 0; i < testbytes.Length; i++)

+                		AssertEquals (testbytes[i], (byte) chars[i]);

+        	}

+

+		// Test GetChars(byte[], int, int)

+		public void TestGetChars2 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			char[] chars = ascii_encoding.GetChars(testbytes, 1, 1);

+                	AssertEquals (1, chars.Length);

+                	AssertEquals (testbytes[1], (byte) chars[0]);

+        	}

+

+		// Test non-ASCII char in byte[]

+		public void TestGetChars3 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			testbytes[2] = 0x80;

+			char[] chars = ascii_encoding.GetChars(testbytes);

+                	AssertEquals ('T', chars[0]);

+                	AssertEquals ('e', chars[1]);

+                	AssertEquals ('?', chars[2]);

+                	AssertEquals ('t', chars[3]);

+        	}

+

+		// Test GetChars(byte[], int, int, char[], int)

+		public void TestGetChars4 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			char[] chars = new char[1];

+			int cnt = ascii_encoding.GetChars(testbytes, 1, 1, chars, 0);

+                	AssertEquals (1, cnt);

+                	AssertEquals (testbytes[1], (byte) chars[0]);

+        	}

+

+		// Test GetString(char[])

+		public void TestGetString1 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			string str = ascii_encoding.GetString(testbytes);

+                	AssertEquals ("Test", str);

+        	}

+

+		// Test GetString(char[], int, int)

+		public void TestGetString2 () 

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			string str = ascii_encoding.GetString(testbytes, 1, 2);

+                	AssertEquals ("es", str);

+        	}

+

+		// Test Decoder

+		public void TestDecoder ()

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			char[] chars = new char[1];

+			int cnt = ascii_encoding.GetDecoder().GetChars(testbytes, 1, 1, chars, 0);

+                	AssertEquals (1, cnt);

+                	AssertEquals (testbytes[1], (byte) chars[0]);

+		}

+

+		// Test Decoder

+		public void TestEncoder ()

+		{

+                	Encoding ascii_encoding = Encoding.ASCII;

+			byte[] bytes = new Byte[1];

+			int cnt = ascii_encoding.GetEncoder().GetBytes(testchars, 1, 1, bytes, 0, false);

+                	AssertEquals (1, cnt);

+                	AssertEquals (testchars[1], (char) bytes[0]);

+		}

+

+	}

+

+}

diff --git a/mcs/class/corlib/Test/System.Text/AllTests.cs b/mcs/class/corlib/Test/System.Text/AllTests.cs
new file mode 100644
index 00000000000..1069b3a3f91
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Text/AllTests.cs
@@ -0,0 +1,30 @@
+// Testsuite.System.AllSystemTests.cs
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System.Text {
+        /// <summary>
+        ///   Combines all available unit tests into one test suite.
+        /// </summary>
+        public class AllTests : TestCase {
+                public AllTests(string name) : base(name) {}
+                
+                public static ITest Suite 
+                { 
+                        get 
+                        {
+                                TestSuite suite =  new TestSuite();
+                                //suite.AddTest(StringBuilderTest.Suite);
+                                suite.AddTest(ASCIIEncodingTest.Suite);
+                                return suite;
+                        }
+                }
+        }
+}
+
diff --git a/mcs/class/corlib/Test/System.Text/ChangeLog b/mcs/class/corlib/Test/System.Text/ChangeLog
new file mode 100644
index 00000000000..46c490e50a2
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Text/ChangeLog
@@ -0,0 +1,13 @@
+2002-03-17  Mike Kestner  <mkestner@speakeasy.net>

+

+	* ASCIIEncodingTest.cs : New suite for ASCIIEncoding.

+	* AllTests.cs : Add the new suite.

+

+2002-02-10  Nick Drochak  <ndrochak@gol.com>

+

+	* AllTests.cs: Remove StringBuilderTest suite.  There's a major failure

+	when it's included and the test errors aren't displayed. 

+

+2002-02-09  Nick Drochak  <ndrochak@gol.com>

+

+	* StringBuilderTest.cs: Fixed tests that were failing against mscorlib. 

diff --git a/mcs/class/corlib/Test/System.Text/StringBuilderTest.cs b/mcs/class/corlib/Test/System.Text/StringBuilderTest.cs
new file mode 100644
index 00000000000..9f2677e1f1c
--- /dev/null
+++ b/mcs/class/corlib/Test/System.Text/StringBuilderTest.cs
@@ -0,0 +1,238 @@
+//

+// StringBuilderTest.dll - NUnit Test Cases for the System.Text.StringBuilder class

+// 

+// Author: Marcin Szczepanski (marcins@zipworld.com.au)

+//

+// NOTES: I've also run all these tests against the MS implementation of 

+// System.Text.StringBuilder to confirm that they return the same results

+// and they do.

+//

+// TODO: Add tests for the AppendFormat methods once the AppendFormat methods

+// are implemented in the StringBuilder class itself

+//

+// TODO: Potentially add more variations on Insert / Append tests for all the

+// possible types.  I don't really think that's necessary as they all

+// pretty much just do .ToString().ToCharArray() and then use the Append / Insert

+// CharArray function.  The ToString() bit for each type should be in the unit

+// tests for those types, and the unit test for ToCharArray should be in the 

+// string test type.  If someone wants to add those tests here for completness 

+// (and some double checking) then feel free :)

+//

+

+using NUnit.Framework;

+using System.Text;

+using System;

+

+namespace MonoTests.System.Text {

+

+public class StringBuilderTest : TestCase {

+

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(StringBuilderTest));

+			}

+		}

+

+        public StringBuilderTest( string name ) : base(name) { }

+

+

+		private StringBuilder sb;

+

+		public void TestConstructor1() 

+		{

+			// check the parameterless ctor

+            sb = new StringBuilder();

+			AssertEquals(String.Empty, sb.ToString());

+			AssertEquals(0, sb.Length);

+			AssertEquals(16, sb.Capacity);

+		}

+

+		public void TestConstructor2() 

+		{

+			// check ctor that specifies the capacity

+			sb = new StringBuilder(10);

+			AssertEquals(String.Empty, sb.ToString());

+			AssertEquals(0, sb.Length);

+			// check that capacity is not less than default

+			AssertEquals(10, sb.Capacity);

+

+			sb = new StringBuilder(42);

+			AssertEquals(String.Empty, sb.ToString());

+			AssertEquals(0, sb.Length);

+			// check that capacity is set

+			AssertEquals(42, sb.Capacity);

+		}

+		

+		public void TestConstructor3() {

+			// check ctor that specifies the capacity & maxCapacity

+			sb = new StringBuilder(444, 1234);

+			AssertEquals(String.Empty, sb.ToString());

+			AssertEquals(0, sb.Length);

+			AssertEquals(444, sb.Capacity);

+			AssertEquals(1234, sb.MaxCapacity);

+		}

+

+		public void TestConstructor4() 

+		{

+			// check for exception in ctor that specifies the capacity & maxCapacity

+			try {

+				sb = new StringBuilder(9999, 15);

+			}

+			catch (ArgumentOutOfRangeException) {

+				return;

+			}

+			// if we didn't catch an exception, then we have a problem Houston.

+			NUnit.Framework.Assertion.Fail("Capacity exeeds MaxCapacity");

+		}

+

+	public void TestConstructor5() {

+		String someString = null;

+		sb = new StringBuilder(someString);

+		AssertEquals("Should be empty string", String.Empty, sb.ToString());

+	}

+

+	public void TestConstructor6() {

+		// check for exception in ctor that prevents startIndex less than zero

+		try {

+			String someString = "someString";

+			sb = new StringBuilder(someString, -1, 3, 18);

+		}

+		catch (ArgumentOutOfRangeException) {

+			return;

+		}

+		// if we didn't catch an exception, then we have a problem Houston.

+		NUnit.Framework.Assertion.Fail("StartIndex not allowed to be less than zero.");

+	}

+

+	public void TestConstructor7() {

+		// check for exception in ctor that prevents length less than zero

+		try {

+			String someString = "someString";

+			sb = new StringBuilder(someString, 2, -222, 18);

+		}

+		catch (ArgumentOutOfRangeException) {

+			return;

+		}

+		// if we didn't catch an exception, then we have a problem Houston.

+		NUnit.Framework.Assertion.Fail("Length not allowed to be less than zero.");

+	}

+

+	public void TestConstructor8() {

+		// check for exception in ctor that ensures substring is contained in given string

+		// check that startIndex is not too big

+		try {

+			String someString = "someString";

+			sb = new StringBuilder(someString, 10000, 4, 18);

+		}

+		catch (ArgumentOutOfRangeException) {

+			return;

+		}

+		// if we didn't catch an exception, then we have a problem Houston.

+		NUnit.Framework.Assertion.Fail("StartIndex and length must refer to a location within the string.");

+	}

+

+	public void TestConstructor9() {

+		// check for exception in ctor that ensures substring is contained in given string

+		// check that length doesn't go beyond end of string

+		try {

+			String someString = "someString";

+			sb = new StringBuilder(someString, 4, 4000, 18);

+		}

+		catch (ArgumentOutOfRangeException) {

+			return;

+		}

+		// if we didn't catch an exception, then we have a problem Houston.

+		NUnit.Framework.Assertion.Fail("StartIndex and length must refer to a location within the string.");

+	}

+

+	public void TestConstructor10() {

+		// check that substring is taken properly and made into a StringBuilder

+		String someString = "someString";

+		sb = new StringBuilder(someString, 4, 6, 18);

+		string expected = "String";

+		AssertEquals( expected, sb.ToString());

+	}

+

+	public void TestAppend() {

+                StringBuilder sb = new StringBuilder( "Foo" );

+                sb.Append( "Two" );

+                string expected = "FooTwo";

+                AssertEquals( expected, sb.ToString() );

+        }

+

+        public void TestInsert() {

+                StringBuilder sb = new StringBuilder();

+

+                AssertEquals( String.Empty, sb.ToString() ); 

+                        /* Test empty StringBuilder conforms to spec */

+

+                sb.Insert( 0, "Foo" ); /* Test insert at start of empty string */

+

+                AssertEquals( "Foo", sb.ToString() );

+

+                sb.Insert( 1, "!!" ); /* Test insert not at start of string */

+

+                AssertEquals( "F!!oo", sb.ToString() );

+

+                sb.Insert( 5, ".." ); /* Test insert at end of string */

+

+                AssertEquals( "F!!oo..", sb.ToString() );

+        

+                sb.Insert( 0, 1234 ); /* Test insert of a number (at start of string) */

+                

+				// FIX: Why does this test fail?

+                //AssertEquals( "1234F!!oo..", sb.ToString() );

+                

+                sb.Insert( 5, 1.5 ); /* Test insert of a decimal (and end of string) */

+                

+				// FIX: Why does this test fail?

+				//AssertEquals( "1234F1.5!!oo..", sb.ToString() );

+

+                sb.Insert( 4, 'A' ); /* Test char insert in middle of string */

+

+				// FIX: Why does this test fail?

+				//AssertEquals( "1234AF1.5!!oo..", sb.ToString() );

+

+        }

+

+        public void TestReplace() {

+                StringBuilder sb = new StringBuilder( "Foobarbaz" );

+

+                sb.Replace( "bar", "!!!" );             /* Test same length replace in middle of string */

+                

+                AssertEquals( "Foo!!!baz", sb.ToString() );

+

+                sb.Replace( "Foo", "ABcD" );            /* Test longer replace at start of string */

+

+                AssertEquals( "ABcD!!!baz", sb.ToString() );

+

+                sb.Replace( "baz", "00" );              /* Test shorter replace at end of string */

+                        

+                AssertEquals( "ABcD!!!00", sb.ToString() );

+

+                sb.Replace( sb.ToString(), null );      /* Test string clear as in spec */

+

+                AssertEquals( String.Empty, sb.ToString() );

+

+                /*           |         10        20        30

+                /*         |0123456789012345678901234567890| */

+                sb.Append( "abc this is testing abc the abc abc partial replace abc" );

+

+                sb.Replace( "abc", "!!!", 0, 31 ); /* Partial replace at start of string */

+

+                AssertEquals( "!!! this is testing !!! the !!! abc partial replace abc", sb.ToString() );

+

+                sb.Replace( "testing", "", 0, 15 ); /* Test replace across boundary */

+

+                AssertEquals( "!!! this is testing !!! the !!! abc partial replace abc", sb.ToString() );

+

+                sb.Replace( "!!!", "" ); /* Test replace with empty string */

+

+                AssertEquals(" this is testing  the  abc partial replace abc", sb.ToString() );

+        }

+

+        public void TestAppendFormat() {

+        }

+}

+

+}

diff --git a/mcs/class/corlib/Test/System/AllTests.cs b/mcs/class/corlib/Test/System/AllTests.cs
new file mode 100644
index 00000000000..e9e4f227da5
--- /dev/null
+++ b/mcs/class/corlib/Test/System/AllTests.cs
@@ -0,0 +1,62 @@
+// Testsuite.System.AllSystemTests.cs
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System {
+        /// <summary>
+        ///   Combines all available unit tests into one test suite.
+        /// </summary>
+        public class AllTests : TestCase {
+
+                public AllTests(string name) : base(name) {}
+                
+                public static ITest Suite { 
+                        get 
+                        {
+                                TestSuite suite = new TestSuite();
+                                suite.AddTest (ArrayTest.Suite);
+				suite.AddTest (AttributeTest.Suite);
+				suite.AddTest (BitConverterTest.Suite);
+				suite.AddTest (BooleanTest.Suite);
+				suite.AddTest (BufferTest.Suite);
+                                suite.AddTest (ByteTest.Suite);
+				suite.AddTest (CharEnumeratorTest.Suite);
+                                suite.AddTest (CharTest.Suite);
+                                suite.AddTest (ConsoleTest.Suite);
+				suite.AddTest (ConvertTest.Suite);
+				suite.AddTest (DateTimeTest.Suite);
+				suite.AddTest (DecimalTest.Suite);
+				suite.AddTest (DecimalTest2.Suite);
+				suite.AddTest (DoubleTest.Suite);
+				suite.AddTest (EnumTest.Suite);
+				suite.AddTest (ExceptionTest.Suite);
+				suite.AddTest (GuidTest.Suite);
+                                suite.AddTest (Int16Test.Suite);
+                                suite.AddTest (Int32Test.Suite);
+                                suite.AddTest (Int64Test.Suite);
+                                suite.AddTest (IntegerFormatterTest.Suite);
+				suite.AddTest (MathTest.Suite);
+				suite.AddTest (MulticastDelegateTest.Suite);
+                                suite.AddTest (ObjectTest.Suite);
+                                suite.AddTest (RandomTest.Suite);
+                                suite.AddTest (ResolveEventArgsTest.Suite);
+                                suite.AddTest (SByteTest.Suite);
+				suite.AddTest (StringTest.Suite);
+				suite.AddTest (TimeSpanTest.Suite);
+				suite.AddTest (TimeZoneTest.Suite);
+				suite.AddTest (UInt16Test.Suite);
+                                suite.AddTest (UInt32Test.Suite);
+                                suite.AddTest (UInt64Test.Suite);
+				suite.AddTest (VersionTest.Suite);
+				return suite;
+                        }
+                }
+        }
+}
+
diff --git a/mcs/class/corlib/Test/System/ArrayTest.cs b/mcs/class/corlib/Test/System/ArrayTest.cs
new file mode 100644
index 00000000000..a96dac5235e
--- /dev/null
+++ b/mcs/class/corlib/Test/System/ArrayTest.cs
@@ -0,0 +1,1988 @@
+// ArrayTest.cs - NUnit Test Cases for the System.Array class

+//

+// David Brandt (bucky@keystreams.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+

+using NUnit.Framework;

+using System;

+using System.Collections;

+using System.Globalization;

+

+namespace MonoTests.System

+{

+

+public class ArrayTest : TestCase

+{

+	public ArrayTest() : base ("MonoTests.System.ArrayTest testsuite") {}

+	public ArrayTest(string name) : base(name) {}

+

+	protected override void SetUp() 

+	{

+	}

+

+	protected override void TearDown() 

+	{

+	}

+

+	public static ITest Suite {

+		get { 

+			return new TestSuite(typeof(ArrayTest)); 

+		}

+	}

+    

+	public void TestIsFixedSize() {

+		char[] a1 = {'a'};

+		Assert("All arrays are fixed", a1.IsFixedSize);

+	}

+

+	public void TestIsReadOnly() {

+		char[] a1 = {'a'};

+		Assert("No array is readonly", !a1.IsReadOnly);

+	}

+

+	public void TestIsSynchronized() {

+		char[] a1 = {'a'};

+		Assert("No array is synchronized", !a1.IsSynchronized);

+	}

+

+	public void TestLength() {

+		{

+			char[] a1 = { };

+			AssertEquals("Zero length array", 0, a1.Length);

+		}

+		{

+			char[] a1 = {'c'};

+			AssertEquals("One-length array", 1, a1.Length);

+		}

+		{

+			char[] a1 = {'c', 'c'};

+			AssertEquals("Two-length array", 2, a1.Length);

+		}

+	}

+

+	public void TestRank() {

+		char[] a1 = { 'c', 'd', 'e' };

+		AssertEquals("Rank one", 1, a1.Rank);

+

+		char[,] a2 = new Char[3,3];

+		AssertEquals("Rank two", 2, a2.Rank);

+

+		char[,,] a3 = new Char[3,3,3];

+		AssertEquals("Rank three", 3, a3.Rank);

+	}

+

+	public void TestBinarySearch1() {

+		bool errorThrown = false;

+		try {

+			Array.BinarySearch(null, "blue");

+		} catch (ArgumentNullException) {

+			errorThrown = true;

+		}

+		Assert("#B01", errorThrown);

+		errorThrown = false;

+		try {

+			char[,] c1 = new Char[2,2];

+			Array.BinarySearch(c1, "needle");

+		} catch (RankException) {

+			errorThrown = true;

+		}

+		Assert("#B02", errorThrown);

+

+		{

+			char[] arr = {'a', 'b', 'b', 'c', 'c', 'c', 'd', 'd'};

+			Assert("#B05", 

+			       Array.BinarySearch(arr, 'c') >= 3);

+			Assert("#B06", 

+			       Array.BinarySearch(arr, 'c') < 6);

+		}

+		{

+			char[] arr = {'a', 'b', 'b', 'd', 'd', 'd', 'e', 'e'};

+			AssertEquals("#B07", 

+				     -4, Array.BinarySearch(arr, 'c'));

+		}

+		{

+			char[] arr = {'a', 'b', 'b', 'c', 'c', 'c', 'd', 'd'};

+			AssertEquals("#B08", 

+				     -9, Array.BinarySearch(arr, 'e'));

+		}

+	}

+	public void TestBinarySearch2() {

+		bool errorThrown = false;

+		try {

+			Array.BinarySearch(null, 0, 1, "blue");

+		} catch (ArgumentNullException) {

+			errorThrown = true;

+		}

+		Assert("#B20", errorThrown);

+		errorThrown = false;

+		try {

+			char[,] c1 = new Char[2,2];

+			Array.BinarySearch(c1, 0, 1, "needle");

+		} catch (RankException) {

+			errorThrown = true;

+		}

+		Assert("#B21", errorThrown);

+		errorThrown = false;

+		try {

+			char[] c1 = {'a'};

+			Array.BinarySearch(c1, -1, 1, 'a');

+		} catch (ArgumentOutOfRangeException) {

+			errorThrown = true;

+		}

+		Assert("#B22", errorThrown);

+		errorThrown = false;

+		try {

+			char[] c1 = {'a'};

+			Array.BinarySearch(c1, 0, -1, 'a');

+		} catch (ArgumentOutOfRangeException) {

+			errorThrown = true;

+		}

+		Assert("#B23", errorThrown);

+		errorThrown = false;

+		try {

+			char[] c1 = {'a'};

+			Array.BinarySearch(c1, 0, 4, 'a');

+		} catch (ArgumentException) {

+			errorThrown = true;

+		}

+		Assert("#B24", errorThrown);

+

+		{

+			char[] arr = {'z', 'z', 'a', 'b', 'b', 'c', 'c', 'c', 'd', 'd'};

+			Assert("#B26", 

+			       Array.BinarySearch(arr, 2, 8, 'c') >= 5);

+			Assert("#B27", 

+			       Array.BinarySearch(arr, 2, 8, 'c') < 8);

+		}

+		{

+			char[] arr = {'z', 'z', 'a', 'b', 'b', 'd', 'd', 'd', 'e', 'e'};

+			AssertEquals("#B28", 

+				     -6, Array.BinarySearch(arr, 2, 8, 'c'));

+		}

+		{

+			char[] arr = {'z', 'z', 'a', 'b', 'b', 'c', 'c', 'c', 'd', 'd'};

+			AssertEquals("#B29", 

+				     -11, Array.BinarySearch(arr, 2, 8, 'e'));

+		}

+	}

+

+	// TODO - testBinarySearch with explicit IComparer args

+

+	public void TestClear() {

+		bool errorThrown = false;

+		try {

+			Array.Clear(null, 0, 1);

+		} catch (ArgumentNullException) {

+			errorThrown = true;

+		}

+		Assert("#C01", errorThrown);

+

+		int[] i1 = { 1, 2, 3, 4 };

+		{

+			int[] compare = {1,2,3,4};

+			AssertEquals("#C02", compare[0], i1[0]);

+			AssertEquals("#C03", compare[1], i1[1]);

+			AssertEquals("#C04", compare[2], i1[2]);

+			AssertEquals("#C05", compare[3], i1[3]);

+		}

+		Array.Clear(i1, 3, 1);

+		{

+			int[] compare = {1,2,3,0};

+			AssertEquals("#C06", compare[0], i1[0]);

+			AssertEquals("#C07", compare[1], i1[1]);

+			AssertEquals("#C08", compare[2], i1[2]);

+			AssertEquals("#C09", compare[3], i1[3]);

+		}

+		Array.Clear(i1, 1, 1);

+		{

+			int[] compare = {1,0,3,0};

+			AssertEquals("#C10", compare[0], i1[0]);

+			AssertEquals("#C11", compare[1], i1[1]);

+			AssertEquals("#C12", compare[2], i1[2]);

+			AssertEquals("#C13", compare[3], i1[3]);

+		}

+		Array.Clear(i1, 1, 3);

+		{

+			int[] compare = {1,0,0,0};

+			AssertEquals("#C14", compare[0], i1[0]);

+			AssertEquals("#C15", compare[1], i1[1]);

+			AssertEquals("#C16", compare[2], i1[2]);

+			AssertEquals("#C17", compare[3], i1[3]);

+		}

+

+		string[] s1 = { "red", "green", "blue" };

+		Array.Clear(s1, 0, 3);

+		{

+			string[] compare = {null, null, null};

+			AssertEquals("#C18", compare[0], s1[0]);

+			AssertEquals("#C19", compare[1], s1[1]);

+			AssertEquals("#C20", compare[2], s1[2]);

+		}

+	}

+

+	public void TestClone() {

+		char[] c1 = {'a', 'b', 'c'};

+		char[] c2 = (char[])c1.Clone();

+		AssertEquals("#D01", c1[0], c2[0]);

+		AssertEquals("#D02", c1[1], c2[1]);

+		AssertEquals("#D03", c1[2], c2[2]);

+

+		char[] d10 = {'a', 'b'};

+		char[] d11 = {'a', 'c'};

+		char[] d12 = {'b', 'c'};

+		char[][] d1 = {d10, d11, d12};

+		char[][] d2 = (char[][])d1.Clone();

+		AssertEquals("#D04", d1[0], d2[0]);

+		AssertEquals("#D05", d1[1], d2[1]);

+		AssertEquals("#D06", d1[2], d2[2]);

+

+		d1[0][0] = 'z';

+		AssertEquals("#D07", d1[0], d2[0]);

+	}

+

+	public void TestCopy() {

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = {};

+				Array.Copy(c1, null, 1);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#E01", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = {};

+				Array.Copy(null, c1, 1);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#E02", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[1];

+				Char[,] c2 = new Char[1,1];

+				Array.Copy(c1, c2, 1);

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#E03", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[1];

+				string[] s1 = new String[1];

+				Array.Copy(c1, s1, 1);

+			} catch (ArrayTypeMismatchException) {

+				errorThrown = true;

+			}

+			Assert("#E04", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[1];

+				Object[] o1 = new Object[1];

+				o1[0] = "hello";

+				Array.Copy(o1, c1, 1);

+			} catch (InvalidCastException) {

+				errorThrown = true;

+			}

+			Assert("#E05", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[1];

+				Char[] c2 = new Char[1];

+				Array.Copy(c1, c2, -1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#E06", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[1];

+				Char[] c2 = new Char[2];

+				Array.Copy(c1, c2, 2);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#E07", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[1];

+				Char[] c2 = new Char[2];

+				Array.Copy(c2, c1, 2);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#E08", errorThrown);

+		}

+

+		char[] orig = {'a', 'b', 'd', 'a'};

+		char[] copy = new Char[4];

+		Array.Copy(orig, copy, 4);

+		for (int i = 0; i < orig.Length; i++) {

+			AssertEquals("#E09(" + i + ")",

+				     orig[i], copy[i]);

+		}

+		Array.Clear(copy, 0, copy.Length);

+		for (int i = 0; i < orig.Length; i++) {

+			AssertEquals("#E10(" + i + ")",

+				     (char)0, copy[i]);

+		}

+		Array.Copy(orig, copy, 2);

+		AssertEquals("#E11", orig[0], copy[0]);

+		AssertEquals("#E12", orig[1], copy[1]);

+		Assert("#E13", orig[2] != copy[2]);

+		Assert("#E14", orig[3] != copy[3]);

+	}

+	public void TestCopy2() {

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				Char[] c2 = new Char[2];

+				Array.Copy(c2, 1, c1, 0, 2);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#E31", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				Char[] c2 = new Char[2];

+				Array.Copy(c2, 0, c1, 1, 2);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#E32", errorThrown);

+		}

+		

+		char[] orig = {'a', 'b', 'd', 'a'};

+		char[] copy = new Char[4];

+		Array.Copy(orig, 1, copy, 1, 3);

+		Assert("#E33", copy[0] != orig[0]);

+		for (int i = 1; i < orig.Length; i++) {

+			AssertEquals("#E34(" + i + ")",

+				     orig[i], copy[i]);

+		}

+		Array.Clear(copy, 0, copy.Length);

+		Array.Copy(orig, 1, copy, 0, 2);

+		AssertEquals("#E35", orig[1], copy[0]);

+		AssertEquals("#E36", orig[2], copy[1]);

+		Assert("#E37", copy[2] != orig[2]);

+		Assert("#E38", copy[3] != orig[3]);

+	}

+

+	public void TestCopyTo() {

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				c1.CopyTo(null, 2);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#E61", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				Char[,] c2 = new Char[2,2];

+				c1.CopyTo(c2, 2);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#E62", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[,] c1 = new Char[2,2];

+				Char[] c2 = new Char[2];

+				c1.CopyTo(c2, -1);

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#E63", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[,] c1 = new Char[2,2];

+				Char[] c2 = new Char[2];

+				c1.CopyTo(c2, 2);

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#E64", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				Char[] c2 = new Char[2];

+				c1.CopyTo(c2, -1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#E65", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				Char[] c2 = new Char[2];

+				c1.CopyTo(c2, 3);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#E66", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Char[] c1 = new Char[2];

+				Char[] c2 = new Char[2];

+				c1.CopyTo(c2, 1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#E67", errorThrown);

+		}

+// FIXME: This test will fail until a bug in Array is fixed.

+// bug details at http://bugzilla.ximian.com/show_bug.cgi?id=27337

+/*

+		{

+			bool errorThrown = false;

+			try {

+				String[] c1 = new String[2];

+				Char[] c2 = new Char[2];

+				// FIXME: Our implementation doesn't throw an exception if

+				//        this is uninitialized.

+				//c1[0] = "Hello";

+				//c1[1] = "World";

+				c1.CopyTo(c2, 0);

+			} catch (ArrayTypeMismatchException) {

+				errorThrown = true;

+			}

+			Assert("#E68", errorThrown);

+		}

+*/

+		Char[] orig = {'a', 'b', 'c', 'd'};

+		Char[] copy = new Char[10];

+		Array.Clear(copy, 0, copy.Length);

+		orig.CopyTo(copy, 3);

+		AssertEquals("#E69", (char)0, copy[0]);

+		AssertEquals("#E70", (char)0, copy[1]);

+		AssertEquals("#E71", (char)0, copy[2]);

+		AssertEquals("#E72", orig[0], copy[3]);

+		AssertEquals("#E73", orig[1], copy[4]);

+		AssertEquals("#E74", orig[2], copy[5]);

+		AssertEquals("#E75", orig[3], copy[6]);

+		AssertEquals("#E76", (char)0, copy[7]);

+		AssertEquals("#E77", (char)0, copy[8]);

+		AssertEquals("#E78", (char)0, copy[9]);

+

+		{

+			// The following is valid and must not throw an exception.

+			bool errorThrown = false;

+			try {

+				int[] src = new int [0];

+				int[] dest = new int [0];

+				src.CopyTo (dest, 0);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#E79", !errorThrown);

+		}

+	}

+

+	public void TestCreateInstance() {

+		{

+			bool errorThrown = false;

+			try {

+				Array.CreateInstance(null, 12);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#F01", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Array.CreateInstance(Type.GetType("System.Char"), -3);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#F02", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Array.CreateInstance(Type.GetType("System.Char"), null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#F03", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Array.CreateInstance(Type.GetType("System.Char"), null, null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#F04", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				int[] lengths = new int [0];

+				Array.CreateInstance(Type.GetType("System.Char"), lengths);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#F05", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				int[] lengths = new int [1];

+				int[] bounds = new int [2];

+				Array.CreateInstance(Type.GetType("System.Char"), lengths, bounds);

+				errorThrown = true;

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#F06", errorThrown);

+		}

+

+		char[] c1 = (char[])Array.CreateInstance(Type.GetType("System.Char"), 12);

+		AssertEquals("#F07", 12, c1.Length);

+

+		Array c2 = Array.CreateInstance(Type.GetType("System.Char"), 12, 5);

+		AssertEquals("#F08", 2, c2.Rank);

+		AssertEquals("#F09", 60, c2.Length);

+

+

+		{

+			int[] lengths = { 3 };

+			int[] bounds = { 5 };

+			int[] src = { 512, 718, 912 };

+			Array array = Array.CreateInstance(typeof(int), lengths, bounds);

+

+			AssertEquals("#F10", 3, array.Length);

+			AssertEquals("#F11", 5, array.GetLowerBound(0));

+			AssertEquals("#F12", 7, array.GetUpperBound(0));

+

+			src.CopyTo (array, 5);

+

+			for (int i = 0; i < src.Length; i++)

+				AssertEquals("#F13(" + i + ")", src[i], array.GetValue(i+5));

+		}

+

+	}

+

+	public void TestGetEnumerator() {

+		String[] s1 = {"this", "is", "a", "test"};

+		IEnumerator en = s1.GetEnumerator ();

+		AssertNotNull ("#G01", en);

+

+		Assert ("#G02", en.MoveNext ());

+		AssertEquals ("#G03", "this", en.Current);

+		Assert ("#G04", en.MoveNext ());

+		AssertEquals ("#G05", "is", en.Current);

+		Assert ("#G06", en.MoveNext ());

+		AssertEquals ("#G07", "a", en.Current);

+		Assert ("#G08", en.MoveNext ());

+		AssertEquals ("#G09", "test", en.Current);

+		Assert ("#G10", !en.MoveNext ());

+

+		en.Reset ();

+		Assert("#G11", en.MoveNext ());

+		AssertEquals ("#G12", "this", en.Current);

+

+		// mutation does not invalidate array enumerator!

+		s1.SetValue ("change", 1);

+		Assert ("#G13", en.MoveNext ());

+		AssertEquals ("#G14", "change", en.Current);

+	}

+

+	public void TestGetEnumeratorMultipleDimension() {

+		String[,] s1 = {{"this", "is"}, {"a", "test"}};

+		IEnumerator en = s1.GetEnumerator ();

+		AssertNotNull ("#AA01", en);

+

+		Assert ("#AA02", en.MoveNext ());

+		AssertEquals ("#AA03", "this", en.Current);

+		Assert ("#AA04", en.MoveNext ());

+		AssertEquals ("#AA05", "is", en.Current);

+		Assert ("#AA06", en.MoveNext ());

+		AssertEquals ("#AA07", "a", en.Current);

+		Assert ("#AA08", en.MoveNext ());

+		AssertEquals ("#AA09", "test", en.Current);

+		Assert ("#AA10", !en.MoveNext ());

+

+		en.Reset ();

+		Assert("#AA11", en.MoveNext ());

+		AssertEquals ("#AA12", "this", en.Current);

+

+		int[] idxs = {0,1};

+		// mutation does not invalidate array enumerator!

+		s1.SetValue ("change", idxs);

+		Assert ("#AA13", en.MoveNext ());

+		AssertEquals ("#AA14", "change", en.Current);

+	}

+

+	public void TestGetEnumeratorNonZeroLowerBounds() {

+		int[] myLengthsArray = new int[2] { 3, 5 };

+		int[] myBoundsArray = new int[2] { 2, 3 };

+

+		Array myArray=Array.CreateInstance( typeof(String), myLengthsArray, myBoundsArray );

+		for ( int i = myArray.GetLowerBound(0); i <= myArray.GetUpperBound(0); i++ )

+			for ( int j = myArray.GetLowerBound(1); j <= myArray.GetUpperBound(1); j++ )  {

+				int[] myIndicesArray = new int[2] { i, j };

+				myArray.SetValue( Convert.ToString(i) + j, myIndicesArray );

+			}

+		IEnumerator en = myArray.GetEnumerator ();

+		AssertNotNull ("#AB01", en);

+

+		// check the first couple of values

+		Assert ("#AB02", en.MoveNext ());

+		AssertEquals ("#AB03", "23", en.Current);

+		Assert ("#AB04", en.MoveNext ());

+		AssertEquals ("#AB05", "24", en.Current);

+

+		// then check the last element's value

+		string lastElement;

+		do {  

+			lastElement = (string)en.Current;

+		} while (en.MoveNext());

+		AssertEquals ("#AB06", "47", lastElement);

+	}

+

+	public void TestIList_Add () {

+		int[] myLengthsArray = new int[2] { 3, 5 };

+		int[] myBoundsArray = new int[2] { 2, 3 };

+

+		Array myArray=Array.CreateInstance ( typeof(String), myLengthsArray, myBoundsArray );

+		try {

+			((IList)myArray).Add ("can not");

+			Fail ("IList.Add should throw");    

+		}

+		catch (NotSupportedException) {

+			return;

+		}

+		catch (Exception) {

+			Fail ("IList.Add threw wrong exception type");    

+		}

+

+		Fail("IList.Add shouldn't get this far");

+	}

+

+	public void TestIList_Insert () {

+		int[] myLengthsArray = new int[2] { 3, 5 };

+		int[] myBoundsArray = new int[2] { 2, 3 };

+

+		Array myArray=Array.CreateInstance ( typeof(String), myLengthsArray, myBoundsArray );

+		try {

+			((IList)myArray).Insert (0, "can not");

+			Fail ("IList.Insert should throw");    

+		}

+		catch (NotSupportedException) {

+			return;

+		}

+		catch (Exception) {

+			Fail ("IList.Insert threw wrong exception type");    

+		}

+

+		Fail("IList.Insert shouldn't get this far");

+	}

+

+	public void TestIList_Remove () {

+		int[] myLengthsArray = new int[2] { 3, 5 };

+		int[] myBoundsArray = new int[2] { 2, 3 };

+

+		Array myArray=Array.CreateInstance ( typeof(String), myLengthsArray, myBoundsArray );

+		try {

+			((IList)myArray).Remove ("can not");

+			Fail ("IList.Remove should throw");    

+		}

+		catch (NotSupportedException) {

+			return;

+		}

+		catch (Exception) {

+			Fail ("IList.Remove threw wrong exception type");    

+		}

+

+		Fail("IList.Remove shouldn't get this far");

+	}

+

+	public void TestIList_RemoveAt () {

+		int[] myLengthsArray = new int[2] { 3, 5 };

+		int[] myBoundsArray = new int[2] { 2, 3 };

+

+		Array myArray=Array.CreateInstance ( typeof(String), myLengthsArray, myBoundsArray );

+		try {

+			((IList)myArray).RemoveAt (0);

+			Fail ("IList.RemoveAt should throw");    

+		}

+		catch (NotSupportedException) {

+			return;

+		}

+		catch (Exception) {

+			Fail ("IList.RemoveAt threw wrong exception type");    

+		}

+

+		Fail("IList.RemoveAt shouldn't get this far");

+	}

+

+	public void TestIList_Contains () {

+		int[] myLengthsArray = new int[2] { 3, 5 };

+		int[] myBoundsArray = new int[2] { 2, 3 };

+

+		Array myArray=Array.CreateInstance ( typeof(String), myLengthsArray, myBoundsArray );

+

+		try {

+			bool b = ((IList)myArray).Contains ("23");

+			Fail("IList.Contains should throw with multi-dimensional arrays");

+		}

+		catch (RankException) {

+			int[] iArr = new int[3] { 1, 2, 3};

+			// check the first and last items

+			Assert("AC01", ((IList)iArr).Contains (1));

+			Assert("AC02", ((IList)iArr).Contains (3));

+

+			// and one that is definately not there

+			Assert("AC03", !((IList)iArr).Contains (42));

+			return;

+		}

+

+		Fail("Should not get here");

+	}

+

+	public void TestIList_IndexOf () {

+		int[] myLengthsArray = new int[2] { 3, 5 };

+		int[] myBoundsArray = new int[2] { 2, 3 };

+

+		Array myArray=Array.CreateInstance ( typeof(String), myLengthsArray, myBoundsArray );

+

+		try {

+			bool b = ((IList)myArray).Contains ("23");

+			Fail("IList.Contains should throw with multi-dimensional arrays");

+		}

+		catch (RankException) {

+			int[] iArr = new int[3] { 1, 2, 3};

+			// check the first and last items

+			AssertEquals("AD01", 0, ((IList)iArr).IndexOf (1));

+			AssertEquals("AD02", 2, ((IList)iArr).IndexOf (3));

+

+			// and one that is definately not there

+			AssertEquals("AD03", -1, ((IList)iArr).IndexOf (42));

+		}

+		catch (Exception e) {

+			Fail("Unexpected exception: " + e.ToString());

+		}

+

+		// check that wierd case whem lowerbound is Int32.MinValue,

+		// so that IndexOf() needs to return Int32.MaxValue when it cannot find the object

+		int[] myLengthArray = new int[1] { 3 };

+		int[] myBoundArray = new int[1] { Int32.MinValue };

+		Array myExtremeArray=Array.CreateInstance ( typeof(String), myLengthArray, myBoundArray );

+		AssertEquals("AD04", Int32.MaxValue, ((IList)myExtremeArray).IndexOf (42));

+

+	}

+

+	public void TestGetLength() {

+		{

+			bool errorThrown = false;

+			try {

+				char[] c1 = {'a', 'b', 'c'};

+				c1.GetLength(-1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#H01", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c1 = {'a', 'b', 'c'};

+				c1.GetLength(1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#H02", errorThrown);

+		}

+

+		char[] c2 = new Char[5];

+		AssertEquals("#H03", 

+			     5, c2.GetLength(0));

+

+		char[,] c3 = new Char[6,7];

+		AssertEquals("#H04", 

+			     6, c3.GetLength(0));

+		AssertEquals("#H05", 

+			     7, c3.GetLength(1));

+	}

+

+	public void TestGetLowerBound() {

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				c.GetLowerBound(-1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#H31", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				c.GetLowerBound(1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#H32", errorThrown);

+		}

+

+		char[] c1 = new Char[5];

+		AssertEquals("#H33", 

+			     0, c1.GetLowerBound(0));

+

+		char[,] c2 = new Char[4,4];

+		AssertEquals("#H34", 

+			     0, c2.GetLowerBound(0));

+		AssertEquals("#H35", 

+			     0, c2.GetLowerBound(1));

+	}

+

+	public void TestGetUpperBound() {

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				c.GetUpperBound(-1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#H61", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				c.GetUpperBound(1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#H62", errorThrown);

+		}

+

+		char[] c1 = new Char[5];

+		AssertEquals("#H63", 

+			     4, c1.GetUpperBound(0));

+

+		char[,] c2 = new Char[4,6];

+		AssertEquals("#H64", 

+			     3, c2.GetUpperBound(0));

+		AssertEquals("#H65", 

+			     5, c2.GetUpperBound(1));

+	}

+

+	public void TestGetValue1() {

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				c.GetValue(1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#I01", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				c.GetValue(-1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#I02", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				c.GetValue(4);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#I03", errorThrown);

+		}

+

+		char[] c1 = {'a', 'b', 'c', 'd'};

+		for (int i = 0; i < c1.Length; i++) {

+			AssertEquals("#I04(" + i + ")", c1[i], c1.GetValue(i));

+		}

+	}

+	public void TestGetValue2() {

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				c.GetValue(1,1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#I21", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				c.GetValue(-1, 1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#I22", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				c.GetValue(4,1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#I23", errorThrown);

+		}

+

+		char[,] c1 = new Char[4,6];

+		for (int i = 0; i < 24; i++) {

+			int first = i / 6;

+			int second = i % 6;

+			c1[first,second] = (char)(((int)'a')+i);

+		}

+		for (int i = 0; i < c1.GetLength(0); i++) {

+			for (int j = 0; j < c1.GetLength(1); j++) {

+				AssertEquals("#I24(" + i + "," + j + ")",

+					     c1[i,j], c1.GetValue(i, j));

+			}

+		}

+	}

+	public void TestGetValue3() {

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				c.GetValue(1,1,1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#I41", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,,] c = new Char[2,2,2];

+				c.GetValue(-1, 1, 1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#I42", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,,] c = new Char[2,2,2];

+				c.GetValue(4,1,1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#I43", errorThrown);

+		}

+

+		char[,,] c1 = new Char[4,2,3];

+		for (int i = 0; i < 24; i++) {

+			int first = i / 6;

+			int remains = i % 6;

+			int second = remains / 3;

+			int third = remains % 3;

+			c1[first,second, third] = (char)(((int)'a')+i);

+		}

+		for (int i = 0; i < c1.GetLength(0); i++) {

+			for (int j = 0; j < c1.GetLength(1); j++) {

+				for (int k = 0; k < c1.GetLength(2); k++) {

+					AssertEquals("#I44(" + i + "," + j + ")",

+						     c1[i,j,k], c1.GetValue(i,j,k));

+				}

+			}

+		}

+	}

+	public void TestGetValueN() {

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				c.GetValue(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#I61", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				int[] coords = {1, 1};

+				c.GetValue(coords);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#I62", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				int[] coords = {-1, 1};

+				c.GetValue(coords);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#I63", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				int[] coords = {4, 1};

+				c.GetValue(coords);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#I64", errorThrown);

+		}

+

+		char[,] c1 = new Char[4,6];

+		for (int i = 0; i < 24; i++) {

+			int first = i / 6;

+			int second = i % 6;

+			c1[first,second] = (char)(((int)'a')+i);

+		}

+		for (int i = 0; i < c1.GetLength(0); i++) {

+			for (int j = 0; j < c1.GetLength(1); j++) {

+				int[] coords = {i, j};

+				AssertEquals("#I65(" + i + "," + j + ")",

+					     c1[i,j], c1.GetValue(coords));

+			}

+		}

+	}

+

+	public void TestIndexOf1() {

+		{

+			bool errorThrown = false;

+			try {

+				Array.IndexOf(null, "huh?");

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#J01", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				Array.IndexOf(c, "huh?");

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#J02", errorThrown);

+		}

+

+		String[] s1 = {"this", "is", "a", "test"};

+		AssertEquals("#J03", -1, Array.IndexOf(s1, null));

+		AssertEquals("#J04", -1, Array.IndexOf(s1, "nothing"));

+		AssertEquals("#J05", 0, Array.IndexOf(s1, "this"));

+		AssertEquals("#J06", 3, Array.IndexOf(s1, "test"));

+	}

+	public void TestIndexOf2() {

+		{

+			bool errorThrown = false;

+			try {

+				Array.IndexOf(null, "huh?", 0);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#J21", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				Array.IndexOf(c, "huh?", 0);

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#J22", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				Array.IndexOf(c, "huh?", 3);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#J23", errorThrown);

+		}

+

+		String[] s1 = {"this", "is", "really", "a", "test"};

+		AssertEquals("#J24", -1, Array.IndexOf(s1, null, 1));

+		AssertEquals("#J25", -1, Array.IndexOf(s1, "nothing", 1));

+		AssertEquals("#J26", -1, Array.IndexOf(s1, "this", 1));

+		AssertEquals("#J27", 1, Array.IndexOf(s1, "is", 1));

+		AssertEquals("#J28", 4, Array.IndexOf(s1, "test", 1));

+	}

+	public void TestIndexOf3() {

+		{

+			bool errorThrown = false;

+			try {

+				Array.IndexOf(null, "huh?", 0, 1);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#J41", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				Array.IndexOf(c, "huh?", 0, 1);

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#J42", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				Array.IndexOf(c, "huh?", 3, 1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#J43", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				Array.IndexOf(c, "huh?", 0, 5);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#J44", errorThrown);

+		}

+

+		String[] s1 = {"this", "is", "really", "a", "test"};

+		AssertEquals("#J45", -1, Array.IndexOf(s1, null, 1, 3));

+		AssertEquals("#J46", -1, Array.IndexOf(s1, "nothing", 1, 3));

+		AssertEquals("#J47", -1, Array.IndexOf(s1, "this", 1, 3));

+		AssertEquals("#J48", 1, Array.IndexOf(s1, "is", 1, 3));

+		AssertEquals("#J49", -1, Array.IndexOf(s1, "test", 1, 3));

+		AssertEquals("#J50", 3, Array.IndexOf(s1, "a", 1, 3));

+	}

+	

+	public void TestLastIndexOf1() {

+		{

+			bool errorThrown = false;

+			try {

+				Array.LastIndexOf(null, "huh?");

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#K01", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				Array.LastIndexOf(c, "huh?");

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#K02", errorThrown);

+		}

+

+		String[] s1 = {"this", "is", "a", "a", "test"};

+		AssertEquals("#K03", -1, Array.LastIndexOf(s1, null));

+		AssertEquals("#K04", -1, Array.LastIndexOf(s1, "nothing"));

+		AssertEquals("#K05", 0, Array.LastIndexOf(s1, "this"));

+		AssertEquals("#K06", 4, Array.LastIndexOf(s1, "test"));

+		AssertEquals("#K07", 3, Array.LastIndexOf(s1, "a"));

+	}

+	public void TestLastIndexOf2() {

+		{

+			bool errorThrown = false;

+			try {

+				Array.LastIndexOf(null, "huh?", 0);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#K21", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				Array.LastIndexOf(c, "huh?", 0);

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#K22", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				Array.LastIndexOf(c, "huh?", 3);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#K23", errorThrown);

+		}

+

+		String[] s1 = {"this", "is", "really", "a", "test"};

+		AssertEquals("#K24", -1, Array.LastIndexOf(s1, null, 3));

+		AssertEquals("#K25", -1, Array.LastIndexOf(s1, "nothing", 3));

+		AssertEquals("#K26", -1, Array.LastIndexOf(s1, "test", 3));

+		AssertEquals("#K27", 3, Array.LastIndexOf(s1, "a", 3));

+		AssertEquals("#K28", 0, Array.LastIndexOf(s1, "this", 3));

+	}

+	public void TestLastIndexOf3() {

+		{

+			bool errorThrown = false;

+			try {

+				Array.LastIndexOf(null, "huh?", 0, 1);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#K41", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				Array.LastIndexOf(c, "huh?", 0, 1);

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#K42", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				Array.LastIndexOf(c, "huh?", 3, 1);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#K43", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				Array.LastIndexOf(c, "huh?", 0, 5);

+			} catch (ArgumentOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#K44", errorThrown);

+		}

+

+		String[] s1 = {"this", "is", "really", "a", "test"};

+		AssertEquals("#K45", 

+			     -1, Array.LastIndexOf(s1, null, 3, 3));

+		AssertEquals("#K46", 

+			     -1, Array.LastIndexOf(s1, "nothing", 3, 3));

+		AssertEquals("#K47", 

+			     -1, Array.LastIndexOf(s1, "this", 3, 3));

+		AssertEquals("#K48",

+			     1, Array.LastIndexOf(s1, "is", 3, 3));

+		AssertEquals("#K49", 

+			     -1, Array.LastIndexOf(s1, "test", 3, 3));

+		AssertEquals("#K50", 

+			     3, Array.LastIndexOf(s1, "a", 3, 3));

+	}

+

+	public void TestReverse() {

+		{

+			bool errorThrown = false;

+			try {

+				Array.Reverse(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#L01", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				Array.Reverse(c);

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#L02", errorThrown);

+		}

+		

+		char[] c1 = {'a', 'b', 'c', 'd'};

+		Array.Reverse(c1);

+		AssertEquals("#L03", 'd', c1[0]);

+		AssertEquals("#L04", 'c', c1[1]);

+		AssertEquals("#L05", 'b', c1[2]);

+		AssertEquals("#L06", 'a', c1[3]);

+

+		{

+			bool errorThrown = false;

+			try {

+				Array.Reverse(null, 0, 0);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#L07", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				Array.Reverse(c, 0, 0);

+			} catch (RankException) {

+				errorThrown = true;

+			}

+			Assert("#L08", errorThrown);

+		}

+		//{

+		//bool errorThrown = false;

+		//try {

+		//	char[] c = new Char[2];

+		//	Array.Reverse(c, 0, 3);

+		//} catch (ArgumentOutOfRangeException) {

+		//	errorThrown = true;

+		//}

+		//Assert("#L09", errorThrown);

+		//}

+		//{

+		//bool errorThrown = false;

+		//try {

+		//	char[] c = new Char[2];

+		//	Array.Reverse(c, 3, 0);

+		//} catch (ArgumentOutOfRangeException) {

+		//	errorThrown = true;

+		//}

+		//Assert("#L10", errorThrown);

+		//}

+

+		char[] c2 = { 'a', 'b', 'c', 'd'};

+		Array.Reverse(c2, 1, 2);

+		AssertEquals("#L11", 'a', c2[0]);

+		AssertEquals("#L12", 'c', c2[1]);

+		AssertEquals("#L13", 'b', c2[2]);

+		AssertEquals("#L14", 'd', c2[3]);

+	}

+

+	public void TestSetValue1() {

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				c.SetValue("buh", 1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#M01", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				c.SetValue("buh", -1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#M02", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = {'a', 'b', 'c'};

+				c.SetValue("buh", 4);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#M03", errorThrown);

+		}

+

+		char[] c1 = {'a', 'b', 'c', 'd'};

+		char[] c2 = new char[4];

+		for (int i = 0; i < c1.Length; i++) {

+			c2.SetValue(c1[i], i);

+		}

+		for (int i = 0; i < c1.Length; i++) {

+			AssertEquals("#M04(" + i + ")", c1[i], c2[i]);

+		}

+

+		int[] c3 = { 1, 2, 3 };

+		long[] c4 = new long [3];

+

+		for (int i = 0; i < c3.Length; i++)

+			c4.SetValue (c3 [i], i);

+		c3.CopyTo (c4, 0);

+		for (int i = 0; i < c3.Length; i++)

+			Assert ("#M05(" + i + ")", c3[i] == c4[i]);

+

+		Object[] c5 = new Object [3];

+		long[] c6 = new long [3];

+

+		c4.CopyTo (c5, 0);

+

+		c5.CopyTo (c6, 0);

+		// for (int i = 0; i < c5.Length; i++)

+		// Assert ("#M06(" + i + ")", c5[i] == c6[i]);

+	}

+

+	public void TestSetValue2() {

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				c.SetValue("buh", 1,1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#M21", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				c.SetValue("buh", -1, 1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#M22", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				c.SetValue("buh", 4,1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#M23", errorThrown);

+		}

+

+		char[,] c1 = new Char[4,6];

+		char[,] c2 = new Char[4,6];

+		for (int i = 0; i < 24; i++) {

+			int first = i / 6;

+			int second = i % 6;

+			c1[first,second] = (char)(((int)'a')+i);

+			c2.SetValue(c1[first,second], first, second);

+		}

+		for (int i = 0; i < c1.GetLength(0); i++) {

+			for (int j = 0; j < c1.GetLength(1); j++) {

+				AssertEquals("#M24(" + i + "," + j + ")",

+					     c1[i,j], c2[i, j]);

+			}

+		}

+	}

+	public void TestSetValue3() {

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				c.SetValue("buh", 1,1,1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#M41", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,,] c = new Char[2,2,2];

+				c.SetValue("buh", -1, 1, 1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#M42", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,,] c = new Char[2,2,2];

+				c.SetValue("buh", 4,1,1);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#M43", errorThrown);

+		}

+

+		char[,,] c1 = new Char[4,2,3];

+		char[,,] c2 = new Char[4,2,3];

+		for (int i = 0; i < 24; i++) {

+			int first = i / 6;

+			int remains = i % 6;

+			int second = remains / 3;

+			int third = remains % 3;

+			c1[first,second, third] = (char)(((int)'a')+i);

+			c2.SetValue(c1[first, second, third], first, second, third);

+		}

+		for (int i = 0; i < c1.GetLength(0); i++) {

+			for (int j = 0; j < c1.GetLength(1); j++) {

+				for (int k = 0; k < c1.GetLength(2); k++) {

+					AssertEquals("#M44(" + i + "," + j + " )",

+						     c1[i,j,k], c2[i,j,k]);

+				}

+			}

+		}

+	}

+	public void TestSetValueN() {

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				c.SetValue("buh", null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#M61", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c = new Char[2];

+				int[] coords = {1, 1};

+				c.SetValue("buh", coords);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#M62", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				int[] coords = {-1, 1};

+				c.SetValue("buh", coords);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#M63", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[,] c = new Char[2,2];

+				int[] coords = {4, 1};

+				c.SetValue("buh", coords);

+			} catch (IndexOutOfRangeException) {

+				errorThrown = true;

+			}

+			Assert("#M64", errorThrown);

+		}

+

+		char[,] c1 = new Char[4,6];

+		char[,] c2 = new Char[4,6];

+		for (int i = 0; i < 24; i++) {

+			int first = i / 6;

+			int second = i % 6;

+			c1[first,second] = (char)(((int)'a')+i);

+			int[] coords = {first, second};

+			c2.SetValue(c1[first,second], coords);

+		}

+		for (int i = 0; i < c1.GetLength(0); i++) {

+			for (int j = 0; j < c1.GetLength(1); j++) {

+				AssertEquals("#M65(" + i + "," + j + ")",

+					     c1[i,j], c2[i,j]);

+			}

+		}

+	}

+

+	public void TestSetValue4() {

+		{

+			int[] c1 = { 1, 2, 3 };

+			long[] c2 = new long [3];

+

+			for (int i = 0; i < c1.Length; i++)

+				c2.SetValue (c1 [i], i);

+

+			for (int i = 0; i < c1.Length; i++) {

+				Assert ("#M81(" + i + ")", c1[i] == c2[i]);

+				AssertEquals ("#M82(" + i + ")", typeof (long), c2[i].GetType ());

+			}

+		}

+		{

+			long[] c1 = { 1, 2, 3 };

+			int[] c2 = new int [3];

+			bool errorThrown = false;

+			try {

+				c2.SetValue (c1 [0], 0);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("#M83", errorThrown);

+		}

+		{

+			int[] c1 = { 1, 2, 3 };

+			Object[] c2 = new Object [3];

+

+			for (int i = 0; i < c1.Length; i++)

+				c2.SetValue (c1 [i], i);

+

+			for (int i = 0; i < c1.Length; i++)

+				AssertEquals ("#M84(" + i + ")", c1[i], Convert.ToInt32 (c2[i]));

+		}

+		{

+			Object[] c1 = new Object [3];

+			Object[] c2 = new Object [3];

+			c1[0] = new Object ();

+

+			for (int i = 0; i < c1.Length; i++)

+				c2.SetValue (c1 [i], i);

+

+			for (int i = 0; i < c1.Length; i++)

+				AssertEquals ("#M85(" + i + ")", c1[i], c2[i]);

+		}

+		{

+			Object[] c1 = new Object [3];

+			string[] c2 = new String [3];

+			string test = "hello";

+			c1[0] = test;

+

+			c2.SetValue (c1 [0], 0);

+			AssertEquals ("#M86", c1[0], c2[0]);

+			AssertEquals ("#M87", "hello", c2[0]);

+		}

+		{

+			char[] c1 = { 'a', 'b', 'c' };

+			string[] c2 = new string [3];

+			try {

+				c2.SetValue (c1 [0], 0);

+				Fail ("#M88");

+			} catch (InvalidCastException) {}

+		}

+		{

+			Single[] c1 = { 1.2F, 2.3F, 3.4F, 4.5F };

+			long[] c2 = new long [3];

+			try {

+				c2.SetValue (c1 [0], 0);

+				Fail ("#M89");

+			} catch (ArgumentException) {}

+		}

+		{

+			Type[] types = {

+				typeof (Boolean),

+				typeof (Byte),

+				typeof (Char),

+				typeof (Double),

+				typeof (Int16),

+				typeof (Int32),

+				typeof (Int64),

+				typeof (SByte),

+				typeof (Single),

+				typeof (UInt16),

+				typeof (UInt32),

+				typeof (UInt64)

+			};

+

+			bool v1 = true;

+			Byte v2 = 1;

+			Char v3 = 'a';

+			Double v4 = -1.2;

+			Int16 v5 = -32;

+			Int32 v6 = -234;

+			Int64 v7 = -34523;

+			SByte v8 = -1;

+			Single v9 = -4.8F;

+			UInt16 v10 = 24234;

+			UInt32 v11 = 235354;

+			UInt64 v12 = 234552;

+

+			Object[] va1 = { v1, v2, v3, v4, v5, v6, v7, v8, v9, v10, v11, v12 };

+			Object[] va2 = { "true", "1", "a", "-1.2", "-32", "-234", "-34523", "-1",

+					 "-4.8F", "24234", "235354", "234552" };

+

+			Object[][] vt = { va1, va1, va1, va1, va1, va1, va1, va1, va1, va1, va1, va1 };

+

+			int[] arg_ex = {

+				0, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,

+				1, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0,

+				1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0,

+				1, 1, 1, 0, 1, 1, 1, 1, 1, 1, 1, 1,

+				1, 1, 1, 0, 0, 0, 0, 1, 0, 1, 1, 1,

+				1, 1, 1, 0, 1, 0, 0, 1, 0, 1, 1, 1,

+				1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 1, 1,

+				1, 1, 1, 0, 0, 0, 0, 0, 0, 1, 1, 1,

+				1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 1,

+				1, 1, 0, 0, 1, 0, 0, 1, 0, 0, 0, 0,

+				1, 1, 1, 0, 1, 1, 0, 1, 0, 1, 0, 0,

+				1, 1, 1, 0, 1, 1, 1, 1, 0, 1, 1, 0

+			};

+

+			// SetValue

+

+			for (int i = 0; i < types.Length; i++) {

+				for (int j = 0; j < types.Length; j++) {

+					Array array = Array.CreateInstance (types [j], 2);

+

+					Object value = vt[j][i];

+

+					bool errorThrown = false;

+					try {

+						array.SetValue (value, 0);

+					} catch (ArgumentException) {

+						errorThrown = true;

+					}

+

+					int ex_index = (i * types.Length) + j;

+

+					AssertEquals ("#M90(" + types [i] + "," + types [j] + ")",

+						      errorThrown, arg_ex [ex_index] == 1);

+				}

+			}

+

+			for (int i = 0; i < types.Length; i++) {

+				String[] array = new String [2];

+

+				Object value = va1 [i];

+

+				bool errorThrown = false;

+				try {

+					array.SetValue (value, 0);

+				} catch (InvalidCastException) {

+					errorThrown = true;

+				}

+

+				Assert ("#M91(" + types [i] + ")", errorThrown);

+			}

+

+			for (int i = 0; i < types.Length; i++) {

+				Array array = Array.CreateInstance (types [i], 2);

+

+				Object value = va2 [i];

+

+				bool errorThrown = false;

+				try {

+					array.SetValue (value, 0);

+				} catch (InvalidCastException) {

+					errorThrown = true;

+				}

+

+				Assert ("#M92(" + types [i] + ")", errorThrown);

+			}

+

+			for (int i = 0; i < types.Length; i++) {

+				Array array = Array.CreateInstance (types [i], 2);

+

+				Object value = null;

+

+				bool errorThrown = false;

+				try {

+					array.SetValue (value, 0);

+				} catch (InvalidCastException) {

+					errorThrown = true;

+				}

+

+				Assert ("#M93(" + types [i] + ")", !errorThrown);

+			}

+

+			// Copy

+

+			for (int i = 0; i < types.Length; i++) {

+				for (int j = 0; j < types.Length; j++) {

+					Array source = Array.CreateInstance (types [i], 2);

+					Array array = Array.CreateInstance (types [j], 2);

+

+					source.SetValue (vt[j][i], 0);

+					source.SetValue (vt[j][i], 1);

+

+					bool errorThrown = false;

+					try {

+						Array.Copy (source, array, 2);

+					} catch (ArrayTypeMismatchException) {

+						errorThrown = true;

+					}

+

+					int ex_index = (i * types.Length) + j;

+

+					AssertEquals ("#M94(" + types [i] + "," + types [j] + ")",

+						      errorThrown, arg_ex [ex_index] == 1);

+				}

+			}

+

+			for (int i = 0; i < types.Length; i++) {

+				Array source = Array.CreateInstance (types [i], 2);

+				String[] array = new String [2];

+

+				source.SetValue (va1 [i], 0);

+				source.SetValue (va1 [i], 1);

+

+				bool errorThrown = false;

+				try {

+					Array.Copy (source, array, 2);

+				} catch (ArrayTypeMismatchException) {

+					errorThrown = true;

+				}

+

+				Assert ("#M95(" + types [i] + ")", errorThrown);

+			}

+

+			for (int i = 0; i < types.Length; i++) {

+				String[] source = new String [2];

+				Array array = Array.CreateInstance (types [i], 2);

+

+				source.SetValue (va2 [i], 0);

+				source.SetValue (va2 [i], 1);

+

+				bool errorThrown = false;

+				try {

+					Array.Copy (source, array, 2);

+				} catch (ArrayTypeMismatchException) {

+					errorThrown = true;

+				}

+

+				Assert ("#M96(" + types [i] + ")", errorThrown);

+			}

+		}

+	}

+

+

+	public void TestSort() {

+		{

+			bool errorThrown = false;

+			try {

+				Array.Sort(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#N01", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Array.Sort(null, 0, 1);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#N02", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c1 = new Char[2];

+				Array.Sort(null, c1);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#N03", errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				char[] c1 = new Char[2];

+				Array.Sort(null, c1, 0, 1);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("#N04", errorThrown);

+		}

+

+		// note: null second array => just sort first array

+		char[] starter = {'d', 'b', 'f', 'e', 'a', 'c'};

+		int[] starter1 = {1,2,3,4,5,6};

+		{

+			char[] c1 = (char[])starter.Clone();

+			Array.Sort(c1);

+			AssertEquals("#N21", 'a', c1[0]);

+			AssertEquals("#N22", 'b', c1[1]);

+			AssertEquals("#N23", 'c', c1[2]);

+			AssertEquals("#N24", 'd', c1[3]);

+			AssertEquals("#N25", 'e', c1[4]);

+			AssertEquals("#N26", 'f', c1[5]);

+		}

+		{

+			char[] c1 = (char[])starter.Clone();

+			int[] i1 = (int[])starter1.Clone();

+			Array.Sort(c1, i1);

+			AssertEquals("#N41", 'a', c1[0]);

+			AssertEquals("#N42", 'b', c1[1]);

+			AssertEquals("#N43", 'c', c1[2]);

+			AssertEquals("#N44", 'd', c1[3]);

+			AssertEquals("#N45", 'e', c1[4]);

+			AssertEquals("#N46", 'f', c1[5]);

+			AssertEquals("#N47", 5, i1[0]);

+			AssertEquals("#N48", 2, i1[1]);

+			AssertEquals("#N49", 6, i1[2]);

+			AssertEquals("#N50", 1, i1[3]);

+			AssertEquals("#N51", 4, i1[4]);

+			AssertEquals("#N52", 3, i1[5]);

+		}

+		{

+			char[] c1 = (char[])starter.Clone();

+			Array.Sort(c1, 1, 4);

+			AssertEquals("#N61", 'd', c1[0]);

+			AssertEquals("#N62", 'a', c1[1]);

+			AssertEquals("#N63", 'b', c1[2]);

+			AssertEquals("#N64", 'e', c1[3]);

+			AssertEquals("#N65", 'f', c1[4]);

+			AssertEquals("#N66", 'c', c1[5]);

+		}

+		{

+			char[] c1 = (char[])starter.Clone();

+			int[] i1 = (int[])starter1.Clone();

+			Array.Sort(c1, i1, 1, 4);

+			AssertEquals("#N81", 'd', c1[0]);

+			AssertEquals("#N82", 'a', c1[1]);

+			AssertEquals("#N83", 'b', c1[2]);

+			AssertEquals("#N84", 'e', c1[3]);

+			AssertEquals("#N85", 'f', c1[4]);

+			AssertEquals("#N86", 'c', c1[5]);

+			AssertEquals("#N87", 1, i1[0]);

+			AssertEquals("#N88", 5, i1[1]);

+			AssertEquals("#N89", 2, i1[2]);

+			AssertEquals("#N90", 4, i1[3]);

+			AssertEquals("#N91", 3, i1[4]);

+			AssertEquals("#N92", 6, i1[5]);

+		}

+	}

+

+	// TODO - TestSort passed-in IComparable versions

+

+}

+

+}

diff --git a/mcs/class/corlib/Test/System/AttributeTest.cs b/mcs/class/corlib/Test/System/AttributeTest.cs
new file mode 100755
index 00000000000..febe82fe118
--- /dev/null
+++ b/mcs/class/corlib/Test/System/AttributeTest.cs
@@ -0,0 +1,164 @@
+//
+// AttributeTest.cs - NUnit Test Cases for the System.Attribute class
+//
+// author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (C) 2002 Duco Fijma
+//
+
+using NUnit.Framework;
+using System;
+
+namespace MonoTests.System
+{
+
+// Inner namespace for some test helper classes
+using MonoTests.System.AttributeTestInternals;
+
+namespace AttributeTestInternals
+{
+
+[AttributeUsage(AttributeTargets.Class, AllowMultiple=true, Inherited=false)]
+internal class MyCustomAttribute : Attribute {
+
+	private string _info;
+
+	public MyCustomAttribute (string info)
+	{
+		_info = info;
+	}
+
+	public string Info 
+	{
+		get {
+			return _info;
+		}
+	}
+
+}
+
+[AttributeUsage(AttributeTargets.Class)]
+internal class YourCustomAttribute : Attribute {
+	
+	private int _value;
+
+	public YourCustomAttribute (int value) 
+	{
+		_value = value;
+	}
+
+	public int Value 
+	{
+		get {
+			return _value;
+		}
+	}
+}
+
+[AttributeUsage(AttributeTargets.Class)]
+internal class UnusedAttribute : Attribute {
+}
+
+[MyCustomAttribute("MyBaseClass"), YourCustomAttribute(37)]
+internal class MyClass {
+	int Value { get { return 42; }}
+}
+
+[MyCustomAttribute("MyDerivedClass")]
+internal class MyDerivedClass : MyClass {
+	public void Do () {}
+}
+
+} // Namespace MonoTests.System.AttributeTestInternals
+
+public class AttributeTest : TestCase {
+		
+	public AttributeTest () : base("MonoTests.System.AttributeTest testcase") {}
+	public AttributeTest (string name) : base(name) {}
+
+	public static ITest Suite {
+		get {
+			return new TestSuite(typeof(AttributeTest));
+		}
+	}
+
+	public void TestIsDefined ()
+	{
+		AssertEquals ("A1", true, Attribute.IsDefined(typeof(MyDerivedClass), typeof(MyCustomAttribute)));
+		AssertEquals ("A2", true, Attribute.IsDefined(typeof(MyDerivedClass), typeof(YourCustomAttribute)));
+		AssertEquals ("A3", false, Attribute.IsDefined(typeof(MyDerivedClass), typeof(UnusedAttribute)));
+		AssertEquals ("A4", true, Attribute.IsDefined(typeof(MyDerivedClass), typeof(MyCustomAttribute), true));
+		AssertEquals ("A5", true, Attribute.IsDefined(typeof(MyDerivedClass), typeof(YourCustomAttribute), true));
+		AssertEquals ("A6", false, Attribute.IsDefined(typeof(MyDerivedClass), typeof(UnusedAttribute), false));
+		AssertEquals ("A7", true, Attribute.IsDefined(typeof(MyDerivedClass), typeof(MyCustomAttribute), false));
+		AssertEquals ("A8", false, Attribute.IsDefined(typeof(MyDerivedClass), typeof(YourCustomAttribute), false));
+		AssertEquals ("A9", false, Attribute.IsDefined(typeof(MyDerivedClass), typeof(UnusedAttribute), false));
+	}
+
+/*
+	public static void TestIsDefaultAttribute () 
+	{
+		Console.WriteLine(">>>IsDefaultAttribute");
+
+		Attribute a =  Attribute.GetCustomAttribute(typeof(MyClass), typeof(MyCustomAttribute));
+		Console.WriteLine (a.IsDefaultAttribute() );
+	}
+
+	private static void WriteAttribute (Attribute a)
+	{
+		if (a == null) {
+			Console.WriteLine ("NULL");
+		}
+		else {
+			Console.WriteLine (a);
+		}
+	}
+*/
+
+	public void TestGetCustomAttribute ()
+	{
+		int i = 1;
+		Type t = typeof(MyDerivedClass);
+		try {
+			AssertEquals ("A1",  "MyDerivedClass", ((MyCustomAttribute) (Attribute.GetCustomAttribute(typeof(MyDerivedClass), typeof(MyCustomAttribute), false))).Info);
+			i++;
+			AssertEquals ("A2", null, ((YourCustomAttribute) (Attribute.GetCustomAttribute(typeof(MyDerivedClass), typeof(YourCustomAttribute), false))));
+			i++;
+			AssertEquals ("A3",  "MyDerivedClass", ((MyCustomAttribute) (Attribute.GetCustomAttribute(typeof(MyDerivedClass), typeof(MyCustomAttribute)))).Info);
+			i++;
+			AssertEquals ("A4", 37, ((YourCustomAttribute) (Attribute.GetCustomAttribute(t, typeof(YourCustomAttribute)))).Value);
+		} catch (Exception e) {
+			Fail ("Unexpected exception thrown at i=" + i + " with t=" + t + ". e=" + e);
+		}
+	}
+/*
+
+	public static void WriteAttributes (Attribute[] attrs)
+	{
+		Console.WriteLine("length = {0}", attrs.Length);
+		foreach (Attribute a in attrs) {
+			WriteAttribute (a);
+		}
+	}
+
+
+	private static void TestGetCustomAttributes ()
+	{
+		Console.WriteLine(">>>GetCustomAttributes");
+
+
+		WriteAttributes (Attribute.GetCustomAttributes(typeof(MyDerivedClass), typeof(MyCustomAttribute)));
+		WriteAttributes (Attribute.GetCustomAttributes(typeof(MyDerivedClass), typeof(MyCustomAttribute), true));
+		WriteAttributes (Attribute.GetCustomAttributes(typeof(MyDerivedClass), typeof(MyCustomAttribute), false));
+
+		WriteAttributes (Attribute.GetCustomAttributes(typeof(MyDerivedClass)));
+		WriteAttributes (Attribute.GetCustomAttributes(typeof(MyDerivedClass), true));
+		WriteAttributes (Attribute.GetCustomAttributes(typeof(MyDerivedClass), false));
+	}
+
+*/
+
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/BitConverterTest.cs b/mcs/class/corlib/Test/System/BitConverterTest.cs
new file mode 100755
index 00000000000..6510b83255e
--- /dev/null
+++ b/mcs/class/corlib/Test/System/BitConverterTest.cs
@@ -0,0 +1,545 @@
+//
+// BitConverterTest.cs - NUnit Test Cases for System.BitConverter
+//
+// author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+// (C) 2002 Duco Fijma
+// 
+
+using NUnit.Framework;
+using System;
+
+namespace MonoTests.System
+{
+
+public class BitConverterTest : TestCase {
+	
+	public BitConverterTest () : base ("System.BitConverter testsuite") {}
+	public BitConverterTest (string name) : base(name) {}
+
+	protected override void SetUp () {}
+
+	protected override void TearDown() {}
+
+	// this property is required.  You need change the parameter for
+	// typeof() below to be your class.
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(BitConverterTest)); 
+		}
+	}
+
+	public void TestIsLittleEndian ()
+	{
+		byte[] b;
+
+		b = BitConverter.GetBytes (1);
+		AssertEquals ("A1", b[0] == 1, BitConverter.IsLittleEndian );
+	}
+
+	private void PrivateTestSingle (float v1)
+	{
+		float v2;
+		byte[] b;
+		byte[] larger = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 }; 
+		bool exception;
+		
+		b = BitConverter.GetBytes (v1);
+		AssertEquals("A1", 4, b.Length);
+
+		v2 = BitConverter.ToSingle (b, 0);
+		AssertEquals("A2", v1, v2);	
+
+		b.CopyTo (larger, 1);
+		v2 = BitConverter.ToSingle (larger, 1);
+		AssertEquals("A3", v1, v2);
+
+		try {
+			v2 = BitConverter.ToSingle (larger, 8);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A4", exception);
+
+		try {
+			v2 = BitConverter.ToSingle ((byte[]) null, 77);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+	}
+
+	public void TestSingle()
+	{
+		PrivateTestSingle (0.1f);
+		PrivateTestSingle (24.1e30f);
+	}
+
+	private void PrivateTestDouble (double v1)
+	{
+		double v2;
+		byte[] b;
+		byte[] larger = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 }; 
+		bool exception;
+		
+		b = BitConverter.GetBytes (v1);
+		AssertEquals("A1", 8, b.Length);
+
+		v2 = BitConverter.ToDouble (b, 0);
+		AssertEquals("A2", v1, v2);	
+
+		b.CopyTo (larger, 1);
+		v2 = BitConverter.ToDouble (larger, 1);
+		AssertEquals("A3", v1, v2);
+
+		try {
+			v2 = BitConverter.ToDouble (larger, 3);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A4", exception);
+
+		try {
+			v2 = BitConverter.ToDouble ((byte[]) null, 77);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+	}
+
+	public void TestDouble ()
+	{
+		double d = 123.321;
+
+		AssertEquals("A1", d, BitConverter.Int64BitsToDouble (BitConverter.DoubleToInt64Bits (d)));
+
+		PrivateTestDouble (0.1);
+		PrivateTestDouble (24.1e77);
+	}
+
+	private void PrivateTestBool (bool v1)
+	{
+		bool v2;
+		byte[] b;
+		byte[] larger = new byte[] { 0x00, 0x01, 0x02, 0x03 }; 
+		bool exception;
+		
+		b = BitConverter.GetBytes (v1);
+		AssertEquals("A1", 1, b.Length);
+
+		v2 = BitConverter.ToBoolean (b, 0);
+		AssertEquals("A2", v1, v2);	
+
+		b.CopyTo (larger, 1);
+		v2 = BitConverter.ToBoolean (larger, 1);
+		AssertEquals("A3", v1, v2);
+
+		try {
+			v2 = BitConverter.ToBoolean (larger, 4);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A4", exception);
+
+		try {
+			v2 = BitConverter.ToBoolean ((byte[]) null, 77);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+	}
+
+	public void TestBool () {
+		PrivateTestBool(true);
+		PrivateTestBool(false);
+	}
+
+	private void PrivateTestChar (char v1)
+	{
+		char v2;
+		byte[] b;
+		byte[] larger = new byte[] { 0x00, 0x01, 0x02, 0x03 }; 
+		bool exception;
+		
+		b = BitConverter.GetBytes (v1);
+		AssertEquals("A1", 2, b.Length);
+
+		v2 = BitConverter.ToChar (b, 0);
+		AssertEquals("A2", v1, v2);	
+
+		b.CopyTo (larger, 1);
+		v2 = BitConverter.ToChar (larger, 1);
+		AssertEquals("A3", v1, v2);
+
+		try {
+			v2 = BitConverter.ToChar (larger, 3);
+			exception = false;
+		}
+		// LAMESPEC:
+		// the docs say it should be ArgumentOutOfRangeException, but
+		// the mscorlib throws an ArgumentException.
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A4", exception);
+
+		try {
+			v2 = BitConverter.ToChar ((byte[]) null, 77);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+	}
+
+	public void TestChar ()
+	{
+		PrivateTestChar('A');
+		PrivateTestChar('\x01ff');
+	}
+
+	private void PrivateTestInt16 (short v1)
+	{
+		short v2;
+		byte[] b;
+		byte[] larger = new byte[] { 0x00, 0x01, 0x02, 0x03 }; 
+		bool exception;
+		
+		b = BitConverter.GetBytes (v1);
+		AssertEquals("A1", 2, b.Length);
+
+		v2 = BitConverter.ToInt16 (b, 0);
+		AssertEquals("A2", v1, v2);	
+
+		b.CopyTo (larger, 1);
+		v2 = BitConverter.ToInt16 (larger, 1);
+		AssertEquals("A3", v1, v2);
+
+		try {
+			v2 = BitConverter.ToInt16 (larger, 3);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A4", exception);
+
+		try {
+			v2 = BitConverter.ToInt16 ((byte[]) null, 77);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+	}
+
+	public void TestInt16 ()
+	{
+		PrivateTestInt16 (0);
+		PrivateTestInt16 (1000);
+		PrivateTestInt16 (-32768);
+		PrivateTestInt16 (32767);
+	}
+
+	private void PrivateTestUInt16 (ushort v1)
+	{
+		ushort v2;
+		byte[] b;
+		byte[] larger = new byte[] { 0x00, 0x01, 0x02, 0x03 }; 
+		bool exception;
+		
+		b = BitConverter.GetBytes (v1);
+		AssertEquals("A1", 2, b.Length);
+
+		v2 = BitConverter.ToUInt16 (b, 0);
+		AssertEquals("A2", v1, v2);	
+
+		b.CopyTo (larger, 1);
+		v2 = BitConverter.ToUInt16 (larger, 1);
+		AssertEquals("A3", v1, v2);
+
+		try {
+			v2 = BitConverter.ToUInt16 (larger, 3);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A4", exception);
+
+		try {
+			v2 = BitConverter.ToUInt16 ((byte[]) null, 77);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+	}
+
+	public void TestUInt16 ()
+	{
+		PrivateTestUInt16 (0);
+		PrivateTestUInt16 (1000);
+		PrivateTestUInt16 (65535);
+	}
+
+	private void PrivateTestInt32 (int v1)
+	{
+		int v2;
+		byte[] b;
+		byte[] larger = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 }; 
+		bool exception;
+		
+		b = BitConverter.GetBytes (v1);
+		AssertEquals("A1", 4, b.Length);
+
+		v2 = BitConverter.ToInt32 (b, 0);
+		AssertEquals("A2", v1, v2);	
+
+		b.CopyTo (larger, 1);
+		v2 = BitConverter.ToInt32 (larger, 1);
+		AssertEquals("A3", v1, v2);
+
+		try {
+			v2 = BitConverter.ToInt32 (larger, 8);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A4", exception);
+
+		try {
+			v2 = BitConverter.ToInt32 ((byte[]) null, 77);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+	}
+
+	public void TestInt32 ()
+	{
+		PrivateTestInt32 (0);
+		PrivateTestInt32 (1000);
+		PrivateTestInt32 (-2147483648);
+		PrivateTestInt32 (2147483647);
+	}
+
+	private void PrivateTestUInt32 (uint v1)
+	{
+		uint v2;
+		byte[] b;
+		byte[] larger = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 }; 
+		bool exception;
+		
+		b = BitConverter.GetBytes (v1);
+		AssertEquals ("A1", 4, b.Length);
+
+		v2 = BitConverter.ToUInt32 (b, 0);
+		AssertEquals ("A2", v1, v2);	
+
+		b.CopyTo (larger, 1);
+		v2 = BitConverter.ToUInt32 (larger, 1);
+		AssertEquals ("A3", v1, v2);
+
+		try {
+			v2 = BitConverter.ToUInt32 (larger, 8);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A4", exception);
+
+		try {
+			v2 = BitConverter.ToUInt32 ((byte[]) null, 77);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+	}
+
+	public void TestUInt32 ()
+	{
+		PrivateTestUInt32 (0u);
+		PrivateTestUInt32 (1000u);
+		PrivateTestUInt32 (4294967295u);
+	}
+
+	private void PrivateTestInt64 (long v1)
+	{
+		long v2;
+		byte[] b;
+		byte[] larger = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 }; 
+		bool exception;
+		
+		b = BitConverter.GetBytes (v1);
+		AssertEquals ("A1", 8, b.Length);
+
+		v2 = BitConverter.ToInt64 (b, 0);
+		AssertEquals ("A2", v1, v2);	
+
+		b.CopyTo (larger, 1);
+		v2 = BitConverter.ToInt64 (larger, 1);
+		AssertEquals ("A3", v1, v2);
+
+		try {
+			v2 = BitConverter.ToInt64 (larger, 8);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A4", exception);
+
+		try {
+			v2 = BitConverter.ToInt64 ((byte[]) null, 77);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+	}
+
+	public void TestInt64 ()
+	{
+		PrivateTestInt64 (0);
+		PrivateTestInt64 (1000);
+		PrivateTestInt64 (-9223372036854775808);
+		PrivateTestInt64 (9223372036854775807);
+	}
+
+	private void PrivateTestUInt64 (ulong v1)
+	{
+		ulong v2;
+		byte[] b;
+		byte[] larger = new byte[] { 0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09 }; 
+		bool exception;
+		
+		b = BitConverter.GetBytes (v1);
+		AssertEquals("A1", 8, b.Length);
+
+		v2 = BitConverter.ToUInt64 (b, 0);
+		AssertEquals("A2", v1, v2);	
+
+		b.CopyTo (larger, 1);
+		v2 = BitConverter.ToUInt64 (larger, 1);
+		AssertEquals("A3", v1, v2);
+
+		try {
+			v2 = BitConverter.ToUInt64 (larger, 8);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A4", exception);
+
+		try {
+			v2 = BitConverter.ToUInt64 ((byte[]) null, 77);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+	}
+
+	public void TestUInt64 ()
+	{
+		PrivateTestUInt64 (0);
+		PrivateTestUInt64 (1000);
+		PrivateTestUInt64 (18446744073709551615);
+	}
+
+	public void TestToString ()
+	{
+		string s;
+		bool exception;
+
+		byte[] b = new byte[] {0x00, 0x11, 0x22, 0x33, 0x44, 0x55, 0x66, 0x77, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff};
+
+		AssertEquals ("A1", "00-11-22-33-44-55-66-77-88-99-AA-BB-CC-DD-EE-FF", BitConverter.ToString (b));
+		AssertEquals ("A2", "66-77-88-99-AA-BB-CC-DD-EE-FF", BitConverter.ToString (b, 6));
+		AssertEquals ("A3", "66-77-88", BitConverter.ToString (b, 6, 3));
+
+		try {
+			s = BitConverter.ToString ((byte[]) null);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A4", exception);
+
+		try {
+			s = BitConverter.ToString (b, 20);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		} 
+		Assert ("A5", exception);
+
+		try {
+			s = BitConverter.ToString ((byte[]) null, 20);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A6", exception);
+
+                try {
+                        s = BitConverter.ToString (b, 20, 3);
+                        exception = false;
+                }
+                catch (ArgumentOutOfRangeException) {
+                        exception = true;
+                }
+                Assert ("A7", exception);
+
+                try {
+                	s = BitConverter.ToString ((byte[]) null, 20, 3);
+                        exception = false;
+                }
+                catch (ArgumentNullException) {
+                        exception = true;
+                }
+                Assert ("A8", exception);
+
+                try {
+                        s = BitConverter.ToString (b, 16, 0);
+                        exception = false;
+                }
+                catch (ArgumentOutOfRangeException) {
+                        exception = true;
+                }
+                Assert ("A9", exception);
+
+
+	}
+
+}
+}
diff --git a/mcs/class/corlib/Test/System/BooleanTest.cs b/mcs/class/corlib/Test/System/BooleanTest.cs
new file mode 100644
index 00000000000..a7bae95c993
--- /dev/null
+++ b/mcs/class/corlib/Test/System/BooleanTest.cs
@@ -0,0 +1,113 @@
+// BooleanTest.cs - NUnit Test Cases for the System.Boolean class

+//

+// Bob Doan <bdoan@sicompos.com>

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+//

+

+using NUnit.Framework;

+using System;

+using System.Globalization;

+

+namespace MonoTests.System

+{

+

+public class BooleanTest : TestCase

+{

+	public BooleanTest () : base ("MonoTests.System.BooleanTests testcase") {}

+	public BooleanTest (string name) : base (name) {}

+

+	protected override void SetUp ()

+	{

+	}

+

+	public static ITest Suite {

+		get {

+			return new TestSuite (typeof (BooleanTest));

+		}

+	}

+

+	public void TestStrings ()

+	{

+		AssertEquals("Wrong False string", "False", Boolean.FalseString);

+		AssertEquals("Wrong True string", "True", Boolean.TrueString);

+	}

+	

+	public void TestCompareTo() {

+		Boolean t=true,f=false;

+		String s = "What Ever";

+		AssertEquals("CompareTo Failed", true, f.CompareTo(t) < 0);

+		AssertEquals("CompareTo Failed", 0, f.CompareTo(f));

+		AssertEquals("CompareTo Failed", 0, t.CompareTo(t));

+		AssertEquals("CompareTo Failed", true, t.CompareTo(f) > 0);

+		AssertEquals("CompareTo Failed", true, t.CompareTo(null) > 0);

+		try {

+			t.CompareTo(s);

+			Fail("CompareTo should raise a System.ArgumentException");

+		}

+		catch (Exception e) {

+			Assert("CompareTo should be a System.ArgumentException", typeof(ArgumentException) == e.GetType());

+		}		

+	}

+

+	public void TestEquals() {

+		Boolean t=true, f=false;

+		String s = "What Ever";

+		AssertEquals("Equals Failed", true, t.Equals(t));

+		AssertEquals("Equals Failed", true, f.Equals(f));

+		AssertEquals("Equals Failed", false, f.Equals(t));

+		AssertEquals("Equals Failed", false, t.Equals(null));

+		AssertEquals("Equals Failed", false, t.Equals(s));

+	}

+

+	public void TestGetHashCode() {

+		Boolean t=true, f=false;

+		AssertEquals("GetHashCode True failed", 1, t.GetHashCode());

+		AssertEquals("GetHashCode True failed", 0, f.GetHashCode());

+	}

+

+	public void TestGetType() {

+		Boolean t=true, f=false;

+		AssertEquals("GetType failed", true, Object.ReferenceEquals(t.GetType(), f.GetType()));

+	}

+

+	public void TestGetTypeCode() {

+		Boolean b=true;

+		AssertEquals("GetTypeCode failed", TypeCode.Boolean, b.GetTypeCode());

+	}

+

+	public void TestParse() {

+		AssertEquals("Parse True failed", true, Boolean.Parse("True"));

+		AssertEquals("Parse True failed", true, Boolean.Parse(" True"));

+		AssertEquals("Parse True failed", true, Boolean.Parse("True "));

+		AssertEquals("Parse True failed", true, Boolean.Parse("tRuE"));

+		AssertEquals("Parse False failed", false, Boolean.Parse("False"));

+		AssertEquals("Parse False failed", false, Boolean.Parse(" False"));

+		AssertEquals("Parse False failed", false, Boolean.Parse("False "));

+		AssertEquals("Parse False failed", false, Boolean.Parse("fAlSe"));

+		

+		try {

+			Boolean.Parse("not-t-or-f");

+			Fail("Parse should raise a System.FormatException");

+		}

+		catch (Exception e) {

+			Assert("Parse should be a System.FormatException", typeof(FormatException) == e.GetType());

+		}		

+

+		try {

+			Boolean.Parse(null);

+			Fail("Parse should raise a System.ArgumentNullException");

+		}

+		catch (Exception e) {

+			Assert("Parse should be a System.ArgumentNullException", typeof(ArgumentNullException) == e.GetType());

+		}		

+	}

+	

+	public void TestToString() {

+		Boolean t=true,f=false;

+		AssertEquals("ToString True Failed", Boolean.TrueString, t.ToString());

+		AssertEquals("ToString False Failed", Boolean.FalseString, f.ToString());

+	}

+}

+

+}

diff --git a/mcs/class/corlib/Test/System/BufferTest.cs b/mcs/class/corlib/Test/System/BufferTest.cs
new file mode 100644
index 00000000000..3423559490a
--- /dev/null
+++ b/mcs/class/corlib/Test/System/BufferTest.cs
@@ -0,0 +1,150 @@
+// BufferTest.cs - NUnit Test Cases for the Buffer class.
+//
+// Cesar Octavio Lopez Nataren (cesar@ciencias.unam.mx)
+//
+// (C) Cesar Octavio Lopez Nataren 2002
+// 
+
+using NUnit.Framework;
+using System;
+
+
+namespace MonoTests.System
+{
+	public class BufferTest : TestCase
+	{
+		const int SIZE = 10;
+		byte [] byteArray  = new byte [SIZE];   // 8-bits unsigned integer array
+		float [] floatArray = new float [SIZE];
+		
+		public BufferTest ()
+			: base ("System.Buffer test") {}
+		
+		public BufferTest (string name)
+			: base (name) {}
+
+		protected override void SetUp () {}
+
+
+		protected override void TearDown () {}
+
+		public static ITest Suite {
+			get { 
+				return new TestSuite (typeof (BufferTest)); 
+			}
+		}
+
+			
+		public void TestBlockCopy ()
+		{
+			int SizeOfInt32 = 4;
+			int [] myArray1 = new int [5] {1, 2, 3, 4, 5};
+			int [] myArray2 = new int [10] { 0, 0, 0, 0, 0, 6, 7, 8, 9, 10 };
+		
+			Buffer.BlockCopy (myArray1, 0, myArray2, 0, SizeOfInt32  * myArray1.Length);
+		
+			for (int i = 0; i < myArray1.Length; i++) 
+				AssertEquals ("TestBlockCopy Error at i=" + i, i + 1, myArray2 [i]);		
+		}
+	
+	
+		public void TestByteLength ()
+		{
+			int numBytes;	
+			bool errorThrown = false;
+			float [] floatArray = new float [10];
+		
+			try {
+				Buffer.ByteLength (null);	
+			} catch (ArgumentNullException) {
+				errorThrown = true;
+			}
+			Assert ("TestByteLength: ArgumentNullException not thrown", errorThrown);
+		
+			errorThrown = false;
+		
+			// FIXME: test the case when the ArgumentException is thrown.
+		
+			numBytes = Buffer.ByteLength (floatArray);
+			AssertEquals ("TestByteLength: wrong byteLength", 40, numBytes);
+		}
+		
+		public void TestGetByte () 
+		{
+			Byte [] byteArray;
+			bool errorThrown = false;
+			byteArray = new byte [10];
+			byteArray [5] = 8;
+		
+			try {
+				Buffer.GetByte (null, 5);
+			} catch (ArgumentNullException) {
+				errorThrown = true;
+			}
+			Assert ("TestGetByte: ArgumentNullException not thrown",
+				errorThrown);
+		
+			errorThrown = false;
+		
+			try {
+				Buffer.GetByte (byteArray, -1);
+			} catch (ArgumentOutOfRangeException) {
+				errorThrown = true;
+			}
+			Assert ("TestGetByte: ArgumentOutOfRangeException (negative index) not implemented",
+				errorThrown);
+		
+			errorThrown = false;
+		
+			try {
+				Buffer.GetByte (byteArray, 12); 
+			} catch (ArgumentOutOfRangeException) {
+				errorThrown = true;
+			}
+			Assert ("TestGetByte: ArgumentOutOfRangeException (index bigger/equal than array's size not thrown", errorThrown);
+		
+			errorThrown = false;
+		
+			// FIXME: test the case when the ArgumentException is thrown.
+		
+			AssertEquals ("TestGetByte Error", (Byte)8, Buffer.GetByte (byteArray, 5));
+		}
+	
+	
+		public void TestSetByte ()
+		{
+			bool errorThrown = false;
+		
+			try {
+				Buffer.SetByte (null, 5, 12);
+			} catch (ArgumentNullException) {
+				errorThrown = true;
+			}
+			Assert ("TestSetByte: ArgumentNullException not thrown", errorThrown);
+			errorThrown = false;
+		
+			try {
+				Buffer.SetByte (byteArray, -1, 32);
+			} catch (ArgumentOutOfRangeException) {
+				errorThrown = true;
+			}
+			Assert ("TestSetByte: ArgumentOutOfRangeException (case: negative index) not thrown",
+				errorThrown);
+			errorThrown = false;
+		
+			try {
+				Buffer.SetByte (byteArray, 12, 43);
+			} catch (ArgumentOutOfRangeException) {
+				errorThrown = true;
+			}
+			Assert ("TestSetByte: ArgumentOutOfRangeException (case: index bigger/equal than array'size",
+				errorThrown);
+			errorThrown = false;
+		
+			// FIXME: test the case when the ArgumentException is thrown
+			
+			Buffer.SetByte (byteArray, 3, (byte) 10);
+			AssertEquals ("TestSetByte", (Byte)10, Buffer.GetByte (byteArray, 3));
+		}
+	}
+}
diff --git a/mcs/class/corlib/Test/System/ByteTest.cs b/mcs/class/corlib/Test/System/ByteTest.cs
new file mode 100644
index 00000000000..751d5c22517
--- /dev/null
+++ b/mcs/class/corlib/Test/System/ByteTest.cs
@@ -0,0 +1,189 @@
+// ByteTest.cs - NUnit Test Cases for the System.Byte struct
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using NUnit.Framework;
+using System;
+using System.Globalization;
+using System.Threading;
+
+namespace MonoTests.System
+{
+
+public class ByteTest : TestCase
+{
+	private const Byte MyByte1 = 42;
+	private const Byte MyByte2 = 0;
+	private const Byte MyByte3 = 255;
+	private const string MyString1 = "42";
+	private const string MyString2 = "0";
+	private const string MyString3 = "255";
+	private string[] Formats1 = {"c", "d", "e", "f", "g", "n", "p", "x" };
+	private string[] Formats2 = {"c5", "d5", "e5", "f5", "g5", "n5", "p5", "x5" };
+	private string[] Results1 = {	"",
+					"0", "0.000000e+000", "0.00",
+					"0", "0.00", "0.00 %", "0"};
+	private string[] Results1_Nfi = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"0.00",
+					"0", "0.000000e+000", "0.00",
+					"0", "0.00", "0.00 %", "0"};
+	private string[] Results2 = {NumberFormatInfo.CurrentInfo.CurrencySymbol+"255.00000",
+					"00255", "2.55000e+002", "255.00000",
+					"255", "255.00000", "25,500.00000 %", "000ff"};
+	private string[] Results2_Nfi = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"255.00000", 
+					"00255", "2.55000e+002", "255.00000",
+					"255", "255.00000", "25,500.00000 %", "000ff"};
+
+	private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
+	
+	public ByteTest() : base ("MonoTests.System.ByteTests testcase") {}

+	public ByteTest(string name) : base(name) {}
+
+	protected override void SetUp() {
+		int cdd = NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits;
+		string csym = NumberFormatInfo.CurrentInfo.CurrencySymbol;
+		string csuffix = (cdd > 0 ? "." : "").PadRight(cdd + (cdd > 0 ? 1 : 0), '0');
+		Results1[0] = csym + "0" + csuffix;
+	}
+
+        protected override void TearDown () {
+	}
+
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(ByteTest)); 
+		}
+	}
+    
+	public void TestMinMax()
+	{
+		AssertEquals(Byte.MinValue, MyByte2);
+		AssertEquals(Byte.MaxValue, MyByte3);
+	}
+	
+	public void TestCompareTo()
+	{
+		Assert(MyByte3.CompareTo(MyByte2) > 0);
+		Assert(MyByte2.CompareTo(MyByte2) == 0);
+		Assert(MyByte1.CompareTo((Byte)42) == 0);
+		Assert(MyByte2.CompareTo(MyByte3) < 0);
+		try {
+			MyByte2.CompareTo(100);
+			Fail("Should raise a System.ArgumentException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentException) == e.GetType());
+		}
+	}
+
+	public void TestEquals()
+	{
+		Assert(MyByte1.Equals(MyByte1));
+		Assert(MyByte1.Equals((Byte)42));
+		Assert(MyByte1.Equals((Int16)42) == false);
+		Assert(MyByte1.Equals(MyByte2) == false);
+	}
+	
+	public void TestGetHashCode()
+	{
+		try {
+			MyByte1.GetHashCode();
+			MyByte2.GetHashCode();
+			MyByte3.GetHashCode();
+		}
+		catch {
+			Fail("GetHashCode should not raise an exception here");
+		}
+	}
+	
+	public void TestParse()
+	{
+		//test Parse(string s)
+		Assert("MyByte1="+MyByte1+", MyString1="+MyString1+", Parse="+Byte.Parse(MyString1) , MyByte1 == Byte.Parse(MyString1));
+		Assert("MyByte2", MyByte2 == Byte.Parse(MyString2));
+		Assert("MyByte3", MyByte3 == Byte.Parse(MyString3));
+
+		try {
+			Byte.Parse(null);
+			Fail("Should raise a System.ArgumentNullException");
+		}
+		catch (Exception e) {
+			Assert("Should get ArgumentNullException", typeof(ArgumentNullException) == e.GetType());
+		}
+		try {
+			Byte.Parse("not-a-number");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert("not-a-number", typeof(FormatException) == e.GetType());
+		}
+		try {
+			int OverInt = Byte.MaxValue + 1;
+			Byte.Parse(OverInt.ToString());
+			Fail("Should raise a System.OverflowException");
+		}
+		catch (Exception e) {
+			Assert("OverflowException", typeof(OverflowException) == e.GetType());
+		}
+
+		//test Parse(string s, NumberStyles style)
+		AssertEquals(" "+NumberFormatInfo.CurrentInfo.CurrencySymbol+"42 ",
+				(byte)42, Byte.Parse(" "+NumberFormatInfo.CurrentInfo.CurrencySymbol+"42 ",
+						NumberStyles.Currency));
+		try {
+			Byte.Parse(NumberFormatInfo.CurrentInfo.CurrencySymbol+"42", NumberStyles.Integer);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(NumberFormatInfo.CurrentInfo.CurrencySymbol+"42 and NumberStyles.Integer", typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, IFormatProvider provider)
+		Assert(" 42 and Nfi", 42 == Byte.Parse(" 42 ", Nfi));
+		try {
+			Byte.Parse("%42", Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert("%42 and Nfi", typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style, IFormatProvider provider)
+		Assert("NumberStyles.HexNumber", 16 == Byte.Parse(" 10 ", NumberStyles.HexNumber, Nfi));
+		try {
+			Byte.Parse(NumberFormatInfo.CurrentInfo.CurrencySymbol+"42", NumberStyles.Integer, Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(NumberFormatInfo.CurrentInfo.CurrencySymbol+"42, NumberStyles.Integer, Nfi", typeof(FormatException) == e.GetType());
+		}
+	}
+	
+	public void TestToString()
+	{
+		//test ToString()
+		AssertEquals("Compare failed for MyString1 and MyByte1", MyString1, MyByte1.ToString());
+		AssertEquals("Compare failed for MyString2 and MyByte2", MyString2, MyByte2.ToString());
+		AssertEquals("Compare failed for MyString3 and MyByte3", MyString3, MyByte3.ToString());
+		//test ToString(string format)
+		for (int i=0; i < Formats1.Length; i++) {
+			AssertEquals("Compare failed for Formats1["+i.ToString()+"]", Results1[i], MyByte2.ToString(Formats1[i]));
+			AssertEquals("Compare failed for Formats2["+i.ToString()+"]", Results2[i], MyByte3.ToString(Formats2[i]));
+		}
+		//test ToString(string format, IFormatProvider provider);
+		for (int i=0; i < Formats1.Length; i++) {
+			AssertEquals("Compare failed for Formats1["+i.ToString()+"] with Nfi", Results1_Nfi[i], MyByte2.ToString(Formats1[i], Nfi));
+			AssertEquals("Compare failed for Formats2["+i.ToString()+"] with Nfi", Results2_Nfi[i], MyByte3.ToString(Formats2[i], Nfi));
+		}
+		try {
+			MyByte1.ToString("z");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			AssertEquals("Exception is the wrong type", typeof(FormatException), e.GetType());
+		}
+		
+	}
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/ChangeLog b/mcs/class/corlib/Test/System/ChangeLog
new file mode 100644
index 00000000000..7ba3de5c489
--- /dev/null
+++ b/mcs/class/corlib/Test/System/ChangeLog
@@ -0,0 +1,531 @@
+2002/08/09  Nick Drochak <ndrochak@gol.com>
+
+	* DecimalTest.cs: Add try-catch block to find which one is throwing
+	the Overflow.  Also started making each Assert using a unique message
+	to differentiate those as well.
+
+	* MulticastDelegate.cs: Disable tests checking the order that delegates
+	are executed.  There's a bugzilla entry for this already because we do
+	it in reverse order. See:
+	http://bugzilla.ximian.com/show_bug.cgi?id=28306
+
+2002/08/02  Nick Drochak <ndrochak@gol.com>
+
+	* ConvertTest.cs (TestGetTypeCode): Find out which test is failing on
+	linux.
+
+2002-08-02  Nick Drochak  <ndrochak@gol.com>
+
+	* BufferTest.cs (TestBlockCopy): BlockCopy uses the number of bytes,
+	so hard-code some of that info into the test since sizeof() is a very
+	unsafe thing to do.
+
+2002-07-31  Nick Drochak  <ndrochak@gol.com>
+
+	* BufferTest.cs: Fixed noisy compiler warnings about unused vars.
+
+2002-07-22  Cesar Octavio Lopez Nataren  <cesar@ciencias.unam.mx>
+
+	* BufferTest.cs: Added this file to test the System.Buffer class 
+	implementation.
+
+2002-07-17  Martin Baulig  <martin@gnome.org>
+
+	* ConvertTest.cs: Commented out line 456 which contains a non-printable
+	character which mcs does not like.  See also bug #27655.
+
+	* DecimalTest.cs, DecimanTest2.cs: Removed the `using S = System'.
+
+2002-07-11  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayTest.cs: Disable a test for now.  Bugzilla'd this one.
+	* ConvertTest.cs: Make message unique for this mistaken duplicate.
+
+2002-07-04  Nick Drochak  <ndrochak@gol.com>
+
+	* DateTimeTest.cs: Made tests pass on ms.net.  Well, they pass in
+	timezone JST.  Need to test in others.  Maybe I'll fly over to GMT
+	and see how they work.  Supposed to be eaiser there.
+
+2002-07-04  Nick Drochak  <ndrochak@gol.com>
+
+	* ConvertTest.cs: Make the test generate the overflow exceptions on
+	mono on Linux.
+	* DecimalTest2.cs: Report exception thrown during subtraction.
+
+2002-07-03  Nick Drochak  <ndrochak@gol.com>
+
+	* DoubleTest.cs: Fix some Assert/AssertEquals usage.
+
+2002-07-03  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayTest.cs: Re-enable some tests.  Let's see what's broken still.
+
+2002-06-20  Nick Drochak  <ndrochak@gol.com>
+
+	* DecimalTest2.cs: Make tests pass against ms.net.
+
+2002-06-19  Nick Drochak  <ndrochak@gol.com>
+
+	* AllTests.cs: Add missing test: DecimalTest2
+	* DecimalTest2.cs: Convert Console.Writeline() into a Fail()
+
+2002/06/14  Nick Drochak <ndrochak@gol.com>
+
+	* Int64Test.cs: Make currency symbol test more culturally sensitive.
+
+2002-06-14  Nick Drochak  <ndrochak@gol.com>
+
+	* DateTimeTest.cs: Make some of the tests a bit more timezone neutral.
+
+2002-06-12   Nick Drochak  <ndrochak@gol.com>
+
+	* ConvertTest.cs: Punt bug in DateTime.Parse() over to that test.
+	* DateTimeTest.cs: Add test for date format of yyyy-mm-dd which mono
+	doesn't handle automagically like ms.net does.  This smells like a 
+	LAMESPEC, however.
+
+2002/06/12  Nick Drochak <ndrochak@gol.com>
+
+	* RandomTest.cs: Exercise Next(min,max) a little more, especially
+	boundary conditions.
+
+2002-06-11  Nick Drochak  <ndrochak@gol.com>
+
+	* StringTest.cs: Check for "end of string" conditions for IndexOf() and
+	Substring().
+
+2002-06-11  Nick Drochak  <ndrochak@gol.com>
+
+	* DoubleTest.cs: Add some more detail to failure message.
+	* Int64Test.cs: Add some details, and fix a copy-paste error.
+	* UInt32Test.cs: Fix currency symbol/culture issues
+	* UInt64Test.cs: Fix currency symbol/culture issues
+
+2002/06/11  Nick Drochak <ndrochak@gol.com>
+
+	* DateTimeTest.cs: Remove RunTest override and put culture manipulation
+	in SetUp and TearDown like the other tests.
+	* TimeZoneTest.cs: Same.
+
+2002-06-11  Nick Drochak  <ndrochak@gol.com>
+
+	* Int64Test.cs: Set the culture to en-US for testing.
+	* MathTest.cs: mono is more precise in Log2, so change test to compare
+	values within a slightly larger margin of error.
+
+2002/06/10  Nick Drochak <ndrochak@gol.com>
+
+	* DecimalTest.cs: More culture indepenence. Fixes the problems we were
+	having with tests failing against MS.NET.
+	* Int64Test.cs: Same plus some formatting fixes.
+	* RandomTest.cs: Split Assert into two to figure out which one part is
+	failing.
+
+2002-06-09  Lawrence Pit  <loz@cable.a2000.nl>

+

+	* DateTimeTest.cs: Making tests culture independent

+

+2002-06-07  Nick Drochak  <ndrochak@gol.com>
+
+	* DecimalTest.cs: Catch unexpected exception and report it.
+
+2002/06/04  Nick Drochak <ndrochak@gol.com>
+
+	* ByteTest.cs: Fix currency constant that we use for the expected
+	value.  Try to be more culture-diverse.
+
+2002/06/03  Nick Drochak <ndrochak@gol.com>
+
+	* DecimalTest.cs: Fix some errors that were showing up when run against
+	ms.net.
+
+2002-06-02  Nick Drochak  <ndrochak@gol.com>
+
+	* ConvertTest.cs: Use en-US culture since that's all we support in our
+	corlib right now. Change constants accordingly.  Also added a bunch of
+	try-catch blocks to show which Assert is failing.
+
+2002-06-02  Duncan Mak  <duncan@ximian.com>
+
+	* ConvertTest.cs (TestToDecimal): Fixed typo in case #H11.
+
+2002-06-01  Nick Drochak  <ndrochak@gol.com>
+
+	* BugTest.cs: Remove, bug fixed.  Yay!
+	* AllTests.cs: Remove BugTest from suite.
+
+2002-05-31  Nick Drochak  <ndrochak@gol.com>
+
+	* BugTest.cs: Small file to show NullReferenceException bug
+	* AllTests.cs: Include BugTest.cs in the suite.
+
+2002-05-29  Nick Drochak  <ndrochak@gol.com>
+
+	* DecimalTest.cs: Use AssertEquals to get nice error report, and mark
+	each one with a unique message string so we know which one failed.
+
+2002-05-29  Lawrence Pit  <loz@cable.a2000.nl>

+

+	* DateTimeTest.cs: Added tests M01 to M03 to TestParseExact, 

+	passing typeof this class as arg in property Suite.

+

+2002-05-22  Lawrence Pit  <loz@cable.a2000.nl>

+

+	* ConsoleTest.cs: Added test writing null.

+

+2002-05-21  Nick Drochak  <ndrochak@gol.com>
+
+	* MathTest.cs:
+		(TestPow): Add try-catch to determine where we are throwing.
+		(TestLog): Re-enable failing test
+		(TestLog2): same although this test still fails on mono. Not
+		sure what the proper value	to use here. It works on MS.NET
+
+2002-05-21  Nick Drochak  <ndrochak@gol.com>
+
+	* MathTest.cs: Better reporting of failures
+	* Int64Test.cs: Add try-catch to determine where we are throwing.
+
+2002-05-20  Nick Drochak  <ndrochak@gol.com>
+
+	* AttributeTest.cs (TestGetCustomAttribute): Add try-catch to find out
+	which assert is failing.
+
+2002-05-19  Martin Baulig  <martin@gnome.org>
+
+	* MartinTests.cs: Removed.
+
+2002-05-14  Nick Drochak  <ndrochak@gol.com>
+
+	* StringTest.cs: A couple more tests
+
+2002-05-07  Nick Drochak  <ndrochak@gol.com>
+
+	* ExceptionTest.cs: New File. Provided by Linus Upson.
+
+2002-05-05  Lawrence Pit  <loz@cable.a2000.nl>

+

+	* StringTest.cs: Added test for replace function

+

+2002-04-30  Nick Drochak  <ndrochak@gol.com>
+
+	* UInt32Test.cs: More verbose on unexepected exception to eliminate
+	compiler warning.
+
+2002-04-28  Nick Drochak  <ndrochak@gol.com>
+
+	* StringTest.cs: Mark Assert() messages with unique identifiers.
+	* DecimalTest2.cs: Write out more info in the Report method.  Need this
+	to determine why op_Subtraction() is failing in the next line.
+	* MathTest.cs:
+	* DoubleTest.cs:
+	* UInt32Test.cs: Add try-catch blocks to find out where the test is
+	failing.
+
+2002-04-28  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayTest.cs (TestIList_IndexOf): Display exception details if we get
+	an unexpected one.
+
+2002/04/24  Nick Drochak <ndrochak@gol.com>
+
+	* IntegerFormatterTest.cs: Remove Console.WriteLines and use 
+	AssertEquals() instead.
+
+2002-04-22  Nick Drochak  <ndrochak@gol.com>
+
+	* StringTest.cs: Add unique markers to Assert messages.
+
+2002-04-09  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayTest.cs: Remove BinarySearch test on unsorted arrays. The
+	behavior is undefined if the array isn't sorted.
+
+2002/04/09  Nick Drochak <ndrochak@gol.com>
+
+	* DecimalTest.cs: Use AssertEquals() for better diagnostic message.
+
+2002-04-09  Nick Drochak  <ndrochak@gol.com>
+
+	* ByteTest.cs: Use AssertEquals() for better diagnostic message.
+
+2002-04-08  Nick Drochak  <ndrochak@gol.com>
+
+	* EnumTest.cs: Add a few tests for differently underlying types and
+	the [Flags] attribute to test ToString().
+
+2002-04-08  Nick Drochak  <ndrochak@gol.com>
+
+	* EnumTest.cs: Add test for ToString for the case where the enum
+	has [Flags] on it, and a mask value is used.
+
+2002-04-04  Nick Drochak  <ndrochak@gol.com>
+
+	* EnumTest.cs: Change one Assert() message string so the two are 
+	unique. And clean up exception catching logic.
+
+2002/03/28  Nick Drochak <ndrochak@gol.com>
+
+	* IntegerFormatterTest.cs: Eliminate warnings about unused exception
+	variables.
+
+2002-03-28  Nick Drochak  <ndrochak@gol.com>
+
+	* EnumTest.cs(TestFormat): Use Fail() instead of AssertEquals() in
+	try-catch blocks. Add test to check if correct exception is being 
+	thrown.
+
+2002/03/18  Nick Drochak <ndrochak@gol.com>
+
+	* ByteTest.cs:
+	* Int64Test.cs:
+	* SByteTest.cs: Do not hard code the "$" as the currency symbol to
+	use for Parse tests. This isn not really the fix we need. These
+	number formats vary wildly depending on the culture the system
+	runs with.  We need a much better strategy here for testing this.
+	* Int32Test.cs: Use #if NOTYET-#endif to disable a test.  This removes
+	an annoying compile warning.
+
+2002-03-18  Nick Drochak  <ndrochak@gol.com>
+
+	* DoubleTest.cs:
+	* EnumTest.cs: Add unique identifier to Assert()'s. Needed to find
+	which one was faling on Linux.
+
+2002-03-12  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayTest.cs: Add tests for IList methods and for enumerator on
+	an array with non-zero lower bounds.
+
+2002-03-09  Nick Drochak  <ndrochak@gol.com>
+
+	* ArrayTest.cs: Enable the enumerator test and include test for
+	Multi-dimensional array enumerator.  Also include test for
+	mutation _not_ invalidating the enumerator.
+
+2002-03-09  Martin Baulig  <martin@gnome.org>
+
+	* Int16Test.cs, Int32Tests.cs, UInt16Tests.cs: Use "en-US" culture and
+	don't let the user override.
+
+	* Int32Tests.cs: Cleanup. Use unique names in Assert()s, use AssertEquals()
+	where appropriate etc.
+
+2002-03-08  Martin Baulig  <martin@gnome.org>
+
+	* StringTest.cs: More String.Split tests.
+
+2002-03-07  Martin Baulig  <martin@gnome.org>
+
+	* StringTest.cs: Added a few more tests for the bug fixes I just
+	committed to String.cs.
+
+2002-03-07  Martin Baulig  <martin@gnome.org>
+
+	* ArrayTest.cs: Fixed the FIXME in test #E05.
+
+2002-03-06  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* CharEnumeratorTest.cs: made test regarding out-of-bounds checking
+	a bit stronger (new failures fixed in CharEnumerator.cs).
+
+2002-03-06  Martin Baulig  <martin@gnome.org>
+
+	* ArrayTest.cs (TestSetValue4): Added testcases #M94-#M96 for Array.Copy.
+
+	* ArrayTest.cs (TestCopyTo): Added testcases #F10-#F13 for arrays with
+	non-zero lower bounds.
+
+	* ArrayTest.cs (TestCopyTo): Added test for copying an empty array
+	to an empty array.
+
+2002-03-06  Martin Baulig  <martin@gnome.org>
+
+	* ArrayTest.cs: Use unique labels for all the tests.
+	(TestSetValue4): A big new testcase.
+
+2002-03-06  Nick Drochak  <ndrochak@gol.com>

+

+	* VersionTest.cs: Fix for mscorlib behavior vs. docs. CompareTo(null)

+	is legal.

+	* UInt16Test.cs:

+	* UInt32Test.cs:

+	* UInt64Test.cs: Use NumberFormatInfo.InvariantInfo.CurrencySymbol

+	where "$" was used. Should help suppress false negatives on systems

+	where "$" is not the currency symbol.

+

+2002-03-04  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* VersionTest.cs: created test cases for System.Version
+
+2002-03-03  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* CharEnumeratorTest.cs: completed the test cases
+
+2002-03-03  Nick Drochak  <ndrochak@gol.com>

+

+	* DateTimeTest.cs: make static member non-static -- wouldn't work on 

+	Windows if it was static. Doesn't _need_ to be static anyway.

+

+2002-03-01  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* AttributeTest.cs: created, far from complete. 
+	* CharEnumeratorTest.cs: created. Contains just the basic case.
+	* AllTests.cs: added the two new tests above
+
+2002-03-01  Duco Fijma  <duco@lorentz.xs4all.nl>
+	* BitConverterTest.cs: added one test for bug fix made to BitConverter
+	* class.
+
+2002-03-01  Martin Baulig  <martin@gnome.org>
+
+	* ArrayTest.cs: Commented out a few bits which are not yet implemented and
+	marked them with FIXME's.
+
+	* DecimalTest.cs, DecimalTest2.cs: Added zero-arg constructors.
+
+	* MartinTests.cs: Enabled ArrayTests.cs.
+
+2002-03-01  Duco Fijma <duco@lorentz.xs4all.nl>
+
+	* BitConverterTest.cs: completed test cases
+
+2002-03-01  Martin Baulig  <martin@gnome.org>
+
+	* MartinTests.cs: 15 tests currently work on Linux, call them all and
+	provide comments for the non-working tests.
+
+2002-02-28  Duncan Mak  <duncan@ximian.com>
+
+	* MathTest.cs: Committed for Jon Guymon <gnarg@slackworks.com>.
+
+2002-02-28  Martin Baulig  <martin@gnome.org>
+
+	* String.cs (TestCompare): Added a few tests.
+	(TestFormat): Please don't compare two strings with Assert (... == ...),
+	use AssertEquals instead - this gives you a better idea what went wrong
+	if the test fails.
+
+2002-02-28  Nick Drochak  <ndrochak@gol.com>
+
+	* BitConverterTest.cs: Test was trying to catch the wrong Exception.
+	The MSDN docs clearly say ArgumentOutOfRangeException, but that's
+	not what get's thrown.
+
+	* DoubleTest.cs: Get working against mscorlib reference.
+
+2002-02-27  Duco Fijma <duco@lorentz.xs4all.nl>
+	* GuidTest.cs: changed to reflect new meaning of Guid.ToString("")
+	and Guid.ToString(null)
+
+2002-02-26  Martin Baulig  <martin@gnome.org>
+
+	* MartinTests.cs: New file. This contains all the test which already
+	work on Linux.
+
+	* String.cs: Added two testcases to TestTrim(), TestTrimStart() and
+	TestTrimEnd().
+
+2002-02-26  Martin Baulig  <martin@gnome.org>
+
+	* DateTimeTest.cs: Added testcases for the parsers. Use the invariant
+	culture to run this test suite.
+
+	* TimeZoneTest.cs: Use the invariant culture to run this test suite.
+
+2002-02-26  Duco Fijma <duco@lorentz.xs4all>
+	* TimeSpanTest.cs: added test from TimeSpan.FromMilliseconds
+
+2002-02-26  Martin Baulig  <martin@gnome.org>
+
+	* DateTimeTest.cs: New test.
+
+	* TimeZoneTest.cs: New test.
+
+2002-02-25  Duco Fijma <duco@lorentz.xs4all.nl>
+	* GuidTest.cs: all methods of System.Guid are now covered
+	* BitConverterTest.cs: created, not yet complete
+
+2002-02-21  Duco Fijma <duco@lorentz.xs4all.nl>
+	* GuidTest.cs: changed according to fix in System.Guid
+
+2002-02-20  Nick Drochak  <ndrochak@gol.com>

+

+	* Int64Test.cs: One array was giving us trouble.  Not sure why, but

+	it's related to the number of elements in an Array.  For short Arrays

+	the compiler doesn't use the PrivateImplmentationDetails struct,

+	but for longer ones it does.  That's when our corlib fails. I paired

+	down the array for now.

+

+2002-02-19  Duco Fijma <duco@lorentz.xs4all.nl>

+	* GuidTest.cs: added a few cases

+

+2002-02-18  Nick Drochak  <ndrochak@gol.com>

+

+	* GuidTest.cs: Fix compile error.  Needed to cast the null in the call to

+	constructor to avoid ambiguity.

+

+2002-02-11  Nick Drochak  <ndrochak@gol.com>

+

+	* Int64Test.cs: Various fixes to make tests work against the ms corlib.

+	Currency Symbol tests seem to be system dependant.  Not sure if this

+	will work on other systems, so please test it if you can. The most

+	disturbing one is negative numbers.  Should they be (n) or -n ?

+

+2002-02-10  Nick Drochak  <ndrochak@gol.com>

+

+	* AllTests.cs: Add Int64Test to the Suite

+	* Int64Test.cs: Change static member to instance member. This was

+	causing NUnitConsole some grief.  Should be instance member anyway.

+

+2002-02-09  Nick Drochak  <ndrochak@gol.com>

+

+	* ByteTest.cs:

+	* Int16Test.cs:

+	* Int32Test.cs:

+	* SByteTest.cs:

+	* UInt16Test.cs:

+	* UInt32Test.cs:

+	* UInt64Test.cs: Fixed tests where a "$" was hard coded.  Change it to

+	use NumberFormatInfo.CurrentInfo.CurrencySymbol.  Also used

+	NumberFormatInfo.InvariantInfo.CurrencySymbol where appropriate. These

+	tests all pass now with mscorlib.

+

+2002-01-06  Nick Drochak  <ndrochak@gol.com>

+

+	* ResolveEventArgsTest.cs: New test.

+	* AllTests.cs: Added new test to suite.

+

+2001-12-27  Nick Drochak <ndrochak@gol.com>

+

+	* UInt32Test.cs: Added messages to Asserts()'s to find out which one was faliing.

+

+2001-12-21  Miguel de Icaza  <miguel@ximian.com>

+

+	* UInt32Test.cs: Added tests for UInt32.Parse.

+

+	* Int32Test.cs: Added tests for Int32.Parse for various cases.

+

+2001-12-08  Nick Drochak  <ndrochak@gol.com>

+

+	* ByteTest.cs: Added messages to Assert()'s to find out which one was failing.

+

+2001-11-28  Nick Drochak <ndrochak@gol.com>

+

+	* Int16Test.cs Int32Test.cs SByteTest.cs: Surgically removed tests that rely on culture of system.  These need to be crafted a bit differently.

+

+2001-11-27  Nick Drochak  <ndrochak@gol.com>

+

+	* SByteTest.cs: Add messages to Assert()'s so we can tell where the tests fail.

+

+2002-02-21  Bob Doan  <bdoan@sicompos.com>

+

+	* BooleanTest.cs: Added New test suite

+	* AllTests.cs: Added new Boolean test to suite.

+

+2002-02-24  Bob Doan  <bdoan@sicompos.com>

+

+	* BooleanTest.cs: Use correct argument order in AssertEquals

+	* AllTests.cs: Added new Double test to suite.

+	* DoubleTest.cs: Add new test suite

+

+2002-02-24  Bob Doan  <bdoan@sicompos.com>

+

+	* DoubleTest.cs: Added parse tests to Double test suite, removed GetHashCodeTests

diff --git a/mcs/class/corlib/Test/System/CharEnumeratorTest.cs b/mcs/class/corlib/Test/System/CharEnumeratorTest.cs
new file mode 100755
index 00000000000..da7fecbc221
--- /dev/null
+++ b/mcs/class/corlib/Test/System/CharEnumeratorTest.cs
@@ -0,0 +1,123 @@
+//
+// CharEnumeratorTest.cs - NUnit Test Cases for the System.CharEnumerator class
+//
+// author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (C) 2002 Duco Fijma
+//
+
+using NUnit.Framework;
+using System;
+
+namespace MonoTests.System
+{
+
+public class CharEnumeratorTest : TestCase
+{
+	public CharEnumeratorTest () : base ("MonoTests.System.CharEnumeratorTest testcase") {}
+        public CharEnumeratorTest (string name) : base (name) {}
+
+	public static ITest Suite {
+		get {
+			return new TestSuite (typeof (CharEnumeratorTest));
+		}
+	}
+
+	string _s;
+
+	protected override void SetUp ()
+	{
+		_s = "Emma en Sophie";
+	}
+
+	private string GetFromEnumerator (CharEnumerator ce)
+	{
+		string res = "";
+		bool cont = true;
+
+		while (cont) {
+			res += ce.Current;
+			cont = ce.MoveNext ();
+		}
+
+		return res;
+	}
+
+	public void TestBasic ()
+	{
+		CharEnumerator ce = _s.GetEnumerator ();
+
+		ce.MoveNext ();
+
+		AssertEquals ("A1", _s, GetFromEnumerator (ce));
+	}
+
+	public void TestClone ()
+	{
+		CharEnumerator ce1, ce2=null;
+		bool cont;
+
+		ce1 = _s.GetEnumerator ();
+		cont = ce1.MoveNext ();
+		while (cont) {
+			if (ce1.Current == 'S') {
+				ce2 = (CharEnumerator) (ce1.Clone ());
+			}
+			cont = ce1.MoveNext ();
+		}
+
+		AssertEquals ("A1", "Sophie", GetFromEnumerator(ce2));
+	}
+
+	public void TestReadOutOfBounds ()
+	{
+		char c;
+		bool exception;
+		CharEnumerator ce = _s.GetEnumerator ();
+	
+		try {
+			c = ce.Current;
+			exception = false;
+		}
+		catch (InvalidOperationException) {
+			exception = true;
+		}
+		Assert ("A1", exception);
+
+		AssertEquals("A2", true, ce.MoveNext ());
+
+		AssertEquals ("A3", _s, GetFromEnumerator (ce));
+
+		try {
+			c = ce.Current;
+		}
+		catch (InvalidOperationException) {
+			exception = true;
+		}
+		Assert ("A4", exception);
+
+		AssertEquals("A5", false, ce.MoveNext() );
+		AssertEquals("A6", false, ce.MoveNext() );
+
+		ce.Reset ();
+
+		try {
+			c = ce.Current;
+		}
+		catch (InvalidOperationException) {
+			exception = true;
+		}
+		Assert ("A7", exception);
+
+		AssertEquals ("A8", true, ce.MoveNext ());
+
+		AssertEquals ("A9", _s, GetFromEnumerator (ce));
+
+		AssertEquals ("A10", false, ce.MoveNext ());
+		AssertEquals ("A11", false, ce.MoveNext ());
+	}
+
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/CharTest.cs b/mcs/class/corlib/Test/System/CharTest.cs
new file mode 100644
index 00000000000..3f89fd24381
--- /dev/null
+++ b/mcs/class/corlib/Test/System/CharTest.cs
@@ -0,0 +1,500 @@
+// CharTest.cs - NUnit Test Cases for the System.Char struct

+//

+// David Brandt (bucky@keystreams.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+

+using NUnit.Framework;

+using System;

+using System.Globalization;

+

+namespace MonoTests.System

+{

+

+public class CharTest : TestCase

+{

+	public CharTest() : base ("MonoTests.System.CharTest testsuite") {}

+	public CharTest(string name) : base(name) {}

+

+	protected override void SetUp() 

+	{

+	}

+

+	protected override void TearDown() 

+	{

+	}

+

+	public static ITest Suite {

+		get { 

+			return new TestSuite(typeof(CharTest)); 

+		}

+	}

+    

+	public void TestCompareTo()

+	{

+		Char c1 = 'a';

+		Char c2 = 'b';

+		Char c3 = 'b';

+		Assert("Less than", c1.CompareTo(c2) == -1);

+		Assert("Greater than", c2.CompareTo(c1) == 1);

+		Assert("Equal 1", c2.CompareTo(c3) == 0);

+		Assert("Equal 2", c1.CompareTo(c1) == 0);

+	}

+	

+	public void TestEquals()

+	{

+		Char c1 = 'a';

+		Char c2 = 'b';

+		Char c3 = 'b';

+		Assert("Same", c1.Equals(c1));

+		Assert("Same value", c2.Equals(c3));

+		Assert("Not same", !c1.Equals(c2));

+	}

+

+	public void TestGetHashValue()

+	{

+		Char c1 = ' ';

+		AssertEquals("deterministic hash code ", c1.GetHashCode(), c1.GetHashCode());

+		// TODO - the spec doesn't say what algorithm is used to get hash codes.  So far, just a weak test for determinism and mostly-uniqueness.

+	}

+

+	public void TestGetNumericValue()

+	{

+		Char c1 = ' ';

+		Char c2 = '3';

+		AssertEquals("code 1", -1.0, Char.GetNumericValue(c1), 0.1);

+		AssertEquals("code 2", 3.0, Char.GetNumericValue(c2), 0.1);

+

+		string s1 = " 3 ";

+		AssertEquals("space not number", -1.0, Char.GetNumericValue(s1, 0), 0.1);

+		AssertEquals("space not number", 3.0, Char.GetNumericValue(s1, 1), 0.1);

+		AssertEquals("space not number", -1.0, Char.GetNumericValue(s1, 2), 0.1);

+	}

+

+	public void TestGetUnicodeCategory()

+	{

+		{

+			char Pe1 = ']';

+			char Pe2 = '}';

+			char Pe3 = ')';

+			AssertEquals("Close Punctuation", 

+				     UnicodeCategory.ClosePunctuation, 

+				     Char.GetUnicodeCategory(Pe1));

+			AssertEquals("Close Punctuation", 

+				     UnicodeCategory.ClosePunctuation, 

+				     Char.GetUnicodeCategory(Pe2));

+			AssertEquals("Close Punctuation", 

+				     UnicodeCategory.ClosePunctuation, 

+				     Char.GetUnicodeCategory(Pe3));

+		}

+		// TODO - ConnectorPunctuation

+		{

+			char c1 = (char)0; // 0000-001F, 007F-009F

+			char c2 = (char)0x001F;

+			char c3 = (char)0x007F;

+			char c4 = (char)0x00F;

+			AssertEquals("Control", 

+				     UnicodeCategory.Control, 

+				     Char.GetUnicodeCategory(c1));

+			AssertEquals("Control", 

+				     UnicodeCategory.Control, 

+				     Char.GetUnicodeCategory(c2));

+			AssertEquals("Control", 

+				     UnicodeCategory.Control, 

+				     Char.GetUnicodeCategory(c3));

+			AssertEquals("Control", 

+				     UnicodeCategory.Control, 

+				     Char.GetUnicodeCategory(c4));

+		}

+		{

+			// TODO - more currencies?

+			char c1 = '$';

+			AssertEquals("Currency",

+				     UnicodeCategory.CurrencySymbol,

+				     Char.GetUnicodeCategory(c1));

+		}

+		{

+			char c1 = '-';

+			AssertEquals("Dash Punctuation", 

+				     UnicodeCategory.DashPunctuation, 

+				     Char.GetUnicodeCategory(c1));

+		}

+		{

+			char c1 = '2';

+			char c2 = '7';

+			AssertEquals("Decimal Digit", 

+				     UnicodeCategory.DecimalDigitNumber, 

+				     Char.GetUnicodeCategory(c1));

+			AssertEquals("Decimal Digit", 

+				     UnicodeCategory.DecimalDigitNumber, 

+				     Char.GetUnicodeCategory(c2));

+		}

+		// TODO - EnclosingMark

+		// TODO - FinalQuotePunctuation

+		// TODO - Format

+		// TODO - InitialQuotePunctuation

+		// TODO - LetterNumber

+		// TODO - LineSeparator (not '\n', that's a control char)

+		{

+			char c1 = 'a';

+			char c2 = 'z';

+			AssertEquals("LowercaseLetter", 

+				     UnicodeCategory.LowercaseLetter, 

+				     Char.GetUnicodeCategory(c1));

+			AssertEquals("LowercaseLetter", 

+				     UnicodeCategory.LowercaseLetter, 

+				     Char.GetUnicodeCategory(c2));

+		}

+		{

+			char c1 = '+';

+			char c2 = '=';

+			AssertEquals("MathSymbol", 

+				     UnicodeCategory.MathSymbol, 

+				     Char.GetUnicodeCategory(c1));

+			AssertEquals("MathSymbol", 

+				     UnicodeCategory.MathSymbol, 

+				     Char.GetUnicodeCategory(c2));

+		}

+		// TODO - ModifierSymbol

+		// TODO - NonSpacingMark

+		// TODO - OpenPunctuation

+		{

+			char c1 = '[';

+			char c2 = '{';

+			char c3 = '(';

+			AssertEquals("OpenPunctuation", 

+				     UnicodeCategory.OpenPunctuation, 

+				     Char.GetUnicodeCategory(c1));

+			AssertEquals("OpenPunctuation", 

+				     UnicodeCategory.OpenPunctuation, 

+				     Char.GetUnicodeCategory(c2));

+			AssertEquals("OpenPunctuation", 

+				     UnicodeCategory.OpenPunctuation, 

+				     Char.GetUnicodeCategory(c3));

+		}

+		// TODO - OtherLetter

+		// TODO - OtherNotAssigned

+		// TODO - OtherNumber

+		{

+			char c1 = '/';

+			AssertEquals("OtherPunctuation", 

+				     UnicodeCategory.OtherPunctuation, 

+				     Char.GetUnicodeCategory(c1));

+		}

+		// TODO - OtherSymbol

+		// TODO - ParagraphSeparator

+		// TODO - PrivateUse

+		{

+			char c1 = ' ';

+			AssertEquals("SpaceSeparator", 

+				     UnicodeCategory.SpaceSeparator, 

+				     Char.GetUnicodeCategory(c1));

+		}

+		// TODO - SpacingCombiningMark

+		{

+			char c1 = (char)0xD800; // D800-DBFF

+			char c2 = (char)0xDBFF; // D800-DBFF

+			char c3 = (char)0xDC01; // DC00-DEFF

+			char c4 = (char)0xDEFF; // DC00-DEFF

+			AssertEquals("High Surrogate", 

+				     UnicodeCategory.Surrogate, 

+				     Char.GetUnicodeCategory(c1));

+			AssertEquals("High Surrogate", 

+				     UnicodeCategory.Surrogate, 

+				     Char.GetUnicodeCategory(c2));

+			AssertEquals("Low Surrogate", 

+				     UnicodeCategory.Surrogate, 

+				     Char.GetUnicodeCategory(c3));

+			AssertEquals("Low Surrogate", 

+				     UnicodeCategory.Surrogate, 

+				     Char.GetUnicodeCategory(c4));

+		}

+		// TODO - TitlecaseLetter

+		// TODO - UppercaseLetter

+		{

+			char c1 = 'A';

+			char c2 = 'Z';

+			AssertEquals("UppercaseLetter", 

+				     UnicodeCategory.UppercaseLetter, 

+				     Char.GetUnicodeCategory(c1));

+			AssertEquals("UppercaseLetter", 

+				     UnicodeCategory.UppercaseLetter, 

+				     Char.GetUnicodeCategory(c2));

+		}

+	}

+

+	public void TestIsControl()

+	{

+		// control is 0000-001F, 007F-009F

+		char c1 = (char)0;

+		char c2 = (char)0x001F;

+		char c3 = (char)0x007F;

+		char c4 = (char)0x009F;

+		Assert("Not control", !Char.IsControl(' '));

+		Assert("control", Char.IsControl(c1));

+		Assert("control", Char.IsControl(c2));

+		Assert("control", Char.IsControl(c3));

+		Assert("control", Char.IsControl(c4));

+

+		string s1 = " " + c1 + c2 + c3 + c4;

+		Assert("Not control", !Char.IsControl(s1, 0));

+		Assert("control", Char.IsControl(s1, 1));

+		Assert("control", Char.IsControl(s1, 2));

+		Assert("control", Char.IsControl(s1, 3));

+		Assert("control", Char.IsControl(s1, 4));

+	}

+

+	public void TestIsDigit()

+	{

+		char c1 = '0';

+		char c2 = '9';

+		Assert("Not digit", !Char.IsDigit(' '));

+		Assert("digit", Char.IsDigit(c1));

+		Assert("digit", Char.IsDigit(c2));

+

+		string s1 = " " + c1 + c2;

+		Assert("Not digit", !Char.IsDigit(s1, 0));

+		Assert("digit", Char.IsDigit(s1, 1));

+		Assert("digit", Char.IsDigit(s1, 2));

+	}

+

+	public void TestIsLetter()

+	{

+		char c1 = 'a';

+		char c2 = 'z';

+		char c3 = 'A';

+		char c4 = 'Z';

+		Assert("Not letter", !Char.IsLetter(' '));

+		Assert("letter", Char.IsLetter(c1));

+		Assert("letter", Char.IsLetter(c2));

+		Assert("letter", Char.IsLetter(c3));

+		Assert("letter", Char.IsLetter(c4));

+

+		string s1 = " " + c1 + c2 + c3 + c4;

+		Assert("Not letter", !Char.IsLetter(s1, 0));

+		Assert("letter", Char.IsLetter(s1, 1));

+		Assert("letter", Char.IsLetter(s1, 2));

+		Assert("letter", Char.IsLetter(s1, 3));

+		Assert("letter", Char.IsLetter(s1, 4));

+	}

+

+	public void TestIsLetterOrDigit()

+	{

+		char c1 = 'a';

+		char c2 = 'z';

+		char c3 = 'A';

+		char c4 = 'Z';

+		char c5 = '0';

+		char c6 = '9';

+		Assert("Not letterordigit", !Char.IsLetterOrDigit(' '));

+		Assert("letterordigit", Char.IsLetterOrDigit(c1));

+		Assert("letterordigit", Char.IsLetterOrDigit(c2));

+		Assert("letterordigit", Char.IsLetterOrDigit(c3));

+		Assert("letterordigit", Char.IsLetterOrDigit(c4));

+		Assert("letterordigit", Char.IsLetterOrDigit(c5));

+		Assert("letterordigit", Char.IsLetterOrDigit(c6));

+

+		string s1 = " " + c1 + c2 + c3 + c4 + c5 + c6;

+		Assert("Not letterordigit", !Char.IsLetterOrDigit(s1, 0));

+		Assert("letterordigit", Char.IsLetterOrDigit(s1, 1));

+		Assert("letterordigit", Char.IsLetterOrDigit(s1, 2));

+		Assert("letterordigit", Char.IsLetterOrDigit(s1, 3));

+		Assert("letterordigit", Char.IsLetterOrDigit(s1, 4));

+		Assert("letterordigit", Char.IsLetterOrDigit(s1, 5));

+		Assert("letterordigit", Char.IsLetterOrDigit(s1, 6));

+	}

+

+	public void TestIsLower()

+	{

+		char c1 = 'a';

+		char c2 = 'z';

+		Assert("Not lower", !Char.IsLower(' '));

+		Assert("lower", Char.IsLower(c1));

+		Assert("lower", Char.IsLower(c2));

+

+		string s1 = " " + c1 + c2;

+		Assert("Not lower", !Char.IsLower(s1, 0));

+		Assert("lower", Char.IsLower(s1, 1));

+		Assert("lower", Char.IsLower(s1, 2));

+	}

+

+	public void TestIsNumber()

+	{

+		char c1 = '0';

+		char c2 = '9';

+		// TODO - IsNumber of less obvious characters

+

+		Assert("Not number", !Char.IsNumber(' '));

+		Assert("number", Char.IsNumber(c1));

+		Assert("number", Char.IsNumber(c2));

+

+		string s1 = " " + c1 + c2;

+		Assert("Not number", !Char.IsNumber(s1, 0));

+		Assert("number", Char.IsNumber(s1, 1));

+		Assert("number", Char.IsNumber(s1, 2));

+	}

+

+	public void TestIsPunctuation()

+	{

+		char c1 = '.';

+		char c2 = '?';

+		Assert("Not punctuation", !Char.IsPunctuation(' '));

+		Assert("punctuation", Char.IsPunctuation(c1));

+		Assert("punctuation", Char.IsPunctuation(c2));

+

+		string s1 = " " + c1 + c2;

+		Assert("Not punctuation", !Char.IsPunctuation(s1, 0));

+		Assert("punctuation", Char.IsPunctuation(s1, 1));

+		Assert("punctuation", Char.IsPunctuation(s1, 2));

+	}

+

+	public void TestIsSeparator()

+	{

+		char c1 = ' ';

+

+		Assert("Not separator", !Char.IsSeparator('.'));

+		Assert("separator1", Char.IsSeparator(c1));

+

+		string s1 = "." + c1;

+		Assert("Not separator", !Char.IsSeparator(s1, 0));

+		Assert("separator1-2", Char.IsSeparator(s1, 1));

+	}

+

+	public void TestIsSurrogate()

+	{

+		// high surrogate - D800-DBFF

+		// low surrogate - DC00-DEFF

+		char c1 = (char)0xD800;

+		char c2 = (char)0xDBFF;

+		char c3 = (char)0xDC00;

+		char c4 = (char)0xDEFF;

+		Assert("Not surrogate", !Char.IsSurrogate(' '));

+		Assert("surrogate1", Char.IsSurrogate(c1));

+		Assert("surrogate2", Char.IsSurrogate(c2));

+		Assert("surrogate3", Char.IsSurrogate(c3));

+		Assert("surrogate4", Char.IsSurrogate(c4));

+

+		string s1 = " " + c1 + c2 + c3 + c4;

+		Assert("Not surrogate", !Char.IsSurrogate(s1, 0));

+		Assert("surrogate1-2", Char.IsSurrogate(s1, 1));

+		Assert("surrogate2-2", Char.IsSurrogate(s1, 2));

+		Assert("surrogate3-2", Char.IsSurrogate(s1, 3));

+		Assert("surrogate4-2", Char.IsSurrogate(s1, 4));

+	}

+

+	public void TestIsSymbol()

+	{

+		char c1 = '+';

+		char c2 = '=';

+		Assert("Not symbol", !Char.IsSymbol(' '));

+		Assert("symbol", Char.IsSymbol(c1));

+		Assert("symbol", Char.IsSymbol(c2));

+

+		string s1 = " " + c1 + c2;

+		Assert("Not symbol", !Char.IsSymbol(s1, 0));

+		Assert("symbol", Char.IsSymbol(s1, 1));

+		Assert("symbol", Char.IsSymbol(s1, 2));

+	}

+

+	public void TestIsUpper()

+	{

+		char c1 = 'A';

+		char c2 = 'Z';

+		Assert("Not upper", !Char.IsUpper('a'));

+		Assert("upper", Char.IsUpper(c1));

+		Assert("upper", Char.IsUpper(c2));

+

+		string s1 = "a" + c1 + c2;

+		Assert("Not upper", !Char.IsUpper(s1, 0));

+		Assert("upper", Char.IsUpper(s1, 1));

+		Assert("upper", Char.IsUpper(s1, 2));

+	}

+

+	public void TestIsWhiteSpace()

+	{

+		char c1 = ' ';

+		char c2 = '\n';

+		char c3 = '\t';

+

+		Assert("Not whitespace", !Char.IsWhiteSpace('.'));

+		Assert("whitespace1", Char.IsWhiteSpace(c1));

+		Assert("whitespace2", Char.IsWhiteSpace(c2));

+		Assert("whitespace3", Char.IsWhiteSpace(c3));

+

+		string s1 = "." + c1 + c2 + c3;

+		Assert("Not whitespace", !Char.IsWhiteSpace(s1, 0));

+		Assert("whitespace1-2", Char.IsWhiteSpace(s1, 1));

+		Assert("whitespace2-2", Char.IsWhiteSpace(s1, 2));

+		Assert("whitespace3-2", Char.IsWhiteSpace(s1, 3));

+	}

+

+

+	public void TestParse()

+	{

+		char c1 = 'a';

+		string s1 = "a";

+		Assert(c1.Equals(Char.Parse(s1)));

+	}	

+

+	public void TestToLower()

+	{

+		char a1 = 'a';

+		char a2 = 'A';

+		char a3 = 'z';

+		char a4 = 'Z';

+		char a5 = ' ';

+		char a6 = '+';

+		char b1 = 'a';

+		char b2 = 'a';

+		char b3 = 'z';

+		char b4 = 'z';

+		char b5 = ' ';

+		char b6 = '+';

+		AssertEquals("char lowered", b1, Char.ToLower(a1));

+		AssertEquals("char lowered", b2, Char.ToLower(a2));

+		AssertEquals("char lowered", b3, Char.ToLower(a3));

+		AssertEquals("char lowered", b4, Char.ToLower(a4));

+		AssertEquals("char lowered", b5, Char.ToLower(a5));

+		AssertEquals("char lowered", b6, Char.ToLower(a6));

+	}

+

+	public void TestToUpper()

+	{

+		char a1 = 'a';

+		char a2 = 'A';

+		char a3 = 'z';

+		char a4 = 'Z';

+		char a5 = ' ';

+		char a6 = '+';

+		char b1 = 'A';

+		char b2 = 'A';

+		char b3 = 'Z';

+		char b4 = 'Z';

+		char b5 = ' ';

+		char b6 = '+';

+		AssertEquals("char uppered", b1, Char.ToUpper(a1));

+		AssertEquals("char uppered", b2, Char.ToUpper(a2));

+		AssertEquals("char uppered", b3, Char.ToUpper(a3));

+		AssertEquals("char uppered", b4, Char.ToUpper(a4));

+		AssertEquals("char uppered", b5, Char.ToUpper(a5));

+		AssertEquals("char uppered", b6, Char.ToUpper(a6));

+	}

+

+

+	public void TestToString()

+	{

+		char c1 = 'a';

+		string s1 = "a";

+		Assert(s1.Equals(c1.ToString()));

+	}

+

+	public void TestGetTypeCode()

+	{

+		char c1 = 'a';

+		Assert(c1.GetTypeCode().Equals(TypeCode.Char));

+	}

+

+}

+

+}

diff --git a/mcs/class/corlib/Test/System/ConsoleTest.cs b/mcs/class/corlib/Test/System/ConsoleTest.cs
new file mode 100644
index 00000000000..da949017630
--- /dev/null
+++ b/mcs/class/corlib/Test/System/ConsoleTest.cs
@@ -0,0 +1,294 @@
+// ConsoleTest.cs - NUnit Test Cases for the System.Console class

+//

+// David Brandt (bucky@keystreams.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+

+using NUnit.Framework;

+using System;

+using System.IO;

+

+

+namespace MonoTests.System

+{

+

+public class ConsoleTest : TestCase

+{

+	public ConsoleTest() : base ("MonoTests.System.ConsoleTest testsuite") {}

+	public ConsoleTest(string name) : base(name) {}

+

+	TextWriter _err;

+	TextReader _in;

+	TextWriter _out;

+	protected override void SetUp() 

+	{

+		_err = Console.Error;

+		_in = Console.In;

+		_out = Console.Out;

+	}

+

+	protected override void TearDown() 

+	{

+		Console.SetError(_err);

+		Console.SetIn(_in);

+		Console.SetOut(_out);

+	}

+

+	public static ITest Suite {

+		get { 

+			return new TestSuite(typeof(ConsoleTest)); 

+		}

+	}

+

+	public void TestError() {

+		AssertNotNull("No error", Console.Error);

+	}

+

+	public void TestIn() {

+		AssertNotNull("No in", Console.In);

+	}

+

+	public void TestOut() {

+		AssertNotNull("No out", Console.Out);

+	}

+

+	public void TestOpenStandardError() {

+		{

+			Stream err = Console.OpenStandardError();

+			AssertNotNull("Can't open error", err);

+		}

+		{

+			Stream err = Console.OpenStandardError(512);

+			AssertNotNull("Can't open error", err);

+		}

+		// Spec says these are here, MS implementation says no.

+		//{

+		//bool errorThrown = false;

+		//try {

+		//Stream err = Console.OpenStandardError(-1);

+		//} catch (ArgumentOutOfRangeException) {

+		//errorThrown = true;

+		//}

+		//Assert("negative buffer error not thrown", 

+		//errorThrown);

+		//}

+		//{

+		//bool errorThrown = false;

+		//try {

+		//Stream err = Console.OpenStandardError(0);

+		//} catch (ArgumentOutOfRangeException) {

+		//errorThrown = true;

+		//}

+		//Assert("zero buffer error not thrown", errorThrown);

+		//}

+	}

+

+	public void TestOpenStandardInput() {

+		{

+			Stream in1 = Console.OpenStandardInput();

+			AssertNotNull("Can't open input", in1);

+		}

+		{

+			Stream in1 = Console.OpenStandardInput(512);

+			AssertNotNull("Can't open input", in1);

+		}

+		// see commented-out tests in TestOpenStandardError

+	}

+	

+	public void TestOpenStandardOutput() {

+		{

+			Stream out1 = Console.OpenStandardOutput();

+			AssertNotNull("Can't open output", out1);

+		}

+		{

+			Stream out1 = Console.OpenStandardOutput(512);

+			AssertNotNull("Can't open output", out1);

+		}

+		// see commented-out tests in TestOpenStandardError

+	}

+	

+	public void TestRead() {

+		String testStr = "This is a readline test";

+		Stream s = new MemoryStream();

+		TextWriter w = new StreamWriter(s);

+		((StreamWriter)w).AutoFlush = true;

+		TextReader r = new StreamReader(s);

+		Console.SetIn(r);

+		w.WriteLine(testStr);

+		s.Position = 0;

+		char val = (char) Console.Read();

+		AssertEquals("Wrong read", 'T', val);

+	}

+

+	public void TestReadLine() {

+		String testStr = "This is a readline test";

+		Stream s = new MemoryStream();

+		TextWriter w = new StreamWriter(s);

+		((StreamWriter)w).AutoFlush = true;

+		TextReader r = new StreamReader(s);

+		Console.SetIn(r);

+		w.WriteLine(testStr);

+		s.Position = 0;

+		String line = Console.ReadLine();

+		AssertEquals("Wrong line", testStr, line);

+	}

+

+	public void TestSetError() {

+		{

+			bool errorThrown = false;

+			try {

+				Console.SetError(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null error error not thrown", errorThrown);

+		}

+		{

+			String testStr = "This is a stderr test";

+			Stream s = new MemoryStream();

+			TextWriter w = new StreamWriter(s);

+			((StreamWriter)w).AutoFlush = true;

+			TextReader r = new StreamReader(s);

+			Console.SetError(w);

+			Console.Error.WriteLine(testStr);

+			s.Position = 0;

+			String line = r.ReadLine();

+			AssertEquals("Wrong line", testStr, line);

+		}

+	}

+

+	public void TestSetIn() {

+		{

+			bool errorThrown = false;

+			try {

+				Console.SetIn(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null in error not thrown", errorThrown);

+		}

+		{

+			String testStr = "This is a stdin test";

+			Stream s = new MemoryStream();

+			TextWriter w = new StreamWriter(s);

+			((StreamWriter)w).AutoFlush = true;

+			TextReader r = new StreamReader(s);

+			Console.SetIn(r);

+			w.WriteLine(testStr);

+			s.Position = 0;

+			String line = Console.In.ReadLine();

+			AssertEquals("Wrong line", testStr, line);

+		}

+	}

+

+	public void TestSetOut() {

+		{

+			bool errorThrown = false;

+			try {

+				Console.SetOut(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null out error not thrown", errorThrown);

+		}

+		{

+			String testStr = "This is a stdout test";

+			Stream s = new MemoryStream();

+			TextWriter w = new StreamWriter(s);

+			((StreamWriter)w).AutoFlush = true;

+			TextReader r = new StreamReader(s);

+			Console.SetOut(w);

+			Console.Out.WriteLine(testStr);

+			s.Position = 0;

+			String line = r.ReadLine();

+			AssertEquals("Wrong line", testStr, line);

+		}

+	}

+

+	public void TestWrite() {

+		Stream s = new MemoryStream();

+		TextWriter w = new StreamWriter(s);

+		((StreamWriter)w).AutoFlush = true;

+		TextReader r = new StreamReader(s);

+		Console.SetOut(w);

+

+		long endPos = 0;

+

+		String testStr = "This is a stdout write test";

+		Console.Write(testStr);

+		s.Position = endPos;

+		String line = r.ReadToEnd();

+		AssertEquals("Wrong line", testStr, line);

+		endPos = s.Position;

+

+		Boolean[] booleans = {true, false};

+		foreach (bool b in booleans ) {

+			Console.Write(b);

+			s.Position = endPos;

+			line = r.ReadToEnd();

+			AssertEquals("Wrong boolean", b.ToString(), line);

+			endPos = s.Position;

+		}

+

+		Char[] chars = {'a', ';', '?'};

+		foreach (Char c in chars ) {

+			Console.Write(c);

+			s.Position = endPos;

+			line = r.ReadToEnd();

+			AssertEquals("Wrong char", c.ToString(), line);

+			endPos = s.Position;

+		}

+

+		// test writing a null value		

+		string x = null;

+		Console.Write (x);

+

+		// TODO - Likewise for char[], decimal, double, int, long, object, single, uint32, uint64

+		// TODO - write with format string

+	}

+

+	public void TestWriteLine() {

+		Stream s = new MemoryStream();

+		TextWriter w = new StreamWriter(s);

+		((StreamWriter)w).AutoFlush = true;

+		TextReader r = new StreamReader(s);

+		Console.SetOut(w);

+

+		long endPos = 0;

+

+		String testStr = "This is a stdout writeline test";

+		Console.WriteLine(testStr);

+		s.Position = endPos;

+		String line = r.ReadLine();

+		AssertEquals("Wrong line", testStr, line);

+		endPos = s.Position;

+

+		Boolean[] booleans = {true, false};

+		foreach (bool b in booleans ) {

+			Console.WriteLine(b);

+			s.Position = endPos;

+			line = r.ReadLine();

+			AssertEquals("Wrong boolean", b.ToString(), line);

+			endPos = s.Position;

+		}

+

+		Char[] chars = {'a', ';', '?'};

+		foreach (Char c in chars ) {

+			Console.WriteLine(c);

+			s.Position = endPos;

+			line = r.ReadLine();

+			AssertEquals("Wrong char", c.ToString(), line);

+			endPos = s.Position;

+		}

+

+		// test writing a null value		

+		string x = null;

+		Console.WriteLine (x);

+

+		// TODO - Likewise for char[], decimal, double, int, long, object, single, uint32, uint64

+		// TODO - write with format string

+	}

+

+}

+}

diff --git a/mcs/class/corlib/Test/System/ConvertTest.cs b/mcs/class/corlib/Test/System/ConvertTest.cs
new file mode 100755
index 00000000000..ebe1b623785
--- /dev/null
+++ b/mcs/class/corlib/Test/System/ConvertTest.cs
@@ -0,0 +1,2754 @@
+// TestConvert.cs - NUnit Test Cases for System.Convert class
+//
+// Krister Hansson (ds99krha@thn.htu.se)
+// Andreas Jonsson (ds99anjn@thn.htu.se)
+// 
+// (C) Krister Hansson & Andreas Jonsson
+// 
+
+
+using NUnit.Framework;
+using System;
+using System.Globalization;
+
+namespace MonoTests.System
+{
+	public class ConvertTest : TestCase
+	{
+		public ConvertTest() : base ("MonoTests.System.ConvertTest testsuite") {}
+		public ConvertTest(string name) : base(name) {}
+
+		bool boolTrue;
+		bool boolFalse;
+		byte tryByte;
+		char tryChar;
+		DateTime tryDT;
+		decimal tryDec;
+		double tryDbl;
+		short tryInt16;
+		int tryInt32;
+		long tryInt64;
+		object tryObj;
+		sbyte trySByte;
+		float tryFloat;
+		string falseString;
+		string trueString;
+		string nullString;
+		string tryStr;
+		ushort tryUI16;
+		uint tryUI32;
+		ulong tryUI64;
+		CultureInfo ci;
+		
+		protected override void SetUp() {
+			boolTrue = true;
+			boolFalse = false;
+			tryByte = 0;
+			tryChar = 'a';
+			tryDT = new DateTime(2002,1,1);
+			tryDec = 1234.2345m;
+			tryDbl = 0;
+			tryInt16 = 1234;
+			tryInt32 = 12345;
+			tryInt64 = 123456789012;
+			tryObj = new Object();
+			trySByte = 123;
+			tryFloat = 1234.2345f;
+			falseString = "false";
+			trueString = "true";
+			nullString = "null";
+			tryStr = "foobar";
+			tryUI16 = 34567;
+			tryUI32 = 567891234;
+			tryUI64 = 0;
+			ci = new CultureInfo("en-US");
+			ci.NumberFormat.NumberDecimalDigits = 3;
+		}
+		protected override void TearDown() {}
+
+		public static ITest Suite {
+			get { 
+				return new TestSuite(typeof(ConvertTest)); 
+			}
+		}
+
+		public void TestChangeType() {
+			int iTest = 1;
+			try {
+				AssertEquals("#A01", (short)12345, Convert.ChangeType(tryInt32, typeof(short)));
+				iTest++;
+				AssertEquals("#A02", 'A', Convert.ChangeType(65, typeof(char)));
+				iTest++;
+				AssertEquals("#A03", 66, Convert.ChangeType('B', typeof(int)));
+				iTest++;
+				AssertEquals("#A04", ((ulong)12345), Convert.ChangeType(tryInt32, typeof(ulong)));
+				
+				iTest++;
+				AssertEquals("#A05", true, Convert.ChangeType(tryDec, TypeCode.Boolean));
+				iTest++;
+				AssertEquals("#A06", 'f', Convert.ChangeType("f", TypeCode.Char));
+				iTest++;
+				AssertEquals("#A07", (decimal)123456789012, Convert.ChangeType(tryInt64, TypeCode.Decimal));
+				iTest++;
+				AssertEquals("#A08", (int)34567, Convert.ChangeType(tryUI16, TypeCode.Int32));
+
+				iTest++;
+				AssertEquals("#A09", (double)567891234, Convert.ChangeType(tryUI32, typeof(double), ci));
+				iTest++;
+				AssertEquals("#A10", (ushort)0, Convert.ChangeType(tryByte, typeof(ushort), ci));
+				iTest++;
+				AssertEquals("#A11", (decimal)567891234, Convert.ChangeType(tryUI32, typeof(decimal), ci));
+				iTest++;
+				AssertEquals("#A12", (float)1234, Convert.ChangeType(tryInt16, typeof(float), ci));
+				iTest++;
+				AssertEquals("#A13", null, Convert.ChangeType(null, null, ci));
+
+				iTest++;
+				AssertEquals("#A14", (decimal)0, Convert.ChangeType(tryByte, TypeCode.Decimal, ci));
+				iTest++;
+				AssertEquals("#A15", "f", Convert.ChangeType('f', TypeCode.String, ci));
+				iTest++;
+				AssertEquals("#A16", 'D', Convert.ChangeType(68, TypeCode.Char, ci));
+				iTest++;
+				AssertEquals("#A17", (long)34567, Convert.ChangeType(tryUI16, TypeCode.Int64, ci));
+				iTest++;
+				AssertEquals("#A18", null, Convert.ChangeType(null, TypeCode.Empty, ci));
+			} catch (Exception e) {
+				Fail ("Unexpected exception at iTest = " + iTest + ": e = " + e);
+			}
+			
+			try {
+				Convert.ChangeType(boolTrue, typeof(char));
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#A25", typeof(InvalidCastException), e.GetType());
+			}
+			
+			try {
+				Convert.ChangeType(tryChar, typeof(DateTime));
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#A26", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ChangeType(ci, TypeCode.String);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#A27", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ChangeType(tryInt32, null);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#A28", typeof(ArgumentNullException), e.GetType());
+			}
+
+			try 
+			{
+				Convert.ChangeType(boolTrue, typeof(DateTime), ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#A29", typeof(InvalidCastException), e.GetType());
+			}
+			
+			try {
+				Convert.ChangeType(ci, typeof(DateTime), ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#A30", typeof(InvalidCastException), e.GetType());
+			}
+
+			/* Should throw ArgumentException but throws InvalidCastException
+			try {
+				Convert.ChangeType(tryUI32, typeof(FormatException), ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#A??", typeof(ArgumentException), e.GetType());
+			}*/
+
+			try {
+				Convert.ChangeType(tryUI32, TypeCode.Byte, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#A31", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ChangeType(boolTrue, TypeCode.Char, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#A32", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ChangeType(boolTrue, null, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#A33", typeof(ArgumentNullException), e.GetType());
+			}		
+		}		
+
+		public void TestGetTypeCode() {
+			int marker = 1;
+			try {
+				AssertEquals("#B01", TypeCode.String, Convert.GetTypeCode(tryStr));
+				marker++;
+				AssertEquals("#B02", TypeCode.UInt16, Convert.GetTypeCode(tryUI16));
+				marker++;
+				AssertEquals("#B03", TypeCode.UInt32, Convert.GetTypeCode(tryUI32));
+				marker++;
+				AssertEquals("#B04", TypeCode.UInt64, Convert.GetTypeCode(tryUI64));
+				marker++;
+				AssertEquals("#B05", TypeCode.Double, Convert.GetTypeCode(tryDbl));
+				marker++;
+				AssertEquals("#B06", TypeCode.Int16, Convert.GetTypeCode(tryInt16));
+				marker++;
+				AssertEquals("#B07", TypeCode.Int64, Convert.GetTypeCode(tryInt64));
+				marker++;
+				AssertEquals("#B08", TypeCode.Object, Convert.GetTypeCode(tryObj));
+				marker++;
+				AssertEquals("#B09", TypeCode.SByte, Convert.GetTypeCode(trySByte));
+				marker++;
+				AssertEquals("#B10", TypeCode.Single, Convert.GetTypeCode(tryFloat));
+				marker++;
+				AssertEquals("#B11", TypeCode.Byte, Convert.GetTypeCode(tryByte));
+				marker++;
+				AssertEquals("#B12", TypeCode.Char, Convert.GetTypeCode(tryChar));
+				marker++;
+//				AssertEquals("#B13", TypeCode.DateTime, Convert.GetTypeCode(tryDT));
+				marker++;
+				AssertEquals("#B14", TypeCode.Decimal, Convert.GetTypeCode(tryDec));
+				marker++;
+				AssertEquals("#B15", TypeCode.Int32, Convert.GetTypeCode(tryInt32));
+				marker++;
+				AssertEquals("#B16", TypeCode.Boolean, Convert.GetTypeCode(boolTrue));
+			} catch (Exception e) {
+				Fail ("Unexpected exception at " + marker + ": " + e);
+			}
+		}
+
+		public void TestIsDBNull() {
+			AssertEquals("#C01", false, Convert.IsDBNull(tryInt32));
+			AssertEquals("#C02", true, Convert.IsDBNull(Convert.DBNull));
+			AssertEquals("#C03", false, Convert.IsDBNull(boolTrue));
+			AssertEquals("#C04", false, Convert.IsDBNull(tryChar));
+			AssertEquals("#C05", false, Convert.IsDBNull(tryFloat));
+		}
+		
+		public void TestToBoolean() {
+			tryObj = (object)tryDbl;
+			
+			AssertEquals("#D01", true, Convert.ToBoolean(boolTrue));
+			AssertEquals("#D02", false, Convert.ToBoolean(tryByte));
+			AssertEquals("#D03", true, Convert.ToBoolean(tryDec));
+			AssertEquals("#D04", false, Convert.ToBoolean(tryDbl));
+			AssertEquals("#D05", true, Convert.ToBoolean(tryInt16));
+			AssertEquals("#D06", true, Convert.ToBoolean(tryInt32));
+			AssertEquals("#D07", true, Convert.ToBoolean(tryInt64));
+			AssertEquals("#D08", false, Convert.ToBoolean(tryObj));
+			AssertEquals("#D09", true, Convert.ToBoolean(trySByte));
+			AssertEquals("#D10", true, Convert.ToBoolean(tryFloat));
+			AssertEquals("#D11", true, Convert.ToBoolean(trueString));
+			AssertEquals("#D12", false, Convert.ToBoolean(falseString));
+			AssertEquals("#D13", true, Convert.ToBoolean(tryUI16));
+			AssertEquals("#D14", true, Convert.ToBoolean(tryUI32));
+			AssertEquals("#D15", false, Convert.ToBoolean(tryUI64));
+			AssertEquals("#D16", false, Convert.ToBoolean(tryObj,ci));
+			AssertEquals("#D17", true, Convert.ToBoolean(trueString, ci));
+			AssertEquals("#D18", false, Convert.ToBoolean(falseString, ci));
+			
+			try {
+				Convert.ToBoolean(tryChar);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#D20", typeof(InvalidCastException), e.GetType());
+			}
+			
+			try {
+				Convert.ToBoolean(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#D21", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToBoolean(tryStr);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#D22", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToBoolean(nullString);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#D23", typeof(FormatException), e.GetType());
+			}
+		}
+
+		public void TestToByte() {
+			
+			AssertEquals("#E01", (byte)1, Convert.ToByte(boolTrue));
+			AssertEquals("#E02", (byte)0, Convert.ToByte(boolFalse));
+			AssertEquals("#E03", tryByte, Convert.ToByte(tryByte));
+			AssertEquals("#E04", (byte)114, Convert.ToByte('r'));
+			AssertEquals("#E05", (byte)201, Convert.ToByte((decimal)200.6));
+			AssertEquals("#E06", (byte)125, Convert.ToByte((double)125.4));
+			AssertEquals("#E07", (byte)255, Convert.ToByte((short)255));
+			AssertEquals("#E08", (byte)254, Convert.ToByte((int)254));
+			AssertEquals("#E09", (byte)34, Convert.ToByte((long)34));
+			AssertEquals("#E10", (byte)1, Convert.ToByte((object)boolTrue));
+			AssertEquals("#E11", (byte)123, Convert.ToByte((float)123.49f));
+			AssertEquals("#E12", (byte)57, Convert.ToByte("57"));
+			AssertEquals("#E13", (byte)75, Convert.ToByte((ushort)75));
+			AssertEquals("#E14", (byte)184, Convert.ToByte((uint)184));
+			AssertEquals("#E15", (byte)241, Convert.ToByte((ulong)241));
+			AssertEquals("#E16", (byte)123, Convert.ToByte(trySByte, ci));
+			AssertEquals("#E17", (byte)27, Convert.ToByte("011011", 2));
+			AssertEquals("#E18", (byte)13, Convert.ToByte("15", 8));
+			AssertEquals("#E19", (byte)27, Convert.ToByte("27", 10));
+			AssertEquals("#E20", (byte)250, Convert.ToByte("FA", 16));
+
+			try {
+				Convert.ToByte('\u03A9'); // sign of Omega on Win2k
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E25", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#D26", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte((decimal)22000);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E27", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte((double)255.5);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E28", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte(-tryInt16);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E29", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte((int)-256);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E30", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte(tryInt64);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E31", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte((object)ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E32", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte((sbyte)-1);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E33", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte((float)-0.6f);		
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E34", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte("1a1");		
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E35", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte("457");		
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E36", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte((ushort)30000);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E37", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte((uint)300);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E38", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte((ulong)987654321321);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E39", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte("10010111", 3);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E40", typeof(ArgumentException), e.GetType());
+			}
+
+			try {
+				Convert.ToByte("3F3", 16);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#E41", typeof(OverflowException), e.GetType());
+			}
+		}
+
+		public void TestToChar(){
+			tryByte = 58;
+			AssertEquals("#F01", ':', Convert.ToChar(tryByte));
+			AssertEquals("#F02", 'a', Convert.ToChar(tryChar));
+			AssertEquals("#F03", 'A', Convert.ToChar((short)65));
+			AssertEquals("#F04", 'x', Convert.ToChar((int)120));
+			AssertEquals("#F05", '"', Convert.ToChar((long)34));
+			AssertEquals("#F06", '-', Convert.ToChar((sbyte)45));
+			AssertEquals("#F07", '@', Convert.ToChar("@"));
+			AssertEquals("#F08", 'K', Convert.ToChar((ushort)75));
+			AssertEquals("#F09", '=', Convert.ToChar((uint)61));
+			// AssertEquals("#F10", 'È', Convert.ToChar((ulong)200));
+			AssertEquals("#F11", '{', Convert.ToChar((object)trySByte, ci));
+			AssertEquals("#F12", 'o', Convert.ToChar(tryStr.Substring(1,1), ci));
+			
+			try {
+				Convert.ToChar(boolTrue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F20", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F21", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(tryDec);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F22", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(tryDbl);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F23", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar((short)-1);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F24", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(Int32.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F25", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(Int32.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F26", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(tryInt64);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F27", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar((long)-123);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F28", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F29", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(-trySByte);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F30", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(tryFloat);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F31", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar("foo");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F32", typeof(FormatException), e.GetType());
+			}
+			
+			try {
+				Convert.ToChar(null);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F33", typeof(ArgumentNullException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(new Exception(), ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F34", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(null, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F35", typeof(ArgumentNullException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar("", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F36", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToChar(tryStr, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#F37", typeof(FormatException), e.GetType());
+			}
+		}
+
+		public void TestToDateTime() {
+			string dateString = "01/01/2002";
+			
+			int iTest = 1;
+			try {
+				AssertEquals("#G01", tryDT, Convert.ToDateTime(tryDT));
+				iTest++;
+				AssertEquals("#G02", tryDT, Convert.ToDateTime(dateString));
+				iTest++;
+				AssertEquals("#G03", tryDT, Convert.ToDateTime(dateString, ci));
+			} catch (Exception e) {
+				Fail ("Unexpected exception at iTest = " + iTest + ": e = " + e);
+			}
+
+			try {
+				Convert.ToDateTime(boolTrue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G10", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(tryByte);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G11", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(tryChar);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G12", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(tryDec);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G13", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(tryDbl);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G14", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(tryInt16);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G15", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(tryInt32);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G16", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(tryInt64);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G17", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G18", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(trySByte);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G19", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(tryFloat);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G20", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime("20a2-01-01");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G21", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime("20002-25-01");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G22", typeof(ArgumentOutOfRangeException), e.GetType());
+			} 
+
+			try {
+				Convert.ToDateTime(tryUI16);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G23", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(tryUI32);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G24", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(tryUI64);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G25", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime(ci, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G26", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDateTime("20a2-01-01", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#G27", typeof(FormatException), e.GetType());
+			}
+		}
+
+		public void TestToDecimal() {
+			AssertEquals("#H01", (decimal)1, Convert.ToDecimal(boolTrue));
+			AssertEquals("#H02", (decimal)0, Convert.ToDecimal(boolFalse));
+			AssertEquals("#H03", (decimal)tryByte, Convert.ToDecimal(tryByte));
+			AssertEquals("#H04", tryDec, Convert.ToDecimal(tryDec));
+			AssertEquals("#H05", (decimal)tryDbl, Convert.ToDecimal(tryDbl));
+			AssertEquals("#H06", (decimal)tryInt16, Convert.ToDecimal(tryInt16));
+			AssertEquals("#H07", (decimal)tryInt32, Convert.ToDecimal(tryInt32));
+			AssertEquals("#H08", (decimal)tryInt64, Convert.ToDecimal(tryInt64));
+			AssertEquals("#H09", (decimal)trySByte, Convert.ToDecimal(trySByte));
+			AssertEquals("#H10", (decimal)tryFloat, Convert.ToDecimal(tryFloat));
+			AssertEquals("#H11", (decimal)23456.432, Convert.ToDecimal("23456.432"));
+			AssertEquals("#H12", (decimal)tryUI16, Convert.ToDecimal(tryUI16));
+			AssertEquals("#H13", (decimal)tryUI32, Convert.ToDecimal(tryUI32));
+			AssertEquals("#H14", (decimal)tryUI64, Convert.ToDecimal(tryUI64));
+			AssertEquals("#H15", (decimal)63784, Convert.ToDecimal("63784", ci));
+			
+			try {
+				Convert.ToDecimal(tryChar);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#H20", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDecimal(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#H21", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDecimal(double.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#H22", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToDecimal(double.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#H23", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToDecimal(ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#H24", typeof(InvalidCastException), e.GetType());
+			}
+			
+			try {
+				Convert.ToDecimal(tryStr);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#H25", typeof(FormatException), e.GetType());
+			}
+			
+			try {
+				string maxDec = decimal.MaxValue.ToString();
+				maxDec = maxDec + "1";				
+				Convert.ToDecimal(maxDec);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#H26", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToDecimal(ci, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#H27", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDecimal(tryStr, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#H28", typeof(FormatException), e.GetType());
+			}
+			
+			try {
+				string maxDec = decimal.MaxValue.ToString();
+				maxDec = maxDec + "1";
+				Convert.ToDecimal(maxDec, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#H29", typeof(OverflowException), e.GetType());
+			}
+		}
+		
+		public void TestToDouble() {
+			int iTest = 1;
+			try {
+				AssertEquals("#I01", (double)1, Convert.ToDouble(boolTrue));
+				iTest++;
+				AssertEquals("#I02", (double)0, Convert.ToDouble(boolFalse));
+				iTest++;
+				AssertEquals("#I03", (double)tryByte, Convert.ToDouble(tryByte));
+				iTest++;
+				AssertEquals("#I04", tryDbl, Convert.ToDouble(tryDbl));
+				iTest++;
+				AssertEquals("#I05", (double)tryDec, Convert.ToDouble(tryDec));
+				iTest++;
+				AssertEquals("#I06", (double)tryInt16, Convert.ToDouble(tryInt16));
+				iTest++;
+				AssertEquals("#I07", (double)tryInt32, Convert.ToDouble(tryInt32));
+				iTest++;
+				AssertEquals("#I08", (double)tryInt64, Convert.ToDouble(tryInt64));
+				iTest++;
+				AssertEquals("#I09", (double)trySByte, Convert.ToDouble(trySByte));
+				iTest++;
+				AssertEquals("#I10", (double)tryFloat, Convert.ToDouble(tryFloat));
+				iTest++;
+				AssertEquals("#I11", (double)23456.432, Convert.ToDouble("23456.432"));
+				iTest++;
+				AssertEquals("#I12", (double)tryUI16, Convert.ToDouble(tryUI16));
+				iTest++;
+				AssertEquals("#I13", (double)tryUI32, Convert.ToDouble(tryUI32));
+				iTest++;
+				AssertEquals("#I14", (double)tryUI64, Convert.ToDouble(tryUI64));
+				iTest++;
+				AssertEquals("#H15", (double)63784, Convert.ToDouble("63784", ci));
+			} catch (Exception e) {
+				Fail ("Unexpected exception at iTest = " + iTest + ": e = " + e);
+			}
+			
+			try {
+				Convert.ToDouble(tryChar);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#I20", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDouble(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#I21", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDouble(ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#I22", typeof(InvalidCastException), e.GetType());
+			}
+			
+			try {
+				Convert.ToDouble(tryStr);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#I23", typeof(FormatException), e.GetType());
+			}
+			
+			try {
+				string maxDec = double.MaxValue.ToString();
+				maxDec = maxDec + "1";				
+				Convert.ToDouble(maxDec);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#I24", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToDouble(ci, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#I25", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToDouble(tryStr, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#I26", typeof(FormatException), e.GetType());
+			}
+			
+			try {
+				string maxDec = double.MaxValue.ToString();
+				maxDec = maxDec + "1";
+				Convert.ToDouble(maxDec, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#I27", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToDouble(tryObj, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#I28", typeof(InvalidCastException), e.GetType());
+			}
+		}
+
+		public void TestToInt16() {
+			AssertEquals("#J01", (short)0, Convert.ToInt16(boolFalse));
+			AssertEquals("#J02", (short)1, Convert.ToInt16(boolTrue));
+			AssertEquals("#J03", (short)97, Convert.ToInt16(tryChar));
+			AssertEquals("#J04", (short)1234, Convert.ToInt16(tryDec));
+			AssertEquals("#J05", (short)0, Convert.ToInt16(tryDbl));
+			AssertEquals("#J06", (short)1234, Convert.ToInt16(tryInt16));
+			AssertEquals("#J07", (short)12345, Convert.ToInt16(tryInt32));
+			AssertEquals("#J08", (short)30000, Convert.ToInt16((long)30000));
+			AssertEquals("#J09", (short)123, Convert.ToInt16(trySByte));
+			AssertEquals("#J10", (short)1234, Convert.ToInt16(tryFloat));
+			AssertEquals("#J11", (short)578, Convert.ToInt16("578"));
+			AssertEquals("#J12", (short)15500, Convert.ToInt16((ushort)15500));
+			AssertEquals("#J13", (short)5489, Convert.ToInt16((uint)5489));
+			AssertEquals("#J14", (short)9876, Convert.ToInt16((ulong)9876));
+			AssertEquals("#J15", (short)14, Convert.ToInt16("14", ci));
+			AssertEquals("#J16", (short)11, Convert.ToInt16("01011", 2));
+			AssertEquals("#J17", (short)1540, Convert.ToInt16("3004", 8));
+			AssertEquals("#J18", (short)321, Convert.ToInt16("321", 10));
+			AssertEquals("#J19", (short)2748, Convert.ToInt16("ABC", 16));
+
+			try {
+				Convert.ToInt16(char.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J25", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J26", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16((decimal)(short.MaxValue + 1));
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J27", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16((decimal)(short.MinValue - 1));
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J28", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16((double)(short.MaxValue + 1));
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J29", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16((double)(short.MinValue - 1));
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J30", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16(50000);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J31", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16(-50000);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J32", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16(tryInt64);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J33", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16(-tryInt64);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J34", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16(tryObj);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J35", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16((float)32767.5);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J36", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16((float)-33000.54);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J37", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16(tryStr);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J38", typeof(FormatException), e.GetType());
+			}
+			
+			try {							
+				Convert.ToInt16("-33000");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J39", typeof(OverflowException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt16(ushort.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J40", typeof(OverflowException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt16(uint.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J41", typeof(OverflowException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt16(ulong.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J42", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16(tryObj, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J43", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt16(tryStr, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J44", typeof(FormatException), e.GetType());
+			}
+			
+			try {							
+				Convert.ToInt16("-33000", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J45", typeof(OverflowException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt16("321", 11);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J46", typeof(ArgumentException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt16("D8BF1", 16);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#J47", typeof(OverflowException), e.GetType());
+			}
+		}
+
+		public void TestToInt32() {
+			long tryMax = long.MaxValue;
+			long tryMin = long.MinValue;
+			AssertEquals("#K01", (int)0, Convert.ToInt32(boolFalse));
+			AssertEquals("#K02", (int)1, Convert.ToInt32(boolTrue));
+			AssertEquals("#K03", (int)0, Convert.ToInt32(tryByte));
+			AssertEquals("#K04", (int)97, Convert.ToInt32(tryChar));
+			AssertEquals("#K05", (int)1234, Convert.ToInt32(tryDec));
+			AssertEquals("#K06", (int)0, Convert.ToInt32(tryDbl));
+			AssertEquals("#K07", (int)1234, Convert.ToInt32(tryInt16));
+			AssertEquals("#K08", (int)12345, Convert.ToInt32(tryInt32));
+			AssertEquals("#K09", (int)60000, Convert.ToInt32((long)60000));
+			AssertEquals("#K10", (int)123, Convert.ToInt32(trySByte));
+			AssertEquals("#K11", (int)1234, Convert.ToInt32(tryFloat));
+			AssertEquals("#K12", (int)9876, Convert.ToInt32((string)"9876"));
+			AssertEquals("#K13", (int)34567, Convert.ToInt32(tryUI16));
+			AssertEquals("#K14", (int)567891234, Convert.ToInt32(tryUI32));
+			AssertEquals("#K15", (int)0, Convert.ToInt32(tryUI64));
+			AssertEquals("#K16", (int)123, Convert.ToInt32("123", ci));
+			AssertEquals("#K17", (int)128, Convert.ToInt32("10000000", 2));
+			AssertEquals("#K18", (int)302, Convert.ToInt32("456", 8));
+			AssertEquals("#K19", (int)456, Convert.ToInt32("456", 10));
+			AssertEquals("#K20", (int)1110, Convert.ToInt32("456", 16));
+
+			try {							
+				Convert.ToInt32(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K25", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {			    
+				Convert.ToInt32((decimal)tryMax);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K26", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt32((decimal)tryMin);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K27", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt32((double)tryMax);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K28", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt32((double)tryMin);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K29", typeof(OverflowException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt32(tryInt64);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K30", typeof(OverflowException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt32(-tryInt64);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K31", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt32(tryObj);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K32", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt32((float)tryMax);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K33", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt32((float)tryMin);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K34", typeof(OverflowException), e.GetType());
+			}
+			
+			try {							
+				Convert.ToInt32(tryStr, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K35", typeof(FormatException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt32("-46565465123");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K36", typeof(OverflowException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt32("46565465123");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K37", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt32((uint)tryMax);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K38", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt32((ulong)tryMax);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K39", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt32(tryObj, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K40", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt32(tryStr, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K41", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt32("-46565465123", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K42", typeof(OverflowException), e.GetType());
+			}
+			
+			try {
+				Convert.ToInt32("654", 9);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#K43", typeof(ArgumentException), e.GetType());
+			}
+		}
+		public void TestToInt64() {
+			decimal longMax = long.MaxValue;
+			longMax += 1000000;
+			decimal longMin = long.MinValue;
+			longMin -= 1000000;
+
+			AssertEquals("#L01", (long)0, Convert.ToInt64(boolFalse));
+			AssertEquals("#L02", (long)1, Convert.ToInt64(boolTrue));
+			AssertEquals("#L03", (long)97, Convert.ToInt64(tryChar));
+			AssertEquals("#L04", (long)1234, Convert.ToInt64(tryDec));
+			AssertEquals("#L05", (long)0, Convert.ToInt64(tryDbl));
+			AssertEquals("#L06", (long)1234, Convert.ToInt64(tryInt16));
+			AssertEquals("#L07", (long)12345, Convert.ToInt64(tryInt32));
+			AssertEquals("#L08", (long)123456789012, Convert.ToInt64(tryInt64));
+			AssertEquals("#L09", (long)123, Convert.ToInt64(trySByte));
+			AssertEquals("#L10", (long)1234, Convert.ToInt64(tryFloat));
+			AssertEquals("#L11", (long)564897, Convert.ToInt64("564897"));
+			AssertEquals("#L12", (long)34567, Convert.ToInt64(tryUI16));
+			AssertEquals("#L13", (long)567891234, Convert.ToInt64(tryUI32));
+			AssertEquals("#L14", (long)0, Convert.ToInt64(tryUI64));
+			AssertEquals("#L15", (long)-2548751, Convert.ToInt64("-2548751", ci));
+			AssertEquals("#L16", (long)24987562, Convert.ToInt64("1011111010100011110101010", 2));
+			AssertEquals("#L17", (long)-24578965, Convert.ToInt64("1777777777777642172153", 8));
+			AssertEquals("#L18", (long)248759757, Convert.ToInt64("248759757", 10));
+			AssertEquals("#L19", (long)256, Convert.ToInt64("100", 16));
+
+			try {
+				Convert.ToInt64(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L20", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64((decimal)longMax + 1);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L21", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64((decimal)longMin);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L24", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64((double)longMax);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L25:"+longMax, typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64((double)longMin);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L26", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64(new Exception());
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L27", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64(((float)longMax)*100);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L28:"+longMax, typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64(((float)longMin)*100);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L29", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64("-567b3");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L30", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64(longMax.ToString());
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L31:", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64(ulong.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L32", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToInt64(tryStr, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L32b", typeof(FormatException), e.GetType());
+			}
+			
+			try {							
+				Convert.ToInt64(longMin.ToString(), ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L33", typeof(OverflowException), e.GetType());
+			}
+
+			try {							
+				Convert.ToInt64("321", 11);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#L34", typeof(ArgumentException), e.GetType());
+			}
+		}
+
+		public void TestToSByte() {
+			int iTest = 1;
+			try {
+				AssertEquals("#M01", (sbyte)0, Convert.ToSByte(boolFalse));
+				iTest++;
+				AssertEquals("#M02", (sbyte)1, Convert.ToSByte(boolTrue));
+				iTest++;
+				AssertEquals("#M03", (sbyte)97, Convert.ToSByte(tryChar));
+				iTest++;
+				AssertEquals("#M04", (sbyte)15, Convert.ToSByte((decimal)15));
+				iTest++;
+				AssertEquals("#M05", (sbyte)0, Convert.ToSByte(tryDbl));
+				iTest++;
+				AssertEquals("#M06", (sbyte)127, Convert.ToSByte((short)127));
+				iTest++;
+				AssertEquals("#M07", (sbyte)-128, Convert.ToSByte((int)-128));
+				iTest++;
+				AssertEquals("#M08", (sbyte)30, Convert.ToSByte((long)30));
+				iTest++;
+				AssertEquals("#M09", (sbyte)123, Convert.ToSByte(trySByte));
+				iTest++;
+				AssertEquals("#M10", (sbyte)12, Convert.ToSByte((float)12.46987f));
+				iTest++;
+				AssertEquals("#M11", (sbyte)1, Convert.ToSByte("1"));
+				iTest++;
+				AssertEquals("#M12", (sbyte)99, Convert.ToSByte((ushort)99));
+				iTest++;
+				AssertEquals("#M13", (sbyte)54, Convert.ToSByte((uint)54));
+				iTest++;
+				AssertEquals("#M14", (sbyte)127, Convert.ToSByte((ulong)127));
+				iTest++;
+				AssertEquals("#M15", (sbyte)14, Convert.ToSByte("14", ci));
+				iTest++;
+				AssertEquals("#M16", (sbyte)11, Convert.ToSByte("01011", 2));
+				iTest++;
+				AssertEquals("#M17", (sbyte)5, Convert.ToSByte("5", 8));
+				iTest++;
+				AssertEquals("#M18", (sbyte)100, Convert.ToSByte("100", 10));
+				iTest++;
+				AssertEquals("#M19", (sbyte)-1, Convert.ToSByte("FF", 16));
+			} catch (Exception e) {
+				Fail ("Unexpected exception at iTest = " + iTest + ": e = " + e);
+			}
+
+			try {
+				Convert.ToSByte((byte)200);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M25", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((char)130);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M26", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M27", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((decimal)127.5m);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M28", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((decimal)-200m);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M29", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((double)150);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M30", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((double)-128.6);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M31", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((short)150);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M32", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((short)-300);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M33", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((int)1500);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M34", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((int)-1286);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M35", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((long)128);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M36", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((long)-129);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M37", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte(new NumberFormatInfo());
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M38", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((float)333);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M39", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((float)-666);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M40", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte("B3");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M41", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte("251");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M42", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte(ushort.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M43", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte((uint)600);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M44", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte(ulong.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M45", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte(ci, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M46", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte(tryStr, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M47", typeof(FormatException), e.GetType());
+			}
+			
+			try {							
+				Convert.ToSByte("325", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M48", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSByte("5D", 15);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M49", typeof(ArgumentException), e.GetType());
+			}
+			
+			try {							
+				Convert.ToSByte("111111111", 2);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#M50", typeof(OverflowException), e.GetType());
+			}
+		}
+
+		public void TestToSingle() {
+			int iTest = 1;
+			try {
+				AssertEquals("#N01", (float)0, Convert.ToSingle(boolFalse));
+				iTest++;
+				AssertEquals("#N02", (float)1, Convert.ToSingle(boolTrue));
+				iTest++;
+				AssertEquals("#N03", (float)0, Convert.ToSingle(tryByte));
+				iTest++;
+				AssertEquals("#N04", (float)1234,234, Convert.ToSingle(tryDec));
+				iTest++;
+				AssertEquals("#N05", (float)0, Convert.ToSingle(tryDbl));
+				iTest++;
+				AssertEquals("#N06", (float)1234, Convert.ToSingle(tryInt16));
+				iTest++;
+				AssertEquals("#N07", (float)12345, Convert.ToSingle(tryInt32));
+				iTest++;
+				AssertEquals("#N08", (float)123456789012, Convert.ToSingle(tryInt64));
+				iTest++;
+				AssertEquals("#N09", (float)123, Convert.ToSingle(trySByte));
+				iTest++;
+				AssertEquals("#N10", (float)1234,2345, Convert.ToSingle(tryFloat));
+				iTest++;
+				AssertEquals("#N11", (float)987, Convert.ToSingle("987"));
+				iTest++;
+				AssertEquals("#N12", (float)34567, Convert.ToSingle(tryUI16));
+				iTest++;
+				AssertEquals("#N13", (float)567891234, Convert.ToSingle(tryUI32));
+				iTest++;
+				AssertEquals("#N14", (float)0, Convert.ToSingle(tryUI64));
+				iTest++;
+				AssertEquals("#N15", (float)654.234, Convert.ToSingle("654.234", ci));
+			} catch (Exception e) {
+				Fail ("Unexpected exception at iTest = " + iTest + ": e = " + e);
+			}
+
+			try {
+				Convert.ToSingle(tryChar);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#N25", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToSingle(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#N26", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToSingle(tryObj);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#N27", typeof(InvalidCastException), e.GetType());
+			}
+			
+			try {
+				Convert.ToSingle("A345H");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#N28", typeof(FormatException), e.GetType());
+			}
+			
+			try {
+				Convert.ToSingle(double.MaxValue.ToString());
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#N29", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToSingle(tryObj, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#N30", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToSingle("J345K", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#N31", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToSingle("11000000000000000000000000000000000000000000000", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#N32", typeof(OverflowException), e.GetType());
+			}
+		}
+
+		public void TestToString() {
+			
+			tryByte = 123;
+			AssertEquals("#O01", "False", Convert.ToString(boolFalse));
+			AssertEquals("#O02", "True", Convert.ToString(boolTrue));
+			AssertEquals("#O03", "123", Convert.ToString(tryByte));
+			AssertEquals("#O04", "a", Convert.ToString(tryChar));
+			AssertEquals("#O05", tryDT.ToString(), Convert.ToString(tryDT));
+			AssertEquals("#O06", tryDec.ToString(), Convert.ToString(tryDec));
+			AssertEquals("#O07", tryDbl.ToString(), Convert.ToString(tryDbl));
+			AssertEquals("#O08", "1234", Convert.ToString(tryInt16));
+			AssertEquals("#O09", "12345", Convert.ToString(tryInt32));
+			AssertEquals("#O10", "123456789012", Convert.ToString(tryInt64));
+			AssertEquals("#O11", "123", Convert.ToString(trySByte));
+			AssertEquals("#O12", tryFloat.ToString(), Convert.ToString(tryFloat));
+			AssertEquals("#O13", "foobar", Convert.ToString(tryStr));
+			AssertEquals("#O14", "34567", Convert.ToString(tryUI16));
+			AssertEquals("#O15", "567891234", Convert.ToString(tryUI32));
+			AssertEquals("#O16", "True", Convert.ToString(boolTrue, ci));
+			AssertEquals("#O17", "False", Convert.ToString(boolFalse, ci));
+			AssertEquals("#O18", "123", Convert.ToString(tryByte, ci));
+			AssertEquals("#O19", "1111011", Convert.ToString(tryByte, 2));
+			AssertEquals("#O20", "173", Convert.ToString(tryByte, 8));
+			AssertEquals("#O21", "123", Convert.ToString(tryByte, 10));
+			AssertEquals("#O22", "7b", Convert.ToString(tryByte, 16));
+			AssertEquals("#O23", "a", Convert.ToString(tryChar, ci));
+			AssertEquals("#O24", tryDT.ToString(ci), Convert.ToString(tryDT, ci));
+			AssertEquals("#O25", tryDec.ToString(ci), Convert.ToString(tryDec,ci));
+			AssertEquals("#O26", tryDbl.ToString(ci), Convert.ToString(tryDbl, ci));
+			AssertEquals("#O27", "1234", Convert.ToString(tryInt16, ci));
+			AssertEquals("#O28", "10011010010", Convert.ToString(tryInt16, 2));
+			AssertEquals("#O29", "2322", Convert.ToString(tryInt16, 8));
+			AssertEquals("#O30", "1234", Convert.ToString(tryInt16, 10));
+			AssertEquals("#O31", "4d2", Convert.ToString(tryInt16, 16));
+			AssertEquals("#O32", "12345", Convert.ToString(tryInt32, ci));
+			AssertEquals("#O33", "11000000111001", Convert.ToString(tryInt32, 2));
+			AssertEquals("#O34", "30071", Convert.ToString(tryInt32, 8));
+			AssertEquals("#O35", "12345", Convert.ToString(tryInt32, 10));
+			AssertEquals("#O36", "3039", Convert.ToString(tryInt32, 16));
+			AssertEquals("#O37", "123456789012", Convert.ToString(tryInt64, ci));
+			AssertEquals("#O38", "1110010111110100110010001101000010100",
+				Convert.ToString(tryInt64, 2));
+			AssertEquals("#O39", "1627646215024", Convert.ToString(tryInt64, 8));
+			AssertEquals("#O40", "123456789012", Convert.ToString(tryInt64, 10));
+			AssertEquals("#O41", "1cbe991a14", Convert.ToString(tryInt64, 16));
+			AssertEquals("#O42", "123", Convert.ToString((trySByte), ci));
+			AssertEquals("#O43", tryFloat.ToString(ci), Convert.ToString((tryFloat), ci));
+			AssertEquals("#O44", "foobar", Convert.ToString((tryStr), ci));
+			AssertEquals("#O45", "34567", Convert.ToString((tryUI16), ci));
+			AssertEquals("#O46", "567891234", Convert.ToString((tryUI32), ci));
+			AssertEquals("#O47", "0", Convert.ToString(tryUI64));
+			AssertEquals("#O48", "0", Convert.ToString((tryUI64), ci));
+
+			try {
+				Convert.ToString(tryInt16, 5);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#O55", typeof(ArgumentException), e.GetType());
+			}
+
+			try {
+				Convert.ToString(tryInt32, 17);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#O56", typeof(ArgumentException), e.GetType());
+			}
+
+			try {
+				Convert.ToString(tryInt64, 1);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#O57", typeof(ArgumentException), e.GetType());
+			}			
+		}
+
+        public void TestToUInt16() {
+			AssertEquals("#P01", (ushort)0, Convert.ToUInt16(boolFalse));
+			AssertEquals("#P02", (ushort)1, Convert.ToUInt16(boolTrue));
+			AssertEquals("#P03", (ushort)0, Convert.ToUInt16(tryByte));
+			AssertEquals("#P04", (ushort)97, Convert.ToUInt16(tryChar));
+			AssertEquals("#P05", (ushort)1234, Convert.ToUInt16(tryDec));
+			AssertEquals("#P06", (ushort)0, Convert.ToUInt16(tryDbl));
+			AssertEquals("#P07", (ushort)1234, Convert.ToUInt16(tryInt16));
+			AssertEquals("#P08", (ushort)12345, Convert.ToUInt16(tryInt32));
+			AssertEquals("#P09", (ushort)43752, Convert.ToUInt16((long)43752));
+			AssertEquals("#P10", (ushort)123, Convert.ToUInt16(trySByte));
+			AssertEquals("#P11", (ushort)1234, Convert.ToUInt16(tryFloat));
+			AssertEquals("#P12", (ushort)123, Convert.ToUInt16((string)"123"));
+			AssertEquals("#P13", (ushort)34567, Convert.ToUInt16(tryUI16));
+			AssertEquals("#P14", (ushort)56789, Convert.ToUInt16((uint)56789));
+			AssertEquals("#P15", (ushort)0, Convert.ToUInt16(tryUI64));
+			AssertEquals("#P16", (ushort)31, Convert.ToUInt16("31", ci));
+			AssertEquals("#P17", (ushort)14, Convert.ToUInt16("1110", 2));
+			AssertEquals("#P18", (ushort)32, Convert.ToUInt16("40", 8));
+			AssertEquals("#P19", (ushort)40, Convert.ToUInt16("40", 10));
+			AssertEquals("#P20", (ushort)64, Convert.ToUInt16("40", 16));
+
+
+			try {
+				Convert.ToUInt16(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P25", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(decimal.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P26", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(decimal.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P27", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(double.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P28", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(double.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P29", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(short.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P30", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(int.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P31", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(int.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P32", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(long.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P33", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(long.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P34", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(tryObj);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P35", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(sbyte.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P36", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(float.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P37", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(float.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P38", typeof(OverflowException), e.GetType());
+			}
+			
+			try {
+				Convert.ToUInt16("1A2");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P39", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16("-32800");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P40", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(int.MaxValue.ToString());
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P41", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16(ulong.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P42", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16("1A2", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P43", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16("-32800", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P44", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16("456987", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P45", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt16("40", 9);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#P46", typeof(ArgumentException), e.GetType());
+			}
+		}
+
+		public void TestToUInt32() {
+			AssertEquals("#Q01", (uint)1, Convert.ToUInt32(boolTrue));
+			AssertEquals("#Q02", (uint)0, Convert.ToUInt32(boolFalse));
+			AssertEquals("#Q03", (uint)0, Convert.ToUInt32(tryByte));
+			AssertEquals("#Q04", (uint)97, Convert.ToUInt32(tryChar));
+			AssertEquals("#Q05", (uint)1234, Convert.ToUInt32(tryDec));
+			AssertEquals("#Q06", (uint)0, Convert.ToUInt32(tryDbl));
+			AssertEquals("#Q07", (uint)1234, Convert.ToUInt32(tryInt16));
+			AssertEquals("#Q08", (uint)12345, Convert.ToUInt32(tryInt32));
+			AssertEquals("#Q09", (uint)1234567890, Convert.ToUInt32((long)1234567890));
+			AssertEquals("#Q10", (uint)123, Convert.ToUInt32(trySByte));
+			AssertEquals("#Q11", (uint)1234, Convert.ToUInt32(tryFloat));
+			AssertEquals("#Q12", (uint)3456789, Convert.ToUInt32("3456789"));
+			AssertEquals("#Q13", (uint)34567, Convert.ToUInt32(tryUI16));
+			AssertEquals("#Q14", (uint)567891234, Convert.ToUInt32(tryUI32));
+			AssertEquals("#Q15", (uint)0, Convert.ToUInt32(tryUI64));
+			AssertEquals("#Q16", (uint)415, Convert.ToUInt32("110011111", 2));
+			AssertEquals("#Q17", (uint)156, Convert.ToUInt32("234" ,8));
+			AssertEquals("#Q18", (uint)234, Convert.ToUInt32("234" ,10));
+			AssertEquals("#Q19", (uint)564, Convert.ToUInt32("234" ,16));
+			
+
+			try {
+				Convert.ToUInt32(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q25", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(decimal.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q26", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32((decimal)-150);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q27", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(double.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q28", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32((double)-1);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q29", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(short.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q30", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(int.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q31", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(long.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q32", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32((long)-50000);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q33", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(new Exception());
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q34", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(sbyte.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q35", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(float.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q36", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(float.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q37", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32("45t54");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q38", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32("-55");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q39", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(ulong.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q40", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(new Exception(), ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q41", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(tryStr, ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q42", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32("-50", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q43", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32(decimal.MaxValue.ToString(), ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q44", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt32("1001110", 1);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#Q45", typeof(ArgumentException), e.GetType());
+			}
+		}
+
+		public void TestToUInt64() 
+		{
+			int iTest = 1;
+			try {
+				AssertEquals("#R01", (ulong)1, Convert.ToUInt64(boolTrue));
+				iTest++;
+				AssertEquals("#R02", (ulong)0, Convert.ToUInt64(boolFalse));
+				iTest++;
+				AssertEquals("#R03", (ulong)0, Convert.ToUInt64(tryByte));
+				iTest++;
+				AssertEquals("#R04", (ulong)97, Convert.ToUInt64(tryChar));
+				iTest++;
+				AssertEquals("#R05", (ulong)1234, Convert.ToUInt64(tryDec));
+				iTest++;
+				AssertEquals("#R06", (ulong)0, Convert.ToUInt64(tryDbl));
+				iTest++;
+				AssertEquals("#R07", (ulong)1234, Convert.ToUInt64(tryInt16));
+				iTest++;
+				AssertEquals("#R08", (ulong)12345, Convert.ToUInt64(tryInt32));
+				iTest++;
+				AssertEquals("#R09", (ulong)123456789012, Convert.ToUInt64(tryInt64));
+				iTest++;
+				AssertEquals("#R10", (ulong)123, Convert.ToUInt64(trySByte));
+				iTest++;
+				AssertEquals("#R11", (ulong)1234, Convert.ToUInt64(tryFloat));
+				iTest++;
+				AssertEquals("#R12", (ulong)345678, Convert.ToUInt64("345678"));
+				iTest++;
+				AssertEquals("#R13", (ulong)34567, Convert.ToUInt64(tryUI16));
+				iTest++;
+				AssertEquals("#R14", (ulong)567891234, Convert.ToUInt64(tryUI32));
+				iTest++;
+				AssertEquals("#R15", (ulong)0, Convert.ToUInt64(tryUI64));
+				iTest++;
+				AssertEquals("#R16", (ulong)123, Convert.ToUInt64("123", ci));
+				iTest++;
+				AssertEquals("#R17", (ulong)4, Convert.ToUInt64("100", 2));
+				iTest++;
+				AssertEquals("#R18", (ulong)64, Convert.ToUInt64("100", 8));
+				iTest++;
+				AssertEquals("#R19", (ulong)100, Convert.ToUInt64("100", 10));
+				iTest++;
+				AssertEquals("#R20", (ulong)256, Convert.ToUInt64("100", 16));
+			} catch (Exception e) {
+				Fail ("Unexpected exception caught when iTest = " + iTest + ": e = " + e);
+			}
+
+			try {
+				Convert.ToUInt64(tryDT);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R25", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(decimal.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R26", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64((decimal)-140);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R27", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(double.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R28", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64((double)-1);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R29", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(short.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R30", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(int.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R31", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(long.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R32", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(tryObj);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R33", typeof(InvalidCastException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(sbyte.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R34", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(float.MinValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R35", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(float.MaxValue);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R36", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64("234rt78");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R37", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64("-68");
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R38", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(decimal.MaxValue.ToString());
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R39", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64("23rd2", ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R40", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(decimal.MinValue.ToString(), ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R41", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64(decimal.MaxValue.ToString(), ci);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R42", typeof(OverflowException), e.GetType());
+			}
+
+			try {
+				Convert.ToUInt64("132", 9);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#R43", typeof(ArgumentException), e.GetType());
+			}
+		}
+
+		public void TestToBase64CharArray() {
+			byte[] byteArr = {33, 127, 255, 109, 170, 54};
+			//						   0    1    2    3    4    5    6    7
+			char[] expectedCharArr = {'I', 'X', '/', '/', 'b', 'a', 'o', '2'};
+			char[] result = new Char[8];
+			
+			Convert.ToBase64CharArray(byteArr, 0, byteArr.Length, result, 0);
+
+			for (int i = 0; i < expectedCharArr.Length; i++) {
+				AssertEquals("#S0" + i, expectedCharArr[i], result[i]);
+			}
+
+			try {
+				Convert.ToBase64CharArray(null, 0, byteArr.Length, result, 0);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#S10", typeof(ArgumentNullException), e.GetType());
+			}
+
+			try {
+				Convert.ToBase64CharArray(byteArr, -1, byteArr.Length, result, 0);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#S11", typeof(ArgumentOutOfRangeException), e.GetType());
+			}
+
+			try {
+				Convert.ToBase64CharArray(byteArr, 0, -5, result, 0);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#S12", typeof(ArgumentOutOfRangeException), e.GetType());
+			}
+
+			try {
+				Convert.ToBase64CharArray(byteArr, 0, byteArr.Length, result, -2);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#S13", typeof(ArgumentOutOfRangeException), e.GetType());
+			}
+
+			try {
+				Convert.ToBase64CharArray(byteArr, 4, byteArr.Length, result, 0);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#S14", typeof(ArgumentOutOfRangeException), e.GetType());
+			}
+
+			try {
+				Convert.ToBase64CharArray(byteArr, 0, byteArr.Length, result, 2);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#S15", typeof(ArgumentOutOfRangeException), e.GetType());
+			}
+		}		
+		public void TestToBase64String() {
+			byte[] byteArr = {33, 127, 255, 109, 170, 54};
+			string expectedStr = "IX//bao2";
+			string result1;
+			string result2;
+			
+			result1 = Convert.ToBase64String(byteArr);
+			result2 = Convert.ToBase64String(byteArr, 0, byteArr.Length);
+
+			AssertEquals("#T01", expectedStr, result1);
+			AssertEquals("#T02", expectedStr, result2);
+
+			try {
+				Convert.ToBase64String(null);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#T05", typeof(ArgumentNullException), e.GetType());
+			}
+			
+			try {
+				Convert.ToBase64String(byteArr, -1, byteArr.Length);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#T06", typeof(ArgumentOutOfRangeException), e.GetType());
+			}
+
+			try {
+				Convert.ToBase64String(byteArr, 0, -10);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#T07", typeof(ArgumentOutOfRangeException), e.GetType());
+			}
+
+			try {
+				Convert.ToBase64String(byteArr, 4, byteArr.Length);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#T08", typeof(ArgumentOutOfRangeException), e.GetType());
+			}		
+		}
+
+		/* Have experienced some problems with FromBase64CharArray using mono. Something 
+		 * about error in a unicode file.
+		 *
+		 * However the test seems to run fine using mono in a cygwin environment
+		 */
+		public void TestFromBase64CharArray() {
+
+			char[] charArr = {'M','o','n','o','m','o','n','o'};
+			byte[] expectedByteArr = {50, 137, 232, 154, 137, 232};
+			
+			byte[] fromCharArr = Convert.FromBase64CharArray(charArr, 0, 8);			
+
+			for (int i = 0; i < fromCharArr.Length; i++){
+				AssertEquals("#U0" + i, expectedByteArr[i], fromCharArr[i]);
+			}
+
+			try {
+				Convert.FromBase64CharArray(null, 0, charArr.Length);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#U10", typeof(ArgumentNullException), e.GetType());
+			}
+			
+			try {
+				Convert.FromBase64CharArray(charArr, -1, charArr.Length);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#U11", typeof(ArgumentOutOfRangeException), e.GetType());
+			}
+
+			try {
+				Convert.FromBase64CharArray(charArr, 0, -5);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#U12", typeof(ArgumentOutOfRangeException), e.GetType());
+			}
+
+			try {
+				Convert.FromBase64CharArray(charArr, 0, 3);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#U13", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.FromBase64CharArray(charArr, 0, 9);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#U14", typeof(ArgumentOutOfRangeException), e.GetType());
+			}
+
+			try {
+				Convert.FromBase64CharArray(charArr, 0, 5);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#U15", typeof(FormatException), e.GetType());
+			}
+		}
+
+		/* Have experienced some problems with FromBase64String using mono. Something about 
+		 * error in a unicode file.
+		 *
+		 * However the test seems to run fine using mono in a cygwin environment
+		 */
+		public void TestFromBase64String() {
+			string str = "Monomono";
+			string err01 = "foo";
+
+			byte[] expectedByteArr = {50, 137, 232, 154, 137, 232};
+			byte[] fromStr = Convert.FromBase64String(str);	
+
+			for (int i = 0; i < fromStr.Length; i++){
+				AssertEquals("#V0" + i, expectedByteArr[i], fromStr[i]);
+			}
+
+			try {
+				Convert.FromBase64String(null);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#V10", typeof(ArgumentNullException), e.GetType());
+			}
+
+			try {
+				Convert.FromBase64String(err01);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#V11", typeof(FormatException), e.GetType());
+			}
+
+			try {
+				Convert.FromBase64String(tryStr);
+				Fail();
+			}
+			catch (Exception e) {
+				AssertEquals("#V12", typeof(FormatException), e.GetType());
+			}
+		}
+	}
+}
diff --git a/mcs/class/corlib/Test/System/DateTimeTest.cs b/mcs/class/corlib/Test/System/DateTimeTest.cs
new file mode 100755
index 00000000000..98b4743a4ce
--- /dev/null
+++ b/mcs/class/corlib/Test/System/DateTimeTest.cs
@@ -0,0 +1,407 @@
+//

+// DateTimeTest.cs - NUnit Test Cases for the System.DateTime struct

+//

+// author:

+//   Martin Baulig (martin@gnome.org)

+//

+//   (C) 2002 Free Software Foundation

+//

+

+using NUnit.Framework;

+using System;

+using System.Threading;

+using System.Globalization;

+

+namespace MonoTests.System

+{

+

+public class DateTimeTest : TestCase

+{

+	private CultureInfo oldcult;

+	

+	long[] myTicks = {

+		631501920000000000L,	// 25 Feb 2002 - 00:00:00

+		631502475130080000L,	// 25 Feb 2002 - 15:25:13,8

+		631502115130080000L,	// 25 Feb 2002 - 05:25:13,8

+		631502115000000000L,	// 25 Feb 2002 - 05:25:00

+		631502115130000000L,	// 25 Feb 2002 - 05:25:13

+		631502079130000000L,	// 25 Feb 2002 - 04:25:13

+		629197085770000000L	// 06 Nov 1994 - 08:49:37 

+	};

+

+	public DateTimeTest() : base ("MonoTests.System.DateTimeTest testcase") {}

+        public DateTimeTest (string name): base(name) {}

+

+	public static ITest Suite

+	{

+		get {

+			return new TestSuite (typeof (DateTimeTest));

+		}

+	}

+

+	protected override void SetUp() 

+	{

+		// the current culture determines the result of formatting

+		oldcult = Thread.CurrentThread.CurrentCulture;

+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("");

+	}

+	

+	protected override void TearDown ()

+	{

+		Thread.CurrentThread.CurrentCulture = oldcult;		

+	}

+	

+	public void TestCtors ()

+	{

+		DateTime t1 = new DateTime (2002,2,25);

+		AssertEquals("A01", myTicks[0], t1.Ticks);

+		DateTime t2 = new DateTime (2002,2,25,15,25,13,8);

+		AssertEquals("A02", myTicks[1], t2.Ticks);

+		AssertEquals("A03", myTicks[0], t2.Date.Ticks);

+		AssertEquals("A04", 2002, t2.Year);

+		AssertEquals("A05", 2, t2.Month);

+		AssertEquals("A06", 25, t2.Day);

+		AssertEquals("A07", 15, t2.Hour);

+		AssertEquals("A08", 25, t2.Minute);

+		AssertEquals("A09", 13, t2.Second);

+		AssertEquals("A10", 8, t2.Millisecond);

+		DateTime t3 = new DateTime (2002,2,25,5,25,13,8);

+		AssertEquals("A11", myTicks[2], t3.Ticks);

+	}

+

+	public void TestToString ()

+	{

+		DateTime t1 = new DateTime (myTicks[2]);

+		DateTime t2 = new DateTime (myTicks[1]);

+		// Standard patterns

+		AssertEquals("B01", "02/25/2002", t1.ToString ("d"));

+		AssertEquals("B02", "Monday, 25 February 2002", t1.ToString ("D"));

+		AssertEquals("B03", "Monday, 25 February 2002 05:25", t1.ToString ("f"));

+		AssertEquals("B04", "Monday, 25 February 2002 05:25:13", t1.ToString ("F"));

+		AssertEquals("B05", "02/25/2002 05:25", t1.ToString ("g"));

+		AssertEquals("B06", "02/25/2002 05:25:13", t1.ToString ("G"));

+		AssertEquals("B07", "February 25", t1.ToString ("m"));

+		AssertEquals("B08", "February 25", t1.ToString ("M"));

+		AssertEquals("B09", "Mon, 25 Feb 2002 05:25:13 GMT", t1.ToString ("r"));

+		AssertEquals("B10", "Mon, 25 Feb 2002 05:25:13 GMT", t1.ToString ("R"));

+		AssertEquals("B11", "2002-02-25T05:25:13", t1.ToString ("s"));

+		AssertEquals("B12", "05:25", t1.ToString ("t"));

+		AssertEquals("B13", "05:25:13", t1.ToString ("T"));

+		AssertEquals("B14", "2002-02-25 05:25:13Z", t1.ToString ("u"));

+		AssertEquals("B15", "Sunday, 24 February 2002 11:25:13", t1.ToUniversalTime().ToString ("U"));

+		AssertEquals("B16", "2002 February", t1.ToString ("y"));

+		AssertEquals("B17", "2002 February", t1.ToString ("Y"));

+

+		// Custom patterns

+		AssertEquals("C01", "25", t1.ToString ("%d"));

+		AssertEquals("C02", "25", t1.ToString ("dd"));

+		AssertEquals("C03", "Mon", t1.ToString ("ddd"));

+		AssertEquals("C04", "Monday", t1.ToString ("dddd"));

+		AssertEquals("C05", "2", t1.ToString ("%M"));

+		AssertEquals("C06", "02", t1.ToString ("MM"));

+		AssertEquals("C07", "Feb", t1.ToString ("MMM"));

+		AssertEquals("C08", "February", t1.ToString ("MMMM"));

+		AssertEquals("C09", "2", t1.ToString ("%y"));

+		AssertEquals("C10", "02", t1.ToString ("yy"));

+		AssertEquals("C11", "2002", t1.ToString ("yyyy"));

+		AssertEquals("C12", "5", t1.ToString ("%h"));

+		AssertEquals("C13", "05", t1.ToString ("hh"));

+		AssertEquals("C14", "3", t2.ToString ("%h"));

+		AssertEquals("C15", "03", t2.ToString ("hh"));

+		AssertEquals("C16", "15", t2.ToString ("%H"));

+		AssertEquals("C17", "15", t2.ToString ("HH"));

+		AssertEquals("C18", "25", t2.ToString ("%m"));

+		AssertEquals("C19", "25", t2.ToString ("mm"));

+		AssertEquals("C20", "13", t2.ToString ("%s"));

+		AssertEquals("C21", "13", t2.ToString ("ss"));

+		AssertEquals("C22", "A", t1.ToString ("%t"));

+		AssertEquals("C23", "P", t2.ToString ("%t"));

+		AssertEquals("C24", "AM", t1.ToString ("tt"));

+		AssertEquals("C25", "PM", t2.ToString ("tt"));

+		long offset = TimeZone.CurrentTimeZone.GetUtcOffset(t1).Ticks / 36000000000;

+		AssertEquals("C26", offset.ToString("+#;-#;0"), t1.ToString ("%z"));

+		AssertEquals("C27", offset.ToString("+00;-00;00"), t1.ToString ("zz"));

+		AssertEquals("C28", offset.ToString("+00;-00;00") + ":00", t1.ToString ("zzz"));

+		AssertEquals("C29", " : ", t1.ToString (" : "));

+		AssertEquals("C30", " / ", t1.ToString (" / "));

+		AssertEquals("C31", " yyy ", t1.ToString (" 'yyy' "));

+		AssertEquals("C32", " d", t1.ToString (" \\d"));

+	}

+

+	public void TestParseExact ()

+	{

+		// Standard patterns

+		DateTime t1 = DateTime.ParseExact ("02/25/2002", "d", null);

+		AssertEquals ("D01", myTicks[0], t1.Ticks);

+		t1 = DateTime.ParseExact ("Monday, 25 February 2002", "D", null);

+		AssertEquals ("D02", myTicks[0], t1.Ticks);

+		t1 = DateTime.ParseExact ("Monday, 25 February 2002 05:25", "f", null);

+		AssertEquals ("D03", myTicks[3], t1.Ticks);

+		t1 = DateTime.ParseExact ("Monday, 25 February 2002 05:25:13", "F", null);

+		AssertEquals ("D04", myTicks[4], t1.Ticks);

+		t1 = DateTime.ParseExact ("02/25/2002 05:25", "g", null);

+		AssertEquals ("D05", myTicks[3], t1.Ticks);

+		t1 = DateTime.ParseExact ("02/25/2002 05:25:13", "G", null);

+		AssertEquals ("D06", myTicks[4], t1.Ticks);

+		t1 = DateTime.ParseExact ("2002-02-25 04:25:13Z", "u", null);

+		AssertEquals ("D07a", 2002, t1.Year);

+		AssertEquals ("D07b", 02, t1.Month);

+		AssertEquals ("D07c", 25, t1.Day);

+		AssertEquals ("D07d", 04, t1.Hour);

+		AssertEquals ("D07e", 25, t1.Minute);

+		AssertEquals ("D07f", 13, t1.Second);

+		t1 = DateTime.ParseExact ("Monday, 25 February 2002 04:25:13", "U", null);

+		t1 = TimeZone.CurrentTimeZone.ToUniversalTime(t1);

+		AssertEquals ("D08a", 2002, t1.Year);

+		AssertEquals ("D08b", 02, t1.Month);

+		AssertEquals ("D08c", 25, t1.Day);

+		AssertEquals ("D08d", 04, t1.Hour);

+		AssertEquals ("D08e", 25, t1.Minute);

+		AssertEquals ("D08f", 13, t1.Second);

+

+		DateTime t2 = new DateTime (DateTime.Today.Year, 2, 25);

+		t1 = DateTime.ParseExact ("February 25", "m", null);

+		AssertEquals ("D09", t2.Ticks, t1.Ticks);

+

+		t2 = new DateTime (DateTime.Today.Year, 2, 25);

+		t1 = DateTime.ParseExact ("February 25", "M", null);

+		AssertEquals ("D10", t2.Ticks, t1.Ticks);

+

+		t1 = DateTime.ParseExact ("Mon, 25 Feb 2002 04:25:13 GMT", "r", null);

+		AssertEquals ("D11a", 2002, t1.Year);

+		AssertEquals ("D11b", 02, t1.Month);

+		AssertEquals ("D11c", 25, t1.Day);

+		AssertEquals ("D11d", 04, t1.Hour);

+		AssertEquals ("D11e", 25, t1.Minute);

+		AssertEquals ("D11f", 13, t1.Second);

+

+		t1 = DateTime.ParseExact ("Mon, 25 Feb 2002 04:25:13 GMT", "R", null);

+		AssertEquals ("D12a", 2002, t1.Year);

+		AssertEquals ("D12b", 02, t1.Month);

+		AssertEquals ("D12c", 25, t1.Day);

+		AssertEquals ("D12d", 04, t1.Hour);

+		AssertEquals ("D12e", 25, t1.Minute);

+		AssertEquals ("D12f", 13, t1.Second);

+

+		t1 = DateTime.ParseExact ("2002-02-25T05:25:13", "s", null);

+		AssertEquals ("D13", myTicks[4], t1.Ticks);

+

+		t2 = DateTime.Today + new TimeSpan (5,25,0);

+		t1 = DateTime.ParseExact ("05:25", "t", null);

+		AssertEquals("D14", t2.Ticks, t1.Ticks);

+

+		t2 = DateTime.Today + new TimeSpan (5,25,13);

+		t1 = DateTime.ParseExact ("05:25:13", "T", null);

+		AssertEquals("D15", t2.Ticks, t1.Ticks);

+

+		t2 = new DateTime (2002, 2, 1);

+		t1 = DateTime.ParseExact ("2002 February", "y", null);

+		AssertEquals ("D16", t2.Ticks, t1.Ticks);

+

+		t2 = new DateTime (2002, 2, 1);

+		t1 = DateTime.ParseExact ("2002 February", "Y", null);

+		AssertEquals ("D16", t2.Ticks, t1.Ticks);

+

+		// Custom patterns

+		t2 = new DateTime (2002, 1, 25);

+		t1 = DateTime.ParseExact ("25", "%d", null);

+		AssertEquals ("E01", t2.Ticks, t1.Ticks);

+		t1 = DateTime.ParseExact ("25", "dd", null);

+		AssertEquals ("E02", t2.Ticks, t1.Ticks);

+

+		t2 = new DateTime (DateTime.Today.Year, 2, 1);

+		t1 = DateTime.ParseExact ("2", "%M", null);

+		AssertEquals ("E03", t2.Ticks, t1.Ticks);

+		t1 = DateTime.ParseExact ("02", "MM", null);

+		AssertEquals ("E04", t2.Ticks, t1.Ticks);

+		t1 = DateTime.ParseExact ("Feb", "MMM", null);

+		AssertEquals ("E05", t2.Ticks, t1.Ticks);

+		t1 = DateTime.ParseExact ("February", "MMMM", null);

+		AssertEquals ("E06", t2.Ticks, t1.Ticks);

+

+		t2 = new DateTime (2005, 1, 1);

+		t1 = DateTime.ParseExact ("5", "%y", null);

+		AssertEquals ("E07", t2.Ticks, t1.Ticks);

+		t1 = DateTime.ParseExact ("05", "yy", null);

+		AssertEquals ("E08", t2.Ticks, t1.Ticks);

+		t1 = DateTime.ParseExact ("2005", "yyyy", null);

+		AssertEquals ("E09", t2.Ticks, t1.Ticks);

+

+		t2 = DateTime.Today + new TimeSpan (5, 0, 0);

+		t1 = DateTime.ParseExact ("5A", "ht", null);

+		AssertEquals ("E10", t2.Ticks, t1.Ticks);

+		t1 = DateTime.ParseExact ("05A", "hht", null);

+		AssertEquals ("E11", t2.Ticks, t1.Ticks);

+

+		t2 = DateTime.Today + new TimeSpan (15, 0, 0);

+		t1 = DateTime.ParseExact ("3P", "ht", null);

+		AssertEquals ("E12", t2.Ticks, t1.Ticks);

+		t1 = DateTime.ParseExact ("03P", "hht", null);

+		AssertEquals ("E13", t2.Ticks, t1.Ticks);

+

+		t2 = DateTime.Today + new TimeSpan (5, 0, 0);

+		t1 = DateTime.ParseExact ("5", "%H", null);

+		AssertEquals ("E14", t2.Ticks, t1.Ticks);

+

+		t2 = DateTime.Today + new TimeSpan (15, 0, 0);

+		t1 = DateTime.ParseExact ("15", "%H", null);

+		AssertEquals ("E15", t2.Ticks, t1.Ticks);

+		t1 = DateTime.ParseExact ("15", "HH", null);

+		AssertEquals ("E16", t2.Ticks, t1.Ticks);

+

+		// Time zones

+		t2 = DateTime.Today + new TimeSpan (17, 18, 0);

+		t1 = DateTime.ParseExact ("11:18AM -5", "h:mmtt z", null);

+		t1 = TimeZone.CurrentTimeZone.ToUniversalTime(t1);

+		if (!TimeZone.CurrentTimeZone.IsDaylightSavingTime(t1))

+			t1 += new TimeSpan(1, 0, 0);

+		AssertEquals ("F01", t2.Ticks, t1.Ticks);

+

+		t1 = DateTime.ParseExact ("11:18AM -05:00", "h:mmtt zzz", null);

+		t1 = TimeZone.CurrentTimeZone.ToUniversalTime(t1);

+		if (!TimeZone.CurrentTimeZone.IsDaylightSavingTime(t1))

+			t1 += new TimeSpan(1, 0, 0);

+		AssertEquals ("F02", t2.Ticks, t1.Ticks);

+

+		t1 = DateTime.ParseExact ("7:18PM +03", "h:mmtt zz", null);

+		t1 = TimeZone.CurrentTimeZone.ToUniversalTime(t1);

+		if (!TimeZone.CurrentTimeZone.IsDaylightSavingTime(t1))

+			t1 += new TimeSpan(1, 0, 0);

+		AssertEquals ("F03", t2.Ticks, t1.Ticks);

+

+		t1 = DateTime.ParseExact ("7:48PM +03:30", "h:mmtt zzz", null);

+		t1 = TimeZone.CurrentTimeZone.ToUniversalTime(t1);

+		if (!TimeZone.CurrentTimeZone.IsDaylightSavingTime(t1))

+			t1 += new TimeSpan(1, 0, 0);

+		AssertEquals ("F04", t2.Ticks, t1.Ticks);

+

+		// Options

+		t2 = DateTime.Today + new TimeSpan (16, 18, 0);

+		t1 = DateTime.ParseExact ("11:18AM -5", "h:mmtt z",

+					  null, DateTimeStyles.AdjustToUniversal);

+		AssertEquals ("G01", t2.Ticks, t1.Ticks);

+

+		t1 = DateTime.ParseExact ("Monday, 25 February 2002 05:25:13", "F",

+					  null, DateTimeStyles.AdjustToUniversal);

+		AssertEquals ("G02", myTicks[4], t1.Ticks);

+		t1 = DateTime.ParseExact ("Monday, 25 February 2002 05:25:13",

+					  "dddd, dd MMMM yyyy HH:mm:ss",

+					  null, DateTimeStyles.AdjustToUniversal);

+		AssertEquals ("G03", myTicks[4], t1.Ticks);

+

+		t1 = DateTime.ParseExact ("02/25/2002", "d", null,

+					  DateTimeStyles.AllowWhiteSpaces);

+		AssertEquals ("G04", myTicks[0], t1.Ticks);

+

+		t1 = DateTime.ParseExact ("    02/25/2002", "d", null,

+					  DateTimeStyles.AllowLeadingWhite);

+		AssertEquals ("G05", myTicks[0], t1.Ticks);

+

+		t1 = DateTime.ParseExact ("02/25/2002    ", "d", null,

+					  DateTimeStyles.AllowTrailingWhite);

+		AssertEquals ("G06", myTicks[0], t1.Ticks);

+

+		t1 = DateTime.ParseExact ("  02 / 25 / 2002    ", "d", null,

+					  DateTimeStyles.AllowWhiteSpaces);

+		AssertEquals ("G07", myTicks[0], t1.Ticks);

+

+		// Multi Custom Patterns

+		string rfc1123_date = "r";

+		string rfc850_date = "dddd, dd'-'MMM'-'yy HH':'mm':'ss 'GMT'";

+		string asctime_date = "ddd MMM d HH':'mm':'ss yyyy";

+		string [] formats = new string [] {rfc1123_date, rfc850_date, asctime_date};

+		CultureInfo enUS = new CultureInfo("en-US", false);

+		t1 = DateTime.ParseExact ("Sun, 06 Nov 1994 08:49:37 GMT", formats[0], enUS, 

+					DateTimeStyles.AllowWhiteSpaces);

+		AssertEquals ("M01", myTicks[6], t1.Ticks);

+		t1 = DateTime.ParseExact ("Sunday, 06-Nov-94 08:49:37 GMT", formats[1], enUS, 

+					DateTimeStyles.AllowWhiteSpaces);

+		AssertEquals ("M02", myTicks[6], t1.Ticks);

+		t1 = DateTime.ParseExact ("Sun Nov  6 08:49:37 1994", formats[2], enUS, 

+					DateTimeStyles.AllowWhiteSpaces);

+		AssertEquals ("M03", myTicks[6], t1.Ticks);

+		t1 = DateTime.ParseExact ("Sun, 06 Nov 1994 08:49:37 GMT", formats, enUS, 

+					DateTimeStyles.AllowWhiteSpaces);

+		AssertEquals ("M04", myTicks[6], t1.Ticks);

+		t1 = DateTime.ParseExact ("Sunday, 06-Nov-94 08:49:37 GMT", formats, enUS, 

+					DateTimeStyles.AllowWhiteSpaces);

+		AssertEquals ("M05", myTicks[6], t1.Ticks);

+		t1 = DateTime.ParseExact ("Sun Nov  6 08:49:37 1994", formats, enUS, 

+					DateTimeStyles.AllowWhiteSpaces);

+		AssertEquals ("M06", myTicks[6], t1.Ticks);

+	}

+

+	public void TestParse ()

+	{

+		// Standard patterns

+		DateTime t1 = DateTime.Parse ("02/25/2002");

+		AssertEquals ("H00", myTicks[0], t1.Ticks);

+		try {

+			t1 = DateTime.Parse ("2002-02-25");

+		}

+		catch (Exception e) {

+			Fail ("Unexpected exception. e=" + e);

+		}

+		AssertEquals ("H01", myTicks[0], t1.Ticks);

+		t1 = DateTime.Parse ("Monday, 25 February 2002");

+		AssertEquals ("H02", myTicks[0], t1.Ticks);

+		t1 = DateTime.Parse ("Monday, 25 February 2002 05:25");

+		AssertEquals ("H03", myTicks[3], t1.Ticks);

+		t1 = DateTime.Parse ("Monday, 25 February 2002 05:25:13");

+		AssertEquals ("H04", myTicks[4], t1.Ticks);

+		t1 = DateTime.Parse ("02/25/2002 05:25");

+		AssertEquals ("H05", myTicks[3], t1.Ticks);

+		t1 = DateTime.Parse ("02/25/2002 05:25:13");

+		AssertEquals ("H06", myTicks[4], t1.Ticks);

+		t1 = DateTime.Parse ("2002-02-25 04:25:13Z");

+		t1 = TimeZone.CurrentTimeZone.ToUniversalTime(t1);

+		AssertEquals ("H07a", 2002, t1.Year);

+		AssertEquals ("H07b", 02, t1.Month);

+		AssertEquals ("H07c", 25, t1.Day);

+		AssertEquals ("H07d", 04, t1.Hour);

+		AssertEquals ("H07e", 25, t1.Minute);

+		AssertEquals ("H07f", 13, t1.Second);

+

+		DateTime t2 = new DateTime (DateTime.Today.Year, 2, 25);

+		t1 = DateTime.Parse ("February 25");

+		AssertEquals ("H08", t2.Ticks, t1.Ticks);

+

+		t2 = new DateTime (DateTime.Today.Year, 2, 8);

+		t1 = DateTime.Parse ("February 08");

+		AssertEquals ("H09", t2.Ticks, t1.Ticks);

+

+		t1 = DateTime.Parse ("Mon, 25 Feb 2002 04:25:13 GMT");

+		t1 = TimeZone.CurrentTimeZone.ToUniversalTime(t1);

+		AssertEquals ("H10a", 2002, t1.Year);

+		AssertEquals ("H10b", 02, t1.Month);

+		AssertEquals ("H10c", 25, t1.Day);

+		AssertEquals ("H10d", 04, t1.Hour);

+		AssertEquals ("H10e", 25, t1.Minute);

+		AssertEquals ("H10f", 13, t1.Second);

+

+		t1 = DateTime.Parse ("2002-02-25T05:25:13");

+		AssertEquals ("H11", myTicks[4], t1.Ticks);

+

+		t2 = DateTime.Today + new TimeSpan (5,25,0);

+		t1 = DateTime.Parse ("05:25");

+		AssertEquals("H12", t2.Ticks, t1.Ticks);

+

+		t2 = DateTime.Today + new TimeSpan (5,25,13);

+		t1 = DateTime.Parse ("05:25:13");

+		AssertEquals("H13", t2.Ticks, t1.Ticks);

+

+		t2 = new DateTime (2002, 2, 1);

+		t1 = DateTime.Parse ("2002 February");

+		AssertEquals ("H14", t2.Ticks, t1.Ticks);

+

+		t2 = new DateTime (2002, 2, 1);

+		t1 = DateTime.Parse ("2002 February");

+		AssertEquals ("H15", t2.Ticks, t1.Ticks);

+

+		t2 = new DateTime (DateTime.Today.Year, 2, 8);

+		t1 = DateTime.Parse ("February 8");

+		AssertEquals ("H16", t2.Ticks, t1.Ticks);

+	}

+}

+

+}

diff --git a/mcs/class/corlib/Test/System/DecimalTest.cs b/mcs/class/corlib/Test/System/DecimalTest.cs
new file mode 100644
index 00000000000..3b2b744ea45
--- /dev/null
+++ b/mcs/class/corlib/Test/System/DecimalTest.cs
@@ -0,0 +1,889 @@
+// DecimalTest.cs - NUnit Test Cases for the System.Decimal struct

+//

+// Author: Martin Weindel (martin.weindel@t-online.de)

+//

+// (C) Martin Weindel, 2001

+// 

+

+using NUnit.Framework;

+using System;

+

+using System.Globalization;

+using System.Runtime.CompilerServices;

+using System.Threading;

+

+namespace MonoTests.System {

+    internal struct ParseTest

+    {

+        public ParseTest(String str, bool exceptionFlag)

+        {

+            this.str = str;

+            this.exceptionFlag = exceptionFlag;

+            this.style = NumberStyles.Number;

+            this.d = 0;

+        }

+

+        public ParseTest(String str, Decimal d)

+        {

+            this.str = str;

+            this.exceptionFlag = false;

+            this.style = NumberStyles.Number;

+            this.d = d;

+        }

+

+        public ParseTest(String str, Decimal d, NumberStyles style)

+        {

+            this.str = str;

+            this.exceptionFlag = false;

+            this.style = style;

+            this.d = d;

+        }

+

+        public String str;

+        public Decimal d;

+        public NumberStyles style;

+        public bool exceptionFlag;

+    }

+

+    internal struct ToStringTest

+    {

+        public ToStringTest(String format, Decimal d, String str)

+        {

+            this.format = format;

+            this.d = d;

+            this.str = str;

+        }

+

+        public String format;

+        public Decimal d;

+        public String str;

+    }

+

+    /// <summary>

+    /// Tests for System.Decimal

+    /// </summary>

+    public class DecimalTest : TestCase

+    {

+	public DecimalTest() : base ("MonoTests.System.DecimalTest testcase") {}

+        public DecimalTest(string name) : base(name) {}

+

+        public static ITest Suite 

+        {

+            get { return new TestSuite(typeof(DecimalTest)); }

+        }

+

+        private const int negativeBitValue = unchecked ((int)0x80000000);

+        private const int negativeScale4Value = unchecked ((int)0x80040000);

+        private int [] parts0 = {0,0,0,0}; //Positive Zero.

+        private int [] parts1 = {1,0,0,0};

+        private int [] parts2 = {0,1,0,0};

+        private int [] parts3 = {0,0,1,0};

+        private int [] parts4 = {0,0,0,negativeBitValue}; // Negative zero.

+        private int [] parts5 = {1,1,1,0};

+        private int [] partsMaxValue = {-1,-1,-1,0};

+        private int [] partsMinValue = {-1,-1,-1,negativeBitValue};

+        private int [] parts6 = {1234, 5678, 8888, negativeScale4Value};

+        private NumberFormatInfo NfiUser;

+

+	private CultureInfo old_culture;

+

+	protected override void SetUp() 

+	{

+		old_culture = Thread.CurrentThread.CurrentCulture;

+

+		// Set culture to en-US and don't let the user override.

+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US", false);

+

+		NfiUser = new NumberFormatInfo();

+		NfiUser.CurrencyDecimalDigits = 3;

+		NfiUser.CurrencyDecimalSeparator = ",";

+		NfiUser.CurrencyGroupSeparator = "_";

+		NfiUser.CurrencyGroupSizes = new int[] { 2,1,0 };

+		NfiUser.CurrencyNegativePattern = 10;

+		NfiUser.CurrencyPositivePattern = 3;

+		NfiUser.CurrencySymbol = "XYZ";

+		NfiUser.NumberDecimalSeparator = "##";

+		NfiUser.NumberDecimalDigits = 4;

+		NfiUser.NumberGroupSeparator = "__";

+		NfiUser.NumberGroupSizes = new int[] { 2,1 };

+		NfiUser.PercentDecimalDigits = 1;

+		NfiUser.PercentDecimalSeparator = ";";

+		NfiUser.PercentGroupSeparator = "~";

+		NfiUser.PercentGroupSizes = new int[] {1};

+		NfiUser.PercentNegativePattern = 2;

+		NfiUser.PercentPositivePattern = 2;

+		NfiUser.PercentSymbol = "%%%";

+        }

+

+	protected override void TearDown()

+	{

+		Thread.CurrentThread.CurrentCulture = old_culture;

+	}

+

+	public void TestToString()

+        {

+            ToStringTest[] tab = {

+                new ToStringTest("F", 12.345678m, "12.35"),

+                new ToStringTest("F3", 12.345678m, "12.346"),

+                new ToStringTest("F0", 12.345678m, "12"),

+                new ToStringTest("F7", 12.345678m, "12.3456780"),

+                new ToStringTest("g", 12.345678m, "12.345678"),

+                new ToStringTest("E", 12.345678m, "1.234568E+001"),

+                new ToStringTest("E3", 12.345678m, "1.235E+001"),

+                new ToStringTest("E0", 12.345678m, "1E+001"),

+                new ToStringTest("e8", 12.345678m, "1.23456780e+001"),

+                new ToStringTest("F", 0.0012m, "0.00"),

+                new ToStringTest("F3", 0.0012m, "0.001"),

+                new ToStringTest("F0", 0.0012m, "0"),

+                new ToStringTest("F6", 0.0012m, "0.001200"),

+                new ToStringTest("e", 0.0012m, "1.200000e-003"),

+                new ToStringTest("E3", 0.0012m, "1.200E-003"),

+                new ToStringTest("E0", 0.0012m, "1E-003"),

+                new ToStringTest("E6", 0.0012m, "1.200000E-003"),

+                new ToStringTest("F4", -0.001234m, "-0.0012"),

+                new ToStringTest("E3", -0.001234m, "-1.234E-003"),

+                new ToStringTest("g", -0.000012m, "-1.2e-05"),

+                new ToStringTest("g", -0.00012m, "-0.00012"),

+                new ToStringTest("g4", -0.00012m, "-0.00012"),

+                new ToStringTest("g7", -0.00012m, "-0.00012"),

+                new ToStringTest("g", -0.0001234m, "-0.0001234"),

+                new ToStringTest("g", -0.0012m, "-0.0012"),

+                new ToStringTest("g", -0.001234m, "-0.001234"),

+                new ToStringTest("g", -0.012m, "-0.012"),

+                new ToStringTest("g4", -0.012m, "-0.012"),

+                new ToStringTest("g", -0.12m, "-0.12"),

+                new ToStringTest("g", -1.2m, "-1.2"),

+                new ToStringTest("g4", -120m, "-120"),

+                new ToStringTest("g", -12m, "-12"),

+                new ToStringTest("g", -120m, "-120"),

+                new ToStringTest("g", -1200m, "-1200"),

+                new ToStringTest("g4", -1200m, "-1200"),

+                new ToStringTest("g", -1234m, "-1234"),

+                new ToStringTest("g", -12000m, "-12000"),

+                new ToStringTest("g4", -12000m, "-1.2e+04"),

+                new ToStringTest("g5", -12000m, "-12000"),

+                new ToStringTest("g", -12345m, "-12345"),

+                new ToStringTest("g", -120000m, "-120000"),

+                new ToStringTest("g4", -120000m, "-1.2e+05"),

+                new ToStringTest("g5", -120000m, "-1.2e+05"),

+                new ToStringTest("g6", -120000m, "-120000"),

+                new ToStringTest("g", -123456.1m, "-123456.1"),

+                new ToStringTest("g5", -123456.1m, "-1.2346e+05"),

+                new ToStringTest("g6", -123456.1m, "-123456"),

+                new ToStringTest("g", -1200000m, "-1200000"),

+                new ToStringTest("g", -123456.1m, "-123456.1"),

+                new ToStringTest("g", -123456.1m, "-123456.1"),

+                new ToStringTest("g", -1234567.1m, "-1234567.1"),

+                new ToStringTest("g", -12000000m, "-12000000"),

+                new ToStringTest("g", -12345678.1m, "-12345678.1"),

+                new ToStringTest("g", -12000000000000000000m, "-12000000000000000000"),

+                new ToStringTest("F", -123, "-123.00"),

+                new ToStringTest("F3", -123, "-123.000"),

+                new ToStringTest("F0", -123, "-123"),

+                new ToStringTest("E3", -123, "-1.230E+002"),

+                new ToStringTest("E0", -123, "-1E+002"),

+                new ToStringTest("E", -123, "-1.230000E+002"),

+                new ToStringTest("F3", Decimal.MinValue, "-79228162514264337593543950335.000"),

+                new ToStringTest("F", Decimal.MinValue, "-79228162514264337593543950335.00"),

+                new ToStringTest("F0", Decimal.MinValue, "-79228162514264337593543950335"),

+                new ToStringTest("E", Decimal.MinValue, "-7.922816E+028"),

+                new ToStringTest("E3", Decimal.MinValue, "-7.923E+028"),

+                new ToStringTest("E28", Decimal.MinValue, "-7.9228162514264337593543950335E+028"),

+                new ToStringTest("E30", Decimal.MinValue, "-7.922816251426433759354395033500E+028"),

+                new ToStringTest("E0", Decimal.MinValue, "-8E+028"),

+                new ToStringTest("N3", Decimal.MinValue, "-79,228,162,514,264,337,593,543,950,335.000"),

+                new ToStringTest("N0", Decimal.MinValue, "-79,228,162,514,264,337,593,543,950,335"),

+                new ToStringTest("N", Decimal.MinValue, "-79,228,162,514,264,337,593,543,950,335.00"),

+                new ToStringTest("n3", Decimal.MinValue, "-79,228,162,514,264,337,593,543,950,335.000"),

+                new ToStringTest("n0", Decimal.MinValue, "-79,228,162,514,264,337,593,543,950,335"),

+                new ToStringTest("n", Decimal.MinValue, "-79,228,162,514,264,337,593,543,950,335.00"),

+                new ToStringTest("C", 123456.7890m, NumberFormatInfo.InvariantInfo.CurrencySymbol + "123,456.79"),

+                new ToStringTest("C", -123456.7890m, "(" + NumberFormatInfo.InvariantInfo.CurrencySymbol + "123,456.79)"),

+                new ToStringTest("C3", 1123456.7890m, NumberFormatInfo.InvariantInfo.CurrencySymbol + "1,123,456.789"),

+                new ToStringTest("P", 123456.7891m, "12,345,678.91 %"),

+                new ToStringTest("P", -123456.7892m, "-12,345,678.92 %"),

+                new ToStringTest("P3", 1234.56789m, "123,456.789 %"),

+            };

+

+            NumberFormatInfo nfi = NumberFormatInfo.InvariantInfo;

+

+            for (int i = 0; i < tab.Length; i++) 

+            {

+                try

+                {

+                    string s = tab[i].d.ToString(tab[i].format, nfi);

+		    AssertEquals("A01 tab[" + i + "].format = '" + tab[i].format + "')", tab[i].str, s);

+                } 

+                catch (OverflowException)

+                {

+                    Fail(tab[i].d.ToString(tab[i].format, nfi) + " (format = '" + tab[i].format + "'): unexpected exception !");

+                }

+		catch (NUnit.Framework.AssertionFailedError e) {

+			throw e;

+		}

+		catch (Exception e) {

+			Fail ("Unexpected Exception when i = " + i + ". e = " + e);

+		}

+            }      

+        }

+

+        public void TestCurrencyPattern()

+        {

+            NumberFormatInfo nfi2 = (NumberFormatInfo)NfiUser.Clone();

+            Decimal d = -1234567.8976m;

+            string[] ergCurrencyNegativePattern = new String[16] {

+                "(XYZ1234_5_67,898)", "-XYZ1234_5_67,898", "XYZ-1234_5_67,898", "XYZ1234_5_67,898-",

+                "(1234_5_67,898XYZ)", "-1234_5_67,898XYZ", "1234_5_67,898-XYZ", "1234_5_67,898XYZ-",

+                "-1234_5_67,898 XYZ", "-XYZ 1234_5_67,898", "1234_5_67,898 XYZ-", "XYZ 1234_5_67,898-",

+                "XYZ -1234_5_67,898", "1234_5_67,898- XYZ", "(XYZ 1234_5_67,898)", "(1234_5_67,898 XYZ)",

+            };

+

+            for (int i = 0; i < ergCurrencyNegativePattern.Length; i++) 

+            {

+                nfi2.CurrencyNegativePattern = i;

+                if (d.ToString("C", nfi2) != ergCurrencyNegativePattern[i]) 

+                {

+                    Fail("CurrencyNegativePattern #" + i + " failed: " +

+                        d.ToString("C", nfi2) + " != " + ergCurrencyNegativePattern[i]);

+                }

+            }

+

+            d = 1234567.8976m;

+            string[] ergCurrencyPositivePattern = new String[4] {

+                "XYZ1234_5_67,898", "1234_5_67,898XYZ", "XYZ 1234_5_67,898", "1234_5_67,898 XYZ",

+            };

+

+            for (int i = 0; i < ergCurrencyPositivePattern.Length; i++) 

+            {

+                nfi2.CurrencyPositivePattern = i;

+                if (d.ToString("C", nfi2) != ergCurrencyPositivePattern[i]) 

+                {

+                    Fail("CurrencyPositivePattern #" + i + " failed: " +

+                        d.ToString("C", nfi2) + " != " + ergCurrencyPositivePattern[i]);

+                }

+            }

+        }

+

+        public void TestNumberNegativePattern()

+        {

+            NumberFormatInfo nfi2 = (NumberFormatInfo)NfiUser.Clone();

+            Decimal d = -1234.89765m;

+            string[] ergNumberNegativePattern = new String[5] {

+                "(1__2__34##8977)", "-1__2__34##8977", "- 1__2__34##8977", "1__2__34##8977-", "1__2__34##8977 -",

+            };

+

+            for (int i = 0; i < ergNumberNegativePattern.Length; i++) 

+            {

+                nfi2.NumberNegativePattern = i;

+		AssertEquals ("NumberNegativePattern #" + i, ergNumberNegativePattern[i], d.ToString("N", nfi2));

+            }

+        }

+        

+        public void TestPercentPattern()

+        {

+            NumberFormatInfo nfi2 = (NumberFormatInfo)NfiUser.Clone();

+            Decimal d = -1234.8976m;

+            string[] ergPercentNegativePattern = new String[3] {

+                "-1~2~3~4~8~9;8 %%%", "-1~2~3~4~8~9;8%%%", "-%%%1~2~3~4~8~9;8"

+            };

+

+            for (int i = 0; i < ergPercentNegativePattern.Length; i++) 

+            {

+                nfi2.PercentNegativePattern = i;

+                if (d.ToString("P", nfi2) != ergPercentNegativePattern[i]) 

+                {

+                    Fail("PercentNegativePattern #" + i + " failed: " +

+                        d.ToString("P", nfi2) + " != " + ergPercentNegativePattern[i]);

+                }

+            }

+

+            d = 1234.8976m;

+            string[] ergPercentPositivePattern = new String[3] {

+                "1~2~3~4~8~9;8 %%%", "1~2~3~4~8~9;8%%%", "%%%1~2~3~4~8~9;8"

+            };

+

+            for (int i = 0; i < ergPercentPositivePattern.Length; i++) 

+            {

+                nfi2.PercentPositivePattern = i;

+                if (d.ToString("P", nfi2) != ergPercentPositivePattern[i]) 

+                {

+                    Fail("PercentPositivePattern #" + i + " failed: " +

+                        d.ToString("P", nfi2) + " != " + ergPercentPositivePattern[i]);

+                }

+            }

+        }

+

+        public void TestParse()

+        {

+            ParseTest[] tab = {

+                new ParseTest("1.2345", 1.2345m),

+                new ParseTest("-9876543210", -9876543210m),

+                new ParseTest(NumberFormatInfo.InvariantInfo.CurrencySymbol 

+			+ " (  79,228,162,514,264,337,593,543,950,335.000 ) ", Decimal.MinValue, NumberStyles.Currency),

+                new ParseTest("1.234567890e-10", (Decimal)1.234567890e-10, NumberStyles.Float),

+                new ParseTest("1.234567890e-24", 1.2346e-24m, NumberStyles.Float),

+                new ParseTest("  47896396.457983645462346E10  ", 478963964579836454.62346m, NumberStyles.Float),

+                new ParseTest("-7922816251426433759354395033.250000000000001", -7922816251426433759354395033.3m),

+                new ParseTest("-00000000000000795033.2500000000000000", -795033.25m),

+                new ParseTest("-000000000000001922816251426433759354395033.300000000000000", -1922816251426433759354395033.3m),

+                new ParseTest("-7922816251426433759354395033.150000000000", -7922816251426433759354395033.2m),

+                new ParseTest("-7922816251426433759354395033.2400000000000", -7922816251426433759354395033.2m),

+                new ParseTest("-7922816251426433759354395033.2600000000000", -7922816251426433759354395033.3m)

+            };

+

+            Decimal d;

+            for (int i = 0; i < tab.Length; i++) 

+            {

+                try

+                {

+                    d = Decimal.Parse(tab[i].str, tab[i].style, NumberFormatInfo.InvariantInfo);

+                    if (tab[i].exceptionFlag)

+                    {

+                        Fail(tab[i].str + ": missing exception !");

+                    }

+                    else if (d != tab[i].d) 

+                    {

+                        Fail(tab[i].str + " != " + d);

+                    }

+                } 

+                catch (OverflowException)

+                {

+                    if (!tab[i].exceptionFlag)

+                    {

+                        Fail(tab[i].str + ": unexpected exception !");

+                    }

+                }

+            }  

+    

+            try 

+            {

+                d = Decimal.Parse(null);

+                Fail("Expected ArgumentNullException");

+            }

+            catch (ArgumentNullException)

+            {

+                //ok

+            }

+

+            try 

+            {

+                d = Decimal.Parse("123nx");

+                Fail("Expected FormatException");

+            }

+            catch (FormatException)

+            {

+                //ok

+            }

+

+            try 

+            {

+                d = Decimal.Parse("79228162514264337593543950336");

+                Fail("Expected OverflowException" + d);

+            }

+            catch (OverflowException)

+            {

+                //ok

+            }

+        }

+

+        public void TestConstants()

+        {

+            Assert(0m == (decimal)Decimal.Zero);

+            Assert(1m == (decimal)Decimal.One);

+            Assert(-1m == (decimal)Decimal.MinusOne);

+            Assert(0m == (decimal)Decimal.Zero);

+            Assert(79228162514264337593543950335m == (decimal)Decimal.MaxValue);

+            Assert(-79228162514264337593543950335m == (decimal)Decimal.MinValue);       

+        }

+

+        public void TestConstructInt32()

+        {

+            decimal[] dtab = {0m, 1m, -1m, 123456m, -1234567m};

+            int[] itab = {0, 1, -1, 123456, -1234567};

+

+            Decimal d;

+            

+            for (int i = 0; i < dtab.GetLength(0); i++)

+            {

+                d = new Decimal(itab[i]);

+                if ((decimal)d != dtab[i]) 

+                {

+                    Fail("Int32 -> Decimal: " + itab[i] + " != " + d);

+                }

+                else 

+                {

+                    int n = (int) d;

+                    if (n != itab[i]) 

+                    {

+                        Fail("Decimal -> Int32: " + d + " != " + itab[i]);

+                    }

+                }

+            }

+

+            d = new Decimal(Int32.MaxValue);

+            Assert((int)d == Int32.MaxValue);

+

+            d = new Decimal(Int32.MinValue);

+            Assert((int)d == Int32.MinValue);

+        }

+

+        public void TestConstructUInt32()

+        {

+            decimal[] dtab = {0m, 1m, 123456m, 123456789m};

+            uint[] itab = {0, 1, 123456, 123456789};

+

+            Decimal d;

+            

+            for (int i = 0; i < dtab.GetLength(0); i++)

+            {

+                d = new Decimal(itab[i]);

+                if ((decimal)d != dtab[i]) 

+                {

+                    Fail("UInt32 -> Decimal: " + itab[i] + " != " + d);

+                }

+                else 

+                {

+                    uint n = (uint) d;

+                    if (n != itab[i]) 

+                    {

+                        Fail("Decimal -> UInt32: " + d + " != " + itab[i]);

+                    }

+                }

+            }

+

+            d = new Decimal(UInt32.MaxValue);

+            Assert((uint)d == UInt32.MaxValue);

+

+            d = new Decimal(UInt32.MinValue);

+            Assert((uint)d == UInt32.MinValue);

+        }

+

+        public void TestConstructInt64()

+        {

+            decimal[] dtab = {0m, 1m, -1m, 9876543m, -9876543210m, 12345678987654321m};

+            long[] itab = {0, 1, -1, 9876543, -9876543210L, 12345678987654321L};

+

+            Decimal d;

+            

+            for (int i = 0; i < dtab.GetLength(0); i++)

+            {

+                d = new Decimal(itab[i]);

+                if ((decimal)d != dtab[i]) 

+                {

+                    Fail("Int64 -> Decimal: " + itab[i] + " != " + d);

+                }

+                else 

+                {

+                    long n = (long) d;

+                    if (n != itab[i]) 

+                    {

+                        Fail("Decimal -> Int64: " + d + " != " + itab[i]);

+                    }

+                }

+            }

+

+            d = new Decimal(Int64.MaxValue);

+            Assert((long)d == Int64.MaxValue);

+

+            d = new Decimal(Int64.MinValue);

+            Assert((long)d == Int64.MinValue);

+        }

+

+        public void TestConstructUInt64()

+        {

+            decimal[] dtab = {0m, 1m, 987654321m, 123456789876543210m};

+            ulong[] itab = {0, 1, 987654321, 123456789876543210L};

+

+            Decimal d;

+            

+            for (int i = 0; i < dtab.GetLength(0); i++)

+            {

+                d = new Decimal(itab[i]);

+                if ((decimal)d != dtab[i]) 

+                {

+                    Fail("UInt64 -> Decimal: " + itab[i] + " != " + d);

+                }

+                else 

+                {

+                    ulong n = (ulong) d;

+                    if (n != itab[i]) 

+                    {

+                        Fail("Decimal -> UInt64: " + d + " != " + itab[i]);

+                    }

+                }

+            }

+

+            d = new Decimal(UInt64.MaxValue);

+            Assert((ulong)d == UInt64.MaxValue);

+

+            d = new Decimal(UInt64.MinValue);

+            Assert((ulong)d == UInt64.MinValue);

+        }

+

+        public void TestConstructSingle()

+        {

+            Decimal d;

+

+            d = new Decimal(-1.2345678f);

+            AssertEquals("A#01", -1.234568m, (decimal)d);

+

+            d=3;

+            AssertEquals("A#02", 3.0f, (float)d);

+

+            d = new Decimal(0.0f);

+            AssertEquals("A#03", 0m, (decimal)d);

+            AssertEquals("A#04", 0.0f, (float)d);

+

+            d = new Decimal(1.0f);

+            AssertEquals("A#05", 1m, (decimal)d);

+            AssertEquals("A#06", 1.0f, (float)d);

+

+            d = new Decimal(-1.2345678f);

+            AssertEquals("A#07", -1.234568m, (decimal)d);

+            AssertEquals("A#08", -1.234568f, (float)d);

+

+            d = new Decimal(1.2345673f);

+            AssertEquals("A#09", 1.234567m, (decimal)d);

+

+            d = new Decimal(1.2345673e7f);

+            AssertEquals("A#10", 12345670m, (decimal)d);

+

+            d = new Decimal(1.2345673e-17f);

+            AssertEquals("A#11", 0.00000000000000001234567m, (decimal)d);

+            AssertEquals("A#12", 1.234567e-17f, (float)d);

+

+            // test exceptions

+            try

+            {

+                d = new Decimal(Single.MaxValue);

+                Fail();

+            } 

+            catch (OverflowException) 

+            {

+            }

+

+            try

+            {

+                d = new Decimal(Single.NaN);

+                Fail();

+            } 

+            catch (OverflowException) 

+            {

+            }

+

+            try

+            {

+                d = new Decimal(Single.PositiveInfinity);

+                Fail();

+            } 

+            catch (OverflowException) 

+            {

+            }

+        }

+

+        public void TestConstructSingleRounding()

+        {

+            decimal d;

+

+            d = new Decimal(1765.2356f);

+            Assert(d == 1765.236m);

+

+            d = new Decimal(1765.23554f);

+            Assert("failed banker's rule rounding test 1", d == 1765.236m);

+

+            d = new Decimal(1765.2354f);

+            Assert(d == 1765.235m);

+

+            d = new Decimal(1765.2346f);

+            Assert(d == 1765.235m);

+

+            d = new Decimal(1765.23454f);

+            Assert("failed banker's rule rounding test 2", d == 1765.234m);

+

+            d = new Decimal(1765.2344f);

+            Assert(d == 1765.234m);

+

+            d = new Decimal(0.00017652356f);

+            Assert(d == 0.0001765236m);

+

+            d = new Decimal(0.000176523554f);

+            Assert("failed banker's rule rounding test 3", d == 0.0001765236m);

+

+            d = new Decimal(0.00017652354f);

+            Assert(d == 0.0001765235m);

+

+            d = new Decimal(0.00017652346f);

+            Assert(d == 0.0001765235m);

+

+            d = new Decimal(0.000176523454f);

+            Assert("failed banker's rule rounding test 4", d == 0.0001765234m);

+

+            d = new Decimal(0.00017652344f);

+            Assert(d == 0.0001765234m);

+

+            d = new Decimal(3.7652356e10f);

+            Assert(d == 37652360000m);

+

+            d = new Decimal(3.7652356e20f);

+            Assert(d == 376523600000000000000m);

+

+            d = new Decimal(3.76523554e20f);

+            Assert("failed banker's rule rounding test 5", d == 376523600000000000000m);

+

+            d = new Decimal(3.7652352e20f);

+            Assert(d == 376523500000000000000m);

+

+            d = new Decimal(3.7652348e20f);

+            Assert(d == 376523500000000000000m);

+

+            d = new Decimal(3.76523454e20f);

+            Assert("failed banker's rule rounding test 6", d == 376523400000000000000m);

+

+            d = new Decimal(3.7652342e20f);

+            Assert(d == 376523400000000000000m);

+        }

+

+        public void TestConstructDouble()

+        {

+            Decimal d;

+

+            d = new Decimal(0.0);

+            Assert((decimal)d == 0m);

+

+            d = new Decimal(1.0);

+            Assert((decimal)d == 1m);

+            Assert(1.0 == (double)d);

+

+            d = new Decimal(-1.2345678901234);

+            Assert((decimal)d == -1.2345678901234m);

+            Assert(-1.2345678901234 == (double)d);

+

+            d = new Decimal(1.2345678901234);

+            Assert((decimal)d == 1.2345678901234m);

+

+            d = new Decimal(1.2345678901234e8);

+            Assert((decimal)d == 123456789.01234m);

+            Assert(1.2345678901234e8 == (double)d);

+

+            d = new Decimal(1.2345678901234e16);

+            Assert((decimal)d == 12345678901234000m);

+            Assert(1.2345678901234e16 == (double)d);

+

+            d = new Decimal(1.2345678901234e24);

+            Assert((decimal)d == 1234567890123400000000000m);

+            Assert(1.2345678901234e24 == (double)d);

+

+            d = new Decimal(1.2345678901234e28);

+            Assert((decimal)d == 1.2345678901234e28m);

+            Assert(1.2345678901234e28 == (double)d);

+

+            d = new Decimal(7.2345678901234e28);

+            Assert((decimal)d == 7.2345678901234e28m);

+            Assert(new Decimal((double)d) == d);

+

+            d = new Decimal(1.2345678901234e-8);

+            Assert((decimal)d == 1.2345678901234e-8m);

+

+            d = new Decimal(1.2345678901234e-14);

+            Assert((decimal)d == 1.2345678901234e-14m);

+            Assert(1.2345678901234e-14 == (double)d);

+

+            d = new Decimal(1.2342278901234e-25);

+            Assert((decimal)d == 1.234e-25m);

+

+            // test exceptions

+            try

+            {

+                d = new Decimal(8e28);

+                Fail();

+            } 

+            catch (OverflowException) 

+            {

+            }

+

+            try

+            {

+                d = new Decimal(8e48);

+                Fail();

+            } 

+            catch (OverflowException) 

+            {

+            }

+

+            try

+            {

+                d = new Decimal(Double.NaN);

+                Fail();

+            } 

+            catch (OverflowException) 

+            {

+            }

+

+            try

+            {

+                d = new Decimal(Double.PositiveInfinity);

+                Fail();

+            } 

+            catch (OverflowException) 

+            {

+            }

+        }

+

+        public void TestConstructDoubleRound()

+        {

+            decimal d;

+	    int TestNum = 1;

+            

+	    try {

+			d = new Decimal(1765.231234567857);

+			AssertEquals("A01", 1765.23123456786m, d);

+

+			TestNum++;

+			d = new Decimal(1765.2312345678554);

+			AssertEquals("A02, failed banker's rule rounding test 1", 1765.23123456786m, d);

+			AssertEquals("A03", 1765.23123456786, (double)d);

+

+			TestNum++;

+			d = new Decimal(1765.231234567853);

+			Assert(d == 1765.23123456785m);

+

+			TestNum++;

+			d = new Decimal(1765.231234567847);

+			Assert(d == 1765.23123456785m);

+

+			TestNum++;

+			d = new Decimal(1765.231234567843);

+			Assert(d == 1765.23123456784m);

+

+			TestNum++;

+			d = new Decimal(1.765231234567857e-9);

+			Assert(d == 1.76523123456786e-9m);

+

+			TestNum++;

+			d = new Decimal(1.7652312345678554e-9);

+			Assert("failed banker's rule rounding test 3", d == 1.76523123456786e-9m);

+

+			TestNum++;

+			d = new Decimal(1.765231234567853e-9);

+			Assert(d == 1.76523123456785e-9m);

+

+			TestNum++;

+			d = new Decimal(1.765231234567857e+24);

+			Assert(d == 1.76523123456786e+24m);

+

+			TestNum++;

+			d = new Decimal(1.7652312345678554e+24);

+			Assert("failed banker's rule rounding test 4", d == 1.76523123456786e+24m);

+

+			TestNum++;

+			d = new Decimal(1.765231234567853e+24);

+			Assert(d == 1.76523123456785e+24m);

+

+			TestNum++;

+			d = new Decimal(1765.2312345678454);

+			Assert(d == 1765.23123456785m);

+		}

+		catch (Exception e) {

+			Fail("At TestNum = " + TestNum + " unexpected exception. e = " + e);

+		}

+        }

+

+        public void TestNegate()

+        {

+            decimal d;

+

+            d = new Decimal(12345678);

+            Assert((decimal)Decimal.Negate(d) == -12345678m);

+        }

+

+        public void TestPartConstruct()

+        {

+            decimal d;

+            

+            d = new Decimal(parts0);

+            Assert(d == 0);

+

+            d = new Decimal(parts1);

+            Assert(d == 1);

+

+            d = new Decimal(parts2);

+            Assert(d == 4294967296m);

+

+            d = new Decimal(parts3);

+            Assert(d == 18446744073709551616m);

+

+            d = new Decimal(parts4);

+            Assert(d == 0m);

+

+            d = new Decimal(parts5);

+            Assert(d == 18446744078004518913m);

+            

+            d = new Decimal(partsMaxValue);

+            Assert(d == Decimal.MaxValue);

+            

+            d = new Decimal(partsMinValue);

+            Assert(d == Decimal.MinValue);

+

+            d = new Decimal(parts6);

+            int[] erg = Decimal.GetBits(d);

+            for (int i = 0; i < 4; i++) 

+            {

+                Assert(erg[i] == parts6[i]); 

+            }

+        }

+

+        public void TestFloorTruncate()

+        {

+            decimal[,] dtab = {

+                {0m, 0m, 0m}, {1m, 1m, 1m}, {-1m, -1m, -1m}, {1.1m, 1m, 1m}, 

+                {-1.000000000001m, -2m, -1m}, {12345.67890m,12345m,12345m},

+                {-123456789012345.67890m, -123456789012346m, -123456789012345m},

+                {Decimal.MaxValue, Decimal.MaxValue, Decimal.MaxValue},

+                {Decimal.MinValue, Decimal.MinValue, Decimal.MinValue},

+                {6.999999999m, 6m, 6m}, {-6.999999999m, -7m, -6m}, 

+                {0.00001m, 0m, 0m}, {-0.00001m, -1m, 0m}

+            };

+

+            decimal d;

+            

+            for (int i = 0; i < dtab.GetLength(0); i++)

+            {

+                d = Decimal.Floor(dtab[i,0]);

+                if (d != dtab[i,1]) 

+                {

+                    Fail("Floor: Floor(" + dtab[i,0] + ") != " + d);

+                }

+                d = Decimal.Truncate(dtab[i,0]);

+                if (d != dtab[i,2]) 

+                {

+                    Fail("Truncate: Truncate(" + dtab[i,0] + ") != " + d);

+                }

+            }

+        }

+

+        public void TestRound()

+        {

+            decimal[,] dtab = { 

+                {1m, 0, 1m}, {1.234567890m, 1, 1.2m}, 

+                {1.234567890m, 2, 1.23m}, {1.23450000001m, 3, 1.235m}, 

+                {1.2345m, 3, 1.234m}, {1.2355m, 3, 1.236m}, 

+                {1.234567890m, 4, 1.2346m}, {1.23567890m, 2, 1.24m}, 

+                {47893764694.4578563236436621m, 7, 47893764694.4578563m},

+                {-47893764694.4578563236436621m, 9, -47893764694.457856324m},

+                {-47893764694.4578m, 5, -47893764694.4578m}

+            };

+

+            decimal d;

+            

+            for (int i = 0; i < dtab.GetLength(0); i++)

+            {

+                d = Decimal.Round(dtab[i,0], (int)dtab[i,1]);

+                if (d != dtab[i,2]) 

+                {

+                    Fail("Round: Round(" + dtab[i,0] + "," + (int)dtab[i,1] + ") != " + d);

+                }

+            }

+        }

+    }

+

+}

diff --git a/mcs/class/corlib/Test/System/DecimalTest2.cs b/mcs/class/corlib/Test/System/DecimalTest2.cs
new file mode 100644
index 00000000000..007f1583340
--- /dev/null
+++ b/mcs/class/corlib/Test/System/DecimalTest2.cs
@@ -0,0 +1,3131 @@
+// DecimalTest.cs - NUnit Test Cases for the System.Decimal struct

+//

+// Author: Martin Weindel (martin.weindel@t-online.de)

+//

+// (C) Martin Weindel, 2001

+// 

+

+using NUnit.Framework;

+using System;

+using System.Globalization;

+using System.Runtime.CompilerServices;

+

+namespace MonoTests.System

+{

+

+    public enum TestResultInfo

+    {

+        Ok = 0,

+        Overflow = 1,

+        ReverseRound = 2,

+        DivideByZero = 3,

+        ReverseOverflow = 4

+    }

+

+    public struct TestResult

+    {

+        public TestResult(int i, decimal v)

+        {

+            info = (TestResultInfo) i;

+            val = v;

+        }

+

+        public TestResultInfo info;

+        public decimal val;

+    }

+

+

+    /// <summary>

+    /// Tests for System.Decimal

+    /// </summary>

+    public class DecimalTest2 : TestCase

+    {

+	public DecimalTest2() : base ("MonoTests.System.DecimalTest2 testcase") {}

+        public DecimalTest2(string name) : base(name) {}

+

+        public static ITest Suite 

+        {

+            get { return new TestSuite(typeof(DecimalTest2)); }

+        }

+

+        private void ReportOpError(string msg, int i, int j, decimal d1, decimal d2, decimal d3, decimal d3b)

+        {

+		decimal delta = 0;

+		try {

+			delta = d3 - d3b;

+		} catch (Exception e) {

+			Fail("ReportOpError: Unexpected exception on " + d3 + " - " + d3b + ". e:" + e);

+		}

+		Fail ("*** " + msg + " for d1=" + d1 + " i=" + i + " d2=" + d2 + " j=" + j + " d3=" + d3 + " d3b=" + d3b + "\n"

+			+ "Ist:" + d3 +  "  Soll:" + d3b + "  delta=" + (delta) + " == " + (d3 == d3b));

+        }

+

+        public void TestCompare()

+        {

+            const int size = 14;

+            decimal[] data = new decimal[size] {

+                0m,	1m, -1m, 2m, 10m, 0.1m, 0.11m,

+                79228162514264337593543950335m,

+                -79228162514264337593543950335m,

+                27703302467091960609331879.532m,

+                -3203854.9559968181492513385018m,

+                -3203854.9559968181492513385017m,

+                -48466870444188873796420.0286m,

+                -48466870444188873796420.02860m

+            };

+

+            short[,] cmpTable = new short[size,size] {

+                {0,-1,1,-1,-1,-1,-1,-1,1,-1,1,1,1,1},

+                {1,0,1,-1,-1,1,1,-1,1,-1,1,1,1,1},

+                {-1,-1,0,-1,-1,-1,-1,-1,1,-1,1,1,1,1},

+                {1,1,1,0,-1,1,1,-1,1,-1,1,1,1,1},

+                {1,1,1,1,0,1,1,-1,1,-1,1,1,1,1},

+                {1,-1,1,-1,-1,0,-1,-1,1,-1,1,1,1,1},

+                {1,-1,1,-1,-1,1,0,-1,1,-1,1,1,1,1},

+                {1,1,1,1,1,1,1,0,1,1,1,1,1,1},

+                {-1,-1,-1,-1,-1,-1,-1,-1,0,-1,-1,-1,-1,-1},

+                {1,1,1,1,1,1,1,-1,1,0,1,1,1,1},

+                {-1,-1,-1,-1,-1,-1,-1,-1,1,-1,0,-1,1,1},

+                {-1,-1,-1,-1,-1,-1,-1,-1,1,-1,1,0,1,1},

+                {-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,-1,0,0},

+                {-1,-1,-1,-1,-1,-1,-1,-1,1,-1,-1,-1,0,0}

+            };

+

+            for (int i = 0; i < size; i++) 

+            {

+                Decimal d1 = data[i];

+                for (int j = 0; j < size; j++) 

+                {

+                    Assert(cmpTable[i,j] == -cmpTable[j,i]);

+                    int x = cmpTable[i,j];

+                    Decimal d2 = data[j];

+

+                    int y = Decimal.Compare(d1, d2);

+                    if (y < 0) y = -1;

+                    else if (y > 0) y = 1;

+                    Assert(x == y);

+

+                    y = d1.CompareTo(d2);

+                    if (y < 0) y = -1;

+                    else if (y > 0) y = 1;

+                    Assert(x == y);

+

+                    bool b = d1 < d2;

+                    if (x != -1) b = !b;

+                    Assert(b);

+

+                    b = d1 <= d2;

+                    if (x == 1) b = !b;

+                    Assert(b);

+

+                    b = d1 >= d2;

+                    if (x == -1) b = !b;

+                    Assert(b);

+

+                    b = d1 > d2;

+                    if (x != 1) b = !b;

+                    Assert(b);

+

+                    b = d1 == d2;

+                    if (x != 0) b = !b;

+                    Assert(b);

+

+                    b = d1.Equals(d2);

+                    if (x != 0) b = !b;

+                    Assert(b);

+

+                    b = Decimal.Equals(d1, d2);

+                    if (x != 0) b = !b;

+                    Assert(b);

+                }

+            }

+        }

+

+        public void TestRemainder()

+        {

+            Assert((decimal)Decimal.Remainder(3.6m, 1.3m) == 1.0m);

+            Assert((decimal)Decimal.Remainder(79228162514264337593543950335m , 

+                27703302467091960609331879.53200m) == 24420760848422211464106753m);

+

+            Assert((decimal)Decimal.Remainder(45937986975432m, 43987453m)

+                == 42334506m);

+            Assert((decimal)Decimal.Remainder(45937986975000m, 5000m)

+                == 0m);

+            Assert((decimal)Decimal.Remainder(-54789548973.6234m, 1.3356m) 

+                == -0.1074m);

+        }

+

+        public void TestAdd()

+        {

+            decimal[] args = auto_build2;

+            TestResult[] trs = trAuto_Add_build2;

+            int errOverflow = 0;

+            int errOp = 0;

+            int count = args.GetLength(0);

+            int n = 0;

+            for (int i = 0; i < count; i++) 

+            {

+                decimal d1 = args[i];

+                for (int j = 0; j < count; j++, n++) 

+                {

+                    decimal d2 = args[j];

+                    decimal d3 = 0;

+                    decimal d4 = 0;

+                    TestResult tr = trs[n];

+                    try

+                    {

+                        d3 = Decimal.Add(d1, d2);

+                        if (d3 != tr.val) 

+                        {

+                            if (tr.info == TestResultInfo.Overflow)

+                            {

+                                ReportOpError("Add: expected overflow", i, j, d1, d2, d3, tr.val);

+                                errOverflow++;

+                            }

+                            else 

+                            {

+                                ReportOpError("Add: result mismatch", i, j, d1, d2, d3, tr.val);

+                                errOp++;

+                            }

+                        }

+                        else if (tr.info == TestResultInfo.Ok)

+                        {

+                            d4 = Decimal.Subtract(d3, d2);

+                            if (d4 != d1)

+                            {

+                                ReportOpError("Subtract: result mismatch", i, j, d3, d2, d4, d1);

+                                errOp++;

+                            }

+                        }

+                    }

+                    catch (OverflowException)

+                    {

+                        if (tr.info != TestResultInfo.Overflow) 

+                        {

+                            ReportOpError("Add: unexpected overflow", i, j, d1, d2, d3, 0);

+                            errOverflow++;

+                        }

+                    }

+                }

+            }

+

+            if (errOverflow + errOp > 0) 

+            {

+                Fail("" + errOp + " wrong additions, " + errOverflow + " wrong overflows");

+            }

+        }

+

+        public void TestMult()

+        {

+            decimal[] args = auto_build2;

+            TestResult[] trs = trAuto_Mult_build2;

+            int errOverflow = 0;

+            int errOp = 0;

+            int count = args.GetLength(0);

+            int n = 0;

+            for (int i = 0; i < count; i++) 

+            {

+                decimal d1 = args[i];

+                for (int j = 0; j < count; j++, n++) 

+                {

+                    decimal d2 = args[j];

+                    decimal d3 = 0;

+                    decimal d4 = 0;

+                    TestResult tr = trs[n];

+                    try

+                    {

+                        d3 = Decimal.Multiply(d1, d2);

+                        if (d3 != tr.val) 

+                        {

+                            if (tr.info == TestResultInfo.Overflow)

+                            {

+                                ReportOpError("Mult: expected overflow", i, j, d1, d2, d3, tr.val);

+                                errOverflow++;

+                            }

+                            else 

+                            {

+                                ReportOpError("Mult: result mismatch", i, j, d1, d2, d3, tr.val);

+                                errOp++;

+                            }

+                        } 

+                    }

+                    catch (OverflowException)

+                    {

+                        if (tr.info != TestResultInfo.Overflow) 

+                        {

+                            ReportOpError("Mult: unexpected overflow", i, j, d1, d2, d3, 0);

+                            errOverflow++;

+                        }

+                    }

+

+                    if (d2 != 0 && tr.info != TestResultInfo.Overflow)

+                    {

+                        try 

+                        {

+                            d4 = Decimal.Divide(d3, d2);

+                            if (d4 != d1 && tr.info != TestResultInfo.ReverseRound)

+                            {

+                                ReportOpError("MultDiv: result mismatch", i, j, d3, d2, d4, d1);

+                                errOp++;

+                            }

+                        }

+                        catch (OverflowException)

+                        {

+                            if (tr.info != TestResultInfo.ReverseOverflow) 

+                            {

+                                ReportOpError("MultDiv: unexpected overflow", i, j, d3, d2, d4, d1);

+                                errOverflow++;

+                            }

+                        }

+                    }

+

+                }

+            }

+

+            if (errOverflow + errOp > 0) 

+            {

+                Fail("" + errOp + " wrong multiplications, " + errOverflow + " wrong overflows");

+            }

+        }

+

+        public void TestDiv()

+        {

+            decimal[] args = auto_build2;

+            TestResult[] trs = trAuto_Div_build2;

+            int errOverflow = 0;

+            int errDivideByZero = 0;

+            int errOp = 0;

+            int count = args.GetLength(0);

+            int n = 0;

+            for (int i = 0; i < count; i++) 

+            {

+                decimal d1 = args[i];

+                for (int j = 0; j < count; j++, n++) 

+                {

+                    decimal d2 = args[j];

+                    decimal d3 = 0;

+                    decimal d4 = 0;

+                    TestResult tr = trs[n];

+                    try

+                    {

+                        d3 = Decimal.Divide(d1, d2);

+                        if (d3 != tr.val) 

+                        {

+                            if (tr.info == TestResultInfo.Overflow)

+                            {

+                                ReportOpError("Div: expected overflow", i, j, d1, d2, d3, tr.val);

+                                errOverflow++;

+                            }

+                            else if (tr.info == TestResultInfo.DivideByZero)

+                            {

+                                ReportOpError("Div: expected divide by zero", i, j, d1, d2, d3, tr.val);

+                                errDivideByZero++;

+                            }

+                            else 

+                            {

+                                ReportOpError("Div: result mismatch", i, j, d1, d2, d3, tr.val);

+                                errOp++;

+                            }

+                        }

+                    }

+                    catch (OverflowException)

+                    {

+                        if (tr.info != TestResultInfo.Overflow) 

+                        {

+                            ReportOpError("Div: unexpected overflow", i, j, d1, d2, d3, 0);

+                            errOverflow++;

+                        }

+                    }

+                    catch (DivideByZeroException)

+                    {

+                        if (tr.info != TestResultInfo.DivideByZero) 

+                        {

+                            ReportOpError("Div: unexpected divide by zero", i, j, d1, d2, d3, 0);

+                            errDivideByZero++;

+                        }

+                    }

+

+                    if (d3 != 0)

+                    {

+                        try

+                        {

+                            d4 = Decimal.Multiply(d3, d2);

+                            if (d4 != d1 && tr.info != TestResultInfo.ReverseRound)

+                            {

+                                ReportOpError("DivMult: result mismatch", i, j, d3, d2, d4, d1);

+                                errOp++;

+                            }

+                        }

+                        catch (OverflowException)

+                        {

+                            if (tr.info != TestResultInfo.ReverseOverflow) 

+                            {

+                                ReportOpError("DivMult: unexpected overflow", i, j, d3, d2, d4, d1);

+                                errOverflow++;

+                            }

+                        }

+                    }

+                }

+            }

+

+            if (errOverflow + errOp > 0) 

+            {

+                Fail("" + errOp + " wrong division, " + errOverflow + " wrong overflows, " + errDivideByZero + " wrong divide by zero, ");

+            }

+        }

+

+        #region Data

+

+

+        // generated argument list build2

+        decimal[] auto_build2 = new decimal[] {

+	    0m, // 0

+	    1m, // 1

+	    -1m, // 2

+	    2m, // 3

+	    10m, // 4

+	    0.1m, // 5

+	    79228162514264337593543950335m, // 6

+	    -79228162514264337593543950335m, // 7

+	    27703302467091960609331879.532m, // 8

+	    -3203854.9559968181492513385018m, // 9

+	    -48466870444188873796420.028868m, // 10

+	    -545193693242804794.30331374676m, // 11

+	    0.7629234053338741809892531431m, // 12

+	    -400453059665371395972.33474452m, // 13

+	    222851627785191714190050.61676m, // 14

+	    14246043379204153213661335.584m, // 15

+	    -421123.30446308691436596648186m, // 16

+	    24463288738299545.200508898642m, // 17

+	    -5323259153836385912697776.001m, // 18

+	    102801066199805834724673169.19m, // 19

+	    7081320760.3793287174700927968m, // 20

+	    415752273939.77704245656837041m, // 21

+	    -6389392489892.6362673670820462m, // 22

+	    442346282742915.0596416330681m, // 23

+	    -512833780867323.89020837443764m, // 24

+	    608940580690915704.1450897514m, // 25

+	    -42535053313319986966115.037787m, // 26

+	    -7808274522591953107485.8812311m, // 27

+	    1037807626804273037330059471.7m, // 28

+	    -4997122966.448652425771563042m, // 29

+        };

+

+

+        // generated result list build2

+        TestResult[] trAuto_Add_build2 = new TestResult[] {

+	    new TestResult(0, 0m), // 0 + 0

+	    new TestResult(0, 1m), // 0 + 1

+	    new TestResult(0, -1m), // 0 + 2

+	    new TestResult(0, 2m), // 0 + 3

+	    new TestResult(0, 10m), // 0 + 4

+	    new TestResult(0, 0.1m), // 0 + 5

+	    new TestResult(0, 79228162514264337593543950335m), // 0 + 6

+	    new TestResult(0, -79228162514264337593543950335m), // 0 + 7

+	    new TestResult(0, 27703302467091960609331879.532m), // 0 + 8

+	    new TestResult(0, -3203854.9559968181492513385018m), // 0 + 9

+	    new TestResult(0, -48466870444188873796420.028868m), // 0 + 10

+	    new TestResult(0, -545193693242804794.30331374676m), // 0 + 11

+	    new TestResult(0, 0.7629234053338741809892531431m), // 0 + 12

+	    new TestResult(0, -400453059665371395972.33474452m), // 0 + 13

+	    new TestResult(0, 222851627785191714190050.61676m), // 0 + 14

+	    new TestResult(0, 14246043379204153213661335.584m), // 0 + 15

+	    new TestResult(0, -421123.30446308691436596648186m), // 0 + 16

+	    new TestResult(0, 24463288738299545.200508898642m), // 0 + 17

+	    new TestResult(0, -5323259153836385912697776.001m), // 0 + 18

+	    new TestResult(0, 102801066199805834724673169.19m), // 0 + 19

+	    new TestResult(0, 7081320760.3793287174700927968m), // 0 + 20

+	    new TestResult(0, 415752273939.77704245656837041m), // 0 + 21

+	    new TestResult(0, -6389392489892.6362673670820462m), // 0 + 22

+	    new TestResult(0, 442346282742915.0596416330681m), // 0 + 23

+	    new TestResult(0, -512833780867323.89020837443764m), // 0 + 24

+	    new TestResult(0, 608940580690915704.1450897514m), // 0 + 25

+	    new TestResult(0, -42535053313319986966115.037787m), // 0 + 26

+	    new TestResult(0, -7808274522591953107485.8812311m), // 0 + 27

+	    new TestResult(0, 1037807626804273037330059471.7m), // 0 + 28

+	    new TestResult(0, -4997122966.448652425771563042m), // 0 + 29

+	    new TestResult(0, 1m), // 1 + 0

+	    new TestResult(0, 2m), // 1 + 1

+	    new TestResult(0, 0m), // 1 + 2

+	    new TestResult(0, 3m), // 1 + 3

+	    new TestResult(0, 11m), // 1 + 4

+	    new TestResult(0, 1.1m), // 1 + 5

+	    new TestResult(1, 0m), // 1 + 6

+	    new TestResult(0, -79228162514264337593543950334m), // 1 + 7

+	    new TestResult(0, 27703302467091960609331880.532m), // 1 + 8

+	    new TestResult(0, -3203853.9559968181492513385018m), // 1 + 9

+	    new TestResult(0, -48466870444188873796419.028868m), // 1 + 10

+	    new TestResult(0, -545193693242804793.30331374676m), // 1 + 11

+	    new TestResult(0, 1.7629234053338741809892531431m), // 1 + 12

+	    new TestResult(0, -400453059665371395971.33474452m), // 1 + 13

+	    new TestResult(0, 222851627785191714190051.61676m), // 1 + 14

+	    new TestResult(0, 14246043379204153213661336.584m), // 1 + 15

+	    new TestResult(0, -421122.30446308691436596648186m), // 1 + 16

+	    new TestResult(0, 24463288738299546.200508898642m), // 1 + 17

+	    new TestResult(0, -5323259153836385912697775.001m), // 1 + 18

+	    new TestResult(0, 102801066199805834724673170.19m), // 1 + 19

+	    new TestResult(0, 7081320761.3793287174700927968m), // 1 + 20

+	    new TestResult(0, 415752273940.77704245656837041m), // 1 + 21

+	    new TestResult(0, -6389392489891.6362673670820462m), // 1 + 22

+	    new TestResult(0, 442346282742916.0596416330681m), // 1 + 23

+	    new TestResult(0, -512833780867322.89020837443764m), // 1 + 24

+	    new TestResult(0, 608940580690915705.1450897514m), // 1 + 25

+	    new TestResult(0, -42535053313319986966114.037787m), // 1 + 26

+	    new TestResult(0, -7808274522591953107484.8812311m), // 1 + 27

+	    new TestResult(0, 1037807626804273037330059472.7m), // 1 + 28

+	    new TestResult(0, -4997122965.448652425771563042m), // 1 + 29

+	    new TestResult(0, -1m), // 2 + 0

+	    new TestResult(0, 0m), // 2 + 1

+	    new TestResult(0, -2m), // 2 + 2

+	    new TestResult(0, 1m), // 2 + 3

+	    new TestResult(0, 9m), // 2 + 4

+	    new TestResult(0, -0.9m), // 2 + 5

+	    new TestResult(0, 79228162514264337593543950334m), // 2 + 6

+	    new TestResult(1, 0m), // 2 + 7

+	    new TestResult(0, 27703302467091960609331878.532m), // 2 + 8

+	    new TestResult(0, -3203855.9559968181492513385018m), // 2 + 9

+	    new TestResult(0, -48466870444188873796421.028868m), // 2 + 10

+	    new TestResult(0, -545193693242804795.30331374676m), // 2 + 11

+	    new TestResult(0, -0.2370765946661258190107468569m), // 2 + 12

+	    new TestResult(0, -400453059665371395973.33474452m), // 2 + 13

+	    new TestResult(0, 222851627785191714190049.61676m), // 2 + 14

+	    new TestResult(0, 14246043379204153213661334.584m), // 2 + 15

+	    new TestResult(0, -421124.30446308691436596648186m), // 2 + 16

+	    new TestResult(0, 24463288738299544.200508898642m), // 2 + 17

+	    new TestResult(0, -5323259153836385912697777.001m), // 2 + 18

+	    new TestResult(0, 102801066199805834724673168.19m), // 2 + 19

+	    new TestResult(0, 7081320759.3793287174700927968m), // 2 + 20

+	    new TestResult(0, 415752273938.77704245656837041m), // 2 + 21

+	    new TestResult(0, -6389392489893.6362673670820462m), // 2 + 22

+	    new TestResult(0, 442346282742914.0596416330681m), // 2 + 23

+	    new TestResult(0, -512833780867324.89020837443764m), // 2 + 24

+	    new TestResult(0, 608940580690915703.1450897514m), // 2 + 25

+	    new TestResult(0, -42535053313319986966116.037787m), // 2 + 26

+	    new TestResult(0, -7808274522591953107486.8812311m), // 2 + 27

+	    new TestResult(0, 1037807626804273037330059470.7m), // 2 + 28

+	    new TestResult(0, -4997122967.448652425771563042m), // 2 + 29

+	    new TestResult(0, 2m), // 3 + 0

+	    new TestResult(0, 3m), // 3 + 1

+	    new TestResult(0, 1m), // 3 + 2

+	    new TestResult(0, 4m), // 3 + 3

+	    new TestResult(0, 12m), // 3 + 4

+	    new TestResult(0, 2.1m), // 3 + 5

+	    new TestResult(1, 0m), // 3 + 6

+	    new TestResult(0, -79228162514264337593543950333m), // 3 + 7

+	    new TestResult(0, 27703302467091960609331881.532m), // 3 + 8

+	    new TestResult(0, -3203852.9559968181492513385018m), // 3 + 9

+	    new TestResult(0, -48466870444188873796418.028868m), // 3 + 10

+	    new TestResult(0, -545193693242804792.30331374676m), // 3 + 11

+	    new TestResult(0, 2.7629234053338741809892531431m), // 3 + 12

+	    new TestResult(0, -400453059665371395970.33474452m), // 3 + 13

+	    new TestResult(0, 222851627785191714190052.61676m), // 3 + 14

+	    new TestResult(0, 14246043379204153213661337.584m), // 3 + 15

+	    new TestResult(0, -421121.30446308691436596648186m), // 3 + 16

+	    new TestResult(0, 24463288738299547.200508898642m), // 3 + 17

+	    new TestResult(0, -5323259153836385912697774.001m), // 3 + 18

+	    new TestResult(0, 102801066199805834724673171.19m), // 3 + 19

+	    new TestResult(0, 7081320762.3793287174700927968m), // 3 + 20

+	    new TestResult(0, 415752273941.77704245656837041m), // 3 + 21

+	    new TestResult(0, -6389392489890.6362673670820462m), // 3 + 22

+	    new TestResult(0, 442346282742917.0596416330681m), // 3 + 23

+	    new TestResult(0, -512833780867321.89020837443764m), // 3 + 24

+	    new TestResult(0, 608940580690915706.1450897514m), // 3 + 25

+	    new TestResult(0, -42535053313319986966113.037787m), // 3 + 26

+	    new TestResult(0, -7808274522591953107483.8812311m), // 3 + 27

+	    new TestResult(0, 1037807626804273037330059473.7m), // 3 + 28

+	    new TestResult(0, -4997122964.448652425771563042m), // 3 + 29

+	    new TestResult(0, 10m), // 4 + 0

+	    new TestResult(0, 11m), // 4 + 1

+	    new TestResult(0, 9m), // 4 + 2

+	    new TestResult(0, 12m), // 4 + 3

+	    new TestResult(0, 20m), // 4 + 4

+	    new TestResult(0, 10.1m), // 4 + 5

+	    new TestResult(1, 0m), // 4 + 6

+	    new TestResult(0, -79228162514264337593543950325m), // 4 + 7

+	    new TestResult(0, 27703302467091960609331889.532m), // 4 + 8

+	    new TestResult(0, -3203844.9559968181492513385018m), // 4 + 9

+	    new TestResult(0, -48466870444188873796410.028868m), // 4 + 10

+	    new TestResult(0, -545193693242804784.30331374676m), // 4 + 11

+	    new TestResult(0, 10.762923405333874180989253143m), // 4 + 12

+	    new TestResult(0, -400453059665371395962.33474452m), // 4 + 13

+	    new TestResult(0, 222851627785191714190060.61676m), // 4 + 14

+	    new TestResult(0, 14246043379204153213661345.584m), // 4 + 15

+	    new TestResult(0, -421113.30446308691436596648186m), // 4 + 16

+	    new TestResult(0, 24463288738299555.200508898642m), // 4 + 17

+	    new TestResult(0, -5323259153836385912697766.001m), // 4 + 18

+	    new TestResult(0, 102801066199805834724673179.19m), // 4 + 19

+	    new TestResult(0, 7081320770.3793287174700927968m), // 4 + 20

+	    new TestResult(0, 415752273949.77704245656837041m), // 4 + 21

+	    new TestResult(0, -6389392489882.6362673670820462m), // 4 + 22

+	    new TestResult(0, 442346282742925.0596416330681m), // 4 + 23

+	    new TestResult(0, -512833780867313.89020837443764m), // 4 + 24

+	    new TestResult(0, 608940580690915714.1450897514m), // 4 + 25

+	    new TestResult(0, -42535053313319986966105.037787m), // 4 + 26

+	    new TestResult(0, -7808274522591953107475.8812311m), // 4 + 27

+	    new TestResult(0, 1037807626804273037330059481.7m), // 4 + 28

+	    new TestResult(0, -4997122956.448652425771563042m), // 4 + 29

+	    new TestResult(0, 0.1m), // 5 + 0

+	    new TestResult(0, 1.1m), // 5 + 1

+	    new TestResult(0, -0.9m), // 5 + 2

+	    new TestResult(0, 2.1m), // 5 + 3

+	    new TestResult(0, 10.1m), // 5 + 4

+	    new TestResult(0, 0.2m), // 5 + 5

+	    new TestResult(2, 79228162514264337593543950335m), // 5 + 6

+	    new TestResult(2, -79228162514264337593543950335m), // 5 + 7

+	    new TestResult(0, 27703302467091960609331879.632m), // 5 + 8

+	    new TestResult(0, -3203854.8559968181492513385018m), // 5 + 9

+	    new TestResult(0, -48466870444188873796419.928868m), // 5 + 10

+	    new TestResult(0, -545193693242804794.20331374676m), // 5 + 11

+	    new TestResult(0, 0.8629234053338741809892531431m), // 5 + 12

+	    new TestResult(0, -400453059665371395972.23474452m), // 5 + 13

+	    new TestResult(0, 222851627785191714190050.71676m), // 5 + 14

+	    new TestResult(0, 14246043379204153213661335.684m), // 5 + 15

+	    new TestResult(0, -421123.20446308691436596648186m), // 5 + 16

+	    new TestResult(0, 24463288738299545.300508898642m), // 5 + 17

+	    new TestResult(0, -5323259153836385912697775.901m), // 5 + 18

+	    new TestResult(0, 102801066199805834724673169.29m), // 5 + 19

+	    new TestResult(0, 7081320760.4793287174700927968m), // 5 + 20

+	    new TestResult(0, 415752273939.87704245656837041m), // 5 + 21

+	    new TestResult(0, -6389392489892.5362673670820462m), // 5 + 22

+	    new TestResult(0, 442346282742915.1596416330681m), // 5 + 23

+	    new TestResult(0, -512833780867323.79020837443764m), // 5 + 24

+	    new TestResult(0, 608940580690915704.2450897514m), // 5 + 25

+	    new TestResult(0, -42535053313319986966114.937787m), // 5 + 26

+	    new TestResult(0, -7808274522591953107485.7812311m), // 5 + 27

+	    new TestResult(0, 1037807626804273037330059471.8m), // 5 + 28

+	    new TestResult(0, -4997122966.348652425771563042m), // 5 + 29

+	    new TestResult(0, 79228162514264337593543950335m), // 6 + 0

+	    new TestResult(1, 0m), // 6 + 1

+	    new TestResult(0, 79228162514264337593543950334m), // 6 + 2

+	    new TestResult(1, 0m), // 6 + 3

+	    new TestResult(1, 0m), // 6 + 4

+	    new TestResult(0, 79228162514264337593543950335m), // 6 + 5

+	    new TestResult(1, 0m), // 6 + 6

+	    new TestResult(0, 0m), // 6 + 7

+	    new TestResult(1, 0m), // 6 + 8

+	    new TestResult(0, 79228162514264337593540746480m), // 6 + 9

+	    new TestResult(0, 79228114047393893404670153915m), // 6 + 10

+	    new TestResult(0, 79228162513719143900301145541m), // 6 + 11

+	    new TestResult(1, 0m), // 6 + 12

+	    new TestResult(0, 79228162113811277928172554363m), // 6 + 13

+	    new TestResult(1, 0m), // 6 + 14

+	    new TestResult(1, 0m), // 6 + 15

+	    new TestResult(0, 79228162514264337593543529212m), // 6 + 16

+	    new TestResult(1, 0m), // 6 + 17

+	    new TestResult(0, 79222839255110501207631252559m), // 6 + 18

+	    new TestResult(1, 0m), // 6 + 19

+	    new TestResult(1, 0m), // 6 + 20

+	    new TestResult(1, 0m), // 6 + 21

+	    new TestResult(0, 79228162514264331204151460442m), // 6 + 22

+	    new TestResult(1, 0m), // 6 + 23

+	    new TestResult(0, 79228162514263824759763083011m), // 6 + 24

+	    new TestResult(1, 0m), // 6 + 25

+	    new TestResult(0, 79228119979211024273556984220m), // 6 + 26

+	    new TestResult(0, 79228154705989815001590842849m), // 6 + 27

+	    new TestResult(1, 0m), // 6 + 28

+	    new TestResult(0, 79228162514264337588546827369m), // 6 + 29

+	    new TestResult(0, -79228162514264337593543950335m), // 7 + 0

+	    new TestResult(0, -79228162514264337593543950334m), // 7 + 1

+	    new TestResult(1, 0m), // 7 + 2

+	    new TestResult(0, -79228162514264337593543950333m), // 7 + 3

+	    new TestResult(0, -79228162514264337593543950325m), // 7 + 4

+	    new TestResult(0, -79228162514264337593543950335m), // 7 + 5

+	    new TestResult(0, 0m), // 7 + 6

+	    new TestResult(1, 0m), // 7 + 7

+	    new TestResult(0, -79200459211797245632934618455m), // 7 + 8

+	    new TestResult(1, 0m), // 7 + 9

+	    new TestResult(1, 0m), // 7 + 10

+	    new TestResult(1, 0m), // 7 + 11

+	    new TestResult(0, -79228162514264337593543950334m), // 7 + 12

+	    new TestResult(1, 0m), // 7 + 13

+	    new TestResult(0, -79227939662636552401829760284m), // 7 + 14

+	    new TestResult(0, -79213916470885133440330288999m), // 7 + 15

+	    new TestResult(1, 0m), // 7 + 16

+	    new TestResult(0, -79228162514239874304805650790m), // 7 + 17

+	    new TestResult(1, 0m), // 7 + 18

+	    new TestResult(0, -79125361448064531758819277166m), // 7 + 19

+	    new TestResult(0, -79228162514264337586462629575m), // 7 + 20

+	    new TestResult(0, -79228162514264337177791676395m), // 7 + 21

+	    new TestResult(1, 0m), // 7 + 22

+	    new TestResult(0, -79228162514263895247261207420m), // 7 + 23

+	    new TestResult(1, 0m), // 7 + 24

+	    new TestResult(0, -79228162513655397012853034631m), // 7 + 25

+	    new TestResult(1, 0m), // 7 + 26

+	    new TestResult(1, 0m), // 7 + 27

+	    new TestResult(0, -78190354887460064556213890863m), // 7 + 28

+	    new TestResult(1, 0m), // 7 + 29

+	    new TestResult(0, 27703302467091960609331879.532m), // 8 + 0

+	    new TestResult(0, 27703302467091960609331880.532m), // 8 + 1

+	    new TestResult(0, 27703302467091960609331878.532m), // 8 + 2

+	    new TestResult(0, 27703302467091960609331881.532m), // 8 + 3

+	    new TestResult(0, 27703302467091960609331889.532m), // 8 + 4

+	    new TestResult(0, 27703302467091960609331879.632m), // 8 + 5

+	    new TestResult(1, 0m), // 8 + 6

+	    new TestResult(2, -79200459211797245632934618455m), // 8 + 7

+	    new TestResult(0, 55406604934183921218663759.064m), // 8 + 8

+	    new TestResult(0, 27703302467091960606128024.576m), // 8 + 9

+	    new TestResult(0, 27654835596647771735535459.503m), // 8 + 10

+	    new TestResult(0, 27703301921898267366527085.229m), // 8 + 11

+	    new TestResult(0, 27703302467091960609331880.295m), // 8 + 12

+	    new TestResult(0, 27702902014032295237935907.197m), // 8 + 13

+	    new TestResult(0, 27926154094877152323521930.149m), // 8 + 14

+	    new TestResult(0, 41949345846296113822993215.116m), // 8 + 15

+	    new TestResult(0, 27703302467091960608910756.228m), // 8 + 16

+	    new TestResult(0, 27703302491555249347631424.733m), // 8 + 17

+	    new TestResult(0, 22380043313255574696634103.531m), // 8 + 18

+	    new TestResult(2, 130504368666897795334005048.72m), // 8 + 19

+	    new TestResult(0, 27703302467091967690652639.911m), // 8 + 20

+	    new TestResult(0, 27703302467092376361605819.309m), // 8 + 21

+	    new TestResult(0, 27703302467085571216841986.896m), // 8 + 22

+	    new TestResult(0, 27703302467534306892074794.592m), // 8 + 23

+	    new TestResult(0, 27703302466579126828464555.642m), // 8 + 24

+	    new TestResult(0, 27703303076032541300247583.677m), // 8 + 25

+	    new TestResult(0, 27660767413778640622365764.494m), // 8 + 26

+	    new TestResult(0, 27695494192569368656224393.651m), // 8 + 27

+	    new TestResult(2, 1065510929271364997939391351.2m), // 8 + 28

+	    new TestResult(0, 27703302467091955612208913.083m), // 8 + 29

+	    new TestResult(0, -3203854.9559968181492513385018m), // 9 + 0

+	    new TestResult(0, -3203853.9559968181492513385018m), // 9 + 1

+	    new TestResult(0, -3203855.9559968181492513385018m), // 9 + 2

+	    new TestResult(0, -3203852.9559968181492513385018m), // 9 + 3

+	    new TestResult(0, -3203844.9559968181492513385018m), // 9 + 4

+	    new TestResult(0, -3203854.8559968181492513385018m), // 9 + 5

+	    new TestResult(2, 79228162514264337593540746480m), // 9 + 6

+	    new TestResult(1, 0m), // 9 + 7

+	    new TestResult(2, 27703302467091960606128024.576m), // 9 + 8

+	    new TestResult(0, -6407709.9119936362985026770036m), // 9 + 9

+	    new TestResult(2, -48466870444188877000274.984865m), // 9 + 10

+	    new TestResult(2, -545193693246008649.25931056491m), // 9 + 11

+	    new TestResult(0, -3203854.1930734128153771575125m), // 9 + 12

+	    new TestResult(2, -400453059665374599827.29074134m), // 9 + 13

+	    new TestResult(2, 222851627785191710986195.66076m), // 9 + 14

+	    new TestResult(2, 14246043379204153210457480.628m), // 9 + 15

+	    new TestResult(0, -3624978.2604599050636173049837m), // 9 + 16

+	    new TestResult(2, 24463288735095690.244512080493m), // 9 + 17

+	    new TestResult(2, -5323259153836385915901630.957m), // 9 + 18

+	    new TestResult(2, 102801066199805834721469314.23m), // 9 + 19

+	    new TestResult(2, 7078116905.4233318993208414583m), // 9 + 20

+	    new TestResult(2, 415749070084.82104563841911907m), // 9 + 21

+	    new TestResult(2, -6389395693747.5922641852312975m), // 9 + 22

+	    new TestResult(2, 442346279539060.10364481491885m), // 9 + 23

+	    new TestResult(2, -512833784071178.84620519258689m), // 9 + 24

+	    new TestResult(2, 608940580687711849.18909293325m), // 9 + 25

+	    new TestResult(2, -42535053313319990169969.993784m), // 9 + 26

+	    new TestResult(2, -7808274522591956311340.8372279m), // 9 + 27

+	    new TestResult(2, 1037807626804273037326855616.7m), // 9 + 28

+	    new TestResult(2, -5000326821.4046492439208143805m), // 9 + 29

+	    new TestResult(0, -48466870444188873796420.028868m), // 10 + 0

+	    new TestResult(0, -48466870444188873796419.028868m), // 10 + 1

+	    new TestResult(0, -48466870444188873796421.028868m), // 10 + 2

+	    new TestResult(0, -48466870444188873796418.028868m), // 10 + 3

+	    new TestResult(0, -48466870444188873796410.028868m), // 10 + 4

+	    new TestResult(0, -48466870444188873796419.928868m), // 10 + 5

+	    new TestResult(2, 79228114047393893404670153915m), // 10 + 6

+	    new TestResult(1, 0m), // 10 + 7

+	    new TestResult(2, 27654835596647771735535459.503m), // 10 + 8

+	    new TestResult(0, -48466870444188877000274.984865m), // 10 + 9

+	    new TestResult(2, -96933740888377747592840.05774m), // 10 + 10

+	    new TestResult(0, -48467415637882116601214.332182m), // 10 + 11

+	    new TestResult(0, -48466870444188873796419.265945m), // 10 + 12

+	    new TestResult(0, -48867323503854245192392.363613m), // 10 + 13

+	    new TestResult(2, 174384757341002840393630.58789m), // 10 + 14

+	    new TestResult(2, 14197576508759964339864915.555m), // 10 + 15

+	    new TestResult(0, -48466870444188874217543.333331m), // 10 + 16

+	    new TestResult(0, -48466845980900135496874.828359m), // 10 + 17

+	    new TestResult(2, -5371726024280574786494196.0299m), // 10 + 18

+	    new TestResult(2, 102752599329361645850876749.16m), // 10 + 19

+	    new TestResult(0, -48466870444181792475659.649539m), // 10 + 20

+	    new TestResult(0, -48466870443773121522480.251826m), // 10 + 21

+	    new TestResult(0, -48466870450578266286312.665135m), // 10 + 22

+	    new TestResult(0, -48466870001842591053504.969226m), // 10 + 23

+	    new TestResult(0, -48466870957022654663743.919076m), // 10 + 24

+	    new TestResult(0, -48466261503608182880715.883778m), // 10 + 25

+	    new TestResult(2, -91001923757508860762535.06666m), // 10 + 26

+	    new TestResult(0, -56275144966780826903905.910099m), // 10 + 27

+	    new TestResult(2, 1037759159933828848456263051.7m), // 10 + 28

+	    new TestResult(0, -48466870444193870919386.47752m), // 10 + 29

+	    new TestResult(0, -545193693242804794.30331374676m), // 11 + 0

+	    new TestResult(0, -545193693242804793.30331374676m), // 11 + 1

+	    new TestResult(0, -545193693242804795.30331374676m), // 11 + 2

+	    new TestResult(0, -545193693242804792.30331374676m), // 11 + 3

+	    new TestResult(0, -545193693242804784.30331374676m), // 11 + 4

+	    new TestResult(0, -545193693242804794.20331374676m), // 11 + 5

+	    new TestResult(2, 79228162513719143900301145541m), // 11 + 6

+	    new TestResult(1, 0m), // 11 + 7

+	    new TestResult(2, 27703301921898267366527085.229m), // 11 + 8

+	    new TestResult(0, -545193693246008649.25931056491m), // 11 + 9

+	    new TestResult(2, -48467415637882116601214.332182m), // 11 + 10

+	    new TestResult(2, -1090387386485609588.6066274935m), // 11 + 11

+	    new TestResult(0, -545193693242804793.54039034143m), // 11 + 12

+	    new TestResult(2, -400998253358614200766.63805827m), // 11 + 13

+	    new TestResult(2, 222851082591498471385256.31345m), // 11 + 14

+	    new TestResult(2, 14246042834010459970856541.281m), // 11 + 15

+	    new TestResult(0, -545193693243225917.60777683367m), // 11 + 16

+	    new TestResult(0, -520730404504505249.10280484812m), // 11 + 17

+	    new TestResult(2, -5323259699030079155502570.3043m), // 11 + 18

+	    new TestResult(2, 102801065654612141481868374.89m), // 11 + 19

+	    new TestResult(0, -545193686161484033.92398502929m), // 11 + 20

+	    new TestResult(0, -545193277490530854.52627129019m), // 11 + 21

+	    new TestResult(0, -545200082635294686.93958111384m), // 11 + 22

+	    new TestResult(0, -544751346960061879.24367211369m), // 11 + 23

+	    new TestResult(0, -545706527023672118.1935221212m), // 11 + 24

+	    new TestResult(0, 63746887448110909.84177600464m), // 11 + 25

+	    new TestResult(2, -42535598507013229770909.341101m), // 11 + 26

+	    new TestResult(2, -7808819716285195912280.1845448m), // 11 + 27

+	    new TestResult(2, 1037807626259079344087254677.4m), // 11 + 28

+	    new TestResult(0, -545193698239927760.75196617253m), // 11 + 29

+	    new TestResult(0, 0.7629234053338741809892531431m), // 12 + 0

+	    new TestResult(0, 1.7629234053338741809892531431m), // 12 + 1

+	    new TestResult(0, -0.2370765946661258190107468569m), // 12 + 2

+	    new TestResult(0, 2.7629234053338741809892531431m), // 12 + 3

+	    new TestResult(2, 10.762923405333874180989253143m), // 12 + 4

+	    new TestResult(0, 0.8629234053338741809892531431m), // 12 + 5

+	    new TestResult(1, 0m), // 12 + 6

+	    new TestResult(2, -79228162514264337593543950334m), // 12 + 7

+	    new TestResult(2, 27703302467091960609331880.295m), // 12 + 8

+	    new TestResult(2, -3203854.1930734128153771575125m), // 12 + 9

+	    new TestResult(2, -48466870444188873796419.265945m), // 12 + 10

+	    new TestResult(2, -545193693242804793.54039034143m), // 12 + 11

+	    new TestResult(0, 1.5258468106677483619785062862m), // 12 + 12

+	    new TestResult(2, -400453059665371395971.57182111m), // 12 + 13

+	    new TestResult(2, 222851627785191714190051.37968m), // 12 + 14

+	    new TestResult(2, 14246043379204153213661336.347m), // 12 + 15

+	    new TestResult(2, -421122.54153968158049178549261m), // 12 + 16

+	    new TestResult(2, 24463288738299545.963432303976m), // 12 + 17

+	    new TestResult(2, -5323259153836385912697775.2381m), // 12 + 18

+	    new TestResult(2, 102801066199805834724673169.95m), // 12 + 19

+	    new TestResult(2, 7081320761.1422521228039669778m), // 12 + 20

+	    new TestResult(2, 415752273940.53996586190224459m), // 12 + 21

+	    new TestResult(2, -6389392489891.873343961748172m), // 12 + 22

+	    new TestResult(2, 442346282742915.82256503840197m), // 12 + 23

+	    new TestResult(2, -512833780867323.12728496910377m), // 12 + 24

+	    new TestResult(2, 608940580690915704.90801315673m), // 12 + 25

+	    new TestResult(2, -42535053313319986966114.274864m), // 12 + 26

+	    new TestResult(2, -7808274522591953107485.1183077m), // 12 + 27

+	    new TestResult(2, 1037807626804273037330059472.5m), // 12 + 28

+	    new TestResult(2, -4997122965.685729020437688861m), // 12 + 29

+	    new TestResult(0, -400453059665371395972.33474452m), // 13 + 0

+	    new TestResult(0, -400453059665371395971.33474452m), // 13 + 1

+	    new TestResult(0, -400453059665371395973.33474452m), // 13 + 2

+	    new TestResult(0, -400453059665371395970.33474452m), // 13 + 3

+	    new TestResult(0, -400453059665371395962.33474452m), // 13 + 4

+	    new TestResult(0, -400453059665371395972.23474452m), // 13 + 5

+	    new TestResult(2, 79228162113811277928172554363m), // 13 + 6

+	    new TestResult(1, 0m), // 13 + 7

+	    new TestResult(2, 27702902014032295237935907.197m), // 13 + 8

+	    new TestResult(0, -400453059665374599827.29074134m), // 13 + 9

+	    new TestResult(2, -48867323503854245192392.363613m), // 13 + 10

+	    new TestResult(0, -400998253358614200766.63805827m), // 13 + 11

+	    new TestResult(0, -400453059665371395971.57182111m), // 13 + 12

+	    new TestResult(2, -800906119330742791944.669489m), // 13 + 13

+	    new TestResult(2, 222451174725526342794078.28202m), // 13 + 14

+	    new TestResult(2, 14245642926144487842265363.249m), // 13 + 15

+	    new TestResult(0, -400453059665371817095.63920761m), // 13 + 16

+	    new TestResult(0, -400428596376633096427.13423562m), // 13 + 17

+	    new TestResult(2, -5323659606896051284093748.3357m), // 13 + 18

+	    new TestResult(2, 102800665746746169353277196.86m), // 13 + 19

+	    new TestResult(0, -400453059658290075211.9554158m), // 13 + 20

+	    new TestResult(0, -400453059249619122032.55770206m), // 13 + 21

+	    new TestResult(0, -400453066054763885864.97101189m), // 13 + 22

+	    new TestResult(0, -400452617319088653057.27510289m), // 13 + 23

+	    new TestResult(0, -400453572499152263296.22495289m), // 13 + 24

+	    new TestResult(0, -399844119084680480268.18965477m), // 13 + 25

+	    new TestResult(2, -42935506372985358362087.372532m), // 13 + 26

+	    new TestResult(2, -8208727582257324503458.215976m), // 13 + 27

+	    new TestResult(2, 1037807226351213371958663499.4m), // 13 + 28

+	    new TestResult(0, -400453059670368518938.78339695m), // 13 + 29

+	    new TestResult(0, 222851627785191714190050.61676m), // 14 + 0

+	    new TestResult(0, 222851627785191714190051.61676m), // 14 + 1

+	    new TestResult(0, 222851627785191714190049.61676m), // 14 + 2

+	    new TestResult(0, 222851627785191714190052.61676m), // 14 + 3

+	    new TestResult(0, 222851627785191714190060.61676m), // 14 + 4

+	    new TestResult(0, 222851627785191714190050.71676m), // 14 + 5

+	    new TestResult(1, 0m), // 14 + 6

+	    new TestResult(2, -79227939662636552401829760284m), // 14 + 7

+	    new TestResult(2, 27926154094877152323521930.149m), // 14 + 8

+	    new TestResult(0, 222851627785191710986195.66076m), // 14 + 9

+	    new TestResult(0, 174384757341002840393630.58789m), // 14 + 10

+	    new TestResult(0, 222851082591498471385256.31345m), // 14 + 11

+	    new TestResult(0, 222851627785191714190051.37968m), // 14 + 12

+	    new TestResult(0, 222451174725526342794078.28202m), // 14 + 13

+	    new TestResult(0, 445703255570383428380101.23352m), // 14 + 14

+	    new TestResult(2, 14468895006989344927851386.201m), // 14 + 15

+	    new TestResult(0, 222851627785191713768927.3123m), // 14 + 16

+	    new TestResult(0, 222851652248480452489595.81727m), // 14 + 17

+	    new TestResult(2, -5100407526051194198507725.3842m), // 14 + 18

+	    new TestResult(2, 103023917827591026438863219.81m), // 14 + 19

+	    new TestResult(0, 222851627785198795510810.99609m), // 14 + 20

+	    new TestResult(0, 222851627785607466463990.3938m), // 14 + 21

+	    new TestResult(0, 222851627778802321700157.98049m), // 14 + 22

+	    new TestResult(0, 222851628227537996932965.6764m), // 14 + 23

+	    new TestResult(0, 222851627272357933322726.72655m), // 14 + 24

+	    new TestResult(0, 222852236725772405105754.76185m), // 14 + 25

+	    new TestResult(0, 180316574471871727223935.57897m), // 14 + 26

+	    new TestResult(0, 215043353262599761082564.73553m), // 14 + 27

+	    new TestResult(2, 1038030478432058229044249522.3m), // 14 + 28

+	    new TestResult(0, 222851627785186717067084.16811m), // 14 + 29

+	    new TestResult(0, 14246043379204153213661335.584m), // 15 + 0

+	    new TestResult(0, 14246043379204153213661336.584m), // 15 + 1

+	    new TestResult(0, 14246043379204153213661334.584m), // 15 + 2

+	    new TestResult(0, 14246043379204153213661337.584m), // 15 + 3

+	    new TestResult(0, 14246043379204153213661345.584m), // 15 + 4

+	    new TestResult(0, 14246043379204153213661335.684m), // 15 + 5

+	    new TestResult(1, 0m), // 15 + 6

+	    new TestResult(2, -79213916470885133440330288999m), // 15 + 7

+	    new TestResult(0, 41949345846296113822993215.116m), // 15 + 8

+	    new TestResult(0, 14246043379204153210457480.628m), // 15 + 9

+	    new TestResult(0, 14197576508759964339864915.555m), // 15 + 10

+	    new TestResult(0, 14246042834010459970856541.281m), // 15 + 11

+	    new TestResult(0, 14246043379204153213661336.347m), // 15 + 12

+	    new TestResult(0, 14245642926144487842265363.249m), // 15 + 13

+	    new TestResult(0, 14468895006989344927851386.201m), // 15 + 14

+	    new TestResult(0, 28492086758408306427322671.168m), // 15 + 15

+	    new TestResult(0, 14246043379204153213240212.28m), // 15 + 16

+	    new TestResult(0, 14246043403667441951960880.785m), // 15 + 17

+	    new TestResult(0, 8922784225367767300963559.583m), // 15 + 18

+	    new TestResult(2, 117047109579009987938334504.77m), // 15 + 19

+	    new TestResult(0, 14246043379204160294982095.963m), // 15 + 20

+	    new TestResult(0, 14246043379204568965935275.361m), // 15 + 21

+	    new TestResult(0, 14246043379197763821171442.948m), // 15 + 22

+	    new TestResult(0, 14246043379646499496404250.644m), // 15 + 23

+	    new TestResult(0, 14246043378691319432794011.694m), // 15 + 24

+	    new TestResult(0, 14246043988144733904577039.729m), // 15 + 25

+	    new TestResult(0, 14203508325890833226695220.546m), // 15 + 26

+	    new TestResult(0, 14238235104681561260553849.703m), // 15 + 27

+	    new TestResult(2, 1052053670183477190543720807.3m), // 15 + 28

+	    new TestResult(0, 14246043379204148216538369.135m), // 15 + 29

+	    new TestResult(0, -421123.30446308691436596648186m), // 16 + 0

+	    new TestResult(0, -421122.30446308691436596648186m), // 16 + 1

+	    new TestResult(0, -421124.30446308691436596648186m), // 16 + 2

+	    new TestResult(0, -421121.30446308691436596648186m), // 16 + 3

+	    new TestResult(0, -421113.30446308691436596648186m), // 16 + 4

+	    new TestResult(0, -421123.20446308691436596648186m), // 16 + 5

+	    new TestResult(2, 79228162514264337593543529212m), // 16 + 6

+	    new TestResult(1, 0m), // 16 + 7

+	    new TestResult(2, 27703302467091960608910756.228m), // 16 + 8

+	    new TestResult(2, -3624978.2604599050636173049837m), // 16 + 9

+	    new TestResult(2, -48466870444188874217543.333331m), // 16 + 10

+	    new TestResult(2, -545193693243225917.60777683367m), // 16 + 11

+	    new TestResult(0, -421122.54153968158049178549261m), // 16 + 12

+	    new TestResult(2, -400453059665371817095.63920761m), // 16 + 13

+	    new TestResult(2, 222851627785191713768927.3123m), // 16 + 14

+	    new TestResult(2, 14246043379204153213240212.28m), // 16 + 15

+	    new TestResult(2, -842246.6089261738287319329637m), // 16 + 16

+	    new TestResult(2, 24463288737878421.896045811728m), // 16 + 17

+	    new TestResult(2, -5323259153836385913118899.3055m), // 16 + 18

+	    new TestResult(2, 102801066199805834724252045.89m), // 16 + 19

+	    new TestResult(2, 7080899637.0748656305557268303m), // 16 + 20

+	    new TestResult(2, 415751852816.47257936965400444m), // 16 + 21

+	    new TestResult(2, -6389392911015.9407304539964122m), // 16 + 22

+	    new TestResult(2, 442346282321791.75517854615373m), // 16 + 23

+	    new TestResult(2, -512833781288447.19467146135201m), // 16 + 24

+	    new TestResult(2, 608940580690494580.84062666449m), // 16 + 25

+	    new TestResult(2, -42535053313319987387238.34225m), // 16 + 26

+	    new TestResult(2, -7808274522591953528609.1856942m), // 16 + 27

+	    new TestResult(2, 1037807626804273037329638348.4m), // 16 + 28

+	    new TestResult(2, -4997544089.7531155126859290085m), // 16 + 29

+	    new TestResult(0, 24463288738299545.200508898642m), // 17 + 0

+	    new TestResult(0, 24463288738299546.200508898642m), // 17 + 1

+	    new TestResult(0, 24463288738299544.200508898642m), // 17 + 2

+	    new TestResult(0, 24463288738299547.200508898642m), // 17 + 3

+	    new TestResult(0, 24463288738299555.200508898642m), // 17 + 4

+	    new TestResult(0, 24463288738299545.300508898642m), // 17 + 5

+	    new TestResult(1, 0m), // 17 + 6

+	    new TestResult(2, -79228162514239874304805650790m), // 17 + 7

+	    new TestResult(2, 27703302491555249347631424.733m), // 17 + 8

+	    new TestResult(0, 24463288735095690.244512080493m), // 17 + 9

+	    new TestResult(2, -48466845980900135496874.828359m), // 17 + 10

+	    new TestResult(2, -520730404504505249.10280484812m), // 17 + 11

+	    new TestResult(0, 24463288738299545.963432303976m), // 17 + 12

+	    new TestResult(2, -400428596376633096427.13423562m), // 17 + 13

+	    new TestResult(2, 222851652248480452489595.81727m), // 17 + 14

+	    new TestResult(2, 14246043403667441951960880.785m), // 17 + 15

+	    new TestResult(0, 24463288737878421.896045811728m), // 17 + 16

+	    new TestResult(0, 48926577476599090.401017797284m), // 17 + 17

+	    new TestResult(2, -5323259129373097174398230.8005m), // 17 + 18

+	    new TestResult(2, 102801066224269123462972714.39m), // 17 + 19

+	    new TestResult(0, 24463295819620305.579837616112m), // 17 + 20

+	    new TestResult(0, 24463704490573484.97755135521m), // 17 + 21

+	    new TestResult(0, 24456899345809652.56424153156m), // 17 + 22

+	    new TestResult(0, 24905635021042460.26015053171m), // 17 + 23

+	    new TestResult(0, 23950454957432221.310300524204m), // 17 + 24

+	    new TestResult(2, 633403869429215249.34559865004m), // 17 + 25

+	    new TestResult(2, -42535028850031248666569.837278m), // 17 + 26

+	    new TestResult(2, -7808250059303214807940.6807222m), // 17 + 27

+	    new TestResult(2, 1037807626828736326068359016.9m), // 17 + 28

+	    new TestResult(0, 24463283741176578.75185647287m), // 17 + 29

+	    new TestResult(0, -5323259153836385912697776.001m), // 18 + 0

+	    new TestResult(0, -5323259153836385912697775.001m), // 18 + 1

+	    new TestResult(0, -5323259153836385912697777.001m), // 18 + 2

+	    new TestResult(0, -5323259153836385912697774.001m), // 18 + 3

+	    new TestResult(0, -5323259153836385912697766.001m), // 18 + 4

+	    new TestResult(0, -5323259153836385912697775.901m), // 18 + 5

+	    new TestResult(2, 79222839255110501207631252559m), // 18 + 6

+	    new TestResult(1, 0m), // 18 + 7

+	    new TestResult(0, 22380043313255574696634103.531m), // 18 + 8

+	    new TestResult(0, -5323259153836385915901630.957m), // 18 + 9

+	    new TestResult(0, -5371726024280574786494196.0299m), // 18 + 10

+	    new TestResult(0, -5323259699030079155502570.3043m), // 18 + 11

+	    new TestResult(0, -5323259153836385912697775.2381m), // 18 + 12

+	    new TestResult(0, -5323659606896051284093748.3357m), // 18 + 13

+	    new TestResult(0, -5100407526051194198507725.3842m), // 18 + 14

+	    new TestResult(0, 8922784225367767300963559.583m), // 18 + 15

+	    new TestResult(0, -5323259153836385913118899.3055m), // 18 + 16

+	    new TestResult(0, -5323259129373097174398230.8005m), // 18 + 17

+	    new TestResult(0, -10646518307672771825395552.002m), // 18 + 18

+	    new TestResult(2, 97477807045969448811975393.19m), // 18 + 19

+	    new TestResult(0, -5323259153836378831377015.6217m), // 18 + 20

+	    new TestResult(0, -5323259153835970160423836.224m), // 18 + 21

+	    new TestResult(0, -5323259153842775305187668.6373m), // 18 + 22

+	    new TestResult(0, -5323259153394039629954860.9414m), // 18 + 23

+	    new TestResult(0, -5323259154349219693565099.8912m), // 18 + 24

+	    new TestResult(0, -5323258544895805221782071.8559m), // 18 + 25

+	    new TestResult(0, -5365794207149705899663891.0388m), // 18 + 26

+	    new TestResult(0, -5331067428358977865805261.8822m), // 18 + 27

+	    new TestResult(2, 1032484367650436651417361695.7m), // 18 + 28

+	    new TestResult(0, -5323259153836390909820742.4497m), // 18 + 29

+	    new TestResult(0, 102801066199805834724673169.19m), // 19 + 0

+	    new TestResult(0, 102801066199805834724673170.19m), // 19 + 1

+	    new TestResult(0, 102801066199805834724673168.19m), // 19 + 2

+	    new TestResult(0, 102801066199805834724673171.19m), // 19 + 3

+	    new TestResult(0, 102801066199805834724673179.19m), // 19 + 4

+	    new TestResult(0, 102801066199805834724673169.29m), // 19 + 5

+	    new TestResult(1, 0m), // 19 + 6

+	    new TestResult(2, -79125361448064531758819277166m), // 19 + 7

+	    new TestResult(0, 130504368666897795334005048.72m), // 19 + 8

+	    new TestResult(0, 102801066199805834721469314.23m), // 19 + 9

+	    new TestResult(0, 102752599329361645850876749.16m), // 19 + 10

+	    new TestResult(0, 102801065654612141481868374.89m), // 19 + 11

+	    new TestResult(0, 102801066199805834724673169.95m), // 19 + 12

+	    new TestResult(0, 102800665746746169353277196.86m), // 19 + 13

+	    new TestResult(0, 103023917827591026438863219.81m), // 19 + 14

+	    new TestResult(0, 117047109579009987938334504.77m), // 19 + 15

+	    new TestResult(0, 102801066199805834724252045.89m), // 19 + 16

+	    new TestResult(0, 102801066224269123462972714.39m), // 19 + 17

+	    new TestResult(0, 97477807045969448811975393.19m), // 19 + 18

+	    new TestResult(0, 205602132399611669449346338.38m), // 19 + 19

+	    new TestResult(0, 102801066199805841805993929.57m), // 19 + 20

+	    new TestResult(0, 102801066199806250476947108.97m), // 19 + 21

+	    new TestResult(0, 102801066199799445332183276.55m), // 19 + 22

+	    new TestResult(0, 102801066200248181007416084.25m), // 19 + 23

+	    new TestResult(0, 102801066199293000943805845.3m), // 19 + 24

+	    new TestResult(0, 102801066808746415415588873.34m), // 19 + 25

+	    new TestResult(0, 102758531146492514737707054.15m), // 19 + 26

+	    new TestResult(0, 102793257925283242771565683.31m), // 19 + 27

+	    new TestResult(2, 1140608693004078872054732640.9m), // 19 + 28

+	    new TestResult(0, 102801066199805829727550202.74m), // 19 + 29

+	    new TestResult(0, 7081320760.3793287174700927968m), // 20 + 0

+	    new TestResult(0, 7081320761.3793287174700927968m), // 20 + 1

+	    new TestResult(0, 7081320759.3793287174700927968m), // 20 + 2

+	    new TestResult(0, 7081320762.3793287174700927968m), // 20 + 3

+	    new TestResult(0, 7081320770.3793287174700927968m), // 20 + 4

+	    new TestResult(0, 7081320760.4793287174700927968m), // 20 + 5

+	    new TestResult(1, 0m), // 20 + 6

+	    new TestResult(2, -79228162514264337586462629575m), // 20 + 7

+	    new TestResult(2, 27703302467091967690652639.911m), // 20 + 8

+	    new TestResult(0, 7078116905.4233318993208414583m), // 20 + 9

+	    new TestResult(2, -48466870444181792475659.649539m), // 20 + 10

+	    new TestResult(2, -545193686161484033.92398502929m), // 20 + 11

+	    new TestResult(0, 7081320761.1422521228039669778m), // 20 + 12

+	    new TestResult(2, -400453059658290075211.9554158m), // 20 + 13

+	    new TestResult(2, 222851627785198795510810.99609m), // 20 + 14

+	    new TestResult(2, 14246043379204160294982095.963m), // 20 + 15

+	    new TestResult(0, 7080899637.0748656305557268303m), // 20 + 16

+	    new TestResult(2, 24463295819620305.579837616112m), // 20 + 17

+	    new TestResult(2, -5323259153836378831377015.6217m), // 20 + 18

+	    new TestResult(2, 102801066199805841805993929.57m), // 20 + 19

+	    new TestResult(2, 14162641520.758657434940185594m), // 20 + 20

+	    new TestResult(2, 422833594700.15637117403846321m), // 20 + 21

+	    new TestResult(2, -6382311169132.2569386496119534m), // 20 + 22

+	    new TestResult(2, 442353364063675.43897035053819m), // 20 + 23

+	    new TestResult(2, -512826699546563.51087965696755m), // 20 + 24

+	    new TestResult(2, 608940587772236464.52441846887m), // 20 + 25

+	    new TestResult(2, -42535053313312905645354.658458m), // 20 + 26

+	    new TestResult(2, -7808274522584871786725.5019024m), // 20 + 27

+	    new TestResult(2, 1037807626804273044411380232.1m), // 20 + 28

+	    new TestResult(0, 2084197793.9306762916985297548m), // 20 + 29

+	    new TestResult(0, 415752273939.77704245656837041m), // 21 + 0

+	    new TestResult(0, 415752273940.77704245656837041m), // 21 + 1

+	    new TestResult(0, 415752273938.77704245656837041m), // 21 + 2

+	    new TestResult(0, 415752273941.77704245656837041m), // 21 + 3

+	    new TestResult(0, 415752273949.77704245656837041m), // 21 + 4

+	    new TestResult(0, 415752273939.87704245656837041m), // 21 + 5

+	    new TestResult(1, 0m), // 21 + 6

+	    new TestResult(2, -79228162514264337177791676395m), // 21 + 7

+	    new TestResult(2, 27703302467092376361605819.309m), // 21 + 8

+	    new TestResult(0, 415749070084.82104563841911907m), // 21 + 9

+	    new TestResult(2, -48466870443773121522480.251826m), // 21 + 10

+	    new TestResult(2, -545193277490530854.52627129019m), // 21 + 11

+	    new TestResult(0, 415752273940.53996586190224459m), // 21 + 12

+	    new TestResult(2, -400453059249619122032.55770206m), // 21 + 13

+	    new TestResult(2, 222851627785607466463990.3938m), // 21 + 14

+	    new TestResult(2, 14246043379204568965935275.361m), // 21 + 15

+	    new TestResult(0, 415751852816.47257936965400444m), // 21 + 16

+	    new TestResult(2, 24463704490573484.97755135521m), // 21 + 17

+	    new TestResult(2, -5323259153835970160423836.224m), // 21 + 18

+	    new TestResult(2, 102801066199806250476947108.97m), // 21 + 19

+	    new TestResult(0, 422833594700.15637117403846321m), // 21 + 20

+	    new TestResult(2, 831504547879.5540849131367408m), // 21 + 21

+	    new TestResult(2, -5973640215952.8592249105136758m), // 21 + 22

+	    new TestResult(2, 442762035016854.83668408963647m), // 21 + 23

+	    new TestResult(2, -512418028593384.11316591786927m), // 21 + 24

+	    new TestResult(2, 608940996443189643.92213220797m), // 21 + 25

+	    new TestResult(2, -42535053312904234692175.260745m), // 21 + 26

+	    new TestResult(2, -7808274522176200833546.1041886m), // 21 + 27

+	    new TestResult(2, 1037807626804273453082333411.5m), // 21 + 28

+	    new TestResult(0, 410755150973.32839003079680737m), // 21 + 29

+	    new TestResult(0, -6389392489892.6362673670820462m), // 22 + 0

+	    new TestResult(0, -6389392489891.6362673670820462m), // 22 + 1

+	    new TestResult(0, -6389392489893.6362673670820462m), // 22 + 2

+	    new TestResult(0, -6389392489890.6362673670820462m), // 22 + 3

+	    new TestResult(0, -6389392489882.6362673670820462m), // 22 + 4

+	    new TestResult(0, -6389392489892.5362673670820462m), // 22 + 5

+	    new TestResult(2, 79228162514264331204151460442m), // 22 + 6

+	    new TestResult(1, 0m), // 22 + 7

+	    new TestResult(2, 27703302467085571216841986.896m), // 22 + 8

+	    new TestResult(0, -6389395693747.5922641852312975m), // 22 + 9

+	    new TestResult(2, -48466870450578266286312.665135m), // 22 + 10

+	    new TestResult(2, -545200082635294686.93958111384m), // 22 + 11

+	    new TestResult(0, -6389392489891.873343961748172m), // 22 + 12

+	    new TestResult(2, -400453066054763885864.97101189m), // 22 + 13

+	    new TestResult(2, 222851627778802321700157.98049m), // 22 + 14

+	    new TestResult(2, 14246043379197763821171442.948m), // 22 + 15

+	    new TestResult(0, -6389392911015.9407304539964122m), // 22 + 16

+	    new TestResult(2, 24456899345809652.56424153156m), // 22 + 17

+	    new TestResult(2, -5323259153842775305187668.6373m), // 22 + 18

+	    new TestResult(2, 102801066199799445332183276.55m), // 22 + 19

+	    new TestResult(0, -6382311169132.2569386496119534m), // 22 + 20

+	    new TestResult(0, -5973640215952.8592249105136758m), // 22 + 21

+	    new TestResult(2, -12778784979785.272534734164092m), // 22 + 22

+	    new TestResult(2, 435956890253022.42337426598605m), // 22 + 23

+	    new TestResult(2, -519223173357216.52647574151969m), // 22 + 24

+	    new TestResult(2, 608934191298425811.50882238432m), // 22 + 25

+	    new TestResult(2, -42535053319709379456007.674054m), // 22 + 26

+	    new TestResult(2, -7808274528981345597378.5174985m), // 22 + 27

+	    new TestResult(2, 1037807626804266647937569579.1m), // 22 + 28

+	    new TestResult(0, -6394389612859.0849197928536092m), // 22 + 29

+	    new TestResult(0, 442346282742915.0596416330681m), // 23 + 0

+	    new TestResult(0, 442346282742916.0596416330681m), // 23 + 1

+	    new TestResult(0, 442346282742914.0596416330681m), // 23 + 2

+	    new TestResult(0, 442346282742917.0596416330681m), // 23 + 3

+	    new TestResult(0, 442346282742925.0596416330681m), // 23 + 4

+	    new TestResult(0, 442346282742915.1596416330681m), // 23 + 5

+	    new TestResult(1, 0m), // 23 + 6

+	    new TestResult(2, -79228162514263895247261207420m), // 23 + 7

+	    new TestResult(2, 27703302467534306892074794.592m), // 23 + 8

+	    new TestResult(0, 442346279539060.10364481491885m), // 23 + 9

+	    new TestResult(2, -48466870001842591053504.969226m), // 23 + 10

+	    new TestResult(2, -544751346960061879.24367211369m), // 23 + 11

+	    new TestResult(0, 442346282742915.82256503840197m), // 23 + 12

+	    new TestResult(2, -400452617319088653057.27510289m), // 23 + 13

+	    new TestResult(2, 222851628227537996932965.6764m), // 23 + 14

+	    new TestResult(2, 14246043379646499496404250.644m), // 23 + 15

+	    new TestResult(0, 442346282321791.75517854615373m), // 23 + 16

+	    new TestResult(2, 24905635021042460.26015053171m), // 23 + 17

+	    new TestResult(2, -5323259153394039629954860.9414m), // 23 + 18

+	    new TestResult(2, 102801066200248181007416084.25m), // 23 + 19

+	    new TestResult(0, 442353364063675.43897035053819m), // 23 + 20

+	    new TestResult(0, 442762035016854.83668408963647m), // 23 + 21

+	    new TestResult(0, 435956890253022.42337426598605m), // 23 + 22

+	    new TestResult(0, 884692565485830.1192832661362m), // 23 + 23

+	    new TestResult(0, -70487498124408.83056674136954m), // 23 + 24

+	    new TestResult(2, 609382926973658619.20473138447m), // 23 + 25

+	    new TestResult(2, -42535052870973704223199.978145m), // 23 + 26

+	    new TestResult(2, -7808274080245670364570.8215895m), // 23 + 27

+	    new TestResult(2, 1037807626804715383612802386.8m), // 23 + 28

+	    new TestResult(0, 442341285619948.61098920729654m), // 23 + 29

+	    new TestResult(0, -512833780867323.89020837443764m), // 24 + 0

+	    new TestResult(0, -512833780867322.89020837443764m), // 24 + 1

+	    new TestResult(0, -512833780867324.89020837443764m), // 24 + 2

+	    new TestResult(0, -512833780867321.89020837443764m), // 24 + 3

+	    new TestResult(0, -512833780867313.89020837443764m), // 24 + 4

+	    new TestResult(0, -512833780867323.79020837443764m), // 24 + 5

+	    new TestResult(2, 79228162514263824759763083011m), // 24 + 6

+	    new TestResult(1, 0m), // 24 + 7

+	    new TestResult(2, 27703302466579126828464555.642m), // 24 + 8

+	    new TestResult(0, -512833784071178.84620519258689m), // 24 + 9

+	    new TestResult(2, -48466870957022654663743.919076m), // 24 + 10

+	    new TestResult(2, -545706527023672118.1935221212m), // 24 + 11

+	    new TestResult(0, -512833780867323.12728496910377m), // 24 + 12

+	    new TestResult(2, -400453572499152263296.22495289m), // 24 + 13

+	    new TestResult(2, 222851627272357933322726.72655m), // 24 + 14

+	    new TestResult(2, 14246043378691319432794011.694m), // 24 + 15

+	    new TestResult(0, -512833781288447.19467146135201m), // 24 + 16

+	    new TestResult(2, 23950454957432221.310300524204m), // 24 + 17

+	    new TestResult(2, -5323259154349219693565099.8912m), // 24 + 18

+	    new TestResult(2, 102801066199293000943805845.3m), // 24 + 19

+	    new TestResult(0, -512826699546563.51087965696755m), // 24 + 20

+	    new TestResult(0, -512418028593384.11316591786927m), // 24 + 21

+	    new TestResult(0, -519223173357216.52647574151969m), // 24 + 22

+	    new TestResult(0, -70487498124408.83056674136954m), // 24 + 23

+	    new TestResult(2, -1025667561734647.7804167488753m), // 24 + 24

+	    new TestResult(2, 608427746910048380.25488137696m), // 24 + 25

+	    new TestResult(2, -42535053826153767833438.927995m), // 24 + 26

+	    new TestResult(2, -7808275035425733974809.7714395m), // 24 + 27

+	    new TestResult(2, 1037807626803760203549192147.8m), // 24 + 28

+	    new TestResult(0, -512838777990290.3388608002092m), // 24 + 29

+	    new TestResult(0, 608940580690915704.1450897514m), // 25 + 0

+	    new TestResult(0, 608940580690915705.1450897514m), // 25 + 1

+	    new TestResult(0, 608940580690915703.1450897514m), // 25 + 2

+	    new TestResult(0, 608940580690915706.1450897514m), // 25 + 3

+	    new TestResult(0, 608940580690915714.1450897514m), // 25 + 4

+	    new TestResult(0, 608940580690915704.2450897514m), // 25 + 5

+	    new TestResult(1, 0m), // 25 + 6

+	    new TestResult(2, -79228162513655397012853034631m), // 25 + 7

+	    new TestResult(2, 27703303076032541300247583.677m), // 25 + 8

+	    new TestResult(0, 608940580687711849.18909293325m), // 25 + 9

+	    new TestResult(2, -48466261503608182880715.883778m), // 25 + 10

+	    new TestResult(0, 63746887448110909.84177600464m), // 25 + 11

+	    new TestResult(0, 608940580690915704.90801315673m), // 25 + 12

+	    new TestResult(2, -399844119084680480268.18965477m), // 25 + 13

+	    new TestResult(2, 222852236725772405105754.76185m), // 25 + 14

+	    new TestResult(2, 14246043988144733904577039.729m), // 25 + 15

+	    new TestResult(0, 608940580690494580.84062666449m), // 25 + 16

+	    new TestResult(0, 633403869429215249.34559865004m), // 25 + 17

+	    new TestResult(2, -5323258544895805221782071.8559m), // 25 + 18

+	    new TestResult(2, 102801066808746415415588873.34m), // 25 + 19

+	    new TestResult(0, 608940587772236464.52441846887m), // 25 + 20

+	    new TestResult(0, 608940996443189643.92213220797m), // 25 + 21

+	    new TestResult(0, 608934191298425811.50882238432m), // 25 + 22

+	    new TestResult(0, 609382926973658619.20473138447m), // 25 + 23

+	    new TestResult(0, 608427746910048380.25488137696m), // 25 + 24

+	    new TestResult(0, 1217881161381831408.2901795028m), // 25 + 25

+	    new TestResult(2, -42534444372739296050410.892697m), // 25 + 26

+	    new TestResult(2, -7807665582011262191781.7361413m), // 25 + 27

+	    new TestResult(2, 1037807627413213618020975175.8m), // 25 + 28

+	    new TestResult(0, 608940575693792737.69643732563m), // 25 + 29

+	    new TestResult(0, -42535053313319986966115.037787m), // 26 + 0

+	    new TestResult(0, -42535053313319986966114.037787m), // 26 + 1

+	    new TestResult(0, -42535053313319986966116.037787m), // 26 + 2

+	    new TestResult(0, -42535053313319986966113.037787m), // 26 + 3

+	    new TestResult(0, -42535053313319986966105.037787m), // 26 + 4

+	    new TestResult(0, -42535053313319986966114.937787m), // 26 + 5

+	    new TestResult(2, 79228119979211024273556984220m), // 26 + 6

+	    new TestResult(1, 0m), // 26 + 7

+	    new TestResult(2, 27660767413778640622365764.494m), // 26 + 8

+	    new TestResult(0, -42535053313319990169969.993784m), // 26 + 9

+	    new TestResult(2, -91001923757508860762535.06666m), // 26 + 10

+	    new TestResult(0, -42535598507013229770909.341101m), // 26 + 11

+	    new TestResult(0, -42535053313319986966114.274864m), // 26 + 12

+	    new TestResult(0, -42935506372985358362087.372532m), // 26 + 13

+	    new TestResult(2, 180316574471871727223935.57897m), // 26 + 14

+	    new TestResult(2, 14203508325890833226695220.546m), // 26 + 15

+	    new TestResult(0, -42535053313319987387238.34225m), // 26 + 16

+	    new TestResult(0, -42535028850031248666569.837278m), // 26 + 17

+	    new TestResult(2, -5365794207149705899663891.0388m), // 26 + 18

+	    new TestResult(2, 102758531146492514737707054.15m), // 26 + 19

+	    new TestResult(0, -42535053313312905645354.658458m), // 26 + 20

+	    new TestResult(0, -42535053312904234692175.260745m), // 26 + 21

+	    new TestResult(0, -42535053319709379456007.674054m), // 26 + 22

+	    new TestResult(0, -42535052870973704223199.978145m), // 26 + 23

+	    new TestResult(0, -42535053826153767833438.927995m), // 26 + 24

+	    new TestResult(0, -42534444372739296050410.892697m), // 26 + 25

+	    new TestResult(2, -85070106626639973932230.07557m), // 26 + 26

+	    new TestResult(0, -50343327835911940073600.919018m), // 26 + 27

+	    new TestResult(2, 1037765091750959717343093356.7m), // 26 + 28

+	    new TestResult(0, -42535053313324984089081.486439m), // 26 + 29

+	    new TestResult(0, -7808274522591953107485.8812311m), // 27 + 0

+	    new TestResult(0, -7808274522591953107484.8812311m), // 27 + 1

+	    new TestResult(0, -7808274522591953107486.8812311m), // 27 + 2

+	    new TestResult(0, -7808274522591953107483.8812311m), // 27 + 3

+	    new TestResult(0, -7808274522591953107475.8812311m), // 27 + 4

+	    new TestResult(0, -7808274522591953107485.7812311m), // 27 + 5

+	    new TestResult(2, 79228154705989815001590842849m), // 27 + 6

+	    new TestResult(1, 0m), // 27 + 7

+	    new TestResult(2, 27695494192569368656224393.651m), // 27 + 8

+	    new TestResult(0, -7808274522591956311340.8372279m), // 27 + 9

+	    new TestResult(2, -56275144966780826903905.910099m), // 27 + 10

+	    new TestResult(0, -7808819716285195912280.1845448m), // 27 + 11

+	    new TestResult(0, -7808274522591953107485.1183077m), // 27 + 12

+	    new TestResult(2, -8208727582257324503458.215976m), // 27 + 13

+	    new TestResult(2, 215043353262599761082564.73553m), // 27 + 14

+	    new TestResult(2, 14238235104681561260553849.703m), // 27 + 15

+	    new TestResult(0, -7808274522591953528609.1856942m), // 27 + 16

+	    new TestResult(0, -7808250059303214807940.6807222m), // 27 + 17

+	    new TestResult(2, -5331067428358977865805261.8822m), // 27 + 18

+	    new TestResult(2, 102793257925283242771565683.31m), // 27 + 19

+	    new TestResult(0, -7808274522584871786725.5019024m), // 27 + 20

+	    new TestResult(0, -7808274522176200833546.1041886m), // 27 + 21

+	    new TestResult(0, -7808274528981345597378.5174985m), // 27 + 22

+	    new TestResult(0, -7808274080245670364570.8215895m), // 27 + 23

+	    new TestResult(0, -7808275035425733974809.7714395m), // 27 + 24

+	    new TestResult(0, -7807665582011262191781.7361413m), // 27 + 25

+	    new TestResult(2, -50343327835911940073600.919018m), // 27 + 26

+	    new TestResult(2, -15616549045183906214971.762462m), // 27 + 27

+	    new TestResult(2, 1037799818529750445376951985.8m), // 27 + 28

+	    new TestResult(0, -7808274522596950230452.3298835m), // 27 + 29

+	    new TestResult(0, 1037807626804273037330059471.7m), // 28 + 0

+	    new TestResult(0, 1037807626804273037330059472.7m), // 28 + 1

+	    new TestResult(0, 1037807626804273037330059470.7m), // 28 + 2

+	    new TestResult(0, 1037807626804273037330059473.7m), // 28 + 3

+	    new TestResult(0, 1037807626804273037330059481.7m), // 28 + 4

+	    new TestResult(0, 1037807626804273037330059471.8m), // 28 + 5

+	    new TestResult(1, 0m), // 28 + 6

+	    new TestResult(2, -78190354887460064556213890863m), // 28 + 7

+	    new TestResult(0, 1065510929271364997939391351.2m), // 28 + 8

+	    new TestResult(0, 1037807626804273037326855616.7m), // 28 + 9

+	    new TestResult(0, 1037759159933828848456263051.7m), // 28 + 10

+	    new TestResult(0, 1037807626259079344087254677.4m), // 28 + 11

+	    new TestResult(0, 1037807626804273037330059472.5m), // 28 + 12

+	    new TestResult(0, 1037807226351213371958663499.4m), // 28 + 13

+	    new TestResult(0, 1038030478432058229044249522.3m), // 28 + 14

+	    new TestResult(0, 1052053670183477190543720807.3m), // 28 + 15

+	    new TestResult(0, 1037807626804273037329638348.4m), // 28 + 16

+	    new TestResult(0, 1037807626828736326068359016.9m), // 28 + 17

+	    new TestResult(0, 1032484367650436651417361695.7m), // 28 + 18

+	    new TestResult(0, 1140608693004078872054732640.9m), // 28 + 19

+	    new TestResult(0, 1037807626804273044411380232.1m), // 28 + 20

+	    new TestResult(0, 1037807626804273453082333411.5m), // 28 + 21

+	    new TestResult(0, 1037807626804266647937569579.1m), // 28 + 22

+	    new TestResult(0, 1037807626804715383612802386.8m), // 28 + 23

+	    new TestResult(0, 1037807626803760203549192147.8m), // 28 + 24

+	    new TestResult(0, 1037807627413213618020975175.8m), // 28 + 25

+	    new TestResult(0, 1037765091750959717343093356.7m), // 28 + 26

+	    new TestResult(0, 1037799818529750445376951985.8m), // 28 + 27

+	    new TestResult(0, 2075615253608546074660118943.4m), // 28 + 28

+	    new TestResult(0, 1037807626804273032332936505.3m), // 28 + 29

+	    new TestResult(0, -4997122966.448652425771563042m), // 29 + 0

+	    new TestResult(0, -4997122965.448652425771563042m), // 29 + 1

+	    new TestResult(0, -4997122967.448652425771563042m), // 29 + 2

+	    new TestResult(0, -4997122964.448652425771563042m), // 29 + 3

+	    new TestResult(0, -4997122956.448652425771563042m), // 29 + 4

+	    new TestResult(0, -4997122966.348652425771563042m), // 29 + 5

+	    new TestResult(2, 79228162514264337588546827369m), // 29 + 6

+	    new TestResult(1, 0m), // 29 + 7

+	    new TestResult(2, 27703302467091955612208913.083m), // 29 + 8

+	    new TestResult(0, -5000326821.4046492439208143805m), // 29 + 9

+	    new TestResult(2, -48466870444193870919386.47752m), // 29 + 10

+	    new TestResult(2, -545193698239927760.75196617253m), // 29 + 11

+	    new TestResult(0, -4997122965.685729020437688861m), // 29 + 12

+	    new TestResult(2, -400453059670368518938.78339695m), // 29 + 13

+	    new TestResult(2, 222851627785186717067084.16811m), // 29 + 14

+	    new TestResult(2, 14246043379204148216538369.135m), // 29 + 15

+	    new TestResult(0, -4997544089.7531155126859290085m), // 29 + 16

+	    new TestResult(2, 24463283741176578.75185647287m), // 29 + 17

+	    new TestResult(2, -5323259153836390909820742.4497m), // 29 + 18

+	    new TestResult(2, 102801066199805829727550202.74m), // 29 + 19

+	    new TestResult(0, 2084197793.9306762916985297548m), // 29 + 20

+	    new TestResult(2, 410755150973.32839003079680737m), // 29 + 21

+	    new TestResult(2, -6394389612859.0849197928536092m), // 29 + 22

+	    new TestResult(2, 442341285619948.61098920729654m), // 29 + 23

+	    new TestResult(2, -512838777990290.3388608002092m), // 29 + 24

+	    new TestResult(2, 608940575693792737.69643732563m), // 29 + 25

+	    new TestResult(2, -42535053313324984089081.486439m), // 29 + 26

+	    new TestResult(2, -7808274522596950230452.3298835m), // 29 + 27

+	    new TestResult(2, 1037807626804273032332936505.3m), // 29 + 28

+	    new TestResult(0, -9994245932.897304851543126084m), // 29 + 29

+        };

+

+

+        // generated result list build2

+        TestResult[] trAuto_Mult_build2 = new TestResult[] {

+	    new TestResult(0, 0m), // 0 * 0

+	    new TestResult(0, 0m), // 0 * 1

+	    new TestResult(0, 0m), // 0 * 2

+	    new TestResult(0, 0m), // 0 * 3

+	    new TestResult(0, 0m), // 0 * 4

+	    new TestResult(0, 0m), // 0 * 5

+	    new TestResult(0, 0m), // 0 * 6

+	    new TestResult(0, 0m), // 0 * 7

+	    new TestResult(0, 0m), // 0 * 8

+	    new TestResult(0, 0m), // 0 * 9

+	    new TestResult(0, 0m), // 0 * 10

+	    new TestResult(0, 0m), // 0 * 11

+	    new TestResult(0, 0m), // 0 * 12

+	    new TestResult(0, 0m), // 0 * 13

+	    new TestResult(0, 0m), // 0 * 14

+	    new TestResult(0, 0m), // 0 * 15

+	    new TestResult(0, 0m), // 0 * 16

+	    new TestResult(0, 0m), // 0 * 17

+	    new TestResult(0, 0m), // 0 * 18

+	    new TestResult(0, 0m), // 0 * 19

+	    new TestResult(0, 0m), // 0 * 20

+	    new TestResult(0, 0m), // 0 * 21

+	    new TestResult(0, 0m), // 0 * 22

+	    new TestResult(0, 0m), // 0 * 23

+	    new TestResult(0, 0m), // 0 * 24

+	    new TestResult(0, 0m), // 0 * 25

+	    new TestResult(0, 0m), // 0 * 26

+	    new TestResult(0, 0m), // 0 * 27

+	    new TestResult(0, 0m), // 0 * 28

+	    new TestResult(0, 0m), // 0 * 29

+	    new TestResult(0, 0m), // 1 * 0

+	    new TestResult(0, 1m), // 1 * 1

+	    new TestResult(0, -1m), // 1 * 2

+	    new TestResult(0, 2m), // 1 * 3

+	    new TestResult(0, 10m), // 1 * 4

+	    new TestResult(0, 0.1m), // 1 * 5

+	    new TestResult(0, 79228162514264337593543950335m), // 1 * 6

+	    new TestResult(0, -79228162514264337593543950335m), // 1 * 7

+	    new TestResult(0, 27703302467091960609331879.532m), // 1 * 8

+	    new TestResult(0, -3203854.9559968181492513385018m), // 1 * 9

+	    new TestResult(0, -48466870444188873796420.028868m), // 1 * 10

+	    new TestResult(0, -545193693242804794.30331374676m), // 1 * 11

+	    new TestResult(0, 0.7629234053338741809892531431m), // 1 * 12

+	    new TestResult(0, -400453059665371395972.33474452m), // 1 * 13

+	    new TestResult(0, 222851627785191714190050.61676m), // 1 * 14

+	    new TestResult(0, 14246043379204153213661335.584m), // 1 * 15

+	    new TestResult(0, -421123.30446308691436596648186m), // 1 * 16

+	    new TestResult(0, 24463288738299545.200508898642m), // 1 * 17

+	    new TestResult(0, -5323259153836385912697776.001m), // 1 * 18

+	    new TestResult(0, 102801066199805834724673169.19m), // 1 * 19

+	    new TestResult(0, 7081320760.3793287174700927968m), // 1 * 20

+	    new TestResult(0, 415752273939.77704245656837041m), // 1 * 21

+	    new TestResult(0, -6389392489892.6362673670820462m), // 1 * 22

+	    new TestResult(0, 442346282742915.0596416330681m), // 1 * 23

+	    new TestResult(0, -512833780867323.89020837443764m), // 1 * 24

+	    new TestResult(0, 608940580690915704.1450897514m), // 1 * 25

+	    new TestResult(0, -42535053313319986966115.037787m), // 1 * 26

+	    new TestResult(0, -7808274522591953107485.8812311m), // 1 * 27

+	    new TestResult(0, 1037807626804273037330059471.7m), // 1 * 28

+	    new TestResult(0, -4997122966.448652425771563042m), // 1 * 29

+	    new TestResult(0, 0m), // 2 * 0

+	    new TestResult(0, -1m), // 2 * 1

+	    new TestResult(0, 1m), // 2 * 2

+	    new TestResult(0, -2m), // 2 * 3

+	    new TestResult(0, -10m), // 2 * 4

+	    new TestResult(0, -0.1m), // 2 * 5

+	    new TestResult(0, -79228162514264337593543950335m), // 2 * 6

+	    new TestResult(0, 79228162514264337593543950335m), // 2 * 7

+	    new TestResult(0, -27703302467091960609331879.532m), // 2 * 8

+	    new TestResult(0, 3203854.9559968181492513385018m), // 2 * 9

+	    new TestResult(0, 48466870444188873796420.028868m), // 2 * 10

+	    new TestResult(0, 545193693242804794.30331374676m), // 2 * 11

+	    new TestResult(0, -0.7629234053338741809892531431m), // 2 * 12

+	    new TestResult(0, 400453059665371395972.33474452m), // 2 * 13

+	    new TestResult(0, -222851627785191714190050.61676m), // 2 * 14

+	    new TestResult(0, -14246043379204153213661335.584m), // 2 * 15

+	    new TestResult(0, 421123.30446308691436596648186m), // 2 * 16

+	    new TestResult(0, -24463288738299545.200508898642m), // 2 * 17

+	    new TestResult(0, 5323259153836385912697776.001m), // 2 * 18

+	    new TestResult(0, -102801066199805834724673169.19m), // 2 * 19

+	    new TestResult(0, -7081320760.3793287174700927968m), // 2 * 20

+	    new TestResult(0, -415752273939.77704245656837041m), // 2 * 21

+	    new TestResult(0, 6389392489892.6362673670820462m), // 2 * 22

+	    new TestResult(0, -442346282742915.0596416330681m), // 2 * 23

+	    new TestResult(0, 512833780867323.89020837443764m), // 2 * 24

+	    new TestResult(0, -608940580690915704.1450897514m), // 2 * 25

+	    new TestResult(0, 42535053313319986966115.037787m), // 2 * 26

+	    new TestResult(0, 7808274522591953107485.8812311m), // 2 * 27

+	    new TestResult(0, -1037807626804273037330059471.7m), // 2 * 28

+	    new TestResult(0, 4997122966.448652425771563042m), // 2 * 29

+	    new TestResult(0, 0m), // 3 * 0

+	    new TestResult(0, 2m), // 3 * 1

+	    new TestResult(0, -2m), // 3 * 2

+	    new TestResult(0, 4m), // 3 * 3

+	    new TestResult(0, 20m), // 3 * 4

+	    new TestResult(0, 0.2m), // 3 * 5

+	    new TestResult(1, 0m), // 3 * 6

+	    new TestResult(1, 0m), // 3 * 7

+	    new TestResult(0, 55406604934183921218663759.064m), // 3 * 8

+	    new TestResult(0, -6407709.9119936362985026770036m), // 3 * 9

+	    new TestResult(2, -96933740888377747592840.05774m), // 3 * 10

+	    new TestResult(0, -1090387386485609588.6066274935m), // 3 * 11

+	    new TestResult(0, 1.5258468106677483619785062862m), // 3 * 12

+	    new TestResult(2, -800906119330742791944.669489m), // 3 * 13

+	    new TestResult(0, 445703255570383428380101.23352m), // 3 * 14

+	    new TestResult(0, 28492086758408306427322671.168m), // 3 * 15

+	    new TestResult(0, -842246.6089261738287319329637m), // 3 * 16

+	    new TestResult(0, 48926577476599090.401017797284m), // 3 * 17

+	    new TestResult(0, -10646518307672771825395552.002m), // 3 * 18

+	    new TestResult(0, 205602132399611669449346338.38m), // 3 * 19

+	    new TestResult(2, 14162641520.758657434940185594m), // 3 * 20

+	    new TestResult(0, 831504547879.5540849131367408m), // 3 * 21

+	    new TestResult(2, -12778784979785.272534734164092m), // 3 * 22

+	    new TestResult(0, 884692565485830.1192832661362m), // 3 * 23

+	    new TestResult(0, -1025667561734647.7804167488753m), // 3 * 24

+	    new TestResult(0, 1217881161381831408.2901795028m), // 3 * 25

+	    new TestResult(2, -85070106626639973932230.07557m), // 3 * 26

+	    new TestResult(0, -15616549045183906214971.762462m), // 3 * 27

+	    new TestResult(0, 2075615253608546074660118943.4m), // 3 * 28

+	    new TestResult(0, -9994245932.897304851543126084m), // 3 * 29

+	    new TestResult(0, 0m), // 4 * 0

+	    new TestResult(0, 10m), // 4 * 1

+	    new TestResult(0, -10m), // 4 * 2

+	    new TestResult(0, 20m), // 4 * 3

+	    new TestResult(0, 100m), // 4 * 4

+	    new TestResult(0, 1m), // 4 * 5

+	    new TestResult(1, 0m), // 4 * 6

+	    new TestResult(1, 0m), // 4 * 7

+	    new TestResult(0, 277033024670919606093318795.32m), // 4 * 8

+	    new TestResult(0, -32038549.559968181492513385018m), // 4 * 9

+	    new TestResult(0, -484668704441888737964200.28868m), // 4 * 10

+	    new TestResult(0, -5451936932428047943.0331374676m), // 4 * 11

+	    new TestResult(0, 7.629234053338741809892531431m), // 4 * 12

+	    new TestResult(0, -4004530596653713959723.3474452m), // 4 * 13

+	    new TestResult(0, 2228516277851917141900506.1676m), // 4 * 14

+	    new TestResult(0, 142460433792041532136613355.84m), // 4 * 15

+	    new TestResult(0, -4211233.0446308691436596648186m), // 4 * 16

+	    new TestResult(0, 244632887382995452.00508898642m), // 4 * 17

+	    new TestResult(0, -53232591538363859126977760.01m), // 4 * 18

+	    new TestResult(0, 1028010661998058347246731691.9m), // 4 * 19

+	    new TestResult(0, 70813207603.793287174700927968m), // 4 * 20

+	    new TestResult(0, 4157522739397.7704245656837041m), // 4 * 21

+	    new TestResult(0, -63893924898926.362673670820462m), // 4 * 22

+	    new TestResult(0, 4423462827429150.596416330681m), // 4 * 23

+	    new TestResult(0, -5128337808673238.9020837443764m), // 4 * 24

+	    new TestResult(0, 6089405806909157041.450897514m), // 4 * 25

+	    new TestResult(0, -425350533133199869661150.37787m), // 4 * 26

+	    new TestResult(0, -78082745225919531074858.812311m), // 4 * 27

+	    new TestResult(0, 10378076268042730373300594717m), // 4 * 28

+	    new TestResult(0, -49971229664.48652425771563042m), // 4 * 29

+	    new TestResult(0, 0m), // 5 * 0

+	    new TestResult(0, 0.1m), // 5 * 1

+	    new TestResult(0, -0.1m), // 5 * 2

+	    new TestResult(0, 0.2m), // 5 * 3

+	    new TestResult(0, 1m), // 5 * 4

+	    new TestResult(0, 0.01m), // 5 * 5

+	    new TestResult(0, 7922816251426433759354395033.5m), // 5 * 6

+	    new TestResult(0, -7922816251426433759354395033.5m), // 5 * 7

+	    new TestResult(0, 2770330246709196060933187.9532m), // 5 * 8

+	    new TestResult(0, -320385.49559968181492513385018m), // 5 * 9

+	    new TestResult(0, -4846687044418887379642.0028868m), // 5 * 10

+	    new TestResult(0, -54519369324280479.430331374676m), // 5 * 11

+	    new TestResult(0, 0.0762923405333874180989253143m), // 5 * 12

+	    new TestResult(0, -40045305966537139597.233474452m), // 5 * 13

+	    new TestResult(0, 22285162778519171419005.061676m), // 5 * 14

+	    new TestResult(0, 1424604337920415321366133.5584m), // 5 * 15

+	    new TestResult(0, -42112.330446308691436596648186m), // 5 * 16

+	    new TestResult(0, 2446328873829954.5200508898642m), // 5 * 17

+	    new TestResult(0, -532325915383638591269777.6001m), // 5 * 18

+	    new TestResult(0, 10280106619980583472467316.919m), // 5 * 19

+	    new TestResult(0, 708132076.03793287174700927968m), // 5 * 20

+	    new TestResult(0, 41575227393.977704245656837041m), // 5 * 21

+	    new TestResult(0, -638939248989.26362673670820462m), // 5 * 22

+	    new TestResult(0, 44234628274291.50596416330681m), // 5 * 23

+	    new TestResult(0, -51283378086732.389020837443764m), // 5 * 24

+	    new TestResult(0, 60894058069091570.41450897514m), // 5 * 25

+	    new TestResult(0, -4253505331331998696611.5037787m), // 5 * 26

+	    new TestResult(0, -780827452259195310748.58812311m), // 5 * 27

+	    new TestResult(0, 103780762680427303733005947.17m), // 5 * 28

+	    new TestResult(0, -499712296.6448652425771563042m), // 5 * 29

+	    new TestResult(0, 0m), // 6 * 0

+	    new TestResult(0, 79228162514264337593543950335m), // 6 * 1

+	    new TestResult(0, -79228162514264337593543950335m), // 6 * 2

+	    new TestResult(1, 0m), // 6 * 3

+	    new TestResult(1, 0m), // 6 * 4

+	    new TestResult(0, 7922816251426433759354395033.5m), // 6 * 5

+	    new TestResult(1, 0m), // 6 * 6

+	    new TestResult(1, 0m), // 6 * 7

+	    new TestResult(1, 0m), // 6 * 8

+	    new TestResult(1, 0m), // 6 * 9

+	    new TestResult(1, 0m), // 6 * 10

+	    new TestResult(1, 0m), // 6 * 11

+	    new TestResult(4, 60445019543728147377669509413m), // 6 * 12

+	    new TestResult(1, 0m), // 6 * 13

+	    new TestResult(1, 0m), // 6 * 14

+	    new TestResult(1, 0m), // 6 * 15

+	    new TestResult(1, 0m), // 6 * 16

+	    new TestResult(1, 0m), // 6 * 17

+	    new TestResult(1, 0m), // 6 * 18

+	    new TestResult(1, 0m), // 6 * 19

+	    new TestResult(1, 0m), // 6 * 20

+	    new TestResult(1, 0m), // 6 * 21

+	    new TestResult(1, 0m), // 6 * 22

+	    new TestResult(1, 0m), // 6 * 23

+	    new TestResult(1, 0m), // 6 * 24

+	    new TestResult(1, 0m), // 6 * 25

+	    new TestResult(1, 0m), // 6 * 26

+	    new TestResult(1, 0m), // 6 * 27

+	    new TestResult(1, 0m), // 6 * 28

+	    new TestResult(1, 0m), // 6 * 29

+	    new TestResult(0, 0m), // 7 * 0

+	    new TestResult(0, -79228162514264337593543950335m), // 7 * 1

+	    new TestResult(0, 79228162514264337593543950335m), // 7 * 2

+	    new TestResult(1, 0m), // 7 * 3

+	    new TestResult(1, 0m), // 7 * 4

+	    new TestResult(0, -7922816251426433759354395033.5m), // 7 * 5

+	    new TestResult(1, 0m), // 7 * 6

+	    new TestResult(1, 0m), // 7 * 7

+	    new TestResult(1, 0m), // 7 * 8

+	    new TestResult(1, 0m), // 7 * 9

+	    new TestResult(1, 0m), // 7 * 10

+	    new TestResult(1, 0m), // 7 * 11

+	    new TestResult(4, -60445019543728147377669509413m), // 7 * 12

+	    new TestResult(1, 0m), // 7 * 13

+	    new TestResult(1, 0m), // 7 * 14

+	    new TestResult(1, 0m), // 7 * 15

+	    new TestResult(1, 0m), // 7 * 16

+	    new TestResult(1, 0m), // 7 * 17

+	    new TestResult(1, 0m), // 7 * 18

+	    new TestResult(1, 0m), // 7 * 19

+	    new TestResult(1, 0m), // 7 * 20

+	    new TestResult(1, 0m), // 7 * 21

+	    new TestResult(1, 0m), // 7 * 22

+	    new TestResult(1, 0m), // 7 * 23

+	    new TestResult(1, 0m), // 7 * 24

+	    new TestResult(1, 0m), // 7 * 25

+	    new TestResult(1, 0m), // 7 * 26

+	    new TestResult(1, 0m), // 7 * 27

+	    new TestResult(1, 0m), // 7 * 28

+	    new TestResult(1, 0m), // 7 * 29

+	    new TestResult(0, 0m), // 8 * 0

+	    new TestResult(0, 27703302467091960609331879.532m), // 8 * 1

+	    new TestResult(0, -27703302467091960609331879.532m), // 8 * 2

+	    new TestResult(0, 55406604934183921218663759.064m), // 8 * 3

+	    new TestResult(0, 277033024670919606093318795.32m), // 8 * 4

+	    new TestResult(0, 2770330246709196060933187.9532m), // 8 * 5

+	    new TestResult(1, 0m), // 8 * 6

+	    new TestResult(1, 0m), // 8 * 7

+	    new TestResult(1, 0m), // 8 * 8

+	    new TestResult(1, 0m), // 8 * 9

+	    new TestResult(1, 0m), // 8 * 10

+	    new TestResult(1, 0m), // 8 * 11

+	    new TestResult(2, 21135497857188116458095236.68m), // 8 * 12

+	    new TestResult(1, 0m), // 8 * 13

+	    new TestResult(1, 0m), // 8 * 14

+	    new TestResult(1, 0m), // 8 * 15

+	    new TestResult(1, 0m), // 8 * 16

+	    new TestResult(1, 0m), // 8 * 17

+	    new TestResult(1, 0m), // 8 * 18

+	    new TestResult(1, 0m), // 8 * 19

+	    new TestResult(1, 0m), // 8 * 20

+	    new TestResult(1, 0m), // 8 * 21

+	    new TestResult(1, 0m), // 8 * 22

+	    new TestResult(1, 0m), // 8 * 23

+	    new TestResult(1, 0m), // 8 * 24

+	    new TestResult(1, 0m), // 8 * 25

+	    new TestResult(1, 0m), // 8 * 26

+	    new TestResult(1, 0m), // 8 * 27

+	    new TestResult(1, 0m), // 8 * 28

+	    new TestResult(1, 0m), // 8 * 29

+	    new TestResult(0, 0m), // 9 * 0

+	    new TestResult(0, -3203854.9559968181492513385018m), // 9 * 1

+	    new TestResult(0, 3203854.9559968181492513385018m), // 9 * 2

+	    new TestResult(0, -6407709.9119936362985026770036m), // 9 * 3

+	    new TestResult(0, -32038549.559968181492513385018m), // 9 * 4

+	    new TestResult(0, -320385.49559968181492513385018m), // 9 * 5

+	    new TestResult(1, 0m), // 9 * 6

+	    new TestResult(1, 0m), // 9 * 7

+	    new TestResult(1, 0m), // 9 * 8

+	    new TestResult(2, 10264686579065.373559419307221m), // 9 * 9

+	    new TestResult(1, 0m), // 9 * 10

+	    new TestResult(2, 1746721516074169126608222.1692m), // 9 * 11

+	    new TestResult(2, -2444295.933224902121034426698m), // 9 * 12

+	    new TestResult(2, 1282993519852989666698903060.5m), // 9 * 13

+	    new TestResult(1, 0m), // 9 * 14

+	    new TestResult(1, 0m), // 9 * 15

+	    new TestResult(0, 1349217986089.8179781485646335m), // 9 * 16

+	    new TestResult(0, -78376828864182146369609.767831m), // 9 * 17

+	    new TestResult(1, 0m), // 9 * 18

+	    new TestResult(1, 0m), // 9 * 19

+	    new TestResult(0, -22687524613144469.045656755412m), // 9 * 20

+	    new TestResult(0, -1332009983328901461.3254059884m), // 9 * 21

+	    new TestResult(0, 20470686794551372519.831909846m), // 9 * 22

+	    new TestResult(0, -1417213330232658207868.9685141m), // 9 * 23

+	    new TestResult(0, 1643045050434361863551.7087135m), // 9 * 24

+	    new TestResult(0, -1950957297354170624860913.7855m), // 9 * 25

+	    new TestResult(1, 0m), // 9 * 26

+	    new TestResult(0, 25016579026989918165002777574m), // 9 * 27

+	    new TestResult(1, 0m), // 9 * 28

+	    new TestResult(2, 16010057181782036.694377696165m), // 9 * 29

+	    new TestResult(0, 0m), // 10 * 0

+	    new TestResult(0, -48466870444188873796420.028868m), // 10 * 1

+	    new TestResult(0, 48466870444188873796420.028868m), // 10 * 2

+	    new TestResult(2, -96933740888377747592840.05774m), // 10 * 3

+	    new TestResult(0, -484668704441888737964200.28868m), // 10 * 4

+	    new TestResult(0, -4846687044418887379642.0028868m), // 10 * 5

+	    new TestResult(1, 0m), // 10 * 6

+	    new TestResult(1, 0m), // 10 * 7

+	    new TestResult(1, 0m), // 10 * 8

+	    new TestResult(1, 0m), // 10 * 9

+	    new TestResult(1, 0m), // 10 * 10

+	    new TestResult(1, 0m), // 10 * 11

+	    new TestResult(0, -36976509845156274734545.845161m), // 10 * 12

+	    new TestResult(1, 0m), // 10 * 13

+	    new TestResult(1, 0m), // 10 * 14

+	    new TestResult(1, 0m), // 10 * 15

+	    new TestResult(2, 20410528638441139616161910791m), // 10 * 16

+	    new TestResult(1, 0m), // 10 * 17

+	    new TestResult(1, 0m), // 10 * 18

+	    new TestResult(1, 0m), // 10 * 19

+	    new TestResult(1, 0m), // 10 * 20

+	    new TestResult(1, 0m), // 10 * 21

+	    new TestResult(1, 0m), // 10 * 22

+	    new TestResult(1, 0m), // 10 * 23

+	    new TestResult(1, 0m), // 10 * 24

+	    new TestResult(1, 0m), // 10 * 25

+	    new TestResult(1, 0m), // 10 * 26

+	    new TestResult(1, 0m), // 10 * 27

+	    new TestResult(1, 0m), // 10 * 28

+	    new TestResult(1, 0m), // 10 * 29

+	    new TestResult(0, 0m), // 11 * 0

+	    new TestResult(0, -545193693242804794.30331374676m), // 11 * 1

+	    new TestResult(0, 545193693242804794.30331374676m), // 11 * 2

+	    new TestResult(2, -1090387386485609588.6066274935m), // 11 * 3

+	    new TestResult(0, -5451936932428047943.0331374676m), // 11 * 4

+	    new TestResult(0, -54519369324280479.430331374676m), // 11 * 5

+	    new TestResult(1, 0m), // 11 * 6

+	    new TestResult(1, 0m), // 11 * 7

+	    new TestResult(1, 0m), // 11 * 8

+	    new TestResult(2, 1746721516074169126608222.1692m), // 11 * 9

+	    new TestResult(1, 0m), // 11 * 10

+	    new TestResult(1, 0m), // 11 * 11

+	    new TestResult(0, -415941029015352223.2321562927m), // 11 * 12

+	    new TestResult(1, 0m), // 11 * 13

+	    new TestResult(1, 0m), // 11 * 14

+	    new TestResult(1, 0m), // 11 * 15

+	    new TestResult(0, 229593769670844494339647.60593m), // 11 * 16

+	    new TestResult(1, 0m), // 11 * 17

+	    new TestResult(1, 0m), // 11 * 18

+	    new TestResult(1, 0m), // 11 * 19

+	    new TestResult(0, -3860691418388152934958161711.9m), // 11 * 20

+	    new TestResult(1, 0m), // 11 * 21

+	    new TestResult(1, 0m), // 11 * 22

+	    new TestResult(1, 0m), // 11 * 23

+	    new TestResult(1, 0m), // 11 * 24

+	    new TestResult(1, 0m), // 11 * 25

+	    new TestResult(1, 0m), // 11 * 26

+	    new TestResult(1, 0m), // 11 * 27

+	    new TestResult(1, 0m), // 11 * 28

+	    new TestResult(2, 2724399925666581324856736883m), // 11 * 29

+	    new TestResult(0, 0m), // 12 * 0

+	    new TestResult(0, 0.7629234053338741809892531431m), // 12 * 1

+	    new TestResult(0, -0.7629234053338741809892531431m), // 12 * 2

+	    new TestResult(0, 1.5258468106677483619785062862m), // 12 * 3

+	    new TestResult(0, 7.629234053338741809892531431m), // 12 * 4

+	    new TestResult(2, 0.0762923405333874180989253143m), // 12 * 5

+	    new TestResult(0, 60445019543728147377669509413m), // 12 * 6

+	    new TestResult(0, -60445019543728147377669509413m), // 12 * 7

+	    new TestResult(0, 21135497857188116458095236.68m), // 12 * 8

+	    new TestResult(0, -2444295.933224902121034426698m), // 12 * 9

+	    new TestResult(0, -36976509845156274734545.845161m), // 12 * 10

+	    new TestResult(0, -415941029015352223.2321562927m), // 12 * 11

+	    new TestResult(0, 0.5820521224062348791152865214m), // 12 * 12

+	    new TestResult(0, -305515011956274243325.23330625m), // 12 * 13

+	    new TestResult(0, 170018722754075475876563.00661m), // 12 * 14

+	    new TestResult(0, 10868639927396524825477357.557m), // 12 * 15

+	    new TestResult(0, -321284.82550643216389212760083m), // 12 * 16

+	    new TestResult(0, 18663615549889303.426127037208m), // 12 * 17

+	    new TestResult(0, -4061239001119573143590088.0528m), // 12 * 18

+	    new TestResult(0, 78429339497108899549297058.831m), // 12 * 19

+	    new TestResult(0, 5402505348.7700567259404098662m), // 12 * 20

+	    new TestResult(0, 317187140609.43641612785737895m), // 12 * 21

+	    new TestResult(0, -4874617076403.5713301079734445m), // 12 * 22

+	    new TestResult(0, 337476332367005.49979200414696m), // 12 * 23

+	    new TestResult(0, -391252894469544.55412631906773m), // 12 * 24

+	    new TestResult(0, 464575021466700199.22364418475m), // 12 * 25

+	    new TestResult(0, -32450987719855972399063.033158m), // 12 * 26

+	    new TestResult(0, -5957115388557583551533.0994303m), // 12 * 27

+	    new TestResult(0, 791767728722982425613218218.59m), // 12 * 28

+	    new TestResult(0, -3812422070.43511700405678157m), // 12 * 29

+	    new TestResult(0, 0m), // 13 * 0

+	    new TestResult(0, -400453059665371395972.33474452m), // 13 * 1

+	    new TestResult(0, 400453059665371395972.33474452m), // 13 * 2

+	    new TestResult(2, -800906119330742791944.669489m), // 13 * 3

+	    new TestResult(0, -4004530596653713959723.3474452m), // 13 * 4

+	    new TestResult(0, -40045305966537139597.233474452m), // 13 * 5

+	    new TestResult(1, 0m), // 13 * 6

+	    new TestResult(1, 0m), // 13 * 7

+	    new TestResult(1, 0m), // 13 * 8

+	    new TestResult(2, 1282993519852989666698903060.5m), // 13 * 9

+	    new TestResult(1, 0m), // 13 * 10

+	    new TestResult(1, 0m), // 13 * 11

+	    new TestResult(0, -305515011956274243325.23330625m), // 13 * 12

+	    new TestResult(1, 0m), // 13 * 13

+	    new TestResult(1, 0m), // 13 * 14

+	    new TestResult(1, 0m), // 13 * 15

+	    new TestResult(2, 168640115768634908407809010.03m), // 13 * 16

+	    new TestResult(1, 0m), // 13 * 17

+	    new TestResult(1, 0m), // 13 * 18

+	    new TestResult(1, 0m), // 13 * 19

+	    new TestResult(1, 0m), // 13 * 20

+	    new TestResult(1, 0m), // 13 * 21

+	    new TestResult(1, 0m), // 13 * 22

+	    new TestResult(1, 0m), // 13 * 23

+	    new TestResult(1, 0m), // 13 * 24

+	    new TestResult(1, 0m), // 13 * 25

+	    new TestResult(1, 0m), // 13 * 26

+	    new TestResult(1, 0m), // 13 * 27

+	    new TestResult(1, 0m), // 13 * 28

+	    new TestResult(1, 0m), // 13 * 29

+	    new TestResult(0, 0m), // 14 * 0

+	    new TestResult(0, 222851627785191714190050.61676m), // 14 * 1

+	    new TestResult(0, -222851627785191714190050.61676m), // 14 * 2

+	    new TestResult(0, 445703255570383428380101.23352m), // 14 * 3

+	    new TestResult(0, 2228516277851917141900506.1676m), // 14 * 4

+	    new TestResult(0, 22285162778519171419005.061676m), // 14 * 5

+	    new TestResult(1, 0m), // 14 * 6

+	    new TestResult(1, 0m), // 14 * 7

+	    new TestResult(1, 0m), // 14 * 8

+	    new TestResult(1, 0m), // 14 * 9

+	    new TestResult(1, 0m), // 14 * 10

+	    new TestResult(1, 0m), // 14 * 11

+	    new TestResult(0, 170018722754075475876563.00661m), // 14 * 12

+	    new TestResult(1, 0m), // 14 * 13

+	    new TestResult(1, 0m), // 14 * 14

+	    new TestResult(1, 0m), // 14 * 15

+	    new TestResult(1, 0m), // 14 * 16

+	    new TestResult(1, 0m), // 14 * 17

+	    new TestResult(1, 0m), // 14 * 18

+	    new TestResult(1, 0m), // 14 * 19

+	    new TestResult(1, 0m), // 14 * 20

+	    new TestResult(1, 0m), // 14 * 21

+	    new TestResult(1, 0m), // 14 * 22

+	    new TestResult(1, 0m), // 14 * 23

+	    new TestResult(1, 0m), // 14 * 24

+	    new TestResult(1, 0m), // 14 * 25

+	    new TestResult(1, 0m), // 14 * 26

+	    new TestResult(1, 0m), // 14 * 27

+	    new TestResult(1, 0m), // 14 * 28

+	    new TestResult(1, 0m), // 14 * 29

+	    new TestResult(0, 0m), // 15 * 0

+	    new TestResult(0, 14246043379204153213661335.584m), // 15 * 1

+	    new TestResult(0, -14246043379204153213661335.584m), // 15 * 2

+	    new TestResult(0, 28492086758408306427322671.168m), // 15 * 3

+	    new TestResult(0, 142460433792041532136613355.84m), // 15 * 4

+	    new TestResult(0, 1424604337920415321366133.5584m), // 15 * 5

+	    new TestResult(1, 0m), // 15 * 6

+	    new TestResult(1, 0m), // 15 * 7

+	    new TestResult(1, 0m), // 15 * 8

+	    new TestResult(1, 0m), // 15 * 9

+	    new TestResult(1, 0m), // 15 * 10

+	    new TestResult(1, 0m), // 15 * 11

+	    new TestResult(0, 10868639927396524825477357.557m), // 15 * 12

+	    new TestResult(1, 0m), // 15 * 13

+	    new TestResult(1, 0m), // 15 * 14

+	    new TestResult(1, 0m), // 15 * 15

+	    new TestResult(1, 0m), // 15 * 16

+	    new TestResult(1, 0m), // 15 * 17

+	    new TestResult(1, 0m), // 15 * 18

+	    new TestResult(1, 0m), // 15 * 19

+	    new TestResult(1, 0m), // 15 * 20

+	    new TestResult(1, 0m), // 15 * 21

+	    new TestResult(1, 0m), // 15 * 22

+	    new TestResult(1, 0m), // 15 * 23

+	    new TestResult(1, 0m), // 15 * 24

+	    new TestResult(1, 0m), // 15 * 25

+	    new TestResult(1, 0m), // 15 * 26

+	    new TestResult(1, 0m), // 15 * 27

+	    new TestResult(1, 0m), // 15 * 28

+	    new TestResult(1, 0m), // 15 * 29

+	    new TestResult(0, 0m), // 16 * 0

+	    new TestResult(0, -421123.30446308691436596648186m), // 16 * 1

+	    new TestResult(0, 421123.30446308691436596648186m), // 16 * 2

+	    new TestResult(2, -842246.6089261738287319329637m), // 16 * 3

+	    new TestResult(0, -4211233.0446308691436596648186m), // 16 * 4

+	    new TestResult(0, -42112.330446308691436596648186m), // 16 * 5

+	    new TestResult(1, 0m), // 16 * 6

+	    new TestResult(1, 0m), // 16 * 7

+	    new TestResult(1, 0m), // 16 * 8

+	    new TestResult(0, 1349217986089.8179781485646335m), // 16 * 9

+	    new TestResult(2, 20410528638441139616161910791m), // 16 * 10

+	    new TestResult(0, 229593769670844494339647.60593m), // 16 * 11

+	    new TestResult(0, -321284.82550643216389212760083m), // 16 * 12

+	    new TestResult(2, 168640115768634908407809010.03m), // 16 * 13

+	    new TestResult(1, 0m), // 16 * 14

+	    new TestResult(1, 0m), // 16 * 15

+	    new TestResult(2, 177344837561.90979904837123025m), // 16 * 16

+	    new TestResult(2, -10302060991507324713598.483586m), // 16 * 17

+	    new TestResult(1, 0m), // 16 * 18

+	    new TestResult(1, 0m), // 16 * 19

+	    new TestResult(2, -2982109198574002.1833628108505m), // 16 * 20

+	    new TestResult(2, -175082971439561442.82206371811m), // 16 * 21

+	    new TestResult(2, 2690722078855217643.0013135833m), // 16 * 22

+	    new TestResult(2, -186282328305659347664.31347679m), // 16 * 23

+	    new TestResult(2, 215966256439146035447.16512997m), // 16 * 24

+	    new TestResult(0, -256439069562229438659442.67473m), // 16 * 25

+	    new TestResult(2, 17912502206818886711664532432m), // 16 * 26

+	    new TestResult(0, 3288246369108855691627019039.6m), // 16 * 27

+	    new TestResult(1, 0m), // 16 * 28

+	    new TestResult(2, 2104404936439239.9111285468803m), // 16 * 29

+	    new TestResult(0, 0m), // 17 * 0

+	    new TestResult(0, 24463288738299545.200508898642m), // 17 * 1

+	    new TestResult(0, -24463288738299545.200508898642m), // 17 * 2

+	    new TestResult(0, 48926577476599090.401017797284m), // 17 * 3

+	    new TestResult(0, 244632887382995452.00508898642m), // 17 * 4

+	    new TestResult(0, 2446328873829954.5200508898642m), // 17 * 5

+	    new TestResult(1, 0m), // 17 * 6

+	    new TestResult(1, 0m), // 17 * 7

+	    new TestResult(1, 0m), // 17 * 8

+	    new TestResult(0, -78376828864182146369609.767831m), // 17 * 9

+	    new TestResult(1, 0m), // 17 * 10

+	    new TestResult(1, 0m), // 17 * 11

+	    new TestResult(0, 18663615549889303.426127037208m), // 17 * 12

+	    new TestResult(1, 0m), // 17 * 13

+	    new TestResult(1, 0m), // 17 * 14

+	    new TestResult(1, 0m), // 17 * 15

+	    new TestResult(2, -10302060991507324713598.483586m), // 17 * 16

+	    new TestResult(1, 0m), // 17 * 17

+	    new TestResult(1, 0m), // 17 * 18

+	    new TestResult(1, 0m), // 17 * 19

+	    new TestResult(0, 173232394409674404469121757.58m), // 17 * 20

+	    new TestResult(2, 10170667920993375211218037940m), // 17 * 21

+	    new TestResult(1, 0m), // 17 * 22

+	    new TestResult(1, 0m), // 17 * 23

+	    new TestResult(1, 0m), // 17 * 24

+	    new TestResult(1, 0m), // 17 * 25

+	    new TestResult(1, 0m), // 17 * 26

+	    new TestResult(1, 0m), // 17 * 27

+	    new TestResult(1, 0m), // 17 * 28

+	    new TestResult(0, -122246061989021334943606343.1m), // 17 * 29

+	    new TestResult(0, 0m), // 18 * 0

+	    new TestResult(0, -5323259153836385912697776.001m), // 18 * 1

+	    new TestResult(0, 5323259153836385912697776.001m), // 18 * 2

+	    new TestResult(0, -10646518307672771825395552.002m), // 18 * 3

+	    new TestResult(0, -53232591538363859126977760.01m), // 18 * 4

+	    new TestResult(0, -532325915383638591269777.6001m), // 18 * 5

+	    new TestResult(1, 0m), // 18 * 6

+	    new TestResult(1, 0m), // 18 * 7

+	    new TestResult(1, 0m), // 18 * 8

+	    new TestResult(1, 0m), // 18 * 9

+	    new TestResult(1, 0m), // 18 * 10

+	    new TestResult(1, 0m), // 18 * 11

+	    new TestResult(2, -4061239001119573143590088.0528m), // 18 * 12

+	    new TestResult(1, 0m), // 18 * 13

+	    new TestResult(1, 0m), // 18 * 14

+	    new TestResult(1, 0m), // 18 * 15

+	    new TestResult(1, 0m), // 18 * 16

+	    new TestResult(1, 0m), // 18 * 17

+	    new TestResult(1, 0m), // 18 * 18

+	    new TestResult(1, 0m), // 18 * 19

+	    new TestResult(1, 0m), // 18 * 20

+	    new TestResult(1, 0m), // 18 * 21

+	    new TestResult(1, 0m), // 18 * 22

+	    new TestResult(1, 0m), // 18 * 23

+	    new TestResult(1, 0m), // 18 * 24

+	    new TestResult(1, 0m), // 18 * 25

+	    new TestResult(1, 0m), // 18 * 26

+	    new TestResult(1, 0m), // 18 * 27

+	    new TestResult(1, 0m), // 18 * 28

+	    new TestResult(1, 0m), // 18 * 29

+	    new TestResult(0, 0m), // 19 * 0

+	    new TestResult(0, 102801066199805834724673169.19m), // 19 * 1

+	    new TestResult(0, -102801066199805834724673169.19m), // 19 * 2

+	    new TestResult(0, 205602132399611669449346338.38m), // 19 * 3

+	    new TestResult(0, 1028010661998058347246731691.9m), // 19 * 4

+	    new TestResult(0, 10280106619980583472467316.919m), // 19 * 5

+	    new TestResult(1, 0m), // 19 * 6

+	    new TestResult(1, 0m), // 19 * 7

+	    new TestResult(1, 0m), // 19 * 8

+	    new TestResult(1, 0m), // 19 * 9

+	    new TestResult(1, 0m), // 19 * 10

+	    new TestResult(1, 0m), // 19 * 11

+	    new TestResult(0, 78429339497108899549297058.831m), // 19 * 12

+	    new TestResult(1, 0m), // 19 * 13

+	    new TestResult(1, 0m), // 19 * 14

+	    new TestResult(1, 0m), // 19 * 15

+	    new TestResult(1, 0m), // 19 * 16

+	    new TestResult(1, 0m), // 19 * 17

+	    new TestResult(1, 0m), // 19 * 18

+	    new TestResult(1, 0m), // 19 * 19

+	    new TestResult(1, 0m), // 19 * 20

+	    new TestResult(1, 0m), // 19 * 21

+	    new TestResult(1, 0m), // 19 * 22

+	    new TestResult(1, 0m), // 19 * 23

+	    new TestResult(1, 0m), // 19 * 24

+	    new TestResult(1, 0m), // 19 * 25

+	    new TestResult(1, 0m), // 19 * 26

+	    new TestResult(1, 0m), // 19 * 27

+	    new TestResult(1, 0m), // 19 * 28

+	    new TestResult(1, 0m), // 19 * 29

+	    new TestResult(0, 0m), // 20 * 0

+	    new TestResult(0, 7081320760.3793287174700927968m), // 20 * 1

+	    new TestResult(0, -7081320760.3793287174700927968m), // 20 * 2

+	    new TestResult(2, 14162641520.758657434940185594m), // 20 * 3

+	    new TestResult(0, 70813207603.793287174700927968m), // 20 * 4

+	    new TestResult(0, 708132076.03793287174700927968m), // 20 * 5

+	    new TestResult(1, 0m), // 20 * 6

+	    new TestResult(1, 0m), // 20 * 7

+	    new TestResult(1, 0m), // 20 * 8

+	    new TestResult(0, -22687524613144469.045656755412m), // 20 * 9

+	    new TestResult(1, 0m), // 20 * 10

+	    new TestResult(0, -3860691418388152934958161711.9m), // 20 * 11

+	    new TestResult(0, 5402505348.7700567259404098662m), // 20 * 12

+	    new TestResult(1, 0m), // 20 * 13

+	    new TestResult(1, 0m), // 20 * 14

+	    new TestResult(1, 0m), // 20 * 15

+	    new TestResult(2, -2982109198574002.1833628108505m), // 20 * 16

+	    new TestResult(2, 173232394409674404469121757.58m), // 20 * 17

+	    new TestResult(1, 0m), // 20 * 18

+	    new TestResult(1, 0m), // 20 * 19

+	    new TestResult(0, 50145103711379274243.914175878m), // 20 * 20

+	    new TestResult(2, 2944075208624656937377.9493098m), // 20 * 21

+	    new TestResult(0, -45245337684888495429839.445203m), // 20 * 22

+	    new TestResult(2, 3132395915264028802867467.4171m), // 20 * 23

+	    new TestResult(2, -3631540499079604049748263.216m), // 20 * 24

+	    new TestResult(0, 4312103575884025168661620716.9m), // 20 * 25

+	    new TestResult(1, 0m), // 20 * 26

+	    new TestResult(1, 0m), // 20 * 27

+	    new TestResult(1, 0m), // 20 * 28

+	    new TestResult(2, -35386230604481178142.543841269m), // 20 * 29

+	    new TestResult(0, 0m), // 21 * 0

+	    new TestResult(0, 415752273939.77704245656837041m), // 21 * 1

+	    new TestResult(0, -415752273939.77704245656837041m), // 21 * 2

+	    new TestResult(2, 831504547879.5540849131367408m), // 21 * 3

+	    new TestResult(0, 4157522739397.7704245656837041m), // 21 * 4

+	    new TestResult(0, 41575227393.977704245656837041m), // 21 * 5

+	    new TestResult(1, 0m), // 21 * 6

+	    new TestResult(1, 0m), // 21 * 7

+	    new TestResult(1, 0m), // 21 * 8

+	    new TestResult(2, -1332009983328901461.3254059884m), // 21 * 9

+	    new TestResult(1, 0m), // 21 * 10

+	    new TestResult(1, 0m), // 21 * 11

+	    new TestResult(0, 317187140609.43641612785737895m), // 21 * 12

+	    new TestResult(1, 0m), // 21 * 13

+	    new TestResult(1, 0m), // 21 * 14

+	    new TestResult(1, 0m), // 21 * 15

+	    new TestResult(2, -175082971439561442.82206371811m), // 21 * 16

+	    new TestResult(2, 10170667920993375211218037940m), // 21 * 17

+	    new TestResult(1, 0m), // 21 * 18

+	    new TestResult(1, 0m), // 21 * 19

+	    new TestResult(2, 2944075208624656937377.9493098m), // 21 * 20

+	    new TestResult(2, 172849953286095412912252.49708m), // 21 * 21

+	    new TestResult(2, -2656404456766597431365611.212m), // 21 * 22

+	    new TestResult(0, 183906472919174492029733196.17m), // 21 * 23

+	    new TestResult(0, -213211810548723232636647639.7m), // 21 * 24

+	    new TestResult(1, 0m), // 21 * 25

+	    new TestResult(1, 0m), // 21 * 26

+	    new TestResult(1, 0m), // 21 * 27

+	    new TestResult(1, 0m), // 21 * 28

+	    new TestResult(0, -2077565236457711426002.3992246m), // 21 * 29

+	    new TestResult(0, 0m), // 22 * 0

+	    new TestResult(0, -6389392489892.6362673670820462m), // 22 * 1

+	    new TestResult(0, 6389392489892.6362673670820462m), // 22 * 2

+	    new TestResult(2, -12778784979785.272534734164092m), // 22 * 3

+	    new TestResult(0, -63893924898926.362673670820462m), // 22 * 4

+	    new TestResult(0, -638939248989.26362673670820462m), // 22 * 5

+	    new TestResult(1, 0m), // 22 * 6

+	    new TestResult(1, 0m), // 22 * 7

+	    new TestResult(1, 0m), // 22 * 8

+	    new TestResult(2, 20470686794551372519.831909846m), // 22 * 9

+	    new TestResult(1, 0m), // 22 * 10

+	    new TestResult(1, 0m), // 22 * 11

+	    new TestResult(0, -4874617076403.5713301079734445m), // 22 * 12

+	    new TestResult(1, 0m), // 22 * 13

+	    new TestResult(1, 0m), // 22 * 14

+	    new TestResult(1, 0m), // 22 * 15

+	    new TestResult(2, 2690722078855217643.0013135833m), // 22 * 16

+	    new TestResult(1, 0m), // 22 * 17

+	    new TestResult(1, 0m), // 22 * 18

+	    new TestResult(1, 0m), // 22 * 19

+	    new TestResult(0, -45245337684888495429839.445203m), // 22 * 20

+	    new TestResult(2, -2656404456766597431365611.212m), // 22 * 21

+	    new TestResult(2, 40824336389896422046045259.169m), // 22 * 22

+	    new TestResult(2, -2826324016889506134750576955.1m), // 22 * 23

+	    new TestResult(2, 3276696308036925201560804370m), // 22 * 24

+	    new TestResult(1, 0m), // 22 * 25

+	    new TestResult(1, 0m), // 22 * 26

+	    new TestResult(1, 0m), // 22 * 27

+	    new TestResult(1, 0m), // 22 * 28

+	    new TestResult(2, 31928579952897032005741.500403m), // 22 * 29

+	    new TestResult(0, 0m), // 23 * 0

+	    new TestResult(0, 442346282742915.0596416330681m), // 23 * 1

+	    new TestResult(0, -442346282742915.0596416330681m), // 23 * 2

+	    new TestResult(0, 884692565485830.1192832661362m), // 23 * 3

+	    new TestResult(0, 4423462827429150.596416330681m), // 23 * 4

+	    new TestResult(0, 44234628274291.50596416330681m), // 23 * 5

+	    new TestResult(1, 0m), // 23 * 6

+	    new TestResult(1, 0m), // 23 * 7

+	    new TestResult(1, 0m), // 23 * 8

+	    new TestResult(2, -1417213330232658207868.9685141m), // 23 * 9

+	    new TestResult(1, 0m), // 23 * 10

+	    new TestResult(1, 0m), // 23 * 11

+	    new TestResult(2, 337476332367005.49979200414696m), // 23 * 12

+	    new TestResult(1, 0m), // 23 * 13

+	    new TestResult(1, 0m), // 23 * 14

+	    new TestResult(1, 0m), // 23 * 15

+	    new TestResult(2, -186282328305659347664.31347679m), // 23 * 16

+	    new TestResult(1, 0m), // 23 * 17

+	    new TestResult(1, 0m), // 23 * 18

+	    new TestResult(1, 0m), // 23 * 19

+	    new TestResult(2, 3132395915264028802867467.4171m), // 23 * 20

+	    new TestResult(0, 183906472919174492029733196.17m), // 23 * 21

+	    new TestResult(2, -2826324016889506134750576955.1m), // 23 * 22

+	    new TestResult(1, 0m), // 23 * 23

+	    new TestResult(1, 0m), // 23 * 24

+	    new TestResult(1, 0m), // 23 * 25

+	    new TestResult(1, 0m), // 23 * 26

+	    new TestResult(1, 0m), // 23 * 27

+	    new TestResult(1, 0m), // 23 * 28

+	    new TestResult(2, -2210458768617810051106106.871m), // 23 * 29

+	    new TestResult(0, 0m), // 24 * 0

+	    new TestResult(0, -512833780867323.89020837443764m), // 24 * 1

+	    new TestResult(0, 512833780867323.89020837443764m), // 24 * 2

+	    new TestResult(2, -1025667561734647.7804167488753m), // 24 * 3

+	    new TestResult(0, -5128337808673238.9020837443764m), // 24 * 4

+	    new TestResult(0, -51283378086732.389020837443764m), // 24 * 5

+	    new TestResult(1, 0m), // 24 * 6

+	    new TestResult(1, 0m), // 24 * 7

+	    new TestResult(1, 0m), // 24 * 8

+	    new TestResult(0, 1643045050434361863551.7087135m), // 24 * 9

+	    new TestResult(1, 0m), // 24 * 10

+	    new TestResult(1, 0m), // 24 * 11

+	    new TestResult(0, -391252894469544.55412631906773m), // 24 * 12

+	    new TestResult(1, 0m), // 24 * 13

+	    new TestResult(1, 0m), // 24 * 14

+	    new TestResult(1, 0m), // 24 * 15

+	    new TestResult(2, 215966256439146035447.16512997m), // 24 * 16

+	    new TestResult(1, 0m), // 24 * 17

+	    new TestResult(1, 0m), // 24 * 18

+	    new TestResult(1, 0m), // 24 * 19

+	    new TestResult(2, -3631540499079604049748263.216m), // 24 * 20

+	    new TestResult(0, -213211810548723232636647639.7m), // 24 * 21

+	    new TestResult(2, 3276696308036925201560804370m), // 24 * 22

+	    new TestResult(1, 0m), // 24 * 23

+	    new TestResult(1, 0m), // 24 * 24

+	    new TestResult(1, 0m), // 24 * 25

+	    new TestResult(1, 0m), // 24 * 26

+	    new TestResult(1, 0m), // 24 * 27

+	    new TestResult(1, 0m), // 24 * 28

+	    new TestResult(2, 2562693464342799730524457.4865m), // 24 * 29

+	    new TestResult(0, 0m), // 25 * 0

+	    new TestResult(0, 608940580690915704.1450897514m), // 25 * 1

+	    new TestResult(0, -608940580690915704.1450897514m), // 25 * 2

+	    new TestResult(0, 1217881161381831408.2901795028m), // 25 * 3

+	    new TestResult(0, 6089405806909157041.450897514m), // 25 * 4

+	    new TestResult(0, 60894058069091570.41450897514m), // 25 * 5

+	    new TestResult(1, 0m), // 25 * 6

+	    new TestResult(1, 0m), // 25 * 7

+	    new TestResult(1, 0m), // 25 * 8

+	    new TestResult(0, -1950957297354170624860913.7855m), // 25 * 9

+	    new TestResult(1, 0m), // 25 * 10

+	    new TestResult(1, 0m), // 25 * 11

+	    new TestResult(0, 464575021466700199.22364418475m), // 25 * 12

+	    new TestResult(1, 0m), // 25 * 13

+	    new TestResult(1, 0m), // 25 * 14

+	    new TestResult(1, 0m), // 25 * 15

+	    new TestResult(0, -256439069562229438659442.67473m), // 25 * 16

+	    new TestResult(1, 0m), // 25 * 17

+	    new TestResult(1, 0m), // 25 * 18

+	    new TestResult(1, 0m), // 25 * 19

+	    new TestResult(0, 4312103575884025168661620716.9m), // 25 * 20

+	    new TestResult(1, 0m), // 25 * 21

+	    new TestResult(1, 0m), // 25 * 22

+	    new TestResult(1, 0m), // 25 * 23

+	    new TestResult(1, 0m), // 25 * 24

+	    new TestResult(1, 0m), // 25 * 25

+	    new TestResult(1, 0m), // 25 * 26

+	    new TestResult(1, 0m), // 25 * 27

+	    new TestResult(1, 0m), // 25 * 28

+	    new TestResult(0, -3042950960973153681431212945.8m), // 25 * 29

+	    new TestResult(0, 0m), // 26 * 0

+	    new TestResult(0, -42535053313319986966115.037787m), // 26 * 1

+	    new TestResult(0, 42535053313319986966115.037787m), // 26 * 2

+	    new TestResult(2, -85070106626639973932230.07557m), // 26 * 3

+	    new TestResult(0, -425350533133199869661150.37787m), // 26 * 4

+	    new TestResult(0, -4253505331331998696611.5037787m), // 26 * 5

+	    new TestResult(1, 0m), // 26 * 6

+	    new TestResult(1, 0m), // 26 * 7

+	    new TestResult(1, 0m), // 26 * 8

+	    new TestResult(1, 0m), // 26 * 9

+	    new TestResult(1, 0m), // 26 * 10

+	    new TestResult(1, 0m), // 26 * 11

+	    new TestResult(0, -32450987719855972399063.033158m), // 26 * 12

+	    new TestResult(1, 0m), // 26 * 13

+	    new TestResult(1, 0m), // 26 * 14

+	    new TestResult(1, 0m), // 26 * 15

+	    new TestResult(2, 17912502206818886711664532432m), // 26 * 16

+	    new TestResult(1, 0m), // 26 * 17

+	    new TestResult(1, 0m), // 26 * 18

+	    new TestResult(1, 0m), // 26 * 19

+	    new TestResult(1, 0m), // 26 * 20

+	    new TestResult(1, 0m), // 26 * 21

+	    new TestResult(1, 0m), // 26 * 22

+	    new TestResult(1, 0m), // 26 * 23

+	    new TestResult(1, 0m), // 26 * 24

+	    new TestResult(1, 0m), // 26 * 25

+	    new TestResult(1, 0m), // 26 * 26

+	    new TestResult(1, 0m), // 26 * 27

+	    new TestResult(1, 0m), // 26 * 28

+	    new TestResult(1, 0m), // 26 * 29

+	    new TestResult(0, 0m), // 27 * 0

+	    new TestResult(0, -7808274522591953107485.8812311m), // 27 * 1

+	    new TestResult(0, 7808274522591953107485.8812311m), // 27 * 2

+	    new TestResult(2, -15616549045183906214971.762462m), // 27 * 3

+	    new TestResult(0, -78082745225919531074858.812311m), // 27 * 4

+	    new TestResult(0, -780827452259195310748.58812311m), // 27 * 5

+	    new TestResult(1, 0m), // 27 * 6

+	    new TestResult(1, 0m), // 27 * 7

+	    new TestResult(1, 0m), // 27 * 8

+	    new TestResult(0, 25016579026989918165002777574m), // 27 * 9

+	    new TestResult(1, 0m), // 27 * 10

+	    new TestResult(1, 0m), // 27 * 11

+	    new TestResult(0, -5957115388557583551533.0994303m), // 27 * 12

+	    new TestResult(1, 0m), // 27 * 13

+	    new TestResult(1, 0m), // 27 * 14

+	    new TestResult(1, 0m), // 27 * 15

+	    new TestResult(0, 3288246369108855691627019039.6m), // 27 * 16

+	    new TestResult(1, 0m), // 27 * 17

+	    new TestResult(1, 0m), // 27 * 18

+	    new TestResult(1, 0m), // 27 * 19

+	    new TestResult(1, 0m), // 27 * 20

+	    new TestResult(1, 0m), // 27 * 21

+	    new TestResult(1, 0m), // 27 * 22

+	    new TestResult(1, 0m), // 27 * 23

+	    new TestResult(1, 0m), // 27 * 24

+	    new TestResult(1, 0m), // 27 * 25

+	    new TestResult(1, 0m), // 27 * 26

+	    new TestResult(1, 0m), // 27 * 27

+	    new TestResult(1, 0m), // 27 * 28

+	    new TestResult(1, 0m), // 27 * 29

+	    new TestResult(0, 0m), // 28 * 0

+	    new TestResult(0, 1037807626804273037330059471.7m), // 28 * 1

+	    new TestResult(0, -1037807626804273037330059471.7m), // 28 * 2

+	    new TestResult(0, 2075615253608546074660118943.4m), // 28 * 3

+	    new TestResult(0, 10378076268042730373300594717m), // 28 * 4

+	    new TestResult(0, 103780762680427303733005947.17m), // 28 * 5

+	    new TestResult(1, 0m), // 28 * 6

+	    new TestResult(1, 0m), // 28 * 7

+	    new TestResult(1, 0m), // 28 * 8

+	    new TestResult(1, 0m), // 28 * 9

+	    new TestResult(1, 0m), // 28 * 10

+	    new TestResult(1, 0m), // 28 * 11

+	    new TestResult(0, 791767728722982425613218218.59m), // 28 * 12

+	    new TestResult(1, 0m), // 28 * 13

+	    new TestResult(1, 0m), // 28 * 14

+	    new TestResult(1, 0m), // 28 * 15

+	    new TestResult(1, 0m), // 28 * 16

+	    new TestResult(1, 0m), // 28 * 17

+	    new TestResult(1, 0m), // 28 * 18

+	    new TestResult(1, 0m), // 28 * 19

+	    new TestResult(1, 0m), // 28 * 20

+	    new TestResult(1, 0m), // 28 * 21

+	    new TestResult(1, 0m), // 28 * 22

+	    new TestResult(1, 0m), // 28 * 23

+	    new TestResult(1, 0m), // 28 * 24

+	    new TestResult(1, 0m), // 28 * 25

+	    new TestResult(1, 0m), // 28 * 26

+	    new TestResult(1, 0m), // 28 * 27

+	    new TestResult(1, 0m), // 28 * 28

+	    new TestResult(1, 0m), // 28 * 29

+	    new TestResult(0, 0m), // 29 * 0

+	    new TestResult(0, -4997122966.448652425771563042m), // 29 * 1

+	    new TestResult(0, 4997122966.448652425771563042m), // 29 * 2

+	    new TestResult(0, -9994245932.897304851543126084m), // 29 * 3

+	    new TestResult(0, -49971229664.48652425771563042m), // 29 * 4

+	    new TestResult(0, -499712296.6448652425771563042m), // 29 * 5

+	    new TestResult(1, 0m), // 29 * 6

+	    new TestResult(1, 0m), // 29 * 7

+	    new TestResult(1, 0m), // 29 * 8

+	    new TestResult(2, 16010057181782036.694377696165m), // 29 * 9

+	    new TestResult(1, 0m), // 29 * 10

+	    new TestResult(2, 2724399925666581324856736883m), // 29 * 11

+	    new TestResult(2, -3812422070.43511700405678157m), // 29 * 12

+	    new TestResult(1, 0m), // 29 * 13

+	    new TestResult(1, 0m), // 29 * 14

+	    new TestResult(1, 0m), // 29 * 15

+	    new TestResult(2, 2104404936439239.9111285468803m), // 29 * 16

+	    new TestResult(2, -122246061989021334943606343.1m), // 29 * 17

+	    new TestResult(1, 0m), // 29 * 18

+	    new TestResult(1, 0m), // 29 * 19

+	    new TestResult(0, -35386230604481178142.543841269m), // 29 * 20

+	    new TestResult(0, -2077565236457711426002.3992246m), // 29 * 21

+	    new TestResult(2, 31928579952897032005741.500403m), // 29 * 22

+	    new TestResult(2, -2210458768617810051106106.871m), // 29 * 23

+	    new TestResult(2, 2562693464342799730524457.4865m), // 29 * 24

+	    new TestResult(0, -3042950960973153681431212945.8m), // 29 * 25

+	    new TestResult(1, 0m), // 29 * 26

+	    new TestResult(1, 0m), // 29 * 27

+	    new TestResult(1, 0m), // 29 * 28

+	    new TestResult(0, 24971237941808579837.350664893m), // 29 * 29

+        };

+

+

+        // generated result list build2

+        TestResult[] trAuto_Div_build2 = new TestResult[] {

+	    new TestResult(3, 0m), // 0 / 0

+	    new TestResult(0, 0m), // 0 / 1

+	    new TestResult(0, 0m), // 0 / 2

+	    new TestResult(0, 0m), // 0 / 3

+	    new TestResult(0, 0m), // 0 / 4

+	    new TestResult(0, 0m), // 0 / 5

+	    new TestResult(0, 0m), // 0 / 6

+	    new TestResult(0, 0m), // 0 / 7

+	    new TestResult(0, 0m), // 0 / 8

+	    new TestResult(0, 0m), // 0 / 9

+	    new TestResult(0, 0m), // 0 / 10

+	    new TestResult(0, 0m), // 0 / 11

+	    new TestResult(0, 0m), // 0 / 12

+	    new TestResult(0, 0m), // 0 / 13

+	    new TestResult(0, 0m), // 0 / 14

+	    new TestResult(0, 0m), // 0 / 15

+	    new TestResult(0, 0m), // 0 / 16

+	    new TestResult(0, 0m), // 0 / 17

+	    new TestResult(0, 0m), // 0 / 18

+	    new TestResult(0, 0m), // 0 / 19

+	    new TestResult(0, 0m), // 0 / 20

+	    new TestResult(0, 0m), // 0 / 21

+	    new TestResult(0, 0m), // 0 / 22

+	    new TestResult(0, 0m), // 0 / 23

+	    new TestResult(0, 0m), // 0 / 24

+	    new TestResult(0, 0m), // 0 / 25

+	    new TestResult(0, 0m), // 0 / 26

+	    new TestResult(0, 0m), // 0 / 27

+	    new TestResult(0, 0m), // 0 / 28

+	    new TestResult(0, 0m), // 0 / 29

+	    new TestResult(3, 0m), // 1 / 0

+	    new TestResult(0, 1m), // 1 / 1

+	    new TestResult(0, -1m), // 1 / 2

+	    new TestResult(0, 0.5m), // 1 / 3

+	    new TestResult(0, 0.1m), // 1 / 4

+	    new TestResult(0, 10m), // 1 / 5

+	    new TestResult(0, 0m), // 1 / 6

+	    new TestResult(0, 0m), // 1 / 7

+	    new TestResult(2, 3.61E-26m), // 1 / 8

+	    new TestResult(2, -3.121239924198969049581E-07m), // 1 / 9

+	    new TestResult(2, -2.06327E-23m), // 1 / 10

+	    new TestResult(2, -1.8342105061E-18m), // 1 / 11

+	    new TestResult(0, 1.3107475704751451797758879069m), // 1 / 12

+	    new TestResult(2, -2.4971716E-21m), // 1 / 13

+	    new TestResult(2, 4.4873E-24m), // 1 / 14

+	    new TestResult(2, 7.02E-26m), // 1 / 15

+	    new TestResult(2, -2.3746014276625098667414E-06m), // 1 / 16

+	    new TestResult(2, 4.08775782642E-17m), // 1 / 17

+	    new TestResult(2, -1.879E-25m), // 1 / 18

+	    new TestResult(2, 9.7E-27m), // 1 / 19

+	    new TestResult(2, 1.412165941691409118E-10m), // 1 / 20

+	    new TestResult(2, 2.4052784859689137E-12m), // 1 / 21

+	    new TestResult(2, -1.565094023542766E-13m), // 1 / 22

+	    new TestResult(2, 2.2606723262128E-15m), // 1 / 23

+	    new TestResult(2, -1.9499495495573E-15m), // 1 / 24

+	    new TestResult(2, 1.6421963517E-18m), // 1 / 25

+	    new TestResult(2, -2.351E-23m), // 1 / 26

+	    new TestResult(2, -1.280693E-22m), // 1 / 27

+	    new TestResult(2, 1E-27m), // 1 / 28

+	    new TestResult(2, -2.00115147598754898E-10m), // 1 / 29

+	    new TestResult(3, 0m), // 2 / 0

+	    new TestResult(0, -1m), // 2 / 1

+	    new TestResult(0, 1m), // 2 / 2

+	    new TestResult(0, -0.5m), // 2 / 3

+	    new TestResult(0, -0.1m), // 2 / 4

+	    new TestResult(0, -10m), // 2 / 5

+	    new TestResult(0, 0m), // 2 / 6

+	    new TestResult(0, 0m), // 2 / 7

+	    new TestResult(2, -3.61E-26m), // 2 / 8

+	    new TestResult(2, 3.121239924198969049581E-07m), // 2 / 9

+	    new TestResult(2, 2.06327E-23m), // 2 / 10

+	    new TestResult(2, 1.8342105061E-18m), // 2 / 11

+	    new TestResult(0, -1.3107475704751451797758879069m), // 2 / 12

+	    new TestResult(2, 2.4971716E-21m), // 2 / 13

+	    new TestResult(2, -4.4873E-24m), // 2 / 14

+	    new TestResult(2, -7.02E-26m), // 2 / 15

+	    new TestResult(2, 2.3746014276625098667414E-06m), // 2 / 16

+	    new TestResult(2, -4.08775782642E-17m), // 2 / 17

+	    new TestResult(2, 1.879E-25m), // 2 / 18

+	    new TestResult(2, -9.7E-27m), // 2 / 19

+	    new TestResult(2, -1.412165941691409118E-10m), // 2 / 20

+	    new TestResult(2, -2.4052784859689137E-12m), // 2 / 21

+	    new TestResult(2, 1.565094023542766E-13m), // 2 / 22

+	    new TestResult(2, -2.2606723262128E-15m), // 2 / 23

+	    new TestResult(2, 1.9499495495573E-15m), // 2 / 24

+	    new TestResult(2, -1.6421963517E-18m), // 2 / 25

+	    new TestResult(2, 2.351E-23m), // 2 / 26

+	    new TestResult(2, 1.280693E-22m), // 2 / 27

+	    new TestResult(2, -1E-27m), // 2 / 28

+	    new TestResult(2, 2.00115147598754898E-10m), // 2 / 29

+	    new TestResult(3, 0m), // 3 / 0

+	    new TestResult(0, 2m), // 3 / 1

+	    new TestResult(0, -2m), // 3 / 2

+	    new TestResult(0, 1m), // 3 / 3

+	    new TestResult(0, 0.2m), // 3 / 4

+	    new TestResult(0, 20m), // 3 / 5

+	    new TestResult(0, 0m), // 3 / 6

+	    new TestResult(0, 0m), // 3 / 7

+	    new TestResult(2, 7.22E-26m), // 3 / 8

+	    new TestResult(2, -6.242479848397938099161E-07m), // 3 / 9

+	    new TestResult(2, -4.12653E-23m), // 3 / 10

+	    new TestResult(2, -3.6684210122E-18m), // 3 / 11

+	    new TestResult(0, 2.6214951409502903595517758138m), // 3 / 12

+	    new TestResult(2, -4.9943432E-21m), // 3 / 13

+	    new TestResult(2, 8.9746E-24m), // 3 / 14

+	    new TestResult(2, 1.404E-25m), // 3 / 15

+	    new TestResult(2, -4.7492028553250197334829E-06m), // 3 / 16

+	    new TestResult(2, 8.17551565284E-17m), // 3 / 17

+	    new TestResult(2, -3.757E-25m), // 3 / 18

+	    new TestResult(2, 1.95E-26m), // 3 / 19

+	    new TestResult(2, 2.824331883382818237E-10m), // 3 / 20

+	    new TestResult(2, 4.8105569719378275E-12m), // 3 / 21

+	    new TestResult(2, -3.130188047085533E-13m), // 3 / 22

+	    new TestResult(2, 4.5213446524256E-15m), // 3 / 23

+	    new TestResult(2, -3.8998990991146E-15m), // 3 / 24

+	    new TestResult(2, 3.2843927034E-18m), // 3 / 25

+	    new TestResult(2, -4.702E-23m), // 3 / 26

+	    new TestResult(2, -2.561385E-22m), // 3 / 27

+	    new TestResult(2, 1.9E-27m), // 3 / 28

+	    new TestResult(2, -4.002302951975097959E-10m), // 3 / 29

+	    new TestResult(3, 0m), // 4 / 0

+	    new TestResult(0, 10m), // 4 / 1

+	    new TestResult(0, -10m), // 4 / 2

+	    new TestResult(0, 5m), // 4 / 3

+	    new TestResult(0, 1m), // 4 / 4

+	    new TestResult(0, 100m), // 4 / 5

+	    new TestResult(2, 1E-28m), // 4 / 6

+	    new TestResult(2, -1E-28m), // 4 / 7

+	    new TestResult(2, 3.61E-25m), // 4 / 8

+	    new TestResult(2, -3.1212399241989690495806E-06m), // 4 / 9

+	    new TestResult(2, -2.063265E-22m), // 4 / 10

+	    new TestResult(2, -1.83421050609E-17m), // 4 / 11

+	    new TestResult(0, 13.107475704751451797758879069m), // 4 / 12

+	    new TestResult(2, -2.49717158E-20m), // 4 / 13

+	    new TestResult(2, 4.48729E-23m), // 4 / 14

+	    new TestResult(2, 7.019E-25m), // 4 / 15

+	    new TestResult(2, -2.37460142766250986674143E-05m), // 4 / 16

+	    new TestResult(2, 4.087757826422E-16m), // 4 / 17

+	    new TestResult(2, -1.8785E-24m), // 4 / 18

+	    new TestResult(2, 9.73E-26m), // 4 / 19

+	    new TestResult(2, 1.4121659416914091185E-09m), // 4 / 20

+	    new TestResult(2, 2.40527848596891375E-11m), // 4 / 21

+	    new TestResult(2, -1.5650940235427663E-12m), // 4 / 22

+	    new TestResult(2, 2.26067232621278E-14m), // 4 / 23

+	    new TestResult(2, -1.94994954955729E-14m), // 4 / 24

+	    new TestResult(2, 1.64219635168E-17m), // 4 / 25

+	    new TestResult(2, -2.351002E-22m), // 4 / 26

+	    new TestResult(2, -1.2806927E-21m), // 4 / 27

+	    new TestResult(2, 9.6E-27m), // 4 / 28

+	    new TestResult(2, -2.0011514759875489796E-09m), // 4 / 29

+	    new TestResult(3, 0m), // 5 / 0

+	    new TestResult(0, 0.1m), // 5 / 1

+	    new TestResult(0, -0.1m), // 5 / 2

+	    new TestResult(0, 0.05m), // 5 / 3

+	    new TestResult(0, 0.01m), // 5 / 4

+	    new TestResult(0, 1m), // 5 / 5

+	    new TestResult(0, 0m), // 5 / 6

+	    new TestResult(0, 0m), // 5 / 7

+	    new TestResult(2, 3.6E-27m), // 5 / 8

+	    new TestResult(2, -3.12123992419896904958E-08m), // 5 / 9

+	    new TestResult(2, -2.0633E-24m), // 5 / 10

+	    new TestResult(2, -1.834210506E-19m), // 5 / 11

+	    new TestResult(0, 0.1310747570475145179775887907m), // 5 / 12

+	    new TestResult(2, -2.497172E-22m), // 5 / 13

+	    new TestResult(2, 4.487E-25m), // 5 / 14

+	    new TestResult(2, 7E-27m), // 5 / 15

+	    new TestResult(2, -2.374601427662509866741E-07m), // 5 / 16

+	    new TestResult(2, 4.0877578264E-18m), // 5 / 17

+	    new TestResult(2, -1.88E-26m), // 5 / 18

+	    new TestResult(2, 1E-27m), // 5 / 19

+	    new TestResult(2, 1.41216594169140912E-11m), // 5 / 20

+	    new TestResult(2, 2.405278485968914E-13m), // 5 / 21

+	    new TestResult(2, -1.56509402354277E-14m), // 5 / 22

+	    new TestResult(2, 2.260672326213E-16m), // 5 / 23

+	    new TestResult(2, -1.949949549557E-16m), // 5 / 24

+	    new TestResult(2, 1.642196352E-19m), // 5 / 25

+	    new TestResult(2, -2.351E-24m), // 5 / 26

+	    new TestResult(2, -1.28069E-23m), // 5 / 27

+	    new TestResult(2, 1E-28m), // 5 / 28

+	    new TestResult(2, -2.00115147598754898E-11m), // 5 / 29

+	    new TestResult(3, 0m), // 6 / 0

+	    new TestResult(0, 79228162514264337593543950335m), // 6 / 1

+	    new TestResult(0, -79228162514264337593543950335m), // 6 / 2

+	    new TestResult(4, 39614081257132168796771975168m), // 6 / 3

+	    new TestResult(4, 7922816251426433759354395034m), // 6 / 4

+	    new TestResult(1, 0m), // 6 / 5

+	    new TestResult(0, 1m), // 6 / 6

+	    new TestResult(0, -1m), // 6 / 7

+	    new TestResult(2, 2859.8815108190596050496514036m), // 6 / 8

+	    new TestResult(2, -24729010396044602218186.765763m), // 6 / 9

+	    new TestResult(0, -1634686.9890330150250120997619m), // 6 / 10

+	    new TestResult(2, -145321128061.87519668639091926m), // 6 / 11

+	    new TestResult(1, 0m), // 6 / 12

+	    new TestResult(0, -197846315.8215581473367403789m), // 6 / 13

+	    new TestResult(0, 355519.78373087286985534915017m), // 6 / 14

+	    new TestResult(0, 5561.4152228343398478498516935m), // 6 / 15

+	    new TestResult(0, -188135307817449443294332.61564m), // 6 / 16

+	    new TestResult(4, 3238655413907.0152158135371692m), // 6 / 17

+	    new TestResult(0, -14883.393842880239095927799143m), // 6 / 18

+	    new TestResult(0, 770.69397665852204557888702506m), // 6 / 19

+	    new TestResult(4, 11188331272543609822.484506627m), // 6 / 20

+	    new TestResult(0, 190565794778408772.72439011791m), // 6 / 21

+	    new TestResult(4, -12399952364735014.543439368391m), // 6 / 22

+	    new TestResult(2, 179108914452685.79816067884477m), // 6 / 23

+	    new TestResult(2, -154490919806941.48506503891762m), // 6 / 24

+	    new TestResult(2, 130108199431.16705963085822836m), // 6 / 25

+	    new TestResult(2, -1862655.7707746844883926874832m), // 6 / 26

+	    new TestResult(2, -10146692.753313261555369747673m), // 6 / 27

+	    new TestResult(0, 76.341858036091015923443233609m), // 6 / 28

+	    new TestResult(2, -15854755435520147876.101506668m), // 6 / 29

+	    new TestResult(3, 0m), // 7 / 0

+	    new TestResult(0, -79228162514264337593543950335m), // 7 / 1

+	    new TestResult(0, 79228162514264337593543950335m), // 7 / 2

+	    new TestResult(4, -39614081257132168796771975168m), // 7 / 3

+	    new TestResult(4, -7922816251426433759354395034m), // 7 / 4

+	    new TestResult(1, 0m), // 7 / 5

+	    new TestResult(0, -1m), // 7 / 6

+	    new TestResult(0, 1m), // 7 / 7

+	    new TestResult(2, -2859.8815108190596050496514036m), // 7 / 8

+	    new TestResult(2, 24729010396044602218186.765763m), // 7 / 9

+	    new TestResult(0, 1634686.9890330150250120997619m), // 7 / 10

+	    new TestResult(2, 145321128061.87519668639091926m), // 7 / 11

+	    new TestResult(1, 0m), // 7 / 12

+	    new TestResult(0, 197846315.8215581473367403789m), // 7 / 13

+	    new TestResult(0, -355519.78373087286985534915017m), // 7 / 14

+	    new TestResult(0, -5561.4152228343398478498516935m), // 7 / 15

+	    new TestResult(0, 188135307817449443294332.61564m), // 7 / 16

+	    new TestResult(4, -3238655413907.0152158135371692m), // 7 / 17

+	    new TestResult(0, 14883.393842880239095927799143m), // 7 / 18

+	    new TestResult(0, -770.69397665852204557888702506m), // 7 / 19

+	    new TestResult(4, -11188331272543609822.484506627m), // 7 / 20

+	    new TestResult(0, -190565794778408772.72439011791m), // 7 / 21

+	    new TestResult(4, 12399952364735014.543439368391m), // 7 / 22

+	    new TestResult(2, -179108914452685.79816067884477m), // 7 / 23

+	    new TestResult(2, 154490919806941.48506503891762m), // 7 / 24

+	    new TestResult(2, -130108199431.16705963085822836m), // 7 / 25

+	    new TestResult(2, 1862655.7707746844883926874832m), // 7 / 26

+	    new TestResult(2, 10146692.753313261555369747673m), // 7 / 27

+	    new TestResult(0, -76.341858036091015923443233609m), // 7 / 28

+	    new TestResult(2, 15854755435520147876.101506668m), // 7 / 29

+	    new TestResult(3, 0m), // 8 / 0

+	    new TestResult(0, 27703302467091960609331879.532m), // 8 / 1

+	    new TestResult(0, -27703302467091960609331879.532m), // 8 / 2

+	    new TestResult(0, 13851651233545980304665939.766m), // 8 / 3

+	    new TestResult(0, 2770330246709196060933187.9532m), // 8 / 4

+	    new TestResult(0, 277033024670919606093318795.32m), // 8 / 5

+	    new TestResult(2, 0.0003496648361888264585379374m), // 8 / 6

+	    new TestResult(2, -0.0003496648361888264585379374m), // 8 / 7

+	    new TestResult(0, 1m), // 8 / 8

+	    new TestResult(2, -8646865369244722339.540450168m), // 8 / 9

+	    new TestResult(0, -571.59255824023515226354006889m), // 8 / 10

+	    new TestResult(0, -50813688.438531062464476589278m), // 8 / 11

+	    new TestResult(0, 36312036402878882966329689.018m), // 8 / 12

+	    new TestResult(0, -69179.899612307954004328275068m), // 8 / 13

+	    new TestResult(2, 124.31276694014267187689413445m), // 8 / 14

+	    new TestResult(0, 1.9446313428704152390534655913m), // 8 / 15

+	    new TestResult(0, -65784301589322901428.917817252m), // 8 / 16

+	    new TestResult(2, 1132443914.7758524269197245123m), // 8 / 17

+	    new TestResult(0, -5.2041994700045071214948001057m), // 8 / 18

+	    new TestResult(2, 0.2694845831000173532986745484m), // 8 / 19

+	    new TestResult(0, 3912166021640285.6025706982227m), // 8 / 20

+	    new TestResult(0, 66634157414385.824002109431498m), // 8 / 21

+	    new TestResult(0, -4335827312364.3201348613764117m), // 8 / 22

+	    new TestResult(0, 62628089232.056911382057917869m), // 8 / 23

+	    new TestResult(0, -54020042166.955319300276527479m), // 8 / 24

+	    new TestResult(0, 45494262.240922193719761217507m), // 8 / 25

+	    new TestResult(0, -651.30522496410233725620872491m), // 8 / 26

+	    new TestResult(0, -3547.9416594456341168641639951m), // 8 / 27

+	    new TestResult(2, 0.0266940632845404098551052086m), // 8 / 28

+	    new TestResult(0, -5543850462175058.4016671641533m), // 8 / 29

+	    new TestResult(3, 0m), // 9 / 0

+	    new TestResult(0, -3203854.9559968181492513385018m), // 9 / 1

+	    new TestResult(0, 3203854.9559968181492513385018m), // 9 / 2

+	    new TestResult(0, -1601927.4779984090746256692509m), // 9 / 3

+	    new TestResult(0, -320385.49559968181492513385018m), // 9 / 4

+	    new TestResult(0, -32038549.559968181492513385018m), // 9 / 5

+	    new TestResult(2, -4.04383E-23m), // 9 / 6

+	    new TestResult(2, 4.04383E-23m), // 9 / 7

+	    new TestResult(2, -1.156488458E-19m), // 9 / 8

+	    new TestResult(0, 1m), // 9 / 9

+	    new TestResult(2, 6.61040196455E-17m), // 9 / 10

+	    new TestResult(2, 5.8765444202781065E-12m), // 9 / 11

+	    new TestResult(0, -4199445.0997275825559060668592m), // 9 / 12

+	    new TestResult(2, 8.0005755447943E-15m), // 9 / 13

+	    new TestResult(2, -1.43766280186E-17m), // 9 / 14

+	    new TestResult(2, -2.248943704E-19m), // 9 / 15

+	    new TestResult(0, 7.6078785525336521046280405305m), // 9 / 16

+	    new TestResult(2, -1.309658317109623269E-10m), // 9 / 17

+	    new TestResult(2, 6.018596622E-19m), // 9 / 18

+	    new TestResult(2, -3.1165581E-20m), // 9 / 19

+	    new TestResult(2, -0.0004524374850977934825669157m), // 9 / 20

+	    new TestResult(2, -7.7061633978240275370839E-06m), // 9 / 21

+	    new TestResult(2, 5.014334243928492665444E-07m), // 9 / 22

+	    new TestResult(2, -7.242866236221657103E-09m), // 9 / 23

+	    new TestResult(2, 6.2473555282928855602E-09m), // 9 / 24

+	    new TestResult(2, -5.261358920047113E-12m), // 9 / 25

+	    new TestResult(2, 7.53226975501E-17m), // 9 / 26

+	    new TestResult(2, 4.103153579868E-16m), // 9 / 27

+	    new TestResult(2, -3.0871376E-21m), // 9 / 28

+	    new TestResult(2, 0.0006411399074043056427231896m), // 9 / 29

+	    new TestResult(3, 0m), // 10 / 0

+	    new TestResult(0, -48466870444188873796420.028868m), // 10 / 1

+	    new TestResult(0, 48466870444188873796420.028868m), // 10 / 2

+	    new TestResult(0, -24233435222094436898210.014434m), // 10 / 3

+	    new TestResult(0, -4846687044418887379642.0028868m), // 10 / 4

+	    new TestResult(0, -484668704441888737964200.28868m), // 10 / 5

+	    new TestResult(2, -6.11737908669317400216E-07m), // 10 / 6

+	    new TestResult(2, 6.11737908669317400216E-07m), // 10 / 7

+	    new TestResult(2, -0.001749497934470499347067655m), // 10 / 8

+	    new TestResult(2, 15127673103138133.38384122385m), // 10 / 9

+	    new TestResult(0, 1m), // 10 / 10

+	    new TestResult(2, 88898.44296603758700885485801m), // 10 / 11

+	    new TestResult(0, -63527832683254186820073.01815m), // 10 / 12

+	    new TestResult(2, 121.03009147860926410013615872m), // 10 / 13

+	    new TestResult(2, -0.217484928990092181791376891m), // 10 / 14

+	    new TestResult(2, -0.0034021285176583848675539818m), // 10 / 15

+	    new TestResult(2, 115089499751104803.45385549602m), // 10 / 16

+	    new TestResult(2, -1981208.2898040400164777217752m), // 10 / 17

+	    new TestResult(2, 0.0091047362233453526323903968m), // 10 / 18

+	    new TestResult(2, -0.0004714627215051239953535366m), // 10 / 19

+	    new TestResult(0, -6844326374165.3505116694016252m), // 10 / 20

+	    new TestResult(2, -116576320761.65010852644993727m), // 10 / 21

+	    new TestResult(0, 7585520927.2021546507200976307m), // 10 / 22

+	    new TestResult(2, -109567712.75131768812510902617m), // 10 / 23

+	    new TestResult(2, 94507952.1910976087542637813m), // 10 / 24

+	    new TestResult(0, -79592.11782075260884714858998m), // 10 / 25

+	    new TestResult(0, 1.1394571457845409462816707224m), // 10 / 26

+	    new TestResult(0, 6.2071166048219727069770728387m), // 10 / 27

+	    new TestResult(2, -4.67012085789282405269787E-05m), // 10 / 28

+	    new TestResult(2, 9698954932588.587842740128447m), // 10 / 29

+	    new TestResult(3, 0m), // 11 / 0

+	    new TestResult(0, -545193693242804794.30331374676m), // 11 / 1

+	    new TestResult(0, 545193693242804794.30331374676m), // 11 / 2

+	    new TestResult(0, -272596846621402397.15165687338m), // 11 / 3

+	    new TestResult(0, -54519369324280479.430331374676m), // 11 / 4

+	    new TestResult(0, -5451936932428047943.0331374676m), // 11 / 5

+	    new TestResult(2, -6.8813118459568899E-12m), // 11 / 6

+	    new TestResult(2, 6.8813118459568899E-12m), // 11 / 7

+	    new TestResult(2, -1.96797365184322821747E-08m), // 11 / 8

+	    new TestResult(2, 170168032177.09280206999941461m), // 11 / 9

+	    new TestResult(2, 1.12487909420644868170014E-05m), // 11 / 10

+	    new TestResult(0, 1m), // 11 / 11

+	    new TestResult(0, -714611308856377959.50595110446m), // 11 / 12

+	    new TestResult(2, 0.0013614421967418161221277362m), // 11 / 13

+	    new TestResult(2, -2.4464424992592870530962E-06m), // 11 / 14

+	    new TestResult(2, -3.82698324531749191876E-08m), // 11 / 15

+	    new TestResult(2, 1294617722326.9607230936474447m), // 11 / 16

+	    new TestResult(0, -22.286197864690758108786295635m), // 11 / 17

+	    new TestResult(2, 1.024172743590536270877E-07m), // 11 / 18

+	    new TestResult(2, -5.3033855911879105358E-09m), // 11 / 19

+	    new TestResult(0, -76990396.522244266468310204941m), // 11 / 20

+	    new TestResult(2, -1311342.6610428539176292952583m), // 11 / 21

+	    new TestResult(2, 85327.93909675220473779587097m), // 11 / 22

+	    new TestResult(2, -1232.5042947397459817875590485m), // 11 / 23

+	    new TestResult(2, 1063.1001965602823514109428061m), // 11 / 24

+	    new TestResult(2, -0.8953150940018113683593315845m), // 11 / 25

+	    new TestResult(2, 1.28175152203717976446025E-05m), // 11 / 26

+	    new TestResult(2, 6.98225570406594773014162E-05m), // 11 / 27

+	    new TestResult(2, -5.253321320461122964E-10m), // 11 / 28

+	    new TestResult(2, 109101516.393194182269828744m), // 11 / 29

+	    new TestResult(3, 0m), // 12 / 0

+	    new TestResult(0, 0.7629234053338741809892531431m), // 12 / 1

+	    new TestResult(0, -0.7629234053338741809892531431m), // 12 / 2

+	    new TestResult(2, 0.3814617026669370904946265716m), // 12 / 3

+	    new TestResult(2, 0.0762923405333874180989253143m), // 12 / 4

+	    new TestResult(0, 7.629234053338741809892531431m), // 12 / 5

+	    new TestResult(0, 0m), // 12 / 6

+	    new TestResult(0, 0m), // 12 / 7

+	    new TestResult(2, 2.75E-26m), // 12 / 8

+	    new TestResult(2, -2.381266991833920788159E-07m), // 12 / 9

+	    new TestResult(2, -1.57411E-23m), // 12 / 10

+	    new TestResult(2, -1.3993621254E-18m), // 12 / 11

+	    new TestResult(0, 1m), // 12 / 12

+	    new TestResult(2, -1.9051506E-21m), // 12 / 13

+	    new TestResult(2, 3.4235E-24m), // 12 / 14

+	    new TestResult(2, 5.36E-26m), // 12 / 15

+	    new TestResult(2, -1.8116390075029613252172E-06m), // 12 / 16

+	    new TestResult(2, 3.11864612111E-17m), // 12 / 17

+	    new TestResult(2, -1.433E-25m), // 12 / 18

+	    new TestResult(2, 7.4E-27m), // 12 / 19

+	    new TestResult(2, 1.077374449131727051E-10m), // 12 / 20

+	    new TestResult(2, 1.8350432532917088E-12m), // 12 / 21

+	    new TestResult(2, -1.194046862108942E-13m), // 12 / 22

+	    new TestResult(2, 1.7247198294583E-15m), // 12 / 23

+	    new TestResult(2, -1.4876621505775E-15m), // 12 / 24

+	    new TestResult(2, 1.2528700328E-18m), // 12 / 25

+	    new TestResult(2, -1.79363E-23m), // 12 / 26

+	    new TestResult(2, -9.7707E-23m), // 12 / 27

+	    new TestResult(2, 7E-28m), // 12 / 28

+	    new TestResult(2, -1.526725298649329415E-10m), // 12 / 29

+	    new TestResult(3, 0m), // 13 / 0

+	    new TestResult(0, -400453059665371395972.33474452m), // 13 / 1

+	    new TestResult(0, 400453059665371395972.33474452m), // 13 / 2

+	    new TestResult(0, -200226529832685697986.16737226m), // 13 / 3

+	    new TestResult(0, -40045305966537139597.233474452m), // 13 / 4

+	    new TestResult(0, -4004530596653713959723.3474452m), // 13 / 5

+	    new TestResult(2, -5.0544282103383796846E-09m), // 13 / 6

+	    new TestResult(2, 5.0544282103383796846E-09m), // 13 / 7

+	    new TestResult(2, -1.44550657865090008770424E-05m), // 13 / 8

+	    new TestResult(0, 124991007759518.90460797449561m), // 13 / 9

+	    new TestResult(2, 0.0082624080324415766315344098m), // 13 / 10

+	    new TestResult(0, 734.51520923413833710945795487m), // 13 / 11

+	    new TestResult(0, -524892875045723911444.75281192m), // 13 / 12

+	    new TestResult(0, 1m), // 13 / 13

+	    new TestResult(2, -0.0017969492242227235536064218m), // 13 / 14

+	    new TestResult(2, -2.81097739916991934127E-05m), // 13 / 15

+	    new TestResult(0, 950916407193211.1625559901416m), // 13 / 16

+	    new TestResult(2, -16369.551287616739221174657438m), // 13 / 17

+	    new TestResult(2, 7.52270457050304262522489E-05m), // 13 / 18

+	    new TestResult(2, -3.8954173771607025488213E-06m), // 13 / 19

+	    new TestResult(0, -56550617210.555523949138629466m), // 13 / 20

+	    new TestResult(2, -963201129.053543593301215979m), // 13 / 21

+	    new TestResult(0, 62674669.039168758653283589393m), // 13 / 22

+	    new TestResult(2, -905293.1499327386264702284996m), // 13 / 23

+	    new TestResult(0, 780863.26331332938464898250347m), // 13 / 24

+	    new TestResult(0, -657.62255360122271090761257385m), // 13 / 25

+	    new TestResult(2, 0.0094146598739531437042039072m), // 13 / 26

+	    new TestResult(2, 0.0512857300939825548661107378m), // 13 / 27

+	    new TestResult(2, -3.858644408872661628546E-07m), // 13 / 28

+	    new TestResult(2, 80136723141.3087985919301071m), // 13 / 29

+	    new TestResult(3, 0m), // 14 / 0

+	    new TestResult(0, 222851627785191714190050.61676m), // 14 / 1

+	    new TestResult(0, -222851627785191714190050.61676m), // 14 / 2

+	    new TestResult(0, 111425813892595857095025.30838m), // 14 / 3

+	    new TestResult(0, 22285162778519171419005.061676m), // 14 / 4

+	    new TestResult(0, 2228516277851917141900506.1676m), // 14 / 5

+	    new TestResult(2, 2.8127829891936371496034E-06m), // 14 / 6

+	    new TestResult(2, -2.8127829891936371496034E-06m), // 14 / 7

+	    new TestResult(2, 0.0080442260647412496180191824m), // 14 / 8

+	    new TestResult(0, -69557339781586865.090190294226m), // 14 / 9

+	    new TestResult(0, -4.5980197554082303507855592074m), // 14 / 10

+	    new TestResult(0, -408756.79698287266169556154972m), // 14 / 11

+	    new TestResult(0, 292102229695871398106087.53771m), // 14 / 12

+	    new TestResult(0, -556.49875161751071295835933612m), // 14 / 13

+	    new TestResult(0, 1m), // 14 / 14

+	    new TestResult(2, 0.0156430541346309720805875037m), // 14 / 15

+	    new TestResult(0, -529183793495630496.21134784463m), // 14 / 16

+	    new TestResult(0, 9109634.856097530429701051341m), // 14 / 17

+	    new TestResult(2, -0.0418637570227228532534385582m), // 14 / 18

+	    new TestResult(2, 0.0021677949074190888565424407m), // 14 / 19

+	    new TestResult(0, 31470347880873.8650457716423m), // 14 / 20

+	    new TestResult(0, 536020225874.87383772032904409m), // 14 / 21

+	    new TestResult(0, -34878375078.338063831579069802m), // 14 / 22

+	    new TestResult(0, 503794507.78545299809142202221m), // 14 / 23

+	    new TestResult(0, -434549431.21784335466036244264m), // 14 / 24

+	    new TestResult(0, 365966.13011459996262470838791m), // 14 / 25

+	    new TestResult(0, -5.2392464667583952349382510034m), // 14 / 26

+	    new TestResult(0, -28.540444773093892153704750451m), // 14 / 27

+	    new TestResult(2, 0.0002147330796473523774307252m), // 14 / 28

+	    new TestResult(0, -44595986386856.427962855912902m), // 14 / 29

+	    new TestResult(3, 0m), // 15 / 0

+	    new TestResult(0, 14246043379204153213661335.584m), // 15 / 1

+	    new TestResult(0, -14246043379204153213661335.584m), // 15 / 2

+	    new TestResult(0, 7123021689602076606830667.792m), // 15 / 3

+	    new TestResult(0, 1424604337920415321366133.5584m), // 15 / 4

+	    new TestResult(0, 142460433792041532136613355.84m), // 15 / 5

+	    new TestResult(2, 0.000179810346814988644017588m), // 15 / 6

+	    new TestResult(2, -0.000179810346814988644017588m), // 15 / 7

+	    new TestResult(2, 0.5142362863101488055319975668m), // 15 / 8

+	    new TestResult(0, -4446531935704239606.853757764m), // 15 / 9

+	    new TestResult(0, -293.9336344319759696558350238m), // 15 / 10

+	    new TestResult(0, -26130242.436351157631251931791m), // 15 / 11

+	    new TestResult(0, 18672966748175371201221341.455m), // 15 / 12

+	    new TestResult(0, -35574.814663942145387025413585m), // 15 / 13

+	    new TestResult(0, 63.926135612238008074953534656m), // 15 / 14

+	    new TestResult(0, 1m), // 15 / 15

+	    new TestResult(0, -33828674946800228646.235978357m), // 15 / 16

+	    new TestResult(0, 582343753.18886100200299543357m), // 15 / 17

+	    new TestResult(0, -2.676188208672362394790189458m), // 15 / 18

+	    new TestResult(2, 0.1385787512311916118536189686m), // 15 / 19

+	    new TestResult(0, 2011777726397049.7148998294303m), // 15 / 20

+	    new TestResult(0, 34265701650179.633435597272951m), // 15 / 21

+	    new TestResult(0, -2229639735192.3415269889385254m), // 15 / 22

+	    new TestResult(0, 32205636025.393565317814400562m), // 15 / 23

+	    new TestResult(0, -27779065870.252746877787654023m), // 15 / 24

+	    new TestResult(0, 23394800.463191857206004010592m), // 15 / 25

+	    new TestResult(0, -334.92478013993600679391750784m), // 15 / 26

+	    new TestResult(0, -1824.480342998389574945394373m), // 15 / 27

+	    new TestResult(2, 0.0137270559699701534233028604m), // 15 / 28

+	    new TestResult(0, -2850849073527704.1131980257228m), // 15 / 29

+	    new TestResult(3, 0m), // 16 / 0

+	    new TestResult(0, -421123.30446308691436596648186m), // 16 / 1

+	    new TestResult(0, 421123.30446308691436596648186m), // 16 / 2

+	    new TestResult(0, -210561.65223154345718298324093m), // 16 / 3

+	    new TestResult(0, -42112.330446308691436596648186m), // 16 / 4

+	    new TestResult(0, -4211233.0446308691436596648186m), // 16 / 5

+	    new TestResult(2, -5.3153E-24m), // 16 / 6

+	    new TestResult(2, 5.3153E-24m), // 16 / 7

+	    new TestResult(2, -1.52011951E-20m), // 16 / 8

+	    new TestResult(2, 0.1314426870900784765046305445m), // 16 / 9

+	    new TestResult(2, 8.6888899697E-18m), // 16 / 10

+	    new TestResult(2, 7.724287894055618E-13m), // 16 / 11

+	    new TestResult(0, -551986.34819545603591091806686m), // 16 / 12

+	    new TestResult(2, 1.0516171478749E-15m), // 16 / 13

+	    new TestResult(2, -1.8897026181E-18m), // 16 / 14

+	    new TestResult(2, -2.95607204E-20m), // 16 / 15

+	    new TestResult(0, 1m), // 16 / 16

+	    new TestResult(2, -1.72145008370758982E-11m), // 16 / 17

+	    new TestResult(2, 7.91100512E-20m), // 16 / 18

+	    new TestResult(2, -4.0964877E-21m), // 16 / 19

+	    new TestResult(2, -5.94695987815313124908788E-05m), // 16 / 20

+	    new TestResult(2, -1.012918824165199591208E-06m), // 16 / 21

+	    new TestResult(2, 6.59097566989758101184E-08m), // 16 / 22

+	    new TestResult(2, -9.520218003229776933E-10m), // 16 / 23

+	    new TestResult(2, 8.211691978458736692E-10m), // 16 / 24

+	    new TestResult(2, -6.915671541963459E-13m), // 16 / 25

+	    new TestResult(2, 9.9006177649E-18m), // 16 / 26

+	    new TestResult(2, 5.39329532081E-17m), // 16 / 27

+	    new TestResult(2, -4.057817E-22m), // 16 / 28

+	    new TestResult(2, 8.42731522299060351340978E-05m), // 16 / 29

+	    new TestResult(3, 0m), // 17 / 0

+	    new TestResult(0, 24463288738299545.200508898642m), // 17 / 1

+	    new TestResult(0, -24463288738299545.200508898642m), // 17 / 2

+	    new TestResult(0, 12231644369149772.600254449321m), // 17 / 3

+	    new TestResult(0, 2446328873829954.5200508898642m), // 17 / 4

+	    new TestResult(0, 244632887382995452.00508898642m), // 17 / 5

+	    new TestResult(2, 3.087701135804474E-13m), // 17 / 6

+	    new TestResult(2, -3.087701135804474E-13m), // 17 / 7

+	    new TestResult(2, 8.830459389222225669E-10m), // 17 / 8

+	    new TestResult(0, -7635579348.7187565660747357791m), // 17 / 9

+	    new TestResult(2, -5.047424872722036356353E-07m), // 17 / 10

+	    new TestResult(2, -0.0448708212173039475800037318m), // 17 / 11

+	    new TestResult(0, 32065196279558108.529140993113m), // 17 / 12

+	    new TestResult(2, -6.10890294076955781848965E-05m), // 17 / 13

+	    new TestResult(2, 1.097738840026777145636E-07m), // 17 / 14

+	    new TestResult(2, 1.7171988100225883459E-09m), // 17 / 15

+	    new TestResult(0, -58090560363.286299748647320613m), // 17 / 16

+	    new TestResult(0, 1m), // 17 / 17

+	    new TestResult(2, -4.5955472073286630491E-09m), // 17 / 18

+	    new TestResult(2, 2.379672667086185355E-10m), // 17 / 19

+	    new TestResult(0, 3454622.3177989620890093190782m), // 17 / 20

+	    new TestResult(0, 58841.022098277508341771781449m), // 17 / 21

+	    new TestResult(0, -3828.7347000513678647353825371m), // 17 / 22

+	    new TestResult(0, 55.303479858826432190514052161m), // 17 / 23

+	    new TestResult(0, -47.702178855937114485246771806m), // 17 / 24

+	    new TestResult(2, 0.0401735235161089558399723624m), // 17 / 25

+	    new TestResult(2, -5.751324339033751411128E-07m), // 17 / 26

+	    new TestResult(2, -3.1329954739064384030107E-06m), // 17 / 27

+	    new TestResult(2, 2.35720841767462147E-11m), // 17 / 28

+	    new TestResult(0, -4895474.6366157719700764456737m), // 17 / 29

+	    new TestResult(3, 0m), // 18 / 0

+	    new TestResult(0, -5323259153836385912697776.001m), // 18 / 1

+	    new TestResult(0, 5323259153836385912697776.001m), // 18 / 2

+	    new TestResult(0, -2661629576918192956348888.0005m), // 18 / 3

+	    new TestResult(0, -532325915383638591269777.6001m), // 18 / 4

+	    new TestResult(0, -53232591538363859126977760.01m), // 18 / 5

+	    new TestResult(2, -6.71889765571425396685425E-05m), // 18 / 6

+	    new TestResult(2, 6.71889765571425396685425E-05m), // 18 / 7

+	    new TestResult(2, -0.1921525117866271842350897941m), // 18 / 8

+	    new TestResult(2, 1661516899781174928.9093780261m), // 18 / 9

+	    new TestResult(2, 109.83294578440517035615430815m), // 18 / 10

+	    new TestResult(0, 9763977.866606841461047851247m), // 18 / 11

+	    new TestResult(0, -6977449002900619940294072.5616m), // 18 / 12

+	    new TestResult(2, 13293.091475651689504900168879m), // 18 / 13

+	    new TestResult(2, -23.887010414694002921991680138m), // 18 / 14

+	    new TestResult(2, -0.3736657970315521134142448751m), // 18 / 15

+	    new TestResult(2, 12640618786517406225.453062932m), // 18 / 16

+	    new TestResult(2, -217601942.68166121398235985303m), // 18 / 17

+	    new TestResult(0, 1m), // 18 / 18

+	    new TestResult(2, -0.0517821395304403973786481636m), // 18 / 19

+	    new TestResult(0, -751732527584477.35915419894761m), // 18 / 20

+	    new TestResult(2, -12803920717959.743225565448731m), // 18 / 21

+	    new TestResult(2, 833140108743.8650907762143944m), // 18 / 22

+	    new TestResult(2, -12034144654.336754703603784598m), // 18 / 23

+	    new TestResult(2, 10380086789.199979490407779016m), // 18 / 24

+	    new TestResult(2, -8741836.761472709884309939817m), // 18 / 25

+	    new TestResult(2, 125.14993491660654415586289072m), // 18 / 26

+	    new TestResult(0, 681.74590153489282094280759828m), // 18 / 27

+	    new TestResult(2, -0.0051293313099156230719389272m), // 18 / 28

+	    new TestResult(2, 1065264791276391.4723331595476m), // 18 / 29

+	    new TestResult(3, 0m), // 19 / 0

+	    new TestResult(0, 102801066199805834724673169.19m), // 19 / 1

+	    new TestResult(0, -102801066199805834724673169.19m), // 19 / 2

+	    new TestResult(0, 51400533099902917362336584.595m), // 19 / 3

+	    new TestResult(0, 10280106619980583472467316.919m), // 19 / 4

+	    new TestResult(0, 1028010661998058347246731691.9m), // 19 / 5

+	    new TestResult(2, 0.0012975318742410238535080931m), // 19 / 6

+	    new TestResult(2, -0.0012975318742410238535080931m), // 19 / 7

+	    new TestResult(0, 3.7107874168403053465719309061m), // 19 / 8

+	    new TestResult(0, -32086679207305516282.844795417m), // 19 / 9

+	    new TestResult(0, -2121.0584726774239906503858037m), // 19 / 10

+	    new TestResult(0, -188558795.66094477019222763757m), // 19 / 11

+	    new TestResult(0, 134746247763650063417846672.74m), // 19 / 12

+	    new TestResult(0, -256711.90097962787395549999647m), // 19 / 13

+	    new TestResult(0, 461.29825131408293475234811789m), // 19 / 14

+	    new TestResult(0, 7.2161135175168023022995955438m), // 19 / 15

+	    new TestResult(0, -244111558563287122929.04506056m), // 19 / 16

+	    new TestResult(0, 4202258629.2276083227657702227m), // 19 / 17

+	    new TestResult(0, -19.311677908019711128996883838m), // 19 / 18

+	    new TestResult(0, 1m), // 19 / 19

+	    new TestResult(0, 14517216445692969.517326696553m), // 19 / 20

+	    new TestResult(0, 247265192865059.0518154425151m), // 19 / 21

+	    new TestResult(0, -16089333432314.039236231362245m), // 19 / 22

+	    new TestResult(0, 232399525463.06860877964908684m), // 19 / 23

+	    new TestResult(0, -200456892730.3205001486617745m), // 19 / 24

+	    new TestResult(0, 168819535.86204710848979659043m), // 19 / 25

+	    new TestResult(0, -2416.8552333191352676140967438m), // 19 / 26

+	    new TestResult(0, -13165.657265554370962757268367m), // 19 / 27

+	    new TestResult(2, 0.0990559941406113443335355768m), // 19 / 28

+	    new TestResult(0, -20572050535883517.889932557941m), // 19 / 29

+	    new TestResult(3, 0m), // 20 / 0

+	    new TestResult(0, 7081320760.3793287174700927968m), // 20 / 1

+	    new TestResult(0, -7081320760.3793287174700927968m), // 20 / 2

+	    new TestResult(0, 3540660380.1896643587350463984m), // 20 / 3

+	    new TestResult(0, 708132076.03793287174700927968m), // 20 / 4

+	    new TestResult(0, 70813207603.793287174700927968m), // 20 / 5

+	    new TestResult(2, 8.93788337E-20m), // 20 / 6

+	    new TestResult(2, -8.93788337E-20m), // 20 / 7

+	    new TestResult(2, 2.556128739088E-16m), // 20 / 8

+	    new TestResult(0, -2210.250107335496183875574735m), // 20 / 9

+	    new TestResult(2, -1.461064165166945E-13m), // 20 / 10

+	    new TestResult(2, -1.2988632935681496171E-08m), // 20 / 11

+	    new TestResult(2, 9281823982.422412820396304075m), // 20 / 12

+	    new TestResult(2, -1.76832729566273202E-11m), // 20 / 13

+	    new TestResult(2, 3.17759436211301E-14m), // 20 / 14

+	    new TestResult(2, 4.970728062443E-16m), // 20 / 15

+	    new TestResult(2, -16815.314387332923907118773285m), // 20 / 16

+	    new TestResult(2, 2.894672435964370128732E-07m), // 20 / 17

+	    new TestResult(2, -1.3302603829227E-15m), // 20 / 18

+	    new TestResult(2, 6.88837287603E-17m), // 20 / 19

+	    new TestResult(0, 1m), // 20 / 20

+	    new TestResult(2, 0.0170325484771854288433021822m), // 20 / 21

+	    new TestResult(2, -0.0011082932800859005017661851m), // 20 / 22

+	    new TestResult(2, 1.60085458760255588702037E-05m), // 20 / 23

+	    new TestResult(2, -1.38082182269723557757959E-05m), // 20 / 24

+	    new TestResult(2, 1.16289191177647018971E-08m), // 20 / 25

+	    new TestResult(2, -1.6648200034492E-13m), // 20 / 26

+	    new TestResult(2, -9.068995640318096E-13m), // 20 / 27

+	    new TestResult(2, 6.8233462325E-18m), // 20 / 28

+	    new TestResult(2, -1.4170795491574366313541174399m), // 20 / 29

+	    new TestResult(3, 0m), // 21 / 0

+	    new TestResult(0, 415752273939.77704245656837041m), // 21 / 1

+	    new TestResult(0, -415752273939.77704245656837041m), // 21 / 2

+	    new TestResult(2, 207876136969.8885212282841852m), // 21 / 3

+	    new TestResult(0, 41575227393.977704245656837041m), // 21 / 4

+	    new TestResult(0, 4157522739397.7704245656837041m), // 21 / 5

+	    new TestResult(2, 5.2475314427E-18m), // 21 / 6

+	    new TestResult(2, -5.2475314427E-18m), // 21 / 7

+	    new TestResult(2, 1.50073181503771E-14m), // 21 / 8

+	    new TestResult(2, -129766.25959973387113808743405m), // 21 / 9

+	    new TestResult(2, -8.5780713738991847E-12m), // 21 / 10

+	    new TestResult(2, -7.625771887911763590261E-07m), // 21 / 11

+	    new TestResult(0, 544946282986.07977368508338172m), // 21 / 12

+	    new TestResult(2, -1.0382047630930577807E-09m), // 21 / 13

+	    new TestResult(2, 1.8656012436244067E-12m), // 21 / 14

+	    new TestResult(2, 2.91837012476515E-14m), // 21 / 15

+	    new TestResult(2, -987245.9432513294606844938685m), // 21 / 16

+	    new TestResult(2, 1.69949461164997956913075E-05m), // 21 / 17

+	    new TestResult(2, -7.81010771643817E-14m), // 21 / 18

+	    new TestResult(2, 4.0442408752037E-15m), // 21 / 19

+	    new TestResult(0, 58.711120143850993772970798576m), // 21 / 20

+	    new TestResult(0, 1m), // 21 / 21

+	    new TestResult(2, -0.0650691399217460043995169619m), // 21 / 22

+	    new TestResult(2, 0.0009398796602556869430220663m), // 21 / 23

+	    new TestResult(2, -0.0008106959592962871308194687m), // 21 / 24

+	    new TestResult(2, 6.827468674662091164433E-07m), // 21 / 25

+	    new TestResult(2, -9.7743447240392408E-12m), // 21 / 26

+	    new TestResult(2, -5.32450892622776623E-11m), // 21 / 27

+	    new TestResult(2, 4.006063004374E-16m), // 21 / 28

+	    new TestResult(2, -83.19832766397646235747803502m), // 21 / 29

+	    new TestResult(3, 0m), // 22 / 0

+	    new TestResult(0, -6389392489892.6362673670820462m), // 22 / 1

+	    new TestResult(0, 6389392489892.6362673670820462m), // 22 / 2

+	    new TestResult(0, -3194696244946.3181336835410231m), // 22 / 3

+	    new TestResult(0, -638939248989.26362673670820462m), // 22 / 4

+	    new TestResult(0, -63893924898926.362673670820462m), // 22 / 5

+	    new TestResult(2, -8.06454710942E-17m), // 22 / 6

+	    new TestResult(2, 8.06454710942E-17m), // 22 / 7

+	    new TestResult(2, -2.306364917136659E-13m), // 22 / 8

+	    new TestResult(2, 1994282.6930829954142428134453m), // 22 / 9

+	    new TestResult(2, 1.31830102322167113E-10m), // 22 / 10

+	    new TestResult(2, 1.17194908324940723524544E-05m), // 22 / 11

+	    new TestResult(2, -8374880682938.911591614017805m), // 22 / 12

+	    new TestResult(2, 1.59554093436863052632E-08m), // 22 / 13

+	    new TestResult(2, -2.8671060442293101E-11m), // 22 / 14

+	    new TestResult(2, -4.485029505960676E-13m), // 22 / 15

+	    new TestResult(2, 15172260.52839517272431927284m), // 22 / 16

+	    new TestResult(2, -0.0002611828915663923103773216m), // 22 / 17

+	    new TestResult(2, 1.2002783079399592E-12m), // 22 / 18

+	    new TestResult(2, -6.21529788171079E-14m), // 22 / 19

+	    new TestResult(2, -902.2882462325251912660653119m), // 22 / 20

+	    new TestResult(2, -15.368268294350108200187006165m), // 22 / 21

+	    new TestResult(0, 1m), // 22 / 22

+	    new TestResult(2, -0.0144443227832120251558802997m), // 22 / 23

+	    new TestResult(2, 0.0124589930076108753677011728m), // 22 / 24

+	    new TestResult(2, -1.04926370363477969575619E-05m), // 22 / 25

+	    new TestResult(2, 1.50214752120500522E-10m), // 22 / 26

+	    new TestResult(2, 8.182848171393031905E-10m), // 22 / 27

+	    new TestResult(2, -6.156625105529E-15m), // 22 / 28

+	    new TestResult(2, 1278.6142211812409691677177837m), // 22 / 29

+	    new TestResult(3, 0m), // 23 / 0

+	    new TestResult(0, 442346282742915.0596416330681m), // 23 / 1

+	    new TestResult(0, -442346282742915.0596416330681m), // 23 / 2

+	    new TestResult(0, 221173141371457.52982081653405m), // 23 / 3

+	    new TestResult(0, 44234628274291.50596416330681m), // 23 / 4

+	    new TestResult(0, 4423462827429150.596416330681m), // 23 / 5

+	    new TestResult(2, 5.5831950244116E-15m), // 23 / 6

+	    new TestResult(2, -5.5831950244116E-15m), // 23 / 7

+	    new TestResult(2, 1.59672762216117307E-11m), // 23 / 8

+	    new TestResult(0, -138066887.80181919317571960944m), // 23 / 9

+	    new TestResult(2, -9.1267762636395250963E-09m), // 23 / 10

+	    new TestResult(2, -0.0008113561991369439495762269m), // 23 / 11

+	    new TestResult(0, 579804315413987.55317875373327m), // 23 / 12

+	    new TestResult(2, -1.104614566093091384748E-06m), // 23 / 13

+	    new TestResult(2, 1.9849362876061009571E-09m), // 23 / 14

+	    new TestResult(2, 3.10504658008156699E-11m), // 23 / 15

+	    new TestResult(2, -1050396114.5225303515983863327m), // 23 / 16

+	    new TestResult(2, 0.018082044792709369766201304m), // 23 / 17

+	    new TestResult(2, -8.30968904499273382E-11m), // 23 / 18

+	    new TestResult(2, 4.3029347758238576E-12m), // 23 / 19

+	    new TestResult(0, 62466.635492334295970467255163m), // 23 / 20

+	    new TestResult(2, 1063.9659972298557739709718754m), // 23 / 21

+	    new TestResult(0, -69.231352345729507070036842909m), // 23 / 22

+	    new TestResult(0, 1m), // 23 / 23

+	    new TestResult(2, -0.8625529347828887027197930493m), // 23 / 24

+	    new TestResult(2, 0.000726419451699245356034835m), // 23 / 25

+	    new TestResult(2, -1.03995704315807902618E-08m), // 23 / 26

+	    new TestResult(2, -5.66509644945319386873E-08m), // 23 / 27

+	    new TestResult(2, 4.262314819414408E-13m), // 23 / 28

+	    new TestResult(0, -88520.19166085901375500091819m), // 23 / 29

+	    new TestResult(3, 0m), // 24 / 0

+	    new TestResult(0, -512833780867323.89020837443764m), // 24 / 1

+	    new TestResult(0, 512833780867323.89020837443764m), // 24 / 2

+	    new TestResult(0, -256416890433661.94510418721882m), // 24 / 3

+	    new TestResult(0, -51283378086732.389020837443764m), // 24 / 4

+	    new TestResult(0, -5128337808673238.9020837443764m), // 24 / 5

+	    new TestResult(2, -6.4728723296466E-15m), // 24 / 6

+	    new TestResult(2, 6.4728723296466E-15m), // 24 / 7

+	    new TestResult(2, -1.85116478974485417E-11m), // 24 / 8

+	    new TestResult(0, 160067727.13209967231293920454m), // 24 / 9

+	    new TestResult(2, 1.05811201789450821647E-08m), // 24 / 10

+	    new TestResult(2, 0.0009406451087447388135269385m), // 24 / 11

+	    new TestResult(0, -672195632329427.78049892650167m), // 24 / 12

+	    new TestResult(2, 1.280633943203881720602E-06m), // 24 / 13

+	    new TestResult(2, -2.3012341707535026743E-09m), // 24 / 14

+	    new TestResult(2, -3.59983307095596564E-11m), // 24 / 15

+	    new TestResult(2, 1217775828.2011100471829103026m), // 24 / 16

+	    new TestResult(2, -0.0209634030139388041036175456m), // 24 / 17

+	    new TestResult(2, 9.63383081768117492E-11m), // 24 / 18

+	    new TestResult(2, -4.988603716138233E-12m), // 24 / 19

+	    new TestResult(0, -72420.639908967018993409156115m), // 24 / 20

+	    new TestResult(2, -1233.5080599982704934889448056m), // 24 / 21

+	    new TestResult(2, 80.26330855062892819843621147m), // 24 / 22

+	    new TestResult(0, -1.1593491363538259770624590073m), // 24 / 23

+	    new TestResult(0, 1m), // 24 / 24

+	    new TestResult(2, -0.0008421737639581399076256596m), // 24 / 25

+	    new TestResult(2, 1.20567329983039744731E-08m), // 24 / 26

+	    new TestResult(2, 6.56782467603468627053E-08m), // 24 / 27

+	    new TestResult(2, -4.941511004756208E-13m), // 24 / 28

+	    new TestResult(2, 102625.80775189204591883200668m), // 24 / 29

+	    new TestResult(3, 0m), // 25 / 0

+	    new TestResult(0, 608940580690915704.1450897514m), // 25 / 1

+	    new TestResult(0, -608940580690915704.1450897514m), // 25 / 2

+	    new TestResult(0, 304470290345457852.0725448757m), // 25 / 3

+	    new TestResult(0, 60894058069091570.41450897514m), // 25 / 4

+	    new TestResult(0, 6089405806909157041.450897514m), // 25 / 5

+	    new TestResult(2, 7.6859106833543095E-12m), // 25 / 6

+	    new TestResult(2, -7.6859106833543095E-12m), // 25 / 7

+	    new TestResult(2, 2.19807938571316735336E-08m), // 25 / 8

+	    new TestResult(2, -190064965191.73899284873850192m), // 25 / 9

+	    new TestResult(2, -1.2564058192949139177057E-05m), // 25 / 10

+	    new TestResult(2, -1.1169252106878663178369471734m), // 25 / 11

+	    new TestResult(2, 798167386704341861.9682340376m), // 25 / 12

+	    new TestResult(2, -0.0015206291124352045188095451m), // 25 / 13

+	    new TestResult(2, 2.7324933039209294299951E-06m), // 25 / 14

+	    new TestResult(2, 4.27445406757517405142E-08m), // 25 / 15

+	    new TestResult(0, -1445991172270.2862199666258075m), // 25 / 16

+	    new TestResult(2, 24.892016245451201449485802529m), // 25 / 17

+	    new TestResult(2, -1.143924357415629812325E-07m), // 25 / 18

+	    new TestResult(2, 5.9234850687965514433E-09m), // 25 / 19

+	    new TestResult(2, 85992514.8565500475609760009m), // 25 / 20

+	    new TestResult(2, 1464671.6779692768786214751455m), // 25 / 21

+	    new TestResult(2, -95304.9263532013818698238713m), // 25 / 22

+	    new TestResult(2, 1376.6151190758908669955780933m), // 25 / 23

+	    new TestResult(2, -1187.4034110254054607086172841m), // 25 / 24

+	    new TestResult(0, 1m), // 25 / 25

+	    new TestResult(2, -1.43162058880087033607313E-05m), // 25 / 26

+	    new TestResult(2, -7.79865742334041504368931E-05m), // 25 / 27

+	    new TestResult(2, 5.867567022667099857E-10m), // 25 / 28

+	    new TestResult(2, -121858234.18383411295432055833m), // 25 / 29

+	    new TestResult(3, 0m), // 26 / 0

+	    new TestResult(0, -42535053313319986966115.037787m), // 26 / 1

+	    new TestResult(0, 42535053313319986966115.037787m), // 26 / 2

+	    new TestResult(2, -21267526656659993483057.518894m), // 26 / 3

+	    new TestResult(0, -4253505331331998696611.5037787m), // 26 / 4

+	    new TestResult(0, -425350533133199869661150.37787m), // 26 / 5

+	    new TestResult(2, -5.368678505659136383798E-07m), // 26 / 6

+	    new TestResult(2, 5.368678505659136383798E-07m), // 26 / 7

+	    new TestResult(2, -0.0015353784395866262203076433m), // 26 / 8

+	    new TestResult(2, 13276210657946598.343741130625m), // 26 / 9

+	    new TestResult(2, 0.8776108901502200170717671109m), // 26 / 10

+	    new TestResult(0, 78018.241664392812128305230978m), // 26 / 11

+	    new TestResult(0, -55752717790464947101601.359896m), // 26 / 12

+	    new TestResult(2, 106.21732631750483463727976216m), // 26 / 13

+	    new TestResult(2, -0.1908671421252521905897157731m), // 26 / 14

+	    new TestResult(2, -0.0029857450367876236635795704m), // 26 / 15

+	    new TestResult(2, 101003798323510611.65980529603m), // 26 / 16

+	    new TestResult(0, -1738729.9707879186275737174853m), // 26 / 17

+	    new TestResult(2, 0.0079904156615530673319808542m), // 26 / 18

+	    new TestResult(2, -0.0004137608186927571471957746m), // 26 / 19

+	    new TestResult(0, -6006655361709.8810944800037905m), // 26 / 20

+	    new TestResult(2, -102308648634.06932650747319597m), // 26 / 21

+	    new TestResult(0, 6657135773.1750052361186583781m), // 26 / 22

+	    new TestResult(2, -96157817.91940752862823678187m), // 26 / 23

+	    new TestResult(2, 82941208.04870360868726566113m), // 26 / 24

+	    new TestResult(0, -69850.909369611886817979504214m), // 26 / 25

+	    new TestResult(0, 1m), // 26 / 26

+	    new TestResult(0, 5.4474331288240229212686639513m), // 26 / 27

+	    new TestResult(2, -4.09854892320443047650146E-05m), // 26 / 28

+	    new TestResult(0, 8511908471915.937756062101659m), // 26 / 29

+	    new TestResult(3, 0m), // 27 / 0

+	    new TestResult(0, -7808274522591953107485.8812311m), // 27 / 1

+	    new TestResult(0, 7808274522591953107485.8812311m), // 27 / 2

+	    new TestResult(2, -3904137261295976553742.9406156m), // 27 / 3

+	    new TestResult(0, -780827452259195310748.58812311m), // 27 / 4

+	    new TestResult(0, -78082745225919531074858.812311m), // 27 / 5

+	    new TestResult(2, -9.85542801296968307756E-08m), // 27 / 6

+	    new TestResult(2, 9.85542801296968307756E-08m), // 27 / 7

+	    new TestResult(2, -0.000281853563555002197999826m), // 27 / 8

+	    new TestResult(2, 2437149817901964.8960845694514m), // 27 / 9

+	    new TestResult(2, 0.1611053994415304138070003376m), // 27 / 10

+	    new TestResult(2, 14322.019163773595213651372685m), // 27 / 11

+	    new TestResult(2, -10234676860090376638967.506512m), // 27 / 12

+	    new TestResult(2, 19.498601232106311831598265533m), // 27 / 13

+	    new TestResult(2, -0.0350379963574616786880617938m), // 27 / 14

+	    new TestResult(2, -0.0005481012737887758520091497m), // 27 / 15

+	    new TestResult(2, 18541539828927654.501195934005m), // 27 / 16

+	    new TestResult(2, -319183.3529057512147016471775m), // 27 / 17

+	    new TestResult(2, 0.0014668221660718241029342142m), // 27 / 18

+	    new TestResult(2, -7.59551900698740123366376E-05m), // 27 / 19

+	    new TestResult(2, -1102657934418.1103423727465413m), // 27 / 20

+	    new TestResult(2, -18781074721.729615778535996388m), // 27 / 21

+	    new TestResult(2, 1222068378.9489912725931951927m), // 27 / 22

+	    new TestResult(2, -17651950.128695901472129097893m), // 27 / 23

+	    new TestResult(0, 15225741.38814783974528909088m), // 27 / 24

+	    new TestResult(2, -12822.719933909700245783228909m), // 27 / 25

+	    new TestResult(2, 0.1835726986181246222761380025m), // 27 / 26

+	    new TestResult(0, 1m), // 27 / 27

+	    new TestResult(2, -7.5238168625104611316081E-06m), // 27 / 28

+	    new TestResult(2, 1562554008580.0861321324839011m), // 27 / 29

+	    new TestResult(3, 0m), // 28 / 0

+	    new TestResult(0, 1037807626804273037330059471.7m), // 28 / 1

+	    new TestResult(0, -1037807626804273037330059471.7m), // 28 / 2

+	    new TestResult(0, 518903813402136518665029735.85m), // 28 / 3

+	    new TestResult(0, 103780762680427303733005947.17m), // 28 / 4

+	    new TestResult(0, 10378076268042730373300594717m), // 28 / 5

+	    new TestResult(2, 0.013098973822817421173845813m), // 28 / 6

+	    new TestResult(2, -0.013098973822817421173845813m), // 28 / 7

+	    new TestResult(0, 37.461513046578399246836695461m), // 28 / 8

+	    new TestResult(0, -323924659841968113506.41166762m), // 28 / 9

+	    new TestResult(0, -21412.722077843692663812014719m), // 28 / 10

+	    new TestResult(0, -1903557652.3848013647110715272m), // 28 / 11

+	    new TestResult(0, 1360303825454277040707598638.1m), // 28 / 12

+	    new TestResult(0, -2591583.7118874583629347087379m), // 28 / 13

+	    new TestResult(0, 4656.9443405844146143879311m), // 28 / 14

+	    new TestResult(0, 72.848832421725332869329889807m), // 28 / 15

+	    new TestResult(0, -2464379472248467996678.919247m), // 28 / 16

+	    new TestResult(0, 42423062487.893912564215173398m), // 28 / 17

+	    new TestResult(0, -194.95718634257023426451589779m), // 28 / 18

+	    new TestResult(0, 10.095300225653040883323838635m), // 28 / 19

+	    new TestResult(0, 146555658460058271.30028503504m), // 28 / 20

+	    new TestResult(0, 2496216357326773.3203945609668m), // 28 / 21

+	    new TestResult(0, -162426651429846.93508891542812m), // 28 / 22

+	    new TestResult(0, 2346142981848.9761467960716552m), // 28 / 23

+	    new TestResult(0, -2023672514414.1119557698582125m), // 28 / 24

+	    new TestResult(0, 1704283898.4827658021193146276m), // 28 / 25

+	    new TestResult(0, -24398.879182297399040382596287m), // 28 / 26

+	    new TestResult(0, -132911.26276382163838029345835m), // 28 / 27

+	    new TestResult(0, 1m), // 28 / 28

+	    new TestResult(0, -207681026417050638.7817636979m), // 28 / 29

+	    new TestResult(3, 0m), // 29 / 0

+	    new TestResult(0, -4997122966.448652425771563042m), // 29 / 1

+	    new TestResult(0, 4997122966.448652425771563042m), // 29 / 2

+	    new TestResult(0, -2498561483.224326212885781521m), // 29 / 3

+	    new TestResult(0, -499712296.6448652425771563042m), // 29 / 4

+	    new TestResult(0, -49971229664.48652425771563042m), // 29 / 5

+	    new TestResult(2, -6.30725591E-20m), // 29 / 6

+	    new TestResult(2, 6.30725591E-20m), // 29 / 7

+	    new TestResult(2, -1.803800457503E-16m), // 29 / 8

+	    new TestResult(0, 1559.7219709011119254589559305m), // 29 / 9

+	    new TestResult(2, 1.031038918059089E-13m), // 29 / 10

+	    new TestResult(2, 9.1657754452841005337E-09m), // 29 / 11

+	    new TestResult(0, -6549966787.6381215871101448624m), // 29 / 12

+	    new TestResult(2, 1.24786734570697837E-11m), // 29 / 13

+	    new TestResult(2, -2.24235425880102E-14m), // 29 / 14

+	    new TestResult(2, -3.507726905944E-16m), // 29 / 15

+	    new TestResult(2, 11866.175330334086443056587349m), // 29 / 16

+	    new TestResult(2, -2.042702851569255038994E-07m), // 29 / 17

+	    new TestResult(2, 9.387337384931E-16m), // 29 / 18

+	    new TestResult(2, -4.86096414286E-17m), // 29 / 19

+	    new TestResult(2, -0.705676685966272906628710787m), // 29 / 20

+	    new TestResult(2, -0.0120194723629401016807892544m), // 29 / 21

+	    new TestResult(2, 0.0007820967289697085504718691m), // 29 / 22

+	    new TestResult(2, -1.1296857600932761513324E-05m), // 29 / 23

+	    new TestResult(2, 9.7441376775089367720444E-06m), // 29 / 24

+	    new TestResult(2, -8.2062571043940289217E-09m), // 29 / 25

+	    new TestResult(2, 1.17482466276439E-13m), // 29 / 26

+	    new TestResult(2, 6.399778788502251E-13m), // 29 / 27

+	    new TestResult(2, -4.8150763565E-18m), // 29 / 28

+	    new TestResult(0, 1m), // 29 / 29

+        };

+

+        #endregion

+    }

+}

diff --git a/mcs/class/corlib/Test/System/DoubleTest.cs b/mcs/class/corlib/Test/System/DoubleTest.cs
new file mode 100644
index 00000000000..bb36355c7f9
--- /dev/null
+++ b/mcs/class/corlib/Test/System/DoubleTest.cs
@@ -0,0 +1,191 @@
+// BooleanTest.cs - NUnit Test Cases for the System.Double class

+//

+// Bob Doan <bdoan@sicompos.com>

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+//

+

+using NUnit.Framework;

+using System;

+using System.Globalization;

+

+namespace MonoTests.System

+{

+

+public class DoubleTest : TestCase

+{

+	private const Double d_zero = 0.0;

+	private const Double d_neg = -1234.5678;

+	private const Double d_pos = 1234.9999;

+	private const Double d_pos2 = 1234.9999;

+	private const Double d_nan = Double.NaN;

+	private const Double d_pinf = Double.PositiveInfinity;

+	private const Double d_ninf = Double.NegativeInfinity;

+	private const String s = "What Ever";

+	private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;

+	

+	

+	private string[] string_values = {

+		"1", ".1", "1.1", "-12", "44.444432", ".000021121", 

+		"   .00001", "  .223    ", "         -221.3233",

+		" 1.7976931348623157e308 ", "+1.7976931348623157E308", "-1.7976931348623157e308",

+		"4.9406564584124650e-324",

+		"6.28318530717958647692528676655900577",

+		"1e-05",

+	};

+	private double[] double_values = {

+		1, .1, 1.1, -12, 44.444432, .000021121,

+		.00001, .223, -221.3233,

+		1.7976931348623157e308, 1.7976931348623157e308, -1.7976931348623157e308,

+		4.9406564584124650e-324,

+		6.28318530717958647692528676655900577,

+		1e-05

+	};

+

+	public DoubleTest () : base ("MonoTests.System.DoubleTests testcase") {}

+	public DoubleTest (string name) : base (name) {}

+	

+

+	protected override void SetUp ()

+	{

+	}

+

+	public static ITest Suite {

+		get {

+			return new TestSuite (typeof (DoubleTest));

+		}

+	}

+

+	public void TestPublicFields ()

+	{												  

+		AssertEquals("Epsilon Field has wrong value", 3.9406564584124654e-324, Double.Epsilon);

+		AssertEquals("MaxValue Field has wrong value", 1.7976931348623157e+308, Double.MaxValue);

+		AssertEquals("MinValue Field has wrong value", -1.7976931348623157e+308, Double.MinValue);

+		AssertEquals("NegativeInfinity Field has wrong value",  (double)-1.0 / (double)(0.0), Double.NegativeInfinity);		

+		AssertEquals("PositiveInfinity Field has wrong value",  (double)1.0 / (double)(0.0), Double.PositiveInfinity);		

+	}

+

+	public void TestCompareTo () {

+		//If you do int foo =  d_ninf.CompareTo(d_pinf); Assert(".." foo < 0, true) this works.... WHY???

+		Assert("CompareTo Infinity failed", d_ninf.CompareTo(d_pinf) < 0);		

+

+		Assert("CompareTo Failed01", d_neg.CompareTo(d_pos) < 0);

+		Assert("CompareTo NaN Failed", d_nan.CompareTo(d_neg) < 0);				

+

+		AssertEquals("CompareTo Failed02", 0, d_pos.CompareTo(d_pos2));		

+		AssertEquals("CompareTo Failed03", 0, d_pinf.CompareTo(d_pinf));		

+		AssertEquals("CompareTo Failed04", 0, d_ninf.CompareTo(d_ninf));		

+		AssertEquals("CompareTo Failed05", 0, d_nan.CompareTo(d_nan));		

+

+		Assert("CompareTo Failed06", d_pos.CompareTo(d_neg) > 0);		

+		Assert("CompareTo Failed07", d_pos.CompareTo(d_nan) > 0);		

+		Assert("CompareTo Failed08", d_pos.CompareTo(null) > 0);		

+		

+		try {

+			d_pos.CompareTo(s);

+			Fail("CompareTo should raise a System.ArgumentException");

+		}

+		catch (Exception e) {

+			AssertEquals ("CompareTo should be a System.ArgumentException", typeof(ArgumentException), e.GetType());

+		}		

+		

+	}

+

+	public void TestEquals () {

+		AssertEquals("Equals Failed", true, d_pos.Equals(d_pos2));

+		AssertEquals("Equals Failed", false, d_pos.Equals(d_neg));

+		AssertEquals("Equals Failed", false, d_pos.Equals(s));

+		

+	}

+

+	public void TestTypeCode () {

+		AssertEquals("GetTypeCode Failed", TypeCode.Double, d_pos.GetTypeCode());		

+	}

+

+	public void TestIsInfinity() {

+		AssertEquals("IsInfinity Failed", true, Double.IsInfinity(Double.PositiveInfinity));

+		AssertEquals("IsInfinity Failed", true, Double.IsInfinity(Double.NegativeInfinity));

+		AssertEquals("IsInfinity Failed", false, Double.IsInfinity(12));		

+	}

+

+	public void TestIsNan() {

+		AssertEquals("IsNan Failed", true, Double.IsNaN(Double.NaN));

+		AssertEquals("IsNan Failed", false, Double.IsNaN(12));

+		AssertEquals("IsNan Failed", false, Double.IsNaN(Double.PositiveInfinity));

+	}

+

+	public void TestIsNegativeInfinity() {

+		AssertEquals("IsNegativeInfinity Failed", true, Double.IsNegativeInfinity(Double.NegativeInfinity));

+		AssertEquals("IsNegativeInfinity Failed", false, Double.IsNegativeInfinity(12));		

+	}

+

+	public void TestIsPositiveInfinity() {

+		AssertEquals("IsPositiveInfinity Failed", true, Double.IsPositiveInfinity(Double.PositiveInfinity));

+		AssertEquals("IsPositiveInfinity Failed", false, Double.IsPositiveInfinity(12));		

+	}

+

+	public void TestParse() {

+		int i=0;

+		try {

+			for(i=0;i<string_values.Length;i++) {			

+				AssertEquals("Parse Failed", double_values[i], Double.Parse(string_values[i]));

+			}

+		} catch (Exception e) {

+			Fail("TestParse: i=" + i + " failed with e = " + e.ToString());

+		}

+		

+		try {

+			AssertEquals("Parse Failed NumberStyles.Float", 10.1111, Double.Parse(" 10.1111 ", NumberStyles.Float, Nfi));

+		} catch (Exception e) {

+			Fail("TestParse: Parse Failed NumberStyles.Float with e = " + e.ToString());

+		}

+

+		try {

+			AssertEquals("Parse Failed NumberStyles.AllowThousands", 1234.5678, Double.Parse("1,234.5678", NumberStyles.Float | NumberStyles.AllowThousands, Nfi));

+		} catch (Exception e) {

+			Fail("TestParse: Parse Failed NumberStyles.AllowThousands with e = " + e.ToString());

+		}

+	

+		try {

+			Double.Parse(null);

+			Fail("Parse should raise a ArgumentNullException");

+		}

+		catch (Exception e) {

+			Assert("Parse should be a ArgumentNullException", typeof(ArgumentNullException) == e.GetType());

+		}		

+

+		try {

+			Double.Parse("save the elk");

+			Fail("Parse should raise a FormatException");

+		}

+		catch (Exception e) {

+			Assert("Parse should be a FormatException", typeof(FormatException) == e.GetType());

+		}		

+

+		double ovf_plus = 0;

+		try {

+			ovf_plus = Double.Parse("1.79769313486232e308");

+			Fail("Parse should have raised an OverflowException +");

+		}

+		catch (Exception e) {

+			AssertEquals("Should be an OverflowException + for " + ovf_plus, typeof(OverflowException), e.GetType());

+		}		

+

+		try {

+			Double.Parse("-1.79769313486232e308");

+			Fail("Parse should have raised an OverflowException -");

+		}

+		catch (Exception e) {

+			AssertEquals("Should be an OverflowException -", typeof(OverflowException), e.GetType());

+		}		

+

+

+	}

+

+	public void TestToString() {

+		//ToString is not yet Implemented......

+		//AssertEquals("ToString Failed", "1234.9999", d_pos.ToString());

+	}

+

+}

+}

diff --git a/mcs/class/corlib/Test/System/EnumTest.cs b/mcs/class/corlib/Test/System/EnumTest.cs
new file mode 100644
index 00000000000..4b6ac0f786c
--- /dev/null
+++ b/mcs/class/corlib/Test/System/EnumTest.cs
@@ -0,0 +1,728 @@
+// EnumTest.cs - NUnit Test Cases for the System.Enum class

+//

+// David Brandt (bucky@keystreams.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+

+using NUnit.Framework;

+using System;

+using System.IO;

+

+

+namespace MonoTests.System

+{

+

+public class EnumTest : TestCase

+{

+	public EnumTest() : base ("MonoTests.System.EnumTest testsuite") {}

+	public EnumTest(string name) : base(name) {}

+

+	protected override void SetUp() 

+	{

+	}

+

+	protected override void TearDown() 

+	{

+	}

+

+	public static ITest Suite {

+		get { 

+			return new TestSuite(typeof(EnumTest)); 

+		}

+	}

+

+	enum TestingEnum {This, Is, A, Test};

+	enum TestingEnum2 {This, Is, A, Test};

+

+	public void TestCompareTo() {

+		Enum e1 = new TestingEnum();

+		Enum e2 = new TestingEnum();

+		Enum e3 = new TestingEnum2();

+

+		AssertEquals("An enum should equal itself", 

+			     0, e1.CompareTo(e1));

+		AssertEquals("An enum should equal a copy", 

+			     0, e1.CompareTo(e2));

+

+		TestingEnum x = TestingEnum.This;

+		TestingEnum y = TestingEnum.Is;

+		AssertEquals("should equal", 0, x.CompareTo(x));

+		AssertEquals("less than", -1, x.CompareTo(y));

+		AssertEquals("greater than", 1, y.CompareTo(x));

+

+		{

+			bool errorThrown = false;

+			try {

+				e1.CompareTo(e3);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("1) Compare type mismatch not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				((Enum)e1).CompareTo((Enum)e3);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("2) Compare type mismatch not caught.", 

+			       errorThrown);

+		}

+	}

+	

+	public void TestEquals() {

+		Enum e1 = new TestingEnum();

+		Enum e2 = new TestingEnum();

+		Enum e3 = new TestingEnum2();

+

+		Assert("An enum should equal itself", e1.Equals(e1));

+		Assert("An enum should equal a copy", e1.Equals(e2));

+

+		Assert("Shouldn't match", !e1.Equals(e3));

+		Assert("Shouldn't match null", !e1.Equals(null));

+	}

+

+	public void TestFormat() {

+		try {

+			TestingEnum x = TestingEnum.Test;

+			Enum.Format(null, x, "G");

+			Fail("null first arg not caught.");

+		} catch (ArgumentNullException) {

+			return;

+		} catch (Exception e) {

+			Fail("first arg null, wrong exception: " + e.ToString());

+		}

+		Fail ("01 - Should not be here");

+

+		try {

+			TestingEnum x = TestingEnum.Test;

+			Enum.Format(x.GetType(), null, "G");

+			Fail("null second arg not caught.");

+		} catch (ArgumentNullException) {

+			return;

+		} catch (Exception e) {

+			Fail("second arg null, wrong exception: " + e.ToString());

+		}

+		Fail ("02 - Should not be here");

+

+		try {

+			TestingEnum x = TestingEnum.Test;

+			Enum.Format(x.GetType(), x, null);

+			Fail("null third arg not caught.");

+		} catch (ArgumentNullException) {

+			return;

+		} catch (Exception e) {

+			Fail("third arg null, wrong exception: " + e.ToString());

+		}

+		Fail ("03 - Should not be here");

+

+		try {

+			String bad = "huh?";

+			TestingEnum x = TestingEnum.Test;

+			Enum.Format(bad.GetType(), x, "G");

+			Fail("bad type arg not caught.");

+		} catch (ArgumentNullException) {

+			return;

+		} catch (Exception e) {

+			Fail("bad type, wrong exception: " + e.ToString());

+		}

+		Fail ("04 - Should not be here");

+

+		try {

+			TestingEnum x = TestingEnum.Test;

+			TestingEnum2 y = TestingEnum2.Test;

+			Enum.Format(y.GetType(), x, "G");

+			Fail("wrong enum type not caught.");

+		} catch (ArgumentNullException) {

+			return;

+		} catch (Exception e) {

+			Fail("wrong enum type, wrong exception: " + e.ToString());

+		}

+		Fail ("05 - Should not be here");

+

+		try {

+			String bad = "huh?";

+			TestingEnum x = TestingEnum.Test;

+			Enum.Format(x.GetType(), bad, "G");

+			Fail("non-enum object not caught.");

+		} catch (ArgumentNullException) {

+			return;

+		} catch (Exception e) {

+			Fail("non-enum object, wrong exception: " + e.ToString());

+		}

+		Fail ("06 - Should not be here");

+

+		string[] codes = {"a", "b", "c", "ad", "e", "af", "ag", "h", 

+				  "i", "j", "k", "l", "m", "n", "o", "p", 

+				  "q", "r", "s", "t", "u", "v", "w", "ax", 

+				  "y", "z"};

+		foreach (string code in codes) {

+			try {

+				TestingEnum x = TestingEnum.Test;

+				Enum.Format(x.GetType(), x, code);

+				Fail ("bad format code not caught - " + code);

+			} catch (FormatException) {

+

+			} catch (Exception e) {

+				Fail ("bad format code, wrong exception: " + e.ToString());

+			}

+		}

+

+		{

+			TestingEnum x = TestingEnum.Test;

+			AssertEquals("decimal format wrong", 

+				     "3", Enum.Format(x.GetType(), x, "d"));

+			AssertEquals("named format wrong", 

+				     "Test", Enum.Format(x.GetType(), x, "g"));

+			AssertEquals("hex format wrong", 

+				     "00000003", Enum.Format(x.GetType(), x, "x"));

+			AssertEquals("bitfield format wrong", 

+				     "Test", Enum.Format(x.GetType(), x, "f"));

+		}

+	}

+

+	public void TestGetHashCode() {

+		Enum e1 = new TestingEnum();

+		Enum e2 = new TestingEnum2();

+

+		AssertEquals("hash code is deterministic", 

+			     e1.GetHashCode(), e1.GetHashCode());

+	}

+	

+	public void GetName() {

+		{

+			bool errorThrown = false;

+			try {

+				TestingEnum x = TestingEnum.Test;

+				Enum.GetName(null, x);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null first arg not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				TestingEnum x = TestingEnum.Test;

+				Enum.GetName(x.GetType(), null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null second arg not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				String bad = "huh?";

+				TestingEnum x = TestingEnum.Test;

+				Enum.GetName(bad.GetType(), x);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("non-enum type not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				TestingEnum x = TestingEnum.Test;

+				TestingEnum2 y = TestingEnum2.Test;

+				Enum.GetName(y.GetType(), x);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("wrong enum type not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				String bad = "huh?";

+				TestingEnum x = TestingEnum.Test;

+				Enum.GetName(x.GetType(), bad);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("non-enum object not caught.", 

+			       errorThrown);

+		}

+		{

+			TestingEnum x = TestingEnum.This;

+			TestingEnum y = TestingEnum.Is;

+			TestingEnum z = TestingEnum.A;

+

+			AssertEquals("first name doesn't match",

+				     "This", Enum.GetName(x.GetType(), x));

+			AssertEquals("second name doesn't match",

+				     "Is", Enum.GetName(y.GetType(), y));

+			AssertEquals("third name doesn't match",

+				     "A", Enum.GetName(z.GetType(), z));

+		}

+	}

+

+	public void TestGetNames() {

+		{

+			bool errorThrown = false;

+			try {

+				Enum.GetNames(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null type not caught.", 

+			       errorThrown);

+		}

+		{

+			TestingEnum x = TestingEnum.This;

+			string[] match = {"This", "Is", "A", "Test"};

+			string[] names = Enum.GetNames(x.GetType());

+			AssertNotNull("Got no names", names);

+			AssertEquals("names wrong size", 

+				     match.Length, names.Length);

+			for (int i = 0; i < names.Length; i++) {

+				AssertEquals("name mismatch",

+					     match[i], names[i]);

+			}

+		}

+	}

+

+	public void TestGetTypeCode() {

+		TestingEnum x = TestingEnum.This;

+		TestingEnum y = new TestingEnum();

+		AssertEquals("01 bad type code", 

+			     TypeCode.Int32, x.GetTypeCode());

+		AssertEquals("02 bad type code", 

+			     TypeCode.Int32, y.GetTypeCode());

+	}

+

+	enum TestShortEnum : short { zero, one, two, three, four, five, six};

+	public void TestGetUnderlyingType() {

+		{

+			bool errorThrown = false;

+			try {

+				Enum.GetUnderlyingType(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null type not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				String bad = "huh?";

+				Enum.GetUnderlyingType(bad.GetType());

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("non-enum type not caught.", 

+			       errorThrown);

+		}

+		{

+			short sh = 5;

+			int i = 5;

+			Enum t1 = new TestingEnum();

+			Enum t2 = new TestShortEnum();

+			AssertEquals("Wrong default underlying type",

+				     i.GetType(), 

+				     Enum.GetUnderlyingType(t1.GetType()));

+			AssertEquals("Not short underlying type",

+				     sh.GetType(), 

+				     Enum.GetUnderlyingType(t2.GetType()));

+		}

+	}

+

+	public void TestGetValues() {

+		{

+			bool errorThrown = false;

+			try {

+				Enum.GetValues(null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null type not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				String bad = "huh?";

+				Enum.GetValues(bad.GetType());

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("non-enum type not caught.", 

+			       errorThrown);

+		}

+		{

+			Enum t1 = new TestingEnum();

+			Array a1 = Enum.GetValues(t1.GetType());

+			for (int i= 0; i < a1.Length; i++) {

+				AssertEquals("wrong enum value",

+					     (TestingEnum)i,

+					     a1.GetValue(i));

+			}

+		}

+		{

+			Enum t1 = new TestShortEnum();

+			Array a1 = Enum.GetValues(t1.GetType());

+			for (short i= 0; i < a1.Length; i++) {

+				AssertEquals("wrong short enum value",

+					     (TestShortEnum)i,

+					     a1.GetValue(i));

+			}

+		}

+	}

+

+	public void TestIsDefined() {

+		{

+			bool errorThrown = false;

+			try {

+				Enum.IsDefined(null, 1);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null first arg not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				TestingEnum x = TestingEnum.Test;

+				Enum.IsDefined(x.GetType(), null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null second arg not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				String bad = "huh?";

+				int i = 4;

+				Enum.IsDefined(bad.GetType(), i);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("non-enum type not caught.", 

+			       errorThrown);

+		}

+

+		try {

+			TestingEnum x = TestingEnum.Test;

+			short i = 4;

+			Enum.IsDefined(x.GetType(), i);

+			Fail("wrong underlying type not caught.");

+		} catch (ArgumentException) {

+		} catch (Exception e) {

+			Fail("wrong Exception thrown ("+e.ToString()+")for underlying type not caught.");

+		}

+

+		// spec says yes, MS impl says no.

+		//{

+		//bool errorThrown = false;

+		//try {

+		//String bad = "huh?";

+		//TestingEnum x = TestingEnum.Test;

+		//Enum.IsDefined(x.GetType(), bad);

+		//} catch (ExecutionEngineException) {

+		//errorThrown = true;

+		//}

+		//Assert("non-enum object not caught.", 

+		//errorThrown);

+		//}

+		{

+			Enum t1 = new TestingEnum();

+			int i = 0;

+			for (i = 0; 

+			     i < Enum.GetValues(t1.GetType()).Length; i++) {

+				Assert("should have value for i=" + i,

+				       Enum.IsDefined(t1.GetType(), i));

+			}

+			Assert("Shouldn't have value",

+			       !Enum.IsDefined(t1.GetType(), i));

+		}

+	}

+

+	public void TestParse1() {

+		{

+			bool errorThrown = false;

+			try {

+				String name = "huh?";

+				Enum.Parse(null, name);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null first arg not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				TestingEnum x = TestingEnum.Test;

+				Enum.Parse(x.GetType(), null);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null second arg not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				String bad = "huh?";

+				Enum.Parse(bad.GetType(), bad);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("non-enum type not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				TestingEnum x = TestingEnum.Test;

+				String bad = "";

+				Enum.Parse(x.GetType(), bad);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("empty string not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				TestingEnum x = TestingEnum.Test;

+				String bad = " ";

+				Enum.Parse(x.GetType(), bad);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("space-only string not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				String bad = "huh?";

+				TestingEnum x = TestingEnum.Test;

+				Enum.Parse(x.GetType(), bad);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("not-in-enum error not caught.", 

+			       errorThrown);

+		}

+		{

+			TestingEnum t1 = new TestingEnum();

+			AssertEquals("parse first enum",

+				     TestingEnum.This, 

+				     Enum.Parse(t1.GetType(), "This"));

+			AssertEquals("parse second enum",

+				     TestingEnum.Is, 

+				     Enum.Parse(t1.GetType(), "Is"));

+			AssertEquals("parse third enum",

+				     TestingEnum.A, 

+				     Enum.Parse(t1.GetType(), "A"));

+			AssertEquals("parse last enum",

+				     TestingEnum.Test, 

+				     Enum.Parse(t1.GetType(), "Test"));

+

+			AssertEquals("parse bitwise-or enum",

+				     TestingEnum.Is, 

+				     Enum.Parse(t1.GetType(), "This,Is"));

+			AssertEquals("parse bitwise-or enum",

+				     TestingEnum.Test, 

+				     Enum.Parse(t1.GetType(), "This,Test"));

+			AssertEquals("parse bitwise-or enum",

+				     TestingEnum.Test, 

+				     Enum.Parse(t1.GetType(), "This,Is,A"));

+		}

+	}

+	public void TestParse2() {

+		{

+			bool errorThrown = true;

+			try {

+				String name = "huh?";

+				Enum.Parse(null, name, true);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null first arg not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = true;

+			try {

+				TestingEnum x = TestingEnum.Test;

+				Enum.Parse(x.GetType(), null, true);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null second arg not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = true;

+			try {

+				String bad = "huh?";

+				Enum.Parse(bad.GetType(), bad, true);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("non-enum type not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = true;

+			try {

+				TestingEnum x = TestingEnum.Test;

+				String bad = "";

+				Enum.Parse(x.GetType(), bad, true);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("empty string not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = true;

+			try {

+				TestingEnum x = TestingEnum.Test;

+				String bad = " ";

+				Enum.Parse(x.GetType(), bad, true);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("space-only string not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = true;

+			try {

+				String bad = "huh?";

+				TestingEnum x = TestingEnum.Test;

+				Enum.Parse(x.GetType(), bad, true);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("not-in-enum error not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = true;

+			try {

+				String bad = "test";

+				TestingEnum x = TestingEnum.Test;

+				Enum.Parse(x.GetType(), bad, false);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("not-in-enum error not caught.", 

+			       errorThrown);

+		}

+		{

+			TestingEnum t1 = new TestingEnum();

+			AssertEquals("parse first enum",

+				     TestingEnum.This, 

+				     Enum.Parse(t1.GetType(), "this", true));

+			AssertEquals("parse second enum",

+				     TestingEnum.Is, 

+				     Enum.Parse(t1.GetType(), "is", true));

+			AssertEquals("parse third enum",

+				     TestingEnum.A, 

+				     Enum.Parse(t1.GetType(), "a", true));

+			AssertEquals("parse last enum",

+				     TestingEnum.Test, 

+				     Enum.Parse(t1.GetType(), "test", true));

+

+			AssertEquals("parse bitwise-or enum",

+				     TestingEnum.Is, 

+				     Enum.Parse(t1.GetType(), "This,is", true));

+			AssertEquals("parse bitwise-or enum",

+				     TestingEnum.Test, 

+				     Enum.Parse(t1.GetType(), "This,test", true));

+			AssertEquals("parse bitwise-or enum",

+				     TestingEnum.Test, 

+				     Enum.Parse(t1.GetType(), "This,is,A", true));

+		}

+	}

+

+	public void TestToObject() {

+		{

+			bool errorThrown = false;

+			try {

+				Enum.ToObject(null, 1);

+			} catch (ArgumentNullException) {

+				errorThrown = true;

+			}

+			Assert("null type not caught.", 

+			       errorThrown);

+		}

+		{

+			bool errorThrown = false;

+			try {

+				Enum.ToObject("huh?".GetType(), 1);

+			} catch (ArgumentException) {

+				errorThrown = true;

+			}

+			Assert("null type not caught.", 

+			       errorThrown);

+		}

+		{

+			TestingEnum t1 = new TestingEnum();

+			AssertEquals("Should get object",

+				     TestingEnum.This,

+				     Enum.ToObject(t1.GetType(), 0));

+		}

+		// TODO - should probably test all the different underlying types

+	}

+

+	[Flags]

+	enum SomeEnum {a,b,c};

+

+	[Flags]

+	enum SomeByteEnum : byte {a,b,c};

+

+	[Flags]

+	enum SomeInt64Enum : long {a,b,c};

+

+	public void TestToString() {

+		AssertEquals("invalid string", "This", 

+			     TestingEnum.This.ToString());

+		AssertEquals("invalid string", "Is", 

+			     TestingEnum.Is.ToString());

+		AssertEquals("invalid string", "A", 

+			     TestingEnum.A.ToString());

+		AssertEquals("invalid string", "Test", 

+			     TestingEnum.Test.ToString());

+

+		Enum is1 = TestingEnum.Is;

+

+		AssertEquals("decimal parse wrong", 

+			     "1", is1.ToString("d"));

+		AssertEquals("named format wrong", 

+			     "Is", is1.ToString("g"));

+		AssertEquals("hex format wrong", 

+			     "00000001", is1.ToString("x"));

+		AssertEquals("bitfield format wrong", 

+			     "Is", is1.ToString("f"));

+

+

+		AssertEquals("bitfield with flags format wrong for Int32 enum", 

+			     "b, c", ((SomeEnum)3).ToString("f"));

+		AssertEquals("bitfield with flags format wrong for Byte enum", 

+			     "b, c", ((SomeByteEnum)3).ToString("f"));

+		AssertEquals("bitfield with flags format wrong for Int64 enum", 

+			     "b, c", ((SomeInt64Enum)3).ToString("f"));

+	}

+

+	// TODO - ToString with IFormatProviders

+}

+}

diff --git a/mcs/class/corlib/Test/System/ExceptionTest.cs b/mcs/class/corlib/Test/System/ExceptionTest.cs
new file mode 100644
index 00000000000..d0f6b80f3f8
--- /dev/null
+++ b/mcs/class/corlib/Test/System/ExceptionTest.cs
@@ -0,0 +1,204 @@
+//

+// ExceptionTest.cs - NUnit Test Cases for the System.Exception class

+// 

+// Linus Upson (linus@linus.com)

+//

+

+using System;

+using NUnit.Framework;

+

+namespace MonoTests.System

+{

+	public class ExceptionTest : TestCase

+	{

+		public ExceptionTest() : base ("MonoTests.System.ExceptionTest testsuite") {}

+		public ExceptionTest(string name) : base(name) {}

+		

+		public static ITest Suite {

+			get {

+				return new TestSuite(typeof(ExceptionTest));

+			}

+		}

+		

+		// This test makes sure that exceptions thrown on block boundaries are

+		// handled in the correct block. The meaning of the 'caught' variable is

+		// a little confusing since there are two catchers: the method being

+		// tested the the method calling the test. There is probably a better

+		// name, but I can't think of it right now.

+		

+		public void TestThrowOnBlockBoundaries()

+		{

+			bool caught;

+			

+			try {

+				caught = false;

+				ThrowBeforeTry();

+			} catch {

+				caught = true;

+			}

+			Assert("Exceptions thrown before try blocks should not be caught", caught);

+			

+			try {

+				caught = false;

+				ThrowAtBeginOfTry();

+			} catch {

+				caught = true;

+			}

+			Assert("Exceptions thrown at begin of try blocks should be caught", !caught);

+

+			try {

+				caught = false;

+				ThrowAtEndOfTry();

+			} catch {

+				caught = true;

+			}

+			Assert("Exceptions thrown at end of try blocks should be caught", !caught);

+

+			try {

+				caught = false;

+				ThrowAtBeginOfCatch();

+			} catch {

+				caught = true;

+			}

+			Assert("Exceptions thrown at begin of catch blocks should not be caught", caught);

+

+			try {

+				caught = false;

+				ThrowAtEndOfCatch();

+			} catch {

+				caught = true;

+			}

+			Assert("Exceptions thrown at end of catch blocks should not be caught", caught);

+

+			try {

+				caught = false;

+				ThrowAtBeginOfFinally();

+			} catch {

+				caught = true;

+			}

+			Assert("Exceptions thrown at begin of finally blocks should not be caught", caught);

+

+			try {

+				caught = false;

+				ThrowAtEndOfFinally();

+			} catch {

+				caught = true;

+			}

+			Assert("Exceptions thrown at end of finally blocks should not be caught", caught);

+

+			try {

+				caught = false;

+				ThrowAfterFinally();

+			} catch {

+				caught = true;

+			}

+			Assert("Exceptions thrown after finally blocks should not be caught", caught);

+		}

+		

+		private static void DoNothing()

+		{

+		}

+

+		private static void ThrowException()

+		{

+			throw new Exception();

+		}

+		

+		private static void ThrowBeforeTry()

+		{

+			ThrowException();

+			try {

+				DoNothing();

+			} catch (Exception) {

+				DoNothing();

+			}

+		}

+

+		private static void ThrowAtBeginOfTry()

+		{

+			DoNothing();

+			try {

+				ThrowException();

+				DoNothing();

+			} catch (Exception) {

+				DoNothing();

+			}

+		}

+

+		private static void ThrowAtEndOfTry()

+		{

+			DoNothing();

+			try {

+				DoNothing();

+				ThrowException();

+			} catch (Exception) {

+				DoNothing();

+			}

+		}

+

+		private static void ThrowAtBeginOfCatch()

+		{

+			DoNothing();

+			try {

+				DoNothing();

+				ThrowException();

+			} catch (Exception) {

+				throw;

+			}

+		}

+

+		private static void ThrowAtEndOfCatch()

+		{

+			DoNothing();

+			try {

+				DoNothing();

+				ThrowException();

+			} catch (Exception) {

+				DoNothing();

+				throw;

+			}

+		}

+

+		private static void ThrowAtBeginOfFinally()

+		{

+			DoNothing();

+			try {

+				DoNothing();

+				ThrowException();

+			} catch (Exception) {

+				DoNothing();

+			} finally {

+				ThrowException();

+				DoNothing();

+			}

+		}

+

+		private static void ThrowAtEndOfFinally()

+		{

+			DoNothing();

+			try {

+				DoNothing();

+				ThrowException();

+			} catch (Exception) {

+				DoNothing();

+			} finally {

+				DoNothing();

+				ThrowException();

+			}

+		}

+

+		private static void ThrowAfterFinally()

+		{

+			DoNothing();

+			try {

+				DoNothing();

+				ThrowException();

+			} catch (Exception) {

+				DoNothing();

+			} finally {

+				DoNothing();

+			}

+			ThrowException();

+		}

+	}

+}

diff --git a/mcs/class/corlib/Test/System/GuidTest.cs b/mcs/class/corlib/Test/System/GuidTest.cs
new file mode 100755
index 00000000000..e3b19008886
--- /dev/null
+++ b/mcs/class/corlib/Test/System/GuidTest.cs
@@ -0,0 +1,247 @@
+//
+// GuidTest.cs - NUnit Test Cases for the System.Guid struct
+//
+// author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (C) 2002 Duco Fijma
+//
+
+using NUnit.Framework;
+using System;
+
+namespace MonoTests.System
+{
+
+public class GuidTest : TestCase
+{
+	public GuidTest () : base ("MonoTests.System.GuidTest testcase") {}
+        public GuidTest (string name) : base (name) {}
+
+	public static ITest Suite {
+		get {
+			return new TestSuite (typeof (GuidTest));
+		}
+	}
+
+	public void TestCtor1 ()
+	{
+		Guid g =  new Guid (new byte[] {0x00, 0x01, 0x02, 0x03, 0x04, 0x05, 0x06, 0x07, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f});
+		bool exception;
+		
+		if (BitConverter.IsLittleEndian) {
+			AssertEquals ("A1", "03020100-0504-0706-0809-0a0b0c0d0e0f", g.ToString ());
+		}
+		else {
+			AssertEquals ("A1", "00010203-0405-0607-0809-0a0b0c0d0e0f", g.ToString ());
+		}
+
+		try {
+			Guid g1 = new Guid ((byte[]) null);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A2", exception);
+
+		try {
+			Guid g1 = new Guid (new byte[] {0x00, 0x01, 0x02});
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		}
+		Assert ("A3", exception);
+	}
+
+	public void TestCtor2 ()
+	{
+		Guid g1 = new Guid ("00010203-0405-0607-0809-0a0b0c0d0e0f"); 
+		Guid g2 = new Guid ("{00010203-0405-0607-0809-0A0B0C0D0E0F}"); 
+		Guid g3 = new Guid ("{0x00010203,0x0405,0x0607,{0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f}}");
+		Guid g4;
+		Guid g5;
+
+		bool exception;
+
+		AssertEquals ("A1", "00010203-0405-0607-0809-0a0b0c0d0e0f", g1.ToString ()); 
+		AssertEquals ("A2", "00010203-0405-0607-0809-0a0b0c0d0e0f", g2.ToString ()); 
+		AssertEquals ("A3", "00010203-0405-0607-0809-0a0b0c0d0e0f", g3.ToString ()); 
+
+		try {
+			g4 = new Guid ((string) null);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A4", exception);
+
+		try {
+			g5 = new Guid ("invalid");
+			exception = false;
+		}
+		catch (FormatException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+		
+	}
+
+	public void TestCtor4 ()
+	{
+		Guid g1 = new Guid (0x00010203, (short) 0x0405, (short) 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g2 = new Guid (unchecked ((int) 0xffffffff), unchecked ((short) 0xffff), unchecked((short) 0xffff), 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff);
+		
+		AssertEquals ("A1", "00010203-0405-0607-0809-0a0b0c0d0e0f", g1.ToString ());
+		AssertEquals ("A2", "ffffffff-ffff-ffff-ffff-ffffffffffff", g2.ToString ());
+
+	}
+
+	public void TestCtor5 ()
+	{
+		Guid g1 = new Guid (0x00010203u, (ushort) 0x0405u, (ushort) 0x0607u, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g2 = new Guid (0xffffffffu, (ushort) 0xffffu, (ushort) 0xffffu, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff);
+		
+		AssertEquals ("A1", "00010203-0405-0607-0809-0a0b0c0d0e0f", g1.ToString ());
+		AssertEquals ("A2", "ffffffff-ffff-ffff-ffff-ffffffffffff", g2.ToString ());
+
+	}
+
+	public void TestEmpty ()
+	{
+		AssertEquals ("A1", "00000000-0000-0000-0000-000000000000", Guid.Empty.ToString ());
+	}
+
+	public void TestNewGuid ()
+	{
+		Guid g1 = Guid.NewGuid ();
+		Guid g2 = Guid.NewGuid ();
+		
+		Assert ("A1", g1 != g2);
+	}
+
+	public void TestEqualityOp ()
+	{
+		Guid g1 = new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g2 = new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g3 = new Guid (0x11223344, 0x5566, 0x6677, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff);
+
+		AssertEquals ("A1", true, g1 == g1);
+		AssertEquals ("A2", true, g1 == g2);
+		AssertEquals ("A3", false, g1 == g3);
+	}
+
+	public void TestInequalityOp ()
+	{
+		Guid g1 = new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g2 = new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g3 = new Guid (0x11223344, 0x5566, 0x6677, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff);
+
+		AssertEquals ("A1", false, g1 != g1);
+		AssertEquals ("A2", false, g1 != g2);
+		AssertEquals ("A3", true, g1 != g3);
+	}
+
+	public void TestEquals ()
+	{
+		Guid g1 = new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g2 = new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g3 = new Guid (0x11223344, 0x5566, 0x6677, 0x88, 0x99, 0xaa, 0xbb, 0xcc, 0xdd, 0xee, 0xff);
+		string s = "This is not a Guid!";
+
+		AssertEquals ("A1", true, g1.Equals (g1));
+		AssertEquals ("A2", true, g1.Equals (g2));
+		AssertEquals ("A3", false, g1.Equals (g3));
+		AssertEquals ("A4", false, g1.Equals (null));
+		AssertEquals ("A5", false, g1.Equals (s));
+	}
+
+	public void TestCompareTo ()
+	{
+		Guid g1 = new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g2 = new Guid (0x00010204, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g3 = new Guid (0x00010203, 0x0405, 0x0607, 0x09, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		Guid g4 = new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x1f);
+		bool exception;
+
+		Assert ("A1", g1.CompareTo (g2) < 0);
+		Assert ("A2", g1.CompareTo (g3) < 0);
+		Assert ("A3", g1.CompareTo (g4) < 0);
+		Assert ("A4", g2.CompareTo (g1) > 0);
+		Assert ("A5", g3.CompareTo (g1) > 0);
+		Assert ("A6", g4.CompareTo (g1) > 0);
+		Assert ("A7", g1.CompareTo (g1) == 0);
+		Assert ("A8", g1.CompareTo (null) > 0);
+		
+		try {
+			g1.CompareTo ("Say what?");
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		}
+		Assert ("A9", exception);
+	}
+
+	public void TestGetHashCode ()
+	{
+		// We don't test anything but the availibility of this member
+		int res = Guid.NewGuid ().GetHashCode ();
+	
+		Assert ("A1", true);
+	}
+
+	public void TestToByteArray ()
+	{
+		Guid g1 = new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		byte[] b = g1.ToByteArray ();
+		
+		AssertEquals ("A1", 0x00010203, BitConverter.ToInt32 (b, 0));
+		AssertEquals ("A2", (short) 0x0405, BitConverter.ToInt16 (b, 4));
+		AssertEquals ("A3", (short) 0x0607, BitConverter.ToInt16 (b, 6));
+		for (int i=8; i<16; ++i) {
+			AssertEquals ("A1", (byte) i, b [i]);
+		}
+		
+	}
+
+	public void TestToString ()
+	{
+		Guid g = new Guid (0x00010203, 0x0405, 0x0607, 0x08, 0x09, 0x0a, 0x0b, 0x0c, 0x0d, 0x0e, 0x0f);
+		bool exception;
+		
+		AssertEquals ("A1", "00010203-0405-0607-0809-0a0b0c0d0e0f", g.ToString ());
+		AssertEquals ("A2", "000102030405060708090a0b0c0d0e0f", g.ToString ("N"));
+		AssertEquals ("A3", "00010203-0405-0607-0809-0a0b0c0d0e0f", g.ToString ("D"));
+		AssertEquals ("A4", "{00010203-0405-0607-0809-0a0b0c0d0e0f}", g.ToString ("B"));
+		AssertEquals ("A5", "(00010203-0405-0607-0809-0a0b0c0d0e0f)", g.ToString ("P"));
+		AssertEquals ("A6", "00010203-0405-0607-0809-0a0b0c0d0e0f", g.ToString (""));
+		AssertEquals ("A7", "00010203-0405-0607-0809-0a0b0c0d0e0f", g.ToString ((string)null));
+
+		try {
+			g.ToString ("X");
+			exception = false;
+		}
+		catch (FormatException) {
+			exception = true;
+		}
+		Assert ("A8", exception);
+
+		try {
+			g.ToString ("This is invalid");
+			exception = false;
+		}
+		catch (FormatException) {
+			exception = true;
+		}
+		Assert ("A9",  exception);
+
+		AssertEquals ("A10", "{00010203-0405-0607-0809-0a0b0c0d0e0f}", g.ToString ("B", null));
+
+	}
+
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/Int16Test.cs b/mcs/class/corlib/Test/System/Int16Test.cs
new file mode 100644
index 00000000000..717b35420b6
--- /dev/null
+++ b/mcs/class/corlib/Test/System/Int16Test.cs
@@ -0,0 +1,193 @@
+// Int16Test.cs - NUnit Test Cases for the System.Int16 struct
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using NUnit.Framework;
+using System;
+using System.Threading;
+using System.Globalization;
+
+namespace MonoTests.System
+{
+
+public class Int16Test : TestCase
+{
+	private const Int16 MyInt16_1 = -42;
+	private const Int16 MyInt16_2 = -32768;
+	private const Int16 MyInt16_3 = 32767;
+	private const string MyString1 = "-42";
+	private const string MyString2 = "-32768";
+	private const string MyString3 = "32767";
+	private string[] Formats1 = {"c", "d", "e", "f", "g", "n", "p", "x" };
+	private string[] Formats2 = {"c5", "d5", "e5", "f5", "g5", "n5", "p5", "x5" };
+	private string[] Results1 = {null, "-32768", "-3.276800e+004", "-32768.00",
+	                                  "-32768", "-32,768.00", "-3,276,800.00 %", "8000"};
+	private string[] Results2 = {null, "32767", "3.27670e+004", "32767.00000",
+	                                  "32767", "32,767.00000", "3,276,700.00000 %", "07fff"};
+	private string[] ResultsNfi1 = {"("+NumberFormatInfo.InvariantInfo.CurrencySymbol+"32,768.00)", "-32768", "-3.276800e+004", "-32768.00",
+	                                  "-32768", "-32,768.00", "-3,276,800.00 %", "8000"};
+	private string[] ResultsNfi2 = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"32,767.00000", "32767", "3.27670e+004", "32767.00000",
+	                                  "32767", "32,767.00000", "3,276,700.00000 %", "07fff"};
+	private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
+	
+	public Int16Test() : base ("MonoTests.System.Int16Test testcase") {}

+	public Int16Test(string name) : base(name) {}
+
+	private CultureInfo old_culture;
+
+	protected override void SetUp() 
+	{
+		old_culture = Thread.CurrentThread.CurrentCulture;
+
+		// Set culture to en-US and don't let the user override.
+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US", false);
+
+		// We can't initialize this until we set the culture.
+		Results1 [0] = "("+NumberFormatInfo.CurrentInfo.CurrencySymbol+"32,768.00)";
+		Results2 [0] = NumberFormatInfo.CurrentInfo.CurrencySymbol+"32,767.00000";
+	}
+
+	protected override void TearDown()
+	{
+		Thread.CurrentThread.CurrentCulture = old_culture;
+	}
+
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(Int16Test)); 
+		}
+	}
+    
+	public void TestMinMax()
+	{
+		
+		AssertEquals(Int16.MinValue, MyInt16_2);
+		AssertEquals(Int16.MaxValue, MyInt16_3);
+	}
+	
+	public void TestCompareTo()
+	{
+		Assert(MyInt16_3.CompareTo(MyInt16_2) > 0);
+		Assert(MyInt16_2.CompareTo(MyInt16_2) == 0);
+		Assert(MyInt16_1.CompareTo((Int16)(-42)) == 0);
+		Assert(MyInt16_2.CompareTo(MyInt16_3) < 0);
+		try {
+			MyInt16_2.CompareTo(100);
+			Fail("Should raise a System.ArgumentException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentException) == e.GetType());
+		}
+	}
+
+	public void TestEquals()
+	{
+		Assert(MyInt16_1.Equals(MyInt16_1));
+		Assert(MyInt16_1.Equals((Int16)(-42)));
+		Assert(MyInt16_1.Equals((SByte)(-42)) == false);
+		Assert(MyInt16_1.Equals(MyInt16_2) == false);
+	}
+	
+	public void TestGetHashCode()
+	{
+		try {
+			MyInt16_1.GetHashCode();
+			MyInt16_2.GetHashCode();
+			MyInt16_3.GetHashCode();
+		}
+		catch {
+			Fail("GetHashCode should not raise an exception here");
+		}
+	}
+	
+	public void TestParse()
+	{
+		//test Parse(string s)
+		Assert(MyInt16_1 == Int16.Parse(MyString1));
+		Assert(MyInt16_2 == Int16.Parse(MyString2));
+		Assert(MyInt16_3 == Int16.Parse(MyString3));
+		try {
+			Int16.Parse(null);
+			Fail("Should raise a System.ArgumentNullException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentNullException) == e.GetType());
+		}
+		try {
+			Int16.Parse("not-a-number");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		try {
+			int OverInt = Int16.MaxValue + 1;
+			Int16.Parse(OverInt.ToString());
+			Fail("Should raise a System.OverflowException");
+		}
+		catch (Exception e) {
+			Assert(typeof(OverflowException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style)
+		Assert(42 == Int16.Parse(" $42 ", NumberStyles.Currency));
+		try {
+			Int16.Parse("$42", NumberStyles.Integer);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, IFormatProvider provider)
+		Assert(-42 == Int16.Parse(" -42 ", Nfi));
+		try {
+			Int16.Parse("%42", Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style, IFormatProvider provider)
+		Assert(16 == Int16.Parse(" 10 ", NumberStyles.HexNumber, Nfi));
+		try {
+			Int16.Parse("$42", NumberStyles.Integer, Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+	}
+	
+	public void TestToString()
+	{
+		//test ToString()
+		Assert(String.Compare(MyString1, MyInt16_1.ToString()) == 0);
+		Assert(String.Compare(MyString2, MyInt16_2.ToString()) == 0);
+		Assert(String.Compare(MyString3, MyInt16_3.ToString()) == 0);
+		//test ToString(string format)
+		/*
+		TODO: These tests are culture sensitive.  Need to find a way to determine the culture
+			of the system to decide the correct expected result.
+		for (int i=0; i < Formats1.Length; i++) {
+			Assert(String.Compare(Results1[i], MyInt16_2.ToString(Formats1[i])) == 0);
+			Assert(String.Compare(Results2[i], MyInt16_3.ToString(Formats2[i])) == 0);
+		}
+		*/
+		//test ToString(string format, IFormatProvider provider);
+		for (int i=0; i < Formats1.Length; i++) {
+			Assert("i="+i+", ResultsNfi1[i]="+ResultsNfi1[i]+", MyInt16_2.ToString(Formats1[i]="+Formats1[i]+"): Expected "+ResultsNfi1[i]+" but got "+MyInt16_2.ToString(Formats1[i], Nfi), String.Compare(ResultsNfi1[i], MyInt16_2.ToString(Formats1[i], Nfi)) == 0);
+			Assert("i="+i+", ResultsNfi2[i]="+ResultsNfi2[i]+", MyInt16_3.ToString(Formats2[i]="+Formats2[i]+"): Expected "+ResultsNfi2[i]+" but got "+MyInt16_3.ToString(Formats2[i], Nfi), String.Compare(ResultsNfi2[i], MyInt16_3.ToString(Formats2[i], Nfi)) == 0);
+		}
+		try {
+			MyInt16_1.ToString("z");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+	}
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/Int32Test.cs b/mcs/class/corlib/Test/System/Int32Test.cs
new file mode 100644
index 00000000000..a74247b2d35
--- /dev/null
+++ b/mcs/class/corlib/Test/System/Int32Test.cs
@@ -0,0 +1,238 @@
+// Int32Test.cs - NUnit Test Cases for the System.Int32 struct
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using NUnit.Framework;
+using System;
+using System.Threading;
+using System.Globalization;
+
+namespace MonoTests.System
+{
+
+public class Int32Test : TestCase
+{
+	private const Int32 MyInt32_1 = -42;
+	private const Int32 MyInt32_2 = -2147483648;
+	private const Int32 MyInt32_3 = 2147483647;
+	private const string MyString1 = "-42";
+	private const string MyString2 = "-2147483648";
+	private const string MyString3 = "2147483647";
+	private string[] Formats1 = {"c", "d", "e", "f", "g", "n", "p", "x" };
+	private string[] Formats2 = {"c5", "d5", "e5", "f5", "g5", "n5", "p5", "x5" };
+	private string[] Results1 = {null,
+					"-2147483648", "-2.147484e+009", "-2147483648.00",
+					"-2147483648", "-2,147,483,648.00", "-214,748,364,800.00 %", "80000000"};
+	private string[] Results2 = {null,
+					"2147483647", "2.14748e+009", "2147483647.00000",
+					"2.1475e+09", "2,147,483,647.00000", "214,748,364,700.00000 %", "7fffffff"};
+	private string[] ResultsNfi1 = {"("+NumberFormatInfo.InvariantInfo.CurrencySymbol+"2,147,483,648.00)",
+					"-2147483648", "-2.147484e+009", "-2147483648.00",
+					"-2147483648", "-2,147,483,648.00", "-214,748,364,800.00 %", "80000000"};
+	private string[] ResultsNfi2 = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"2,147,483,647.00000",
+					"2147483647", "2.14748e+009", "2147483647.00000",
+					"2.1475e+09", "2,147,483,647.00000", "214,748,364,700.00000 %", "7fffffff"};
+	private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
+	
+	public Int32Test() : base ("MonoTests.System.Int32Test testcase") {}

+	public Int32Test(string name) : base(name) {}
+
+	private CultureInfo old_culture;
+
+	protected override void SetUp() 
+	{
+		old_culture = Thread.CurrentThread.CurrentCulture;
+
+		// Set culture to en-US and don't let the user override.
+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US", false);
+
+		// We can't initialize this until we set the culture.
+		Results1 [0] = "("+NumberFormatInfo.CurrentInfo.CurrencySymbol+"2,147,483,648.00)";
+		Results2 [0] = NumberFormatInfo.CurrentInfo.CurrencySymbol+"2,147,483,647.00000";
+	}
+
+	protected override void TearDown()
+	{
+		Thread.CurrentThread.CurrentCulture = old_culture;
+	}
+
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(Int32Test)); 
+		}
+	}
+    
+	public void TestMinMax()
+	{
+		
+		AssertEquals("#A01", Int32.MinValue, MyInt32_2);
+		AssertEquals("#A02", Int32.MaxValue, MyInt32_3);
+	}
+	
+	public void TestCompareTo()
+	{
+		Assert("MyInt32_3.CompareTo(MyInt32_2) > 0", MyInt32_3.CompareTo(MyInt32_2) > 0);
+		Assert("MyInt32_2.CompareTo(MyInt32_2) == 0", MyInt32_2.CompareTo(MyInt32_2) == 0);
+		Assert("MyInt32_1.CompareTo((Int32)(-42)) == 0", MyInt32_1.CompareTo((Int32)(-42)) == 0);
+		Assert("MyInt32_2.CompareTo(MyInt32_3) < 0", MyInt32_2.CompareTo(MyInt32_3) < 0);
+		try {
+			MyInt32_2.CompareTo((Int16)100);
+			Fail("Should raise a System.ArgumentException");
+		}
+		catch (Exception e) {
+			Assert("typeof(ArgumentException) == e.GetType()", typeof(ArgumentException) == e.GetType());
+		}
+	}
+
+	public void TestEquals()
+	{
+		Assert ("#B01", MyInt32_1.Equals (MyInt32_1));
+		Assert ("#B02", MyInt32_1.Equals ((Int32)(-42)));
+		Assert ("#B03", MyInt32_1.Equals ((SByte)(-42)) == false);
+		Assert ("#B04", MyInt32_1.Equals (MyInt32_2) == false);
+	}
+	
+	public void TestGetHashCode()
+	{
+		try {
+			MyInt32_1.GetHashCode();
+			MyInt32_2.GetHashCode();
+			MyInt32_3.GetHashCode();
+		}
+		catch {
+			Fail("GetHashCode should not raise an exception here");
+		}
+	}
+	
+	public void TestParse()
+	{
+		//test Parse(string s)
+		AssertEquals ("#C01", MyInt32_1, Int32.Parse (MyString1));
+		AssertEquals ("#C02", MyInt32_2, Int32.Parse (MyString2));
+		AssertEquals ("#C03", MyInt32_3, Int32.Parse (MyString3));
+
+		AssertEquals ("#C04", 1, Int32.Parse ("1"));
+		AssertEquals ("#C05", 1, Int32.Parse (" 1"));
+		AssertEquals ("#C06", 1, Int32.Parse ("     1"));
+		AssertEquals ("#C07", 1, Int32.Parse ("1    "));
+		AssertEquals ("#C08", 1, Int32.Parse ("+1"));
+		AssertEquals ("#C09", -1, Int32.Parse ("-1"));
+		AssertEquals ("#C10", -1, Int32.Parse ("  -1"));
+		AssertEquals ("#C11", -1, Int32.Parse ("  -1  "));
+		AssertEquals ("#C12", -1, Int32.Parse ("  -1  "));
+
+		try {
+			Int32.Parse(null);
+			Fail ("#C13: Should raise a System.ArgumentNullException");
+		}
+		catch (Exception e) {
+			Assert ("#C14", typeof (ArgumentNullException) == e.GetType());
+		}
+		try {
+			Int32.Parse("not-a-number");
+			Fail ("#C15: Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert ("#C16", typeof (FormatException) == e.GetType());
+		}
+		try {
+			double OverInt = (double)Int32.MaxValue + 1;
+			Int32.Parse(OverInt.ToString());
+			Fail ("#C17: Should raise a System.OverflowException");
+		}
+		catch (Exception e) {
+			AssertEquals ("#C18", typeof (OverflowException), e.GetType());
+		}
+		//test Parse(string s, NumberStyles style)
+		AssertEquals ("#C19", 42, Int32.Parse (" $42 ", NumberStyles.Currency));
+		try {
+			Int32.Parse("$42", NumberStyles.Integer);
+			Fail ("#C20: Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert ("#C21", typeof (FormatException) == e.GetType());
+		}
+		//test Parse(string s, IFormatProvider provider)
+		AssertEquals ("#C22", -42, Int32.Parse (" -42 ", Nfi));
+		try {
+			Int32.Parse("%42", Nfi);
+			Fail ("#C23: Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert ("#C24", typeof (FormatException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style, IFormatProvider provider)
+		AssertEquals ("#C25", 16, Int32.Parse (" 10 ", NumberStyles.HexNumber, Nfi));
+		try {
+			Int32.Parse("$42", NumberStyles.Integer, Nfi);
+			Fail ("#C26: Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert("#C27", typeof (FormatException) == e.GetType());
+		}
+
+		try {
+			Int32.Parse (" - 1 ");
+			Fail ("#C28: Should raise FormatException");
+		} catch (Exception e){
+			Assert ("#C29", typeof (FormatException) == e.GetType ());
+		}
+
+		try {
+			Int32.Parse (" - ");
+			Fail ("#C30: Should raise FormatException");
+		} catch (Exception e){
+			Assert ("#C31", typeof (FormatException) == e.GetType ());
+		}
+	}
+	
+	public void TestToString()
+	{
+		//test ToString()
+		AssertEquals ("#D01", MyString1, MyInt32_1.ToString ());
+		AssertEquals ("#D02", MyString2, MyInt32_2.ToString ());
+		AssertEquals ("#D03", MyString3, MyInt32_3.ToString ());
+
+		//test ToString(string format, IFormatProvider provider);
+		for (int i=0; i < Formats1.Length; i++) {
+			AssertEquals ("#D04(" + i + "," + Formats1 [i] + ")",
+				      ResultsNfi1 [i], MyInt32_2.ToString (Formats1 [i], Nfi));
+			AssertEquals ("#D05(" + i + "," + Formats2 [i] + ")",
+				      ResultsNfi2 [i], MyInt32_3.ToString (Formats2 [i], Nfi));
+		}
+
+		//test ToString(string format)
+		for (int i=0; i < Formats1.Length; i++) {
+			AssertEquals ("#D06(" + i + ")", Results1 [i],
+				      MyInt32_2.ToString(Formats1[i]));
+			AssertEquals ("#D07(" + i + ")", Results2 [i],
+				      MyInt32_3.ToString(Formats2[i]));
+		}
+
+		try {
+			MyInt32_1.ToString("z");
+			Fail ("#D08: Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert ("#D09", typeof (FormatException) == e.GetType());
+		}
+	}
+
+	public void TestCustomToString()
+	{
+		// FIXME: Not yet implemented.
+#if NOTYET
+		// culture sensitive?
+
+		int i = 123;
+
+		AssertEquals ("Custom format string 00000", "00123", i.ToString ("00000"));
+		AssertEquals ("Custom format string ####", "123", i.ToString ("####"));
+#endif
+	}
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/Int64Test.cs b/mcs/class/corlib/Test/System/Int64Test.cs
new file mode 100644
index 00000000000..173f8185430
--- /dev/null
+++ b/mcs/class/corlib/Test/System/Int64Test.cs
@@ -0,0 +1,363 @@
+// Int64Test.cs - NUnit Test Cases for the System.Int64 struct
+//
+// Author: Martin Weindel (martin.weindel@t-online.de)
+//
+// (C) Martin Weindel, 2001
+// 
+// tests ToString and Parse function with the culture independent 
+// NumberFormatInfo.InvariantInfo
+
+using NUnit.Framework;
+using System;
+using System.Globalization;
+using System.Threading;
+
+    /// <summary>
+    /// Tests for System.Int64
+    /// </summary>
+namespace MonoTests.System
+{
+
+public class Int64Test : TestCase
+{
+	private const Int64 MyInt64_1 = -42;
+	private const Int64 MyInt64_2 = -9223372036854775808;
+	private const Int64 MyInt64_3 = 9223372036854775807;
+	private const string MyString1 = "-42";
+	private const string MyString2 = "-9223372036854775808";
+	private const string MyString3 = "9223372036854775807";
+	private string[] Formats1 = {"c", "d", "e", "f", "g", "n", "p", "x" };
+	private string[] Formats2 = {"c5", "d5", "e5", "f5", "g5", "n5", "p5", "x5" };
+	private string[] Results1 = {"", "-9223372036854775808", "-9.223372e+018", "-9223372036854775808.00",
+	                                  "-9223372036854775808", "-9,223,372,036,854,775,808.00", "-922,337,203,685,477,580,800.00 %", "8000000000000000"};
+	private string[] Results2 = {"", "9223372036854775807", "9.22337e+018", "9223372036854775807.00000",
+	                                  "9.2234e+18", "9,223,372,036,854,775,807.00000", "922,337,203,685,477,580,700.00000 %", "7fffffffffffffff"};
+	private string[] ResultsNfi1 = {"("+NumberFormatInfo.InvariantInfo.CurrencySymbol+"9,223,372,036,854,775,808.00)", "-9223372036854775808", "-9.223372e+018", "-9223372036854775808.00",
+	                                  "-9223372036854775808", "-9,223,372,036,854,775,808.00", "-922,337,203,685,477,580,800.00 %", "8000000000000000"};
+	private string[] ResultsNfi2 = {""+NumberFormatInfo.InvariantInfo.CurrencySymbol+"9,223,372,036,854,775,807.00000", "9223372036854775807", "9.22337e+018", "9223372036854775807.00000",
+	                                  "9.2234e+18", "9,223,372,036,854,775,807.00000", "922,337,203,685,477,580,700.00000 %", "7fffffffffffffff"};
+
+	// FIXME: This is failing with an ArgumentException.  Seems to be related to the number of elements in the arrary,
+	// not the values themselves
+/*	private long[] vals
+        = { 0, Int64.MaxValue, Int64.MinValue,
+              1L, 12L, 123L, 1234L, -123L, 
+              1234567890123456L, 6543210987654321L };
+*/
+	private long[] vals
+		= { 0, Int64.MaxValue, Int64.MinValue };
+
+	private const long val1 = -1234567L;
+	private const long val2 = 1234567L;
+	private const string sval1Test1 = "  -1,234,567   ";
+	private const string sval1Test2 = "  -1234567   ";
+	//private const string sval1Test3 = "  -12345,,,,67   "; // interesting: this case works on SDK Beta2, but the specification says nothing about this case
+	private const string sval1Test4 = "  -12345 67   ";
+	private  string sval1Test5 = "  -"+NumberFormatInfo.InvariantInfo.CurrencySymbol+"1,234,567.00 ";
+	private  string sval1Test6 = "("+NumberFormatInfo.InvariantInfo.CurrencySymbol+"1,234,567.00)";
+	private const string sval1Test7 = "-1,234,567.00";
+	private const string sval1UserCur1 = "1234/5/67:000 XYZ-";
+	private const string sval2UserCur1 = "1234/5/67:000 XYZ";
+	private const string sval1UserPercent1 = "-%%%1~2~3~4~5~6~7~0~0;0";
+	private const string sval2UserPercent1 = "%%%1~2~3~4~5~6~7~0~0;0";
+	private const NumberStyles style1 =  NumberStyles.AllowLeadingWhite | NumberStyles.AllowLeadingSign
+					| NumberStyles.AllowTrailingWhite | NumberStyles.AllowThousands;
+	private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
+	private NumberFormatInfo NfiUser;
+
+	public Int64Test() : base("MonoTests.System.Int64Test") {}
+	public Int64Test(string name) : base(name) {}
+
+	public static ITest Suite 
+	{
+		get { return new TestSuite(typeof(Int64Test)); }
+	}
+
+	private CultureInfo old_culture;
+
+	protected override void SetUp() 
+	{
+		old_culture = Thread.CurrentThread.CurrentCulture;
+
+		// Set culture to en-US and don't let the user override.
+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US", false);
+
+		int cdd = NumberFormatInfo.CurrentInfo.CurrencyDecimalDigits;
+		string csym = NumberFormatInfo.CurrentInfo.CurrencySymbol;
+		string csuffix = (cdd > 0 ? "." : "").PadRight(cdd + (cdd > 0 ? 1 : 0), '0');
+		Results1[0] = "(" + csym + "9,223,372,036,854,775,808" + csuffix + ")";
+		Results2[0] = csym + "9,223,372,036,854,775,807.00000";
+		NfiUser = new NumberFormatInfo();
+		NfiUser.CurrencyDecimalDigits = 3;
+		NfiUser.CurrencyDecimalSeparator = ":";
+		NfiUser.CurrencyGroupSeparator = "/";
+		NfiUser.CurrencyGroupSizes = new int[] { 2,1,0 };
+		NfiUser.CurrencyNegativePattern = 10;  // n $-
+		NfiUser.CurrencyPositivePattern = 3;  // n $
+		NfiUser.CurrencySymbol = "XYZ";
+		NfiUser.PercentDecimalDigits = 1;
+		NfiUser.PercentDecimalSeparator = ";";
+		NfiUser.PercentGroupSeparator = "~";
+		NfiUser.PercentGroupSizes = new int[] {1};
+		NfiUser.PercentNegativePattern = 2;
+		NfiUser.PercentPositivePattern = 2;
+		NfiUser.PercentSymbol = "%%%";
+	}
+
+	protected override void TearDown()
+	{
+		Thread.CurrentThread.CurrentCulture = old_culture;
+	}
+
+	public void TestMinMax()
+	{
+		
+		AssertEquals(Int64.MinValue, MyInt64_2);
+		AssertEquals(Int64.MaxValue, MyInt64_3);
+	}
+	
+	public void TestCompareTo()
+	{
+		Assert(MyInt64_3.CompareTo(MyInt64_2) > 0);
+		Assert(MyInt64_2.CompareTo(MyInt64_2) == 0);
+		Assert(MyInt64_1.CompareTo((Int64)(-42)) == 0);
+		Assert(MyInt64_2.CompareTo(MyInt64_3) < 0);
+		try {
+			MyInt64_2.CompareTo((Int16)100);
+			Fail("Should raise a System.ArgumentException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentException) == e.GetType());
+		}
+	}
+
+	public void TestEquals()
+	{
+		Assert(MyInt64_1.Equals(MyInt64_1));
+		Assert(MyInt64_1.Equals((Int64)(-42)));
+		Assert(MyInt64_1.Equals((SByte)(-42)) == false);
+		Assert(MyInt64_1.Equals(MyInt64_2) == false);
+	}
+	
+	public void TestGetHashCode()
+	{
+		try {
+			MyInt64_1.GetHashCode();
+			MyInt64_2.GetHashCode();
+			MyInt64_3.GetHashCode();
+		}
+		catch {
+			Fail("GetHashCode should not raise an exception here");
+		}
+	}
+	
+    public void TestRoundTripGeneral() 
+    {
+        foreach(long lv in vals) 
+        {
+            string s = lv.ToString(Nfi);
+            long lv2 = Int64.Parse(s);
+            Assert(lv == lv2);
+            long lv3 = Int64.Parse(s, NumberStyles.Integer, Nfi);
+            Assert(lv == lv3);
+        }
+    }
+
+    public void TestRoundTripHex() 
+    {
+        foreach(long lv in vals) 
+        {
+            string s = lv.ToString("x", Nfi);
+            long lv2 = Int64.Parse(s, NumberStyles.HexNumber, Nfi);
+            Assert(lv == lv2);
+        }
+    }
+
+    public void TestParseNull()
+    {
+        try 
+        {
+            Int64.Parse(null);
+            Fail("Should raise System.ArgumentNullException"); 
+        } 
+        catch (ArgumentNullException) 
+        {
+            // ok
+        }
+    }
+
+    public void TestParse()
+    {
+        long lv;
+
+        lv = Int64.Parse(sval1Test1, style1, Nfi);
+        AssertEquals("Long value should be equal for Test1", val1, lv);
+
+	try
+        {
+            lv = Int64.Parse(sval1Test1, Nfi);
+            Fail("Should raise FormatException 1");
+        }
+        catch (FormatException)
+        {
+            // ok
+        }
+
+        lv = Int64.Parse(sval1Test2, style1, Nfi);
+        AssertEquals("Value should be the same for Test2 with style1", val1, lv);
+        lv = Int64.Parse(sval1Test2, Nfi);
+        AssertEquals("Value should be the same for Test2 without style1", val1, lv);
+
+	try
+        {
+            lv = Int64.Parse(sval1Test4, style1, Nfi);
+            Fail("Should raise FormatException 3");
+        }
+        catch (FormatException)
+        {
+            // ok
+        }
+
+        lv = Int64.Parse(sval1Test5, NumberStyles.Currency, Nfi);
+        AssertEquals("Value should be the same for Test5 and currency style", val1, lv);
+
+	//test Parse(string s)
+	Assert(MyInt64_1 == Int64.Parse(MyString1));
+	Assert(MyInt64_2 == Int64.Parse(MyString2));
+	Assert(MyInt64_3 == Int64.Parse(MyString3));
+	try {
+		Int64.Parse(null);
+		Fail("Should raise a System.ArgumentNullException");
+	}
+	catch (Exception e) {
+		Assert(typeof(ArgumentNullException) == e.GetType());
+	}
+	try {
+		Int64.Parse("not-a-number");
+		Fail("Should raise a System.FormatException");
+	}
+	catch (Exception e) {
+		Assert(typeof(FormatException) == e.GetType());
+	}
+	//test Parse(string s, NumberStyles style)
+	try {
+		double OverInt = (double)Int64.MaxValue + 1;
+		Int64.Parse(OverInt.ToString(), NumberStyles.Float);
+		Fail("Should raise a System.OverflowException");
+	}
+	catch (Exception e) {
+		Assert(typeof(OverflowException) == e.GetType());
+	}
+	try {
+		double OverInt = (double)Int64.MaxValue + 1;
+		Int64.Parse(OverInt.ToString(), NumberStyles.Integer);
+		Fail("Should raise a System.FormatException");
+	}
+	catch (Exception e) {
+		Assert(typeof(FormatException) == e.GetType());
+	}
+	AssertEquals("A1", (long)42, Int64.Parse(" "+NumberFormatInfo.CurrentInfo.CurrencySymbol+"42 ", NumberStyles.Currency));
+	try {
+		Int64.Parse(NumberFormatInfo.CurrentInfo.CurrencySymbol+"42", NumberStyles.Integer);
+		Fail("Should raise a System.FormatException");
+	}
+	catch (Exception e) {
+		Assert(typeof(FormatException) == e.GetType());
+	}
+	//test Parse(string s, IFormatProvider provider)
+	Assert(-42 == Int64.Parse(" -42 ", Nfi));
+	try {
+		Int64.Parse("%42", Nfi);
+		Fail("Should raise a System.FormatException");
+	}
+	catch (Exception e) {
+		Assert(typeof(FormatException) == e.GetType());
+	}
+	//test Parse(string s, NumberStyles style, IFormatProvider provider)
+	Assert(16 == Int64.Parse(" 10 ", NumberStyles.HexNumber, Nfi));
+	try {
+		Int64.Parse(NumberFormatInfo.CurrentInfo.CurrencySymbol+"42", NumberStyles.Integer, Nfi);
+		Fail("Should raise a System.FormatException");
+	}
+	catch (Exception e) {
+		Assert(typeof(FormatException) == e.GetType());
+	}    
+    }
+
+    public void TestToString() 
+    {
+        string s;
+
+        s = val1.ToString("c", Nfi);
+        Assert("val1 does not become sval1Test6", s.Equals(sval1Test6));
+
+        s = val1.ToString("n", Nfi);
+        AssertEquals("val1 does not become sval1Test7", sval1Test7, s);
+
+	//test ToString()
+	AssertEquals("MyInt64_1.ToString()", MyString1, MyInt64_1.ToString());
+	AssertEquals("MyInt64_2.ToString()", MyString2, MyInt64_2.ToString());
+	AssertEquals("MyInt64_3.ToString()", MyString3, MyInt64_3.ToString());
+	//test ToString(string format)
+	for (int i=0; i < Formats1.Length; i++) {
+		AssertEquals("MyInt64_2.ToString(Formats1["+i+"])", Results1[i], MyInt64_2.ToString(Formats1[i]));
+		AssertEquals("MyInt64_3.ToString(Formats2["+i+"])", Results2[i], MyInt64_3.ToString(Formats2[i]));
+	}
+	//test ToString(string format, IFormatProvider provider);
+	for (int i=0; i < Formats1.Length; i++) {
+		AssertEquals("MyInt64_2.ToString(Formats1["+i+"], Nfi)", ResultsNfi1[i], MyInt64_2.ToString(Formats1[i], Nfi));
+		AssertEquals("MyInt64_3.ToString(Formats2["+i+"], Nfi)", ResultsNfi2[i], MyInt64_3.ToString(Formats2[i], Nfi));
+	}
+	try {
+		MyInt64_1.ToString("z");
+		Fail("Should raise a System.FormatException");
+	}
+	catch (Exception e) {
+		AssertEquals("Exception is wrong type", typeof(FormatException), e.GetType());
+	}
+    }
+
+    public void TestUserCurrency()
+    {
+        string s= "";
+        long v;
+	int iTest = 1;
+	try {
+		s = val1.ToString("c", NfiUser);
+		iTest++;
+		AssertEquals("Currency value type 1 is not what we want to try to parse", sval1UserCur1, s);
+		iTest++;
+		v = Int64.Parse(s, NumberStyles.Currency, NfiUser);
+		iTest++;
+		Assert(v == val1);
+	} catch (Exception e) {
+		Fail ("1 Unexpected exception at iTest = " + iTest + ", s = " + s + ":e = " + e);
+	}
+   
+	iTest = 1;
+	try {
+		s = val2.ToString("c", NfiUser);
+		iTest++;
+		AssertEquals("Currency value type 2 is not what we want to try to parse", sval2UserCur1, s);
+		iTest++;
+		v = Int64.Parse(s, NumberStyles.Currency, NfiUser);
+		iTest++;
+		Assert(v == val2);
+	} catch (Exception e) {
+		Fail ("2 Unexpected exception at iTest = " + iTest + ":e = " + e);
+	}
+    }
+
+    public void TestUserPercent()
+    {
+        string s;
+
+        s = val1.ToString("p", NfiUser);
+        Assert(s.Equals(sval1UserPercent1));
+
+        s = val2.ToString("p", NfiUser);
+        Assert(s.Equals(sval2UserPercent1));
+    }
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/IntegerFormatterTest.cs b/mcs/class/corlib/Test/System/IntegerFormatterTest.cs
new file mode 100644
index 00000000000..33f352aecf9
--- /dev/null
+++ b/mcs/class/corlib/Test/System/IntegerFormatterTest.cs
@@ -0,0 +1,2016 @@
+//
+// IntegerFormatterTest.cs - NUnit Test Cases for System.IntegerFormatter
+//
+// Author:
+//   Gonzalo Paniagua Javier (gonzalo@ximian.com)
+//
+// (C) Ximian, Inc. http://www.ximian.com
+//
+
+using NUnit.Framework;
+using System;
+using System.Globalization;
+using System.IO;
+using System.Threading;
+
+namespace MonoTests.System
+{
+
+public class IntegerFormatterTest : TestCase
+{
+	private const int INT32 = 0;
+	private const int INT64 = 1;
+	private const int UINT32 = 2;
+	private const int UINT64 = 3;
+	private int testType;
+
+	public IntegerFormatterTest () : 
+		base ("[MonoTests.System.IntegerFormatterTest]") {}
+
+	public IntegerFormatterTest (string name) : base (name) {}
+
+	protected override void SetUp () {}
+	
+	protected override void TearDown() {}
+
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(IntegerFormatterTest)); 
+		}
+	}
+
+	public void TestStandard ()
+	{
+		// Make the test Culture insensitive
+		NumberFormatInfo nfi = new NumberFormatInfo ();
+		nfi.CurrencySymbol = "$";
+
+		StringReader sr = new StringReader (tutti);
+
+		string inputLine;
+		while ((inputLine = sr.ReadLine ()) != null) {
+			if (inputLine.IndexOf ('(') != -1)
+				ProcessLine (inputLine, nfi);
+			else
+				ChangeType (inputLine);
+		}
+
+		sr.Close ();
+	}
+
+	private void ProcessLine (string testLine, NumberFormatInfo nfi)
+	{
+		string number = "0";
+		string format = "X";
+		string expected = "XXX";
+		int idxStart;
+		int idxEnd;
+
+		idxStart = testLine.IndexOf ('(');
+		if (idxStart != -1){
+			idxStart++;
+			idxEnd = testLine.IndexOf (')');
+			number = testLine.Substring (idxStart,
+						     idxEnd - idxStart);
+		}
+
+		idxStart = testLine.IndexOf ('(', idxStart);
+		if (idxStart != -1) {
+			idxStart++;
+			idxEnd = testLine.IndexOf (')', idxStart);
+			format = testLine.Substring (idxStart,
+						     idxEnd - idxStart);
+		}
+
+		idxStart = testLine.IndexOf ('(', idxStart);
+		if (idxStart != -1) {
+			idxStart++;
+			idxEnd = testLine.LastIndexOf (')');
+			expected = testLine.Substring (idxStart,
+						       idxEnd - idxStart);
+		}
+
+		DoTest (number, format, expected, nfi);
+	}
+
+	private void DoTest (string number,
+				   string format, 
+				   string expected,
+				   NumberFormatInfo nfi)
+	{
+		string id = number + " " + format;
+
+		switch (testType) {
+		case INT32:
+			int i32 = Int32.Parse (number, nfi);
+			AssertEquals(id, expected, i32.ToString (format, nfi));
+			break;
+		case INT64:
+			long i64 = Int64.Parse (number, nfi);
+			AssertEquals(id, expected, i64.ToString (format, nfi));
+			break;
+		case UINT32:
+			uint ui32 = UInt32.Parse (number, nfi);
+			AssertEquals(id, expected, ui32.ToString (format, nfi));
+			break;
+		case UINT64:
+			ulong ui64 = UInt64.Parse (number, nfi);
+			AssertEquals(id, expected, ui64.ToString (format, nfi));
+			break;
+		}
+	}
+
+	private void ChangeType (string newType)
+	{
+		if (newType == "Int32")
+			testType = INT32;
+		else if (newType == "Int64")
+			testType = INT64;
+		else if (newType == "UInt32")
+			testType = UINT32;
+		else if (newType == "UInt64")
+			testType = UINT64;
+		else throw new Exception ("Test of type '" + newType + "' not supported.");
+
+	}
+
+	private static string tutti = "Int32\n" +
+"(-2147483648) (C) (($2,147,483,648.00))\n" +
+"(-2147483648) (C0) (($2,147,483,648))\n" +
+"(-2147483648) (C1) (($2,147,483,648.0))\n" +
+"(-2147483648) (C2) (($2,147,483,648.00))\n" +
+"(-2147483648) (C3) (($2,147,483,648.000))\n" +
+"(-2147483648) (C4) (($2,147,483,648.0000))\n" +
+"(-2147483648) (C5) (($2,147,483,648.00000))\n" +
+"(-2147483648) (C6) (($2,147,483,648.000000))\n" +
+"(-2147483648) (C7) (($2,147,483,648.0000000))\n" +
+"(-2147483648) (C8) (($2,147,483,648.00000000))\n" +
+"(-2147483648) (C9) (($2,147,483,648.000000000))\n" +
+"(-2147483648) (C10) (($2,147,483,648.0000000000))\n" +
+"(-2147483648) (C99) (($2,147,483,648.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000))\n" +
+"(-2147483648) (D) (-2147483648)\n" +
+"(-2147483648) (D0) (-2147483648)\n" +
+"(-2147483648) (D1) (-2147483648)\n" +
+"(-2147483648) (D2) (-2147483648)\n" +
+"(-2147483648) (D3) (-2147483648)\n" +
+"(-2147483648) (D4) (-2147483648)\n" +
+"(-2147483648) (D5) (-2147483648)\n" +
+"(-2147483648) (D6) (-2147483648)\n" +
+"(-2147483648) (D7) (-2147483648)\n" +
+"(-2147483648) (D8) (-2147483648)\n" +
+"(-2147483648) (D9) (-2147483648)\n" +
+"(-2147483648) (D10) (-2147483648)\n" +
+"(-2147483648) (D99) (-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002147483648)\n" +
+"(-2147483648) (E) (-2.147484E+009)\n" +
+"(-2147483648) (E0) (-2E+009)\n" +
+"(-2147483648) (E1) (-2.1E+009)\n" +
+"(-2147483648) (E2) (-2.15E+009)\n" +
+"(-2147483648) (E3) (-2.147E+009)\n" +
+"(-2147483648) (E4) (-2.1475E+009)\n" +
+"(-2147483648) (E5) (-2.14748E+009)\n" +
+"(-2147483648) (E6) (-2.147484E+009)\n" +
+"(-2147483648) (E7) (-2.1474836E+009)\n" +
+"(-2147483648) (E8) (-2.14748365E+009)\n" +
+"(-2147483648) (E9) (-2.147483648E+009)\n" +
+"(-2147483648) (E10) (-2.1474836480E+009)\n" +
+"(-2147483648) (E99) (-2.147483648000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+009)\n" +
+"(-2147483648) (F) (-2147483648.00)\n" +
+"(-2147483648) (F0) (-2147483648)\n" +
+"(-2147483648) (F1) (-2147483648.0)\n" +
+"(-2147483648) (F2) (-2147483648.00)\n" +
+"(-2147483648) (F3) (-2147483648.000)\n" +
+"(-2147483648) (F4) (-2147483648.0000)\n" +
+"(-2147483648) (F5) (-2147483648.00000)\n" +
+"(-2147483648) (F6) (-2147483648.000000)\n" +
+"(-2147483648) (F7) (-2147483648.0000000)\n" +
+"(-2147483648) (F8) (-2147483648.00000000)\n" +
+"(-2147483648) (F9) (-2147483648.000000000)\n" +
+"(-2147483648) (F10) (-2147483648.0000000000)\n" +
+"(-2147483648) (F99) (-2147483648.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(-2147483648) (G) (-2147483648)\n" +
+"(-2147483648) (G0) (-2147483648)\n" +
+"(-2147483648) (G1) (-2E+09)\n" +
+"(-2147483648) (G2) (-2.1E+09)\n" +
+"(-2147483648) (G3) (-2.15E+09)\n" +
+"(-2147483648) (G4) (-2.147E+09)\n" +
+"(-2147483648) (G5) (-2.1475E+09)\n" +
+"(-2147483648) (G6) (-2.14748E+09)\n" +
+"(-2147483648) (G7) (-2.147484E+09)\n" +
+"(-2147483648) (G8) (-2.1474836E+09)\n" +
+"(-2147483648) (G9) (-2.14748365E+09)\n" +
+"(-2147483648) (G10) (-2147483648)\n" +
+"(-2147483648) (G99) (-2147483648)\n" +
+"(-2147483648) (N) (-2,147,483,648.00)\n" +
+"(-2147483648) (N0) (-2,147,483,648)\n" +
+"(-2147483648) (N1) (-2,147,483,648.0)\n" +
+"(-2147483648) (N2) (-2,147,483,648.00)\n" +
+"(-2147483648) (N3) (-2,147,483,648.000)\n" +
+"(-2147483648) (N4) (-2,147,483,648.0000)\n" +
+"(-2147483648) (N5) (-2,147,483,648.00000)\n" +
+"(-2147483648) (N6) (-2,147,483,648.000000)\n" +
+"(-2147483648) (N7) (-2,147,483,648.0000000)\n" +
+"(-2147483648) (N8) (-2,147,483,648.00000000)\n" +
+"(-2147483648) (N9) (-2,147,483,648.000000000)\n" +
+"(-2147483648) (N10) (-2,147,483,648.0000000000)\n" +
+"(-2147483648) (N99) (-2,147,483,648.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(-2147483648) (P) (-214,748,364,800.00 %)\n" +
+"(-2147483648) (P0) (-214,748,364,800 %)\n" +
+"(-2147483648) (P1) (-214,748,364,800.0 %)\n" +
+"(-2147483648) (P2) (-214,748,364,800.00 %)\n" +
+"(-2147483648) (P3) (-214,748,364,800.000 %)\n" +
+"(-2147483648) (P4) (-214,748,364,800.0000 %)\n" +
+"(-2147483648) (P5) (-214,748,364,800.00000 %)\n" +
+"(-2147483648) (P6) (-214,748,364,800.000000 %)\n" +
+"(-2147483648) (P7) (-214,748,364,800.0000000 %)\n" +
+"(-2147483648) (P8) (-214,748,364,800.00000000 %)\n" +
+"(-2147483648) (P9) (-214,748,364,800.000000000 %)\n" +
+"(-2147483648) (P10) (-214,748,364,800.0000000000 %)\n" +
+"(-2147483648) (P99) (-214,748,364,800.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(-2147483648) (X) (80000000)\n" +
+"(-2147483648) (X0) (80000000)\n" +
+"(-2147483648) (X1) (80000000)\n" +
+"(-2147483648) (X2) (80000000)\n" +
+"(-2147483648) (X3) (80000000)\n" +
+"(-2147483648) (X4) (80000000)\n" +
+"(-2147483648) (X5) (80000000)\n" +
+"(-2147483648) (X6) (80000000)\n" +
+"(-2147483648) (X7) (80000000)\n" +
+"(-2147483648) (X8) (80000000)\n" +
+"(-2147483648) (X9) (080000000)\n" +
+"(-2147483648) (X10) (0080000000)\n" +
+"(-2147483648) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000080000000)\n" +
+"(2147483647) (C) ($2,147,483,647.00)\n" +
+"(2147483647) (C0) ($2,147,483,647)\n" +
+"(2147483647) (C1) ($2,147,483,647.0)\n" +
+"(2147483647) (C2) ($2,147,483,647.00)\n" +
+"(2147483647) (C3) ($2,147,483,647.000)\n" +
+"(2147483647) (C4) ($2,147,483,647.0000)\n" +
+"(2147483647) (C5) ($2,147,483,647.00000)\n" +
+"(2147483647) (C6) ($2,147,483,647.000000)\n" +
+"(2147483647) (C7) ($2,147,483,647.0000000)\n" +
+"(2147483647) (C8) ($2,147,483,647.00000000)\n" +
+"(2147483647) (C9) ($2,147,483,647.000000000)\n" +
+"(2147483647) (C10) ($2,147,483,647.0000000000)\n" +
+"(2147483647) (C99) ($2,147,483,647.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(2147483647) (D) (2147483647)\n" +
+"(2147483647) (D0) (2147483647)\n" +
+"(2147483647) (D1) (2147483647)\n" +
+"(2147483647) (D2) (2147483647)\n" +
+"(2147483647) (D3) (2147483647)\n" +
+"(2147483647) (D4) (2147483647)\n" +
+"(2147483647) (D5) (2147483647)\n" +
+"(2147483647) (D6) (2147483647)\n" +
+"(2147483647) (D7) (2147483647)\n" +
+"(2147483647) (D8) (2147483647)\n" +
+"(2147483647) (D9) (2147483647)\n" +
+"(2147483647) (D10) (2147483647)\n" +
+"(2147483647) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002147483647)\n" +
+"(2147483647) (E) (2.147484E+009)\n" +
+"(2147483647) (E0) (2E+009)\n" +
+"(2147483647) (E1) (2.1E+009)\n" +
+"(2147483647) (E2) (2.15E+009)\n" +
+"(2147483647) (E3) (2.147E+009)\n" +
+"(2147483647) (E4) (2.1475E+009)\n" +
+"(2147483647) (E5) (2.14748E+009)\n" +
+"(2147483647) (E6) (2.147484E+009)\n" +
+"(2147483647) (E7) (2.1474836E+009)\n" +
+"(2147483647) (E8) (2.14748365E+009)\n" +
+"(2147483647) (E9) (2.147483647E+009)\n" +
+"(2147483647) (E10) (2.1474836470E+009)\n" +
+"(2147483647) (E99) (2.147483647000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+009)\n" +
+"(2147483647) (F) (2147483647.00)\n" +
+"(2147483647) (F0) (2147483647)\n" +
+"(2147483647) (F1) (2147483647.0)\n" +
+"(2147483647) (F2) (2147483647.00)\n" +
+"(2147483647) (F3) (2147483647.000)\n" +
+"(2147483647) (F4) (2147483647.0000)\n" +
+"(2147483647) (F5) (2147483647.00000)\n" +
+"(2147483647) (F6) (2147483647.000000)\n" +
+"(2147483647) (F7) (2147483647.0000000)\n" +
+"(2147483647) (F8) (2147483647.00000000)\n" +
+"(2147483647) (F9) (2147483647.000000000)\n" +
+"(2147483647) (F10) (2147483647.0000000000)\n" +
+"(2147483647) (F99) (2147483647.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(2147483647) (G) (2147483647)\n" +
+"(2147483647) (G0) (2147483647)\n" +
+"(2147483647) (G1) (2E+09)\n" +
+"(2147483647) (G2) (2.1E+09)\n" +
+"(2147483647) (G3) (2.15E+09)\n" +
+"(2147483647) (G4) (2.147E+09)\n" +
+"(2147483647) (G5) (2.1475E+09)\n" +
+"(2147483647) (G6) (2.14748E+09)\n" +
+"(2147483647) (G7) (2.147484E+09)\n" +
+"(2147483647) (G8) (2.1474836E+09)\n" +
+"(2147483647) (G9) (2.14748365E+09)\n" +
+"(2147483647) (G10) (2147483647)\n" +
+"(2147483647) (G99) (2147483647)\n" +
+"(2147483647) (N) (2,147,483,647.00)\n" +
+"(2147483647) (N0) (2,147,483,647)\n" +
+"(2147483647) (N1) (2,147,483,647.0)\n" +
+"(2147483647) (N2) (2,147,483,647.00)\n" +
+"(2147483647) (N3) (2,147,483,647.000)\n" +
+"(2147483647) (N4) (2,147,483,647.0000)\n" +
+"(2147483647) (N5) (2,147,483,647.00000)\n" +
+"(2147483647) (N6) (2,147,483,647.000000)\n" +
+"(2147483647) (N7) (2,147,483,647.0000000)\n" +
+"(2147483647) (N8) (2,147,483,647.00000000)\n" +
+"(2147483647) (N9) (2,147,483,647.000000000)\n" +
+"(2147483647) (N10) (2,147,483,647.0000000000)\n" +
+"(2147483647) (N99) (2,147,483,647.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(2147483647) (P) (214,748,364,700.00 %)\n" +
+"(2147483647) (P0) (214,748,364,700 %)\n" +
+"(2147483647) (P1) (214,748,364,700.0 %)\n" +
+"(2147483647) (P2) (214,748,364,700.00 %)\n" +
+"(2147483647) (P3) (214,748,364,700.000 %)\n" +
+"(2147483647) (P4) (214,748,364,700.0000 %)\n" +
+"(2147483647) (P5) (214,748,364,700.00000 %)\n" +
+"(2147483647) (P6) (214,748,364,700.000000 %)\n" +
+"(2147483647) (P7) (214,748,364,700.0000000 %)\n" +
+"(2147483647) (P8) (214,748,364,700.00000000 %)\n" +
+"(2147483647) (P9) (214,748,364,700.000000000 %)\n" +
+"(2147483647) (P10) (214,748,364,700.0000000000 %)\n" +
+"(2147483647) (P99) (214,748,364,700.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(2147483647) (X) (7FFFFFFF)\n" +
+"(2147483647) (X0) (7FFFFFFF)\n" +
+"(2147483647) (X1) (7FFFFFFF)\n" +
+"(2147483647) (X2) (7FFFFFFF)\n" +
+"(2147483647) (X3) (7FFFFFFF)\n" +
+"(2147483647) (X4) (7FFFFFFF)\n" +
+"(2147483647) (X5) (7FFFFFFF)\n" +
+"(2147483647) (X6) (7FFFFFFF)\n" +
+"(2147483647) (X7) (7FFFFFFF)\n" +
+"(2147483647) (X8) (7FFFFFFF)\n" +
+"(2147483647) (X9) (07FFFFFFF)\n" +
+"(2147483647) (X10) (007FFFFFFF)\n" +
+"(2147483647) (X99) (00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000007FFFFFFF)\n" +
+"(0) (C) ($0.00)\n" +
+"(0) (C0) ($0)\n" +
+"(0) (C1) ($0.0)\n" +
+"(0) (C2) ($0.00)\n" +
+"(0) (C3) ($0.000)\n" +
+"(0) (C4) ($0.0000)\n" +
+"(0) (C5) ($0.00000)\n" +
+"(0) (C6) ($0.000000)\n" +
+"(0) (C7) ($0.0000000)\n" +
+"(0) (C8) ($0.00000000)\n" +
+"(0) (C9) ($0.000000000)\n" +
+"(0) (C10) ($0.0000000000)\n" +
+"(0) (C99) ($0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (D) (0)\n" +
+"(0) (D0) (0)\n" +
+"(0) (D1) (0)\n" +
+"(0) (D2) (00)\n" +
+"(0) (D3) (000)\n" +
+"(0) (D4) (0000)\n" +
+"(0) (D5) (00000)\n" +
+"(0) (D6) (000000)\n" +
+"(0) (D7) (0000000)\n" +
+"(0) (D8) (00000000)\n" +
+"(0) (D9) (000000000)\n" +
+"(0) (D10) (0000000000)\n" +
+"(0) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (E) (0.000000E+000)\n" +
+"(0) (E0) (0E+000)\n" +
+"(0) (E1) (0.0E+000)\n" +
+"(0) (E2) (0.00E+000)\n" +
+"(0) (E3) (0.000E+000)\n" +
+"(0) (E4) (0.0000E+000)\n" +
+"(0) (E5) (0.00000E+000)\n" +
+"(0) (E6) (0.000000E+000)\n" +
+"(0) (E7) (0.0000000E+000)\n" +
+"(0) (E8) (0.00000000E+000)\n" +
+"(0) (E9) (0.000000000E+000)\n" +
+"(0) (E10) (0.0000000000E+000)\n" +
+"(0) (E99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+000)\n" +
+"(0) (F) (0.00)\n" +
+"(0) (F0) (0)\n" +
+"(0) (F1) (0.0)\n" +
+"(0) (F2) (0.00)\n" +
+"(0) (F3) (0.000)\n" +
+"(0) (F4) (0.0000)\n" +
+"(0) (F5) (0.00000)\n" +
+"(0) (F6) (0.000000)\n" +
+"(0) (F7) (0.0000000)\n" +
+"(0) (F8) (0.00000000)\n" +
+"(0) (F9) (0.000000000)\n" +
+"(0) (F10) (0.0000000000)\n" +
+"(0) (F99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (G) (0)\n" +
+"(0) (G0) (0)\n" +
+"(0) (G1) (0)\n" +
+"(0) (G2) (0)\n" +
+"(0) (G3) (0)\n" +
+"(0) (G4) (0)\n" +
+"(0) (G5) (0)\n" +
+"(0) (G6) (0)\n" +
+"(0) (G7) (0)\n" +
+"(0) (G8) (0)\n" +
+"(0) (G9) (0)\n" +
+"(0) (G10) (0)\n" +
+"(0) (G99) (0)\n" +
+"(0) (N) (0.00)\n" +
+"(0) (N0) (0)\n" +
+"(0) (N1) (0.0)\n" +
+"(0) (N2) (0.00)\n" +
+"(0) (N3) (0.000)\n" +
+"(0) (N4) (0.0000)\n" +
+"(0) (N5) (0.00000)\n" +
+"(0) (N6) (0.000000)\n" +
+"(0) (N7) (0.0000000)\n" +
+"(0) (N8) (0.00000000)\n" +
+"(0) (N9) (0.000000000)\n" +
+"(0) (N10) (0.0000000000)\n" +
+"(0) (N99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (P) (0.00 %)\n" +
+"(0) (P0) (0 %)\n" +
+"(0) (P1) (0.0 %)\n" +
+"(0) (P2) (0.00 %)\n" +
+"(0) (P3) (0.000 %)\n" +
+"(0) (P4) (0.0000 %)\n" +
+"(0) (P5) (0.00000 %)\n" +
+"(0) (P6) (0.000000 %)\n" +
+"(0) (P7) (0.0000000 %)\n" +
+"(0) (P8) (0.00000000 %)\n" +
+"(0) (P9) (0.000000000 %)\n" +
+"(0) (P10) (0.0000000000 %)\n" +
+"(0) (P99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(0) (X) (0)\n" +
+"(0) (X0) (0)\n" +
+"(0) (X1) (0)\n" +
+"(0) (X2) (00)\n" +
+"(0) (X3) (000)\n" +
+"(0) (X4) (0000)\n" +
+"(0) (X5) (00000)\n" +
+"(0) (X6) (000000)\n" +
+"(0) (X7) (0000000)\n" +
+"(0) (X8) (00000000)\n" +
+"(0) (X9) (000000000)\n" +
+"(0) (X10) (0000000000)\n" +
+"(0) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(-100) (C) (($100.00))\n" +
+"(-100) (C0) (($100))\n" +
+"(-100) (C1) (($100.0))\n" +
+"(-100) (C2) (($100.00))\n" +
+"(-100) (C3) (($100.000))\n" +
+"(-100) (C4) (($100.0000))\n" +
+"(-100) (C5) (($100.00000))\n" +
+"(-100) (C6) (($100.000000))\n" +
+"(-100) (C7) (($100.0000000))\n" +
+"(-100) (C8) (($100.00000000))\n" +
+"(-100) (C9) (($100.000000000))\n" +
+"(-100) (C10) (($100.0000000000))\n" +
+"(-100) (C99) (($100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000))\n" +
+"(-100) (D) (-100)\n" +
+"(-100) (D0) (-100)\n" +
+"(-100) (D1) (-100)\n" +
+"(-100) (D2) (-100)\n" +
+"(-100) (D3) (-100)\n" +
+"(-100) (D4) (-0100)\n" +
+"(-100) (D5) (-00100)\n" +
+"(-100) (D6) (-000100)\n" +
+"(-100) (D7) (-0000100)\n" +
+"(-100) (D8) (-00000100)\n" +
+"(-100) (D9) (-000000100)\n" +
+"(-100) (D10) (-0000000100)\n" +
+"(-100) (D99) (-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100)\n" +
+"(-100) (E) (-1.000000E+002)\n" +
+"(-100) (E0) (-1E+002)\n" +
+"(-100) (E1) (-1.0E+002)\n" +
+"(-100) (E2) (-1.00E+002)\n" +
+"(-100) (E3) (-1.000E+002)\n" +
+"(-100) (E4) (-1.0000E+002)\n" +
+"(-100) (E5) (-1.00000E+002)\n" +
+"(-100) (E6) (-1.000000E+002)\n" +
+"(-100) (E7) (-1.0000000E+002)\n" +
+"(-100) (E8) (-1.00000000E+002)\n" +
+"(-100) (E9) (-1.000000000E+002)\n" +
+"(-100) (E10) (-1.0000000000E+002)\n" +
+"(-100) (E99) (-1.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+002)\n" +
+"(-100) (F) (-100.00)\n" +
+"(-100) (F0) (-100)\n" +
+"(-100) (F1) (-100.0)\n" +
+"(-100) (F2) (-100.00)\n" +
+"(-100) (F3) (-100.000)\n" +
+"(-100) (F4) (-100.0000)\n" +
+"(-100) (F5) (-100.00000)\n" +
+"(-100) (F6) (-100.000000)\n" +
+"(-100) (F7) (-100.0000000)\n" +
+"(-100) (F8) (-100.00000000)\n" +
+"(-100) (F9) (-100.000000000)\n" +
+"(-100) (F10) (-100.0000000000)\n" +
+"(-100) (F99) (-100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(-100) (G) (-100)\n" +
+"(-100) (G0) (-100)\n" +
+"(-100) (G1) (-1E+02)\n" +
+"(-100) (G2) (-1E+02)\n" +
+"(-100) (G3) (-100)\n" +
+"(-100) (G4) (-100)\n" +
+"(-100) (G5) (-100)\n" +
+"(-100) (G6) (-100)\n" +
+"(-100) (G7) (-100)\n" +
+"(-100) (G8) (-100)\n" +
+"(-100) (G9) (-100)\n" +
+"(-100) (G10) (-100)\n" +
+"(-100) (G99) (-100)\n" +
+"(-100) (N) (-100.00)\n" +
+"(-100) (N0) (-100)\n" +
+"(-100) (N1) (-100.0)\n" +
+"(-100) (N2) (-100.00)\n" +
+"(-100) (N3) (-100.000)\n" +
+"(-100) (N4) (-100.0000)\n" +
+"(-100) (N5) (-100.00000)\n" +
+"(-100) (N6) (-100.000000)\n" +
+"(-100) (N7) (-100.0000000)\n" +
+"(-100) (N8) (-100.00000000)\n" +
+"(-100) (N9) (-100.000000000)\n" +
+"(-100) (N10) (-100.0000000000)\n" +
+"(-100) (N99) (-100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(-100) (P) (-10,000.00 %)\n" +
+"(-100) (P0) (-10,000 %)\n" +
+"(-100) (P1) (-10,000.0 %)\n" +
+"(-100) (P2) (-10,000.00 %)\n" +
+"(-100) (P3) (-10,000.000 %)\n" +
+"(-100) (P4) (-10,000.0000 %)\n" +
+"(-100) (P5) (-10,000.00000 %)\n" +
+"(-100) (P6) (-10,000.000000 %)\n" +
+"(-100) (P7) (-10,000.0000000 %)\n" +
+"(-100) (P8) (-10,000.00000000 %)\n" +
+"(-100) (P9) (-10,000.000000000 %)\n" +
+"(-100) (P10) (-10,000.0000000000 %)\n" +
+"(-100) (P99) (-10,000.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(-100) (X) (FFFFFF9C)\n" +
+"(-100) (X0) (FFFFFF9C)\n" +
+"(-100) (X1) (FFFFFF9C)\n" +
+"(-100) (X2) (FFFFFF9C)\n" +
+"(-100) (X3) (FFFFFF9C)\n" +
+"(-100) (X4) (FFFFFF9C)\n" +
+"(-100) (X5) (FFFFFF9C)\n" +
+"(-100) (X6) (FFFFFF9C)\n" +
+"(-100) (X7) (FFFFFF9C)\n" +
+"(-100) (X8) (FFFFFF9C)\n" +
+"(-100) (X9) (0FFFFFF9C)\n" +
+"(-100) (X10) (00FFFFFF9C)\n" +
+"(-100) (X99) (0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFF9C)\n" +
+"(100) (C) ($100.00)\n" +
+"(100) (C0) ($100)\n" +
+"(100) (C1) ($100.0)\n" +
+"(100) (C2) ($100.00)\n" +
+"(100) (C3) ($100.000)\n" +
+"(100) (C4) ($100.0000)\n" +
+"(100) (C5) ($100.00000)\n" +
+"(100) (C6) ($100.000000)\n" +
+"(100) (C7) ($100.0000000)\n" +
+"(100) (C8) ($100.00000000)\n" +
+"(100) (C9) ($100.000000000)\n" +
+"(100) (C10) ($100.0000000000)\n" +
+"(100) (C99) ($100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (D) (100)\n" +
+"(100) (D0) (100)\n" +
+"(100) (D1) (100)\n" +
+"(100) (D2) (100)\n" +
+"(100) (D3) (100)\n" +
+"(100) (D4) (0100)\n" +
+"(100) (D5) (00100)\n" +
+"(100) (D6) (000100)\n" +
+"(100) (D7) (0000100)\n" +
+"(100) (D8) (00000100)\n" +
+"(100) (D9) (000000100)\n" +
+"(100) (D10) (0000000100)\n" +
+"(100) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100)\n" +
+"(100) (E) (1.000000E+002)\n" +
+"(100) (E0) (1E+002)\n" +
+"(100) (E1) (1.0E+002)\n" +
+"(100) (E2) (1.00E+002)\n" +
+"(100) (E3) (1.000E+002)\n" +
+"(100) (E4) (1.0000E+002)\n" +
+"(100) (E5) (1.00000E+002)\n" +
+"(100) (E6) (1.000000E+002)\n" +
+"(100) (E7) (1.0000000E+002)\n" +
+"(100) (E8) (1.00000000E+002)\n" +
+"(100) (E9) (1.000000000E+002)\n" +
+"(100) (E10) (1.0000000000E+002)\n" +
+"(100) (E99) (1.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+002)\n" +
+"(100) (F) (100.00)\n" +
+"(100) (F0) (100)\n" +
+"(100) (F1) (100.0)\n" +
+"(100) (F2) (100.00)\n" +
+"(100) (F3) (100.000)\n" +
+"(100) (F4) (100.0000)\n" +
+"(100) (F5) (100.00000)\n" +
+"(100) (F6) (100.000000)\n" +
+"(100) (F7) (100.0000000)\n" +
+"(100) (F8) (100.00000000)\n" +
+"(100) (F9) (100.000000000)\n" +
+"(100) (F10) (100.0000000000)\n" +
+"(100) (F99) (100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (G) (100)\n" +
+"(100) (G0) (100)\n" +
+"(100) (G1) (1E+02)\n" +
+"(100) (G2) (1E+02)\n" +
+"(100) (G3) (100)\n" +
+"(100) (G4) (100)\n" +
+"(100) (G5) (100)\n" +
+"(100) (G6) (100)\n" +
+"(100) (G7) (100)\n" +
+"(100) (G8) (100)\n" +
+"(100) (G9) (100)\n" +
+"(100) (G10) (100)\n" +
+"(100) (G99) (100)\n" +
+"(100) (N) (100.00)\n" +
+"(100) (N0) (100)\n" +
+"(100) (N1) (100.0)\n" +
+"(100) (N2) (100.00)\n" +
+"(100) (N3) (100.000)\n" +
+"(100) (N4) (100.0000)\n" +
+"(100) (N5) (100.00000)\n" +
+"(100) (N6) (100.000000)\n" +
+"(100) (N7) (100.0000000)\n" +
+"(100) (N8) (100.00000000)\n" +
+"(100) (N9) (100.000000000)\n" +
+"(100) (N10) (100.0000000000)\n" +
+"(100) (N99) (100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (P) (10,000.00 %)\n" +
+"(100) (P0) (10,000 %)\n" +
+"(100) (P1) (10,000.0 %)\n" +
+"(100) (P2) (10,000.00 %)\n" +
+"(100) (P3) (10,000.000 %)\n" +
+"(100) (P4) (10,000.0000 %)\n" +
+"(100) (P5) (10,000.00000 %)\n" +
+"(100) (P6) (10,000.000000 %)\n" +
+"(100) (P7) (10,000.0000000 %)\n" +
+"(100) (P8) (10,000.00000000 %)\n" +
+"(100) (P9) (10,000.000000000 %)\n" +
+"(100) (P10) (10,000.0000000000 %)\n" +
+"(100) (P99) (10,000.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(100) (X) (64)\n" +
+"(100) (X0) (64)\n" +
+"(100) (X1) (64)\n" +
+"(100) (X2) (64)\n" +
+"(100) (X3) (064)\n" +
+"(100) (X4) (0064)\n" +
+"(100) (X5) (00064)\n" +
+"(100) (X6) (000064)\n" +
+"(100) (X7) (0000064)\n" +
+"(100) (X8) (00000064)\n" +
+"(100) (X9) (000000064)\n" +
+"(100) (X10) (0000000064)\n" +
+"(100) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064)\n" +
+"Int64\n" +
+"(-9223372036854775808) (C) (($9,223,372,036,854,775,808.00))\n" +
+"(-9223372036854775808) (C0) (($9,223,372,036,854,775,808))\n" +
+"(-9223372036854775808) (C1) (($9,223,372,036,854,775,808.0))\n" +
+"(-9223372036854775808) (C2) (($9,223,372,036,854,775,808.00))\n" +
+"(-9223372036854775808) (C3) (($9,223,372,036,854,775,808.000))\n" +
+"(-9223372036854775808) (C4) (($9,223,372,036,854,775,808.0000))\n" +
+"(-9223372036854775808) (C5) (($9,223,372,036,854,775,808.00000))\n" +
+"(-9223372036854775808) (C6) (($9,223,372,036,854,775,808.000000))\n" +
+"(-9223372036854775808) (C7) (($9,223,372,036,854,775,808.0000000))\n" +
+"(-9223372036854775808) (C8) (($9,223,372,036,854,775,808.00000000))\n" +
+"(-9223372036854775808) (C9) (($9,223,372,036,854,775,808.000000000))\n" +
+"(-9223372036854775808) (C10) (($9,223,372,036,854,775,808.0000000000))\n" +
+"(-9223372036854775808) (C99) (($9,223,372,036,854,775,808.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000))\n" +
+"(-9223372036854775808) (D) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D0) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D1) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D2) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D3) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D4) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D5) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D6) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D7) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D8) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D9) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D10) (-9223372036854775808)\n" +
+"(-9223372036854775808) (D99) (-000000000000000000000000000000000000000000000000000000000000000000000000000000009223372036854775808)\n" +
+"(-9223372036854775808) (E) (-9.223372E+018)\n" +
+"(-9223372036854775808) (E0) (-9E+018)\n" +
+"(-9223372036854775808) (E1) (-9.2E+018)\n" +
+"(-9223372036854775808) (E2) (-9.22E+018)\n" +
+"(-9223372036854775808) (E3) (-9.223E+018)\n" +
+"(-9223372036854775808) (E4) (-9.2234E+018)\n" +
+"(-9223372036854775808) (E5) (-9.22337E+018)\n" +
+"(-9223372036854775808) (E6) (-9.223372E+018)\n" +
+"(-9223372036854775808) (E7) (-9.2233720E+018)\n" +
+"(-9223372036854775808) (E8) (-9.22337204E+018)\n" +
+"(-9223372036854775808) (E9) (-9.223372037E+018)\n" +
+"(-9223372036854775808) (E10) (-9.2233720369E+018)\n" +
+"(-9223372036854775808) (E99) (-9.223372036854775808000000000000000000000000000000000000000000000000000000000000000000000000000000000E+018)\n" +
+"(-9223372036854775808) (F) (-9223372036854775808.00)\n" +
+"(-9223372036854775808) (F0) (-9223372036854775808)\n" +
+"(-9223372036854775808) (F1) (-9223372036854775808.0)\n" +
+"(-9223372036854775808) (F2) (-9223372036854775808.00)\n" +
+"(-9223372036854775808) (F3) (-9223372036854775808.000)\n" +
+"(-9223372036854775808) (F4) (-9223372036854775808.0000)\n" +
+"(-9223372036854775808) (F5) (-9223372036854775808.00000)\n" +
+"(-9223372036854775808) (F6) (-9223372036854775808.000000)\n" +
+"(-9223372036854775808) (F7) (-9223372036854775808.0000000)\n" +
+"(-9223372036854775808) (F8) (-9223372036854775808.00000000)\n" +
+"(-9223372036854775808) (F9) (-9223372036854775808.000000000)\n" +
+"(-9223372036854775808) (F10) (-9223372036854775808.0000000000)\n" +
+"(-9223372036854775808) (F99) (-9223372036854775808.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(-9223372036854775808) (G) (-9223372036854775808)\n" +
+"(-9223372036854775808) (G0) (-9223372036854775808)\n" +
+"(-9223372036854775808) (G1) (-9E+18)\n" +
+"(-9223372036854775808) (G2) (-9.2E+18)\n" +
+"(-9223372036854775808) (G3) (-9.22E+18)\n" +
+"(-9223372036854775808) (G4) (-9.223E+18)\n" +
+"(-9223372036854775808) (G5) (-9.2234E+18)\n" +
+"(-9223372036854775808) (G6) (-9.22337E+18)\n" +
+"(-9223372036854775808) (G7) (-9.223372E+18)\n" +
+"(-9223372036854775808) (G8) (-9.223372E+18)\n" +
+"(-9223372036854775808) (G9) (-9.22337204E+18)\n" +
+"(-9223372036854775808) (G10) (-9.223372037E+18)\n" +
+"(-9223372036854775808) (G99) (-9223372036854775808)\n" +
+"(-9223372036854775808) (N) (-9,223,372,036,854,775,808.00)\n" +
+"(-9223372036854775808) (N0) (-9,223,372,036,854,775,808)\n" +
+"(-9223372036854775808) (N1) (-9,223,372,036,854,775,808.0)\n" +
+"(-9223372036854775808) (N2) (-9,223,372,036,854,775,808.00)\n" +
+"(-9223372036854775808) (N3) (-9,223,372,036,854,775,808.000)\n" +
+"(-9223372036854775808) (N4) (-9,223,372,036,854,775,808.0000)\n" +
+"(-9223372036854775808) (N5) (-9,223,372,036,854,775,808.00000)\n" +
+"(-9223372036854775808) (N6) (-9,223,372,036,854,775,808.000000)\n" +
+"(-9223372036854775808) (N7) (-9,223,372,036,854,775,808.0000000)\n" +
+"(-9223372036854775808) (N8) (-9,223,372,036,854,775,808.00000000)\n" +
+"(-9223372036854775808) (N9) (-9,223,372,036,854,775,808.000000000)\n" +
+"(-9223372036854775808) (N10) (-9,223,372,036,854,775,808.0000000000)\n" +
+"(-9223372036854775808) (N99) (-9,223,372,036,854,775,808.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(-9223372036854775808) (P) (-922,337,203,685,477,580,800.00 %)\n" +
+"(-9223372036854775808) (P0) (-922,337,203,685,477,580,800 %)\n" +
+"(-9223372036854775808) (P1) (-922,337,203,685,477,580,800.0 %)\n" +
+"(-9223372036854775808) (P2) (-922,337,203,685,477,580,800.00 %)\n" +
+"(-9223372036854775808) (P3) (-922,337,203,685,477,580,800.000 %)\n" +
+"(-9223372036854775808) (P4) (-922,337,203,685,477,580,800.0000 %)\n" +
+"(-9223372036854775808) (P5) (-922,337,203,685,477,580,800.00000 %)\n" +
+"(-9223372036854775808) (P6) (-922,337,203,685,477,580,800.000000 %)\n" +
+"(-9223372036854775808) (P7) (-922,337,203,685,477,580,800.0000000 %)\n" +
+"(-9223372036854775808) (P8) (-922,337,203,685,477,580,800.00000000 %)\n" +
+"(-9223372036854775808) (P9) (-922,337,203,685,477,580,800.000000000 %)\n" +
+"(-9223372036854775808) (P10) (-922,337,203,685,477,580,800.0000000000 %)\n" +
+"(-9223372036854775808) (P99) (-922,337,203,685,477,580,800.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(-9223372036854775808) (X) (8000000000000000)\n" +
+"(-9223372036854775808) (X0) (8000000000000000)\n" +
+"(-9223372036854775808) (X1) (8000000000000000)\n" +
+"(-9223372036854775808) (X2) (8000000000000000)\n" +
+"(-9223372036854775808) (X3) (8000000000000000)\n" +
+"(-9223372036854775808) (X4) (8000000000000000)\n" +
+"(-9223372036854775808) (X5) (8000000000000000)\n" +
+"(-9223372036854775808) (X6) (8000000000000000)\n" +
+"(-9223372036854775808) (X7) (8000000000000000)\n" +
+"(-9223372036854775808) (X8) (8000000000000000)\n" +
+"(-9223372036854775808) (X9) (8000000000000000)\n" +
+"(-9223372036854775808) (X10) (8000000000000000)\n" +
+"(-9223372036854775808) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000008000000000000000)\n" +
+"(9223372036854775807) (C) ($9,223,372,036,854,775,807.00)\n" +
+"(9223372036854775807) (C0) ($9,223,372,036,854,775,807)\n" +
+"(9223372036854775807) (C1) ($9,223,372,036,854,775,807.0)\n" +
+"(9223372036854775807) (C2) ($9,223,372,036,854,775,807.00)\n" +
+"(9223372036854775807) (C3) ($9,223,372,036,854,775,807.000)\n" +
+"(9223372036854775807) (C4) ($9,223,372,036,854,775,807.0000)\n" +
+"(9223372036854775807) (C5) ($9,223,372,036,854,775,807.00000)\n" +
+"(9223372036854775807) (C6) ($9,223,372,036,854,775,807.000000)\n" +
+"(9223372036854775807) (C7) ($9,223,372,036,854,775,807.0000000)\n" +
+"(9223372036854775807) (C8) ($9,223,372,036,854,775,807.00000000)\n" +
+"(9223372036854775807) (C9) ($9,223,372,036,854,775,807.000000000)\n" +
+"(9223372036854775807) (C10) ($9,223,372,036,854,775,807.0000000000)\n" +
+"(9223372036854775807) (C99) ($9,223,372,036,854,775,807.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(9223372036854775807) (D) (9223372036854775807)\n" +
+"(9223372036854775807) (D0) (9223372036854775807)\n" +
+"(9223372036854775807) (D1) (9223372036854775807)\n" +
+"(9223372036854775807) (D2) (9223372036854775807)\n" +
+"(9223372036854775807) (D3) (9223372036854775807)\n" +
+"(9223372036854775807) (D4) (9223372036854775807)\n" +
+"(9223372036854775807) (D5) (9223372036854775807)\n" +
+"(9223372036854775807) (D6) (9223372036854775807)\n" +
+"(9223372036854775807) (D7) (9223372036854775807)\n" +
+"(9223372036854775807) (D8) (9223372036854775807)\n" +
+"(9223372036854775807) (D9) (9223372036854775807)\n" +
+"(9223372036854775807) (D10) (9223372036854775807)\n" +
+"(9223372036854775807) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000009223372036854775807)\n" +
+"(9223372036854775807) (E) (9.223372E+018)\n" +
+"(9223372036854775807) (E0) (9E+018)\n" +
+"(9223372036854775807) (E1) (9.2E+018)\n" +
+"(9223372036854775807) (E2) (9.22E+018)\n" +
+"(9223372036854775807) (E3) (9.223E+018)\n" +
+"(9223372036854775807) (E4) (9.2234E+018)\n" +
+"(9223372036854775807) (E5) (9.22337E+018)\n" +
+"(9223372036854775807) (E6) (9.223372E+018)\n" +
+"(9223372036854775807) (E7) (9.2233720E+018)\n" +
+"(9223372036854775807) (E8) (9.22337204E+018)\n" +
+"(9223372036854775807) (E9) (9.223372037E+018)\n" +
+"(9223372036854775807) (E10) (9.2233720369E+018)\n" +
+"(9223372036854775807) (E99) (9.223372036854775807000000000000000000000000000000000000000000000000000000000000000000000000000000000E+018)\n" +
+"(9223372036854775807) (F) (9223372036854775807.00)\n" +
+"(9223372036854775807) (F0) (9223372036854775807)\n" +
+"(9223372036854775807) (F1) (9223372036854775807.0)\n" +
+"(9223372036854775807) (F2) (9223372036854775807.00)\n" +
+"(9223372036854775807) (F3) (9223372036854775807.000)\n" +
+"(9223372036854775807) (F4) (9223372036854775807.0000)\n" +
+"(9223372036854775807) (F5) (9223372036854775807.00000)\n" +
+"(9223372036854775807) (F6) (9223372036854775807.000000)\n" +
+"(9223372036854775807) (F7) (9223372036854775807.0000000)\n" +
+"(9223372036854775807) (F8) (9223372036854775807.00000000)\n" +
+"(9223372036854775807) (F9) (9223372036854775807.000000000)\n" +
+"(9223372036854775807) (F10) (9223372036854775807.0000000000)\n" +
+"(9223372036854775807) (F99) (9223372036854775807.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(9223372036854775807) (G) (9223372036854775807)\n" +
+"(9223372036854775807) (G0) (9223372036854775807)\n" +
+"(9223372036854775807) (G1) (9E+18)\n" +
+"(9223372036854775807) (G2) (9.2E+18)\n" +
+"(9223372036854775807) (G3) (9.22E+18)\n" +
+"(9223372036854775807) (G4) (9.223E+18)\n" +
+"(9223372036854775807) (G5) (9.2234E+18)\n" +
+"(9223372036854775807) (G6) (9.22337E+18)\n" +
+"(9223372036854775807) (G7) (9.223372E+18)\n" +
+"(9223372036854775807) (G8) (9.223372E+18)\n" +
+"(9223372036854775807) (G9) (9.22337204E+18)\n" +
+"(9223372036854775807) (G10) (9.223372037E+18)\n" +
+"(9223372036854775807) (G99) (9223372036854775807)\n" +
+"(9223372036854775807) (N) (9,223,372,036,854,775,807.00)\n" +
+"(9223372036854775807) (N0) (9,223,372,036,854,775,807)\n" +
+"(9223372036854775807) (N1) (9,223,372,036,854,775,807.0)\n" +
+"(9223372036854775807) (N2) (9,223,372,036,854,775,807.00)\n" +
+"(9223372036854775807) (N3) (9,223,372,036,854,775,807.000)\n" +
+"(9223372036854775807) (N4) (9,223,372,036,854,775,807.0000)\n" +
+"(9223372036854775807) (N5) (9,223,372,036,854,775,807.00000)\n" +
+"(9223372036854775807) (N6) (9,223,372,036,854,775,807.000000)\n" +
+"(9223372036854775807) (N7) (9,223,372,036,854,775,807.0000000)\n" +
+"(9223372036854775807) (N8) (9,223,372,036,854,775,807.00000000)\n" +
+"(9223372036854775807) (N9) (9,223,372,036,854,775,807.000000000)\n" +
+"(9223372036854775807) (N10) (9,223,372,036,854,775,807.0000000000)\n" +
+"(9223372036854775807) (N99) (9,223,372,036,854,775,807.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(9223372036854775807) (P) (922,337,203,685,477,580,700.00 %)\n" +
+"(9223372036854775807) (P0) (922,337,203,685,477,580,700 %)\n" +
+"(9223372036854775807) (P1) (922,337,203,685,477,580,700.0 %)\n" +
+"(9223372036854775807) (P2) (922,337,203,685,477,580,700.00 %)\n" +
+"(9223372036854775807) (P3) (922,337,203,685,477,580,700.000 %)\n" +
+"(9223372036854775807) (P4) (922,337,203,685,477,580,700.0000 %)\n" +
+"(9223372036854775807) (P5) (922,337,203,685,477,580,700.00000 %)\n" +
+"(9223372036854775807) (P6) (922,337,203,685,477,580,700.000000 %)\n" +
+"(9223372036854775807) (P7) (922,337,203,685,477,580,700.0000000 %)\n" +
+"(9223372036854775807) (P8) (922,337,203,685,477,580,700.00000000 %)\n" +
+"(9223372036854775807) (P9) (922,337,203,685,477,580,700.000000000 %)\n" +
+"(9223372036854775807) (P10) (922,337,203,685,477,580,700.0000000000 %)\n" +
+"(9223372036854775807) (P99) (922,337,203,685,477,580,700.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(9223372036854775807) (X) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X0) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X1) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X2) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X3) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X4) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X5) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X6) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X7) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X8) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X9) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X10) (7FFFFFFFFFFFFFFF)\n" +
+"(9223372036854775807) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000007FFFFFFFFFFFFFFF)\n" +
+"(0) (C) ($0.00)\n" +
+"(0) (C0) ($0)\n" +
+"(0) (C1) ($0.0)\n" +
+"(0) (C2) ($0.00)\n" +
+"(0) (C3) ($0.000)\n" +
+"(0) (C4) ($0.0000)\n" +
+"(0) (C5) ($0.00000)\n" +
+"(0) (C6) ($0.000000)\n" +
+"(0) (C7) ($0.0000000)\n" +
+"(0) (C8) ($0.00000000)\n" +
+"(0) (C9) ($0.000000000)\n" +
+"(0) (C10) ($0.0000000000)\n" +
+"(0) (C99) ($0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (D) (0)\n" +
+"(0) (D0) (0)\n" +
+"(0) (D1) (0)\n" +
+"(0) (D2) (00)\n" +
+"(0) (D3) (000)\n" +
+"(0) (D4) (0000)\n" +
+"(0) (D5) (00000)\n" +
+"(0) (D6) (000000)\n" +
+"(0) (D7) (0000000)\n" +
+"(0) (D8) (00000000)\n" +
+"(0) (D9) (000000000)\n" +
+"(0) (D10) (0000000000)\n" +
+"(0) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (E) (0.000000E+000)\n" +
+"(0) (E0) (0E+000)\n" +
+"(0) (E1) (0.0E+000)\n" +
+"(0) (E2) (0.00E+000)\n" +
+"(0) (E3) (0.000E+000)\n" +
+"(0) (E4) (0.0000E+000)\n" +
+"(0) (E5) (0.00000E+000)\n" +
+"(0) (E6) (0.000000E+000)\n" +
+"(0) (E7) (0.0000000E+000)\n" +
+"(0) (E8) (0.00000000E+000)\n" +
+"(0) (E9) (0.000000000E+000)\n" +
+"(0) (E10) (0.0000000000E+000)\n" +
+"(0) (E99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+000)\n" +
+"(0) (F) (0.00)\n" +
+"(0) (F0) (0)\n" +
+"(0) (F1) (0.0)\n" +
+"(0) (F2) (0.00)\n" +
+"(0) (F3) (0.000)\n" +
+"(0) (F4) (0.0000)\n" +
+"(0) (F5) (0.00000)\n" +
+"(0) (F6) (0.000000)\n" +
+"(0) (F7) (0.0000000)\n" +
+"(0) (F8) (0.00000000)\n" +
+"(0) (F9) (0.000000000)\n" +
+"(0) (F10) (0.0000000000)\n" +
+"(0) (F99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (G) (0)\n" +
+"(0) (G0) (0)\n" +
+"(0) (G1) (0)\n" +
+"(0) (G2) (0)\n" +
+"(0) (G3) (0)\n" +
+"(0) (G4) (0)\n" +
+"(0) (G5) (0)\n" +
+"(0) (G6) (0)\n" +
+"(0) (G7) (0)\n" +
+"(0) (G8) (0)\n" +
+"(0) (G9) (0)\n" +
+"(0) (G10) (0)\n" +
+"(0) (G99) (0)\n" +
+"(0) (N) (0.00)\n" +
+"(0) (N0) (0)\n" +
+"(0) (N1) (0.0)\n" +
+"(0) (N2) (0.00)\n" +
+"(0) (N3) (0.000)\n" +
+"(0) (N4) (0.0000)\n" +
+"(0) (N5) (0.00000)\n" +
+"(0) (N6) (0.000000)\n" +
+"(0) (N7) (0.0000000)\n" +
+"(0) (N8) (0.00000000)\n" +
+"(0) (N9) (0.000000000)\n" +
+"(0) (N10) (0.0000000000)\n" +
+"(0) (N99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (P) (0.00 %)\n" +
+"(0) (P0) (0 %)\n" +
+"(0) (P1) (0.0 %)\n" +
+"(0) (P2) (0.00 %)\n" +
+"(0) (P3) (0.000 %)\n" +
+"(0) (P4) (0.0000 %)\n" +
+"(0) (P5) (0.00000 %)\n" +
+"(0) (P6) (0.000000 %)\n" +
+"(0) (P7) (0.0000000 %)\n" +
+"(0) (P8) (0.00000000 %)\n" +
+"(0) (P9) (0.000000000 %)\n" +
+"(0) (P10) (0.0000000000 %)\n" +
+"(0) (P99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(0) (X) (0)\n" +
+"(0) (X0) (0)\n" +
+"(0) (X1) (0)\n" +
+"(0) (X2) (00)\n" +
+"(0) (X3) (000)\n" +
+"(0) (X4) (0000)\n" +
+"(0) (X5) (00000)\n" +
+"(0) (X6) (000000)\n" +
+"(0) (X7) (0000000)\n" +
+"(0) (X8) (00000000)\n" +
+"(0) (X9) (000000000)\n" +
+"(0) (X10) (0000000000)\n" +
+"(0) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(-100) (C) (($100.00))\n" +
+"(-100) (C0) (($100))\n" +
+"(-100) (C1) (($100.0))\n" +
+"(-100) (C2) (($100.00))\n" +
+"(-100) (C3) (($100.000))\n" +
+"(-100) (C4) (($100.0000))\n" +
+"(-100) (C5) (($100.00000))\n" +
+"(-100) (C6) (($100.000000))\n" +
+"(-100) (C7) (($100.0000000))\n" +
+"(-100) (C8) (($100.00000000))\n" +
+"(-100) (C9) (($100.000000000))\n" +
+"(-100) (C10) (($100.0000000000))\n" +
+"(-100) (C99) (($100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000))\n" +
+"(-100) (D) (-100)\n" +
+"(-100) (D0) (-100)\n" +
+"(-100) (D1) (-100)\n" +
+"(-100) (D2) (-100)\n" +
+"(-100) (D3) (-100)\n" +
+"(-100) (D4) (-0100)\n" +
+"(-100) (D5) (-00100)\n" +
+"(-100) (D6) (-000100)\n" +
+"(-100) (D7) (-0000100)\n" +
+"(-100) (D8) (-00000100)\n" +
+"(-100) (D9) (-000000100)\n" +
+"(-100) (D10) (-0000000100)\n" +
+"(-100) (D99) (-000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100)\n" +
+"(-100) (E) (-1.000000E+002)\n" +
+"(-100) (E0) (-1E+002)\n" +
+"(-100) (E1) (-1.0E+002)\n" +
+"(-100) (E2) (-1.00E+002)\n" +
+"(-100) (E3) (-1.000E+002)\n" +
+"(-100) (E4) (-1.0000E+002)\n" +
+"(-100) (E5) (-1.00000E+002)\n" +
+"(-100) (E6) (-1.000000E+002)\n" +
+"(-100) (E7) (-1.0000000E+002)\n" +
+"(-100) (E8) (-1.00000000E+002)\n" +
+"(-100) (E9) (-1.000000000E+002)\n" +
+"(-100) (E10) (-1.0000000000E+002)\n" +
+"(-100) (E99) (-1.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+002)\n" +
+"(-100) (F) (-100.00)\n" +
+"(-100) (F0) (-100)\n" +
+"(-100) (F1) (-100.0)\n" +
+"(-100) (F2) (-100.00)\n" +
+"(-100) (F3) (-100.000)\n" +
+"(-100) (F4) (-100.0000)\n" +
+"(-100) (F5) (-100.00000)\n" +
+"(-100) (F6) (-100.000000)\n" +
+"(-100) (F7) (-100.0000000)\n" +
+"(-100) (F8) (-100.00000000)\n" +
+"(-100) (F9) (-100.000000000)\n" +
+"(-100) (F10) (-100.0000000000)\n" +
+"(-100) (F99) (-100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(-100) (G) (-100)\n" +
+"(-100) (G0) (-100)\n" +
+"(-100) (G1) (-1E+02)\n" +
+"(-100) (G2) (-1E+02)\n" +
+"(-100) (G3) (-100)\n" +
+"(-100) (G4) (-100)\n" +
+"(-100) (G5) (-100)\n" +
+"(-100) (G6) (-100)\n" +
+"(-100) (G7) (-100)\n" +
+"(-100) (G8) (-100)\n" +
+"(-100) (G9) (-100)\n" +
+"(-100) (G10) (-100)\n" +
+"(-100) (G99) (-100)\n" +
+"(-100) (N) (-100.00)\n" +
+"(-100) (N0) (-100)\n" +
+"(-100) (N1) (-100.0)\n" +
+"(-100) (N2) (-100.00)\n" +
+"(-100) (N3) (-100.000)\n" +
+"(-100) (N4) (-100.0000)\n" +
+"(-100) (N5) (-100.00000)\n" +
+"(-100) (N6) (-100.000000)\n" +
+"(-100) (N7) (-100.0000000)\n" +
+"(-100) (N8) (-100.00000000)\n" +
+"(-100) (N9) (-100.000000000)\n" +
+"(-100) (N10) (-100.0000000000)\n" +
+"(-100) (N99) (-100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(-100) (P) (-10,000.00 %)\n" +
+"(-100) (P0) (-10,000 %)\n" +
+"(-100) (P1) (-10,000.0 %)\n" +
+"(-100) (P2) (-10,000.00 %)\n" +
+"(-100) (P3) (-10,000.000 %)\n" +
+"(-100) (P4) (-10,000.0000 %)\n" +
+"(-100) (P5) (-10,000.00000 %)\n" +
+"(-100) (P6) (-10,000.000000 %)\n" +
+"(-100) (P7) (-10,000.0000000 %)\n" +
+"(-100) (P8) (-10,000.00000000 %)\n" +
+"(-100) (P9) (-10,000.000000000 %)\n" +
+"(-100) (P10) (-10,000.0000000000 %)\n" +
+"(-100) (P99) (-10,000.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(-100) (X) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X0) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X1) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X2) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X3) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X4) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X5) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X6) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X7) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X8) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X9) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X10) (FFFFFFFFFFFFFF9C)\n" +
+"(-100) (X99) (00000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFF9C)\n" +
+"(100) (C) ($100.00)\n" +
+"(100) (C0) ($100)\n" +
+"(100) (C1) ($100.0)\n" +
+"(100) (C2) ($100.00)\n" +
+"(100) (C3) ($100.000)\n" +
+"(100) (C4) ($100.0000)\n" +
+"(100) (C5) ($100.00000)\n" +
+"(100) (C6) ($100.000000)\n" +
+"(100) (C7) ($100.0000000)\n" +
+"(100) (C8) ($100.00000000)\n" +
+"(100) (C9) ($100.000000000)\n" +
+"(100) (C10) ($100.0000000000)\n" +
+"(100) (C99) ($100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (D) (100)\n" +
+"(100) (D0) (100)\n" +
+"(100) (D1) (100)\n" +
+"(100) (D2) (100)\n" +
+"(100) (D3) (100)\n" +
+"(100) (D4) (0100)\n" +
+"(100) (D5) (00100)\n" +
+"(100) (D6) (000100)\n" +
+"(100) (D7) (0000100)\n" +
+"(100) (D8) (00000100)\n" +
+"(100) (D9) (000000100)\n" +
+"(100) (D10) (0000000100)\n" +
+"(100) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100)\n" +
+"(100) (E) (1.000000E+002)\n" +
+"(100) (E0) (1E+002)\n" +
+"(100) (E1) (1.0E+002)\n" +
+"(100) (E2) (1.00E+002)\n" +
+"(100) (E3) (1.000E+002)\n" +
+"(100) (E4) (1.0000E+002)\n" +
+"(100) (E5) (1.00000E+002)\n" +
+"(100) (E6) (1.000000E+002)\n" +
+"(100) (E7) (1.0000000E+002)\n" +
+"(100) (E8) (1.00000000E+002)\n" +
+"(100) (E9) (1.000000000E+002)\n" +
+"(100) (E10) (1.0000000000E+002)\n" +
+"(100) (E99) (1.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+002)\n" +
+"(100) (F) (100.00)\n" +
+"(100) (F0) (100)\n" +
+"(100) (F1) (100.0)\n" +
+"(100) (F2) (100.00)\n" +
+"(100) (F3) (100.000)\n" +
+"(100) (F4) (100.0000)\n" +
+"(100) (F5) (100.00000)\n" +
+"(100) (F6) (100.000000)\n" +
+"(100) (F7) (100.0000000)\n" +
+"(100) (F8) (100.00000000)\n" +
+"(100) (F9) (100.000000000)\n" +
+"(100) (F10) (100.0000000000)\n" +
+"(100) (F99) (100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (G) (100)\n" +
+"(100) (G0) (100)\n" +
+"(100) (G1) (1E+02)\n" +
+"(100) (G2) (1E+02)\n" +
+"(100) (G3) (100)\n" +
+"(100) (G4) (100)\n" +
+"(100) (G5) (100)\n" +
+"(100) (G6) (100)\n" +
+"(100) (G7) (100)\n" +
+"(100) (G8) (100)\n" +
+"(100) (G9) (100)\n" +
+"(100) (G10) (100)\n" +
+"(100) (G99) (100)\n" +
+"(100) (N) (100.00)\n" +
+"(100) (N0) (100)\n" +
+"(100) (N1) (100.0)\n" +
+"(100) (N2) (100.00)\n" +
+"(100) (N3) (100.000)\n" +
+"(100) (N4) (100.0000)\n" +
+"(100) (N5) (100.00000)\n" +
+"(100) (N6) (100.000000)\n" +
+"(100) (N7) (100.0000000)\n" +
+"(100) (N8) (100.00000000)\n" +
+"(100) (N9) (100.000000000)\n" +
+"(100) (N10) (100.0000000000)\n" +
+"(100) (N99) (100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (P) (10,000.00 %)\n" +
+"(100) (P0) (10,000 %)\n" +
+"(100) (P1) (10,000.0 %)\n" +
+"(100) (P2) (10,000.00 %)\n" +
+"(100) (P3) (10,000.000 %)\n" +
+"(100) (P4) (10,000.0000 %)\n" +
+"(100) (P5) (10,000.00000 %)\n" +
+"(100) (P6) (10,000.000000 %)\n" +
+"(100) (P7) (10,000.0000000 %)\n" +
+"(100) (P8) (10,000.00000000 %)\n" +
+"(100) (P9) (10,000.000000000 %)\n" +
+"(100) (P10) (10,000.0000000000 %)\n" +
+"(100) (P99) (10,000.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(100) (X) (64)\n" +
+"(100) (X0) (64)\n" +
+"(100) (X1) (64)\n" +
+"(100) (X2) (64)\n" +
+"(100) (X3) (064)\n" +
+"(100) (X4) (0064)\n" +
+"(100) (X5) (00064)\n" +
+"(100) (X6) (000064)\n" +
+"(100) (X7) (0000064)\n" +
+"(100) (X8) (00000064)\n" +
+"(100) (X9) (000000064)\n" +
+"(100) (X10) (0000000064)\n" +
+"(100) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064)\n" +
+"UInt32\n" +
+"(0) (C) ($0.00)\n" +
+"(0) (C0) ($0)\n" +
+"(0) (C1) ($0.0)\n" +
+"(0) (C2) ($0.00)\n" +
+"(0) (C3) ($0.000)\n" +
+"(0) (C4) ($0.0000)\n" +
+"(0) (C5) ($0.00000)\n" +
+"(0) (C6) ($0.000000)\n" +
+"(0) (C7) ($0.0000000)\n" +
+"(0) (C8) ($0.00000000)\n" +
+"(0) (C9) ($0.000000000)\n" +
+"(0) (C10) ($0.0000000000)\n" +
+"(0) (C99) ($0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (D) (0)\n" +
+"(0) (D0) (0)\n" +
+"(0) (D1) (0)\n" +
+"(0) (D2) (00)\n" +
+"(0) (D3) (000)\n" +
+"(0) (D4) (0000)\n" +
+"(0) (D5) (00000)\n" +
+"(0) (D6) (000000)\n" +
+"(0) (D7) (0000000)\n" +
+"(0) (D8) (00000000)\n" +
+"(0) (D9) (000000000)\n" +
+"(0) (D10) (0000000000)\n" +
+"(0) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (E) (0.000000E+000)\n" +
+"(0) (E0) (0E+000)\n" +
+"(0) (E1) (0.0E+000)\n" +
+"(0) (E2) (0.00E+000)\n" +
+"(0) (E3) (0.000E+000)\n" +
+"(0) (E4) (0.0000E+000)\n" +
+"(0) (E5) (0.00000E+000)\n" +
+"(0) (E6) (0.000000E+000)\n" +
+"(0) (E7) (0.0000000E+000)\n" +
+"(0) (E8) (0.00000000E+000)\n" +
+"(0) (E9) (0.000000000E+000)\n" +
+"(0) (E10) (0.0000000000E+000)\n" +
+"(0) (E99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+000)\n" +
+"(0) (F) (0.00)\n" +
+"(0) (F0) (0)\n" +
+"(0) (F1) (0.0)\n" +
+"(0) (F2) (0.00)\n" +
+"(0) (F3) (0.000)\n" +
+"(0) (F4) (0.0000)\n" +
+"(0) (F5) (0.00000)\n" +
+"(0) (F6) (0.000000)\n" +
+"(0) (F7) (0.0000000)\n" +
+"(0) (F8) (0.00000000)\n" +
+"(0) (F9) (0.000000000)\n" +
+"(0) (F10) (0.0000000000)\n" +
+"(0) (F99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (G) (0)\n" +
+"(0) (G0) (0)\n" +
+"(0) (G1) (0)\n" +
+"(0) (G2) (0)\n" +
+"(0) (G3) (0)\n" +
+"(0) (G4) (0)\n" +
+"(0) (G5) (0)\n" +
+"(0) (G6) (0)\n" +
+"(0) (G7) (0)\n" +
+"(0) (G8) (0)\n" +
+"(0) (G9) (0)\n" +
+"(0) (G10) (0)\n" +
+"(0) (G99) (0)\n" +
+"(0) (N) (0.00)\n" +
+"(0) (N0) (0)\n" +
+"(0) (N1) (0.0)\n" +
+"(0) (N2) (0.00)\n" +
+"(0) (N3) (0.000)\n" +
+"(0) (N4) (0.0000)\n" +
+"(0) (N5) (0.00000)\n" +
+"(0) (N6) (0.000000)\n" +
+"(0) (N7) (0.0000000)\n" +
+"(0) (N8) (0.00000000)\n" +
+"(0) (N9) (0.000000000)\n" +
+"(0) (N10) (0.0000000000)\n" +
+"(0) (N99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (P) (0.00 %)\n" +
+"(0) (P0) (0 %)\n" +
+"(0) (P1) (0.0 %)\n" +
+"(0) (P2) (0.00 %)\n" +
+"(0) (P3) (0.000 %)\n" +
+"(0) (P4) (0.0000 %)\n" +
+"(0) (P5) (0.00000 %)\n" +
+"(0) (P6) (0.000000 %)\n" +
+"(0) (P7) (0.0000000 %)\n" +
+"(0) (P8) (0.00000000 %)\n" +
+"(0) (P9) (0.000000000 %)\n" +
+"(0) (P10) (0.0000000000 %)\n" +
+"(0) (P99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(0) (X) (0)\n" +
+"(0) (X0) (0)\n" +
+"(0) (X1) (0)\n" +
+"(0) (X2) (00)\n" +
+"(0) (X3) (000)\n" +
+"(0) (X4) (0000)\n" +
+"(0) (X5) (00000)\n" +
+"(0) (X6) (000000)\n" +
+"(0) (X7) (0000000)\n" +
+"(0) (X8) (00000000)\n" +
+"(0) (X9) (000000000)\n" +
+"(0) (X10) (0000000000)\n" +
+"(0) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(4294967295) (C) ($4,294,967,295.00)\n" +
+"(4294967295) (C0) ($4,294,967,295)\n" +
+"(4294967295) (C1) ($4,294,967,295.0)\n" +
+"(4294967295) (C2) ($4,294,967,295.00)\n" +
+"(4294967295) (C3) ($4,294,967,295.000)\n" +
+"(4294967295) (C4) ($4,294,967,295.0000)\n" +
+"(4294967295) (C5) ($4,294,967,295.00000)\n" +
+"(4294967295) (C6) ($4,294,967,295.000000)\n" +
+"(4294967295) (C7) ($4,294,967,295.0000000)\n" +
+"(4294967295) (C8) ($4,294,967,295.00000000)\n" +
+"(4294967295) (C9) ($4,294,967,295.000000000)\n" +
+"(4294967295) (C10) ($4,294,967,295.0000000000)\n" +
+"(4294967295) (C99) ($4,294,967,295.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(4294967295) (D) (4294967295)\n" +
+"(4294967295) (D0) (4294967295)\n" +
+"(4294967295) (D1) (4294967295)\n" +
+"(4294967295) (D2) (4294967295)\n" +
+"(4294967295) (D3) (4294967295)\n" +
+"(4294967295) (D4) (4294967295)\n" +
+"(4294967295) (D5) (4294967295)\n" +
+"(4294967295) (D6) (4294967295)\n" +
+"(4294967295) (D7) (4294967295)\n" +
+"(4294967295) (D8) (4294967295)\n" +
+"(4294967295) (D9) (4294967295)\n" +
+"(4294967295) (D10) (4294967295)\n" +
+"(4294967295) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000004294967295)\n" +
+"(4294967295) (E) (4.294967E+009)\n" +
+"(4294967295) (E0) (4E+009)\n" +
+"(4294967295) (E1) (4.3E+009)\n" +
+"(4294967295) (E2) (4.29E+009)\n" +
+"(4294967295) (E3) (4.295E+009)\n" +
+"(4294967295) (E4) (4.2950E+009)\n" +
+"(4294967295) (E5) (4.29497E+009)\n" +
+"(4294967295) (E6) (4.294967E+009)\n" +
+"(4294967295) (E7) (4.2949673E+009)\n" +
+"(4294967295) (E8) (4.29496730E+009)\n" +
+"(4294967295) (E9) (4.294967295E+009)\n" +
+"(4294967295) (E10) (4.2949672950E+009)\n" +
+"(4294967295) (E99) (4.294967295000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+009)\n" +
+"(4294967295) (F) (4294967295.00)\n" +
+"(4294967295) (F0) (4294967295)\n" +
+"(4294967295) (F1) (4294967295.0)\n" +
+"(4294967295) (F2) (4294967295.00)\n" +
+"(4294967295) (F3) (4294967295.000)\n" +
+"(4294967295) (F4) (4294967295.0000)\n" +
+"(4294967295) (F5) (4294967295.00000)\n" +
+"(4294967295) (F6) (4294967295.000000)\n" +
+"(4294967295) (F7) (4294967295.0000000)\n" +
+"(4294967295) (F8) (4294967295.00000000)\n" +
+"(4294967295) (F9) (4294967295.000000000)\n" +
+"(4294967295) (F10) (4294967295.0000000000)\n" +
+"(4294967295) (F99) (4294967295.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(4294967295) (G) (4294967295)\n" +
+"(4294967295) (G0) (4294967295)\n" +
+"(4294967295) (G1) (4E+09)\n" +
+"(4294967295) (G2) (4.3E+09)\n" +
+"(4294967295) (G3) (4.29E+09)\n" +
+"(4294967295) (G4) (4.295E+09)\n" +
+"(4294967295) (G5) (4.295E+09)\n" +
+"(4294967295) (G6) (4.29497E+09)\n" +
+"(4294967295) (G7) (4.294967E+09)\n" +
+"(4294967295) (G8) (4.2949673E+09)\n" +
+"(4294967295) (G9) (4.2949673E+09)\n" +
+"(4294967295) (G10) (4294967295)\n" +
+"(4294967295) (G99) (4294967295)\n" +
+"(4294967295) (N) (4,294,967,295.00)\n" +
+"(4294967295) (N0) (4,294,967,295)\n" +
+"(4294967295) (N1) (4,294,967,295.0)\n" +
+"(4294967295) (N2) (4,294,967,295.00)\n" +
+"(4294967295) (N3) (4,294,967,295.000)\n" +
+"(4294967295) (N4) (4,294,967,295.0000)\n" +
+"(4294967295) (N5) (4,294,967,295.00000)\n" +
+"(4294967295) (N6) (4,294,967,295.000000)\n" +
+"(4294967295) (N7) (4,294,967,295.0000000)\n" +
+"(4294967295) (N8) (4,294,967,295.00000000)\n" +
+"(4294967295) (N9) (4,294,967,295.000000000)\n" +
+"(4294967295) (N10) (4,294,967,295.0000000000)\n" +
+"(4294967295) (N99) (4,294,967,295.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(4294967295) (P) (429,496,729,500.00 %)\n" +
+"(4294967295) (P0) (429,496,729,500 %)\n" +
+"(4294967295) (P1) (429,496,729,500.0 %)\n" +
+"(4294967295) (P2) (429,496,729,500.00 %)\n" +
+"(4294967295) (P3) (429,496,729,500.000 %)\n" +
+"(4294967295) (P4) (429,496,729,500.0000 %)\n" +
+"(4294967295) (P5) (429,496,729,500.00000 %)\n" +
+"(4294967295) (P6) (429,496,729,500.000000 %)\n" +
+"(4294967295) (P7) (429,496,729,500.0000000 %)\n" +
+"(4294967295) (P8) (429,496,729,500.00000000 %)\n" +
+"(4294967295) (P9) (429,496,729,500.000000000 %)\n" +
+"(4294967295) (P10) (429,496,729,500.0000000000 %)\n" +
+"(4294967295) (P99) (429,496,729,500.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(4294967295) (X) (FFFFFFFF)\n" +
+"(4294967295) (X0) (FFFFFFFF)\n" +
+"(4294967295) (X1) (FFFFFFFF)\n" +
+"(4294967295) (X2) (FFFFFFFF)\n" +
+"(4294967295) (X3) (FFFFFFFF)\n" +
+"(4294967295) (X4) (FFFFFFFF)\n" +
+"(4294967295) (X5) (FFFFFFFF)\n" +
+"(4294967295) (X6) (FFFFFFFF)\n" +
+"(4294967295) (X7) (FFFFFFFF)\n" +
+"(4294967295) (X8) (FFFFFFFF)\n" +
+"(4294967295) (X9) (0FFFFFFFF)\n" +
+"(4294967295) (X10) (00FFFFFFFF)\n" +
+"(4294967295) (X99) (0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFF)\n" +
+"(0) (C) ($0.00)\n" +
+"(0) (C0) ($0)\n" +
+"(0) (C1) ($0.0)\n" +
+"(0) (C2) ($0.00)\n" +
+"(0) (C3) ($0.000)\n" +
+"(0) (C4) ($0.0000)\n" +
+"(0) (C5) ($0.00000)\n" +
+"(0) (C6) ($0.000000)\n" +
+"(0) (C7) ($0.0000000)\n" +
+"(0) (C8) ($0.00000000)\n" +
+"(0) (C9) ($0.000000000)\n" +
+"(0) (C10) ($0.0000000000)\n" +
+"(0) (C99) ($0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (D) (0)\n" +
+"(0) (D0) (0)\n" +
+"(0) (D1) (0)\n" +
+"(0) (D2) (00)\n" +
+"(0) (D3) (000)\n" +
+"(0) (D4) (0000)\n" +
+"(0) (D5) (00000)\n" +
+"(0) (D6) (000000)\n" +
+"(0) (D7) (0000000)\n" +
+"(0) (D8) (00000000)\n" +
+"(0) (D9) (000000000)\n" +
+"(0) (D10) (0000000000)\n" +
+"(0) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (E) (0.000000E+000)\n" +
+"(0) (E0) (0E+000)\n" +
+"(0) (E1) (0.0E+000)\n" +
+"(0) (E2) (0.00E+000)\n" +
+"(0) (E3) (0.000E+000)\n" +
+"(0) (E4) (0.0000E+000)\n" +
+"(0) (E5) (0.00000E+000)\n" +
+"(0) (E6) (0.000000E+000)\n" +
+"(0) (E7) (0.0000000E+000)\n" +
+"(0) (E8) (0.00000000E+000)\n" +
+"(0) (E9) (0.000000000E+000)\n" +
+"(0) (E10) (0.0000000000E+000)\n" +
+"(0) (E99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+000)\n" +
+"(0) (F) (0.00)\n" +
+"(0) (F0) (0)\n" +
+"(0) (F1) (0.0)\n" +
+"(0) (F2) (0.00)\n" +
+"(0) (F3) (0.000)\n" +
+"(0) (F4) (0.0000)\n" +
+"(0) (F5) (0.00000)\n" +
+"(0) (F6) (0.000000)\n" +
+"(0) (F7) (0.0000000)\n" +
+"(0) (F8) (0.00000000)\n" +
+"(0) (F9) (0.000000000)\n" +
+"(0) (F10) (0.0000000000)\n" +
+"(0) (F99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (G) (0)\n" +
+"(0) (G0) (0)\n" +
+"(0) (G1) (0)\n" +
+"(0) (G2) (0)\n" +
+"(0) (G3) (0)\n" +
+"(0) (G4) (0)\n" +
+"(0) (G5) (0)\n" +
+"(0) (G6) (0)\n" +
+"(0) (G7) (0)\n" +
+"(0) (G8) (0)\n" +
+"(0) (G9) (0)\n" +
+"(0) (G10) (0)\n" +
+"(0) (G99) (0)\n" +
+"(0) (N) (0.00)\n" +
+"(0) (N0) (0)\n" +
+"(0) (N1) (0.0)\n" +
+"(0) (N2) (0.00)\n" +
+"(0) (N3) (0.000)\n" +
+"(0) (N4) (0.0000)\n" +
+"(0) (N5) (0.00000)\n" +
+"(0) (N6) (0.000000)\n" +
+"(0) (N7) (0.0000000)\n" +
+"(0) (N8) (0.00000000)\n" +
+"(0) (N9) (0.000000000)\n" +
+"(0) (N10) (0.0000000000)\n" +
+"(0) (N99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (P) (0.00 %)\n" +
+"(0) (P0) (0 %)\n" +
+"(0) (P1) (0.0 %)\n" +
+"(0) (P2) (0.00 %)\n" +
+"(0) (P3) (0.000 %)\n" +
+"(0) (P4) (0.0000 %)\n" +
+"(0) (P5) (0.00000 %)\n" +
+"(0) (P6) (0.000000 %)\n" +
+"(0) (P7) (0.0000000 %)\n" +
+"(0) (P8) (0.00000000 %)\n" +
+"(0) (P9) (0.000000000 %)\n" +
+"(0) (P10) (0.0000000000 %)\n" +
+"(0) (P99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(0) (X) (0)\n" +
+"(0) (X0) (0)\n" +
+"(0) (X1) (0)\n" +
+"(0) (X2) (00)\n" +
+"(0) (X3) (000)\n" +
+"(0) (X4) (0000)\n" +
+"(0) (X5) (00000)\n" +
+"(0) (X6) (000000)\n" +
+"(0) (X7) (0000000)\n" +
+"(0) (X8) (00000000)\n" +
+"(0) (X9) (000000000)\n" +
+"(0) (X10) (0000000000)\n" +
+"(0) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (C) ($100.00)\n" +
+"(100) (C0) ($100)\n" +
+"(100) (C1) ($100.0)\n" +
+"(100) (C2) ($100.00)\n" +
+"(100) (C3) ($100.000)\n" +
+"(100) (C4) ($100.0000)\n" +
+"(100) (C5) ($100.00000)\n" +
+"(100) (C6) ($100.000000)\n" +
+"(100) (C7) ($100.0000000)\n" +
+"(100) (C8) ($100.00000000)\n" +
+"(100) (C9) ($100.000000000)\n" +
+"(100) (C10) ($100.0000000000)\n" +
+"(100) (C99) ($100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (D) (100)\n" +
+"(100) (D0) (100)\n" +
+"(100) (D1) (100)\n" +
+"(100) (D2) (100)\n" +
+"(100) (D3) (100)\n" +
+"(100) (D4) (0100)\n" +
+"(100) (D5) (00100)\n" +
+"(100) (D6) (000100)\n" +
+"(100) (D7) (0000100)\n" +
+"(100) (D8) (00000100)\n" +
+"(100) (D9) (000000100)\n" +
+"(100) (D10) (0000000100)\n" +
+"(100) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100)\n" +
+"(100) (E) (1.000000E+002)\n" +
+"(100) (E0) (1E+002)\n" +
+"(100) (E1) (1.0E+002)\n" +
+"(100) (E2) (1.00E+002)\n" +
+"(100) (E3) (1.000E+002)\n" +
+"(100) (E4) (1.0000E+002)\n" +
+"(100) (E5) (1.00000E+002)\n" +
+"(100) (E6) (1.000000E+002)\n" +
+"(100) (E7) (1.0000000E+002)\n" +
+"(100) (E8) (1.00000000E+002)\n" +
+"(100) (E9) (1.000000000E+002)\n" +
+"(100) (E10) (1.0000000000E+002)\n" +
+"(100) (E99) (1.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+002)\n" +
+"(100) (F) (100.00)\n" +
+"(100) (F0) (100)\n" +
+"(100) (F1) (100.0)\n" +
+"(100) (F2) (100.00)\n" +
+"(100) (F3) (100.000)\n" +
+"(100) (F4) (100.0000)\n" +
+"(100) (F5) (100.00000)\n" +
+"(100) (F6) (100.000000)\n" +
+"(100) (F7) (100.0000000)\n" +
+"(100) (F8) (100.00000000)\n" +
+"(100) (F9) (100.000000000)\n" +
+"(100) (F10) (100.0000000000)\n" +
+"(100) (F99) (100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (G) (100)\n" +
+"(100) (G0) (100)\n" +
+"(100) (G1) (1E+02)\n" +
+"(100) (G2) (1E+02)\n" +
+"(100) (G3) (100)\n" +
+"(100) (G4) (100)\n" +
+"(100) (G5) (100)\n" +
+"(100) (G6) (100)\n" +
+"(100) (G7) (100)\n" +
+"(100) (G8) (100)\n" +
+"(100) (G9) (100)\n" +
+"(100) (G10) (100)\n" +
+"(100) (G99) (100)\n" +
+"(100) (N) (100.00)\n" +
+"(100) (N0) (100)\n" +
+"(100) (N1) (100.0)\n" +
+"(100) (N2) (100.00)\n" +
+"(100) (N3) (100.000)\n" +
+"(100) (N4) (100.0000)\n" +
+"(100) (N5) (100.00000)\n" +
+"(100) (N6) (100.000000)\n" +
+"(100) (N7) (100.0000000)\n" +
+"(100) (N8) (100.00000000)\n" +
+"(100) (N9) (100.000000000)\n" +
+"(100) (N10) (100.0000000000)\n" +
+"(100) (N99) (100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (P) (10,000.00 %)\n" +
+"(100) (P0) (10,000 %)\n" +
+"(100) (P1) (10,000.0 %)\n" +
+"(100) (P2) (10,000.00 %)\n" +
+"(100) (P3) (10,000.000 %)\n" +
+"(100) (P4) (10,000.0000 %)\n" +
+"(100) (P5) (10,000.00000 %)\n" +
+"(100) (P6) (10,000.000000 %)\n" +
+"(100) (P7) (10,000.0000000 %)\n" +
+"(100) (P8) (10,000.00000000 %)\n" +
+"(100) (P9) (10,000.000000000 %)\n" +
+"(100) (P10) (10,000.0000000000 %)\n" +
+"(100) (P99) (10,000.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(100) (X) (64)\n" +
+"(100) (X0) (64)\n" +
+"(100) (X1) (64)\n" +
+"(100) (X2) (64)\n" +
+"(100) (X3) (064)\n" +
+"(100) (X4) (0064)\n" +
+"(100) (X5) (00064)\n" +
+"(100) (X6) (000064)\n" +
+"(100) (X7) (0000064)\n" +
+"(100) (X8) (00000064)\n" +
+"(100) (X9) (000000064)\n" +
+"(100) (X10) (0000000064)\n" +
+"(100) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064)\n" +
+"UInt64\n" +
+"(0) (C) ($0.00)\n" +
+"(0) (C0) ($0)\n" +
+"(0) (C1) ($0.0)\n" +
+"(0) (C2) ($0.00)\n" +
+"(0) (C3) ($0.000)\n" +
+"(0) (C4) ($0.0000)\n" +
+"(0) (C5) ($0.00000)\n" +
+"(0) (C6) ($0.000000)\n" +
+"(0) (C7) ($0.0000000)\n" +
+"(0) (C8) ($0.00000000)\n" +
+"(0) (C9) ($0.000000000)\n" +
+"(0) (C10) ($0.0000000000)\n" +
+"(0) (C99) ($0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (D) (0)\n" +
+"(0) (D0) (0)\n" +
+"(0) (D1) (0)\n" +
+"(0) (D2) (00)\n" +
+"(0) (D3) (000)\n" +
+"(0) (D4) (0000)\n" +
+"(0) (D5) (00000)\n" +
+"(0) (D6) (000000)\n" +
+"(0) (D7) (0000000)\n" +
+"(0) (D8) (00000000)\n" +
+"(0) (D9) (000000000)\n" +
+"(0) (D10) (0000000000)\n" +
+"(0) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (E) (0.000000E+000)\n" +
+"(0) (E0) (0E+000)\n" +
+"(0) (E1) (0.0E+000)\n" +
+"(0) (E2) (0.00E+000)\n" +
+"(0) (E3) (0.000E+000)\n" +
+"(0) (E4) (0.0000E+000)\n" +
+"(0) (E5) (0.00000E+000)\n" +
+"(0) (E6) (0.000000E+000)\n" +
+"(0) (E7) (0.0000000E+000)\n" +
+"(0) (E8) (0.00000000E+000)\n" +
+"(0) (E9) (0.000000000E+000)\n" +
+"(0) (E10) (0.0000000000E+000)\n" +
+"(0) (E99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+000)\n" +
+"(0) (F) (0.00)\n" +
+"(0) (F0) (0)\n" +
+"(0) (F1) (0.0)\n" +
+"(0) (F2) (0.00)\n" +
+"(0) (F3) (0.000)\n" +
+"(0) (F4) (0.0000)\n" +
+"(0) (F5) (0.00000)\n" +
+"(0) (F6) (0.000000)\n" +
+"(0) (F7) (0.0000000)\n" +
+"(0) (F8) (0.00000000)\n" +
+"(0) (F9) (0.000000000)\n" +
+"(0) (F10) (0.0000000000)\n" +
+"(0) (F99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (G) (0)\n" +
+"(0) (G0) (0)\n" +
+"(0) (G1) (0)\n" +
+"(0) (G2) (0)\n" +
+"(0) (G3) (0)\n" +
+"(0) (G4) (0)\n" +
+"(0) (G5) (0)\n" +
+"(0) (G6) (0)\n" +
+"(0) (G7) (0)\n" +
+"(0) (G8) (0)\n" +
+"(0) (G9) (0)\n" +
+"(0) (G10) (0)\n" +
+"(0) (G99) (0)\n" +
+"(0) (N) (0.00)\n" +
+"(0) (N0) (0)\n" +
+"(0) (N1) (0.0)\n" +
+"(0) (N2) (0.00)\n" +
+"(0) (N3) (0.000)\n" +
+"(0) (N4) (0.0000)\n" +
+"(0) (N5) (0.00000)\n" +
+"(0) (N6) (0.000000)\n" +
+"(0) (N7) (0.0000000)\n" +
+"(0) (N8) (0.00000000)\n" +
+"(0) (N9) (0.000000000)\n" +
+"(0) (N10) (0.0000000000)\n" +
+"(0) (N99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (P) (0.00 %)\n" +
+"(0) (P0) (0 %)\n" +
+"(0) (P1) (0.0 %)\n" +
+"(0) (P2) (0.00 %)\n" +
+"(0) (P3) (0.000 %)\n" +
+"(0) (P4) (0.0000 %)\n" +
+"(0) (P5) (0.00000 %)\n" +
+"(0) (P6) (0.000000 %)\n" +
+"(0) (P7) (0.0000000 %)\n" +
+"(0) (P8) (0.00000000 %)\n" +
+"(0) (P9) (0.000000000 %)\n" +
+"(0) (P10) (0.0000000000 %)\n" +
+"(0) (P99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(0) (X) (0)\n" +
+"(0) (X0) (0)\n" +
+"(0) (X1) (0)\n" +
+"(0) (X2) (00)\n" +
+"(0) (X3) (000)\n" +
+"(0) (X4) (0000)\n" +
+"(0) (X5) (00000)\n" +
+"(0) (X6) (000000)\n" +
+"(0) (X7) (0000000)\n" +
+"(0) (X8) (00000000)\n" +
+"(0) (X9) (000000000)\n" +
+"(0) (X10) (0000000000)\n" +
+"(0) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(18446744073709551615) (C) ($18,446,744,073,709,551,615.00)\n" +
+"(18446744073709551615) (C0) ($18,446,744,073,709,551,615)\n" +
+"(18446744073709551615) (C1) ($18,446,744,073,709,551,615.0)\n" +
+"(18446744073709551615) (C2) ($18,446,744,073,709,551,615.00)\n" +
+"(18446744073709551615) (C3) ($18,446,744,073,709,551,615.000)\n" +
+"(18446744073709551615) (C4) ($18,446,744,073,709,551,615.0000)\n" +
+"(18446744073709551615) (C5) ($18,446,744,073,709,551,615.00000)\n" +
+"(18446744073709551615) (C6) ($18,446,744,073,709,551,615.000000)\n" +
+"(18446744073709551615) (C7) ($18,446,744,073,709,551,615.0000000)\n" +
+"(18446744073709551615) (C8) ($18,446,744,073,709,551,615.00000000)\n" +
+"(18446744073709551615) (C9) ($18,446,744,073,709,551,615.000000000)\n" +
+"(18446744073709551615) (C10) ($18,446,744,073,709,551,615.0000000000)\n" +
+"(18446744073709551615) (C99) ($18,446,744,073,709,551,615.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(18446744073709551615) (D) (18446744073709551615)\n" +
+"(18446744073709551615) (D0) (18446744073709551615)\n" +
+"(18446744073709551615) (D1) (18446744073709551615)\n" +
+"(18446744073709551615) (D2) (18446744073709551615)\n" +
+"(18446744073709551615) (D3) (18446744073709551615)\n" +
+"(18446744073709551615) (D4) (18446744073709551615)\n" +
+"(18446744073709551615) (D5) (18446744073709551615)\n" +
+"(18446744073709551615) (D6) (18446744073709551615)\n" +
+"(18446744073709551615) (D7) (18446744073709551615)\n" +
+"(18446744073709551615) (D8) (18446744073709551615)\n" +
+"(18446744073709551615) (D9) (18446744073709551615)\n" +
+"(18446744073709551615) (D10) (18446744073709551615)\n" +
+"(18446744073709551615) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000018446744073709551615)\n" +
+"(18446744073709551615) (E) (1.844674E+019)\n" +
+"(18446744073709551615) (E0) (2E+019)\n" +
+"(18446744073709551615) (E1) (1.8E+019)\n" +
+"(18446744073709551615) (E2) (1.84E+019)\n" +
+"(18446744073709551615) (E3) (1.845E+019)\n" +
+"(18446744073709551615) (E4) (1.8447E+019)\n" +
+"(18446744073709551615) (E5) (1.84467E+019)\n" +
+"(18446744073709551615) (E6) (1.844674E+019)\n" +
+"(18446744073709551615) (E7) (1.8446744E+019)\n" +
+"(18446744073709551615) (E8) (1.84467441E+019)\n" +
+"(18446744073709551615) (E9) (1.844674407E+019)\n" +
+"(18446744073709551615) (E10) (1.8446744074E+019)\n" +
+"(18446744073709551615) (E99) (1.844674407370955161500000000000000000000000000000000000000000000000000000000000000000000000000000000E+019)\n" +
+"(18446744073709551615) (F) (18446744073709551615.00)\n" +
+"(18446744073709551615) (F0) (18446744073709551615)\n" +
+"(18446744073709551615) (F1) (18446744073709551615.0)\n" +
+"(18446744073709551615) (F2) (18446744073709551615.00)\n" +
+"(18446744073709551615) (F3) (18446744073709551615.000)\n" +
+"(18446744073709551615) (F4) (18446744073709551615.0000)\n" +
+"(18446744073709551615) (F5) (18446744073709551615.00000)\n" +
+"(18446744073709551615) (F6) (18446744073709551615.000000)\n" +
+"(18446744073709551615) (F7) (18446744073709551615.0000000)\n" +
+"(18446744073709551615) (F8) (18446744073709551615.00000000)\n" +
+"(18446744073709551615) (F9) (18446744073709551615.000000000)\n" +
+"(18446744073709551615) (F10) (18446744073709551615.0000000000)\n" +
+"(18446744073709551615) (F99) (18446744073709551615.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(18446744073709551615) (G) (18446744073709551615)\n" +
+"(18446744073709551615) (G0) (18446744073709551615)\n" +
+"(18446744073709551615) (G1) (2E+19)\n" +
+"(18446744073709551615) (G2) (1.8E+19)\n" +
+"(18446744073709551615) (G3) (1.84E+19)\n" +
+"(18446744073709551615) (G4) (1.845E+19)\n" +
+"(18446744073709551615) (G5) (1.8447E+19)\n" +
+"(18446744073709551615) (G6) (1.84467E+19)\n" +
+"(18446744073709551615) (G7) (1.844674E+19)\n" +
+"(18446744073709551615) (G8) (1.8446744E+19)\n" +
+"(18446744073709551615) (G9) (1.84467441E+19)\n" +
+"(18446744073709551615) (G10) (1.844674407E+19)\n" +
+"(18446744073709551615) (G99) (18446744073709551615)\n" +
+"(18446744073709551615) (N) (18,446,744,073,709,551,615.00)\n" +
+"(18446744073709551615) (N0) (18,446,744,073,709,551,615)\n" +
+"(18446744073709551615) (N1) (18,446,744,073,709,551,615.0)\n" +
+"(18446744073709551615) (N2) (18,446,744,073,709,551,615.00)\n" +
+"(18446744073709551615) (N3) (18,446,744,073,709,551,615.000)\n" +
+"(18446744073709551615) (N4) (18,446,744,073,709,551,615.0000)\n" +
+"(18446744073709551615) (N5) (18,446,744,073,709,551,615.00000)\n" +
+"(18446744073709551615) (N6) (18,446,744,073,709,551,615.000000)\n" +
+"(18446744073709551615) (N7) (18,446,744,073,709,551,615.0000000)\n" +
+"(18446744073709551615) (N8) (18,446,744,073,709,551,615.00000000)\n" +
+"(18446744073709551615) (N9) (18,446,744,073,709,551,615.000000000)\n" +
+"(18446744073709551615) (N10) (18,446,744,073,709,551,615.0000000000)\n" +
+"(18446744073709551615) (N99) (18,446,744,073,709,551,615.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(18446744073709551615) (P) (1,844,674,407,370,955,161,500.00 %)\n" +
+"(18446744073709551615) (P0) (1,844,674,407,370,955,161,500 %)\n" +
+"(18446744073709551615) (P1) (1,844,674,407,370,955,161,500.0 %)\n" +
+"(18446744073709551615) (P2) (1,844,674,407,370,955,161,500.00 %)\n" +
+"(18446744073709551615) (P3) (1,844,674,407,370,955,161,500.000 %)\n" +
+"(18446744073709551615) (P4) (1,844,674,407,370,955,161,500.0000 %)\n" +
+"(18446744073709551615) (P5) (1,844,674,407,370,955,161,500.00000 %)\n" +
+"(18446744073709551615) (P6) (1,844,674,407,370,955,161,500.000000 %)\n" +
+"(18446744073709551615) (P7) (1,844,674,407,370,955,161,500.0000000 %)\n" +
+"(18446744073709551615) (P8) (1,844,674,407,370,955,161,500.00000000 %)\n" +
+"(18446744073709551615) (P9) (1,844,674,407,370,955,161,500.000000000 %)\n" +
+"(18446744073709551615) (P10) (1,844,674,407,370,955,161,500.0000000000 %)\n" +
+"(18446744073709551615) (P99) (1,844,674,407,370,955,161,500.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(18446744073709551615) (X) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X0) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X1) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X2) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X3) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X4) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X5) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X6) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X7) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X8) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X9) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X10) (FFFFFFFFFFFFFFFF)\n" +
+"(18446744073709551615) (X99) (00000000000000000000000000000000000000000000000000000000000000000000000000000000000FFFFFFFFFFFFFFFF)\n" +
+"(0) (C) ($0.00)\n" +
+"(0) (C0) ($0)\n" +
+"(0) (C1) ($0.0)\n" +
+"(0) (C2) ($0.00)\n" +
+"(0) (C3) ($0.000)\n" +
+"(0) (C4) ($0.0000)\n" +
+"(0) (C5) ($0.00000)\n" +
+"(0) (C6) ($0.000000)\n" +
+"(0) (C7) ($0.0000000)\n" +
+"(0) (C8) ($0.00000000)\n" +
+"(0) (C9) ($0.000000000)\n" +
+"(0) (C10) ($0.0000000000)\n" +
+"(0) (C99) ($0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (D) (0)\n" +
+"(0) (D0) (0)\n" +
+"(0) (D1) (0)\n" +
+"(0) (D2) (00)\n" +
+"(0) (D3) (000)\n" +
+"(0) (D4) (0000)\n" +
+"(0) (D5) (00000)\n" +
+"(0) (D6) (000000)\n" +
+"(0) (D7) (0000000)\n" +
+"(0) (D8) (00000000)\n" +
+"(0) (D9) (000000000)\n" +
+"(0) (D10) (0000000000)\n" +
+"(0) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (E) (0.000000E+000)\n" +
+"(0) (E0) (0E+000)\n" +
+"(0) (E1) (0.0E+000)\n" +
+"(0) (E2) (0.00E+000)\n" +
+"(0) (E3) (0.000E+000)\n" +
+"(0) (E4) (0.0000E+000)\n" +
+"(0) (E5) (0.00000E+000)\n" +
+"(0) (E6) (0.000000E+000)\n" +
+"(0) (E7) (0.0000000E+000)\n" +
+"(0) (E8) (0.00000000E+000)\n" +
+"(0) (E9) (0.000000000E+000)\n" +
+"(0) (E10) (0.0000000000E+000)\n" +
+"(0) (E99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+000)\n" +
+"(0) (F) (0.00)\n" +
+"(0) (F0) (0)\n" +
+"(0) (F1) (0.0)\n" +
+"(0) (F2) (0.00)\n" +
+"(0) (F3) (0.000)\n" +
+"(0) (F4) (0.0000)\n" +
+"(0) (F5) (0.00000)\n" +
+"(0) (F6) (0.000000)\n" +
+"(0) (F7) (0.0000000)\n" +
+"(0) (F8) (0.00000000)\n" +
+"(0) (F9) (0.000000000)\n" +
+"(0) (F10) (0.0000000000)\n" +
+"(0) (F99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (G) (0)\n" +
+"(0) (G0) (0)\n" +
+"(0) (G1) (0)\n" +
+"(0) (G2) (0)\n" +
+"(0) (G3) (0)\n" +
+"(0) (G4) (0)\n" +
+"(0) (G5) (0)\n" +
+"(0) (G6) (0)\n" +
+"(0) (G7) (0)\n" +
+"(0) (G8) (0)\n" +
+"(0) (G9) (0)\n" +
+"(0) (G10) (0)\n" +
+"(0) (G99) (0)\n" +
+"(0) (N) (0.00)\n" +
+"(0) (N0) (0)\n" +
+"(0) (N1) (0.0)\n" +
+"(0) (N2) (0.00)\n" +
+"(0) (N3) (0.000)\n" +
+"(0) (N4) (0.0000)\n" +
+"(0) (N5) (0.00000)\n" +
+"(0) (N6) (0.000000)\n" +
+"(0) (N7) (0.0000000)\n" +
+"(0) (N8) (0.00000000)\n" +
+"(0) (N9) (0.000000000)\n" +
+"(0) (N10) (0.0000000000)\n" +
+"(0) (N99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(0) (P) (0.00 %)\n" +
+"(0) (P0) (0 %)\n" +
+"(0) (P1) (0.0 %)\n" +
+"(0) (P2) (0.00 %)\n" +
+"(0) (P3) (0.000 %)\n" +
+"(0) (P4) (0.0000 %)\n" +
+"(0) (P5) (0.00000 %)\n" +
+"(0) (P6) (0.000000 %)\n" +
+"(0) (P7) (0.0000000 %)\n" +
+"(0) (P8) (0.00000000 %)\n" +
+"(0) (P9) (0.000000000 %)\n" +
+"(0) (P10) (0.0000000000 %)\n" +
+"(0) (P99) (0.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(0) (X) (0)\n" +
+"(0) (X0) (0)\n" +
+"(0) (X1) (0)\n" +
+"(0) (X2) (00)\n" +
+"(0) (X3) (000)\n" +
+"(0) (X4) (0000)\n" +
+"(0) (X5) (00000)\n" +
+"(0) (X6) (000000)\n" +
+"(0) (X7) (0000000)\n" +
+"(0) (X8) (00000000)\n" +
+"(0) (X9) (000000000)\n" +
+"(0) (X10) (0000000000)\n" +
+"(0) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (C) ($100.00)\n" +
+"(100) (C0) ($100)\n" +
+"(100) (C1) ($100.0)\n" +
+"(100) (C2) ($100.00)\n" +
+"(100) (C3) ($100.000)\n" +
+"(100) (C4) ($100.0000)\n" +
+"(100) (C5) ($100.00000)\n" +
+"(100) (C6) ($100.000000)\n" +
+"(100) (C7) ($100.0000000)\n" +
+"(100) (C8) ($100.00000000)\n" +
+"(100) (C9) ($100.000000000)\n" +
+"(100) (C10) ($100.0000000000)\n" +
+"(100) (C99) ($100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (D) (100)\n" +
+"(100) (D0) (100)\n" +
+"(100) (D1) (100)\n" +
+"(100) (D2) (100)\n" +
+"(100) (D3) (100)\n" +
+"(100) (D4) (0100)\n" +
+"(100) (D5) (00100)\n" +
+"(100) (D6) (000100)\n" +
+"(100) (D7) (0000100)\n" +
+"(100) (D8) (00000100)\n" +
+"(100) (D9) (000000100)\n" +
+"(100) (D10) (0000000100)\n" +
+"(100) (D99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100)\n" +
+"(100) (E) (1.000000E+002)\n" +
+"(100) (E0) (1E+002)\n" +
+"(100) (E1) (1.0E+002)\n" +
+"(100) (E2) (1.00E+002)\n" +
+"(100) (E3) (1.000E+002)\n" +
+"(100) (E4) (1.0000E+002)\n" +
+"(100) (E5) (1.00000E+002)\n" +
+"(100) (E6) (1.000000E+002)\n" +
+"(100) (E7) (1.0000000E+002)\n" +
+"(100) (E8) (1.00000000E+002)\n" +
+"(100) (E9) (1.000000000E+002)\n" +
+"(100) (E10) (1.0000000000E+002)\n" +
+"(100) (E99) (1.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000E+002)\n" +
+"(100) (F) (100.00)\n" +
+"(100) (F0) (100)\n" +
+"(100) (F1) (100.0)\n" +
+"(100) (F2) (100.00)\n" +
+"(100) (F3) (100.000)\n" +
+"(100) (F4) (100.0000)\n" +
+"(100) (F5) (100.00000)\n" +
+"(100) (F6) (100.000000)\n" +
+"(100) (F7) (100.0000000)\n" +
+"(100) (F8) (100.00000000)\n" +
+"(100) (F9) (100.000000000)\n" +
+"(100) (F10) (100.0000000000)\n" +
+"(100) (F99) (100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (G) (100)\n" +
+"(100) (G0) (100)\n" +
+"(100) (G1) (1E+02)\n" +
+"(100) (G2) (1E+02)\n" +
+"(100) (G3) (100)\n" +
+"(100) (G4) (100)\n" +
+"(100) (G5) (100)\n" +
+"(100) (G6) (100)\n" +
+"(100) (G7) (100)\n" +
+"(100) (G8) (100)\n" +
+"(100) (G9) (100)\n" +
+"(100) (G10) (100)\n" +
+"(100) (G99) (100)\n" +
+"(100) (N) (100.00)\n" +
+"(100) (N0) (100)\n" +
+"(100) (N1) (100.0)\n" +
+"(100) (N2) (100.00)\n" +
+"(100) (N3) (100.000)\n" +
+"(100) (N4) (100.0000)\n" +
+"(100) (N5) (100.00000)\n" +
+"(100) (N6) (100.000000)\n" +
+"(100) (N7) (100.0000000)\n" +
+"(100) (N8) (100.00000000)\n" +
+"(100) (N9) (100.000000000)\n" +
+"(100) (N10) (100.0000000000)\n" +
+"(100) (N99) (100.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000)\n" +
+"(100) (P) (10,000.00 %)\n" +
+"(100) (P0) (10,000 %)\n" +
+"(100) (P1) (10,000.0 %)\n" +
+"(100) (P2) (10,000.00 %)\n" +
+"(100) (P3) (10,000.000 %)\n" +
+"(100) (P4) (10,000.0000 %)\n" +
+"(100) (P5) (10,000.00000 %)\n" +
+"(100) (P6) (10,000.000000 %)\n" +
+"(100) (P7) (10,000.0000000 %)\n" +
+"(100) (P8) (10,000.00000000 %)\n" +
+"(100) (P9) (10,000.000000000 %)\n" +
+"(100) (P10) (10,000.0000000000 %)\n" +
+"(100) (P99) (10,000.000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000 %)\n" +
+"(100) (X) (64)\n" +
+"(100) (X0) (64)\n" +
+"(100) (X1) (64)\n" +
+"(100) (X2) (64)\n" +
+"(100) (X3) (064)\n" +
+"(100) (X4) (0064)\n" +
+"(100) (X5) (00064)\n" +
+"(100) (X6) (000064)\n" +
+"(100) (X7) (0000064)\n" +
+"(100) (X8) (00000064)\n" +
+"(100) (X9) (000000064)\n" +
+"(100) (X10) (0000000064)\n" +
+"(100) (X99) (000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000064)\n";
+}
+
+}
+
diff --git a/mcs/class/corlib/Test/System/MathTest.cs b/mcs/class/corlib/Test/System/MathTest.cs
new file mode 100755
index 00000000000..a6b8feb799a
--- /dev/null
+++ b/mcs/class/corlib/Test/System/MathTest.cs
@@ -0,0 +1,614 @@
+// MathTest.cs
+//
+// Jon Guymon (guymon@slackworks.com)
+//
+// (C) 2002 Jon Guymon
+// 
+
+using System;
+using NUnit.Framework;
+
+namespace MonoTests.System 
+{
+
+public class MathTest : TestCase {
+	
+	public MathTest() : base ("System.Math testsuite") {}
+	public MathTest(string name) : base(name) {}
+
+	protected override void SetUp() {}
+	protected override void TearDown() {}
+
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(MathTest)); 
+		}
+	}
+
+	static double x = 0.1234;
+	static double y = 12.345;
+
+	public void TestDecimalAbs() {
+		decimal a = -9.0M;
+
+		Assert(9.0M == Math.Abs(a));
+	}
+
+
+	public void TestDoubleAbs() {
+		double a = -9.0D;
+
+		Assert(9.0D == Math.Abs(a));
+	}
+
+	public void TestFloatAbs() {
+		float a = -9.0F;
+
+		Assert(9.0F == Math.Abs(a));
+	}
+
+	public void TestLongAbs() {
+		long a = -9L;
+		long b = Int64.MinValue;
+
+		Assert(9L == Math.Abs(a));
+		try {
+			Math.Abs(b);
+			Fail("Should raise System.OverflowException");
+		} catch(Exception e) {
+			Assert(typeof(OverflowException) == e.GetType());
+		}
+	}
+
+	public void TestIntAbs() {
+		int a = -9;
+		int b = Int32.MinValue;
+
+		Assert(9 == Math.Abs(a));
+		try {
+			Math.Abs(b);
+			Fail("Should raise System.OverflowException");
+		} catch(Exception e) {
+			Assert(typeof(OverflowException) == e.GetType());
+		}
+	}
+
+	public void TestSbyteAbs() {
+		sbyte a = -9;
+		sbyte b = SByte.MinValue;
+
+		Assert(9 == Math.Abs(a));
+		try {
+			Math.Abs(b);
+			Fail("Should raise System.OverflowException");
+		} catch(Exception e) {
+			Assert(typeof(OverflowException) == e.GetType());
+		}
+	}
+
+	public void TestShortAbs() {
+		short a = -9;
+		short b = Int16.MinValue;
+
+		Assert(9 == Math.Abs(a));
+		try {
+			Math.Abs(b);
+			Fail("Should raise System.OverflowException");
+		} catch(Exception e) {
+			Assert(typeof(OverflowException) == e.GetType());
+		}
+	}
+
+	public void TestAcos() {
+		double a = Math.Acos(x);
+		double b = 1.4470809809523457;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+		Assert(double.IsNaN(Math.Acos(-1.01D)));
+		Assert(double.IsNaN(Math.Acos(1.01D)));
+	}
+
+	public void TestAsin() {
+		double a = Math.Asin(x);
+		double b = 0.12371534584255098;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+		Assert(double.IsNaN(Math.Asin(-1.01D)));
+		Assert(double.IsNaN(Math.Asin(1.01D)));
+	}
+
+	public void TestAtan() {
+		double a = Math.Atan(x);
+		double b = 0.12277930094473837;
+		double c = 1.5707963267948966;
+		double d = -1.5707963267948966;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+		Assert("should return NaN", 
+		       double.IsNaN(Math.Atan(double.NaN)));
+		Assert(Math.Atan(double.PositiveInfinity).ToString("G99")+" != "+c.ToString("G99"), 
+		       Math.Abs((double)Math.Atan(double.PositiveInfinity) - c) <= double.Epsilon);
+		Assert(Math.Atan(double.NegativeInfinity).ToString("G99")+" != "+d.ToString("G99"),
+		       Math.Abs((double)Math.Atan(double.NegativeInfinity) - d) <= double.Epsilon);
+	}
+
+	public void TestAtan2() {
+		double a = Math.Atan2(x, y);
+		double b = 0.0099956168687207747;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+		Assert(double.IsNaN(Math.Acos(-2D)));
+		Assert(double.IsNaN(Math.Acos(2D)));
+	}
+
+	public void TestCos() {
+		double a = Math.Cos(x);
+		double b = 0.99239587670489104;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+	}
+
+	public void TestCosh() {
+		double a = Math.Cosh(x);
+		double b = 1.0076234465130722;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+		Assert(Math.Cosh(double.NegativeInfinity) == double.PositiveInfinity);
+		Assert(Math.Cosh(double.PositiveInfinity) == double.PositiveInfinity);
+		Assert(double.IsNaN(Math.Cosh(double.NaN)));
+	}
+
+	public void TestSin() {
+		double a = Math.Sin(x);
+		double b = 0.12308705821137626;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+	}
+
+	public void TestSinh() {
+		double a = Math.Sinh(x);
+		double b = 0.12371341868561381;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+	}
+
+	public void TestTan() {
+		double a = Math.Tan(x);
+		double b = 0.12403019913793806;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+	}
+
+	public void TestTanh() {
+		double a = Math.Tanh(x);
+		double b = 0.12277743150353424;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+	}
+
+	public void TestSqrt() {
+		double a = Math.Sqrt(x);
+		double b = 0.35128336140500593;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+	}
+
+	public void TestExp() {
+		double a = Math.Exp(x);
+		double b = 1.1313368651986859;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+		Assert(double.IsNaN(Math.Exp(double.NaN)));
+		Assert(Math.Exp(double.NegativeInfinity) == 0);
+		Assert(Math.Exp(double.PositiveInfinity) == double.PositiveInfinity);
+	}
+
+	public void TestCeiling() {
+		int iTest = 1;
+		try {
+			double a = Math.Ceiling(1.5);
+			double b = 2;
+	
+			iTest++;
+			Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+			       (Math.Abs(a - b) <= double.Epsilon));
+			iTest++;
+			Assert(Math.Ceiling(double.NegativeInfinity) == double.NegativeInfinity);
+			iTest++;
+			Assert(Math.Ceiling(double.PositiveInfinity) == double.PositiveInfinity);
+			iTest++;
+			Assert(double.IsNaN(Math.Ceiling(double.NaN)));
+		} catch (Exception e) {
+			Fail("Unexpected Exception at iTest=" + iTest + ": " + e);
+		}
+	}
+
+	public void TestFloor() {
+		try {
+			double a = Math.Floor(1.5);
+			double b = 1;
+
+			Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+			       (Math.Abs(a - b) <= double.Epsilon));
+			Assert(Math.Floor(double.NegativeInfinity) == double.NegativeInfinity);
+			Assert(Math.Floor(double.PositiveInfinity) == double.PositiveInfinity);
+			Assert(double.IsNaN(Math.Floor(double.NaN)));
+		} catch (Exception e) {
+			Fail("Unexpected Exception: " + e.ToString());
+		}
+	}
+
+	public void TestIEEERemainder() {
+		double a = Math.IEEERemainder(y, x);
+		double b = 0.0050000000000007816;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+		Assert(double.IsNaN(Math.IEEERemainder(y, 0)));
+	}
+
+	public void TestLog() {
+		double a = Math.Log(y);
+		double b = 2.513251122797143;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+		Assert(double.IsNaN(Math.Log(-1)));
+		Assert(double.IsNaN(Math.Log(double.NaN)));
+
+		// MS docs say this should be PositiveInfinity
+		Assert(Math.Log(0) == double.NegativeInfinity);
+		Assert(Math.Log(double.PositiveInfinity) == double.PositiveInfinity);
+	}
+
+	public void TestLog2() {
+		double a = Math.Log(x, y);
+		double b = -0.83251695325303621;
+
+		Assert(a + " != " + b + " because diff is " + Math.Abs(a - b), (Math.Abs(a - b) <= 1e-14));
+		Assert(double.IsNaN(Math.Log(-1, y)));
+		Assert(double.IsNaN(Math.Log(double.NaN, y)));
+		Assert(double.IsNaN(Math.Log(x, double.NaN)));
+		Assert(double.IsNaN(Math.Log(double.NegativeInfinity, y)));
+		Assert(double.IsNaN(Math.Log(x, double.NegativeInfinity)));
+		Assert(double.IsNaN(Math.Log(double.PositiveInfinity, double.PositiveInfinity)));
+
+		// MS docs say this should be PositiveInfinity
+		Assert(Math.Log(0, y) == double.NegativeInfinity);
+		Assert(Math.Log(double.PositiveInfinity, y) == double.PositiveInfinity);
+		Assert(Math.Log(x, double.PositiveInfinity) == 0);
+	}
+
+ 	public void TestLog10() {
+		double a = Math.Log10(x);
+		double b = -0.90868484030277719;
+
+		Assert(a.ToString("G99") + " != " + b.ToString("G99"), 
+		       (Math.Abs(a - b) <= double.Epsilon));
+		Assert(double.IsNaN(Math.Log10(-1)));
+		Assert(double.IsNaN(Math.Log10(double.NaN)));
+
+		// MS docs say this should be PositiveInfinity
+		Assert(Math.Log10(0) == double.NegativeInfinity);
+		Assert(Math.Log10(double.PositiveInfinity) == double.PositiveInfinity);
+
+	}	
+
+ 	public void TestPow() {
+		int iTest = 1;
+
+		try {
+			double a = Math.Pow(y, x);
+			double b = 1.363609446060212;
+
+			Assert(a.ToString("G99") + " != " + b.ToString("G99"), (Math.Abs(a - b) <= double.Epsilon));
+			iTest++;
+			Assert (double.IsNaN(Math.Pow(y, double.NaN)));
+			iTest++;
+			Assert (double.IsNaN(Math.Pow(double.NaN, x)));
+			iTest++;
+			Assert ("Math.Pow(double.NegativeInfinity, 1) should be NegativeInfinity", double.IsNegativeInfinity(Math.Pow(double.NegativeInfinity, 1)));
+			iTest++;
+			Assert ("Math.Pow(double.NegativeInfinity, 2) should be PositiveInfinity", double.IsPositiveInfinity(Math.Pow(double.NegativeInfinity, 2)));
+
+			// MS docs say this should be 0
+			iTest++;
+			Assert(double.IsNaN(Math.Pow(1, double.NegativeInfinity)));
+			iTest++;
+			AssertEquals ("Math.Pow(double.PositiveInfinity, double.NegativeInfinity)", (double)0, Math.Pow(double.PositiveInfinity, double.NegativeInfinity));
+			iTest++;
+			Assert ("Math.Pow(double.PositiveInfinity, 1) should be PositiveInfinity", double.IsPositiveInfinity(Math.Pow(double.PositiveInfinity, 1)));
+
+			// MS docs say this should be PositiveInfinity
+			iTest++;
+			Assert ("Math.Pow(1, double.PositiveInfinity) should be NaN", double.IsNaN(Math.Pow(1, double.PositiveInfinity)));
+		} catch (Exception e) {
+			Fail ("Unexpected exception at iTest=" + iTest + ". e=" + e);
+		}
+	}	
+
+	public void TestByteMax() {
+		byte a = 1;
+		byte b = 2;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestDecimalMax() {
+		decimal a = 1.5M;
+		decimal b = 2.5M;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestDoubleMax() {
+		double a = 1.5D;
+		double b = 2.5D;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestFloatMax() {
+		float a = 1.5F;
+		float b = 2.5F;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestIntMax() {
+		int a = 1;
+		int b = 2;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestLongMax() {
+		long a = 1L;
+		long b = 2L;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestSbyteMax() {
+		sbyte a = 1;
+		sbyte b = 2;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestShortMax() {
+		short a = 1;
+		short b = 2;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestUintMax() {
+		uint a = 1U;
+		uint b = 2U;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestUlongMax() {
+		ulong a = 1UL;
+		ulong b = 2UL;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestUshortMax() {
+		ushort a = 1;
+		ushort b = 2;
+
+		Assert(b == Math.Max(a, b));
+		Assert(b == Math.Max(b, a));
+	}
+
+	public void TestByteMin() {
+		byte a = 1;
+		byte b = 2;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestDecimalMin() {
+		decimal a = 1.5M;
+		decimal b = 2.5M;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestDoubleMin() {
+		double a = 1.5D;
+		double b = 2.5D;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestFloatMin() {
+		float a = 1.5F;
+		float b = 2.5F;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestIntMin() {
+		int a = 1;
+		int b = 2;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestLongMin() {
+		long a = 1L;
+		long b = 2L;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestSbyteMin() {
+		sbyte a = 1;
+		sbyte b = 2;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestShortMin() {
+		short a = 1;
+		short b = 2;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestUintMin() {
+		uint a = 1U;
+		uint b = 2U;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestUlongMin() {
+		ulong a = 1UL;
+		ulong b = 2UL;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestUshortMin() {
+		ushort a = 1;
+		ushort b = 2;
+
+		Assert(a == Math.Min(a, b));
+		Assert(a == Math.Min(b, a));
+	}
+
+	public void TestDecimalRound() {
+		decimal a = 1.5M;
+		decimal b = 2.5M;
+
+		Assert(Math.Round(a) + " != 2", Math.Round(a) == 2);
+		Assert(Math.Round(b) + " != 2", Math.Round(b) == 2);
+	}
+
+	public void TestDecimalRound2() {
+		decimal a = 3.45M;
+		decimal b = 3.46M;
+
+		AssertEquals ("Should round down", Math.Round(a, 1), 3.4M);
+		AssertEquals ("Should round up", Math.Round(b, 1), 3.5M);
+	}
+
+	public void TestDoubleRound() {
+		double a = 1.5D;
+		double b = 2.5D;
+
+		AssertEquals ("Should round up", Math.Round(a), 2D);
+		AssertEquals ("Should round down", Math.Round(b), 2D);
+	}
+
+	public void TestDoubleRound2() {
+		double a = 3.45D;
+		double b = 3.46D;
+
+		AssertEquals ("Should round down", Math.Round(a, 1), 3.4D);
+		AssertEquals ("Should round up", Math.Round(b, 1), 3.5D);
+	}
+	
+	public void TestDecimalSign() {
+		decimal a = -5M;
+		decimal b = 5M;
+
+		Assert(Math.Sign(a) == -1);
+		Assert(Math.Sign(b) == 1);
+		Assert(Math.Sign(0M) == 0);
+	}
+
+	public void TestDoubleSign() {
+		double a = -5D;
+		double b = 5D;
+
+		Assert(Math.Sign(a) == -1);
+		Assert(Math.Sign(b) == 1);
+		Assert(Math.Sign(0D) == 0);
+	}
+
+	public void TestFloatSign() {
+		float a = -5F;
+		float b = 5F;
+
+		Assert(Math.Sign(a) == -1);
+		Assert(Math.Sign(b) == 1);
+		Assert(Math.Sign(0F) == 0);
+	}
+
+	public void TestIntSign() {
+		int a = -5;
+		int b = 5;
+
+		Assert(Math.Sign(a) == -1);
+		Assert(Math.Sign(b) == 1);
+	}
+
+	public void TestLongSign() {
+		long a = -5L;
+		long b = 5L;
+
+		Assert(Math.Sign(a) == -1);
+		Assert(Math.Sign(b) == 1);
+		Assert(Math.Sign(0L) == 0);
+	}
+
+	public void TestSbyteSign() {
+		sbyte a = -5;
+		sbyte b = 5;
+
+		Assert(Math.Sign(a) == -1);
+		Assert(Math.Sign(b) == 1);
+		Assert(Math.Sign(0) == 0);
+	}
+
+	public void TestShortSign() {
+		short a = -5;
+		short b = 5;
+
+		Assert(Math.Sign(a) == -1);
+		Assert(Math.Sign(b) == 1);
+		Assert(Math.Sign(0) == 0);
+	}
+
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/MulticastDelegate.cs b/mcs/class/corlib/Test/System/MulticastDelegate.cs
new file mode 100644
index 00000000000..79525319797
--- /dev/null
+++ b/mcs/class/corlib/Test/System/MulticastDelegate.cs
@@ -0,0 +1,129 @@
+// MulticastDelegate.cs - NUnit Test Cases for MulticastDelegates (C# delegates)

+//

+// Daniel Stodden (stodden@in.tum.de)

+//

+// (C) Daniel Stodden

+// 

+

+// these are the standard namespaces you will need.  You may need to add more

+// depending on your tests.

+using NUnit.Framework;

+using System;

+

+// all test namespaces start with "MonoTests."  Append the Namespace that

+// contains the class you are testing, e.g. MonoTests.System.Collections

+namespace MonoTests.System

+{

+

+// the class name should end with "Test" and start with the name of the class

+// you are testing, e.g. CollectionBaseTest

+public class MulticastDelegateTest : TestCase {

+	

+	// there should be two constructors for your class.  The first one

+	// (without parameters) should set the name to something unique.

+	// Of course the name of the method is the same as the name of the

+	// class

+	public MulticastDelegateTest() : base ("System.MulticastDelegate") {}

+	public MulticastDelegateTest(string name) : base(name) {}

+

+	// this method is run before each Test* method is called. You can put

+	// variable initialization, etc. here that is common to each test.

+	// Just leave the method empty if you don't need to use it.

+	protected override void SetUp() {}

+

+	// this method is run after each Test* method is called. You can put

+	// clean-up code, etc. here.  Whatever needs to be done after each test.

+	// Just leave the method empty if you don't need to use it.

+	protected override void TearDown() {}

+

+	// this property is required.  You need change the parameter for

+	// typeof() below to be your class.

+	public static ITest Suite {

+		get {

+			return new TestSuite(typeof(MulticastDelegateTest));

+		}

+	}

+

+	private delegate char MyDelegate( ref string s );

+

+	private char MethodA( ref string s ) 

+	{

+		s += "a";

+		return 'a';

+	}

+

+	private char MethodB( ref string s )

+	{

+		s += "b";

+		return 'b';

+	}

+

+	private char MethodC( ref string s )

+	{

+		s += "c";

+		return 'c';

+	}

+

+	private char MethodD( ref string s )

+	{

+		s += "d";

+		return 'd';

+	}

+

+	public void TestEquals()

+	{

+		MyDelegate dela = new MyDelegate( MethodA );

+		MyDelegate delb = new MyDelegate( MethodB );

+		MyDelegate delc = new MyDelegate( MethodC );

+

+		AssertEquals( "#A01", false, dela == delb );

+		

+		MyDelegate del1, del2;

+

+		del1 = dela + delb;

+		del2 = delb + delc;

+		AssertEquals( "#A02", false, del1 == del2 );

+		

+		del1 += delc;

+		del2 = dela + del2;

+		AssertEquals( "#A03", true, del1 == del2 );

+	}

+

+	public void TestCombineRemove()

+	{

+		MyDelegate dela = new MyDelegate( MethodA );

+		MyDelegate delb = new MyDelegate( MethodB );

+		MyDelegate delc = new MyDelegate( MethodC );

+		MyDelegate deld = new MyDelegate( MethodD );

+

+		string val;

+		char res;

+

+		// test combine

+		MyDelegate del1, del2;

+		del1 = dela + delb + delb + delc + delb + delb + deld;

+		val = "";

+		res = del1( ref val );

+		// FIXME: this is bug #28306 - delegate order is reversed

+		//   http://bugzilla.ximian.com/show_bug.cgi?id=28306

+		// AssertEquals( "#A01", "abbcbbd", val );

+		// AssertEquals( "#A02", 'd', res );

+

+		// test remove

+		del2 = del1 - ( delb + delb );

+		val = "";

+		res = del2( ref val );

+		// FIXME: this is bug #28306 - delegate order is reversed

+		//   http://bugzilla.ximian.com/show_bug.cgi?id=28306

+		//AssertEquals( "#A03", "abbcd", val );

+		//AssertEquals( "#A04", 'd', res );

+

+		// we did not affect del1, did we?

+		val = "";

+		res = del1( ref val );

+		// FIXME: this is bug #28306 - delegate order is reversed

+		//   http://bugzilla.ximian.com/show_bug.cgi?id=28306

+		//AssertEquals( "#A05", "abbcbbd", val );

+	}

+}

+}

diff --git a/mcs/class/corlib/Test/System/ObjectTest.cs b/mcs/class/corlib/Test/System/ObjectTest.cs
new file mode 100644
index 00000000000..5a9545f390a
--- /dev/null
+++ b/mcs/class/corlib/Test/System/ObjectTest.cs
@@ -0,0 +1,121 @@
+// ObjectTest.cs - NUnit Test Cases for the System.Object struct

+//

+// David Brandt (bucky@keystreams.com)

+//

+// (C) Ximian, Inc.  http://www.ximian.com

+// 

+

+using NUnit.Framework;

+using System;

+using System.Globalization;

+

+namespace MonoTests.System

+{

+

+public class ObjectTest : TestCase

+{

+	public ObjectTest() : base ("MonoTests.System.ObjectTest testsuite") {}

+	public ObjectTest(string name) : base(name) {}

+

+	protected override void SetUp() 

+	{

+	}

+

+	protected override void TearDown() 

+	{

+	}

+

+	public static ITest Suite {

+		get { 

+			return new TestSuite(typeof(ObjectTest)); 

+		}

+	}

+

+	public void TestCtor() {

+		Object o = new Object();

+		AssertNotNull("Can I at least get an _Object_, please?", o);

+	}

+

+	public void TestEquals1() {

+		{

+			Object x = new Object();

+			Object y = new Object();

+			Assert("Object should equal itself",

+			       x.Equals(x));

+			Assert("object should not equal null",

+			       !x.Equals(null));

+			Assert("Different objects should not equal 1",

+			       !x.Equals(y));

+			Assert("Different objects should not equal 2",

+			       !y.Equals(x));

+		}

+		{

+			double x = Double.NaN;

+			double y = Double.NaN;

+			Assert("NaNs should always equal each other",

+			       ((Object)x).Equals(y));

+		}

+	}

+	public void TestEquals2() {

+		{

+			Object x = new Object();

+			Object y = new Object();

+			Assert("Object should equal itself",

+			       Object.Equals(x,x));

+			Assert("object should not equal null",

+			       !Object.Equals(x,null));

+			Assert("null should not equal object",

+			       !Object.Equals(null,x));

+			Assert("Different objects should not equal 1",

+			       !Object.Equals(x,y));

+			Assert("Different objects should not equal 2",

+			       !Object.Equals(y,x));

+			Assert("null should not equal null",

+			       Object.Equals(null,null));

+		}

+		{

+			double x = Double.NaN;

+			double y = Double.NaN;

+			Assert("NaNs should always equal each other",

+			       Object.Equals(x,y));

+		}

+	}

+

+	public void TestGetHashCode() {

+		Object x = new Object();

+		AssertEquals("Object's hash code should not change",

+			     x.GetHashCode(), x.GetHashCode());

+	}

+

+	public void TestGetType() {

+		Object x = new Object();

+		AssertNotNull("Should get a type for Object", x.GetType());

+		AssertEquals("Bad name for Object type", "System.Object",

+			     x.GetType().ToString());

+	}

+

+	public void TestReferenceEquals() {

+		Object x = new Object();

+		Object y = new Object();

+		Assert("Object should equal itself",

+		       Object.ReferenceEquals(x,x));

+		Assert("object should not equal null",

+		       !Object.ReferenceEquals(x,null));

+		Assert("null should not equal object",

+		       !Object.ReferenceEquals(null,x));

+		Assert("Different objects should not equal 1",

+		       !Object.ReferenceEquals(x,y));

+		Assert("Different objects should not equal 2",

+		       !Object.ReferenceEquals(y,x));

+		Assert("null should not equal null",

+		       Object.ReferenceEquals(null,null));

+	}

+

+	public void TestToString() {

+		Object x = new Object();

+		Object y = new Object();

+		AssertEquals("All Objects should have same string rep",

+			     x.ToString(), y.ToString());

+	}

+}

+}

diff --git a/mcs/class/corlib/Test/System/RandomTest.cs b/mcs/class/corlib/Test/System/RandomTest.cs
new file mode 100644
index 00000000000..74146dea1c6
--- /dev/null
+++ b/mcs/class/corlib/Test/System/RandomTest.cs
@@ -0,0 +1,90 @@
+//
+// System.Random Test Cases
+//
+// Author: Bob Smith <bob@thestuff.net>
+//
+
+using NUnit.Framework;
+using System;
+
+namespace MonoTests.System {
+
+public class RandomTest : TestCase
+{
+	public static ITest Suite {
+		get {
+			return new TestSuite(typeof(RandomTest));
+		}
+	}
+
+	public RandomTest() : base ("MonoTests.System.RandomTest testcase") {}

+        public RandomTest(string name): base(name){}
+        public void TestDouble()
+        {
+                Random r = new Random();
+                int i;
+                double c=0;
+                for (i=0; i<20; i++) c+=r.NextDouble();
+                c/=i;
+                Assert (c.ToString() + " is out of range.", c < .7 && c > .3);
+        }
+        public void TestSeed()
+        {
+                Random r = new Random(42);
+                Random r2 = new Random(42);
+                int i;
+                double c=0, c2=0;
+                for (i=0; i<20; i++)
+                {
+                        c += r.NextDouble();
+                        c2 += r2.NextDouble();
+                }
+                AssertEquals(c, c2);
+        }
+        public void TestNext()
+        {
+                Random r = new Random();
+                int i;
+                long c;
+                for (i=0; i<20; i++)
+                {
+                        c = r.Next();
+                        Assert (c < Int32.MaxValue && c >= 0);
+                }
+        }
+        public void TestNextMax()
+        {
+                Random r = new Random();
+                int i;
+                long c;
+                for (i=0; i<20; i++)
+                {
+                        c = r.Next(10);
+                        Assert (c < 10 && c >= 0);
+                }
+        }
+        public void TestNextMinMax()
+        {
+                Random r = new Random();
+                int i;
+                long c;
+		AssertEquals ("#1 Failed where min == max", 42, r.Next (42, 42));
+		AssertEquals ("#2 Failed where min == max", Int32.MaxValue, r.Next (Int32.MaxValue,Int32.MaxValue));
+		AssertEquals ("#3 Failed where min == max", Int32.MinValue, r.Next (Int32.MinValue,Int32.MinValue));
+		AssertEquals ("#4 Failed where min == max", 0, r.Next (0, 0));
+                for (i = 1; i <= Int32.MaxValue / 2; i *= 2)
+                {
+                        c = r.Next (i, i * 2);
+			Assert ("At i=" + i + " c < i*2 failed", c < i * 2);
+                        Assert ("At i=" + i + " c >= i failed", c >= i);
+                }
+                for (i = -1; i >= Int32.MinValue / 2; i *= 2)
+                {
+                        c = r.Next (i * 2, i);
+			Assert ("At i=" + i + " c < i*2 failed", c < i);
+                        Assert ("At i=" + i + " c >= i failed", c >= i * 2);
+                }
+        }
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/ResolveEventArgsTest.cs b/mcs/class/corlib/Test/System/ResolveEventArgsTest.cs
new file mode 100644
index 00000000000..728408b3b1d
--- /dev/null
+++ b/mcs/class/corlib/Test/System/ResolveEventArgsTest.cs
@@ -0,0 +1,30 @@
+//
+// System.ResolveEventArgs Test Cases
+//
+// Author: Nick Drochak <ndrochak@gol.com>
+//
+
+using NUnit.Framework;
+using System;
+
+namespace MonoTests.System {
+
+public class ResolveEventArgsTest : TestCase
+{
+	public static ITest Suite {
+		get {
+			return new TestSuite(typeof(RandomTest));
+		}
+	}
+
+	public ResolveEventArgsTest() : base ("MonoTests.System.ResolveEventArgsTest testcase") {}

+        public ResolveEventArgsTest(string name): base(name){}
+
+	public void TestTheWholeThing()
+        {
+                ResolveEventArgs REA = new ResolveEventArgs("REA_Name");
+                Assert ("Name property not correct", REA.Name == "REA_Name");
+        }
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/SByteTest.cs b/mcs/class/corlib/Test/System/SByteTest.cs
new file mode 100644
index 00000000000..0005eb55c63
--- /dev/null
+++ b/mcs/class/corlib/Test/System/SByteTest.cs
@@ -0,0 +1,180 @@
+// SByteTest.cs - NUnit Test Cases for the System.SByte struct
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using NUnit.Framework;
+using System;
+using System.Globalization;
+
+namespace MonoTests.System
+{
+
+public class SByteTest : TestCase
+{
+	private const SByte MySByte1 = -42;
+	private const SByte MySByte2 = -128;
+	private const SByte MySByte3 = 127;
+	private const string MyString1 = "-42";
+	private const string MyString2 = "-128";
+	private const string MyString3 = "127";
+	private string[] Formats1 = {"c", "d", "e", "f", "g", "n", "p", "x" };
+	private string[] Formats2 = {"c5", "d5", "e5", "f5", "g5", "n5", "p5", "x5" };
+	private string[] Results1 = {"("+NumberFormatInfo.CurrentInfo.CurrencySymbol+"128.00)",
+					"-128", "-1.280000e+002", "-128.00",
+					"-128", "-128.00", "-12,800.00 %", "80"};
+	private string[] Results2 = {NumberFormatInfo.CurrentInfo.CurrencySymbol+"127.00000",
+					"00127", "1.27000e+002", "127.00000",
+					"127", "127.00000", "12,700.00000 %", "0007f"};
+	private string[] ResultsNfi1 = {"("+NumberFormatInfo.InvariantInfo.CurrencySymbol+"128.00)", 
+					"-128", "-1.280000e+002", "-128.00",
+					"-128", "-128.00", "-12,800.00 %", "80"};
+	private string[] ResultsNfi2 = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"127.00000",
+					"00127", "1.27000e+002", "127.00000",
+					"127", "127.00000", "12,700.00000 %", "0007f"};
+	private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
+	
+	public SByteTest() : base ("MonoTests.System.SByteTest testcase") {}

+	public SByteTest(string name) : base(name) {}
+
+	protected override void SetUp() 
+	{
+	}
+
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(SByteTest)); 
+		}
+	}
+    
+	public void TestMinMax()
+	{
+		AssertEquals(SByte.MinValue, MySByte2);
+		AssertEquals(SByte.MaxValue, MySByte3);
+	}
+	
+	public void TestCompareTo()
+	{
+		Assert(MySByte3.CompareTo(MySByte2) > 0);
+		Assert(MySByte2.CompareTo(MySByte2) == 0);
+		Assert(MySByte1.CompareTo((SByte)(-42)) == 0);
+		Assert(MySByte2.CompareTo(MySByte3) < 0);
+		try {
+			MySByte2.CompareTo(100);
+			Fail("Should raise a System.ArgumentException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentException) == e.GetType());
+		}
+	}
+
+	public void TestEquals()
+	{
+		Assert(MySByte1.Equals(MySByte1));
+		Assert(MySByte1.Equals((SByte)(-42)));
+		Assert(MySByte1.Equals((Int16)(-42)) == false);
+		Assert(MySByte1.Equals(MySByte2) == false);
+	}
+	
+	public void TestGetHashCode()
+	{
+		try {
+			MySByte1.GetHashCode();
+			MySByte2.GetHashCode();
+			MySByte3.GetHashCode();
+		}
+		catch {
+			Fail("GetHashCode should not raise an exception here");
+		}
+	}
+	
+	public void TestParse()
+	{
+		//test Parse(string s)
+		Assert(MySByte1 == SByte.Parse(MyString1));
+		Assert(MySByte2 == SByte.Parse(MyString2));
+		Assert(MySByte3 == SByte.Parse(MyString3));
+		try {
+			SByte.Parse(null);
+			Fail("Should raise a System.ArgumentNullException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentNullException) == e.GetType());
+		}
+		try {
+			SByte.Parse("not-a-number");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		try {
+			int OverInt = SByte.MaxValue + 1;
+			SByte.Parse(OverInt.ToString());
+			Fail("Should raise a System.OverflowException");
+		}
+		catch (Exception e) {
+			Assert(typeof(OverflowException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style)
+		AssertEquals("A1", (sbyte)42, SByte.Parse(" "+NumberFormatInfo.CurrentInfo.CurrencySymbol+"42 ", NumberStyles.Currency));
+		try {
+			SByte.Parse(NumberFormatInfo.CurrentInfo.CurrencySymbol+"42", NumberStyles.Integer);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, IFormatProvider provider)
+		Assert(-42 == SByte.Parse(" -42 ", Nfi));
+		try {
+			SByte.Parse("%42", Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style, IFormatProvider provider)
+		Assert(16 == SByte.Parse(" 10 ", NumberStyles.HexNumber, Nfi));
+		try {
+			SByte.Parse(NumberFormatInfo.CurrentInfo.CurrencySymbol+"42", NumberStyles.Integer, Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+	}
+	
+	public void TestToString()
+	{
+		//test ToString()
+		Assert("MyString1, MySByte1.ToString()", String.Compare(MyString1, MySByte1.ToString()) == 0);
+		Assert("MyString2, MySByte2.ToString()", String.Compare(MyString2, MySByte2.ToString()) == 0);
+		Assert("MyString3, MySByte3.ToString()", String.Compare(MyString3, MySByte3.ToString()) == 0);
+		//test ToString(string format)
+		/*
+		TODO: These tests depend on the culture of the system running the test.
+			So, this needs to be tested in a different way.
+		for (int i=0; i < Formats1.Length; i++) {
+			Assert("i="+i+", Results1[i]="+Results1[i]+", MySByte2.ToString(Formats1[i])="+MySByte2.ToString(Formats1[i]), String.Compare(Results1[i], MySByte2.ToString(Formats1[i])) == 0);
+			Assert("Results2[i], MySByte3.ToString(Formats2[i])", String.Compare(Results2[i], MySByte3.ToString(Formats2[i])) == 0);
+		}
+		*/
+		//test ToString(string format, IFormatProvider provider);
+		for (int i=0; i < Formats1.Length; i++) {
+			Assert("i="+i+", ResultsNfi1[i]="+ResultsNfi1[i]+", MySByte2.ToString(Formats1[i]="+Formats1[i]+"): Expected "+ResultsNfi1[i]+" but got "+MySByte2.ToString(Formats1[i], Nfi), String.Compare(ResultsNfi1[i], MySByte2.ToString(Formats1[i], Nfi)) == 0);
+			Assert("ResultsNfi2[i], MySByte3.ToString(Formats2[i], Nfi):"+ResultsNfi2[i]+"<==>"+MySByte3.ToString(Formats2[i], Nfi), String.Compare(ResultsNfi2[i], MySByte3.ToString(Formats2[i], Nfi)) == 0);
+		}
+		try {
+			MySByte1.ToString("z");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert("typeof(FormatException) == e.GetType()", typeof(FormatException) == e.GetType());
+		}
+	}
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/StringTest.cs b/mcs/class/corlib/Test/System/StringTest.cs
new file mode 100644
index 00000000000..9cdb8c2c776
--- /dev/null
+++ b/mcs/class/corlib/Test/System/StringTest.cs
@@ -0,0 +1,1083 @@
+// StringTest.cs - NUnit Test Cases for the System.String class
+//
+// Jeffrey Stedfast <fejj@ximian.com>
+// David Brandt <bucky@keystreams.com>
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+//
+
+using NUnit.Framework;
+using System;
+using System.Globalization;
+
+namespace MonoTests.System
+{
+
+public class StringTest : TestCase
+{
+	public StringTest() : base ("MonoTests.System.StringTest testcase") {}

+	public StringTest (string name) : base (name) {}
+
+	protected override void SetUp ()
+	{
+	}
+
+	public static ITest Suite {
+		get {
+			return new TestSuite (typeof (StringTest));
+		}
+	}
+
+	public void TestLength ()
+	{
+		string str = "test string";
+
+		AssertEquals("wrong length", 11, str.Length);
+	}
+
+	public void TestCompare ()
+	{
+		string lesser = "abc";
+		string medium = "abcd";
+		string greater = "xyz";
+		string caps = "ABC";
+
+		AssertEquals(0, String.Compare(null, null));
+		AssertEquals(1, String.Compare(lesser, null));
+
+		Assert (String.Compare (lesser, greater) < 0);
+		Assert (String.Compare (greater, lesser) > 0);
+		Assert (String.Compare (lesser, lesser) == 0);
+		Assert (String.Compare (lesser, medium) < 0);
+
+		Assert (String.Compare (lesser, caps, true) == 0);
+		Assert (String.Compare (lesser, caps, false) != 0);
+		AssertEquals ("A01", String.Compare ("a", "b"), -1);

+		AssertEquals ("A02", String.Compare ("b", "a"), 1);

+		AssertEquals ("A03", String.Compare ("A", "a"), 1);

+		AssertEquals ("A04", String.Compare ("a", "A"), -1);

+

+
+		// TODO - test with CultureInfo
+
+		string needle = "ab";
+		string haystack = "abbcbacab";
+		AssertEquals("basic substring check #1", 0, 

+			     String.Compare(needle, 0, haystack, 0, 2));
+		AssertEquals("basic substring check #2", -1,

+			     String.Compare(needle, 0, haystack, 0, 3));
+		AssertEquals("basic substring check #3", 0, 

+			     String.Compare("ab", 0, "ab", 0, 2));

+		AssertEquals("basic substring check #4", 0, 

+			     String.Compare("ab", 0, "ab", 0, 3));

+		AssertEquals("basic substring check #5", 0, 

+			     String.Compare("abc", 0, "ab", 0, 2));

+		AssertEquals("basic substring check #6", 1, 

+			     String.Compare("abc", 0, "ab", 0, 5));

+		AssertEquals("basic substring check #7", -1, 

+			     String.Compare("ab", 0, "abc", 0, 5));

+

+		for (int i = 1; i <= (haystack.Length - needle.Length); i++) {
+			if (i != 7) {
+				Assert("loop substring check #1/" + i, String.Compare(needle, 0, haystack, i, 2) != 0);

+				Assert("loop substring check #2/" + i, String.Compare(needle, 0, haystack, i, 3) != 0);

+			} else {
+				AssertEquals("loop substring check #3/" + i, 0, String.Compare(needle, 0, haystack, i, 2));

+				AssertEquals("loop substring check #4/" + i, 0, String.Compare(needle, 0, haystack, i, 3));

+			}
+		}
+
+		needle = "AB";
+		AssertEquals("basic substring check #8", 0, 

+			     String.Compare(needle, 0, haystack, 0, 2, true));
+		AssertEquals("basic substring check #9", 1, 

+			     String.Compare(needle, 0, haystack, 0, 2, false));
+		for (int i = 1; i <= (haystack.Length - needle.Length); i++) {
+			if (i != 7) {
+				Assert("loop substring check #5/" + i, String.Compare(needle, 0, haystack, i, 2, true) != 0);

+				Assert("loop substring check #6/" + i, String.Compare(needle, 0, haystack, i, 2, false) != 0);

+			} else {
+				AssertEquals("loop substring check #7/" + i, 0, String.Compare(needle, 0, haystack, i, 2, true));

+				AssertEquals("loop substring check #8/" + i, 1, String.Compare(needle, 0, haystack, i, 2, false));

+			}
+		}
+
+		// TODO - extended format call with CultureInfo
+	}
+
+	public void TestCompareOrdinal ()
+	{
+		string lesser = "abc";
+		string medium = "abcd";
+		string greater = "xyz";
+
+		AssertEquals(0, String.CompareOrdinal(null, null));
+		AssertEquals(1, String.CompareOrdinal(lesser, null));
+
+		Assert (String.CompareOrdinal (lesser, greater) < 0);
+		Assert (String.CompareOrdinal (greater, lesser) > 0);
+		Assert (String.CompareOrdinal (lesser, lesser) == 0);
+		Assert (String.CompareOrdinal (lesser, medium) < 0);
+
+		string needle = "ab";
+		string haystack = "abbcbacab";
+		AssertEquals("basic substring check", 0, 
+			     String.CompareOrdinal(needle, 0, haystack, 0, 2));
+		AssertEquals("basic substring miss", -1,
+			     String.CompareOrdinal(needle, 0, haystack, 0, 3));
+		for (int i = 1; i <= (haystack.Length - needle.Length); i++) {
+			if (i != 7) {
+				Assert("loop substring check " + i, String.CompareOrdinal(needle, 0, haystack, i, 2) != 0);
+				Assert("loop substring check " + i, String.CompareOrdinal(needle, 0, haystack, i, 3) != 0);
+			} else {
+				AssertEquals("loop substring check " + i, 0, String.CompareOrdinal(needle, 0, haystack, i, 2));
+				AssertEquals("loop substring check " + i, 0, String.CompareOrdinal(needle, 0, haystack, i, 3));
+			}
+		}
+	}
+
+	public void TestCompareTo ()
+	{
+		string lower = "abc";
+		string greater = "xyz";
+		string lesser = "abc";
+		
+		Assert (lower.CompareTo (greater) < 0);
+		Assert (lower.CompareTo (lower) == 0);
+		Assert (greater.CompareTo (lesser) > 0);
+	}
+
+	public void TestConcat ()
+	{
+		string string1 = "string1";
+		string string2 = "string2";
+		string concat = "string1string2";
+
+		Assert (String.Concat (string1, string2) == concat);
+	}
+
+	public void TestCopy()
+	{
+		string s1 = "original";
+		string s2 = String.Copy(s1);
+		AssertEquals("String copy no good", s1, s2);
+
+		bool errorThrown = false;
+		try {
+			string s = String.Copy(null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null copy shouldn't be good", errorThrown);
+	}
+
+	public void TestCopyTo()
+	{
+		string s1 = "original";
+
+		bool errorThrown = false;
+		try {
+			s1.CopyTo(0, (char[])null, 0, s1.Length);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null CopyTo shouldn't be good", errorThrown);
+		
+		char[] c1 = new char[s1.Length];
+		string s2 = new String(c1);
+		Assert("char string not bad to start", !s1.Equals(s2));
+		for (int i = 0; i < s1.Length; i++) {
+			s1.CopyTo(i, c1, i, 1);
+		}
+		s2 = new String(c1);
+		AssertEquals("char-by-char copy bad", s1, s2);
+	}
+
+	public void TestEndsWith()
+	{
+		string s1 = "original";
+		
+		bool errorThrown = false;
+		try {
+			bool huh = s1.EndsWith(null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null EndsWith shouldn't be good", errorThrown);
+
+		Assert("should match", s1.EndsWith("l"));
+		Assert("should match 2", s1.EndsWith("inal"));
+		Assert("should fail", !s1.EndsWith("ina"));
+	}
+
+	public void TestEquals()
+	{
+		string s1 = "original";
+		string yes = "original";
+		object y = yes;
+		string no = "copy";
+
+		Assert("No match for null", !s1.Equals(null));
+		Assert("Should match object", s1.Equals(y));
+		Assert("Should match", s1.Equals(yes));
+		Assert("Shouldn't match", !s1.Equals(no));
+
+		Assert("Static nulls should match", String.Equals(null, null));
+		Assert("Should match", String.Equals(s1, yes));
+		Assert("Shouldn't match", !String.Equals(s1, no));
+	}
+
+	public void TestFormat ()
+	{
+		AssertEquals ("Empty format string.", "", String.Format ("", 0));

+		AssertEquals ("Single argument.", "100", String.Format ("{0}", 100));

+		AssertEquals ("Single argument, right justified.", "X   37X", String.Format ("X{0,5}X", 37));

+		AssertEquals ("Single argument, left justified.", "X37   X", String.Format ("X{0,-5}X", 37));

+		AssertEquals ("Two arguments.", "The 3 wise men.", String.Format ("The {0} wise {1}.", 3, "men"));

+		AssertEquals ("Three arguments.", "do re me fa so.", String.Format ("{0} re {1} fa {2}.", "do", "me", "so"));

+		AssertEquals ("Formatted argument.", "###00c0ffee#", String.Format ("###{0:x8}#", 0xc0ffee));

+		AssertEquals ("Formatted argument, right justified.", "#  033#", String.Format ("#{0,5:x3}#", 0x33));

+		AssertEquals ("Formatted argument, left justified.", "#033  #", String.Format ("#{0,-5:x3}#", 0x33));

+		AssertEquals ("Escaped bracket", "typedef struct _MonoObject { ... } MonoObject;", String.Format ("typedef struct _{0} {{ ... }} MonoObject;", "MonoObject"));

+		AssertEquals
("With Slash", "Could not find file \"a/b\"", String.Format ("Could not find file \"{0}\"", "a/b"));
+		AssertEquals
("With BackSlash", "Could not find file \"a\\b\"", String.Format ("Could not find file \"{0}\"", "a\\b"));
+
+		// TODO test format exceptions
+
+		// TODO test argument null exceptions
+		//   This should work, but it doesn't currently.
+		//   I think I broke the spec...
+		//bool errorThrown = false;
+		//try {
+		//string s = String.Format(null, " ");
+		//} catch (ArgumentNullException) {
+		//errorThrown = true;
+		//}
+		//Assert("error not thrown 1", errorThrown);
+		//errorThrown = false;
+		//try {
+		//string s = String.Format(null, " ", " ");
+		//} catch (ArgumentNullException) {
+		//errorThrown = true;
+		//}
+		//Assert("error not thrown 2", errorThrown);
+		//errorThrown = false;
+		//try {
+		//string s = String.Format(" ", null);
+		//} catch (ArgumentNullException) {
+		//errorThrown = true;
+		//}
+		//Assert("error not thrown 3", errorThrown);
+	}
+
+	public void TestGetEnumerator()
+	{
+		string s1 = "original";
+		char[] c1 = new char[s1.Length];
+		string s2 = new String(c1);
+		Assert("pre-enumerated string should not match", !s1.Equals(s2));
+		CharEnumerator en = s1.GetEnumerator();
+		AssertNotNull("null enumerator", en);
+		
+		for (int i = 0; i < s1.Length; i++) {
+			en.MoveNext();
+			c1[i] = en.Current;
+		}
+		s2 = new String(c1);
+		AssertEquals("enumerated string should match", s1, s2);
+	}
+
+	public void TestGetHashCode()
+	{
+		string s1 = "original";
+		// TODO - weak test, currently.  Just verifies determinicity.
+		AssertEquals("same string, same hash code", 
+			     s1.GetHashCode(), s1.GetHashCode());
+	}
+
+	public void TestGetType() {
+		string s1 = "original";
+		AssertEquals("String type", "System.String", s1.GetType().ToString());
+	}
+
+	public void TestGetTypeCode() {
+		string s1 = "original";
+		Assert(s1.GetTypeCode().Equals(TypeCode.String));
+	}
+
+	public void TestIndexOf() {
+		string s1 = "original";
+
+		bool errorThrown = false;
+		try {
+			int i = s1.IndexOf('q', s1.Length + 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range error for char", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.IndexOf('q', s1.Length + 1, 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range error for char", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.IndexOf("huh", s1.Length + 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range for string", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.IndexOf("huh", s1.Length + 1, 3);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range for string", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.IndexOf(null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null string error", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.IndexOf(null, 0);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null string error", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.IndexOf(null, 0, 1);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null string error", errorThrown);
+
+		AssertEquals("basic char index", 1, s1.IndexOf('r'));
+		AssertEquals("basic char index", 2, s1.IndexOf('i'));
+		AssertEquals("basic char index - no", -1, s1.IndexOf('q'));
+		
+		AssertEquals("basic string index", 1, s1.IndexOf("rig"));
+		AssertEquals("basic string index", 2, s1.IndexOf("i"));
+		AssertEquals("basic string index - no", -1, s1.IndexOf("rag"));
+
+		AssertEquals("stepped char index", 1, s1.IndexOf('r', 1));
+		AssertEquals("stepped char index", 2, s1.IndexOf('i', 1));
+		AssertEquals("stepped char index", 4, s1.IndexOf('i', 3));
+		AssertEquals("stepped char index", -1, s1.IndexOf('i', 5));
+		AssertEquals("stepped char index", -1, s1.IndexOf('l', s1.Length));
+
+		AssertEquals("stepped limited char index", 
+			     1, s1.IndexOf('r', 1, 1));
+		AssertEquals("stepped limited char index", 
+			     -1, s1.IndexOf('r', 0, 1));
+		AssertEquals("stepped limited char index", 
+			     2, s1.IndexOf('i', 1, 3));
+		AssertEquals("stepped limited char index", 
+			     4, s1.IndexOf('i', 3, 3));
+		AssertEquals("stepped limited char index", 
+			     -1, s1.IndexOf('i', 5, 3));
+
+		s1 = "original original";
+		AssertEquals("stepped string index 1",
+			     0, s1.IndexOf("original", 0));
+		AssertEquals("stepped string index 2", 
+			     9, s1.IndexOf("original", 1));
+		AssertEquals("stepped string index 3", 
+			     -1, s1.IndexOf("original", 10));
+		AssertEquals("stepped limited string index 1",
+			     1, s1.IndexOf("rig", 0, 5));
+		AssertEquals("stepped limited string index 2",
+			     -1, s1.IndexOf("rig", 0, 3));
+		AssertEquals("stepped limited string index 3",
+			     10, s1.IndexOf("rig", 2, 15));
+		AssertEquals("stepped limited string index 4",
+			     -1, s1.IndexOf("rig", 2, 3));
+	}
+
+	public void TestIndexOfAny() {
+		string s1 = "abcdefghijklm";
+
+		bool errorThrown = false;
+		try {
+			int i = s1.IndexOfAny(null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null char[] error", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.IndexOfAny(null, 0);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null char[] error", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.IndexOfAny(null, 0, 1);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null char[] error", errorThrown);
+
+		char[] c1 = {'a', 'e', 'i', 'o', 'u'};
+		AssertEquals("first vowel", 0, s1.IndexOfAny(c1));
+		AssertEquals("second vowel", 4, s1.IndexOfAny(c1, 1));
+		AssertEquals("out of vowels", -1, s1.IndexOfAny(c1, 9));
+		AssertEquals("second vowel in range", 
+			     4, s1.IndexOfAny(c1, 1, 4));
+		AssertEquals("second vowel out of range", 
+			     -1, s1.IndexOfAny(c1, 1, 3));
+
+		errorThrown = false;
+		try {
+			int i = s1.IndexOfAny(c1, s1.Length+1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("Out of range error", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.IndexOfAny(c1, s1.Length+1, 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("Out of range error", errorThrown);
+	}
+
+	public void TestInsert() {
+		string s1 = "original";
+		
+		bool errorThrown = false;
+		try {
+			string result = s1.Insert(0, null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("Null arg error", errorThrown);
+
+		errorThrown = false;
+		try {
+			string result = s1.Insert(s1.Length+1, "Hi!");
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("Out of range error", errorThrown);
+
+		AssertEquals("front insert", 
+			     "Hi!original", s1.Insert(0, "Hi!"));
+		AssertEquals("back insert", 
+			     "originalHi!", s1.Insert(s1.Length, "Hi!"));
+		AssertEquals("middle insert", 
+			     "origHi!inal", s1.Insert(4, "Hi!"));
+	}
+
+	public void TestIntern() {
+		bool errorThrown = false;
+		try {
+			string s = String.Intern(null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null arg error", errorThrown);
+
+		string s1 = "original";
+		AssertEquals("One string's reps are both the same",
+			     String.Intern(s1), String.Intern(s1));
+
+		string s2 = "originally";
+		Assert("Different strings, different reps",
+		       String.Intern(s1) != String.Intern(s2));
+	}
+
+	public void TestIsInterned() {
+		bool errorThrown = false;
+		try {
+			string s = String.IsInterned(null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null arg error", errorThrown);
+
+		// FIXME - it seems like this should work, but no.
+		//   I don't know how it's possible to get a null
+		//   returned from IsInterned.
+		//Assert("no intern for regular string", 
+		//String.IsInterned("original") == null);
+
+		string s1 = "original";
+		AssertEquals("is interned", s1, String.IsInterned(s1));
+	}
+
+	public void TestJoin() {
+		bool errorThrown = false;
+		try {
+			string s = String.Join(" ", null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null arg error", errorThrown);
+
+		string[] chunks = {"this", "is", "a", "test"};
+		AssertEquals("Basic join", "this is a test",
+			     String.Join(" ", chunks));
+		AssertEquals("Basic join", "this.is.a.test",
+			     String.Join(".", chunks));
+
+		AssertEquals("Subset join", "is a",
+			     String.Join(" ", chunks, 1, 2));
+		AssertEquals("Subset join", "is.a",
+			     String.Join(".", chunks, 1, 2));
+		AssertEquals("Subset join", "is a test",
+			     String.Join(" ", chunks, 1, 3));
+
+		errorThrown = false;
+		try {
+			string s = String.Join(" ", chunks, 2, 3);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range error", errorThrown);
+	}
+
+	public void TestLastIndexOf() {
+		string s1 = "original";
+
+		bool errorThrown = false;
+		try {
+			int i = s1.LastIndexOf('q', -1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range error for char", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.LastIndexOf('q', -1, 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range error for char", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.LastIndexOf("huh", s1.Length + 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range for string", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.LastIndexOf("huh", s1.Length + 1, 3);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range for string", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.LastIndexOf(null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null string error", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.LastIndexOf(null, 0);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null string error", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.LastIndexOf(null, 0, 1);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null string error", errorThrown);
+
+		AssertEquals("basic char index", 1, s1.LastIndexOf('r'));
+		AssertEquals("basic char index", 4, s1.LastIndexOf('i'));
+		AssertEquals("basic char index - no", -1, s1.LastIndexOf('q'));
+		
+		AssertEquals("basic string index", 1, s1.LastIndexOf("rig"));
+		AssertEquals("basic string index", 4, s1.LastIndexOf("i"));
+		AssertEquals("basic string index - no", -1, 
+			     s1.LastIndexOf("rag"));
+
+
+
+		AssertEquals("stepped char index", 1, 
+			     s1.LastIndexOf('r', s1.Length-1));
+		AssertEquals("stepped char index", 4, 
+			     s1.LastIndexOf('i', s1.Length-1));
+		AssertEquals("stepped char index", 2, 
+			     s1.LastIndexOf('i', 3));
+		AssertEquals("stepped char index", -1, 
+			     s1.LastIndexOf('i', 1));
+
+		AssertEquals("stepped limited char index", 
+			     1, s1.LastIndexOf('r', 1, 1));
+		AssertEquals("stepped limited char index", 
+			     -1, s1.LastIndexOf('r', 0, 1));
+		AssertEquals("stepped limited char index", 
+			     4, s1.LastIndexOf('i', 6, 3));
+		AssertEquals("stepped limited char index", 
+			     2, s1.LastIndexOf('i', 3, 3));
+		AssertEquals("stepped limited char index", 
+			     -1, s1.LastIndexOf('i', 1, 2));
+
+		s1 = "original original";
+		AssertEquals("stepped string index #1",
+			     9, s1.LastIndexOf("original", s1.Length));
+		AssertEquals("stepped string index #2", 
+			     0, s1.LastIndexOf("original", s1.Length-2));
+		AssertEquals("stepped string index #3", 
+			     -1, s1.LastIndexOf("original", s1.Length-11));
+		AssertEquals("stepped string index #4",
+			     -1, s1.LastIndexOf("translator", 2));
+		AssertEquals("stepped limited string index #1",
+			     10, s1.LastIndexOf("rig", s1.Length-1, 10));
+		AssertEquals("stepped limited string index #2",
+			     -1, s1.LastIndexOf("rig", s1.Length, 3));
+		AssertEquals("stepped limited string index #3",
+			     10, s1.LastIndexOf("rig", s1.Length-2, 15));
+		AssertEquals("stepped limited string index #4",
+			     -1, s1.LastIndexOf("rig", s1.Length-2, 3));
+	}
+
+	public void TestLastIndexOfAny() {
+		string s1 = ".bcdefghijklm";
+
+		bool errorThrown = false;
+		try {
+			int i = s1.LastIndexOfAny(null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null char[] error", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.LastIndexOfAny(null, s1.Length);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null char[] error", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.LastIndexOfAny(null, s1.Length, 1);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null char[] error", errorThrown);
+
+		char[] c1 = {'a', 'e', 'i', 'o', 'u'};
+		AssertEquals("first vowel", 8, s1.LastIndexOfAny(c1));
+		AssertEquals("second vowel", 4, s1.LastIndexOfAny(c1, 7));
+		AssertEquals("out of vowels", -1, s1.LastIndexOfAny(c1, 3));
+		AssertEquals("second vowel in range", 
+			     4, s1.LastIndexOfAny(c1, s1.Length-6, 4));
+		AssertEquals("second vowel out of range", 
+			     -1, s1.LastIndexOfAny(c1, s1.Length-6, 3));
+
+		errorThrown = false;
+		try {
+			int i = s1.LastIndexOfAny(c1, -1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("Out of range error", errorThrown);
+
+		errorThrown = false;
+		try {
+			int i = s1.LastIndexOfAny(c1, -1, 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("Out of range error", errorThrown);
+	}
+
+	public void TestPadLeft() {
+		string s1 = "Hi!";
+
+		bool errorThrown = false;
+		try {
+			string s = s1.PadLeft(-1);
+		} catch (ArgumentException) {
+			errorThrown = true;
+		}
+		Assert("Bad argument error", errorThrown);
+
+		AssertEquals("Too little padding",
+			     s1, s1.PadLeft(s1.Length-1));
+		AssertEquals("Some padding",
+			     "  Hi!", s1.PadLeft(5));
+	}
+
+	public void TestPadRight() {
+		string s1 = "Hi!";
+
+		bool errorThrown = false;
+		try {
+			string s = s1.PadRight(-1);
+		} catch (ArgumentException) {
+			errorThrown = true;
+		}
+		Assert("Bad argument error", errorThrown);
+
+		AssertEquals("Too little padding",
+			     s1, s1.PadRight(s1.Length-1));
+		AssertEquals("Some padding",
+			     "Hi!  ", s1.PadRight(5));
+	}
+
+	public void TestRemove() {
+		string s1 = "original";
+
+		bool errorThrown = false;
+		try {
+			s1.Remove(-1,1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range error", errorThrown);
+		errorThrown = false;
+		try {
+			s1.Remove(1,-1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range error", errorThrown);
+		errorThrown = false;
+		try {
+			s1.Remove(s1.Length,s1.Length);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("out of range error", errorThrown);
+
+		AssertEquals("basic remove", "oinal",
+			     s1.Remove(1, 3));
+	}
+
+	public void TestReplace() {
+		string s1 = "original";
+
+		AssertEquals("non-hit char", s1, s1.Replace('q','s'));
+		AssertEquals("single char", "oxiginal", s1.Replace('r', 'x'));
+		AssertEquals("double char", "orxgxnal", s1.Replace('i', 'x'));
+
+		bool errorThrown = false;
+		try {
+			string s = s1.Replace(null, "feh");
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("should get null arg exception", errorThrown);
+
+		AssertEquals("replace as remove", "ornal", 
+			     s1.Replace("igi", null));
+		AssertEquals("non-hit string", s1, s1.Replace("spam", "eggs"));
+		AssertEquals("single string", "orirumal", 
+			     s1.Replace("gin", "rum"));
+		AssertEquals("double string", "oreigeinal", 
+			     s1.Replace("i", "ei"));
+			     			     

+		AssertEquals ("result longer", ":!:", "::".Replace ("::", ":!:"));

+	}
+
+	public void TestSplit() {
+		string s1 = "abcdefghijklm";
+		char[] c1 = {'q', 'r'};
+		AssertEquals("No splitters", s1, (s1.Split(c1))[0]);
+
+		char[] c2 = {'a', 'e', 'i', 'o', 'u'};
+		string[] chunks = s1.Split(c2);
+		AssertEquals("First chunk", "", chunks[0]);
+		AssertEquals("Second chunk", "bcd", chunks[1]);
+		AssertEquals("Third chunk", "fgh", chunks[2]);
+		AssertEquals("Fourth chunk", "jklm", chunks[3]);
+
+		{
+			bool errorThrown = false;
+			try {
+				chunks = s1.Split(c2, -1);
+			} catch (ArgumentOutOfRangeException) {
+				errorThrown = true;
+			}
+			Assert("Split out of range", errorThrown);
+		}
+
+		chunks = s1.Split(c2, 2);
+		AssertEquals("Limited chunk", 2, chunks.Length);
+		AssertEquals("First limited chunk", "", chunks[0]);
+		AssertEquals("Second limited chunk", "bcdefghijklm", chunks[1]);
+
+		string s3 = "1.0";
+		char[] c3 = {'.'};
+		chunks = s3.Split(c3,2);
+		AssertEquals("1.0 split length", 2, chunks.Length);
+		AssertEquals("1.0 split first chunk", "1", chunks[0]);
+		AssertEquals("1.0 split second chunk", "0", chunks[1]);
+
+		string s4 = "1.0.0";
+		char[] c4 = {'.'};
+		chunks = s4.Split(c4,2);
+		AssertEquals("1.0.0 split length", 2, chunks.Length);
+		AssertEquals("1.0.0 split first chunk", "1", chunks[0]);
+		AssertEquals("1.0.0 split second chunk", "0.0", chunks[1]);
+
+		string s5 = ".0.0";
+		char[] c5 = {'.'};
+		chunks = s5.Split (c5, 2);
+		AssertEquals(".0.0 split length", 2, chunks.Length);
+		AssertEquals(".0.0 split first chunk", "", chunks[0]);
+		AssertEquals(".0.0 split second chunk", "0.0", chunks[1]);
+
+		string s6 = ".0";
+		char[] c6 = {'.'};
+		chunks = s6.Split (c6, 2);
+		AssertEquals(".0 split length", 2, chunks.Length);
+		AssertEquals(".0 split first chunk", "", chunks[0]);
+		AssertEquals(".0 split second chunk", "0", chunks[1]);
+
+		string s7 = "0.";
+		char[] c7 = {'.'};
+		chunks = s7.Split (c7, 2);
+		AssertEquals("0. split length", 2, chunks.Length);
+		AssertEquals("0. split first chunk", "0", chunks[0]);
+		AssertEquals("0. split second chunk", "", chunks[1]);
+
+		string s8 = "0.0000";
+		char[] c8 = {'.'};
+		chunks = s8.Split (c8, 2);
+		AssertEquals("0.0000/2 split length", 2, chunks.Length);
+		AssertEquals("0.0000/2 split first chunk", "0", chunks[0]);
+		AssertEquals("0.0000/2 split second chunk", "0000", chunks[1]);
+
+		chunks = s8.Split (c8, 3);
+		AssertEquals("0.0000/3 split length", 2, chunks.Length);
+		AssertEquals("0.0000/3 split first chunk", "0", chunks[0]);
+		AssertEquals("0.0000/3 split second chunk", "0000", chunks[1]);
+
+		chunks = s8.Split (c8, 1);
+		AssertEquals("0.0000/1 split length", 1, chunks.Length);
+		AssertEquals("0.0000/1 split first chunk", "0.0000", chunks[0]);
+
+		chunks = s1.Split(c2, 1);
+		AssertEquals("Single split", 1, chunks.Length);
+		AssertEquals("Single chunk", s1, chunks[0]);
+
+		chunks = s1.Split(c2, 0);
+		AssertEquals("Zero split", 0, chunks.Length);
+	}
+
+	public void TestStartsWith() {
+		string s1 = "original";
+		
+		bool errorThrown = false;
+		try {
+			bool huh = s1.StartsWith(null);
+		} catch (ArgumentNullException) {
+			errorThrown = true;
+		}
+		Assert("null StartsWith shouldn't be good", errorThrown);
+
+		Assert("should match", s1.StartsWith("o"));
+		Assert("should match 2", s1.StartsWith("orig"));
+		Assert("should fail", !s1.StartsWith("rig"));
+	}
+
+	public void TestSubstring() {
+		string s1 = "original";
+
+		bool errorThrown = false;
+		try {
+			string s = s1.Substring(s1.Length+1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("error not thrown", errorThrown);
+		errorThrown = false;
+		try {
+			string s = s1.Substring(-1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("error not thrown", errorThrown);
+
+		errorThrown = false;
+		try {
+			string s = s1.Substring(1, -1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("error not thrown", errorThrown);
+		errorThrown = false;
+		try {
+			string s = s1.Substring(-1, 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("error not thrown", errorThrown);
+		errorThrown = false;
+		try {
+			string s = s1.Substring(s1.Length, 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("error not thrown", errorThrown);
+		errorThrown = false;
+		try {
+			string s = s1.Substring(1, s1.Length);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("error not thrown", errorThrown);
+
+		AssertEquals("basic substring", "inal",
+			     s1.Substring(4));
+		AssertEquals("midstring", "igin",
+			     s1.Substring(2, 4));
+		AssertEquals("at end", "",
+			     s1.Substring(s1.Length, 0));
+	}
+
+	public void TestToCharArray() {
+		string s1 = "original";
+		char[] c1 = s1.ToCharArray();
+		AssertEquals("right array size", s1.Length, c1.Length);
+		AssertEquals("basic char array", s1,
+			     new String(c1));
+		
+		bool errorThrown = false;
+		try {
+			s1.ToCharArray(s1.Length, 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("error not thrown", errorThrown);
+		errorThrown = false;
+		try {
+			s1.ToCharArray(1, s1.Length);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("error not thrown", errorThrown);
+		errorThrown = false;
+		try {
+			s1.ToCharArray(-1, 1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("error not thrown", errorThrown);
+		errorThrown = false;
+		try {
+			s1.ToCharArray(1, -1);
+		} catch (ArgumentOutOfRangeException) {
+			errorThrown = true;
+		}
+		Assert("error not thrown", errorThrown);
+
+		c1 = s1.ToCharArray(0, 3);
+		AssertEquals("Starting char array", "ori", new String(c1));
+	}
+
+	public void TestToLower() {
+		string s1 = "OrIgInAl";
+		AssertEquals("lowercase failed", "original", s1.ToLower());
+
+		// TODO - Again, with CultureInfo
+	}
+
+	public void TestToString() {
+		string s1 = "original";
+		AssertEquals("ToString failed!", s1, s1.ToString());
+	}
+
+	public void TestToUpper() {
+		string s1 = "OrIgInAl";
+		AssertEquals("uppercase failed", "ORIGINAL", s1.ToUpper());
+
+		// TODO - Again, with CultureInfo
+	}
+
+	public void TestTrim() {
+		string s1 = "  original\t\n";
+		AssertEquals("basic trim failed", "original", s1.Trim());
+		AssertEquals("basic trim failed", "original", s1.Trim(null));
+
+		s1 = "original";

+		AssertEquals("basic trim failed", "original", s1.Trim());

+		AssertEquals("basic trim failed", "original", s1.Trim(null));

+

+		s1 = "   \t \n  ";

+		AssertEquals("empty trim failed", "", s1.Trim());

+		AssertEquals("empty trim failed", "", s1.Trim(null));

+

+		s1 = "aaaoriginalbbb";
+		char[] delims = {'a', 'b'};
+		AssertEquals("custom trim failed", 
+			     "original", s1.Trim(delims));
+	}
+
+	public void TestTrimEnd() {
+		string s1 = "  original\t\n";
+		AssertEquals("basic TrimEnd failed", 
+			     "  original", s1.TrimEnd(null));
+
+		s1 = "  original";

+		AssertEquals("basic TrimEnd failed", 

+			     "  original", s1.TrimEnd(null));

+

+		s1 = "  \t  \n  \n    ";

+		AssertEquals("empty TrimEnd failed", 

+			     "", s1.TrimEnd(null));

+

+		s1 = "aaaoriginalbbb";
+		char[] delims = {'a', 'b'};
+		AssertEquals("custom TrimEnd failed", 
+			     "aaaoriginal", s1.TrimEnd(delims));
+	}
+
+	public void TestTrimStart() {
+		string s1 = "  original\t\n";
+		AssertEquals("basic TrimStart failed", 
+			     "original\t\n", s1.TrimStart(null));
+
+		s1 = "original\t\n";

+		AssertEquals("basic TrimStart failed", 

+			     "original\t\n", s1.TrimStart(null));

+

+		s1 = "    \t \n \n  ";

+		AssertEquals("empty TrimStart failed", 

+			     "", s1.TrimStart(null));

+

+		s1 = "aaaoriginalbbb";
+		char[] delims = {'a', 'b'};
+		AssertEquals("custom TrimStart failed", 
+			     "originalbbb", s1.TrimStart(delims));
+	}
+
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/TimeSpanTest.cs b/mcs/class/corlib/Test/System/TimeSpanTest.cs
new file mode 100755
index 00000000000..c3e59151ac3
--- /dev/null
+++ b/mcs/class/corlib/Test/System/TimeSpanTest.cs
@@ -0,0 +1,266 @@
+//
+// TimeSpanTest.cs - NUnit Test Cases for the System.TimeSpan struct
+//
+// author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (C) 2001 Duco Fijma
+//
+
+using NUnit.Framework;
+using System;
+
+namespace MonoTests.System
+{
+
+public class TimeSpanTest : TestCase
+{
+	public TimeSpanTest() : base ("MonoTests.System.TimeSpanTest testcase") {}
+        public TimeSpanTest (string name): base (name) {}
+
+	public static ITest Suite
+	{
+		get {
+			return new TestSuite (typeof(TimeSpanTest));
+		}
+	}
+
+	public void TestCtors ()
+	{
+		TimeSpan t1 = new TimeSpan (1234567890);
+
+		AssertEquals ("A1", "00:02:03.4567890", t1.ToString ());
+		t1 = new TimeSpan (1,2,3);
+		AssertEquals ("A2", "01:02:03", t1.ToString ());
+		t1 = new TimeSpan (1,2,3,4);
+		AssertEquals ("A3", "1.02:03:04", t1.ToString ());
+		t1 = new TimeSpan (1,2,3,4,5);
+		AssertEquals ("A4", "1.02:03:04.0050000", t1.ToString ());
+		t1 = new TimeSpan (-1,2,-3,4,-5);
+		AssertEquals ("A5", "-22:02:56.0050000", t1.ToString ());
+		t1 = new TimeSpan (0,25,0,0,0);
+		AssertEquals ("A6", "1.01:00:00", t1.ToString ());
+        }
+
+	public void TestProperties ()
+	{
+		TimeSpan t1 = new TimeSpan (1,2,3,4,5);
+		TimeSpan t2 = -t1;
+
+		AssertEquals ("A1", 1, t1.Days);
+		AssertEquals ("A2", 2, t1.Hours);
+		AssertEquals ("A3", 3, t1.Minutes);
+		AssertEquals ("A4", 4, t1.Seconds);
+		AssertEquals ("A5", 5, t1.Milliseconds);
+		AssertEquals ("A6", -1, t2.Days);
+		AssertEquals ("A7", -2, t2.Hours);
+		AssertEquals ("A8", -3, t2.Minutes);
+		AssertEquals ("A9", -4, t2.Seconds);
+		AssertEquals ("A10", -5, t2.Milliseconds);
+	}
+
+	public void TestAdd ()
+	{
+		TimeSpan t1 = new TimeSpan (2,3,4,5,6);
+		TimeSpan t2 = new TimeSpan (1,2,3,4,5);
+		TimeSpan t3 = t1 + t2;
+		TimeSpan t4 = t1.Add (t2);
+		TimeSpan t5;
+		bool exception;
+
+		AssertEquals ("A1", 3, t3.Days);
+		AssertEquals ("A2", 5, t3.Hours);
+		AssertEquals ("A3", 7, t3.Minutes);
+		AssertEquals ("A4", 9, t3.Seconds);
+		AssertEquals ("A5", 11, t3.Milliseconds);
+		AssertEquals ("A6", "3.05:07:09.0110000", t4.ToString ());
+		try
+		{
+			t5 = TimeSpan.MaxValue + new TimeSpan (1);			
+			exception = false;
+		}
+		catch (OverflowException)
+		{
+			exception = true;
+		}
+		Assert ("A7", exception);
+	}
+
+	public void TestCompare ()
+	{
+		TimeSpan t1 = new TimeSpan (-1);
+		TimeSpan t2 = new TimeSpan (1);
+		int res;
+		bool exception;
+
+		AssertEquals ("A1", -1, TimeSpan.Compare (t1, t2));
+		AssertEquals ("A2", 1, TimeSpan.Compare (t2, t1));
+		AssertEquals ("A3", 0, TimeSpan.Compare (t2, t2));
+		AssertEquals ("A4", -1, TimeSpan.Compare (TimeSpan.MinValue, TimeSpan.MaxValue));
+		AssertEquals ("A5", -1, t1.CompareTo (t2));
+		AssertEquals ("A6", 1, t2.CompareTo (t1));
+		AssertEquals ("A7", 0, t2.CompareTo (t2));
+		AssertEquals ("A8", -1, TimeSpan.Compare (TimeSpan.MinValue, TimeSpan.MaxValue));
+
+		AssertEquals ("A9", 1, TimeSpan.Zero.CompareTo (null));
+		
+		try
+		{
+			res = TimeSpan.Zero.CompareTo("");
+			exception = false;	
+		}
+		catch (ArgumentException)
+		{
+			exception = true;
+		}
+		Assert ("A10", exception);
+
+		AssertEquals ("A11", false, t1 == t2);
+		AssertEquals ("A12", false, t1 > t2);
+		AssertEquals ("A13", false, t1 >= t2);
+		AssertEquals ("A14", true, t1 != t2);
+		AssertEquals ("A15", true, t1 < t2);
+		AssertEquals ("A16", true, t1 <= t2);
+	}
+
+	public void TestNegateAndDuration ()
+	{
+		TimeSpan t1;
+		bool exception;
+
+		AssertEquals ("A1", "-00:00:00.0012345", new TimeSpan (12345).Negate ().ToString ());
+		AssertEquals ("A2", "00:00:00.0012345", new TimeSpan (-12345).Duration ().ToString ());
+			
+		try
+		{
+			t1 = TimeSpan.MinValue.Negate ();
+			exception = false;
+		}
+		catch (OverflowException)
+		{
+			exception = true;
+		}
+		Assert ("A3", exception);
+
+		try
+		{
+			t1 = TimeSpan.MinValue.Duration ();
+			exception = false;
+		}
+		catch (OverflowException) {
+			exception = true;
+		}
+		Assert ("A4", exception);
+
+		AssertEquals ("A5", "-00:00:00.0000077", (-(new TimeSpan (77))).ToString ());
+		AssertEquals("A6", "00:00:00.0000077", (+(new TimeSpan(77))).ToString());
+	}
+
+	public void TestEquals ()
+	{
+		TimeSpan t1 = new TimeSpan (1);
+		TimeSpan t2 = new TimeSpan (2);
+		string s = "justastring";
+
+		AssertEquals ("A1", true, t1.Equals (t1));
+		AssertEquals ("A2", false, t1.Equals (t2));
+		AssertEquals ("A3", false, t1.Equals (s));
+		AssertEquals ("A4", false, t1.Equals (null));
+		AssertEquals ("A5", true, TimeSpan.Equals (t1, t1));
+		AssertEquals ("A6", false, TimeSpan.Equals (t1, t2));
+		AssertEquals ("A7", false, TimeSpan.Equals (t1, null));
+		AssertEquals ("A8", false, TimeSpan.Equals (t1, s));
+		AssertEquals ("A9", false, TimeSpan.Equals (s, t2));
+		AssertEquals ("A10", true, TimeSpan.Equals (null,null));
+	}
+
+	public void TestFromXXXX ()
+	{
+		AssertEquals ("A1", "12.08:16:48", TimeSpan.FromDays (12.345).ToString ());
+		AssertEquals ("A2", "12:20:42", TimeSpan.FromHours (12.345).ToString ());
+		AssertEquals ("A3", "00:12:20.7000000", TimeSpan.FromMinutes (12.345).ToString ());
+		AssertEquals ("A4", "00:00:12.3450000", TimeSpan.FromSeconds (12.345).ToString ());
+		AssertEquals ("A5", "00:00:00.0120000", TimeSpan.FromMilliseconds (12.345).ToString ());
+		AssertEquals ("A6", "00:00:00.0012345", TimeSpan.FromTicks (12345).ToString ());
+	}
+
+	public void TestGetHashCode ()
+	{
+		AssertEquals ("A1", 77, new TimeSpan (77).GetHashCode ());
+	}
+
+	private void TestParseHelper (string s, bool expectFormat, bool expectOverflow, string expect)
+	{
+		bool formatException = false;
+		bool overflowException = false;
+		string result = "junk ";
+
+		try {
+			result =  TimeSpan.Parse (s).ToString ();
+		}
+		catch (OverflowException) {
+			overflowException = true;
+		}
+		catch (FormatException) {
+			formatException = true;
+		}
+		AssertEquals ("A1", expectFormat, formatException);
+		AssertEquals ("A2", expectOverflow, overflowException);
+
+		if (!expectOverflow && !expectFormat) {
+			AssertEquals ("A3", expect, result);
+		}
+	}
+
+	public void TestParse ()
+	{
+		TestParseHelper (" 13:45:15 ",false, false, "13:45:15");
+		TestParseHelper (" -1:2:3 ", false, false, "-01:02:03");
+
+		TestParseHelper (" 25:0:0 ",false, true, "dontcare");
+		TestParseHelper ("aaa", true, false, "dontcare");
+
+		TestParseHelper ("-21.23:59:59.9999999", false, false, "-21.23:59:59.9999999");
+
+		TestParseHelper ("100000000000000.1:1:1", false, true, "dontcare");
+		TestParseHelper ("24:60:60", false, true, "dontcare");
+		TestParseHelper ("0001:0002:0003.12     ", false, false, "01:02:03.1200000");
+
+		TestParseHelper (" 1:2:3:12345678 ", true, false, "dontcare"); 
+	}
+
+	public void TestSubstract ()
+	{
+		TimeSpan t1 = new TimeSpan (2,3,4,5,6);
+		TimeSpan t2 = new TimeSpan (1,2,3,4,5);
+		TimeSpan t3 = t1 - t2;
+		TimeSpan t4 = t1.Subtract (t2);
+		TimeSpan t5;
+		bool exception;
+
+		AssertEquals ("A1", "1.01:01:01.0010000", t3.ToString ());
+		AssertEquals ("A2", "1.01:01:01.0010000", t4.ToString ());
+		try {
+			t5 = TimeSpan.MinValue - new TimeSpan (1);
+			exception = false;
+		}
+		catch (OverflowException) {
+			exception = true;
+		}
+		Assert ("A3", exception);
+	}
+
+	public void TestToString () 
+	{
+		TimeSpan t1 = new TimeSpan (1,2,3,4,5);
+		TimeSpan t2 = -t1;
+		
+		AssertEquals ("A1", "1.02:03:04.0050000", t1.ToString ());
+		AssertEquals ("A2", "-1.02:03:04.0050000", t2.ToString ());
+		AssertEquals ("A3", "10675199.02:48:05.4775807", TimeSpan.MaxValue.ToString ());
+		AssertEquals ("A4", "-10675199.02:48:05.4775808", TimeSpan.MinValue.ToString ());
+	}
+
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/TimeZoneTest.cs b/mcs/class/corlib/Test/System/TimeZoneTest.cs
new file mode 100644
index 00000000000..c4440d3fee9
--- /dev/null
+++ b/mcs/class/corlib/Test/System/TimeZoneTest.cs
@@ -0,0 +1,74 @@
+//

+// TimeZoneTest.cs - NUnit Test Cases for the System.TimeZone struct

+//

+// author:

+//   Martin Baulig (martin@gnome.org)

+//

+//   (C) 2002 Martin Baulig

+//

+

+using NUnit.Framework;

+using System;

+using System.Threading;

+using System.Globalization;

+

+namespace MonoTests.System

+{

+

+public class TimeZoneTest : TestCase

+{

+	private CultureInfo oldcult;

+

+	public TimeZoneTest() : base ("MonoTests.System.TimeZoneTest testcase") {}

+        public TimeZoneTest (string name): base(name) {}

+

+	public static ITest Suite

+	{

+		get {

+			return new TestSuite (typeof(TimeZoneTest));

+		}

+	}

+

+	protected override void SetUp ()

+	{

+		oldcult = Thread.CurrentThread.CurrentCulture;

+

+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("");

+

+	}

+	

+	protected override void TearDown ()

+	{

+		Thread.CurrentThread.CurrentCulture = oldcult;

+	}

+

+	public void TestCtors ()

+	{

+		TimeZone t1 = TimeZone.CurrentTimeZone;

+		AssertEquals("A01", "CET", t1.StandardName);

+		AssertEquals("A02", "CEST", t1.DaylightName);

+

+		DaylightTime d1 = t1.GetDaylightChanges (2002);

+		AssertEquals("A03", "03/31/2002 01:00:00", d1.Start.ToString ("G"));

+		AssertEquals("A04", "10/27/2002 01:00:00", d1.End.ToString ("G"));

+		AssertEquals("A05", 36000000000L, d1.Delta.Ticks);

+

+		DaylightTime d2 = t1.GetDaylightChanges (1996);

+		AssertEquals("A06", "03/31/1996 01:00:00", d2.Start.ToString ("G"));

+		AssertEquals("A07", "10/27/1996 01:00:00", d2.End.ToString ("G"));

+		AssertEquals("A08", 36000000000L, d2.Delta.Ticks);

+

+		DateTime d3 = new DateTime (2002,2,25);

+		AssertEquals("A09", false, t1.IsDaylightSavingTime (d3));

+		DateTime d4 = new DateTime (2002,4,2);

+		AssertEquals("A10", true, t1.IsDaylightSavingTime (d4));

+		DateTime d5 = new DateTime (2002,11,4);

+		AssertEquals("A11", false, t1.IsDaylightSavingTime (d5));

+

+		AssertEquals("A12", 36000000000L, t1.GetUtcOffset (d3).Ticks);

+		AssertEquals("A13", 72000000000L, t1.GetUtcOffset (d4).Ticks);

+		AssertEquals("A14", 36000000000L, t1.GetUtcOffset (d5).Ticks);

+        }

+}

+

+}

diff --git a/mcs/class/corlib/Test/System/UInt16Test.cs b/mcs/class/corlib/Test/System/UInt16Test.cs
new file mode 100644
index 00000000000..cc62b30384e
--- /dev/null
+++ b/mcs/class/corlib/Test/System/UInt16Test.cs
@@ -0,0 +1,194 @@
+// UInt16Test.cs - NUnit Test Cases for the System.UInt16 struct
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using NUnit.Framework;
+using System;
+using System.Threading;
+using System.Globalization;
+
+namespace MonoTests.System
+{
+
+public class UInt16Test : TestCase
+{
+	private const UInt16 MyUInt16_1 = 42;
+	private const UInt16 MyUInt16_2 = 0;
+	private const UInt16 MyUInt16_3 = 65535;
+	private const string MyString1 = "42";
+	private const string MyString2 = "0";
+	private const string MyString3 = "65535";
+	private string[] Formats1 = {"c", "d", "e", "f", "g", "n", "p", "x" };
+	private string[] Formats2 = {"c5", "d5", "e5", "f5", "g5", "n5", "p5", "x5" };
+	private string[] Results1 = {null,
+				     "0", "0.000000e+000", "0.00",
+				     "0", "0.00", "0.00 %", "0"};
+	private string[] Results2 = {null,
+				     "65535", "6.55350e+004", "65535.00000",
+				     "65535", "65,535.00000", "6,553,500.00000 %", "0ffff"};
+	private string[] ResultsNfi1 = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"0.00",
+					"0", "0.000000e+000", "0.00",
+					"0", "0.00", "0.00 %", "0"};
+	private string[] ResultsNfi2 = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"65,535.00000",
+					"65535", "6.55350e+004", "65535.00000",
+					"65535", "65,535.00000", "6,553,500.00000 %", "0ffff"};
+
+	private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
+	
+	public UInt16Test() : base ("MonoTests.System.UInt16Test testcase") {}

+	public UInt16Test(string name) : base(name) {}
+
+	private CultureInfo old_culture;
+
+	protected override void SetUp() 
+	{
+		old_culture = Thread.CurrentThread.CurrentCulture;
+
+		// Set culture to en-US and don't let the user override.
+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US", false);
+
+		Results1 [0] = NumberFormatInfo.CurrentInfo.CurrencySymbol+"0.00";
+		Results2 [0] = NumberFormatInfo.CurrentInfo.CurrencySymbol+"65,535.00000";
+	}
+
+	protected override void TearDown()
+	{
+		Thread.CurrentThread.CurrentCulture = old_culture;
+	}
+
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(UInt16Test)); 
+		}
+	}
+    
+	public void TestMinMax()
+	{
+		
+		AssertEquals(UInt16.MinValue, MyUInt16_2);
+		AssertEquals(UInt16.MaxValue, MyUInt16_3);
+	}
+	
+	public void TestCompareTo()
+	{
+		Assert(MyUInt16_3.CompareTo(MyUInt16_2) > 0);
+		Assert(MyUInt16_2.CompareTo(MyUInt16_2) == 0);
+		Assert(MyUInt16_1.CompareTo((UInt16)(42)) == 0);
+		Assert(MyUInt16_2.CompareTo(MyUInt16_3) < 0);
+		try {
+			MyUInt16_2.CompareTo(100);
+			Fail("Should raise a System.ArgumentException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentException) == e.GetType());
+		}
+	}
+
+	public void TestEquals()
+	{
+		Assert(MyUInt16_1.Equals(MyUInt16_1));
+		Assert(MyUInt16_1.Equals((UInt16)(42)));
+		Assert(MyUInt16_1.Equals((SByte)(42)) == false);
+		Assert(MyUInt16_1.Equals(MyUInt16_2) == false);
+	}
+	
+	public void TestGetHashCode()
+	{
+		try {
+			MyUInt16_1.GetHashCode();
+			MyUInt16_2.GetHashCode();
+			MyUInt16_3.GetHashCode();
+		}
+		catch {
+			Fail("GetHashCode should not raise an exception here");
+		}
+	}
+	
+	public void TestParse()
+	{
+		//test Parse(string s)
+		Assert(MyUInt16_1 == UInt16.Parse(MyString1));
+		Assert(MyUInt16_2 == UInt16.Parse(MyString2));
+		Assert(MyUInt16_3 == UInt16.Parse(MyString3));
+		try {
+			UInt16.Parse(null);
+			Fail("Should raise a System.ArgumentNullException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentNullException) == e.GetType());
+		}
+		try {
+			UInt16.Parse("not-a-number");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		try {
+			int OverInt = UInt16.MaxValue + 1;
+			UInt16.Parse(OverInt.ToString());
+			Fail("Should raise a System.OverflowException");
+		}
+		catch (Exception e) {
+			Assert(typeof(OverflowException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style)
+		Assert(42 == UInt16.Parse(" "+NumberFormatInfo.CurrentInfo.CurrencySymbol+"42 ", NumberStyles.Currency));
+		try {
+			UInt16.Parse("$42", NumberStyles.Integer);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, IFormatProvider provider)
+		Assert(42 == UInt16.Parse(" 42 ", Nfi));
+		try {
+			UInt16.Parse("%42", Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style, IFormatProvider provider)
+		Assert(16 == UInt16.Parse(" 10 ", NumberStyles.HexNumber, Nfi));
+		try {
+			UInt16.Parse("$42", NumberStyles.Integer, Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+	}
+	
+	public void TestToString()
+	{
+		//test ToString()
+		AssertEquals("A1", MyString1, MyUInt16_1.ToString());
+		AssertEquals("A2", MyString2, MyUInt16_2.ToString());
+		AssertEquals("A3", MyString3, MyUInt16_3.ToString());
+		//test ToString(string format)
+		for (int i=0; i < Formats1.Length; i++) {
+			AssertEquals("A4:"+i.ToString(), Results1[i], MyUInt16_2.ToString(Formats1[i]));
+			AssertEquals("A5:"+i.ToString(), Results2[i], MyUInt16_3.ToString(Formats2[i]));
+		}
+		//test ToString(string format, IFormatProvider provider);
+		for (int i=0; i < Formats1.Length; i++) {
+			AssertEquals("A6:"+i.ToString(), ResultsNfi1[i], MyUInt16_2.ToString(Formats1[i], Nfi));
+			AssertEquals("A7:"+i.ToString(), ResultsNfi2[i], MyUInt16_3.ToString(Formats2[i], Nfi));
+		}
+		try {
+			MyUInt16_1.ToString("z");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert("A8", typeof(FormatException) == e.GetType());
+		}
+	}
+}
+
+
+}
diff --git a/mcs/class/corlib/Test/System/UInt32Test.cs b/mcs/class/corlib/Test/System/UInt32Test.cs
new file mode 100644
index 00000000000..da64ebd7087
--- /dev/null
+++ b/mcs/class/corlib/Test/System/UInt32Test.cs
@@ -0,0 +1,236 @@
+// UInt32Test.cs - NUnit Test Cases for the System.UInt32 struct
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using NUnit.Framework;
+using System;
+using System.Globalization;
+using System.Threading;
+
+namespace MonoTests.System
+{
+
+public class UInt32Test : TestCase
+{
+	private const UInt32 MyUInt32_1 = 42;
+	private const UInt32 MyUInt32_2 = 0;
+	private const UInt32 MyUInt32_3 = 4294967295;
+	private const string MyString1 = "42";
+	private const string MyString2 = "0";
+	private const string MyString3 = "4294967295";
+	private string[] Formats1 = {"c", "d", "e", "f", "g", "n", "p", "x" };
+	private string[] Formats2 = {"c5", "d5", "e5", "f5", "g5", "n5", "p5", "x5" };
+	private string[] Results1 = {"",
+					"0", "0.000000e+000", "0.00",
+					"0", "0.00", "0.00 %", "0"};
+	private string[] ResultsNfi1 = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"0.00",
+					"0", "0.000000e+000", "0.00",
+					"0", "0.00", "0.00 %", "0"};
+	private string[] Results2 = {"",
+					"4294967295", "4.29497e+009", "4294967295.00000",
+					"4.295e+09", "4,294,967,295.00000", "429,496,729,500.00000 %", "ffffffff"};
+	private string[] ResultsNfi2 = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"4,294,967,295.00000",
+					"4294967295", "4.29497e+009", "4294967295.00000",
+					"4.295e+09", "4,294,967,295.00000", "429,496,729,500.00000 %", "ffffffff"};
+	private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
+	
+	public UInt32Test() : base ("MonoTests.System.UInt32Test testcase") {}

+	public UInt32Test(string name) : base(name) {}
+
+	private CultureInfo old_culture;
+
+	protected override void SetUp() 
+	{
+		old_culture = Thread.CurrentThread.CurrentCulture;
+
+		// Set culture to en-US and don't let the user override.
+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US", false);
+
+		// We can't initialize this until we set the culture.
+		Results1 [0] = NumberFormatInfo.CurrentInfo.CurrencySymbol+"0.00";
+		Results2 [0] = NumberFormatInfo.CurrentInfo.CurrencySymbol+"4,294,967,295.00000";
+	}
+
+	protected override void TearDown()
+	{
+		Thread.CurrentThread.CurrentCulture = old_culture;
+	}
+
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(UInt32Test)); 
+		}
+	}
+    
+	public void TestMinMax()
+	{
+		
+		AssertEquals(UInt32.MinValue, MyUInt32_2);
+		AssertEquals(UInt32.MaxValue, MyUInt32_3);
+	}
+	
+	public void TestCompareTo()
+	{
+		Assert(MyUInt32_3.CompareTo(MyUInt32_2) > 0);
+		Assert(MyUInt32_2.CompareTo(MyUInt32_2) == 0);
+		Assert(MyUInt32_1.CompareTo((UInt32)(42)) == 0);
+		Assert(MyUInt32_2.CompareTo(MyUInt32_3) < 0);
+		Assert (1 == UInt32.Parse ("1"));
+		Assert (1 == UInt32.Parse (" 1"));
+		Assert (1 == UInt32.Parse ("     1"));
+		Assert (1 == UInt32.Parse ("1    "));
+		Assert (1 == UInt32.Parse ("+1"));
+
+		try {
+			UInt32.Parse (" + 1 ");
+			Fail ("Should raise FormatException1");
+		} catch (Exception e){
+			Assert (typeof (FormatException) == e.GetType ());
+		}
+
+		try {
+			UInt32.Parse (" + ");
+			Fail ("Should raise FormatException");
+		} catch (Exception e){
+			Assert (typeof (FormatException) == e.GetType ());
+		}
+		try {
+			MyUInt32_2.CompareTo((Int16)100);
+			Fail("Should raise a System.ArgumentException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentException) == e.GetType());
+		}
+	}
+
+	public void TestEquals()
+	{
+		Assert(MyUInt32_1.Equals(MyUInt32_1));
+		Assert(MyUInt32_1.Equals((UInt32)(42)));
+		Assert(MyUInt32_1.Equals((SByte)(42)) == false);
+		Assert(MyUInt32_1.Equals(MyUInt32_2) == false);
+	}
+	
+	public void TestGetHashCode()
+	{
+		try {
+			MyUInt32_1.GetHashCode();
+			MyUInt32_2.GetHashCode();
+			MyUInt32_3.GetHashCode();
+		}
+		catch {
+			Fail("GetHashCode should not raise an exception here");
+		}
+	}
+	
+	public void TestParse()
+	{
+		//test Parse(string s)
+		Assert("Parse problem on \""+MyString1+"\"", MyUInt32_1 == UInt32.Parse(MyString1));
+		Assert("Parse problem on \""+MyString2+"\"", MyUInt32_2 == UInt32.Parse(MyString2));
+		Assert("Parse problem on \""+MyString3+"\"", MyUInt32_3 == UInt32.Parse(MyString3));
+		try {
+			UInt32.Parse(null);
+			Fail("Should raise a System.ArgumentNullException");
+		}
+		catch (Exception e) {
+			Assert("Did not get ArgumentNullException type", typeof(ArgumentNullException) == e.GetType());
+		}
+		try {
+			UInt32.Parse("not-a-number");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert("Did not get FormatException type", typeof(FormatException) == e.GetType());
+		}
+		try {
+			// TODO: Use this after ToString() is completed. For now, hard code string that generates
+			// exception.
+			//double OverInt = (double)UInt32.MaxValue + 1;
+			//UInt32.Parse(OverInt.ToString());
+			UInt32.Parse("4294967296");
+			Fail("Should raise a System.OverflowException");
+		}
+		catch (Exception e) {
+			Assert("Did not get OverflowException type on '"+"4294967296"+"'. Instead, got: '"+e.GetType()+"'", typeof(OverflowException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style)
+		Assert(42 == UInt32.Parse(" "+NumberFormatInfo.CurrentInfo.CurrencySymbol+"42 ", NumberStyles.Currency));
+		try {
+			UInt32.Parse("$42", NumberStyles.Integer);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, IFormatProvider provider)
+		Assert(42 == UInt32.Parse(" 42 ", Nfi));
+		try {
+			UInt32.Parse("%42", Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style, IFormatProvider provider)
+		Assert(16 == UInt32.Parse(" 10 ", NumberStyles.HexNumber, Nfi));
+		try {
+			UInt32.Parse("$42", NumberStyles.Integer, Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+	}
+	
+	public void TestToString()
+	{
+		int TestNumber = 1;
+		try {
+			//test ToString()
+			AssertEquals(MyString1, MyUInt32_1.ToString());
+			TestNumber++;
+			AssertEquals(MyString2, MyUInt32_2.ToString());
+			TestNumber++;
+			AssertEquals(MyString3, MyUInt32_3.ToString());
+		} catch (Exception e) {
+			Fail("TestToString: Failed on TestNumber=" + TestNumber 
+				+ " with exception: " + e.ToString());
+		}
+
+		//test ToString(string format)
+		for (int i=0; i < Formats1.Length; i++) {
+			try {
+				AssertEquals(Results1[i], MyUInt32_2.ToString(Formats1[i]));
+			} catch (Exception e) {
+				Fail("TestToString: MyUInt32_2.ToString(Formats1[i]) i=" + i 
+					+ ". e = " + e.ToString());
+			}
+
+			try {
+				AssertEquals(Results2[i], MyUInt32_3.ToString(Formats2[i]));
+			} catch (Exception e) {
+				Fail("TestToString: MyUInt32_3.ToString(Formats2[i]) i=" + i
+					+ ". e = " + e.ToString());
+			}
+		}
+		//test ToString(string format, IFormatProvider provider);
+		for (int i=0; i < Formats1.Length; i++) {
+			AssertEquals(ResultsNfi1[i], MyUInt32_2.ToString(Formats1[i], Nfi));
+			AssertEquals(ResultsNfi2[i], MyUInt32_3.ToString(Formats2[i], Nfi));
+		}
+		try {
+			MyUInt32_1.ToString("z");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+	}
+}
+
+
+}
diff --git a/mcs/class/corlib/Test/System/UInt64Test.cs b/mcs/class/corlib/Test/System/UInt64Test.cs
new file mode 100644
index 00000000000..b1c2dac65f2
--- /dev/null
+++ b/mcs/class/corlib/Test/System/UInt64Test.cs
@@ -0,0 +1,204 @@
+// UInt64Test.cs - NUnit Test Cases for the System.UInt64 struct
+//
+// Mario Martinez (mariom925@home.om)
+//
+// (C) Ximian, Inc.  http://www.ximian.com
+// 
+
+using NUnit.Framework;
+using System;
+using System.Globalization;
+using System.Threading;
+
+namespace MonoTests.System
+{
+
+public class UInt64Test : TestCase
+{
+	private const UInt64 MyUInt64_1 = 42;
+	private const UInt64 MyUInt64_2 = 0;
+	private const UInt64 MyUInt64_3 = 18446744073709551615;
+	private const string MyString1 = "42";
+	private const string MyString2 = "0";
+	private const string MyString3 = "18446744073709551615";
+	private string[] Formats1 = {"c", "d", "e", "f", "g", "n", "p", "x" };
+	private string[] Formats2 = {"c5", "d5", "e5", "f5", "g5", "n5", "p5", "x5" };
+	private string[] Results1 = {"",
+					"0", "0.000000e+000", "0.00",
+					"0", "0.00", "0.00 %", "0"};
+	private string[] ResultsNfi1 = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"0.00",
+					"0", "0.000000e+000", "0.00",
+					"0", "0.00", "0.00 %", "0"};
+	private string[] Results2 = {"",
+					"18446744073709551615", "1.84467e+019", "18446744073709551615.00000",
+					"1.8447e+19", "18,446,744,073,709,551,615.00000",
+					"1,844,674,407,370,955,161,500.00000 %", "ffffffffffffffff"};
+	private string[] ResultsNfi2 = {NumberFormatInfo.InvariantInfo.CurrencySymbol+"18,446,744,073,709,551,615.00000",
+					"18446744073709551615", "1.84467e+019", "18446744073709551615.00000",
+					"1.8447e+19", "18,446,744,073,709,551,615.00000",
+					"1,844,674,407,370,955,161,500.00000 %", "ffffffffffffffff"};
+
+	private NumberFormatInfo Nfi = NumberFormatInfo.InvariantInfo;
+	
+	public UInt64Test() : base ("MonoTests.System.UInt64Test testcase") {}

+	public UInt64Test(string name) : base(name) {}
+
+	private CultureInfo old_culture;
+
+	protected override void SetUp() 
+	{
+		old_culture = Thread.CurrentThread.CurrentCulture;
+
+		// Set culture to en-US and don't let the user override.
+		Thread.CurrentThread.CurrentCulture = new CultureInfo ("en-US", false);
+
+		// We can't initialize this until we set the culture.
+		Results1 [0] = NumberFormatInfo.CurrentInfo.CurrencySymbol+"0.00";
+		Results2 [0] = NumberFormatInfo.CurrentInfo.CurrencySymbol+"18,446,744,073,709,551,615.00000";
+	}
+
+	protected override void TearDown()
+	{
+		Thread.CurrentThread.CurrentCulture = old_culture;
+	}
+
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof(UInt64Test)); 
+		}
+	}
+    
+	public void TestMinMax()
+	{
+		
+		AssertEquals(UInt64.MinValue, MyUInt64_2);
+		AssertEquals(UInt64.MaxValue, MyUInt64_3);
+	}
+	
+	public void TestCompareTo()
+	{
+		Assert(MyUInt64_3.CompareTo(MyUInt64_2) > 0);
+		Assert(MyUInt64_2.CompareTo(MyUInt64_2) == 0);
+		Assert(MyUInt64_1.CompareTo((UInt64)(42)) == 0);
+		Assert(MyUInt64_2.CompareTo(MyUInt64_3) < 0);
+		try {
+			MyUInt64_2.CompareTo((Int16)100);
+			Fail("Should raise a System.ArgumentException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentException) == e.GetType());
+		}
+	}
+
+	public void TestEquals()
+	{
+		Assert(MyUInt64_1.Equals(MyUInt64_1));
+		Assert(MyUInt64_1.Equals((UInt64)(42)));
+		Assert(MyUInt64_1.Equals((SByte)(42)) == false);
+		Assert(MyUInt64_1.Equals(MyUInt64_2) == false);
+	}
+	
+	public void TestGetHashCode()
+	{
+		try {
+			MyUInt64_1.GetHashCode();
+			MyUInt64_2.GetHashCode();
+			MyUInt64_3.GetHashCode();
+		}
+		catch {
+			Fail("GetHashCode should not raise an exception here");
+		}
+	}
+	
+	public void TestParse()
+	{
+		//test Parse(string s)
+		Assert(MyUInt64_1 == UInt64.Parse(MyString1));
+		Assert(MyUInt64_2 == UInt64.Parse(MyString2));
+		Assert(MyUInt64_3 == UInt64.Parse(MyString3));
+		try {
+			UInt64.Parse(null);
+			Fail("Should raise a ArgumentNullException");
+		}
+		catch (Exception e) {
+			Assert(typeof(ArgumentNullException) == e.GetType());
+		}
+		try {
+			UInt64.Parse("not-a-number");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style)
+		try {
+			double OverInt = (double)UInt64.MaxValue + 1;
+			UInt64.Parse(OverInt.ToString(), NumberStyles.Float);
+			Fail("Should raise a OverflowException");
+		}
+		catch (Exception e) {
+			Assert(typeof(OverflowException) == e.GetType());
+		}
+		try {
+			double OverInt = (double)UInt64.MaxValue + 1;
+			UInt64.Parse(OverInt.ToString(), NumberStyles.Integer);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		Assert(42 == UInt64.Parse(" "+NumberFormatInfo.CurrentInfo.CurrencySymbol+"42 ", NumberStyles.Currency));
+		try {
+			UInt64.Parse("$42", NumberStyles.Integer);
+			Fail("Should raise a FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, IFormatProvider provider)
+		Assert(42 == UInt64.Parse(" 42 ", Nfi));
+		try {
+			UInt64.Parse("%42", Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+		//test Parse(string s, NumberStyles style, IFormatProvider provider)
+		Assert(16 == UInt64.Parse(" 10 ", NumberStyles.HexNumber, Nfi));
+		try {
+			UInt64.Parse("$42", NumberStyles.Integer, Nfi);
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+	}
+	
+	public void TestToString()
+	{
+		//test ToString()
+		AssertEquals(MyString1, MyUInt64_1.ToString());
+		AssertEquals(MyString2, MyUInt64_2.ToString());
+		AssertEquals(MyString3, MyUInt64_3.ToString());
+		//test ToString(string format)
+		for (int i=0; i < Formats1.Length; i++) {
+			AssertEquals(Results1[i], MyUInt64_2.ToString(Formats1[i]));
+			AssertEquals(Results2[i], MyUInt64_3.ToString(Formats2[i]));
+		}
+		//test ToString(string format, IFormatProvider provider);
+		for (int i=0; i < Formats1.Length; i++) {
+			AssertEquals(ResultsNfi1[i], MyUInt64_2.ToString(Formats1[i], Nfi));
+			AssertEquals(ResultsNfi2[i], MyUInt64_3.ToString(Formats2[i], Nfi));
+		}
+		try {
+			MyUInt64_1.ToString("z");
+			Fail("Should raise a System.FormatException");
+		}
+		catch (Exception e) {
+			Assert(typeof(FormatException) == e.GetType());
+		}
+	}
+}
+
+}
diff --git a/mcs/class/corlib/Test/System/VersionTest.cs b/mcs/class/corlib/Test/System/VersionTest.cs
new file mode 100644
index 00000000000..32f4c17d6e5
--- /dev/null
+++ b/mcs/class/corlib/Test/System/VersionTest.cs
@@ -0,0 +1,244 @@
+//
+// VersionTest.cs - NUnit Test Cases for the System.Version class
+//
+// author:
+//   Duco Fijma (duco@lorentz.xs4all.nl)
+//
+//   (C) 2002 Duco Fijma
+//
+
+using NUnit.Framework;
+using System;
+
+namespace MonoTests.System
+{
+
+public class VersionTest : TestCase
+{
+	public VersionTest () : base ("MonoTests.System.VersionTest testcase") {}
+        public VersionTest (string name) : base (name) {}
+
+	public static ITest Suite {
+		get {
+			return new TestSuite (typeof (VersionTest));
+		}
+	}
+
+
+	public void TestCtors ()
+	{
+		Version v1;
+		bool exception;
+		
+		/*
+		v1 = new Version ();
+		AssertEquals ("A1", 0, v1.Major);
+		AssertEquals ("A2", 0, v1.Minor);
+		AssertEquals ("A3", -1, v1.Build);
+		AssertEquals ("A4", -1, v1.Revision);
+	*/
+
+		v1 = new Version (23, 7);
+		AssertEquals ("A5", 23, v1.Major);
+		AssertEquals ("A6", 7, v1.Minor);
+		AssertEquals ("A7", -1, v1.Build);
+		AssertEquals ("A8", -1, v1.Revision);
+
+		v1 = new Version (23, 7, 99);
+		AssertEquals ("A9", 23, v1.Major);
+		AssertEquals ("A10", 7, v1.Minor);
+		AssertEquals ("A11", 99, v1.Build);
+		AssertEquals ("A12", -1, v1.Revision);
+
+		v1 = new Version (23, 7, 99, 42);
+		AssertEquals ("A13", 23, v1.Major);
+		AssertEquals ("A14", 7, v1.Minor);
+		AssertEquals ("A15", 99, v1.Build);
+		AssertEquals ("A16", 42, v1.Revision);
+		
+		try {	
+			v1 = new Version (23, -1);
+			exception = false;
+		}
+		catch (ArgumentOutOfRangeException) {
+			exception = true;
+		}
+		Assert ("A17", exception);
+
+		try {	
+			v1 = new Version (23, 7, -1);
+			exception = false;
+		}
+		catch (ArgumentOutOfRangeException) {
+			exception = true;
+		}
+		Assert ("A18", exception);
+
+		try {	
+			v1 = new Version (23, 7, 99, -1);
+			exception = false;
+		}
+		catch (ArgumentOutOfRangeException) {
+			exception = true;
+		}
+		Assert ("A19", exception);
+		
+	}
+
+	public void TestStringCtor () 
+	{
+		Version v1;
+		bool exception;
+		
+		v1 = new Version("1.42.79");
+		AssertEquals ("A1", 1, v1.Major);
+		AssertEquals ("A2", 42, v1.Minor);
+		AssertEquals ("A3", 79, v1.Build);
+		AssertEquals ("A4", -1, v1.Revision);
+		
+
+		try {	
+			v1 = new Version ("1.42.-79");
+			exception = false;
+		}
+		catch (ArgumentOutOfRangeException) {
+			exception = true;
+		}
+		Assert ("A5", exception);
+
+		try {	
+			v1 = new Version ("1");
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		}
+		Assert ("A6", exception);
+
+		try {	
+			v1 = new Version ("1.2.3.4.5");
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		}
+		Assert ("A7", exception);
+
+		try {	
+			v1 = new Version ((string) null);
+			exception = false;
+		}
+		catch (ArgumentNullException) {
+			exception = true;
+		}
+		Assert ("A6", exception);
+
+
+	}
+
+	public void TestClone () 
+	{
+		Version v1 = new Version (1, 2, 3, 4);
+		Version v2 = (Version) v1.Clone ();
+
+		Assert ("A1", v1.Equals (v2));
+		Assert ("A2", !ReferenceEquals (v1, v2));
+	}
+
+	public void TestCompareTo ()
+	{
+		Assert ("A1", new Version (1, 2).CompareTo (new Version (1, 1)) > 0);
+		Assert ("A2", new Version (1, 2, 3).CompareTo (new Version (2, 2, 3)) < 0);
+		Assert ("A3", new Version (1, 2, 3, 4).CompareTo (new Version (1, 2, 2, 1)) > 0);
+
+		Assert ("A4", new Version (1, 3).CompareTo (new Version (1, 2, 2, 1)) > 0);
+		Assert ("A5", new Version (1, 2, 2).CompareTo (new Version (1, 2, 2, 1)) < 0);
+
+		Assert ("A6", new Version (1, 2).CompareTo (new Version (1, 2)) == 0);
+		Assert ("A7", new Version (1, 2, 3).CompareTo (new Version (1, 2, 3)) == 0);
+
+		Assert ("A8", new Version (1, 1) < new Version (1, 2));
+		Assert ("A9", new Version (1, 2) <= new Version (1, 2));
+		Assert ("A10", new Version (1, 2) <= new Version (1, 3));
+		Assert ("A11", new Version (1, 2) >= new Version (1, 2));
+		Assert ("A12", new Version (1, 3) >= new Version (1, 2));
+		Assert ("A13", new Version (1, 3) > new Version (1, 2));
+
+		Version v1 = new Version(1, 2);
+		bool exception;
+
+		// LAMESPEC: Docs say this should throw a ArgumentNullException,
+		// but it simply works. Seems any version is subsequent to null
+		Assert ("A14:", v1.CompareTo (null) > 0);
+
+		try {
+			v1.CompareTo ("A string is not a version");
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		}
+		Assert ("A15", exception);
+		
+	}
+	
+
+	public void TestEquals ()
+	{
+		Version v1 = new Version (1, 2);
+		Version v2 = new Version (1, 2, 3, 4);
+		Version v3 = new Version (1, 2, 3, 4);
+
+		AssertEquals ("A1", true, v2.Equals (v3));
+		AssertEquals ("A2", true, v2.Equals (v2));
+		AssertEquals ("A3", false, v1.Equals (v3));
+
+		AssertEquals ("A4", true, v2 == v3);
+		AssertEquals ("A5", true, v2 == v2);
+		AssertEquals ("A6", false, v1 == v3);
+
+		AssertEquals ("A7", false, v2.Equals ((Version) null));
+		AssertEquals ("A8", false, v2.Equals ("A string"));
+		
+	}
+
+	public void TestToString ()
+	{
+		Version v1 = new Version (1,2);
+		Version v2 = new Version (1,2,3);
+		Version v3 = new Version (1,2,3,4);
+		
+		AssertEquals ("A1", "1.2", v1.ToString ());
+		AssertEquals ("A2", "1.2.3", v2.ToString ());
+		AssertEquals ("A3", "1.2.3.4", v3.ToString ());
+
+		AssertEquals ("A4", "" , v3.ToString (0));
+		AssertEquals ("A5", "1" , v3.ToString (1));
+		AssertEquals ("A6", "1.2" , v3.ToString (2));
+		AssertEquals ("A7", "1.2.3" , v3.ToString (3));
+		AssertEquals ("A8", "1.2.3.4" , v3.ToString (4));
+
+		bool exception;
+
+		try {
+			v2.ToString (4);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		}
+		Assert ("A9", exception);
+
+		try {
+			v3.ToString (42);
+			exception = false;
+		}
+		catch (ArgumentException) {
+			exception = true;
+		}
+		Assert ("A10", exception);
+	}
+
+}
+
+}
diff --git a/mcs/class/corlib/Test/corlib_linux_test.args b/mcs/class/corlib/Test/corlib_linux_test.args
new file mode 100644
index 00000000000..f8a25ccadfa
--- /dev/null
+++ b/mcs/class/corlib/Test/corlib_linux_test.args
@@ -0,0 +1,85 @@
+--target library
+-o corlib_linux_test.dll
+--noconfig
+-r ../../lib/corlib.dll
+-r ../../lib/System.dll
+-r ../../../nunit/NUnitCore_mono.dll
+System/TimeZoneTest.cs
+System/AllTests.cs
+System/ArrayTest.cs
+System/BitConverterTest.cs
+System/BooleanTest.cs
+System/BufferTest.cs
+System/ByteTest.cs
+System/CharTest.cs
+System/ConsoleTest.cs
+System/DecimalTest.cs
+System/DecimalTest2.cs
+System/DoubleTest.cs
+System/EnumTest.cs
+System/GuidTest.cs
+System/Int16Test.cs
+System/Int32Test.cs
+System/Int64Test.cs
+System/IntegerFormatterTest.cs
+System/ObjectTest.cs
+System/RandomTest.cs
+System/ResolveEventArgsTest.cs
+System/SByteTest.cs
+System/TimeSpanTest.cs
+System/UInt16Test.cs
+System/UInt32Test.cs
+System/UInt64Test.cs
+System/DateTimeTest.cs
+System/StringTest.cs
+System/MathTest.cs
+System/AttributeTest.cs
+System/CharEnumeratorTest.cs
+System/VersionTest.cs
+System/MulticastDelegate.cs
+System/ExceptionTest.cs
+System/ConvertTest.cs
+AllTests.cs
+System.Collections/BitArrayTest.cs
+System.Collections/AllTests.cs
+System.Collections/ArrayListTest.cs
+System.Collections/CaseInsensitiveComparerTest.cs
+System.Collections/CaseInsensitiveHashCodeProviderTest.cs
+System.Collections/ComparerTest.cs
+System.Collections/CollectionBaseTest.cs
+System.Collections/HashtableTest.cs
+System.Collections/StackTest.cs
+System.Collections/QueueTest.cs
+System.Collections/ReadOnlyCollectionBaseTest.cs
+System.Collections/SortedListTest.cs
+System.Diagnostics/AllTests.cs
+System.Diagnostics/DebugTest.cs
+System.Diagnostics/StackFrameTest.cs
+System.Diagnostics/StackTraceTest.cs
+System.Diagnostics/TextWriterTraceListenerTest.cs
+System.IO/PathTest.cs
+System.IO/AllTests.cs
+System.IO/FileTest.cs
+System.IO/MemoryStreamTest.cs
+System.IO/StreamReaderTest.cs
+System.IO/StreamWriterTest.cs
+System.IO/StringReaderTest.cs
+System.IO/StringWriterTest.cs
+System.Resources/AllTests.cs
+System.Resources/ResourceReaderTest.cs
+System.Security.Cryptography/AllTests.cs
+System.Security.Cryptography/AsymmetricAlgorithmTest.cs
+System.Security.Cryptography/RNGCryptoServiceProviderTest.cs
+System.Security.Cryptography/SymmetricAlgorithmTest.cs
+System.Security.Cryptography/FromBase64Transform.cs
+System.Security.Permissions/AllTests.cs
+System.Security.Permissions/FileIOPermissionTest.cs
+System.Text/AllTests.cs
+System.Text/StringBuilderTest.cs
+System.Text/ASCIIEncodingTest.cs
+System.Runtime.Serialization/ObjectIDGeneratorTests.cs
+System.Runtime.Serialization/AllTests.cs
+System.Globalization/AllTests.cs
+System.Globalization/CalendarTest.cs
+System.Security/AllTests.cs
+System.Security/SecurityElementTest.cs
diff --git a/mcs/class/corlib/Test/corlib_test.build b/mcs/class/corlib/Test/corlib_test.build
new file mode 100644
index 00000000000..d0840a32f72
--- /dev/null
+++ b/mcs/class/corlib/Test/corlib_test.build
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+

+<!-- NAnt build file for corlib_test.dll -->

+<!-- Target build (default) builds tests -->

+<!-- Target test runs tests -->

+

+<project name="corlib_test" default="build">

+	<property name="debug" value="true"/>

+	<property name="nunit_home" value="..\..\..\nunit"/>

+

+	<target name="build">

+	</target>

+

+	<target name="assemblies">

+		<csc target="library" output="corlib_linux_test.dll" debug="${debug}">

+			<sources>

+				<includes name="**/*.cs"/>

+				<excludes name="System.Security.Policy/*.cs"/>

+			</sources>

+			<references basedir="..\..\..\nunit">

+				<includes name="NUnitCore_mono.dll"/>

+			</references>

+			<arg value="/r:..\..\lib\corlib.dll"/>

+			<arg value="/r:..\..\lib\System.dll"/>

+			<arg value="/nowarn:1595"/>

+			<arg value="/nostdlib"/> 	<!-- don't reference mscorlib -->

+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->

+		</csc>

+

+		<csc target="library" output="corlib_test.dll" debug="${debug}">

+			<sources>

+				<includes name="**/*.cs"/>

+			</sources>

+			<references basedir="..\..\..\nunit">

+				<includes name="NUnitCore.dll"/>

+			</references>

+			<arg value="/r:corlib_res.dll"/>

+			<arg value="/nowarn:1595"/>

+		</csc>

+

+		<csc target="library" output="corlib_reference.dll" debug="${debug}">

+			<sources>

+				<includes name="**/*.cs"/>

+			</sources>

+			<references basedir="..\..\..\nunit">

+				<includes name="NUnitCore.dll"/>

+			</references>

+			<arg value="/nowarn:1595"/>

+		</csc>

+</target>

+

+

+	<target name="test" depends="assemblies">

+<!-- Do not run the unit tests with mono corlib on ms.net.  With all the icalls the results provide no useful info -->

+<!-- Change this to be "mint NUnitConsole" or "mono NUnitConsole" when those are ready to be run on Windows -->

+<!--		<exec program="..\..\..\nunit\NUnitConsole" commandline="MonoTests.AllTests,corlib_test.dll" failonerror="false"/> -->

+		<exec program="..\..\..\nunit\NUnitConsole" commandline="MonoTests.AllTests,corlib_reference.dll" failonerror="false"/>

+	</target>

+

+	<target name="clean">

+		<delete file="corlib_test.dll" failonerror="false"/>

+		<delete file="corlib_linux_test.dll" failonerror="false"/>

+		<delete file="corlib_reference.dll" failonerror="false"/>

+

+		<delete file="corlib_test.pdb" failonerror="false"/>

+		<delete file="corlib_linux_test.pdb" failonerror="false"/>

+		<delete file="corlib_reference.pdb" failonerror="false"/>

+		

+	</target>

+</project>

diff --git a/mcs/class/corlib/Test/makefile.gnu b/mcs/class/corlib/Test/makefile.gnu
new file mode 100644
index 00000000000..87094415cee
--- /dev/null
+++ b/mcs/class/corlib/Test/makefile.gnu
@@ -0,0 +1,16 @@
+topdir = ../../..
+
+LIBRARY = corlib_linux_test.dll
+
+LIB_LIST = corlib_linux_test.args
+LIB_FLAGS = -r ../../lib/corlib.dll -r ../../lib/System.dll -r ../../lib/NUnitCore_mono.dll
+
+include ../../library.make
+
+MCS_FLAGS = --target library --noconfig
+
+TEST_SUITE_PREFIX = MonoTests.
+TEST_SUITE = AllTests
+
+test: $(LIBRARY)
+	mono ../../../nunit/src/NUnitConsole/NUnitConsole_mono.exe $(TEST_SUITE_PREFIX)$(TEST_SUITE),corlib_linux_test.dll
diff --git a/mcs/class/corlib/Test/resources/AFile.txt b/mcs/class/corlib/Test/resources/AFile.txt
new file mode 100644
index 00000000000..59072cba2d9
--- /dev/null
+++ b/mcs/class/corlib/Test/resources/AFile.txt
@@ -0,0 +1,39 @@
+//

+// Mono.Tests.AllTests.cs

+//

+// Author:

+//      Alexander Klyubin (klyubin@aqris.com)

+//

+// (C) 2001

+//

+

+using System;

+using NUnit.Framework;

+

+namespace MonoTests {

+        /// <summary>

+        ///   Combines all available unit tests into one test suite.

+        /// </summary>

+        public class AllTests : TestCase {

+                public AllTests(string name) : base(name) {}

+                

+                public static ITest Suite 

+                { 

+                        get 

+                        {

+                                TestSuite suite =  new TestSuite();

+                                suite.AddTest(System.AllTests.Suite);

+                                suite.AddTest(System.Collections.AllTests.Suite);

+                                suite.AddTest(System.Security.AllTests.Suite);

+                                suite.AddTest(System.Security.Cryptography.AllTests.Suite);

+                                suite.AddTest(System.IO.AllTests.Suite);

+                                suite.AddTest(System.Net.AllTests.Suite);

+                                suite.AddTest(System.Text.AllTests.Suite);

+                                suite.AddTest(System.Security.Permissions.AllTests.Suite);

+                                suite.AddTest(System.Resources.AllTests.Suite);

+//                                suite.AddTest(System.Security.Policy.AllTests.Suite);

+                                return suite;

+                        }

+                }

+        }

+}

diff --git a/mcs/class/corlib/Test/resources/Empty.resources b/mcs/class/corlib/Test/resources/Empty.resources
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/class/corlib/Test/resources/Empty.resources
diff --git a/mcs/class/corlib/Test/resources/MyResources.resources b/mcs/class/corlib/Test/resources/MyResources.resources
new file mode 100644
index 00000000000..b486e9e5111
--- /dev/null
+++ b/mcs/class/corlib/Test/resources/MyResources.resources
diff --git a/mcs/class/corlib/Unix/Errno.cs b/mcs/class/corlib/Unix/Errno.cs
new file mode 100755
index 00000000000..36c3b4bc698
--- /dev/null
+++ b/mcs/class/corlib/Unix/Errno.cs
@@ -0,0 +1,139 @@
+//
+// Errno.cs: used to provide better information
+//
+
+namespace System.Private {
+
+	internal class Errno {
+
+		internal static string Message (int code)
+		{
+			switch (code){
+			case Wrapper.EPERM:
+				return "No permission";
+			case Wrapper.ENOENT:
+				return "The name does not exist";
+			case Wrapper.EISDIR:
+				return "error: Is a directory";
+			case Wrapper.EBADF:
+				return "Bad file descriptor";
+			case Wrapper.ENOMEM:
+				return "Out of memory";
+			case Wrapper.EEXIST:
+				return "File already exists";
+			case Wrapper.ENOTEMPTY:
+				return "Directory is not empty";
+				
+			case Wrapper.ESRCH:
+			case Wrapper.EINTR:
+			case Wrapper.EIO:
+			case Wrapper.ENXIO:
+			case Wrapper.E2BIG:
+			case Wrapper.ENOEXEC:
+			case Wrapper.ECHILD:
+			case Wrapper.EAGAIN:
+			case Wrapper.EACCES:
+			case Wrapper.EFAULT:
+			case Wrapper.ENOTBLK:
+			case Wrapper.EBUSY:
+			case Wrapper.EXDEV:
+			case Wrapper.ENODEV:
+			case Wrapper.EINVAL:
+			case Wrapper.ENFILE:
+			case Wrapper.EMFILE:
+			case Wrapper.ENOTTY:
+			case Wrapper.ETXTBSY:
+			case Wrapper.EFBIG:
+			case Wrapper.ENOSPC:
+			case Wrapper.ESPIPE:
+			case Wrapper.EROFS:
+			case Wrapper.EMLINK:
+			case Wrapper.EPIPE:
+			case Wrapper.EDOM:
+			case Wrapper.ERANGE:
+			case Wrapper.EDEADLK:
+			case Wrapper.ENAMETOOLONG:
+			case Wrapper.ENOLCK:
+			case Wrapper.ENOSYS:
+			case Wrapper.ELOOP:
+			case Wrapper.ENOMSG:
+			case Wrapper.EIDRM:
+			case Wrapper.ECHRNG:
+			case Wrapper.EL2NSYNC:
+			case Wrapper.EL3HLT:
+			case Wrapper.EL3RST:
+			case Wrapper.ELNRNG:
+			case Wrapper.EUNATCH:
+			case Wrapper.ENOCSI:
+			case Wrapper.EL2HLT:
+			case Wrapper.EBADE:
+			case Wrapper.EBADR:
+			case Wrapper.EXFULL:
+			case Wrapper.ENOANO:
+			case Wrapper.EBADRQC:
+			case Wrapper.EBADSLT:
+			case Wrapper.EBFONT:
+			case Wrapper.ENOSTR:
+			case Wrapper.ENODATA:
+			case Wrapper.ETIME:
+			case Wrapper.ENOSR:
+			case Wrapper.ENONET:
+			case Wrapper.ENOPKG:
+			case Wrapper.EREMOTE:
+			case Wrapper.ENOLINK:
+			case Wrapper.EADV:
+			case Wrapper.ESRMNT:
+			case Wrapper.ECOMM:
+			case Wrapper.EPROTO:
+			case Wrapper.EMULTIHOP:
+			case Wrapper.EDOTDOT:
+			case Wrapper.EBADMSG:
+			case Wrapper.ENOTUNIQ:
+			case Wrapper.EBADFD:
+			case Wrapper.EREMCHG:
+			case Wrapper.ELIBACC:
+			case Wrapper.ELIBBAD:
+			case Wrapper.ELIBSCN:
+			case Wrapper.ELIBMAX:
+			case Wrapper.ELIBEXEC:
+			case Wrapper.EUSERS:
+			case Wrapper.ENOTSOCK:
+			case Wrapper.EDESTADDRREQ:
+			case Wrapper.EMSGSIZE:
+			case Wrapper.EPROTOTYPE:
+			case Wrapper.ENOPROTOOPT:
+			case Wrapper.EPROTONOSUPPORT:
+			case Wrapper.ESOCKTNOSUPPORT:
+			case Wrapper.EOPNOTSUPP:
+			case Wrapper.EPFNOSUPPORT:
+			case Wrapper.EAFNOSUPPORT:
+			case Wrapper.EADDRINUSE:
+			case Wrapper.EADDRNOTAVAIL:
+			case Wrapper.ENETDOWN:
+			case Wrapper.ENETUNREACH:
+			case Wrapper.ENETRESET:
+			case Wrapper.ECONNABORTED:
+			case Wrapper.ECONNRESET:
+			case Wrapper.ENOBUFS:
+			case Wrapper.EISCONN:
+			case Wrapper.ENOTCONN:
+			case Wrapper.ESHUTDOWN:
+			case Wrapper.ETOOMANYREFS:
+			case Wrapper.ETIMEDOUT:
+			case Wrapper.ECONNREFUSED:
+			case Wrapper.EHOSTDOWN:
+			case Wrapper.EHOSTUNREACH:
+			case Wrapper.EALREADY:
+			case Wrapper.EINPROGRESS:
+			case Wrapper.ESTALE:
+			case Wrapper.EDQUOT:
+			case Wrapper.ENOMEDIUM:
+				break;
+				
+			case Wrapper.ENOTDIR:
+				return "Not a directory";
+			}
+			return String.Format ("Errno code={0}", code);
+		}
+	}
+}
diff --git a/mcs/class/corlib/Unix/Wrapper.cs b/mcs/class/corlib/Unix/Wrapper.cs
new file mode 100644
index 00000000000..76512a67223
--- /dev/null
+++ b/mcs/class/corlib/Unix/Wrapper.cs
@@ -0,0 +1,237 @@
+/*
+ * Generated automatically: do not edit this file.
+ */
+
+using System;
+using System.Runtime.InteropServices;
+
+namespace System.Private {
+
+[CLSCompliant(false)]
+public struct stat {
+	public uint st_dev;
+	public uint st_mode;
+	public uint st_nlink;
+	public uint st_uid;
+	public uint st_gid;
+	public long st_size;
+	public uint st_atime;
+	public uint st_mtime;
+	public uint st_ctime;
+};
+
+public class Wrapper {
+
+	public const int SEEK_SET             = 0;
+	public const int SEEK_CUR             = 1;
+	public const int SEEK_END             = 2;
+	public const int O_RDONLY             = 0x00000000;
+	public const int O_WRONLY             = 0x00000001;
+	public const int O_RDWR               = 0x00000002;
+	public const int O_CREAT              = 0x00000040;
+	public const int O_EXCL               = 0x00000080;
+	public const int O_NOCTTY             = 0x00000100;
+	public const int O_TRUNC              = 0x00000200;
+	public const int O_SYNC               = 0x00001000;
+	public const int O_APPEND             = 0x00000400;
+	public const int STDIN_FILENO         = 0x00000000;
+	public const int STDOUT_FILENO        = 0x00000001;
+	public const int STDERR_FILENO        = 0x00000002;
+	public const int S_IFMT               = 0x0000f000;
+	public const int S_IFSOCK             = 0x0000c000;
+	public const int S_IFLNK              = 0x0000a000;
+	public const int S_IFREG              = 0x00008000;
+	public const int S_IFBLK              = 0x00006000;
+	public const int S_IFDIR              = 0x00004000;
+	public const int S_IFCHR              = 0x00002000;
+	public const int S_IFIFO              = 0x00001000;
+	public const int S_ISUID              = 0x00000800;
+	public const int S_ISGID              = 0x00000400;
+	public const int S_ISVTX              = 0x00000200;
+	public const int S_IRWXU              = 0x000001c0;
+	public const int S_IRUSR              = 0x00000100;
+	public const int S_IWUSR              = 0x00000080;
+	public const int S_IXUSR              = 0x00000040;
+	public const int S_IRWXG              = 0x00000038;
+	public const int S_IRGRP              = 0x00000020;
+	public const int S_IWGRP              = 0x00000010;
+	public const int S_IXGRP              = 0x00000008;
+	public const int S_IRWXO              = 0x00000007;
+	public const int S_IROTH              = 0x00000004;
+	public const int S_IWOTH              = 0x00000002;
+	public const int S_IXOTH              = 0x00000001;
+	public const int EPERM                = 1;
+	public const int ENOENT               = 2;
+	public const int ESRCH                = 3;
+	public const int EINTR                = 4;
+	public const int EIO                  = 5;
+	public const int ENXIO                = 6;
+	public const int E2BIG                = 7;
+	public const int ENOEXEC              = 8;
+	public const int EBADF                = 9;
+	public const int ECHILD               = 10;
+	public const int EAGAIN               = 11;
+	public const int ENOMEM               = 12;
+	public const int EACCES               = 13;
+	public const int EFAULT               = 14;
+	public const int ENOTBLK              = 15;
+	public const int EBUSY                = 16;
+	public const int EEXIST               = 17;
+	public const int EXDEV                = 18;
+	public const int ENODEV               = 19;
+	public const int EISDIR               = 21;
+	public const int EINVAL               = 22;
+	public const int ENFILE               = 23;
+	public const int EMFILE               = 24;
+	public const int ENOTTY               = 25;
+	public const int ETXTBSY              = 26;
+	public const int EFBIG                = 27;
+	public const int ENOSPC               = 28;
+	public const int ESPIPE               = 29;
+	public const int EROFS                = 30;
+	public const int EMLINK               = 31;
+	public const int EPIPE                = 32;
+	public const int EDOM                 = 33;
+	public const int ERANGE               = 34;
+	public const int EDEADLK              = 35;
+	public const int ENAMETOOLONG         = 36;
+	public const int ENOLCK               = 37;
+	public const int ENOSYS               = 38;
+	public const int ENOTEMPTY            = 39;
+	public const int ELOOP                = 40;
+	public const int EWOULDBLOCK          = 11;
+	public const int ENOMSG               = 42;
+	public const int EIDRM                = 43;
+	public const int ECHRNG               = 44;
+	public const int EL2NSYNC             = 45;
+	public const int EL3HLT               = 46;
+	public const int EL3RST               = 47;
+	public const int ELNRNG               = 48;
+	public const int EUNATCH              = 49;
+	public const int ENOCSI               = 50;
+	public const int EL2HLT               = 51;
+	public const int EBADE                = 52;
+	public const int EBADR                = 53;
+	public const int EXFULL               = 54;
+	public const int ENOANO               = 55;
+	public const int EBADRQC              = 56;
+	public const int EBADSLT              = 57;
+	public const int EDEADLOCK            = 35;
+	public const int EBFONT               = 59;
+	public const int ENOSTR               = 60;
+	public const int ENODATA              = 61;
+	public const int ETIME                = 62;
+	public const int ENOSR                = 63;
+	public const int ENONET               = 64;
+	public const int ENOPKG               = 65;
+	public const int EREMOTE              = 66;
+	public const int ENOLINK              = 67;
+	public const int EADV                 = 68;
+	public const int ESRMNT               = 69;
+	public const int ECOMM                = 70;
+	public const int EPROTO               = 71;
+	public const int EMULTIHOP            = 72;
+	public const int EDOTDOT              = 73;
+	public const int EBADMSG              = 74;
+	public const int ENOTUNIQ             = 76;
+	public const int EBADFD               = 77;
+	public const int EREMCHG              = 78;
+	public const int ELIBACC              = 79;
+	public const int ELIBBAD              = 80;
+	public const int ELIBSCN              = 81;
+	public const int ELIBMAX              = 82;
+	public const int ELIBEXEC             = 83;
+	public const int EUSERS               = 87;
+	public const int ENOTSOCK             = 88;
+	public const int EDESTADDRREQ         = 89;
+	public const int EMSGSIZE             = 90;
+	public const int EPROTOTYPE           = 91;
+	public const int ENOPROTOOPT          = 92;
+	public const int EPROTONOSUPPORT      = 93;
+	public const int ESOCKTNOSUPPORT      = 94;
+	public const int EOPNOTSUPP           = 95;
+	public const int EPFNOSUPPORT         = 96;
+	public const int EAFNOSUPPORT         = 97;
+	public const int EADDRINUSE           = 98;
+	public const int EADDRNOTAVAIL        = 99;
+	public const int ENETDOWN             = 100;
+	public const int ENETUNREACH          = 101;
+	public const int ENETRESET            = 102;
+	public const int ECONNABORTED         = 103;
+	public const int ECONNRESET           = 104;
+	public const int ENOBUFS              = 105;
+	public const int EISCONN              = 106;
+	public const int ENOTCONN             = 107;
+	public const int ESHUTDOWN            = 108;
+	public const int ETOOMANYREFS         = 109;
+	public const int ETIMEDOUT            = 110;
+	public const int ECONNREFUSED         = 111;
+	public const int EHOSTDOWN            = 112;
+	public const int EHOSTUNREACH         = 113;
+	public const int EALREADY             = 114;
+	public const int EINPROGRESS          = 115;
+	public const int ESTALE               = 116;
+	public const int EDQUOT               = 122;
+	public const int ENOMEDIUM            = 123;
+	public const int ENOTDIR              = 20;
+
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_seek", CharSet=CharSet.Ansi)]
+	public unsafe static extern long seek (IntPtr fd, long offset, int whence);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_mkdir", CharSet=CharSet.Ansi)]
+	public unsafe static extern int mkdir (string path, int mode);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_rmdir", CharSet=CharSet.Ansi)]
+	public unsafe static extern int rmdir (string path);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_read", CharSet=CharSet.Ansi)]
+	[CLSCompliant(false)]
+	public unsafe static extern int read (IntPtr fd, void * buf, int count);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_write", CharSet=CharSet.Ansi)]
+	[CLSCompliant(false)]
+	public unsafe static extern int write (IntPtr fd, void * buf, int count);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_fstat", CharSet=CharSet.Ansi)]
+	[CLSCompliant(false)]
+	public unsafe static extern int fstat (IntPtr fd, stat * buf);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_ftruncate", CharSet=CharSet.Ansi)]
+	public unsafe static extern int ftruncate (IntPtr fd, long length);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_open", CharSet=CharSet.Ansi)]
+	public unsafe static extern IntPtr open (string path, int flags, int mode);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_close", CharSet=CharSet.Ansi)]
+	public unsafe static extern int close (IntPtr fd);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_stat", CharSet=CharSet.Ansi)]
+	[CLSCompliant(false)]
+	public unsafe static extern int stat (string path, stat * buf);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_unlink", CharSet=CharSet.Ansi)]
+	public unsafe static extern int unlink (string path);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_opendir", CharSet=CharSet.Ansi)]
+	public unsafe static extern IntPtr opendir (string path);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_readdir", CharSet=CharSet.Ansi)]
+	public unsafe static extern string readdir (IntPtr dir);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_closedir", CharSet=CharSet.Ansi)]
+	public unsafe static extern int closedir (IntPtr dir);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_getenv", CharSet=CharSet.Ansi)]
+	public unsafe static extern IntPtr getenv (string variable);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_environ", CharSet=CharSet.Ansi)]
+	public unsafe static extern IntPtr environ ();
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_rename", CharSet=CharSet.Ansi)]
+	public unsafe static extern int rename (string source, string target);
+
+	[DllImport("monowrapper", EntryPoint="mono_wrapper_utime", CharSet=CharSet.Ansi)]
+	public unsafe static extern int utime (string path, int atime, int mtime);
+}
+}
diff --git a/mcs/class/corlib/Unix/common.src b/mcs/class/corlib/Unix/common.src
new file mode 100644
index 00000000000..14f9533ef75
--- /dev/null
+++ b/mcs/class/corlib/Unix/common.src
@@ -0,0 +1 @@
+Wrapper.cs
\ No newline at end of file
diff --git a/mcs/class/corlib/Unix/mono.src b/mcs/class/corlib/Unix/mono.src
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/class/corlib/Unix/mono.src
diff --git a/mcs/class/corlib/Unix/windows.src b/mcs/class/corlib/Unix/windows.src
new file mode 100644
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/class/corlib/Unix/windows.src
diff --git a/mcs/class/corlib/Windows/Windows.cs b/mcs/class/corlib/Windows/Windows.cs
new file mode 100644
index 00000000000..891c26f0b68
--- /dev/null
+++ b/mcs/class/corlib/Windows/Windows.cs
@@ -0,0 +1,694 @@
+/*---------------------------------------------------------------------

+

+		 XX		   X		    XXX

+				  XX		     XX

+		XXX	XX XXX	 XXXXX		     XX

+		 XX	XXX XX	  XX		     XX

+		 XX	XX  XX	  XX	  XXXXX	     XX

+		 XX	XX  XX	  XX XX	 XX    X     XX

+		XXXX	XX  XX	   XXX	 XXXXXXX    XXXX

+					 XX

+					  XXXXX

+

+Copyright (c) 2001 Intel Corporation.  All Rights Reserved.

+

+CREATED: August	15, 2001

+OWNER: Scott D Smith, Joel Marcey

+VERSION: 1.0

+---------------------------------------------------------------------*/

+	    

+using System;

+using System.Runtime.InteropServices;

+using System.Text;

+using System.IO;

+using System.Collections;

+

+namespace System.PAL

+{

+	/// <summary>

+	///	Class that implements IOperatingSystem,	providing the requested	functionality through calls into APIs available	in Windows (this class is a work in progress). 

+	/// </summary>

+	internal class OpSys

+	{

+	

+		//OS Calls (P/Invoke)

+	

+	

+		/*DWORD	GetFullPathName(

+		    LPCTSTR lpFileName,	 // file name

+		    DWORD nBufferLength, // size of path buffer

+		    LPTSTR lpBuffer,	 // path buffer

+		    LPTSTR *lpFilePart	 // address of file name in path

+		    );*/

+	

+		[DllImport("kernel32.dll")]

+		private	static extern uint GetFullPathName(string path,	uint bufLength,	System.Text.StringBuilder buffer, ref System.Text.StringBuilder	fNameAddr);

+	

+		/*UINT GetTempFileName(

+		    LPCTSTR lpPathName,	     //	directory name

+		    LPCTSTR lpPrefixString,  //	file name prefix

+		    UINT uUnique,	     //	integer

+		    LPTSTR lpTempFileName    //	file name buffer

+		    );*/

+	

+		[DllImport("kernel32.dll")]

+		private	static extern uint GetTempFileName(string path,	string prefix, uint unique, System.Text.StringBuilder buffer);

+

+		/*DWORD	GetTempPath(

+		    DWORD nBufferLength,  // size of buffer

+		    LPTSTR lpBuffer	  // path buffer

+		    );*/

+	

+		[DllImport("kernel32.dll")]

+		private	static extern int GetTempPath(int bufferLength,	System.Text.StringBuilder buffer);

+

+

+

+	

+		// Class Constants

+	

+		private	const int EOF =	-1; // In stdio.h, EOF is defined as -1

+	

+

+

+		// For StdInputStream and StdOutputStream

+	

+		private	const int STDOUT = 1; // In stdio.h, the handle	to standard out	is 1

+		private	const int STDIN	= 0; //	In stdio.h, the	standard input handle is defined as 0. Will this always	be true?

+

+	

+		// Class Fields

+	

+		private	static bool isNextCharacterResidualNewline = false;

+		private	static byte residualNewlineByte	= 0;

+

+

+	

+		// Class Constructor

+	

+		public OpSys()

+		{

+		}

+

+	

+		//  System.Environment Services	

+	

+		public string NewLineSequence

+		{

+			get

+			{

+				return "\r\n";

+			}

+		}

+

+		public char DirectorySeparator

+		{

+			get

+			{

+				return (char) 0x005C; // This is a \

+			}

+		}

+

+		public char AltDirectorySeparator

+		{

+			get

+			{

+				return (char) 0x002F; // This is a /

+			}

+		}

+

+		public char VolumeSeparator

+		{

+			get

+			{

+				return (char) 0x003A; // This is a :

+			}

+		}

+

+		public char PathSeparator

+		{

+			get

+			{

+				return (char) 0x003B; // This is a ;

+			}

+		}

+

+		public char[] InvalidPathChars

+		{

+			get

+			{

+				char[] ipc = {'"', '<',	'>', '|', '\0'};

+				return ipc;

+			}

+		}

+

+		public char[] DirVolSeparatorChars

+		{

+			get

+			{

+				char[] dsc = new char[]	{this.DirectorySeparator, this.AltDirectorySeparator, this.VolumeSeparator};

+				return dsc;

+			}

+		}

+		public char ExtensionCharacter

+		{

+			get

+			{

+				return (char) 0x002E; // This is a .

+			}

+		}

+

+		public string GetEnvironmentVariable(string eVar)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetEnvironmentVariable(System.String): Stub	Method");

+			// Call	Windows	API to get environment variable;

+			return null;

+		}

+

+		public string CommandLine

+		{

+			get

+			{

+				return null;

+			}

+		}

+

+		public IDictionary EnvironmentVariables

+		{

+			get

+			{

+				return null;

+			}

+		}

+

+		public string MachineName

+		{

+			get

+			{

+				return null;

+			}

+		}

+

+		public OperatingSystem OSVersion

+		{

+			get

+			{

+				return null;

+			}

+		}

+

+		// System.Path services

+

+		public string ChangeExtension(string path, string extension)

+		{

+			//System.Diagnostics.Debug.WriteLine("Windows:ChangeExtension(System.String, System.String): Stub Method");

+			if (path == null || path.Equals(string.Empty))

+			{

+				return path;

+			}

+			if (!this.HasExtension(path) &&	extension != null)

+			{

+				return string.Concat(path, extension);

+			}

+			string pathNoExt = path.Substring(0, path.LastIndexOf(this.ExtensionCharacter));

+			// If extension	is null, concat	replaces it with string.Empty

+			return string.Concat(pathNoExt,	extension);

+		}

+

+		public string GetExtension(string path)

+		{

+			//System.Diagnostics.Debug.WriteLine("Windows:GetExtension(System.String): Stub	Method");

+			if (path == null)

+			{

+				return path;

+			}

+			if (!this.HasExtension(path))

+			{

+				return string.Empty;

+			}

+			// It has an extension

+			return path.Substring(path.LastIndexOf(this.ExtensionCharacter));

+		}

+

+		public string GetFileName(string path)

+		{

+			//System.Diagnostics.Debug.WriteLine("Windows:GetFileName(System.String): Stub Method");

+			if (path == null)

+			{

+				return null;

+			}

+			int dvLast = path.LastIndexOfAny(this.DirVolSeparatorChars);

+			if (dvLast == -1)

+			{

+				return path;

+			}

+			return dvLast +	1 == path.Length ? string.Empty	: path.Substring(dvLast	+ 1);

+		}

+	

+		public long FileLength(string path)

+		{

+			return 0;

+		}

+

+		public long FileLength(IntPtr handle)

+		{

+			return 0;

+		}

+

+		public string GetFileNameWithoutExtension(string path)

+		{

+			//System.Diagnostics.Debug.WriteLine("Windows:GetFileNameWithoutExtension(System.String): Stub Method");

+			return this.ChangeExtension(this.GetFileName(path), null);

+		}

+

+		// TODO: Windows: GetFullPath: Verify logic here. This seems TOO simplistic

+		public string GetFullPath(string path)

+		{

+			//System.Diagnostics.Debug.WriteLine("Windows:GetFullPath(System.String): Stub Method");

+			if (path == null)

+			{

+				return null;

+			}

+			// TODO: GetFullPath: What should the size of the buffer be?

+			System.Text.StringBuilder buffer = new System.Text.StringBuilder(256);

+			// Just	temporary to pass in as	final parameter

+			System.Text.StringBuilder temp = new System.Text.StringBuilder();

+			// TODO: GetFullPath: ECMA spec	says that an ArgumentException is thrown if system can not retrieve the	path. That does	not seem right.	Returning null for now

+			return GetFullPathName(path, (uint) buffer.Capacity, buffer, ref temp) != 0 ? buffer.ToString()	: null;

+		}

+

+		public string GetPathRoot(string path)

+		{

+			//System.Diagnostics.Debug.WriteLine("Windows:GetPathRoot(System.String): Stub Method");

+			if (path == null)

+			{

+				return null;

+			}

+			// TODO: Windows: GetPathRoot: Check logic. Assuming that if there is not dir or vol separators	in the first three characters, then relative.

+			int dvFirst = path.IndexOfAny(this.DirVolSeparatorChars, 0, 3);

+			if (dvFirst == -1)

+			{

+				return string.Empty;

+			}

+			if (dvFirst == 0 && path[dvFirst].Equals(this.VolumeSeparator))

+			{

+				return string.Empty;

+			}

+			return dvFirst == 1 && path[dvFirst].Equals(this.VolumeSeparator) && (path[dvFirst+1].Equals(this.DirectorySeparator) || path[dvFirst+1].Equals(this.AltDirectorySeparator)) ? path.Substring(0, dvFirst+2) : path.Substring(0,	dvFirst+1);

+

+		}

+	

+		public string GetTempFileName()

+		{

+			//System.Diagnostics.Debug.WriteLine("Windows:GetTempFileName(): Stub Method");

+			string tPath = this.GetTempPath();

+			string prefix =	"tmp";

+			// TODO: Windows: GetTempFileName: Remove System once our implementation of StringBuilder is done. Same	for parameter to P/Invoke

+			// TODO: Windows: GetTempFileName: What	is the proper length?

+			System.Text.StringBuilder buffer = new System.Text.StringBuilder(256);

+			// TODO: Windows: GetTempFileName: If an error is returned, what should	we do? Right now return	null;

+			return GetTempFileName(tPath, prefix, 0, buffer) != 0 ?	buffer.ToString() : null;

+		}

+

+		public string GetTempPath()

+		{

+			//System.Diagnostics.Debug.WriteLine("Windows:GetTempPath(): Stub Method");

+			// TODO: Windows: GetTempPath: Remove System once our implementation of	StringBuilder is done. Same for	parameter to P/Invoke

+			// According to	docs, LPTSTR maps to StringBuilder for In/Out

+			System.Text.StringBuilder buffer = new System.Text.StringBuilder(256);

+			// TODO: Windows: GetTempPath: What is the proper length?

+			// TODO: Windows: GetTempPath: If an error is returned,	what should we do? Right now return null;

+			return GetTempPath(buffer.Capacity, buffer) != 0 ? buffer.ToString() : null;

+		}

+

+		public bool HasExtension(string	path)

+		{

+			//System.Diagnostics.Debug.WriteLine("Windows:HasExtension(System.String): Stub	Method");

+			int dvLast = path.LastIndexOfAny(this.DirVolSeparatorChars);

+			int exLast = path.LastIndexOf(this.ExtensionCharacter);

+			if (exLast > dvLast)

+			{

+				return true;

+			}

+			return false;

+		}

+

+		public bool IsPathRooted(string	path)

+		{

+			//System.Diagnostics.Debug.WriteLine("Windows:IsPathRooted(System.String): Stub	Method");

+			return (this.GetPathRoot(path) == null)	|| (this.GetPathRoot(path).Equals(string.Empty)) ? false : true;

+		}

+

+       

+		// System.Directory service  

+

+		public void DeleteDirectory(string path, bool recursive)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:DeleteDirectory(System.String, System.Boolean): Stub Method");

+		}

+

+		public bool ExistsDirectory(string path)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:ExistsDirectory(System.String): Stub Method");

+			return false;

+		}

+

+		public DateTime	GetCreationTimeDirectory(string	path)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetCreationTimeDirectory(System.String): Stub Method");

+			return new DateTime(0);

+		}

+

+		public string GetCurrentDirectory()

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetCurrentDirectory(): Stub	Method");

+			return null;

+		}

+

+		public string[]	GetDirectories(string path, string searchPattern)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetDirectories(System.String,System.String): Stub Method");

+			return null;

+		}

+

+		public string[]	GetFiles(string	path, string searchPattern)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetFiles(System.String, System.String): Stub Method");

+			return null;

+		}

+

+		public string[]	GetFileSystemEntries(string path, string searchPattern)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetFileSystemEntries(System.String,	System.String):	Stub Method");

+			return null;

+		}

+

+		public DateTime	GetLastAccessTimeDirectory(string path)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetLastAccessTimeDirectory(System.String): Stub Method");

+			return new DateTime(0);

+		}

+

+		public DateTime	GetLastWriteTimeDirectory(string path)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetLastWriteTimeDirectory(System.String): Stub Method");

+			return new DateTime(0);

+		}

+

+		public void MoveDirectory(string sourceDirName,	string destDirName)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:MoveDirectory(System.String, System.String): Stub Method");

+		}

+

+		public void SetCreationTimeDirectory(string path, DateTime creationTime)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:SetCreationTimeDirectory(System.String, System.DateTime): Stub Method");

+		}

+

+		public void SetCurrentDirectory(string path)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:SetCurrentDirectory(System.String):	Stub Method");

+		}

+

+		public void SetLastAccessTimeDirectory(string path, DateTime lastAccessTime)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:SetLastAccessTimeDirectory(System.String, System.DateTime):	Stub Method");

+		}

+

+		public void SetLastWriteTimeDirectory(string path, DateTime lastWriteTime)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:SetLastWriteTimeDirectory(System.String, System.DateTime): Stub Method");

+		}

+

+	

+		// I/O Services

+	

+

+		public int ReadStdInput(byte[] buffer, int offset, int count)

+		{

+			return ReadFile(new IntPtr(STDIN), buffer, offset, count);

+		}

+

+		public void FlushStdOutput(byte[] byteBuf)

+		{

+			FlushFile (new IntPtr(STDOUT), byteBuf);

+		}

+	

+		public unsafe int ReadFile(IntPtr handle, byte[] buffer, int offset, int count)

+		{

+			int res;

+

+			fixed (void *p = &buffer[offset]) {

+				res = _read(handle, p, count);

+			}

+			return res;

+		}

+

+		public unsafe int WriteFile(IntPtr handle, byte[] buffer, int offset, int count)

+		{

+			int res;

+

+			fixed (void *p = &buffer [offset]) {

+				res = _write(handle, p, count);

+			}

+			return res;

+		}

+

+		public int SetLengthFile(IntPtr handle, long length)

+		{

+			return _ftruncate (handle, (int)length);

+		}

+

+		public void FlushFile(IntPtr handle, byte[] byteBuf)

+		{

+			WriteFile (handle, byteBuf, 0, byteBuf.Length);

+		}

+

+		public IntPtr OpenFile(string path, FileMode mode, FileAccess access, FileShare	share)

+		{

+			int flags = _getUnixFlags (mode, access);

+

+			return _open (path, flags, 0x1a4);

+		}

+	    

+		public void CloseFile(IntPtr handle)

+		{

+			_close (handle);

+		}

+	

+		public long SeekFile(IntPtr handle, long offset, SeekOrigin origin)

+		{

+			switch (origin) {

+				case SeekOrigin.End:

+					return _lseek (handle, (int)offset, SEEK_END);

+				case SeekOrigin.Current:

+					return _lseek (handle, (int)offset, SEEK_CUR);

+				default:

+					return _lseek (handle, (int)offset, SEEK_SET);

+			}

+		}

+	

+		public IntPtr CreateFile(string	path, FileMode mode, FileAccess	access,	FileShare share)

+		{

+			return OpenFile(path, FileMode.CreateNew, access, share);

+		}

+	

+		public void DeleteFile(string path)

+		{

+			_unlink(path);

+		}

+	

+		public bool ExistsFile(string path)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:ExistsFile(System.String): Stub Method");

+			return false;

+		}

+	

+		public DateTime	GetCreationTimeFile(string path)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetCreationTimeFile(System.String):	Stub Method");

+			return new DateTime(0);

+		}

+	

+		public DateTime	GetLastAccessTimeFile(string path)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetLastAccessTimeFile(System.String): Stub Method");

+			return new DateTime(0);

+		}

+	

+		public DateTime	GetLastWriteTimeFile(string path)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:GetLastWriteFile(System.String): Stub Method");

+			return new DateTime(0);

+		}

+	

+		public void SetCreationTimeFile(string path, DateTime creationTime)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:SetCreationTimeFile(System.String, System.DateTime): Stub Method");

+		}

+	

+		public void SetLastAccessTimeFile(string path, DateTime	lastAccessTime)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:SetLastAccessTimeFile(System.String, System.DateTime): Stub	Method");

+		}

+	

+		public void SetLastWriteTimeFile(string	path, DateTime lastWriteTime)

+		{

+			System.Diagnostics.Debug.WriteLine("Windows:SetCLastWriteTimeFile(System.String, System.DateTime): Stub	Method");

+		}

+

+		// DONE: Determine if this should be in a utility class

+		/// <summary>

+		///     Determines if a byte is part of the newline sequence

+		/// </summary>

+		/// <param name="c">The byte to compare</param>

+		/// <returns>A System.Boolean stating whether the byte is part of the newline</returns>

+		private static bool IsPartOfNewlineSequence(byte c)

+		{

+			char[] newLineArray = System.Environment.NewLine.ToCharArray();

+			for (int i = 0; i < newLineArray.Length; i++)

+			{

+				if (c == (byte) newLineArray[i]) // Or do I need Equals()

+				{

+					return true;

+				}

+			}

+			return false;

+		}

+

+		/// <summary>

+		///     Determines if a character is a newline character

+		/// </summary>

+		/// <param name="c">The character to check to see if it is a newline character</param>

+		/// <returns></returns>

+		public static bool IsPartOfNewlineSequence(char c)

+		{

+			// DONE: Determine if this method can be moved into TextReader or maybe a utility class (a class with a bunch of static methods...System.IO.IOUtility)

+			char[] newLineArray = System.Environment.NewLine.ToCharArray();

+			for (int i = 0; i < newLineArray.Length; i++)

+			{

+				if (c == newLineArray[i]) // TODO: Determine if .Equals() should be used here.

+				{

+					return true;

+				}

+			}

+			return false;

+		}

+

+		[ DllImport("msvcrt", EntryPoint="acos") ]

+		public extern static double Acos(double d);

+

+		[ DllImport("msvcrt", EntryPoint="asin") ]

+		public extern static double Asin(double d);

+

+		[ DllImport("msvcrt", EntryPoint="atan") ]

+		public extern static double Atan(double d);

+

+		[ DllImport("msvcrt", EntryPoint="atan2") ]

+		public extern static double Atan2(double y, double x);

+

+		[ DllImport("msvcrt", EntryPoint="cos") ]

+		public extern static double Cos(double d);

+

+		[ DllImport("msvcrt", EntryPoint="cosh") ]

+		public extern static double Cosh(double d);

+

+		[ DllImport("msvcrt", EntryPoint="exp") ]

+		public extern static double Exp(double d);

+

+		[ DllImport("msvcrt", EntryPoint="log") ]

+		public extern static double Log(double d);

+

+		[ DllImport("msvcrt", EntryPoint="log10") ]

+		public extern static double Log10(double d);

+

+		[ DllImport("msvcrt", EntryPoint="pow") ]

+		public extern static double Pow(double x, double y);

+

+		[ DllImport("msvcrt", EntryPoint="sin") ]

+		public extern static double Sin(double d);

+

+		[ DllImport("msvcrt", EntryPoint="sinh") ]

+		public extern static double Sinh(double d);

+

+		[ DllImport("msvcrt", EntryPoint="sqrt") ]

+		public extern static double Sqrt(double d);

+

+		[ DllImport("msvcrt", EntryPoint="tan") ]

+		public extern static double Tan(double d);

+

+		[ DllImport("msvcrt", EntryPoint="tanh") ]

+		public extern static double Tanh(double d);

+

+		[ DllImport("msvcrt", EntryPoint="_read", CharSet=CharSet.Ansi) ]

+		private unsafe static extern int _read(IntPtr fd, void *buf, int count);

+

+		[ DllImport("msvcrt", EntryPoint="_write", CharSet=CharSet.Ansi) ]

+		private unsafe static extern int _write(IntPtr fd, void *buf, int count);

+

+		[ DllImport("msvcrt", EntryPoint="_lseek", CharSet=CharSet.Ansi) ]

+		private unsafe static extern int _lseek(IntPtr fd, int offset, int whence);

+

+		[ DllImport("msvcrt", EntryPoint="_chsize", CharSet=CharSet.Ansi) ]

+		private unsafe static extern int _ftruncate (IntPtr fd, int count);

+

+		[ DllImport("msvcrt", EntryPoint="_close", CharSet=CharSet.Ansi) ]

+		private unsafe static extern void _close(IntPtr fd);

+

+		[ DllImport("msvcrt", EntryPoint="_open", CharSet=CharSet.Ansi) ]

+		private unsafe static extern IntPtr _open(string path, int flags, int mode);

+

+		[ DllImport("msvcrt", EntryPoint="_unlink", CharSet=CharSet.Ansi) ]

+		private unsafe static extern int _unlink(string path);

+

+		private const int O_RDONLY  = 0x000;

+		private const int O_WRONLY  = 0x001;

+		private const int O_RDWR    = 0x002;

+		private const int O_CREAT   = 0x040;

+		private const int O_EXCL    = 0x080;

+		private const int O_TRUNC   = 0x200;

+		private const int O_APPEND  = 0x400;

+

+		private const int SEEK_SET = 0;

+		private const int SEEK_CUR = 1;

+		private const int SEEK_END = 2;

+

+		private int _getUnixFlags (FileMode mode, FileAccess access)

+		{

+			int flags = 0;

+			switch (access) {

+				case FileAccess.Read:

+					flags = O_RDONLY;

+					break;

+				case FileAccess.Write:

+					flags = O_WRONLY;

+					break;

+				case FileAccess.ReadWrite:

+					flags = O_RDWR;

+					break;

+			}

+

+			switch (mode) {

+				case FileMode.Append:

+					flags |= O_APPEND;

+					break;

+				case FileMode.Create:

+					flags |= O_CREAT;

+					break;

+				case FileMode.CreateNew:

+					flags |= O_CREAT | O_EXCL;

+					break;

+				case FileMode.Open:

+					break;

+				case FileMode.OpenOrCreate:

+					flags |= O_CREAT;

+					break;

+				case FileMode.Truncate:

+					flags |= O_TRUNC;

+					break;

+			}

+

+			return flags;

+		}

+	}

+}

diff --git a/mcs/class/corlib/corlib.build b/mcs/class/corlib/corlib.build
new file mode 100644
index 00000000000..75dfd340370
--- /dev/null
+++ b/mcs/class/corlib/corlib.build
@@ -0,0 +1,152 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for corlib.dll -->
+<!-- Target windows builds libraries _for_ windows -->
+<!-- Target linux builds libraries _for_ linux -->
+
+<project name="corlib" default="build">
+	<property name="debug" value="true"/>
+	<property name="verbose" value="true"/>
+
+	<target name="build">
+		<mkdir dir="../lib"/>
+		<csc target="library" output="../lib/corlib.dll" debug="${debug}">
+			<!-- keep in sync with corlib_cmp.dll below -->
+			<arg value="/nowarn:1595"/>
+			<arg value="/nowarn:0649"/> <!-- field never assigned to -->
+			<arg value="/nowarn:0169"/> <!-- field never used -->
+			<arg value="/nowarn:0679"/> <!-- internal may be overriden -->
+			<arg value="/unsafe"/>
+
+			<arg value="/nostdlib"/> 	<!-- don't reference mscorlib -->
+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->
+
+			<sources>
+				<includes name="**/*.cs"/>
+
+				<excludes name="Test/**"/>
+				<excludes name="System.Security.Permissions/SecurityPermissionAttribute.cs"/>	<!-- custom security attributes problem -->
+
+				<excludes name="Unix/**"/>
+				<excludes name="Linux/**"/>
+				<excludes name="Windows/**"/>
+				<excludes name="System.PAL/**"/>
+			</sources>
+		</csc>
+		<csc target="library" output="../lib/corlib_cmp.dll" debug="${debug}">
+			<!-- This dll is used to compare with mscorlib -->
+			<!-- It should be the same as corlib.dll minus Object and ValueTyp -->
+			<arg value="/nowarn:1595"/>
+			<arg value="/nowarn:0649"/> <!-- field never assigned to -->
+			<arg value="/nowarn:0169"/> <!-- field never used -->
+			<arg value="/nowarn:0679"/> <!-- internal may be overriden -->
+			<arg value="/unsafe"/>
+
+			<arg value="/nostdlib"/>
+			<arg value="/noconfig"/>
+			<arg value="/r:mscorlib.dll"/>
+			
+			<sources>
+				<includes name="**/*.cs"/>
+
+				<excludes name="Test/**"/>
+				<excludes name="System.Security.Permissions/SecurityPermissionAttribute.cs"/>
+
+				<excludes name="Unix/**"/>
+				<excludes name="Linux/**"/>
+				<excludes name="Windows/**"/>
+				<excludes name="System.PAL/**"/>
+
+				<excludes name="System/Object.cs"/>
+				<excludes name="System/ValueType.cs"/>
+				<excludes name="System/Enum.cs"/>
+				<excludes name="System/Delegate.cs"/>
+				<excludes name="System/MulticastDelegate.cs"/>
+				<excludes name="System/Exception.cs"/>
+			</sources>
+		</csc>
+		<!-- NUnit can only run under windows right now, so build for windows
+			even though this is inside the linux target -->
+		<csc target="library" output="Test/corlib_res.dll" debug="${debug}">
+			<arg value="/nowarn:1595"/>
+			<arg value="/nowarn:0649"/> <!-- field never assigned to -->
+			<arg value="/nowarn:0169"/> <!-- field never used -->
+			<arg value="/nowarn:0679"/> <!-- internal may be overriden -->
+			<arg value="/unsafe"/>
+			<sources>
+				<includes name="**/*.cs"/>
+
+				<excludes name="Test/**"/>
+
+				<excludes name="Unix/**"/>
+				<excludes name="Linux/**"/>
+				<excludes name="Windows/**"/>
+				<excludes name="System.PAL/**"/>
+
+				<excludes name="System/Object.cs"/>
+				<excludes name="System/ValueType.cs"/>
+				<excludes name="System/Enum.cs"/>
+				<excludes name="System/Delegate.cs"/>
+				<excludes name="System/MulticastDelegate.cs"/>
+				<excludes name="System/Exception.cs"/>
+				<excludes name="System/Type.cs"/>
+				<excludes name="System/MonoType.cs"/>
+				<excludes name="System/Array.cs"/>
+				<excludes name="System/String.cs"/>
+				<excludes name="System/Console.cs"/>
+				<excludes name="System/AppDomain.cs"/>
+				<excludes name="System/RuntimeTypeHandle.cs"/>
+				<excludes name="System/ICloneable.cs"/>
+
+				<excludes name="System.Collections/Queue.cs"/>
+				<excludes name="System.Collections/ICollection.cs"/>
+				<excludes name="System.Collections/IEnumerator.cs"/>
+				<excludes name="System.Collections/IEnumerable.cs"/>
+				<excludes name="System.Collections/IList.cs"/>
+				<excludes name="System.PAL/IOperatingSystem.cs"/>
+				<excludes name="System.Reflection.Emit/**"/>
+				<excludes name="System.Runtime.CompilerServices/**"/>
+				<excludes name="System.Security.Permissions/SecurityPermissionAttribute.cs"/>
+			</sources>
+		</csc>
+		<nant basedir="Test" target="build"/>
+	</target>
+
+	<target name="mcs-build">
+		<mkdir dir="../lib"/>
+
+		<mcs target="library" output="../lib/corlib_mcs.dll" debug="false" verbose="${verbose}">
+			<arg value="--unsafe"/>
+
+			<arg value="--nostdlib"/> 	<!-- don't reference mscorlib -->
+			<arg value="--noconfig"/>	<!-- don't reference ms assemblies -->
+
+			<sources>
+				<includes name="**/*.cs"/>
+
+				<excludes name="Test/**"/>
+				<excludes name="System.Security.Permissions/SecurityPermissionAttribute.cs"/>	<!-- custom security attributes problem -->
+
+				<excludes name="Unix/**"/>
+				<excludes name="Linux/**"/>
+				<excludes name="Windows/**"/>
+				<excludes name="System.PAL/**"/>
+			</sources>
+		</mcs>
+
+	</target>
+
+	<target name="test" depends="build">
+		<nant basedir="Test" target="test"/>
+	</target>
+
+	<target name="clean">
+		<delete file="../lib/corlib.dll" failonerror="false"/>
+		<delete file="../lib/corlib.pdb" failonerror="false"/>
+		<delete file="../lib/corlib_cmp.dll" failonerror="false"/>
+		<delete file="../lib/corlib_cmp.pdb" failonerror="false"/>
+		<delete file="Test/corlib_res.dll" failonerror="false"/>
+		<delete file="Test/corlib_res.pdb" failonerror="false"/>
+		<nant basedir="Test" target="clean"/>
+	</target>
+</project>
diff --git a/mcs/class/corlib/makefile.gnu b/mcs/class/corlib/makefile.gnu
new file mode 100644
index 00000000000..c38eade6d42
--- /dev/null
+++ b/mcs/class/corlib/makefile.gnu
@@ -0,0 +1,15 @@
+topdir = ../..
+
+LIBRARY = ../lib/corlib.dll
+
+LIB_LIST = unix.args
+LIB_FLAGS = --unsafe --nostdlib
+
+SOURCES_INCLUDE=*.cs
+SOURCES_EXCLUDE=\
+	./Test*	\
+	./System.Security.Permissions/SecurityPermissionAttribute.cs	\
+	./System.PAL/*.cs	\
+	./Windows/*.cs
+
+include ../library.make
diff --git a/mcs/class/corlib/unix.args b/mcs/class/corlib/unix.args
new file mode 100755
index 00000000000..be115a38908
--- /dev/null
+++ b/mcs/class/corlib/unix.args
@@ -0,0 +1,721 @@
+--target library
+--unsafe --nostdlib --noconfig
+-o ../lib/corlib_mcs.dll
+System/Activator.cs
+System/AppDomain.cs
+System/AppDomainSetup.cs
+System/AppDomainUnloadedException.cs
+System/ApplicationException.cs
+System/ArgumentException.cs
+System/ArgumentNullException.cs
+System/ArgumentOutOfRangeException.cs
+System/ArithmeticException.cs
+System/Array.cs
+System/ArrayTypeMismatchException.cs
+System/AssemblyLoadEventArgs.cs
+System/AssemblyLoadEventHandler.cs
+System/AsyncCallback.cs
+System/Attribute.cs
+System/AttributeTargets.cs
+System/AttributeUsage.cs
+System/BadImageFormatException.cs
+System/BitConverter.cs
+System/Boolean.cs
+System/Buffer.cs
+System/Byte.cs
+System/CannotUnloadAppDomainException.cs
+System/Char.cs
+System/CharEnumerator.cs
+System/CLSCompliantAttribute.cs
+System/Console.cs
+System/ContextBoundObject.cs
+System/ContextMarshalException.cs
+System/ContextStaticAttribute.cs
+System/Convert.cs
+System/CrossAppDomainDelegate.cs
+System/DateTime.cs
+System/DBNull.cs
+System/Decimal.cs
+System/DecimalFormatter.cs
+System/Delegate.cs
+System/DivideByZeroException.cs
+System/DllNotFoundException.cs
+System/Double.cs
+System/DuplicateWaitObjectException.cs
+System/EntryPointNotFoundException.cs
+System/Enum.cs
+System/Environment.cs
+System/EventArgs.cs
+System/EventHandler.cs
+System/Exception.cs
+System/ExecutionEngineException.cs
+System/FieldAccessException.cs
+System/FlagsAttribute.cs
+System/FormatException.cs
+System/GC.cs
+System/Guid.cs
+System/IAppDomainSetup.cs
+System/IAsyncResult.cs
+System/ICloneable.cs
+System/IComparable.cs
+System/IConvertible.cs
+System/ICustomFormatter.cs
+System/IDisposable.cs
+System/IFormatProvider.cs
+System/IFormattable.cs
+System/IndexOutOfRangeException.cs
+System/Int16.cs
+System/Int32.cs
+System/Int64.cs
+System/IntegerFormatter.cs
+System/IntPtr.cs
+System/InvalidCastException.cs
+System/InvalidOperationException.cs
+System/InvalidProgramException.cs
+System/IServiceProvider.cs
+System/LoaderOptimization.cs
+System/LoaderOptimizationAttribute.cs
+System/LocalDataStoreSlot.cs
+System/MarshalByRefObject.cs
+System/Math.cs
+System/MemberAccessException.cs
+System/MethodAccessException.cs
+System/MissingFieldException.cs
+System/MissingMemberException.cs
+System/MissingMethodException.cs
+System/MonoCustomAttrs.cs
+System/MonoDummy.cs
+System/MonoType.cs
+System/MTAThreadAttribute.cs
+System/MulticastDelegate.cs
+System/MulticastNotSupportedException.cs
+System/NonSerializedAttribute.cs
+System/NotFiniteNumberException.cs
+System/NotImplementedException.cs
+System/NotSupportedException.cs
+System/NullReferenceException.cs
+System/Object.cs
+System/ObjectDisposedException.cs
+System/ObsoleteAttribute.cs
+System/OperatingSystem.cs
+System/OutOfMemoryException.cs
+System/OverflowException.cs
+System/ParamArrayAttribute.cs
+System/PlatformID.cs
+System/PlatformNotSupportedException.cs
+System/Random.cs
+System/RankException.cs
+System/ResolveEventArgs.cs
+System/ResolveEventHandler.cs
+System/RuntimeArgumentHandle.cs
+System/RuntimeFieldHandle.cs
+System/RuntimeMethodHandle.cs
+System/RuntimeTypeHandle.cs
+System/SByte.cs
+System/SerializableAttribute.cs
+System/Single.cs
+System/StackOverflowException.cs
+System/STAThreadAttribute.cs
+System/String.cs
+System/SystemException.cs
+System/ThreadStaticAttribute.cs
+System/TimeSpan.cs
+System/TimeZone.cs
+System/TODOAttribute.cs
+System/Type.cs
+System/TypeCode.cs
+System/TypeInitializationException.cs
+System/TypeLoadException.cs
+System/TypeUnloadedException.cs
+System/UInt16.cs
+System/UInt32.cs
+System/UInt64.cs
+System/UIntPtr.cs
+System/UnauthorizedAccessException.cs
+System/UnhandledExceptionEventArgs.cs
+System/UnhandledExceptionEventHandler.cs
+System/ValueType.cs
+System/Version.cs
+System/Void.cs
+System/WeakReference.cs
+System/_AppDomain.cs
+System.Collections/ArrayList.cs
+System.Collections/BitArray.cs
+System.Collections/CaseInsensitiveComparer.cs
+System.Collections/CaseInsensitiveHashCodeProvider.cs
+System.Collections/CollectionBase.cs
+System.Collections/Comparer.cs
+System.Collections/DictionaryBase.cs
+System.Collections/DictionaryEntry.cs
+System.Collections/Hashtable.cs
+System.Collections/ICollection.cs
+System.Collections/IComparer.cs
+System.Collections/IDictionary.cs
+System.Collections/IDictionaryEnumerator.cs
+System.Collections/IEnumerable.cs
+System.Collections/IEnumerator.cs
+System.Collections/IHashCodeProvider.cs
+System.Collections/IList.cs
+System.Collections/Queue.cs
+System.Collections/ReadOnlyCollectionBase.cs
+System.Collections/SortedList.cs
+System.Collections/Stack.cs
+System.Configuration.Assemblies/AssemblyHash.cs
+System.Configuration.Assemblies/AssemblyHashAlgorithm.cs
+System.Configuration.Assemblies/AssemblyVersionCompatibility.cs
+System.Configuration.Assemblies/ProcessorID.cs
+System.Diagnostics/ConditionalAttribute.cs
+System.Diagnostics/DebuggableAttribute.cs
+System.Diagnostics/Debugger.cs
+System.Diagnostics/DebuggerHiddenAttribute.cs
+System.Diagnostics/DebuggerStepThroughAttribute.cs
+System.Diagnostics/StackFrame.cs
+System.Diagnostics/StackTrace.cs
+System.Diagnostics.SymbolStore/ISymbolBinder.cs
+System.Diagnostics.SymbolStore/ISymbolDocument.cs
+System.Diagnostics.SymbolStore/ISymbolDocumentWriter.cs
+System.Diagnostics.SymbolStore/ISymbolMethod.cs
+System.Diagnostics.SymbolStore/ISymbolNamespace.cs
+System.Diagnostics.SymbolStore/ISymbolReader.cs
+System.Diagnostics.SymbolStore/ISymbolScope.cs
+System.Diagnostics.SymbolStore/ISymbolVariable.cs
+System.Diagnostics.SymbolStore/ISymbolWriter.cs
+System.Diagnostics.SymbolStore/SymAddressKind.cs
+System.Diagnostics.SymbolStore/SymbolToken.cs
+System.Diagnostics.SymbolStore/SymDocumentType.cs
+System.Diagnostics.SymbolStore/SymLanguageType.cs
+System.Diagnostics.SymbolStore/SymLanguageVendor.cs
+System.Globalization/Calendar.cs
+System.Globalization/CalendarWeekRule.cs
+System.Globalization/CalendricalCalculations.cs
+System.Globalization/CompareInfo.cs
+System.Globalization/CompareOptions.cs
+System.Globalization/CultureInfo.cs
+System.Globalization/CultureTypes.cs
+System.Globalization/DateTimeFormatInfo.cs
+System.Globalization/DateTimeStyles.cs
+System.Globalization/DaylightTime.cs
+System.Globalization/GregorianCalendar.cs
+System.Globalization/GregorianCalendarTypes.cs
+System.Globalization/HebrewCalendar.cs
+System.Globalization/HijriCalendar.cs
+System.Globalization/JapaneseCalendar.cs
+System.Globalization/JulianCalendar.cs
+System.Globalization/KoreanCalendar.cs
+System.Globalization/Locale.cs
+System.Globalization/NumberFormatInfo.cs
+System.Globalization/NumberStyles.cs
+System.Globalization/RegionInfo.cs
+System.Globalization/TaiwanCalendar.cs
+System.Globalization/TextInfo.cs
+System.Globalization/ThaiBuddhistCalendar.cs
+System.Globalization/UnicodeCategory.cs
+System.IO/BinaryReader.cs
+System.IO/BinaryWriter.cs
+System.IO/BufferedStream.cs
+System.IO/CheckArgument.cs
+System.IO/CheckPermission.cs
+System.IO/Directory.cs
+System.IO/DirectoryInfo.cs
+System.IO/DirectoryNotFoundException.cs
+System.IO/EndOfStreamException.cs
+System.IO/File.cs
+System.IO/FileAccess.cs
+System.IO/FileAttributes.cs
+System.IO/FileInfo.cs
+System.IO/FileLoadException.cs
+System.IO/FileMode.cs
+System.IO/FileNotFoundException.cs
+System.IO/FileShare.cs
+System.IO/FileStream.cs
+System.IO/FileSystemInfo.cs
+System.IO/IOException.cs
+System.IO/MemoryStream.cs
+System.IO/MonoIO.cs
+System.IO/MonoIOError.cs
+System.IO/MonoIOStat.cs
+System.IO/Path.cs
+System.IO/PathTooLongException.cs
+System.IO/SearchPattern.cs
+System.IO/SeekOrigin.cs
+System.IO/Stream.cs
+System.IO/StreamReader.cs
+System.IO/StreamWriter.cs
+System.IO/StringReader.cs
+System.IO/StringWriter.cs
+System.IO/TextReader.cs
+System.IO/TextWriter.cs
+System.IO.IsolatedStorage/INormalizeForIsolatedStorage.cs
+System.IO.IsolatedStorage/IsolatedStorage.cs
+System.IO.IsolatedStorage/IsolatedStorageException.cs
+System.IO.IsolatedStorage/IsolatedStorageFileStream.cs
+System.IO.IsolatedStorage/IsolatedStorageScope.cs
+System.Reflection/AmbiguousMatchException.cs
+System.Reflection/Assembly.cs
+System.Reflection/AssemblyAlgorithmIdAttribute.cs
+System.Reflection/AssemblyCompanyAttribute.cs
+System.Reflection/AssemblyConfigurationAttribute.cs
+System.Reflection/AssemblyCopyrightAttribute.cs
+System.Reflection/AssemblyCultureAttribute.cs
+System.Reflection/AssemblyDefaultAliasAttribute.cs
+System.Reflection/AssemblyDelaySignAttribute.cs
+System.Reflection/AssemblyDescriptionAttribute.cs
+System.Reflection/AssemblyFileVersionAttribute.cs
+System.Reflection/AssemblyFlagsAttribute.cs
+System.Reflection/AssemblyInformationalVersionAttribute.cs
+System.Reflection/AssemblyKeyFileAttribute.cs
+System.Reflection/AssemblyKeyNameAttribute.cs
+System.Reflection/AssemblyName.cs
+System.Reflection/AssemblyNameFlags.cs
+System.Reflection/AssemblyNameProxy.cs
+System.Reflection/AssemblyProductAttribute.cs
+System.Reflection/AssemblyTitleAttribute.cs
+System.Reflection/AssemblyTradeMarkAttribute.cs
+System.Reflection/AssemblyVersionAttribute.cs
+System.Reflection/Binder.cs
+System.Reflection/BindingFlags.cs
+System.Reflection/CallingConventions.cs
+System.Reflection/ConstructorInfo.cs
+System.Reflection/CustomAttributeFormatException.cs
+System.Reflection/DefaultMemberAttribute.cs
+System.Reflection/EventAttributes.cs
+System.Reflection/EventInfo.cs
+System.Reflection/FieldAttributes.cs
+System.Reflection/FieldInfo.cs
+System.Reflection/ICustomAttributeProvider.cs
+System.Reflection/InterfaceMapping.cs
+System.Reflection/InvalidFilterCriteriaException.cs
+System.Reflection/IReflect.cs
+System.Reflection/ManifestResourceInfo.cs
+System.Reflection/MemberFilter.cs
+System.Reflection/MemberInfo.cs
+System.Reflection/MemberTypes.cs
+System.Reflection/MethodAttributes.cs
+System.Reflection/MethodBase.cs
+System.Reflection/MethodImplAttributes.cs
+System.Reflection/MethodInfo.cs
+System.Reflection/Missing.cs
+System.Reflection/Module.cs
+System.Reflection/MonoEvent.cs
+System.Reflection/MonoField.cs
+System.Reflection/MonoMethod.cs
+System.Reflection/MonoProperty.cs
+System.Reflection/ParameterAttributes.cs
+System.Reflection/ParameterInfo.cs
+System.Reflection/ParameterModifier.cs
+System.Reflection/PropertyAttributes.cs
+System.Reflection/PropertyInfo.cs
+System.Reflection/ReflectionTypeLoadException.cs
+System.Reflection/ResourceAttributes.cs
+System.Reflection/ResourceLocation.cs
+System.Reflection/StrongNameKeyPair.cs
+System.Reflection/TargetException.cs
+System.Reflection/TargetInvocationException.cs
+System.Reflection/TargetParameterCountException.cs
+System.Reflection/TypeAttributes.cs
+System.Reflection/TypeDelegator.cs
+System.Reflection/TypeFilter.cs
+System.Reflection.Emit/AssemblyBuilder.cs
+System.Reflection.Emit/AssemblyBuilderAccess.cs
+System.Reflection.Emit/ConstructorBuilder.cs
+System.Reflection.Emit/CustomAttributeBuilder.cs
+System.Reflection.Emit/EnumBuilder.cs
+System.Reflection.Emit/EventBuilder.cs
+System.Reflection.Emit/EventToken.cs
+System.Reflection.Emit/FieldBuilder.cs
+System.Reflection.Emit/FieldToken.cs
+System.Reflection.Emit/FlowControl.cs
+System.Reflection.Emit/ILGenerator.cs
+System.Reflection.Emit/Label.cs
+System.Reflection.Emit/LocalBuilder.cs
+System.Reflection.Emit/MethodBuilder.cs
+System.Reflection.Emit/MethodToken.cs
+System.Reflection.Emit/ModuleBuilder.cs
+System.Reflection.Emit/MonoArrayMethod.cs
+System.Reflection.Emit/OpCode.cs
+System.Reflection.Emit/OpCodes.cs
+System.Reflection.Emit/OpCodeType.cs
+System.Reflection.Emit/OperandType.cs
+System.Reflection.Emit/PackingSize.cs
+System.Reflection.Emit/ParameterBuilder.cs
+System.Reflection.Emit/ParameterToken.cs
+System.Reflection.Emit/PEFileKinds.cs
+System.Reflection.Emit/PropertyBuilder.cs
+System.Reflection.Emit/PropertyToken.cs
+System.Reflection.Emit/SignatureHelper.cs
+System.Reflection.Emit/SignatureToken.cs
+System.Reflection.Emit/StackBehaviour.cs
+System.Reflection.Emit/StringToken.cs
+System.Reflection.Emit/TypeBuilder.cs
+System.Reflection.Emit/TypeToken.cs
+System.Reflection.Emit/UnmanagedMarshal.cs
+System.Resources/IResourceReader.cs
+System.Resources/IResourceWriter.cs
+System.Resources/MissingManifestResourceException.cs
+System.Resources/NeutralResourcesLanguageAttribute.cs
+System.Resources/ResourceManager.cs
+System.Resources/ResourceReader.cs
+System.Resources/ResourceSet.cs
+System.Resources/ResourceWriter.cs
+System.Resources/SatelliteContractVersionAttribute.cs
+System.Runtime.CompilerServices/AccessedThroughPropertyAttribute.cs
+System.Runtime.CompilerServices/CompilationRelaxationsAttribute.cs
+System.Runtime.CompilerServices/CustomConstantAttribute.cs
+System.Runtime.CompilerServices/DateTimeConstantAttribute.cs
+System.Runtime.CompilerServices/DecimalConstantAttribute.cs
+System.Runtime.CompilerServices/DiscardableAttribute.cs
+System.Runtime.CompilerServices/IDispatchConstantAttribute.cs
+System.Runtime.CompilerServices/IUnknownConstantAttribute.cs
+System.Runtime.CompilerServices/IndexerNameAttribute.cs
+System.Runtime.CompilerServices/MethodCodeType.cs
+System.Runtime.CompilerServices/MethodImplAttribute.cs
+System.Runtime.CompilerServices/MethodImplOptions.cs
+System.Runtime.CompilerServices/RequiredAttributeAttribute.cs
+System.Runtime.CompilerServices/RuntimeHelpers.cs
+System.Runtime.InteropServices/AssemblyRegistrationFlags.cs
+System.Runtime.InteropServices/AutomationProxyAttribute.cs
+System.Runtime.InteropServices/BINDPTR.cs
+System.Runtime.InteropServices/CallingConvention.cs
+System.Runtime.InteropServices/CharSet.cs
+System.Runtime.InteropServices/ClassInterfaceAttribute.cs
+System.Runtime.InteropServices/ClassInterfaceType.cs
+System.Runtime.InteropServices/CoClassAttribute.cs
+System.Runtime.InteropServices/ComAliasNameAttribute.cs
+System.Runtime.InteropServices/ComConversionLossAttribute.cs
+System.Runtime.InteropServices/ComEventInterfaceAttribute.cs
+System.Runtime.InteropServices/ComImportAttribute.cs
+System.Runtime.InteropServices/ComInterfaceType.cs
+System.Runtime.InteropServices/ComMemberType.cs
+System.Runtime.InteropServices/ComRegisterFunctionAttribute.cs
+System.Runtime.InteropServices/ComUnregisterFunctionAttribute.cs
+System.Runtime.InteropServices/ComVisible.cs
+System.Runtime.InteropServices/DESCKIND.cs
+System.Runtime.InteropServices/DISPPARAMS.cs
+System.Runtime.InteropServices/DispIdAttribute.cs
+System.Runtime.InteropServices/DllImportAttribute.cs
+System.Runtime.InteropServices/EXCEPINFO.cs
+System.Runtime.InteropServices/ExporterEventKind.cs
+System.Runtime.InteropServices/ExternalException.cs
+System.Runtime.InteropServices/FieldOffsetAttribute.cs
+System.Runtime.InteropServices/GCHandle.cs
+System.Runtime.InteropServices/GCHandleType.cs
+System.Runtime.InteropServices/GuidAttribute.cs
+System.Runtime.InteropServices/ICustomAdapter.cs
+System.Runtime.InteropServices/ICustomFactory.cs
+System.Runtime.InteropServices/ICustomMarshaler.cs
+System.Runtime.InteropServices/INVOKEKIND.cs
+System.Runtime.InteropServices/IRegistrationServices.cs
+System.Runtime.InteropServices/ITypeLibConverter.cs
+System.Runtime.InteropServices/ITypeLibExporterNameProvider.cs
+System.Runtime.InteropServices/ITypeLibExporterNotifySink.cs
+System.Runtime.InteropServices/ITypeLibImporterNotifySink.cs
+System.Runtime.InteropServices/ImportedFromTypeLibAttribute.cs
+System.Runtime.InteropServices/ImporterEventKind.cs
+System.Runtime.InteropServices/InAttribute.cs
+System.Runtime.InteropServices/InterfaceTypeAttribute.cs
+System.Runtime.InteropServices/LCIDConversionAttribute.cs
+System.Runtime.InteropServices/LayoutKind.cs
+System.Runtime.InteropServices/Marshal.cs
+System.Runtime.InteropServices/MarshalAsAttribute.cs
+System.Runtime.InteropServices/OptionalAttribute.cs
+System.Runtime.InteropServices/OutAttribute.cs
+System.Runtime.InteropServices/PreserveSigAttribute.cs
+System.Runtime.InteropServices/PrimaryInteropAssemblyAttribute.cs
+System.Runtime.InteropServices/ProgIdAttribute.cs
+System.Runtime.InteropServices/StructLayoutAttribute.cs
+System.Runtime.InteropServices/TYPEKIND.cs
+System.Runtime.InteropServices/TypeLibExporterFlags.cs
+System.Runtime.InteropServices/TypeLibFuncAttribute.cs
+System.Runtime.InteropServices/TypeLibFuncFlags.cs
+System.Runtime.InteropServices/TypeLibTypeAttribute.cs
+System.Runtime.InteropServices/TypeLibTypeFlags.cs
+System.Runtime.InteropServices/TypeLibVarAttribute.cs
+System.Runtime.InteropServices/TypeLibVarFlags.cs
+System.Runtime.InteropServices/UCOMTypeComp.cs
+System.Runtime.InteropServices/UCOMTypeInfo.cs
+System.Runtime.InteropServices/UCOMTypeLib.cs
+System.Runtime.InteropServices/UnmanagedType.cs
+System.Runtime.InteropServices/VarEnum.cs
+System.Runtime.Remoting/ActivatedClientTypeEntry.cs
+System.Runtime.Remoting/ActivatedServiceTypeEntry.cs
+System.Runtime.Remoting/IObjectHandle.cs
+System.Runtime.Remoting/IChannelInfo.cs
+System.Runtime.Remoting/IEnvoyInfo.cs
+System.Runtime.Remoting/IRemotingTypeInfo.cs
+System.Runtime.Remoting/ObjectHandle.cs
+System.Runtime.Remoting/ObjRef.cs
+System.Runtime.Remoting/RemotingException.cs
+System.Runtime.Remoting/RemotingTimeoutException.cs
+System.Runtime.Remoting/RemotingServices.cs
+System.Runtime.Remoting/ServerException.cs
+System.Runtime.Remoting/TypeEntry.cs
+System.Runtime.Remoting/WellKnownObjectMode.cs
+System.Runtime.Remoting/WellKnownClientTypeEntry.cs
+System.Runtime.Remoting/WellKnownServiceTypeEntry.cs
+System.Runtime.Remoting.Activation/ActivatorLevel.cs
+System.Runtime.Remoting.Activation/IActivator.cs
+System.Runtime.Remoting.Activation/IConstructionCallMessage.cs
+System.Runtime.Remoting.Activation/IConstructionReturnMessage.cs
+System.Runtime.Remoting.Channels/BaseChannelObjectWithProperties.cs
+System.Runtime.Remoting.Channels/BaseChannelSinkWithProperties.cs
+System.Runtime.Remoting.Channels/BaseChannelWithProperties.cs
+System.Runtime.Remoting.Channels/ChannelDataStore.cs
+System.Runtime.Remoting.Channels/ChannelServices.cs
+System.Runtime.Remoting.Channels/ClientChannelSinkStack.cs
+System.Runtime.Remoting.Channels/IChannel.cs
+System.Runtime.Remoting.Channels/IChannelDataStore.cs
+System.Runtime.Remoting.Channels/IChannelReceiver.cs
+System.Runtime.Remoting.Channels/IChannelSender.cs
+System.Runtime.Remoting.Channels/IChannelSinkBase.cs
+System.Runtime.Remoting.Channels/IClientChannelSink.cs
+System.Runtime.Remoting.Channels/IClientChannelSinkProvider.cs
+System.Runtime.Remoting.Channels/IClientChannelSinkStack.cs
+System.Runtime.Remoting.Channels/IClientFormatterSink.cs
+System.Runtime.Remoting.Channels/IClientFormatterSinkProvider.cs
+System.Runtime.Remoting.Channels/IClientResponseChannelSinkStack.cs
+System.Runtime.Remoting.Channels/IServerResponseChannelSinkStack.cs
+System.Runtime.Remoting.Channels/IServerChannelSink.cs
+System.Runtime.Remoting.Channels/IServerChannelSinkProvider.cs
+System.Runtime.Remoting.Channels/IServerChannelSinkStack.cs
+System.Runtime.Remoting.Channels/IServerFormatterSinkProvider.cs
+System.Runtime.Remoting.Channels/ITransportHeaders.cs
+System.Runtime.Remoting.Channels/ServerChannelSinkStack.cs
+System.Runtime.Remoting.Channels/ServerProcessing.cs
+System.Runtime.Remoting.Channels/SinkProviderData.cs
+System.Runtime.Remoting.Channels/TransportHeaders.cs
+System.Runtime.Remoting.Contexts/Context.cs
+System.Runtime.Remoting.Contexts/ContextProperty.cs
+System.Runtime.Remoting.Contexts/CrossContextDelegate.cs
+System.Runtime.Remoting.Contexts/IContextAttribute.cs
+System.Runtime.Remoting.Contexts/IContextProperty.cs
+System.Runtime.Remoting.Contexts/IContributeClientContextSink.cs
+System.Runtime.Remoting.Contexts/IContributeServerContextSink.cs
+System.Runtime.Remoting.Contexts/IDynamicMessageSink.cs
+System.Runtime.Remoting.Contexts/IDynamicProperty.cs
+System.Runtime.Remoting.Lifetime/ClientSponsor.cs
+System.Runtime.Remoting.Lifetime/ILease.cs
+System.Runtime.Remoting.Lifetime/ISponsor.cs
+System.Runtime.Remoting.Lifetime/LeaseState.cs
+System.Runtime.Remoting.Lifetime/LifetimeServices.cs
+System.Runtime.Remoting.Messaging/AsyncResult.cs
+System.Runtime.Remoting.Messaging/Header.cs
+System.Runtime.Remoting.Messaging/HeaderHandler.cs
+System.Runtime.Remoting.Messaging/IMessage.cs
+System.Runtime.Remoting.Messaging/IMessageCtrl.cs
+System.Runtime.Remoting.Messaging/IMessageSink.cs
+System.Runtime.Remoting.Messaging/IMethodCallMessage.cs
+System.Runtime.Remoting.Messaging/IMethodMessage.cs
+System.Runtime.Remoting.Messaging/IMethodReturnMessage.cs
+System.Runtime.Remoting.Messaging/IRemotingFormatter.cs
+System.Runtime.Remoting.Messaging/InternalMessageWrapper.cs
+System.Runtime.Remoting.Messaging/LogicalCallContext.cs
+System.Runtime.Remoting.Messaging/MessageSurrogateFilter.cs
+System.Runtime.Remoting.Messaging/MethodCall.cs
+System.Runtime.Remoting.Messaging/MethodCallMessageWrapper.cs
+System.Runtime.Remoting.Messaging/MethodResponse.cs
+System.Runtime.Remoting.Messaging/MethodReturnMessageWrapper.cs
+System.Runtime.Remoting.Messaging/MonoMethodMessage.cs
+System.Runtime.Remoting.Messaging/OneWayAttribute.cs
+System.Runtime.Remoting.Messaging/RemotingSurrogateSelector.cs
+System.Runtime.Remoting.Messaging/ReturnMessage.cs
+System.Runtime.Remoting.Metadata/SoapAttribute.cs
+System.Runtime.Remoting.Metadata/SoapFieldAttribute.cs
+System.Runtime.Remoting.Metadata/SoapMethodAttribute.cs
+System.Runtime.Remoting.Metadata/SoapOption.cs
+System.Runtime.Remoting.Metadata/SoapParameterAttribute.cs
+System.Runtime.Remoting.Metadata/SoapTypeAttribute.cs
+System.Runtime.Remoting.Metadata/XmlFieldOrderOption.cs
+System.Runtime.Remoting.Proxies/RealProxy.cs
+System.Runtime.Remoting.Proxies/RemotingProxy.cs
+System.Runtime.Remoting.Proxies/ProxyAttribute.cs
+System.Runtime.Remoting.Services/ITrackingHandler.cs
+System.Runtime.Serialization/FormatterConverter.cs
+System.Runtime.Serialization/FormatterServices.cs
+System.Runtime.Serialization/IDeserializationCallback.cs
+System.Runtime.Serialization/IFormatter.cs
+System.Runtime.Serialization/IFormatterConverter.cs
+System.Runtime.Serialization/IObjectReference.cs
+System.Runtime.Serialization/ISerializable.cs
+System.Runtime.Serialization/ISerializationSurrogate.cs
+System.Runtime.Serialization/ISurrogateSelector.cs
+System.Runtime.Serialization/ObjectIDGenerator.cs
+System.Runtime.Serialization/SerializationBinder.cs
+System.Runtime.Serialization/SerializationEntry.cs
+System.Runtime.Serialization/SerializationException.cs
+System.Runtime.Serialization/SerializationInfo.cs
+System.Runtime.Serialization/SerializationInfoEnumerator.cs
+System.Runtime.Serialization/StreamingContext.cs
+System.Runtime.Serialization/StreamingContextStates.cs
+System.Runtime.Serialization/SurrogateSelector.cs
+System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.cs
+System.Runtime.Serialization.Formatters/FormatterTopObjectStyle.cs
+System.Runtime.Serialization.Formatters/FormatterTypeStyle.cs
+System.Runtime.Serialization.Formatters/IFieldInfo.cs
+System.Runtime.Serialization.Formatters/InternalArrayTypeE.cs
+System.Runtime.Serialization.Formatters/InternalElementTypeE.cs
+System.Runtime.Serialization.Formatters/InternalMemberTypeE.cs
+System.Runtime.Serialization.Formatters/InternalMemberValueE.cs
+System.Runtime.Serialization.Formatters/InternalNameSpaceE.cs
+System.Runtime.Serialization.Formatters/InternalObjectPositionE.cs
+System.Runtime.Serialization.Formatters/InternalObjectTypeE.cs
+System.Runtime.Serialization.Formatters/InternalParseStateE.cs
+System.Runtime.Serialization.Formatters/InternalParseTypeE.cs
+System.Runtime.Serialization.Formatters/InternalPrimitiveTypeE.cs
+System.Runtime.Serialization.Formatters/InternalSerializerTypeE.cs
+System.Runtime.Serialization.Formatters/ISoapMessage.cs
+System.Runtime.Serialization.Formatters/ServerFault.cs
+System.Runtime.Serialization.Formatters/SoapFault.cs
+System.Runtime.Serialization.Formatters/SoapMessage.cs
+System.Runtime.Serialization.Formatters.Binary/BinaryFormatter.cs
+System.Security/CodeAccessPermission.cs
+System.Security/IEvidenceFactory.cs
+System.Security/IPermission.cs
+System.Security/ISecurityEncodable.cs
+System.Security/ISecurityPolicyEncodable.cs
+System.Security/IStackWalk.cs
+System.Security/NamedPermissionSet.cs
+System.Security/PermissionSet.cs
+System.Security/PolicyLevelType.cs
+System.Security/SecurityElement.cs
+System.Security/SecurityException.cs
+System.Security/SecurityManager.cs
+System.Security/SecurityZone.cs
+System.Security/SuppressUnmanagedCodeSecurityAttribute.cs
+System.Security/UnverifiableCodeAttribute.cs
+System.Security/VerificationException.cs
+System.Security/XmlSyntaxException.cs
+System.Security.Cryptography/AsymmetricAlgorithm.cs
+System.Security.Cryptography/AsymmetricKeyExchangeDeformatter.cs
+System.Security.Cryptography/AsymmetricKeyExchangeFormatter.cs
+System.Security.Cryptography/AsymmetricSignatureDeformatter.cs
+System.Security.Cryptography/AsymmetricSignatureFormatter.cs
+System.Security.Cryptography/CipherMode.cs
+System.Security.Cryptography/CryptoAPITransform.cs
+System.Security.Cryptography/CryptographicException.cs
+System.Security.Cryptography/CryptographicUnexpectedOperationExcpetion.cs
+System.Security.Cryptography/CryptoStream.cs
+System.Security.Cryptography/CryptoStreamMode.cs
+System.Security.Cryptography/CspParameters.cs
+System.Security.Cryptography/CspProviderFlags.cs
+System.Security.Cryptography/DeriveBytes.cs
+System.Security.Cryptography/DES.cs
+System.Security.Cryptography/DESCryptoServiceProvider.cs
+System.Security.Cryptography/DSA.cs
+System.Security.Cryptography/DSACryptoServiceProvider.cs
+System.Security.Cryptography/DSAParameters.cs
+System.Security.Cryptography/DSASignatureDeformatter.cs
+System.Security.Cryptography/DSASignatureFormatter.cs
+System.Security.Cryptography/FromBase64Transform.cs
+System.Security.Cryptography/HashAlgorithm.cs
+System.Security.Cryptography/ICryptoTransform.cs
+System.Security.Cryptography/KeySizes.cs
+System.Security.Cryptography/MD5.cs
+System.Security.Cryptography/MD5CryptoServiceProvider.cs
+System.Security.Cryptography/PaddingMode.cs
+System.Security.Cryptography/RandomNumberGenerator.cs
+System.Security.Cryptography/Rijndael.cs
+System.Security.Cryptography/RijndaelManaged.cs
+System.Security.Cryptography/RNGCryptoServiceProvider.cs
+System.Security.Cryptography/RSA.cs
+System.Security.Cryptography/RSAParameters.cs
+System.Security.Cryptography/SHA1.cs
+System.Security.Cryptography/SHA1CryptoServiceProvider.cs
+System.Security.Cryptography/SHA256.cs
+System.Security.Cryptography/SHA256Managed.cs
+System.Security.Cryptography/SHA384.cs
+System.Security.Cryptography/SHA384Managed.cs
+System.Security.Cryptography/SHA512.cs
+System.Security.Cryptography/SHA512Managed.cs
+System.Security.Cryptography/SignatureDescription.cs
+System.Security.Cryptography/SymmetricAlgorithm.cs
+System.Security.Cryptography/ToBase64Transform.cs
+System.Security.Cryptography/X509Certificates.cs
+System.Security.Permissions/CodeAccessSecurityAttribute.cs
+System.Security.Permissions/EnvironmentPermission.cs
+System.Security.Permissions/EnvironmentPermissionAccess.cs
+System.Security.Permissions/EnvironmentPermissionAttribute.cs
+System.Security.Permissions/FileDialogPermissionAccess.cs
+System.Security.Permissions/FileDialogPermissionAttribute.cs
+System.Security.Permissions/FileIOPermission.cs
+System.Security.Permissions/FileIOPermissionAccess.cs
+System.Security.Permissions/FileIOPermissionAttribute.cs
+System.Security.Permissions/IsolatedStorageContainment.cs
+System.Security.Permissions/IsolatedStorageFilePermissionAttribute.cs
+System.Security.Permissions/IsolatedStoragePermission.cs
+System.Security.Permissions/IsolatedStoragePermissionAttribute.cs
+System.Security.Permissions/IUnrestrictedPermission.cs
+System.Security.Permissions/PermissionSetAttribute.cs
+System.Security.Permissions/PermissionState.cs
+System.Security.Permissions/PrincipalPermissionAttribute.cs
+System.Security.Permissions/ReflectionPermission.cs
+System.Security.Permissions/ReflectionPermissionAttribute.cs
+System.Security.Permissions/ReflectionPermissionFlag.cs
+System.Security.Permissions/RegistryPermissionAccess.cs
+System.Security.Permissions/RegistryPermissionAttribute.cs
+System.Security.Permissions/SecurityAction.cs
+System.Security.Permissions/SecurityAttribute.cs
+System.Security.Permissions/SecurityPermission.cs
+System.Security.Permissions/SecurityPermissionFlag.cs
+System.Security.Permissions/SiteIdentityPermissionAttribute.cs
+System.Security.Permissions/StrongNamePermissionAttribute.cs
+System.Security.Permissions/UIPermissionAttribute.cs
+System.Security.Permissions/UIPermissionClipboard.cs
+System.Security.Permissions/UIPermissionWindow.cs
+System.Security.Permissions/UrlIdentityPermissionAttribute.cs
+System.Security.Permissions/ZoneIdentityPermissionAttribute.cs
+System.Security.Policy/AllMembershipCondition.cs
+System.Security.Policy/ApplicationDirectoryMembershipCondition.cs
+System.Security.Policy/CodeGroup.cs
+System.Security.Policy/Evidence.cs
+System.Security.Policy/FileCodeGroup.cs
+System.Security.Policy/IIdentityPermissionFactory.cs
+System.Security.Policy/IMembershipCondition.cs
+System.Security.Policy/PolicyException.cs
+System.Security.Policy/PolicyLevel.cs
+System.Security.Policy/PolicyStatement.cs
+System.Security.Policy/PolicyStatementAttribute.cs
+System.Security.Principal/GenericIdentity.cs
+System.Security.Principal/GenericPrincipal.cs
+System.Security.Principal/IIdentity.cs
+System.Security.Principal/IPrincipal.cs
+System.Security.Principal/PrincipalPolicy.cs
+System.Security.Principal/WindowsAccountType.cs
+System.Security.Principal/WindowsBuiltInRole.cs
+System.Text/ASCIIEncoding.cs
+System.Text/Decoder.cs
+System.Text/DefaultEncoding.cs
+System.Text/Encoder.cs
+System.Text/Encoding.cs
+System.Text/Latin1Encoding.cs
+System.Text/StringBuilder.cs
+System.Text/UnicodeEncoding.cs
+System.Text/UTF7Encoding.cs
+System.Text/UTF8Encoding.cs
+System.Threading/ApartmentState.cs
+System.Threading/AutoResetEvent.cs
+System.Threading/Interlocked.cs
+System.Threading/IOCompletionCallback.cs
+System.Threading/LockCookie.cs
+System.Threading/ManualResetEvent.cs
+System.Threading/Monitor.cs
+System.Threading/Mutex.cs
+System.Threading/NativeEventCalls.cs
+System.Threading/NativeOverlapped.cs
+System.Threading/Overlapped.cs
+System.Threading/ReaderWriterLock.cs
+System.Threading/RegisteredWaitHandle.cs
+System.Threading/SynchronizationLockException.cs
+System.Threading/Thread.cs
+System.Threading/ThreadAbortException.cs
+System.Threading/ThreadInterruptedException.cs
+System.Threading/ThreadPool.cs
+System.Threading/ThreadPriority.cs
+System.Threading/ThreadStart.cs
+System.Threading/ThreadState.cs
+System.Threading/ThreadStateException.cs
+System.Threading/Timeout.cs
+System.Threading/Timer.cs
+System.Threading/TimerCallback.cs
+System.Threading/WaitCallback.cs
+System.Threading/WaitHandle.cs
+System.Threading/WaitOrTimerCallback.cs
diff --git a/mcs/class/executable.make b/mcs/class/executable.make
new file mode 100644
index 00000000000..566b73cd17b
--- /dev/null
+++ b/mcs/class/executable.make
@@ -0,0 +1,28 @@
+MCS = mcs
+MCS_FLAGS = --target exe
+INSTALL = /usr/bin/install
+prefix = /usr
+
+all: $(PROGRAM)
+
+clean:
+	-rm -rf $(PROGRAM) .response-exe .makefrag-exe
+
+.response-exe: $(PROGRAM_LIST)
+	cat $^ |egrep '\.cs$$' >$@
+
+.makefrag-exe: $(PROGRAM_LIST)
+	echo -n "program-deps: " >$@.new
+	cat $^ |egrep '\.cs$$' | sed -e 's,\.cs,.cs \\,' >>$@.new
+	cat $@.new |sed -e '$$s, \\$$,,' >$@
+	rm -rf $@.new
+
+-include .makefrag-exe
+
+$(PROGRAM): .response-exe .makefrag-exe #program-deps
+	$(MCS) $(MCS_FLAGS) -o $(PROGRAM) $(PROGRAM_FLAGS) @.response-exe
+
+install: all
+	mkdir -p $(prefix)/bin/
+	$(INSTALL) -m 755 $(PROGRAM) $(prefix)/bin/
+
diff --git a/mcs/class/lib/.cvsignore b/mcs/class/lib/.cvsignore
new file mode 100644
index 00000000000..335c71fd7fa
--- /dev/null
+++ b/mcs/class/lib/.cvsignore
@@ -0,0 +1,2 @@
+*.dll
+*.pdb
diff --git a/mcs/class/library.build b/mcs/class/library.build
new file mode 100644
index 00000000000..20cbe2204ee
--- /dev/null
+++ b/mcs/class/library.build
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<!-- NAnt build file for class libraries -->
+<!-- Target windows builds libraries _for_ windows -->
+<!-- Target linux builds libraries _for_ linux -->
+
+<project name="corlib" default="build">
+	<property name="debug" value="false"/>
+
+	<target name="build">
+		<nant basedir="corlib" target="build"/>
+		<nant basedir="I18N" target="build"/>
+		<nant basedir="System" target="build"/>
+		<nant basedir="System.Drawing" target="build"/>
+		<nant basedir="System.EnterpriseServices" target="build"/>
+		<nant basedir="System.XML" target="build"/>
+		<nant basedir="System.Data" target="build"/>
+		<nant basedir="System.Web" target="build"/>
+		<nant basedir="System.Web.Services" target="build"/>
+		<nant basedir="Microsoft.VisualBasic" target="build"/>
+		<nant basedir="System.Configuration.Install" target="build"/>
+		<nant basedir="System.Runtime.Remoting" target="build"/>
+	</target>
+
+	<target name="test">
+		<nant basedir="corlib" target="test"/>
+		<nant basedir="System" target="test"/>
+		<nant basedir="System.XML" target="test"/>
+		<nant basedir="System.Data" target="test"/>
+		<nant basedir="System.Web.Services" target="test"/>
+		<nant basedir="Microsoft.VisualBasic" target="test"/>
+		<nant basedir="System.Configuration.Install" target="test"/>
+	</target>
+
+	<target name="clean">
+		<delete failonerror="false">
+			<fileset basedir="lib">
+				<includes name="*.dll"/>
+			</fileset>
+		</delete>
+		<nant basedir="corlib" target="clean"/>
+		<nant basedir="I18N" target="clean"/>
+		<nant basedir="System" target="clean"/>
+		<nant basedir="System.Drawing" target="clean"/>
+		<nant basedir="System.XML" target="clean"/>
+		<nant basedir="System.Data" target="clean"/>
+		<nant basedir="System.Web.Services" target="clean"/>
+		<nant basedir="Microsoft.VisualBasic" target="clean"/>
+		<nant basedir="System.Configuration.Install" target="clean"/>
+	</target>
+</project>
diff --git a/mcs/class/library.make b/mcs/class/library.make
new file mode 100644
index 00000000000..9e33c323b7b
--- /dev/null
+++ b/mcs/class/library.make
@@ -0,0 +1,54 @@
+#USE_SOURCE_RULES=1
+RUNTIME = mono
+MCS = $(RUNTIME) $(topdir)/mcs/mcs.exe
+MCS_FLAGS = --target library --noconfig
+INSTALL = /usr/bin/install
+prefix = /usr
+
+
+SOURCES_CMD=find . \
+	! \( $(SOURCES_INCLUDE:%=! -path '%' ) \) -a	\
+	  \( $(SOURCES_EXCLUDE:%=! -path '%' ) ! -path '/dev/null' \) -a	\
+	  ! -path '*/__*.cs'
+
+
+all: .makefrag $(LIBRARY)
+
+clean:
+	-rm -rf $(LIBRARY) .response .makefrag library-deps.stamp
+
+
+ifdef USE_SOURCE_RULES
+
+.PHONY: .makefrag
+.makefrag:
+	@echo -n "SOURCES=" >$@
+	@$(SOURCES_CMD) | tee .response | sed -e 's/$$/ \\/' >>$@
+
+else
+
+.response: $(LIB_LIST)
+	cat $^ |egrep '\.cs$$' >$@
+
+.makefrag: $(LIB_LIST) $(topdir)/class/library.make
+	echo -n "library-deps.stamp: " >$@.new
+	cat $< |egrep '\.cs$$' | sed -e 's,\.cs,.cs \\,' >>$@.new
+	cat $@.new |sed -e '$$s, \\$$,,' >$@
+	echo -e "\ttouch library-deps.stamp" >>$@
+	rm -rf $@.new
+
+endif
+
+-include .makefrag
+
+ifdef USE_SOURCE_RULES
+$(LIBRARY): $(SOURCES) $(topdir)/class/library.make
+else
+$(LIBRARY): .response library-deps.stamp
+endif
+	MONO_PATH=$(MONO_PATH_PREFIX)$(MONO_PATH) $(MCS) $(MCS_FLAGS) -o $(LIBRARY) $(LIB_FLAGS) @.response
+
+install: all
+	mkdir -p $(prefix)/lib/
+	$(INSTALL) -m 644 $(LIBRARY) $(prefix)/lib/
+
diff --git a/mcs/class/makefile b/mcs/class/makefile
new file mode 100644
index 00000000000..d619d4f87f3
--- /dev/null
+++ b/mcs/class/makefile
@@ -0,0 +1,15 @@
+NANT	= ../nant/NAnt.exe
+
+all: linux
+
+linux:
+	$(NANT)
+
+push:
+	scp lib/*.dll mono-cvs:libs
+
+test:
+	$(NANT) test
+
+clean:
+	$(NANT) clean
diff --git a/mcs/class/makefile.gnu b/mcs/class/makefile.gnu
new file mode 100644
index 00000000000..a661a242de9
--- /dev/null
+++ b/mcs/class/makefile.gnu
@@ -0,0 +1,31 @@
+INSTALL = /usr/bin/install
+prefix = /usr
+
+DIRS =	corlib				\
+	I18N				\
+	System				\
+	System.XML			\
+	System.Drawing			\
+	System.Data			\
+	System.EnterpriseServices	\
+	System.Web			\
+	System.Web.Services		\
+	System.Runtime.Remoting		\
+	System.Runtime.Serialization.Formatters.Soap \
+	System.Configuration.Install \
+	Mono.CSharp.Debugger		\
+	Microsoft.VisualBasic
+
+default: all
+
+all clean:
+	@for i in $(DIRS) ; do \
+		if [ -d "$$i" ] && [ -f "$$i/makefile.gnu" ] ; then	\
+			(cd $$i && $(MAKE) -f makefile.gnu $@) || exit 1; \
+		fi	\
+	done
+
+install: all
+	mkdir -p $(prefix)/lib/
+	$(INSTALL) -m 644 lib/*.dll $(prefix)/lib/
+
diff --git a/mcs/class/notes/BitVecto32.txt b/mcs/class/notes/BitVecto32.txt
new file mode 100644
index 00000000000..fad747dfe76
--- /dev/null
+++ b/mcs/class/notes/BitVecto32.txt
@@ -0,0 +1,6 @@
+* Why does CreateSection take a short for the range number?
+
+  It would seem like it should be possible to have numbers between 0
+  and UInt32.MaxValue in there.   Why is the API limiting things to 16
+  bits?
+
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom.Compiler/CodeGenerator.xml b/mcs/docs/apidocs/xml/en/System.CodeDom.Compiler/CodeGenerator.xml
new file mode 100644
index 00000000000..2c8646250ba
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom.Compiler/CodeGenerator.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.Compiler.CodeGenerator" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="isCurrentClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="isCurrentDelegate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="isCurrentEnum">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="isCurrentInterface">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="isCurrentStruct">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="CurrentClassName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentMember">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentMemberName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Indent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsCurrentClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsCurrentDelegate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsCurrentEnum">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsCurrentInterface">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsCurrentStruct">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Output">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ValidateIdentifier(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsValidIdentifier(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GenerateCodeFromStatement(System.IO.TextWriter, System.CodeDom.CodeStatement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="output">TODO</param>

+            <param name="expression">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GenerateCodeFromNamespace(System.IO.TextWriter, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="output">TODO</param>

+            <param name="expression">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GenerateCodeFromExpression(System.IO.TextWriter, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="output">TODO</param>

+            <param name="expression">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsValidLanguateIndependentIdentifier(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom.Compiler/ICodeGenerator.xml b/mcs/docs/apidocs/xml/en/System.CodeDom.Compiler/ICodeGenerator.xml
new file mode 100644
index 00000000000..462a3d7624f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom.Compiler/ICodeGenerator.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.CodeDom.Compiler.ICodeGenerator" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeArrayCreateExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeArrayCreateExpression.xml
new file mode 100644
index 00000000000..b8e8b9878e0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeArrayCreateExpression.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeArrayCreateExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeArrayCreateExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeArrayCreateExpression(System.String, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="createType">TODO</param>

+            <param name="size">TODO</param>

+        </constructor>

+        <constructor name="CodeArrayCreateExpression(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="createType">TODO</param>

+            <param name="size">TODO</param>

+        </constructor>

+        <constructor name="CodeArrayCreateExpression(System.String, System.CodeDom.CodeExpression[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="createType">TODO</param>

+            <param name="initializers">TODO</param>

+        </constructor>

+        <property name="SizeExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Size">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Initializers">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CreateType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAssignStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAssignStatement.xml
new file mode 100644
index 00000000000..262a7392730
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAssignStatement.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeAssignStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeAssignStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeAssignStatement(System.CodeDom.CodeExpression, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="left">TODO</param>

+            <param name="right">TODO</param>

+        </constructor>

+        <property name="Left">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Right">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttachEventStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttachEventStatement.xml
new file mode 100644
index 00000000000..d1266e6fc4f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttachEventStatement.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeAttachEventStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeAttachEventStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeAttachEventStatement(System.CodeDom.CodeExpression, System.String, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="eventName">TODO</param>

+            <param name="newListener">TODO</param>

+        </constructor>

+        <property name="EventName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NewListener">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TargetObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeArgument.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeArgument.xml
new file mode 100644
index 00000000000..0bae2c15f09
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeArgument.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeAttributeArgument" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeAttributeArgument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeAttributeArgument(System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="CodeAttributeArgument(System.String, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="val">TODO</param>

+        </constructor>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeArgumentCollection.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeArgumentCollection.xml
new file mode 100644
index 00000000000..fb1a8ea598d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeArgumentCollection.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeAttributeArgumentCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeAttributeArgumentCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.CodeDom.CodeAttributeArgument)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.CodeDom.CodeAttributeArgument[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeBlock.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeBlock.xml
new file mode 100644
index 00000000000..a5be704038c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeBlock.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeAttributeBlock" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeAttributeBlock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeAttributeBlock(System.CodeDom.CodeAttributeDeclaration[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributes">TODO</param>

+        </constructor>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeDeclaration.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeDeclaration.xml
new file mode 100644
index 00000000000..be68281d8c6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeDeclaration.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeAttributeDeclaration" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeAttributeDeclaration">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeAttributeDeclaration(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <constructor name="CodeAttributeDeclaration(System.String, System.CodeDom.CodeAttributeArgument[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="arguments">TODO</param>

+        </constructor>

+        <property name="Arguments">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeDeclarationCollection.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeDeclarationCollection.xml
new file mode 100644
index 00000000000..81d85a06dda
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeAttributeDeclarationCollection.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeAttributeDeclarationCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeAttributeDeclarationCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.CodeDom.CodeAttributeDeclaration)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.CodeDom.CodeAttributeDeclaration[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeBaseReferenceExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeBaseReferenceExpression.xml
new file mode 100644
index 00000000000..53d58e722d3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeBaseReferenceExpression.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeBaseReferenceExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeBaseReferenceExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeBinaryOperatorExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeBinaryOperatorExpression.xml
new file mode 100644
index 00000000000..3384b74114f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeBinaryOperatorExpression.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeBinaryOperatorExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeBinaryOperatorType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeBinaryOperatorType(System.CodeDom.CodeExpression, System.CodeDom.CodeBinaryOperatorExpression.CodeBinaryOperatorType, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="left">TODO</param>

+            <param name="oper">TODO</param>

+            <param name="right">TODO</param>

+        </constructor>

+        <property name="Left">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Right">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Operator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeBinaryOperatorType.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeBinaryOperatorType.xml
new file mode 100644
index 00000000000..3fd58201cfa
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeBinaryOperatorType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.CodeDom.CodeBinaryOperatorType" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCastExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCastExpression.xml
new file mode 100644
index 00000000000..381b67c4524
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCastExpression.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeCastExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeCastExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeCastExpression(System.String, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetType">TODO</param>

+            <param name="expression">TODO</param>

+        </constructor>

+        <property name="Expression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TargetType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCatchClause.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCatchClause.xml
new file mode 100644
index 00000000000..132696ca756
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCatchClause.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeCatchClause" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeCatchClause">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeCatchClause(System.CodeDom.CodeParameterDeclarationExpression, System.CodeDom.CodeStatement[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="statements">TODO</param>

+        </constructor>

+        <property name="Statements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Condition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCatchClauseCollection.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCatchClauseCollection.xml
new file mode 100644
index 00000000000..079b59bd95b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCatchClauseCollection.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeCatchClauseCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeCatchClauseCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.CodeDom.CodeCatchClause)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.CodeDom.CodeCatchClause[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClass.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClass.xml
new file mode 100644
index 00000000000..482bec6431e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClass.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeClass" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeClass(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <property name="attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsEnum">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsInterface">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsStruct">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Members">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassCollection.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassCollection.xml
new file mode 100644
index 00000000000..d25d3381423
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassCollection.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeClassCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeClassCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.CodeDom.CodeClass)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.CodeDom.CodeClass[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassConstructor.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassConstructor.xml
new file mode 100644
index 00000000000..27653767f21
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassConstructor.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeClassConstructor" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeClassConstructor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassDelegate.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassDelegate.xml
new file mode 100644
index 00000000000..a7e89a7e86d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassDelegate.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeClassDelegate" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeClassDelegate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeClassDelegate(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <property name="Parameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReturnType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassMember.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassMember.xml
new file mode 100644
index 00000000000..a98be1bef8c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassMember.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeClassMember" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MemberAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CustomAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassMemberCollection.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassMemberCollection.xml
new file mode 100644
index 00000000000..08a240e200b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeClassMemberCollection.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeClassMemberCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeClassMemberCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.CodeDom.CodeClassMember)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.CodeDom.CodeClassMember[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCommentStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCommentStatement.xml
new file mode 100644
index 00000000000..c42ebe9f451
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeCommentStatement.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeCommentStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeCommentStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeCommentStatement(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+        </constructor>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeConstructor.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeConstructor.xml
new file mode 100644
index 00000000000..940d88a4c68
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeConstructor.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeConstructor" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeConstructor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BaseConstructorArgs">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ChainedConstructorArgs">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDelegateCreateExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDelegateCreateExpression.xml
new file mode 100644
index 00000000000..ce19eec4cd4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDelegateCreateExpression.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeDelegateCreateExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeDelegateCreateExpression(System.String, System.CodeDom.CodeExpression, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="delegateType">TODO</param>

+            <param name="targetObject">TODO</param>

+            <param name="methodName">TODO</param>

+        </constructor>

+        <constructor name="CodeDelegateCreateExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="DelegateType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MethodName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TargetObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDelegateInvokeExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDelegateInvokeExpression.xml
new file mode 100644
index 00000000000..932732ada24
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDelegateInvokeExpression.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeDelegateInvokeExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeDelegateInvokeExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeDelegateInvokeExpression(System.CodeDom.CodeExpression, System.CodeDom.CodeExpression[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="parameters">TODO</param>

+        </constructor>

+        <constructor name="CodeDelegateInvokeExpression(System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+        </constructor>

+        <property name="TargetObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Parameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDelegateInvokeStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDelegateInvokeStatement.xml
new file mode 100644
index 00000000000..05c9e77b862
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDelegateInvokeStatement.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeDelegateInvokeStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeDelegateInvokeStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeDelegateInvokeStatement(System.CodeDom.CodeStatement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+        </constructor>

+        <constructor name="CodeDelegateInvokeStatement(System.CodeDom.CodeDelegateInvokeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="delegateInvoke">TODO</param>

+        </constructor>

+        <constructor name="CodeDelegateInvokeStatement(System.CodeDom.CodeStatement, System.CodeDom.CodeStatement[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="parameters">TODO</param>

+        </constructor>

+        <property name="DelegateInvoke">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDetachEventStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDetachEventStatement.xml
new file mode 100644
index 00000000000..1aafb197b69
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeDetachEventStatement.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeDetachEventStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeDetachEventStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeDetachEventStatement(System.CodeDom.CodeExpression, System.String, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="eventName">TODO</param>

+            <param name="newListener">TODO</param>

+        </constructor>

+        <property name="EventName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TargetObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NewListener">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeExpression.xml
new file mode 100644
index 00000000000..524b3c32db9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeExpression.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="UserData">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeExpressionCollection.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeExpressionCollection.xml
new file mode 100644
index 00000000000..9e539c2d417
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeExpressionCollection.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeExpressionCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeExpressionCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.CodeDom.CodeExpression[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeFieldReferenceExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeFieldReferenceExpression.xml
new file mode 100644
index 00000000000..82dd3f04fb4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeFieldReferenceExpression.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeFieldReferenceExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FieldDirection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="FieldDirection(System.CodeDom.CodeExpression, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="fieldName">TODO</param>

+        </constructor>

+        <property name="Direction">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FieldName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TargetObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeForLoopStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeForLoopStatement.xml
new file mode 100644
index 00000000000..86993c7c619
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeForLoopStatement.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeForLoopStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeForLoopStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeForLoopStatement(System.CodeDom.CodeStatement, System.CodeDom.CodeExpression, System.CodeDom.CodeStatement, System.CodeDom.CodeStatement[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="initStatement">TODO</param>

+            <param name="testExpression">TODO</param>

+            <param name="incrementStatement">TODO</param>

+            <param name="statements">TODO</param>

+        </constructor>

+        <property name="InitStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IncrementStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Statements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TestExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeIfStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeIfStatement.xml
new file mode 100644
index 00000000000..629b29d2b62
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeIfStatement.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeIfStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeIfStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeIfStatement(System.CodeDom.CodeExpression, System.CodeDom.CodeStatement[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="trueStatements">TODO</param>

+        </constructor>

+        <constructor name="CodeIfStatement(System.CodeDom.CodeExpression, System.CodeDom.CodeStatement[], System.CodeDom.CodeStatement[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="trueStatements">TODO</param>

+            <param name="falseStatements">TODO</param>

+        </constructor>

+        <property name="Condition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FalseStatements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TrueStatements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeIndexerExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeIndexerExpression.xml
new file mode 100644
index 00000000000..549f7400d38
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeIndexerExpression.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeIndexerExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeIndexerExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeIndexerExpression(System.CodeDom.CodeExpression, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="index">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLinePragma.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLinePragma.xml
new file mode 100644
index 00000000000..3c55370827b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLinePragma.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeLinePragma" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeLinePragma(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">TODO</param>

+            <param name="lineNumber">TODO</param>

+        </constructor>

+        <property name="FileName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LineNumber">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralClassMember.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralClassMember.xml
new file mode 100644
index 00000000000..2f3cee8fd07
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralClassMember.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeLiteralClassMember" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeLiteralClassMember">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeLiteralClassMember(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+        </constructor>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralExpression.xml
new file mode 100644
index 00000000000..ef4396e998f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralExpression.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeLiteralExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeLiteralExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeLiteralExpression(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralNamespace.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralNamespace.xml
new file mode 100644
index 00000000000..e7281bd205a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralNamespace.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeLiteralNamespace" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeLiteralNamespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LinePragma">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralStatement.xml
new file mode 100644
index 00000000000..e4f0e56a91b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeLiteralStatement.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeLiteralStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeLiteralStatement(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberEvent.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberEvent.xml
new file mode 100644
index 00000000000..3c4e9b3f5be
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberEvent.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeMemberEvent" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeMemberEvent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ImplementsType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PrivateImplements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Type">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberField.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberField.xml
new file mode 100644
index 00000000000..a0959219825
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberField.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeMemberField" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeMemberField">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeMemberField(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="name">TODO</param>

+        </constructor>

+        <property name="InitExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Type">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberMethod.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberMethod.xml
new file mode 100644
index 00000000000..e75321039b8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberMethod.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeMemberMethod" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeMemberMethod">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ImplementsType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PrivateImplements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReturnType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Parameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Statements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberProperty.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberProperty.xml
new file mode 100644
index 00000000000..424571ce0ca
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMemberProperty.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeMemberProperty" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeMemberProperty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ImplementsType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PrivateImplements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Parameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SetStatements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GetStatements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Type">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasGet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasSet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMethodInvokeExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMethodInvokeExpression.xml
new file mode 100644
index 00000000000..eaec26ed0ac
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMethodInvokeExpression.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeMethodInvokeExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeMethodInvokeExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeMethodInvokeExpression(System.CodeDom.CodeExpression, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="methodName">TODO</param>

+        </constructor>

+        <constructor name="CodeMethodInvokeExpression(System.CodeDom.CodeExpression, System.String, System.CodeDom.CodeExpression[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="methodName">TODO</param>

+            <param name="parameters">TODO</param>

+        </constructor>

+        <property name="MethodName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Parameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TargetObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMethodInvokeStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMethodInvokeStatement.xml
new file mode 100644
index 00000000000..23d691ef7a6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMethodInvokeStatement.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeMethodInvokeStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeMethodInvokeStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeMethodInvokeStatement(System.CodeDom.CodeMethodInvokeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="methodInvoke">TODO</param>

+        </constructor>

+        <constructor name="CodeMethodInvokeStatement(System.CodeDom.CodeExpression, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="methodName">TODO</param>

+        </constructor>

+        <constructor name="CodeMethodInvokeStatement(System.CodeDom.CodeExpression, System.String, System.CodeDom.CodeExpression[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="methodName">TODO</param>

+            <param name="parameters">TODO</param>

+        </constructor>

+        <property name="MethodName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Parameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TargetObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MethodInvoke">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMethodReturnStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMethodReturnStatement.xml
new file mode 100644
index 00000000000..640bf702d64
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeMethodReturnStatement.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeMethodReturnStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeMethodReturnStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeNamespace.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeNamespace.xml
new file mode 100644
index 00000000000..ceb7d8a7064
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeNamespace.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeNamespace" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeNamespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeNamespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <property name="AllowLateBound">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Classes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Imports">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RequireVariableDeclaration">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UserData">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeNamespaceImport.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeNamespaceImport.xml
new file mode 100644
index 00000000000..273bbf57612
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeNamespaceImport.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeNamespaceImport" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeNamespaceImport">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeNamespaceImport(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nameSpace">TODO</param>

+        </constructor>

+        <property name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeNamespaceImportCollection.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeNamespaceImportCollection.xml
new file mode 100644
index 00000000000..7b5d18880fa
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeNamespaceImportCollection.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeNamespaceImportCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeNamespaceImportCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.CodeDom.CodeNamespaceImport)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.CodeDom.CodeNamespaceImport[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeObject.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeObject.xml
new file mode 100644
index 00000000000..5ddcb0761d1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeObject.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeObject" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeObjectCreateExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeObjectCreateExpression.xml
new file mode 100644
index 00000000000..a02b887ca4c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeObjectCreateExpression.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeObjectCreateExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeObjectCreateExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeObjectCreateExpression(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="createType">TODO</param>

+        </constructor>

+        <constructor name="CodeObjectCreateExpression(System.String, System.CodeDom.CodeExpression[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="createType">TODO</param>

+            <param name="parameters">TODO</param>

+        </constructor>

+        <property name="CreateType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Parameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeParameterDeclarationExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeParameterDeclarationExpression.xml
new file mode 100644
index 00000000000..3fe1477c25f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeParameterDeclarationExpression.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeParameterDeclarationExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeParameterDeclarationExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeParameterDeclarationExpression(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="name">TODO</param>

+        </constructor>

+        <property name="Type">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CustomAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Direction">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeParameterDeclarationExpressionCollection.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeParameterDeclarationExpressionCollection.xml
new file mode 100644
index 00000000000..6031ed5aae4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeParameterDeclarationExpressionCollection.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeParameterDeclarationExpressionCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeParameterDeclarationExpressionCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.CodeDom.CodeParameterDeclarationExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.CodeDom.CodeParameterDeclarationExpression[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodePrimitiveExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodePrimitiveExpression.xml
new file mode 100644
index 00000000000..14093e2ea80
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodePrimitiveExpression.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodePrimitiveExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodePrimitiveExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodePrimitiveExpression(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodePropertyReferenceExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodePropertyReferenceExpression.xml
new file mode 100644
index 00000000000..223cf538fc6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodePropertyReferenceExpression.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodePropertyReferenceExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodePropertyReferenceExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodePropertyReferenceExpression(System.CodeDom.CodeExpression, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetObject">TODO</param>

+            <param name="propertyName">TODO</param>

+        </constructor>

+        <property name="Parameter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PropertyName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TargetObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeStatement.xml
new file mode 100644
index 00000000000..defd73cc6ce
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeStatement.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeStatementCollection.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeStatementCollection.xml
new file mode 100644
index 00000000000..ace507bd91b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeStatementCollection.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeStatementCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeStatementCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.CodeDom.CodeStatement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.CodeDom.CodeStatement[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeThisReferenceExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeThisReferenceExpression.xml
new file mode 100644
index 00000000000..a74de0cd721
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeThisReferenceExpression.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeThisReferenceExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeThisReferenceExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeThrowExceptionStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeThrowExceptionStatement.xml
new file mode 100644
index 00000000000..e3d1f2b8e7c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeThrowExceptionStatement.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeThrowExceptionStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeThrowExceptionStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeThrowExceptionStatement(System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="toThrow">TODO</param>

+        </constructor>

+        <property name="ToThrow">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTryCatchFinallyStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTryCatchFinallyStatement.xml
new file mode 100644
index 00000000000..95a52fafa35
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTryCatchFinallyStatement.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeTryCatchFinallyStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeTryCatchFinallyStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeTryCatchFinallyStatement(System.CodeDom.CodeStatement[], System.CodeDom.CodeCatchClause[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="tryStatements">TODO</param>

+            <param name="catchClauses">TODO</param>

+        </constructor>

+        <constructor name="CodeTryCatchFinallyStatement(System.CodeDom.CodeStatement[], System.CodeDom.CodeCatchClause[], System.CodeDom.CodeStatement[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="tryStatements">TODO</param>

+            <param name="catchClauses">TODO</param>

+            <param name="finallyStatements">TODO</param>

+        </constructor>

+        <property name="FinallyStatements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TryStatements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CatchClauses">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeDeclaration.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeDeclaration.xml
new file mode 100644
index 00000000000..45b5bdc6f92
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeDeclaration.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeTypeDeclaration" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeTypeDeclaration">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeMember.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeMember.xml
new file mode 100644
index 00000000000..72f38c7e168
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeMember.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeTypeMember" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeTypeMember">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeOfExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeOfExpression.xml
new file mode 100644
index 00000000000..f6f925a645e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeOfExpression.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeTypeOfExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeTypeOfExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeTypeOfExpression(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+        </constructor>

+        <property name="Type">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeReferenceExpression.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeReferenceExpression.xml
new file mode 100644
index 00000000000..a03beb96551
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeTypeReferenceExpression.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeTypeReferenceExpression" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeTypeReferenceExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeTypeReferenceExpression(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+        </constructor>

+        <property name="Type">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/CodeVariableDeclarationStatement.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeVariableDeclarationStatement.xml
new file mode 100644
index 00000000000..bd9ff46e94f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/CodeVariableDeclarationStatement.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CodeDom.CodeVariableDeclarationStatement" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeVariableDeclarationStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CodeVariableDeclarationStatement(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="name">TODO</param>

+        </constructor>

+        <constructor name="CodeVariableDeclarationStatement(System.String, System.String, System.CodeDom.CodeExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="name">TODO</param>

+            <param name="initExpression">TODO</param>

+        </constructor>

+        <property name="InitExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Type">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/FieldDirection.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/FieldDirection.xml
new file mode 100644
index 00000000000..87bac0fb1da
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/FieldDirection.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.CodeDom.FieldDirection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.CodeDom/MemberAttributes.xml b/mcs/docs/apidocs/xml/en/System.CodeDom/MemberAttributes.xml
new file mode 100644
index 00000000000..6fb7fe86f6a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.CodeDom/MemberAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.CodeDom.MemberAttributes" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections.Specialized/BitVector32.xml b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/BitVector32.xml
new file mode 100644
index 00000000000..5fb7ba0b3fe
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/BitVector32.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Collections.Specialized.BitVector32" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Section(System.Collections.Specialized.BitVector32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="source">TODO</param>

+        </constructor>

+        <constructor name="Section(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="init">TODO</param>

+        </constructor>

+        <property name="Data">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateSection(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="maxval">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateMask">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateMask(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prev">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections.Specialized/KeysCollection.xml b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/KeysCollection.xml
new file mode 100644
index 00000000000..4af9734b852
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/KeysCollection.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Specialized.NameObjectCollectionBase+KeysCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="arr">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Get(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections.Specialized/ListDictionary.xml b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/ListDictionary.xml
new file mode 100644
index 00000000000..46cfa7e744d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/ListDictionary.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Specialized.ListDictionary" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ListDictionary">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ListDictionary(System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="comparer">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Keys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Values">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections.Specialized/NameObjectCollectionBase.xml b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/NameObjectCollectionBase.xml
new file mode 100644
index 00000000000..11dc715d6ef
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/NameObjectCollectionBase.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Specialized.NameObjectCollectionBase" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Comparer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HashCodeProvider">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Keys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="OnDeserialization(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="sender">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="arr">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections.Specialized/NameValueCollection.xml b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/NameValueCollection.xml
new file mode 100644
index 00000000000..bd371f4af57
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/NameValueCollection.xml
@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Specialized.NameValueCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NameValueCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="NameValueCollection(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+        </constructor>

+        <constructor name="NameValueCollection(System.Collections.Specialized.NameValueCollection)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="col">TODO</param>

+        </constructor>

+        <constructor name="NameValueCollection(System.Collections.IHashCodeProvider, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hashProvider">TODO</param>

+            <param name="comparer">TODO</param>

+        </constructor>

+        <constructor name="NameValueCollection(System.Int32, System.Collections.IHashCodeProvider, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+            <param name="hashProvider">TODO</param>

+            <param name="comparer">TODO</param>

+        </constructor>

+        <property name="AllKeys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Set(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValues(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValues(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetKey(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Get(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Get(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dest">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Collections.Specialized.NameValueCollection)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="HasKeys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections.Specialized/Section.xml b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/Section.xml
new file mode 100644
index 00000000000..a839c3ac72d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/Section.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Collections.Specialized.BitVector32+Section" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="maxval">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections.Specialized/StringCollection.xml b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/StringCollection.xml
new file mode 100644
index 00000000000..e3cc77d5eb6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/StringCollection.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Specialized.StringCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StringCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.String[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections.Specialized/StringDictionary.xml b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/StringDictionary.xml
new file mode 100644
index 00000000000..5d9cca465ea
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/StringDictionary.xml
@@ -0,0 +1,84 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Specialized.StringDictionary" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StringDictionary">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Keys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Values">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ContainsValue(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ContainsKey(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections.Specialized/StringEnumerator.xml b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/StringEnumerator.xml
new file mode 100644
index 00000000000..cc708fbe37b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections.Specialized/StringEnumerator.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Specialized.StringEnumerator" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Current">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="MoveNext">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/ArrayList.xml b/mcs/docs/apidocs/xml/en/System.Collections/ArrayList.xml
new file mode 100644
index 00000000000..70c4b7872d0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/ArrayList.xml
@@ -0,0 +1,326 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.ArrayList" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ArrayList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ArrayList(System.Collections.ICollection)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+        </constructor>

+        <constructor name="ArrayList(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+        </constructor>

+        <property name="Capacity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="arrayIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TrimToSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToArray(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToArray">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort(System.Int32, System.Int32, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort(System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetRange(System.Int32, System.Collections.ICollection)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Reverse(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Reverse">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveRange(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.Object, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="StartIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.Object, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="InsertRange(System.Int32, System.Collections.ICollection)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Object, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetRange(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Int32, System.Array, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="array">TODO</param>

+            <param name="arrayIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BinarySearch(System.Int32, System.Int32, System.Object, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <param name="value">TODO</param>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BinarySearch(System.Object, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BinarySearch(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.Collections.ICollection)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadOnly(System.Collections.ArrayList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="list">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadOnly(System.Collections.IList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="list">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Synchronized(System.Collections.ArrayList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="list">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Synchronized(System.Collections.IList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="list">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FixedSize(System.Collections.ArrayList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="list">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FixedSize(System.Collections.IList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="list">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Repeat(System.Object, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Adapter(System.Collections.IList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="list">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/BitArray.xml b/mcs/docs/apidocs/xml/en/System.Collections/BitArray.xml
new file mode 100644
index 00000000000..b89d3c6b434
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/BitArray.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.BitArray" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="BitArray(System.Collections.BitArray)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="orig">TODO</param>

+        </constructor>

+        <constructor name="BitArray(System.Boolean[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bits">TODO</param>

+        </constructor>

+        <constructor name="BitArray(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+        </constructor>

+        <constructor name="BitArray(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+        </constructor>

+        <constructor name="BitArray(System.Int32[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="words">TODO</param>

+        </constructor>

+        <constructor name="BitArray(System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+            <param name="value">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="And(System.Collections.BitArray)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="operand">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Get(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Not">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Or(System.Collections.BitArray)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="operand">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Set(System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetAll(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Xor(System.Collections.BitArray)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="operand">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/CaseInsensitiveComparer.xml b/mcs/docs/apidocs/xml/en/System.Collections/CaseInsensitiveComparer.xml
new file mode 100644
index 00000000000..a9b0f801b65
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/CaseInsensitiveComparer.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.CaseInsensitiveComparer" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CaseInsensitiveComparer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Default">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Compare(System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/CaseInsensitiveHashCodeProvider.xml b/mcs/docs/apidocs/xml/en/System.Collections/CaseInsensitiveHashCodeProvider.xml
new file mode 100644
index 00000000000..befb667b8ee
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/CaseInsensitiveHashCodeProvider.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.CaseInsensitiveHashCodeProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CaseInsensitiveHashCodeProvider">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Default">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/CollectionBase.xml b/mcs/docs/apidocs/xml/en/System.Collections/CollectionBase.xml
new file mode 100644
index 00000000000..b751f54a4c9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/CollectionBase.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.CollectionBase" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="List">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/Comparer.xml b/mcs/docs/apidocs/xml/en/System.Collections/Comparer.xml
new file mode 100644
index 00000000000..31b591364dd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/Comparer.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Comparer" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Default">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="Compare(System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/DictionaryBase.xml b/mcs/docs/apidocs/xml/en/System.Collections/DictionaryBase.xml
new file mode 100644
index 00000000000..173c93d2e0e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/DictionaryBase.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.DictionaryBase" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Dictionary">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerHashtable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/DictionaryEntry.xml b/mcs/docs/apidocs/xml/en/System.Collections/DictionaryEntry.xml
new file mode 100644
index 00000000000..8dba7909ce7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/DictionaryEntry.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Collections.DictionaryEntry" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DictionaryEntry(System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="k">TODO</param>

+            <param name="value">TODO</param>

+        </constructor>

+        <property name="Key">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/EnumeratorMode.xml b/mcs/docs/apidocs/xml/en/System.Collections/EnumeratorMode.xml
new file mode 100644
index 00000000000..8515eb3742f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/EnumeratorMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Collections.SortedList+EnumeratorMode" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/Hashtable.xml b/mcs/docs/apidocs/xml/en/System.Collections/Hashtable.xml
new file mode 100644
index 00000000000..03b8ccd913d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/Hashtable.xml
@@ -0,0 +1,192 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Hashtable" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="EnumeratorMode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Int32, System.Single, System.Collections.IHashCodeProvider, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+            <param name="loadFactor">TODO</param>

+            <param name="hcp">TODO</param>

+            <param name="comparer">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Int32, System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+            <param name="loadFactor">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Int32, System.Collections.IHashCodeProvider, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+            <param name="hcp">TODO</param>

+            <param name="comparer">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Collections.IDictionary, System.Single, System.Collections.IHashCodeProvider, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <param name="loadFactor">TODO</param>

+            <param name="hcp">TODO</param>

+            <param name="comparer">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Collections.IDictionary, System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <param name="loadFactor">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Collections.IDictionary)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Collections.IDictionary, System.Collections.IHashCodeProvider, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <param name="hcp">TODO</param>

+            <param name="comparer">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Collections.IHashCodeProvider, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hcp">TODO</param>

+            <param name="comparer">TODO</param>

+        </constructor>

+        <property name="comparer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="hcp">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Keys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Values">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="OnDeserialization(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="sender">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="arrayIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ContainsValue(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ContainsKey(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Synchronized(System.Collections.Hashtable)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="table">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/ICollection.xml b/mcs/docs/apidocs/xml/en/System.Collections/ICollection.xml
new file mode 100644
index 00000000000..2d0140d7f18
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/ICollection.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Collections.ICollection" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/IComparer.xml b/mcs/docs/apidocs/xml/en/System.Collections/IComparer.xml
new file mode 100644
index 00000000000..80fe52dbe49
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/IComparer.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Collections.IComparer" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/IDictionary.xml b/mcs/docs/apidocs/xml/en/System.Collections/IDictionary.xml
new file mode 100644
index 00000000000..6ac8a6bf6ef
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/IDictionary.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Collections.IDictionary" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/IDictionaryEnumerator.xml b/mcs/docs/apidocs/xml/en/System.Collections/IDictionaryEnumerator.xml
new file mode 100644
index 00000000000..92c12957f48
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/IDictionaryEnumerator.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Collections.IDictionaryEnumerator" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/IEnumerable.xml b/mcs/docs/apidocs/xml/en/System.Collections/IEnumerable.xml
new file mode 100644
index 00000000000..5a2e568d0ed
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/IEnumerable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Collections.IEnumerable" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/IEnumerator.xml b/mcs/docs/apidocs/xml/en/System.Collections/IEnumerator.xml
new file mode 100644
index 00000000000..1b21234fc49
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/IEnumerator.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Collections.IEnumerator" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/IHashCodeProvider.xml b/mcs/docs/apidocs/xml/en/System.Collections/IHashCodeProvider.xml
new file mode 100644
index 00000000000..333254394f0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/IHashCodeProvider.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Collections.IHashCodeProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/IList.xml b/mcs/docs/apidocs/xml/en/System.Collections/IList.xml
new file mode 100644
index 00000000000..1688ccb2848
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/IList.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Collections.IList" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/Queue.xml b/mcs/docs/apidocs/xml/en/System.Collections/Queue.xml
new file mode 100644
index 00000000000..bd61d3aff3e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/Queue.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Queue" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Queue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="Queue(System.Collections.ICollection)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="collection">TODO</param>

+        </constructor>

+        <constructor name="Queue(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="initialCapacity">TODO</param>

+        </constructor>

+        <constructor name="Queue(System.Int32, System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="initialCapacity">TODO</param>

+            <param name="growFactor">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToArray">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Peek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Enqueue(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Dequeue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Synchronized(System.Collections.Queue)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="queue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/ReadOnlyCollectionBase.xml b/mcs/docs/apidocs/xml/en/System.Collections/ReadOnlyCollectionBase.xml
new file mode 100644
index 00000000000..fe75e6e9964
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/ReadOnlyCollectionBase.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.ReadOnlyCollectionBase" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/SortedList.xml b/mcs/docs/apidocs/xml/en/System.Collections/SortedList.xml
new file mode 100644
index 00000000000..e9e3f80c1d1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/SortedList.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.SortedList" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="EnumeratorMode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="initialCapacity">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Collections.IComparer, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="comparer">TODO</param>

+            <param name="initialCapacity">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="comparer">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Collections.IDictionary)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+        </constructor>

+        <constructor name="EnumeratorMode(System.Collections.IDictionary, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <param name="comparer">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Keys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Values">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Capacity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="arrayIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TrimToSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetKey(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetByIndex(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetByIndex(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ContainsValue(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ContainsKey(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOfValue(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOfKey(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValueList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetKeyList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Synchronized(System.Collections.SortedList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="list">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Collections/Stack.xml b/mcs/docs/apidocs/xml/en/System.Collections/Stack.xml
new file mode 100644
index 00000000000..e45abc3472e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Collections/Stack.xml
@@ -0,0 +1,92 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Collections.Stack" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Stack">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="Stack(System.Collections.ICollection)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="collection">TODO</param>

+        </constructor>

+        <constructor name="Stack(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToArray">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Push(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Pop">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Peek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Synchronized(System.Collections.Stack)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/BrowsableAttribute.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/BrowsableAttribute.xml
new file mode 100644
index 00000000000..39f3d383dc7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/BrowsableAttribute.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.BrowsableAttribute" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="BrowsableAttribute(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="browsable">TODO</param>

+        </constructor>

+        <field name="No">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Yes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Browsable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/CategoryAttribute.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/CategoryAttribute.xml
new file mode 100644
index 00000000000..e2e2fb20da1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/CategoryAttribute.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.CategoryAttribute" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CategoryAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="category">TODO</param>

+        </constructor>

+        <constructor name="CategoryAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Category">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Action">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Appearance">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Behaviour">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Data">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Default">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Design">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DragDrop">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Focus">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Format">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Key">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Layout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Mouse">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="WindowStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/Component.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/Component.xml
new file mode 100644
index 00000000000..134113aecac
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/Component.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.Component" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Component">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Container">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DesignMode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Events">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Site">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <event name="Disposed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/ComponentCollection.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/ComponentCollection.xml
new file mode 100644
index 00000000000..0ba0c3930a9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/ComponentCollection.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.ComponentCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ComponentCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/Container.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/Container.xml
new file mode 100644
index 00000000000..962bed57f6e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/Container.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.Container" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Container">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Components">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.ComponentModel.IComponent)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="component">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.ComponentModel.IComponent, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="component">TODO</param>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.ComponentModel.IComponent)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="component">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/DescriptionAttribute.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/DescriptionAttribute.xml
new file mode 100644
index 00000000000..e459b406927
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/DescriptionAttribute.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.DescriptionAttribute" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DescriptionAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <constructor name="DescriptionAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Description">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DescriptionValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/DesignOnlyAttribute.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/DesignOnlyAttribute.xml
new file mode 100644
index 00000000000..426cc021f6e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/DesignOnlyAttribute.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.DesignOnlyAttribute" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DesignOnlyAttribute(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="design_only">TODO</param>

+        </constructor>

+        <field name="No">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Yes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="IsDesignOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/DesignerSerializationVisibility.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/DesignerSerializationVisibility.xml
new file mode 100644
index 00000000000..80e8b5a3631
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/DesignerSerializationVisibility.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.ComponentModel.DesignerSerializationVisibility" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/DesignerSerializationVisibilityAttribute.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/DesignerSerializationVisibilityAttribute.xml
new file mode 100644
index 00000000000..6d47e78f9d7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/DesignerSerializationVisibilityAttribute.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.DesignerSerializationVisibilityAttribute" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DesignerSerializationVisibilityAttribute(System.ComponentModel.DesignerSerializationVisibility)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="vis">TODO</param>

+        </constructor>

+        <field name="Content">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Hidden">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Visible">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Visibility">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/EventHandlerList.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/EventHandlerList.xml
new file mode 100644
index 00000000000..0f0e46f70ed
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/EventHandlerList.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.EventHandlerList" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="EventHandlerList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddHandler(System.Object, System.Delegate)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveHandler(System.Object, System.Delegate)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/IComponent.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/IComponent.xml
new file mode 100644
index 00000000000..3b1b0c84faa
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/IComponent.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.ComponentModel.IComponent" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/IContainer.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/IContainer.xml
new file mode 100644
index 00000000000..c41ef2cce1a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/IContainer.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.ComponentModel.IContainer" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/ISite.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/ISite.xml
new file mode 100644
index 00000000000..56352c9374a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/ISite.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.ComponentModel.ISite" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/LocalizableAttribute.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/LocalizableAttribute.xml
new file mode 100644
index 00000000000..e387b6a0981
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/LocalizableAttribute.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.LocalizableAttribute" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="LocalizableAttribute(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localizable">TODO</param>

+        </constructor>

+        <field name="No">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Yes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="IsLocalizable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/MemberDescriptor.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/MemberDescriptor.xml
new file mode 100644
index 00000000000..98e3d772c2b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/MemberDescriptor.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.MemberDescriptor" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="AttributeArray">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Category">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Description">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DesignTimeOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DisplayName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsBrowsable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NameHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/PropertyDescriptor.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/PropertyDescriptor.xml
new file mode 100644
index 00000000000..d7c40c5910b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/PropertyDescriptor.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.PropertyDescriptor" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="ComponentType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Converter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsLocalizable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PropertyType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SerializationVisibility">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="AddValueChanged(System.Object, System.EventHandler)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="component">TODO</param>

+            <param name="handler">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/TypeConverter.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/TypeConverter.xml
new file mode 100644
index 00000000000..9b5c8a93e4d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/TypeConverter.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.TypeConverter" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TypeConverter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.ComponentModel/Win32Exception.xml b/mcs/docs/apidocs/xml/en/System.ComponentModel/Win32Exception.xml
new file mode 100644
index 00000000000..3f32bfa828e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.ComponentModel/Win32Exception.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ComponentModel.Win32Exception" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Win32Exception">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="Win32Exception(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="error">TODO</param>

+        </constructor>

+        <constructor name="Win32Exception(System.Int32, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="error">TODO</param>

+            <param name="message">TODO</param>

+        </constructor>

+        <property name="NativeErrorCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/AssemblyHash.xml b/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/AssemblyHash.xml
new file mode 100644
index 00000000000..233449aaf6b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/AssemblyHash.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Configuration.Assemblies.AssemblyHash" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyHash(System.Configuration.Assemblies.AssemblyHashAlgorithm, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="algorithm">TODO</param>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="AssemblyHash(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Algorithm">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetValue(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/AssemblyHashAlgorithm.xml b/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/AssemblyHashAlgorithm.xml
new file mode 100644
index 00000000000..8cdf7a2e1a3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/AssemblyHashAlgorithm.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Configuration.Assemblies.AssemblyHashAlgorithm" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/AssemblyVersionCompatibility.xml b/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/AssemblyVersionCompatibility.xml
new file mode 100644
index 00000000000..cb17e7340de
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/AssemblyVersionCompatibility.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Configuration.Assemblies.AssemblyVersionCompatibility" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/ProcessorID.xml b/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/ProcessorID.xml
new file mode 100644
index 00000000000..95829b3800a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration.Assemblies/ProcessorID.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Configuration.Assemblies.ProcessorID" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration/ConfigurationException.xml b/mcs/docs/apidocs/xml/en/System.Configuration/ConfigurationException.xml
new file mode 100644
index 00000000000..b2bba67364f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration/ConfigurationException.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Configuration.ConfigurationException" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ConfigurationException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ConfigurationException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ConfigurationException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <constructor name="ConfigurationException(System.String, System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="node">TODO</param>

+        </constructor>

+        <constructor name="ConfigurationException(System.String, System.Exception, System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+            <param name="node">TODO</param>

+        </constructor>

+        <constructor name="ConfigurationException(System.String, System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="filename">TODO</param>

+            <param name="line">TODO</param>

+        </constructor>

+        <constructor name="ConfigurationException(System.String, System.Exception, System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+            <param name="filename">TODO</param>

+            <param name="line">TODO</param>

+        </constructor>

+        <property name="BareMessage">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Filename">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Line">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetXmlNodeFilename(System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="node">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetXmlNodeLineNumber(System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="node">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration/ConfigurationSettings.xml b/mcs/docs/apidocs/xml/en/System.Configuration/ConfigurationSettings.xml
new file mode 100644
index 00000000000..d65c097ebe6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration/ConfigurationSettings.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Configuration.ConfigurationSettings" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="AppSettings">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetConfig(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="sectionName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration/DictionarySectionHandler.xml b/mcs/docs/apidocs/xml/en/System.Configuration/DictionarySectionHandler.xml
new file mode 100644
index 00000000000..1a6bb2c81d2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration/DictionarySectionHandler.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Configuration.DictionarySectionHandler" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DictionarySectionHandler">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="KeyAttributeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ValueAttributeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Create(System.Object, System.Object, System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parent">TODO</param>

+            <param name="context">TODO</param>

+            <param name="section">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration/IConfigurationSectionHandler.xml b/mcs/docs/apidocs/xml/en/System.Configuration/IConfigurationSectionHandler.xml
new file mode 100644
index 00000000000..7109e0931a8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration/IConfigurationSectionHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Configuration.IConfigurationSectionHandler" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration/IgnoreSectionHandler.xml b/mcs/docs/apidocs/xml/en/System.Configuration/IgnoreSectionHandler.xml
new file mode 100644
index 00000000000..e297b7a77a6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration/IgnoreSectionHandler.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Configuration.IgnoreSectionHandler" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IgnoreSectionHandler">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Create(System.Object, System.Object, System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parent">TODO</param>

+            <param name="configContext">TODO</param>

+            <param name="section">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration/NameValueSectionHandler.xml b/mcs/docs/apidocs/xml/en/System.Configuration/NameValueSectionHandler.xml
new file mode 100644
index 00000000000..c55186a1bb1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration/NameValueSectionHandler.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Configuration.NameValueSectionHandler" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NameValueSectionHandler">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="KeyAttributeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ValueAttributeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Create(System.Object, System.Object, System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parent">TODO</param>

+            <param name="context">TODO</param>

+            <param name="section">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Configuration/SingleTagSectionHandler.xml b/mcs/docs/apidocs/xml/en/System.Configuration/SingleTagSectionHandler.xml
new file mode 100644
index 00000000000..46a2dddb41e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Configuration/SingleTagSectionHandler.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Configuration.SingleTagSectionHandler" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SingleTagSectionHandler">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Create(System.Object, System.Object, System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parent">TODO</param>

+            <param name="context">TODO</param>

+            <param name="section">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/AcceptRejectRule.xml b/mcs/docs/apidocs/xml/en/System.Data/AcceptRejectRule.xml
new file mode 100644
index 00000000000..f2e691f0586
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/AcceptRejectRule.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.AcceptRejectRule" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/CommandBehavior.xml b/mcs/docs/apidocs/xml/en/System.Data/CommandBehavior.xml
new file mode 100644
index 00000000000..bf85abfdaef
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/CommandBehavior.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.CommandBehavior" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/CommandType.xml b/mcs/docs/apidocs/xml/en/System.Data/CommandType.xml
new file mode 100644
index 00000000000..f26c16afa37
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/CommandType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.CommandType" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/ConnectionState.xml b/mcs/docs/apidocs/xml/en/System.Data/ConnectionState.xml
new file mode 100644
index 00000000000..6d908a83e9c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/ConnectionState.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.ConnectionState" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/DataColumnChangeEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Data/DataColumnChangeEventArgs.xml
new file mode 100644
index 00000000000..e677fed9724
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/DataColumnChangeEventArgs.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Data.DataColumnChangeEventArgs" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataColumnChangeEventArgs(System.Data.DataRow, System.Data.DataColumn, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="row">TODO</param>

+            <param name="column">TODO</param>

+            <param name="value">TODO</param>

+        </constructor>

+        <property name="Column">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProposedValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Row">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/DataColumnChangeEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Data/DataColumnChangeEventHandler.xml
new file mode 100644
index 00000000000..b64826ff7d1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/DataColumnChangeEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Data.DataColumnChangeEventHandler" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/DataColumnCollection.xml b/mcs/docs/apidocs/xml/en/System.Data/DataColumnCollection.xml
new file mode 100644
index 00000000000..730c7f4f2af
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/DataColumnCollection.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Data.DataColumnCollection" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="List">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="IndexOf(System.Data.DataColumn)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="column">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String, System.Type, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="columnName">TODO</param>

+            <param name="type">TODO</param>

+            <param name="expression">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="columnName">TODO</param>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="columnName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Data.DataColumn)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="column">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.Data.DataColumn[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="columns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CanRemove(System.Data.DataColumn)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="column">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="columnName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Data.DataColumn)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="column">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <event name="CollectionChanged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/DataRowAction.xml b/mcs/docs/apidocs/xml/en/System.Data/DataRowAction.xml
new file mode 100644
index 00000000000..0a8c6853d90
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/DataRowAction.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.DataRowAction" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/DataRowChangeEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Data/DataRowChangeEventHandler.xml
new file mode 100644
index 00000000000..a117750af16
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/DataRowChangeEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Data.DataRowChangeEventHandler" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/DataRowState.xml b/mcs/docs/apidocs/xml/en/System.Data/DataRowState.xml
new file mode 100644
index 00000000000..b0ab018917b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/DataRowState.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.DataRowState" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/DataRowVersion.xml b/mcs/docs/apidocs/xml/en/System.Data/DataRowVersion.xml
new file mode 100644
index 00000000000..30a1c714767
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/DataRowVersion.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.DataRowVersion" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/DataViewRowState.xml b/mcs/docs/apidocs/xml/en/System.Data/DataViewRowState.xml
new file mode 100644
index 00000000000..049c21032b1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/DataViewRowState.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.DataViewRowState" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/DbType.xml b/mcs/docs/apidocs/xml/en/System.Data/DbType.xml
new file mode 100644
index 00000000000..2de868e090a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/DbType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.DbType" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/FillErrorEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Data/FillErrorEventHandler.xml
new file mode 100644
index 00000000000..1d072a5d68e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/FillErrorEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Data.FillErrorEventHandler" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IColumnMapping.xml b/mcs/docs/apidocs/xml/en/System.Data/IColumnMapping.xml
new file mode 100644
index 00000000000..b9e5b505955
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IColumnMapping.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IColumnMapping" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IColumnMappingCollection.xml b/mcs/docs/apidocs/xml/en/System.Data/IColumnMappingCollection.xml
new file mode 100644
index 00000000000..e60cca139a3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IColumnMappingCollection.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IColumnMappingCollection" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IDBCommand.xml b/mcs/docs/apidocs/xml/en/System.Data/IDBCommand.xml
new file mode 100644
index 00000000000..654519a85dd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IDBCommand.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IDBCommand" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IDBConnection.xml b/mcs/docs/apidocs/xml/en/System.Data/IDBConnection.xml
new file mode 100644
index 00000000000..4f1a37dbdf1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IDBConnection.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IDBConnection" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IDataAdapter.xml b/mcs/docs/apidocs/xml/en/System.Data/IDataAdapter.xml
new file mode 100644
index 00000000000..45e921c3cc2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IDataAdapter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IDataAdapter" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IDataParameter.xml b/mcs/docs/apidocs/xml/en/System.Data/IDataParameter.xml
new file mode 100644
index 00000000000..fe855c9a99c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IDataParameter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IDataParameter" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IDataParameterCollection.xml b/mcs/docs/apidocs/xml/en/System.Data/IDataParameterCollection.xml
new file mode 100644
index 00000000000..8c42ad49474
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IDataParameterCollection.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IDataParameterCollection" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IDataReader.xml b/mcs/docs/apidocs/xml/en/System.Data/IDataReader.xml
new file mode 100644
index 00000000000..b1f02cd7a1a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IDataReader.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IDataReader" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IDataRecord.xml b/mcs/docs/apidocs/xml/en/System.Data/IDataRecord.xml
new file mode 100644
index 00000000000..fb5636d770e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IDataRecord.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IDataRecord" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IDbDataAdapter.xml b/mcs/docs/apidocs/xml/en/System.Data/IDbDataAdapter.xml
new file mode 100644
index 00000000000..d4b6117ccee
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IDbDataAdapter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IDbDataAdapter" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IDbDataParameter.xml b/mcs/docs/apidocs/xml/en/System.Data/IDbDataParameter.xml
new file mode 100644
index 00000000000..a2c0a569d03
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IDbDataParameter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IDbDataParameter" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IDbTransaction.xml b/mcs/docs/apidocs/xml/en/System.Data/IDbTransaction.xml
new file mode 100644
index 00000000000..f0d467db7bf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IDbTransaction.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.IDbTransaction" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/ITableMapping.xml b/mcs/docs/apidocs/xml/en/System.Data/ITableMapping.xml
new file mode 100644
index 00000000000..fa2c1704357
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/ITableMapping.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.ITableMapping" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/ITableMappingCollection.xml b/mcs/docs/apidocs/xml/en/System.Data/ITableMappingCollection.xml
new file mode 100644
index 00000000000..5c08fdec75b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/ITableMappingCollection.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Data.ITableMappingCollection" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/IsolationLevel.xml b/mcs/docs/apidocs/xml/en/System.Data/IsolationLevel.xml
new file mode 100644
index 00000000000..0effdb7b0d1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/IsolationLevel.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.IsolationLevel" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/MappingType.xml b/mcs/docs/apidocs/xml/en/System.Data/MappingType.xml
new file mode 100644
index 00000000000..9de6778792c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/MappingType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.MappingType" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/MergeFailedEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Data/MergeFailedEventHandler.xml
new file mode 100644
index 00000000000..fec6b1537a8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/MergeFailedEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Data.MergeFailedEventHandler" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/MissingMappingAction.xml b/mcs/docs/apidocs/xml/en/System.Data/MissingMappingAction.xml
new file mode 100644
index 00000000000..8c1a6366783
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/MissingMappingAction.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.MissingMappingAction" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/MissingSchemaAction.xml b/mcs/docs/apidocs/xml/en/System.Data/MissingSchemaAction.xml
new file mode 100644
index 00000000000..7b8fc38f10e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/MissingSchemaAction.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.MissingSchemaAction" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/ParameterDirection.xml b/mcs/docs/apidocs/xml/en/System.Data/ParameterDirection.xml
new file mode 100644
index 00000000000..d4fc5bcfaa0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/ParameterDirection.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.ParameterDirection" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/PropertyAttributes.xml b/mcs/docs/apidocs/xml/en/System.Data/PropertyAttributes.xml
new file mode 100644
index 00000000000..618b6166390
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/PropertyAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.PropertyAttributes" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/Rule.xml b/mcs/docs/apidocs/xml/en/System.Data/Rule.xml
new file mode 100644
index 00000000000..ed0162ab860
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/Rule.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.Rule" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/SchemaType.xml b/mcs/docs/apidocs/xml/en/System.Data/SchemaType.xml
new file mode 100644
index 00000000000..b68a372ceb7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/SchemaType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.SchemaType" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/SqlDbType.xml b/mcs/docs/apidocs/xml/en/System.Data/SqlDbType.xml
new file mode 100644
index 00000000000..7b126ae8c3c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/SqlDbType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.SqlDbType" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/StateChangeEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Data/StateChangeEventHandler.xml
new file mode 100644
index 00000000000..32ec8625f60
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/StateChangeEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Data.StateChangeEventHandler" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/StatementType.xml b/mcs/docs/apidocs/xml/en/System.Data/StatementType.xml
new file mode 100644
index 00000000000..f43605df5be
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/StatementType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.StatementType" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/UpdateRowSource.xml b/mcs/docs/apidocs/xml/en/System.Data/UpdateRowSource.xml
new file mode 100644
index 00000000000..8961d90d9de
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/UpdateRowSource.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.UpdateRowSource" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/UpdateStatus.xml b/mcs/docs/apidocs/xml/en/System.Data/UpdateStatus.xml
new file mode 100644
index 00000000000..11e01b1fa1c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/UpdateStatus.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.UpdateStatus" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/XmlReadMode.xml b/mcs/docs/apidocs/xml/en/System.Data/XmlReadMode.xml
new file mode 100644
index 00000000000..89cee021213
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/XmlReadMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.XmlReadMode" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Data/XmlWriteMode.xml b/mcs/docs/apidocs/xml/en/System.Data/XmlWriteMode.xml
new file mode 100644
index 00000000000..c75e22b1975
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Data/XmlWriteMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Data.XmlWriteMode" assembly="System.Data">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolBinder.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolBinder.xml
new file mode 100644
index 00000000000..115912ea214
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolBinder.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Diagnostics.SymbolStore.ISymbolBinder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolDocument.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolDocument.xml
new file mode 100644
index 00000000000..38a65b583d9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolDocument.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Diagnostics.SymbolStore.ISymbolDocument" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolDocumentWriter.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolDocumentWriter.xml
new file mode 100644
index 00000000000..6dc28c91683
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolDocumentWriter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Diagnostics.SymbolStore.ISymbolDocumentWriter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolMethod.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolMethod.xml
new file mode 100644
index 00000000000..9f6db0c68dd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolMethod.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Diagnostics.SymbolStore.ISymbolMethod" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolNamespace.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolNamespace.xml
new file mode 100644
index 00000000000..44deb236b5a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolNamespace.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Diagnostics.SymbolStore.ISymbolNamespace" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolReader.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolReader.xml
new file mode 100644
index 00000000000..2146f6de489
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolReader.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Diagnostics.SymbolStore.ISymbolReader" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolScope.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolScope.xml
new file mode 100644
index 00000000000..404d17a0f1e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolScope.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Diagnostics.SymbolStore.ISymbolScope" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolVariable.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolVariable.xml
new file mode 100644
index 00000000000..01a88418d55
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolVariable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Diagnostics.SymbolStore.ISymbolVariable" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolWriter.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolWriter.xml
new file mode 100644
index 00000000000..3c95ae985e1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/ISymbolWriter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Diagnostics.SymbolStore.ISymbolWriter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymAddressKind.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymAddressKind.xml
new file mode 100644
index 00000000000..f2af6e6c6d7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymAddressKind.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Diagnostics.SymbolStore.SymAddressKind" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymDocumentType.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymDocumentType.xml
new file mode 100644
index 00000000000..6574e80fd54
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymDocumentType.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.SymbolStore.SymDocumentType" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SymDocumentType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymLanguageType.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymLanguageType.xml
new file mode 100644
index 00000000000..61aa8365b89
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymLanguageType.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.SymbolStore.SymLanguageType" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SymLanguageType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="Basic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="C">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Cobol">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="CPlusPlus">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="CSharp">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="ILAssembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Java">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="JScript">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MCPlusPlus">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Pascal">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SMC">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymLanguageVendor.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymLanguageVendor.xml
new file mode 100644
index 00000000000..1921c6fd94d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymLanguageVendor.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.SymbolStore.SymLanguageVendor" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SymLanguageVendor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="Microsoft">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymbolToken.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymbolToken.xml
new file mode 100644
index 00000000000..4e770fca04f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics.SymbolStore/SymbolToken.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Diagnostics.SymbolStore.SymbolToken" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SymbolToken(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+        </constructor>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetToken">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/BooleanSwitch.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/BooleanSwitch.xml
new file mode 100644
index 00000000000..b436e63d16e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/BooleanSwitch.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.BooleanSwitch" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="BooleanSwitch(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="displayName">TODO</param>

+            <param name="description">TODO</param>

+        </constructor>

+        <property name="Enabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/ChangeLog b/mcs/docs/apidocs/xml/en/System.Diagnostics/ChangeLog
new file mode 100644
index 00000000000..395a915cd46
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/ChangeLog
@@ -0,0 +1,18 @@
+2002-05-29  Jonathan Pryor <jonpryor@vt.edu>

+  * DefaultTraceListener.xml: Update with information about MONO_TRACE.

+

+2002-05-27  Jonathan Pryor <jonpryor@vt.edu>

+  * ChangeLog: Added this file

+  * Moved public documentation from the source code into the appropriate XML

+    files.  Modified:

+    - Debug.xml

+    - DefaultTraceListener.xml

+    - DiagnosticsConfigurationHandler.xml

+    - Switch.xml

+    - TextWriterTraceListener.xml

+    - Trace.xml

+    - TraceLevel.xml

+    - TraceListener.xml

+    - TraceListenerCollection.xml

+    - TraceSwitch.xml

+

diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/ConditionalAttribute.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/ConditionalAttribute.xml
new file mode 100644
index 00000000000..38122a680ca
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/ConditionalAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.ConditionalAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ConditionalAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conditionString">TODO</param>

+        </constructor>

+        <property name="ConditionString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/Debug.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/Debug.xml
new file mode 100644
index 00000000000..03dcd1cc863
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/Debug.xml
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<!-- It should be noted that this file is just a copy of `Trace.xml -->

+<monodoc language="en">

+    <class name="System.Diagnostics.Trace" assembly="System">

+        <summary>Provides a set of methods to help debug code.</summary>

+        <remarks>TODO</remarks>

+        <property name="AutoFlush">

+            <summary>

+              Gets or sets value indicating whether Flush should be called 

+              on the listeners after each write.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IndentLevel">

+            <summary>Gets or sets indent level.</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IndentSize">

+            <summary>The number of spaces in an indent.</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Listeners">

+            <summary>Returns the listeners collection.</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Assert(System.Boolean)">

+            <summary>

+              Checks for a condition, and prints a stack trace if the 

+              condition is false.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Assert(System.Boolean, System.String)">

+            <summary>

+              Checks for a condition, and displays a message if the condition

+              is false.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Assert(System.Boolean, System.String, System.String)">

+            <summary>

+              Checks for a condtion, and displays a message and a detailed 

+              message string if the condition is false.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <param name="detailMessage">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>Closes the Debug buffer.</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Fail(System.String)">

+            <summary>Emits the specified error message.</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Fail(System.String, System.String)">

+            <summary>

+              Emits the specified error message and detailed error 

+              message.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="detailMessage">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>Flushes the listeners.</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Indent">

+            <summary>Increments the indent level.</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Unindent">

+            <summary>Decrements the indent level.</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Object)">

+            <summary>

+              Writes the value of the specified object's ToString method to 

+              the listeners.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>

+              Writes the specified message to each listener in the Listeners 

+              collection.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Object, System.String)">

+            <summary>

+              Writes the category name and value of the specified object's

+              ToString method to each listener in the Listeners collection.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.String)">

+            <summary>

+              Writes the category name and the specified message

+              to each listener in the Listeners collection.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteIf(System.Boolean, System.Object)">

+            <summary>

+              Writes the value of the specified object's ToString method

+              to each of the listeners if the condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteIf(System.Boolean, System.String)">

+            <summary>

+              Writes the specified message to each of the listeners

+              if the specified condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteIf(System.Boolean, System.Object, System.String)">

+            <summary>

+              Writes the value of the specified object's ToString message

+              and category to each of the listeners if the condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="value">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteIf(System.Boolean, System.String, System.String)">

+            <summary>

+              Writes the category and specified message to each listener

+              if the specified condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Object)">

+            <summary>

+              Writes the value of the object's ToString method,

+              followed by a line terminator, to each listener.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String)">

+            <summary>

+              Writes the specified message, followed by a line terminator,

+              to each listener.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Object, System.String)">

+            <summary>

+              Writes the value of the specified object's ToString method,

+              along with a category, followed by a line terminator, to each 

+              listener.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.String)">

+            <summary>

+              Writes the specified category and message, followed by a line 

+              terminator, to each listener.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLineIf(System.Boolean, System.Object)">

+            <summary>

+              Writes the value of the object's ToString method

+              to each listener if the specified condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLineIf(System.Boolean, System.String)">

+            <summary>

+              Writes the specified message to each listener

+              if the specified condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLineIf(System.Boolean, System.Object, System.String)">

+            <summary>

+              Writes the value of the object's ToString method, and a category

+              to each listener if the specified condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="value">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLineIf(System.Boolean, System.String, System.String)">

+            <summary>

+              Writes the specified category and message to each listener, 

+              followed by a line terminator, if the specified condition 

+              is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>

+

diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/DebuggableAttribute.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/DebuggableAttribute.xml
new file mode 100644
index 00000000000..8a0e6cbc5eb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/DebuggableAttribute.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.DebuggableAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DebuggableAttribute(System.Boolean, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="isJITTrackingEnabled">TODO</param>

+            <param name="isJITOptimizerDisabled">TODO</param>

+        </constructor>

+        <property name="IsJITTrackingEnabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsJITOptimizerDisabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/Debugger.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/Debugger.xml
new file mode 100644
index 00000000000..c67b1655518
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/Debugger.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.Debugger" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Debugger">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="DefaultCategory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="IsAttached">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Break">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLogging">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Launch">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Log(System.Int32, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <param name="category">TODO</param>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/DebuggerHiddenAttribute.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/DebuggerHiddenAttribute.xml
new file mode 100644
index 00000000000..a09c3842390
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/DebuggerHiddenAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.DebuggerHiddenAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DebuggerHiddenAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/DebuggerStepThroughAttribute.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/DebuggerStepThroughAttribute.xml
new file mode 100644
index 00000000000..c0b79ccbd8d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/DebuggerStepThroughAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.DebuggerStepThroughAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DebuggerStepThroughAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/DefaultTraceListener.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/DefaultTraceListener.xml
new file mode 100644
index 00000000000..973d73bb845
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/DefaultTraceListener.xml
@@ -0,0 +1,137 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.DefaultTraceListener" assembly="System">

+        <summary>

+          Provides the default output methods and behavior for tracing.

+        </summary>

+        <remarks>

+          <para>There are three ways to get output from the

+          <c>DefaultTraceListener</c>.</para>

+          <list type="number">

+            <item><description>Set the <see cref="LogFileName"/> property.

+              This will cause all output to be appended to the specified log

+              file.

+              <para>This is the only mechanism that is consistent across

+              both Windows and Unix platforms.</para>

+            </description></item>

+            <item><description>On Windows, messages are displayed using the

+              <c>OutputDebugString</c> API.  (Look it up on MSDN.)  Messages 

+              are automatically displayed in the debugger if the program is 

+              being debugged.  If the program isn't being debugged, a

+              program such as <c>DebugView</c> (available from

+              www.systeminternals.com) can be used to view the output.

+            </description></item>

+            <item><description>On Unix, behavior is dependant upon the

+              <c>MONO_TRACE</c> environment variable.

+              <para>If <c>MONO_TRACE</c> isn't set or is empty, messages are

+                ignored.</para>

+              <para>If <c>MONO_TRACE</c> is set, messages will be sent where

+                <c>MONO_TRACE</c> specifies.  <c>MONO_TRACE</c> accepts

+                three different sets of values:</para>

+              <list type="bullet">

+                <item>

+                  <term><c>Console.Out</c></term>

+                  <description>Send messages to standard output.</description>

+                  </item>

+                <item>

+                  <term><c>Console.Error</c></term>

+                  <description>Send messages to standard error.</description>

+                  </item>

+                <item>

+                  <term>Anything else</term>

+                  <description>Treat "Anything else" as a file, and append the

+                    message to the specified file.</description>

+                  </item>

+              </list>

+              <para>Both <c>Console.Out</c> and <c>Console.Error</c> allow the

+                specification of a "prefix" -- a message that will prefix all

+                messages sent to the specified location.  The prefix is

+                appended to the location, separated from the location with a

+                colon (':').

+              </para>

+              <para>For example, 

+                <c>export MONO_TRACE="Console.Out:** my prefix "</c>

+                would send messages to standard output.  Messages would be

+                prefixed with the string "<c>** my prefix </c>".

+              </para>

+              <para>Other valid examples are:

+                <list type="bullet">

+                <item><description><c>export MONO_TRACE="/dev/stdout"</c>,

+                  which would also send messages to the console.

+                  </description></item>

+                <item><description><c>export MONO_TRACE="out.txt"</c>, which

+                  would append messages to the file "out.txt" in the current

+                  working directory.

+                  </description></item>

+                <item><description><c>export MONO_TRACE="/dev/ttyS0"</c>, which

+                  would append messages to the serial port, if permitted.

+                  </description></item>

+                </list>

+              </para>

+            </description></item>

+          </list>

+          <para>The <c>DefaultTraceListener</c> is not complete.  

+          MSDN specifies that GUI widgets be used 

+          for certain features.  The short-term solution is to forgo GUI

+          widgets and use the normal existing mechanisms (log file, console,

+          <c>OutputDebugString</c>).</para>

+        </remarks>

+        <constructor name="DefaultTraceListener">

+            <summary>Create a new instance of the <c>DefaultTraceListener</c>,

+            with "Default" as its <see cref="Name"/>.</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AssertUiEnabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LogFileName">

+            <summary>

+              Gets or sets name of a log file to write trace or debug 

+              messages to.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>

+              The name of a log file to write trace or debug messages to.

+            </value>

+        </property>

+        <method name="WriteLine(System.String)">

+            <summary>

+              Writes the output to the Console, followed by a newline

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">The message to write.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>Writes the output to the Console.</summary>

+            <remarks>TODO</remarks>

+            <param name="message">The message to write.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Fail(System.String, System.String)">

+            <summary>

+              Emits or displays detailed messages and a stack trace

+              for an assertion that always fails.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">The message to emit or display.</param>

+            <param name="detailMessage">

+              The detailed message to emit or display.

+            </param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Fail(System.String)">

+            <summary>

+              Emits or displays a message and a stack trace for an 

+              assertion that always fails.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">The message to emit or display.</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>

+

diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/DiagnosticsConfigurationHandler.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/DiagnosticsConfigurationHandler.xml
new file mode 100644
index 00000000000..951109057b6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/DiagnosticsConfigurationHandler.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.DiagnosticsConfigurationHandler" assembly="System">

+        <summary>

+          The configuration section handler for the diagnostics section of

+          the configuration file.  The section handler participates in the 

+          resolution of configuration settings between the &lt;diagnostics&gt; 

+          and &lt;/diagnostics&gt; portion of the .config file.

+        </summary>

+        <remarks>TODO</remarks>

+        <constructor name="DiagnosticsConfigurationHandler">

+            <summary>

+              Initializes a new instance of the

+              <see cref="DiagnosticsConfigurationHandler">

+              DiagnosticsConfigurationHandler</see> class.

+            </summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Create(System.Object, System.Object, System.Xml.XmlNode)">

+            <summary>

+              Parses the configuration settings between the

+              &lt;diagnostics&gt; and &lt;/diagnostics&gt; portion of the

+              .config file to populate the values of the object and return it.

+            </summary>

+            <remarks>Not implemented.</remarks>

+            <param name="parent">

+              Reference to the &quot;default&quot; value provided by the 

+              parent IConfigurationSectionHandler.

+            </param>

+            <param name="configContext">TODO</param>

+            <param name="section">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>

+

diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/FileVersionInfo.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/FileVersionInfo.xml
new file mode 100644
index 00000000000..273c6e1acdc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/FileVersionInfo.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.FileVersionInfo" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FileVersionInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Comments">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CompanyName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FileBuildPart">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FileDescription">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FileMajorPart">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FileMinorPart">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FileName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FilePrivatePart">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FileVersion">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InternalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsDebug">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsPatched">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsPreRelease">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsPrivateBuild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSpecialBuild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Language">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LegalCopyright">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LegalTrademarks">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OriginalFilename">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PrivateBuild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProductBuildPart">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProductMajorPart">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProductMinorPart">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProductName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProductPrivatePart">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProductVersion">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SpecialBuild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetVersionInfo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/Process.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/Process.xml
new file mode 100644
index 00000000000..5b09088540a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/Process.xml
@@ -0,0 +1,340 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.Process" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Process">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BasePriority">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EnableRaisingEvents">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ExitCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ExitTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Handle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HandleCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasExited">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Id">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MachineName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MainModule">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MainWindowHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MainWindowTitle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MaxWorkingSet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MinWorkingSet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Modules">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NonpagedSystemMemorySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PagedMemorySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PagedSystemMemorySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PeakPagedMemorySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PeakVirtualMemorySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PeakWorkingSet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PriorityBoostEnabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PriorityClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PrivateMemorySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PrivilegedProcessorTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProcessName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProcessorAffinity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Responding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="StandardError">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="StandardInput">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="StandardOutput">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="StartInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="StartTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SynchronizingObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Threads">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TotalProcessorTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UserProcessorTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="VirtualMemorySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="WorkingSet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloseMainWindow">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="EnterDebugMode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCurrentProcess">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProcessById(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="processId">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProcessById(System.Int32, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="processId">TODO</param>

+            <param name="machineName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProcesses">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProcesses(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="machineName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProcessesByName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="processName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProcessesByName(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="processName">TODO</param>

+            <param name="machineName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Kill">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="LeaveDebugMode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Refresh">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Start">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Start(System.Diagnostics.ProcessStartInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="startInfo">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Start(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Start(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">TODO</param>

+            <param name="arguments">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitForExit">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitForExit(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="milliseconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitForInputIdle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitForInputIdle(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="milliseconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <event name="Exited">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/ProcessModule.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/ProcessModule.xml
new file mode 100644
index 00000000000..9aac6ffaa38
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/ProcessModule.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.ProcessModule" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ProcessModule">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BaseAddress">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EntryPointAddress">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FileName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FileVersionInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ModuleMemorySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ModuleName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/ProcessPriorityClass.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/ProcessPriorityClass.xml
new file mode 100644
index 00000000000..ae60fedc540
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/ProcessPriorityClass.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Diagnostics.ProcessPriorityClass" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/StackFrame.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/StackFrame.xml
new file mode 100644
index 00000000000..66c76a28ca3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/StackFrame.xml
@@ -0,0 +1,91 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.StackFrame" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StackFrame">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="StackFrame(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="needFileInfo">TODO</param>

+        </constructor>

+        <constructor name="StackFrame(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="skipFrames">TODO</param>

+        </constructor>

+        <constructor name="StackFrame(System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="skipFrames">TODO</param>

+            <param name="needFileInfo">TODO</param>

+        </constructor>

+        <constructor name="StackFrame(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">TODO</param>

+            <param name="lineNumber">TODO</param>

+        </constructor>

+        <constructor name="StackFrame(System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">TODO</param>

+            <param name="lineNumber">TODO</param>

+            <param name="colNumber">TODO</param>

+        </constructor>

+        <field name="OFFSET_UNKNOWN">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="GetNativeOffset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethod">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetILOffset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFileName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFileColumnNumber">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFileLineNumber">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/StackTrace.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/StackTrace.xml
new file mode 100644
index 00000000000..128664384a3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/StackTrace.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.StackTrace" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StackTrace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="StackTrace(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="needFileInfo">TODO</param>

+        </constructor>

+        <constructor name="StackTrace(System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+        </constructor>

+        <constructor name="StackTrace(System.Exception, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <param name="needFileInfo">TODO</param>

+        </constructor>

+        <constructor name="StackTrace(System.Exception, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <param name="skipFrames">TODO</param>

+        </constructor>

+        <constructor name="StackTrace(System.Exception, System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <param name="skipFrames">TODO</param>

+            <param name="needFileInfo">TODO</param>

+        </constructor>

+        <constructor name="StackTrace(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="skipFrames">TODO</param>

+        </constructor>

+        <constructor name="StackTrace(System.Diagnostics.StackFrame)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="frame">TODO</param>

+        </constructor>

+        <constructor name="StackTrace(System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="skipFrames">TODO</param>

+            <param name="needFileInfo">TODO</param>

+        </constructor>

+        <constructor name="StackTrace(System.Threading.Thread, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="targetThread">TODO</param>

+            <param name="needFileInfo">TODO</param>

+        </constructor>

+        <field name="METHODS_TO_SKIP">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="FrameCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetFrame(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/Switch.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/Switch.xml
new file mode 100644
index 00000000000..0a7f1109c3d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/Switch.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.Switch" assembly="System">

+        <summary>

+          Abstract base class to create new debugging and tracing switches.

+        </summary>

+        <remarks>TODO</remarks>

+        <constructor name="Switch">

+          <summary>Initialize a new instance.</summary>

+          <remarks>TODO</remarks>

+        </constructor>

+        <property name="Description">

+            <summary>Returns a description of the switch.</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DisplayName">

+            <summary>Returns a name used to identify the switch.</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SwitchSetting">

+            <summary>Gets or sets the current setting for this switch.</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="OnSwitchSettingChanged">

+            <summary>Raises the SwitchSettingChanged event.</summary>

+            <remarks>TODO</remarks>

+        </method>

+    </class>

+</monodoc>

+

diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/TextWriterTraceListener.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/TextWriterTraceListener.xml
new file mode 100644
index 00000000000..9645cf9117f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/TextWriterTraceListener.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.TextWriterTraceListener" assembly="System">

+        <summary>

+          Directs tracing or debugging output to a 

+          <see cref="System.IO.TextWriter">TextWriter</see> or to a 

+          <see cref="System.IO.Stream">Stream</see>,

+          such as <see cref="System.Console.Out">Console.Out</see> or

+          <see cref="System.IO.FileStream">FileStream</see>.

+        </summary>

+        <remarks>TODO</remarks>

+        <constructor name="TextWriterTraceListener">

+            <summary>

+              Initializes a new instance of the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see>

+              class with 

+              <see cref="System.IO.TextWriter">TextWriter</see> 

+              as the output recipient.

+            </summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="TextWriterTraceListener(System.IO.Stream)">

+            <summary>

+              Initializes a new instance of the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see> 

+              class, using the stream as the output

+              recipient of the debugging and tracing output.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="stream">

+              A <see cref="System.IO.Stream">Stream</see> that represents the 

+              stream the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see> 

+              writes to.

+            </param>

+            <exception cref="System.ArgumentNullException">

+              The stream is a null reference.

+            </exception>

+        </constructor>

+        <constructor name="TextWriterTraceListener(System.String)">

+            <summary>

+              Initializes a new instance of the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see> 

+              class, using the file as the recipient

+              of the debugging and tracing output.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">

+              The name of the file the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see>

+              writes to.

+            </param>

+            <exception cref="System.ArgumentNullException">

+              The fileName is null.

+            </exception>

+        </constructor>

+        <constructor name="TextWriterTraceListener(System.IO.TextWriter)">

+            <summary>

+              Initializes a new instance of the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see> 

+              class using the specified writer as the

+              recipient of the tracing or debugging output.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="writer">

+              A <see cref="System.IO.TextWriter">TextWriter</see> that receives 

+              output from the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see>.

+            </param>

+            <exception cref="System.ArgumentNullException">

+              The writer is a null reference

+            </exception>

+        </constructor>

+        <constructor name="TextWriterTraceListener(System.IO.Stream, System.String)">

+            <summary>

+              Initializes a new instance of the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see>

+              class with the specified name, using the

+              stream as the recipient of the tracing or debugging output.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="stream">

+              A <see cref="System.IO.Stream">Stream</see> that represents 

+              the stream the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see>

+              writes to.

+            </param>

+            <param name="name">The name of the new instance.</param>

+            <exception cref="System.ArgumentNullException">

+              The stream is a null reference

+            </exception>

+        </constructor>

+        <constructor name="TextWriterTraceListener(System.String, System.String)">

+            <summary>

+              Initializes a new instance of the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see>

+              class with the specified name, using the

+              file as the recipient of the tracing or debugging output.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">

+              The name of the file the <see cref="TextWriterTraceListener">

+              TextWriterTraceListener</see> writes to.

+            </param>

+            <param name="name">The name of the new instance.</param>

+            <exception cref="System.ArgumentNullException">

+              The file is a null reference.

+            </exception>

+        </constructor>

+        <constructor name="TextWriterTraceListener(System.IO.TextWriter, System.String)">

+            <summary>

+              Initializes a new instance of the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see>

+              class with the specified name, using

+              the specified writer as the recipient of the tracing or 

+              debugging output.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="writer">

+              A <see cref="System.IO.TextWriter">TextWriter</see> that receives 

+              the output from the 

+              <see cref="TextWriterTraceListener">TextWriterTraceListener</see>.

+            </param>

+            <param name="name">The name of the new instance.</param>

+            <exception cref="System.ArgumentNullException">

+              The writer is a null reference.

+            </exception>

+        </constructor>

+        <property name="Writer">

+            <summary>

+              Gets or sets the writer that receives the debugging or 

+              tracing output.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>

+              A <see cref="System.IO.TextWriter">TextWriter</see> that 

+              represents the writer that receives the tracing or 

+              debugging output.

+            </value>

+        </property>

+        <method name="WriteLine(System.String)">

+            <summary>

+              Writes a message to this instance's 

+              <see cref="System.IO.Writer">Writer</see>

+              followed by a line terminator.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">A message to write.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>

+              Writes a message to this instance's 

+              <see cref="System.IO.Writer">Writer</see>.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">A message to write.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>

+              Flushes the output buffer for the 

+              <see cref="System.IO.Writer">Writer</see>.

+            </summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>

+              Closes the <see cref="System.IO.Writer">Writer</see> so that 

+              it no longer receives tracing or debugging output.

+            </summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>

+

diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/Trace.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/Trace.xml
new file mode 100644
index 00000000000..58857d7225c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/Trace.xml
@@ -0,0 +1,260 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.Trace" assembly="System">

+        <summary>Provides a set of methods to help debug code.</summary>

+        <remarks>TODO</remarks>

+        <property name="AutoFlush">

+            <summary>

+              Gets or sets value indicating whether Flush should be called 

+              on the listeners after each write.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IndentLevel">

+            <summary>Gets or sets indent level.</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IndentSize">

+            <summary>The number of spaces in an indent.</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Listeners">

+            <summary>Returns the listeners collection.</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Assert(System.Boolean)">

+            <summary>

+              Checks for a condition, and prints a stack trace if the 

+              condition is false.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Assert(System.Boolean, System.String)">

+            <summary>

+              Checks for a condition, and displays a message if the condition

+              is false.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Assert(System.Boolean, System.String, System.String)">

+            <summary>

+              Checks for a condtion, and displays a message and a detailed 

+              message string if the condition is false.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <param name="detailMessage">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>Closes the Debug buffer.</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Fail(System.String)">

+            <summary>Emits the specified error message.</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Fail(System.String, System.String)">

+            <summary>

+              Emits the specified error message and detailed error 

+              message.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="detailMessage">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>Flushes the listeners.</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Indent">

+            <summary>Increments the indent level.</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Unindent">

+            <summary>Decrements the indent level.</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Object)">

+            <summary>

+              Writes the value of the specified object's ToString method to 

+              the listeners.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>

+              Writes the specified message to each listener in the Listeners 

+              collection.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Object, System.String)">

+            <summary>

+              Writes the category name and value of the specified object's

+              ToString method to each listener in the Listeners collection.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.String)">

+            <summary>

+              Writes the category name and the specified message

+              to each listener in the Listeners collection.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteIf(System.Boolean, System.Object)">

+            <summary>

+              Writes the value of the specified object's ToString method

+              to each of the listeners if the condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteIf(System.Boolean, System.String)">

+            <summary>

+              Writes the specified message to each of the listeners

+              if the specified condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteIf(System.Boolean, System.Object, System.String)">

+            <summary>

+              Writes the value of the specified object's ToString message

+              and category to each of the listeners if the condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="value">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteIf(System.Boolean, System.String, System.String)">

+            <summary>

+              Writes the category and specified message to each listener

+              if the specified condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Object)">

+            <summary>

+              Writes the value of the object's ToString method,

+              followed by a line terminator, to each listener.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String)">

+            <summary>

+              Writes the specified message, followed by a line terminator,

+              to each listener.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Object, System.String)">

+            <summary>

+              Writes the value of the specified object's ToString method,

+              along with a category, followed by a line terminator, to each 

+              listener.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.String)">

+            <summary>

+              Writes the specified category and message, followed by a line 

+              terminator, to each listener.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLineIf(System.Boolean, System.Object)">

+            <summary>

+              Writes the value of the object's ToString method

+              to each listener if the specified condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLineIf(System.Boolean, System.String)">

+            <summary>

+              Writes the specified message to each listener

+              if the specified condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLineIf(System.Boolean, System.Object, System.String)">

+            <summary>

+              Writes the value of the object's ToString method, and a category

+              to each listener if the specified condition is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="value">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLineIf(System.Boolean, System.String, System.String)">

+            <summary>

+              Writes the specified category and message to each listener, 

+              followed by a line terminator, if the specified condition 

+              is true.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="condition">TODO</param>

+            <param name="message">TODO</param>

+            <param name="category">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>

+

diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceLevel.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceLevel.xml
new file mode 100644
index 00000000000..aab8e5a1b60
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceLevel.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Diagnostics.TraceLevel" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceListener.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceListener.xml
new file mode 100644
index 00000000000..4da3a53384d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceListener.xml
@@ -0,0 +1,223 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.TraceListener" assembly="System">

+        <summary>

+          Provides the abstract base class for the listeners who monitor

+          trace and debug output.

+        </summary>

+        <remarks>TODO</remarks>

+        <constructor name="TraceListener">

+            <summary>

+              Initializes a new instance of the 

+              <see cref="TraceListener">TraceListener</see> class.

+            </summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="TraceListener(System.String)">

+            <summary>

+              Initializes a new instance of the 

+              <see cref="TraceListener">TraceListener</see> class using the 

+              specified name as the listener.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="name">

+            The value to return from <see cref="Name"/>.

+            </param>

+        </constructor>

+        <property name="IndentLevel">

+            <summary>Gets or sets the indent level.</summary>

+            <remarks>TODO</remarks>

+            <value>The indent level.  The default is zero.</value>

+        </property>

+        <property name="IndentSize">

+            <summary>Gets or sets the number of spaces in an indent.</summary>

+            <remarks>TODO</remarks>

+            <value>

+              The number of spaces in an indent.  The default is four spaces.

+            </value>

+        </property>

+        <property name="Name">

+            <summary>

+              Gets or sets a name for this 

+              <see cref="TraceListener">TraceListener</see>.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>

+              A name for this <see cref="TraceListener">TraceListener</see>.

+              The default is the empty string ("").

+            </value>

+        </property>

+        <property name="NeedIndent">

+            <summary>

+              Gets or sets a value indicating whether to indent the output.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>

+              <c>true</c> if the output should be indented; 

+              otherwise <c>false</c>.

+            </value>

+        </property>

+        <method name="Dispose">

+            <summary>

+              Releases all resources used by the i

+              <see cref="TraceListener">TraceListener</see>.

+            </summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteIndent">

+            <summary>

+              Writes the indent to the listener you create when you implement 

+              this class, and resets the <see cref="NeedIndent">NeedIndent</see>

+              Property to <b>false</b>.

+            </summary>

+            <remarks>TODO</remarks>

+        </method>

+        <method name="WriteLine(System.String, System.String)">

+            <summary>

+              Writes a category name and a message to the listener you create 

+              when you implement the 

+              <see cref="TraceListener">TraceListener</see> class, followed 

+              by a line terminator.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">A message to write.</param>

+            <param name="category">

+              A category name used to organize the output.

+            </param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Object, System.String)">

+            <summary>

+              Writes a category name and the value of the object's 

+              <see cref="System.Object.ToString">ToString</see>

+              method to the listener you create when you implement the

+              <see cref="TraceListener">TraceListener</see> class, followed 

+              by a line terminator.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="o">

+              An <see cref="System.Object">Object</see> whose fully qualified

+              class name you wish to write.

+            </param>

+            <param name="category">

+              A category name used to organize the output.

+            </param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String)">

+            <summary>

+              When overridden in a derived class, writes the specified message 

+              to the listener you create in the derived class, followed by a 

+              line terminator.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">A message to write.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Object)">

+            <summary>

+              Writes the value of the object's 

+              <see cref="System.Object.ToString">ToString</see>

+              method to the listener you create when you implement the

+              <see cref="TraceListener">TraceListener</see> class, followed 

+              by a line terminator.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="o">

+              An <see cref="System.Object">Object</see> whose fully qualified

+              class name you want to write.

+            </param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.String)">

+            <summary>

+              Writes a category name and a message to the listener you 

+              create when you implement the 

+              <see cref="TraceListener">TraceListener</see> class.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">A message to write.</param>

+            <param name="category">

+              A category name used to organize the output.

+            </param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Object, System.String)">

+            <summary>

+              Writes a category name and the value of the object's 

+              <see cref="System.Object.ToString">ToString</see>

+              method to the listener you create when you implement the

+              <see cref="TraceListener">TraceListener</see> class.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="o">

+              An <see cref="System.Object">Object</see> whose fully qualified

+              class name you wish to write.

+            </param>

+            <param name="category">

+              A category name used to organize the output.

+            </param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>

+              When overridden in a derived class, writes the specified message 

+              to the listener you create in the derived class.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">A message to write.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Object)">

+            <summary>Writes the value of the object's 

+              <see cref="System.Object.ToString">ToString</see>

+              method to the listener you create when you implement the

+              <see cref="TraceListener">TraceListener</see> class.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="o">

+              An <see cref="System.Object">Object</see> whose fully qualified

+              class name you want to write.

+            </param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>

+              When overridden in a derived class, flushes the output buffer.

+            </summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Fail(System.String, System.String)">

+            <summary>

+              Emits an error message, and a detailed error message to the 

+              listener you create when you implement the 

+              <see cref="TraceListener">TraceListener</see> class.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">A message to emit.</param>

+            <param name="detailMessage">A detailed message to emit.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Fail(System.String)">

+            <summary>

+              Emits an error message to the listener you create when you 

+              implement the <see cref="TraceListener">TraceListener</see> 

+              class.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="message">A message to emit.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>

+              When overridden in a derived class, closes the output stream 

+              so it no longer receives tracing or debugging output.

+            </summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>

diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceListenerCollection.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceListenerCollection.xml
new file mode 100644
index 00000000000..09a34d5fabb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceListenerCollection.xml
@@ -0,0 +1,132 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.TraceListenerCollection" assembly="System">

+        <summary>Provides a list of TraceListener objects.</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>Returns the number of items in the list.</summary>

+            <remarks>TODO</remarks>

+            <value>The number of items.</value>

+        </property>

+        <property name="Item(System.String)">

+            <summary>

+              Gets the first TraceListener in the list with the

+              specified name.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>Returns an enumerator for the list of listeners.</summary>

+            <remarks>TODO</remarks>

+            <returns>

+              List Enumerator of type <see cref="IEnumerator"/>.

+            </returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>Removes the listener at the specified index.</summary>

+            <remarks>TODO</remarks>

+            <param name="index">Location of the listener to remove.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>Clears all listeners from the list.</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Diagnostics.TraceListener)">

+            <summary>Adds a TraceListener to the list.</summary>

+            <remarks>TODO</remarks>

+            <param name="listener">

+              The <see cref="TraceListener"/> being added to the list.

+            </param>

+            <returns>

+              The position in the list where the listener was inserted.

+            </returns>

+        </method>

+        <method name="AddRange(System.Diagnostics.TraceListener[])">

+            <summary>

+              Adds an array of <see cref="TraceListeners"/>s to the list.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="value">

+              Array of <see cref="TraceListener"/> to add to the list.

+            </param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.Diagnostics.TraceListenerCollection)">

+            <summary>

+              Adds the contents of another TraceListenerCollection to this one.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="value">

+              The TraceListenerCollection to copy values from.

+            </param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Diagnostics.TraceListener)">

+            <summary>

+              Checks to see if the list contains the specified listener.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="listener">The listener to search for.</param>

+            <returns>

+              <c>true</c> if list contains listener; <c>false</c> otherwise.

+            </returns>

+        </method>

+        <method name="CopyTo(System.Diagnostics.TraceListener[], System.Int32)">

+            <summary>

+              Copies a section of the current TraceListenerCollection to

+              the specified array at the specified index.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="listeners">Array to copy listeners to.</param>

+            <param name="index">Starting index of copy.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Diagnostics.TraceListener)">

+            <summary>Gets the index of the specified listener.</summary>

+            <remarks>TODO</remarks>

+            <param name="listener">The listener to search for.</param>

+            <returns>

+              The index of the listener in the list, if it exists.

+            </returns>

+        </method>

+        <method name="Insert(System.Int32, System.Diagnostics.TraceListener)">

+            <summary>

+              Inserts the specified listener into the list at the 

+              specified index.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="index">

+              Location in the list to insert the listener.

+            </param>

+            <param name="listener">

+              The TraceListener to insert into the list.

+            </param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.String)">

+            <summary>

+              Removes the listener with the specified name from the list, 

+              if it exists.

+            </summary>

+            <remarks>TODO</remarks>

+            <param name="name">Name of listener to remove.</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Diagnostics.TraceListener)">

+            <summary>Removes the specified listener from the list.</summary>

+            <remarks>TODO</remarks>

+            <param name="listener">The listener to remove.</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>

+

diff --git a/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceSwitch.xml b/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceSwitch.xml
new file mode 100644
index 00000000000..51ba8e82ffe
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Diagnostics/TraceSwitch.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Diagnostics.TraceSwitch" assembly="System">

+        <summary>

+          Multi-level switch to provide tracing and debug output without

+          recompiling.

+        </summary>

+        <remarks>TODO</remarks>

+        <constructor name="TraceSwitch(System.String, System.String)">

+            <summary>Initializes a new instance.</summary>

+            <remarks>TODO</remarks>

+            <param name="displayName">Name for the switch.</param>

+            <param name="description">Description of the switch.</param>

+        </constructor>

+        <property name="Level">

+            <summary>

+              Gets or sets the trace level that specifies the messages to 

+              output for tracing and debugging.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TraceError">

+            <summary>

+              Gets a value indicating whether the Level is set to Error, 

+              Warning, Info, or Verbose.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TraceInfo">

+            <summary>

+              Gets a value indicating whether the Level is set to Info or 

+              Verbose.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TraceVerbose">

+            <summary>

+              Gets a value indicating whether the Level is set to Verbose.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TraceWarning">

+            <summary>

+              Gets a value indicating whether the Level is set to

+              Warning, Info, or Verbose.

+            </summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>

+

diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/CCGregorianEraHandler.xml b/mcs/docs/apidocs/xml/en/System.Globalization/CCGregorianEraHandler.xml
new file mode 100644
index 00000000000..f87a6eb2f34
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/CCGregorianEraHandler.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.CCGregorianEraHandler" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CCGregorianEraHandler">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Eras">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="appendEra(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nr">TODO</param>

+            <param name="rd_start">TODO</param>

+            <param name="rd_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="appendEra(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nr">TODO</param>

+            <param name="rd_start">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GregorianYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EraYear(System.Int32&amp;, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="era">TODO</param>

+            <param name="date">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CheckDateTime(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ValidDate(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="date">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ValidEra(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/CCHijriCalendar.xml b/mcs/docs/apidocs/xml/en/System.Globalization/CCHijriCalendar.xml
new file mode 100644
index 00000000000..b9f072d73d2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/CCHijriCalendar.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.CCHijriCalendar" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Month">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="is_leap_year(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="fixed_from_dmy(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="day">TODO</param>

+            <param name="month">TODO</param>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="year_from_fixed(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="date">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="my_from_fixed(System.Int32&amp;, System.Int32&amp;, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="month">TODO</param>

+            <param name="year">TODO</param>

+            <param name="date">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="dmy_from_fixed(System.Int32&amp;, System.Int32&amp;, System.Int32&amp;, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="day">TODO</param>

+            <param name="month">TODO</param>

+            <param name="year">TODO</param>

+            <param name="date">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="month_from_fixed(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="date">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="day_from_fixed(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="date">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="date_difference(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dayA">TODO</param>

+            <param name="monthA">TODO</param>

+            <param name="yearA">TODO</param>

+            <param name="dayB">TODO</param>

+            <param name="monthB">TODO</param>

+            <param name="yearB">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="day_number(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="day">TODO</param>

+            <param name="month">TODO</param>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="days_remaining(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="day">TODO</param>

+            <param name="month">TODO</param>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/Calendar.xml b/mcs/docs/apidocs/xml/en/System.Globalization/Calendar.xml
new file mode 100644
index 00000000000..7e3fa317545
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/Calendar.xml
@@ -0,0 +1,283 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.Calendar" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="CurrentEra">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="M_DaysInWeek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Eras">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="M_MaxYear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TwoDigitYearMax">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AbbreviatedEraNames">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EraNames">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToFourDigitYear(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapMonth(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapDay(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapDay(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetWeekOfYear(System.DateTime, System.Globalization.CalendarWeekRule, System.DayOfWeek)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="rule">TODO</param>

+            <param name="firstDayOfWeek">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSecond(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthsInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthsInYear(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMinute(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMilliseconds(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHour(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEra(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInYear(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInMonth(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfWeek(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddYears(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="years">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddWeeks(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="weeks">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddSeconds(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="seconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMonths(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="months">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMinutes(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="minutes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMilliseconds(System.DateTime, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddHours(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="hours">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddDays(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="days">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/CalendarWeekRule.xml b/mcs/docs/apidocs/xml/en/System.Globalization/CalendarWeekRule.xml
new file mode 100644
index 00000000000..664ec5679a4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/CalendarWeekRule.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Globalization.CalendarWeekRule" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/CompareOptions.xml b/mcs/docs/apidocs/xml/en/System.Globalization/CompareOptions.xml
new file mode 100644
index 00000000000..376dcf18f96
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/CompareOptions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Globalization.CompareOptions" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/CultureInfo.xml b/mcs/docs/apidocs/xml/en/System.Globalization/CultureInfo.xml
new file mode 100644
index 00000000000..b4c0c72f9b9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/CultureInfo.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.CultureInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CultureInfo(System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="culture">TODO</param>

+            <param name="use_user_override">TODO</param>

+        </constructor>

+        <constructor name="CultureInfo(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="culture">TODO</param>

+        </constructor>

+        <constructor name="CultureInfo(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="use_user_override">TODO</param>

+        </constructor>

+        <constructor name="CultureInfo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <property name="InvariantCulture">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentCulture">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentUICulture">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LCID">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Calendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsNeutralCulture">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NumberFormat">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DateTimeFormat">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetFormat(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="formatType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateSpecificCulture(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/CultureTypes.xml b/mcs/docs/apidocs/xml/en/System.Globalization/CultureTypes.xml
new file mode 100644
index 00000000000..46f502874f6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/CultureTypes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Globalization.CultureTypes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/DateTimeFormatInfo.xml b/mcs/docs/apidocs/xml/en/System.Globalization/DateTimeFormatInfo.xml
new file mode 100644
index 00000000000..06066ed0cd2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/DateTimeFormatInfo.xml
@@ -0,0 +1,212 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.DateTimeFormatInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DateTimeFormatInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="theInvariantDateTimeFormatInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AbbreviatedDayNames">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AbbreviatedMonthNames">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DayNames">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MonthNames">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AMDesignator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PMDesignator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DateSeparator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TimeSeparator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LongDatePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShortDatePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShortTimePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LongTimePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MonthDayPattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="YearMonthPattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FullDateTimePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InvariantInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FirstDayOfWeek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Calendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CalendarWeekRule">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RFC1123Pattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SortableDateTimePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UniversalSortableDateTimePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetFormat(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="formatType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInstance(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadOnly(System.Globalization.DateTimeFormatInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dtfi">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAbbreviatedEraName(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAbbreviatedMonthName(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="month">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEra(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="eraName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEraName(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthName(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="month">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAllDateTimePatterns">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAllDateTimePatterns(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayName(System.DayOfWeek)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dayofweek">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAbbreviatedDayName(System.DayOfWeek)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dayofweek">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/DateTimeStyles.xml b/mcs/docs/apidocs/xml/en/System.Globalization/DateTimeStyles.xml
new file mode 100644
index 00000000000..fa9abdf7930
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/DateTimeStyles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Globalization.DateTimeStyles" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/DaylightTime.xml b/mcs/docs/apidocs/xml/en/System.Globalization/DaylightTime.xml
new file mode 100644
index 00000000000..f0ae3190441
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/DaylightTime.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.DaylightTime" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DaylightTime(System.DateTime, System.DateTime, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="start">TODO</param>

+            <param name="end">TODO</param>

+            <param name="delta">TODO</param>

+        </constructor>

+        <property name="Start">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="End">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Delta">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/GregorianCalendar.xml b/mcs/docs/apidocs/xml/en/System.Globalization/GregorianCalendar.xml
new file mode 100644
index 00000000000..47abf133fcf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/GregorianCalendar.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.GregorianCalendar" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="GregorianCalendar(System.Globalization.GregorianCalendarTypes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+        </constructor>

+        <constructor name="GregorianCalendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="ADEra">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Eras">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CalendarType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToDateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapDay(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthsInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEra(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfWeek(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddYears(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="years">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMonths(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="months">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/GregorianCalendarTypes.xml b/mcs/docs/apidocs/xml/en/System.Globalization/GregorianCalendarTypes.xml
new file mode 100644
index 00000000000..79e0a20437c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/GregorianCalendarTypes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Globalization.GregorianCalendarTypes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/HebrewCalendar.xml b/mcs/docs/apidocs/xml/en/System.Globalization/HebrewCalendar.xml
new file mode 100644
index 00000000000..a9ffa3486d8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/HebrewCalendar.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.HebrewCalendar" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="HebrewCalendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="HebrewEra">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="M_MaxYear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Eras">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToDateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapDay(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSecond(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthsInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMinute(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMilliseconds(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHour(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEra(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfWeek(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddYears(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="years">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddWeeks(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="weeks">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddSeconds(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="seconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMonths(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="months">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMinutes(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="minutes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMilliseconds(System.DateTime, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddHours(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="hours">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddDays(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="days">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/HijriCalendar.xml b/mcs/docs/apidocs/xml/en/System.Globalization/HijriCalendar.xml
new file mode 100644
index 00000000000..2f6709e84ae
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/HijriCalendar.xml
@@ -0,0 +1,201 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.HijriCalendar" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="HijriCalendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="HijriEra">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Eras">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AddHijriDate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToDateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapDay(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSecond(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthsInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMinute(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMilliseconds(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHour(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEra(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfWeek(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddYears(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="years">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddWeeks(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="weeks">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddSeconds(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="seconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMonths(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="months">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMinutes(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="minutes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMilliseconds(System.DateTime, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddHours(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="hours">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddDays(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="days">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/JapaneseCalendar.xml b/mcs/docs/apidocs/xml/en/System.Globalization/JapaneseCalendar.xml
new file mode 100644
index 00000000000..3266f82be86
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/JapaneseCalendar.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.JapaneseCalendar" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="JapaneseCalendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Eras">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToFourDigitYear(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapDay(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSecond(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthsInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMinute(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMilliseconds(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHour(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEra(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfWeek(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddYears(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="years">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddWeeks(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="weeks">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddSeconds(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="seconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMonths(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="months">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMinutes(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="minutes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMilliseconds(System.DateTime, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddHours(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="hours">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddDays(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="days">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/JulianCalendar.xml b/mcs/docs/apidocs/xml/en/System.Globalization/JulianCalendar.xml
new file mode 100644
index 00000000000..4728d1bc250
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/JulianCalendar.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.JulianCalendar" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="JulianCalendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="JulianEra">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Eras">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToDateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapDay(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthsInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEra(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfWeek(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddYears(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="years">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMonths(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="months">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/KoreanCalendar.xml b/mcs/docs/apidocs/xml/en/System.Globalization/KoreanCalendar.xml
new file mode 100644
index 00000000000..ea4a29f9804
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/KoreanCalendar.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.KoreanCalendar" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="KoreanCalendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="KoreanEra">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Eras">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToDateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapDay(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthsInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEra(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfWeek(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddYears(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="years">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMonths(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="months">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/Month.xml b/mcs/docs/apidocs/xml/en/System.Globalization/Month.xml
new file mode 100644
index 00000000000..b41a9cf3e8c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/Month.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Globalization.CCHijriCalendar+Month" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/NumberFormatInfo.xml b/mcs/docs/apidocs/xml/en/System.Globalization/NumberFormatInfo.xml
new file mode 100644
index 00000000000..93fd76421fb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/NumberFormatInfo.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.NumberFormatInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NumberFormatInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="CurrencyDecimalDigits">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrencyDecimalSeparator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrencyGroupSeparator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrencyGroupSizes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrencyNegativePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrencyPositivePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrencySymbol">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InvariantInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NaNSymbol">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NegativeInfinitySymbol">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NegativeSign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NumberDecimalDigits">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NumberDecimalSeparator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NumberGroupSeparator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NumberGroupSizes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NumberNegativePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PercentDecimalDigits">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PercentDecimalSeparator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PercentGroupSeparator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PercentGroupSizes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PercentNegativePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PercentPositivePattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PercentSymbol">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PerMilleSymbol">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PositiveInfinitySymbol">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PositiveSign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetFormat(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="formatType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadOnly(System.Globalization.NumberFormatInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nfi">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInstance(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/NumberStyles.xml b/mcs/docs/apidocs/xml/en/System.Globalization/NumberStyles.xml
new file mode 100644
index 00000000000..63ca4e8dd1a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/NumberStyles.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Globalization.NumberStyles" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/RegionInfo.xml b/mcs/docs/apidocs/xml/en/System.Globalization/RegionInfo.xml
new file mode 100644
index 00000000000..2fa311d7f37
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/RegionInfo.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.RegionInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RegionInfo(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="culture">TODO</param>

+        </constructor>

+        <constructor name="RegionInfo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <property name="CurrencySymbol">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentRegion">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DisplayName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EnglishName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsMetric">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ISOCurrencySymbol">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/TaiwanCalendar.xml b/mcs/docs/apidocs/xml/en/System.Globalization/TaiwanCalendar.xml
new file mode 100644
index 00000000000..d0fd2875971
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/TaiwanCalendar.xml
@@ -0,0 +1,198 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.TaiwanCalendar" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TaiwanCalendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Eras">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToFourDigitYear(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapDay(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSecond(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthsInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMinute(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMilliseconds(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHour(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEra(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfWeek(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddYears(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="years">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddWeeks(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="weeks">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddSeconds(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="seconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMonths(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="months">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMinutes(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="minutes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMilliseconds(System.DateTime, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddHours(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="hours">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddDays(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="days">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/ThaiBuddhistCalendar.xml b/mcs/docs/apidocs/xml/en/System.Globalization/ThaiBuddhistCalendar.xml
new file mode 100644
index 00000000000..0531aaa8e1d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/ThaiBuddhistCalendar.xml
@@ -0,0 +1,130 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Globalization.ThaiBuddhistCalendar" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ThaiBuddhistCalendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="ThaiBuddhistEra">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Eras">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToDateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="milliseconds">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapDay(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonthsInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEra(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInYear(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaysInMonth(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="era">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfYear(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfWeek(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDayOfMonth(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddYears(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="years">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMonths(System.DateTime, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="months">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Globalization/UnicodeCategory.xml b/mcs/docs/apidocs/xml/en/System.Globalization/UnicodeCategory.xml
new file mode 100644
index 00000000000..183f7478747
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Globalization/UnicodeCategory.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Globalization.UnicodeCategory" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/INormalizeForIsolatedStorage.xml b/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/INormalizeForIsolatedStorage.xml
new file mode 100644
index 00000000000..4802a848f0d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/INormalizeForIsolatedStorage.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.IO.IsolatedStorage.INormalizeForIsolatedStorage" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorage.xml b/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorage.xml
new file mode 100644
index 00000000000..cce0d682e0b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorage.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.IsolatedStorage.IsolatedStorage" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="AssemblyIdentity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DomainIdentity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MaximumSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Scope">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SeparatorExternal">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SeparatorInternal">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Remove">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorageException.xml b/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorageException.xml
new file mode 100644
index 00000000000..3eb3b6f7df5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorageException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.IsolatedStorage.IsolatedStorageException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IsolatedStorageException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="IsolatedStorageException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="IsolatedStorageException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorageFileStream.xml b/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorageFileStream.xml
new file mode 100644
index 00000000000..d766ed2ee11
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorageFileStream.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.IsolatedStorage.IsolatedStorageFileStream" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IsolatedStorageFileStream(System.String, System.IO.FileMode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="mode">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorageScope.xml b/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorageScope.xml
new file mode 100644
index 00000000000..d8883cb005f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO.IsolatedStorage/IsolatedStorageScope.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.IO.IsolatedStorage.IsolatedStorageScope" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/BinaryReader.xml b/mcs/docs/apidocs/xml/en/System.IO/BinaryReader.xml
new file mode 100644
index 00000000000..b93ba0e3448
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/BinaryReader.xml
@@ -0,0 +1,142 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.BinaryReader" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="BinaryReader(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+        </constructor>

+        <constructor name="BinaryReader(System.IO.Stream, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="encoding">TODO</param>

+        </constructor>

+        <property name="BaseStream">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadUInt64">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadUInt32">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadUInt16">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadSingle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadSByte">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadInt64">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadInt32">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadInt16">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadDouble">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadDecimal">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadChars(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadBytes(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadByte">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadBoolean">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="PeekChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/BinaryWriter.xml b/mcs/docs/apidocs/xml/en/System.IO/BinaryWriter.xml
new file mode 100644
index 00000000000..427201d6d3e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/BinaryWriter.xml
@@ -0,0 +1,162 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.BinaryWriter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="BinaryWriter(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="output">TODO</param>

+        </constructor>

+        <constructor name="BinaryWriter(System.IO.Stream, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="output">TODO</param>

+            <param name="encoding">TODO</param>

+        </constructor>

+        <field name="Null">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="BaseStream">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Seek(System.Int32, System.IO.SeekOrigin)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="origin">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/BufferedStream.xml b/mcs/docs/apidocs/xml/en/System.IO/BufferedStream.xml
new file mode 100644
index 00000000000..82ed7514db7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/BufferedStream.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.BufferedStream" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="BufferedStream(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+        </constructor>

+        <constructor name="BufferedStream(System.IO.Stream, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <param name="buffer_size">TODO</param>

+        </constructor>

+        <property name="CanRead">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanWrite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanSeek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Position">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteByte(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLength(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Seek(System.Int64, System.IO.SeekOrigin)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="origin">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadByte">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/Directory.xml b/mcs/docs/apidocs/xml/en/System.IO/Directory.xml
new file mode 100644
index 00000000000..263548893f8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/Directory.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.Directory" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="CreateDirectory(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Delete(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Delete(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="recurse">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Exists(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLastAccessTime(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLastWriteTime(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCreationTime(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCurrentDirectory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDirectories(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDirectories(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="pattern">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDirectoryRoot(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFiles(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFiles(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="pattern">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFileSystemEntries(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFileSystemEntries(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="pattern">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLogicalDrives">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetParent(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Move(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="src">TODO</param>

+            <param name="dest">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCreationTime(System.String, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="creation_time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCurrentDirectory(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLastAccessTime(System.String, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="last_access_time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLastWriteTime(System.String, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="last_write_time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/DirectoryInfo.xml b/mcs/docs/apidocs/xml/en/System.IO/DirectoryInfo.xml
new file mode 100644
index 00000000000..1458e89d9d1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/DirectoryInfo.xml
@@ -0,0 +1,99 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.DirectoryInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DirectoryInfo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+        </constructor>

+        <property name="Exists">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Parent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Root">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Delete">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateSubdirectory(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFiles">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFiles(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="pattern">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDirectories">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDirectories(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="pattern">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFileSystemInfos">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFileSystemInfos(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="pattern">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Delete(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="recurse">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveTo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dest">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/DirectoryNotFoundException.xml b/mcs/docs/apidocs/xml/en/System.IO/DirectoryNotFoundException.xml
new file mode 100644
index 00000000000..0a0a5e40678
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/DirectoryNotFoundException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.DirectoryNotFoundException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DirectoryNotFoundException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="DirectoryNotFoundException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="DirectoryNotFoundException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/EndOfStreamException.xml b/mcs/docs/apidocs/xml/en/System.IO/EndOfStreamException.xml
new file mode 100644
index 00000000000..4f98bedfca8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/EndOfStreamException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.EndOfStreamException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="EndOfStreamException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="EndOfStreamException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="EndOfStreamException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/File.xml b/mcs/docs/apidocs/xml/en/System.IO/File.xml
new file mode 100644
index 00000000000..65a57e3f0b0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/File.xml
@@ -0,0 +1,155 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.File" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="AppendText(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="sourceFilename">TODO</param>

+            <param name="destFilename">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy(System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="src">TODO</param>

+            <param name="dest">TODO</param>

+            <param name="overwrite">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="buffersize">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Delete(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Exists(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttributes(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCreationTime(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLastAccessTime(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLastWriteTime(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Move(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="src">TODO</param>

+            <param name="dest">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Open(System.String, System.IO.FileMode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="mode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Open(System.String, System.IO.FileMode, System.IO.FileAccess)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="mode">TODO</param>

+            <param name="access">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Open(System.String, System.IO.FileMode, System.IO.FileAccess, System.IO.FileShare)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="mode">TODO</param>

+            <param name="access">TODO</param>

+            <param name="share">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenRead(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenText(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenWrite(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetAttributes(System.String, System.IO.FileAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="attributes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCreationTime(System.String, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="creation_time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLastAccessTime(System.String, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="last_access_time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLastWriteTime(System.String, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="last_write_time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/FileAccess.xml b/mcs/docs/apidocs/xml/en/System.IO/FileAccess.xml
new file mode 100644
index 00000000000..e3bb30c1902
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/FileAccess.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.IO.FileAccess" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/FileAttributes.xml b/mcs/docs/apidocs/xml/en/System.IO/FileAttributes.xml
new file mode 100644
index 00000000000..db7bdb6b53e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/FileAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.IO.FileAttributes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/FileInfo.xml b/mcs/docs/apidocs/xml/en/System.IO/FileInfo.xml
new file mode 100644
index 00000000000..161ebdc2d51
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/FileInfo.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.FileInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FileInfo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+        </constructor>

+        <property name="Exists">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DirectoryName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Directory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Delete">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AppendText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenRead">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenWrite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Open(System.IO.FileMode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Open(System.IO.FileMode, System.IO.FileAccess)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mode">TODO</param>

+            <param name="access">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Open(System.IO.FileMode, System.IO.FileAccess, System.IO.FileShare)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mode">TODO</param>

+            <param name="access">TODO</param>

+            <param name="share">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveTo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dest">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="overwrite">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/FileLoadException.xml b/mcs/docs/apidocs/xml/en/System.IO/FileLoadException.xml
new file mode 100644
index 00000000000..5a1328cecea
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/FileLoadException.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.FileLoadException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FileLoadException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="FileLoadException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="FileLoadException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FileName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FusionLog">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/FileMode.xml b/mcs/docs/apidocs/xml/en/System.IO/FileMode.xml
new file mode 100644
index 00000000000..58ccd2f9ccf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/FileMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.IO.FileMode" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/FileNotFoundException.xml b/mcs/docs/apidocs/xml/en/System.IO/FileNotFoundException.xml
new file mode 100644
index 00000000000..1c1129ea7ed
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/FileNotFoundException.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.FileNotFoundException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FileNotFoundException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="FileNotFoundException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="FileNotFoundException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <constructor name="FileNotFoundException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="fileName">TODO</param>

+        </constructor>

+        <constructor name="FileNotFoundException(System.String, System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="fileName">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+        <property name="FileName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FusionLog">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/FileShare.xml b/mcs/docs/apidocs/xml/en/System.IO/FileShare.xml
new file mode 100644
index 00000000000..253ff07e320
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/FileShare.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.IO.FileShare" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/FileStream.xml b/mcs/docs/apidocs/xml/en/System.IO/FileStream.xml
new file mode 100644
index 00000000000..7d429a0df74
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/FileStream.xml
@@ -0,0 +1,163 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.FileStream" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FileStream(System.IntPtr, System.IO.FileAccess)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="handle">TODO</param>

+            <param name="access">TODO</param>

+        </constructor>

+        <constructor name="FileStream(System.IntPtr, System.IO.FileAccess, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="handle">TODO</param>

+            <param name="access">TODO</param>

+            <param name="ownsHandle">TODO</param>

+        </constructor>

+        <constructor name="FileStream(System.IntPtr, System.IO.FileAccess, System.Boolean, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="handle">TODO</param>

+            <param name="access">TODO</param>

+            <param name="ownsHandle">TODO</param>

+            <param name="bufferSize">TODO</param>

+        </constructor>

+        <constructor name="FileStream(System.IntPtr, System.IO.FileAccess, System.Boolean, System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="handle">TODO</param>

+            <param name="access">TODO</param>

+            <param name="ownsHandle">TODO</param>

+            <param name="bufferSize">TODO</param>

+            <param name="isAsync">TODO</param>

+        </constructor>

+        <constructor name="FileStream(System.String, System.IO.FileMode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="mode">TODO</param>

+        </constructor>

+        <constructor name="FileStream(System.String, System.IO.FileMode, System.IO.FileAccess)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="mode">TODO</param>

+            <param name="access">TODO</param>

+        </constructor>

+        <constructor name="FileStream(System.String, System.IO.FileMode, System.IO.FileAccess, System.IO.FileShare)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="mode">TODO</param>

+            <param name="access">TODO</param>

+            <param name="share">TODO</param>

+        </constructor>

+        <constructor name="FileStream(System.String, System.IO.FileMode, System.IO.FileAccess, System.IO.FileShare, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="mode">TODO</param>

+            <param name="access">TODO</param>

+            <param name="share">TODO</param>

+            <param name="bufferSize">TODO</param>

+        </constructor>

+        <constructor name="FileStream(System.String, System.IO.FileMode, System.IO.FileAccess, System.IO.FileShare, System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="mode">TODO</param>

+            <param name="access">TODO</param>

+            <param name="share">TODO</param>

+            <param name="bufferSize">TODO</param>

+            <param name="isAsync">TODO</param>

+        </constructor>

+        <property name="CanRead">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanWrite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanSeek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Position">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Handle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteByte(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="src">TODO</param>

+            <param name="src_offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLength(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Seek(System.Int64, System.IO.SeekOrigin)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="origin">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadByte">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dest">TODO</param>

+            <param name="dest_offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/FileSystemInfo.xml b/mcs/docs/apidocs/xml/en/System.IO/FileSystemInfo.xml
new file mode 100644
index 00000000000..f8e78d87eab
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/FileSystemInfo.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.FileSystemInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Exists">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FullName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Extension">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CreationTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LastAccessTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LastWriteTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Delete">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Refresh">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/IOException.xml b/mcs/docs/apidocs/xml/en/System.IO/IOException.xml
new file mode 100644
index 00000000000..9b808f609f1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/IOException.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.IOException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IOException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="IOException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="IOException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <constructor name="IOException(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="hresult">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/MemoryStream.xml b/mcs/docs/apidocs/xml/en/System.IO/MemoryStream.xml
new file mode 100644
index 00000000000..bb28a2f2b5e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/MemoryStream.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.MemoryStream" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MemoryStream">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="MemoryStream(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+        </constructor>

+        <constructor name="MemoryStream(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+        </constructor>

+        <constructor name="MemoryStream(System.Byte[], System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="writeable">TODO</param>

+        </constructor>

+        <constructor name="MemoryStream(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+        </constructor>

+        <constructor name="MemoryStream(System.Byte[], System.Int32, System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <param name="writeable">TODO</param>

+        </constructor>

+        <constructor name="MemoryStream(System.Byte[], System.Int32, System.Int32, System.Boolean, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <param name="writeable">TODO</param>

+            <param name="publicallyVisible">TODO</param>

+        </constructor>

+        <property name="CanRead">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanSeek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanWrite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Capacity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Position">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToArray">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBuffer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteByte(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLength(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Seek(System.Int64, System.IO.SeekOrigin)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="loc">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadByte">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/Path.xml b/mcs/docs/apidocs/xml/en/System.IO/Path.xml
new file mode 100644
index 00000000000..5c8cceb292c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/Path.xml
@@ -0,0 +1,100 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.Path" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="AltDirectorySeparatorChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="DirectorySeparatorChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="InvalidPathChars">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="PathSeparator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="VolumeSeparatorChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ChangeExtension(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="extension">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Combine(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path1">TODO</param>

+            <param name="path2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDirectoryName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetExtension(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFileName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFileNameWithoutExtension(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFullPath(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetPathRoot(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTempFileName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTempPath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="HasExtension(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsPathRooted(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/PathTooLongException.xml b/mcs/docs/apidocs/xml/en/System.IO/PathTooLongException.xml
new file mode 100644
index 00000000000..1741279772d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/PathTooLongException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.PathTooLongException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="PathTooLongException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="PathTooLongException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="PathTooLongException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/SeekOrigin.xml b/mcs/docs/apidocs/xml/en/System.IO/SeekOrigin.xml
new file mode 100644
index 00000000000..bb813b853a0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/SeekOrigin.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.IO.SeekOrigin" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/Stream.xml b/mcs/docs/apidocs/xml/en/System.IO/Stream.xml
new file mode 100644
index 00000000000..bf097c21b55
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/Stream.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.Stream" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Null">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="CanRead">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanSeek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanWrite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Position">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndWrite(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="async_result">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndRead(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="async_result">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginWrite(System.Byte[], System.Int32, System.Int32, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <param name="cback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginRead(System.Byte[], System.Int32, System.Int32, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <param name="cback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteByte(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLength(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Seek(System.Int64, System.IO.SeekOrigin)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="origin">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadByte">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/StreamReader.xml b/mcs/docs/apidocs/xml/en/System.IO/StreamReader.xml
new file mode 100644
index 00000000000..8d33e6decc9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/StreamReader.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.StreamReader" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StreamReader(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+        </constructor>

+        <constructor name="StreamReader(System.IO.Stream, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <param name="detectEncodingFromByteOrderMarks">TODO</param>

+        </constructor>

+        <constructor name="StreamReader(System.IO.Stream, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <param name="encoding">TODO</param>

+        </constructor>

+        <constructor name="StreamReader(System.IO.Stream, System.Text.Encoding, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <param name="encoding">TODO</param>

+            <param name="detectEncodingFromByteOrderMarks">TODO</param>

+        </constructor>

+        <constructor name="StreamReader(System.IO.Stream, System.Text.Encoding, System.Boolean, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <param name="encoding">TODO</param>

+            <param name="detectEncodingFromByteOrderMarks">TODO</param>

+            <param name="bufferSize">TODO</param>

+        </constructor>

+        <constructor name="StreamReader(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+        </constructor>

+        <constructor name="StreamReader(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="detectEncodingFromByteOrderMarks">TODO</param>

+        </constructor>

+        <constructor name="StreamReader(System.String, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="encoding">TODO</param>

+        </constructor>

+        <constructor name="StreamReader(System.String, System.Text.Encoding, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="encoding">TODO</param>

+            <param name="detectEncodingFromByteOrderMarks">TODO</param>

+        </constructor>

+        <constructor name="StreamReader(System.String, System.Text.Encoding, System.Boolean, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="encoding">TODO</param>

+            <param name="detectEncodingFromByteOrderMarks">TODO</param>

+            <param name="bufferSize">TODO</param>

+        </constructor>

+        <field name="Null">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="BaseStream">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentEncoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ReadToEnd">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dest_buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Peek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="DiscardBufferedData">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/StreamWriter.xml b/mcs/docs/apidocs/xml/en/System.IO/StreamWriter.xml
new file mode 100644
index 00000000000..880ddd36a97
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/StreamWriter.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.StreamWriter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StreamWriter(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+        </constructor>

+        <constructor name="StreamWriter(System.IO.Stream, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <param name="encoding">TODO</param>

+        </constructor>

+        <constructor name="StreamWriter(System.IO.Stream, System.Text.Encoding, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <param name="encoding">TODO</param>

+            <param name="bufferSize">TODO</param>

+        </constructor>

+        <constructor name="StreamWriter(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+        </constructor>

+        <constructor name="StreamWriter(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="append">TODO</param>

+        </constructor>

+        <constructor name="StreamWriter(System.String, System.Boolean, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="append">TODO</param>

+            <param name="encoding">TODO</param>

+        </constructor>

+        <constructor name="StreamWriter(System.String, System.Boolean, System.Text.Encoding, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="append">TODO</param>

+            <param name="encoding">TODO</param>

+            <param name="bufferSize">TODO</param>

+        </constructor>

+        <property name="AutoFlush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseStream">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Encoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Write(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/StringReader.xml b/mcs/docs/apidocs/xml/en/System.IO/StringReader.xml
new file mode 100644
index 00000000000..60a19b61ee9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/StringReader.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.StringReader" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StringReader(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+        </constructor>

+        <method name="ReadToEnd">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Peek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/StringWriter.xml b/mcs/docs/apidocs/xml/en/System.IO/StringWriter.xml
new file mode 100644
index 00000000000..cd1d33ace1b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/StringWriter.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.StringWriter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StringWriter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="StringWriter(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="formatProvider">TODO</param>

+        </constructor>

+        <constructor name="StringWriter(System.Text.StringBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="sb">TODO</param>

+        </constructor>

+        <constructor name="StringWriter(System.Text.StringBuilder, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="sb">TODO</param>

+            <param name="formatProvider">TODO</param>

+        </constructor>

+        <property name="Encoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetStringBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/TextReader.xml b/mcs/docs/apidocs/xml/en/System.IO/TextReader.xml
new file mode 100644
index 00000000000..b20ccb2b4cd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/TextReader.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.TextReader" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Null">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ReadToEnd">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadBlock(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Peek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Synchronised(System.IO.TextReader)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="reader">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.IO/TextWriter.xml b/mcs/docs/apidocs/xml/en/System.IO/TextWriter.xml
new file mode 100644
index 00000000000..f35eb655cec
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.IO/TextWriter.xml
@@ -0,0 +1,270 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IO.TextWriter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Null">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Encoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FormatProvider">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NewLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteLine(System.String, System.Object, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <param name="arg2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <param name="arg2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Synchronised(System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/AddressFamily.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/AddressFamily.xml
new file mode 100644
index 00000000000..4e18c966b06
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/AddressFamily.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.Sockets.AddressFamily" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/LingerOption.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/LingerOption.xml
new file mode 100644
index 00000000000..c5b2191bac4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/LingerOption.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.Sockets.LingerOption" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="LingerOption(System.Boolean, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="enable">TODO</param>

+            <param name="secs">TODO</param>

+        </constructor>

+        <property name="Enabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LingerTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/MulticastOption.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/MulticastOption.xml
new file mode 100644
index 00000000000..489e8403e2a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/MulticastOption.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.Sockets.MulticastOption" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MulticastOption(System.Net.IPAddress)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="grp">TODO</param>

+        </constructor>

+        <constructor name="MulticastOption(System.Net.IPAddress, System.Net.IPAddress)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="grp">TODO</param>

+            <param name="addr">TODO</param>

+        </constructor>

+        <property name="Group">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalAddress">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/NetworkStream.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/NetworkStream.xml
new file mode 100644
index 00000000000..895a52e7640
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/NetworkStream.xml
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.Sockets.NetworkStream" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NetworkStream(System.Net.Sockets.Socket)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="socket">TODO</param>

+        </constructor>

+        <constructor name="NetworkStream(System.Net.Sockets.Socket, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="socket">TODO</param>

+            <param name="owns_socket">TODO</param>

+        </constructor>

+        <constructor name="NetworkStream(System.Net.Sockets.Socket, System.IO.FileAccess)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="socket">TODO</param>

+            <param name="access">TODO</param>

+        </constructor>

+        <constructor name="NetworkStream(System.Net.Sockets.Socket, System.IO.FileAccess, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="socket">TODO</param>

+            <param name="access">TODO</param>

+            <param name="owns_socket">TODO</param>

+        </constructor>

+        <property name="CanRead">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanSeek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanWrite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataAvailable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Position">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Readable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Socket">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Writeable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Write(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLength(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Seek(System.Int64, System.IO.SeekOrigin)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="origin">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndWrite(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ar">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginWrite(System.Byte[], System.Int32, System.Int32, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndRead(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ar">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginRead(System.Byte[], System.Int32, System.Int32, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/ProtocolFamily.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/ProtocolFamily.xml
new file mode 100644
index 00000000000..19a8603779f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/ProtocolFamily.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.Sockets.ProtocolFamily" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/ProtocolType.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/ProtocolType.xml
new file mode 100644
index 00000000000..da33090e437
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/ProtocolType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.Sockets.ProtocolType" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/SelectMode.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SelectMode.xml
new file mode 100644
index 00000000000..273faae5544
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SelectMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.Sockets.SelectMode" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/Socket.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/Socket.xml
new file mode 100644
index 00000000000..48d79259ec7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/Socket.xml
@@ -0,0 +1,396 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.Sockets.Socket" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Socket(System.Net.Sockets.AddressFamily, System.Net.Sockets.SocketType, System.Net.Sockets.ProtocolType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="family">TODO</param>

+            <param name="type">TODO</param>

+            <param name="proto">TODO</param>

+        </constructor>

+        <property name="AddressFamily">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Available">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Blocking">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Connected">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Handle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalEndPoint">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProtocolType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RemoteEndPoint">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SocketType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Select(System.Collections.IList, System.Collections.IList, System.Collections.IList, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="read_list">TODO</param>

+            <param name="write_list">TODO</param>

+            <param name="err_list">TODO</param>

+            <param name="time_us">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Accept">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginAccept(System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginConnect(System.Net.EndPoint, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="end_point">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginReceive(System.Byte[], System.Int32, System.Int32, System.Net.Sockets.SocketFlags, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <param name="socket_flags">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginReceiveFrom(System.Byte[], System.Int32, System.Int32, System.Net.Sockets.SocketFlags, System.Net.EndPoint&amp;, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <param name="socket_flags">TODO</param>

+            <param name="remote_end">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginSend(System.Byte[], System.Int32, System.Int32, System.Net.Sockets.SocketFlags, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <param name="socket_flags">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginSendTo(System.Byte[], System.Int32, System.Int32, System.Net.Sockets.SocketFlags, System.Net.EndPoint, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <param name="socket_flags">TODO</param>

+            <param name="remote_end">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Bind(System.Net.EndPoint)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="local_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Connect(System.Net.EndPoint)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="remote_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndAccept(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="result">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndConnect(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="result">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndReceive(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="result">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndReceiveFrom(System.IAsyncResult, System.Net.EndPoint&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="result">TODO</param>

+            <param name="end_point">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndSend(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="result">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndSendTo(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="result">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSocketOption(System.Net.Sockets.SocketOptionLevel, System.Net.Sockets.SocketOptionName)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSocketOption(System.Net.Sockets.SocketOptionLevel, System.Net.Sockets.SocketOptionName, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <param name="name">TODO</param>

+            <param name="opt_value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSocketOption(System.Net.Sockets.SocketOptionLevel, System.Net.Sockets.SocketOptionName, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <param name="name">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IOControl(System.Int32, System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ioctl_code">TODO</param>

+            <param name="in_value">TODO</param>

+            <param name="out_value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Listen(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="backlog">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Poll(System.Int32, System.Net.Sockets.SelectMode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time_us">TODO</param>

+            <param name="mode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Receive(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Receive(System.Byte[], System.Net.Sockets.SocketFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <param name="flags">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Receive(System.Byte[], System.Int32, System.Net.Sockets.SocketFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <param name="size">TODO</param>

+            <param name="flags">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Receive(System.Byte[], System.Int32, System.Int32, System.Net.Sockets.SocketFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <param name="flags">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReceiveFrom(System.Byte[], System.Net.EndPoint&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <param name="remote_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReceiveFrom(System.Byte[], System.Net.Sockets.SocketFlags, System.Net.EndPoint&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <param name="flags">TODO</param>

+            <param name="remote_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReceiveFrom(System.Byte[], System.Int32, System.Net.Sockets.SocketFlags, System.Net.EndPoint&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <param name="size">TODO</param>

+            <param name="flags">TODO</param>

+            <param name="remote_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReceiveFrom(System.Byte[], System.Int32, System.Int32, System.Net.Sockets.SocketFlags, System.Net.EndPoint&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <param name="flags">TODO</param>

+            <param name="remote_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Send(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Send(System.Byte[], System.Net.Sockets.SocketFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <param name="flags">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Send(System.Byte[], System.Int32, System.Net.Sockets.SocketFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <param name="size">TODO</param>

+            <param name="flags">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Send(System.Byte[], System.Int32, System.Int32, System.Net.Sockets.SocketFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buf">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <param name="flags">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SendTo(System.Byte[], System.Net.EndPoint)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="remote_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SendTo(System.Byte[], System.Net.Sockets.SocketFlags, System.Net.EndPoint)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="flags">TODO</param>

+            <param name="remote_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SendTo(System.Byte[], System.Int32, System.Net.Sockets.SocketFlags, System.Net.EndPoint)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="size">TODO</param>

+            <param name="flags">TODO</param>

+            <param name="remote_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SendTo(System.Byte[], System.Int32, System.Int32, System.Net.Sockets.SocketFlags, System.Net.EndPoint)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="size">TODO</param>

+            <param name="flags">TODO</param>

+            <param name="remote_end">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetSocketOption(System.Net.Sockets.SocketOptionLevel, System.Net.Sockets.SocketOptionName, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <param name="name">TODO</param>

+            <param name="opt_value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetSocketOption(System.Net.Sockets.SocketOptionLevel, System.Net.Sockets.SocketOptionName, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <param name="name">TODO</param>

+            <param name="opt_value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetSocketOption(System.Net.Sockets.SocketOptionLevel, System.Net.Sockets.SocketOptionName, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <param name="name">TODO</param>

+            <param name="opt_value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Shutdown(System.Net.Sockets.SocketShutdown)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="how">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketException.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketException.xml
new file mode 100644
index 00000000000..fa82470f5f3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketException.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.Sockets.SocketException" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SocketException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="SocketException(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="error">TODO</param>

+        </constructor>

+        <property name="ErrorCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketFlags.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketFlags.xml
new file mode 100644
index 00000000000..96397cb2661
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketFlags.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.Sockets.SocketFlags" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketOptionLevel.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketOptionLevel.xml
new file mode 100644
index 00000000000..94711691826
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketOptionLevel.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.Sockets.SocketOptionLevel" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketOptionName.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketOptionName.xml
new file mode 100644
index 00000000000..6904c8d9883
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketOptionName.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.Sockets.SocketOptionName" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketShutdown.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketShutdown.xml
new file mode 100644
index 00000000000..ba09ba7e49c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketShutdown.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.Sockets.SocketShutdown" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketType.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketType.xml
new file mode 100644
index 00000000000..fd2f1e36280
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/SocketType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.Sockets.SocketType" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/TcpClient.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/TcpClient.xml
new file mode 100644
index 00000000000..24e8bd7872e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/TcpClient.xml
@@ -0,0 +1,98 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.Sockets.TcpClient" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TcpClient">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="TcpClient(System.Net.IPEndPoint)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="local_end_point">TODO</param>

+        </constructor>

+        <constructor name="TcpClient(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hostname">TODO</param>

+            <param name="port">TODO</param>

+        </constructor>

+        <property name="Active">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Client">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LingerState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NoDelay">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReceiveBufferSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReceiveTimeout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SendBufferSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SendTimeout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Connect(System.Net.IPEndPoint)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="remote_end_point">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Connect(System.Net.IPAddress, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="address">TODO</param>

+            <param name="port">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Connect(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hostname">TODO</param>

+            <param name="port">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetStream">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net.Sockets/TcpListener.xml b/mcs/docs/apidocs/xml/en/System.Net.Sockets/TcpListener.xml
new file mode 100644
index 00000000000..0479294751b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net.Sockets/TcpListener.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.Sockets.TcpListener" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TcpListener(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="port">TODO</param>

+        </constructor>

+        <constructor name="TcpListener(System.Net.IPEndPoint)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="local_end_point">TODO</param>

+        </constructor>

+        <constructor name="TcpListener(System.Net.IPAddress, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="listen_ip">TODO</param>

+            <param name="port">TODO</param>

+        </constructor>

+        <property name="Active">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalEndPoint">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Server">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="AcceptSocket">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AcceptTcpClient">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Pending">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Start">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Stop">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/Authorization.xml b/mcs/docs/apidocs/xml/en/System.Net/Authorization.xml
new file mode 100644
index 00000000000..ebe5779fecf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/Authorization.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.Authorization" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Authorization(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="token">TODO</param>

+        </constructor>

+        <constructor name="Authorization(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="token">TODO</param>

+            <param name="complete">TODO</param>

+        </constructor>

+        <property name="Complete">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/ConnectionModes.xml b/mcs/docs/apidocs/xml/en/System.Net/ConnectionModes.xml
new file mode 100644
index 00000000000..df03b257adf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/ConnectionModes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.ConnectionModes" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/Dns.xml b/mcs/docs/apidocs/xml/en/System.Net/Dns.xml
new file mode 100644
index 00000000000..ad2e6c6eac2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/Dns.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.Dns" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="BeginGetHostByName(System.String, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hostName">TODO</param>

+            <param name="requestCallback">TODO</param>

+            <param name="stateObject">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginResolve(System.String, System.AsyncCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hostName">TODO</param>

+            <param name="requestCallback">TODO</param>

+            <param name="stateObject">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndGetHostByName(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="asyncResult">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndResolve(System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="asyncResult">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHostByAddress(System.Net.IPAddress)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="address">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHostByAddress(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="address">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHostByName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hostName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHostName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Resolve(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hostName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/EndPoint.xml b/mcs/docs/apidocs/xml/en/System.Net/EndPoint.xml
new file mode 100644
index 00000000000..05ac52e956d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/EndPoint.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.EndPoint" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="AddressFamily">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Serialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.Net.SocketAddress)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="address">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/HttpStatusCode.xml b/mcs/docs/apidocs/xml/en/System.Net/HttpStatusCode.xml
new file mode 100644
index 00000000000..6c39c57bfe8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/HttpStatusCode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.HttpStatusCode" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/ICredentials.xml b/mcs/docs/apidocs/xml/en/System.Net/ICredentials.xml
new file mode 100644
index 00000000000..d1609e6556b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/ICredentials.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Net.ICredentials" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/IPAddress.xml b/mcs/docs/apidocs/xml/en/System.Net/IPAddress.xml
new file mode 100644
index 00000000000..73a7c90ea60
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/IPAddress.xml
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.IPAddress" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IPAddress(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="addr">TODO</param>

+        </constructor>

+        <field name="Any">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Broadcast">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Loopback">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="None">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Address">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AddressFamily">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="other">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="HostToNetworkOrder(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="host">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="HostToNetworkOrder(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="host">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="HostToNetworkOrder(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="host">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NetworkToHostOrder(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="network">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NetworkToHostOrder(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="network">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NetworkToHostOrder(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="network">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ip">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLoopback(System.Net.IPAddress)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="addr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/IPEndPoint.xml b/mcs/docs/apidocs/xml/en/System.Net/IPEndPoint.xml
new file mode 100644
index 00000000000..5f50096899f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/IPEndPoint.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.IPEndPoint" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IPEndPoint(System.Net.IPAddress, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="address">TODO</param>

+            <param name="port">TODO</param>

+        </constructor>

+        <constructor name="IPEndPoint(System.Int64, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="iaddr">TODO</param>

+            <param name="port">TODO</param>

+        </constructor>

+        <field name="MaxPort">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinPort">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Address">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AddressFamily">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Port">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Serialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.Net.SocketAddress)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="sockaddr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/IPHostEntry.xml b/mcs/docs/apidocs/xml/en/System.Net/IPHostEntry.xml
new file mode 100644
index 00000000000..a5e918b5306
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/IPHostEntry.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.IPHostEntry" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IPHostEntry">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AddressList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Aliases">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HostName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/NetworkAccess.xml b/mcs/docs/apidocs/xml/en/System.Net/NetworkAccess.xml
new file mode 100644
index 00000000000..988e5817574
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/NetworkAccess.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.NetworkAccess" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/NetworkCredential.xml b/mcs/docs/apidocs/xml/en/System.Net/NetworkCredential.xml
new file mode 100644
index 00000000000..ff3e0ca2dce
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/NetworkCredential.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.NetworkCredential" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NetworkCredential">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="NetworkCredential(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="userName">TODO</param>

+            <param name="password">TODO</param>

+        </constructor>

+        <constructor name="NetworkCredential(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="userName">TODO</param>

+            <param name="password">TODO</param>

+            <param name="domain">TODO</param>

+        </constructor>

+        <property name="Domain">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UserName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Password">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetCredential(System.Uri, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="uri">TODO</param>

+            <param name="authType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/ProxyUseType.xml b/mcs/docs/apidocs/xml/en/System.Net/ProxyUseType.xml
new file mode 100644
index 00000000000..62ce163226e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/ProxyUseType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.ProxyUseType" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/SocketAddress.xml b/mcs/docs/apidocs/xml/en/System.Net/SocketAddress.xml
new file mode 100644
index 00000000000..7b47eea3484
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/SocketAddress.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Net.SocketAddress" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SocketAddress(System.Net.Sockets.AddressFamily, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="family">TODO</param>

+            <param name="size">TODO</param>

+        </constructor>

+        <constructor name="SocketAddress(System.Net.Sockets.AddressFamily)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="family">TODO</param>

+        </constructor>

+        <property name="Family">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Size">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/TransportType.xml b/mcs/docs/apidocs/xml/en/System.Net/TransportType.xml
new file mode 100644
index 00000000000..cd8d90deda7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/TransportType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.TransportType" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/WebExceptionStatus.xml b/mcs/docs/apidocs/xml/en/System.Net/WebExceptionStatus.xml
new file mode 100644
index 00000000000..c0b358699ab
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/WebExceptionStatus.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.WebExceptionStatus" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Net/WebStatus.xml b/mcs/docs/apidocs/xml/en/System.Net/WebStatus.xml
new file mode 100644
index 00000000000..257242f549d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Net/WebStatus.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Net.WebStatus" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/AssemblyBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/AssemblyBuilder.xml
new file mode 100644
index 00000000000..c2e3c7eaeab
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/AssemblyBuilder.xml
@@ -0,0 +1,159 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.AssemblyBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="CodeBase">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EntryPoint">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Location">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetExportedTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFile(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddResourceFile(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="fileName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddResourceFile(System.String, System.String, System.Reflection.ResourceAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="fileName">TODO</param>

+            <param name="attribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicModule(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicModule(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="emitSymbolInfo">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicModule(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="fileName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicModule(System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="fileName">TODO</param>

+            <param name="emitSymbolInfo">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineResource(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="description">TODO</param>

+            <param name="fileName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineResource(System.String, System.String, System.String, System.Reflection.ResourceAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="description">TODO</param>

+            <param name="fileName">TODO</param>

+            <param name="attribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineUnmanagedResource(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="resource">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineUnmanagedResource(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="resourceFileName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineVersionInfoResource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineVersionInfoResource(System.String, System.String, System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="product">TODO</param>

+            <param name="productVersion">TODO</param>

+            <param name="company">TODO</param>

+            <param name="copyright">TODO</param>

+            <param name="trademark">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDynamicModule(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Save(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyFileName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetEntryPoint(System.Reflection.MethodInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="entryMethod">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetEntryPoint(System.Reflection.MethodInfo, System.Reflection.Emit.PEFileKinds)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="entryMethod">TODO</param>

+            <param name="fileKind">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="customBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.ConstructorInfo, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="binaryAttribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/AssemblyBuilderAccess.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/AssemblyBuilderAccess.xml
new file mode 100644
index 00000000000..75b595e4c4b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/AssemblyBuilderAccess.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.Emit.AssemblyBuilderAccess" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ConstructorBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ConstructorBuilder.xml
new file mode 100644
index 00000000000..c457c2ac8f1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ConstructorBuilder.xml
@@ -0,0 +1,169 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.ConstructorBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="TypeBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MethodHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReflectedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DeclaringType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReturnType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Signature">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InitLocals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Invoke(System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="parameters">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Invoke(System.Object, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="parameters">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetParameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethodImplementationFlags">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddDeclarativeSecurity(System.Security.Permissions.SecurityAction, System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+            <param name="pset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineParameter(System.Int32, System.Reflection.ParameterAttributes, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="iSequence">TODO</param>

+            <param name="attributes">TODO</param>

+            <param name="strParamName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetILGenerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetILGenerator(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="size">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="customBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.ConstructorInfo, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="binaryAttribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetImplementationFlags(System.Reflection.MethodImplAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetModule">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetToken">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetSymCustomAttribute(System.String, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/CustomAttributeBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/CustomAttributeBuilder.xml
new file mode 100644
index 00000000000..6e20c63d239
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/CustomAttributeBuilder.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.CustomAttributeBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CustomAttributeBuilder(System.Reflection.ConstructorInfo, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="constructorArgs">TODO</param>

+        </constructor>

+        <constructor name="CustomAttributeBuilder(System.Reflection.ConstructorInfo, System.Object[], System.Reflection.FieldInfo[], System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="constructorArgs">TODO</param>

+            <param name="namedFields">TODO</param>

+            <param name="fieldValues">TODO</param>

+        </constructor>

+        <constructor name="CustomAttributeBuilder(System.Reflection.ConstructorInfo, System.Object[], System.Reflection.PropertyInfo[], System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="constructorArgs">TODO</param>

+            <param name="namedProperties">TODO</param>

+            <param name="propertyValues">TODO</param>

+        </constructor>

+        <constructor name="CustomAttributeBuilder(System.Reflection.ConstructorInfo, System.Object[], System.Reflection.PropertyInfo[], System.Object[], System.Reflection.FieldInfo[], System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="constructorArgs">TODO</param>

+            <param name="namedProperties">TODO</param>

+            <param name="propertyValues">TODO</param>

+            <param name="namedFields">TODO</param>

+            <param name="fieldValues">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/EnumBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/EnumBuilder.xml
new file mode 100644
index 00000000000..5ff112c663f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/EnumBuilder.xml
@@ -0,0 +1,240 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.EnumBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Assembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AssemblyQualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DeclaringType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FullName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GUID">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Module">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReflectedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TypeHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TypeToken">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnderlyingField">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnderlyingSystemType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MemberType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InvokeMember(System.String, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object, System.Object[], System.Reflection.ParameterModifier[], System.Globalization.CultureInfo, System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="target">TODO</param>

+            <param name="args">TODO</param>

+            <param name="modifiers">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="namedParameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperties(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethods(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMembers(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFields(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetField(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetConstructors(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNestedTypes(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNestedType(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMember(System.String, System.Reflection.MemberTypes, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="type">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvents(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvents">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvent(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetElementType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterfaces">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterfaceMap(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="interfaceType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterface(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineLiteral(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="literalName">TODO</param>

+            <param name="literalValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="customBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.ConstructorInfo, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="binaryAttribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/EventBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/EventBuilder.xml
new file mode 100644
index 00000000000..b543eeb814d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/EventBuilder.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.EventBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="AddOtherMethod(System.Reflection.Emit.MethodBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mdBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEventToken">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetAddOnMethod(System.Reflection.Emit.MethodBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mdBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetRaiseMethod(System.Reflection.Emit.MethodBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mdBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetRemoveOnMethod(System.Reflection.Emit.MethodBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mdBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="customBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.ConstructorInfo, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="binaryAttribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/EventToken.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/EventToken.xml
new file mode 100644
index 00000000000..0e1960e45cf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/EventToken.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.Emit.EventToken" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Token">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/FieldBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/FieldBuilder.xml
new file mode 100644
index 00000000000..58e4b3a3273
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/FieldBuilder.xml
@@ -0,0 +1,110 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.FieldBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DeclaringType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FieldHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FieldType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReflectedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetValue(System.Object, System.Object, System.Reflection.BindingFlags, System.Reflection.Binder, System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="val">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetToken">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetConstant(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="defaultValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="customBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.ConstructorInfo, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="binaryAttribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetMarshal(System.Reflection.Emit.UnmanagedMarshal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="unmanagedMarshal">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetOffset(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="iOffset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/FieldToken.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/FieldToken.xml
new file mode 100644
index 00000000000..8e8225055bc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/FieldToken.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.Emit.FieldToken" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Token">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/FlowControl.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/FlowControl.xml
new file mode 100644
index 00000000000..f40afcadc08
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/FlowControl.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.Emit.FlowControl" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ILGenerator.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ILGenerator.xml
new file mode 100644
index 00000000000..9d3b7a454aa
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ILGenerator.xml
@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.ILGenerator" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="UsingNamespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="usingNamespace">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ThrowException(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="exceptionType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MarkSequencePoint(System.Diagnostics.SymbolStore.ISymbolDocumentWriter, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="document">TODO</param>

+            <param name="startLine">TODO</param>

+            <param name="startColumn">TODO</param>

+            <param name="endLine">TODO</param>

+            <param name="endColumn">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MarkLabel(System.Reflection.Emit.Label)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="loc">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndScope">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndExceptionBlock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="EmitWriteLine(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EmitWriteLine(System.Reflection.Emit.LocalBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="lbuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EmitWriteLine(System.Reflection.FieldInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="field">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Reflection.Emit.SignatureHelper)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="shelper">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Reflection.MethodInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="method">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Reflection.Emit.LocalBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="lbuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Reflection.Emit.Label[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="labels">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Reflection.Emit.Label)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="label">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Reflection.FieldInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="field">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Reflection.ConstructorInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="constructor">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode, System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Emit(System.Reflection.Emit.OpCode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineLabel">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="DeclareLocal(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginScope">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginFinallyBlock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginFaultBlock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginExceptionBlock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginExceptFilterBlock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="BeginCatchBlock(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="exceptionType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EmitCall(System.Reflection.Emit.OpCode, System.Reflection.MethodInfo, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="methodinfo">TODO</param>

+            <param name="optionalParamTypes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EmitCalli(System.Reflection.Emit.OpCode, System.Reflection.CallingConventions, System.Type, System.Type[], System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="opcode">TODO</param>

+            <param name="call_conv">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="paramTypes">TODO</param>

+            <param name="optionalParamTypes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/Label.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/Label.xml
new file mode 100644
index 00000000000..b74c4625cbe
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/Label.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.Emit.Label" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/LocalBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/LocalBuilder.xml
new file mode 100644
index 00000000000..9509fc3d3e5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/LocalBuilder.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.LocalBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="LocalType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetLocalSymInfo(System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="lname">TODO</param>

+            <param name="startOffset">TODO</param>

+            <param name="endOffset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLocalSymInfo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="lname">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/MethodBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/MethodBuilder.xml
new file mode 100644
index 00000000000..9aad40e60d4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/MethodBuilder.xml
@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.MethodBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="TypeBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReturnType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReflectedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DeclaringType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MethodHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReturnTypeCustomAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetBaseDefinition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Invoke(System.Object, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="parameters">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetParameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethodImplementationFlags">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetToken">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateMethodBody(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="il">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetILGenerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetILGenerator(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="size">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineParameter(System.Int32, System.Reflection.ParameterAttributes, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="position">TODO</param>

+            <param name="attributes">TODO</param>

+            <param name="strParamName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="customBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.ConstructorInfo, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="binaryAttribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetImplementationFlags(System.Reflection.MethodImplAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/MethodToken.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/MethodToken.xml
new file mode 100644
index 00000000000..e1b32b43cae
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/MethodToken.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.Emit.MethodToken" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Token">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ModuleBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ModuleBuilder.xml
new file mode 100644
index 00000000000..1e82dc25201
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ModuleBuilder.xml
@@ -0,0 +1,128 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.ModuleBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="FullyQualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetType(System.String, System.Boolean, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="className">TODO</param>

+            <param name="throwOnError">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="className">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="className">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineType(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineType(System.String, System.Reflection.TypeAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineType(System.String, System.Reflection.TypeAttributes, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <param name="parent">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineType(System.String, System.Reflection.TypeAttributes, System.Type, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <param name="parent">TODO</param>

+            <param name="interfaces">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineType(System.String, System.Reflection.TypeAttributes, System.Type, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <param name="parent">TODO</param>

+            <param name="typesize">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineType(System.String, System.Reflection.TypeAttributes, System.Type, System.Reflection.Emit.PackingSize)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <param name="parent">TODO</param>

+            <param name="packsize">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineType(System.String, System.Reflection.TypeAttributes, System.Type, System.Reflection.Emit.PackingSize, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <param name="parent">TODO</param>

+            <param name="packsize">TODO</param>

+            <param name="typesize">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetArrayMethod(System.Type, System.String, System.Reflection.CallingConventions, System.Type, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="arrayClass">TODO</param>

+            <param name="methodName">TODO</param>

+            <param name="callingConvention">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="parameterTypes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineEnum(System.String, System.Reflection.TypeAttributes, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="visibility">TODO</param>

+            <param name="underlyingType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="customBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.ConstructorInfo, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="binaryAttribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSymWriter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OpCode.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OpCode.xml
new file mode 100644
index 00000000000..6f7e1899907
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OpCode.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.Emit.OpCode" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Size">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OpCodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OperandType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FlowControl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="StackBehaviourPop">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="StackBehaviourPush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OpCodeType.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OpCodeType.xml
new file mode 100644
index 00000000000..7f4f406ae8b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OpCodeType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.Emit.OpCodeType" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OpCodes.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OpCodes.xml
new file mode 100644
index 00000000000..073b8d5bb00
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OpCodes.xml
@@ -0,0 +1,906 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.OpCodes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="OpCodes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="Add">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Add_Ovf">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Add_Ovf_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="And">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Arglist">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Beq">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Beq_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Bge">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Bge_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Bge_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Bge_Un_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Bgt">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Bgt_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Bgt_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Bgt_Un_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ble">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ble_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ble_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ble_Un_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Blt">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Blt_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Blt_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Blt_Un_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Bne_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Bne_Un_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Box">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Boxval">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Br">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Br_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Break">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Brfalse">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Brfalse_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Brtrue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Brtrue_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Call">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Calli">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Callvirt">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Castclass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ceq">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Cgt">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Cgt_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ckfinite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Clt">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Clt_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_I">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_I1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_I2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_I4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_I8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_I">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_I_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_I1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_I1_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_I2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_I2_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_I4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_I4_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_I8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_I8_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_U">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_U_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_U1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_U1_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_U2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_U2_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_U4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_U4_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_U8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_Ovf_U8_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_R_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_R4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_R8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_U">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_U1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_U2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_U4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Conv_U8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Cpblk">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Cpobj">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Div">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Div_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Dup">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Endfilter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Endfinally">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Initblk">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Initobj">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Isinst">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Jmp">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldarg">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldarg_0">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldarg_1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldarg_2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldarg_3">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldarg_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldarga">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldarga_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_0">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_3">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_5">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_6">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_7">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_M1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I4_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_I8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_R4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldc_R8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_I">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_I1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_I2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_I4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_I8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_R4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_R8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_Ref">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_U1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_U2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelem_U4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldelema">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldfld">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldflda">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldftn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_I">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_I1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_I2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_I4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_I8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_R4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_R8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_Ref">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_U1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_U2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldind_U4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldlen">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldloc">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldloc_0">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldloc_1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldloc_2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldloc_3">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldloc_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldloca">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldloca_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldnull">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldobj">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldsfld">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldsflda">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldstr">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldtoken">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ldvirtftn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Leave">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Leave_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Localloc">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Mkrefany">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Mul">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Mul_Ovf">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Mul_Ovf_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Neg">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Newarr">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Newobj">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Nop">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Not">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Or">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Pop">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Prefix1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Prefix2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Prefix3">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Prefix4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Prefix5">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Prefix6">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Prefix7">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Prefixref">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Refanytype">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Refanyval">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Rem">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Rem_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Ret">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Rethrow">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Shl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Shr">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Shr_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Sizeof">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Starg">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Starg_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stelem_I">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stelem_I1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stelem_I2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stelem_I4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stelem_I8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stelem_R4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stelem_R8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stelem_Ref">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stfld">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stind_I">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stind_I1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stind_I2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stind_I4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stind_I8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stind_R4">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stind_R8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stind_Ref">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stloc">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stloc_0">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stloc_1">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stloc_2">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stloc_3">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stloc_S">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stobj">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Stsfld">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Sub">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Sub_Ovf">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Sub_Ovf_Un">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Switch">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Tailcall">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Throw">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Unaligned">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Unbox">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Volatile">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Xor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="TakesSingleByteArgument(System.Reflection.Emit.OpCode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inst">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OperandType.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OperandType.xml
new file mode 100644
index 00000000000..e0c868f8dc4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/OperandType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.Emit.OperandType" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PEFileKinds.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PEFileKinds.xml
new file mode 100644
index 00000000000..a09166ae5a7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PEFileKinds.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.Emit.PEFileKinds" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PackingSize.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PackingSize.xml
new file mode 100644
index 00000000000..71f79d630f3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PackingSize.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.Emit.PackingSize" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ParameterBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ParameterBuilder.xml
new file mode 100644
index 00000000000..6af1e4167bb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ParameterBuilder.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.ParameterBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsIn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsOut">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsOptional">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Position">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetMarshal(System.Reflection.Emit.UnmanagedMarshal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="unmanagedMarshal">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetConstant(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="defaultValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetToken">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="customBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.ConstructorInfo, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="binaryAttribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ParameterToken.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ParameterToken.xml
new file mode 100644
index 00000000000..c6c21f46333
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/ParameterToken.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.Emit.ParameterToken" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Token">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PropertyBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PropertyBuilder.xml
new file mode 100644
index 00000000000..08c9ab1e657
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PropertyBuilder.xml
@@ -0,0 +1,164 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.PropertyBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanRead">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanWrite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DeclaringType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PropertyToken">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PropertyType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReflectedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetValue(System.Object, System.Object, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="value">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="index">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetValue(System.Object, System.Object, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="value">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.Object, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="index">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.Object, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSetMethod(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetIndexParameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetGetMethod(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAccessors(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddOtherMethod(System.Reflection.Emit.MethodBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mdBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetConstant(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="defaultValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="customBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.ConstructorInfo, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="binaryAttribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetGetMethod(System.Reflection.Emit.MethodBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mdBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetSetMethod(System.Reflection.Emit.MethodBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mdBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PropertyToken.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PropertyToken.xml
new file mode 100644
index 00000000000..12faff1b7dc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/PropertyToken.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.Emit.PropertyToken" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Token">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/SignatureHelper.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/SignatureHelper.xml
new file mode 100644
index 00000000000..d11c41ad967
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/SignatureHelper.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.SignatureHelper" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFieldSigHelper(System.Reflection.Module)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mod">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLocalVarSigHelper(System.Reflection.Module)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mod">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethodSigHelper(System.Reflection.Module, System.Reflection.CallingConventions, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mod">TODO</param>

+            <param name="callingConvention">TODO</param>

+            <param name="returnType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethodSigHelper(System.Reflection.Module, System.Type, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mod">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="parameterTypes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetPropertySigHelper(System.Reflection.Module, System.Type, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mod">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="parameterTypes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddArgument(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="clsArgument">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddSentinel">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSignature">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/SignatureToken.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/SignatureToken.xml
new file mode 100644
index 00000000000..040d1c1cd76
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/SignatureToken.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.Emit.SignatureToken" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Token">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/StackBehaviour.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/StackBehaviour.xml
new file mode 100644
index 00000000000..f4f84e6398a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/StackBehaviour.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.Emit.StackBehaviour" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/StringToken.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/StringToken.xml
new file mode 100644
index 00000000000..a83f8dba6c2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/StringToken.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.Emit.StringToken" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Token">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/TypeBuilder.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/TypeBuilder.xml
new file mode 100644
index 00000000000..cd832ad0f9c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/TypeBuilder.xml
@@ -0,0 +1,403 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.TypeBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="UnspecifiedTypeSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Assembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AssemblyQualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DeclaringType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnderlyingSystemType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FullName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GUID">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Module">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PackingSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReflectedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MemberType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TypeHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InvokeMember(System.String, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object, System.Object[], System.Reflection.ParameterModifier[], System.Globalization.CultureInfo, System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="target">TODO</param>

+            <param name="args">TODO</param>

+            <param name="modifiers">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="namedParameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperties(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethods(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMembers(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFields(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetField(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetConstructors(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNestedTypes(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNestedType(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvents(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvent(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetElementType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterfaces">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterface(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddDeclarativeSecurity(System.Security.Permissions.SecurityAction, System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+            <param name="pset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddInterfaceImplementation(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="interfaceType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineNestedType(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineNestedType(System.String, System.Reflection.TypeAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineNestedType(System.String, System.Reflection.TypeAttributes, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <param name="parent">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineNestedType(System.String, System.Reflection.TypeAttributes, System.Type, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <param name="parent">TODO</param>

+            <param name="interfaces">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineNestedType(System.String, System.Reflection.TypeAttributes, System.Type, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <param name="parent">TODO</param>

+            <param name="typesize">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineNestedType(System.String, System.Reflection.TypeAttributes, System.Type, System.Reflection.Emit.PackingSize)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <param name="parent">TODO</param>

+            <param name="packsize">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineNestedType(System.String, System.Reflection.TypeAttributes, System.Type, System.Reflection.Emit.PackingSize, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attr">TODO</param>

+            <param name="parent">TODO</param>

+            <param name="packsize">TODO</param>

+            <param name="typesize">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineConstructor(System.Reflection.MethodAttributes, System.Reflection.CallingConventions, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributes">TODO</param>

+            <param name="callingConvention">TODO</param>

+            <param name="parameterTypes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDefaultConstructor(System.Reflection.MethodAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineMethod(System.String, System.Reflection.MethodAttributes, System.Type, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attributes">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="parameterTypes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineMethod(System.String, System.Reflection.MethodAttributes, System.Reflection.CallingConventions, System.Type, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attributes">TODO</param>

+            <param name="callingConvention">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="parameterTypes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefinePInvokeMethod(System.String, System.String, System.String, System.Reflection.MethodAttributes, System.Reflection.CallingConventions, System.Type, System.Type[], System.Runtime.InteropServices.CallingConvention, System.Runtime.InteropServices.CharSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="dllName">TODO</param>

+            <param name="entryName">TODO</param>

+            <param name="attributes">TODO</param>

+            <param name="callingConvention">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="parameterTypes">TODO</param>

+            <param name="nativeCallConv">TODO</param>

+            <param name="nativeCharSet">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefinePInvokeMethod(System.String, System.String, System.Reflection.MethodAttributes, System.Reflection.CallingConventions, System.Type, System.Type[], System.Runtime.InteropServices.CallingConvention, System.Runtime.InteropServices.CharSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="dllName">TODO</param>

+            <param name="attributes">TODO</param>

+            <param name="callingConvention">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="parameterTypes">TODO</param>

+            <param name="nativeCallConv">TODO</param>

+            <param name="nativeCharSet">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineMethodOverride(System.Reflection.MethodInfo, System.Reflection.MethodInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="methodInfoBody">TODO</param>

+            <param name="methodInfoDeclaration">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineField(System.String, System.Type, System.Reflection.FieldAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fieldName">TODO</param>

+            <param name="type">TODO</param>

+            <param name="attributes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineProperty(System.String, System.Reflection.PropertyAttributes, System.Type, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attributes">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="parameterTypes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineTypeInitializer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.Emit.CustomAttributeBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="customBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCustomAttribute(System.Reflection.ConstructorInfo, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="con">TODO</param>

+            <param name="binaryAttribute">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineEvent(System.String, System.Reflection.EventAttributes, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="attributes">TODO</param>

+            <param name="eventtype">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineInitializedData(System.String, System.Byte[], System.Reflection.FieldAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="data">TODO</param>

+            <param name="attributes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineUninitializedData(System.String, System.Int32, System.Reflection.FieldAttributes)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="size">TODO</param>

+            <param name="attributes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetParent(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parentType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/TypeToken.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/TypeToken.xml
new file mode 100644
index 00000000000..59bff0c653c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/TypeToken.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.Emit.TypeToken" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Token">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection.Emit/UnmanagedMarshal.xml b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/UnmanagedMarshal.xml
new file mode 100644
index 00000000000..319e6d226f2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection.Emit/UnmanagedMarshal.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Emit.UnmanagedMarshal" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UnmanagedMarshal">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BaseType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ElementCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GetUnmanagedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IIDGuid">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="DefineByValArray(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elemCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineByValTStr(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elemCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineLPArray(System.Runtime.InteropServices.UnmanagedType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elemType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineSafeArray(System.Runtime.InteropServices.UnmanagedType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elemType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineUnmanagedMarshal(System.Runtime.InteropServices.UnmanagedType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="unmanagedType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AmbiguousMatchException.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AmbiguousMatchException.xml
new file mode 100644
index 00000000000..3a5d3af8d94
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AmbiguousMatchException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AmbiguousMatchException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AmbiguousMatchException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="AmbiguousMatchException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="AmbiguousMatchException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/Assembly.xml b/mcs/docs/apidocs/xml/en/System.Reflection/Assembly.xml
new file mode 100644
index 00000000000..1242389ea58
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/Assembly.xml
@@ -0,0 +1,277 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Assembly" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="CodeBase">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CopiedCodeBase">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FullName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EntryPoint">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Evidence">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Location">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetName(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="copiedName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="throwOnError">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetExportedTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetManifestResourceStream(System.Type, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetManifestResourceStream(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFile(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFiles">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String, System.Boolean, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="throwOnError">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateQualifiedName(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyName">TODO</param>

+            <param name="typeName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="nCreateQualifiedName(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyName">TODO</param>

+            <param name="typeName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAssembly(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSatelliteAssembly(System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LoadFrom(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyFile">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyString">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.String, System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyString">TODO</param>

+            <param name="assemblySecurity">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Reflection.AssemblyName)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyRef">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Reflection.AssemblyName, System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyRef">TODO</param>

+            <param name="assemblySecurity">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rawAssembly">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rawAssembly">TODO</param>

+            <param name="rawSymbolStore">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Byte[], System.Byte[], System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rawAssembly">TODO</param>

+            <param name="rawSymbolStore">TODO</param>

+            <param name="securityEvidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="typeName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="typeName">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.String, System.Boolean, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="typeName">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="args">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="activationAttributes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLoadedModules">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetModules">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetModule(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetManifestResourceNames">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetExecutingAssembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetReferencedAssemblies">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetManifestResourceInfo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="resourceName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyAlgorithmIdAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyAlgorithmIdAttribute.xml
new file mode 100644
index 00000000000..0bacf8f7897
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyAlgorithmIdAttribute.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyAlgorithmIdAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyAlgorithmIdAttribute(System.Configuration.Assemblies.AssemblyHashAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="algorithmId">TODO</param>

+        </constructor>

+        <constructor name="AssemblyAlgorithmIdAttribute(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="algorithmId">TODO</param>

+        </constructor>

+        <property name="Algorithmid">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyCompanyAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyCompanyAttribute.xml
new file mode 100644
index 00000000000..c423f9322dc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyCompanyAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyCompanyAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyCompanyAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="company">TODO</param>

+        </constructor>

+        <property name="Company">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyConfigurationAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyConfigurationAttribute.xml
new file mode 100644
index 00000000000..45c0463df99
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyConfigurationAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyConfigurationAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyConfigurationAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="configuration">TODO</param>

+        </constructor>

+        <property name="Configuration">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyCopyrightAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyCopyrightAttribute.xml
new file mode 100644
index 00000000000..512143e5958
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyCopyrightAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyCopyrightAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyCopyrightAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="copyright">TODO</param>

+        </constructor>

+        <property name="Copyright">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyCultureAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyCultureAttribute.xml
new file mode 100644
index 00000000000..a79cd465a79
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyCultureAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyCultureAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyCultureAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="culture">TODO</param>

+        </constructor>

+        <property name="Culture">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyDefaultAliasAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyDefaultAliasAttribute.xml
new file mode 100644
index 00000000000..00f488258b8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyDefaultAliasAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyDefaultAliasAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyDefaultAliasAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="defaultAlias">TODO</param>

+        </constructor>

+        <property name="DefaultAlias">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyDelaySignAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyDelaySignAttribute.xml
new file mode 100644
index 00000000000..50e99963c1c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyDelaySignAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyDelaySignAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyDelaySignAttribute(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="delaySign">TODO</param>

+        </constructor>

+        <property name="DelaySIgn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyDescriptionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyDescriptionAttribute.xml
new file mode 100644
index 00000000000..5c54d463523
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyDescriptionAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyDescriptionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyDescriptionAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="description">TODO</param>

+        </constructor>

+        <property name="Description">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyFileVersionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyFileVersionAttribute.xml
new file mode 100644
index 00000000000..0d560bf351d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyFileVersionAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyFileVersionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyFileVersionAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="version">TODO</param>

+        </constructor>

+        <property name="FileVersion">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyFlagsAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyFlagsAttribute.xml
new file mode 100644
index 00000000000..ad58ed31774
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyFlagsAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyFlagsAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyFlagsAttribute(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="flags">TODO</param>

+        </constructor>

+        <property name="Flags">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyInformationalVersionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyInformationalVersionAttribute.xml
new file mode 100644
index 00000000000..792c7c81036
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyInformationalVersionAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyInformationalVersionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyInformationalVersionAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="informationalVersion">TODO</param>

+        </constructor>

+        <property name="InformationalVersion">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyKeyFileAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyKeyFileAttribute.xml
new file mode 100644
index 00000000000..17f3c538355
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyKeyFileAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyKeyFileAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyKeyFileAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="keyFile">TODO</param>

+        </constructor>

+        <property name="KeyFile">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyKeyNameAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyKeyNameAttribute.xml
new file mode 100644
index 00000000000..aaa3cd01b05
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyKeyNameAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyKeyNameAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyKeyNameAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="keyName">TODO</param>

+        </constructor>

+        <property name="KeyName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyName.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyName.xml
new file mode 100644
index 00000000000..619bb0c2c9b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyName.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyName" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CodeBase">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Version">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyNameFlags.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyNameFlags.xml
new file mode 100644
index 00000000000..13bde38d9cf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyNameFlags.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.AssemblyNameFlags" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyNameProxy.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyNameProxy.xml
new file mode 100644
index 00000000000..41626ac2931
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyNameProxy.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyNameProxy" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyNameProxy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GetAssemblyName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyFile">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyProductAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyProductAttribute.xml
new file mode 100644
index 00000000000..81e087103de
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyProductAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyProductAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyProductAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="product">TODO</param>

+        </constructor>

+        <property name="Product">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyTitleAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyTitleAttribute.xml
new file mode 100644
index 00000000000..c1471166205
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyTitleAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyTitleAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyTitleAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="title">TODO</param>

+        </constructor>

+        <property name="Title">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyTrademarkAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyTrademarkAttribute.xml
new file mode 100644
index 00000000000..6e4c3ceb0e9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyTrademarkAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyTrademarkAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyTrademarkAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="trademark">TODO</param>

+        </constructor>

+        <property name="Trademark">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyVersionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyVersionAttribute.xml
new file mode 100644
index 00000000000..695007dab21
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/AssemblyVersionAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.AssemblyVersionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyVersionAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="version">TODO</param>

+        </constructor>

+        <property name="Version">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/Binder.xml b/mcs/docs/apidocs/xml/en/System.Reflection/Binder.xml
new file mode 100644
index 00000000000..c448c3df786
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/Binder.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Binder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/BindingFlags.xml b/mcs/docs/apidocs/xml/en/System.Reflection/BindingFlags.xml
new file mode 100644
index 00000000000..31ca9cc2b39
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/BindingFlags.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.BindingFlags" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/CallingConventions.xml b/mcs/docs/apidocs/xml/en/System.Reflection/CallingConventions.xml
new file mode 100644
index 00000000000..62900cc2d27
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/CallingConventions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.CallingConventions" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/ConstructorInfo.xml b/mcs/docs/apidocs/xml/en/System.Reflection/ConstructorInfo.xml
new file mode 100644
index 00000000000..e925326cfe5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/ConstructorInfo.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.ConstructorInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="ConstructorName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TypeConstructorName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="MemberType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Invoke(System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="parameters">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Invoke(System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/CustomAttributeFormatException.xml b/mcs/docs/apidocs/xml/en/System.Reflection/CustomAttributeFormatException.xml
new file mode 100644
index 00000000000..92f44cd0b5a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/CustomAttributeFormatException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.CustomAttributeFormatException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CustomAttributeFormatException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CustomAttributeFormatException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="CustomAttributeFormatException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/DefaultMemberAttribute.xml b/mcs/docs/apidocs/xml/en/System.Reflection/DefaultMemberAttribute.xml
new file mode 100644
index 00000000000..bcb877ba308
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/DefaultMemberAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.DefaultMemberAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DefaultMemberAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="member_name">TODO</param>

+        </constructor>

+        <property name="MemberName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/EventAttributes.xml b/mcs/docs/apidocs/xml/en/System.Reflection/EventAttributes.xml
new file mode 100644
index 00000000000..0d90a2e4aae
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/EventAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.EventAttributes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/EventInfo.xml b/mcs/docs/apidocs/xml/en/System.Reflection/EventInfo.xml
new file mode 100644
index 00000000000..3f31dbae2ea
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/EventInfo.xml
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.EventInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EventHandlerType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsMulticast">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSpecialName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MemberType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReflectedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DeclaringType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetRemoveMethod(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetRaiseMethod(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAddMethod(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddEventHandler(System.Object, System.Delegate)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <param name="handler">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAddMethod">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetRaiseMethod">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetRemoveMethod">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveEventHandler(System.Object, System.Delegate)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <param name="handler">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/FieldAttributes.xml b/mcs/docs/apidocs/xml/en/System.Reflection/FieldAttributes.xml
new file mode 100644
index 00000000000..2e5155405c8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/FieldAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.FieldAttributes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/FieldInfo.xml b/mcs/docs/apidocs/xml/en/System.Reflection/FieldInfo.xml
new file mode 100644
index 00000000000..3b3c317e29d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/FieldInfo.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.FieldInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FieldHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FieldType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MemberType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsLiteral">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsStatic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsInitOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetValue(System.Object, System.Object, System.Reflection.BindingFlags, System.Reflection.Binder, System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="val">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetValue(System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/ICustomAttributeProvider.xml b/mcs/docs/apidocs/xml/en/System.Reflection/ICustomAttributeProvider.xml
new file mode 100644
index 00000000000..9b7c98fe670
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/ICustomAttributeProvider.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Reflection.ICustomAttributeProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/IReflect.xml b/mcs/docs/apidocs/xml/en/System.Reflection/IReflect.xml
new file mode 100644
index 00000000000..c04c002c107
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/IReflect.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Reflection.IReflect" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/InterfaceMapping.xml b/mcs/docs/apidocs/xml/en/System.Reflection/InterfaceMapping.xml
new file mode 100644
index 00000000000..27962317fdc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/InterfaceMapping.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.InterfaceMapping" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="InterfaceMethods">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="InterfaceType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TargetMethods">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TargetType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/InvalidFilterCriteriaException.xml b/mcs/docs/apidocs/xml/en/System.Reflection/InvalidFilterCriteriaException.xml
new file mode 100644
index 00000000000..7ad6a818bc8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/InvalidFilterCriteriaException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.InvalidFilterCriteriaException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="InvalidFilterCriteriaException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="InvalidFilterCriteriaException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="InvalidFilterCriteriaException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/ManifestResourceInfo.xml b/mcs/docs/apidocs/xml/en/System.Reflection/ManifestResourceInfo.xml
new file mode 100644
index 00000000000..f7e8f5a4053
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/ManifestResourceInfo.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.ManifestResourceInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ManifestResourceInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/MemberFilter.xml b/mcs/docs/apidocs/xml/en/System.Reflection/MemberFilter.xml
new file mode 100644
index 00000000000..35f2264e974
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/MemberFilter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Reflection.MemberFilter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/MemberInfo.xml b/mcs/docs/apidocs/xml/en/System.Reflection/MemberInfo.xml
new file mode 100644
index 00000000000..7eee5b7f37b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/MemberInfo.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.MemberInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="DeclaringType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MemberType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReflectedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/MemberTypes.xml b/mcs/docs/apidocs/xml/en/System.Reflection/MemberTypes.xml
new file mode 100644
index 00000000000..d83d3710f38
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/MemberTypes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.MemberTypes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/MethodAttributes.xml b/mcs/docs/apidocs/xml/en/System.Reflection/MethodAttributes.xml
new file mode 100644
index 00000000000..88166ec4277
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/MethodAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.MethodAttributes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/MethodBase.xml b/mcs/docs/apidocs/xml/en/System.Reflection/MethodBase.xml
new file mode 100644
index 00000000000..54ce51269ff
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/MethodBase.xml
@@ -0,0 +1,126 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.MethodBase" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="MethodHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CallingConvention">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsPublic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsPrivate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFamily">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsAssembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFamilyAndAssembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFamilyOrAssembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsStatic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFinal">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsVirtual">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsHideBySig">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsAbstract">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSpecialName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsConstructor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Invoke(System.Object, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="parameters">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetParameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethodImplementationFlags">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCurrentMethod">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethodFromHandle(System.RuntimeMethodHandle)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="handle">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Invoke(System.Object, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="parameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/MethodImplAttributes.xml b/mcs/docs/apidocs/xml/en/System.Reflection/MethodImplAttributes.xml
new file mode 100644
index 00000000000..3ab67ac5c47
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/MethodImplAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.MethodImplAttributes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/MethodInfo.xml b/mcs/docs/apidocs/xml/en/System.Reflection/MethodInfo.xml
new file mode 100644
index 00000000000..2515971330c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/MethodInfo.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.MethodInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="MemberType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReturnType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReturnTypeCustomAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetBaseDefinition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/Missing.xml b/mcs/docs/apidocs/xml/en/System.Reflection/Missing.xml
new file mode 100644
index 00000000000..441f3aaff0e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/Missing.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Missing" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/Module.xml b/mcs/docs/apidocs/xml/en/System.Reflection/Module.xml
new file mode 100644
index 00000000000..22815103cd2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/Module.xml
@@ -0,0 +1,158 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.Module" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="FilterTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="FilterTypeNameIgnoreCase">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Assembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FullyQualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ScopeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String, System.Boolean, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="className">TODO</param>

+            <param name="throwOnError">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="className">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="className">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FindTypes(System.Reflection.TypeFilter, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="filter">TODO</param>

+            <param name="filterCriteria">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetField(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetField(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="flags">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFields">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethod(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethod(System.String, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="types">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethod(System.String, System.Reflection.BindingFlags, System.Reflection.Binder, System.Reflection.CallingConventions, System.Type[], System.Reflection.ParameterModifier[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="callConvention">TODO</param>

+            <param name="types">TODO</param>

+            <param name="modifiers">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethods">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSignerCertificate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsResource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/MonoEvent.xml b/mcs/docs/apidocs/xml/en/System.Reflection/MonoEvent.xml
new file mode 100644
index 00000000000..11cd9de2dde
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/MonoEvent.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.MonoEvent" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MonoEvent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DeclaringType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetRemoveMethod(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetRaiseMethod(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAddMethod(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/ParameterAttributes.xml b/mcs/docs/apidocs/xml/en/System.Reflection/ParameterAttributes.xml
new file mode 100644
index 00000000000..ec76a3e1bc5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/ParameterAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.ParameterAttributes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/ParameterInfo.xml b/mcs/docs/apidocs/xml/en/System.Reflection/ParameterInfo.xml
new file mode 100644
index 00000000000..9f5ad7c1708
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/ParameterInfo.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.ParameterInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="ParameterType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DefaultValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsIn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsLcid">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsOptional">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsOut">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsRetval">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Member">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Position">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/ParameterModifier.xml b/mcs/docs/apidocs/xml/en/System.Reflection/ParameterModifier.xml
new file mode 100644
index 00000000000..bd5e0a98ab3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/ParameterModifier.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Reflection.ParameterModifier" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ParameterModifier(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="paramaterCount">TODO</param>

+        </constructor>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/PropertyAttributes.xml b/mcs/docs/apidocs/xml/en/System.Reflection/PropertyAttributes.xml
new file mode 100644
index 00000000000..ce1472de9fd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/PropertyAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.PropertyAttributes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/PropertyInfo.xml b/mcs/docs/apidocs/xml/en/System.Reflection/PropertyInfo.xml
new file mode 100644
index 00000000000..ec54c0b3bdb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/PropertyInfo.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.PropertyInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanRead">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanWrite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSpecialName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MemberType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PropertyType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetValue(System.Object, System.Object, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="value">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="index">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetValue(System.Object, System.Object, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="value">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.Object, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="index">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.Object, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSetMethod(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetIndexParameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetGetMethod(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAccessors(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nonPublic">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAccessors">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetGetMethod">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSetMethod">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/ReflectionTypeLoadException.xml b/mcs/docs/apidocs/xml/en/System.Reflection/ReflectionTypeLoadException.xml
new file mode 100644
index 00000000000..850cc64bb84
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/ReflectionTypeLoadException.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.ReflectionTypeLoadException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ReflectionTypeLoadException(System.Type[], System.Exception[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="classes">TODO</param>

+            <param name="exceptions">TODO</param>

+        </constructor>

+        <constructor name="ReflectionTypeLoadException(System.Type[], System.Exception[], System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="classes">TODO</param>

+            <param name="exceptions">TODO</param>

+            <param name="message">TODO</param>

+        </constructor>

+        <property name="Types">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LoaderExceptions">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/ResourceAttributes.xml b/mcs/docs/apidocs/xml/en/System.Reflection/ResourceAttributes.xml
new file mode 100644
index 00000000000..dacb03d5d06
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/ResourceAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.ResourceAttributes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/ResourceLocation.xml b/mcs/docs/apidocs/xml/en/System.Reflection/ResourceLocation.xml
new file mode 100644
index 00000000000..dc74eff20a5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/ResourceLocation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.ResourceLocation" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/StrongNameKeyPair.xml b/mcs/docs/apidocs/xml/en/System.Reflection/StrongNameKeyPair.xml
new file mode 100644
index 00000000000..70a35904b43
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/StrongNameKeyPair.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.StrongNameKeyPair" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StrongNameKeyPair(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="keyPairArray">TODO</param>

+        </constructor>

+        <constructor name="StrongNameKeyPair(System.IO.FileStream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="keyPairFile">TODO</param>

+        </constructor>

+        <constructor name="StrongNameKeyPair(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="keyPairContainer">TODO</param>

+        </constructor>

+        <property name="PublicKey">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/TargetException.xml b/mcs/docs/apidocs/xml/en/System.Reflection/TargetException.xml
new file mode 100644
index 00000000000..875ef0d6d44
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/TargetException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.TargetException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TargetException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="TargetException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="TargetException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/TargetInvocationException.xml b/mcs/docs/apidocs/xml/en/System.Reflection/TargetInvocationException.xml
new file mode 100644
index 00000000000..a91825216d2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/TargetInvocationException.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.TargetInvocationException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/TargetParameterCountException.xml b/mcs/docs/apidocs/xml/en/System.Reflection/TargetParameterCountException.xml
new file mode 100644
index 00000000000..bcb8293f2cb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/TargetParameterCountException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.TargetParameterCountException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TargetParameterCountException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="TargetParameterCountException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="TargetParameterCountException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/TypeAttributes.xml b/mcs/docs/apidocs/xml/en/System.Reflection/TypeAttributes.xml
new file mode 100644
index 00000000000..4df8773a742
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/TypeAttributes.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Reflection.TypeAttributes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/TypeDelegator.xml b/mcs/docs/apidocs/xml/en/System.Reflection/TypeDelegator.xml
new file mode 100644
index 00000000000..f7083032310
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/TypeDelegator.xml
@@ -0,0 +1,195 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Reflection.TypeDelegator" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TypeDelegator(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="delegatingType">TODO</param>

+        </constructor>

+        <property name="Assembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AssemblyQualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FullName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GUID">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Module">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TypeHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnderlyingSystemType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InvokeMember(System.String, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object, System.Object[], System.Reflection.ParameterModifier[], System.Globalization.CultureInfo, System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="target">TODO</param>

+            <param name="args">TODO</param>

+            <param name="modifiers">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="namedParameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperties(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethods(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMembers(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFields(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetField(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetConstructors(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNestedTypes(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNestedType(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMember(System.String, System.Reflection.MemberTypes, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="type">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvents(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvents">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvent(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetElementType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterfaces">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterfaceMap(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="interfaceType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterface(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="attributeType">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Reflection/TypeFilter.xml b/mcs/docs/apidocs/xml/en/System.Reflection/TypeFilter.xml
new file mode 100644
index 00000000000..b924d176016
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Reflection/TypeFilter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Reflection.TypeFilter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Resources/IResourceReader.xml b/mcs/docs/apidocs/xml/en/System.Resources/IResourceReader.xml
new file mode 100644
index 00000000000..b99fa0f108d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Resources/IResourceReader.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Resources.IResourceReader" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Resources/IResourceWriter.xml b/mcs/docs/apidocs/xml/en/System.Resources/IResourceWriter.xml
new file mode 100644
index 00000000000..c6ffe6cfbaa
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Resources/IResourceWriter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Resources.IResourceWriter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Resources/MissingManifestResourceException.xml b/mcs/docs/apidocs/xml/en/System.Resources/MissingManifestResourceException.xml
new file mode 100644
index 00000000000..678e30ce10f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Resources/MissingManifestResourceException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Resources.MissingManifestResourceException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MissingManifestResourceException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="MissingManifestResourceException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="MissingManifestResourceException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="e">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Resources/NeutralResourcesLanguageAttribute.xml b/mcs/docs/apidocs/xml/en/System.Resources/NeutralResourcesLanguageAttribute.xml
new file mode 100644
index 00000000000..f798d9d0b32
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Resources/NeutralResourcesLanguageAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Resources.NeutralResourcesLanguageAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NeutralResourcesLanguageAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cultureName">TODO</param>

+        </constructor>

+        <property name="CultureName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Resources/ResourceManager.xml b/mcs/docs/apidocs/xml/en/System.Resources/ResourceManager.xml
new file mode 100644
index 00000000000..69acbb88c98
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Resources/ResourceManager.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Resources.ResourceManager" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ResourceManager(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="resourceSource">TODO</param>

+        </constructor>

+        <constructor name="ResourceManager(System.String, System.Reflection.Assembly)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="baseName">TODO</param>

+            <param name="assembly">TODO</param>

+        </constructor>

+        <constructor name="ResourceManager(System.String, System.Reflection.Assembly, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="baseName">TODO</param>

+            <param name="assembly">TODO</param>

+            <param name="usingResourceSet">TODO</param>

+        </constructor>

+        <field name="HeaderVersionNumber">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="BaseName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IgnoreCase">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ResourceSetType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ReleaseAllResources">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetString(System.String, System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetResourceSet(System.Globalization.CultureInfo, System.Boolean, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="culture">TODO</param>

+            <param name="createIfNotExists">TODO</param>

+            <param name="tryParents">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateFileBasedResourceManager(System.String, System.String, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="baseName">TODO</param>

+            <param name="resourceDir">TODO</param>

+            <param name="usingResourceSet">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Resources/ResourceReader.xml b/mcs/docs/apidocs/xml/en/System.Resources/ResourceReader.xml
new file mode 100644
index 00000000000..5be53e6154d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Resources/ResourceReader.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Resources.ResourceReader" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ResourceReader(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+        </constructor>

+        <constructor name="ResourceReader(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">TODO</param>

+        </constructor>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Resources/ResourceSet.xml b/mcs/docs/apidocs/xml/en/System.Resources/ResourceSet.xml
new file mode 100644
index 00000000000..7e2c97f547e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Resources/ResourceSet.xml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Resources.ResourceSet" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ResourceSet(System.Resources.IResourceReader)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="reader">TODO</param>

+        </constructor>

+        <constructor name="ResourceSet(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+        </constructor>

+        <constructor name="ResourceSet(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">TODO</param>

+        </constructor>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetString(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetObject(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetObject(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDefaultWriter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDefaultReader">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Resources/ResourceWriter.xml b/mcs/docs/apidocs/xml/en/System.Resources/ResourceWriter.xml
new file mode 100644
index 00000000000..e1737e13baf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Resources/ResourceWriter.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Resources.ResourceWriter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ResourceWriter(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+        </constructor>

+        <constructor name="ResourceWriter(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fileName">TODO</param>

+        </constructor>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Generate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddResource(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddResource(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddResource(System.String, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Resources/SatelliteContractVersionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Resources/SatelliteContractVersionAttribute.xml
new file mode 100644
index 00000000000..98b849f3cd1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Resources/SatelliteContractVersionAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Resources.SatelliteContractVersionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SatelliteContractVersionAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="version">TODO</param>

+        </constructor>

+        <property name="Version">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/IndexerNameAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/IndexerNameAttribute.xml
new file mode 100644
index 00000000000..511ebe32b23
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/IndexerNameAttribute.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.CompilerServices.IndexerNameAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IndexerNameAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="indexer_name">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/MethodCodeType.xml b/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/MethodCodeType.xml
new file mode 100644
index 00000000000..f00e79e4038
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/MethodCodeType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.CompilerServices.MethodCodeType" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/MethodImplAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/MethodImplAttribute.xml
new file mode 100644
index 00000000000..4564595c8ab
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/MethodImplAttribute.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.CompilerServices.MethodImplAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MethodImplAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="MethodImplAttribute(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="options">TODO</param>

+        </constructor>

+        <constructor name="MethodImplAttribute(System.Runtime.CompilerServices.MethodImplOptions)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="options">TODO</param>

+        </constructor>

+        <field name="MethodCodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/MethodImplOptions.xml b/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/MethodImplOptions.xml
new file mode 100644
index 00000000000..67ac30f5ee5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/MethodImplOptions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.CompilerServices.MethodImplOptions" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/RuntimeHelpers.xml b/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/RuntimeHelpers.xml
new file mode 100644
index 00000000000..222ea016a06
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.CompilerServices/RuntimeHelpers.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.CompilerServices.RuntimeHelpers" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="OffsetToStringData">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InitializeArray(System.Array, System.RuntimeFieldHandle)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="fldHandle">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/AssemblyRegistrationFlags.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/AssemblyRegistrationFlags.xml
new file mode 100644
index 00000000000..fc74cc58d59
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/AssemblyRegistrationFlags.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.AssemblyRegistrationFlags" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/CallingConvention.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/CallingConvention.xml
new file mode 100644
index 00000000000..6d77ef477b3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/CallingConvention.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.CallingConvention" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/CharSet.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/CharSet.xml
new file mode 100644
index 00000000000..98791441587
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/CharSet.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.CharSet" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ClassInterfaceAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ClassInterfaceAttribute.xml
new file mode 100644
index 00000000000..57b6a3a5291
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ClassInterfaceAttribute.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.ClassInterfaceAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ClassInterfaceAttribute(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="classInterfaceType">TODO</param>

+        </constructor>

+        <constructor name="ClassInterfaceAttribute(System.Runtime.InteropServices.ClassInterfaceType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="classInterfaceType">TODO</param>

+        </constructor>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ClassInterfaceType.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ClassInterfaceType.xml
new file mode 100644
index 00000000000..aa3d7b2644f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ClassInterfaceType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.ClassInterfaceType" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ComInterfaceType.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ComInterfaceType.xml
new file mode 100644
index 00000000000..38bb54f1713
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ComInterfaceType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.ComInterfaceType" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/DllImportAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/DllImportAttribute.xml
new file mode 100644
index 00000000000..268829d1efe
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/DllImportAttribute.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.DllImportAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DllImportAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dllName">TODO</param>

+        </constructor>

+        <field name="CallingConvention">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="CharSet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="EntryPoint">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="ExactSpelling">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="PreserveSig">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SetLastError">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ExporterEventKind.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ExporterEventKind.xml
new file mode 100644
index 00000000000..239ee958cba
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ExporterEventKind.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.ExporterEventKind" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ExternalException.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ExternalException.xml
new file mode 100644
index 00000000000..11f3477f1c4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ExternalException.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.ExternalException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ExternalException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ExternalException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ExternalException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <constructor name="ExternalException(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="errorCode">TODO</param>

+        </constructor>

+        <property name="ErrorCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/FieldOffsetAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/FieldOffsetAttribute.xml
new file mode 100644
index 00000000000..4141b765c65
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/FieldOffsetAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.FieldOffsetAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FieldOffsetAttribute(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+        </constructor>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/GCHandle.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/GCHandle.xml
new file mode 100644
index 00000000000..b02d62413a6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/GCHandle.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Runtime.InteropServices.GCHandle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="IsAllocated">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Target">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="AddrOfPinnedObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Alloc(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Alloc(System.Object, System.Runtime.InteropServices.GCHandleType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Free">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Explicit(System.Runtime.InteropServices.GCHandle)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.IntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/GCHandleType.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/GCHandleType.xml
new file mode 100644
index 00000000000..74bfc108fb4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/GCHandleType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.GCHandleType" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/GuidAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/GuidAttribute.xml
new file mode 100644
index 00000000000..39415881982
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/GuidAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.GuidAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="GuidAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="guid">TODO</param>

+        </constructor>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ICustomAdapter.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ICustomAdapter.xml
new file mode 100644
index 00000000000..3a3c60c2c07
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ICustomAdapter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.InteropServices.ICustomAdapter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ICustomFactory.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ICustomFactory.xml
new file mode 100644
index 00000000000..735f6098d42
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ICustomFactory.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.InteropServices.ICustomFactory" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ICustomMarshaler.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ICustomMarshaler.xml
new file mode 100644
index 00000000000..b38477dd864
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ICustomMarshaler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.InteropServices.ICustomMarshaler" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/IRegistrationServices.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/IRegistrationServices.xml
new file mode 100644
index 00000000000..b4c92087a63
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/IRegistrationServices.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.InteropServices.IRegistrationServices" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibConverter.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibConverter.xml
new file mode 100644
index 00000000000..482844a771c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibConverter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.InteropServices.ITypeLibConverter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibExporterNameProvider.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibExporterNameProvider.xml
new file mode 100644
index 00000000000..ca3a2ce1bee
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibExporterNameProvider.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.InteropServices.ITypeLibExporterNameProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibExporterNotifySink.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibExporterNotifySink.xml
new file mode 100644
index 00000000000..ed6aea5e761
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibExporterNotifySink.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.InteropServices.ITypeLibExporterNotifySink" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibImporterNotifySink.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibImporterNotifySink.xml
new file mode 100644
index 00000000000..d8f0d83b095
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ITypeLibImporterNotifySink.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.InteropServices.ITypeLibImporterNotifySink" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ImporterEventKind.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ImporterEventKind.xml
new file mode 100644
index 00000000000..6cb53b31f07
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/ImporterEventKind.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.ImporterEventKind" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/InAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/InAttribute.xml
new file mode 100644
index 00000000000..411fa8d0134
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/InAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.InAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="InAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/InterfaceTypeAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/InterfaceTypeAttribute.xml
new file mode 100644
index 00000000000..4e40deadc2e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/InterfaceTypeAttribute.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.InterfaceTypeAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="InterfaceTypeAttribute(System.Runtime.InteropServices.ComInterfaceType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="interfaceType">TODO</param>

+        </constructor>

+        <constructor name="InterfaceTypeAttribute(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="interfaceType">TODO</param>

+        </constructor>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/LayoutKind.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/LayoutKind.xml
new file mode 100644
index 00000000000..0468dfdf90e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/LayoutKind.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.LayoutKind" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/MarshalAsAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/MarshalAsAttribute.xml
new file mode 100644
index 00000000000..65f76224c86
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/MarshalAsAttribute.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.MarshalAsAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MarshalAsAttribute(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="unmanagedType">TODO</param>

+        </constructor>

+        <constructor name="MarshalAsAttribute(System.Runtime.InteropServices.UnmanagedType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="unmanagedType">TODO</param>

+        </constructor>

+        <field name="ArraySubType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MarshalCookie">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MarshalType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MarshalTypeRef">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SafeArraySubType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SizeConst">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SizeParamIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/OptionalAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/OptionalAttribute.xml
new file mode 100644
index 00000000000..d5f4bc3583e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/OptionalAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.OptionalAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="OptionalAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/OutAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/OutAttribute.xml
new file mode 100644
index 00000000000..44803c141a8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/OutAttribute.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.OutAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="OutAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="TypeId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/PInvokeMap.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/PInvokeMap.xml
new file mode 100644
index 00000000000..8513a5f5696
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/PInvokeMap.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.PInvokeMap" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/StructLayoutAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/StructLayoutAttribute.xml
new file mode 100644
index 00000000000..6479cd91597
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/StructLayoutAttribute.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.InteropServices.StructLayoutAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StructLayoutAttribute(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="layoutKind">TODO</param>

+        </constructor>

+        <constructor name="StructLayoutAttribute(System.Runtime.InteropServices.LayoutKind)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="layoutKind">TODO</param>

+        </constructor>

+        <field name="CharSet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Pack">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Size">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/TypeLibExporterFlags.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/TypeLibExporterFlags.xml
new file mode 100644
index 00000000000..0402473075e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/TypeLibExporterFlags.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.TypeLibExporterFlags" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/UnmanagedType.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/UnmanagedType.xml
new file mode 100644
index 00000000000..201b0268721
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/UnmanagedType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.UnmanagedType" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/VarEnum.xml b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/VarEnum.xml
new file mode 100644
index 00000000000..a0f3aaf4e23
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.InteropServices/VarEnum.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.InteropServices.VarEnum" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/ActivatorLevel.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/ActivatorLevel.xml
new file mode 100644
index 00000000000..19cbde98683
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/ActivatorLevel.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Remoting.Activation.ActivatorLevel" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/IActivator.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/IActivator.xml
new file mode 100644
index 00000000000..07a950d4128
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/IActivator.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Activation.IActivator" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/IConstructionCallMessage.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/IConstructionCallMessage.xml
new file mode 100644
index 00000000000..58bf5868119
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/IConstructionCallMessage.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Activation.IConstructionCallMessage" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/IConstructionReturnMessage.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/IConstructionReturnMessage.xml
new file mode 100644
index 00000000000..f2f8d4e42db
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Activation/IConstructionReturnMessage.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Activation.IConstructionReturnMessage" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/Context.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/Context.xml
new file mode 100644
index 00000000000..c300f6fdbb3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/Context.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Remoting.Contexts.Context" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Context">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="DefaultContext">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ContextID">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetProperty(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetProperty(System.Runtime.Remoting.Contexts.IContextProperty)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prop">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/ContextAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/ContextAttribute.xml
new file mode 100644
index 00000000000..7eee55e5d81
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/ContextAttribute.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Remoting.Contexts.ContextAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ContextAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="IsNewContextOK(System.Runtime.Remoting.Contexts.Context)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ctx">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Freeze(System.Runtime.Remoting.Contexts.Context)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ctx">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsContextOK(System.Runtime.Remoting.Contexts.Context, System.Runtime.Remoting.Activation.IConstructionCallMessage)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ctx">TODO</param>

+            <param name="msg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetPropertiesForNewContext(System.Runtime.Remoting.Activation.IConstructionCallMessage)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="msg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IContextAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IContextAttribute.xml
new file mode 100644
index 00000000000..afa3202b2f1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IContextAttribute.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Contexts.IContextAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IContextProperty.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IContextProperty.xml
new file mode 100644
index 00000000000..2893cc7da0b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IContextProperty.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Contexts.IContextProperty" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IDynamicMessageSink.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IDynamicMessageSink.xml
new file mode 100644
index 00000000000..436c49d3529
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IDynamicMessageSink.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Contexts.IDynamicMessageSink" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IDynamicProperty.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IDynamicProperty.xml
new file mode 100644
index 00000000000..2be4ee71ad4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/IDynamicProperty.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Contexts.IDynamicProperty" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/SynchronizationAttribute.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/SynchronizationAttribute.xml
new file mode 100644
index 00000000000..ec87c6f2479
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Contexts/SynchronizationAttribute.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Contexts.SynchronizationAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/AsyncResult.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/AsyncResult.xml
new file mode 100644
index 00000000000..ce3f8077321
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/AsyncResult.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Remoting.Messaging.AsyncResult" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AsyncResult">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AsyncState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AsyncWaitHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CompletedSynchronously">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsCompleted">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EndInvokeCalled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AsyncDelegate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/Header.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/Header.xml
new file mode 100644
index 00000000000..b1883983449
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/Header.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Remoting.Messaging.Header" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Header(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="Header(System.String, System.Object, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <param name="must_understand">TODO</param>

+        </constructor>

+        <constructor name="Header(System.String, System.Object, System.Boolean, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <param name="must_understand">TODO</param>

+            <param name="header_namespace">TODO</param>

+        </constructor>

+        <field name="HeaderNamespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MustUnderstand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMessage.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMessage.xml
new file mode 100644
index 00000000000..a5198ddfc75
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMessage.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Messaging.IMessage" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMessageCtrl.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMessageCtrl.xml
new file mode 100644
index 00000000000..5369b4cbd10
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMessageCtrl.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Messaging.IMessageCtrl" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMessageSink.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMessageSink.xml
new file mode 100644
index 00000000000..49111124191
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMessageSink.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Messaging.IMessageSink" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMethodCallMessage.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMethodCallMessage.xml
new file mode 100644
index 00000000000..34d4fcc7bf7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMethodCallMessage.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Messaging.IMethodCallMessage" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMethodMessage.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMethodMessage.xml
new file mode 100644
index 00000000000..d98ed321044
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMethodMessage.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Messaging.IMethodMessage" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMethodReturnMessage.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMethodReturnMessage.xml
new file mode 100644
index 00000000000..0ee99aa9705
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/IMethodReturnMessage.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Remoting.Messaging.IMethodReturnMessage" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/LogicalCallContext.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/LogicalCallContext.xml
new file mode 100644
index 00000000000..d0245ae4f3b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Messaging/LogicalCallContext.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Remoting.Messaging.LogicalCallContext" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="HasInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FreeNamedDataSlot(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetData(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetData(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Proxies/RealProxy.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Proxies/RealProxy.xml
new file mode 100644
index 00000000000..bcccb181787
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting.Proxies/RealProxy.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Remoting.Proxies.RealProxy" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="GetTransparentProxy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Invoke(System.Runtime.Remoting.Messaging.IMessage)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="msg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/LeaseState.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/LeaseState.xml
new file mode 100644
index 00000000000..dc93d01b373
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/LeaseState.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Remoting.LeaseState" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/ObjRef.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/ObjRef.xml
new file mode 100644
index 00000000000..52385994d0d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/ObjRef.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Remoting.ObjRef" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ObjRef">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ObjRef(System.MarshalByRefObject, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mbr">TODO</param>

+            <param name="type">TODO</param>

+        </constructor>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="si">TODO</param>

+            <param name="sc">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetRealObject(System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="sc">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsFromThisAppDomain">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsFromThisProcess">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/ObjectHandle.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/ObjectHandle.xml
new file mode 100644
index 00000000000..2f1cc7ca2f5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/ObjectHandle.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Remoting.ObjectHandle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ObjectHandle(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+        </constructor>

+        <method name="GetRealObject(System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="InitializeLifetimeService">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Unwrap">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/RemotingServices.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/RemotingServices.xml
new file mode 100644
index 00000000000..b0a6eebb280
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/RemotingServices.xml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Remoting.RemotingServices" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="IsTransparentProxy(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="proxy">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ExecuteMessage(System.MarshalByRefObject, System.Runtime.Remoting.Messaging.IMethodCallMessage)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <param name="reqMsg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/SoapMethodOption.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/SoapMethodOption.xml
new file mode 100644
index 00000000000..9c979904565
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/SoapMethodOption.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Remoting.SoapMethodOption" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/SoapOption.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/SoapOption.xml
new file mode 100644
index 00000000000..58c26f41096
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/SoapOption.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Remoting.SoapOption" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/WellKnownObjectMode.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/WellKnownObjectMode.xml
new file mode 100644
index 00000000000..417743c6825
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Remoting/WellKnownObjectMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Remoting.WellKnownObjectMode" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters.Binary/BinaryArrayTypeEnum.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters.Binary/BinaryArrayTypeEnum.xml
new file mode 100644
index 00000000000..7df6dc6cc2a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters.Binary/BinaryArrayTypeEnum.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.Binary.BinaryArrayTypeEnum" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.xml
new file mode 100644
index 00000000000..052efa2666e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/FormatterAssemblyStyle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.FormatterAssemblyStyle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/FormatterTopObjectStyle.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/FormatterTopObjectStyle.xml
new file mode 100644
index 00000000000..31602ed7218
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/FormatterTopObjectStyle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.FormatterTopObjectStyle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/FormatterTypeStyle.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/FormatterTypeStyle.xml
new file mode 100644
index 00000000000..1553903e86b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/FormatterTypeStyle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.FormatterTypeStyle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/IFieldInfo.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/IFieldInfo.xml
new file mode 100644
index 00000000000..1aaee4042ef
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/IFieldInfo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Serialization.Formatters.IFieldInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/ISoapMessage.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/ISoapMessage.xml
new file mode 100644
index 00000000000..246b434a4e8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/ISoapMessage.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Serialization.Formatters.ISoapMessage" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalArrayTypeE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalArrayTypeE.xml
new file mode 100644
index 00000000000..22b95598d58
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalArrayTypeE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalArrayTypeE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalElementTypeE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalElementTypeE.xml
new file mode 100644
index 00000000000..4684f6d26c2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalElementTypeE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalElementTypeE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalMemberTypeE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalMemberTypeE.xml
new file mode 100644
index 00000000000..0789e88cfc4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalMemberTypeE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalMemberTypeE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalMemberValueE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalMemberValueE.xml
new file mode 100644
index 00000000000..fd498783d87
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalMemberValueE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalMemberValueE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalNameSpaceE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalNameSpaceE.xml
new file mode 100644
index 00000000000..bdb54cdef63
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalNameSpaceE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalNameSpaceE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalObjectPositionE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalObjectPositionE.xml
new file mode 100644
index 00000000000..54166dc2a90
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalObjectPositionE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalObjectPositionE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalObjectTypeE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalObjectTypeE.xml
new file mode 100644
index 00000000000..c49438620a1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalObjectTypeE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalObjectTypeE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalParseStateE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalParseStateE.xml
new file mode 100644
index 00000000000..472d9a7e0df
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalParseStateE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalParseStateE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalParseTypeE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalParseTypeE.xml
new file mode 100644
index 00000000000..1e4bc057823
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalParseTypeE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalParseTypeE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalPrimitiveTypeE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalPrimitiveTypeE.xml
new file mode 100644
index 00000000000..8ce02d3b4c1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalPrimitiveTypeE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalPrimitiveTypeE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalSerializerTypeE.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalSerializerTypeE.xml
new file mode 100644
index 00000000000..77ff630b3bd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization.Formatters/InternalSerializerTypeE.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.Formatters.InternalSerializerTypeE" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IDeserializationCallback.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IDeserializationCallback.xml
new file mode 100644
index 00000000000..0b81efa9154
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IDeserializationCallback.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Serialization.IDeserializationCallback" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IFormatter.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IFormatter.xml
new file mode 100644
index 00000000000..21de0da6997
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IFormatter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Serialization.IFormatter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IFormatterConverter.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IFormatterConverter.xml
new file mode 100644
index 00000000000..8948ff8e7dc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IFormatterConverter.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Serialization.IFormatterConverter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IObjectReference.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IObjectReference.xml
new file mode 100644
index 00000000000..ee6170675bd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/IObjectReference.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Serialization.IObjectReference" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ISerializable.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ISerializable.xml
new file mode 100644
index 00000000000..ae2284955d5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ISerializable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Serialization.ISerializable" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ISerializationSurrogate.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ISerializationSurrogate.xml
new file mode 100644
index 00000000000..c2ddff92c37
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ISerializationSurrogate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Serialization.ISerializationSurrogate" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ISurrogateSelector.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ISurrogateSelector.xml
new file mode 100644
index 00000000000..fca838cece7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ISurrogateSelector.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Runtime.Serialization.ISurrogateSelector" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ObjectIDGenerator.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ObjectIDGenerator.xml
new file mode 100644
index 00000000000..27a5fc49ad4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/ObjectIDGenerator.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Serialization.ObjectIDGenerator" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ObjectIDGenerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="HasId(System.Object, System.Boolean&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="firstTime">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetId(System.Object, System.Boolean&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="firstTime">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationBinder.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationBinder.xml
new file mode 100644
index 00000000000..95053f10901
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationBinder.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Serialization.SerializationBinder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="BindToType(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyName">TODO</param>

+            <param name="typeName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationEntry.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationEntry.xml
new file mode 100644
index 00000000000..98d68bc8212
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationEntry.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Runtime.Serialization.SerializationEntry" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ObjectType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationException.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationException.xml
new file mode 100644
index 00000000000..db5561dca81
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Serialization.SerializationException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SerializationException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="SerializationException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="SerializationException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationInfo.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationInfo.xml
new file mode 100644
index 00000000000..952d009b17a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationInfo.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Serialization.SerializationInfo" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SerializationInfo(System.Type, System.Runtime.Serialization.IFormatterConverter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="converter">TODO</param>

+        </constructor>

+        <property name="AssemblyName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FullTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MemberCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="AddValue(System.String, System.Object, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.String, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetType(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddValue(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBoolean(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetByte(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetChar(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDateTime(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDecimal(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDouble(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInt16(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInt32(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInt64(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSByte(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetSingle(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetUInt16(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetUInt32(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetUInt64(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationInfoEnumerator.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationInfoEnumerator.xml
new file mode 100644
index 00000000000..4e8f179e92d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SerializationInfoEnumerator.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Serialization.SerializationInfoEnumerator" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Current">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ObjectType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveNext">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/StreamingContext.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/StreamingContext.xml
new file mode 100644
index 00000000000..ac32c8c8f61
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/StreamingContext.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Runtime.Serialization.StreamingContext" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StreamingContext(System.Runtime.Serialization.StreamingContextStates)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="state">TODO</param>

+        </constructor>

+        <constructor name="StreamingContext(System.Runtime.Serialization.StreamingContextStates, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="state">TODO</param>

+            <param name="additional">TODO</param>

+        </constructor>

+        <property name="Context">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="State">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/StreamingContextStates.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/StreamingContextStates.xml
new file mode 100644
index 00000000000..240c7b3f6ef
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/StreamingContextStates.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Runtime.Serialization.StreamingContextStates" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SurrogateSelector.xml b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SurrogateSelector.xml
new file mode 100644
index 00000000000..812a666b336
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Runtime.Serialization/SurrogateSelector.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Runtime.Serialization.SurrogateSelector" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SurrogateSelector">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GetSurrogate(System.Type, System.Runtime.Serialization.StreamingContext, System.Runtime.Serialization.ISurrogateSelector&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="context">TODO</param>

+            <param name="selector">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNextSelector">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ChainSelector(System.Runtime.Serialization.ISurrogateSelector)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="selector">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveSurrogate(System.Type, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddSurrogate(System.Type, System.Runtime.Serialization.StreamingContext, System.Runtime.Serialization.ISerializationSurrogate)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="context">TODO</param>

+            <param name="surrogate">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography.X509Certificates/X509Certificate.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography.X509Certificates/X509Certificate.xml
new file mode 100644
index 00000000000..50f18faad5a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography.X509Certificates/X509Certificate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.X509Certificates.X509Certificate" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricAlgorithm.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricAlgorithm.xml
new file mode 100644
index 00000000000..02d8efddc2a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricAlgorithm.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.AsymmetricAlgorithm" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="KeyExchangeAlgorithm">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="KeySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LegalKeySizes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SignatureAlgorithm">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToXmlString(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="includePrivateParameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXmlString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xmlString">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ValidKeySize(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bitLength">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="algName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricKeyExchangeDeformatter.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricKeyExchangeDeformatter.xml
new file mode 100644
index 00000000000..2ab68118867
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricKeyExchangeDeformatter.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.AsymmetricKeyExchangeDeformatter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AsymmetricKeyExchangeDeformatter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Parameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetKey(System.Security.Cryptography.AsymmetricAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DecryptKeyExchange(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgb">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricKeyExchangeFormatter.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricKeyExchangeFormatter.xml
new file mode 100644
index 00000000000..2a61e48e7eb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricKeyExchangeFormatter.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.AsymmetricKeyExchangeFormatter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AsymmetricKeyExchangeFormatter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Parameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetKey(System.Security.Cryptography.AsymmetricAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateKeyExchange(System.Byte[], System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <param name="symAlgType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateKeyExchange(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricSignatureDeformatter.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricSignatureDeformatter.xml
new file mode 100644
index 00000000000..fda968216ff
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricSignatureDeformatter.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.AsymmetricSignatureDeformatter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AsymmetricSignatureDeformatter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="VerifySignature(System.Security.Cryptography.HashAlgorithm, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hash">TODO</param>

+            <param name="rgbSignature">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="VerifySignature(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbHash">TODO</param>

+            <param name="rgbSignature">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetKey(System.Security.Cryptography.AsymmetricAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetHashAlgorithm(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricSignatureFormatter.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricSignatureFormatter.xml
new file mode 100644
index 00000000000..403ec7b7d0a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/AsymmetricSignatureFormatter.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.AsymmetricSignatureFormatter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AsymmetricSignatureFormatter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="CreateSignature(System.Security.Cryptography.HashAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hash">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateSignature(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbHash">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetKey(System.Security.Cryptography.AsymmetricAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetHashAlgorithm(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CipherMode.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CipherMode.xml
new file mode 100644
index 00000000000..a9eb966cd75
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CipherMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Cryptography.CipherMode" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptoAPITransform.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptoAPITransform.xml
new file mode 100644
index 00000000000..33ca36db19c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptoAPITransform.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.CryptoAPITransform" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CryptoAPITransform">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="CanTransformMultipleBlocks">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InputBlockSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="KeyHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OutputBlockSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="TransformFinalBlock(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inputBuffer">TODO</param>

+            <param name="inputOffset">TODO</param>

+            <param name="inputCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TransformBlock(System.Byte[], System.Int32, System.Int32, System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inputBuffer">TODO</param>

+            <param name="inputOffset">TODO</param>

+            <param name="inputCount">TODO</param>

+            <param name="outputBuffer">TODO</param>

+            <param name="outputOffset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptoStream.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptoStream.xml
new file mode 100644
index 00000000000..da818e23e7c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptoStream.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.CryptoStream" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CryptoStream(System.IO.Stream, System.Security.Cryptography.ICryptoTransform, System.Security.Cryptography.CryptoStreamMode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <param name="transform">TODO</param>

+            <param name="mode">TODO</param>

+        </constructor>

+        <property name="CanRead">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanSeek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanWrite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Position">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Write(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetLength(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Seek(System.Int64, System.IO.SeekOrigin)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="origin">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="FlushFinalBlock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptoStreamMode.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptoStreamMode.xml
new file mode 100644
index 00000000000..9d69ee5360a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptoStreamMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Cryptography.CryptoStreamMode" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptographicException.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptographicException.xml
new file mode 100644
index 00000000000..661f9b52c76
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptographicException.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.CryptographicException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CryptographicException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CryptographicException(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hr">TODO</param>

+        </constructor>

+        <constructor name="CryptographicException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="CryptographicException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <constructor name="CryptographicException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="insert">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptographicUnexpectedOperationException.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptographicUnexpectedOperationException.xml
new file mode 100644
index 00000000000..bb7606e72d1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CryptographicUnexpectedOperationException.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.CryptographicUnexpectedOperationException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CryptographicUnexpectedOperationException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CryptographicUnexpectedOperationException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="CryptographicUnexpectedOperationException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <constructor name="CryptographicUnexpectedOperationException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="insert">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CspParameters.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CspParameters.xml
new file mode 100644
index 00000000000..c977f370d51
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CspParameters.xml
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.CspParameters" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CspParameters">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CspParameters(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dwTypeIn">TODO</param>

+        </constructor>

+        <constructor name="CspParameters(System.Int32, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dwTypeIn">TODO</param>

+            <param name="strProviderNameIn">TODO</param>

+        </constructor>

+        <constructor name="CspParameters(System.Int32, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dwTypeIn">TODO</param>

+            <param name="strProviderNameIn">TODO</param>

+            <param name="strContainerNameIn">TODO</param>

+        </constructor>

+        <field name="KeyContainerName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="KeyNumber">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="ProviderName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="ProviderType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Flags">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CspProviderFlags.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CspProviderFlags.xml
new file mode 100644
index 00000000000..802305f7cd7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/CspProviderFlags.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Cryptography.CspProviderFlags" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DES.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DES.xml
new file mode 100644
index 00000000000..3d3ef8f5476
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DES.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.DES" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DES">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Key">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsWeakKey(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbKey">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSemiWeakKey(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbKey">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DESCryptoServiceProvider.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DESCryptoServiceProvider.xml
new file mode 100644
index 00000000000..ca18e1f8352
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DESCryptoServiceProvider.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.DESCryptoServiceProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DESCryptoServiceProvider">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Key">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IV">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreateDecryptor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateEncryptor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSA.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSA.xml
new file mode 100644
index 00000000000..2b2f2061e85
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSA.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.DSA" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="VerifySignature(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbHash">TODO</param>

+            <param name="rgbSignature">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ImportParameters(System.Security.Cryptography.DSAParameters)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ExportParameters(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="includePrivateParameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateSignature(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbHash">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXmlString(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="includePrivateParameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXmlString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xmlString">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="algName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSACryptoServiceProvider.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSACryptoServiceProvider.xml
new file mode 100644
index 00000000000..fd791164701
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSACryptoServiceProvider.xml
@@ -0,0 +1,124 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.DSACryptoServiceProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DSACryptoServiceProvider">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="DSACryptoServiceProvider(System.Security.Cryptography.CspParameters)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parameters">TODO</param>

+        </constructor>

+        <constructor name="DSACryptoServiceProvider(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key_size">TODO</param>

+        </constructor>

+        <constructor name="DSACryptoServiceProvider(System.Int32, System.Security.Cryptography.CspParameters)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key_size">TODO</param>

+            <param name="parameters">TODO</param>

+        </constructor>

+        <property name="KeyExchangeAlgorithm">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="KeySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LegalKeySizes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SignatureAlgorithm">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PersistKeyInCsp">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="VerifySignature(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hash">TODO</param>

+            <param name="sig">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ImportParameters(System.Security.Cryptography.DSAParameters)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ExportParameters(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="include">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateSignature(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgb">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXmlString(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="includePrivateParameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXmlString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xmlString">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SignData(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SignData(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SignData(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SignHash(System.Byte[], System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hash">TODO</param>

+            <param name="str">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="VerifyData(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <param name="sig">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSAParameters.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSAParameters.xml
new file mode 100644
index 00000000000..5afed41ddaf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSAParameters.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Security.Cryptography.DSAParameters" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Counter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="G">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="J">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="P">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Q">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Seed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="X">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Y">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSASignatureDeformatter.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSASignatureDeformatter.xml
new file mode 100644
index 00000000000..dee4d1f2426
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSASignatureDeformatter.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.DSASignatureDeformatter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DSASignatureDeformatter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="DSASignatureDeformatter(System.Security.Cryptography.AsymmetricAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+        </constructor>

+        <method name="VerifySignature(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbHash">TODO</param>

+            <param name="rgbSignature">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetKey(System.Security.Cryptography.AsymmetricAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetHashAlgorithm(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSASignatureFormatter.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSASignatureFormatter.xml
new file mode 100644
index 00000000000..a806aee80fa
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DSASignatureFormatter.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.DSASignatureFormatter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DSASignatureFormatter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="DSASignatureFormatter(System.Security.Cryptography.AsymmetricAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+        </constructor>

+        <method name="CreateSignature(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbHash">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetKey(System.Security.Cryptography.AsymmetricAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetHashAlgorithm(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DeriveBytes.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DeriveBytes.xml
new file mode 100644
index 00000000000..932f27ab9ea
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/DeriveBytes.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.DeriveBytes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cb">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/FromBase64Transform.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/FromBase64Transform.xml
new file mode 100644
index 00000000000..6decaea7d0e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/FromBase64Transform.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.FromBase64Transform" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FromBase64Transform">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="FromBase64Transform(System.Security.Cryptography.FromBase64TransformMode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="mode">TODO</param>

+        </constructor>

+        <property name="CanTransformMultipleBlocks">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InputBlockSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OutputBlockSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="TransformFinalBlock(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inputBuffer">TODO</param>

+            <param name="inputOffset">TODO</param>

+            <param name="inputCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TransformBlock(System.Byte[], System.Int32, System.Int32, System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inputBuffer">TODO</param>

+            <param name="inputOffset">TODO</param>

+            <param name="inputCount">TODO</param>

+            <param name="outputBuffer">TODO</param>

+            <param name="outputOffset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/FromBase64TransformMode.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/FromBase64TransformMode.xml
new file mode 100644
index 00000000000..b0aa37a6b17
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/FromBase64TransformMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Cryptography.FromBase64TransformMode" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/HashAlgorithm.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/HashAlgorithm.xml
new file mode 100644
index 00000000000..cc5bfe55873
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/HashAlgorithm.xml
@@ -0,0 +1,73 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.HashAlgorithm" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="CanTransformMultipleBlocks">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Hash">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HashSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InputBlockSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OutputBlockSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="TransformFinalBlock(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inputBuffer">TODO</param>

+            <param name="inputOffset">TODO</param>

+            <param name="inputCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TransformBlock(System.Byte[], System.Int32, System.Int32, System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inputBuffer">TODO</param>

+            <param name="inputOffset">TODO</param>

+            <param name="inputCount">TODO</param>

+            <param name="outputBuffer">TODO</param>

+            <param name="outputOffset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Initialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ComputeHash(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="st">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/ICryptoTransform.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/ICryptoTransform.xml
new file mode 100644
index 00000000000..046b56497e3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/ICryptoTransform.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.Cryptography.ICryptoTransform" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/KeySizes.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/KeySizes.xml
new file mode 100644
index 00000000000..b5c77c35abf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/KeySizes.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.KeySizes" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="KeySizes(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="minSize">TODO</param>

+            <param name="maxSize">TODO</param>

+            <param name="skipSize">TODO</param>

+        </constructor>

+        <property name="MaxSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MinSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SkipSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/MD5.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/MD5.xml
new file mode 100644
index 00000000000..708d9408b53
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/MD5.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.MD5" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="st">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/MD5CryptoServiceProvider.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/MD5CryptoServiceProvider.xml
new file mode 100644
index 00000000000..3e0f44a78d2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/MD5CryptoServiceProvider.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.MD5CryptoServiceProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MD5CryptoServiceProvider">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Initialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/PaddingMode.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/PaddingMode.xml
new file mode 100644
index 00000000000..4c5839eaa59
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/PaddingMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Cryptography.PaddingMode" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RNGCryptoServiceProvider.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RNGCryptoServiceProvider.xml
new file mode 100644
index 00000000000..7443ba71c7f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RNGCryptoServiceProvider.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.RNGCryptoServiceProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RNGCryptoServiceProvider">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="RNGCryptoServiceProvider(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgb">TODO</param>

+        </constructor>

+        <constructor name="RNGCryptoServiceProvider(System.Security.Cryptography.CspParameters)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cspParams">TODO</param>

+        </constructor>

+        <constructor name="RNGCryptoServiceProvider(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+        </constructor>

+        <method name="GetNonZeroBytes(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RSA.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RSA.xml
new file mode 100644
index 00000000000..5df368682a0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RSA.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.RSA" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RSA">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="ImportParameters(System.Security.Cryptography.RSAParameters)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ExportParameters(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="include">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DecryptValue(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgb">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EncryptValue(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgb">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXmlString(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="include">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXmlString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xml">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="alg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RSAParameters.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RSAParameters.xml
new file mode 100644
index 00000000000..da9cfec6e24
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RSAParameters.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Security.Cryptography.RSAParameters" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="P">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Q">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="D">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="DP">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="DQ">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="InverseQ">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Modulus">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Exponent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RandomNumberGenerator.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RandomNumberGenerator.xml
new file mode 100644
index 00000000000..a7ad8a52873
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RandomNumberGenerator.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.RandomNumberGenerator" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RandomNumberGenerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GetNonZeroBytes(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rngName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/Rijndael.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/Rijndael.xml
new file mode 100644
index 00000000000..db27d4af897
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/Rijndael.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.Rijndael" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Rijndael">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="alg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RijndaelManaged.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RijndaelManaged.xml
new file mode 100644
index 00000000000..62ea1fb6f71
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/RijndaelManaged.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.RijndaelManaged" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RijndaelManaged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GenerateKey">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GenerateIV">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateEncryptor(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbKey">TODO</param>

+            <param name="rgbIV">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDecryptor(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbKey">TODO</param>

+            <param name="rgbIV">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA1.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA1.xml
new file mode 100644
index 00000000000..4d7ff76537b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA1.xml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.SHA1" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="st">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA1CryptoServiceProvider.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA1CryptoServiceProvider.xml
new file mode 100644
index 00000000000..30b1ff908f9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA1CryptoServiceProvider.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.SHA1CryptoServiceProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SHA1CryptoServiceProvider">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Initialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA256.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA256.xml
new file mode 100644
index 00000000000..211c74b9967
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA256.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.SHA256" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SHA256">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="st">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA256Managed.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA256Managed.xml
new file mode 100644
index 00000000000..90d7ac1fe77
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA256Managed.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.SHA256Managed" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SHA256Managed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Initialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ProcessBlock(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inputBuffer">TODO</param>

+            <param name="inputOffset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ProcessFinalBlock(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inputBuffer">TODO</param>

+            <param name="inputOffset">TODO</param>

+            <param name="inputCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA384.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA384.xml
new file mode 100644
index 00000000000..35d336b2215
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA384.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.SHA384" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SHA384">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="st">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA384Managed.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA384Managed.xml
new file mode 100644
index 00000000000..310fb4d59c8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA384Managed.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.SHA384Managed" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SHA384Managed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Initialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA512.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA512.xml
new file mode 100644
index 00000000000..d230aee7d3b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA512.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.SHA512" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SHA512">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="st">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA512Managed.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA512Managed.xml
new file mode 100644
index 00000000000..96fe63a6806
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SHA512Managed.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.SHA512Managed" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SHA512Managed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Initialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SignatureDescription.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SignatureDescription.xml
new file mode 100644
index 00000000000..35fa2d7cf46
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SignatureDescription.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.SignatureDescription" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SignatureDescription(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="el">TODO</param>

+        </constructor>

+        <property name="DeformatterAlgorithm">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DigestAlgorithm">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FormatterAlgorithm">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="KeyAlgorithm">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreateFormatter(System.Security.Cryptography.AsymmetricAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDigest">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDeformatter(System.Security.Cryptography.AsymmetricAlgorithm)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SymmetricAlgorithm.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SymmetricAlgorithm.xml
new file mode 100644
index 00000000000..dc790e00af6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/SymmetricAlgorithm.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.SymmetricAlgorithm" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SymmetricAlgorithm">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BlockSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FeedbackSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IV">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Key">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="KeySize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LegalBlockSizes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LegalKeySizes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Mode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Padding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GenerateKey">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GenerateIV">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateEncryptor(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbKey">TODO</param>

+            <param name="rgbIV">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateEncryptor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDecryptor(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rgbKey">TODO</param>

+            <param name="rgbIV">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDecryptor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ValidKeySize(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bitLength">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Create(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="algName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Cryptography/ToBase64Transform.xml b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/ToBase64Transform.xml
new file mode 100644
index 00000000000..5c721a06fe2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Cryptography/ToBase64Transform.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Cryptography.ToBase64Transform" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ToBase64Transform">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="CanTransformMultipleBlocks">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InputBlockSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OutputBlockSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="TransformFinalBlock(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inputBuffer">TODO</param>

+            <param name="inputOffset">TODO</param>

+            <param name="inputCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TransformBlock(System.Byte[], System.Int32, System.Int32, System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inputBuffer">TODO</param>

+            <param name="inputOffset">TODO</param>

+            <param name="inputCount">TODO</param>

+            <param name="outputBuffer">TODO</param>

+            <param name="outputOffset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/CodeAccessSecurityAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/CodeAccessSecurityAttribute.xml
new file mode 100644
index 00000000000..6b3049f54f3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/CodeAccessSecurityAttribute.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.CodeAccessSecurityAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeAccessSecurityAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/EnvironmentPermissionAccess.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/EnvironmentPermissionAccess.xml
new file mode 100644
index 00000000000..605683160b7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/EnvironmentPermissionAccess.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.EnvironmentPermissionAccess" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/EnvironmentPermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/EnvironmentPermissionAttribute.xml
new file mode 100644
index 00000000000..ef59656253d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/EnvironmentPermissionAttribute.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.EnvironmentPermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="EnvironmentPermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="All">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Read">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Write">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileDialogPermissionAccess.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileDialogPermissionAccess.xml
new file mode 100644
index 00000000000..29bc1ec1860
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileDialogPermissionAccess.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.FileDialogPermissionAccess" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileDialogPermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileDialogPermissionAttribute.xml
new file mode 100644
index 00000000000..a8922ff6386
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileDialogPermissionAttribute.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.FileDialogPermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FileDialogPermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="Open">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Save">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileIOPermission.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileIOPermission.xml
new file mode 100644
index 00000000000..fec369d2a80
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileIOPermission.xml
@@ -0,0 +1,108 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.FileIOPermission" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FileIOPermission(System.Security.Permissions.PermissionState)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="state">TODO</param>

+        </constructor>

+        <constructor name="FileIOPermission(System.Security.Permissions.FileIOPermissionAccess, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="access">TODO</param>

+            <param name="path">TODO</param>

+        </constructor>

+        <constructor name="FileIOPermission(System.Security.Permissions.FileIOPermissionAccess, System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="access">TODO</param>

+            <param name="pathList">TODO</param>

+        </constructor>

+        <property name="AllFiles">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AllLocalFiles">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="IsUnrestricted">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="esd">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Union(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="other">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSubsetOf(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Intersect(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddPathList(System.Security.Permissions.FileIOPermissionAccess, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="access">TODO</param>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddPathList(System.Security.Permissions.FileIOPermissionAccess, System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="access">TODO</param>

+            <param name="pathList">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetPathList(System.Security.Permissions.FileIOPermissionAccess)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="access">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetPathList(System.Security.Permissions.FileIOPermissionAccess, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="access">TODO</param>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetPathList(System.Security.Permissions.FileIOPermissionAccess, System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="access">TODO</param>

+            <param name="pathList">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileIOPermissionAccess.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileIOPermissionAccess.xml
new file mode 100644
index 00000000000..de2a6e11e7c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileIOPermissionAccess.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.FileIOPermissionAccess" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileIOPermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileIOPermissionAttribute.xml
new file mode 100644
index 00000000000..7606b85ed43
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/FileIOPermissionAttribute.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.FileIOPermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FileIOPermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="All">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Append">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PathDiscovery">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Read">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Write">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/IUnrestrictedPermission.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/IUnrestrictedPermission.xml
new file mode 100644
index 00000000000..4e08349777e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/IUnrestrictedPermission.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.Permissions.IUnrestrictedPermission" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStorageContainment.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStorageContainment.xml
new file mode 100644
index 00000000000..0c852cd883b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStorageContainment.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.IsolatedStorageContainment" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStorageFilePermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStorageFilePermissionAttribute.xml
new file mode 100644
index 00000000000..acc229238c5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStorageFilePermissionAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.IsolatedStorageFilePermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IsolatedStorageFilePermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStoragePermission.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStoragePermission.xml
new file mode 100644
index 00000000000..5bfd52b0b6b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStoragePermission.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.IsolatedStoragePermission" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IsolatedStoragePermission(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="UsageAllowed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UserQuota">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStoragePermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStoragePermissionAttribute.xml
new file mode 100644
index 00000000000..f991426a3f4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/IsolatedStoragePermissionAttribute.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.IsolatedStoragePermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IsolatedStoragePermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="UsageAllowed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UserQuota">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/PermissionSetAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/PermissionSetAttribute.xml
new file mode 100644
index 00000000000..f7385e96d8c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/PermissionSetAttribute.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.PermissionSetAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="PermissionSetAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="File">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnicodeEncoded">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XML">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreatePermissionSet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/PermissionState.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/PermissionState.xml
new file mode 100644
index 00000000000..ffbdfaa99e3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/PermissionState.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.PermissionState" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/PrinciplePermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/PrinciplePermissionAttribute.xml
new file mode 100644
index 00000000000..d9c2686c516
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/PrinciplePermissionAttribute.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.PrinciplePermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="PrinciplePermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="Authenticated">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Role">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/ReflectionPermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/ReflectionPermissionAttribute.xml
new file mode 100644
index 00000000000..1855bcb8f92
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/ReflectionPermissionAttribute.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.ReflectionPermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ReflectionPermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="Flags">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MemberAccess">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReflectionEmit">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TypeInformation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/ReflectionPermissionFlag.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/ReflectionPermissionFlag.xml
new file mode 100644
index 00000000000..7412d5c74d3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/ReflectionPermissionFlag.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.ReflectionPermissionFlag" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/RegistryPermissionAccess.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/RegistryPermissionAccess.xml
new file mode 100644
index 00000000000..3d621d82ec0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/RegistryPermissionAccess.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.RegistryPermissionAccess" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/RegistryPermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/RegistryPermissionAttribute.xml
new file mode 100644
index 00000000000..f094e17692e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/RegistryPermissionAttribute.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.RegistryPermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RegistryPermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="All">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Create">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Read">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Write">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityAction.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityAction.xml
new file mode 100644
index 00000000000..b36fcc87cc4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityAction.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.SecurityAction" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityAttribute.xml
new file mode 100644
index 00000000000..701eb0bae33
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityAttribute.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.SecurityAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SecurityAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="Unrestricted">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Action">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityPermission.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityPermission.xml
new file mode 100644
index 00000000000..b14f2391e2e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityPermission.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.SecurityPermission" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SecurityPermission(System.Security.Permissions.PermissionState)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="state">TODO</param>

+        </constructor>

+        <constructor name="SecurityPermission(System.Security.Permissions.SecurityPermissionFlag)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="flags">TODO</param>

+        </constructor>

+        <property name="Flags">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="IsUnrestricted">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Union(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSubsetOf(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Intersect(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityPermissionFlag.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityPermissionFlag.xml
new file mode 100644
index 00000000000..05948d77703
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/SecurityPermissionFlag.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.SecurityPermissionFlag" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/SiteIdentityPermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/SiteIdentityPermissionAttribute.xml
new file mode 100644
index 00000000000..97246589911
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/SiteIdentityPermissionAttribute.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.SiteIdentityPermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SiteIdentityPermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="Site">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/StrongNameIdentityPermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/StrongNameIdentityPermissionAttribute.xml
new file mode 100644
index 00000000000..133b1917b04
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/StrongNameIdentityPermissionAttribute.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.StrongNameIdentityPermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StrongNameIdentityPermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PublicKey">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Version">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/UIPermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/UIPermissionAttribute.xml
new file mode 100644
index 00000000000..0ef02ed6eeb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/UIPermissionAttribute.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.UIPermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UIPermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="Clipboard">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Window">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/UIPermissionClipboard.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/UIPermissionClipboard.xml
new file mode 100644
index 00000000000..a6390ca1a51
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/UIPermissionClipboard.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.UIPermissionClipboard" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/UIPermissionWindow.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/UIPermissionWindow.xml
new file mode 100644
index 00000000000..9376807dcda
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/UIPermissionWindow.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Permissions.UIPermissionWindow" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/UrlIdentityPermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/UrlIdentityPermissionAttribute.xml
new file mode 100644
index 00000000000..0a80842b254
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/UrlIdentityPermissionAttribute.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.UrlIdentityPermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UrlIdentityPermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="Url">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Permissions/ZoneIdentityPermissionAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Permissions/ZoneIdentityPermissionAttribute.xml
new file mode 100644
index 00000000000..2ae65a7e9d0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Permissions/ZoneIdentityPermissionAttribute.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Permissions.ZoneIdentityPermissionAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ZoneIdentityPermissionAttribute(System.Security.Permissions.SecurityAction)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="action">TODO</param>

+        </constructor>

+        <property name="Zone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreatePermission">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/AllMembershipCondition.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/AllMembershipCondition.xml
new file mode 100644
index 00000000000..465173c55db
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/AllMembershipCondition.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Policy.AllMembershipCondition" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AllMembershipCondition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="ToXml(System.Security.Policy.PolicyLevel)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement, System.Security.Policy.PolicyLevel)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <param name="level">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Check(System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="evidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/ApplicationDirectoryMembershipCondition.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/ApplicationDirectoryMembershipCondition.xml
new file mode 100644
index 00000000000..d034a869755
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/ApplicationDirectoryMembershipCondition.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Policy.ApplicationDirectoryMembershipCondition" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ApplicationDirectoryMembershipCondition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="ToXml(System.Security.Policy.PolicyLevel)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement, System.Security.Policy.PolicyLevel)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <param name="level">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Check(System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="evidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/CodeGroup.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/CodeGroup.xml
new file mode 100644
index 00000000000..dc8ba9558c5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/CodeGroup.xml
@@ -0,0 +1,125 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Policy.CodeGroup" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CodeGroup(System.Security.Policy.IMembershipCondition, System.Security.Policy.PolicyStatement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="membershipCondition">TODO</param>

+            <param name="policy">TODO</param>

+        </constructor>

+        <property name="MergeLogic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PolicyStatement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Description">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MembershipCondition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Children">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AttributeString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PermissionSetName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ResolveMatchingCodeGroups(System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="evidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Resolve(System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="evidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddChild(System.Security.Policy.CodeGroup)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="group">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Security.Policy.CodeGroup, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cg">TODO</param>

+            <param name="compareChildren">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveChild(System.Security.Policy.CodeGroup)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="group">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement, System.Security.Policy.PolicyLevel)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <param name="level">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXml(System.Security.Policy.PolicyLevel)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/Evidence.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/Evidence.xml
new file mode 100644
index 00000000000..c0e73d71f4a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/Evidence.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Policy.Evidence" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Evidence">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GetHostEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/FileCodeGroup.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/FileCodeGroup.xml
new file mode 100644
index 00000000000..bbd9f14146a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/FileCodeGroup.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Policy.FileCodeGroup" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FileCodeGroup(System.Security.Policy.IMembershipCondition, System.Security.Permissions.FileIOPermissionAccess)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="membershipCondition">TODO</param>

+            <param name="access">TODO</param>

+        </constructor>

+        <property name="MergeLogic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AttributeString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PermissionSetName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ResolveMatchingCodeGroups(System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="evidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Resolve(System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="evidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/IIdentityPermissionFactory.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/IIdentityPermissionFactory.xml
new file mode 100644
index 00000000000..1aef2080d7d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/IIdentityPermissionFactory.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.Policy.IIdentityPermissionFactory" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/IMembershipCondition.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/IMembershipCondition.xml
new file mode 100644
index 00000000000..bd39f0e165a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/IMembershipCondition.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.Policy.IMembershipCondition" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyException.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyException.xml
new file mode 100644
index 00000000000..cd225c24822
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Policy.PolicyException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="PolicyException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="PolicyException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="PolicyException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyLevel.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyLevel.xml
new file mode 100644
index 00000000000..6a649b8489f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyLevel.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Policy.PolicyLevel" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="FullTrustAssemblies">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Label">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NamedPermissionSets">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RootCodeGroup">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="StoreLocation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyStatement.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyStatement.xml
new file mode 100644
index 00000000000..21e95083418
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyStatement.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Policy.PolicyStatement" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="PolicyStatement(System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="perms">TODO</param>

+        </constructor>

+        <constructor name="PolicyStatement(System.Security.PermissionSet, System.Security.Policy.PolicyStatementAttribute)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="perms">TODO</param>

+            <param name="attrs">TODO</param>

+        </constructor>

+        <property name="PermissionSet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AttributeString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToXml(System.Security.Policy.PolicyLevel)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement, System.Security.Policy.PolicyLevel)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <param name="level">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyStatementAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyStatementAttribute.xml
new file mode 100644
index 00000000000..0c11d7ff951
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Policy/PolicyStatementAttribute.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Policy.PolicyStatementAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Principal/GenericIdentity.xml b/mcs/docs/apidocs/xml/en/System.Security.Principal/GenericIdentity.xml
new file mode 100644
index 00000000000..c5a547fe4f1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Principal/GenericIdentity.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Principal.GenericIdentity" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="GenericIdentity(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="user_name">TODO</param>

+            <param name="authentication_type">TODO</param>

+        </constructor>

+        <constructor name="GenericIdentity(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <property name="AuthenticationType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsAuthenticated">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Principal/GenericPrincipal.xml b/mcs/docs/apidocs/xml/en/System.Security.Principal/GenericPrincipal.xml
new file mode 100644
index 00000000000..9525f160e83
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Principal/GenericPrincipal.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.Principal.GenericPrincipal" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="GenericPrincipal(System.Security.Principal.IIdentity, System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="identity">TODO</param>

+            <param name="roles">TODO</param>

+        </constructor>

+        <property name="Identity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="IsInRole(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="role">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Principal/IIdentity.xml b/mcs/docs/apidocs/xml/en/System.Security.Principal/IIdentity.xml
new file mode 100644
index 00000000000..145d84fc399
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Principal/IIdentity.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.Principal.IIdentity" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Principal/IPrincipal.xml b/mcs/docs/apidocs/xml/en/System.Security.Principal/IPrincipal.xml
new file mode 100644
index 00000000000..f200a22c91c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Principal/IPrincipal.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.Principal.IPrincipal" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security.Principal/PrincipalPolicy.xml b/mcs/docs/apidocs/xml/en/System.Security.Principal/PrincipalPolicy.xml
new file mode 100644
index 00000000000..add9d8e8fdb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security.Principal/PrincipalPolicy.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.Principal.PrincipalPolicy" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/CodeAccessPermission.xml b/mcs/docs/apidocs/xml/en/System.Security/CodeAccessPermission.xml
new file mode 100644
index 00000000000..78cae7a757b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/CodeAccessPermission.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.CodeAccessPermission" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="PermitOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Deny">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Assert">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elem">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Union(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="other">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSubsetOf(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Intersect(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Demand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/IEvidenceFactory.xml b/mcs/docs/apidocs/xml/en/System.Security/IEvidenceFactory.xml
new file mode 100644
index 00000000000..dcd67a37c75
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/IEvidenceFactory.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.IEvidenceFactory" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/IPermission.xml b/mcs/docs/apidocs/xml/en/System.Security/IPermission.xml
new file mode 100644
index 00000000000..1c46e999ed2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/IPermission.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.IPermission" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/ISecurityEncodable.xml b/mcs/docs/apidocs/xml/en/System.Security/ISecurityEncodable.xml
new file mode 100644
index 00000000000..fe467a5962c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/ISecurityEncodable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.ISecurityEncodable" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/ISecurityPolicyEncodable.xml b/mcs/docs/apidocs/xml/en/System.Security/ISecurityPolicyEncodable.xml
new file mode 100644
index 00000000000..40e3a06f3ba
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/ISecurityPolicyEncodable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.ISecurityPolicyEncodable" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/IStackWalk.xml b/mcs/docs/apidocs/xml/en/System.Security/IStackWalk.xml
new file mode 100644
index 00000000000..82361fdefe2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/IStackWalk.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Security.IStackWalk" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/NamedPermissionSet.xml b/mcs/docs/apidocs/xml/en/System.Security/NamedPermissionSet.xml
new file mode 100644
index 00000000000..1146445d9d9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/NamedPermissionSet.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.NamedPermissionSet" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NamedPermissionSet(System.String, System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="set">TODO</param>

+        </constructor>

+        <constructor name="NamedPermissionSet(System.String, System.Security.Permissions.PermissionState)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="state">TODO</param>

+        </constructor>

+        <constructor name="NamedPermissionSet(System.Security.NamedPermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="set">TODO</param>

+        </constructor>

+        <constructor name="NamedPermissionSet(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <property name="Description">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/PermissionSet.xml b/mcs/docs/apidocs/xml/en/System.Security/PermissionSet.xml
new file mode 100644
index 00000000000..705da9c6274
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/PermissionSet.xml
@@ -0,0 +1,89 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.PermissionSet" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="PermissionSet(System.Security.Permissions.PermissionState)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="state">TODO</param>

+        </constructor>

+        <constructor name="PermissionSet(System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="permSet">TODO</param>

+        </constructor>

+        <method name="PermitOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Deny">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Demand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Assert">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromXml(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="et">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Union(System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="other">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSubsetOf(System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddPermission(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="perm">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/PolicyLevelType.xml b/mcs/docs/apidocs/xml/en/System.Security/PolicyLevelType.xml
new file mode 100644
index 00000000000..41c92d3e854
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/PolicyLevelType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.PolicyLevelType" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/SecurityElement.xml b/mcs/docs/apidocs/xml/en/System.Security/SecurityElement.xml
new file mode 100644
index 00000000000..0ccd638126c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/SecurityElement.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.SecurityElement" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SecurityElement(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="tag">TODO</param>

+            <param name="text">TODO</param>

+        </constructor>

+        <constructor name="SecurityElement(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="tag">TODO</param>

+        </constructor>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Children">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Tag">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="AddAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddChild(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="child">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Attribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equal(System.Security.SecurityElement)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="other">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Escape(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsInvalidAttributeName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsInvalidAttributeValue(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsInvalidTag(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsInvalidText(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/SecurityException.xml b/mcs/docs/apidocs/xml/en/System.Security/SecurityException.xml
new file mode 100644
index 00000000000..2bbfbb3dda5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/SecurityException.xml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.SecurityException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SecurityException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="SecurityException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="SecurityException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <constructor name="SecurityException(System.String, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="type">TODO</param>

+        </constructor>

+        <constructor name="SecurityException(System.String, System.Type, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="type">TODO</param>

+            <param name="state">TODO</param>

+        </constructor>

+        <property name="PermissionState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PermissionType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/SecurityManager.xml b/mcs/docs/apidocs/xml/en/System.Security/SecurityManager.xml
new file mode 100644
index 00000000000..bcb2f2ca8b1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/SecurityManager.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.SecurityManager" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="CheckExecutionRights">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SecurityEnabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="IsGranted(System.Security.IPermission)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="perm">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LoadPolicyLevelFromFile(System.String, System.Security.PolicyLevelType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LoadPolicyLevelFromString(System.String, System.Security.PolicyLevelType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="PolicyHierarchy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ResolvePolicy(System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="evidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ResolvePolicy(System.Security.Policy.Evidence, System.Security.PermissionSet, System.Security.PermissionSet, System.Security.PermissionSet, System.Security.PermissionSet&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="evidence">TODO</param>

+            <param name="reqdPset">TODO</param>

+            <param name="optPset">TODO</param>

+            <param name="denyPset">TODO</param>

+            <param name="denied">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ResolvePolicyGroups(System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="evidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SavePolicy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="SavePolicyLevel(System.Security.Policy.PolicyLevel)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="level">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/SecurityZone.xml b/mcs/docs/apidocs/xml/en/System.Security/SecurityZone.xml
new file mode 100644
index 00000000000..435d97ae587
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/SecurityZone.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Security.SecurityZone" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/SuppressUnmanagedCodeSecurityAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security/SuppressUnmanagedCodeSecurityAttribute.xml
new file mode 100644
index 00000000000..7d2e9c2a941
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/SuppressUnmanagedCodeSecurityAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.SuppressUnmanagedCodeSecurityAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SuppressUnmanagedCodeSecurityAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/UnverifiableCodeAttribute.xml b/mcs/docs/apidocs/xml/en/System.Security/UnverifiableCodeAttribute.xml
new file mode 100644
index 00000000000..56af407c5a8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/UnverifiableCodeAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.UnverifiableCodeAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UnverifiableCodeAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/VerificationException.xml b/mcs/docs/apidocs/xml/en/System.Security/VerificationException.xml
new file mode 100644
index 00000000000..a61342f9cbc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/VerificationException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.VerificationException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="VerificationException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="VerificationException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="VerificationException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Security/XmlSyntaxException.xml b/mcs/docs/apidocs/xml/en/System.Security/XmlSyntaxException.xml
new file mode 100644
index 00000000000..234292d528e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Security/XmlSyntaxException.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Security.XmlSyntaxException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSyntaxException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="XmlSyntaxException(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="lineNumber">TODO</param>

+        </constructor>

+        <constructor name="XmlSyntaxException(System.Int32, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="lineNumber">TODO</param>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="XmlSyntaxException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="XmlSyntaxException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Capture.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Capture.xml
new file mode 100644
index 00000000000..ff181a92125
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Capture.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.RegularExpressions.Capture" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Index">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Previous">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Checkpoint">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsDefined">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/CaptureCollection.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/CaptureCollection.xml
new file mode 100644
index 00000000000..e9c6c5edb01
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/CaptureCollection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.RegularExpressions.CaptureCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/CostDelegate.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/CostDelegate.xml
new file mode 100644
index 00000000000..1a0d2903071
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/CostDelegate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Text.RegularExpressions.IntervalCollection+CostDelegate" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Group.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Group.xml
new file mode 100644
index 00000000000..b64687bda40
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Group.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.RegularExpressions.Group" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Captures">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Success">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Synchronized(System.Text.RegularExpressions.Group)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inner">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/GroupCollection.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/GroupCollection.xml
new file mode 100644
index 00000000000..291deabd7dd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/GroupCollection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.RegularExpressions.GroupCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Match.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Match.xml
new file mode 100644
index 00000000000..23c8b82f033
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Match.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.RegularExpressions.Match" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Groups">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Regex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Result(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="replacement">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Synchronized(System.Text.RegularExpressions.Match)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inner">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NextMatch">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/MatchCollection.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/MatchCollection.xml
new file mode 100644
index 00000000000..3aa2bbd8b97
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/MatchCollection.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.RegularExpressions.MatchCollection" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/MatchEvaluator.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/MatchEvaluator.xml
new file mode 100644
index 00000000000..74f3c12c364
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/MatchEvaluator.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Text.RegularExpressions.MatchEvaluator" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Regex.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Regex.xml
new file mode 100644
index 00000000000..73dcc274a37
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/Regex.xml
@@ -0,0 +1,291 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.RegularExpressions.Regex" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Regex(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="pattern">TODO</param>

+        </constructor>

+        <constructor name="Regex(System.String, System.Text.RegularExpressions.RegexOptions)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="pattern">TODO</param>

+            <param name="options">TODO</param>

+        </constructor>

+        <property name="Options">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RightToLeft">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GroupCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompileToAssembly(System.Text.RegularExpressions.RegexCompilationInfo[], System.Reflection.AssemblyName)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="regexes">TODO</param>

+            <param name="aname">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompileToAssembly(System.Text.RegularExpressions.RegexCompilationInfo[], System.Reflection.AssemblyName, System.Reflection.Emit.CustomAttributeBuilder[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="regexes">TODO</param>

+            <param name="aname">TODO</param>

+            <param name="attribs">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompileToAssembly(System.Text.RegularExpressions.RegexCompilationInfo[], System.Reflection.AssemblyName, System.Reflection.Emit.CustomAttributeBuilder[], System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="regexes">TODO</param>

+            <param name="aname">TODO</param>

+            <param name="attribs">TODO</param>

+            <param name="resourceFile">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Escape(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Unescape(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsMatch(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="pattern">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Match(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="pattern">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Match(System.String, System.String, System.Text.RegularExpressions.RegexOptions)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="pattern">TODO</param>

+            <param name="options">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.String, System.Text.RegularExpressions.MatchEvaluator)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="pattern">TODO</param>

+            <param name="evaluator">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.String, System.Text.RegularExpressions.MatchEvaluator, System.Text.RegularExpressions.RegexOptions)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="pattern">TODO</param>

+            <param name="evaluator">TODO</param>

+            <param name="options">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="pattern">TODO</param>

+            <param name="replacement">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.String, System.String, System.Text.RegularExpressions.RegexOptions)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="pattern">TODO</param>

+            <param name="replacement">TODO</param>

+            <param name="options">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Split(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="pattern">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Split(System.String, System.String, System.Text.RegularExpressions.RegexOptions)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="pattern">TODO</param>

+            <param name="options">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetGroupNames">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetGroupNumbers">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GroupNameFromNumber(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="i">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GroupNumberFromName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsMatch(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsMatch(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="startat">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Match(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Match(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="startat">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Match(System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="startat">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Matches(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Matches(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="startat">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.Text.RegularExpressions.MatchEvaluator)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="evaluator">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.Text.RegularExpressions.MatchEvaluator, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="evaluator">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.Text.RegularExpressions.MatchEvaluator, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="evaluator">TODO</param>

+            <param name="count">TODO</param>

+            <param name="startat">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="replacement">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="replacement">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="replacement">TODO</param>

+            <param name="count">TODO</param>

+            <param name="startat">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Split(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Split(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Split(System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="count">TODO</param>

+            <param name="startat">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/RegexCollectionBase.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/RegexCollectionBase.xml
new file mode 100644
index 00000000000..b9a8d90c386
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/RegexCollectionBase.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.RegularExpressions.RegexCollectionBase" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/RegexCompilationInfo.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/RegexCompilationInfo.xml
new file mode 100644
index 00000000000..70d435212e0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/RegexCompilationInfo.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.RegularExpressions.RegexCompilationInfo" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RegexCompilationInfo(System.String, System.Text.RegularExpressions.RegexOptions, System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="pattern">TODO</param>

+            <param name="options">TODO</param>

+            <param name="name">TODO</param>

+            <param name="full_namespace">TODO</param>

+            <param name="is_public">TODO</param>

+        </constructor>

+        <property name="IsPublic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Options">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Pattern">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/RegexOptions.xml b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/RegexOptions.xml
new file mode 100644
index 00000000000..c1501e1b2a8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text.RegularExpressions/RegexOptions.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Text.RegularExpressions.RegexOptions" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text/ASCIIEncoding.xml b/mcs/docs/apidocs/xml/en/System.Text/ASCIIEncoding.xml
new file mode 100644
index 00000000000..9cf9c7dec81
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text/ASCIIEncoding.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.ASCIIEncoding" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ASCIIEncoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GetString(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <param name="byteIndex">TODO</param>

+            <param name="byteCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetString(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMaxCharCount(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="byteCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMaxByteCount(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="charCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetChars(System.Byte[], System.Int32, System.Int32, System.Char[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <param name="byteIndex">TODO</param>

+            <param name="byteCount">TODO</param>

+            <param name="chars">TODO</param>

+            <param name="charIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCharCount(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCharCount(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.String, System.Int32, System.Int32, System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <param name="charIndex">TODO</param>

+            <param name="charCount">TODO</param>

+            <param name="bytes">TODO</param>

+            <param name="byteIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Char[], System.Int32, System.Int32, System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <param name="charIndex">TODO</param>

+            <param name="charCount">TODO</param>

+            <param name="bytes">TODO</param>

+            <param name="byteIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetByteCount(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetByteCount(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetByteCount(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text/Decoder.xml b/mcs/docs/apidocs/xml/en/System.Text/Decoder.xml
new file mode 100644
index 00000000000..000fc7223e4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text/Decoder.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.Decoder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="GetChars(System.Byte[], System.Int32, System.Int32, System.Char[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <param name="byteIndex">TODO</param>

+            <param name="byteCount">TODO</param>

+            <param name="chars">TODO</param>

+            <param name="charIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCharCount(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text/Encoder.xml b/mcs/docs/apidocs/xml/en/System.Text/Encoder.xml
new file mode 100644
index 00000000000..46903b52236
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text/Encoder.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.Encoder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="GetBytes(System.Char[], System.Int32, System.Int32, System.Byte[], System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <param name="charIndex">TODO</param>

+            <param name="charCount">TODO</param>

+            <param name="bytes">TODO</param>

+            <param name="byteIndex">TODO</param>

+            <param name="flush">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetByteCount(System.Char[], System.Int32, System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <param name="flush">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text/Encoding.xml b/mcs/docs/apidocs/xml/en/System.Text/Encoding.xml
new file mode 100644
index 00000000000..0b8f9263d96
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text/Encoding.xml
@@ -0,0 +1,268 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.Encoding" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Unicode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UTF7">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UTF8">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ASCII">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BigEndianUnicode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BodyName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CodePage">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Default">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EncodingName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HeaderName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsBrowserDisplay">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsBrowserSave">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsMailNewsDisplay">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsMailNewsSave">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="WebName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="WindowsCodePage">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetString(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetString(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetPreamble">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMaxCharCount(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="byteCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMaxByteCount(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="charCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEncoding(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEncoding(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="codepage">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEncoder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDecoder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetChars(System.Byte[], System.Int32, System.Int32, System.Char[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <param name="byteIndex">TODO</param>

+            <param name="byteCount">TODO</param>

+            <param name="chars">TODO</param>

+            <param name="charIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetChars(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetChars(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCharCount(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCharCount(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bytes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.String, System.Int32, System.Int32, System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="charIndex">TODO</param>

+            <param name="charCount">TODO</param>

+            <param name="bytes">TODO</param>

+            <param name="byteIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Char[], System.Int32, System.Int32, System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <param name="charIndex">TODO</param>

+            <param name="charCount">TODO</param>

+            <param name="bytes">TODO</param>

+            <param name="byteIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetByteCount(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetByteCount(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetByteCount(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="chars">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Convert(System.Text.Encoding, System.Text.Encoding, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="srcEncoding">TODO</param>

+            <param name="dstEncoding">TODO</param>

+            <param name="bytes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Convert(System.Text.Encoding, System.Text.Encoding, System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="srcEncoding">TODO</param>

+            <param name="dstEncoding">TODO</param>

+            <param name="bytes">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text/StringBuilder.xml b/mcs/docs/apidocs/xml/en/System.Text/StringBuilder.xml
new file mode 100644
index 00000000000..82371ab354d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text/StringBuilder.xml
@@ -0,0 +1,412 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.StringBuilder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StringBuilder(System.String, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="length">TODO</param>

+            <param name="capacity">TODO</param>

+        </constructor>

+        <constructor name="StringBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="StringBuilder(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+        </constructor>

+        <constructor name="StringBuilder(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+            <param name="maxCapacity">TODO</param>

+        </constructor>

+        <constructor name="StringBuilder(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="StringBuilder(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="capacity">TODO</param>

+        </constructor>

+        <property name="MaxCapacity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Capacity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="startIndex">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EnsureCapacity(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="capacity">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Text.StringBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="sb">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="startIndex">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.Char, System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="oldChar">TODO</param>

+            <param name="newChar">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.Char, System.Char, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="oldChar">TODO</param>

+            <param name="newChar">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="oldValue">TODO</param>

+            <param name="newValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="oldValue">TODO</param>

+            <param name="newValue">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Char, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="repeatCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="charCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AppendFormat(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AppendFormat(System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="args">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AppendFormat(System.IFormatProvider, System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <param name="format">TODO</param>

+            <param name="args">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AppendFormat(System.String, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AppendFormat(System.String, System.Object, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <param name="arg2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="charCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text/UTF7Encoding.xml b/mcs/docs/apidocs/xml/en/System.Text/UTF7Encoding.xml
new file mode 100644
index 00000000000..61031c80d33
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text/UTF7Encoding.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.UTF7Encoding" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UTF7Encoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GetMaxCharCount(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="byteCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMaxByteCount(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="charCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text/UTF8Encoding.xml b/mcs/docs/apidocs/xml/en/System.Text/UTF8Encoding.xml
new file mode 100644
index 00000000000..503d3146f79
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text/UTF8Encoding.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.UTF8Encoding" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UTF8Encoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GetMaxCharCount(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="byteCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMaxByteCount(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="charCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Text/UnicodeEncoding.xml b/mcs/docs/apidocs/xml/en/System.Text/UnicodeEncoding.xml
new file mode 100644
index 00000000000..cff9430dfdb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Text/UnicodeEncoding.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Text.UnicodeEncoding" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UnicodeEncoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="UnicodeEncoding(System.Boolean, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bigEndian">TODO</param>

+            <param name="byteOrderMark">TODO</param>

+        </constructor>

+        <method name="GetMaxCharCount(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="byteCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMaxByteCount(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="charCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ApartmentState.xml b/mcs/docs/apidocs/xml/en/System.Threading/ApartmentState.xml
new file mode 100644
index 00000000000..86b945e7c22
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ApartmentState.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Threading.ApartmentState" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/AutoResetEvent.xml b/mcs/docs/apidocs/xml/en/System.Threading/AutoResetEvent.xml
new file mode 100644
index 00000000000..f766bc65756
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/AutoResetEvent.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.AutoResetEvent" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AutoResetEvent(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="initialState">TODO</param>

+        </constructor>

+        <method name="Set">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/IOCompletionCallback.xml b/mcs/docs/apidocs/xml/en/System.Threading/IOCompletionCallback.xml
new file mode 100644
index 00000000000..e45c2f2ead2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/IOCompletionCallback.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Threading.IOCompletionCallback" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/Interlocked.xml b/mcs/docs/apidocs/xml/en/System.Threading/Interlocked.xml
new file mode 100644
index 00000000000..ac9ac6418d4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/Interlocked.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.Interlocked" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="CompareExchange(System.Int32&amp;, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="location1">TODO</param>

+            <param name="value">TODO</param>

+            <param name="comparand">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareExchange(System.Object&amp;, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="location1">TODO</param>

+            <param name="value">TODO</param>

+            <param name="comparand">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareExchange(System.Single&amp;, System.Single, System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="location1">TODO</param>

+            <param name="value">TODO</param>

+            <param name="comparand">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Decrement(System.Int32&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="location">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Decrement(System.Int64&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="location">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Exchange(System.Int32&amp;, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="location1">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Exchange(System.Object&amp;, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="location1">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Exchange(System.Single&amp;, System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="location1">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Increment(System.Int32&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="location">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Increment(System.Int64&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="location">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/LockCookie.xml b/mcs/docs/apidocs/xml/en/System.Threading/LockCookie.xml
new file mode 100644
index 00000000000..4c890edd520
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/LockCookie.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Threading.LockCookie" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ManualResetEvent.xml b/mcs/docs/apidocs/xml/en/System.Threading/ManualResetEvent.xml
new file mode 100644
index 00000000000..f040a0a1641
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ManualResetEvent.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.ManualResetEvent" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ManualResetEvent(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="initialState">TODO</param>

+        </constructor>

+        <method name="Set">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/Monitor.xml b/mcs/docs/apidocs/xml/en/System.Threading/Monitor.xml
new file mode 100644
index 00000000000..6073e366007
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/Monitor.xml
@@ -0,0 +1,88 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.Monitor" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="Enter(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Exit(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Pulse(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="PulseAll(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TryEnter(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TryEnter(System.Object, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="millisecondsTimeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TryEnter(System.Object, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="timeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Wait(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Wait(System.Object, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="millisecondsTimeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Wait(System.Object, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="timeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Wait(System.Object, System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="millisecondsTimeout">TODO</param>

+            <param name="exitContext">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Wait(System.Object, System.TimeSpan, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <param name="timeout">TODO</param>

+            <param name="exitContext">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/Mutex.xml b/mcs/docs/apidocs/xml/en/System.Threading/Mutex.xml
new file mode 100644
index 00000000000..d9221ff3346
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/Mutex.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.Mutex" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Mutex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="Mutex(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="initiallyOwned">TODO</param>

+        </constructor>

+        <constructor name="Mutex(System.Boolean, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="initiallyOwned">TODO</param>

+            <param name="name">TODO</param>

+        </constructor>

+        <constructor name="Mutex(System.Boolean, System.String, System.Boolean&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="initiallyOwned">TODO</param>

+            <param name="name">TODO</param>

+            <param name="gotOwnership">TODO</param>

+        </constructor>

+        <method name="ReleaseMutex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/NativeOverlapped.xml b/mcs/docs/apidocs/xml/en/System.Threading/NativeOverlapped.xml
new file mode 100644
index 00000000000..fa6ddd27379
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/NativeOverlapped.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Threading.NativeOverlapped" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="EventHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="InternalHigh">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="InternalLow">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="OffsetHigh">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="OffsetLow">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/Overlapped.xml b/mcs/docs/apidocs/xml/en/System.Threading/Overlapped.xml
new file mode 100644
index 00000000000..4bf80f64f79
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/Overlapped.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.Overlapped" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Overlapped">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="Overlapped(System.Int32, System.Int32, System.Int32, System.IAsyncResult)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offsetLo">TODO</param>

+            <param name="offsetHi">TODO</param>

+            <param name="hEvent">TODO</param>

+            <param name="ar">TODO</param>

+        </constructor>

+        <property name="AsyncResult">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EventHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OffsetHigh">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OffsetLow">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Free(System.Threading.NativeOverlapped*)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nativeOverlappedPtr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Unpack(System.Threading.NativeOverlapped*)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nativeOverlappedPtr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Pack(System.Threading.IOCompletionCallback)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="iocb">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UnsafePack(System.Threading.IOCompletionCallback)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="iocb">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ReaderWriterLock.xml b/mcs/docs/apidocs/xml/en/System.Threading/ReaderWriterLock.xml
new file mode 100644
index 00000000000..c55a4aec1ca
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ReaderWriterLock.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.ReaderWriterLock" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ReaderWriterLock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="IsReaderLockHeld">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsWriterLockHeld">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="WriterSeqNum">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="AcquireReaderLock(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="millisecondsTimeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AcquireReaderLock(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="timeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AcquireWriterLock(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="millisecondsTimeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AcquireWriterLock(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="timeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AnyWritersSince(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="seqNum">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DowngradeFromWriterLock(System.Threading.LockCookie&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="lockCookie">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReleaseLock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReleaseReaderLock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReleaseWriterLock">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="RestoreLock(System.Threading.LockCookie&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="lockCookie">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UpgradeToWriterLock(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="millisecondsTimeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UpgradeToWriterLock(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="timeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/RegisteredWaitHandle.xml b/mcs/docs/apidocs/xml/en/System.Threading/RegisteredWaitHandle.xml
new file mode 100644
index 00000000000..0d5864f1d0b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/RegisteredWaitHandle.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.RegisteredWaitHandle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="Unregister(System.Threading.WaitHandle)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitObject">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/SynchronizationLockException.xml b/mcs/docs/apidocs/xml/en/System.Threading/SynchronizationLockException.xml
new file mode 100644
index 00000000000..b61c07ab162
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/SynchronizationLockException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.SynchronizationLockException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SynchronizationLockException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="SynchronizationLockException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="SynchronizationLockException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/Thread.xml b/mcs/docs/apidocs/xml/en/System.Threading/Thread.xml
new file mode 100644
index 00000000000..dcd23005007
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/Thread.xml
@@ -0,0 +1,179 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.Thread" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Thread(System.Threading.ThreadStart)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="start">TODO</param>

+        </constructor>

+        <property name="CurrentContext">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentPrincipal">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentThread">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ApartmentState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentCulture">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentUICulture">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsAlive">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsBackground">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Priority">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ThreadState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="AllocateDataSlot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AllocateNamedDataSlot(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FreeNamedDataSlot(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetData(System.LocalDataStoreSlot)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="slot">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDomain">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDomainID">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNamedDataSlot(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ResetAbort">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetData(System.LocalDataStoreSlot, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="slot">TODO</param>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sleep(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="millisecondsTimeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sleep(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="timeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Abort">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Abort(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stateInfo">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Interrupt">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Join">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Join(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="millisecondsTimeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Join(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="timeout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Resume">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Start">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Suspend">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ThreadAbortException.xml b/mcs/docs/apidocs/xml/en/System.Threading/ThreadAbortException.xml
new file mode 100644
index 00000000000..ba0c8be21a3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ThreadAbortException.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.ThreadAbortException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="ExceptionState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ThreadExceptionEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Threading/ThreadExceptionEventArgs.xml
new file mode 100644
index 00000000000..9696b298749
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ThreadExceptionEventArgs.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.ThreadExceptionEventArgs" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ThreadExceptionEventArgs(System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t">TODO</param>

+        </constructor>

+        <property name="Exception">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ThreadExceptionEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Threading/ThreadExceptionEventHandler.xml
new file mode 100644
index 00000000000..103b641714d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ThreadExceptionEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Threading.ThreadExceptionEventHandler" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ThreadInterruptedException.xml b/mcs/docs/apidocs/xml/en/System.Threading/ThreadInterruptedException.xml
new file mode 100644
index 00000000000..47bffca396d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ThreadInterruptedException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.ThreadInterruptedException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ThreadInterruptedException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ThreadInterruptedException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ThreadInterruptedException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ThreadPool.xml b/mcs/docs/apidocs/xml/en/System.Threading/ThreadPool.xml
new file mode 100644
index 00000000000..18b1ab0a88a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ThreadPool.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.ThreadPool" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="BindHandle(System.IntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="osHandle">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="QueueUserWorkItem(System.Threading.WaitCallback)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="callback">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="QueueUserWorkItem(System.Threading.WaitCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RegisterWaitForSingleObject(System.Threading.WaitHandle, System.Threading.WaitOrTimerCallback, System.Object, System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitObject">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="millisecondsTimeOutInterval">TODO</param>

+            <param name="executeOnlyOnce">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RegisterWaitForSingleObject(System.Threading.WaitHandle, System.Threading.WaitOrTimerCallback, System.Object, System.Int64, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitObject">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="millisecondsTimeOutInterval">TODO</param>

+            <param name="executeOnlyOnce">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RegisterWaitForSingleObject(System.Threading.WaitHandle, System.Threading.WaitOrTimerCallback, System.Object, System.TimeSpan, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitObject">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="timeout">TODO</param>

+            <param name="executeOnlyOnce">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RegisterWaitForSingleObject(System.Threading.WaitHandle, System.Threading.WaitOrTimerCallback, System.Object, System.UInt32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitObject">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="millisecondsTimeOutInterval">TODO</param>

+            <param name="executeOnlyOnce">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UnsafeQueueUserWorkItem(System.Threading.WaitCallback, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UnsafeRegisterWaitForSingleObject(System.Threading.WaitHandle, System.Threading.WaitOrTimerCallback, System.Object, System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitObject">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="millisecondsTimeOutInterval">TODO</param>

+            <param name="executeOnlyOnce">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UnsafeRegisterWaitForSingleObject(System.Threading.WaitHandle, System.Threading.WaitOrTimerCallback, System.Object, System.Int64, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitObject">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="millisecondsTimeOutInterval">TODO</param>

+            <param name="executeOnlyOnce">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UnsafeRegisterWaitForSingleObject(System.Threading.WaitHandle, System.Threading.WaitOrTimerCallback, System.Object, System.TimeSpan, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitObject">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="timeout">TODO</param>

+            <param name="executeOnlyOnce">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UnsafeRegisterWaitForSingleObject(System.Threading.WaitHandle, System.Threading.WaitOrTimerCallback, System.Object, System.UInt32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitObject">TODO</param>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="millisecondsTimeOutInterval">TODO</param>

+            <param name="executeOnlyOnce">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ThreadPriority.xml b/mcs/docs/apidocs/xml/en/System.Threading/ThreadPriority.xml
new file mode 100644
index 00000000000..4f33a75c6ac
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ThreadPriority.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Threading.ThreadPriority" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ThreadStart.xml b/mcs/docs/apidocs/xml/en/System.Threading/ThreadStart.xml
new file mode 100644
index 00000000000..a916cc25ddc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ThreadStart.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Threading.ThreadStart" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ThreadState.xml b/mcs/docs/apidocs/xml/en/System.Threading/ThreadState.xml
new file mode 100644
index 00000000000..b9f216ebd38
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ThreadState.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Threading.ThreadState" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/ThreadStateException.xml b/mcs/docs/apidocs/xml/en/System.Threading/ThreadStateException.xml
new file mode 100644
index 00000000000..4d77ecbc916
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/ThreadStateException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.ThreadStateException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ThreadStateException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ThreadStateException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ThreadStateException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/Timeout.xml b/mcs/docs/apidocs/xml/en/System.Threading/Timeout.xml
new file mode 100644
index 00000000000..3b3ae9ba4d7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/Timeout.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.Timeout" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Infinite">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/Timer.xml b/mcs/docs/apidocs/xml/en/System.Threading/Timer.xml
new file mode 100644
index 00000000000..066fb6487f7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/Timer.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.Timer" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Timer(System.Threading.TimerCallback, System.Object, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="dueTime">TODO</param>

+            <param name="period">TODO</param>

+        </constructor>

+        <constructor name="Timer(System.Threading.TimerCallback, System.Object, System.Int64, System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="dueTime">TODO</param>

+            <param name="period">TODO</param>

+        </constructor>

+        <constructor name="Timer(System.Threading.TimerCallback, System.Object, System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="dueTime">TODO</param>

+            <param name="period">TODO</param>

+        </constructor>

+        <constructor name="Timer(System.Threading.TimerCallback, System.Object, System.UInt32, System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="callback">TODO</param>

+            <param name="state">TODO</param>

+            <param name="dueTime">TODO</param>

+            <param name="period">TODO</param>

+        </constructor>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Change(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dueTime">TODO</param>

+            <param name="period">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Change(System.Int64, System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dueTime">TODO</param>

+            <param name="period">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Change(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dueTime">TODO</param>

+            <param name="period">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Change(System.UInt32, System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dueTime">TODO</param>

+            <param name="period">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Dispose(System.Threading.WaitHandle)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="notifyObject">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/TimerCallback.xml b/mcs/docs/apidocs/xml/en/System.Threading/TimerCallback.xml
new file mode 100644
index 00000000000..677fb5a8417
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/TimerCallback.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Threading.TimerCallback" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/WaitCallback.xml b/mcs/docs/apidocs/xml/en/System.Threading/WaitCallback.xml
new file mode 100644
index 00000000000..be00fa1081e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/WaitCallback.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Threading.WaitCallback" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/WaitHandle.xml b/mcs/docs/apidocs/xml/en/System.Threading/WaitHandle.xml
new file mode 100644
index 00000000000..43cee182318
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/WaitHandle.xml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Threading.WaitHandle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="WaitHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="WaitTimeout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Handle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitOne(System.TimeSpan, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="timeout">TODO</param>

+            <param name="exitContext">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitOne(System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="millisecondsTimeout">TODO</param>

+            <param name="exitContext">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitOne">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitAll(System.Threading.WaitHandle[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitHandles">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitAll(System.Threading.WaitHandle[], System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitHandles">TODO</param>

+            <param name="millisecondsTimeout">TODO</param>

+            <param name="exitContext">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitAll(System.Threading.WaitHandle[], System.TimeSpan, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitHandles">TODO</param>

+            <param name="timeout">TODO</param>

+            <param name="exitContext">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitAny(System.Threading.WaitHandle[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitHandles">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitAny(System.Threading.WaitHandle[], System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitHandles">TODO</param>

+            <param name="millisecondsTimeout">TODO</param>

+            <param name="exitContext">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WaitAny(System.Threading.WaitHandle[], System.TimeSpan, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="waitHandles">TODO</param>

+            <param name="timeout">TODO</param>

+            <param name="exitContext">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Threading/WaitOrTimerCallback.xml b/mcs/docs/apidocs/xml/en/System.Threading/WaitOrTimerCallback.xml
new file mode 100644
index 00000000000..29ebc232baf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Threading/WaitOrTimerCallback.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Threading.WaitOrTimerCallback" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/Cache.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/Cache.xml
new file mode 100644
index 00000000000..deb2c68d103
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/Cache.xml
@@ -0,0 +1,114 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.Caching.Cache" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Cache">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="NoAbsoluteExpiration">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="NoSlidingExpiration">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="SingletonCache">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Touch(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strKey">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String, System.Object, System.Web.Caching.CacheDependency, System.DateTime, System.TimeSpan, System.Web.Caching.CacheItemPriority, System.Web.Caching.CacheItemPriorityDecay, System.Web.Caching.CacheItemRemovedCallback)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strKey">TODO</param>

+            <param name="objItem">TODO</param>

+            <param name="objDependency">TODO</param>

+            <param name="absolutExpiration">TODO</param>

+            <param name="slidingExpiration">TODO</param>

+            <param name="enumPriority">TODO</param>

+            <param name="enumPriorityDecay">TODO</param>

+            <param name="eventRemoveCallback">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strKey">TODO</param>

+            <param name="objItem">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.String, System.Object, System.Web.Caching.CacheDependency)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strKey">TODO</param>

+            <param name="objItem">TODO</param>

+            <param name="objDependency">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.String, System.Object, System.Web.Caching.CacheDependency, System.DateTime, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strKey">TODO</param>

+            <param name="objItem">TODO</param>

+            <param name="objDependency">TODO</param>

+            <param name="absolutExpiration">TODO</param>

+            <param name="slidingExpiration">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.String, System.Object, System.Web.Caching.CacheDependency, System.DateTime, System.TimeSpan, System.Web.Caching.CacheItemPriority, System.Web.Caching.CacheItemPriorityDecay, System.Web.Caching.CacheItemRemovedCallback)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strKey">TODO</param>

+            <param name="objItem">TODO</param>

+            <param name="objDependency">TODO</param>

+            <param name="absolutExpiration">TODO</param>

+            <param name="slidingExpiration">TODO</param>

+            <param name="enumPriority">TODO</param>

+            <param name="enumPriorityDecay">TODO</param>

+            <param name="eventRemoveCallback">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strKey">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Get(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strKey">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheDependency.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheDependency.xml
new file mode 100644
index 00000000000..df5ea4b025f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheDependency.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.Caching.CacheDependency" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CacheDependencyCallback">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CacheDependencyCallback(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="filename">TODO</param>

+        </constructor>

+        <constructor name="CacheDependencyCallback(System.String[], System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="filenames">TODO</param>

+            <param name="cachekeys">TODO</param>

+        </constructor>

+        <property name="IsDisposed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasEvents">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="OnChanged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Signal">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <event name="Changed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheDependencyCallback.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheDependencyCallback.xml
new file mode 100644
index 00000000000..e30271d091f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheDependencyCallback.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.Caching.CacheDependency+CacheDependencyCallback" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheEntry.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheEntry.xml
new file mode 100644
index 00000000000..a6b5d209b5b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheEntry.xml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.Caching.CacheEntry" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Flags(System.Web.Caching.Cache, System.String, System.Object, System.Web.Caching.CacheDependency, System.Web.Caching.CacheItemRemovedCallback, System.DateTime, System.TimeSpan, System.Int64, System.Boolean, System.Web.Caching.CacheItemPriority)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objManager">TODO</param>

+            <param name="strKey">TODO</param>

+            <param name="objItem">TODO</param>

+            <param name="objDependency">TODO</param>

+            <param name="eventRemove">TODO</param>

+            <param name="dtExpires">TODO</param>

+            <param name="tsSpan">TODO</param>

+            <param name="longMinHits">TODO</param>

+            <param name="boolPublic">TODO</param>

+            <param name="enumPriority">TODO</param>

+        </constructor>

+        <property name="HasUsage">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasAbsoluteExpiration">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasSlidingExpiration">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ExpiresBucket">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ExpiresIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Expires">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SlidingExpiration">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Key">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Hits">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MinimumHits">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Priority">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="OnChanged(System.Web.Caching.CacheDependency)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objDependency">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close(System.Web.Caching.CacheItemRemovedReason)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="enumReason">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TestFlag(System.Web.Caching.CacheEntry.Flags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="oFlag">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetFlag(System.Web.Caching.CacheEntry.Flags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="oFlag">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheExpires.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheExpires.xml
new file mode 100644
index 00000000000..4d7ec30464a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheExpires.xml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.Caching.CacheExpires" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CacheExpires(System.Web.Caching.Cache)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objManager">TODO</param>

+        </constructor>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Web.Caching.CacheEntry)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objEntry">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Web.Caching.CacheEntry)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objEntry">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Update(System.Web.Caching.CacheEntry, System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objEntry">TODO</param>

+            <param name="ticksExpires">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GarbageCleanup(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="State">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemPriority.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemPriority.xml
new file mode 100644
index 00000000000..54e64a182ef
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemPriority.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.Caching.CacheItemPriority" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemPriorityDecay.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemPriorityDecay.xml
new file mode 100644
index 00000000000..aaec2241d10
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemPriorityDecay.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.Caching.CacheItemPriorityDecay" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemRemovedCallback.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemRemovedCallback.xml
new file mode 100644
index 00000000000..b98a41cafef
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemRemovedCallback.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.Caching.CacheItemRemovedCallback" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemRemovedReason.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemRemovedReason.xml
new file mode 100644
index 00000000000..1d1824bd2c1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/CacheItemRemovedReason.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.Caching.CacheItemRemovedReason" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/ExpiresBucket.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/ExpiresBucket.xml
new file mode 100644
index 00000000000..ef83f386dce
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/ExpiresBucket.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.Caching.ExpiresBucket" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ExpiresBucket(System.Byte, System.Web.Caching.Cache)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bucket">TODO</param>

+            <param name="objManager">TODO</param>

+        </constructor>

+        <property name="Size">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Add(System.Web.Caching.CacheEntry)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objEntry">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Web.Caching.CacheEntry)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objEntry">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Update(System.Web.Caching.CacheEntry, System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objEntry">TODO</param>

+            <param name="ticksExpires">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FlushExpiredItems">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/ExpiresEntry.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/ExpiresEntry.xml
new file mode 100644
index 00000000000..db235e346e7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/ExpiresEntry.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Web.Caching.ExpiresEntry" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="_objEntry">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="_ticksExpires">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="_intNext">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Caching/Flags.xml b/mcs/docs/apidocs/xml/en/System.Web.Caching/Flags.xml
new file mode 100644
index 00000000000..8122abe8e88
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Caching/Flags.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.Caching.CacheEntry+Flags" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Configuration/AuthenticationMode.xml b/mcs/docs/apidocs/xml/en/System.Web.Configuration/AuthenticationMode.xml
new file mode 100644
index 00000000000..6d5f2dc9730
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Configuration/AuthenticationMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.Configuration.AuthenticationMode" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Configuration/ClientTargetSectionHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.Configuration/ClientTargetSectionHandler.xml
new file mode 100644
index 00000000000..c5d4a62ba96
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Configuration/ClientTargetSectionHandler.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.Configuration.ClientTargetSectionHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ClientTargetSectionHandler">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="KeyAttributeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ValueAttributeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Configuration/FormsAuthPasswordFormat.xml b/mcs/docs/apidocs/xml/en/System.Web.Configuration/FormsAuthPasswordFormat.xml
new file mode 100644
index 00000000000..e4226dfcab7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Configuration/FormsAuthPasswordFormat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.Configuration.FormsAuthPasswordFormat" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Configuration/FormsProtectionEnum.xml b/mcs/docs/apidocs/xml/en/System.Web.Configuration/FormsProtectionEnum.xml
new file mode 100644
index 00000000000..a125159b178
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Configuration/FormsProtectionEnum.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.Configuration.FormsProtectionEnum" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/AdCreatedEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/AdCreatedEventArgs.xml
new file mode 100644
index 00000000000..012e1779ccc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/AdCreatedEventArgs.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.AdCreatedEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AdCreatedEventArgs(System.Collections.IDictionary)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="adProperties">TODO</param>

+        </constructor>

+        <property name="AdProperties">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AlternateText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ImageUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NavigateUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/AdCreatedEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/AdCreatedEventHandler.xml
new file mode 100644
index 00000000000..53e7c326040
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/AdCreatedEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.AdCreatedEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/AdRotator.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/AdRotator.xml
new file mode 100644
index 00000000000..73d6b28a8bd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/AdRotator.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.AdRotator" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AdRotator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AdvertisementFile">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Font">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="KeywordFilter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Target">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <event name="AdCreated">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BaseCompareValidator.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BaseCompareValidator.xml
new file mode 100644
index 00000000000..b496b8fe9eb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BaseCompareValidator.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.BaseCompareValidator" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Type">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CutoffYear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CanConvert(System.String, System.Web.UI.WebControls.ValidationDataType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BaseDataList.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BaseDataList.xml
new file mode 100644
index 00000000000..c209e508b77
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BaseDataList.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.BaseDataList" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="BaseDataList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Controls">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CellPadding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CellSpacing">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataKeyField">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataKeys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataMember">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GridLines">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HorizontalAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataKeysArray">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="DataBind">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsBindableType(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <event name="SelectedIndexChanged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BaseValidator.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BaseValidator.xml
new file mode 100644
index 00000000000..1862b9813f4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BaseValidator.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.BaseValidator" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="ControlToValidate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Display">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EnableClientScript">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Enabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ErrorMessage">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ForeColor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsValid">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PropertiesValid">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RenderUplevel">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Validate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValidationProperty(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="component">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BorderStyle.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BorderStyle.xml
new file mode 100644
index 00000000000..856bce48377
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BorderStyle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.BorderStyle" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BoundColumn.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BoundColumn.xml
new file mode 100644
index 00000000000..0cf960afc99
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/BoundColumn.xml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.BoundColumn" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="BoundColumn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="thisExpr">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="DataField">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataFormatString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InitializeCell(System.Web.UI.WebControls.TableCell, System.Int32, System.Web.UI.WebControls.ListItemType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cell">TODO</param>

+            <param name="columnIndex">TODO</param>

+            <param name="itemType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Initialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Button.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Button.xml
new file mode 100644
index 00000000000..a8f71a6fdf9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Button.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.Button" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Button">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="CausesValidation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CommandArgument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <event name="Click">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="Command">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ButtonColumn.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ButtonColumn.xml
new file mode 100644
index 00000000000..2cc6c5a0019
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ButtonColumn.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.ButtonColumn" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ButtonColumn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ButtonType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataTextField">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataTextFormatString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InitializeCell(System.Web.UI.WebControls.TableCell, System.Int32, System.Web.UI.WebControls.ListItemType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cell">TODO</param>

+            <param name="columnIndex">TODO</param>

+            <param name="itemType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Initialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ButtonColumnType.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ButtonColumnType.xml
new file mode 100644
index 00000000000..c6e4916800b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ButtonColumnType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.ButtonColumnType" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Calendar.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Calendar.xml
new file mode 100644
index 00000000000..c3695b83e35
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Calendar.xml
@@ -0,0 +1,167 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.Calendar" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Calendar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="CellPadding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CellSpacing">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DayHeaderStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DayNameFormat">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DayStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FirstDayOfWeek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NextMonthText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NextPrevFormat">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NextPrevStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OtherMonthDayStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PrevMonthText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedDate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedDates">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedDayStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectionMode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectMonthText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectorStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectWeekText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShowDayHeader">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShowGridLines">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShowNextPrevMonth">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShowTitle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TitleFormat">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TitleStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TodayDayStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TodaysDate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="VisibleDate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="WeekendDayStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <event name="DayRender">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="SelectionChanged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="VisibleMonthChanged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CalendarDay.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CalendarDay.xml
new file mode 100644
index 00000000000..2c1b5095405
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CalendarDay.xml
@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.CalendarDay" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CalendarDay(System.DateTime, System.Boolean, System.Boolean, System.Boolean, System.Boolean, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="date">TODO</param>

+            <param name="isWeekend">TODO</param>

+            <param name="isToday">TODO</param>

+            <param name="isSelected">TODO</param>

+            <param name="isOtherMonth">TODO</param>

+            <param name="dayNumberText">TODO</param>

+        </constructor>

+        <property name="Date">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DayNumberText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsOtherMonth">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSelectable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSelected">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsToday">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsWeekend">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CalendarSelectionMode.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CalendarSelectionMode.xml
new file mode 100644
index 00000000000..9fb88552b82
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CalendarSelectionMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.CalendarSelectionMode" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CheckBox.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CheckBox.xml
new file mode 100644
index 00000000000..1e612307213
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CheckBox.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.CheckBox" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CheckBox">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AutoPostBack">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Checked">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SaveCheckedViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TextAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <event name="CheckedChanged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CheckBoxList.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CheckBoxList.xml
new file mode 100644
index 00000000000..51a8ae6db4d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CheckBoxList.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.CheckBoxList" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CheckBoxList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="CellPadding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CellSpacing">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatColumns">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatDirection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatLayout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TextAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CommandEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CommandEventArgs.xml
new file mode 100644
index 00000000000..2ad9335af55
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CommandEventArgs.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.CommandEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CommandEventArgs(System.Web.UI.WebControls.CommandEventArgs)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="e">TODO</param>

+        </constructor>

+        <constructor name="CommandEventArgs(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="commandName">TODO</param>

+            <param name="argument">TODO</param>

+        </constructor>

+        <property name="CommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CommandArgument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CommandEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CommandEventHandler.xml
new file mode 100644
index 00000000000..1c2a998efbe
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CommandEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.CommandEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CompareValidator.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CompareValidator.xml
new file mode 100644
index 00000000000..b5a6275291b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CompareValidator.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.CompareValidator" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CompareValidator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ControlToCompare">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Operator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ValueToCompare">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CustomValidator.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CustomValidator.xml
new file mode 100644
index 00000000000..91ef681da24
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/CustomValidator.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.CustomValidator" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CustomValidator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ClientValidationFunction">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <event name="ServerValidate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGrid.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGrid.xml
new file mode 100644
index 00000000000..9ed82c0bd92
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGrid.xml
@@ -0,0 +1,208 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataGrid" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataGrid">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="CancelCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="DeleteCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="EditCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="NextPageCommandArgument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="PageCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="PrevPageCommandArgument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SelectCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SortCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="UpdateCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="AllowCustomPaging">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AllowPaging">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AllowSorting">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AlternatingItemStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AutoGenerateColumns">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BackImageUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Columns">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentPageIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EditItemIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EditItemStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FooterStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HeaderStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PageCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PagerStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PageSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedItem">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedItemStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShowFooter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShowHeader">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="VirtualItemCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <event name="CancelCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="DeleteCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="EditCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="ItemCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="ItemCreated">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="ItemDataBound">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="PageIndexChanged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="SortCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="UpdateCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridColumn.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridColumn.xml
new file mode 100644
index 00000000000..66ba99aabd1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridColumn.xml
@@ -0,0 +1,90 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataGridColumn" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataGridColumn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="FooterStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HeaderStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FooterText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HeaderImageUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HeaderText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SortExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Visible">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DesignMode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Owner">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsTrackingViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InitializeCell(System.Web.UI.WebControls.TableCell, System.Int32, System.Web.UI.WebControls.ListItemType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cell">TODO</param>

+            <param name="columnIndex">TODO</param>

+            <param name="itemType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Initialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridColumnCollection.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridColumnCollection.xml
new file mode 100644
index 00000000000..3dd558a9ce7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridColumnCollection.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataGridColumnCollection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataGridColumnCollection(System.Web.UI.WebControls.DataGrid, System.Collections.ArrayList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="owner">TODO</param>

+            <param name="columns">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Web.UI.WebControls.DataGridColumn)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="column">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAt(System.Int32, System.Web.UI.WebControls.DataGridColumn)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="column">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Web.UI.WebControls.DataGridColumn)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="column">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Web.UI.WebControls.DataGridColumn)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="column">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridCommandEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridCommandEventArgs.xml
new file mode 100644
index 00000000000..860aade8bb9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridCommandEventArgs.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataGridCommandEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataGridCommandEventArgs(System.Web.UI.WebControls.DataGridItem, System.Object, System.Web.UI.WebControls.CommandEventArgs)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <param name="commandSource">TODO</param>

+            <param name="originalArgs">TODO</param>

+        </constructor>

+        <property name="CommandSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridCommandEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridCommandEventHandler.xml
new file mode 100644
index 00000000000..cacf0f7aa78
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridCommandEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.DataGridCommandEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItem.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItem.xml
new file mode 100644
index 00000000000..ee949082f87
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItem.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataGridItem" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataGridItem(System.Int32, System.Int32, System.Web.UI.WebControls.ListItemType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="itemIndex">TODO</param>

+            <param name="dataSetIndex">TODO</param>

+            <param name="itemType">TODO</param>

+        </constructor>

+        <property name="DataItem">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataSetIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItemCollection.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItemCollection.xml
new file mode 100644
index 00000000000..a22c4c552b9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItemCollection.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataGridItemCollection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataGridItemCollection(System.Collections.ArrayList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="items">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItemEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItemEventArgs.xml
new file mode 100644
index 00000000000..d23ea7db5e4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItemEventArgs.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataGridItemEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataGridItemEventArgs(System.Web.UI.WebControls.DataGridItem)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+        </constructor>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItemEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItemEventHandler.xml
new file mode 100644
index 00000000000..be441b64acb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridItemEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.DataGridItemEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridPageChangedEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridPageChangedEventArgs.xml
new file mode 100644
index 00000000000..112468b9e3f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridPageChangedEventArgs.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataGridPageChangedEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataGridPageChangedEventArgs(System.Object, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="commandSource">TODO</param>

+            <param name="newPageIndex">TODO</param>

+        </constructor>

+        <property name="CommandSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NewPageIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridPageChangedEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridPageChangedEventHandler.xml
new file mode 100644
index 00000000000..4d03f497d9c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridPageChangedEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.DataGridPageChangedEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridPagerStyle.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridPagerStyle.xml
new file mode 100644
index 00000000000..5e7d082c24e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridPagerStyle.xml
@@ -0,0 +1,55 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataGridPagerStyle" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Mode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NextPageText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PrevPageText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PageButtonCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Position">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Visible">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MergeWith(System.Web.UI.WebControls.Style)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyFrom(System.Web.UI.WebControls.Style)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridSortCommandEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridSortCommandEventArgs.xml
new file mode 100644
index 00000000000..f9afd9a5c9e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridSortCommandEventArgs.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataGridSortCommandEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataGridSortCommandEventArgs(System.Object, System.Web.UI.WebControls.DataGridCommandEventArgs)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="commandSource">TODO</param>

+            <param name="dce">TODO</param>

+        </constructor>

+        <property name="CommandSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SortExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridSortCommandEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridSortCommandEventHandler.xml
new file mode 100644
index 00000000000..5acd31112c7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataGridSortCommandEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.DataGridSortCommandEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataKeyCollection.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataKeyCollection.xml
new file mode 100644
index 00000000000..eebf56fb108
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataKeyCollection.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataKeyCollection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataKeyCollection(System.Collections.ArrayList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="keys">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataList.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataList.xml
new file mode 100644
index 00000000000..9f56e3af5c4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataList.xml
@@ -0,0 +1,197 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataList" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="CancelCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="DeleteCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="EditCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SelectCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="UpdateCommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="AlternatingItemStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AlternatingItemTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EditItemIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EditItemStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EditItemTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ExtractTemplateRows">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FooterStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FooterTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GridLines">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HeaderStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HeaderTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatColumns">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatDirection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatLayout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedItem">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedItemStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedItemTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SeparatorStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SeparatorTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SeparatorItemTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShowHeader">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShowFooter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <event name="CancelCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="DeleteCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="EditCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="ItemCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="ItemCreated">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="ItemDataBound">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="UpdateCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListCommandEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListCommandEventArgs.xml
new file mode 100644
index 00000000000..3b01947fea0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListCommandEventArgs.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataListCommandEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataListCommandEventArgs(System.Web.UI.WebControls.DataListItem, System.Object, System.Web.UI.WebControls.CommandEventArgs)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <param name="commandSource">TODO</param>

+            <param name="originalArgs">TODO</param>

+        </constructor>

+        <property name="CommandSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListCommandEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListCommandEventHandler.xml
new file mode 100644
index 00000000000..1d8d65bce37
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListCommandEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.DataListCommandEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItem.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItem.xml
new file mode 100644
index 00000000000..fc3cb186399
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItem.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataListItem" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataListItem(System.Int32, System.Web.UI.WebControls.ListItemType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="itemIndex">TODO</param>

+            <param name="itemType">TODO</param>

+        </constructor>

+        <property name="DataItem">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="RenderItem(System.Web.UI.HtmlTextWriter, System.Boolean, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <param name="extractRows">TODO</param>

+            <param name="tableLayout">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItemCollection.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItemCollection.xml
new file mode 100644
index 00000000000..8a8cb7e83ee
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItemCollection.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataListItemCollection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataListItemCollection(System.Collections.ArrayList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="items">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItemEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItemEventArgs.xml
new file mode 100644
index 00000000000..5798d8dc566
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItemEventArgs.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DataListItemEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataListItemEventArgs(System.Web.UI.WebControls.DataListItem)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+        </constructor>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItemEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItemEventHandler.xml
new file mode 100644
index 00000000000..3fd13672382
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DataListItemEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.DataListItemEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DayNameFormat.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DayNameFormat.xml
new file mode 100644
index 00000000000..1f39d31d5c0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DayNameFormat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.DayNameFormat" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DayRenderEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DayRenderEventArgs.xml
new file mode 100644
index 00000000000..1fa1421fd57
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DayRenderEventArgs.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DayRenderEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DayRenderEventArgs(System.Web.UI.WebControls.TableCell, System.Web.UI.WebControls.CalendarDay)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cell">TODO</param>

+            <param name="day">TODO</param>

+        </constructor>

+        <property name="Cell">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Day">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DayRenderEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DayRenderEventHandler.xml
new file mode 100644
index 00000000000..f782ca24c0a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DayRenderEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.DayRenderEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DropDownList.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DropDownList.xml
new file mode 100644
index 00000000000..9caa38c4651
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/DropDownList.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.DropDownList" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DropDownList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BorderColor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BorderStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BorderWidth">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ToolTip">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/EditCommandColumn.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/EditCommandColumn.xml
new file mode 100644
index 00000000000..6606f538d48
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/EditCommandColumn.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.EditCommandColumn" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="EditCommandColumn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ButtonType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CancelText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EditText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UpdateText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InitializeCell(System.Web.UI.WebControls.TableCell, System.Int32, System.Web.UI.WebControls.ListItemType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cell">TODO</param>

+            <param name="columnIndex">TODO</param>

+            <param name="itemType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FirstDayOfWeek.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FirstDayOfWeek.xml
new file mode 100644
index 00000000000..f6f1c512d3c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FirstDayOfWeek.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.FirstDayOfWeek" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontInfo.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontInfo.xml
new file mode 100644
index 00000000000..4c4b3915f54
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontInfo.xml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.FontInfo" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Bold">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Italic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Overline">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Strikeout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Underline">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Size">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Names">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Owner">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyFrom(System.Web.UI.WebControls.FontInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="source">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MergeWith(System.Web.UI.WebControls.FontInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="with">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ShouldSerializeNames">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontNamesConverter.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontNamesConverter.xml
new file mode 100644
index 00000000000..8ad052fc23b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontNamesConverter.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.FontNamesConverter" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FontNamesConverter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="ConvertTo(System.ComponentModel.ITypeDescriptorContext, System.Globalization.CultureInfo, System.Object, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="value">TODO</param>

+            <param name="destinationType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ConvertFrom(System.ComponentModel.ITypeDescriptorContext, System.Globalization.CultureInfo, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CanConvertFrom(System.ComponentModel.ITypeDescriptorContext, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="sourceType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontSize.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontSize.xml
new file mode 100644
index 00000000000..5cef1900068
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontSize.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.FontSize" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontUnit.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontUnit.xml
new file mode 100644
index 00000000000..d9fd7f2a5d4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontUnit.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Web.UI.WebControls.FontUnit" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FontUnit(System.Web.UI.WebControls.FontSize)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+        </constructor>

+        <constructor name="FontUnit(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="FontUnit(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="FontUnit(System.Web.UI.WebControls.Unit)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="FontUnit(System.String, System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="culture">TODO</param>

+        </constructor>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Large">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Larger">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Medium">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Small">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Smaller">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="XLarge">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="XSmall">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="XXLarge">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="XXSmall">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="IsEmpty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Type">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Unit">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Point(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="n">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Equality(System.Web.UI.WebControls.FontUnit, System.Web.UI.WebControls.FontUnit)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="left">TODO</param>

+            <param name="right">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.Web.UI.WebControls.FontUnit, System.Web.UI.WebControls.FontUnit)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="left">TODO</param>

+            <param name="right">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="n">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontUnitConverter.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontUnitConverter.xml
new file mode 100644
index 00000000000..7f2e45ebe00
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/FontUnitConverter.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.FontUnitConverter" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FontUnitConverter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetStandardValues(System.ComponentModel.ITypeDescriptorContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ConvertTo(System.ComponentModel.ITypeDescriptorContext, System.Globalization.CultureInfo, System.Object, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="value">TODO</param>

+            <param name="destinationType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ConvertFrom(System.ComponentModel.ITypeDescriptorContext, System.Globalization.CultureInfo, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CanConvertFrom(System.ComponentModel.ITypeDescriptorContext, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="sourceType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/GridLines.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/GridLines.xml
new file mode 100644
index 00000000000..58baa8e165b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/GridLines.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.GridLines" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HorizontalAlign.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HorizontalAlign.xml
new file mode 100644
index 00000000000..1fa9733d61b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HorizontalAlign.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.HorizontalAlign" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HyperLink.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HyperLink.xml
new file mode 100644
index 00000000000..1eb59990035
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HyperLink.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.HyperLink" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="HyperLink">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ImageUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NavigateUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Target">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HyperLinkColumn.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HyperLinkColumn.xml
new file mode 100644
index 00000000000..e71995dc55d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HyperLinkColumn.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.HyperLinkColumn" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="HyperLinkColumn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="DataNavigateUrlField">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataNavigateUrlFormatString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataTextField">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataTextFormatString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NavigateUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Target">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InitializeCell(System.Web.UI.WebControls.TableCell, System.Int32, System.Web.UI.WebControls.ListItemType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cell">TODO</param>

+            <param name="columnIndex">TODO</param>

+            <param name="itemType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Initialize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HyperLinkControlBuilder.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HyperLinkControlBuilder.xml
new file mode 100644
index 00000000000..2999f2d7b28
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/HyperLinkControlBuilder.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.HyperLinkControlBuilder" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="HyperLinkControlBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="AllowWhitespaceLiterals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/IRepeatInfoUser.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/IRepeatInfoUser.xml
new file mode 100644
index 00000000000..25fa2633699
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/IRepeatInfoUser.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.WebControls.IRepeatInfoUser" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Image.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Image.xml
new file mode 100644
index 00000000000..71f8ccf52d5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Image.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.Image" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Image">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AlternateText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Enabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Font">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ImageAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ImageUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ImageAlign.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ImageAlign.xml
new file mode 100644
index 00000000000..6482c1bfc58
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ImageAlign.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.ImageAlign" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ImageButton.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ImageButton.xml
new file mode 100644
index 00000000000..71a6196222a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ImageButton.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.ImageButton" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ImageButton">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="CausesValidation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CommandArgument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TagKey">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <event name="Click">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="Command">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Label.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Label.xml
new file mode 100644
index 00000000000..7a1a74c46f7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Label.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.Label" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Label">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LabelControlBuilder.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LabelControlBuilder.xml
new file mode 100644
index 00000000000..44c93a55267
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LabelControlBuilder.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.LabelControlBuilder" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="LabelControlBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="AllowWhitespaceLiterals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LinkButton.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LinkButton.xml
new file mode 100644
index 00000000000..04f143a5894
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LinkButton.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.LinkButton" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="LinkButton">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="CausesValidation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CommandArgument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CommandName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <event name="Click">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="Command">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LinkButtonControlBuilder.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LinkButtonControlBuilder.xml
new file mode 100644
index 00000000000..13d87cc1b8b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LinkButtonControlBuilder.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.LinkButtonControlBuilder" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="LinkButtonControlBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="AllowWhitespaceLiterals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListBox.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListBox.xml
new file mode 100644
index 00000000000..8b6e0c4eacd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListBox.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.ListBox" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ListBox">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BorderColor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BorderStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BorderWidth">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Rows">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectionMode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ToolTip">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListControl.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListControl.xml
new file mode 100644
index 00000000000..68082d44820
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListControl.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.ListControl" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ListControl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AutoPostBack">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataMember">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataTextField">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataTextFormatString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataValueField">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedItem">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SelectedIndices">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SaveSelectedIndicesViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ClearSelection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <event name="SelectedIndexChanged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItem.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItem.xml
new file mode 100644
index 00000000000..a13df37e66d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItem.xml
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.ListItem" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ListItem(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="ListItem(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+        </constructor>

+        <constructor name="ListItem">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Selected">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Dirty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsTrackingViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="FromString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItemCollection.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItemCollection.xml
new file mode 100644
index 00000000000..da2774dcd51
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItemCollection.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.ListItemCollection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ListItemCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Capacity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Web.UI.WebControls.ListItem)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.Web.UI.WebControls.ListItem[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="items">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Web.UI.WebControls.ListItem)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FindByText(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FindByValue(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Web.UI.WebControls.ListItem)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Web.UI.WebControls.ListItem)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Web.UI.WebControls.ListItem)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItemControlBuilder.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItemControlBuilder.xml
new file mode 100644
index 00000000000..5b1027ef790
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItemControlBuilder.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.ListItemControlBuilder" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ListItemControlBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="HtmlDecodeLiterals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AllowWhitespaceLiterals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItemType.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItemType.xml
new file mode 100644
index 00000000000..8382b3c0738
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListItemType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.ListItemType" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListSelectionMode.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListSelectionMode.xml
new file mode 100644
index 00000000000..bf46ca30284
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ListSelectionMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.ListSelectionMode" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Literal.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Literal.xml
new file mode 100644
index 00000000000..74bb0c4f226
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Literal.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.Literal" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Literal">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LiteralControlBuilder.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LiteralControlBuilder.xml
new file mode 100644
index 00000000000..2088f45dabb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/LiteralControlBuilder.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.LiteralControlBuilder" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="LiteralControlBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="AppendSubBuilder(System.Web.UI.ControlBuilder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="subBuilder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AllowWhitespaceLiterals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/MonthChangedEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/MonthChangedEventArgs.xml
new file mode 100644
index 00000000000..51f3fb2269e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/MonthChangedEventArgs.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.MonthChangedEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MonthChangedEventArgs(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newDate">TODO</param>

+            <param name="previousDate">TODO</param>

+        </constructor>

+        <property name="NewDate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PreviousDate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/MonthChangedEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/MonthChangedEventHandler.xml
new file mode 100644
index 00000000000..62939c7efaa
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/MonthChangedEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.MonthChangedEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/NextPrevFormat.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/NextPrevFormat.xml
new file mode 100644
index 00000000000..b710a1c2074
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/NextPrevFormat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.NextPrevFormat" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PagedDataSource.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PagedDataSource.xml
new file mode 100644
index 00000000000..d65603c64cb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PagedDataSource.xml
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.PagedDataSource" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="PagedDataSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AllowCustomPaging">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AllowPaging">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentPageIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataSourceCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FirstIndexInPage">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsCustomPagingEnabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFirstPage">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsLastPage">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsPagingEnabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PageCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PageSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="VirtualCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetItemProperties(System.ComponentModel.PropertyDescriptor[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="listAccessors">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetListName(System.ComponentModel.PropertyDescriptor[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="listAccessors">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PagerMode.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PagerMode.xml
new file mode 100644
index 00000000000..5924b8703ee
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PagerMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.PagerMode" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PagerPosition.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PagerPosition.xml
new file mode 100644
index 00000000000..f7de2c87434
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PagerPosition.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.PagerPosition" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Panel.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Panel.xml
new file mode 100644
index 00000000000..d44b366aae9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Panel.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.Panel" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Panel">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BackImageUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HorizontalAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Wrap">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PlaceHolder.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PlaceHolder.xml
new file mode 100644
index 00000000000..265c249c755
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PlaceHolder.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.PlaceHolder" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="PlaceHolder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PlaceHolderControlBuilder.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PlaceHolderControlBuilder.xml
new file mode 100644
index 00000000000..19b91fdb1d1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/PlaceHolderControlBuilder.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.PlaceHolderControlBuilder" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="PlaceHolderControlBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="AllowWhitespaceLiterals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RadioButton.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RadioButton.xml
new file mode 100644
index 00000000000..e9a85763de1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RadioButton.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.RadioButton" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RadioButton">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="GroupName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UniqueGroupNamePrivate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ValueAttributePrivate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RadioButtonList.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RadioButtonList.xml
new file mode 100644
index 00000000000..084c16f5d07
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RadioButtonList.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.RadioButtonList" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RadioButtonList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="CellPadding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CellSpacing">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatColumns">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatDirection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatLayout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TextAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RangeValidator.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RangeValidator.xml
new file mode 100644
index 00000000000..a0a18ba3167
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RangeValidator.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.RangeValidator" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RangeValidator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="MaximumValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MinimumValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RegularExpressionValidator.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RegularExpressionValidator.xml
new file mode 100644
index 00000000000..62ef297b9dc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RegularExpressionValidator.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.RegularExpressionValidator" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RegularExpressionValidator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ValidationExpression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeatDirection.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeatDirection.xml
new file mode 100644
index 00000000000..085919ea6e4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeatDirection.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.RepeatDirection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeatInfo.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeatInfo.xml
new file mode 100644
index 00000000000..5358d08e881
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeatInfo.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.RepeatInfo" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RepeatInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="OuterTableImplied">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatColumns">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatDirection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RepeatLayout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="RenderRepeater(System.Web.UI.HtmlTextWriter, System.Web.UI.WebControls.IRepeatInfoUser, System.Web.UI.WebControls.Style, System.Web.UI.WebControls.WebControl)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <param name="user">TODO</param>

+            <param name="controlStyle">TODO</param>

+            <param name="baseControl">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeatLayout.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeatLayout.xml
new file mode 100644
index 00000000000..a6a6bb35a97
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeatLayout.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.RepeatLayout" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Repeater.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Repeater.xml
new file mode 100644
index 00000000000..9c59361e3e8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Repeater.xml
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.Repeater" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Repeater">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AlternatingItemTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Controls">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataMember">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DataSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FooterTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HeaderTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SeparatorTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="DataBind">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <event name="ItemCommand">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="ItemCreated">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="ItemDataBound">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterCommandEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterCommandEventArgs.xml
new file mode 100644
index 00000000000..a12980be588
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterCommandEventArgs.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.RepeaterCommandEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RepeaterCommandEventArgs(System.Web.UI.WebControls.RepeaterItem, System.Object, System.Web.UI.WebControls.CommandEventArgs)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <param name="commandSource">TODO</param>

+            <param name="originalArgs">TODO</param>

+        </constructor>

+        <property name="CommandSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterCommandEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterCommandEventHandler.xml
new file mode 100644
index 00000000000..93511d98951
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterCommandEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.RepeaterCommandEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItem.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItem.xml
new file mode 100644
index 00000000000..2e65dded93c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItem.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.RepeaterItem" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RepeaterItem(System.Int32, System.Web.UI.WebControls.ListItemType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="itemIndex">TODO</param>

+            <param name="itemType">TODO</param>

+        </constructor>

+        <property name="DataItem">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItemCollection.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItemCollection.xml
new file mode 100644
index 00000000000..f1ee3d0d605
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItemCollection.xml
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.RepeaterItemCollection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RepeaterItemCollection(System.Collections.ArrayList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="items">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItemEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItemEventArgs.xml
new file mode 100644
index 00000000000..2d16ae80510
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItemEventArgs.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.RepeaterItemEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RepeaterItemEventArgs(System.Web.UI.WebControls.RepeaterItem)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+        </constructor>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItemEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItemEventHandler.xml
new file mode 100644
index 00000000000..699cba83b44
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RepeaterItemEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.RepeaterItemEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RequiredFieldValidator.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RequiredFieldValidator.xml
new file mode 100644
index 00000000000..68ed9a3fe34
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/RequiredFieldValidator.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.RequiredFieldValidator" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RequiredFieldValidator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="InitialValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/SelectedDatesCollection.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/SelectedDatesCollection.xml
new file mode 100644
index 00000000000..c3cfeb1795a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/SelectedDatesCollection.xml
@@ -0,0 +1,80 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.SelectedDatesCollection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SelectedDatesCollection(System.Collections.ArrayList)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dateList">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="date">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="date">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="date">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SelectRange(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fromDate">TODO</param>

+            <param name="toDate">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ServerValidateEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ServerValidateEventArgs.xml
new file mode 100644
index 00000000000..7090ac1b1af
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ServerValidateEventArgs.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.ServerValidateEventArgs" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ServerValidateEventArgs(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="isValid">TODO</param>

+        </constructor>

+        <property name="IsValid">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ServerValidateEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ServerValidateEventHandler.xml
new file mode 100644
index 00000000000..d2b2250bb26
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ServerValidateEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.WebControls.ServerValidateEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Style.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Style.xml
new file mode 100644
index 00000000000..a6026260f02
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Style.xml
@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.Style" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Style">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="Style(System.Web.UI.StateBag)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bag">TODO</param>

+        </constructor>

+        <property name="ViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BackColor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BorderColor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BorderStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BorderWidth">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CssClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ForeColor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Height">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Width">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Font">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsEmpty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsTrackingViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MergeWith(System.Web.UI.WebControls.Style)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="with">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyFrom(System.Web.UI.WebControls.Style)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="source">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAttributesToRender(System.Web.UI.HtmlTextWriter, System.Web.UI.WebControls.WebControl)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <param name="owner">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAttributesToRender(System.Web.UI.HtmlTextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Table.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Table.xml
new file mode 100644
index 00000000000..34edf1058c6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Table.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.Table" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Table">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BackImageUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CellPadding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CellSpacing">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GridLines">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HorizontalAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Rows">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableCell.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableCell.xml
new file mode 100644
index 00000000000..1a4cda11393
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableCell.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TableCell" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TableCell">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ColumnSpan">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RowSpan">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HorizontalAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="VerticalAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Wrap">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableCellCollection.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableCellCollection.xml
new file mode 100644
index 00000000000..761d44c229c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableCellCollection.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TableCellCollection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Web.UI.WebControls.TableCell)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cell">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAt(System.Int32, System.Web.UI.WebControls.TableCell)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="cell">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.Web.UI.WebControls.TableCell[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cells">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCellIndex(System.Web.UI.WebControls.TableCell)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cell">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Web.UI.WebControls.TableCell)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cell">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableCellControlBuilder.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableCellControlBuilder.xml
new file mode 100644
index 00000000000..a0b244c39a7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableCellControlBuilder.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TableCellControlBuilder" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TableCellControlBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="AllowWhitespaceLiterals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableHeaderCell.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableHeaderCell.xml
new file mode 100644
index 00000000000..f28dfdec4ee
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableHeaderCell.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TableHeaderCell" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TableHeaderCell">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableItemStyle.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableItemStyle.xml
new file mode 100644
index 00000000000..b302c502c74
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableItemStyle.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TableItemStyle" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TableItemStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="TableItemStyle(System.Web.UI.StateBag)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bag">TODO</param>

+        </constructor>

+        <property name="HorizontalAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="VerticalAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Wrap">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MergeWith(System.Web.UI.WebControls.Style)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyFrom(System.Web.UI.WebControls.Style)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAttributesToRender(System.Web.UI.HtmlTextWriter, System.Web.UI.WebControls.WebControl)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <param name="owner">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableRow.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableRow.xml
new file mode 100644
index 00000000000..7934db63bb6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableRow.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TableRow" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TableRow">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Cells">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HorizontalAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="VerticalAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableRowCollection.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableRowCollection.xml
new file mode 100644
index 00000000000..40125de0f5f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableRowCollection.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TableRowCollection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Web.UI.WebControls.TableRow)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="row">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAt(System.Int32, System.Web.UI.WebControls.TableRow)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="row">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddRange(System.Web.UI.WebControls.TableRow[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rows">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetRowIndex(System.Web.UI.WebControls.TableRow)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="row">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Web.UI.WebControls.TableRow)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="row">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableStyle.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableStyle.xml
new file mode 100644
index 00000000000..6b88020e958
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TableStyle.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TableStyle" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TableStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="TableStyle(System.Web.UI.StateBag)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bag">TODO</param>

+        </constructor>

+        <property name="BackImageUrl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CellPadding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CellSpacing">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GridLines">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HorizontalAlign">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MergeWith(System.Web.UI.WebControls.Style)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyFrom(System.Web.UI.WebControls.Style)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAttributesToRender(System.Web.UI.HtmlTextWriter, System.Web.UI.WebControls.WebControl)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <param name="owner">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TargetConverter.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TargetConverter.xml
new file mode 100644
index 00000000000..e1af0f07093
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TargetConverter.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TargetConverter" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TargetConverter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetStandardValues(System.ComponentModel.ITypeDescriptorContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TemplateColumn.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TemplateColumn.xml
new file mode 100644
index 00000000000..1a759c5108b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TemplateColumn.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TemplateColumn" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TemplateColumn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="EditItemTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FooterTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HeaderTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemTemplate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InitializeCell(System.Web.UI.WebControls.TableCell, System.Int32, System.Web.UI.WebControls.ListItemType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cell">TODO</param>

+            <param name="columnIndex">TODO</param>

+            <param name="itemType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextAlign.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextAlign.xml
new file mode 100644
index 00000000000..9d974b4527b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextAlign.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.TextAlign" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextBox.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextBox.xml
new file mode 100644
index 00000000000..3c396c9ee48
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextBox.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TextBox" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TextBox">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AutoPostBack">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Columns">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MaxLength">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Rows">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TextMode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Wrap">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TagKey">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <event name="TextChanged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextBoxControlBuilder.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextBoxControlBuilder.xml
new file mode 100644
index 00000000000..fe14b700460
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextBoxControlBuilder.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.TextBoxControlBuilder" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TextBoxControlBuilder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="HtmlDecodeLiterals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AllowWhitespaceLiterals">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextBoxMode.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextBoxMode.xml
new file mode 100644
index 00000000000..78d879f9748
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TextBoxMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.TextBoxMode" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TitleFormat.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TitleFormat.xml
new file mode 100644
index 00000000000..2a0d32e23e0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/TitleFormat.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.TitleFormat" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Unit.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Unit.xml
new file mode 100644
index 00000000000..28294efe9ea
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Unit.xml
@@ -0,0 +1,127 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Web.UI.WebControls.Unit" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Unit(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="Unit(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="Unit(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="Unit(System.Double, System.Web.UI.WebControls.UnitType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="type">TODO</param>

+        </constructor>

+        <constructor name="Unit(System.String, System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="culture">TODO</param>

+        </constructor>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="IsEmpty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Type">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Percentage(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="n">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Pixel(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="n">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Point(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="n">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Equality(System.Web.UI.WebControls.Unit, System.Web.UI.WebControls.Unit)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="left">TODO</param>

+            <param name="right">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.Web.UI.WebControls.Unit, System.Web.UI.WebControls.Unit)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="left">TODO</param>

+            <param name="right">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="n">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/UnitConverter.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/UnitConverter.xml
new file mode 100644
index 00000000000..6a97eb416da
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/UnitConverter.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.UnitConverter" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UnitConverter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="ConvertTo(System.ComponentModel.ITypeDescriptorContext, System.Globalization.CultureInfo, System.Object, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="value">TODO</param>

+            <param name="destinationType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ConvertFrom(System.ComponentModel.ITypeDescriptorContext, System.Globalization.CultureInfo, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CanConvertFrom(System.ComponentModel.ITypeDescriptorContext, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="sourceType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/UnitType.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/UnitType.xml
new file mode 100644
index 00000000000..827bc30c564
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/UnitType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.UnitType" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidatedControlConverter.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidatedControlConverter.xml
new file mode 100644
index 00000000000..b4141cd470a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidatedControlConverter.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.ValidatedControlConverter" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ValidatedControlConverter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="GetStandardValuesSupported(System.ComponentModel.ITypeDescriptorContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetStandardValuesExclusive(System.ComponentModel.ITypeDescriptorContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetStandardValues(System.ComponentModel.ITypeDescriptorContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationCompareOperator.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationCompareOperator.xml
new file mode 100644
index 00000000000..37f8ccffd84
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationCompareOperator.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.ValidationCompareOperator" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationDataType.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationDataType.xml
new file mode 100644
index 00000000000..af6cb6b1eed
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationDataType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.ValidationDataType" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationSummary.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationSummary.xml
new file mode 100644
index 00000000000..5f41b3e3cf5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationSummary.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.ValidationSummary" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ValidationSummary">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="DisplayMode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EnableClientScript">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ForeColor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShowMessageBox">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShowSummary">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HeaderText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationSummaryDisplayMode.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationSummaryDisplayMode.xml
new file mode 100644
index 00000000000..2c0f858c4a1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidationSummaryDisplayMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.ValidationSummaryDisplayMode" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidatorDisplay.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidatorDisplay.xml
new file mode 100644
index 00000000000..c5c0fb1b269
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/ValidatorDisplay.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.ValidatorDisplay" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/VerticalAlign.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/VerticalAlign.xml
new file mode 100644
index 00000000000..d566d156b84
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/VerticalAlign.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.WebControls.VerticalAlign" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/WebColorConverter.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/WebColorConverter.xml
new file mode 100644
index 00000000000..62641617e4e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/WebColorConverter.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.WebColorConverter" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="WebColorConverter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="ConvertTo(System.ComponentModel.ITypeDescriptorContext, System.Globalization.CultureInfo, System.Object, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="value">TODO</param>

+            <param name="destinationType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ConvertFrom(System.ComponentModel.ITypeDescriptorContext, System.Globalization.CultureInfo, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="context">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/WebControl.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/WebControl.xml
new file mode 100644
index 00000000000..46e2f9d3e92
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/WebControl.xml
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.WebControl" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="WebControl(System.Web.UI.HtmlTextWriterTag)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="tag">TODO</param>

+        </constructor>

+        <property name="AccessKey">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BackColor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BorderColor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BorderStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BorderWidth">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ControlStyle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ControlStyleCreated">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CssClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Enabled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Font">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ForeColor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Height">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Style">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TabIndex">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ToolTip">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Width">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TagKey">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TagName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="RenderEndTag(System.Web.UI.HtmlTextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RenderBeginTag(System.Web.UI.HtmlTextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ApplyStyle(System.Web.UI.WebControls.Style)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyBaseAttributes(System.Web.UI.WebControls.WebControl)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="controlSrc">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MergeStyle(System.Web.UI.WebControls.Style)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Xml.xml b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Xml.xml
new file mode 100644
index 00000000000..aff03e77704
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI.WebControls/Xml.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.WebControls.Xml" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Xml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Document">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DocumentContent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DocumentSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Transform">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TransformSource">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TransformArgumentList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/BuildMethod.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/BuildMethod.xml
new file mode 100644
index 00000000000..9f01cdea29b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/BuildMethod.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.BuildMethod" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/BuildTemplateMethod.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/BuildTemplateMethod.xml
new file mode 100644
index 00000000000..1b9162e5ccc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/BuildTemplateMethod.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.BuildTemplateMethod" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/Control.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/Control.xml
new file mode 100644
index 00000000000..1ad9759f6b6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/Control.xml
@@ -0,0 +1,171 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.Control" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Control">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ClientID">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Controls">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EnableViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ID">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NamingContainer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Page">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Parent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Site">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TemplateSourceDirectory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UniqueID">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Visible">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ChildControlsCreated">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Context">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Events">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasChildViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsTrackingViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ViewStateIgnoresCase">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Dispose">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="HasControls">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="FindControl(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="id">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DataBind">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="RenderControl(System.Web.UI.HtmlTextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ResolveUrl(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="relativeUrl">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetRenderMethodDelegate(System.Web.UI.RenderMethod)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="renderMethod">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <event name="DataBinding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="Disposed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="Init">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="Load">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="PreRender">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="Unload">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/DataBindingHandlerAttribute.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/DataBindingHandlerAttribute.xml
new file mode 100644
index 00000000000..7717da85b4b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/DataBindingHandlerAttribute.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.DataBindingHandlerAttribute" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DataBindingHandlerAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="DataBindingHandlerAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="typeName">TODO</param>

+        </constructor>

+        <constructor name="DataBindingHandlerAttribute(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+        </constructor>

+        <field name="Default">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="HandlerTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/DesignTimeParseData.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/DesignTimeParseData.xml
new file mode 100644
index 00000000000..df5d993d5ec
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/DesignTimeParseData.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.DesignTimeParseData" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DesignTimeParseData">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="InDesigner">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriter.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriter.xml
new file mode 100644
index 00000000000..95f2ca2a694
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriter.xml
@@ -0,0 +1,409 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.HtmlTextWriter" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="HtmlTextWriter(System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+        </constructor>

+        <constructor name="HtmlTextWriter(System.IO.TextWriter, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <param name="tabString">TODO</param>

+        </constructor>

+        <field name="DefaultTabString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="DoubleQuoteChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="EndTagLeftChars">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="EqualsChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="EqualsDoubleQuoteString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SelfClosingChars">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SelfClosingTagEnd">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SemicolonChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SingleQuoteChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SlashChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="SpaceChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="StyleEqualsChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TagLeftChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TagRightChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Encoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Indent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerWriter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NewLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TagKey">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TagName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteStyleAttribute(System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <param name="fEncode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStyleAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteFullBeginTag(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="tagName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteEndTag(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="tagName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteBeginTag(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="tagName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteAttribute(System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <param name="fEncode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RenderEndTag">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="RenderBeginTag(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="tagName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RenderBeginTag(System.Web.UI.HtmlTextWriterTag)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="tagKey">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddStyleAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddStyleAttribute(System.Web.UI.HtmlTextWriterStyle, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAttribute(System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <param name="fEndode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAttribute(System.Web.UI.HtmlTextWriterAttribute, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="value">TODO</param>

+            <param name="fEncode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddAttribute(System.Web.UI.HtmlTextWriterAttribute, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLineNoTabs(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriterAttribute.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriterAttribute.xml
new file mode 100644
index 00000000000..bb2ca9d4e9f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriterAttribute.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.HtmlTextWriterAttribute" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriterStyle.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriterStyle.xml
new file mode 100644
index 00000000000..203137709e8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriterStyle.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.HtmlTextWriterStyle" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriterTag.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriterTag.xml
new file mode 100644
index 00000000000..a392625cbcc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/HtmlTextWriterTag.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.HtmlTextWriterTag" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/IAttributeAccessor.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/IAttributeAccessor.xml
new file mode 100644
index 00000000000..e5b654baa73
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/IAttributeAccessor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.IAttributeAccessor" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/IDataBindingsAccessor.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/IDataBindingsAccessor.xml
new file mode 100644
index 00000000000..e1dd05c4f90
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/IDataBindingsAccessor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.IDataBindingsAccessor" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/INamingContainer.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/INamingContainer.xml
new file mode 100644
index 00000000000..f9523b4563f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/INamingContainer.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.INamingContainer" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/IParserAccessor.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/IParserAccessor.xml
new file mode 100644
index 00000000000..bea43a15a98
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/IParserAccessor.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.IParserAccessor" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/IPostBackDataHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/IPostBackDataHandler.xml
new file mode 100644
index 00000000000..f4fbb2344a5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/IPostBackDataHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.IPostBackDataHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/IPostBackEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/IPostBackEventHandler.xml
new file mode 100644
index 00000000000..6a8eb1746ba
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/IPostBackEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.IPostBackEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/IStateManager.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/IStateManager.xml
new file mode 100644
index 00000000000..82787116fdd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/IStateManager.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.IStateManager" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/ITagNameToTypeMapper.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/ITagNameToTypeMapper.xml
new file mode 100644
index 00000000000..cf4cc78ea5e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/ITagNameToTypeMapper.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.ITagNameToTypeMapper" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/ITemplate.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/ITemplate.xml
new file mode 100644
index 00000000000..b229b42f18b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/ITemplate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.ITemplate" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/IValidator.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/IValidator.xml
new file mode 100644
index 00000000000..6d17c690ac2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/IValidator.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Web.UI.IValidator" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/ImageClickEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/ImageClickEventHandler.xml
new file mode 100644
index 00000000000..eac19e160c2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/ImageClickEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.UI.ImageClickEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/LiteralControl.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/LiteralControl.xml
new file mode 100644
index 00000000000..275e1291473
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/LiteralControl.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.LiteralControl" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="LiteralControl">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="LiteralControl(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+        </constructor>

+        <property name="Text">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/OutputCacheLocation.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/OutputCacheLocation.xml
new file mode 100644
index 00000000000..eaac300ce41
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/OutputCacheLocation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.OutputCacheLocation" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/Pair.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/Pair.xml
new file mode 100644
index 00000000000..2bdb4e8a463
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/Pair.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.Pair" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Pair(System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="first">TODO</param>

+            <param name="second">TODO</param>

+        </constructor>

+        <constructor name="Pair">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="First">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Second">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/PersistenceMode.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/PersistenceMode.xml
new file mode 100644
index 00000000000..6a164cb1d23
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/PersistenceMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.UI.PersistenceMode" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/PropertyConverter.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/PropertyConverter.xml
new file mode 100644
index 00000000000..b024c9104e5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/PropertyConverter.xml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.PropertyConverter" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="EnumFromString(System.Type, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="enumType">TODO</param>

+            <param name="enumValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EnumToString(System.Type, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="enumType">TODO</param>

+            <param name="enumValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ObjectFromString(System.Type, System.Reflection.MemberInfo, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objType">TODO</param>

+            <param name="propertyInfo">TODO</param>

+            <param name="objValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/StateBag.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/StateBag.xml
new file mode 100644
index 00000000000..57f89903859
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/StateBag.xml
@@ -0,0 +1,78 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.StateBag" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StateBag(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ignoreCase">TODO</param>

+        </constructor>

+        <constructor name="StateBag">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Keys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Values">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsTrackingViewState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsItemDirty(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetItemDirty(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="dirty">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/StateItem.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/StateItem.xml
new file mode 100644
index 00000000000..01e44ddaaac
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/StateItem.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.StateItem" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="IsDirty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.UI/ToolboxDataAttribute.xml b/mcs/docs/apidocs/xml/en/System.Web.UI/ToolboxDataAttribute.xml
new file mode 100644
index 00000000000..d0ae0f2182e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.UI/ToolboxDataAttribute.xml
@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.UI.ToolboxDataAttribute" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ToolboxDataAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+        </constructor>

+        <field name="Default">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Data">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="IsDefaultAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Utils/FileAction.xml b/mcs/docs/apidocs/xml/en/System.Web.Utils/FileAction.xml
new file mode 100644
index 00000000000..085d6f56cb9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Utils/FileAction.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.Utils.FileAction" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Utils/FileChangeEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.Utils/FileChangeEventHandler.xml
new file mode 100644
index 00000000000..b255403ac43
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Utils/FileChangeEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.Utils.FileChangeEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Utils/NativeFileChangeEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web.Utils/NativeFileChangeEventHandler.xml
new file mode 100644
index 00000000000..b21ed12a57e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Utils/NativeFileChangeEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.Utils.NativeFileChangeEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Utils/WebEqualComparer.xml b/mcs/docs/apidocs/xml/en/System.Web.Utils/WebEqualComparer.xml
new file mode 100644
index 00000000000..01eef6d0228
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Utils/WebEqualComparer.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.Utils.WebEqualComparer" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="WebEqualComparer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Default">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web.Utils/WebHashCodeProvider.xml b/mcs/docs/apidocs/xml/en/System.Web.Utils/WebHashCodeProvider.xml
new file mode 100644
index 00000000000..9cc1abdd2ca
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web.Utils/WebHashCodeProvider.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.Utils.WebHashCodeProvider" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="WebHashCodeProvider">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Default">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/BeginEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web/BeginEventHandler.xml
new file mode 100644
index 00000000000..0c60b68a4ea
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/BeginEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.BeginEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/EndEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Web/EndEventHandler.xml
new file mode 100644
index 00000000000..711987b13e0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/EndEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.EndEventHandler" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/EndOfSendNotification.xml b/mcs/docs/apidocs/xml/en/System.Web/EndOfSendNotification.xml
new file mode 100644
index 00000000000..8cf577faf3a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/EndOfSendNotification.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Web.HttpWorkerRequest+EndOfSendNotification" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/HttpCacheRevalidation.xml b/mcs/docs/apidocs/xml/en/System.Web/HttpCacheRevalidation.xml
new file mode 100644
index 00000000000..967947fc262
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/HttpCacheRevalidation.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.HttpCacheRevalidation" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/HttpCacheability.xml b/mcs/docs/apidocs/xml/en/System.Web/HttpCacheability.xml
new file mode 100644
index 00000000000..b10489cef05
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/HttpCacheability.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.HttpCacheability" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/HttpCookie.xml b/mcs/docs/apidocs/xml/en/System.Web/HttpCookie.xml
new file mode 100644
index 00000000000..7bfaa9332d7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/HttpCookie.xml
@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.HttpCookie" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="HttpCookie(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <constructor name="HttpCookie(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+        </constructor>

+        <property name="Domain">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Expires">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasKeys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Path">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Secure">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Values">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/HttpCookieCollection.xml b/mcs/docs/apidocs/xml/en/System.Web/HttpCookieCollection.xml
new file mode 100644
index 00000000000..938631012d4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/HttpCookieCollection.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.HttpCookieCollection" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="HttpCookieCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AllKeys">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Add(System.Web.HttpCookie)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cookie">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dest">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetKey(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Set(System.Web.HttpCookie)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="cookie">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/HttpRuntime.xml b/mcs/docs/apidocs/xml/en/System.Web/HttpRuntime.xml
new file mode 100644
index 00000000000..5277ade0168
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/HttpRuntime.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.HttpRuntime" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="HttpRuntime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Cache">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AppDomainAppId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AppDomainAppPath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AppDomainAppVirtualPath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AppDomainId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AspInstallDirectory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BinDirectory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ClrInstallDirectory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CodegenDir">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsOnUNCShare">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MachineConfigurationDirectory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AppPathDiscovery">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ControlPrincipal">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Reflection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SensitiveInformation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnmanagedCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Unrestricted">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/HttpServerUtility.xml b/mcs/docs/apidocs/xml/en/System.Web/HttpServerUtility.xml
new file mode 100644
index 00000000000..99708dc3a92
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/HttpServerUtility.xml
@@ -0,0 +1,140 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.HttpServerUtility" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="HttpServerUtility">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="MachineName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ScriptTimeout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ClearError">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateObject(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="progID">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateObject(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateObjectFromClsid(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="clsid">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Execute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Execute(System.String, System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="writer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLastError">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="HtmlDecode(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="HtmlDecode(System.String, System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="output">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="HtmlEncode(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="HtmlEncode(System.String, System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="output">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MapPath(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Transfer(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Transfer(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <param name="preserveForm">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UrlDecode(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UrlDecode(System.String, System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="output">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UrlEncode(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UrlEncode(System.String, System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="output">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="UrlPathEncode(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/HttpValidationStatus.xml b/mcs/docs/apidocs/xml/en/System.Web/HttpValidationStatus.xml
new file mode 100644
index 00000000000..2ed1766c4b4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/HttpValidationStatus.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.HttpValidationStatus" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/HttpWorkerRequest.xml b/mcs/docs/apidocs/xml/en/System.Web/HttpWorkerRequest.xml
new file mode 100644
index 00000000000..8bf2dd0c926
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/HttpWorkerRequest.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Web.HttpWorkerRequest" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="EndOfSendNotification">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/ProcessShutdownReason.xml b/mcs/docs/apidocs/xml/en/System.Web/ProcessShutdownReason.xml
new file mode 100644
index 00000000000..75d7eb81a61
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/ProcessShutdownReason.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.ProcessShutdownReason" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/ProcessStatus.xml b/mcs/docs/apidocs/xml/en/System.Web/ProcessStatus.xml
new file mode 100644
index 00000000000..7d85fa562c0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/ProcessStatus.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.ProcessStatus" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Web/TraceMode.xml b/mcs/docs/apidocs/xml/en/System.Web/TraceMode.xml
new file mode 100644
index 00000000000..1fe58d1a5f2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Web/TraceMode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Web.TraceMode" assembly="System.Web">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/ValidationEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/ValidationEventArgs.xml
new file mode 100644
index 00000000000..0074606703b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/ValidationEventArgs.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.ValidationEventArgs" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Exception">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Severity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/ValidationEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/ValidationEventHandler.xml
new file mode 100644
index 00000000000..2406235558b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/ValidationEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Xml.Schema.ValidationEventHandler" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchema.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchema.xml
new file mode 100644
index 00000000000..48ab802eb39
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchema.xml
@@ -0,0 +1,176 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchema" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchema">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="InstanceNamespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="AttributeFormDefault">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AttributeGroups">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BlockDefault">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ElementFormDefault">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Elements">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FinalDefault">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Groups">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Id">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Includes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsCompiled">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Notations">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SchemaTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TargetNamespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnhandledAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Version">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Language">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Compile(System.Xml.Schema.ValidationEventHandler)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="validationEventHandler">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.IO.TextReader, System.Xml.Schema.ValidationEventHandler)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="reader">TODO</param>

+            <param name="validationEventHandler">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.IO.Stream, System.Xml.Schema.ValidationEventHandler)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <param name="validationEventHandler">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read(System.Xml.XmlReader, System.Xml.Schema.ValidationEventHandler)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="reader">TODO</param>

+            <param name="validationEventHandler">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.IO.Stream, System.Xml.XmlNamespaceManager)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="stream">TODO</param>

+            <param name="namespaceManager">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.IO.TextWriter, System.Xml.XmlNamespaceManager)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <param name="namespaceManager">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Xml.XmlWriter, System.Xml.XmlNamespaceManager)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <param name="namespaceManager">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAll.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAll.xml
new file mode 100644
index 00000000000..b9ed588375f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAll.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaAll" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaAll">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAnnotated.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAnnotated.xml
new file mode 100644
index 00000000000..ba8b400c76c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAnnotated.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaAnnotated" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaAnnotated">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Annotation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Id">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnhandledAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAnnotation.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAnnotation.xml
new file mode 100644
index 00000000000..4257581a80d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAnnotation.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaAnnotation" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaAnnotation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Id">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnhandledAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAny.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAny.xml
new file mode 100644
index 00000000000..e822dda3812
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAny.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaAny" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaAny">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProcessContents">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAnyAttribute.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAnyAttribute.xml
new file mode 100644
index 00000000000..ad401ea0a57
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAnyAttribute.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaAnyAttribute" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaAnyAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ProcessContents">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAppInfo.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAppInfo.xml
new file mode 100644
index 00000000000..77912b20c4b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAppInfo.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaAppInfo" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaAppInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Markup">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Source">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAttribute.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAttribute.xml
new file mode 100644
index 00000000000..c3112798ee1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAttribute.xml
@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaAttribute" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AttributeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DefaultValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FixedValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Form">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="QualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RefName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SchemaType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SchemaTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Use">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAttributeGroup.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAttributeGroup.xml
new file mode 100644
index 00000000000..71a4f94f483
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAttributeGroup.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaAttributeGroup" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaAttributeGroup">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AnyAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RedefinedAttributeGroup">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAttributeGroupRef.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAttributeGroupRef.xml
new file mode 100644
index 00000000000..3b43321dc77
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaAttributeGroupRef.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaAttributeGroupRef" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaAttributeGroupRef">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="RefName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaChoice.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaChoice.xml
new file mode 100644
index 00000000000..1bd5f6d9804
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaChoice.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaChoice" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaChoice">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaCollection.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaCollection.xml
new file mode 100644
index 00000000000..363bf38bab6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaCollection.xml
@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaCollection" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="XmlSchemaCollection(System.Xml.XmlNameTable)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nametable">TODO</param>

+        </constructor>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NameTable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Add(System.String, System.Xml.XmlReader)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ns">TODO</param>

+            <param name="reader">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ns">TODO</param>

+            <param name="uri">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Xml.Schema.XmlSchema)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="schema">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Xml.Schema.XmlSchemaCollection)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="schema">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Xml.Schema.XmlSchema)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="schema">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Xml.Schema.XmlSchema[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <event name="ValidationEventHandler">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaCollectionEnumerator.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaCollectionEnumerator.xml
new file mode 100644
index 00000000000..399a6f2be2c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaCollectionEnumerator.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaCollectionEnumerator" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Current">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="MoveNext">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexContent.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexContent.xml
new file mode 100644
index 00000000000..7d945f9a4ce
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexContent.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaComplexContent" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaComplexContent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Content">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsMixed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexContentExtension.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexContentExtension.xml
new file mode 100644
index 00000000000..710d219e57f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexContentExtension.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaComplexContentExtension" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaComplexContentExtension">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BaseTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AnyAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Particle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexContentRestriction.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexContentRestriction.xml
new file mode 100644
index 00000000000..0f717fd3e35
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexContentRestriction.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaComplexContentRestriction" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaComplexContentRestriction">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BaseTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AnyAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Particle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexType.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexType.xml
new file mode 100644
index 00000000000..2f426b78c08
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaComplexType.xml
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaComplexType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaComplexType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Block">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsAbstract">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsMixed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AnyAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ContentModel">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Particle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AttributeUses">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AttributeWildcard">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BlockResolved">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ContentType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ContentTypeParticle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContent.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContent.xml
new file mode 100644
index 00000000000..c89646367a4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContent.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaContent" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContentModel.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContentModel.xml
new file mode 100644
index 00000000000..6d5c2088765
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContentModel.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaContentModel" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Content">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContentProcessing.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContentProcessing.xml
new file mode 100644
index 00000000000..e36b7e84ad7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContentProcessing.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.Schema.XmlSchemaContentProcessing" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContentType.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContentType.xml
new file mode 100644
index 00000000000..d73d8537db5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaContentType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.Schema.XmlSchemaContentType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaDatatype.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaDatatype.xml
new file mode 100644
index 00000000000..afe65a6b627
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaDatatype.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaDatatype" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="TokenizedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ValueType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ParseValue(System.String, System.Xml.XmlNameTable, System.Xml.XmlNamespaceManager)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="nameTable">TODO</param>

+            <param name="nsmgr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaDerivationMethod.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaDerivationMethod.xml
new file mode 100644
index 00000000000..ea0df9878bb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaDerivationMethod.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.Schema.XmlSchemaDerivationMethod" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaDocumentation.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaDocumentation.xml
new file mode 100644
index 00000000000..442ecacd2d3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaDocumentation.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaDocumentation" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaDocumentation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Markup">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Source">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Language">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaElement.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaElement.xml
new file mode 100644
index 00000000000..2326615f301
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaElement.xml
@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaElement" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="IsAbstract">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Block">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DefaultValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Final">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FixedValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Form">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsNillable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RefName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SchemaTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SubstitutionGroup">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Constraints">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SchemaType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BlockResolved">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ElementType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FinalResolved">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="QualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaEnumerationFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaEnumerationFacet.xml
new file mode 100644
index 00000000000..29f758db2d0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaEnumerationFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaEnumerationFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaEnumerationFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaException.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaException.xml
new file mode 100644
index 00000000000..9ab0f104ca5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaException.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaException" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+        <property name="LineNumber">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LinePosition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SourceSchemaObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SourceUri">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaExternal.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaExternal.xml
new file mode 100644
index 00000000000..8cde2f06706
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaExternal.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaExternal" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Id">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Schema">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SchemaLocation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnhandledAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaFacet.xml
new file mode 100644
index 00000000000..dba18bd2392
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaFacet.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="IsFixed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaForm.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaForm.xml
new file mode 100644
index 00000000000..e861d5bc52e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaForm.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.Schema.XmlSchemaForm" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaFractionDigitsFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaFractionDigitsFacet.xml
new file mode 100644
index 00000000000..edecd71515b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaFractionDigitsFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaFractionDigitsFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaFractionDigitsFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaGroup.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaGroup.xml
new file mode 100644
index 00000000000..6fc3195382d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaGroup.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaGroup" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaGroup">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Particle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaGroupBase.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaGroupBase.xml
new file mode 100644
index 00000000000..0f70d69626b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaGroupBase.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaGroupBase" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaGroupRef.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaGroupRef.xml
new file mode 100644
index 00000000000..69dbedf187f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaGroupRef.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaGroupRef" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaGroupRef">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Particle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RefName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaIdentityConstraint.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaIdentityConstraint.xml
new file mode 100644
index 00000000000..45aae6a1390
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaIdentityConstraint.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaIdentityConstraint" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaIdentityConstraint">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Fields">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Selector">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="QualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaImport.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaImport.xml
new file mode 100644
index 00000000000..841a70a2580
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaImport.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaImport" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaImport">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Annotation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaInclude.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaInclude.xml
new file mode 100644
index 00000000000..0f66695a602
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaInclude.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaInclude" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaInclude">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Annotation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaKey.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaKey.xml
new file mode 100644
index 00000000000..73f63e5d1a0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaKey.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaKey" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaKey">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaKeyref.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaKeyref.xml
new file mode 100644
index 00000000000..4e36755dfe9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaKeyref.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaKeyref" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaKeyref">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Refer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaLengthFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaLengthFacet.xml
new file mode 100644
index 00000000000..5db9b6ad4f9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaLengthFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaLengthFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaLengthFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMaxExclusiveFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMaxExclusiveFacet.xml
new file mode 100644
index 00000000000..cc1b9f383d5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMaxExclusiveFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaMaxExclusiveFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaMaxExclusiveFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMaxInclusiveFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMaxInclusiveFacet.xml
new file mode 100644
index 00000000000..25cd201dad6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMaxInclusiveFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaMaxInclusiveFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaMaxInclusiveFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMaxLengthFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMaxLengthFacet.xml
new file mode 100644
index 00000000000..8d2e208b137
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMaxLengthFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaMaxLengthFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaMaxLengthFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMinExclusiveFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMinExclusiveFacet.xml
new file mode 100644
index 00000000000..7a8fddf565a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMinExclusiveFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaMinExclusiveFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaMinExclusiveFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMinInclusiveFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMinInclusiveFacet.xml
new file mode 100644
index 00000000000..f80284b88a5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMinInclusiveFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaMinInclusiveFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaMinInclusiveFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMinLengthFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMinLengthFacet.xml
new file mode 100644
index 00000000000..73368379d13
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaMinLengthFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaMinLengthFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaMinLengthFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaNotation.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaNotation.xml
new file mode 100644
index 00000000000..e955e77a00c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaNotation.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaNotation" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaNotation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Public">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="System">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaNumericFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaNumericFacet.xml
new file mode 100644
index 00000000000..bfcf3fe3869
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaNumericFacet.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaNumericFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObject.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObject.xml
new file mode 100644
index 00000000000..2ad7e630598
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObject.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaObject" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="LineNumber">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LinePosition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SourceUri">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Namespaces">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObjectCollection.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObjectCollection.xml
new file mode 100644
index 00000000000..b6e080dd061
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObjectCollection.xml
@@ -0,0 +1,65 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaObjectCollection" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaObjectCollection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="XmlSchemaObjectCollection(System.Xml.Schema.XmlSchemaObject)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="parent">TODO</param>

+        </constructor>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Add(System.Xml.Schema.XmlSchemaObject)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Contains(System.Xml.Schema.XmlSchemaObject)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Xml.Schema.XmlSchemaObject[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Xml.Schema.XmlSchemaObject)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.Xml.Schema.XmlSchemaObject)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Xml.Schema.XmlSchemaObject)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="item">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObjectEnumerator.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObjectEnumerator.xml
new file mode 100644
index 00000000000..ea55500857f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObjectEnumerator.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaObjectEnumerator" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Current">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="MoveNext">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObjectTable.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObjectTable.xml
new file mode 100644
index 00000000000..d076dab50c2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaObjectTable.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaObjectTable" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Names">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Values">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Contains(System.Xml.XmlQualifiedName)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaParticle.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaParticle.xml
new file mode 100644
index 00000000000..161c53d77a8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaParticle.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaParticle" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="MaxOccursString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MinOccursString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MaxOccurs">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MinOccurs">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaPatternFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaPatternFacet.xml
new file mode 100644
index 00000000000..8790fb09a60
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaPatternFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaPatternFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaPatternFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaRedefine.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaRedefine.xml
new file mode 100644
index 00000000000..1f4b8f58bc1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaRedefine.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaRedefine" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaRedefine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AttributeGroups">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Groups">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SchemaTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSequence.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSequence.xml
new file mode 100644
index 00000000000..4d259546431
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSequence.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaSequence" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaSequence">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Items">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleContent.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleContent.xml
new file mode 100644
index 00000000000..bd5ff0b3187
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleContent.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaSimpleContent" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaSimpleContent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Content">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleContentExtension.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleContentExtension.xml
new file mode 100644
index 00000000000..ae536b81b61
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleContentExtension.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaSimpleContentExtension" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaSimpleContentExtension">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="AnyAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleContentRestriction.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleContentRestriction.xml
new file mode 100644
index 00000000000..bd82e67b320
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleContentRestriction.xml
@@ -0,0 +1,37 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaSimpleContentRestriction" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaSimpleContentRestriction">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BaseTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AnyAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Facets">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleType.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleType.xml
new file mode 100644
index 00000000000..60cc1ba947e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleType.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaSimpleType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaSimpleType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Content">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeContent.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeContent.xml
new file mode 100644
index 00000000000..68f2d9f183e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeContent.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaSimpleTypeContent" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeList.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeList.xml
new file mode 100644
index 00000000000..75e67bfd7ce
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeList.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaSimpleTypeList" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaSimpleTypeList">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ItemType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeRestriction.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeRestriction.xml
new file mode 100644
index 00000000000..5a2bc87dd44
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeRestriction.xml
@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaSimpleTypeRestriction" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaSimpleTypeRestriction">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BaseType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Facets">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeUnion.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeUnion.xml
new file mode 100644
index 00000000000..f91d2ef02a9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaSimpleTypeUnion.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaSimpleTypeUnion" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaSimpleTypeUnion">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="BaseTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MemberTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaTotalDigitsFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaTotalDigitsFacet.xml
new file mode 100644
index 00000000000..ecb34b186fd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaTotalDigitsFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaTotalDigitsFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaTotalDigitsFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaType.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaType.xml
new file mode 100644
index 00000000000..014e95feac1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaType.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Final">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseSchemaType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Datatype">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DerivedBy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FinalResolved">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsMixed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="QualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaUnique.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaUnique.xml
new file mode 100644
index 00000000000..59e3539aae1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaUnique.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaUnique" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaUnique">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaUse.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaUse.xml
new file mode 100644
index 00000000000..a1805e5f7a7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaUse.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.Schema.XmlSchemaUse" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaWhiteSpaceFacet.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaWhiteSpaceFacet.xml
new file mode 100644
index 00000000000..deabb059f2e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaWhiteSpaceFacet.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaWhiteSpaceFacet" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaWhiteSpaceFacet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaXPath.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaXPath.xml
new file mode 100644
index 00000000000..bcf34da65d5
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSchemaXPath.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.Schema.XmlSchemaXPath" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlSchemaXPath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="XPath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSeverityType.xml b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSeverityType.xml
new file mode 100644
index 00000000000..063be488cb8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.Schema/XmlSeverityType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.Schema.XmlSeverityType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/IXPathNavigable.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/IXPathNavigable.xml
new file mode 100644
index 00000000000..0d5b2d0b9ab
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/IXPathNavigable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Xml.XPath.IXPathNavigable" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathExpression.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathExpression.xml
new file mode 100644
index 00000000000..f46f860a956
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathExpression.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XPath.XPathExpression" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Expression">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReturnType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetContext(System.Xml.XmlNamespaceManager)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nsManager">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddSort(System.Object, System.Xml.XPath.XmlSortOrder, System.Xml.XPath.XmlCaseOrder, System.String, System.Xml.XPath.XmlDataType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="expr">TODO</param>

+            <param name="order">TODO</param>

+            <param name="caseOrder">TODO</param>

+            <param name="lang">TODO</param>

+            <param name="dataType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddSort(System.Object, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="expr">TODO</param>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNamespaceScope.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNamespaceScope.xml
new file mode 100644
index 00000000000..6105b9d0179
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNamespaceScope.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XPath.XPathNamespaceScope" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNavigator.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNavigator.xml
new file mode 100644
index 00000000000..1f39dfe6572
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNavigator.xml
@@ -0,0 +1,288 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XPath.XPathNavigator" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="BaseURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasChildren">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsEmptyElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NamespaceURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NameTable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Prefix">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlLang">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SelectDescendants(System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <param name="matchSelf">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SelectDescendants(System.Xml.XPath.XPathNodeType, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="matchSelf">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SelectChildren(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SelectChildren(System.Xml.XPath.XPathNodeType)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SelectAncestors(System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <param name="matchSelf">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SelectAncestors(System.Xml.XPath.XPathNodeType, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="matchSelf">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Select(System.Xml.XPath.XPathExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="expr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Select(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xpath">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToPrevious">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToParent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToNextNamespace(System.Xml.XPath.XPathNamespaceScope)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="namespaceScope">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToNextAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToNext">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToNamespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToId(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="id">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToFirstNamespace(System.Xml.XPath.XPathNamespaceScope)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="namespaceScope">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToFirstChild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToFirstAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToFirst">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveTo(System.Xml.XPath.XPathNavigator)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="other">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Matches(System.Xml.XPath.XPathExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="expr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Matches(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xpath">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSamePosition(System.Xml.XPath.XPathNavigator)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="other">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDescendant(System.Xml.XPath.XPathNavigator)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nav">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNamespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Evaluate(System.Xml.XPath.XPathExpression, System.Xml.XPath.XPathNodeIterator)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="expr">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Evaluate(System.Xml.XPath.XPathExpression)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="expr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Evaluate(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xpath">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Compile(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xpath">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ComparePosition(System.Xml.XPath.XPathNavigator)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nav">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToFirstNamespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToNextNamespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNodeIterator.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNodeIterator.xml
new file mode 100644
index 00000000000..fd41655f363
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNodeIterator.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XPath.XPathNodeIterator" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Current">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentPosition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="MoveNext">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNodeType.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNodeType.xml
new file mode 100644
index 00000000000..da5610933d8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathNodeType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XPath.XPathNodeType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathResultType.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathResultType.xml
new file mode 100644
index 00000000000..e5658414659
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathResultType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XPath.XPathResultType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathScanner.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathScanner.xml
new file mode 100644
index 00000000000..b38ba50a98b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathScanner.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XPath.XPathScanner" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XPathScanner(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xpath">TODO</param>

+        </constructor>

+        <property name="TokenType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Scan">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathTokenType.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathTokenType.xml
new file mode 100644
index 00000000000..0fa8d8a62b8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XPathTokenType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XPath.XPathTokenType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/XmlDataType.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XmlDataType.xml
new file mode 100644
index 00000000000..6fe40fb98a9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XmlDataType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XPath.XmlDataType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml.XPath/XmlSortOrder.xml b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XmlSortOrder.xml
new file mode 100644
index 00000000000..55177785804
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml.XPath/XmlSortOrder.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XPath.XmlSortOrder" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/EntityHandling.xml b/mcs/docs/apidocs/xml/en/System.Xml/EntityHandling.xml
new file mode 100644
index 00000000000..1a0967bfb37
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/EntityHandling.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.EntityHandling" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/Formatting.xml b/mcs/docs/apidocs/xml/en/System.Xml/Formatting.xml
new file mode 100644
index 00000000000..fd67ab9c3dd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/Formatting.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.Formatting" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/IHasXmlNode.xml b/mcs/docs/apidocs/xml/en/System.Xml/IHasXmlNode.xml
new file mode 100644
index 00000000000..a9f4d27556d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/IHasXmlNode.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Xml.IHasXmlNode" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/IXmlLineInfo.xml b/mcs/docs/apidocs/xml/en/System.Xml/IXmlLineInfo.xml
new file mode 100644
index 00000000000..997b1b35bf2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/IXmlLineInfo.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.Xml.IXmlLineInfo" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/NameTable.xml b/mcs/docs/apidocs/xml/en/System.Xml/NameTable.xml
new file mode 100644
index 00000000000..961b8690629
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/NameTable.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.NameTable" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NameTable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="Get(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Get(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <param name="start">TODO</param>

+            <param name="len">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="key">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/ReadState.xml b/mcs/docs/apidocs/xml/en/System.Xml/ReadState.xml
new file mode 100644
index 00000000000..a3f356debd3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/ReadState.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.ReadState" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/ValidationType.xml b/mcs/docs/apidocs/xml/en/System.Xml/ValidationType.xml
new file mode 100644
index 00000000000..35c7c032888
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/ValidationType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.ValidationType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/WhitespaceHandling.xml b/mcs/docs/apidocs/xml/en/System.Xml/WhitespaceHandling.xml
new file mode 100644
index 00000000000..cbbc45eba63
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/WhitespaceHandling.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.WhitespaceHandling" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/WriteState.xml b/mcs/docs/apidocs/xml/en/System.Xml/WriteState.xml
new file mode 100644
index 00000000000..7805202cae9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/WriteState.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.WriteState" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlAttribute.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlAttribute.xml
new file mode 100644
index 00000000000..5ceb3a05c34
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlAttribute.xml
@@ -0,0 +1,96 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlAttribute" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="BaseURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NamespaceURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OwnerDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OwnerElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ParentNode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Prefix">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Specified">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LastLinkedChild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlAttributeCollection.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlAttributeCollection.xml
new file mode 100644
index 00000000000..332e22c8c35
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlAttributeCollection.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlAttributeCollection" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="ItemOf">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemOf">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemOf">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="RemoveAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="i">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAll">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Xml.XmlAttribute)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="node">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Prepend(System.Xml.XmlAttribute)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="node">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="InsertBefore(System.Xml.XmlAttribute, System.Xml.XmlAttribute)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newNode">TODO</param>

+            <param name="refNode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="InsertAfter(System.Xml.XmlAttribute, System.Xml.XmlAttribute)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newNode">TODO</param>

+            <param name="refNode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Append(System.Xml.XmlAttribute)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="node">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetNamedItem(System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="node">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Xml.XmlAttribute[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlCDataSection.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlCDataSection.xml
new file mode 100644
index 00000000000..515f6201dbd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlCDataSection.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlCDataSection" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlCaseOrder.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlCaseOrder.xml
new file mode 100644
index 00000000000..ab7f8ddc62a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlCaseOrder.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XmlCaseOrder" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlCharacterData.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlCharacterData.xml
new file mode 100644
index 00000000000..3de21092924
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlCharacterData.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlCharacterData" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Data">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Substring(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReplaceData(System.Int32, System.Int32, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <param name="strData">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="InsertData(System.Int32, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="strData">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DeleteData(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AppendData(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strData">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlComment.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlComment.xml
new file mode 100644
index 00000000000..b156db70c0f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlComment.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlComment" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlDeclaration.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlDeclaration.xml
new file mode 100644
index 00000000000..158b719db77
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlDeclaration.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlDeclaration" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Encoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Standalone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Version">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlDocument.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlDocument.xml
new file mode 100644
index 00000000000..0076c6c2982
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlDocument.xml
@@ -0,0 +1,353 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlDocument" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="XmlDocument(System.Xml.NameTable)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nt">TODO</param>

+        </constructor>

+        <property name="BaseURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DocumentElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DocumentType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Implementation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LastLinkedChild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NameTable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OwnerDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PreserveWhitespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlResolver">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Save(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Save(System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="writer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Save(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="filename">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Save(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="outStream">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadNode(System.Xml.XmlReader)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="reader">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LoadXml(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xml">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Xml.XmlReader)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xmlReader">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.IO.TextReader)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="txtReader">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="filename">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inStream">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ImportNode(System.Xml.XmlNode, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="node">TODO</param>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetElementsByTagName(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetElementsByTagName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetElementById(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elementId">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateXmlDeclaration(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="version">TODO</param>

+            <param name="encoding">TODO</param>

+            <param name="standalone">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateWhitespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateTextNode(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateSignificantWhitespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateProcessingInstruction(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateNode(System.Xml.XmlNodeType, System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="prefix">TODO</param>

+            <param name="name">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateNode(System.Xml.XmlNodeType, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <param name="name">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateNode(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nodeTypeString">TODO</param>

+            <param name="name">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateEntityReference(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateElement(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDocumentType(System.String, System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="publicId">TODO</param>

+            <param name="systemId">TODO</param>

+            <param name="internalSubset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDocumentFragment">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateComment(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateCDataSection(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateAttribute(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="qualifiedName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateElement(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateElement(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="qualifiedName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <event name="NodeChanged">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="NodeChanging">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="NodeInserted">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="NodeInserting">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="NodeRemoved">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="NodeRemoving">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlDocumentFragment.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlDocumentFragment.xml
new file mode 100644
index 00000000000..2bd03f6e8bc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlDocumentFragment.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlDocumentFragment" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="InnerXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OwnerDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ParentNode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlDocumentType.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlDocumentType.xml
new file mode 100644
index 00000000000..685ea39d2d4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlDocumentType.xml
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlDocumentType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Entities">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InternalSubset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Notations">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PublicId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SystemId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlElement.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlElement.xml
new file mode 100644
index 00000000000..ee59cd10bdb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlElement.xml
@@ -0,0 +1,213 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlElement" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsEmpty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LastLinkedChild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NamespaceURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NextSibling">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OwnerDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Prefix">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetAttributeNode(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetAttributeNode(System.Xml.XmlAttribute)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetAttribute(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAttributeNode(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAttributeNode(System.Xml.XmlAttribute)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="oldAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAttributeAt(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="i">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAllAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="HasAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="HasAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetElementsByTagName(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetElementsByTagName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttributeNode(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttributeNode(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAll">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlEntity.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlEntity.xml
new file mode 100644
index 00000000000..7bd48c60fe6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlEntity.xml
@@ -0,0 +1,81 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlEntity" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="BaseURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NotationName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OuterXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PublicId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SystemId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlEntityReference.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlEntityReference.xml
new file mode 100644
index 00000000000..d56affacbe4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlEntityReference.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlEntityReference" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="BaseURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlException.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlException.xml
new file mode 100644
index 00000000000..a03533f65ef
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlException.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlException" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+        <property name="LineNumber">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LinePosition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlImplementation.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlImplementation.xml
new file mode 100644
index 00000000000..12d216e91d7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlImplementation.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlImplementation" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlImplementation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="CreateDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="HasFeature(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strFeature">TODO</param>

+            <param name="strVersion">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlLinkedNode.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlLinkedNode.xml
new file mode 100644
index 00000000000..e64df943276
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlLinkedNode.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlLinkedNode" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="NextSibling">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NextLinkedSibling">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PreviousSibling">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNameTable.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNameTable.xml
new file mode 100644
index 00000000000..521983da4e9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNameTable.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlNameTable" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="Get(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Get(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNamedNodeMap.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNamedNodeMap.xml
new file mode 100644
index 00000000000..7f8fad291e1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNamedNodeMap.xml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlNamedNodeMap" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetNamedItem(System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="node">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveNamedItem(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveNamedItem(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Item(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNamedItem(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNamedItem(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNamespaceManager.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNamespaceManager.xml
new file mode 100644
index 00000000000..60a64db256e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNamespaceManager.xml
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlNamespaceManager" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlNamespaceManager(System.Xml.XmlNameTable)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nameTable">TODO</param>

+        </constructor>

+        <property name="DefaultNamespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NameTable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveNamespace(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <param name="uri">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="PushScope">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="PopScope">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="LookupPrefix(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="uri">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LookupNamespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="HasNamespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddNamespace(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <param name="uri">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNode.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNode.xml
new file mode 100644
index 00000000000..73ee8c06982
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNode.xml
@@ -0,0 +1,250 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlNode" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ChildNodes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FirstChild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasChildNodes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LastChild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LastLinkedChild">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NamespaceURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NextSibling">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OuterXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OwnerDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ParentNode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Prefix">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PreviousSibling">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CreateNavigator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Supports(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="feature">TODO</param>

+            <param name="version">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SelectSingleNode(System.String, System.Xml.XmlNamespaceManager)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xpath">TODO</param>

+            <param name="nsmgr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SelectSingleNode(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xpath">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SelectNodes(System.String, System.Xml.XmlNamespaceManager)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xpath">TODO</param>

+            <param name="nsmgr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SelectNodes(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xpath">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReplaceChild(System.Xml.XmlNode, System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newChild">TODO</param>

+            <param name="oldChild">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveChild(System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="oldChild">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="RemoveAll">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="PrependChild(System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newChild">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Normalize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="InsertBefore(System.Xml.XmlNode, System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newChild">TODO</param>

+            <param name="refChild">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="InsertAfter(System.Xml.XmlNode, System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newChild">TODO</param>

+            <param name="refChild">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetPrefixOfNamespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNamespaceOfPrefix(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AppendChild(System.Xml.XmlNode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newChild">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeChangedAction.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeChangedAction.xml
new file mode 100644
index 00000000000..0bfc1d4f304
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeChangedAction.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XmlNodeChangedAction" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeChangedEventArgs.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeChangedEventArgs.xml
new file mode 100644
index 00000000000..6637d3894a2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeChangedEventArgs.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlNodeChangedEventArgs" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Action">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Node">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OldParent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NewParent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeChangedEventHandler.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeChangedEventHandler.xml
new file mode 100644
index 00000000000..512c3019cf4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeChangedEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.Xml.XmlNodeChangedEventHandler" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeList.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeList.xml
new file mode 100644
index 00000000000..1aba015739f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeList.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlNodeList" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ItemOf">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Item(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeOrder.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeOrder.xml
new file mode 100644
index 00000000000..84aa3a066d3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeOrder.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XmlNodeOrder" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeType.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeType.xml
new file mode 100644
index 00000000000..868de8f0992
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNodeType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XmlNodeType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlNotation.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlNotation.xml
new file mode 100644
index 00000000000..01d767cb095
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlNotation.xml
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlNotation" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="InnerXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OuterXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PublicId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SystemId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlParserContext.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlParserContext.xml
new file mode 100644
index 00000000000..57c3782f3a8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlParserContext.xml
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlParserContext" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlParserContext(System.Xml.XmlNameTable, System.Xml.XmlNamespaceManager, System.String, System.Xml.XmlSpace)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nt">TODO</param>

+            <param name="nsMgr">TODO</param>

+            <param name="xmlLang">TODO</param>

+            <param name="xmlSpace">TODO</param>

+        </constructor>

+        <constructor name="XmlParserContext(System.Xml.XmlNameTable, System.Xml.XmlNamespaceManager, System.String, System.Xml.XmlSpace, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nt">TODO</param>

+            <param name="nsMgr">TODO</param>

+            <param name="xmlLang">TODO</param>

+            <param name="xmlSpace">TODO</param>

+            <param name="enc">TODO</param>

+        </constructor>

+        <constructor name="XmlParserContext(System.Xml.XmlNameTable, System.Xml.XmlNamespaceManager, System.String, System.String, System.String, System.String, System.String, System.String, System.Xml.XmlSpace)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nt">TODO</param>

+            <param name="nsMgr">TODO</param>

+            <param name="docTypeName">TODO</param>

+            <param name="pubId">TODO</param>

+            <param name="sysId">TODO</param>

+            <param name="internalSubset">TODO</param>

+            <param name="baseURI">TODO</param>

+            <param name="xmlLang">TODO</param>

+            <param name="xmlSpace">TODO</param>

+        </constructor>

+        <constructor name="XmlParserContext(System.Xml.XmlNameTable, System.Xml.XmlNamespaceManager, System.String, System.String, System.String, System.String, System.String, System.String, System.Xml.XmlSpace, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="nt">TODO</param>

+            <param name="nsMgr">TODO</param>

+            <param name="docTypeName">TODO</param>

+            <param name="pubId">TODO</param>

+            <param name="sysId">TODO</param>

+            <param name="internalSubset">TODO</param>

+            <param name="baseURI">TODO</param>

+            <param name="xmlLang">TODO</param>

+            <param name="xmlSpace">TODO</param>

+            <param name="enc">TODO</param>

+        </constructor>

+        <property name="BaseURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DocTypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Encoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InternalSubset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NamespaceManager">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NameTable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PublicId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SystemId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlLang">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlSpace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlProcessingInstruction.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlProcessingInstruction.xml
new file mode 100644
index 00000000000..bb48f448652
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlProcessingInstruction.xml
@@ -0,0 +1,61 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlProcessingInstruction" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Data">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="InnerText">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Target">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlQualifiedName.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlQualifiedName.xml
new file mode 100644
index 00000000000..66f584e1bfa
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlQualifiedName.xml
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlQualifiedName" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlQualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="XmlQualifiedName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <constructor name="XmlQualifiedName(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="ns">TODO</param>

+        </constructor>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="IsEmpty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="other">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Equality(System.Xml.XmlQualifiedName, System.Xml.XmlQualifiedName)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.Xml.XmlQualifiedName, System.Xml.XmlQualifiedName)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlReader.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlReader.xml
new file mode 100644
index 00000000000..83ea519aabf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlReader.xml
@@ -0,0 +1,298 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlReader" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="AttributeCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CanResolveEntity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Depth">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EOF">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasAttributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsDefault">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsEmptyElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NamespaceURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NameTable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Prefix">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="QuoteChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReadState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlLang">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlSpace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Skip">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ResolveEntity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadStartElement(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadStartElement(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadStartElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadOuterXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadInnerXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadEndElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadElementString(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadElementString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadElementString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadAttributeValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToNextAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToFirstAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToContent">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToAttribute(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="i">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LookupNamespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsStartElement(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsStartElement(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsStartElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttribute(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="i">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsNameToken(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlResolver.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlResolver.xml
new file mode 100644
index 00000000000..065f4b332bb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlResolver.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlResolver" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Credentials">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ResolveUri(System.Uri, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="baseUri">TODO</param>

+            <param name="relativeUri">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEntity(System.Uri, System.String, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="absoluteUri">TODO</param>

+            <param name="role">TODO</param>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlSignificantWhitespace.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlSignificantWhitespace.xml
new file mode 100644
index 00000000000..ef9231ab78d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlSignificantWhitespace.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlSignificantWhitespace" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlSpace.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlSpace.xml
new file mode 100644
index 00000000000..f6f1a9ecdbf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlSpace.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XmlSpace" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlText.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlText.xml
new file mode 100644
index 00000000000..8f0cbb1cda3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlText.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlText" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SplitText(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlTextReader.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlTextReader.xml
new file mode 100644
index 00000000000..e6df4043bfe
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlTextReader.xml
@@ -0,0 +1,349 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlTextReader" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlTextReader(System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="url">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.IO.TextReader)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.IO.Stream, System.Xml.XmlNameTable)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="nt">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.String, System.IO.Stream)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="url">TODO</param>

+            <param name="input">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.String, System.IO.TextReader)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="url">TODO</param>

+            <param name="input">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.String, System.Xml.XmlNameTable)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="url">TODO</param>

+            <param name="nt">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.IO.TextReader, System.Xml.XmlNameTable)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="input">TODO</param>

+            <param name="nt">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.IO.Stream, System.Xml.XmlNodeType, System.Xml.XmlParserContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xmlFragment">TODO</param>

+            <param name="fragType">TODO</param>

+            <param name="context">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.String, System.IO.Stream, System.Xml.XmlNameTable)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="url">TODO</param>

+            <param name="input">TODO</param>

+            <param name="nt">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.String, System.IO.TextReader, System.Xml.XmlNameTable)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="url">TODO</param>

+            <param name="input">TODO</param>

+            <param name="nt">TODO</param>

+        </constructor>

+        <constructor name="XmlTextReader(System.String, System.Xml.XmlNodeType, System.Xml.XmlParserContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="xmlFragment">TODO</param>

+            <param name="fragType">TODO</param>

+            <param name="context">TODO</param>

+        </constructor>

+        <property name="AttributeCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Depth">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Encoding">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="EOF">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsDefault">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsEmptyElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LineNumber">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LinePosition">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Namespaces">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NamespaceURI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NameTable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Normalization">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Prefix">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="QuoteChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReadState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="WhitespaceHandling">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlLang">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlResolver">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlSpace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ResolveEntity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadOuterXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadInnerXml">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadAttributeValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToNextAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToFirstAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveToAttribute(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="i">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LookupNamespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="namespaceURI">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAttribute(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="i">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetRemainder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadBase64(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadBinHex(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadChars(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ResetState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlTextWriter.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlTextWriter.xml
new file mode 100644
index 00000000000..2689f39d9dd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlTextWriter.xml
@@ -0,0 +1,254 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlTextWriter" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlTextWriter(System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+        </constructor>

+        <constructor name="XmlTextWriter(System.IO.Stream, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <param name="encoding">TODO</param>

+        </constructor>

+        <constructor name="XmlTextWriter(System.String, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="filename">TODO</param>

+            <param name="encoding">TODO</param>

+        </constructor>

+        <property name="BaseStream">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Formatting">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IndentingOverriden">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Indentation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IndentChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Namespaces">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="QuoteChar">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="WriteState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlLang">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlSpace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteWhitespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ws">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteSurrogateCharEntity(System.Char, System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="lowChar">TODO</param>

+            <param name="highChar">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartElement(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartDocument(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="standalone">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartAttribute(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteRaw(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteRaw(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteQualifiedName(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteProcessingInstruction(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteNmToken(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteFullEndElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteEntityRef(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteEndElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteEndDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteEndAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteDocType(System.String, System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="pubid">TODO</param>

+            <param name="sysid">TODO</param>

+            <param name="subset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteComment(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteChars(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteCharEntity(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ch">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteCData(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteBinHex(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteBase64(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LookupPrefix(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlTokenizedType.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlTokenizedType.xml
new file mode 100644
index 00000000000..76aeb7c160c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlTokenizedType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Xml.XmlTokenizedType" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlUrlResolver.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlUrlResolver.xml
new file mode 100644
index 00000000000..bb380274c73
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlUrlResolver.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlUrlResolver" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="XmlUrlResolver">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="Credentials">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ResolveUri(System.Uri, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="baseUri">TODO</param>

+            <param name="relativeUri">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEntity(System.Uri, System.String, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="absoluteUri">TODO</param>

+            <param name="role">TODO</param>

+            <param name="ofObjectToReturn">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlWhitespace.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlWhitespace.xml
new file mode 100644
index 00000000000..c3c4107b96a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlWhitespace.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlWhitespace" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="LocalName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NodeType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteContentTo(System.Xml.XmlWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="w">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CloneNode(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="deep">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System.Xml/XmlWriter.xml b/mcs/docs/apidocs/xml/en/System.Xml/XmlWriter.xml
new file mode 100644
index 00000000000..4123f6b9644
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System.Xml/XmlWriter.xml
@@ -0,0 +1,275 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Xml.XmlWriter" assembly="System.Xml">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="WriteState">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlLang">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="XmlSpace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="WriteWhitespace(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ws">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteSurrogateCharEntity(System.Char, System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="lowChar">TODO</param>

+            <param name="highChar">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartElement(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartDocument(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="standalone">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartAttribute(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteRaw(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteRaw(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteQualifiedName(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteProcessingInstruction(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteNode(System.Xml.XmlReader, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="reader">TODO</param>

+            <param name="defattr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteNmToken(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteFullEndElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteEntityRef(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteEndElement">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteEndDocument">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteEndAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteDocType(System.String, System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="pubid">TODO</param>

+            <param name="sysid">TODO</param>

+            <param name="subset">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteComment(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteChars(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteCharEntity(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ch">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteCData(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="text">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteBinHex(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteBase64(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteAttributes(System.Xml.XmlReader, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="reader">TODO</param>

+            <param name="defattr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LookupPrefix(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Flush">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Close">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteAttributeString(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteAttributeString(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteAttributeString(System.String, System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="prefix">TODO</param>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteElementString(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteElementString(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartAttribute(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartElement(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteStartElement(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="localName">TODO</param>

+            <param name="ns">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/AppDomain.xml b/mcs/docs/apidocs/xml/en/System/AppDomain.xml
new file mode 100644
index 00000000000..f0c153b4190
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/AppDomain.xml
@@ -0,0 +1,426 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.AppDomain" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="SetupInformation">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseDirectory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="RelativeSearchPath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DynamicDirectory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShadowCopyFiles">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FriendlyName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Evidence">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentDomain">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="SetThreadPrincipal(System.Security.Principal.IPrincipal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="principal">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetShadowCopyPath(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetPrincipalPolicy(System.Security.Principal.PrincipalPolicy)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="policy">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetData(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="data">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetCachePath(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetAppDomainPolicy(System.Security.Policy.PolicyLevel)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="domainPolicy">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Byte[], System.Byte[], System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rawAssembly">TODO</param>

+            <param name="rawSymbolStore">TODO</param>

+            <param name="securityEvidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.String, System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyString">TODO</param>

+            <param name="assemblySecurity">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Byte[], System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rawAssembly">TODO</param>

+            <param name="rawSymbolStore">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Reflection.AssemblyName, System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyRef">TODO</param>

+            <param name="assemblySecurity">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyString">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="rawAssembly">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Load(System.Reflection.AssemblyName)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyRef">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetData(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetAssemblies">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ExecuteAssembly(System.String, System.Security.Policy.Evidence, System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyFile">TODO</param>

+            <param name="assemblySecurity">TODO</param>

+            <param name="args">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ExecuteAssembly(System.String, System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyFile">TODO</param>

+            <param name="assemblySecurity">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ExecuteAssembly(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyFile">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DoCallBack(System.CrossAppDomainDelegate)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="theDelegate">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicAssembly(System.Reflection.AssemblyName, System.Reflection.Emit.AssemblyBuilderAccess, System.String, System.Security.Policy.Evidence, System.Security.PermissionSet, System.Security.PermissionSet, System.Security.PermissionSet, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="access">TODO</param>

+            <param name="dir">TODO</param>

+            <param name="evidence">TODO</param>

+            <param name="requiredPermissions">TODO</param>

+            <param name="optionalPermissions">TODO</param>

+            <param name="refusedPersmissions">TODO</param>

+            <param name="isSynchronized">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicAssembly(System.Reflection.AssemblyName, System.Reflection.Emit.AssemblyBuilderAccess, System.String, System.Security.Policy.Evidence, System.Security.PermissionSet, System.Security.PermissionSet, System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="access">TODO</param>

+            <param name="dir">TODO</param>

+            <param name="evidence">TODO</param>

+            <param name="requiredPermissions">TODO</param>

+            <param name="optionalPermissions">TODO</param>

+            <param name="refusedPersmissions">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicAssembly(System.Reflection.AssemblyName, System.Reflection.Emit.AssemblyBuilderAccess, System.String, System.Security.PermissionSet, System.Security.PermissionSet, System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="access">TODO</param>

+            <param name="dir">TODO</param>

+            <param name="requiredPermissions">TODO</param>

+            <param name="optionalPermissions">TODO</param>

+            <param name="refusedPersmissions">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicAssembly(System.Reflection.AssemblyName, System.Reflection.Emit.AssemblyBuilderAccess, System.Security.Policy.Evidence, System.Security.PermissionSet, System.Security.PermissionSet, System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="access">TODO</param>

+            <param name="evidence">TODO</param>

+            <param name="requiredPermissions">TODO</param>

+            <param name="optionalPermissions">TODO</param>

+            <param name="refusedPersmissions">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicAssembly(System.Reflection.AssemblyName, System.Reflection.Emit.AssemblyBuilderAccess, System.Security.PermissionSet, System.Security.PermissionSet, System.Security.PermissionSet)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="access">TODO</param>

+            <param name="requiredPermissions">TODO</param>

+            <param name="optionalPermissions">TODO</param>

+            <param name="refusedPersmissions">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicAssembly(System.Reflection.AssemblyName, System.Reflection.Emit.AssemblyBuilderAccess, System.String, System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="access">TODO</param>

+            <param name="dir">TODO</param>

+            <param name="evidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicAssembly(System.Reflection.AssemblyName, System.Reflection.Emit.AssemblyBuilderAccess, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="access">TODO</param>

+            <param name="dir">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicAssembly(System.Reflection.AssemblyName, System.Reflection.Emit.AssemblyBuilderAccess, System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="access">TODO</param>

+            <param name="evidence">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DefineDynamicAssembly(System.Reflection.AssemblyName, System.Reflection.Emit.AssemblyBuilderAccess)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="access">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstanceFrom(System.String, System.String, System.Boolean, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo, System.Object[], System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyName">TODO</param>

+            <param name="typeName">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="args">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="activationAttributes">TODO</param>

+            <param name="securityAttribtutes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstanceFrom(System.String, System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyName">TODO</param>

+            <param name="typeName">TODO</param>

+            <param name="activationAttributes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstanceFrom(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyName">TODO</param>

+            <param name="typeName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.String, System.String, System.Boolean, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object[], System.Globalization.CultureInfo, System.Object[], System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyName">TODO</param>

+            <param name="typeName">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="args">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="activationAttributes">TODO</param>

+            <param name="securityAttribtutes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.String, System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyName">TODO</param>

+            <param name="typeName">TODO</param>

+            <param name="activationAttributes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="assemblyName">TODO</param>

+            <param name="typeName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ClearShadowCopyPath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ClearPrivatePath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="AppendPrivatePath(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="path">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="InitializeLifetimeService">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="other">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDomain(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="friendlyName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDomain(System.String, System.Security.Policy.Evidence)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="friendlyName">TODO</param>

+            <param name="securityInfo">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDomain(System.String, System.Security.Policy.Evidence, System.AppDomainSetup)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="friendlyName">TODO</param>

+            <param name="securityInfo">TODO</param>

+            <param name="info">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateDomain(System.String, System.Security.Policy.Evidence, System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="friendlyName">TODO</param>

+            <param name="securityInfo">TODO</param>

+            <param name="appBasePath">TODO</param>

+            <param name="appRelativeSearchPath">TODO</param>

+            <param name="shadowCopyFiles">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Unload(System.AppDomain)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="domain">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCurrentThreadId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <event name="AssemblyLoad">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="AssemblyResolve">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="DomainUnload">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="ProcessExit">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="ResourceResolve">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="TypeResolve">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+        <event name="UnhandledException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <data>TODO</data>

+        </event>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/AppDomainSetup.xml b/mcs/docs/apidocs/xml/en/System/AppDomainSetup.xml
new file mode 100644
index 00000000000..4f5fd4829d2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/AppDomainSetup.xml
@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.AppDomainSetup" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AppDomainSetup">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <property name="ApplicationBase">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ApplicationName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CachePath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ConfigurationFile">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DisallowPublisherPolicy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DynamicBase">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LicenseFile">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PrivateBinPath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PrivateBinPathProbe">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShadowCopyDirectories">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ShadowCopyFiles">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/AppDomainUnloadedException.xml b/mcs/docs/apidocs/xml/en/System/AppDomainUnloadedException.xml
new file mode 100644
index 00000000000..42ee2a67875
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/AppDomainUnloadedException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.AppDomainUnloadedException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AppDomainUnloadedException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="AppDomainUnloadedException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="AppDomainUnloadedException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ApplicationException.xml b/mcs/docs/apidocs/xml/en/System/ApplicationException.xml
new file mode 100644
index 00000000000..9a6abc6bebd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ApplicationException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ApplicationException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ApplicationException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ApplicationException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ApplicationException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ArgumentException.xml b/mcs/docs/apidocs/xml/en/System/ArgumentException.xml
new file mode 100644
index 00000000000..461ad043025
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ArgumentException.xml
@@ -0,0 +1,48 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ArgumentException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ArgumentException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ArgumentException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ArgumentException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <constructor name="ArgumentException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="param_name">TODO</param>

+        </constructor>

+        <constructor name="ArgumentException(System.String, System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="param_name">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <property name="ParamName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ArgumentNullException.xml b/mcs/docs/apidocs/xml/en/System/ArgumentNullException.xml
new file mode 100644
index 00000000000..02879fb4751
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ArgumentNullException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ArgumentNullException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ArgumentNullException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ArgumentNullException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="param_name">TODO</param>

+        </constructor>

+        <constructor name="ArgumentNullException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="param_name">TODO</param>

+            <param name="message">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ArgumentOutOfRangeException.xml b/mcs/docs/apidocs/xml/en/System/ArgumentOutOfRangeException.xml
new file mode 100644
index 00000000000..448920d228a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ArgumentOutOfRangeException.xml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ArgumentOutOfRangeException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ArgumentOutOfRangeException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ArgumentOutOfRangeException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="param_name">TODO</param>

+        </constructor>

+        <constructor name="ArgumentOutOfRangeException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="param_name">TODO</param>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ArgumentOutOfRangeException(System.String, System.Object, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="param_name">TODO</param>

+            <param name="actual_value">TODO</param>

+            <param name="message">TODO</param>

+        </constructor>

+        <property name="ActualValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ArithmeticException.xml b/mcs/docs/apidocs/xml/en/System/ArithmeticException.xml
new file mode 100644
index 00000000000..689a582a9f3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ArithmeticException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ArithmeticException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ArithmeticException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ArithmeticException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ArithmeticException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Array.xml b/mcs/docs/apidocs/xml/en/System/Array.xml
new file mode 100644
index 00000000000..bea80e8505e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Array.xml
@@ -0,0 +1,366 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Array" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Rank">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Item">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Count">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSynchronized">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SyncRoot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFixedSize">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsReadOnly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLength(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dimension">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLowerBound(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dimension">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.Int32[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="idxs">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetValue(System.Object, System.Int32[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="idxs">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetUpperBound(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dimension">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="idx">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="idx1">TODO</param>

+            <param name="idx2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetValue(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="idx1">TODO</param>

+            <param name="idx2">TODO</param>

+            <param name="idx3">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetValue(System.Object, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="idx">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetValue(System.Object, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="idx1">TODO</param>

+            <param name="idx2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetValue(System.Object, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="idx1">TODO</param>

+            <param name="idx2">TODO</param>

+            <param name="idx3">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.Type, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elementType">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.Type, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elementType">TODO</param>

+            <param name="l1">TODO</param>

+            <param name="l2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.Type, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elementType">TODO</param>

+            <param name="l1">TODO</param>

+            <param name="l2">TODO</param>

+            <param name="l3">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.Type, System.Int32[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elementType">TODO</param>

+            <param name="lengths">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateInstance(System.Type, System.Int32[], System.Int32[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="elementType">TODO</param>

+            <param name="lengths">TODO</param>

+            <param name="bounds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BinarySearch(System.Array, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BinarySearch(System.Array, System.Object, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="value">TODO</param>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BinarySearch(System.Array, System.Int32, System.Int32, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <param name="length">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BinarySearch(System.Array, System.Int32, System.Int32, System.Object, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <param name="length">TODO</param>

+            <param name="value">TODO</param>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clear(System.Array, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy(System.Array, System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="source">TODO</param>

+            <param name="dest">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy(System.Array, System.Int32, System.Array, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="source">TODO</param>

+            <param name="source_idx">TODO</param>

+            <param name="dest">TODO</param>

+            <param name="dest_idx">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Array, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Array, System.Object, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="value">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Array, System.Object, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="value">TODO</param>

+            <param name="index">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.Array, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.Array, System.Object, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="value">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.Array, System.Object, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="value">TODO</param>

+            <param name="index">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Reverse(System.Array)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Reverse(System.Array, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort(System.Array)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort(System.Array, System.Array)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="keys">TODO</param>

+            <param name="items">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort(System.Array, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort(System.Array, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort(System.Array, System.Array, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="keys">TODO</param>

+            <param name="items">TODO</param>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort(System.Array, System.Array, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="keys">TODO</param>

+            <param name="items">TODO</param>

+            <param name="index">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort(System.Array, System.Int32, System.Int32, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <param name="length">TODO</param>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sort(System.Array, System.Array, System.Int32, System.Int32, System.Collections.IComparer)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="keys">TODO</param>

+            <param name="items">TODO</param>

+            <param name="index">TODO</param>

+            <param name="length">TODO</param>

+            <param name="comparer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ArrayTypeMismatchException.xml b/mcs/docs/apidocs/xml/en/System/ArrayTypeMismatchException.xml
new file mode 100644
index 00000000000..e600fab3934
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ArrayTypeMismatchException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ArrayTypeMismatchException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ArrayTypeMismatchException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ArrayTypeMismatchException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ArrayTypeMismatchException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/AssemblyLoadEventArgs.xml b/mcs/docs/apidocs/xml/en/System/AssemblyLoadEventArgs.xml
new file mode 100644
index 00000000000..1f160d15332
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/AssemblyLoadEventArgs.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.AssemblyLoadEventArgs" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AssemblyLoadEventArgs(System.Reflection.Assembly)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="loadedAssembly">TODO</param>

+        </constructor>

+        <property name="LoadedAssembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/AssemblyLoadEventHandler.xml b/mcs/docs/apidocs/xml/en/System/AssemblyLoadEventHandler.xml
new file mode 100644
index 00000000000..1ebbcbc3366
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/AssemblyLoadEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.AssemblyLoadEventHandler" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/AsyncCallback.xml b/mcs/docs/apidocs/xml/en/System/AsyncCallback.xml
new file mode 100644
index 00000000000..83060a95222
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/AsyncCallback.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.AsyncCallback" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Attribute.xml b/mcs/docs/apidocs/xml/en/System/Attribute.xml
new file mode 100644
index 00000000000..21c038a86a0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Attribute.xml
@@ -0,0 +1,261 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Attribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="TypeId">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Match(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefaultAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttribute(System.Reflection.ParameterInfo, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttribute(System.Reflection.MemberInfo, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttribute(System.Reflection.Assembly, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttribute(System.Reflection.Module, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttribute(System.Reflection.Module, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttribute(System.Reflection.Assembly, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttribute(System.Reflection.ParameterInfo, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttribute(System.Reflection.MemberInfo, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.Assembly)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.ParameterInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.MemberInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.Module)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.Assembly, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.Module, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.ParameterInfo, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.MemberInfo, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.Assembly, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.ParameterInfo, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.Module, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.MemberInfo, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.Module, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.Assembly, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.MemberInfo, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCustomAttributes(System.Reflection.ParameterInfo, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Reflection.Module, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Reflection.ParameterInfo, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Reflection.MemberInfo, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Reflection.Assembly, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Reflection.MemberInfo, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Reflection.Assembly, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Reflection.Module, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDefined(System.Reflection.ParameterInfo, System.Type, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="element">TODO</param>

+            <param name="attribute_type">TODO</param>

+            <param name="inherit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/AttributeTargets.xml b/mcs/docs/apidocs/xml/en/System/AttributeTargets.xml
new file mode 100644
index 00000000000..c335b966a0f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/AttributeTargets.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.AttributeTargets" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/AttributeUsageAttribute.xml b/mcs/docs/apidocs/xml/en/System/AttributeUsageAttribute.xml
new file mode 100644
index 00000000000..ff002391a3e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/AttributeUsageAttribute.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.AttributeUsageAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="AttributeUsageAttribute(System.AttributeTargets)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="validOn">TODO</param>

+        </constructor>

+        <property name="AllowMultiple">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Inherited">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ValidOn">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/BadImageFormatException.xml b/mcs/docs/apidocs/xml/en/System/BadImageFormatException.xml
new file mode 100644
index 00000000000..469d739ef56
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/BadImageFormatException.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.BadImageFormatException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="BadImageFormatException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="BadImageFormatException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="BadImageFormatException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <constructor name="BadImageFormatException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="fileName">TODO</param>

+        </constructor>

+        <constructor name="BadImageFormatException(System.String, System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="fileName">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FileName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FusionLog">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/BitConverter.xml b/mcs/docs/apidocs/xml/en/System/BitConverter.xml
new file mode 100644
index 00000000000..6815a7f37af
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/BitConverter.xml
@@ -0,0 +1,175 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.BitConverter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="IsLittleEndian">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="DoubleToInt64Bits(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Int64BitsToDouble(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBytes(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Byte[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="start_index">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Boolean.xml b/mcs/docs/apidocs/xml/en/System/Boolean.xml
new file mode 100644
index 00000000000..3342c26b09a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Boolean.xml
@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Boolean" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="FalseString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TrueString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Buffer.xml b/mcs/docs/apidocs/xml/en/System/Buffer.xml
new file mode 100644
index 00000000000..36a69613977
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Buffer.xml
@@ -0,0 +1,39 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Buffer" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="ByteLength(System.Array)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetByte(System.Array, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetByte(System.Array, System.Int32, System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="array">TODO</param>

+            <param name="index">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="BlockCopy(System.Array, System.Int32, System.Array, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="src">TODO</param>

+            <param name="src_offset">TODO</param>

+            <param name="dest">TODO</param>

+            <param name="dest_offset">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Byte.xml b/mcs/docs/apidocs/xml/en/System/Byte.xml
new file mode 100644
index 00000000000..1d2dfd6b9b6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Byte.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Byte" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/CLSCompliantAttribute.xml b/mcs/docs/apidocs/xml/en/System/CLSCompliantAttribute.xml
new file mode 100644
index 00000000000..128f73c1122
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/CLSCompliantAttribute.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CLSCompliantAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CLSCompliantAttribute(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="is_compliant">TODO</param>

+        </constructor>

+        <property name="IsCompliant">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/CannotUnloadAppDomainException.xml b/mcs/docs/apidocs/xml/en/System/CannotUnloadAppDomainException.xml
new file mode 100644
index 00000000000..3980908e9e8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/CannotUnloadAppDomainException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CannotUnloadAppDomainException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="CannotUnloadAppDomainException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="CannotUnloadAppDomainException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="CannotUnloadAppDomainException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Char.xml b/mcs/docs/apidocs/xml/en/System/Char.xml
new file mode 100644
index 00000000000..07aed173f66
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Char.xml
@@ -0,0 +1,344 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Char" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNumericValue(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNumericValue(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetUnicodeCategory(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetUnicodeCategory(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsControl(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsControl(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDigit(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDigit(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLetter(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLetter(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLetterOrDigit(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLetterOrDigit(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLower(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLower(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsNumber(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsNumber(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsPunctuation(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsPunctuation(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSeparator(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSeparator(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSurrogate(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSurrogate(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSymbol(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSymbol(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsUpper(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsUpper(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsWhiteSpace(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsWhiteSpace(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToLower(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUpper(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/CharEnumerator.xml b/mcs/docs/apidocs/xml/en/System/CharEnumerator.xml
new file mode 100644
index 00000000000..ce2e96fe447
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/CharEnumerator.xml
@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.CharEnumerator" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Current">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Reset">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="MoveNext">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Console.xml b/mcs/docs/apidocs/xml/en/System/Console.xml
new file mode 100644
index 00000000000..06f7edf2522
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Console.xml
@@ -0,0 +1,311 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Console" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Error">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Out">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="In">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="OpenStandardError">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenStandardError(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bufferSize">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenStandardInput">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenStandardInput(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bufferSize">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenStandardOutput">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="OpenStandardOutput(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bufferSize">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetError(System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newError">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetIn(System.IO.TextReader)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newIn">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="SetOut(System.IO.TextWriter)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newOut">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Write(System.String, System.Object, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <param name="arg2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <param name="index">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="WriteLine(System.String, System.Object, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <param name="arg2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Read">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ReadLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ContextBoundObject.xml b/mcs/docs/apidocs/xml/en/System/ContextBoundObject.xml
new file mode 100644
index 00000000000..ae31dd241e0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ContextBoundObject.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ContextBoundObject" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ContextMarshalException.xml b/mcs/docs/apidocs/xml/en/System/ContextMarshalException.xml
new file mode 100644
index 00000000000..58da7a376ec
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ContextMarshalException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ContextMarshalException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ContextMarshalException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ContextMarshalException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ContextMarshalException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ContextStaticAttribute.xml b/mcs/docs/apidocs/xml/en/System/ContextStaticAttribute.xml
new file mode 100644
index 00000000000..79890c0323b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ContextStaticAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ContextStaticAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ContextStaticAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Convert.xml b/mcs/docs/apidocs/xml/en/System/Convert.xml
new file mode 100644
index 00000000000..5eb24ebab39
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Convert.xml
@@ -0,0 +1,1924 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Convert" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="DBNull">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="FromBase64CharArray(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inArray">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromBase64String(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDBNull(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBase64CharArray(System.Byte[], System.Int32, System.Int32, System.Char[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inArray">TODO</param>

+            <param name="offsetIn">TODO</param>

+            <param name="length">TODO</param>

+            <param name="outArray">TODO</param>

+            <param name="offsetOut">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBase64String(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inArray">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBase64String(System.Byte[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="inArray">TODO</param>

+            <param name="offset">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Boolean, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Byte, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Byte, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="toBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Char, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.DateTime, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Decimal, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Double, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Single, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int32, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int64, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int64, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.SByte, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int16, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int16, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.UInt32, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.UInt64, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.UInt16, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="fromBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64(System.Object, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ChangeType(System.Object, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="conversionType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ChangeType(System.Object, System.TypeCode)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="typeCode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ChangeType(System.Object, System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ChangeType(System.Object, System.TypeCode, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="typeCode">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/CrossAppDomainDelegate.xml b/mcs/docs/apidocs/xml/en/System/CrossAppDomainDelegate.xml
new file mode 100644
index 00000000000..25680b2a6e7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/CrossAppDomainDelegate.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.CrossAppDomainDelegate" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/DBNull.xml b/mcs/docs/apidocs/xml/en/System/DBNull.xml
new file mode 100644
index 00000000000..b1f576b9e77
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/DBNull.xml
@@ -0,0 +1,35 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.DBNull" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/DateTime.xml b/mcs/docs/apidocs/xml/en/System/DateTime.xml
new file mode 100644
index 00000000000..68f23aa5f60
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/DateTime.xml
@@ -0,0 +1,565 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.DateTime" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DateTime(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="newticks">TODO</param>

+        </constructor>

+        <constructor name="DateTime(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+        </constructor>

+        <constructor name="DateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+        </constructor>

+        <constructor name="DateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="millisecond">TODO</param>

+        </constructor>

+        <constructor name="DateTime(System.Int32, System.Int32, System.Int32, System.Globalization.Calendar)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="calendar">TODO</param>

+        </constructor>

+        <constructor name="DateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Globalization.Calendar)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="calendar">TODO</param>

+        </constructor>

+        <constructor name="DateTime(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Int32, System.Globalization.Calendar)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <param name="day">TODO</param>

+            <param name="hour">TODO</param>

+            <param name="minute">TODO</param>

+            <param name="second">TODO</param>

+            <param name="millisecond">TODO</param>

+            <param name="calendar">TODO</param>

+        </constructor>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Date">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Month">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Day">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DayOfWeek">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DayOfYear">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TimeOfDay">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Hour">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Minute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Second">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Millisecond">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Now">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Ticks">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Today">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UtcNow">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Year">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ts">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddDays(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="days">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddTicks(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddHours(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hours">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMilliseconds(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ms">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMinutes(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="minutes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddMonths(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="months">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddSeconds(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="seconds">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="AddYears(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="years">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Compare(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="DaysInMonth(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <param name="month">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromFileTime(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fileTime">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromOADate(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDateTimeFormats">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDateTimeFormats(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDateTimeFormats(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDateTimeFormats(System.Char, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsLeapYear(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider, System.Globalization.DateTimeStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <param name="styles">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ParseExact(System.String, System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ParseExact(System.String, System.String, System.IFormatProvider, System.Globalization.DateTimeStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ParseExact(System.String, System.String[], System.IFormatProvider, System.Globalization.DateTimeStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="formats">TODO</param>

+            <param name="fp">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Subtract(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="dt">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Subtract(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ts">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToFileTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToLongDateString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToLongTimeString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToOADate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToShortDateString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToShortTimeString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToLocalTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUniversalTime">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Addition(System.DateTime, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <param name="t">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Equality(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_GreaterThan(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_GreaterThanOrEqual(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_LessThan(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_LessThanOrEqual(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Subtraction(System.DateTime, System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Subtraction(System.DateTime, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <param name="t">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/DayOfWeek.xml b/mcs/docs/apidocs/xml/en/System/DayOfWeek.xml
new file mode 100644
index 00000000000..2369ad409e0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/DayOfWeek.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.DayOfWeek" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Decimal.xml b/mcs/docs/apidocs/xml/en/System/Decimal.xml
new file mode 100644
index 00000000000..a7d26f86a0f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Decimal.xml
@@ -0,0 +1,454 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Decimal" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Decimal(System.Int32, System.Int32, System.Int32, System.Boolean, System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="lo">TODO</param>

+            <param name="mid">TODO</param>

+            <param name="hi">TODO</param>

+            <param name="isNegative">TODO</param>

+            <param name="scale">TODO</param>

+        </constructor>

+        <constructor name="Decimal(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+        </constructor>

+        <constructor name="Decimal(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+        </constructor>

+        <constructor name="Decimal(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+        </constructor>

+        <constructor name="Decimal(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="uval">TODO</param>

+        </constructor>

+        <constructor name="Decimal(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+        </constructor>

+        <constructor name="Decimal(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+        </constructor>

+        <constructor name="Decimal(System.Int32[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bits">TODO</param>

+        </constructor>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinusOne">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="One">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Zero">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetBits(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Negate(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Subtract(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Floor(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Truncate(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Round(System.Decimal, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <param name="decimals">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Multiply(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Divide(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remainder(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Compare(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Addition(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Decrement(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Increment(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Subtraction(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_UnaryNegation(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_UnaryPlus(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Multiply(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Division(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Modulus(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Implicit(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Equality(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_GreaterThan(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_GreaterThanOrEqual(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_LessThan(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_LessThanOrEqual(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d1">TODO</param>

+            <param name="d2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/DivideByZeroException.xml b/mcs/docs/apidocs/xml/en/System/DivideByZeroException.xml
new file mode 100644
index 00000000000..29ae2214d0a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/DivideByZeroException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.DivideByZeroException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DivideByZeroException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="DivideByZeroException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="DivideByZeroException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/DllNotFoundException.xml b/mcs/docs/apidocs/xml/en/System/DllNotFoundException.xml
new file mode 100644
index 00000000000..fe5466feaae
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/DllNotFoundException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.DllNotFoundException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DllNotFoundException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="DllNotFoundException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="DllNotFoundException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Double.xml b/mcs/docs/apidocs/xml/en/System/Double.xml
new file mode 100644
index 00000000000..c48866e507d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Double.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Double" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Epsilon">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="NaN">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="NegativeInfinity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="PositiveInfinity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsInfinity(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsNaN(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsNegativeInfinity(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsPositiveInfinity(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/DuplicateWaitObjectException.xml b/mcs/docs/apidocs/xml/en/System/DuplicateWaitObjectException.xml
new file mode 100644
index 00000000000..48ce9f3dc12
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/DuplicateWaitObjectException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.DuplicateWaitObjectException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="DuplicateWaitObjectException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="DuplicateWaitObjectException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="param_name">TODO</param>

+        </constructor>

+        <constructor name="DuplicateWaitObjectException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="param_name">TODO</param>

+            <param name="message">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/EntryPointNotFoundException.xml b/mcs/docs/apidocs/xml/en/System/EntryPointNotFoundException.xml
new file mode 100644
index 00000000000..4eb1fc85173
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/EntryPointNotFoundException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.EntryPointNotFoundException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="EntryPointNotFoundException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="EntryPointNotFoundException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="EntryPointNotFoundException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Environment.xml b/mcs/docs/apidocs/xml/en/System/Environment.xml
new file mode 100644
index 00000000000..7f73d9e4b36
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Environment.xml
@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Environment" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="CommandLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="CurrentDirectory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ExitCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MachineName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="NewLine">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="OSVersion">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="StackTrace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="SystemDirectory">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TickCount">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UserDomainName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UserInteractive">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UserName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Version">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="WorkingSet">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Exit(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="exitCode">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ExpandEnvironmentVariables(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetCommandLineArgs">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnvironmentVariable(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnvironmentVariables">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFolderPath(System.Environment.SpecialFolder)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="folder">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLogicalDrives">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/EventArgs.xml b/mcs/docs/apidocs/xml/en/System/EventArgs.xml
new file mode 100644
index 00000000000..8ce6c56729f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/EventArgs.xml
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.EventArgs" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="EventArgs">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/EventHandler.xml b/mcs/docs/apidocs/xml/en/System/EventHandler.xml
new file mode 100644
index 00000000000..d8fa6f11845
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/EventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.EventHandler" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ExecutionEngineException.xml b/mcs/docs/apidocs/xml/en/System/ExecutionEngineException.xml
new file mode 100644
index 00000000000..29f31398fbb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ExecutionEngineException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ExecutionEngineException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ExecutionEngineException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ExecutionEngineException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ExecutionEngineException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/FieldAccessException.xml b/mcs/docs/apidocs/xml/en/System/FieldAccessException.xml
new file mode 100644
index 00000000000..e66e2839461
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/FieldAccessException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.FieldAccessException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FieldAccessException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="FieldAccessException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="FieldAccessException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/FlagsAttribute.xml b/mcs/docs/apidocs/xml/en/System/FlagsAttribute.xml
new file mode 100644
index 00000000000..0a56c423023
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/FlagsAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.FlagsAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FlagsAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/FormatException.xml b/mcs/docs/apidocs/xml/en/System/FormatException.xml
new file mode 100644
index 00000000000..31abaf59d68
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/FormatException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.FormatException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="FormatException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="FormatException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="FormatException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/GC.xml b/mcs/docs/apidocs/xml/en/System/GC.xml
new file mode 100644
index 00000000000..dededd93f08
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/GC.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.GC" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="SuppressFinalize(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Guid.xml b/mcs/docs/apidocs/xml/en/System/Guid.xml
new file mode 100644
index 00000000000..a5236a8de70
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Guid.xml
@@ -0,0 +1,119 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Guid" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Guid(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="b">TODO</param>

+        </constructor>

+        <constructor name="Guid(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="g">TODO</param>

+        </constructor>

+        <constructor name="Guid(System.Int32, System.Int16, System.Int16, System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <param name="c">TODO</param>

+            <param name="d">TODO</param>

+        </constructor>

+        <constructor name="Guid(System.Int32, System.Int16, System.Int16, System.Byte, System.Byte, System.Byte, System.Byte, System.Byte, System.Byte, System.Byte, System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <param name="c">TODO</param>

+            <param name="d">TODO</param>

+            <param name="e">TODO</param>

+            <param name="f">TODO</param>

+            <param name="g">TODO</param>

+            <param name="h">TODO</param>

+            <param name="i">TODO</param>

+            <param name="j">TODO</param>

+            <param name="k">TODO</param>

+        </constructor>

+        <constructor name="Guid(System.UInt32, System.UInt16, System.UInt16, System.Byte, System.Byte, System.Byte, System.Byte, System.Byte, System.Byte, System.Byte, System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <param name="c">TODO</param>

+            <param name="d">TODO</param>

+            <param name="e">TODO</param>

+            <param name="f">TODO</param>

+            <param name="g">TODO</param>

+            <param name="h">TODO</param>

+            <param name="i">TODO</param>

+            <param name="j">TODO</param>

+            <param name="k">TODO</param>

+        </constructor>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="NewGuid">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByteArray">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Equality(System.Guid, System.Guid)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.Guid, System.Guid)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IAppDomainSetup.xml b/mcs/docs/apidocs/xml/en/System/IAppDomainSetup.xml
new file mode 100644
index 00000000000..e66a4e5bebd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IAppDomainSetup.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.IAppDomainSetup" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IAsyncResult.xml b/mcs/docs/apidocs/xml/en/System/IAsyncResult.xml
new file mode 100644
index 00000000000..a5148f5f87c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IAsyncResult.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.IAsyncResult" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ICloneable.xml b/mcs/docs/apidocs/xml/en/System/ICloneable.xml
new file mode 100644
index 00000000000..239dd98c16e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ICloneable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.ICloneable" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IComparable.xml b/mcs/docs/apidocs/xml/en/System/IComparable.xml
new file mode 100644
index 00000000000..b760c09b67e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IComparable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.IComparable" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IConvertible.xml b/mcs/docs/apidocs/xml/en/System/IConvertible.xml
new file mode 100644
index 00000000000..a2474443c8b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IConvertible.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.IConvertible" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IDisposable.xml b/mcs/docs/apidocs/xml/en/System/IDisposable.xml
new file mode 100644
index 00000000000..64f187f3167
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IDisposable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.IDisposable" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IFormatProvider.xml b/mcs/docs/apidocs/xml/en/System/IFormatProvider.xml
new file mode 100644
index 00000000000..4e38edf58d3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IFormatProvider.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.IFormatProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IFormattable.xml b/mcs/docs/apidocs/xml/en/System/IFormattable.xml
new file mode 100644
index 00000000000..a4b63678a42
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IFormattable.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.IFormattable" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IServiceProvider.xml b/mcs/docs/apidocs/xml/en/System/IServiceProvider.xml
new file mode 100644
index 00000000000..dd49f1a5256
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IServiceProvider.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System.IServiceProvider" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IndexOutOfRangeException.xml b/mcs/docs/apidocs/xml/en/System/IndexOutOfRangeException.xml
new file mode 100644
index 00000000000..d99b0ffdfc2
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IndexOutOfRangeException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IndexOutOfRangeException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IndexOutOfRangeException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="IndexOutOfRangeException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="IndexOutOfRangeException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Int16.xml b/mcs/docs/apidocs/xml/en/System/Int16.xml
new file mode 100644
index 00000000000..a77115e18da
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Int16.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Int16" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Int32.xml b/mcs/docs/apidocs/xml/en/System/Int32.xml
new file mode 100644
index 00000000000..5b1a4cf7862
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Int32.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Int32" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Int64.xml b/mcs/docs/apidocs/xml/en/System/Int64.xml
new file mode 100644
index 00000000000..4b41733dd52
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Int64.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Int64" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IntPtr.xml b/mcs/docs/apidocs/xml/en/System/IntPtr.xml
new file mode 100644
index 00000000000..b28512927c6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IntPtr.xml
@@ -0,0 +1,120 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.IntPtr" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IntPtr(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="i32">TODO</param>

+        </constructor>

+        <constructor name="IntPtr(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="i64">TODO</param>

+        </constructor>

+        <constructor name="IntPtr(System.Void*)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ptr">TODO</param>

+        </constructor>

+        <field name="Zero">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Size">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="si">TODO</param>

+            <param name="sc">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToPointer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Equality(System.IntPtr, System.IntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.IntPtr, System.IntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Void*)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.IntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.IntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.IntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/IntegerFormatter.xml b/mcs/docs/apidocs/xml/en/System/IntegerFormatter.xml
new file mode 100644
index 00000000000..57fa716d366
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/IntegerFormatter.xml
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.IntegerFormatter" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="IntegerFormatter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <method name="NumberToString(System.String, System.Globalization.NumberFormatInfo, System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="nfi">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NumberToString(System.String, System.Globalization.NumberFormatInfo, System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="nfi">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NumberToString(System.String, System.Globalization.NumberFormatInfo, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="nfi">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NumberToString(System.String, System.Globalization.NumberFormatInfo, System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="nfi">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NumberToString(System.String, System.Globalization.NumberFormatInfo, System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="nfi">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NumberToString(System.String, System.Globalization.NumberFormatInfo, System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="nfi">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NumberToString(System.String, System.Globalization.NumberFormatInfo, System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="nfi">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="NumberToString(System.String, System.Globalization.NumberFormatInfo, System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="nfi">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/InvalidCastException.xml b/mcs/docs/apidocs/xml/en/System/InvalidCastException.xml
new file mode 100644
index 00000000000..5fc51c4dc84
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/InvalidCastException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.InvalidCastException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="InvalidCastException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="InvalidCastException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="InvalidCastException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/InvalidOperationException.xml b/mcs/docs/apidocs/xml/en/System/InvalidOperationException.xml
new file mode 100644
index 00000000000..aeb66fe35aa
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/InvalidOperationException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.InvalidOperationException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="InvalidOperationException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="InvalidOperationException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="InvalidOperationException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/InvalidProgramException.xml b/mcs/docs/apidocs/xml/en/System/InvalidProgramException.xml
new file mode 100644
index 00000000000..29bbfb054f0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/InvalidProgramException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.InvalidProgramException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="InvalidProgramException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="InvalidProgramException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="InvalidProgramException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/LoaderOptimization.xml b/mcs/docs/apidocs/xml/en/System/LoaderOptimization.xml
new file mode 100644
index 00000000000..72bd0496a13
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/LoaderOptimization.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.LoaderOptimization" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/LoaderOptimizationAttribute.xml b/mcs/docs/apidocs/xml/en/System/LoaderOptimizationAttribute.xml
new file mode 100644
index 00000000000..17bef7724ac
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/LoaderOptimizationAttribute.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.LoaderOptimizationAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="LoaderOptimizationAttribute(System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="LoaderOptimizationAttribute(System.LoaderOptimization)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/LocalDataStoreSlot.xml b/mcs/docs/apidocs/xml/en/System/LocalDataStoreSlot.xml
new file mode 100644
index 00000000000..7c8d7ca3268
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/LocalDataStoreSlot.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.LocalDataStoreSlot" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="LocalDataStoreSlot">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/MTAThreadAttribute.xml b/mcs/docs/apidocs/xml/en/System/MTAThreadAttribute.xml
new file mode 100644
index 00000000000..1f515ee74aa
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/MTAThreadAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.MTAThreadAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MTAThreadAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/MarshalByRefObject.xml b/mcs/docs/apidocs/xml/en/System/MarshalByRefObject.xml
new file mode 100644
index 00000000000..2e0885081ee
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/MarshalByRefObject.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.MarshalByRefObject" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <method name="InitializeLifetimeService">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLifetimeService">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CreateObjRef(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Math.xml b/mcs/docs/apidocs/xml/en/System/Math.xml
new file mode 100644
index 00000000000..4dc60f68739
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Math.xml
@@ -0,0 +1,398 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Math" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="E">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="PI">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="Abs(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Abs(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Abs(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Abs(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Abs(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Abs(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Abs(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Ceiling(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Floor(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IEEERemainder(System.Double, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <param name="y">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Log(System.Double, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="newBase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.Byte, System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.Double, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.Single, System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.Int64, System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.SByte, System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.Int16, System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.UInt32, System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.UInt64, System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Max(System.UInt16, System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.Byte, System.Byte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.Decimal, System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.Double, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.Single, System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.Int64, System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.SByte, System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.Int16, System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.UInt32, System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.UInt64, System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Min(System.UInt16, System.UInt16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="val1">TODO</param>

+            <param name="val2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Round(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Round(System.Decimal, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <param name="decimals">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Round(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="d">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Round(System.Double, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="digits">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sign(System.Decimal)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sign(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sign(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sign(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sign(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sign(System.SByte)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sign(System.Int16)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sin(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Cos(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Tan(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sinh(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Cosh(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Tanh(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Acos(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Asin(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Atan(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Atan2(System.Double, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="y">TODO</param>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Exp(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Log(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Log10(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Pow(System.Double, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <param name="y">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Sqrt(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="x">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/MemberAccessException.xml b/mcs/docs/apidocs/xml/en/System/MemberAccessException.xml
new file mode 100644
index 00000000000..eac96a1ae5a
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/MemberAccessException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.MemberAccessException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MemberAccessException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="MemberAccessException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="MemberAccessException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/MethodAccessException.xml b/mcs/docs/apidocs/xml/en/System/MethodAccessException.xml
new file mode 100644
index 00000000000..c68a27b1510
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/MethodAccessException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.MethodAccessException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MethodAccessException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="MethodAccessException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="MethodAccessException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/MissingFieldException.xml b/mcs/docs/apidocs/xml/en/System/MissingFieldException.xml
new file mode 100644
index 00000000000..30f98adcd08
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/MissingFieldException.xml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.MissingFieldException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MissingFieldException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="MissingFieldException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="MissingFieldException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+        <constructor name="MissingFieldException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="className">TODO</param>

+            <param name="fieldName">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/MissingMemberException.xml b/mcs/docs/apidocs/xml/en/System/MissingMemberException.xml
new file mode 100644
index 00000000000..7825779d182
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/MissingMemberException.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.MissingMemberException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MissingMemberException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="MissingMemberException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="MissingMemberException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <constructor name="MissingMemberException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="className">TODO</param>

+            <param name="memberName">TODO</param>

+        </constructor>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/MissingMethodException.xml b/mcs/docs/apidocs/xml/en/System/MissingMethodException.xml
new file mode 100644
index 00000000000..06c0ff131dc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/MissingMethodException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.MissingMethodException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MissingMethodException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="MissingMethodException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="MissingMethodException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/MonoDummy.xml b/mcs/docs/apidocs/xml/en/System/MonoDummy.xml
new file mode 100644
index 00000000000..9647a380b5f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/MonoDummy.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.MonoDummy" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MonoDummy">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/MonoTODOAttribute.xml b/mcs/docs/apidocs/xml/en/System/MonoTODOAttribute.xml
new file mode 100644
index 00000000000..1134d19bfcb
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/MonoTODOAttribute.xml
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.MonoTODOAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MonoTODOAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="MonoTODOAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="comment">TODO</param>

+        </constructor>

+        <property name="Comment">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/MulticastNotSupportedException.xml b/mcs/docs/apidocs/xml/en/System/MulticastNotSupportedException.xml
new file mode 100644
index 00000000000..88a50bdfecf
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/MulticastNotSupportedException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.MulticastNotSupportedException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="MulticastNotSupportedException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="MulticastNotSupportedException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="MulticastNotSupportedException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/NonSerializedAttribute.xml b/mcs/docs/apidocs/xml/en/System/NonSerializedAttribute.xml
new file mode 100644
index 00000000000..517d471da5d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/NonSerializedAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.NonSerializedAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NonSerializedAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/NotFiniteNumberException.xml b/mcs/docs/apidocs/xml/en/System/NotFiniteNumberException.xml
new file mode 100644
index 00000000000..0dca3b530e7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/NotFiniteNumberException.xml
@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.NotFiniteNumberException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NotFiniteNumberException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="NotFiniteNumberException(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="offending_number">TODO</param>

+        </constructor>

+        <constructor name="NotFiniteNumberException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="NotFiniteNumberException(System.String, System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="offending_number">TODO</param>

+        </constructor>

+        <constructor name="NotFiniteNumberException(System.String, System.Double, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="offending_number">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <property name="OffendingNumber">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/NotImplementedException.xml b/mcs/docs/apidocs/xml/en/System/NotImplementedException.xml
new file mode 100644
index 00000000000..0f2773339c8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/NotImplementedException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.NotImplementedException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NotImplementedException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="NotImplementedException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="NotImplementedException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/NotSupportedException.xml b/mcs/docs/apidocs/xml/en/System/NotSupportedException.xml
new file mode 100644
index 00000000000..3f6f972dab9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/NotSupportedException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.NotSupportedException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NotSupportedException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="NotSupportedException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="NotSupportedException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/NullReferenceException.xml b/mcs/docs/apidocs/xml/en/System/NullReferenceException.xml
new file mode 100644
index 00000000000..1d0540b28ba
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/NullReferenceException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.NullReferenceException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="NullReferenceException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="NullReferenceException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="NullReferenceException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ObjectDisposedException.xml b/mcs/docs/apidocs/xml/en/System/ObjectDisposedException.xml
new file mode 100644
index 00000000000..05db743f2b4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ObjectDisposedException.xml
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ObjectDisposedException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ObjectDisposedException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objectName">TODO</param>

+        </constructor>

+        <constructor name="ObjectDisposedException(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="objectName">TODO</param>

+            <param name="message">TODO</param>

+        </constructor>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ObjectName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ObsoleteAttribute.xml b/mcs/docs/apidocs/xml/en/System/ObsoleteAttribute.xml
new file mode 100644
index 00000000000..682b19e784b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ObsoleteAttribute.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ObsoleteAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ObsoleteAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="ObsoleteAttribute(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="ObsoleteAttribute(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="error">TODO</param>

+        </constructor>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsError">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/OperatingSystem.xml b/mcs/docs/apidocs/xml/en/System/OperatingSystem.xml
new file mode 100644
index 00000000000..1ded618514e
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/OperatingSystem.xml
@@ -0,0 +1,45 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.OperatingSystem" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="OperatingSystem(System.PlatformID, System.Version)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="platform">TODO</param>

+            <param name="version">TODO</param>

+        </constructor>

+        <property name="Platform">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Version">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/OutOfMemoryException.xml b/mcs/docs/apidocs/xml/en/System/OutOfMemoryException.xml
new file mode 100644
index 00000000000..9de8aa08af3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/OutOfMemoryException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.OutOfMemoryException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="OutOfMemoryException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="OutOfMemoryException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="OutOfMemoryException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/OverflowException.xml b/mcs/docs/apidocs/xml/en/System/OverflowException.xml
new file mode 100644
index 00000000000..3e8617eeada
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/OverflowException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.OverflowException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="OverflowException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="OverflowException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="OverflowException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ParamArrayAttribute.xml b/mcs/docs/apidocs/xml/en/System/ParamArrayAttribute.xml
new file mode 100644
index 00000000000..4c0b4a1c0a3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ParamArrayAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ParamArrayAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ParamArrayAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/PlatformID.xml b/mcs/docs/apidocs/xml/en/System/PlatformID.xml
new file mode 100644
index 00000000000..3ac63a822ff
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/PlatformID.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.PlatformID" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/PlatformNotSupportedException.xml b/mcs/docs/apidocs/xml/en/System/PlatformNotSupportedException.xml
new file mode 100644
index 00000000000..0b78710d4b0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/PlatformNotSupportedException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.PlatformNotSupportedException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="PlatformNotSupportedException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="PlatformNotSupportedException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="PlatformNotSupportedException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Random.xml b/mcs/docs/apidocs/xml/en/System/Random.xml
new file mode 100644
index 00000000000..b77b7c483a9
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Random.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Random" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Random">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="Random(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="Seed">TODO</param>

+        </constructor>

+        <method name="NextDouble">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="NextBytes(System.Byte[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="buffer">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Next(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="minValue">TODO</param>

+            <param name="maxValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Next(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="maxValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Next">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/RankException.xml b/mcs/docs/apidocs/xml/en/System/RankException.xml
new file mode 100644
index 00000000000..5cbcfebf565
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/RankException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.RankException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="RankException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="RankException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="RankException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ResolveEventArgs.xml b/mcs/docs/apidocs/xml/en/System/ResolveEventArgs.xml
new file mode 100644
index 00000000000..77771134dc3
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ResolveEventArgs.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ResolveEventArgs" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ResolveEventArgs(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+        </constructor>

+        <property name="Name">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ResolveEventHandler.xml b/mcs/docs/apidocs/xml/en/System/ResolveEventHandler.xml
new file mode 100644
index 00000000000..43fcb9782d6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ResolveEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.ResolveEventHandler" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/RuntimeArgumentHandle.xml b/mcs/docs/apidocs/xml/en/System/RuntimeArgumentHandle.xml
new file mode 100644
index 00000000000..8908991d47c
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/RuntimeArgumentHandle.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.RuntimeArgumentHandle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/RuntimeFieldHandle.xml b/mcs/docs/apidocs/xml/en/System/RuntimeFieldHandle.xml
new file mode 100644
index 00000000000..ff0f5dcd56d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/RuntimeFieldHandle.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.RuntimeFieldHandle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/RuntimeMethodHandle.xml b/mcs/docs/apidocs/xml/en/System/RuntimeMethodHandle.xml
new file mode 100644
index 00000000000..65f767842d7
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/RuntimeMethodHandle.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.RuntimeMethodHandle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/RuntimeTypeHandle.xml b/mcs/docs/apidocs/xml/en/System/RuntimeTypeHandle.xml
new file mode 100644
index 00000000000..6e177412341
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/RuntimeTypeHandle.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.RuntimeTypeHandle" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="Value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/SByte.xml b/mcs/docs/apidocs/xml/en/System/SByte.xml
new file mode 100644
index 00000000000..42175ecc4ce
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/SByte.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.SByte" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/STAThreadAttribute.xml b/mcs/docs/apidocs/xml/en/System/STAThreadAttribute.xml
new file mode 100644
index 00000000000..3dcf8381a22
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/STAThreadAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.STAThreadAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="STAThreadAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/SerializableAttribute.xml b/mcs/docs/apidocs/xml/en/System/SerializableAttribute.xml
new file mode 100644
index 00000000000..c01e94817fc
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/SerializableAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.SerializableAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SerializableAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Single.xml b/mcs/docs/apidocs/xml/en/System/Single.xml
new file mode 100644
index 00000000000..18b93d8ccef
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Single.xml
@@ -0,0 +1,225 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Single" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Epsilon">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="NaN">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="PositiveInfinity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="NegativeInfinity">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsInfinity(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="f">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsNaN(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="f">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsNegativeInfinity(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="f">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsPositiveInfinity(System.Single)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="f">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/SpecialFolder.xml b/mcs/docs/apidocs/xml/en/System/SpecialFolder.xml
new file mode 100644
index 00000000000..c61bab16fa8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/SpecialFolder.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.Environment+SpecialFolder" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/StackOverflowException.xml b/mcs/docs/apidocs/xml/en/System/StackOverflowException.xml
new file mode 100644
index 00000000000..97be57541d8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/StackOverflowException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.StackOverflowException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="StackOverflowException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="StackOverflowException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="StackOverflowException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/String.xml b/mcs/docs/apidocs/xml/en/System/String.xml
new file mode 100644
index 00000000000..20ef1ca3d79
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/String.xml
@@ -0,0 +1,630 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.String" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="String(System.Char*)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="String(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="String(System.SByte*)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="String(System.Char, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <param name="count">TODO</param>

+        </constructor>

+        <constructor name="String(System.Char*, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="length">TODO</param>

+        </constructor>

+        <constructor name="String(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="length">TODO</param>

+        </constructor>

+        <constructor name="String(System.SByte*, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="length">TODO</param>

+        </constructor>

+        <constructor name="String(System.SByte*, System.Int32, System.Int32, System.Text.Encoding)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="length">TODO</param>

+            <param name="enc">TODO</param>

+        </constructor>

+        <field name="Empty">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Length">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Chars">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Compare(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strA">TODO</param>

+            <param name="strB">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Compare(System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strA">TODO</param>

+            <param name="strB">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Compare(System.String, System.String, System.Boolean, System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strA">TODO</param>

+            <param name="strB">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Compare(System.String, System.Int32, System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strA">TODO</param>

+            <param name="indexA">TODO</param>

+            <param name="strB">TODO</param>

+            <param name="indexB">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Compare(System.String, System.Int32, System.String, System.Int32, System.Int32, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strA">TODO</param>

+            <param name="indexA">TODO</param>

+            <param name="strB">TODO</param>

+            <param name="indexB">TODO</param>

+            <param name="length">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Compare(System.String, System.Int32, System.String, System.Int32, System.Int32, System.Boolean, System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strA">TODO</param>

+            <param name="indexA">TODO</param>

+            <param name="strB">TODO</param>

+            <param name="indexB">TODO</param>

+            <param name="length">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareOrdinal(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strA">TODO</param>

+            <param name="strB">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareOrdinal(System.String, System.Int32, System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="strA">TODO</param>

+            <param name="indexA">TODO</param>

+            <param name="strB">TODO</param>

+            <param name="indexB">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Concat(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="arg">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Concat(System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="args">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Concat(System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Concat(System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Concat(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str0">TODO</param>

+            <param name="str1">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Concat(System.Object, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <param name="arg2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Concat(System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str0">TODO</param>

+            <param name="str1">TODO</param>

+            <param name="str2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Concat(System.String, System.String, System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str0">TODO</param>

+            <param name="str1">TODO</param>

+            <param name="str2">TODO</param>

+            <param name="str3">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Copy(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CopyTo(System.Int32, System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="sourceIndex">TODO</param>

+            <param name="destination">TODO</param>

+            <param name="destinationIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="EndsWith(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Format(System.String, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Format(System.String, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Format(System.String, System.Object, System.Object, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="arg0">TODO</param>

+            <param name="arg1">TODO</param>

+            <param name="arg2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Format(System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="args">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Format(System.IFormatProvider, System.String, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <param name="format">TODO</param>

+            <param name="args">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEnumerator">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Char, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.Char, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOf(System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOfAny(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOfAny(System.Char[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <param name="startIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IndexOfAny(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Insert(System.Int32, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="startIndex">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Intern(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsInterned(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="str">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Join(System.String, System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="separator">TODO</param>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Join(System.String, System.String[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="separator">TODO</param>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.Char, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.Char, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOf(System.String, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOfAny(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOfAny(System.Char[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <param name="startIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="LastIndexOfAny(System.Char[], System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="values">TODO</param>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="PadLeft(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="totalWidth">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="PadLeft(System.Int32, System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="totalWidth">TODO</param>

+            <param name="padChar">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="PadRight(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="totalWidth">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="PadRight(System.Int32, System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="totalWidth">TODO</param>

+            <param name="padChar">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Remove(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="startIndex">TODO</param>

+            <param name="count">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.Char, System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="oldChar">TODO</param>

+            <param name="newChar">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Replace(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="oldValue">TODO</param>

+            <param name="newValue">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Split(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="separator">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Split(System.Char[], System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="separator">TODO</param>

+            <param name="maxCount">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="StartsWith(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Substring(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="startIndex">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Substring(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="startIndex">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToCharArray">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToCharArray(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="startIndex">TODO</param>

+            <param name="length">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToLower">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToLower(System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUpper">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUpper(System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Trim">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Trim(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="trimChars">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TrimEnd(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="trimChars">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="TrimStart(System.Char[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="trimChars">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Equality(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="a">TODO</param>

+            <param name="b">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/SystemException.xml b/mcs/docs/apidocs/xml/en/System/SystemException.xml
new file mode 100644
index 00000000000..0ab0152e457
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/SystemException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.SystemException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="SystemException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="SystemException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="SystemException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/ThreadStaticAttribute.xml b/mcs/docs/apidocs/xml/en/System/ThreadStaticAttribute.xml
new file mode 100644
index 00000000000..e74c0789ca4
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/ThreadStaticAttribute.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.ThreadStaticAttribute" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="ThreadStaticAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/TimeSpan.xml b/mcs/docs/apidocs/xml/en/System/TimeSpan.xml
new file mode 100644
index 00000000000..d2d45f7dd90
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/TimeSpan.xml
@@ -0,0 +1,292 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.TimeSpan" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TimeSpan(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="TimeSpan(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="hours">TODO</param>

+            <param name="minutes">TODO</param>

+            <param name="seconds">TODO</param>

+        </constructor>

+        <constructor name="TimeSpan(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="days">TODO</param>

+            <param name="hours">TODO</param>

+            <param name="minutes">TODO</param>

+            <param name="seconds">TODO</param>

+        </constructor>

+        <constructor name="TimeSpan(System.Int32, System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="days">TODO</param>

+            <param name="hours">TODO</param>

+            <param name="minutes">TODO</param>

+            <param name="seconds">TODO</param>

+            <param name="milliseconds">TODO</param>

+        </constructor>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Zero">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TicksPerDay">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TicksPerHour">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TicksPerMillisecond">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TicksPerMinute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="TicksPerSecond">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Days">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Hours">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Milliseconds">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Minutes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Seconds">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Ticks">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TotalDays">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TotalHours">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TotalMilliseconds">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TotalMinutes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TotalSeconds">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Add(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ts">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Compare(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Duration">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromDays(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromHours(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromMinutes(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromSeconds(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromMilliseconds(System.Double)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromTicks(System.Int64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Negate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Subtract(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="ts">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Addition(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Equality(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_GreaterThan(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_GreaterThanOrEqual(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_LessThan(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_LessThanOrEqual(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Subtraction(System.TimeSpan, System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t1">TODO</param>

+            <param name="t2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_UnaryNegation(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_UnaryPlus(System.TimeSpan)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="t">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/TimeZone.xml b/mcs/docs/apidocs/xml/en/System/TimeZone.xml
new file mode 100644
index 00000000000..7f13481afe1
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/TimeZone.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.TimeZone" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <property name="CurrentTimeZone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DaylightName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="StandardName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="ToUniversalTime(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToLocalTime(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDaylightSavingTime(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetUtcOffset(System.DateTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDaylightChanges(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="year">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsDaylightSavingTime(System.DateTime, System.Globalization.DaylightTime)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="time">TODO</param>

+            <param name="daylightTimes">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Type.xml b/mcs/docs/apidocs/xml/en/System/Type.xml
new file mode 100644
index 00000000000..371e0537f42
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Type.xml
@@ -0,0 +1,758 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Type" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="Delimiter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="EmptyTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="FilterAttribute">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="FilterName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="FilterNameIgnoreCase">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="Missing">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Assembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AssemblyQualifiedName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Attributes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="BaseType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DeclaringType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="DefaultBinder">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="FullName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="GUID">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HasElementType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsAbstract">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsAnsiClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsArray">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsAutoClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsAutoLayout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsByRef">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsCOMObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsContextful">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsEnum">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsExplicitLayout">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsImport">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsInterface">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsLayoutSequential">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsMarshalByRef">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsNestedAssembly">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsNestedFamANDAssem">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsNestedFamily">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsNestedFamORAssem">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsNestedPrivate">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsNestedPublic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsNotPublic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsPointer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsPrimitive">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsPublic">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSealed">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSerializable">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsSpecialName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsUnicodeClass">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsValueType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="MemberType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Module">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Namespace">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="ReflectedType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TypeHandle">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TypeInitializer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UnderlyingSystemType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="InvokeMember(System.String, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object, System.Object[], System.Reflection.ParameterModifier[], System.Globalization.CultureInfo, System.String[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="target">TODO</param>

+            <param name="args">TODO</param>

+            <param name="modifiers">TODO</param>

+            <param name="culture">TODO</param>

+            <param name="namedParameters">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperty(System.String, System.Reflection.BindingFlags, System.Reflection.Binder, System.Type, System.Type[], System.Reflection.ParameterModifier[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="types">TODO</param>

+            <param name="modifiers">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperty(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperties(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethods(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethod(System.String, System.Reflection.BindingFlags, System.Reflection.Binder, System.Type[], System.Reflection.ParameterModifier[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="types">TODO</param>

+            <param name="modifiers">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethod(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMembers(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMember(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFields(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetField(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FindMembers(System.Reflection.MemberTypes, System.Reflection.BindingFlags, System.Reflection.MemberFilter, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="memberType">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <param name="filter">TODO</param>

+            <param name="filterCriteria">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetDefaultMembers">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetConstructors(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNestedTypes(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNestedType(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMember(System.String, System.Reflection.MemberTypes, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="type">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvents(System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvents">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvent(System.String, System.Reflection.BindingFlags)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetElementType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetArrayRank">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsInstanceOfType(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsAssignableFrom(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterfaces">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterfaceMap(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="interfaceType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterface(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FindInterfaces(System.Reflection.TypeFilter, System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="filter">TODO</param>

+            <param name="filterCriteria">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="typeName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="typeName">TODO</param>

+            <param name="throwOnError">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetType(System.String, System.Boolean, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="typeName">TODO</param>

+            <param name="throwOnError">TODO</param>

+            <param name="ignoreCase">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeArray(System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="args">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeFromCLSID(System.Guid)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="clsid">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeFromCLSID(System.Guid, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="clsid">TODO</param>

+            <param name="throwOnError">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeFromCLSID(System.Guid, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="clsid">TODO</param>

+            <param name="server">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeFromCLSID(System.Guid, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="clsid">TODO</param>

+            <param name="server">TODO</param>

+            <param name="throwOnError">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeFromHandle(System.RuntimeTypeHandle)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="handle">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeFromProgID(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="progID">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeFromProgID(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="progID">TODO</param>

+            <param name="throwOnError">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeFromProgID(System.String, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="progID">TODO</param>

+            <param name="server">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeFromProgID(System.String, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="progID">TODO</param>

+            <param name="server">TODO</param>

+            <param name="throwOnError">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeHandle(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsSubclassOf(System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="c">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetInterface(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetEvent(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetField(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetFields">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMember(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMembers">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethod(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethod(System.String, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="types">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethod(System.String, System.Type[], System.Reflection.ParameterModifier[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="types">TODO</param>

+            <param name="modifiers">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethod(System.String, System.Reflection.BindingFlags, System.Reflection.Binder, System.Reflection.CallingConventions, System.Type[], System.Reflection.ParameterModifier[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="bindingAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="callConvention">TODO</param>

+            <param name="types">TODO</param>

+            <param name="modifiers">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetMethods">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNestedType(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetNestedTypes">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperties">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperty(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperty(System.String, System.Type)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="returnType">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperty(System.String, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="types">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperty(System.String, System.Type, System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="types">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetProperty(System.String, System.Type, System.Type[], System.Reflection.ParameterModifier[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="returnType">TODO</param>

+            <param name="types">TODO</param>

+            <param name="modifiers">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetConstructor(System.Type[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="types">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetConstructor(System.Reflection.BindingFlags, System.Reflection.Binder, System.Type[], System.Reflection.ParameterModifier[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="types">TODO</param>

+            <param name="modifiers">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetConstructor(System.Reflection.BindingFlags, System.Reflection.Binder, System.Reflection.CallingConventions, System.Type[], System.Reflection.ParameterModifier[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="bindingAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="callConvention">TODO</param>

+            <param name="types">TODO</param>

+            <param name="modifiers">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetConstructors">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="InvokeMember(System.String, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object, System.Object[])">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="target">TODO</param>

+            <param name="args">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="InvokeMember(System.String, System.Reflection.BindingFlags, System.Reflection.Binder, System.Object, System.Object[], System.Globalization.CultureInfo)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <param name="invokeAttr">TODO</param>

+            <param name="binder">TODO</param>

+            <param name="target">TODO</param>

+            <param name="args">TODO</param>

+            <param name="culture">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/TypeCode.xml b/mcs/docs/apidocs/xml/en/System/TypeCode.xml
new file mode 100644
index 00000000000..899d9f8400b
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/TypeCode.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.TypeCode" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/TypeInitializationException.xml b/mcs/docs/apidocs/xml/en/System/TypeInitializationException.xml
new file mode 100644
index 00000000000..e465dfc8a7d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/TypeInitializationException.xml
@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.TypeInitializationException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TypeInitializationException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="type_name">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <property name="TypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/TypeLoadException.xml b/mcs/docs/apidocs/xml/en/System/TypeLoadException.xml
new file mode 100644
index 00000000000..49e924048e0
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/TypeLoadException.xml
@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.TypeLoadException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TypeLoadException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="TypeLoadException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="TypeLoadException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+        <property name="Message">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TypeName">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/TypeUnloadedException.xml b/mcs/docs/apidocs/xml/en/System/TypeUnloadedException.xml
new file mode 100644
index 00000000000..94ee9063814
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/TypeUnloadedException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.TypeUnloadedException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="TypeUnloadedException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="TypeUnloadedException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="TypeUnloadedException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="innerException">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/UInt16.xml b/mcs/docs/apidocs/xml/en/System/UInt16.xml
new file mode 100644
index 00000000000..400ed0d93d6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/UInt16.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.UInt16" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/UInt32.xml b/mcs/docs/apidocs/xml/en/System/UInt32.xml
new file mode 100644
index 00000000000..61270db013d
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/UInt32.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.UInt32" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/UInt64.xml b/mcs/docs/apidocs/xml/en/System/UInt64.xml
new file mode 100644
index 00000000000..05617cfb193
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/UInt64.xml
@@ -0,0 +1,185 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.UInt64" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <field name="value">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MaxValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="MinValue">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <method name="ToUInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToType(System.Type, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="conversionType">TODO</param>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSingle(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToSByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt64(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt32(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToInt16(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDouble(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDecimal(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToDateTime(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToChar(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToByte(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToBoolean(System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="provider">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetTypeCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="o">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Parse(System.String, System.Globalization.NumberStyles, System.IFormatProvider)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="s">TODO</param>

+            <param name="style">TODO</param>

+            <param name="fp">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="format">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/UIntPtr.xml b/mcs/docs/apidocs/xml/en/System/UIntPtr.xml
new file mode 100644
index 00000000000..2c29054edc6
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/UIntPtr.xml
@@ -0,0 +1,113 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.UIntPtr" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UIntPtr(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="UIntPtr(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <constructor name="UIntPtr(System.Void*)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+        </constructor>

+        <field name="Zero">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="Size">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt32">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToUInt64">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToPointer">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Equality(System.UIntPtr, System.UIntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value1">TODO</param>

+            <param name="value2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.UIntPtr, System.UIntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value1">TODO</param>

+            <param name="value2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.UIntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.UIntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.UInt64)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.Void*)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.UIntPtr)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Explicit(System.UInt32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="value">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/UnauthorizedAccessException.xml b/mcs/docs/apidocs/xml/en/System/UnauthorizedAccessException.xml
new file mode 100644
index 00000000000..eb5de2697ae
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/UnauthorizedAccessException.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.UnauthorizedAccessException" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UnauthorizedAccessException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="UnauthorizedAccessException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+        <constructor name="UnauthorizedAccessException(System.String, System.Exception)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+            <param name="inner">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/UnhandledExceptionEventArgs.xml b/mcs/docs/apidocs/xml/en/System/UnhandledExceptionEventArgs.xml
new file mode 100644
index 00000000000..8997b926dab
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/UnhandledExceptionEventArgs.xml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.UnhandledExceptionEventArgs" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UnhandledExceptionEventArgs(System.Object, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="exception">TODO</param>

+            <param name="isTerminating">TODO</param>

+        </constructor>

+        <property name="ExceptionObject">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsTerminating">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/UnhandledExceptionEventHandler.xml b/mcs/docs/apidocs/xml/en/System/UnhandledExceptionEventHandler.xml
new file mode 100644
index 00000000000..b00ec29905f
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/UnhandledExceptionEventHandler.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <delegate name="System.UnhandledExceptionEventHandler" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </delegate>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Uri.xml b/mcs/docs/apidocs/xml/en/System/Uri.xml
new file mode 100644
index 00000000000..1917d253ecd
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Uri.xml
@@ -0,0 +1,233 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Uri" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Uri(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="uri">TODO</param>

+        </constructor>

+        <constructor name="Uri(System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="uri">TODO</param>

+            <param name="dontEscape">TODO</param>

+        </constructor>

+        <constructor name="Uri(System.Uri, System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="baseUri">TODO</param>

+            <param name="relativeUri">TODO</param>

+        </constructor>

+        <constructor name="Uri(System.Uri, System.String, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="baseUri">TODO</param>

+            <param name="relativeUri">TODO</param>

+            <param name="dontEscape">TODO</param>

+        </constructor>

+        <field name="SchemeDelimiter">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="UriSchemeFile">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="UriSchemeFtp">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="UriSchemeGopher">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="UriSchemeHttp">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="UriSchemeHttps">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="UriSchemeMailto">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <field name="UriSchemeNntp">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </field>

+        <property name="AbsolutePath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="AbsoluteUri">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Authority">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Fragment">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Host">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="HostNameType">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsDefaultPort">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsFile">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsLoopback">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="IsUnc">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="LocalPath">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="PathAndQuery">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Port">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Query">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Scheme">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Segments">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UserEscaped">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="UserInfo">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="compared">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="CheckHostName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="name">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="CheckSchemeName(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="schemeName">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="FromHex(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="digit">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="HexEscape(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="character">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="HexUnescape(System.String, System.Int32&amp;)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="pattern">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsHexDigit(System.Char)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="character">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="IsHexEncoding(System.String, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="pattern">TODO</param>

+            <param name="index">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetLeftPart(System.UriPartial)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="part">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="MakeRelative(System.Uri)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="toUri">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/UriFormatException.xml b/mcs/docs/apidocs/xml/en/System/UriFormatException.xml
new file mode 100644
index 00000000000..21024af1120
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/UriFormatException.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.UriFormatException" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="UriFormatException">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="UriFormatException(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="message">TODO</param>

+        </constructor>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/UriHostNameType.xml b/mcs/docs/apidocs/xml/en/System/UriHostNameType.xml
new file mode 100644
index 00000000000..05997be4025
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/UriHostNameType.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.UriHostNameType" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/UriPartial.xml b/mcs/docs/apidocs/xml/en/System/UriPartial.xml
new file mode 100644
index 00000000000..2a0365c09ac
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/UriPartial.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <enum name="System.UriPartial" assembly="System">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <member name="TODO" />

+    </enum>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Version.xml b/mcs/docs/apidocs/xml/en/System/Version.xml
new file mode 100644
index 00000000000..d2dc0664213
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Version.xml
@@ -0,0 +1,133 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.Version" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="Version">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+        </constructor>

+        <constructor name="Version(System.String)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="version">TODO</param>

+        </constructor>

+        <constructor name="Version(System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="major">TODO</param>

+            <param name="minor">TODO</param>

+        </constructor>

+        <constructor name="Version(System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="major">TODO</param>

+            <param name="minor">TODO</param>

+            <param name="build">TODO</param>

+        </constructor>

+        <constructor name="Version(System.Int32, System.Int32, System.Int32, System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="major">TODO</param>

+            <param name="minor">TODO</param>

+            <param name="build">TODO</param>

+            <param name="revision">TODO</param>

+        </constructor>

+        <property name="Build">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Major">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Minor">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Revision">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="CompareTo(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="version">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="Clone">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="GetHashCode">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="Equals(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="obj">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <returns>TODO</returns>

+        </method>

+        <method name="ToString(System.Int32)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="fields">TODO</param>

+            <returns>TODO</returns>

+        </method>

+        <operator name="op_Equality(System.Version, System.Version)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v1">TODO</param>

+            <param name="v2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_Inequality(System.Version, System.Version)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v1">TODO</param>

+            <param name="v2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_GreaterThan(System.Version, System.Version)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v1">TODO</param>

+            <param name="v2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_GreaterThanOrEqual(System.Version, System.Version)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v1">TODO</param>

+            <param name="v2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_LessThan(System.Version, System.Version)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v1">TODO</param>

+            <param name="v2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+        <operator name="op_LessThanOrEqual(System.Version, System.Version)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="v1">TODO</param>

+            <param name="v2">TODO</param>

+            <returns>TODO</returns>

+        </operator>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/Void.xml b/mcs/docs/apidocs/xml/en/System/Void.xml
new file mode 100644
index 00000000000..454ef01d3ab
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/Void.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <struct name="System.Void" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </struct>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/WeakReference.xml b/mcs/docs/apidocs/xml/en/System/WeakReference.xml
new file mode 100644
index 00000000000..ab5b93831e8
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/WeakReference.xml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <class name="System.WeakReference" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+        <constructor name="WeakReference(System.Object)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+        </constructor>

+        <constructor name="WeakReference(System.Object, System.Boolean)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="target">TODO</param>

+            <param name="trackResurrection">TODO</param>

+        </constructor>

+        <property name="IsAlive">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="Target">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <property name="TrackResurrection">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <value>TODO</value>

+        </property>

+        <method name="GetObjectData(System.Runtime.Serialization.SerializationInfo, System.Runtime.Serialization.StreamingContext)">

+            <summary>TODO</summary>

+            <remarks>TODO</remarks>

+            <param name="info">TODO</param>

+            <param name="context">TODO</param>

+            <returns>TODO</returns>

+        </method>

+    </class>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/apidocs/xml/en/System/_AppDomain.xml b/mcs/docs/apidocs/xml/en/System/_AppDomain.xml
new file mode 100644
index 00000000000..c162b997a20
--- /dev/null
+++ b/mcs/docs/apidocs/xml/en/System/_AppDomain.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>

+<!DOCTYPE monodoc SYSTEM "http://www.go-mono.org/monodoc.dtd">

+<monodoc language="en">

+    <interface name="System._AppDomain" assembly="corlib">

+        <summary>TODO</summary>

+        <remarks>TODO</remarks>

+    </interface>

+</monodoc>
\ No newline at end of file
diff --git a/mcs/docs/clr-abi.txt b/mcs/docs/clr-abi.txt
new file mode 100755
index 00000000000..99cce56c71f
--- /dev/null
+++ b/mcs/docs/clr-abi.txt
@@ -0,0 +1,3 @@
+* The generated code from the JIT by Microsoft uses registers
+  to pass arguments to functions rather than pushing then on the
+  stack.
\ No newline at end of file
diff --git a/mcs/docs/compiler b/mcs/docs/compiler
new file mode 100755
index 00000000000..5167eecad34
--- /dev/null
+++ b/mcs/docs/compiler
@@ -0,0 +1,407 @@
+		       The Internals of the Mono C# Compiler
+	
+				Miguel de Icaza
+			      (miguel@ximian.com)
+				      2002
+
+* Abstract
+
+	The Mono C# compiler is a C# compiler written in C# itself.
+	Its goals are to provide a free and alternate implementation
+	of the C# language.  The Mono C# compiler generates ECMA CIL
+	images through the use of the System.Reflection.Emit API which
+	enable the compiler to be platform independent.
+	
+* Overview: How the compiler fits together
+
+	The compilation process is managed by the compiler driver (it
+	lives in driver.cs).
+
+	The compiler reads a set of C# source code files, and parses
+	them.  Any assemblies or modules that the user might want to
+	use with his project are loaded after parsing is done.
+
+	Once all the files have been parsed, the type hierarchy is
+	resolved.  First interfaces are resolved, then types and
+	enumerations.
+
+	Once the type hierarchy is resolved, every type is populated:
+	fields, methods, indexers, properties, events and delegates
+	are entered into the type system.  
+
+	At this point the program skeleton has been completed.  The
+	next process is to actually emit the code for each of the
+	executable methods.  The compiler drives this from
+	RootContext.EmitCode.
+
+	Each type then has to populate its methods: populating a
+	method requires creating a structure that is used as the state
+	of the block being emitted (this is the EmitContext class) and
+	then generating code for the topmost statement (the Block).
+
+	Code generation has two steps: the first step is the semantic
+	analysis (Resolve method) that resolves any pending tasks, and
+	guarantees that the code is correct.  The second phase is the
+	actual code emission.  All errors are flagged during in the
+	"Resolution" process. 
+
+	After all code has been emitted, then the compiler closes all
+	the types (this basically tells the Reflection.Emit library to
+	finish up the types), resources, and definition of the entry
+	point are done at this point, and the output is saved to
+	disk. 
+
+* The parsing process
+
+	All the input files that make up a program need to be read in
+	advance, because C# allows declarations to happen after an
+	entity is used, for example, the following is a valid program:
+
+	class X : Y {
+		static void Main ()
+		{
+			a = "hello"; b = "world";
+		}
+		string a;
+	}
+	
+	class Y {
+		public string b;
+	}
+
+	At the time the assignment expression `a = "hello"' is parsed,
+	it is not know whether a is a class field from this class, or
+	its parents, or whether it is a property access or a variable
+	reference.  The actual meaning of `a' will not be discvored
+	until the semantic analysis phase.
+
+** The Tokenizer and the pre-processor
+
+	The tokenizer is contained in the file `cs-tokenizer.cs', and
+	the main entry point is the `token ()' method.  The tokenizer
+	implements the `yyParser.yyInput' interface, which is what the
+	Yacc/Jay parser will use when fetching tokens.  
+
+	Token definitions are generated by jay during the compilation
+	process, and those can be references from the tokenizer class
+	with the `Token.' prefix. 
+
+	Each time a token is returned, the location for the token is
+	recorded into the `Location' property, that can be accessed by
+	the parser.  The parser retrieves the Location properties as
+	it builds its internal representation to allow the semantic
+	analysis phase to produce error messages that can pin point
+	the location of the problem. 
+
+	Some tokens have values associated with it, for example when
+	the tokenizer encounters a string, it will return a
+	LITERAL_STRING token, and the actual string parsed will be
+	available in the `Value' property of the tokenizer.   The same
+	mechanism is used to return integers and floating point
+	numbers. 
+
+	C# has a limited pre-processor that allows conditional
+	compilation, but it is not as fully featured as the C
+	pre-processor, and most notably, macros are missing.  This
+	makes it simple to implement in very few lines and mesh it
+	with the tokenizer.
+
+	The `handle_preprocessing_directive' method in the tokenizer
+	handles all the pre-processing, and it is invoked when the '#'
+	symbol is found as the first token in a line.  
+
+	The state of the pre-processor is contained in a Stack called
+	`ifstack', this state is used to track the if/elif/else/endif
+	nesting and the current state.  The state is encoded in the
+	top of the stack as a number of values `TAKING',
+	`TAKEN_BEFORE', `ELSE_SEEN', `PARENT_TAKING'.
+
+** Locations
+
+	Locations are encoded as a 32-bit number (the Location
+	struct) that map each input source line to a linear number.
+	As new files are parsed, the Location manager is informed of
+	the new file, to allow it to map back from an int constant to
+	a file + line number. 
+
+	The tokenizer also tracks the column number for a token, but
+	this is currently not being used or encoded.  It could
+	probably be encoded in the low 9 bits, allowing for columns
+	from 1 to 512 to be encoded.
+
+* The Parser
+
+	The parser is written using Jay, which is a port of Berkeley
+	Yacc to Java, that I later ported to C#. 
+
+	Many people ask why the grammar of the parser does not match
+	exactly the definition in the C# specification.  The reason is
+	simple: the grammar in the C# specification is designed to be
+	consumed by humans, and not by a computer program.  Before
+	you can feed this grammar to a tool, it needs to be simplified
+	to allow the tool to generate a correct parser for it. 
+
+	In the Mono C# compiler, we use a class for each of the
+	statements and expressions in the C# language.  For example,
+	there is a `While' class for the the `while' statement, a
+	`Cast' class to represent a cast expression and so on.
+
+	There is a Statement class, and an Expression class which are
+	the base classes for statements and expressions. 
+
+** Namespaces
+	
+	Using list.
+
+* Internal Representation
+
+** Expressions
+
+	Expressions in the Mono C# compiler are represented by the
+	`Expression' class.  This is an abstract class that particular
+	kinds of expressions have to inherit from and override a few
+	methods.
+
+	The base Expression class contains two fields: `eclass' which
+	represents the "expression classification" (from the C#
+	specs) and the type of the expression.
+
+	Expressions have to be resolved before they are can be used.
+	The resolution process is implemented by overriding the
+	`DoResolve' method.  The DoResolve method has to set the
+	`eclass' field and the `type', perform all error checking and
+	computations that will be required for code generation at this
+	stage. 
+
+	The return value from DoResolve is an expression.  Most of the
+	time an Expression derived class will return itself (return
+	this) when it will handle the emission of the code itself, or
+	it can return a new Expression.
+
+	For example, the parser will create an "ElementAccess" class
+	for:
+
+		a [0] = 1;
+
+	During the resolution process, the compiler will know whether
+	this is an array access, or an indexer access.  And will
+	return either an ArrayAccess expression or an IndexerAccess
+	expression from DoResolve.
+
+
+
+*** The Expression Class
+
+	The utility functions that can be called by all children of
+	Expression. 
+
+** Constants
+
+	Constants in the Mono C# compiler are reprensented by the
+	abstract class `Constant'.  Constant is in turn derived from
+	Expression.  The base constructor for `Constant' just sets the
+	expression class to be an `ExprClass.Value', Constants are
+	born in a fully resolved state, so the `DoResolve' method
+	only returns a reference to itself.
+
+	Each Constant should implement the `GetValue' method which
+	returns an object with the actual contents of this constant, a
+	utility virtual method called `AsString' is used to render a
+	diagnostic message.  The output of AsString is shown to the
+	developer when an error or a warning is triggered.
+
+	Constant classes also participate in the constant folding
+	process.  Constant folding is invoked by those expressions
+	that can be constant folded invoking the functionality
+	provided by the ConstantFold class (cfold.cs).   
+
+	Each Constant has to implement a number of methods to convert
+	itself into a Constant of a different type.  These methods are
+	called `ConvertToXXXX' and they are invoked by the wrapper
+	functions `ToXXXX'.  These methods only perform implicit
+	numeric conversions.  Explicit conversions are handled by the
+	`Cast' expression class.
+
+	The `ToXXXX' methods are the entry point, and provide error
+	reporting in case a conversion can not be performed.
+
+** Constant Folding
+
+	The C# language requires constant folding to be implemented.
+	Constant folding is hooked up in the Binary.Resolve method.
+	If both sides of a binary expression are constants, then the
+	ConstantFold.BinaryFold routine is invoked.  
+
+	This routine implements all the binary operator rules, it
+	is a mirror of the code that generates code for binary
+	operators, but that has to be evaluated at runtime.
+
+	If the constants can be folded, then a new constant expression
+	is returned, if not, then the null value is returned (for
+	example, the concatenation of a string constant and a numeric
+	constant is deferred to the runtime). 
+
+** Side effects
+
+	a [i++]++ 
+	a [i++] += 5;
+
+** Statements
+
+* The semantic analysis 
+
+	Hence, the compiler driver has to parse all the input files.
+	Once all the input files have been parsed, and an internal
+	representation of the input program exists, the following
+	steps are taken:
+
+		* The interface hierarchy is resolved first.
+	 	  As the interface hierarchy is constructed,
+		  TypeBuilder objects are created for each one of
+		  them. 
+
+		* Classes and structure hierarchy is resolved next,
+		  TypeBuilder objects are created for them.
+
+		* Constants and enumerations are resolved.
+
+		* Method, indexer, properties, delegates and event
+		  definitions are now entered into the TypeBuilders. 
+
+		* Elements that contain code are now invoked to
+		  perform semantic analysis and code generation.
+
+* Output Generation
+
+** Code Generation
+
+	The EmitContext class is created any time that IL code is to
+	be generated (methods, properties, indexers and attributes all
+	create EmitContexts).  
+
+	The EmitContext keeps track of the current namespace and type
+	container.  This is used during name resolution.
+
+	An EmitContext is used by the underlying code generation
+	facilities to track the state of code generation:
+
+		* The ILGenerator used to generate code for this
+		  method.
+
+		* The TypeContainer where the code lives, this is used
+		  to access the TypeBuilder.
+
+		* The DeclSpace, this is used to resolve names through
+	 	  RootContext.LookupType in the various statements and
+	 	  expressions. 
+	
+	Code generation state is also tracked here:
+
+		* CheckState:
+
+		  This variable tracks the `checked' state of the
+		  compilation, it controls whether we should generate
+		  code that does overflow checking, or if we generate
+		  code that ignores overflows.
+		  
+		  The default setting comes from the command line
+		  option to generate checked or unchecked code plus
+		  any source code changes using the checked/unchecked
+		  statements or expressions.  Contrast this with the
+		  ConstantCheckState flag.
+
+		* ConstantCheckState
+		  
+		  The constant check state is always set to `true' and
+		  cant be changed from the command line.  The source
+		  code can change this setting with the `checked' and
+		  `unchecked' statements and expressions.
+		  
+		* IsStatic
+		  
+		  Whether we are emitting code inside a static or
+		  instance method
+		  
+		* ReturnType
+		  
+		  The value that is allowed to be returned or NULL if
+		  there is no return type.
+		  
+		  
+		* ContainerType
+		  
+		  Points to the Type (extracted from the
+		  TypeContainer) that declares this body of code
+		  summary>
+		  
+		  
+		* IsConstructor
+		  
+		  Whether this is generating code for a constructor
+
+		* CurrentBlock
+
+		  Tracks the current block being generated.
+
+		* ReturnLabel;
+		
+		  The location where return has to jump to return the
+		  value
+
+	A few variables are used to track the state for checking in
+	for loops, or in try/catch statements:
+
+		* InFinally
+		
+		  Whether we are in a Finally block
+
+		* InTry
+
+		  Whether we are in a Try block
+
+		* InCatch
+		  
+		  Whether we are in a Catch block
+
+		* InUnsafe
+		  Whether we are inside an unsafe block
+		
+* Miscelaneous
+
+** Error Processing.
+
+	Errors are reported during the various stages of the
+	compilation process.  The compiler stops its processing if
+	there are errors between the various phases.  This simplifies
+	the code, because it is safe to assume always that the data
+	structures that the compiler is operating on are always
+	consistent.
+
+	The error codes in the Mono C# compiler are the same as those
+	found in the Microsoft C# compiler, with a few exceptions
+	(where we report a few more errors, those are documented in
+	mcs/errors/errors.txt).  The goal is to reduce confussion to
+	the users, and also to help us track the progress of the
+	compiler in terms of the errors we report. 
+
+	The Report class provides error and warning display functions,
+	and also keeps an error count which is used to stop the
+	compiler between the phases.  
+
+	A couple of debugging tools are available here, and are useful
+	when extending or fixing bugs in the compiler.  If the
+	`--fatal' flag is passed to the compiler, the Report.Error
+	routine will throw an exception.  This can be used to pinpoint
+	the location of the bug and examine the variables around the
+	error location.
+
+	Warnings can be turned into errors by using the `--werror'
+	flag to the compiler. 
+
+	The report class also ignores warnings that have been
+	specified on the command line with the `--nowarn' flag.
+
+	Finally, code in the compiler uses the global variable
+	RootContext.WarningLevel in a few places to decide whether a
+	warning is worth reporting to the user or not.  
+
diff --git a/mcs/docs/control-flow-analysis.txt b/mcs/docs/control-flow-analysis.txt
new file mode 100644
index 00000000000..939c8bbba0c
--- /dev/null
+++ b/mcs/docs/control-flow-analysis.txt
@@ -0,0 +1,164 @@
+                       How Control Flow Analysis works in MCS
+        
+                                Martin Baulig
+                              (martin@gnome.org)
+                                      2002
+
+This document gives you a short overview how control flow analysis
+works in MCS.
+
+Control Flow Analysis is used to ensure that local variables are not
+accessed before they have been initialized and that all `out'
+parameters have been assigned before control leaves the current
+method.  To do this, the compiler keeps two bitvectors - one for the
+locals and one for the out parameters (the latter one isn't needed if
+a method doesn't have any `out' parameters).
+
+Each time the compiler encounters a branching of the program's control
+flow, these bitvectors are duplicated for each of the possible
+branches and then merged after the branching.
+
+* Simple branchings
+
+As a first rule, a local variable is only initialized if it's
+initialized in all possible branches:
+
+    1    int a;
+    2    if (something)
+    3       a = 3;
+    4    else
+    5       Console.WriteLine ("Hello World");
+    6    Console.WriteLine (a);
+
+In this example there's one branching of control flow (lines 2-5)
+which has two branches: the `if' block in line 3 and the `else' block
+in line 5.  In line 6, the local `a' hasn't been initialized because
+it is only initialized in the `if' case, but not in the `else' case.
+
+* Control may return from the current block
+
+However, there's an exception to this rule: control may return from
+the current block before it reaches its end:
+
+    1    int a;
+    2    if (something)
+    3       a = 3;
+    4    else
+    5       return;
+    6    Console.WriteLine (a);
+
+In this case, line 6 will only be reached in the `if' case, but not in
+the `else' case - so for the local `a' to be initialized, the `else'
+clause is of no importance.
+
+This means that we must change this simple rule to:
+
+     A local variable must be initialized in all possible branches
+     which do not return.
+
+* `out' parameters
+
+As a simple rule, an `out' parameter must be assigned before control
+leaves the current method.  If `a' is an `out' parameter in the
+following example, it must have been initialized in line 5 and in line
+8 because control may return to the caller in these lines.
+
+    1    if (something)
+    2       Console.WriteLine ("Hello World");
+    3    else {
+    4       a = 8;
+    5       return;
+    6    }
+    7    a = 9;
+    8    return;
+
+* Return vs. Break
+
+This is not so simple as it looks like, let's assume `b' is an `out'
+parameter:
+
+    1    int a;
+    2    do {
+    3       if (something)
+    3          a = 3;
+    4       else
+    5          break;
+    6       b = a;
+    7    } while (some_condition);
+    8    Console.WriteLine (a);
+
+Regarding the local `a', the assignment in line 6 is allowed, but the
+output in line 8 is not.  However, control only leaves the current
+block in line 5, but not the whole method.
+
+That's why the control flow code distinguishes between `break' and
+`return' statements - a `break' statement is any statement which makes
+control leave the current block (break, continue, goto, return) and a
+`return' statement is a statement which makes control leave the
+current method (return).
+
+There are two `FlowReturns' states in the FlowBranching class:
+`Breaks' specifies whether control may leave the current block before
+reaching its end and `Returns' specifies whether control may leave the
+current method before reaching the end of the current block.
+
+At the end of each flow branching which may return, but which does not
+always throw an exception, the state of all `out' parameters is
+checked and if one of them isn't initialized, an error is reported.
+
+* Forward gotos
+
+In the following example, the local `a' isn't initialized in line 5
+since the assignment in line 3 is never executed:
+
+    1    int a;
+    2    goto World;
+    3    a = 4;
+    4  World:
+    5    Console.WriteLine (a);
+
+Each time the compiler encounters a forward goto, it duplicates the
+bitvector with the current state of the locals and `out' parameters
+and passed it to LabeledStatement.AddUserVector() to tell the label
+that may be reached with a forward goto from a code position with that
+state.  When the label is reached, the state of all these jump origins
+is merged with the current state - see UsageVector.MergeJumpOrigins.
+
+* Exception blocks
+
+Things get a bit more difficult in exception blocks.
+
+There are a few rules in exception blocks:
+
+* A local is considered as being initialized after an exception block
+  if it has been initialized in either the try block and all not
+  always returning catch blocks or in the finally block.
+
+* If the try block always throws an exception and the local is
+  initialized in all not always returning catch blocks, then it will
+  be initialized after the exception block.
+
+* The code after the exception block is only reached if either the
+  whole try block is executed or none of the catch blocks may ever
+  return.  Since an exception may occur at any time in a try block,
+  the compiler can't know whether the whole try block will be executed
+  or not - so it needs to look only at the catch blocks to find out
+  whether the exception block may return or not.  The rule here is
+  that an exception block may return unless it has at least one catch
+  block and none of the catch blocks may ever return.
+
+* Since the finally block is always executed, it is fine for an
+  `out' parameter to be initialized there.  The same applies for
+  locals - if a local or an `out' parameter is initialized in a
+  finally block, then it's always initialized.
+
+* If the try or a catch block may return, all `out' parameters which
+  aren't initialized in the finally block must have been initialized
+  before the potential return.
+
+Internally, the code handles a return in a try or catch block like a
+forward goto to the finally block.
+
+
+Last updated August 5th, 2002
+Martin Baulig <martin@gnome.org>
diff --git a/mcs/docs/order.txt b/mcs/docs/order.txt
new file mode 100755
index 00000000000..fb23b66c014
--- /dev/null
+++ b/mcs/docs/order.txt
@@ -0,0 +1,3 @@
+The plans:
+
+    Currently types and base classes are being registered.
\ No newline at end of file
diff --git a/mcs/doctools/.cvsignore b/mcs/doctools/.cvsignore
new file mode 100644
index 00000000000..378eac25d31
--- /dev/null
+++ b/mcs/doctools/.cvsignore
@@ -0,0 +1 @@
+build
diff --git a/mcs/doctools/ChangeLog b/mcs/doctools/ChangeLog
new file mode 100644
index 00000000000..393d023425c
--- /dev/null
+++ b/mcs/doctools/ChangeLog
@@ -0,0 +1,13 @@
+2002-03-28  John Barnette <jbarn@httcb.net>
+
+	* makefile: added gui target, no longer uses CVS NAnt
+
+	* doctools.build: Reworked, added gui target.
+
+2002-02-24  Nick Drochak  <ndrochak@gol.com>
+
+	* makefile: have 'clean' target remove the build directory
+
+2002-02-14  Nick Drochak  <ndrochak@gol.com>
+
+	* doctools.build: Fix build script so doctools will compile (doesn't run yet though)
diff --git a/mcs/doctools/README.build b/mcs/doctools/README.build
new file mode 100644
index 00000000000..f29dd30eddc
--- /dev/null
+++ b/mcs/doctools/README.build
@@ -0,0 +1,8 @@
+28 March 2002 (jbarn)
+
+The NAnt buildfile for doctools uses tasks that exist in NAnt 0.7.x,
+and are not available in the version of NAnt (0.6) in our CVS tree.
+As I really don't want to go through the hell of getting the newer version
+of NAnt into our tree, the makefile and build files under doctools require
+NAnt 0.7.x or greater to be in the path somewhere.
+
diff --git a/mcs/doctools/doctools.build b/mcs/doctools/doctools.build
new file mode 100644
index 00000000000..4d2fee7f6b6
--- /dev/null
+++ b/mcs/doctools/doctools.build
@@ -0,0 +1,70 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- NOTE: this buildfile requires NAnt 0.7.x or greater. -->
+
+<project name="doctools" default="gui">
+    <property name="build.dir" value="build" />
+    <property name="build.resource.dir" value="${build.dir}/res" />
+    <property name="debug" value="true" />
+    <property name="src.dir" value="src" />
+ 
+    <target name="init">
+        <mkdir dir="${build.dir}" />
+    </target>
+    
+    <target name="docstub" depends="init">
+        <csc target="exe" output="${build.dir}/docstub.exe">
+            <sources>
+                <includes name="src/Console/docstub.cs" />
+            </sources>
+        </csc>
+    </target>
+
+    <target name="core" depends="init">
+        <csc target="library" output="${build.dir}/Mono.Doc.Core.dll" debug="${debug}">
+            <sources>
+                <includes name="${src.dir}/Core/*.cs" />
+            </sources>
+            <references>
+                <includes name="System.dll" />
+            </references>
+        </csc>
+    </target>
+
+    <target name="docval" depends="init">
+        <csc target="exe" output="${build.dir}/docval.exe" debug="${debug}">
+            <sources>
+                <includes name="${src.dir}/Console/docval.cs" />
+            </sources>
+        </csc>
+    </target>
+
+    <target name="gui" depends="init,core">
+        <mkdir dir="${build.resource.dir}" />
+        <resgen input="etc/gui/ImageResources.resx"
+               output="${build.resource.dir}/Mono.Doc.Gui.ImageResources.resources"
+        />
+        <resgen input="etc/gui/TextResources.resx"
+               output="${build.resource.dir}/Mono.Doc.Gui.TextResources.resources"
+        />
+
+        <csc target="winexe" debug="${debug}" output="${build.dir}/monodoc.exe">
+            <sources>
+                <includes name="${src.dir}/Gui/*.cs" />
+            </sources>
+            <references>
+                <includes name="System.dll" />
+                <includes name="System.Data.dll" />
+                <includes name="System.Drawing.dll" />
+                <includes name="System.Windows.Forms.dll" />
+                <includes name="${build.dir}\Mono.Doc.Core.dll" />
+            </references>
+
+            <arg value="/resource:${build.resource.dir}\Mono.Doc.Gui.ImageResources.resources" />
+            <arg value="/resource:${build.resource.dir}\Mono.Doc.Gui.TextResources.resources" />
+        </csc>
+    </target>    
+
+    <target name="clean">
+        <delete dir="${build.dir}" />
+    </target>
+</project>
diff --git a/mcs/doctools/etc/gui/AboutMonodoc.png b/mcs/doctools/etc/gui/AboutMonodoc.png
new file mode 100644
index 00000000000..9cf817597c4
--- /dev/null
+++ b/mcs/doctools/etc/gui/AboutMonodoc.png
diff --git a/mcs/doctools/etc/gui/AssemblyBrowser.png b/mcs/doctools/etc/gui/AssemblyBrowser.png
new file mode 100644
index 00000000000..b7de659ce54
--- /dev/null
+++ b/mcs/doctools/etc/gui/AssemblyBrowser.png
diff --git a/mcs/doctools/etc/gui/ErrorExplosion.png b/mcs/doctools/etc/gui/ErrorExplosion.png
new file mode 100644
index 00000000000..cd3d9572781
--- /dev/null
+++ b/mcs/doctools/etc/gui/ErrorExplosion.png
diff --git a/mcs/doctools/etc/gui/ImageResources.resx b/mcs/doctools/etc/gui/ImageResources.resx
new file mode 100644
index 00000000000..ff32aaf2d35
--- /dev/null
+++ b/mcs/doctools/etc/gui/ImageResources.resx
@@ -0,0 +1,504 @@
+<?xml version="1.0" encoding="utf-8"?>

+<root>

+  <!-- 

+            Microsoft ResX Schema 

+        

+            Version 1.3

+                

+            The primary goals of this format is to allow a simple XML format 

+            that is mostly human readable. The generation and parsing of the 

+            various data types are done through the TypeConverter classes 

+            associated with the data types.

+        

+            Example:

+        

+                ... ado.net/XML headers & schema ...

+                <resheader name="resmimetype">text/microsoft-resx</resheader>

+                <resheader name="version">1.3</resheader>

+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

+                <data name="Name1">this is my long string</data>

+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

+                    [base64 mime encoded serialized .NET Framework object]

+                </data>

+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]

+                </data>

+        

+            There are any number of "resheader" rows that contain simple 

+            name/value pairs.

+            

+            Each data row contains a name, and value. The row also contains a 

+            type or mimetype. Type corresponds to a .NET class that support 

+            text/value conversion through the TypeConverter architecture. 

+            Classes that don't support this are serialized and stored with the 

+            mimetype set.

+                     

+            The mimetype is used for serialized objects, and tells the 

+            ResXResourceReader how to depersist the object. This is currently not 

+            extensible. For a given mimetype the value must be set accordingly:

+        

+            Note - application/x-microsoft.net.object.binary.base64 is the format 

+                   that the ResXResourceWriter will generate, however the reader can 

+                   read any of the formats listed below.

+        

+            mimetype: application/x-microsoft.net.object.binary.base64

+            value   : The object must be serialized with 

+                    : System.Serialization.Formatters.Binary.BinaryFormatter

+                    : and then encoded with base64 encoding.

+        

+            mimetype: application/x-microsoft.net.object.soap.base64

+            value   : The object must be serialized with 

+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

+                    : and then encoded with base64 encoding.

+            mimetype: application/x-microsoft.net.object.bytearray.base64

+            value   : The object must be serialized into a byte array 

+                    : using a System.ComponentModel.TypeConverter

+                    : and then encoded with base64 encoding.

+        -->

+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

+    <xsd:element name="root" msdata:IsDataSet="true">

+      <xsd:complexType>

+        <xsd:choice maxOccurs="unbounded">

+          <xsd:element name="data">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />

+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

+            </xsd:complexType>

+          </xsd:element>

+          <xsd:element name="resheader">

+            <xsd:complexType>

+              <xsd:sequence>

+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+              </xsd:sequence>

+              <xsd:attribute name="name" type="xsd:string" use="required" />

+            </xsd:complexType>

+          </xsd:element>

+        </xsd:choice>

+      </xsd:complexType>

+    </xsd:element>

+  </xsd:schema>

+  <resheader name="resmimetype">

+    <value>text/microsoft-resx</value>

+  </resheader>

+  <resheader name="version">

+    <value>1.3</value>

+  </resheader>

+  <resheader name="reader">

+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <resheader name="writer">

+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+  </resheader>

+  <data name="AboutMonodoc.Bitmap" type="System.Drawing.Bitmap, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">

+    <value>

+        iVBORw0KGgoAAAANSUhEUgAAASwAAAEsCAIAAAD2HxkiAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAK0dJREFUeF7tndvq

+        Z0eVgHsewScQfAEvfAARciEiitHQTrRD1E7UG49IGMUbURFEUBREUfBCHJBhLvRCwQMiY1CI4oGIIgoe

+        Bg9jTIjaHrHnS69OpVKHVatqn3977Yvm3/tXtapq1fpq1Xn/2wMPPHDFH9eAa2BDDQChP64B18BWGnjT

+        m950Zau0PV3XgGvgzW9+82tf+9qnILypPo888kjx9973eir+q2vgPBp4y1ve8vrXv/7ee+99GoT/sfuH

+        lmPnDw3bzp+7d//83wmev/3tbxD4qle9itpwCGeGeucEkr3dM3j3xTP4m9/85k9/+tP169evXbt29epV

+        h9Ah3B2VDuGuu6QzE7OAOPeE05l2CB3CSWg6hA5hsxE5Xnf0i1/8Ypgx+/znPz8JkeUj7x/CD33oQ//5

+        5DMdmCUkNI346AEOBuFnPvMZCHzf+97Hfgb+rUH49re//aMf/Si/Js9nP/vZD3zgA3b0EEKURAgv3/3u

+        dxuFDED4wQ9+8OMf//h/lx5+esc73jEgsxaFUjAlQBlRJootIkSKQPqDH/yAkMmCAS/5ifXl2dl773vf

+        G1oH0o2fxx577A9/+MPRwYvzfyQIP/KRj9y4cQOLkR1FRQj59cc//jG2Qj196UtfIkx4Pvaxjz300EP8

+        hBC4AtQaSJ/61Ke++93visEhhIhBCP/96U9/yvtf/vKXpNVE0QjMe97zHjz8z3/+85CogBE/IWnq7+tf

+        /zpAGoUrwUgURT3jGc9AnwmEoAVgv/3tb3mP3sjJHXfcISHl4b+8FG187nOfu++++yaiCO3I+dnPfmZR

+        wj//+c+//OUvADmFxkcffRQJ8vz+97+3ixqOWEziMBAKgVhDsIMEQshBj9QfzGAfta1/RCciloe03CsG

+        ITBw11131YQ85znPIRXSAnjdKzY5wekJexSNLSNI1jctPutZz7r//vsBkijUKNGbSdQCgDFCwm5h/sb/

+        ABL4feUrX+G/AIauSFHPEhLQJ/AMu0ScnrA3oARofPzxx+38SEgo+sc//iEpokzyL61zU85wREXyMSCk

+        F5oQGHtCMBDvBzlNixF7AkW0H3OIY+wVAuqYaRHm4CEVQmj4f/jDH0q2E/YoBZYN59iHPMCQNAqEISLR

+        ESLbnboefO+f//xnJAfA+BsI8UWCH6jb9zCTf6IAUq8/hFv6tNOV8Pe//93uykDuX//6FwYQqx2Fk42/

+        /vWvCi3GiDTu//X058tf/jIvYsn8l5fyZu8QfvKTn/zJT34ilRT3hQKEvAcDLEDxfkVjChyCHw4QIah4

+        TAjVX+vc1sAQBvJsY/rSZ6Zu6Ct++tOfxl8xPJSX5BAakz4hLxGFQDuEknrcrUBFQMjQC2n5SRrUIk9S

+        BbFiMWji4kLtnVKaIVJUlEBnmEbhj3/8I91FQkKIogS4wk01XRkB6MeSaF4Wmjnkk1xNiCVioOu5z30u

+        crBemOSPF73oRYFDNP/sZz87pLJfCOl/yk5UjKPIBub44IMPSv8zViiq5CfgrPmQYDrEwm6CA8yFKI4o

+        CMEjifEVx4dFMEArZwA5QhrjvSJRyIdGiRg34dKaEBGxFg6LqQuEcUtHflCjSOYJEzPSRy3SSAtCSGOn

+        9BOf+ARcJQ1BUAL6BFHhOUaC9o5YuR8LSlAQCnLIZM3PY0uKM7REhDpJSCAUDvkXd3LPPffIG2gMv+7a

+        E5JpakjpXsrQLmiTkGhQOvdMqzD1gn/jX5liSQw3nl3gV5lulW6qiA1CZJZVhGB/xYGi9GSKg8OcCvFC

+        ScMhboT6aDo0AjCGJHDSg5UxqjJbA8PgRxJ5syVlDwJFkwTDETE3E2CQ4SJvxH0Vh6+8J0DTGYoPLCqB

+        ROMUEwjFiGVgVlNCc7aGotV62tQvPduaJ+yKGGMm4AEhdngwCOMRS6418BM7EHJQEM0kbXneM6Q/wGRm

+        XmciM7hZKkAmbIpzpzAmKGI6eWYwvuJ6SQIh5pX7QGnFQcs4tCMYgfMOFepS+qXSkSPz+rAZrRIMEvBU

+        NZZAkeEfwXJRVMQ3v/lNHUKi5z5QlFAcVRaRoK7hsKiEZr9UYQljGIMwj5hDyCDwne98p3RKD+MJxYPl

+        cxLJUERmR/SFe8iEw+JIQKRJ2w9mytIF1i9zIfmoiUzSrc17pAmETKLkeSBu76BOYE6agwBzsVOqWF7Q

+        pyiBrmBzfoUAgJq3RzRkdFx1CAlQVAJkJj4w747GQMo0SVEJ8FnzZtIXqLVEtEE6hPaIOYTC3pEgZL8c

+        w0ImJ77//e9LVzD3P9KLgy7L6jlhYLV4f4cYn2XdD8yw0bC2lnRrdQjpDZJKMr7lv7xksGcZzsVhRFpi

+        EyikJo33+vqHKEFxgAlahCR8MjiU4igQSqyiEmr9WAUnRoA1JYB0LSKrGrUxIb0JZl+mR8TpPfOZz5Qp

+        Gel/4gMZHPKvzJTya5in2e/ETLxp9f3vf39R10Kg7rtiMOAH15rALHZjJBBpJAfMeS0iRIeQyshdB+ni

+        HnsJlPBFgeJX856trEYqPdIuAgUzDD0fJOsQFv0nSlD8pwIhP0FUrlWUgJOsLVrUJjllYkkZUg5H1Itw

+        DAgBkpnSpPlE0V0EYpe0TMXGu9iTVHbDMCubVzySmcVJYgW6WFXP2xHcCC+HF9xxhkCVtCky5Vt0rfHc

+        TD7hrMNTdG4M/8KcVsiGIodF+ZoS+KnmP3ULxhnWlFBzhmG5L+5HyGBYcYPf+c53Hn74YZhP5gubEfX8

+        J7OjL3zhC/d7nhBXnkM4sIEbJ5b3hXohlPWPxPp5o0BIzYUNdyEi9YfXGnODxAIqbDr3RYBB1Spi8b3F

+        RqQ5q5kEoAPZBSHQFpUALUrSuhHLNqmiEgCmFpf5VX4lYrxjBgL1FX84HIt4IZ4QCBNFJ9vWmts4JQC8

+        JT1JmOyFENh6ISwaCiSwKjgMIRFl4ippDmjgSU5Z7cCF5vkf8IRA2CWnpgR9iR/T5wl2HP4b/mBlr6YE

+        ffn+Rz/6Udg7+r3vfS9JIkmXX0M2EItBhk2nErIYvvhT8vIw3VGmZxJFj0FITzKRMwZhPlGkeELZpZlP

+        LIGQcYW9BqpspilKViZ7yE8XPDU3xTY3uxwC15SgzwYJG0UO5b0seBSVoEzP5DLzhGph4vdxxsbeHwZC

+        pklzCCHK6ABDMHqw0yFkojW3JwVCeCiueer+yuIhcXf5KBdzpIzKfM9cEHZ5wmJgskr+iysTgfzcySRA

+        4pdqSlDWG8YgLGYm9mx5Y5F78rh3yq8HhpBeZW83EhRngVAGY/YxIX3OvL8k9mchTQ/DqDKfZeEN06HK

+        +Qm7B1NGa7UxoZzGSB76nDUl6GPRoieMu478zVxoUQn6gmECjN0TFiPqA78QJfecB4ZwoBu5FYQ4pXxJ

+        Q5ZGpkNYFC4LhptAKKcxcq5YhKgpoQmh4kzEpvF4uXBRgsJGEYxa99LoOZPWIf+vQ7iNJ4STYjs9vEIY

+        0zXgZmfsjubOTYGwqITmDhux2pjDfLaDic2am61BWJtNCWnl5NfagmJ3tNZHzeUHT/jiF79410sU+Zjw

+        WJ5wOQgZcPb2dY8FYU5R4kwIwARML4R673HNX707+sQG7oGxZdeYcFFPeDYI86kRh3ClOxGX84TsJl0B

+        wuJwaJbuaHGpUJ/12coTFpXQ7I5anFJxqVCUYIm+bRj3hE/M5teO5CrrH12esDhsm3FiJt8vogvfBMLi

+        7Ghzw3fxPGHODBMzNSVsC5gldYdQuzpxLgjpMebbtaSdNp4hVCZREZIPOPE566wT5iMxdmAWZ0dZz6gp

+        QT85ZbHjmhL0dUKL5BXCOIRrQMgW7XyTMRDycuLNhbJYn28W0TfELeoJyU8RKrZo15RQhDasWzQxkMX6

+        ohKUDdlNsasFcAjXgLC205rZ/IGThLFXZKic79iSgxTKhrgZIbQv+kNmce8oEvQbMZowyE18xdMklitn

+        mvKXDnA6CDk7P8se1K4xoey0Lh57U/a1WNbxsY/8mLIczlA6unNB2LV3FM/GKYqiErjVYvgUBRrgPERR

+        CcqRwqW56pJ/OgiZCM1PYyw9MQNOykH45uVOysYX2oL8wgU2l+uHM7aCUI7VF28DULaP6gbNUYaaEvS+

+        KFcGy/2/8kBs8yiT5GQ4Yq0gh4Hwa1/72vSN13KUKZnGWGGJIhyEz2cm8JDDp5mYesl7g2hJtkQrjnQr

+        CHF3nKwvKkE5zaRDyNRLTQlygV3xkXsxwrXLdODlbC5Y6kcKByLmWwuSLB0GQo5vJV0OWGIw0HuKIodw

+        YLG+9xSF8CCH6xM/LFcqDEzPMJjMpwSVO2ZiJmsQNu93SjqNvd1Rosvh+qISatMzCoTyjZqkVRUlKIeY

+        xHnmHWO5skjxn8MR9XbkSBAmupa7IewXzIRDvdNP1nOot3iekJtOa9dbCAP4vfymQBpyKqlrrUIuL026

+        BiiEXFkGmUUIa0sLymitBqF+NImRYVEJOMliK1Dcw4nGOJLLaLCohOTwRLzJhr/BrHabJm0iMpVtpUpE

+        Ngwku3mKm3tCccIfx9g7Khc95ath1CVHCi1XrQkbEJvLkfXirk+mMbuTVwZ9G97rEPIr1pNfO01B7PeO

+        Fi+xl/sOIdPy7bTi+cbmLGVOIzjleiAb+qWJcl1iUQnKvaPJ6SEIlHu44+veRAm8jzui+QG/4pELmVyV

+        SwlixxWftGhGLPY885fJZnSB8M4779zpN+vf9a538TWYX/3qV8UrD2m35NNc9EvpZ1L3uS/C7qGU9/xK

+        d7+4VCWXvcu93Xi5IpByFTfM1y41kS8Z8KtkQ1x0PjArIiQdIThsTtLQp61dH9y8vBQHyPwQQ1DymS+y

+        y2ASDPj8Q+3aJe7txfvJN0Xlq2n5PhUZXIkoVMFkTO7f5AbuBCFRArGKN3DHpkwYhcDkSoucAVjKG/T4

+        oqraqYhmxGK3swhhCMmvO4UQ1/etb30LtKhLKib/blG8KET7h04ZMcrNvOH2JzAIzMAqvxKmdnmrfMGC

+        dj18fSHc2iQXliKZXwmDkdWEyNeUSEisEBSLsyOBw1gOJihJ46aK3gyEwlec4uZfvoikExh/+ZCxUO3W

+        TUQFNZITHF3Mg3y9jLREDzzKZd6IIhX5MEHxTu7AYVEJ8bdHxV7FlBmVQYLMqeRKKN69XYSwpgEZ49RY

+        UjyhHjERmDjnnUKI9/vqV7/6mte8RvkMUL5DQq51CBBCERagMFOUIC+xs1iOcnV3TQhWgoTaFCUcUjGS

+        vVgC+RffDpDQKL6LFXkCSyuQXznHexhTeqGyVaD55cOkILRK5CHeXY3r6xWCTOTULsYnz8hUlEBEaAQ8

+        5iSxVLkfraYE+TpFzk8CoWVMWINQH0zSBNi7owfwhED44Q9/+HnPex42Fz+YrLTB+SPBaHpjeGrDaAU/

+        +SmBuSYnzltioCJBWSeADekZ5lYV3DI/8VCo3IeHrnhzzw0JFTvhTSVQugRC4+cfY8nkU/k6BT1V+SDp

+        RCU0L3SK50hkkjPvkcrMFqTVzuPKV/osEYP3zud4klki/vvtb3+b/F+/fn1fh3qBkAIXH7qpeAZ5wtfk

+        GRCGJ9yljSdEZcNPDLMiRNLlGuIQRjps2L0OofAZOpnEsnypFz7Dx6dg2DINI55w7EkgHBPS/Ggh40z5

+        VOiAEmBGWQ+srQ3QsSRWjJMMB5JJnTz6cERlleIwSxTFY4u9i4QrhGcACfzyMCi1bD0jDCyFb9ZjHOL9

+        Ym8fD1blosSuJQ0lG70X/i4Xnlmf8M36phJYD6CPav86b8IAEWVsKS2mjMbp0DY/Mzoc0QLhvjyh8aTw

+        ClBNTMIIYQhGcjIOpJOZPLxvzp32Jkf45aAalkwfFd/ItKpMw9JVCw89ySYn+sp4/Cuoh8t/u8QORyzm

+        zT3hRMoa0QeoWDnKMCqrRbRDddCQDqFDuBpNgwkdFC17th1Ch3CQjdWi2a35oCEdQodwNZoGEzooWvZs

+        O4QO4SAbq0WzW/NBQzqEDuFqNA0mdFC07Nl2CB3CQTZWi2a35oOGdAgdwtVoGkzooGjZs+0QOoSDbKwW

+        zW7NBw2pQbisec4hfeV17YHkVrPU4YQOariXlG2HcICsjijDbKwW8ZKs+aBlcQg7iBoIuhpLwwkd1HAv

+        KdsO4QBZHVGG2Vgt4iVZ80HL4hB2EDUQdDWWhhM6qOFeUrYdwgGyOqIMs7FaxEuy5oOWxSHsIGog6Gos

+        DSe0Q8ONT+sNH9vdYblqWXIIB8jqiDLMxmoR92OssMfhXY7MhwPvQuN+crhQThzCDqIGgq7G0nBCCxmW

+        XSzgcdMEl7sIe1zqEe4y5eKJQ3zbzF7YYkiHcICsjijDbKwWcaIBTY8uV9lz51J+vSUX7ejXqE1PfQ8S

+        HMIOogaCrsbScEKbWyEQ1m5SBE6HcI6tZUvKGKBi5SjDbKwWcQ8Qho5oQqNDeHNJfOaRvTJRA8mtxtJw

+        QptDSAZkSkYu2I7vAnUIHcIB6NIow2ysFnEPEIY8MEMTfzbQIXQIHcI2oXIVejucLQRzofEXBwKEcRLh

+        /vXwh032/3XlM07FKH84mE/MzECaImI1hzac0LDphIhdxq0nx6pgE0IkJEwOF6GW86XlJxl2CB3Cp0wi

+        cTIxZorbKbopiZvEarqXBEKAZKyYoyJv8nTjl0qukrwlzlxpU4r5D9FzObXyJu8FQvm40NWrV6/wTRJ5

+        GCLPM3mypJRlAZpD+rCDWi1isLnE+Jrva55wWA4Ccwh5U4QwsfgAfPJH7HNqMCd+yeIea02AxUvn+gme

+        0CGcg7lMxmosDSdU9BhKf8xiykWAEzdbtHU7hIm5F31grTnQO9JjEBZlFkXleoi7o09MDrsnnJfFYTZW

+        i1gbUA17QqVP2By8dUFY82BTcp6zbXH4tTarBqEyJnQI5wXwCWmrsTScUNPIhv1JM2LO5ACEOXJjEDZB

+        UorTjFtrmEQD3h2dH7xY4jAbq0WMTTaZMIj5DD8loyw9Su6sauElpAXCYrc2zl4YLnYVrZbVWnlz5Qhp

+        IXUJYNGbT8ycHcJmF3HNAEUIlS5iyNvjjz9+48YN1vpl20388Ib3TD8OfNAX+RxoRDjfAw5HPWLhHP7g

+        Pb8SZlhRvkThEA4bT3fEgEqREygiQLxOyN9ynrA2WcJPrO8LeHwmnRkNxlTxBlT+5g2L/hySIgyHFe0o

+        gh/oyge0EX7//fcnRz049sEb3vMrwslG15dGg/ocQoewm6WBCGLNMSpXnnyEE/gRUy5CWEwxfLmanW4B

+        PD49D3IIkYe/w08cUxQULWcUwQmowA8J4YwVwskq/4bMx6Xgm9tEGVCOQ+gQDphNRxSsmW/BY/rBmrFp

+        QS5wEswaYMKJXuw7eMI8PQhELJCEDd/8IYzxHuZxoWFTOGkFkCCWMHQglTIQlyYDqHKApSwkFG80FxQJ

+        zE8dqnkyqEPoEA6YjTUKBIo1B8zAD3J4KZ1POBGzhrf8VGENwkBgEEufECEMz/LeJqlIHgKHErh2UlHy

+        TNJJ+NCVJQkSQgJyEpfoEC6L05j01SY5hxOy8tQfLhCYeCHwS65vwvNI3y/p6cm2tTxlJMSBicV/FecW

+        uArM4JYBpniBDY1CTCwer+g5SY73+NVQOpHZr6enliiuXbvm29bGQNNiDbOxWsQBozFGSaxZ/E9tPBac

+        W3zJRfEoE+QgB48aiIJV0tLvZZNYse8iVj6EI3sEi9sCep74vWKRCSwDXURJT3jsHgDvjs4P3rHWCY1E

+        9QZLrBm0dGcliwHYdMxJEUK6hfHkjXgqy6Vs+K44ogzhkkYBLOMDjQxQCaNPqJK0PPZ510SZDqFD2MuX

+        KTyuKbZmHBeANS8RhRPAizuNiW9BAlTEkzekUvNUSUbFGcYjT+KSzxCMXmsSgBkdmDcVeEIgh9AhnGA+

+        laj4hKRThwtiINdMCeSwewVCHBfC4+kQxm+WJQdJGkcXe1q6neQzNA2kjrRYOGlNWYVvllcCOIQOodFU

+        OoJBBWOk2JqNPcZksT7vjkJy7GBJAsn2JXI8bRI9vl848cN0oWNEO8rfGdQhdAg7TcYQPEHFvoBWO1kf

+        0qTnGU/JiCsz5Oh2EFqHxNfFE7AIj/0ko0260HbhwyEdQodw2HiqERNUsGbjVhILhPEqOX/Hg7pmSWTU

+        F7vo2NmS7US4cbTZTFcP4BA6hBNNqBB92JoHIOzlpAvCLsKH9egQOoTDxqN5wjF/tTSEMrlq9IS9fd1h

+        PTqEDuGw8VghtFuzBcJ4TNg7bJPVvBjC+HMXONV4gaR31mdYjw6hQzhsPBqEyb5K/I9lrr8JYTLl0zuB

+        ySJEvF4PZvEKR7JAIr9aVlYmatAhdAgnmlAhejLXjzWz+qcfXBApTQjzxY+upTzGeLGvk2nbsMJBM5H4

+        SeMeg4kadAgdwokmVIiOS0nWCWXjaHNjVxNC2QYQ75gx4k0u8y0EABlP2+bbcWS3ndEZEl2eXoU6hA5h

+        r820w4u5JyfuwLI52diEkLTZRxav9RnxJiKuOG4acIPyIZq4PMnGVHy43MGrb8oBPITz/PrXv7bsYk00

+        6BA6hG2oBkIwyZGMvmR6BktVfIUFQlnri6dnlIMOIed0NYunKPJDVXnzIeeAaxyGc1g0B8opZEWHDqFD

+        OIBYO4rslk6cIWaK88EfFt0FnPBT8i2KYlcwOU9YO/IXcinnCeNdqcJVMRs0H/F5QplKlfD4yXiLHBmW

+        073hRDIR3RMuS9SA9NWOBQ4n1OZpNIScc0/Oy+MPMVkMV25Ak0socI/hsqb4LJ90BSET6iSw5MV+sl4u

+        a0JIzJXu2YTYZIspHDIQRQii+FVuA+AB7NDQiFj7RtagV/eEA2R1RBlmY7WIo4i14wEAaMV3W4QFOrkB

+        Lb6OCScpuCbXpcEkKBL4C1/4QuxkAodhkibcMYO/Ajx6j7Atd6WFGVEmWuQ6KX2MJ4ch41PzIedyw1py

+        3ZNRbE1lDmEHUQNBV2NpOKE2TBNCyC1PYBAP4fKryuSWJMLI+fT8DiXeJBCKP4Q3cUfBf8JkwBuKYFuO

+        6vMv7+V6G8uKpZyapwXJM5PknyTItlFsUZcO4QBZHVGG2Vgt4gTETFFBhc4kqGCpYBb3NvlbmJFuHm5T

+        LvAVP4Nxh5+k+6qMJKXDKfeOxhdkyL2g0Cj44SHtSwi0IDLkC5IDfsl1prjc5uqLT8x0YDNv0NVYGk6o

+        SVJy7XwzfDGArLaFoZQMqGS8J73HBx98UG74xe55KQ/GzU+WURZhBGC59CV+5IZsPBv4KZcI18oVJCdi

+        J17sHSfnnnBe6FJpw2ysFtECVe2DJ5a49jADhNiFS8iJSUyM7mPCZWGrSV+NpeGEEsBqHzAJBmQMX/zw

+        i/41mKLkAE/8oRVdTs3Wc4SaH8DJua1xmHwHpqt1cE+4LJzDbKwWMf50UWw6Ne/XDJ+YaTN8EW/F+mvy

+        m3avRyzmM0fLIUw/vb0sQHNIX42l4YQskDTdWmKstfA1yGt9RQWMAWeYQxgLqekhYXuJHql7wjlQq8sY

+        ZmO1iEYIc06M5miR3wth0+kVAxhdqF4uY6m7cqhBuKx5ziF9NUsdTmjAdpeo5lpzXutzJr3BYjClY1b0

+        eE0GigLtHcKm3TczUGwL7LGGK84hHObLFFGsOVhS/LdiNMVuUtPIjAGUjpze7cwHb7XuXC0Jy/tipzFv

+        RJRSjE3MJA1NraaMLYWxLiSYQ2hiaThQV2V44KU1MOysah1m/b2xOA7hMF+miMZq8GDraGAhCCdm3iE0

+        sTQcaGL1ePQzaMAhHObLFPEMNuRlnKgBh9DE0nCgidXj0c+gAYdwmC9TxDPYkJdxogYcQhNLw4EmVo9H

+        P4MGHMJhvkwRz2BDXsaJGnAITSwNB5pYPR79DBpwCIf5MkU8gw15GSdqwCE0sTQcaGL1ePQzaMAhHObL

+        FPEMNuRlnKgBh9DE0nCgidXj0c+gAYdwmC9TxDPYkJdxogYcQhNLw4EmVo9HP4MGHMJhvkwRz2BDXsaJ

+        GnAITSwNB5pYPR79DBpwCIf5MkU8gw15GSdqwCE0sTQcaGL1ePQzaMAhHObLFPEMNuRlnKgBh9DE0nCg

+        idXj0c+gAYdwmC9TxDPYkJdxogYcQhNLw4EmVo9HP4MGHMJhvkwRz2BDXsaJGnAITSwNB5pYPR79DBpw

+        CIf5MkU8gw15GSdqwCE0sTQcaLh6+HItTx69+H79b5gMl8sj5hpwCIf5MkWcYnNFCBGYv1cgnHjn9JT8

+        e1yjBhxCE0vDgYQZwSZxYvF/i/7NDiHCjd9IMpqFB1tTAw7hMF+miFKXCW+hgmPMcuQcwjVJ2DAth9DE

+        0nCgAGETvCUg9L7ohmjZk3YIh/kyRdwWQqWbajcRD7m0BhxCE0vDgYwQ+phwaUPfs3yHcJgvU8QwIIzn

+        ZpKhYD5tI0yGJ+7KFt/7xMyeGWvmzSE0sTQcqFkBswTwdcJZ1LiVEIdwmC9TxHXq1Sdg1tHzQqk4hCaW

+        hgMtVG0u9pI04BAO82WKeEm24mVZSAMOoYml4UALVZuLvSQNOITDfJkiXpKteFkW0oBDaGJpONBC1eZi

+        L0kDDuEwX6aIl2QrXpaFNOAQmlgaDrRQtbnYS9KAQzjMlyniJdmKl2UhDTiEJpaGAy1UbS72kjTgEA7z

+        ZYp4SbbiZVlIAw6hiaXhQAtVm4u9JA04hMN8mSJekq14WRbSgENoYmk40ELV5mIvSQMO4TBfpoiXZCte

+        loU04BCaWBoOtFC1udhL0oBDOMyXKeIl2YqXZSENaBCarGzTQAspxcW6BtbUgEO4prY9LddAQQMOoZuF

+        a2BjDTiEG1eAJ+8acAjdBlwDG2vAIdy4Ajx514BD6DbgGthYAw7hxhXgybsGzgih8smx4jchFCuZ5dbd

+        Wn7s1kk25CFKnqVZMhnk67mKcyKZMUa0F7ZYxjj6LOXtys/EwGeEsKiyMRL2UN9xHpaw+KAuY2GTPBhj

+        ddnxhX2Z+FwQ5p9Yoe6Tr6/YaSz6nK62v5ifPEtN51MLkGcmd5ihFPFPRSs3ljdxyHkbEVOq5Cd2pHb3

+        vgTzXQ3EQOBzQSgKKmJmZ6/mGZLqt1tDkrT+32IdB9gs8OSw5RxaurW18tYgVMKHKHFcXZ819drVPkDL

+        QlEcwtuKnQXCGAa7NRS/0Vtzkk07aDqNGDmRlr8xQlgsbyKt5gmb2UiEW9o4u86balwzgEM4J4RjNafz

+        39s6rAlhzS3HbBcJL5Kv0Jsn5J5w06MTUeIzGn2vree+YrgZntgdDd3LxK01u82KLzJ6Qh1CEVJzsxZP

+        qNSvQ3hUCItfwF1oYsbCpCU/zYYmHlDlfba4UxeoiKMkTimEj9OtdbPz90n0vIEIb2pxa/mxdEeLbUdT

+        gZsHOGN3dEalW0ibMbmlRR2lOHo+j1KKUJsO4STDPlx96x28xHFNUs2SkS9J7ejJIVzSWFy2a8CgAYfQ

+        oCQP4hpYUgMO4ZLaddmuAYMGHEKDkjyIa2BJDTiES2rXZbsGDBpwCA1K8iCugSU14BAuqV2X7RowaMAh

+        NCjJHCTeL5KvZc2yumVcyivuXJklA2ZlrBGwtkOItA+kf4dwNluJa92IyljaRpbyLWNjye05VqLzkNVj

+        6d8hnM3GFDbyDZnxFkrJQYie7K7M81ds44tJJGITG40tVcmPCMnlK4qLwzebjCRwM3xcijgPx9U/ED70

+        0EN33HHHtWvX+PfKA08+N2/e3Ms27Xo+ZgNoJkG6sRb7TsHEixxaulW52JjqmO2E9ib8Ercmv6az3vDD

+        ujc2Rgq0oYBJSZPmKcmhXsBE4Rb9iycEP56rV686hMMmkUYsmkix5dbrySKn6Hlq1pB4NiX12Ea7nOFw

+        4Nj6mzWh+0yL3vJmKG+nLHIm6j9AiCd0CJv13hHAUnlzGUExW80muZl60RN2qOBWUB2VXmnG/mdXD2J6

+        IzhR/w7hFDN4WtykFd8PhMH1FZt5iyfs0tFW3dHj6t8h7DIwLXDSeUva7KSHFv4bExLzEAeIRzXFnl7e

+        HUqi5wYa3tTixs6k2N2q6aIr8BTtF2k36m1v+peJGR8TTrGHmeMu14WbOaNbi1tIUQuJrWnLlyi2tqMs

+        /WJbvrtc7iNDS9Cyvv4dwn1Yk+fixBpwCE9c+V70fWjAIdxHPXguTqwBh/DEle9F34cGHMJ91IPn4sQa

+        cAhPXPle9H1owCHcRz14Lk6sAYfwxJXvRd+HBhzCfdSD5+LEGnAIT1z5XvR9aMAh3Ec9eC5OrAGH8MSV

+        70XfhwYcwn3Ug+fixBpwCE9c+V70fWjAIdxHPXguTqwBh/DEle9F34cGHMJ91IPn4sQacAhPXPle9H1o

+        wCHcRz14Lk6sAQ3CE6vFi+4aWE8DDuF6uvaUXANFDTiEbhiugY014BBuXAGevGvAIXQbcA1srAGHcLYK

+        WO3694k5TvK5xP25wzncVWaGS9Eb0SHs1ZgWPrahNe2pN62t8tnUdW9BmgIPEcAhnLOaasatfMWF5JOv

+        tYQ3xa+4xL9K1gc8sOQz/6BKeB8nnX86JqjMUi47V/aQc9bZDmQ5hHNWQhHC4seDYn7C38kf+X9zXItR

+        mkWqfW5BkZ8TYixXMzMx0vbAlxTSIZyzNhXPUPspN0HduIvZ7fUhRU+Y+0Ydj4F86rruLcWcNbepLIdw

+        TvUHMzIOugY854wQ5qJqGBTfO4RzmY5DOJcmbw/Pmp4tTm8JCGsjvWa67gnnNIUeWQ5hj7bUsPlAK3aM

+        zZ5qAklRWlFIGBYWR3T5y1hI/GvyPm5Nauk2C9XVw+wKPFu17UCQQ7hlJZzW7GpKP6dCHMLNIMx93WZZ

+        2U3CDuHVq1evPPDkc/Pmzd1UjWfENXDJGnBPeMm162U7hAYcwkNUk2fykjXgEF5y7XrZDqEBh/AQ1eSZ

+        vGQNOISXXLtetkNowCE8RDV5Ji9ZAw7hJdfuOmXLF/eaO2zWyZiksvl6bHPx0yFc0x4uLa2ifdc2dhs3

+        tS+hoyYGExOdKN8hnKh/j144HBwrxXICo1eJtW2uNTk1SCweO2k7uvb01pxwkq5AeMetx3fM9BqDh7/d

+        31Ooyx3jRL9R87RKZVgaghAmpy50a2vF1EukZ5hfgycUDn3bmnPVrYGmkeUSp3PYNdIbhjDJec0Dzwih

+        e8Ju+/MIMvNh94RFrzJFjRaei8NRy9jVWC6HcEoNetwZNGCEUJ+YESdjyU0zuVzOFAib3dSkGdJTL7ZZ

+        cXfUPaHFBjzMUxpQumfF7qLShzQSKEYcP8UeY+LBhvOZAx8ai6TV0MtbCyzy44kZHxM6YNtowO4Gt8nf

+        wqn6EsXCCnbxBg3Y3aBB2PGCOITHqzPP8YVpwCG8sAr14hxPAw7h8erMc3xhGnAIL6xCvTjH04BDeLw6

+        8xxfmAYcwgurUC/O8TTgEB6vzjzHF6YBh/DCKnTV4hS3jyTbU2pbTFbN6HyJFZc0J5bRIZyvfs4nqQah

+        aCLfdXkZi/LF3aHysmvrT5DjEJ4PnflKXNzcHMTXtjLnlqrsBc0zq7idXE4cOGkaAjNd5BSVp+uhpm+H

+        cD5LPLGkAQib7tHiLWNsanmI3yduKvw3rjpLuk2cuoQ4hCdGZ62i1zxh3lmNPZjFjuMwyd9FZ1jsHieJ

+        WtKdRXN5urzheovr169fu3bNjzLNomQXclsDdgh7VVaEMElOcblFT9ibh+nh3RNO16FLaGhgQwj1/qpD

+        6LZ7Cg2ETlc8TxPYSH7t6o7GcWtykkmX4piwGGbNunFPuKa2PS3XgKYBX6Jw+3ANbKwBh3DjCvDkXQMO

+        oduAa2BjDTiEG1eAJ+8acAjdBlwDG2vAIdy4Ajx514BD6DbgGthYAw7hxhXgybsGHEK3gY01kG+5npKh

+        eMNakJNsspkif2Lc2hYf38A9UbEefaoG8s3WUyTWdnIjs4jolLQG4iZ54L/uCQfU6FFua6DmxHo9T/FU

+        RGAmJ0eXr0AY11yykTX/yZ5ulzNPto/HEPpHQh2tPg3UbD0hKglWTKMI4bD8PEW9sZAs1bxx8X3Mp5H5

+        uG+cJBe+yuTnCftM0EPHlq0YpUVRNQiTJBJaapJ17BWvm48hLeWq6aGZveAS/XPZFiPxMAUN1Gzd4voS

+        cRZPmHgSpUomQmjxwEnftcs+EtcauqP0Rd0TdmnSA6dfya5Bktt0sbuYezkj5Iq0INPo/Yp56Oqm5mYR

+        +9KafO+OOk7jGih2F2XAE57c6RWxzI01kZOAVJSvdF+b4RPnFvKT9EibcvRGJ4ku//Xu6LgJesyja0Dv

+        uK5WOl+iWE3VntC+NFDz1evn0iFcX+eeomvgaRpwCN0gXAMba8Ah3LgCPHnXgEPoNuAa2FgDDuHGFeDJ

+        uwYcQrcB18DGGnAIN64AT9414BC6DZg08OCtJw9ae28S6oFuacAh3NIQima9ZYbUtGu5PVYpdqheDUJ+

+        +19/zBr4n1sPwb/xjW+EvyW2/Dd5GYIVA4eIBIuFBGnxe/k7kVPLeAimpytliZ+QYvI+D0kA2Y9iVt6p

+        A/7iF7949NFH77333rvvvvuuu+668sCt561vfeuNGzcee+yxR/zp0cDDt54kRvIm/m8eWOLWwhTlS/gQ

+        pSYzzlUtvJ43S25DKg/denqUd96wv/vd72iEXv7yl7/sZS97yUtecuVtb3vbG9/4xte97nWvfvWrX/nK

+        V/67Pz0aeMELXpAH52XyhDDF8Pwav6/9HSdkCWMJr8ux5LZHWx72tgb4Ou9LX/pS8JPnyhve8Ib77rvv

+        nnvu4Yc777wz/OB/WDTw/Oc/Pw9WfCnBaj/F72t/xwlZwljC63IsubVoycPoGrgCga94xStiLl1ldg1M

+        gbAIAC8tgFnCdEGYpGtvMkIqcmeRXXUeMmjg/wGWxDeDO3nJPAAAAABJRU5ErkJggg==

+</value>

+  </data>

+  <data name="AssemblyTree.Bitmap" type="System.Drawing.Bitmap, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">

+    <value>

+        iVBORw0KGgoAAAANSUhEUgAAAPAAAAAQCAYAAAAoEfIQAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAACExJREFUaEPtml1o

+        XEUUxzdPPlUCRURFqFACIoWIgvQhEARFBSUgVBCEhfjx0JfVYkAUW8hFrFTyVhASUkGtpYagQqG0pbHR

+        QEtNtA/FlLZXQhtsTVmMFl0IHuecmXN37ux83f3KUgxM7u69c++cmTm/8z8zd/sAoOT66+vrS/GaqPOQ

+        s5K6MDU1NT86OjoUqtfp68LmeWHvptuB/ewlWzo97r32fOW72wy7vu8V34gdr7lLc8NYd3hgeM56DwJs

+        FlERwU33XAXYc5EIT231+Nzk5GS6uLg4j0dfvU5fk3aW5kP2dtoOFRR7xpZu9LeX2kiSJF1YWLAV9A0M

+        8A0+z+d6wXfQlr3f7N3XX+mvll4vwZZ37oL73r2niucaWNVPMLi7BbQILx1FwaOrY3TPpHiK+BMQpzaI

+        8RyX0ESzDTa7wgNPAGM1CkChtjp1XQUSbH/TbWmXY27WeLI/6EcZIBPxL6EBNgsCbDuPUDcLcCv9d9nj

+        87/pH6bLp5dPD88uzY6MHByZHZjYCgMHtkL5UHk6x4YcjLrilmYkvHxEgH1KrAOMo6kDrEFLzhxSaBu8

+        ugP6gghCy3OZJCUQxQlxK5MRgt6Al6r7bAk9DyffVUL35sZOzGuz/ab7BCZF73fBV8RupaQgjlxoXtsN

+        sM/WZvuP/cS5E0NHcxjbb1u9wfHBpVfPPQ4PjvcDgq3NbSmdUUpL0KLafq6O2ne8RsVQNhNgVmEFK4Er

+        /0oEcCuQ2hxIRlQqDAsC480YmnFGdCQxCZSC4RG/mwPtgJfsaQZiOeklTAWpKeMYlWXQeOO8JUKxmoCY

+        nTdBtSsIsRoPHqYoe/WgoxRThzf7rAPsC3KWazR/PJf2Oayreiv9Z3hp7D0Qb9Sq/ddOvABcbq8tDZp2

+        Yfr80qlHYdeJx0BPpVF9CdhqtSpTZUOB9e82iE2ACVXxTAFyBi4jLACm86VRUSwpbitwo6ProPAkieNR

+        bcJISRJhHxYJv3s9xNc49WJoze+yy5QBqICVDya+gOJrX63lqArNkyoMM3733d8Ab0GITectAnF9PIov

+        afBeHV7sp6bA9NkEGAdCBjj3UY1XVs82frpfttJ/A14ZQAXENr9HcNeWp2F99SvYqF2GlYVKlWHGNTAW

+        VN63Lz0Fu396ErZ/dC+do0JOgZFZQUwKzBBrSsx1TIjDADO+pMAdAZgBsqkcwpsBloc3p6AcqW1A2BRX

+        KTI9IwLewuqFz1UKbCpv9h3nTrfb7IMKiHJ+GV4D4pj7ZdCTChwLsa6+Nqd1BR4NXhfEDSl0PdAF4JUZ

+        RAZ5VADE+gX774CXA3DO73AcEFb495T4+AmVjb/Pwfq1Q7DxDwak81Ce3glPH30Yxn8bgY//fBmemNoO

+        lSOVCeV7UoF1iE0lzqDlNFqmYpROUlGbWBmqTSiwT315skN1bI7CAGeQSxVrgFdcZ4dpWHNiH20O1xCt

+        1TpcZQKcyuc03uXMnjSwdQXmIF2HN2o9ywpEjp6H13u/ob5UNwZiHV6eL02Jc8uvIgrM9nOuxRDHAKyW

+        DYX6r+ZSNieVl+AV563jRgBvHGwotT8SuHFhF1w4uRN2vLcNygtD8Mr8EDy7f3BJY0KtkTQ4MZ3OlFit

+        iTXlJWNmFq/e4kH2A9wdBXZFdB3gulrm02YVwWmtyc6mH0MKrAcYzAIYYJo0oVysWpoDWQKIc62rVMO9

+        BuZsgI+8YUJ9SJIrau3La2DpVFoQ892vKS5nEdQfH5CkQBJaHppogM3nmlA7MiSaOwSEj/gZ/9ScyjHU

+        9qvxewzATfdftE3AavDyuJh9IIBvCfVd+4BKbWUsA7e2fklU/wuq6RG4f2wLDI7vEECXZzOfyyBUabRN

+        iTMHQHBnZmi9PLNw9XYcwDJlwb9OptCxALvqMbC2zamYNbAJMTkIT14A4oi1bqY+emBx9UU/3wAxOhVC

+        HfmaDevpTswBKXS/UmE0JQpeX19CbamA5VwDM7z6MQZg9u+i/c9S6Ah4sQoBnH4IN848j+tfAe+EWA8f

+        E5dWMATJsvw+pOlnkF48AOvXtV1o3fFyqbJaE3NHGVyEF4s4n0uhdRXGe+qbWHl4O7GJ5Zv8GAWOASFm

+        Fzo3lnmKckpsOmTEWjcN2chZhJ6K5+yR0DrhDd2vVDeovuz0ckOvdXhD/cbrnLLaVJgV2IQwFmAdYs6o

+        QgGFbVKbVrRP4bsHAd5YehNWz+8Tt+KPxb5oLMtjAOvfwq+nX8z5Qu4lOEVrXYk1xWVwMXVmFcg5iFgH

+        M8Q6wKi6rLwI72YAjBBjIbsdO4ExjhJTJ2uDK2uK50o9YxQ4pu2QipnzVuSZRZRfqW/LyhtrX0iBdYg1

+        CIMpdD4Gy2AUA2996rOlhDcAI8A3Tz4Ht38/Y10L0/r4l7egtrofd6vLObvMQcoglhtVpLaUMlvAbeig

+        2szC+2zghgDmaGcOUtGBs028Akuu/wqkkLFOlNmOAcICb12ZXL8cau19b4ydRZzPNYahdroNL6sdv0Iy

+        18G2tTD6J0Md6o/p40Xq++Zcfw6/MoLaj0JlD9jLxQqsHB+q4jtjL8CZIyqAca0bCxDVw3e8MSVyDVZ0

+        wDzw4oZOx+DldjMFLtiWrnDm53aMQbeeEesr7bQnRoFFexm0DDuC3E47mn0WArwy/4bYyPoS4LpIo1Wp

+        Xa7A2tkRSI8NwvLhB2D17NhEg+C6Gi2SMjUosUo1fE7ZqhoUHSyyJUnmutFuN9sqOg53Yv2Qn/V6cESA

+        q1cOQ+3n12Dtu2cg/foRuPDp3bA03V+9fHxkVmxqVWy/ziKxvRMn1BOUon551Y4xEU7TtbbaYe//zwj/

+        Iq9TYyRARVijgDVt+A+t1PRPsQlSHgAAAABJRU5ErkJggg==

+</value>

+  </data>

+  <data name="ErrorExplosion.Bitmap" type="System.Drawing.Bitmap, System.Drawing, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" mimetype="application/x-microsoft.net.object.bytearray.base64">

+    <value>

+        iVBORw0KGgoAAAANSUhEUgAAAEEAAABACAIAAADKyY23AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8

+        YQUAAAAgY0hSTQAAeiYAAICEAAD6AAAAgOgAAHUwAADqYAAAOpgAABdwnLpRPAAAJtZJREFUaEPdendb

+        Wtu37vk4999zz/M7u6UYNYm9K2JDVBSlWrCBvWADBBt2RVERBXvvvfeeWGKMJaYnJjGarPsuYe9zznM/

+        wb37Gc/akyWa8c456jvmv/3b/x//+VOe+jia+DiYedqaeFj9RXn6u6fVnwHOj0J9bIVMipjvk87zTuN6

+        JXM84liUWKaLIMAh3M8ulm4bF+CQGOScxHRJCHSIZ9gnBNknMh1S2S7pXDcxj4KnYYE3ScGOqUyHtGDH

+        lGCnxED7WLq1gGYR4WMJ4dPsOV42IVTLIIpFoJsl3fmJj8NjDztTBtU6yNM20MOG7vrUy8HU29EMa66f

+        C4fyMMLnSbSfFSQ2wMZ4BFSr32zv/S+oDgA0e5MAZzMm5THHwzKUZh1JtzNomRjiGs90jgmwD/exZFHN

+        mG4mXE/bCLqzkEmNC/EUBbuLQtwSue6pYV7ZAp+8uEBlMqsoKQRSnMIuSGDKYvwyeNSMMM+MMO9kjrso

+        yCWa4RLP8kjh0+KMf9aa4/mU5WHB8rAKuRMm5WmQ25NA18fQB8JwMccb/DSQYh7s8TTE0wJPiBGDl/Uf

+        NLs/3Sz+olo/8HV4FODyGN8OoT5luZPCpz4N97KKpNkKfG3DvK1Y1MeBro8CnB8yKfZ8mmtMsJeI7S1k

+        ecZxPdMi6TlxgeVprEZFdHtpUosyXpsXUyeNKElmSiO9MsN9IKk8r/hgt0h/J4gwxCM5lJ7Op6ZyKUls

+        SnywSxTDkettzXAxpdnd43paYR/ZVAsIFvhoEBwO08sOgoPyc7MwYvC0/svPydTT3szdxoRieQ9gcCA+

+        dg/9nUxJ9M6mLLfHnDs8ga7Ykkd+zib+Lo84FKsoOs6HtDFokMqnyIS+xWkho1Vxy7rs3Z6Cne787a48

+        PNfbZHOa9O6yJJ0iVpXOVcYH5cX45UbRJREkqqwI7/gQJy7VnG7/B832D3+nB2xPSz7djudlzfe2gdIh

+        lCcMp0f+Dg8DHE2wCKZYsj1seN72HE9bhvNjIwZvBxMHs/9wszGFAAZs0dveFO6BM4Fp+VjfowOPwyO6

+        gwnN/qGvg4mfq3kg1ULoY5fGdJOGecvCPSVhFHmke3mKX4OUdb1UQ2w3ETvNP5Zrvy1U/1yrJzY0WL+d

+        1TzrUU7XpvcpRZ15UU2S0MrEgDwBVRhkHx1gE063hkT420cFukQHu0ES2J5JXG88BX6OTFdzut19wAh2

+        e+xn8Vuw/YNQypMIHI6LmRGDn5MZ7CeYahngYg4VSS2dTCHetvepln/4Opu5W//lZvmHh+09YMB7ro+d

+        iO0l5npIBbSy5GB1Drc2K1gjC5ltTrtcURNvh4izXuKk+/ZZy7e1BmJLR+y23S43/Npo/LFS93pEud2S

+        udIsXmrO6i0TVaYGJUb4RDMd0/iuXNffFFFURaxPAsspiUdRiBjyOEYa3xNHEeBkznC1oDtbUG3M/OEe

+        Lvj4ONDtSRDlb3/Afvs7m3O8beFJ+AG+AcFX6Y44B3LjYTmwUUiw+xM4enSgEzw4g+OeG0krTQrU5oaN

+        16UeTZTfHHQRb8Z+nfbcvuggjruIo44fuzpiv53Y7/i+SoL5ulB72CNfrE+erU9eas4ZrU3V5Qly4kKS

+        eNS8OEZ2qFuDNLxeJihICpYnBKcgoPE8YoKcsfd0e3jpU2DwtCV1MwhgQIznANMHDMMr/Aw7Db0BAGtA

+        8rT8V5DrI5bbI3+7P0Jc7sczHbLCPBA0JaFURZRXaRy9Scbb6FLcHnYTl2PEq15of/285eag7faw/eZ5

+        CwnmVe+PZ/rPC+o3U5WHA4VbHfKtzvzVtryByoS6TJY4wh+hAm6dyfcoEAXmRNLjmK4I63xP7JclgpWf

+        40Oa3QPssj/Cri15CIYtNhzI33HJ5j5geFj9CePBxkN87B4AA6yL7+sQ7W+XGY6o4hnHsBZznBplYcPV

+        aX3lCX2l8X2loqGq+BV9zruFOuKknzju+bbRSLzsudnTQ2kg+fZcD6Mi3gzhcIjn3ecTVVPq5PZ8QUdR

+        zFB1ykhNykB5vCw6MNTDIsrXLplFTWC6CXztEYV8bR/4O97H3uHw6Q4PfO0fwpwCnJ7Q7c0QV/ASoQXP

+        ILf/CwNUN3gCzgEQYV0Chmt6mAfCfFkqOz+WVpMWPKHO2O0p3u7I3+3O3+nKOxoq/rzS+OtZ+88d3ffV

+        uq/LtcTztputpp97LcSLzh/7rT+PO4nzvptXXT+22rY6Fc25Ycp4/4rU4CZ5RE9x7FA5XIKHFMmjmgsD

+        XRGLOB7WoT72wW5PobpBUYRH5AckikDnxwHIdK6PDMKkmLE9//YHgy0ZABiOyeDWTHcLuC/X6wnSUEaY

+        hzzKpyo5sCMvYrhMNFIWu9mWtdchuRgvu91s+rml/TJX9Wm2/Ha9/tsKKcRBB3E2SBx2fN9t/rrb/GlT

+        82mleUmfC4svTeNUZYXV5YQ2ZrObs5kdhbHFcQyu+yOet6Wv/X1EP+wuwuh/OS581+0J0/VJEBKXkznT

+        zTSYYoY0xfWyCKfbGm0JABCaYDzQ/h+XAAasYU5IOmG+Nslct+KkoPocXrOU150fMVYhOhlUvJ0qxd4T

+        O03ElpaMoesaYrfpy2Lt1ZKaeN5OHPd+X9e8m638MF/9fkH1a79vrlkmF/rHsVzFAlqlmNNfFreiy1xs

+        yh5WpcYxbRFbETwCXBE8TAKc7jHcnwZQnsAhkXDvAJgF30mIuynbwxw7G+ZrFRlgZ8RAdzSFx0BjhCoo

+        DTFke7aXDc4hJpga4e+I0FGTHd5WJGrPjxqtiIdffpyv+LWpIba1d3mg8teaGvJ9ofJ6TXO9XE9s6xGI

+        3o6XnvQp3k2UISLt9SqxBdEB1qG+NuIo34a86IVm6dl4JWLUlCYzIciaR7NguD1iUqHJg0CXewHuFv5u

+        T0it7g4BqZbMti7myIZwd5Q8kXQb1D5GDOSXKE95KD9cHmHLMyL9IKjqYG0Chl1qhGc8hxrP8pLHsGsz

+        IzXS0CFV7PFUIbHZeLNSdzVffbVU82NTe7ur/77d9Gm14Wat9nq97sNy3YvR0qWWnOm6lNn61KXG9JZ8

+        kTozNNLDtDyBsdlVPFARO9OQ8POg5dNc3WarPJvj6mH277D4YKoV6gAuzQqlUbC7hUE3VIQQuIQfjMXJ

+        BNEWKTyW4ZQQQjFiwM/wVRwWMjm8SsSixjBdgt3Nkfbx5PqYR/jZwOFS2F6ZXM9cgXtvueDTVj0w/Fxr

+        +LqgAoybDQ3xTI+g9Hq6/NNC5eVMxW6vYqQmqas4prsktksZ2SJjN0oj2wrjYfodhfGrHYVDVaKlVjEw

+        IHu8X2xokoaFe1uggIUteNv9FeRuZgCAYgfqAQY+4ok1Uh4AhPvaxwQ4wlH/J4Y7xECPcgUuT1Z18DOa

+        RVTAk8QQpxSOexrbPZXplMm2a8vnXi6pcAi3q/XfF2vgzbfIx89a4Bsnw3nTdXEzDUmDVfGtypjOsviB

+        mrR2pbA6NVCVwVNnhylFAbUZ/C6lqL9ceDReSlwOE2fdSCODNclJLBf4HhwA0QVeYcBg2F8cAtvT2iAA

+        EEazAwDUjtDKiAFYIUGuJFb8AoKan8M9nvfTRCSyGHpJin9JcmBJYlBlCqsug4us1Fsa9Xy4CLZ+NV8D

+        Q/8wVYGjQClxtVB11CdpyQ3RStmqzJDytOByMQ9eVJXOKY73rxSzpBGeYo5LYayfSszGER2OVxAnA8SJ

+        7nK5qrkgNJyGXTfFOZA+4P4YJSYqVsOuQ2mDIPdxqXAGa1TvaTwPVI1GDIYCHWEYv4aABY+JDbDNjfap

+        zeHrC2J7KoQ9pcJOZexARfJ0Q/Z4bdpMY8b+QPHxgPLtdM3H+bo3E1Vvpyo/zaveTJYc9kgW9dl95XGV

+        6UxxKDXKn+x1kNSxBdWZnOxwanFCoC4/TiuL0uaGTzakn8zUEK97dkcLCuK9/Bx+hxUhorC8LEkbpj4J

+        9YLjklsO08czys8eH/GMZTgkBLuIue7/hcHgN/gFUaBjdpgX/hk47kBlEnRd1EvW2yWbHfLVFsmyTrKg

+        zRmtShqrTt5oz9/qUD7rLT8arDwaLD8ZKTsdL381rDzsVZyMV210F/WrUlVZYZIo35xImiojtKcstUzM

+        zBPSmguEPRXi2qxQnEyTPHxnqJS4GJptlaTyXX3tUfA/QFJCJxREMUGMiaCRjgubge/iaZBsgS8aqTS2

+        WyrLNYtPNZ5DGN1REOAii/QtEJLG2leagJi93Zl72Jt/PFBwMFB4NKTc7Zavt+bMN4p7lTEt0rD+4nid

+        QtSQE6GVhPeUxM9osoBwuTlruTljqSlzuVU2XCtukAqqMvjNeaKukmT4sSSamiv0aS6Ia8iNLooLVETT

+        ShL8xhrEe6MqtSQUgRLNgJ8TBF0kUtijSF/r2AB77DfpijwP6C2J8suNZShEQfJov5xw75wwTxSdRgzx

+        HG/0U3VZYbXpbJT1I5WJa7qsZx2S457cs8G83S7pdkfOqi59rSVro00yVp3YlMXViNnxDEeemwnP9UEm

+        x7Uug92qEHTkhXUVRHTKOb1KQVUKI9rbNNLLLC+KVhBFE3mZxTEtc6I8NHlCeEh5Gqc0iZkWYotiu14S

+        IWQ4oD9huFj5Oj31tn0Q5GYa5msBozAASOd7ZkXQoH1xCrcqSwD7wXYrYvzRS5WnsP/GwHZHQigU0Yvi

+        /CrTQrTyyNYiETyhpVDYUZKgzxNiv6vFfJiEOieyMjNMLgxM5VIRQ+D9iNaIxYokXm4CJzmUFsN0Q7yD

+        JLGpqM/ZHk9SQ31RsYfR7TP47rnRvspEZnFSMBZwEnAIogCbaJZniLcN2bc4PoBPo5RArYoiIi7IIYXj

+        JouhA3BNdmi1mKuM85NFUOUx9ML4wIp0LqKcRiIwYogMcBAGu6ZxnFPZTmKeqyzKWxHrC5+Wx9AK4vyz

+        Qz1SQ5xF/rYx/jbYMPgW39OC6WyChhtdL4TjZYXmC1pCVxSV8EW+pxXKT4SRQGfTRI4Pyji+t52Abhnp

+        ZwUJpz3lepiyKA851Ec8T7PwQFeWpzWqI5RJ+JsGALFMJ4TaZLYroOZEeOXH0ksSGWVJgaWJDABAAVqX

+        E66VRzcroowYBP62UQz7eKajkGEHwSIh2AnPxBBn7AS2HIwG7BURDaGNjG7etneh2hLbhuLeUAz72P7l

+        bfMnWSfbPvCzN0F1EOhsTrO5D+IDdShZ8LghgpuiqsPX7liIeyhL8RKBCPGUDKYeFmRU9LFCtZ8Q4prO

+        dwevA5GEexSK/KvTWRppeLNCoMriA0BjrgAAUPwaMaCjh4AyMSxSuFSDoI1CK4iWH9EgKsAZ+wrtIRxv

+        O66PPWwJ2wYlQOQYlAMA4KHZPvK1M0XV4Gv70Mf6flwQFRJgZ0J3MfN1NqU5PcITHbm/22MIFgw3M/wd

+        Ps02ws8OAgCgCEB2ZIZSDSdQnhJSl82Huq15UW350U1QXUGGZnQyTbJQIwZxqAcE6orDvDPCffBMD/XC

+        R8AAJMQ1NFbAgPQOAGQZQyUF2wbtoTSeBhjwDZL1IGPLY2RMYAh0ME0P9S2I57JdAcCMhs7E2cwP3SIF

+        NelTLPARfwd2CGMGAQd6JpHtAmUQlGHS2P6KVBYAkOpKw7RSvjaHR67l4Whi2wrQS/1tSzg1tAfgtqTR

+        dAjIEvwV7ATMURRoj7AAc0pkwVldQWyBZQj1dbgj50gYJA3lYQG7gjMAACzE9y4+IufQbP6CbxQkhHSW

+        pcN9ses4ChCK3g4PITgNlNZB4Ca8LOCQAAD7SWA549/NiYQr0pFD1Nn8BklYg4SvyeZB+yYJXyfDR56+

+        IAJpdEydMtWQbjwHWRRNEesH91UmBhbGB2ADciI8wGrhCRfP5LmnsVwSgxyBB/EOSQeZEnxZqK8d9g+C

+        Bc/HBjBgVzgKbycTKIqCx8vmX2E+TyqzeAsdSkm4O07M4DlwIUOPhl/Br995sAv2CADQVUuiaPBahC9d

+        XjSENHopaTOI3b0lQmRYFA1D1QlTGjEKgrVWqRFDaQqrUswjHT85qDghQBHtLY/yQqhF01gg9FVE+qD9

+        T2e7IjohO6bx3HEsyWwK9EZfEclwDvdzgG8YzgSn4eP80Mfxgb/LfQ+rfw+nmSN/bQ9VyaOpdPu/GM4P

+        0YJBAl1MEENxAnAAnEBKqCdsGEwmTAjK1OZEqCXhMCEcAiynWRYOAD3FosnaNBQKC3rJYot0iZSctbYc

+        IwZdbkRHQUxNNg8F0j+CjxBVFhf0UVkKA6jAnWSHukOQ4cUct3SWGw4H7C8SqsDHBtwEuEAEU2xzkKu1

+        l+VjtqttiMMf1cn+u215md7mHPfHiMiBjg/QpbDczDhu5tF0eyRgxECYbr4owBDy0axqcwVN8sgWeQSM

+        R5vDaVWED1SIJutTZrXiuaaM5z2FkGfdBbudeRAjBnV6sCaL05QnMIhWEdEoD9fkhtVL+QZRZXDKU5io

+        2yCFIoZM4AMDA0EGNgVcMpIGrAu1DWpMVI0Myj3UPEFuNp4WfwgDHg/XiN7M1kyUCsHVASFaFDQqbIo5

+        MMPBMkJJyylNCkEKQ6GA6KmXk8Gns0iIqgyWg6JhXJU0p8lAwYaybbtbvtch2+9WvOgvfDmofDVcYsTQ

+        mS9AFQSqyyDw+v8uSNiIZSR7JYmol0SqsyPARJQkhCDho0CEBSN7wEkE/vYRdAcIw/0/ve1+QytLs/+9

+        sybh12kf8WpgpyOXZKvATYDFcnqEjh6/gugnjfavEfPqMvgNWfzGrFBUOu1yAcjM4fKkFa10tVmyppOu

+        6yWbrbLdTvlBX+HxcPFZf/6bkeJPU5Xf5muvF+uMGHqLIvqLI3tLYyB9ZbHoTgYr44arE0ZUiaM1Se0l

+        Il1BlEYWASYCMDSy6MbcGAjKUpR0JGcTHwRVEJFTuJ4JHCrf77Gv4z2OtwNaSl15ws5Y6U5fYU6wdeBd

+        m353ROZIZEg+oPhLklgtckFbXlR3QQxUHylPmKlJX2nK2WpTbOmle+2Kg+7Cg578/e68o76Cs9Gyt9NV

+        VzMV12AYVu8oiHWNEcOCJgWCqhMl50KjeK4hbaYuBTKtTsYTrGinMrolTwBqCCGiWSbQ5UZCkHSQaOpz

+        QqvSWYhmIP9EgXYC2lPQDUGulnxvSqCLFaKNMoG+3FoUh2YdGDzh9485no8R4hD9UJvBcfVSXrsivK84

+        FlTDTG3ysjZzu1XyvEvxrFN+1Fd4OlIG1c9GS15PlH9cUF2DtF2uvVlR366ii6zD2ojher0JJAq6mXcz

+        Nedj5ccDRTC43XbpVkv2ph7AxMAGWWzMmq1Ln6hOGUaHWSxsk/Nbc3m6XK5Oxm+U8FCoyiOpYrY9qhUe

+        xZrr5iTwIXtFgPy8PlAtYoPVCnJ9iAIpKdheHu2B72slrM78cJz8iCoe5P5KS9Zmu3S3K/dZj+J5r/zF

+        kBI9yeVM1ds51du5KrA7V+t1N7tNP3YaDXK9rfm2WW/EgI7+GuzQ806SoN4EXdd4tVT/ZbEODCnkcqIU

+        bdq76aq3k9WvxypOBoqPegr2O/KfdUp32iRb7ZK9LsXBQNFeT8FiU+ZYdXy9hJ0f7ZcSRE0NoZYmB8zp

+        Ml9P19cnM9HTRfpZopXDAY7V4oSTljWpu+05r2ZVl8sNnzf13/bafuy1Xu+2XO80Qz6uNnzZ0H7d1n7b

+        abraavi6rbne097u64iTTuIVONwuLH697DBiOBtSvOyTng7kG+RssAAMO0ihz7PV6JhBXkDAAHxfUH+d

+        q/k6BxKp/mYZvFjT9bIaLShIse9r2i9LmpPR0u0O6bwueViViPhYEOutU4RcLFZ8XKqFQSvi/PJFvvrC

+        6P2Rqu9brd9WG0k6cFd/9bzjx4se4nSIeD1MXIAi6CeJ55MukiY8H7iT3juNO0h51Um87ifeDJITAjxf

+        9xsxLGrT5jUpK82SJW32fEMGZEFDWg6ec/VieMiiNgPesqrP2WzPBcf6rLdwv195PlIOY4W8Gq08n1Cd

+        T6rPJmpPx9XzbfkzenmDlKMQOC/pMt7Mq8C9Xm83aguFWTynvuJooL3Z0P5Yb7rdgU6gynuIsz5wsr/O

+        e39d9P287L+57Lu+6Lk9I+Xnea9BsL457f7xquv2dd9/FyOG7U7ZVod0s02x3pK7qpNC1vQygwAY1IXS

+        UH29VQokgATOi/T4mgQwlgPKyL6iqMESsL/xg2VxvSVxqIozeS4JAU/0irDXs3XEYS/xohfW3FstBobm

+        HNbLkRKcG2hw4nkPsd9HksrgxjF2uegnLgfu9njw15sBAwCgIl9i198NE+9HiA+jeEO+xGnciRHDXo9i

+        pysXBg1FQUJis7c7FQbBRzDbh4PK5334KX4kXb3z8kVtOjDDxbGvbfIw5FS9Ar11aH0mB7QFcnl+jA/Y

+        1f2B8pOxSuKo72anbbW3slDoU5lIH6kQLjamHvQXvBwufTla9m5V/XGj4esz3c1R+89XJBjyQLD3wICj

+        OO0mOfOTzn/kH+3/B4at9uz1lgwkke122WYrEooEC2QlPLfapFgYBF+A/PMRvAESSGdhFCIvSN/pJtms

+        Tj7TnNskF6nEYWBfekoSx6vTQDB/WdHdbLf3V6fLIt01Ody5piwcKfbldKwCE4nrPR2GFT+PwJP3ExeD

+        Rn9AZnw3QrwdJi4HyfM57yMPCk9y0Uec9v4jxnM46svb75Eie4PIQFQ96MnDAh+RVrDA07DA++ddZKon

+        w1FL9nqbHOGlRcGvFQdVpwaUJvqhwYe15Ap8M7lUMcs5T+C501XSJuOdjlW9mamdbJICA7iMjmIhGG/M

+        444GlChD3i2qIJ8Q7Hd15AhvS/t1XfN9U4uTwQjm+37Lj8O2v+0NGPp/HbZDfh60QW73W40YPi/Vflqs

+        uVqp+4I4s1gDweLraj2EfIk4u1T/ebHu43zte8TByYrzsdLTkeJnvfmgORa0GSBssLXTjRnDqmSwqxWp

+        nJwwary/RU0689tWNyqA88nKn3sdW/0VmXxcErAmmYfUoNa80LEq4ao2fUGbuKBJ2GgVHw8XXE6VvZks

+        ezddAfb/3XLN+5XaD6vqT+v1nzca/pFrxMM7AU4wvEYMhiEIsddK7Oh/bjX/2sYks4V41ka+2WtFukAM

+        udloRuqAYI0331Y0SD1IQBdTFacTFfAZUGnjqoQuZQSoENRXOJbNHuWX9ZbZ+qTvm80ImmP1WQkMK/Qk

+        cO6JRtk04l5jGqYw+325e92S48G8j3PVIP2/LapvVzTETitx1Em86DLKYQeOCLz61YbmdrsZglETBHy7

+        EcO3FTVynGESBSIeT6zxxiBvJiuQ4N7PVH+cq4FggZR3OVGOb2J0S/7F3dav69qzyUoEt7mGlIq0IJS9

+        1eLA92stp1NVL0aKMKf7sqa+WGrBCKtMzO6uzsQtgp7SuN1uBXHQTRx2QhsUEeQOrms/T1d9nCj/NleD

+        GRIJ4ATJoY98vuj6td+GSR+5uYb9xUbv6I0Yfqw03Kxq3s5UXEyUYLRDyoTy25KK2Gz4vlh1PFL6YrgE

+        mRihCfaDJ9bY+F8nrcRF94+TtptXHYh91wft4OvHqmL1abwuSdRYecrrqaaLae1uX+nX7R7ieOzrRm+f

+        Mq42OWhWnd2eGzFUHL+uk7+d0V6/6LzC0Oh06MNK46elxvPRqvcTtTvNktfjZcieN6jtNhuJZzpio+7n

+        YjmxXPlloeHdlOrrCrJq44vBYiOG8yHlxXDx+wVkqNKT0eKT4YL9LsmLPtnlaNH5cN7rGdV+f8FGWw7o

+        SpgNPoK9XNFlnM6V3B63Eu8Rtod+HHecTJevt2ZvtGaPlgvn61Owx9e7bV93Wy+XaonzQeLNMPFx/sNa

+        E/j6i1nVaHXskk58Oa8iXvbdvmonzruQBFBNvJ6tOBtTvhoqWqxLmKyMRjnzFXaF6mNNAxv7iUJ1rwVm

+        /HWh7vtSw5e5WmhuxHA5Xgnu+nm/Ek3G/mDR+VT1yVgZCod3oOZXNJjonE2Vn4yXYIERG3E2dL2jx5tP

+        6+rbo1ZDiv2+33Y4pgROhK/LhQpMWG6PWogPw8Rp+5d9DXHZ+eus9eaF7vZYjzc/X7YdTOR92FITb/qJ

+        T6PXx03EOySynq97jYcj8vPpkhfDisUG0UZLzlaH7Hyq5mxShTg+2yDe6CyETKkSEf1fDha/n66BBf0d

+        WwdKjgZKdHmRzYqICU324ZjqxVjNwUjF+XTd+yXtbm/u8VjxB9Q2h13ExQg5SD8bwv4Rr8eJ12NknXM+

+        TLzsf7/W+G4B49A+xMRbVDuI7h9Gfp1B+07iI86hh9T43SDxEX+h/2q/mXjdCwv8cqBHFiM+TyMtfNrS

+        rXVKLmZrMARbQ9fWVdRZGNOQzSlJCEhg2OASFC4QgTeI9rXAHKMihYkOGzM+IwZMnSFJLGfcAcCdA1zY

+        QcdTLWZjBIgas6UwdFiduN6bfzhZ9XK29nim5mROfbpQv4w2pbd4a6hsY0AJ8h1cA64vfFrSvd/s+Ljd

+        cXs8/PV595u1ZpR0P08Gfh33Xz/v+Lyle7/e9GJa9Wy0bGuoZK2/eKI5e3dE9WKmca27ZEIjRTs6osoa

+        rMhsy4uvyeTHYwBJfcRyfeBt8R/gEEA+kANoN4sgT2vMWfg067z4YCOGYNf7IW5gm83BDqHK5/tYhLia

+        BDr9yaGY8D3MmM6/syn3wn3MhIHWiSwHiCjIJtrfIoFhh9thmMniozDQMtL7ocjHVMZ3QZUhj/RUZ3Ea

+        srjYxcGKJDD7a62KjVb5XnfR0XDVbKOkuzgOjEkWn4J7ZylM59Rglzg/W4HHU6btvRgf2zi6c5ibBeYP

+        Afb3oDqmQeByMKlCF0VicLfxdn5Ksb7vYXv/v+5rUKz+pNrc87J/6GrxO67I4DqT6+N/eVj+5ud439eO

+        vBR3d9vgPggLsEPgiEAiAS3b9XGIqzluHPnY/YZpMUkJ+zyJo1tL+S4ZIXb1GSwQKv0lQqh+0Ffybq4R

+        de7VsvZ6s31NLwewYiENlE9SkF2cv5XA01TkZ41fj/R+Gu7xBOJv9Z8g8e9ukZADdsyo/Owf4O4PBASP

+        n8OfGLWBFAQLbDwHiu0jDwdzPCnWDz3tH3nZPQIkw4zdy/ovXGTCHTs/l6c0R3P8CII108PW3948nO4q

+        YLjxcSOMTZUIg9Sy2CG1/Hxes91b9Hqh4dVENcrEvW75SmPas3bZmzElhndoiEfKotG1LepkB+Pq/TH1

+        Rn/ZZJNkuUc5pc+d1udp8qNAq6WHuvED3Hn+FAbFCjDC/TDGBf9Lcgj5AvfccFfUlyPqjM6SBCMGHxsT

+        L5uHPjamXlYmEG8bc7qDBd3J2tfRytvBAuSpr4OZj80DUKhhNAfcKQuwf8ClWijCKa2KyMm6zNkGctaP

+        mvftfANxMnL1DM824iU6ssZPKzVnY4XH/YqLsWKkmouhvPOBgrejZa+Hit+Pl+G21o9l1a9l9fVsNUiK

+        n+vNF+OVo+VxdWmBlfE03C2CpIS4CQOcoujOMYHuKaH+2UJuuZiPKUx9dnizNBRlvxED3dEc4mX7p6fN

+        H7if6GH9O+h1GBJ8A7M9WCRoCAibYhrsfA9OAjJ0pCEXO/3jedfNfjfyABmmLoZQHZD97mbD11X1XbJv

+        QK9DbLVAoB9Kr522bJSP31dbPi9oLyerUIOhJHs7WrKuSSG73KGS0/GayzntVH3WWoeyrTilQRaTL2SA

+        IGXj/oAzOaGL9ncANQgrwpgPlIouX2jEAPPA5Teq7X/4uvzJ8jbl+ZpxvB6EUH4Lcv7fTMd/D3L6VyzD

+        Qh7rWZ8b2lOZOKBKmm7OOZioeb9WRyAsotA/0BNIFIe6z+uqN3MlP5e1H8YqPk3VXM3WvRmtvJrD7auu

+        78v687na9gLQpuHzTbKR6lSUrls9+Rfz6heDpego0BspYzxwp6VdGacvEHVVpNblRtfLY3AlCzc70MSC

+        ZUxj26WE2ICQB7EpifYvTGKrJNFGDDA4prulkEfNFjEqZZEtZUm9tWnj2szF9tyt3qL98Yrj2erTRfXV

+        LoqLUeKk7+uuHs07GhfcULraafq4VocCEykW6enzKu5ukO77fqru1VD5SHkciDokJty42hoorUoLwjwK

+        AVQu8M6L9h6oTtnsL9kfUW33lWXzEZ1sUkNwSda2XhEljfZVxPlW5/B6qpNn9LlLrbKZxvTBSmGPMkwn

+        D6/JYKFZx2UqUCRGDORIxtEEswWwdJhdp3MouObTmBOGafR+f+X5ourXyy7i4wTZCr7s/LhW82GlGrv+

+        crJ6vjmzLZ+PUeJgmbBTEdYhD51SJU/UJLblh3UqI0FwJIdYJAZbKuK9MRStzWbnRlGV8Qwwk8kYMgXa

+        Fif61WSxypL8kVvj/Z+IuQ6SCLc0lkO9LDyD75IQ9DgnwqlaHNBTFjXfLEYxhvIR1dDZSNGL/vy1JvFg

+        aaReyjJiYDr9hetDvpa/MWx+Z9r+Hmz7G9fhd6GnaS7XuUJEb1Ywtvql1zAYNLKHLRdzpS/HFe+XK8bV

+        KXo5ryzOB/6nTgmqFPlq0ljTqoxxTaq+KFybx9PIeRVihlrK1RZFVmWzO4oEg1WJ0xrJiCoDFBsCCyYg

+        PaUx4BTBL07Wp+FK2mxT1uFY1d5g6f5IxdV2+9V267ft1qtN/Ze1po/LGtQ+b2ar340rP89Wfl6oxq2i

+        s4kyIwY0JdXpwVopFx0Myvr1rsK9/rLD0cpX0+qLec3H3WaSM70YIEsjNOMnnSTJ87LjbK7qLe5JLqpR

+        YCOMHo+UX0zV/drr+7zZejFffzyBl6SDflpu/bDY+npa+2ZBffu86/t215v5prcLzZdzmjcLdYgHn1Ya

+        UVPiNh2u+kEn4qAL1Sex34ko/AFU0Ir2eqsFrez1dtuXteYPSxpUnMcjJa/GK15NVp7PqIwY2gujR6qT

+        DwZzT6eL0TThAhsqfrJqPwPhM3r7Cm3uCCigqz399UEredPwsIX05rM24l3vzxf6T+u113tNYLWOR5XL

+        TamrzSTZuKHNXq1LX6/LXKlOWypL2VBlztaJnvXkYvK91Jhx0KdEpz7fkHjQL389WYpK+aBX9moo73Ki

+        +HKs8HRQftSdfdIjP+yUbOkzlhpSxiuFIIVbZNzGTKauIBJmWRRPk0VS8oVef/eiG3BKFWgF3OkkTd9A

+        +BgE3fdF76/nTV821J836r7ttdzg/iTqvMtx4qwHBvZxq/7det3pUtX+ZNH6QO5Kr+RwuBgMO6Ybu715

+        2Kqz6ernA4XL+kx0eSOVIngL7jDiFjLK5KPhstNJ1dmc6uVUxcFo8XafYkEvnqjHjCcJi66i2BlNDmSl

+        NX+oMhkft7pLIM8HqxZ18pcT9UejtRhQGDH8v/6//wOxEBXYZyzgPgAAAABJRU5ErkJggg==

+</value>

+  </data>

+</root>
\ No newline at end of file
diff --git a/mcs/doctools/etc/gui/TextResources.resx b/mcs/doctools/etc/gui/TextResources.resx
new file mode 100644
index 00000000000..29d380cc385
--- /dev/null
+++ b/mcs/doctools/etc/gui/TextResources.resx
@@ -0,0 +1,138 @@
+<?xml version="1.0" encoding="utf-8" ?>

+<root>

+	<!-- 

+            Microsoft ResX Schema 

+        

+            Version 1.3

+                

+            The primary goals of this format is to allow a simple XML format 

+            that is mostly human readable. The generation and parsing of the 

+            various data types are done through the TypeConverter classes 

+            associated with the data types.

+        

+            Example:

+        

+                ... ado.net/XML headers & schema ...

+                <resheader name="resmimetype">text/microsoft-resx</resheader>

+                <resheader name="version">1.3</resheader>

+                <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>

+                <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>

+                <data name="Name1">this is my long string</data>

+                <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>

+                <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">

+                    [base64 mime encoded serialized .NET Framework object]

+                </data>

+                <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">

+                    [base64 mime encoded string representing a byte array form of the .NET Framework object]

+                </data>

+        

+            There are any number of "resheader" rows that contain simple 

+            name/value pairs.

+            

+            Each data row contains a name, and value. The row also contains a 

+            type or mimetype. Type corresponds to a .NET class that support 

+            text/value conversion through the TypeConverter architecture. 

+            Classes that don't support this are serialized and stored with the 

+            mimetype set.

+                     

+            The mimetype is used for serialized objects, and tells the 

+            ResXResourceReader how to depersist the object. This is currently not 

+            extensible. For a given mimetype the value must be set accordingly:

+        

+            Note - application/x-microsoft.net.object.binary.base64 is the format 

+                   that the ResXResourceWriter will generate, however the reader can 

+                   read any of the formats listed below.

+        

+            mimetype: application/x-microsoft.net.object.binary.base64

+            value   : The object must be serialized with 

+                    : System.Serialization.Formatters.Binary.BinaryFormatter

+                    : and then encoded with base64 encoding.

+        

+            mimetype: application/x-microsoft.net.object.soap.base64

+            value   : The object must be serialized with 

+                    : System.Runtime.Serialization.Formatters.Soap.SoapFormatter

+                    : and then encoded with base64 encoding.

+            mimetype: application/x-microsoft.net.object.bytearray.base64

+            value   : The object must be serialized into a byte array 

+                    : using a System.ComponentModel.TypeConverter

+                    : and then encoded with base64 encoding.

+        -->

+	<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">

+		<xsd:element name="root" msdata:IsDataSet="true">

+			<xsd:complexType>

+				<xsd:choice maxOccurs="unbounded">

+					<xsd:element name="data">

+						<xsd:complexType>

+							<xsd:sequence>

+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+								<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />

+							</xsd:sequence>

+							<xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />

+							<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />

+							<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />

+						</xsd:complexType>

+					</xsd:element>

+					<xsd:element name="resheader">

+						<xsd:complexType>

+							<xsd:sequence>

+								<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />

+							</xsd:sequence>

+							<xsd:attribute name="name" type="xsd:string" use="required" />

+						</xsd:complexType>

+					</xsd:element>

+				</xsd:choice>

+			</xsd:complexType>

+		</xsd:element>

+	</xsd:schema>

+	<resheader name="resmimetype">

+		<value>text/microsoft-resx</value>

+	</resheader>

+	<resheader name="version">

+		<value>1.3</value>

+	</resheader>

+	<resheader name="reader">

+		<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+	</resheader>

+	<resheader name="writer">

+		<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=1.0.3300.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>

+	</resheader>

+	<data name="Monodoc.Version">

+		<value>0.0</value>

+	</data>

+	<data name="Form.About.Title">

+		<value>About Monodoc</value>

+	</data>

+	<data name="Menu.File">

+		<value>File</value>

+	</data>

+	<data name="Menu.File.Exit">

+		<value>Exit</value>

+	</data>

+	<data name="Menu.Edit">

+		<value>Edit</value>

+	</data>

+	<data name="Menu.Window">

+		<value>Window</value>

+	</data>

+	<data name="Menu.Help">

+		<value>Help</value>

+	</data>

+	<data name="Menu.Window.About">

+		<value>About Monodoc...</value>

+	</data>

+	<data name="Menu.Window.Cascade">

+		<value>Cascade</value>

+	</data>

+	<data name="Menu.Window.TileHorizontal">

+		<value>Tile Horizontal</value>

+	</data>

+	<data name="Menu.Window.TileVertical">

+		<value>TileVertical</value>

+	</data>

+	<data name="Form.Main.Title">

+		<value>Monodoc</value>

+	</data>

+	<data name="Buttons.Close">

+		<value>Close</value>

+	</data>

+</root>
\ No newline at end of file
diff --git a/mcs/doctools/etc/gui/readme.txt b/mcs/doctools/etc/gui/readme.txt
new file mode 100644
index 00000000000..2b54b334365
--- /dev/null
+++ b/mcs/doctools/etc/gui/readme.txt
@@ -0,0 +1,20 @@
+Monodoc GUI Graphical Resources
+-------------------------------
+These are the original files for graphical resources that end up in
+ImageResources.resx.
+
+Filename --> Resource Name
+
+AboutMonodoc.png 	--> AboutMonodoc.Bitmap
+AssemblyBrowser.png	--> AssemblyTree.Bitmap
+
+* TODO: Figure out a way to generate the .resx file programatically.
+
+
+Monodoc GUI Text Resources
+--------------------------
+These files contain text used by the GUI, such as menu and button names,
+abstracted out for easy internationalization.
+
+TextResources.resx	--> Standard (English) text resources.
+
diff --git a/mcs/doctools/etc/monodoc.dtd b/mcs/doctools/etc/monodoc.dtd
new file mode 100644
index 00000000000..fbdac7184ed
--- /dev/null
+++ b/mcs/doctools/etc/monodoc.dtd
@@ -0,0 +1,135 @@
+<?xml version="1.0" encoding="UTF-8"?>

+

+<!-- Root element -->

+<!ELEMENT monodoc (class | delegate | enum | interface | struct)*>

+<!ATTLIST monodoc

+	language CDATA #REQUIRED

+>

+

+<!-- Type-level tags -->

+<!ELEMENT class (summary, remarks?, (class | delegate | enum | interface | struct | constructor | event | field | method | operator | property)*, seealso*)>

+<!ATTLIST class

+	name CDATA #REQUIRED

+	assembly CDATA #IMPLIED

+>

+

+<!ELEMENT delegate (summary, remarks?, param*, seealso*)>

+<!ATTLIST delegate

+	name CDATA #REQUIRED

+	assembly CDATA #IMPLIED

+>

+<!ELEMENT enum (summary, remarks?, member+)>

+<!ATTLIST enum

+	name CDATA #REQUIRED

+	assembly CDATA #IMPLIED

+>

+

+<!ELEMENT interface (summary, remarks?, seealso*)>

+<!ATTLIST interface

+	name CDATA #REQUIRED

+	assembly CDATA #IMPLIED

+>

+

+<!ELEMENT struct (summary, remarks?, (class | delegate | enum | interface | struct | constructor | event | field | method | operator | property)*, seealso*)>

+<!ATTLIST struct

+	name CDATA #REQUIRED

+	assembly CDATA #IMPLIED

+>

+

+<!-- Member-level tags -->

+<!ELEMENT constructor (summary, remarks?, param*, exception*, seealso*)>

+<!ATTLIST constructor

+	name CDATA #REQUIRED

+>

+

+<!ELEMENT event (summary, remarks?, data, seealso*)>

+<!ATTLIST event

+	name CDATA #REQUIRED

+>

+

+<!ELEMENT field (summary, remarks?, seealso*)>

+<!ATTLIST field

+	name CDATA #REQUIRED

+>

+

+<!ELEMENT method (summary, remarks?, param*, exception*, returns?, seealso*)>

+<!ATTLIST method

+	name CDATA #REQUIRED

+>

+

+<!ELEMENT operator (summary, remarks?, param*, exception*, returns?, seealso*)>

+<!ATTLIST operator

+	name CDATA #REQUIRED

+>

+

+<!ELEMENT property (summary, remarks?, value, exception*, seealso*)>

+<!ATTLIST property

+	name CDATA #REQUIRED

+>

+

+<!-- Member-info level tags -->

+<!ELEMENT data (#PCDATA | c | example | list | para | see)*>

+

+<!ELEMENT exception (#PCDATA | c | example | list | para | paramref | see)*>

+<!ATTLIST exception

+	cref CDATA #REQUIRED

+>

+

+<!ELEMENT member (#PCDATA | c | see)*>

+<!ATTLIST member

+	name CDATA #REQUIRED

+>

+

+<!ELEMENT param (#PCDATA | c | example | list | para | see)*>

+<!ATTLIST param

+	name CDATA #REQUIRED

+>

+

+<!ELEMENT remarks (#PCDATA | c | example | list | para | paramref | see)*>

+

+<!ELEMENT returns (#PCDATA | c | example | list | para | paramref | see)*>

+

+<!ELEMENT seealso EMPTY>

+<!ATTLIST seealso

+	cref CDATA #REQUIRED

+>

+

+<!ELEMENT summary (#PCDATA | c | example | list | para | paramref | see)*>

+

+<!ELEMENT value (#PCDATA | c | example | list | para | paramref | see)*>

+

+<!-- Formatting and presentation tags -->

+

+<!ELEMENT c (#PCDATA)>

+

+<!ELEMENT code (#PCDATA)>

+<!ATTLIST code

+	lang CDATA #REQUIRED

+>

+

+<!ELEMENT description (#PCDATA | c | see)*>

+

+<!ELEMENT example (#PCDATA | c | code | para | see)*>

+

+<!ELEMENT item (term?, description)>

+

+<!ELEMENT list (listheader?, item+)>

+<!ATTLIST list

+	type (bullet | number | table) #REQUIRED

+>

+

+<!ELEMENT listheader (term?, description)>

+

+<!ELEMENT para (#PCDATA | c | example | list | paramref | see)*>

+

+<!ELEMENT paramref EMPTY>

+<!ATTLIST paramref

+	name CDATA #REQUIRED

+>

+

+<!ELEMENT see (#PCDATA)>

+<!ATTLIST see

+	cref CDATA #REQUIRED

+>

+

+<!ELEMENT term (#PCDATA)>

diff --git a/mcs/doctools/makefile b/mcs/doctools/makefile
new file mode 100755
index 00000000000..c7fe192bd46
--- /dev/null
+++ b/mcs/doctools/makefile
@@ -0,0 +1,11 @@
+docstub:
+	NAnt docstub
+
+docval:
+	NAnt docval
+
+gui:
+	NAnt gui
+
+clean:
+	rm -rf build
diff --git a/mcs/doctools/src/Console/docstub.cs b/mcs/doctools/src/Console/docstub.cs
new file mode 100644
index 00000000000..ca23f7675bb
--- /dev/null
+++ b/mcs/doctools/src/Console/docstub.cs
@@ -0,0 +1,693 @@
+//	docstub.cs
+//
+//	Adam Treat (manyoso@yahoo.com)
+//	(C) 2002 Adam Treat
+//
+//	DocStub is based heavily upon the NDoc project
+//	ndoc.sourceforge.net
+//
+//	This program is free software; you can redistribute it and/or modify
+//	it under the terms of the GNU General Public License as published by
+//	the Free Software Foundation; either version 2 of the License, or
+//	(at your option) any later version.
+
+
+using System;
+using System.Collections;
+using System.Collections.Specialized;
+using System.Diagnostics;
+using System.IO;
+using System.Reflection;
+using System.Xml;
+using System.Text;
+
+namespace Mono.Util {
+
+	class DocStub {
+
+		Assembly assembly;
+		bool nested;
+		string assembly_file, directory, language, classname, currentNamespace, docname;
+
+		void Usage()
+		{
+			Console.Write (
+				"docstub -l <lang> -d <directory> -a <assembly>\n\n" +
+				"   -d || --dir       <directory>             The directory to write the xml files to.\n" +
+				"   -a || --assembly  <assembly>              Specifies the target assembly to load and parse.\n" +
+				"   -l || --language  <two-letter ISO code>   Specifies the language encoding.\n\n");
+		}
+
+		public static void Main(string[] args)
+		{
+			DocStub stub = new DocStub(args);
+		}
+
+		public DocStub(string[] args)
+		{
+			assembly_file = null;
+			directory = null;
+			int argc = args.Length;
+
+			for(int i = 0; i < argc; i++) {
+
+				string arg = args[i];
+
+				if(arg.StartsWith("-")) {
+
+					switch(arg) {
+
+					case "-d": case "--directory":
+						if((i + 1) >= argc) {
+							Usage();
+							return;
+						}
+						directory = args[++i];
+						continue;
+
+					case "-a": case "--assembly":
+						if((i + 1) >= argc) {
+							Usage();
+							return;
+						}
+						assembly_file = args[++i];
+						continue;
+					case "-l": case "--language":
+						if((i + 1) >= argc) {
+							Usage();
+							return;
+						}
+						language = args[++i];
+						continue;
+
+					default:
+						Usage();
+						return;
+					}
+				}
+			}
+
+			if(assembly_file == null) {
+				Usage();
+				return;
+			} else if(directory == null) {
+				Usage();
+				return;
+			}
+
+			if (!Directory.Exists(directory) && directory != null) {
+                Directory.CreateDirectory(directory);
+            }
+
+			// Call the main driver to get some things done
+			MakeXml();
+		}
+
+		// Builds an XmlDocument with the reflected metadata
+		private void MakeXml()
+		{
+			try {
+				assembly = LoadAssembly(Path.GetFullPath(assembly_file));
+			}
+			catch (Exception e) {
+				Console.WriteLine(e.Message);
+			}
+			Write();
+		}
+
+		private void Write()
+		{
+			foreach(Module module in assembly.GetModules()) {
+				WriteNamespaces(module);
+			}
+		}
+
+		private void WriteNamespaces(Module module)
+		{
+			Type[] types = GetMyTypes(module);
+			StringCollection namespaceNames = GetNamespaceNames(types);
+			XmlTextWriter dummy = new XmlTextWriter("temp.xml", new UTF8Encoding());
+
+			foreach (string namespaceName in namespaceNames) {
+				currentNamespace = namespaceName;
+				WriteClasses(dummy, types);
+				WriteInterfaces(dummy, types);
+				WriteStructures(dummy, types);
+				WriteDelegates(dummy, types);
+				WriteEnumerations(dummy, types);
+			}
+
+            dummy.Close();
+			File.Delete("temp.xml");
+		}
+
+		private XmlTextWriter StartDocument()
+		{
+			if (!Directory.Exists(directory+"/"+currentNamespace) && directory != null) {
+                Directory.CreateDirectory(directory+"/"+currentNamespace);
+            }
+
+			string filename = directory+"/"+currentNamespace+"/"+docname+".xml";
+   			XmlTextWriter writer = new XmlTextWriter (filename, new UTF8Encoding());
+			writer.Formatting = Formatting.Indented;
+			writer.Indentation=4;
+			writer.WriteStartDocument();
+			writer.WriteDocType("monodoc", null, "http://www.go-mono.org/monodoc.dtd", null);
+			writer.WriteStartElement("monodoc");
+			writer.WriteAttributeString("language",language);
+			return writer;
+		}
+
+		private void EndDocument(XmlTextWriter writer)
+		{
+			writer.WriteEndElement();
+			writer.WriteEndDocument();
+			nested = false;
+			writer.Close();
+		}
+
+		private bool IsDelegate(Type type)
+		{
+			return type.BaseType.FullName == "System.Delegate" ||
+				type.BaseType.FullName == "System.MulticastDelegate";
+		}
+
+		private string GetTypeName(Type type)
+		{
+			return type.FullName.Replace('+', '.');
+		}
+
+		private StringCollection GetNamespaceNames(Type[] types)
+		{
+			StringCollection namespaceNames = new StringCollection();
+			foreach (Type type in types) {
+				if (!namespaceNames.Contains(type.Namespace)) {
+					namespaceNames.Add(type.Namespace);
+				}
+			}
+			return namespaceNames;
+		}
+
+		private bool IsAlsoAnEvent(Type type, string fullName)
+		{
+			bool isEvent = false;
+
+			BindingFlags bindingFlags =
+				BindingFlags.Instance |
+				BindingFlags.Static |
+				BindingFlags.Public |
+				BindingFlags.NonPublic |
+				BindingFlags.DeclaredOnly;
+
+			foreach (EventInfo eventInfo in type.GetEvents(bindingFlags)) {
+
+				if (eventInfo.EventHandlerType.FullName == fullName) {
+
+					isEvent = true;
+					break;
+				}
+			}
+
+			return isEvent;
+		}
+
+		private bool IsAlsoAnEvent(FieldInfo field)
+		{
+			return IsAlsoAnEvent(field.DeclaringType, field.FieldType.FullName);
+		}
+
+		private bool IsAlsoAnEvent(PropertyInfo property)
+		{
+			return IsAlsoAnEvent(property.DeclaringType, property.PropertyType.FullName);
+		}
+
+		// Loads an assembly.
+		public static Assembly LoadAssembly(string filename)
+		{
+			if (!File.Exists(filename)) {
+				throw new ApplicationException("can't find assembly " + filename);
+			}
+
+			FileStream fs = File.Open(filename, FileMode.Open, FileAccess.Read);
+			byte[] buffer = new byte[fs.Length];
+			fs.Read(buffer, 0, (int)fs.Length);
+			fs.Close();
+
+			return Assembly.Load(buffer);
+		}
+
+		private Type[] GetMyTypes(Module module)
+		{
+			int i = 0;
+			Type[] temp = module.GetTypes();
+			ArrayList list = new ArrayList();
+			foreach (Type type in temp) {
+				if (MustDocumentType(type)) {
+     				list.Add(type);
+				}
+			}
+			Type[] types = new Type[list.Count];
+			foreach (Type type in list) {
+				types[i++] = type;
+			}
+			return types;
+		}
+
+		private bool MustDocumentType(Type type)
+		{
+			if (type != null) {
+				return ((type.IsPublic ||
+						type.IsNestedPublic) &&
+						!type.FullName.Equals("Driver") &&
+						!type.FullName.Equals("Profile"));
+			} else {
+				return false;
+			}
+		}
+
+		private bool MustDocumentMethod(MethodBase method)
+		{
+			return (method.IsPublic);
+		}
+
+		private bool MustDocumentField(FieldInfo field)
+		{
+			return (field.IsPublic);
+		}
+
+		private string GetParameterTypes(ParameterInfo[] parameters)
+		{
+			if (parameters.Length != 0) {
+				StringBuilder sb = new StringBuilder();
+				sb.Append("(");
+				foreach (ParameterInfo parameter in parameters) {
+
+					sb.Append(GetTypeName(parameter.ParameterType) + ", ");
+				}
+				sb.Remove(sb.Length-2, 2);
+				sb.Append(")");
+				return sb.ToString();
+			} else {
+				return "";
+			}
+		}
+
+		private void WriteClasses(XmlTextWriter writer, Type[] types)
+		{
+			foreach (Type type in types) {
+				if (type.IsClass && !IsDelegate(type) && type.Namespace.Equals(currentNamespace)) {
+					classname = type.FullName;
+					docname = type.Name;
+					if (!nested) {
+
+						writer = StartDocument();
+						WriteClass(writer, type);
+						EndDocument(writer);
+					} else {
+						WriteClass(writer, type);
+					}
+				}
+			}
+		}
+
+		private void WriteInterfaces(XmlTextWriter writer, Type[] types)
+		{
+  			foreach (Type type in types) {
+
+				if (type.IsInterface && type.Namespace.Equals(currentNamespace)) {
+
+					classname = type.FullName;
+					docname = type.Name;
+					if (!nested) {
+
+						writer = StartDocument();
+						WriteInterface(writer, type);
+						EndDocument(writer);
+					} else {
+						WriteInterface(writer, type);
+					}
+				}
+			}
+		}
+
+		private void WriteStructures(XmlTextWriter writer, Type[] types)
+		{
+			foreach (Type type in types) {
+
+				if (type.IsValueType && !type.IsEnum && type.Namespace.Equals(currentNamespace)) {
+
+					classname = type.FullName;
+					docname = type.Name;
+					if (!nested) {
+
+						writer = StartDocument();
+						WriteClass(writer, type);
+						EndDocument(writer);
+					} else {
+						WriteClass(writer, type);
+					}
+				}
+			}
+		}
+
+		private void WriteDelegates(XmlTextWriter writer, Type[] types)
+		{
+			foreach (Type type in types) {
+
+				if (type.IsClass && IsDelegate(type) && type.Namespace.Equals(currentNamespace)) {
+
+					classname = type.FullName;
+					docname = type.Name;
+					if (!nested) {
+
+						writer = StartDocument();
+						WriteDelegate(writer, type);
+						EndDocument(writer);
+					} else {
+						WriteDelegate(writer, type);
+					}
+				}
+			}
+		}
+
+		private void WriteEnumerations(XmlTextWriter writer, Type[] types)
+		{
+			foreach (Type type in types) {
+
+				if (type.IsEnum && type.Namespace.Equals(currentNamespace)) {
+
+					classname = type.FullName;
+					docname = type.Name;
+					if (!nested) {
+
+						writer = StartDocument();
+						WriteEnumeration(writer, type);
+						EndDocument(writer);
+					} else {
+						WriteEnumeration(writer, type);
+					}
+				}
+			}
+		}
+
+		// Writes XML documenting a class or struct.
+		private void WriteClass(XmlTextWriter writer, Type type)
+		{
+			Type[] types = type.GetNestedTypes();
+			AssemblyName assemblyName = assembly.GetName();
+			bool isStruct = type.IsValueType;
+			nested = false;
+
+			writer.WriteStartElement(isStruct ? "struct" : "class");
+			writer.WriteAttributeString("name", type.FullName);
+			writer.WriteAttributeString("assembly", assemblyName.Name);
+			writer.WriteElementString("summary","TODO");
+			writer.WriteElementString("remarks","TODO");
+
+			WriteClasses(writer, types);
+			WriteInterfaces(writer, types);
+			WriteStructures(writer, types);
+			WriteDelegates(writer, types);
+			WriteEnumerations(writer, types);
+
+			WriteConstructors(writer, type);
+			WriteFields(writer, type);
+			WriteProperties(writer, type);
+			WriteMethods(writer, type);
+			WriteOperators(writer, type);
+			WriteEvents(writer, type);
+
+			writer.WriteEndElement();
+		}
+
+		// Writes XML documenting an interface.
+		private void WriteInterface(XmlTextWriter writer, Type type)
+		{
+			AssemblyName assemblyName = assembly.GetName();
+
+			writer.WriteStartElement("interface");
+			writer.WriteAttributeString("name", type.FullName);
+			writer.WriteAttributeString("assembly", assemblyName.Name);
+			writer.WriteElementString("summary","TODO");
+			writer.WriteElementString("remarks","TODO");
+			writer.WriteEndElement();
+		}
+
+		// Writes XML documenting a delegate.
+		private void WriteDelegate(XmlTextWriter writer, Type type)
+		{
+			AssemblyName assemblyName = assembly.GetName();
+
+			writer.WriteStartElement("delegate");
+			writer.WriteAttributeString("name", type.FullName);
+			writer.WriteAttributeString("assembly", assemblyName.Name);
+			writer.WriteElementString("summary","TODO");
+			writer.WriteElementString("remarks","TODO");
+			writer.WriteEndElement();
+		}
+
+		// Writes XML documenting an enumeration.
+		private void WriteEnumeration(XmlTextWriter writer, Type type)
+		{
+			Type[] types = type.GetNestedTypes();
+			AssemblyName assemblyName = assembly.GetName();
+
+			writer.WriteStartElement("enum");
+			writer.WriteAttributeString("name", type.FullName);
+			writer.WriteAttributeString("assembly", assemblyName.Name);
+			writer.WriteElementString("summary","TODO");
+			writer.WriteElementString("remarks","TODO");
+
+			writer.WriteStartElement("member");
+			writer.WriteAttributeString("name", "TODO");
+			writer.WriteEndElement();
+
+			writer.WriteEndElement();
+		}
+
+		private void WriteConstructors(XmlTextWriter writer, Type type)
+		{
+			BindingFlags bindingFlags =
+				BindingFlags.Instance |
+				BindingFlags.Public |
+				BindingFlags.NonPublic;
+
+			ConstructorInfo[] constructors = type.GetConstructors(bindingFlags);
+
+			foreach (ConstructorInfo constructor in constructors) {
+
+				if (MustDocumentMethod(constructor)) {
+
+					WriteConstructor(writer, constructor);
+				}
+			}
+		}
+
+		private void WriteFields(XmlTextWriter writer, Type type)
+		{
+			BindingFlags bindingFlags =
+				BindingFlags.Instance |
+				BindingFlags.Static |
+				BindingFlags.Public |
+				BindingFlags.NonPublic;
+
+			foreach (FieldInfo field in type.GetFields(bindingFlags)) {
+
+				if (!IsAlsoAnEvent(field) && MustDocumentField(field)) {
+
+					WriteField(writer, field);
+				}
+			}
+		}
+
+		private void WriteProperties(XmlTextWriter writer, Type type)
+		{
+			BindingFlags bindingFlags =
+				BindingFlags.Instance |
+				BindingFlags.Static |
+				BindingFlags.Public |
+				BindingFlags.NonPublic;
+
+			PropertyInfo[] properties = type.GetProperties(bindingFlags);
+
+			foreach (PropertyInfo property in properties) {
+
+				MethodInfo getMethod = property.GetGetMethod(true);
+				MethodInfo setMethod = property.GetSetMethod(true);
+
+				bool hasGetter = (getMethod != null);
+				bool hasSetter = (setMethod != null);
+
+				if ((hasGetter || hasSetter) && !IsAlsoAnEvent(property)) {
+
+					WriteProperty(writer, property, property.DeclaringType.FullName != type.FullName);
+				}
+			}
+		}
+
+		private void WriteMethods(XmlTextWriter writer, Type type)
+		{
+			BindingFlags bindingFlags =
+				BindingFlags.Instance |
+				BindingFlags.Static |
+				BindingFlags.Public |
+				BindingFlags.NonPublic;
+
+			MethodInfo[] methods = type.GetMethods(bindingFlags);
+
+			foreach (MethodInfo method in methods) {
+
+				if (!(method.Name.StartsWith("get_")) &&
+					!(method.Name.StartsWith("set_")) &&
+					!(method.Name.StartsWith("add_")) &&
+					!(method.Name.StartsWith("remove_")) &&
+					!(method.Name.StartsWith("op_")) && MustDocumentMethod(method))
+				{
+					WriteMethod(writer, method, method.DeclaringType.FullName != type.FullName);
+				}
+			}
+		}
+
+		private void WriteOperators(XmlTextWriter writer, Type type)
+		{
+			BindingFlags bindingFlags =
+				BindingFlags.Instance |
+				BindingFlags.Static |
+				BindingFlags.Public |
+				BindingFlags.NonPublic;
+
+			MethodInfo[] methods = type.GetMethods(bindingFlags);
+
+			foreach (MethodInfo method in methods) {
+
+				if (method.Name.StartsWith("op_") && MustDocumentMethod(method)) {
+
+					WriteOperator(writer, method);
+				}
+			}
+		}
+
+		private void WriteEvents(XmlTextWriter writer, Type type)
+		{
+			BindingFlags bindingFlags =
+				BindingFlags.Instance |
+				BindingFlags.Static |
+				BindingFlags.Public |
+				BindingFlags.NonPublic |
+				BindingFlags.DeclaredOnly;
+
+			foreach (EventInfo eventInfo in type.GetEvents(bindingFlags)) {
+
+				MethodInfo addMethod = eventInfo.GetAddMethod(true);
+
+				if (addMethod != null && MustDocumentMethod(addMethod)) {
+
+					WriteEvent(writer, eventInfo);
+				}
+			}
+		}
+
+		// Writes XML documenting a field.
+		private void WriteField(XmlTextWriter writer, FieldInfo field)
+		{
+			writer.WriteStartElement("field");
+			writer.WriteAttributeString("name", field.Name);
+			writer.WriteElementString("summary","TODO");
+			writer.WriteElementString("remarks","TODO");
+			writer.WriteEndElement();
+		}
+
+		// Writes XML documenting an event.
+		private void WriteEvent(XmlTextWriter writer, EventInfo eventInfo)
+		{
+			writer.WriteStartElement("event");
+			writer.WriteAttributeString("name", eventInfo.Name);
+			writer.WriteElementString("summary","TODO");
+			writer.WriteElementString("remarks","TODO");
+			writer.WriteElementString("data","TODO");
+
+			writer.WriteEndElement();
+		}
+
+		// Writes XML documenting a constructor.
+		private void WriteConstructor(XmlTextWriter writer, ConstructorInfo constructor)
+		{
+			writer.WriteStartElement("constructor");
+			writer.WriteAttributeString("name", docname + GetParameterTypes(constructor.GetParameters()));
+			writer.WriteElementString("summary","TODO");
+			writer.WriteElementString("remarks","TODO");
+
+			foreach (ParameterInfo parameter in constructor.GetParameters()) {
+
+				WriteParameter(writer, parameter);
+			}
+
+			writer.WriteEndElement();
+		}
+
+		// Writes XML documenting a property.
+		private void WriteProperty(XmlTextWriter writer, PropertyInfo property, bool inherited )
+		{
+			if (!inherited) {
+
+				writer.WriteStartElement("property");
+				writer.WriteAttributeString("name", property.Name);
+				writer.WriteElementString("summary","TODO");
+				writer.WriteElementString("remarks","TODO");
+				writer.WriteElementString("value","TODO");
+
+				writer.WriteEndElement();
+			}
+		}
+
+		// Writes XML documenting an operator.
+		private void WriteOperator(XmlTextWriter writer, MethodInfo method)
+		{
+			if (method != null) {
+
+				writer.WriteStartElement("operator");
+				writer.WriteAttributeString("name", method.Name + GetParameterTypes(method.GetParameters()));
+				writer.WriteElementString("summary","TODO");
+				writer.WriteElementString("remarks","TODO");
+
+				foreach (ParameterInfo parameter in method.GetParameters()) {
+
+					WriteParameter(writer, parameter);
+				}
+
+				writer.WriteElementString("returns", "TODO");
+
+				writer.WriteEndElement();
+			}
+		}
+
+		// Writes XML documenting a method.
+		private void WriteMethod(XmlTextWriter writer, MethodInfo method, bool inherited)
+		{
+			if (!inherited && method != null) {
+
+				writer.WriteStartElement("method");
+				writer.WriteAttributeString("name", method.Name + GetParameterTypes(method.GetParameters()));
+				writer.WriteElementString("summary","TODO");
+				writer.WriteElementString("remarks","TODO");
+
+				foreach (ParameterInfo parameter in method.GetParameters()) {
+
+					WriteParameter(writer, parameter);
+				}
+
+				writer.WriteElementString("returns", "TODO");
+
+				writer.WriteEndElement();
+			}
+		}
+
+		private void WriteParameter(XmlTextWriter writer, ParameterInfo parameter)
+		{
+			writer.WriteStartElement("param");
+			writer.WriteAttributeString("name", parameter.Name);
+			writer.WriteString("TODO");
+			writer.WriteEndElement();
+		}
+	}
+}
diff --git a/mcs/doctools/src/Console/docval.cs b/mcs/doctools/src/Console/docval.cs
new file mode 100644
index 00000000000..9c3b691c609
--- /dev/null
+++ b/mcs/doctools/src/Console/docval.cs
@@ -0,0 +1,94 @@
+//	docval.cs
+//
+//	Adam Treat (manyoso@yahoo.com)
+//	(C) 2002 Adam Treat
+//
+//	This program is free software; you can redistribute it and/or modify
+//	it under the terms of the GNU General Public License as published by
+//	the Free Software Foundation; either version 2 of the License, or
+//	(at your option) any later version.
+
+using System;
+using System.Xml;
+
+namespace Mono.Util {
+
+	class DocVal {
+
+		string file;
+
+		void Usage()
+		{
+			Console.Write ("docval [file]\n\n");
+		}
+
+		public static void Main(string[] args)
+		{
+			DocVal val = new DocVal(args);
+		}
+
+		public DocVal(string [] args)
+		{
+			bool pass = true;
+			file = null;
+			int argc = args.Length;
+
+			for(int i = 0; i < argc; i++) {
+				string arg = args[i];
+				if(arg.EndsWith(".xml")) {
+					file = arg;
+				}
+			}
+
+			if(file == null) {
+				Usage();
+				return;
+			}
+
+			try {
+				XmlTextReader read = new XmlTextReader(file);
+				XmlValidatingReader validate = new XmlValidatingReader(read);
+				validate.ValidationType = ValidationType.Auto;
+				while (validate.Read()) {
+					switch (validate.NodeType) {
+						case XmlNodeType.XmlDeclaration:
+							Console.WriteLine("** XML declaration");
+							break;
+						case XmlNodeType.DocumentType:
+							Console.WriteLine("** DocumentType node");
+							break;
+						case XmlNodeType.Document:
+							Console.WriteLine("** Document node");
+							break;
+						case XmlNodeType.Element:
+							Console.WriteLine("** Element: {0}", validate.Name);
+						break;
+						case XmlNodeType.EndElement:
+							Console.WriteLine("** End Element: {0}", validate.Name);
+							break;
+						case XmlNodeType.Text:
+							Console.WriteLine("** Text: {0}", validate.Value);
+							break;
+						case XmlNodeType.Comment:
+							Console.WriteLine("** Comment: {1}", validate.Name, validate.Value);
+							break;
+						case XmlNodeType.Whitespace:
+							break;
+						default:
+							pass = false;
+							Console.WriteLine("** ERROR: Unknown node type");
+							break;
+					}
+				}
+			} catch (Exception e) {
+				pass = false;
+				Console.WriteLine(e);
+			}
+			if(pass) {
+				Console.Write("\n   Validation: PASSED!\n\n");
+			} else {
+				Console.Write("\n   Validation: FAILED!\n\n");
+			}
+		}
+	}
+}
diff --git a/mcs/doctools/src/Core/.cvsignore b/mcs/doctools/src/Core/.cvsignore
new file mode 100644
index 00000000000..ebc8ba26975
--- /dev/null
+++ b/mcs/doctools/src/Core/.cvsignore
@@ -0,0 +1,3 @@
+bin
+obj
+*.user
diff --git a/mcs/doctools/src/Core/AbstractClassStructDoc.cs b/mcs/doctools/src/Core/AbstractClassStructDoc.cs
new file mode 100644
index 00000000000..f303f796f78
--- /dev/null
+++ b/mcs/doctools/src/Core/AbstractClassStructDoc.cs
@@ -0,0 +1,159 @@
+// AbstractClassStructDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Reflection;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	public abstract class AbstractClassStructDoc : AbstractTypeDoc

+	{

+		protected ValueConstrainedArrayList constructors = new ValueConstrainedArrayList(typeof(ConstructorDoc));

+		protected ValueConstrainedArrayList       events = new ValueConstrainedArrayList(typeof(EventDoc));

+		protected ValueConstrainedArrayList       fields = new ValueConstrainedArrayList(typeof(FieldDoc));

+		protected ValueConstrainedArrayList      methods = new ValueConstrainedArrayList(typeof(MethodDoc));

+		protected ValueConstrainedArrayList    operators = new ValueConstrainedArrayList(typeof(OperatorDoc));

+		protected ValueConstrainedArrayList   properties = new ValueConstrainedArrayList(typeof(PropertyDoc));

+

+		// nested items

+		protected ValueConstrainedArrayList      classes = new ValueConstrainedArrayList(typeof(ClassDoc));

+		protected ValueConstrainedArrayList    delegates = new ValueConstrainedArrayList(typeof(DelegateDoc));

+		protected ValueConstrainedArrayList        enums = new ValueConstrainedArrayList(typeof(EnumDoc));

+		protected ValueConstrainedArrayList   interfaces = new ValueConstrainedArrayList(typeof(InterfaceDoc));

+		protected ValueConstrainedArrayList      structs = new ValueConstrainedArrayList(typeof(StructDoc));

+

+		public AbstractClassStructDoc(string name) : base(name)

+		{

+		}

+

+		public AbstractClassStructDoc() : this(string.Empty)

+		{

+		}

+

+		public AbstractClassStructDoc(Type t, AssemblyLoader loader) : base(t, loader)

+		{

+			// constructors

+			foreach (ConstructorInfo cons in loader.GetConstructors(t))

+			{

+				this.Constructors.Add(new ConstructorDoc(cons, loader));

+			}

+

+			// events

+			foreach (EventInfo ev in loader.GetEvents(t))

+			{

+				this.Events.Add(new EventDoc(ev, loader));

+			}

+

+			// fields

+			foreach (FieldInfo field in loader.GetFields(t))

+			{

+				this.Fields.Add(new FieldDoc(TypeNameHelper.GetName(field)));

+			}

+

+			// methods

+			foreach (MethodInfo m in loader.GetMethods(t))

+			{

+				this.Methods.Add(new MethodDoc(m, loader));

+			}

+

+			// operators

+			foreach (MethodInfo o in loader.GetOperators(t))

+			{

+				this.Operators.Add(new OperatorDoc(o, loader));

+			}

+

+			// properties

+			foreach (PropertyInfo prop in loader.GetProperties(t))

+			{

+				this.Properties.Add(new PropertyDoc(prop, loader));

+			}

+

+			// TODO: nested types

+		}

+

+		[XmlElement(ElementName = "constructor", Type = typeof(ConstructorDoc))]

+		public ValueConstrainedArrayList Constructors

+		{

+			get { return this.constructors;  }

+		}

+

+		[XmlElement(ElementName = "event", Type = typeof(EventDoc))]

+		public ValueConstrainedArrayList Events

+		{

+			get { return this.events;  }

+		}

+

+		[XmlElement(ElementName = "field", Type = typeof(FieldDoc))]

+		public ValueConstrainedArrayList Fields

+		{

+			get { return this.fields;  }

+		}

+

+		[XmlElement(ElementName = "method", Type = typeof(MethodDoc))]

+		public ValueConstrainedArrayList Methods

+		{

+			get { return this.methods;  }

+		}

+

+		[XmlElement(ElementName = "operator", Type = typeof(OperatorDoc))]

+		public ValueConstrainedArrayList Operators

+		{

+			get { return this.operators;  }

+		}

+

+		[XmlElement(ElementName = "property", Type = typeof(PropertyDoc))]

+		public ValueConstrainedArrayList Properties

+		{

+			get { return this.properties;  }

+		}

+

+		[XmlElement(ElementName = "class", Type = typeof(ClassDoc))]

+		public ValueConstrainedArrayList Classes

+		{

+			get { return this.classes;  }

+		}

+

+		[XmlElement(ElementName = "delegate", Type = typeof(DelegateDoc))]

+		public ValueConstrainedArrayList Delegates

+		{

+			get { return this.delegates;  }

+		}

+

+		[XmlElement(ElementName = "enum", Type = typeof(EnumDoc))]

+		public ValueConstrainedArrayList Enums

+		{

+			get { return this.enums;  }

+		}

+

+		[XmlElement(ElementName = "interface", Type = typeof(InterfaceDoc))]

+		public ValueConstrainedArrayList Interfaces

+		{

+			get { return this.interfaces;  }

+		}

+

+		[XmlElement(ElementName = "struct", Type = typeof(StructDoc))]

+		public ValueConstrainedArrayList Structs

+		{

+			get { return this.structs;  }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/AbstractDoc.cs b/mcs/doctools/src/Core/AbstractDoc.cs
new file mode 100644
index 00000000000..20b7df73536
--- /dev/null
+++ b/mcs/doctools/src/Core/AbstractDoc.cs
@@ -0,0 +1,83 @@
+// AbstractDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Collections.Specialized;

+using System.Reflection;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	public abstract class AbstractDoc

+	{

+		protected string           name;

+		protected string           summary;

+		protected string           remarks;

+		protected StringCollection seeAlso;

+

+		public static readonly string TODO = "Documentation forthcoming.";

+

+		public AbstractDoc(string name)

+		{

+			this.name     = name;

+			this.summary  = string.Empty;

+			this.remarks  = string.Empty;

+			this.seeAlso  = new StringCollection();

+		}

+

+		public AbstractDoc() : this(string.Empty)

+		{

+		}

+

+		public AbstractDoc(MemberInfo m, AssemblyLoader loader) : this(TypeNameHelper.GetName(m))

+		{

+			this.summary = AbstractDoc.TODO;

+			this.remarks = AbstractDoc.TODO;

+		}

+

+		[XmlElement(ElementName = "summary")]

+		public string Summary

+		{

+			get { return this.summary;  }

+			set { this.summary = value; }

+		}

+

+		[XmlElement(ElementName = "remarks")]

+		public string Remarks

+		{

+			get { return this.remarks;  }

+			set { this.remarks = value; }

+		}

+

+		[XmlAttribute(AttributeName = "name")]

+		public string Name

+		{

+			get { return this.name;  }

+			set { this.name = value; }

+		}

+

+		[XmlElement(ElementName = "seealso")]

+		public StringCollection SeeAlso

+		{

+			get { return this.seeAlso; }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/AbstractMethodOperatorDoc.cs b/mcs/doctools/src/Core/AbstractMethodOperatorDoc.cs
new file mode 100644
index 00000000000..80361f7906a
--- /dev/null
+++ b/mcs/doctools/src/Core/AbstractMethodOperatorDoc.cs
@@ -0,0 +1,71 @@
+// AbstractMethodOperatorDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Reflection;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	public abstract class AbstractMethodOperatorDoc : AbstractDoc

+	{

+		protected ValueConstrainedArrayList exceptions = new ValueConstrainedArrayList(typeof(ExceptionDoc));

+		protected ValueConstrainedArrayList parameters = new ValueConstrainedArrayList(typeof(ParameterDoc));

+		protected string                    returns    = string.Empty;

+

+		public AbstractMethodOperatorDoc(string name) : base(name)

+		{

+		}

+

+		public AbstractMethodOperatorDoc() : this(string.Empty)

+		{

+		}

+

+		public AbstractMethodOperatorDoc(MethodInfo m, AssemblyLoader loader) : base(m, loader)

+		{

+			foreach (ParameterInfo param in m.GetParameters())

+			{

+				this.Parameters.Add(new ParameterDoc(param.Name, AbstractDoc.TODO));

+			}

+

+			this.Returns = AbstractDoc.TODO;

+		}

+

+		[XmlElement(ElementName = "exception", Type = typeof(ExceptionDoc))]

+		public ValueConstrainedArrayList Exceptions

+		{

+			get { return this.exceptions; }

+		}

+

+		[XmlElement(ElementName = "param", Type = typeof(ParameterDoc))]

+		public ValueConstrainedArrayList Parameters

+		{

+			get { return this.parameters; }

+		}

+

+		[XmlElement(ElementName = "returns")]

+		public string Returns

+		{

+			get { return this.returns;  }

+			set { this.returns = value; }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/AbstractTypeDoc.cs b/mcs/doctools/src/Core/AbstractTypeDoc.cs
new file mode 100644
index 00000000000..d84255a4fb6
--- /dev/null
+++ b/mcs/doctools/src/Core/AbstractTypeDoc.cs
@@ -0,0 +1,52 @@
+// AbstractTypeDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	public abstract class AbstractTypeDoc : AbstractDoc

+	{

+		protected string assembly;

+

+		public AbstractTypeDoc(string name) : base(name)

+		{

+			this.assembly = string.Empty;

+		}

+

+		public AbstractTypeDoc() : this(string.Empty)

+		{

+		}

+

+		public AbstractTypeDoc(Type t, AssemblyLoader loader) : base(t, loader)

+		{

+			this.assembly = t.Assembly.GetName().Name;

+		}

+

+		[XmlAttribute(AttributeName = "assembly")]

+		public string Assembly

+		{

+			get { return this.assembly;  }

+			set { this.assembly = value; }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/AssemblyInfo.cs b/mcs/doctools/src/Core/AssemblyInfo.cs
new file mode 100644
index 00000000000..8e9127507a2
--- /dev/null
+++ b/mcs/doctools/src/Core/AssemblyInfo.cs
@@ -0,0 +1,79 @@
+// AssemblyInfo.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System.Reflection;

+using System.Runtime.CompilerServices;

+

+//

+// General Information about an assembly is controlled through the following 

+// set of attributes. Change these attribute values to modify the information

+// associated with an assembly.

+//

+[assembly: AssemblyTitle("")]

+[assembly: AssemblyDescription("")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("")]

+[assembly: AssemblyProduct("")]

+[assembly: AssemblyCopyright("")]

+[assembly: AssemblyTrademark("")]

+[assembly: AssemblyCulture("")]		

+

+//

+// Version information for an assembly consists of the following four values:

+//

+//      Major Version

+//      Minor Version 

+//      Build Number

+//      Revision

+//

+// You can specify all the values or you can default the Revision and Build Numbers 

+// by using the '*' as shown below:

+

+[assembly: AssemblyVersion("1.0.*")]

+

+//

+// In order to sign your assembly you must specify a key to use. Refer to the 

+// Microsoft .NET Framework documentation for more information on assembly signing.

+//

+// Use the attributes below to control which key is used for signing. 

+//

+// Notes: 

+//   (*) If no key is specified, the assembly is not signed.

+//   (*) KeyName refers to a key that has been installed in the Crypto Service

+//       Provider (CSP) on your machine. KeyFile refers to a file which contains

+//       a key.

+//   (*) If the KeyFile and the KeyName values are both specified, the 

+//       following processing occurs:

+//       (1) If the KeyName can be found in the CSP, that key is used.

+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 

+//           in the KeyFile is installed into the CSP and used.

+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.

+//       When specifying the KeyFile, the location of the KeyFile should be

+//       relative to the project output directory which is

+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is

+//       located in the project directory, you would specify the AssemblyKeyFile 

+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]

+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

+//       documentation for more information on this.

+//

+[assembly: AssemblyDelaySign(false)]

+[assembly: AssemblyKeyFile("")]

+[assembly: AssemblyKeyName("")]

diff --git a/mcs/doctools/src/Core/AssemblyLoader.cs b/mcs/doctools/src/Core/AssemblyLoader.cs
new file mode 100644
index 00000000000..fc4157c9593
--- /dev/null
+++ b/mcs/doctools/src/Core/AssemblyLoader.cs
@@ -0,0 +1,379 @@
+// AssemblyLoader.cs

+// John Barnette (jbarn@httcb.net)

+// Adam Treat (manyoso@yahoo.com)

+// 

+// Copyright (c) 2002 John Barnette

+// Copyright (c) 2002 Adam Treat

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Collections;

+using System.IO;

+using System.Reflection;

+

+namespace Mono.Doc.Core

+{

+	public class AssemblyLoader

+	{

+		#region Instance Fields

+

+		private Assembly assem;

+

+		#endregion // Instance Fields

+

+		#region Constructors and Destructors

+

+		// TODO: add a constructor that allows specification of type and member visibility

+		public AssemblyLoader(string fileName)

+		{

+			if (!File.Exists(fileName))
+			{
+				throw new ApplicationException(
+					"Cannot find assembly file: " + fileName
+					);
+			}
+
+			FileStream fs = File.Open(fileName, FileMode.Open, FileAccess.Read);
+			byte[] buffer = new byte[fs.Length];
+			fs.Read(buffer, 0, (int)fs.Length);
+			fs.Close();
+
+			assem = Assembly.Load(buffer);
+		}

+

+		#endregion // Constructors and Destructors

+

+		#region Private Instance Methods

+

+		// TODO: visibility should be configurable in constructor
+		private bool MustDocumentType(Type type)
+		{
+			if (type != null) 

+			{
+				return ((type.IsPublic ||
+					type.IsNestedPublic) &&
+					!type.FullName.Equals("Driver") &&
+					!type.FullName.Equals("Profile")
+					);
+			} 

+		
+			return false;
+		}

+

+		// TODO: visibility should be configurable in constructor
+		private bool MustDocumentMethod(MethodBase method)
+		{
+			return (method.IsPublic);
+		}
+
+		// TODO: visibility should be configurable in constructor
+		private bool MustDocumentField(FieldInfo field)
+		{
+			return (field.IsPublic);
+		}
+

+		private bool IsAlsoAnEvent(Type type, string fullName)
+		{
+			bool isEvent = false;
+
+			BindingFlags bindingFlags =
+				BindingFlags.Instance |
+				BindingFlags.Static |
+				BindingFlags.Public |
+				BindingFlags.NonPublic |
+				BindingFlags.DeclaredOnly;
+
+			foreach (EventInfo eventInfo in type.GetEvents(bindingFlags)) 

+			{
+
+				if (eventInfo.EventHandlerType.FullName == fullName) 

+				{
+
+					isEvent = true;
+					break;
+				}
+			}
+
+			return isEvent;
+		}
+
+		private bool IsAlsoAnEvent(FieldInfo field)
+		{
+			return IsAlsoAnEvent(field.DeclaringType, field.FieldType.FullName);
+		}
+
+		private bool IsAlsoAnEvent(PropertyInfo property)
+		{
+			return IsAlsoAnEvent(property.DeclaringType, property.PropertyType.FullName);
+		}
+

+		#endregion // Private Instance Methods

+

+		#region Public Static Methods

+

+		public static bool IsClass(Type t)

+		{

+			return (t.IsClass && !IsDelegate(t)) ? true : false;

+		}

+

+		public static bool IsDelegate(Type t)

+		{

+			return t.BaseType.FullName == "System.Delegate" ||
+				t.BaseType.FullName == "System.MulticastDelegate";
+		}

+

+		public static bool IsStruct(Type t)

+		{

+			return (t.IsValueType && !t.IsEnum) ? true : false;

+		}

+

+		#endregion

+

+		#region Public Instance Methods

+

+		public Type[] GetTypes()
+		{
+			ArrayList list = new ArrayList();
+

+			foreach (Module m in assem.GetModules())

+			{

+				Type[] moduleTypes = m.GetTypes();
+

+				foreach (Type type in moduleTypes) 

+				{
+					if (MustDocumentType(type)) 

+					{
+						list.Add(type);
+					}
+				}
+			}
+
+			Type[] types = new Type[list.Count];
+			int    i     = 0;
+			

+			foreach (Type type in list) 

+			{
+				types[i++] = type;
+			}
+
+			return types;
+		}
+
+		public ConstructorInfo[] GetConstructors(Type t)
+		{
+			// TODO: should be configurable in constructor
+			BindingFlags bindingFlags = 
+				BindingFlags.Instance  | 
+				BindingFlags.Public    |
+				BindingFlags.NonPublic ;
+
+			ArrayList ctorList = new ArrayList();
+
+			foreach (ConstructorInfo ctor in t.GetConstructors(bindingFlags))
+			{
+				if (MustDocumentMethod(ctor))
+				{
+					ctorList.Add(ctor);
+				}
+			}
+
+			ConstructorInfo[] constructors = new ConstructorInfo[ctorList.Count];
+			int               i            = 0;
+
+			foreach (ConstructorInfo c in ctorList)
+			{
+				constructors[i++] = c;
+			}
+
+			return constructors;
+		}
+
+		public FieldInfo[] GetFields(Type t)
+		{
+			// TODO: should be configurable in constructor
+			BindingFlags bindingFlags  = 
+				BindingFlags.Instance  | 
+				BindingFlags.Static    |
+				BindingFlags.Public    |
+				BindingFlags.NonPublic ;
+
+			ArrayList   fieldList = new ArrayList();
+
+			foreach (FieldInfo field in t.GetFields(bindingFlags))
+			{
+				if (MustDocumentField(field))
+				{
+					fieldList.Add(field);
+				}
+			}
+
+			FieldInfo[] fields = new FieldInfo[fieldList.Count];
+			int         i      = 0;
+
+			foreach (FieldInfo f in fieldList)
+			{
+				fields[i++] = f;
+			}
+
+			return fields;
+		}
+
+		public PropertyInfo[] GetProperties(Type t)
+		{
+			// TODO: should be configurable in constructor
+			BindingFlags bindingFlags  =
+				BindingFlags.Instance  |
+				BindingFlags.Static    |
+				BindingFlags.Public    |
+				BindingFlags.NonPublic ;
+
+			ArrayList propertyList = new ArrayList();
+
+			foreach (PropertyInfo property in t.GetProperties(bindingFlags))
+			{
+				bool hasAccessor = (property.GetGetMethod(true) != null);
+				bool hasMutator  = (property.GetSetMethod(true) != null);
+
+				if ((hasAccessor || hasMutator) && !IsAlsoAnEvent(property))
+				{
+					propertyList.Add(property);
+				}
+			}
+
+			PropertyInfo[] properties = new PropertyInfo[propertyList.Count];
+			int            i          = 0;
+
+			foreach (PropertyInfo p in propertyList)
+			{
+				properties[i++] = p;
+			}
+
+			return properties;
+		}
+
+		public MethodInfo[] GetMethods(Type t)
+		{
+			// TODO: should be configurable in constructor
+			BindingFlags bindingFlags  =
+				BindingFlags.Instance  |
+				BindingFlags.Static    |
+				BindingFlags.Public    |
+				BindingFlags.NonPublic ;
+
+			ArrayList methodList = new ArrayList();
+
+			foreach (MethodInfo method in t.GetMethods(bindingFlags))
+			{
+				if (!(method.Name.StartsWith("get_"))    &&
+					!(method.Name.StartsWith("set_"))    &&
+					!(method.Name.StartsWith("add_"))    &&
+					!(method.Name.StartsWith("remove_")) &&
+					!(method.Name.StartsWith("op_"))     &&
+					MustDocumentMethod(method))
+				{
+					methodList.Add(method);
+				}
+			}
+
+			MethodInfo[] methods = new MethodInfo[methodList.Count];
+			int          i       = 0;
+
+			foreach (MethodInfo m in methodList)
+			{
+				methods[i++] = m;
+			}
+
+			return methods;
+		}
+
+		public MethodInfo[] GetOperators(Type t)
+		{
+			// TODO: should be configurable in constructor
+			BindingFlags bindingFlags  =
+				BindingFlags.Instance  |
+				BindingFlags.Static    |
+				BindingFlags.Public    |
+				BindingFlags.NonPublic ;
+
+			ArrayList operatorList = new ArrayList();
+
+			foreach (MethodInfo operatorMethod in t.GetMethods(bindingFlags))
+			{
+				if (operatorMethod.Name.StartsWith("op_") && MustDocumentMethod(operatorMethod))
+				{
+					operatorList.Add(operatorMethod);
+				}
+			}
+
+			MethodInfo[] operators = new MethodInfo[operatorList.Count];
+			int          i         = 0;
+
+			foreach (MethodInfo m in operatorList)
+			{
+				operators[i++] = m;
+			}
+
+			return operators;
+		}
+
+		public EventInfo[] GetEvents(Type t)
+		{
+			// TODO: should be configurable in constructor
+			BindingFlags bindingFlags =
+				BindingFlags.Instance |
+				BindingFlags.Static |
+				BindingFlags.Public |
+				BindingFlags.NonPublic |
+				BindingFlags.DeclaredOnly;
+
+			ArrayList eventList = new ArrayList();
+
+			foreach (EventInfo eventInfo in t.GetEvents(bindingFlags)) 

+			{
+
+				MethodInfo addMethod = eventInfo.GetAddMethod(true);
+
+				if (addMethod != null && MustDocumentMethod(addMethod)) 

+				{
+					eventList.Add(eventInfo);
+				}
+			}
+
+			EventInfo[] events = new EventInfo[eventList.Count];
+			int         i      = 0;
+
+			foreach (EventInfo e in eventList)
+			{
+				events[i++] = e;
+			}
+
+			return events;
+		}
+
+		#endregion // Public Instance Methods
+
+		#region Public Instance Properties
+
+		public Assembly Assembly
+		{
+			get { return assem; }
+		}
+
+		#endregion // Public Instance Properties
+	}

+}

diff --git a/mcs/doctools/src/Core/ClassDoc.cs b/mcs/doctools/src/Core/ClassDoc.cs
new file mode 100644
index 00000000000..f40e09a228a
--- /dev/null
+++ b/mcs/doctools/src/Core/ClassDoc.cs
@@ -0,0 +1,53 @@
+// ClassDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+

+	[XmlType(TypeName = "class")]

+	public class ClassDoc : AbstractClassStructDoc

+	{

+		public ClassDoc(string name) : base(name)

+		{

+		}

+

+		public ClassDoc() : this(string.Empty)

+		{

+		}

+

+		public ClassDoc(Type t, AssemblyLoader loader) : base(t, loader)

+		{

+			// TODO: type-checking should happen before the base ctor call.

+			if (!t.IsClass)

+			{

+				throw new ArgumentException("Type must be a class.", "t");

+			}

+		}

+

+		public override string ToString()

+		{

+			return "[ClassDoc " + this.Name + "]";

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/ConstructorDoc.cs b/mcs/doctools/src/Core/ConstructorDoc.cs
new file mode 100644
index 00000000000..e622b10dcc1
--- /dev/null
+++ b/mcs/doctools/src/Core/ConstructorDoc.cs
@@ -0,0 +1,64 @@
+// ConstructorDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Collections.Specialized;

+using System.Reflection;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	[XmlType(TypeName = "constructor")]

+	public class ConstructorDoc : AbstractDoc

+	{

+		private ValueConstrainedArrayList exceptions = new ValueConstrainedArrayList(typeof(ExceptionDoc));

+		private ValueConstrainedArrayList parameters = new ValueConstrainedArrayList(typeof(ParameterDoc));

+

+		public ConstructorDoc(string name) : base(name)

+		{

+		}

+

+		public ConstructorDoc() : this(string.Empty)

+		{

+		}

+

+		public ConstructorDoc(ConstructorInfo cons, AssemblyLoader loader) : base(cons, loader)

+		{

+			// parameters

+			foreach (ParameterInfo param in cons.GetParameters())

+			{

+				this.Parameters.Add(new ParameterDoc(param.Name, AbstractDoc.TODO));

+			}

+		}

+

+		[XmlElement(ElementName = "exception", Type = typeof(ExceptionDoc))]

+		public ValueConstrainedArrayList Exceptions

+		{

+			get { return this.exceptions; }

+		}

+

+		[XmlElement(ElementName = "param", Type = typeof(ParameterDoc))]

+		public ValueConstrainedArrayList Parameters

+		{

+			get { return this.parameters; }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/Core.csproj b/mcs/doctools/src/Core/Core.csproj
new file mode 100644
index 00000000000..e50daa5be63
--- /dev/null
+++ b/mcs/doctools/src/Core/Core.csproj
@@ -0,0 +1,233 @@
+<VisualStudioProject>

+    <CSHARP

+        ProjectType = "Local"

+        ProductVersion = "7.0.9466"

+        SchemaVersion = "1.0"

+        ProjectGuid = "{73F5A60D-A5E3-4852-B4C6-478275E733F9}"

+    >

+        <Build>

+            <Settings

+                ApplicationIcon = ""

+                AssemblyKeyContainerName = ""

+                AssemblyName = "Mono.Doc.Core"

+                AssemblyOriginatorKeyFile = ""

+                DefaultClientScript = "JScript"

+                DefaultHTMLPageLayout = "Grid"

+                DefaultTargetSchema = "IE50"

+                DelaySign = "false"

+                OutputType = "Library"

+                RootNamespace = "Mono.Doc.Core"

+                StartupObject = ""

+            >

+                <Config

+                    Name = "Debug"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "DEBUG;TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "true"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "true"

+                    Optimize = "false"

+                    OutputPath = "..\..\build\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+                <Config

+                    Name = "Release"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "false"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "false"

+                    Optimize = "true"

+                    OutputPath = "..\..\build\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+            </Settings>

+            <References>

+                <Reference

+                    Name = "System"

+                    AssemblyName = "System"

+                    HintPath = "D:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.dll"

+                />

+                <Reference

+                    Name = "System.Data"

+                    AssemblyName = "System.Data"

+                    HintPath = "D:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"

+                />

+                <Reference

+                    Name = "System.XML"

+                    AssemblyName = "System.Xml"

+                    HintPath = "D:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"

+                />

+            </References>

+        </Build>

+        <Files>

+            <Include>

+                <File

+                    RelPath = "AbstractClassStructDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AbstractDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AbstractMethodOperatorDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AbstractTypeDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AssemblyInfo.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AssemblyLoader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ClassDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ConstructorDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DelegateDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DocProject.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "EnumDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "EventDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ExceptionDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "FieldDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "InterfaceDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MethodDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MonodocException.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MonodocFile.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NamingFlags.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NotifyArrayList.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NotifyCollection.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "NotifyHashtable.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "OperatorDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ParameterDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "PropertyDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "RecursiveFileList.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "SortedStringValues.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "StructDoc.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TypeNameHelper.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ValueConstrainedArrayList.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+            </Include>

+        </Files>

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/doctools/src/Core/DelegateDoc.cs b/mcs/doctools/src/Core/DelegateDoc.cs
new file mode 100644
index 00000000000..5682bc28f1a
--- /dev/null
+++ b/mcs/doctools/src/Core/DelegateDoc.cs
@@ -0,0 +1,46 @@
+// DelegateDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	[XmlType(TypeName = "delegate")]

+	public class DelegateDoc : AbstractTypeDoc

+	{

+		private ValueConstrainedArrayList parameters = new ValueConstrainedArrayList(typeof(ParameterDoc));

+

+		public DelegateDoc(string name) : base(name)

+		{

+		}

+

+		public DelegateDoc() : this (string.Empty)

+		{

+		}

+

+		[XmlElement(ElementName = "param", Type = typeof(ParameterDoc))]

+		public ValueConstrainedArrayList Parameters

+		{

+			get { return this.parameters; }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/DocProject.cs b/mcs/doctools/src/Core/DocProject.cs
new file mode 100644
index 00000000000..6d2c2ee4545
--- /dev/null
+++ b/mcs/doctools/src/Core/DocProject.cs
@@ -0,0 +1,327 @@
+// DocProject.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Collections;

+using System.IO;

+using System.Text;

+using System.Xml;

+

+namespace Mono.Doc.Core

+{

+	public class DocProject

+	{

+		# region Public Static Fields

+

+		public static string UntitledProjectName = "Untitled"; // TODO: i18n

+

+		#endregion // Public Static Fields

+

+		#region Private Instance Fields

+

+		private ArrayList assemblyFiles;

+		private ArrayList xmlDirectories;

+		private Hashtable properties;

+		private bool      isModified;

+		private bool      isNewProject;

+		private string    projectFileName;

+

+		#endregion // Private Instace Fields

+

+		#region Public Events

+

+		public event EventHandler Modified;

+

+		public DocProject()

+		{

+			assemblyFiles   = new ArrayList();

+			xmlDirectories  = new ArrayList();

+			properties      = new Hashtable();

+			isModified      = false;

+			isNewProject    = true;

+			projectFileName = DocProject.UntitledProjectName;

+		}

+

+		#endregion // Public Events

+

+		#region Public Instance Methods

+		

+		public void Load(string fileName)

+		{

+			Clear();

+

+			XmlTextReader xml = null;

+

+			try

+			{

+				StreamReader stream = new StreamReader(fileName);

+				xml                 = new XmlTextReader(stream);

+

+				xml.MoveToContent();

+				xml.ReadStartElement("monodoc-project");

+

+				while (xml.Read()) 

+				{

+					if (xml.NodeType == XmlNodeType.Element)

+					{

+						switch (xml.Name)

+						{

+							case "assemblies":

+								LoadAssemblies(xml);

+								break;

+							case "xmlDocs":

+								LoadXmlDirectories(xml);

+								break;

+							case "properties":

+								LoadProperties(xml);

+								break;

+						}

+					}

+				}

+			}

+			catch (Exception e)

+			{

+				// FIXME: i18n

+				throw new MonodocException(

+					"Problem reading project file '" + fileName + "'.\n" + e.Message, e

+					);

+			} 

+			finally 

+			{

+				if (xml != null) xml.Close();

+			}

+

+

+			projectFileName = fileName;

+			isModified      = false;

+			isNewProject    = false;

+		}

+

+		public void Save()

+		{

+			Save(projectFileName);

+		}

+

+		public void Save(string fileName)

+		{

+			if (DocProject.UntitledProjectName == fileName)

+			{

+				throw new MonodocException("Cannot save untitled (default) project.");

+			}

+			

+			XmlTextWriter xml = null;

+

+			try

+			{

+				StreamWriter stream = new StreamWriter(fileName, false, new UTF8Encoding());

+				xml                 = new XmlTextWriter(stream);

+				xml.Formatting      = Formatting.Indented;

+				xml.Indentation     = 4;

+

+				// <monodoc-project>

+				xml.WriteStartElement("monodoc-project");

+

+				SaveAssemblies(xml);

+				SaveXmlDirectories(xml);

+				SaveProperties(xml);

+

+				// </monodoc-project>

+				xml.WriteEndElement();

+

+			} 

+			catch (Exception e)

+			{

+				// TODO: i18n

+				throw new MonodocException(

+					"Problem saving project file '" + fileName + "'.\n" + e.Message, e

+					);

+			}

+			finally

+			{

+				if (xml != null) xml.Close();

+			}

+

+			projectFileName = fileName;

+			isModified      = false;

+			isNewProject    = false;

+		}

+

+		public void Clear()

+		{

+			assemblyFiles.Clear();

+			xmlDirectories.Clear();

+			properties.Clear();

+

+			projectFileName = DocProject.UntitledProjectName;

+			isModified      = false;

+			isNewProject    = true;

+		}

+		

+		#endregion // Public Instance Methods

+

+		#region Private Instance Methods

+

+		private void LoadAssemblies(XmlTextReader xml)

+		{

+			while (xml.Read() && !(xml.NodeType == XmlNodeType.EndElement && xml.Name == "assemblies"))

+			{

+				if (xml.NodeType == XmlNodeType.Element && xml.Name == "assembly")

+				{

+					assemblyFiles.Add(xml["location"]);

+				}

+			}

+		}

+

+		private void LoadXmlDirectories(XmlTextReader xml)

+		{

+			while (xml.Read() && !(xml.NodeType == XmlNodeType.EndElement && xml.Name == "xmlDocs"))

+			{

+				if (xml.NodeType == XmlNodeType.Element && xml.Name == "directory")

+				{

+					xmlDirectories.Add(xml["location"]);

+				}

+			}

+		}

+

+		// TODO: this is dropping the first property, and I'm too tired to know why.

+		private void LoadProperties(XmlTextReader xml)

+		{

+			while (xml.Read() && !(xml.NodeType == XmlNodeType.EndElement && xml.Name == "properties"))

+			{

+				if (xml.NodeType == XmlNodeType.Element && xml.Name == "property")

+				{

+					Console.WriteLine("project property load: {0} = '{1}'",

+						xml["name"], xml["value"]);

+

+					properties[xml["name"]] = xml["value"];

+				}

+			}

+		}

+

+		private void SaveAssemblies(XmlTextWriter xml)

+		{

+			// <assemblies>

+			xml.WriteStartElement("assemblies");

+

+			foreach (string assemblyFile in assemblyFiles)

+			{

+				// <assembly location="...">

+				xml.WriteStartElement("assembly");

+				xml.WriteAttributeString("location", assemblyFile);

+

+				// </assembly>

+				xml.WriteEndElement();

+			}

+

+			// </assemblies>

+			xml.WriteEndElement();

+		}

+

+		private void SaveXmlDirectories(XmlTextWriter xml)

+		{

+			// <xmlDocs>

+			xml.WriteStartElement("xmlDocs");

+

+			foreach (string xmlDir in xmlDirectories)

+			{

+				// <directory location="...">

+				xml.WriteStartElement("directory");

+				xml.WriteAttributeString("location", xmlDir);

+

+				// </directory>

+				xml.WriteEndElement();

+			}

+

+			// </xmlDocs>

+			xml.WriteEndElement();

+		}

+

+		private void SaveProperties(XmlTextWriter xml)

+		{

+			// <properties>

+			xml.WriteStartElement("properties");

+

+			foreach (string name in properties.Keys)

+			{

+				// <property name="..." value="...">

+				xml.WriteStartElement("property");

+				xml.WriteAttributeString("name", name);

+				xml.WriteAttributeString("value", properties[name].ToString());

+

+				// </property>

+				xml.WriteEndElement();

+			}

+

+			// </properties>

+			xml.WriteEndElement();

+		}

+

+		#endregion // Private Instance Methods

+

+		#region Public Instance Properties

+		

+		public string FilePath

+		{

+			get { return projectFileName;  }

+			set { projectFileName = value; }

+		}

+

+		public bool IsModified

+		{

+			get { return isModified;  }

+			set

+			{

+				if (value && Modified != null)

+				{

+					isModified = value;

+					Modified(this, new EventArgs());

+				}

+				else

+				{

+					isModified = value;

+				}

+			}

+		}

+

+		public bool IsNewProject

+		{

+			get { return isNewProject;  }

+			set { isNewProject = value; }

+		}

+

+		public ArrayList AssemblyFiles

+		{

+			get { return assemblyFiles; }

+		}

+

+		public ArrayList XmlDirectories

+		{

+			get { return xmlDirectories; }

+		}

+

+		public Hashtable Properties

+		{

+			get { return properties; }

+		}

+		

+		#endregion // Public Instance Properties

+	}

+}

diff --git a/mcs/doctools/src/Core/EnumDoc.cs b/mcs/doctools/src/Core/EnumDoc.cs
new file mode 100644
index 00000000000..0e08cbd2d0d
--- /dev/null
+++ b/mcs/doctools/src/Core/EnumDoc.cs
@@ -0,0 +1,76 @@
+// EnumDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Reflection;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	[XmlType(TypeName = "enum")]

+	public class EnumDoc : AbstractTypeDoc

+	{

+		private ValueConstrainedArrayList members = new ValueConstrainedArrayList(typeof(EnumDoc.Member));

+		

+		public EnumDoc(string name) : base(name)

+		{

+		}

+

+		public EnumDoc() : this(string.Empty)

+		{

+		}

+

+		public EnumDoc(Type t, AssemblyLoader loader) : base(t, loader)

+		{

+			if (!t.IsEnum)

+			{

+				throw new ArgumentException("EnumDoc Type must be an enum.", "t");

+			}

+

+			foreach (FieldInfo m in t.GetFields())

+			{

+				this.Members.Add(new EnumDoc.Member(m.Name, AbstractDoc.TODO));

+			}

+		}

+

+		[XmlElement(ElementName = "member", Type = typeof(EnumDoc.Member))]

+		public ValueConstrainedArrayList Members

+		{

+			get { return this.members; }

+		}

+

+

+		[XmlType(TypeName = "member")]

+		public struct Member

+		{

+			[XmlAttribute(AttributeName = "name")]

+			public string Name;

+			[XmlText]

+			public string Description;

+

+			public Member(string name, string description)

+			{

+				Name        = name;

+				Description = description;

+			}

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/EventDoc.cs b/mcs/doctools/src/Core/EventDoc.cs
new file mode 100644
index 00000000000..5cf6e543ba3
--- /dev/null
+++ b/mcs/doctools/src/Core/EventDoc.cs
@@ -0,0 +1,55 @@
+// EventDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+

+// Permission is hereby granted, free of charge, to any person obtaining a

+// copy of this software and associated documentation files (the "Software"),

+// to deal in the Software without restriction, including without limitation

+// the rights to use, copy, modify, merge, publish, distribute, sublicense,

+// and/or sell copies of the Software, and to permit persons to whom the

+// Software is furnished to do so, subject to the following conditions:

+//

+// The above copyright notice and this permission notice shall be included in

+// all copies or substantial portions of the Software.

+//

+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR

+// IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,

+// FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE

+// AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER

+// LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING

+// FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS

+// IN THE SOFTWARE.

+

+using System;

+using System.Reflection;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	[XmlType(TypeName = "event")]

+	public class EventDoc : AbstractDoc

+	{

+		private string data = string.Empty;

+

+		public EventDoc(string name) : base(name)

+		{

+		}

+

+		public EventDoc() : this(string.Empty)

+		{

+		}

+

+		public EventDoc(EventInfo ev, AssemblyLoader loader) : base(ev, loader)

+		{

+			this.data = AbstractDoc.TODO;

+		}

+

+		[XmlElement(ElementName = "data")]

+		public string Data

+		{

+			get { return this.data;  }

+			set { this.data = value; }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/ExceptionDoc.cs b/mcs/doctools/src/Core/ExceptionDoc.cs
new file mode 100644
index 00000000000..669c2769a6b
--- /dev/null
+++ b/mcs/doctools/src/Core/ExceptionDoc.cs
@@ -0,0 +1,59 @@
+// ExceptionDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	[XmlType(TypeName = "exception")]	

+	public class ExceptionDoc

+	{

+		private string cref;

+		private string description;

+

+		public ExceptionDoc()

+		{

+			this.cref        = string.Empty;

+			this.description = string.Empty;

+		}

+

+		public ExceptionDoc(string cref, string description)

+		{

+			this.cref        = cref;

+			this.description = description;

+		}

+

+		[XmlAttribute(AttributeName = "cref")]

+		public string Cref

+		{

+			get { return this.cref;  }

+			set { this.cref = value; }

+		}

+

+		[XmlText]

+		public string Description

+		{

+			get { return this.description;  }

+			set { this.description = value; }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/FieldDoc.cs b/mcs/doctools/src/Core/FieldDoc.cs
new file mode 100644
index 00000000000..db277ec695c
--- /dev/null
+++ b/mcs/doctools/src/Core/FieldDoc.cs
@@ -0,0 +1,39 @@
+// FieldDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+

+	[XmlType(TypeName = "field")]

+	public class FieldDoc : AbstractDoc

+	{

+		public FieldDoc(string name) : base(name)

+		{

+		}

+

+		public FieldDoc() : this(string.Empty)

+		{

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/InterfaceDoc.cs b/mcs/doctools/src/Core/InterfaceDoc.cs
new file mode 100644
index 00000000000..a43223824ba
--- /dev/null
+++ b/mcs/doctools/src/Core/InterfaceDoc.cs
@@ -0,0 +1,36 @@
+// InterfaceDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+

+namespace Mono.Doc.Core

+{

+	public class InterfaceDoc : AbstractTypeDoc

+	{

+		public InterfaceDoc(string name) : base(name)

+		{

+		}

+

+		public InterfaceDoc() : this(string.Empty)

+		{

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/MethodDoc.cs b/mcs/doctools/src/Core/MethodDoc.cs
new file mode 100644
index 00000000000..99f924465df
--- /dev/null
+++ b/mcs/doctools/src/Core/MethodDoc.cs
@@ -0,0 +1,43 @@
+// MethodDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Reflection;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	[XmlType(TypeName = "method")]

+	public class MethodDoc : AbstractMethodOperatorDoc

+	{

+		public MethodDoc(string name) : base(name)

+		{

+		}

+

+		public MethodDoc() : this(string.Empty)

+		{

+		}

+

+		public MethodDoc(MethodInfo m, AssemblyLoader loader) : base(m, loader)

+		{

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/MonodocException.cs b/mcs/doctools/src/Core/MonodocException.cs
new file mode 100644
index 00000000000..1aacaace08e
--- /dev/null
+++ b/mcs/doctools/src/Core/MonodocException.cs
@@ -0,0 +1,40 @@
+// MonodocException.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+

+namespace Mono.Doc.Core

+{

+	public class MonodocException : ApplicationException

+	{

+		public MonodocException() : base()

+		{

+		}

+

+		public MonodocException(string msg) : base(msg)

+		{

+		}

+

+		public MonodocException(string msg, Exception nested) : base(msg, nested)

+		{

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/MonodocFile.cs b/mcs/doctools/src/Core/MonodocFile.cs
new file mode 100644
index 00000000000..3d51c21f6cd
--- /dev/null
+++ b/mcs/doctools/src/Core/MonodocFile.cs
@@ -0,0 +1,32 @@
+using System;

+using System.Collections;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	[XmlRoot(ElementName="monodoc")]

+	public class MonodocFile

+	{

+		private string    language = "en";

+		private ArrayList types    = new ArrayList();

+

+		public MonodocFile()

+		{

+		}

+

+		[XmlAttribute(AttributeName="language")]

+		public string Language

+		{

+			get { return language;  }

+			set { language = value; }

+		}

+

+		[XmlElement(Type = typeof(ClassDoc)), XmlElement(Type = typeof(InterfaceDoc)),

+		 XmlElement(Type = typeof(StructDoc)), XmlElement(Type = typeof(DelegateDoc)),

+		 XmlElement(Type = typeof(EnumDoc))]

+		public ArrayList Types

+		{

+			get { return types; }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/NamingFlags.cs b/mcs/doctools/src/Core/NamingFlags.cs
new file mode 100644
index 00000000000..f4f6d4042fd
--- /dev/null
+++ b/mcs/doctools/src/Core/NamingFlags.cs
@@ -0,0 +1,36 @@
+// NamingFlags.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+

+namespace Mono.Doc.Core

+{

+	[Flags]

+	public enum NamingFlags

+	{

+		None              =  1,

+		FullName          =  2,

+		TypeSpecifier     =  4,

+		ForceMethodParams =  8,

+		HideMethodParams  = 16,

+		ShortParamTypes   = 32

+	}

+}
\ No newline at end of file
diff --git a/mcs/doctools/src/Core/NotifyArrayList.cs b/mcs/doctools/src/Core/NotifyArrayList.cs
new file mode 100644
index 00000000000..9efea5fcd63
--- /dev/null
+++ b/mcs/doctools/src/Core/NotifyArrayList.cs
@@ -0,0 +1,175 @@
+// NotifyArrayList.cs

+// John Sohn (jsohn@columbus.rr.com)

+// 

+// Copyright (c) 2002 John Sohn

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied 

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  

+

+using System;

+using System.Collections;

+

+namespace Mono.Doc.Core

+{

+	/// <summary>

+	/// An implementation of the ArrayList class that provides 

+	/// a mechanism to receive a notification event

+	/// when the elements of the array are changed

+	/// </summary>

+	public class NotifyArrayList : ArrayList, INotifyCollection

+	{

+		#region Protected Instance Fields

+		

+		protected NotifyCollectionHandler handler = null;

+

+		#endregion

+

+		#region Constructors and Destructors

+		

+		public NotifyArrayList() : base()

+		{

+			handler = new NotifyCollectionHandler(this);	

+		}

+		

+		public NotifyArrayList(ICollection collection) 

+			: base(collection)

+		{

+			handler = new NotifyCollectionHandler(this);

+		}

+		

+		public NotifyArrayList(int i) : base(i)

+		{

+			handler = new NotifyCollectionHandler(this);

+		}

+		

+		#endregion // Constructors and Destructors

+

+		#region Public Instance Fields

+		

+		/// <summary>

+		/// The event handler that will be called whenever

+		/// a change is made to the ArrayList.

+		/// </summary>

+		public event CollectionModifiedEventHandler Modified;

+

+		#endregion // Public Instance Fields

+

+		#region Public Instance Methods

+

+		/// <summary>

+		/// Turns off notification event calling. Notification 

+		/// events will not be sent until EndUpdate() is called.

+		/// </summary>

+		public virtual void BeginUpdate()

+		{

+			handler.BeginUpdate();

+		}

+

+		/// <summary>

+		/// Resumes notification event calling previously

+		/// turned off by calling BeginUpdate().

+		/// </summary>

+		public virtual void EndUpdate()

+		{

+			handler.EndUpdate();

+		}

+

+		/// <summary>

+		/// Invokes the Modified event.

+		/// </summary>

+		public void SetModifiedEvent()

+		{

+			if (Modified != null)

+			{

+				Modified(this);

+			}

+		}

+		

+		// the following overridden functions modify the contents

+		// of the collection

+		public override object this[int index] 

+		{

+			set

+			{

+				base[index] = value;

+				handler.OnModified();

+			}

+		}

+	

+		public override int Add(object value) 

+		{

+			int status = base.Add(value);

+			handler.OnModified();

+			return status;

+		}

+

+		public override void AddRange(ICollection c) 

+		{

+			base.AddRange(c);

+			handler.OnModified();

+		}

+

+		public override void Clear() 

+		{

+			base.Clear();

+			handler.OnModified();

+		}

+

+		public override void Insert(int index, object value) 

+		{

+			base.Insert(index, value);

+			handler.OnModified();

+		}

+

+		public override void InsertRange(int index, ICollection c) {

+			base.InsertRange(index, c);

+			handler.OnModified();

+		}

+

+		public override void Remove(object obj) {

+			base.Remove(obj);

+			handler.OnModified();

+		}

+

+		public override void RemoveAt(int index) {

+			base.RemoveAt(index);

+			handler.OnModified();

+		}

+

+		public override void RemoveRange(int index,int count) {

+			base.RemoveRange(index, count);

+			handler.OnModified();

+		}

+

+		public override void Reverse() {

+			base.Reverse();

+			handler.OnModified();

+		}

+

+		public override void SetRange(int index,ICollection c) {

+			base.SetRange(index, c);

+			handler.OnModified();

+		}

+

+		public override void Sort() {

+			base.Sort();

+			handler.OnModified();

+		}

+		

+		#endregion // Public Instance Methods

+	}

+}

+

diff --git a/mcs/doctools/src/Core/NotifyCollection.cs b/mcs/doctools/src/Core/NotifyCollection.cs
new file mode 100644
index 00000000000..1d098e14dac
--- /dev/null
+++ b/mcs/doctools/src/Core/NotifyCollection.cs
@@ -0,0 +1,82 @@
+// NotifyCollections.cs

+// John Sohn (jsohn@columbus.rr.com)

+// 

+// Copyright (c) 2002 John Sohn

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  US

+

+using System;

+using System.Collections;

+

+namespace Mono.Doc.Core

+{

+	public delegate void CollectionModifiedEventHandler(object sender);

+

+	public interface INotifyCollection

+	{

+		event CollectionModifiedEventHandler Modified;

+		void BeginUpdate();

+		void EndUpdate();

+		void SetModifiedEvent();

+	}

+

+	public class NotifyCollectionHandler

+	{

+		private bool callModifiedEvent = true;

+		private bool changedDuringUpdate = false;

+		INotifyCollection collection;

+		

+		public NotifyCollectionHandler(INotifyCollection collection)

+		{

+			this.collection = collection;

+		}

+		

+		public void BeginUpdate()

+		{

+			callModifiedEvent = false;

+			changedDuringUpdate = false;

+		}

+		

+		public void EndUpdate()

+		{

+			// call the event if changes occured between the

+			// begin/end update calls

+			if (changedDuringUpdate)

+			{

+				collection.SetModifiedEvent();

+			}

+

+			changedDuringUpdate = false;

+			callModifiedEvent = true;

+		}

+		

+		public void OnModified()

+		{

+			// if in the middle of begin/end update

+			// save the event call until EndUpdate()

+			if (!callModifiedEvent)

+			{

+				changedDuringUpdate = true;

+			}

+			else

+			{

+				collection.SetModifiedEvent();

+			}

+		}

+	}

+}

+

diff --git a/mcs/doctools/src/Core/NotifyHashtable.cs b/mcs/doctools/src/Core/NotifyHashtable.cs
new file mode 100644
index 00000000000..d05a45f1e42
--- /dev/null
+++ b/mcs/doctools/src/Core/NotifyHashtable.cs
@@ -0,0 +1,174 @@
+// NotifyHashtable.cs

+// John Sohn (jsohn@columbus.rr.com)

+// 

+// Copyright (c) 2002 John Sohn

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Collections;

+using System.Runtime.Serialization;

+

+namespace Mono.Doc.Core

+{

+	/// <summary>

+	/// An implementation of the Hashtable class that provides 

+	/// a mechanism to receive a notification event

+	/// when the elements of the Hashtable are changed

+	// </summary>

+	public class NotifyHashtable : Hashtable, INotifyCollection

+	{

+		#region Protected Instance Fields

+		

+		protected NotifyCollectionHandler handler = null;

+

+		#endregion

+

+		#region Constructors and Destructor

+		

+		public NotifyHashtable() : base()

+		{

+			handler = new NotifyCollectionHandler(this);	

+		}

+		

+		public NotifyHashtable(IDictionary d) : base(d) 

+		{

+			handler = new NotifyCollectionHandler(this);	

+		}

+		

+		public NotifyHashtable(int i) : base(i) 

+		{

+			handler = new NotifyCollectionHandler(this);	

+		}

+		

+		public NotifyHashtable(IDictionary d, float f) : base(d, f)

+		{

+			handler = new NotifyCollectionHandler(this);	

+		}

+		

+		public NotifyHashtable(IHashCodeProvider hp, IComparer c)

+			: base(hp, c)

+		{

+			handler = new NotifyCollectionHandler(this);	

+		}

+		

+		public NotifyHashtable(int i, float f) : base(i, f)

+		{

+			handler = new NotifyCollectionHandler(this);	

+		}

+		

+		protected NotifyHashtable(SerializationInfo si, 

+			StreamingContext sc) : base(si, sc)

+		{

+			handler = new NotifyCollectionHandler(this);	

+		}

+		

+		public NotifyHashtable(IDictionary d, IHashCodeProvider hcp, 

+			IComparer c) : base(d, hcp, c)

+		{

+			handler = new NotifyCollectionHandler(this);	

+		}

+		

+		public NotifyHashtable(int i, IHashCodeProvider hcp, 

+			IComparer c) : base(i, hcp, c)

+		{

+			handler = new NotifyCollectionHandler(this);

+		}

+		

+		public NotifyHashtable(IDictionary d, float f, 

+			IHashCodeProvider hcp, IComparer c) 

+			: base(d, f, hcp, c)

+		{

+			handler = new NotifyCollectionHandler(this);

+		}

+		

+		public NotifyHashtable(int i, float f, IHashCodeProvider hcp,

+			IComparer c) : base(i, f, hcp, c)

+ 		{

+			handler = new NotifyCollectionHandler(this);

+		}

+

+		#endregion

+

+		#region Public Instance Fields

+

+		/// <summary>

+		/// The event handler that will be called whenever

+		/// a change is made to the Hashtable.

+		/// </summary>	

+		public event CollectionModifiedEventHandler Modified;

+

+		#endregion // Public Instance Fields

+		

+		#region Public Instance Methods

+

+		/// <summary>

+		/// Turns off notification event calling. Notification 

+		/// events will not be sent until EndUpdate() is called.

+		/// </summary>

+		public virtual void BeginUpdate()

+		{

+			handler.BeginUpdate();

+		}

+

+		/// <summary>

+		/// Resumes notification event calling previously

+		/// turned off by calling BeginUpdate().

+		/// </summary>

+		public virtual void EndUpdate()

+		{

+			handler.EndUpdate();

+		}

+

+		public virtual void SetModifiedEvent()

+		{

+			if (Modified != null)

+			{

+				Modified(this);

+			}			

+		}

+

+		public override object this[object key]

+		{

+			set

+			{

+				base[key] = value;

+				handler.OnModified();

+			}

+		}

+

+		public override void Add(object key,object value)

+		{

+			base.Add(key, value);

+			handler.OnModified();

+		}

+		

+		public override void Clear()

+		{

+			base.Clear();

+			handler.OnModified();

+		}

+

+		public override void Remove(object key)

+		{

+			base.Remove(key);

+			handler.OnModified();

+		}

+		#endregion // Public Instance Methods

+	}

+}

+

diff --git a/mcs/doctools/src/Core/OperatorDoc.cs b/mcs/doctools/src/Core/OperatorDoc.cs
new file mode 100644
index 00000000000..eb1b4e06520
--- /dev/null
+++ b/mcs/doctools/src/Core/OperatorDoc.cs
@@ -0,0 +1,43 @@
+// OperatorDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Reflection;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	[XmlType(TypeName = "operator")]

+	public class OperatorDoc : AbstractMethodOperatorDoc

+	{

+		public OperatorDoc(string name) : base(name)

+		{

+		}

+

+		public OperatorDoc() : this(string.Empty)

+		{

+		}

+

+		public OperatorDoc(MethodInfo o, AssemblyLoader loader) : base(o, loader)

+		{

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/ParameterDoc.cs b/mcs/doctools/src/Core/ParameterDoc.cs
new file mode 100644
index 00000000000..0b6b75df7a3
--- /dev/null
+++ b/mcs/doctools/src/Core/ParameterDoc.cs
@@ -0,0 +1,46 @@
+using System;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	[XmlType(TypeName = "param")]

+	public class ParameterDoc

+	{

+		private string name        = string.Empty;

+		private string description = string.Empty;

+

+		public ParameterDoc()

+		{

+		}

+

+		public ParameterDoc(string name, string description)

+		{

+			if (name == null)

+			{

+				throw new ArgumentException("ParameterDoc name cannot be null.", "name");

+			}

+

+			if (description == null)

+			{

+				throw new ArgumentException("ParameterDoc description cannot be null.", "description");

+			}

+

+			this.name        = name;

+			this.description = description;

+		}

+

+		[XmlAttribute(AttributeName = "name")]

+		public string Name

+		{

+			get { return this.name;  }

+			set { this.name = value; }

+		}

+

+		[XmlText]

+		public string Description

+		{

+			get { return this.description;  }

+			set { this.description = value; }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/PropertyDoc.cs b/mcs/doctools/src/Core/PropertyDoc.cs
new file mode 100644
index 00000000000..2eca5481515
--- /dev/null
+++ b/mcs/doctools/src/Core/PropertyDoc.cs
@@ -0,0 +1,59 @@
+// PropertyDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Reflection;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	public class PropertyDoc : AbstractDoc

+	{

+		private string                    value      = string.Empty;

+		private ValueConstrainedArrayList exceptions = new ValueConstrainedArrayList(typeof(ExceptionDoc));

+

+		public PropertyDoc(string name) : base(name)

+		{

+		}

+

+		public PropertyDoc() : this(string.Empty)

+		{

+		}

+

+		public PropertyDoc(PropertyInfo prop, AssemblyLoader loader) : base(prop, loader)

+		{

+			value = AbstractDoc.TODO;

+		}

+

+		[XmlElement(ElementName = "value")]

+		public string Value

+		{

+			get { return this.value;  }

+			set { this.value = value; }

+		}

+

+		[XmlElement(ElementName = "exception", Type = typeof(ExceptionDoc))]

+		public ValueConstrainedArrayList Exceptions

+		{

+			get { return this.exceptions;  }

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/RecursiveFileList.cs b/mcs/doctools/src/Core/RecursiveFileList.cs
new file mode 100644
index 00000000000..3f1a556a904
--- /dev/null
+++ b/mcs/doctools/src/Core/RecursiveFileList.cs
@@ -0,0 +1,105 @@
+// RecursiveFileList.cs

+// John Sohn (jsohn@columbus.rr.com)

+// 

+// Copyright (c) 2002 John Sohn

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Collections;

+using System.IO;

+

+

+namespace Mono.Doc.Core 

+{

+	/// <summary>

+	/// Recurses through the given directory and subdirectories based on a 

+	/// filter (wildcard) passed into the constructor. The results are placed

+	/// in the Files property which is an ArrayList of System.IO.FileInfo objects

+	/// </summary>

+	public class RecursiveFileList 

+	{

+		#region Private Instance Fields

+

+		private ArrayList fileInfoList;

+

+		#endregion // Private Instance Fields

+

+		#region Constructors and Destructors

+

+		/// <summary>Constructor for RecursiveFileList.</summary>

+		/// <param name="path">The directory to recurse.</param>

+		/// <exception cref="DirectoryNotFoundException">Thrown if an invalid path is specified.</exception>

+		public RecursiveFileList(string path) : this(path, null) 

+		{

+		}

+

+		/// <summary>

+		/// Constructor for RecursiveFileList.

+		/// </summary>

+		/// <param name="path">The directory to recurse.</param>

+		/// <param name="filter">Wildcard of files to collect.</param>

+		/// <exception cref="DirectoryNotFoundException">Thrown if an invalid path is specified.</exception>

+		public RecursiveFileList(string path, string filter)

+		{

+			this.fileInfoList = new ArrayList();

+			AddFilesInPath(path, filter);

+		}

+

+		#endregion // Constructors and Destructors

+

+		#region Private Instance Methods

+

+		private void AddFilesInPath(string path, string filter)

+		{

+			DirectoryInfo dir = new DirectoryInfo(path);

+

+

+			if (filter == null) 

+			{

+				filter = "*.*";

+			}

+                        

+			foreach (FileSystemInfo fi in dir.GetFiles(filter)) 

+			{

+				this.fileInfoList.Add(fi);

+			}

+

+

+			foreach (DirectoryInfo di in dir.GetDirectories()) 

+			{

+				AddFilesInPath(di.FullName, filter);

+			}

+		}

+

+		#endregion // Private Instance Methods

+

+		#region Public Instance Properties

+

+		/// <summary>

+		/// Contains an ArrayList of System.IO.FileInfo objects

+		/// based on the path (and optional filter) passed to the constructor.

+		/// </summary>

+		public ArrayList Files

+		{

+			get { return this.fileInfoList; }

+		}

+

+		#endregion // Public Instance Properties

+	}

+}

+

diff --git a/mcs/doctools/src/Core/SortedStringValues.cs b/mcs/doctools/src/Core/SortedStringValues.cs
new file mode 100644
index 00000000000..9f1e130de4c
--- /dev/null
+++ b/mcs/doctools/src/Core/SortedStringValues.cs
@@ -0,0 +1,85 @@
+// SortedStringValues.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// The original concept for this class was presented in an MSDN online article

+// by Eric Gunnerson.

+

+using System;

+using System.Collections;

+

+namespace Mono.Doc.Core

+{

+	public class SortedStringValues : IEnumerable

+	{

+		private IEnumerable enumerable;

+

+		public SortedStringValues(IEnumerable enumerable)

+		{

+			this.enumerable = enumerable;

+		}

+

+		internal class SortedStringValuesEnumerator : IEnumerator

+		{

+			private ArrayList   items = new ArrayList();

+			private int         current;

+

+			internal SortedStringValuesEnumerator(IEnumerator enumerator)

+			{

+				while (enumerator.MoveNext())

+				{

+					items.Add(enumerator.Current.ToString());

+				}

+

+				IDisposable disposable = enumerator as IDisposable;

+

+				if (disposable != null)

+				{

+					disposable.Dispose();

+				}

+

+				items.Sort();

+				current = -1;

+			}

+

+			public void Reset()

+			{

+				current = -1;

+			}

+

+			public bool MoveNext()

+			{

+				if (++current == items.Count) return false;

+

+				return true;

+			}

+

+			public object Current

+			{

+				get { return items[current]; }

+			}

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			return new SortedStringValuesEnumerator(enumerable.GetEnumerator());

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/StructDoc.cs b/mcs/doctools/src/Core/StructDoc.cs
new file mode 100644
index 00000000000..2c5194b22dd
--- /dev/null
+++ b/mcs/doctools/src/Core/StructDoc.cs
@@ -0,0 +1,47 @@
+// StructDoc.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Reflection;

+using System.Xml.Serialization;

+

+namespace Mono.Doc.Core

+{

+	[XmlType(TypeName = "struct")]

+	public class StructDoc : AbstractClassStructDoc

+	{

+		public StructDoc(string name) : base(name)

+		{

+		}

+

+		public StructDoc() : this(string.Empty)

+		{

+		}

+

+		public StructDoc(Type t, AssemblyLoader loader) : base(t, loader)

+		{

+			if (!AssemblyLoader.IsStruct(t))

+			{

+				throw new ArgumentException("Structdoc Type must be a struct.", "t");

+			}

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/TypeNameHelper.cs b/mcs/doctools/src/Core/TypeNameHelper.cs
new file mode 100644
index 00000000000..3c5d4c8570f
--- /dev/null
+++ b/mcs/doctools/src/Core/TypeNameHelper.cs
@@ -0,0 +1,122 @@
+// TypeNameHelper.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Reflection;

+using System.Text;

+

+namespace Mono.Doc.Core

+{

+	/// <summary>

+	/// Generates friendly names for types. 

+	/// </summary>

+	public sealed class TypeNameHelper

+	{

+		private TypeNameHelper()

+		{

+			// can't instantiate this class

+		}

+

+

+		/// <summary>

+		/// Given a MemberInfo object, creates a friendly string name without

+		/// full qualifiers or a type prefix.

+		/// </summary>

+		/// <param name="m">The MemberInfo to name</param>

+		/// <returns>A friendly name</returns>

+		public static string GetName(MemberInfo m) {

+			return GetName(m, NamingFlags.None);

+		}

+

+

+		/// <summary>

+		/// Given a MemberInfo object, creates a friendly string name.  

+		/// </summary>

+		/// <param name="m">The MemberInfo to name</param>

+		/// <param name="flags">NamingFlags can be combined to alter the output</param>

+		/// <returns>A friendly name</returns>

+		public static string GetName(MemberInfo m, NamingFlags flags)

+		{

+			StringBuilder name = new StringBuilder();

+			

+			// type specifier

+			if ((flags & NamingFlags.TypeSpecifier) != 0) {

+				// append a type specifier to this name

+				string    type = null;

+

+				if (m is ConstructorInfo) {

+					type = "C";

+				} else if (m is MethodInfo) {

+					type = "M";

+				} else if (m is EventInfo) {

+					type = "E";

+				} else if (m is FieldInfo) {

+					type = "F";

+				} else if (m is PropertyInfo) {

+					type = "P";

+				} else if (m is Type) {

+					type = "T";

+				} else {

+					type = "!";

+				}

+

+				name.Append(type + ":");

+			}

+

+			// first-class types

+			if (m.DeclaringType == null && m is Type) {

+				return name.Append((m as Type).FullName).ToString();

+			}

+

+			// full name

+			if (((flags & NamingFlags.FullName) != 0) && m.DeclaringType != null) {

+				name.Append(m.DeclaringType.FullName + ".");

+			}

+

+			// normal name

+			name.Append(m.Name.Replace(".", "#")); // for #ctor

+		

+			// for methods and constructors, params are part of the name

+			if (m is MethodBase) {

+				MethodBase      method     = m as MethodBase;

+				ParameterInfo[] parameters = method.GetParameters();

+				

+				if (parameters.Length > 0 && ((flags & NamingFlags.HideMethodParams) == 0)) {

+					bool first = true;

+					name.Append("(");

+

+					foreach (ParameterInfo p in parameters) {

+						if (!first) name.Append(",");

+						first = false;

+						name.Append(((flags & NamingFlags.ShortParamTypes) != 0) ? 

+							p.ParameterType.Name : p.ParameterType.FullName);

+					}

+

+					name.Append(")");

+				} else if ((flags & NamingFlags.ForceMethodParams) != 0) {

+					name.Append("()");

+				}

+			}

+

+			return name.ToString();

+		}

+	}

+}

diff --git a/mcs/doctools/src/Core/ValueConstrainedArrayList.cs b/mcs/doctools/src/Core/ValueConstrainedArrayList.cs
new file mode 100644
index 00000000000..0fdfad47ca3
--- /dev/null
+++ b/mcs/doctools/src/Core/ValueConstrainedArrayList.cs
@@ -0,0 +1,164 @@
+// ValueConstrainedArrayList.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Collections;

+

+namespace Mono.Doc.Core

+{

+	public class ValueConstrainedArrayList : ArrayList

+	{

+		#region Protected Instance Fields

+

+		protected Type allowed;

+

+		#endregion // Protected Instance Fields

+

+		#region Constructors and Destructors

+

+		public ValueConstrainedArrayList(Type allowed) : base()

+		{

+			if (allowed == null)

+			{

+				throw new ArgumentNullException("allowed", "Specified Type constraint cannot be null.");

+			}

+

+			this.allowed = allowed;

+		}

+

+		public ValueConstrainedArrayList(Type allowed, ICollection c)

+		{

+			if (allowed == null)

+			{

+				throw new ArgumentNullException("allowed", "Specified Type constraint cannot be null.");

+			}

+

+			this.allowed = allowed;

+			

+			this.AddRange(c);

+		}

+

+		public ValueConstrainedArrayList(Type allowed, int capacity) : base(capacity)

+		{

+			if (allowed == null)

+			{

+				throw new ArgumentNullException("allowed", "Specified Type constraint cannot be null.");

+			}

+

+			this.allowed = allowed;

+		}

+

+		#endregion // Constructors and Destructors

+

+		#region Public Instance Methods

+

+		public override int Add(object value)

+		{

+			if (allowed != value.GetType())

+			{

+				throw new ArgumentException("Values in constrained collection must be of type " + allowed.ToString() +

+					".", "value"

+					);

+			}

+

+			return base.Add(value);

+		}

+

+		public override void AddRange(ICollection c)

+		{

+			foreach (object o in c)

+			{

+				if (allowed != o.GetType())

+				{

+					throw new ArgumentException("Values in constrained collection must be of type " +

+						allowed.ToString() + ".", "c"

+						);

+				}

+			}

+

+			base.AddRange(c);

+		}

+

+		public override void Insert(int index, object value)

+		{

+			if (allowed != value.GetType())

+			{

+				throw new ArgumentException("Values in constrained collection must be of type " + allowed.ToString() +

+					".", "value"

+					);

+			}

+

+			base.Insert(index, value);

+		}

+

+		public override void InsertRange(int index, ICollection c)

+		{

+			foreach (object o in c)

+			{

+				if (allowed != o.GetType())

+				{

+					throw new ArgumentException("Values in constrained collection must be of type " +

+						allowed.ToString() + ".", "c"

+						);

+				}

+			}

+			

+			base.InsertRange(index, c);

+		}

+

+		public override void SetRange(int index, ICollection c)

+		{

+			foreach (object o in c)

+			{

+				if (allowed != o.GetType())

+				{

+					throw new ArgumentException("Values in constrained collection must be of type " +

+						allowed.ToString() + ".", "c"

+						);

+				}

+			}

+			

+			base.SetRange(index, c);

+		}

+

+		#endregion // Public Instance Methods

+

+		#region Public Instance Properties

+

+		public override object this[int index]

+		{

+			get { return base[index]; }

+			set

+			{

+				if (allowed != value.GetType())

+				{

+					throw new ArgumentException("Values in constrained collection must be of type " +

+						allowed.ToString() + "." + "value"

+						);

+				}

+

+				base[index] = value;

+			}

+		}

+

+		#endregion // Public Instance Properties

+	}

+}

diff --git a/mcs/doctools/src/Gui/.cvsignore b/mcs/doctools/src/Gui/.cvsignore
new file mode 100644
index 00000000000..83e41579c07
--- /dev/null
+++ b/mcs/doctools/src/Gui/.cvsignore
@@ -0,0 +1,3 @@
+bin
+obj
+*.resx
diff --git a/mcs/doctools/src/Gui/AboutForm.cs b/mcs/doctools/src/Gui/AboutForm.cs
new file mode 100644
index 00000000000..443b04d5fa3
--- /dev/null
+++ b/mcs/doctools/src/Gui/AboutForm.cs
@@ -0,0 +1,82 @@
+// AboutForm.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Drawing;

+using System.Windows.Forms;

+

+namespace Mono.Doc.Gui

+{

+	public class AboutForm : Form

+	{

+		private PictureBox aboutLogo;

+		private Button     closeButton;

+

+		public AboutForm()

+		{

+			aboutLogo   = new PictureBox();

+			closeButton = new Button();

+

+			this.SuspendLayout();

+

+			// aboutLogo properties

+			aboutLogo.Dock  = DockStyle.Fill;

+			aboutLogo.Image = GuiResources.AboutMonodocBitmap;

+			aboutLogo.Name  = "aboutLogo";

+			aboutLogo.Size  = new Size(300, 300);

+

+			// closeButton properties

+			closeButton.Location = new Point(96, 272);

+			closeButton.Name     = "closeButton";

+			closeButton.Size     = new Size(104, 24);

+			closeButton.TabIndex = 0;

+			closeButton.Text     = GuiResources.GetString("Buttons.Close");

+

+			

+			// form properties

+			this.AutoScaleBaseSize = new Size(5, 13);

+			this.BackColor         = Color.White;

+			this.ClientSize        = new Size(300, 300);

+			this.FormBorderStyle   = FormBorderStyle.FixedSingle;

+			this.Icon              = GuiResources.OpenBookIcon;

+			this.MaximizeBox       = false;

+			this.MinimizeBox       = false;

+			this.Name              = "AboutForm";

+			this.ShowInTaskbar     = false;

+			this.StartPosition     = FormStartPosition.CenterParent;

+			this.Text              = GuiResources.GetString("Form.About.Title");

+

+			// bind events

+			closeButton.Click += new EventHandler(closeButton_Click);

+

+			// add components

+			this.Controls.AddRange(new Control[] { closeButton, aboutLogo});

+

+			this.ResumeLayout(false);

+		}

+

+		// events

+		private void closeButton_Click(object sender, EventArgs args)

+		{

+			this.Close();

+		}

+	}

+}

diff --git a/mcs/doctools/src/Gui/AssemblyTreeImages.cs b/mcs/doctools/src/Gui/AssemblyTreeImages.cs
new file mode 100644
index 00000000000..363bdeef6ac
--- /dev/null
+++ b/mcs/doctools/src/Gui/AssemblyTreeImages.cs
@@ -0,0 +1,94 @@
+// AssemblyTreeImages.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Drawing;

+using System.Windows.Forms;

+

+namespace Mono.Doc.Gui

+{

+	/// <summary>

+	/// Summary description for AssemblyBrowserImages.

+	/// </summary>

+	public class AssemblyTreeImages

+	{

+		private static Image[] images      = null;

+		private static ImageList imageList = null;

+

+		// this class cannot be instantiated

+		private AssemblyTreeImages()

+		{

+		}

+

+		static AssemblyTreeImages()

+		{

+			Bitmap b       = GuiResources.AssemblyTreeBitmap;

+			int count      = (int) b.Width / b.Height;

+			images         = new Image[count];

+			Rectangle rect = new Rectangle(0, 0, b.Height, b.Height);

+			imageList      = new ImageList();

+

+			for (int j = 0; j < count; j++)

+			{

+				images[j] = b.Clone(rect, b.PixelFormat);

+				rect.X   += b.Height;

+

+				imageList.Images.Add(images[j]);

+			}

+		}

+		

+		// access as an ImageList for TreeView, ToolBar

+		public static ImageList List  { get { return imageList; } }

+

+		public static Image AssemblyClosedImage { get { return images[AssemblyClosed];  } }

+		public static Image AssemblyOpenImage   { get { return images[AssemblyOpen];    } }

+		public static Image NamespaceImage      { get { return images[Namespace];       } }

+		public static Image ClassImage          { get { return images[Class];           } }

+		public static Image InterfaceImage      { get { return images[Interface];       } }

+		public static Image StructImage         { get { return images[Struct];          } }

+		public static Image EnumImage           { get { return images[Enum];            } }

+		public static Image ConstructorImage    { get { return images[Constructor];     } }

+		public static Image MethodImage         { get { return images[Method];          } }

+		public static Image EventImage          { get { return images[Event];           } }

+		public static Image PropertyImage       { get { return images[Property];        } }

+		public static Image DelegateImage       { get { return images[Delegate];        } }

+		public static Image OperatorImage       { get { return images[Operator];        } }

+		public static Image FieldImage          { get { return images[Field];           } }

+		public static Image ShortcutsImage      { get { return images[Shortcuts];       } }

+

+		// imageList indexes

+		public static int AssemblyClosed = 0;

+		public static int AssemblyOpen   = 1;

+		public static int Namespace      = 2;

+		public static int Class          = 3;

+		public static int Interface      = 4;

+		public static int Struct         = 5;

+		public static int Enum           = 6;

+		public static int Constructor    = 7;

+		public static int Method         = 8;

+		public static int Event          = 9;

+		public static int Property       = 10;

+		public static int Delegate       = 11;

+		public static int Operator       = 12;

+		public static int Field          = 13;

+		public static int Shortcuts      = 14;

+	}

+}

diff --git a/mcs/doctools/src/Gui/AssemblyTreeLoader.cs b/mcs/doctools/src/Gui/AssemblyTreeLoader.cs
new file mode 100644
index 00000000000..152e22a4752
--- /dev/null
+++ b/mcs/doctools/src/Gui/AssemblyTreeLoader.cs
@@ -0,0 +1,461 @@
+// AssemblyTreeLoader.cs

+// John Barnette (jbarn@httcb.net)

+// Adam Treat (manyoso@yahoo.com)

+// 

+// Copyright (c) 2002 John Barnette

+// Copyright (c) 2002 Adam Treat

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Much of the reflection guts of this class come from the original Monodoc

+// XML stub generator, by Adam Treat, and much of the guts of *that* were

+// derived from NDoc (http://ndoc.sourceforge.net).

+

+using Mono.Doc.Core;

+using System;

+using System.Collections;

+using System.Reflection;

+using System.Windows.Forms;

+

+namespace Mono.Doc.Gui

+{

+	public class AssemblyTreeLoader

+	{

+		#region Instance Fields

+

+		private AssemblyLoader loader;

+

+		#endregion // Instance Fields

+

+		#region Constructors and Destructors

+

+		public AssemblyTreeLoader(AssemblyLoader loader)

+		{

+			this.loader = loader;

+		}

+

+		#endregion // Constructors and Destructors

+

+		#region Private Instance Methods

+

+		private TreeNode GetNodeForType(Type t)

+		{

+			string nodeName   =  GetTypeDisplayName(t) + " ";

+			TreeNode typeNode = new TreeNode();

+			typeNode.Tag      =

+				TypeNameHelper.GetName(t, NamingFlags.TypeSpecifier | NamingFlags.FullName);

+

+			if (t.IsClass && !IsDelegate(t))

+			{

+				// Type is class

+				typeNode.ImageIndex         = AssemblyTreeImages.Class;

+				typeNode.SelectedImageIndex = AssemblyTreeImages.Class;

+				typeNode.Text               = nodeName + "Class"; // TODO: i18n

+				

+				// Constructors, Fields, Properties, Methods, Operators, Events

+				TreeNode[] categories = new TreeNode[6];

+				categories[0]         = GetConstructorsNode(t);

+				categories[1]         = GetFieldsNode(t);

+				categories[2]         = GetPropertiesNode(t);

+				categories[3]         = GetMethodsNode(t);

+				categories[4]         = GetOperatorsNode(t);

+				categories[5]         = GetEventsNode(t);

+

+				foreach (TreeNode cat in categories)

+				{

+					if (cat != null) 

+					{

+						typeNode.Nodes.Add(cat);

+					}

+				}

+			}

+			else if (t.IsInterface)

+			{

+				// Type is interface

+				typeNode.ImageIndex         = AssemblyTreeImages.Interface;

+				typeNode.SelectedImageIndex = AssemblyTreeImages.Interface;

+				typeNode.Text               = nodeName + "Interface"; // TODO: i18n

+

+				// Methods, properties, events

+				TreeNode methodsNode = GetMethodsNode(t);

+				TreeNode propsNode   = GetPropertiesNode(t);

+				TreeNode eventsNode  = GetEventsNode(t);

+

+				if (methodsNode != null)

+				{

+					typeNode.Nodes.Add(methodsNode);

+				}

+

+				if (propsNode != null)

+				{

+					typeNode.Nodes.Add(propsNode);

+				}

+

+				if (eventsNode != null)

+				{

+					typeNode.Nodes.Add(eventsNode);

+				}

+			}

+			else if (t.IsValueType && !t.IsEnum)

+			{

+				// Type is struct

+				typeNode.ImageIndex         = AssemblyTreeImages.Struct;

+				typeNode.SelectedImageIndex = AssemblyTreeImages.Struct;

+				typeNode.Text               = nodeName + "Structure"; // TODO: i18n

+

+				// Constructors, Fields, Properties, Methods, Operators, Events

+				TreeNode[] categories = new TreeNode[6];

+				categories[0]         = GetConstructorsNode(t);

+				categories[1]         = GetFieldsNode(t);

+				categories[2]         = GetPropertiesNode(t);

+				categories[3]         = GetMethodsNode(t);

+				categories[4]         = GetOperatorsNode(t);

+				categories[5]         = GetEventsNode(t);

+

+				foreach (TreeNode cat in categories)

+				{

+					if (cat != null) 

+					{

+						typeNode.Nodes.Add(cat);

+					}

+				}

+			}

+			else if (t.IsEnum)

+			{

+				// Type is enumeration

+				typeNode.ImageIndex         = AssemblyTreeImages.Enum;

+				typeNode.SelectedImageIndex = AssemblyTreeImages.Enum;

+				typeNode.Text               = nodeName + "Enumeration"; // TODO: i18n

+			}

+			else if (t.IsClass && IsDelegate(t))

+			{

+				// Type is delegate

+				typeNode.ImageIndex         = AssemblyTreeImages.Delegate;

+				typeNode.SelectedImageIndex = AssemblyTreeImages.Delegate;

+				typeNode.Text               = nodeName + "Delegate"; // TODO: i18n

+			}

+			else 

+			{

+				MessageBox.Show(

+					"Encountered unexpected type during tree load: " + t.FullName,

+					"What the heck is this?"

+					);

+			}

+

+			return typeNode;

+		}

+

+		private TreeNode GetConstructorsNode(Type t)

+		{

+			ConstructorInfo[] ctors = loader.GetConstructors(t);

+

+			if (ctors.Length > 0)

+			{

+				TreeNode cNode           = new TreeNode("Constructors");

+				cNode.ImageIndex         = AssemblyTreeImages.Constructor;

+				cNode.SelectedImageIndex = AssemblyTreeImages.Constructor;

+

+				foreach (ConstructorInfo ctor in ctors)

+				{

+					TreeNode ctorNode           = new TreeNode();

+					ctorNode.ImageIndex         = AssemblyTreeImages.Constructor;

+					ctorNode.SelectedImageIndex = AssemblyTreeImages.Constructor;

+					ctorNode.Tag                = GetTag(ctor);

+					ctorNode.Text               = TypeNameHelper.GetName(ctor,

+						NamingFlags.ForceMethodParams | NamingFlags.ShortParamTypes).

+							Replace("#ctor", t.Name + " Constructor ").

+								Replace(",", ", ");

+

+					cNode.Nodes.Add(ctorNode);

+				}

+

+				return cNode;

+			}

+			else

+			{

+				return null;

+			}

+		}

+

+		private TreeNode GetFieldsNode(Type t)

+		{

+			FieldInfo[] fields = loader.GetFields(t);

+

+			if (fields.Length > 0)

+			{

+				TreeNode fNode           = new TreeNode("Fields");

+				fNode.ImageIndex         = AssemblyTreeImages.Field;

+				fNode.SelectedImageIndex = AssemblyTreeImages.Field;

+

+				foreach (FieldInfo field in fields)

+				{

+					TreeNode fieldNode           = new TreeNode();

+					fieldNode.ImageIndex         = AssemblyTreeImages.Field;

+					fieldNode.SelectedImageIndex = AssemblyTreeImages.Field;

+					fieldNode.Tag                = GetTag(field);

+					fieldNode.Text               = field.Name + " Field";

+

+					fNode.Nodes.Add(fieldNode);

+				}

+

+				return fNode;

+			}

+			else

+			{

+				return null;

+			}

+		}

+

+		private TreeNode GetPropertiesNode(Type t)

+		{

+			PropertyInfo[] properties = loader.GetProperties(t);

+

+			if (properties.Length > 0)

+			{

+				TreeNode pNode           = new TreeNode("Properties");

+				pNode.ImageIndex         = AssemblyTreeImages.Property;

+				pNode.SelectedImageIndex = AssemblyTreeImages.Property;

+				

+				foreach (PropertyInfo property in properties)

+				{

+					TreeNode propertyNode           = new TreeNode();

+					propertyNode.ImageIndex         = AssemblyTreeImages.Property;

+					propertyNode.SelectedImageIndex = AssemblyTreeImages.Property;

+					propertyNode.Tag                = GetTag(property);

+					propertyNode.Text               = property.Name + " Property";

+

+					pNode.Nodes.Add(propertyNode);

+				}

+

+				return pNode;

+			}

+			else

+			{

+				return null;

+			}

+		}

+

+		private TreeNode GetMethodsNode(Type t)

+		{

+			MethodInfo[] methods = loader.GetMethods(t);

+

+			if (methods.Length > 0)

+			{

+				TreeNode mNode           = new TreeNode("Methods");

+				mNode.ImageIndex         = AssemblyTreeImages.Method;

+				mNode.SelectedImageIndex = AssemblyTreeImages.Method;

+				Hashtable overloads      = new Hashtable();

+

+				// group method overloads by name

+				foreach (MethodInfo method in methods)

+				{

+					ArrayList overloadList = overloads[method.Name] as ArrayList;

+

+					if (overloadList == null)

+					{

+						overloadList           = new ArrayList();

+						overloads[method.Name] = overloadList;

+						

+						overloadList.Add(method);

+					}

+					else

+					{

+						overloadList.Add(method);

+					}

+				}

+

+				// create nodes, grouping overloaded methods

+				foreach (string methodName in overloads.Keys)

+				{

+					ArrayList overloadList = overloads[methodName] as ArrayList;

+

+					if (overloadList.Count > 1)

+					{

+						// overloaded method

+						TreeNode overloadNode = new TreeNode();

+						overloadNode.ImageIndex = AssemblyTreeImages.Method;

+						overloadNode.SelectedImageIndex = AssemblyTreeImages.Method;

+						overloadNode.Text = methodName + " Method";

+						overloadNode.Tag = "TODO:OVERLOAD";

+

+						foreach (MethodInfo m in overloadList)

+						{

+							overloadNode.Nodes.Add(GetOverloadedMethodNode(m));

+						}

+

+						mNode.Nodes.Add(overloadNode);

+					}

+					else

+					{

+						// not overloaded

+						MethodInfo m                  = overloadList[0] as MethodInfo;

+						TreeNode methodNode           = new TreeNode();

+						methodNode.ImageIndex         = AssemblyTreeImages.Method;

+						methodNode.SelectedImageIndex = AssemblyTreeImages.Method;

+						methodNode.Tag                = GetTag(m);

+						methodNode.Text               = m.Name +

+							TypeNameHelper.GetName(m, NamingFlags.HideMethodParams).

+							Replace(m.Name, " ") + " Method";

+

+						mNode.Nodes.Add(methodNode);

+					}

+				}

+

+				return mNode;

+			}

+			else

+			{

+				return null;

+			}

+		}

+

+		private TreeNode GetOverloadedMethodNode(MethodInfo m)

+		{

+			TreeNode mNode = new TreeNode();

+			mNode.Tag      = GetTag(m);

+			mNode.Text     = m.Name + TypeNameHelper.GetName(m,

+				NamingFlags.ForceMethodParams | NamingFlags.ShortParamTypes).

+				Replace(",", ", ").Replace(m.Name, " ") + " Method";

+

+			return mNode;

+		}

+

+		private TreeNode GetOperatorsNode(Type t)

+		{

+			MethodInfo[] operatorMethods = loader.GetOperators(t);

+			

+			if (operatorMethods.Length > 0)

+			{

+				TreeNode oNode = new TreeNode("Operators");

+				oNode.ImageIndex         = AssemblyTreeImages.Operator;

+				oNode.SelectedImageIndex = AssemblyTreeImages.Operator;

+

+				foreach (MethodInfo om in operatorMethods)

+				{

+					TreeNode omNode           = new TreeNode();

+					omNode.ImageIndex         = AssemblyTreeImages.Operator;

+					omNode.SelectedImageIndex = AssemblyTreeImages.Operator;

+					omNode.Tag                = GetTag(om);

+					omNode.Text               = om.Name.Replace("op_", "") + " Operator";

+

+					oNode.Nodes.Add(omNode);

+				}

+

+				return oNode;

+			}

+			else

+			{

+				return null;

+			}

+		}

+

+		private TreeNode GetEventsNode(Type t)

+		{

+			EventInfo[] events = loader.GetEvents(t);

+

+			if (events.Length > 0)

+			{

+				TreeNode eNode           = new TreeNode("Events");

+				eNode.ImageIndex         = AssemblyTreeImages.Event;

+				eNode.SelectedImageIndex = AssemblyTreeImages.Event;

+

+				foreach (EventInfo e in events)

+				{

+					TreeNode eiNode          = new TreeNode();

+					eiNode.ImageIndex         = AssemblyTreeImages.Event;

+					eiNode.SelectedImageIndex = AssemblyTreeImages.Event;

+					eiNode.Tag                = GetTag(e);

+					eiNode.Text               = e.Name + " Event";

+

+					eNode.Nodes.Add(eiNode);

+				}

+

+				return eNode;

+			}

+			else

+			{

+				return null;

+			}

+		}

+

+		private bool IsDelegate(Type type)
+		{
+			return type.BaseType.FullName == "System.Delegate" ||
+				type.BaseType.FullName == "System.MulticastDelegate";
+		}
+
+		private string GetTypeDisplayName(Type type)
+		{
+			string[] s  = type.FullName.Split(new char[] {'.'});
+			string name = s[s.Length - 1];
+
+			return name.Replace('+', '.');
+		}

+

+		private string GetTag(MemberInfo m)

+		{

+			return TypeNameHelper.GetName(m, NamingFlags.TypeSpecifier | NamingFlags.FullName);

+		}

+

+		#endregion // Private Instance Methods

+

+		#region Public Instance Methods

+

+		public void LoadNode(TreeNode node)

+		{

+			// create root element

+			TreeNode root           = new TreeNode(loader.Assembly.GetName().Name + " Assembly");

+			root.ImageIndex         = AssemblyTreeImages.AssemblyOpen;

+			root.SelectedImageIndex = AssemblyTreeImages.AssemblyOpen;

+			root.Tag                = "A:" + loader.Assembly.GetName().Name;

+

+			node.Nodes.Add(root);

+

+			// dictionary of namespaces

+			Hashtable namespaces = new Hashtable();

+

+			foreach (Type t in loader.GetTypes())

+			{

+				TreeNode nsNode = (TreeNode) namespaces[t.Namespace];

+

+				if (nsNode == null)

+				{

+					nsNode                    = new TreeNode(t.Namespace);

+					nsNode.ImageIndex         = AssemblyTreeImages.Namespace;

+					nsNode.SelectedImageIndex = AssemblyTreeImages.Namespace;

+					nsNode.Tag                = "N:" + t.Namespace;

+					namespaces[t.Namespace]   = nsNode;

+

+				}

+

+				// TODO: sort types before adding

+				TreeNode typeNode = GetNodeForType(t);

+					

+				nsNode.Nodes.Add(typeNode);

+			}

+			

+

+			// add sorted namespace nodes to root

+			foreach (string nsName in new SortedStringValues(namespaces.Keys))

+			{

+				root.Nodes.Add((TreeNode) namespaces[nsName]);

+			}

+		}

+

+		#endregion // Public Instance Methods

+	}

+}

diff --git a/mcs/doctools/src/Gui/DirectorySelectorForm.cs b/mcs/doctools/src/Gui/DirectorySelectorForm.cs
new file mode 100644
index 00000000000..7e51e61515c
--- /dev/null
+++ b/mcs/doctools/src/Gui/DirectorySelectorForm.cs
@@ -0,0 +1,318 @@
+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Drawing;

+using System.Collections;

+using System.ComponentModel;

+using System.Windows.Forms;

+using System.IO;

+

+namespace Mono.Doc.Gui

+{

+	/// <summary>

+	/// Summary description for DirectorySelectorForm.

+	/// </summary>

+	public class DirectorySelectorForm : System.Windows.Forms.Form

+	{

+		private DirectoryInfo currentDirectory;

+		private string        selectedDirectoryName;

+

+		private System.Windows.Forms.Label labelPath;

+		private System.Windows.Forms.TextBox textBoxPath;

+		private System.Windows.Forms.TreeView tree;

+		private System.Windows.Forms.Button buttonOK;

+		private System.Windows.Forms.Button buttonCancel;

+		private System.Windows.Forms.Button buttonParentDir;

+

+		/// <summary>

+		/// Required designer variable.

+		/// </summary>

+		private System.ComponentModel.Container components = null;

+

+		public DirectorySelectorForm()

+		{

+			//

+			// Required for Windows Form Designer support

+			//

+			InitializeComponent();

+

+			//

+			// TODO: Add any constructor code after InitializeComponent call

+			//

+

+			this.buttonParentDir.ImageList  = AssemblyTreeImages.List;

+			this.buttonParentDir.ImageIndex = AssemblyTreeImages.Shortcuts; // TODO: need prev. dir icon

+			this.tree.ImageList             = AssemblyTreeImages.List;

+			this.tree.ImageIndex            = AssemblyTreeImages.Shortcuts; // TODO: need folder icon

+			this.tree.SelectedImageIndex    = AssemblyTreeImages.Shortcuts; // TODO: need folder icon

+

+			if (SetCurrentDirectory(Directory.GetCurrentDirectory()))

+			{

+				this.textBoxPath.Text      = this.currentDirectory.FullName;

+				this.selectedDirectoryName = this.currentDirectory.FullName;

+				

+				InitializeTree();

+			}

+		}

+

+		/// <summary>

+		/// Clean up any resources being used.

+		/// </summary>

+		protected override void Dispose( bool disposing )

+		{

+			if( disposing )

+			{

+				if(components != null)

+				{

+					components.Dispose();

+				}

+			}

+			base.Dispose( disposing );

+		}

+

+		#region Private Instance Methods

+

+		private void InitializeTree()

+		{

+			this.tree.Nodes.Clear();

+

+			foreach (DirectoryInfo dirInfo in this.currentDirectory.GetDirectories())

+			{

+				TreeNode dirNode = new TreeNode(dirInfo.Name);

+				dirNode.Tag      = dirInfo.FullName;

+

+				CreateSubdirectoryNodes(dirNode);

+				this.tree.Nodes.Add(dirNode);

+			}

+		}

+

+		private void CreateSubdirectoryNodes(TreeNode dirNode)

+		{

+			DirectoryInfo dirInfo = new DirectoryInfo(dirNode.Tag as string);

+

+			foreach (DirectoryInfo childDirInfo in dirInfo.GetDirectories())

+			{

+				TreeNode childDirNode = new TreeNode(childDirInfo.Name);

+				childDirNode.Tag      = childDirInfo.FullName;

+

+				dirNode.Nodes.Add(childDirNode);

+			}

+		}

+

+		private bool SetCurrentDirectory(string dirName)

+		{

+			string        errorMessage = null;

+			DirectoryInfo newDirectory = null;

+

+			try

+			{

+				newDirectory = new DirectoryInfo(dirName);

+			}

+			catch (ArgumentNullException)

+			{

+				errorMessage = "cannot be null.";

+			}

+			catch (DirectoryNotFoundException)

+			{

+				errorMessage = "was not found.";

+			}

+			catch (ArgumentException)

+			{

+				errorMessage = "contains invalid characters.";

+			}

+			catch (PathTooLongException)

+			{

+				errorMessage = "is too long.";

+			}

+

+			if (errorMessage != null)

+			{

+				MessageBox.Show("The selected path " + errorMessage,

+					"Problem Opening Directory",

+					MessageBoxButtons.OK,

+					MessageBoxIcon.Error

+					);

+

+				return false;

+			}

+			else

+			{

+				this.currentDirectory = newDirectory;

+				

+				return true;

+			}

+		}

+

+		#endregion // Private Instance Methods

+

+		#region Public Instance Properties

+

+		public string DirectoryName

+		{

+			get { return selectedDirectoryName; }

+		}

+

+		#endregion // Public Instance Properties

+

+		#region Windows Form Designer generated code

+		/// <summary>

+		/// Required method for Designer support - do not modify

+		/// the contents of this method with the code editor.

+		/// </summary>

+		private void InitializeComponent()

+		{

+			this.labelPath = new System.Windows.Forms.Label();

+			this.textBoxPath = new System.Windows.Forms.TextBox();

+			this.tree = new System.Windows.Forms.TreeView();

+			this.buttonOK = new System.Windows.Forms.Button();

+			this.buttonCancel = new System.Windows.Forms.Button();

+			this.buttonParentDir = new System.Windows.Forms.Button();

+			this.SuspendLayout();

+			// 

+			// labelPath

+			// 

+			this.labelPath.Location = new System.Drawing.Point(8, 8);

+			this.labelPath.Name = "labelPath";

+			this.labelPath.Size = new System.Drawing.Size(40, 16);

+			this.labelPath.TabIndex = 0;

+			this.labelPath.Text = "Path:";

+			this.labelPath.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;

+			// 

+			// textBoxPath

+			// 

+			this.textBoxPath.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.textBoxPath.Location = new System.Drawing.Point(48, 6);

+			this.textBoxPath.Name = "textBoxPath";

+			this.textBoxPath.Size = new System.Drawing.Size(232, 20);

+			this.textBoxPath.TabIndex = 1;

+			this.textBoxPath.Text = "";

+			this.textBoxPath.Leave += new System.EventHandler(this.textBoxPath_Leave);

+			// 

+			// tree

+			// 

+			this.tree.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 

+				| System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.tree.ImageIndex = -1;

+			this.tree.Location = new System.Drawing.Point(8, 32);

+			this.tree.Name = "tree";

+			this.tree.SelectedImageIndex = -1;

+			this.tree.Size = new System.Drawing.Size(304, 288);

+			this.tree.TabIndex = 3;

+			this.tree.BeforeSelect += new System.Windows.Forms.TreeViewCancelEventHandler(this.tree_BeforeSelect);

+			this.tree.BeforeExpand += new System.Windows.Forms.TreeViewCancelEventHandler(this.tree_BeforeExpand);

+			// 

+			// buttonOK

+			// 

+			this.buttonOK.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonOK.Location = new System.Drawing.Point(144, 328);

+			this.buttonOK.Name = "buttonOK";

+			this.buttonOK.TabIndex = 4;

+			this.buttonOK.Text = "OK";

+			this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);

+			// 

+			// buttonCancel

+			// 

+			this.buttonCancel.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonCancel.Location = new System.Drawing.Point(232, 328);

+			this.buttonCancel.Name = "buttonCancel";

+			this.buttonCancel.TabIndex = 5;

+			this.buttonCancel.Text = "Cancel";

+			this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);

+			// 

+			// buttonParentDir

+			// 

+			this.buttonParentDir.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonParentDir.Location = new System.Drawing.Point(288, 5);

+			this.buttonParentDir.Name = "buttonParentDir";

+			this.buttonParentDir.Size = new System.Drawing.Size(24, 23);

+			this.buttonParentDir.TabIndex = 6;

+			this.buttonParentDir.Text = "..";

+			this.buttonParentDir.Click += new System.EventHandler(this.buttonParentDir_Click);

+			// 

+			// DirectorySelectorForm

+			// 

+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);

+			this.ClientSize = new System.Drawing.Size(320, 358);

+			this.Controls.AddRange(new System.Windows.Forms.Control[] {

+																		  this.buttonParentDir,

+																		  this.buttonCancel,

+																		  this.buttonOK,

+																		  this.tree,

+																		  this.textBoxPath,

+																		  this.labelPath});

+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;

+			this.Name = "DirectorySelectorForm";

+			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;

+			this.Text = "Select Directory";

+			this.ResumeLayout(false);

+

+		}

+		#endregion

+

+		private void buttonCancel_Click(object sender, System.EventArgs e)

+		{

+			this.DialogResult = DialogResult.Cancel;

+			this.Close();

+		}

+

+		private void buttonOK_Click(object sender, System.EventArgs e)

+		{

+			this.DialogResult = DialogResult.OK;

+			this.Close();

+		}

+

+		private void textBoxPath_Leave(object sender, System.EventArgs e)

+		{

+			if (SetCurrentDirectory(textBoxPath.Text))

+			{

+				InitializeTree();

+			}

+		}

+

+		private void tree_BeforeExpand(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)

+		{

+			foreach (TreeNode childDirNode in e.Node.Nodes)

+			{

+				if (childDirNode.Nodes.Count == 0)

+				{

+					CreateSubdirectoryNodes(childDirNode);

+				}

+			}

+		}

+

+		private void tree_BeforeSelect(object sender, System.Windows.Forms.TreeViewCancelEventArgs e)

+		{

+			string path                = e.Node.Tag as string;

+			this.textBoxPath.Text      = path;

+			this.selectedDirectoryName = path;

+		}

+

+		private void buttonParentDir_Click(object sender, System.EventArgs e)

+		{

+			DirectoryInfo parent = this.currentDirectory.Parent;

+

+			if (parent != null && SetCurrentDirectory(parent.FullName))

+			{

+				textBoxPath.Text = parent.FullName;

+				InitializeTree();

+			}

+		}

+	}

+}

diff --git a/mcs/doctools/src/Gui/EditPropertyForm.cs b/mcs/doctools/src/Gui/EditPropertyForm.cs
new file mode 100644
index 00000000000..431ec38377f
--- /dev/null
+++ b/mcs/doctools/src/Gui/EditPropertyForm.cs
@@ -0,0 +1,182 @@
+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Drawing;

+using System.Collections;

+using System.ComponentModel;

+using System.Windows.Forms;

+

+namespace Mono.Doc.Gui

+{

+	/// <summary>

+	/// Summary description for EditPropertyForm.

+	/// </summary>

+	public class EditPropertyForm : System.Windows.Forms.Form

+	{

+		private System.Windows.Forms.Label labelPropertyName;

+		private System.Windows.Forms.Label labelPropertyValue;

+		private System.Windows.Forms.TextBox textBoxPropertyName;

+		private System.Windows.Forms.TextBox textBoxPropertyValue;

+		private System.Windows.Forms.Button buttonOk;

+		private System.Windows.Forms.Button buttonCancel;

+		/// <summary>

+		/// Required designer variable.

+		/// </summary>

+		private System.ComponentModel.Container components = null;

+

+		public EditPropertyForm()

+		{

+			//

+			// Required for Windows Form Designer support

+			//

+			InitializeComponent();

+

+			//

+			// TODO: Add any constructor code after InitializeComponent call

+			//

+		}

+

+		/// <summary>

+		/// Clean up any resources being used.

+		/// </summary>

+		protected override void Dispose( bool disposing )

+		{

+			if( disposing )

+			{

+				if(components != null)

+				{

+					components.Dispose();

+				}

+			}

+			base.Dispose( disposing );

+		}

+

+		#region Windows Form Designer generated code

+		/// <summary>

+		/// Required method for Designer support - do not modify

+		/// the contents of this method with the code editor.

+		/// </summary>

+		private void InitializeComponent()

+		{

+			this.labelPropertyName = new System.Windows.Forms.Label();

+			this.labelPropertyValue = new System.Windows.Forms.Label();

+			this.textBoxPropertyName = new System.Windows.Forms.TextBox();

+			this.textBoxPropertyValue = new System.Windows.Forms.TextBox();

+			this.buttonOk = new System.Windows.Forms.Button();

+			this.buttonCancel = new System.Windows.Forms.Button();

+			this.SuspendLayout();

+			// 

+			// labelPropertyName

+			// 

+			this.labelPropertyName.Location = new System.Drawing.Point(8, 8);

+			this.labelPropertyName.Name = "labelPropertyName";

+			this.labelPropertyName.Size = new System.Drawing.Size(100, 16);

+			this.labelPropertyName.TabIndex = 0;

+			this.labelPropertyName.Text = "Property Name";

+			// 

+			// labelPropertyValue

+			// 

+			this.labelPropertyValue.Location = new System.Drawing.Point(8, 56);

+			this.labelPropertyValue.Name = "labelPropertyValue";

+			this.labelPropertyValue.Size = new System.Drawing.Size(96, 16);

+			this.labelPropertyValue.TabIndex = 1;

+			this.labelPropertyValue.Text = "Property Value";

+			// 

+			// textBoxPropertyName

+			// 

+			this.textBoxPropertyName.Location = new System.Drawing.Point(8, 24);

+			this.textBoxPropertyName.Name = "textBoxPropertyName";

+			this.textBoxPropertyName.Size = new System.Drawing.Size(272, 20);

+			this.textBoxPropertyName.TabIndex = 2;

+			this.textBoxPropertyName.Text = "New Property";

+			// 

+			// textBoxPropertyValue

+			// 

+			this.textBoxPropertyValue.Location = new System.Drawing.Point(8, 72);

+			this.textBoxPropertyValue.Name = "textBoxPropertyValue";

+			this.textBoxPropertyValue.Size = new System.Drawing.Size(272, 20);

+			this.textBoxPropertyValue.TabIndex = 3;

+			this.textBoxPropertyValue.Text = "Property Value";

+			// 

+			// buttonOk

+			// 

+			this.buttonOk.DialogResult = System.Windows.Forms.DialogResult.OK;

+			this.buttonOk.Location = new System.Drawing.Point(120, 104);

+			this.buttonOk.Name = "buttonOk";

+			this.buttonOk.TabIndex = 4;

+			this.buttonOk.Text = "OK";

+			this.buttonOk.Click += new System.EventHandler(this.buttonOk_Click);

+			// 

+			// buttonCancel

+			// 

+			this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;

+			this.buttonCancel.Location = new System.Drawing.Point(208, 104);

+			this.buttonCancel.Name = "buttonCancel";

+			this.buttonCancel.TabIndex = 5;

+			this.buttonCancel.Text = "Cancel";

+			this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);

+			// 

+			// EditPropertyForm

+			// 

+			this.AcceptButton = this.buttonOk;

+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);

+			this.CancelButton = this.buttonCancel;

+			this.ClientSize = new System.Drawing.Size(292, 136);

+			this.Controls.AddRange(new System.Windows.Forms.Control[] {

+																		  this.buttonCancel,

+																		  this.buttonOk,

+																		  this.textBoxPropertyValue,

+																		  this.textBoxPropertyName,

+																		  this.labelPropertyValue,

+																		  this.labelPropertyName});

+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedToolWindow;

+			this.Name = "EditPropertyForm";

+			this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;

+			this.Text = "Edit Project Property";

+			this.ResumeLayout(false);

+

+		}

+		#endregion

+

+		private void buttonCancel_Click(object sender, System.EventArgs e)

+		{

+			this.Close();

+		}

+

+		private void buttonOk_Click(object sender, System.EventArgs e)

+		{

+			this.Close();

+		}

+

+		#region Public Instance Properties

+

+		public string PropertyName

+		{

+			get { return this.textBoxPropertyName.Text;  }

+			set { this.textBoxPropertyName.Text = value; }

+		}

+

+		public string PropertyValue

+		{

+			get { return this.textBoxPropertyValue.Text;  }

+			set { this.textBoxPropertyValue.Text = value; }

+		}

+

+		#endregion // Public Instance Properties

+	}

+}

diff --git a/mcs/doctools/src/Gui/ExampleCodeEditorForm.cs b/mcs/doctools/src/Gui/ExampleCodeEditorForm.cs
new file mode 100644
index 00000000000..aae0001d991
--- /dev/null
+++ b/mcs/doctools/src/Gui/ExampleCodeEditorForm.cs
@@ -0,0 +1,166 @@
+// ExampleCodeEditorForm.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Drawing;

+using System.Collections;

+using System.ComponentModel;

+using System.Windows.Forms;

+

+namespace Mono.Doc.Gui

+{

+	/// <summary>

+	/// Summary description for ExampleCodeEditorForm.

+	/// </summary>

+	public class ExampleCodeEditorForm : System.Windows.Forms.Form

+	{

+		// TODO: figure out how to munge TextBox to support simple autoindent.

+

+		private System.Windows.Forms.Label labelExampleLanguage;

+		private System.Windows.Forms.ComboBox comboBoxExampleLanguage;

+		private System.Windows.Forms.Button buttonOk;

+		private System.Windows.Forms.Button buttonCancel;

+		private System.Windows.Forms.TextBox textBoxExampleText;

+		/// <summary>

+		/// Required designer variable.

+		/// </summary>

+		private System.ComponentModel.Container components = null;

+

+		public ExampleCodeEditorForm()

+		{

+			//

+			// Required for Windows Form Designer support

+			//

+			InitializeComponent();

+

+			//

+			// TODO: Add any constructor code after InitializeComponent call

+			//

+		}

+

+		/// <summary>

+		/// Clean up any resources being used.

+		/// </summary>

+		protected override void Dispose( bool disposing )

+		{

+			if( disposing )

+			{

+				if(components != null)

+				{

+					components.Dispose();

+				}

+			}

+			base.Dispose( disposing );

+		}

+

+		#region Windows Form Designer generated code

+		/// <summary>

+		/// Required method for Designer support - do not modify

+		/// the contents of this method with the code editor.

+		/// </summary>

+		private void InitializeComponent()

+		{

+			this.labelExampleLanguage = new System.Windows.Forms.Label();

+			this.comboBoxExampleLanguage = new System.Windows.Forms.ComboBox();

+			this.buttonOk = new System.Windows.Forms.Button();

+			this.buttonCancel = new System.Windows.Forms.Button();

+			this.textBoxExampleText = new System.Windows.Forms.TextBox();

+			this.SuspendLayout();

+			// 

+			// labelExampleLanguage

+			// 

+			this.labelExampleLanguage.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);

+			this.labelExampleLanguage.Location = new System.Drawing.Point(168, 8);

+			this.labelExampleLanguage.Name = "labelExampleLanguage";

+			this.labelExampleLanguage.Size = new System.Drawing.Size(112, 16);

+			this.labelExampleLanguage.TabIndex = 0;

+			this.labelExampleLanguage.Text = "Example Language:";

+			this.labelExampleLanguage.TextAlign = System.Drawing.ContentAlignment.MiddleLeft;

+			// 

+			// comboBoxExampleLanguage

+			// 

+			this.comboBoxExampleLanguage.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);

+			this.comboBoxExampleLanguage.Items.AddRange(new object[] {

+																		 "C#"});

+			this.comboBoxExampleLanguage.Location = new System.Drawing.Point(280, 6);

+			this.comboBoxExampleLanguage.Name = "comboBoxExampleLanguage";

+			this.comboBoxExampleLanguage.Size = new System.Drawing.Size(121, 21);

+			this.comboBoxExampleLanguage.TabIndex = 1;

+			// 

+			// buttonOk

+			// 

+			this.buttonOk.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonOk.Location = new System.Drawing.Point(248, 353);

+			this.buttonOk.Name = "buttonOk";

+			this.buttonOk.Size = new System.Drawing.Size(64, 24);

+			this.buttonOk.TabIndex = 2;

+			this.buttonOk.Text = "OK";

+			// 

+			// buttonCancel

+			// 

+			this.buttonCancel.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;

+			this.buttonCancel.Location = new System.Drawing.Point(328, 353);

+			this.buttonCancel.Name = "buttonCancel";

+			this.buttonCancel.Size = new System.Drawing.Size(64, 24);

+			this.buttonCancel.TabIndex = 3;

+			this.buttonCancel.Text = "Cancel";

+			// 

+			// textBoxExampleText

+			// 

+			this.textBoxExampleText.AcceptsReturn = true;

+			this.textBoxExampleText.AcceptsTab = true;

+			this.textBoxExampleText.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 

+				| System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.textBoxExampleText.Font = new System.Drawing.Font("Courier New", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((System.Byte)(0)));

+			this.textBoxExampleText.Location = new System.Drawing.Point(8, 32);

+			this.textBoxExampleText.Multiline = true;

+			this.textBoxExampleText.Name = "textBoxExampleText";

+			this.textBoxExampleText.ScrollBars = System.Windows.Forms.ScrollBars.Both;

+			this.textBoxExampleText.Size = new System.Drawing.Size(392, 313);

+			this.textBoxExampleText.TabIndex = 4;

+			this.textBoxExampleText.Text = "// example code";

+			this.textBoxExampleText.WordWrap = false;

+			// 

+			// ExampleCodeEditorForm

+			// 

+			this.AcceptButton = this.buttonOk;

+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);

+			this.CancelButton = this.buttonCancel;

+			this.ClientSize = new System.Drawing.Size(408, 382);

+			this.Controls.AddRange(new System.Windows.Forms.Control[] {

+																		  this.textBoxExampleText,

+																		  this.buttonCancel,

+																		  this.buttonOk,

+																		  this.comboBoxExampleLanguage,

+																		  this.labelExampleLanguage});

+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.SizableToolWindow;

+			this.Name = "ExampleCodeEditorForm";

+			this.ShowInTaskbar = false;

+			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;

+			this.Text = "Example Code Editor";

+			this.ResumeLayout(false);

+

+		}

+		#endregion

+	}

+}

diff --git a/mcs/doctools/src/Gui/GenericEditorForm.cs b/mcs/doctools/src/Gui/GenericEditorForm.cs
new file mode 100644
index 00000000000..4af61c0791d
--- /dev/null
+++ b/mcs/doctools/src/Gui/GenericEditorForm.cs
@@ -0,0 +1,232 @@
+// GenericEditorForm.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Drawing;

+using System.Collections;

+using System.ComponentModel;

+using System.Windows.Forms;

+

+namespace Mono.Doc.Gui

+{

+	/// <summary>

+	/// Summary description for GenericEditorForm.

+	/// </summary>

+	public class GenericEditorForm : System.Windows.Forms.Form

+	{

+		protected System.Windows.Forms.ToolBar toolBar;

+		protected System.Windows.Forms.Label labelSummary;

+		protected System.Windows.Forms.TextBox textBoxSummary;

+		protected System.Windows.Forms.Label labelRemarks;

+		protected System.Windows.Forms.TextBox textBoxRemarks;

+		protected System.Windows.Forms.Label labelSeeAlso;

+		protected System.Windows.Forms.ComboBox comboBoxLanguage;

+		protected System.Windows.Forms.Label labelLanguage;

+		protected System.Windows.Forms.ListView listViewSeeAlso;

+		/// <summary>

+		/// Required designer variable.

+		/// </summary>

+		private System.ComponentModel.Container components = null;

+

+		public GenericEditorForm()

+		{

+			//

+			// Required for Windows Form Designer support

+			//

+			InitializeComponent();

+

+			// TODO: hack so I can see the toolbar and ListView

+			toolBar.ImageList = AssemblyTreeImages.List;

+			listViewSeeAlso.SmallImageList = AssemblyTreeImages.List;

+

+			for (int j = 0; j < toolBar.ImageList.Images.Count; j++) 

+			{

+				ToolBarButton b = new ToolBarButton();

+				b.ImageIndex    = j;

+				toolBar.Buttons.Add(b);

+

+				ListViewItem i = new ListViewItem("See Also " + j.ToString(), j);

+				listViewSeeAlso.Items.Add(i);

+			}

+		}

+

+		/// <summary>

+		/// Clean up any resources being used.

+		/// </summary>

+		protected override void Dispose( bool disposing )

+		{

+			if( disposing )

+			{

+				if(components != null)

+				{

+					components.Dispose();

+				}

+			}

+			base.Dispose( disposing );

+		}

+

+		#region Windows Form Designer generated code

+		/// <summary>

+		/// Required method for Designer support - do not modify

+		/// the contents of this method with the code editor.

+		/// </summary>

+		private void InitializeComponent()

+		{

+			this.toolBar = new System.Windows.Forms.ToolBar();

+			this.labelSummary = new System.Windows.Forms.Label();

+			this.textBoxSummary = new System.Windows.Forms.TextBox();

+			this.labelRemarks = new System.Windows.Forms.Label();

+			this.textBoxRemarks = new System.Windows.Forms.TextBox();

+			this.labelSeeAlso = new System.Windows.Forms.Label();

+			this.comboBoxLanguage = new System.Windows.Forms.ComboBox();

+			this.labelLanguage = new System.Windows.Forms.Label();

+			this.listViewSeeAlso = new System.Windows.Forms.ListView();

+			this.SuspendLayout();

+			// 

+			// toolBar

+			// 

+			this.toolBar.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.toolBar.Appearance = System.Windows.Forms.ToolBarAppearance.Flat;

+			this.toolBar.Divider = false;

+			this.toolBar.Dock = System.Windows.Forms.DockStyle.None;

+			this.toolBar.DropDownArrows = true;

+			this.toolBar.Location = new System.Drawing.Point(8, 0);

+			this.toolBar.Name = "toolBar";

+			this.toolBar.ShowToolTips = true;

+			this.toolBar.Size = new System.Drawing.Size(416, 23);

+			this.toolBar.TabIndex = 0;

+			this.toolBar.TextAlign = System.Windows.Forms.ToolBarTextAlign.Right;

+			this.toolBar.Wrappable = false;

+			// 

+			// labelSummary

+			// 

+			this.labelSummary.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.labelSummary.Location = new System.Drawing.Point(8, 64);

+			this.labelSummary.Name = "labelSummary";

+			this.labelSummary.Size = new System.Drawing.Size(416, 16);

+			this.labelSummary.TabIndex = 1;

+			this.labelSummary.Text = "Summary";

+			// 

+			// textBoxSummary

+			// 

+			this.textBoxSummary.AcceptsReturn = true;

+			this.textBoxSummary.AcceptsTab = true;

+			this.textBoxSummary.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.textBoxSummary.Location = new System.Drawing.Point(8, 80);

+			this.textBoxSummary.Multiline = true;

+			this.textBoxSummary.Name = "textBoxSummary";

+			this.textBoxSummary.Size = new System.Drawing.Size(416, 72);

+			this.textBoxSummary.TabIndex = 2;

+			this.textBoxSummary.Text = "Insert summary here.";

+			// 

+			// labelRemarks

+			// 

+			this.labelRemarks.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.labelRemarks.Location = new System.Drawing.Point(8, 160);

+			this.labelRemarks.Name = "labelRemarks";

+			this.labelRemarks.Size = new System.Drawing.Size(416, 16);

+			this.labelRemarks.TabIndex = 3;

+			this.labelRemarks.Text = "Remarks";

+			// 

+			// textBoxRemarks

+			// 

+			this.textBoxRemarks.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 

+				| System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.textBoxRemarks.Location = new System.Drawing.Point(8, 176);

+			this.textBoxRemarks.Multiline = true;

+			this.textBoxRemarks.Name = "textBoxRemarks";

+			this.textBoxRemarks.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;

+			this.textBoxRemarks.Size = new System.Drawing.Size(416, 192);

+			this.textBoxRemarks.TabIndex = 3;

+			this.textBoxRemarks.Text = "Insert remarks here.";

+			// 

+			// labelSeeAlso

+			// 

+			this.labelSeeAlso.Anchor = ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.labelSeeAlso.Location = new System.Drawing.Point(8, 376);

+			this.labelSeeAlso.Name = "labelSeeAlso";

+			this.labelSeeAlso.Size = new System.Drawing.Size(416, 16);

+			this.labelSeeAlso.TabIndex = 5;

+			this.labelSeeAlso.Text = "See Also";

+			// 

+			// comboBoxLanguage

+			// 

+			this.comboBoxLanguage.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);

+			this.comboBoxLanguage.Location = new System.Drawing.Point(304, 32);

+			this.comboBoxLanguage.Name = "comboBoxLanguage";

+			this.comboBoxLanguage.Size = new System.Drawing.Size(121, 21);

+			this.comboBoxLanguage.TabIndex = 1;

+			this.comboBoxLanguage.Text = "English (en)";

+			// 

+			// labelLanguage

+			// 

+			this.labelLanguage.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.labelLanguage.Location = new System.Drawing.Point(8, 34);

+			this.labelLanguage.Name = "labelLanguage";

+			this.labelLanguage.Size = new System.Drawing.Size(296, 16);

+			this.labelLanguage.TabIndex = 8;

+			this.labelLanguage.Text = "Language:";

+			this.labelLanguage.TextAlign = System.Drawing.ContentAlignment.MiddleRight;

+			// 

+			// listViewSeeAlso

+			// 

+			this.listViewSeeAlso.Anchor = ((System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.listViewSeeAlso.GridLines = true;

+			this.listViewSeeAlso.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.None;

+			this.listViewSeeAlso.LabelWrap = false;

+			this.listViewSeeAlso.Location = new System.Drawing.Point(8, 392);

+			this.listViewSeeAlso.Name = "listViewSeeAlso";

+			this.listViewSeeAlso.Size = new System.Drawing.Size(416, 72);

+			this.listViewSeeAlso.Sorting = System.Windows.Forms.SortOrder.Ascending;

+			this.listViewSeeAlso.TabIndex = 4;

+			this.listViewSeeAlso.View = System.Windows.Forms.View.List;

+			// 

+			// GenericEditorForm

+			// 

+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);

+			this.ClientSize = new System.Drawing.Size(432, 477);

+			this.Controls.AddRange(new System.Windows.Forms.Control[] {

+																		  this.listViewSeeAlso,

+																		  this.labelLanguage,

+																		  this.comboBoxLanguage,

+																		  this.labelSeeAlso,

+																		  this.textBoxRemarks,

+																		  this.labelRemarks,

+																		  this.textBoxSummary,

+																		  this.labelSummary,

+																		  this.toolBar});

+			this.Name = "GenericEditorForm";

+			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Show;

+			this.Text = "GenericEditorForm";

+			this.ResumeLayout(false);

+

+		}

+		#endregion

+	}

+}

diff --git a/mcs/doctools/src/Gui/Gui.csproj b/mcs/doctools/src/Gui/Gui.csproj
new file mode 100644
index 00000000000..4f60acdd078
--- /dev/null
+++ b/mcs/doctools/src/Gui/Gui.csproj
@@ -0,0 +1,228 @@
+<VisualStudioProject>

+    <CSHARP

+        ProjectType = "Local"

+        ProductVersion = "7.0.9466"

+        SchemaVersion = "1.0"

+        ProjectGuid = "{B76CBA27-ABBD-45FE-AFC3-A629BC13BAAE}"

+    >

+        <Build>

+            <Settings

+                ApplicationIcon = ""

+                AssemblyKeyContainerName = ""

+                AssemblyName = "monodoc"

+                AssemblyOriginatorKeyFile = ""

+                DefaultClientScript = "JScript"

+                DefaultHTMLPageLayout = "Grid"

+                DefaultTargetSchema = "IE50"

+                DelaySign = "false"

+                OutputType = "WinExe"

+                RootNamespace = "Mono.Doc.Gui"

+                StartupObject = "Mono.Doc.Gui.GuiDriver"

+            >

+                <Config

+                    Name = "Debug"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "DEBUG;TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "true"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "true"

+                    Optimize = "false"

+                    OutputPath = "..\..\build\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+                <Config

+                    Name = "Release"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "false"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "false"

+                    Optimize = "true"

+                    OutputPath = "..\..\build\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+            </Settings>

+            <References>

+                <Reference

+                    Name = "Core"

+                    Project = "{73F5A60D-A5E3-4852-B4C6-478275E733F9}"

+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"

+                />

+                <Reference

+                    Name = "System"

+                    AssemblyName = "System"

+                    HintPath = "D:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.dll"

+                />

+                <Reference

+                    Name = "System.Drawing"

+                    AssemblyName = "System.Drawing"

+                    HintPath = "D:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Drawing.dll"

+                />

+                <Reference

+                    Name = "System.Windows.Forms"

+                    AssemblyName = "System.Windows.Forms"

+                    HintPath = "D:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Windows.Forms.dll"

+                />

+                <Reference

+                    Name = "System.Data"

+                    AssemblyName = "System.Data"

+                    HintPath = "D:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"

+                />

+                <Reference

+                    Name = "System.XML"

+                    AssemblyName = "System.Xml"

+                    HintPath = "D:\WINNT\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"

+                />

+            </References>

+        </Build>

+        <Files>

+            <Include>

+                <File

+                    RelPath = "AboutForm.cs"

+                    SubType = "Form"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AboutForm.resx"

+                    DependentUpon = "AboutForm.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "AssemblyTreeImages.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "AssemblyTreeLoader.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DirectorySelectorForm.cs"

+                    SubType = "Form"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "DirectorySelectorForm.resx"

+                    DependentUpon = "DirectorySelectorForm.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "EditPropertyForm.cs"

+                    SubType = "Form"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "EditPropertyForm.resx"

+                    DependentUpon = "EditPropertyForm.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "ExampleCodeEditorForm.cs"

+                    SubType = "Form"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ExampleCodeEditorForm.resx"

+                    DependentUpon = "ExampleCodeEditorForm.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "GenericEditorForm.cs"

+                    SubType = "Form"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "GenericEditorForm.resx"

+                    DependentUpon = "GenericEditorForm.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "GuiDriver.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "GuiResources.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ImageResources.resx"

+                    Link = "..\..\etc\gui\ImageResources.resx"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "MainForm.cs"

+                    SubType = "Form"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MainForm.resx"

+                    DependentUpon = "MainForm.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "MdiToolBar.cs"

+                    SubType = "Component"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "MdiToolBar.resx"

+                    DependentUpon = "MdiToolBar.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "ProjectOptionsForm.cs"

+                    SubType = "Form"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "ProjectOptionsForm.resx"

+                    DependentUpon = "ProjectOptionsForm.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "TextResources.resx"

+                    Link = "..\..\etc\gui\TextResources.resx"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "TypeEditorForm.cs"

+                    SubType = "Form"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "TypeEditorForm.resx"

+                    DependentUpon = "TypeEditorForm.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+                <File

+                    RelPath = "UnexpectedErrorForm.cs"

+                    SubType = "Form"

+                    BuildAction = "Compile"

+                />

+                <File

+                    RelPath = "UnexpectedErrorForm.resx"

+                    DependentUpon = "UnexpectedErrorForm.cs"

+                    BuildAction = "EmbeddedResource"

+                />

+            </Include>

+        </Files>

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/doctools/src/Gui/GuiDriver.cs b/mcs/doctools/src/Gui/GuiDriver.cs
new file mode 100644
index 00000000000..21ccee8929a
--- /dev/null
+++ b/mcs/doctools/src/Gui/GuiDriver.cs
@@ -0,0 +1,45 @@
+// GuiDriver.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Windows.Forms;

+

+namespace Mono.Doc.Gui

+{

+	public abstract class GuiDriver

+	{

+		[STAThread]

+		public static void Main(string[] args) 

+		{

+			try

+			{

+				// DEBUG: testing UnexpectedErrorForm

+				//throw new ApplicationException("test exception");

+				Application.Run(new MainForm((args.Length > 0) ? args[0] : null));

+			}

+			catch (Exception e)

+			{

+				UnexpectedErrorForm error = new UnexpectedErrorForm(e);

+				error.ShowDialog();

+			}

+		}

+	}

+}

diff --git a/mcs/doctools/src/Gui/GuiResources.cs b/mcs/doctools/src/Gui/GuiResources.cs
new file mode 100644
index 00000000000..a3136c7b617
--- /dev/null
+++ b/mcs/doctools/src/Gui/GuiResources.cs
@@ -0,0 +1,78 @@
+// GuiResources.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Drawing;

+using System.Reflection;

+using System.Resources;

+

+namespace Mono.Doc.Gui

+{

+	/// <summary>

+	/// Summary description for Resources.

+	/// </summary>

+	public class GuiResources

+	{

+		private static ResourceManager imageMgr = null;

+		private static ResourceManager textMgr  = null;

+

+		// this class cannot be instantiated

+		private GuiResources()

+		{

+		}

+

+		static GuiResources()

+		{

+			imageMgr = new ResourceManager("Mono.Doc.Gui.ImageResources", Assembly.GetExecutingAssembly());

+			textMgr  = new ResourceManager("Mono.Doc.Gui.TextResources", Assembly.GetExecutingAssembly());

+		}

+

+		public static Bitmap AssemblyTreeBitmap

+		{

+			get { return (Bitmap) imageMgr.GetObject("AssemblyTree.Bitmap"); }

+		}

+

+		public static Bitmap AboutMonodocBitmap

+		{

+			get { return (Bitmap) imageMgr.GetObject("AboutMonodoc.Bitmap"); }

+		}

+

+		public static Bitmap ErrorExplosionBitmap

+		{

+			get { return (Bitmap) imageMgr.GetObject("ErrorExplosion.Bitmap"); }

+		}

+

+		public static Icon OpenBookIcon

+		{

+			get	{ return (Icon) imageMgr.GetObject("OpenBook.Icon"); }

+		}

+

+		public static Icon ClosedBookIcon

+		{

+			get { return (Icon) imageMgr.GetObject("ClosedBook.Icon"); }

+		}

+

+		public static string GetString(string key)

+		{

+			return textMgr.GetString(key);

+		}

+	}

+}

diff --git a/mcs/doctools/src/Gui/MainForm.cs b/mcs/doctools/src/Gui/MainForm.cs
new file mode 100644
index 00000000000..10c952db1d1
--- /dev/null
+++ b/mcs/doctools/src/Gui/MainForm.cs
@@ -0,0 +1,898 @@
+// MainForm.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Collections;

+using System.ComponentModel;

+using System.Drawing;

+using System.IO;

+using System.Reflection;

+using System.Windows.Forms;

+

+using Mono.Doc.Core;

+

+namespace Mono.Doc.Gui

+{

+	public class MainForm : Form

+	{

+		#region Private Instance Fields

+

+		// project

+		private DocProject project;

+		private string     projectName;

+

+		// mdi toolbar

+		private MdiToolBar mdiToolBar;

+

+		// main menu / items

+		private MainMenu mainMenu;

+		private MenuItem menuFile;

+		private MenuItem menuFileNew;

+		private MenuItem menuFileOpen;

+		private MenuItem menuFileClose;

+		private MenuItem menuFileSave;

+		private MenuItem menuFileSaveAs;

+		private MenuItem menuFileSeparator1;

+		private MenuItem menuFileRecent;

+		private MenuItem menuFileSeparator2;

+		private MenuItem menuFileExit;

+		private MenuItem menuEdit;

+		private MenuItem menuWindow;

+		private MenuItem menuWindowCascade;

+		private MenuItem menuWindowTile;

+		private MenuItem menuWindowTileHorizontal;

+		private MenuItem menuDebug;

+		private MenuItem menuDebugHaltAndCatchFire;

+		private MenuItem menuDebugDisplayGeneric;

+		private MenuItem menuHelp;

+		private MenuItem menuHelpAbout;

+

+		// tree context menu / items

+		private ContextMenu treeProjectMenu;

+		private MenuItem    treeMenuProjectAddAssembly;

+		private MenuItem    treeMenuProjectAddDirectory;

+		private MenuItem    treeMenuProjectSeparator1;

+		private MenuItem    treeMenuProjectOptions;

+		private ContextMenu treeShortcutMenu;

+		private MenuItem    treeMenuShortcutClear;

+		private ContextMenu treeDirectoryMenu;

+		private MenuItem    treeMenuDirectoryAdd;

+		private ContextMenu treeAssemblyMenu;

+		private MenuItem    treeMenuAssemblyAdd;

+

+		// status bar

+		private StatusBar status;

+

+		// project tree

+		private TreeView tree;

+		private TreeNode treeProjectRootNode;

+		private TreeNode treeShortcutsNode;

+		private TreeNode treeDirectoryNode;

+		private TreeNode treeAssemblyNode;

+

+		// splitter

+		private Splitter verticalSplitter;

+

+		#endregion // Private Instance Fields

+

+		#region Constructors and Destructors

+

+		public MainForm(string projectFile)

+		{

+			this.project           = new DocProject();

+			this.project.Modified += new EventHandler(this.project_Modified );

+

+			UpdateTitle();

+

+			this.SuspendLayout();

+

+			// this

+			this.AutoScaleBaseSize         = new Size(5, 13);

+			this.IsMdiContainer            = true;

+			this.Name                      = "MainForm";

+

+			// mdiToolBar

+			this.mdiToolBar             = new MdiToolBar();

+			this.mdiToolBar.Dock        = DockStyle.Top; // TODO: make this configurable

+			this.mdiToolBar.TextAlign   = ToolBarTextAlign.Right;

+			this.mdiToolBar.Divider     = true; // TODO: only if it's docked at the top.

+			this.mdiToolBar.ImageList   = AssemblyTreeImages.List;

+			this.mdiToolBar.Appearance  = ToolBarAppearance.Flat;

+

+			// set initial size to 75% of the current screen

+			// TODO: this should only happen if we have no size prefs

+			// HACK: not sure how best to determine the current screen for multihead users

+			Rectangle workArea = Screen.PrimaryScreen.WorkingArea;

+			int       x        = (int) (workArea.Width * 0.75);

+			int       y        = (int) (workArea.Height * 0.75);

+			this.ClientSize    = new Size(x, y);

+

+			// won't completely remove flicker, but it helps

+			this.SetStyle(ControlStyles.DoubleBuffer, true);

+

+			// main menu / items

+			this.mainMenu                  = new MainMenu();

+			this.menuFile                  = new MenuItem();

+			this.menuFileNew               = new MenuItem();

+			this.menuFileOpen              = new MenuItem();

+			this.menuFileClose             = new MenuItem();

+			this.menuFileSave              = new MenuItem();

+			this.menuFileSaveAs            = new MenuItem();

+			this.menuFileSeparator1        = new MenuItem();

+			this.menuFileRecent            = new MenuItem();

+			this.menuFileSeparator2        = new MenuItem();

+			this.menuFileExit              = new MenuItem();

+			this.menuEdit                  = new MenuItem();

+			this.menuWindow                = new MenuItem();

+			this.menuWindowCascade         = new MenuItem();

+			this.menuWindowTile            = new MenuItem();

+			this.menuWindowTileHorizontal  = new MenuItem();

+			this.menuDebug                 = new MenuItem();

+			this.menuDebugHaltAndCatchFire = new MenuItem();

+			this.menuDebugDisplayGeneric   = new MenuItem();

+			this.menuHelp                  = new MenuItem();

+			this.menuHelpAbout             = new MenuItem();

+

+			InitializeMainMenu();

+

+			// status bar

+			this.status                    = new StatusBar();

+			this.status.Text               = "Ready.";

+

+			// project tree

+			this.tree                      = new TreeView();

+			this.treeAssemblyNode          = new TreeNode();

+			this.treeDirectoryNode         = new TreeNode();

+			this.treeProjectRootNode       = new TreeNode();

+			this.treeShortcutsNode         = new TreeNode();

+

+			InitializeTree();

+

+			// vertical splitter

+			// TODO: figure out how to store location in prefs

+			this.verticalSplitter          = new Splitter();

+			this.verticalSplitter.Name     = "verticalSplitter";

+			this.verticalSplitter.TabStop  = false;

+

+			// add components and layout

+			this.Menu = this.mainMenu;

+			this.Controls.AddRange(new Control[] {

+			    this.mdiToolBar,

+				this.verticalSplitter,

+				this.tree,

+				this.status

+			});

+

+			this.ResumeLayout(false);

+

+			// project tree context menus

+			this.treeProjectMenu             = new ContextMenu();

+			this.treeMenuProjectAddAssembly  = new MenuItem();

+			this.treeMenuProjectAddDirectory = new MenuItem();

+			this.treeMenuProjectSeparator1   = new MenuItem();

+			this.treeMenuProjectOptions      = new MenuItem();

+

+			this.treeShortcutMenu            = new ContextMenu();

+			this.treeMenuShortcutClear       = new MenuItem();

+

+			this.treeDirectoryMenu           = new ContextMenu();

+			this.treeMenuDirectoryAdd        = new MenuItem();

+

+			this.treeAssemblyMenu            = new ContextMenu();

+			this.treeMenuAssemblyAdd         = new MenuItem();

+

+			InitializeTreeContextMenu();

+		}

+

+		protected override void Dispose(bool disposing)

+		{

+			base.Dispose(disposing);

+		}

+

+		#endregion // Constructors and Destructors

+

+		#region Private Instance Methods

+

+		private void DisplayCorrectTreeMenu(Point showAt)

+		{

+			ContextMenu displayMenu = null;

+

+			if (this.treeProjectRootNode == tree.SelectedNode)

+			{

+				displayMenu = this.treeProjectMenu;

+			}

+			else if (this.treeShortcutsNode == tree.SelectedNode)

+			{

+				displayMenu = this.treeShortcutMenu;

+			}

+			else if (this.treeDirectoryNode == tree.SelectedNode)

+			{

+				displayMenu = this.treeDirectoryMenu;

+			}

+			else if (this.treeAssemblyNode == tree.SelectedNode)

+			{

+				displayMenu = this.treeAssemblyMenu;

+			}

+

+			if (displayMenu != null)

+			{

+				displayMenu.Show(this.tree, showAt);

+			}

+		}

+

+		private void Clear()

+		{

+			project.Clear();

+		}

+

+		private void CloseProject()

+		{

+			if (project.IsModified)

+			{

+				// TODO: i18n

+				DialogResult r = MessageBox.Show(

+					"Save changes to " + projectName + "?",

+					"Save Modified Project",

+					MessageBoxButtons.YesNoCancel,

+					MessageBoxIcon.Question,

+					MessageBoxDefaultButton.Button1

+					);

+

+				switch (r)

+				{

+					case DialogResult.Yes:

+						SaveOrSaveAsProject();

+						Clear();

+						UpdateTitle();

+						InitializeTree();

+						break;

+					case DialogResult.No:

+						Clear();

+						UpdateTitle();

+						InitializeTree();

+						break;

+				}

+			}

+			else

+			{

+				Clear();

+				UpdateTitle();

+				InitializeTree();

+			}

+		}

+

+		private void UpdateTitle()

+		{

+			string title = GuiResources.GetString("Form.Main.Title");

+

+			if (project.IsNewProject)

+			{

+				projectName = DocProject.UntitledProjectName;

+			}

+			else

+			{

+				projectName = Path.GetFileName(project.FilePath);

+				projectName = projectName.Substring(0, projectName.LastIndexOf('.'));

+			}

+

+			this.Text = projectName + (project.IsModified ? "*" : "") + " - " + title;

+		}

+

+		private void SaveOrSaveAsProject()

+		{

+			if (project.IsNewProject)

+			{

+				SaveAsProject();

+			}

+			else

+			{

+				SaveProject();

+			}

+		}

+

+		private void SaveAsProject()

+		{

+			SaveFileDialog save = new SaveFileDialog();

+

+			if (project.IsNewProject)

+			{

+				save.FileName =

+					"." + 

+					Path.DirectorySeparatorChar +

+					DocProject.UntitledProjectName +

+					".mdproj"; // TODO: abstract constant

+			}

+			else

+			{

+				save.FileName = project.FilePath;

+			}

+

+			save.Filter = "Monodoc Project Files (*.mdproj)|*.mdproj|All Files (*.*)|*.*"; // TODO: abstract constrant

+			save.RestoreDirectory = true;

+

+			if (save.ShowDialog() == DialogResult.OK)

+			{

+				project.FilePath = save.FileName;

+				SaveProject();

+				InitializeTree();

+			}

+		}

+

+		private void SaveProject()

+		{

+			try

+			{

+				project.Save();

+				UpdateTitle();

+			}

+			catch (MonodocException mde)

+			{

+				// TODO: error handling

+				MessageBox.Show("MonodocException during project save: " + mde.Message);

+			}

+			catch (Exception e)

+			{

+				// TODO: better error handling

+				MessageBox.Show("OTHER exception during project open: " + e.Message);

+			}

+		}

+

+		private void LoadSourceDocuments()

+		{

+			int fileCount = 0;

+

+			try

+			{

+				foreach (string dirName in this.project.XmlDirectories)

+				{

+					// TODO: abstract constant

+					RecursiveFileList fileList = new RecursiveFileList(dirName, "*.xml");

+

+					foreach (FileInfo f in fileList.Files)

+					{

+						this.status.Text = "Scanning file: " + f.Name;

+						fileCount++;

+					}

+				}

+

+				this.status.Text = "Scanned " + fileCount + " XML source files.";

+			}

+			catch (Exception e)

+			{

+				// TODO: better error handling

+				MessageBox.Show("Problem while trying to scan XML source directories.\n" +

+					e.Message + "\n" +

+					e.StackTrace

+					);

+			}

+		}

+

+		private void OpenProject(string fileName)

+		{

+			try

+			{

+				project.Load(fileName);

+				UpdateTitle();

+				InitializeTree();

+				LoadSourceDocuments();

+			}

+			catch (MonodocException mde)

+			{

+				// TODO: better error handling

+				MessageBox.Show("MonodocException during project open: " + mde.Message);

+			}

+			catch (Exception e)

+			{

+				// TODO: better error handling

+				MessageBox.Show("OTHER exception during project open: " + e.Message + "\n" + e.StackTrace);

+			}

+		}

+

+		#endregion // Private Instance Methods

+

+		#region Tree Init

+

+		private void InitializeTree()

+		{

+			

+			// tree

+			this.tree.Dock                 = DockStyle.Left;

+			this.tree.ImageList            = AssemblyTreeImages.List;

+			this.tree.ImageIndex           = 0;

+			this.tree.SelectedImageIndex   = 0;

+			this.tree.Name                 = "tree";

+			this.tree.TabIndex             = 1;

+			this.tree.AfterSelect         += new TreeViewEventHandler(this.tree_AfterSelect);

+			this.tree.MouseUp             += new MouseEventHandler(this.tree_MouseUp);

+

+			// treeAssemblyNode

+			this.treeAssemblyNode.Text               = "Assemblies"; // TODO: i18n

+			this.treeAssemblyNode.ImageIndex         = AssemblyTreeImages.AssemblyClosed;

+			this.treeAssemblyNode.SelectedImageIndex = AssemblyTreeImages.AssemblyClosed;

+			this.treeAssemblyNode.Tag                = "ASSEMBLIES"; // TODO: abstract constant

+			

+			// treeDirectoryNode

+			this.treeDirectoryNode.Text               = "Source Directories"; // TODO: i18n

+			this.treeDirectoryNode.ImageIndex         = AssemblyTreeImages.Shortcuts; // TODO: folder image

+			this.treeDirectoryNode.SelectedImageIndex = AssemblyTreeImages.Shortcuts;

+			this.treeDirectoryNode.Tag                = "DIRECTORIES"; // TODO: abstract constant

+

+			// treeProjectRootNode

+			this.treeProjectRootNode.Text               = projectName + " Project"; // TODO: i18n

+			this.treeProjectRootNode.ImageIndex         = AssemblyTreeImages.Shortcuts; // TODO: project image

+			this.treeProjectRootNode.SelectedImageIndex = AssemblyTreeImages.Shortcuts;

+			this.treeProjectRootNode.Tag                = "PROJECT"; // TODO: abstract constant

+

+			// treeShortcutsNode

+			this.treeShortcutsNode.Text               = "Shortcuts"; // TODO: i18n

+			this.treeShortcutsNode.ImageIndex         = AssemblyTreeImages.Shortcuts;

+			this.treeShortcutsNode.SelectedImageIndex = AssemblyTreeImages.Shortcuts;

+			this.treeShortcutsNode.Tag                = "SHORTCUTS"; // TODO: abstract constant

+

+			this.tree.BeginUpdate();

+			this.tree.Nodes.Clear();

+

+			// ugh.  appears necessary to effectively rebuild the tree.

+			TreeNode[] nodesToRemove = new TreeNode[] {

+														  this.treeAssemblyNode,

+														  this.treeDirectoryNode,

+														  this.treeProjectRootNode,

+														  this.treeShortcutsNode

+													  };

+

+			foreach (TreeNode n in nodesToRemove)

+			{

+				n.Nodes.Clear();

+

+				if (n.Parent != null)

+				{

+					n.Remove();

+				}

+			}

+

+			tree.Nodes.Add(this.treeProjectRootNode);

+

+			this.treeProjectRootNode.Nodes.AddRange(

+				new TreeNode[] {

+								   this.treeShortcutsNode,

+								   this.treeDirectoryNode,

+								   this.treeAssemblyNode

+							   });

+

+			// project xml directories

+			foreach (string xmlDir in project.XmlDirectories)

+			{

+				TreeNode dirNode           = new TreeNode(xmlDir);

+				dirNode.ImageIndex         = AssemblyTreeImages.Shortcuts; // TODO: folder image

+				dirNode.SelectedImageIndex = AssemblyTreeImages.Shortcuts;

+				dirNode.Tag                = "DIRECTORY:" + xmlDir;

+

+				this.treeDirectoryNode.Nodes.Add(dirNode);

+			}

+

+			// project assemblies

+			try

+			{

+				foreach (string assemblyFile in this.project.AssemblyFiles)

+				{

+					AssemblyLoader     asmLoader  = new AssemblyLoader(assemblyFile);

+					AssemblyTreeLoader treeLoader = new AssemblyTreeLoader(asmLoader);

+				

+					treeLoader.LoadNode(this.treeAssemblyNode);

+				}

+			} 

+			catch (ApplicationException ae)

+			{

+				// TODO: better error handling

+				MessageBox.Show(ae.Message, "Error Loading project assemblies");

+			}

+

+			this.treeProjectRootNode.Expand();

+			this.treeAssemblyNode.Expand();

+			this.treeDirectoryNode.Expand();

+			this.tree.EndUpdate();

+		}

+

+		#endregion // Tree Init

+		

+		#region Tree Events

+

+		private void tree_AfterSelect(object sender, TreeViewEventArgs args)

+		{

+			this.status.Text = (string) args.Node.Tag;

+		}

+

+		private void tree_MouseUp(object sender, MouseEventArgs args)

+		{

+			if (args.Button == MouseButtons.Right)

+			{

+				tree.SelectedNode = tree.GetNodeAt(args.X, args.Y);

+

+				if (tree.SelectedNode != null)

+				{

+					Point menuLoc = this.PointToClient(tree.PointToScreen(new Point(args.X, args.Y)));

+					this.status.Text = "display tree menu at " + menuLoc.ToString();

+					DisplayCorrectTreeMenu(menuLoc);

+				}

+			}

+		}

+

+		#endregion // Tree Events

+

+		#region Tree Context Menu Init

+

+		private void InitializeTreeContextMenu()

+		{

+			// treeProjectMenu

+			this.treeProjectMenu.MenuItems.AddRange(

+				new MenuItem[] {

+								   this.treeMenuProjectAddAssembly,

+								   this.treeMenuProjectAddDirectory,

+								   this.treeMenuProjectSeparator1,

+								   this.treeMenuProjectOptions

+							   });

+

+			this.treeMenuProjectAddAssembly.Index   = 0;

+			this.treeMenuProjectAddAssembly.Text    = "Add Assembly..."; // TODO: i18n

+			this.treeMenuProjectAddAssembly.Click  +=

+				new EventHandler(this.treeMenuProjectAddAssembly_Click);

+

+			this.treeMenuProjectAddDirectory.Index  = 1;

+			this.treeMenuProjectAddDirectory.Text   = "Add Directory..."; // TODO: i18n

+			this.treeMenuProjectAddDirectory.Click +=

+				new EventHandler(this.treeMenuProjectAddDirectory_Click);

+

+			this.treeMenuProjectSeparator1.Index    = 2;

+			this.treeMenuProjectSeparator1.Text     = "-";

+

+			this.treeMenuProjectOptions.Index       = 3;

+			this.treeMenuProjectOptions.Text        = "Options..."; // TODO: i18n

+			this.treeMenuProjectOptions.Click      +=

+				new EventHandler(this.treeMenuProjectOptions_Click);

+

+			// treeShortcutMenu

+			this.treeShortcutMenu.MenuItems.AddRange(

+				new MenuItem[] {

+								   this.treeMenuShortcutClear

+							   });

+

+			this.treeMenuShortcutClear.Index  = 0;

+			this.treeMenuShortcutClear.Text   = "Clear Shortcuts"; // TODO: i18n

+			this.treeMenuShortcutClear.Click += new EventHandler(this.treeMenuShortcutClear_Click);

+

+			// treeDirectoryMenu

+			this.treeDirectoryMenu.MenuItems.AddRange(

+				new MenuItem[] {

+								   this.treeMenuDirectoryAdd

+							   });

+

+			this.treeMenuDirectoryAdd.Index  = 0;

+			this.treeMenuDirectoryAdd.Text   = "Add Directory..."; // TODO: i18n

+			this.treeMenuDirectoryAdd.Click += new EventHandler(this.treeMenuDirectoryAdd_Click);

+

+			// treeAssemblyMenu

+			this.treeAssemblyMenu.MenuItems.AddRange(

+				new MenuItem[] {

+								   this.treeMenuAssemblyAdd

+							   });

+

+			this.treeMenuAssemblyAdd.Index  = 0;

+			this.treeMenuAssemblyAdd.Text   = "Add Assembly..."; // TODO: i18n

+			this.treeMenuAssemblyAdd.Click += new EventHandler(this.treeMenuAssemblyAdd_Click);

+		}

+

+		#endregion // Tree Context Menu Init

+

+		#region Tree Context Menu Events

+

+		private void treeMenuProjectAddAssembly_Click(object sender, EventArgs args)

+		{

+			MessageBox.Show("TODO: add assembly to project");

+		}

+

+		private void treeMenuProjectAddDirectory_Click(object sender, EventArgs args)

+		{

+			MessageBox.Show("TODO: add source directory to project");

+		}

+

+		private void treeMenuProjectOptions_Click(object sender, EventArgs args)

+		{

+			ProjectOptionsForm options = new ProjectOptionsForm(this.project);

+			options.ShowDialog();

+			options.Dispose();

+		}

+

+		private void treeMenuShortcutClear_Click(object sender, EventArgs args)

+		{

+			treeShortcutsNode.Nodes.Clear();

+		}

+

+		private void treeMenuDirectoryAdd_Click(object sender, EventArgs args)

+		{

+			this.treeMenuProjectAddDirectory_Click(sender, args);

+		}

+

+		private void treeMenuAssemblyAdd_Click(object sender, EventArgs args)

+		{

+			this.treeMenuProjectAddAssembly_Click(sender, args);

+		}

+

+		#endregion // Tree Context Menu Events

+

+		#region Main Menu Init

+

+		private void InitializeMainMenu()

+		{

+			// main

+			this.mainMenu.MenuItems.AddRange(

+				new MenuItem[] {

+								   this.menuFile,

+								   this.menuEdit,

+								   this.menuWindow,

+								   this.menuDebug,

+								   this.menuHelp

+							   });

+

+			// File

+			this.menuFile.Index = 0;

+			this.menuFile.Text  = "File"; // TODO: i18n

+			

+			this.menuFile.MenuItems.AddRange(

+				new MenuItem[] {

+								   this.menuFileNew,

+								   this.menuFileOpen,

+								   this.menuFileClose,

+								   this.menuFileSave,

+								   this.menuFileSaveAs,

+								   this.menuFileSeparator1,

+								   this.menuFileRecent,

+								   this.menuFileSeparator2,

+								   this.menuFileExit

+							   });

+

+			// File|New Project

+			this.menuFileNew.Index  = 0;

+			this.menuFileNew.Text   = "New Project"; // TODO: i18n

+			this.menuFileNew.Click += new EventHandler(this.menuFileNew_Click);

+

+			// File|Open Project

+			this.menuFileOpen.Index  = 1;

+			this.menuFileOpen.Text   = "Open Project..."; // TODO: i18n

+			this.menuFileOpen.Click += new EventHandler(this.menuFileOpen_Click);

+

+

+			// File|Save Project

+			this.menuFileSave.Index  = 2;

+			this.menuFileSave.Text   = "Save Project"; // TODO: i18n

+			this.menuFileSave.Click += new EventHandler(this.menuFileSave_Click);

+

+			// File|Save Project As

+			this.menuFileSaveAs.Index  = 3;

+			this.menuFileSaveAs.Text   = "Save Project As..."; // TODO: i18n

+			this.menuFileSaveAs.Click += new EventHandler(this.menuFileSaveAs_Click);

+

+			// File|Separator1

+			this.menuFileSeparator1.Index = 4;

+			this.menuFileSeparator1.Text  = "-";

+

+			// File|Recent Projects

+			this.menuFileRecent.Index = 5;

+			this.menuFileRecent.Text  = "Recent Projects"; // TODO: i18n

+

+			// File|Separator2

+			this.menuFileSeparator2.Index = 6;

+			this.menuFileSeparator2.Text  = "-";

+

+			// File|Close Project

+			this.menuFileClose.Index  = 7;

+			this.menuFileClose.Text   = "Close Project"; // TODO: i18n

+			this.menuFileClose.Click += new EventHandler(this.menuFileClose_Click);

+

+			// File|Exit

+			this.menuFileExit.Index  = 8;

+			this.menuFileExit.Text   = "Exit"; // TODO: i18n

+			this.menuFileExit.Click += new EventHandler(this.menuFileExit_Click);

+

+			// Edit

+			this.menuEdit.Index = 1;

+			this.menuEdit.Text  = "Edit"; // TODO: i18n

+

+			// Window

+			this.menuWindow.Index   = 2;

+			this.menuWindow.Text    = "Window"; // TODO: i18n

+			this.menuWindow.MdiList = true;

+

+			this.menuWindow.MenuItems.AddRange(

+				new MenuItem[] {

+								   this.menuWindowCascade,

+								   this.menuWindowTile,

+								   this.menuWindowTileHorizontal

+							   });

+

+			// Window|Cascade

+			this.menuWindowCascade.Index  = 0;

+			this.menuWindowCascade.Text   = "Cascade"; // TODO: i18n

+			this.menuWindowCascade.Click += new EventHandler(this.menuWindowCascade_Click);

+

+			// Window|Tile

+			this.menuWindowTile.Index  = 1;

+			this.menuWindowTile.Text   = "Tile"; // TODO: i18n

+			this.menuWindowTile.Click += new EventHandler(this.menuWindowTile_Click);

+			

+			// Window|Tile Horizontal

+			this.menuWindowTileHorizontal.Index  = 2;

+			this.menuWindowTileHorizontal.Text   = "Tile Horizontal"; // TODO: i18n

+			this.menuWindowTileHorizontal.Click += new EventHandler(this.menuWindowTileHorizontal_Click);

+

+			// DEBUG

+			this.menuDebug.Index = 3;

+			this.menuDebug.Text  = "DEBUG";

+

+			this.menuDebug.MenuItems.AddRange(

+				new MenuItem[] {

+								   this.menuDebugHaltAndCatchFire,

+								   this.menuDebugDisplayGeneric

+							   });

+

+			// DEBUG|Halt and Catch Fire

+			this.menuDebugHaltAndCatchFire.Index  = 0;

+			this.menuDebugHaltAndCatchFire.Text   = "Halt and Catch Fire";

+			this.menuDebugHaltAndCatchFire.Click += new EventHandler(this.menuDebugHaltAndCatchFire_Click);

+

+			// DEBUG|Display Generic

+			this.menuDebugDisplayGeneric.Index  = 1;

+			this.menuDebugDisplayGeneric.Text   = "Display Generic Form";

+			this.menuDebugDisplayGeneric.Click += new EventHandler(this.menuDebugDisplayGeneric_Click);

+

+			// Help

+			this.menuHelp.Index   = 4;

+			this.menuHelp.Text    = "Help"; // TODO: i18n

+

+			this.menuHelp.MenuItems.AddRange(

+				new MenuItem[] {

+								   this.menuHelpAbout

+							   });

+

+			// Help|About

+			this.menuHelpAbout.Index  = 0;

+			this.menuHelpAbout.Text   = "About..."; // TODO: i18n

+			this.menuHelpAbout.Click += new EventHandler(this.menuHelpAbout_Click);

+		}

+

+		#endregion // Main Menu Init

+		

+		#region Main Menu Events

+

+		private void menuFileNew_Click(object sender, EventArgs e)

+		{

+			CloseProject();

+		}

+

+		private void menuFileOpen_Click(object sender, EventArgs e)

+		{

+			OpenFileDialog open = new OpenFileDialog();

+			open.Filter         = "Monodoc Project Files (*.mdproj)|*.mdproj| All Files (*.*)|*.*";

+

+			if (open.ShowDialog() == DialogResult.OK)

+			{

+				OpenProject(open.FileName);

+			}

+		}

+

+		private void menuFileClose_Click(object sender, EventArgs e)

+		{

+			CloseProject();

+		}

+

+		private void menuFileSave_Click(object sender, EventArgs e)

+		{

+			if (project.IsNewProject || project.IsModified)

+			{

+				SaveOrSaveAsProject();

+			}

+		}

+

+		private void menuFileSaveAs_Click(object sender, EventArgs e)

+		{

+			SaveAsProject();

+		}

+

+		private void menuFileExit_Click(object sender, EventArgs e)

+		{

+			Application.Exit();

+		}

+

+		private void menuWindowCascade_Click(object sender, EventArgs e)

+		{

+			this.LayoutMdi(MdiLayout.Cascade);

+		}

+

+		private void menuWindowTile_Click(object sender, EventArgs e)

+		{

+			this.LayoutMdi(MdiLayout.TileVertical);

+		}

+

+		private void menuWindowTileHorizontal_Click(object sender, EventArgs e)

+		{

+			this.LayoutMdi(MdiLayout.TileHorizontal);

+		}

+

+		private void menuDebugHaltAndCatchFire_Click(object sender, EventArgs e)

+		{

+			throw new ApplicationException("Test Exception Message",

+				new ApplicationException("Inner Exception Message")

+				);

+		}

+

+		private void menuDebugDisplayGeneric_Click(object sender, EventArgs e)

+		{

+			GenericEditorForm generic = new GenericEditorForm();

+			generic.MdiParent         = this;

+			generic.Tag               = "mditoolbarimageindex[1]";

+			generic.Show();

+		}

+

+		private void menuHelpAbout_Click(object sender, EventArgs e)

+		{

+			Form aboutForm = new AboutForm();

+			aboutForm.ShowDialog();

+		}

+

+		#endregion // Main Menu Events

+

+		#region Other Events and Handlers

+

+		private void project_Modified(object sender, EventArgs args)

+		{

+			UpdateTitle();

+			InitializeTree();

+		}

+

+		protected override void OnClosing(CancelEventArgs e)

+		{

+			base.OnClosing(e);

+

+			// this code is nearly duplicated from CloseProject()

+			if (project.IsModified)

+			{

+				// TODO: i18n

+				DialogResult r = MessageBox.Show(

+					"Save changes to " + projectName + "?",

+					"Save Modified Project",

+					MessageBoxButtons.YesNoCancel,

+					MessageBoxIcon.Question,

+					MessageBoxDefaultButton.Button1

+					);

+

+				switch (r)

+				{

+					case DialogResult.Yes:

+						SaveOrSaveAsProject();

+						break;

+					case DialogResult.Cancel:

+						e.Cancel = true;

+						break;

+				}

+			}

+		}

+		#endregion // Other Events and Handlers

+	}

+}

diff --git a/mcs/doctools/src/Gui/MdiToolBar.cs b/mcs/doctools/src/Gui/MdiToolBar.cs
new file mode 100644
index 00000000000..3bdc16e8b78
--- /dev/null
+++ b/mcs/doctools/src/Gui/MdiToolBar.cs
@@ -0,0 +1,206 @@
+// MdiToolBar.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Collections;

+using System.ComponentModel;

+using System.Windows.Forms;

+

+namespace Mono.Doc.Gui

+{

+	public class MdiToolBar : ToolBar

+	{

+		#region Private Instance Fields

+

+		private Hashtable mdiChildren     = null;

+		private Form      currentMdiChild = null;

+

+		#endregion // Private Instance Fields

+

+		#region Constructors and Destructors

+

+		public MdiToolBar() : base()

+		{

+			this.mdiChildren = new Hashtable();

+		}

+

+		#endregion // Constructors and Destructors

+

+		#region Event Handlers

+

+		private void mdiParent_MdiChildActivate(object sender, EventArgs args)

+		{

+			Form activeMdiChild = ((Form) sender).ActiveMdiChild;

+

+			if (activeMdiChild != null)

+			{

+				if (this.mdiChildren[activeMdiChild] == null) 

+				{

+					// need a new button

+					ToolBarButton newButton           = new ToolBarButton(activeMdiChild.Text);

+					newButton.Style                   = ToolBarButtonStyle.ToggleButton;

+					this.mdiChildren[activeMdiChild]  = newButton;

+					activeMdiChild.Closing           += new CancelEventHandler(this.mdiChild_Closing);

+

+					// tooltip

+					newButton.ToolTipText = activeMdiChild.Text;

+

+					// separators

+					if ((this.Appearance == ToolBarAppearance.Flat) && (this.Buttons.Count > 0)) 

+					{

+						ToolBarButton sep = new ToolBarButton();

+						sep.Style         = ToolBarButtonStyle.Separator;

+						

+						this.Buttons.Add(sep);

+					}

+

+					// image index.  if the mdi child form's Tag property is a string

+					// and contains the text "mditoolbarimageindex[n]", where n is

+					// an integer, the associated button's ImageIndex property will be

+					// set to n.

+

+					String formTag = activeMdiChild.Tag as string;

+

+					if (formTag != null)

+					{

+						string lookFor = "mditoolbarimageindex[";

+						int    index   = formTag.IndexOf(lookFor);

+

+						if (index != -1)

+						{

+							int    startIndex    = index + lookFor.Length;

+							int    endIndex      = formTag.IndexOf("]", startIndex);

+							string imageIndexStr = formTag.Substring(startIndex, endIndex - startIndex);

+

+							MessageBox.Show("mditoolbar: imageIndexStr: " + imageIndexStr);

+						

+							try

+							{

+								newButton.ImageIndex = int.Parse(imageIndexStr);

+							}

+							catch

+							{

+							}

+						}

+					}

+					else

+					{

+						// use default index

+						newButton.ImageIndex = 0;

+					}

+

+					this.Buttons.Add(newButton);

+				}

+

+				this.CurrentMdiChild = activeMdiChild;

+			}

+			else

+			{

+				// last MDI child removed; clean up

+				this.mdiChildren.Clear();

+				this.Buttons.Clear();

+				this.currentMdiChild = null;

+			}

+		}

+

+		private void mdiChild_Closing(object sender, CancelEventArgs args)

+		{

+			ToolBarButton b = (ToolBarButton) this.mdiChildren[sender];

+

+			// deal with separators

+			if ((this.Appearance == ToolBarAppearance.Flat) && (this.Buttons.Count > 1))

+			{

+				int bIndex = this.Buttons.IndexOf(b);

+

+				if (bIndex == 0) 

+				{

+					this.Buttons.RemoveAt(bIndex + 1);

+				} 

+				else 

+				{

+					this.Buttons.RemoveAt(bIndex - 1);

+				}

+			}

+

+			this.Buttons.Remove(b);

+			this.mdiChildren.Remove(sender);

+		}

+

+		#endregion // Event Handlers

+

+		#region Overridden Event Handlers

+

+		protected override void OnButtonClick(ToolBarButtonClickEventArgs args)

+		{

+			base.OnButtonClick(args);

+

+			args.Button.Pushed = true;

+

+			// linear search, but double-hashing seems worthless.

+			foreach (Form keyChild in this.mdiChildren.Keys) 

+			{

+				if (args.Button == this.mdiChildren[keyChild])

+				{

+					keyChild.Activate();

+					break;

+				}

+			}

+		}

+

+		protected override void OnParentChanged(EventArgs args)

+		{

+			base.OnParentChanged(args);

+

+			// TODO: potential for multiple registration of event handler?

+			if (this.Parent is Form && ((Form) this.Parent).IsMdiContainer) 

+			{

+				((Form) this.Parent).MdiChildActivate

+					+= new EventHandler(this.mdiParent_MdiChildActivate);

+			}

+		}

+

+		#endregion // Overridden Event Handlers

+

+		#region Private Instance Properties

+

+		private Form CurrentMdiChild 

+		{

+			get { return this.currentMdiChild; }

+			set 

+			{

+				if (this.currentMdiChild != null) 

+				{

+					ToolBarButton child = this.mdiChildren[this.currentMdiChild] as ToolBarButton;

+

+					if (child != null)

+					{

+						child.Pushed = false;

+					}

+				}

+

+				((ToolBarButton) this.mdiChildren[value]).Pushed = true;

+				this.currentMdiChild = value;

+			}

+		}

+

+		#endregion // Private Instance Properties

+	}

+}

diff --git a/mcs/doctools/src/Gui/ProjectOptionsForm.cs b/mcs/doctools/src/Gui/ProjectOptionsForm.cs
new file mode 100644
index 00000000000..1b67d749ce5
--- /dev/null
+++ b/mcs/doctools/src/Gui/ProjectOptionsForm.cs
@@ -0,0 +1,560 @@
+// ProjectOptionsForm.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using Mono.Doc.Core;

+using System;

+using System.Drawing;

+using System.Collections;

+using System.ComponentModel;

+using System.Windows.Forms;

+

+namespace Mono.Doc.Gui

+{

+	/// <summary>

+	/// Summary description for ProjectOptionsForm.

+	/// </summary>

+	public class ProjectOptionsForm : System.Windows.Forms.Form

+	{

+		private DocProject project;

+		private bool       isModified;

+

+		private System.Windows.Forms.Button buttonOK;

+		private System.Windows.Forms.Button buttonCancel;

+		private System.Windows.Forms.Button buttonApply;

+		private System.Windows.Forms.GroupBox groupBoxAssemblies;

+		private System.Windows.Forms.Button buttonAssemblyRemove;

+		private System.Windows.Forms.Button buttonAssemblyAdd;

+		private System.Windows.Forms.ListBox listBoxAssembliesToDocument;

+		private System.Windows.Forms.GroupBox groupBoxDirectories;

+		private System.Windows.Forms.Button buttonDirectoryRemove;

+		private System.Windows.Forms.Button buttonDirectoryAdd;

+		private System.Windows.Forms.ListBox listBoxXmlSourceDirectories;

+		private System.Windows.Forms.GroupBox groupBoxProperties;

+		private System.Windows.Forms.ListView listViewProperties;

+		private System.Windows.Forms.ToolBar toolBarProperties;

+		private System.Windows.Forms.ToolBarButton toolBarButtonNewProperty;

+		private System.Windows.Forms.ToolBarButton toolBarButtonEditProperty;

+		private System.Windows.Forms.ToolBarButton toolBarButtonRemoveProperty;

+		private System.Windows.Forms.ColumnHeader columnHeaderName;

+		private System.Windows.Forms.ColumnHeader columnHeaderValue;

+		/// <summary>

+		/// Required designer variable.

+		/// </summary>

+		private System.ComponentModel.Container components = null;

+

+		public ProjectOptionsForm(DocProject project)

+		{

+			//this.SetStyle(ControlStyles.DoubleBuffer, true);

+			

+			this.project    = project;

+			this.isModified = false;

+

+			//

+			// Required for Windows Form Designer support

+			//

+			InitializeComponent();

+

+			//

+			// TODO: Add any constructor code after InitializeComponent call

+			//

+

+			this.toolBarProperties.ImageList = AssemblyTreeImages.List; // TODO: need real images

+

+			// load list of assemblies

+			this.listBoxAssembliesToDocument.BeginUpdate();

+			this.listBoxAssembliesToDocument.Items.Clear();

+

+			foreach (string assemblyFile in project.AssemblyFiles)

+			{

+				this.listBoxAssembliesToDocument.Items.Add(assemblyFile);

+			}

+			

+			this.listBoxAssembliesToDocument.EndUpdate();

+

+			// load list of XML directories

+			this.listBoxXmlSourceDirectories.BeginUpdate();

+			this.listBoxXmlSourceDirectories.Items.Clear();

+

+			foreach (string xmlDir in project.XmlDirectories)

+			{

+				this.listBoxXmlSourceDirectories.Items.Add(xmlDir);

+			}

+

+			this.listBoxXmlSourceDirectories.EndUpdate();

+

+			// load properties

+			foreach (string name in project.Properties.Keys)

+			{

+				ListViewItem entry = new ListViewItem(name);

+

+				entry.SubItems.Add(project.Properties[name] as string);

+				this.listViewProperties.Items.Add(entry);

+			}

+		}

+

+		/// <summary>

+		/// Clean up any resources being used.

+		/// </summary>

+		protected override void Dispose( bool disposing )

+		{

+			if( disposing )

+			{

+				if(components != null)

+				{

+					components.Dispose();

+				}

+			}

+			base.Dispose( disposing );

+		}

+

+		#region Windows Form Designer generated code

+		/// <summary>

+		/// Required method for Designer support - do not modify

+		/// the contents of this method with the code editor.

+		/// </summary>

+		private void InitializeComponent()

+		{

+			this.buttonOK = new System.Windows.Forms.Button();

+			this.buttonCancel = new System.Windows.Forms.Button();

+			this.buttonApply = new System.Windows.Forms.Button();

+			this.groupBoxAssemblies = new System.Windows.Forms.GroupBox();

+			this.buttonAssemblyRemove = new System.Windows.Forms.Button();

+			this.buttonAssemblyAdd = new System.Windows.Forms.Button();

+			this.listBoxAssembliesToDocument = new System.Windows.Forms.ListBox();

+			this.groupBoxDirectories = new System.Windows.Forms.GroupBox();

+			this.buttonDirectoryRemove = new System.Windows.Forms.Button();

+			this.buttonDirectoryAdd = new System.Windows.Forms.Button();

+			this.listBoxXmlSourceDirectories = new System.Windows.Forms.ListBox();

+			this.groupBoxProperties = new System.Windows.Forms.GroupBox();

+			this.toolBarProperties = new System.Windows.Forms.ToolBar();

+			this.toolBarButtonNewProperty = new System.Windows.Forms.ToolBarButton();

+			this.toolBarButtonEditProperty = new System.Windows.Forms.ToolBarButton();

+			this.toolBarButtonRemoveProperty = new System.Windows.Forms.ToolBarButton();

+			this.listViewProperties = new System.Windows.Forms.ListView();

+			this.columnHeaderName = new System.Windows.Forms.ColumnHeader();

+			this.columnHeaderValue = new System.Windows.Forms.ColumnHeader();

+			this.groupBoxAssemblies.SuspendLayout();

+			this.groupBoxDirectories.SuspendLayout();

+			this.groupBoxProperties.SuspendLayout();

+			this.SuspendLayout();

+			// 

+			// buttonOK

+			// 

+			this.buttonOK.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonOK.Location = new System.Drawing.Point(168, 394);

+			this.buttonOK.Name = "buttonOK";

+			this.buttonOK.TabIndex = 10;

+			this.buttonOK.Text = "OK";

+			this.buttonOK.Click += new System.EventHandler(this.buttonOK_Click);

+			// 

+			// buttonCancel

+			// 

+			this.buttonCancel.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;

+			this.buttonCancel.Location = new System.Drawing.Point(344, 394);

+			this.buttonCancel.Name = "buttonCancel";

+			this.buttonCancel.Size = new System.Drawing.Size(72, 23);

+			this.buttonCancel.TabIndex = 11;

+			this.buttonCancel.Text = "Cancel";

+			this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);

+			// 

+			// buttonApply

+			// 

+			this.buttonApply.Anchor = (System.Windows.Forms.AnchorStyles.Bottom | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonApply.Location = new System.Drawing.Point(256, 394);

+			this.buttonApply.Name = "buttonApply";

+			this.buttonApply.TabIndex = 12;

+			this.buttonApply.Text = "Apply";

+			this.buttonApply.Click += new System.EventHandler(this.buttonApply_Click);

+			// 

+			// groupBoxAssemblies

+			// 

+			this.groupBoxAssemblies.Controls.AddRange(new System.Windows.Forms.Control[] {

+																							 this.buttonAssemblyRemove,

+																							 this.buttonAssemblyAdd,

+																							 this.listBoxAssembliesToDocument});

+			this.groupBoxAssemblies.Location = new System.Drawing.Point(9, 8);

+			this.groupBoxAssemblies.Name = "groupBoxAssemblies";

+			this.groupBoxAssemblies.Size = new System.Drawing.Size(408, 96);

+			this.groupBoxAssemblies.TabIndex = 17;

+			this.groupBoxAssemblies.TabStop = false;

+			this.groupBoxAssemblies.Text = "Assemblies";

+			// 

+			// buttonAssemblyRemove

+			// 

+			this.buttonAssemblyRemove.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonAssemblyRemove.Location = new System.Drawing.Point(320, 40);

+			this.buttonAssemblyRemove.Name = "buttonAssemblyRemove";

+			this.buttonAssemblyRemove.Size = new System.Drawing.Size(80, 19);

+			this.buttonAssemblyRemove.TabIndex = 8;

+			this.buttonAssemblyRemove.Text = "Remove";

+			this.buttonAssemblyRemove.Click += new System.EventHandler(this.buttonAssemblyRemove_Click);

+			// 

+			// buttonAssemblyAdd

+			// 

+			this.buttonAssemblyAdd.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonAssemblyAdd.Location = new System.Drawing.Point(320, 16);

+			this.buttonAssemblyAdd.Name = "buttonAssemblyAdd";

+			this.buttonAssemblyAdd.Size = new System.Drawing.Size(80, 19);

+			this.buttonAssemblyAdd.TabIndex = 7;

+			this.buttonAssemblyAdd.Text = "Add...";

+			this.buttonAssemblyAdd.Click += new System.EventHandler(this.buttonAssemblyAdd_Click);

+			// 

+			// listBoxAssembliesToDocument

+			// 

+			this.listBoxAssembliesToDocument.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.listBoxAssembliesToDocument.Location = new System.Drawing.Point(8, 16);

+			this.listBoxAssembliesToDocument.Name = "listBoxAssembliesToDocument";

+			this.listBoxAssembliesToDocument.Size = new System.Drawing.Size(304, 69);

+			this.listBoxAssembliesToDocument.TabIndex = 6;

+			// 

+			// groupBoxDirectories

+			// 

+			this.groupBoxDirectories.Controls.AddRange(new System.Windows.Forms.Control[] {

+																							  this.buttonDirectoryRemove,

+																							  this.buttonDirectoryAdd,

+																							  this.listBoxXmlSourceDirectories});

+			this.groupBoxDirectories.Location = new System.Drawing.Point(9, 112);

+			this.groupBoxDirectories.Name = "groupBoxDirectories";

+			this.groupBoxDirectories.Size = new System.Drawing.Size(408, 96);

+			this.groupBoxDirectories.TabIndex = 18;

+			this.groupBoxDirectories.TabStop = false;

+			this.groupBoxDirectories.Text = "XML Source Directories";

+			// 

+			// buttonDirectoryRemove

+			// 

+			this.buttonDirectoryRemove.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonDirectoryRemove.Location = new System.Drawing.Point(320, 40);

+			this.buttonDirectoryRemove.Name = "buttonDirectoryRemove";

+			this.buttonDirectoryRemove.Size = new System.Drawing.Size(80, 19);

+			this.buttonDirectoryRemove.TabIndex = 8;

+			this.buttonDirectoryRemove.Text = "Remove";

+			this.buttonDirectoryRemove.Click += new System.EventHandler(this.buttonDirectoryRemove_Click);

+			// 

+			// buttonDirectoryAdd

+			// 

+			this.buttonDirectoryAdd.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);

+			this.buttonDirectoryAdd.Location = new System.Drawing.Point(320, 16);

+			this.buttonDirectoryAdd.Name = "buttonDirectoryAdd";

+			this.buttonDirectoryAdd.Size = new System.Drawing.Size(80, 19);

+			this.buttonDirectoryAdd.TabIndex = 7;

+			this.buttonDirectoryAdd.Text = "Add...";

+			this.buttonDirectoryAdd.Click += new System.EventHandler(this.buttonDirectoryAdd_Click);

+			// 

+			// listBoxXmlSourceDirectories

+			// 

+			this.listBoxXmlSourceDirectories.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.listBoxXmlSourceDirectories.Location = new System.Drawing.Point(8, 16);

+			this.listBoxXmlSourceDirectories.Name = "listBoxXmlSourceDirectories";

+			this.listBoxXmlSourceDirectories.Size = new System.Drawing.Size(304, 69);

+			this.listBoxXmlSourceDirectories.TabIndex = 6;

+			// 

+			// groupBoxProperties

+			// 

+			this.groupBoxProperties.Controls.AddRange(new System.Windows.Forms.Control[] {

+																							 this.toolBarProperties,

+																							 this.listViewProperties});

+			this.groupBoxProperties.Location = new System.Drawing.Point(9, 216);

+			this.groupBoxProperties.Name = "groupBoxProperties";

+			this.groupBoxProperties.Size = new System.Drawing.Size(408, 168);

+			this.groupBoxProperties.TabIndex = 19;

+			this.groupBoxProperties.TabStop = false;

+			this.groupBoxProperties.Text = "Properties";

+			// 

+			// toolBarProperties

+			// 

+			this.toolBarProperties.Anchor = ((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.toolBarProperties.Buttons.AddRange(new System.Windows.Forms.ToolBarButton[] {

+																								 this.toolBarButtonNewProperty,

+																								 this.toolBarButtonEditProperty,

+																								 this.toolBarButtonRemoveProperty});

+			this.toolBarProperties.Divider = false;

+			this.toolBarProperties.Dock = System.Windows.Forms.DockStyle.None;

+			this.toolBarProperties.DropDownArrows = true;

+			this.toolBarProperties.Location = new System.Drawing.Point(8, 16);

+			this.toolBarProperties.Name = "toolBarProperties";

+			this.toolBarProperties.ShowToolTips = true;

+			this.toolBarProperties.Size = new System.Drawing.Size(392, 23);

+			this.toolBarProperties.TabIndex = 2;

+			this.toolBarProperties.TextAlign = System.Windows.Forms.ToolBarTextAlign.Right;

+			this.toolBarProperties.ButtonClick += new System.Windows.Forms.ToolBarButtonClickEventHandler(this.toolBarProperties_ButtonClick);

+			// 

+			// toolBarButtonNewProperty

+			// 

+			this.toolBarButtonNewProperty.ImageIndex = 0;

+			this.toolBarButtonNewProperty.ToolTipText = "New Property";

+			// 

+			// toolBarButtonEditProperty

+			// 

+			this.toolBarButtonEditProperty.Enabled = false;

+			this.toolBarButtonEditProperty.ImageIndex = 1;

+			this.toolBarButtonEditProperty.ToolTipText = "Edit Property";

+			// 

+			// toolBarButtonRemoveProperty

+			// 

+			this.toolBarButtonRemoveProperty.Enabled = false;

+			this.toolBarButtonRemoveProperty.ImageIndex = 2;

+			this.toolBarButtonRemoveProperty.ToolTipText = "Remove Property";

+			// 

+			// listViewProperties

+			// 

+			this.listViewProperties.Anchor = (((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) 

+				| System.Windows.Forms.AnchorStyles.Left) 

+				| System.Windows.Forms.AnchorStyles.Right);

+			this.listViewProperties.Columns.AddRange(new System.Windows.Forms.ColumnHeader[] {

+																								 this.columnHeaderName,

+																								 this.columnHeaderValue});

+			this.listViewProperties.FullRowSelect = true;

+			this.listViewProperties.GridLines = true;

+			this.listViewProperties.HeaderStyle = System.Windows.Forms.ColumnHeaderStyle.Nonclickable;

+			this.listViewProperties.Location = new System.Drawing.Point(8, 40);

+			this.listViewProperties.Name = "listViewProperties";

+			this.listViewProperties.Size = new System.Drawing.Size(392, 120);

+			this.listViewProperties.TabIndex = 1;

+			this.listViewProperties.View = System.Windows.Forms.View.Details;

+			this.listViewProperties.SelectedIndexChanged += new System.EventHandler(this.listViewProperties_SelectedIndexChanged);

+			// 

+			// columnHeaderName

+			// 

+			this.columnHeaderName.Text = "Name";

+			this.columnHeaderName.Width = 171;

+			// 

+			// columnHeaderValue

+			// 

+			this.columnHeaderValue.Text = "Value";

+			this.columnHeaderValue.Width = 217;

+			// 

+			// ProjectOptionsForm

+			// 

+			this.AcceptButton = this.buttonOK;

+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);

+			this.CancelButton = this.buttonCancel;

+			this.ClientSize = new System.Drawing.Size(426, 423);

+			this.Controls.AddRange(new System.Windows.Forms.Control[] {

+																		  this.groupBoxProperties,

+																		  this.groupBoxAssemblies,

+																		  this.buttonApply,

+																		  this.buttonCancel,

+																		  this.buttonOK,

+																		  this.groupBoxDirectories});

+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

+			this.MaximizeBox = false;

+			this.Name = "ProjectOptionsForm";

+			this.SizeGripStyle = System.Windows.Forms.SizeGripStyle.Hide;

+			this.Text = "Monodoc Project Options";

+			this.groupBoxAssemblies.ResumeLayout(false);

+			this.groupBoxDirectories.ResumeLayout(false);

+			this.groupBoxProperties.ResumeLayout(false);

+			this.ResumeLayout(false);

+

+		}

+		#endregion

+

+		#region Private Instance Methods

+

+		private void SaveProjectChanges()

+		{

+			project.AssemblyFiles.Clear();

+

+			foreach (string assemblyFile in this.listBoxAssembliesToDocument.Items)

+			{

+				project.AssemblyFiles.Add(assemblyFile);

+			}

+

+			project.XmlDirectories.Clear();

+			

+			foreach (string xmlDir in this.listBoxXmlSourceDirectories.Items)

+			{

+				project.XmlDirectories.Add(xmlDir);

+			}

+

+			project.Properties.Clear();

+

+			foreach (ListViewItem prop in this.listViewProperties.Items)

+			{

+				project.Properties[prop.SubItems[0].Text] = prop.SubItems[1].Text;

+			}

+

+			project.IsModified = true;

+			this.isModified    = false;

+		}

+

+		#endregion // Private Instance Methods

+

+		private void buttonCancel_Click(object sender, System.EventArgs e)

+		{

+			this.Close();

+		}

+

+		private void buttonApply_Click(object sender, System.EventArgs e)

+		{

+			if (this.isModified)

+			{

+				SaveProjectChanges();

+			}

+		}

+

+		private void buttonOK_Click(object sender, System.EventArgs e)

+		{

+			if (this.isModified)

+			{

+				SaveProjectChanges();

+			}

+

+			this.Close();

+		}

+

+		private void buttonAssemblyAdd_Click(object sender, System.EventArgs e)

+		{

+			OpenFileDialog open = new OpenFileDialog();

+			open.Filter         = "Assembly Files (*.dll; *.exe)|*.dll; *.exe|All Files (*.*)|*.*";

+

+			if (open.ShowDialog() == DialogResult.OK)

+			{

+				this.listBoxAssembliesToDocument.Items.Add(open.FileName);

+				this.isModified = true;

+			}

+		}

+

+		private void buttonAssemblyRemove_Click(object sender, System.EventArgs e)

+		{

+			this.listBoxAssembliesToDocument.Items.Remove(

+				this.listBoxAssembliesToDocument.SelectedItem

+				);

+			this.isModified = true;

+		}

+

+		private void buttonDirectoryAdd_Click(object sender, System.EventArgs e)

+		{

+			DirectorySelectorForm dirSel = new DirectorySelectorForm();

+			

+			if (dirSel.ShowDialog() == DialogResult.OK)

+			{

+				this.listBoxXmlSourceDirectories.Items.Add(dirSel.DirectoryName);

+				this.isModified = true;

+			}

+

+			dirSel.Dispose();

+		}

+		private void buttonDirectoryRemove_Click(object sender, System.EventArgs e)

+		{

+			this.listBoxXmlSourceDirectories.Items.Remove(

+				this.listBoxXmlSourceDirectories.SelectedItem

+				);

+			this.isModified = true;

+		}

+

+		private void toolBarProperties_ButtonClick(object sender, System.Windows.Forms.ToolBarButtonClickEventArgs e)

+		{

+			if (e.Button == toolBarButtonNewProperty)

+			{

+				EditPropertyForm edit = new EditPropertyForm();

+

+				if (edit.ShowDialog() == DialogResult.OK)

+				{

+					ListViewItem item = null;

+

+					foreach (ListViewItem existingItem in this.listViewProperties.Items)

+					{

+						if (existingItem.Text == edit.PropertyName)

+						{

+							item = existingItem;

+							break;

+						}

+					}

+

+					if (item != null)

+					{

+						DialogResult dr = MessageBox.Show(

+							"A property named " + edit.PropertyName + " already exists.  Overwrite?",

+							"Property Exists", MessageBoxButtons.YesNo, MessageBoxIcon.Question

+							);

+

+						if (dr == DialogResult.Yes && item.SubItems[1].Text != edit.PropertyValue)

+						{

+							item.SubItems[0].Text = edit.PropertyName;

+							item.SubItems[1].Text = edit.PropertyValue;

+							this.isModified       = true;

+						}

+					}

+					else

+					{

+						ListViewItem newProperty = new ListViewItem(edit.PropertyName);

+						

+						newProperty.SubItems.Add(edit.PropertyValue);

+						this.listViewProperties.Items.Add(newProperty);

+						

+						newProperty.Selected = true;

+						this.isModified      = true;

+					}

+				}

+

+				edit.Dispose();

+			}

+			else if (e.Button == toolBarButtonEditProperty)

+			{

+				if (this.listViewProperties.SelectedItems.Count > 0)

+				{

+					ListViewItem selectedItem = this.listViewProperties.SelectedItems[0];

+					EditPropertyForm edit     = new EditPropertyForm();

+					edit.PropertyName         = selectedItem.SubItems[0].Text;

+					edit.PropertyValue        = selectedItem.SubItems[1].Text;

+

+					if (edit.ShowDialog(this) == DialogResult.OK &&

+						(selectedItem.SubItems[0].Text != edit.PropertyName ||

+						 selectedItem.SubItems[1].Text != edit.PropertyValue))

+					{

+						selectedItem.SubItems[0].Text = edit.PropertyName;

+						selectedItem.SubItems[1].Text = edit.PropertyValue;

+						selectedItem.Selected         = true;

+						this.isModified               = true;

+					}

+

+					edit.Dispose();

+				}

+			}

+			else if (e.Button == toolBarButtonRemoveProperty)

+			{

+				foreach (ListViewItem item in this.listViewProperties.SelectedItems)

+				{

+					item.Remove();

+				}

+			}

+		}

+

+		private void listViewProperties_SelectedIndexChanged(object sender, System.EventArgs e)

+		{

+			if (this.listViewProperties.SelectedItems.Count > 0)

+			{

+				this.toolBarButtonEditProperty.Enabled   = true;

+				this.toolBarButtonRemoveProperty.Enabled = true;

+			}

+			else

+			{

+				this.toolBarButtonEditProperty.Enabled   = false;

+				this.toolBarButtonRemoveProperty.Enabled = false;

+			}

+		}

+	}

+}

diff --git a/mcs/doctools/src/Gui/TypeEditorForm.cs b/mcs/doctools/src/Gui/TypeEditorForm.cs
new file mode 100644
index 00000000000..7fa9784276e
--- /dev/null
+++ b/mcs/doctools/src/Gui/TypeEditorForm.cs
@@ -0,0 +1,120 @@
+// TypeEditorForm.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+

+namespace Mono.Doc.Gui

+{

+	public class TypeEditorForm : GenericEditorForm

+	{

+		private System.Windows.Forms.Label labelMembers;

+		private System.Windows.Forms.ComboBox comboBoxMembers;

+

+		private void InitializeComponent()

+		{

+			this.labelMembers = new System.Windows.Forms.Label();

+			this.comboBoxMembers = new System.Windows.Forms.ComboBox();

+			this.SuspendLayout();

+			// 

+			// toolBar

+			// 

+			//this.toolBar.ButtonSize = new System.Drawing.Size(43, 22);

+			this.toolBar.Visible = true;

+			// 

+			// labelSummary

+			// 

+			this.labelSummary.Visible = true;

+			// 

+			// textBoxSummary

+			// 

+			this.textBoxSummary.Visible = true;

+			// 

+			// labelRemarks

+			// 

+			this.labelRemarks.Visible = true;

+			// 

+			// textBoxRemarks

+			// 

+			this.textBoxRemarks.Visible = true;

+			// 

+			// labelSeeAlso

+			// 

+			this.labelSeeAlso.Visible = true;

+			// 

+			// comboBoxLanguage

+			// 

+			this.comboBoxLanguage.ItemHeight = 13;

+			this.comboBoxLanguage.Visible = true;

+			// 

+			// labelLanguage

+			// 

+			this.labelLanguage.Location = new System.Drawing.Point(232, 34);

+			this.labelLanguage.Size = new System.Drawing.Size(72, 16);

+			this.labelLanguage.Visible = true;

+			// 

+			// listView1

+			// 

+			this.listViewSeeAlso.Visible = true;

+			// 

+			// labelMembers

+			// 

+			this.labelMembers.Location = new System.Drawing.Point(8, 34);

+			this.labelMembers.Name = "labelMembers";

+			this.labelMembers.Size = new System.Drawing.Size(56, 16);

+			this.labelMembers.TabIndex = 10;

+			this.labelMembers.Text = "Members:";

+			// 

+			// comboBoxMembers

+			// 

+			this.comboBoxMembers.Location = new System.Drawing.Point(64, 32);

+			this.comboBoxMembers.Name = "comboBoxMembers";

+			this.comboBoxMembers.Size = new System.Drawing.Size(168, 21);

+			this.comboBoxMembers.TabIndex = 11;

+			this.comboBoxMembers.Text = "comboBox1";

+			// 

+			// TypeEditorForm

+			// 

+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);

+			this.ClientSize = new System.Drawing.Size(432, 469);

+			this.Controls.AddRange(new System.Windows.Forms.Control[] {

+																		  this.listViewSeeAlso,

+																		  this.labelLanguage,

+																		  this.comboBoxLanguage,

+																		  this.labelSeeAlso,

+																		  this.textBoxRemarks,

+																		  this.labelRemarks,

+																		  this.textBoxSummary,

+																		  this.labelSummary,

+																		  this.toolBar,

+																		  this.comboBoxMembers,

+																		  this.labelMembers});

+			this.Name = "TypeEditorForm";

+			this.Text = "TypeEditorForm";

+			this.ResumeLayout(false);

+

+		}

+	

+		public TypeEditorForm() : base()

+		{

+			InitializeComponent();

+		}

+	}

+}

diff --git a/mcs/doctools/src/Gui/UnexpectedErrorForm.cs b/mcs/doctools/src/Gui/UnexpectedErrorForm.cs
new file mode 100644
index 00000000000..1d692fa86d1
--- /dev/null
+++ b/mcs/doctools/src/Gui/UnexpectedErrorForm.cs
@@ -0,0 +1,203 @@
+// UnexpectedErrorForm.cs

+// John Barnette (jbarn@httcb.net)

+// 

+// Copyright (c) 2002 John Barnette

+//

+// This file is part of Monodoc, a multilingual API documentation tool.

+//

+// Monodoc is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+// 

+// Monodoc is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+// 

+// You should have received a copy of the GNU General Public License

+// along with Monodoc; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+

+using System;

+using System.Drawing;

+using System.Collections;

+using System.ComponentModel;

+using System.Windows.Forms;

+

+namespace Mono.Doc.Gui

+{

+	/// <summary>

+	/// Summary description for UnexpectedErrorForm.

+	/// </summary>

+	public class UnexpectedErrorForm : System.Windows.Forms.Form

+	{

+		private System.Windows.Forms.PictureBox pictureBoxExplosion;

+		private System.Windows.Forms.Label labelErrorExplanation;

+		private System.Windows.Forms.TextBox textBoxErrorMessage;

+		private System.Windows.Forms.Button buttonSendErrorReport;

+		private System.Windows.Forms.Button buttonQuit;

+		private System.Windows.Forms.Button buttonContinue;

+		/// <summary>

+		/// Required designer variable.

+		/// </summary>

+		private System.ComponentModel.Container components = null;

+

+		public UnexpectedErrorForm(Exception e)

+		{

+			//

+			// Required for Windows Form Designer support

+			//

+			InitializeComponent();

+

+			//

+			// TODO: Add any constructor code after InitializeComponent call

+			//

+

+			this.pictureBoxExplosion.Image = GuiResources.ErrorExplosionBitmap;

+

+			this.textBoxErrorMessage.Text +=

+				"Exception: " + e.GetType().FullName + "\n" +

+				"Message: " + e.Message + "\n\n" +

+				"Stack Trace: \n" + e.StackTrace + "\n\n";

+

+			while (e.InnerException != null)

+			{

+				e = e.InnerException;

+				this.textBoxErrorMessage.Text +=

+					"--- NESTED EXCEPTION ---\n" +

+					"Exception: " + e.GetType().FullName + "\n" +

+					"Message: " + e.Message + "\n\n" +

+					"Stack Trace: \n" + e.StackTrace + "\n\n";

+			}

+		}

+

+		/// <summary>

+		/// Clean up any resources being used.

+		/// </summary>

+		protected override void Dispose( bool disposing )

+		{

+			if( disposing )

+			{

+				if(components != null)

+				{

+					components.Dispose();

+				}

+			}

+			base.Dispose( disposing );

+		}

+

+		#region Windows Form Designer generated code

+		/// <summary>

+		/// Required method for Designer support - do not modify

+		/// the contents of this method with the code editor.

+		/// </summary>

+		private void InitializeComponent()

+		{

+			this.pictureBoxExplosion = new System.Windows.Forms.PictureBox();

+			this.labelErrorExplanation = new System.Windows.Forms.Label();

+			this.textBoxErrorMessage = new System.Windows.Forms.TextBox();

+			this.buttonQuit = new System.Windows.Forms.Button();

+			this.buttonSendErrorReport = new System.Windows.Forms.Button();

+			this.buttonContinue = new System.Windows.Forms.Button();

+			this.SuspendLayout();

+			// 

+			// pictureBoxExplosion

+			// 

+			this.pictureBoxExplosion.Location = new System.Drawing.Point(8, 8);

+			this.pictureBoxExplosion.Name = "pictureBoxExplosion";

+			this.pictureBoxExplosion.Size = new System.Drawing.Size(65, 64);

+			this.pictureBoxExplosion.TabIndex = 0;

+			this.pictureBoxExplosion.TabStop = false;

+			// 

+			// labelErrorExplanation

+			// 

+			this.labelErrorExplanation.Anchor = (System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right);

+			this.labelErrorExplanation.Location = new System.Drawing.Point(96, 8);

+			this.labelErrorExplanation.Name = "labelErrorExplanation";

+			this.labelErrorExplanation.Size = new System.Drawing.Size(216, 64);

+			this.labelErrorExplanation.TabIndex = 1;

+			this.labelErrorExplanation.Text = "Kaboom!  Monodoc has thrown an unexpected exception.  Seeing as we\'re in heavy de" +

+				"velopment, this is hardly surprising.  Relevant debugging information follows.";

+			// 

+			// textBoxErrorMessage

+			// 

+			this.textBoxErrorMessage.AcceptsReturn = true;

+			this.textBoxErrorMessage.Location = new System.Drawing.Point(8, 88);

+			this.textBoxErrorMessage.Multiline = true;

+			this.textBoxErrorMessage.Name = "textBoxErrorMessage";

+			this.textBoxErrorMessage.ReadOnly = true;

+			this.textBoxErrorMessage.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;

+			this.textBoxErrorMessage.Size = new System.Drawing.Size(304, 216);

+			this.textBoxErrorMessage.TabIndex = 2;

+			this.textBoxErrorMessage.Text = "";

+			// 

+			// buttonQuit

+			// 

+			this.buttonQuit.DialogResult = System.Windows.Forms.DialogResult.Cancel;

+			this.buttonQuit.Location = new System.Drawing.Point(144, 312);

+			this.buttonQuit.Name = "buttonQuit";

+			this.buttonQuit.TabIndex = 3;

+			this.buttonQuit.Text = "Quit";

+			this.buttonQuit.Click += new System.EventHandler(this.buttonExit_Click);

+			// 

+			// buttonSendErrorReport

+			// 

+			this.buttonSendErrorReport.DialogResult = System.Windows.Forms.DialogResult.Cancel;

+			this.buttonSendErrorReport.Location = new System.Drawing.Point(8, 312);

+			this.buttonSendErrorReport.Name = "buttonSendErrorReport";

+			this.buttonSendErrorReport.Size = new System.Drawing.Size(117, 23);

+			this.buttonSendErrorReport.TabIndex = 4;

+			this.buttonSendErrorReport.Text = "Send Error Report";

+			this.buttonSendErrorReport.Click += new System.EventHandler(this.buttonSendErrorReport_Click);

+			// 

+			// buttonContinue

+			// 

+			this.buttonContinue.DialogResult = System.Windows.Forms.DialogResult.Cancel;

+			this.buttonContinue.Location = new System.Drawing.Point(232, 312);

+			this.buttonContinue.Name = "buttonContinue";

+			this.buttonContinue.TabIndex = 5;

+			this.buttonContinue.Text = "Continue";

+			this.buttonContinue.Click += new System.EventHandler(this.buttonContinue_Click);

+			// 

+			// UnexpectedErrorForm

+			// 

+			this.AcceptButton = this.buttonQuit;

+			this.AutoScaleBaseSize = new System.Drawing.Size(5, 13);

+			this.CancelButton = this.buttonContinue;

+			this.ClientSize = new System.Drawing.Size(320, 341);

+			this.Controls.AddRange(new System.Windows.Forms.Control[] {

+																		  this.buttonContinue,

+																		  this.buttonSendErrorReport,

+																		  this.buttonQuit,

+																		  this.textBoxErrorMessage,

+																		  this.labelErrorExplanation,

+																		  this.pictureBoxExplosion});

+			this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle;

+			this.MaximizeBox = false;

+			this.MinimizeBox = false;

+			this.Name = "UnexpectedErrorForm";

+			this.Text = "Monodoc Error";

+			this.ResumeLayout(false);

+

+		}

+		#endregion

+

+		private void buttonExit_Click(object sender, System.EventArgs e)

+		{

+			Application.Exit();

+		}

+

+		private void buttonSendErrorReport_Click(object sender, System.EventArgs e)

+		{

+			MessageBox.Show("TODO: This is coming, as soon as I figure out the best " +

+				"delivery mechanism.  Promise.", "Unimplemented Feature"

+				);

+		}

+

+		private void buttonContinue_Click(object sender, System.EventArgs e)

+		{

+			MessageBox.Show("TODO: implement continue.", "Unimplemented Feature");

+		}

+	}

+}

diff --git a/mcs/doctools/src/doctools.sln b/mcs/doctools/src/doctools.sln
new file mode 100644
index 00000000000..ea182e32103
--- /dev/null
+++ b/mcs/doctools/src/doctools.sln
@@ -0,0 +1,33 @@
+Microsoft Visual Studio Solution File, Format Version 7.00

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Gui", "Gui\Gui.csproj", "{B76CBA27-ABBD-45FE-AFC3-A629BC13BAAE}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Core", "Core\Core.csproj", "{73F5A60D-A5E3-4852-B4C6-478275E733F9}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "xmltest", "xmltest\xmltest.csproj", "{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}"

+EndProject

+Global

+	GlobalSection(SolutionConfiguration) = preSolution

+		ConfigName.0 = Debug

+		ConfigName.1 = Release

+	EndGlobalSection

+	GlobalSection(ProjectDependencies) = postSolution

+	EndGlobalSection

+	GlobalSection(ProjectConfiguration) = postSolution

+		{B76CBA27-ABBD-45FE-AFC3-A629BC13BAAE}.Debug.ActiveCfg = Release|.NET

+		{B76CBA27-ABBD-45FE-AFC3-A629BC13BAAE}.Debug.Build.0 = Release|.NET

+		{B76CBA27-ABBD-45FE-AFC3-A629BC13BAAE}.Release.ActiveCfg = Release|.NET

+		{B76CBA27-ABBD-45FE-AFC3-A629BC13BAAE}.Release.Build.0 = Release|.NET

+		{73F5A60D-A5E3-4852-B4C6-478275E733F9}.Debug.ActiveCfg = Release|.NET

+		{73F5A60D-A5E3-4852-B4C6-478275E733F9}.Debug.Build.0 = Release|.NET

+		{73F5A60D-A5E3-4852-B4C6-478275E733F9}.Release.ActiveCfg = Release|.NET

+		{73F5A60D-A5E3-4852-B4C6-478275E733F9}.Release.Build.0 = Release|.NET

+		{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}.Debug.ActiveCfg = Debug|.NET

+		{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}.Debug.Build.0 = Debug|.NET

+		{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}.Release.ActiveCfg = Release|.NET

+		{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}.Release.Build.0 = Release|.NET

+	EndGlobalSection

+	GlobalSection(ExtensibilityGlobals) = postSolution

+	EndGlobalSection

+	GlobalSection(ExtensibilityAddIns) = postSolution

+	EndGlobalSection

+EndGlobal

diff --git a/mcs/doctools/src/xmltest/Driver.cs b/mcs/doctools/src/xmltest/Driver.cs
new file mode 100644
index 00000000000..542ecc92f63
--- /dev/null
+++ b/mcs/doctools/src/xmltest/Driver.cs
@@ -0,0 +1,38 @@
+using System;

+using System.Xml.Serialization;

+

+using Mono.Doc.Core;

+

+namespace Mono.Doc.XmlTest

+{

+	public class Driver

+	{

+		private static string assemblyFile = 

+			@"D:\projects\mcs\doctools\build\System.Xml.dll";

+		private static string sampleClass = "System.Xml.XmlDocument";

+		private static string sampleEnum  = "System.Xml.WriteState";

+

+		public Driver()

+		{

+		}

+

+		public static void Main(string[] args)

+		{

+			AssemblyLoader loader = new AssemblyLoader(assemblyFile);

+			Type           t      = loader.Assembly.GetType(sampleClass, true, false);

+			MonodocFile    file   = new MonodocFile();

+			XmlSerializer  ser    = new XmlSerializer(file.GetType());

+			ClassDoc       aClass = new ClassDoc(t, loader);

+

+			file.Types.Add(aClass);

+

+			EnumDoc anEnum = new EnumDoc(loader.Assembly.GetType(sampleEnum, true, false), loader);

+

+			file.Types.Add(anEnum);

+

+			// serialize to stdout for now

+			ser.Serialize(Console.Out, file);

+			Console.WriteLine();

+		}

+	}

+}

diff --git a/mcs/doctools/src/xmltest/xmltest.csproj b/mcs/doctools/src/xmltest/xmltest.csproj
new file mode 100644
index 00000000000..b541b1b5d8e
--- /dev/null
+++ b/mcs/doctools/src/xmltest/xmltest.csproj
@@ -0,0 +1,93 @@
+<VisualStudioProject>

+    <CSHARP

+        ProjectType = "Local"

+        ProductVersion = "7.0.9466"

+        SchemaVersion = "1.0"

+        ProjectGuid = "{D83D563A-46E7-4CBA-87EE-FEA674A0CACE}"

+    >

+        <Build>

+            <Settings

+                ApplicationIcon = ""

+                AssemblyKeyContainerName = ""

+                AssemblyName = "xmltest"

+                AssemblyOriginatorKeyFile = ""

+                DefaultClientScript = "JScript"

+                DefaultHTMLPageLayout = "Grid"

+                DefaultTargetSchema = "IE50"

+                DelaySign = "false"

+                OutputType = "Exe"

+                RootNamespace = "Mono.Doc.XmlTest"

+                StartupObject = "Mono.Doc.XmlTest.Driver"

+            >

+                <Config

+                    Name = "Debug"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "DEBUG;TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "true"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "true"

+                    Optimize = "false"

+                    OutputPath = "..\..\build\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+                <Config

+                    Name = "Release"

+                    AllowUnsafeBlocks = "false"

+                    BaseAddress = "285212672"

+                    CheckForOverflowUnderflow = "false"

+                    ConfigurationOverrideFile = ""

+                    DefineConstants = "TRACE"

+                    DocumentationFile = ""

+                    DebugSymbols = "false"

+                    FileAlignment = "4096"

+                    IncrementalBuild = "false"

+                    Optimize = "true"

+                    OutputPath = "bin\Release\"

+                    RegisterForComInterop = "false"

+                    RemoveIntegerChecks = "false"

+                    TreatWarningsAsErrors = "false"

+                    WarningLevel = "4"

+                />

+            </Settings>

+            <References>

+                <Reference

+                    Name = "System"

+                    AssemblyName = "System"

+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.dll"

+                />

+                <Reference

+                    Name = "System.Data"

+                    AssemblyName = "System.Data"

+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"

+                />

+                <Reference

+                    Name = "System.XML"

+                    AssemblyName = "System.XML"

+                    HintPath = "C:\WINDOWS\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"

+                />

+                <Reference

+                    Name = "Core"

+                    Project = "{73F5A60D-A5E3-4852-B4C6-478275E733F9}"

+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"

+                />

+            </References>

+        </Build>

+        <Files>

+            <Include>

+                <File

+                    RelPath = "Driver.cs"

+                    SubType = "Code"

+                    BuildAction = "Compile"

+                />

+            </Include>

+        </Files>

+    </CSHARP>

+</VisualStudioProject>

+

diff --git a/mcs/errors/1529.cs b/mcs/errors/1529.cs
new file mode 100755
index 00000000000..06dd1f74a89
--- /dev/null
+++ b/mcs/errors/1529.cs
@@ -0,0 +1,4 @@
+// cs1529.cs: Using clause must precede all other namespace elements
+// Line:
+class X { }
+using System;
diff --git a/mcs/errors/ChangeLog b/mcs/errors/ChangeLog
new file mode 100644
index 00000000000..43f54af9f73
--- /dev/null
+++ b/mcs/errors/ChangeLog
@@ -0,0 +1,48 @@
+2002-08-19  Ravi Pratap  <ravi@ximian.com>
+
+	* error-4.cs : New test.
+
+	* error-5.cs : New test.
+
+2002-08-11  Martin Baulig  <martin@gnome.org>
+
+	* error-3.cs: New test.
+
+2002-08-08  Martin Baulig  <martin@gnome.org>
+
+	* cs1540.cs: New test.
+
+2002-08-08  Martin Baulig  <martin@gnome.org>
+
+	* cs0236.cs: New test.
+
+2002-08-05  Martin Baulig  <martin@gnome.org>
+
+	* runtest.pl: This is a perl script which runs a testcase, parses the
+	MCS output and checks whether all errors are reported.
+
+	* error-1.cs, error-2.cs: Moved here from ../tests/.
+
+	* README.tests: Added (empty) list of all test cases.
+
+2002-08-02  Martin Baulig  <martin@gnome.org>
+
+	* cs0155.cs, cs0155-2.cs: New tests.
+
+2002-07-06  Andrew Birkett  <adb@tardis.ed.ac.uk>
+
+	* cs1039.cs, cs1033.cs, cs1010.cs: New tests.
+
+2002-06-26    <adb@tardis.ed.ac.uk>
+
+	* cs1501-3.cs: Added new test for struct ctr typechecks.
+
+2002-06-24  Andrew Birkett  <adb@tardis.ed.ac.uk>
+
+	* fail: cs0121.cs, cs0157.cs and cs1501.cs no longer fail.  
+	* cs0176.cs: Method has to be public for correct test
+	* cs0196.cs, cs0242.cs: Do 'return' to stop null statement warning.
+	* cs0255.cs: Add assignment to stop 'unused variable' warning.
+	* makefile: Output is now like "Running test 42 .. OK".  Added --unsafe to 
+	  make cs0193.cs, cs0196.cs and cs0214-3.cs work.
+
diff --git a/mcs/errors/README.tests b/mcs/errors/README.tests
new file mode 100644
index 00000000000..d8d1e384071
--- /dev/null
+++ b/mcs/errors/README.tests
@@ -0,0 +1,33 @@
+Test cases listed by Category:
+==============================
+
+* Flow Analysis
+
+  error-1.cs error-3.cs
+
+* Type Containers
+
+  error-2.cs
+
+Test cases listed by Number:
+============================
+
+error-1.cs
+----------
+Flow analysis: Check whether mcs correctly reports all errors.
+
+error-2.cs
+----------
+Base types are less accessible than the current type.
+
+error-3.cs
+----------
+Flow analysis: Check struct members.
+
+error-4.cs
+----------
+Ensure that we do not allow void types to be converted to anything else
+
+error-5.cs
+----------
+Catch invalid access to a private event of a class
diff --git a/mcs/errors/bug1.cs b/mcs/errors/bug1.cs
new file mode 100755
index 00000000000..934f0f9bce2
--- /dev/null
+++ b/mcs/errors/bug1.cs
@@ -0,0 +1,17 @@
+//
+// FIXED
+//
+interface A {
+	void B ();
+}
+
+interface X {
+	void B ();
+}
+
+
+class B : A, X {
+	void X.B () {}
+	void A.B () {}
+	
+}
diff --git a/mcs/errors/bug10.cs b/mcs/errors/bug10.cs
new file mode 100644
index 00000000000..5b2ff627ffa
--- /dev/null
+++ b/mcs/errors/bug10.cs
@@ -0,0 +1,30 @@
+//
+// fixed
+//
+using System;
+
+public class Blah {
+
+	public void Connect ()
+	{
+	}
+
+	public void Button1_Click (int i, int j)
+	{
+		Console.WriteLine ("Button1 was clicked !");
+		Console.WriteLine ("Answer : " + (i+j));
+	}
+
+	public static int Main ()
+	{
+		Blah b = new Blah ();
+
+		b.Connect ();
+
+		b.OnClick ();
+
+		Console.WriteLine ("Test passes");
+		return 0;
+	}
+	
+}
diff --git a/mcs/errors/bug11.cs b/mcs/errors/bug11.cs
new file mode 100755
index 00000000000..b48bc1893f7
--- /dev/null
+++ b/mcs/errors/bug11.cs
@@ -0,0 +1,23 @@
+//
+// fixed
+//
+class Location {
+	static public int Null {
+		get {
+			return 1;
+		}
+	}
+}
+
+class X {
+	Location Location;
+	X ()
+	{
+		int a = Location.Null;
+	}
+
+	static void Main () {}
+}
+	
+	
+	
diff --git a/mcs/errors/bug12.cs b/mcs/errors/bug12.cs
new file mode 100755
index 00000000000..27c24e93eb7
--- /dev/null
+++ b/mcs/errors/bug12.cs
@@ -0,0 +1,19 @@
+using System.Collections;
+
+	class PtrHashtable : Hashtable {
+		class PtrComparer : IComparer {
+			public int Compare (object x, object y)
+			{
+				if (x == y)
+					return 0;
+				else
+					return 1;
+			}
+		}
+		
+		public PtrHashtable ()
+		{
+			comparer = new PtrComparer ();
+		}
+	}
+
diff --git a/mcs/errors/bug13.cs b/mcs/errors/bug13.cs
new file mode 100755
index 00000000000..91016d0a7c7
--- /dev/null
+++ b/mcs/errors/bug13.cs
@@ -0,0 +1,11 @@
+using System;
+
+class X {
+	static void Main ()
+	{
+		Type t = null;
+
+		if (t.GetType () == null)
+			return;
+	}
+}
diff --git a/mcs/errors/bug14.cs b/mcs/errors/bug14.cs
new file mode 100755
index 00000000000..9167d9afbbf
--- /dev/null
+++ b/mcs/errors/bug14.cs
@@ -0,0 +1,15 @@
+//
+// fixed
+//
+using System;
+
+class X {
+
+	static void Main ()
+	{
+		string msg = String.Format ("{0} {1} {2} {3}", "one", 3, 3, "two");
+
+		Console.WriteLine (msg);
+	}
+}
+	
diff --git a/mcs/errors/bug15.cs b/mcs/errors/bug15.cs
new file mode 100755
index 00000000000..d233407af32
--- /dev/null
+++ b/mcs/errors/bug15.cs
@@ -0,0 +1,25 @@
+//
+// fixed
+//
+using System;
+
+class X {
+
+	void A ()
+	{
+	}
+				
+	static void Main ()
+	{
+		int loop = 0;
+		
+		goto a;
+	b:
+		loop++;
+	a:
+		Console.WriteLine ("Hello");
+		for (;;){
+			goto b;
+		}
+	}
+}
diff --git a/mcs/errors/bug16.cs b/mcs/errors/bug16.cs
new file mode 100644
index 00000000000..4b8503cf127
--- /dev/null
+++ b/mcs/errors/bug16.cs
@@ -0,0 +1,24 @@
+//
+// Fixed
+//
+
+using System;
+
+public class Blah {
+	
+	public static void Main ()
+	{
+		ushort i;
+		sbyte  j;
+		
+		i = 10;
+		j = 20;
+
+		Console.WriteLine (i);
+		Console.WriteLine (j);
+		
+		Console.WriteLine ("Hello there !");
+	}	
+}
+
+		
diff --git a/mcs/errors/bug17.cs b/mcs/errors/bug17.cs
new file mode 100755
index 00000000000..d922487cf34
--- /dev/null
+++ b/mcs/errors/bug17.cs
@@ -0,0 +1,10 @@
+//
+// Fixed
+//
+class X {
+	static void Main ()
+	{
+double x = 64.0;
+System.Console.WriteLine("x = " + x.ToBoolean(null));
+}
+}
diff --git a/mcs/errors/bug18.cs b/mcs/errors/bug18.cs
new file mode 100755
index 00000000000..61e0f0af006
--- /dev/null
+++ b/mcs/errors/bug18.cs
@@ -0,0 +1,16 @@
+namespace A {
+	interface B {
+	}
+}
+
+class X {
+	static void A (object A)
+	{
+		object x = (A.B) A;
+	}
+
+	static void Main ()
+	{
+	}
+}
+
diff --git a/mcs/errors/bug19.cs b/mcs/errors/bug19.cs
new file mode 100755
index 00000000000..15755b6faaa
--- /dev/null
+++ b/mcs/errors/bug19.cs
@@ -0,0 +1,18 @@
+namespace N1
+{	
+	public enum A
+	{
+		A_1, A_2, A_3
+	}
+
+	public class B
+	{
+		const A b = A.A_1;
+	}
+}
+
+
+
+
+
+
diff --git a/mcs/errors/bug2.cs b/mcs/errors/bug2.cs
new file mode 100755
index 00000000000..61f6eea2bce
--- /dev/null
+++ b/mcs/errors/bug2.cs
@@ -0,0 +1,29 @@
+//
+// fixed
+//
+class X {
+
+	static void A (ref int a)
+	{
+		a++;
+	}
+
+	// Int32&
+	static void B (ref int a)
+	{
+		// Int32&&
+		A (ref a);
+	}
+
+	static int Main ()
+	{
+		int a = 10;
+
+		B (ref a);
+
+		if (a == 11)
+			return 0;
+		else
+			return 1;
+	}
+}
diff --git a/mcs/errors/bug3.cs b/mcs/errors/bug3.cs
new file mode 100755
index 00000000000..af24ecc011b
--- /dev/null
+++ b/mcs/errors/bug3.cs
@@ -0,0 +1,36 @@
+// 
+// Fixed, incorporated into test
+//
+using System;
+
+using System.Runtime.InteropServices;
+
+[StructLayout (LayoutKind.Explicit)]
+struct A {
+	[FieldOffset (0)]
+	public int a;
+	[FieldOffset (0)]
+	public byte b1;
+	[FieldOffset (1)]
+	public byte b2;
+	[FieldOffset (2)]
+	public byte b3;
+	[FieldOffset (3)]
+	public byte b4;
+}
+
+class X {
+	static void Main ()
+	{
+		A a = new A ();
+
+		a.a = 0x12345678;
+
+		Console.WriteLine ("b1: " + a.b1);
+		Console.WriteLine ("b2: " + a.b2);
+		Console.WriteLine ("b3: " + a.b3);
+		Console.WriteLine ("b4: " + a.b4);
+		
+	}
+}
+	
diff --git a/mcs/errors/bug4.cs b/mcs/errors/bug4.cs
new file mode 100755
index 00000000000..775cfe30349
--- /dev/null
+++ b/mcs/errors/bug4.cs
@@ -0,0 +1,18 @@
+//
+// Fixed
+//
+using System;
+
+class X {
+	static void Main ()
+	{
+		try {
+			throw new Exception ();
+		} catch (Exception e) {
+			Console.WriteLine ("Caught");
+			throw;
+		} catch {
+			Console.WriteLine ("Again");
+		}
+	}
+}
diff --git a/mcs/errors/bug5.cs b/mcs/errors/bug5.cs
new file mode 100755
index 00000000000..03fce159750
--- /dev/null
+++ b/mcs/errors/bug5.cs
@@ -0,0 +1,23 @@
+//
+// fixed
+//
+interface I {
+	void a ();
+}
+
+abstract class X : I {
+	public abstract void a ();
+}
+
+class Y : X {
+	override public void a () {
+		System.Console.WriteLine ("Hello!");
+		return;
+	}
+
+	static void Main () {
+		Y y = new Y ();
+
+		((I) y ).a ();
+	}
+}
diff --git a/mcs/errors/bug6.cs b/mcs/errors/bug6.cs
new file mode 100755
index 00000000000..9cbf071393d
--- /dev/null
+++ b/mcs/errors/bug6.cs
@@ -0,0 +1,14 @@
+//
+// fixed
+//
+public class X {
+
+	public enum Blah { A }
+
+}
+
+public class Y : X {
+
+	Blah x;
+	
+}
diff --git a/mcs/errors/bug7.cs b/mcs/errors/bug7.cs
new file mode 100755
index 00000000000..fcd35bc6cdb
--- /dev/null
+++ b/mcs/errors/bug7.cs
@@ -0,0 +1,13 @@
+public enum X :byte {
+	a, b
+}
+
+public class Y {
+
+	const X myconst = X.a;
+
+	static void Main ()
+	{
+	}
+}
+
diff --git a/mcs/errors/bug8.cs b/mcs/errors/bug8.cs
new file mode 100755
index 00000000000..47846f7c4c9
--- /dev/null
+++ b/mcs/errors/bug8.cs
@@ -0,0 +1,20 @@
+using System;
+
+//
+// The problem here is that `(Type)' is being recognized as a Property
+// but inside a Cast expression this is invalid.
+//
+class X {
+
+	int Type {
+		get {
+			return 1;
+		}
+	}
+
+	static void Main ()
+	{
+		Type t = (Type) null;
+	}
+
+}
diff --git a/mcs/errors/bug9.cs b/mcs/errors/bug9.cs
new file mode 100755
index 00000000000..f0c436a1ad0
--- /dev/null
+++ b/mcs/errors/bug9.cs
@@ -0,0 +1,7 @@
+enum A {
+a, b
+}
+
+class X {
+	const A a = A.a;
+}
diff --git a/mcs/errors/cs-11.cs b/mcs/errors/cs-11.cs
new file mode 100644
index 00000000000..5adc40a2573
--- /dev/null
+++ b/mcs/errors/cs-11.cs
@@ -0,0 +1,20 @@
+// cs-11.cs : Delegate creation expression takes only one argument
+// Line : 17
+
+public class Blah {
+
+	public delegate int MyDelegate (int i, int j);
+
+	public int Foo (int i, int j)
+	{
+		return i+j;
+	}
+
+	public static void Main ()
+	{
+		Blah i = new Blah ();
+
+		MyDelegate del = new MyDelegate ();
+	}
+}
+
diff --git a/mcs/errors/cs-12.cs b/mcs/errors/cs-12.cs
new file mode 100755
index 00000000000..fe4b09b37a2
--- /dev/null
+++ b/mcs/errors/cs-12.cs
@@ -0,0 +1,34 @@
+class Y {
+	byte b;
+	
+	public static implicit operator int (Y i)
+	{
+		return i.b;
+	}
+
+//	public static implicit operator byte (Y i)
+//	{
+//		return i.b;
+//	}
+
+	public Y (byte b)
+	{
+		this.b = b;
+	}			
+}
+
+class X {
+	static void Main ()
+	{
+		Y y = new Y (1);
+
+		switch (y){
+		case 0:
+			break;
+		case 1:
+			break;
+		}
+
+		int a = y;
+	}
+}
diff --git a/mcs/errors/cs0017.cs b/mcs/errors/cs0017.cs
new file mode 100755
index 00000000000..7942594be2f
--- /dev/null
+++ b/mcs/errors/cs0017.cs
@@ -0,0 +1,9 @@
+// cs0017.cs: Program has more than one entry point

+// Line: 7

+class X {

+static void Main () {}

+}

+class Y {

+static void Main () {

+}

+}

diff --git a/mcs/errors/cs0019-2.cs b/mcs/errors/cs0019-2.cs
new file mode 100755
index 00000000000..d9753a29a1c
--- /dev/null
+++ b/mcs/errors/cs0019-2.cs
@@ -0,0 +1,20 @@
+// cs0019.cs : Operator + cannot be applied to operands of type `int' and `Test.Zub'
+// Line : 11
+using System;
+
+class Test {
+
+	enum Zub :byte {
+		Foo = 99,
+		Bar,
+		Baz
+	}
+	
+
+	static void Main ()
+	{
+		int v = 1;
+		object foo = (v + Zub.Foo);
+	}
+}
+	
diff --git a/mcs/errors/cs0019-3.cs b/mcs/errors/cs0019-3.cs
new file mode 100755
index 00000000000..e49fde2ab13
--- /dev/null
+++ b/mcs/errors/cs0019-3.cs
@@ -0,0 +1,19 @@
+// cs0019.cs : Operator + cannot be applied to operands of type `int' and `Test.Zub'
+// Line : 11
+using System;
+
+class Test {
+
+	enum Zub :byte {
+		Foo = 99,
+		Bar,
+		Baz
+	}
+	
+
+	static void Main ()
+	{
+		object v = (Zub.Foo + Zub.Foo);
+	}
+}
+	
diff --git a/mcs/errors/cs0019-4.cs b/mcs/errors/cs0019-4.cs
new file mode 100755
index 00000000000..938735e69a2
--- /dev/null
+++ b/mcs/errors/cs0019-4.cs
@@ -0,0 +1,20 @@
+// cs0019.cs : Operator + cannot be applied to operands of type `int' and `Test.Zub'
+// Line : 11
+using System;
+
+class Test {
+
+	enum Zub :byte {
+		Foo = 99,
+		Bar,
+		Baz
+	}
+	
+
+	static void Main ()
+	{
+		Zub a = Zub.Foo, b = Zub.Bar;
+		object v = (a + b);
+	}
+}
+	
diff --git a/mcs/errors/cs0019-5.cs b/mcs/errors/cs0019-5.cs
new file mode 100755
index 00000000000..6b8da99ef80
--- /dev/null
+++ b/mcs/errors/cs0019-5.cs
@@ -0,0 +1,16 @@
+class X {
+}
+
+class Y {
+}
+
+class T {
+	static void Main ()
+	{
+		X x = new X ();
+		Y y = new Y ();
+
+		if (x == y){
+		}
+	}
+}
diff --git a/mcs/errors/cs0019.cs b/mcs/errors/cs0019.cs
new file mode 100644
index 00000000000..c3dbd4f9b93
--- /dev/null
+++ b/mcs/errors/cs0019.cs
@@ -0,0 +1,14 @@
+// cs0019.cs : Operator + cannot be applied to operands of type `Foo' and `int'
+// Line : 11
+
+public class Foo {
+
+	public static void Main ()
+	{
+		
+		Foo k = new Foo ();
+
+		int i = k + 6;
+		
+	}
+}
diff --git a/mcs/errors/cs0020.cs b/mcs/errors/cs0020.cs
new file mode 100755
index 00000000000..228401b453c
--- /dev/null
+++ b/mcs/errors/cs0020.cs
@@ -0,0 +1,12 @@
+// cs0020.cs : Division by constant zero.
+// Line : 999999999
+
+using System;
+
+public class X {
+	static void Main ()
+	{
+		int i = 1 / 0;
+		Console.WriteLine (i);
+	}
+}
diff --git a/mcs/errors/cs0023.cs b/mcs/errors/cs0023.cs
new file mode 100644
index 00000000000..6a2cd5518c9
--- /dev/null
+++ b/mcs/errors/cs0023.cs
@@ -0,0 +1,13 @@
+// cs0023.cs : Operator ~ cannot be applied to operand of type `Foo'
+// Line : 10
+
+public class Foo {
+
+	public static void Main ()
+	{
+		Foo k = new Foo ();
+		
+		int i = ~ k;
+
+	}
+}
diff --git a/mcs/errors/cs0026-2.cs b/mcs/errors/cs0026-2.cs
new file mode 100755
index 00000000000..a4f41cdb51d
--- /dev/null
+++ b/mcs/errors/cs0026-2.cs
@@ -0,0 +1,10 @@
+// cs0026: use of this is not allowed in a static field initializer
+// 
+class X {
+	static object o = this;
+
+	static int Main ()
+	{
+		return 1;
+	}
+}
diff --git a/mcs/errors/cs0026.cs b/mcs/errors/cs0026.cs
new file mode 100755
index 00000000000..e4b5ca7e580
--- /dev/null
+++ b/mcs/errors/cs0026.cs
@@ -0,0 +1,8 @@
+// cs0026: use of this is not allowed in static methods
+// Line: 6
+class X {
+	static void A ()
+	{
+		this = null;
+	}
+}
diff --git a/mcs/errors/cs0028.cs b/mcs/errors/cs0028.cs
new file mode 100755
index 00000000000..5cbf73f5130
--- /dev/null
+++ b/mcs/errors/cs0028.cs
@@ -0,0 +1,12 @@
+// cs0028: has the wrong signature to be an entry point
+// Line: 8
+
+class T {
+        public static int Main ()
+        {
+        }
+        public static int Main (int foo)
+        {
+        }
+}
+
diff --git a/mcs/errors/cs0029.cs b/mcs/errors/cs0029.cs
new file mode 100755
index 00000000000..4f701c4e085
--- /dev/null
+++ b/mcs/errors/cs0029.cs
@@ -0,0 +1,12 @@
+// cs0029: cannot implicitly conver type `double' to `decimal'
+// Line: 7
+
+class T {
+	public static int Main (string [] args)
+	{
+		decimal d = 100d;
+
+		return 1;
+	}
+}
+	      
diff --git a/mcs/errors/cs0030.cs b/mcs/errors/cs0030.cs
new file mode 100644
index 00000000000..7226eb2855c
--- /dev/null
+++ b/mcs/errors/cs0030.cs
@@ -0,0 +1,15 @@
+// cs0030.cs : Cannot convert type 'Blah' to 'float'
+// Line : 12
+
+public class Blah {
+
+	public static int Main ()
+	{
+		Blah k;
+		
+		k = new Blah ();
+		
+		float f = (float) k;
+		
+	}
+}
diff --git a/mcs/errors/cs0031.cs b/mcs/errors/cs0031.cs
new file mode 100644
index 00000000000..c79ba6975de
--- /dev/null
+++ b/mcs/errors/cs0031.cs
@@ -0,0 +1,14 @@
+// cs0031.cs : Constant value '256' cannot be converted to a byte
+// Line : 7
+
+public class Blah {
+
+	public enum MyEnum : byte {
+		Foo = 256,
+		Bar
+	}
+
+	public static void Main ()
+	{
+	}
+}
diff --git a/mcs/errors/cs0034.cs b/mcs/errors/cs0034.cs
new file mode 100755
index 00000000000..2d5917abee5
--- /dev/null
+++ b/mcs/errors/cs0034.cs
@@ -0,0 +1,15 @@
+// cs0034: operator >= is ambiguous on types ulong and sbyte
+// Line: 7
+class X {
+
+	bool ret (ulong u, sbyte s)
+	{
+		return (u >= s);
+	}
+
+	bool ret (ulong u, short s)
+	{
+		return (u >= s);
+	}
+
+}
diff --git a/mcs/errors/cs0039.cs b/mcs/errors/cs0039.cs
new file mode 100755
index 00000000000..494fe68f956
--- /dev/null
+++ b/mcs/errors/cs0039.cs
@@ -0,0 +1,16 @@
+// cs0039.cs: as operator can not convert explicitly from type to type
+// line: 8
+class A {
+        public static void Main ()
+        {
+		decimal tryDec;
+		tryDec = 1234.2345M;
+
+		object a = tryDec as string;
+        }
+}
+
+
+
+
+
diff --git a/mcs/errors/cs0051.cs b/mcs/errors/cs0051.cs
new file mode 100755
index 00000000000..177c0028638
--- /dev/null
+++ b/mcs/errors/cs0051.cs
@@ -0,0 +1,15 @@
+// cs0051.cs: Inconsistent accessibility: parameter type `MyClass.X' is less accessible than method MyClass.method(MyClass.X)
+// Line: 12
+
+public class MyClass {
+
+	//
+	// To fix change the next line to "public enum X {
+	enum X {
+		a, b
+	}
+
+	public void method (X arg)
+	{
+	}
+}
diff --git a/mcs/errors/cs0060.cs b/mcs/errors/cs0060.cs
new file mode 100755
index 00000000000..0e571b72987
--- /dev/null
+++ b/mcs/errors/cs0060.cs
@@ -0,0 +1,7 @@
+// cs0060.cs: Incosistent accessability between X and Y.X
+// Line: 6
+class X {
+}
+
+public class Y : X {
+}
diff --git a/mcs/errors/cs0066.cs b/mcs/errors/cs0066.cs
new file mode 100644
index 00000000000..e7e6f5e3479
--- /dev/null
+++ b/mcs/errors/cs0066.cs
@@ -0,0 +1,25 @@
+// cs0066.cs : 'Button.Click' : event must be of a delegate type 
+// Line : 10
+
+using System;
+
+public delegate void EventHandler (object sender, EventArgs e);
+
+public class Button {
+
+	public event Blah Click;
+
+	public void Reset ()
+	{
+		Click = null;
+	}
+}
+
+public class Blah {
+
+	public static void Main ()
+	{
+		Blah b = new Blah ();
+	}
+	
+}
diff --git a/mcs/errors/cs0070.cs b/mcs/errors/cs0070.cs
new file mode 100644
index 00000000000..826c97b301a
--- /dev/null
+++ b/mcs/errors/cs0070.cs
@@ -0,0 +1,30 @@
+// cs0070.cs :  The event 'Click' can only appear on the left-side of a += or -= (except when used from within the type 'Button')
+// Line : 20
+
+using System;
+
+public delegate void EventHandler (int i, int j);
+
+public class Button {
+
+	public event EventHandler Click;
+
+}
+
+public class Blah {
+
+	Button Button1 = new Button ();
+
+	public void Connect ()
+	{
+		Button1.Click = new EventHandler (Button1_Click);
+	}
+
+	public void Button1_Click (int i, int j)
+	{
+	}
+	
+	public static void Main ()
+	{
+	}
+}
diff --git a/mcs/errors/cs0106.cs b/mcs/errors/cs0106.cs
new file mode 100755
index 00000000000..22a7dabeb58
--- /dev/null
+++ b/mcs/errors/cs0106.cs
@@ -0,0 +1,12 @@
+// cs0106: virtual, abstract or public are not valid for explicit interface implementations
+// Line: 8
+interface A {
+	void B ();
+}
+
+class X : A {
+	public virtual void A.B () {}
+
+	static void Main () {}
+}
+
diff --git a/mcs/errors/cs0107.cs b/mcs/errors/cs0107.cs
new file mode 100755
index 00000000000..fd02f7e2c2a
--- /dev/null
+++ b/mcs/errors/cs0107.cs
@@ -0,0 +1,6 @@
+// cs0107.cs: More than one protection modifier
+// Line: 4
+class X {
+	public private class X {
+	}
+}
diff --git a/mcs/errors/cs0108.cs b/mcs/errors/cs0108.cs
new file mode 100755
index 00000000000..a516acc7d38
--- /dev/null
+++ b/mcs/errors/cs0108.cs
@@ -0,0 +1,10 @@
+// cs0108.cs: The new keyword is required on MEMBER because it hides MEMBER2
+// Line:
+
+class Base {
+	public void F () {}
+}
+
+class Derived : Base {
+	void F () {}
+}
diff --git a/mcs/errors/cs0110.cs b/mcs/errors/cs0110.cs
new file mode 100755
index 00000000000..81abb2390f3
--- /dev/null
+++ b/mcs/errors/cs0110.cs
@@ -0,0 +1,29 @@
+class A {
+	int a;
+	
+	class B {
+		int b;
+
+		class C {
+			int c;
+
+			void m ()
+			{
+				c = 1;
+			}
+
+			enum F {
+				A, B, C, D = X, E
+			}
+
+			const int X = Y + 1;
+			const int Y = 1 + (int) F.E;
+		}
+	}
+
+	static int Main (string [] args)
+	{
+		return 0;
+	}
+
+}
diff --git a/mcs/errors/cs0111.cs b/mcs/errors/cs0111.cs
new file mode 100644
index 00000000000..968e204f64a
--- /dev/null
+++ b/mcs/errors/cs0111.cs
@@ -0,0 +1,21 @@
+// cs111.cs : Class `Blah' already contains a definition with the same return value and parameter types for method `Foo'
+// Line : 10
+
+public class Blah {
+
+	static public void Foo (int i, int j)
+	{
+	}
+
+	static public void Foo (int i, int j)
+	{
+	}
+
+	public static void Main ()
+	{
+		int i = 1;
+		int j = 2;
+
+		Foo (i, j);
+	}
+}
diff --git a/mcs/errors/cs0113.cs b/mcs/errors/cs0113.cs
new file mode 100755
index 00000000000..6ddf367cf5d
--- /dev/null
+++ b/mcs/errors/cs0113.cs
@@ -0,0 +1,3 @@
+class X {
+	public virtual override void Y () {}
+}
diff --git a/mcs/errors/cs0114.cs b/mcs/errors/cs0114.cs
new file mode 100755
index 00000000000..a617710997d
--- /dev/null
+++ b/mcs/errors/cs0114.cs
@@ -0,0 +1,9 @@
+// cs0114.cs: Y.XX hides inherited member X.XX.  Must use `override' or `new' keyword
+// Line: 8
+public abstract class X {
+	public abstract void XX ();
+}
+
+class Y : X {
+	void XX () {}
+}
diff --git a/mcs/errors/cs0115.cs b/mcs/errors/cs0115.cs
new file mode 100755
index 00000000000..f3ae9aa468d
--- /dev/null
+++ b/mcs/errors/cs0115.cs
@@ -0,0 +1,5 @@
+class X {
+	public override void Bla ()
+	{
+	}
+}
diff --git a/mcs/errors/cs0117.cs b/mcs/errors/cs0117.cs
new file mode 100755
index 00000000000..7b942b47625
--- /dev/null
+++ b/mcs/errors/cs0117.cs
@@ -0,0 +1,10 @@
+// cs0117: `int' does not contain a definition for 'E'.
+// Line: 7
+
+class T {
+	public static int Main (string [] args )
+	{
+		int x = 1.E;
+		return 0;
+	}
+}
diff --git a/mcs/errors/cs0118.cs b/mcs/errors/cs0118.cs
new file mode 100755
index 00000000000..bd3afe1a62a
--- /dev/null
+++ b/mcs/errors/cs0118.cs
@@ -0,0 +1,11 @@
+// cs0118.cs: X.s denotes a 'field' where a class was expected
+// Line: 6
+class X {
+	string s;
+
+	s MyProperty {
+		get {
+			return s;
+		}
+	}
+}
diff --git a/mcs/errors/cs0120-2.cs b/mcs/errors/cs0120-2.cs
new file mode 100755
index 00000000000..68899fc9e80
--- /dev/null
+++ b/mcs/errors/cs0120-2.cs
@@ -0,0 +1,26 @@
+using System;
+using System.Threading;
+using System.Reflection;
+using System.Reflection.Emit;
+
+public class Test {
+
+        public Test () : this (Add8(4), 6) {
+                string hostName = System.Net.Dns.GetHostName ();
+                Console.WriteLine ("Hostname: " + hostName);
+        }
+
+        public Test (int i, int j) {
+                Console.WriteLine ("GOT : " + i + " : " + j);
+        }
+
+
+        public static void Main (String[] args) {
+                Test t = new Test ();
+        }
+
+        private int Add8 (int i) {
+                return i + 8;
+        }
+
+}
diff --git a/mcs/errors/cs0120.cs b/mcs/errors/cs0120.cs
new file mode 100755
index 00000000000..817b2d5ea35
--- /dev/null
+++ b/mcs/errors/cs0120.cs
@@ -0,0 +1,15 @@
+// cs0120: Ie, a static method invoking a non-static method
+// `An object reference is required for the nonstatic field, method or property test.method()
+// Line: 11
+
+class test {
+
+	void method ()
+	{
+	}
+       
+	public static int Main (string [] args){
+		method ();
+		return 1;
+	}
+}
diff --git a/mcs/errors/cs0121.cs b/mcs/errors/cs0121.cs
new file mode 100755
index 00000000000..7a8797ee680
--- /dev/null
+++ b/mcs/errors/cs0121.cs
@@ -0,0 +1,17 @@
+// cs0121.cs: ambigous call when selecting function due to implicit casts
+// Line: 15
+
+class X {
+	static void a (int i, double d)
+	{
+	}
+
+	static void a (double d, int i)
+	{
+	}
+
+	public static void Main ()
+	{
+		a (0, 0);
+	}
+}	
diff --git a/mcs/errors/cs0122.cs b/mcs/errors/cs0122.cs
new file mode 100755
index 00000000000..47078b0fdf8
--- /dev/null
+++ b/mcs/errors/cs0122.cs
@@ -0,0 +1,18 @@
+// cs0122.cs: y.x is inaccessible due to its protection level
+// Line: 15
+using System;
+
+class Y {
+	void x () {}
+
+}
+
+class X {
+	static int Main ()
+	{
+		Y y = new Y ();
+
+		y.x ();
+		return 0;
+	}
+}
diff --git a/mcs/errors/cs0126.cs b/mcs/errors/cs0126.cs
new file mode 100644
index 00000000000..f17d4d39607
--- /dev/null
+++ b/mcs/errors/cs0126.cs
@@ -0,0 +1,9 @@
+// cs0126: an object of type `int' is expected in the return statement
+// Line: 7
+
+class X {
+	int Y ()
+	{
+		return;
+	}
+}
diff --git a/mcs/errors/cs0127.cs b/mcs/errors/cs0127.cs
new file mode 100755
index 00000000000..2a72c6a1a3d
--- /dev/null
+++ b/mcs/errors/cs0127.cs
@@ -0,0 +1,8 @@
+// cs0127.cs:  Since 'X.fn' returns void, a return keyword must not be followed by an object expression
+// Line: 6
+class X {
+	void fn ()
+	{
+		return 1;
+	}
+}
diff --git a/mcs/errors/cs0128.cs b/mcs/errors/cs0128.cs
new file mode 100755
index 00000000000..09a3d042f99
--- /dev/null
+++ b/mcs/errors/cs0128.cs
@@ -0,0 +1,12 @@
+// cs0128: a local variable named `x' is already defined in this scope
+// Line:
+
+class x {
+	static int y ()
+	{
+		int x = 1;
+		int x = 2;
+
+		return x + x;
+	}
+}
diff --git a/mcs/errors/cs0131.cs b/mcs/errors/cs0131.cs
new file mode 100755
index 00000000000..ef025a2039a
--- /dev/null
+++ b/mcs/errors/cs0131.cs
@@ -0,0 +1,8 @@
+// cs0131.cs: left hand side of an assignment must be variable, property access or indexer
+// Line:
+class X {
+	void A ()
+	{
+		5 = 4;
+	}
+}
diff --git a/mcs/errors/cs0132.cs b/mcs/errors/cs0132.cs
new file mode 100755
index 00000000000..1b4ebf2c7b4
--- /dev/null
+++ b/mcs/errors/cs0132.cs
@@ -0,0 +1,7 @@
+// cs0132.cs: A static parameter must  not have any parameters
+// Line: 4
+class X {
+	static X (int x)
+	{
+	}
+}
diff --git a/mcs/errors/cs0133.cs b/mcs/errors/cs0133.cs
new file mode 100755
index 00000000000..a8d0e08abe7
--- /dev/null
+++ b/mcs/errors/cs0133.cs
@@ -0,0 +1,8 @@
+// cs0133.cs: the expression being assigned to `x' must be constant
+// Line: 6
+class X {
+	X (int arg)
+	{
+		const int x = arg;
+	}
+}
diff --git a/mcs/errors/cs0136-2.cs b/mcs/errors/cs0136-2.cs
new file mode 100755
index 00000000000..4dc9d547e32
--- /dev/null
+++ b/mcs/errors/cs0136-2.cs
@@ -0,0 +1,9 @@
+// cs0136.cs: local variable j can not be declared, because there is something with that name already
+// Line: 5
+class X {
+	public static void Bar (int j, params int [] args)
+	{
+		foreach (int j in args)
+			;
+	}
+}
diff --git a/mcs/errors/cs0136.cs b/mcs/errors/cs0136.cs
new file mode 100755
index 00000000000..3927a72616b
--- /dev/null
+++ b/mcs/errors/cs0136.cs
@@ -0,0 +1,13 @@
+// cs0136: A local variable named 'i' cannot be declared in this scope because it would give a different meaning to 'i'
+// Line: 8
+class X {
+	void b ()
+	{
+		int i;
+		{
+			string i;
+		}
+	}
+}
+
+
diff --git a/mcs/errors/cs0139.cs b/mcs/errors/cs0139.cs
new file mode 100644
index 00000000000..11eb5d7f750
--- /dev/null
+++ b/mcs/errors/cs0139.cs
@@ -0,0 +1,8 @@
+// cs0139.cs: No loop to exit to in continue or break.
+// Line: 6
+class X {
+	void A ()
+	{
+		continue;
+	}
+}
diff --git a/mcs/errors/cs0144-2.cs b/mcs/errors/cs0144-2.cs
new file mode 100755
index 00000000000..d6a94543115
--- /dev/null
+++ b/mcs/errors/cs0144-2.cs
@@ -0,0 +1,13 @@
+// cs0144.cs: can not create instances of abstract classes or interfaces
+// Line: 11
+interface X {
+	void A ();
+
+}
+
+class Demo {
+	static void Main ()
+	{
+		object x = new X ();
+	}
+}
diff --git a/mcs/errors/cs0144.cs b/mcs/errors/cs0144.cs
new file mode 100755
index 00000000000..4b754ce5750
--- /dev/null
+++ b/mcs/errors/cs0144.cs
@@ -0,0 +1,13 @@
+// cs0144.cs: can not create instances of abstract classes or interfaces
+// Line: 11
+abstract class X {
+	public abstract void B ();
+
+}
+
+class Demo {
+	static void Main ()
+	{
+		object x = new X ();
+	}
+}
diff --git a/mcs/errors/cs0146.cs b/mcs/errors/cs0146.cs
new file mode 100644
index 00000000000..8b81c046864
--- /dev/null
+++ b/mcs/errors/cs0146.cs
@@ -0,0 +1,7 @@
+// cs0146.cs: circular class definition
+// Line: 6
+class A : B {
+}
+
+class B : A {
+}
diff --git a/mcs/errors/cs0150.cs b/mcs/errors/cs0150.cs
new file mode 100644
index 00000000000..fc67a91086e
--- /dev/null
+++ b/mcs/errors/cs0150.cs
@@ -0,0 +1,14 @@
+// cs0150.cs :
+// Line :
+
+using System;
+
+public class Blah {
+	
+	public static void Main ()
+	{
+		int foo = 6;
+		
+		int [] i = new int [foo] { 0, 1, 2, 3, 4, 5 };
+	}
+}
diff --git a/mcs/errors/cs0151.cs b/mcs/errors/cs0151.cs
new file mode 100755
index 00000000000..03ef7c2e9a9
--- /dev/null
+++ b/mcs/errors/cs0151.cs
@@ -0,0 +1,19 @@
+// cs0151.cs: An integral value expected
+// Line: 12
+class Y {
+	byte b;
+}
+
+class X {
+	static void Main ()
+	{
+		Y y = new Y ();
+
+		switch (y){
+		case 0:
+			break;
+		case 1:
+			break;
+		}
+	}
+}
diff --git a/mcs/errors/cs0152.cs b/mcs/errors/cs0152.cs
new file mode 100755
index 00000000000..bf2c3e520ec
--- /dev/null
+++ b/mcs/errors/cs0152.cs
@@ -0,0 +1,13 @@
+// cs0152.cs: The label `case X:' already occurs in this switch statement
+// Line: 9
+class X {
+	void f (int i)
+	{
+		switch (i){
+		case 1:
+			break;
+		case 1:	
+			break;
+		}
+	}
+}
diff --git a/mcs/errors/cs0153.cs b/mcs/errors/cs0153.cs
new file mode 100755
index 00000000000..c102bfa4672
--- /dev/null
+++ b/mcs/errors/cs0153.cs
@@ -0,0 +1,8 @@
+// cs0153.cs: goto default only allowed in switch statement
+// Line:
+class X {
+	void Main ()
+	{
+		goto default;
+	}
+}
diff --git a/mcs/errors/cs0155-2.cs b/mcs/errors/cs0155-2.cs
new file mode 100644
index 00000000000..c9cdad5d38d
--- /dev/null
+++ b/mcs/errors/cs0155-2.cs
@@ -0,0 +1,12 @@
+// cs0155-2.cs: The type caught or thrown must be derived from System.Exception
+// Line: 8
+class X {
+	static void Main ()
+	{
+		try {
+			;
+		} catch (int e) {
+			throw;
+		}
+	}
+}
diff --git a/mcs/errors/cs0155.cs b/mcs/errors/cs0155.cs
new file mode 100644
index 00000000000..48f5641434c
--- /dev/null
+++ b/mcs/errors/cs0155.cs
@@ -0,0 +1,9 @@
+// cs0155.cs: The type caught or thrown must be derived from System.Exception
+// Line: 7
+class X {
+	static void Main ()
+	{
+		int a = 9;
+		throw a;
+	}
+}
diff --git a/mcs/errors/cs0157.cs b/mcs/errors/cs0157.cs
new file mode 100755
index 00000000000..a56dd964da0
--- /dev/null
+++ b/mcs/errors/cs0157.cs
@@ -0,0 +1,12 @@
+// cs0157.cs: Control can not leave the body of a finally clause
+// Line: 9
+
+class X {
+	void A ()
+	{
+		try {
+		} finally {
+			return;
+		}
+	}
+}
diff --git a/mcs/errors/cs0159-2.cs b/mcs/errors/cs0159-2.cs
new file mode 100755
index 00000000000..aeb30d78a35
--- /dev/null
+++ b/mcs/errors/cs0159-2.cs
@@ -0,0 +1,16 @@
+// cs0159-2.cs: No such case 20
+
+class y {
+	enum X { A = 1, B = 1, C = 1 }
+
+	static void Main ()
+	{
+		int x = 1;
+
+		switch (x){
+			case 1: break;
+			case 2: goto case 20;
+		}
+	}
+}
+		
diff --git a/mcs/errors/cs0159.cs b/mcs/errors/cs0159.cs
new file mode 100755
index 00000000000..65aa5cb2dfb
--- /dev/null
+++ b/mcs/errors/cs0159.cs
@@ -0,0 +1,23 @@
+// cs0159.cs: No default target for goto default
+// Line:
+
+class X {
+
+	static int m (int n)
+	{
+		switch (n){
+		case 0:
+			goto default;
+
+		case 1:
+			return 1;
+		}
+
+		return 10;
+	}
+	
+	static void Main ()
+	{
+		m (1);
+	}
+}
diff --git a/mcs/errors/cs0164.cs b/mcs/errors/cs0164.cs
new file mode 100755
index 00000000000..5fc48c41eac
--- /dev/null
+++ b/mcs/errors/cs0164.cs
@@ -0,0 +1,8 @@
+// cs0164.cs: This label has not been referenced
+// Line: 5
+class X {
+	static void Main () {
+		a:
+			return;
+	}
+}
diff --git a/mcs/errors/cs0165-2.cs b/mcs/errors/cs0165-2.cs
new file mode 100755
index 00000000000..3d0d3a9e2af
--- /dev/null
+++ b/mcs/errors/cs0165-2.cs
@@ -0,0 +1,16 @@
+class T {

+	void fun (ref int a)

+	{

+		if (a == 3)

+		a = 2;

+	}

+

+	void x ()

+	{

+		int x;

+

+		if (System.Console.Read () == 1)

+			x = 1;

+		fun (ref x);

+	}

+}

diff --git a/mcs/errors/cs0165.cs b/mcs/errors/cs0165.cs
new file mode 100755
index 00000000000..b3f89b240b9
--- /dev/null
+++ b/mcs/errors/cs0165.cs
@@ -0,0 +1,11 @@
+// cs0165.cs: Use of unassigned local variable
+// Line: 9
+
+class T {
+	static void Main ()
+	{
+		int errors;
+
+		errors += 1;
+	}
+}
diff --git a/mcs/errors/cs0169.cs b/mcs/errors/cs0169.cs
new file mode 100755
index 00000000000..bcd47c81491
--- /dev/null
+++ b/mcs/errors/cs0169.cs
@@ -0,0 +1,11 @@
+// cs0169.cs: warning, private field `prv' is never used
+// Line: 4
+class X {
+	int x;
+
+	void blah ()
+	{
+	}
+
+	static void Main () {}
+}
diff --git a/mcs/errors/cs0171.cs b/mcs/errors/cs0171.cs
new file mode 100755
index 00000000000..5b2b2343b2a
--- /dev/null
+++ b/mcs/errors/cs0171.cs
@@ -0,0 +1,11 @@
+// cs0171.cs: field x must be initialized before constructor X ends.
+// Line: 
+struct X {
+	public readonly int x;
+
+	X (int a)
+	{
+	}
+
+	static void Main () {}
+}
diff --git a/mcs/errors/cs0172.cs b/mcs/errors/cs0172.cs
new file mode 100755
index 00000000000..2ae816f8eb5
--- /dev/null
+++ b/mcs/errors/cs0172.cs
@@ -0,0 +1,25 @@
+class X {
+	public static implicit operator X (Y y)
+	{
+		return null;
+	}
+}
+
+class Y {
+	public static implicit operator Y (X x)
+	{
+		return null;
+	}
+}
+
+class Z
+{
+	static void Main ()
+	{
+		X x = new X ();
+		Y y = new Y ();
+
+		object d = (x == x) ? x : y;
+	}
+	
+}
diff --git a/mcs/errors/cs0176.cs b/mcs/errors/cs0176.cs
new file mode 100755
index 00000000000..889971fc117
--- /dev/null
+++ b/mcs/errors/cs0176.cs
@@ -0,0 +1,14 @@
+// cs0176.cs: cannot be accessed with an instance reference, use typename instead
+// Line: 12
+class X {
+	public static void void_method ()
+	{
+	}
+}
+
+class Y {
+	void m (X arg)
+	{
+		arg.void_method ();
+	}
+}
diff --git a/mcs/errors/cs0178.cs b/mcs/errors/cs0178.cs
new file mode 100644
index 00000000000..47be8ec08a7
--- /dev/null
+++ b/mcs/errors/cs0178.cs
@@ -0,0 +1,12 @@
+// cs0178.cs :
+// Line :
+
+using System;
+
+public class Blah {
+	
+	public static void Main ()
+	{
+		int [,] i = new int [4,2] { 0, 1, 2, 3, 4, 5 };
+	}
+}
diff --git a/mcs/errors/cs0179.cs b/mcs/errors/cs0179.cs
new file mode 100755
index 00000000000..ed7eee8895b
--- /dev/null
+++ b/mcs/errors/cs0179.cs
@@ -0,0 +1,14 @@
+// cs0179.cs: member can not be declared extern and have a body
+// Line:
+
+class X {
+
+	public extern int extern_method ()
+		{
+		}
+	
+	public static void Main ()
+		{
+		}
+}
+      
diff --git a/mcs/errors/cs0180.cs b/mcs/errors/cs0180.cs
new file mode 100755
index 00000000000..7f1714e7331
--- /dev/null
+++ b/mcs/errors/cs0180.cs
@@ -0,0 +1,12 @@
+// cs0179.cs: member can not be declared extern and abstract
+// Line:
+
+class X {
+
+	public extern abstract int extern_method ();
+	
+	public static void Main ()
+		{
+		}
+}
+      
diff --git a/mcs/errors/cs0183.cs b/mcs/errors/cs0183.cs
new file mode 100755
index 00000000000..781e693dbd0
--- /dev/null
+++ b/mcs/errors/cs0183.cs
@@ -0,0 +1,13 @@
+// cs0183.cs: the expression is always of the type `x'
+// Line:
+
+class X {
+
+	static void Main ()
+	{
+		int i = 5;
+
+		if (i is int){
+		}
+	}
+}
diff --git a/mcs/errors/cs0184.cs b/mcs/errors/cs0184.cs
new file mode 100755
index 00000000000..4ff379f6005
--- /dev/null
+++ b/mcs/errors/cs0184.cs
@@ -0,0 +1,13 @@
+// cs0184.cs: The expression is never of the provided type
+// Line:
+
+class X {
+
+	static void Main ()
+	{
+		int a = 1;
+		
+		if (a is byte){
+		}
+	}
+}
diff --git a/mcs/errors/cs0185.cs b/mcs/errors/cs0185.cs
new file mode 100755
index 00000000000..6efb95560a6
--- /dev/null
+++ b/mcs/errors/cs0185.cs
@@ -0,0 +1,11 @@
+// cs0185.cs: object is not a reference type (as expected by lock)
+// Line:
+
+class X {
+	static void Main ()
+	{
+		lock (5) {
+		}
+	}
+}
+      
diff --git a/mcs/errors/cs0187.cs b/mcs/errors/cs0187.cs
new file mode 100755
index 00000000000..dd9562abd70
--- /dev/null
+++ b/mcs/errors/cs0187.cs
@@ -0,0 +1,8 @@
+class X {
+	static void Main ()
+	{
+		X x = new X();
+
+		x++;
+	}
+}
diff --git a/mcs/errors/cs0191.cs b/mcs/errors/cs0191.cs
new file mode 100755
index 00000000000..6b3cc5df250
--- /dev/null
+++ b/mcs/errors/cs0191.cs
@@ -0,0 +1,12 @@
+// cs0191: can not assign to readonly variable outside constructor
+// Line: 8
+class X {
+	readonly int a;
+
+	void Y ()
+	{
+		a = 1;
+	}
+}
+
+	
diff --git a/mcs/errors/cs0193.cs b/mcs/errors/cs0193.cs
new file mode 100755
index 00000000000..fe2662a82af
--- /dev/null
+++ b/mcs/errors/cs0193.cs
@@ -0,0 +1,13 @@
+// cs0193.cs: * or -> operator can only be applied to pointer types.
+// Line: 8
+
+unsafe class X {
+	static void Main ()
+	{
+		int a = 0;
+		if (*a == 0)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mcs/errors/cs0196.cs b/mcs/errors/cs0196.cs
new file mode 100755
index 00000000000..57dd9c2b7b1
--- /dev/null
+++ b/mcs/errors/cs0196.cs
@@ -0,0 +1,11 @@
+// cs0196.cs: pointers must be indexed by a single value
+// line: 8
+using System;
+unsafe class ZZ {
+	static void Main () {
+		int *p = null;
+
+		if (p [10,4] == 4)
+			return;
+	}
+}
diff --git a/mcs/errors/cs0198.cs b/mcs/errors/cs0198.cs
new file mode 100755
index 00000000000..60bce195511
--- /dev/null
+++ b/mcs/errors/cs0198.cs
@@ -0,0 +1,12 @@
+// cs0198: can not assign to static readonly variable outside static constructor
+// Line: 8
+class X {
+	static readonly int a;
+
+	static void Y ()
+	{
+		a = 1;
+	}
+}
+
+	
diff --git a/mcs/errors/cs0200.cs b/mcs/errors/cs0200.cs
new file mode 100755
index 00000000000..87ec5c6786f
--- /dev/null
+++ b/mcs/errors/cs0200.cs
@@ -0,0 +1,15 @@
+// cs0200: can not assign to property X.P -- it is readonly
+// line: 12
+class X {
+	static int P {
+		get {
+			return 1;
+		}
+	}
+
+	static int Main ()
+	{
+		P = 10;
+		return 1;
+	}
+}
diff --git a/mcs/errors/cs0206.cs b/mcs/errors/cs0206.cs
new file mode 100755
index 00000000000..03c79bf1a9a
--- /dev/null
+++ b/mcs/errors/cs0206.cs
@@ -0,0 +1,16 @@
+// cs0206.cs: indexers or properties can not be used as ref or out arguments
+// Line:
+class X {
+	static int P { get { return 1; } set { } }
+
+	static int m (out int v)
+	{
+		v = 1;
+		return 1;
+	}
+	
+	static void Main ()
+	{
+		m (out P);
+	}
+}
diff --git a/mcs/errors/cs0214-2.cs b/mcs/errors/cs0214-2.cs
new file mode 100755
index 00000000000..2526a9fc682
--- /dev/null
+++ b/mcs/errors/cs0214-2.cs
@@ -0,0 +1,7 @@
+class X {
+	static void Main ()
+	{
+		int b = 0;
+		int a = (int *) b;
+	}
+}
diff --git a/mcs/errors/cs0214-3.cs b/mcs/errors/cs0214-3.cs
new file mode 100755
index 00000000000..e40bbfb7247
--- /dev/null
+++ b/mcs/errors/cs0214-3.cs
@@ -0,0 +1,12 @@
+struct X {
+	static unsafe void *a ()
+		{
+			return null;
+		}
+
+	static void Main ()
+		{
+			a ();
+		}
+	
+}
diff --git a/mcs/errors/cs0214.cs b/mcs/errors/cs0214.cs
new file mode 100644
index 00000000000..08eb088af39
--- /dev/null
+++ b/mcs/errors/cs0214.cs
@@ -0,0 +1,5 @@
+// cs0214: Pointer can only be used in unsafe context
+// Line: 4
+class X {
+	void *a;
+}
diff --git a/mcs/errors/cs0215.cs b/mcs/errors/cs0215.cs
new file mode 100644
index 00000000000..3c875505e94
--- /dev/null
+++ b/mcs/errors/cs0215.cs
@@ -0,0 +1,13 @@
+// cs0215.cs : The return type of operator True or False must be bool
+// Line : 11 
+
+class Blah {
+
+	public static void Main ()
+	{
+
+	}
+
+	public static int operator true (Blah i) {}
+
+}
diff --git a/mcs/errors/cs0216.cs b/mcs/errors/cs0216.cs
new file mode 100644
index 00000000000..ca7db926d23
--- /dev/null
+++ b/mcs/errors/cs0216.cs
@@ -0,0 +1,12 @@
+// cs0216.cs: If you define operator <, you also need to define >
+// Line:
+class X {
+	public static X operator < (X a, int b)
+	{
+		return null;
+	}
+
+	static void Main () {
+	}
+}
+	
diff --git a/mcs/errors/cs0234.cs b/mcs/errors/cs0234.cs
new file mode 100755
index 00000000000..046394a6d9a
--- /dev/null
+++ b/mcs/errors/cs0234.cs
@@ -0,0 +1,10 @@
+//cs0243: NonExistant does not exist in this namespace
+
+using System;
+using Nonexistant;
+
+class X
+{
+	static void Main () {
+	}
+}
diff --git a/mcs/errors/cs0236.cs b/mcs/errors/cs0236.cs
new file mode 100644
index 00000000000..6908792fb22
--- /dev/null
+++ b/mcs/errors/cs0236.cs
@@ -0,0 +1,15 @@
+//cs0236: A field initializer cannot reference the non-static field, method or property `X.Foo'.
+
+class X
+{
+	int Foo {
+		get {
+			return 9;
+		}
+	}
+
+	long Bar = Foo;
+
+	static void Main () {
+	}
+}
diff --git a/mcs/errors/cs0239.cs b/mcs/errors/cs0239.cs
new file mode 100644
index 00000000000..0f3608643bc
--- /dev/null
+++ b/mcs/errors/cs0239.cs
@@ -0,0 +1,34 @@
+// cs0239.cs : `X.MyMethod' : cannot override inherited member `Bar.MyMethod' because it is sealed.
+// Line : 25
+
+using System;
+
+public class Foo {
+
+	public virtual void MyMethod ()
+	{
+		Console.WriteLine ("This is me !");
+	}
+}
+	      
+public class Bar : Foo {
+
+	public sealed override void MyMethod ()
+	{
+
+	}
+
+} 
+
+public class X : Bar {
+
+	public override void MyMethod ()
+	{
+
+	}
+	
+	public static void Main ()
+	{
+
+	}
+}
diff --git a/mcs/errors/cs0242.cs b/mcs/errors/cs0242.cs
new file mode 100755
index 00000000000..c775f17342e
--- /dev/null
+++ b/mcs/errors/cs0242.cs
@@ -0,0 +1,11 @@
+// cs0242: operation is not defined for void *
+// Line: 8
+using System;
+unsafe class ZZ {
+	static void Main () {
+		void *p = null;
+
+		if (p [10] == 4)
+			return;
+	}
+}
diff --git a/mcs/errors/cs0246.cs b/mcs/errors/cs0246.cs
new file mode 100644
index 00000000000..dfa20eef8ac
--- /dev/null
+++ b/mcs/errors/cs0246.cs
@@ -0,0 +1,9 @@
+// cs0246.cs: can not find type `B'
+// Line: 4
+interface A : B {
+}
+
+class X {
+	static void Main () {
+	}
+}
diff --git a/mcs/errors/cs0255.cs b/mcs/errors/cs0255.cs
new file mode 100755
index 00000000000..5319b82f5e1
--- /dev/null
+++ b/mcs/errors/cs0255.cs
@@ -0,0 +1,12 @@
+// cs0255.cs: Can not use stackalloc in finally or catch
+// Line: 10
+unsafe class X {
+
+	static void Main ()
+	{
+		try {
+		} catch {
+			char *ptr = stackalloc char [10];
+		}
+	}
+}	
diff --git a/mcs/errors/cs0284.cs b/mcs/errors/cs0284.cs
new file mode 100755
index 00000000000..7d867e57120
--- /dev/null
+++ b/mcs/errors/cs0284.cs
@@ -0,0 +1,9 @@
+// cs0284.cs: Can not create array with negative size
+// Line: 7
+
+class X {
+	static void Main ()
+	{
+		int [] x = new int [-4];
+	}
+}
diff --git a/mcs/errors/cs0500.cs b/mcs/errors/cs0500.cs
new file mode 100755
index 00000000000..d59cee21359
--- /dev/null
+++ b/mcs/errors/cs0500.cs
@@ -0,0 +1,4 @@
+abstract class X {
+	public abstract void B () {
+	}
+}
diff --git a/mcs/errors/cs0501.cs b/mcs/errors/cs0501.cs
new file mode 100755
index 00000000000..1448d79e91e
--- /dev/null
+++ b/mcs/errors/cs0501.cs
@@ -0,0 +1,5 @@
+// cs0501.cs: `Class.X' must declare a body because it is not marked abstract or extern
+// Line: 4
+class Class {
+	virtual public void X ();
+}
diff --git a/mcs/errors/cs0503.cs b/mcs/errors/cs0503.cs
new file mode 100755
index 00000000000..e8e8e048568
--- /dev/null
+++ b/mcs/errors/cs0503.cs
@@ -0,0 +1,5 @@
+// cs0503.cs: The abstract method `Class.X' cannot be marked virtual
+// Line: 4
+abstract class Class {
+	virtual abstract public void X ();
+}
diff --git a/mcs/errors/cs0509.cs b/mcs/errors/cs0509.cs
new file mode 100644
index 00000000000..f89988f2cb3
--- /dev/null
+++ b/mcs/errors/cs0509.cs
@@ -0,0 +1,8 @@
+// cs0509.cs: base class is sealed
+// Line: 7
+struct V {
+	int v;
+}
+
+class X : V {
+}
diff --git a/mcs/errors/cs0513.cs b/mcs/errors/cs0513.cs
new file mode 100755
index 00000000000..d2664371b04
--- /dev/null
+++ b/mcs/errors/cs0513.cs
@@ -0,0 +1,10 @@
+// cs0513.cs: X.myAbstract is abstract but it is contained in non-abstract class
+// Line: 5
+
+class X {
+	public abstract void myAbstract ();
+}
+
+class Y : X {
+}
+	
diff --git a/mcs/errors/cs0515.cs b/mcs/errors/cs0515.cs
new file mode 100755
index 00000000000..3ffb5c7b0bd
--- /dev/null
+++ b/mcs/errors/cs0515.cs
@@ -0,0 +1,7 @@
+// cs0515.cs: access modifiers are not allowed on static constructors
+// Line: 4
+class X {
+	public static X ()
+	{
+	}
+}
diff --git a/mcs/errors/cs0523.cs b/mcs/errors/cs0523.cs
new file mode 100755
index 00000000000..43b016e6264
--- /dev/null
+++ b/mcs/errors/cs0523.cs
@@ -0,0 +1,12 @@
+// cs0523.cs: circular structure definition
+//
+
+struct A {
+	B b;
+}
+
+struct B {
+	A a;
+}
+
+class Y { static void Main () {} }
diff --git a/mcs/errors/cs0527-2.cs b/mcs/errors/cs0527-2.cs
new file mode 100644
index 00000000000..e312377061b
--- /dev/null
+++ b/mcs/errors/cs0527-2.cs
@@ -0,0 +1,8 @@
+class A1 {
+}
+
+class A2 {
+}
+
+class B : A1, A2 {
+}
diff --git a/mcs/errors/cs0527.cs b/mcs/errors/cs0527.cs
new file mode 100644
index 00000000000..994add02c67
--- /dev/null
+++ b/mcs/errors/cs0527.cs
@@ -0,0 +1,7 @@
+// cs0527:  type in interface list is not an interface
+// Line: 6
+class X {
+}
+
+interface A : X {
+}
diff --git a/mcs/errors/cs0528.cs b/mcs/errors/cs0528.cs
new file mode 100755
index 00000000000..84b1d06cef0
--- /dev/null
+++ b/mcs/errors/cs0528.cs
@@ -0,0 +1,10 @@
+// cs0528:  `A' is already listed in interface list
+// Line: 6
+interface A {
+        void stuff ();
+}
+class C: A, A {
+        public void stuff () {}
+        static void Main() {}
+}
+
diff --git a/mcs/errors/cs0529.cs b/mcs/errors/cs0529.cs
new file mode 100644
index 00000000000..52e725162d0
--- /dev/null
+++ b/mcs/errors/cs0529.cs
@@ -0,0 +1,7 @@
+// cs0529: Recursive interface definition
+// Line: 3
+interface A : B {
+}
+
+interface B : A {
+}
diff --git a/mcs/errors/cs0534.cs b/mcs/errors/cs0534.cs
new file mode 100755
index 00000000000..fe865887ce1
--- /dev/null
+++ b/mcs/errors/cs0534.cs
@@ -0,0 +1,11 @@
+// cs0534.cs: `Y' does not implement inherited abstract member `myAbstract'
+// Line: 5
+
+abstract class X {
+	public abstract void myAbstract ();
+}
+
+class Y : X {
+static void Main (){}
+}
+	
diff --git a/mcs/errors/cs0539.cs b/mcs/errors/cs0539.cs
new file mode 100755
index 00000000000..a9bf22fc40f
--- /dev/null
+++ b/mcs/errors/cs0539.cs
@@ -0,0 +1,10 @@
+// cs0539.cs: Member in explicit interface declaration is not a member of the interface
+// Line:
+
+interface A {
+}
+
+class X : A {
+	void A.B () {}
+	static void Main () {}
+}
diff --git a/mcs/errors/cs0540.cs b/mcs/errors/cs0540.cs
new file mode 100755
index 00000000000..25d5d78ade1
--- /dev/null
+++ b/mcs/errors/cs0540.cs
@@ -0,0 +1,11 @@
+// cs0540.cs: containing class does not implement interface
+// Line:
+
+interface A {
+}
+
+class B {
+	void A.B () {}
+
+	static void Main () {}
+}
diff --git a/mcs/errors/cs0542.cs b/mcs/errors/cs0542.cs
new file mode 100755
index 00000000000..61bcdcd88e3
--- /dev/null
+++ b/mcs/errors/cs0542.cs
@@ -0,0 +1,6 @@
+// cs0542.cs: member names can not be the same as their enclosing type
+// Line: 4
+class X {
+	int X;
+}
+
diff --git a/mcs/errors/cs0543.cs b/mcs/errors/cs0543.cs
new file mode 100644
index 00000000000..b59d0e834f5
--- /dev/null
+++ b/mcs/errors/cs0543.cs
@@ -0,0 +1,14 @@
+// cs1008.cs : Enumerator value for 'Bar' is too large to fit in its type 
+// Line : 9
+
+public class Blah {
+
+	public enum MyEnum : byte {
+		Foo = 255,
+		Bar
+	}
+
+	public static void Main ()
+	{
+	}
+}
diff --git a/mcs/errors/cs0552.cs b/mcs/errors/cs0552.cs
new file mode 100755
index 00000000000..7fe395005de
--- /dev/null
+++ b/mcs/errors/cs0552.cs
@@ -0,0 +1,17 @@
+// cs0552.cs: user-defined conversion to/from interface
+// Line: 12
+//
+using System;
+using System.IO;
+
+//
+//
+// Implicit conversion to an interface is not permitted
+//
+class NoIDispose {
+	public static implicit operator IDisposable (NoIDispose a)
+	{
+		return a.x;
+	}
+}
+
diff --git a/mcs/errors/cs0555.cs b/mcs/errors/cs0555.cs
new file mode 100644
index 00000000000..110f952d25f
--- /dev/null
+++ b/mcs/errors/cs0555.cs
@@ -0,0 +1,11 @@
+// cs0555.cs : User-defined conversion cannot take an object of the enclosing type
+// and convert to an object of the enclosing type
+// Line : 8
+
+class Blah {
+
+	public static void Main () {}
+
+	public static implicit operator Blah (Blah i) {}
+
+}
diff --git a/mcs/errors/cs0556.cs b/mcs/errors/cs0556.cs
new file mode 100644
index 00000000000..36ff437d65b
--- /dev/null
+++ b/mcs/errors/cs0556.cs
@@ -0,0 +1,10 @@
+// cs0556.cs : User-defined conversion must convert to or from the enclosing type
+// Line : 8
+
+class Blah {
+
+	public static void Main () {}
+	
+	public static implicit operator int (int i) {}
+
+}
diff --git a/mcs/errors/cs0563.cs b/mcs/errors/cs0563.cs
new file mode 100644
index 00000000000..af369883b2c
--- /dev/null
+++ b/mcs/errors/cs0563.cs
@@ -0,0 +1,7 @@
+// cs0563.cs: One of the parameters to the binary operator should be the containing type
+// Line: 4
+class X {
+	public static int operator + (int a, int b)
+	{
+	}
+}
diff --git a/mcs/errors/cs0574.cs b/mcs/errors/cs0574.cs
new file mode 100755
index 00000000000..1b88bf0173f
--- /dev/null
+++ b/mcs/errors/cs0574.cs
@@ -0,0 +1,13 @@
+// cs0574.cs: Name of destructor must match name of class:
+// Line: 6
+
+class X  {
+
+	~Y ()
+	{
+	}
+
+	static void Main ()
+	{
+	}
+}
diff --git a/mcs/errors/cs0575.cs b/mcs/errors/cs0575.cs
new file mode 100755
index 00000000000..16d0b7aa49e
--- /dev/null
+++ b/mcs/errors/cs0575.cs
@@ -0,0 +1,12 @@
+// cs0575.cs: destructors are only allowed in class types
+// Line: 5
+struct X  {
+
+	~X ()
+	{
+	}
+
+	static void Main ()
+	{
+	}
+}
diff --git a/mcs/errors/cs0592.cs b/mcs/errors/cs0592.cs
new file mode 100644
index 00000000000..02dd459cdbe
--- /dev/null
+++ b/mcs/errors/cs0592.cs
@@ -0,0 +1,29 @@
+// cs0592.cs : Attribute 'Simple' is not valid on this declaration type. It is valid on 'constructor' declarations only.
+// Line : 22
+
+using System;
+
+[AttributeUsage (AttributeTargets.Constructor, AllowMultiple = true)]
+	public class SimpleAttribute : Attribute {
+
+		string name = null;
+
+		public string MyNamedArg;
+		
+		public SimpleAttribute (string name)
+		{
+			this.name = name;
+		}
+		
+		
+	}
+
+[Simple ("Dummy", MyNamedArg = "Dude!")]
+	public class Blah {
+
+		public static void Main ()
+		{
+		}
+	}
+					   
+	
diff --git a/mcs/errors/cs0594-2.cs b/mcs/errors/cs0594-2.cs
new file mode 100755
index 00000000000..94b44f43770
--- /dev/null
+++ b/mcs/errors/cs0594-2.cs
@@ -0,0 +1,8 @@
+//

+// cs0594: Floating-point constant is outside the range for type 'decimal|double|float'

+

+class X {

+	public static void Main() {

+		double dbl = 1.0e99999;

+	}

+}

diff --git a/mcs/errors/cs0594-3.cs b/mcs/errors/cs0594-3.cs
new file mode 100755
index 00000000000..e105d22aaf8
--- /dev/null
+++ b/mcs/errors/cs0594-3.cs
@@ -0,0 +1,8 @@
+//

+// cs0594: Floating-point constant is outside the range for type 'decimal|double|float'

+

+class X {

+	public static void Main() {

+		float f = 1.0e999999f;

+	}

+}

diff --git a/mcs/errors/cs0594.cs b/mcs/errors/cs0594.cs
new file mode 100755
index 00000000000..334dd35333a
--- /dev/null
+++ b/mcs/errors/cs0594.cs
@@ -0,0 +1,8 @@
+//

+// cs0594: Floating-point constant is outside the range for type 'decimal|double|float'

+

+class X {

+	public static void Main() {

+		decimal d = 12311111111111111111111111111111111111111111111111m;

+	}

+}

diff --git a/mcs/errors/cs0601.cs b/mcs/errors/cs0601.cs
new file mode 100644
index 00000000000..020787e74cf
--- /dev/null
+++ b/mcs/errors/cs0601.cs
@@ -0,0 +1,11 @@
+// cs0601.cs : The DllImport attribute must be specified on a method marked 'static' and 'extern'.
+// Line : 9
+
+using System;
+using System.Runtime.InteropServices;
+      
+class Test {
+	[DllImport("cygwin1.dll", EntryPoint="puts", CharSet=CharSet.Ansi)]
+	public extern int puts (string name);
+	
+}
diff --git a/mcs/errors/cs0616.cs b/mcs/errors/cs0616.cs
new file mode 100755
index 00000000000..ecb7f28cda7
--- /dev/null
+++ b/mcs/errors/cs0616.cs
@@ -0,0 +1,12 @@
+// cs0616.cs: 'FakeAttribute': is not an attribute class
+// Line: 8
+
+class FakeAttribute {
+}
+
+class T {
+	[Fake]
+	static int Main() {
+		return 0;
+	}
+}
diff --git a/mcs/errors/cs0617.cs b/mcs/errors/cs0617.cs
new file mode 100644
index 00000000000..e75266d9d1f
--- /dev/null
+++ b/mcs/errors/cs0617.cs
@@ -0,0 +1,26 @@
+// cs0617,cs : 'MyNamedArg' is not a valid named attribute argument. Named attribute arguments must be fields which are not readonly, static or const, or properties with a set accessor which are not static.
+// Line : 20
+
+using System;
+
+[AttributeUsage (AttributeTargets.Class, AllowMultiple = true)]
+	public class SimpleAttribute : Attribute {
+
+		string name = null;
+
+		public readonly string MyNamedArg;
+		
+		public SimpleAttribute (string name)
+		{
+			this.name = name;
+		}
+
+	}
+
+[Simple ("Dummy", MyNamedArg = "Dude!")]
+	public class Blah {
+
+		public static void Main ()
+		{
+		}
+	}
diff --git a/mcs/errors/cs0621.cs b/mcs/errors/cs0621.cs
new file mode 100755
index 00000000000..87bc932088c
--- /dev/null
+++ b/mcs/errors/cs0621.cs
@@ -0,0 +1,5 @@
+// cs0621.cs: X.method virtual or abstract methods can not be private
+// Line:
+class X {
+	virtual void method () {}
+}
diff --git a/mcs/errors/cs0642.cs b/mcs/errors/cs0642.cs
new file mode 100755
index 00000000000..9c73cd6baf1
--- /dev/null
+++ b/mcs/errors/cs0642.cs
@@ -0,0 +1,6 @@
+class X{
+	static void Main ()
+	{
+		if (true);
+	}
+}
diff --git a/mcs/errors/cs0644.cs b/mcs/errors/cs0644.cs
new file mode 100755
index 00000000000..5e93f4ef509
--- /dev/null
+++ b/mcs/errors/cs0644.cs
@@ -0,0 +1,4 @@
+// cs0644.cs: Cannot inherit from special class
+// Line: 3
+class X : System.ValueType {
+}
diff --git a/mcs/errors/cs0645.cs b/mcs/errors/cs0645.cs
new file mode 100755
index 00000000000..ff866d9dcad
--- /dev/null
+++ b/mcs/errors/cs0645.cs
@@ -0,0 +1,4 @@
+// cs0645.cs: identifier too long
+// Line: 3
+class aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa {
+}
diff --git a/mcs/errors/cs0646.cs b/mcs/errors/cs0646.cs
new file mode 100644
index 00000000000..78b7f4e3c77
--- /dev/null
+++ b/mcs/errors/cs0646.cs
@@ -0,0 +1,26 @@
+// cs0646.cs : Cannot specify the DefaultMember attribute on  a type containing an indexer
+// Line : 8
+
+using System;
+using System.Reflection;
+
+[DefaultMember ("Item")]
+public class Foo {
+
+	string bar;
+	
+	public static void Main ()
+	{
+		Console.WriteLine ("foo");
+	}
+
+	string this [int idx] {
+		get {
+			return "foo";
+		}
+		set {
+			bar = value;
+		}
+	}
+}
+		
diff --git a/mcs/errors/cs0649.cs b/mcs/errors/cs0649.cs
new file mode 100755
index 00000000000..1642edd35bb
--- /dev/null
+++ b/mcs/errors/cs0649.cs
@@ -0,0 +1,11 @@
+// cs0649.cs: Field `X.s' is never assigned to, and will always have its default value null
+// Line: 4
+class X {
+	string s;
+
+	string Value {
+		get {
+			return s;
+		}
+	}
+}
diff --git a/mcs/errors/cs0654.cs b/mcs/errors/cs0654.cs
new file mode 100755
index 00000000000..9622867128b
--- /dev/null
+++ b/mcs/errors/cs0654.cs
@@ -0,0 +1,13 @@
+// cs0654.cs: Method referenced without argument list.
+// Line: 12
+class X {
+	int a (int a)
+	{
+		return 0;
+	}
+
+	void b ()
+	{
+		int x = a;
+	}
+}
diff --git a/mcs/errors/cs0658.cs b/mcs/errors/cs0658.cs
new file mode 100644
index 00000000000..e4da1e82b72
--- /dev/null
+++ b/mcs/errors/cs0658.cs
@@ -0,0 +1,18 @@
+// cs0658.cs : Invalid attribute location "blah"
+// Line : 8
+
+public class MyClass {
+
+	delegate int MyDelegate (int i, int j);
+	
+	[blah:Help("blah")]
+	public static MyClass operator/ (MyClass i, MyClass j)
+	{
+	
+	}
+
+	public static implicit operator MyClass (Object o)
+	{
+
+	}
+}
diff --git a/mcs/errors/cs0664.cs b/mcs/errors/cs0664.cs
new file mode 100755
index 00000000000..daa1f39b717
--- /dev/null
+++ b/mcs/errors/cs0664.cs
@@ -0,0 +1,8 @@
+// cs0664.cs: Literal of type double cannot be implicity converted to Float, use F suffix
+// Line: 6
+class X {
+	void A ()
+	{
+		float f = 2.0;
+	}
+}
diff --git a/mcs/errors/cs0668.cs b/mcs/errors/cs0668.cs
new file mode 100755
index 00000000000..04408a390d2
--- /dev/null
+++ b/mcs/errors/cs0668.cs
@@ -0,0 +1,28 @@
+// cs0668.cs: Two indexers have different names, they should have the same name across the board.
+// Line: 
+
+using System.Runtime.CompilerServices;
+class A {
+	[IndexerName ("Blah")]
+	int this [int a] {
+	get { return 1; }
+	}
+	
+	[IndexerName ("Foo")]
+	int this [string b] {
+	get { return 2; }
+	}
+	
+        public static int Main ()
+        {
+		int a = 5;
+		
+		if (!(a is object))
+			return 3;
+
+		return 0;
+        }
+}
+
+
+
diff --git a/mcs/errors/cs0677.cs b/mcs/errors/cs0677.cs
new file mode 100755
index 00000000000..822724a9b53
--- /dev/null
+++ b/mcs/errors/cs0677.cs
@@ -0,0 +1,12 @@
+// cs0677.cs: X.a volatile field can not be of type "A"
+// Line: 8
+using System;
+
+struct A { int a; }
+
+class X {
+	public volatile A a;
+	static void Main ()
+		{
+		}
+}
diff --git a/mcs/errors/cs1001.cs b/mcs/errors/cs1001.cs
new file mode 100755
index 00000000000..d9fa6b29d28
--- /dev/null
+++ b/mcs/errors/cs1001.cs
@@ -0,0 +1,11 @@
+//
+// cs1001: identifier expected
+// Line: 8
+
+class T {
+
+	// Change (args) to (string args) to fix it
+	public static int Main (args)
+	{
+	}
+}
diff --git a/mcs/errors/cs1002.cs b/mcs/errors/cs1002.cs
new file mode 100755
index 00000000000..65de1280ea9
--- /dev/null
+++ b/mcs/errors/cs1002.cs
@@ -0,0 +1,10 @@
+// cs1002.cs: ; expected
+// Line: 8
+
+class T {
+	void member ()
+	{
+		int a = 1 | 2
+		int b;
+	}
+}
diff --git a/mcs/errors/cs1008.cs b/mcs/errors/cs1008.cs
new file mode 100644
index 00000000000..3c49e166dd8
--- /dev/null
+++ b/mcs/errors/cs1008.cs
@@ -0,0 +1,14 @@
+// cs1008.cs : Type byte, sbyte, short, ushort, int, uint, long, or ulong expected
+// Line : 7
+
+public class Blah {
+
+	public enum MyEnum {
+		Foo = "foo",
+		Bar
+	}
+
+	public static void Main ()
+	{
+	}
+}
diff --git a/mcs/errors/cs1010.cs b/mcs/errors/cs1010.cs
new file mode 100644
index 00000000000..f70d4910328
--- /dev/null
+++ b/mcs/errors/cs1010.cs
@@ -0,0 +1,8 @@
+// cs1010.cs : Newline in constant

+// Line : 6

+

+class X

+{

+	static string s = "Hello

+world!";

+}
\ No newline at end of file
diff --git a/mcs/errors/cs1011.cs b/mcs/errors/cs1011.cs
new file mode 100755
index 00000000000..ce78e701617
--- /dev/null
+++ b/mcs/errors/cs1011.cs
@@ -0,0 +1,6 @@
+// cs1011: Empty character literal
+// Line: 5
+
+class T {
+	char c = '';
+}
diff --git a/mcs/errors/cs1012.cs b/mcs/errors/cs1012.cs
new file mode 100755
index 00000000000..61e65b63a88
--- /dev/null
+++ b/mcs/errors/cs1012.cs
@@ -0,0 +1,6 @@
+// cs1012: Too many characters in character literal
+// Line: 5
+
+class x {
+	char x = 'xx';
+}
diff --git a/mcs/errors/cs1019.cs b/mcs/errors/cs1019.cs
new file mode 100644
index 00000000000..4fe30f842f7
--- /dev/null
+++ b/mcs/errors/cs1019.cs
@@ -0,0 +1,27 @@
+// cs1019.cs : Overloadable unary operator expected
+// Line : 18
+
+public class MyClass {
+
+	public int this[int ndx] 
+	{
+		get { }
+		set { }
+	}
+
+	public event EventHandler Click 
+	{
+		add { } 
+		remove { }
+	}
+
+	public static MyClass operator/ (MyClass i)
+	{
+	
+	}
+
+	public static implicit operator MyClass (Object o)
+	{
+
+	}
+}
diff --git a/mcs/errors/cs102.cs b/mcs/errors/cs102.cs
new file mode 100755
index 00000000000..68f366156f3
--- /dev/null
+++ b/mcs/errors/cs102.cs
@@ -0,0 +1,7 @@
+// cs102.cs: The class 'X' already contains a definition for 'A'
+// Line: 6
+class X {
+	const int A = 10;
+
+	int A () {}
+}
diff --git a/mcs/errors/cs1020.cs b/mcs/errors/cs1020.cs
new file mode 100644
index 00000000000..891a613331f
--- /dev/null
+++ b/mcs/errors/cs1020.cs
@@ -0,0 +1,28 @@
+// cs1020.cs : Overloadable binary operator expected
+// Line : 19
+
+
+public class MyClass {
+
+	public int this[int ndx] 
+	{
+		get { }
+		set { }
+	}
+
+	public event EventHandler Click 
+	{
+		add { } 
+		remove { }
+	}
+
+	public static MyClass operator++ (MyClass i, MyClass j)
+	{
+	
+	}
+
+	public static implicit operator MyClass (Object o)
+	{
+
+	}
+}
diff --git a/mcs/errors/cs1021-2.cs b/mcs/errors/cs1021-2.cs
new file mode 100755
index 00000000000..8507e2737c1
--- /dev/null
+++ b/mcs/errors/cs1021-2.cs
@@ -0,0 +1,8 @@
+//

+// cs1021: Integral constant is too large

+

+class X {

+	public static void Main() {

+		int h = 0xffffffffffffffffffffffffff;

+	}

+}

diff --git a/mcs/errors/cs1021.cs b/mcs/errors/cs1021.cs
new file mode 100755
index 00000000000..50b5f591c1f
--- /dev/null
+++ b/mcs/errors/cs1021.cs
@@ -0,0 +1,8 @@
+//

+// cs1021: Integral constant is too large

+

+class X {

+	public static void Main() {

+		int i = 123821738792178327198;

+	}

+}

diff --git a/mcs/errors/cs1032.cs b/mcs/errors/cs1032.cs
new file mode 100755
index 00000000000..e6640a68fe9
--- /dev/null
+++ b/mcs/errors/cs1032.cs
@@ -0,0 +1,8 @@
+// cs1032: tokens seen before define
+// Line: 4
+class X {
+#define A
+
+	static void Main () {
+	}
+}
diff --git a/mcs/errors/cs1033.cs b/mcs/errors/cs1033.cs
new file mode 100644
index 00000000000..09eb11104c2
--- /dev/null
+++ b/mcs/errors/cs1033.cs
@@ -0,0 +1,7 @@
+// cs1033.cs : @ must be followed by " (or identifier)

+// Line : 6

+

+class X 

+{

+	static string s = @ ;

+}

diff --git a/mcs/errors/cs1039.cs b/mcs/errors/cs1039.cs
new file mode 100644
index 00000000000..df6c8f7d63f
--- /dev/null
+++ b/mcs/errors/cs1039.cs
@@ -0,0 +1,6 @@
+// cs1039.cs : Unterminated string constant

+// Line : 6

+

+class X

+{

+	static string s = "foo
\ No newline at end of file
diff --git a/mcs/errors/cs1501-2.cs b/mcs/errors/cs1501-2.cs
new file mode 100755
index 00000000000..18d3b1a381d
--- /dev/null
+++ b/mcs/errors/cs1501-2.cs
@@ -0,0 +1,14 @@
+// cs1501: no match for this argument list
+// Line: 11
+class X {
+
+	X (int a)
+	{
+	}
+	
+	static void Main ()
+	{
+		new X ();
+	}
+}
+	
diff --git a/mcs/errors/cs1501-3.cs b/mcs/errors/cs1501-3.cs
new file mode 100644
index 00000000000..e9a8573c826
--- /dev/null
+++ b/mcs/errors/cs1501-3.cs
@@ -0,0 +1,8 @@
+// CS1501: No overload for method 'X' takes '2' arguments
+public struct X {
+        public X(int i) { }
+        
+        public static void Main() {
+                X x = new X("foo", "bar");
+        }
+}
diff --git a/mcs/errors/cs1501.cs b/mcs/errors/cs1501.cs
new file mode 100755
index 00000000000..10342181e28
--- /dev/null
+++ b/mcs/errors/cs1501.cs
@@ -0,0 +1,15 @@
+// cs1501.cs: No overload for method `Base' takes `0' arguments
+// Line: 12
+class Base {
+	Base (string x)
+	{
+	}
+}
+
+// Notice how there is no invocation to "base (something)"
+
+class Derived : Base {
+	Derived ()
+	{
+	}
+}
diff --git a/mcs/errors/cs1510.cs b/mcs/errors/cs1510.cs
new file mode 100755
index 00000000000..4feba3810f6
--- /dev/null
+++ b/mcs/errors/cs1510.cs
@@ -0,0 +1,13 @@
+// cs1510: an lvalue is required for ref or out argument
+// Line: 11
+class X {
+	public static void m (ref int i)
+	{
+		i++;
+	}
+
+	static void Main ()
+	{
+		m (ref 4);
+	}
+}
diff --git a/mcs/errors/cs1511.cs b/mcs/errors/cs1511.cs
new file mode 100755
index 00000000000..4ec26c689b4
--- /dev/null
+++ b/mcs/errors/cs1511.cs
@@ -0,0 +1,14 @@
+// cs1511.cs: Base modifier not allowed in static code
+// Line:
+
+class Y {
+	public int a;
+}
+
+class X : Y {
+
+	static void Main ()
+	{
+		base.a = 1;
+	}
+}
diff --git a/mcs/errors/cs1513.cs b/mcs/errors/cs1513.cs
new file mode 100755
index 00000000000..819528ced96
--- /dev/null
+++ b/mcs/errors/cs1513.cs
@@ -0,0 +1,3 @@
+namespace X  {
+
+	
diff --git a/mcs/errors/cs1518.cs b/mcs/errors/cs1518.cs
new file mode 100755
index 00000000000..89036e1ee62
--- /dev/null
+++ b/mcs/errors/cs1518.cs
@@ -0,0 +1,6 @@
+//cs1518.cs: namespace can only contain class, interface, enum, struct or delegate
+// Line: 5
+namespace X {
+
+	sealed fe {}
+}
diff --git a/mcs/errors/cs1520.cs b/mcs/errors/cs1520.cs
new file mode 100755
index 00000000000..23dbafd0fcc
--- /dev/null
+++ b/mcs/errors/cs1520.cs
@@ -0,0 +1,12 @@
+//
+// cs1520: Class, struct or interface method must have a return type
+// Line: 9
+
+class test {
+
+	// To fix add a return type
+	
+	public static Main (string[] args)
+	{
+	}
+}
diff --git a/mcs/errors/cs1523.cs b/mcs/errors/cs1523.cs
new file mode 100755
index 00000000000..fda07fd98f6
--- /dev/null
+++ b/mcs/errors/cs1523.cs
@@ -0,0 +1,14 @@
+// cs1523: case or default must precede code in switch statement
+// Line: 11
+
+class X {
+
+	static void Main ()
+	{
+		int i = 0;
+
+		switch (i){
+			i = 4;
+		}
+	}
+}
diff --git a/mcs/errors/cs1524.cs b/mcs/errors/cs1524.cs
new file mode 100755
index 00000000000..b43976cc0bd
--- /dev/null
+++ b/mcs/errors/cs1524.cs
@@ -0,0 +1,15 @@
+// cs1524.cs: expected catch or finally
+// Line: 12
+
+namespace Test {
+        public class Test {
+                public static int Main () {
+                        int a;
+                        try {
+                                a = 1;
+                        }
+
+                        return 0;
+                }
+        }
+}
diff --git a/mcs/errors/cs1525.cs b/mcs/errors/cs1525.cs
new file mode 100755
index 00000000000..dc1459ceac0
--- /dev/null
+++ b/mcs/errors/cs1525.cs
@@ -0,0 +1,8 @@
+// cs1525: Invalid expression term.
+// Line: 7
+class X {
+	X ()
+	{
+	label1:
+	}
+}
diff --git a/mcs/errors/cs1526.cs b/mcs/errors/cs1526.cs
new file mode 100755
index 00000000000..582d451ea89
--- /dev/null
+++ b/mcs/errors/cs1526.cs
@@ -0,0 +1,8 @@
+// cs1526: new expression requires () or [] after type
+// Line: 6
+class X {
+        static void Main ()
+	{
+		X x = new X;
+	}
+}
diff --git a/mcs/errors/cs1527.cs b/mcs/errors/cs1527.cs
new file mode 100755
index 00000000000..663f880cd58
--- /dev/null
+++ b/mcs/errors/cs1527.cs
@@ -0,0 +1,4 @@
+// cs1527.cs: namespace elements cant explicitly be declared protected or private
+// Line:
+private class X {
+}
diff --git a/mcs/errors/cs1528.cs b/mcs/errors/cs1528.cs
new file mode 100755
index 00000000000..7223adc8f40
--- /dev/null
+++ b/mcs/errors/cs1528.cs
@@ -0,0 +1,14 @@
+// cs1528.cs: cant specify constructor arguments in declaration
+// Line:
+class X {
+	X (int a)
+	{
+	}
+}
+
+class Y {
+	static void Main ()
+	{
+		X x (4);
+	}
+}
diff --git a/mcs/errors/cs1529.cs b/mcs/errors/cs1529.cs
new file mode 100755
index 00000000000..d822cb7cef1
--- /dev/null
+++ b/mcs/errors/cs1529.cs
@@ -0,0 +1,4 @@
+// cs1529.cs: Using clause must precede all other namespace elements
+// Line: 4
+class X { }
+using System;
diff --git a/mcs/errors/cs1530.cs b/mcs/errors/cs1530.cs
new file mode 100755
index 00000000000..7ed13b49dcf
--- /dev/null
+++ b/mcs/errors/cs1530.cs
@@ -0,0 +1,7 @@
+// cs1530.cs: New not allowed on namespace declarations
+// Line: 
+namespace A {
+
+	new class X {
+	}
+}
diff --git a/mcs/errors/cs1540.cs b/mcs/errors/cs1540.cs
new file mode 100644
index 00000000000..6ba524e4869
--- /dev/null
+++ b/mcs/errors/cs1540.cs
@@ -0,0 +1,13 @@
+class A
+{
+        protected int n;
+}
+
+class B : A
+{
+        public static void Main ()
+	{
+		A b = new A ();
+		b.n = 1;
+	}
+}
diff --git a/mcs/errors/cs1552.cs b/mcs/errors/cs1552.cs
new file mode 100755
index 00000000000..b64f87bf1c2
--- /dev/null
+++ b/mcs/errors/cs1552.cs
@@ -0,0 +1,11 @@
+//
+// cs1552.cs: Array type specified, [] must appear before parameter name
+// Line: 8
+
+class T {
+	// To fix: change (string args[]) to (string [] args)
+	
+	public static int Main (string args[])
+	{
+	}
+}
diff --git a/mcs/errors/cs1579.cs b/mcs/errors/cs1579.cs
new file mode 100755
index 00000000000..93fc43044af
--- /dev/null
+++ b/mcs/errors/cs1579.cs
@@ -0,0 +1,13 @@
+// cs1579.cs: foreach statement cannot operate on variables of type X because X does not contain a definition for GetEnumerator or is not accessible
+// Line: 10
+class X {
+}
+
+class Y {
+	void yy (X b)
+	{
+		
+		foreach (object a in b)
+			;
+	}
+}
diff --git a/mcs/errors/cs1593.cs b/mcs/errors/cs1593.cs
new file mode 100644
index 00000000000..755cd703170
--- /dev/null
+++ b/mcs/errors/cs1593.cs
@@ -0,0 +1,30 @@
+// cs1593.cs : Delegate 'Blah.MyDelegate' does not take '1' arguments
+// Line : 21
+
+using System;
+
+public class Blah {
+
+	public delegate int MyDelegate (int i, int j);
+	
+	public int Foo (int i, int j)
+	{
+		return i+j;
+	}
+
+	public static int Main ()
+	{
+		Blah i = new Blah ();
+
+		MyDelegate del = new MyDelegate (i.Foo);
+
+		int number = del (2);
+
+		if (number == 5)
+			return 0;
+		else
+			return 1;
+
+	}
+
+}
diff --git a/mcs/errors/cs1594.cs b/mcs/errors/cs1594.cs
new file mode 100644
index 00000000000..0ffb3d9e761
--- /dev/null
+++ b/mcs/errors/cs1594.cs
@@ -0,0 +1,30 @@
+// cs1594.cs : Delegate 'Blah.MyDelegate' has some invalid arguments.
+// Line : 21
+
+using System;
+
+public class Blah {
+
+	public delegate int MyDelegate (int i, int j);
+	
+	public int Foo (int i, int j)
+	{
+		return i+j;
+	}
+
+	public static int Main ()
+	{
+		Blah i = new Blah ();
+
+		MyDelegate del = new MyDelegate (i.Foo);
+
+		int number = del (2, "a string");
+
+		if (number == 5)
+			return 0;
+		else
+			return 1;
+
+	}
+
+}
diff --git a/mcs/errors/cs1604.cs b/mcs/errors/cs1604.cs
new file mode 100755
index 00000000000..1e87da758a1
--- /dev/null
+++ b/mcs/errors/cs1604.cs
@@ -0,0 +1,14 @@
+// cs1604.cs: m is a readonly variable
+// line: 10
+using System.IO;
+
+class X {
+
+	static void Main ()
+	{
+		using (MemoryStream m = new MemoryStream ()){
+			m = null;
+		}
+	}
+}
+	
diff --git a/mcs/errors/cs5001.cs b/mcs/errors/cs5001.cs
new file mode 100755
index 00000000000..712760b76e0
--- /dev/null
+++ b/mcs/errors/cs5001.cs
@@ -0,0 +1,8 @@
+//cs5001: Program x does not have an entry point defined
+
+using System;
+using System.Collections;
+
+namespace Butt {
+}
+
diff --git a/mcs/errors/error-1.cs b/mcs/errors/error-1.cs
new file mode 100644
index 00000000000..49d084654cd
--- /dev/null
+++ b/mcs/errors/error-1.cs
@@ -0,0 +1,92 @@
+// This test must produce a compilation error in each method.
+using System;
+
+public class X
+{
+	public static int Main ()
+	{
+		// This is a compilation-only test.
+		return 0;
+	}
+
+	// Must assign out parameter.
+	// CS0177
+	public static void test1 (out float f)
+	{
+	}
+
+	// Must assign it before returning.
+	public static void test2 (int a, out float f)
+	{
+		// CS0177
+		if (a == 5)
+			return;
+
+		f = 8.53F;
+	}
+
+	public static void test3 (out float f)
+	{
+		try {
+			f = 8.53F;
+		} catch {
+			return;
+		}
+		// CS0177
+	}
+
+	public static int test4 ()
+	{
+		int a;
+
+		try {
+			a = 3;
+		} catch {
+			Console.WriteLine ("EXCEPTION");
+		}
+
+		// CS0165
+		return a;
+	}
+
+	public static int test5 ()
+	{
+		int a;
+
+		try {
+			Console.WriteLine ("TRY");
+			a = 8;
+		} catch {
+			a = 9;
+		} finally {
+			// CS0165
+			Console.WriteLine (a);
+		}
+
+		return a;
+	}
+
+	public static void test6 (int a, out float f)
+	{
+		do {
+			// CS0177
+			if (a == 8) {
+				Console.WriteLine ("Hello");
+				return;
+			}
+		} while (false);
+
+		f = 1.3F;
+		return;
+	}
+
+	// CS0177
+	public static void test7 (out float f)
+	{
+		goto World;
+		f = 8.0F;
+
+	World:
+		;
+	}
+}
diff --git a/mcs/errors/error-2.cs b/mcs/errors/error-2.cs
new file mode 100644
index 00000000000..1b19718e81b
--- /dev/null
+++ b/mcs/errors/error-2.cs
@@ -0,0 +1,106 @@
+class Internal { }
+
+public class Public { }
+
+interface InternalInterface { }
+
+class X
+{
+	public class NestedPublic { }
+
+	internal class NestedAssembly { }
+
+	protected internal class NestedFamilyAndAssembly { }
+
+	protected class NestedFamily { }
+
+	protected class NestedPrivate { }
+
+	static void Main () { }
+}
+
+// CS0060
+public class A : Internal { }
+
+// CS0060
+public class B : X.NestedPublic { }
+// CS0060
+public class C : X.NestedAssembly { }
+// CS0060
+public class D : X.NestedFamilyAndAssembly { }
+
+// CS0059
+public delegate void E (Internal i);
+// CS0058
+public delegate Internal F ();
+
+public class Y
+{
+	// CS0060
+	public class YA : Internal { }
+	// CS0060
+	public class YB : X.NestedPublic { }
+	// CS0060
+	public class YC : X.NestedAssembly { }
+	// CS0060
+	public class YD : X.NestedFamilyAndAssembly { }
+
+	// CS0051
+	public void YMA (Internal a) { }
+	// CS0051
+	public void YMB (X.NestedPublic a) { }
+	// CS0051
+	public void YMC (X.NestedAssembly a) { }
+	// CS0051
+	public void YMD (X.NestedFamilyAndAssembly a) { }
+
+	// CS0050
+	public Internal YME () { }
+
+	// CS0052
+	public Internal YE;
+
+	// CS0053
+	public Internal YF {
+		get { return null; }
+	}
+
+	// CS0054
+	public Internal this [int a] {
+		get { return null; }
+	}
+
+	// CS0052
+	public event Internal YG;
+
+	// CS0055
+	public int this [Internal i] {
+		get { return; }
+	}
+}
+
+class Z : X
+{
+	// CS0060
+	public class ZA : NestedFamily { }
+	// CS0060
+	internal class ZB : NestedFamily { }
+}
+
+internal interface L
+{
+	void Hello (string hello);
+}
+
+// CS0061
+public interface M : L
+{
+	void World (string world);
+}
+
+public class N : M
+{
+	public void Hello (string hello) { }
+
+	public void World (string world) { }
+}
diff --git a/mcs/errors/error-3.cs b/mcs/errors/error-3.cs
new file mode 100644
index 00000000000..5dfe8996555
--- /dev/null
+++ b/mcs/errors/error-3.cs
@@ -0,0 +1,60 @@
+using System;
+
+struct A
+{
+	public int a;
+	private long b;
+	private float c;
+
+	public A (int foo)
+	// CS0171
+	{
+		a = foo;
+		// CS0170
+		b = (long) c;
+	}
+}
+
+class X
+{
+	// CS0177
+	static void test1 (out A a)
+	{
+		a.a = 5;
+	}
+
+	static void test_output (A a)
+	{
+	}
+
+	static void test2 ()
+	{
+		A a;
+
+		// CS0165
+		test_output (a);
+	}
+
+	static void test3 ()
+	{
+		A a;
+
+		a.a = 5;
+		// CS0165
+		test_output (a);
+	}
+
+	static void test4 ()
+	{
+		A a;
+
+		// CS0170
+		Console.WriteLine (a.a);
+	}
+
+	public static int Main ()
+	{
+		// Compilation-only test.
+		return 0;
+	}
+}
diff --git a/mcs/errors/error-4.cs b/mcs/errors/error-4.cs
new file mode 100644
index 00000000000..05edea56cdd
--- /dev/null
+++ b/mcs/errors/error-4.cs
@@ -0,0 +1,22 @@
+// This should not compile as void can't be converted to bool
+
+using System;
+
+public class MainClass
+{
+        public static void Main()
+        {
+		test MyBug = new test();
+                Console.WriteLine (MyBug.mytest());
+	}
+}
+
+public class   test
+{
+        public void mytest()
+        {
+                Console.WriteLine("test");
+	}
+}
+
+
diff --git a/mcs/errors/error-5.cs b/mcs/errors/error-5.cs
new file mode 100644
index 00000000000..1cb3b060e74
--- /dev/null
+++ b/mcs/errors/error-5.cs
@@ -0,0 +1,17 @@
+// The event access is illegal and it should bail out
+
+using System;
+
+delegate void MyEventHandler();
+
+class MyEvent {
+	public event MyEventHandler SomeEvent;
+}
+
+class EventDemo {
+
+	public static void Main(){
+		MyEvent evt = new MyEvent();
+                evt.SomeEvent();
+        }
+}
diff --git a/mcs/errors/errors.txt b/mcs/errors/errors.txt
new file mode 100755
index 00000000000..4f7050be037
--- /dev/null
+++ b/mcs/errors/errors.txt
@@ -0,0 +1,70 @@
+We use negative numbers for the compiler, and leave the possitive
+numbers to match the Microsoft numbers:
+
+-1	An Primary Expression was parsed, when a Type was expected.
+	This happens because my parser knowledge is limited, and I
+	am not good at writing grammars.  It is still an error,
+	but if I were smarter, I would have found a Bison/Yacc way
+	of handling it.
+
+-2	Internal error, an interface is being defined inside an
+	interface (This should never happen).
+
+-3      Constant type is not one of sbyte, byte, short, ushort, int,
+	uint, long, ulong, char, float, double, decimal, bool, string, enum
+	or null type. 
+
+-5      A search for a name on a Type returned matches that contain
+	methods and non-methods.  They have the same name, and I do
+	not know how this is possible to begin with.
+
+-6      Generic internal compiler error.
+
+-7      Internal compiler error/library error: no default constructor
+	for a built-in type.  Ie, decimal (int 32)
+
+-8	User-defined conversion cannot convert from or to object type.
+
+-9	User-defined conversion cannot convert from or to an interface type.
+
+-10	User-defined conversion cannot convert between types that derive 
+	from each other.
+
+-11	Delegate creation expression takes only one argument
+
+-12     More than one integral conversion exists for the type on a
+	switch statement.
+
+-13	No return with a value found.  Warning, since we currently
+	do not perform flow analysis, and can not tell whether a
+	ret is required or not.
+
+-14     Invalid number passed to probe
+
+-15	Can not locate default assembly path
+
+-16	Can not use System.Enum.ToObject (type, ConstantValue) with
+	user defined types.
+
+-17     A type has already been defined (try --nostdlib)
+
+-18	Do not know how to generate debugging information for this platform.
+
+-19     Can not find required utility function in the core libraries.
+
+-20	Cannot find attribute type Blah (maybe you forgot to set the 
+	usage using the AttributeUsage attribute ?).
+
+-21	Bug in Microsoft compiler while applying named attribute for
+	StructLayout.CharSet value.
+
+-22     Location of previous error 
+
+-23	.NET runtime error when encoding attributes whose constructor
+	takes an object, but an enumeration value that is boxed is
+	passed.
+
+	Sample:
+		using System.ComponentModel;
+		[DefaultValue (CollectionChangeAction.Add)]
+		class X { static void Main () {	} }
diff --git a/mcs/errors/fail b/mcs/errors/fail
new file mode 100755
index 00000000000..7ff0429db42
--- /dev/null
+++ b/mcs/errors/fail
@@ -0,0 +1,30 @@
+The following tests failed: 
+
+cs0051.cs: We don't complain about inconsistent accessibility.
+cs0060.cs: We don't complain about inconsistent accessibility.
+cs0108.cs: We should re-enable the test code in the compiler
+cs0110.cs: Stack overflow in the compiler
+cs0111.cs: We don't complain about second occurance of method definition.
+cs0118.cs: We report the error, but the CSC error gives more information.
+cs0136.cs: Similar error reported (reuse of variable name, 128)
+cs0136-2.cs: Similar error reported (reuse of variable name, 128)
+cs0164.cs: We dont emit the warning for an unused label
+cs0165.cs: We need data flow analysis
+cs0165-2.cs: We need data flow analysis
+cs0171.cs: We do not track unassigned struct fields on struct constructors 
+cs0216.cs: We do not report missing operators.
+cs0234.cs: Will be hard to fix;
+cs0255.cs: Error isn't flagged.
+cs0523.cs: Error isn't flagged.
+cs0529.cs: We get error CS0146 instead
+cs0654.cs: Compiler crash
+cs1001.cs: Compiler emits syntax error;  Its ok.
+cs1513.cs: Syntax error;  We could provide better message
+cs1518.cs: Syntax error;  We could provide better message
+cs1525.cs: Syntax error;  We could provide better message
+cs1528.cs: Syntax error;  We could provide better message
+cs1529.cs: Syntax error;  We could provide better message
+cs1552.cs: Syntax error;  We could provide better message
+cs1604.cs: Error isn't flagged.
+cs-20.cs: Attribute error isn't flagged
+
diff --git a/mcs/errors/makefile b/mcs/errors/makefile
new file mode 100755
index 00000000000..8edc6cc8730
--- /dev/null
+++ b/mcs/errors/makefile
@@ -0,0 +1,48 @@
+#
+# Compile at the maximum warning level to probe for warnings
+#
+MCS=mono ../mcs/mcs.exe --wlevel 4 # for linux
+#MCS=../mcs/mcs.exe --wlevel 4 # for windows
+
+
+all:
+	@ failed=false; \
+	for i in cs*.cs; do \
+		case $$i in \
+			cs[0-9]*-[0-9]*cs) \
+			error=`echo $$i | sed -e 's/cs*//' -e 's/.cs//' -e 's/-.*//'`; \
+			;;\
+			cs[0-9-]*cs)  \
+			error=`echo $$i | sed -e 's/cs*//' -e 's/.cs//'`; \
+			;;\
+		esac; \
+		echo -n "Running test $$i ... "; \
+		if $(MCS) --unsafe --expect-error $$error $$i > /dev/null; \
+		then echo OK; \
+		else echo FAILED; \
+		     flist="$$flist $$i"; \
+		     failed=true; \
+		fi; \
+	done; \
+	if $$failed; then \
+		echo "The following tests failed: $$flist"; \
+	else \
+		echo All tests passed; \
+	fi
+
+test-error-mono:
+	@ failed=false; \
+	for i in error-*.cs; do \
+		echo -n "Running test $$i ... "; \
+		if MCS='$(MCS)' perl ./runtest.pl $$i > /dev/null; \
+		then echo OK; \
+		else echo FAILED; \
+		     flist="$$flist $$i"; \
+		     failed=true; \
+		fi; \
+	done; \
+	if $$failed; then \
+		echo "The following tests failed: $$flist"; \
+	else \
+		echo All tests passed; \
+	fi
diff --git a/mcs/errors/runtest.pl b/mcs/errors/runtest.pl
new file mode 100755
index 00000000000..09ace98e74d
--- /dev/null
+++ b/mcs/errors/runtest.pl
@@ -0,0 +1,105 @@
+#!/usr/bin/perl -w
+
+use strict;
+use IPC::Open3;
+
+# Setting $strict to 1 enables line number checks, setting it to 2 makes
+# line number mismatches fatal.
+my $strict = 2;
+my $failures = 0;
+my $mcs = (defined $ENV{MCS}) ? $ENV{MCS} : 'mcs';
+
+unless ($#ARGV == 0) {
+    print STDERR "Usage: $0 testcase.cs\n";
+    exit 1;
+}
+
+my %errors = ();
+my %warnings = ();
+my %lines = ();
+
+my $filename = $ARGV [0];
+my $input;
+
+my $line = 0;
+
+open (INPUT, "<$filename") or die
+    "Can't open testcase: $!";
+while (defined ($input = <INPUT>)) {
+    ++$line;
+    chop $input;
+    next unless $input =~ m,^\s*//\s*(error|warning)?\s*(CS\d+),;
+
+    if ((defined $1) and ($1 eq 'warning')) {
+	++$warnings{$2};
+    } else {
+	++$errors{$2};
+    }
+
+    $lines{$line+1} = $2;
+}
+close INPUT;
+
+open (MCS, "$mcs $filename|") or die
+    "Can't open mcs pipe: $!";
+
+while (defined ($input = <MCS>)) {
+    chop $input;
+    next unless $input =~ m,\((\d+)\)\s+(warning|error)\s+(CS\d+):,;
+
+    if ($2 eq 'warning') {
+	--$warnings{$3};
+    } else {
+	--$errors{$3};
+    }
+
+    next unless $strict;
+
+    if (!defined $lines{$1}) {
+	print "Didn't expect any warnings or errors in line $1, but got $2 $3.\n";
+	$failures++ if $strict == 2;
+    } elsif ($lines{$1} ne $3) {
+	print "Expected to find ".$lines{$1}." on line $1, but got $3.\n";
+	$failures++ if $strict == 2;
+    }
+}
+
+close MCS;
+
+foreach my $error (keys %errors) {
+    my $times = $errors{$error};
+
+    if ($times == -1) {
+	print "Unexpected error $error.\n";
+    } elsif ($times < 0) {
+	print "Unexpected error $error (reported ".(-$times)." times).\n";
+    } elsif ($times == 1) {
+	print "Failed to report error $error.\n";
+    } elsif ($times > 0) {
+	print "Failed to report error $error $times times.\n";
+    }
+
+    $failures++ unless $times == 0;    
+}
+
+foreach my $warning (keys %warnings) {
+    my $times = $warnings{$warning};
+
+    if ($times == -1) {
+	print "Unexpected warning $warning.\n";
+    } elsif ($times < 0) {
+	print "Unexpected warning $warning (reported ".(-$times)." times).\n";
+    } elsif ($times == 1) {
+	print "Failed to report warning $warning.\n";
+    } elsif ($times > 0) {
+	print "Failed to report warning $warning $times times.\n";
+    }
+
+    $failures++ unless $times == 0;    
+}
+
+if ($failures == 0) {
+    exit 0;
+} else {
+    exit 1;
+}
diff --git a/mcs/jay/.cvsignore b/mcs/jay/.cvsignore
new file mode 100755
index 00000000000..75b36e0911d
--- /dev/null
+++ b/mcs/jay/.cvsignore
@@ -0,0 +1,2 @@
+jay
+jay.exe
diff --git a/mcs/jay/ACKNOWLEDGEMENTS b/mcs/jay/ACKNOWLEDGEMENTS
new file mode 100644
index 00000000000..b66bb250645
--- /dev/null
+++ b/mcs/jay/ACKNOWLEDGEMENTS
@@ -0,0 +1,25 @@
+     Berkeley Yacc owes much to the unflagging efforts of Keith Bostic.
+His badgering kept me working on it long after I was ready to quit.
+
+     Berkeley Yacc is based on the excellent algorithm for computing LALR(1)
+lookaheads developed by Tom Pennello and Frank DeRemer.  The algorithm is
+described in their almost impenetrable article in TOPLAS 4,4.
+
+     Finally, much of the credit for the latest version must go to those
+who pointed out deficiencies of my earlier releases.  Among the most
+prolific contributors were
+
+	  Benson I. Margulies
+	  Dave Gentzel
+	  Antoine Verheijen
+	  Peter S. Housel
+	  Dale Smith
+	  Ozan Yigit
+	  John Campbell
+	  Bill Sommerfeld
+	  Paul Hilfinger
+	  Gary Bridgewater
+	  Dave Bakken
+	  Dan Lanciani
+	  Richard Sargent
+	  Parag Patel
diff --git a/mcs/jay/ChangeLog b/mcs/jay/ChangeLog
new file mode 100755
index 00000000000..a32b32b76e6
--- /dev/null
+++ b/mcs/jay/ChangeLog
@@ -0,0 +1,18 @@
+2002-08-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* skeleton.cs: Fix the code that expanded the arrays dynamically,
+	it was broken, and instead was copying 0 elements.
+
+2002-07-10 Alp Toker  <alp@atoker.com>
+
+	* main.c: mktemp() is deprecated with gcc 3.1.1, use mkstemp() instead
+
+2001-07-15  Sean MacIsaac  <macisaac@ximian.com>
+
+	* makefile: added windows and unix targets.
+
+2001-07-14  Sean MacIsaac  <macisaac@ximian.com>
+
+	* main.c: fixed error in command line flag -c if it was not first
+	option.
+
diff --git a/mcs/jay/NEW_FEATURES b/mcs/jay/NEW_FEATURES
new file mode 100644
index 00000000000..b030c625b00
--- /dev/null
+++ b/mcs/jay/NEW_FEATURES
@@ -0,0 +1,46 @@
+     The -r option has been implemented.  The -r option tells Yacc to
+put the read-only tables in y.tab.c and the code and variables in
+y.code.c.  Keith Bostic asked for this option so that :yyfix could be
+eliminated.
+
+     The -l and -t options have been implemented.  The -l option tells
+Yacc not to include #line directives in the code it produces.  The -t
+option causes debugging code to be included in the compiled parser.
+
+     The code for error recovery has been changed to implement the same
+algorithm as AT&T Yacc.  There will still be differences in the way
+error recovery works because AT&T Yacc uses more default reductions
+than Berkeley Yacc.
+
+     The environment variable TMPDIR determines the directory where
+temporary files will be created.  If TMPDIR is defined, temporary files
+will be created in the directory whose pathname is the value of TMPDIR.
+By default, temporary files are created in /tmp.
+
+     The keywords are now case-insensitive.  For example, %nonassoc,
+%NONASSOC, %NonAssoc, and %nOnAsSoC are all equivalent.
+
+     Commas and semicolons that are not part of C code are treated as
+commentary.
+
+     Line-end comments, as in BCPL, are permitted.  Line-end comments
+begin with // and end at the next end-of-line.  Line-end comments are
+permitted in C code; they are converted to C comments on output.
+
+     The form of y.output files has been changed to look more like
+those produced by AT&T Yacc.
+
+     A new kind of declaration has been added.  The form of the declaration
+is
+
+	  %ident string
+
+where string is a sequence of characters begining with a double quote
+and ending with either a double quote or the next end-of-line, whichever
+comes first.  The declaration will cause a #ident directive to be written
+near the start of the output file.
+
+     If a parser has been compiled with debugging code, that code can be
+enabled by setting an environment variable.  If the environment variable
+YYDEBUG is set to 0, debugging output is suppressed.  If it is set to 1,
+debugging output is written to standard output.
diff --git a/mcs/jay/NOTES b/mcs/jay/NOTES
new file mode 100644
index 00000000000..9db3c96ce1b
--- /dev/null
+++ b/mcs/jay/NOTES
@@ -0,0 +1,9 @@
+Berkeley Yacc reflects its origins.  The reason so many routines
+use exactly six register variables is that Berkeley Yacc was
+developed on a VAX using PCC.  PCC placed at most six variables
+in registers.  I went to considerable effort to find which six
+variables most belonged in registers.  Changes in machines and
+compilers make that effort worthless, perhaps even harmful.
+
+The code contains many instances where address calculations are
+performed in particular ways to optimize the code for the VAX.
diff --git a/mcs/jay/README b/mcs/jay/README
new file mode 100644
index 00000000000..e3995505b8a
--- /dev/null
+++ b/mcs/jay/README
@@ -0,0 +1,9 @@
+This is a port of Jay to C#, the original Jay can be found here:
+	http://www.informatik.uni-osnabrueck.de/bernd/jay/
+
+This is a temporary solution as we move to a Bison-generated parser
+as it would provide better error recovery.
+
+The original README from Jay is in `README.jay'
+
+Miguel
diff --git a/mcs/jay/README.jay b/mcs/jay/README.jay
new file mode 100644
index 00000000000..94b7b72e6e4
--- /dev/null
+++ b/mcs/jay/README.jay
@@ -0,0 +1,55 @@
+    This version of Berkeley Yacc was taken from the BSD-Lite CD and targeted
+to Java by
+
+			axel.schreiner@informatik.uni-osnabrueck.de
+
+Makefile -> makefile	removed Berkeleyisms, call it jay
+defs.h			eliminate -dlpr options, %union, output_file, #ident
+			eliminate sekeleton.c references
+error.c			eliminate %union
+main.c			eliminate -dlpr options, %union, output_file
+output.c		eliminate -dlpr options, %union, output_file
+			fix #define, short, -t/yyDebug
+			respell YYERRCODE, YYTABLESIZE, YYFINAL, YYMAXTOKEN
+			output trailer last
+			switch to filter behaviour
+reader.c		eliminate output_file, #ident
+			#line -> // line, pass //
+			yyvsp[] -> yyVals[yyTop], yyval -> yyVal
+skeleton.c -> skeleton	Java skeleton
+test			removed
+yacc.1 -> jay.1		adapted
+yyfix.*			removed
+
+Types: there is a significant difference. yacc uses %union to cast the value
+stack and <tag> to select alternatives. This works for l- and r-values alike.
+jay uses Object as the value stack and <tag> to set a class. l-values must not
+be cast. $n should not be assigned to, but $$ usually is. $n is referenced,
+but $$ usually is not. Consequently jay casts $n and $<tag>$ but not $<>n
+and $$. This makes assignment to $n references to $$ kludgily possible.
+As another kludge, to prevent 'untyped' messages and to avoid unnecessary
+casts, casts to "Object" are not emitted.
+-------------------------------------------------------------------------------
+    Berkeley Yacc is an LALR(1) parser generator.  Berkeley Yacc has been made
+as compatible as possible with AT&T Yacc.  Berkeley Yacc can accept any input
+specification that conforms to the AT&T Yacc documentation.  Specifications
+that take advantage of undocumented features of AT&T Yacc will probably be
+rejected.
+
+    Berkeley Yacc is distributed with no warranty whatever.  The code is certain
+to contain errors.  Neither the author nor any contributor takes responsibility
+for any consequences of its use.
+
+    Berkeley Yacc is in the public domain.  The data structures and algorithms
+used in Berkeley Yacc are all either taken from documents available to the
+general public or are inventions of the author.  Anyone may freely distribute
+source or binary forms of Berkeley Yacc whether unchanged or modified.
+Distributers may charge whatever fees they can obtain for Berkeley Yacc.
+Programs generated by Berkeley Yacc may be distributed freely.
+
+    Please report bugs to
+
+			robert.corbett@eng.Sun.COM
+
+Include a small example if possible.  Please include the banner string from
+skeleton.c with the bug report.  Do not expect rapid responses.
diff --git a/mcs/jay/closure.c b/mcs/jay/closure.c
new file mode 100644
index 00000000000..5f63c5f32cd
--- /dev/null
+++ b/mcs/jay/closure.c
@@ -0,0 +1,295 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)closure.c	5.3 (Berkeley) 5/24/93";
+#endif /* not lint */
+
+#include "defs.h"
+
+short *itemset;
+short *itemsetend;
+unsigned *ruleset;
+
+static unsigned *first_derives;
+static unsigned *EFF;
+
+
+set_EFF()
+{
+    register unsigned *row;
+    register int symbol;
+    register short *sp;
+    register int rowsize;
+    register int i;
+    register int rule;
+
+    rowsize = WORDSIZE(nvars);
+    EFF = NEW2(nvars * rowsize, unsigned);
+
+    row = EFF;
+    for (i = start_symbol; i < nsyms; i++)
+    {
+	sp = derives[i];
+	for (rule = *sp; rule > 0; rule = *++sp)
+	{
+	    symbol = ritem[rrhs[rule]];
+	    if (ISVAR(symbol))
+	    {
+		symbol -= start_symbol;
+		SETBIT(row, symbol);
+	    }
+	}
+	row += rowsize;
+    }
+
+    reflexive_transitive_closure(EFF, nvars);
+
+#ifdef	DEBUG
+    print_EFF();
+#endif
+}
+
+
+set_first_derives()
+{
+    register unsigned *rrow;
+    register unsigned *vrow;
+    register int j;
+    register unsigned k;
+    register unsigned cword;
+    register short *rp;
+
+    int rule;
+    int i;
+    int rulesetsize;
+    int varsetsize;
+
+    rulesetsize = WORDSIZE(nrules);
+    varsetsize = WORDSIZE(nvars);
+    first_derives = NEW2(nvars * rulesetsize, unsigned) - ntokens * rulesetsize;
+
+    set_EFF();
+
+    rrow = first_derives + ntokens * rulesetsize;
+    for (i = start_symbol; i < nsyms; i++)
+    {
+	vrow = EFF + ((i - ntokens) * varsetsize);
+	k = BITS_PER_WORD;
+	for (j = start_symbol; j < nsyms; k++, j++)
+	{
+	    if (k >= BITS_PER_WORD)
+	    {
+		cword = *vrow++;
+		k = 0;
+	    }
+
+	    if (cword & (1 << k))
+	    {
+		rp = derives[j];
+		while ((rule = *rp++) >= 0)
+		{
+		    SETBIT(rrow, rule);
+		}
+	    }
+	}
+
+	vrow += varsetsize;
+	rrow += rulesetsize;
+    }
+
+#ifdef	DEBUG
+    print_first_derives();
+#endif
+
+    FREE(EFF);
+}
+
+
+closure(nucleus, n)
+short *nucleus;
+int n;
+{
+    register int ruleno;
+    register unsigned word;
+    register unsigned i;
+    register short *csp;
+    register unsigned *dsp;
+    register unsigned *rsp;
+    register int rulesetsize;
+
+    short *csend;
+    unsigned *rsend;
+    int symbol;
+    int itemno;
+
+    rulesetsize = WORDSIZE(nrules);
+    rsp = ruleset;
+    rsend = ruleset + rulesetsize;
+    for (rsp = ruleset; rsp < rsend; rsp++)
+	*rsp = 0;
+
+    csend = nucleus + n;
+    for (csp = nucleus; csp < csend; ++csp)
+    {
+	symbol = ritem[*csp];
+	if (ISVAR(symbol))
+	{
+	    dsp = first_derives + symbol * rulesetsize;
+	    rsp = ruleset;
+	    while (rsp < rsend)
+		*rsp++ |= *dsp++;
+	}
+    }
+
+    ruleno = 0;
+    itemsetend = itemset;
+    csp = nucleus;
+    for (rsp = ruleset; rsp < rsend; ++rsp)
+    {
+	word = *rsp;
+	if (word)
+	{
+	    for (i = 0; i < BITS_PER_WORD; ++i)
+	    {
+		if (word & (1 << i))
+		{
+		    itemno = rrhs[ruleno+i];
+		    while (csp < csend && *csp < itemno)
+			*itemsetend++ = *csp++;
+		    *itemsetend++ = itemno;
+		    while (csp < csend && *csp == itemno)
+			++csp;
+		}
+	    }
+	}
+	ruleno += BITS_PER_WORD;
+    }
+
+    while (csp < csend)
+	*itemsetend++ = *csp++;
+
+#ifdef	DEBUG
+  print_closure(n);
+#endif
+}
+
+
+
+finalize_closure()
+{
+  FREE(itemset);
+  FREE(ruleset);
+  FREE(first_derives + ntokens * WORDSIZE(nrules));
+}
+
+
+#ifdef	DEBUG
+
+print_closure(n)
+int n;
+{
+  register short *isp;
+
+  printf("\n\nn = %d\n\n", n);
+  for (isp = itemset; isp < itemsetend; isp++)
+    printf("   %d\n", *isp);
+}
+
+
+print_EFF()
+{
+    register int i, j;
+    register unsigned *rowp;
+    register unsigned word;
+    register unsigned k;
+
+    printf("\n\nEpsilon Free Firsts\n");
+
+    for (i = start_symbol; i < nsyms; i++)
+    {
+	printf("\n%s", symbol_name[i]);
+	rowp = EFF + ((i - start_symbol) * WORDSIZE(nvars));
+	word = *rowp++;
+
+	k = BITS_PER_WORD;
+	for (j = 0; j < nvars; k++, j++)
+	{
+	    if (k >= BITS_PER_WORD)
+	    {
+		word = *rowp++;
+		k = 0;
+	    }
+
+	    if (word & (1 << k))
+		printf("  %s", symbol_name[start_symbol + j]);
+	}
+    }
+}
+
+
+print_first_derives()
+{
+    register int i;
+    register int j;
+    register unsigned *rp;
+    register unsigned cword;
+    register unsigned k;
+
+    printf("\n\n\nFirst Derives\n");
+
+    for (i = start_symbol; i < nsyms; i++)
+    {
+	printf("\n%s derives\n", symbol_name[i]);
+	rp = first_derives + i * WORDSIZE(nrules);
+	k = BITS_PER_WORD;
+	for (j = 0; j <= nrules; k++, j++)
+        {
+	  if (k >= BITS_PER_WORD)
+	  {
+	      cword = *rp++;
+	      k = 0;
+	  }
+
+	  if (cword & (1 << k))
+	    printf("   %d\n", j);
+	}
+    }
+
+  fflush(stdout);
+}
+
+#endif
diff --git a/mcs/jay/defs.h b/mcs/jay/defs.h
new file mode 100644
index 00000000000..ac1d63f53a3
--- /dev/null
+++ b/mcs/jay/defs.h
@@ -0,0 +1,308 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ *	@(#)defs.h	5.6 (Berkeley) 5/24/93
+ */
+
+#include <assert.h>
+#include <ctype.h>
+#include <stdio.h>
+
+
+/*  machine-dependent definitions			*/
+/*  the following definitions are for the Tahoe		*/
+/*  they might have to be changed for other machines	*/
+
+/*  MAXCHAR is the largest unsigned character value	*/
+/*  MAXSHORT is the largest value of a C short		*/
+/*  MINSHORT is the most negative value of a C short	*/
+/*  MAXTABLE is the maximum table size			*/
+/*  BITS_PER_WORD is the number of bits in a C unsigned	*/
+/*  WORDSIZE computes the number of words needed to	*/
+/*	store n bits					*/
+/*  BIT returns the value of the n-th bit starting	*/
+/*	from r (0-indexed)				*/
+/*  SETBIT sets the n-th bit starting from r		*/
+
+#define	MAXCHAR		255
+#define	MAXSHORT	32767
+#define MINSHORT	-32768
+#define MAXTABLE	32500
+#define BITS_PER_WORD	32
+#define	WORDSIZE(n)	(((n)+(BITS_PER_WORD-1))/BITS_PER_WORD)
+#define	BIT(r, n)	((((r)[(n)>>5])>>((n)&31))&1)
+#define	SETBIT(r, n)	((r)[(n)>>5]|=((unsigned)1<<((n)&31)))
+
+
+/*  character names  */
+
+#define	NUL		'\0'    /*  the null character  */
+#define	NEWLINE		'\n'    /*  line feed  */
+#define	SP		' '     /*  space  */
+#define	BS		'\b'    /*  backspace  */
+#define	HT		'\t'    /*  horizontal tab  */
+#define	VT		'\013'  /*  vertical tab  */
+#define	CR		'\r'    /*  carriage return  */
+#define	FF		'\f'    /*  form feed  */
+#define	QUOTE		'\''    /*  single quote  */
+#define	DOUBLE_QUOTE	'\"'    /*  double quote  */
+#define	BACKSLASH	'\\'    /*  backslash  */
+
+
+/* defines for constructing filenames */
+
+#define CODE_SUFFIX	".code.c"
+#define	DEFINES_SUFFIX	".tab.h"
+#define	OUTPUT_SUFFIX	".tab.c"
+#define	VERBOSE_SUFFIX	".output"
+
+
+/* keyword codes */
+
+#define TOKEN 0
+#define LEFT 1
+#define RIGHT 2
+#define NONASSOC 3
+#define MARK 4
+#define TEXT 5
+#define TYPE 6
+#define START 7
+
+
+/*  symbol classes  */
+
+#define UNKNOWN 0
+#define TERM 1
+#define NONTERM 2
+
+
+/*  the undefined value  */
+
+#define UNDEFINED (-1)
+
+
+/*  action codes  */
+
+#define SHIFT 1
+#define REDUCE 2
+
+
+/*  character macros  */
+
+#define IS_IDENT(c)	(isalnum(c) || (c) == '_' || (c) == '.' || (c) == '$')
+#define	IS_OCTAL(c)	((c) >= '0' && (c) <= '7')
+#define	NUMERIC_VALUE(c)	((c) - '0')
+
+
+/*  symbol macros  */
+
+#define ISTOKEN(s)	((s) < start_symbol)
+#define ISVAR(s)	((s) >= start_symbol)
+
+
+/*  storage allocation macros  */
+
+#define CALLOC(k,n)	(calloc((unsigned)(k),(unsigned)(n)))
+#define	FREE(x)		(free((char*)(x)))
+#define MALLOC(n)	(malloc((unsigned)(n)))
+#define	NEW(t)		((t*)allocate(sizeof(t)))
+#define	NEW2(n,t)	((t*)allocate((unsigned)((n)*sizeof(t))))
+#define REALLOC(p,n)	(realloc((char*)(p),(unsigned)(n)))
+
+
+/*  the structure of a symbol table entry  */
+
+typedef struct bucket bucket;
+struct bucket
+{
+    struct bucket *link;
+    struct bucket *next;
+    char *name;
+    char *tag;
+    short value;
+    short index;
+    short prec;
+    char class;
+    char assoc;
+};
+
+
+/*  the structure of the LR(0) state machine  */
+
+typedef struct core core;
+struct core
+{
+    struct core *next;
+    struct core *link;
+    short number;
+    short accessing_symbol;
+    short nitems;
+    short items[1];
+};
+
+
+/*  the structure used to record shifts  */
+
+typedef struct shifts shifts;
+struct shifts
+{
+    struct shifts *next;
+    short number;
+    short nshifts;
+    short shift[1];
+};
+
+
+/*  the structure used to store reductions  */
+
+typedef struct reductions reductions;
+struct reductions
+{
+    struct reductions *next;
+    short number;
+    short nreds;
+    short rules[1];
+};
+
+
+/*  the structure used to represent parser actions  */
+
+typedef struct action action;
+struct action
+{
+    struct action *next;
+    short symbol;
+    short number;
+    short prec;
+    char action_code;
+    char assoc;
+    char suppressed;
+};
+
+
+/* global variables */
+
+extern char tflag;
+extern char vflag;
+
+extern char *myname;
+extern char *cptr;
+extern char *line;
+extern int lineno;
+extern int outline;
+
+extern char *action_file_name;
+extern char *input_file_name;
+extern char *prolog_file_name;
+extern char *local_file_name;
+extern char *verbose_file_name;
+
+extern FILE *action_file;
+extern FILE *input_file;
+extern FILE *prolog_file;
+extern FILE *local_file;
+extern FILE *verbose_file;
+
+extern int nitems;
+extern int nrules;
+extern int nsyms;
+extern int ntokens;
+extern int nvars;
+extern int ntags;
+
+extern char *line_format;
+
+extern int   start_symbol;
+extern char  **symbol_name;
+extern short *symbol_value;
+extern short *symbol_prec;
+extern char  *symbol_assoc;
+
+extern short *ritem;
+extern short *rlhs;
+extern short *rrhs;
+extern short *rprec;
+extern char  *rassoc;
+
+extern short **derives;
+extern char *nullable;
+
+extern bucket *first_symbol;
+extern bucket *last_symbol;
+
+extern int nstates;
+extern core *first_state;
+extern shifts *first_shift;
+extern reductions *first_reduction;
+extern short *accessing_symbol;
+extern core **state_table;
+extern shifts **shift_table;
+extern reductions **reduction_table;
+extern unsigned *LA;
+extern short *LAruleno;
+extern short *lookaheads;
+extern short *goto_map;
+extern short *from_state;
+extern short *to_state;
+
+extern action **parser;
+extern int SRtotal;
+extern int RRtotal;
+extern short *SRconflicts;
+extern short *RRconflicts;
+extern short *defred;
+extern short *rules_used;
+extern short nunused;
+extern short final_state;
+
+/* global functions */
+
+extern char *allocate();
+extern bucket *lookup();
+extern bucket *make_bucket();
+
+
+/* system variables */
+
+extern int errno;
+
+
+/* system functions */
+
+extern void free();
+extern char *calloc();
+extern char *malloc();
+extern char *realloc();
+extern char *strcpy();
diff --git a/mcs/jay/depend b/mcs/jay/depend
new file mode 100644
index 00000000000..134445ffddd
--- /dev/null
+++ b/mcs/jay/depend
@@ -0,0 +1,11 @@
+closure.o: closure.c defs.h
+error.o: error.c defs.h
+lalr.o: lalr.c defs.h
+lr0.o: lr0.c defs.h
+main.o: main.c defs.h
+mkpar.o: mkpar.c defs.h
+output.o: output.c defs.h
+reader.o: reader.c defs.h
+symtab.o: symtab.c defs.h
+verbose.o: verbose.c defs.h
+warshall.o: warshall.c defs.h
diff --git a/mcs/jay/error.c b/mcs/jay/error.c
new file mode 100644
index 00000000000..dd8bf291c20
--- /dev/null
+++ b/mcs/jay/error.c
@@ -0,0 +1,335 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)error.c	5.3 (Berkeley) 6/1/90";
+#endif /* not lint */
+
+/* routines for printing error messages  */
+
+#include "defs.h"
+
+
+fatal(msg)
+char *msg;
+{
+    fprintf(stderr, "%s: f - %s\n", myname, msg);
+    done(2);
+}
+
+
+no_space()
+{
+    fprintf(stderr, "%s: f - out of space\n", myname);
+    done(2);
+}
+
+
+open_error(filename)
+char *filename;
+{
+    fprintf(stderr, "%s: f - cannot open \"%s\"\n", myname, filename);
+    done(2);
+}
+
+
+unexpected_EOF()
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", unexpected end-of-file\n",
+	    myname, lineno, input_file_name);
+    done(1);
+}
+
+
+print_pos(st_line, st_cptr)
+char *st_line;
+char *st_cptr;
+{
+    register char *s;
+
+    if (st_line == 0) return;
+    for (s = st_line; *s != '\n'; ++s)
+    {
+	if (isprint(*s) || *s == '\t')
+	    putc(*s, stderr);
+	else
+	    putc('?', stderr);
+    }
+    putc('\n', stderr);
+    for (s = st_line; s < st_cptr; ++s)
+    {
+	if (*s == '\t')
+	    putc('\t', stderr);
+	else
+	    putc(' ', stderr);
+    }
+    putc('^', stderr);
+    putc('\n', stderr);
+}
+
+
+syntax_error(st_lineno, st_line, st_cptr)
+int st_lineno;
+char *st_line;
+char *st_cptr;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", syntax error\n",
+	    myname, st_lineno, input_file_name);
+    print_pos(st_line, st_cptr);
+    done(1);
+}
+
+
+unterminated_comment(c_lineno, c_line, c_cptr)
+int c_lineno;
+char *c_line;
+char *c_cptr;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", unmatched /*\n",
+	    myname, c_lineno, input_file_name);
+    print_pos(c_line, c_cptr);
+    done(1);
+}
+
+
+unterminated_string(s_lineno, s_line, s_cptr)
+int s_lineno;
+char *s_line;
+char *s_cptr;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", unterminated string\n",
+	    myname, s_lineno, input_file_name);
+    print_pos(s_line, s_cptr);
+    done(1);
+}
+
+
+unterminated_text(t_lineno, t_line, t_cptr)
+int t_lineno;
+char *t_line;
+char *t_cptr;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", unmatched %%{\n",
+	    myname, t_lineno, input_file_name);
+    print_pos(t_line, t_cptr);
+    done(1);
+}
+
+
+illegal_tag(t_lineno, t_line, t_cptr)
+int t_lineno;
+char *t_line;
+char *t_cptr;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", illegal tag\n",
+	    myname, t_lineno, input_file_name);
+    print_pos(t_line, t_cptr);
+    done(1);
+}
+
+
+illegal_character(c_cptr)
+char *c_cptr;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", illegal character\n",
+	    myname, lineno, input_file_name);
+    print_pos(line, c_cptr);
+    done(1);
+}
+
+
+used_reserved(s)
+char *s;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", illegal use of reserved symbol \
+%s\n", myname, lineno, input_file_name, s);
+    done(1);
+}
+
+
+tokenized_start(s)
+char *s;
+{
+     fprintf(stderr, "%s: e - line %d of \"%s\", the start symbol %s cannot be \
+declared to be a token\n", myname, lineno, input_file_name, s);
+     done(1);
+}
+
+
+retyped_warning(s)
+char *s;
+{
+    fprintf(stderr, "%s: w - line %d of \"%s\", the type of %s has been \
+redeclared\n", myname, lineno, input_file_name, s);
+}
+
+
+reprec_warning(s)
+char *s;
+{
+    fprintf(stderr, "%s: w - line %d of \"%s\", the precedence of %s has been \
+redeclared\n", myname, lineno, input_file_name, s);
+}
+
+
+revalued_warning(s)
+char *s;
+{
+    fprintf(stderr, "%s: w - line %d of \"%s\", the value of %s has been \
+redeclared\n", myname, lineno, input_file_name, s);
+}
+
+
+terminal_start(s)
+char *s;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", the start symbol %s is a \
+token\n", myname, lineno, input_file_name, s);
+    done(1);
+}
+
+
+restarted_warning()
+{
+    fprintf(stderr, "%s: w - line %d of \"%s\", the start symbol has been \
+redeclared\n", myname, lineno, input_file_name);
+}
+
+
+no_grammar()
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", no grammar has been \
+specified\n", myname, lineno, input_file_name);
+    done(1);
+}
+
+
+terminal_lhs(s_lineno)
+int s_lineno;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", a token appears on the lhs \
+of a production\n", myname, s_lineno, input_file_name);
+    done(1);
+}
+
+
+prec_redeclared()
+{
+    fprintf(stderr, "%s: w - line %d of  \"%s\", conflicting %%prec \
+specifiers\n", myname, lineno, input_file_name);
+}
+
+
+unterminated_action(a_lineno, a_line, a_cptr)
+int a_lineno;
+char *a_line;
+char *a_cptr;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", unterminated action\n",
+	    myname, a_lineno, input_file_name);
+    print_pos(a_line, a_cptr);
+    done(1);
+}
+
+
+dollar_warning(a_lineno, i)
+int a_lineno;
+int i;
+{
+    fprintf(stderr, "%s: w - line %d of \"%s\", $%d references beyond the \
+end of the current rule\n", myname, a_lineno, input_file_name, i);
+}
+
+
+dollar_error(a_lineno, a_line, a_cptr)
+int a_lineno;
+char *a_line;
+char *a_cptr;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", illegal $-name\n",
+	    myname, a_lineno, input_file_name);
+    print_pos(a_line, a_cptr);
+    done(1);
+}
+
+
+untyped_lhs()
+{
+    fprintf(stderr, "%s: w - line %d of \"%s\", $$ is untyped\n",
+	    myname, lineno, input_file_name);
+    /** done(1); */
+}
+
+
+untyped_rhs(i, s)
+int i;
+char *s;
+{
+    fprintf(stderr, "%s: w - line %d of \"%s\", $%d (%s) is untyped\n",
+	    myname, lineno, input_file_name, i, s);
+    /** done(1); */
+}
+
+
+unknown_rhs(i)
+int i;
+{
+    fprintf(stderr, "%s: e - line %d of \"%s\", $%d is untyped\n",
+	    myname, lineno, input_file_name, i);
+    done(1);
+}
+
+
+default_action_warning()
+{
+    fprintf(stderr, "%s: w - line %d of \"%s\", the default action assigns an \
+undefined value to $$\n", myname, lineno, input_file_name);
+}
+
+
+undefined_goal(s)
+char *s;
+{
+    fprintf(stderr, "%s: e - the start symbol %s is undefined\n", myname, s);
+    done(1);
+}
+
+
+undefined_symbol_warning(s)
+char *s;
+{
+    fprintf(stderr, "%s: w - the symbol %s is undefined\n", myname, s);
+}
diff --git a/mcs/jay/jay.1 b/mcs/jay/jay.1
new file mode 100644
index 00000000000..85040fd5694
--- /dev/null
+++ b/mcs/jay/jay.1
@@ -0,0 +1,120 @@
+.\" Copyright (c) 1989, 1990 The Regents of the University of California.
+.\" All rights reserved.
+.\"
+.\" This code is derived from software contributed to Berkeley by
+.\" Robert Paul Corbett.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in the
+.\"    documentation and/or other materials provided with the distribution.
+.\" 3. All advertising materials mentioning features or use of this software
+.\"    must display the following acknowledgement:
+.\"	This product includes software developed by the University of
+.\"	California, Berkeley and its contributors.
+.\" 4. Neither the name of the University nor the names of its contributors
+.\"    may be used to endorse or promote products derived from this software
+.\"    without specific prior written permission.
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+.\" ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+.\" LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+.\" SUCH DAMAGE.
+.\"
+.\"     @(#)yacc.1	5.8 (Berkeley) 5/24/93
+.\"
+.TH JAY 1 "May 24, 1993 / July 8, 1998"
+.UC 6
+.SH NAME
+jay \- an LALR(1) parser generator for Java and C#
+.SH SYNOPSIS
+.B jay [ -tv ] [ -c ] [ -b
+.I file_prefix
+.B ] [ -V
+.I yyValue
+.B ]
+.I filename
+.B <
+.I skeleton
+.SH DESCRIPTION
+.I Jay
+reads the grammar specification in the file
+.I filename
+and generates an LR(1) parser for it.
+The parsers consist of a set of LALR(1) parsing tables and a driver routine
+from the file
+.I skeleton
+written in the Java programming language.
+.I Jay
+writes the parse tables and the driver routine to standard output.
+.PP
+The following options are available:
+.RS
+.TP
+\fB-b \fIfile_prefix\fR
+The
+.B -b
+option changes the prefix prepended to the output file names to
+the string denoted by
+.IR file_prefix.
+The default prefix is the character
+.IR y.
+.TP
+.B -c
+The
+.B -c 
+option makes jay generate C# code instead of the default Java.
+.TP
+.B -t
+The
+.B -t
+option arranges for
+debugging information to be incorporated in the compiled code.
+.TP
+.B -v
+The
+.B -v
+option causes a human-readable description of the generated parser to
+be written to the file
+.IR y.output.
+.RE
+.PP
+If the environment variable TMPDIR is set, the string denoted by
+TMPDIR will be used as the name of the directory where the temporary
+files are created.
+.SH FILES
+.IR skeleton
+.br
+.IR y.output
+.br
+.IR /tmp/yacc.aXXXXXX
+.br
+.IR /tmp/yacc.tXXXXXX
+.br
+.IR /tmp/yacc.uXXXXXX
+.SH DIAGNOSTICS
+If there are rules that are never reduced, the number of such rules is
+reported on standard error.
+If there are any LALR(1) conflicts, the number of conflicts is reported
+on standard error.
+.SH HISTORY
+.I Jay
+is derived from Berkeley
+.I yacc .
+Input conventions closely follow those of
+.I yacc ;
+for details,
+consult the parser
+.I skeleton
+file and the commented example included with the sources.
diff --git a/mcs/jay/lalr.c b/mcs/jay/lalr.c
new file mode 100644
index 00000000000..bf9aec846b7
--- /dev/null
+++ b/mcs/jay/lalr.c
@@ -0,0 +1,678 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)lalr.c	5.3 (Berkeley) 6/1/90";
+#endif /* not lint */
+
+#include "defs.h"
+
+typedef
+  struct shorts
+    {
+      struct shorts *next;
+      short value;
+    }
+  shorts;
+
+int tokensetsize;
+short *lookaheads;
+short *LAruleno;
+unsigned *LA;
+short *accessing_symbol;
+core **state_table;
+shifts **shift_table;
+reductions **reduction_table;
+short *goto_map;
+short *from_state;
+short *to_state;
+
+short **transpose();
+
+static int infinity;
+static int maxrhs;
+static int ngotos;
+static unsigned *F;
+static short **includes;
+static shorts **lookback;
+static short **R;
+static short *INDEX;
+static short *VERTICES;
+static int top;
+
+
+lalr()
+{
+    tokensetsize = WORDSIZE(ntokens);
+
+    set_state_table();
+    set_accessing_symbol();
+    set_shift_table();
+    set_reduction_table();
+    set_maxrhs();
+    initialize_LA();
+    set_goto_map();
+    initialize_F();
+    build_relations();
+    compute_FOLLOWS();
+    compute_lookaheads();
+}
+
+
+
+set_state_table()
+{
+    register core *sp;
+
+    state_table = NEW2(nstates, core *);
+    for (sp = first_state; sp; sp = sp->next)
+	state_table[sp->number] = sp;
+}
+
+
+
+set_accessing_symbol()
+{
+    register core *sp;
+
+    accessing_symbol = NEW2(nstates, short);
+    for (sp = first_state; sp; sp = sp->next)
+	accessing_symbol[sp->number] = sp->accessing_symbol;
+}
+
+
+
+set_shift_table()
+{
+    register shifts *sp;
+
+    shift_table = NEW2(nstates, shifts *);
+    for (sp = first_shift; sp; sp = sp->next)
+	shift_table[sp->number] = sp;
+}
+
+
+
+set_reduction_table()
+{
+    register reductions *rp;
+
+    reduction_table = NEW2(nstates, reductions *);
+    for (rp = first_reduction; rp; rp = rp->next)
+	reduction_table[rp->number] = rp;
+}
+
+
+
+set_maxrhs()
+{
+  register short *itemp;
+  register short *item_end;
+  register int length;
+  register int max;
+
+  length = 0;
+  max = 0;
+  item_end = ritem + nitems;
+  for (itemp = ritem; itemp < item_end; itemp++)
+    {
+      if (*itemp >= 0)
+	{
+	  length++;
+	}
+      else
+	{
+	  if (length > max) max = length;
+	  length = 0;
+	}
+    }
+
+  maxrhs = max;
+}
+
+
+
+initialize_LA()
+{
+  register int i, j, k;
+  register reductions *rp;
+
+  lookaheads = NEW2(nstates + 1, short);
+
+  k = 0;
+  for (i = 0; i < nstates; i++)
+    {
+      lookaheads[i] = k;
+      rp = reduction_table[i];
+      if (rp)
+	k += rp->nreds;
+    }
+  lookaheads[nstates] = k;
+
+  LA = NEW2(k * tokensetsize, unsigned);
+  LAruleno = NEW2(k, short);
+  lookback = NEW2(k, shorts *);
+
+  k = 0;
+  for (i = 0; i < nstates; i++)
+    {
+      rp = reduction_table[i];
+      if (rp)
+	{
+	  for (j = 0; j < rp->nreds; j++)
+	    {
+	      LAruleno[k] = rp->rules[j];
+	      k++;
+	    }
+	}
+    }
+}
+
+
+set_goto_map()
+{
+  register shifts *sp;
+  register int i;
+  register int symbol;
+  register int k;
+  register short *temp_map;
+  register int state2;
+  register int state1;
+
+  goto_map = NEW2(nvars + 1, short) - ntokens;
+  temp_map = NEW2(nvars + 1, short) - ntokens;
+
+  ngotos = 0;
+  for (sp = first_shift; sp; sp = sp->next)
+    {
+      for (i = sp->nshifts - 1; i >= 0; i--)
+	{
+	  symbol = accessing_symbol[sp->shift[i]];
+
+	  if (ISTOKEN(symbol)) break;
+
+	  if (ngotos == MAXSHORT)
+	    fatal("too many gotos");
+
+	  ngotos++;
+	  goto_map[symbol]++;
+        }
+    }
+
+  k = 0;
+  for (i = ntokens; i < nsyms; i++)
+    {
+      temp_map[i] = k;
+      k += goto_map[i];
+    }
+
+  for (i = ntokens; i < nsyms; i++)
+    goto_map[i] = temp_map[i];
+
+  goto_map[nsyms] = ngotos;
+  temp_map[nsyms] = ngotos;
+
+  from_state = NEW2(ngotos, short);
+  to_state = NEW2(ngotos, short);
+
+  for (sp = first_shift; sp; sp = sp->next)
+    {
+      state1 = sp->number;
+      for (i = sp->nshifts - 1; i >= 0; i--)
+	{
+	  state2 = sp->shift[i];
+	  symbol = accessing_symbol[state2];
+
+	  if (ISTOKEN(symbol)) break;
+
+	  k = temp_map[symbol]++;
+	  from_state[k] = state1;
+	  to_state[k] = state2;
+	}
+    }
+
+  FREE(temp_map + ntokens);
+}
+
+
+
+/*  Map_goto maps a state/symbol pair into its numeric representation.	*/
+
+int
+map_goto(state, symbol)
+int state;
+int symbol;
+{
+    register int high;
+    register int low;
+    register int middle;
+    register int s;
+
+    low = goto_map[symbol];
+    high = goto_map[symbol + 1];
+
+    for (;;)
+    {
+	assert(low <= high);
+	middle = (low + high) >> 1;
+	s = from_state[middle];
+	if (s == state)
+	    return (middle);
+	else if (s < state)
+	    low = middle + 1;
+	else
+	    high = middle - 1;
+    }
+}
+
+
+
+initialize_F()
+{
+  register int i;
+  register int j;
+  register int k;
+  register shifts *sp;
+  register short *edge;
+  register unsigned *rowp;
+  register short *rp;
+  register short **reads;
+  register int nedges;
+  register int stateno;
+  register int symbol;
+  register int nwords;
+
+  nwords = ngotos * tokensetsize;
+  F = NEW2(nwords, unsigned);
+
+  reads = NEW2(ngotos, short *);
+  edge = NEW2(ngotos + 1, short);
+  nedges = 0;
+
+  rowp = F;
+  for (i = 0; i < ngotos; i++)
+    {
+      stateno = to_state[i];
+      sp = shift_table[stateno];
+
+      if (sp)
+	{
+	  k = sp->nshifts;
+
+	  for (j = 0; j < k; j++)
+	    {
+	      symbol = accessing_symbol[sp->shift[j]];
+	      if (ISVAR(symbol))
+		break;
+	      SETBIT(rowp, symbol);
+	    }
+
+	  for (; j < k; j++)
+	    {
+	      symbol = accessing_symbol[sp->shift[j]];
+	      if (nullable[symbol])
+		edge[nedges++] = map_goto(stateno, symbol);
+	    }
+	
+	  if (nedges)
+	    {
+	      reads[i] = rp = NEW2(nedges + 1, short);
+
+	      for (j = 0; j < nedges; j++)
+		rp[j] = edge[j];
+
+	      rp[nedges] = -1;
+	      nedges = 0;
+	    }
+	}
+
+      rowp += tokensetsize;
+    }
+
+  SETBIT(F, 0);
+  digraph(reads);
+
+  for (i = 0; i < ngotos; i++)
+    {
+      if (reads[i])
+	FREE(reads[i]);
+    }
+
+  FREE(reads);
+  FREE(edge);
+}
+
+
+
+build_relations()
+{
+  register int i;
+  register int j;
+  register int k;
+  register short *rulep;
+  register short *rp;
+  register shifts *sp;
+  register int length;
+  register int nedges;
+  register int done;
+  register int state1;
+  register int stateno;
+  register int symbol1;
+  register int symbol2;
+  register short *shortp;
+  register short *edge;
+  register short *states;
+  register short **new_includes;
+
+  includes = NEW2(ngotos, short *);
+  edge = NEW2(ngotos + 1, short);
+  states = NEW2(maxrhs + 1, short);
+
+  for (i = 0; i < ngotos; i++)
+    {
+      nedges = 0;
+      state1 = from_state[i];
+      symbol1 = accessing_symbol[to_state[i]];
+
+      for (rulep = derives[symbol1]; *rulep >= 0; rulep++)
+	{
+	  length = 1;
+	  states[0] = state1;
+	  stateno = state1;
+
+	  for (rp = ritem + rrhs[*rulep]; *rp >= 0; rp++)
+	    {
+	      symbol2 = *rp;
+	      sp = shift_table[stateno];
+	      k = sp->nshifts;
+
+	      for (j = 0; j < k; j++)
+		{
+		  stateno = sp->shift[j];
+		  if (accessing_symbol[stateno] == symbol2) break;
+		}
+
+	      states[length++] = stateno;
+	    }
+
+	  add_lookback_edge(stateno, *rulep, i);
+
+	  length--;
+	  done = 0;
+	  while (!done)
+	    {
+	      done = 1;
+	      rp--;
+	      if (ISVAR(*rp))
+		{
+		  stateno = states[--length];
+		  edge[nedges++] = map_goto(stateno, *rp);
+		  if (nullable[*rp] && length > 0) done = 0;
+		}
+	    }
+	}
+
+      if (nedges)
+	{
+	  includes[i] = shortp = NEW2(nedges + 1, short);
+	  for (j = 0; j < nedges; j++)
+	    shortp[j] = edge[j];
+	  shortp[nedges] = -1;
+	}
+    }
+
+  new_includes = transpose(includes, ngotos);
+
+  for (i = 0; i < ngotos; i++)
+    if (includes[i])
+      FREE(includes[i]);
+
+  FREE(includes);
+
+  includes = new_includes;
+
+  FREE(edge);
+  FREE(states);
+}
+
+
+add_lookback_edge(stateno, ruleno, gotono)
+int stateno, ruleno, gotono;
+{
+    register int i, k;
+    register int found;
+    register shorts *sp;
+
+    i = lookaheads[stateno];
+    k = lookaheads[stateno + 1];
+    found = 0;
+    while (!found && i < k)
+    {
+	if (LAruleno[i] == ruleno)
+	    found = 1;
+	else
+	    ++i;
+    }
+    assert(found);
+
+    sp = NEW(shorts);
+    sp->next = lookback[i];
+    sp->value = gotono;
+    lookback[i] = sp;
+}
+
+
+
+short **
+transpose(R, n)
+short **R;
+int n;
+{
+  register short **new_R;
+  register short **temp_R;
+  register short *nedges;
+  register short *sp;
+  register int i;
+  register int k;
+
+  nedges = NEW2(n, short);
+
+  for (i = 0; i < n; i++)
+    {
+      sp = R[i];
+      if (sp)
+	{
+	  while (*sp >= 0)
+	    nedges[*sp++]++;
+	}
+    }
+
+  new_R = NEW2(n, short *);
+  temp_R = NEW2(n, short *);
+
+  for (i = 0; i < n; i++)
+    {
+      k = nedges[i];
+      if (k > 0)
+	{
+	  sp = NEW2(k + 1, short);
+	  new_R[i] = sp;
+	  temp_R[i] = sp;
+	  sp[k] = -1;
+	}
+    }
+
+  FREE(nedges);
+
+  for (i = 0; i < n; i++)
+    {
+      sp = R[i];
+      if (sp)
+	{
+	  while (*sp >= 0)
+	    *temp_R[*sp++]++ = i;
+	}
+    }
+
+  FREE(temp_R);
+
+  return (new_R);
+}
+
+
+
+compute_FOLLOWS()
+{
+  digraph(includes);
+}
+
+
+compute_lookaheads()
+{
+  register int i, n;
+  register unsigned *fp1, *fp2, *fp3;
+  register shorts *sp, *next;
+  register unsigned *rowp;
+
+  rowp = LA;
+  n = lookaheads[nstates];
+  for (i = 0; i < n; i++)
+    {
+      fp3 = rowp + tokensetsize;
+      for (sp = lookback[i]; sp; sp = sp->next)
+	{
+	  fp1 = rowp;
+	  fp2 = F + tokensetsize * sp->value;
+	  while (fp1 < fp3)
+	    *fp1++ |= *fp2++;
+	}
+      rowp = fp3;
+    }
+
+  for (i = 0; i < n; i++)
+    for (sp = lookback[i]; sp; sp = next)
+      {
+        next = sp->next;
+        FREE(sp);
+      }
+
+  FREE(lookback);
+  FREE(F);
+}
+
+
+digraph(relation)
+short **relation;
+{
+  register int i;
+
+  infinity = ngotos + 2;
+  INDEX = NEW2(ngotos + 1, short);
+  VERTICES = NEW2(ngotos + 1, short);
+  top = 0;
+
+  R = relation;
+
+  for (i = 0; i < ngotos; i++)
+    INDEX[i] = 0;
+
+  for (i = 0; i < ngotos; i++)
+    {
+      if (INDEX[i] == 0 && R[i])
+	traverse(i);
+    }
+
+  FREE(INDEX);
+  FREE(VERTICES);
+}
+
+
+
+traverse(i)
+register int i;
+{
+  register unsigned *fp1;
+  register unsigned *fp2;
+  register unsigned *fp3;
+  register int j;
+  register short *rp;
+
+  int height;
+  unsigned *base;
+
+  VERTICES[++top] = i;
+  INDEX[i] = height = top;
+
+  base = F + i * tokensetsize;
+  fp3 = base + tokensetsize;
+
+  rp = R[i];
+  if (rp)
+    {
+      while ((j = *rp++) >= 0)
+	{
+	  if (INDEX[j] == 0)
+	    traverse(j);
+
+	  if (INDEX[i] > INDEX[j])
+	    INDEX[i] = INDEX[j];
+
+	  fp1 = base;
+	  fp2 = F + j * tokensetsize;
+
+	  while (fp1 < fp3)
+	    *fp1++ |= *fp2++;
+	}
+    }
+
+  if (INDEX[i] == height)
+    {
+      for (;;)
+	{
+	  j = VERTICES[top--];
+	  INDEX[j] = infinity;
+
+	  if (i == j)
+	    break;
+
+	  fp1 = base;
+	  fp2 = F + j * tokensetsize;
+
+	  while (fp1 < fp3)
+	    *fp2++ = *fp1++;
+	}
+    }
+}
diff --git a/mcs/jay/lr0.c b/mcs/jay/lr0.c
new file mode 100644
index 00000000000..43106ea6cf3
--- /dev/null
+++ b/mcs/jay/lr0.c
@@ -0,0 +1,637 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)lr0.c	5.3 (Berkeley) 1/20/91";
+#endif /* not lint */
+
+#include "defs.h"
+
+extern short *itemset;
+extern short *itemsetend;
+extern unsigned *ruleset;
+
+int nstates;
+core *first_state;
+shifts *first_shift;
+reductions *first_reduction;
+
+int get_state();
+core *new_state();
+
+static core **state_set;
+static core *this_state;
+static core *last_state;
+static shifts *last_shift;
+static reductions *last_reduction;
+
+static int nshifts;
+static short *shift_symbol;
+
+static short *redset;
+static short *shiftset;
+
+static short **kernel_base;
+static short **kernel_end;
+static short *kernel_items;
+
+
+allocate_itemsets()
+{
+    register short *itemp;
+    register short *item_end;
+    register int symbol;
+    register int i;
+    register int count;
+    register int max;
+    register short *symbol_count;
+
+    count = 0;
+    symbol_count = NEW2(nsyms, short);
+
+    item_end = ritem + nitems;
+    for (itemp = ritem; itemp < item_end; itemp++)
+    {
+	symbol = *itemp;
+	if (symbol >= 0)
+	{
+	    count++;
+	    symbol_count[symbol]++;
+	}
+    }
+
+    kernel_base = NEW2(nsyms, short *);
+    kernel_items = NEW2(count, short);
+
+    count = 0;
+    max = 0;
+    for (i = 0; i < nsyms; i++)
+    {
+	kernel_base[i] = kernel_items + count;
+	count += symbol_count[i];
+	if (max < symbol_count[i])
+	    max = symbol_count[i];
+    }
+
+    shift_symbol = symbol_count;
+    kernel_end = NEW2(nsyms, short *);
+}
+
+
+allocate_storage()
+{
+    allocate_itemsets();
+    shiftset = NEW2(nsyms, short);
+    redset = NEW2(nrules + 1, short);
+    state_set = NEW2(nitems, core *);
+}
+
+
+append_states()
+{
+    register int i;
+    register int j;
+    register int symbol;
+
+#ifdef	TRACE
+    fprintf(stderr, "Entering append_states()\n");
+#endif
+    for (i = 1; i < nshifts; i++)
+    {
+	symbol = shift_symbol[i];
+	j = i;
+	while (j > 0 && shift_symbol[j - 1] > symbol)
+	{
+	    shift_symbol[j] = shift_symbol[j - 1];
+	    j--;
+	}
+	shift_symbol[j] = symbol;
+    }
+
+    for (i = 0; i < nshifts; i++)
+    {
+	symbol = shift_symbol[i];
+	shiftset[i] = get_state(symbol);
+    }
+}
+
+
+free_storage()
+{
+    FREE(shift_symbol);
+    FREE(redset);
+    FREE(shiftset);
+    FREE(kernel_base);
+    FREE(kernel_end);
+    FREE(kernel_items);
+    FREE(state_set);
+}
+
+
+
+generate_states()
+{
+    allocate_storage();
+    itemset = NEW2(nitems, short);
+    ruleset = NEW2(WORDSIZE(nrules), unsigned);
+    set_first_derives();
+    initialize_states();
+
+    while (this_state)
+    {
+	closure(this_state->items, this_state->nitems);
+	save_reductions();
+	new_itemsets();
+	append_states();
+
+	if (nshifts > 0)
+	    save_shifts();
+
+	this_state = this_state->next;
+    }
+
+    finalize_closure();
+    free_storage();
+}
+
+
+
+int
+get_state(symbol)
+int symbol;
+{
+    register int key;
+    register short *isp1;
+    register short *isp2;
+    register short *iend;
+    register core *sp;
+    register int found;
+    register int n;
+
+#ifdef	TRACE
+    fprintf(stderr, "Entering get_state(%d)\n", symbol);
+#endif
+
+    isp1 = kernel_base[symbol];
+    iend = kernel_end[symbol];
+    n = iend - isp1;
+
+    key = *isp1;
+    assert(0 <= key && key < nitems);
+    sp = state_set[key];
+    if (sp)
+    {
+	found = 0;
+	while (!found)
+	{
+	    if (sp->nitems == n)
+	    {
+		found = 1;
+		isp1 = kernel_base[symbol];
+		isp2 = sp->items;
+
+		while (found && isp1 < iend)
+		{
+		    if (*isp1++ != *isp2++)
+			found = 0;
+		}
+	    }
+
+	    if (!found)
+	    {
+		if (sp->link)
+		{
+		    sp = sp->link;
+		}
+		else
+		{
+		    sp = sp->link = new_state(symbol);
+		    found = 1;
+		}
+	    }
+	}
+    }
+    else
+    {
+	state_set[key] = sp = new_state(symbol);
+    }
+
+    return (sp->number);
+}
+
+
+
+initialize_states()
+{
+    register int i;
+    register short *start_derives;
+    register core *p;
+
+    start_derives = derives[start_symbol];
+    for (i = 0; start_derives[i] >= 0; ++i)
+	continue;
+
+    p = (core *) MALLOC(sizeof(core) + i*sizeof(short));
+    if (p == 0) no_space();
+
+    p->next = 0;
+    p->link = 0;
+    p->number = 0;
+    p->accessing_symbol = 0;
+    p->nitems = i;
+
+    for (i = 0;  start_derives[i] >= 0; ++i)
+	p->items[i] = rrhs[start_derives[i]];
+
+    first_state = last_state = this_state = p;
+    nstates = 1;
+}
+
+
+new_itemsets()
+{
+    register int i;
+    register int shiftcount;
+    register short *isp;
+    register short *ksp;
+    register int symbol;
+
+    for (i = 0; i < nsyms; i++)
+	kernel_end[i] = 0;
+
+    shiftcount = 0;
+    isp = itemset;
+    while (isp < itemsetend)
+    {
+	i = *isp++;
+	symbol = ritem[i];
+	if (symbol > 0)
+	{
+	    ksp = kernel_end[symbol];
+	    if (!ksp)
+	    {
+		shift_symbol[shiftcount++] = symbol;
+		ksp = kernel_base[symbol];
+	    }
+
+	    *ksp++ = i + 1;
+	    kernel_end[symbol] = ksp;
+	}
+    }
+
+    nshifts = shiftcount;
+}
+
+
+
+core *
+new_state(symbol)
+int symbol;
+{
+    register int n;
+    register core *p;
+    register short *isp1;
+    register short *isp2;
+    register short *iend;
+
+#ifdef	TRACE
+    fprintf(stderr, "Entering new_state(%d)\n", symbol);
+#endif
+
+    if (nstates >= MAXSHORT)
+	fatal("too many states");
+
+    isp1 = kernel_base[symbol];
+    iend = kernel_end[symbol];
+    n = iend - isp1;
+
+    p = (core *) allocate((unsigned) (sizeof(core) + (n - 1) * sizeof(short)));
+    p->accessing_symbol = symbol;
+    p->number = nstates;
+    p->nitems = n;
+
+    isp2 = p->items;
+    while (isp1 < iend)
+	*isp2++ = *isp1++;
+
+    last_state->next = p;
+    last_state = p;
+
+    nstates++;
+
+    return (p);
+}
+
+
+/* show_cores is used for debugging */
+
+show_cores()
+{
+    core *p;
+    int i, j, k, n;
+    int itemno;
+
+    k = 0;
+    for (p = first_state; p; ++k, p = p->next)
+    {
+	if (k) printf("\n");
+	printf("state %d, number = %d, accessing symbol = %s\n",
+		k, p->number, symbol_name[p->accessing_symbol]);
+	n = p->nitems;
+	for (i = 0; i < n; ++i)
+	{
+	    itemno = p->items[i];
+	    printf("%4d  ", itemno);
+	    j = itemno;
+	    while (ritem[j] >= 0) ++j;
+	    printf("%s :", symbol_name[rlhs[-ritem[j]]]);
+	    j = rrhs[-ritem[j]];
+	    while (j < itemno)
+		printf(" %s", symbol_name[ritem[j++]]);
+	    printf(" .");
+	    while (ritem[j] >= 0)
+		printf(" %s", symbol_name[ritem[j++]]);
+	    printf("\n");
+	    fflush(stdout);
+	}
+    }
+}
+
+
+/* show_ritems is used for debugging */
+
+show_ritems()
+{
+    int i;
+
+    for (i = 0; i < nitems; ++i)
+	printf("ritem[%d] = %d\n", i, ritem[i]);
+}
+
+
+/* show_rrhs is used for debugging */
+show_rrhs()
+{
+    int i;
+
+    for (i = 0; i < nrules; ++i)
+	printf("rrhs[%d] = %d\n", i, rrhs[i]);
+}
+
+
+/* show_shifts is used for debugging */
+
+show_shifts()
+{
+    shifts *p;
+    int i, j, k;
+
+    k = 0;
+    for (p = first_shift; p; ++k, p = p->next)
+    {
+	if (k) printf("\n");
+	printf("shift %d, number = %d, nshifts = %d\n", k, p->number,
+		p->nshifts);
+	j = p->nshifts;
+	for (i = 0; i < j; ++i)
+	    printf("\t%d\n", p->shift[i]);
+    }
+}
+
+
+save_shifts()
+{
+    register shifts *p;
+    register short *sp1;
+    register short *sp2;
+    register short *send;
+
+    p = (shifts *) allocate((unsigned) (sizeof(shifts) +
+			(nshifts - 1) * sizeof(short)));
+
+    p->number = this_state->number;
+    p->nshifts = nshifts;
+
+    sp1 = shiftset;
+    sp2 = p->shift;
+    send = shiftset + nshifts;
+
+    while (sp1 < send)
+	*sp2++ = *sp1++;
+
+    if (last_shift)
+    {
+	last_shift->next = p;
+	last_shift = p;
+    }
+    else
+    {
+	first_shift = p;
+	last_shift = p;
+    }
+}
+
+
+
+save_reductions()
+{
+    register short *isp;
+    register short *rp1;
+    register short *rp2;
+    register int item;
+    register int count;
+    register reductions *p;
+    register short *rend;
+
+    count = 0;
+    for (isp = itemset; isp < itemsetend; isp++)
+    {
+	item = ritem[*isp];
+	if (item < 0)
+	{
+	    redset[count++] = -item;
+	}
+    }
+
+    if (count)
+    {
+	p = (reductions *) allocate((unsigned) (sizeof(reductions) +
+					(count - 1) * sizeof(short)));
+
+	p->number = this_state->number;
+	p->nreds = count;
+
+	rp1 = redset;
+	rp2 = p->rules;
+	rend = rp1 + count;
+
+	while (rp1 < rend)
+	    *rp2++ = *rp1++;
+
+	if (last_reduction)
+	{
+	    last_reduction->next = p;
+	    last_reduction = p;
+	}
+	else
+	{
+	    first_reduction = p;
+	    last_reduction = p;
+	}
+    }
+}
+
+
+set_derives()
+{
+    register int i, k;
+    register int lhs;
+    register short *rules;
+
+    derives = NEW2(nsyms, short *);
+    rules = NEW2(nvars + nrules, short);
+
+    k = 0;
+    for (lhs = start_symbol; lhs < nsyms; lhs++)
+    {
+	derives[lhs] = rules + k;
+	for (i = 0; i < nrules; i++)
+	{
+	    if (rlhs[i] == lhs)
+	    {
+		rules[k] = i;
+		k++;
+	    }
+	}
+	rules[k] = -1;
+	k++;
+    }
+
+#ifdef	DEBUG
+    print_derives();
+#endif
+}
+
+free_derives()
+{
+    FREE(derives[start_symbol]);
+    FREE(derives);
+}
+
+#ifdef	DEBUG
+print_derives()
+{
+    register int i;
+    register short *sp;
+
+    printf("\nDERIVES\n\n");
+
+    for (i = start_symbol; i < nsyms; i++)
+    {
+	printf("%s derives ", symbol_name[i]);
+	for (sp = derives[i]; *sp >= 0; sp++)
+	{
+	    printf("  %d", *sp);
+	}
+	putchar('\n');
+    }
+
+    putchar('\n');
+}
+#endif
+
+
+set_nullable()
+{
+    register int i, j;
+    register int empty;
+    int done;
+
+    nullable = MALLOC(nsyms);
+    if (nullable == 0) no_space();
+
+    for (i = 0; i < nsyms; ++i)
+	nullable[i] = 0;
+
+    done = 0;
+    while (!done)
+    {
+	done = 1;
+	for (i = 1; i < nitems; i++)
+	{
+	    empty = 1;
+	    while ((j = ritem[i]) >= 0)
+	    {
+		if (!nullable[j])
+		    empty = 0;
+		++i;
+	    }
+	    if (empty)
+	    {
+		j = rlhs[-j];
+		if (!nullable[j])
+		{
+		    nullable[j] = 1;
+		    done = 0;
+		}
+	    }
+	}
+    }
+
+#ifdef DEBUG
+    for (i = 0; i < nsyms; i++)
+    {
+	if (nullable[i])
+	    printf("%s is nullable\n", symbol_name[i]);
+	else
+	    printf("%s is not nullable\n", symbol_name[i]);
+    }
+#endif
+}
+
+
+free_nullable()
+{
+    FREE(nullable);
+}
+
+
+lr0()
+{
+    set_derives();
+    set_nullable();
+    generate_states();
+}
diff --git a/mcs/jay/main.c b/mcs/jay/main.c
new file mode 100644
index 00000000000..83345a3b2e7
--- /dev/null
+++ b/mcs/jay/main.c
@@ -0,0 +1,341 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+char copyright[] =
+"@(#) Copyright (c) 1989 The Regents of the University of California.\n\
+ All rights reserved.\n";
+#endif /* not lint */
+
+#ifndef lint
+static char sccsid[] = "@(#)main.c	5.5 (Berkeley) 5/24/93";
+#endif /* not lint */
+
+#include <signal.h>
+#include "defs.h"
+
+char tflag;
+char vflag;
+char csharp = 0;
+
+char *file_prefix = "y";
+char *myname = "yacc";
+char *temp_form = "yacc.XXXXXXX";
+
+int lineno;
+int outline;
+
+char *action_file_name;
+char *input_file_name = "";
+char *prolog_file_name;
+char *local_file_name;
+char *verbose_file_name;
+
+FILE *action_file;	/*  a temp file, used to save actions associated    */
+			/*  with rules until the parser is written	    */
+FILE *input_file;	/*  the input file				    */
+FILE *prolog_file;	/*  temp files, used to save text until all	    */
+FILE *local_file;	/*  symbols have been defined			    */
+FILE *verbose_file;	/*  y.output					    */
+
+int nitems;
+int nrules;
+int nsyms;
+int ntokens;
+int nvars;
+
+int   start_symbol;
+char  **symbol_name;
+short *symbol_value;
+short *symbol_prec;
+char  *symbol_assoc;
+
+short *ritem;
+short *rlhs;
+short *rrhs;
+short *rprec;
+char  *rassoc;
+short **derives;
+char *nullable;
+
+extern char *mkstemp();
+extern char *getenv();
+
+done(k)
+int k;
+{
+    if (action_file) { fclose(action_file); unlink(action_file_name); }
+    if (prolog_file) { fclose(prolog_file); unlink(prolog_file_name); }
+    if (local_file) { fclose(local_file); unlink(local_file_name); }
+    exit(k);
+}
+
+
+void
+onintr(signo)
+	int signo;
+{
+    done(1);
+}
+
+
+set_signals()
+{
+#ifdef SIGINT
+    if (signal(SIGINT, SIG_IGN) != SIG_IGN)
+	signal(SIGINT, onintr);
+#endif
+#ifdef SIGTERM
+    if (signal(SIGTERM, SIG_IGN) != SIG_IGN)
+	signal(SIGTERM, onintr);
+#endif
+#ifdef SIGHUP
+    if (signal(SIGHUP, SIG_IGN) != SIG_IGN)
+	signal(SIGHUP, onintr);
+#endif
+}
+
+
+usage()
+{
+    fprintf(stderr, "usage: %s [-tvc] [-b file_prefix] filename\n", myname);
+    exit(1);
+}
+
+
+getargs(argc, argv)
+int argc;
+char *argv[];
+{
+    register int i;
+    register char *s;
+
+    if (argc > 0) myname = argv[0];
+    for (i = 1; i < argc; ++i)
+    {
+	s = argv[i];
+	if (*s != '-') break;
+	switch (*++s)
+	{
+	case '\0':
+	    input_file = stdin;
+	    if (i + 1 < argc) usage();
+	    return;
+
+	case '-':
+	    ++i;
+	    goto no_more_options;
+
+	case 'b':
+	    if (*++s)
+		 file_prefix = s;
+	    else if (++i < argc)
+		file_prefix = argv[i];
+	    else
+		usage();
+	    continue;
+
+	case 't':
+	    tflag = 1;
+	    break;
+
+	case 'c':
+	    csharp = 1;
+	    line_format = "#line %d \"%s\"\n";
+	    break;
+	    
+	case 'v':
+	    vflag = 1;
+	    break;
+
+	default:
+	    usage();
+	}
+
+	for (;;)
+	{
+	    switch (*++s)
+	    {
+	    case '\0':
+		goto end_of_option;
+
+	    case 't':
+		tflag = 1;
+		break;
+
+	    case 'v':
+		vflag = 1;
+		break;
+
+            case 'c':
+		csharp = 1;
+		break;
+
+	    default:
+		usage();
+	    }
+	}
+end_of_option:;
+    }
+
+no_more_options:;
+    if (i + 1 != argc) usage();
+    input_file_name = argv[i];
+}
+
+
+char *
+allocate(n)
+unsigned n;
+{
+    register char *p;
+
+    p = NULL;
+    if (n)
+    {
+	p = CALLOC(1, n);
+	if (!p) no_space();
+    }
+    return (p);
+}
+
+
+create_file_names()
+{
+    int i, len;
+    char *tmpdir;
+
+    tmpdir = getenv("TMPDIR");
+    if (tmpdir == 0) tmpdir = "/tmp";
+
+    len = strlen(tmpdir);
+    i = len + 13;
+    if (len && tmpdir[len-1] != '/')
+	++i;
+
+    action_file_name = MALLOC(i);
+    if (action_file_name == 0) no_space();
+    prolog_file_name = MALLOC(i);
+    if (prolog_file_name == 0) no_space();
+    local_file_name = MALLOC(i);
+    if (local_file_name == 0) no_space();
+
+    strcpy(action_file_name, tmpdir);
+    strcpy(prolog_file_name, tmpdir);
+    strcpy(local_file_name, tmpdir);
+
+    if (len && tmpdir[len - 1] != '/')
+    {
+	action_file_name[len] = '/';
+	prolog_file_name[len] = '/';
+	local_file_name[len] = '/';
+	++len;
+    }
+
+    strcpy(action_file_name + len, temp_form);
+    strcpy(prolog_file_name + len, temp_form);
+    strcpy(local_file_name + len, temp_form);
+
+    action_file_name[len + 5] = 'a';
+    prolog_file_name[len + 5] = 'p';
+    local_file_name[len + 5] = 'l';
+
+    mkstemp(action_file_name);
+    mkstemp(prolog_file_name);
+    mkstemp(local_file_name);
+
+    len = strlen(file_prefix);
+
+    if (vflag)
+    {
+	verbose_file_name = MALLOC(len + 8);
+	if (verbose_file_name == 0)
+	    no_space();
+	strcpy(verbose_file_name, file_prefix);
+	strcpy(verbose_file_name + len, VERBOSE_SUFFIX);
+    }
+}
+
+
+open_files()
+{
+    create_file_names();
+
+    if (input_file == 0)
+    {
+	input_file = fopen(input_file_name, "r");
+	if (input_file == 0)
+	    open_error(input_file_name);
+    }
+
+    action_file = fopen(action_file_name, "w");
+    if (action_file == 0)
+	open_error(action_file_name);
+
+    prolog_file = fopen(prolog_file_name, "w");
+    if (prolog_file == 0)
+	open_error(prolog_file_name);
+
+    local_file = fopen(local_file_name, "w");
+    if (local_file == 0)
+	open_error(local_file_name);
+
+    if (vflag)
+    {
+	verbose_file = fopen(verbose_file_name, "w");
+	if (verbose_file == 0)
+	    open_error(verbose_file_name);
+    }
+}
+
+
+int
+main(argc, argv)
+int argc;
+char *argv[];
+{
+    set_signals();
+    getargs(argc, argv);
+    open_files();
+    reader();
+    lr0();
+    lalr();
+    make_parser();
+    verbose();
+    output();
+    done(0);
+    /*NOTREACHED*/
+}
diff --git a/mcs/jay/makefile b/mcs/jay/makefile
new file mode 100644
index 00000000000..10991a5435f
--- /dev/null
+++ b/mcs/jay/makefile
@@ -0,0 +1,14 @@
+all	= jay
+c	= closure.c error.c lalr.c lr0.c main.c mkpar.c output.c reader.c \
+	  symtab.c verbose.c warshall.c
+
+CFLAGS=#-g
+
+jay:	$(c:.c=.o)	; $(CC) -o $@ $(CFLAGS) $(c:.c=.o)
+
+clean:
+	rm -f jay *.o
+
+windows: jay
+
+linux: jay
diff --git a/mcs/jay/makefile.gnu b/mcs/jay/makefile.gnu
new file mode 100644
index 00000000000..68dd3340417
--- /dev/null
+++ b/mcs/jay/makefile.gnu
@@ -0,0 +1,8 @@
+all:
+	$(MAKE) -f makefile linux
+
+clean:
+	$(MAKE) -f makefile clean
+
+install: all
+
diff --git a/mcs/jay/mkpar.c b/mcs/jay/mkpar.c
new file mode 100644
index 00000000000..42ead14514d
--- /dev/null
+++ b/mcs/jay/mkpar.c
@@ -0,0 +1,395 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)mkpar.c	5.3 (Berkeley) 1/20/91";
+#endif /* not lint */
+
+#include "defs.h"
+
+action **parser;
+int SRtotal;
+int RRtotal;
+short *SRconflicts;
+short *RRconflicts;
+short *defred;
+short *rules_used;
+short nunused;
+short final_state;
+
+static int SRcount;
+static int RRcount;
+
+extern action *parse_actions();
+extern action *get_shifts();
+extern action *add_reductions();
+extern action *add_reduce();
+
+
+make_parser()
+{
+    register int i;
+
+    parser = NEW2(nstates, action *);
+    for (i = 0; i < nstates; i++)
+	parser[i] = parse_actions(i);
+
+    find_final_state();
+    remove_conflicts();
+    unused_rules();
+    if (SRtotal + RRtotal > 0) total_conflicts();
+    defreds();
+}
+
+
+action *
+parse_actions(stateno)
+register int stateno;
+{
+    register action *actions;
+
+    actions = get_shifts(stateno);
+    actions = add_reductions(stateno, actions);
+    return (actions);
+}
+
+
+action *
+get_shifts(stateno)
+int stateno;
+{
+    register action *actions, *temp;
+    register shifts *sp;
+    register short *to_state;
+    register int i, k;
+    register int symbol;
+
+    actions = 0;
+    sp = shift_table[stateno];
+    if (sp)
+    {
+	to_state = sp->shift;
+	for (i = sp->nshifts - 1; i >= 0; i--)
+	{
+	    k = to_state[i];
+	    symbol = accessing_symbol[k];
+	    if (ISTOKEN(symbol))
+	    {
+		temp = NEW(action);
+		temp->next = actions;
+		temp->symbol = symbol;
+		temp->number = k;
+		temp->prec = symbol_prec[symbol];
+		temp->action_code = SHIFT;
+		temp->assoc = symbol_assoc[symbol];
+		actions = temp;
+	    }
+	}
+    }
+    return (actions);
+}
+
+action *
+add_reductions(stateno, actions)
+int stateno;
+register action *actions;
+{
+    register int i, j, m, n;
+    register int ruleno, tokensetsize;
+    register unsigned *rowp;
+
+    tokensetsize = WORDSIZE(ntokens);
+    m = lookaheads[stateno];
+    n = lookaheads[stateno + 1];
+    for (i = m; i < n; i++)
+    {
+	ruleno = LAruleno[i];
+	rowp = LA + i * tokensetsize;
+	for (j = ntokens - 1; j >= 0; j--)
+	{
+	    if (BIT(rowp, j))
+		actions = add_reduce(actions, ruleno, j);
+	}
+    }
+    return (actions);
+}
+
+
+action *
+add_reduce(actions, ruleno, symbol)
+register action *actions;
+register int ruleno, symbol;
+{
+    register action *temp, *prev, *next;
+
+    prev = 0;
+    for (next = actions; next && next->symbol < symbol; next = next->next)
+	prev = next;
+
+    while (next && next->symbol == symbol && next->action_code == SHIFT)
+    {
+	prev = next;
+	next = next->next;
+    }
+
+    while (next && next->symbol == symbol &&
+	    next->action_code == REDUCE && next->number < ruleno)
+    {
+	prev = next;
+	next = next->next;
+    }
+
+    temp = NEW(action);
+    temp->next = next;
+    temp->symbol = symbol;
+    temp->number = ruleno;
+    temp->prec = rprec[ruleno];
+    temp->action_code = REDUCE;
+    temp->assoc = rassoc[ruleno];
+
+    if (prev)
+	prev->next = temp;
+    else
+	actions = temp;
+
+    return (actions);
+}
+
+
+find_final_state()
+{
+    register int goal, i;
+    register short *to_state;
+    register shifts *p;
+
+    p = shift_table[0];
+    to_state = p->shift;
+    goal = ritem[1];
+    for (i = p->nshifts - 1; i >= 0; --i)
+    {
+	final_state = to_state[i];
+	if (accessing_symbol[final_state] == goal) break;
+    }
+}
+
+
+unused_rules()
+{
+    register int i;
+    register action *p;
+
+    rules_used = (short *) MALLOC(nrules*sizeof(short));
+    if (rules_used == 0) no_space();
+
+    for (i = 0; i < nrules; ++i)
+	rules_used[i] = 0;
+
+    for (i = 0; i < nstates; ++i)
+    {
+	for (p = parser[i]; p; p = p->next)
+	{
+	    if (p->action_code == REDUCE && p->suppressed == 0)
+		rules_used[p->number] = 1;
+	}
+    }
+
+    nunused = 0;
+    for (i = 3; i < nrules; ++i)
+	if (!rules_used[i]) ++nunused;
+
+    if (nunused)
+	if (nunused == 1)
+	    fprintf(stderr, "%s: 1 rule never reduced\n", myname);
+	else
+	    fprintf(stderr, "%s: %d rules never reduced\n", myname, nunused);
+}
+
+
+remove_conflicts()
+{
+    register int i;
+    register int symbol;
+    register action *p, *pref;
+
+    SRtotal = 0;
+    RRtotal = 0;
+    SRconflicts = NEW2(nstates, short);
+    RRconflicts = NEW2(nstates, short);
+    for (i = 0; i < nstates; i++)
+    {
+	SRcount = 0;
+	RRcount = 0;
+	symbol = -1;
+	for (p = parser[i]; p; p = p->next)
+	{
+	    if (p->symbol != symbol)
+	    {
+		pref = p;
+		symbol = p->symbol;
+	    }
+	    else if (i == final_state && symbol == 0)
+	    {
+		SRcount++;
+		p->suppressed = 1;
+	    }
+	    else if (pref->action_code == SHIFT)
+	    {
+		if (pref->prec > 0 && p->prec > 0)
+		{
+		    if (pref->prec < p->prec)
+		    {
+			pref->suppressed = 2;
+			pref = p;
+		    }
+		    else if (pref->prec > p->prec)
+		    {
+			p->suppressed = 2;
+		    }
+		    else if (pref->assoc == LEFT)
+		    {
+			pref->suppressed = 2;
+			pref = p;
+		    }
+		    else if (pref->assoc == RIGHT)
+		    {
+			p->suppressed = 2;
+		    }
+		    else
+		    {
+			pref->suppressed = 2;
+			p->suppressed = 2;
+		    }
+		}
+		else
+		{
+		    SRcount++;
+		    p->suppressed = 1;
+		}
+	    }
+	    else
+	    {
+		RRcount++;
+		p->suppressed = 1;
+	    }
+	}
+	SRtotal += SRcount;
+	RRtotal += RRcount;
+	SRconflicts[i] = SRcount;
+	RRconflicts[i] = RRcount;
+    }
+}
+
+
+total_conflicts()
+{
+    fprintf(stderr, "%s: ", myname);
+    if (SRtotal == 1)
+	fprintf(stderr, "1 shift/reduce conflict");
+    else if (SRtotal > 1)
+	fprintf(stderr, "%d shift/reduce conflicts", SRtotal);
+
+    if (SRtotal && RRtotal)
+	fprintf(stderr, ", ");
+
+    if (RRtotal == 1)
+	fprintf(stderr, "1 reduce/reduce conflict");
+    else if (RRtotal > 1)
+	fprintf(stderr, "%d reduce/reduce conflicts", RRtotal);
+
+    fprintf(stderr, ".\n");
+}
+
+
+int
+sole_reduction(stateno)
+int stateno;
+{
+    register int count, ruleno;
+    register action *p;
+
+    count = 0;
+    ruleno = 0; 
+    for (p = parser[stateno]; p; p = p->next)
+    {
+	if (p->action_code == SHIFT && p->suppressed == 0)
+	    return (0);
+	else if (p->action_code == REDUCE && p->suppressed == 0)
+	{
+	    if (ruleno > 0 && p->number != ruleno)
+		return (0);
+	    if (p->symbol != 1)
+		++count;
+	    ruleno = p->number;
+	}
+    }
+
+    if (count == 0)
+	return (0);
+    return (ruleno);
+}
+
+
+defreds()
+{
+    register int i;
+
+    defred = NEW2(nstates, short);
+    for (i = 0; i < nstates; i++)
+	defred[i] = sole_reduction(i);
+}
+ 
+free_action_row(p)
+register action *p;
+{
+  register action *q;
+
+  while (p)
+    {
+      q = p->next;
+      FREE(p);
+      p = q;
+    }
+}
+
+free_parser()
+{
+  register int i;
+
+  for (i = 0; i < nstates; i++)
+    free_action_row(parser[i]);
+
+  FREE(parser);
+}
diff --git a/mcs/jay/output.c b/mcs/jay/output.c
new file mode 100644
index 00000000000..81e4755c9cd
--- /dev/null
+++ b/mcs/jay/output.c
@@ -0,0 +1,1173 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)output.c	5.7 (Berkeley) 5/24/93";
+#endif /* not lint */
+
+#include "defs.h"
+#include <string.h>
+
+static int nvectors;
+static int nentries;
+static short **froms;
+static short **tos;
+static short *tally;
+static short *width;
+static short *state_count;
+static short *order;
+static short *base;
+static short *pos;
+static int maxtable;
+static short *table;
+static short *check;
+static int lowzero;
+static int high;
+extern int csharp;
+
+output () {
+  int lno = 0;
+  char buf [128];
+
+  free_itemsets();
+  free_shifts();
+  free_reductions();
+
+  while (fgets(buf, sizeof buf, stdin) != NULL) {
+    char * cp;
+    ++ lno;
+    if (buf[strlen(buf)-1] != '\n')
+      fprintf(stderr, "jay: line %d is too long\n", lno), done(1);
+    switch (buf[0]) {
+    case '#':	continue;
+    case 't':	if (!tflag) fputs("//t", stdout);
+    case '.':	break;
+    default:
+      cp = strtok(buf, " \t\r\n");
+      if (cp)
+        if (strcmp(cp, "actions") == 0) output_semantic_actions();
+        else if (strcmp(cp, "debug") == 0) output_debug();
+        else if (strcmp(cp, "epilog") == 0) output_trailing_text();
+        else if (strcmp(cp, "prolog") == 0)
+		output_stored_text(prolog_file, prolog_file_name);
+        else if (strcmp(cp, "local") == 0)
+		output_stored_text(local_file, local_file_name);
+        else if (strcmp(cp, "tables") == 0)
+	  output_rule_data(), output_yydefred(), output_actions();
+        else if (strcmp(cp, "tokens") == 0)
+		output_defines(strtok(NULL, "\r\n"));
+        else
+          fprintf(stderr, "jay: unknown call (%s) in line %d\n", cp, lno);
+      continue;
+    }
+    fputs(buf+1, stdout), ++ outline;
+  }
+  free_parser();
+}
+
+output_rule_data()
+{
+    register int i;
+    register int j;
+
+
+    printf("  %s static %s short [] yyLhs  = {%16d,",
+	   csharp ? "" : " protected",
+	   csharp ? "" : " final",
+	    symbol_value[start_symbol]);
+
+    j = 10;
+    for (i = 3; i < nrules; i++)
+    {
+	if (j >= 10)
+	{
+	    ++outline;
+	    putchar('\n');
+	    j = 1;
+	}
+        else
+	    ++j;
+
+        printf("%5d,", symbol_value[rlhs[i]]);
+    }
+    outline += 2;
+    printf("\n  };\n");
+
+    printf("  %s static %s short [] yyLen = {%12d,",
+	   csharp ? "" : "protected",
+	   csharp ? "" : "final",
+	   2);
+
+    j = 10;
+    for (i = 3; i < nrules; i++)
+    {
+	if (j >= 10)
+	{
+	    ++outline;
+	    putchar('\n');
+	    j = 1;
+	}
+	else
+	  j++;
+
+        printf("%5d,", rrhs[i + 1] - rrhs[i] - 1);
+    }
+    outline += 2;
+    printf("\n  };\n");
+}
+
+
+output_yydefred()
+{
+    register int i, j;
+
+    printf("  %s static %s short [] yyDefRed = {%13d,",
+	   csharp ? "" : "protected",
+	   csharp ? "" : "final",	   
+	    (defred[0] ? defred[0] - 2 : 0));
+
+    j = 10;
+    for (i = 1; i < nstates; i++)
+    {
+	if (j < 10)
+	    ++j;
+	else
+	{
+	    ++outline;
+	    putchar('\n');
+	    j = 1;
+	}
+
+	printf("%5d,", (defred[i] ? defred[i] - 2 : 0));
+    }
+
+    outline += 2;
+    printf("\n  };\n");
+}
+
+
+output_actions()
+{
+    nvectors = 2*nstates + nvars;
+
+    froms = NEW2(nvectors, short *);
+    tos = NEW2(nvectors, short *);
+    tally = NEW2(nvectors, short);
+    width = NEW2(nvectors, short);
+
+    token_actions();
+    FREE(lookaheads);
+    FREE(LA);
+    FREE(LAruleno);
+    FREE(accessing_symbol);
+
+    goto_actions();
+    FREE(goto_map + ntokens);
+    FREE(from_state);
+    FREE(to_state);
+
+    sort_actions();
+    pack_table();
+    output_base();
+    output_table();
+    output_check();
+}
+
+
+token_actions()
+{
+    register int i, j;
+    register int shiftcount, reducecount;
+    register int max, min;
+    register short *actionrow, *r, *s;
+    register action *p;
+
+    actionrow = NEW2(2*ntokens, short);
+    for (i = 0; i < nstates; ++i)
+    {
+	if (parser[i])
+	{
+	    for (j = 0; j < 2*ntokens; ++j)
+	    actionrow[j] = 0;
+
+	    shiftcount = 0;
+	    reducecount = 0;
+	    for (p = parser[i]; p; p = p->next)
+	    {
+		if (p->suppressed == 0)
+		{
+		    if (p->action_code == SHIFT)
+		    {
+			++shiftcount;
+			actionrow[p->symbol] = p->number;
+		    }
+		    else if (p->action_code == REDUCE && p->number != defred[i])
+		    {
+			++reducecount;
+			actionrow[p->symbol + ntokens] = p->number;
+		    }
+		}
+	    }
+
+	    tally[i] = shiftcount;
+	    tally[nstates+i] = reducecount;
+	    width[i] = 0;
+	    width[nstates+i] = 0;
+	    if (shiftcount > 0)
+	    {
+		froms[i] = r = NEW2(shiftcount, short);
+		tos[i] = s = NEW2(shiftcount, short);
+		min = MAXSHORT;
+		max = 0;
+		for (j = 0; j < ntokens; ++j)
+		{
+		    if (actionrow[j])
+		    {
+			if (min > symbol_value[j])
+			    min = symbol_value[j];
+			if (max < symbol_value[j])
+			    max = symbol_value[j];
+			*r++ = symbol_value[j];
+			*s++ = actionrow[j];
+		    }
+		}
+		width[i] = max - min + 1;
+	    }
+	    if (reducecount > 0)
+	    {
+		froms[nstates+i] = r = NEW2(reducecount, short);
+		tos[nstates+i] = s = NEW2(reducecount, short);
+		min = MAXSHORT;
+		max = 0;
+		for (j = 0; j < ntokens; ++j)
+		{
+		    if (actionrow[ntokens+j])
+		    {
+			if (min > symbol_value[j])
+			    min = symbol_value[j];
+			if (max < symbol_value[j])
+			    max = symbol_value[j];
+			*r++ = symbol_value[j];
+			*s++ = actionrow[ntokens+j] - 2;
+		    }
+		}
+		width[nstates+i] = max - min + 1;
+	    }
+	}
+    }
+    FREE(actionrow);
+}
+
+goto_actions()
+{
+    register int i, j, k;
+
+    state_count = NEW2(nstates, short);
+
+    k = default_goto(start_symbol + 1);
+    printf("  protected static %s short [] yyDgoto  = {%14d,", csharp ? "" : "final", k);
+    save_column(start_symbol + 1, k);
+
+    j = 10;
+    for (i = start_symbol + 2; i < nsyms; i++)
+    {
+	if (j >= 10)
+	{
+	    ++outline;
+	    putchar('\n');
+	    j = 1;
+	}
+	else
+	    ++j;
+
+	k = default_goto(i);
+	printf("%5d,", k);
+	save_column(i, k);
+    }
+
+    outline += 2;
+    printf("\n  };\n");
+    FREE(state_count);
+}
+
+int
+default_goto(symbol)
+int symbol;
+{
+    register int i;
+    register int m;
+    register int n;
+    register int default_state;
+    register int max;
+
+    m = goto_map[symbol];
+    n = goto_map[symbol + 1];
+
+    if (m == n) return (0);
+
+    for (i = 0; i < nstates; i++)
+	state_count[i] = 0;
+
+    for (i = m; i < n; i++)
+	state_count[to_state[i]]++;
+
+    max = 0;
+    default_state = 0;
+    for (i = 0; i < nstates; i++)
+    {
+	if (state_count[i] > max)
+	{
+	    max = state_count[i];
+	    default_state = i;
+	}
+    }
+
+    return (default_state);
+}
+
+
+
+save_column(symbol, default_state)
+int symbol;
+int default_state;
+{
+    register int i;
+    register int m;
+    register int n;
+    register short *sp;
+    register short *sp1;
+    register short *sp2;
+    register int count;
+    register int symno;
+
+    m = goto_map[symbol];
+    n = goto_map[symbol + 1];
+
+    count = 0;
+    for (i = m; i < n; i++)
+    {
+	if (to_state[i] != default_state)
+	    ++count;
+    }
+    if (count == 0) return;
+
+    symno = symbol_value[symbol] + 2*nstates;
+
+    froms[symno] = sp1 = sp = NEW2(count, short);
+    tos[symno] = sp2 = NEW2(count, short);
+
+    for (i = m; i < n; i++)
+    {
+	if (to_state[i] != default_state)
+	{
+	    *sp1++ = from_state[i];
+	    *sp2++ = to_state[i];
+	}
+    }
+
+    tally[symno] = count;
+    width[symno] = sp1[-1] - sp[0] + 1;
+}
+
+sort_actions()
+{
+  register int i;
+  register int j;
+  register int k;
+  register int t;
+  register int w;
+
+  order = NEW2(nvectors, short);
+  nentries = 0;
+
+  for (i = 0; i < nvectors; i++)
+    {
+      if (tally[i] > 0)
+	{
+	  t = tally[i];
+	  w = width[i];
+	  j = nentries - 1;
+
+	  while (j >= 0 && (width[order[j]] < w))
+	    j--;
+
+	  while (j >= 0 && (width[order[j]] == w) && (tally[order[j]] < t))
+	    j--;
+
+	  for (k = nentries - 1; k > j; k--)
+	    order[k + 1] = order[k];
+
+	  order[j + 1] = i;
+	  nentries++;
+	}
+    }
+}
+
+
+pack_table()
+{
+    register int i;
+    register int place;
+    register int state;
+
+    base = NEW2(nvectors, short);
+    pos = NEW2(nentries, short);
+
+    maxtable = 1000;
+    table = NEW2(maxtable, short);
+    check = NEW2(maxtable, short);
+
+    lowzero = 0;
+    high = 0;
+
+    for (i = 0; i < maxtable; i++)
+	check[i] = -1;
+
+    for (i = 0; i < nentries; i++)
+    {
+	state = matching_vector(i);
+
+	if (state < 0)
+	    place = pack_vector(i);
+	else
+	    place = base[state];
+
+	pos[i] = place;
+	base[order[i]] = place;
+    }
+
+    for (i = 0; i < nvectors; i++)
+    {
+	if (froms[i])
+	    FREE(froms[i]);
+	if (tos[i])
+	    FREE(tos[i]);
+    }
+
+    FREE(froms);
+    FREE(tos);
+    FREE(pos);
+}
+
+
+/*  The function matching_vector determines if the vector specified by	*/
+/*  the input parameter matches a previously considered	vector.  The	*/
+/*  test at the start of the function checks if the vector represents	*/
+/*  a row of shifts over terminal symbols or a row of reductions, or a	*/
+/*  column of shifts over a nonterminal symbol.  Berkeley Yacc does not	*/
+/*  check if a column of shifts over a nonterminal symbols matches a	*/
+/*  previously considered vector.  Because of the nature of LR parsing	*/
+/*  tables, no two columns can match.  Therefore, the only possible	*/
+/*  match would be between a row and a column.  Such matches are	*/
+/*  unlikely.  Therefore, to save time, no attempt is made to see if a	*/
+/*  column matches a previously considered vector.			*/
+/*									*/
+/*  Matching_vector is poorly designed.  The test could easily be made	*/
+/*  faster.  Also, it depends on the vectors being in a specific	*/
+/*  order.								*/
+
+int
+matching_vector(vector)
+int vector;
+{
+    register int i;
+    register int j;
+    register int k;
+    register int t;
+    register int w;
+    register int match;
+    register int prev;
+
+    i = order[vector];
+    if (i >= 2*nstates)
+	return (-1);
+
+    t = tally[i];
+    w = width[i];
+
+    for (prev = vector - 1; prev >= 0; prev--)
+    {
+	j = order[prev];
+	if (width[j] != w || tally[j] != t)
+	    return (-1);
+
+	match = 1;
+	for (k = 0; match && k < t; k++)
+	{
+	    if (tos[j][k] != tos[i][k] || froms[j][k] != froms[i][k])
+		match = 0;
+	}
+
+	if (match)
+	    return (j);
+    }
+
+    return (-1);
+}
+
+
+
+int
+pack_vector(vector)
+int vector;
+{
+    register int i, j, k, l;
+    register int t;
+    register int loc;
+    register int ok;
+    register short *from;
+    register short *to;
+    int newmax;
+
+    i = order[vector];
+    t = tally[i];
+    assert(t);
+
+    from = froms[i];
+    to = tos[i];
+
+    j = lowzero - from[0];
+    for (k = 1; k < t; ++k)
+	if (lowzero - from[k] > j)
+	    j = lowzero - from[k];
+    for (;; ++j)
+    {
+	if (j == 0)
+	    continue;
+	ok = 1;
+	for (k = 0; ok && k < t; k++)
+	{
+	    loc = j + from[k];
+	    if (loc >= maxtable)
+	    {
+		if (loc >= MAXTABLE)
+		    fatal("maximum table size exceeded");
+
+		newmax = maxtable;
+		do { newmax += 200; } while (newmax <= loc);
+		table = (short *) REALLOC(table, newmax*sizeof(short));
+		if (table == 0) no_space();
+		check = (short *) REALLOC(check, newmax*sizeof(short));
+		if (check == 0) no_space();
+		for (l  = maxtable; l < newmax; ++l)
+		{
+		    table[l] = 0;
+		    check[l] = -1;
+		}
+		maxtable = newmax;
+	    }
+
+	    if (check[loc] != -1)
+		ok = 0;
+	}
+	for (k = 0; ok && k < vector; k++)
+	{
+	    if (pos[k] == j)
+		ok = 0;
+	}
+	if (ok)
+	{
+	    for (k = 0; k < t; k++)
+	    {
+		loc = j + from[k];
+		table[loc] = to[k];
+		check[loc] = from[k];
+		if (loc > high) high = loc;
+	    }
+
+	    while (check[lowzero] != -1)
+		++lowzero;
+
+	    return (j);
+	}
+    }
+}
+
+
+
+output_base()
+{
+    register int i, j;
+
+    printf("  protected static %s short [] yySindex = {%13d,", csharp?"":"final", base[0]);
+
+    j = 10;
+    for (i = 1; i < nstates; i++)
+    {
+	if (j >= 10)
+	{
+	    ++outline;
+	    putchar('\n');
+	    j = 1;
+	}
+	else
+	    ++j;
+
+	printf("%5d,", base[i]);
+    }
+
+    outline += 2;
+    printf("\n  };\n  protected static %s short [] yyRindex = {%13d,",
+	   csharp ? "" : "final",
+	    base[nstates]);
+
+    j = 10;
+    for (i = nstates + 1; i < 2*nstates; i++)
+    {
+	if (j >= 10)
+	{
+	    ++outline;
+	    putchar('\n');
+	    j = 1;
+	}
+	else
+	    ++j;
+
+	printf("%5d,", base[i]);
+    }
+
+    outline += 2;
+    printf("\n  };\n  protected static %s short [] yyGindex = {%13d,",
+	   csharp ? "" : "final",
+	    base[2*nstates]);
+
+    j = 10;
+    for (i = 2*nstates + 1; i < nvectors - 1; i++)
+    {
+	if (j >= 10)
+	{
+	    ++outline;
+	    putchar('\n');
+	    j = 1;
+	}
+	else
+	    ++j;
+
+	printf("%5d,", base[i]);
+    }
+
+    outline += 2;
+    printf("\n  };\n");
+    FREE(base);
+}
+
+
+
+output_table()
+{
+    register int i;
+    register int j;
+
+    printf("  protected static %s short [] yyTable = {%14d,", csharp ? "" : "final", table[0]);
+
+    j = 10;
+    for (i = 1; i <= high; i++)
+    {
+	if (j >= 10)
+	{
+	    ++outline;
+	    putchar('\n');
+	    j = 1;
+	}
+	else
+	    ++j;
+
+	printf("%5d,", table[i]);
+    }
+
+    outline += 2;
+    printf("\n  };\n");
+    FREE(table);
+}
+
+
+
+output_check()
+{
+    register int i;
+    register int j;
+
+    printf("  protected static %s short [] yyCheck = {%14d,",
+	   csharp ? "" : "final",
+	    check[0]);
+
+    j = 10;
+    for (i = 1; i <= high; i++)
+    {
+	if (j >= 10)
+	{
+	    ++outline;
+	    putchar('\n');
+	    j = 1;
+	}
+	else
+	    ++j;
+
+	printf("%5d,", check[i]);
+    }
+
+    outline += 2;
+    printf("\n  };\n");
+    FREE(check);
+}
+
+
+int
+is_C_identifier(name)
+char *name;
+{
+    register char *s;
+    register int c;
+
+    s = name;
+    c = *s;
+    if (c == '"')
+    {
+	c = *++s;
+	if (!isalpha(c) && c != '_' && c != '$')
+	    return (0);
+	while ((c = *++s) != '"')
+	{
+	    if (!isalnum(c) && c != '_' && c != '$')
+		return (0);
+	}
+	return (1);
+    }
+
+    if (!isalpha(c) && c != '_' && c != '$')
+	return (0);
+    while (c = *++s)
+    {
+	if (!isalnum(c) && c != '_' && c != '$')
+	    return (0);
+    }
+    return (1);
+}
+
+
+output_defines(prefix)
+char *prefix;
+{
+    register int c, i;
+    register char *s;
+
+    for (i = 2; i < ntokens; ++i)
+    {
+	s = symbol_name[i];
+	if (is_C_identifier(s))
+	{
+	    if (prefix)
+	        printf("  %s ", prefix);
+	    c = *s;
+	    if (c == '"')
+	    {
+		while ((c = *++s) != '"')
+		{
+		    putchar(c);
+		}
+	    }
+	    else
+	    {
+		do
+		{
+		    putchar(c);
+		}
+		while (c = *++s);
+	    }
+	    ++outline;
+	    printf(" = %d%s\n", symbol_value[i], csharp ? ";" : ";");
+	}
+    }
+
+    ++outline;
+    printf("  %s yyErrorCode = %d%s\n", prefix ? prefix : "", symbol_value[1], csharp ? ";" : ";");
+}
+
+
+output_stored_text(file, name)
+FILE *file;
+char *name;
+{
+    register int c;
+    register FILE *in;
+
+    fflush(file);
+    in = fopen(name, "r");
+    if (in == NULL)
+	open_error(name);
+    if ((c = getc(in)) != EOF) {
+      if (c ==  '\n')
+	++outline;
+      putchar(c);
+      while ((c = getc(in)) != EOF)
+      {
+	if (c == '\n')
+	    ++outline;
+    	putchar(c);
+      }
+      printf(line_format, ++outline + 1, "-");
+    }
+    fclose(in);
+}
+
+
+output_debug()
+{
+    register int i, j, k, max;
+    char **symnam, *s;
+    char * prefix = tflag ? "" : "//t";
+
+    ++outline;
+    printf("  protected static %s int yyFinal = %d;\n", csharp ? "" : "final", final_state);
+
+      ++outline;
+      printf("%s  public static %s string [] yyRule = {\n", prefix, csharp ? "" : "final");
+      for (i = 2; i < nrules; ++i)
+      {
+	  printf("%s    \"%s :", prefix, symbol_name[rlhs[i]]);
+	  for (j = rrhs[i]; ritem[j] > 0; ++j)
+	  {
+	      s = symbol_name[ritem[j]];
+	      if (s[0] == '"')
+	      {
+		  printf(" \\\"");
+		  while (*++s != '"')
+		  {
+		      if (*s == '\\')
+		      {
+			  if (s[1] == '\\')
+			      printf("\\\\\\\\");
+			  else
+			      printf("\\\\%c", s[1]);
+			  ++s;
+		      }
+		      else
+			  putchar(*s);
+		  }
+		  printf("\\\"");
+	      }
+	      else if (s[0] == '\'')
+	      {
+		  if (s[1] == '"')
+		      printf(" '\\\"'");
+		  else if (s[1] == '\\')
+		  {
+		      if (s[2] == '\\')
+			  printf(" '\\\\\\\\");
+		      else
+			  printf(" '\\\\%c", s[2]);
+		      s += 2;
+		      while (*++s != '\'')
+			  putchar(*s);
+		      putchar('\'');
+		  }
+		  else
+		      printf(" '%c'", s[1]);
+	      }
+	      else
+		  printf(" %s", s);
+	  }
+	  ++outline;
+	  printf("\",\n");
+      }
+      ++ outline;
+      printf("%s  };\n", prefix);
+
+    max = 0;
+    for (i = 2; i < ntokens; ++i)
+	if (symbol_value[i] > max)
+	    max = symbol_value[i];
+
+	/* need yyName for yyExpecting() */
+
+      printf("  protected static %s string [] yyName = {", csharp ? "" : "final");
+      symnam = (char **) MALLOC((max+1)*sizeof(char *));
+      if (symnam == 0) no_space();
+  
+      /* Note that it is  not necessary to initialize the element	*/
+      /* symnam[max].							*/
+      for (i = 0; i < max; ++i)
+	  symnam[i] = 0;
+      for (i = ntokens - 1; i >= 2; --i)
+	  symnam[symbol_value[i]] = symbol_name[i];
+      symnam[0] = "end-of-file";
+  
+      j = 70; fputs("    ", stdout);
+      for (i = 0; i <= max; ++i)
+      {
+	  if (s = symnam[i])
+	  {
+	      if (s[0] == '"')
+	      {
+		  k = 7;
+		  while (*++s != '"')
+		  {
+		      ++k;
+		      if (*s == '\\')
+		      {
+			  k += 2;
+			  if (*++s == '\\')
+			      ++k;
+		      }
+		  }
+		  j += k;
+		  if (j > 70)
+		  {
+		      ++outline;
+		      printf("\n    ");
+		      j = k;
+		  }
+		  printf("\"\\\"");
+		  s = symnam[i];
+		  while (*++s != '"')
+		  {
+		      if (*s == '\\')
+		      {
+			  printf("\\\\");
+			  if (*++s == '\\')
+			      printf("\\\\");
+			  else
+			      putchar(*s);
+		      }
+		      else
+			  putchar(*s);
+		  }
+		  printf("\\\"\",");
+	      }
+	      else if (s[0] == '\'')
+	      {
+		  if (s[1] == '"')
+		  {
+		      j += 7;
+		      if (j > 70)
+		      {
+			  ++outline;
+		      	  printf("\n    ");
+			  j = 7;
+		      }
+		      printf("\"'\\\"'\",");
+		  }
+		  else
+		  {
+		      k = 5;
+		      while (*++s != '\'')
+		      {
+			  ++k;
+			  if (*s == '\\')
+			  {
+			      k += 2;
+			      if (*++s == '\\')
+				  ++k;
+			  }
+		      }
+		      j += k;
+		      if (j > 70)
+		      {
+			  ++outline;
+		      	  printf("\n    ");
+			  j = k;
+		      }
+		      printf("\"'");
+		      s = symnam[i];
+		      while (*++s != '\'')
+		      {
+			  if (*s == '\\')
+			  {
+			      printf("\\\\");
+			      if (*++s == '\\')
+				  printf("\\\\");
+			      else
+				  putchar(*s);
+			  }
+			  else
+			      putchar(*s);
+		      }
+		      printf("'\",");
+		  }
+	      }
+	      else
+	      {
+		  k = strlen(s) + 3;
+		  j += k;
+		  if (j > 70)
+		  {
+		      ++outline;
+		      printf("\n    ");
+		      j = k;
+		  }
+		  putchar('"');
+		  do { putchar(*s); } while (*++s);
+		  printf("\",");
+	      }
+	  }
+	  else
+	  {
+	      j += 5;
+	      if (j > 70)
+	      {
+		  ++outline;
+		  printf("\n    ");
+		  j = 5;
+	      }
+	      printf("null,");
+	  }
+      }
+      outline += 2;
+      printf("\n  };\n");
+      FREE(symnam);
+}
+
+output_trailing_text()
+{
+    register int c, last;
+    register FILE *in;
+
+    if (line == 0)
+	return;
+
+    in = input_file;
+    c = *cptr;
+    if (c == '\n')
+    {
+	++lineno;
+	if ((c = getc(in)) == EOF)
+	    return;
+        ++outline;
+	printf(line_format, lineno, input_file_name);
+	if (c == '\n')
+	    ++outline;
+	putchar(c);
+	last = c;
+    }
+    else
+    {
+	++outline;
+	printf(line_format, lineno, input_file_name);
+	do { putchar(c); } while ((c = *++cptr) != '\n');
+	++outline;
+	putchar('\n');
+	last = '\n';
+    }
+
+    while ((c = getc(in)) != EOF)
+    {
+	if (c == '\n')
+	    ++outline;
+	putchar(c);
+	last = c;
+    }
+
+    if (last != '\n')
+    {
+	++outline;
+	putchar('\n');
+    }
+    printf(line_format, ++outline + 1, "-");
+}
+
+
+output_semantic_actions()
+{
+    register int c, last;
+
+    fclose(action_file);
+    action_file = fopen(action_file_name, "r");
+    if (action_file == NULL)
+	open_error(action_file_name);
+
+    if ((c = getc(action_file)) == EOF)
+	return;
+
+    last = c;
+    if (c == '\n')
+	++outline;
+    putchar(c);
+    while ((c = getc(action_file)) != EOF)
+    {
+	if (c == '\n')
+	    ++outline;
+	putchar(c);
+	last = c;
+    }
+
+    if (last != '\n')
+    {
+	++outline;
+	putchar('\n');
+    }
+
+    printf(line_format, ++outline + 1, "-");
+}
+
+
+free_itemsets()
+{
+    register core *cp, *next;
+
+    FREE(state_table);
+    for (cp = first_state; cp; cp = next)
+    {
+	next = cp->next;
+	FREE(cp);
+    }
+}
+
+
+free_shifts()
+{
+    register shifts *sp, *next;
+
+    FREE(shift_table);
+    for (sp = first_shift; sp; sp = next)
+    {
+	next = sp->next;
+	FREE(sp);
+    }
+}
+
+
+
+free_reductions()
+{
+    register reductions *rp, *next;
+
+    FREE(reduction_table);
+    for (rp = first_reduction; rp; rp = next)
+    {
+	next = rp->next;
+	FREE(rp);
+    }
+}
diff --git a/mcs/jay/reader.c b/mcs/jay/reader.c
new file mode 100644
index 00000000000..f2cdd5af834
--- /dev/null
+++ b/mcs/jay/reader.c
@@ -0,0 +1,1627 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)reader.c	5.7 (Berkeley) 1/20/91";
+#endif /* not lint */
+
+#include "defs.h"
+
+/*  The line size must be a positive integer.  One hundred was chosen	*/
+/*  because few lines in Yacc input grammars exceed 100 characters.	*/
+/*  Note that if a line exceeds LINESIZE characters, the line buffer	*/
+/*  will be expanded to accomodate it.					*/
+
+#define LINESIZE 100
+
+char *cache;
+int cinc, cache_size;
+
+int ntags, tagmax;
+char **tag_table;
+
+char saw_eof;
+char *cptr, *line;
+int linesize;
+
+bucket *goal;
+int prec;
+int gensym;
+char last_was_action;
+
+int maxitems;
+bucket **pitem;
+
+int maxrules;
+bucket **plhs;
+
+int name_pool_size;
+char *name_pool;
+
+char *line_format = "\t\t\t\t\t// line %d \"%s\"\n";
+
+
+cachec(c)
+int c;
+{
+    assert(cinc >= 0);
+    if (cinc >= cache_size)
+    {
+	cache_size += 256;
+	cache = REALLOC(cache, cache_size);
+	if (cache == 0) no_space();
+    }
+    cache[cinc] = c;
+    ++cinc;
+}
+
+
+get_line()
+{
+    register FILE *f = input_file;
+    register int c;
+    register int i;
+
+    if (saw_eof || (c = getc(f)) == EOF)
+    {
+	if (line) { FREE(line); line = 0; }
+	cptr = 0;
+	saw_eof = 1;
+	return;
+    }
+
+    if (line == 0 || linesize != (LINESIZE + 1))
+    {
+	if (line) FREE(line);
+	linesize = LINESIZE + 1;
+	line = MALLOC(linesize);
+	if (line == 0) no_space();
+    }
+
+    i = 0;
+    ++lineno;
+    for (;;)
+    {
+	line[i]  =  c;
+	if (c == '\n') { cptr = line; return; }
+	if (++i >= linesize)
+	{
+	    linesize += LINESIZE;
+	    line = REALLOC(line, linesize);
+	    if (line ==  0) no_space();
+	}
+	c = getc(f);
+	if (c ==  EOF)
+	{
+	    line[i] = '\n';
+	    saw_eof = 1;
+	    cptr = line;
+	    return;
+	}
+    }
+}
+
+
+char *
+dup_line()
+{
+    register char *p, *s, *t;
+
+    if (line == 0) return (0);
+    s = line;
+    while (*s != '\n') ++s;
+    p = MALLOC(s - line + 1);
+    if (p == 0) no_space();
+
+    s = line;
+    t = p;
+    while ((*t++ = *s++) != '\n') continue;
+    return (p);
+}
+
+
+skip_comment()
+{
+    register char *s;
+
+    int st_lineno = lineno;
+    char *st_line = dup_line();
+    char *st_cptr = st_line + (cptr - line);
+
+    s = cptr + 2;
+    for (;;)
+    {
+	if (*s == '*' && s[1] == '/')
+	{
+	    cptr = s + 2;
+	    FREE(st_line);
+	    return;
+	}
+	if (*s == '\n')
+	{
+	    get_line();
+	    if (line == 0)
+		unterminated_comment(st_lineno, st_line, st_cptr);
+	    s = cptr;
+	}
+	else
+	    ++s;
+    }
+}
+
+
+int
+nextc()
+{
+    register char *s;
+
+    if (line == 0)
+    {
+	get_line();
+	if (line == 0)
+	    return (EOF);
+    }
+
+    s = cptr;
+    for (;;)
+    {
+	switch (*s)
+	{
+	case '\n':
+	    get_line();
+	    if (line == 0) return (EOF);
+	    s = cptr;
+	    break;
+
+	case ' ':
+	case '\t':
+	case '\f':
+	case '\r':
+	case '\v':
+	case ',':
+	case ';':
+	    ++s;
+	    break;
+
+	case '\\':
+	    cptr = s;
+	    return ('%');
+
+	case '/':
+	    if (s[1] == '*')
+	    {
+		cptr = s;
+		skip_comment();
+		s = cptr;
+		break;
+	    }
+	    else if (s[1] == '/')
+	    {
+		get_line();
+		if (line == 0) return (EOF);
+		s = cptr;
+		break;
+	    }
+	    /* fall through */
+
+	default:
+	    cptr = s;
+	    return (*s);
+	}
+    }
+}
+
+
+int
+keyword()
+{
+    register int c;
+    char *t_cptr = cptr;
+
+    c = *++cptr;
+    if (isalpha(c))
+    {
+	cinc = 0;
+	for (;;)
+	{
+	    if (isalpha(c))
+	    {
+		if (isupper(c)) c = tolower(c);
+		cachec(c);
+	    }
+	    else if (isdigit(c) || c == '_' || c == '.' || c == '$')
+		cachec(c);
+	    else
+		break;
+	    c = *++cptr;
+	}
+	cachec(NUL);
+
+	if (strcmp(cache, "token") == 0 || strcmp(cache, "term") == 0)
+	    return (TOKEN);
+	if (strcmp(cache, "type") == 0)
+	    return (TYPE);
+	if (strcmp(cache, "left") == 0)
+	    return (LEFT);
+	if (strcmp(cache, "right") == 0)
+	    return (RIGHT);
+	if (strcmp(cache, "nonassoc") == 0 || strcmp(cache, "binary") == 0)
+	    return (NONASSOC);
+	if (strcmp(cache, "start") == 0)
+	    return (START);
+    }
+    else
+    {
+	++cptr;
+	if (c == '{')
+	    return (TEXT);
+	if (c == '%' || c == '\\')
+	    return (MARK);
+	if (c == '<')
+	    return (LEFT);
+	if (c == '>')
+	    return (RIGHT);
+	if (c == '0')
+	    return (TOKEN);
+	if (c == '2')
+	    return (NONASSOC);
+    }
+    syntax_error(lineno, line, t_cptr);
+    /*NOTREACHED*/
+}
+
+
+copy_text(f)
+FILE *f;
+{
+    register int c;
+    int quote;
+    int need_newline = 0;
+    int t_lineno = lineno;
+    char *t_line = dup_line();
+    char *t_cptr = t_line + (cptr - line - 2);
+
+    if (*cptr == '\n')
+    {
+	get_line();
+	if (line == 0)
+	    unterminated_text(t_lineno, t_line, t_cptr);
+    }
+    fprintf(f, line_format, lineno, input_file_name);
+
+loop:
+    c = *cptr++;
+    switch (c)
+    {
+    case '\n':
+    next_line:
+	putc('\n', f);
+	need_newline = 0;
+	get_line();
+	if (line) goto loop;
+	unterminated_text(t_lineno, t_line, t_cptr);
+
+    case '\'':
+    case '"':
+	{
+	    int s_lineno = lineno;
+	    char *s_line = dup_line();
+	    char *s_cptr = s_line + (cptr - line - 1);
+
+	    quote = c;
+	    putc(c, f);
+	    for (;;)
+	    {
+		c = *cptr++;
+		putc(c, f);
+		if (c == quote)
+		{
+		    need_newline = 1;
+		    FREE(s_line);
+		    goto loop;
+		}
+		if (c == '\n')
+		    unterminated_string(s_lineno, s_line, s_cptr);
+		if (c == '\\')
+		{
+		    c = *cptr++;
+		    putc(c, f);
+		    if (c == '\n')
+		    {
+			get_line();
+			if (line == 0)
+			    unterminated_string(s_lineno, s_line, s_cptr);
+		    }
+		}
+	    }
+	}
+
+    case '/':
+	putc(c, f);
+	need_newline = 1;
+	c = *cptr;
+	if (c == '/')
+	{
+	    do putc(c, f); while ((c = *++cptr) != '\n');
+	    goto next_line;
+	}
+	if (c == '*')
+	{
+	    int c_lineno = lineno;
+	    char *c_line = dup_line();
+	    char *c_cptr = c_line + (cptr - line - 1);
+
+	    putc('*', f);
+	    ++cptr;
+	    for (;;)
+	    {
+		c = *cptr++;
+		putc(c, f);
+		if (c == '*' && *cptr == '/')
+		{
+		    putc('/', f);
+		    ++cptr;
+		    FREE(c_line);
+		    goto loop;
+		}
+		if (c == '\n')
+		{
+		    get_line();
+		    if (line == 0)
+			unterminated_comment(c_lineno, c_line, c_cptr);
+		}
+	    }
+	}
+	need_newline = 1;
+	goto loop;
+
+    case '%':
+    case '\\':
+	if (*cptr == '}')
+	{
+	    if (need_newline) putc('\n', f);
+	    ++cptr;
+	    FREE(t_line);
+	    return;
+	}
+	/* fall through */
+
+    default:
+	putc(c, f);
+	need_newline = 1;
+	goto loop;
+    }
+}
+
+int
+hexval(c)
+int c;
+{
+    if (c >= '0' && c <= '9')
+	return (c - '0');
+    if (c >= 'A' && c <= 'F')
+	return (c - 'A' + 10);
+    if (c >= 'a' && c <= 'f')
+	return (c - 'a' + 10);
+    return (-1);
+}
+
+
+bucket *
+get_literal()
+{
+    register int c, quote;
+    register int i;
+    register int n;
+    register char *s;
+    register bucket *bp;
+    int s_lineno = lineno;
+    char *s_line = dup_line();
+    char *s_cptr = s_line + (cptr - line);
+
+    quote = *cptr++;
+    cinc = 0;
+    for (;;)
+    {
+	c = *cptr++;
+	if (c == quote) break;
+	if (c == '\n') unterminated_string(s_lineno, s_line, s_cptr);
+	if (c == '\\')
+	{
+	    char *c_cptr = cptr - 1;
+
+	    c = *cptr++;
+	    switch (c)
+	    {
+	    case '\n':
+		get_line();
+		if (line == 0) unterminated_string(s_lineno, s_line, s_cptr);
+		continue;
+
+	    case '0': case '1': case '2': case '3':
+	    case '4': case '5': case '6': case '7':
+		n = c - '0';
+		c = *cptr;
+		if (IS_OCTAL(c))
+		{
+		    n = (n << 3) + (c - '0');
+		    c = *++cptr;
+		    if (IS_OCTAL(c))
+		    {
+			n = (n << 3) + (c - '0');
+			++cptr;
+		    }
+		}
+		if (n > MAXCHAR) illegal_character(c_cptr);
+		c = n;
+	    	break;
+
+	    case 'x':
+		c = *cptr++;
+		n = hexval(c);
+		if (n < 0 || n >= 16)
+		    illegal_character(c_cptr);
+		for (;;)
+		{
+		    c = *cptr;
+		    i = hexval(c);
+		    if (i < 0 || i >= 16) break;
+		    ++cptr;
+		    n = (n << 4) + i;
+		    if (n > MAXCHAR) illegal_character(c_cptr);
+		}
+		c = n;
+		break;
+
+	    case 'a': c = 7; break;
+	    case 'b': c = '\b'; break;
+	    case 'f': c = '\f'; break;
+	    case 'n': c = '\n'; break;
+	    case 'r': c = '\r'; break;
+	    case 't': c = '\t'; break;
+	    case 'v': c = '\v'; break;
+	    }
+	}
+	cachec(c);
+    }
+    FREE(s_line);
+
+    n = cinc;
+    s = MALLOC(n);
+    if (s == 0) no_space();
+    
+    for (i = 0; i < n; ++i)
+	s[i] = cache[i];
+
+    cinc = 0;
+    if (n == 1)
+	cachec('\'');
+    else
+	cachec('"');
+
+    for (i = 0; i < n; ++i)
+    {
+	c = ((unsigned char *)s)[i];
+	if (c == '\\' || c == cache[0])
+	{
+	    cachec('\\');
+	    cachec(c);
+	}
+	else if (isprint(c))
+	    cachec(c);
+	else
+	{
+	    cachec('\\');
+	    switch (c)
+	    {
+	    case 7: cachec('a'); break;
+	    case '\b': cachec('b'); break;
+	    case '\f': cachec('f'); break;
+	    case '\n': cachec('n'); break;
+	    case '\r': cachec('r'); break;
+	    case '\t': cachec('t'); break;
+	    case '\v': cachec('v'); break;
+	    default:
+		cachec(((c >> 6) & 7) + '0');
+		cachec(((c >> 3) & 7) + '0');
+		cachec((c & 7) + '0');
+		break;
+	    }
+	}
+    }
+
+    if (n == 1)
+	cachec('\'');
+    else
+	cachec('"');
+
+    cachec(NUL);
+    bp = lookup(cache);
+    bp->class = TERM;
+    if (n == 1 && bp->value == UNDEFINED)
+	bp->value = *(unsigned char *)s;
+    FREE(s);
+
+    return (bp);
+}
+
+
+int
+is_reserved(name)
+char *name;
+{
+    char *s;
+
+    if (strcmp(name, ".") == 0 ||
+	    strcmp(name, "$accept") == 0 ||
+	    strcmp(name, "$end") == 0)
+	return (1);
+
+    if (name[0] == '$' && name[1] == '$' && isdigit(name[2]))
+    {
+	s = name + 3;
+	while (isdigit(*s)) ++s;
+	if (*s == NUL) return (1);
+    }
+
+    return (0);
+}
+
+
+bucket *
+get_name()
+{
+    register int c;
+
+    cinc = 0;
+    for (c = *cptr; IS_IDENT(c); c = *++cptr)
+	cachec(c);
+    cachec(NUL);
+
+    if (is_reserved(cache)) used_reserved(cache);
+
+    return (lookup(cache));
+}
+
+
+int
+get_number()
+{
+    register int c;
+    register int n;
+
+    n = 0;
+    for (c = *cptr; isdigit(c); c = *++cptr)
+	n = 10*n + (c - '0');
+
+    return (n);
+}
+
+
+char *
+get_tag(int emptyOk)
+{
+    register int c;
+    register int i;
+    register char *s;
+    int t_lineno = lineno;
+    char *t_line = dup_line();
+    char *t_cptr = t_line + (cptr - line);
+
+    ++cptr;
+    c = nextc();
+    if (c == EOF) unexpected_EOF();
+    if (emptyOk && c == '>') {
+      ++cptr; return 0;	// 0 indicates empty tag if emptyOk
+    }
+    if (!isalpha(c) && c != '_' && c != '$')
+	illegal_tag(t_lineno, t_line, t_cptr);
+
+    cinc = 0;
+    do { cachec(c); c = *++cptr; } while (IS_IDENT(c));
+    cachec(NUL);
+
+    c = nextc();
+    if (c == EOF) unexpected_EOF();
+    if (c != '>')
+	illegal_tag(t_lineno, t_line, t_cptr);
+    ++cptr;
+
+    for (i = 0; i < ntags; ++i)
+    {
+	if (strcmp(cache, tag_table[i]) == 0)
+	    return (tag_table[i]);
+    }
+
+    if (ntags >= tagmax)
+    {
+	tagmax += 16;
+	tag_table = (char **)
+			(tag_table ? REALLOC(tag_table, tagmax*sizeof(char *))
+				   : MALLOC(tagmax*sizeof(char *)));
+	if (tag_table == 0) no_space();
+    }
+
+    s = MALLOC(cinc);
+    if  (s == 0) no_space();
+    strcpy(s, cache);
+    tag_table[ntags] = s;
+    ++ntags;
+    FREE(t_line);
+    return (s);
+}
+
+
+declare_tokens(assoc)
+int assoc;
+{
+    register int c;
+    register bucket *bp;
+    int value;
+    char *tag = 0;
+
+    if (assoc != TOKEN) ++prec;
+
+    c = nextc();
+    if (c == EOF) unexpected_EOF();
+    if (c == '<')
+    {
+	tag = get_tag(0);
+	c = nextc();
+	if (c == EOF) unexpected_EOF();
+    }
+
+    for (;;)
+    {
+	if (isalpha(c) || c == '_' || c == '.' || c == '$')
+	    bp = get_name();
+	else if (c == '\'' || c == '"')
+	    bp = get_literal();
+	else
+	    return;
+
+	if (bp == goal) tokenized_start(bp->name);
+	bp->class = TERM;
+
+	if (tag)
+	{
+	    if (bp->tag && tag != bp->tag)
+		retyped_warning(bp->name);
+	    bp->tag = tag;
+	}
+
+	if (assoc != TOKEN)
+	{
+	    if (bp->prec && prec != bp->prec)
+		reprec_warning(bp->name);
+	    bp->assoc = assoc;
+	    bp->prec = prec;
+	}
+
+	c = nextc();
+	if (c == EOF) unexpected_EOF();
+	value = UNDEFINED;
+	if (isdigit(c))
+	{
+	    value = get_number();
+	    if (bp->value != UNDEFINED && value != bp->value)
+		revalued_warning(bp->name);
+	    bp->value = value;
+	    c = nextc();
+	    if (c == EOF) unexpected_EOF();
+	}
+    }
+}
+
+
+declare_types()
+{
+    register int c;
+    register bucket *bp;
+    char *tag;
+
+    c = nextc();
+    if (c == EOF) unexpected_EOF();
+    if (c != '<') syntax_error(lineno, line, cptr);
+    tag = get_tag(0);
+
+    for (;;)
+    {
+	c = nextc();
+	if (isalpha(c) || c == '_' || c == '.' || c == '$')
+	    bp = get_name();
+	else if (c == '\'' || c == '"')
+	    bp = get_literal();
+	else
+	    return;
+
+	if (bp->tag && tag != bp->tag)
+	    retyped_warning(bp->name);
+	bp->tag = tag;
+    }
+}
+
+
+declare_start()
+{
+    register int c;
+    register bucket *bp;
+
+    c = nextc();
+    if (c == EOF) unexpected_EOF();
+    if (!isalpha(c) && c != '_' && c != '.' && c != '$')
+	syntax_error(lineno, line, cptr);
+    bp = get_name();
+    if (bp->class == TERM)
+	terminal_start(bp->name);
+    if (goal && goal != bp)
+	restarted_warning();
+    goal = bp;
+}
+
+
+read_declarations()
+{
+    register int c, k;
+
+    cache_size = 256;
+    cache = MALLOC(cache_size);
+    if (cache == 0) no_space();
+
+    for (;;)
+    {
+	c = nextc();
+	if (c == EOF) unexpected_EOF();
+	if (c != '%') syntax_error(lineno, line, cptr);
+	switch (k = keyword())
+	{
+	case MARK:
+	    return;
+
+	case TEXT:
+	    copy_text(prolog_file);
+	    break;
+
+	case TOKEN:
+	case LEFT:
+	case RIGHT:
+	case NONASSOC:
+	    declare_tokens(k);
+	    break;
+
+	case TYPE:
+	    declare_types();
+	    break;
+
+	case START:
+	    declare_start();
+	    break;
+	}
+    }
+}
+
+
+initialize_grammar()
+{
+    nitems = 4;
+    maxitems = 300;
+    pitem = (bucket **) MALLOC(maxitems*sizeof(bucket *));
+    if (pitem == 0) no_space();
+    pitem[0] = 0;
+    pitem[1] = 0;
+    pitem[2] = 0;
+    pitem[3] = 0;
+
+    nrules = 3;
+    maxrules = 100;
+    plhs = (bucket **) MALLOC(maxrules*sizeof(bucket *));
+    if (plhs == 0) no_space();
+    plhs[0] = 0;
+    plhs[1] = 0;
+    plhs[2] = 0;
+    rprec = (short *) MALLOC(maxrules*sizeof(short));
+    if (rprec == 0) no_space();
+    rprec[0] = 0;
+    rprec[1] = 0;
+    rprec[2] = 0;
+    rassoc = (char *) MALLOC(maxrules*sizeof(char));
+    if (rassoc == 0) no_space();
+    rassoc[0] = TOKEN;
+    rassoc[1] = TOKEN;
+    rassoc[2] = TOKEN;
+}
+
+
+expand_items()
+{
+    maxitems += 300;
+    pitem = (bucket **) REALLOC(pitem, maxitems*sizeof(bucket *));
+    if (pitem == 0) no_space();
+}
+
+
+expand_rules()
+{
+    maxrules += 100;
+    plhs = (bucket **) REALLOC(plhs, maxrules*sizeof(bucket *));
+    if (plhs == 0) no_space();
+    rprec = (short *) REALLOC(rprec, maxrules*sizeof(short));
+    if (rprec == 0) no_space();
+    rassoc = (char *) REALLOC(rassoc, maxrules*sizeof(char));
+    if (rassoc == 0) no_space();
+}
+
+
+advance_to_start()
+{
+    register int c;
+    register bucket *bp;
+    char *s_cptr;
+    int s_lineno;
+
+    for (;;)
+    {
+	c = nextc();
+	if (c != '%') break;
+	s_cptr = cptr;
+	switch (keyword())
+	{
+	case MARK:
+	    no_grammar();
+
+	case TEXT:
+	    copy_text(local_file);
+	    break;
+
+	case START:
+	    declare_start();
+	    break;
+
+	default:
+	    syntax_error(lineno, line, s_cptr);
+	}
+    }
+
+    c = nextc();
+    if (!isalpha(c) && c != '_' && c != '.' && c != '_')
+	syntax_error(lineno, line, cptr);
+    bp = get_name();
+    if (goal == 0)
+    {
+	if (bp->class == TERM)
+	    terminal_start(bp->name);
+	goal = bp;
+    }
+
+    s_lineno = lineno;
+    c = nextc();
+    if (c == EOF) unexpected_EOF();
+    if (c != ':') syntax_error(lineno, line, cptr);
+    start_rule(bp, s_lineno);
+    ++cptr;
+}
+
+
+start_rule(bp, s_lineno)
+register bucket *bp;
+int s_lineno;
+{
+    if (bp->class == TERM)
+	terminal_lhs(s_lineno);
+    bp->class = NONTERM;
+    if (nrules >= maxrules)
+	expand_rules();
+    plhs[nrules] = bp;
+    rprec[nrules] = UNDEFINED;
+    rassoc[nrules] = TOKEN;
+}
+
+
+end_rule()
+{
+    register int i;
+
+    if (!last_was_action && plhs[nrules]->tag)
+    {
+	for (i = nitems - 1; pitem[i]; --i) continue;
+	if (pitem[i+1] == 0 || pitem[i+1]->tag != plhs[nrules]->tag)
+	    default_action_warning();	/** if classes don't match exactly **/
+    }					/** bug: could be superclass... **/
+
+    last_was_action = 0;
+    if (nitems >= maxitems) expand_items();
+    pitem[nitems] = 0;
+    ++nitems;
+    ++nrules;
+}
+
+
+insert_empty_rule()
+{
+    register bucket *bp, **bpp;
+
+    assert(cache);
+    sprintf(cache, "$$%d", ++gensym);
+    bp = make_bucket(cache);
+    last_symbol->next = bp;
+    last_symbol = bp;
+    bp->tag = plhs[nrules]->tag;
+    bp->class = NONTERM;
+
+    if ((nitems += 2) > maxitems)
+	expand_items();
+    bpp = pitem + nitems - 1;
+    *bpp-- = bp;
+    while (bpp[0] = bpp[-1]) --bpp;
+
+    if (++nrules >= maxrules)
+	expand_rules();
+    plhs[nrules] = plhs[nrules-1];
+    plhs[nrules-1] = bp;
+    rprec[nrules] = rprec[nrules-1];
+    rprec[nrules-1] = 0;
+    rassoc[nrules] = rassoc[nrules-1];
+    rassoc[nrules-1] = TOKEN;
+}
+
+
+add_symbol()
+{
+    register int c;
+    register bucket *bp;
+    int s_lineno = lineno;
+
+    c = *cptr;
+    if (c == '\'' || c == '"')
+	bp = get_literal();
+    else
+	bp = get_name();
+
+    c = nextc();
+    if (c == ':')
+    {
+	end_rule();
+	start_rule(bp, s_lineno);
+	++cptr;
+	return;
+    }
+
+    if (last_was_action)
+	insert_empty_rule();
+    last_was_action = 0;
+
+    if (++nitems > maxitems)
+	expand_items();
+    pitem[nitems-1] = bp;
+}
+
+
+copy_action()
+{
+    register int c;
+    register int i, n;
+    int depth;
+    int quote;
+    char *tag;
+    register FILE *f = action_file;
+    int a_lineno = lineno;
+    char *a_line = dup_line();
+    char *a_cptr = a_line + (cptr - line);
+
+    if (last_was_action)
+	insert_empty_rule();
+    last_was_action = 1;
+
+    fprintf(f, "case %d:\n", nrules - 2);
+    fprintf(f, line_format, lineno, input_file_name);
+    putc(' ', f); putc(' ', f);
+    if (*cptr == '=') ++cptr;
+
+    n = 0;
+    for (i = nitems - 1; pitem[i]; --i) ++n;
+
+    depth = 0;
+loop:
+    c = *cptr;
+    if (c == '$')
+    {
+	if (cptr[1] == '<')
+	{
+	    int d_lineno = lineno;
+	    char *d_line = dup_line();
+	    char *d_cptr = d_line + (cptr - line);
+
+	    ++cptr;
+	    tag = get_tag(1);
+	    c = *cptr;
+	    if (c == '$')
+	    {   if (tag && strcmp(tag, "Object"))
+					fprintf(f, "((%s)yyVal)", tag);
+		else fprintf(f, "yyVal");
+		++cptr;
+		FREE(d_line);
+		goto loop;
+	    }
+	    else if (isdigit(c))
+	    {
+		i = get_number();
+		if (i > n) dollar_warning(d_lineno, i);
+		if (tag && strcmp(tag, "Object"))
+			fprintf(f, "((%s)yyVals[%d+yyTop])", tag, i - n);
+		else fprintf(f, "yyVals[%d+yyTop]", i - n);
+		FREE(d_line);
+		goto loop;
+	    }
+	    else if (c == '-' && isdigit(cptr[1]))
+	    {
+		++cptr;
+		i = -get_number() - n;
+		if (tag && strcmp(tag, "Object"))
+			fprintf(f, "((%s)yyVals[%d+yyTop])", tag, i);
+		else fprintf(f, "yyVals[%d+yyTop]", tag, i);
+		FREE(d_line);
+		goto loop;
+	    }
+	    else
+		dollar_error(d_lineno, d_line, d_cptr);
+	}
+	else if (cptr[1] == '$')
+	{
+	    if (ntags && plhs[nrules]->tag == 0)
+		untyped_lhs();
+	    fprintf(f, "yyVal");
+	    cptr += 2;
+	    goto loop;
+	}
+	else if (isdigit(cptr[1]))
+	{
+	    ++cptr;
+	    i = get_number();
+	    if (ntags)
+	    {
+		if (i <= 0 || i > n)
+		    unknown_rhs(i);
+		tag = pitem[nitems + i - n - 1]->tag;
+		if (tag == 0)
+		    untyped_rhs(i, pitem[nitems + i - n - 1]->name),
+		    fprintf(f, "yyVals[%d+yyTop]", i - n);
+		else if (strcmp(tag, "Object"))
+		    fprintf(f, "((%s)yyVals[%d+yyTop])", tag, i - n);
+		else
+		    fprintf(f, "yyVals[%d+yyTop]", i - n);
+	    }
+	    else
+	    {
+		if (i > n)
+		    dollar_warning(lineno, i);
+		fprintf(f, "yyVals[%d+yyTop]", i - n);
+	    }
+	    goto loop;
+	}
+	else if (cptr[1] == '-')
+	{
+	    cptr += 2;
+	    i = get_number();
+	    if (ntags)
+		unknown_rhs(-i);
+	    fprintf(f, "yyVals[%d+yyTop]", -i - n);
+	    goto loop;
+	}
+    }
+    if (isalpha(c) || c == '_' || c == '$')
+    {
+	do
+	{
+	    putc(c, f);
+	    c = *++cptr;
+	} while (isalnum(c) || c == '_' || c == '$');
+	goto loop;
+    }
+    putc(c, f);
+    ++cptr;
+    switch (c)
+    {
+    case '\n':
+    next_line:
+	get_line();
+	if (line) goto loop;
+	unterminated_action(a_lineno, a_line, a_cptr);
+
+    case ';':
+	if (depth > 0) goto loop;
+	fprintf(f, "\nbreak;\n");
+	return;
+
+    case '{':
+	++depth;
+	goto loop;
+
+    case '}':
+	if (--depth > 0) goto loop;
+	fprintf(f, "\n  break;\n");
+	return;
+
+    case '\'':
+    case '"':
+	{
+	    int s_lineno = lineno;
+	    char *s_line = dup_line();
+	    char *s_cptr = s_line + (cptr - line - 1);
+
+	    quote = c;
+	    for (;;)
+	    {
+		c = *cptr++;
+		putc(c, f);
+		if (c == quote)
+		{
+		    FREE(s_line);
+		    goto loop;
+		}
+		if (c == '\n')
+		    unterminated_string(s_lineno, s_line, s_cptr);
+		if (c == '\\')
+		{
+		    c = *cptr++;
+		    putc(c, f);
+		    if (c == '\n')
+		    {
+			get_line();
+			if (line == 0)
+			    unterminated_string(s_lineno, s_line, s_cptr);
+		    }
+		}
+	    }
+	}
+
+    case '/':
+	c = *cptr;
+	if (c == '/')
+	{
+	    putc('*', f);
+	    while ((c = *++cptr) != '\n')
+	    {
+		if (c == '*' && cptr[1] == '/')
+		    fprintf(f, "* ");
+		else
+		    putc(c, f);
+	    }
+	    fprintf(f, "*/\n");
+	    goto next_line;
+	}
+	if (c == '*')
+	{
+	    int c_lineno = lineno;
+	    char *c_line = dup_line();
+	    char *c_cptr = c_line + (cptr - line - 1);
+
+	    putc('*', f);
+	    ++cptr;
+	    for (;;)
+	    {
+		c = *cptr++;
+		putc(c, f);
+		if (c == '*' && *cptr == '/')
+		{
+		    putc('/', f);
+		    ++cptr;
+		    FREE(c_line);
+		    goto loop;
+		}
+		if (c == '\n')
+		{
+		    get_line();
+		    if (line == 0)
+			unterminated_comment(c_lineno, c_line, c_cptr);
+		}
+	    }
+	}
+	goto loop;
+
+    default:
+	goto loop;
+    }
+}
+
+
+int
+mark_symbol()
+{
+    register int c;
+    register bucket *bp;
+
+    c = cptr[1];
+    if (c == '%' || c == '\\')
+    {
+	cptr += 2;
+	return (1);
+    }
+
+    if (c == '=')
+	cptr += 2;
+    else if ((c == 'p' || c == 'P') &&
+	     ((c = cptr[2]) == 'r' || c == 'R') &&
+	     ((c = cptr[3]) == 'e' || c == 'E') &&
+	     ((c = cptr[4]) == 'c' || c == 'C') &&
+	     ((c = cptr[5], !IS_IDENT(c))))
+	cptr += 5;
+    else
+	syntax_error(lineno, line, cptr);
+
+    c = nextc();
+    if (isalpha(c) || c == '_' || c == '.' || c == '$')
+	bp = get_name();
+    else if (c == '\'' || c == '"')
+	bp = get_literal();
+    else
+    {
+	syntax_error(lineno, line, cptr);
+	/*NOTREACHED*/
+    }
+
+    if (rprec[nrules] != UNDEFINED && bp->prec != rprec[nrules])
+	prec_redeclared();
+
+    rprec[nrules] = bp->prec;
+    rassoc[nrules] = bp->assoc;
+    return (0);
+}
+
+
+read_grammar()
+{
+    register int c;
+
+    initialize_grammar();
+    advance_to_start();
+
+    for (;;)
+    {
+	c = nextc();
+	if (c == EOF) break;
+	if (isalpha(c) || c == '_' || c == '.' || c == '$' || c == '\'' ||
+		c == '"')
+	    add_symbol();
+	else if (c == '{' || c == '=')
+	    copy_action();
+	else if (c == '|')
+	{
+	    end_rule();
+	    start_rule(plhs[nrules-1], 0);
+	    ++cptr;
+	}
+	else if (c == '%')
+	{
+	    if (mark_symbol()) break;
+	}
+	else
+	    syntax_error(lineno, line, cptr);
+    }
+    end_rule();
+}
+
+
+free_tags()
+{
+    register int i;
+
+    if (tag_table == 0) return;
+
+    for (i = 0; i < ntags; ++i)
+    {
+	assert(tag_table[i]);
+	FREE(tag_table[i]);
+    }
+    FREE(tag_table);
+}
+
+
+pack_names()
+{
+    register bucket *bp;
+    register char *p, *s, *t;
+
+    name_pool_size = 13;  /* 13 == sizeof("$end") + sizeof("$accept") */
+    for (bp = first_symbol; bp; bp = bp->next)
+	name_pool_size += strlen(bp->name) + 1;
+    name_pool = MALLOC(name_pool_size);
+    if (name_pool == 0) no_space();
+
+    strcpy(name_pool, "$accept");
+    strcpy(name_pool+8, "$end");
+    t = name_pool + 13;
+    for (bp = first_symbol; bp; bp = bp->next)
+    {
+	p = t;
+	s = bp->name;
+	while (*t++ = *s++) continue;
+	FREE(bp->name);
+	bp->name = p;
+    }
+}
+
+
+check_symbols()
+{
+    register bucket *bp;
+
+    if (goal->class == UNKNOWN)
+	undefined_goal(goal->name);
+
+    for (bp = first_symbol; bp; bp = bp->next)
+    {
+	if (bp->class == UNKNOWN)
+	{
+	    undefined_symbol_warning(bp->name);
+	    bp->class = TERM;
+	}
+    }
+}
+
+
+pack_symbols()
+{
+    register bucket *bp;
+    register bucket **v;
+    register int i, j, k, n;
+
+    nsyms = 2;
+    ntokens = 1;
+    for (bp = first_symbol; bp; bp = bp->next)
+    {
+	++nsyms;
+	if (bp->class == TERM) ++ntokens;
+    }
+    start_symbol = ntokens;
+    nvars = nsyms - ntokens;
+
+    symbol_name = (char **) MALLOC(nsyms*sizeof(char *));
+    if (symbol_name == 0) no_space();
+    symbol_value = (short *) MALLOC(nsyms*sizeof(short));
+    if (symbol_value == 0) no_space();
+    symbol_prec = (short *) MALLOC(nsyms*sizeof(short));
+    if (symbol_prec == 0) no_space();
+    symbol_assoc = MALLOC(nsyms);
+    if (symbol_assoc == 0) no_space();
+
+    v = (bucket **) MALLOC(nsyms*sizeof(bucket *));
+    if (v == 0) no_space();
+
+    v[0] = 0;
+    v[start_symbol] = 0;
+
+    i = 1;
+    j = start_symbol + 1;
+    for (bp = first_symbol; bp; bp = bp->next)
+    {
+	if (bp->class == TERM)
+	    v[i++] = bp;
+	else
+	    v[j++] = bp;
+    }
+    assert(i == ntokens && j == nsyms);
+
+    for (i = 1; i < ntokens; ++i)
+	v[i]->index = i;
+
+    goal->index = start_symbol + 1;
+    k = start_symbol + 2;
+    while (++i < nsyms)
+	if (v[i] != goal)
+	{
+	    v[i]->index = k;
+	    ++k;
+	}
+
+    goal->value = 0;
+    k = 1;
+    for (i = start_symbol + 1; i < nsyms; ++i)
+    {
+	if (v[i] != goal)
+	{
+	    v[i]->value = k;
+	    ++k;
+	}
+    }
+
+    k = 0;
+    for (i = 1; i < ntokens; ++i)
+    {
+	n = v[i]->value;
+	if (n > 256)
+	{
+	    for (j = k++; j > 0 && symbol_value[j-1] > n; --j)
+		symbol_value[j] = symbol_value[j-1];
+	    symbol_value[j] = n;
+	}
+    }
+
+    if (v[1]->value == UNDEFINED)
+	v[1]->value = 256;
+
+    j = 0;
+    n = 257;
+    for (i = 2; i < ntokens; ++i)
+    {
+	if (v[i]->value == UNDEFINED)
+	{
+	    while (j < k && n == symbol_value[j])
+	    {
+		while (++j < k && n == symbol_value[j]) continue;
+		++n;
+	    }
+	    v[i]->value = n;
+	    ++n;
+	}
+    }
+
+    symbol_name[0] = name_pool + 8;
+    symbol_value[0] = 0;
+    symbol_prec[0] = 0;
+    symbol_assoc[0] = TOKEN;
+    for (i = 1; i < ntokens; ++i)
+    {
+	symbol_name[i] = v[i]->name;
+	symbol_value[i] = v[i]->value;
+	symbol_prec[i] = v[i]->prec;
+	symbol_assoc[i] = v[i]->assoc;
+    }
+    symbol_name[start_symbol] = name_pool;
+    symbol_value[start_symbol] = -1;
+    symbol_prec[start_symbol] = 0;
+    symbol_assoc[start_symbol] = TOKEN;
+    for (++i; i < nsyms; ++i)
+    {
+	k = v[i]->index;
+	symbol_name[k] = v[i]->name;
+	symbol_value[k] = v[i]->value;
+	symbol_prec[k] = v[i]->prec;
+	symbol_assoc[k] = v[i]->assoc;
+    }
+
+    FREE(v);
+}
+
+
+pack_grammar()
+{
+    register int i, j;
+    int assoc, prec;
+
+    ritem = (short *) MALLOC(nitems*sizeof(short));
+    if (ritem == 0) no_space();
+    rlhs = (short *) MALLOC(nrules*sizeof(short));
+    if (rlhs == 0) no_space();
+    rrhs = (short *) MALLOC((nrules+1)*sizeof(short));
+    if (rrhs == 0) no_space();
+    rprec = (short *) REALLOC(rprec, nrules*sizeof(short));
+    if (rprec == 0) no_space();
+    rassoc = REALLOC(rassoc, nrules);
+    if (rassoc == 0) no_space();
+
+    ritem[0] = -1;
+    ritem[1] = goal->index;
+    ritem[2] = 0;
+    ritem[3] = -2;
+    rlhs[0] = 0;
+    rlhs[1] = 0;
+    rlhs[2] = start_symbol;
+    rrhs[0] = 0;
+    rrhs[1] = 0;
+    rrhs[2] = 1;
+
+    j = 4;
+    for (i = 3; i < nrules; ++i)
+    {
+	rlhs[i] = plhs[i]->index;
+	rrhs[i] = j;
+	assoc = TOKEN;
+	prec = 0;
+	while (pitem[j])
+	{
+	    ritem[j] = pitem[j]->index;
+	    if (pitem[j]->class == TERM)
+	    {
+		prec = pitem[j]->prec;
+		assoc = pitem[j]->assoc;
+	    }
+	    ++j;
+	}
+	ritem[j] = -i;
+	++j;
+	if (rprec[i] == UNDEFINED)
+	{
+	    rprec[i] = prec;
+	    rassoc[i] = assoc;
+	}
+    }
+    rrhs[i] = j;
+
+    FREE(plhs);
+    FREE(pitem);
+}
+
+
+print_grammar()
+{
+    register int i, j, k;
+    int spacing;
+    register FILE *f = verbose_file;
+
+    if (!vflag) return;
+
+    k = 1;
+    for (i = 2; i < nrules; ++i)
+    {
+	if (rlhs[i] != rlhs[i-1])
+	{
+	    if (i != 2) fprintf(f, "\n");
+	    fprintf(f, "%4d  %s :", i - 2, symbol_name[rlhs[i]]);
+	    spacing = strlen(symbol_name[rlhs[i]]) + 1;
+	}
+	else
+	{
+	    fprintf(f, "%4d  ", i - 2);
+	    j = spacing;
+	    while (--j >= 0) putc(' ', f);
+	    putc('|', f);
+	}
+
+	while (ritem[k] >= 0)
+	{
+	    fprintf(f, " %s", symbol_name[ritem[k]]);
+	    ++k;
+	}
+	++k;
+	putc('\n', f);
+    }
+}
+
+
+reader()
+{
+    create_symbol_table();
+    read_declarations();
+    read_grammar();
+    free_symbol_table();
+    free_tags();
+    pack_names();
+    check_symbols();
+    pack_symbols();
+    pack_grammar();
+    free_symbols();
+    print_grammar();
+}
diff --git a/mcs/jay/skeleton b/mcs/jay/skeleton
new file mode 100644
index 00000000000..07135c082f2
--- /dev/null
+++ b/mcs/jay/skeleton
@@ -0,0 +1,268 @@
+#	jay skeleton
+
+#	character in column 1 determines outcome...
+#		# is a comment
+#		. is copied
+#		t is copied as //t if -t is set
+#	other lines are interpreted to call jay procedures
+
+.// created by jay 0.7 (c) 1998 Axel.Schreiner@informatik.uni-osnabrueck.de
+.
+ prolog		## %{ ... %} prior to the first %%
+
+.// %token constants
+.
+ tokens public static final int
+.
+.  /** thrown for irrecoverable syntax errors and stack overflow.
+.    */
+.  public static class yyException extends java.lang.Exception {
+.    public yyException (String message) {
+.      super(message);
+.    }
+.  }
+.
+.  /** must be implemented by a scanner object to supply input to the parser.
+.    */
+.  public interface yyInput {
+.    /** move on to next token.
+.        @return false if positioned beyond tokens.
+.        @throws IOException on input error.
+.      */
+.    boolean advance () throws java.io.IOException;
+.    /** classifies current token.
+.        Should not be called if advance() returned false.
+.        @return current %token or single character.
+.      */
+.    int token ();
+.    /** associated with current token.
+.        Should not be called if advance() returned false.
+.        @return value for token().
+.      */
+.    Object value ();
+.  }
+.
+.  /** simplified error message.
+.      @see <a href="#yyerror(java.lang.String, java.lang.String[])">yyerror</a>
+.    */
+.  public void yyerror (String message) {
+.    yyerror(message, null);
+.  }
+.
+.  /** (syntax) error message.
+.      Can be overwritten to control message format.
+.      @param message text to be displayed.
+.      @param expected vector of acceptable tokens, if available.
+.    */
+.  public void yyerror (String message, String[] expected) {
+.    if (expected != null && expected.length > 0) {
+.      System.err.print(message+", expecting");
+.      for (int n = 0; n < expected.length; ++ n)
+.        System.err.print(" "+expected[n]);
+.      System.err.println();
+.    } else
+.      System.err.println(message);
+.  }
+.
+.  /** debugging support, requires the package jay.yydebug.
+.      Set to null to suppress debugging messages.
+.    */
+t  protected jay.yydebug.yyDebug yydebug;
+.
+ debug			## tables for debugging support
+.
+.  /** index-checked interface to yyName[].
+.      @param token single character or %token value.
+.      @return token name or [illegal] or [unknown].
+.    */
+t  public static final String yyname (int token) {
+t    if (token < 0 || token > yyName.length) return "[illegal]";
+t    String name;
+t    if ((name = yyName[token]) != null) return name;
+t    return "[unknown]";
+t  }
+.
+.  /** computes list of expected tokens on error by tracing the tables.
+.      @param state for which to compute the list.
+.      @return list of token names.
+.    */
+.  protected String[] yyExpecting (int state) {
+.    int token, n, len = 0;
+.    boolean[] ok = new boolean[yyName.length];
+.
+.    if ((n = yySindex[state]) != 0)
+.      for (token = n < 0 ? -n : 0;
+.           token < yyName.length && n+token < yyTable.length; ++ token)
+.        if (yyCheck[n+token] == token && !ok[token] && yyName[token] != null) {
+.          ++ len;
+.          ok[token] = true;
+.        }
+.    if ((n = yyRindex[state]) != 0)
+.      for (token = n < 0 ? -n : 0;
+.           token < yyName.length && n+token < yyTable.length; ++ token)
+.        if (yyCheck[n+token] == token && !ok[token] && yyName[token] != null) {
+.          ++ len;
+.          ok[token] = true;
+.        }
+.
+.    String result[] = new String[len];
+.    for (n = token = 0; n < len;  ++ token)
+.      if (ok[token]) result[n++] = yyName[token];
+.    return result;
+.  }
+.
+.  /** the generated parser, with debugging messages.
+.      Maintains a state and a value stack, currently with fixed maximum size.
+.      @param yyLex scanner.
+.      @param yydebug debug message writer implementing yyDebug, or null.
+.      @return result of the last reduction, if any.
+.      @throws yyException on irrecoverable parse error.
+.    */
+.  public Object yyparse (yyInput yyLex, Object yydebug)
+.				throws java.io.IOException, yyException {
+t    this.yydebug = (jay.yydebug.yyDebug)yydebug;
+.    return yyparse(yyLex);
+.  }
+.
+.  /** initial size and increment of the state/value stack [default 256].
+.      This is not final so that it can be overwritten outside of invocations
+.      of yyparse().
+.    */
+.  protected int yyMax;
+.
+.  /** executed at the beginning of a reduce action.
+.      Used as $$ = yyDefault($1), prior to the user-specified action, if any.
+.      Can be overwritten to provide deep copy, etc.
+.      @param first value for $1, or null.
+.      @return first.
+.    */
+.  protected Object yyDefault (Object first) {
+.    return first;
+.  }
+.
+.  /** the generated parser.
+.      Maintains a state and a value stack, currently with fixed maximum size.
+.      @param yyLex scanner.
+.      @return result of the last reduction, if any.
+.      @throws yyException on irrecoverable parse error.
+.    */
+.  public Object yyparse (yyInput yyLex)
+.				throws java.io.IOException, yyException {
+.    if (yyMax <= 0) yyMax = 256;			// initial size
+.    int yyState = 0, yyStates[] = new int[yyMax];	// state stack
+.    Object yyVal = null, yyVals[] = new Object[yyMax];	// value stack
+.    int yyToken = -1;					// current input
+.    int yyErrorFlag = 0;				// #tks to shift
+.
+ local		## %{ ... %} after the first %%
+
+.    yyLoop: for (int yyTop = 0;; ++ yyTop) {
+.      if (yyTop >= yyStates.length) {			// dynamically increase
+.        int[] i = new int[yyStates.length+yyMax];
+.        System.arraycopy(yyStates, 0, i, 0, yyStates.length);
+.        yyStates = i;
+.        Object[] o = new Object[yyVals.length+yyMax];
+.        System.arraycopy(yyVals, 0, o, 0, yyVals.length);
+.        yyVals = o;
+.      }
+.      yyStates[yyTop] = yyState;
+.      yyVals[yyTop] = yyVal;
+t      if (yydebug != null) yydebug.push(yyState, yyVal);
+.
+.      yyDiscarded: for (;;) {	// discarding a token does not change stack
+.        int yyN;
+.        if ((yyN = yyDefRed[yyState]) == 0) {	// else [default] reduce (yyN)
+.          if (yyToken < 0) {
+.            yyToken = yyLex.advance() ? yyLex.token() : 0;
+t            if (yydebug != null)
+t              yydebug.lex(yyState, yyToken, yyname(yyToken), yyLex.value());
+.          }
+.          if ((yyN = yySindex[yyState]) != 0 && (yyN += yyToken) >= 0
+.              && yyN < yyTable.length && yyCheck[yyN] == yyToken) {
+t            if (yydebug != null)
+t              yydebug.shift(yyState, yyTable[yyN], yyErrorFlag-1);
+.            yyState = yyTable[yyN];		// shift to yyN
+.            yyVal = yyLex.value();
+.            yyToken = -1;
+.            if (yyErrorFlag > 0) -- yyErrorFlag;
+.            continue yyLoop;
+.          }
+.          if ((yyN = yyRindex[yyState]) != 0 && (yyN += yyToken) >= 0
+.              && yyN < yyTable.length && yyCheck[yyN] == yyToken)
+.            yyN = yyTable[yyN];			// reduce (yyN)
+.          else
+.            switch (yyErrorFlag) {
+.  
+.            case 0:
+.              yyerror("syntax error", yyExpecting(yyState));
+t              if (yydebug != null) yydebug.error("syntax error");
+.  
+.            case 1: case 2:
+.              yyErrorFlag = 3;
+.              do {
+.                if ((yyN = yySindex[yyStates[yyTop]]) != 0
+.                    && (yyN += yyErrorCode) >= 0 && yyN < yyTable.length
+.                    && yyCheck[yyN] == yyErrorCode) {
+t                  if (yydebug != null)
+t                    yydebug.shift(yyStates[yyTop], yyTable[yyN], 3);
+.                  yyState = yyTable[yyN];
+.                  yyVal = yyLex.value();
+.                  continue yyLoop;
+.                }
+t                if (yydebug != null) yydebug.pop(yyStates[yyTop]);
+.              } while (-- yyTop >= 0);
+t              if (yydebug != null) yydebug.reject();
+.              throw new yyException("irrecoverable syntax error");
+.  
+.            case 3:
+.              if (yyToken == 0) {
+t                if (yydebug != null) yydebug.reject();
+.                throw new yyException("irrecoverable syntax error at end-of-file");
+.              }
+t              if (yydebug != null)
+t                yydebug.discard(yyState, yyToken, yyname(yyToken),
+t  							yyLex.value());
+.              yyToken = -1;
+.              continue yyDiscarded;		// leave stack alone
+.            }
+.        }
+.        int yyV = yyTop + 1-yyLen[yyN];
+t        if (yydebug != null)
+t          yydebug.reduce(yyState, yyStates[yyV-1], yyN, yyRule[yyN], yyLen[yyN]);
+.        yyVal = yyDefault(yyV > yyTop ? null : yyVals[yyV]);
+.        switch (yyN) {
+
+ actions		## code from the actions within the grammar
+
+.        }
+.        yyTop -= yyLen[yyN];
+.        yyState = yyStates[yyTop];
+.        int yyM = yyLhs[yyN];
+.        if (yyState == 0 && yyM == 0) {
+t          if (yydebug != null) yydebug.shift(0, yyFinal);
+.          yyState = yyFinal;
+.          if (yyToken < 0) {
+.            yyToken = yyLex.advance() ? yyLex.token() : 0;
+t            if (yydebug != null)
+t               yydebug.lex(yyState, yyToken,yyname(yyToken), yyLex.value());
+.          }
+.          if (yyToken == 0) {
+t            if (yydebug != null) yydebug.accept(yyVal);
+.            return yyVal;
+.          }
+.          continue yyLoop;
+.        }
+.        if ((yyN = yyGindex[yyM]) != 0 && (yyN += yyState) >= 0
+.            && yyN < yyTable.length && yyCheck[yyN] == yyState)
+.          yyState = yyTable[yyN];
+.        else
+.          yyState = yyDgoto[yyM];
+t        if (yydebug != null) yydebug.shift(yyStates[yyTop], yyState);
+.	 continue yyLoop;
+.      }
+.    }
+.  }
+.
+ tables			## tables for rules, default reduction, and action calls
+.
+ epilog			## text following second %%
diff --git a/mcs/jay/skeleton.cs b/mcs/jay/skeleton.cs
new file mode 100644
index 00000000000..82d8f63e3d6
--- /dev/null
+++ b/mcs/jay/skeleton.cs
@@ -0,0 +1,352 @@
+#	jay skeleton
+
+#	character in column 1 determines outcome...
+#		# is a comment
+#		. is copied
+#		t is copied as //t if -t is set
+#	other lines are interpreted to call jay procedures
+
+.// created by jay 0.7 (c) 1998 Axel.Schreiner@informatik.uni-osnabrueck.de
+.
+ prolog		## %{ ... %} prior to the first %%
+
+.
+.  /** simplified error message.
+.      @see <a href="#yyerror(java.lang.String, java.lang.String[])">yyerror</a>
+.    */
+.  public void yyerror (string message) {
+.    yyerror(message, null);
+.  }
+.
+.  /** (syntax) error message.
+.      Can be overwritten to control message format.
+.      @param message text to be displayed.
+.      @param expected vector of acceptable tokens, if available.
+.    */
+.  public void yyerror (string message, string[] expected) {
+.    if ((expected != null) && (expected.Length  > 0)) {
+.      System.Console.Write (message+", expecting");
+.      for (int n = 0; n < expected.Length; ++ n)
+.        System.Console.Write (" "+expected[n]);
+.        System.Console.WriteLine ();
+.    } else
+.      System.Console.WriteLine (message);
+.  }
+.
+.  /** debugging support, requires the package jay.yydebug.
+.      Set to null to suppress debugging messages.
+.    */
+t  protected yydebug.yyDebug debug;
+.
+ debug			## tables for debugging support
+.
+.  /** index-checked interface to yyName[].
+.      @param token single character or %token value.
+.      @return token name or [illegal] or [unknown].
+.    */
+t  public static string yyname (int token) {
+t    if ((token < 0) || (token > yyName.Length)) return "[illegal]";
+t    string name;
+t    if ((name = yyName[token]) != null) return name;
+t    return "[unknown]";
+t  }
+.
+.  /** computes list of expected tokens on error by tracing the tables.
+.      @param state for which to compute the list.
+.      @return list of token names.
+.    */
+.  protected string[] yyExpecting (int state) {
+.    int token, n, len = 0;
+.    bool[] ok = new bool[yyName.Length];
+.
+.    if ((n = yySindex[state]) != 0)
+.      for (token = n < 0 ? -n : 0;
+.           (token < yyName.Length) && (n+token < yyTable.Length); ++ token)
+.        if (yyCheck[n+token] == token && !ok[token] && yyName[token] != null) {
+.          ++ len;
+.          ok[token] = true;
+.        }
+.    if ((n = yyRindex[state]) != 0)
+.      for (token = n < 0 ? -n : 0;
+.           (token < yyName.Length) && (n+token < yyTable.Length); ++ token)
+.        if (yyCheck[n+token] == token && !ok[token] && yyName[token] != null) {
+.          ++ len;
+.          ok[token] = true;
+.        }
+.
+.    string [] result = new string[len];
+.    for (n = token = 0; n < len;  ++ token)
+.      if (ok[token]) result[n++] = yyName[token];
+.    return result;
+.  }
+.
+.  /** the generated parser, with debugging messages.
+.      Maintains a state and a value stack, currently with fixed maximum size.
+.      @param yyLex scanner.
+.      @param yydebug debug message writer implementing yyDebug, or null.
+.      @return result of the last reduction, if any.
+.      @throws yyException on irrecoverable parse error.
+.    */
+.  public Object yyparse (yyParser.yyInput yyLex, Object yyd)
+.				 {
+t    this.debug = (yydebug.yyDebug)yyd;
+.    return yyparse(yyLex);
+.  }
+.
+.  /** initial size and increment of the state/value stack [default 256].
+.      This is not final so that it can be overwritten outside of invocations
+.      of yyparse().
+.    */
+.  protected int yyMax;
+.
+.  /** executed at the beginning of a reduce action.
+.      Used as $$ = yyDefault($1), prior to the user-specified action, if any.
+.      Can be overwritten to provide deep copy, etc.
+.      @param first value for $1, or null.
+.      @return first.
+.    */
+.  protected Object yyDefault (Object first) {
+.    return first;
+.  }
+.
+.  /** the generated parser.
+.      Maintains a state and a value stack, currently with fixed maximum size.
+.      @param yyLex scanner.
+.      @return result of the last reduction, if any.
+.      @throws yyException on irrecoverable parse error.
+.    */
+.  public Object yyparse (yyParser.yyInput yyLex)
+.				{
+.    if (yyMax <= 0) yyMax = 256;			// initial size
+.    int yyState = 0;                                   // state stack ptr
+.    int [] yyStates = new int[yyMax];	                // state stack 
+.    Object yyVal = null;                               // value stack ptr
+.    Object [] yyVals = new Object[yyMax];	        // value stack
+.    int yyToken = -1;					// current input
+.    int yyErrorFlag = 0;				// #tks to shift
+.
+ local		## %{ ... %} after the first %%
+
+.    int yyTop = 0;
+.    goto skip;
+.    yyLoop:
+.    yyTop++;
+.    skip:
+.    for (;; ++ yyTop) {
+.      if (yyTop >= yyStates.Length) {			// dynamically increase
+.        int[] i = new int[yyStates.Length+yyMax];
+.        yyStates.CopyTo (i, 0);
+.        yyStates = i;
+.        Object[] o = new Object[yyVals.Length+yyMax];
+.        yyVals.CopyTo (o, 0);
+.        yyVals = o;
+.      }
+.      yyStates[yyTop] = yyState;
+.      yyVals[yyTop] = yyVal;
+t      if (debug != null) debug.push(yyState, yyVal);
+.
+.      yyDiscarded: for (;;) {	// discarding a token does not change stack
+.        int yyN;
+.        if ((yyN = yyDefRed[yyState]) == 0) {	// else [default] reduce (yyN)
+.          if (yyToken < 0) {
+.            yyToken = yyLex.advance() ? yyLex.token() : 0;
+t            if (debug != null)
+t              debug.lex(yyState, yyToken, yyname(yyToken), yyLex.value());
+.          }
+.          if ((yyN = yySindex[yyState]) != 0 && ((yyN += yyToken) >= 0)
+.              && (yyN < yyTable.Length) && (yyCheck[yyN] == yyToken)) {
+t            if (debug != null)
+t              debug.shift(yyState, yyTable[yyN], yyErrorFlag-1);
+.            yyState = yyTable[yyN];		// shift to yyN
+.            yyVal = yyLex.value();
+.            yyToken = -1;
+.            if (yyErrorFlag > 0) -- yyErrorFlag;
+.            goto yyLoop;
+.          }
+.          if ((yyN = yyRindex[yyState]) != 0 && (yyN += yyToken) >= 0
+.              && yyN < yyTable.Length && yyCheck[yyN] == yyToken)
+.            yyN = yyTable[yyN];			// reduce (yyN)
+.          else
+.            switch (yyErrorFlag) {
+.  
+.            case 0:
+.              yyerror("syntax error", yyExpecting(yyState));
+t              if (debug != null) debug.error("syntax error");
+.              goto case 1;
+.            case 1: case 2:
+.              yyErrorFlag = 3;
+.              do {
+.                if ((yyN = yySindex[yyStates[yyTop]]) != 0
+.                    && (yyN += Token.yyErrorCode) >= 0 && yyN < yyTable.Length
+.                    && yyCheck[yyN] == Token.yyErrorCode) {
+t                  if (debug != null)
+t                    debug.shift(yyStates[yyTop], yyTable[yyN], 3);
+.                  yyState = yyTable[yyN];
+.                  yyVal = yyLex.value();
+.                  goto yyLoop;
+.                }
+t                if (debug != null) debug.pop(yyStates[yyTop]);
+.              } while (-- yyTop >= 0);
+t              if (debug != null) debug.reject();
+.              throw new yyParser.yyException("irrecoverable syntax error");
+.  
+.            case 3:
+.              if (yyToken == 0) {
+t                if (debug != null) debug.reject();
+.                throw new yyParser.yyException("irrecoverable syntax error at end-of-file");
+.              }
+t              if (debug != null)
+t                debug.discard(yyState, yyToken, yyname(yyToken),
+t  							yyLex.value());
+.              yyToken = -1;
+.              goto yyDiscarded;		// leave stack alone
+.            }
+.        }
+.        int yyV = yyTop + 1-yyLen[yyN];
+t        if (debug != null)
+t          debug.reduce(yyState, yyStates[yyV-1], yyN, yyRule[yyN], yyLen[yyN]);
+.        yyVal = yyDefault(yyV > yyTop ? null : yyVals[yyV]);
+.        switch (yyN) {
+
+ actions		## code from the actions within the grammar
+
+.        }
+.        yyTop -= yyLen[yyN];
+.        yyState = yyStates[yyTop];
+.        int yyM = yyLhs[yyN];
+.        if (yyState == 0 && yyM == 0) {
+t          if (debug != null) debug.shift(0, yyFinal);
+.          yyState = yyFinal;
+.          if (yyToken < 0) {
+.            yyToken = yyLex.advance() ? yyLex.token() : 0;
+t            if (debug != null)
+t               debug.lex(yyState, yyToken,yyname(yyToken), yyLex.value());
+.          }
+.          if (yyToken == 0) {
+t            if (debug != null) debug.accept(yyVal);
+.            return yyVal;
+.          }
+.          goto yyLoop;
+.        }
+.        if (((yyN = yyGindex[yyM]) != 0) && ((yyN += yyState) >= 0)
+.            && (yyN < yyTable.Length) && (yyCheck[yyN] == yyState))
+.          yyState = yyTable[yyN];
+.        else
+.          yyState = yyDgoto[yyM];
+t        if (debug != null) debug.shift(yyStates[yyTop], yyState);
+.	 goto yyLoop;
+.      }
+.    }
+.  }
+.
+ tables			## tables for rules, default reduction, and action calls
+.
+ epilog			## text following second %%
+.namespace yydebug {
+.        using System;
+.	 public interface yyDebug {
+.		 void push (int state, Object value);
+.		 void lex (int state, int token, string name, Object value);
+.		 void shift (int from, int to, int errorFlag);
+.		 void pop (int state);
+.		 void discard (int state, int token, string name, Object value);
+.		 void reduce (int from, int to, int rule, string text, int len);
+.		 void shift (int from, int to);
+.		 void accept (Object value);
+.		 void error (string message);
+.		 void reject ();
+.	 }
+.	 
+.	 class yyDebugSimple : yyDebug {
+.		 void println (string s){
+.			 Console.WriteLine (s);
+.		 }
+.		 
+.		 public void push (int state, Object value) {
+.			 println ("push\tstate "+state+"\tvalue "+value);
+.		 }
+.		 
+.		 public void lex (int state, int token, string name, Object value) {
+.			 println("lex\tstate "+state+"\treading "+name+"\tvalue "+value);
+.		 }
+.		 
+.		 public void shift (int from, int to, int errorFlag) {
+.			 switch (errorFlag) {
+.			 default:				// normally
+.				 println("shift\tfrom state "+from+" to "+to);
+.				 break;
+.			 case 0: case 1: case 2:		// in error recovery
+.				 println("shift\tfrom state "+from+" to "+to
+.					     +"\t"+errorFlag+" left to recover");
+.				 break;
+.			 case 3:				// normally
+.				 println("shift\tfrom state "+from+" to "+to+"\ton error");
+.				 break;
+.			 }
+.		 }
+.		 
+.		 public void pop (int state) {
+.			 println("pop\tstate "+state+"\ton error");
+.		 }
+.		 
+.		 public void discard (int state, int token, string name, Object value) {
+.			 println("discard\tstate "+state+"\ttoken "+name+"\tvalue "+value);
+.		 }
+.		 
+.		 public void reduce (int from, int to, int rule, string text, int len) {
+.			 println("reduce\tstate "+from+"\tuncover "+to
+.				     +"\trule ("+rule+") "+text);
+.		 }
+.		 
+.		 public void shift (int from, int to) {
+.			 println("goto\tfrom state "+from+" to "+to);
+.		 }
+.		 
+.		 public void accept (Object value) {
+.			 println("accept\tvalue "+value);
+.		 }
+.		 
+.		 public void error (string message) {
+.			 println("error\t"+message);
+.		 }
+.		 
+.		 public void reject () {
+.			 println("reject");
+.		 }
+.		 
+.	 }
+.}
+.// %token constants
+. class Token {
+ tokens public const int
+. }
+. namespace yyParser {
+.  using System;
+.  /** thrown for irrecoverable syntax errors and stack overflow.
+.    */
+.  public class yyException : System.Exception {
+.    public yyException (string message) : base (message) {
+.    }
+.  }
+.
+.  /** must be implemented by a scanner object to supply input to the parser.
+.    */
+.  public interface yyInput {
+.    /** move on to next token.
+.        @return false if positioned beyond tokens.
+.        @throws IOException on input error.
+.      */
+.    bool advance (); // throws java.io.IOException;
+.    /** classifies current token.
+.        Should not be called if advance() returned false.
+.        @return current %token or single character.
+.      */
+.    int token ();
+.    /** associated with current token.
+.        Should not be called if advance() returned false.
+.        @return value for token().
+.      */
+.    Object value ();
+.  }
+. }
+.} // close outermost namespace, that MUST HAVE BEEN opened in the prolog
diff --git a/mcs/jay/symtab.c b/mcs/jay/symtab.c
new file mode 100644
index 00000000000..0c5f55c535b
--- /dev/null
+++ b/mcs/jay/symtab.c
@@ -0,0 +1,158 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)symtab.c	5.3 (Berkeley) 6/1/90";
+#endif /* not lint */
+
+#include "defs.h"
+
+/* TABLE_SIZE is the number of entries in the symbol table. */
+/* TABLE_SIZE must be a power of two.			    */
+
+#define	TABLE_SIZE 1024
+
+
+bucket **symbol_table;
+bucket *first_symbol;
+bucket *last_symbol;
+
+
+int
+hash(name)
+char *name;
+{
+    register char *s;
+    register int c, k;
+
+    assert(name && *name);
+    s = name;
+    k = *s;
+    while (c = *++s)
+	k = (31*k + c) & (TABLE_SIZE - 1);
+
+    return (k);
+}
+
+
+bucket *
+make_bucket(name)
+char *name;
+{
+    register bucket *bp;
+
+    assert(name);
+    bp = (bucket *) MALLOC(sizeof(bucket));
+    if (bp == 0) no_space();
+    bp->link = 0;
+    bp->next = 0;
+    bp->name = MALLOC(strlen(name) + 1);
+    if (bp->name == 0) no_space();
+    bp->tag = 0;
+    bp->value = UNDEFINED;
+    bp->index = 0;
+    bp->prec = 0;
+    bp-> class = UNKNOWN;
+    bp->assoc = TOKEN;
+
+    if (bp->name == 0) no_space();
+    strcpy(bp->name, name);
+
+    return (bp);
+}
+
+
+bucket *
+lookup(name)
+char *name;
+{
+    register bucket *bp, **bpp;
+
+    bpp = symbol_table + hash(name);
+    bp = *bpp;
+
+    while (bp)
+    {
+	if (strcmp(name, bp->name) == 0) return (bp);
+	bpp = &bp->link;
+	bp = *bpp;
+    }
+
+    *bpp = bp = make_bucket(name);
+    last_symbol->next = bp;
+    last_symbol = bp;
+
+    return (bp);
+}
+
+
+create_symbol_table()
+{
+    register int i;
+    register bucket *bp;
+
+    symbol_table = (bucket **) MALLOC(TABLE_SIZE*sizeof(bucket *));
+    if (symbol_table == 0) no_space();
+    for (i = 0; i < TABLE_SIZE; i++)
+	symbol_table[i] = 0;
+
+    bp = make_bucket("error");
+    bp->index = 1;
+    bp->class = TERM;
+
+    first_symbol = bp;
+    last_symbol = bp;
+    symbol_table[hash("error")] = bp;
+}
+
+
+free_symbol_table()
+{
+    FREE(symbol_table);
+    symbol_table = 0;
+}
+
+
+free_symbols()
+{
+    register bucket *p, *q;
+
+    for (p = first_symbol; p; p = q)
+    {
+	q = p->next;
+	FREE(p);
+    }
+}
diff --git a/mcs/jay/verbose.c b/mcs/jay/verbose.c
new file mode 100644
index 00000000000..33ae265ee2e
--- /dev/null
+++ b/mcs/jay/verbose.c
@@ -0,0 +1,366 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)verbose.c	5.3 (Berkeley) 1/20/91";
+#endif /* not lint */
+
+#include "defs.h"
+
+static short *null_rules;
+
+verbose()
+{
+    register int i;
+
+    if (!vflag) return;
+
+    null_rules = (short *) MALLOC(nrules*sizeof(short));
+    if (null_rules == 0) no_space();
+    fprintf(verbose_file, "\f\n");
+    for (i = 0; i < nstates; i++)
+	print_state(i);
+    FREE(null_rules);
+
+    if (nunused)
+	log_unused();
+    if (SRtotal || RRtotal)
+	log_conflicts();
+
+    fprintf(verbose_file, "\n\n%d terminals, %d nonterminals\n", ntokens,
+	    nvars);
+    fprintf(verbose_file, "%d grammar rules, %d states\n", nrules - 2, nstates);
+}
+
+
+log_unused()
+{
+    register int i;
+    register short *p;
+
+    fprintf(verbose_file, "\n\nRules never reduced:\n");
+    for (i = 3; i < nrules; ++i)
+    {
+	if (!rules_used[i])
+	{
+	    fprintf(verbose_file, "\t%s :", symbol_name[rlhs[i]]);
+	    for (p = ritem + rrhs[i]; *p >= 0; ++p)
+		fprintf(verbose_file, " %s", symbol_name[*p]);
+	    fprintf(verbose_file, "  (%d)\n", i - 2);
+	}
+    }
+}
+
+
+log_conflicts()
+{
+    register int i;
+
+    fprintf(verbose_file, "\n\n");
+    for (i = 0; i < nstates; i++)
+    {
+	if (SRconflicts[i] || RRconflicts[i])
+	{
+	    fprintf(verbose_file, "State %d contains ", i);
+	    if (SRconflicts[i] == 1)
+		fprintf(verbose_file, "1 shift/reduce conflict");
+	    else if (SRconflicts[i] > 1)
+		fprintf(verbose_file, "%d shift/reduce conflicts",
+			SRconflicts[i]);
+	    if (SRconflicts[i] && RRconflicts[i])
+		fprintf(verbose_file, ", ");
+	    if (RRconflicts[i] == 1)
+		fprintf(verbose_file, "1 reduce/reduce conflict");
+	    else if (RRconflicts[i] > 1)
+		fprintf(verbose_file, "%d reduce/reduce conflicts",
+			RRconflicts[i]);
+	    fprintf(verbose_file, ".\n");
+	}
+    }
+}
+
+
+print_state(state)
+int state;
+{
+    if (state)
+	fprintf(verbose_file, "\n\n");
+    if (SRconflicts[state] || RRconflicts[state])
+	print_conflicts(state);
+    fprintf(verbose_file, "state %d\n", state);
+    print_core(state);
+    print_nulls(state);
+    print_actions(state);
+}
+
+
+print_conflicts(state)
+int state;
+{
+    register int symbol, act, number;
+    register action *p;
+
+    symbol = -1;
+    for (p = parser[state]; p; p = p->next)
+    {
+	if (p->suppressed == 2)
+	    continue;
+
+	if (p->symbol != symbol)
+	{
+	    symbol = p->symbol;
+	    number = p->number;
+	    if (p->action_code == SHIFT)
+		act = SHIFT;
+	    else
+		act = REDUCE;
+	}
+	else if (p->suppressed == 1)
+	{
+	    if (state == final_state && symbol == 0)
+	    {
+		fprintf(verbose_file, "%d: shift/reduce conflict \
+(accept, reduce %d) on $end\n", state, p->number - 2);
+	    }
+	    else
+	    {
+		if (act == SHIFT)
+		{
+		    fprintf(verbose_file, "%d: shift/reduce conflict \
+(shift %d, reduce %d) on %s\n", state, number, p->number - 2,
+			    symbol_name[symbol]);
+		}
+		else
+		{
+		    fprintf(verbose_file, "%d: reduce/reduce conflict \
+(reduce %d, reduce %d) on %s\n", state, number - 2, p->number - 2,
+			    symbol_name[symbol]);
+		}
+	    }
+	}
+    }
+}
+
+
+print_core(state)
+int state;
+{
+    register int i;
+    register int k;
+    register int rule;
+    register core *statep;
+    register short *sp;
+    register short *sp1;
+
+    statep = state_table[state];
+    k = statep->nitems;
+
+    for (i = 0; i < k; i++)
+    {
+	sp1 = sp = ritem + statep->items[i];
+
+	while (*sp >= 0) ++sp;
+	rule = -(*sp);
+	fprintf(verbose_file, "\t%s : ", symbol_name[rlhs[rule]]);
+
+        for (sp = ritem + rrhs[rule]; sp < sp1; sp++)
+	    fprintf(verbose_file, "%s ", symbol_name[*sp]);
+
+	putc('.', verbose_file);
+
+	while (*sp >= 0)
+	{
+	    fprintf(verbose_file, " %s", symbol_name[*sp]);
+	    sp++;
+	}
+	fprintf(verbose_file, "  (%d)\n", -2 - *sp);
+    }
+}
+
+
+print_nulls(state)
+int state;
+{
+    register action *p;
+    register int i, j, k, nnulls;
+
+    nnulls = 0;
+    for (p = parser[state]; p; p = p->next)
+    {
+	if (p->action_code == REDUCE &&
+		(p->suppressed == 0 || p->suppressed == 1))
+	{
+	    i = p->number;
+	    if (rrhs[i] + 1 == rrhs[i+1])
+	    {
+		for (j = 0; j < nnulls && i > null_rules[j]; ++j)
+		    continue;
+
+		if (j == nnulls)
+		{
+		    ++nnulls;
+		    null_rules[j] = i;
+		}
+		else if (i != null_rules[j])
+		{
+		    ++nnulls;
+		    for (k = nnulls - 1; k > j; --k)
+			null_rules[k] = null_rules[k-1];
+		    null_rules[j] = i;
+		}
+	    }
+	}
+    }
+
+    for (i = 0; i < nnulls; ++i)
+    {
+	j = null_rules[i];
+	fprintf(verbose_file, "\t%s : .  (%d)\n", symbol_name[rlhs[j]],
+		j - 2);
+    }
+    fprintf(verbose_file, "\n");
+}
+
+
+print_actions(stateno)
+int stateno;
+{
+    register action *p;
+    register shifts *sp;
+    register int as;
+
+    if (stateno == final_state)
+	fprintf(verbose_file, "\t$end  accept\n");
+
+    p = parser[stateno];
+    if (p)
+    {
+	print_shifts(p);
+	print_reductions(p, defred[stateno]);
+    }
+
+    sp = shift_table[stateno];
+    if (sp && sp->nshifts > 0)
+    {
+	as = accessing_symbol[sp->shift[sp->nshifts - 1]];
+	if (ISVAR(as))
+	    print_gotos(stateno);
+    }
+}
+
+
+print_shifts(p)
+register action *p;
+{
+    register int count;
+    register action *q;
+
+    count = 0;
+    for (q = p; q; q = q->next)
+    {
+	if (q->suppressed < 2 && q->action_code == SHIFT)
+	    ++count;
+    }
+
+    if (count > 0)
+    {
+	for (; p; p = p->next)
+	{
+	    if (p->action_code == SHIFT && p->suppressed == 0)
+		fprintf(verbose_file, "\t%s  shift %d\n",
+			    symbol_name[p->symbol], p->number);
+	}
+    }
+}
+
+
+print_reductions(p, defred)
+register action *p;
+register int defred;
+{
+    register int k, anyreds;
+    register action *q;
+
+    anyreds = 0;
+    for (q = p; q ; q = q->next)
+    {
+	if (q->action_code == REDUCE && q->suppressed < 2)
+	{
+	    anyreds = 1;
+	    break;
+	}
+    }
+
+    if (anyreds == 0)
+	fprintf(verbose_file, "\t.  error\n");
+    else
+    {
+	for (; p; p = p->next)
+	{
+	    if (p->action_code == REDUCE && p->number != defred)
+	    {
+		k = p->number - 2;
+		if (p->suppressed == 0)
+		    fprintf(verbose_file, "\t%s  reduce %d\n",
+			    symbol_name[p->symbol], k);
+	    }
+	}
+
+        if (defred > 0)
+	    fprintf(verbose_file, "\t.  reduce %d\n", defred - 2);
+    }
+}
+
+
+print_gotos(stateno)
+int stateno;
+{
+    register int i, k;
+    register int as;
+    register short *to_state;
+    register shifts *sp;
+
+    putc('\n', verbose_file);
+    sp = shift_table[stateno];
+    to_state = sp->shift;
+    for (i = 0; i < sp->nshifts; ++i)
+    {
+	k = to_state[i];
+	as = accessing_symbol[k];
+	if (ISVAR(as))
+	    fprintf(verbose_file, "\t%s  goto %d\n", symbol_name[as], k);
+    }
+}
diff --git a/mcs/jay/warshall.c b/mcs/jay/warshall.c
new file mode 100644
index 00000000000..4672244e368
--- /dev/null
+++ b/mcs/jay/warshall.c
@@ -0,0 +1,122 @@
+/*
+ * Copyright (c) 1989 The Regents of the University of California.
+ * All rights reserved.
+ *
+ * This code is derived from software contributed to Berkeley by
+ * Robert Paul Corbett.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ */
+
+#ifndef lint
+static char sccsid[] = "@(#)warshall.c	5.4 (Berkeley) 5/24/93";
+#endif /* not lint */
+
+#include "defs.h"
+
+transitive_closure(R, n)
+unsigned *R;
+int n;
+{
+    register int rowsize;
+    register unsigned i;
+    register unsigned *rowj;
+    register unsigned *rp;
+    register unsigned *rend;
+    register unsigned *ccol;
+    register unsigned *relend;
+    register unsigned *cword;
+    register unsigned *rowi;
+
+    rowsize = WORDSIZE(n);
+    relend = R + n*rowsize;
+
+    cword = R;
+    i = 0;
+    rowi = R;
+    while (rowi < relend)
+    {
+	ccol = cword;
+	rowj = R;
+
+	while (rowj < relend)
+	{
+	    if (*ccol & (1 << i))
+	    {
+		rp = rowi;
+		rend = rowj + rowsize;
+		while (rowj < rend)
+		    *rowj++ |= *rp++;
+	    }
+	    else
+	    {
+		rowj += rowsize;
+	    }
+
+	    ccol += rowsize;
+	}
+
+	if (++i >= BITS_PER_WORD)
+	{
+	    i = 0;
+	    cword++;
+	}
+
+	rowi += rowsize;
+    }
+}
+
+reflexive_transitive_closure(R, n)
+unsigned *R;
+int n;
+{
+    register int rowsize;
+    register unsigned i;
+    register unsigned *rp;
+    register unsigned *relend;
+
+    transitive_closure(R, n);
+
+    rowsize = WORDSIZE(n);
+    relend = R + n*rowsize;
+
+    i = 0;
+    rp = R;
+    while (rp < relend)
+    {
+	*rp |= (1 << i);
+	if (++i >= BITS_PER_WORD)
+	{
+	    i = 0;
+	    rp++;
+	}
+
+	rp += rowsize;
+    }
+}
diff --git a/mcs/makefile b/mcs/makefile
new file mode 100755
index 00000000000..a07cc55d444
--- /dev/null
+++ b/mcs/makefile
@@ -0,0 +1,30 @@
+VERSION=0.13.99
+
+DIRS=jay nant mcs class nunit tools monoresgen
+
+all: linux
+
+windows:
+	for i in $(DIRS); do 			\
+		(cd $$i; make linux)		\
+	done
+
+linux:
+	for i in $(DIRS); do 			\
+		(cd $$i; make linux) || exit 1;	\
+	done
+
+test:
+	(cd nunit; make)
+	(cd class; make test)
+
+clean:
+	for i in $(DIRS); do 			\
+		(cd $$i; make clean)		\
+	done
+
+
+dist: 
+	(c=`pwd`; d=`basename $$c`; cd ..; cp -a $$d mcs-$(VERSION); cd mcs-$(VERSION); make clean; cd ..; \
+	tar czvf $$d/mcs-$(VERSION).tar.gz --exclude=CVS --exclude='.#*' --exclude=core --exclude='*~' --exclude='*.exe' mcs-$(VERSION); \
+	rm -rf mcs-$(VERSION))
diff --git a/mcs/makefile.gnu b/mcs/makefile.gnu
new file mode 100644
index 00000000000..6df1ee8793c
--- /dev/null
+++ b/mcs/makefile.gnu
@@ -0,0 +1,35 @@
+DIRS=jay mcs class nunit nunit/src/NUnitConsole monoresgen
+DIST=monocharge-`date -u +%Y%m%d`
+
+#nant doesn't work yet
+
+default: all
+
+all:
+	for i in $(DIRS) ; do \
+		(cd $$i; $(MAKE) -f makefile.gnu $@) || exit 1; \
+	done
+
+install:
+	if test x$$prefix = x; then \
+		echo Usage is: make -f makefile.gnu install prefix=YOURPREFIX; \
+		exit 1; \
+	fi;
+	for i in $(DIRS) ; do \
+		(cd $$i; $(MAKE) -f makefile.gnu $@) || exit 1; \
+	done
+
+clean:
+	-rm -f monocharge-*.tar.gz
+	for i in $(DIRS) ; do \
+		(cd $$i; $(MAKE) -f makefile.gnu $@) || exit 1; \
+	done
+
+dist: all
+	mkdir $(DIST)
+	for i in $(DIRS) ; do \
+		(cd $$i; $(MAKE) -f makefile.gnu install prefix=$(PWD)/$(DIST)) || exit 1; \
+	done
+	tar -c $(DIST) | gzip > $(DIST).tar.gz
+	rm -rf $(DIST)
+
diff --git a/mcs/mbas/.cvsignore b/mcs/mbas/.cvsignore
new file mode 100644
index 00000000000..23c8dc48e2f
--- /dev/null
+++ b/mcs/mbas/.cvsignore
@@ -0,0 +1,11 @@
+mbas.pdb

+mbas.exe

+mb-parser.cs

+y.output

+*.pdb

+mbas.csproj.user

+mbas.suo

+D/bin

+D/obj

+D/bin/*

+D/obj/*

diff --git a/mcs/mbas/AssemblyInfo.cs b/mcs/mbas/AssemblyInfo.cs
new file mode 100644
index 00000000000..be476f85c0d
--- /dev/null
+++ b/mcs/mbas/AssemblyInfo.cs
@@ -0,0 +1,66 @@
+using System.Reflection;
+using System.Runtime.CompilerServices;
+
+//
+// General Information about an assembly is controlled through the following 
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+//
+[assembly: AssemblyTitle("MonoBASIC Compiler")]
+[assembly: AssemblyDescription("This is a compiler for the MonoBASIC language, \nwhich is a superset of Visual Basic.NET")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("")]
+[assembly: AssemblyCopyright("(c)2002 Rafael Teixeira")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]		
+
+[assembly: Mono.GetOptions.Author("Ravi Pratap")]
+[assembly: Mono.GetOptions.Author("Miguel de Icaza")]
+[assembly: Mono.GetOptions.Author("Rafael Teixeira")]
+
+[assembly: Mono.GetOptions.LicensingWith(Mono.GetOptions.Licenses.GPL)]
+[assembly: Mono.GetOptions.ForMoreInformation("http://www.go-mono.com")]
+[assembly: Mono.GetOptions.UsageClause("mbas [options] source-files")]
+
+//
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version 
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Revision and Build Numbers 
+// by using the '*' as shown below:
+
+[assembly: AssemblyVersion("1.0.*")]
+
+//
+// In order to sign your assembly you must specify a key to use. Refer to the 
+// Microsoft .NET Framework documentation for more information on assembly signing.
+//
+// Use the attributes below to control which key is used for signing. 
+//
+// Notes: 
+//   (*) If no key is specified, the assembly is not signed.
+//   (*) KeyName refers to a key that has been installed in the Crypto Service
+//       Provider (CSP) on your machine. KeyFile refers to a file which contains
+//       a key.
+//   (*) If the KeyFile and the KeyName values are both specified, the 
+//       following processing occurs:
+//       (1) If the KeyName can be found in the CSP, that key is used.
+//       (2) If the KeyName does not exist and the KeyFile does exist, the key 
+//           in the KeyFile is installed into the CSP and used.
+//   (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility.
+//       When specifying the KeyFile, the location of the KeyFile should be
+//       relative to the project output directory which is
+//       %Project Directory%\obj\<configuration>. For example, if your KeyFile is
+//       located in the project directory, you would specify the AssemblyKeyFile 
+//       attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")]
+//   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework
+//       documentation for more information on this.
+//
+[assembly: AssemblyDelaySign(false)]
+[assembly: AssemblyKeyFile("")]
+[assembly: AssemblyKeyName("")]
diff --git a/mcs/mbas/ChangeLog b/mcs/mbas/ChangeLog
new file mode 100644
index 00000000000..8256e51d9cd
--- /dev/null
+++ b/mcs/mbas/ChangeLog
@@ -0,0 +1,92 @@
+2002-08-06  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* added "test" target to makefile
+	* merged assign.cs, attribute.cs, cfold.cs, class.cs, codegen.cs, const.cs, constant.cs, 
+	  decl.cs, delegate.cs, ecore.cs, enum.cs, expression.cs, interface.cs, modifiers.cs, parameter.cs, 
+	  pending.cs, report.cs, rootcontext.cs, statement.cs, support.cs and typemanager.cs from mcs/mcs, to resync
+
+2002-07-14  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged assign.cs, class.cs, ecore.cs, expression.cs, statement.cs and typemanager from mcs/mcs, to resync
+
+2002-07-09  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged attribute.cs, ecore.cs, namespace.cs and statement.cs from mcs/mcs, to resync
+
+2002-07-06  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged attribute.cs, class.cs, codegen.cs, ecore.cs, expression.cs, 
+	  modifiers.cs, namespace.cs, report.cs, rootcontext.cs, statement.cs and typemanager.cs from mcs/mcs, to resync
+	* changed driver.cs to follow mcs lead on error/warning counting and reporting
+
+2002-06-23  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged attribute.cs, class.cs, ecore.cs, rootcontext.cs, support.cs and typemanager.cs from mcs/mcs, to resync
+	* makefile makes csc reference a copy of Mono.GetOptions.dll (mbas.sln now compiles to mbas dir instead of mbas/bin/Debug)
+
+2002-06-21  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged attribute.cs, class.cs, interface.cs, expression.cs, ecore.cs, 
+	  modifiers.cs, rootcontext.cs, statement.cs and typemanager.cs from mcs/mcs, to resync
+	* added pending.cs from mcs/mcs, to resync
+
+2002-06-15  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged assign.cs, attribute.cs, enum.cs and namespace.cs from mcs/mcs, to resync
+	* namespace.cs needed some fixing, because CSharpParser isn´t available
+
+2002-06-15  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged delegate.cs, ecore.cs, typemanager.cs and rootcontext.cs from mcs/mcs, to resolve expression.cs blues
+
+2002-06-15  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* oops merged expression.cs from mcs/mcs is breaking my make
+	* driver.cs, assemblyinfo.cs wasn´t ready for prime time (offending lines were commented out)
+
+2002-06-15  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged expression.cs from mcs/mcs
+
+2002-06-12  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* corrected Module.TypeAttr property getter in module.cs
+	
+2002-06-12  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged typemanager.cs from mcs/mcs
+
+2002-06-10  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged expression.cs and interface.cs from mcs/mcs
+
+2002-06-09  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged const.cs, enum.cs, expression.cs and typemanager.cs from mcs/mcs
+    * comments on module.cs
+
+2002-06-07  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged class.cs, attribute.cs from mcs/mcs
+
+2002-06-07  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged class.cs, enum.cs, expression.cs, interface.cs, rootcontext.cs and typemanager.cs from mcs/mcs
+	* added module.cs (class Mono.MonoBASIC.Module - derived from Mono.CSharp.Class)
+	* added System.XML and Microsoft.VisualBasic to the default config (driver.cs)
+	
+2002-06-07  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged class.cs and ecore.cs from mcs/mcs
+
+2002-06-02  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* copied methods MakeName and CheckDef from mcs\cs-parser.jay to GenericParser.cs 
+	  where they are inherited by mb-parser.jay/cs
+	* put some code on the Module rule in mb-parser.jay to at least generate a class in the assembly,
+	  if I jump over the entry-point check code, while debugging
+	
+2002-05-31  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* class Mono.MonoBASIC.Tokenizer now handles 
+		- all valid line-terminators (CR, LF, CRLF, LS and PS)
+		- escaped identifiers (like [Integer])
+		- old-fashioned comments syntax (REM Blah-Blah)
+
+2002-05-31  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* modified mbas.ico to be a small version of mono´s logo (see mcs\MonoIcon.png)
+
+2002-05-31  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* squashed some reduce/reduce conflicts out of mb-parser.jay
+
+2002-05-31  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* merged codegen.cs from mcs
+	* altered Driver.cs to work with new codegen.cs
+
+2002-05-27  Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+
+	* merged all I could from mcs source files into mbas
+	* added VS.NET Solution and Project Files for mbas
+	* added icon file and a vb-sources-filled testmbas directory
+	* started this ChangeLog
diff --git a/mcs/mbas/assign.cs b/mcs/mbas/assign.cs
new file mode 100644
index 00000000000..5956d38ccf2
--- /dev/null
+++ b/mcs/mbas/assign.cs
@@ -0,0 +1,495 @@
+//
+// assign.cs: Assignments.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Martin Baulig (martin@gnome.org)
+//
+// (C) 2001, 2002 Ximian, Inc.
+//
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   This interface is implemented by expressions that can be assigned to.
+	/// </summary>
+	/// <remarks>
+	///   This interface is implemented by Expressions whose values can not
+	///   store the result on the top of the stack.
+	///
+	///   Expressions implementing this (Properties, Indexers and Arrays) would
+	///   perform an assignment of the Expression "source" into its final
+	///   location.
+	///
+	///   No values on the top of the stack are expected to be left by
+	///   invoking this method.
+	/// </remarks>
+	public interface IAssignMethod {
+		//
+		// This method will emit the code for the actual assignment
+		//
+		void EmitAssign (EmitContext ec, Expression source);
+
+		//
+		// This method is invoked before any code generation takes
+		// place, and it is a mechanism to inform that the expression
+		// will be invoked more than once, and that the method should
+		// use temporary values to avoid having side effects
+		//
+		// Example: a [ g () ] ++
+		//
+		void CacheTemporaries (EmitContext ec);
+	}
+
+	/// <summary>
+	///   An Expression to hold a temporary value.
+	/// </summary>
+	/// <remarks>
+	///   The LocalTemporary class is used to hold temporary values of a given
+	///   type to "simulate" the expression semantics on property and indexer
+	///   access whose return values are void.
+	///
+	///   The local temporary is used to alter the normal flow of code generation
+	///   basically it creates a local variable, and its emit instruction generates
+	///   code to access this value, return its address or save its value.
+	/// </remarks>
+	public class LocalTemporary : Expression, IMemoryLocation {
+		LocalBuilder builder;
+		
+		public LocalTemporary (EmitContext ec, Type t)
+		{
+			type = t;
+			eclass = ExprClass.Value;
+			loc = Location.Null;
+			builder = ec.GetTemporaryStorage (t);
+		}
+
+		public void Release (EmitContext ec)
+		{
+			ec.FreeTemporaryStorage (builder);
+			builder = null;
+		}
+		
+		public LocalTemporary (LocalBuilder b, Type t)
+		{
+			type = t;
+			eclass = ExprClass.Value;
+			loc = Location.Null;
+			builder = b;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldloc, builder); 
+		}
+
+		public void Store (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Stloc, builder);
+		}
+
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			ec.ig.Emit (OpCodes.Ldloca, builder);
+		}
+	}
+
+	/// <summary>
+	///   The Assign node takes care of assigning the value of source into
+	///   the expression represented by target. 
+	/// </summary>
+	public class Assign : ExpressionStatement {
+		protected Expression target, source, real_source;
+		protected LocalTemporary temp = null, real_temp = null;
+		protected Assign embedded = null;
+		protected bool is_embedded = false;
+		protected bool must_free_temp = false;
+
+		public Assign (Expression target, Expression source, Location l)
+		{
+			this.target = target;
+			this.source = this.real_source = source;
+			this.loc = l;
+		}
+
+		protected Assign (Assign embedded, Location l)
+			: this (embedded.target, embedded.source, l)
+		{
+			this.is_embedded = true;
+		}
+
+		public Expression Target {
+			get {
+				return target;
+			}
+
+			set {
+				target = value;
+			}
+		}
+
+		public Expression Source {
+			get {
+				return source;
+			}
+
+			set {
+				source = value;
+			}
+		}
+
+		public static void error70 (EventInfo ei, Location l)
+		{
+			Report.Error (70, l, "The event '" + ei.Name +
+				      "' can only appear on the left-side of a += or -= (except when" +
+				      " used from within the type '" + ei.DeclaringType + "')");
+		}
+
+		//
+		// Will return either `this' or an instance of `New'.
+		//
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// Create an embedded assignment if our source is an assignment.
+			if (source is Assign)
+				source = embedded = new Assign ((Assign) source, loc);
+
+			real_source = source = source.Resolve (ec);
+			if (source == null)
+				return null;
+
+			//
+			// This is used in an embedded assignment.
+			// As an example, consider the statement "A = X = Y = Z".
+			//
+			if (is_embedded && !(source is Constant)) {
+				// If this is the innermost assignment (the "Y = Z" in our example),
+				// create a new temporary local, otherwise inherit that variable
+				// from our child (the "X = (Y = Z)" inherits the local from the
+				// "Y = Z" assignment).
+				if (embedded == null)
+					real_temp = temp = new LocalTemporary (ec, source.Type);
+				else
+					temp = embedded.temp;
+
+				// Set the source to the new temporary variable.
+				// This means that the following target.ResolveLValue () will tell
+				// the target to read it's source value from that variable.
+				source = temp;
+			}
+
+			// If we have an embedded assignment, use the embedded assignment's temporary
+			// local variable as source.
+			if (embedded != null)
+				source = (embedded.temp != null) ? embedded.temp : embedded.source;
+
+			target = target.ResolveLValue (ec, source);
+
+			if (target == null)
+				return null;
+
+			Type target_type = target.Type;
+			Type source_type = real_source.Type;
+
+			// If we're an embedded assignment, our parent will reuse our source as its
+			// source, it won't read from our target.
+			if (is_embedded)
+				type = source_type;
+			else
+				type = target_type;
+			eclass = ExprClass.Value;
+
+			//
+			// If we are doing a property assignment, then
+			// set the `value' field on the property, and Resolve
+			// it.
+			//
+			if (target is PropertyExpr){
+				PropertyExpr property_assign = (PropertyExpr) target;
+
+				if (source_type != target_type){
+					source = ConvertImplicitRequired (ec, source, target_type, loc);
+					if (source == null)
+						return null;
+				}
+
+				//
+				// FIXME: Maybe handle this in the LValueResolve
+				//
+				if (!property_assign.VerifyAssignable ())
+					return null;
+
+				return this;
+			}
+
+			if (target is IndexerAccess) {
+				return this;
+			}
+
+			if (target is EventExpr) {
+
+				Binary tmp;
+				EventInfo ei = ((EventExpr) target).EventInfo;
+
+
+				Expression ml = MemberLookup (
+					ec, ec.ContainerType, ei.Name,
+					MemberTypes.Event, AllBindingFlags, loc);
+
+				if (ml == null) {
+				        //
+					// If this is the case, then the Event does not belong 
+					// to this Type and so, according to the spec
+					// is allowed to only appear on the left hand of
+					// the += and -= operators
+					//
+					// Note that target will not appear as an EventExpr
+					// in the case it is being referenced within the same type container;
+					// it will appear as a FieldExpr in that case.
+					//
+					
+					if (!(source is Binary)) {
+						error70 (ei, loc);
+						return null;
+					} else {
+						tmp = ((Binary) source);
+						if (tmp.Oper != Binary.Operator.Addition &&
+						    tmp.Oper != Binary.Operator.Subtraction) {
+							error70 (ei, loc);
+							return null;
+						}
+					}
+				}
+			}
+			
+			if (source is New && target_type.IsValueType){
+				New n = (New) source;
+
+				n.ValueTypeVariable = target;
+				return n;
+			}
+
+			if (target.eclass != ExprClass.Variable && target.eclass != ExprClass.EventAccess){
+				Report.Error (131, loc,
+					      "Left hand of an assignment must be a variable, " +
+					      "a property or an indexer");
+				return null;
+			}
+
+			if ((source.eclass == ExprClass.Type) && (source is TypeExpr)) {
+				source.Error118 ("variable or value");
+				return null;
+			} else if (source is MethodGroupExpr){
+				((MethodGroupExpr) source).ReportUsageError ();
+				return null;
+			}
+
+			if (target_type == source_type)
+				return this;
+			
+			//
+			// If this assignemnt/operator was part of a compound binary
+			// operator, then we allow an explicit conversion, as detailed
+			// in the spec. 
+			//
+
+			if (this is CompoundAssign){
+				CompoundAssign a = (CompoundAssign) this;
+				
+				Binary b = source as Binary;
+				if (b != null && b.IsBuiltinOperator){
+					//
+					// 1. if the source is explicitly convertible to the
+					//    target_type
+					//
+					
+					source = ConvertExplicit (ec, source, target_type, loc);
+					if (source == null){
+						Error_CannotConvertImplicit (loc, source_type, target_type);
+						return null;
+					}
+				
+					//
+					// 2. and the original right side is implicitly convertible to
+					// the type of target_type.
+					//
+					if (StandardConversionExists (a.original_source, target_type))
+						return this;
+
+					Error_CannotConvertImplicit (loc, a.original_source.Type, target_type);
+					return null;
+				}
+			}
+			
+			source = ConvertImplicitRequired (ec, source, target_type, loc);
+			if (source == null)
+				return null;
+
+			// If we're an embedded assignment, we need to create a new temporary variable
+			// for the converted value.  Our parent will use this new variable as its source.
+			// The same applies when we have an embedded assignment - in this case, we need
+			// to convert our embedded assignment's temporary local variable to the correct
+			// type and store it in a new temporary local.
+			if (is_embedded || embedded != null) {
+				type = target_type;
+				temp = new LocalTemporary (ec, type);
+				must_free_temp = true;
+			}
+			
+			return this;
+		}
+
+		Expression EmitEmbedded (EmitContext ec)
+		{
+			// Emit an embedded assignment.
+			
+			if (real_temp != null) {
+				// If we're the innermost assignment, `real_source' is the right-hand
+				// expression which gets assigned to all the variables left of it.
+				// Emit this expression and store its result in real_temp.
+				real_source.Emit (ec);
+				real_temp.Store (ec);
+			}
+
+			if (embedded != null)
+				embedded.EmitEmbedded (ec);
+
+			// This happens when we've done a type conversion, in this case source will be
+			// the expression which does the type conversion from real_temp.
+			// So emit it and store the result in temp; this is the var which will be read
+			// by our parent.
+			if (temp != real_temp) {
+				source.Emit (ec);
+				temp.Store (ec);
+			}
+
+			Expression temp_source = (temp != null) ? temp : source;
+			((IAssignMethod) target).EmitAssign (ec, temp_source);
+			return temp_source;
+		}
+
+		void ReleaseEmbedded (EmitContext ec)
+		{
+			if (embedded != null)
+				embedded.ReleaseEmbedded (ec);
+
+			if (real_temp != null)
+				real_temp.Release (ec);
+
+			if (must_free_temp)
+				temp.Release (ec);
+		}
+
+		void Emit (EmitContext ec, bool is_statement)
+		{
+			if (target is EventExpr) {
+				((EventExpr) target).EmitAddOrRemove (ec, source);
+				return;
+			}
+
+			//
+			// FIXME! We need a way to "probe" if the process can
+			// just use `dup' to propagate the result
+			// 
+			IAssignMethod am = (IAssignMethod) target;
+
+			if (this is CompoundAssign){
+				am.CacheTemporaries (ec);
+			}
+
+			Expression temp_source;
+			if (embedded != null) {
+				temp_source = embedded.EmitEmbedded (ec);
+
+				if (temp != null) {
+					source.Emit (ec);
+					temp.Store (ec);
+					temp_source = temp;
+				}
+			} else
+				temp_source = source;
+
+			if (is_statement)
+				am.EmitAssign (ec, temp_source);
+			else {
+				LocalTemporary tempo;
+
+				tempo = new LocalTemporary (ec, source.Type);
+
+				temp_source.Emit (ec);
+				tempo.Store (ec);
+				am.EmitAssign (ec, tempo);
+				tempo.Emit (ec);
+				tempo.Release (ec);
+			}
+
+			if (embedded != null) {
+				if (temp != null)
+					temp.Release (ec);
+				embedded.ReleaseEmbedded (ec);
+			}
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			Emit (ec, false);
+		}
+
+		public override void EmitStatement (EmitContext ec)
+		{
+			Emit (ec, true);
+		}
+	}
+
+	
+	//
+	// This class is used for compound assignments.  
+	//
+	class CompoundAssign : Assign {
+		Binary.Operator op;
+		public Expression original_source;
+		
+		public CompoundAssign (Binary.Operator op, Expression target, Expression source, Location l)
+			: base (target, source, l)
+		{
+			original_source = source;
+			this.op = op;
+		}
+
+		public Expression ResolveSource (EmitContext ec)
+		{
+			return original_source.Resolve (ec);
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			target = target.ResolveLValue (ec, source);
+			if (target == null)
+				return null;
+
+			original_source = original_source.Resolve (ec);
+			if (original_source == null)
+				return null;
+
+			//
+			// Only now we can decouple the original source/target
+			// into a tree, to guarantee that we do not have side
+			// effects.
+			//
+			source = new Binary (op, target, original_source, loc);
+			return base.DoResolve (ec);
+		}
+	}
+}
+
+
+
+
diff --git a/mcs/mbas/attribute.cs b/mcs/mbas/attribute.cs
new file mode 100644
index 00000000000..f58fc3762f5
--- /dev/null
+++ b/mcs/mbas/attribute.cs
@@ -0,0 +1,871 @@
+//
+// attribute.cs: Attribute Handler
+//
+// Author: Ravi Pratap (ravi@ximian.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+//
+
+using System;
+using System.Diagnostics;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+using System.Text;
+
+namespace Mono.CSharp {
+
+	public class Attribute {
+		public readonly string    Name;
+		public readonly ArrayList Arguments;
+
+		Location Location;
+
+		public Type Type;
+		
+		//
+		// The following are only meaningful when the attribute
+		// being emitted is one of the builtin ones
+		//
+		AttributeTargets Targets;
+		bool AllowMultiple;
+		bool Inherited;
+
+		bool UsageAttr = false;
+		
+		MethodImplOptions ImplOptions;
+		UnmanagedType     UnmanagedType;
+		CustomAttributeBuilder cb;
+		
+		public Attribute (string name, ArrayList args, Location loc)
+		{
+			Name = name;
+			Arguments = args;
+			Location = loc;
+		}
+
+		void Error_InvalidNamedArgument (string name)
+		{
+			Report.Error (617, Location, "'" + name + "' is not a valid named attribute " +
+				      "argument. Named attribute arguments must be fields which are not " +
+				      "readonly, static or const, or properties with a set accessor which "+
+				      "are not static.");
+		}
+
+		void Error_AttributeArgumentNotValid ()
+		{
+			Report.Error (182, Location,
+				      "An attribute argument must be a constant expression, typeof " +
+				      "expression or array creation expression");
+		}
+
+		static void Error_AttributeConstructorMismatch (Location loc)
+		{
+			Report.Error (
+					-6, loc,
+					"Could not find a constructor for this argument list.");
+		}
+		
+		private Type CheckAttributeType (EmitContext ec) {
+			Type t;
+			bool isattributeclass = true;
+			
+			t = RootContext.LookupType (ec.DeclSpace, Name, true, Location);
+			if (t != null) {
+				isattributeclass = t.IsSubclassOf (TypeManager.attribute_type);
+				if (isattributeclass)
+					return t;
+			}
+			t = RootContext.LookupType (ec.DeclSpace, Name + "Attribute", true, Location);
+			if (t != null) {
+				if (t.IsSubclassOf (TypeManager.attribute_type))
+					return t;
+			}
+			if (!isattributeclass) {
+				Report.Error (616, Location, "'" + Name + "': is not an attribute class");
+				return null;
+			}
+			if (t != null) {
+				Report.Error (616, Location, "'" + Name + "Attribute': is not an attribute class");
+				return null;
+			}
+			Report.Error (
+				246, Location, "Could not find attribute '" + Name + "' (are you" +
+				" missing a using directive or an assembly reference ?)");
+			return null;
+		}
+
+		public Type ResolveType (EmitContext ec)
+		{
+			Type = CheckAttributeType (ec);
+			return Type;
+		}
+
+		
+		public CustomAttributeBuilder Resolve (EmitContext ec)
+		{
+			if (Type == null)
+				Type = CheckAttributeType (ec);
+			if (Type == null)
+				return null;
+
+			bool MethodImplAttr = false;
+			bool MarshalAsAttr = false;
+
+			UsageAttr = false;
+
+			if (Type == TypeManager.attribute_usage_type)
+				UsageAttr = true;
+			if (Type == TypeManager.methodimpl_attr_type)
+				MethodImplAttr = true;
+			if (Type == TypeManager.marshal_as_attr_type)
+				MarshalAsAttr = true;
+
+			// Now we extract the positional and named arguments
+			
+			ArrayList pos_args = new ArrayList ();
+			ArrayList named_args = new ArrayList ();
+			int pos_arg_count = 0;
+			
+			if (Arguments != null) {
+				pos_args = (ArrayList) Arguments [0];
+				if (pos_args != null)
+					pos_arg_count = pos_args.Count;
+				if (Arguments.Count > 1)
+					named_args = (ArrayList) Arguments [1];
+			}
+
+			object [] pos_values = new object [pos_arg_count];
+
+			//
+			// First process positional arguments 
+			//
+
+			int i;
+			for (i = 0; i < pos_arg_count; i++) {
+				Argument a = (Argument) pos_args [i];
+				Expression e;
+
+				if (!a.Resolve (ec, Location))
+					return null;
+
+				e = a.Expr;
+				if (e is Constant) {
+					pos_values [i] = ((Constant) e).GetValue ();
+				} else if (e is TypeOf) {
+					pos_values [i] = ((TypeOf) e).TypeArg;
+				} else {
+					Error_AttributeArgumentNotValid ();
+					return null;
+				}
+				
+				if (UsageAttr)
+					this.Targets = (AttributeTargets) pos_values [0];
+				
+				if (MethodImplAttr)
+					this.ImplOptions = (MethodImplOptions) pos_values [0];
+				
+				if (MarshalAsAttr)
+					this.UnmanagedType =
+					(System.Runtime.InteropServices.UnmanagedType) pos_values [0];
+			}
+
+			//
+			// Now process named arguments
+			//
+
+			ArrayList field_infos = new ArrayList ();
+			ArrayList prop_infos  = new ArrayList ();
+			ArrayList field_values = new ArrayList ();
+			ArrayList prop_values = new ArrayList ();
+			
+			for (i = 0; i < named_args.Count; i++) {
+				DictionaryEntry de = (DictionaryEntry) named_args [i];
+				string member_name = (string) de.Key;
+				Argument a  = (Argument) de.Value;
+				Expression e;
+				
+				if (!a.Resolve (ec, Location))
+					return null;
+
+				Expression member = Expression.MemberLookup (
+					ec, Type, member_name,
+					MemberTypes.Field | MemberTypes.Property,
+					BindingFlags.Public | BindingFlags.Instance,
+					Location);
+
+				if (member == null || !(member is PropertyExpr || member is FieldExpr)) {
+					Error_InvalidNamedArgument (member_name);
+					return null;
+				}
+
+				e = a.Expr;
+				if (member is PropertyExpr) {
+					PropertyExpr pe = (PropertyExpr) member;
+					PropertyInfo pi = pe.PropertyInfo;
+
+					if (!pi.CanWrite) {
+						Error_InvalidNamedArgument (member_name);
+						return null;
+					}
+
+					if (e is Constant) {
+						object o = ((Constant) e).GetValue ();
+						prop_values.Add (o);
+						
+						if (UsageAttr) {
+							if (member_name == "AllowMultiple")
+								this.AllowMultiple = (bool) o;
+							if (member_name == "Inherited")
+								this.Inherited = (bool) o;
+						}
+						
+					} else { 
+						Error_AttributeArgumentNotValid ();
+						return null;
+					}
+					
+					prop_infos.Add (pi);
+					
+				} else if (member is FieldExpr) {
+					FieldExpr fe = (FieldExpr) member;
+					FieldInfo fi = fe.FieldInfo;
+
+					if (fi.IsInitOnly) {
+						Error_InvalidNamedArgument (member_name);
+						return null;
+					}
+
+					//
+					// Handle charset here, and set the TypeAttributes
+					
+					if (e is Constant){
+						object value = ((Constant) e).GetValue ();
+						
+						field_values.Add (value);
+					} else { 
+						Error_AttributeArgumentNotValid ();
+						return null;
+					}
+					
+					field_infos.Add (fi);
+				}
+			}
+
+			Expression mg = Expression.MemberLookup (
+				ec, Type, ".ctor", MemberTypes.Constructor,
+				BindingFlags.Public | BindingFlags.Instance, Location);
+
+			if (mg == null) {
+				Error_AttributeConstructorMismatch (Location);
+				return null;
+			}
+
+			MethodBase constructor = Invocation.OverloadResolve (
+				ec, (MethodGroupExpr) mg, pos_args, Location);
+
+			if (constructor == null) {
+				Error_AttributeConstructorMismatch (Location);
+				return null;
+			}
+			
+			PropertyInfo [] prop_info_arr = new PropertyInfo [prop_infos.Count];
+			FieldInfo [] field_info_arr = new FieldInfo [field_infos.Count];
+			object [] field_values_arr = new object [field_values.Count];
+			object [] prop_values_arr = new object [prop_values.Count];
+
+			field_infos.CopyTo  (field_info_arr, 0);
+			field_values.CopyTo (field_values_arr, 0);
+
+			prop_values.CopyTo  (prop_values_arr, 0);
+			prop_infos.CopyTo   (prop_info_arr, 0);
+
+			try {
+				cb = new CustomAttributeBuilder (
+					(ConstructorInfo) constructor, pos_values,
+					prop_info_arr, prop_values_arr,
+					field_info_arr, field_values_arr); 
+			} catch (NullReferenceException) {
+				Report.Warning (
+					-23, Location,
+					"The compiler can not encode this attribute in the Mono runtime\n" +
+					"\tdue to a known bug in it.  We know about the problem and will\n" +
+					"\tfix it as soon as possible.");
+			} catch {
+				//
+				// Sample:
+				// using System.ComponentModel;
+				// [DefaultValue (CollectionChangeAction.Add)]
+				// class X { static void Main () {} }
+				//
+				Report.Warning (
+					-23, Location,
+					"The compiler can not encode this attribute in .NET due to\n" +
+					"\ta bug in the .NET runtime.  Try the Mono runtime");
+			}
+			
+			return cb;
+		}
+
+		static string GetValidPlaces (Attribute attr)
+		{
+			StringBuilder sb = new StringBuilder ();
+			AttributeTargets targets = 0;
+			
+			TypeContainer a = TypeManager.LookupAttr (attr.Type);
+
+			if (a == null) {
+				
+				System.Attribute [] attrs = null;
+				
+				try {
+					attrs = System.Attribute.GetCustomAttributes (attr.Type);
+					
+				} catch {
+					Report.Error (-20, attr.Location, "Cannot find attribute type " + attr.Name +
+						      " (maybe you forgot to set the usage using the" +
+						      " AttributeUsage attribute ?).");
+					return null;
+				}
+					
+				foreach (System.Attribute tmp in attrs)
+					if (tmp is AttributeUsageAttribute) {
+						targets = ((AttributeUsageAttribute) tmp).ValidOn;
+						break;
+					}
+			} else
+				targets = a.Targets;
+
+			
+			if ((targets & AttributeTargets.Assembly) != 0)
+				sb.Append ("'assembly' ");
+
+			if ((targets & AttributeTargets.Class) != 0)
+				sb.Append ("'class' ");
+
+			if ((targets & AttributeTargets.Constructor) != 0)
+				sb.Append ("'constructor' ");
+
+			if ((targets & AttributeTargets.Delegate) != 0)
+				sb.Append ("'delegate' ");
+
+			if ((targets & AttributeTargets.Enum) != 0)
+				sb.Append ("'enum' ");
+
+			if ((targets & AttributeTargets.Event) != 0)
+				sb.Append ("'event' ");
+
+			if ((targets & AttributeTargets.Field) != 0)
+				sb.Append ("'field' ");
+
+			if ((targets & AttributeTargets.Interface) != 0)
+				sb.Append ("'interface' ");
+
+			if ((targets & AttributeTargets.Method) != 0)
+				sb.Append ("'method' ");
+
+			if ((targets & AttributeTargets.Module) != 0)
+				sb.Append ("'module' ");
+
+			if ((targets & AttributeTargets.Parameter) != 0)
+				sb.Append ("'parameter' ");
+
+			if ((targets & AttributeTargets.Property) != 0)
+				sb.Append ("'property' ");
+
+			if ((targets & AttributeTargets.ReturnValue) != 0)
+				sb.Append ("'return value' ");
+
+			if ((targets & AttributeTargets.Struct) != 0)
+				sb.Append ("'struct' ");
+
+			return sb.ToString ();
+
+		}
+
+		public static void Error_AttributeNotValidForElement (Attribute a, Location loc)
+		{
+			Report.Error (
+				592, loc, "Attribute '" + a.Name +
+				"' is not valid on this declaration type. " +
+				"It is valid on " + GetValidPlaces (a) + "declarations only.");
+		}
+
+		public static bool CheckAttribute (Attribute a, object element)
+		{
+			TypeContainer attr = TypeManager.LookupAttr (a.Type);
+			AttributeTargets targets = 0;
+
+			
+			if (attr == null) {
+
+				System.Attribute [] attrs = null;
+				
+				try {
+					attrs = System.Attribute.GetCustomAttributes (a.Type);
+
+				} catch {
+					Report.Error (-20, a.Location, "Cannot find attribute type " + a.Name +
+						      " (maybe you forgot to set the usage using the" +
+						      " AttributeUsage attribute ?).");
+					return false;
+				}
+					
+				foreach (System.Attribute tmp in attrs)
+					if (tmp is AttributeUsageAttribute) 
+						targets = ((AttributeUsageAttribute) tmp).ValidOn;
+			} else
+				targets = attr.Targets;
+
+			if (element is Class) {
+				if ((targets & AttributeTargets.Class) != 0)
+					return true;
+				else
+					return false;
+				
+			} else if (element is Struct) {
+				if ((targets & AttributeTargets.Struct) != 0)
+					return true;
+				else
+					return false;
+			} else if (element is Constructor) {
+				if ((targets & AttributeTargets.Constructor) != 0)
+					return true;
+				else
+					return false;
+			} else if (element is Delegate) {
+				if ((targets & AttributeTargets.Delegate) != 0)
+					return true;
+				else
+					return false;
+			} else if (element is Enum) {
+				if ((targets & AttributeTargets.Enum) != 0)
+					return true;
+				else
+					return false;
+			} else if (element is Event || element is InterfaceEvent) {
+				if ((targets & AttributeTargets.Event) != 0)
+					return true;
+				else
+					return false;
+			} else if (element is Field || element is FieldBuilder) {
+				if ((targets & AttributeTargets.Field) != 0)
+					return true;
+				else
+					return false;
+			} else if (element is Interface) {
+				if ((targets & AttributeTargets.Interface) != 0)
+					return true;
+				else
+					return false;
+			} else if (element is Method || element is Operator || element is InterfaceMethod || element is Accessor) {
+				if ((targets & AttributeTargets.Method) != 0)
+					return true;
+				else
+					return false;
+			} else if (element is ParameterBuilder) {
+				if ((targets & AttributeTargets.Parameter) != 0)
+					return true;
+				else
+					return false;
+			} else if (element is Property || element is Indexer ||
+				   element is InterfaceProperty || element is InterfaceIndexer) {
+				if ((targets & AttributeTargets.Property) != 0)
+					return true;
+				else
+					return false;
+			} else if (element is AssemblyBuilder){
+				if ((targets & AttributeTargets.Assembly) != 0)
+					return true;
+				else
+					return false;
+			}
+
+			return false;
+		}
+
+		//
+		// This method should be invoked to pull the IndexerName attribute from an
+		// Indexer if it exists.
+		//
+		public static string ScanForIndexerName (EmitContext ec, Attributes opt_attrs)
+		{
+			if (opt_attrs == null)
+				return null;
+			if (opt_attrs.AttributeSections == null)
+				return null;
+
+			foreach (AttributeSection asec in opt_attrs.AttributeSections) {
+				if (asec.Attributes == null)
+					continue;
+
+				foreach (Attribute a in asec.Attributes){
+					if (a.ResolveType (ec) == null)
+						return null;
+					
+					if (a.Type != TypeManager.indexer_name_type)
+						continue;
+
+					//
+					// So we have found an IndexerName, pull the data out.
+					//
+					if (a.Arguments == null || a.Arguments [0] == null){
+						Error_AttributeConstructorMismatch (a.Location);
+						return null;
+					}
+					ArrayList pos_args = (ArrayList) a.Arguments [0];
+					if (pos_args.Count == 0){
+						Error_AttributeConstructorMismatch (a.Location);
+						return null;
+					}
+					
+					Argument arg = (Argument) pos_args [0];
+					if (!arg.Resolve (ec, a.Location))
+						return null;
+					
+					Expression e = arg.Expr;
+					if (!(e is StringConstant)){
+						Error_AttributeConstructorMismatch (a.Location);
+						return null;
+					}
+
+					//
+					// Remove the attribute from the list
+					//
+					asec.Attributes.Remove (a);
+
+					return (((StringConstant) e).Value);
+				}
+			}
+			return null;
+		}
+
+		//
+		// This pulls the condition name out of a Conditional attribute
+		//
+		public string Conditional_GetConditionName ()
+		{
+			//
+			// So we have a Conditional, pull the data out.
+			//
+			if (Arguments == null || Arguments [0] == null){
+				Error_AttributeConstructorMismatch (Location);
+				return null;
+			}
+
+			ArrayList pos_args = (ArrayList) Arguments [0];
+			if (pos_args.Count != 1){
+				Error_AttributeConstructorMismatch (Location);
+				return null;
+			}
+
+			Argument arg = (Argument) pos_args [0];	
+			if (!(arg.Expr is StringConstant)){
+				Error_AttributeConstructorMismatch (Location);
+				return null;
+			}
+
+			return ((StringConstant) arg.Expr).Value;
+		}
+
+		//
+		// This pulls the obsolete message and error flag out of an Obsolete attribute
+		//
+		public string Obsolete_GetObsoleteMessage (out bool is_error)
+		{
+			is_error = false;
+			//
+			// So we have an Obsolete, pull the data out.
+			//
+			if (Arguments == null || Arguments [0] == null)
+				return "";
+
+			ArrayList pos_args = (ArrayList) Arguments [0];
+			if (pos_args.Count == 0)
+				return "";
+			else if (pos_args.Count > 2){
+				Error_AttributeConstructorMismatch (Location);
+				return null;
+			}
+
+			Argument arg = (Argument) pos_args [0];	
+			if (!(arg.Expr is StringConstant)){
+				Error_AttributeConstructorMismatch (Location);
+				return null;
+			}
+
+			if (pos_args.Count == 2){
+				Argument arg2 = (Argument) pos_args [1];
+				if (!(arg2.Expr is BoolConstant)){
+					Error_AttributeConstructorMismatch (Location);
+					return null;
+				}
+				is_error = ((BoolConstant) arg2.Expr).Value;
+			}
+
+			return ((StringConstant) arg.Expr).Value;
+		}
+
+		//
+		// Applies the attributes to the `builder'.
+		//
+		public static void ApplyAttributes (EmitContext ec, object builder, object kind,
+						    Attributes opt_attrs, Location loc)
+		{
+			if (opt_attrs == null)
+				return;
+			if (opt_attrs.AttributeSections == null)
+				return;
+
+			foreach (AttributeSection asec in opt_attrs.AttributeSections) {
+				if (asec.Attributes == null)
+					continue;
+
+				if (asec.Target == "assembly" && !(builder is AssemblyBuilder))
+					continue;
+				
+				foreach (Attribute a in asec.Attributes) {
+					CustomAttributeBuilder cb = a.Resolve (ec);
+
+					if (cb == null)
+						continue;
+
+					if (!(kind is TypeContainer))
+						if (!CheckAttribute (a, kind)) {
+							Error_AttributeNotValidForElement (a, loc);
+							return;
+						}
+
+					if (kind is Method || kind is Operator || kind is InterfaceMethod ||
+					    kind is Accessor) {
+						if (a.Type == TypeManager.methodimpl_attr_type) {
+							if (a.ImplOptions == MethodImplOptions.InternalCall)
+								((MethodBuilder) builder).
+								SetImplementationFlags (
+									MethodImplAttributes.InternalCall |
+									MethodImplAttributes.Runtime);
+						} else if (a.Type != TypeManager.dllimport_type){
+							((MethodBuilder) builder).SetCustomAttribute (cb);
+						}
+					} else if (kind is Constructor) {
+						((ConstructorBuilder) builder).SetCustomAttribute (cb);
+					} else if (kind is Field) {
+						((FieldBuilder) builder).SetCustomAttribute (cb);
+					} else if (kind is Property || kind is Indexer ||
+						   kind is InterfaceProperty || kind is InterfaceIndexer) {
+						((PropertyBuilder) builder).SetCustomAttribute (cb);
+					} else if (kind is Event || kind is InterfaceEvent) {
+						((MyEventBuilder) builder).SetCustomAttribute (cb);
+					} else if (kind is ParameterBuilder) {
+
+						if (a.Type == TypeManager.marshal_as_attr_type) {
+							UnmanagedMarshal marshal =
+								UnmanagedMarshal.DefineUnmanagedMarshal (a.UnmanagedType);
+							
+							((ParameterBuilder) builder).SetMarshal (marshal);
+						} else 
+							((ParameterBuilder) builder).SetCustomAttribute (cb);
+						
+					} else if (kind is Enum) {
+						((TypeBuilder) builder).SetCustomAttribute (cb); 
+
+					} else if (kind is TypeContainer) {
+						TypeContainer tc = (TypeContainer) kind;
+						
+						if (a.UsageAttr) {
+							tc.Targets = a.Targets;
+							tc.AllowMultiple = a.AllowMultiple;
+							tc.Inherited = a.Inherited;
+							
+						} else if (a.Type == TypeManager.default_member_type) {
+							if (tc.Indexers != null) {
+								Report.Error (646, loc,
+								      "Cannot specify the DefaultMember attribute on" +
+								      " a type containing an indexer");
+								return;
+							}
+
+						} else {
+							if (!CheckAttribute (a, kind)) {
+								Error_AttributeNotValidForElement (a, loc);
+								return;
+							}
+						}
+
+						try {
+							((TypeBuilder) builder).SetCustomAttribute (cb);
+						} catch (System.ArgumentException) {
+							Report.Warning (
+								-21, loc,
+						"The CharSet named property on StructLayout\n"+
+						"\tdoes not work correctly on Microsoft.NET\n"+
+						"\tYou might want to remove the CharSet declaration\n"+
+						"\tor compile using the Mono runtime instead of the\n"+
+						"\tMicrosoft .NET runtime");
+						}
+						
+					} else if (kind is AssemblyBuilder){
+						((AssemblyBuilder) builder).SetCustomAttribute (cb);
+					} else if (kind is ModuleBuilder) {
+						((ModuleBuilder) builder).SetCustomAttribute (cb);
+					} else if (kind is FieldBuilder) {
+						((FieldBuilder) builder).SetCustomAttribute (cb);
+					} else
+						throw new Exception ("Unknown kind: " + kind);
+				}
+			}
+		}
+
+		public MethodBuilder DefinePInvokeMethod (EmitContext ec, TypeBuilder builder, string name,
+							  MethodAttributes flags, Type ret_type, Type [] param_types)
+		{
+			//
+			// We extract from the attribute the information we need 
+			//
+
+			if (Arguments == null) {
+				Console.WriteLine ("Internal error : this is not supposed to happen !");
+				return null;
+			}
+
+			Type = CheckAttributeType (ec);
+			if (Type == null)
+				return null;
+			
+			ArrayList named_args = new ArrayList ();
+			
+			ArrayList pos_args = (ArrayList) Arguments [0];
+			if (Arguments.Count > 1)
+				named_args = (ArrayList) Arguments [1];
+			
+
+			string dll_name = null;
+			
+			Argument tmp = (Argument) pos_args [0];
+
+			if (!tmp.Resolve (ec, Location))
+				return null;
+			
+			if (tmp.Expr is Constant)
+				dll_name = (string) ((Constant) tmp.Expr).GetValue ();
+			else { 
+				Error_AttributeArgumentNotValid ();
+				return null;
+			}
+
+			// Now we process the named arguments
+			CallingConvention cc = CallingConvention.Winapi;
+			CharSet charset = CharSet.Ansi;
+			bool preserve_sig = true;
+			bool exact_spelling = false;
+			bool set_last_err = false;
+			string entry_point = null;
+
+			for (int i = 0; i < named_args.Count; i++) {
+
+				DictionaryEntry de = (DictionaryEntry) named_args [i];
+
+				string member_name = (string) de.Key;
+				Argument a  = (Argument) de.Value;
+
+				if (!a.Resolve (ec, Location))
+					return null;
+
+				Expression member = Expression.MemberLookup (
+					ec, Type, member_name, 
+					MemberTypes.Field | MemberTypes.Property,
+					BindingFlags.Public | BindingFlags.Instance,
+					Location);
+
+				if (member == null || !(member is FieldExpr)) {
+					Error_InvalidNamedArgument (member_name);
+					return null;
+				}
+
+				if (member is FieldExpr) {
+					FieldExpr fe = (FieldExpr) member;
+					FieldInfo fi = fe.FieldInfo;
+
+					if (fi.IsInitOnly) {
+						Error_InvalidNamedArgument (member_name);
+						return null;
+					}
+
+					if (a.Expr is Constant) {
+						Constant c = (Constant) a.Expr;
+						
+						if (member_name == "CallingConvention")
+							cc = (CallingConvention) c.GetValue ();
+						else if (member_name == "CharSet")
+							charset = (CharSet) c.GetValue ();
+						else if (member_name == "EntryPoint")
+							entry_point = (string) c.GetValue ();
+						else if (member_name == "SetLastError")
+							set_last_err = (bool) c.GetValue ();
+						else if (member_name == "ExactSpelling")
+							exact_spelling = (bool) c.GetValue ();
+						else if (member_name == "PreserveSig")
+							preserve_sig = (bool) c.GetValue ();
+					} else { 
+						Error_AttributeArgumentNotValid ();
+						return null;
+					}
+					
+				}
+			}
+
+			if (entry_point == null)
+				entry_point = name;
+			
+			MethodBuilder mb = builder.DefinePInvokeMethod (
+				name, dll_name, entry_point, flags | MethodAttributes.HideBySig,
+				CallingConventions.Standard,
+				ret_type,
+				param_types,
+				cc,
+				charset);
+
+			if (preserve_sig)
+				mb.SetImplementationFlags (MethodImplAttributes.PreserveSig);
+			
+			return mb;
+		}
+		
+	}
+	
+	public class AttributeSection {
+		
+		public readonly string    Target;
+		public readonly ArrayList Attributes;
+		
+		public AttributeSection (string target, ArrayList attrs)
+		{
+			Target = target;
+			Attributes = attrs;
+		}
+		
+	}
+
+	public class Attributes {
+		public ArrayList AttributeSections;
+		public Location Location;
+
+		public Attributes (AttributeSection a, Location loc)
+		{
+			AttributeSections = new ArrayList ();
+			AttributeSections.Add (a);
+
+		}
+
+		public void AddAttribute (AttributeSection a)
+		{
+			if (a != null)
+				AttributeSections.Add (a);
+		}
+	}
+}
diff --git a/mcs/mbas/cfold.cs b/mcs/mbas/cfold.cs
new file mode 100644
index 00000000000..9da0bc08bf8
--- /dev/null
+++ b/mcs/mbas/cfold.cs
@@ -0,0 +1,1028 @@
+//
+// cfold.cs: Constant Folding
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System;
+
+namespace Mono.CSharp {
+
+	public class ConstantFold {
+
+		//
+		// Performs the numeric promotions on the left and right expresions
+		// and desposits the results on `lc' and `rc'.
+		//
+		// On success, the types of `lc' and `rc' on output will always match,
+		// and the pair will be one of:
+		//
+		//   (double, double)
+		//   (float, float)
+		//   (ulong, ulong)
+		//   (long, long)
+		//   (uint, uint)
+		//   (int, int)
+		//
+		static void DoConstantNumericPromotions (Binary.Operator oper,
+							 ref Constant left, ref Constant right,
+							 Location loc)
+		{
+			if (left is DoubleConstant || right is DoubleConstant){
+				//
+				// If either side is a double, convert the other to a double
+				//
+				if (!(left is DoubleConstant))
+					left = left.ToDouble (loc);
+
+				if (!(right is DoubleConstant))
+					right = right.ToDouble (loc);
+				return;
+			} else if (left is FloatConstant || right is FloatConstant) {
+				//
+				// If either side is a float, convert the other to a float
+				//
+				if (!(left is FloatConstant))
+					left = left.ToFloat (loc);
+
+				if (!(right is FloatConstant))
+					right = right.ToFloat (loc);
+;				return;
+			} else if (left is ULongConstant || right is ULongConstant){
+				//
+				// If either operand is of type ulong, the other operand is
+				// converted to type ulong.  or an error ocurrs if the other
+				// operand is of type sbyte, short, int or long
+				//
+				Constant match, other;
+					
+				if (left is ULongConstant){
+					other = right;
+					match = left;
+					if (!(right is ULongConstant))
+						right = right.ToULong (loc);
+				} else {
+					other = left;
+					match = right;
+					left = left.ToULong (loc);
+				}
+
+#if WRONG
+				if (other is SByteConstant || other is ShortConstant ||
+				    other is IntConstant || other is LongConstant){
+					Binary.Error_OperatorAmbiguous
+						(loc, oper, other.Type, match.Type);
+					left = null;
+					right = null;
+				}
+#endif
+				return;
+			} else if (left is LongConstant || right is LongConstant){
+				//
+				// If either operand is of type long, the other operand is converted
+				// to type long.
+				//
+				if (!(left is LongConstant))
+					left = left.ToLong (loc);
+				else if (!(right is LongConstant))
+					right = right.ToLong (loc);
+				return;
+			} else if (left is UIntConstant || right is UIntConstant){
+				//
+				// If either operand is of type uint, and the other
+				// operand is of type sbyte, short or int, the operands are
+				// converted to type long.
+				//
+				Constant match, other;
+				if (left is UIntConstant){
+					other = right;
+					match = left;
+				} else {
+					other = left;
+					match = right;
+				}
+
+				// Nothing to do.
+				if (other is UIntConstant)
+					return;
+
+				if (other is SByteConstant || other is ShortConstant ||
+				    other is IntConstant){
+					left = left.ToLong (loc);
+					right = right.ToLong (loc);
+				}
+
+				return;
+			} else {
+				//
+				// Force conversions to int32
+				//
+				if (!(left is IntConstant))
+					left = left.ToInt (loc);
+				if (!(right is IntConstant))
+					right = right.ToInt (loc);
+			}
+			return;
+		}
+
+		static void Error_CompileTimeOverflow (Location loc)
+		{
+			Report.Error (220, loc, "The operation overflows at compile time in checked mode");
+		}
+		
+		/// <summary>
+		///   Constant expression folder for binary operations.
+		///
+		///   Returns null if the expression can not be folded.
+		/// </summary>
+		static public Expression BinaryFold (EmitContext ec, Binary.Operator oper,
+						     Constant left, Constant right, Location loc)
+		{
+			Type lt = left.Type;
+			Type rt = right.Type;
+			Type result_type = null;
+			bool bool_res;
+			
+			//
+			// Enumerator folding
+			//
+			if (rt == lt && left is EnumConstant)
+				result_type = lt;
+
+			//
+			// During an enum evaluation, we need to unwrap enumerations
+			//
+			if (ec.InEnumContext){
+				if (left is EnumConstant)
+					left = ((EnumConstant) left).Child;
+				
+				if (right is EnumConstant)
+					right = ((EnumConstant) right).Child;
+			}
+			
+			switch (oper){
+			case Binary.Operator.BitwiseOr:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+				
+				if (left is IntConstant){
+					IntConstant v;
+					int res = ((IntConstant) left).Value | ((IntConstant) right).Value;
+					
+					v = new IntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is UIntConstant){
+					UIntConstant v;
+					uint res = ((UIntConstant)left).Value | ((UIntConstant)right).Value;
+					
+					v = new UIntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is LongConstant){
+					LongConstant v;
+					long res = ((LongConstant)left).Value | ((LongConstant)right).Value;
+					
+					v = new LongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is ULongConstant){
+					ULongConstant v;
+					ulong res = ((ULongConstant)left).Value |
+						((ULongConstant)right).Value;
+					
+					v = new ULongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				}
+				break;
+				
+			case Binary.Operator.BitwiseAnd:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+				
+				if (left is IntConstant){
+					IntConstant v;
+					int res = ((IntConstant) left).Value & ((IntConstant) right).Value;
+					
+					v = new IntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is UIntConstant){
+					UIntConstant v;
+					uint res = ((UIntConstant)left).Value & ((UIntConstant)right).Value;
+					
+					v = new UIntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is LongConstant){
+					LongConstant v;
+					long res = ((LongConstant)left).Value & ((LongConstant)right).Value;
+					
+					v = new LongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is ULongConstant){
+					ULongConstant v;
+					ulong res = ((ULongConstant)left).Value &
+						((ULongConstant)right).Value;
+					
+					v = new ULongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				}
+				break;
+
+			case Binary.Operator.ExclusiveOr:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+				
+				if (left is IntConstant){
+					IntConstant v;
+					int res = ((IntConstant) left).Value ^ ((IntConstant) right).Value;
+					
+					v = new IntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is UIntConstant){
+					UIntConstant v;
+					uint res = ((UIntConstant)left).Value ^ ((UIntConstant)right).Value;
+					
+					v = new UIntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is LongConstant){
+					LongConstant v;
+					long res = ((LongConstant)left).Value ^ ((LongConstant)right).Value;
+					
+					v = new LongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is ULongConstant){
+					ULongConstant v;
+					ulong res = ((ULongConstant)left).Value ^
+						((ULongConstant)right).Value;
+					
+					v = new ULongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				}
+				break;
+
+			case Binary.Operator.Addition:
+				Constant result;
+				bool left_is_string = left is StringConstant;
+				bool right_is_string = right is StringConstant;
+
+				//
+				// If both sides are strings, then concatenate, if
+				// one is a string, and the other is not, then defer
+				// to runtime concatenation
+				//
+				if (left_is_string || right_is_string){
+					if (left_is_string && right_is_string)
+						return new StringConstant (
+							((StringConstant) left).Value +
+							((StringConstant) right).Value);
+					
+					return null;
+				}
+
+				//
+				// handle "E operator + (E x, U y)"
+				// handle "E operator + (Y y, E x)"
+				//
+				// note that E operator + (E x, E y) is invalid
+				//
+				Type wrap_as = null;
+				if (left is EnumConstant){
+					if (right is EnumConstant){
+						return null;
+					}
+					if (((EnumConstant) left).Child.Type != right.Type)
+						return null;
+
+					wrap_as = left.Type;
+				} else if (right is EnumConstant){
+					if (((EnumConstant) right).Child.Type != left.Type)
+						return null;
+					wrap_as = right.Type;
+				}
+
+				result = null;
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				try {
+					if (left is DoubleConstant){
+						double res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((DoubleConstant) left).Value +
+								       ((DoubleConstant) right).Value);
+						else
+							res = unchecked (((DoubleConstant) left).Value +
+									 ((DoubleConstant) right).Value);
+						
+						result = new DoubleConstant (res);
+					} else if (left is FloatConstant){
+						float res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((FloatConstant) left).Value +
+								       ((FloatConstant) right).Value);
+						else
+							res = unchecked (((FloatConstant) left).Value +
+									 ((FloatConstant) right).Value);
+						
+						result = new FloatConstant (res);
+					} else if (left is ULongConstant){
+						ulong res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((ULongConstant) left).Value +
+								       ((ULongConstant) right).Value);
+						else
+							res = unchecked (((ULongConstant) left).Value +
+									 ((ULongConstant) right).Value);
+
+						result = new ULongConstant (res);
+					} else if (left is LongConstant){
+						long res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((LongConstant) left).Value +
+								       ((LongConstant) right).Value);
+						else
+							res = unchecked (((LongConstant) left).Value +
+									 ((LongConstant) right).Value);
+						
+						result = new LongConstant (res);
+					} else if (left is UIntConstant){
+						uint res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((UIntConstant) left).Value +
+								       ((UIntConstant) right).Value);
+						else
+							res = unchecked (((UIntConstant) left).Value +
+									 ((UIntConstant) right).Value);
+						
+						result = new UIntConstant (res);
+					} else if (left is IntConstant){
+						int res;
+
+						if (ec.ConstantCheckState)
+							res = checked (((IntConstant) left).Value +
+								       ((IntConstant) right).Value);
+						else
+							res = unchecked (((IntConstant) left).Value +
+									 ((IntConstant) right).Value);
+
+						result = new IntConstant (res);
+					} else {
+						throw new Exception ( "Unexepected input: " + left);
+					}
+				} catch (OverflowException){
+					Error_CompileTimeOverflow (loc);
+				}
+
+				if (wrap_as != null)
+					return new EnumConstant (result, wrap_as);
+				else
+					return result;
+
+			case Binary.Operator.Subtraction:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				try {
+					if (left is DoubleConstant){
+						double res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((DoubleConstant) left).Value -
+								       ((DoubleConstant) right).Value);
+						else
+							res = unchecked (((DoubleConstant) left).Value -
+									 ((DoubleConstant) right).Value);
+						
+						return new DoubleConstant (res);
+					} else if (left is FloatConstant){
+						float res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((FloatConstant) left).Value -
+								       ((FloatConstant) right).Value);
+						else
+							res = unchecked (((FloatConstant) left).Value -
+									 ((FloatConstant) right).Value);
+						
+						return new FloatConstant (res);
+					} else if (left is ULongConstant){
+						ulong res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((ULongConstant) left).Value -
+								       ((ULongConstant) right).Value);
+						else
+							res = unchecked (((ULongConstant) left).Value -
+									 ((ULongConstant) right).Value);
+						
+						return new ULongConstant (res);
+					} else if (left is LongConstant){
+						long res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((LongConstant) left).Value -
+								       ((LongConstant) right).Value);
+						else
+							res = unchecked (((LongConstant) left).Value -
+									 ((LongConstant) right).Value);
+						
+						return new LongConstant (res);
+					} else if (left is UIntConstant){
+						uint res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((UIntConstant) left).Value -
+								       ((UIntConstant) right).Value);
+						else
+							res = unchecked (((UIntConstant) left).Value -
+									 ((UIntConstant) right).Value);
+						
+						return new UIntConstant (res);
+					} else if (left is IntConstant){
+						int res;
+
+						if (ec.ConstantCheckState)
+							res = checked (((IntConstant) left).Value -
+								       ((IntConstant) right).Value);
+						else
+							res = unchecked (((IntConstant) left).Value -
+									 ((IntConstant) right).Value);
+
+						return new IntConstant (res);
+					} else {
+						throw new Exception ( "Unexepected input: " + left);
+					}
+				} catch (OverflowException){
+					Error_CompileTimeOverflow (loc);
+				}
+				break;
+				
+			case Binary.Operator.Multiply:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				try {
+					if (left is DoubleConstant){
+						double res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((DoubleConstant) left).Value *
+								       ((DoubleConstant) right).Value);
+						else
+							res = unchecked (((DoubleConstant) left).Value *
+									 ((DoubleConstant) right).Value);
+						
+						return new DoubleConstant (res);
+					} else if (left is FloatConstant){
+						float res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((FloatConstant) left).Value *
+								       ((FloatConstant) right).Value);
+						else
+							res = unchecked (((FloatConstant) left).Value *
+									 ((FloatConstant) right).Value);
+						
+						return new FloatConstant (res);
+					} else if (left is ULongConstant){
+						ulong res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((ULongConstant) left).Value *
+								       ((ULongConstant) right).Value);
+						else
+							res = unchecked (((ULongConstant) left).Value *
+									 ((ULongConstant) right).Value);
+						
+						return new ULongConstant (res);
+					} else if (left is LongConstant){
+						long res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((LongConstant) left).Value *
+								       ((LongConstant) right).Value);
+						else
+							res = unchecked (((LongConstant) left).Value *
+									 ((LongConstant) right).Value);
+						
+						return new LongConstant (res);
+					} else if (left is UIntConstant){
+						uint res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((UIntConstant) left).Value *
+								       ((UIntConstant) right).Value);
+						else
+							res = unchecked (((UIntConstant) left).Value *
+									 ((UIntConstant) right).Value);
+						
+						return new UIntConstant (res);
+					} else if (left is IntConstant){
+						int res;
+
+						if (ec.ConstantCheckState)
+							res = checked (((IntConstant) left).Value *
+								       ((IntConstant) right).Value);
+						else
+							res = unchecked (((IntConstant) left).Value *
+									 ((IntConstant) right).Value);
+
+						return new IntConstant (res);
+					} else {
+						throw new Exception ( "Unexepected input: " + left);
+					}
+				} catch (OverflowException){
+					Error_CompileTimeOverflow (loc);
+				}
+				break;
+
+			case Binary.Operator.Division:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				try {
+					if (left is DoubleConstant){
+						double res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((DoubleConstant) left).Value /
+								       ((DoubleConstant) right).Value);
+						else
+							res = unchecked (((DoubleConstant) left).Value /
+									 ((DoubleConstant) right).Value);
+						
+						return new DoubleConstant (res);
+					} else if (left is FloatConstant){
+						float res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((FloatConstant) left).Value /
+								       ((FloatConstant) right).Value);
+						else
+							res = unchecked (((FloatConstant) left).Value /
+									 ((FloatConstant) right).Value);
+						
+						return new FloatConstant (res);
+					} else if (left is ULongConstant){
+						ulong res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((ULongConstant) left).Value /
+								       ((ULongConstant) right).Value);
+						else
+							res = unchecked (((ULongConstant) left).Value /
+									 ((ULongConstant) right).Value);
+						
+						return new ULongConstant (res);
+					} else if (left is LongConstant){
+						long res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((LongConstant) left).Value /
+								       ((LongConstant) right).Value);
+						else
+							res = unchecked (((LongConstant) left).Value /
+									 ((LongConstant) right).Value);
+						
+						return new LongConstant (res);
+					} else if (left is UIntConstant){
+						uint res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((UIntConstant) left).Value /
+								       ((UIntConstant) right).Value);
+						else
+							res = unchecked (((UIntConstant) left).Value /
+									 ((UIntConstant) right).Value);
+						
+						return new UIntConstant (res);
+					} else if (left is IntConstant){
+						int res;
+
+						if (ec.ConstantCheckState)
+							res = checked (((IntConstant) left).Value /
+								       ((IntConstant) right).Value);
+						else
+							res = unchecked (((IntConstant) left).Value /
+									 ((IntConstant) right).Value);
+
+						return new IntConstant (res);
+					} else {
+						throw new Exception ( "Unexepected input: " + left);
+					}
+				} catch (OverflowException){
+					Error_CompileTimeOverflow (loc);
+
+				} catch (DivideByZeroException) {
+					Report.Error (020, loc, "Division by constant zero");
+				}
+				
+				break;
+				
+			case Binary.Operator.Modulus:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				try {
+					if (left is DoubleConstant){
+						double res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((DoubleConstant) left).Value %
+								       ((DoubleConstant) right).Value);
+						else
+							res = unchecked (((DoubleConstant) left).Value %
+									 ((DoubleConstant) right).Value);
+						
+						return new DoubleConstant (res);
+					} else if (left is FloatConstant){
+						float res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((FloatConstant) left).Value %
+								       ((FloatConstant) right).Value);
+						else
+							res = unchecked (((FloatConstant) left).Value %
+									 ((FloatConstant) right).Value);
+						
+						return new FloatConstant (res);
+					} else if (left is ULongConstant){
+						ulong res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((ULongConstant) left).Value %
+								       ((ULongConstant) right).Value);
+						else
+							res = unchecked (((ULongConstant) left).Value %
+									 ((ULongConstant) right).Value);
+						
+						return new ULongConstant (res);
+					} else if (left is LongConstant){
+						long res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((LongConstant) left).Value %
+								       ((LongConstant) right).Value);
+						else
+							res = unchecked (((LongConstant) left).Value %
+									 ((LongConstant) right).Value);
+						
+						return new LongConstant (res);
+					} else if (left is UIntConstant){
+						uint res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((UIntConstant) left).Value %
+								       ((UIntConstant) right).Value);
+						else
+							res = unchecked (((UIntConstant) left).Value %
+									 ((UIntConstant) right).Value);
+						
+						return new UIntConstant (res);
+					} else if (left is IntConstant){
+						int res;
+
+						if (ec.ConstantCheckState)
+							res = checked (((IntConstant) left).Value %
+								       ((IntConstant) right).Value);
+						else
+							res = unchecked (((IntConstant) left).Value %
+									 ((IntConstant) right).Value);
+
+						return new IntConstant (res);
+					} else {
+						throw new Exception ( "Unexepected input: " + left);
+					}
+				} catch (OverflowException){
+					Error_CompileTimeOverflow (loc);
+				}
+				break;
+
+				//
+				// There is no overflow checking on left shift
+				//
+			case Binary.Operator.LeftShift:
+				IntConstant ic = right.ToInt (loc);
+				if (ic == null){
+					Binary.Error_OperatorCannotBeApplied (loc, "<<", lt, rt);
+					return null;
+				}
+				int lshift_val = ic.Value;
+
+				IntConstant lic;
+				if ((lic = left.ConvertToInt ()) != null)
+					return new IntConstant (lic.Value << lshift_val);
+
+				UIntConstant luic;
+				if ((luic = left.ConvertToUInt ()) != null)
+					return new UIntConstant (luic.Value << lshift_val);
+
+				LongConstant llc;
+				if ((llc = left.ConvertToLong ()) != null)
+					return new LongConstant (llc.Value << lshift_val);
+
+				ULongConstant lulc;
+				if ((lulc = left.ConvertToULong ()) != null)
+					return new ULongConstant (lulc.Value << lshift_val);
+
+				Binary.Error_OperatorCannotBeApplied (loc, "<<", lt, rt);
+				break;
+
+				//
+				// There is no overflow checking on right shift
+				//
+			case Binary.Operator.RightShift:
+				IntConstant sic = right.ToInt (loc);
+				if (sic == null){
+					Binary.Error_OperatorCannotBeApplied (loc, ">>", lt, rt);
+					return null;
+				}
+				int rshift_val = sic.Value;
+
+				IntConstant ric;
+				if ((ric = left.ConvertToInt ()) != null)
+					return new IntConstant (ric.Value >> rshift_val);
+
+				UIntConstant ruic;
+				if ((ruic = left.ConvertToUInt ()) != null)
+					return new UIntConstant (ruic.Value >> rshift_val);
+
+				LongConstant rlc;
+				if ((rlc = left.ConvertToLong ()) != null)
+					return new LongConstant (rlc.Value >> rshift_val);
+
+				ULongConstant rulc;
+				if ((rulc = left.ConvertToULong ()) != null)
+					return new ULongConstant (rulc.Value >> rshift_val);
+
+				Binary.Error_OperatorCannotBeApplied (loc, ">>", lt, rt);
+				break;
+
+			case Binary.Operator.LogicalAnd:
+				if (left is BoolConstant && right is BoolConstant){
+					return new BoolConstant (
+						((BoolConstant) left).Value &&
+						((BoolConstant) right).Value);
+				}
+				break;
+
+			case Binary.Operator.LogicalOr:
+				if (left is BoolConstant && right is BoolConstant){
+					return new BoolConstant (
+						((BoolConstant) left).Value ||
+						((BoolConstant) right).Value);
+				}
+				break;
+				
+			case Binary.Operator.Equality:
+				if (left is BoolConstant && right is BoolConstant){
+					return new BoolConstant (
+						((BoolConstant) left).Value ==
+						((BoolConstant) right).Value);
+				
+				}
+				if (left is StringConstant && right is StringConstant){
+					return new BoolConstant (
+						((StringConstant) left).Value ==
+						((StringConstant) right).Value);
+					
+				}
+				
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value ==
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value ==
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value ==
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value ==
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value ==
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value ==
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+
+			case Binary.Operator.Inequality:
+				if (left is BoolConstant && right is BoolConstant){
+					return new BoolConstant (
+						((BoolConstant) left).Value !=
+						((BoolConstant) right).Value);
+				}
+				if (left is StringConstant && right is StringConstant){
+					return new BoolConstant (
+						((StringConstant) left).Value !=
+						((StringConstant) right).Value);
+					
+				}
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value !=
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value !=
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value !=
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value !=
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value !=
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value !=
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+
+			case Binary.Operator.LessThan:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value <
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value <
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value <
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value <
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value <
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value <
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+				
+			case Binary.Operator.GreaterThan:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value >
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value >
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value >
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value >
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value >
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value >
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+
+			case Binary.Operator.GreaterThanOrEqual:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value >=
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value >=
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value >=
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value >=
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value >=
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value >=
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+
+			case Binary.Operator.LessThanOrEqual:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value <=
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value <=
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value <=
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value <=
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value <=
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value <=
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+			}
+					
+			return null;
+		}
+	}
+}
diff --git a/mcs/mbas/class.cs b/mcs/mbas/class.cs
new file mode 100644
index 00000000000..ec947c2e882
--- /dev/null
+++ b/mcs/mbas/class.cs
@@ -0,0 +1,4312 @@
+//
+// class.cs: Class and Struct handlers
+//
+// Authors: Miguel de Icaza (miguel@gnu.org)
+//          Martin Baulig (martin@gnome.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001, 2002 Ximian, Inc (http://www.ximian.com)
+//
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+using System.Diagnostics.SymbolStore;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   This is the base class for structs and classes.  
+	/// </summary>
+	public class TypeContainer : DeclSpace {
+		// Holds a list of classes and structures
+		ArrayList types;
+
+		// Holds the list of properties
+		ArrayList properties;
+
+		// Holds the list of enumerations
+		ArrayList enums;
+
+		// Holds the list of delegates
+		ArrayList delegates;
+		
+		// Holds the list of constructors
+		ArrayList instance_constructors;
+
+		// Holds the list of fields
+		ArrayList fields;
+
+		// Holds a list of fields that have initializers
+		ArrayList initialized_fields;
+
+		// Holds a list of static fields that have initializers
+		ArrayList initialized_static_fields;
+
+		// Holds the list of constants
+		ArrayList constants;
+
+		// Holds the list of
+		ArrayList interfaces;
+
+		// Holds order in which interfaces must be closed
+		ArrayList interface_order;
+		
+		// Holds the methods.
+		ArrayList methods;
+
+		// Holds the events
+		ArrayList events;
+
+		// Holds the indexers
+		ArrayList indexers;
+
+		// Holds the operators
+		ArrayList operators;
+
+		// The emit context for toplevel objects.
+		EmitContext ec;
+		
+		//
+		// Pointers to the default constructor and the default static constructor
+		//
+		Constructor default_constructor;
+		Constructor default_static_constructor;
+
+		//
+		// Whether we have seen a static constructor for this class or not
+		//
+		bool have_static_constructor = false;
+
+		//
+		// Whether we have at least one non-static field
+		//
+		bool have_nonstatic_fields = false;
+		
+		//
+		// This one is computed after we can distinguish interfaces
+		// from classes from the arraylist `type_bases' 
+		//
+		string     base_class_name;
+
+		ArrayList type_bases;
+
+		// Attributes for this type
+		protected Attributes attributes;
+
+		// Information in the case we are an attribute type
+
+		public AttributeTargets Targets = AttributeTargets.All;
+		public bool AllowMultiple = false;
+		public bool Inherited;
+
+		// The interfaces we implement.
+		Type [] ifaces;
+		
+		//
+		// The indexer name for this class
+		//
+		public string IndexerName;
+
+		public TypeContainer (TypeContainer parent, string name, Location l)
+			: base (parent, name, l)
+		{
+			string n;
+			types = new ArrayList ();
+
+			if (parent == null)
+				n = "";
+			else
+				n = parent.Name;
+
+			base_class_name = null;
+			
+			//Console.WriteLine ("New class " + name + " inside " + n);
+		}
+
+		public AdditionResult AddConstant (Const constant)
+		{
+			AdditionResult res;
+			string name = constant.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+			
+			if (constants == null)
+				constants = new ArrayList ();
+
+			constants.Add (constant);
+			DefineName (name, constant);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddEnum (Mono.CSharp.Enum e)
+		{
+			AdditionResult res;
+			string name = e.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			if (enums == null)
+				enums = new ArrayList ();
+
+			enums.Add (e);
+			DefineName (name, e);
+
+			return AdditionResult.Success;
+		}
+		
+		public AdditionResult AddClass (Class c)
+		{
+			AdditionResult res;
+			string name = c.Name;
+
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			DefineName (name, c);
+			types.Add (c);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddStruct (Struct s)
+		{
+			AdditionResult res;
+			string name = s.Name;
+			
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			DefineName (name, s);
+			types.Add (s);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddDelegate (Delegate d)
+		{
+			AdditionResult res;
+			string name = d.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			if (delegates == null)
+				delegates = new ArrayList ();
+			
+			DefineName (name, d);
+			delegates.Add (d);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddMethod (Method method)
+		{
+			string name = method.Name;
+			Object value = defined_names [name];
+			
+			if (value != null && (!(value is Method)))
+				return AdditionResult.NameExists;
+
+			if (name == Basename)
+				return AdditionResult.EnclosingClash;
+
+			if (methods == null)
+				methods = new ArrayList ();
+
+			if (method.Name.IndexOf (".") != -1)
+				methods.Insert (0, method);
+			else 
+				methods.Add (method);
+			
+			if (value != null)
+				DefineName (name, method);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddConstructor (Constructor c)
+		{
+			if (c.Name != Basename) 
+				return AdditionResult.NotAConstructor;
+
+			bool is_static = (c.ModFlags & Modifiers.STATIC) != 0;
+			
+			if (is_static){
+				have_static_constructor = true;
+				if (default_static_constructor != null){
+					Console.WriteLine ("I have a static constructor already");
+					Console.WriteLine ("   " + default_static_constructor);
+					return AdditionResult.MethodExists;
+				}
+
+				default_static_constructor = c;
+			} else {
+				if (c.IsDefault ()){
+					if (default_constructor != null)
+						return AdditionResult.MethodExists;
+					default_constructor = c;
+				}
+				
+				if (instance_constructors == null)
+					instance_constructors = new ArrayList ();
+				
+				instance_constructors.Add (c);
+			}
+			
+			return AdditionResult.Success;
+		}
+		
+		public AdditionResult AddInterface (Interface iface)
+		{
+			AdditionResult res;
+			string name = iface.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+			
+			if (interfaces == null)
+				interfaces = new ArrayList ();
+			interfaces.Add (iface);
+			DefineName (name, iface);
+			
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddField (Field field)
+		{
+			AdditionResult res;
+			string name = field.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+			
+			if (fields == null)
+				fields = new ArrayList ();
+			
+			fields.Add (field);
+			
+			if (field.Initializer != null){
+				if ((field.ModFlags & Modifiers.STATIC) != 0){
+					if (initialized_static_fields == null)
+						initialized_static_fields = new ArrayList ();
+
+					initialized_static_fields.Add (field);
+
+					//
+					// We have not seen a static constructor,
+					// but we will provide static initialization of fields
+					//
+					have_static_constructor = true;
+				} else {
+					if (initialized_fields == null)
+						initialized_fields = new ArrayList ();
+				
+					initialized_fields.Add (field);
+				}
+			}
+
+			if ((field.ModFlags & Modifiers.STATIC) == 0)
+				have_nonstatic_fields = true;
+
+			DefineName (name, field);
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddProperty (Property prop)
+		{
+			AdditionResult res;
+			string name = prop.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			if (properties == null)
+				properties = new ArrayList ();
+
+			if (prop.Name.IndexOf (".") != -1)
+				properties.Insert (0, prop);
+			else
+				properties.Add (prop);
+			DefineName (name, prop);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddEvent (Event e)
+		{
+			AdditionResult res;
+			string name = e.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			if (events == null)
+				events = new ArrayList ();
+			
+			events.Add (e);
+			DefineName (name, e);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddIndexer (Indexer i)
+		{
+			if (indexers == null)
+				indexers = new ArrayList ();
+
+			if (i.InterfaceType != null)
+				indexers.Insert (0, i);
+			else
+				indexers.Add (i);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddOperator (Operator op)
+		{
+			if (operators == null)
+				operators = new ArrayList ();
+
+			operators.Add (op);
+
+			return AdditionResult.Success;
+		}
+
+		public void RegisterOrder (Interface iface)
+		{
+			if (interface_order == null)
+				interface_order = new ArrayList ();
+
+			interface_order.Add (iface);
+		}
+		
+		public ArrayList Types {
+			get {
+				return types;
+			}
+		}
+
+		public ArrayList Methods {
+			get {
+				return methods;
+			}
+		}
+
+		public ArrayList Constants {
+			get {
+				return constants;
+			}
+		}
+
+		public ArrayList Interfaces {
+			get {
+				return interfaces;
+			}
+		}
+		
+		public string Base {
+			get {
+				return base_class_name;
+			}
+		}
+		
+		public ArrayList Bases {
+			get {
+				return type_bases;
+			}
+
+			set {
+				type_bases = value;
+			}
+		}
+
+		public ArrayList Fields {
+			get {
+				return fields;
+			}
+
+			set {
+				fields = value;
+			}
+		}
+
+		public ArrayList InstanceConstructors {
+			get {
+				return instance_constructors;
+			}
+		}
+
+		public ArrayList Properties {
+			get {
+				return properties;
+			}
+		}
+
+		public ArrayList Events {
+			get {
+				return events;
+			}
+		}
+		
+		public ArrayList Enums {
+			get {
+				return enums;
+			}
+		}
+
+		public ArrayList Indexers {
+			get {
+				return indexers;
+			}
+		}
+
+		public ArrayList Operators {
+			get {
+				return operators;
+			}
+		}
+
+		public ArrayList Delegates {
+			get {
+				return delegates;
+			}
+		}
+		
+		public Attributes OptAttributes {
+			get {
+				return attributes;
+			}
+		}
+		
+		public bool HaveStaticConstructor {
+			get {
+				return have_static_constructor;
+			}
+		}
+		
+		public virtual TypeAttributes TypeAttr {
+			get {
+				return Modifiers.TypeAttr (ModFlags, this);
+			}
+		}
+
+		//
+		// Emits the instance field initializers
+		//
+		public bool EmitFieldInitializers (EmitContext ec)
+		{
+			ArrayList fields;
+			ILGenerator ig = ec.ig;
+			Expression instance_expr;
+			
+			if (ec.IsStatic){
+				fields = initialized_static_fields;
+				instance_expr = null;
+			} else {
+				fields = initialized_fields;
+				instance_expr = new This (Location.Null).Resolve (ec);
+			}
+
+			if (fields == null)
+				return true;
+			
+			foreach (Field f in fields){
+				Object init = f.Initializer;
+
+				Expression e;
+				if (init is Expression)
+					e = (Expression) init;
+				else {
+					e = new ArrayCreation (f.Type, "", (ArrayList)init, f.Location);
+				}
+
+				Location l = f.Location;
+				FieldExpr fe = new FieldExpr (f.FieldBuilder, l);
+				fe.InstanceExpression = instance_expr;
+				Expression a = new Assign (fe, e, l);
+
+				a = a.Resolve (ec);
+				if (a == null)
+					return false;
+
+				if (a is ExpressionStatement)
+					((ExpressionStatement) a).EmitStatement (ec);
+				else {
+					throw new Exception ("Assign.Resolve returned a non ExpressionStatement");
+				}
+			}
+			
+			return true;
+		}
+		
+		//
+		// Defines the default constructors
+		//
+		void DefineDefaultConstructor (bool is_static)
+		{
+			Constructor c;
+			int mods = 0;
+
+			c = new Constructor (Basename, Parameters.EmptyReadOnlyParameters,
+					     new ConstructorBaseInitializer (null, new Location (-1)),
+					     new Location (-1));
+			
+			if (is_static)
+				mods = Modifiers.STATIC;
+
+			c.ModFlags = mods;
+
+			AddConstructor (c);
+			
+			c.Block = new Block (null);
+			
+		}
+
+		public void ReportStructInitializedInstanceError ()
+		{
+			string n = TypeBuilder.FullName;
+			
+			foreach (Field f in initialized_fields){
+				Report.Error (
+					573, Location,
+					"`" + n + "." + f.Name + "': can not have " +
+					"instance field initializers in structs");
+			}
+		}
+
+		/// <remarks>
+		///  The pending methods that need to be implemented (interfaces or abstract methods)
+		/// </remarks>
+		public PendingImplementation Pending;
+
+		/// <summary>
+		///   This function computes the Base class and also the
+		///   list of interfaces that the class or struct @c implements.
+		///   
+		///   The return value is an array (might be null) of
+		///   interfaces implemented (as Types).
+		///   
+		///   The @parent argument is set to the parent object or null
+		///   if this is `System.Object'. 
+		/// </summary>
+		Type [] GetClassBases (bool is_class, out Type parent, out bool error)
+		{
+			ArrayList bases = Bases;
+			int count;
+			int start, j, i;
+
+			error = false;
+
+			if (is_class)
+				parent = null;
+			else
+				parent = TypeManager.value_type;
+
+			if (bases == null){
+				if (is_class){
+					if (RootContext.StdLib)
+						parent = TypeManager.object_type;
+					else if (Name != "System.Object")
+						parent = TypeManager.object_type;
+				} else {
+					//
+					// If we are compiling our runtime,
+					// and we are defining ValueType, then our
+					// parent is `System.Object'.
+					//
+					if (!RootContext.StdLib && Name == "System.ValueType")
+						parent = TypeManager.object_type;
+				}
+
+				return null;
+			}
+
+			//
+			// Bases should be null if there are no bases at all
+			//
+			count = bases.Count;
+
+			if (is_class){
+				Expression name = (Expression) bases [0];
+				name = ResolveTypeExpr (name, false, Location);
+
+				if (name == null){
+					error = true;
+					return null;
+				}
+
+				Type first = name.Type;
+
+				if (first.IsClass){
+					parent = first;
+					start = 1;
+				} else {
+					parent = TypeManager.object_type;
+					start = 0;
+				}
+
+				if (!AsAccessible (parent, ModFlags))
+					Report.Error (60, Location,
+						      "Inconsistent accessibility: base class `" +
+						      TypeManager.CSharpName (parent) + "' is less " +
+						      "accessible than class `" +
+						      Name + "'");
+
+			} else {
+				start = 0;
+			}
+
+			Type [] ifaces = new Type [count-start];
+			
+			for (i = start, j = 0; i < count; i++, j++){
+				Expression name = (Expression) bases [i];
+				Expression resolved = ResolveTypeExpr (name, false, Location);
+				bases [i] = resolved;
+				Type t = resolved.Type;
+
+				if (t == null){
+					error = true;
+					return null;
+				}
+
+				if (is_class == false && !t.IsInterface){
+					Report.Error (527, "In Struct `" + Name + "', type `"+
+						      name +"' is not an interface");
+					error = true;
+					return null;
+				}
+				
+				if (t.IsSealed) {
+					string detail = "";
+					
+					if (t.IsValueType)
+						detail = " (a class can not inherit from a struct/enum)";
+							
+					Report.Error (509, "class `"+ Name +
+						      "': Cannot inherit from sealed class `"+
+						      bases [i]+"'"+detail);
+					error = true;
+					return null;
+				}
+
+				if (t.IsClass) {
+					if (parent != null){
+						Report.Error (527, "In Class `" + Name + "', type `"+
+							      name+"' is not an interface");
+						error = true;
+						return null;
+					}
+				}
+
+				for (int x = 0; x < j; x++) {
+					if (t == ifaces [x]) {
+						Report.Error (528, "`" + name + "' is already listed in interface list");
+						error = true;
+						return null;
+					}
+				}
+
+				ifaces [j] = t;
+			}
+
+			return TypeManager.ExpandInterfaces (ifaces);
+		}
+		
+		//
+		// Defines the type in the appropriate ModuleBuilder or TypeBuilder.
+		//
+		public override TypeBuilder DefineType ()
+		{
+			Type parent;
+			bool error;
+			bool is_class;
+
+			if (TypeBuilder != null)
+				return TypeBuilder;
+			
+			if (InTransit)
+				return null;
+			
+			InTransit = true;
+
+			if (this is Class)
+				is_class = true;
+			else
+				is_class = false;
+
+			ec = new EmitContext (this, Mono.CSharp.Location.Null, null, null, ModFlags);
+
+			ifaces = GetClassBases (is_class, out parent, out error); 
+			
+			if (error)
+				return null;
+
+			if (is_class && parent != null){
+				if (parent == TypeManager.enum_type ||
+				    (parent == TypeManager.value_type && RootContext.StdLib) ||
+				    parent == TypeManager.delegate_type ||
+				    parent == TypeManager.array_type){
+					Report.Error (
+						644, Location, "`" + Name + "' cannot inherit from " +
+						"special class `" + TypeManager.CSharpName (parent) + "'");
+					return null;
+				}
+			}
+
+			if (!is_class && TypeManager.value_type == null)
+				throw new Exception ();
+
+			TypeAttributes type_attributes = TypeAttr;
+
+			// if (parent_builder is ModuleBuilder) {
+			if (IsTopLevel){
+				ModuleBuilder builder = CodeGen.ModuleBuilder;
+				
+				//
+				// Structs with no fields need to have a ".size 1"
+				// appended
+				//
+
+				if (!is_class && !have_nonstatic_fields)
+					TypeBuilder = builder.DefineType (Name,
+									  type_attributes,
+									  parent, 
+									  PackingSize.Unspecified, 1);
+				else
+				//
+				// classes or structs with fields
+				//
+					TypeBuilder = builder.DefineType (Name,
+									  type_attributes,
+									  parent,
+									  ifaces);
+			} else {
+				TypeBuilder builder = Parent.TypeBuilder;
+				
+				//
+				// Structs with no fields need to have a ".size 1"
+				// appended
+				//
+				if (!is_class && !have_nonstatic_fields)
+					TypeBuilder = builder.DefineNestedType (Basename,
+										type_attributes,
+										parent, 
+										PackingSize.Unspecified);
+				else {
+					//
+					// classes or structs with fields
+					//
+					TypeBuilder = builder.DefineNestedType (Basename,
+										type_attributes,
+										parent,
+										ifaces);
+				}
+			}
+
+			// add interfaces that were not added at type creation (weird API issue)
+			if (!is_class && !have_nonstatic_fields && (ifaces != null)) {
+				foreach (Type i in ifaces)
+					TypeBuilder.AddInterfaceImplementation (i);
+			}
+			
+			//
+			// Finish the setup for the EmitContext
+			//
+			ec.ContainerType = TypeBuilder;
+
+			TypeManager.AddUserType (Name, TypeBuilder, this, ifaces);
+
+			if ((parent != null) &&
+			    (parent == TypeManager.attribute_type ||
+			     parent.IsSubclassOf (TypeManager.attribute_type))) {
+				RootContext.RegisterAttribute (this);
+				TypeManager.RegisterAttrType (TypeBuilder, this);
+			} else
+				RootContext.RegisterOrder (this); 
+				
+			if (Interfaces != null) {
+				foreach (Interface iface in Interfaces)
+					iface.DefineType ();
+			}
+			
+			if (Types != null) {
+				foreach (TypeContainer tc in Types)
+					tc.DefineType ();
+			}
+
+			if (Delegates != null) {
+				foreach (Delegate d in Delegates)
+					d.DefineType ();
+			}
+
+			if (Enums != null) {
+				foreach (Enum en in Enums)
+					en.DefineType ();
+			}
+
+			InTransit = false;
+			return TypeBuilder;
+		}
+
+
+		/// <summary>
+		///   Defines the MemberCore objects that are in the `list' Arraylist
+		///
+		///   The `defined_names' array contains a list of members defined in
+		///   a base class
+		/// </summary>
+		static ArrayList remove_list = new ArrayList ();
+		void DefineMembers (ArrayList list, MemberInfo [] defined_names)
+		{
+			int idx;
+			
+			remove_list.Clear ();
+
+			foreach (MemberCore mc in list){
+				if (!mc.Define (this)){
+					remove_list.Add (mc);
+					continue;
+				}
+						
+				if (defined_names == null)
+					continue;
+
+				idx = Array.BinarySearch (defined_names, mc.Name, mif_compare);
+				if (idx < 0){
+					if (RootContext.WarningLevel >= 4){
+						if ((mc.ModFlags & Modifiers.NEW) != 0)
+							Warning_KewywordNewNotRequired (mc.Location, mc);
+					}
+					continue;
+				}
+
+				MemberInfo match = defined_names [idx];
+
+				if (match is PropertyInfo && ((mc.ModFlags & Modifiers.OVERRIDE) != 0))
+					continue;
+
+				//
+				// If we are both methods, let the method resolution emit warnings
+				//
+				if (match is MethodBase && mc is MethodCore)
+					continue; 
+				
+				if ((mc.ModFlags & Modifiers.NEW) == 0)
+					Warning_KeywordNewRequired (mc.Location, defined_names [idx]);
+			}
+			
+			foreach (object o in remove_list)
+				list.Remove (o);
+			
+			remove_list.Clear ();
+		}
+
+		//
+		// Defines the indexers, and also verifies that the IndexerNameAttribute in the
+		// class is consisten.  Either it is `Item' or it is the name defined by all the
+		// indexers with the `IndexerName' attribute.
+		//
+		// Turns out that the IndexerNameAttribute is applied to each indexer,
+		// but it is never emitted, instead a DefaultName attribute is attached
+		// to the class.
+		//
+		void DefineIndexers ()
+		{
+			string class_indexer_name = null;
+			
+			foreach (Indexer i in Indexers){
+				string name;
+				
+				i.Define (this);
+
+				name = i.IndexerName;
+
+				if (i.InterfaceType != null)
+					continue;
+
+				if (class_indexer_name == null){
+					class_indexer_name = name;
+					continue;
+				}
+				
+				if (name == class_indexer_name)
+					continue;
+				
+				Report.Error (
+					668, "Two indexers have different names, " +
+					" you should use the same name for all your indexers");
+			}
+			if (class_indexer_name == null)
+				class_indexer_name = "Item";
+			IndexerName = class_indexer_name;
+		}
+
+		static void Report1530 (Location loc)
+		{
+			Report.Error (1530, loc, "Keyword new not allowed for namespace elements");
+		}
+
+		/// <summary>
+		///   Populates our TypeBuilder with fields and methods
+		/// </summary>
+		public override bool Define (TypeContainer parent)
+		{
+			MemberInfo [] defined_names = null;
+
+			if (interface_order != null){
+				foreach (Interface iface in interface_order)
+					if ((iface.ModFlags & Modifiers.NEW) == 0)
+						iface.Define (this);
+					else
+						Report1530 (iface.Location);
+			}
+
+			if (RootContext.WarningLevel > 1){
+				Type ptype;
+
+				//
+				// This code throws an exception in the comparer
+				// I guess the string is not an object?
+				//
+				ptype = TypeBuilder.BaseType;
+				if (ptype != null){
+					defined_names = FindMembers (
+						ptype, MemberTypes.All & ~MemberTypes.Constructor,
+						BindingFlags.Public | BindingFlags.Instance |
+						BindingFlags.Static, null, null);
+
+					Array.Sort (defined_names, mif_compare);
+				}
+			}
+			
+			if (constants != null)
+				DefineMembers (constants, defined_names);
+
+			if (fields != null)
+				DefineMembers (fields, defined_names);
+
+			if (this is Class){
+				if (instance_constructors == null){
+					if (default_constructor == null)
+						DefineDefaultConstructor (false);
+				}
+
+				if (initialized_static_fields != null &&
+				    default_static_constructor == null)
+					DefineDefaultConstructor (true);
+			}
+
+			if (this is Struct){
+				//
+				// Structs can not have initialized instance
+				// fields
+				//
+				if (initialized_static_fields != null &&
+				    default_static_constructor == null)
+					DefineDefaultConstructor (true);
+
+				if (initialized_fields != null)
+					ReportStructInitializedInstanceError ();
+			}
+
+			Pending = PendingImplementation.GetPendingImplementations (this);
+			
+			//
+			// Constructors are not in the defined_names array
+			//
+			if (instance_constructors != null)
+				DefineMembers (instance_constructors, null);
+		
+			if (default_static_constructor != null)
+				default_static_constructor.Define (this);
+			
+			if (methods != null)
+				DefineMembers (methods, defined_names);
+
+			if (properties != null)
+				DefineMembers (properties, defined_names);
+
+			if (events != null)
+				DefineMembers (events, defined_names);
+
+			if (indexers != null) {
+				DefineIndexers ();
+			} else
+				IndexerName = "Item";
+
+			if (operators != null)
+				DefineMembers (operators, null);
+
+			if (enums != null)
+				DefineMembers (enums, defined_names);
+			
+			if (delegates != null)
+				DefineMembers (delegates, defined_names);
+
+			return true;
+		}
+
+		/// <summary>
+		///   This function is based by a delegate to the FindMembers routine
+		/// </summary>
+		static bool AlwaysAccept (MemberInfo m, object filterCriteria)
+		{
+			return true;
+		}
+
+		/// <summary>
+		///   This filter is used by FindMembers, and we just keep
+		///   a global for the filter to `AlwaysAccept'
+		/// </summary>
+		static MemberFilter accepting_filter;
+
+		
+		/// <summary>
+		///   A member comparission method based on name only
+		/// </summary>
+		static IComparer mif_compare;
+
+		static TypeContainer ()
+		{
+			accepting_filter = new MemberFilter (AlwaysAccept);
+			mif_compare = new MemberInfoCompare ();
+		}
+		
+		/// <summary>
+		///   This method returns the members of this type just like Type.FindMembers would
+		///   Only, we need to use this for types which are _being_ defined because MS' 
+		///   implementation can't take care of that.
+		/// </summary>
+		//
+		// FIXME: return an empty static array instead of null, that cleans up
+		// some code and is consistent with some coding conventions I just found
+		// out existed ;-)
+		//
+		//
+		// Notice that in various cases we check if our field is non-null,
+		// something that would normally mean that there was a bug elsewhere.
+		//
+		// The problem happens while we are defining p-invoke methods, as those
+		// will trigger a FindMembers, but this happens before things are defined
+		//
+		// Since the whole process is a no-op, it is fine to check for null here.
+		//
+		public MemberInfo [] FindMembers (MemberTypes mt, BindingFlags bf,
+						  MemberFilter filter, object criteria)
+		{
+			ArrayList members = new ArrayList ();
+			bool priv = (bf & BindingFlags.NonPublic) != 0;
+
+			if (filter == null)
+				filter = accepting_filter; 
+
+			if ((mt & MemberTypes.Field) != 0) {
+				if (fields != null) {
+					foreach (Field f in fields) {
+						if ((f.ModFlags & Modifiers.PRIVATE) != 0)
+							if (!priv)
+								continue;
+
+						FieldBuilder fb = f.FieldBuilder;
+						if (fb != null && filter (fb, criteria) == true)
+							members.Add (fb);
+					}
+				}
+
+				if (constants != null) {
+					foreach (Const con in constants) {
+						if ((con.ModFlags & Modifiers.PRIVATE) != 0)
+							if (!priv)
+								continue;
+						
+						FieldBuilder fb = con.FieldBuilder;
+						if (fb != null && filter (fb, criteria) == true)
+							members.Add (fb);
+					}
+				}
+			}
+
+			if ((mt & MemberTypes.Method) != 0) {
+				if (methods != null) {
+					foreach (Method m in methods) {
+						if ((m.ModFlags & Modifiers.PRIVATE) != 0)
+							if (!priv)
+								continue;
+						
+						MethodBuilder mb = m.MethodBuilder;
+
+						if (mb != null && filter (mb, criteria) == true)
+							members.Add (mb);
+					}
+				}
+
+				if (operators != null){
+					foreach (Operator o in operators) {
+						if ((o.ModFlags & Modifiers.PRIVATE) != 0)
+							if (!priv)
+								continue;
+						
+						MethodBuilder ob = o.OperatorMethodBuilder;
+						if (ob != null && filter (ob, criteria) == true)
+							members.Add (ob);
+					}
+				}
+
+				if (properties != null){
+					foreach (Property p in properties){
+						if ((p.ModFlags & Modifiers.PRIVATE) != 0)
+							if (!priv)
+								continue;
+						
+						MethodBuilder b;
+
+						b = p.GetBuilder;
+						if (b != null && filter (b, criteria) == true)
+							members.Add (b);
+
+						b = p.SetBuilder;
+						if (b != null && filter (b, criteria) == true)
+							members.Add (b);
+					}
+				}
+			}
+
+			if ((mt & MemberTypes.Event) != 0) {
+				if (events != null)
+				        foreach (Event e in events) {
+						if ((e.ModFlags & Modifiers.PRIVATE) != 0)
+							if (!priv)
+								continue;
+
+						MemberInfo eb = e.EventBuilder;
+						if (eb != null && filter (eb, criteria) == true)
+						        members.Add (e.EventBuilder);
+					}
+			}
+			
+			if ((mt & MemberTypes.Property) != 0){
+				if (properties != null)
+					foreach (Property p in properties) {
+						if ((p.ModFlags & Modifiers.PRIVATE) != 0)
+							if (!priv)
+								continue;
+
+						MemberInfo pb = p.PropertyBuilder;
+						if (pb != null && filter (pb, criteria) == true) {
+							members.Add (p.PropertyBuilder);
+						}
+					}
+
+				if (indexers != null)
+					foreach (Indexer ix in indexers) {
+						if ((ix.ModFlags & Modifiers.PRIVATE) != 0)
+							if (!priv)
+								continue;
+
+						MemberInfo ib = ix.PropertyBuilder;
+						if (ib != null && filter (ib, criteria) == true) {
+							members.Add (ix.PropertyBuilder);
+						}
+					}
+			}
+			
+			if ((mt & MemberTypes.NestedType) != 0) {
+				if (types != null){
+					foreach (TypeContainer t in types) {
+						TypeBuilder tb = t.TypeBuilder;
+
+						if (tb != null && (filter (tb, criteria) == true))
+								members.Add (tb);
+					}
+				}
+
+				if (enums != null){
+					foreach (Enum en in enums){
+						TypeBuilder tb = en.TypeBuilder;
+
+						if (tb != null && (filter (tb, criteria) == true))
+							members.Add (tb);
+					}
+				}
+				
+				if (delegates != null){
+					foreach (Delegate d in delegates){
+						TypeBuilder tb = d.TypeBuilder;
+						
+						if (tb != null && (filter (tb, criteria) == true))
+							members.Add (tb);
+					}
+				}
+			}
+
+			if ((mt & MemberTypes.Constructor) != 0){
+				if (instance_constructors != null){
+					foreach (Constructor c in instance_constructors){
+						ConstructorBuilder cb = c.ConstructorBuilder;
+
+						if (cb != null)
+							if (filter (cb, criteria) == true)
+								members.Add (cb);
+					}
+				}
+
+				if (default_static_constructor != null){
+					ConstructorBuilder cb =
+						default_static_constructor.ConstructorBuilder;
+					
+					if (cb != null)
+					if (filter (cb, criteria) == true)
+						members.Add (cb);
+				}
+			}
+
+			//
+			// Lookup members in parent if requested.
+			//
+			if (((bf & BindingFlags.DeclaredOnly) == 0) && (TypeBuilder.BaseType != null)) {
+				MemberInfo [] mi;
+
+				mi = FindMembers (TypeBuilder.BaseType, mt, bf, filter, criteria);
+				if (mi != null)
+					members.AddRange (mi);
+			}
+			
+			int count = members.Count;
+			if (count > 0){
+				MemberInfo [] mi = new MemberInfo [count];
+				members.CopyTo (mi);
+				return mi;
+			}
+
+			return null;
+		}
+
+		
+
+		public static MemberInfo [] FindMembers (Type t, MemberTypes mt, BindingFlags bf,
+							 MemberFilter filter, object criteria)
+		{
+			TypeContainer tc = TypeManager.LookupTypeContainer (t);
+
+			if (tc != null)
+				return tc.FindMembers (mt, bf, filter, criteria);
+			else
+				return t.FindMembers (mt, bf, filter, criteria);
+		}
+
+		//
+		// FindMethods will look for methods not only in the type `t', but in
+		// any interfaces implemented by the type.
+		//
+		public static MethodInfo [] FindMethods (Type t, BindingFlags bf,
+							 MemberFilter filter, object criteria)
+		{
+			return null;
+		}
+
+		/// <summary>
+		///   Emits the values for the constants
+		/// </summary>
+		public void EmitConstants ()
+		{
+			if (constants != null)
+				foreach (Const con in constants)
+					con.EmitConstant (this);
+			return;
+		}
+
+		/// <summary>
+		///   Emits the code, this step is performed after all
+		///   the types, enumerations, constructors
+		/// </summary>
+		public void Emit ()
+		{
+			if (instance_constructors != null)
+				foreach (Constructor c in instance_constructors)
+					c.Emit (this);
+
+			if (default_static_constructor != null)
+				default_static_constructor.Emit (this);
+			
+			if (methods != null)
+				foreach (Method m in methods)
+					m.Emit (this);
+
+			if (operators != null)
+				foreach (Operator o in operators)
+					o.Emit (this);
+
+			if (properties != null)
+				foreach (Property p in properties)
+					p.Emit (this);
+
+			if (indexers != null){
+				foreach (Indexer ix in indexers)
+					ix.Emit (this);
+				
+				CustomAttributeBuilder cb = Interface.EmitDefaultMemberAttr (
+					this, IndexerName, ModFlags, Location);
+				TypeBuilder.SetCustomAttribute (cb);
+			}
+			
+			if (fields != null)
+				foreach (Field f in fields)
+					f.Emit (this);
+
+			if (events != null){
+				foreach (Event e in Events)
+					e.Emit (this);
+			}
+
+			if (Pending != null)
+				if (Pending.VerifyPendingMethods ())
+					return;
+			
+			Attribute.ApplyAttributes (ec, TypeBuilder, this, OptAttributes, Location);
+
+			//
+			// Check for internal or private fields that were never assigned
+			//
+			if (fields != null && RootContext.WarningLevel >= 3) {
+				foreach (Field f in fields) {
+					if ((f.ModFlags & Modifiers.PUBLIC) != 0)
+						continue;
+
+					if (f.status == 0){
+						Report.Warning (
+							169, f.Location, "Private field " +
+							MakeName (f.Name) + " is never used");
+						continue;
+					}
+
+					//
+					// Only report 649 on level 4
+					//
+					if (RootContext.WarningLevel < 4)
+						continue;
+
+					if ((f.status & Field.Status.ASSIGNED) != 0)
+						continue;
+
+					Report.Warning (
+						649, f.Location,
+						"Field " + MakeName (f.Name) + " is never assigned " +
+						" to and will always have its default value");
+				}
+			}
+			
+//			if (types != null)
+//				foreach (TypeContainer tc in types)
+//					tc.Emit ();
+		}
+		
+		public override void CloseType ()
+		{
+			try {
+				if (!Created){
+					Created = true;
+					TypeBuilder.CreateType ();
+				}
+			} catch (TypeLoadException){
+				//
+				// This is fine, the code still created the type
+				//
+//				Report.Warning (-20, "Exception while creating class: " + TypeBuilder.Name);
+//				Console.WriteLine (e.Message);
+			} catch {
+				Console.WriteLine ("In type: " + Name);
+				throw;
+			}
+			
+			if (Enums != null)
+				foreach (Enum en in Enums)
+					en.CloseType ();
+
+			if (interface_order != null){
+				foreach (Interface iface in interface_order)
+					iface.CloseType ();
+			}
+			
+			if (Types != null){
+				foreach (TypeContainer tc in Types)
+					if (tc is Struct)
+						tc.CloseType ();
+
+				foreach (TypeContainer tc in Types)
+					if (!(tc is Struct))
+						tc.CloseType ();
+			}
+
+			if (Delegates != null)
+				foreach (Delegate d in Delegates)
+					d.CloseDelegate ();
+		}
+
+		public string MakeName (string n)
+		{
+			return "`" + Name + "." + n + "'";
+		}
+
+		public void Warning_KeywordNewRequired (Location l, MemberInfo mi)
+		{
+			Report.Warning (
+				108, l, "The keyword new is required on " + 
+				MakeName (mi.Name) + " because it hides `" +
+				mi.ReflectedType.Name + "." + mi.Name + "'");
+		}
+
+		public void Warning_KewywordNewNotRequired (Location l, MemberCore mc)
+		{
+			Report.Warning (
+				109, l, "The member " + MakeName (mc.Name) + " does not hide an " +
+				"inherited member, the keyword new is not required");
+		}
+		
+		public static int CheckMember (string name, MemberInfo mi, int ModFlags)
+		{
+			return 0;
+		}
+
+		//
+		// Performs the validation on a Method's modifiers (properties have
+		// the same properties).
+		//
+		public bool MethodModifiersValid (int flags, string n, Location loc)
+		{
+			const int vao = (Modifiers.VIRTUAL | Modifiers.ABSTRACT | Modifiers.OVERRIDE);
+			const int va = (Modifiers.VIRTUAL | Modifiers.ABSTRACT);
+			const int nv = (Modifiers.NEW | Modifiers.VIRTUAL);
+			bool ok = true;
+			string name = MakeName (n);
+			
+			//
+			// At most one of static, virtual or override
+			//
+			if ((flags & Modifiers.STATIC) != 0){
+				if ((flags & vao) != 0){
+					Report.Error (
+						112, loc, "static method " + name + "can not be marked " +
+						"as virtual, abstract or override");
+					ok = false;
+				}
+			}
+
+			if (this is Struct){
+				if ((flags & va) != 0){
+					Modifiers.Error_InvalidModifier (loc, "virtual or abstract");
+					ok = false;
+				}
+			}
+
+			if ((flags & Modifiers.OVERRIDE) != 0 && (flags & nv) != 0){
+				Report.Error (
+					113, loc, name +
+					" marked as override cannot be marked as new or virtual");
+				ok = false;
+			}
+
+			//
+			// If the declaration includes the abstract modifier, then the
+			// declaration does not include static, virtual or extern
+			//
+			if ((flags & Modifiers.ABSTRACT) != 0){
+				if ((flags & Modifiers.EXTERN) != 0){
+					Report.Error (
+						180, loc, name + " can not be both abstract and extern");
+					ok = false;
+				}
+
+				if ((flags & Modifiers.VIRTUAL) != 0){
+					Report.Error (
+						503, loc, name + " can not be both abstract and virtual");
+					ok = false;
+				}
+
+				if ((ModFlags & Modifiers.ABSTRACT) == 0){
+					Report.Error (
+						513, loc, name +
+						" is abstract but its container class is not");
+					ok = false;
+
+				}
+			}
+
+			if ((flags & Modifiers.PRIVATE) != 0){
+				if ((flags & vao) != 0){
+					Report.Error (
+						621, loc, name +
+						" virtual or abstract members can not be private");
+					ok = false;
+				}
+			}
+
+			if ((flags & Modifiers.SEALED) != 0){
+				if ((flags & Modifiers.OVERRIDE) == 0){
+					Report.Error (
+						238, loc, name +
+						" cannot be sealed because it is not an override");
+					ok = false;
+				}
+			}
+
+			return ok;
+		}
+
+		// Access level of a type.
+		enum AccessLevel {
+			Public			= 0,
+			ProtectedInternal	= 1,
+			Internal		= 2,
+			Protected		= 3,
+			Private			= 4
+		}
+
+		// Check whether `flags' denotes a more restricted access than `level'
+		// and return the new level.
+		static AccessLevel CheckAccessLevel (AccessLevel level, int flags)
+		{
+			AccessLevel old_level = level;
+
+			if ((flags & Modifiers.INTERNAL) != 0) {
+				if ((flags & Modifiers.PROTECTED) != 0) {
+					if ((int) level < (int) AccessLevel.ProtectedInternal)
+						level = AccessLevel.ProtectedInternal;
+				} else {
+					if ((int) level < (int) AccessLevel.Internal)
+						level = AccessLevel.Internal;
+				}
+			} else if ((flags & Modifiers.PROTECTED) != 0) {
+				if ((int) level < (int) AccessLevel.Protected)
+					level = AccessLevel.Protected;
+			} else if ((flags & Modifiers.PRIVATE) != 0)
+				level = AccessLevel.Private;
+
+			return level;
+		}
+
+		// Return the access level for a new member which is defined in the current
+		// TypeContainer with access modifiers `flags'.
+		AccessLevel GetAccessLevel (int flags)
+		{
+			if ((flags & Modifiers.PRIVATE) != 0)
+				return AccessLevel.Private;
+
+			AccessLevel level;
+			if (!IsTopLevel && (Parent != null))
+				level = Parent.GetAccessLevel (flags);
+			else
+				level = AccessLevel.Public;
+
+			return CheckAccessLevel (CheckAccessLevel (level, flags), ModFlags);
+		}
+
+		// Return the access level for type `t', but don't give more access than `flags'.
+		static AccessLevel GetAccessLevel (Type t, int flags)
+		{
+			if (((flags & Modifiers.PRIVATE) != 0) || t.IsNestedPrivate)
+				return AccessLevel.Private;
+
+			AccessLevel level;
+			if (TypeManager.IsBuiltinType (t))
+				return AccessLevel.Public;
+			else if ((t.DeclaringType != null) && (t != t.DeclaringType))
+				level = GetAccessLevel (t.DeclaringType, flags);
+			else {
+				level = CheckAccessLevel (AccessLevel.Public, flags);
+			}
+
+			if (t.IsNestedPublic)
+				return level;
+
+			if (t.IsNestedAssembly || t.IsNotPublic) {
+				if ((int) level < (int) AccessLevel.Internal)
+					level = AccessLevel.Internal;
+			}
+
+			if (t.IsNestedFamily) {
+				if ((int) level < (int) AccessLevel.Protected)
+					level = AccessLevel.Protected;
+			}
+
+			if (t.IsNestedFamORAssem) {
+				if ((int) level < (int) AccessLevel.ProtectedInternal)
+					level = AccessLevel.ProtectedInternal;
+			}
+
+			return level;
+		}
+
+		//
+		// Returns true if `parent' is as accessible as the flags `flags'
+		// given for this member.
+		//
+		public bool AsAccessible (Type parent, int flags)
+		{
+			while (parent.IsArray || parent.IsPointer || parent.IsByRef)
+				parent = parent.GetElementType ();
+
+			AccessLevel level = GetAccessLevel (flags);
+			AccessLevel level2 = GetAccessLevel (parent, flags);
+
+			return (int) level >= (int) level2;
+		}
+
+		Hashtable builder_and_args;
+		
+		public bool RegisterMethod (MethodBuilder mb, InternalParameters ip, Type [] args)
+		{
+			if (builder_and_args == null)
+				builder_and_args = new Hashtable ();
+			return true;
+		}
+
+		/// <summary>
+		///   Performs checks for an explicit interface implementation.  First it
+		///   checks whether the `interface_type' is a base inteface implementation.
+		///   Then it checks whether `name' exists in the interface type.
+		/// </summary>
+		public bool VerifyImplements (Type interface_type, string full, string name, Location loc)
+		{
+			bool found = false;
+
+			if (ifaces != null){
+				foreach (Type t in ifaces){
+					if (t == interface_type){
+						found = true;
+						break;
+					}
+				}
+			}
+			
+			if (!found){
+				Report.Error (540, "`" + full + "': containing class does not implement interface `" + interface_type.FullName + "'");
+				return false;
+			}
+
+			return true;
+		}
+
+		public static void Error_ExplicitInterfaceNotMemberInterface (Location loc, string name)
+		{
+			Report.Error (539, loc, "Explicit implementation: `" + name + "' is not a member of the interface");
+		}
+	}
+
+	public class Class : TypeContainer {
+		// <summary>
+		//   Modifiers allowed in a class declaration
+		// </summary>
+		public const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.ABSTRACT |
+			Modifiers.SEALED |
+			Modifiers.UNSAFE;
+
+		public Class (TypeContainer parent, string name, int mod, Attributes attrs, Location l)
+			: base (parent, name, l)
+		{
+			int accmods;
+
+			if (parent.Parent == null)
+				accmods = Modifiers.INTERNAL;
+			else
+				accmods = Modifiers.PRIVATE;
+
+			this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, l);
+			this.attributes = attrs;
+		}
+
+		//
+		// FIXME: How do we deal with the user specifying a different
+		// layout?
+		//
+		public override TypeAttributes TypeAttr {
+			get {
+				return base.TypeAttr | TypeAttributes.AutoLayout | TypeAttributes.Class;
+			}
+		}
+	}
+
+	public class Struct : TypeContainer {
+		// <summary>
+		//   Modifiers allowed in a struct declaration
+		// </summary>
+		public const int AllowedModifiers =
+			Modifiers.NEW       |
+			Modifiers.PUBLIC    |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL  |
+			Modifiers.UNSAFE    |
+			Modifiers.PRIVATE;
+
+		public Struct (TypeContainer parent, string name, int mod, Attributes attrs, Location l)
+			: base (parent, name, l)
+		{
+			int accmods;
+			
+			if (parent.Parent == null)
+				accmods = Modifiers.INTERNAL;
+			else
+				accmods = Modifiers.PRIVATE;
+			
+			this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, l);
+
+			this.ModFlags |= Modifiers.SEALED;
+			this.attributes = attrs;
+			
+		}
+
+		//
+		// FIXME: Allow the user to specify a different set of attributes
+		// in some cases (Sealed for example is mandatory for a class,
+		// but what SequentialLayout can be changed
+		//
+		public override TypeAttributes TypeAttr {
+			get {
+				return base.TypeAttr |
+					TypeAttributes.SequentialLayout |
+					TypeAttributes.Sealed |
+					TypeAttributes.BeforeFieldInit;
+			}
+		}
+	}
+
+	public abstract class MethodCore : MemberBase {
+		public readonly Parameters Parameters;
+		Block block;
+		
+		//
+		// Parameters, cached for semantic analysis.
+		//
+		protected InternalParameters parameter_info;
+		protected Type [] parameter_types;
+
+		public MethodCore (Expression type, int mod, int allowed_mod, string name,
+				   Attributes attrs, Parameters parameters, Location loc)
+			: base (type, mod, allowed_mod, name, attrs, loc)
+		{
+			Parameters = parameters;
+		}
+		
+		//
+		//  Returns the System.Type array for the parameters of this method
+		//
+		public Type [] ParameterTypes {
+			get {
+				return parameter_types;
+			}
+		}
+
+		public InternalParameters ParameterInfo
+		{
+			get {
+				return parameter_info;
+			}
+		}
+		
+		public Block Block {
+			get {
+				return block;
+			}
+
+			set {
+				block = value;
+			}
+		}
+
+		protected virtual bool DoDefineParameters (TypeContainer parent)
+		{
+			// Check if arguments were correct
+			parameter_types = Parameters.GetParameterInfo (parent);
+			if ((parameter_types == null) || !CheckParameters (parent, parameter_types))
+				return false;
+
+			parameter_info = new InternalParameters (parent, Parameters);
+
+			return true;
+		}
+
+		public CallingConventions GetCallingConvention (bool is_class)
+		{
+			CallingConventions cc = 0;
+			
+			cc = Parameters.GetCallingConvention ();
+
+			if (is_class)
+				if ((ModFlags & Modifiers.STATIC) == 0)
+					cc |= CallingConventions.HasThis;
+
+			// FIXME: How is `ExplicitThis' used in C#?
+			
+			return cc;
+		}
+
+		public void LabelParameters (EmitContext ec, Type [] parameters, MethodBase builder)
+		{
+			//
+			// Define each type attribute (in/out/ref) and
+			// the argument names.
+			//
+			Parameter [] p = Parameters.FixedParameters;
+			int i = 0;
+			
+			MethodBuilder mb = null;
+			ConstructorBuilder cb = null;
+
+			if (builder is MethodBuilder)
+				mb = (MethodBuilder) builder;
+			else
+				cb = (ConstructorBuilder) builder;
+
+			if (p != null){
+				for (i = 0; i < p.Length; i++) {
+					ParameterBuilder pb;
+					
+					if (mb == null)
+						pb = cb.DefineParameter (
+							i + 1, p [i].Attributes, p [i].Name);
+					else 
+						pb = mb.DefineParameter (
+							i + 1, p [i].Attributes, p [i].Name);
+					
+					Attributes attr = p [i].OptAttributes;
+					if (attr != null)
+						Attribute.ApplyAttributes (ec, pb, pb, attr, Location);
+				}
+			}
+
+			if (Parameters.ArrayParameter != null){
+				ParameterBuilder pb;
+				Parameter array_param = Parameters.ArrayParameter;
+				
+				if (mb == null)
+					pb = cb.DefineParameter (
+						i + 1, array_param.Attributes,
+						array_param.Name);
+				else
+					pb = mb.DefineParameter (
+						i + 1, array_param.Attributes,
+						array_param.Name);
+					
+				CustomAttributeBuilder a = new CustomAttributeBuilder (
+					TypeManager.cons_param_array_attribute, new object [0]);
+				
+				pb.SetCustomAttribute (a);
+			}
+		}
+	}
+	
+	public class Method : MethodCore {
+		public MethodBuilder MethodBuilder;
+		public MethodData MethodData;
+
+		/// <summary>
+		///   Modifiers allowed in a class declaration
+		/// </summary>
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.STATIC |
+			Modifiers.VIRTUAL |
+			Modifiers.SEALED |
+			Modifiers.OVERRIDE |
+			Modifiers.ABSTRACT |
+		        Modifiers.UNSAFE |
+			Modifiers.EXTERN;
+
+		//
+		// return_type can be "null" for VOID values.
+		//
+		public Method (Expression return_type, int mod, string name, Parameters parameters,
+			       Attributes attrs, Location l)
+			: base (return_type, mod, AllowedModifiers, name, attrs, parameters, l)
+		{ }
+
+		//
+		// Returns the `System.Type' for the ReturnType of this
+		// function.  Provides a nice cache.  (used between semantic analysis
+		// and actual code generation
+		//
+		public Type GetReturnType (TypeContainer parent)
+		{
+			return MemberType;
+		}
+
+		// Whether this is an operator method.
+		public bool IsOperator;
+
+                void DuplicateEntryPoint (MethodInfo b, Location location)
+                {
+                        Report.Error (
+                                17, location,
+                                "Program `" + CodeGen.FileName +
+                                "'  has more than one entry point defined: `" +
+                                TypeManager.CSharpSignature(b) + "'");
+                }
+
+                void Report28 (MethodInfo b)
+                {
+			if (RootContext.WarningLevel < 4) 
+				return;
+				
+                        Report.Warning (
+                                28, Location,
+                                "`" + TypeManager.CSharpSignature(b) +
+                                "' has the wrong signature to be an entry point");
+                }
+
+                public bool IsEntryPoint (MethodBuilder b, InternalParameters pinfo)
+                {
+                        if (b.ReturnType != TypeManager.void_type &&
+                            b.ReturnType != TypeManager.int32_type)
+                                return false;
+
+                        if (pinfo.Count == 0)
+                                return true;
+
+                        if (pinfo.Count > 1)
+                                return false;
+
+                        Type t = pinfo.ParameterType(0);
+                        if (t.IsArray &&
+                            (t.GetArrayRank() == 1) &&
+                            (t.GetElementType() == TypeManager.string_type) &&
+                            (pinfo.ParameterModifier(0) == Parameter.Modifier.NONE))
+                                return true;
+                        else
+                                return false;
+                }
+
+		//
+		// Checks our base implementation if any
+		//
+		protected override bool CheckBase (TypeContainer parent)
+		{
+			// Check whether arguments were correct.
+			if (!DoDefineParameters (parent))
+				return false;
+
+			MethodSignature ms = new MethodSignature (Name, null, ParameterTypes);
+			if (!IsOperator) {
+				MemberInfo [] mi_this;
+
+				mi_this = TypeContainer.FindMembers (
+					parent.TypeBuilder, MemberTypes.Method,
+					BindingFlags.NonPublic | BindingFlags.Public |
+					BindingFlags.Static | BindingFlags.Instance |
+					BindingFlags.DeclaredOnly,
+					MethodSignature.method_signature_filter, ms);
+
+				if (mi_this != null && mi_this.Length > 0) {
+					Report.Error (111, Location, "Class `" + parent.Name + "' " +
+						      "already defines a member called `" + Name + "' " +
+						      "with the same parameter types");
+					return false;
+				}
+			}
+
+			//
+			// Verify if the parent has a type with the same name, and then
+			// check whether we have to create a new slot for it or not.
+			//
+			Type ptype = parent.TypeBuilder.BaseType;
+
+			// ptype is only null for System.Object while compiling corlib.
+			if (ptype != null){
+				MemberInfo [] mi, mi_static, mi_instance;
+
+				mi_static = TypeContainer.FindMembers (
+					ptype, MemberTypes.Method,
+					BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static,
+					MethodSignature.inheritable_method_signature_filter, ms);
+
+				mi_instance = TypeContainer.FindMembers (
+					ptype, MemberTypes.Method,
+					BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance,
+					MethodSignature.inheritable_method_signature_filter,
+					ms);
+
+				if (mi_instance != null && mi_instance.Length > 0){
+					mi = mi_instance;
+				} else if (mi_static != null && mi_static.Length > 0)
+					mi = mi_static;
+				else
+					mi = null;
+
+				if (mi != null && mi.Length > 0){
+					parent_method = (MethodInfo) mi [0];
+					string name = parent_method.DeclaringType.Name + "." +
+						parent_method.Name;
+
+					if (!CheckMethodAgainstBase (parent, flags, parent_method, name))
+						return false;
+
+					if ((ModFlags & Modifiers.NEW) == 0) {
+						Type parent_ret = TypeManager.TypeToCoreType (
+							parent_method.ReturnType);
+
+						if (parent_ret != MemberType) {
+							Report.Error (
+								508, parent.MakeName (Name) + ": cannot " +
+								"change return type when overriding " +
+								"inherited member " + name);
+							return false;
+						}
+					}
+				} else {
+					if ((ModFlags & Modifiers.NEW) != 0)
+						WarningNotHiding (parent);
+
+					if ((ModFlags & Modifiers.OVERRIDE) != 0){
+						Report.Error (115, Location,
+							      parent.MakeName (Name) +
+							      " no suitable methods found to override");
+					}
+				}
+			} else if ((ModFlags & Modifiers.NEW) != 0)
+				WarningNotHiding (parent);
+
+			return true;
+		}
+
+		//
+		// Creates the type
+		//
+		public override bool Define (TypeContainer parent)
+		{
+			if (!DoDefine (parent))
+				return false;
+
+			if (!CheckBase (parent))
+				return false;
+
+			CallingConventions cc = GetCallingConvention (parent is Class);
+
+			MethodData = new MethodData (this, null, MemberType, ParameterTypes,
+						     ParameterInfo, cc, OptAttributes,
+						     ModFlags, flags, true);
+
+			if (!MethodData.Define (parent))
+				return false;
+
+			MethodBuilder = MethodData.MethodBuilder;
+			
+			//
+			// This is used to track the Entry Point,
+			//
+			if (Name == "Main" &&
+			    ((ModFlags & Modifiers.STATIC) != 0) && 
+			    (RootContext.MainClass == null ||
+			     RootContext.MainClass == parent.TypeBuilder.FullName)){
+                                if (IsEntryPoint (MethodBuilder, ParameterInfo)) {
+                                        if (RootContext.EntryPoint == null) {
+                                                RootContext.EntryPoint = MethodBuilder;
+                                                RootContext.EntryPointLocation = Location;
+                                        } else {
+                                                DuplicateEntryPoint (RootContext.EntryPoint, RootContext.EntryPointLocation);
+                                                DuplicateEntryPoint (MethodBuilder, Location);
+                                        }
+                                } else                                 	
+                               	        Report28(MethodBuilder);
+			}
+
+			return true;
+		}
+
+		//
+		// Emits the code
+		// 
+		public void Emit (TypeContainer parent)
+		{
+			MethodData.Emit (parent, Block, this);
+		}
+	}
+
+	public abstract class ConstructorInitializer {
+		ArrayList argument_list;
+		ConstructorInfo parent_constructor;
+		Location location;
+		
+		public ConstructorInitializer (ArrayList argument_list, Location location)
+		{
+			this.argument_list = argument_list;
+			this.location = location;
+		}
+
+		public ArrayList Arguments {
+			get {
+				return argument_list;
+			}
+		}
+
+		public bool Resolve (EmitContext ec)
+		{
+			Expression parent_constructor_group;
+			Type t;
+			
+			if (argument_list != null){
+				foreach (Argument a in argument_list){
+					if (!a.Resolve (ec, location))
+						return false;
+				}
+			}
+
+			if (this is ConstructorBaseInitializer) {
+				if (ec.ContainerType.BaseType == null)
+					return true;
+
+				t = ec.ContainerType.BaseType;
+				if (ec.ContainerType.IsValueType) {
+					Report.Error (522, location,
+						"structs cannot call base class constructors");
+					return false;
+				}
+			} else
+				t = ec.ContainerType;
+			
+			parent_constructor_group = Expression.MemberLookup (
+				ec, t, ".ctor", 
+				MemberTypes.Constructor,
+				BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+				location);
+			
+			if (parent_constructor_group == null){
+				Report.Error (1501, location,
+				       "Can not find a constructor for this argument list");
+				return false;
+			}
+			
+			parent_constructor = (ConstructorInfo) Invocation.OverloadResolve (ec, 
+				(MethodGroupExpr) parent_constructor_group, argument_list, location);
+			
+			if (parent_constructor == null){
+				Report.Error (1501, location,
+				       "Can not find a constructor for this argument list");
+				return false;
+			}
+			
+			return true;
+		}
+
+		public void Emit (EmitContext ec)
+		{
+			if (parent_constructor != null)
+				ec.ig.Emit (OpCodes.Ldarg_0);
+			if (argument_list != null)
+				Invocation.EmitArguments (ec, null, argument_list);
+			if (parent_constructor != null)
+				ec.ig.Emit (OpCodes.Call, parent_constructor);
+		}
+	}
+
+	public class ConstructorBaseInitializer : ConstructorInitializer {
+		public ConstructorBaseInitializer (ArrayList argument_list, Location l) : base (argument_list, l)
+		{
+		}
+	}
+
+	public class ConstructorThisInitializer : ConstructorInitializer {
+		public ConstructorThisInitializer (ArrayList argument_list, Location l) : base (argument_list, l)
+		{
+		}
+	}
+	
+	public class Constructor : MethodCore {
+		public ConstructorBuilder ConstructorBuilder;
+		public ConstructorInitializer Initializer;
+		new public Attributes OptAttributes;
+
+		// <summary>
+		//   Modifiers allowed for a constructor.
+		// </summary>
+		const int AllowedModifiers =
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.STATIC |
+			Modifiers.UNSAFE |
+			Modifiers.PRIVATE;
+
+		//
+		// The spec claims that static is not permitted, but
+		// my very own code has static constructors.
+		//
+		public Constructor (string name, Parameters args, ConstructorInitializer init, Location l)
+			: base (null, 0, AllowedModifiers, name, null, args, l)
+		{
+			Initializer = init;
+		}
+
+		//
+		// Returns true if this is a default constructor
+		//
+		public bool IsDefault ()
+		{
+			if ((ModFlags & Modifiers.STATIC) != 0)
+				return  (Parameters.FixedParameters == null ? true : Parameters.Empty) &&
+					(Parameters.ArrayParameter == null ? true : Parameters.Empty);
+			
+			else
+				return  (Parameters.FixedParameters == null ? true : Parameters.Empty) &&
+					(Parameters.ArrayParameter == null ? true : Parameters.Empty) &&
+					(Initializer is ConstructorBaseInitializer) &&
+					(Initializer.Arguments == null);
+		}
+
+		//
+		// Creates the ConstructorBuilder
+		//
+		public override bool Define (TypeContainer parent)
+		{
+			MethodAttributes ca = (MethodAttributes.RTSpecialName |
+					       MethodAttributes.SpecialName);
+
+			// Check if arguments were correct.
+			if (!DoDefineParameters (parent))
+				return false;
+
+			if ((ModFlags & Modifiers.STATIC) != 0)
+				ca |= MethodAttributes.Static;
+			else {
+				if (parent is Struct && ParameterTypes.Length == 0){
+					Report.Error (
+						568, Location, 
+						"Structs can not contain explicit parameterless " +
+						"constructors");
+					return false;
+				}
+				ca |= MethodAttributes.Public | MethodAttributes.HideBySig;
+			}
+
+			ConstructorBuilder = parent.TypeBuilder.DefineConstructor (
+				ca, GetCallingConvention (parent is Class), ParameterTypes);
+
+			//
+			// HACK because System.Reflection.Emit is lame
+			//
+			if (!TypeManager.RegisterMethod (ConstructorBuilder, ParameterInfo, ParameterTypes)) {
+				Report.Error (
+					111, Location,
+					"Class `" +parent.Name+ "' already contains a definition with the " +
+					"same return value and parameter types for constructor `" + Name
+					+ "'");
+				return false;
+			}
+
+			return true;
+		}
+
+		//
+		// Emits the code
+		//
+		public void Emit (TypeContainer parent)
+		{
+			ILGenerator ig = ConstructorBuilder.GetILGenerator ();
+			EmitContext ec = new EmitContext (parent, Location, ig, null, ModFlags, true);
+
+			if ((ModFlags & Modifiers.STATIC) == 0){
+				if (parent is Class && Initializer == null)
+					Initializer = new ConstructorBaseInitializer (null, parent.Location);
+
+
+				//
+				// Spec mandates that Initializers will not have
+				// `this' access
+				//
+				ec.IsStatic = true;
+				if (Initializer != null && !Initializer.Resolve (ec))
+					return;
+				ec.IsStatic = false;
+			}
+
+			LabelParameters (ec, ParameterTypes, ConstructorBuilder);
+			
+			//
+			// Classes can have base initializers and instance field initializers.
+			//
+			if (parent is Class){
+				if ((ModFlags & Modifiers.STATIC) == 0)
+					parent.EmitFieldInitializers (ec);
+			}
+			if (Initializer != null)
+				Initializer.Emit (ec);
+			
+			if ((ModFlags & Modifiers.STATIC) != 0)
+				parent.EmitFieldInitializers (ec);
+
+			Attribute.ApplyAttributes (ec, ConstructorBuilder, this, OptAttributes, Location);
+
+			ec.EmitTopBlock (Block, ParameterInfo, Location);
+		}
+	}
+
+	public class MethodData {
+		//
+		// The return type of this method
+		//
+		public readonly Type ReturnType;
+		public readonly Type[] ParameterTypes;
+		public readonly InternalParameters ParameterInfo;
+		public readonly CallingConventions CallingConventions;
+		public readonly Attributes OptAttributes;
+		public readonly Location Location;
+
+		//
+		// Are we implementing an interface ?
+		//
+		public bool IsImplementing = false;
+
+		//
+		// Protected data.
+		//
+		protected MemberBase member;
+		protected int modifiers;
+		protected MethodAttributes flags;
+		protected bool is_method;
+		protected string accessor_name;
+		ArrayList conditionals;
+
+		MethodBuilder builder = null;
+		public MethodBuilder MethodBuilder {
+			get {
+				return builder;
+			}
+		}
+
+		public MethodData (MemberBase member, string name, Type return_type,
+				   Type [] parameter_types, InternalParameters parameters,
+				   CallingConventions cc, Attributes opt_attrs,
+				   int modifiers, MethodAttributes flags, bool is_method)
+		{
+			this.member = member;
+			this.accessor_name = name;
+			this.ReturnType = return_type;
+			this.ParameterTypes = parameter_types;
+			this.ParameterInfo = parameters;
+			this.CallingConventions = cc;
+			this.OptAttributes = opt_attrs;
+			this.modifiers = modifiers;
+			this.flags = flags;
+			this.is_method = is_method;
+			this.Location = member.Location;
+			this.conditionals = new ArrayList ();
+		}
+
+		//
+		// Attributes.
+		//
+		Attribute dllimport_attribute = null;
+		string obsolete = null;
+		bool obsolete_error = false;
+
+		public virtual bool ApplyAttributes (Attributes opt_attrs, bool is_method)
+		{
+			if ((opt_attrs == null) || (opt_attrs.AttributeSections == null))
+				return true;
+
+			foreach (AttributeSection asec in opt_attrs.AttributeSections) {
+				if (asec.Attributes == null)
+					continue;
+					
+				foreach (Attribute a in asec.Attributes) {
+					if (a.Name == "Conditional") {
+						if (!ApplyConditionalAttribute (a))
+							return false;
+					} else if (a.Name == "Obsolete") {
+						if (!ApplyObsoleteAttribute (a))
+							return false;
+					} else if (a.Name.IndexOf ("DllImport") != -1) {
+						if (!is_method) {
+							a.Type = TypeManager.dllimport_type;
+							Attribute.Error_AttributeNotValidForElement (a, Location);
+							return false;
+						}
+						if (!ApplyDllImportAttribute (a))
+							return false;
+					}
+				}
+			}
+
+			return true;
+		}
+
+		//
+		// Applies the `DllImport' attribute to the method.
+		//
+		protected virtual bool ApplyDllImportAttribute (Attribute a)
+		{
+			const int extern_static = Modifiers.EXTERN | Modifiers.STATIC;
+			if ((modifiers & extern_static) != extern_static) {
+				Report.Error (601, Location,
+					      "The DllImport attribute must be specified on a method " +
+					      "marked `static' and `extern'.");
+				return false;
+			}
+
+			flags |= MethodAttributes.PinvokeImpl;
+			dllimport_attribute = a;
+			return true;
+		}
+
+		//
+		// Applies the `Obsolete' attribute to the method.
+		//
+		protected virtual bool ApplyObsoleteAttribute (Attribute a)
+		{
+			if (obsolete != null) {
+				Report.Error (579, Location, "Duplicate `Obsolete' attribute");
+				return false;
+			}
+
+			obsolete = a.Obsolete_GetObsoleteMessage (out obsolete_error);
+			return obsolete != null;
+		}
+
+		//
+		// Applies the `Conditional' attribute to the method.
+		//
+		protected virtual bool ApplyConditionalAttribute (Attribute a)
+		{
+			// The Conditional attribute is only valid on methods.
+			if (!is_method) {
+				Attribute.Error_AttributeNotValidForElement (a, Location);
+				return false;
+			}
+
+			string condition = a.Conditional_GetConditionName ();
+
+			if (condition == null)
+				return false;
+
+			if (ReturnType != TypeManager.void_type) {
+				Report.Error (578, Location,
+					      "Conditional not valid on `" + member.Name + "' " +
+					      "because its return type is not void");
+				return false;
+			}
+
+			if ((modifiers & Modifiers.OVERRIDE) != 0) {
+				Report.Error (243, Location,
+					      "Conditional not valid on `" + member.Name + "' " +
+					      "because it is an override method");
+				return false;
+			}
+
+			if (member.IsExplicitImpl) {
+				Report.Error (577, Location,
+					      "Conditional not valid on `" + member.Name + "' " +
+					      "because it is an explicit interface implementation");
+				return false;
+			}
+
+			if (IsImplementing) {
+				Report.Error (623, Location,
+					      "Conditional not valid on `" + member.Name + "' " +
+					      "because it is an interface method");
+				return false;
+			}
+
+			conditionals.Add (condition);
+
+			return true;
+		}
+
+		//
+		// Checks whether this method should be ignored due to its Conditional attributes.
+		//
+		bool ShouldIgnore (Location loc)
+		{
+			// When we're overriding a virtual method, we implicitly inherit the
+			// Conditional attributes from our parent.
+			if (member.ParentMethod != null) {
+				TypeManager.MethodFlags flags = TypeManager.GetMethodFlags (
+					member.ParentMethod, loc);
+
+				if ((flags & TypeManager.MethodFlags.ShouldIgnore) != 0)
+					return true;
+			}
+
+			foreach (string condition in conditionals)
+				if (RootContext.AllDefines [condition] == null)
+					return true;
+
+			return false;
+		}
+
+		//
+		// Returns the TypeManager.MethodFlags for this method.
+		// This emits an error 619 / warning 618 if the method is obsolete.
+		// In the former case, TypeManager.MethodFlags.IsObsoleteError is returned.
+		//
+		public virtual TypeManager.MethodFlags GetMethodFlags (Location loc)
+		{
+			TypeManager.MethodFlags flags = 0;
+
+			if (obsolete != null) {
+				if (obsolete_error) {
+					Report.Error (619, loc, "Method `" + member.Name +
+						      "' is obsolete: `" + obsolete + "'");
+					return TypeManager.MethodFlags.IsObsoleteError;
+				} else
+					Report.Warning (618, loc, "Method `" + member.Name +
+							"' is obsolete: `" + obsolete + "'");
+
+				flags |= TypeManager.MethodFlags.IsObsolete;
+			}
+
+			if (ShouldIgnore (loc))
+			    flags |= TypeManager.MethodFlags.ShouldIgnore;
+
+			return flags;
+		}
+
+		public virtual bool Define (TypeContainer parent)
+		{
+			MethodInfo implementing = null;
+			string method_name, name, prefix;
+
+			if (OptAttributes != null)
+				if (!ApplyAttributes (OptAttributes, is_method))
+					return false;
+
+			if (member.IsExplicitImpl)
+				prefix = member.InterfaceType.FullName + ".";
+			else
+				prefix = "";
+
+			if (accessor_name != null)
+				name = accessor_name + "_" + member.ShortName;
+			else
+				name = member.ShortName;
+			method_name = prefix + name;
+				
+			if (parent.Pending != null){
+				if (member is Indexer)
+					implementing = parent.Pending.IsInterfaceIndexer (
+						member.InterfaceType, ReturnType, ParameterTypes);
+				else
+					implementing = parent.Pending.IsInterfaceMethod (
+						member.InterfaceType, name, ReturnType, ParameterTypes);
+
+				if (member.InterfaceType != null && implementing == null){
+					TypeContainer.Error_ExplicitInterfaceNotMemberInterface (
+						Location, name);
+					return false;
+				}
+			}
+
+			//
+			// For implicit implementations, make sure we are public, for
+			// explicit implementations, make sure we are private.
+			//
+			if (implementing != null){
+				//
+				// Setting null inside this block will trigger a more
+				// verbose error reporting for missing interface implementations
+				//
+				// The "candidate" function has been flagged already
+				// but it wont get cleared
+				//
+				if (!member.IsExplicitImpl){
+					//
+					// We already catch different accessibility settings
+					// so we just need to check that we are not private
+					//
+					if ((modifiers & Modifiers.PRIVATE) != 0)
+						implementing = null;
+					
+					//
+					// Static is not allowed
+					//
+					if ((modifiers & Modifiers.STATIC) != 0)
+						implementing = null;
+				} else {
+					if ((modifiers & (Modifiers.PUBLIC | Modifiers.ABSTRACT | Modifiers.VIRTUAL)) != 0){
+						Modifiers.Error_InvalidModifier (Location, "public, virtual or abstract");
+						implementing = null;
+					}
+				}
+			}
+			
+			//
+			// If implementing is still valid, set flags
+			//
+			if (implementing != null){
+				//
+				// When implementing interface methods, set NewSlot.
+				//
+				if (implementing.DeclaringType.IsInterface)
+					flags |= MethodAttributes.NewSlot;
+				
+				flags |=
+					MethodAttributes.Virtual |
+					MethodAttributes.HideBySig;
+
+				// Get the method name from the explicit interface.
+				if (member.InterfaceType != null) {
+					name = implementing.Name;
+					method_name = prefix + name;
+				}
+
+				IsImplementing = true;
+			}
+
+			//
+			// Create the MethodBuilder for the method
+			//
+			if ((flags & MethodAttributes.PinvokeImpl) != 0) {
+				if ((modifiers & Modifiers.STATIC) == 0) {
+					Report.Error (601, Location,
+						      "The DllImport attribute must be specified on " +
+						      "a method marked 'static' and 'extern'.");
+					return false;
+				}
+				
+				EmitContext ec = new EmitContext (
+					parent, Location, null, ReturnType, modifiers);
+				
+				builder = dllimport_attribute.DefinePInvokeMethod (
+					ec, parent.TypeBuilder, method_name, flags,
+					ReturnType, ParameterTypes);
+			} else
+				builder = parent.TypeBuilder.DefineMethod (
+					method_name, flags, CallingConventions,
+					ReturnType, ParameterTypes);
+
+			if (builder == null)
+				return false;
+
+			if (IsImplementing) {
+				//
+				// clear the pending implemntation flag
+				//
+				if (member is Indexer) {
+					parent.Pending.ImplementIndexer (
+						member.InterfaceType, builder, ReturnType,
+						ParameterTypes, true);
+				} else
+					parent.Pending.ImplementMethod (
+						member.InterfaceType, name, ReturnType,
+						ParameterTypes, member.IsExplicitImpl);
+
+				if (member.IsExplicitImpl)
+					parent.TypeBuilder.DefineMethodOverride (
+						builder, implementing);
+			}
+
+			if (!TypeManager.RegisterMethod (builder, ParameterInfo, ParameterTypes)) {
+				Report.Error (111, Location,
+					      "Class `" + parent.Name +
+					      "' already contains a definition with the " +
+					      "same return value and parameter types as the " +
+					      "'get' method of property `" + member.Name + "'");
+				return false;
+			}
+
+			TypeManager.AddMethod (builder, this);
+
+			return true;
+		}
+
+		//
+		// Emits the code
+		// 
+		public virtual void Emit (TypeContainer parent, Block block, object kind)
+		{
+			ILGenerator ig;
+			EmitContext ec;
+
+			if ((flags & MethodAttributes.PinvokeImpl) == 0)
+				ig = builder.GetILGenerator ();
+			else
+				ig = null;
+
+			ec = new EmitContext (parent, Location, ig, ReturnType, modifiers);
+
+			if (OptAttributes != null)
+				Attribute.ApplyAttributes (ec, builder, kind, OptAttributes, Location);
+
+			if (member is MethodCore)
+				((MethodCore) member).LabelParameters (ec, ParameterTypes, MethodBuilder);
+
+			//
+			// abstract or extern methods have no bodies
+			//
+			if ((modifiers & (Modifiers.ABSTRACT | Modifiers.EXTERN)) != 0){
+				if (block == null)
+					return;
+
+				//
+				// abstract or extern methods have no bodies.
+				//
+				if ((modifiers & Modifiers.ABSTRACT) != 0)
+					Report.Error (
+						500, Location, "Abstract method `" +
+						TypeManager.CSharpSignature (builder) +
+						"' can not have a body");
+
+				if ((modifiers & Modifiers.EXTERN) != 0)
+					Report.Error (
+						179, Location, "External method `" +
+						TypeManager.CSharpSignature (builder) +
+						"' can not have a body");
+
+				return;
+			}
+
+			//
+			// Methods must have a body unless they're extern or abstract
+			//
+			if (block == null) {
+				Report.Error (
+					501, Location, "Method `" +
+					TypeManager.CSharpSignature (builder) +
+					"' must declare a body since it is not marked " +
+					"abstract or extern");
+				return;
+			}
+
+			//
+			// Handle destructors specially
+			//
+			// FIXME: This code generates buggy code
+			//
+			if (member.Name == "Finalize" && ReturnType == TypeManager.void_type)
+				EmitDestructor (ec, block);
+			else {
+				ISymbolWriter sw = CodeGen.SymbolWriter;
+
+				if ((sw != null) && !Location.IsNull (Location) &&
+				    !Location.IsNull (block.EndLocation)) {
+					Location end = block.EndLocation;
+					MethodToken token = MethodBuilder.GetToken ();
+					sw.OpenMethod (new SymbolToken (token.Token));
+					sw.SetMethodSourceRange (Location.SymbolDocument,
+								 Location.Row, 0,
+								 end.SymbolDocument,
+								 end.Row, 0);
+
+					ec.EmitTopBlock (block, ParameterInfo, Location);
+
+					sw.CloseMethod ();
+				} else
+					ec.EmitTopBlock (block, ParameterInfo, Location);
+			}
+		}
+
+		void EmitDestructor (EmitContext ec, Block block)
+		{
+			ILGenerator ig = ec.ig;
+			
+			Label finish = ig.DefineLabel ();
+			bool old_in_try = ec.InTry;
+			
+			ig.BeginExceptionBlock ();
+			ec.InTry = true;
+			ec.ReturnLabel = finish;
+			ec.HasReturnLabel = true;
+			ec.EmitTopBlock (block, null, Location);
+			ec.InTry = old_in_try;
+			
+			// ig.MarkLabel (finish);
+			bool old_in_finally = ec.InFinally;
+			ec.InFinally = true;
+			ig.BeginFinallyBlock ();
+			
+			if (ec.ContainerType.BaseType != null) {
+				Expression member_lookup = Expression.MemberLookup (
+					ec, ec.ContainerType.BaseType, "Finalize",
+					MemberTypes.Method, Expression.AllBindingFlags, Location);
+
+				if (member_lookup != null){
+					MethodGroupExpr parent_destructor = ((MethodGroupExpr) member_lookup);
+				
+					ig.Emit (OpCodes.Ldarg_0);
+					ig.Emit (OpCodes.Call, (MethodInfo) parent_destructor.Methods [0]);
+				}
+			}
+			ec.InFinally = old_in_finally;
+			
+			ig.EndExceptionBlock ();
+			//ig.MarkLabel (ec.ReturnLabel);
+			ig.Emit (OpCodes.Ret);
+		}
+	}
+
+	abstract public class MemberBase : MemberCore {
+		public Expression Type;
+		public readonly Attributes OptAttributes;
+
+		protected MethodAttributes flags;
+
+		//
+		// The "short" name of this property / indexer / event.  This is the
+		// name without the explicit interface.
+		//
+		public string ShortName;
+
+		//
+		// The type of this property / indexer / event
+		//
+		public Type MemberType;
+
+		//
+		// If true, this is an explicit interface implementation
+		//
+		public bool IsExplicitImpl = false;
+
+		//
+		// The name of the interface we are explicitly implementing
+		//
+		public string ExplicitInterfaceName = null;
+
+		//
+		// If true, the interface type we are explicitly implementing
+		//
+		public Type InterfaceType = null;
+
+		//
+		// The method we're overriding if this is an override method.
+		//
+		protected MethodInfo parent_method = null;
+		public MethodInfo ParentMethod {
+			get {
+				return parent_method;
+			}
+		}
+
+		//
+		// The constructor is only exposed to our children
+		//
+		protected MemberBase (Expression type, int mod, int allowed_mod, string name,
+				      Attributes attrs, Location loc)
+			: base (name, loc)
+		{
+			Type = type;
+			ModFlags = Modifiers.Check (allowed_mod, mod, Modifiers.PRIVATE, loc);
+			OptAttributes = attrs;
+		}
+
+		protected virtual bool CheckBase (TypeContainer parent)
+		{
+			return true;
+		}
+
+		protected virtual bool CheckParameters (TypeContainer parent, Type [] parameters)
+		{
+			bool error = false;
+
+			foreach (Type partype in parameters){
+				if (partype.IsPointer && !UnsafeOK (parent))
+					error = true;
+
+				if (parent.AsAccessible (partype, ModFlags))
+					continue;
+
+				if (this is Indexer)
+					Report.Error (55, Location,
+						      "Inconsistent accessibility: parameter type `" +
+						      TypeManager.CSharpName (partype) + "' is less " +
+						      "accessible than indexer `" + Name + "'");
+				else
+					Report.Error (51, Location,
+						      "Inconsistent accessibility: parameter type `" +
+						      TypeManager.CSharpName (partype) + "' is less " +
+						      "accessible than method `" + Name + "'");
+				error = true;
+			}
+
+			return !error;
+		}
+
+		protected virtual bool DoDefine (TypeContainer parent)
+		{
+			if (Name == null)
+				Name = "this";
+
+			if (!parent.MethodModifiersValid (ModFlags, Name, Location))
+				return false;
+
+			flags = Modifiers.MethodAttr (ModFlags);
+
+			// Lookup Type, verify validity
+			MemberType = parent.ResolveType (Type, false, Location);
+			if (MemberType == null)
+				return false;
+
+			// verify accessibility
+			if (!parent.AsAccessible (MemberType, ModFlags)) {
+				if (this is Property)
+					Report.Error (53, Location,
+						      "Inconsistent accessibility: property type `" +
+						      TypeManager.CSharpName (MemberType) + "' is less " +
+						      "accessible than property `" + Name + "'");
+				else if (this is Indexer)
+					Report.Error (54, Location,
+						      "Inconsistent accessibility: indexer return type `" +
+						      TypeManager.CSharpName (MemberType) + "' is less " +
+						      "accessible than indexer `" + Name + "'");
+				else if (this is Method)
+					Report.Error (50, Location,
+						      "Inconsistent accessibility: return type `" +
+						      TypeManager.CSharpName (MemberType) + "' is less " +
+						      "accessible than method `" + Name + "'");
+				else
+					Report.Error (52, Location,
+						      "Inconsistent accessibility: field type `" +
+						      TypeManager.CSharpName (MemberType) + "' is less " +
+						      "accessible than field `" + Name + "'");
+				return false;
+			}
+
+			if (MemberType.IsPointer && !UnsafeOK (parent))
+				return false;
+			
+			//
+			// Check for explicit interface implementation
+			//
+			if ((ExplicitInterfaceName == null) && (Name.IndexOf (".") != -1)){
+				int pos = Name.LastIndexOf (".");
+
+				ExplicitInterfaceName = Name.Substring (0, pos);
+				ShortName = Name.Substring (pos + 1);
+			} else
+				ShortName = Name;
+
+			if (ExplicitInterfaceName != null) {
+				InterfaceType  = RootContext.LookupType (
+					parent, ExplicitInterfaceName, false, Location);
+				if (InterfaceType == null)
+					return false;
+
+				// Compute the full name that we need to export.
+				Name = InterfaceType.FullName + "." + ShortName;
+				
+				if (!parent.VerifyImplements (InterfaceType, ShortName, Name, Location))
+					return false;
+				
+				IsExplicitImpl = true;
+			} else
+				IsExplicitImpl = false;
+
+			return true;
+		}
+	}
+
+	//
+	// Fields and Events both generate FieldBuilders, we use this to share 
+	// their common bits.  This is also used to flag usage of the field
+	//
+	abstract public class FieldBase : MemberBase {
+		public readonly Object Initializer;
+		public FieldBuilder  FieldBuilder;
+		public Status status;
+
+		[Flags]
+		public enum Status : byte { ASSIGNED = 1, USED = 2 }
+
+		//
+		// The constructor is only exposed to our children
+		//
+		protected FieldBase (Expression type, int mod, int allowed_mod, string name,
+				     object init, Attributes attrs, Location loc)
+			: base (type, mod, allowed_mod, name, attrs, loc)
+		{
+			Initializer = init;
+		}
+	}
+
+	//
+	// The Field class is used to represents class/struct fields during parsing.
+	//
+	public class Field : FieldBase {
+		// <summary>
+		//   Modifiers allowed in a class declaration
+		// </summary>
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.STATIC |
+		        Modifiers.VOLATILE |
+		        Modifiers.UNSAFE |
+			Modifiers.READONLY;
+
+		public Field (Expression type, int mod, string name, Object expr_or_array_init,
+			      Attributes attrs, Location loc)
+			: base (type, mod, AllowedModifiers, name, expr_or_array_init, attrs, loc)
+		{
+		}
+
+		public override bool Define (TypeContainer parent)
+		{
+			Type t = parent.ResolveType (Type, false, Location);
+			
+			if (t == null)
+				return false;
+
+			if (!parent.AsAccessible (t, ModFlags)) {
+				Report.Error (52, Location,
+					      "Inconsistent accessibility: field type `" +
+					      TypeManager.CSharpName (t) + "' is less " +
+					      "accessible than field `" + Name + "'");
+				return false;
+			}
+
+			if (t.IsPointer && !UnsafeOK (parent))
+				return false;
+				
+			if (RootContext.WarningLevel > 1){
+				Type ptype = parent.TypeBuilder.BaseType;
+
+				// ptype is only null for System.Object while compiling corlib.
+				if (ptype != null){
+					MemberInfo [] mi;
+					
+					mi = TypeContainer.FindMembers (
+						ptype, MemberTypes.Method,
+						BindingFlags.Public |
+						BindingFlags.Static | BindingFlags.Instance,
+						System.Type.FilterName, Name);
+				}
+			}
+
+			if ((ModFlags & Modifiers.VOLATILE) != 0){
+				if (!t.IsClass){
+					if (TypeManager.IsEnumType (t))
+						t = TypeManager.EnumToUnderlying (t);
+
+					if (!((t == TypeManager.bool_type) ||
+					      (t == TypeManager.sbyte_type) ||
+					      (t == TypeManager.byte_type) ||
+					      (t == TypeManager.short_type) ||    
+					      (t == TypeManager.ushort_type) ||
+					      (t == TypeManager.int32_type) ||    
+					      (t == TypeManager.uint32_type) ||    
+					      (t == TypeManager.char_type) ||    
+					      (t == TypeManager.float_type))){
+						Report.Error (
+							677, Location, parent.MakeName (Name) +
+							" A volatile field can not be of type `" +
+							TypeManager.CSharpName (t) + "'");
+						return false;
+					}
+				}
+			}
+			
+			FieldBuilder = parent.TypeBuilder.DefineField (
+				Name, t, Modifiers.FieldAttr (ModFlags));
+
+			TypeManager.RegisterFieldBase (FieldBuilder, this);
+			return true;
+		}
+
+		public void Emit (TypeContainer tc)
+		{
+			EmitContext ec = new EmitContext (tc, Location, null,
+							  FieldBuilder.FieldType, ModFlags);
+
+			Attribute.ApplyAttributes (ec, FieldBuilder, this, OptAttributes, Location);
+		}
+	}
+
+	//
+	// `set' and `get' accessors are represented with an Accessor.
+	// 
+	public class Accessor {
+		//
+		// Null if the accessor is empty, or a Block if not
+		//
+		public Block Block;
+		public Attributes OptAttributes;
+		
+		public Accessor (Block b, Attributes attrs)
+		{
+			Block = b;
+			OptAttributes = attrs;
+		}
+	}
+
+	//
+	// Properties and Indexers both generate PropertyBuilders, we use this to share 
+	// their common bits.
+	//
+	abstract public class PropertyBase : MethodCore {
+		public Accessor Get, Set;
+		public PropertyBuilder PropertyBuilder;
+		public MethodBuilder GetBuilder, SetBuilder;
+		public MethodData GetData, SetData;
+
+		protected EmitContext ec;
+
+		public PropertyBase (Expression type, string name, int mod_flags, int allowed_mod,
+				     Parameters parameters, Accessor get_block, Accessor set_block,
+				     Attributes attrs, Location loc)
+			: base (type, mod_flags, allowed_mod, name, attrs, parameters, loc)
+		{
+			Get = get_block;
+			Set = set_block;
+		}
+
+		protected override bool DoDefine (TypeContainer parent)
+		{
+			if (!base.DoDefine (parent))
+				return false;
+
+			ec = new EmitContext (parent, Location, null, MemberType, ModFlags);
+
+			return true;
+		}
+
+		//
+		// Checks our base implementation if any
+		//
+		protected override bool CheckBase (TypeContainer parent)
+		{
+			// Check whether arguments were correct.
+			if (!DoDefineParameters (parent))
+				return false;
+
+			MethodSignature ms = new MethodSignature (Name, null, ParameterTypes);
+			MemberInfo [] props_this;
+
+			props_this = TypeContainer.FindMembers (
+				parent.TypeBuilder, MemberTypes.Property,
+				BindingFlags.NonPublic | BindingFlags.Public |
+				BindingFlags.Static | BindingFlags.Instance |
+				BindingFlags.DeclaredOnly,
+				MethodSignature.method_signature_filter, ms);
+
+			if (props_this != null && props_this.Length > 0) {
+				Report.Error (111, Location, "Class `" + parent.Name + "' " +
+					      "already defines a member called `" + Name + "' " +
+					      "with the same parameter types");
+				return false;
+			}
+
+			//
+			// Find properties with the same name on the base class
+			//
+			MemberInfo [] props;
+			MemberInfo [] props_static = TypeContainer.FindMembers (
+				parent.TypeBuilder.BaseType, MemberTypes.Property,
+				BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static,
+				MethodSignature.inheritable_property_signature_filter, ms);
+
+			MemberInfo [] props_instance = TypeContainer.FindMembers (
+				parent.TypeBuilder.BaseType, MemberTypes.Property,
+				BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance,
+				MethodSignature.inheritable_property_signature_filter,
+				ms);
+
+			//
+			// Find if we have anything
+			//
+			if (props_static != null && props_static.Length > 0)
+				props = props_static;
+			else if (props_instance != null && props_instance.Length > 0)
+				props = props_instance;
+			else
+				props = null;
+
+			//
+			// If we have something on the base.
+			if (props != null && props.Length > 0){
+				PropertyInfo pi = (PropertyInfo) props [0];
+
+				MethodInfo inherited_get = TypeManager.GetPropertyGetter (pi);
+				MethodInfo inherited_set = TypeManager.GetPropertySetter (pi);
+
+				MethodInfo reference = inherited_get == null ?
+					inherited_set : inherited_get;
+				
+				if (reference != null) {
+					string name = reference.DeclaringType.Name + "." + Name;
+
+					if (!CheckMethodAgainstBase (parent, flags, reference, name))
+						return false;
+				}
+
+				if (((ModFlags & Modifiers.NEW) == 0) && (pi.PropertyType != MemberType)) {
+					Report.Error (508, parent.MakeName (Name) + ": cannot " +
+						      "change return type when overriding inherited " +
+						      "member `" + pi.DeclaringType + "." + pi.Name + "'");
+					return false;
+				}
+			} else {
+				if ((ModFlags & Modifiers.NEW) != 0)
+					WarningNotHiding (parent);
+				
+				if ((ModFlags & Modifiers.OVERRIDE) != 0){
+					if (this is Indexer)
+						Report.Error (115, Location,
+							      parent.MakeName (Name) +
+							      " no suitable indexers found to override");
+					else
+						Report.Error (115, Location,
+							      parent.MakeName (Name) +
+							      " no suitable properties found to override");
+					return false;
+				}
+			}
+			return true;
+		}
+
+		public void Emit (TypeContainer tc)
+		{
+			//
+			// The PropertyBuilder can be null for explicit implementations, in that
+			// case, we do not actually emit the ".property", so there is nowhere to
+			// put the attribute
+			//
+			if (PropertyBuilder != null)
+				Attribute.ApplyAttributes (ec, PropertyBuilder, this, OptAttributes, Location);
+
+			if (GetData != null)
+				GetData.Emit (tc, Get.Block, Get);
+
+			if (SetData != null)
+				SetData.Emit (tc, Set.Block, Set);
+		}
+	}
+			
+	public class Property : PropertyBase {
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.STATIC |
+			Modifiers.SEALED |
+			Modifiers.OVERRIDE |
+			Modifiers.ABSTRACT |
+		        Modifiers.UNSAFE |
+			Modifiers.EXTERN |
+			Modifiers.VIRTUAL;
+
+		public Property (Expression type, string name, int mod_flags,
+				 Accessor get_block, Accessor set_block,
+				 Attributes attrs, Location loc)
+			: base (type, name, mod_flags, AllowedModifiers,
+				Parameters.EmptyReadOnlyParameters,
+				get_block, set_block, attrs, loc)
+		{
+		}
+
+		public override bool Define (TypeContainer parent)
+		{
+			if (!DoDefine (parent))
+				return false;
+
+			if (!CheckBase (parent))
+				return false;
+
+			flags |= MethodAttributes.HideBySig | MethodAttributes.SpecialName;
+
+			if (Get != null) {
+				Type [] parameters = TypeManager.NoTypes;
+
+				InternalParameters ip = new InternalParameters (
+					parent, Parameters.EmptyReadOnlyParameters);
+
+				GetData = new MethodData (this, "get", MemberType,
+							  parameters, ip, CallingConventions.Standard,
+							  Get.OptAttributes, ModFlags, flags, false);
+
+				if (!GetData.Define (parent))
+					return false;
+
+				GetBuilder = GetData.MethodBuilder;
+			}
+
+			if (Set != null) {
+				Type [] parameters = new Type [1];
+				parameters [0] = MemberType;
+
+				Parameter [] parms = new Parameter [1];
+				parms [0] = new Parameter (Type, "value", Parameter.Modifier.NONE, null);
+				InternalParameters ip = new InternalParameters (
+					parent, new Parameters (parms, null, Location));
+
+				SetData = new MethodData (this, "set", TypeManager.void_type,
+							  parameters, ip, CallingConventions.Standard,
+							  Set.OptAttributes, ModFlags, flags, false);
+
+				if (!SetData.Define (parent))
+					return false;
+
+				SetBuilder = SetData.MethodBuilder;
+				SetBuilder.DefineParameter (1, ParameterAttributes.None, "value"); 
+			}
+
+			// FIXME - PropertyAttributes.HasDefault ?
+			
+			PropertyAttributes prop_attr =
+			PropertyAttributes.RTSpecialName |
+			PropertyAttributes.SpecialName;
+
+			if (!IsExplicitImpl){
+				PropertyBuilder = parent.TypeBuilder.DefineProperty (
+					Name, prop_attr, MemberType, null);
+				
+				if (Get != null)
+					PropertyBuilder.SetGetMethod (GetBuilder);
+				
+				if (Set != null)
+					PropertyBuilder.SetSetMethod (SetBuilder);
+
+				//
+				// HACK for the reasons exposed above
+				//
+				if (!TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder)) {
+					Report.Error (
+						111, Location,
+						"Class `" + parent.Name +
+						"' already contains a definition for the property `" +
+						Name + "'");
+					return false;
+				}
+			}
+			return true;
+		}
+	}
+
+	/// </summary>
+	///  Gigantic workaround  for lameness in SRE follows :
+	///  This class derives from EventInfo and attempts to basically
+	///  wrap around the EventBuilder so that FindMembers can quickly
+	///  return this in it search for members
+	/// </summary>
+	public class MyEventBuilder : EventInfo {
+		
+		//
+		// We use this to "point" to our Builder which is
+		// not really a MemberInfo
+		//
+		EventBuilder MyBuilder;
+		
+		//
+		// We "catch" and wrap these methods
+		//
+		MethodInfo raise, remove, add;
+
+		EventAttributes attributes;
+		Type declaring_type, reflected_type, event_type;
+		string name;
+
+		public MyEventBuilder (TypeBuilder type_builder, string name, EventAttributes event_attr, Type event_type)
+		{
+			MyBuilder = type_builder.DefineEvent (name, event_attr, event_type);
+
+			// And now store the values in our own fields.
+			
+			declaring_type = type_builder;
+
+			reflected_type = type_builder;
+			
+			attributes = event_attr;
+			this.name = name;
+			this.event_type = event_type;
+		}
+		
+		//
+		// Methods that you have to override.  Note that you only need 
+		// to "implement" the variants that take the argument (those are
+		// the "abstract" methods, the others (GetAddMethod()) are 
+		// regular.
+		//
+		public override MethodInfo GetAddMethod (bool nonPublic)
+		{
+			return add;
+		}
+		
+		public override MethodInfo GetRemoveMethod (bool nonPublic)
+		{
+			return remove;
+		}
+		
+		public override MethodInfo GetRaiseMethod (bool nonPublic)
+		{
+			return raise;
+		}
+		
+		//
+		// These methods make "MyEventInfo" look like a Builder
+		//
+		public void SetRaiseMethod (MethodBuilder raiseMethod)
+		{
+			raise = raiseMethod;
+			MyBuilder.SetRaiseMethod (raiseMethod);
+		}
+
+		public void SetRemoveOnMethod (MethodBuilder removeMethod)
+		{
+			remove = removeMethod;
+			MyBuilder.SetRemoveOnMethod (removeMethod);
+		}
+
+		public void SetAddOnMethod (MethodBuilder addMethod)
+		{
+			add = addMethod;
+			MyBuilder.SetAddOnMethod (addMethod);
+		}
+
+		public void SetCustomAttribute (CustomAttributeBuilder cb)
+		{
+			MyBuilder.SetCustomAttribute (cb);
+		}
+		
+		public override object [] GetCustomAttributes (bool inherit)
+		{
+			// FIXME : There's nothing which can be seemingly done here because
+			// we have no way of getting at the custom attribute objects of the
+			// EventBuilder !
+			return null;
+		}
+
+		public override object [] GetCustomAttributes (Type t, bool inherit)
+		{
+			// FIXME : Same here !
+			return null;
+		}
+
+		public override bool IsDefined (Type t, bool b)
+		{
+			return true;
+		}
+
+		public override EventAttributes Attributes {
+			get {
+				return attributes;
+			}
+		}
+
+		public override string Name {
+			get {
+				return name;
+			}
+		}
+
+		public override Type DeclaringType {
+			get {
+				return declaring_type;
+			}
+		}
+
+		public override Type ReflectedType {
+			get {
+				return reflected_type;
+			}
+		}
+
+		public Type EventType {
+			get {
+				return event_type;
+			}
+		}
+	}
+	
+	public class Event : FieldBase {
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.STATIC |
+			Modifiers.VIRTUAL |
+			Modifiers.SEALED |
+			Modifiers.OVERRIDE |
+			Modifiers.UNSAFE |
+			Modifiers.ABSTRACT;
+
+		public readonly Accessor  Add;
+		public readonly Accessor  Remove;
+		public MyEventBuilder     EventBuilder;
+
+		MethodBuilder AddBuilder, RemoveBuilder;
+		MethodData AddData, RemoveData;
+		
+		public Event (Expression type, string name, Object init, int mod, Accessor add,
+			      Accessor remove, Attributes attrs, Location loc)
+			: base (type, mod, AllowedModifiers, name, init, attrs, loc)
+		{
+			Add = add;
+			Remove = remove;
+		}
+
+		public override bool Define (TypeContainer parent)
+		{
+			EventAttributes e_attr = EventAttributes.RTSpecialName | EventAttributes.SpecialName;
+
+			if (!DoDefine (parent))
+				return false;
+
+			if (!MemberType.IsSubclassOf (TypeManager.delegate_type)) {
+				Report.Error (66, Location, "'" + parent.Name + "." + Name +
+					      "' : event must be of a delegate type");
+				return false;
+			}
+
+			Type [] parameter_types = new Type [1];
+			parameter_types [0] = MemberType;
+
+			Parameter [] parms = new Parameter [1];
+			parms [0] = new Parameter (Type, "value", Parameter.Modifier.NONE, null);
+			InternalParameters ip = new InternalParameters (
+				parent, new Parameters (parms, null, Location)); 
+
+			if (!CheckBase (parent))
+				return false;
+
+			//
+			// Now define the accessors
+			//
+			AddData = new MethodData (this, "add", TypeManager.void_type,
+						  parameter_types, ip, CallingConventions.Standard,
+						  (Add != null) ? Add.OptAttributes : null,
+						  ModFlags, flags, false);
+
+			if (!AddData.Define (parent))
+				return false;
+
+			AddBuilder = AddData.MethodBuilder;
+			AddBuilder.DefineParameter (1, ParameterAttributes.None, "value");
+
+			RemoveData = new MethodData (this, "remove", TypeManager.void_type,
+						     parameter_types, ip, CallingConventions.Standard,
+						     (Remove != null) ? Remove.OptAttributes : null,
+						     ModFlags, flags, false);
+
+			if (!RemoveData.Define (parent))
+				return false;
+
+			RemoveBuilder = RemoveData.MethodBuilder;
+			RemoveBuilder.DefineParameter (1, ParameterAttributes.None, "value");
+
+			if (!IsExplicitImpl){
+				EventBuilder = new MyEventBuilder (
+					parent.TypeBuilder, Name, e_attr, MemberType);
+					
+				if (Add == null && Remove == null) {
+					FieldBuilder = parent.TypeBuilder.DefineField (
+						Name, MemberType, FieldAttributes.FamANDAssem);
+					TypeManager.RegisterPrivateFieldOfEvent (
+						(EventInfo) EventBuilder, FieldBuilder);
+					TypeManager.RegisterFieldBase (FieldBuilder, this);
+				}
+			
+				EventBuilder.SetAddOnMethod (AddBuilder);
+				EventBuilder.SetRemoveOnMethod (RemoveBuilder);
+
+				if (!TypeManager.RegisterEvent (EventBuilder, AddBuilder, RemoveBuilder)) {
+					Report.Error (111, Location,
+						      "Class `" + parent.Name +
+						      "' already contains a definition for the event `" +
+						      Name + "'");
+					return false;
+				}
+			}
+			
+			return true;
+		}
+
+		void EmitDefaultMethod (EmitContext ec, bool is_add)
+		{
+			ILGenerator ig = ec.ig;
+			MethodInfo method = null;
+			
+			if (is_add)
+				method = TypeManager.delegate_combine_delegate_delegate;
+			else
+				method = TypeManager.delegate_remove_delegate_delegate;
+
+			if ((ModFlags & Modifiers.STATIC) != 0) {
+				ig.Emit (OpCodes.Ldsfld, (FieldInfo) FieldBuilder);
+				ig.Emit (OpCodes.Ldarg_0);
+				ig.Emit (OpCodes.Call, method);
+				ig.Emit (OpCodes.Castclass, MemberType);
+				ig.Emit (OpCodes.Stsfld, (FieldInfo) FieldBuilder);
+			} else {
+				ig.Emit (OpCodes.Ldarg_0);
+				ig.Emit (OpCodes.Ldarg_0);
+				ig.Emit (OpCodes.Ldfld, (FieldInfo) FieldBuilder);
+				ig.Emit (OpCodes.Ldarg_1);
+				ig.Emit (OpCodes.Call, method);
+				ig.Emit (OpCodes.Castclass, MemberType);
+				ig.Emit (OpCodes.Stfld, (FieldInfo) FieldBuilder);
+			}
+			ig.Emit (OpCodes.Ret);
+		}
+
+		public void Emit (TypeContainer tc)
+		{
+			EmitContext ec;
+
+			ec = new EmitContext (tc, Location, null, MemberType, ModFlags);
+			Attribute.ApplyAttributes (ec, EventBuilder, this, OptAttributes, Location);
+
+			if (Add != null)
+				AddData.Emit (tc, Add.Block, Add);
+			else {
+				ILGenerator ig = AddData.MethodBuilder.GetILGenerator ();
+				ec = new EmitContext (tc, Location, ig, TypeManager.void_type, ModFlags);
+				EmitDefaultMethod (ec, true);
+			}
+
+			if (Remove != null)
+				RemoveData.Emit (tc, Remove.Block, Remove);
+			else {
+				ILGenerator ig = RemoveData.MethodBuilder.GetILGenerator ();
+				ec = new EmitContext (tc, Location, ig, TypeManager.void_type, ModFlags);
+				EmitDefaultMethod (ec, false);
+			}
+		}
+		
+	}
+
+	//
+	// FIXME: This does not handle:
+	//
+	//   int INTERFACENAME [ args ]
+	//   Does not 
+	//
+	// Only:
+	// 
+	// int this [ args ]
+ 
+	public class Indexer : PropertyBase {
+
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.VIRTUAL |
+			Modifiers.SEALED |
+			Modifiers.OVERRIDE |
+			Modifiers.UNSAFE |
+			Modifiers.EXTERN |
+			Modifiers.ABSTRACT;
+
+		public string IndexerName;
+		public string InterfaceIndexerName;
+
+		//
+		// Are we implementing an interface ?
+		//
+		bool IsImplementing = false;
+		
+		public Indexer (Expression type, string int_type, int flags, Parameters parameters,
+				Accessor get_block, Accessor set_block, Attributes attrs, Location loc)
+			: base (type, "", flags, AllowedModifiers, parameters, get_block, set_block,
+				attrs, loc)
+		{
+			ExplicitInterfaceName = int_type;
+		}
+
+		public override bool Define (TypeContainer parent)
+		{
+			PropertyAttributes prop_attr =
+				PropertyAttributes.RTSpecialName |
+				PropertyAttributes.SpecialName;
+			
+			if (!DoDefine (parent))
+				return false;
+
+			IndexerName = Attribute.ScanForIndexerName (ec, OptAttributes);
+			if (IndexerName == null)
+				IndexerName = "Item";
+			else if (IsExplicitImpl)
+				Report.Error (592, Location,
+					      "Attribute 'IndexerName' is not valid on this declaration " +
+					      "type. It is valid on `property' declarations only.");
+
+			ShortName = IndexerName;
+			if (IsExplicitImpl) {
+				InterfaceIndexerName = TypeManager.IndexerPropertyName (InterfaceType);
+				Name = InterfaceType.FullName + "." + IndexerName;
+			} else {
+				InterfaceIndexerName = IndexerName;
+				Name = ShortName;
+			}
+
+			if (!CheckBase (parent))
+				return false;
+
+			if (Get != null){
+                                InternalParameters ip = new InternalParameters (parent, Parameters);
+
+				GetData = new MethodData (this, "get", MemberType,
+							  ParameterTypes, ip, CallingConventions.Standard,
+							  Get.OptAttributes, ModFlags, flags, false);
+
+				if (!GetData.Define (parent))
+					return false;
+
+				GetBuilder = GetData.MethodBuilder;
+			}
+			
+			if (Set != null){
+				int top = ParameterTypes.Length;
+				Type [] set_pars = new Type [top + 1];
+				ParameterTypes.CopyTo (set_pars, 0);
+				set_pars [top] = MemberType;
+
+				Parameter [] fixed_parms = Parameters.FixedParameters;
+
+				if (fixed_parms == null){
+					throw new Exception ("We currently do not support only array arguments in an indexer");
+					// BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
+					// BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
+					//
+					// Here is the problem: the `value' parameter has
+					// to come *after* the array parameter in the declaration
+					// like this:
+					// X (object [] x, Type value)
+					// .param [0]
+					//
+					// BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
+					// BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
+					
+				}
+				
+				Parameter [] tmp = new Parameter [fixed_parms.Length + 1];
+
+
+				fixed_parms.CopyTo (tmp, 0);
+				tmp [fixed_parms.Length] = new Parameter (
+					Type, "value", Parameter.Modifier.NONE, null);
+
+				Parameters set_formal_params = new Parameters (tmp, null, Location);
+				
+				InternalParameters ip = new InternalParameters (parent, set_formal_params);
+
+				SetData = new MethodData (this, "set", TypeManager.void_type,
+							  set_pars, ip, CallingConventions.Standard,
+							  Set.OptAttributes, ModFlags, flags, false);
+
+				if (!SetData.Define (parent))
+					return false;
+
+				SetBuilder = SetData.MethodBuilder;
+			}
+
+			//
+			// Now name the parameters
+			//
+			Parameter [] p = Parameters.FixedParameters;
+			if (p != null) {
+				int i;
+				
+				for (i = 0; i < p.Length; ++i) {
+					if (Get != null)
+						GetBuilder.DefineParameter (
+							i + 1, p [i].Attributes, p [i].Name);
+
+					if (Set != null)
+						SetBuilder.DefineParameter (
+							i + 1, p [i].Attributes, p [i].Name);
+				}
+
+				if (Set != null)
+					SetBuilder.DefineParameter (
+						i + 1, ParameterAttributes.None, "value");
+					
+				if (i != ParameterTypes.Length) {
+					Parameter array_param = Parameters.ArrayParameter;
+					SetBuilder.DefineParameter (
+						i + 1, array_param.Attributes, array_param.Name);
+				}
+			}
+
+			if (GetData != null)
+				IsImplementing = GetData.IsImplementing;
+			else if (SetData != null)
+				IsImplementing = SetData.IsImplementing;
+
+			//
+			// Define the PropertyBuilder if one of the following conditions are met:
+			// a) we're not implementing an interface indexer.
+			// b) the indexer has a different IndexerName and this is no
+			//    explicit interface implementation.
+			//
+			if (!IsExplicitImpl) {
+				PropertyBuilder = parent.TypeBuilder.DefineProperty (
+					IndexerName, prop_attr, MemberType, ParameterTypes);
+
+				if (GetData != null)
+					PropertyBuilder.SetGetMethod (GetBuilder);
+
+				if (SetData != null)
+					PropertyBuilder.SetSetMethod (SetBuilder);
+				
+				TypeManager.RegisterIndexer (PropertyBuilder, GetBuilder, SetBuilder,
+							     ParameterTypes);
+			}
+
+			return true;
+		}
+	}
+
+	public class Operator : MemberCore {
+
+		const int AllowedModifiers =
+			Modifiers.PUBLIC |
+			Modifiers.UNSAFE |
+			Modifiers.EXTERN |
+			Modifiers.STATIC;
+
+		const int RequiredModifiers =
+			Modifiers.PUBLIC |
+			Modifiers.STATIC;
+
+		public enum OpType : byte {
+
+			// Unary operators
+			LogicalNot,
+			OnesComplement,
+			Increment,
+			Decrement,
+			True,
+			False,
+
+			// Unary and Binary operators
+			Addition,
+			Subtraction,
+
+			UnaryPlus,
+			UnaryNegation,
+			
+			// Binary operators
+			Multiply,
+			Division,
+			Modulus,
+			BitwiseAnd,
+			BitwiseOr,
+			ExclusiveOr,
+			LeftShift,
+			RightShift,
+			Equality,
+			Inequality,
+			GreaterThan,
+			LessThan,
+			GreaterThanOrEqual,
+			LessThanOrEqual,
+
+			// Implicit and Explicit
+			Implicit,
+			Explicit
+		};
+
+		public readonly OpType OperatorType;
+		public readonly Expression ReturnType;
+		public readonly Expression FirstArgType, SecondArgType;
+		public readonly string FirstArgName, SecondArgName;
+		public readonly Block  Block;
+		public Attributes      OptAttributes;
+		public MethodBuilder   OperatorMethodBuilder;
+		
+		public string MethodName;
+		public Method OperatorMethod;
+
+		public Operator (OpType type, Expression ret_type, int flags,
+				 Expression arg1type, string arg1name,
+				 Expression arg2type, string arg2name,
+				 Block block, Attributes attrs, Location loc)
+			: base ("", loc)
+		{
+			OperatorType = type;
+			ReturnType = ret_type;
+			ModFlags = Modifiers.Check (AllowedModifiers, flags, Modifiers.PUBLIC, loc);
+			FirstArgType = arg1type;
+			FirstArgName = arg1name;
+			SecondArgType = arg2type;
+			SecondArgName = arg2name;
+			Block = block;
+			OptAttributes = attrs;
+		}
+
+		string Prototype (TypeContainer parent)
+		{
+			return parent.Name + ".operator " + OperatorType + " (" + FirstArgType + "," +
+				SecondArgType + ")";
+		}
+		
+		public override bool Define (TypeContainer parent)
+		{
+			int length = 1;
+			MethodName = "op_" + OperatorType;
+			
+			if (SecondArgType != null)
+				length = 2;
+			
+			Parameter [] param_list = new Parameter [length];
+
+			if ((ModFlags & RequiredModifiers) != RequiredModifiers){
+				Report.Error (
+					558, Location, 
+					"User defined operators `" +
+					Prototype (parent) +
+					"' must be declared static and public");
+				return false;
+			}
+
+			param_list[0] = new Parameter (FirstArgType, FirstArgName,
+						       Parameter.Modifier.NONE, null);
+			if (SecondArgType != null)
+				param_list[1] = new Parameter (SecondArgType, SecondArgName,
+							       Parameter.Modifier.NONE, null);
+			
+			OperatorMethod = new Method (ReturnType, ModFlags, MethodName,
+						     new Parameters (param_list, null, Location),
+						     OptAttributes, Mono.CSharp.Location.Null);
+
+			OperatorMethod.IsOperator = true;			
+			OperatorMethod.Define (parent);
+
+			if (OperatorMethod.MethodBuilder == null)
+				return false;
+			
+			OperatorMethodBuilder = OperatorMethod.MethodBuilder;
+
+			Type [] param_types = OperatorMethod.ParameterTypes;
+			Type declaring_type = OperatorMethodBuilder.DeclaringType;
+			Type return_type = OperatorMethod.GetReturnType (parent);
+			Type first_arg_type = param_types [0];
+
+			// Rules for conversion operators
+			
+			if (OperatorType == OpType.Implicit || OperatorType == OpType.Explicit) {
+				if (first_arg_type == return_type && first_arg_type == declaring_type){
+					Report.Error (
+						555, Location,
+						"User-defined conversion cannot take an object of the " +
+						"enclosing type and convert to an object of the enclosing" +
+						" type");
+					return false;
+				}
+				
+				if (first_arg_type != declaring_type && return_type != declaring_type){
+					Report.Error (
+						556, Location, 
+						"User-defined conversion must convert to or from the " +
+						"enclosing type");
+					return false;
+				}
+				
+				if (first_arg_type == TypeManager.object_type ||
+				    return_type == TypeManager.object_type){
+					Report.Error (
+						-8, Location,
+						"User-defined conversion cannot convert to or from " +
+						"object type");
+					return false;
+				}
+
+				if (first_arg_type.IsInterface || return_type.IsInterface){
+					Report.Error (
+						552, Location,
+						"User-defined conversion cannot convert to or from an " +
+						"interface type");
+					return false;
+				}
+				
+				if (first_arg_type.IsSubclassOf (return_type) ||
+				    return_type.IsSubclassOf (first_arg_type)){
+					Report.Error (
+						-10, Location,
+						"User-defined conversion cannot convert between types " +
+						"that derive from each other");
+					return false;
+				}
+			} else if (SecondArgType == null) {
+				// Checks for Unary operators
+				
+				if (first_arg_type != declaring_type){
+					Report.Error (
+						562, Location,
+						"The parameter of a unary operator must be the " +
+						"containing type");
+					return false;
+				}
+				
+				if (OperatorType == OpType.Increment || OperatorType == OpType.Decrement) {
+					if (return_type != declaring_type){
+						Report.Error (
+							559, Location,
+							"The parameter and return type for ++ and -- " +
+							"must be the containing type");
+						return false;
+					}
+					
+				}
+				
+				if (OperatorType == OpType.True || OperatorType == OpType.False) {
+					if (return_type != TypeManager.bool_type){
+						Report.Error (
+							215, Location,
+							"The return type of operator True or False " +
+							"must be bool");
+						return false;
+					}
+				}
+				
+			} else {
+				// Checks for Binary operators
+				
+				if (first_arg_type != declaring_type &&
+				    param_types [1] != declaring_type){
+					Report.Error (
+						563, Location,
+						"One of the parameters of a binary operator must " +
+						"be the containing type");
+					return false;
+				}
+			}
+
+			return true;
+		}
+		
+		public void Emit (TypeContainer parent)
+		{
+			EmitContext ec = new EmitContext (parent, Location, null, null, ModFlags);
+			Attribute.ApplyAttributes (ec, OperatorMethodBuilder, this, OptAttributes, Location);
+
+			//
+			// abstract or extern methods have no bodies
+			//
+			if ((ModFlags & (Modifiers.ABSTRACT | Modifiers.EXTERN)) != 0)
+				return;
+			
+			OperatorMethod.Block = Block;
+			OperatorMethod.Emit (parent);
+		}
+	}
+
+	//
+	// This is used to compare method signatures
+	//
+	struct MethodSignature {
+		public string Name;
+		public Type RetType;
+		public Type [] Parameters;
+		
+		/// <summary>
+		///    This delegate is used to extract methods which have the
+		///    same signature as the argument
+		/// </summary>
+		public static MemberFilter method_signature_filter;
+
+		/// <summary>
+		///   This delegate is used to extract inheritable methods which
+		///   have the same signature as the argument.  By inheritable,
+		///   this means that we have permissions to override the method
+		///   from the current assembly and class
+		/// </summary>
+		public static MemberFilter inheritable_method_signature_filter;
+
+		/// <summary>
+		///   This delegate is used to extract inheritable methods which
+		///   have the same signature as the argument.  By inheritable,
+		///   this means that we have permissions to override the method
+		///   from the current assembly and class
+		/// </summary>
+		public static MemberFilter inheritable_property_signature_filter;
+		
+		static MethodSignature ()
+		{
+			method_signature_filter = new MemberFilter (MemberSignatureCompare);
+			inheritable_method_signature_filter = new MemberFilter (
+				InheritableMemberSignatureCompare);
+			inheritable_property_signature_filter = new MemberFilter (
+				InheritablePropertySignatureCompare);
+		}
+		
+		public MethodSignature (string name, Type ret_type, Type [] parameters)
+		{
+			Name = name;
+			RetType = ret_type;
+
+			if (parameters == null)
+				Parameters = TypeManager.NoTypes;
+			else
+				Parameters = parameters;
+		}
+		
+		public override int GetHashCode ()
+		{
+			return Name.GetHashCode ();
+		}
+
+		public override bool Equals (Object o)
+		{
+			MethodSignature other = (MethodSignature) o;
+
+			if (other.Name != Name)
+				return false;
+
+			if (other.RetType != RetType)
+				return false;
+			
+			if (Parameters == null){
+				if (other.Parameters == null)
+					return true;
+				return false;
+			}
+
+			if (other.Parameters == null)
+				return false;
+			
+			int c = Parameters.Length;
+			if (other.Parameters.Length != c)
+				return false;
+
+			for (int i = 0; i < c; i++)
+				if (other.Parameters [i] != Parameters [i])
+					return false;
+
+			return true;
+		}
+
+		static bool MemberSignatureCompare (MemberInfo m, object filter_criteria)
+		{
+			MethodSignature sig = (MethodSignature) filter_criteria;
+
+			if (m.Name != sig.Name)
+				return false;
+
+			Type ReturnType;
+			MethodInfo mi = m as MethodInfo;
+			PropertyInfo pi = m as PropertyInfo;
+
+			if (mi != null)
+				ReturnType = mi.ReturnType;
+			else if (pi != null)
+				ReturnType = pi.PropertyType;
+			else
+				return false;
+			
+			//
+			// we use sig.RetType == null to mean `do not check the
+			// method return value.  
+			//
+			if (sig.RetType != null)
+				if (ReturnType != sig.RetType)
+					return false;
+
+			Type [] args;
+			if (mi != null)
+				args = TypeManager.GetArgumentTypes (mi);
+			else
+				args = TypeManager.GetArgumentTypes (pi);
+			Type [] sigp = sig.Parameters;
+
+			if (args.Length != sigp.Length)
+				return false;
+
+			for (int i = args.Length; i > 0; ){
+				i--;
+				if (args [i] != sigp [i])
+					return false;
+			}
+			return true;
+		}
+
+		//
+		// This filter should be used when we are requesting methods that
+		// we want to override.
+		//
+		// This makes a number of assumptions, for example
+		// that the methods being extracted are of a parent
+		// class (this means we know implicitly that we are
+		// being called to find out about members by a derived
+		// class).
+		// 
+		static bool InheritableMemberSignatureCompare (MemberInfo m, object filter_criteria)
+		{
+		        if (MemberSignatureCompare (m, filter_criteria)){
+				MethodInfo mi = (MethodInfo) m;
+				MethodAttributes prot = mi.Attributes & MethodAttributes.MemberAccessMask;
+
+				// If only accessible to the current class.
+				if (prot == MethodAttributes.Private)
+					return false;
+
+				// If only accessible to the defining assembly or 
+				if (prot == MethodAttributes.FamANDAssem ||
+				    prot == MethodAttributes.Assembly){
+					if (m.DeclaringType.Assembly == CodeGen.AssemblyBuilder)
+						return true;
+					else
+						return false;
+				}
+
+				// Anything else (FamOrAssembly and Public) is fine
+				return true;
+			}
+			return false;
+		}
+
+		//
+		// This filter should be used when we are requesting properties that
+		// we want to override.
+		//
+		// This makes a number of assumptions, for example
+		// that the methods being extracted are of a parent
+		// class (this means we know implicitly that we are
+		// being called to find out about members by a derived
+		// class).
+		// 
+		static bool InheritablePropertySignatureCompare (MemberInfo m, object filter_criteria)
+		{
+		        if (MemberSignatureCompare (m, filter_criteria)){
+				PropertyInfo pi = (PropertyInfo) m;
+
+				MethodInfo inherited_get = TypeManager.GetPropertyGetter (pi);
+				MethodInfo inherited_set = TypeManager.GetPropertySetter (pi);
+
+				MethodInfo mi = inherited_get == null ? inherited_set : inherited_get;
+
+				MethodAttributes prot = mi.Attributes & MethodAttributes.MemberAccessMask;
+
+				// If only accessible to the current class.
+				if (prot == MethodAttributes.Private)
+					return false;
+
+				// If only accessible to the defining assembly or 
+				if (prot == MethodAttributes.FamANDAssem ||
+				    prot == MethodAttributes.Assembly){
+					if (m.DeclaringType.Assembly == CodeGen.AssemblyBuilder)
+						return true;
+					else
+						return false;
+				}
+
+				// Anything else (FamOrAssembly and Public) is fine
+				return true;
+			}
+			return false;
+		}
+	}
+}
diff --git a/mcs/mbas/codegen.cs b/mcs/mbas/codegen.cs
new file mode 100644
index 00000000000..a8a09a72130
--- /dev/null
+++ b/mcs/mbas/codegen.cs
@@ -0,0 +1,633 @@
+//
+// codegen.cs: The code generator
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Diagnostics.SymbolStore;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///    Code generator class.
+	/// </summary>
+	public class CodeGen {
+		static AppDomain current_domain;
+		public static AssemblyBuilder AssemblyBuilder;
+		public static ModuleBuilder   ModuleBuilder;
+
+		static public ISymbolWriter SymbolWriter;
+
+		public static string Basename (string name)
+		{
+			int pos = name.LastIndexOf ("/");
+
+			if (pos != -1)
+				return name.Substring (pos + 1);
+
+			pos = name.LastIndexOf ("\\");
+			if (pos != -1)
+				return name.Substring (pos + 1);
+
+			return name;
+		}
+
+		public static string Dirname (string name)
+		{
+			int pos = name.LastIndexOf ("/");
+
+			if (pos != -1)
+				return name.Substring (0, pos);
+
+			pos = name.LastIndexOf ("\\");
+			if (pos != -1)
+				return name.Substring (0, pos);
+
+			return ".";
+		}
+
+		static string TrimExt (string name)
+		{
+			int pos = name.LastIndexOf (".");
+
+			return name.Substring (0, pos);
+		}
+
+		static public string FileName;
+
+		//
+		// This routine initializes the Mono runtime SymbolWriter.
+		//
+		static void InitMonoSymbolWriter (string basename, string[] debug_args)
+		{
+			string symbol_output = basename + "-debug.s";
+
+			Type itype = SymbolWriter.GetType ();
+			if (itype == null)
+				return;
+
+			Type[] arg_types = new Type [2];
+			arg_types [0] = typeof (string);
+			arg_types [1] = typeof (string[]);
+
+			MethodInfo initialize = itype.GetMethod ("Initialize", arg_types);
+			if (initialize == null)
+				return;
+
+			object[] args = new object [2];
+			args [0] = symbol_output;
+			args [1] = debug_args;
+
+			initialize.Invoke (SymbolWriter, args);
+		}
+
+		//
+		// Initializes the symbol writer
+		//
+		static void InitializeSymbolWriter (string basename, string[] args)
+		{
+			SymbolWriter = ModuleBuilder.GetSymWriter ();
+
+			//
+			// If we got an ISymbolWriter instance, initialize it.
+			//
+			if (SymbolWriter == null)
+				return;
+			
+			//
+			// Due to lacking documentation about the first argument of the
+			// Initialize method, we cannot use Microsoft's default symbol
+			// writer yet.
+			//
+			// If we're using the mono symbol writer, the SymbolWriter object
+			// is of type MonoSymbolWriter - but that's defined in a dynamically
+			// loaded DLL - that's why we're doing a comparision based on the type
+			// name here instead of using `SymbolWriter is MonoSymbolWriter'.
+			//
+			Type sym_type = ((object) SymbolWriter).GetType ();
+			
+			switch (sym_type.Name){
+			case "MonoSymbolWriter":
+				InitMonoSymbolWriter (basename, args);
+				break;
+
+			default:
+				Report.Error (
+					-18, "Cannot generate debugging information on this platform");
+				break;
+			}
+		}
+
+		//
+		// Initializes the code generator variables
+		//
+		static public void Init (string name, string output, bool want_debugging_support,
+					 string[] debug_args)
+		{
+			AssemblyName an;
+
+			FileName = output;
+			an = new AssemblyName ();
+			an.Name = TrimExt (Basename (name));
+			current_domain = AppDomain.CurrentDomain;
+			AssemblyBuilder = current_domain.DefineDynamicAssembly (
+				an, AssemblyBuilderAccess.RunAndSave, Dirname (name));
+
+			//
+			// Pass a path-less name to DefineDynamicModule.  Wonder how
+			// this copes with output in different directories then.
+			// FIXME: figure out how this copes with --output /tmp/blah
+			//
+			// If the third argument is true, the ModuleBuilder will dynamically
+			// load the default symbol writer.
+			//
+			ModuleBuilder = AssemblyBuilder.DefineDynamicModule (
+				Basename (name), Basename (output), want_debugging_support);
+
+			if (want_debugging_support)
+				InitializeSymbolWriter (an.Name, debug_args);
+		}
+
+		static public void Save (string name)
+		{
+			try {
+				AssemblyBuilder.Save (Basename (name));
+			} catch (System.IO.IOException io){
+				Report.Error (16, "Coult not write to file `"+name+"', cause: " + io.Message);
+			}
+		}
+
+		static public void SaveSymbols ()
+		{
+			if (SymbolWriter != null) {
+				// If we have a symbol writer, call its Close() method to write
+				// the symbol file to disk.
+				//
+				// When using Mono's default symbol writer, the Close() method must
+				// be called after the assembly has already been written to disk since
+				// it opens the assembly and reads its metadata.
+				SymbolWriter.Close ();
+			}
+		}
+	}
+
+	/// <summary>
+	///   An Emit Context is created for each body of code (from methods,
+	///   properties bodies, indexer bodies or constructor bodies)
+	/// </summary>
+	public class EmitContext {
+		public DeclSpace DeclSpace;
+		public TypeContainer TypeContainer;
+		public ILGenerator   ig;
+
+		/// <summary>
+		///   This variable tracks the `checked' state of the compilation,
+		///   it controls whether we should generate code that does overflow
+		///   checking, or if we generate code that ignores overflows.
+		///
+		///   The default setting comes from the command line option to generate
+		///   checked or unchecked code plus any source code changes using the
+		///   checked/unchecked statements or expressions.   Contrast this with
+		///   the ConstantCheckState flag.
+		/// </summary>
+		
+		public bool CheckState;
+
+		/// <summary>
+		///   The constant check state is always set to `true' and cant be changed
+		///   from the command line.  The source code can change this setting with
+		///   the `checked' and `unchecked' statements and expressions. 
+		/// </summary>
+		public bool ConstantCheckState;
+
+		/// <summary>
+		///   Whether we are emitting code inside a static or instance method
+		/// </summary>
+		public bool IsStatic;
+
+		/// <summary>
+		///   The value that is allowed to be returned or NULL if there is no
+		///   return type.
+		/// </summary>
+		public Type ReturnType;
+
+		/// <summary>
+		///   Points to the Type (extracted from the TypeContainer) that
+		///   declares this body of code
+		/// </summary>
+		public Type ContainerType;
+		
+		/// <summary>
+		///   Whether this is generating code for a constructor
+		/// </summary>
+		public bool IsConstructor;
+
+		/// <summary>
+		///   Whether we're control flow analysis enabled
+		/// </summary>
+		public bool DoFlowAnalysis;
+		
+		/// <summary>
+		///   Keeps track of the Type to LocalBuilder temporary storage created
+		///   to store structures (used to compute the address of the structure
+		///   value on structure method invocations)
+		/// </summary>
+		public Hashtable temporary_storage;
+
+		public Block CurrentBlock;
+
+		/// <summary>
+		///   The location where we store the return value.
+		/// </summary>
+		LocalBuilder return_value;
+
+		/// <summary>
+		///   The location where return has to jump to return the
+		///   value
+		/// </summary>
+		public Label ReturnLabel;
+
+		/// <summary>
+		///   If we already defined the ReturnLabel
+		/// </summary>
+		public bool HasReturnLabel;
+
+		/// <summary>
+		///   Whether we are in a Finally block
+		/// </summary>
+		public bool InFinally;
+
+		/// <summary>
+		///   Whether we are in a Try block
+		/// </summary>
+		public bool InTry;
+
+		/// <summary>
+		///   Whether we are in a Catch block
+		/// </summary>
+		public bool InCatch;
+
+		/// <summary>
+		///  Whether we are inside an unsafe block
+		/// </summary>
+		public bool InUnsafe;
+
+		/// <summary>
+		///   Whether we break from a loop or not
+		/// </summary>
+		public bool Breaks;
+		
+		/// <summary>
+		///   Location for this EmitContext
+		/// </summary>
+		public Location loc;
+
+		/// <summary>
+		///   Used to "flag" the resolution process to only lookup types,
+		///   and nothing else.  This is an out-of-band communication
+		///   path to SimpleName from the cast operation.
+		/// </summary>
+		public bool OnlyLookupTypes;
+
+		/// <summary>
+		///   Used to flag that it is ok to define types recursively, as the
+		///   expressions are being evaluated as part of the type lookup
+		///   during the type resolution process
+		/// </summary>
+		public bool ResolvingTypeTree;
+		
+		/// <summary>
+		///   Inside an enum definition, we do not resolve enumeration values
+		///   to their enumerations, but rather to the underlying type/value
+		///   This is so EnumVal + EnumValB can be evaluated.
+		///
+		///   There is no "E operator + (E x, E y)", so during an enum evaluation
+		///   we relax the rules
+		/// </summary>
+		public bool InEnumContext;
+
+		protected Stack FlowStack;
+		
+		public EmitContext (TypeContainer parent, DeclSpace ds, Location l, ILGenerator ig,
+				    Type return_type, int code_flags, bool is_constructor)
+		{
+			this.ig = ig;
+
+			TypeContainer = parent;
+			DeclSpace = ds;
+			CheckState = RootContext.Checked;
+			ConstantCheckState = true;
+			
+			IsStatic = (code_flags & Modifiers.STATIC) != 0;
+			ReturnType = return_type;
+			IsConstructor = is_constructor;
+			CurrentBlock = null;
+			
+			if (parent != null){
+				// Can only be null for the ResolveType contexts.
+			ContainerType = parent.TypeBuilder;
+			InUnsafe = ((parent.ModFlags | code_flags) & Modifiers.UNSAFE) != 0;
+			}
+			OnlyLookupTypes = false;
+			loc = l;
+
+			FlowStack = new Stack ();
+			
+			if (ReturnType == TypeManager.void_type)
+				ReturnType = null;
+		}
+
+		public EmitContext (TypeContainer tc, Location l, ILGenerator ig,
+				    Type return_type, int code_flags, bool is_constructor)
+			: this (tc, tc, l, ig, return_type, code_flags, is_constructor)
+		{
+		}
+
+		public EmitContext (TypeContainer tc, Location l, ILGenerator ig,
+				    Type return_type, int code_flags)
+			: this (tc, tc, l, ig, return_type, code_flags, false)
+		{
+		}
+
+		public FlowBranching CurrentBranching {
+			get {
+				return (FlowBranching) FlowStack.Peek ();
+			}
+		}
+
+		// <summary>
+		//   Starts a new code branching.  This inherits the state of all local
+		//   variables and parameters from the current branching.
+		// </summary>
+		public FlowBranching StartFlowBranching (FlowBranchingType type, Location loc)
+		{
+			FlowBranching cfb = new FlowBranching (CurrentBranching, type, null, loc);
+
+			FlowStack.Push (cfb);
+
+			return cfb;
+		}
+
+		// <summary>
+		//   Starts a new code branching for block `block'.
+		// </summary>
+		public FlowBranching StartFlowBranching (Block block)
+		{
+			FlowBranching cfb;
+			FlowBranchingType type;
+
+			if (CurrentBranching.Type == FlowBranchingType.SWITCH)
+				type = FlowBranchingType.SWITCH_SECTION;
+			else
+				type = FlowBranchingType.BLOCK;
+
+			cfb = new FlowBranching (CurrentBranching, type, block, block.StartLocation);
+
+			FlowStack.Push (cfb);
+
+			return cfb;
+		}
+
+		// <summary>
+		//   Ends a code branching.  Merges the state of locals and parameters
+		//   from all the children of the ending branching.
+		// </summary>
+		public FlowReturns EndFlowBranching ()
+		{
+			FlowBranching cfb = (FlowBranching) FlowStack.Pop ();
+
+			return CurrentBranching.MergeChild (cfb);
+		}
+
+		// <summary>
+		//   Kills the current code branching.  This throws away any changed state
+		//   information and should only be used in case of an error.
+		// </summary>
+		public void KillFlowBranching ()
+		{
+			FlowBranching cfb = (FlowBranching) FlowStack.Pop ();
+		}
+
+		// <summary>
+		//   Checks whether the local variable `vi' is already initialized
+		//   at the current point of the method's control flow.
+		//   If this method returns false, the caller must report an
+		//   error 165.
+		// </summary>
+		public bool IsVariableAssigned (VariableInfo vi)
+		{
+			if (DoFlowAnalysis)
+				return CurrentBranching.IsVariableAssigned (vi);
+			else
+				return true;
+		}
+
+		// <summary>
+		//   Marks the local variable `vi' as being initialized at the current
+		//   current point of the method's control flow.
+		// </summary>
+		public void SetVariableAssigned (VariableInfo vi)
+		{
+			if (DoFlowAnalysis)
+				CurrentBranching.SetVariableAssigned (vi);
+		}
+
+		// <summary>
+		//   Checks whether the parameter `number' is already initialized
+		//   at the current point of the method's control flow.
+		//   If this method returns false, the caller must report an
+		//   error 165.  This is only necessary for `out' parameters and the
+		//   call will always succeed for non-`out' parameters.
+		// </summary>
+		public bool IsParameterAssigned (int number)
+		{
+			if (DoFlowAnalysis)
+				return CurrentBranching.IsParameterAssigned (number);
+			else
+				return true;
+		}
+
+		// <summary>
+		//   Marks the parameter `number' as being initialized at the current
+		//   current point of the method's control flow.  This is only necessary
+		//   for `out' parameters.
+		// </summary>
+		public void SetParameterAssigned (int number)
+		{
+			if (DoFlowAnalysis)
+				CurrentBranching.SetParameterAssigned (number);
+		}
+
+		public void EmitTopBlock (Block block, InternalParameters ip, Location loc)
+		{
+			bool has_ret = false;
+
+//			Console.WriteLine ("Emitting: " + loc);
+
+			if (CodeGen.SymbolWriter != null)
+				Mark (loc);
+
+			if (block != null){
+				int errors = Report.Errors;
+
+				block.EmitMeta (this, block);
+
+				if (Report.Errors == errors){
+					bool old_do_flow_analysis = DoFlowAnalysis;
+					DoFlowAnalysis = true;
+
+					FlowBranching cfb = new FlowBranching (block, ip, loc);
+					FlowStack.Push (cfb);
+
+					if (!block.Resolve (this)) {
+						FlowStack.Pop ();
+						DoFlowAnalysis = old_do_flow_analysis;
+						return;
+					}
+
+					cfb = (FlowBranching) FlowStack.Pop ();
+					cfb.MergeTopBlock ();
+
+					DoFlowAnalysis = old_do_flow_analysis;
+
+					has_ret = block.Emit (this);
+
+					if (Report.Errors == errors){
+						if (RootContext.WarningLevel >= 3)
+							block.UsageWarning ();
+					}
+				}
+			}
+
+			if (ReturnType != null && !has_ret){
+				//
+				// FIXME: we need full flow analysis to implement this
+				// correctly and emit an error instead of a warning.
+				//
+				//
+				Report.Error (161, loc, "Not all code paths return a value");
+				return;
+			}
+
+			if (HasReturnLabel)
+				ig.MarkLabel (ReturnLabel);
+			if (return_value != null){
+				ig.Emit (OpCodes.Ldloc, return_value);
+				ig.Emit (OpCodes.Ret);
+			} else {
+				if (!InTry){
+					if (!has_ret || HasReturnLabel)
+						ig.Emit (OpCodes.Ret);
+				}
+			}
+		}
+
+		/// <summary>
+		///   This is called immediately before emitting an IL opcode to tell the symbol
+		///   writer to which source line this opcode belongs.
+		/// </summary>
+		public void Mark (Location loc)
+		{
+			if (!Location.IsNull (loc)) {
+				ISymbolDocumentWriter doc = loc.SymbolDocument;
+
+				if (doc != null)
+					ig.MarkSequencePoint (doc, loc.Row, 0,  loc.Row, 0);
+			}		}
+
+
+		/// <summary>
+		///   Returns a temporary storage for a variable of type t as 
+		///   a local variable in the current body.
+		/// </summary>
+		public LocalBuilder GetTemporaryStorage (Type t)
+		{
+			LocalBuilder location;
+			
+			if (temporary_storage != null){
+				location = (LocalBuilder) temporary_storage [t];
+				if (location != null)
+					return location;
+			}
+			
+			location = ig.DeclareLocal (t);
+			
+			return location;
+		}
+
+		public void FreeTemporaryStorage (LocalBuilder b)
+		{
+			// Empty for now.
+		}
+
+		/// <summary>
+		///   Current loop begin and end labels.
+		/// </summary>
+		public Label LoopBegin, LoopEnd;
+
+		/// <summary>
+		///   Whether we are inside a loop and break/continue are possible.
+		/// </summary>
+		public bool  InLoop;
+
+		/// <summary>
+		///   This is incremented each time we enter a try/catch block and
+		///   decremented if we leave it.
+		/// </summary>
+		public int   TryCatchLevel;
+
+		/// <summary>
+		///   The TryCatchLevel at the begin of the current loop.
+		/// </summary>
+		public int   LoopBeginTryCatchLevel;
+
+		/// <summary>
+		///   Default target in a switch statement.   Only valid if
+		///   InSwitch is true
+		/// </summary>
+		public Label DefaultTarget;
+
+		/// <summary>
+		///   If this is non-null, points to the current switch statement
+		/// </summary>
+		public Switch Switch;
+
+		/// <summary>
+		///   ReturnValue creates on demand the LocalBuilder for the
+		///   return value from the function.  By default this is not
+		///   used.  This is only required when returns are found inside
+		///   Try or Catch statements.
+		/// </summary>
+		public LocalBuilder TemporaryReturn ()
+		{
+			if (return_value == null){
+				return_value = ig.DeclareLocal (ReturnType);
+				ReturnLabel = ig.DefineLabel ();
+				HasReturnLabel = true;
+			}
+
+			return return_value;
+		}
+
+		/// <summary>
+	        ///   A dynamic This that is shared by all variables in a emitcontext.
+		///   Created on demand.
+		/// </summary>
+		public Expression my_this;
+		public Expression This {
+			get {
+				if (my_this == null)
+					my_this = new This (loc).Resolve (this);
+
+				return my_this;
+			}
+		}
+	}
+}
diff --git a/mcs/mbas/const.cs b/mcs/mbas/const.cs
new file mode 100644
index 00000000000..e6643de5733
--- /dev/null
+++ b/mcs/mbas/const.cs
@@ -0,0 +1,232 @@
+//
+// const.cs: Constant declarations.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+//
+
+//
+// This is needed because the following situation arises:
+//
+//     The FieldBuilder is declared with the real type for an enumeration
+//
+//     When we attempt to set the value for the constant, the FieldBuilder.SetConstant
+//     function aborts because it requires its argument to be of the same type
+//
+
+namespace Mono.CSharp {
+
+	using System;
+	using System.Reflection;
+	using System.Reflection.Emit;
+	using System.Collections;
+
+	public class Const : MemberCore {
+		public Expression ConstantType;
+		public Expression Expr;
+		public Attributes  OptAttributes;
+		public FieldBuilder FieldBuilder;
+
+		object ConstantValue = null;
+		Type type;
+
+		bool in_transit = false;
+
+		public const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE;
+
+		public Const (Expression constant_type, string name, Expression expr, int mod_flags,
+			      Attributes attrs, Location loc)
+			: base (name, loc)
+		{
+			ConstantType = constant_type;
+			Name = name;
+			Expr = expr;
+			ModFlags = Modifiers.Check (AllowedModifiers, mod_flags, Modifiers.PRIVATE, loc);
+			OptAttributes = attrs;
+		}
+
+		public FieldAttributes FieldAttr {
+			get {
+				return FieldAttributes.Literal | FieldAttributes.Static |
+					Modifiers.FieldAttr (ModFlags) ;
+			}
+		}
+
+#if DEBUG
+		void dump_tree (Type t)
+		{
+			Console.WriteLine ("Dumping hierarchy");
+			while (t != null){
+				Console.WriteLine ("   " + t.FullName + " " +
+					(t.GetType ().IsEnum ? "yes" : "no"));
+				t = t.BaseType;
+			}
+		}
+#endif
+
+		/// <summary>
+		///   Defines the constant in the @parent
+		/// </summary>
+		public override bool Define (TypeContainer parent)
+		{
+			type = parent.ResolveType (ConstantType, false, Location);
+
+			if (type == null)
+				return false;
+
+			if (!TypeManager.IsBuiltinType (type) &&
+			    (!type.IsSubclassOf (TypeManager.enum_type))) {
+				Report.Error (
+					-3, Location,
+					"Constant type is not valid (only system types are allowed)");
+				return false;
+			}
+
+			Type ptype = parent.TypeBuilder.BaseType;
+
+			if (ptype != null) {
+				MemberInfo [] mi = TypeContainer.FindMembers (
+					ptype, MemberTypes.Field, BindingFlags.Public,
+					Type.FilterName, Name);
+				
+				if (mi == null || mi.Length == 0)
+					if ((ModFlags & Modifiers.NEW) != 0)
+						WarningNotHiding (parent);
+
+			} else if ((ModFlags & Modifiers.NEW) != 0)
+				WarningNotHiding (parent);
+
+			FieldBuilder = parent.TypeBuilder.DefineField (Name, type, FieldAttr);
+
+			TypeManager.RegisterConstant (FieldBuilder, this);
+
+			return true;
+		}
+
+		/// <summary>
+		///  Looks up the value of a constant field. Defines it if it hasn't
+		///  already been. Similar to LookupEnumValue in spirit.
+		/// </summary>
+		public object LookupConstantValue (EmitContext ec)
+		{
+			if (ConstantValue != null)
+				return ConstantValue;
+
+			if (in_transit) {
+				Report.Error (110, Location,
+					      "The evaluation of the constant value for `" +
+					      Name + "' involves a circular definition.");
+				return null;
+			}
+
+			in_transit = true;
+			int errors = Report.Errors;
+
+			Expr = Expr.Resolve (ec);
+
+			in_transit = false;
+
+			if (Expr == null) {
+				if (errors == Report.Errors)
+					Report.Error (150, Location, "A constant value is expected");
+				return null;
+			}
+
+			if (!(Expr is Constant)) {
+				UnCheckedExpr un_expr = Expr as UnCheckedExpr;
+				CheckedExpr ch_expr = Expr as CheckedExpr;
+
+				if ((un_expr != null) && (un_expr.Expr is Constant))
+					Expr = un_expr.Expr;
+				else if ((ch_expr != null) && (ch_expr.Expr is Constant))
+					Expr = ch_expr.Expr;
+				else {
+					Report.Error (150, Location, "A constant value is expected");
+					return null;
+				}
+			}
+
+			ConstantValue = ((Constant) Expr).GetValue ();
+
+			if (type != Expr.Type) {
+				try {
+					ConstantValue = TypeManager.ChangeType (ConstantValue, type);
+				} catch {
+					Expression.Error_CannotConvertImplicit (Location, Expr.Type, type);
+					return null;
+				}
+
+				if (type == TypeManager.int32_type)
+					Expr = new IntConstant ((int) ConstantValue);
+				else if (type == TypeManager.uint32_type)
+					Expr = new UIntConstant ((uint) ConstantValue);
+				else if (type == TypeManager.int64_type)
+					Expr = new LongConstant ((long) ConstantValue);
+				else if (type == TypeManager.uint64_type)
+					Expr = new ULongConstant ((ulong) ConstantValue);
+				else if (type == TypeManager.float_type)
+					Expr = new FloatConstant ((float) ConstantValue);
+				else if (type == TypeManager.double_type)
+					Expr = new DoubleConstant ((double) ConstantValue);
+				else if (type == TypeManager.string_type)
+					Expr = new StringConstant ((string) ConstantValue);
+				else if (type == TypeManager.short_type)
+					Expr = new ShortConstant ((short) ConstantValue);
+				else if (type == TypeManager.ushort_type)
+					Expr = new UShortConstant ((ushort) ConstantValue);
+				else if (type == TypeManager.sbyte_type)
+					Expr = new SByteConstant ((sbyte) ConstantValue);
+				else if (type == TypeManager.byte_type)
+					Expr = new ByteConstant ((byte) ConstantValue);
+				else if (type == TypeManager.char_type)
+					Expr = new CharConstant ((char) ConstantValue);
+				else if (type == TypeManager.bool_type)
+					Expr = new BoolConstant ((bool) ConstantValue);
+			}
+
+			if (type.IsEnum){
+				//
+				// This sadly does not work for our user-defined enumerations types ;-(
+				//
+				try {
+					ConstantValue = System.Enum.ToObject (
+						type, ConstantValue);
+				} catch (ArgumentException){
+					Report.Error (
+						-16, Location,
+						".NET SDK 1.0 does not permit to create the constant "+
+						" field from a user-defined enumeration");
+				}
+			}
+
+			FieldBuilder.SetConstant (ConstantValue);
+
+			if (!TypeManager.RegisterFieldValue (FieldBuilder, ConstantValue))
+				return null;
+
+			return ConstantValue;
+		}
+		
+		
+		/// <summary>
+		///  Emits the field value by evaluating the expression
+		/// </summary>
+		public void EmitConstant (TypeContainer parent)
+		{
+			EmitContext ec = new EmitContext (parent, Location, null, type, ModFlags);
+			LookupConstantValue (ec);
+			
+			return;
+		}
+	}
+}
+
+
diff --git a/mcs/mbas/constant.cs b/mcs/mbas/constant.cs
new file mode 100644
index 00000000000..44a4c07b672
--- /dev/null
+++ b/mcs/mbas/constant.cs
@@ -0,0 +1,974 @@
+//
+// constant.cs: Constants.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+//
+
+namespace Mono.CSharp {
+
+	using System;
+	using System.Reflection.Emit;
+
+	/// <summary>
+	///   Base class for constants and literals.
+	/// </summary>
+	public abstract class Constant : Expression {
+		/// <remarks>
+		///   This is different from ToString in that ToString
+		///   is supposed to be there for debugging purposes,
+		///   and is not guaranteed to be useful for anything else,
+		///   AsString() will provide something that can be used
+		///   for round-tripping C# code.  Maybe it can be used
+		///   for IL assembly as well.
+		/// </remarks>
+		public abstract string AsString ();
+
+		override public string ToString ()
+		{
+			return this.GetType ().Name + " (" + AsString () + ")";
+		}
+
+		/// <summary>
+		///  This is used to obtain the actual value of the literal
+		///  cast into an object.
+		/// </summary>
+		public abstract object GetValue ();
+
+		/// <summary>
+		///   Constants are always born in a fully resolved state
+		/// </summary>
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return this;
+		}
+
+		//
+		// The various ToXXXX conversion functions are used by the constant
+		// folding evaluator.   A null value is returned if the conversion is
+		// not possible.   
+		//
+		// Note: not all the patterns for catching `implicit_conv' are the same.
+		// some implicit conversions can never be performed between two types
+		// even if the conversion would be lossless (for example short to uint),
+		// but some conversions are explicitly permitted by the standard provided
+		// that there will be no loss of information (for example, int to uint).
+		//
+		public DoubleConstant ToDouble (Location loc)
+		{
+			DoubleConstant c = ConvertToDouble ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.double_type);
+
+			return c;
+		}
+
+		public FloatConstant ToFloat (Location loc)
+		{
+			FloatConstant c = ConvertToFloat ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.float_type);
+
+			return c;
+		}
+
+		public ULongConstant ToULong (Location loc)
+		{
+			ULongConstant c = ConvertToULong ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.uint64_type);
+
+			return c;
+		}
+
+		public LongConstant ToLong (Location loc)
+		{
+			LongConstant c = ConvertToLong ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.int64_type);
+
+			return c;
+		}
+		
+		public UIntConstant ToUInt (Location loc)
+		{
+			UIntConstant c = ConvertToUInt ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.uint32_type);
+
+			return c;
+		}
+
+		public IntConstant ToInt (Location loc)
+		{
+			IntConstant c = ConvertToInt ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.int32_type);
+
+			return c;
+		}
+		
+		public virtual DoubleConstant ConvertToDouble ()
+		{
+			return null;
+		}
+
+		public virtual FloatConstant ConvertToFloat ()
+		{
+			return null;
+		}
+
+		public virtual ULongConstant ConvertToULong ()
+		{
+			return null;
+		}
+
+		public virtual LongConstant ConvertToLong ()
+		{
+			return null;
+		}
+
+		public virtual UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public virtual IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+	
+	public class BoolConstant : Constant {
+		public readonly bool Value;
+		
+		public BoolConstant (bool val)
+		{
+			type = TypeManager.bool_type;
+			eclass = ExprClass.Value;
+
+			Value = val;
+		}
+
+		override public string AsString ()
+		{
+			return Value ? "true" : "false";
+		}
+
+		public override object GetValue ()
+		{
+			return (object) Value;
+		}
+				
+		
+		public override void Emit (EmitContext ec)
+		{
+			if (Value)
+				ec.ig.Emit (OpCodes.Ldc_I4_1);
+			else
+				ec.ig.Emit (OpCodes.Ldc_I4_0);
+		}
+	}
+
+	public class ByteConstant : Constant {
+		public readonly byte Value;
+
+		public ByteConstant (byte v)
+		{
+			type = TypeManager.byte_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return new ULongConstant (Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return new UIntConstant (Value);
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return new IntConstant (Value);
+		}
+	}
+
+	public class CharConstant : Constant {
+		public readonly char Value;
+
+		public CharConstant (char v)
+		{
+			type = TypeManager.char_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, Value);
+		}
+
+		static public string descape (char c)
+		{
+			switch (c){
+			case '\a':
+				return "\\a"; 
+			case '\b':
+				return "\\b"; 
+			case '\n':
+				return "\\n"; 
+			case '\t':
+				return "\\t"; 
+			case '\v':
+				return "\\v"; 
+			case '\r':
+				return "\\r"; 
+			case '\\':
+				return "\\\\";
+			case '\f':
+				return "\\f"; 
+			case '\0':
+				return "\\0"; 
+			case '"':
+				return "\\\""; 
+			case '\'':
+				return "\\\'"; 
+			}
+			return c.ToString ();
+		}
+
+		public override string AsString ()
+		{
+			return "\"" + descape (Value) + "\"";
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return new ULongConstant (Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return new UIntConstant (Value);
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return new IntConstant (Value);
+		}
+	}
+
+	public class SByteConstant : Constant {
+		public readonly sbyte Value;
+
+		public SByteConstant (sbyte v)
+		{
+			type = TypeManager.sbyte_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			if (Value >= 0)
+				return new ULongConstant ((ulong) Value);
+			
+			return null;
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return new IntConstant (Value);
+		}
+	}
+
+	public class ShortConstant : Constant {
+		public readonly short Value;
+
+		public ShortConstant (short v)
+		{
+			type = TypeManager.short_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return null;
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return new IntConstant (Value);
+		}
+	}
+
+	public class UShortConstant : Constant {
+		public readonly ushort Value;
+
+		public UShortConstant (ushort v)
+		{
+			type = TypeManager.ushort_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return new ULongConstant (Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return new UIntConstant (Value);
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return new IntConstant (Value);
+		}
+	}
+
+	public class IntConstant : Constant {
+		public readonly int Value;
+
+		public IntConstant (int v)
+		{
+			type = TypeManager.int32_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		static public void EmitInt (ILGenerator ig, int i)
+		{
+			switch (i){
+			case -1:
+				ig.Emit (OpCodes.Ldc_I4_M1);
+				break;
+				
+			case 0:
+				ig.Emit (OpCodes.Ldc_I4_0);
+				break;
+				
+			case 1:
+				ig.Emit (OpCodes.Ldc_I4_1);
+				break;
+				
+			case 2:
+				ig.Emit (OpCodes.Ldc_I4_2);
+				break;
+				
+			case 3:
+				ig.Emit (OpCodes.Ldc_I4_3);
+				break;
+				
+			case 4:
+				ig.Emit (OpCodes.Ldc_I4_4);
+				break;
+				
+			case 5:
+				ig.Emit (OpCodes.Ldc_I4_5);
+				break;
+				
+			case 6:
+				ig.Emit (OpCodes.Ldc_I4_6);
+				break;
+				
+			case 7:
+				ig.Emit (OpCodes.Ldc_I4_7);
+				break;
+				
+			case 8:
+				ig.Emit (OpCodes.Ldc_I4_8);
+				break;
+
+			default:
+				if (i >= -128 && i <= 127){
+					ig.Emit (OpCodes.Ldc_I4_S, (sbyte) i);
+				} else
+					ig.Emit (OpCodes.Ldc_I4, i);
+				break;
+			}
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			EmitInt (ec.ig, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			if (Value < 0)
+				return null;
+
+			return new ULongConstant ((ulong) Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			if (Value < 0)
+				return null;
+
+			return new UIntConstant ((uint) Value);
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return this;
+		}
+	}
+
+	public class UIntConstant : Constant {
+		public readonly uint Value;
+
+		public UIntConstant (uint v)
+		{
+			type = TypeManager.uint32_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, unchecked ((int) Value));
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return new ULongConstant (Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return this;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+
+	public class LongConstant : Constant {
+		public readonly long Value;
+
+		public LongConstant (long v)
+		{
+			type = TypeManager.int64_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			EmitLong (ig, Value);
+		}
+
+		static public void EmitLong (ILGenerator ig, long l)
+		{
+			if ((l >> 32) == 0){
+				IntLiteral.EmitInt (ig, unchecked ((int) l));
+				ig.Emit (OpCodes.Conv_I8);
+			} else {
+				ig.Emit (OpCodes.Ldc_I8, l);
+			}
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			if (Value < 0)
+				return null;
+			
+			return new ULongConstant ((ulong) Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return this;
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+
+	public class ULongConstant : Constant {
+		public readonly ulong Value;
+
+		public ULongConstant (ulong v)
+		{
+			type = TypeManager.uint64_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			LongLiteral.EmitLong (ig, unchecked ((long) Value));
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return this;
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return null;
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+
+	public class FloatConstant : Constant {
+		public readonly float Value;
+
+		public FloatConstant (float v)
+		{
+			type = TypeManager.float_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldc_R4, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return this;
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return null;
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+
+	public class DoubleConstant : Constant {
+		public readonly double Value;
+
+		public DoubleConstant (double v)
+		{
+			type = TypeManager.double_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldc_R8, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return this;
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return null;
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return null;
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return null;
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+
+	public class DecimalConstant : Constant {
+		public readonly decimal Value;
+
+		public DecimalConstant (decimal d)
+		{
+			type = TypeManager.decimal_type;
+			eclass = ExprClass.Value;
+			Value = d;
+		}
+
+		override public string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return (object) Value;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			int [] words = Decimal.GetBits (Value);
+			
+			//
+			// FIXME: we could optimize this, and call a better 
+			// constructor
+			//
+
+			ILGenerator ig = ec.ig;
+			
+			IntConstant.EmitInt (ig, words [0]);
+			IntConstant.EmitInt (ig, words [1]);
+			IntConstant.EmitInt (ig, words [2]);
+
+			// sign
+			IntConstant.EmitInt (ig, words [3] >> 31);
+
+			// power
+			IntConstant.EmitInt (ig, (words [3] >> 16) & 0xff);
+
+			ig.Emit (OpCodes.Newobj, TypeManager.void_decimal_ctor_five_args);
+		}
+	}
+
+	public class StringConstant : Constant {
+		public readonly string Value;
+
+		public StringConstant (string s)
+		{
+			type = TypeManager.string_type;
+			eclass = ExprClass.Value;
+			Value = s;
+		}
+
+		// FIXME: Escape the string.
+		override public string AsString ()
+		{
+			return "\"" + Value + "\"";
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldstr, Value);
+		}
+	}
+
+}
+
+
diff --git a/mcs/mbas/decl.cs b/mcs/mbas/decl.cs
new file mode 100644
index 00000000000..377db34ae58
--- /dev/null
+++ b/mcs/mbas/decl.cs
@@ -0,0 +1,549 @@
+//
+// decl.cs: Declaration base class for structs, classes, enums and interfaces.
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+// TODO: Move the method verification stuff from the class.cs and interface.cs here
+//
+
+using System;
+using System.Collections;
+using System.Reflection.Emit;
+using System.Reflection;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   Base representation for members.  This is only used to keep track
+	///   of Name, Location and Modifier flags.
+	/// </summary>
+	public abstract class MemberCore {
+		/// <summary>
+		///   Public name
+		/// </summary>
+		public string Name;
+
+		/// <summary>
+		///   Modifier flags that the user specified in the source code
+		/// </summary>
+		public int ModFlags;
+
+		/// <summary>
+		///   Location where this declaration happens
+		/// </summary>
+		public readonly Location Location;
+
+		public MemberCore (string name, Location loc)
+		{
+			Name = name;
+			Location = loc;
+		}
+
+		protected void WarningNotHiding (TypeContainer parent)
+		{
+			Report.Warning (
+				109, Location,
+				"The member " + parent.MakeName (Name) + " does not hide an " +
+				"inherited member.  The keyword new is not required");
+							   
+		}
+
+		void Error_CannotChangeAccessModifiers (TypeContainer parent, MethodInfo parent_method,
+							string name)
+		{
+			//
+			// FIXME: report the old/new permissions?
+			//
+			Report.Error (
+				507, Location, parent.MakeName (Name) +
+				": can't change the access modifiers when overriding inherited " +
+				"member `" + name + "'");
+		}
+		
+		//
+		// Performs various checks on the MethodInfo `mb' regarding the modifier flags
+		// that have been defined.
+		//
+		// `name' is the user visible name for reporting errors (this is used to
+		// provide the right name regarding method names and properties)
+		//
+		protected bool CheckMethodAgainstBase (TypeContainer parent, MethodAttributes my_attrs,
+						       MethodInfo mb, string name)
+		{
+			bool ok = true;
+			
+			if ((ModFlags & Modifiers.OVERRIDE) != 0){
+				if (!(mb.IsAbstract || mb.IsVirtual)){
+					Report.Error (
+						506, Location, parent.MakeName (Name) +
+						": cannot override inherited member `" +
+						name + "' because it is not " +
+						"virtual, abstract or override");
+					ok = false;
+				}
+				
+				// Now we check that the overriden method is not final
+				
+				if (mb.IsFinal) {
+					Report.Error (239, Location, parent.MakeName (Name) + " : cannot " +
+						      "override inherited member `" + name +
+						      "' because it is sealed.");
+					ok = false;
+				}
+
+				//
+				// Check that the permissions are not being changed
+				//
+				MethodAttributes thisp = my_attrs & MethodAttributes.MemberAccessMask;
+				MethodAttributes parentp = mb.Attributes & MethodAttributes.MemberAccessMask;
+
+				if (thisp != parentp){
+					Error_CannotChangeAccessModifiers (parent, mb, name);
+					ok = false;
+				}
+			}
+
+			if (mb.IsVirtual || mb.IsAbstract){
+				if ((ModFlags & (Modifiers.NEW | Modifiers.OVERRIDE)) == 0){
+					if (Name != "Finalize" && (RootContext.WarningLevel >= 2)){
+						Report.Warning (
+							114, Location, parent.MakeName (Name) + 
+							" hides inherited member `" + name +
+							"'.  To make the current member override that " +
+							"implementation, add the override keyword, " +
+							"otherwise use the new keyword");
+					}
+				}
+			} else {
+				if ((ModFlags & (Modifiers.NEW | Modifiers.OVERRIDE)) == 0){
+					if (Name != "Finalize" && (RootContext.WarningLevel >= 1)){
+						Report.Warning (
+							108, Location, "The keyword new is required on " +
+							parent.MakeName (Name) + " because it hides " +
+							"inherited member `" + name + "'");
+					}
+				}
+			}
+
+			return ok;
+		}
+
+		public abstract bool Define (TypeContainer parent);
+
+		// 
+		// Whehter is it ok to use an unsafe pointer in this type container
+		//
+		public bool UnsafeOK (DeclSpace parent)
+		{
+			//
+			// First check if this MemberCore modifier flags has unsafe set
+			//
+			if ((ModFlags & Modifiers.UNSAFE) != 0)
+				return true;
+
+			if (parent.UnsafeContext)
+				return true;
+
+			Expression.UnsafeError (Location);
+			return false;
+		}
+	}
+
+	//
+	// FIXME: This is temporary outside DeclSpace, because I have to fix a bug
+	// in MCS that makes it fail the lookup for the enum
+	//
+
+		/// <summary>
+		///   The result value from adding an declaration into
+		///   a struct or a class
+		/// </summary>
+		public enum AdditionResult {
+			/// <summary>
+			/// The declaration has been successfully
+			/// added to the declation space.
+			/// </summary>
+			Success,
+
+			/// <summary>
+			///   The symbol has already been defined.
+			/// </summary>
+			NameExists,
+
+			/// <summary>
+			///   Returned if the declation being added to the
+			///   name space clashes with its container name.
+			///
+			///   The only exceptions for this are constructors
+			///   and static constructors
+			/// </summary>
+			EnclosingClash,
+
+			/// <summary>
+			///   Returned if a constructor was created (because syntactically
+			///   it looked like a constructor) but was not (because the name
+			///   of the method is not the same as the container class
+			/// </summary>
+			NotAConstructor,
+
+			/// <summary>
+			///   This is only used by static constructors to emit the
+			///   error 111, but this error for other things really
+			///   happens at another level for other functions.
+			/// </summary>
+			MethodExists
+		}
+
+	/// <summary>
+	///   Base class for structs, classes, enumerations and interfaces.  
+	/// </summary>
+	/// <remarks>
+	///   They all create new declaration spaces.  This
+	///   provides the common foundation for managing those name
+	///   spaces.
+	/// </remarks>
+	public abstract class DeclSpace : MemberCore {
+		/// <summary>
+		///   this points to the actual definition that is being
+		///   created with System.Reflection.Emit
+		/// </summary>
+		public TypeBuilder TypeBuilder;
+
+		/// <summary>
+		///   This variable tracks whether we have Closed the type
+		/// </summary>
+		public bool Created = false;
+		
+		//
+		// This is the namespace in which this typecontainer
+		// was declared.  We use this to resolve names.
+		//
+		public Namespace Namespace;
+
+		public Hashtable Cache = new Hashtable ();
+		
+		public string Basename;
+		
+		/// <summary>
+		///   defined_names is used for toplevel objects
+		/// </summary>
+		protected Hashtable defined_names;
+
+		TypeContainer parent;		
+
+		public DeclSpace (TypeContainer parent, string name, Location l)
+			: base (name, l)
+		{
+			Basename = name.Substring (1 + name.LastIndexOf ('.'));
+			defined_names = new Hashtable ();
+			this.parent = parent;
+		}
+
+		/// <summary>
+		///   Returns a status code based purely on the name
+		///   of the member being added
+		/// </summary>
+		protected AdditionResult IsValid (string name)
+		{
+			if (name == Basename)
+				return AdditionResult.EnclosingClash;
+
+			if (defined_names.Contains (name))
+				return AdditionResult.NameExists;
+
+			return AdditionResult.Success;
+		}
+
+		/// <summary>
+		///   Introduce @name into this declaration space and
+		///   associates it with the object @o.  Note that for
+		///   methods this will just point to the first method. o
+		/// </summary>
+		protected void DefineName (string name, object o)
+		{
+			defined_names.Add (name, o);
+		}
+
+		/// <summary>
+		///   Returns the object associated with a given name in the declaration
+		///   space.  This is the inverse operation of `DefineName'
+		/// </summary>
+		public object GetDefinition (string name)
+		{
+			return defined_names [name];
+		}
+		
+		bool in_transit = false;
+		
+		/// <summary>
+		///   This function is used to catch recursive definitions
+		///   in declarations.
+		/// </summary>
+		public bool InTransit {
+			get {
+				return in_transit;
+			}
+
+			set {
+				in_transit = value;
+			}
+		}
+
+		public TypeContainer Parent {
+			get {
+				return parent;
+			}
+		}
+
+		/// <summary>
+		///   Looks up the alias for the name
+		/// </summary>
+		public string LookupAlias (string name)
+		{
+			if (Namespace != null)
+				return Namespace.LookupAlias (name);
+			else
+				return null;
+		}
+		
+		// 
+		// root_types contains all the types.  All TopLevel types
+		// hence have a parent that points to `root_types', that is
+		// why there is a non-obvious test down here.
+		//
+		public bool IsTopLevel {
+			get {
+				if (parent != null){
+					if (parent.parent == null)
+						return true;
+				}
+				return false;
+			}
+		}
+
+		public virtual void CloseType ()
+		{
+			if (!Created){
+				try {
+					TypeBuilder.CreateType ();
+				} catch {
+					//
+					// The try/catch is needed because
+					// nested enumerations fail to load when they
+					// are defined.
+					//
+					// Even if this is the right order (enumerations
+					// declared after types).
+					//
+					// Note that this still creates the type and
+					// it is possible to save it
+				}
+				Created = true;
+			}
+		}
+
+		/// <remarks>
+		///  Should be overriten by the appropriate declaration space
+		/// <remarks>
+		public abstract TypeBuilder DefineType ();
+		
+		//
+		// Whether this is an `unsafe context'
+		//
+		public bool UnsafeContext {
+			get {
+				if ((ModFlags & Modifiers.UNSAFE) != 0)
+					return true;
+				if (parent != null)
+					return parent.UnsafeContext;
+				return false;
+			}
+		}
+
+		public static string MakeFQN (string nsn, string name)
+		{
+			string prefix = (nsn == "" ? "" : nsn + ".");
+
+			return prefix + name;
+		}
+
+		EmitContext type_resolve_ec;
+		EmitContext GetTypeResolveEmitContext (TypeContainer parent, Location loc)
+		{
+			type_resolve_ec = new EmitContext (parent, this, loc, null, null, ModFlags, false);
+			type_resolve_ec.ResolvingTypeTree = true;
+			type_resolve_ec.OnlyLookupTypes = true;
+
+			return type_resolve_ec;
+		}
+
+		// <summary>
+		//    Looks up the type, as parsed into the expression `e' 
+		// </summary>
+		public Type ResolveType (Expression e, bool silent, Location loc)
+		{
+			if (type_resolve_ec == null)
+				type_resolve_ec = GetTypeResolveEmitContext (parent, loc);
+			type_resolve_ec.loc = loc;
+			Expression d = e.Resolve (type_resolve_ec);
+			if (d == null || d.eclass != ExprClass.Type){
+				if (!silent){
+					Report.Error (246, loc, "Cannot find type `"+ e.ToString () +"'");
+				}
+				return null;
+			}
+
+			return d.Type;
+		}
+
+		// <summary>
+		//    Resolves the expression `e' for a type, and will recursively define
+		//    types. 
+		// </summary>
+		public Expression ResolveTypeExpr (Expression e, bool silent, Location loc)
+		{
+			if (type_resolve_ec == null)
+				type_resolve_ec = GetTypeResolveEmitContext (parent, loc);
+
+			Expression d = e.Resolve (type_resolve_ec);
+			if (d == null || d.eclass != ExprClass.Type){
+				if (!silent){
+					Report.Error (246, loc, "Cannot find type `"+ e +"'");
+				}
+				return null;
+			}
+
+			return d;
+		}
+		
+		Type LookupInterfaceOrClass (string ns, string name, out bool error)
+		{
+			DeclSpace parent;
+			Type t;
+
+			error = false;
+			name = MakeFQN (ns, name);
+			
+			t  = TypeManager.LookupType (name);
+			if (t != null)
+				return t;
+
+			parent = (DeclSpace) RootContext.Tree.Decls [name];
+			if (parent == null)
+				return null;
+			
+			t = parent.DefineType ();
+			if (t == null){
+				Report.Error (146, "Class definition is circular: `"+name+"'");
+				error = true;
+				return null;
+			}
+			return t;
+		}
+		
+		/// <summary>
+		///   GetType is used to resolve type names at the DeclSpace level.
+		///   Use this to lookup class/struct bases, interface bases or 
+		///   delegate type references
+		/// </summary>
+		///
+		/// <remarks>
+		///   Contrast this to LookupType which is used inside method bodies to 
+		///   lookup types that have already been defined.  GetType is used
+		///   during the tree resolution process and potentially define
+		///   recursively the type
+		/// </remarks>
+		public Type FindType (string name)
+		{
+			Type t;
+			bool error;
+
+			//
+			// For the case the type we are looking for is nested within this one
+			// or is in any base class
+			//
+			DeclSpace containing_ds = this;
+
+			while (containing_ds != null){
+				Type current_type = containing_ds.TypeBuilder;
+
+				while (current_type != null) {
+					string pre = current_type.FullName;
+					
+					t = LookupInterfaceOrClass (pre, name, out error);
+					if (error)
+						return null;
+				
+					if (t != null) 
+						return t;
+
+					current_type = current_type.BaseType;
+				}
+				containing_ds = containing_ds.Parent;
+			}
+			
+			//
+			// Attempt to lookup the class on our namespace and all it's implicit parents
+			//
+			for (string ns = Namespace.Name; ns != null; ns = RootContext.ImplicitParent (ns)) {
+
+				t = LookupInterfaceOrClass (ns, name, out error);
+				if (error)
+					return null;
+				
+				if (t != null) 
+					return t;
+			}
+			
+			//
+			// Attempt to do a direct unqualified lookup
+			//
+			t = LookupInterfaceOrClass ("", name, out error);
+			if (error)
+				return null;
+			
+			if (t != null)
+				return t;
+			
+			//
+			// Attempt to lookup the class on any of the `using'
+			// namespaces
+			//
+
+			for (Namespace ns = Namespace; ns != null; ns = ns.Parent){
+
+				t = LookupInterfaceOrClass (ns.Name, name, out error);
+				if (error)
+					return null;
+
+				if (t != null)
+					return t;
+
+				//
+				// Now check the using clause list
+				//
+				ArrayList using_list = ns.UsingTable;
+				
+				if (using_list == null)
+					continue;
+
+				foreach (string n in using_list){
+					t = LookupInterfaceOrClass (n, name, out error);
+					if (error)
+						return null;
+
+					if (t != null)
+						return t;
+				}
+				
+			}
+
+			//Report.Error (246, Location, "Can not find type `"+name+"'");
+			return null;
+		}
+	}
+}
diff --git a/mcs/mbas/delegate.cs b/mcs/mbas/delegate.cs
new file mode 100644
index 00000000000..68ca9ec9f5d
--- /dev/null
+++ b/mcs/mbas/delegate.cs
@@ -0,0 +1,727 @@
+//
+// delegate.cs: Delegate Handler
+//
+// Author: Ravi Pratap (ravi@ximian.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Text;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   Holds Delegates
+	/// </summary>
+	public class Delegate : DeclSpace {
+ 		public Expression ReturnType;
+		public Parameters      Parameters;
+		public Attributes      OptAttributes;
+
+		public ConstructorBuilder ConstructorBuilder;
+		public MethodBuilder      InvokeBuilder;
+		public MethodBuilder      BeginInvokeBuilder;
+		public MethodBuilder      EndInvokeBuilder;
+		
+		Type [] param_types;
+		Type ret_type;
+		
+		Expression instance_expr;
+		MethodBase delegate_method;
+	
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+		        Modifiers.UNSAFE |
+			Modifiers.PRIVATE;
+
+ 		public Delegate (TypeContainer parent, Expression type, int mod_flags,
+				 string name, Parameters param_list,
+				 Attributes attrs, Location l)
+			: base (parent, name, l)
+		{
+			this.ReturnType = type;
+			ModFlags        = Modifiers.Check (AllowedModifiers, mod_flags,
+							   IsTopLevel ? Modifiers.INTERNAL :
+							   Modifiers.PRIVATE, l);
+			Parameters      = param_list;
+			OptAttributes   = attrs;
+		}
+
+		public override TypeBuilder DefineType ()
+		{
+			TypeAttributes attr;
+
+			if (TypeBuilder != null)
+				return TypeBuilder;
+			
+			if (IsTopLevel) {
+				ModuleBuilder builder = CodeGen.ModuleBuilder;
+				attr = TypeAttributes.Public | TypeAttributes.Class | TypeAttributes.Sealed;
+
+				TypeBuilder = builder.DefineType (
+					Name, attr, TypeManager.multicast_delegate_type);
+			} else {
+				TypeBuilder builder = Parent.TypeBuilder;
+				attr = TypeAttributes.NestedPublic | TypeAttributes.Class |
+					TypeAttributes.Sealed;
+
+				string name = Name.Substring (1 + Name.LastIndexOf ('.'));
+				TypeBuilder = builder.DefineNestedType (
+					name, attr, TypeManager.multicast_delegate_type);
+			}
+
+			TypeManager.AddDelegateType (Name, TypeBuilder, this);
+
+			return TypeBuilder;
+		}
+
+ 		public override bool Define (TypeContainer container)
+		{
+			MethodAttributes mattr;
+			int i;
+
+			// FIXME: POSSIBLY make this static, as it is always constant
+			//
+			Type [] const_arg_types = new Type [2];
+			const_arg_types [0] = TypeManager.object_type;
+			const_arg_types [1] = TypeManager.intptr_type;
+
+			mattr = MethodAttributes.RTSpecialName | MethodAttributes.SpecialName |
+				MethodAttributes.HideBySig | MethodAttributes.Public;
+
+			ConstructorBuilder = TypeBuilder.DefineConstructor (mattr,
+									    CallingConventions.Standard,
+									    const_arg_types);
+
+			ConstructorBuilder.DefineParameter (1, ParameterAttributes.None, "object");
+			ConstructorBuilder.DefineParameter (2, ParameterAttributes.None, "method");
+			//
+			// HACK because System.Reflection.Emit is lame
+			//
+			//
+			// FIXME: POSSIBLY make these static, as they are always the same
+			Parameter [] fixed_pars = new Parameter [2];
+			fixed_pars [0] = new Parameter (null, null, Parameter.Modifier.NONE, null);
+			fixed_pars [1] = new Parameter (null, null, Parameter.Modifier.NONE, null);
+			Parameters const_parameters = new Parameters (fixed_pars, null, Location);
+			
+			TypeManager.RegisterMethod (
+				ConstructorBuilder,
+				new InternalParameters (const_arg_types, const_parameters),
+				const_arg_types);
+				
+			
+			ConstructorBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
+
+			//
+			// Here the various methods like Invoke, BeginInvoke etc are defined
+			//
+			// First, call the `out of band' special method for
+			// defining recursively any types we need:
+			
+			if (!Parameters.ComputeAndDefineParameterTypes (this))
+				return false;
+			
+ 			param_types = Parameters.GetParameterInfo (this);
+			if (param_types == null)
+				return false;
+
+			//
+			// Invoke method
+			//
+
+			// Check accessibility
+			foreach (Type partype in param_types)
+				if (!container.AsAccessible (partype, ModFlags)) {
+					Report.Error (59, Location,
+						      "Inconsistent accessibility: parameter type `" +
+						      TypeManager.CSharpName (partype) + "` is less " +
+						      "accessible than delegate `" + Name + "'");
+					return false;
+				}
+			
+ 			ReturnType = ResolveTypeExpr (ReturnType, false, Location);
+   			ret_type = ReturnType.Type;
+			if (ret_type == null)
+				return false;
+
+			if (!container.AsAccessible (ret_type, ModFlags)) {
+				Report.Error (58, Location,
+					      "Inconsistent accessibility: return type `" +
+					      TypeManager.CSharpName (ret_type) + "` is less " +
+					      "accessible than delegate `" + Name + "'");
+				return false;
+			}
+
+			//
+			// We don't have to check any others because they are all
+			// guaranteed to be accessible - they are standard types.
+			//
+			
+  			CallingConventions cc = Parameters.GetCallingConvention ();
+
+ 			mattr = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Virtual;
+
+ 			InvokeBuilder = TypeBuilder.DefineMethod ("Invoke", 
+ 								  mattr,		     
+ 								  cc,
+ 								  ret_type,		     
+ 								  param_types);
+
+			i = 0;
+			if (Parameters.FixedParameters != null){
+				int top = Parameters.FixedParameters.Length;
+				Parameter p;
+				
+				for (; i < top; i++) {
+					p = Parameters.FixedParameters [i];
+
+					InvokeBuilder.DefineParameter (
+						i+1, p.Attributes, p.Name);
+				}
+			}
+			if (Parameters.ArrayParameter != null){
+				Parameter p = Parameters.ArrayParameter;
+				
+				InvokeBuilder.DefineParameter (
+					i+1, p.Attributes, p.Name);
+			}
+			
+			InvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
+
+			TypeManager.RegisterMethod (InvokeBuilder,
+						    new InternalParameters (container, Parameters),
+						    param_types);
+
+			//
+			// BeginInvoke
+			//
+			int params_num = param_types.Length;
+			Type [] async_param_types = new Type [params_num + 2];
+
+			param_types.CopyTo (async_param_types, 0);
+
+			async_param_types [params_num] = TypeManager.asynccallback_type;
+			async_param_types [params_num + 1] = TypeManager.object_type;
+
+			mattr = MethodAttributes.Public | MethodAttributes.HideBySig |
+				MethodAttributes.Virtual | MethodAttributes.NewSlot;
+			
+			BeginInvokeBuilder = TypeBuilder.DefineMethod ("BeginInvoke",
+								       mattr,
+								       cc,
+								       TypeManager.iasyncresult_type,
+								       async_param_types);
+
+			i = 0;
+			if (Parameters.FixedParameters != null){
+				int top = Parameters.FixedParameters.Length;
+				Parameter p;
+				
+				for (i = 0 ; i < top; i++) {
+					p = Parameters.FixedParameters [i];
+
+					BeginInvokeBuilder.DefineParameter (
+						i+1, p.Attributes, p.Name);
+				}
+			}
+			if (Parameters.ArrayParameter != null){
+				Parameter p = Parameters.ArrayParameter;
+				
+				BeginInvokeBuilder.DefineParameter (
+					i+1, p.Attributes, p.Name);
+				i++;
+			}
+
+			BeginInvokeBuilder.DefineParameter (i + 1, ParameterAttributes.None, "callback");
+			BeginInvokeBuilder.DefineParameter (i + 2, ParameterAttributes.None, "object");
+			
+			BeginInvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
+
+			Parameter [] async_params = new Parameter [params_num + 2];
+			int n = 0;
+			if (Parameters.FixedParameters != null){
+				Parameters.FixedParameters.CopyTo (async_params, 0);
+				n = Parameters.FixedParameters.Length;
+			}
+			if (Parameters.ArrayParameter != null)
+				async_params [n] = Parameters.ArrayParameter;
+			
+			async_params [params_num] = new Parameter (
+				TypeManager.system_asynccallback_expr, "callback",
+								   Parameter.Modifier.NONE, null);
+			async_params [params_num + 1] = new Parameter (
+				TypeManager.system_object_expr, "object",
+								   Parameter.Modifier.NONE, null);
+
+			Parameters async_parameters = new Parameters (async_params, null, Location);
+			
+			async_parameters.ComputeAndDefineParameterTypes (this);
+			TypeManager.RegisterMethod (BeginInvokeBuilder,
+						    new InternalParameters (container, async_parameters),
+						    async_param_types);
+
+			//
+			// EndInvoke
+			//
+			Type [] end_param_types = new Type [1];
+			end_param_types [0] = TypeManager.iasyncresult_type;
+			
+			EndInvokeBuilder = TypeBuilder.DefineMethod ("EndInvoke",
+								     mattr,
+								     cc,
+								     ret_type,
+								     end_param_types);
+			EndInvokeBuilder.DefineParameter (1, ParameterAttributes.None, "result");
+			
+			EndInvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);
+
+			Parameter [] end_params = new Parameter [1];
+			end_params [0] = new Parameter (
+				TypeManager.system_iasyncresult_expr, "result",
+							Parameter.Modifier.NONE, null);
+
+			TypeManager.RegisterMethod (
+				EndInvokeBuilder, new InternalParameters (
+					container,
+					new Parameters (
+						end_params, null, Location)),
+						    end_param_types);
+
+			return true;
+		}
+
+		/// <summary>
+		///  Verifies whether the method in question is compatible with the delegate
+		///  Returns the method itself if okay and null if not.
+		/// </summary>
+		public static MethodBase VerifyMethod (EmitContext ec, Type delegate_type, MethodBase mb,
+						       Location loc)
+		{
+			ParameterData pd = Invocation.GetParameterData (mb);
+
+			int pd_count = pd.Count;
+
+			Expression ml = Expression.MemberLookup (
+				ec, delegate_type, "Invoke", loc);
+
+			if (!(ml is MethodGroupExpr)) {
+				Report.Error (-100, loc, "Internal error : could not find Invoke method!");
+				return null;
+			}
+
+			MethodBase invoke_mb = ((MethodGroupExpr) ml).Methods [0];
+
+			ParameterData invoke_pd = Invocation.GetParameterData (invoke_mb);
+
+			if (invoke_pd.Count != pd_count)
+				return null;
+
+			for (int i = pd_count; i > 0; ) {
+				i--;
+
+				if (invoke_pd.ParameterType (i) == pd.ParameterType (i))
+					continue;
+				else
+					return null;
+			}
+
+			if (((MethodInfo) invoke_mb).ReturnType == ((MethodInfo) mb).ReturnType)
+				return mb;
+			else
+				return null;
+		}
+
+		// <summary>
+		//  Verifies whether the invocation arguments are compatible with the
+		//  delegate's target method
+		// </summary>
+		public static bool VerifyApplicability (EmitContext ec,
+							Type delegate_type,
+							ArrayList args,
+							Location loc)
+		{
+			int arg_count;
+
+			if (args == null)
+				arg_count = 0;
+			else
+				arg_count = args.Count;
+
+			Expression ml = Expression.MemberLookup (
+				ec, delegate_type, "Invoke", loc);
+			
+			if (!(ml is MethodGroupExpr)) {
+				Report.Error (-100, loc, "Internal error : could not find Invoke method!");
+				return false;
+			}
+			
+			MethodBase mb = ((MethodGroupExpr) ml).Methods [0];
+			ParameterData pd = Invocation.GetParameterData (mb);
+
+			int pd_count = pd.Count;
+
+			bool not_params_method = (pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS);
+
+			if (not_params_method && pd_count != arg_count) {
+				Report.Error (1593, loc,
+					      "Delegate '" + delegate_type.ToString ()
+					      + "' does not take '" + arg_count + "' arguments");
+				return false;
+			}
+
+			return Invocation.VerifyArgumentsCompat (ec, args, arg_count, mb, !not_params_method,
+								 delegate_type, loc);
+		}
+		
+		/// <summary>
+		///  Verifies whether the delegate in question is compatible with this one in
+		///  order to determine if instantiation from the same is possible.
+		/// </summary>
+		public static bool VerifyDelegate (EmitContext ec, Type delegate_type, Type probe_type, Location loc)
+		{
+			Expression ml = Expression.MemberLookup (
+				ec, delegate_type, "Invoke", loc);
+			
+			if (!(ml is MethodGroupExpr)) {
+				Report.Error (-100, loc, "Internal error : could not find Invoke method!");
+				return false;
+			}
+			
+			MethodBase mb = ((MethodGroupExpr) ml).Methods [0];
+			ParameterData pd = Invocation.GetParameterData (mb);
+
+			Expression probe_ml = Expression.MemberLookup (
+				ec, delegate_type, "Invoke", loc);
+			
+			if (!(probe_ml is MethodGroupExpr)) {
+				Report.Error (-100, loc, "Internal error : could not find Invoke method!");
+				return false;
+			}
+			
+			MethodBase probe_mb = ((MethodGroupExpr) probe_ml).Methods [0];
+			ParameterData probe_pd = Invocation.GetParameterData (probe_mb);
+			
+			if (((MethodInfo) mb).ReturnType != ((MethodInfo) probe_mb).ReturnType)
+				return false;
+
+			if (pd.Count != probe_pd.Count)
+				return false;
+
+			for (int i = pd.Count; i > 0; ) {
+				i--;
+
+				if (pd.ParameterType (i) != probe_pd.ParameterType (i) ||
+				    pd.ParameterModifier (i) != probe_pd.ParameterModifier (i))
+					return false;
+			}
+			
+			return true;
+		}
+		
+		public static string FullDelegateDesc (Type del_type, MethodBase mb, ParameterData pd)
+		{
+			StringBuilder sb = new StringBuilder (TypeManager.CSharpName (((MethodInfo) mb).ReturnType));
+			
+			sb.Append (" " + del_type.ToString ());
+			sb.Append (" (");
+
+			int length = pd.Count;
+			
+			for (int i = length; i > 0; ) {
+				i--;
+				
+				sb.Append (TypeManager.CSharpName (pd.ParameterType (length - i - 1)));
+				if (i != 0)
+					sb.Append (", ");
+			}
+			
+			sb.Append (")");
+			return sb.ToString ();
+			
+		}
+		
+		// Hack around System.Reflection as found everywhere else
+		public MemberInfo [] FindMembers (MemberTypes mt, BindingFlags bf, MemberFilter filter, object criteria)
+		{
+			ArrayList members = new ArrayList ();
+
+			if ((mt & MemberTypes.Method) != 0) {
+				if (ConstructorBuilder != null)
+				if (filter (ConstructorBuilder, criteria))
+					members.Add (ConstructorBuilder);
+
+				if (InvokeBuilder != null)
+				if (filter (InvokeBuilder, criteria))
+					members.Add (InvokeBuilder);
+
+				if (BeginInvokeBuilder != null)
+				if (filter (BeginInvokeBuilder, criteria))
+					members.Add (BeginInvokeBuilder);
+
+				if (EndInvokeBuilder != null)
+				if (filter (EndInvokeBuilder, criteria))
+					members.Add (EndInvokeBuilder);
+			}
+
+			int count = members.Count;
+
+			if (count > 0) {
+				MemberInfo [] mi = new MemberInfo [count];
+				members.CopyTo (mi, 0);
+				return mi;
+			}
+
+			return null;
+		}
+		
+		public void CloseDelegate ()
+		{
+			TypeBuilder.CreateType ();
+		}
+		
+		public Expression InstanceExpression {
+			get {
+				return instance_expr;
+			}
+			set {
+				instance_expr = value;
+			}
+		}
+
+		public MethodBase TargetMethod {
+			get {
+				return delegate_method;
+			}
+			set {
+				delegate_method = value;
+			}
+		}
+
+		public Type TargetReturnType {
+			get {
+				return ret_type;
+			}
+		}
+
+		public Type [] ParameterTypes {
+			get {
+				return param_types;
+			}
+		}
+		
+	}
+
+	public class NewDelegate : Expression {
+
+		public ArrayList Arguments;
+
+		MethodBase constructor_method;
+		MethodBase delegate_method;
+		Expression delegate_instance_expr;
+
+		public NewDelegate (Type type, ArrayList Arguments, Location loc)
+		{
+			this.type = type;
+			this.Arguments = Arguments;
+			this.loc  = loc; 
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			if (Arguments == null) {
+				Report.Error (-11, loc,
+					      "Delegate creation expression takes only one argument");
+				return null;
+			}
+
+			if (Arguments.Count != 1) {
+				Report.Error (-11, loc,
+					      "Delegate creation expression takes only one argument");
+				return null;
+			}
+
+			Expression ml = Expression.MemberLookup (
+				ec, type, ".ctor", loc);
+
+			if (!(ml is MethodGroupExpr)) {
+				Report.Error (-100, loc, "Internal error : Could not find delegate constructor!");
+				return null;
+			}
+
+			constructor_method = ((MethodGroupExpr) ml).Methods [0];
+			Argument a = (Argument) Arguments [0];
+			
+			if (!a.Resolve (ec, loc))
+				return null;
+			
+			Expression e = a.Expr;
+
+			Expression invoke_method = Expression.MemberLookup (
+				ec, type, "Invoke", MemberTypes.Method,
+				Expression.AllBindingFlags, loc);
+
+			if (invoke_method == null) {
+				Report.Error (-200, loc, "Internal error ! COuld not find Invoke method!");
+				return null;
+			}
+
+			if (e is MethodGroupExpr) {
+				MethodGroupExpr mg = (MethodGroupExpr) e;
+
+				foreach (MethodInfo mi in mg.Methods){
+					delegate_method  = Delegate.VerifyMethod (ec, type, mi, loc);
+
+					if (delegate_method != null)
+						break;
+				}
+					
+				if (delegate_method == null) {
+					string method_desc;
+					if (mg.Methods.Length > 1)
+						method_desc = mg.Methods [0].Name;
+					else
+						method_desc = Invocation.FullMethodDesc (mg.Methods [0]);
+
+					MethodBase dm = ((MethodGroupExpr) invoke_method).Methods [0];
+					ParameterData param = Invocation.GetParameterData (dm);
+					string delegate_desc = Delegate.FullDelegateDesc (type, dm, param);
+
+					Report.Error (123, loc, "Method '" + method_desc + "' does not " +
+						      "match delegate '" + delegate_desc + "'");
+
+					return null;
+				}
+						
+				if (mg.InstanceExpression != null)
+					delegate_instance_expr = mg.InstanceExpression.Resolve (ec);
+				else {
+					if (!ec.IsStatic)
+						delegate_instance_expr = ec.This;
+					else
+						delegate_instance_expr = null;
+				}
+
+				if (delegate_instance_expr != null)
+					if (delegate_instance_expr.Type.IsValueType)
+						delegate_instance_expr = new BoxedCast (delegate_instance_expr);
+				
+				eclass = ExprClass.Value;
+				return this;
+			}
+
+			Type e_type = e.Type;
+
+			if (!TypeManager.IsDelegateType (e_type)) {
+				Report.Error (-12, loc, "Cannot create a delegate from something " +
+					      "not a delegate or a method.");
+				return null;
+			}
+
+			// This is what MS' compiler reports. We could always choose
+			// to be more verbose and actually give delegate-level specifics
+			
+			if (!Delegate.VerifyDelegate (ec, type, e_type, loc)) {
+				Report.Error (29, loc, "Cannot implicitly convert type '" + e_type + "' " +
+					      "to type '" + type + "'");
+				return null;
+			}
+				
+			delegate_instance_expr = e;
+			delegate_method        = ((MethodGroupExpr) invoke_method).Methods [0];
+			
+			eclass = ExprClass.Value;
+			return this;
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			if (delegate_instance_expr == null ||
+			    delegate_method.IsStatic)
+				ec.ig.Emit (OpCodes.Ldnull);
+			else
+				delegate_instance_expr.Emit (ec);
+			
+			ec.ig.Emit (OpCodes.Ldftn, (MethodInfo) delegate_method);
+			ec.ig.Emit (OpCodes.Newobj, (ConstructorInfo) constructor_method);
+		}
+	}
+
+	public class DelegateInvocation : ExpressionStatement {
+
+		public Expression InstanceExpr;
+		public ArrayList  Arguments;
+
+		MethodBase method;
+		
+		public DelegateInvocation (Expression instance_expr, ArrayList args, Location loc)
+		{
+			this.InstanceExpr = instance_expr;
+			this.Arguments = args;
+			this.loc = loc;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Type del_type = InstanceExpr.Type;
+			if (del_type == null)
+				return null;
+			
+			if (Arguments != null){
+				foreach (Argument a in Arguments){
+					if (!a.Resolve (ec, loc))
+						return null;
+				}
+			}
+			
+			if (!Delegate.VerifyApplicability (ec, del_type, Arguments, loc))
+				return null;
+
+			Expression ml = Expression.MemberLookup (ec, del_type, "Invoke", loc);
+			if (!(ml is MethodGroupExpr)) {
+				Report.Error (-100, loc, "Internal error : could not find Invoke method!");
+				return null;
+			}
+			
+			method = ((MethodGroupExpr) ml).Methods [0];
+			type = ((MethodInfo) method).ReturnType;
+			eclass = ExprClass.Value;
+			
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			Delegate del = TypeManager.LookupDelegate (InstanceExpr.Type);
+
+			//
+			// Invocation on delegates call the virtual Invoke member
+			// so we are always `instance' calls
+			//
+			Invocation.EmitCall (ec, false, false, InstanceExpr, method, Arguments, loc);
+		}
+
+		public override void EmitStatement (EmitContext ec)
+		{
+			Emit (ec);
+			// 
+			// Pop the return value if there is one
+			//
+			if (method is MethodInfo){
+				if (((MethodInfo) method).ReturnType != TypeManager.void_type)
+					ec.ig.Emit (OpCodes.Pop);
+			}
+		}
+
+	}
+}
diff --git a/mcs/mbas/driver.cs b/mcs/mbas/driver.cs
new file mode 100644
index 00000000000..c579e18f224
--- /dev/null
+++ b/mcs/mbas/driver.cs
@@ -0,0 +1,878 @@
+//
+// driver.cs: The compiler command line driver.
+//
+// Author: Rafael Teixeira (rafaelteixeirabr@hotmail.com)
+// Based on mcs by : Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2002 Rafael Teixeira
+//
+
+namespace Mono.Languages
+{
+	using System;
+	using System.Reflection;
+	using System.Reflection.Emit;
+	using System.Collections;
+	using System.IO;
+	using System.Globalization;
+	using Mono.CSharp;
+	using Mono.GetOptions;
+
+	enum Target {
+		Library, Exe, Module, WinExe
+	};
+	
+	/// <summary>
+	///    The compiler driver.
+	/// </summary>
+	public class Driver
+	{
+		
+		//
+		// Assemblies references to be linked.   Initialized with
+		// mscorlib.dll elsewhere.
+		static ArrayList references;
+
+		//
+		// If any of these fail, we ignore the problem.  This is so
+		// that we can list all the assemblies in Windows and not fail
+		// if they are missing on Linux.
+		//
+		static ArrayList soft_references;
+
+		// Lookup paths
+		static ArrayList link_paths;
+
+		// Whether we want to only run the tokenizer
+		static bool tokenize = false;
+		
+		static int error_count = 0;
+
+		static string first_source;
+
+		static Target target = Target.Exe;
+		static string target_ext = ".exe";
+
+		static bool want_debugging_support = false;
+		static ArrayList debug_arglist = new ArrayList ();
+
+		static bool parse_only = false;
+		static bool timestamps = false;
+
+		//
+		// Whether to load the initial config file (what CSC.RSP has by default)
+		// 
+		static bool load_default_config = true;
+
+		static Hashtable source_files = new Hashtable ();
+
+		//
+		// An array of the defines from the command line
+		//
+		static ArrayList defines;
+
+		//
+		// A list of resource files
+		//
+		static ArrayList resources = new ArrayList();
+		
+		//
+		// Last time we took the time
+		//
+		static DateTime last_time;
+		static void ShowTime (string msg)
+		{
+			DateTime now = DateTime.Now;
+			TimeSpan span = now - last_time;
+			last_time = now;
+
+			Console.WriteLine (
+				"[{0:00}:{1:000}] {2}",
+				(int) span.TotalSeconds, span.Milliseconds, msg);
+		}
+	       
+		
+		static void Usage (bool is_error)
+		{
+			Console.WriteLine (	@"
+MonoBASIC Compiler, Copyright (C)2002 Rafael Teixeira.
+Usage: mbas [options] source-files
+Options:
+  --about         About the MonoBASIC compiler
+  --checked       Set default context to checked
+  --define SYM    Defines the symbol SYM
+  --fatal         Makes errors fatal
+  -g, --debug     Write symbolic debugging information to FILE-debug.s
+  -h, --help      Prints this usage instructions
+  -L PATH         Adds PATH to the assembly link path
+  -m CLASS,
+  --main CLASS    Specifies CLASS as main (starting) class
+  --noconfig      Disables implicit references to assemblies
+  --nostdlib      Does not load core libraries
+  --nowarn XXX    Ignores warning number XXX
+  -o FNAME,
+  --output FNAME  Specifies output file
+  --parse         Only parses the source file (for debugging the tokenizer)
+  --probe X       Probes for the source to generate code X on line L
+  -r ASSEMBLY     References an assembly
+  --recurse SPEC  Recursively compiles the files in SPEC ([dir]/file)
+  --resource FILE Adds FILE as a resource
+  --stacktrace    Shows stack trace at error location
+  --target KIND   Specifies the target (KIND is one of: exe, winexe, library, module)
+  --tokenize      Only tokenizes source files
+  --timestamp     Displays time stamps of various compiler events
+  --unsafe        Allows unsafe code
+  --werror        Treat warnings as errors
+  -v              Verbose parsing (for debugging the parser)
+  --wlevel LEVEL  Sets warning level (the highest is 4, the default)
+  @file           Read response file for more options
+");
+
+		}
+
+
+		static void About ()
+		{
+//			Options.ShowAbout();
+		}
+		
+		static void error (string msg)
+		{
+			Console.WriteLine ("Error: " + msg);
+		}
+
+		static void notice (string msg)
+		{
+			Console.WriteLine (msg);
+		}
+		
+		private static Mono.GetOptions.OptionList Options;
+
+		private static bool SetVerboseParsing(object nothing)
+		{
+			GenericParser.yacc_verbose_flag = true;
+			return true;
+		}
+
+		private static bool SetMainClass(object className)
+		{
+			RootContext.MainClass = (string)className;
+			return true;
+		}
+
+		private static bool AddFile(object fileName)
+		{
+			string f = (string)fileName;
+			if (first_source == null)
+				first_source = f;
+
+			if (source_files.Contains(f))
+			{
+				Report.Error (1516, "Source file `" + f + "' specified multiple times");
+				return false;
+			} 
+			else
+				source_files.Add(f, f);
+					
+			return true;
+		}
+
+		public static int Main (string[] args)
+		{
+			Options = new OptionList();
+			Options.ShowTitle();
+			Options.AddParameterReader(new OptionFound(AddFile));
+			Options.AddAbout(' ',"about", "About the MonoBASIC compiler");
+			Options.AddBooleanSwitch('v',"verbose", "Verbose parsing (for debugging the parser)", new OptionFound(SetVerboseParsing) );
+			Options.AddSymbolAdder('m',"main", "Specifies CLASS as main (starting) class", "CLASS", new OptionFound(SetMainClass) );
+
+			bool ok = MainDriver (args);
+			
+			if (ok && Report.Errors == 0) 
+			{
+				Console.Write("Compilation succeeded");
+				if (Report.Warnings > 0) 
+				{
+					Console.Write(" - {0} warning(s)", Report.Warnings);
+				} 
+				Console.WriteLine();
+				return 0;
+			} 
+			else 
+			{
+				Console.WriteLine("Compilation failed: {0} error(s), {1} warnings",
+					Report.Errors, Report.Warnings);
+				return 1;
+			}
+		}
+
+		static public int LoadAssembly (string assembly, bool soft)
+		{
+			Assembly a;
+			string total_log = "";
+
+			try {
+				char[] path_chars = { '/', '\\', '.' };
+
+				if (assembly.IndexOfAny (path_chars) != -1)
+					a = Assembly.LoadFrom (assembly);
+				else
+					a = Assembly.Load (assembly);
+				TypeManager.AddAssembly (a);
+				return 0;
+			} catch (FileNotFoundException){
+				foreach (string dir in link_paths){
+					string full_path = dir + "/" + assembly + ".dll";
+
+					try {
+						a = Assembly.LoadFrom (full_path);
+						TypeManager.AddAssembly (a);
+						return 0;
+					} catch (FileNotFoundException ff) {
+						total_log += ff.FusionLog;
+						continue;
+					}
+				}
+				if (soft)
+					return 0;
+			} catch (BadImageFormatException f) {
+				error ("// Bad file format while loading assembly");
+				error ("Log: " + f.FusionLog);
+				return 1;
+			} catch (FileLoadException f){
+				error ("File Load Exception: " + assembly);
+				error ("Log: " + f.FusionLog);
+				return 1;
+			} catch (ArgumentNullException){
+				error ("// Argument Null exception ");
+				return 1;
+			}
+			
+			Report.Error (6, "Can not find assembly `" + assembly + "'" );
+			Console.WriteLine ("Log: \n" + total_log);
+
+			return 0;
+		}
+
+		/// <summary>
+		///   Loads all assemblies referenced on the command line
+		/// </summary>
+		static public int LoadReferences ()
+		{
+			int errors = 0;
+
+			foreach (string r in references)
+				errors += LoadAssembly (r, false);
+
+			foreach (string r in soft_references)
+				errors += LoadAssembly (r, true);
+			
+			return errors;
+		}
+
+		static void SetupDefaultDefines ()
+		{
+			defines = new ArrayList ();
+			defines.Add ("__MonoBASIC__");
+		}
+
+
+		//
+		// Returns the directory where the system assemblies are installed
+		//
+		static string GetSystemDir ()
+		{
+			Assembly [] assemblies = AppDomain.CurrentDomain.GetAssemblies ();
+
+			foreach (Assembly a in assemblies){
+				string codebase = a.CodeBase;
+				if (codebase.EndsWith ("corlib.dll")){
+					return codebase.Substring (0, codebase.LastIndexOf ("/"));
+				}
+			}
+
+			Report.Error (-15, "Can not compute my system path");
+			return "";
+		}
+
+		//
+		// Given a path specification, splits the path from the file/pattern
+		//
+		static void SplitPathAndPattern (string spec, out string path, out string pattern)
+		{
+			int p = spec.LastIndexOf ("/");
+			if (p != -1){
+				//
+				// Windows does not like /file.cs, switch that to:
+				// "\", "file.cs"
+				//
+				if (p == 0){
+					path = "\\";
+					pattern = spec.Substring (1);
+				} else {
+					path = spec.Substring (0, p);
+					pattern = spec.Substring (p + 1);
+				}
+				return;
+			}
+
+			p = spec.LastIndexOf ("\\");
+			if (p != -1){
+				path = spec.Substring (0, p);
+				pattern = spec.Substring (p + 1);
+				return;
+			}
+
+			path = ".";
+			pattern = spec;
+		}
+
+
+		static int ProcessSourceFile(string filename)
+		{
+			if (tokenize)
+				GenericParser.Tokenize(filename);
+			else
+				return GenericParser.Parse(filename);
+
+			return 0;
+		}
+
+		static bool AddFiles (string spec, bool recurse)
+		{
+			string path, pattern;
+
+			SplitPathAndPattern (spec, out path, out pattern);
+			if (pattern.IndexOf ("*") == -1){
+				return AddFile (spec);
+			}
+
+			string [] files = null;
+			try {
+				files = Directory.GetFiles (path, pattern);
+			} catch (System.IO.DirectoryNotFoundException) {
+				Report.Error (2001, "Source file `" + spec + "' could not be found");
+				return false;
+			} catch (System.IO.IOException){
+				Report.Error (2001, "Source file `" + spec + "' could not be found");
+				return false;
+			}
+			foreach (string f in files)
+				AddFile (f);
+
+			if (!recurse)
+				return true;
+			
+			string [] dirs = null;
+
+			try {
+				dirs = Directory.GetDirectories (path);
+			} catch {
+			}
+			
+			foreach (string d in dirs) {
+					
+				// Don't include path in this string, as each
+				// directory entry already does
+				AddFiles (d + "/" + pattern, true);
+			}
+			
+
+			return true;
+		}
+
+		static void DefineDefaultConfig ()
+		{
+			//
+			// For now the "default config" is harcoded into the compiler
+			// we can move this outside later
+			//
+			string [] default_config = 
+			{
+				"System",
+				"System.Data",
+				"System.Xml",
+				"Microsoft.VisualBasic", // just for now
+#if false
+				//
+				// Is it worth pre-loading all this stuff?
+				//
+				"Accessibility",
+				"System.Configuration.Install",
+				"System.Design",
+				"System.DirectoryServices",
+				"System.Drawing.Design",
+				"System.Drawing",
+				"System.EnterpriseServices",
+				"System.Management",
+				"System.Messaging",
+				"System.Runtime.Remoting",
+				"System.Runtime.Serialization.Formatters.Soap",
+				"System.Security",
+				"System.ServiceProcess",
+				"System.Web",
+				"System.Web.RegularExpressions",
+				"System.Web.Services",
+				"System.Windows.Forms"
+#endif
+			};
+			
+			int p = 0;
+			foreach (string def in default_config)
+				soft_references.Insert (p++, def);
+		}
+		
+		/// <summary>
+		///    Parses the arguments, and drives the compilation
+		///    process.
+		/// </summary>
+		///
+		/// <remarks>
+		///    TODO: Mostly structured to debug the compiler
+		///    now, needs to be turned into a real driver soon.
+		/// </remarks>
+		static bool MainDriver (string [] args)
+		{
+			int errors = 0;//, i;
+			string output_file = null;
+			//bool parsing_options = true;
+			
+			references = new ArrayList ();
+			soft_references = new ArrayList ();
+			link_paths = new ArrayList ();
+			SetupDefaultDefines ();
+			
+			//
+			// Setup defaults
+			//
+			// This is not required because Assembly.Load knows about this
+			// path.
+			//
+			link_paths.Add (GetSystemDir ());
+
+			if (!Options.ProcessArgs(args))
+				return false;
+
+			/*			int argc = args.Length;
+						for (i = 0; i < argc; i++){
+							string arg = args [i];
+							//
+							// Prepare to recurse
+							//
+				
+							if (parsing_options && (arg.StartsWith ("-"))){
+								switch (arg){
+
+								case "--":
+									parsing_options = false;
+									continue;
+
+								case "--parse":
+									parse_only = true;
+									continue;
+
+								case "--unsafe":
+									RootContext.Unsafe = true;
+									continue;
+
+								case "/?": case "/h": case "/help":
+								case "--help":
+									Usage (false);
+									return false;
+
+								case "--define":
+									if ((i + 1) >= argc){
+										Usage (true);
+										return false;
+									}
+									defines.Add (args [++i]);
+									continue;
+						
+								case "--probe": {
+									int code = 0;
+
+									try {
+										code = Int32.Parse (
+											args [++i], NumberStyles.AllowLeadingSign);
+										Report.SetProbe (code);
+									} catch {
+										Report.Error (-14, "Invalid number specified");
+									} 
+									continue;
+								}
+
+								case "--tokenize": {
+									tokenize = true;
+									continue;
+								}
+					
+								case "-o": 
+								case "--output":
+									if ((i + 1) >= argc){
+										Usage (true);
+										return false;
+									}
+									output_file = args [++i];
+									string bname = CodeGen.Basename (output_file);
+									if (bname.IndexOf (".") == -1)
+										output_file += ".exe";
+									continue;
+
+								case "--checked":
+									RootContext.Checked = true;
+									continue;
+
+								case "--stacktrace":
+									Report.Stacktrace = true;
+									continue;
+
+								case "--target":
+									if ((i + 1) >= argc){
+										Usage (true);
+										return false;
+									}
+
+									string type = args [++i];
+									switch (type){
+									case "library":
+										target = Target.Library;
+										target_ext = ".dll";
+										break;
+							
+									case "exe":
+										target = Target.Exe;
+										break;
+							
+									case "winexe":
+										target = Target.WinExe;
+										break;
+							
+									case "module":
+										target = Target.Module;
+										target_ext = ".dll";
+										break;
+									default:
+										Usage (true);
+										return false;
+									}
+									continue;
+
+								case "-r":
+									if ((i + 1) >= argc){
+										Usage (true);
+										return false;
+									}
+						
+									references.Add(args [++i]);
+									continue;
+					
+								case "--resource":
+									if ((i + 1) >= argc)
+									{
+										Usage (true);
+										Console.WriteLine("Missing argument to --resource"); 
+										return false;
+									}
+						
+									resources.Add(args [++i]);
+									continue;
+					
+					
+								case "-L":
+									if ((i + 1) >= argc){
+										Usage (true);
+										return false;
+									}
+									link_paths.Add (args [++i]);
+									continue;
+						
+								case "--nostdlib":
+									RootContext.StdLib = false;
+									continue;
+						
+								case "--fatal":
+									Report.Fatal = true;
+									continue;
+
+								case "--werror":
+									Report.WarningsAreErrors = true;
+									continue;
+
+								case "--nowarn":
+									if ((i + 1) >= argc){
+										Usage (true);
+										return false;
+									}
+									int warn;
+						
+									try {
+										warn = Int32.Parse (args [++i]);
+									} catch {
+										Usage (true);
+										return false;
+									}
+									Report.SetIgnoreWarning (warn);
+									continue;
+
+								case "--wlevel":
+									if ((i + 1) >= argc){
+										Report.Error (
+											1900,
+											"--wlevel requires an value from 0 to 4");
+										error_count++;
+										return false;
+									}
+									int level;
+						
+									try {
+										level = Int32.Parse (args [++i]);
+									} catch {
+										Report.Error (
+											1900,
+											"--wlevel requires an value from 0 to 4");
+										return false;
+									}
+									if (level < 0 || level > 4){
+										Report.Error (1900, "Warning level must be 0 to 4");
+										return false;
+									} else
+										RootContext.WarningLevel = level;
+									continue;
+						
+								case "--about":
+									About ();
+									return false;
+
+								case "--recurse":
+									if ((i + 1) >= argc){
+										Console.WriteLine ("--recurse requires an argument");
+										error_count++;
+										return false;
+									}
+									AddFiles (args [++i], true);
+									continue;
+						
+								case "--timestamp":
+									timestamps = true;
+									last_time = DateTime.Now;
+									debug_arglist.Add("timestamp");
+									continue;
+
+								case "--debug": case "-g":
+									want_debugging_support = true;
+									continue;
+
+								case "--debug-args":
+									if ((i + 1) >= argc){
+										Console.WriteLine ("--debug-args requires an argument");
+										error_count++;
+										return false;
+									}
+									char[] sep = { ',' };
+									debug_arglist.AddRange (args [++i].Split (sep));
+									continue;
+
+								case "--noconfig":
+									load_default_config = false;
+									continue;
+
+								default:
+									Console.WriteLine ("Unknown option: " + arg);
+									errors++;
+									continue;
+								}
+							}
+
+							// Rafael: Does not compile them yet!!!
+							errors += AddFiles(arg, false); 
+						}
+			*/
+			//Rafael: Compile all source files!!!
+			foreach(string filename in source_files.Values)
+				errors += ProcessSourceFile(filename);
+
+			if (first_source == null)
+			{
+				Report.Error (2008, "No files to compile were specified");
+				return false;
+			}
+
+			if (tokenize)
+				return true;
+			
+			if (Report.Errors > 0)
+				return false;
+			
+			if (parse_only)
+				return true;
+			
+			//
+			// Load Core Library for default compilation
+			//
+			if (RootContext.StdLib)
+				references.Insert (0, "mscorlib");
+
+			if (load_default_config)
+				DefineDefaultConfig ();
+
+			if (errors > 0)
+			{
+				error ("Parsing failed");
+				return false;
+			}
+
+			//
+			// Load assemblies required
+			//
+			if (timestamps)
+				ShowTime ("Loading references");
+			errors += LoadReferences ();
+			if (timestamps)
+				ShowTime ("   References loaded");
+			
+			if (errors > 0)
+			{
+				error ("Could not load one or more assemblies");
+				return false;
+			}
+
+			error_count = errors;
+
+			//
+			// Quick hack
+			//
+			if (output_file == null)
+			{
+				int pos = first_source.LastIndexOf (".");
+
+				if (pos > 0)
+					output_file = first_source.Substring (0, pos) + target_ext;
+				else
+					output_file = first_source + target_ext;
+			}
+
+			string[] debug_args = new string [debug_arglist.Count];
+			debug_arglist.CopyTo(debug_args);
+			CodeGen.Init (output_file, output_file, want_debugging_support, debug_args);
+
+			TypeManager.AddModule (CodeGen.ModuleBuilder);
+
+			//
+			// Before emitting, we need to get the core
+			// types emitted from the user defined types
+			// or from the system ones.
+			//
+			if (timestamps)
+				ShowTime ("Initializing Core Types");
+			if (!RootContext.StdLib)
+			{
+				RootContext.ResolveCore ();
+				if (Report.Errors > 0)
+					return false;
+			}
+			
+			TypeManager.InitCoreTypes ();
+			if (timestamps)
+				ShowTime ("   Core Types done");
+		
+			//
+			// The second pass of the compiler
+			//
+			if (timestamps)
+				ShowTime ("Resolving tree");
+			RootContext.ResolveTree ();
+			if (timestamps)
+				ShowTime ("Populate tree");
+
+			if (Report.Errors > 0)
+			{
+				error ("Compilation failed");
+				return false;
+			}
+
+			if (!RootContext.StdLib)
+				RootContext.BootCorlib_PopulateCoreTypes ();
+			RootContext.PopulateTypes ();
+			
+			TypeManager.InitCodeHelpers ();
+				
+			if (Report.Errors > 0)
+			{
+				error ("Compilation failed");
+				return false;
+			}
+			
+			//
+			// The code generator
+			//
+			if (timestamps)
+				ShowTime ("Emitting code");
+			RootContext.EmitCode ();
+			if (timestamps)
+				ShowTime ("   done");
+
+			if (Report.Errors > 0)
+			{
+				error ("Compilation failed");
+				return false;
+			}
+
+			if (timestamps)
+				ShowTime ("Closing types");
+			
+			RootContext.CloseTypes ();
+
+			//			PEFileKinds k = PEFileKinds.ConsoleApplication;
+			//				
+			//			if (target == Target.Library || target == Target.Module)
+			//				k = PEFileKinds.Dll;
+			//			else if (target == Target.Exe)
+			//				k = PEFileKinds.ConsoleApplication;
+			//			else if (target == Target.WinExe)
+			//				k = PEFileKinds.WindowApplication;
+			//
+			//			if (target == Target.Exe || target == Target.WinExe){
+			//				MethodInfo ep = RootContext.EntryPoint;
+			//
+			//				if (ep == null){
+			//					Report.Error (5001, "Program " + output_file +
+			//							      " does not have an entry point defined");
+			//					return;
+			//				}
+			//				
+			//				CodeGen.AssemblyBuilder.SetEntryPoint (ep, k);
+			//			}
+
+			//
+			// Add the resources
+			//
+			if (resources != null)
+			{
+				foreach (string file in resources)
+					CodeGen.AssemblyBuilder.AddResourceFile (file, file);
+			}
+			
+			CodeGen.Save (output_file);
+			if (timestamps)
+				ShowTime ("Saved output");
+
+			if (want_debugging_support) 
+			{
+				CodeGen.SaveSymbols ();
+				if (timestamps)
+					ShowTime ("Saved symbols");
+			}
+
+			if (Report.ExpectedError != 0)
+			{
+				Console.WriteLine("Failed to report expected error " + Report.ExpectedError);
+				Environment.Exit (1);
+				return false;
+			}
+			return (Report.Errors == 0);
+		}
+
+	}
+}
diff --git a/mcs/mbas/ecore.cs b/mcs/mbas/ecore.cs
new file mode 100644
index 00000000000..74b0b012b35
--- /dev/null
+++ b/mcs/mbas/ecore.cs
@@ -0,0 +1,4052 @@
+//
+// ecore.cs: Core of the Expression representation for the intermediate tree.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+//
+
+namespace Mono.CSharp {
+	using System;
+	using System.Collections;
+	using System.Diagnostics;
+	using System.Reflection;
+	using System.Reflection.Emit;
+	using System.Text;
+
+	/// <remarks>
+	///   The ExprClass class contains the is used to pass the 
+	///   classification of an expression (value, variable, namespace,
+	///   type, method group, property access, event access, indexer access,
+	///   nothing).
+	/// </remarks>
+	public enum ExprClass : byte {
+		Invalid,
+		
+		Value,
+		Variable,
+		Namespace,
+		Type,
+		MethodGroup,
+		PropertyAccess,
+		EventAccess,
+		IndexerAccess,
+		Nothing, 
+	}
+
+	//
+	// This is just as a hint to AddressOf of what will be done with the
+	// address.
+	[Flags]
+	public enum AddressOp {
+		Store = 1,
+		Load  = 2,
+		LoadStore = 3
+	};
+	
+	/// <summary>
+	///   This interface is implemented by variables
+	/// </summary>
+	public interface IMemoryLocation {
+		/// <summary>
+		///   The AddressOf method should generate code that loads
+		///   the address of the object and leaves it on the stack.
+		///
+		///   The `mode' argument is used to notify the expression
+		///   of whether this will be used to read from the address or
+		///   write to the address.
+		///
+		///   This is just a hint that can be used to provide good error
+		///   reporting, and should have no other side effects. 
+		/// </summary>
+		void AddressOf (EmitContext ec, AddressOp mode);
+	}
+
+	/// <remarks>
+	///   Base class for expressions
+	/// </remarks>
+	public abstract class Expression {
+		public ExprClass eclass;
+		protected Type type;
+		protected Location loc;
+		
+		public Type Type {
+			get {
+				return type;
+			}
+
+			set {
+				type = value;
+			}
+		}
+
+		public Location Location {
+			get {
+				return loc;
+			}
+		}
+
+		/// <summary>
+		///   Utility wrapper routine for Error, just to beautify the code
+		/// </summary>
+		public void Error (int error, string s)
+		{
+			if (Location.IsNull (loc))
+				Report.Error (error, loc, s);
+			else
+				Report.Error (error, s);
+		}
+
+		/// <summary>
+		///   Utility wrapper routine for Warning, just to beautify the code
+		/// </summary>
+		protected void Warning (int warning, string s)
+		{
+			if (Location.IsNull (loc))
+				Report.Warning (warning, loc, s);
+			else
+				Report.Warning (warning, s);
+		}
+
+		protected void Warning (int warning, int level, string s)
+		{
+			if (level <= RootContext.WarningLevel)
+				Warning (warning, s);
+		}
+
+		static public void Error_CannotConvertType (Location loc, Type source, Type target)
+		{
+			Report.Error (30, loc, "Cannot convert type '" +
+				      TypeManager.CSharpName (source) + "' to '" +
+				      TypeManager.CSharpName (target) + "'");
+		}
+
+		/// <summary>
+		///   Performs semantic analysis on the Expression
+		/// </summary>
+		///
+		/// <remarks>
+		///   The Resolve method is invoked to perform the semantic analysis
+		///   on the node.
+		///
+		///   The return value is an expression (it can be the
+		///   same expression in some cases) or a new
+		///   expression that better represents this node.
+		///   
+		///   For example, optimizations of Unary (LiteralInt)
+		///   would return a new LiteralInt with a negated
+		///   value.
+		///   
+		///   If there is an error during semantic analysis,
+		///   then an error should be reported (using Report)
+		///   and a null value should be returned.
+		///   
+		///   There are two side effects expected from calling
+		///   Resolve(): the the field variable "eclass" should
+		///   be set to any value of the enumeration
+		///   `ExprClass' and the type variable should be set
+		///   to a valid type (this is the type of the
+		///   expression).
+		/// </remarks>
+		public abstract Expression DoResolve (EmitContext ec);
+
+		public virtual Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			return DoResolve (ec);
+		}
+		
+		/// <summary>
+		///   Resolves an expression and performs semantic analysis on it.
+		/// </summary>
+		///
+		/// <remarks>
+		///   Currently Resolve wraps DoResolve to perform sanity
+		///   checking and assertion checking on what we expect from Resolve.
+		/// </remarks>
+		public Expression Resolve (EmitContext ec)
+		{
+			Expression e = DoResolve (ec);
+
+			if (e != null){
+
+				if (e is SimpleName){
+					SimpleName s = (SimpleName) e;
+
+					Report.Error (
+						      103, loc,
+						      "The name `" + s.Name + "' could not be found in `" +
+						      ec.DeclSpace.Name + "'");
+					return null;
+				}
+				
+				if (e.eclass == ExprClass.Invalid)
+					throw new Exception ("Expression " + e.GetType () +
+							     " ExprClass is Invalid after resolve");
+
+				if (e.eclass != ExprClass.MethodGroup)
+					if (e.type == null)
+						throw new Exception (
+							"Expression " + e.GetType () +
+							" did not set its type after Resolve\n" +
+							"called from: " + this.GetType ());
+			}
+
+			return e;
+		}
+
+		/// <summary>
+		///   Performs expression resolution and semantic analysis, but
+		///   allows SimpleNames to be returned.
+		/// </summary>
+		///
+		/// <remarks>
+		///   This is used by MemberAccess to construct long names that can not be
+		///   partially resolved (namespace-qualified names for example).
+		/// </remarks>
+		public Expression ResolveWithSimpleName (EmitContext ec)
+		{
+			Expression e;
+
+			if (this is SimpleName)
+				e = ((SimpleName) this).DoResolveAllowStatic (ec);
+			else 
+				e = DoResolve (ec);
+
+			if (e != null){
+				if (e is SimpleName)
+					return e;
+
+				if (e.eclass == ExprClass.Invalid)
+					throw new Exception ("Expression " + e +
+							     " ExprClass is Invalid after resolve");
+
+				if (e.eclass != ExprClass.MethodGroup)
+					if (e.type == null)
+						throw new Exception ("Expression " + e +
+								     " did not set its type after Resolve");
+			}
+
+			return e;
+		}
+		
+		/// <summary>
+		///   Resolves an expression for LValue assignment
+		/// </summary>
+		///
+		/// <remarks>
+		///   Currently ResolveLValue wraps DoResolveLValue to perform sanity
+		///   checking and assertion checking on what we expect from Resolve
+		/// </remarks>
+		public Expression ResolveLValue (EmitContext ec, Expression right_side)
+		{
+			Expression e = DoResolveLValue (ec, right_side);
+
+			if (e != null){
+				if (e is SimpleName){
+					SimpleName s = (SimpleName) e;
+
+					Report.Error (
+						103, loc,
+						"The name `" + s.Name + "' could not be found in `" +
+						ec.DeclSpace.Name + "'");
+					return null;
+				}
+
+				if (e.eclass == ExprClass.Invalid)
+					throw new Exception ("Expression " + e +
+							     " ExprClass is Invalid after resolve");
+
+				if (e.eclass != ExprClass.MethodGroup)
+					if (e.type == null)
+						throw new Exception ("Expression " + e +
+								     " did not set its type after Resolve");
+			}
+
+			return e;
+		}
+		
+		/// <summary>
+		///   Emits the code for the expression
+		/// </summary>
+		///
+		/// <remarks>
+		///   The Emit method is invoked to generate the code
+		///   for the expression.  
+		/// </remarks>
+		public abstract void Emit (EmitContext ec);
+
+		/// <summary>
+		///   Protected constructor.  Only derivate types should
+		///   be able to be created
+		/// </summary>
+
+		protected Expression ()
+		{
+			eclass = ExprClass.Invalid;
+			type = null;
+		}
+
+		/// <summary>
+		///   Returns a literalized version of a literal FieldInfo
+		/// </summary>
+		///
+		/// <remarks>
+		///   The possible return values are:
+		///      IntConstant, UIntConstant
+		///      LongLiteral, ULongConstant
+		///      FloatConstant, DoubleConstant
+		///      StringConstant
+		///
+		///   The value returned is already resolved.
+		/// </remarks>
+		public static Constant Constantify (object v, Type t)
+		{
+			if (t == TypeManager.int32_type)
+				return new IntConstant ((int) v);
+			else if (t == TypeManager.uint32_type)
+				return new UIntConstant ((uint) v);
+			else if (t == TypeManager.int64_type)
+				return new LongConstant ((long) v);
+			else if (t == TypeManager.uint64_type)
+				return new ULongConstant ((ulong) v);
+			else if (t == TypeManager.float_type)
+				return new FloatConstant ((float) v);
+			else if (t == TypeManager.double_type)
+				return new DoubleConstant ((double) v);
+			else if (t == TypeManager.string_type)
+				return new StringConstant ((string) v);
+			else if (t == TypeManager.short_type)
+				return new ShortConstant ((short)v);
+			else if (t == TypeManager.ushort_type)
+				return new UShortConstant ((ushort)v);
+			else if (t == TypeManager.sbyte_type)
+				return new SByteConstant (((sbyte)v));
+			else if (t == TypeManager.byte_type)
+				return new ByteConstant ((byte)v);
+			else if (t == TypeManager.char_type)
+				return new CharConstant ((char)v);
+			else if (t == TypeManager.bool_type)
+				return new BoolConstant ((bool) v);
+			else if (TypeManager.IsEnumType (t)){
+				Constant e = Constantify (v, TypeManager.TypeToCoreType (v.GetType ()));
+
+				return new EnumConstant (e, t);
+			} else
+				throw new Exception ("Unknown type for constant (" + t +
+						     "), details: " + v);
+		}
+
+		/// <summary>
+		///   Returns a fully formed expression after a MemberLookup
+		/// </summary>
+		public static Expression ExprClassFromMemberInfo (EmitContext ec, MemberInfo mi, Location loc)
+		{
+			if (mi is EventInfo)
+				return new EventExpr ((EventInfo) mi, loc);
+			else if (mi is FieldInfo)
+				return new FieldExpr ((FieldInfo) mi, loc);
+			else if (mi is PropertyInfo)
+				return new PropertyExpr ((PropertyInfo) mi, loc);
+		        else if (mi is Type){
+				return new TypeExpr ((System.Type) mi, loc);
+			}
+
+			return null;
+		}
+
+		//
+		// FIXME: Probably implement a cache for (t,name,current_access_set)?
+		//
+		// This code could use some optimizations, but we need to do some
+		// measurements.  For example, we could use a delegate to `flag' when
+		// something can not any longer be a method-group (because it is something
+		// else).
+		//
+		// Return values:
+		//     If the return value is an Array, then it is an array of
+		//     MethodBases
+		//   
+		//     If the return value is an MemberInfo, it is anything, but a Method
+		//
+		//     null on error.
+		//
+		// FIXME: When calling MemberLookup inside an `Invocation', we should pass
+		// the arguments here and have MemberLookup return only the methods that
+		// match the argument count/type, unlike we are doing now (we delay this
+		// decision).
+		//
+		// This is so we can catch correctly attempts to invoke instance methods
+		// from a static body (scan for error 120 in ResolveSimpleName).
+		//
+		//
+		// FIXME: Potential optimization, have a static ArrayList
+		//
+
+		public static Expression MemberLookup (EmitContext ec, Type t, string name,
+						       MemberTypes mt, BindingFlags bf, Location loc)
+		{
+			MemberInfo [] mi = TypeManager.MemberLookup (ec.ContainerType, t, mt, bf, name);
+
+			if (mi == null)
+				return null;
+
+			int count = mi.Length;
+
+			if (count > 1)
+				return new MethodGroupExpr (mi, loc);
+
+			if (mi [0] is MethodBase)
+				return new MethodGroupExpr (mi, loc);
+
+			return ExprClassFromMemberInfo (ec, mi [0], loc);
+		}
+
+		public const MemberTypes AllMemberTypes =
+			MemberTypes.Constructor |
+			MemberTypes.Event       |
+			MemberTypes.Field       |
+			MemberTypes.Method      |
+			MemberTypes.NestedType  |
+			MemberTypes.Property;
+		
+		public const BindingFlags AllBindingFlags =
+			BindingFlags.Public |
+			BindingFlags.Static |
+			BindingFlags.Instance;
+
+		public static Expression MemberLookup (EmitContext ec, Type t, string name, Location loc)
+		{
+			return MemberLookup (ec, t, name, AllMemberTypes, AllBindingFlags, loc);
+		}
+
+		public static Expression MethodLookup (EmitContext ec, Type t, string name, Location loc)
+		{
+			return MemberLookup (ec, t, name, MemberTypes.Method, AllBindingFlags, loc);
+		}
+
+		/// <summary>
+		///   This is a wrapper for MemberLookup that is not used to "probe", but
+		///   to find a final definition.  If the final definition is not found, we
+		///   look for private members and display a useful debugging message if we
+		///   find it.
+		/// </summary>
+		public static Expression MemberLookupFinal (EmitContext ec, Type t, string name, 
+							    Location loc)
+		{
+			return MemberLookupFinal (ec, t, name, MemberTypes.Method, AllBindingFlags, loc);
+		}
+
+		public static Expression MemberLookupFinal (EmitContext ec, Type t, string name,
+							    MemberTypes mt, BindingFlags bf, Location loc)
+		{
+			Expression e;
+
+			int errors = Report.Errors;
+
+			e = MemberLookup (ec, t, name, mt, bf, loc);
+
+			if (e != null)
+				return e;
+
+			// Error has already been reported.
+			if (errors < Report.Errors)
+				return null;
+			
+			e = MemberLookup (ec, t, name, AllMemberTypes,
+					  AllBindingFlags | BindingFlags.NonPublic, loc);
+			if (e == null){
+				Report.Error (
+					117, loc, "`" + t + "' does not contain a definition " +
+					"for `" + name + "'");
+			} else {
+				Report.Error (
+					122, loc, "`" + t + "." + name +
+					"' is inaccessible due to its protection level");
+			}
+			
+			return null;
+		}
+
+		static public MemberInfo GetFieldFromEvent (EventExpr event_expr)
+		{
+			EventInfo ei = event_expr.EventInfo;
+
+			return TypeManager.GetPrivateFieldOfEvent (ei);
+		}
+		
+		static EmptyExpression MyEmptyExpr;
+		static public Expression ImplicitReferenceConversion (Expression expr, Type target_type)
+		{
+			Type expr_type = expr.Type;
+
+			if (expr_type == null && expr.eclass == ExprClass.MethodGroup){
+				// if we are a method group, emit a warning
+
+				expr.Emit (null);
+			}
+			
+			if (target_type == TypeManager.object_type) {
+				//
+				// A pointer type cannot be converted to object
+				// 
+				if (expr_type.IsPointer)
+					return null;
+
+				if (expr_type.IsValueType)
+					return new BoxedCast (expr);
+				if (expr_type.IsClass || expr_type.IsInterface)
+					return new EmptyCast (expr, target_type);
+			} else if (expr_type.IsSubclassOf (target_type)) {
+				return new EmptyCast (expr, target_type);
+			} else {
+
+				// This code is kind of mirrored inside StandardConversionExists
+				// with the small distinction that we only probe there
+				//
+				// Always ensure that the code here and there is in sync
+				
+				// from the null type to any reference-type.
+				if (expr is NullLiteral && !target_type.IsValueType)
+					return new EmptyCast (expr, target_type);
+
+				// from any class-type S to any interface-type T.
+				if (expr_type.IsClass && target_type.IsInterface) {
+					if (TypeManager.ImplementsInterface (expr_type, target_type))
+						return new EmptyCast (expr, target_type);
+					else
+						return null;
+				}
+
+				// from any interface type S to interface-type T.
+				if (expr_type.IsInterface && target_type.IsInterface) {
+
+					if (TypeManager.ImplementsInterface (expr_type, target_type))
+						return new EmptyCast (expr, target_type);
+					else
+						return null;
+				}
+				
+				// from an array-type S to an array-type of type T
+				if (expr_type.IsArray && target_type.IsArray) {
+					if (expr_type.GetArrayRank () == target_type.GetArrayRank ()) {
+
+						Type expr_element_type = expr_type.GetElementType ();
+
+						if (MyEmptyExpr == null)
+							MyEmptyExpr = new EmptyExpression ();
+						
+						MyEmptyExpr.SetType (expr_element_type);
+						Type target_element_type = target_type.GetElementType ();
+
+						if (!expr_element_type.IsValueType && !target_element_type.IsValueType)
+							if (StandardConversionExists (MyEmptyExpr,
+										      target_element_type))
+								return new EmptyCast (expr, target_type);
+					}
+				}
+				
+				
+				// from an array-type to System.Array
+				if (expr_type.IsArray && target_type == TypeManager.array_type)
+					return new EmptyCast (expr, target_type);
+				
+				// from any delegate type to System.Delegate
+				if (expr_type.IsSubclassOf (TypeManager.delegate_type) &&
+				    target_type == TypeManager.delegate_type)
+					return new EmptyCast (expr, target_type);
+					
+				// from any array-type or delegate type into System.ICloneable.
+				if (expr_type.IsArray || expr_type.IsSubclassOf (TypeManager.delegate_type))
+					if (target_type == TypeManager.icloneable_type)
+						return new EmptyCast (expr, target_type);
+				
+				return null;
+
+			}
+			
+			return null;
+		}
+
+		/// <summary>
+		///   Handles expressions like this: decimal d; d = 1;
+		///   and changes them into: decimal d; d = new System.Decimal (1);
+		/// </summary>
+		static Expression InternalTypeConstructor (EmitContext ec, Expression expr, Type target)
+		{
+			ArrayList args = new ArrayList ();
+
+			args.Add (new Argument (expr, Argument.AType.Expression));
+
+			Expression ne = new New (new TypeExpr (target, Location.Null), args, Location.Null);
+
+			return ne.Resolve (ec);
+		}
+
+		/// <summary>
+		///   Implicit Numeric Conversions.
+		///
+		///   expr is the expression to convert, returns a new expression of type
+		///   target_type or null if an implicit conversion is not possible.
+		/// </summary>
+		static public Expression ImplicitNumericConversion (EmitContext ec, Expression expr,
+								    Type target_type, Location loc)
+		{
+			Type expr_type = expr.Type;
+			
+			//
+			// Attempt to do the implicit constant expression conversions
+
+			if (expr is IntConstant){
+				Expression e;
+				
+				e = TryImplicitIntConversion (target_type, (IntConstant) expr);
+
+				if (e != null)
+					return e;
+			} else if (expr is LongConstant && target_type == TypeManager.uint64_type){
+				//
+				// Try the implicit constant expression conversion
+				// from long to ulong, instead of a nice routine,
+				// we just inline it
+				//
+				long v = ((LongConstant) expr).Value;
+				if (v > 0)
+					return new ULongConstant ((ulong) v);
+			}
+
+			//
+			// If we have an enumeration, extract the underlying type,
+			// use this during the comparission, but wrap around the original
+			// target_type
+			//
+			Type real_target_type = target_type;
+
+			if (TypeManager.IsEnumType (real_target_type))
+				real_target_type = TypeManager.EnumToUnderlying (real_target_type);
+
+			if (expr_type == real_target_type)
+				return new EmptyCast (expr, target_type);
+			
+			if (expr_type == TypeManager.sbyte_type){
+				//
+				// From sbyte to short, int, long, float, double.
+				//
+				if (real_target_type == TypeManager.int32_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.short_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.byte_type){
+				//
+				// From byte to short, ushort, int, uint, long, ulong, float, double
+				// 
+				if ((real_target_type == TypeManager.short_type) ||
+				    (real_target_type == TypeManager.ushort_type) ||
+				    (real_target_type == TypeManager.int32_type) ||
+				    (real_target_type == TypeManager.uint32_type))
+					return new EmptyCast (expr, target_type);
+
+				if (real_target_type == TypeManager.uint64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.short_type){
+				//
+				// From short to int, long, float, double
+				// 
+				if (real_target_type == TypeManager.int32_type)
+					return new EmptyCast (expr, target_type);
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.ushort_type){
+				//
+				// From ushort to int, uint, long, ulong, float, double
+				//
+				if (real_target_type == TypeManager.uint32_type)
+					return new EmptyCast (expr, target_type);
+
+				if (real_target_type == TypeManager.uint64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+				if (real_target_type == TypeManager.int32_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.int32_type){
+				//
+				// From int to long, float, double
+				//
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.uint32_type){
+				//
+				// From uint to long, ulong, float, double
+				//
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+				if (real_target_type == TypeManager.uint64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
+							       OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
+							       OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.int64_type){
+				//
+				// From long/ulong to float, double
+				//
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);	
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.uint64_type){
+				//
+				// From ulong to float, double
+				//
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
+							       OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
+							       OpCodes.Conv_R4);	
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.char_type){
+				//
+				// From char to ushort, int, uint, long, ulong, float, double
+				// 
+				if ((real_target_type == TypeManager.ushort_type) ||
+				    (real_target_type == TypeManager.int32_type) ||
+				    (real_target_type == TypeManager.uint32_type))
+					return new EmptyCast (expr, target_type);
+				if (real_target_type == TypeManager.uint64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.float_type){
+				//
+				// float to double
+				//
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+			}
+
+			return null;
+		}
+
+		//
+		// Tests whether an implicit reference conversion exists between expr_type
+		// and target_type
+		//
+		public static bool ImplicitReferenceConversionExists (Expression expr, Type target_type)
+		{
+			Type expr_type = expr.Type;
+			
+			//
+			// This is the boxed case.
+			//
+			if (target_type == TypeManager.object_type) {
+				if ((expr_type.IsClass) ||
+				    (expr_type.IsValueType) ||
+				    (expr_type.IsInterface))
+					return true;
+				
+			} else if (expr_type.IsSubclassOf (target_type)) {
+				return true;
+				
+			} else {
+				// Please remember that all code below actually comes
+				// from ImplicitReferenceConversion so make sure code remains in sync
+				
+				// from any class-type S to any interface-type T.
+				if (expr_type.IsClass && target_type.IsInterface) {
+					if (TypeManager.ImplementsInterface (expr_type, target_type))
+						return true;
+				}
+				
+				// from any interface type S to interface-type T.
+				if (expr_type.IsInterface && target_type.IsInterface)
+					if (TypeManager.ImplementsInterface (expr_type, target_type))
+						return true;
+				
+				// from an array-type S to an array-type of type T
+				if (expr_type.IsArray && target_type.IsArray) {
+					if (expr_type.GetArrayRank () == target_type.GetArrayRank ()) {
+						
+						Type expr_element_type = expr_type.GetElementType ();
+
+						if (MyEmptyExpr == null)
+							MyEmptyExpr = new EmptyExpression ();
+						
+						MyEmptyExpr.SetType (expr_element_type);
+						Type target_element_type = target_type.GetElementType ();
+						
+						if (!expr_element_type.IsValueType && !target_element_type.IsValueType)
+							if (StandardConversionExists (MyEmptyExpr,
+										      target_element_type))
+								return true;
+					}
+				}
+				
+				// from an array-type to System.Array
+				if (expr_type.IsArray && (target_type == TypeManager.array_type))
+					return true;
+				
+				// from any delegate type to System.Delegate
+				if (expr_type.IsSubclassOf (TypeManager.delegate_type) &&
+				    target_type == TypeManager.delegate_type)
+					if (target_type.IsAssignableFrom (expr_type))
+						return true;
+					
+				// from any array-type or delegate type into System.ICloneable.
+				if (expr_type.IsArray || expr_type.IsSubclassOf (TypeManager.delegate_type))
+					if (target_type == TypeManager.icloneable_type)
+						return true;
+				
+				// from the null type to any reference-type.
+				if (expr is NullLiteral && !target_type.IsValueType &&
+				    !TypeManager.IsEnumType (target_type))
+					return true;
+				
+			}
+
+			return false;
+		}
+
+		/// <summary>
+		///  Same as StandardConversionExists except that it also looks at
+		///  implicit user defined conversions - needed for overload resolution
+		/// </summary>
+		public static bool ImplicitConversionExists (EmitContext ec, Expression expr, Type target_type)
+		{
+			if (StandardConversionExists (expr, target_type) == true)
+				return true;
+
+			Expression dummy = ImplicitUserConversion (ec, expr, target_type, Location.Null);
+
+			if (dummy != null)
+				return true;
+
+			return false;
+		}
+		
+		/// <summary>
+		///  Determines if a standard implicit conversion exists from
+		///  expr_type to target_type
+		/// </summary>
+		public static bool StandardConversionExists (Expression expr, Type target_type)
+		{
+			Type expr_type = expr.Type;
+			
+			if (expr_type == target_type)
+				return true;
+
+			// First numeric conversions 
+
+			if (expr_type == TypeManager.sbyte_type){
+				//
+				// From sbyte to short, int, long, float, double.
+				//
+				if ((target_type == TypeManager.int32_type) || 
+				    (target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type)  ||
+				    (target_type == TypeManager.short_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+				
+			} else if (expr_type == TypeManager.byte_type){
+				//
+				// From byte to short, ushort, int, uint, long, ulong, float, double
+				// 
+				if ((target_type == TypeManager.short_type) ||
+				    (target_type == TypeManager.ushort_type) ||
+				    (target_type == TypeManager.int32_type) ||
+				    (target_type == TypeManager.uint32_type) ||
+				    (target_type == TypeManager.uint64_type) ||
+				    (target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+	
+			} else if (expr_type == TypeManager.short_type){
+				//
+				// From short to int, long, float, double
+				// 
+				if ((target_type == TypeManager.int32_type) ||
+				    (target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+					
+			} else if (expr_type == TypeManager.ushort_type){
+				//
+				// From ushort to int, uint, long, ulong, float, double
+				//
+				if ((target_type == TypeManager.uint32_type) ||
+				    (target_type == TypeManager.uint64_type) ||
+				    (target_type == TypeManager.int32_type) ||
+				    (target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+				    
+			} else if (expr_type == TypeManager.int32_type){
+				//
+				// From int to long, float, double
+				//
+				if ((target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+					
+			} else if (expr_type == TypeManager.uint32_type){
+				//
+				// From uint to long, ulong, float, double
+				//
+				if ((target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.uint64_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+					
+			} else if ((expr_type == TypeManager.uint64_type) ||
+				   (expr_type == TypeManager.int64_type)) {
+				//
+				// From long/ulong to float, double
+				//
+				if ((target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+				    
+			} else if (expr_type == TypeManager.char_type){
+				//
+				// From char to ushort, int, uint, long, ulong, float, double
+				// 
+				if ((target_type == TypeManager.ushort_type) ||
+				    (target_type == TypeManager.int32_type) ||
+				    (target_type == TypeManager.uint32_type) ||
+				    (target_type == TypeManager.uint64_type) ||
+				    (target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+
+			} else if (expr_type == TypeManager.float_type){
+				//
+				// float to double
+				//
+				if (target_type == TypeManager.double_type)
+					return true;
+			}	
+			
+			if (ImplicitReferenceConversionExists (expr, target_type))
+				return true;
+			
+			if (expr is IntConstant){
+				int value = ((IntConstant) expr).Value;
+
+				if (target_type == TypeManager.sbyte_type){
+					if (value >= SByte.MinValue && value <= SByte.MaxValue)
+						return true;
+				} else if (target_type == TypeManager.byte_type){
+					if (Byte.MinValue >= 0 && value <= Byte.MaxValue)
+						return true;
+				} else if (target_type == TypeManager.short_type){
+					if (value >= Int16.MinValue && value <= Int16.MaxValue)
+						return true;
+				} else if (target_type == TypeManager.ushort_type){
+					if (value >= UInt16.MinValue && value <= UInt16.MaxValue)
+						return true;
+				} else if (target_type == TypeManager.uint32_type){
+					if (value >= 0)
+						return true;
+				} else if (target_type == TypeManager.uint64_type){
+					 //
+					 // we can optimize this case: a positive int32
+					 // always fits on a uint64.  But we need an opcode
+					 // to do it.
+					 //
+					if (value >= 0)
+						return true;
+				}
+				
+				if (value == 0 && expr is IntLiteral && TypeManager.IsEnumType (target_type))
+					return true;
+			}
+
+			if (expr is LongConstant && target_type == TypeManager.uint64_type){
+				//
+				// Try the implicit constant expression conversion
+				// from long to ulong, instead of a nice routine,
+				// we just inline it
+				//
+				long v = ((LongConstant) expr).Value;
+				if (v > 0)
+					return true;
+			}
+			
+			if (target_type.IsSubclassOf (TypeManager.enum_type) && expr is IntLiteral){
+				IntLiteral i = (IntLiteral) expr;
+
+				if (i.Value == 0)
+					return true;
+			}
+			return false;
+		}
+
+		//
+		// Used internally by FindMostEncompassedType, this is used
+		// to avoid creating lots of objects in the tight loop inside
+		// FindMostEncompassedType
+		//
+		static EmptyExpression priv_fmet_param;
+		
+		/// <summary>
+		///  Finds "most encompassed type" according to the spec (13.4.2)
+		///  amongst the methods in the MethodGroupExpr
+		/// </summary>
+		static Type FindMostEncompassedType (ArrayList types)
+		{
+			Type best = null;
+
+			if (priv_fmet_param == null)
+				priv_fmet_param = new EmptyExpression ();
+
+			foreach (Type t in types){
+				priv_fmet_param.SetType (t);
+				
+				if (best == null) {
+					best = t;
+					continue;
+				}
+				
+				if (StandardConversionExists (priv_fmet_param, best))
+					best = t;
+			}
+
+			return best;
+		}
+
+		//
+		// Used internally by FindMostEncompassingType, this is used
+		// to avoid creating lots of objects in the tight loop inside
+		// FindMostEncompassingType
+		//
+		static EmptyExpression priv_fmee_ret;
+		
+		/// <summary>
+		///  Finds "most encompassing type" according to the spec (13.4.2)
+		///  amongst the types in the given set
+		/// </summary>
+		static Type FindMostEncompassingType (ArrayList types)
+		{
+			Type best = null;
+
+			if (priv_fmee_ret == null)
+				priv_fmee_ret = new EmptyExpression ();
+
+			foreach (Type t in types){
+				priv_fmee_ret.SetType (best);
+
+				if (best == null) {
+					best = t;
+					continue;
+				}
+
+				if (StandardConversionExists (priv_fmee_ret, t))
+					best = t;
+			}
+			
+			return best;
+		}
+
+		//
+		// Used to avoid creating too many objects
+		//
+		static EmptyExpression priv_fms_expr;
+		
+		/// <summary>
+		///   Finds the most specific source Sx according to the rules of the spec (13.4.4)
+		///   by making use of FindMostEncomp* methods. Applies the correct rules separately
+		///   for explicit and implicit conversion operators.
+		/// </summary>
+		static public Type FindMostSpecificSource (MethodGroupExpr me, Type source_type,
+							   bool apply_explicit_conv_rules,
+							   Location loc)
+		{
+			ArrayList src_types_set = new ArrayList ();
+			
+			if (priv_fms_expr == null)
+				priv_fms_expr = new EmptyExpression ();
+			
+			//
+			// If any operator converts from S then Sx = S
+			//
+			foreach (MethodBase mb in me.Methods){
+				ParameterData pd = Invocation.GetParameterData (mb);
+				Type param_type = pd.ParameterType (0);
+
+				if (param_type == source_type)
+					return param_type;
+
+				if (apply_explicit_conv_rules) {
+					//
+					// From the spec :
+					// Find the set of applicable user-defined conversion operators, U.  This set
+					// consists of the
+					// user-defined implicit or explicit conversion operators declared by
+					// the classes or structs in D that convert from a type encompassing
+					// or encompassed by S to a type encompassing or encompassed by T
+					//
+					priv_fms_expr.SetType (param_type);
+					if (StandardConversionExists (priv_fms_expr, source_type))
+						src_types_set.Add (param_type);
+					else {
+						priv_fms_expr.SetType (source_type);
+						if (StandardConversionExists (priv_fms_expr, param_type))
+							src_types_set.Add (param_type);
+					}
+				} else {
+					//
+					// Only if S is encompassed by param_type
+					//
+					priv_fms_expr.SetType (source_type);
+					if (StandardConversionExists (priv_fms_expr, param_type))
+						src_types_set.Add (param_type);
+				}
+			}
+			
+			//
+			// Explicit Conv rules
+			//
+			if (apply_explicit_conv_rules) {
+				ArrayList candidate_set = new ArrayList ();
+
+				foreach (Type param_type in src_types_set){
+					priv_fms_expr.SetType (source_type);
+					
+					if (StandardConversionExists (priv_fms_expr, param_type))
+						candidate_set.Add (param_type);
+				}
+
+				if (candidate_set.Count != 0)
+					return FindMostEncompassedType (candidate_set);
+			}
+
+			//
+			// Final case
+			//
+			if (apply_explicit_conv_rules)
+				return FindMostEncompassingType (src_types_set);
+			else
+				return FindMostEncompassedType (src_types_set);
+		}
+
+		//
+		// Useful in avoiding proliferation of objects
+		//
+		static EmptyExpression priv_fmt_expr;
+		
+		/// <summary>
+		///  Finds the most specific target Tx according to section 13.4.4
+		/// </summary>
+		static public Type FindMostSpecificTarget (MethodGroupExpr me, Type target,
+							   bool apply_explicit_conv_rules,
+							   Location loc)
+		{
+			ArrayList tgt_types_set = new ArrayList ();
+			
+			if (priv_fmt_expr == null)
+				priv_fmt_expr = new EmptyExpression ();
+			
+			//
+			// If any operator converts to T then Tx = T
+			//
+			foreach (MethodInfo mi in me.Methods){
+				Type ret_type = mi.ReturnType;
+
+				if (ret_type == target)
+					return ret_type;
+
+				if (apply_explicit_conv_rules) {
+					//
+					// From the spec :
+					// Find the set of applicable user-defined conversion operators, U.
+					//
+					// This set consists of the
+					// user-defined implicit or explicit conversion operators declared by
+					// the classes or structs in D that convert from a type encompassing
+					// or encompassed by S to a type encompassing or encompassed by T
+					//
+					priv_fms_expr.SetType (ret_type);
+					if (StandardConversionExists (priv_fms_expr, target))
+						tgt_types_set.Add (ret_type);
+					else {
+						priv_fms_expr.SetType (target);
+						if (StandardConversionExists (priv_fms_expr, ret_type))
+							tgt_types_set.Add (ret_type);
+					}
+				} else {
+					//
+					// Only if T is encompassed by param_type
+					//
+					priv_fms_expr.SetType (ret_type);
+					if (StandardConversionExists (priv_fms_expr, target))
+						tgt_types_set.Add (ret_type);
+				}
+			}
+
+			//
+			// Explicit conv rules
+			//
+			if (apply_explicit_conv_rules) {
+				ArrayList candidate_set = new ArrayList ();
+
+				foreach (Type ret_type in tgt_types_set){
+					priv_fmt_expr.SetType (ret_type);
+					
+					if (StandardConversionExists (priv_fmt_expr, target))
+						candidate_set.Add (ret_type);
+				}
+
+				if (candidate_set.Count != 0)
+					return FindMostEncompassingType (candidate_set);
+			}
+			
+			//
+			// Okay, final case !
+			//
+			if (apply_explicit_conv_rules)
+				return FindMostEncompassedType (tgt_types_set);
+			else
+				return FindMostEncompassingType (tgt_types_set);
+		}
+		
+		/// <summary>
+		///  User-defined Implicit conversions
+		/// </summary>
+		static public Expression ImplicitUserConversion (EmitContext ec, Expression source,
+								 Type target, Location loc)
+		{
+			return UserDefinedConversion (ec, source, target, loc, false);
+		}
+
+		/// <summary>
+		///  User-defined Explicit conversions
+		/// </summary>
+		static public Expression ExplicitUserConversion (EmitContext ec, Expression source,
+								 Type target, Location loc)
+		{
+			return UserDefinedConversion (ec, source, target, loc, true);
+		}
+
+		/// <summary>
+		///   Computes the MethodGroup for the user-defined conversion
+		///   operators from source_type to target_type.  `look_for_explicit'
+		///   controls whether we should also include the list of explicit
+		///   operators
+		/// </summary>
+		static MethodGroupExpr GetConversionOperators (EmitContext ec,
+							       Type source_type, Type target_type,
+							       Location loc, bool look_for_explicit)
+		{
+			Expression mg1 = null, mg2 = null;
+			Expression mg5 = null, mg6 = null, mg7 = null, mg8 = null;
+			string op_name;
+
+			//
+			// FIXME : How does the False operator come into the picture ?
+			// This doesn't look complete and very correct !
+			//
+			if (target_type == TypeManager.bool_type && !look_for_explicit)
+				op_name = "op_True";
+			else
+				op_name = "op_Implicit";
+
+			MethodGroupExpr union3;
+			
+			mg1 = MethodLookup (ec, source_type, op_name, loc);
+			if (source_type.BaseType != null)
+				mg2 = MethodLookup (ec, source_type.BaseType, op_name, loc);
+
+			if (mg1 == null)
+				union3 = (MethodGroupExpr) mg2;
+			else if (mg2 == null)
+				union3 = (MethodGroupExpr) mg1;
+			else
+				union3 = Invocation.MakeUnionSet (mg1, mg2, loc);
+
+			mg1 = MethodLookup (ec, target_type, op_name, loc);
+			if (mg1 != null){
+				if (union3 != null)
+					union3 = Invocation.MakeUnionSet (union3, mg1, loc);
+				else
+					union3 = (MethodGroupExpr) mg1;
+			}
+
+			if (target_type.BaseType != null)
+				mg1 = MethodLookup (ec, target_type.BaseType, op_name, loc);
+			
+			if (mg1 != null){
+				if (union3 != null)
+					union3 = Invocation.MakeUnionSet (union3, mg1, loc);
+				else
+					union3 = (MethodGroupExpr) mg1;
+			}
+
+			MethodGroupExpr union4 = null;
+
+			if (look_for_explicit) {
+				op_name = "op_Explicit";
+
+				mg5 = MemberLookup (ec, source_type, op_name, loc);
+				if (source_type.BaseType != null)
+					mg6 = MethodLookup (ec, source_type.BaseType, op_name, loc);
+				
+				mg7 = MemberLookup (ec, target_type, op_name, loc);
+				if (target_type.BaseType != null)
+					mg8 = MethodLookup (ec, target_type.BaseType, op_name, loc);
+				
+				MethodGroupExpr union5 = Invocation.MakeUnionSet (mg5, mg6, loc);
+				MethodGroupExpr union6 = Invocation.MakeUnionSet (mg7, mg8, loc);
+
+				union4 = Invocation.MakeUnionSet (union5, union6, loc);
+			}
+			
+			return Invocation.MakeUnionSet (union3, union4, loc);
+		}
+		
+		/// <summary>
+		///   User-defined conversions
+		/// </summary>
+		static public Expression UserDefinedConversion (EmitContext ec, Expression source,
+								Type target, Location loc,
+								bool look_for_explicit)
+		{
+			MethodGroupExpr union;
+			Type source_type = source.Type;
+			MethodBase method = null;
+			
+			union = GetConversionOperators (ec, source_type, target, loc, look_for_explicit);
+			if (union == null)
+				return null;
+			
+			Type most_specific_source, most_specific_target;
+
+#if BLAH
+			foreach (MethodBase m in union.Methods){
+				Console.WriteLine ("Name: " + m.Name);
+				Console.WriteLine ("    : " + ((MethodInfo)m).ReturnType);
+			}
+#endif
+			
+			most_specific_source = FindMostSpecificSource (union, source_type, look_for_explicit, loc);
+			if (most_specific_source == null)
+				return null;
+
+			most_specific_target = FindMostSpecificTarget (union, target, look_for_explicit, loc);
+			if (most_specific_target == null) 
+				return null;
+			
+			int count = 0;
+
+			foreach (MethodBase mb in union.Methods){
+				ParameterData pd = Invocation.GetParameterData (mb);
+				MethodInfo mi = (MethodInfo) mb;
+				
+				if (pd.ParameterType (0) == most_specific_source &&
+				    mi.ReturnType == most_specific_target) {
+					method = mb;
+					count++;
+				}
+			}
+			
+			if (method == null || count > 1) {
+				Report.Error (-11, loc, "Ambiguous user defined conversion");
+				return null;
+			}
+			
+			//
+			// This will do the conversion to the best match that we
+			// found.  Now we need to perform an implict standard conversion
+			// if the best match was not the type that we were requested
+			// by target.
+			//
+			if (look_for_explicit)
+				source = ConvertExplicitStandard (ec, source, most_specific_source, loc);
+			else
+				source = ConvertImplicitStandard (ec, source, most_specific_source, loc);
+
+			if (source == null)
+				return null;
+
+			Expression e;
+			e =  new UserCast ((MethodInfo) method, source, loc);
+			if (e.Type != target){
+				if (!look_for_explicit)
+					e = ConvertImplicitStandard (ec, e, target, loc);
+				else
+					e = ConvertExplicitStandard (ec, e, target, loc);
+			} 
+			return e;
+		}
+		
+		/// <summary>
+		///   Converts implicitly the resolved expression `expr' into the
+		///   `target_type'.  It returns a new expression that can be used
+		///   in a context that expects a `target_type'. 
+		/// </summary>
+		static public Expression ConvertImplicit (EmitContext ec, Expression expr,
+							  Type target_type, Location loc)
+		{
+			Type expr_type = expr.Type;
+			Expression e;
+
+			if (expr_type == target_type)
+				return expr;
+
+			if (target_type == null)
+				throw new Exception ("Target type is null");
+
+			e = ConvertImplicitStandard (ec, expr, target_type, loc);
+			if (e != null)
+				return e;
+
+			e = ImplicitUserConversion (ec, expr, target_type, loc);
+			if (e != null)
+				return e;
+
+			return null;
+		}
+
+		
+		/// <summary>
+		///   Attempts to apply the `Standard Implicit
+		///   Conversion' rules to the expression `expr' into
+		///   the `target_type'.  It returns a new expression
+		///   that can be used in a context that expects a
+		///   `target_type'.
+		///
+		///   This is different from `ConvertImplicit' in that the
+		///   user defined implicit conversions are excluded. 
+		/// </summary>
+		static public Expression ConvertImplicitStandard (EmitContext ec, Expression expr,
+								  Type target_type, Location loc)
+		{
+			Type expr_type = expr.Type;
+			Expression e;
+
+			if (expr_type == target_type)
+				return expr;
+
+			e = ImplicitNumericConversion (ec, expr, target_type, loc);
+			if (e != null)
+				return e;
+
+			e = ImplicitReferenceConversion (expr, target_type);
+			if (e != null)
+				return e;
+
+			if (target_type.IsSubclassOf (TypeManager.enum_type) && expr is IntLiteral){
+				IntLiteral i = (IntLiteral) expr;
+
+				if (i.Value == 0)
+					return new EmptyCast (expr, target_type);
+			}
+
+			if (ec.InUnsafe) {
+				if (expr_type.IsPointer){
+					if (target_type == TypeManager.void_ptr_type)
+						return new EmptyCast (expr, target_type);
+
+					//
+					// yep, comparing pointer types cant be done with
+					// t1 == t2, we have to compare their element types.
+					//
+					if (target_type.IsPointer){
+						if (target_type.GetElementType()==expr_type.GetElementType())
+							return expr;
+					}
+				}
+				
+				if (target_type.IsPointer){
+					if (expr is NullLiteral)
+						return new EmptyCast (expr, target_type);
+				}
+			}
+
+			return null;
+		}
+
+		/// <summary>
+		///   Attemps to perform an implict constant conversion of the IntConstant
+		///   into a different data type using casts (See Implicit Constant
+		///   Expression Conversions)
+		/// </summary>
+		static protected Expression TryImplicitIntConversion (Type target_type, IntConstant ic)
+		{
+			int value = ic.Value;
+
+			//
+			// FIXME: This could return constants instead of EmptyCasts
+			//
+			if (target_type == TypeManager.sbyte_type){
+				if (value >= SByte.MinValue && value <= SByte.MaxValue)
+					return new SByteConstant ((sbyte) value);
+			} else if (target_type == TypeManager.byte_type){
+				if (Byte.MinValue >= 0 && value <= Byte.MaxValue)
+					return new ByteConstant ((byte) value);
+			} else if (target_type == TypeManager.short_type){
+				if (value >= Int16.MinValue && value <= Int16.MaxValue)
+					return new ShortConstant ((short) value);
+			} else if (target_type == TypeManager.ushort_type){
+				if (value >= UInt16.MinValue && value <= UInt16.MaxValue)
+					return new UShortConstant ((ushort) value);
+			} else if (target_type == TypeManager.uint32_type){
+				if (value >= 0)
+					return new UIntConstant ((uint) value);
+			} else if (target_type == TypeManager.uint64_type){
+				//
+				// we can optimize this case: a positive int32
+				// always fits on a uint64.  But we need an opcode
+				// to do it.
+				//
+				if (value >= 0)
+					return new ULongConstant ((ulong) value);
+			}
+			
+			if (value == 0 && ic is IntLiteral && TypeManager.IsEnumType (target_type))
+				return new EnumConstant (ic, target_type);
+
+			return null;
+		}
+
+		static public void Error_CannotConvertImplicit (Location loc, Type source, Type target)
+		{
+			string msg = "Cannot convert implicitly from `"+
+				TypeManager.CSharpName (source) + "' to `" +
+				TypeManager.CSharpName (target) + "'";
+
+			Report.Error (29, loc, msg);
+		}
+
+		/// <summary>
+		///   Attemptes to implicityly convert `target' into `type', using
+		///   ConvertImplicit.  If there is no implicit conversion, then
+		///   an error is signaled
+		/// </summary>
+		static public Expression ConvertImplicitRequired (EmitContext ec, Expression source,
+								  Type target_type, Location loc)
+		{
+			Expression e;
+			
+			e = ConvertImplicit (ec, source, target_type, loc);
+			if (e != null)
+				return e;
+
+			if (source is DoubleLiteral && target_type == TypeManager.float_type){
+				Report.Error (664, loc,
+					      "Double literal cannot be implicitly converted to " +
+					      "float type, use F suffix to create a float literal");
+			}
+			
+			Error_CannotConvertImplicit (loc, source.Type, target_type);
+
+			return null;
+		}
+
+		/// <summary>
+		///   Performs the explicit numeric conversions
+		/// </summary>
+		static Expression ConvertNumericExplicit (EmitContext ec, Expression expr, Type target_type)
+		{
+			Type expr_type = expr.Type;
+
+			//
+			// If we have an enumeration, extract the underlying type,
+			// use this during the comparission, but wrap around the original
+			// target_type
+			//
+			Type real_target_type = target_type;
+
+			if (TypeManager.IsEnumType (real_target_type))
+				real_target_type = TypeManager.EnumToUnderlying (real_target_type);
+
+			if (expr_type == TypeManager.sbyte_type){
+				//
+				// From sbyte to byte, ushort, uint, ulong, char
+				//
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I1_U1);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I1_U2);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I1_U4);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I1_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I1_CH);
+			} else if (expr_type == TypeManager.byte_type){
+				//
+				// From byte to sbyte and char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U1_I1);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U1_CH);
+			} else if (expr_type == TypeManager.short_type){
+				//
+				// From short to sbyte, byte, ushort, uint, ulong, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_U1);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_U2);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_U4);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_CH);
+			} else if (expr_type == TypeManager.ushort_type){
+				//
+				// From ushort to sbyte, byte, short, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U2_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U2_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U2_I2);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U2_CH);
+			} else if (expr_type == TypeManager.int32_type){
+				//
+				// From int to sbyte, byte, short, ushort, uint, ulong, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_U2);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_U4);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_CH);
+			} else if (expr_type == TypeManager.uint32_type){
+				//
+				// From uint to sbyte, byte, short, ushort, int, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_U2);
+				if (real_target_type == TypeManager.int32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_I4);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_CH);
+			} else if (expr_type == TypeManager.int64_type){
+				//
+				// From long to sbyte, byte, short, ushort, int, uint, ulong, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_U2);
+				if (real_target_type == TypeManager.int32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_I4);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_U4);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_CH);
+			} else if (expr_type == TypeManager.uint64_type){
+				//
+				// From ulong to sbyte, byte, short, ushort, int, uint, long, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_U2);
+				if (real_target_type == TypeManager.int32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_I4);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_U4);
+				if (real_target_type == TypeManager.int64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_I8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_CH);
+			} else if (expr_type == TypeManager.char_type){
+				//
+				// From char to sbyte, byte, short
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.CH_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.CH_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.CH_I2);
+			} else if (expr_type == TypeManager.float_type){
+				//
+				// From float to sbyte, byte, short,
+				// ushort, int, uint, long, ulong, char
+				// or decimal
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_U2);
+				if (real_target_type == TypeManager.int32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_I4);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_U4);
+				if (real_target_type == TypeManager.int64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_I8);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_CH);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.double_type){
+				//
+				// From double to byte, byte, short,
+				// ushort, int, uint, long, ulong,
+				// char, float or decimal
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_U2);
+				if (real_target_type == TypeManager.int32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_I4);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_U4);
+				if (real_target_type == TypeManager.int64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_I8);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_CH);
+				if (real_target_type == TypeManager.float_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_R4);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} 
+
+			// decimal is taken care of by the op_Explicit methods.
+
+			return null;
+		}
+
+		/// <summary>
+		///  Returns whether an explicit reference conversion can be performed
+		///  from source_type to target_type
+		/// </summary>
+		public static bool ExplicitReferenceConversionExists (Type source_type, Type target_type)
+		{
+			bool target_is_value_type = target_type.IsValueType;
+			
+			if (source_type == target_type)
+				return true;
+			
+			//
+			// From object to any reference type
+			//
+			if (source_type == TypeManager.object_type && !target_is_value_type)
+				return true;
+					
+			//
+			// From any class S to any class-type T, provided S is a base class of T
+			//
+			if (target_type.IsSubclassOf (source_type))
+				return true;
+
+			//
+			// From any interface type S to any interface T provided S is not derived from T
+			//
+			if (source_type.IsInterface && target_type.IsInterface){
+				if (!target_type.IsSubclassOf (source_type))
+					return true;
+			}
+			    
+			//
+			// From any class type S to any interface T, provided S is not sealed
+			// and provided S does not implement T.
+			//
+			if (target_type.IsInterface && !source_type.IsSealed &&
+			    !TypeManager.ImplementsInterface (source_type, target_type))
+				return true;
+
+			//
+			// From any interface-type S to to any class type T, provided T is not
+			// sealed, or provided T implements S.
+			//
+			if (source_type.IsInterface &&
+			    (!target_type.IsSealed || TypeManager.ImplementsInterface (target_type, source_type)))
+				return true;
+			
+			
+			// From an array type S with an element type Se to an array type T with an 
+			// element type Te provided all the following are true:
+			//     * S and T differe only in element type, in other words, S and T
+			//       have the same number of dimensions.
+			//     * Both Se and Te are reference types
+			//     * An explicit referenc conversions exist from Se to Te
+			//
+			if (source_type.IsArray && target_type.IsArray) {
+				if (source_type.GetArrayRank () == target_type.GetArrayRank ()) {
+					
+					Type source_element_type = source_type.GetElementType ();
+					Type target_element_type = target_type.GetElementType ();
+					
+					if (!source_element_type.IsValueType && !target_element_type.IsValueType)
+						if (ExplicitReferenceConversionExists (source_element_type,
+										       target_element_type))
+							return true;
+				}
+			}
+			
+
+			// From System.Array to any array-type
+			if (source_type == TypeManager.array_type &&
+			    target_type.IsArray){
+				return true;
+			}
+
+			//
+			// From System delegate to any delegate-type
+			//
+			if (source_type == TypeManager.delegate_type &&
+			    target_type.IsSubclassOf (TypeManager.delegate_type))
+				return true;
+
+			//
+			// From ICloneable to Array or Delegate types
+			//
+			if (source_type == TypeManager.icloneable_type &&
+			    (target_type == TypeManager.array_type ||
+			     target_type == TypeManager.delegate_type))
+				return true;
+			
+			return false;
+		}
+
+		/// <summary>
+		///   Implements Explicit Reference conversions
+		/// </summary>
+		static Expression ConvertReferenceExplicit (Expression source, Type target_type)
+		{
+			Type source_type = source.Type;
+			bool target_is_value_type = target_type.IsValueType;
+
+			//
+			// From object to any reference type
+			//
+			if (source_type == TypeManager.object_type && !target_is_value_type)
+				return new ClassCast (source, target_type);
+
+
+			//
+			// From any class S to any class-type T, provided S is a base class of T
+			//
+			if (target_type.IsSubclassOf (source_type))
+				return new ClassCast (source, target_type);
+
+			//
+			// From any interface type S to any interface T provided S is not derived from T
+			//
+			if (source_type.IsInterface && target_type.IsInterface){
+				if (TypeManager.ImplementsInterface (source_type, target_type))
+					return null;
+				else
+					return new ClassCast (source, target_type);
+			}
+			    
+			//
+			// From any class type S to any interface T, provides S is not sealed
+			// and provided S does not implement T.
+			//
+			if (target_type.IsInterface && !source_type.IsSealed) {
+				if (TypeManager.ImplementsInterface (source_type, target_type))
+					return null;
+				else
+					return new ClassCast (source, target_type);
+				
+			}
+
+			//
+			// From any interface-type S to to any class type T, provided T is not
+			// sealed, or provided T implements S.
+			//
+			if (source_type.IsInterface) {
+				if (!target_type.IsSealed || TypeManager.ImplementsInterface (target_type, source_type))
+					return new ClassCast (source, target_type);
+				else
+					return null;
+			}
+			
+			// From an array type S with an element type Se to an array type T with an 
+			// element type Te provided all the following are true:
+			//     * S and T differe only in element type, in other words, S and T
+			//       have the same number of dimensions.
+			//     * Both Se and Te are reference types
+			//     * An explicit referenc conversions exist from Se to Te
+			//
+			if (source_type.IsArray && target_type.IsArray) {
+				if (source_type.GetArrayRank () == target_type.GetArrayRank ()) {
+					
+					Type source_element_type = source_type.GetElementType ();
+					Type target_element_type = target_type.GetElementType ();
+					
+					if (!source_element_type.IsValueType && !target_element_type.IsValueType)
+						if (ExplicitReferenceConversionExists (source_element_type,
+										       target_element_type))
+							return new ClassCast (source, target_type);
+				}
+			}
+			
+
+			// From System.Array to any array-type
+			if (source_type == TypeManager.array_type &&
+			    target_type.IsArray) {
+				return new ClassCast (source, target_type);
+			}
+
+			//
+			// From System delegate to any delegate-type
+			//
+			if (source_type == TypeManager.delegate_type &&
+			    target_type.IsSubclassOf (TypeManager.delegate_type))
+				return new ClassCast (source, target_type);
+
+			//
+			// From ICloneable to Array or Delegate types
+			//
+			if (source_type == TypeManager.icloneable_type &&
+			    (target_type == TypeManager.array_type ||
+			     target_type == TypeManager.delegate_type))
+				return new ClassCast (source, target_type);
+			
+			return null;
+		}
+		
+		/// <summary>
+		///   Performs an explicit conversion of the expression `expr' whose
+		///   type is expr.Type to `target_type'.
+		/// </summary>
+		static public Expression ConvertExplicit (EmitContext ec, Expression expr,
+							  Type target_type, Location loc)
+		{
+			Type expr_type = expr.Type;
+			Expression ne = ConvertImplicitStandard (ec, expr, target_type, loc);
+
+			if (ne != null)
+				return ne;
+
+			ne = ConvertNumericExplicit (ec, expr, target_type);
+			if (ne != null)
+				return ne;
+
+			//
+			// Unboxing conversion.
+			//
+			if (expr_type == TypeManager.object_type && target_type.IsValueType)
+				return new UnboxCast (expr, target_type);
+
+			//
+			// Enum types
+			//
+			if (expr_type.IsSubclassOf (TypeManager.enum_type)) {
+				Expression e;
+
+				//
+				// FIXME: Is there any reason we should have EnumConstant
+				// dealt with here instead of just using always the
+				// UnderlyingSystemType to wrap the type?
+				//
+				if (expr is EnumConstant)
+					e = ((EnumConstant) expr).Child;
+				else {
+					e = new EmptyCast (expr, TypeManager.EnumToUnderlying (expr_type));
+				}
+				
+				Expression t = ConvertImplicit (ec, e, target_type, loc);
+				if (t != null)
+					return t;
+				
+				return ConvertNumericExplicit (ec, e, target_type);
+			}
+			
+			ne = ConvertReferenceExplicit (expr, target_type);
+			if (ne != null)
+				return ne;
+
+			if (ec.InUnsafe){
+				if (target_type.IsPointer){
+					if (expr_type.IsPointer)
+						return new EmptyCast (expr, target_type);
+					
+					if (expr_type == TypeManager.sbyte_type ||
+					    expr_type == TypeManager.byte_type ||
+					    expr_type == TypeManager.short_type ||
+					    expr_type == TypeManager.ushort_type ||
+					    expr_type == TypeManager.int32_type ||
+					    expr_type == TypeManager.uint32_type ||
+					    expr_type == TypeManager.uint64_type ||
+					    expr_type == TypeManager.int64_type)
+						return new OpcodeCast (expr, target_type, OpCodes.Conv_U);
+				}
+				if (expr_type.IsPointer){
+					if (target_type == TypeManager.sbyte_type ||
+					    target_type == TypeManager.byte_type ||
+					    target_type == TypeManager.short_type ||
+					    target_type == TypeManager.ushort_type ||
+					    target_type == TypeManager.int32_type ||
+					    target_type == TypeManager.uint32_type ||
+					    target_type == TypeManager.uint64_type ||
+					    target_type == TypeManager.int64_type){
+						Expression e = new EmptyCast (expr, TypeManager.uint32_type);
+						Expression ci, ce;
+
+						ci = ConvertImplicitStandard (ec, e, target_type, loc);
+
+						if (ci != null)
+							return ci;
+
+						ce = ConvertNumericExplicit (ec, e, target_type);
+						if (ce != null)
+							return ce;
+						//
+						// We should always be able to go from an uint32
+						// implicitly or explicitly to the other integral
+						// types
+						//
+						throw new Exception ("Internal compiler error");
+					}
+				}
+			}
+			
+			ne = ExplicitUserConversion (ec, expr, target_type, loc);
+			if (ne != null)
+				return ne;
+
+			Error_CannotConvertType (loc, expr_type, target_type);
+			return null;
+		}
+
+		/// <summary>
+		///   Same as ConvertExplicit, only it doesn't include user defined conversions
+		/// </summary>
+		static public Expression ConvertExplicitStandard (EmitContext ec, Expression expr,
+								  Type target_type, Location l)
+		{
+			Expression ne = ConvertImplicitStandard (ec, expr, target_type, l);
+
+			if (ne != null)
+				return ne;
+
+			ne = ConvertNumericExplicit (ec, expr, target_type);
+			if (ne != null)
+				return ne;
+
+			ne = ConvertReferenceExplicit (expr, target_type);
+			if (ne != null)
+				return ne;
+
+			Error_CannotConvertType (l, expr.Type, target_type);
+			return null;
+		}
+
+		static string ExprClassName (ExprClass c)
+		{
+			switch (c){
+			case ExprClass.Invalid:
+				return "Invalid";
+			case ExprClass.Value:
+				return "value";
+			case ExprClass.Variable:
+				return "variable";
+			case ExprClass.Namespace:
+				return "namespace";
+			case ExprClass.Type:
+				return "type";
+			case ExprClass.MethodGroup:
+				return "method group";
+			case ExprClass.PropertyAccess:
+				return "property access";
+			case ExprClass.EventAccess:
+				return "event access";
+			case ExprClass.IndexerAccess:
+				return "indexer access";
+			case ExprClass.Nothing:
+				return "null";
+			}
+			throw new Exception ("Should not happen");
+		}
+		
+		/// <summary>
+		///   Reports that we were expecting `expr' to be of class `expected'
+		/// </summary>
+		public void Error118 (string expected)
+		{
+			string kind = "Unknown";
+			
+			kind = ExprClassName (eclass);
+
+			Error (118, "Expression denotes a `" + kind +
+			       "' where a `" + expected + "' was expected");
+		}
+
+		static void Error_ConstantValueCannotBeConverted (Location l, string val, Type t)
+		{
+			Report.Error (31, l, "Constant value `" + val + "' cannot be converted to " +
+				      TypeManager.CSharpName (t));
+		}
+
+		public static void UnsafeError (Location loc)
+		{
+			Report.Error (214, loc, "Pointers may only be used in an unsafe context");
+		}
+		
+		/// <summary>
+		///   Converts the IntConstant, UIntConstant, LongConstant or
+		///   ULongConstant into the integral target_type.   Notice
+		///   that we do not return an `Expression' we do return
+		///   a boxed integral type.
+		///
+		///   FIXME: Since I added the new constants, we need to
+		///   also support conversions from CharConstant, ByteConstant,
+		///   SByteConstant, UShortConstant, ShortConstant
+		///
+		///   This is used by the switch statement, so the domain
+		///   of work is restricted to the literals above, and the
+		///   targets are int32, uint32, char, byte, sbyte, ushort,
+		///   short, uint64 and int64
+		/// </summary>
+		public static object ConvertIntLiteral (Constant c, Type target_type, Location loc)
+		{
+			string s = "";
+
+			if (c.Type == target_type)
+				return ((Constant) c).GetValue ();
+
+			//
+			// Make into one of the literals we handle, we dont really care
+			// about this value as we will just return a few limited types
+			// 
+			if (c is EnumConstant)
+				c = ((EnumConstant)c).WidenToCompilerConstant ();
+
+			if (c is IntConstant){
+				int v = ((IntConstant) c).Value;
+				
+				if (target_type == TypeManager.uint32_type){
+					if (v >= 0)
+						return (uint) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= Char.MinValue && v <= Char.MaxValue)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v >= SByte.MinValue && v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v >= Int16.MinValue && v <= UInt16.MaxValue)
+						return (short) v;
+				} else if (target_type == TypeManager.ushort_type){
+					if (v >= UInt16.MinValue && v <= UInt16.MaxValue)
+						return (ushort) v;
+				} else if (target_type == TypeManager.int64_type)
+					return (long) v;
+			        else if (target_type == TypeManager.uint64_type){
+					if (v > 0)
+						return (ulong) v;
+				}
+
+				s = v.ToString ();
+			} else if (c is	UIntConstant){
+				uint v = ((UIntConstant) c).Value;
+
+				if (target_type == TypeManager.int32_type){
+					if (v <= Int32.MaxValue)
+						return (int) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= Char.MinValue && v <= Char.MaxValue)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v <= UInt16.MaxValue)
+						return (short) v;
+				} else if (target_type == TypeManager.ushort_type){
+					if (v <= UInt16.MaxValue)
+						return (ushort) v;
+				} else if (target_type == TypeManager.int64_type)
+					return (long) v;
+			        else if (target_type == TypeManager.uint64_type)
+					return (ulong) v;
+				s = v.ToString ();
+			} else if (c is	LongConstant){ 
+				long v = ((LongConstant) c).Value;
+
+				if (target_type == TypeManager.int32_type){
+					if (v >= UInt32.MinValue && v <= UInt32.MaxValue)
+						return (int) v;
+				} else if (target_type == TypeManager.uint32_type){
+					if (v >= 0 && v <= UInt32.MaxValue)
+						return (uint) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= Char.MinValue && v <= Char.MaxValue)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v >= SByte.MinValue && v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v >= Int16.MinValue && v <= UInt16.MaxValue)
+						return (short) v;
+				} else if (target_type == TypeManager.ushort_type){
+					if (v >= UInt16.MinValue && v <= UInt16.MaxValue)
+						return (ushort) v;
+			        } else if (target_type == TypeManager.uint64_type){
+					if (v > 0)
+						return (ulong) v;
+				}
+				s = v.ToString ();
+			} else if (c is	ULongConstant){
+				ulong v = ((ULongConstant) c).Value;
+
+				if (target_type == TypeManager.int32_type){
+					if (v <= Int32.MaxValue)
+						return (int) v;
+				} else if (target_type == TypeManager.uint32_type){
+					if (v <= UInt32.MaxValue)
+						return (uint) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= Char.MinValue && v <= Char.MaxValue)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v <= (int) SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v <= UInt16.MaxValue)
+						return (short) v;
+				} else if (target_type == TypeManager.ushort_type){
+					if (v <= UInt16.MaxValue)
+						return (ushort) v;
+			        } else if (target_type == TypeManager.int64_type){
+					if (v <= Int64.MaxValue)
+						return (long) v;
+				}
+				s = v.ToString ();
+			} else if (c is ByteConstant){
+				byte v = ((ByteConstant) c).Value;
+				
+				if (target_type == TypeManager.int32_type)
+					return (int) v;
+				else if (target_type == TypeManager.uint32_type)
+					return (uint) v;
+				else if (target_type == TypeManager.char_type)
+					return (char) v;
+				else if (target_type == TypeManager.sbyte_type){
+					if (v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type)
+					return (short) v;
+				else if (target_type == TypeManager.ushort_type)
+					return (ushort) v;
+			        else if (target_type == TypeManager.int64_type)
+					return (long) v;
+				else if (target_type == TypeManager.uint64_type)
+					return (ulong) v;
+				s = v.ToString ();
+			} else if (c is SByteConstant){
+				sbyte v = ((SByteConstant) c).Value;
+				
+				if (target_type == TypeManager.int32_type)
+					return (int) v;
+				else if (target_type == TypeManager.uint32_type){
+					if (v >= 0)
+						return (uint) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= 0)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= 0)
+						return (byte) v;
+				} else if (target_type == TypeManager.short_type)
+					return (short) v;
+				else if (target_type == TypeManager.ushort_type){
+					if (v >= 0)
+						return (ushort) v;
+			        } else if (target_type == TypeManager.int64_type)
+					return (long) v;
+				else if (target_type == TypeManager.uint64_type){
+					if (v >= 0)
+						return (ulong) v;
+				}
+				s = v.ToString ();
+			} else if (c is ShortConstant){
+				short v = ((ShortConstant) c).Value;
+				
+				if (target_type == TypeManager.int32_type){
+					return (int) v;
+				} else if (target_type == TypeManager.uint32_type){
+					if (v >= 0)
+						return (uint) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= 0)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v >= SByte.MinValue && v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.ushort_type){
+					if (v >= 0)
+						return (ushort) v;
+			        } else if (target_type == TypeManager.int64_type)
+					return (long) v;
+				else if (target_type == TypeManager.uint64_type)
+					return (ulong) v;
+
+				s = v.ToString ();
+			} else if (c is UShortConstant){
+				ushort v = ((UShortConstant) c).Value;
+				
+				if (target_type == TypeManager.int32_type)
+					return (int) v;
+				else if (target_type == TypeManager.uint32_type)
+					return (uint) v;
+				else if (target_type == TypeManager.char_type){
+					if (v >= Char.MinValue && v <= Char.MaxValue)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v <= SByte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v <= Int16.MaxValue)
+						return (short) v;
+			        } else if (target_type == TypeManager.int64_type)
+					return (long) v;
+				else if (target_type == TypeManager.uint64_type)
+					return (ulong) v;
+
+				s = v.ToString ();
+			} else if (c is CharConstant){
+				char v = ((CharConstant) c).Value;
+				
+				if (target_type == TypeManager.int32_type)
+					return (int) v;
+				else if (target_type == TypeManager.uint32_type)
+					return (uint) v;
+				else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v <= Int16.MaxValue)
+						return (short) v;
+				} else if (target_type == TypeManager.ushort_type)
+					return (short) v;
+			        else if (target_type == TypeManager.int64_type)
+					return (long) v;
+				else if (target_type == TypeManager.uint64_type)
+					return (ulong) v;
+
+				s = v.ToString ();
+			}
+			Error_ConstantValueCannotBeConverted (loc, s, target_type);
+			return null;
+		}
+
+		//
+		// Load the object from the pointer.  
+		//
+		public static void LoadFromPtr (ILGenerator ig, Type t)
+		{
+			if (t == TypeManager.int32_type)
+				ig.Emit (OpCodes.Ldind_I4);
+			else if (t == TypeManager.uint32_type)
+				ig.Emit (OpCodes.Ldind_U4);
+			else if (t == TypeManager.short_type)
+				ig.Emit (OpCodes.Ldind_I2);
+			else if (t == TypeManager.ushort_type)
+				ig.Emit (OpCodes.Ldind_U2);
+			else if (t == TypeManager.char_type)
+				ig.Emit (OpCodes.Ldind_U2);
+			else if (t == TypeManager.byte_type)
+				ig.Emit (OpCodes.Ldind_U1);
+			else if (t == TypeManager.sbyte_type)
+				ig.Emit (OpCodes.Ldind_I1);
+			else if (t == TypeManager.uint64_type)
+				ig.Emit (OpCodes.Ldind_I8);
+			else if (t == TypeManager.int64_type)
+				ig.Emit (OpCodes.Ldind_I8);
+			else if (t == TypeManager.float_type)
+				ig.Emit (OpCodes.Ldind_R4);
+			else if (t == TypeManager.double_type)
+				ig.Emit (OpCodes.Ldind_R8);
+			else if (t == TypeManager.bool_type)
+				ig.Emit (OpCodes.Ldind_I1);
+			else if (t == TypeManager.intptr_type)
+				ig.Emit (OpCodes.Ldind_I);
+			else if (TypeManager.IsEnumType (t)) {
+				if (t == TypeManager.enum_type)
+					ig.Emit (OpCodes.Ldind_Ref);
+				else
+					LoadFromPtr (ig, TypeManager.EnumToUnderlying (t));
+			} else if (t.IsValueType)
+				ig.Emit (OpCodes.Ldobj, t);
+			else
+				ig.Emit (OpCodes.Ldind_Ref);
+		}
+
+		//
+		// The stack contains the pointer and the value of type `type'
+		//
+		public static void StoreFromPtr (ILGenerator ig, Type type)
+		{
+			if (type.IsEnum)
+				type = TypeManager.EnumToUnderlying (type);
+			if (type == TypeManager.int32_type || type == TypeManager.uint32_type)
+				ig.Emit (OpCodes.Stind_I4);
+			else if (type == TypeManager.int64_type || type == TypeManager.uint64_type)
+				ig.Emit (OpCodes.Stind_I8);
+			else if (type == TypeManager.char_type || type == TypeManager.short_type ||
+				 type == TypeManager.ushort_type)
+				ig.Emit (OpCodes.Stind_I2);
+			else if (type == TypeManager.float_type)
+				ig.Emit (OpCodes.Stind_R4);
+			else if (type == TypeManager.double_type)
+				ig.Emit (OpCodes.Stind_R8);
+			else if (type == TypeManager.byte_type || type == TypeManager.sbyte_type ||
+				 type == TypeManager.bool_type)
+				ig.Emit (OpCodes.Stind_I1);
+			else if (type == TypeManager.intptr_type)
+				ig.Emit (OpCodes.Stind_I);
+			else if (type.IsValueType)
+				ig.Emit (OpCodes.Stobj, type);
+			else
+				ig.Emit (OpCodes.Stind_Ref);
+		}
+		
+		//
+		// Returns the size of type `t' if known, otherwise, 0
+		//
+		public static int GetTypeSize (Type t)
+		{
+			t = TypeManager.TypeToCoreType (t);
+			if (t == TypeManager.int32_type ||
+			    t == TypeManager.uint32_type ||
+			    t == TypeManager.float_type)
+			        return 4;
+			else if (t == TypeManager.int64_type ||
+				 t == TypeManager.uint64_type ||
+				 t == TypeManager.double_type)
+			        return 8;
+			else if (t == TypeManager.byte_type ||
+				 t == TypeManager.sbyte_type ||
+				 t == TypeManager.bool_type) 	
+			        return 1;
+			else if (t == TypeManager.short_type ||
+				 t == TypeManager.char_type ||
+				 t == TypeManager.ushort_type)
+				return 2;
+			else
+				return 0;
+		}
+
+		//
+		// Default implementation of IAssignMethod.CacheTemporaries
+		//
+		public void CacheTemporaries (EmitContext ec)
+		{
+		}
+
+		static void Error_NegativeArrayIndex (Location loc)
+		{
+			Report.Error (284, loc, "Can not create array with a negative size");
+		}
+		
+		//
+		// Converts `source' to an int, uint, long or ulong.
+		//
+		public Expression ExpressionToArrayArgument (EmitContext ec, Expression source, Location loc)
+		{
+			Expression target;
+			
+			bool old_checked = ec.CheckState;
+			ec.CheckState = true;
+			
+			target = ConvertImplicit (ec, source, TypeManager.int32_type, loc);
+			if (target == null){
+				target = ConvertImplicit (ec, source, TypeManager.uint32_type, loc);
+				if (target == null){
+					target = ConvertImplicit (ec, source, TypeManager.int64_type, loc);
+					if (target == null){
+						target = ConvertImplicit (ec, source, TypeManager.uint64_type, loc);
+						if (target == null)
+							Expression.Error_CannotConvertImplicit (loc, source.Type, TypeManager.int32_type);
+					}
+				}
+			} 
+			ec.CheckState = old_checked;
+
+			//
+			// Only positive constants are allowed at compile time
+			//
+			if (target is Constant){
+				if (target is IntConstant){
+					if (((IntConstant) target).Value < 0){
+						Error_NegativeArrayIndex (loc);
+						return null;
+					}
+				}
+
+				if (target is LongConstant){
+					if (((LongConstant) target).Value < 0){
+						Error_NegativeArrayIndex (loc);
+						return null;
+					}
+				}
+				
+			}
+
+			return target;
+		}
+		
+	}
+
+	/// <summary>
+	///   This is just a base class for expressions that can
+	///   appear on statements (invocations, object creation,
+	///   assignments, post/pre increment and decrement).  The idea
+	///   being that they would support an extra Emition interface that
+	///   does not leave a result on the stack.
+	/// </summary>
+	public abstract class ExpressionStatement : Expression {
+
+		/// <summary>
+		///   Requests the expression to be emitted in a `statement'
+		///   context.  This means that no new value is left on the
+		///   stack after invoking this method (constrasted with
+		///   Emit that will always leave a value on the stack).
+		/// </summary>
+		public abstract void EmitStatement (EmitContext ec);
+	}
+
+	/// <summary>
+	///   This kind of cast is used to encapsulate the child
+	///   whose type is child.Type into an expression that is
+	///   reported to return "return_type".  This is used to encapsulate
+	///   expressions which have compatible types, but need to be dealt
+	///   at higher levels with.
+	///
+	///   For example, a "byte" expression could be encapsulated in one
+	///   of these as an "unsigned int".  The type for the expression
+	///   would be "unsigned int".
+	///
+	/// </summary>
+	public class EmptyCast : Expression {
+		protected Expression child;
+
+		public EmptyCast (Expression child, Type return_type)
+		{
+			eclass = child.eclass;
+			type = return_type;
+			this.child = child;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			child.Emit (ec);
+		}
+	}
+
+	/// <summary>
+	///  This class is used to wrap literals which belong inside Enums
+	/// </summary>
+	public class EnumConstant : Constant {
+		public Constant Child;
+
+		public EnumConstant (Constant child, Type enum_type)
+		{
+			eclass = child.eclass;
+			this.Child = child;
+			type = enum_type;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			Child.Emit (ec);
+		}
+
+		public override object GetValue ()
+		{
+			return Child.GetValue ();
+		}
+
+		//
+		// Converts from one of the valid underlying types for an enumeration
+		// (int32, uint32, int64, uint64, short, ushort, byte, sbyte) to
+		// one of the internal compiler literals: Int/UInt/Long/ULong Literals.
+		//
+		public Constant WidenToCompilerConstant ()
+		{
+			Type t = TypeManager.EnumToUnderlying (Child.Type);
+			object v = ((Constant) Child).GetValue ();;
+			
+			if (t == TypeManager.int32_type)
+				return new IntConstant ((int) v);
+			if (t == TypeManager.uint32_type)
+				return new UIntConstant ((uint) v);
+			if (t == TypeManager.int64_type)
+				return new LongConstant ((long) v);
+			if (t == TypeManager.uint64_type)
+				return new ULongConstant ((ulong) v);
+			if (t == TypeManager.short_type)
+				return new ShortConstant ((short) v);
+			if (t == TypeManager.ushort_type)
+				return new UShortConstant ((ushort) v);
+			if (t == TypeManager.byte_type)
+				return new ByteConstant ((byte) v);
+			if (t == TypeManager.sbyte_type)
+				return new SByteConstant ((sbyte) v);
+
+			throw new Exception ("Invalid enumeration underlying type: " + t);
+		}
+
+		//
+		// Extracts the value in the enumeration on its native representation
+		//
+		public object GetPlainValue ()
+		{
+			Type t = TypeManager.EnumToUnderlying (Child.Type);
+			object v = ((Constant) Child).GetValue ();;
+			
+			if (t == TypeManager.int32_type)
+				return (int) v;
+			if (t == TypeManager.uint32_type)
+				return (uint) v;
+			if (t == TypeManager.int64_type)
+				return (long) v;
+			if (t == TypeManager.uint64_type)
+				return (ulong) v;
+			if (t == TypeManager.short_type)
+				return (short) v;
+			if (t == TypeManager.ushort_type)
+				return (ushort) v;
+			if (t == TypeManager.byte_type)
+				return (byte) v;
+			if (t == TypeManager.sbyte_type)
+				return (sbyte) v;
+
+			return null;
+		}
+		
+		public override string AsString ()
+		{
+			return Child.AsString ();
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return Child.ConvertToDouble ();
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return Child.ConvertToFloat ();
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return Child.ConvertToULong ();
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return Child.ConvertToLong ();
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return Child.ConvertToUInt ();
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return Child.ConvertToInt ();
+		}
+	}
+
+	/// <summary>
+	///   This kind of cast is used to encapsulate Value Types in objects.
+	///
+	///   The effect of it is to box the value type emitted by the previous
+	///   operation.
+	/// </summary>
+	public class BoxedCast : EmptyCast {
+
+		public BoxedCast (Expression expr)
+			: base (expr, TypeManager.object_type)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			base.Emit (ec);
+			
+			ec.ig.Emit (OpCodes.Box, child.Type);
+		}
+	}
+
+	public class UnboxCast : EmptyCast {
+		public UnboxCast (Expression expr, Type return_type)
+			: base (expr, return_type)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			Type t = type;
+			ILGenerator ig = ec.ig;
+			
+			base.Emit (ec);
+			ig.Emit (OpCodes.Unbox, t);
+
+			LoadFromPtr (ig, t);
+		}
+	}
+	
+	/// <summary>
+	///   This is used to perform explicit numeric conversions.
+	///
+	///   Explicit numeric conversions might trigger exceptions in a checked
+	///   context, so they should generate the conv.ovf opcodes instead of
+	///   conv opcodes.
+	/// </summary>
+	public class ConvCast : EmptyCast {
+		public enum Mode : byte {
+			I1_U1, I1_U2, I1_U4, I1_U8, I1_CH,
+			U1_I1, U1_CH,
+			I2_I1, I2_U1, I2_U2, I2_U4, I2_U8, I2_CH,
+			U2_I1, U2_U1, U2_I2, U2_CH,
+			I4_I1, I4_U1, I4_I2, I4_U2, I4_U4, I4_U8, I4_CH,
+			U4_I1, U4_U1, U4_I2, U4_U2, U4_I4, U4_CH,
+			I8_I1, I8_U1, I8_I2, I8_U2, I8_I4, I8_U4, I8_U8, I8_CH,
+			U8_I1, U8_U1, U8_I2, U8_U2, U8_I4, U8_U4, U8_I8, U8_CH,
+			CH_I1, CH_U1, CH_I2,
+			R4_I1, R4_U1, R4_I2, R4_U2, R4_I4, R4_U4, R4_I8, R4_U8, R4_CH,
+			R8_I1, R8_U1, R8_I2, R8_U2, R8_I4, R8_U4, R8_I8, R8_U8, R8_CH, R8_R4
+		}
+
+		Mode mode;
+		bool checked_state;
+		
+		public ConvCast (EmitContext ec, Expression child, Type return_type, Mode m)
+			: base (child, return_type)
+		{
+			checked_state = ec.CheckState;
+			mode = m;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			base.Emit (ec);
+
+			if (checked_state){
+				switch (mode){
+				case Mode.I1_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.I1_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.I1_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.I1_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.I1_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+
+				case Mode.U1_I1: ig.Emit (OpCodes.Conv_Ovf_I1_Un); break;
+				case Mode.U1_CH: /* nothing */ break;
+
+				case Mode.I2_I1: ig.Emit (OpCodes.Conv_Ovf_I1); break;
+				case Mode.I2_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.I2_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.I2_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.I2_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.I2_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+
+				case Mode.U2_I1: ig.Emit (OpCodes.Conv_Ovf_I1_Un); break;
+				case Mode.U2_U1: ig.Emit (OpCodes.Conv_Ovf_U1_Un); break;
+				case Mode.U2_I2: ig.Emit (OpCodes.Conv_Ovf_I2_Un); break;
+				case Mode.U2_CH: /* nothing */ break;
+
+				case Mode.I4_I1: ig.Emit (OpCodes.Conv_Ovf_I1); break;
+				case Mode.I4_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.I4_I2: ig.Emit (OpCodes.Conv_Ovf_I2); break;
+				case Mode.I4_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.I4_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.I4_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.I4_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+
+				case Mode.U4_I1: ig.Emit (OpCodes.Conv_Ovf_I1_Un); break;
+				case Mode.U4_U1: ig.Emit (OpCodes.Conv_Ovf_U1_Un); break;
+				case Mode.U4_I2: ig.Emit (OpCodes.Conv_Ovf_I2_Un); break;
+				case Mode.U4_U2: ig.Emit (OpCodes.Conv_Ovf_U2_Un); break;
+				case Mode.U4_I4: ig.Emit (OpCodes.Conv_Ovf_I4_Un); break;
+				case Mode.U4_CH: ig.Emit (OpCodes.Conv_Ovf_U2_Un); break;
+
+				case Mode.I8_I1: ig.Emit (OpCodes.Conv_Ovf_I1); break;
+				case Mode.I8_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.I8_I2: ig.Emit (OpCodes.Conv_Ovf_I2); break;
+				case Mode.I8_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.I8_I4: ig.Emit (OpCodes.Conv_Ovf_I4); break;
+				case Mode.I8_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.I8_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.I8_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+
+				case Mode.U8_I1: ig.Emit (OpCodes.Conv_Ovf_I1_Un); break;
+				case Mode.U8_U1: ig.Emit (OpCodes.Conv_Ovf_U1_Un); break;
+				case Mode.U8_I2: ig.Emit (OpCodes.Conv_Ovf_I2_Un); break;
+				case Mode.U8_U2: ig.Emit (OpCodes.Conv_Ovf_U2_Un); break;
+				case Mode.U8_I4: ig.Emit (OpCodes.Conv_Ovf_I4_Un); break;
+				case Mode.U8_U4: ig.Emit (OpCodes.Conv_Ovf_U4_Un); break;
+				case Mode.U8_I8: ig.Emit (OpCodes.Conv_Ovf_I8_Un); break;
+				case Mode.U8_CH: ig.Emit (OpCodes.Conv_Ovf_U2_Un); break;
+
+				case Mode.CH_I1: ig.Emit (OpCodes.Conv_Ovf_I1_Un); break;
+				case Mode.CH_U1: ig.Emit (OpCodes.Conv_Ovf_U1_Un); break;
+				case Mode.CH_I2: ig.Emit (OpCodes.Conv_Ovf_I2_Un); break;
+
+				case Mode.R4_I1: ig.Emit (OpCodes.Conv_Ovf_I1); break;
+				case Mode.R4_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.R4_I2: ig.Emit (OpCodes.Conv_Ovf_I2); break;
+				case Mode.R4_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.R4_I4: ig.Emit (OpCodes.Conv_Ovf_I4); break;
+				case Mode.R4_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.R4_I8: ig.Emit (OpCodes.Conv_Ovf_I8); break;
+				case Mode.R4_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.R4_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+
+				case Mode.R8_I1: ig.Emit (OpCodes.Conv_Ovf_I1); break;
+				case Mode.R8_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.R8_I2: ig.Emit (OpCodes.Conv_Ovf_I2); break;
+				case Mode.R8_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.R8_I4: ig.Emit (OpCodes.Conv_Ovf_I4); break;
+				case Mode.R8_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.R8_I8: ig.Emit (OpCodes.Conv_Ovf_I8); break;
+				case Mode.R8_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.R8_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.R8_R4: ig.Emit (OpCodes.Conv_R4); break;
+				}
+			} else {
+				switch (mode){
+				case Mode.I1_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.I1_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.I1_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.I1_U8: ig.Emit (OpCodes.Conv_I8); break;
+				case Mode.I1_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.U1_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.U1_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.I2_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.I2_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.I2_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.I2_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.I2_U8: ig.Emit (OpCodes.Conv_I8); break;
+				case Mode.I2_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.U2_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.U2_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.U2_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.U2_CH: /* nothing */ break;
+
+				case Mode.I4_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.I4_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.I4_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.I4_U4: /* nothing */ break;
+				case Mode.I4_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.I4_U8: ig.Emit (OpCodes.Conv_I8); break;
+				case Mode.I4_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.U4_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.U4_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.U4_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.U4_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.U4_I4: /* nothing */ break;
+				case Mode.U4_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.I8_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.I8_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.I8_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.I8_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.I8_I4: ig.Emit (OpCodes.Conv_I4); break;
+				case Mode.I8_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.I8_U8: /* nothing */ break;
+				case Mode.I8_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.U8_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.U8_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.U8_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.U8_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.U8_I4: ig.Emit (OpCodes.Conv_I4); break;
+				case Mode.U8_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.U8_I8: /* nothing */ break;
+				case Mode.U8_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.CH_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.CH_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.CH_I2: ig.Emit (OpCodes.Conv_I2); break;
+
+				case Mode.R4_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.R4_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.R4_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.R4_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.R4_I4: ig.Emit (OpCodes.Conv_I4); break;
+				case Mode.R4_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.R4_I8: ig.Emit (OpCodes.Conv_I8); break;
+				case Mode.R4_U8: ig.Emit (OpCodes.Conv_U8); break;
+				case Mode.R4_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.R8_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.R8_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.R8_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.R8_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.R8_I4: ig.Emit (OpCodes.Conv_I4); break;
+				case Mode.R8_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.R8_I8: ig.Emit (OpCodes.Conv_I8); break;
+				case Mode.R8_U8: ig.Emit (OpCodes.Conv_U8); break;
+				case Mode.R8_CH: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.R8_R4: ig.Emit (OpCodes.Conv_R4); break;
+				}
+			}
+		}
+	}
+	
+	public class OpcodeCast : EmptyCast {
+		OpCode op, op2;
+		bool second_valid;
+		
+		public OpcodeCast (Expression child, Type return_type, OpCode op)
+			: base (child, return_type)
+			
+		{
+			this.op = op;
+			second_valid = false;
+		}
+
+		public OpcodeCast (Expression child, Type return_type, OpCode op, OpCode op2)
+			: base (child, return_type)
+			
+		{
+			this.op = op;
+			this.op2 = op2;
+			second_valid = true;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			base.Emit (ec);
+			ec.ig.Emit (op);
+
+			if (second_valid)
+				ec.ig.Emit (op2);
+		}			
+	}
+
+	/// <summary>
+	///   This kind of cast is used to encapsulate a child and cast it
+	///   to the class requested
+	/// </summary>
+	public class ClassCast : EmptyCast {
+		public ClassCast (Expression child, Type return_type)
+			: base (child, return_type)
+			
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			base.Emit (ec);
+
+			ec.ig.Emit (OpCodes.Castclass, type);
+		}			
+		
+	}
+	
+	/// <summary>
+	///   SimpleName expressions are initially formed of a single
+	///   word and it only happens at the beginning of the expression.
+	/// </summary>
+	///
+	/// <remarks>
+	///   The expression will try to be bound to a Field, a Method
+	///   group or a Property.  If those fail we pass the name to our
+	///   caller and the SimpleName is compounded to perform a type
+	///   lookup.  The idea behind this process is that we want to avoid
+	///   creating a namespace map from the assemblies, as that requires
+	///   the GetExportedTypes function to be called and a hashtable to
+	///   be constructed which reduces startup time.  If later we find
+	///   that this is slower, we should create a `NamespaceExpr' expression
+	///   that fully participates in the resolution process. 
+	///   
+	///   For example `System.Console.WriteLine' is decomposed into
+	///   MemberAccess (MemberAccess (SimpleName ("System"), "Console"), "WriteLine")
+	///   
+	///   The first SimpleName wont produce a match on its own, so it will
+	///   be turned into:
+	///   MemberAccess (SimpleName ("System.Console"), "WriteLine").
+	///   
+	///   System.Console will produce a TypeExpr match.
+	///   
+	///   The downside of this is that we might be hitting `LookupType' too many
+	///   times with this scheme.
+	/// </remarks>
+	public class SimpleName : Expression {
+		public readonly string Name;
+		
+		public SimpleName (string name, Location l)
+		{
+			Name = name;
+			loc = l;
+		}
+
+		public static void Error_ObjectRefRequired (Location l, string name)
+		{
+			Report.Error (
+				120, l,
+				"An object reference is required " +
+				"for the non-static field `"+name+"'");
+		}
+		
+		//
+		// Checks whether we are trying to access an instance
+		// property, method or field from a static body.
+		//
+		Expression MemberStaticCheck (Expression e)
+		{
+			if (e is FieldExpr){
+				FieldInfo fi = ((FieldExpr) e).FieldInfo;
+				
+				if (!fi.IsStatic){
+					Error_ObjectRefRequired (loc, Name);
+					return null;
+				}
+			} else if (e is MethodGroupExpr){
+				MethodGroupExpr mg = (MethodGroupExpr) e;
+
+				if (!mg.RemoveInstanceMethods ()){
+					Error_ObjectRefRequired (loc, mg.Methods [0].Name);
+					return null;
+				}
+				return e;
+			} else if (e is PropertyExpr){
+				if (!((PropertyExpr) e).IsStatic){
+					Error_ObjectRefRequired (loc, Name);
+					return null;
+				}
+			} else if (e is EventExpr) {
+				if (!((EventExpr) e).IsStatic) {
+					Error_ObjectRefRequired (loc, Name);
+					return null;
+				}
+			}
+
+			return e;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return SimpleNameResolve (ec, null, false);
+		}
+
+		public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			return SimpleNameResolve (ec, right_side, false);
+		}
+		
+
+		public Expression DoResolveAllowStatic (EmitContext ec)
+		{
+			return SimpleNameResolve (ec, null, true);
+		}
+
+		/// <remarks>
+		///   7.5.2: Simple Names. 
+		///
+		///   Local Variables and Parameters are handled at
+		///   parse time, so they never occur as SimpleNames.
+		///
+		///   The `allow_static' flag is used by MemberAccess only
+		///   and it is used to inform us that it is ok for us to 
+		///   avoid the static check, because MemberAccess might end
+		///   up resolving the Name as a Type name and the access as
+		///   a static type access.
+		///
+		///   ie: Type Type; .... { Type.GetType (""); }
+		///
+		///   Type is both an instance variable and a Type;  Type.GetType
+		///   is the static method not an instance method of type.
+		/// </remarks>
+		Expression SimpleNameResolve (EmitContext ec, Expression right_side, bool allow_static)
+		{
+			Expression e = null;
+
+			//
+			// Stage 1: Performed by the parser (binding to locals or parameters).
+			//
+			if (!ec.OnlyLookupTypes){
+				Block current_block = ec.CurrentBlock;
+				if (current_block != null && current_block.IsVariableDefined (Name)){
+					LocalVariableReference var;
+					
+					var = new LocalVariableReference (ec.CurrentBlock, Name, loc);
+
+					if (right_side != null)
+						return var.ResolveLValue (ec, right_side);
+					else
+						return var.Resolve (ec);
+				}
+			
+				//
+				// Stage 2: Lookup members 
+				//
+
+				//
+				// For enums, the TypeBuilder is not ec.DeclSpace.TypeBuilder
+				// Hence we have two different cases
+				//
+
+				DeclSpace lookup_ds = ec.DeclSpace;
+				do {
+					if (lookup_ds.TypeBuilder == null)
+						break;
+
+					e = MemberLookup (ec, lookup_ds.TypeBuilder, Name, loc);
+					if (e != null)
+						break;
+
+					//
+					// Classes/structs keep looking, enums break
+					//
+					if (lookup_ds is TypeContainer)
+						lookup_ds = ((TypeContainer) lookup_ds).Parent;
+					else
+						break;
+				} while (lookup_ds != null);
+				
+				if (e == null && ec.ContainerType != null)
+					e = MemberLookup (ec, ec.ContainerType, Name, loc);
+			}
+
+			// Continuation of stage 2
+			if (e == null){
+				//
+				// Stage 3: Lookup symbol in the various namespaces. 
+				//
+				DeclSpace ds = ec.DeclSpace;
+				Type t;
+				string alias_value;
+
+				if ((t = RootContext.LookupType (ds, Name, true, loc)) != null)
+					return new TypeExpr (t, loc);
+				
+				//
+				// Stage 2 part b: Lookup up if we are an alias to a type
+				// or a namespace.
+				//
+				// Since we are cheating: we only do the Alias lookup for
+				// namespaces if the name does not include any dots in it
+				//
+				
+				alias_value = ec.DeclSpace.LookupAlias (Name);
+				
+				if (Name.IndexOf ('.') == -1 && alias_value != null) {
+					if ((t = RootContext.LookupType (ds, alias_value, true, loc))
+					    != null)
+						return new TypeExpr (t, loc);
+					
+				// we have alias value, but it isn't Type, so try if it's namespace
+					return new SimpleName (alias_value, loc);
+				}
+				
+				if (ec.ResolvingTypeTree){
+					Type dt = ec.DeclSpace.FindType (Name);
+					if (dt != null)
+						return new TypeExpr (dt, loc);
+				}
+				
+				// No match, maybe our parent can compose us
+				// into something meaningful.
+				return this;
+			}
+			
+			//
+			// Stage 2 continues here. 
+			// 
+			if (e is TypeExpr)
+				return e;
+
+			if (ec.OnlyLookupTypes)
+				return null;
+			
+			if (e is FieldExpr){
+				FieldExpr fe = (FieldExpr) e;
+				FieldInfo fi = fe.FieldInfo;
+
+				if (fi.FieldType.IsPointer && !ec.InUnsafe){
+					UnsafeError (loc);
+				}
+				
+				if (ec.IsStatic){
+					if (!allow_static && !fi.IsStatic){
+						Error_ObjectRefRequired (loc, Name);
+						return null;
+					}
+				} else {
+					// If we are not in static code and this
+					// field is not static, set the instance to `this'.
+
+					if (!fi.IsStatic)
+						fe.InstanceExpression = ec.This;
+				}
+
+				
+				if (fi is FieldBuilder) {
+					Const c = TypeManager.LookupConstant ((FieldBuilder) fi);
+					
+					if (c != null) {
+						object o = c.LookupConstantValue (ec);
+						if (o == null)
+							return null;
+						object real_value = ((Constant)c.Expr).GetValue ();
+						return Constantify (real_value, fi.FieldType);
+					}
+				}
+
+				if (fi.IsLiteral) {
+					Type t = fi.FieldType;
+					Type decl_type = fi.DeclaringType;
+					object o;
+
+					if (fi is FieldBuilder)
+						o = TypeManager.GetValue ((FieldBuilder) fi);
+					else
+						o = fi.GetValue (fi);
+					
+					if (decl_type.IsSubclassOf (TypeManager.enum_type)) {
+						Expression enum_member = MemberLookup (
+							ec, decl_type, "value__", MemberTypes.Field,
+							AllBindingFlags, loc); 
+
+						Enum en = TypeManager.LookupEnum (decl_type);
+
+						Constant c;
+						if (en != null)
+							c = Constantify (o, en.UnderlyingType);
+						else 
+							c = Constantify (o, enum_member.Type);
+						
+						return new EnumConstant (c, decl_type);
+					}
+					
+					Expression exp = Constantify (o, t);
+				}
+					
+				return e;
+			}
+
+			if (e is PropertyExpr) {
+				PropertyExpr pe = (PropertyExpr) e;
+
+				if (ec.IsStatic){
+					if (allow_static)
+						return e;
+
+					return MemberStaticCheck (e);
+				} else {
+					// If we are not in static code and this
+					// field is not static, set the instance to `this'.
+
+					if (!pe.IsStatic)
+						pe.InstanceExpression = ec.This;
+				}
+
+				return e;
+			}
+
+			if (e is EventExpr) {
+				//
+				// If the event is local to this class, we transform ourselves into
+				// a FieldExpr
+				//
+				EventExpr ee = (EventExpr) e;
+
+				Expression ml = MemberLookup (
+					ec, ec.ContainerType, ee.EventInfo.Name,
+					MemberTypes.Event, AllBindingFlags | BindingFlags.DeclaredOnly, loc);
+
+				if (ml != null) {
+					MemberInfo mi = GetFieldFromEvent ((EventExpr) ml);
+
+					if (mi == null) {
+						//
+						// If this happens, then we have an event with its own
+						// accessors and private field etc so there's no need
+						// to transform ourselves : we should instead flag an error
+						//
+						Assign.error70 (ee.EventInfo, loc);
+						return null;
+					}
+
+					ml = ExprClassFromMemberInfo (ec, mi, loc);
+					
+					if (ml == null) {
+						Report.Error (-200, loc, "Internal error!!");
+						return null;
+					}
+
+					Expression instance_expr;
+					
+					FieldInfo fi = ((FieldExpr) ml).FieldInfo;
+
+					if (fi.IsStatic)
+						instance_expr = null;
+					else {
+						instance_expr = ec.This;
+						instance_expr = instance_expr.Resolve (ec);
+					} 
+					
+					return MemberAccess.ResolveMemberAccess (ec, ml, instance_expr, loc, null);
+				}
+			}
+				
+			
+			if (ec.IsStatic){
+				if (allow_static)
+					return e;
+
+				return MemberStaticCheck (e);
+			} else
+				return e;
+		}
+
+		
+		
+		public override void Emit (EmitContext ec)
+		{
+			//
+			// If this is ever reached, then we failed to
+			// find the name as a namespace
+			//
+
+			Error (103, "The name `" + Name +
+			       "' does not exist in the class `" +
+			       ec.DeclSpace.Name + "'");
+		}
+
+		public override string ToString ()
+		{
+			return Name;
+		}
+	}
+	
+	/// <summary>
+	///   Fully resolved expression that evaluates to a type
+	/// </summary>
+	public class TypeExpr : Expression {
+		public TypeExpr (Type t, Location l)
+		{
+			Type = t;
+			eclass = ExprClass.Type;
+			loc = l;
+		}
+
+		override public Expression DoResolve (EmitContext ec)
+		{
+			return this;
+		}
+
+		override public void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should never be called");
+		}
+	}
+
+	/// <summary>
+	///   Used to create types from a fully qualified name.  These are just used
+	///   by the parser to setup the core types.  A TypeExpression is always
+	///   classified as a type.
+	/// </summary>
+	public class TypeExpression : TypeExpr {
+		string name;
+		
+		public TypeExpression (string name) : base (null, Location.Null)
+		{
+			this.name = name;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			if (type == null)
+				type = RootContext.LookupType (ec.DeclSpace, name, false, Location.Null);
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should never be called");			
+		}
+
+		public override string ToString ()
+		{
+			return name;
+		}
+	}
+
+	/// <summary>
+	///   MethodGroup Expression.
+	///  
+	///   This is a fully resolved expression that evaluates to a type
+	/// </summary>
+	public class MethodGroupExpr : Expression {
+		public MethodBase [] Methods;
+		Expression instance_expression = null;
+		
+		public MethodGroupExpr (MemberInfo [] mi, Location l)
+		{
+			Methods = new MethodBase [mi.Length];
+			mi.CopyTo (Methods, 0);
+			eclass = ExprClass.MethodGroup;
+			type = TypeManager.object_type;
+			loc = l;
+		}
+
+		public MethodGroupExpr (ArrayList list, Location l)
+		{
+			Methods = new MethodBase [list.Count];
+
+			try {
+				list.CopyTo (Methods, 0);
+			} catch {
+				foreach (MemberInfo m in list){
+					if (!(m is MethodBase)){
+						Console.WriteLine ("Name " + m.Name);
+						Console.WriteLine ("Found a: " + m.GetType ().FullName);
+					}
+				}
+				throw;
+			}
+			loc = l;
+			eclass = ExprClass.MethodGroup;
+			type = TypeManager.object_type;
+		}
+		
+		//
+		// `A method group may have associated an instance expression' 
+		// 
+		public Expression InstanceExpression {
+			get {
+				return instance_expression;
+			}
+
+			set {
+				instance_expression = value;
+			}
+		}
+		
+		override public Expression DoResolve (EmitContext ec)
+		{
+			return this;
+		}
+
+		public void ReportUsageError ()
+		{
+			Report.Error (654, loc, "Method `" + Methods [0].DeclaringType + "." +
+				      Methods [0].Name + "()' is referenced without parentheses");
+		}
+
+		override public void Emit (EmitContext ec)
+		{
+			ReportUsageError ();
+		}
+
+		bool RemoveMethods (bool keep_static)
+		{
+			ArrayList smethods = new ArrayList ();
+
+			foreach (MethodBase mb in Methods){
+				if (mb.IsStatic == keep_static)
+					smethods.Add (mb);
+			}
+
+			if (smethods.Count == 0)
+				return false;
+
+			Methods = new MethodBase [smethods.Count];
+			smethods.CopyTo (Methods, 0);
+
+			return true;
+		}
+		
+		/// <summary>
+		///   Removes any instance methods from the MethodGroup, returns
+		///   false if the resulting set is empty.
+		/// </summary>
+		public bool RemoveInstanceMethods ()
+		{
+			return RemoveMethods (true);
+		}
+
+		/// <summary>
+		///   Removes any static methods from the MethodGroup, returns
+		///   false if the resulting set is empty.
+		/// </summary>
+		public bool RemoveStaticMethods ()
+		{
+			return RemoveMethods (false);
+		}
+	}
+
+	/// <summary>
+	///   Fully resolved expression that evaluates to a Field
+	/// </summary>
+	public class FieldExpr : Expression, IAssignMethod, IMemoryLocation {
+		public readonly FieldInfo FieldInfo;
+		public Expression InstanceExpression;
+		
+		public FieldExpr (FieldInfo fi, Location l)
+		{
+			FieldInfo = fi;
+			eclass = ExprClass.Variable;
+			type = fi.FieldType;
+			loc = l;
+		}
+
+		override public Expression DoResolve (EmitContext ec)
+		{
+			if (!FieldInfo.IsStatic){
+				if (InstanceExpression == null){
+					throw new Exception ("non-static FieldExpr without instance var\n" +
+							     "You have to assign the Instance variable\n" +
+							     "Of the FieldExpr to set this\n");
+				}
+
+				InstanceExpression = InstanceExpression.Resolve (ec);
+				if (InstanceExpression == null)
+					return null;
+			}
+
+			return this;
+		}
+
+		void Report_AssignToReadonly (bool is_instance)
+		{
+			string msg;
+			
+			if (is_instance)
+				msg = "Readonly field can not be assigned outside " +
+				"of constructor or variable initializer";
+			else
+				msg = "A static readonly field can only be assigned in " +
+				"a static constructor";
+
+			Report.Error (is_instance ? 191 : 198, loc, msg);
+		}
+		
+		override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			Expression e = DoResolve (ec);
+
+			if (e == null)
+				return null;
+			
+			if (!FieldInfo.IsInitOnly)
+				return this;
+
+			//
+			// InitOnly fields can only be assigned in constructors
+			//
+
+			if (ec.IsConstructor)
+				return this;
+
+			Report_AssignToReadonly (true);
+			
+			return null;
+		}
+
+		override public void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			bool is_volatile = false;
+				
+			if (FieldInfo is FieldBuilder){
+				FieldBase f = TypeManager.GetField (FieldInfo);
+
+				if ((f.ModFlags & Modifiers.VOLATILE) != 0)
+					is_volatile = true;
+				
+				f.status |= Field.Status.USED;
+			}
+			
+			if (FieldInfo.IsStatic){
+				if (is_volatile)
+					ig.Emit (OpCodes.Volatile);
+				
+				ig.Emit (OpCodes.Ldsfld, FieldInfo);
+			} else {
+				if (InstanceExpression.Type.IsValueType){
+					IMemoryLocation ml;
+					LocalTemporary tempo = null;
+					
+					if (!(InstanceExpression is IMemoryLocation)){
+						tempo = new LocalTemporary (
+							ec, InstanceExpression.Type);
+
+						InstanceExpression.Emit (ec);
+						tempo.Store (ec);
+						ml = tempo;
+					} else
+						ml = (IMemoryLocation) InstanceExpression;
+
+					ml.AddressOf (ec, AddressOp.Load);
+				} else 
+					InstanceExpression.Emit (ec);
+
+				if (is_volatile)
+					ig.Emit (OpCodes.Volatile);
+				
+				ig.Emit (OpCodes.Ldfld, FieldInfo);
+			}
+		}
+
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			FieldAttributes fa = FieldInfo.Attributes;
+			bool is_static = (fa & FieldAttributes.Static) != 0;
+			bool is_readonly = (fa & FieldAttributes.InitOnly) != 0;
+			ILGenerator ig = ec.ig;
+
+			if (is_readonly && !ec.IsConstructor){
+				Report_AssignToReadonly (!is_static);
+				return;
+			}
+			
+			if (!is_static){
+				Expression instance = InstanceExpression;
+
+				if (instance.Type.IsValueType){
+					if (instance is IMemoryLocation){
+						IMemoryLocation ml = (IMemoryLocation) instance;
+
+						ml.AddressOf (ec, AddressOp.Store);
+					} else
+						throw new Exception ("The " + instance + " of type " +
+								     instance.Type +
+								     " represents a ValueType and does " +
+								     "not implement IMemoryLocation");
+				} else
+					instance.Emit (ec);
+			}
+			source.Emit (ec);
+
+			if (FieldInfo is FieldBuilder){
+				FieldBase f = TypeManager.GetField (FieldInfo);
+				
+				if ((f.ModFlags & Modifiers.VOLATILE) != 0)
+					ig.Emit (OpCodes.Volatile);
+			}
+			
+			if (is_static)
+				ig.Emit (OpCodes.Stsfld, FieldInfo);
+			else 
+				ig.Emit (OpCodes.Stfld, FieldInfo);
+
+			if (FieldInfo is FieldBuilder){
+				FieldBase f = TypeManager.GetField (FieldInfo);
+
+				f.status |= Field.Status.ASSIGNED;
+			}
+		}
+		
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			ILGenerator ig = ec.ig;
+			
+			if (FieldInfo is FieldBuilder){
+				FieldBase f = TypeManager.GetField (FieldInfo);
+				if ((f.ModFlags & Modifiers.VOLATILE) != 0)
+					ig.Emit (OpCodes.Volatile);
+			}
+
+			if (FieldInfo is FieldBuilder){
+				FieldBase f = TypeManager.GetField (FieldInfo);
+
+				if ((mode & AddressOp.Store) != 0)
+					f.status |= Field.Status.ASSIGNED;
+				if ((mode & AddressOp.Load) != 0)
+					f.status |= Field.Status.USED;
+			}
+
+			//
+			// Handle initonly fields specially: make a copy and then
+			// get the address of the copy.
+			//
+			if (FieldInfo.IsInitOnly){
+				if (ec.IsConstructor) {
+					ig.Emit (OpCodes.Ldsflda, FieldInfo);
+				} else {
+					LocalBuilder local;
+				
+					Emit (ec);
+					local = ig.DeclareLocal (type);
+					ig.Emit (OpCodes.Stloc, local);
+					ig.Emit (OpCodes.Ldloca, local);
+				}
+				return;
+			}
+
+			if (FieldInfo.IsStatic)
+				ig.Emit (OpCodes.Ldsflda, FieldInfo);
+			else {
+				if (InstanceExpression is IMemoryLocation)
+					((IMemoryLocation)InstanceExpression).AddressOf (ec, AddressOp.LoadStore);
+				else
+					InstanceExpression.Emit (ec);
+				ig.Emit (OpCodes.Ldflda, FieldInfo);
+			}
+		}
+	}
+	
+	/// <summary>
+	///   Expression that evaluates to a Property.  The Assign class
+	///   might set the `Value' expression if we are in an assignment.
+	///
+	///   This is not an LValue because we need to re-write the expression, we
+	///   can not take data from the stack and store it.  
+	/// </summary>
+	public class PropertyExpr : ExpressionStatement, IAssignMethod {
+		public readonly PropertyInfo PropertyInfo;
+		public readonly bool IsStatic;
+		public bool IsBase;
+		MethodInfo [] Accessors;
+		
+		Expression instance_expr;
+		
+		public PropertyExpr (PropertyInfo pi, Location l)
+		{
+			PropertyInfo = pi;
+			eclass = ExprClass.PropertyAccess;
+			IsStatic = false;
+			loc = l;
+			Accessors = TypeManager.GetAccessors (pi);
+
+			if (Accessors != null)
+				foreach (MethodInfo mi in Accessors){
+					if (mi != null)
+						if (mi.IsStatic)
+							IsStatic = true;
+				}
+			else
+				Accessors = new MethodInfo [2];
+			
+			type = TypeManager.TypeToCoreType (pi.PropertyType);
+		}
+
+		//
+		// The instance expression associated with this expression
+		//
+		public Expression InstanceExpression {
+			set {
+				instance_expr = value;
+			}
+
+			get {
+				return instance_expr;
+			}
+		}
+
+		public bool VerifyAssignable ()
+		{
+			if (!PropertyInfo.CanWrite){
+				Report.Error (200, loc, 
+					      "The property `" + PropertyInfo.Name +
+					      "' can not be assigned to, as it has not set accessor");
+				return false;
+			}
+
+			return true;
+		}
+
+		override public Expression DoResolve (EmitContext ec)
+		{
+			if (!PropertyInfo.CanRead){
+				Report.Error (154, loc, 
+					      "The property `" + PropertyInfo.Name +
+					      "' can not be used in " +
+					      "this context because it lacks a get accessor");
+				return null;
+			}
+
+			type = PropertyInfo.PropertyType;
+
+			return this;
+		}
+
+		override public void Emit (EmitContext ec)
+		{
+			MethodInfo method = Accessors [0];
+
+			//
+			// Special case: length of single dimension array is turned into ldlen
+			//
+			if (method == TypeManager.int_array_get_length){
+				Type iet = instance_expr.Type;
+
+				//
+				// System.Array.Length can be called, but the Type does not
+				// support invoking GetArrayRank, so test for that case first
+				//
+				if (iet != TypeManager.array_type && (iet.GetArrayRank () == 1)){
+					instance_expr.Emit (ec);
+					ec.ig.Emit (OpCodes.Ldlen);
+					return;
+				}
+			}
+
+			Invocation.EmitCall (ec, IsBase, IsStatic, instance_expr, method, null, loc);
+			
+		}
+
+		//
+		// Implements the IAssignMethod interface for assignments
+		//
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			Argument arg = new Argument (source, Argument.AType.Expression);
+			ArrayList args = new ArrayList ();
+
+			args.Add (arg);
+			Invocation.EmitCall (ec, false, IsStatic, instance_expr, Accessors [1], args, loc);
+		}
+
+		override public void EmitStatement (EmitContext ec)
+		{
+			Emit (ec);
+			ec.ig.Emit (OpCodes.Pop);
+		}
+	}
+
+	/// <summary>
+	///   Fully resolved expression that evaluates to an Event
+	/// </summary>
+	public class EventExpr : Expression {
+		public readonly EventInfo EventInfo;
+		public Expression InstanceExpression;
+
+		public readonly bool IsStatic;
+
+		MethodInfo add_accessor, remove_accessor;
+		
+		public EventExpr (EventInfo ei, Location loc)
+		{
+			EventInfo = ei;
+			this.loc = loc;
+			eclass = ExprClass.EventAccess;
+
+			add_accessor = TypeManager.GetAddMethod (ei);
+			remove_accessor = TypeManager.GetRemoveMethod (ei);
+			
+			if (add_accessor.IsStatic || remove_accessor.IsStatic)
+					IsStatic = true;
+
+			if (EventInfo is MyEventBuilder)
+				type = ((MyEventBuilder) EventInfo).EventType;
+			else
+				type = EventInfo.EventHandlerType;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// We are born fully resolved
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should not happen I think");
+		}
+
+		public void EmitAddOrRemove (EmitContext ec, Expression source)
+		{
+			Expression handler = ((Binary) source).Right;
+			
+			Argument arg = new Argument (handler, Argument.AType.Expression);
+			ArrayList args = new ArrayList ();
+				
+			args.Add (arg);
+			
+			if (((Binary) source).Oper == Binary.Operator.Addition)
+				Invocation.EmitCall (
+					ec, false, IsStatic, InstanceExpression, add_accessor, args, loc);
+			else
+				Invocation.EmitCall (
+					ec, false, IsStatic, InstanceExpression, remove_accessor, args, loc);
+		}
+	}
+}	
diff --git a/mcs/mbas/enum.cs b/mcs/mbas/enum.cs
new file mode 100644
index 00000000000..b2c9ae34db0
--- /dev/null
+++ b/mcs/mbas/enum.cs
@@ -0,0 +1,478 @@
+//
+// enum.cs: Enum handling.
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//         Ravi Pratap     (ravi@ximian.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   Enumeration container
+	/// </summary>
+	public class Enum : DeclSpace {
+		ArrayList ordered_enums;
+		
+		public Expression BaseType;
+		public Attributes  OptAttributes;
+		
+		public Type UnderlyingType;
+
+		Hashtable member_to_location;
+		Hashtable member_to_attributes;
+
+		//
+		// This is for members that have been defined
+		//
+		Hashtable member_to_value;
+
+		//
+		// This is used to mark members we're currently defining
+		//
+		Hashtable in_transit;
+		
+		ArrayList field_builders;
+		
+		public const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE;
+
+		public Enum (TypeContainer parent, Expression type, int mod_flags, string name, Attributes attrs, Location l)
+			: base (parent, name, l)
+		{
+			this.BaseType = type;
+			ModFlags = Modifiers.Check (AllowedModifiers, mod_flags,
+						    IsTopLevel ? Modifiers.INTERNAL : Modifiers.PRIVATE, l);
+			OptAttributes = attrs;
+
+			ordered_enums = new ArrayList ();
+			member_to_location = new Hashtable ();
+			member_to_value = new Hashtable ();
+			in_transit = new Hashtable ();
+			field_builders = new ArrayList ();
+		}
+
+		/// <summary>
+		///   Adds @name to the enumeration space, with @expr
+		///   being its definition.  
+		/// </summary>
+		public AdditionResult AddEnumMember (string name, Expression expr, Location loc,
+						     Attributes opt_attrs)
+		{
+			if (defined_names.Contains (name))
+				return AdditionResult.NameExists;
+
+			DefineName (name, expr);
+
+			ordered_enums.Add (name);
+			member_to_location.Add (name, loc);
+
+			if (member_to_attributes == null)
+				member_to_attributes = new Hashtable ();
+
+			member_to_attributes.Add (name, opt_attrs);
+			
+			return AdditionResult.Success;
+		}
+
+		//
+		// This is used by corlib compilation: we map from our
+		// type to a type that is consumable by the DefineField
+		//
+		Type MapToInternalType (Type t)
+		{
+			if (t == TypeManager.int32_type)
+				return typeof (int);
+			if (t == TypeManager.int64_type)
+				return typeof (long);
+			if (t == TypeManager.uint32_type)
+				return typeof (uint);
+			if (t == TypeManager.uint64_type)
+				return typeof (ulong);
+			if (t == TypeManager.float_type)
+				return typeof (float);
+			if (t == TypeManager.double_type)
+				return typeof (double);
+			if (t == TypeManager.byte_type)
+				return typeof (byte);
+			if (t == TypeManager.sbyte_type)
+				return typeof (sbyte);
+			if (t == TypeManager.char_type)
+				return typeof (char);
+			if (t == TypeManager.short_type)
+				return typeof (short);
+			if (t == TypeManager.ushort_type)
+				return typeof (ushort);
+
+			throw new Exception ();
+		}
+		
+		public override TypeBuilder DefineType ()
+		{
+			if (TypeBuilder != null)
+				return TypeBuilder;
+
+			TypeAttributes attr = Modifiers.TypeAttr (ModFlags, IsTopLevel);
+
+			attr |= TypeAttributes.Class | TypeAttributes.Sealed;
+
+			UnderlyingType = ResolveType (BaseType, false, Location);
+
+			if (UnderlyingType != TypeManager.int32_type &&
+			    UnderlyingType != TypeManager.uint32_type &&
+			    UnderlyingType != TypeManager.int64_type &&
+			    UnderlyingType != TypeManager.uint64_type &&
+			    UnderlyingType != TypeManager.short_type &&
+			    UnderlyingType != TypeManager.ushort_type &&
+			    UnderlyingType != TypeManager.byte_type  &&
+			    UnderlyingType != TypeManager.sbyte_type) {
+				Report.Error (1008, Location,
+					      "Type byte, sbyte, short, ushort, int, uint, " +
+					      "long, or ulong expected (got: " +
+					      TypeManager.CSharpName (UnderlyingType) + ")");
+				return null;
+			}
+
+			if (IsTopLevel) {
+				ModuleBuilder builder = CodeGen.ModuleBuilder;
+
+				TypeBuilder = builder.DefineType (Name, attr, TypeManager.enum_type);
+			} else {
+				TypeBuilder builder = Parent.TypeBuilder;
+
+				TypeBuilder = builder.DefineNestedType (
+					Basename, attr, TypeManager.enum_type);
+			}
+
+			//
+			// Call MapToInternalType for corlib
+			//
+			TypeBuilder.DefineField ("value__", UnderlyingType,
+						 FieldAttributes.Public | FieldAttributes.SpecialName
+						 | FieldAttributes.RTSpecialName);
+
+			TypeManager.AddEnumType (Name, TypeBuilder, this);
+
+			return TypeBuilder;
+		}
+
+	        bool IsValidEnumConstant (Expression e)
+		{
+			if (!(e is Constant))
+				return false;
+
+			if (e is IntConstant || e is UIntConstant || e is LongConstant ||
+			    e is ByteConstant || e is SByteConstant || e is ShortConstant ||
+			    e is UShortConstant || e is ULongConstant || e is EnumConstant)
+				return true;
+			else
+				return false;
+		}
+
+		object GetNextDefaultValue (object default_value)
+		{
+			if (UnderlyingType == TypeManager.int32_type) {
+				int i = (int) default_value;
+				
+				if (i < System.Int32.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.uint32_type) {
+				uint i = (uint) default_value;
+
+				if (i < System.UInt32.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.int64_type) {
+				long i = (long) default_value;
+
+				if (i < System.Int64.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.uint64_type) {
+				ulong i = (ulong) default_value;
+
+				if (i < System.UInt64.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.short_type) {
+				short i = (short) default_value;
+
+				if (i < System.Int16.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.ushort_type) {
+				ushort i = (ushort) default_value;
+
+				if (i < System.UInt16.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.byte_type) {
+				byte i = (byte) default_value;
+
+				if (i < System.Byte.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.sbyte_type) {
+				sbyte i = (sbyte) default_value;
+
+				if (i < System.SByte.MaxValue)
+					return ++i;
+				else
+					return null;
+			}
+
+			return null;
+		}
+
+		void Error_ConstantValueCannotBeConverted (object val, Location loc)
+		{
+			if (val is Constant)
+				Report.Error (31, loc, "Constant value '" + ((Constant) val).AsString () +
+					      "' cannot be converted" +
+					      " to a " + TypeManager.CSharpName (UnderlyingType));
+			else 
+				Report.Error (31, loc, "Constant value '" + val +
+					      "' cannot be converted" +
+					      " to a " + TypeManager.CSharpName (UnderlyingType));
+			return;
+		}
+
+		/// <summary>
+		///  This is used to lookup the value of an enum member. If the member is undefined,
+		///  it attempts to define it and return its value
+		/// </summary>
+		public object LookupEnumValue (EmitContext ec, string name, Location loc)
+		{
+			object default_value = null;
+			Constant c = null;
+
+			default_value = member_to_value [name];
+
+			if (default_value != null)
+				return default_value;
+
+			//
+			// This may happen if we're calling a method in System.Enum, for instance
+			// Enum.IsDefined().
+			//
+			if (!defined_names.Contains (name))
+				return null;
+
+			if (in_transit.Contains (name)) {
+				Report.Error (110, loc, "The evaluation of the constant value for `" +
+					      Name + "." + name + "' involves a circular definition.");
+				return null;
+			}
+
+			//
+			// So if the above doesn't happen, we have a member that is undefined
+			// We now proceed to define it 
+			//
+			Expression val = this [name];
+
+			if (val == null) {
+				
+				int idx = ordered_enums.IndexOf (name);
+
+				if (idx == 0)
+					default_value = 0;
+				else {
+					for (int i = 0; i < idx; ++i) {
+						string n = (string) ordered_enums [i];
+						Location m_loc = (Mono.CSharp.Location)
+							member_to_location [n];
+						in_transit.Add (name, true);
+						default_value = LookupEnumValue (ec, n, m_loc);
+						in_transit.Remove (name);
+						if (default_value == null)
+							return null;
+					}
+					
+					default_value = GetNextDefaultValue (default_value);
+				}
+				
+			} else {
+				bool old = ec.InEnumContext;
+				ec.InEnumContext = true;
+				in_transit.Add (name, true);
+				val = val.Resolve (ec);
+				in_transit.Remove (name);
+				ec.InEnumContext = old;
+				
+				if (val == null)
+					return null;
+
+				if (IsValidEnumConstant (val)) {
+					c = (Constant) val;
+					default_value = c.GetValue ();
+					
+					if (default_value == null) {
+						Error_ConstantValueCannotBeConverted (c, loc);
+						return null;
+					}
+					
+				} else {
+					Report.Error (
+						1008, loc,
+						"Type byte, sbyte, short, ushort, int, uint, long, or " +
+						"ulong expected (have: " + val + ")");
+					return null;
+				}
+			}
+
+			FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
+					| FieldAttributes.Literal;
+			
+			FieldBuilder fb = TypeBuilder.DefineField (name, UnderlyingType, attr);
+
+			try {
+				default_value = TypeManager.ChangeType (default_value, UnderlyingType);
+			} catch {
+				Error_ConstantValueCannotBeConverted (c, loc);
+				return null;
+			}
+
+			fb.SetConstant (default_value);
+			field_builders.Add (fb);
+			member_to_value [name] = default_value;
+
+			if (!TypeManager.RegisterFieldValue (fb, default_value))
+				return null;
+
+			//
+			// Now apply attributes
+			//
+			Attribute.ApplyAttributes (ec, fb, fb, (Attributes) member_to_attributes [name], loc); 
+			
+			return default_value;
+		}
+		
+		public override bool Define (TypeContainer parent)
+		{
+			//
+			// If there was an error during DefineEnum, return
+			//
+			if (TypeBuilder == null)
+				return false;
+			
+			EmitContext ec = new EmitContext (parent, this, Location, null,
+							  UnderlyingType, ModFlags, false);
+			
+			object default_value = 0;
+			
+			FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
+				             | FieldAttributes.Literal;
+
+			
+			foreach (string name in ordered_enums) {
+				//
+				// Have we already been defined, thanks to some cross-referencing ?
+				// 
+				if (member_to_value.Contains (name))
+					continue;
+				
+				Location loc = (Mono.CSharp.Location) member_to_location [name];
+
+				if (this [name] != null) {
+					default_value = LookupEnumValue (ec, name, loc);
+
+					if (default_value == null)
+						return true;
+
+				} else {
+					FieldBuilder fb = TypeBuilder.DefineField (
+						name, UnderlyingType, attr);
+					
+					if (default_value == null) {
+					   Report.Error (543, loc, "Enumerator value for '" + name + "' is too large to " +
+							      "fit in its type");
+						return false;
+					}
+					
+					try {
+						default_value = TypeManager.ChangeType (default_value, UnderlyingType);
+					} catch {
+						Error_ConstantValueCannotBeConverted (default_value, loc);
+						return false;
+					}
+
+					fb.SetConstant (default_value);
+					field_builders.Add (fb);
+					member_to_value [name] = default_value;
+					
+					if (!TypeManager.RegisterFieldValue (fb, default_value))
+						return false;
+
+					//
+					// Apply attributes on the enum member
+					//
+					Attribute.ApplyAttributes (ec, fb, fb, (Attributes) member_to_attributes [name], loc);
+				}
+
+				default_value = GetNextDefaultValue (default_value);
+			}
+			
+			Attribute.ApplyAttributes (ec, TypeBuilder, this, OptAttributes, Location);
+
+			return true;
+		}
+		
+		//
+		// Hack around System.Reflection as found everywhere else
+		//
+		public MemberInfo [] FindMembers (MemberTypes mt, BindingFlags bf,
+						  MemberFilter filter, object criteria)
+		{
+			ArrayList members = new ArrayList ();
+
+			if ((mt & MemberTypes.Field) != 0) {
+				foreach (FieldBuilder fb in field_builders)
+					if (filter (fb, criteria) == true)
+						members.Add (fb);
+			}
+
+			int count = members.Count;
+
+			if (count > 0) {
+				MemberInfo [] mi = new MemberInfo [count];
+				members.CopyTo (mi, 0);
+				return mi;
+			}
+
+			return null;
+		}
+
+		public ArrayList ValueNames {
+			get {
+				return ordered_enums;
+			}
+		}
+
+		// indexer
+		public Expression this [string name] {
+			get {
+				return (Expression) defined_names [name];
+			}
+		}
+	}
+}
diff --git a/mcs/mbas/expression.cs b/mcs/mbas/expression.cs
new file mode 100644
index 00000000000..2e09e096170
--- /dev/null
+++ b/mcs/mbas/expression.cs
@@ -0,0 +1,6676 @@
+//
+// expression.cs: Expression representation for the IL tree.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+//
+#define USE_OLD
+
+namespace Mono.CSharp {
+	using System;
+	using System.Collections;
+	using System.Reflection;
+	using System.Reflection.Emit;
+	using System.Text;
+
+	/// <summary>
+	///   This is just a helper class, it is generated by Unary, UnaryMutator
+	///   when an overloaded method has been found.  It just emits the code for a
+	///   static call.
+	/// </summary>
+	public class StaticCallExpr : ExpressionStatement {
+		ArrayList args;
+		MethodInfo mi;
+
+		StaticCallExpr (MethodInfo m, ArrayList a, Location l)
+		{
+			mi = m;
+			args = a;
+
+			type = m.ReturnType;
+			eclass = ExprClass.Value;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// We are born fully resolved
+			//
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			if (args != null) 
+				Invocation.EmitArguments (ec, mi, args);
+
+			ec.ig.Emit (OpCodes.Call, mi);
+			return;
+		}
+		
+		static public Expression MakeSimpleCall (EmitContext ec, MethodGroupExpr mg,
+							 Expression e, Location loc)
+		{
+			ArrayList args;
+			MethodBase method;
+			
+			args = new ArrayList (1);
+			args.Add (new Argument (e, Argument.AType.Expression));
+			method = Invocation.OverloadResolve (ec, (MethodGroupExpr) mg, args, loc);
+
+			if (method == null)
+				return null;
+
+			return new StaticCallExpr ((MethodInfo) method, args, loc);
+		}
+
+		public override void EmitStatement (EmitContext ec)
+		{
+			Emit (ec);
+			if (TypeManager.TypeToCoreType (type) != TypeManager.void_type)
+				ec.ig.Emit (OpCodes.Pop);
+		}
+	}
+	
+	/// <summary>
+	///   Unary expressions.  
+	/// </summary>
+	///
+	/// <remarks>
+	///   Unary implements unary expressions.   It derives from
+	///   ExpressionStatement becuase the pre/post increment/decrement
+	///   operators can be used in a statement context.
+	/// </remarks>
+	public class Unary : Expression {
+		public enum Operator : byte {
+			UnaryPlus, UnaryNegation, LogicalNot, OnesComplement,
+			Indirection, AddressOf,  TOP
+		}
+
+		public Operator Oper;
+		public Expression Expr;
+		
+		public Unary (Operator op, Expression expr, Location loc)
+		{
+			this.Oper = op;
+			this.Expr = expr;
+			this.loc = loc;
+		}
+
+		/// <summary>
+		///   Returns a stringified representation of the Operator
+		/// </summary>
+		static public string OperName (Operator oper)
+		{
+			switch (oper){
+			case Operator.UnaryPlus:
+				return "+";
+			case Operator.UnaryNegation:
+				return "-";
+			case Operator.LogicalNot:
+				return "!";
+			case Operator.OnesComplement:
+				return "~";
+			case Operator.AddressOf:
+				return "&";
+			case Operator.Indirection:
+				return "*";
+			}
+
+			return oper.ToString ();
+		}
+
+		static string [] oper_names;
+
+		static Unary ()
+		{
+			oper_names = new string [(int)Operator.TOP];
+
+			oper_names [(int) Operator.UnaryPlus] = "op_UnaryPlus";
+			oper_names [(int) Operator.UnaryNegation] = "op_UnaryNegation";
+			oper_names [(int) Operator.LogicalNot] = "op_LogicalNot";
+			oper_names [(int) Operator.OnesComplement] = "op_OnesComplement";
+			oper_names [(int) Operator.Indirection] = "op_Indirection";
+			oper_names [(int) Operator.AddressOf] = "op_AddressOf";
+		}
+
+		void Error23 (Type t)
+		{
+			Error (
+				23, "Operator " + OperName (Oper) +
+				" cannot be applied to operand of type `" +
+				TypeManager.CSharpName (t) + "'");
+		}
+
+		/// <remarks>
+		///   The result has been already resolved:
+		///
+		///   FIXME: a minus constant -128 sbyte cant be turned into a
+		///   constant byte.
+		/// </remarks>
+		static Expression TryReduceNegative (Constant expr)
+		{
+			Expression e = null;
+			
+			if (expr is IntConstant)
+				e = new IntConstant (-((IntConstant) expr).Value);
+			else if (expr is UIntConstant){
+				uint value = ((UIntConstant) expr).Value;
+
+				if (value < 2147483649)
+					return new IntConstant (-(int)value);
+				else
+					e = new LongConstant (value);
+			}
+			else if (expr is LongConstant)
+				e = new LongConstant (-((LongConstant) expr).Value);
+			else if (expr is ULongConstant){
+				ulong value = ((ULongConstant) expr).Value;
+
+				if (value < 9223372036854775809)
+					return new LongConstant(-(long)value);
+			}
+			else if (expr is FloatConstant)
+				e = new FloatConstant (-((FloatConstant) expr).Value);
+			else if (expr is DoubleConstant)
+				e = new DoubleConstant (-((DoubleConstant) expr).Value);
+			else if (expr is DecimalConstant)
+				e = new DecimalConstant (-((DecimalConstant) expr).Value);
+			else if (expr is ShortConstant)
+				e = new IntConstant (-((ShortConstant) expr).Value);
+			else if (expr is UShortConstant)
+				e = new IntConstant (-((UShortConstant) expr).Value);
+			return e;
+		}
+
+		// <summary>
+		//   This routine will attempt to simplify the unary expression when the
+		//   argument is a constant.  The result is returned in `result' and the
+		//   function returns true or false depending on whether a reduction
+		//   was performed or not
+		// </summary>
+		bool Reduce (EmitContext ec, Constant e, out Expression result)
+		{
+			Type expr_type = e.Type;
+			
+			switch (Oper){
+			case Operator.UnaryPlus:
+				result = e;
+				return true;
+				
+			case Operator.UnaryNegation:
+				result = TryReduceNegative (e);
+				return true;
+				
+			case Operator.LogicalNot:
+				if (expr_type != TypeManager.bool_type) {
+					result = null;
+					Error23 (expr_type);
+					return false;
+				}
+				
+				BoolConstant b = (BoolConstant) e;
+				result = new BoolConstant (!(b.Value));
+				return true;
+				
+			case Operator.OnesComplement:
+				if (!((expr_type == TypeManager.int32_type) ||
+				      (expr_type == TypeManager.uint32_type) ||
+				      (expr_type == TypeManager.int64_type) ||
+				      (expr_type == TypeManager.uint64_type) ||
+				      (expr_type.IsSubclassOf (TypeManager.enum_type)))){
+					result = null;
+					Error23 (expr_type);
+					return false;
+				}
+
+				if (e is EnumConstant){
+					EnumConstant enum_constant = (EnumConstant) e;
+					Expression reduced;
+					
+					if (Reduce (ec, enum_constant.Child, out reduced)){
+						result = new EnumConstant ((Constant) reduced, enum_constant.Type);
+						return true;
+					} else {
+						result = null;
+						return false;
+					}
+				}
+
+				if (expr_type == TypeManager.int32_type){
+					result = new IntConstant (~ ((IntConstant) e).Value);
+				} else if (expr_type == TypeManager.uint32_type){
+					result = new UIntConstant (~ ((UIntConstant) e).Value);
+				} else if (expr_type == TypeManager.int64_type){
+					result = new LongConstant (~ ((LongConstant) e).Value);
+				} else if (expr_type == TypeManager.uint64_type){
+					result = new ULongConstant (~ ((ULongConstant) e).Value);
+				} else {
+					result = null;
+					Error23 (expr_type);
+					return false;
+				}
+				return true;
+
+			case Operator.AddressOf:
+				result = this;
+				return false;
+
+			case Operator.Indirection:
+				result = this;
+				return false;
+			}
+			throw new Exception ("Can not constant fold: " + Oper.ToString());
+		}
+
+		Expression ResolveOperator (EmitContext ec)
+		{
+			Type expr_type = Expr.Type;
+
+			//
+			// Step 1: Perform Operator Overload location
+			//
+			Expression mg;
+			string op_name;
+			
+			op_name = oper_names [(int) Oper];
+
+			mg = MemberLookup (ec, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
+			
+			if (mg != null) {
+				Expression e = StaticCallExpr.MakeSimpleCall (
+					ec, (MethodGroupExpr) mg, Expr, loc);
+
+				if (e == null){
+					Error23 (expr_type);
+					return null;
+				}
+				
+				return e;
+			}
+
+			// Only perform numeric promotions on:
+			// +, - 
+
+			if (expr_type == null)
+				return null;
+			
+			//
+			// Step 2: Default operations on CLI native types.
+			//
+
+			// Attempt to use a constant folding operation.
+			if (Expr is Constant){
+				Expression result;
+				
+				if (Reduce (ec, (Constant) Expr, out result))
+					return result;
+			}
+
+			switch (Oper){
+			case Operator.LogicalNot:
+				if (expr_type != TypeManager.bool_type) {
+					Error23 (Expr.Type);
+					return null;
+				}
+				
+				type = TypeManager.bool_type;
+				return this;
+
+			case Operator.OnesComplement:
+				if (!((expr_type == TypeManager.int32_type) ||
+				      (expr_type == TypeManager.uint32_type) ||
+				      (expr_type == TypeManager.int64_type) ||
+				      (expr_type == TypeManager.uint64_type) ||
+				      (expr_type.IsSubclassOf (TypeManager.enum_type)))){
+					Expression e;
+
+					e = ConvertImplicit (ec, Expr, TypeManager.int32_type, loc);
+					if (e != null){
+						type = TypeManager.int32_type;
+						return this;
+					}
+					e = ConvertImplicit (ec, Expr, TypeManager.uint32_type, loc);
+					if (e != null){
+						type = TypeManager.uint32_type;
+						return this;
+					}
+					e = ConvertImplicit (ec, Expr, TypeManager.int64_type, loc);
+					if (e != null){
+						type = TypeManager.int64_type;
+						return this;
+					}
+					e = ConvertImplicit (ec, Expr, TypeManager.uint64_type, loc);
+					if (e != null){
+						type = TypeManager.uint64_type;
+						return this;
+					}
+					Error23 (expr_type);
+					return null;
+				}
+				type = expr_type;
+				return this;
+
+			case Operator.AddressOf:
+				if (Expr.eclass != ExprClass.Variable){
+					Error (211, "Cannot take the address of non-variables");
+					return null;
+				}
+				
+				if (!ec.InUnsafe) {
+					UnsafeError (loc); 
+					return null;
+				}
+				
+				if (!TypeManager.VerifyUnManaged (Expr.Type, loc)){
+					return null;
+				}
+				
+				string ptr_type_name = Expr.Type.FullName + "*";
+				type = TypeManager.LookupType (ptr_type_name);
+				
+				return this;
+
+			case Operator.Indirection:
+				if (!ec.InUnsafe){
+					UnsafeError (loc);
+					return null;
+				}
+				
+				if (!expr_type.IsPointer){
+					Error (
+						193,
+						"The * or -> operator can only be applied to pointers");
+					return null;
+				}
+				
+				//
+				// We create an Indirection expression, because
+				// it can implement the IMemoryLocation.
+				// 
+				return new Indirection (Expr, loc);
+			
+			case Operator.UnaryPlus:
+				//
+				// A plus in front of something is just a no-op, so return the child.
+				//
+				return Expr;
+
+			case Operator.UnaryNegation:
+				//
+				// Deals with -literals
+				// int     operator- (int x)
+				// long    operator- (long x)
+				// float   operator- (float f)
+				// double  operator- (double d)
+				// decimal operator- (decimal d)
+				//
+				Expression expr = null;
+
+				//
+				// transform - - expr into expr
+				//
+				if (Expr is Unary){
+					Unary unary = (Unary) Expr;
+					
+					if (unary.Oper == Operator.UnaryNegation)
+						return unary.Expr;
+				}
+
+				//
+				// perform numeric promotions to int,
+				// long, double.
+				//
+				//
+				// The following is inneficient, because we call
+				// ConvertImplicit too many times.
+				//
+				// It is also not clear if we should convert to Float
+				// or Double initially.
+				//
+				if (expr_type == TypeManager.uint32_type){
+					//
+					// FIXME: handle exception to this rule that
+					// permits the int value -2147483648 (-2^31) to
+					// bt wrote as a decimal interger literal
+					//
+					type = TypeManager.int64_type;
+					Expr = ConvertImplicit (ec, Expr, type, loc);
+					return this;
+				}
+
+				if (expr_type == TypeManager.uint64_type){
+					//
+					// FIXME: Handle exception of `long value'
+					// -92233720368547758087 (-2^63) to be wrote as
+					// decimal integer literal.
+					//
+					Error23 (expr_type);
+					return null;
+				}
+
+				if (expr_type == TypeManager.float_type){
+					type = expr_type;
+					return this;
+				}
+				
+				expr = ConvertImplicit (ec, Expr, TypeManager.int32_type, loc);
+				if (expr != null){
+					Expr = expr;
+					type = expr.Type;
+					return this;
+				} 
+
+				expr = ConvertImplicit (ec, Expr, TypeManager.int64_type, loc);
+				if (expr != null){
+					Expr = expr;
+					type = expr.Type;
+					return this;
+				}
+
+				expr = ConvertImplicit (ec, Expr, TypeManager.double_type, loc);
+				if (expr != null){
+					Expr = expr;
+					type = expr.Type;
+					return this;
+				}
+				
+				Error23 (expr_type);
+				return null;
+			}
+
+			Error (187, "No such operator '" + OperName (Oper) + "' defined for type '" +
+			       TypeManager.CSharpName (expr_type) + "'");
+			return null;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			if (Oper == Operator.AddressOf)
+				Expr = Expr.ResolveLValue (ec, new EmptyExpression ());
+			else
+				Expr = Expr.Resolve (ec);
+			
+			if (Expr == null)
+				return null;
+
+			eclass = ExprClass.Value;
+			return ResolveOperator (ec);
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Type expr_type = Expr.Type;
+			
+			switch (Oper) {
+			case Operator.UnaryPlus:
+				throw new Exception ("This should be caught by Resolve");
+				
+			case Operator.UnaryNegation:
+				Expr.Emit (ec);
+				ig.Emit (OpCodes.Neg);
+				break;
+				
+			case Operator.LogicalNot:
+				Expr.Emit (ec);
+				ig.Emit (OpCodes.Ldc_I4_0);
+				ig.Emit (OpCodes.Ceq);
+				break;
+				
+			case Operator.OnesComplement:
+				Expr.Emit (ec);
+				ig.Emit (OpCodes.Not);
+				break;
+				
+			case Operator.AddressOf:
+				((IMemoryLocation)Expr).AddressOf (ec, AddressOp.LoadStore);
+				break;
+				
+			default:
+				throw new Exception ("This should not happen: Operator = "
+						     + Oper.ToString ());
+			}
+		}
+
+		/// <summary>
+		///   This will emit the child expression for `ec' avoiding the logical
+		///   not.  The parent will take care of changing brfalse/brtrue
+		/// </summary>
+		public void EmitLogicalNot (EmitContext ec)
+		{
+			if (Oper != Operator.LogicalNot)
+				throw new Exception ("EmitLogicalNot can only be called with !expr");
+
+			Expr.Emit (ec);
+		}
+
+		public override string ToString ()
+		{
+			return "Unary (" + Oper + ", " + Expr + ")";
+		}
+		
+	}
+
+	//
+	// Unary operators are turned into Indirection expressions
+	// after semantic analysis (this is so we can take the address
+	// of an indirection).
+	//
+	public class Indirection : Expression, IMemoryLocation, IAssignMethod {
+		Expression expr;
+		LocalTemporary temporary;
+		bool have_temporary;
+		
+		public Indirection (Expression expr, Location l)
+		{
+			this.expr = expr;
+			this.type = TypeManager.TypeToCoreType (expr.Type.GetElementType ());
+			eclass = ExprClass.Variable;
+			loc = l;
+		}
+
+		void LoadExprValue (EmitContext ec)
+		{
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			if (temporary != null){
+				if (have_temporary){
+					temporary.Emit (ec);
+					return;
+				}
+				expr.Emit (ec);
+				ec.ig.Emit (OpCodes.Dup);
+				temporary.Store (ec);
+				have_temporary = true;
+			} else
+				expr.Emit (ec);
+			
+			LoadFromPtr (ig, Type);
+		}
+
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			if (temporary != null){
+				if (have_temporary){
+					temporary.Emit (ec);
+					return;
+				}
+				expr.Emit (ec);
+				ec.ig.Emit (OpCodes.Dup);
+				temporary.Store (ec);
+				have_temporary = true;
+			} else
+				expr.Emit (ec);
+
+			source.Emit (ec);
+			StoreFromPtr (ec.ig, type);
+		}
+		
+		public void AddressOf (EmitContext ec, AddressOp Mode)
+		{
+			if (temporary != null){
+				if (have_temporary){
+					temporary.Emit (ec);
+					return;
+				}
+				expr.Emit (ec);
+				ec.ig.Emit (OpCodes.Dup);
+				temporary.Store (ec);
+				have_temporary = true;
+			} else
+				expr.Emit (ec);
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// Born fully resolved
+			//
+			return this;
+		}
+
+		public new void CacheTemporaries (EmitContext ec)
+		{
+			temporary = new LocalTemporary (ec, type);
+		}
+	}
+	
+	/// <summary>
+	///   Unary Mutator expressions (pre and post ++ and --)
+	/// </summary>
+	///
+	/// <remarks>
+	///   UnaryMutator implements ++ and -- expressions.   It derives from
+	///   ExpressionStatement becuase the pre/post increment/decrement
+	///   operators can be used in a statement context.
+	///
+	/// FIXME: Idea, we could split this up in two classes, one simpler
+	/// for the common case, and one with the extra fields for more complex
+	/// classes (indexers require temporary access;  overloaded require method)
+	///
+	/// Maybe we should have classes PreIncrement, PostIncrement, PreDecrement,
+	/// PostDecrement, that way we could save the `Mode' byte as well.  
+	/// </remarks>
+	public class UnaryMutator : ExpressionStatement {
+		public enum Mode : byte {
+			PreIncrement, PreDecrement, PostIncrement, PostDecrement
+		}
+		
+		Mode mode;
+		Expression expr;
+		LocalTemporary temp_storage;
+
+		//
+		// This is expensive for the simplest case.
+		//
+		Expression method;
+			
+		public UnaryMutator (Mode m, Expression e, Location l)
+		{
+			mode = m;
+			loc = l;
+			expr = e;
+		}
+
+		static string OperName (Mode mode)
+		{
+			return (mode == Mode.PreIncrement || mode == Mode.PostIncrement) ?
+				"++" : "--";
+		}
+		
+		void Error23 (Type t)
+		{
+			Error (
+				23, "Operator " + OperName (mode) + 
+				" cannot be applied to operand of type `" +
+				TypeManager.CSharpName (t) + "'");
+		}
+
+		/// <summary>
+		///   Returns whether an object of type `t' can be incremented
+		///   or decremented with add/sub (ie, basically whether we can
+		///   use pre-post incr-decr operations on it, but it is not a
+		///   System.Decimal, which we require operator overloading to catch)
+		/// </summary>
+		static bool IsIncrementableNumber (Type t)
+		{
+			return (t == TypeManager.sbyte_type) ||
+				(t == TypeManager.byte_type) ||
+				(t == TypeManager.short_type) ||
+				(t == TypeManager.ushort_type) ||
+				(t == TypeManager.int32_type) ||
+				(t == TypeManager.uint32_type) ||
+				(t == TypeManager.int64_type) ||
+				(t == TypeManager.uint64_type) ||
+				(t == TypeManager.char_type) ||
+				(t.IsSubclassOf (TypeManager.enum_type)) ||
+				(t == TypeManager.float_type) ||
+				(t == TypeManager.double_type) ||
+				(t.IsPointer && t != TypeManager.void_ptr_type);
+		}
+
+		Expression ResolveOperator (EmitContext ec)
+		{
+			Type expr_type = expr.Type;
+
+			//
+			// Step 1: Perform Operator Overload location
+			//
+			Expression mg;
+			string op_name;
+			
+			if (mode == Mode.PreIncrement || mode == Mode.PostIncrement)
+				op_name = "op_Increment";
+			else 
+				op_name = "op_Decrement";
+
+			mg = MemberLookup (ec, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
+
+			if (mg == null && expr_type.BaseType != null)
+				mg = MemberLookup (ec, expr_type.BaseType, op_name,
+						   MemberTypes.Method, AllBindingFlags, loc);
+			
+			if (mg != null) {
+				method = StaticCallExpr.MakeSimpleCall (
+					ec, (MethodGroupExpr) mg, expr, loc);
+
+				type = method.Type;
+				return this;
+			}
+
+			//
+			// The operand of the prefix/postfix increment decrement operators
+			// should be an expression that is classified as a variable,
+			// a property access or an indexer access
+			//
+			type = expr_type;
+			if (expr.eclass == ExprClass.Variable){
+				if (IsIncrementableNumber (expr_type) ||
+				    expr_type == TypeManager.decimal_type){
+					return this;
+				}
+			} else if (expr.eclass == ExprClass.IndexerAccess){
+				IndexerAccess ia = (IndexerAccess) expr;
+				
+				temp_storage = new LocalTemporary (ec, expr.Type);
+				
+				expr = ia.ResolveLValue (ec, temp_storage);
+				if (expr == null)
+					return null;
+
+				return this;
+			} else if (expr.eclass == ExprClass.PropertyAccess){
+				PropertyExpr pe = (PropertyExpr) expr;
+
+				if (pe.VerifyAssignable ())
+					return this;
+
+				return null;
+			} else {
+				expr.Error118 ("variable, indexer or property access");
+				return null;
+			}
+
+			Error (187, "No such operator '" + OperName (mode) + "' defined for type '" +
+			       TypeManager.CSharpName (expr_type) + "'");
+			return null;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			expr = expr.Resolve (ec);
+			
+			if (expr == null)
+				return null;
+
+			eclass = ExprClass.Value;
+			return ResolveOperator (ec);
+		}
+
+		static int PtrTypeSize (Type t)
+		{
+			return GetTypeSize (t.GetElementType ());
+		}
+
+		//
+		// Loads the proper "1" into the stack based on the type
+		//
+		static void LoadOne (ILGenerator ig, Type t)
+		{
+			if (t == TypeManager.uint64_type || t == TypeManager.int64_type)
+				ig.Emit (OpCodes.Ldc_I8, 1L);
+			else if (t == TypeManager.double_type)
+				ig.Emit (OpCodes.Ldc_R8, 1.0);
+			else if (t == TypeManager.float_type)
+				ig.Emit (OpCodes.Ldc_R4, 1.0F);
+			else if (t.IsPointer){
+				int n = PtrTypeSize (t);
+				
+				if (n == 0)
+					ig.Emit (OpCodes.Sizeof, t);
+				else
+					IntConstant.EmitInt (ig, n);
+			} else 
+				ig.Emit (OpCodes.Ldc_I4_1);
+		}
+
+		
+		//
+		// FIXME: We need some way of avoiding the use of temp_storage
+		// for some types of storage (parameters, local variables,
+		// static fields) and single-dimension array access.
+		//
+		void EmitCode (EmitContext ec, bool is_expr)
+		{
+			ILGenerator ig = ec.ig;
+			IAssignMethod ia = (IAssignMethod) expr;
+			Type expr_type = expr.Type;
+			
+			if (temp_storage == null)
+				temp_storage = new LocalTemporary (ec, expr_type);
+
+			ia.CacheTemporaries (ec);
+			ig.Emit (OpCodes.Nop);
+			switch (mode){
+			case Mode.PreIncrement:
+			case Mode.PreDecrement:
+				if (method == null){
+					expr.Emit (ec);
+
+					LoadOne (ig, expr_type);
+					
+					//
+					// Select the opcode based on the check state (then the type)
+					// and the actual operation
+					//
+					if (ec.CheckState){
+						if (expr_type == TypeManager.int32_type ||
+						    expr_type == TypeManager.int64_type){
+							if (mode == Mode.PreDecrement)
+								ig.Emit (OpCodes.Sub_Ovf);
+							else
+								ig.Emit (OpCodes.Add_Ovf);
+						} else if (expr_type == TypeManager.uint32_type ||
+							   expr_type == TypeManager.uint64_type){
+							if (mode == Mode.PreDecrement)
+								ig.Emit (OpCodes.Sub_Ovf_Un);
+							else
+								ig.Emit (OpCodes.Add_Ovf_Un);
+						} else {
+							if (mode == Mode.PreDecrement)
+								ig.Emit (OpCodes.Sub_Ovf);
+							else
+								ig.Emit (OpCodes.Add_Ovf);
+						}
+					} else {
+						if (mode == Mode.PreDecrement)
+							ig.Emit (OpCodes.Sub);
+						else
+							ig.Emit (OpCodes.Add);
+					}
+				} else 
+					method.Emit (ec);
+
+				temp_storage.Store (ec);
+				ia.EmitAssign (ec, temp_storage);
+				if (is_expr)
+					temp_storage.Emit (ec);
+				break;
+				
+			case Mode.PostIncrement:
+			case Mode.PostDecrement:
+				if (is_expr)
+					expr.Emit (ec);
+				
+				if (method == null){
+					if (!is_expr)
+						expr.Emit (ec);
+					else
+						ig.Emit (OpCodes.Dup);
+
+					LoadOne (ig, expr_type);
+					
+					if (ec.CheckState){
+						if (expr_type == TypeManager.int32_type ||
+						    expr_type == TypeManager.int64_type){
+							if (mode == Mode.PostDecrement)
+								ig.Emit (OpCodes.Sub_Ovf);
+							else
+								ig.Emit (OpCodes.Add_Ovf);
+						} else if (expr_type == TypeManager.uint32_type ||
+							   expr_type == TypeManager.uint64_type){
+							if (mode == Mode.PostDecrement)
+								ig.Emit (OpCodes.Sub_Ovf_Un);
+							else
+								ig.Emit (OpCodes.Add_Ovf_Un);
+						} else {
+							if (mode == Mode.PostDecrement)
+								ig.Emit (OpCodes.Sub_Ovf);
+							else
+								ig.Emit (OpCodes.Add_Ovf);
+						}
+					} else {
+						if (mode == Mode.PostDecrement)
+							ig.Emit (OpCodes.Sub);
+						else
+							ig.Emit (OpCodes.Add);
+					}
+				} else {
+					method.Emit (ec);
+				}
+				
+				temp_storage.Store (ec);
+				ia.EmitAssign (ec, temp_storage);
+				break;
+			}
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			EmitCode (ec, true);
+			
+		}
+		
+		public override void EmitStatement (EmitContext ec)
+		{
+			EmitCode (ec, false);
+		}
+
+	}
+
+	/// <summary>
+	///   Base class for the `Is' and `As' classes. 
+	/// </summary>
+	///
+	/// <remarks>
+	///   FIXME: Split this in two, and we get to save the `Operator' Oper
+	///   size. 
+	/// </remarks>
+	public abstract class Probe : Expression {
+		public readonly Expression ProbeType;
+		protected Expression expr;
+		protected Type probe_type;
+		
+		public Probe (Expression expr, Expression probe_type, Location l)
+		{
+			ProbeType = probe_type;
+			loc = l;
+			this.expr = expr;
+		}
+
+		public Expression Expr {
+			get {
+				return expr;
+			}
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			probe_type = ec.DeclSpace.ResolveType (ProbeType, false, loc);
+
+			if (probe_type == null)
+				return null;
+
+			expr = expr.Resolve (ec);
+			
+			return this;
+		}
+	}
+
+	/// <summary>
+	///   Implementation of the `is' operator.
+	/// </summary>
+	public class Is : Probe {
+		public Is (Expression expr, Expression probe_type, Location l)
+			: base (expr, probe_type, l)
+		{
+		}
+
+		enum Action {
+			AlwaysTrue, AlwaysNull, AlwaysFalse, LeaveOnStack, Probe
+		}
+
+		Action action;
+		
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			expr.Emit (ec);
+
+			switch (action){
+			case Action.AlwaysFalse:
+				ig.Emit (OpCodes.Pop);
+				IntConstant.EmitInt (ig, 0);
+				return;
+			case Action.AlwaysTrue:
+				ig.Emit (OpCodes.Pop);
+				ig.Emit (OpCodes.Nop);
+				IntConstant.EmitInt (ig, 1);
+				return;
+			case Action.LeaveOnStack:
+				// the `e != null' rule.
+				return;
+			case Action.Probe:
+				ig.Emit (OpCodes.Isinst, probe_type);
+				ig.Emit (OpCodes.Ldnull);
+				ig.Emit (OpCodes.Cgt_Un);
+				return;
+			}
+			throw new Exception ("never reached");
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Expression e = base.DoResolve (ec);
+
+			if ((e == null) || (expr == null))
+				return null;
+
+			Type etype = expr.Type;
+			bool warning_always_matches = false;
+			bool warning_never_matches = false;
+
+			type = TypeManager.bool_type;
+			eclass = ExprClass.Value;
+
+			//
+			// First case, if at compile time, there is an implicit conversion
+			// then e != null (objects) or true (value types)
+			//
+			e = ConvertImplicitStandard (ec, expr, probe_type, loc);
+			if (e != null){
+				expr = e;
+				if (etype.IsValueType)
+					action = Action.AlwaysTrue;
+				else
+					action = Action.LeaveOnStack;
+
+				warning_always_matches = true;
+			} else if (ExplicitReferenceConversionExists (etype, probe_type)){
+				//
+				// Second case: explicit reference convresion
+				//
+				if (expr is NullLiteral)
+					action = Action.AlwaysFalse;
+				else
+					action = Action.Probe;
+			} else {
+				action = Action.AlwaysFalse;
+				warning_never_matches = true;
+			}
+			
+			if (RootContext.WarningLevel >= 1){
+				if (warning_always_matches)
+					Warning (
+						183,
+						"The expression is always of type `" +
+						TypeManager.CSharpName (probe_type) + "'");
+				else if (warning_never_matches){
+					if (!(probe_type.IsInterface || expr.Type.IsInterface))
+						Warning (
+							184,
+							"The expression is never of type `" +
+							TypeManager.CSharpName (probe_type) + "'");
+				}
+			}
+
+			return this;
+		}				
+	}
+
+	/// <summary>
+	///   Implementation of the `as' operator.
+	/// </summary>
+	public class As : Probe {
+		public As (Expression expr, Expression probe_type, Location l)
+			: base (expr, probe_type, l)
+		{
+		}
+
+		bool do_isinst = false;
+		
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			expr.Emit (ec);
+
+			if (do_isinst)
+				ig.Emit (OpCodes.Isinst, probe_type);
+		}
+
+		static void Error_CannotConvertType (Type source, Type target, Location loc)
+		{
+			Report.Error (
+				39, loc, "as operator can not convert from `" +
+				TypeManager.CSharpName (source) + "' to `" +
+				TypeManager.CSharpName (target) + "'");
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Expression e = base.DoResolve (ec);
+
+			if (e == null)
+				return null;
+
+			type = probe_type;
+			eclass = ExprClass.Value;
+			Type etype = expr.Type;
+			
+			e = ConvertImplicit (ec, expr, probe_type, loc);
+			if (e != null){
+				expr = e;
+				do_isinst = false;
+				return this;
+			}
+
+			if (ExplicitReferenceConversionExists (etype, probe_type)){
+				do_isinst = true;
+				return this;
+			}
+
+			Error_CannotConvertType (etype, probe_type, loc);
+			return null;
+		}				
+	}
+	
+	/// <summary>
+	///   This represents a typecast in the source language.
+	///
+	///   FIXME: Cast expressions have an unusual set of parsing
+	///   rules, we need to figure those out.
+	/// </summary>
+	public class Cast : Expression {
+		Expression target_type;
+		Expression expr;
+			
+		public Cast (Expression cast_type, Expression expr, Location loc)
+		{
+			this.target_type = cast_type;
+			this.expr = expr;
+			this.loc = loc;
+		}
+
+		public Expression TargetType {
+			get {
+				return target_type;
+			}
+		}
+
+		public Expression Expr {
+			get {
+				return expr;
+			}
+			set {
+				expr = value;
+			}
+		}
+
+		/// <summary>
+		///   Attempts to do a compile-time folding of a constant cast.
+		/// </summary>
+		Expression TryReduce (EmitContext ec, Type target_type)
+		{
+			if (expr is ByteConstant){
+				byte v = ((ByteConstant) expr).Value;
+	
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is SByteConstant){
+				sbyte v = ((SByteConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is ShortConstant){
+				short v = ((ShortConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is UShortConstant){
+				ushort v = ((UShortConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is IntConstant){
+				int v = ((IntConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is UIntConstant){
+				uint v = ((UIntConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is LongConstant){
+				long v = ((LongConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is ULongConstant){
+				ulong v = ((ULongConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is FloatConstant){
+				float v = ((FloatConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is DoubleConstant){
+				double v = ((DoubleConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+
+			return null;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			expr = expr.Resolve (ec);
+			if (expr == null)
+				return null;
+
+			int errors = Report.Errors;
+
+			bool old_state = ec.OnlyLookupTypes;
+			ec.OnlyLookupTypes = true;
+			target_type = target_type.Resolve (ec);
+			ec.OnlyLookupTypes = old_state;
+			
+			if (target_type == null){
+				if (errors == Report.Errors)
+					Error (-10, "Can not resolve type");
+				return null;
+			}
+
+			if (target_type.eclass != ExprClass.Type){
+				target_type.Error118 ("class");
+				return null;
+			}
+			
+			type = target_type.Type;
+			eclass = ExprClass.Value;
+			
+			if (type == null)
+				return null;
+
+			if (expr is Constant){
+				Expression e = TryReduce (ec, type);
+
+				if (e != null)
+					return e;
+			}
+			
+			expr = ConvertExplicit (ec, expr, type, loc);
+			return expr;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			//
+			// This one will never happen
+			//
+			throw new Exception ("Should not happen");
+		}
+	}
+
+	/// <summary>
+	///   Binary operators
+	/// </summary>
+	public class Binary : Expression {
+		public enum Operator : byte {
+			Multiply, Division, Modulus,
+			Addition, Subtraction,
+			LeftShift, RightShift,
+			LessThan, GreaterThan, LessThanOrEqual, GreaterThanOrEqual, 
+			Equality, Inequality,
+			BitwiseAnd,
+			ExclusiveOr,
+			BitwiseOr,
+			LogicalAnd,
+			LogicalOr,
+			TOP
+		}
+
+		Operator oper;
+		Expression left, right;
+
+		//
+		// After resolution, method might contain the operator overload
+		// method.
+		//
+		protected MethodBase method;
+		ArrayList  Arguments;
+
+		bool DelegateOperation;
+
+		// This must be kept in sync with Operator!!!
+		static string [] oper_names;
+
+		static Binary ()
+		{
+			oper_names = new string [(int) Operator.TOP];
+
+			oper_names [(int) Operator.Multiply] = "op_Multiply";
+			oper_names [(int) Operator.Division] = "op_Division";
+			oper_names [(int) Operator.Modulus] = "op_Modulus";
+			oper_names [(int) Operator.Addition] = "op_Addition";
+			oper_names [(int) Operator.Subtraction] = "op_Subtraction";
+			oper_names [(int) Operator.LeftShift] = "op_LeftShift";
+			oper_names [(int) Operator.RightShift] = "op_RightShift";
+			oper_names [(int) Operator.LessThan] = "op_LessThan";
+			oper_names [(int) Operator.GreaterThan] = "op_GreaterThan";
+			oper_names [(int) Operator.LessThanOrEqual] = "op_LessThanOrEqual";
+			oper_names [(int) Operator.GreaterThanOrEqual] = "op_GreaterThanOrEqual";
+			oper_names [(int) Operator.Equality] = "op_Equality";
+			oper_names [(int) Operator.Inequality] = "op_Inequality";
+			oper_names [(int) Operator.BitwiseAnd] = "op_BitwiseAnd";
+			oper_names [(int) Operator.BitwiseOr] = "op_BitwiseOr";
+			oper_names [(int) Operator.ExclusiveOr] = "op_ExclusiveOr";
+			oper_names [(int) Operator.LogicalOr] = "op_LogicalOr";
+			oper_names [(int) Operator.LogicalAnd] = "op_LogicalAnd";
+		}
+
+		public Binary (Operator oper, Expression left, Expression right, Location loc)
+		{
+			this.oper = oper;
+			this.left = left;
+			this.right = right;
+			this.loc = loc;
+		}
+
+		public Operator Oper {
+			get {
+				return oper;
+			}
+			set {
+				oper = value;
+			}
+		}
+		
+		public Expression Left {
+			get {
+				return left;
+			}
+			set {
+				left = value;
+			}
+		}
+
+		public Expression Right {
+			get {
+				return right;
+			}
+			set {
+				right = value;
+			}
+		}
+
+
+		/// <summary>
+		///   Returns a stringified representation of the Operator
+		/// </summary>
+		static string OperName (Operator oper)
+		{
+			switch (oper){
+			case Operator.Multiply:
+				return "*";
+			case Operator.Division:
+				return "/";
+			case Operator.Modulus:
+				return "%";
+			case Operator.Addition:
+				return "+";
+			case Operator.Subtraction:
+				return "-";
+			case Operator.LeftShift:
+				return "<<";
+			case Operator.RightShift:
+				return ">>";
+			case Operator.LessThan:
+				return "<";
+			case Operator.GreaterThan:
+				return ">";
+			case Operator.LessThanOrEqual:
+				return "<=";
+			case Operator.GreaterThanOrEqual:
+				return ">=";
+			case Operator.Equality:
+				return "==";
+			case Operator.Inequality:
+				return "!=";
+			case Operator.BitwiseAnd:
+				return "&";
+			case Operator.BitwiseOr:
+				return "|";
+			case Operator.ExclusiveOr:
+				return "^";
+			case Operator.LogicalOr:
+				return "||";
+			case Operator.LogicalAnd:
+				return "&&";
+			}
+
+			return oper.ToString ();
+		}
+
+		public override string ToString ()
+		{
+			return "operator " + OperName (oper) + "(" + left.ToString () + ", " +
+				right.ToString () + ")";
+		}
+		
+		Expression ForceConversion (EmitContext ec, Expression expr, Type target_type)
+		{
+			if (expr.Type == target_type)
+				return expr;
+
+			return ConvertImplicit (ec, expr, target_type, new Location (-1));
+		}
+
+		public static void Error_OperatorAmbiguous (Location loc, Operator oper, Type l, Type r)
+		{
+			Report.Error (
+				34, loc, "Operator `" + OperName (oper) 
+				+ "' is ambiguous on operands of type `"
+				+ TypeManager.CSharpName (l) + "' "
+				+ "and `" + TypeManager.CSharpName (r)
+				+ "'");
+		}
+
+		//
+		// Note that handling the case l == Decimal || r == Decimal
+		// is taken care of by the Step 1 Operator Overload resolution.
+		//
+		bool DoNumericPromotions (EmitContext ec, Type l, Type r)
+		{
+			if (l == TypeManager.double_type || r == TypeManager.double_type){
+				//
+				// If either operand is of type double, the other operand is
+				// conveted to type double.
+				//
+				if (r != TypeManager.double_type)
+					right = ConvertImplicit (ec, right, TypeManager.double_type, loc);
+				if (l != TypeManager.double_type)
+					left = ConvertImplicit (ec, left, TypeManager.double_type, loc);
+				
+				type = TypeManager.double_type;
+			} else if (l == TypeManager.float_type || r == TypeManager.float_type){
+				//
+				// if either operand is of type float, the other operand is
+				// converted to type float.
+				//
+				if (r != TypeManager.double_type)
+					right = ConvertImplicit (ec, right, TypeManager.float_type, loc);
+				if (l != TypeManager.double_type)
+					left = ConvertImplicit (ec, left, TypeManager.float_type, loc);
+				type = TypeManager.float_type;
+			} else if (l == TypeManager.uint64_type || r == TypeManager.uint64_type){
+				Expression e;
+				Type other;
+				//
+				// If either operand is of type ulong, the other operand is
+				// converted to type ulong.  or an error ocurrs if the other
+				// operand is of type sbyte, short, int or long
+				//
+				if (l == TypeManager.uint64_type){
+					if (r != TypeManager.uint64_type){
+						if (right is IntConstant){
+							IntConstant ic = (IntConstant) right;
+							
+							e = TryImplicitIntConversion (l, ic);
+							if (e != null)
+								right = e;
+						} else if (right is LongConstant){
+							long ll = ((LongConstant) right).Value;
+
+							if (ll > 0)
+								right = new ULongConstant ((ulong) ll);
+						} else {
+							e = ImplicitNumericConversion (ec, right, l, loc);
+							if (e != null)
+								right = e;
+						}
+					}
+					other = right.Type;
+				} else {
+					if (left is IntConstant){
+						e = TryImplicitIntConversion (r, (IntConstant) left);
+						if (e != null)
+							left = e;
+					} else if (left is LongConstant){
+						long ll = ((LongConstant) left).Value;
+						
+						if (ll > 0)
+							left = new ULongConstant ((ulong) ll);
+					} else {
+						e = ImplicitNumericConversion (ec, left, r, loc);
+						if (e != null)
+							left = e;
+					}
+					other = left.Type;
+				}
+
+				if ((other == TypeManager.sbyte_type) ||
+				    (other == TypeManager.short_type) ||
+				    (other == TypeManager.int32_type) ||
+				    (other == TypeManager.int64_type))
+					Error_OperatorAmbiguous (loc, oper, l, r);
+				type = TypeManager.uint64_type;
+			} else if (l == TypeManager.int64_type || r == TypeManager.int64_type){
+				//
+				// If either operand is of type long, the other operand is converted
+				// to type long.
+				//
+				if (l != TypeManager.int64_type)
+					left = ConvertImplicit (ec, left, TypeManager.int64_type, loc);
+				if (r != TypeManager.int64_type)
+					right = ConvertImplicit (ec, right, TypeManager.int64_type, loc);
+
+				type = TypeManager.int64_type;
+			} else if (l == TypeManager.uint32_type || r == TypeManager.uint32_type){
+				//
+				// If either operand is of type uint, and the other
+				// operand is of type sbyte, short or int, othe operands are
+				// converted to type long.
+				//
+				Type other = null;
+				
+				if (l == TypeManager.uint32_type){
+					if (right is IntConstant){
+						IntConstant ic = (IntConstant) right;
+						int val = ic.Value;
+						
+						if (val >= 0)
+							right = new UIntConstant ((uint) val);
+
+						type = l;
+						return true;
+					}
+					other = r;
+				} 
+				else if (r == TypeManager.uint32_type){
+					if (left is IntConstant){
+						IntConstant ic = (IntConstant) left;
+						int val = ic.Value;
+						
+						if (val >= 0)
+							left = new UIntConstant ((uint) val);
+
+						type = r;
+						return true;
+					}
+					
+					other = l;
+				}
+
+				if ((other == TypeManager.sbyte_type) ||
+				    (other == TypeManager.short_type) ||
+				    (other == TypeManager.int32_type)){
+					left = ForceConversion (ec, left, TypeManager.int64_type);
+					right = ForceConversion (ec, right, TypeManager.int64_type);
+					type = TypeManager.int64_type;
+				} else {
+					//
+					// if either operand is of type uint, the other
+					// operand is converd to type uint
+					//
+					left = ForceConversion (ec, left, TypeManager.uint32_type);
+					right = ForceConversion (ec, right, TypeManager.uint32_type);
+					type = TypeManager.uint32_type;
+				} 
+			} else if (l == TypeManager.decimal_type || r == TypeManager.decimal_type){
+				if (l != TypeManager.decimal_type)
+					left = ConvertImplicit (ec, left, TypeManager.decimal_type, loc);
+				if (r != TypeManager.decimal_type)
+					right = ConvertImplicit (ec, right, TypeManager.decimal_type, loc);
+
+				type = TypeManager.decimal_type;
+			} else {
+				Expression l_tmp, r_tmp;
+
+				l_tmp = ForceConversion (ec, left, TypeManager.int32_type);
+				if (l_tmp == null)
+					return false;
+				
+				r_tmp = ForceConversion (ec, right, TypeManager.int32_type);
+				if (r_tmp == null)
+					return false;
+
+				left = l_tmp;
+				right = r_tmp;
+				
+				type = TypeManager.int32_type;
+			}
+
+			return true;
+		}
+
+		static public void Error_OperatorCannotBeApplied (Location loc, string name, Type l, Type r)
+		{
+			Report.Error (19, loc,
+			       "Operator " + name + " cannot be applied to operands of type `" +
+			       TypeManager.CSharpName (l) + "' and `" +
+			       TypeManager.CSharpName (r) + "'");
+		}
+		
+		void Error_OperatorCannotBeApplied ()
+		{
+			Error_OperatorCannotBeApplied (loc, OperName (oper), left.Type, right.Type);
+		}
+
+		static bool is_32_or_64 (Type t)
+		{
+			return (t == TypeManager.int32_type || t == TypeManager.uint32_type ||
+				t == TypeManager.int64_type || t == TypeManager.uint64_type);
+		}
+
+		static bool is_unsigned (Type t)
+		{
+			return (t == TypeManager.uint32_type || t == TypeManager.uint64_type ||
+				t == TypeManager.short_type || t == TypeManager.byte_type);
+		}
+					
+		Expression CheckShiftArguments (EmitContext ec)
+		{
+			Expression e;
+			Type l = left.Type;
+			Type r = right.Type;
+
+			e = ForceConversion (ec, right, TypeManager.int32_type);
+			if (e == null){
+				Error_OperatorCannotBeApplied ();
+				return null;
+			}
+			right = e;
+
+			if (((e = ConvertImplicit (ec, left, TypeManager.int32_type, loc)) != null) ||
+			    ((e = ConvertImplicit (ec, left, TypeManager.uint32_type, loc)) != null) ||
+			    ((e = ConvertImplicit (ec, left, TypeManager.int64_type, loc)) != null) ||
+			    ((e = ConvertImplicit (ec, left, TypeManager.uint64_type, loc)) != null)){
+				left = e;
+				type = e.Type;
+
+				return this;
+			}
+			Error_OperatorCannotBeApplied ();
+			return null;
+		}
+
+		Expression ResolveOperator (EmitContext ec)
+		{
+			Type l = left.Type;
+			Type r = right.Type;
+
+			bool overload_failed = false;
+
+			//
+			// Step 1: Perform Operator Overload location
+			//
+			Expression left_expr, right_expr;
+				
+			string op = oper_names [(int) oper];
+				
+			MethodGroupExpr union;
+			left_expr = MemberLookup (ec, l, op, MemberTypes.Method, AllBindingFlags, loc);
+			if (r != l){
+				right_expr = MemberLookup (
+					ec, r, op, MemberTypes.Method, AllBindingFlags, loc);
+				union = Invocation.MakeUnionSet (left_expr, right_expr, loc);
+			} else
+				union = (MethodGroupExpr) left_expr;
+				
+			if (union != null) {
+				Arguments = new ArrayList ();
+				Arguments.Add (new Argument (left, Argument.AType.Expression));
+				Arguments.Add (new Argument (right, Argument.AType.Expression));
+				
+				method = Invocation.OverloadResolve (ec, union, Arguments, Location.Null);
+				if (method != null) {
+					MethodInfo mi = (MethodInfo) method;
+					
+					type = mi.ReturnType;
+					return this;
+				} else {
+					overload_failed = true;
+				}
+			}	
+			
+			//
+			// Step 2: Default operations on CLI native types.
+			//
+
+			//
+			// Step 0: String concatenation (because overloading will get this wrong)
+			//
+			if (oper == Operator.Addition){
+				//
+				// If any of the arguments is a string, cast to string
+				//
+				
+				if (l == TypeManager.string_type){
+					
+					if (r == TypeManager.void_type) {
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+					
+					if (r == TypeManager.string_type){
+						if (left is Constant && right is Constant){
+							StringConstant ls = (StringConstant) left;
+							StringConstant rs = (StringConstant) right;
+							
+							return new StringConstant (
+								ls.Value + rs.Value);
+						}
+						
+						// string + string
+						method = TypeManager.string_concat_string_string;
+					} else {
+						// string + object
+						method = TypeManager.string_concat_object_object;
+						right = ConvertImplicit (ec, right,
+									 TypeManager.object_type, loc);
+					}
+					type = TypeManager.string_type;
+
+					Arguments = new ArrayList ();
+					Arguments.Add (new Argument (left, Argument.AType.Expression));
+					Arguments.Add (new Argument (right, Argument.AType.Expression));
+
+					return this;
+					
+				} else if (r == TypeManager.string_type){
+					// object + string
+
+					if (l == TypeManager.void_type) {
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+					
+					method = TypeManager.string_concat_object_object;
+					left = ConvertImplicit (ec, left, TypeManager.object_type, loc);
+					Arguments = new ArrayList ();
+					Arguments.Add (new Argument (left, Argument.AType.Expression));
+					Arguments.Add (new Argument (right, Argument.AType.Expression));
+
+					type = TypeManager.string_type;
+
+					return this;
+				}
+
+				//
+				// Transform a + ( - b) into a - b
+				//
+				if (right is Unary){
+					Unary right_unary = (Unary) right;
+
+					if (right_unary.Oper == Unary.Operator.UnaryNegation){
+						oper = Operator.Subtraction;
+						right = right_unary.Expr;
+						r = right.Type;
+					}
+				}
+			}
+
+			if (oper == Operator.Equality || oper == Operator.Inequality){
+				if (l == TypeManager.bool_type || r == TypeManager.bool_type){
+					if (r != TypeManager.bool_type || l != TypeManager.bool_type){
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+					
+					type = TypeManager.bool_type;
+					return this;
+				}
+
+				//
+				// operator != (object a, object b)
+				// operator == (object a, object b)
+				//
+				// For this to be used, both arguments have to be reference-types.
+				// Read the rationale on the spec (14.9.6)
+				//
+				// Also, if at compile time we know that the classes do not inherit
+				// one from the other, then we catch the error there.
+				//
+				if (!(l.IsValueType || r.IsValueType)){
+					type = TypeManager.bool_type;
+
+					if (l == r)
+						return this;
+					
+					if (l.IsSubclassOf (r) || r.IsSubclassOf (l))
+						return this;
+
+					//
+					// Also, a standard conversion must exist from either one
+					//
+					if (!(StandardConversionExists (left, r) ||
+					      StandardConversionExists (right, l))){
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+					//
+					// We are going to have to convert to an object to compare
+					//
+					if (l != TypeManager.object_type)
+						left = new EmptyCast (left, TypeManager.object_type);
+					if (r != TypeManager.object_type)
+						right = new EmptyCast (right, TypeManager.object_type);
+
+					//
+					// FIXME: CSC here catches errors cs254 and cs252
+					//
+					return this;
+				}
+			}
+
+			// Only perform numeric promotions on:
+			// +, -, *, /, %, &, |, ^, ==, !=, <, >, <=, >=
+			//
+			if (oper == Operator.Addition || oper == Operator.Subtraction) {
+				if (l.IsSubclassOf (TypeManager.delegate_type) &&
+				    r.IsSubclassOf (TypeManager.delegate_type)) {
+					
+					Arguments = new ArrayList ();
+					Arguments.Add (new Argument (left, Argument.AType.Expression));
+					Arguments.Add (new Argument (right, Argument.AType.Expression));
+					
+					if (oper == Operator.Addition)
+						method = TypeManager.delegate_combine_delegate_delegate;
+					else
+						method = TypeManager.delegate_remove_delegate_delegate;
+
+					if (l != r) {
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+
+					DelegateOperation = true;
+					type = l;
+					return this;
+				}
+
+				//
+				// Pointer arithmetic:
+				//
+				// T* operator + (T* x, int y);
+				// T* operator + (T* x, uint y);
+				// T* operator + (T* x, long y);
+				// T* operator + (T* x, ulong y);
+				//
+				// T* operator + (int y,   T* x);
+				// T* operator + (uint y,  T *x);
+				// T* operator + (long y,  T *x);
+				// T* operator + (ulong y, T *x);
+				//
+				// T* operator - (T* x, int y);
+				// T* operator - (T* x, uint y);
+				// T* operator - (T* x, long y);
+				// T* operator - (T* x, ulong y);
+				//
+				// long operator - (T* x, T *y)
+				//
+				if (l.IsPointer){
+					if (r.IsPointer && oper == Operator.Subtraction){
+						if (r == l)
+							return new PointerArithmetic (
+								false, left, right, TypeManager.int64_type,
+								loc);
+					} else if (is_32_or_64 (r))
+						return new PointerArithmetic (
+							oper == Operator.Addition, left, right, l, loc);
+				} else if (r.IsPointer && is_32_or_64 (l) && oper == Operator.Addition)
+					return new PointerArithmetic (
+						true, right, left, r, loc);
+			}
+			
+			//
+			// Enumeration operators
+			//
+			bool lie = TypeManager.IsEnumType (l);
+			bool rie = TypeManager.IsEnumType (r);
+			if (lie || rie){
+				Expression temp;
+
+				//
+				// operator + (E e, U x)
+				//
+				if (oper == Operator.Addition){
+					if (lie && rie){
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+
+					Type enum_type = lie ? l : r;
+					Type other_type = lie ? r : l;
+					Type underlying_type = TypeManager.EnumToUnderlying (enum_type);
+;
+					
+					if (underlying_type != other_type){
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+
+					type = enum_type;
+					return this;
+				}
+				
+				if (!rie){
+					temp = ConvertImplicit (ec, right, l, loc);
+					if (temp != null)
+						right = temp;
+					else {
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+				} if (!lie){
+					temp = ConvertImplicit (ec, left, r, loc);
+					if (temp != null){
+						left = temp;
+						l = r;
+					} else {
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+				}
+
+				if (oper == Operator.Equality || oper == Operator.Inequality ||
+				    oper == Operator.LessThanOrEqual || oper == Operator.LessThan ||
+				    oper == Operator.GreaterThanOrEqual || oper == Operator.GreaterThan){
+					type = TypeManager.bool_type;
+					return this;
+				}
+
+				if (oper == Operator.BitwiseAnd ||
+				    oper == Operator.BitwiseOr ||
+				    oper == Operator.ExclusiveOr){
+					type = l;
+					return this;
+				}
+				return null;
+			}
+			
+			if (oper == Operator.LeftShift || oper == Operator.RightShift)
+				return CheckShiftArguments (ec);
+
+			if (oper == Operator.LogicalOr || oper == Operator.LogicalAnd){
+				if (l != TypeManager.bool_type || r != TypeManager.bool_type){
+					Error_OperatorCannotBeApplied ();
+					return null;
+				}
+
+				type = TypeManager.bool_type;
+				return this;
+			} 
+
+			//
+			// operator & (bool x, bool y)
+			// operator | (bool x, bool y)
+			// operator ^ (bool x, bool y)
+			//
+			if (l == TypeManager.bool_type && r == TypeManager.bool_type){
+				if (oper == Operator.BitwiseAnd ||
+				    oper == Operator.BitwiseOr ||
+				    oper == Operator.ExclusiveOr){
+					type = l;
+					return this;
+				}
+			}
+			
+			//
+			// Pointer comparison
+			//
+			if (l.IsPointer && r.IsPointer){
+				if (oper == Operator.Equality || oper == Operator.Inequality ||
+				    oper == Operator.LessThan || oper == Operator.LessThanOrEqual ||
+				    oper == Operator.GreaterThan || oper == Operator.GreaterThanOrEqual){
+					type = TypeManager.bool_type;
+					return this;
+				}
+			}
+			
+			//
+			// We are dealing with numbers
+			//
+			if (overload_failed){
+				Error_OperatorCannotBeApplied ();
+				return null;
+			}
+
+			if (!DoNumericPromotions (ec, l, r)){
+				Error_OperatorCannotBeApplied ();
+				return null;
+			}
+
+			if (left == null || right == null)
+				return null;
+
+			//
+			// reload our cached types if required
+			//
+			l = left.Type;
+			r = right.Type;
+			
+			if (oper == Operator.BitwiseAnd ||
+			    oper == Operator.BitwiseOr ||
+			    oper == Operator.ExclusiveOr){
+				if (l == r){
+					if (!((l == TypeManager.int32_type) ||
+					      (l == TypeManager.uint32_type) ||
+					      (l == TypeManager.int64_type) ||
+					      (l == TypeManager.uint64_type)))
+						type = l;
+				} else {
+					Error_OperatorCannotBeApplied ();
+					return null;
+				}
+			}
+
+			if (oper == Operator.Equality ||
+			    oper == Operator.Inequality ||
+			    oper == Operator.LessThanOrEqual ||
+			    oper == Operator.LessThan ||
+			    oper == Operator.GreaterThanOrEqual ||
+			    oper == Operator.GreaterThan){
+				type = TypeManager.bool_type;
+			}
+
+			return this;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			left = left.Resolve (ec);
+			right = right.Resolve (ec);
+
+			if (left == null || right == null)
+				return null;
+
+			if (left.Type == null)
+				throw new Exception (
+					"Resolve returned non null, but did not set the type! (" +
+					left + ") at Line: " + loc.Row);
+			if (right.Type == null)
+				throw new Exception (
+					"Resolve returned non null, but did not set the type! (" +
+					right + ") at Line: "+ loc.Row);
+
+			eclass = ExprClass.Value;
+
+			if (left is Constant && right is Constant){
+				Expression e = ConstantFold.BinaryFold (
+					ec, oper, (Constant) left, (Constant) right, loc);
+				if (e != null)
+					return e;
+			}
+
+			return ResolveOperator (ec);
+		}
+
+		/// <remarks>
+		///   EmitBranchable is called from Statement.EmitBoolExpression in the
+		///   context of a conditional bool expression.  This function will return
+		///   false if it is was possible to use EmitBranchable, or true if it was.
+		///
+		///   The expression's code is generated, and we will generate a branch to `target'
+		///   if the resulting expression value is equal to isTrue
+		/// </remarks>
+		public bool EmitBranchable (EmitContext ec, Label target, bool onTrue)
+		{
+			if (method != null)
+				return false;
+
+			ILGenerator ig = ec.ig;
+
+			//
+			// This is more complicated than it looks, but its just to avoid
+			// duplicated tests: basically, we allow ==, !=, >, <, >= and <=
+			// but on top of that we want for == and != to use a special path
+			// if we are comparing against null
+			//
+			if (oper == Operator.Equality || oper == Operator.Inequality){
+				bool my_on_true = oper == Operator.Inequality ? onTrue : !onTrue;
+				
+				if (left is NullLiteral){
+					right.Emit (ec);
+					if (my_on_true)
+						ig.Emit (OpCodes.Brtrue, target);
+					else
+						ig.Emit (OpCodes.Brfalse, target);
+					return true;
+				} else if (right is NullLiteral){
+					left.Emit (ec);
+					if (my_on_true)
+						ig.Emit (OpCodes.Brtrue, target);
+					else
+						ig.Emit (OpCodes.Brfalse, target);
+					return true;
+				} 
+			} else if (!(oper == Operator.LessThan ||
+				      oper == Operator.GreaterThan ||
+				      oper == Operator.LessThanOrEqual ||
+				      oper == Operator.GreaterThanOrEqual))
+				return false;
+			
+
+			
+			left.Emit (ec);
+			right.Emit (ec);
+
+			bool isUnsigned = is_unsigned (left.Type);
+
+			switch (oper){
+			case Operator.Equality:
+				if (onTrue)
+					ig.Emit (OpCodes.Beq, target);
+				else
+					ig.Emit (OpCodes.Bne_Un, target);
+				break;
+
+			case Operator.Inequality:
+				if (onTrue)
+					ig.Emit (OpCodes.Bne_Un, target);
+				else
+					ig.Emit (OpCodes.Beq, target);
+				break;
+
+			case Operator.LessThan:
+				if (onTrue)
+					if (isUnsigned)
+						ig.Emit (OpCodes.Blt_Un, target);
+					else
+						ig.Emit (OpCodes.Blt, target);
+				else
+					if (isUnsigned)
+						ig.Emit (OpCodes.Bge_Un, target);
+					else
+						ig.Emit (OpCodes.Bge, target);
+				break;
+
+			case Operator.GreaterThan:
+				if (onTrue)
+					if (isUnsigned)
+						ig.Emit (OpCodes.Bgt_Un, target);
+					else
+						ig.Emit (OpCodes.Bgt, target);
+				else
+					if (isUnsigned)
+						ig.Emit (OpCodes.Ble_Un, target);
+					else
+						ig.Emit (OpCodes.Ble, target);
+				break;
+
+			case Operator.LessThanOrEqual:
+				if (onTrue)
+					if (isUnsigned)
+						ig.Emit (OpCodes.Ble_Un, target);
+					else
+						ig.Emit (OpCodes.Ble, target);
+				else
+					if (isUnsigned)
+						ig.Emit (OpCodes.Bgt_Un, target);
+					else
+						ig.Emit (OpCodes.Bgt, target);
+				break;
+
+
+			case Operator.GreaterThanOrEqual:
+				if (onTrue)
+					if (isUnsigned)
+						ig.Emit (OpCodes.Bge_Un, target);
+					else
+						ig.Emit (OpCodes.Bge, target);
+				else
+					if (isUnsigned)
+						ig.Emit (OpCodes.Blt_Un, target);
+					else
+						ig.Emit (OpCodes.Blt, target);
+				break;
+
+			default:
+				return false;
+			}
+			
+			return true;
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Type l = left.Type;
+			Type r = right.Type;
+			OpCode opcode;
+
+			if (method != null) {
+
+				// Note that operators are static anyway
+				
+				if (Arguments != null) 
+					Invocation.EmitArguments (ec, method, Arguments);
+				
+				if (method is MethodInfo)
+					ig.Emit (OpCodes.Call, (MethodInfo) method);
+				else
+					ig.Emit (OpCodes.Call, (ConstructorInfo) method);
+
+				if (DelegateOperation)
+					ig.Emit (OpCodes.Castclass, type);
+					
+				return;
+			}
+
+			//
+			// Handle short-circuit operators differently
+			// than the rest
+			//
+			if (oper == Operator.LogicalAnd){
+				Label load_zero = ig.DefineLabel ();
+				Label end = ig.DefineLabel ();
+				
+				left.Emit (ec);
+				ig.Emit (OpCodes.Brfalse, load_zero);
+				right.Emit (ec);
+				ig.Emit (OpCodes.Br, end);
+				ig.MarkLabel (load_zero);
+				ig.Emit (OpCodes.Ldc_I4_0);
+				ig.MarkLabel (end);
+				return;
+			} else if (oper == Operator.LogicalOr){
+				Label load_one = ig.DefineLabel ();
+				Label end = ig.DefineLabel ();
+				
+				left.Emit (ec);
+				ig.Emit (OpCodes.Brtrue, load_one);
+				right.Emit (ec);
+				ig.Emit (OpCodes.Br, end);
+				ig.MarkLabel (load_one);
+				ig.Emit (OpCodes.Ldc_I4_1);
+				ig.MarkLabel (end);
+				return;
+			}
+			
+			left.Emit (ec);
+			right.Emit (ec);
+
+			switch (oper){
+			case Operator.Multiply:
+				if (ec.CheckState){
+					if (l == TypeManager.int32_type || l == TypeManager.int64_type)
+						opcode = OpCodes.Mul_Ovf;
+					else if (l==TypeManager.uint32_type || l==TypeManager.uint64_type)
+						opcode = OpCodes.Mul_Ovf_Un;
+					else
+						opcode = OpCodes.Mul;
+				} else
+					opcode = OpCodes.Mul;
+
+				break;
+
+			case Operator.Division:
+				if (l == TypeManager.uint32_type || l == TypeManager.uint64_type)
+					opcode = OpCodes.Div_Un;
+				else
+					opcode = OpCodes.Div;
+				break;
+
+			case Operator.Modulus:
+				if (l == TypeManager.uint32_type || l == TypeManager.uint64_type)
+					opcode = OpCodes.Rem_Un;
+				else
+					opcode = OpCodes.Rem;
+				break;
+
+			case Operator.Addition:
+				if (ec.CheckState){
+					if (l == TypeManager.int32_type || l == TypeManager.int64_type)
+						opcode = OpCodes.Add_Ovf;
+					else if (l==TypeManager.uint32_type || l==TypeManager.uint64_type)
+						opcode = OpCodes.Add_Ovf_Un;
+					else
+						opcode = OpCodes.Add;
+				} else
+					opcode = OpCodes.Add;
+				break;
+
+			case Operator.Subtraction:
+				if (ec.CheckState){
+					if (l == TypeManager.int32_type || l == TypeManager.int64_type)
+						opcode = OpCodes.Sub_Ovf;
+					else if (l==TypeManager.uint32_type || l==TypeManager.uint64_type)
+						opcode = OpCodes.Sub_Ovf_Un;
+					else
+						opcode = OpCodes.Sub;
+				} else
+					opcode = OpCodes.Sub;
+				break;
+
+			case Operator.RightShift:
+				if (l == TypeManager.uint32_type || l == TypeManager.uint64_type)
+					opcode = OpCodes.Shr_Un;
+				else
+					opcode = OpCodes.Shr;
+				break;
+				
+			case Operator.LeftShift:
+				opcode = OpCodes.Shl;
+				break;
+
+			case Operator.Equality:
+				opcode = OpCodes.Ceq;
+				break;
+
+			case Operator.Inequality:
+				ec.ig.Emit (OpCodes.Ceq);
+				ec.ig.Emit (OpCodes.Ldc_I4_0);
+				
+				opcode = OpCodes.Ceq;
+				break;
+
+			case Operator.LessThan:
+				opcode = OpCodes.Clt;
+				break;
+
+			case Operator.GreaterThan:
+				opcode = OpCodes.Cgt;
+				break;
+
+			case Operator.LessThanOrEqual:
+				ec.ig.Emit (OpCodes.Cgt);
+				ec.ig.Emit (OpCodes.Ldc_I4_0);
+				
+				opcode = OpCodes.Ceq;
+				break;
+
+			case Operator.GreaterThanOrEqual:
+				ec.ig.Emit (OpCodes.Clt);
+				ec.ig.Emit (OpCodes.Ldc_I4_1);
+				
+				opcode = OpCodes.Sub;
+				break;
+
+			case Operator.BitwiseOr:
+				opcode = OpCodes.Or;
+				break;
+
+			case Operator.BitwiseAnd:
+				opcode = OpCodes.And;
+				break;
+
+			case Operator.ExclusiveOr:
+				opcode = OpCodes.Xor;
+				break;
+
+			default:
+				throw new Exception ("This should not happen: Operator = "
+						     + oper.ToString ());
+			}
+
+			ig.Emit (opcode);
+		}
+
+		public bool IsBuiltinOperator {
+			get {
+				return method == null;
+			}
+		}
+	}
+
+	public class PointerArithmetic : Expression {
+		Expression left, right;
+		bool is_add;
+
+		//
+		// We assume that `l' is always a pointer
+		//
+		public PointerArithmetic (bool is_addition, Expression l, Expression r, Type t,
+					  Location loc)
+		{
+			type = t;
+			eclass = ExprClass.Variable;
+			this.loc = loc;
+			left = l;
+			right = r;
+			is_add = is_addition;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// We are born fully resolved
+			//
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			Type op_type = left.Type;
+			ILGenerator ig = ec.ig;
+			int size = GetTypeSize (op_type.GetElementType ());
+			
+			if (right.Type.IsPointer){
+				//
+				// handle (pointer - pointer)
+				//
+				left.Emit (ec);
+				right.Emit (ec);
+				ig.Emit (OpCodes.Sub);
+
+				if (size != 1){
+					if (size == 0)
+						ig.Emit (OpCodes.Sizeof, op_type);
+					else 
+						IntLiteral.EmitInt (ig, size);
+					ig.Emit (OpCodes.Div);
+				}
+				ig.Emit (OpCodes.Conv_I8);
+			} else {
+				//
+				// handle + and - on (pointer op int)
+				//
+				left.Emit (ec);
+				ig.Emit (OpCodes.Conv_I);
+				right.Emit (ec);
+				if (size != 1){
+					if (size == 0)
+						ig.Emit (OpCodes.Sizeof, op_type);
+					else 
+						IntLiteral.EmitInt (ig, size);
+					ig.Emit (OpCodes.Mul);
+				}
+				if (is_add)
+					ig.Emit (OpCodes.Add);
+				else
+					ig.Emit (OpCodes.Sub);
+			}
+		}
+	}
+	
+	/// <summary>
+	///   Implements the ternary conditiona operator (?:)
+	/// </summary>
+	public class Conditional : Expression {
+		Expression expr, trueExpr, falseExpr;
+		
+		public Conditional (Expression expr, Expression trueExpr, Expression falseExpr, Location l)
+		{
+			this.expr = expr;
+			this.trueExpr = trueExpr;
+			this.falseExpr = falseExpr;
+			this.loc = l;
+		}
+
+		public Expression Expr {
+			get {
+				return expr;
+			}
+		}
+
+		public Expression TrueExpr {
+			get {
+				return trueExpr;
+			}
+		}
+
+		public Expression FalseExpr {
+			get {
+				return falseExpr;
+			}
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			expr = expr.Resolve (ec);
+
+			if (expr.Type != TypeManager.bool_type)
+				expr = Expression.ConvertImplicitRequired (
+					ec, expr, TypeManager.bool_type, loc);
+			
+			trueExpr = trueExpr.Resolve (ec);
+			falseExpr = falseExpr.Resolve (ec);
+
+			if (expr == null || trueExpr == null || falseExpr == null)
+				return null;
+
+			eclass = ExprClass.Value;
+			if (trueExpr.Type == falseExpr.Type)
+				type = trueExpr.Type;
+			else {
+				Expression conv;
+				Type true_type = trueExpr.Type;
+				Type false_type = falseExpr.Type;
+
+				if (trueExpr is NullLiteral){
+					type = false_type;
+					return this;
+				} else if (falseExpr is NullLiteral){
+					type = true_type;
+					return this;
+				}
+				
+				//
+				// First, if an implicit conversion exists from trueExpr
+				// to falseExpr, then the result type is of type falseExpr.Type
+				//
+				conv = ConvertImplicit (ec, trueExpr, false_type, loc);
+				if (conv != null){
+					//
+					// Check if both can convert implicitl to each other's type
+					//
+					if (ConvertImplicit (ec, falseExpr, true_type, loc) != null){
+						Error (172,
+						       "Can not compute type of conditional expression " +
+						       "as `" + TypeManager.CSharpName (trueExpr.Type) +
+						       "' and `" + TypeManager.CSharpName (falseExpr.Type) +
+						       "' convert implicitly to each other");
+						return null;
+					}
+					type = false_type;
+					trueExpr = conv;
+				} else if ((conv = ConvertImplicit(ec, falseExpr, true_type,loc))!= null){
+					type = true_type;
+					falseExpr = conv;
+				} else {
+					Error (173, "The type of the conditional expression can " +
+					       "not be computed because there is no implicit conversion" +
+					       " from `" + TypeManager.CSharpName (trueExpr.Type) + "'" +
+					       " and `" + TypeManager.CSharpName (falseExpr.Type) + "'");
+					return null;
+				}
+			}
+
+			if (expr is BoolConstant){
+				BoolConstant bc = (BoolConstant) expr;
+
+				if (bc.Value)
+					return trueExpr;
+				else
+					return falseExpr;
+			}
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label false_target = ig.DefineLabel ();
+			Label end_target = ig.DefineLabel ();
+
+			expr.Emit (ec);
+			ig.Emit (OpCodes.Brfalse, false_target);
+			trueExpr.Emit (ec);
+			ig.Emit (OpCodes.Br, end_target);
+			ig.MarkLabel (false_target);
+			falseExpr.Emit (ec);
+			ig.MarkLabel (end_target);
+		}
+
+	}
+
+	/// <summary>
+	///   Local variables
+	/// </summary>
+	public class LocalVariableReference : Expression, IAssignMethod, IMemoryLocation {
+		public readonly string Name;
+		public readonly Block Block;
+		VariableInfo variable_info;
+		bool is_readonly;
+		
+		public LocalVariableReference (Block block, string name, Location l)
+		{
+			Block = block;
+			Name = name;
+			loc = l;
+			eclass = ExprClass.Variable;
+		}
+
+		// Setting `is_readonly' to false will allow you to create a writable
+		// reference to a read-only variable.  This is used by foreach and using.
+		public LocalVariableReference (Block block, string name, Location l,
+					       VariableInfo variable_info, bool is_readonly)
+			: this (block, name, l)
+		{
+			this.variable_info = variable_info;
+			this.is_readonly = is_readonly;
+		}
+
+		public VariableInfo VariableInfo {
+			get {
+				if (variable_info == null) {
+					variable_info = Block.GetVariableInfo (Name);
+					is_readonly = variable_info.ReadOnly;
+				}
+				return variable_info;
+			}
+		}
+
+		public bool IsReadOnly {
+			get {
+				if (variable_info == null) {
+					variable_info = Block.GetVariableInfo (Name);
+					is_readonly = variable_info.ReadOnly;
+				}
+				return is_readonly;
+			}
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			VariableInfo vi = VariableInfo;
+
+			if (Block.IsConstant (Name)) {
+				Expression e = Block.GetConstantExpression (Name);
+
+				vi.Used = true;
+				return e;
+			}
+
+			if (!ec.IsVariableAssigned (vi)) {
+				Error (
+					165,
+					"Use of unassigned local variable `" + Name + "'");
+				ec.SetVariableAssigned (vi);
+				return null;
+			}
+
+			type = vi.VariableType;
+			return this;
+		}
+
+		override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			VariableInfo vi = VariableInfo;
+
+			ec.SetVariableAssigned (vi);
+
+			Expression e = DoResolve (ec);
+
+			if (e == null)
+				return null;
+
+			if (is_readonly){
+				Error (
+					1604,
+					"cannot assign to `" + Name + "' because it is readonly");
+				return null;
+			}
+			
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			VariableInfo vi = VariableInfo;
+			ILGenerator ig = ec.ig;
+
+			ig.Emit (OpCodes.Ldloc, vi.LocalBuilder);
+			vi.Used = true;
+		}
+		
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			ILGenerator ig = ec.ig;
+			VariableInfo vi = VariableInfo;
+
+			vi.Assigned = true;
+
+			source.Emit (ec);
+			
+			ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+		}
+		
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			VariableInfo vi = VariableInfo;
+
+			ec.ig.Emit (OpCodes.Ldloca, vi.LocalBuilder);
+		}
+	}
+
+	/// <summary>
+	///   This represents a reference to a parameter in the intermediate
+	///   representation.
+	/// </summary>
+	public class ParameterReference : Expression, IAssignMethod, IMemoryLocation {
+		Parameters pars;
+		String name;
+		int idx;
+		public Parameter.Modifier mod;
+		public bool is_ref;
+		
+		public ParameterReference (Parameters pars, int idx, string name, Location loc)
+		{
+			this.pars = pars;
+			this.idx  = idx;
+			this.name = name;
+			this.loc = loc;
+			eclass = ExprClass.Variable;
+		}
+
+		//
+		// Notice that for ref/out parameters, the type exposed is not the
+		// same type exposed externally.
+		//
+		// for "ref int a":
+		//   externally we expose "int&"
+		//   here we expose       "int".
+		//
+		// We record this in "is_ref".  This means that the type system can treat
+		// the type as it is expected, but when we generate the code, we generate
+		// the alternate kind of code.
+		//
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = pars.GetParameterInfo (ec.DeclSpace, idx, out mod);
+			is_ref = (mod & Parameter.Modifier.ISBYREF) != 0;
+			eclass = ExprClass.Variable;
+
+			if (((mod & (Parameter.Modifier.OUT)) != 0) && !ec.IsParameterAssigned (idx)) {
+				Error (
+					165,
+					"Use of unassigned local variable `" + name + "'");
+				return null;
+			}
+
+			return this;
+		}
+
+		override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			type = pars.GetParameterInfo (ec.DeclSpace, idx, out mod);
+			is_ref = (mod & Parameter.Modifier.ISBYREF) != 0;
+			eclass = ExprClass.Variable;
+
+			if ((mod & Parameter.Modifier.OUT) != 0)
+				ec.SetParameterAssigned (idx);
+
+			return this;
+		}
+
+		static void EmitLdArg (ILGenerator ig, int x)
+		{
+			if (x <= 255){
+				switch (x){
+				case 0: ig.Emit (OpCodes.Ldarg_0); break;
+				case 1: ig.Emit (OpCodes.Ldarg_1); break;
+				case 2: ig.Emit (OpCodes.Ldarg_2); break;
+				case 3: ig.Emit (OpCodes.Ldarg_3); break;
+				default: ig.Emit (OpCodes.Ldarg_S, (byte) x); break;
+				}
+			} else
+				ig.Emit (OpCodes.Ldarg, x);
+		}
+		
+		//
+		// This method is used by parameters that are references, that are
+		// being passed as references:  we only want to pass the pointer (that
+		// is already stored in the parameter, not the address of the pointer,
+		// and not the value of the variable).
+		//
+		public void EmitLoad (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			int arg_idx = idx;
+
+			if (!ec.IsStatic)
+				arg_idx++;
+
+			EmitLdArg (ig, arg_idx);
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			int arg_idx = idx;
+
+			if (!ec.IsStatic)
+				arg_idx++;
+
+			EmitLdArg (ig, arg_idx);
+
+			if (!is_ref)
+				return;
+
+			//
+			// If we are a reference, we loaded on the stack a pointer
+			// Now lets load the real value
+			//
+			LoadFromPtr (ig, type);
+		}
+
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			ILGenerator ig = ec.ig;
+			int arg_idx = idx;
+
+			if (!ec.IsStatic)
+				arg_idx++;
+
+			if (is_ref)
+				EmitLdArg (ig, arg_idx);
+			
+			source.Emit (ec);
+
+			if (is_ref)
+				StoreFromPtr (ig, type);
+			else {
+				if (arg_idx <= 255)
+					ig.Emit (OpCodes.Starg_S, (byte) arg_idx);
+				else
+					ig.Emit (OpCodes.Starg, arg_idx);
+			}
+		}
+
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			int arg_idx = idx;
+
+			if (!ec.IsStatic)
+				arg_idx++;
+
+			if (is_ref){
+				if (arg_idx <= 255)
+					ec.ig.Emit (OpCodes.Ldarg_S, (byte) arg_idx);
+				else
+					ec.ig.Emit (OpCodes.Ldarg, arg_idx);
+			} else {
+				if (arg_idx <= 255)
+					ec.ig.Emit (OpCodes.Ldarga_S, (byte) arg_idx);
+				else
+					ec.ig.Emit (OpCodes.Ldarga, arg_idx);
+			}
+		}
+	}
+	
+	/// <summary>
+	///   Used for arguments to New(), Invocation()
+	/// </summary>
+	public class Argument {
+		public enum AType : byte {
+			Expression,
+			Ref,
+			Out
+		};
+
+		public readonly AType ArgType;
+		public Expression Expr;
+		
+		public Argument (Expression expr, AType type)
+		{
+			this.Expr = expr;
+			this.ArgType = type;
+		}
+
+		public Type Type {
+			get {
+				if (ArgType == AType.Ref || ArgType == AType.Out)
+					return TypeManager.LookupType (Expr.Type.ToString () + "&");
+				else
+					return Expr.Type;
+			}
+		}
+
+		public Parameter.Modifier GetParameterModifier ()
+		{
+			switch (ArgType) {
+			case AType.Out:
+				return Parameter.Modifier.OUT | Parameter.Modifier.ISBYREF;
+
+			case AType.Ref:
+				return Parameter.Modifier.REF | Parameter.Modifier.ISBYREF;
+
+			default:
+				return Parameter.Modifier.NONE;
+			}
+		}
+
+	        public static string FullDesc (Argument a)
+		{
+			return (a.ArgType == AType.Ref ? "ref " :
+				(a.ArgType == AType.Out ? "out " : "")) +
+				TypeManager.CSharpName (a.Expr.Type);
+		}
+		
+		public bool Resolve (EmitContext ec, Location loc)
+		{
+			if (ArgType == AType.Ref) {
+				Expr = Expr.Resolve (ec);
+				if (Expr == null)
+					return false;
+
+				Expr = Expr.ResolveLValue (ec, Expr);
+			} else if (ArgType == AType.Out)
+				Expr = Expr.ResolveLValue (ec, new EmptyExpression ());
+			else
+				Expr = Expr.Resolve (ec);
+
+			if (Expr == null)
+				return false;
+
+			if (ArgType == AType.Expression){
+				if ((Expr.eclass == ExprClass.Type) && (Expr is TypeExpr)) {
+					Report.Error (118, loc, "Expression denotes a `type' " +
+						      "where a `variable or value' was expected");
+					return false;
+				}
+
+				return true;
+			}
+
+			if (Expr.eclass != ExprClass.Variable){
+				//
+				// We just probe to match the CSC output
+				//
+				if (Expr.eclass == ExprClass.PropertyAccess ||
+				    Expr.eclass == ExprClass.IndexerAccess){
+					Report.Error (
+						206, loc,
+						"A property or indexer can not be passed as an out or ref " +
+						"parameter");
+				} else {
+					Report.Error (
+						1510, loc,
+						"An lvalue is required as an argument to out or ref");
+				}
+				return false;
+			}
+				
+			return true;
+		}
+
+		public void Emit (EmitContext ec)
+		{
+			//
+			// Ref and Out parameters need to have their addresses taken.
+			//
+			// ParameterReferences might already be references, so we want
+			// to pass just the value
+			//
+			if (ArgType == AType.Ref || ArgType == AType.Out){
+				AddressOp mode = AddressOp.Store;
+
+				if (ArgType == AType.Ref)
+					mode |= AddressOp.Load;
+				
+				if (Expr is ParameterReference){
+					ParameterReference pr = (ParameterReference) Expr;
+
+					if (pr.is_ref)
+						pr.EmitLoad (ec);
+					else {
+						
+						pr.AddressOf (ec, mode);
+					}
+				} else
+					((IMemoryLocation)Expr).AddressOf (ec, mode);
+			} else
+				Expr.Emit (ec);
+		}
+	}
+
+	/// <summary>
+	///   Invocation of methods or delegates.
+	/// </summary>
+	public class Invocation : ExpressionStatement {
+		public readonly ArrayList Arguments;
+
+		Expression expr;
+		MethodBase method = null;
+		bool is_base;
+		
+		static Hashtable method_parameter_cache;
+
+		static Invocation ()
+		{
+			method_parameter_cache = new PtrHashtable ();
+		}
+			
+		//
+		// arguments is an ArrayList, but we do not want to typecast,
+		// as it might be null.
+		//
+		// FIXME: only allow expr to be a method invocation or a
+		// delegate invocation (7.5.5)
+		//
+		public Invocation (Expression expr, ArrayList arguments, Location l)
+		{
+			this.expr = expr;
+			Arguments = arguments;
+			loc = l;
+		}
+
+		public Expression Expr {
+			get {
+				return expr;
+			}
+		}
+
+		/// <summary>
+		///   Returns the Parameters (a ParameterData interface) for the
+		///   Method `mb'
+		/// </summary>
+		public static ParameterData GetParameterData (MethodBase mb)
+		{
+			object pd = method_parameter_cache [mb];
+			object ip;
+			
+			if (pd != null)
+				return (ParameterData) pd;
+
+			
+			ip = TypeManager.LookupParametersByBuilder (mb);
+			if (ip != null){
+				method_parameter_cache [mb] = ip;
+
+				return (ParameterData) ip;
+			} else {
+				ParameterInfo [] pi = mb.GetParameters ();
+				ReflectionParameters rp = new ReflectionParameters (pi);
+				method_parameter_cache [mb] = rp;
+
+				return (ParameterData) rp;
+			}
+		}
+
+		/// <summary>
+		///  Determines "better conversion" as specified in 7.4.2.3
+		///  Returns : 1 if a->p is better
+		///            0 if a->q or neither is better 
+		/// </summary>
+		static int BetterConversion (EmitContext ec, Argument a, Type p, Type q, Location loc)
+		{
+			Type argument_type = a.Type;
+			Expression argument_expr = a.Expr;
+
+			if (argument_type == null)
+				throw new Exception ("Expression of type " + a.Expr + " does not resolve its type");
+
+			if (p == q)
+				return 0;
+			
+			if (argument_type == p)
+				return 1;
+
+			if (argument_type == q)
+				return 0;
+
+			//
+			// Now probe whether an implicit constant expression conversion
+			// can be used.
+			//
+			// An implicit constant expression conversion permits the following
+			// conversions:
+			//
+			//    * A constant-expression of type `int' can be converted to type
+			//      sbyte, byute, short, ushort, uint, ulong provided the value of
+			//      of the expression is withing the range of the destination type.
+			//
+			//    * A constant-expression of type long can be converted to type
+			//      ulong, provided the value of the constant expression is not negative
+			//
+			// FIXME: Note that this assumes that constant folding has
+			// taken place.  We dont do constant folding yet.
+			//
+
+			if (argument_expr is IntConstant){
+				IntConstant ei = (IntConstant) argument_expr;
+				int value = ei.Value;
+				
+				if (p == TypeManager.sbyte_type){
+					if (value >= SByte.MinValue && value <= SByte.MaxValue)
+						return 1;
+				} else if (p == TypeManager.byte_type){
+					if (Byte.MinValue >= 0 && value <= Byte.MaxValue)
+						return 1;
+				} else if (p == TypeManager.short_type){
+					if (value >= Int16.MinValue && value <= Int16.MaxValue)
+						return 1;
+				} else if (p == TypeManager.ushort_type){
+					if (value >= UInt16.MinValue && value <= UInt16.MaxValue)
+						return 1;
+				} else if (p == TypeManager.uint32_type){
+					//
+					// we can optimize this case: a positive int32
+					// always fits on a uint32
+					//
+					if (value >= 0)
+						return 1;
+				} else if (p == TypeManager.uint64_type){
+					//
+					// we can optimize this case: a positive int32
+					// always fits on a uint64
+					//
+					if (value >= 0)
+						return 1;
+				}
+			} else if (argument_type == TypeManager.int64_type && argument_expr is LongConstant){
+				LongConstant lc = (LongConstant) argument_expr;
+				
+				if (p == TypeManager.uint64_type){
+					if (lc.Value > 0)
+						return 1;
+				}
+			}
+
+			if (q == null) {
+				Expression tmp = ConvertImplicit (ec, argument_expr, p, loc);
+				
+				if (tmp != null)
+					return 1;
+				else
+					return 0;
+			}
+
+			Expression p_tmp = new EmptyExpression (p);
+			Expression q_tmp = new EmptyExpression (q);
+			
+			if (StandardConversionExists (p_tmp, q) == true &&
+			    StandardConversionExists (q_tmp, p) == false)
+				return 1;
+
+			if (p == TypeManager.sbyte_type)
+				if (q == TypeManager.byte_type || q == TypeManager.ushort_type ||
+				    q == TypeManager.uint32_type || q == TypeManager.uint64_type)
+					return 1;
+
+			if (p == TypeManager.short_type)
+				if (q == TypeManager.ushort_type || q == TypeManager.uint32_type ||
+				    q == TypeManager.uint64_type)
+					return 1;
+
+			if (p == TypeManager.int32_type)
+				if (q == TypeManager.uint32_type || q == TypeManager.uint64_type)
+					return 1;
+
+			if (p == TypeManager.int64_type)
+				if (q == TypeManager.uint64_type)
+					return 1;
+
+			return 0;
+		}
+		
+		/// <summary>
+		///  Determines "Better function"
+		/// </summary>
+		/// <remarks>
+		///    and returns an integer indicating :
+		///    0 if candidate ain't better
+		///    1 if candidate is better than the current best match
+		/// </remarks>
+		static int BetterFunction (EmitContext ec, ArrayList args,
+					   MethodBase candidate, MethodBase best,
+					   bool expanded_form, Location loc)
+		{
+			ParameterData candidate_pd = GetParameterData (candidate);
+			ParameterData best_pd;
+			int argument_count;
+		
+			if (args == null)
+				argument_count = 0;
+			else
+				argument_count = args.Count;
+
+			int cand_count = candidate_pd.Count;
+
+			if (cand_count == 0 && argument_count == 0)
+				return 1;
+
+			if (candidate_pd.ParameterModifier (cand_count - 1) != Parameter.Modifier.PARAMS)
+				if (cand_count != argument_count)
+					return 0;
+			
+			if (best == null) {
+				int x = 0;
+
+				if (argument_count == 0 && cand_count == 1 &&
+				    candidate_pd.ParameterModifier (cand_count - 1) == Parameter.Modifier.PARAMS)
+					return 1;
+				
+				for (int j = argument_count; j > 0;) {
+					j--;
+
+					Argument a = (Argument) args [j];
+					Type t = candidate_pd.ParameterType (j);
+
+					if (candidate_pd.ParameterModifier (j) == Parameter.Modifier.PARAMS)
+						if (expanded_form)
+							t = t.GetElementType ();
+
+					x = BetterConversion (ec, a, t, null, loc);
+					
+					if (x <= 0)
+						break;
+				}
+
+				if (x > 0)
+					return 1;
+				else
+					return 0;
+			}
+
+			best_pd = GetParameterData (best);
+
+			int rating1 = 0, rating2 = 0;
+			
+			for (int j = 0; j < argument_count; ++j) {
+				int x, y;
+				
+				Argument a = (Argument) args [j];
+
+				Type ct = candidate_pd.ParameterType (j);
+				Type bt = best_pd.ParameterType (j);
+
+				if (candidate_pd.ParameterModifier (j) == Parameter.Modifier.PARAMS)
+					if (expanded_form)
+						ct = ct.GetElementType ();
+
+				if (best_pd.ParameterModifier (j) == Parameter.Modifier.PARAMS)
+					if (expanded_form)
+						bt = bt.GetElementType ();
+				
+				x = BetterConversion (ec, a, ct, bt, loc);
+				y = BetterConversion (ec, a, bt, ct, loc);
+
+				if (x < y)
+					return 0;
+				
+				rating1 += x;
+				rating2 += y;
+			}
+
+			if (rating1 > rating2)
+				return 1;
+			else
+				return 0;
+		}
+
+		public static string FullMethodDesc (MethodBase mb)
+		{
+			string ret_type = "";
+
+			if (mb is MethodInfo)
+				ret_type = TypeManager.CSharpName (((MethodInfo) mb).ReturnType);
+			
+			StringBuilder sb = new StringBuilder (ret_type + " " + mb.Name);
+			ParameterData pd = GetParameterData (mb);
+
+			int count = pd.Count;
+			sb.Append (" (");
+			
+			for (int i = count; i > 0; ) {
+				i--;
+
+				sb.Append (pd.ParameterDesc (count - i - 1));
+				if (i != 0)
+					sb.Append (", ");
+			}
+			
+			sb.Append (")");
+			return sb.ToString ();
+		}
+
+		public static MethodGroupExpr MakeUnionSet (Expression mg1, Expression mg2, Location loc)
+		{
+			MemberInfo [] miset;
+			MethodGroupExpr union;
+
+			if (mg1 == null){
+				if (mg2 == null)
+					return null;
+				return (MethodGroupExpr) mg2;
+			} else {
+				if (mg2 == null)
+					return (MethodGroupExpr) mg1;
+			}
+			
+			MethodGroupExpr left_set = null, right_set = null;
+			int length1 = 0, length2 = 0;
+			
+			left_set = (MethodGroupExpr) mg1;
+			length1 = left_set.Methods.Length;
+			
+			right_set = (MethodGroupExpr) mg2;
+			length2 = right_set.Methods.Length;
+			
+			ArrayList common = new ArrayList ();
+
+			foreach (MethodBase l in left_set.Methods){
+				foreach (MethodBase r in right_set.Methods){
+					if (l != r)
+						continue;
+					common.Add (r);
+					break;
+				}
+			}
+			
+			miset = new MemberInfo [length1 + length2 - common.Count];
+			left_set.Methods.CopyTo (miset, 0);
+			
+			int k = length1;
+
+			foreach (MemberInfo mi in right_set.Methods){
+				if (!common.Contains (mi))
+					miset [k++] = mi;
+			}
+			
+			union = new MethodGroupExpr (miset, loc);
+			
+			return union;
+		}
+
+		/// <summary>
+		///  Determines is the candidate method, if a params method, is applicable
+		///  in its expanded form to the given set of arguments
+		/// </summary>
+		static bool IsParamsMethodApplicable (EmitContext ec, ArrayList arguments, MethodBase candidate)
+		{
+			int arg_count;
+			
+			if (arguments == null)
+				arg_count = 0;
+			else
+				arg_count = arguments.Count;
+			
+			ParameterData pd = GetParameterData (candidate);
+			
+			int pd_count = pd.Count;
+
+			if (pd_count == 0)
+				return false;
+			
+			if (pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS)
+				return false;
+			
+			if (pd_count - 1 > arg_count)
+				return false;
+			
+			if (pd_count == 1 && arg_count == 0)
+				return true;
+
+			//
+			// If we have come this far, the case which remains is when the number of parameters
+			// is less than or equal to the argument count.
+			//
+			for (int i = 0; i < pd_count - 1; ++i) {
+
+				Argument a = (Argument) arguments [i];
+
+				Parameter.Modifier a_mod = a.GetParameterModifier () &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+				Parameter.Modifier p_mod = pd.ParameterModifier (i) &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+
+				if (a_mod == p_mod) {
+
+					if (a_mod == Parameter.Modifier.NONE)
+						if (!ImplicitConversionExists (ec, a.Expr, pd.ParameterType (i)))
+							return false;
+										
+					if ((a_mod & Parameter.Modifier.ISBYREF) != 0) {
+						Type pt = pd.ParameterType (i);
+
+						if (!pt.IsByRef)
+							pt = TypeManager.LookupType (pt.FullName + "&");
+						
+						if (pt != a.Type)
+							return false;
+					}
+				} else
+					return false;
+				
+			}
+
+			Type element_type = pd.ParameterType (pd_count - 1).GetElementType ();
+
+			for (int i = pd_count - 1; i < arg_count; i++) {
+				Argument a = (Argument) arguments [i];
+				
+				if (!StandardConversionExists (a.Expr, element_type))
+					return false;
+			}
+			
+			return true;
+		}
+
+		/// <summary>
+		///  Determines if the candidate method is applicable (section 14.4.2.1)
+		///  to the given set of arguments
+		/// </summary>
+		static bool IsApplicable (EmitContext ec, ArrayList arguments, MethodBase candidate)
+		{
+			int arg_count;
+
+			if (arguments == null)
+				arg_count = 0;
+			else
+				arg_count = arguments.Count;
+
+			ParameterData pd = GetParameterData (candidate);
+
+			int pd_count = pd.Count;
+
+			if (arg_count != pd.Count)
+				return false;
+			
+			for (int i = arg_count; i > 0; ) {
+				i--;
+
+				Argument a = (Argument) arguments [i];
+
+				Parameter.Modifier a_mod = a.GetParameterModifier () &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+				Parameter.Modifier p_mod = pd.ParameterModifier (i) &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+
+				if (a_mod == p_mod ||
+				    (a_mod == Parameter.Modifier.NONE && p_mod == Parameter.Modifier.PARAMS)) {
+					if (a_mod == Parameter.Modifier.NONE)
+						if (!ImplicitConversionExists (ec, a.Expr, pd.ParameterType (i)))
+							return false;
+					
+					if ((a_mod & Parameter.Modifier.ISBYREF) != 0) {
+						Type pt = pd.ParameterType (i);
+
+						if (!pt.IsByRef)
+							pt = TypeManager.LookupType (pt.FullName + "&");
+
+						if (pt != a.Type)
+							return false;
+					}
+				} else
+					return false;
+			}
+
+			return true;
+		}
+		
+		
+
+		/// <summary>
+		///   Find the Applicable Function Members (7.4.2.1)
+		///
+		///   me: Method Group expression with the members to select.
+		///       it might contain constructors or methods (or anything
+		///       that maps to a method).
+		///
+		///   Arguments: ArrayList containing resolved Argument objects.
+		///
+		///   loc: The location if we want an error to be reported, or a Null
+		///        location for "probing" purposes.
+		///
+		///   Returns: The MethodBase (either a ConstructorInfo or a MethodInfo)
+		///            that is the best match of me on Arguments.
+		///
+		/// </summary>
+		public static MethodBase OverloadResolve (EmitContext ec, MethodGroupExpr me,
+							  ArrayList Arguments, Location loc)
+		{
+			ArrayList afm = new ArrayList ();
+			MethodBase method = null;
+			Type current_type = null;
+			int argument_count;
+			ArrayList candidates = new ArrayList ();
+			
+
+			foreach (MethodBase candidate in me.Methods){
+				int x;
+
+				// If we're going one level higher in the class hierarchy, abort if
+				// we already found an applicable method.
+				if (candidate.DeclaringType != current_type) {
+					current_type = candidate.DeclaringType;
+					if (method != null)
+						break;
+				}
+
+				// Check if candidate is applicable (section 14.4.2.1)
+				if (!IsApplicable (ec, Arguments, candidate))
+					continue;
+
+				candidates.Add (candidate);
+				x = BetterFunction (ec, Arguments, candidate, method, false, loc);
+				
+				if (x == 0)
+					continue;
+
+				method = candidate;
+			}
+
+			if (Arguments == null)
+				argument_count = 0;
+			else
+				argument_count = Arguments.Count;
+			
+			//
+			// Now we see if we can find params functions, applicable in their expanded form
+			// since if they were applicable in their normal form, they would have been selected
+			// above anyways
+			//
+			bool chose_params_expanded = false;
+			
+			if (method == null) {
+				candidates = new ArrayList ();
+				foreach (MethodBase candidate in me.Methods){
+					if (!IsParamsMethodApplicable (ec, Arguments, candidate))
+						continue;
+
+					candidates.Add (candidate);
+
+					int x = BetterFunction (ec, Arguments, candidate, method, true, loc);
+					if (x == 0)
+						continue;
+
+					method = candidate; 
+					chose_params_expanded = true;
+				}
+			}
+
+			if (method == null)
+				return null;
+
+			//
+			// Now check that there are no ambiguities i.e the selected method
+			// should be better than all the others
+			//
+
+			foreach (MethodBase candidate in candidates){
+ 				if (candidate == method)
+ 					continue;
+
+				//
+				// If a normal method is applicable in the sense that it has the same
+				// number of arguments, then the expanded params method is never applicable
+				// so we debar the params method.
+				//
+				if (IsParamsMethodApplicable (ec, Arguments, candidate) &&
+				    IsApplicable (ec, Arguments, method))
+					continue;
+					
+				int x = BetterFunction (ec, Arguments, method, candidate,
+							chose_params_expanded, loc);
+
+				if (x != 1) {
+ 					Report.Error (
+ 						121, loc,
+ 						"Ambiguous call when selecting function due to implicit casts");
+					return null;
+ 				}
+			}
+
+			//
+			// And now check if the arguments are all compatible, perform conversions
+			// if necessary etc. and return if everything is all right
+			//
+
+			if (VerifyArgumentsCompat (ec, Arguments, argument_count, method,
+						   chose_params_expanded, null, loc))
+				return method;
+			else
+				return null;
+		}
+
+		public static bool VerifyArgumentsCompat (EmitContext ec, ArrayList Arguments,
+							  int argument_count,
+							  MethodBase method, 
+							  bool chose_params_expanded,
+							  Type delegate_type,
+							  Location loc)
+		{
+			ParameterData pd = GetParameterData (method);
+			int pd_count = pd.Count;
+			
+			for (int j = 0; j < argument_count; j++) {
+				Argument a = (Argument) Arguments [j];
+				Expression a_expr = a.Expr;
+				Type parameter_type = pd.ParameterType (j);
+
+				if (pd.ParameterModifier (j) == Parameter.Modifier.PARAMS &&
+				    chose_params_expanded)
+					parameter_type = parameter_type.GetElementType ();
+
+				if (a.Type != parameter_type){
+					Expression conv;
+					
+					conv = ConvertImplicit (ec, a_expr, parameter_type, loc);
+
+					if (conv == null) {
+						if (!Location.IsNull (loc)) {
+							if (delegate_type == null) 
+								Report.Error (1502, loc,
+								       "The best overloaded match for method '" +
+								       FullMethodDesc (method) +
+								       "' has some invalid arguments");
+							else
+								Report.Error (1594, loc,
+									      "Delegate '" + delegate_type.ToString () +
+									      "' has some invalid arguments.");
+							Report.Error (1503, loc,
+							 "Argument " + (j+1) +
+							 ": Cannot convert from '" + Argument.FullDesc (a) 
+							 + "' to '" + pd.ParameterDesc (j) + "'");
+						}
+						
+						return false;
+					}
+					
+					//
+					// Update the argument with the implicit conversion
+					//
+					if (a_expr != conv)
+						a.Expr = conv;
+				}
+
+				Parameter.Modifier a_mod = a.GetParameterModifier () &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+				Parameter.Modifier p_mod = pd.ParameterModifier (j) &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+
+				
+				if (a_mod != p_mod &&
+				    pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS) {
+					if (!Location.IsNull (loc)) {
+						Console.WriteLine ("A:P: " + a.GetParameterModifier ());
+						Console.WriteLine ("PP:: " + pd.ParameterModifier (j));
+						Console.WriteLine ("PT:  " + parameter_type.IsByRef);
+						Report.Error (1502, loc,
+						       "The best overloaded match for method '" + FullMethodDesc (method)+
+						       "' has some invalid arguments");
+						Report.Error (1503, loc,
+						       "Argument " + (j+1) +
+						       ": Cannot convert from '" + Argument.FullDesc (a) 
+						       + "' to '" + pd.ParameterDesc (j) + "'");
+					}
+					
+					return false;
+				}
+			}
+
+			return true;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// First, resolve the expression that is used to
+			// trigger the invocation
+			//
+			if (expr is BaseAccess)
+				is_base = true;
+
+			expr = expr.Resolve (ec);
+			if (expr == null)
+				return null;
+
+			if (!(expr is MethodGroupExpr)) {
+				Type expr_type = expr.Type;
+
+				if (expr_type != null){
+					bool IsDelegate = TypeManager.IsDelegateType (expr_type);
+					if (IsDelegate)
+						return (new DelegateInvocation (
+							this.expr, Arguments, loc)).Resolve (ec);
+				}
+			}
+
+			if (!(expr is MethodGroupExpr)){
+				expr.Error118 ("method group");
+				return null;
+			}
+
+			//
+			// Next, evaluate all the expressions in the argument list
+			//
+			if (Arguments != null){
+				foreach (Argument a in Arguments){
+					if (!a.Resolve (ec, loc))
+						return null;
+				}
+			}
+
+			method = OverloadResolve (ec, (MethodGroupExpr) this.expr, Arguments, loc);
+
+			if (method == null){
+				Error (-6,
+				       "Could not find any applicable function for this argument list");
+				return null;
+			}
+
+			if (method is MethodInfo)
+				type = TypeManager.TypeToCoreType (((MethodInfo)method).ReturnType);
+
+			if (type.IsPointer){
+				if (!ec.InUnsafe){
+					UnsafeError (loc);
+					return null;
+				}
+			}
+			
+			eclass = ExprClass.Value;
+			return this;
+		}
+
+		// <summary>
+		//   Emits the list of arguments as an array
+		// </summary>
+		static void EmitParams (EmitContext ec, int idx, ArrayList arguments)
+		{
+			ILGenerator ig = ec.ig;
+			int count = arguments.Count - idx;
+			Argument a = (Argument) arguments [idx];
+			Type t = a.Expr.Type;
+			string array_type = t.FullName + "[]";
+			LocalBuilder array;
+
+			array = ig.DeclareLocal (TypeManager.LookupType (array_type));
+			IntConstant.EmitInt (ig, count);
+			ig.Emit (OpCodes.Newarr, TypeManager.TypeToCoreType (t));
+			ig.Emit (OpCodes.Stloc, array);
+
+			int top = arguments.Count;
+			for (int j = idx; j < top; j++){
+				a = (Argument) arguments [j];
+				
+				ig.Emit (OpCodes.Ldloc, array);
+				IntConstant.EmitInt (ig, j - idx);
+				a.Emit (ec);
+				
+				ArrayAccess.EmitStoreOpcode (ig, t);
+			}
+			ig.Emit (OpCodes.Ldloc, array);
+		}
+		
+		/// <summary>
+		///   Emits a list of resolved Arguments that are in the arguments
+		///   ArrayList.
+		/// 
+		///   The MethodBase argument might be null if the
+		///   emission of the arguments is known not to contain
+		///   a `params' field (for example in constructors or other routines
+		///   that keep their arguments in this structure)
+		/// </summary>
+		public static void EmitArguments (EmitContext ec, MethodBase mb, ArrayList arguments)
+		{
+			ParameterData pd;
+			if (mb != null)
+				pd = GetParameterData (mb);
+			else
+				pd = null;
+
+			//
+			// If we are calling a params method with no arguments, special case it
+			//
+			if (arguments == null){
+				if (pd != null && pd.Count > 0 &&
+				    pd.ParameterModifier (0) == Parameter.Modifier.PARAMS){
+					ILGenerator ig = ec.ig;
+
+					IntConstant.EmitInt (ig, 0);
+					ig.Emit (OpCodes.Newarr, pd.ParameterType (0).GetElementType ());
+				}
+
+				return;
+			}
+
+			int top = arguments.Count;
+
+			for (int i = 0; i < top; i++){
+				Argument a = (Argument) arguments [i];
+
+				if (pd != null){
+					if (pd.ParameterModifier (i) == Parameter.Modifier.PARAMS){
+						//
+						// Special case if we are passing the same data as the
+						// params argument, do not put it in an array.
+						//
+						if (pd.ParameterType (i) == a.Type)
+							a.Emit (ec);
+						else
+							EmitParams (ec, i, arguments);
+						return;
+					}
+				}
+					    
+				a.Emit (ec);
+			}
+
+			if (pd != null && pd.Count > top &&
+			    pd.ParameterModifier (top) == Parameter.Modifier.PARAMS){
+				ILGenerator ig = ec.ig;
+
+				IntConstant.EmitInt (ig, 0);
+				ig.Emit (OpCodes.Newarr, pd.ParameterType (top).GetElementType ());
+			}
+		}
+
+		/// <remarks>
+		///   is_base tells whether we want to force the use of the `call'
+		///   opcode instead of using callvirt.  Call is required to call
+		///   a specific method, while callvirt will always use the most
+		///   recent method in the vtable.
+		///
+		///   is_static tells whether this is an invocation on a static method
+		///
+		///   instance_expr is an expression that represents the instance
+		///   it must be non-null if is_static is false.
+		///
+		///   method is the method to invoke.
+		///
+		///   Arguments is the list of arguments to pass to the method or constructor.
+		/// </remarks>
+		public static void EmitCall (EmitContext ec, bool is_base,
+					     bool is_static, Expression instance_expr,
+					     MethodBase method, ArrayList Arguments, Location loc)
+		{
+			ILGenerator ig = ec.ig;
+			bool struct_call = false;
+
+			Type decl_type = method.DeclaringType;
+
+			if (!RootContext.StdLib) {
+				// Replace any calls to the system's System.Array type with calls to
+				// the newly created one.
+				if (method == TypeManager.system_int_array_get_length)
+					method = TypeManager.int_array_get_length;
+				else if (method == TypeManager.system_int_array_get_rank)
+					method = TypeManager.int_array_get_rank;
+				else if (method == TypeManager.system_object_array_clone)
+					method = TypeManager.object_array_clone;
+				else if (method == TypeManager.system_int_array_get_length_int)
+					method = TypeManager.int_array_get_length_int;
+				else if (method == TypeManager.system_int_array_get_lower_bound_int)
+					method = TypeManager.int_array_get_lower_bound_int;
+				else if (method == TypeManager.system_int_array_get_upper_bound_int)
+					method = TypeManager.int_array_get_upper_bound_int;
+				else if (method == TypeManager.system_void_array_copyto_array_int)
+					method = TypeManager.void_array_copyto_array_int;
+			}
+
+			//
+			// This checks the `ConditionalAttribute' on the method, and the
+			// ObsoleteAttribute
+			//
+			TypeManager.MethodFlags flags = TypeManager.GetMethodFlags (method, loc);
+			if ((flags & TypeManager.MethodFlags.IsObsoleteError) != 0)
+				return;
+			if ((flags & TypeManager.MethodFlags.ShouldIgnore) != 0)
+				return;
+			
+			if (!is_static){
+				if (decl_type.IsValueType)
+					struct_call = true;
+				//
+				// If this is ourselves, push "this"
+				//
+				if (instance_expr == null){
+					ig.Emit (OpCodes.Ldarg_0);
+				} else {
+					//
+					// Push the instance expression
+					//
+					if (instance_expr.Type.IsValueType){
+						//
+						// Special case: calls to a function declared in a 
+						// reference-type with a value-type argument need
+						// to have their value boxed.  
+
+						struct_call = true;
+						if (decl_type.IsValueType){
+							//
+							// If the expression implements IMemoryLocation, then
+							// we can optimize and use AddressOf on the
+							// return.
+							//
+							// If not we have to use some temporary storage for
+							// it.
+							if (instance_expr is IMemoryLocation){
+								((IMemoryLocation)instance_expr).
+									AddressOf (ec, AddressOp.LoadStore);
+							}
+							else {
+								Type t = instance_expr.Type;
+								
+								instance_expr.Emit (ec);
+								LocalBuilder temp = ig.DeclareLocal (t);
+								ig.Emit (OpCodes.Stloc, temp);
+								ig.Emit (OpCodes.Ldloca, temp);
+							}
+						} else {
+							instance_expr.Emit (ec);
+							ig.Emit (OpCodes.Box, instance_expr.Type);
+						} 
+					} else
+						instance_expr.Emit (ec);
+				}
+			}
+
+			EmitArguments (ec, method, Arguments);
+
+			if (is_static || struct_call || is_base){
+				if (method is MethodInfo) {
+					ig.Emit (OpCodes.Call, (MethodInfo) method);
+				} else
+					ig.Emit (OpCodes.Call, (ConstructorInfo) method);
+			} else {
+				if (method is MethodInfo)
+					ig.Emit (OpCodes.Callvirt, (MethodInfo) method);
+				else
+					ig.Emit (OpCodes.Callvirt, (ConstructorInfo) method);
+			}
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			MethodGroupExpr mg = (MethodGroupExpr) this.expr;
+
+			EmitCall (
+				ec, is_base, method.IsStatic, mg.InstanceExpression, method, Arguments, loc);
+		}
+		
+		public override void EmitStatement (EmitContext ec)
+		{
+			Emit (ec);
+
+			// 
+			// Pop the return value if there is one
+			//
+			if (method is MethodInfo){
+				Type ret = ((MethodInfo)method).ReturnType;
+				if (TypeManager.TypeToCoreType (ret) != TypeManager.void_type)
+					ec.ig.Emit (OpCodes.Pop);
+			}
+		}
+	}
+
+	//
+	// This class is used to "disable" the code generation for the
+	// temporary variable when initializing value types.
+	//
+	class EmptyAddressOf : EmptyExpression, IMemoryLocation {
+		public void AddressOf (EmitContext ec, AddressOp Mode)
+		{
+			// nothing
+		}
+	}
+	
+	/// <summary>
+	///    Implements the new expression 
+	/// </summary>
+	public class New : ExpressionStatement {
+		public readonly ArrayList Arguments;
+		public readonly Expression RequestedType;
+
+		MethodBase method = null;
+
+		//
+		// If set, the new expression is for a value_target, and
+		// we will not leave anything on the stack.
+		//
+		Expression value_target;
+		bool value_target_set = false;
+		
+		public New (Expression requested_type, ArrayList arguments, Location l)
+		{
+			RequestedType = requested_type;
+			Arguments = arguments;
+			loc = l;
+		}
+
+		public Expression ValueTypeVariable {
+			get {
+				return value_target;
+			}
+
+			set {
+				value_target = value;
+				value_target_set = true;
+			}
+		}
+
+		//
+		// This function is used to disable the following code sequence for
+		// value type initialization:
+		//
+		// AddressOf (temporary)
+		// Construct/Init
+		// LoadTemporary
+		//
+		// Instead the provide will have provided us with the address on the
+		// stack to store the results.
+		//
+		static Expression MyEmptyExpression;
+		
+		public void DisableTemporaryValueType ()
+		{
+			if (MyEmptyExpression == null)
+				MyEmptyExpression = new EmptyAddressOf ();
+
+			//
+			// To enable this, look into:
+			// test-34 and test-89 and self bootstrapping.
+			//
+			// For instance, we can avoid a copy by using `newobj'
+			// instead of Call + Push-temp on value types.
+//			value_target = MyEmptyExpression;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = ec.DeclSpace.ResolveType (RequestedType, false, loc);
+			
+			if (type == null)
+				return null;
+			
+			bool IsDelegate = TypeManager.IsDelegateType (type);
+			
+			if (IsDelegate)
+				return (new NewDelegate (type, Arguments, loc)).Resolve (ec);
+
+			if (type.IsInterface || type.IsAbstract){
+				Error (
+					144, "It is not possible to create instances of interfaces " +
+					"or abstract classes");
+				return null;
+			}
+			
+			bool is_struct = false;
+			is_struct = type.IsValueType;
+			eclass = ExprClass.Value;
+
+			//
+			// SRE returns a match for .ctor () on structs (the object constructor), 
+			// so we have to manually ignore it.
+			//
+			if (is_struct && Arguments == null)
+				return this;
+			
+			Expression ml;
+			ml = MemberLookupFinal (ec, type, ".ctor",
+						MemberTypes.Constructor,
+						AllBindingFlags | BindingFlags.DeclaredOnly, loc);
+
+			if (ml == null)
+				return null;
+			
+			if (! (ml is MethodGroupExpr)){
+				if (!is_struct){
+					ml.Error118 ("method group");
+					return null;
+				}
+			}
+
+			if (ml != null) {
+				if (Arguments != null){
+					foreach (Argument a in Arguments){
+						if (!a.Resolve (ec, loc))
+							return null;
+					}
+				}
+
+				method = Invocation.OverloadResolve (ec, (MethodGroupExpr) ml,
+								     Arguments, loc);
+				
+			}
+
+			if (method == null) { 
+                                if (!is_struct || Arguments.Count > 0) {
+        				Error (1501,
+	        			       "New invocation: Can not find a constructor for " +
+		        		       "this argument list");
+			        	return null;
+                                }
+			}
+			return this;
+		}
+
+		//
+		// This DoEmit can be invoked in two contexts:
+		//    * As a mechanism that will leave a value on the stack (new object)
+		//    * As one that wont (init struct)
+		//
+		// You can control whether a value is required on the stack by passing
+		// need_value_on_stack.  The code *might* leave a value on the stack
+		// so it must be popped manually
+		//
+		// If we are dealing with a ValueType, we have a few
+		// situations to deal with:
+		//
+		//    * The target is a ValueType, and we have been provided
+		//      the instance (this is easy, we are being assigned).
+		//
+		//    * The target of New is being passed as an argument,
+		//      to a boxing operation or a function that takes a
+		//      ValueType.
+		//
+		//      In this case, we need to create a temporary variable
+		//      that is the argument of New.
+		//
+		// Returns whether a value is left on the stack
+		//
+		bool DoEmit (EmitContext ec, bool need_value_on_stack)
+		{
+			bool is_value_type = type.IsValueType;
+			ILGenerator ig = ec.ig;
+
+			if (is_value_type){
+				IMemoryLocation ml;
+
+				// Allow DoEmit() to be called multiple times.
+				// We need to create a new LocalTemporary each time since
+				// you can't share LocalBuilders among ILGeneators.
+				if (!value_target_set)
+					value_target = new LocalTemporary (ec, type);
+					
+				ml = (IMemoryLocation) value_target;
+				ml.AddressOf (ec, AddressOp.Store);
+			}
+
+			if (method != null)
+				Invocation.EmitArguments (ec, method, Arguments);
+
+			if (is_value_type){
+				if (method == null)
+					ig.Emit (OpCodes.Initobj, type);
+				else 
+					ig.Emit (OpCodes.Call, (ConstructorInfo) method);
+                                if (need_value_on_stack){
+                                        value_target.Emit (ec);
+                                        return true;
+                                }
+                                return false;
+			} else {
+				ig.Emit (OpCodes.Newobj, (ConstructorInfo) method);
+				return true;
+			}
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			DoEmit (ec, true);
+		}
+		
+		public override void EmitStatement (EmitContext ec)
+		{
+			if (DoEmit (ec, false))
+				ec.ig.Emit (OpCodes.Pop);
+		}
+	}
+
+	/// <summary>
+	///   14.5.10.2: Represents an array creation expression.
+	/// </summary>
+	///
+	/// <remarks>
+	///   There are two possible scenarios here: one is an array creation
+	///   expression that specifies the dimensions and optionally the
+	///   initialization data and the other which does not need dimensions
+	///   specified but where initialization data is mandatory.
+	/// </remarks>
+	public class ArrayCreation : ExpressionStatement {
+		Expression requested_base_type;
+		ArrayList initializers;
+
+		//
+		// The list of Argument types.
+		// This is used to construct the `newarray' or constructor signature
+		//
+		ArrayList arguments;
+
+		//
+		// Method used to create the array object.
+		//
+		MethodBase new_method = null;
+		
+		Type array_element_type;
+		Type underlying_type;
+		bool is_one_dimensional = false;
+		bool is_builtin_type = false;
+		bool expect_initializers = false;
+		int num_arguments = 0;
+		int dimensions = 0;
+		string rank;
+
+		ArrayList array_data;
+
+		Hashtable bounds;
+
+		//
+		// The number of array initializers that we can handle
+		// via the InitializeArray method - through EmitStaticInitializers
+		//
+		int num_automatic_initializers;
+		
+		public ArrayCreation (Expression requested_base_type, ArrayList exprs, string rank, ArrayList initializers, Location l)
+		{
+			this.requested_base_type = requested_base_type;
+			this.initializers = initializers;
+			this.rank = rank;
+			loc = l;
+
+			arguments = new ArrayList ();
+
+			foreach (Expression e in exprs) {
+				arguments.Add (new Argument (e, Argument.AType.Expression));
+				num_arguments++;
+			}
+		}
+
+		public ArrayCreation (Expression requested_base_type, string rank, ArrayList initializers, Location l)
+		{
+			this.requested_base_type = requested_base_type;
+			this.initializers = initializers;
+			this.rank = rank;
+			loc = l;
+
+			//this.rank = rank.Substring (0, rank.LastIndexOf ("["));
+			//
+			//string tmp = rank.Substring (rank.LastIndexOf ("["));
+			//
+			//dimensions = tmp.Length - 1;
+			expect_initializers = true;
+		}
+
+		public Expression FormArrayType (Expression base_type, int idx_count, string rank)
+		{
+			StringBuilder sb = new StringBuilder (rank);
+			
+			sb.Append ("[");
+			for (int i = 1; i < idx_count; i++)
+				sb.Append (",");
+			
+			sb.Append ("]");
+
+			return new ComposedCast (base_type, sb.ToString (), loc);
+		}
+
+		void error178 ()
+		{
+			Error (178, "Incorrectly structured array initializer");
+		}
+		
+		public bool CheckIndices (EmitContext ec, ArrayList probe, int idx, bool specified_dims)
+		{
+			if (specified_dims) { 
+				Argument a = (Argument) arguments [idx];
+				
+				if (!a.Resolve (ec, loc))
+					return false;
+				
+				if (!(a.Expr is Constant)) {
+					Error (150, "A constant value is expected");
+					return false;
+				}
+				
+				int value = (int) ((Constant) a.Expr).GetValue ();
+				
+				if (value != probe.Count) {
+					error178 ();
+					return false;
+				}
+				
+				bounds [idx] = value;
+			}
+			
+			foreach (object o in probe) {
+				if (o is ArrayList) {
+					bool ret = CheckIndices (ec, (ArrayList) o, idx + 1, specified_dims);
+					if (!ret)
+						return false;
+				} else {
+					Expression tmp = (Expression) o;
+					tmp = tmp.Resolve (ec);
+					if (tmp == null)
+						continue;
+
+					// Console.WriteLine ("I got: " + tmp);
+					// Handle initialization from vars, fields etc.
+
+					Expression conv = ConvertImplicitRequired (
+						ec, tmp, underlying_type, loc);
+					
+					if (conv == null) 
+						return false;
+
+					if (conv is StringConstant)
+						array_data.Add (conv);
+					else if (conv is Constant) {
+						array_data.Add (conv);
+						num_automatic_initializers++;
+					} else
+						array_data.Add (conv);
+				}
+			}
+
+			return true;
+		}
+		
+		public void UpdateIndices (EmitContext ec)
+		{
+			int i = 0;
+			for (ArrayList probe = initializers; probe != null;) {
+				if (probe.Count > 0 && probe [0] is ArrayList) {
+					Expression e = new IntConstant (probe.Count);
+					arguments.Add (new Argument (e, Argument.AType.Expression));
+
+					bounds [i++] =  probe.Count;
+					
+					probe = (ArrayList) probe [0];
+					
+				} else {
+					Expression e = new IntConstant (probe.Count);
+					arguments.Add (new Argument (e, Argument.AType.Expression));
+
+					bounds [i++] = probe.Count;
+					probe = null;
+				}
+			}
+
+		}
+		
+		public bool ValidateInitializers (EmitContext ec, Type array_type)
+		{
+			if (initializers == null) {
+				if (expect_initializers)
+					return false;
+				else
+					return true;
+			}
+			
+			if (underlying_type == null)
+				return false;
+			
+			//
+			// We use this to store all the date values in the order in which we
+			// will need to store them in the byte blob later
+			//
+			array_data = new ArrayList ();
+			bounds = new Hashtable ();
+			
+			bool ret;
+
+			if (arguments != null) {
+				ret = CheckIndices (ec, initializers, 0, true);
+				return ret;
+			} else {
+				arguments = new ArrayList ();
+
+				ret = CheckIndices (ec, initializers, 0, false);
+				
+				if (!ret)
+					return false;
+				
+				UpdateIndices (ec);
+				
+				if (arguments.Count != dimensions) {
+					error178 ();
+					return false;
+				}
+
+				return ret;
+			}
+		}
+
+		void Error_NegativeArrayIndex ()
+		{
+			Error (284, "Can not create array with a negative size");
+		}
+		
+		//
+		// Converts `source' to an int, uint, long or ulong.
+		//
+		Expression ExpressionToArrayArgument (EmitContext ec, Expression source)
+		{
+			Expression target;
+			
+			bool old_checked = ec.CheckState;
+			ec.CheckState = true;
+			
+			target = ConvertImplicit (ec, source, TypeManager.int32_type, loc);
+			if (target == null){
+				target = ConvertImplicit (ec, source, TypeManager.uint32_type, loc);
+				if (target == null){
+					target = ConvertImplicit (ec, source, TypeManager.int64_type, loc);
+					if (target == null){
+						target = ConvertImplicit (ec, source, TypeManager.uint64_type, loc);
+						if (target == null)
+							Expression.Error_CannotConvertImplicit (loc, source.Type, TypeManager.int32_type);
+					}
+				}
+			} 
+			ec.CheckState = old_checked;
+
+			//
+			// Only positive constants are allowed at compile time
+			//
+			if (target is Constant){
+				if (target is IntConstant){
+					if (((IntConstant) target).Value < 0){
+						Error_NegativeArrayIndex ();
+						return null;
+					}
+				}
+
+				if (target is LongConstant){
+					if (((LongConstant) target).Value < 0){
+						Error_NegativeArrayIndex ();
+						return null;
+					}
+				}
+				
+			}
+
+			return target;
+		}
+
+		//
+		// Creates the type of the array
+		//
+		bool LookupType (EmitContext ec)
+		{
+			StringBuilder array_qualifier = new StringBuilder (rank);
+
+			//
+			// `In the first form allocates an array instace of the type that results
+			// from deleting each of the individual expression from the expression list'
+			//
+			if (num_arguments > 0) {
+				array_qualifier.Append ("[");
+				for (int i = num_arguments-1; i > 0; i--)
+					array_qualifier.Append (",");
+				array_qualifier.Append ("]");				
+			}
+
+			//
+			// Lookup the type
+			//
+			Expression array_type_expr;
+			array_type_expr = new ComposedCast (requested_base_type, array_qualifier.ToString (), loc);
+			type = ec.DeclSpace.ResolveType (array_type_expr, false, loc);
+
+			if (type == null)
+				return false;
+
+			underlying_type = type;
+			if (underlying_type.IsArray)
+				underlying_type = TypeManager.TypeToCoreType (underlying_type.GetElementType ());
+			dimensions = type.GetArrayRank ();
+
+			return true;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			int arg_count;
+
+			if (!LookupType (ec))
+				return null;
+			
+			//
+			// First step is to validate the initializers and fill
+			// in any missing bits
+			//
+			if (!ValidateInitializers (ec, type))
+				return null;
+
+			if (arguments == null)
+				arg_count = 0;
+			else {
+				arg_count = arguments.Count;
+				foreach (Argument a in arguments){
+					if (!a.Resolve (ec, loc))
+						return null;
+
+					Expression real_arg = ExpressionToArrayArgument (ec, a.Expr, loc);
+					if (real_arg == null)
+						return null;
+
+					a.Expr = real_arg;
+				}
+			}
+			
+			array_element_type = TypeManager.TypeToCoreType (type.GetElementType ());
+
+			if (arg_count == 1) {
+				is_one_dimensional = true;
+				eclass = ExprClass.Value;
+				return this;
+			}
+
+			is_builtin_type = TypeManager.IsBuiltinType (type);
+
+			if (is_builtin_type) {
+				Expression ml;
+				
+				ml = MemberLookup (ec, type, ".ctor", MemberTypes.Constructor,
+						   AllBindingFlags, loc);
+				
+				if (!(ml is MethodGroupExpr)) {
+					ml.Error118 ("method group");
+					return null;
+				}
+				
+				if (ml == null) {
+					Error (-6, "New invocation: Can not find a constructor for " +
+						      "this argument list");
+					return null;
+				}
+				
+				new_method = Invocation.OverloadResolve (ec, (MethodGroupExpr) ml, arguments, loc);
+
+				if (new_method == null) {
+					Error (-6, "New invocation: Can not find a constructor for " +
+						      "this argument list");
+					return null;
+				}
+				
+				eclass = ExprClass.Value;
+				return this;
+			} else {
+				ModuleBuilder mb = CodeGen.ModuleBuilder;
+				ArrayList args = new ArrayList ();
+				
+				if (arguments != null) {
+					for (int i = 0; i < arg_count; i++)
+						args.Add (TypeManager.int32_type);
+				}
+				
+				Type [] arg_types = null;
+
+				if (args.Count > 0)
+					arg_types = new Type [args.Count];
+				
+				args.CopyTo (arg_types, 0);
+				
+				new_method = mb.GetArrayMethod (type, ".ctor", CallingConventions.HasThis, null,
+							    arg_types);
+
+				if (new_method == null) {
+					Error (-6, "New invocation: Can not find a constructor for " +
+						      "this argument list");
+					return null;
+				}
+				
+				eclass = ExprClass.Value;
+				return this;
+			}
+		}
+
+		public static byte [] MakeByteBlob (ArrayList array_data, Type underlying_type, Location loc)
+		{
+			int factor;
+			byte [] data;
+			byte [] element;
+			int count = array_data.Count;
+
+			factor = GetTypeSize (underlying_type);
+			if (factor == 0)
+				return null;
+
+			data = new byte [(count * factor + 4) & ~3];
+			int idx = 0;
+			
+			for (int i = 0; i < count; ++i) {
+				object v = array_data [i];
+
+				if (v is EnumConstant)
+					v = ((EnumConstant) v).Child;
+				
+				if (v is Constant && !(v is StringConstant))
+					v = ((Constant) v).GetValue ();
+				else {
+					idx += factor;
+					continue;
+				}
+				
+				if (underlying_type == TypeManager.int64_type){
+					if (!(v is Expression)){
+						long val = (long) v;
+						
+						for (int j = 0; j < factor; ++j) {
+							data [idx + j] = (byte) (val & 0xFF);
+							val = (val >> 8);
+						}
+					}
+				} else if (underlying_type == TypeManager.uint64_type){
+					if (!(v is Expression)){
+						ulong val = (ulong) v;
+
+						for (int j = 0; j < factor; ++j) {
+							data [idx + j] = (byte) (val & 0xFF);
+							val = (val >> 8);
+						}
+					}
+				} else if (underlying_type == TypeManager.float_type) {
+					if (!(v is Expression)){
+						element = BitConverter.GetBytes ((float) v);
+							
+						for (int j = 0; j < factor; ++j)
+							data [idx + j] = element [j];
+					}
+				} else if (underlying_type == TypeManager.double_type) {
+					if (!(v is Expression)){
+						element = BitConverter.GetBytes ((double) v);
+
+						for (int j = 0; j < factor; ++j)
+							data [idx + j] = element [j];
+					}
+				} else if (underlying_type == TypeManager.char_type){
+					if (!(v is Expression)){
+						int val = (int) ((char) v);
+						
+						data [idx] = (byte) (val & 0xff);
+						data [idx+1] = (byte) (val >> 8);
+					}
+				} else if (underlying_type == TypeManager.short_type){
+					if (!(v is Expression)){
+						int val = (int) ((short) v);
+					
+						data [idx] = (byte) (val & 0xff);
+						data [idx+1] = (byte) (val >> 8);
+					}
+				} else if (underlying_type == TypeManager.ushort_type){
+					if (!(v is Expression)){
+						int val = (int) ((ushort) v);
+					
+						data [idx] = (byte) (val & 0xff);
+						data [idx+1] = (byte) (val >> 8);
+					}
+				} else if (underlying_type == TypeManager.int32_type) {
+					if (!(v is Expression)){
+						int val = (int) v;
+					
+						data [idx]   = (byte) (val & 0xff);
+						data [idx+1] = (byte) ((val >> 8) & 0xff);
+						data [idx+2] = (byte) ((val >> 16) & 0xff);
+						data [idx+3] = (byte) (val >> 24);
+					}
+				} else if (underlying_type == TypeManager.uint32_type) {
+					if (!(v is Expression)){
+						uint val = (uint) v;
+					
+						data [idx]   = (byte) (val & 0xff);
+						data [idx+1] = (byte) ((val >> 8) & 0xff);
+						data [idx+2] = (byte) ((val >> 16) & 0xff);
+						data [idx+3] = (byte) (val >> 24);
+					}
+				} else if (underlying_type == TypeManager.sbyte_type) {
+					if (!(v is Expression)){
+						sbyte val = (sbyte) v;
+						data [idx] = (byte) val;
+					}
+				} else if (underlying_type == TypeManager.byte_type) {
+					if (!(v is Expression)){
+						byte val = (byte) v;
+						data [idx] = (byte) val;
+					}
+				} else if (underlying_type == TypeManager.bool_type) {
+					if (!(v is Expression)){
+						bool val = (bool) v;
+						data [idx] = (byte) (val ? 1 : 0);
+					}
+				} else
+					throw new Exception ("Unrecognized type in MakeByteBlob");
+
+                                idx += factor;
+			}
+
+			return data;
+		}
+
+		//
+		// Emits the initializers for the array
+		//
+		void EmitStaticInitializers (EmitContext ec, bool is_expression)
+		{
+			//
+			// First, the static data
+			//
+			FieldBuilder fb;
+			ILGenerator ig = ec.ig;
+			
+			byte [] data = MakeByteBlob (array_data, underlying_type, loc);
+			
+			if (data != null) {
+				fb = RootContext.MakeStaticData (data);
+
+				if (is_expression)
+					ig.Emit (OpCodes.Dup);
+				ig.Emit (OpCodes.Ldtoken, fb);
+				ig.Emit (OpCodes.Call,
+					 TypeManager.void_initializearray_array_fieldhandle);
+			}
+		}
+		
+		//
+		// Emits pieces of the array that can not be computed at compile
+		// time (variables and string locations).
+		//
+		// This always expect the top value on the stack to be the array
+		//
+		void EmitDynamicInitializers (EmitContext ec, bool is_expression)
+		{
+			ILGenerator ig = ec.ig;
+			int dims = bounds.Count;
+			int [] current_pos = new int [dims];
+			int top = array_data.Count;
+			LocalBuilder temp = ig.DeclareLocal (type);
+
+			ig.Emit (OpCodes.Stloc, temp);
+
+			MethodInfo set = null;
+
+			if (dims != 1){
+				Type [] args;
+				ModuleBuilder mb = null;
+				mb = CodeGen.ModuleBuilder;
+				args = new Type [dims + 1];
+
+				int j;
+				for (j = 0; j < dims; j++)
+					args [j] = TypeManager.int32_type;
+
+				args [j] = array_element_type;
+				
+				set = mb.GetArrayMethod (
+					type, "Set",
+					CallingConventions.HasThis | CallingConventions.Standard,
+					TypeManager.void_type, args);
+			}
+			
+			for (int i = 0; i < top; i++){
+
+				Expression e = null;
+
+				if (array_data [i] is Expression)
+					e = (Expression) array_data [i];
+
+				if (e != null) {
+					//
+					// Basically we do this for string literals and
+					// other non-literal expressions
+					//
+					if (e is StringConstant || !(e is Constant) ||
+					    num_automatic_initializers <= 2) {
+						Type etype = e.Type;
+						
+						ig.Emit (OpCodes.Ldloc, temp);
+
+						for (int idx = dims; idx > 0; ) {
+							idx--;
+							IntConstant.EmitInt (ig, current_pos [idx]);
+						}
+
+						//
+						// If we are dealing with a struct, get the
+						// address of it, so we can store it.
+						//
+						if ((dims == 1) &&
+						    etype.IsSubclassOf (TypeManager.value_type) &&
+						    (!TypeManager.IsBuiltinType (etype) ||
+						     etype == TypeManager.decimal_type)) {
+							if (e is New){
+								New n = (New) e;
+
+								//
+								// Let new know that we are providing
+								// the address where to store the results
+								//
+								n.DisableTemporaryValueType ();
+							}
+									     
+							ig.Emit (OpCodes.Ldelema, etype);
+						}
+
+						e.Emit (ec);
+						
+						if (dims == 1)
+							ArrayAccess.EmitStoreOpcode (ig, array_element_type);
+						else 
+							ig.Emit (OpCodes.Call, set);
+					}
+				}
+				
+				//
+				// Advance counter
+				//
+				for (int j = 0; j < dims; j++){
+					current_pos [j]++;
+					if (current_pos [j] < (int) bounds [j])
+						break;
+					current_pos [j] = 0;
+				}
+			}
+
+			if (is_expression)
+				ig.Emit (OpCodes.Ldloc, temp);
+		}
+
+		void EmitArrayArguments (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			foreach (Argument a in arguments) {
+				Type atype = a.Type;
+				a.Emit (ec);
+
+				if (atype == TypeManager.uint64_type)
+					ig.Emit (OpCodes.Conv_Ovf_U4);
+				else if (atype == TypeManager.int64_type)
+					ig.Emit (OpCodes.Conv_Ovf_I4);
+			}
+		}
+		
+		void DoEmit (EmitContext ec, bool is_statement)
+		{
+			ILGenerator ig = ec.ig;
+			
+			EmitArrayArguments (ec);
+			if (is_one_dimensional)
+				ig.Emit (OpCodes.Newarr, array_element_type);
+			else {
+				if (is_builtin_type) 
+					ig.Emit (OpCodes.Newobj, (ConstructorInfo) new_method);
+				else 
+					ig.Emit (OpCodes.Newobj, (MethodInfo) new_method);
+			}
+			
+			if (initializers != null){
+				//
+				// FIXME: Set this variable correctly.
+				// 
+				bool dynamic_initializers = true;
+
+				if (underlying_type != TypeManager.string_type &&
+				    underlying_type != TypeManager.object_type) {
+					if (num_automatic_initializers > 2)
+						EmitStaticInitializers (ec, dynamic_initializers || !is_statement);
+				}
+				
+				if (dynamic_initializers)
+					EmitDynamicInitializers (ec, !is_statement);
+			}
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			DoEmit (ec, false);
+		}
+
+		public override void EmitStatement (EmitContext ec)
+		{
+			DoEmit (ec, true);
+		}
+		
+	}
+	
+	/// <summary>
+	///   Represents the `this' construct
+	/// </summary>
+	public class This : Expression, IAssignMethod, IMemoryLocation {
+		
+		public This (Location loc)
+		{
+			this.loc = loc;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			eclass = ExprClass.Variable;
+			type = ec.ContainerType;
+
+			if (ec.IsStatic){
+				Error (26,
+					      "Keyword this not valid in static code");
+				return null;
+			}
+			
+			return this;
+		}
+
+		override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			DoResolve (ec);
+			
+			if (ec.TypeContainer is Class){
+				Error (1604, "Cannot assign to `this'");
+				return null;
+			}
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			ig.Emit (OpCodes.Ldarg_0);
+			if (ec.TypeContainer is Struct)
+				ig.Emit (OpCodes.Ldobj, type);
+		}
+
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			ILGenerator ig = ec.ig;
+			
+			if (ec.TypeContainer is Struct){
+				ig.Emit (OpCodes.Ldarg_0);
+				source.Emit (ec);
+				ig.Emit (OpCodes.Stobj, type);
+			} else {
+				source.Emit (ec);
+				ig.Emit (OpCodes.Starg, 0);
+			}
+		}
+
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			ec.ig.Emit (OpCodes.Ldarg_0);
+
+			// FIMXE
+			// FIGURE OUT WHY LDARG_S does not work
+			//
+			// consider: struct X { int val; int P { set { val = value; }}}
+			//
+			// Yes, this looks very bad. Look at `NOTAS' for
+			// an explanation.
+			// ec.ig.Emit (OpCodes.Ldarga_S, (byte) 0);
+		}
+	}
+
+	/// <summary>
+	///   Implements the typeof operator
+	/// </summary>
+	public class TypeOf : Expression {
+		public readonly Expression QueriedType;
+		Type typearg;
+		
+		public TypeOf (Expression queried_type, Location l)
+		{
+			QueriedType = queried_type;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			typearg = ec.DeclSpace.ResolveType (QueriedType, false, loc);
+
+			if (typearg == null)
+				return null;
+
+			type = TypeManager.type_type;
+			eclass = ExprClass.Type;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldtoken, typearg);
+			ec.ig.Emit (OpCodes.Call, TypeManager.system_type_get_type_from_handle);
+		}
+
+		public Type TypeArg { 
+			get { return typearg; }
+		}
+	}
+
+	/// <summary>
+	///   Implements the sizeof expression
+	/// </summary>
+	public class SizeOf : Expression {
+		public readonly Expression QueriedType;
+		Type type_queried;
+		
+		public SizeOf (Expression queried_type, Location l)
+		{
+			this.QueriedType = queried_type;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type_queried = ec.DeclSpace.ResolveType (QueriedType, false, loc);
+			if (type_queried == null)
+				return null;
+
+			type = TypeManager.int32_type;
+			eclass = ExprClass.Value;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			int size = GetTypeSize (type_queried);
+
+			if (size == 0)
+				ec.ig.Emit (OpCodes.Sizeof, type_queried);
+			else
+				IntConstant.EmitInt (ec.ig, size);
+		}
+	}
+
+	/// <summary>
+	///   Implements the member access expression
+	/// </summary>
+	public class MemberAccess : Expression {
+		public readonly string Identifier;
+		Expression expr;
+		Expression member_lookup;
+		
+		public MemberAccess (Expression expr, string id, Location l)
+		{
+			this.expr = expr;
+			Identifier = id;
+			loc = l;
+		}
+
+		public Expression Expr {
+			get {
+				return expr;
+			}
+		}
+
+		static void error176 (Location loc, string name)
+		{
+			Report.Error (176, loc, "Static member `" +
+				      name + "' cannot be accessed " +
+				      "with an instance reference, qualify with a " +
+				      "type name instead");
+		}
+
+		static bool IdenticalNameAndTypeName (EmitContext ec, Expression left_original, Location loc)
+		{
+			if (left_original == null)
+				return false;
+
+			if (!(left_original is SimpleName))
+				return false;
+
+			SimpleName sn = (SimpleName) left_original;
+
+			Type t = RootContext.LookupType (ec.DeclSpace, sn.Name, true, loc);
+			if (t != null)
+				return true;
+
+			return false;
+		}
+		
+		public static Expression ResolveMemberAccess (EmitContext ec, Expression member_lookup,
+							      Expression left, Location loc,
+							      Expression left_original)
+		{
+			//
+			// Method Groups
+			//
+			if (member_lookup is MethodGroupExpr){
+				MethodGroupExpr mg = (MethodGroupExpr) member_lookup;
+
+				//
+				// Type.MethodGroup
+				//
+				if (left is TypeExpr){
+					if (!mg.RemoveInstanceMethods ()){
+						SimpleName.Error_ObjectRefRequired (loc, mg.Methods [0].Name); 
+						return null;
+					}
+
+					return member_lookup;
+				}
+
+				//
+				// Instance.MethodGroup
+				//
+				if (IdenticalNameAndTypeName (ec, left_original, loc)){
+					if (mg.RemoveInstanceMethods ())
+						return member_lookup;
+				}
+				
+				if (!mg.RemoveStaticMethods ()){
+					error176 (loc, mg.Methods [0].Name);
+					return null;
+				} 
+				
+				mg.InstanceExpression = left;
+				return member_lookup;
+#if ORIGINAL
+				if (!mg.RemoveStaticMethods ()){
+					if (IdenticalNameAndTypeName (ec, left_original, loc)){
+						if (!mg.RemoveInstanceMethods ()){
+							SimpleName.Error_ObjectRefRequired (loc, mg.Methods [0].Name);
+							return null;
+						}
+						return member_lookup;
+					}
+					
+					error176 (loc, mg.Methods [0].Name);
+					return null;
+				}
+				
+				mg.InstanceExpression = left;
+					
+				return member_lookup;
+#endif
+			}
+
+			if (member_lookup is FieldExpr){
+				FieldExpr fe = (FieldExpr) member_lookup;
+				FieldInfo fi = fe.FieldInfo;
+				Type decl_type = fi.DeclaringType;
+				
+				if (fi is FieldBuilder) {
+					Const c = TypeManager.LookupConstant ((FieldBuilder) fi);
+					
+					if (c != null) {
+						object o = c.LookupConstantValue (ec);
+						object real_value = ((Constant) c.Expr).GetValue ();
+
+						return Constantify (real_value, fi.FieldType);
+					}
+				}
+
+				if (fi.IsLiteral) {
+					Type t = fi.FieldType;
+					
+					object o;
+
+					if (fi is FieldBuilder)
+						o = TypeManager.GetValue ((FieldBuilder) fi);
+					else
+						o = fi.GetValue (fi);
+					
+					if (decl_type.IsSubclassOf (TypeManager.enum_type)) {
+						Expression enum_member = MemberLookup (
+							ec, decl_type, "value__", MemberTypes.Field,
+							AllBindingFlags, loc); 
+
+						Enum en = TypeManager.LookupEnum (decl_type);
+
+						Constant c;
+						if (en != null)
+							c = Constantify (o, en.UnderlyingType);
+						else 
+							c = Constantify (o, enum_member.Type);
+						
+						return new EnumConstant (c, decl_type);
+					}
+					
+					Expression exp = Constantify (o, t);
+
+					if (!(left is TypeExpr)) {
+						error176 (loc, fe.FieldInfo.Name);
+						return null;
+					}
+					
+					return exp;
+				}
+
+				if (fi.FieldType.IsPointer && !ec.InUnsafe){
+					UnsafeError (loc);
+					return null;
+				}
+				
+				if (left is TypeExpr){
+					// and refers to a type name or an 
+					if (!fe.FieldInfo.IsStatic){
+						error176 (loc, fe.FieldInfo.Name);
+						return null;
+					}
+					return member_lookup;
+				} else {
+					if (fe.FieldInfo.IsStatic){
+						if (IdenticalNameAndTypeName (ec, left_original, loc))
+							return member_lookup;
+
+						error176 (loc, fe.FieldInfo.Name);
+						return null;
+					}
+
+					//
+					// Since we can not check for instance objects in SimpleName,
+					// becaue of the rule that allows types and variables to share
+					// the name (as long as they can be de-ambiguated later, see 
+					// IdenticalNameAndTypeName), we have to check whether left 
+					// is an instance variable in a static context
+					//
+
+					if (ec.IsStatic && left is FieldExpr){
+						FieldExpr fexp = (FieldExpr) left;
+
+						if (!fexp.FieldInfo.IsStatic){
+							SimpleName.Error_ObjectRefRequired (loc, fexp.FieldInfo.Name);
+							return null;
+						}
+					}
+					fe.InstanceExpression = left;
+
+					return fe;
+				}
+			}
+
+			if (member_lookup is PropertyExpr){
+				PropertyExpr pe = (PropertyExpr) member_lookup;
+
+				if (left is TypeExpr){
+					if (!pe.IsStatic){
+						SimpleName.Error_ObjectRefRequired (loc, pe.PropertyInfo.Name);
+						return null;
+					}
+					return pe;
+				} else {
+					if (pe.IsStatic){
+						if (IdenticalNameAndTypeName (ec, left_original, loc))
+							return member_lookup;
+						error176 (loc, pe.PropertyInfo.Name);
+						return null;
+					}
+					pe.InstanceExpression = left;
+					
+					return pe;
+				}
+			}
+
+			if (member_lookup is EventExpr) {
+
+				EventExpr ee = (EventExpr) member_lookup;
+				
+				//
+				// If the event is local to this class, we transform ourselves into
+				// a FieldExpr
+				//
+
+				Expression ml = MemberLookup (
+					ec, ec.ContainerType, ee.EventInfo.Name, MemberTypes.Event,
+					AllBindingFlags | BindingFlags.DeclaredOnly, loc);
+
+				if (ml != null) {
+					MemberInfo mi = GetFieldFromEvent ((EventExpr) ml);
+
+					if (mi == null) {
+						//
+						// If this happens, then we have an event with its own
+						// accessors and private field etc so there's no need
+						// to transform ourselves : we should instead flag an error
+						//
+						Assign.error70 (ee.EventInfo, loc);
+						return null;
+					}
+
+					ml = ExprClassFromMemberInfo (ec, mi, loc);
+					
+					if (ml == null) {
+						Report.Error (-200, loc, "Internal error!!");
+						return null;
+					}
+					return ResolveMemberAccess (ec, ml, left, loc, left_original);
+				}
+
+				if (left is TypeExpr) {
+					if (!ee.IsStatic) {
+						SimpleName.Error_ObjectRefRequired (loc, ee.EventInfo.Name);
+						return null;
+					}
+
+					return ee;
+
+				} else {
+					if (ee.IsStatic) {
+						if (IdenticalNameAndTypeName (ec, left_original, loc))
+							return ee;
+						    
+						error176 (loc, ee.EventInfo.Name);
+						return null;
+					}
+
+					ee.InstanceExpression = left;
+
+					return ee;
+				}
+			}
+
+			if (member_lookup is TypeExpr){
+				member_lookup.Resolve (ec);
+				return member_lookup;
+			}
+			
+			Console.WriteLine ("Left is: " + left);
+			Report.Error (-100, loc, "Support for [" + member_lookup + "] is not present yet");
+			Environment.Exit (0);
+			return null;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			if (type != null)
+				throw new Exception ();
+			//
+			// We are the sole users of ResolveWithSimpleName (ie, the only
+			// ones that can cope with it)
+			//
+			Expression original = expr;
+			expr = expr.ResolveWithSimpleName (ec);
+
+			if (expr == null)
+				return null;
+
+			if (expr is SimpleName){
+				SimpleName child_expr = (SimpleName) expr;
+				
+				Expression new_expr = new SimpleName (child_expr.Name + "." + Identifier, loc);
+
+				return new_expr.ResolveWithSimpleName (ec);
+			}
+					
+			//
+			// TODO: I mailed Ravi about this, and apparently we can get rid
+			// of this and put it in the right place.
+			// 
+			// Handle enums here when they are in transit.
+			// Note that we cannot afford to hit MemberLookup in this case because
+			// it will fail to find any members at all
+			//
+
+			int errors = Report.Errors;
+			
+			Type expr_type = expr.Type;
+			if ((expr is TypeExpr) && (expr_type.IsSubclassOf (TypeManager.enum_type))){
+				
+				Enum en = TypeManager.LookupEnum (expr_type);
+				
+				if (en != null) {
+					object value = en.LookupEnumValue (ec, Identifier, loc);
+
+					if (value != null){
+						Constant c = Constantify (value, en.UnderlyingType);
+						return new EnumConstant (c, expr_type);
+					}
+				}
+			}
+
+			if (expr_type.IsPointer){
+				Error (23,
+					      "The `.' operator can not be applied to pointer operands (" +
+					      TypeManager.CSharpName (expr_type) + ")");
+				return null;
+			}
+
+			member_lookup = MemberLookup (ec, expr_type, Identifier, loc);
+
+			if (member_lookup == null){
+				// Error has already been reported.
+				if (errors < Report.Errors)
+					return null;
+
+				//
+				// Try looking the member up from the same type, if we find
+				// it, we know that the error was due to limited visibility
+				//
+				object lookup = TypeManager.MemberLookup (
+					expr_type, expr_type, AllMemberTypes, AllBindingFlags, Identifier);
+				if (lookup == null)
+					Error (117, "`" + expr_type + "' does not contain a " +
+						      "definition for `" + Identifier + "'");
+				else
+					Error (122, "`" + expr_type + "." + Identifier + "' " +
+						      "is inaccessible because of its protection level");
+					      
+				return null;
+			}
+
+			return ResolveMemberAccess (ec, member_lookup, expr, loc, original);
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should not happen");
+		}
+
+		public override string ToString ()
+		{
+			return expr + "." + Identifier;
+		}
+	}
+
+	/// <summary>
+	///   Implements checked expressions
+	/// </summary>
+	public class CheckedExpr : Expression {
+
+		public Expression Expr;
+
+		public CheckedExpr (Expression e, Location l)
+		{
+			Expr = e;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			bool last_const_check = ec.ConstantCheckState;
+
+			ec.ConstantCheckState = true;
+			Expr = Expr.Resolve (ec);
+			ec.ConstantCheckState = last_const_check;
+			
+			if (Expr == null)
+				return null;
+
+			eclass = Expr.eclass;
+			type = Expr.Type;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			bool last_check = ec.CheckState;
+			bool last_const_check = ec.ConstantCheckState;
+			
+			ec.CheckState = true;
+			ec.ConstantCheckState = true;
+			Expr.Emit (ec);
+			ec.CheckState = last_check;
+			ec.ConstantCheckState = last_const_check;
+		}
+		
+	}
+
+	/// <summary>
+	///   Implements the unchecked expression
+	/// </summary>
+	public class UnCheckedExpr : Expression {
+
+		public Expression Expr;
+
+		public UnCheckedExpr (Expression e, Location l)
+		{
+			Expr = e;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			bool last_const_check = ec.ConstantCheckState;
+
+			ec.ConstantCheckState = false;
+			Expr = Expr.Resolve (ec);
+			ec.ConstantCheckState = last_const_check;
+
+			if (Expr == null)
+				return null;
+
+			eclass = Expr.eclass;
+			type = Expr.Type;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			bool last_check = ec.CheckState;
+			bool last_const_check = ec.ConstantCheckState;
+			
+			ec.CheckState = false;
+			ec.ConstantCheckState = false;
+			Expr.Emit (ec);
+			ec.CheckState = last_check;
+			ec.ConstantCheckState = last_const_check;
+		}
+		
+	}
+
+	/// <summary>
+	///   An Element Access expression.
+	///
+	///   During semantic analysis these are transformed into 
+	///   IndexerAccess or ArrayAccess 
+	/// </summary>
+	public class ElementAccess : Expression {
+		public ArrayList  Arguments;
+		public Expression Expr;
+		
+		public ElementAccess (Expression e, ArrayList e_list, Location l)
+		{
+			Expr = e;
+
+			loc  = l;
+			
+			if (e_list == null)
+				return;
+			
+			Arguments = new ArrayList ();
+			foreach (Expression tmp in e_list)
+				Arguments.Add (new Argument (tmp, Argument.AType.Expression));
+			
+		}
+
+		bool CommonResolve (EmitContext ec)
+		{
+			Expr = Expr.Resolve (ec);
+
+			if (Expr == null) 
+				return false;
+
+			if (Arguments == null)
+				return false;
+
+			foreach (Argument a in Arguments){
+				if (!a.Resolve (ec, loc))
+					return false;
+			}
+
+			return true;
+		}
+
+		Expression MakePointerAccess ()
+		{
+			Type t = Expr.Type;
+
+			if (t == TypeManager.void_ptr_type){
+				Error (
+					242,
+					"The array index operation is not valid for void pointers");
+				return null;
+			}
+			if (Arguments.Count != 1){
+				Error (
+					196,
+					"A pointer must be indexed by a single value");
+				return null;
+			}
+			Expression p = new PointerArithmetic (true, Expr, ((Argument)Arguments [0]).Expr,
+							      t, loc);
+			return new Indirection (p, loc);
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			if (!CommonResolve (ec))
+				return null;
+
+			//
+			// We perform some simple tests, and then to "split" the emit and store
+			// code we create an instance of a different class, and return that.
+			//
+			// I am experimenting with this pattern.
+			//
+			Type t = Expr.Type;
+
+			if (t.IsArray)
+				return (new ArrayAccess (this, loc)).Resolve (ec);
+			else if (t.IsPointer)
+				return MakePointerAccess ();
+			else
+				return (new IndexerAccess (this, loc)).Resolve (ec);
+		}
+
+		public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			if (!CommonResolve (ec))
+				return null;
+
+			Type t = Expr.Type;
+			if (t.IsArray)
+				return (new ArrayAccess (this, loc)).ResolveLValue (ec, right_side);
+			else if (t.IsPointer)
+				return MakePointerAccess ();
+			else
+				return (new IndexerAccess (this, loc)).ResolveLValue (ec, right_side);
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should never be reached");
+		}
+	}
+
+	/// <summary>
+	///   Implements array access 
+	/// </summary>
+	public class ArrayAccess : Expression, IAssignMethod, IMemoryLocation {
+		//
+		// Points to our "data" repository
+		//
+		ElementAccess ea;
+
+		LocalTemporary [] cached_locations;
+		
+		public ArrayAccess (ElementAccess ea_data, Location l)
+		{
+			ea = ea_data;
+			eclass = ExprClass.Variable;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			ExprClass eclass = ea.Expr.eclass;
+
+#if false
+			// As long as the type is valid
+			if (!(eclass == ExprClass.Variable || eclass == ExprClass.PropertyAccess ||
+			      eclass == ExprClass.Value)) {
+				ea.Expr.Error118 ("variable or value");
+				return null;
+			}
+#endif
+
+			Type t = ea.Expr.Type;
+			if (t.GetArrayRank () != ea.Arguments.Count){
+				ea.Error (22,
+					  "Incorrect number of indexes for array " +
+					  " expected: " + t.GetArrayRank () + " got: " +
+					  ea.Arguments.Count);
+				return null;
+			}
+			type = TypeManager.TypeToCoreType (t.GetElementType ());
+			if (type.IsPointer && !ec.InUnsafe){
+				UnsafeError (ea.Location);
+				return null;
+			}
+
+			foreach (Argument a in ea.Arguments){
+				Type argtype = a.Type;
+
+				if (argtype == TypeManager.int32_type ||
+				    argtype == TypeManager.uint32_type ||
+				    argtype == TypeManager.int64_type ||
+				    argtype == TypeManager.uint64_type)
+					continue;
+
+				//
+				// Mhm.  This is strage, because the Argument.Type is not the same as
+				// Argument.Expr.Type: the value changes depending on the ref/out setting.
+				//
+				// Wonder if I will run into trouble for this.
+				//
+				a.Expr = ExpressionToArrayArgument (ec, a.Expr, ea.Location);
+				if (a.Expr == null)
+					return null;
+			}
+			
+			eclass = ExprClass.Variable;
+
+			return this;
+		}
+
+		/// <summary>
+		///    Emits the right opcode to load an object of Type `t'
+		///    from an array of T
+		/// </summary>
+		static public void EmitLoadOpcode (ILGenerator ig, Type type)
+		{
+			if (type == TypeManager.byte_type || type == TypeManager.bool_type)
+				ig.Emit (OpCodes.Ldelem_U1);
+			else if (type == TypeManager.sbyte_type)
+				ig.Emit (OpCodes.Ldelem_I1);
+			else if (type == TypeManager.short_type)
+				ig.Emit (OpCodes.Ldelem_I2);
+			else if (type == TypeManager.ushort_type || type == TypeManager.char_type)
+				ig.Emit (OpCodes.Ldelem_U2);
+			else if (type == TypeManager.int32_type)
+				ig.Emit (OpCodes.Ldelem_I4);
+			else if (type == TypeManager.uint32_type)
+				ig.Emit (OpCodes.Ldelem_U4);
+			else if (type == TypeManager.uint64_type)
+				ig.Emit (OpCodes.Ldelem_I8);
+			else if (type == TypeManager.int64_type)
+				ig.Emit (OpCodes.Ldelem_I8);
+			else if (type == TypeManager.float_type)
+				ig.Emit (OpCodes.Ldelem_R4);
+			else if (type == TypeManager.double_type)
+				ig.Emit (OpCodes.Ldelem_R8);
+			else if (type == TypeManager.intptr_type)
+				ig.Emit (OpCodes.Ldelem_I);
+			else if (type.IsValueType){
+				ig.Emit (OpCodes.Ldelema, type);
+				ig.Emit (OpCodes.Ldobj, type);
+			} else 
+				ig.Emit (OpCodes.Ldelem_Ref);
+		}
+
+		/// <summary>
+		///    Emits the right opcode to store an object of Type `t'
+		///    from an array of T.  
+		/// </summary>
+		static public void EmitStoreOpcode (ILGenerator ig, Type t)
+		{
+			t = TypeManager.TypeToCoreType (t);
+			if (t == TypeManager.byte_type || t == TypeManager.sbyte_type ||
+			    t == TypeManager.bool_type)
+				ig.Emit (OpCodes.Stelem_I1);
+			else if (t == TypeManager.short_type || t == TypeManager.ushort_type || t == TypeManager.char_type)
+				ig.Emit (OpCodes.Stelem_I2);
+			else if (t == TypeManager.int32_type || t == TypeManager.uint32_type)
+				ig.Emit (OpCodes.Stelem_I4);
+			else if (t == TypeManager.int64_type || t == TypeManager.uint64_type)
+				ig.Emit (OpCodes.Stelem_I8);
+			else if (t == TypeManager.float_type)
+				ig.Emit (OpCodes.Stelem_R4);
+			else if (t == TypeManager.double_type)
+				ig.Emit (OpCodes.Stelem_R8);
+			else if (t == TypeManager.intptr_type)
+				ig.Emit (OpCodes.Stelem_I);
+			else if (t.IsValueType)
+				ig.Emit (OpCodes.Stobj, t);
+			else
+				ig.Emit (OpCodes.Stelem_Ref);
+		}
+
+		MethodInfo FetchGetMethod ()
+		{
+			ModuleBuilder mb = CodeGen.ModuleBuilder;
+			int arg_count = ea.Arguments.Count;
+			Type [] args = new Type [arg_count];
+			MethodInfo get;
+			
+			for (int i = 0; i < arg_count; i++){
+				//args [i++] = a.Type;
+				args [i] = TypeManager.int32_type;
+			}
+			
+			get = mb.GetArrayMethod (
+				ea.Expr.Type, "Get",
+				CallingConventions.HasThis |
+				CallingConventions.Standard,
+				type, args);
+			return get;
+		}
+				
+
+		MethodInfo FetchAddressMethod ()
+		{
+			ModuleBuilder mb = CodeGen.ModuleBuilder;
+			int arg_count = ea.Arguments.Count;
+			Type [] args = new Type [arg_count];
+			MethodInfo address;
+			string ptr_type_name;
+			Type ret_type;
+			
+			ptr_type_name = type.FullName + "&";
+			ret_type = Type.GetType (ptr_type_name);
+			
+			//
+			// It is a type defined by the source code we are compiling
+			//
+			if (ret_type == null){
+				ret_type = mb.GetType (ptr_type_name);
+			}
+
+			for (int i = 0; i < arg_count; i++){
+				//args [i++] = a.Type;
+				args [i] = TypeManager.int32_type;
+			}
+			
+			address = mb.GetArrayMethod (
+				ea.Expr.Type, "Address",
+				CallingConventions.HasThis |
+				CallingConventions.Standard,
+				ret_type, args);
+
+			return address;
+		}
+
+		//
+		// Load the array arguments into the stack.
+		//
+		// If we have been requested to cache the values (cached_locations array
+		// initialized), then load the arguments the first time and store them
+		// in locals.  otherwise load from local variables.
+		//
+		void LoadArrayAndArguments (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			if (cached_locations == null){
+				ea.Expr.Emit (ec);
+				foreach (Argument a in ea.Arguments){
+					Type argtype = a.Expr.Type;
+					
+					a.Expr.Emit (ec);
+					
+					if (argtype == TypeManager.int64_type)
+						ig.Emit (OpCodes.Conv_Ovf_I);
+					else if (argtype == TypeManager.uint64_type)
+						ig.Emit (OpCodes.Conv_Ovf_I_Un);
+				}
+				return;
+			}
+
+			if (cached_locations [0] == null){
+				cached_locations [0] = new LocalTemporary (ec, ea.Expr.Type);
+				ea.Expr.Emit (ec);
+				ig.Emit (OpCodes.Dup);
+				cached_locations [0].Store (ec);
+				
+				int j = 1;
+				
+				foreach (Argument a in ea.Arguments){
+					Type argtype = a.Expr.Type;
+					
+					cached_locations [j] = new LocalTemporary (ec, TypeManager.intptr_type /* a.Expr.Type */);
+					a.Expr.Emit (ec);
+					if (argtype == TypeManager.int64_type)
+						ig.Emit (OpCodes.Conv_Ovf_I);
+					else if (argtype == TypeManager.uint64_type)
+						ig.Emit (OpCodes.Conv_Ovf_I_Un);
+
+					ig.Emit (OpCodes.Dup);
+					cached_locations [j].Store (ec);
+					j++;
+				}
+				return;
+			}
+
+			foreach (LocalTemporary lt in cached_locations)
+				lt.Emit (ec);
+		}
+
+		public new void CacheTemporaries (EmitContext ec)
+		{
+			cached_locations = new LocalTemporary [ea.Arguments.Count + 1];
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			int rank = ea.Expr.Type.GetArrayRank ();
+			ILGenerator ig = ec.ig;
+
+			LoadArrayAndArguments (ec);
+			
+			if (rank == 1)
+				EmitLoadOpcode (ig, type);
+			else {
+				MethodInfo method;
+				
+				method = FetchGetMethod ();
+				ig.Emit (OpCodes.Call, method);
+			}
+		}
+
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			int rank = ea.Expr.Type.GetArrayRank ();
+			ILGenerator ig = ec.ig;
+			Type t = source.Type;
+
+			LoadArrayAndArguments (ec);
+
+			//
+			// The stobj opcode used by value types will need
+			// an address on the stack, not really an array/array
+			// pair
+			//
+			if (rank == 1){
+				if (t.IsValueType && !TypeManager.IsBuiltinType (t))
+					ig.Emit (OpCodes.Ldelema, t);
+			}
+			
+			source.Emit (ec);
+
+			if (rank == 1)
+				EmitStoreOpcode (ig, t);
+			else {
+				ModuleBuilder mb = CodeGen.ModuleBuilder;
+				int arg_count = ea.Arguments.Count;
+				Type [] args = new Type [arg_count + 1];
+				MethodInfo set;
+				
+				for (int i = 0; i < arg_count; i++){
+					//args [i++] = a.Type;
+					args [i] = TypeManager.int32_type;
+				}
+
+				args [arg_count] = type;
+				
+				set = mb.GetArrayMethod (
+					ea.Expr.Type, "Set",
+					CallingConventions.HasThis |
+					CallingConventions.Standard,
+					TypeManager.void_type, args);
+				
+				ig.Emit (OpCodes.Call, set);
+			}
+		}
+
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			int rank = ea.Expr.Type.GetArrayRank ();
+			ILGenerator ig = ec.ig;
+
+			LoadArrayAndArguments (ec);
+
+			if (rank == 1){
+				ig.Emit (OpCodes.Ldelema, type);
+			} else {
+				MethodInfo address = FetchAddressMethod ();
+				ig.Emit (OpCodes.Call, address);
+			}
+		}
+	}
+
+	
+	class Indexers {
+		public ArrayList getters, setters;
+		static Hashtable map;
+
+		static Indexers ()
+		{
+			map = new Hashtable ();
+		}
+
+		Indexers (MemberInfo [] mi)
+		{
+			foreach (PropertyInfo property in mi){
+				MethodInfo get, set;
+				
+				get = property.GetGetMethod (true);
+				if (get != null){
+					if (getters == null)
+						getters = new ArrayList ();
+
+					getters.Add (get);
+				}
+				
+				set = property.GetSetMethod (true);
+				if (set != null){
+					if (setters == null)
+						setters = new ArrayList ();
+					setters.Add (set);
+				}
+			}
+		}
+
+		static private Indexers GetIndexersForTypeOrInterface (Type caller_type, Type lookup_type)
+		{
+			Indexers ix = (Indexers) map [lookup_type];
+			
+			if (ix != null)
+				return ix;
+
+			string p_name = TypeManager.IndexerPropertyName (lookup_type);
+
+			MemberInfo [] mi = TypeManager.MemberLookup (
+				caller_type, lookup_type, MemberTypes.Property,
+				BindingFlags.Public | BindingFlags.Instance, p_name);
+
+			if (mi == null || mi.Length == 0)
+				return null;
+
+			ix = new Indexers (mi);
+			map [lookup_type] = ix;
+
+			return ix;
+		}
+		
+		static public Indexers GetIndexersForType (Type caller_type, Type lookup_type, Location loc) 
+		{
+			Indexers ix = (Indexers) map [lookup_type];
+			
+			if (ix != null)
+				return ix;
+
+			ix = GetIndexersForTypeOrInterface (caller_type, lookup_type);
+			if (ix != null)
+				return ix;
+
+			Type [] ifaces = TypeManager.GetInterfaces (lookup_type);
+			if (ifaces != null) {
+				foreach (Type itype in ifaces) {
+					ix = GetIndexersForTypeOrInterface (caller_type, itype);
+					if (ix != null)
+						return ix;
+				}
+			}
+
+			Report.Error (21, loc,
+				      "Type `" + TypeManager.CSharpName (lookup_type) +
+				      "' does not have any indexers defined");
+			return null;
+		}
+	}
+
+	/// <summary>
+	///   Expressions that represent an indexer call.
+	/// </summary>
+	public class IndexerAccess : Expression, IAssignMethod {
+		//
+		// Points to our "data" repository
+		//
+		ElementAccess ea;
+		MethodInfo get, set;
+		Indexers ilist;
+		ArrayList set_arguments;
+		
+		public IndexerAccess (ElementAccess ea_data, Location l)
+		{
+			ea = ea_data;
+			eclass = ExprClass.Value;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Type indexer_type = ea.Expr.Type;
+			
+			//
+			// Step 1: Query for all `Item' *properties*.  Notice
+			// that the actual methods are pointed from here.
+			//
+			// This is a group of properties, piles of them.  
+
+			if (ilist == null)
+				ilist = Indexers.GetIndexersForType (
+					ec.ContainerType, indexer_type, ea.Location);
+
+
+			//
+			// Step 2: find the proper match
+			//
+			if (ilist != null && ilist.getters != null && ilist.getters.Count > 0){
+				Location loc = ea.Location;
+				
+				get = (MethodInfo) Invocation.OverloadResolve (
+					ec, new MethodGroupExpr (ilist.getters, loc), ea.Arguments, loc);
+			}
+
+			if (get == null){
+				ea.Error (154, "indexer can not be used in this context, because " +
+					  "it lacks a `get' accessor");
+				return null;
+			}
+
+			type = get.ReturnType;
+			if (type.IsPointer && !ec.InUnsafe){
+				UnsafeError (ea.Location);
+				return null;
+			}
+			
+			eclass = ExprClass.IndexerAccess;
+			return this;
+		}
+
+		public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			Type indexer_type = ea.Expr.Type;
+			Type right_type = right_side.Type;
+
+			if (ilist == null)
+				ilist = Indexers.GetIndexersForType (
+					ec.ContainerType, indexer_type, ea.Location);
+
+			if (ilist != null && ilist.setters != null && ilist.setters.Count > 0){
+				Location loc = ea.Location;
+				
+				set_arguments = (ArrayList) ea.Arguments.Clone ();
+				set_arguments.Add (new Argument (right_side, Argument.AType.Expression));
+
+				set = (MethodInfo) Invocation.OverloadResolve (
+					ec, new MethodGroupExpr (ilist.setters, loc), set_arguments, loc);
+			}
+			
+			if (set == null){
+				ea.Error (200, "indexer X.this [" + TypeManager.CSharpName (right_type) +
+					  "] lacks a `set' accessor");
+				return null;
+			}
+
+			type = TypeManager.void_type;
+			eclass = ExprClass.IndexerAccess;
+			return this;
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			Invocation.EmitCall (ec, false, false, ea.Expr, get, ea.Arguments, ea.Location);
+		}
+
+		//
+		// source is ignored, because we already have a copy of it from the
+		// LValue resolution and we have already constructed a pre-cached
+		// version of the arguments (ea.set_arguments);
+		//
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			Invocation.EmitCall (ec, false, false, ea.Expr, set, set_arguments, ea.Location);
+		}
+	}
+
+	/// <summary>
+	///   The base operator for method names
+	/// </summary>
+	public class BaseAccess : Expression {
+		string member;
+		
+		public BaseAccess (string member, Location l)
+		{
+			this.member = member;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Expression member_lookup;
+			Type current_type = ec.ContainerType;
+			Type base_type = current_type.BaseType;
+			Expression e;
+
+			if (ec.IsStatic){
+				Error (1511,
+					      "Keyword base is not allowed in static method");
+				return null;
+			}
+			
+			member_lookup = MemberLookup (ec, base_type, member, loc);
+			if (member_lookup == null) {
+				Error (117,
+					      TypeManager.CSharpName (base_type) + " does not " +
+					      "contain a definition for `" + member + "'");
+				return null;
+			}
+
+			Expression left;
+			
+			if (ec.IsStatic)
+				left = new TypeExpr (base_type, loc);
+			else
+				left = ec.This;
+			
+			e = MemberAccess.ResolveMemberAccess (ec, member_lookup, left, loc, null);
+
+			if (e is PropertyExpr){
+				PropertyExpr pe = (PropertyExpr) e;
+
+				pe.IsBase = true;
+			}
+
+			return e;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should never be called"); 
+		}
+	}
+
+	/// <summary>
+	///   The base indexer operator
+	/// </summary>
+	public class BaseIndexerAccess : Expression {
+		ArrayList Arguments;
+		
+		public BaseIndexerAccess (ArrayList args, Location l)
+		{
+			Arguments = args;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Type current_type = ec.ContainerType;
+			Type base_type = current_type.BaseType;
+			Expression member_lookup;
+
+			if (ec.IsStatic){
+				Error (1511,
+					      "Keyword base is not allowed in static method");
+				return null;
+			}
+			
+			member_lookup = MemberLookup (ec, base_type, "get_Item", MemberTypes.Method, AllBindingFlags, loc);
+			if (member_lookup == null)
+				return null;
+
+			return MemberAccess.ResolveMemberAccess (ec, member_lookup, ec.This, loc, null);
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should never be called");
+		}
+	}
+	
+	/// <summary>
+	///   This class exists solely to pass the Type around and to be a dummy
+	///   that can be passed to the conversion functions (this is used by
+	///   foreach implementation to typecast the object return value from
+	///   get_Current into the proper type.  All code has been generated and
+	///   we only care about the side effect conversions to be performed
+	///
+	///   This is also now used as a placeholder where a no-action expression
+	///   is needed (the `New' class).
+	/// </summary>
+	public class EmptyExpression : Expression {
+		public EmptyExpression ()
+		{
+			type = TypeManager.object_type;
+			eclass = ExprClass.Value;
+			loc = Location.Null;
+		}
+
+		public EmptyExpression (Type t)
+		{
+			type = t;
+			eclass = ExprClass.Value;
+			loc = Location.Null;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			// nothing, as we only exist to not do anything.
+		}
+
+		//
+		// This is just because we might want to reuse this bad boy
+		// instead of creating gazillions of EmptyExpressions.
+		// (CanConvertImplicit uses it)
+		//
+		public void SetType (Type t)
+		{
+			type = t;
+		}
+	}
+
+	public class UserCast : Expression {
+		MethodBase method;
+		Expression source;
+		
+		public UserCast (MethodInfo method, Expression source, Location l)
+		{
+			this.method = method;
+			this.source = source;
+			type = method.ReturnType;
+			eclass = ExprClass.Value;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// We are born fully resolved
+			//
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			source.Emit (ec);
+			
+			if (method is MethodInfo)
+				ig.Emit (OpCodes.Call, (MethodInfo) method);
+			else
+				ig.Emit (OpCodes.Call, (ConstructorInfo) method);
+
+		}
+	}
+
+	// <summary>
+	//   This class is used to "construct" the type during a typecast
+	//   operation.  Since the Type.GetType class in .NET can parse
+	//   the type specification, we just use this to construct the type
+	//   one bit at a time.
+	// </summary>
+	public class ComposedCast : Expression {
+		Expression left;
+		string dim;
+		
+		public ComposedCast (Expression left, string dim, Location l)
+		{
+			this.left = left;
+			this.dim = dim;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			left = left.Resolve (ec);
+			if (left == null)
+				return null;
+
+			if (left.eclass != ExprClass.Type){
+				left.Error118 ("type");
+				return null;
+			}
+			
+			type = RootContext.LookupType (
+				ec.DeclSpace, left.Type.FullName + dim, false, loc);
+			if (type == null)
+				return null;
+
+			if (!ec.ResolvingTypeTree){
+				//
+				// If the above flag is set, this is being invoked from the ResolveType function.
+				// Upper layers take care of the type validity in this context.
+				//
+			if (!ec.InUnsafe && type.IsPointer){
+				UnsafeError (loc);
+				return null;
+			}
+			}
+			
+			eclass = ExprClass.Type;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("This should never be called");
+		}
+
+		public override string ToString ()
+		{
+			return left + dim;
+		}
+	}
+
+	//
+	// This class is used to represent the address of an array, used
+	// only by the Fixed statement, this is like the C "&a [0]" construct.
+	//
+	public class ArrayPtr : Expression {
+		Expression array;
+		
+		public ArrayPtr (Expression array, Location l)
+		{
+			Type array_type = array.Type.GetElementType ();
+
+			this.array = array;
+			
+			string array_ptr_type_name = array_type.FullName + "*";
+			
+			type = Type.GetType (array_ptr_type_name);
+			if (type == null){
+				ModuleBuilder mb = CodeGen.ModuleBuilder;
+				
+				type = mb.GetType (array_ptr_type_name);
+			}
+
+			eclass = ExprClass.Value;
+			loc = l;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			array.Emit (ec);
+			IntLiteral.EmitInt (ig, 0);
+			ig.Emit (OpCodes.Ldelema, array.Type.GetElementType ());
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// We are born fully resolved
+			//
+			return this;
+		}
+	}
+
+	//
+	// Used by the fixed statement
+	//
+	public class StringPtr : Expression {
+		LocalBuilder b;
+		
+		public StringPtr (LocalBuilder b, Location l)
+		{
+			this.b = b;
+			eclass = ExprClass.Value;
+			type = TypeManager.char_ptr_type;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			ig.Emit (OpCodes.Ldloc, b);
+			ig.Emit (OpCodes.Conv_I);
+			ig.Emit (OpCodes.Call, TypeManager.int_get_offset_to_string_data);
+			ig.Emit (OpCodes.Add);
+		}
+	}
+	
+	//
+	// Implements the `stackalloc' keyword
+	//
+	public class StackAlloc : Expression {
+		Type otype;
+		Expression t;
+		Expression count;
+		
+		public StackAlloc (Expression type, Expression count, Location l)
+		{
+			t = type;
+			this.count = count;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			count = count.Resolve (ec);
+			if (count == null)
+				return null;
+			
+			if (count.Type != TypeManager.int32_type){
+				count = ConvertImplicitRequired (ec, count, TypeManager.int32_type, loc);
+				if (count == null)
+					return null;
+			}
+
+			if (ec.InCatch || ec.InFinally){
+				Error (255,
+					      "stackalloc can not be used in a catch or finally block");
+				return null;
+			}
+
+			otype = ec.DeclSpace.ResolveType (t, false, loc);
+
+			if (otype == null)
+				return null;
+
+			if (!TypeManager.VerifyUnManaged (otype, loc))
+				return null;
+
+			string ptr_name = otype.FullName + "*";
+			type = Type.GetType (ptr_name);
+			if (type == null){
+				ModuleBuilder mb = CodeGen.ModuleBuilder;
+				
+				type = mb.GetType (ptr_name);
+			}
+			eclass = ExprClass.Value;
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			int size = GetTypeSize (otype);
+			ILGenerator ig = ec.ig;
+				
+			if (size == 0)
+				ig.Emit (OpCodes.Sizeof, otype);
+			else
+				IntConstant.EmitInt (ig, size);
+			count.Emit (ec);
+			ig.Emit (OpCodes.Mul);
+			ig.Emit (OpCodes.Localloc);
+		}
+	}
+}
diff --git a/mcs/mbas/genericparser.cs b/mcs/mbas/genericparser.cs
new file mode 100644
index 00000000000..f31f0be075c
--- /dev/null
+++ b/mcs/mbas/genericparser.cs
@@ -0,0 +1,336 @@
+//

+// GenericParser.cs: The Base Parser for the Mono compilers

+//

+// Author: A Rafael D Teixeira (rafaelteixeirabr@hotmail.com)

+//

+// Licensed under the terms of the GNU GPL

+//

+// Copyright (C) 2001 Ximian, Inc.

+//

+

+namespace Mono.Languages

+{

+	using System;

+	using System.Reflection;

+	using System.Collections;

+	using System.IO;

+	using Mono.CSharp;

+

+	/// <summary>

+	/// Base class to support multiple Jay generated parsers

+	/// </summary>

+	public abstract class GenericParser

+	{

+		// ---------------------------------------------------

+		// Class state

+

+		// Count of errors found while parsing

+		static protected int global_errors;

+

+		// Maps extensions to specific parsers

+		static private Hashtable mapOfParsers;

+

+		// Indicates if parsing should be verbose

+		static public bool yacc_verbose_flag = false;

+

+		// Context to use

+		static public ArrayList defines;

+

+		// ---------------------------------------------------

+		// Instance state

+

+		// Name of the file we are parsing

+		protected string name;

+

+		// Input stream to parse from.

+		protected System.IO.TextReader input;

+

+		// Current namespace definition

+		protected Namespace     current_namespace;

+

+		// Current typecontainer definition

+		protected TypeContainer current_container;

+

+		// ---------------------------------------------------

+		// What the descendants MUST reimplement

+

+		/// <summary>

+		/// Parses the current "input"

+		/// </summary>

+		public abstract int parse();

+

+		/// <summary>

+		/// Lists the extensions this parser can handle

+		/// </summary>

+		public abstract string[] extensions();

+		/* {

+			string [] list = { ".cs" };

+			return list;

+		} */

+

+		// ---------------------------------------------------

+		// What the descendants DONT HAVE to reimplement

+

+		/// <summary>

+		/// Initializes this parser from a file and parses it

+		/// </summary>

+		/// <param name="fileName">Name of the file to be parsed</param>

+		/// <param name="context">Context to output the parsed tree</param>

+		public int ParseFile(string fileName)

+		{

+			// file exceptions must be caught by caller

+

+			global_errors = 0;

+			name = fileName;

+			// TODO: Encoding switching as needed

+			//   We are here forcing StreamReader to assume current system codepage,

+			//   because normally it defaults to UTF-8

+			input = new StreamReader(fileName, System.Text.Encoding.Default); 

+			//rc = context;

+			return parse();

+		}

+

+		/// <summary>

+		/// Initializes this parser from a string and parses it

+		/// </summary>

+		/// <param name="source">String to be parsed</param>

+		/// <param name="sourceName">Name of the source to be parsed (just for error reporting)</param>

+		/// <param name="context">Context to output the parsed tree</param>

+		public int ParseString(string source, string sourceName)

+		{

+			global_errors = 0;

+			name = sourceName;

+			input = new StringReader(source);

+			//rc = context;

+			return parse();

+		}

+

+		// ---------------------------------------------------

+		// Class methods

+

+		static private void MapParsers()

+		{

+

+			mapOfParsers = new Hashtable();

+

+			Assembly thisAssembly = Assembly.GetExecutingAssembly();

+			foreach(Type type in thisAssembly.GetTypes())

+			{

+				if (type.BaseType != null)

+					if (type.BaseType.FullName == "Mono.Languages.GenericParser")

+					{

+						GenericParser parser = (GenericParser)Activator.CreateInstance(type);

+						foreach(string fileExtension in parser.extensions())

+						{												

+							string theFileExtension = fileExtension.ToLower();

+							if (mapOfParsers.Contains(theFileExtension))

+								Console.WriteLine("[TRACE] " + type.FullName + " can't try to parse '" + theFileExtension + "' files too");

+							else

+								mapOfParsers.Add(theFileExtension, parser);

+						}

+					}

+			}

+		}

+

+		/// <summary>

+		/// Find the descendant parser that knows how to parse the specified file

+		/// based on the files extension

+		/// </summary>

+		/// <param name="fileName">Name of the file to be parsed</param>

+		public static GenericParser GetSpecificParserFor(string fileName)

+		{

+			int i;

+			string fileExtension;

+			

+			if (mapOfParsers == null)

+				MapParsers();

+			

+			if ((i = fileName.LastIndexOf(".")) < 0)

+				return null;

+			else

+				fileExtension = fileName.Substring(i).ToLower();

+

+			return (GenericParser)mapOfParsers[fileExtension];

+		}

+

+		

+		public static int Tokenize(string fileName)

+		{

+			GenericParser parser = GetSpecificParserFor(fileName);

+						

+			if (parser == null)

+			{

+				Console.WriteLine("Do not know how to compile " + fileName);

+				return 1;

+			}

+

+/*			Stream input;

+

+			try {

+				input = File.OpenRead (input_file);

+

+			} catch {

+				Report.Error (2001, "Source file '" + input_file + "' could not be opened");

+				return 1;

+			}

+

+			using (input){

+				Tokenizer lexer = new Tokenizer (input, input_file, defines);

+				int token, tokens = 0, errors = 0;

+

+				while ((token = lexer.token ()) != Token.EOF){

+					Location l = lexer.Location;

+					tokens++;

+					if (token == Token.ERROR)

+						errors++;

+				}

+				Console.WriteLine ("Tokenized: " + tokens + " found " + errors + " errors");

+			}

+*/			

+			return 0;

+		}

+

+

+		/// <summary>

+		/// Find the descendant parser that knows how to parse the specified file

+		/// based on the files extension, and parses it using the chosen parser

+		/// </summary>

+		/// <param name="fileName">Name of the file to be parsed</param>

+		/// <param name="context">Context to output the parsed tree</param>

+		public static int Parse(string fileName)

+		{

+			int errors;

+			GenericParser parser = GetSpecificParserFor(fileName);

+						

+			if (parser == null)

+			{

+				Console.WriteLine("Do not know how to compile " + fileName);

+				return 1;

+			}

+			

+			try 

+			{

+				errors = parser.ParseFile(fileName);

+			} 

+			catch (FileNotFoundException ex)

+			{

+				error(2001, "Source file \'" + fileName + "\' could not be found!!!");

+				Console.WriteLine (ex);

+				return 1;

+			}

+			catch (Exception ex)

+			{

+				Console.WriteLine (ex);

+				Console.WriteLine ("Compilation aborted");

+				return 1;

+			}

+			

+			return errors;

+		}

+

+		// <summary>
+		//   Given the @class_name name, it creates a fully qualified name
+		//   based on the containing declaration space
+		// </summary>
+		protected string MakeName(string class_name)
+		{
+			string ns = current_namespace.Name;
+			string container_name = current_container.Name;
+
+			if (container_name == "")

+			{
+				if (ns != "")
+					return ns + "." + class_name;
+				else
+					return class_name;
+			} 

+			else
+				return container_name + "." + class_name;
+		}
+
+		// <summary>
+		//   Used to report back to the user the result of a declaration
+		//   in the current declaration space
+		// </summary>
+		protected void CheckDef (AdditionResult result, string name, Location l)
+		{
+			if (result == AdditionResult.Success)
+				return;
+
+			switch (result)

+			{
+				case AdditionResult.NameExists:
+					Report.Error (102, l, "The container '" + current_container.Name + 
+						"' already contains a definition for '"+
+						name + "'");
+					break;
+
+
+					//
+					// This is handled only for static Constructors, because
+					// in reality we handle these by the semantic analysis later
+					//
+				case AdditionResult.MethodExists:
+					Report.Error (
+						111, l, "Class `"+current_container.Name+
+						"' already defines a member called '" + 
+						name + "' with the same parameter types (more than one default constructor)");
+					break;
+
+				case AdditionResult.EnclosingClash:
+					Report.Error (542, l, "Member names cannot be the same as their enclosing type");
+					break;
+		
+				case AdditionResult.NotAConstructor:
+					Report.Error (1520, l, "Class, struct, or interface method must have a return type");
+					break;
+			}
+		}
+
+		// <summary>
+		//   Used to report back to the user the result of a declaration
+		//   in the current declaration space
+		// </summary>
+		protected void CheckDef (bool result, string name, Location l)
+		{
+			if (result)
+				return;
+			CheckDef (AdditionResult.NameExists, name, l);
+		}
+
+

+		/// <summary>

+		/// Emits error messages and increments a global count of them

+		/// </summary>

+		/// <param name="code"></param>

+		/// <param name="desc"></param>

+		static public void error (int code, string desc)

+		{

+			Console.WriteLine ("error MC"+code+": "+ desc);

+			global_errors++;

+		}

+

+		// Emits error messages with location info.

+		// FIXME : Ideally, all error reporting should happen

+		// with Report.Error but how do you get at that non-static

+		// method everywhere you need it ?

+		static public void error (int code, Mono.CSharp.Location l, string text)

+		{

+			Console.WriteLine (l.Name + "(" + l.Row + ",?" + /*l.Col +*/

+					   "): error MC" + code + ": " + text);

+			global_errors++;

+		}

+		

+		// ---------------------------------------------------

+		// Constructors

+

+		public GenericParser()

+		{

+			// DO NOTHING

+		}

+

+	}

+}

+

+

+

diff --git a/mcs/mbas/interface.cs b/mcs/mbas/interface.cs
new file mode 100644
index 00000000000..a1b6d60ba5e
--- /dev/null
+++ b/mcs/mbas/interface.cs
@@ -0,0 +1,968 @@
+//
+// interface.cs: Interface handler
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+
+using System.Collections;
+using System;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   Interfaces
+	/// </summary>
+	public class Interface : DeclSpace {
+		const MethodAttributes interface_method_attributes =
+			MethodAttributes.Public |
+			MethodAttributes.Abstract |
+			MethodAttributes.HideBySig |
+			MethodAttributes.NewSlot |
+			MethodAttributes.Virtual;
+
+		const MethodAttributes property_attributes =
+			MethodAttributes.Public |
+			MethodAttributes.Abstract |
+			MethodAttributes.HideBySig |
+			MethodAttributes.NewSlot |
+			MethodAttributes.SpecialName |
+			MethodAttributes.Virtual;
+		
+		ArrayList bases;
+		
+		ArrayList defined_method;
+		ArrayList defined_indexer;
+		ArrayList defined_events;
+		ArrayList defined_properties;
+
+		ArrayList method_builders;
+		ArrayList property_builders;
+		ArrayList event_builders;
+		
+		Attributes OptAttributes;
+
+		public string IndexerName;
+
+		// These will happen after the semantic analysis
+		
+		// Hashtable defined_indexers;
+		// Hashtable defined_methods;
+		
+		/// <summary>
+		///   Modifiers allowed in a class declaration
+		/// </summary>
+		public const int AllowedModifiers =
+			Modifiers.NEW       |
+			Modifiers.PUBLIC    |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL  |
+		 	Modifiers.UNSAFE    |
+			Modifiers.PRIVATE;
+
+		public Interface (TypeContainer parent, string name, int mod, Attributes attrs, Location l)
+			: base (parent, name, l)
+		{
+			ModFlags = Modifiers.Check (AllowedModifiers, mod, Modifiers.PRIVATE, l);
+			OptAttributes = attrs;
+			
+			method_builders = new ArrayList ();
+			property_builders = new ArrayList ();
+			event_builders = new ArrayList ();
+		}
+
+		public AdditionResult AddMethod (InterfaceMethod imethod)
+		{
+			string name = imethod.Name;
+			Object value = defined_names [name];
+
+			if (value != null){
+				if (!(value is InterfaceMethod))
+					return AdditionResult.NameExists;
+			} 
+
+			if (defined_method == null)
+				defined_method = new ArrayList ();
+
+			defined_method.Add (imethod);
+			if (value == null)
+				DefineName (name, imethod);
+			
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddProperty (InterfaceProperty iprop)
+		{
+			AdditionResult res;
+			string name = iprop.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			DefineName (name, iprop);
+
+			if (defined_properties == null)
+				defined_properties = new ArrayList ();
+
+			defined_properties.Add (iprop);
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddEvent (InterfaceEvent ievent)
+		{
+			string name = ievent.Name;
+			AdditionResult res;
+			
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			DefineName (name, ievent);
+
+			if (defined_events == null)
+				defined_events = new ArrayList ();
+
+			defined_events.Add (ievent);
+			return AdditionResult.Success;
+		}
+
+		public bool AddIndexer (InterfaceIndexer iindexer)
+		{
+			if (defined_indexer == null)
+				defined_indexer = new ArrayList ();
+			
+			defined_indexer.Add (iindexer);
+			return true;
+		}
+		
+		public ArrayList InterfaceMethods {
+			get {
+				return defined_method;
+			}
+		}
+
+		public ArrayList InterfaceProperties {
+			get {
+				return defined_properties;
+			}
+		}
+
+		public ArrayList InterfaceEvents {
+			get {
+				return defined_events;
+			}
+		}
+
+		public ArrayList InterfaceIndexers {
+			get {
+				return defined_indexer;
+			}
+		}
+
+		public ArrayList Bases {
+			get {
+				return bases;
+			}
+
+			set {
+				bases = value;
+			}
+		}
+
+		public virtual TypeAttributes InterfaceAttr {
+			get {
+				TypeAttributes x = TypeAttributes.Interface | TypeAttributes.Abstract;
+
+				if (IsTopLevel == false) {
+					
+					if ((ModFlags & Modifiers.PROTECTED) != 0
+					    && (ModFlags & Modifiers.INTERNAL) != 0)
+						x |= TypeAttributes.NestedFamORAssem;
+					else if ((ModFlags & Modifiers.PROTECTED) != 0)
+						x |= TypeAttributes.NestedFamily;
+					else if ((ModFlags & Modifiers.INTERNAL) != 0)
+						x |= TypeAttributes.NestedAssembly;
+					else if ((ModFlags & Modifiers.PUBLIC) != 0)
+						x |= TypeAttributes.NestedPublic;
+					else
+						x |= TypeAttributes.NestedPrivate;
+				} else {
+					if ((ModFlags & Modifiers.PUBLIC) != 0)
+						x |= TypeAttributes.Public;
+					else if ((ModFlags & Modifiers.PRIVATE) != 0)
+						x |= TypeAttributes.NotPublic;
+				}
+				
+				if ((ModFlags & Modifiers.ABSTRACT) != 0)
+					x |= TypeAttributes.Abstract;
+				
+				if ((ModFlags & Modifiers.SEALED) != 0)
+					x |= TypeAttributes.Sealed;
+
+				return x;
+			}
+		}
+		
+		void Error111 (InterfaceMemberBase ib)
+		{
+			Report.Error (
+				111,
+				"Interface `" + Name + "' already contains a definition with the " +
+				"same return value and parameter types for member `" + ib.Name + "'");
+		}
+
+		bool RegisterMethod (MethodBase mb, InternalParameters ip, Type [] types)
+		{
+			if (!TypeManager.RegisterMethod (mb, ip, types))
+				return false;
+
+			method_builders.Add (mb);
+			return true;
+		}
+
+		public MethodInfo [] GetMethods ()
+		{
+			int n = method_builders.Count;
+			MethodInfo [] mi = new MethodInfo [n];
+			
+			method_builders.CopyTo (mi, 0);
+
+			return mi;
+		}
+
+		// Hack around System.Reflection as found everywhere else
+		public MemberInfo [] FindMembers (MemberTypes mt, BindingFlags bf, MemberFilter filter, object criteria)
+		{
+			ArrayList members = new ArrayList ();
+
+			if ((mt & MemberTypes.Method) != 0) {
+				foreach (MethodBuilder mb in method_builders)
+					if (filter (mb, criteria))
+						members.Add (mb);
+			}
+
+			if ((mt & MemberTypes.Property) != 0) {
+				foreach (PropertyBuilder pb in property_builders)
+				        if (filter (pb, criteria))
+				                members.Add (pb);
+			}
+
+			if ((mt & MemberTypes.Event) != 0) {
+				foreach (MyEventBuilder eb in event_builders)
+				        if (filter (eb, criteria))
+				                members.Add (eb);
+			}
+
+			if (((bf & BindingFlags.DeclaredOnly) == 0) && (TypeBuilder.BaseType != null)) {
+				MemberInfo [] parent_mi;
+				
+				parent_mi = TypeContainer.FindMembers (
+					TypeBuilder.BaseType, mt, bf, filter, criteria);
+
+				if (parent_mi != null)
+					members.AddRange (parent_mi);
+			}
+			
+			// The rest of the cases, if any, are unhandled at present.
+
+			int count = members.Count;
+
+			if (count > 0) {
+				MemberInfo [] mi = new MemberInfo [count];
+				members.CopyTo (mi, 0);
+				return mi;
+			}
+
+			return null;
+		}
+
+		//
+		// Populates the methods in the interface
+		//
+		void PopulateMethod (TypeContainer parent, DeclSpace decl_space, InterfaceMethod im)
+		{
+			Type return_type = this.ResolveType (im.ReturnType, false, im.Location);
+			Type [] arg_types = im.ParameterTypes (this);
+			MethodBuilder mb;
+			Parameter [] p;
+			int i;
+
+			if (return_type == null)
+				return;
+
+			if (return_type.IsPointer && !UnsafeOK (this))
+				return;
+
+			foreach (Type t in arg_types){
+
+				if (t == null)
+					return;
+				
+				if (t.IsPointer && !UnsafeOK (this))
+					return;
+			}
+			
+			//
+			// Create the method
+			//
+			mb = TypeBuilder.DefineMethod (
+				im.Name, interface_method_attributes,
+				return_type, arg_types);
+
+			InternalParameters ip = new InternalParameters (arg_types, im.Parameters);
+			
+			if (!RegisterMethod (mb, ip, arg_types)) {
+				Error111 (im);
+				return;
+			}
+
+			//
+			// Define each type attribute (in/out/ref) and
+			// the argument names.
+			//
+			p = im.Parameters.FixedParameters;
+			if (p != null){
+				for (i = 0; i < p.Length; i++)
+					mb.DefineParameter (i + 1, p [i].Attributes, p [i].Name);
+
+				if (i != arg_types.Length)
+					Console.WriteLine ("Implement the type definition for params");
+			}
+
+			EmitContext ec = new EmitContext (parent, decl_space, Location, null,
+							  return_type, ModFlags, false);
+
+			if (im.OptAttributes != null)
+				Attribute.ApplyAttributes (ec, mb, im, im.OptAttributes, Location);
+		}
+
+		//
+		// Populates the properties in the interface
+		//
+		void PopulateProperty (TypeContainer parent, DeclSpace decl_space, InterfaceProperty ip)
+		{
+			PropertyBuilder pb;
+			MethodBuilder get = null, set = null;
+			ip.Type = this.ResolveTypeExpr (ip.Type, false, ip.Location);
+			Type prop_type = ip.Type.Type;
+			Type [] setter_args = new Type [1];
+
+			if (prop_type == null)
+				return;
+
+			if (prop_type.IsPointer && !UnsafeOK (this))
+				return;
+			
+			setter_args [0] = prop_type;
+
+			//
+			// FIXME: properties are missing the following
+			// flags: hidebysig newslot specialname
+			//
+			pb = TypeBuilder.DefineProperty (
+				ip.Name, PropertyAttributes.None,
+				prop_type, null);
+
+			if (ip.HasGet){
+				get = TypeBuilder.DefineMethod (
+					"get_" + ip.Name, property_attributes ,
+					prop_type, null);
+
+				//
+				// HACK because System.Reflection.Emit is lame
+				//
+				Type [] null_types = null;
+				InternalParameters inp = new InternalParameters
+					(null_types, Parameters.EmptyReadOnlyParameters);
+				
+				if (!RegisterMethod (get, inp, null)) {
+					Error111 (ip);
+					return;
+				}
+				
+				pb.SetGetMethod (get);
+			}
+
+			if (ip.HasSet){
+				setter_args [0] = prop_type;
+
+				set = TypeBuilder.DefineMethod (
+					"set_" + ip.Name, property_attributes,
+					TypeManager.void_type, setter_args);
+
+				set.DefineParameter (1, ParameterAttributes.None, "value");
+				pb.SetSetMethod (set);
+
+				//
+				// HACK because System.Reflection.Emit is lame
+				//
+				Parameter [] parms = new Parameter [1];
+				parms [0] = new Parameter (ip.Type, "value", Parameter.Modifier.NONE, null);
+				InternalParameters ipp = new InternalParameters (
+					this, new Parameters (parms, null, Location.Null));
+					
+				if (!RegisterMethod (set, ipp, setter_args)) {
+					Error111 (ip);
+					return;
+				}
+			}
+
+			EmitContext ec = new EmitContext (parent, decl_space, Location, null,
+							  null, ModFlags, false);
+
+			if (ip.OptAttributes != null)
+				Attribute.ApplyAttributes (ec, pb, ip, ip.OptAttributes, Location);
+
+			TypeManager.RegisterProperty (pb, get, set);
+			property_builders.Add (pb);
+		}
+
+		//
+		// Populates the events in the interface
+		//
+		void PopulateEvent (TypeContainer parent, DeclSpace decl_space, InterfaceEvent ie)
+		{
+			//
+		        // FIXME: We need to do this after delegates have been
+			// declared or we declare them recursively.
+			//
+			MyEventBuilder eb;
+			MethodBuilder add = null, remove = null;
+			ie.Type = this.ResolveTypeExpr (ie.Type, false, ie.Location);
+			Type event_type = ie.Type.Type;
+
+			if (event_type == null)
+				return;
+
+			if (event_type.IsPointer && !UnsafeOK (this))
+				return;
+
+			Type [] parameters = new Type [1];
+			parameters [0] = event_type;
+
+			eb = new MyEventBuilder (TypeBuilder, ie.Name,
+						 EventAttributes.None, event_type);
+
+			//
+			// Now define the accessors
+			//
+			string add_name = "add_" + ie.Name;
+			
+			add = TypeBuilder.DefineMethod (
+				add_name, property_attributes, null, parameters);
+			add.DefineParameter (1, ParameterAttributes.None, "value");
+			eb.SetAddOnMethod (add);
+
+			string remove_name = "remove_" + ie.Name;
+			remove = TypeBuilder.DefineMethod (
+				remove_name, property_attributes, null, parameters);
+			remove.DefineParameter (1, ParameterAttributes.None, "value");
+			eb.SetRemoveOnMethod (remove);
+
+			Parameter [] parms = new Parameter [1];
+			parms [0] = new Parameter (ie.Type, "value", Parameter.Modifier.NONE, null);
+			InternalParameters ip = new InternalParameters (
+				this, new Parameters (parms, null, Location.Null));
+
+			if (!RegisterMethod (add, ip, parameters)) {
+				Error111 (ie);
+				return;
+			}
+			
+			if (!RegisterMethod (remove, ip, parameters)) {
+				Error111 (ie);
+				return;
+			}
+
+			EmitContext ec = new EmitContext (parent, decl_space, Location, null,
+							  null, ModFlags, false);
+
+
+			if (ie.OptAttributes != null)
+				Attribute.ApplyAttributes (ec, eb, ie, ie.OptAttributes, Location);
+
+			TypeManager.RegisterEvent (eb, add, remove);
+			event_builders.Add (eb);
+		}
+
+		//
+		// Populates the indexers in the interface
+		//
+		void PopulateIndexer (TypeContainer parent, DeclSpace decl_space, InterfaceIndexer ii)
+		{
+			PropertyBuilder pb;
+			ii.Type = this.ResolveTypeExpr (ii.Type, false, ii.Location);
+			Type prop_type = ii.Type.Type;
+			Type [] arg_types = ii.ParameterTypes (this);
+			Type [] value_arg_types;
+
+			if (prop_type == null)
+				return;
+
+			if (prop_type.IsPointer && !UnsafeOK (this))
+				return;
+			
+			//
+			// Sets up the extra invisible `value' argument for setters.
+			// 
+			if (arg_types != null){
+				int count = arg_types.Length;
+				value_arg_types = new Type [count + 1];
+
+				arg_types.CopyTo (value_arg_types, 0);
+				value_arg_types [count] = prop_type;
+
+				foreach (Type t in arg_types){
+					if (t.IsPointer && !UnsafeOK (this))
+						return;
+				}
+			} else {
+				value_arg_types = new Type [1];
+
+				value_arg_types [1] = prop_type;
+			}
+
+			EmitContext ec = new EmitContext (parent, decl_space, Location, null,
+							  null, ModFlags, false);
+
+			IndexerName = Attribute.ScanForIndexerName (ec, ii.OptAttributes);
+			if (IndexerName == null)
+				IndexerName = "Item";
+			
+			pb = TypeBuilder.DefineProperty (
+				IndexerName, PropertyAttributes.None,
+				prop_type, arg_types);
+			
+			MethodBuilder set_item = null, get_item = null;
+			if (ii.HasGet){
+				Parameter [] p = ii.Parameters.FixedParameters;
+				
+				get_item = TypeBuilder.DefineMethod (
+					"get_" + IndexerName, property_attributes,
+					prop_type, arg_types);
+				pb.SetGetMethod (get_item);
+				//
+				// HACK because System.Reflection.Emit is lame
+				//
+				InternalParameters ip = new InternalParameters (
+					arg_types, ii.Parameters);
+				
+				if (!RegisterMethod (get_item, ip, arg_types)) {
+					Error111 (ii);
+					return;
+				}
+
+				if (p != null){
+					for (int i = 0; i < p.Length; i++)
+						get_item.DefineParameter (
+							i + 1,
+							p [i].Attributes, p [i].Name);
+				}
+			}
+
+			if (ii.HasSet){
+				Parameter [] p = ii.Parameters.FixedParameters;
+				Parameter [] pv;
+				int i = 0;
+				
+				pv = new Parameter [p.Length + 1];
+				p.CopyTo (pv, 0);
+				pv [p.Length] = new Parameter (ii.Type, "value", Parameter.Modifier.NONE, null);
+				Parameters value_params = new Parameters (pv, null, Location.Null);
+				value_params.GetParameterInfo (decl_space);
+				
+				set_item = TypeBuilder.DefineMethod (
+					"set_" + IndexerName, property_attributes,
+					TypeManager.void_type, value_arg_types);
+				pb.SetSetMethod (set_item);
+				//
+				// HACK because System.Reflection.Emit is lame
+				//
+				InternalParameters ip = new InternalParameters (
+					value_arg_types, value_params);
+				if (!RegisterMethod (set_item, ip, value_arg_types)) {
+					Error111 (ii);
+					return;
+				}
+
+				if (p != null){
+					for (; i < p.Length; i++)
+						set_item.DefineParameter (
+							i + 1,
+							p [i].Attributes, p [i].Name);
+				}
+				
+				set_item.DefineParameter (i + 1, ParameterAttributes.None, "value");
+			}
+
+			if (ii.OptAttributes != null)
+				Attribute.ApplyAttributes (ec, pb, ii, ii.OptAttributes, Location);
+
+			property_builders.Add (pb);
+		}
+
+		/// <summary>
+		///   Performs the semantic analysis for all the interface members
+		///   that were declared
+		/// </summary>
+		bool SemanticAnalysis ()
+		{
+			Hashtable methods = new Hashtable ();
+
+			
+			if (defined_method != null){
+				foreach (InterfaceMethod im in defined_method){
+					string sig = im.GetSignature (this);
+					
+					//
+					// If there was an undefined Type on the signatures
+					// 
+					if (sig == null)
+						continue;
+					
+					if (methods [sig] != null){
+						Error111 (im);
+						return false;
+					}
+				}
+			}
+
+			//
+			// FIXME: Here I should check i
+			// 
+			return true;
+		}
+
+		Type GetInterfaceTypeByName (string name)
+		{
+			Type t = FindType (name);
+
+			if (t == null) {
+				Report.Error (246, Location, "The type or namespace `" + name +
+					      "' could not be found");
+				return null;
+			}
+			
+			if (t.IsInterface)
+				return t;
+				
+			string cause;
+			
+			if (t.IsValueType)
+				cause = "is a struct";
+			else if (t.IsClass) 
+				cause = "is a class";
+			else
+				cause = "Should not happen.";
+			
+			Report.Error (527, Location, "`"+name+"' " + cause +
+				      ", need an interface instead");
+			
+			return null;
+		}
+		
+		//
+		// Returns the list of interfaces that this interface implements
+		// Or null if it does not implement any interface.
+		//
+		// Sets the error boolean accoringly.
+		//
+		Type [] GetInterfaceBases (out bool error)
+		{
+			Type [] tbases;
+			int i;
+
+			error = false;
+			if (Bases == null)
+				return null;
+			
+			tbases = new Type [Bases.Count];
+			i = 0;
+
+			foreach (string name in Bases){
+				Type t;
+
+				t = GetInterfaceTypeByName (name);
+				if (t == null){
+					error = true;
+					return null;
+				}
+
+				if (!Parent.AsAccessible (t, ModFlags))
+					Report.Error (61, Location,
+						      "Inconsistent accessibility: base interface `" +
+						      TypeManager.CSharpName (t) + "' is less " +
+						      "accessible than interface `" +
+						      Name + "'");
+
+				tbases [i++] = t;
+			}
+			
+			return TypeManager.ExpandInterfaces (tbases);
+		}
+		
+		//
+		// <summary>
+		//  Defines the Interface in the appropriate ModuleBuilder or TypeBuilder
+		// </summary>
+		//
+		// TODO:
+		//   Rework the way we recurse, because for recursive
+		//   definitions of interfaces (A:B and B:A) we report the
+		//   error twice, rather than once.  
+		
+		public override TypeBuilder DefineType ()
+		{
+			Type [] ifaces;
+			bool error;
+
+			if (TypeBuilder != null)
+				return TypeBuilder;
+			
+			if (InTransit)
+				return null;
+			
+			InTransit = true;
+			
+			ifaces = GetInterfaceBases (out error);
+
+			if (error)
+				return null;
+
+			if (IsTopLevel) {
+				ModuleBuilder builder = CodeGen.ModuleBuilder;
+
+				TypeBuilder = builder.DefineType (
+					Name,
+					InterfaceAttr,
+					(Type)null,   // Parent Type
+					ifaces);
+				RootContext.RegisterOrder (this);
+			} else {
+				TypeBuilder builder = Parent.TypeBuilder;
+
+				TypeBuilder = builder.DefineNestedType (
+					Basename,
+					InterfaceAttr,
+					(Type) null, //parent type
+					ifaces);
+
+				TypeContainer tc = TypeManager.LookupTypeContainer (builder);
+				tc.RegisterOrder (this);
+			}
+
+			TypeManager.AddUserInterface (Name, TypeBuilder, this, ifaces);
+			InTransit = false;
+			
+			return TypeBuilder;
+		}
+
+		//
+		// Defines the indexers, and also verifies that the IndexerNameAttribute in the
+		// interface is consistent.  Either it is `Item' or it is the name defined by all the
+		// indexers with the `IndexerName' attribute.
+		//
+		// Turns out that the IndexerNameAttribute is applied to each indexer,
+		// but it is never emitted, instead a DefaultName attribute is attached
+		// to the interface
+		//
+		void DefineIndexers (TypeContainer parent)
+		{
+			string interface_indexer_name = null;
+
+			foreach (InterfaceIndexer ii in defined_indexer){
+
+				PopulateIndexer (parent, this, ii);
+
+				if (interface_indexer_name == null){
+					interface_indexer_name = IndexerName;
+					continue;
+				}
+				
+				if (IndexerName == interface_indexer_name)
+					continue;
+				
+				Report.Error (
+					668, "Two indexers have different names, " +
+					" you should use the same name for all your indexers");
+			}
+			if (interface_indexer_name == null)
+				interface_indexer_name = "Item";
+			IndexerName = interface_indexer_name;
+		}
+		
+		/// <summary>
+		///   Performs semantic analysis, and then generates the IL interfaces
+		/// </summary>
+		public override bool Define (TypeContainer parent)
+		{
+			if (!SemanticAnalysis ())
+				return false;
+
+			if (defined_method != null){
+				foreach (InterfaceMethod im in defined_method)
+					PopulateMethod (parent, this, im);
+			}
+
+			if (defined_properties != null){
+				foreach (InterfaceProperty ip in defined_properties)
+					PopulateProperty (parent, this, ip);
+			}
+
+			if (defined_events != null)
+				foreach (InterfaceEvent ie in defined_events)
+					PopulateEvent (parent, this, ie);
+
+			if (defined_indexer != null) {
+				DefineIndexers (parent);
+
+				CustomAttributeBuilder cb = EmitDefaultMemberAttr (
+					parent, IndexerName, ModFlags, Location);
+				if (cb != null)
+					TypeBuilder.SetCustomAttribute (cb);
+ 			}
+			
+			return true;
+		}
+
+		public static CustomAttributeBuilder EmitDefaultMemberAttr (TypeContainer parent,
+									    string name,
+									    int flags,
+									    Location loc)
+		{
+			EmitContext ec = new EmitContext (parent, loc, null, null, flags);
+
+			Expression ml = Expression.MemberLookup (ec, TypeManager.default_member_type,
+								 ".ctor", MemberTypes.Constructor,
+								 BindingFlags.Public | BindingFlags.Instance,
+								 Location.Null);
+			
+			if (!(ml is MethodGroupExpr)) {
+				Console.WriteLine ("Internal error !!!!");
+				return null;
+			}
+			
+			MethodGroupExpr mg = (MethodGroupExpr) ml;
+
+			MethodBase constructor = mg.Methods [0];
+
+			string [] vals = { name };
+
+			CustomAttributeBuilder cb = null;
+			try {
+				cb = new CustomAttributeBuilder ((ConstructorInfo) constructor, vals);
+			} catch {
+				Report.Warning (-100, "Can not set the indexer default member attribute");
+			}
+
+			return cb;
+		}
+
+	}
+
+	public class InterfaceMemberBase {
+		public readonly string Name;
+		public readonly bool IsNew;
+		public Attributes OptAttributes;
+		
+		public InterfaceMemberBase (string name, bool is_new, Attributes attrs)
+		{
+			Name = name;
+			IsNew = is_new;
+			OptAttributes = attrs;
+		}
+	}
+	
+	public class InterfaceProperty : InterfaceMemberBase {
+		public readonly bool HasSet;
+		public readonly bool HasGet;
+		public readonly Location Location;
+		public Expression Type;
+		
+		public InterfaceProperty (Expression type, string name,
+					  bool is_new, bool has_get, bool has_set,
+					  Attributes attrs, Location loc)
+			: base (name, is_new, attrs)
+		{
+			Type = type;
+			HasGet = has_get;
+			HasSet = has_set;
+			Location = loc;
+		}
+	}
+
+	public class InterfaceEvent : InterfaceMemberBase {
+		public readonly Location Location;
+		public Expression Type;
+		
+		public InterfaceEvent (Expression type, string name, bool is_new, Attributes attrs,
+				       Location loc)
+			: base (name, is_new, attrs)
+		{
+			Type = type;
+			Location = loc;
+		}
+	}
+	
+	public class InterfaceMethod : InterfaceMemberBase {
+		public readonly Expression ReturnType;
+		public readonly Parameters Parameters;
+		public readonly Location Location;
+		
+		public InterfaceMethod (Expression return_type, string name, bool is_new, Parameters args,
+					Attributes attrs, Location l)
+			: base (name, is_new, attrs)
+		{
+			this.ReturnType = return_type;
+			this.Parameters = args;
+			Location = l;
+		}
+
+		/// <summary>
+		///   Returns the signature for this interface method
+		/// </summary>
+		public string GetSignature (DeclSpace ds)
+		{
+			Type ret = ds.ResolveType (ReturnType, false, Location);
+			string args = Parameters.GetSignature (ds);
+
+			if ((ret == null) || (args == null))
+				return null;
+			
+			return (IsNew ? "new-" : "") + ret.FullName + "(" + args + ")";
+		}
+
+		public Type [] ParameterTypes (DeclSpace ds)
+		{
+			return Parameters.GetParameterInfo (ds);
+		}
+	}
+
+	public class InterfaceIndexer : InterfaceMemberBase {
+		public readonly bool HasGet, HasSet;
+		public readonly Parameters Parameters;
+		public readonly Location Location;
+		public Expression Type;
+		
+		public InterfaceIndexer (Expression type, Parameters args, bool do_get, bool do_set,
+					 bool is_new, Attributes attrs, Location loc)
+			: base ("", is_new, attrs)
+		{
+			Type = type;
+			Parameters = args;
+			HasGet = do_get;
+			HasSet = do_set;
+			Location = loc;
+		}
+
+		public Type [] ParameterTypes (DeclSpace ds)
+		{
+			return Parameters.GetParameterInfo (ds);
+		}
+	}
+}
diff --git a/mcs/mbas/literal.cs b/mcs/mbas/literal.cs
new file mode 100644
index 00000000000..a307030db6a
--- /dev/null
+++ b/mcs/mbas/literal.cs
@@ -0,0 +1,187 @@
+//
+// literal.cs: Literal representation for the IL tree.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+//
+// Notice that during parsing we create objects of type Literal, but the
+// types are not loaded (thats why the Resolve method has to assign the
+// type at that point).
+//
+// Literals differ from the constants in that we know we encountered them
+// as a literal in the source code (and some extra rules apply there) and
+// they have to be resolved (since during parsing we have not loaded the
+// types yet) while constants are created only after types have been loaded
+// and are fully resolved when born.
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace Mono.CSharp {
+
+	public class NullLiteral : Constant {
+		public static readonly NullLiteral Null;
+		
+		static NullLiteral ()
+		{
+			Null = new NullLiteral ();
+		}
+			
+		public NullLiteral ()
+		{
+			if (Null != null)
+				throw new Exception ("More than one null has been created!");
+			eclass = ExprClass.Value;
+		}
+		
+		override public string AsString ()
+		{
+			return "null";
+		}
+
+		public override object GetValue ()
+		{
+			return null;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.object_type;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldnull);
+		}
+	}
+
+	public class BoolLiteral : BoolConstant {
+		public BoolLiteral (bool val) : base (val)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.bool_type;
+			return this;
+		}
+	}
+
+	public class CharLiteral : CharConstant {
+		public CharLiteral (char c) : base (c)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.char_type;
+			return this;
+		}
+	}
+
+	public class IntLiteral : IntConstant {
+		public IntLiteral (int l) : base (l)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.int32_type;
+			return this;
+		}
+	}
+
+	public class UIntLiteral : UIntConstant {
+		public UIntLiteral (uint l) : base (l)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.uint32_type;
+			return this;
+		}
+	}
+	
+	public class LongLiteral : LongConstant {
+		public LongLiteral (long l) : base (l)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.int64_type;
+
+			return this;
+		}
+	}
+
+	public class ULongLiteral : ULongConstant {
+		public ULongLiteral (ulong l) : base (l)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.uint64_type;
+			return this;
+		}
+	}
+	
+	public class FloatLiteral : FloatConstant {
+		
+		public FloatLiteral (float f) : base (f)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.float_type;
+			return this;
+		}
+	}
+
+	public class DoubleLiteral : DoubleConstant {
+		public DoubleLiteral (double d) : base (d)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.double_type;
+
+			return this;
+		}
+	}
+
+	public class DecimalLiteral : DecimalConstant {
+		public DecimalLiteral (decimal d) : base (d)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.decimal_type;
+			return this;
+		}
+	}
+
+	public class StringLiteral : StringConstant {
+		public StringLiteral (string s) : base (s)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.string_type;
+
+			return this;
+		}
+	}
+}
diff --git a/mcs/mbas/location.cs b/mcs/mbas/location.cs
new file mode 100644
index 00000000000..1b32f32de6e
--- /dev/null
+++ b/mcs/mbas/location.cs
@@ -0,0 +1,151 @@
+//
+// location.cs: Keeps track of the location of source code entity
+//
+// Author:
+//   Miguel de Icaza
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics.SymbolStore;
+
+namespace Mono.CSharp {
+	/// <summary>
+	///   Keeps track of the location in the program
+	/// </summary>
+	///
+	/// <remarks>
+	///   This uses a compact representation and a couple of auxiliary
+	///   structures to keep track of tokens to (file,line) mappings.
+	///
+	///   We could probably also keep track of columns by storing those
+	///   in 8 bits (and say, map anything after char 255 to be `255+').
+	/// </remarks>
+	public struct Location {
+		public int token; 
+
+		static Hashtable map;
+		static Hashtable sym_docs;
+		static ArrayList list;
+		static int global_count;
+		static int module_base;
+
+		public readonly static Location Null;
+		
+		static Location ()
+		{
+			map = new Hashtable ();
+			list = new ArrayList ();
+			sym_docs = new Hashtable ();
+			global_count = 0;
+			module_base = 0;
+			Null.token = -1;
+		}
+
+		static public void Push (string name)
+		{
+			map.Remove (global_count);
+			map.Add (global_count, name);
+			list.Add (global_count);
+			module_base = global_count;
+		}
+		
+		public Location (int row)
+		{
+			if (row < 0)
+				token = -1;
+			else {
+				token = module_base + row;
+				if (global_count < token)
+					global_count = token;
+			}
+		}
+
+		public override string ToString ()
+		{
+			return Name + ": (" + Row + ")";
+		}
+		
+		/// <summary>
+		///   Whether the Location is Null
+		/// </summary>
+		static public bool IsNull (Location l)
+		{
+			return l.token == -1;
+		}
+
+		public string Name {
+			get {
+				int best = 0;
+				
+				if (token < 0)
+					return "Internal";
+
+				foreach (int b in list){
+					if (token > b)
+						best = b;
+				}
+				return (string) map [best];
+			}
+		}
+
+		public int Row {
+			get {
+				int best = 0;
+				
+				if (token < 0)
+					return 1;
+				
+				foreach (int b in list){
+					if (token > b)
+						best = b;
+				}
+				return token - best;
+			}
+		}
+
+		// The ISymbolDocumentWriter interface is used by the symbol writer to
+		// describe a single source file - for each source file there's exactly
+		// one corresponding ISymbolDocumentWriter instance.
+		//
+		// This class has an internal hash table mapping source document names
+		// to such ISymbolDocumentWriter instances - so there's exactly one
+		// instance per document.
+		//
+		// This property returns the ISymbolDocumentWriter instance which belongs
+		// to the location's source file.
+		//
+		// If we don't have a symbol writer, this property is always null.
+		public ISymbolDocumentWriter SymbolDocument {
+			get {
+				ISymbolWriter sw = CodeGen.SymbolWriter;
+				ISymbolDocumentWriter doc;
+
+				if (token < 0)
+					return null;
+
+				// If we don't have a symbol writer, return null.
+				if (sw == null)
+					return null;
+
+				if (sym_docs.Contains (Name))
+					// If we already created an ISymbolDocumentWriter
+					// instance for this document, return it.
+					doc = (ISymbolDocumentWriter) sym_docs [Name];
+				else {
+					// Create a new ISymbolDocumentWriter instance and
+					// store it in the hash table.
+					doc = sw.DefineDocument (Name, SymLanguageType.CSharp,
+								 SymLanguageVendor.Microsoft,
+								 SymDocumentType.Text);
+
+					sym_docs.Add (Name, doc);
+				}
+
+				return doc;
+			}
+		}
+	}
+}
diff --git a/mcs/mbas/makefile b/mcs/mbas/makefile
new file mode 100644
index 00000000000..3ef9724a18c
--- /dev/null
+++ b/mcs/mbas/makefile
@@ -0,0 +1,65 @@
+CSC=csc.exe
+CSCFLAGS=/nologo /debug+ /debug:full /optimize /target:exe /r:System.dll /r:Mono.GetOptions.dll /out:mbas.exe 
+
+VERSION=0.13
+
+COMPILER_SOURCES = \
+      AssemblyInfo.cs   \
+	assign.cs		\
+	attribute.cs		\
+	cfold.cs		\
+	class.cs 		\
+	codegen.cs		\
+	const.cs		\
+	constant.cs		\
+	decl.cs			\
+	delegate.cs		\
+	driver.cs 	 	\
+	enum.cs			\
+	ecore.cs		\
+	expression.cs 		\
+	genericparser.cs	\
+	interface.cs		\
+	literal.cs		\
+	location.cs 		\
+	mb-parser.cs 		\
+	mb-tokenizer.cs 	\
+	modifiers.cs 		\
+	module.cs		\
+	namespace.cs		\
+	parameter.cs		\
+	pending.cs		\
+	report.cs		\
+	rootcontext.cs		\
+	statement.cs		\
+	statementCollection.cs	\
+	support.cs		\
+	tree.cs 		\
+	typemanager.cs
+
+all: mbas.exe
+
+parser: mb-parser.cs
+
+test: mbas.exe
+	./mbas testmbas/WriteOk.vb
+
+mbas.exe: $(COMPILER_SOURCES)
+	$(CSC) $(CSCFLAGS) $(COMPILER_SOURCES)
+
+docs: $(COMPILER_SOURCES)
+	$(CSC) $(CSCFLAGS) /doc:docs.xml /nowarn:1591 $(COMPILER_SOURCES)
+
+windows: all
+
+linux: all
+
+opt:
+	$(CSC) /nologo /optimize+ /r:System.dll /target:exe /out:mbas.exe $(COMPILER_SOURCES)
+
+clean:
+	rm -f mbas.exe y.output mbas.pdb *~ .*~ mb-parser.cs mbas.log response
+
+mb-parser.cs: mb-parser.jay
+	../jay/jay -ctv < ../jay/skeleton.cs mb-parser.jay > mb-parser.cs
+
diff --git a/mcs/mbas/mb-parser.jay b/mcs/mbas/mb-parser.jay
new file mode 100644
index 00000000000..bc4f3a16400
--- /dev/null
+++ b/mcs/mbas/mb-parser.jay
@@ -0,0 +1,515 @@
+%{
+//
+// Mono.MonoBASIC.Parser.cs (from .jay): The Parser for the MonoBASIC compiler
+//
+// Author: A Rafael D Teixeira (rafaelteixeirabr@hotmail.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// Copyright (C) 2001 A Rafael D Teixeira
+//
+// TODO:
+//	Nearly everything
+//
+
+namespace Mono.MonoBASIC
+{
+	using System.Text;
+	using System;
+	using System.Collections;
+	using Mono.Languages;
+	using Mono.CSharp;
+
+	/// <summary>
+	///    The MonoBASIC Parser
+	/// </summary>
+	public class Parser : GenericParser 
+	{
+	
+/*
+		/// <summary>
+		///   Current block is used to add statements as we find
+		///   them.  
+		/// </summary>
+		Block      current_block;
+
+		/// <summary>
+		///   Current interface is used by the various declaration
+		///   productions in the interface declaration to "add"
+		///   the interfaces as we find them.
+		/// </summary>
+		Interface  current_interface;
+
+		/// <summary>
+		///   This is used by the unary_expression code to resolve
+		///   a name against a parameter.  
+		/// </summary>
+		Parameters current_local_parameters;
+
+		/// <summary>
+		///   Using during property parsing to describe the implicit
+		///   value parameter that is passed to the "set" accessor
+		///   method
+		/// </summary>
+		Parameter [] implicit_value_parameters;
+
+*/
+		bool UseExtendedSyntax; // for ".mbs" files
+
+		public override string[] extensions()
+		{
+			string [] list = { ".vb", ".mbs" };
+			return list;
+		}
+
+%}
+
+%token EOF
+%token NONE   /* This token is never returned by our lexer */
+%token ERROR  // This is used not by the parser, but by the tokenizer.
+	      // do not remove.
+
+/*
+ *These are the MonoBASIC keywords
+ */
+%token ADDHANDLER
+%token ADDRESSOF
+%token ALIAS
+%token AND
+%token ANDALSO
+%token ANSI
+%token AS
+%token ASSEMBLY
+%token AUTO
+%token BOOLEAN	
+%token BYREF
+%token BYTE
+%token BYVAL	
+%token CALL
+%token CASE	
+%token CATCH	
+%token CBOOL
+%token CBYTE
+%token CCHAR	
+%token CDATE
+%token CDEC
+%token CDBL
+%token CHAR	
+%token CINT
+%token CLASS
+%token CLNG
+%token COBJ
+//%token COMPARE	
+%token CONST	
+%token CSHORT	
+%token CSNG
+%token CSTR
+%token CTYPE
+%token DATE
+%token DECIMAL	
+%token DECLARE
+%token DEFAULT	
+%token DELEGATE	
+%token DESCRIPTION // MonoBASIC extension
+%token DIM
+%token DO	
+%token DOUBLE	
+%token EACH	
+%token ELSE
+%token ELSEIF
+%token END	
+%token ENUM	
+%token EOL
+%token ERASE
+%token ERROR
+%token EVENT
+%token EXIT	
+//%token EXPLICIT	
+%token FALSE	
+%token FINALLY	
+%token FOR	
+%token FRIEND
+%token FUNCTION
+%token GET
+%token GETTYPE
+%token GOTO	
+%token HANDLES
+%token IF	
+%token IMPLEMENTS
+%token IMPORTS	
+%token IN	
+%token INHERITS
+%token INTEGER	
+%token INTERFACE
+%token IS
+%token LET
+%token LIB	
+%token LIKE	
+%token LONG	
+%token LOOP
+%token ME
+%token MOD
+%token MODULE
+%token MUSTINHERIT	
+%token MUSTOVERRIDE
+%token MYBASE
+%token MYCLASS
+%token NAMESPACE
+%token NEW
+%token NEXT	
+%token NOT
+%token NOTHING
+%token NOTINHERITABLE
+%token NOTOVERRIDABLE
+%token OBJECT	
+%token ON
+%token OPTION	
+%token OPTIONAL	
+%token OR
+%token ORELSE
+%token OVERLOADS
+%token OVERRIDABLE	
+%token OVERRIDES	
+%token PARAMETER // MonoBASIC extension
+%token PARAM_ARRAY
+%token PRESERVE
+%token PRIVATE	
+%token PROPERTY
+%token PROTECTED
+%token PUBLIC
+%token RAISEEVENT
+%token READONLY	
+%token REDIM
+%token REM
+%token REMOVEHANDLER
+%token RESUME	
+%token RETURN	
+%token SELECT
+%token SET
+%token SHADOWS
+%token SHARED
+%token SHORT	
+%token SINGLE
+%token SIZEOF	
+%token STATIC	
+%token STEP
+%token STOP
+%token STRING	
+%token STRUCTURE	
+%token SUB
+%token SUMMARY // MonoBASIC extension
+%token SYNCLOCK
+%token THEN
+%token THROW
+%token TO
+%token TRUE	
+%token TRY	
+%token TYPEOF	
+%token UNICODE
+%token UNTIL
+%token VARIANT	
+%token WHEN	
+%token WHILE	
+%token WITH
+%token WITHEVENTS
+%token WRITEONLY
+%token XOR
+
+/* MonoBASIC single character operators/punctuation. */
+%token OPEN_BRACKET  "["
+%token CLOSE_BRACKET "]"
+%token OPEN_PARENS   "("
+%token CLOSE_PARENS  ")"
+%token DOT           "."
+%token COMMA         ","
+%token COLON         ":"
+
+%token PLUS           "+"
+%token MINUS          "-"
+%token ASSIGN         "="
+%token OP_LT          "<"
+%token OP_GT          ">"
+%token STAR           "*"
+%token PERCENT        "%"
+%token DIV            "/"
+%token OP_EXP         "^"
+%token INTERR         "?"
+%token OP_IDIV        "\\"
+%token OP_CONCAT      "&"
+
+/* MonoBASIC multi-character operators. */
+%token OP_LE                  "<="
+%token OP_GE                  ">="
+%token OP_EQ                  "=="
+%token OP_NE                  "<>"
+%token OP_AND                 //"and"
+%token OP_OR                  //"or"
+%token OP_XOR                 //"xor"
+%token OP_MODULUS             //"mod"
+%token OP_MULT_ASSIGN         "*="
+%token OP_DIV_ASSIGN          "/="
+%token OP_IDIV_ASSIGN         "\\="
+%token OP_ADD_ASSIGN          "+="
+%token OP_SUB_ASSIGN          "-="
+%token OP_CONCAT_ASSIGN       "&="
+%token OP_EXP_ASSIGN          "^="
+
+/* Numbers */
+%token LITERAL_INTEGER           "int literal"
+%token LITERAL_SINGLE            "float literal"
+%token LITERAL_DOUBLE            "double literal"
+%token LITERAL_DECIMAL           "decimal literal"
+%token LITERAL_CHARACTER         "character literal"
+%token LITERAL_STRING            "string literal"
+
+%token IDENTIFIER
+
+/* Add precedence rules to solve dangling else s/r conflict */
+%nonassoc LOWPREC
+%nonassoc IF
+%nonassoc ELSE
+%right ASSIGN
+%left OP_OR
+%left OP_AND
+%left BITWISE_OR
+%left BITWISE_AND
+%left OP_SHIFT_LEFT OP_SHIFT_RIGHT
+%left PLUS MINUS
+%left STAR DIV PERCENT
+%right BITWISE_NOT CARRET UMINUS
+%nonassoc OP_INC OP_DEC
+%left OPEN_PARENS
+%left OPEN_BRACKET OPEN_BRACE
+%left DOT
+%nonassoc HIGHPREC
+
+%start compilation_unit
+%%
+
+compilation_unit
+	: opt_imports_directives 
+	  opt_attributes
+	  opt_declarations 
+	  EOF
+	  {
+		$$ = $3;
+	  }
+	;
+	
+opt_declarations
+	: /* empty */
+	| declarations
+	;
+
+declarations
+	: declaration
+	| declarations declaration
+	;
+	
+declaration
+	: namespace_declaration
+	| type_declaration
+	  {
+		string name = "";
+		int mod_flags;
+
+		if ($1 is Class){
+			Class c = (Class) $1;
+			mod_flags = c.ModFlags;
+			name = c.Name;
+		} else if ($1 is Struct){
+			Struct s = (Struct) $1;
+			mod_flags = s.ModFlags;
+			name = s.Name;
+		} else
+			break;
+
+		if ((mod_flags & (Modifiers.PRIVATE|Modifiers.PROTECTED)) != 0){
+			Report.Error (
+				1527, lexer.Location, 
+				"Namespace elements cannot be explicitly " +
+			        "declared private or protected in '" + name + "'");
+		}
+	  }
+	;
+
+qualified_identifier
+	: IDENTIFIER
+	| qualified_identifier DOT IDENTIFIER 
+	  { 
+	    $$ = (($1).ToString ()) + "." + ($3.ToString ()); 
+	  }
+	;
+opt_imports_directives
+	: /* empty */
+	| imports_directives
+	;
+
+imports_directives
+	: imports_directive 
+	| imports_directives imports_directive 
+	;
+
+imports_directive
+	: /* imports_alias_directive
+	| */ imports_namespace_directive
+	;
+
+imports_namespace_directive
+	: IMPORTS qualified_identifier EOL 
+	  {
+		current_namespace.Using ((string) $2, lexer.Location);
+	  }
+	;
+
+opt_attributes
+	: /* empty */
+	;
+
+namespace_declaration
+	: NAMESPACE qualified_identifier EOL
+	  {
+		current_namespace = RootContext.Tree.RecordNamespace(current_namespace, name, (string)$2);
+	  } 
+	  opt_imports_directives
+	  opt_declarations
+	  END NAMESPACE EOL
+	  { 
+		current_namespace = current_namespace.Parent;
+	  }
+	;
+
+type_declaration
+	: class_declaration
+	| module_declaration
+//	| struct_declaration		
+//	| interface_declaration		
+//	| enum_declaration		
+//	| delegate_declaration
+	;
+
+class_declaration
+	: /* opt_attributes opt_modifiers */
+	  CLASS IDENTIFIER /* opt_class_interfaces */ EOL
+	  { 
+	  }
+	  opt_class_member_declarations
+	  END CLASS EOL
+	  {
+	  }
+	;
+
+opt_module_modifiers
+	: /* empty */	{ $$ = (int) 0; }
+	| PUBLIC		{ $$ = Modifiers.PUBLIC; }
+	| FRIEND		{ $$ = Modifiers.INTERNAL; }
+	;
+
+module_declaration
+	: opt_attributes opt_module_modifiers
+	  MODULE IDENTIFIER EOL
+	  { 
+		Module new_module;
+		string name;
+
+		name = MakeName((string) $4);
+		new_module = new Module(current_container, 
+								name, 
+								(int) $2, 
+								(Attributes) $1,
+								lexer.Location);
+		current_container = new_module;
+		current_container.Namespace = current_namespace;
+		RootContext.Tree.RecordDecl(name, new_module);
+	  }
+	  opt_class_member_declarations
+	  END MODULE EOL
+	  {
+		Module new_module = (Module)current_container;
+
+		current_container = current_container.Parent;
+		CheckDef (current_container.AddClass(new_module), new_module.Name, new_module.Location);
+
+		$$ = new_module;
+	  }
+	;
+
+opt_class_member_declarations
+	: /* empty */
+	| class_member_declarations
+	;
+
+class_member_declarations
+	: class_member_declaration
+	| class_member_declarations class_member_declaration
+	;
+
+class_member_declaration
+	: /* type_declaration
+	| */ sub_declaration
+	;
+
+sub_declaration
+	: SUB qualified_identifier OPEN_PARENS opt_formal_parameters CLOSE_PARENS EOL
+	  opt_statements
+	  END SUB EOL
+	;
+
+opt_statements
+	: /* empty */
+	| qualified_identifier OPEN_PARENS opt_actual_parameters CLOSE_PARENS EOL
+	;
+
+opt_formal_parameters 
+	: /* empty */
+	| qualified_identifier AS qualified_identifier
+	;
+
+opt_actual_parameters 
+	: /* empty */
+	| qualified_identifier
+	| LITERAL_STRING
+	;
+
+%%
+
+
+Tokenizer lexer;
+
+public Tokenizer Lexer {
+	get {
+		return lexer;
+	}
+}		   
+
+public override int parse ()
+{
+	current_namespace = new Namespace (null, "");
+	current_container = RootContext.Tree.Types;
+	current_container.Namespace = current_namespace;
+
+	UseExtendedSyntax = name.EndsWith(".mbs");
+
+	lexer = new Tokenizer (input, name, defines);
+	StringBuilder value = new StringBuilder ();
+
+	try 
+	{
+		if (yacc_verbose_flag)
+			yyparse (lexer, new yydebug.yyDebugSimple ());
+		else
+			yyparse (lexer);
+	} 
+	catch (Exception e)
+	{
+		Console.WriteLine (lexer.location + "  : Parsing error ");
+		Console.WriteLine (e);
+	}
+	
+	return Report.Errors;
+}
+
+/* end end end */
+}
+
+
diff --git a/mcs/mbas/mb-tokenizer.cs b/mcs/mbas/mb-tokenizer.cs
new file mode 100644
index 00000000000..99bfd15f55f
--- /dev/null
+++ b/mcs/mbas/mb-tokenizer.cs
@@ -0,0 +1,864 @@
+//

+// Mono.MonoBASIC.Tokenizer.cs: The Tokenizer for the MonoBASIC compiler

+//

+// Author: A Rafael D Teixeira (rafaelteixeirabr@hotmail.com)

+//	   

+// Based on cs-tokenizer.cs by Miguel de Icaza (miguel@gnu.org)

+//

+// Licensed under the terms of the GNU GPL

+//

+// Copyright (C) 2001 A Rafael D Teixeira

+//

+

+namespace Mono.MonoBASIC

+{

+	using System;

+	using System.Text;

+	using System.Collections;

+	using System.IO;

+	using System.Globalization;

+	using Mono.Languages;

+	using Mono.CSharp;

+	

+	/// <summary>

+	///    Tokenizer for MonoBASIC source code. 

+	/// </summary>

+	

+	public class Tokenizer : yyParser.yyInput

+	{

+		TextReader reader;

+		public string ref_name;

+		public int ref_line = 1;

+		public int line = 1;

+		public int col = 1;

+		public int current_token;

+		bool handle_get_set = false;

+

+		public int ExpandedTabsSize = 4; 

+

+		public string location {

+			get {

+				string det;

+

+				if (current_token == Token.ERROR)

+					det = "detail: " + error_details;

+				else

+					det = "";

+				

+				return "Line:     "+line+" Col: "+col + "\n" +

+				       "VirtLine: "+ref_line +

+				       " Token: "+current_token + " " + det;

+			}

+		}

+

+		public bool properties {

+			get {

+				return handle_get_set;

+			}

+

+			set {

+				handle_get_set = value;

+			}

+                }

+		

+		//

+		// Class variables

+		// 

+		static Hashtable keywords;

+		static NumberStyles styles;

+		static NumberFormatInfo csharp_format_info;

+		

+		//

+		// Values for the associated token returned

+		//

+		System.Text.StringBuilder number;

+		int putback_char;

+		Object val;

+		

+		//

+		// Details about the error encoutered by the tokenizer

+		//

+		string error_details;

+		

+		public string error {

+			get {

+				return error_details;

+			}

+		}

+		

+		public int Line {

+			get {

+				return line;

+			}

+		}

+

+		public int Col {

+			get {

+				return col;

+			}

+		}

+		

+		static void initTokens ()

+		{

+			keywords = new Hashtable ();

+

+			keywords.Add ("addhandler", Token.ADDHANDLER);

+			keywords.Add ("addressof", Token.ADDRESSOF);

+			keywords.Add ("alias", Token.ALIAS);

+			keywords.Add ("and", Token.AND);

+			keywords.Add ("andalso", Token.ANDALSO);

+			keywords.Add ("ansi", Token.ANSI);

+			keywords.Add ("as", Token.AS);

+			keywords.Add ("assembly", Token.ASSEMBLY);

+			keywords.Add ("auto", Token.AUTO);

+			keywords.Add ("boolean", Token.BOOLEAN);

+			keywords.Add ("byref", Token.BYREF);

+			keywords.Add ("byte", Token.BYTE);

+			keywords.Add ("byval", Token.BYVAL);

+			keywords.Add ("call", Token.CALL);

+			keywords.Add ("case", Token.CASE);

+			keywords.Add ("catch", Token.CATCH);

+			keywords.Add ("cbool", Token.CBOOL);

+			keywords.Add ("cbyte", Token.CBYTE);

+			keywords.Add ("cchar", Token.CCHAR);

+			keywords.Add ("cdate", Token.CDATE);

+			keywords.Add ("cdec", Token.CDEC);

+			keywords.Add ("cdbl", Token.CDBL);

+			keywords.Add ("char", Token.CHAR);

+			keywords.Add ("cint", Token.CINT);

+			keywords.Add ("class", Token.CLASS);

+			keywords.Add ("clng", Token.CLNG);

+			keywords.Add ("cobj", Token.COBJ);

+			//keywords.Add ("compare", Token.COMPARE);

+			keywords.Add ("const", Token.CONST);

+			keywords.Add ("cshort", Token.CSHORT);

+			keywords.Add ("csng", Token.CSNG);

+			keywords.Add ("cstr", Token.CSTR);

+			keywords.Add ("ctype", Token.CTYPE);

+			keywords.Add ("date", Token.DATE);

+			keywords.Add ("decimal", Token.DECIMAL);

+			keywords.Add ("declare", Token.DECLARE);

+			keywords.Add ("default", Token.DEFAULT);

+			keywords.Add ("delegate", Token.DELEGATE);

+			keywords.Add ("dim", Token.DIM);

+			keywords.Add ("do", Token.DO);

+			keywords.Add ("double", Token.DOUBLE);

+			keywords.Add ("each", Token.EACH);

+			keywords.Add ("else", Token.ELSE);

+			keywords.Add ("elseif", Token.ELSEIF);

+			keywords.Add ("end", Token.END);

+			keywords.Add ("enum", Token.ENUM);

+			keywords.Add ("erase", Token.ERASE);

+			keywords.Add ("error", Token.ERROR);

+			keywords.Add ("event", Token.EVENT);

+			keywords.Add ("exit", Token.EXIT);

+			//keywords.Add ("explicit", Token.EXPLICIT);

+			keywords.Add ("false", Token.FALSE);

+			keywords.Add ("finally", Token.FINALLY);

+			keywords.Add ("for", Token.FOR);

+			keywords.Add ("friend", Token.FRIEND);

+			keywords.Add ("function", Token.FUNCTION);

+			keywords.Add ("get", Token.GET);

+			keywords.Add ("gettype", Token.GETTYPE);

+			keywords.Add ("goto", Token.GOTO);

+			keywords.Add ("handles", Token.HANDLES);

+			keywords.Add ("if", Token.IF);

+			keywords.Add ("implements", Token.IMPLEMENTS);

+			keywords.Add ("imports", Token.IMPORTS);

+			keywords.Add ("in", Token.IN);

+			keywords.Add ("inherits", Token.INHERITS);

+			keywords.Add ("integer", Token.INTEGER);

+			keywords.Add ("interface", Token.INTERFACE);

+			keywords.Add ("is", Token.IS);

+			keywords.Add ("let ", Token.LET );

+			keywords.Add ("lib ", Token.LIB );

+			keywords.Add ("like ", Token.LIKE );

+			keywords.Add ("long", Token.LONG);

+			keywords.Add ("loop", Token.LOOP);

+			keywords.Add ("me", Token.ME);

+			keywords.Add ("mod", Token.MOD);

+			keywords.Add ("module", Token.MODULE);

+			keywords.Add ("mustinherit", Token.MUSTINHERIT);

+			keywords.Add ("mustoverride", Token.MUSTOVERRIDE);

+			keywords.Add ("mybase", Token.MYBASE);

+			keywords.Add ("myclass", Token.MYCLASS);

+			keywords.Add ("namespace", Token.NAMESPACE);

+			keywords.Add ("new", Token.NEW);

+			keywords.Add ("next", Token.NEXT);

+			keywords.Add ("not", Token.NOT);

+			keywords.Add ("nothing", Token.NOTHING);

+			keywords.Add ("notinheritable", Token.NOTINHERITABLE);

+			keywords.Add ("notoverridable", Token.NOTOVERRIDABLE);

+			keywords.Add ("object", Token.OBJECT);

+			keywords.Add ("on", Token.ON);

+			keywords.Add ("option", Token.OPTION);

+			keywords.Add ("optional", Token.OPTIONAL);

+			keywords.Add ("or", Token.OR);

+			keywords.Add ("orelse", Token.ORELSE);

+			keywords.Add ("overloads", Token.OVERLOADS);

+			keywords.Add ("overridable", Token.OVERRIDABLE);

+			keywords.Add ("overrides", Token.OVERRIDES);

+			keywords.Add ("paramarray", Token.PARAM_ARRAY);

+			keywords.Add ("preserve", Token.PRESERVE);

+			keywords.Add ("private", Token.PRIVATE);

+			keywords.Add ("property", Token.PROPERTY);

+			keywords.Add ("protected", Token.PROTECTED);

+			keywords.Add ("public", Token.PUBLIC);

+			keywords.Add ("raiseevent", Token.RAISEEVENT);

+			keywords.Add ("readonly", Token.READONLY);

+			keywords.Add ("redim", Token.REDIM);

+			keywords.Add ("rem", Token.REM);

+			keywords.Add ("removehandler", Token.REMOVEHANDLER);

+			keywords.Add ("resume", Token.RESUME);

+			keywords.Add ("return", Token.RETURN);

+			keywords.Add ("select", Token.SELECT);

+			keywords.Add ("set", Token.SET);

+			keywords.Add ("shadows", Token.SHADOWS);

+			keywords.Add ("shared", Token.SHARED);

+			keywords.Add ("short", Token.SHORT);

+			keywords.Add ("single", Token.SINGLE);

+			keywords.Add ("sizeof", Token.SIZEOF);

+			keywords.Add ("static", Token.STATIC);

+			keywords.Add ("step", Token.STEP);

+			keywords.Add ("stop", Token.STOP);

+			keywords.Add ("string", Token.STRING);

+			keywords.Add ("structure", Token.STRUCTURE);

+			keywords.Add ("sub", Token.SUB);

+			keywords.Add ("synclock", Token.SYNCLOCK);

+			keywords.Add ("then", Token.THEN);

+			keywords.Add ("throw", Token.THROW);

+			keywords.Add ("to", Token.TO);

+			keywords.Add ("true", Token.TRUE);

+			keywords.Add ("try", Token.TRY);

+			keywords.Add ("typeof", Token.TYPEOF);

+			keywords.Add ("unicode", Token.UNICODE);

+			keywords.Add ("until", Token.UNTIL);

+			keywords.Add ("variant", Token.VARIANT);

+			keywords.Add ("when", Token.WHEN);

+			keywords.Add ("while", Token.WHILE);

+			keywords.Add ("with", Token.WITH);

+			keywords.Add ("withevents", Token.WITHEVENTS);

+			keywords.Add ("writeonly", Token.WRITEONLY);

+			keywords.Add ("xor", Token.XOR);

+		}

+

+		//

+		// Class initializer

+		// 

+		static Tokenizer ()

+		{

+			initTokens ();

+			csharp_format_info = new NumberFormatInfo ();

+			csharp_format_info.CurrencyDecimalSeparator = ".";

+			styles = NumberStyles.AllowExponent | NumberStyles.AllowDecimalPoint;

+		}

+

+		bool is_keyword (string name)

+		{

+			bool res;

+

+			res = keywords.Contains(name.ToLower());

+			if ((name == "get" || name == "set") && handle_get_set == false)

+				return false;

+			return res;

+		}

+

+		int getKeyword (string name)

+		{

+			return (int) (keywords [name.ToLower()]);

+		}

+		

+		public Location Location {

+			get {

+				return new Location (ref_line);

+			}

+		}

+		

+		bool is_identifier_start_character (char c)

+		{

+			return Char.IsLetter (c) || c == '_' ;

+		}

+

+		bool is_identifier_part_character (char c)

+		{

+			return (Char.IsLetter (c) || Char.IsDigit (c) || c == '_');

+		}

+

+		int is_punct (char c, ref bool doread)

+		{

+			int idx = "{}[](),:;~+-*/%&|^!=<>?".IndexOf (c);

+			int d;

+			int t;

+

+			doread = false;

+

+			switch (c){

+//			case '[':

+//				return Token.OPEN_BRACKET;

+//			case ']':

+//				return Token.CLOSE_BRACKET;

+			case '(':

+				return Token.OPEN_PARENS;

+			case ')':

+				return Token.CLOSE_PARENS;

+			case ',':

+				return Token.COMMA;

+			case ':':

+				return Token.COLON;

+			case '?':

+				return Token.INTERR;

+			}

+

+			d = peekChar ();

+			if (c == '+'){

+				

+				if (d == '+')

+					t = Token.OP_INC;

+				else if (d == '=')

+					t = Token.OP_ADD_ASSIGN;

+				else

+					return Token.PLUS;

+				doread = true;

+				return t;

+			}

+			if (c == '-'){

+				if (d == '=')

+					t = Token.OP_SUB_ASSIGN;

+				else

+					return Token.MINUS;

+				doread = true;

+				return t;

+			}

+

+			if (c == '='){

+				/*if (d == '='){

+					doread = true;

+					return Token.OP_EQ;

+				}*/

+				return Token.ASSIGN;

+			}

+

+			if (c == '*'){

+				if (d == '='){

+					doread = true;

+					return Token.OP_MULT_ASSIGN;

+				}

+				return Token.STAR;

+			}

+

+			if (c == '/'){

+				if (d == '='){

+					doread = true;

+					return Token.OP_DIV_ASSIGN;

+				}

+				return Token.DIV;

+			}

+

+			if (c == '\\'){

+				if (d == '='){

+					doread = true;

+					return Token.OP_IDIV_ASSIGN;

+				}

+				return Token.OP_IDIV;

+			}

+

+			if (c == '^'){

+				if (d == '='){

+					doread = true;

+					return Token.OP_EXP_ASSIGN;

+				}

+				return Token.OP_EXP;

+			}

+

+			if (c == '<'){

+				if (d == '>')

+				{

+					doread = true;

+					return Token.OP_NE;

+				}

+				if (d == '='){

+					doread = true;

+					return Token.OP_LE;

+				}

+				return Token.OP_LT;

+			}

+

+			if (c == '>'){

+				if (d == '='){

+					doread = true;

+					return Token.OP_GE;

+				}

+				return Token.OP_GT;

+			}

+			return Token.ERROR;

+		}

+

+		bool decimal_digits (int c)

+		{

+			int d;

+			bool seen_digits = false;

+			

+			if (c != -1)

+				number.Append ((char) c);

+			

+			while ((d = peekChar ()) != -1){

+				if (Char.IsDigit ((char)d)){

+					number.Append ((char) d);

+					getChar ();

+					seen_digits = true;

+				} else

+					break;

+			}

+			return seen_digits;

+		}

+

+		void hex_digits (int c)

+		{

+			int d;

+

+			if (c != -1)

+				number.Append ((char) c);

+			while ((d = peekChar ()) != -1){

+				char e = Char.ToUpper ((char) d);

+				

+				if (Char.IsDigit (e) ||

+				    (e >= 'A' && e <= 'F')){

+					number.Append ((char) e);

+					getChar ();

+				} else

+					break;

+			}

+		}

+		

+		int real_type_suffix (int c)

+		{

+			int t;

+			

+			switch (c){

+			case 'F': case 'f':

+				t =  Token.LITERAL_SINGLE;

+				break;

+			case 'D': case 'd':

+				t = Token.LITERAL_DOUBLE;

+				break;

+			case 'M': case 'm':

+				 t= Token.LITERAL_DECIMAL;

+				break;

+			default:

+				return Token.NONE;

+			}

+			getChar ();

+			return t;

+		}

+

+		int integer_type_suffix (int c)

+		{

+			// FIXME: Handle U and L suffixes.

+			// We also need to see in which kind of

+			// Int the thing fits better according to the spec.

+			return Token.LITERAL_INTEGER;

+		}

+		

+		void adjust_int (int t)

+		{

+			val = new System.Int32();

+			val = System.Int32.Parse (number.ToString (), 0);

+		}

+

+		int adjust_real (int t)

+		{

+			string s = number.ToString ();

+

+			Console.WriteLine (s);

+			switch (t){

+			case Token.LITERAL_DECIMAL:

+				val = new System.Decimal ();

+				val = System.Decimal.Parse (

+					s, styles, csharp_format_info);

+				break;

+			case Token.LITERAL_DOUBLE:

+				val = new System.Double ();

+				val = System.Double.Parse (

+					s, styles, csharp_format_info);

+				break;

+			case Token.LITERAL_SINGLE:

+				val = new System.Double ();

+				val = (float) System.Double.Parse (

+					s, styles, csharp_format_info);

+				break;

+

+			case Token.NONE:

+				val = new System.Double ();

+				val = System.Double.Parse (

+					s, styles, csharp_format_info);

+				t = Token.LITERAL_DOUBLE;

+				break;

+			}

+			return t;

+		}

+

+		//

+		// Invoked if we know we have .digits or digits

+		//

+		int is_number (int c)

+		{

+			bool is_real = false;

+			number = new System.Text.StringBuilder ();

+			int type;

+

+			number.Length = 0;

+

+			if (Char.IsDigit ((char)c)){

+				if (c == '0' && peekChar () == 'x' || peekChar () == 'X'){

+					getChar ();

+					hex_digits (-1);

+					val = new System.Int32 ();

+					val = System.Int32.Parse (number.ToString (), NumberStyles.HexNumber);

+					return integer_type_suffix (peekChar ());

+				}

+				decimal_digits (c);

+				c = getChar ();

+			}

+

+			//

+			// We need to handle the case of

+			// "1.1" vs "1.string" (LITERAL_SINGLE vs NUMBER DOT IDENTIFIER)

+			//

+			if (c == '.'){

+				if (decimal_digits ('.')){

+					is_real = true;

+					c = peekChar ();

+				} else {

+					putback ('.');

+					number.Length -= 1;

+					adjust_int (Token.LITERAL_INTEGER);

+					return Token.LITERAL_INTEGER;

+				}

+			}

+			

+			if (c == 'e' || c == 'E'){

+				is_real = true;

+				number.Append ("e");

+				getChar ();

+				

+				c = peekChar ();

+				if (c == '+'){

+					number.Append ((char) c);

+					getChar ();

+					c = peekChar ();

+				} else if (c == '-'){

+					number.Append ((char) c);

+					getChar ();

+					c = peekChar ();

+				}

+				decimal_digits (-1);

+				c = peekChar ();

+			}

+

+			type = real_type_suffix (c);

+			if (type == Token.NONE && !is_real){

+				type = integer_type_suffix (c);

+				adjust_int (type);

+				putback (c);

+				return type;

+			} else

+				is_real = true;

+

+			if (is_real)

+				return adjust_real (type);

+

+			Console.WriteLine ("This should not be reached");

+			throw new Exception ("Is Number should never reach this point");

+		}

+			

+		int escape (int c)

+		{

+			int d;

+			int v;

+

+			d = peekChar ();

+			if (c != '\\')

+				return c;

+			

+			switch (d){

+			case 'a':

+				v = '\a'; break;

+			case 'b':

+				v = '\b'; break;

+			case 'n':

+				v = '\n'; break;

+			case 't':

+				v = '\t'; break;

+			case 'v':

+				v = '\v'; break;

+			case 'r':

+				v = 'c'; break;

+			case '\\':

+				v = '\\'; break;

+			case 'f':

+				v = '\f'; break;

+			case '0':

+				v = 0; break;

+			case '"':

+				v = '"'; break;

+			case '\'':

+				v = '\''; break;

+			default:

+				error_details = "cs1009: Unrecognized escape sequence " + (char)d;

+				return -1;

+			}

+			getChar ();

+			return v;

+		}

+

+		int getChar ()

+		{

+			if (putback_char != -1){

+				int x = putback_char;

+				putback_char = -1;

+

+				return x;

+			}

+			return reader.Read ();

+		}

+

+		int peekChar ()

+		{

+			if (putback_char != -1)

+				return putback_char;

+			return reader.Peek ();

+		}

+

+		void putback (int c)

+		{

+			if (putback_char != -1)

+				throw new Exception ("This should not happen putback on putback");

+			putback_char = c;

+		}

+

+		public bool advance ()

+		{

+			return current_token != Token.EOF ;

+		}

+

+		public Object Value {

+			get {

+				return val;

+			}

+		}

+

+		public Object value ()

+		{

+			return val;

+		}

+

+		private bool IsEOL(int currentChar)

+		{

+			if (currentChar ==  0x0D)

+			{

+				if (peekChar() ==  0x0A) // if it is a CR-LF pair consume LF also

+					getChar();

+

+				return true;

+			}

+			return (currentChar ==  -1 || currentChar ==  0x0A || currentChar ==  0x2028 || currentChar ==  0x2029);

+		}

+

+		private int DropComments()		

+		{

+			int d;

+			while (!IsEOL(d = getChar ()))

+				col++;

+			line++;

+			ref_line++;

+			col = 0;

+

+			return Token.EOL;

+		}	

+			

+		public int token ()

+		{

+			int lastToken = current_token;

+			do

+			{

+				current_token = xtoken ();

+				if (current_token == 0) 

+					return Token.EOF;

+				if (current_token == Token.REM)

+					current_token = DropComments();

+			} while (lastToken == Token.EOL && current_token == Token.EOL);

+

+			return current_token;

+		}

+

+		private string GetIdentifier()

+		{

+			int c = getChar();

+			if (is_identifier_start_character ((char) c))

+				return GetIdentifier(c);

+			else

+				return null;

+		}

+

+		private string GetIdentifier(int c)

+		{

+			System.Text.StringBuilder id = new System.Text.StringBuilder ();

+

+			id.Append ((char) c);

+				

+			while ((c = peekChar ()) != -1) 

+			{

+				if (is_identifier_part_character ((char) c))

+				{

+					id.Append ((char)getChar ());

+					col++;

+				} 

+				else 

+					break;

+			}

+

+			return id.ToString ();

+		}

+

+		public int xtoken ()

+		{

+			int t;

+			bool doread = false;

+			int c;

+

+			val = null;

+			for (;(c = getChar ()) != -1; col++) {

+			

+				// Handle line comments.

+				if (c == '\'')

+					return Token.REM;

+

+				// Handle EOL.

+				if (IsEOL(c))

+				{

+					line++;

+					ref_line++;

+					col = 0;

+					if (current_token == Token.EOL) // if last token was also EOL keep skipping

+						continue;

+					return Token.EOL;

+				}

+				

+				// Handle escaped identifiers

+				if (c == '[')

+				{

+					if ((val = GetIdentifier()) == null)

+						break;

+					if ((c = getChar()) != ']')

+						break;

+					return Token.IDENTIFIER;

+				}

+

+				// Handle unescaped identifiers

+				if (is_identifier_start_character ((char) c))

+				{

+					string id;

+					if ((id = GetIdentifier(c)) == null)

+						break;

+					if (is_keyword(id))

+						return getKeyword(id);

+					val = id;

+					return Token.IDENTIFIER;

+				}

+

+				// handle numeric literals

+				if (c == '.'){

+					if (Char.IsDigit ((char) peekChar ()))

+						return is_number (c);

+					return Token.DOT;

+				}

+				

+				if (Char.IsDigit ((char) c))

+					return is_number (c);

+

+				/* For now, limited support for pre-processor commands */

+				if (col == 1 && c == '#'){

+					System.Text.StringBuilder s = new System.Text.StringBuilder ();

+					

+					while ((c = getChar ()) != -1 && (c != '\n')){

+						s.Append ((char) c);

+					}

+					if (String.Compare (s.ToString (), 0, "line", 0, 4) == 0){

+						string arg = s.ToString ().Substring (5);

+						int pos;

+

+						if ((pos = arg.IndexOf (' ')) != -1 && pos != 0){

+							ref_line = System.Int32.Parse (arg.Substring (0, pos));

+							pos++;

+

+							char [] quotes = { '\"' };

+

+							ref_name = arg.Substring (pos);

+							ref_name.TrimStart (quotes);

+							ref_name.TrimEnd (quotes);

+						} else

+							ref_line = System.Int32.Parse (arg);

+					}

+					line++;

+					ref_line++;

+					continue;

+				}

+				

+				if ((t = is_punct ((char)c, ref doread)) != Token.ERROR){

+					if (doread){

+						getChar ();

+						col++;

+					}

+					return t;

+				}

+				

+				// Treat string literals

+				if (c == '"'){

+					System.Text.StringBuilder s = new System.Text.StringBuilder ();

+

+					while ((c = getChar ()) != -1){

+						if (c == '"'){ // TODO: treat double-doublequotes

+							val = s.ToString ();

+							return Token.LITERAL_STRING;

+						}

+

+						c = escape (c);

+						if (c == -1)

+							return Token.ERROR;

+						s.Append ((char) c);

+					}

+				}

+			

+				// expand tabs for location and ignore it as whitespace

+				if (c == '\t')

+				{

+					col = (((col + ExpandedTabsSize) / ExpandedTabsSize) * ExpandedTabsSize) - 1;

+					continue;

+				}

+

+				// white space

+				if (c == ' ' || c == '\f' || c == '\v')

+					continue;

+

+				error_details = ((char)c).ToString ();

+				

+				return Token.ERROR;

+			}

+

+			if (current_token != Token.EOL) // if last token wasn´t EOL send it before EOF

+				return Token.EOL;

+			

+			return Token.EOF;

+		}

+

+		public Tokenizer (System.IO.TextReader input, string fname, ArrayList defines)

+		{

+			this.ref_name = fname;

+			reader = input;

+			putback_char = -1;

+			

+			Location.Push (fname);

+		}

+

+	}

+}

diff --git a/mcs/mbas/mbas.csproj b/mcs/mbas/mbas.csproj
new file mode 100644
index 00000000000..f551f2bd48a
--- /dev/null
+++ b/mcs/mbas/mbas.csproj
@@ -0,0 +1,260 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9466"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{D9868C8B-B8C9-43E0-8702-F33AD49F1CC3}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = "mbas.ico"
+                AssemblyKeyContainerName = ""
+                AssemblyName = "mbas"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                RootNamespace = "Mono.Languages"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "true"
+                    Optimize = "false"
+                    OutputPath = ".\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "false"
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                    HintPath = "..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.dll"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                    HintPath = "..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.Data.dll"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                    HintPath = "..\..\..\..\WINNT\Microsoft.NET\Framework\v1.0.3705\System.XML.dll"
+                />
+                <Reference
+                    Name = "Mono.GetOptions"
+                    Project = "{8D3008AB-7C0F-4DBE-A305-752926C366A7}"
+                    Package = "{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "AssemblyInfo.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "assign.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "attribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "cfold.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "ChangeLog"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "class.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "codegen.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "const.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "constant.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "decl.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "delegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "driver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "ecore.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "enum.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "expression.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "genericparser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "interface.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "literal.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "location.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "mbas.ico"
+                    BuildAction = "Content"
+                />
+                <File
+                    RelPath = "mb-parser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "mb-parser.jay"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "mb-tokenizer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "modifiers.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "module.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "namespace.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "parameter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "pending.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "report.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "rootcontext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "statement.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "statementCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "support.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "tree.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "typemanager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/mcs/mbas/mbas.ico b/mcs/mbas/mbas.ico
new file mode 100644
index 00000000000..e134617dd82
--- /dev/null
+++ b/mcs/mbas/mbas.ico
diff --git a/mcs/mbas/mbas.sln b/mcs/mbas/mbas.sln
new file mode 100644
index 00000000000..95f0b4a015e
--- /dev/null
+++ b/mcs/mbas/mbas.sln
@@ -0,0 +1,33 @@
+Microsoft Visual Studio Solution File, Format Version 7.00

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "mbas", "mbas.csproj", "{D9868C8B-B8C9-43E0-8702-F33AD49F1CC3}"

+EndProject

+Project("{F184B08F-C81C-45F6-A57F-5ABD9991F28F}") = "testmbas", "testmbas\testmbas.vbproj", "{64A40514-2574-4F75-B967-855531F2F01D}"

+EndProject

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mono.GetOptions", "..\class\Mono.GetOptions\Mono.GetOptions.csproj", "{8D3008AB-7C0F-4DBE-A305-752926C366A7}"

+EndProject

+Global

+	GlobalSection(SolutionConfiguration) = preSolution

+		ConfigName.0 = Debug

+		ConfigName.1 = Release

+	EndGlobalSection

+	GlobalSection(ProjectDependencies) = postSolution

+	EndGlobalSection

+	GlobalSection(ProjectConfiguration) = postSolution

+		{D9868C8B-B8C9-43E0-8702-F33AD49F1CC3}.Debug.ActiveCfg = Debug|.NET

+		{D9868C8B-B8C9-43E0-8702-F33AD49F1CC3}.Debug.Build.0 = Debug|.NET

+		{D9868C8B-B8C9-43E0-8702-F33AD49F1CC3}.Release.ActiveCfg = Release|.NET

+		{D9868C8B-B8C9-43E0-8702-F33AD49F1CC3}.Release.Build.0 = Release|.NET

+		{64A40514-2574-4F75-B967-855531F2F01D}.Debug.ActiveCfg = Debug|.NET

+		{64A40514-2574-4F75-B967-855531F2F01D}.Debug.Build.0 = Debug|.NET

+		{64A40514-2574-4F75-B967-855531F2F01D}.Release.ActiveCfg = Release|.NET

+		{64A40514-2574-4F75-B967-855531F2F01D}.Release.Build.0 = Release|.NET

+		{8D3008AB-7C0F-4DBE-A305-752926C366A7}.Debug.ActiveCfg = Debug|.NET

+		{8D3008AB-7C0F-4DBE-A305-752926C366A7}.Debug.Build.0 = Debug|.NET

+		{8D3008AB-7C0F-4DBE-A305-752926C366A7}.Release.ActiveCfg = Release|.NET

+		{8D3008AB-7C0F-4DBE-A305-752926C366A7}.Release.Build.0 = Release|.NET

+	EndGlobalSection

+	GlobalSection(ExtensibilityGlobals) = postSolution

+	EndGlobalSection

+	GlobalSection(ExtensibilityAddIns) = postSolution

+	EndGlobalSection

+EndGlobal

diff --git a/mcs/mbas/modifiers.cs b/mcs/mbas/modifiers.cs
new file mode 100644
index 00000000000..a5cf6f62c03
--- /dev/null
+++ b/mcs/mbas/modifiers.cs
@@ -0,0 +1,241 @@
+//
+// modifiers.cs: Modifier handling.
+// 
+using System;
+using System.Reflection;
+
+namespace Mono.CSharp {
+	public class Modifiers {
+
+		//
+		// The ordering of the following 4 constants
+		// has been carefully done.
+		//
+		public const int PROTECTED = 0x0001;
+		public const int PUBLIC    = 0x0002;
+		public const int PRIVATE   = 0x0004;
+		public const int INTERNAL  = 0x0008;
+		public const int NEW       = 0x0010;
+		public const int ABSTRACT  = 0x0020;
+		public const int SEALED    = 0x0040;
+		public const int STATIC    = 0x0080;
+		public const int READONLY  = 0x0100;
+		public const int VIRTUAL   = 0x0200;
+		public const int OVERRIDE  = 0x0400;
+		public const int EXTERN    = 0x0800;
+		public const int VOLATILE  = 0x1000;
+		public const int UNSAFE    = 0x2000;
+		public const int TOP       = 0x2000;
+
+		public const int Accessibility =
+			PUBLIC | PROTECTED | INTERNAL | PRIVATE;
+		
+		static public string Name (int i)
+		{
+			string s = "";
+			
+			switch (i) {
+			case Modifiers.NEW:
+				s = "new"; break;
+			case Modifiers.PUBLIC:
+				s = "public"; break;
+			case Modifiers.PROTECTED:
+				s = "protected"; break;
+			case Modifiers.INTERNAL:
+				s = "internal"; break;
+			case Modifiers.PRIVATE:
+				s = "private"; break;
+			case Modifiers.ABSTRACT:
+				s = "abstract"; break;
+			case Modifiers.SEALED:
+				s = "sealed"; break;
+			case Modifiers.STATIC:
+				s = "static"; break;
+			case Modifiers.READONLY:
+				s = "readonly"; break;
+			case Modifiers.VIRTUAL:
+				s = "virtual"; break;
+			case Modifiers.OVERRIDE:
+				s = "override"; break;
+			case Modifiers.EXTERN:
+				s = "extern"; break;
+			case Modifiers.VOLATILE:
+				s = "volatile"; break;
+			}
+
+			return s;
+		}
+
+		public static TypeAttributes TypeAttr (int mod_flags, bool is_toplevel)
+		{
+			TypeAttributes t = 0;
+
+			if (is_toplevel){
+				if ((mod_flags & PUBLIC) != 0)
+					t |= TypeAttributes.Public;
+				if ((mod_flags & PRIVATE) != 0)
+					t |= TypeAttributes.NotPublic;
+			} else {
+				if ((mod_flags & PUBLIC) != 0)
+					t |= TypeAttributes.NestedPublic;
+				if ((mod_flags & PRIVATE) != 0)
+					t |= TypeAttributes.NestedPrivate;
+				if ((mod_flags & PROTECTED) != 0 && (mod_flags & INTERNAL) != 0)
+					t |= TypeAttributes.NestedFamORAssem;
+				if ((mod_flags & PROTECTED) != 0)
+					t |= TypeAttributes.NestedFamily;
+				if ((mod_flags & INTERNAL) != 0)
+					t |= TypeAttributes.NestedAssembly;
+			}
+			
+			if ((mod_flags & SEALED) != 0)
+				t |= TypeAttributes.Sealed;
+			if ((mod_flags & ABSTRACT) != 0)
+				t |= TypeAttributes.Abstract;
+
+			return t;
+		}
+		
+		public static TypeAttributes TypeAttr (int mod_flags, TypeContainer caller)
+		{
+			TypeAttributes t = TypeAttr (mod_flags, caller.IsTopLevel);
+
+			// If we do not have static constructors, static methods
+			// can be invoked without initializing the type.
+			if (!caller.HaveStaticConstructor)
+				t |= TypeAttributes.BeforeFieldInit;
+				
+			return t;
+		}
+
+		public static FieldAttributes FieldAttr (int mod_flags)
+		{
+			FieldAttributes fa = 0;
+
+			if ((mod_flags & PUBLIC) != 0)
+				fa |= FieldAttributes.Public;
+			if ((mod_flags & PRIVATE) != 0)
+				fa |= FieldAttributes.Private;
+			if ((mod_flags & PROTECTED) != 0){
+				if ((mod_flags & INTERNAL) != 0)
+					fa |= FieldAttributes.FamORAssem;
+				else 
+					fa |= FieldAttributes.Family;
+			} else {
+				if ((mod_flags & INTERNAL) != 0)
+					fa |= FieldAttributes.Assembly;
+			}
+			
+			if ((mod_flags & STATIC) != 0)
+				fa |= FieldAttributes.Static;
+			if ((mod_flags & READONLY) != 0)
+				fa |= FieldAttributes.InitOnly;
+
+			return fa;
+		}
+
+		public static MethodAttributes MethodAttr (int mod_flags)
+		{
+			MethodAttributes ma = 0;
+
+			if ((mod_flags & PUBLIC) != 0)
+				ma |= MethodAttributes.Public;
+			if ((mod_flags & PRIVATE) != 0)
+				ma |= MethodAttributes.Private;
+			if ((mod_flags & PROTECTED) != 0){
+				if ((mod_flags & INTERNAL) != 0)
+					ma |= MethodAttributes.FamORAssem;
+				else 
+					ma |= MethodAttributes.Family;
+			} else {
+				if ((mod_flags & INTERNAL) != 0)
+					ma |= MethodAttributes.Assembly;
+			}
+
+			if ((mod_flags & STATIC) != 0)
+				ma |= MethodAttributes.Static;
+			if ((mod_flags & ABSTRACT) != 0){
+				ma |= MethodAttributes.Abstract | MethodAttributes.Virtual |
+					MethodAttributes.HideBySig;
+			}
+			if ((mod_flags & SEALED) != 0)
+				ma |= MethodAttributes.Final;
+
+			if ((mod_flags & VIRTUAL) != 0)
+				ma |= MethodAttributes.Virtual;
+
+			if ((mod_flags & OVERRIDE) != 0)
+				ma |= MethodAttributes.Virtual | MethodAttributes.HideBySig;
+			else {
+				if ((ma & MethodAttributes.Virtual) != 0)
+					ma |= MethodAttributes.NewSlot;
+			}
+			
+			if ((mod_flags & NEW) != 0)
+				ma |= MethodAttributes.HideBySig;
+			
+			return ma;
+		}
+
+		// <summary>
+		//   Checks the object @mod modifiers to be in @allowed.
+		//   Returns the new mask.  Side effect: reports any
+		//   incorrect attributes. 
+		// </summary>
+		public static int Check (int allowed, int mod, int def_access, Location l)
+		{
+			int invalid_flags  = (~allowed) & mod;
+			int i;
+
+			if (invalid_flags == 0){
+				int a = mod;
+
+				if ((mod & Modifiers.UNSAFE) != 0){
+					if (!RootContext.Unsafe){
+						Report.Error (227, l,
+							      "Unsafe code requires the --unsafe command " +
+							      "line option to be specified");
+					}
+				}
+				
+				//
+				// If no accessibility bits provided
+				// then provide the defaults.
+				//
+				if ((mod & Accessibility) == 0){
+					mod |= def_access;
+					return mod;
+				}
+
+				//
+				// Make sure that no conflicting accessibility
+				// bits have been set.  Protected+Internal is
+				// allowed, that is why they are placed on bits
+				// 1 and 4 (so the shift 3 basically merges them)
+				//
+				a &= 15;
+				a |= (a >> 3);
+				a = ((a & 2) >> 1) + (a & 5);
+				a = ((a & 4) >> 2) + (a & 3);
+				if (a > 1)
+					Report.Error (107, l, "More than one protection modifier specified");
+				
+				return mod;
+			}
+			
+			for (i = 1; i < TOP; i <<= 1){
+				if ((i & invalid_flags) == 0)
+					continue;
+
+				Error_InvalidModifier (l, Name (i));
+			}
+
+			return allowed & mod;
+		}
+
+		public static void Error_InvalidModifier (Location l, string name)
+		{
+			Report.Error (106, l, "the modifier " + name + " is not valid for this item");
+		}
+	}
+}
diff --git a/mcs/mbas/module.cs b/mcs/mbas/module.cs
new file mode 100644
index 00000000000..ec9982d7e02
--- /dev/null
+++ b/mcs/mbas/module.cs
@@ -0,0 +1,74 @@
+//
+// module.cs: Module handler
+//
+// Author: Rafael Teixeira (rafaelteixeirabr@hotmail.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2002 Rafael Teixeira
+//
+using System;
+using System.Collections;
+using System.Diagnostics.SymbolStore;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+using Mono.CSharp ;
+
+namespace Mono.MonoBASIC
+{
+	public class Utils
+	{
+		public static void AddSpecializedAttribute(ref Attributes attrs, string attributeName, ArrayList args, Location loc)
+		{
+			Mono.CSharp.Attribute specialAttr = new Mono.CSharp.Attribute(attributeName, args, loc);
+			ArrayList al = new ArrayList();
+			al.Add(specialAttr);
+			AttributeSection asec = new AttributeSection(null, al);
+			if (attrs == null)
+				attrs = new Attributes(asec, loc);
+			else
+				attrs.AddAttribute(asec);
+		}
+	}
+	
+	/// <summary>
+	/// Summary description for module.
+	/// </summary>
+	public class Module : Mono.CSharp.Class 
+	{
+		// <summary>
+		//   Modifiers allowed in a class declaration
+		// </summary>
+		public new const int AllowedModifiers =
+			Modifiers.PUBLIC |
+			Modifiers.INTERNAL;
+
+		public Module(TypeContainer parent, string name, int mod, Attributes attrs, Location l)
+			: base (parent, name, 0, null, l)
+		{
+			if (parent.Parent != null)
+				Report.Error (30617, l,
+					"'Module' statements can occur only at file or namespace level");
+
+			// overwrite ModFlags
+			this.ModFlags = Modifiers.Check (AllowedModifiers, mod, Modifiers.INTERNAL, l);
+
+			// add specialized attribute
+			Utils.AddSpecializedAttribute(ref attrs, "Microsoft.VisualBasic.CompilerServices.StandardModuleAttribute", null, l);
+			this.attributes = attrs;
+		}
+
+		//
+		// FIXME: How do we deal with the user specifying a different
+		// layout?
+		//
+		public override TypeAttributes TypeAttr 
+		{
+			get 
+			{
+				return base.TypeAttr | TypeAttributes.AutoLayout | TypeAttributes.Class | TypeAttributes.Sealed;
+			}
+		}
+	}
+}
diff --git a/mcs/mbas/namespace.cs b/mcs/mbas/namespace.cs
new file mode 100644
index 00000000000..d01bde48642
--- /dev/null
+++ b/mcs/mbas/namespace.cs
@@ -0,0 +1,129 @@
+//
+// namespace.cs: Tracks namespaces
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+using System;
+using System.Collections;
+using Mono.Languages;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   Keeps track of the namespaces defined in the C# code.
+	/// </summary>
+	public class Namespace {
+		Namespace parent;
+		string name;
+		ArrayList using_clauses;
+		Hashtable aliases;
+		public bool DeclarationFound = false;
+		
+		/// <summary>
+		///   Constructor Takes the current namespace and the
+		///   name.  This is bootstrapped with parent == null
+		///   and name = ""
+		/// </summary>
+		public Namespace (Namespace parent, string name)
+		{
+			this.name = name;
+			this.parent = parent;
+		}
+
+		/// <summary>
+		///   The qualified name of the current namespace
+		/// </summary>
+		public string Name {
+			get {
+				string pname = parent != null ? parent.Name : "";
+				
+				if (pname == "")
+					return name;
+				else
+					return parent.Name + "." + name;
+			}
+		}
+
+		/// <summary>
+		///   The parent of this namespace, used by the parser to "Pop"
+		///   the current namespace declaration
+		/// </summary>
+		public Namespace Parent {
+			get {
+				return parent;
+			}
+		}
+
+		/// <summary>
+		///   Records a new namespace for resolving name references
+		/// </summary>
+		public void Using (string ns, Location loc)
+		{
+			if (DeclarationFound){
+				Report.Error (1529, loc, "A using clause must precede all other namespace elements");
+				return;
+			}
+
+			if (using_clauses == null)
+				using_clauses = new ArrayList ();
+
+			using_clauses.Add (ns);
+		}
+
+		public ArrayList UsingTable {
+			get {
+				return using_clauses;
+			}
+		}
+
+		public void UsingAlias (string alias, string namespace_or_type, Location loc)
+		{
+			if (aliases == null)
+				aliases = new Hashtable ();
+			
+			if (aliases.Contains (alias)){
+				Report.Error (1537, loc, "The using alias `" + alias +
+					      "' appeared previously in this namespace");
+				return;
+			}
+					
+			aliases [alias] = namespace_or_type;
+		}
+
+		public string LookupAlias (string alias)
+		{
+			string value = null;
+
+			// System.Console.WriteLine ("Lookup " + alias + " in " + name);
+
+			if (aliases != null)
+				value = (string) (aliases [alias]);
+			if (value == null && Parent != null)
+				value = Parent.LookupAlias (alias);
+
+			return value;
+		}
+
+		/// <summary>
+		///   Used to validate that all the using clauses are correct
+		///   after we are finished parsing all the files
+		/// </summary>
+		public void VerifyUsing ()
+		{
+			foreach (DictionaryEntry de in using_clauses){
+				if (de.Value == null){
+					string name = (string) de.Key;
+					
+					Report.Error (234, "The type or namespace `" +
+							    name + "' does not exist in the " +
+							    "class or namespace `" + name + "'");
+				}
+			}
+		}
+
+	}
+}
+
diff --git a/mcs/mbas/parameter.cs b/mcs/mbas/parameter.cs
new file mode 100644
index 00000000000..ab125da9719
--- /dev/null
+++ b/mcs/mbas/parameter.cs
@@ -0,0 +1,422 @@
+//
+// parameter.cs: Parameter definition.
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+//
+//
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Collections;
+
+namespace Mono.CSharp {
+
+
+	/// <summary>
+	///   Represents a single method parameter
+	/// </summary>
+	public class Parameter {
+		[Flags]
+		public enum Modifier : byte {
+			NONE    = 0,
+			REF     = 1,
+			OUT     = 2,
+			PARAMS  = 4,
+			// This is a flag which says that it's either REF or OUT.
+			ISBYREF = 8
+		}
+
+		public readonly Expression TypeName;
+		public readonly Modifier ModFlags;
+		public Attributes OptAttributes;
+		public readonly string Name;
+		public Type parameter_type;
+		
+		public Parameter (Expression type, string name, Modifier mod, Attributes attrs)
+		{
+			Name = name;
+			ModFlags = mod;
+			TypeName = type;
+			OptAttributes = attrs;
+		}
+
+		// <summary>
+		//   Resolve is used in method definitions
+		// </summary>
+		public bool Resolve (DeclSpace ds, Location l)
+		{
+			parameter_type = ds.ResolveType (TypeName, false, l);
+			return parameter_type != null;
+		}
+
+		// <summary>
+		//   ResolveAndDefine is used by delegate declarations, because
+		//   they happen during the initial tree resolution process
+		// </summary>
+		public bool ResolveAndDefine (DeclSpace ds)
+		{
+			// FIXME: Should use something else instead of Location.Null
+			parameter_type = ds.ResolveType (TypeName, true, Location.Null);
+			return parameter_type != null;
+		}
+		
+		public Type ExternalType (DeclSpace ds, Location l)
+		{
+			if ((ModFlags & Parameter.Modifier.ISBYREF) != 0){
+				string n = parameter_type.FullName + "&";
+
+				Type t = RootContext.LookupType (ds, n, false, l);
+
+				return t;
+			}
+			
+			return parameter_type;
+		}
+
+		public Type ParameterType {
+			get {
+				return parameter_type;
+			}
+		}
+		
+		public ParameterAttributes Attributes {
+			get {
+				switch (ModFlags){
+				case Modifier.NONE:
+					return ParameterAttributes.None;
+				case Modifier.REF:
+					return ParameterAttributes.None;
+				case Modifier.OUT:
+					return ParameterAttributes.Out;
+				case Modifier.PARAMS:
+					return 0;
+				}
+				
+				return ParameterAttributes.None;
+			}
+		}
+		
+		/// <summary>
+		///   Returns the signature for this parameter evaluating it on the
+		///   @tc context
+		/// </summary>
+		public string GetSignature (DeclSpace ds, Location loc)
+		{
+			if (parameter_type == null){
+				if (!Resolve (ds, loc))
+					return null;
+			}
+
+			return ExternalType (ds, loc).FullName;
+		}
+	}
+
+	/// <summary>
+	///   Represents the methods parameters
+	/// </summary>
+	public class Parameters {
+		public Parameter [] FixedParameters;
+		public readonly Parameter ArrayParameter;
+		string signature;
+		Type [] types;
+		Location loc;
+		
+		static Parameters empty_parameters;
+		
+		public Parameters (Parameter [] fixed_parameters, Parameter array_parameter, Location l)
+		{
+			FixedParameters = fixed_parameters;
+			ArrayParameter  = array_parameter;
+			loc = l;
+		}
+
+		/// <summary>
+		///   This is used to reuse a set of empty parameters, because they
+		///   are common
+		/// </summary>
+		public static Parameters EmptyReadOnlyParameters {
+			get {
+				if (empty_parameters == null)
+					empty_parameters = new Parameters (null, null, Location.Null);
+			
+				return empty_parameters;
+			}
+		}
+		
+		public bool Empty {
+			get {
+				return (FixedParameters == null) && (ArrayParameter == null);
+			}
+		}
+		
+		public void ComputeSignature (DeclSpace ds)
+		{
+			signature = "";
+			if (FixedParameters != null){
+				for (int i = 0; i < FixedParameters.Length; i++){
+					Parameter par = FixedParameters [i];
+					
+					signature += par.GetSignature (ds, loc);
+				}
+			}
+			//
+			// Note: as per the spec, the `params' arguments (ArrayParameter)
+			// are not used in the signature computation for a method
+			//
+		}
+
+		static void error100 (string name)
+		{
+			Report.Error (
+				100, "The parameter name `" + name + "' is a duplicate");
+		}
+		
+		public bool VerifyArgs ()
+		{
+			int count;
+			int i, j;
+
+			if (FixedParameters == null)
+				return true;
+			
+			count = FixedParameters.Length;
+			string array_par_name = ArrayParameter != null ? ArrayParameter.Name : null;
+			for (i = 0; i < count; i++){
+				string base_name = FixedParameters [i].Name;
+				
+				for (j = i + 1; j < count; j++){
+					if (base_name != FixedParameters [j].Name)
+						continue;
+					error100 (base_name);
+					return false;
+				}
+
+				if (base_name == array_par_name){
+					error100 (base_name);
+					return false;
+				}
+			}
+			return true;
+		}
+		
+		/// <summary>
+		///    Returns the signature of the Parameters evaluated in
+		///    the @tc environment
+		/// </summary>
+		public string GetSignature (DeclSpace ds)
+		{
+			if (signature == null){
+				VerifyArgs ();
+				ComputeSignature (ds);
+			}
+			
+			return signature;
+		}
+		
+		/// <summary>
+		///    Returns the paramenter information based on the name
+		/// </summary>
+		public Parameter GetParameterByName (string name, out int idx)
+		{
+			idx = 0;
+			int i = 0;
+
+			if (FixedParameters != null){
+				foreach (Parameter par in FixedParameters){
+					if (par.Name == name){
+						idx = i;
+						return par;
+					}
+					i++;
+				}
+			}
+
+			if (ArrayParameter != null){
+				if (name == ArrayParameter.Name){
+					idx = i;
+					return ArrayParameter;
+				}
+			}
+			
+			return null;
+		}
+
+		bool ComputeParameterTypes (DeclSpace ds)
+		{
+			int extra = (ArrayParameter != null) ? 1 : 0;
+			int i = 0;
+			int pc;
+
+			if (FixedParameters == null)
+				pc = extra;
+			else
+				pc = extra + FixedParameters.Length;
+
+			types = new Type [pc];
+			
+			if (!VerifyArgs ()){
+				FixedParameters = null;
+				return false;
+			}
+
+			bool failed = false;
+			if (FixedParameters != null){
+				foreach (Parameter p in FixedParameters){
+					Type t = null;
+					
+					if (p.Resolve (ds, loc))
+						t = p.ExternalType (ds, loc);
+					else
+						failed = true;
+					
+					types [i] = t;
+					i++;
+				}
+			}
+			
+			if (failed)
+				types = null;
+			
+			if (extra > 0){
+				if (ArrayParameter.Resolve (ds, loc))
+					types [i] = ArrayParameter.ExternalType (ds, loc);
+				else
+					return false;
+			}
+
+			return true;
+		}
+
+		//
+		// This variant is used by Delegates, because they need to
+		// resolve/define names, instead of the plain LookupType
+		//
+		public bool ComputeAndDefineParameterTypes (DeclSpace ds)
+		{
+			int extra = (ArrayParameter != null) ? 1 : 0;
+			int i = 0;
+			int pc;
+
+			if (FixedParameters == null)
+				pc = extra;
+			else
+				pc = extra + FixedParameters.Length;
+			
+			types = new Type [pc];
+			
+			if (!VerifyArgs ()){
+				FixedParameters = null;
+				return false;
+			}
+
+			bool ok_flag = true;
+			
+			if (FixedParameters != null){
+				foreach (Parameter p in FixedParameters){
+					Type t = null;
+					
+					if (p.ResolveAndDefine (ds))
+						t = p.ExternalType (ds, loc);
+					else
+						ok_flag = false;
+					
+					types [i] = t;
+					i++;
+				}
+			}
+			
+			if (extra > 0){
+				if (ArrayParameter.ResolveAndDefine (ds))
+					types [i] = ArrayParameter.ExternalType (ds, loc);
+				else
+					ok_flag = false;
+			}
+
+			//
+			// invalidate the cached types
+			//
+			if (!ok_flag){
+				types = null;
+			}
+			
+			return ok_flag;
+		}
+		
+		/// <summary>
+		///   Returns the argument types as an array
+		/// </summary>
+		static Type [] no_types = new Type [0];
+		
+		public Type [] GetParameterInfo (DeclSpace ds)
+		{
+			if (types != null)
+				return types;
+			
+			if (FixedParameters == null && ArrayParameter == null)
+				return no_types;
+
+			if (ComputeParameterTypes (ds) == false){
+				types = null;
+				return null;
+			}
+
+			return types;
+		}
+
+		/// <summary>
+		///   Returns the type of a given parameter, and stores in the `is_out'
+		///   boolean whether this is an out or ref parameter.
+		///
+		///   Note that the returned type will not contain any dereference in this
+		///   case (ie, you get "int" for a ref int instead of "int&"
+		/// </summary>
+		public Type GetParameterInfo (DeclSpace ds, int idx, out Parameter.Modifier mod)
+		{
+			mod = Parameter.Modifier.NONE;
+			
+			if (!VerifyArgs ()){
+				FixedParameters = null;
+				return null;
+			}
+
+			if (FixedParameters == null && ArrayParameter == null)
+				return null;
+			
+			if (types == null)
+				if (ComputeParameterTypes (ds) == false)
+					return null;
+
+			//
+			// If this is a request for the variable lenght arg.
+			//
+			int array_idx = (FixedParameters != null ? FixedParameters.Length : 0);
+			if (idx == array_idx)
+				return types [idx];
+
+			//
+			// Otherwise, it is a fixed parameter
+			//
+			Parameter p = FixedParameters [idx];
+			mod = p.ModFlags;
+
+			if ((mod & (Parameter.Modifier.REF | Parameter.Modifier.OUT)) != 0)
+				mod |= Parameter.Modifier.ISBYREF;
+
+			return p.ParameterType;
+		}
+
+		public CallingConventions GetCallingConvention ()
+		{
+			// For now this is the only correc thing to do
+			return CallingConventions.Standard;
+		}
+	}
+}
+		
+	
+
diff --git a/mcs/mbas/pending.cs b/mcs/mbas/pending.cs
new file mode 100644
index 00000000000..4bfaa6ff15a
--- /dev/null
+++ b/mcs/mbas/pending.cs
@@ -0,0 +1,517 @@
+//
+// pending.cs: Pending method implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001, 2002 Ximian, Inc (http://www.ximian.com)
+//
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace Mono.CSharp {
+
+	struct TypeAndMethods {
+		public Type          type;
+		public MethodInfo [] methods;
+		
+		// Far from ideal, but we want to avoid creating a copy
+		// of methods above.
+		public Type [][]     args;
+		
+		//
+		// This flag on the method says `We found a match, but
+		// because it was private, we could not use the match
+		//
+		public bool []       found;
+
+		// If a method is defined here, then we always need to
+		// create a proxy for it.  This is used when implementing
+		// an interface's indexer with a different IndexerName.
+		public MethodInfo [] need_proxy;
+	}
+
+	public class PendingImplementation {
+		/// <summary>
+		///   The container for this PendingImplementation
+		/// </summary>
+		TypeContainer container;
+		
+		/// <summary>
+		///   This filter is used by FindMembers, and it is used to
+		///   extract only virtual/abstract fields
+		/// </summary>
+		static MemberFilter virtual_method_filter;
+
+		/// <summary>
+		///   This is the array of TypeAndMethods that describes the pending implementations
+		///   (both interfaces and abstract methods in parent class)
+		/// </summary>
+		TypeAndMethods [] pending_implementations;
+
+		static bool IsVirtualFilter (MemberInfo m, object filterCriteria)
+		{
+			if (!(m is MethodInfo))
+				return false;
+
+			return ((MethodInfo) m).IsVirtual;
+		}
+
+		/// <summary>
+		///   Inits the virtual_method_filter
+		/// </summary>
+		static PendingImplementation ()
+		{
+			virtual_method_filter = new MemberFilter (IsVirtualFilter);
+		}
+
+		// <remarks>
+		//   Returns a list of the abstract methods that are exposed by all of our
+		//   parents that we must implement.  Notice that this `flattens' the
+		//   method search space, and takes into account overrides.  
+		// </remarks>
+		static ArrayList GetAbstractMethods (Type t)
+		{
+			ArrayList list = null;
+			bool searching = true;
+			Type current_type = t;
+			
+			do {
+				MemberInfo [] mi;
+				
+				mi = TypeContainer.FindMembers (
+					current_type, MemberTypes.Method,
+					BindingFlags.Public | BindingFlags.Instance |
+					BindingFlags.DeclaredOnly,
+					virtual_method_filter, null);
+
+				if (current_type == TypeManager.object_type)
+					searching = false;
+				else {
+					current_type = current_type.BaseType;
+					if (!current_type.IsAbstract)
+						searching = false;
+				}
+
+				if (mi == null)
+					continue;
+
+				int count = mi.Length;
+				if (count == 0)
+					continue;
+
+				if (count == 1 && !(mi [0] is MethodBase))
+					searching = false;
+				else 
+					list = TypeManager.CopyNewMethods (list, mi);
+			} while (searching);
+
+			if (list == null)
+				return null;
+			
+			for (int i = 0; i < list.Count; i++){
+				while (list.Count > i && !((MethodInfo) list [i]).IsAbstract)
+					list.RemoveAt (i);
+			}
+
+			if (list.Count == 0)
+				return null;
+
+			return list;
+		}
+
+		PendingImplementation (TypeContainer container, Type [] ifaces, ArrayList abstract_methods, int total)
+		{
+			TypeBuilder type_builder = container.TypeBuilder;
+			
+			this.container = container;
+			pending_implementations = new TypeAndMethods [total];
+
+			int i = 0;
+			if (ifaces != null){
+				foreach (Type t in ifaces){
+					MethodInfo [] mi;
+
+					if (t is TypeBuilder){
+						Interface iface;
+
+						iface = TypeManager.LookupInterface (t);
+						
+						mi = iface.GetMethods ();
+					} else
+						mi = t.GetMethods ();
+
+					int count = mi.Length;
+					pending_implementations [i].type = t;
+					pending_implementations [i].methods = mi;
+					pending_implementations [i].args = new Type [count][];
+					pending_implementations [i].found = new bool [count];
+					pending_implementations [i].need_proxy = new MethodInfo [count];
+
+					int j = 0;
+					foreach (MethodInfo m in mi){
+						Type [] types = TypeManager.GetArgumentTypes (m);
+
+						pending_implementations [i].args [j] = types;
+						j++;
+					}
+					i++;
+				}
+			}
+
+			if (abstract_methods != null){
+				int count = abstract_methods.Count;
+				pending_implementations [i].methods = new MethodInfo [count];
+				pending_implementations [i].need_proxy = new MethodInfo [count];
+				
+				abstract_methods.CopyTo (pending_implementations [i].methods, 0);
+				pending_implementations [i].found = new bool [count];
+				pending_implementations [i].args = new Type [count][];
+				pending_implementations [i].type = type_builder;
+				
+				int j = 0;
+				foreach (MemberInfo m in abstract_methods){
+					MethodInfo mi = (MethodInfo) m;
+					
+					Type [] types = TypeManager.GetArgumentTypes (mi);
+					
+					pending_implementations [i].args [j] = types;
+					j++;
+				}
+			}
+		}
+		
+		//
+		// Factory method: if there are pending implementation methods, we return a PendingImplementation
+		// object, otherwise we return null.
+		//
+		// Register method implementations are either abstract methods
+		// flagged as such on the base class or interface methods
+		//
+		static public PendingImplementation GetPendingImplementations (TypeContainer container)
+		{
+			TypeBuilder type_builder = container.TypeBuilder;
+			Type [] ifaces;
+			Type b = type_builder.BaseType;
+			int icount = 0;
+
+			//
+			// Notice that TypeBuilders will only return the interfaces that the Type
+			// is supposed to implement, not all the interfaces that the type implements.
+			//
+			// Completely broken.  Anyways, we take advantage of this, so we only register
+			// the implementations that we need, as they are those that are listed by the
+			// TypeBuilder.
+			//
+			ifaces = type_builder.GetInterfaces ();
+#if DEBUG
+			{
+				Type x = type_builder;
+
+				while (x != null){
+					Type [] iff = x.GetInterfaces ();
+					Console.WriteLine ("Type: " + x.Name);
+					
+					foreach (Type tt in iff){
+						Console.WriteLine ("  Iface: " + tt.Name);
+					}
+					x = x.BaseType;
+				}
+			}
+#endif
+					
+			icount = ifaces.Length;
+
+			//
+			// If we are implementing an abstract class, and we are not
+			// ourselves abstract, and there are abstract methods (C# allows
+			// abstract classes that have no abstract methods), then allocate
+			// one slot.
+			//
+			// We also pre-compute the methods.
+			//
+			bool implementing_abstract = ((b != null) && b.IsAbstract && !type_builder.IsAbstract);
+			ArrayList abstract_methods = null;
+
+			if (implementing_abstract){
+				abstract_methods = GetAbstractMethods (b);
+				
+				if (abstract_methods == null)
+					implementing_abstract = false;
+			}
+			
+			int total = icount +  (implementing_abstract ? 1 : 0);
+			if (total == 0)
+				return null;
+
+			return new PendingImplementation (container, ifaces, abstract_methods, total);
+		}
+
+		public enum Operation {
+			//
+			// If you change this, review the whole InterfaceMethod routine as there
+			// are a couple of assumptions on these three states
+			//
+			Lookup, ClearOne, ClearAll
+		}
+
+		/// <summary>
+		///   Whether the specified method is an interface method implementation
+		/// </summary>
+		public MethodInfo IsInterfaceMethod (Type t, string name, Type ret_type, Type [] args)
+		{
+			return InterfaceMethod (t, name, ret_type, args, Operation.Lookup, null);
+		}
+
+		public MethodInfo IsInterfaceIndexer (Type t, Type ret_type, Type [] args)
+		{
+			return InterfaceMethod (t, null, ret_type, args, Operation.Lookup, null);
+		}
+
+		public void ImplementMethod (Type t, string name, Type ret_type, Type [] args, bool clear_one) 
+		{
+			InterfaceMethod (t, name, ret_type, args,
+					 clear_one ? Operation.ClearOne : Operation.ClearAll, null);
+		}
+
+		public void ImplementIndexer (Type t, MethodInfo mi, Type ret_type, Type [] args, bool clear_one) 
+		{
+			InterfaceMethod (t, mi.Name, ret_type, args,
+					 clear_one ? Operation.ClearOne : Operation.ClearAll, mi);
+		}
+		
+		/// <remarks>
+		///   If a method in Type `t' (or null to look in all interfaces
+		///   and the base abstract class) with name `Name', return type `ret_type' and
+		///   arguments `args' implements an interface, this method will
+		///   return the MethodInfo that this method implements.
+		///
+		///   If `name' is null, we operate solely on the method's signature.  This is for
+		///   instance used when implementing indexers.
+		///
+		///   The `Operation op' controls whether to lookup, clear the pending bit, or clear
+		///   all the methods with the given signature.
+		///
+		///   The `MethodInfo need_proxy' is used when we're implementing an interface's
+		///   indexer in a class.  If the new indexer's IndexerName does not match the one
+		///   that was used in the interface, then we always need to create a proxy for it.
+		///
+		/// </remarks>
+		public MethodInfo InterfaceMethod (Type t, string name, Type ret_type, Type [] args,
+						   Operation op, MethodInfo need_proxy)
+		{
+			int arg_len = args.Length;
+
+			if (pending_implementations == null)
+				return null;
+
+			foreach (TypeAndMethods tm in pending_implementations){
+				if (!(t == null || tm.type == t))
+					continue;
+
+				int i = 0;
+				foreach (MethodInfo m in tm.methods){
+					if (m == null){
+						i++;
+						continue;
+					}
+
+					// `need_proxy' is not null when we're implementing an
+					// interface indexer and this is Clear(One/All) operation.
+					// If `name' is null, then we do a match solely based on the
+					// signature and not on the name (this is done in the Lookup
+					// for an interface indexer).
+					if ((name != null) && (need_proxy == null) && (name != m.Name)){
+						i++;
+						continue;
+					}
+
+					if (ret_type != m.ReturnType){
+						if (!((ret_type == null && m.ReturnType == TypeManager.void_type) ||
+						      (m.ReturnType == null && ret_type == TypeManager.void_type)))
+						{
+							i++;
+							continue;
+						}
+					}
+
+					//
+					// Check if we have the same parameters
+					//
+					if (tm.args [i].Length != arg_len){
+						i++;
+						continue;
+					}
+
+					int j, top = args.Length;
+					bool fail = false;
+					
+					for (j = 0; j < top; j++){
+						if (tm.args [i][j] != args[j]){
+							fail = true;
+							break;
+						}
+					}
+					if (fail){
+						i++;
+						continue;
+					}
+
+					if (op != Operation.Lookup){
+						// If `t != null', then this is an explicitly interface
+						// implementation and we can always clear the method.
+						// `need_proxy' is not null if we're implementing an
+						// interface indexer.  In this case, we need to create
+						// a proxy if the implementation's IndexerName doesn't
+						// match the IndexerName in the interface.
+						if ((t == null) && (need_proxy != null) && (name != m.Name))
+							tm.need_proxy [i] = need_proxy;
+						else
+							tm.methods [i] = null;
+					}
+					tm.found [i] = true;
+
+					//
+					// Lookups and ClearOne return
+					//
+					if (op != Operation.ClearAll)
+						return m;
+				}
+
+				// If a specific type was requested, we can stop now.
+				if (tm.type == t)
+					return null;
+			}
+			return null;
+		}
+
+		/// <summary>
+		///   C# allows this kind of scenarios:
+		///   interface I { void M (); }
+		///   class X { public void M (); }
+		///   class Y : X, I { }
+		///
+		///   For that case, we create an explicit implementation function
+		///   I.M in Y.
+		/// </summary>
+		void DefineProxy (Type iface, MethodInfo parent_method, MethodInfo iface_method,
+				  Type [] args)
+		{
+			MethodBuilder proxy;
+
+			string proxy_name = iface.Name + "." + iface_method.Name;
+
+			proxy = container.TypeBuilder.DefineMethod (
+				proxy_name,
+				MethodAttributes.HideBySig |
+				MethodAttributes.NewSlot |
+				MethodAttributes.Virtual,
+				CallingConventions.Standard | CallingConventions.HasThis,
+				parent_method.ReturnType, args);
+
+			int top = args.Length;
+			ILGenerator ig = proxy.GetILGenerator ();
+
+			ig.Emit (OpCodes.Ldarg_0);
+			for (int i = 0; i < top; i++){
+				switch (i){
+				case 0:
+					ig.Emit (OpCodes.Ldarg_1); break;
+				case 1:
+					ig.Emit (OpCodes.Ldarg_2); break;
+				case 2:
+					ig.Emit (OpCodes.Ldarg_3); break;
+				default:
+					ig.Emit (OpCodes.Ldarg, i - 1); break;
+				}
+			}
+			ig.Emit (OpCodes.Call, parent_method);
+			ig.Emit (OpCodes.Ret);
+
+			container.TypeBuilder.DefineMethodOverride (proxy, iface_method);
+		}
+		
+		/// <summary>
+		///   This function tells whether one of our parent classes implements
+		///   the given method (which turns out, it is valid to have an interface
+		///   implementation in a parent
+		/// </summary>
+		bool ParentImplements (Type iface_type, MethodInfo mi)
+		{
+			MethodSignature ms;
+			
+			Type [] args = TypeManager.GetArgumentTypes (mi);
+			ms = new MethodSignature (mi.Name, mi.ReturnType, args);
+			MemberInfo [] list = TypeContainer.FindMembers (
+				container.TypeBuilder.BaseType, MemberTypes.Method | MemberTypes.Property,
+				BindingFlags.Public | BindingFlags.Instance,
+				MethodSignature.method_signature_filter, ms);
+
+			if (list == null || list.Length == 0)
+				return false;
+
+			DefineProxy (iface_type, (MethodInfo) list [0], mi, args);
+			return true;
+		}
+
+		/// <summary>
+		///   Verifies that any pending abstract methods or interface methods
+		///   were implemented.
+		/// </summary>
+		public bool VerifyPendingMethods ()
+		{
+			int top = pending_implementations.Length;
+			bool errors = false;
+			int i;
+			
+			for (i = 0; i < top; i++){
+				Type type = pending_implementations [i].type;
+				int j = 0;
+				
+				foreach (MethodInfo mi in pending_implementations [i].methods){
+					if (mi == null)
+						continue;
+
+					if (type.IsInterface){
+						MethodInfo need_proxy =
+							pending_implementations [i].need_proxy [j];
+
+						if (need_proxy != null) {
+							Type [] args = TypeManager.GetArgumentTypes (mi);
+							DefineProxy (type, need_proxy, mi, args);
+							continue;
+						}
+
+						if (ParentImplements (type, mi))
+							continue;
+
+						string extra = "";
+						
+						if (pending_implementations [i].found [j])
+							extra = ".  (method might be private or static)";
+						Report.Error (
+							536, container.Location,
+							"`" + container.Name + "' does not implement " +
+							"interface member `" +
+							type.FullName + "." + mi.Name + "'" + extra);
+					} else {
+						Report.Error (
+							534, container.Location,
+							"`" + container.Name + "' does not implement " +
+							"inherited abstract member `" +
+							type.FullName + "." + mi.Name + "'");
+					}
+					errors = true;
+					j++;
+				}
+			}
+			return errors;
+		}
+	} /* end of class */
+}
diff --git a/mcs/mbas/report.cs b/mcs/mbas/report.cs
new file mode 100644
index 00000000000..60b4b3c6fdb
--- /dev/null
+++ b/mcs/mbas/report.cs
@@ -0,0 +1,229 @@
+//
+// report.cs: report errors and warnings.
+//
+// Author: Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc. (http://www.ximian.com)
+//
+
+//
+// FIXME: currently our class library does not support custom number format strings
+//
+using System;
+using System.Text;
+using System.Collections;
+using System.Diagnostics;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   This class is used to report errors and warnings t te user.
+	/// </summary>
+	public class Report {
+		/// <summary>  
+		///   Errors encountered so far
+		/// </summary>
+		static public int Errors;
+
+		/// <summary>  
+		///   Warnings encountered so far
+		/// </summary>
+		static public int Warnings;
+
+		/// <summary>  
+		///   Whether errors should be throw an exception
+		/// </summary>
+		static public bool Fatal;
+		
+		/// <summary>  
+		///   Whether warnings should be considered errors
+		/// </summary>
+		static public bool WarningsAreErrors;
+
+		/// <summary>  
+		///   Whether to dump a stack trace on errors. 
+		/// </summary>
+		static public bool Stacktrace;
+		
+		//
+		// If the 'expected' error code is reported then the
+                // compilation succeeds.
+		//
+		// Used for the test suite to excercise the error codes
+		//
+		static int expected_error = 0;
+
+		//
+		// Keeps track of the warnings that we are ignoring
+		//
+		static Hashtable warning_ignore_table;
+		
+		static void Check (int code)
+		{
+			if (code == expected_error){
+				if (Fatal)
+					throw new Exception ();
+				
+				Environment.Exit (0);
+			}
+		}
+		
+		static public void RealError (string msg)
+		{
+			Errors++;
+			Console.WriteLine (msg);
+
+			if (Stacktrace)
+				Console.WriteLine (new StackTrace ().ToString ());
+			if (Fatal)
+				throw new Exception (msg);
+		}
+
+		static public void Error (int code, Location l, string text)
+		{
+			string msg = String.Format (
+				"{0}({1}) error CS{2:0000}: {3}", l.Name, l.Row, code, text);
+//				"{0}({1}) error CS{2}: {3}", l.Name, l.Row, code, text);
+			
+			RealError (msg);
+			Check (code);
+		}
+
+		static public void Warning (int code, Location l, string text)
+		{
+			if (warning_ignore_table != null){
+				if (warning_ignore_table.Contains (code))
+					return;
+			}
+			
+			if (WarningsAreErrors)
+				Error (code, l, text);
+			else {
+				string row;
+				
+				if (Location.IsNull (l))
+					row = "";
+				else
+					row = l.Row.ToString ();
+				
+				Console.WriteLine (String.Format (
+					"{0}({1}) warning CS{2:0000}: {3}",
+//					"{0}({1}) warning CS{2}: {3}",
+					l.Name,  row, code, text));
+				Warnings++;
+				Check (code);
+
+				if (Stacktrace)
+					Console.WriteLine (new StackTrace ().ToString ());
+			}
+		}
+		
+		static public void Warning (int code, string text)
+		{
+			Warning (code, Location.Null, text);
+		}
+
+		static public void Error (int code, string text)
+		{
+			string msg = String.Format ("error CS{0:0000}: {1}", code, text);
+//			string msg = String.Format ("error CS{0}: {1}", code, text);
+			
+			RealError (msg);
+			Check (code);
+		}
+
+		static public void Message (Message m)
+		{
+			if (m is ErrorMessage)
+				Error (m.code, m.text);
+			else
+				Warning (m.code, m.text);
+		}
+
+		static public void SetIgnoreWarning (int code)
+		{
+			if (warning_ignore_table == null)
+				warning_ignore_table = new Hashtable ();
+
+			warning_ignore_table [code] = true;
+		}
+		
+                static public int ExpectedError {
+                        set {
+                                expected_error = value;
+                        }
+                        get {
+                                return expected_error;
+                        }
+                }
+
+		public static int DebugFlags = 0;
+
+		[Conditional ("MCS_DEBUG")]
+		static public void Debug (string message, params object[] args)
+		{
+			Debug (4, message, args);
+		}
+			
+		[Conditional ("MCS_DEBUG")]
+		static public void Debug (int category, string message, params object[] args)
+		{
+			if ((category & DebugFlags) == 0)
+				return;
+
+			StringBuilder sb = new StringBuilder (message);
+
+			if ((args != null) && (args.Length > 0)) {
+				sb.Append (": ");
+
+				bool first = true;
+				foreach (object arg in args) {
+					if (first)
+						first = false;
+					else
+						sb.Append (",");
+					if (arg == null)
+						sb.Append ("null");
+					else
+						sb.Append (arg);
+				}
+			}
+
+			Console.WriteLine (sb.ToString ());
+		}
+	}
+
+	public class Message {
+		public int code;
+		public string text;
+		
+		public Message (int code, string text)
+		{
+			this.code = code;
+			this.text = text;
+		}
+	}
+
+	public class WarningMessage : Message {
+		public WarningMessage (int code, string text) : base (code, text)
+		{
+		}
+	}
+
+	public class ErrorMessage : Message {
+		public ErrorMessage (int code, string text) : base (code, text)
+		{
+		}
+
+		//
+		// For compatibility reasons with old code.
+		//
+		public static void report_error (string error)
+		{
+			Console.Write ("ERROR: ");
+			Console.WriteLine (error);
+		}
+	}
+}
+
+
diff --git a/mcs/mbas/rootcontext.cs b/mcs/mbas/rootcontext.cs
new file mode 100644
index 00000000000..9de9670cf92
--- /dev/null
+++ b/mcs/mbas/rootcontext.cs
@@ -0,0 +1,784 @@
+//
+// rootcontext.cs: keeps track of our tree representation, and assemblies loaded.
+//
+// Author: Miguel de Icaza (miguel@ximian.com)
+//         Ravi Pratap     (ravi@ximian.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Diagnostics;
+
+namespace Mono.CSharp {
+
+	public class RootContext {
+
+		//
+		// Contains the parsed tree
+		//
+		static Tree tree;
+
+		//
+		// This hashtable contains all of the #definitions across the source code
+		// it is used by the ConditionalAttribute handler.
+		//
+		public static Hashtable AllDefines = new Hashtable ();
+		
+		//
+		// The list of global attributes (those that target the assembly)
+		//
+		static Hashtable global_attributes = new Hashtable ();
+		
+		//
+		// Whether we are being linked against the standard libraries.
+		// This is only used to tell whether `System.Object' should
+		// have a parent or not.
+		//
+		public static bool StdLib = true;
+
+		//
+		// This keeps track of the order in which classes were defined
+		// so that we can poulate them in that order.
+		//
+		// Order is important, because we need to be able to tell by
+		// examining the parent's list of methods which ones are virtual
+		// or abstract as well as the parent names (to implement new, 
+		// override).
+		//
+		static ArrayList type_container_resolve_order;
+		static ArrayList interface_resolve_order;
+		static ArrayList attribute_types;
+
+		//
+		// Holds a reference to the Private Implementation Details
+		// class.
+		//
+		static TypeBuilder impl_details_class;
+
+		public static int WarningLevel = 2;
+		
+		//
+		// Constructor
+		//
+		static RootContext ()
+		{
+			tree = new Tree ();
+			interface_resolve_order = new ArrayList ();
+			type_container_resolve_order = new ArrayList ();
+		}
+
+		static public Tree Tree {
+			get {
+				return tree;
+			}
+		}
+
+		static public string MainClass;
+		
+		public static void RegisterOrder (Interface iface)
+		{
+			interface_resolve_order.Add (iface);
+		}
+		
+		public static void RegisterOrder (TypeContainer tc)
+		{
+			type_container_resolve_order.Add (tc);
+		}
+
+		public static void RegisterAttribute (TypeContainer tc)
+		{
+			if (attribute_types == null)
+				attribute_types = new ArrayList ();
+			
+			attribute_types.Add (tc);
+		}
+		
+		// 
+		// The default compiler checked state
+		//
+		static public bool Checked = false;
+
+		//
+		// Whether to allow Unsafe code
+		//
+		static public bool Unsafe = false;
+		
+		static string MakeFQN (string nsn, string name)
+		{
+			string prefix = (nsn == "" ? "" : nsn + ".");
+
+			return prefix + name;
+		}
+		       
+		// <remarks>
+		//   This function is used to resolve the hierarchy tree.
+		//   It processes interfaces, structs and classes in that order.
+		//
+		//   It creates the TypeBuilder's as it processes the user defined
+		//   types.  
+		// </remarks>
+		static public void ResolveTree ()
+		{
+			//
+			// Process the attribute types separately and before anything else
+			//
+			if (attribute_types != null)
+				foreach (TypeContainer tc in attribute_types)
+					tc.DefineType ();
+			
+			//
+			// Interfaces are processed next, as classes and
+			// structs might inherit from an object or implement
+			// a set of interfaces, we need to be able to tell
+			// them appart by just using the TypeManager.
+			//
+			TypeContainer root = Tree.Types;
+
+			ArrayList ifaces = root.Interfaces;
+			if (ifaces != null){
+				foreach (Interface i in ifaces) 
+					i.DefineType ();
+			}
+
+			
+			foreach (TypeContainer tc in root.Types) 
+				tc.DefineType ();
+
+			if (root.Delegates != null)
+				foreach (Delegate d in root.Delegates) 
+					d.DefineType ();
+
+			if (root.Enums != null)
+				foreach (Enum e in root.Enums)
+					e.DefineType ();
+			
+		}
+
+		static void Error_TypeConflict (string name, Location loc)
+		{
+			Report.Error (
+				520, loc, "`" + name + "' conflicts with a predefined type");
+		}
+
+		static void Error_TypeConflict (string name)
+		{
+			Report.Error (
+				520, "`" + name + "' conflicts with a predefined type");
+		}
+
+		//
+		// Resolves a single class during the corlib bootstrap process
+		//
+		static TypeBuilder BootstrapCorlib_ResolveClass (TypeContainer root, string name)
+		{
+			object o = root.GetDefinition (name);
+			if (o == null){
+				Report.Error (518, "The predefined type `" + name + "' is not defined");
+				return null;
+			}
+
+			if (!(o is Class)){
+				if (o is DeclSpace){
+					DeclSpace d = (DeclSpace) o;
+
+					Error_TypeConflict (name, d.Location);
+				} else
+					Error_TypeConflict (name);
+
+				return null;
+			}
+
+			return ((DeclSpace) o).DefineType ();
+		}
+
+		//
+		// Resolves a struct during the corlib bootstrap process
+		//
+		static void BootstrapCorlib_ResolveStruct (TypeContainer root, string name)
+		{
+			object o = root.GetDefinition (name);
+			if (o == null){
+				Report.Error (518, "The predefined type `" + name + "' is not defined");
+				return;
+			}
+
+			if (!(o is Struct)){
+				if (o is DeclSpace){
+					DeclSpace d = (DeclSpace) o;
+
+					Error_TypeConflict (name, d.Location);
+				} else
+					Error_TypeConflict (name);
+
+				return;
+			}
+
+			((DeclSpace) o).DefineType ();
+		}
+
+		//
+		// Resolves a struct during the corlib bootstrap process
+		//
+		static void BootstrapCorlib_ResolveInterface (TypeContainer root, string name)
+		{
+			object o = root.GetDefinition (name);
+			if (o == null){
+				Report.Error (518, "The predefined type `" + name + "' is not defined");
+				return;
+			}
+
+			if (!(o is Interface)){
+				if (o is DeclSpace){
+					DeclSpace d = (DeclSpace) o;
+
+					Error_TypeConflict (name, d.Location);
+				} else
+					Error_TypeConflict (name);
+
+				return;
+			}
+
+			((DeclSpace) o).DefineType ();
+		}
+
+		//
+		// Resolves a delegate during the corlib bootstrap process
+		//
+		static void BootstrapCorlib_ResolveDelegate (TypeContainer root, string name)
+		{
+			object o = root.GetDefinition (name);
+			if (o == null){
+				Report.Error (518, "The predefined type `" + name + "' is not defined");
+				Environment.Exit (0);
+			}
+
+			if (!(o is Delegate)){
+				Error_TypeConflict (name);
+				return;
+			}
+
+			((DeclSpace) o).DefineType ();
+		}
+		
+
+		/// <summary>
+		///    Resolves the core types in the compiler when compiling with --nostdlib
+		/// </summary>
+		static public void ResolveCore ()
+		{
+			TypeContainer root = Tree.Types;
+
+			TypeManager.object_type = BootstrapCorlib_ResolveClass (root, "System.Object");
+			TypeManager.value_type = BootstrapCorlib_ResolveClass (root, "System.ValueType");
+			TypeManager.attribute_type = BootstrapCorlib_ResolveClass (root, "System.Attribute");
+			
+			string [] interfaces_first_stage = {
+				"System.IComparable", "System.ICloneable",
+				"System.IConvertible",
+				
+				"System.Collections.IEnumerable",
+				"System.Collections.ICollection",
+				"System.Collections.IEnumerator",
+				"System.Collections.IList", 
+				"System.IAsyncResult",
+				"System.IDisposable",
+				
+				"System.Runtime.Serialization.ISerializable",
+
+				"System.Reflection.IReflect",
+				"System.Reflection.ICustomAttributeProvider"
+			};
+
+			foreach (string iname in interfaces_first_stage)
+				BootstrapCorlib_ResolveInterface (root, iname);
+
+			//
+			// These are the base value types
+			//
+			string [] structs_first_stage = {
+				"System.Byte",    "System.SByte",
+				"System.Int16",   "System.UInt16",
+				"System.Int32",   "System.UInt32",
+				"System.Int64",   "System.UInt64",
+			};
+
+			foreach (string cname in structs_first_stage)
+				BootstrapCorlib_ResolveStruct (root, cname);
+
+			//
+			// Now, we can load the enumerations, after this point,
+			// we can use enums.
+			//
+			TypeManager.InitEnumUnderlyingTypes ();
+
+			string [] structs_second_stage = {
+				"System.Single",  "System.Double",
+				"System.Char",    "System.Boolean",
+				"System.Decimal", "System.Void",
+				"System.RuntimeFieldHandle",
+				"System.RuntimeTypeHandle",
+				"System.IntPtr"
+			};
+			
+			foreach (string cname in structs_second_stage)
+				BootstrapCorlib_ResolveStruct (root, cname);
+			
+			//
+			// These are classes that depends on the core interfaces
+			//
+			string [] classes_second_stage = {
+				"System.Reflection.MemberInfo",
+				"System.Type",
+				"System.Exception",
+
+				//
+				// These are not really important in the order, but they
+				// are used by the compiler later on (typemanager/CoreLookupType-d)
+				//
+				"System.Runtime.CompilerServices.RuntimeHelpers",
+				"System.Reflection.DefaultMemberAttribute",
+				"System.Threading.Monitor",
+				
+				"System.AttributeUsageAttribute",
+				"System.Runtime.InteropServices.DllImportAttribute",
+				"System.Runtime.CompilerServices.MethodImplAttribute",
+				"System.Runtime.InteropServices.MarshalAsAttribute",
+				"System.Diagnostics.ConditionalAttribute",
+				"System.ObsoleteAttribute",
+				"System.ParamArrayAttribute",
+				"System.Security.UnverifiableCodeAttribute",
+				"System.Runtime.CompilerServices.IndexerNameAttribute",
+			};
+
+			// We must store them here before calling BootstrapCorlib_ResolveDelegate.
+			TypeManager.string_type = BootstrapCorlib_ResolveClass (root, "System.String");
+			TypeManager.enum_type = BootstrapCorlib_ResolveClass (root, "System.Enum");
+			TypeManager.array_type = BootstrapCorlib_ResolveClass (root, "System.Array");
+			TypeManager.multicast_delegate_type = BootstrapCorlib_ResolveClass (root, "System.MulticastDelegate");
+			TypeManager.delegate_type = BootstrapCorlib_ResolveClass (root, "System.Delegate");
+			
+			foreach (string cname in classes_second_stage)
+				BootstrapCorlib_ResolveClass (root, cname);
+
+			BootstrapCorlib_ResolveDelegate (root, "System.AsyncCallback");
+		}
+			
+		// <summary>
+		//   Closes all open types
+		// </summary>
+		//
+		// <remarks>
+		//   We usually use TypeBuilder types.  When we are done
+		//   creating the type (which will happen after we have added
+		//   methods, fields, etc) we need to "Define" them before we
+		//   can save the Assembly
+		// </remarks>
+		static public void CloseTypes ()
+		{
+			TypeContainer root = Tree.Types;
+			
+			ArrayList ifaces = root.Interfaces;
+
+			if (root.Enums != null)
+				foreach (Enum en in root.Enums)
+					en.CloseType ();
+
+			if (attribute_types != null)
+				foreach (TypeContainer tc in attribute_types)
+					tc.CloseType ();
+			
+			foreach (Interface iface in interface_resolve_order)
+				iface.CloseType ();
+
+			//
+			// We do this in two passes, first we close the structs,
+			// then the classes, because it seems the code needs it this
+			// way.  If this is really what is going on, we should probably
+			// make sure that we define the structs in order as well.
+			//
+			foreach (TypeContainer tc in type_container_resolve_order){
+				if (tc is Struct && tc.Parent == tree.Types){
+					tc.CloseType ();
+				}
+			}
+
+			foreach (TypeContainer tc in type_container_resolve_order){
+				if (!(tc is Struct && tc.Parent == tree.Types))
+					tc.CloseType ();					
+			}
+			
+			if (root.Delegates != null)
+				foreach (Delegate d in root.Delegates)
+					d.CloseDelegate ();
+
+
+			//
+			// If we have a <PrivateImplementationDetails> class, close it
+			//
+			if (impl_details_class != null){
+				impl_details_class.CreateType ();
+			}
+		}
+
+		//
+		// This idea is from Felix Arrese-Igor
+		//
+		// Returns : the implicit parent of a composite namespace string
+		//   eg. Implicit parent of A.B is A
+		//
+		static public string ImplicitParent (string ns)
+		{
+			int i = ns.LastIndexOf (".");
+			if (i < 0)
+				return null;
+			
+			return ns.Substring (0, i);
+		}
+
+		static Type NamespaceLookup (Namespace curr_ns, string name)
+		{
+			Type t;
+			
+			//
+			// Try in the current namespace and all its implicit parents
+			//
+			for (string ns = curr_ns.Name; ns != null; ns = ImplicitParent (ns)) {
+				t = TypeManager.LookupType (MakeFQN (ns, name));
+				if (t != null)
+					return t;
+			}
+			
+			//
+			// It's possible that name already is fully qualified. So we do
+			// a simple direct lookup without adding any namespace names
+			//
+			t = TypeManager.LookupType (name); 
+			if (t != null)
+				return t;
+
+			//
+			// Try the aliases in the current namespace
+			//
+			string alias = curr_ns.LookupAlias (name);
+
+			if (alias != null) {
+				t = TypeManager.LookupType (alias);
+				if (t != null)
+					return t;
+
+				t = TypeManager.LookupType (MakeFQN (alias, name));
+				if (t != null)
+					return t;
+			}
+			
+			for (Namespace ns = curr_ns; ns != null; ns = ns.Parent) {
+				//
+				// Look in the namespace ns
+				//
+				t = TypeManager.LookupType (MakeFQN (ns.Name, name));
+				if (t != null)
+					return t;
+				
+				//
+				// Then try with the using clauses
+				//
+				ArrayList using_list = ns.UsingTable;
+
+				if (using_list == null)
+					continue;
+
+				foreach (string n in using_list) {
+					t = TypeManager.LookupType (MakeFQN (n, name));
+					if (t != null)
+						return t;
+				}
+
+				//
+				// Try with aliases
+				//
+				string a = ns.LookupAlias (name);
+				if (a != null) {
+					t = TypeManager.LookupType (a);
+					if (t != null)
+						return t;
+
+					t = TypeManager.LookupType (MakeFQN (a, name));
+					if (t != null)
+						return t;
+				}
+			}
+
+			return null;
+		}
+		
+		//
+		// Public function used to locate types, this can only
+		// be used after the ResolveTree function has been invoked.
+		//
+		// Returns: Type or null if they type can not be found.
+		//
+		// Come to think of it, this should be a DeclSpace
+		//
+		static public Type LookupType (DeclSpace ds, string name, bool silent, Location loc)
+		{
+			Type t;
+
+			if (ds.Cache.Contains (name)){
+				t = (Type) ds.Cache [name];
+				if (t != null)
+					return t;
+			} else {
+				//
+				// For the case the type we are looking for is nested within this one
+				// or is in any base class
+				//
+				DeclSpace containing_ds = ds;
+				while (containing_ds != null){
+					Type current_type = containing_ds.TypeBuilder;
+					
+					while (current_type != null) {
+						//
+						// nested class
+						//
+						t = TypeManager.LookupType (current_type.FullName + "+" + name);
+						if (t != null){
+							ds.Cache [name] = t;
+							return t;
+						}
+						
+						current_type = current_type.BaseType;
+					}
+					
+					containing_ds = containing_ds.Parent;
+				}
+				
+				t = NamespaceLookup (ds.Namespace, name);
+				if (t != null){
+					ds.Cache [name] = t;
+					return t;
+				}
+			}
+
+			if (!silent)
+				Report.Error (246, loc, "Cannot find type `"+name+"'");
+			
+			return null;
+		}
+
+		// <summary>
+		//   This is the silent version of LookupType, you can use this
+		//   to `probe' for a type
+		// </summary>
+		static public Type LookupType (TypeContainer tc, string name, Location loc)
+		{
+			return LookupType (tc, name, true, loc);
+		}
+
+		static public bool IsNamespace (string name)
+		{
+			Namespace ns;
+
+			if (tree.Namespaces != null){
+				ns = (Namespace) tree.Namespaces [name];
+
+				if (ns != null)
+					return true;
+			}
+
+			return false;
+		}
+
+		static void Report1530 (Location loc)
+		{
+			Report.Error (1530, loc, "Keyword new not allowed for namespace elements");
+		}
+		
+		static public void PopulateCoreType (TypeContainer root, string name)
+		{
+			DeclSpace ds = (DeclSpace) root.GetDefinition (name);
+
+			ds.Define (root);
+		}
+		
+		static public void BootCorlib_PopulateCoreTypes ()
+		{
+			TypeContainer root = tree.Types;
+
+			PopulateCoreType (root, "System.Object");
+			PopulateCoreType (root, "System.ValueType");
+			PopulateCoreType (root, "System.Attribute");
+		}
+		
+		// <summary>
+		//   Populates the structs and classes with fields and methods
+		// </summary>
+		//
+		// This is invoked after all interfaces, structs and classes
+		// have been defined through `ResolveTree' 
+		static public void PopulateTypes ()
+		{
+			TypeContainer root = Tree.Types;
+
+			if (attribute_types != null)
+				foreach (TypeContainer tc in attribute_types)
+					tc.Define (root);
+			
+			if (interface_resolve_order != null){
+				foreach (Interface iface in interface_resolve_order)
+					if ((iface.ModFlags & Modifiers.NEW) == 0)
+						iface.Define (root);
+					else
+						Report1530 (iface.Location);
+			}
+
+
+			if (type_container_resolve_order != null){
+				foreach (TypeContainer tc in type_container_resolve_order) {
+					// When compiling corlib, these types have already been
+					// populated from BootCorlib_PopulateCoreTypes ().
+					if (!RootContext.StdLib &&
+					    ((tc.Name == "System.Object") ||
+					     (tc.Name == "System.Attribute") ||
+					     (tc.Name == "System.ValueType")))
+						continue;
+
+					if ((tc.ModFlags & Modifiers.NEW) == 0)
+						tc.Define (root);
+					else
+						Report1530 (tc.Location);
+				}
+			}
+
+			ArrayList delegates = root.Delegates;
+			if (delegates != null){
+				foreach (Delegate d in delegates)
+					if ((d.ModFlags & Modifiers.NEW) == 0)
+						d.Define (root);
+					else
+						Report1530 (d.Location);
+			}
+
+			ArrayList enums = root.Enums;
+			if (enums != null){
+				foreach (Enum en in enums)
+					if ((en.ModFlags & Modifiers.NEW) == 0)
+						en.Define (root);
+					else
+						Report1530 (en.Location);
+			}
+		}
+
+		static public void EmitCode ()
+		{
+			//
+			// Because of the strange way in which we do things, global
+			// attributes must be processed first.
+			//
+			if (global_attributes.Count > 0){
+				AssemblyBuilder ab = CodeGen.AssemblyBuilder;
+				TypeContainer dummy = new TypeContainer (null, "", new Location (-1));
+				EmitContext temp_ec = new EmitContext (
+					dummy, Mono.CSharp.Location.Null, null, null, 0, false);
+			
+				foreach (DictionaryEntry de in global_attributes){
+					Namespace ns = (Namespace) de.Key;
+					Attributes attrs = (Attributes) de.Value;
+					
+					dummy.Namespace = ns;
+					Attribute.ApplyAttributes (temp_ec, ab, ab, attrs, attrs.Location);
+				}
+			}
+			
+			if (attribute_types != null)
+				foreach (TypeContainer tc in attribute_types)
+					tc.Emit ();
+			
+			if (type_container_resolve_order != null) {
+				foreach (TypeContainer tc in type_container_resolve_order)
+					tc.EmitConstants ();
+				
+				foreach (TypeContainer tc in type_container_resolve_order)
+					tc.Emit ();
+			}
+			
+			if (Unsafe) {
+				if (TypeManager.unverifiable_code_ctor == null) {
+					Console.WriteLine ("Internal error ! Cannot set unverifiable code attribute.");
+					return;
+				}
+				
+				CustomAttributeBuilder cb = new CustomAttributeBuilder (TypeManager.unverifiable_code_ctor, new object [0]);
+				CodeGen.ModuleBuilder.SetCustomAttribute (cb);
+			}
+		}
+		
+		//
+		// Public Field, used to track which method is the public entry
+		// point.
+		//
+		static public MethodInfo EntryPoint;
+
+                //
+                // Track the location of the entry point.
+                //
+                static public Location EntryPointLocation;
+
+		//
+		// These are used to generate unique names on the structs and fields.
+		//
+		static int field_count;
+		
+		//
+		// Makes an initialized struct, returns the field builder that
+		// references the data.  Thanks go to Sergey Chaban for researching
+		// how to do this.  And coming up with a shorter mechanism than I
+		// was able to figure out.
+		//
+		// This works but makes an implicit public struct $ArrayType$SIZE and
+		// makes the fields point to it.  We could get more control if we did
+		// use instead:
+		//
+		// 1. DefineNestedType on the impl_details_class with our struct.
+		//
+		// 2. Define the field on the impl_details_class
+		//
+		static public FieldBuilder MakeStaticData (byte [] data)
+		{
+			FieldBuilder fb;
+			int size = data.Length;
+			
+			if (impl_details_class == null)
+				impl_details_class = CodeGen.ModuleBuilder.DefineType (
+					"<PrivateImplementationDetails>", TypeAttributes.NotPublic, TypeManager.object_type);
+
+			fb = impl_details_class.DefineInitializedData (
+				"$$field-" + (field_count++), data,
+				FieldAttributes.Static | FieldAttributes.Assembly);
+			
+			return fb;
+		}
+
+		//
+		// Adds a global attribute that was declared in `container', 
+		// the attribute is in `attr', and it was defined at `loc'
+		//
+		static public void AddGlobalAttribute (TypeContainer container,
+						       AttributeSection attr, Location loc)
+		{
+			Namespace ns = container.Namespace;
+			Attributes a = (Attributes) global_attributes [ns];
+
+			if (a == null)
+				global_attributes [ns] = new Attributes (attr, loc);
+			else
+				a.AddAttribute (attr);
+		}
+	}
+}
+	      
+
diff --git a/mcs/mbas/statement.cs b/mcs/mbas/statement.cs
new file mode 100644
index 00000000000..84dba12813a
--- /dev/null
+++ b/mcs/mbas/statement.cs
@@ -0,0 +1,4704 @@
+//
+// statement.cs: Statement representation for the IL tree.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Martin Baulig (martin@gnome.org)
+//
+// (C) 2001, 2002 Ximian, Inc.
+//
+
+using System;
+using System.Text;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Diagnostics;
+
+namespace Mono.CSharp {
+
+	using System.Collections;
+	
+	public abstract class Statement {
+		public Location loc;
+		
+		///
+		/// Resolves the statement, true means that all sub-statements
+		/// did resolve ok.
+		//
+		public virtual bool Resolve (EmitContext ec)
+		{
+			return true;
+		}
+		
+		/// <summary>
+		///   Return value indicates whether all code paths emitted return.
+		/// </summary>
+		public abstract bool Emit (EmitContext ec);
+		
+		public static Expression ResolveBoolean (EmitContext ec, Expression e, Location loc)
+		{
+			e = e.Resolve (ec);
+			if (e == null)
+				return null;
+			
+			if (e.Type != TypeManager.bool_type){
+				e = Expression.ConvertImplicit (ec, e, TypeManager.bool_type,
+								new Location (-1));
+			}
+
+			if (e == null){
+				Report.Error (
+					31, loc, "Can not convert the expression to a boolean");
+			}
+
+			if (CodeGen.SymbolWriter != null)
+				ec.Mark (loc);
+
+			return e;
+		}
+		
+		/// <remarks>
+		///    Encapsulates the emission of a boolean test and jumping to a
+		///    destination.
+		///
+		///    This will emit the bool expression in `bool_expr' and if
+		///    `target_is_for_true' is true, then the code will generate a 
+		///    brtrue to the target.   Otherwise a brfalse. 
+		/// </remarks>
+		public static void EmitBoolExpression (EmitContext ec, Expression bool_expr,
+						       Label target, bool target_is_for_true)
+		{
+			ILGenerator ig = ec.ig;
+			
+			bool invert = false;
+			if (bool_expr is Unary){
+				Unary u = (Unary) bool_expr;
+				
+				if (u.Oper == Unary.Operator.LogicalNot){
+					invert = true;
+
+					u.EmitLogicalNot (ec);
+				}
+			} else if (bool_expr is Binary){
+				Binary b = (Binary) bool_expr;
+
+				if (b.EmitBranchable (ec, target, target_is_for_true))
+					return;
+			}
+
+			if (!invert)
+				bool_expr.Emit (ec);
+
+			if (target_is_for_true){
+				if (invert)
+					ig.Emit (OpCodes.Brfalse, target);
+				else
+					ig.Emit (OpCodes.Brtrue, target);
+			} else {
+				if (invert)
+					ig.Emit (OpCodes.Brtrue, target);
+				else
+					ig.Emit (OpCodes.Brfalse, target);
+			}
+		}
+
+		public static void Warning_DeadCodeFound (Location loc)
+		{
+			Report.Warning (162, loc, "Unreachable code detected");
+		}
+	}
+
+	public class EmptyStatement : Statement {
+		public override bool Resolve (EmitContext ec)
+		{
+			return true;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			return false;
+		}
+	}
+	
+	public class If : Statement {
+		Expression expr;
+		public Statement TrueStatement;
+		public Statement FalseStatement;
+		
+		public If (Expression expr, Statement trueStatement, Location l)
+		{
+			this.expr = expr;
+			TrueStatement = trueStatement;
+			loc = l;
+		}
+
+		public If (Expression expr,
+			   Statement trueStatement,
+			   Statement falseStatement,
+			   Location l)
+		{
+			this.expr = expr;
+			TrueStatement = trueStatement;
+			FalseStatement = falseStatement;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			Report.Debug (1, "START IF BLOCK");
+
+			expr = ResolveBoolean (ec, expr, loc);
+			if (expr == null){
+				return false;
+			}
+			
+			ec.StartFlowBranching (FlowBranchingType.BLOCK, loc);
+			
+			if (!TrueStatement.Resolve (ec)) {
+				ec.KillFlowBranching ();
+				return false;
+			}
+
+			ec.CurrentBranching.CreateSibling ();
+
+			if ((FalseStatement != null) && !FalseStatement.Resolve (ec)) {
+				ec.KillFlowBranching ();
+				return false;
+			}
+					
+			ec.EndFlowBranching ();
+
+			Report.Debug (1, "END IF BLOCK");
+
+			return true;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label false_target = ig.DefineLabel ();
+			Label end;
+			bool is_true_ret, is_false_ret;
+
+			//
+			// Dead code elimination
+			//
+			if (expr is BoolConstant){
+				bool take = ((BoolConstant) expr).Value;
+
+				if (take){
+					if (FalseStatement != null){
+						Warning_DeadCodeFound (FalseStatement.loc);
+					}
+					return TrueStatement.Emit (ec);
+				} else {
+					Warning_DeadCodeFound (TrueStatement.loc);
+					if (FalseStatement != null)
+						return FalseStatement.Emit (ec);
+				}
+			}
+			
+			EmitBoolExpression (ec, expr, false_target, false);
+
+			is_true_ret = TrueStatement.Emit (ec);
+			is_false_ret = is_true_ret;
+
+			if (FalseStatement != null){
+				bool branch_emitted = false;
+				
+				end = ig.DefineLabel ();
+				if (!is_true_ret){
+					ig.Emit (OpCodes.Br, end);
+					branch_emitted = true;
+				}
+
+				ig.MarkLabel (false_target);
+				is_false_ret = FalseStatement.Emit (ec);
+
+				if (branch_emitted)
+					ig.MarkLabel (end);
+			} else {
+				ig.MarkLabel (false_target);
+				is_false_ret = false;
+			}
+
+			return is_true_ret && is_false_ret;
+		}
+	}
+
+	public class Do : Statement {
+		public Expression expr;
+		public readonly Statement  EmbeddedStatement;
+		
+		public Do (Statement statement, Expression boolExpr, Location l)
+		{
+			expr = boolExpr;
+			EmbeddedStatement = statement;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			if (!EmbeddedStatement.Resolve (ec))
+				return false;
+
+			expr = ResolveBoolean (ec, expr, loc);
+			if (expr == null)
+				return false;
+			
+			return true;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label loop = ig.DefineLabel ();
+			Label old_begin = ec.LoopBegin;
+			Label old_end = ec.LoopEnd;
+			bool  old_inloop = ec.InLoop;
+			bool old_breaks = ec.Breaks;
+			int old_loop_begin_try_catch_level = ec.LoopBeginTryCatchLevel;
+			
+			ec.LoopBegin = ig.DefineLabel ();
+			ec.LoopEnd = ig.DefineLabel ();
+			ec.InLoop = true;
+			ec.LoopBeginTryCatchLevel = ec.TryCatchLevel;
+				
+			ig.MarkLabel (loop);
+			ec.Breaks = false;
+			EmbeddedStatement.Emit (ec);
+			bool breaks = ec.Breaks;
+			ig.MarkLabel (ec.LoopBegin);
+
+			//
+			// Dead code elimination
+			//
+			if (expr is BoolConstant){
+				bool res = ((BoolConstant) expr).Value;
+
+				if (res)
+					ec.ig.Emit (OpCodes.Br, loop); 
+			} else
+				EmitBoolExpression (ec, expr, loop, true);
+			
+			ig.MarkLabel (ec.LoopEnd);
+
+			ec.LoopBeginTryCatchLevel = old_loop_begin_try_catch_level;
+			ec.LoopBegin = old_begin;
+			ec.LoopEnd = old_end;
+			ec.InLoop = old_inloop;
+			ec.Breaks = old_breaks;
+
+			//
+			// Inform whether we are infinite or not
+			//
+			if (expr is BoolConstant){
+				BoolConstant bc = (BoolConstant) expr;
+
+				if (bc.Value == true)
+					return breaks == false;
+			}
+			
+			return false;
+		}
+	}
+
+	public class While : Statement {
+		public Expression expr;
+		public readonly Statement Statement;
+		
+		public While (Expression boolExpr, Statement statement, Location l)
+		{
+			this.expr = boolExpr;
+			Statement = statement;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			expr = ResolveBoolean (ec, expr, loc);
+			if (expr == null)
+				return false;
+			
+			return Statement.Resolve (ec);
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label old_begin = ec.LoopBegin;
+			Label old_end = ec.LoopEnd;
+			bool old_inloop = ec.InLoop;
+			bool old_breaks = ec.Breaks;
+			Label while_loop = ig.DefineLabel ();
+			int old_loop_begin_try_catch_level = ec.LoopBeginTryCatchLevel;
+			bool ret;
+			
+			ec.LoopBegin = ig.DefineLabel ();
+			ec.LoopEnd = ig.DefineLabel ();
+			ec.InLoop = true;
+			ec.LoopBeginTryCatchLevel = ec.TryCatchLevel;
+
+			ig.Emit (OpCodes.Br, ec.LoopBegin);
+			ig.MarkLabel (while_loop);
+
+			//
+			// Inform whether we are infinite or not
+			//
+			if (expr is BoolConstant){
+				BoolConstant bc = (BoolConstant) expr;
+
+				ig.MarkLabel (ec.LoopBegin);
+				if (bc.Value == false){
+					Warning_DeadCodeFound (Statement.loc);
+					ret = false;
+				} else {
+					bool breaks;
+					
+					ec.Breaks = false;
+					Statement.Emit (ec);
+					breaks = ec.Breaks;
+					ig.Emit (OpCodes.Br, ec.LoopBegin);
+					
+					//
+					// Inform that we are infinite (ie, `we return'), only
+					// if we do not `break' inside the code.
+					//
+					ret = breaks == false;
+				}
+				ig.MarkLabel (ec.LoopEnd);
+			} else {
+				Statement.Emit (ec);
+			
+				ig.MarkLabel (ec.LoopBegin);
+
+				EmitBoolExpression (ec, expr, while_loop, true);
+				ig.MarkLabel (ec.LoopEnd);
+
+				ret = false;
+			}	
+
+			ec.LoopBegin = old_begin;
+			ec.LoopEnd = old_end;
+			ec.InLoop = old_inloop;
+			ec.Breaks = old_breaks;
+			ec.LoopBeginTryCatchLevel = old_loop_begin_try_catch_level;
+
+			return ret;
+		}
+	}
+
+	public class For : Statement {
+		Expression Test;
+		readonly Statement InitStatement;
+		readonly Statement Increment;
+		readonly Statement Statement;
+		
+		public For (Statement initStatement,
+			    Expression test,
+			    Statement increment,
+			    Statement statement,
+			    Location l)
+		{
+			InitStatement = initStatement;
+			Test = test;
+			Increment = increment;
+			Statement = statement;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			bool ok = true;
+
+			if (InitStatement != null){
+				if (!InitStatement.Resolve (ec))
+					ok = false;
+			}
+
+			if (Test != null){
+				Test = ResolveBoolean (ec, Test, loc);
+				if (Test == null)
+					ok = false;
+			}
+
+			if (Increment != null){
+				if (!Increment.Resolve (ec))
+					ok = false;
+			}
+			
+			return Statement.Resolve (ec) && ok;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label old_begin = ec.LoopBegin;
+			Label old_end = ec.LoopEnd;
+			bool old_inloop = ec.InLoop;
+			bool old_breaks = ec.Breaks;
+			int old_loop_begin_try_catch_level = ec.LoopBeginTryCatchLevel;
+			Label loop = ig.DefineLabel ();
+			Label test = ig.DefineLabel ();
+			
+			if (InitStatement != null)
+				if (! (InitStatement is EmptyStatement))
+					InitStatement.Emit (ec);
+
+			ec.LoopBegin = ig.DefineLabel ();
+			ec.LoopEnd = ig.DefineLabel ();
+			ec.InLoop = true;
+			ec.LoopBeginTryCatchLevel = ec.TryCatchLevel;
+
+			ig.Emit (OpCodes.Br, test);
+			ig.MarkLabel (loop);
+			ec.Breaks = false;
+			Statement.Emit (ec);
+			bool breaks = ec.Breaks;
+
+			ig.MarkLabel (ec.LoopBegin);
+			if (!(Increment is EmptyStatement))
+				Increment.Emit (ec);
+
+			ig.MarkLabel (test);
+			//
+			// If test is null, there is no test, and we are just
+			// an infinite loop
+			//
+			if (Test != null)
+				EmitBoolExpression (ec, Test, loop, true);
+			else
+				ig.Emit (OpCodes.Br, loop);
+			ig.MarkLabel (ec.LoopEnd);
+
+			ec.LoopBegin = old_begin;
+			ec.LoopEnd = old_end;
+			ec.InLoop = old_inloop;
+			ec.Breaks = old_breaks;
+			ec.LoopBeginTryCatchLevel = old_loop_begin_try_catch_level;
+			
+			//
+			// Inform whether we are infinite or not
+			//
+			if (Test != null){
+				if (Test is BoolConstant){
+					BoolConstant bc = (BoolConstant) Test;
+
+					if (bc.Value)
+						return breaks == false;
+				}
+				return false;
+			} else
+				return true;
+		}
+	}
+	
+	public class StatementExpression : Statement {
+		Expression expr;
+		
+		public StatementExpression (ExpressionStatement expr, Location l)
+		{
+			this.expr = expr;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			expr = (Expression) expr.Resolve (ec);
+			return expr != null;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			if (expr is ExpressionStatement)
+				((ExpressionStatement) expr).EmitStatement (ec);
+			else {
+				expr.Emit (ec);
+				ig.Emit (OpCodes.Pop);
+			}
+
+			return false;
+		}
+
+		public override string ToString ()
+		{
+			return "StatementExpression (" + expr + ")";
+		}
+	}
+
+	/// <summary>
+	///   Implements the return statement
+	/// </summary>
+	public class Return : Statement {
+		public Expression Expr;
+		
+		public Return (Expression expr, Location l)
+		{
+			Expr = expr;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			if (Expr != null){
+				Expr = Expr.Resolve (ec);
+				if (Expr == null)
+					return false;
+			}
+
+			FlowBranching.UsageVector vector = ec.CurrentBranching.CurrentUsageVector;
+
+			if (ec.CurrentBranching.InTryBlock ())
+				ec.CurrentBranching.AddFinallyVector (vector);
+
+			vector.Returns = FlowReturns.ALWAYS;
+			vector.Breaks = FlowReturns.ALWAYS;
+
+			return true;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			if (ec.InFinally){
+				Report.Error (157,loc,"Control can not leave the body of the finally block");
+				return false;
+			}
+			
+			if (ec.ReturnType == null){
+				if (Expr != null){
+					Report.Error (127, loc, "Return with a value not allowed here");
+					return true;
+				}
+			} else {
+				if (Expr == null){
+					Report.Error (126, loc, "An object of type `" +
+						      TypeManager.CSharpName (ec.ReturnType) + "' is " +
+						      "expected for the return statement");
+					return true;
+				}
+
+				if (Expr.Type != ec.ReturnType)
+					Expr = Expression.ConvertImplicitRequired (
+						ec, Expr, ec.ReturnType, loc);
+
+				if (Expr == null)
+					return true;
+
+				Expr.Emit (ec);
+
+				if (ec.InTry || ec.InCatch)
+					ec.ig.Emit (OpCodes.Stloc, ec.TemporaryReturn ());
+			}
+
+			if (ec.InTry || ec.InCatch) {
+				if (!ec.HasReturnLabel) {
+					ec.ReturnLabel = ec.ig.DefineLabel ();
+					ec.HasReturnLabel = true;
+				}
+				ec.ig.Emit (OpCodes.Leave, ec.ReturnLabel);
+			} else
+				ec.ig.Emit (OpCodes.Ret);
+
+			return true; 
+		}
+	}
+
+	public class Goto : Statement {
+		string target;
+		Block block;
+		LabeledStatement label;
+		
+		public override bool Resolve (EmitContext ec)
+		{
+			label = block.LookupLabel (target);
+			if (label == null){
+				Report.Error (
+					159, loc,
+					"No such label `" + target + "' in this scope");
+				return false;
+			}
+
+			// If this is a forward goto.
+			if (!label.IsDefined)
+				label.AddUsageVector (ec.CurrentBranching.CurrentUsageVector);
+
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.ALWAYS;
+
+			return true;
+		}
+		
+		public Goto (Block parent_block, string label, Location l)
+		{
+			block = parent_block;
+			loc = l;
+			target = label;
+		}
+
+		public string Target {
+			get {
+				return target;
+			}
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			Label l = label.LabelTarget (ec);
+			ec.ig.Emit (OpCodes.Br, l);
+			
+			return false;
+		}
+	}
+
+	public class LabeledStatement : Statement {
+		public readonly Location Location;
+		string label_name;
+		bool defined;
+		bool referenced;
+		Label label;
+
+		ArrayList vectors;
+		
+		public LabeledStatement (string label_name, Location l)
+		{
+			this.label_name = label_name;
+			this.Location = l;
+		}
+
+		public Label LabelTarget (EmitContext ec)
+		{
+			if (defined)
+				return label;
+			label = ec.ig.DefineLabel ();
+			defined = true;
+
+			return label;
+		}
+
+		public bool IsDefined {
+			get {
+				return defined;
+			}
+		}
+
+		public bool HasBeenReferenced {
+			get {
+				return referenced;
+			}
+		}
+
+		public void AddUsageVector (FlowBranching.UsageVector vector)
+		{
+			if (vectors == null)
+				vectors = new ArrayList ();
+
+			vectors.Add (vector.Clone ());
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			if (vectors != null)
+				ec.CurrentBranching.CurrentUsageVector.MergeJumpOrigins (vectors);
+
+			referenced = true;
+
+			return true;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			LabelTarget (ec);
+			ec.ig.MarkLabel (label);
+
+			return false;
+		}
+	}
+	
+
+	/// <summary>
+	///   `goto default' statement
+	/// </summary>
+	public class GotoDefault : Statement {
+		
+		public GotoDefault (Location l)
+		{
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			ec.CurrentBranching.CurrentUsageVector.Returns = FlowReturns.UNREACHABLE;
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.ALWAYS;
+			return true;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			if (ec.Switch == null){
+				Report.Error (153, loc, "goto default is only valid in a switch statement");
+				return false;
+			}
+
+			if (!ec.Switch.GotDefault){
+				Report.Error (159, loc, "No default target on switch statement");
+				return false;
+			}
+			ec.ig.Emit (OpCodes.Br, ec.Switch.DefaultTarget);
+			return false;
+		}
+	}
+
+	/// <summary>
+	///   `goto case' statement
+	/// </summary>
+	public class GotoCase : Statement {
+		Expression expr;
+		Label label;
+		
+		public GotoCase (Expression e, Location l)
+		{
+			expr = e;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			if (ec.Switch == null){
+				Report.Error (153, loc, "goto case is only valid in a switch statement");
+				return false;
+			}
+
+			expr = expr.Resolve (ec);
+			if (expr == null)
+				return false;
+
+			if (!(expr is Constant)){
+				Report.Error (159, loc, "Target expression for goto case is not constant");
+				return false;
+			}
+
+			object val = Expression.ConvertIntLiteral (
+				(Constant) expr, ec.Switch.SwitchType, loc);
+
+			if (val == null)
+				return false;
+					
+			SwitchLabel sl = (SwitchLabel) ec.Switch.Elements [val];
+
+			if (sl == null){
+				Report.Error (
+					159, loc,
+					"No such label 'case " + val + "': for the goto case");
+			}
+
+			label = sl.ILLabelCode;
+
+			ec.CurrentBranching.CurrentUsageVector.Returns = FlowReturns.UNREACHABLE;
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.ALWAYS;
+			return true;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Br, label);
+			return true;
+		}
+	}
+	
+	public class Throw : Statement {
+		Expression expr;
+		
+		public Throw (Expression expr, Location l)
+		{
+			this.expr = expr;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			if (expr != null){
+				expr = expr.Resolve (ec);
+				if (expr == null)
+					return false;
+
+				ExprClass eclass = expr.eclass;
+
+				if (!(eclass == ExprClass.Variable || eclass == ExprClass.PropertyAccess ||
+				      eclass == ExprClass.Value || eclass == ExprClass.IndexerAccess)) {
+					expr.Error118 ("value, variable, property or indexer access ");
+					return false;
+				}
+
+				Type t = expr.Type;
+				
+				if (t != TypeManager.exception_type && !t.IsSubclassOf (TypeManager.exception_type)) {
+					Report.Error (155, loc,
+						      "The type caught or thrown must be derived " +
+						      "from System.Exception");
+					return false;
+				}
+			}
+
+			ec.CurrentBranching.CurrentUsageVector.Returns = FlowReturns.EXCEPTION;
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.EXCEPTION;
+			return true;
+		}
+			
+		public override bool Emit (EmitContext ec)
+		{
+			if (expr == null){
+				if (ec.InCatch)
+					ec.ig.Emit (OpCodes.Rethrow);
+				else {
+					Report.Error (
+						156, loc,
+						"A throw statement with no argument is only " +
+						"allowed in a catch clause");
+				}
+				return false;
+			}
+
+			expr.Emit (ec);
+
+			ec.ig.Emit (OpCodes.Throw);
+
+			return true;
+		}
+	}
+
+	public class Break : Statement {
+		
+		public Break (Location l)
+		{
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.ALWAYS;
+			return true;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			if (ec.InLoop == false && ec.Switch == null){
+				Report.Error (139, loc, "No enclosing loop or switch to continue to");
+				return false;
+			}
+
+			ec.Breaks = true;
+			if (ec.InTry || ec.InCatch)
+				ig.Emit (OpCodes.Leave, ec.LoopEnd);
+			else
+				ig.Emit (OpCodes.Br, ec.LoopEnd);
+
+			return false;
+		}
+	}
+
+	public class Continue : Statement {
+		
+		public Continue (Location l)
+		{
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.ALWAYS;
+			return true;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			Label begin = ec.LoopBegin;
+			
+			if (!ec.InLoop){
+				Report.Error (139, loc, "No enclosing loop to continue to");
+				return false;
+			} 
+
+			//
+			// UGH: Non trivial.  This Br might cross a try/catch boundary
+			// How can we tell?
+			//
+			// while () {
+			//   try { ... } catch { continue; }
+			// }
+			//
+			// From:
+			// try {} catch { while () { continue; }}
+			//
+			if (ec.TryCatchLevel > ec.LoopBeginTryCatchLevel)
+				ec.ig.Emit (OpCodes.Leave, begin);
+			else if (ec.TryCatchLevel < ec.LoopBeginTryCatchLevel)
+				throw new Exception ("Should never happen");
+			else
+				ec.ig.Emit (OpCodes.Br, begin);
+			return false;
+		}
+	}
+
+	// <summary>
+	//   This is used in the control flow analysis code to specify whether the
+	//   current code block may return to its enclosing block before reaching
+	//   its end.
+	// </summary>
+	public enum FlowReturns {
+		// It can never return.
+		NEVER,
+
+		// This means that the block contains a conditional return statement
+		// somewhere.
+		SOMETIMES,
+
+		// The code always returns, ie. there's an unconditional return / break
+		// statement in it.
+		ALWAYS,
+
+		// The code always throws an exception.
+		EXCEPTION,
+
+		// The current code block is unreachable.  This happens if it's immediately
+		// following a FlowReturns.ALWAYS block.
+		UNREACHABLE
+	}
+
+	// <summary>
+	//   This is a special bit vector which can inherit from another bit vector doing a
+	//   copy-on-write strategy.  The inherited vector may have a smaller size than the
+	//   current one.
+	// </summary>
+	public class MyBitVector {
+		public readonly int Count;
+		public readonly MyBitVector InheritsFrom;
+
+		bool is_dirty;
+		BitArray vector;
+
+		public MyBitVector (int Count)
+			: this (null, Count)
+		{ }
+
+		public MyBitVector (MyBitVector InheritsFrom, int Count)
+		{
+			this.InheritsFrom = InheritsFrom;
+			this.Count = Count;
+		}
+
+		// <summary>
+		//   Checks whether this bit vector has been modified.  After setting this to true,
+		//   we won't use the inherited vector anymore, but our own copy of it.
+		// </summary>
+		public bool IsDirty {
+			get {
+				return is_dirty;
+			}
+
+			set {
+				if (!is_dirty)
+					initialize_vector ();
+			}
+		}
+
+		// <summary>
+		//   Get/set bit `index' in the bit vector.
+		// </summary>
+		public bool this [int index]
+		{
+			get {
+				if (index > Count)
+					throw new ArgumentOutOfRangeException ();
+
+				// We're doing a "copy-on-write" strategy here; as long
+				// as nobody writes to the array, we can use our parent's
+				// copy instead of duplicating the vector.
+
+				if (vector != null)
+					return vector [index];
+				else if (InheritsFrom != null) {
+					BitArray inherited = InheritsFrom.Vector;
+
+					if (index < inherited.Count)
+						return inherited [index];
+					else
+						return false;
+				} else
+					return false;
+			}
+
+			set {
+				if (index > Count)
+					throw new ArgumentOutOfRangeException ();
+
+				// Only copy the vector if we're actually modifying it.
+
+				if (this [index] != value) {
+					initialize_vector ();
+
+					vector [index] = value;
+				}
+			}
+		}
+
+		// <summary>
+		//   If you explicitly convert the MyBitVector to a BitArray, you will get a deep
+		//   copy of the bit vector.
+		// </summary>
+		public static explicit operator BitArray (MyBitVector vector)
+		{
+			vector.initialize_vector ();
+			return vector.Vector;
+		}
+
+		// <summary>
+		//   Performs an `or' operation on the bit vector.  The `new_vector' may have a
+		//   different size than the current one.
+		// </summary>
+		public void Or (MyBitVector new_vector)
+		{
+			BitArray new_array = new_vector.Vector;
+
+			initialize_vector ();
+
+			int upper;
+			if (vector.Count < new_array.Count)
+				upper = vector.Count;
+			else
+				upper = new_array.Count;
+
+			for (int i = 0; i < upper; i++)
+				vector [i] = vector [i] | new_array [i];
+		}
+
+		// <summary>
+		//   Perfonrms an `and' operation on the bit vector.  The `new_vector' may have
+		//   a different size than the current one.
+		// </summary>
+		public void And (MyBitVector new_vector)
+		{
+			BitArray new_array = new_vector.Vector;
+
+			initialize_vector ();
+
+			int lower, upper;
+			if (vector.Count < new_array.Count)
+				lower = upper = vector.Count;
+			else {
+				lower = new_array.Count;
+				upper = vector.Count;
+			}
+
+			for (int i = 0; i < lower; i++)
+				vector [i] = vector [i] & new_array [i];
+
+			for (int i = lower; i < upper; i++)
+				vector [i] = false;
+		}
+
+		// <summary>
+		//   This does a deep copy of the bit vector.
+		// </summary>
+		public MyBitVector Clone ()
+		{
+			MyBitVector retval = new MyBitVector (Count);
+
+			retval.Vector = Vector;
+
+			return retval;
+		}
+
+		BitArray Vector {
+			get {
+				if (vector != null)
+					return vector;
+				else if (!is_dirty && (InheritsFrom != null))
+					return InheritsFrom.Vector;
+
+				initialize_vector ();
+
+				return vector;
+			}
+
+			set {
+				initialize_vector ();
+
+				for (int i = 0; i < Math.Min (vector.Count, value.Count); i++)
+					vector [i] = value [i];
+			}
+		}
+
+		void initialize_vector ()
+		{
+			if (vector != null)
+				return;
+
+			vector = new BitArray (Count, false);
+			if (InheritsFrom != null)
+				Vector = InheritsFrom.Vector;
+
+			is_dirty = true;
+		}
+
+		public override string ToString ()
+		{
+			StringBuilder sb = new StringBuilder ("MyBitVector (");
+
+			BitArray vector = Vector;
+			sb.Append (Count);
+			sb.Append (",");
+			if (!IsDirty)
+				sb.Append ("INHERITED - ");
+			for (int i = 0; i < vector.Count; i++) {
+				if (i > 0)
+					sb.Append (",");
+				sb.Append (vector [i]);
+			}
+			
+			sb.Append (")");
+			return sb.ToString ();
+		}
+	}
+
+	// <summary>
+	//   The type of a FlowBranching.
+	// </summary>
+	public enum FlowBranchingType {
+		// Normal (conditional or toplevel) block.
+		BLOCK,
+
+		// Try/Catch block.
+		EXCEPTION,
+
+		// Switch block.
+		SWITCH,
+
+		// Switch section.
+		SWITCH_SECTION
+	}
+
+	// <summary>
+	//   A new instance of this class is created every time a new block is resolved
+	//   and if there's branching in the block's control flow.
+	// </summary>
+	public class FlowBranching {
+		// <summary>
+		//   The type of this flow branching.
+		// </summary>
+		public readonly FlowBranchingType Type;
+
+		// <summary>
+		//   The block this branching is contained in.  This may be null if it's not
+		//   a top-level block and it doesn't declare any local variables.
+		// </summary>
+		public readonly Block Block;
+
+		// <summary>
+		//   The parent of this branching or null if this is the top-block.
+		// </summary>
+		public readonly FlowBranching Parent;
+
+		// <summary>
+		//   Start-Location of this flow branching.
+		// </summary>
+		public readonly Location Location;
+
+		// <summary>
+		//   A list of UsageVectors.  A new vector is added each time control flow may
+		//   take a different path.
+		// </summary>
+		public ArrayList Siblings;
+
+		//
+		// Private
+		//
+		InternalParameters param_info;
+		int[] param_map;
+		int num_params;
+		ArrayList finally_vectors;
+
+		static int next_id = 0;
+		int id;
+
+		// <summary>
+		//   Performs an `And' operation on the FlowReturns status
+		//   (for instance, a block only returns ALWAYS if all its siblings
+		//   always return).
+		// </summary>
+		public static FlowReturns AndFlowReturns (FlowReturns a, FlowReturns b)
+		{
+			if (b == FlowReturns.UNREACHABLE)
+				return a;
+
+			switch (a) {
+			case FlowReturns.NEVER:
+				if (b == FlowReturns.NEVER)
+					return FlowReturns.NEVER;
+				else
+					return FlowReturns.SOMETIMES;
+
+			case FlowReturns.SOMETIMES:
+				return FlowReturns.SOMETIMES;
+
+			case FlowReturns.ALWAYS:
+				if ((b == FlowReturns.ALWAYS) || (b == FlowReturns.EXCEPTION))
+					return FlowReturns.ALWAYS;
+				else
+					return FlowReturns.SOMETIMES;
+
+			case FlowReturns.EXCEPTION:
+				if (b == FlowReturns.EXCEPTION)
+					return FlowReturns.EXCEPTION;
+				else if (b == FlowReturns.ALWAYS)
+					return FlowReturns.ALWAYS;
+				else
+					return FlowReturns.SOMETIMES;
+			}
+
+			return b;
+		}
+
+		// <summary>
+		//   The vector contains a BitArray with information about which local variables
+		//   and parameters are already initialized at the current code position.
+		// </summary>
+		public class UsageVector {
+			// <summary>
+			//   If this is true, then the usage vector has been modified and must be
+			//   merged when we're done with this branching.
+			// </summary>
+			public bool IsDirty;
+
+			// <summary>
+			//   The number of parameters in this block.
+			// </summary>
+			public readonly int CountParameters;
+
+			// <summary>
+			//   The number of locals in this block.
+			// </summary>
+			public readonly int CountLocals;
+
+			// <summary>
+			//   If not null, then we inherit our state from this vector and do a
+			//   copy-on-write.  If null, then we're the first sibling in a top-level
+			//   block and inherit from the empty vector.
+			// </summary>
+			public readonly UsageVector InheritsFrom;
+
+			//
+			// Private.
+			//
+			MyBitVector locals, parameters;
+			FlowReturns real_returns, real_breaks;
+			bool returns_set, breaks_set, is_finally;
+
+			static int next_id = 0;
+			int id;
+
+			//
+			// Normally, you should not use any of these constructors.
+			//
+			public UsageVector (UsageVector parent, int num_params, int num_locals)
+			{
+				this.InheritsFrom = parent;
+				this.CountParameters = num_params;
+				this.CountLocals = num_locals;
+				this.real_returns = FlowReturns.NEVER;
+				this.real_breaks = FlowReturns.NEVER;
+
+				if (parent != null) {
+					locals = new MyBitVector (parent.locals, CountLocals);
+					if (num_params > 0)
+						parameters = new MyBitVector (parent.parameters, num_params);
+				} else {
+					locals = new MyBitVector (null, CountLocals);
+					if (num_params > 0)
+						parameters = new MyBitVector (null, num_params);
+				}
+
+				id = ++next_id;
+			}
+
+			public UsageVector (UsageVector parent)
+				: this (parent, parent.CountParameters, parent.CountLocals)
+			{ }
+
+			// <summary>
+			//   This does a deep copy of the usage vector.
+			// </summary>
+			public UsageVector Clone ()
+			{
+				UsageVector retval = new UsageVector (null, CountParameters, CountLocals);
+
+				retval.locals = locals.Clone ();
+				if (parameters != null)
+					retval.parameters = parameters.Clone ();
+				retval.real_returns = real_returns;
+				retval.real_breaks = real_breaks;
+
+				return retval;
+			}
+
+			// 
+			// State of parameter `number'.
+			//
+			public bool this [int number]
+			{
+				get {
+					if (number == -1)
+						return true;
+					else if (number == 0)
+						throw new ArgumentException ();
+
+					return parameters [number - 1];
+				}
+
+				set {
+					if (number == -1)
+						return;
+					else if (number == 0)
+						throw new ArgumentException ();
+
+					parameters [number - 1] = value;
+				}
+			}
+
+			//
+			// State of the local variable `vi'.
+			//
+			public bool this [VariableInfo vi]
+			{
+				get {
+					if (vi.Number == -1)
+						return true;
+					else if (vi.Number == 0)
+						throw new ArgumentException ();
+
+					return locals [vi.Number - 1];
+				}
+
+				set {
+					if (vi.Number == -1)
+						return;
+					else if (vi.Number == 0)
+						throw new ArgumentException ();
+
+					locals [vi.Number - 1] = value;
+				}
+			}
+
+			// <summary>
+			//   Specifies when the current block returns.
+			// </summary>
+			public FlowReturns Returns {
+				get {
+					return real_returns;
+				}
+
+				set {
+					real_returns = value;
+					returns_set = true;
+				}
+			}
+
+			// <summary>
+			//   Specifies whether control may return to our containing block
+			//   before reaching the end of this block.  This happens if there
+			//   is a break/continue/goto/return in it.
+			// </summary>
+			public FlowReturns Breaks {
+				get {
+					return real_breaks;
+				}
+
+				set {
+					real_breaks = value;
+					breaks_set = true;
+				}
+			}
+
+			// <summary>
+			//   Merge a child branching.
+			// </summary>
+			public FlowReturns MergeChildren (FlowBranching branching, ICollection children)
+			{
+				MyBitVector new_locals = null;
+				MyBitVector new_params = null;
+
+				FlowReturns new_returns = FlowReturns.NEVER;
+				FlowReturns new_breaks = FlowReturns.NEVER;
+				bool new_returns_set = false, new_breaks_set = false;
+				FlowReturns breaks;
+
+				Report.Debug (1, "MERGING CHILDREN", branching, this);
+
+				foreach (UsageVector child in children) {
+					Report.Debug (1, "  MERGING CHILD", child);
+
+					// If Returns is already set, perform an `And' operation on it,
+					// otherwise just set just.
+					if (!new_returns_set) {
+						new_returns = child.Returns;
+						new_returns_set = true;
+					} else
+						new_returns = AndFlowReturns (new_returns, child.Returns);
+
+					// If Breaks is already set, perform an `And' operation on it,
+					// otherwise just set just.
+					if (!new_breaks_set) {
+						new_breaks = child.Breaks;
+						new_breaks_set = true;
+					} else
+						new_breaks = AndFlowReturns (new_breaks, child.Breaks);
+
+					// Ignore unreachable children.
+					if (child.Returns == FlowReturns.UNREACHABLE)
+						continue;
+
+					// If we're a switch section, `break' won't leave the current
+					// branching (NOTE: the type check here means that we're "a"
+					// switch section, not that we're "in" a switch section!).
+					breaks = (branching.Type == FlowBranchingType.SWITCH_SECTION) ?
+						child.Returns : child.Breaks;
+
+					// A local variable is initialized after a flow branching if it
+					// has been initialized in all its branches which do neither
+					// always return or always throw an exception.
+					//
+					// If a branch may return, but does not always return, then we
+					// can treat it like a never-returning branch here: control will
+					// only reach the code position after the branching if we did not
+					// return here.
+					//
+					// It's important to distinguish between always and sometimes
+					// returning branches here:
+					//
+					//    1   int a;
+					//    2   if (something) {
+					//    3      return;
+					//    4      a = 5;
+					//    5   }
+					//    6   Console.WriteLine (a);
+					//
+					// The if block in lines 3-4 always returns, so we must not look
+					// at the initialization of `a' in line 4 - thus it'll still be
+					// uninitialized in line 6.
+					//
+					// On the other hand, the following is allowed:
+					//
+					//    1   int a;
+					//    2   if (something)
+					//    3      a = 5;
+					//    4   else
+					//    5      return;
+					//    6   Console.WriteLine (a);
+					//
+					// Here, `a' is initialized in line 3 and we must not look at
+					// line 5 since it always returns.
+					// 
+					if ((breaks != FlowReturns.EXCEPTION) &&
+					    (breaks != FlowReturns.ALWAYS)) {
+						if (new_locals != null)
+							new_locals.And (child.locals);
+						else {
+							new_locals = locals.Clone ();
+							new_locals.Or (child.locals);
+						}
+					}
+
+					// An `out' parameter must be assigned in all branches which do
+					// not always throw an exception.
+					if (!child.is_finally && (child.Returns != FlowReturns.EXCEPTION)) {
+						if (parameters != null) {
+							if (new_params != null)
+								new_params.And (child.parameters);
+							else {
+								new_params = parameters.Clone ();
+								new_params.Or (child.parameters);
+							}
+						}
+					}
+
+					// If we always return, check whether all `out' parameters have
+					// been assigned.
+					if ((child.Returns == FlowReturns.ALWAYS) && (child.parameters != null)) {
+						branching.CheckOutParameters (
+							child.parameters, branching.Location);
+					}
+				}
+
+				// Set new `Returns' status.
+				if (!returns_set) {
+					Returns = new_returns;
+					returns_set = true;
+				} else
+					Returns = AndFlowReturns (Returns, new_returns);
+
+				//
+				// We've now either reached the point after the branching or we will
+				// never get there since we always return or always throw an exception.
+				//
+				// If we can reach the point after the branching, mark all locals and
+				// parameters as initialized which have been initialized in all branches
+				// we need to look at (see above).
+				//
+
+				breaks = (branching.Type == FlowBranchingType.SWITCH_SECTION) ?
+					Returns : Breaks;
+
+				if ((new_locals != null) &&
+				    ((breaks == FlowReturns.NEVER) || (breaks == FlowReturns.SOMETIMES))) {
+					locals.Or (new_locals);
+				}
+
+				if ((new_params != null) && (Breaks == FlowReturns.NEVER))
+					parameters.Or (new_params);
+
+				//
+				// If we may have returned (this only happens if there was a reachable
+				// `return' statement in one of the branches), then we may return to our
+				// parent block before reaching the end of the block, so set `Breaks'.
+				//
+
+				if ((Returns != FlowReturns.NEVER) && (Returns != FlowReturns.SOMETIMES)) {
+					real_breaks = Returns;
+					breaks_set = true;
+				}
+
+				Report.Debug (1, "MERGING CHILDREN DONE", new_params, new_locals,
+					      new_returns, new_breaks, this);
+
+				return new_returns;
+			}
+
+			// <summary>
+			//   Tells control flow analysis that the current code position may be reached with
+			//   a forward jump from any of the origins listed in `origin_vectors' which is a
+			//   list of UsageVectors.
+			//
+			//   This is used when resolving forward gotos - in the following example, the
+			//   variable `a' is uninitialized in line 8 becase this line may be reached via
+			//   the goto in line 4:
+			//
+			//      1     int a;
+			//
+			//      3     if (something)
+			//      4        goto World;
+			//
+			//      6     a = 5;
+			//
+			//      7  World:
+			//      8     Console.WriteLine (a);
+			//
+			// </summary>
+			public void MergeJumpOrigins (ICollection origin_vectors)
+			{
+				Report.Debug (1, "MERGING JUMP ORIGIN", this);
+
+				real_breaks = FlowReturns.NEVER;
+				breaks_set = false;
+
+				foreach (UsageVector vector in origin_vectors) {
+					Report.Debug (1, "  MERGING JUMP ORIGIN", vector);
+
+					locals.And (vector.locals);
+					if (parameters != null)
+						parameters.And (vector.parameters);
+					Breaks = AndFlowReturns (Breaks, vector.Breaks);
+				}
+
+				Report.Debug (1, "MERGING JUMP ORIGIN DONE", this);
+			}
+
+			// <summary>
+			//   This is used at the beginning of a finally block if there were
+			//   any return statements in the try block or one of the catch blocks.
+			// </summary>
+			public void MergeFinallyOrigins (ICollection finally_vectors)
+			{
+				Report.Debug (1, "MERGING FINALLY ORIGIN", this);
+
+				real_breaks = FlowReturns.NEVER;
+				breaks_set = false;
+
+				foreach (UsageVector vector in finally_vectors) {
+					Report.Debug (1, "  MERGING FINALLY ORIGIN", vector);
+
+					if (parameters != null)
+						parameters.And (vector.parameters);
+					Breaks = AndFlowReturns (Breaks, vector.Breaks);
+				}
+
+				is_finally = true;
+
+				Report.Debug (1, "MERGING FINALLY ORIGIN DONE", this);
+			}
+
+			// <summary>
+			//   Performs an `or' operation on the locals and the parameters.
+			// </summary>
+			public void Or (UsageVector new_vector)
+			{
+				locals.Or (new_vector.locals);
+				if (parameters != null)
+					parameters.Or (new_vector.parameters);
+			}
+
+			// <summary>
+			//   Performs an `and' operation on the locals.
+			// </summary>
+			public void AndLocals (UsageVector new_vector)
+			{
+				locals.And (new_vector.locals);
+			}
+
+			// <summary>
+			//   Returns a deep copy of the parameters.
+			// </summary>
+			public MyBitVector Parameters {
+				get {
+					if (parameters != null)
+						return parameters.Clone ();
+					else
+						return null;
+				}
+			}
+
+			// <summary>
+			//   Returns a deep copy of the locals.
+			// </summary>
+			public MyBitVector Locals {
+				get {
+					return locals.Clone ();
+				}
+			}
+
+			//
+			// Debugging stuff.
+			//
+
+			public override string ToString ()
+			{
+				StringBuilder sb = new StringBuilder ();
+
+				sb.Append ("Vector (");
+				sb.Append (id);
+				sb.Append (",");
+				sb.Append (Returns);
+				sb.Append (",");
+				sb.Append (Breaks);
+				if (parameters != null) {
+					sb.Append (" - ");
+					sb.Append (parameters);
+				}
+				sb.Append (" - ");
+				sb.Append (locals);
+				sb.Append (")");
+
+				return sb.ToString ();
+			}
+		}
+
+		FlowBranching (FlowBranchingType type, Location loc)
+		{
+			this.Siblings = new ArrayList ();
+			this.Block = null;
+			this.Location = loc;
+			this.Type = type;
+			id = ++next_id;
+		}
+
+		// <summary>
+		//   Creates a new flow branching for `block'.
+		//   This is used from Block.Resolve to create the top-level branching of
+		//   the block.
+		// </summary>
+		public FlowBranching (Block block, InternalParameters ip, Location loc)
+			: this (FlowBranchingType.BLOCK, loc)
+		{
+			Block = block;
+			Parent = null;
+
+			param_info = ip;
+			param_map = new int [(param_info != null) ? param_info.Count : 0];
+			num_params = 0;
+
+			for (int i = 0; i < param_map.Length; i++) {
+				Parameter.Modifier mod = param_info.ParameterModifier (i);
+
+				if ((mod & Parameter.Modifier.OUT) == 0)
+					continue;
+
+				param_map [i] = ++num_params;
+			}
+
+			Siblings = new ArrayList ();
+			Siblings.Add (new UsageVector (null, num_params, block.CountVariables));
+		}
+
+		// <summary>
+		//   Creates a new flow branching which is contained in `parent'.
+		//   You should only pass non-null for the `block' argument if this block
+		//   introduces any new variables - in this case, we need to create a new
+		//   usage vector with a different size than our parent's one.
+		// </summary>
+		public FlowBranching (FlowBranching parent, FlowBranchingType type,
+				      Block block, Location loc)
+			: this (type, loc)
+		{
+			Parent = parent;
+			Block = block;
+
+			if (parent != null) {
+				param_info = parent.param_info;
+				param_map = parent.param_map;
+				num_params = parent.num_params;
+			}
+
+			UsageVector vector;
+			if (Block != null)
+				vector = new UsageVector (parent.CurrentUsageVector, num_params,
+							  Block.CountVariables);
+			else
+				vector = new UsageVector (Parent.CurrentUsageVector);
+
+			Siblings.Add (vector);
+
+			switch (Type) {
+			case FlowBranchingType.EXCEPTION:
+				finally_vectors = new ArrayList ();
+				break;
+
+			default:
+				break;
+			}
+		}
+
+		// <summary>
+		//   Returns the branching's current usage vector.
+		// </summary>
+		public UsageVector CurrentUsageVector
+		{
+			get {
+				return (UsageVector) Siblings [Siblings.Count - 1];
+			}
+		}
+
+		// <summary>
+		//   Creates a sibling of the current usage vector.
+		// </summary>
+		public void CreateSibling ()
+		{
+			Siblings.Add (new UsageVector (Parent.CurrentUsageVector));
+
+			Report.Debug (1, "CREATED SIBLING", CurrentUsageVector);
+		}
+
+		// <summary>
+		//   Creates a sibling for a `finally' block.
+		// </summary>
+		public void CreateSiblingForFinally ()
+		{
+			if (Type != FlowBranchingType.EXCEPTION)
+				throw new NotSupportedException ();
+
+			CreateSibling ();
+
+			CurrentUsageVector.MergeFinallyOrigins (finally_vectors);
+		}
+
+		// <summary>
+		//   Check whether all `out' parameters have been assigned.
+		// </summary>
+		public void CheckOutParameters (MyBitVector parameters, Location loc)
+		{
+			if (InTryBlock ())
+				return;
+
+			for (int i = 0; i < param_map.Length; i++) {
+				if (param_map [i] == 0)
+					continue;
+
+				if (!parameters [param_map [i] - 1]) {
+					Report.Error (
+						177, loc, "The out parameter `" +
+						param_info.ParameterName (i) + "` must be " +
+						"assigned before control leave the current method.");
+					param_map [i] = 0;
+				}
+			}
+		}
+
+		// <summary>
+		//   Merge a child branching.
+		// </summary>
+		public FlowReturns MergeChild (FlowBranching child)
+		{
+			return CurrentUsageVector.MergeChildren (child, child.Siblings);
+		}
+
+		// <summary>
+		//   Does the toplevel merging.
+		// </summary>
+		public FlowReturns MergeTopBlock ()
+		{
+			if ((Type != FlowBranchingType.BLOCK) || (Block == null))
+				throw new NotSupportedException ();
+
+			UsageVector vector = new UsageVector (null, num_params, Block.CountVariables);
+
+			vector.MergeChildren (this, Siblings);
+
+			Siblings.Clear ();
+			Siblings.Add (vector);
+
+			Report.Debug (1, "MERGING TOP BLOCK", vector);
+
+			if (vector.Returns != FlowReturns.EXCEPTION)
+				CheckOutParameters (CurrentUsageVector.Parameters, Location);
+
+			return vector.Returns;
+		}
+
+		public bool InTryBlock ()
+		{
+			if (finally_vectors != null)
+				return true;
+			else if (Parent != null)
+				return Parent.InTryBlock ();
+			else
+				return false;
+		}
+
+		public void AddFinallyVector (UsageVector vector)
+		{
+			if (finally_vectors != null) {
+				finally_vectors.Add (vector.Clone ());
+				return;
+			}
+
+			if (Parent != null)
+				Parent.AddFinallyVector (vector);
+			else
+				throw new NotSupportedException ();
+		}
+
+		public bool IsVariableAssigned (VariableInfo vi)
+		{
+			Report.Debug (2, "CHECK VARIABLE ACCESS", this, vi);
+
+			if (CurrentUsageVector.Breaks == FlowReturns.UNREACHABLE)
+				return true;
+			else
+				return CurrentUsageVector [vi];
+		}
+
+		public void SetVariableAssigned (VariableInfo vi)
+		{
+			Report.Debug (2, "SET VARIABLE ACCESS", this, vi, CurrentUsageVector);
+
+			if (CurrentUsageVector.Breaks == FlowReturns.UNREACHABLE)
+				return;
+
+			CurrentUsageVector [vi] = true;
+		}
+
+		public bool IsParameterAssigned (int number)
+		{
+			Report.Debug (2, "IS PARAMETER ASSIGNED", this, number);
+
+			if (param_map [number] == 0)
+				return true;
+			else
+				return CurrentUsageVector [param_map [number]];
+		}
+
+		public void SetParameterAssigned (int number)
+		{
+			Report.Debug (2, "SET PARAMETER ACCESS", this, number, param_map [number],
+				      CurrentUsageVector);
+
+			if (param_map [number] == 0)
+				return;
+
+			if (CurrentUsageVector.Breaks == FlowReturns.NEVER)
+				CurrentUsageVector [param_map [number]] = true;
+		}
+
+		public override string ToString ()
+		{
+			StringBuilder sb = new StringBuilder ("FlowBranching (");
+
+			sb.Append (id);
+			sb.Append (",");
+			sb.Append (Type);
+			if (Block != null) {
+				sb.Append (" - ");
+				sb.Append (Block.ID);
+				sb.Append (" - ");
+				sb.Append (Block.StartLocation);
+			}
+			sb.Append (" - ");
+			sb.Append (Siblings.Count);
+			sb.Append (" - ");
+			sb.Append (CurrentUsageVector);
+			sb.Append (")");
+			return sb.ToString ();
+		}
+	}
+	
+	public class VariableInfo {
+		public Expression Type;
+		public LocalBuilder LocalBuilder;
+		public Type VariableType;
+		public readonly Location Location;
+		public readonly int Block;
+
+		public int Number;
+		
+		public bool Used;
+		public bool Assigned;
+		public bool ReadOnly;
+		
+		public VariableInfo (Expression type, int block, Location l)
+		{
+			Type = type;
+			Block = block;
+			LocalBuilder = null;
+			Location = l;
+		}
+
+		public void MakePinned ()
+		{
+			TypeManager.MakePinned (LocalBuilder);
+		}
+
+		public override string ToString ()
+		{
+			return "VariableInfo (" + Number + "," + Type + "," + Location + ")";
+		}
+	}
+		
+	/// <summary>
+	///   Block represents a C# block.
+	/// </summary>
+	///
+	/// <remarks>
+	///   This class is used in a number of places: either to represent
+	///   explicit blocks that the programmer places or implicit blocks.
+	///
+	///   Implicit blocks are used as labels or to introduce variable
+	///   declarations.
+	/// </remarks>
+	public class Block : Statement {
+		public readonly Block     Parent;
+		public readonly bool      Implicit;
+		public readonly Location  StartLocation;
+		public Location           EndLocation;
+
+		//
+		// The statements in this block
+		//
+		ArrayList statements;
+
+		//
+		// An array of Blocks.  We keep track of children just
+		// to generate the local variable declarations.
+		//
+		// Statements and child statements are handled through the
+		// statements.
+		//
+		ArrayList children;
+		
+		//
+		// Labels.  (label, block) pairs.
+		//
+		Hashtable labels;
+
+		//
+		// Keeps track of (name, type) pairs
+		//
+		Hashtable variables;
+
+		//
+		// Keeps track of constants
+		Hashtable constants;
+
+		//
+		// Maps variable names to ILGenerator.LocalBuilders
+		//
+		Hashtable local_builders;
+
+		bool used = false;
+
+		static int id;
+
+		int this_id;
+		
+		public Block (Block parent)
+			: this (parent, false, Location.Null, Location.Null)
+		{ }
+
+		public Block (Block parent, bool implicit_block)
+			: this (parent, implicit_block, Location.Null, Location.Null)
+		{ }
+
+		public Block (Block parent, Location start, Location end)
+			: this (parent, false, start, end)
+		{ }
+
+		public Block (Block parent, bool implicit_block, Location start, Location end)
+		{
+			if (parent != null)
+				parent.AddChild (this);
+			
+			this.Parent = parent;
+			this.Implicit = implicit_block;
+			this.StartLocation = start;
+			this.EndLocation = end;
+			this.loc = start;
+			this_id = id++;
+			statements = new ArrayList ();
+		}
+
+		public int ID {
+			get {
+				if (Implicit)
+					return Parent.ID;
+				else
+					return this_id;
+			}
+		}
+		
+		void AddChild (Block b)
+		{
+			if (children == null)
+				children = new ArrayList ();
+			
+			children.Add (b);
+		}
+
+		public void SetEndLocation (Location loc)
+		{
+			EndLocation = loc;
+		}
+
+		/// <summary>
+		///   Adds a label to the current block. 
+		/// </summary>
+		///
+		/// <returns>
+		///   false if the name already exists in this block. true
+		///   otherwise.
+		/// </returns>
+		///
+		public bool AddLabel (string name, LabeledStatement target)
+		{
+			if (labels == null)
+				labels = new Hashtable ();
+			if (labels.Contains (name))
+				return false;
+			
+			labels.Add (name, target);
+			return true;
+		}
+
+		public LabeledStatement LookupLabel (string name)
+		{
+			if (labels != null){
+				if (labels.Contains (name))
+					return ((LabeledStatement) labels [name]);
+			}
+
+			if (Parent != null)
+				return Parent.LookupLabel (name);
+
+			return null;
+		}
+
+		public VariableInfo AddVariable (Expression type, string name, Parameters pars, Location l)
+		{
+			if (variables == null)
+				variables = new Hashtable ();
+
+			VariableInfo vi = GetVariableInfo (name);
+			if (vi != null) {
+				if (vi.Block != ID)
+					Report.Error (136, l, "A local variable named `" + name + "' " +
+						      "cannot be declared in this scope since it would " +
+						      "give a different meaning to `" + name + "', which " +
+						      "is already used in a `parent or current' scope to " +
+						      "denote something else");
+				else
+					Report.Error (128, l, "A local variable `" + name + "' is already " +
+						      "defined in this scope");
+				return null;
+			}
+
+			if (pars != null) {
+				int idx = 0;
+				Parameter p = pars.GetParameterByName (name, out idx);
+				if (p != null) {
+					Report.Error (136, l, "A local variable named `" + name + "' " +
+						      "cannot be declared in this scope since it would " +
+						      "give a different meaning to `" + name + "', which " +
+						      "is already used in a `parent or current' scope to " +
+						      "denote something else");
+					return null;
+				}
+			}
+			
+			vi = new VariableInfo (type, ID, l);
+
+			variables.Add (name, vi);
+
+			if (variables_initialized)
+				throw new Exception ();
+
+			// Console.WriteLine ("Adding {0} to {1}", name, ID);
+			return vi;
+		}
+
+		public bool AddConstant (Expression type, string name, Expression value, Parameters pars, Location l)
+		{
+			if (AddVariable (type, name, pars, l) == null)
+				return false;
+			
+			if (constants == null)
+				constants = new Hashtable ();
+
+			constants.Add (name, value);
+			return true;
+		}
+
+		public Hashtable Variables {
+			get {
+				return variables;
+			}
+		}
+
+		public VariableInfo GetVariableInfo (string name)
+		{
+			if (variables != null) {
+				object temp;
+				temp = variables [name];
+
+				if (temp != null){
+					return (VariableInfo) temp;
+				}
+			}
+
+			if (Parent != null)
+				return Parent.GetVariableInfo (name);
+
+			return null;
+		}
+		
+		public Expression GetVariableType (string name)
+		{
+			VariableInfo vi = GetVariableInfo (name);
+
+			if (vi != null)
+				return vi.Type;
+
+			return null;
+		}
+
+		public Expression GetConstantExpression (string name)
+		{
+			if (constants != null) {
+				object temp;
+				temp = constants [name];
+				
+				if (temp != null)
+					return (Expression) temp;
+			}
+			
+			if (Parent != null)
+				return Parent.GetConstantExpression (name);
+
+			return null;
+		}
+		
+		/// <summary>
+		///   True if the variable named @name has been defined
+		///   in this block
+		/// </summary>
+		public bool IsVariableDefined (string name)
+		{
+			// Console.WriteLine ("Looking up {0} in {1}", name, ID);
+			if (variables != null) {
+				if (variables.Contains (name))
+					return true;
+			}
+			
+			if (Parent != null)
+				return Parent.IsVariableDefined (name);
+
+			return false;
+		}
+
+		/// <summary>
+		///   True if the variable named @name is a constant
+		///  </summary>
+		public bool IsConstant (string name)
+		{
+			Expression e = null;
+			
+			e = GetConstantExpression (name);
+			
+			return e != null;
+		}
+		
+		/// <summary>
+		///   Use to fetch the statement associated with this label
+		/// </summary>
+		public Statement this [string name] {
+			get {
+				return (Statement) labels [name];
+			}
+		}
+
+		/// <returns>
+		///   A list of labels that were not used within this block
+		/// </returns>
+		public string [] GetUnreferenced ()
+		{
+			// FIXME: Implement me
+			return null;
+		}
+
+		public void AddStatement (Statement s)
+		{
+			statements.Add (s);
+			used = true;
+		}
+
+		public bool Used {
+			get {
+				return used;
+			}
+		}
+
+		public void Use ()
+		{
+			used = true;
+		}
+
+		bool variables_initialized = false;
+		int count_variables = 0, first_variable = 0;
+
+		void UpdateVariableInfo (EmitContext ec)
+		{
+			DeclSpace ds = ec.DeclSpace;
+
+			first_variable = 0;
+
+			if (Parent != null)
+				first_variable += Parent.CountVariables;
+
+			count_variables = first_variable;
+			if (variables != null) {
+				foreach (VariableInfo vi in variables.Values) {
+					Report.Debug (2, "VARIABLE", vi);
+
+					Type type = ds.ResolveType (vi.Type, false, vi.Location);
+					if (type == null) {
+						vi.Number = -1;
+						continue;
+					}
+
+					vi.VariableType = type;
+
+					Report.Debug (2, "VARIABLE", vi, type, type.IsValueType,
+						      TypeManager.IsValueType (type),
+						      TypeManager.IsBuiltinType (type));
+
+					// FIXME: we don't have support for structs yet.
+					if (TypeManager.IsValueType (type) && !TypeManager.IsBuiltinType (type))
+						vi.Number = -1;
+					else
+						vi.Number = ++count_variables;
+				}
+			}
+
+			variables_initialized = true;
+		}
+
+		//
+		// <returns>
+		//   The number of local variables in this block
+		// </returns>
+		public int CountVariables
+		{
+			get {
+				if (!variables_initialized)
+					throw new Exception ();
+
+				return count_variables;
+			}
+		}
+
+		/// <summary>
+		///   Emits the variable declarations and labels.
+		/// </summary>
+		/// <remarks>
+		///   tc: is our typecontainer (to resolve type references)
+		///   ig: is the code generator:
+		///   toplevel: the toplevel block.  This is used for checking 
+		///   		that no two labels with the same name are used.
+		/// </remarks>
+		public void EmitMeta (EmitContext ec, Block toplevel)
+		{
+			DeclSpace ds = ec.DeclSpace;
+			ILGenerator ig = ec.ig;
+
+			if (!variables_initialized)
+				UpdateVariableInfo (ec);
+
+			//
+			// Process this block variables
+			//
+			if (variables != null){
+				local_builders = new Hashtable ();
+				
+				foreach (DictionaryEntry de in variables){
+					string name = (string) de.Key;
+					VariableInfo vi = (VariableInfo) de.Value;
+
+					if (vi.VariableType == null)
+						continue;
+
+					vi.LocalBuilder = ig.DeclareLocal (vi.VariableType);
+
+					if (CodeGen.SymbolWriter != null)
+						vi.LocalBuilder.SetLocalSymInfo (name);
+
+					if (constants == null)
+						continue;
+
+					Expression cv = (Expression) constants [name];
+					if (cv == null)
+						continue;
+
+					Expression e = cv.Resolve (ec);
+					if (e == null)
+						continue;
+
+					if (!(e is Constant)){
+						Report.Error (133, vi.Location,
+							      "The expression being assigned to `" +
+							      name + "' must be constant (" + e + ")");
+						continue;
+					}
+
+					constants.Remove (name);
+					constants.Add (name, e);
+				}
+			}
+
+			//
+			// Now, handle the children
+			//
+			if (children != null){
+				foreach (Block b in children)
+					b.EmitMeta (ec, toplevel);
+			}
+		}
+
+		public void UsageWarning ()
+		{
+			string name;
+			
+			if (variables != null){
+				foreach (DictionaryEntry de in variables){
+					VariableInfo vi = (VariableInfo) de.Value;
+					
+					if (vi.Used)
+						continue;
+					
+					name = (string) de.Key;
+						
+					if (vi.Assigned){
+						Report.Warning (
+							219, vi.Location, "The variable `" + name +
+							"' is assigned but its value is never used");
+					} else {
+						Report.Warning (
+							168, vi.Location, "The variable `" +
+							name +
+							"' is declared but never used");
+					} 
+				}
+			}
+
+			if (children != null)
+				foreach (Block b in children)
+					b.UsageWarning ();
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			Block prev_block = ec.CurrentBlock;
+			bool ok = true;
+
+			ec.CurrentBlock = this;
+			ec.StartFlowBranching (this);
+
+			Report.Debug (1, "RESOLVE BLOCK", StartLocation);
+
+			if (!variables_initialized)
+				UpdateVariableInfo (ec);
+
+			foreach (Statement s in statements){
+				if (s.Resolve (ec) == false)
+					ok = false;
+			}
+
+			Report.Debug (1, "RESOLVE BLOCK DONE", StartLocation);
+
+			ec.EndFlowBranching ();
+			ec.CurrentBlock = prev_block;
+
+			if ((labels != null) && (RootContext.WarningLevel >= 2)) {
+				foreach (LabeledStatement label in labels.Values)
+					if (!label.HasBeenReferenced)
+						Report.Warning (164, label.Location,
+								"This label has not been referenced");
+			}
+
+			return ok;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			bool is_ret = false, this_ret = false;
+			Block prev_block = ec.CurrentBlock;
+			bool warning_shown = false;
+
+			ec.CurrentBlock = this;
+
+			if (CodeGen.SymbolWriter != null) {
+				ec.Mark (StartLocation);
+				
+				foreach (Statement s in statements) {
+					ec.Mark (s.loc);
+					
+					if (is_ret && !warning_shown && !(s is EmptyStatement)){
+						warning_shown = true;
+						Warning_DeadCodeFound (s.loc);
+					}
+					this_ret = s.Emit (ec);
+					if (this_ret)
+						is_ret = true;
+				}
+
+				ec.Mark (EndLocation); 
+			} else {
+				foreach (Statement s in statements){
+					if (is_ret && !warning_shown && !(s is EmptyStatement)){
+						warning_shown = true;
+						Warning_DeadCodeFound (s.loc);
+					}
+					this_ret = s.Emit (ec);
+					if (this_ret)
+						is_ret = true;
+				}
+			}
+			
+			ec.CurrentBlock = prev_block;
+			return is_ret;
+		}
+	}
+
+	public class SwitchLabel {
+		Expression label;
+		object converted;
+		public Location loc;
+		public Label ILLabel;
+		public Label ILLabelCode;
+
+		//
+		// if expr == null, then it is the default case.
+		//
+		public SwitchLabel (Expression expr, Location l)
+		{
+			label = expr;
+			loc = l;
+		}
+
+		public Expression Label {
+			get {
+				return label;
+			}
+		}
+
+		public object Converted {
+			get {
+				return converted;
+			}
+		}
+
+		//
+		// Resolves the expression, reduces it to a literal if possible
+		// and then converts it to the requested type.
+		//
+		public bool ResolveAndReduce (EmitContext ec, Type required_type)
+		{
+			ILLabel = ec.ig.DefineLabel ();
+			ILLabelCode = ec.ig.DefineLabel ();
+
+			if (label == null)
+				return true;
+			
+			Expression e = label.Resolve (ec);
+
+			if (e == null)
+				return false;
+
+			if (!(e is Constant)){
+				Console.WriteLine ("Value is: " + label);
+				Report.Error (150, loc, "A constant value is expected");
+				return false;
+			}
+
+			if (e is StringConstant || e is NullLiteral){
+				if (required_type == TypeManager.string_type){
+					converted = label;
+					ILLabel = ec.ig.DefineLabel ();
+					return true;
+				}
+			}
+
+			converted = Expression.ConvertIntLiteral ((Constant) e, required_type, loc);
+			if (converted == null)
+				return false;
+
+			return true;
+		}
+	}
+
+	public class SwitchSection {
+		// An array of SwitchLabels.
+		public readonly ArrayList Labels;
+		public readonly Block Block;
+		
+		public SwitchSection (ArrayList labels, Block block)
+		{
+			Labels = labels;
+			Block = block;
+		}
+	}
+	
+	public class Switch : Statement {
+		public readonly ArrayList Sections;
+		public Expression Expr;
+
+		/// <summary>
+		///   Maps constants whose type type SwitchType to their  SwitchLabels.
+		/// </summary>
+		public Hashtable Elements;
+
+		/// <summary>
+		///   The governing switch type
+		/// </summary>
+		public Type SwitchType;
+
+		//
+		// Computed
+		//
+		bool got_default;
+		Label default_target;
+		Expression new_expr;
+
+		//
+		// The types allowed to be implicitly cast from
+		// on the governing type
+		//
+		static Type [] allowed_types;
+		
+		public Switch (Expression e, ArrayList sects, Location l)
+		{
+			Expr = e;
+			Sections = sects;
+			loc = l;
+		}
+
+		public bool GotDefault {
+			get {
+				return got_default;
+			}
+		}
+
+		public Label DefaultTarget {
+			get {
+				return default_target;
+			}
+		}
+
+		//
+		// Determines the governing type for a switch.  The returned
+		// expression might be the expression from the switch, or an
+		// expression that includes any potential conversions to the
+		// integral types or to string.
+		//
+		Expression SwitchGoverningType (EmitContext ec, Type t)
+		{
+			if (t == TypeManager.int32_type ||
+			    t == TypeManager.uint32_type ||
+			    t == TypeManager.char_type ||
+			    t == TypeManager.byte_type ||
+			    t == TypeManager.sbyte_type ||
+			    t == TypeManager.ushort_type ||
+			    t == TypeManager.short_type ||
+			    t == TypeManager.uint64_type ||
+			    t == TypeManager.int64_type ||
+			    t == TypeManager.string_type ||
+				t == TypeManager.bool_type ||
+				t.IsSubclassOf (TypeManager.enum_type))
+				return Expr;
+
+			if (allowed_types == null){
+				allowed_types = new Type [] {
+					TypeManager.sbyte_type,
+					TypeManager.byte_type,
+					TypeManager.short_type,
+					TypeManager.ushort_type,
+					TypeManager.int32_type,
+					TypeManager.uint32_type,
+					TypeManager.int64_type,
+					TypeManager.uint64_type,
+					TypeManager.char_type,
+					TypeManager.bool_type,
+					TypeManager.string_type
+				};
+			}
+
+			//
+			// Try to find a *user* defined implicit conversion.
+			//
+			// If there is no implicit conversion, or if there are multiple
+			// conversions, we have to report an error
+			//
+			Expression converted = null;
+			foreach (Type tt in allowed_types){
+				Expression e;
+				
+				e = Expression.ImplicitUserConversion (ec, Expr, tt, loc);
+				if (e == null)
+					continue;
+
+				if (converted != null){
+					Report.Error (-12, loc, "More than one conversion to an integral " +
+						      " type exists for type `" +
+						      TypeManager.CSharpName (Expr.Type)+"'");
+					return null;
+				} else
+					converted = e;
+			}
+			return converted;
+		}
+
+		void error152 (string n)
+		{
+			Report.Error (
+				152, "The label `" + n + ":' " +
+				"is already present on this switch statement");
+		}
+		
+		//
+		// Performs the basic sanity checks on the switch statement
+		// (looks for duplicate keys and non-constant expressions).
+		//
+		// It also returns a hashtable with the keys that we will later
+		// use to compute the switch tables
+		//
+		bool CheckSwitch (EmitContext ec)
+		{
+			Type compare_type;
+			bool error = false;
+			Elements = new Hashtable ();
+				
+			got_default = false;
+
+			if (TypeManager.IsEnumType (SwitchType)){
+				compare_type = TypeManager.EnumToUnderlying (SwitchType);
+			} else
+				compare_type = SwitchType;
+			
+			foreach (SwitchSection ss in Sections){
+				foreach (SwitchLabel sl in ss.Labels){
+					if (!sl.ResolveAndReduce (ec, SwitchType)){
+						error = true;
+						continue;
+					}
+
+					if (sl.Label == null){
+						if (got_default){
+							error152 ("default");
+							error = true;
+						}
+						got_default = true;
+						continue;
+					}
+					
+					object key = sl.Converted;
+
+					if (key is Constant)
+						key = ((Constant) key).GetValue ();
+
+					if (key == null)
+						key = NullLiteral.Null;
+					
+					string lname = null;
+					if (compare_type == TypeManager.uint64_type){
+						ulong v = (ulong) key;
+
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.int64_type){
+						long v = (long) key;
+
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.uint32_type){
+						uint v = (uint) key;
+
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.char_type){
+						char v = (char) key;
+						
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.byte_type){
+						byte v = (byte) key;
+						
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.sbyte_type){
+						sbyte v = (sbyte) key;
+						
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.short_type){
+						short v = (short) key;
+						
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.ushort_type){
+						ushort v = (ushort) key;
+						
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.string_type){
+						if (key is NullLiteral){
+							if (Elements.Contains (NullLiteral.Null))
+								lname = "null";
+							else
+								Elements.Add (NullLiteral.Null, null);
+						} else {
+							string s = (string) key;
+
+							if (Elements.Contains (s))
+								lname = s;
+							else
+								Elements.Add (s, sl);
+						}
+					} else if (compare_type == TypeManager.int32_type) {
+						int v = (int) key;
+
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.bool_type) {
+						bool v = (bool) key;
+
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					}
+					else
+					{
+						throw new Exception ("Unknown switch type!" +
+								     SwitchType + " " + compare_type);
+					}
+
+					if (lname != null){
+						error152 ("case + " + lname);
+						error = true;
+					}
+				}
+			}
+			if (error)
+				return false;
+			
+			return true;
+		}
+
+		void EmitObjectInteger (ILGenerator ig, object k)
+		{
+			if (k is int)
+				IntConstant.EmitInt (ig, (int) k);
+			else if (k is Constant) {
+				EmitObjectInteger (ig, ((Constant) k).GetValue ());
+			} 
+			else if (k is uint)
+				IntConstant.EmitInt (ig, unchecked ((int) (uint) k));
+			else if (k is long)
+			{
+				if ((long) k >= int.MinValue && (long) k <= int.MaxValue)
+				{
+					IntConstant.EmitInt (ig, (int) (long) k);
+					ig.Emit (OpCodes.Conv_I8);
+				}
+				else
+					LongConstant.EmitLong (ig, (long) k);
+			}
+			else if (k is ulong)
+			{
+				if ((ulong) k < (1L<<32))
+				{
+					IntConstant.EmitInt (ig, (int) (long) k);
+					ig.Emit (OpCodes.Conv_U8);
+				}
+				else
+				{
+					LongConstant.EmitLong (ig, unchecked ((long) (ulong) k));
+				}
+			}
+			else if (k is char)
+				IntConstant.EmitInt (ig, (int) ((char) k));
+			else if (k is sbyte)
+				IntConstant.EmitInt (ig, (int) ((sbyte) k));
+			else if (k is byte)
+				IntConstant.EmitInt (ig, (int) ((byte) k));
+			else if (k is short)
+				IntConstant.EmitInt (ig, (int) ((short) k));
+			else if (k is ushort)
+				IntConstant.EmitInt (ig, (int) ((ushort) k));
+			else if (k is bool)
+				IntConstant.EmitInt (ig, ((bool) k) ? 1 : 0);
+			else
+				throw new Exception ("Unhandled case");
+		}
+		
+		// structure used to hold blocks of keys while calculating table switch
+		class KeyBlock : IComparable
+		{
+			public KeyBlock (long _nFirst)
+			{
+				nFirst = nLast = _nFirst;
+			}
+			public long nFirst;
+			public long nLast;
+			public ArrayList rgKeys = null;
+			public int Length
+			{
+				get { return (int) (nLast - nFirst + 1); }
+			}
+			public static long TotalLength (KeyBlock kbFirst, KeyBlock kbLast)
+			{
+				return kbLast.nLast - kbFirst.nFirst + 1;
+			}
+			public int CompareTo (object obj)
+			{
+				KeyBlock kb = (KeyBlock) obj;
+				int nLength = Length;
+				int nLengthOther = kb.Length;
+				if (nLengthOther == nLength)
+					return (int) (kb.nFirst - nFirst);
+				return nLength - nLengthOther;
+			}
+		}
+
+		/// <summary>
+		/// This method emits code for a lookup-based switch statement (non-string)
+		/// Basically it groups the cases into blocks that are at least half full,
+		/// and then spits out individual lookup opcodes for each block.
+		/// It emits the longest blocks first, and short blocks are just
+		/// handled with direct compares.
+		/// </summary>
+		/// <param name="ec"></param>
+		/// <param name="val"></param>
+		/// <returns></returns>
+		bool TableSwitchEmit (EmitContext ec, LocalBuilder val)
+		{
+			int cElements = Elements.Count;
+			object [] rgKeys = new object [cElements];
+			Elements.Keys.CopyTo (rgKeys, 0);
+			Array.Sort (rgKeys);
+
+			// initialize the block list with one element per key
+			ArrayList rgKeyBlocks = new ArrayList ();
+			foreach (object key in rgKeys)
+				rgKeyBlocks.Add (new KeyBlock (Convert.ToInt64 (key)));
+
+			KeyBlock kbCurr;
+			// iteratively merge the blocks while they are at least half full
+			// there's probably a really cool way to do this with a tree...
+			while (rgKeyBlocks.Count > 1)
+			{
+				ArrayList rgKeyBlocksNew = new ArrayList ();
+				kbCurr = (KeyBlock) rgKeyBlocks [0];
+				for (int ikb = 1; ikb < rgKeyBlocks.Count; ikb++)
+				{
+					KeyBlock kb = (KeyBlock) rgKeyBlocks [ikb];
+					if ((kbCurr.Length + kb.Length) * 2 >=  KeyBlock.TotalLength (kbCurr, kb))
+					{
+						// merge blocks
+						kbCurr.nLast = kb.nLast;
+					}
+					else
+					{
+						// start a new block
+						rgKeyBlocksNew.Add (kbCurr);
+						kbCurr = kb;
+					}
+				}
+				rgKeyBlocksNew.Add (kbCurr);
+				if (rgKeyBlocks.Count == rgKeyBlocksNew.Count)
+					break;
+				rgKeyBlocks = rgKeyBlocksNew;
+			}
+
+			// initialize the key lists
+			foreach (KeyBlock kb in rgKeyBlocks)
+				kb.rgKeys = new ArrayList ();
+
+			// fill the key lists
+			int iBlockCurr = 0;
+			if (rgKeyBlocks.Count > 0) {
+				kbCurr = (KeyBlock) rgKeyBlocks [0];
+				foreach (object key in rgKeys)
+				{
+					bool fNextBlock = (key is UInt64) ? (ulong) key > (ulong) kbCurr.nLast : Convert.ToInt64 (key) > kbCurr.nLast;
+					if (fNextBlock)
+						kbCurr = (KeyBlock) rgKeyBlocks [++iBlockCurr];
+					kbCurr.rgKeys.Add (key);
+				}
+			}
+
+			// sort the blocks so we can tackle the largest ones first
+			rgKeyBlocks.Sort ();
+
+			// okay now we can start...
+			ILGenerator ig = ec.ig;
+			Label lblEnd = ig.DefineLabel ();	// at the end ;-)
+			Label lblDefault = ig.DefineLabel ();
+
+			Type typeKeys = null;
+			if (rgKeys.Length > 0)
+				typeKeys = rgKeys [0].GetType ();	// used for conversions
+
+			for (int iBlock = rgKeyBlocks.Count - 1; iBlock >= 0; --iBlock)
+			{
+				KeyBlock kb = ((KeyBlock) rgKeyBlocks [iBlock]);
+				lblDefault = (iBlock == 0) ? DefaultTarget : ig.DefineLabel ();
+				if (kb.Length <= 2)
+				{
+					foreach (object key in kb.rgKeys)
+					{
+						ig.Emit (OpCodes.Ldloc, val);
+						EmitObjectInteger (ig, key);
+						SwitchLabel sl = (SwitchLabel) Elements [key];
+						ig.Emit (OpCodes.Beq, sl.ILLabel);
+					}
+				}
+				else
+				{
+					// TODO: if all the keys in the block are the same and there are
+					//       no gaps/defaults then just use a range-check.
+					if (SwitchType == TypeManager.int64_type ||
+						SwitchType == TypeManager.uint64_type)
+					{
+						// TODO: optimize constant/I4 cases
+
+						// check block range (could be > 2^31)
+						ig.Emit (OpCodes.Ldloc, val);
+						EmitObjectInteger (ig, Convert.ChangeType (kb.nFirst, typeKeys));
+						ig.Emit (OpCodes.Blt, lblDefault);
+						ig.Emit (OpCodes.Ldloc, val);
+						EmitObjectInteger (ig, Convert.ChangeType (kb.nFirst, typeKeys));
+						ig.Emit (OpCodes.Bgt, lblDefault);
+
+						// normalize range
+						ig.Emit (OpCodes.Ldloc, val);
+						if (kb.nFirst != 0)
+						{
+							EmitObjectInteger (ig, Convert.ChangeType (kb.nFirst, typeKeys));
+							ig.Emit (OpCodes.Sub);
+						}
+						ig.Emit (OpCodes.Conv_I4);	// assumes < 2^31 labels!
+					}
+					else
+					{
+						// normalize range
+						ig.Emit (OpCodes.Ldloc, val);
+						int nFirst = (int) kb.nFirst;
+						if (nFirst > 0)
+						{
+							IntConstant.EmitInt (ig, nFirst);
+							ig.Emit (OpCodes.Sub);
+						}
+						else if (nFirst < 0)
+						{
+							IntConstant.EmitInt (ig, -nFirst);
+							ig.Emit (OpCodes.Add);
+						}
+					}
+
+					// first, build the list of labels for the switch
+					int iKey = 0;
+					int cJumps = kb.Length;
+					Label [] rgLabels = new Label [cJumps];
+					for (int iJump = 0; iJump < cJumps; iJump++)
+					{
+						object key = kb.rgKeys [iKey];
+						if (Convert.ToInt64 (key) == kb.nFirst + iJump)
+						{
+							SwitchLabel sl = (SwitchLabel) Elements [key];
+							rgLabels [iJump] = sl.ILLabel;
+							iKey++;
+						}
+						else
+							rgLabels [iJump] = lblDefault;
+					}
+					// emit the switch opcode
+					ig.Emit (OpCodes.Switch, rgLabels);
+				}
+
+				// mark the default for this block
+				if (iBlock != 0)
+					ig.MarkLabel (lblDefault);
+			}
+
+			// TODO: find the default case and emit it here,
+			//       to prevent having to do the following jump.
+			//       make sure to mark other labels in the default section
+
+			// the last default just goes to the end
+			ig.Emit (OpCodes.Br, lblDefault);
+
+			// now emit the code for the sections
+			bool fFoundDefault = false;
+			bool fAllReturn = true;
+			foreach (SwitchSection ss in Sections)
+			{
+				foreach (SwitchLabel sl in ss.Labels)
+				{
+					ig.MarkLabel (sl.ILLabel);
+					ig.MarkLabel (sl.ILLabelCode);
+					if (sl.Label == null)
+					{
+						ig.MarkLabel (lblDefault);
+						fFoundDefault = true;
+					}
+				}
+				fAllReturn &= ss.Block.Emit (ec);
+				//ig.Emit (OpCodes.Br, lblEnd);
+			}
+			
+			if (!fFoundDefault) {
+				ig.MarkLabel (lblDefault);
+				fAllReturn = false;
+			}
+			ig.MarkLabel (lblEnd);
+
+			return fAllReturn;
+		}
+		//
+		// This simple emit switch works, but does not take advantage of the
+		// `switch' opcode. 
+		// TODO: remove non-string logic from here
+		// TODO: binary search strings?
+		//
+		bool SimpleSwitchEmit (EmitContext ec, LocalBuilder val)
+		{
+			ILGenerator ig = ec.ig;
+			Label end_of_switch = ig.DefineLabel ();
+			Label next_test = ig.DefineLabel ();
+			Label null_target = ig.DefineLabel ();
+			bool default_found = false;
+			bool first_test = true;
+			bool pending_goto_end = false;
+			bool all_return = true;
+			bool is_string = false;
+			bool null_found;
+			
+			//
+			// Special processing for strings: we cant compare
+			// against null.
+			//
+			if (SwitchType == TypeManager.string_type){
+				ig.Emit (OpCodes.Ldloc, val);
+				is_string = true;
+				
+				if (Elements.Contains (NullLiteral.Null)){
+					ig.Emit (OpCodes.Brfalse, null_target);
+				} else
+					ig.Emit (OpCodes.Brfalse, default_target);
+
+				ig.Emit (OpCodes.Ldloc, val);
+				ig.Emit (OpCodes.Call, TypeManager.string_isinterneted_string);
+				ig.Emit (OpCodes.Stloc, val);
+			}
+
+			SwitchSection last_section;
+			last_section = (SwitchSection) Sections [Sections.Count-1];
+			
+			foreach (SwitchSection ss in Sections){
+				Label sec_begin = ig.DefineLabel ();
+
+				if (pending_goto_end)
+					ig.Emit (OpCodes.Br, end_of_switch);
+
+				int label_count = ss.Labels.Count;
+				null_found = false;
+				foreach (SwitchLabel sl in ss.Labels){
+					ig.MarkLabel (sl.ILLabel);
+					
+					if (!first_test){
+						ig.MarkLabel (next_test);
+						next_test = ig.DefineLabel ();
+					}
+					//
+					// If we are the default target
+					//
+					if (sl.Label == null){
+						ig.MarkLabel (default_target);
+						default_found = true;
+					} else {
+						object lit = sl.Converted;
+
+						if (lit is NullLiteral){
+							null_found = true;
+							if (label_count == 1)
+								ig.Emit (OpCodes.Br, next_test);
+							continue;
+									      
+						}
+						if (is_string){
+							StringConstant str = (StringConstant) lit;
+
+							ig.Emit (OpCodes.Ldloc, val);
+							ig.Emit (OpCodes.Ldstr, str.Value);
+							if (label_count == 1)
+								ig.Emit (OpCodes.Bne_Un, next_test);
+							else
+								ig.Emit (OpCodes.Beq, sec_begin);
+						} else {
+							ig.Emit (OpCodes.Ldloc, val);
+							EmitObjectInteger (ig, lit);
+							ig.Emit (OpCodes.Ceq);
+							if (label_count == 1)
+								ig.Emit (OpCodes.Brfalse, next_test);
+							else
+								ig.Emit (OpCodes.Brtrue, sec_begin);
+						}
+					}
+				}
+				if (label_count != 1 && ss != last_section)
+					ig.Emit (OpCodes.Br, next_test);
+				
+				if (null_found)
+					ig.MarkLabel (null_target);
+				ig.MarkLabel (sec_begin);
+				foreach (SwitchLabel sl in ss.Labels)
+					ig.MarkLabel (sl.ILLabelCode);
+				if (ss.Block.Emit (ec))
+					pending_goto_end = false;
+				else {
+					all_return = false;
+					pending_goto_end = true;
+				}
+				first_test = false;
+			}
+			if (!default_found){
+				ig.MarkLabel (default_target);
+				all_return = false;
+			}
+			ig.MarkLabel (next_test);
+			ig.MarkLabel (end_of_switch);
+			
+			return all_return;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			Expr = Expr.Resolve (ec);
+			if (Expr == null)
+				return false;
+
+			new_expr = SwitchGoverningType (ec, Expr.Type);
+			if (new_expr == null){
+				Report.Error (151, loc, "An integer type or string was expected for switch");
+				return false;
+			}
+
+			// Validate switch.
+			SwitchType = new_expr.Type;
+
+			if (!CheckSwitch (ec))
+				return false;
+
+			Switch old_switch = ec.Switch;
+			ec.Switch = this;
+			ec.Switch.SwitchType = SwitchType;
+
+			ec.StartFlowBranching (FlowBranchingType.SWITCH, loc);
+
+			bool first = true;
+			foreach (SwitchSection ss in Sections){
+				if (!first)
+					ec.CurrentBranching.CreateSibling ();
+				else
+					first = false;
+
+				if (ss.Block.Resolve (ec) != true)
+					return false;
+			}
+
+			ec.EndFlowBranching ();
+			ec.Switch = old_switch;
+
+			return true;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			// Store variable for comparission purposes
+			LocalBuilder value = ec.ig.DeclareLocal (SwitchType);
+			new_expr.Emit (ec);
+			ec.ig.Emit (OpCodes.Stloc, value);
+
+			ILGenerator ig = ec.ig;
+
+			default_target = ig.DefineLabel ();
+
+			//
+			// Setup the codegen context
+			//
+			Label old_end = ec.LoopEnd;
+			Switch old_switch = ec.Switch;
+			
+			ec.LoopEnd = ig.DefineLabel ();
+			ec.Switch = this;
+
+			// Emit Code.
+			bool all_return;
+			if (SwitchType == TypeManager.string_type)
+				all_return = SimpleSwitchEmit (ec, value);
+			else
+				all_return = TableSwitchEmit (ec, value);
+
+			// Restore context state. 
+			ig.MarkLabel (ec.LoopEnd);
+
+			//
+			// Restore the previous context
+			//
+			ec.LoopEnd = old_end;
+			ec.Switch = old_switch;
+			
+			return all_return;
+		}
+	}
+
+	public class Lock : Statement {
+		Expression expr;
+		Statement Statement;
+			
+		public Lock (Expression expr, Statement stmt, Location l)
+		{
+			this.expr = expr;
+			Statement = stmt;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			expr = expr.Resolve (ec);
+			return Statement.Resolve (ec) && expr != null;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			Type type = expr.Type;
+			bool val;
+			
+			if (type.IsValueType){
+				Report.Error (185, loc, "lock statement requires the expression to be " +
+					      " a reference type (type is: `" +
+					      TypeManager.CSharpName (type) + "'");
+				return false;
+			}
+
+			ILGenerator ig = ec.ig;
+			LocalBuilder temp = ig.DeclareLocal (type);
+				
+			expr.Emit (ec);
+			ig.Emit (OpCodes.Dup);
+			ig.Emit (OpCodes.Stloc, temp);
+			ig.Emit (OpCodes.Call, TypeManager.void_monitor_enter_object);
+
+			// try
+			Label end = ig.BeginExceptionBlock ();
+			bool old_in_try = ec.InTry;
+			ec.InTry = true;
+			Label finish = ig.DefineLabel ();
+			val = Statement.Emit (ec);
+			ec.InTry = old_in_try;
+			// ig.Emit (OpCodes.Leave, finish);
+
+			ig.MarkLabel (finish);
+			
+			// finally
+			ig.BeginFinallyBlock ();
+			ig.Emit (OpCodes.Ldloc, temp);
+			ig.Emit (OpCodes.Call, TypeManager.void_monitor_exit_object);
+			ig.EndExceptionBlock ();
+			
+			return val;
+		}
+	}
+
+	public class Unchecked : Statement {
+		public readonly Block Block;
+		
+		public Unchecked (Block b)
+		{
+			Block = b;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			return Block.Resolve (ec);
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			bool previous_state = ec.CheckState;
+			bool previous_state_const = ec.ConstantCheckState;
+			bool val;
+			
+			ec.CheckState = false;
+			ec.ConstantCheckState = false;
+			val = Block.Emit (ec);
+			ec.CheckState = previous_state;
+			ec.ConstantCheckState = previous_state_const;
+
+			return val;
+		}
+	}
+
+	public class Checked : Statement {
+		public readonly Block Block;
+		
+		public Checked (Block b)
+		{
+			Block = b;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			bool previous_state = ec.CheckState;
+			bool previous_state_const = ec.ConstantCheckState;
+			
+			ec.CheckState = true;
+			ec.ConstantCheckState = true;
+			bool ret = Block.Resolve (ec);
+			ec.CheckState = previous_state;
+			ec.ConstantCheckState = previous_state_const;
+
+			return ret;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			bool previous_state = ec.CheckState;
+			bool previous_state_const = ec.ConstantCheckState;
+			bool val;
+			
+			ec.CheckState = true;
+			ec.ConstantCheckState = true;
+			val = Block.Emit (ec);
+			ec.CheckState = previous_state;
+			ec.ConstantCheckState = previous_state_const;
+
+			return val;
+		}
+	}
+
+	public class Unsafe : Statement {
+		public readonly Block Block;
+
+		public Unsafe (Block b)
+		{
+			Block = b;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			bool previous_state = ec.InUnsafe;
+			bool val;
+			
+			ec.InUnsafe = true;
+			val = Block.Resolve (ec);
+			ec.InUnsafe = previous_state;
+
+			return val;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			bool previous_state = ec.InUnsafe;
+			bool val;
+			
+			ec.InUnsafe = true;
+			val = Block.Emit (ec);
+			ec.InUnsafe = previous_state;
+
+			return val;
+		}
+	}
+
+	// 
+	// Fixed statement
+	//
+	public class Fixed : Statement {
+		Expression type;
+		ArrayList declarators;
+		Statement statement;
+		Type expr_type;
+		FixedData[] data;
+
+		struct FixedData {
+			public bool is_object;
+			public VariableInfo vi;
+			public Expression expr;
+			public Expression converted;
+		}			
+
+		public Fixed (Expression type, ArrayList decls, Statement stmt, Location l)
+		{
+			this.type = type;
+			declarators = decls;
+			statement = stmt;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			expr_type = ec.DeclSpace.ResolveType (type, false, loc);
+			if (expr_type == null)
+				return false;
+
+			data = new FixedData [declarators.Count];
+
+			int i = 0;
+			foreach (Pair p in declarators){
+				VariableInfo vi = (VariableInfo) p.First;
+				Expression e = (Expression) p.Second;
+
+				vi.Number = -1;
+
+				//
+				// The rules for the possible declarators are pretty wise,
+				// but the production on the grammar is more concise.
+				//
+				// So we have to enforce these rules here.
+				//
+				// We do not resolve before doing the case 1 test,
+				// because the grammar is explicit in that the token &
+				// is present, so we need to test for this particular case.
+				//
+
+				//
+				// Case 1: & object.
+				//
+				if (e is Unary && ((Unary) e).Oper == Unary.Operator.AddressOf){
+					Expression child = ((Unary) e).Expr;
+
+					vi.MakePinned ();
+					if (child is ParameterReference || child is LocalVariableReference){
+						Report.Error (
+							213, loc, 
+							"No need to use fixed statement for parameters or " +
+							"local variable declarations (address is already " +
+							"fixed)");
+						return false;
+					}
+					
+					e = e.Resolve (ec);
+					if (e == null)
+						return false;
+
+					child = ((Unary) e).Expr;
+					
+					if (!TypeManager.VerifyUnManaged (child.Type, loc))
+						return false;
+
+					data [i].is_object = true;
+					data [i].expr = e;
+					data [i].converted = null;
+					data [i].vi = vi;
+					i++;
+
+					continue;
+				}
+
+				e = e.Resolve (ec);
+				if (e == null)
+					return false;
+
+				//
+				// Case 2: Array
+				//
+				if (e.Type.IsArray){
+					Type array_type = e.Type.GetElementType ();
+					
+					vi.MakePinned ();
+					//
+					// Provided that array_type is unmanaged,
+					//
+					if (!TypeManager.VerifyUnManaged (array_type, loc))
+						return false;
+
+					//
+					// and T* is implicitly convertible to the
+					// pointer type given in the fixed statement.
+					//
+					ArrayPtr array_ptr = new ArrayPtr (e, loc);
+					
+					Expression converted = Expression.ConvertImplicitRequired (
+						ec, array_ptr, vi.VariableType, loc);
+					if (converted == null)
+						return false;
+
+					data [i].is_object = false;
+					data [i].expr = e;
+					data [i].converted = converted;
+					data [i].vi = vi;
+					i++;
+
+					continue;
+				}
+
+				//
+				// Case 3: string
+				//
+				if (e.Type == TypeManager.string_type){
+					data [i].is_object = false;
+					data [i].expr = e;
+					data [i].converted = null;
+					data [i].vi = vi;
+					i++;
+				}
+			}
+
+			return statement.Resolve (ec);
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			bool is_ret = false;
+
+			for (int i = 0; i < data.Length; i++) {
+				VariableInfo vi = data [i].vi;
+
+				//
+				// Case 1: & object.
+				//
+				if (data [i].is_object) {
+					//
+					// Store pointer in pinned location
+					//
+					data [i].expr.Emit (ec);
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+
+					is_ret = statement.Emit (ec);
+
+					// Clear the pinned variable.
+					ig.Emit (OpCodes.Ldc_I4_0);
+					ig.Emit (OpCodes.Conv_U);
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+
+					continue;
+				}
+
+				//
+				// Case 2: Array
+				//
+				if (data [i].expr.Type.IsArray){
+					//
+					// Store pointer in pinned location
+					//
+					data [i].converted.Emit (ec);
+					
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+
+					is_ret = statement.Emit (ec);
+					
+					// Clear the pinned variable.
+					ig.Emit (OpCodes.Ldc_I4_0);
+					ig.Emit (OpCodes.Conv_U);
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+
+					continue;
+				}
+
+				//
+				// Case 3: string
+				//
+				if (data [i].expr.Type == TypeManager.string_type){
+					LocalBuilder pinned_string = ig.DeclareLocal (TypeManager.string_type);
+					TypeManager.MakePinned (pinned_string);
+					
+					data [i].expr.Emit (ec);
+					ig.Emit (OpCodes.Stloc, pinned_string);
+
+					Expression sptr = new StringPtr (pinned_string, loc);
+					Expression converted = Expression.ConvertImplicitRequired (
+						ec, sptr, vi.VariableType, loc);
+					
+					if (converted == null)
+						continue;
+
+					converted.Emit (ec);
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+					
+					is_ret = statement.Emit (ec);
+
+					// Clear the pinned variable
+					ig.Emit (OpCodes.Ldnull);
+					ig.Emit (OpCodes.Stloc, pinned_string);
+				}
+			}
+
+			return is_ret;
+		}
+	}
+	
+	public class Catch {
+		public readonly string Name;
+		public readonly Block  Block;
+		public readonly Location Location;
+
+		Expression type;
+		
+		public Catch (Expression type, string name, Block block, Location l)
+		{
+			this.type = type;
+			Name = name;
+			Block = block;
+			Location = l;
+		}
+
+		public Type CatchType {
+			get {
+				if (type == null)
+					throw new InvalidOperationException ();
+
+				return type.Type;
+			}
+		}
+
+		public bool IsGeneral {
+			get {
+				return type == null;
+			}
+		}
+
+		public bool Resolve (EmitContext ec)
+		{
+			if (type != null) {
+				type = type.DoResolve (ec);
+				if (type == null)
+					return false;
+
+				Type t = type.Type;
+				if (t != TypeManager.exception_type && !t.IsSubclassOf (TypeManager.exception_type)){
+					Report.Error (155, Location,
+						      "The type caught or thrown must be derived " +
+						      "from System.Exception");
+					return false;
+				}
+			}
+
+			if (!Block.Resolve (ec))
+				return false;
+
+			return true;
+		}
+	}
+
+	public class Try : Statement {
+		public readonly Block Fini, Block;
+		public readonly ArrayList Specific;
+		public readonly Catch General;
+		
+		//
+		// specific, general and fini might all be null.
+		//
+		public Try (Block block, ArrayList specific, Catch general, Block fini, Location l)
+		{
+			if (specific == null && general == null){
+				Console.WriteLine ("CIR.Try: Either specific or general have to be non-null");
+			}
+			
+			this.Block = block;
+			this.Specific = specific;
+			this.General = general;
+			this.Fini = fini;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			bool ok = true;
+			
+			ec.StartFlowBranching (FlowBranchingType.EXCEPTION, Block.StartLocation);
+
+			Report.Debug (1, "START OF TRY BLOCK", Block.StartLocation);
+
+			bool old_in_try = ec.InTry;
+			ec.InTry = true;
+
+			if (!Block.Resolve (ec))
+				ok = false;
+
+			ec.InTry = old_in_try;
+
+			FlowBranching.UsageVector vector = ec.CurrentBranching.CurrentUsageVector;
+
+			Report.Debug (1, "START OF CATCH BLOCKS", vector);
+
+			foreach (Catch c in Specific){
+				ec.CurrentBranching.CreateSibling ();
+				Report.Debug (1, "STARTED SIBLING FOR CATCH", ec.CurrentBranching);
+
+				if (c.Name != null) {
+					VariableInfo vi = c.Block.GetVariableInfo (c.Name);
+					if (vi == null)
+						throw new Exception ();
+
+					vi.Number = -1;
+				}
+
+				bool old_in_catch = ec.InCatch;
+				ec.InCatch = true;
+
+				if (!c.Resolve (ec))
+					ok = false;
+
+				ec.InCatch = old_in_catch;
+
+				FlowBranching.UsageVector current = ec.CurrentBranching.CurrentUsageVector;
+
+				if ((current.Returns == FlowReturns.NEVER) ||
+				    (current.Returns == FlowReturns.SOMETIMES)) {
+					vector.AndLocals (current);
+				}
+			}
+
+			if (General != null){
+				ec.CurrentBranching.CreateSibling ();
+				Report.Debug (1, "STARTED SIBLING FOR GENERAL", ec.CurrentBranching);
+
+				bool old_in_catch = ec.InCatch;
+				ec.InCatch = true;
+
+				if (!General.Resolve (ec))
+					ok = false;
+
+				ec.InCatch = old_in_catch;
+
+				FlowBranching.UsageVector current = ec.CurrentBranching.CurrentUsageVector;
+
+				if ((current.Returns == FlowReturns.NEVER) ||
+				    (current.Returns == FlowReturns.SOMETIMES)) {
+					vector.AndLocals (current);
+				}
+			}
+
+			ec.CurrentBranching.CreateSiblingForFinally ();
+			Report.Debug (1, "STARTED SIBLING FOR FINALLY", ec.CurrentBranching, vector);
+
+			if (Fini != null) {
+				bool old_in_finally = ec.InFinally;
+				ec.InFinally = true;
+
+				if (!Fini.Resolve (ec))
+					ok = false;
+
+				ec.InFinally = old_in_finally;
+			}
+
+			FlowBranching.UsageVector f_vector = ec.CurrentBranching.CurrentUsageVector;
+
+			FlowReturns returns = ec.EndFlowBranching ();
+
+			Report.Debug (1, "END OF FINALLY", ec.CurrentBranching, returns, vector, f_vector);
+
+			if ((returns == FlowReturns.SOMETIMES) || (returns == FlowReturns.ALWAYS)) {
+				ec.CurrentBranching.CheckOutParameters (f_vector.Parameters, loc);
+			}
+
+			ec.CurrentBranching.CurrentUsageVector.Or (vector);
+
+			Report.Debug (1, "END OF TRY", ec.CurrentBranching);
+
+			return ok;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label end;
+			Label finish = ig.DefineLabel ();;
+			bool returns;
+
+			ec.TryCatchLevel++;
+			end = ig.BeginExceptionBlock ();
+			bool old_in_try = ec.InTry;
+			ec.InTry = true;
+			returns = Block.Emit (ec);
+			ec.InTry = old_in_try;
+
+			//
+			// System.Reflection.Emit provides this automatically:
+			// ig.Emit (OpCodes.Leave, finish);
+
+			bool old_in_catch = ec.InCatch;
+			ec.InCatch = true;
+			DeclSpace ds = ec.DeclSpace;
+
+			foreach (Catch c in Specific){
+				VariableInfo vi;
+				
+				ig.BeginCatchBlock (c.CatchType);
+
+				if (c.Name != null){
+					vi = c.Block.GetVariableInfo (c.Name);
+					if (vi == null)
+						throw new Exception ("Variable does not exist in this block");
+
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+				} else
+					ig.Emit (OpCodes.Pop);
+				
+				if (!c.Block.Emit (ec))
+					returns = false;
+			}
+
+			if (General != null){
+				ig.BeginCatchBlock (TypeManager.object_type);
+				ig.Emit (OpCodes.Pop);
+				if (!General.Block.Emit (ec))
+					returns = false;
+			}
+			ec.InCatch = old_in_catch;
+
+			ig.MarkLabel (finish);
+			if (Fini != null){
+				ig.BeginFinallyBlock ();
+				bool old_in_finally = ec.InFinally;
+				ec.InFinally = true;
+				Fini.Emit (ec);
+				ec.InFinally = old_in_finally;
+			}
+			
+			ig.EndExceptionBlock ();
+			ec.TryCatchLevel--;
+
+			if (!returns || ec.InTry || ec.InCatch)
+				return returns;
+
+			// Unfortunately, System.Reflection.Emit automatically emits a leave
+			// to the end of the finally block.  This is a problem if `returns'
+			// is true since we may jump to a point after the end of the method.
+			// As a workaround, emit an explicit ret here.
+
+			if (ec.ReturnType != null)
+				ec.ig.Emit (OpCodes.Ldloc, ec.TemporaryReturn ());
+			ec.ig.Emit (OpCodes.Ret);
+
+			return true;
+		}
+	}
+
+	//
+	// FIXME: We still do not support the expression variant of the using
+	// statement.
+	//
+	public class Using : Statement {
+		object expression_or_block;
+		Statement Statement;
+		ArrayList var_list;
+		Expression expr;
+		Type expr_type;
+		Expression conv;
+		Expression [] converted_vars;
+		ExpressionStatement [] assign;
+		
+		public Using (object expression_or_block, Statement stmt, Location l)
+		{
+			this.expression_or_block = expression_or_block;
+			Statement = stmt;
+			loc = l;
+		}
+
+		//
+		// Resolves for the case of using using a local variable declaration.
+		//
+		bool ResolveLocalVariableDecls (EmitContext ec)
+		{
+			bool need_conv = false;
+			expr_type = ec.DeclSpace.ResolveType (expr, false, loc);
+			int i = 0;
+
+			if (expr_type == null)
+				return false;
+
+			//
+			// The type must be an IDisposable or an implicit conversion
+			// must exist.
+			//
+			converted_vars = new Expression [var_list.Count];
+			assign = new ExpressionStatement [var_list.Count];
+			if (!TypeManager.ImplementsInterface (expr_type, TypeManager.idisposable_type)){
+				foreach (DictionaryEntry e in var_list){
+					Expression var = (Expression) e.Key;
+
+					var = var.ResolveLValue (ec, new EmptyExpression ());
+					if (var == null)
+						return false;
+					
+					converted_vars [i] = Expression.ConvertImplicit (
+						ec, var, TypeManager.idisposable_type, loc);
+
+					if (converted_vars [i] == null)
+						return false;
+					i++;
+				}
+				need_conv = true;
+			}
+
+			i = 0;
+			foreach (DictionaryEntry e in var_list){
+				LocalVariableReference var = (LocalVariableReference) e.Key;
+				Expression new_expr = (Expression) e.Value;
+				Expression a;
+
+				a = new Assign (var, new_expr, loc);
+				a = a.Resolve (ec);
+				if (a == null)
+					return false;
+
+				if (!need_conv)
+					converted_vars [i] = var;
+				assign [i] = (ExpressionStatement) a;
+				i++;
+			}
+
+			return true;
+		}
+
+		bool ResolveExpression (EmitContext ec)
+		{
+			if (!TypeManager.ImplementsInterface (expr_type, TypeManager.idisposable_type)){
+				conv = Expression.ConvertImplicit (
+					ec, expr, TypeManager.idisposable_type, loc);
+
+				if (conv == null)
+					return false;
+			}
+
+			return true;
+		}
+		
+		//
+		// Emits the code for the case of using using a local variable declaration.
+		//
+		bool EmitLocalVariableDecls (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			int i = 0;
+
+			bool old_in_try = ec.InTry;
+			ec.InTry = true;
+			for (i = 0; i < assign.Length; i++) {
+				assign [i].EmitStatement (ec);
+				
+				ig.BeginExceptionBlock ();
+			}
+			Statement.Emit (ec);
+			ec.InTry = old_in_try;
+
+			bool old_in_finally = ec.InFinally;
+			ec.InFinally = true;
+			var_list.Reverse ();
+			foreach (DictionaryEntry e in var_list){
+				LocalVariableReference var = (LocalVariableReference) e.Key;
+				Label skip = ig.DefineLabel ();
+				i--;
+				
+				ig.BeginFinallyBlock ();
+				
+				var.Emit (ec);
+				ig.Emit (OpCodes.Brfalse, skip);
+				converted_vars [i].Emit (ec);
+				ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
+				ig.MarkLabel (skip);
+				ig.EndExceptionBlock ();
+			}
+			ec.InFinally = old_in_finally;
+
+			return false;
+		}
+
+		bool EmitExpression (EmitContext ec)
+		{
+			//
+			// Make a copy of the expression and operate on that.
+			//
+			ILGenerator ig = ec.ig;
+			LocalBuilder local_copy = ig.DeclareLocal (expr_type);
+			if (conv != null)
+				conv.Emit (ec);
+			else
+				expr.Emit (ec);
+			ig.Emit (OpCodes.Stloc, local_copy);
+
+			bool old_in_try = ec.InTry;
+			ec.InTry = true;
+			ig.BeginExceptionBlock ();
+			Statement.Emit (ec);
+			ec.InTry = old_in_try;
+			
+			Label skip = ig.DefineLabel ();
+			bool old_in_finally = ec.InFinally;
+			ig.BeginFinallyBlock ();
+			ig.Emit (OpCodes.Ldloc, local_copy);
+			ig.Emit (OpCodes.Brfalse, skip);
+			ig.Emit (OpCodes.Ldloc, local_copy);
+			ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
+			ig.MarkLabel (skip);
+			ec.InFinally = old_in_finally;
+			ig.EndExceptionBlock ();
+
+			return false;
+		}
+		
+		public override bool Resolve (EmitContext ec)
+		{
+			if (expression_or_block is DictionaryEntry){
+				expr = (Expression) ((DictionaryEntry) expression_or_block).Key;
+				var_list = (ArrayList)((DictionaryEntry)expression_or_block).Value;
+
+				if (!ResolveLocalVariableDecls (ec))
+					return false;
+
+			} else if (expression_or_block is Expression){
+				expr = (Expression) expression_or_block;
+
+				expr = expr.Resolve (ec);
+				if (expr == null)
+					return false;
+
+				expr_type = expr.Type;
+
+				if (!ResolveExpression (ec))
+					return false;
+			}			
+
+			return Statement.Resolve (ec);
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			if (expression_or_block is DictionaryEntry)
+				return EmitLocalVariableDecls (ec);
+			else if (expression_or_block is Expression)
+				return EmitExpression (ec);
+
+			return false;
+		}
+	}
+
+	/// <summary>
+	///   Implementation of the foreach C# statement
+	/// </summary>
+	public class Foreach : Statement {
+		Expression type;
+		LocalVariableReference variable;
+		Expression expr;
+		Statement statement;
+		ForeachHelperMethods hm;
+		Expression empty, conv;
+		Type array_type, element_type;
+		Type var_type;
+		
+		public Foreach (Expression type, LocalVariableReference var, Expression expr,
+				Statement stmt, Location l)
+		{
+			this.type = type;
+			this.variable = var;
+			this.expr = expr;
+			statement = stmt;
+			loc = l;
+		}
+		
+		public override bool Resolve (EmitContext ec)
+		{
+			expr = expr.Resolve (ec);
+			if (expr == null)
+				return false;
+
+			var_type = ec.DeclSpace.ResolveType (type, false, loc);
+			if (var_type == null)
+				return false;
+			
+			//
+			// We need an instance variable.  Not sure this is the best
+			// way of doing this.
+			//
+			// FIXME: When we implement propertyaccess, will those turn
+			// out to return values in ExprClass?  I think they should.
+			//
+			if (!(expr.eclass == ExprClass.Variable || expr.eclass == ExprClass.Value ||
+			      expr.eclass == ExprClass.PropertyAccess)){
+				error1579 (expr.Type);
+				return false;
+			}
+
+			if (expr.Type.IsArray) {
+				array_type = expr.Type;
+				element_type = array_type.GetElementType ();
+
+				empty = new EmptyExpression (element_type);
+			} else {
+				hm = ProbeCollectionType (ec, expr.Type);
+				if (hm == null){
+					error1579 (expr.Type);
+					return false;
+				}
+
+				array_type = expr.Type;
+				element_type = hm.element_type;
+
+				empty = new EmptyExpression (hm.element_type);
+			}
+
+			//
+			// FIXME: maybe we can apply the same trick we do in the
+			// array handling to avoid creating empty and conv in some cases.
+			//
+			// Although it is not as important in this case, as the type
+			// will not likely be object (what the enumerator will return).
+			//
+			conv = Expression.ConvertExplicit (ec, empty, var_type, loc);
+			if (conv == null)
+				return false;
+
+			if (variable.ResolveLValue (ec, empty) == null)
+				return false;
+
+			if (!statement.Resolve (ec))
+				return false;
+
+			return true;
+		}
+		
+		//
+		// Retrieves a `public bool MoveNext ()' method from the Type `t'
+		//
+		static MethodInfo FetchMethodMoveNext (Type t)
+		{
+			MemberInfo [] move_next_list;
+			
+			move_next_list = TypeContainer.FindMembers (
+				t, MemberTypes.Method,
+				BindingFlags.Public | BindingFlags.Instance,
+				Type.FilterName, "MoveNext");
+			if (move_next_list == null || move_next_list.Length == 0)
+				return null;
+
+			foreach (MemberInfo m in move_next_list){
+				MethodInfo mi = (MethodInfo) m;
+				Type [] args;
+				
+				args = TypeManager.GetArgumentTypes (mi);
+				if (args != null && args.Length == 0){
+					if (mi.ReturnType == TypeManager.bool_type)
+						return mi;
+				}
+			}
+			return null;
+		}
+		
+		//
+		// Retrieves a `public T get_Current ()' method from the Type `t'
+		//
+		static MethodInfo FetchMethodGetCurrent (Type t)
+		{
+			MemberInfo [] move_next_list;
+			
+			move_next_list = TypeContainer.FindMembers (
+				t, MemberTypes.Method,
+				BindingFlags.Public | BindingFlags.Instance,
+				Type.FilterName, "get_Current");
+			if (move_next_list == null || move_next_list.Length == 0)
+				return null;
+
+			foreach (MemberInfo m in move_next_list){
+				MethodInfo mi = (MethodInfo) m;
+				Type [] args;
+
+				args = TypeManager.GetArgumentTypes (mi);
+				if (args != null && args.Length == 0)
+					return mi;
+			}
+			return null;
+		}
+
+		// 
+		// This struct records the helper methods used by the Foreach construct
+		//
+		class ForeachHelperMethods {
+			public EmitContext ec;
+			public MethodInfo get_enumerator;
+			public MethodInfo move_next;
+			public MethodInfo get_current;
+			public Type element_type;
+			public Type enumerator_type;
+			public bool is_disposable;
+
+			public ForeachHelperMethods (EmitContext ec)
+			{
+				this.ec = ec;
+				this.element_type = TypeManager.object_type;
+				this.enumerator_type = TypeManager.ienumerator_type;
+				this.is_disposable = true;
+			}
+		}
+		
+		static bool GetEnumeratorFilter (MemberInfo m, object criteria)
+		{
+			if (m == null)
+				return false;
+			
+			if (!(m is MethodInfo))
+				return false;
+			
+			if (m.Name != "GetEnumerator")
+				return false;
+
+			MethodInfo mi = (MethodInfo) m;
+			Type [] args = TypeManager.GetArgumentTypes (mi);
+			if (args != null){
+				if (args.Length != 0)
+					return false;
+			}
+			ForeachHelperMethods hm = (ForeachHelperMethods) criteria;
+			EmitContext ec = hm.ec;
+
+			//
+			// Check whether GetEnumerator is accessible to us
+			//
+			MethodAttributes prot = mi.Attributes & MethodAttributes.MemberAccessMask;
+
+			Type declaring = mi.DeclaringType;
+			if (prot == MethodAttributes.Private){
+				if (declaring != ec.ContainerType)
+					return false;
+			} else if (prot == MethodAttributes.FamANDAssem){
+				// If from a different assembly, false
+				if (!(mi is MethodBuilder))
+					return false;
+				//
+				// Are we being invoked from the same class, or from a derived method?
+				//
+				if (ec.ContainerType != declaring){
+					if (!ec.ContainerType.IsSubclassOf (declaring))
+						return false;
+				}
+			} else if (prot == MethodAttributes.FamORAssem){
+				if (!(mi is MethodBuilder ||
+				      ec.ContainerType == declaring ||
+				      ec.ContainerType.IsSubclassOf (declaring)))
+					return false;
+			} if (prot == MethodAttributes.Family){
+				if (!(ec.ContainerType == declaring ||
+				      ec.ContainerType.IsSubclassOf (declaring)))
+					return false;
+			}
+
+			//
+			// Ok, we can access it, now make sure that we can do something
+			// with this `GetEnumerator'
+			//
+
+			if (mi.ReturnType == TypeManager.ienumerator_type ||
+			    TypeManager.ienumerator_type.IsAssignableFrom (mi.ReturnType) ||
+			    (!RootContext.StdLib && TypeManager.ImplementsInterface (mi.ReturnType, TypeManager.ienumerator_type))) {
+				hm.move_next = TypeManager.bool_movenext_void;
+				hm.get_current = TypeManager.object_getcurrent_void;
+				return true;
+			}
+
+			//
+			// Ok, so they dont return an IEnumerable, we will have to
+			// find if they support the GetEnumerator pattern.
+			//
+			Type return_type = mi.ReturnType;
+
+			hm.move_next = FetchMethodMoveNext (return_type);
+			if (hm.move_next == null)
+				return false;
+			hm.get_current = FetchMethodGetCurrent (return_type);
+			if (hm.get_current == null)
+				return false;
+
+			hm.element_type = hm.get_current.ReturnType;
+			hm.enumerator_type = return_type;
+			hm.is_disposable = TypeManager.ImplementsInterface (
+				hm.enumerator_type, TypeManager.idisposable_type);
+
+			return true;
+		}
+		
+		/// <summary>
+		///   This filter is used to find the GetEnumerator method
+		///   on which IEnumerator operates
+		/// </summary>
+		static MemberFilter FilterEnumerator;
+		
+		static Foreach ()
+		{
+			FilterEnumerator = new MemberFilter (GetEnumeratorFilter);
+		}
+
+                void error1579 (Type t)
+                {
+                        Report.Error (1579, loc,
+                                      "foreach statement cannot operate on variables of type `" +
+                                      t.FullName + "' because that class does not provide a " +
+                                      " GetEnumerator method or it is inaccessible");
+                }
+
+		static bool TryType (Type t, ForeachHelperMethods hm)
+		{
+			MemberInfo [] mi;
+			
+			mi = TypeContainer.FindMembers (t, MemberTypes.Method,
+							BindingFlags.Public | BindingFlags.NonPublic |
+							BindingFlags.Instance,
+							FilterEnumerator, hm);
+
+			if (mi == null || mi.Length == 0)
+				return false;
+
+			hm.get_enumerator = (MethodInfo) mi [0];
+			return true;	
+		}
+		
+		//
+		// Looks for a usable GetEnumerator in the Type, and if found returns
+		// the three methods that participate: GetEnumerator, MoveNext and get_Current
+		//
+		ForeachHelperMethods ProbeCollectionType (EmitContext ec, Type t)
+		{
+			ForeachHelperMethods hm = new ForeachHelperMethods (ec);
+
+			if (TryType (t, hm))
+				return hm;
+
+			//
+			// Now try to find the method in the interfaces
+			//
+			while (t != null){
+				Type [] ifaces = t.GetInterfaces ();
+
+				foreach (Type i in ifaces){
+					if (TryType (i, hm))
+						return hm;
+				}
+				
+				//
+				// Since TypeBuilder.GetInterfaces only returns the interface
+				// types for this type, we have to keep looping, but once
+				// we hit a non-TypeBuilder (ie, a Type), then we know we are
+				// done, because it returns all the types
+				//
+				if ((t is TypeBuilder))
+					t = t.BaseType;
+				else
+					break;
+			} 
+
+			return null;
+		}
+
+		//
+		// FIXME: possible optimization.
+		// We might be able to avoid creating `empty' if the type is the sam
+		//
+		bool EmitCollectionForeach (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			LocalBuilder enumerator, disposable;
+
+			enumerator = ig.DeclareLocal (hm.enumerator_type);
+			if (hm.is_disposable)
+				disposable = ig.DeclareLocal (TypeManager.idisposable_type);
+			else
+				disposable = null;
+			
+			//
+			// Instantiate the enumerator
+			//
+			if (expr.Type.IsValueType){
+				if (expr is IMemoryLocation){
+					IMemoryLocation ml = (IMemoryLocation) expr;
+
+					ml.AddressOf (ec, AddressOp.Load);
+				} else
+					throw new Exception ("Expr " + expr + " of type " + expr.Type +
+							     " does not implement IMemoryLocation");
+				ig.Emit (OpCodes.Call, hm.get_enumerator);
+			} else {
+				expr.Emit (ec);
+				ig.Emit (OpCodes.Callvirt, hm.get_enumerator);
+			}
+			ig.Emit (OpCodes.Stloc, enumerator);
+
+			//
+			// Protect the code in a try/finalize block, so that
+			// if the beast implement IDisposable, we get rid of it
+			//
+			Label l;
+			bool old_in_try = ec.InTry;
+
+			if (hm.is_disposable) {
+				l = ig.BeginExceptionBlock ();
+				ec.InTry = true;
+			}
+			
+			Label end_try = ig.DefineLabel ();
+			
+			ig.MarkLabel (ec.LoopBegin);
+			ig.Emit (OpCodes.Ldloc, enumerator);
+			ig.Emit (OpCodes.Callvirt, hm.move_next);
+			ig.Emit (OpCodes.Brfalse, end_try);
+			ig.Emit (OpCodes.Ldloc, enumerator);
+			ig.Emit (OpCodes.Callvirt, hm.get_current);
+			variable.EmitAssign (ec, conv);
+			statement.Emit (ec);
+			ig.Emit (OpCodes.Br, ec.LoopBegin);
+			ig.MarkLabel (end_try);
+			ec.InTry = old_in_try;
+			
+			// The runtime provides this for us.
+			// ig.Emit (OpCodes.Leave, end);
+
+			//
+			// Now the finally block
+			//
+			if (hm.is_disposable) {
+				Label end_finally = ig.DefineLabel ();
+				bool old_in_finally = ec.InFinally;
+				ec.InFinally = true;
+				ig.BeginFinallyBlock ();
+			
+				ig.Emit (OpCodes.Ldloc, enumerator);
+				ig.Emit (OpCodes.Isinst, TypeManager.idisposable_type);
+				ig.Emit (OpCodes.Stloc, disposable);
+				ig.Emit (OpCodes.Ldloc, disposable);
+				ig.Emit (OpCodes.Brfalse, end_finally);
+				ig.Emit (OpCodes.Ldloc, disposable);
+				ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
+				ig.MarkLabel (end_finally);
+				ec.InFinally = old_in_finally;
+
+				// The runtime generates this anyways.
+				// ig.Emit (OpCodes.Endfinally);
+
+				ig.EndExceptionBlock ();
+			}
+
+			ig.MarkLabel (ec.LoopEnd);
+			return false;
+		}
+
+		//
+		// FIXME: possible optimization.
+		// We might be able to avoid creating `empty' if the type is the sam
+		//
+		bool EmitArrayForeach (EmitContext ec)
+		{
+			int rank = array_type.GetArrayRank ();
+			ILGenerator ig = ec.ig;
+
+			LocalBuilder copy = ig.DeclareLocal (array_type);
+			
+			//
+			// Make our copy of the array
+			//
+			expr.Emit (ec);
+			ig.Emit (OpCodes.Stloc, copy);
+			
+			if (rank == 1){
+				LocalBuilder counter = ig.DeclareLocal (TypeManager.int32_type);
+
+				Label loop, test;
+				
+				ig.Emit (OpCodes.Ldc_I4_0);
+				ig.Emit (OpCodes.Stloc, counter);
+				test = ig.DefineLabel ();
+				ig.Emit (OpCodes.Br, test);
+
+				loop = ig.DefineLabel ();
+				ig.MarkLabel (loop);
+
+				ig.Emit (OpCodes.Ldloc, copy);
+				ig.Emit (OpCodes.Ldloc, counter);
+				ArrayAccess.EmitLoadOpcode (ig, var_type);
+
+				variable.EmitAssign (ec, conv);
+
+				statement.Emit (ec);
+
+				ig.MarkLabel (ec.LoopBegin);
+				ig.Emit (OpCodes.Ldloc, counter);
+				ig.Emit (OpCodes.Ldc_I4_1);
+				ig.Emit (OpCodes.Add);
+				ig.Emit (OpCodes.Stloc, counter);
+
+				ig.MarkLabel (test);
+				ig.Emit (OpCodes.Ldloc, counter);
+				ig.Emit (OpCodes.Ldloc, copy);
+				ig.Emit (OpCodes.Ldlen);
+				ig.Emit (OpCodes.Conv_I4);
+				ig.Emit (OpCodes.Blt, loop);
+			} else {
+				LocalBuilder [] dim_len   = new LocalBuilder [rank];
+				LocalBuilder [] dim_count = new LocalBuilder [rank];
+				Label [] loop = new Label [rank];
+				Label [] test = new Label [rank];
+				int dim;
+				
+				for (dim = 0; dim < rank; dim++){
+					dim_len [dim] = ig.DeclareLocal (TypeManager.int32_type);
+					dim_count [dim] = ig.DeclareLocal (TypeManager.int32_type);
+					test [dim] = ig.DefineLabel ();
+					loop [dim] = ig.DefineLabel ();
+				}
+					
+				for (dim = 0; dim < rank; dim++){
+					ig.Emit (OpCodes.Ldloc, copy);
+					IntLiteral.EmitInt (ig, dim);
+					ig.Emit (OpCodes.Callvirt, TypeManager.int_getlength_int);
+					ig.Emit (OpCodes.Stloc, dim_len [dim]);
+				}
+
+				for (dim = 0; dim < rank; dim++){
+					ig.Emit (OpCodes.Ldc_I4_0);
+					ig.Emit (OpCodes.Stloc, dim_count [dim]);
+					ig.Emit (OpCodes.Br, test [dim]);
+					ig.MarkLabel (loop [dim]);
+				}
+
+				ig.Emit (OpCodes.Ldloc, copy);
+				for (dim = 0; dim < rank; dim++)
+					ig.Emit (OpCodes.Ldloc, dim_count [dim]);
+
+				//
+				// FIXME: Maybe we can cache the computation of `get'?
+				//
+				Type [] args = new Type [rank];
+				MethodInfo get;
+
+				for (int i = 0; i < rank; i++)
+					args [i] = TypeManager.int32_type;
+
+				ModuleBuilder mb = CodeGen.ModuleBuilder;
+				get = mb.GetArrayMethod (
+					array_type, "Get",
+					CallingConventions.HasThis| CallingConventions.Standard,
+					var_type, args);
+				ig.Emit (OpCodes.Call, get);
+				variable.EmitAssign (ec, conv);
+				statement.Emit (ec);
+				ig.MarkLabel (ec.LoopBegin);
+				for (dim = rank - 1; dim >= 0; dim--){
+					ig.Emit (OpCodes.Ldloc, dim_count [dim]);
+					ig.Emit (OpCodes.Ldc_I4_1);
+					ig.Emit (OpCodes.Add);
+					ig.Emit (OpCodes.Stloc, dim_count [dim]);
+
+					ig.MarkLabel (test [dim]);
+					ig.Emit (OpCodes.Ldloc, dim_count [dim]);
+					ig.Emit (OpCodes.Ldloc, dim_len [dim]);
+					ig.Emit (OpCodes.Blt, loop [dim]);
+				}
+			}
+			ig.MarkLabel (ec.LoopEnd);
+			
+			return false;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			bool ret_val;
+			
+			ILGenerator ig = ec.ig;
+			
+			Label old_begin = ec.LoopBegin, old_end = ec.LoopEnd;
+			bool old_inloop = ec.InLoop;
+			int old_loop_begin_try_catch_level = ec.LoopBeginTryCatchLevel;
+			ec.LoopBegin = ig.DefineLabel ();
+			ec.LoopEnd = ig.DefineLabel ();
+			ec.InLoop = true;
+			ec.LoopBeginTryCatchLevel = ec.TryCatchLevel;
+			
+			if (hm != null)
+				ret_val = EmitCollectionForeach (ec);
+			else
+				ret_val = EmitArrayForeach (ec);
+			
+			ec.LoopBegin = old_begin;
+			ec.LoopEnd = old_end;
+			ec.InLoop = old_inloop;
+			ec.LoopBeginTryCatchLevel = old_loop_begin_try_catch_level;
+
+			return ret_val;
+		}
+	}
+}
+
diff --git a/mcs/mbas/statementCollection.cs b/mcs/mbas/statementCollection.cs
new file mode 100644
index 00000000000..7479f48c9ad
--- /dev/null
+++ b/mcs/mbas/statementCollection.cs
@@ -0,0 +1,166 @@
+//

+// System.CodeDOM CodeStatementCollection Class implementation

+//

+// Author:

+//   Miguel de Icaza (miguel@ximian.com)

+//

+// (C) 2001 Ximian, Inc.

+//

+

+namespace Mono.CSharp {

+

+	using System.Collections;

+	using System;

+	

+	public class StatementCollection : IList, ICollection, IEnumerable {

+

+		ArrayList statements;

+		

+		//

+		// Constructors

+		//

+		public StatementCollection ()

+		{

+			statements = new ArrayList ();

+		}

+

+		//

+		// Properties

+		//

+		public int Count {

+			get {

+				return statements.Count;

+			}

+		}

+

+		//

+		// Methods

+		//

+		public void Add (Statement value)

+		{

+			statements.Add (value);

+		}

+

+		public void AddRange (Statement [] values)

+		{

+			foreach (Statement ca in values) 

+				statements.Add (ca);

+

+		}

+

+		public void Clear ()

+		{

+			statements.Clear ();

+		}

+

+		private class Enumerator : IEnumerator {

+			private StatementCollection collection;

+			private int currentIndex = -1;

+

+			internal Enumerator (StatementCollection collection)

+			{

+				this.collection = collection;

+			}

+

+			public object Current {

+				get {

+					if (currentIndex == collection.Count)

+						throw new InvalidOperationException ();

+					return collection [currentIndex];

+				}

+			}

+

+			public bool MoveNext ()

+			{

+				if (currentIndex > collection.Count)

+					throw new InvalidOperationException ();

+				return ++currentIndex < collection.Count;

+			}

+

+			public void Reset ()

+			{

+				currentIndex = -1;

+			}

+		}

+		

+		public IEnumerator GetEnumerator ()

+		{

+			return new StatementCollection.Enumerator (this);

+		}

+

+		//

+		// IList method implementations

+		//

+		public int Add (object value)

+		{

+			return statements.Add (value);

+		}

+

+		public bool Contains (Object value)

+		{

+			return statements.Contains (value);

+		}

+

+		public int IndexOf (Object value)

+		{

+			return statements.IndexOf (value);

+		}

+

+		public void Insert (int index, Object value)

+		{

+			statements [index] = value;

+		}

+

+		public object this[int index] {

+			get {

+				return statements [index];

+			}

+

+			set {

+				statements [index] = value;

+			}

+		}

+

+		public void Remove (object value)

+		{

+			statements.Remove (value);

+		}

+

+		public void RemoveAt (int index)

+		{

+			statements.RemoveAt (index);

+		}

+

+		//

+		// ICollection method implementations

+		//

+		public void CopyTo (Array array, int index)

+		{

+			statements.CopyTo (array, index);

+		}

+

+		public object SyncRoot {

+			get {

+				return statements.SyncRoot;

+			}

+		}

+

+		public bool IsReadOnly {

+			get {

+				return false;

+			}

+		}

+

+		public bool IsSynchronized {

+			get {

+				return statements.IsSynchronized;

+			}

+		}

+

+		public bool IsFixedSize {

+			get {

+				return false;

+			}

+		}

+	}

+}

diff --git a/mcs/mbas/support.cs b/mcs/mbas/support.cs
new file mode 100644
index 00000000000..5bf8026921b
--- /dev/null
+++ b/mcs/mbas/support.cs
@@ -0,0 +1,258 @@
+//
+// support.cs: Support routines to work around the fact that System.Reflection.Emit
+// can not introspect types that are being constructed
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+using System.Text;
+using System.Reflection;
+using System.Collections;
+using System.Reflection.Emit;
+using System.Globalization;
+
+namespace Mono.CSharp {
+
+	public interface ParameterData {
+		Type ParameterType (int pos);
+		int  Count { get; }
+		string ParameterName (int pos);
+		string ParameterDesc (int pos);
+		Parameter.Modifier ParameterModifier (int pos);
+	}
+
+	public class ReflectionParameters : ParameterData {
+		ParameterInfo [] pi;
+		bool last_arg_is_params = false;
+		
+		public ReflectionParameters (ParameterInfo [] pi)
+		{
+			object [] attrs;
+			
+			this.pi = pi;
+
+			int count = pi.Length-1;
+
+			if (count >= 0) {
+				attrs = pi [count].GetCustomAttributes (TypeManager.param_array_type, true);
+
+				if (attrs == null)
+					return;
+				
+				if (attrs.Length == 0)
+					return;
+
+				last_arg_is_params = true;
+			}
+		}
+		       
+		public Type ParameterType (int pos)
+		{
+			if (last_arg_is_params && pos >= pi.Length - 1)
+				return pi [pi.Length - 1].ParameterType;
+			else 
+				return pi [pos].ParameterType;
+		}
+
+		public string ParameterName (int pos)
+		{
+			if (last_arg_is_params && pos >= pi.Length - 1)
+				return pi [pi.Length - 1].Name;
+			else 
+				return pi [pos].Name;
+		}
+
+		public string ParameterDesc (int pos)
+		{
+			StringBuilder sb = new StringBuilder ();
+
+			if (pi [pos].IsOut)
+				sb.Append ("out ");
+
+			if (pi [pos].IsIn)
+				sb.Append ("in ");
+
+			if (pos >= pi.Length - 1 && last_arg_is_params)
+				sb.Append ("params ");
+			
+			sb.Append (TypeManager.CSharpName (ParameterType (pos)));
+
+			return sb.ToString ();
+			
+		}
+
+		public Parameter.Modifier ParameterModifier (int pos)
+		{
+			int len = pi.Length;
+			
+			if (pos >= len - 1)
+				if (last_arg_is_params)
+					return Parameter.Modifier.PARAMS;
+			
+			Type t = pi [pos].ParameterType;
+			if (t.IsByRef)
+				return Parameter.Modifier.ISBYREF;
+			
+			return Parameter.Modifier.NONE;
+		}
+
+		public int Count {
+			get {
+				return pi.Length;
+			}
+		}
+		
+	}
+
+	public class InternalParameters : ParameterData {
+		Type [] param_types;
+
+		Parameters parameters;
+		
+		public InternalParameters (Type [] param_types, Parameters parameters)
+		{
+			this.param_types = param_types;
+			this.parameters = parameters;
+		}
+
+		public InternalParameters (DeclSpace ds, Parameters parameters)
+			: this (parameters.GetParameterInfo (ds), parameters)
+		{
+		}
+
+		public int Count {
+			get {
+				if (param_types == null)
+					return 0;
+
+				return param_types.Length;
+			}
+		}
+
+		public Type ParameterType (int pos)
+		{
+			if (param_types == null)
+				return null;
+
+			Parameter [] fixed_pars = parameters.FixedParameters;
+			if (fixed_pars != null){
+				int len = fixed_pars.Length;
+				if (pos < len)
+					return parameters.FixedParameters [pos].ParameterType;
+				else 
+					return parameters.ArrayParameter.ParameterType;
+			} else
+				return parameters.ArrayParameter.ParameterType;
+		}
+
+		public string ParameterName (int pos)
+		{
+			Parameter p;
+
+			if (pos >= parameters.FixedParameters.Length)
+				p = parameters.ArrayParameter;
+			else
+				p = parameters.FixedParameters [pos];
+
+			return p.Name;
+		}
+
+		public string ParameterDesc (int pos)
+		{
+			string tmp = String.Empty;
+			Parameter p;
+
+			if (pos >= parameters.FixedParameters.Length)
+				p = parameters.ArrayParameter;
+			else
+				p = parameters.FixedParameters [pos];
+			
+			if (p.ModFlags == Parameter.Modifier.REF)
+				tmp = "ref ";
+			else if (p.ModFlags == Parameter.Modifier.OUT)
+				tmp = "out ";
+			else if (p.ModFlags == Parameter.Modifier.PARAMS)
+				tmp = "params ";
+
+			Type t = ParameterType (pos);
+
+			return tmp + TypeManager.CSharpName (t);
+		}
+
+		public Parameter.Modifier ParameterModifier (int pos)
+		{
+			Parameter.Modifier mod;
+
+			if (parameters.FixedParameters == null) {
+				if (parameters.ArrayParameter != null) 
+					mod = parameters.ArrayParameter.ModFlags;
+				else
+					mod = Parameter.Modifier.NONE;
+			} else if (pos >= parameters.FixedParameters.Length)
+				mod = parameters.ArrayParameter.ModFlags;
+			else
+				mod = parameters.FixedParameters [pos].ModFlags;
+
+			if ((mod & (Parameter.Modifier.REF | Parameter.Modifier.OUT)) != 0)
+				mod |= Parameter.Modifier.ISBYREF;
+
+			return mod;
+		}
+		
+	}
+
+	class PtrHashtable : Hashtable {
+		class PtrComparer : IComparer {
+			public int Compare (object x, object y)
+			{
+				if (x == y)
+					return 0;
+				else
+					return 1;
+			}
+		}
+		
+		public PtrHashtable ()
+		{
+			comparer = new PtrComparer ();
+		}
+	}
+
+	//
+	// Compares member infos based on their name and
+	// also allows one argument to be a string
+	//
+	class MemberInfoCompare : IComparer {
+
+		public int Compare (object a, object b)
+		{
+			if (a == null || b == null){
+				Console.WriteLine ("Invalid information passed");
+				throw new Exception ();
+			}
+			
+			if (a is string)
+				return String.Compare ((string) a, ((MemberInfo)b).Name);
+
+			if (b is string)
+				return String.Compare (((MemberInfo)a).Name, (string) b);
+
+			return String.Compare (((MemberInfo)a).Name, ((MemberInfo)b).Name);
+		}
+	}
+
+	struct Pair {
+		public object First;
+		public object Second;
+		
+		public Pair (object f, object s)
+		{
+			First = f;
+			Second = s;
+		}
+	}
+}
diff --git a/mcs/mbas/testmbas/.cvsignore b/mcs/mbas/testmbas/.cvsignore
new file mode 100644
index 00000000000..e57ea06cf94
--- /dev/null
+++ b/mcs/mbas/testmbas/.cvsignore
@@ -0,0 +1,4 @@
+*.exe

+*.pdb

+*.vbproj

+*.vbproj.user

diff --git a/mcs/mbas/testmbas/AssemblyInfo.vb b/mcs/mbas/testmbas/AssemblyInfo.vb
new file mode 100644
index 00000000000..f600c94bc01
--- /dev/null
+++ b/mcs/mbas/testmbas/AssemblyInfo.vb
@@ -0,0 +1,31 @@
+Imports System.Reflection

+Imports System.Runtime.InteropServices

+

+' General Information about an assembly is controlled through the following 

+' set of attributes. Change these attribute values to modify the information

+' associated with an assembly.

+

+' Review the values of the assembly attributes

+

+<Assembly: AssemblyTitle("")> 

+<Assembly: AssemblyDescription("")> 

+<Assembly: AssemblyCompany("")> 

+<Assembly: AssemblyProduct("")> 

+<Assembly: AssemblyCopyright("")> 

+<Assembly: AssemblyTrademark("")> 

+<Assembly: CLSCompliant(True)> 

+

+'The following GUID is for the ID of the typelib if this project is exposed to COM

+<Assembly: Guid("EA89BB68-1010-427C-A8B5-917940328A4B")> 

+

+' Version information for an assembly consists of the following four values:

+'

+'      Major Version

+'      Minor Version 

+'      Build Number

+'      Revision

+'

+' You can specify all the values or you can default the Build and Revision Numbers 

+' by using the '*' as shown below:

+

+<Assembly: AssemblyVersion("1.0.*")> 

diff --git a/mcs/mbas/testmbas/WriteOK.vb b/mcs/mbas/testmbas/WriteOK.vb
new file mode 100644
index 00000000000..abe4911b4de
--- /dev/null
+++ b/mcs/mbas/testmbas/WriteOK.vb
@@ -0,0 +1,17 @@
+Module WriteOK

+

+    Sub Main()

+        REM Testing old-fashioned comments

+        Console.WriteLine("OK!") ' Simple comments

+    End Sub

+

+End Module

+

+Module WriteOK2

+

+    Sub [Sub]() ' Escaped identifier

+        Console.WriteLine("Sub:OK!")

+    End Sub

+

+End Module

+

diff --git a/mcs/mbas/tree.cs b/mcs/mbas/tree.cs
new file mode 100644
index 00000000000..2cf5be8ca5c
--- /dev/null
+++ b/mcs/mbas/tree.cs
@@ -0,0 +1,109 @@
+//
+// tree.cs: keeps a tree representation of the generated code
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.IO;
+
+namespace Mono.CSharp
+{
+
+	public interface ITreeDump {
+		int  Dump (Tree tree, StreamWriter output);
+		void ParseOptions (string options);
+	}
+
+	// <summary>
+	//   
+	//   We store here all the toplevel types that we have parsed,
+	//   this is the root of all information we have parsed.
+	// 
+	// </summary>
+	
+	public class Tree {
+		TypeContainer root_types;
+
+		// <summary>
+		//  Keeps track of namespaces defined in the source code
+		// </summary>
+		Hashtable namespaces;
+
+		// <summary>
+		//   Keeps track of all the types definied (classes, structs, ifaces, enums)
+		// </summary>
+		Hashtable decls;
+		
+		public Tree ()
+		{
+			root_types = new TypeContainer (null, "", new Location (-1));
+
+			decls = new Hashtable ();
+			namespaces = new Hashtable ();
+		}
+
+		public void RecordDecl (string name, DeclSpace ds)
+		{
+			if (decls.Contains (name)){
+				Report.Error (
+					101, ds.Location,
+					"There is already a definition for `" + name + "'");
+				DeclSpace other = (DeclSpace) decls [name];
+				Report.Error (0,
+					other.Location, "(Location of symbol related to previous error)");
+				return;
+			}
+			decls.Add (name, ds);
+		}
+		
+		public Namespace RecordNamespace (Namespace parent, string file, string name)
+		{
+			Namespace ns = new Namespace (parent, name);
+
+			if (namespaces.Contains (file)){
+				Hashtable ns_ns = (Hashtable) namespaces [file];
+
+				if (ns_ns.Contains (ns.Name))
+					return (Namespace) ns_ns [ns.Name];
+				ns_ns.Add (ns.Name, ns);
+			} else {
+				Hashtable new_table = new Hashtable ();
+				namespaces [file] = new_table;
+
+				new_table.Add (ns.Name, ns);
+			}
+
+			return ns;
+		}
+
+		//
+		// FIXME: Why are we using Types?
+		//
+                public TypeContainer Types {
+                        get {
+                                return root_types;
+                        }
+                }
+
+		public Hashtable Decls {
+			get {
+				return decls;
+			}
+		}
+
+		public Hashtable Namespaces {
+			get {
+				return namespaces;
+			}
+		}
+	}
+}
diff --git a/mcs/mbas/typemanager.cs b/mcs/mbas/typemanager.cs
new file mode 100644
index 00000000000..2abb70813a8
--- /dev/null
+++ b/mcs/mbas/typemanager.cs
@@ -0,0 +1,1966 @@
+//
+// typemanager.cs: C# type manager
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//         Ravi Pratap     (ravi@ximian.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+//
+#define CACHE
+
+using System;
+using System.Globalization;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Text.RegularExpressions;
+using System.Runtime.CompilerServices;
+using System.Diagnostics;
+
+namespace Mono.CSharp {
+
+public class TypeManager {
+	//
+	// A list of core types that the compiler requires or uses
+	//
+	static public Type object_type;
+	static public Type value_type;
+	static public Type string_type;
+	static public Type int32_type;
+	static public Type uint32_type;
+	static public Type int64_type;
+	static public Type uint64_type;
+	static public Type float_type;
+	static public Type double_type;
+	static public Type char_type;
+	static public Type char_ptr_type;
+	static public Type short_type;
+	static public Type decimal_type;
+	static public Type bool_type;
+	static public Type sbyte_type;
+	static public Type byte_type;
+	static public Type ushort_type;
+	static public Type enum_type;
+	static public Type delegate_type;
+	static public Type multicast_delegate_type;
+	static public Type void_type;
+	static public Type enumeration_type;
+	static public Type array_type;
+	static public Type runtime_handle_type;
+	static public Type icloneable_type;
+	static public Type type_type;
+	static public Type ienumerator_type;
+	static public Type idisposable_type;
+	static public Type default_member_type;
+	static public Type iasyncresult_type;
+	static public Type asynccallback_type;
+	static public Type intptr_type;
+	static public Type monitor_type;
+	static public Type runtime_field_handle_type;
+	static public Type attribute_type;
+	static public Type attribute_usage_type;
+	static public Type dllimport_type;
+	static public Type unverifiable_code_type;
+	static public Type methodimpl_attr_type;
+	static public Type marshal_as_attr_type;
+	static public Type param_array_type;
+	static public Type void_ptr_type;
+	static public Type indexer_name_type;
+	static public Type exception_type;
+	static public object obsolete_attribute_type;
+	static public object conditional_attribute_type;
+
+	//
+	// An empty array of types
+	//
+	static public Type [] NoTypes;
+
+
+	// 
+	// Expressions representing the internal types.  Used during declaration
+	// definition.
+	//
+	static public Expression system_object_expr, system_string_expr; 
+	static public Expression system_boolean_expr, system_decimal_expr;
+	static public Expression system_single_expr, system_double_expr;
+	static public Expression system_sbyte_expr, system_byte_expr;
+	static public Expression system_int16_expr, system_uint16_expr;
+	static public Expression system_int32_expr, system_uint32_expr;
+	static public Expression system_int64_expr, system_uint64_expr;
+	static public Expression system_char_expr, system_void_expr;
+	static public Expression system_asynccallback_expr;
+	static public Expression system_iasyncresult_expr;
+
+	//
+	// This is only used when compiling corlib
+	//
+	static public Type system_int32_type;
+	static public Type system_array_type;
+	static public Type system_type_type;
+	static public Type system_assemblybuilder_type;
+	static public MethodInfo system_int_array_get_length;
+	static public MethodInfo system_int_array_get_rank;
+	static public MethodInfo system_object_array_clone;
+	static public MethodInfo system_int_array_get_length_int;
+	static public MethodInfo system_int_array_get_lower_bound_int;
+	static public MethodInfo system_int_array_get_upper_bound_int;
+	static public MethodInfo system_void_array_copyto_array_int;
+	static public MethodInfo system_void_set_corlib_type_builders;
+
+	
+	//
+	// Internal, not really used outside
+	//
+	static Type runtime_helpers_type;
+	
+	//
+	// These methods are called by code generated by the compiler
+	//
+	static public MethodInfo string_concat_string_string;
+	static public MethodInfo string_concat_object_object;
+	static public MethodInfo string_isinterneted_string;
+	static public MethodInfo system_type_get_type_from_handle;
+	static public MethodInfo object_getcurrent_void;
+	static public MethodInfo bool_movenext_void;
+	static public MethodInfo void_dispose_void;
+	static public MethodInfo void_monitor_enter_object;
+	static public MethodInfo void_monitor_exit_object;
+	static public MethodInfo void_initializearray_array_fieldhandle;
+	static public MethodInfo int_getlength_int;
+	static public MethodInfo delegate_combine_delegate_delegate;
+	static public MethodInfo delegate_remove_delegate_delegate;
+	static public MethodInfo int_get_offset_to_string_data;
+	static public MethodInfo int_array_get_length;
+	static public MethodInfo int_array_get_rank;
+	static public MethodInfo object_array_clone;
+	static public MethodInfo int_array_get_length_int;
+	static public MethodInfo int_array_get_lower_bound_int;
+	static public MethodInfo int_array_get_upper_bound_int;
+	static public MethodInfo void_array_copyto_array_int;
+	
+	//
+	// The attribute constructors.
+	//
+	static public ConstructorInfo cons_param_array_attribute;
+	static public ConstructorInfo void_decimal_ctor_five_args;
+	static public ConstructorInfo unverifiable_code_ctor;
+	
+	// <remarks>
+	//   Holds the Array of Assemblies that have been loaded
+	//   (either because it is the default or the user used the
+	//   -r command line option)
+	// </remarks>
+	static Assembly [] assemblies;
+
+	// <remarks>
+	//  Keeps a list of module builders. We used this to do lookups
+	//  on the modulebuilder using GetType -- needed for arrays
+	// </remarks>
+	static ModuleBuilder [] modules;
+
+	// <remarks>
+	//   This is the type_cache from the assemblies to avoid
+	//   hitting System.Reflection on every lookup.
+	// </summary>
+	static Hashtable types;
+
+	// <remarks>
+	//  This is used to hotld the corresponding TypeContainer objects
+	//  since we need this in FindMembers
+	// </remarks>
+	static Hashtable typecontainers;
+
+	// <remarks>
+	//   Keeps track of those types that are defined by the
+	//   user's program
+	// </remarks>
+	static ArrayList user_types;
+
+	// <remarks>
+	//   Keeps a mapping between TypeBuilders and their TypeContainers
+	// </remarks>
+	static PtrHashtable builder_to_container;
+
+	// <remarks>
+	//   Tracks the interfaces implemented by typebuilders.  We only
+	//   enter those who do implement or or more interfaces
+	// </remarks>
+	static PtrHashtable builder_to_ifaces;
+
+	// <remarks>
+	//   Maps MethodBase.RuntimeTypeHandle to a Type array that contains
+	//   the arguments to the method
+	// </remarks>
+	static Hashtable method_arguments;
+
+	// <remarks>
+	//   Maps PropertyBuilder to a Type array that contains
+	//   the arguments to the indexer
+	// </remarks>
+	static Hashtable indexer_arguments;
+
+	// <remarks>
+	//   Maybe `method_arguments' should be replaced and only
+	//   method_internal_params should be kept?
+	// <remarks>
+	static Hashtable method_internal_params;
+
+	static PtrHashtable builder_to_interface;
+
+	// <remarks>
+	//  Keeps track of delegate types
+	// </remarks>
+
+	static Hashtable builder_to_delegate;
+
+	// <remarks>
+	//  Keeps track of enum types
+	// </remarks>
+
+	static Hashtable builder_to_enum;
+
+	// <remarks>
+	//  Keeps track of attribute types
+	// </remarks>
+
+	static Hashtable builder_to_attr;
+
+	// <remarks>
+	//  Keeps track of methods
+	// </remarks>
+
+	static Hashtable builder_to_method;
+
+	struct Signature {
+		public string name;
+		public Type [] args;
+	}
+
+	/// <summary>
+	///   A filter for Findmembers that uses the Signature object to
+	///   extract objects
+	/// </summary>
+	static bool SignatureFilter (MemberInfo mi, object criteria)
+	{
+		Signature sig = (Signature) criteria;
+
+		if (!(mi is MethodBase))
+			return false;
+		
+		if (mi.Name != sig.name)
+			return false;
+
+		int count = sig.args.Length;
+		
+		if (mi is MethodBuilder || mi is ConstructorBuilder){
+			Type [] candidate_args = GetArgumentTypes ((MethodBase) mi);
+
+			if (candidate_args.Length != count)
+				return false;
+			
+			for (int i = 0; i < count; i++)
+				if (candidate_args [i] != sig.args [i])
+					return false;
+			
+			return true;
+		} else {
+			ParameterInfo [] pars = ((MethodBase) mi).GetParameters ();
+
+			if (pars.Length != count)
+				return false;
+
+			for (int i = 0; i < count; i++)
+				if (pars [i].ParameterType != sig.args [i])
+					return false;
+			return true;
+		}
+	}
+
+	// A delegate that points to the filter above.
+	static MemberFilter signature_filter;
+
+	//
+	// These are expressions that represent some of the internal data types, used
+	// elsewhere
+	//
+	static void InitExpressionTypes ()
+	{
+		system_object_expr  = new TypeExpression ("System.Object");
+		system_string_expr  = new TypeExpression ("System.String");
+		system_boolean_expr = new TypeExpression ("System.Boolean");
+		system_decimal_expr = new TypeExpression ("System.Decimal");
+		system_single_expr  = new TypeExpression ("System.Single");
+		system_double_expr  = new TypeExpression ("System.Double");
+		system_sbyte_expr   = new TypeExpression ("System.SByte");
+		system_byte_expr    = new TypeExpression ("System.Byte");
+		system_int16_expr   = new TypeExpression ("System.Int16");
+		system_uint16_expr  = new TypeExpression ("System.UInt16");
+		system_int32_expr   = new TypeExpression ("System.Int32");
+		system_uint32_expr  = new TypeExpression ("System.UInt32");
+		system_int64_expr   = new TypeExpression ("System.Int64");
+		system_uint64_expr  = new TypeExpression ("System.UInt64");
+		system_char_expr    = new TypeExpression ("System.Char");
+		system_void_expr    = new TypeExpression ("System.Void");
+		system_asynccallback_expr = new TypeExpression ("System.AsyncCallback");
+		system_iasyncresult_expr = new TypeExpression ("System.IAsyncResult");
+	}
+	
+	static TypeManager ()
+	{
+		assemblies = new Assembly [0];
+		modules = null;
+		user_types = new ArrayList ();
+		
+		types = new Hashtable ();
+		typecontainers = new Hashtable ();
+		
+		builder_to_interface = new PtrHashtable ();
+		builder_to_delegate = new PtrHashtable ();
+		builder_to_enum  = new PtrHashtable ();
+		builder_to_attr = new PtrHashtable ();
+		builder_to_method = new PtrHashtable ();
+		method_arguments = new PtrHashtable ();
+		method_internal_params = new PtrHashtable ();
+		indexer_arguments = new PtrHashtable ();
+		builder_to_container = new PtrHashtable ();
+		builder_to_ifaces = new PtrHashtable ();
+		
+		NoTypes = new Type [0];
+
+		signature_filter = new MemberFilter (SignatureFilter);
+		InitExpressionTypes ();
+	}
+
+	public static void AddUserType (string name, TypeBuilder t, Type [] ifaces)
+	{
+		try {
+			types.Add (name, t);
+		} catch {
+			Type prev = (Type) types [name];
+			TypeContainer tc = (TypeContainer) builder_to_container [prev];
+
+			if (tc != null){
+				//
+				// This probably never happens, as we catch this before
+				//
+				Report.Error (-17, "The type `" + name + "' has already been defined.");
+				return;
+			}
+
+			tc = (TypeContainer) builder_to_container [t];
+			
+			Report.Warning (
+				1595, "The type `" + name + "' is defined in an existing assembly;"+
+				" Using the new definition from: " + tc.Location);
+			Report.Warning (1595, "Previously defined in: " + prev.Assembly.FullName);
+			
+			types.Remove (name);
+			types.Add (name, t);
+		}
+		user_types.Add (t);
+			
+		if (ifaces != null)
+			builder_to_ifaces [t] = ifaces;
+	}
+
+	//
+	// This entry point is used by types that we define under the covers
+	// 
+	public static void RegisterBuilder (TypeBuilder tb, Type [] ifaces)
+	{
+		if (ifaces != null)
+			builder_to_ifaces [tb] = ifaces;
+	}
+	
+	public static void AddUserType (string name, TypeBuilder t, TypeContainer tc, Type [] ifaces)
+	{
+		builder_to_container.Add (t, tc);
+		typecontainers.Add (name, tc);
+		AddUserType (name, t, ifaces);
+	}
+
+	public static void AddDelegateType (string name, TypeBuilder t, Delegate del)
+	{
+		types.Add (name, t);
+		builder_to_delegate.Add (t, del);
+	}
+	
+	public static void AddEnumType (string name, TypeBuilder t, Enum en)
+	{
+		types.Add (name, t);
+		builder_to_enum.Add (t, en);
+	}
+
+	public static void AddUserInterface (string name, TypeBuilder t, Interface i, Type [] ifaces)
+	{
+		AddUserType (name, t, ifaces);
+		builder_to_interface.Add (t, i);
+	}
+
+	public static void AddMethod (MethodBuilder builder, MethodData method)
+	{
+		builder_to_method.Add (builder, method);
+	}
+
+	public static void RegisterAttrType (Type t, TypeContainer tc)
+	{
+		builder_to_attr.Add (t, tc);
+	}
+
+	/// <summary>
+	///   Returns the TypeContainer whose Type is `t' or null if there is no
+	///   TypeContainer for `t' (ie, the Type comes from a library)
+	/// </summary>
+	public static TypeContainer LookupTypeContainer (Type t)
+	{
+		return (TypeContainer) builder_to_container [t];
+	}
+
+	public static Interface LookupInterface (Type t)
+	{
+		return (Interface) builder_to_interface [t];
+	}
+
+	public static Delegate LookupDelegate (Type t)
+	{
+		return (Delegate) builder_to_delegate [t];
+	}
+
+	public static Enum LookupEnum (Type t)
+	{
+		return (Enum) builder_to_enum [t];
+	}
+	
+	public static TypeContainer LookupAttr (Type t)
+	{
+		return (TypeContainer) builder_to_attr [t];
+	}
+	
+	/// <summary>
+	///   Registers an assembly to load types from.
+	/// </summary>
+	public static void AddAssembly (Assembly a)
+	{
+		int top = assemblies.Length;
+		Assembly [] n = new Assembly [top + 1];
+
+		assemblies.CopyTo (n, 0);
+		
+		n [top] = a;
+		assemblies = n;
+	}
+
+	/// <summary>
+	///  Registers a module builder to lookup types from
+	/// </summary>
+	public static void AddModule (ModuleBuilder mb)
+	{
+		int top = modules != null ? modules.Length : 0;
+		ModuleBuilder [] n = new ModuleBuilder [top + 1];
+
+		if (modules != null)
+			modules.CopyTo (n, 0);
+		n [top] = mb;
+		modules = n;
+	}
+
+	/// <summary>
+	///   Returns the Type associated with @name
+	/// </summary>
+	public static Type LookupType (string name)
+	{
+		Type t;
+
+		//
+		// First lookup in user defined and cached values
+		//
+
+		t = (Type) types [name];
+		if (t != null)
+			return t;
+
+		foreach (Assembly a in assemblies){
+			t = a.GetType (name);
+			if (t != null){
+				types [name] = t;
+
+				return t;
+			}
+		}
+
+		foreach (ModuleBuilder mb in modules) {
+			t = mb.GetType (name);
+			if (t != null) {
+				types [name] = t;
+				return t;
+			}
+		}
+		
+		return null;
+	}
+
+	/// <summary>
+	///   Returns the C# name of a type if possible, or the full type name otherwise
+	/// </summary>
+	static public string CSharpName (Type t)
+	{
+		return Regex.Replace (t.FullName, 
+			@"^System\." +
+			@"(Int32|UInt32|Int16|Uint16|Int64|UInt64|" +
+			@"Single|Double|Char|Decimal|Byte|SByte|Object|" +
+			@"Boolean|String|Void)" +
+			@"(\W+|\b)", 
+			new MatchEvaluator (CSharpNameMatch));
+	}	
+	
+	static String CSharpNameMatch (Match match) 
+	{
+		string s = match.Groups [1].Captures [0].Value;
+		return s.ToLower ().
+		Replace ("int32", "int").
+		Replace ("uint32", "uint").
+		Replace ("int16", "short").
+		Replace ("uint16", "ushort").
+		Replace ("int64", "long").
+		Replace ("uint64", "ulong").
+		Replace ("single", "float").
+		Replace ("boolean", "bool")
+		+ match.Groups [2].Captures [0].Value;
+	}
+
+        /// <summary>
+        ///   Returns the signature of the method
+        /// </summary>
+        static public string CSharpSignature (MethodBase mb)
+        {
+                string sig = "(";
+
+		//
+		// FIXME: We should really have a single function to do
+		// everything instead of the following 5 line pattern
+		//
+                ParameterData iparams = LookupParametersByBuilder (mb);
+
+		if (iparams == null){
+			ParameterInfo [] pi = mb.GetParameters ();
+			iparams = new ReflectionParameters (pi);
+		}
+		
+                for (int i = 0; i < iparams.Count; i++) {
+                        if (i > 0) {
+                                sig += ", ";
+                        }
+                        sig += iparams.ParameterDesc(i);
+                }
+                sig += ")";
+
+                return mb.DeclaringType.Name + "." + mb.Name + sig;
+        }
+
+	/// <summary>
+	///   Looks up a type, and aborts if it is not found.  This is used
+	///   by types required by the compiler
+	/// </summary>
+	static Type CoreLookupType (string name)
+	{
+		Type t = LookupType (name);
+
+		if (t == null){
+			Report.Error (518, "The predefined type `" + name + "' is not defined or imported");
+			Environment.Exit (0);
+		}
+
+		return t;
+	}
+
+	/// <summary>
+	///   Returns the MethodInfo for a method named `name' defined
+	///   in type `t' which takes arguments of types `args'
+	/// </summary>
+	static MethodInfo GetMethod (Type t, string name, Type [] args)
+	{
+		MemberInfo [] mi;
+		Signature sig;
+
+		sig.name = name;
+		sig.args = args;
+		
+		mi = FindMembers (
+			t, MemberTypes.Method,
+			instance_and_static | BindingFlags.Public, signature_filter, sig);
+		if (mi == null || mi.Length == 0 || !(mi [0] is MethodInfo)){
+			Report.Error (-19, "Can not find the core function `" + name + "'");
+			return null;
+		}
+
+		return (MethodInfo) mi [0];
+	}
+
+	/// <summary>
+	///    Returns the ConstructorInfo for "args"
+	/// </summary>
+	static ConstructorInfo GetConstructor (Type t, Type [] args)
+	{
+		MemberInfo [] mi;
+		Signature sig;
+
+		sig.name = ".ctor";
+		sig.args = args;
+		
+		mi = FindMembers (t, MemberTypes.Constructor,
+				  instance_and_static | BindingFlags.Public | BindingFlags.DeclaredOnly, signature_filter, sig);
+		if (mi == null || mi.Length == 0 || !(mi [0] is ConstructorInfo)){
+			Report.Error (-19, "Can not find the core constructor for type `" + t.Name + "'");
+			return null;
+		}
+
+		return (ConstructorInfo) mi [0];
+	}
+
+	public static void InitEnumUnderlyingTypes ()
+	{
+
+		int32_type    = CoreLookupType ("System.Int32");
+		int64_type    = CoreLookupType ("System.Int64");
+		uint32_type   = CoreLookupType ("System.UInt32"); 
+		uint64_type   = CoreLookupType ("System.UInt64"); 
+		byte_type     = CoreLookupType ("System.Byte");
+		sbyte_type    = CoreLookupType ("System.SByte");
+		short_type    = CoreLookupType ("System.Int16");
+		ushort_type   = CoreLookupType ("System.UInt16");
+	}
+	
+	/// <remarks>
+	///   The types have to be initialized after the initial
+	///   population of the type has happened (for example, to
+	///   bootstrap the corlib.dll
+	/// </remarks>
+	public static void InitCoreTypes ()
+	{
+		object_type   = CoreLookupType ("System.Object");
+		value_type    = CoreLookupType ("System.ValueType");
+
+		InitEnumUnderlyingTypes ();
+
+		char_type     = CoreLookupType ("System.Char");
+		string_type   = CoreLookupType ("System.String");
+		float_type    = CoreLookupType ("System.Single");
+		double_type   = CoreLookupType ("System.Double");
+		char_ptr_type = CoreLookupType ("System.Char*");
+		decimal_type  = CoreLookupType ("System.Decimal");
+		bool_type     = CoreLookupType ("System.Boolean");
+		enum_type     = CoreLookupType ("System.Enum");
+
+		multicast_delegate_type = CoreLookupType ("System.MulticastDelegate");
+		delegate_type           = CoreLookupType ("System.Delegate");
+
+		array_type    = CoreLookupType ("System.Array");
+		void_type     = CoreLookupType ("System.Void");
+		type_type     = CoreLookupType ("System.Type");
+
+		runtime_field_handle_type = CoreLookupType ("System.RuntimeFieldHandle");
+		runtime_helpers_type = CoreLookupType ("System.Runtime.CompilerServices.RuntimeHelpers");
+		default_member_type  = CoreLookupType ("System.Reflection.DefaultMemberAttribute");
+		runtime_handle_type  = CoreLookupType ("System.RuntimeTypeHandle");
+		asynccallback_type   = CoreLookupType ("System.AsyncCallback");
+		iasyncresult_type    = CoreLookupType ("System.IAsyncResult");
+		ienumerator_type     = CoreLookupType ("System.Collections.IEnumerator");
+		idisposable_type     = CoreLookupType ("System.IDisposable");
+		icloneable_type      = CoreLookupType ("System.ICloneable");
+		monitor_type         = CoreLookupType ("System.Threading.Monitor");
+		intptr_type          = CoreLookupType ("System.IntPtr");
+
+		attribute_type       = CoreLookupType ("System.Attribute");
+		attribute_usage_type = CoreLookupType ("System.AttributeUsageAttribute");
+		dllimport_type       = CoreLookupType ("System.Runtime.InteropServices.DllImportAttribute");
+		methodimpl_attr_type = CoreLookupType ("System.Runtime.CompilerServices.MethodImplAttribute");
+		marshal_as_attr_type  = CoreLookupType ("System.Runtime.InteropServices.MarshalAsAttribute");
+		param_array_type      = CoreLookupType ("System.ParamArrayAttribute");
+
+		unverifiable_code_type= CoreLookupType ("System.Security.UnverifiableCodeAttribute");
+
+		void_ptr_type         = CoreLookupType ("System.Void*");
+
+		indexer_name_type     = CoreLookupType ("System.Runtime.CompilerServices.IndexerNameAttribute");
+
+		exception_type        = CoreLookupType ("System.Exception");
+
+		//
+		// Attribute types
+		//
+		obsolete_attribute_type = CoreLookupType ("System.ObsoleteAttribute");
+		conditional_attribute_type = CoreLookupType ("System.Diagnostics.ConditionalAttribute");
+
+		//
+		// When compiling corlib, store the "real" types here.
+		//
+		if (!RootContext.StdLib) {
+			system_int32_type = typeof (System.Int32);
+			system_array_type = typeof (System.Array);
+			system_type_type = typeof (System.Type);
+			system_assemblybuilder_type = typeof (System.Reflection.Emit.AssemblyBuilder);
+
+			Type [] void_arg = {  };
+			system_int_array_get_length = GetMethod (
+				system_array_type, "get_Length", void_arg);
+			system_int_array_get_rank = GetMethod (
+				system_array_type, "get_Rank", void_arg);
+			system_object_array_clone = GetMethod (
+				system_array_type, "Clone", void_arg);
+
+			Type [] system_int_arg = { system_int32_type };
+			system_int_array_get_length_int = GetMethod (
+				system_array_type, "GetLength", system_int_arg);
+			system_int_array_get_upper_bound_int = GetMethod (
+				system_array_type, "GetUpperBound", system_int_arg);
+			system_int_array_get_lower_bound_int = GetMethod (
+				system_array_type, "GetLowerBound", system_int_arg);
+
+			Type [] system_array_int_arg = { system_array_type, system_int32_type };
+			system_void_array_copyto_array_int = GetMethod (
+				system_array_type, "CopyTo", system_array_int_arg);
+
+			Type [] system_type_type_arg = { system_type_type, system_type_type, system_type_type };
+
+			try {
+			system_void_set_corlib_type_builders = GetMethod (
+				system_assemblybuilder_type, "SetCorlibTypeBuilders",
+				system_type_type_arg);
+
+			object[] args = new object [3];
+			args [0] = object_type;
+			args [1] = value_type;
+			args [2] = enum_type;
+
+			system_void_set_corlib_type_builders.Invoke (CodeGen.AssemblyBuilder, args);
+			} catch {
+				Console.WriteLine ("Corlib compilation is not supported in Microsoft.NET due to bugs in it");
+			}
+		}
+	}
+
+	//
+	// The helper methods that are used by the compiler
+	//
+	public static void InitCodeHelpers ()
+	{
+		//
+		// Now load the default methods that we use.
+		//
+		Type [] string_string = { string_type, string_type };
+		string_concat_string_string = GetMethod (
+			string_type, "Concat", string_string);
+
+		Type [] object_object = { object_type, object_type };
+		string_concat_object_object = GetMethod (
+			string_type, "Concat", object_object);
+
+		Type [] string_ = { string_type };
+		string_isinterneted_string = GetMethod (
+			string_type, "IsInterned", string_);
+		
+		Type [] runtime_type_handle = { runtime_handle_type };
+		system_type_get_type_from_handle = GetMethod (
+			type_type, "GetTypeFromHandle", runtime_type_handle);
+
+		Type [] delegate_delegate = { delegate_type, delegate_type };
+		delegate_combine_delegate_delegate = GetMethod (
+				delegate_type, "Combine", delegate_delegate);
+
+		delegate_remove_delegate_delegate = GetMethod (
+				delegate_type, "Remove", delegate_delegate);
+
+		//
+		// Void arguments
+		//
+		Type [] void_arg = {  };
+		object_getcurrent_void = GetMethod (
+			ienumerator_type, "get_Current", void_arg);
+		bool_movenext_void = GetMethod (
+			ienumerator_type, "MoveNext", void_arg);
+		void_dispose_void = GetMethod (
+			idisposable_type, "Dispose", void_arg);
+		int_get_offset_to_string_data = GetMethod (
+			runtime_helpers_type, "get_OffsetToStringData", void_arg);
+		int_array_get_length = GetMethod (
+			array_type, "get_Length", void_arg);
+		int_array_get_rank = GetMethod (
+			array_type, "get_Rank", void_arg);
+
+		//
+		// Int32 arguments
+		//
+		Type [] int_arg = { int32_type };
+		int_array_get_length_int = GetMethod (
+			array_type, "GetLength", int_arg);
+		int_array_get_upper_bound_int = GetMethod (
+			array_type, "GetUpperBound", int_arg);
+		int_array_get_lower_bound_int = GetMethod (
+			array_type, "GetLowerBound", int_arg);
+
+		//
+		// System.Array methods
+		//
+		object_array_clone = GetMethod (
+			array_type, "Clone", void_arg);
+		Type [] array_int_arg = { array_type, int32_type };
+		void_array_copyto_array_int = GetMethod (
+			array_type, "CopyTo", array_int_arg);
+		
+		//
+		// object arguments
+		//
+		Type [] object_arg = { object_type };
+		void_monitor_enter_object = GetMethod (
+			monitor_type, "Enter", object_arg);
+		void_monitor_exit_object = GetMethod (
+			monitor_type, "Exit", object_arg);
+
+		Type [] array_field_handle_arg = { array_type, runtime_field_handle_type };
+		
+		void_initializearray_array_fieldhandle = GetMethod (
+			runtime_helpers_type, "InitializeArray", array_field_handle_arg);
+
+		//
+		// Array functions
+		//
+		int_getlength_int = GetMethod (
+			array_type, "GetLength", int_arg);
+
+		//
+		// Decimal constructors
+		//
+		Type [] dec_arg = { int32_type, int32_type, int32_type, bool_type, byte_type };
+		void_decimal_ctor_five_args = GetConstructor (
+			decimal_type, dec_arg);
+		
+		//
+		// Attributes
+		//
+		cons_param_array_attribute = GetConstructor (
+			param_array_type, void_arg);
+
+		unverifiable_code_ctor = GetConstructor (
+			unverifiable_code_type, void_arg);
+		
+	}
+
+	const BindingFlags instance_and_static = BindingFlags.Static | BindingFlags.Instance;
+
+	//
+	// FIXME: This can be optimized easily.  speedup by having a single builder mapping
+	//
+	public static MemberInfo [] FindMembers (Type t, MemberTypes mt, BindingFlags bf,
+						 MemberFilter filter, object criteria)
+	{
+		//
+		// We have to take care of arrays specially, because GetType on
+		// a TypeBuilder array will return a Type, not a TypeBuilder,
+		// and we can not call FindMembers on this type.
+		//
+		if (t.IsSubclassOf (TypeManager.array_type))
+			return TypeManager.array_type.FindMembers (mt, bf, filter, criteria);
+		
+		if (!(t is TypeBuilder)){
+			//
+			// Since FindMembers will not lookup both static and instance
+			// members, we emulate this behaviour here.
+			//
+			if ((bf & instance_and_static) == instance_and_static){
+				MemberInfo [] i_members = t.FindMembers (
+					mt, bf & ~BindingFlags.Static, filter, criteria);
+
+				int i_len = i_members.Length;
+				if (i_len == 1){
+					MemberInfo one = i_members [0];
+
+					//
+					// If any of these are present, we are done!
+					//
+					if ((one is Type) || (one is EventInfo) || (one is FieldInfo))
+						return i_members;
+				}
+				
+				MemberInfo [] s_members = t.FindMembers (
+					mt, bf & ~BindingFlags.Instance, filter, criteria);
+
+				int s_len = s_members.Length;
+				if (i_len > 0 || s_len > 0){
+					MemberInfo [] both = new MemberInfo [i_len + s_len];
+
+					i_members.CopyTo (both, 0);
+					s_members.CopyTo (both, i_len);
+
+					return both;
+				} else {
+					if (i_len > 0)
+						return i_members;
+					else
+						return s_members;
+				}
+			}
+		        return t.FindMembers (mt, bf, filter, criteria);
+		}
+
+		//
+		// FIXME: We should not have builder_to_blah everywhere,
+		// we should just have a builder_to_findmemberizable
+		// and have them implement a new ICanFindMembers interface
+		//
+		Enum e = (Enum) builder_to_enum [t];
+
+		if (e != null)
+		        return e.FindMembers (mt, bf, filter, criteria);
+		
+		Delegate del = (Delegate) builder_to_delegate [t];
+
+		if (del != null)
+		        return del.FindMembers (mt, bf, filter, criteria);
+
+		Interface iface = (Interface) builder_to_interface [t];
+
+		if (iface != null) 
+		        return iface.FindMembers (mt, bf, filter, criteria);
+		
+		TypeContainer tc = (TypeContainer) builder_to_container [t];
+
+		if (tc != null)
+			return tc.FindMembers (mt, bf, filter, criteria);
+
+		return null;
+	}
+
+	public static bool IsBuiltinType (Type t)
+	{
+		if (t == object_type || t == string_type || t == int32_type || t == uint32_type ||
+		    t == int64_type || t == uint64_type || t == float_type || t == double_type ||
+		    t == char_type || t == short_type || t == decimal_type || t == bool_type ||
+		    t == sbyte_type || t == byte_type || t == ushort_type || t == void_type)
+			return true;
+		else
+			return false;
+	}
+
+	public static bool IsDelegateType (Type t)
+	{
+		if (t.IsSubclassOf (TypeManager.delegate_type))
+			return true;
+		else
+			return false;
+	}
+	
+	public static bool IsEnumType (Type t)
+	{
+		if (t.IsSubclassOf (TypeManager.enum_type))
+			return true;
+		else
+			return false;
+	}
+	
+	public static bool IsValueType (Type t)
+	{
+		if (t.IsSubclassOf (TypeManager.value_type))
+			return true;
+		else
+			return false;
+	}
+	
+	public static bool IsInterfaceType (Type t)
+	{
+		Interface iface = (Interface) builder_to_interface [t];
+
+		if (iface != null)
+			return true;
+		else
+			return false;
+	}
+
+	/// <summary>
+	///   Returns the User Defined Types
+	/// </summary>
+	public static ArrayList UserTypes {
+		get {
+			return user_types;
+		}
+	}
+
+	public static Hashtable TypeContainers {
+		get {
+			return typecontainers;
+		}
+	}
+
+	static Hashtable builder_to_constant;
+
+	public static void RegisterConstant (FieldBuilder fb, Const c)
+	{
+		if (builder_to_constant == null)
+			builder_to_constant = new PtrHashtable ();
+
+		if (builder_to_constant.Contains (fb))
+			return;
+
+		builder_to_constant.Add (fb, c);
+	}
+
+	public static Const LookupConstant (FieldBuilder fb)
+	{
+		if (builder_to_constant == null)
+			return null;
+		
+		return (Const) builder_to_constant [fb];
+	}
+	
+	/// <summary>
+	///   Gigantic work around for missing features in System.Reflection.Emit follows.
+	/// </summary>
+	///
+	/// <remarks>
+	///   Since System.Reflection.Emit can not return MethodBase.GetParameters
+	///   for anything which is dynamic, and we need this in a number of places,
+	///   we register this information here, and use it afterwards.
+	/// </remarks>
+	static public bool RegisterMethod (MethodBase mb, InternalParameters ip, Type [] args)
+	{
+		if (args == null)
+			args = NoTypes;
+				
+		method_arguments.Add (mb, args);
+		method_internal_params.Add (mb, ip);
+		
+		return true;
+	}
+	
+	static public InternalParameters LookupParametersByBuilder (MethodBase mb)
+	{
+		if (! (mb is ConstructorBuilder || mb is MethodBuilder))
+			return null;
+		
+		if (method_internal_params.Contains (mb))
+			return (InternalParameters) method_internal_params [mb];
+		else
+			throw new Exception ("Argument for Method not registered" + mb);
+	}
+
+	/// <summary>
+	///    Returns the argument types for a method based on its methodbase
+	///
+	///    For dynamic methods, we use the compiler provided types, for
+	///    methods from existing assemblies we load them from GetParameters,
+	///    and insert them into the cache
+	/// </summary>
+	static public Type [] GetArgumentTypes (MethodBase mb)
+	{
+		if (method_arguments.Contains (mb))
+			return (Type []) method_arguments [mb];
+		else {
+			ParameterInfo [] pi = mb.GetParameters ();
+			int c = pi.Length;
+			Type [] types = new Type [c];
+			
+			for (int i = 0; i < c; i++)
+				types [i] = pi [i].ParameterType;
+
+			method_arguments.Add (mb, types);
+			return types;
+		}
+	}
+
+	/// <summary>
+	///    Returns the argument types for an indexer based on its PropertyInfo
+	///
+	///    For dynamic indexers, we use the compiler provided types, for
+	///    indexers from existing assemblies we load them from GetParameters,
+	///    and insert them into the cache
+	/// </summary>
+	static public Type [] GetArgumentTypes (PropertyInfo indexer)
+	{
+		if (indexer_arguments.Contains (indexer))
+			return (Type []) indexer_arguments [indexer];
+		else if (indexer is PropertyBuilder)
+			// If we're a PropertyBuilder and not in the
+			// `indexer_arguments' hash, then we're a property and
+			// not an indexer.
+			return NoTypes;
+		else {
+			ParameterInfo [] pi = indexer.GetIndexParameters ();
+			// Property, not an indexer.
+			if (pi == null)
+				return NoTypes;
+			int c = pi.Length;
+			Type [] types = new Type [c];
+			
+			for (int i = 0; i < c; i++)
+				types [i] = pi [i].ParameterType;
+
+			indexer_arguments.Add (indexer, types);
+			return types;
+		}
+	}
+	
+	// <remarks>
+	//  This is a workaround the fact that GetValue is not
+	//  supported for dynamic types
+	// </remarks>
+	static Hashtable fields = new Hashtable ();
+	static public bool RegisterFieldValue (FieldBuilder fb, object value)
+	{
+		if (fields.Contains (fb))
+			return false;
+
+		fields.Add (fb, value);
+
+		return true;
+	}
+
+	static public object GetValue (FieldBuilder fb)
+	{
+		return fields [fb];
+	}
+
+	static Hashtable fieldbuilders_to_fields = new Hashtable ();
+	static public bool RegisterFieldBase (FieldBuilder fb, FieldBase f)
+	{
+		if (fieldbuilders_to_fields.Contains (fb))
+			return false;
+
+		fieldbuilders_to_fields.Add (fb, f);
+		return true;
+	}
+
+	static public FieldBase GetField (FieldInfo fb)
+	{
+		return (FieldBase) fieldbuilders_to_fields [fb];
+	}
+	
+	static Hashtable events;
+
+	static public bool RegisterEvent (MyEventBuilder eb, MethodBase add, MethodBase remove)
+	{
+		if (events == null)
+			events = new Hashtable ();
+
+		if (events.Contains (eb))
+			return false;
+
+		events.Add (eb, new Pair (add, remove));
+
+		return true;
+	}
+
+	static public MethodInfo GetAddMethod (EventInfo ei)
+	{
+		if (ei is MyEventBuilder) {
+			Pair pair = (Pair) events [ei];
+
+			return (MethodInfo) pair.First;
+		} else
+			return ei.GetAddMethod ();
+	}
+
+	static public MethodInfo GetRemoveMethod (EventInfo ei)
+	{
+		if (ei is MyEventBuilder) {
+			Pair pair = (Pair) events [ei];
+
+			return (MethodInfo) pair.Second;
+		} else
+			return ei.GetAddMethod ();
+	}
+
+	static Hashtable priv_fields_events;
+
+	static public bool RegisterPrivateFieldOfEvent (EventInfo einfo, FieldBuilder builder)
+	{
+		if (priv_fields_events == null)
+			priv_fields_events = new Hashtable ();
+
+		if (priv_fields_events.Contains (einfo))
+			return false;
+
+		priv_fields_events.Add (einfo, builder);
+
+		return true;
+	}
+
+	static public MemberInfo GetPrivateFieldOfEvent (EventInfo ei)
+	{
+		return (MemberInfo) priv_fields_events [ei];
+	}
+		
+	static Hashtable properties;
+	
+	static public bool RegisterProperty (PropertyBuilder pb, MethodBase get, MethodBase set)
+	{
+		if (properties == null)
+			properties = new Hashtable ();
+
+		if (properties.Contains (pb))
+			return false;
+
+		properties.Add (pb, new Pair (get, set));
+
+		return true;
+	}
+
+	static public bool RegisterIndexer (PropertyBuilder pb, MethodBase get, MethodBase set, Type[] args)
+	{
+		if (!RegisterProperty (pb, get,set))
+			return false;
+
+		indexer_arguments.Add (pb, args);
+
+		return true;
+	}
+
+	//
+	// FIXME: we need to return the accessors depending on whether
+	// they are visible or not.
+	//
+	static public MethodInfo [] GetAccessors (PropertyInfo pi)
+	{
+		MethodInfo [] ret;
+
+		if (pi is PropertyBuilder){
+			Pair pair = (Pair) properties [pi];
+
+			ret = new MethodInfo [2];
+			ret [0] = (MethodInfo) pair.First;
+			ret [1] = (MethodInfo) pair.Second;
+
+			return ret;
+		} else {
+			MethodInfo [] mi = new MethodInfo [2];
+
+			//
+			// Why this and not pi.GetAccessors?
+			// Because sometimes index 0 is the getter
+			// sometimes it is 1
+			//
+			mi [0] = pi.GetGetMethod (true);
+			mi [1] = pi.GetSetMethod (true);
+
+			return mi;
+		}
+	}
+
+	static public MethodInfo GetPropertyGetter (PropertyInfo pi)
+	{
+		if (pi is PropertyBuilder){
+			Pair de = (Pair) properties [pi];
+
+			return (MethodInfo) de.Second;
+		} else
+			return pi.GetSetMethod ();
+	}
+
+	static public MethodInfo GetPropertySetter (PropertyInfo pi)
+	{
+		if (pi is PropertyBuilder){
+			Pair de = (Pair) properties [pi];
+
+			return (MethodInfo) de.First;
+		} else
+			return pi.GetGetMethod ();
+	}
+
+	/// <summary>
+	///   Given an array of interface types, expand and eliminate repeated ocurrences
+	///   of an interface.  
+	/// </summary>
+	///
+	/// <remarks>
+	///   This expands in context like: IA; IB : IA; IC : IA, IB; the interface "IC" to
+	///   be IA, IB, IC.
+	/// </remarks>
+	public static Type [] ExpandInterfaces (Type [] base_interfaces)
+	{
+		ArrayList new_ifaces = new ArrayList ();
+		
+		foreach (Type iface in base_interfaces){
+			if (!new_ifaces.Contains (iface))
+				new_ifaces.Add (iface);
+			
+			Type [] implementing = TypeManager.GetInterfaces (iface);
+			
+			foreach (Type imp in implementing){
+				if (!new_ifaces.Contains (imp))
+					new_ifaces.Add (imp);
+			}
+		}
+		Type [] ret = new Type [new_ifaces.Count];
+		new_ifaces.CopyTo (ret, 0);
+		return ret;
+	}
+		
+	/// <summary>
+	///   This function returns the interfaces in the type `t'.  Works with
+	///   both types and TypeBuilders.
+	/// </summary>
+	public static Type [] GetInterfaces (Type t)
+	{
+		//
+		// The reason for catching the Array case is that Reflection.Emit
+		// will not return a TypeBuilder for Array types of TypeBuilder types,
+		// but will still throw an exception if we try to call GetInterfaces
+		// on the type.
+		//
+		// Since the array interfaces are always constant, we return those for
+		// the System.Array
+		//
+		
+		if (t.IsArray)
+			t = TypeManager.array_type;
+		
+		if (t is TypeBuilder){
+			Type [] parent_ifaces;
+			
+			if (t.BaseType == null)
+				parent_ifaces = NoTypes;
+			else
+				parent_ifaces = GetInterfaces (t.BaseType);
+			Type [] type_ifaces = (Type []) builder_to_ifaces [t];
+			if (type_ifaces == null)
+				type_ifaces = NoTypes;
+
+			int parent_count = parent_ifaces.Length;
+			Type [] result = new Type [parent_count + type_ifaces.Length];
+			parent_ifaces.CopyTo (result, 0);
+			type_ifaces.CopyTo (result, parent_count);
+
+			return result;
+		} else
+			return t.GetInterfaces ();
+	}
+	
+	/// <remarks>
+	///  The following is used to check if a given type implements an interface.
+	///  The cache helps us reduce the expense of hitting Type.GetInterfaces everytime.
+	/// </remarks>
+	public static bool ImplementsInterface (Type t, Type iface)
+	{
+		Type [] interfaces;
+
+		//
+		// FIXME OPTIMIZATION:
+		// as soon as we hit a non-TypeBuiler in the interface
+		// chain, we could return, as the `Type.GetInterfaces'
+		// will return all the interfaces implement by the type
+		// or its parents.
+		//
+		do {
+			interfaces = GetInterfaces (t);
+
+			if (interfaces != null){
+				foreach (Type i in interfaces){
+					if (i == iface)
+						return true;
+				}
+			}
+			
+			t = t.BaseType;
+		} while (t != null);
+		
+		return false;
+	}
+
+	// This is a custom version of Convert.ChangeType() which works
+	// with the TypeBuilder defined types when compiling corlib.
+	public static object ChangeType (object value, Type conversionType)
+	{
+		if (!(value is IConvertible))
+			throw new ArgumentException ();
+
+		IConvertible convertValue = (IConvertible) value;
+		CultureInfo ci = CultureInfo.CurrentCulture;
+		NumberFormatInfo provider = ci.NumberFormat;
+
+		//
+		// We must use Type.Equals() here since `conversionType' is
+		// the TypeBuilder created version of a system type and not
+		// the system type itself.  You cannot use Type.GetTypeCode()
+		// on such a type - it'd always return TypeCode.Object.
+		//
+		if (conversionType.Equals (typeof (Boolean)))
+			return (object)(convertValue.ToBoolean (provider));
+		else if (conversionType.Equals (typeof (Byte)))
+			return (object)(convertValue.ToByte (provider));
+		else if (conversionType.Equals (typeof (Char)))
+			return (object)(convertValue.ToChar (provider));
+		else if (conversionType.Equals (typeof (DateTime)))
+			return (object)(convertValue.ToDateTime (provider));
+		else if (conversionType.Equals (typeof (Decimal)))
+			return (object)(convertValue.ToDecimal (provider));
+		else if (conversionType.Equals (typeof (Double)))
+			return (object)(convertValue.ToDouble (provider));
+		else if (conversionType.Equals (typeof (Int16)))
+			return (object)(convertValue.ToInt16 (provider));
+		else if (conversionType.Equals (typeof (Int32)))
+			return (object)(convertValue.ToInt32 (provider));
+		else if (conversionType.Equals (typeof (Int64)))
+			return (object)(convertValue.ToInt64 (provider));
+		else if (conversionType.Equals (typeof (SByte)))
+			return (object)(convertValue.ToSByte (provider));
+		else if (conversionType.Equals (typeof (Single)))
+			return (object)(convertValue.ToSingle (provider));
+		else if (conversionType.Equals (typeof (String)))
+			return (object)(convertValue.ToString (provider));
+		else if (conversionType.Equals (typeof (UInt16)))
+			return (object)(convertValue.ToUInt16 (provider));
+		else if (conversionType.Equals (typeof (UInt32)))
+			return (object)(convertValue.ToUInt32 (provider));
+		else if (conversionType.Equals (typeof (UInt64)))
+			return (object)(convertValue.ToUInt64 (provider));
+		else if (conversionType.Equals (typeof (Object)))
+			return (object)(value);
+		else 
+			throw new InvalidCastException ();
+	}
+
+	//
+	// This is needed, because enumerations from assemblies
+	// do not report their underlyingtype, but they report
+	// themselves
+	//
+	public static Type EnumToUnderlying (Type t)
+	{
+		if (t == TypeManager.enum_type)
+			return t;
+
+		t = t.UnderlyingSystemType;
+		if (!TypeManager.IsEnumType (t))
+			return t;
+	
+		if (t is TypeBuilder) {
+			// slow path needed to compile corlib
+			if (t == TypeManager.bool_type ||
+					t == TypeManager.byte_type ||
+					t == TypeManager.sbyte_type ||
+					t == TypeManager.char_type ||
+					t == TypeManager.short_type ||
+					t == TypeManager.ushort_type ||
+					t == TypeManager.int32_type ||
+					t == TypeManager.uint32_type ||
+					t == TypeManager.int64_type ||
+					t == TypeManager.uint64_type)
+				return t;
+			throw new Exception ("Unhandled typecode in enum " + " from " + t.AssemblyQualifiedName);
+		}
+		TypeCode tc = Type.GetTypeCode (t);
+
+		switch (tc){
+		case TypeCode.Boolean:
+			return TypeManager.bool_type;
+		case TypeCode.Byte:
+			return TypeManager.byte_type;
+		case TypeCode.SByte:
+			return TypeManager.sbyte_type;
+		case TypeCode.Char:
+			return TypeManager.char_type;
+		case TypeCode.Int16:
+			return TypeManager.short_type;
+		case TypeCode.UInt16:
+			return TypeManager.ushort_type;
+		case TypeCode.Int32:
+			return TypeManager.int32_type;
+		case TypeCode.UInt32:
+			return TypeManager.uint32_type;
+		case TypeCode.Int64:
+			return TypeManager.int64_type;
+		case TypeCode.UInt64:
+			return TypeManager.uint64_type;
+		}
+		throw new Exception ("Unhandled typecode in enum " + tc + " from " + t.AssemblyQualifiedName);
+	}
+
+	//
+	// When compiling corlib and called with one of the core types, return
+	// the corresponding typebuilder for that type.
+	//
+	public static Type TypeToCoreType (Type t)
+	{
+		if (RootContext.StdLib || (t is TypeBuilder))
+			return t;
+
+		TypeCode tc = Type.GetTypeCode (t);
+
+		switch (tc){
+		case TypeCode.Boolean:
+			return TypeManager.bool_type;
+		case TypeCode.Byte:
+			return TypeManager.byte_type;
+		case TypeCode.SByte:
+			return TypeManager.sbyte_type;
+		case TypeCode.Char:
+			return TypeManager.char_type;
+		case TypeCode.Int16:
+			return TypeManager.short_type;
+		case TypeCode.UInt16:
+			return TypeManager.ushort_type;
+		case TypeCode.Int32:
+			return TypeManager.int32_type;
+		case TypeCode.UInt32:
+			return TypeManager.uint32_type;
+		case TypeCode.Int64:
+			return TypeManager.int64_type;
+		case TypeCode.UInt64:
+			return TypeManager.uint64_type;
+		case TypeCode.String:
+			return TypeManager.string_type;
+		default:
+			if (t == typeof (void))
+				return TypeManager.void_type;
+			if (t == typeof (object))
+				return TypeManager.object_type;
+			if (t == typeof (System.Type))
+				return TypeManager.type_type;
+			return t;
+		}
+	}
+
+	/// <summary>
+	///   Utility function that can be used to probe whether a type
+	///   is managed or not.  
+	/// </summary>
+	public static bool VerifyUnManaged (Type t, Location loc)
+	{
+		if (t.IsValueType || t.IsPointer){
+			//
+			// FIXME: this is more complex, we actually need to
+			// make sure that the type does not contain any
+			// classes itself
+			//
+			return true;
+		}
+
+		if (!RootContext.StdLib && (t == TypeManager.decimal_type))
+			// We need this explicit check here to make it work when
+			// compiling corlib.
+			return true;
+
+		Report.Error (
+			208, loc,
+			"Cannot take the address or size of a variable of a managed type ('" +
+			CSharpName (t) + "')");
+		return false;	
+	}
+	
+	/// <summary>
+	///   Returns the name of the indexer in a given type.
+	/// </summary>
+	/// <remarks>
+	///   The default is not always `Item'.  The user can change this behaviour by
+	///   using the DefaultMemberAttribute in the class.
+	///
+	///   For example, the String class indexer is named `Chars' not `Item' 
+	/// </remarks>
+	public static string IndexerPropertyName (Type t)
+	{
+		if (t is TypeBuilder) {
+			if (t.IsInterface) {
+				Interface i = LookupInterface (t);
+
+				if ((i == null) || (i.IndexerName == null))
+					return "Item";
+
+				return i.IndexerName;
+			} else {
+				TypeContainer tc = LookupTypeContainer (t);
+
+				if ((tc == null) || (tc.IndexerName == null))
+					return "Item";
+
+				return tc.IndexerName;
+			}
+		}
+		
+		System.Attribute attr = System.Attribute.GetCustomAttribute (
+			t, TypeManager.default_member_type);
+		if (attr != null){
+			DefaultMemberAttribute dma = (DefaultMemberAttribute) attr;
+			return dma.MemberName;
+		}
+
+		return "Item";
+	}
+
+	public static void MakePinned (LocalBuilder builder)
+	{
+		//
+		// FIXME: Flag the "LocalBuilder" type as being
+		// pinned.  Figure out API.
+		//
+	}
+
+
+	//
+	// Returns whether the array of memberinfos contains the given method
+	//
+	static bool ArrayContainsMethod (MemberInfo [] array, MethodBase new_method)
+	{
+		Type [] new_args = TypeManager.GetArgumentTypes (new_method);
+		
+		foreach (MethodBase method in array){
+			if (method.Name != new_method.Name)
+				continue;
+			
+			Type [] old_args = TypeManager.GetArgumentTypes (method);
+			int old_count = old_args.Length;
+			int i;
+			
+			if (new_args.Length != old_count)
+				continue;
+			
+			for (i = 0; i < old_count; i++){
+				if (old_args [i] != new_args [i])
+					break;
+			}
+			if (i != old_count)
+				continue;
+
+			return true;
+		}
+		return false;
+	}
+	
+	//
+	// We copy methods from `new_members' into `target_list' if the signature
+	// for the method from in the new list does not exist in the target_list
+	//
+	// The name is assumed to be the same.
+	//
+	public static ArrayList CopyNewMethods (ArrayList target_list, MemberInfo [] new_members)
+	{
+		if (target_list == null){
+			target_list = new ArrayList ();
+
+			foreach (MemberInfo mi in new_members){
+				if (mi is MethodBase)
+					target_list.Add (mi);
+			}
+			return target_list;
+		}
+		
+		MemberInfo [] target_array = new MemberInfo [target_list.Count];
+		target_list.CopyTo (target_array, 0);
+		
+		foreach (MemberInfo mi in new_members){
+			MethodBase new_method = (MethodBase) mi;
+			
+			if (!ArrayContainsMethod (target_array, new_method))
+				target_list.Add (new_method);
+		}
+		return target_list;
+	}
+
+	[Flags]
+	public enum MethodFlags {
+		IsObsolete = 1,
+		IsObsoleteError = 2,
+		ShouldIgnore = 3
+	}
+	
+	//
+	// Returns the TypeManager.MethodFlags for this method.
+	// This emits an error 619 / warning 618 if the method is obsolete.
+	// In the former case, TypeManager.MethodFlags.IsObsoleteError is returned.
+	//
+	static public MethodFlags GetMethodFlags (MethodBase mb, Location loc)
+	{
+		MethodFlags flags = 0;
+		
+		if (mb.DeclaringType is TypeBuilder){
+			MethodData method = (MethodData) builder_to_method [mb];
+			if (method == null) {
+				// FIXME: implement Obsolete attribute on Property,
+				//        Indexer and Event.
+				return 0;
+			}
+
+			return method.GetMethodFlags (loc);
+		}
+
+		object [] attrs = mb.GetCustomAttributes (true);
+		foreach (object ta in attrs){
+			if (!(ta is System.Attribute)){
+				Console.WriteLine ("Unknown type in GetMethodFlags: " + ta);
+				continue;
+			}
+			System.Attribute a = (System.Attribute) ta;
+			if (a.TypeId == TypeManager.obsolete_attribute_type){
+				ObsoleteAttribute oa = (ObsoleteAttribute) a;
+
+				string method_desc = TypeManager.CSharpSignature (mb);
+
+				if (oa.IsError) {
+					Report.Error (619, loc, "Method `" + method_desc +
+						      "' is obsolete: `" + oa.Message + "'");
+					return MethodFlags.IsObsoleteError;
+				} else
+					Report.Warning (618, loc, "Method `" + method_desc +
+							"' is obsolete: `" + oa.Message + "'");
+
+				flags |= MethodFlags.IsObsolete;
+
+				continue;
+			}
+			
+			//
+			// Skip over conditional code.
+			//
+			if (a.TypeId == TypeManager.conditional_attribute_type){
+				ConditionalAttribute ca = (ConditionalAttribute) a;
+
+				if (RootContext.AllDefines [ca.ConditionString] == null)
+					flags |= MethodFlags.ShouldIgnore;
+			}
+		}
+
+		return flags;
+	}
+	
+#region MemberLookup implementation
+	
+	//
+	// Name of the member
+	//
+	static string   closure_name;
+
+	//
+	// Whether we allow private members in the result (since FindMembers
+	// uses NonPublic for both protected and private), we need to distinguish.
+	//
+	static bool     closure_private_ok;
+
+	//
+	// Who is invoking us and which type is being queried currently.
+	//
+	static Type     closure_invocation_type;
+	static Type     closure_queried_type;
+
+	//
+	// The assembly that defines the type is that is calling us
+	//
+	static Assembly closure_invocation_assembly;
+
+	//
+	// This filter filters by name + whether it is ok to include private
+	// members in the search
+	//
+	static internal bool FilterWithClosure (MemberInfo m, object filter_criteria)
+	{
+		//
+		// Hack: we know that the filter criteria will always be in the `closure'
+		// fields. 
+		//
+
+		if (m.Name != closure_name)
+			return false;
+
+		//
+		// Ugly: we need to find out the type of `m', and depending
+		// on this, tell whether we accept or not
+		//
+		if (m is MethodBase){
+			MethodBase mb = (MethodBase) m;
+			MethodAttributes ma = mb.Attributes & MethodAttributes.MemberAccessMask;
+
+			if (ma == MethodAttributes.Private)
+				return closure_private_ok;
+
+			//
+			// FamAndAssem requires that we not only derivate, but we are on the
+			// same assembly.  
+			//
+			if (ma == MethodAttributes.FamANDAssem){
+				if (closure_invocation_assembly != mb.DeclaringType.Assembly)
+					return false;
+			}
+
+			// FamORAssem, Family and Public:
+			return true;
+		}
+
+		if (m is FieldInfo){
+			FieldInfo fi = (FieldInfo) m;
+			FieldAttributes fa = fi.Attributes & FieldAttributes.FieldAccessMask;
+
+			if (fa == FieldAttributes.Private)
+				return closure_private_ok;
+
+			//
+			// FamAndAssem requires that we not only derivate, but we are on the
+			// same assembly.  
+			//
+			if (fa == FieldAttributes.FamANDAssem){
+				if (closure_invocation_assembly != fi.DeclaringType.Assembly)
+					return false;
+			}
+			// FamORAssem, Family and Public:
+			return true;
+		}
+
+		//
+		// EventInfos and PropertyInfos, return true
+		//
+		return true;
+	}
+
+	static MemberFilter FilterWithClosure_delegate = new MemberFilter (FilterWithClosure);
+	
+	//
+	// Looks up a member called `name' in the `queried_type'.  This lookup
+	// is done by code that is contained in the definition for `invocation_type'.
+	//
+	// The binding flags are `bf' and the kind of members being looked up are `mt'
+	//
+	// Returns an array of a single element for everything but Methods/Constructors
+	// that might return multiple matches.
+	//
+	public static MemberInfo [] MemberLookup (Type invocation_type, Type queried_type, 
+						  MemberTypes mt, BindingFlags original_bf, string name)
+	{
+		BindingFlags bf = original_bf;
+		
+		ArrayList method_list = null;
+		Type current_type = queried_type;
+		bool searching = (original_bf & BindingFlags.DeclaredOnly) == 0;
+		bool private_ok;
+		bool always_ok_flag = false;
+
+		closure_name = name;
+		closure_invocation_type = invocation_type;
+		closure_invocation_assembly = invocation_type != null ? invocation_type.Assembly : null;
+
+		//
+		// If we are a nested class, we always have access to our container
+		// type names
+		//
+		if (invocation_type != null){
+			string invocation_name = invocation_type.FullName;
+			if (invocation_name.IndexOf ('+') != -1){
+				string container = queried_type.FullName + "+";
+				int container_length = container.Length;
+				
+				if (invocation_name.Length > container_length){
+					string shared = invocation_name.Substring (0, container_length);
+				
+					if (shared == container)
+						always_ok_flag = true;
+				}
+			}
+		}
+		
+		do {
+			MemberInfo [] mi;
+
+			//
+			// `NonPublic' is lame, because it includes both protected and
+			// private methods, so we need to control this behavior by
+			// explicitly tracking if a private method is ok or not.
+			//
+			// The possible cases are:
+			//    public, private and protected (internal does not come into the
+			//    equation)
+			//
+			if (invocation_type != null){
+				if (invocation_type == current_type){
+					private_ok = true;
+				} else
+					private_ok = always_ok_flag;
+				
+				if (private_ok || invocation_type.IsSubclassOf (current_type))
+					bf = original_bf | BindingFlags.NonPublic;
+			} else {
+				private_ok = false;
+				bf = original_bf & ~BindingFlags.NonPublic;
+			}
+
+			closure_private_ok = private_ok;
+			closure_queried_type = current_type;
+			
+			mi = TypeManager.FindMembers (
+				current_type, mt, bf | BindingFlags.DeclaredOnly,
+				FilterWithClosure_delegate, name);
+			
+			if (current_type == TypeManager.object_type)
+				searching = false;
+			else {
+				current_type = current_type.BaseType;
+				
+				//
+				// This happens with interfaces, they have a null
+				// basetype.  Look members up in the Object class.
+				//
+				if (current_type == null)
+					current_type = TypeManager.object_type;
+			}
+			
+			if (mi == null)
+				continue;
+			
+			int count = mi.Length;
+			
+			if (count == 0)
+				continue;
+			
+			//
+			// Events and types are returned by both `static' and `instance'
+			// searches, which means that our above FindMembers will
+			// return two copies of the same.
+			//
+			if (count == 1 && !(mi [0] is MethodBase)){
+				return mi;
+			}
+
+			//
+			// Multiple properties: we query those just to find out the indexer
+			// name
+			//
+			if (mi [0] is PropertyInfo)
+				return mi;
+
+			//
+			// We found methods, turn the search into "method scan"
+			// mode.
+			//
+			
+			method_list = CopyNewMethods (method_list, mi);
+			mt &= (MemberTypes.Method | MemberTypes.Constructor);
+		} while (searching);
+
+		if (method_list != null && method_list.Count > 0)
+			return (MemberInfo []) method_list.ToArray (typeof (MemberInfo));
+	
+		//
+		// Interfaces do not list members they inherit, so we have to
+		// scan those.
+		// 
+		if (!queried_type.IsInterface)
+			return null;
+
+		if (queried_type.IsArray)
+			queried_type = TypeManager.array_type;
+		
+		Type [] ifaces = GetInterfaces (queried_type);
+		if (ifaces == null)
+			return null;
+		
+		foreach (Type itype in ifaces){
+			MemberInfo [] x;
+
+			x = MemberLookup (null, itype, mt, bf, name);
+			if (x != null)
+				return x;
+		}
+					
+		return null;
+	}
+#endregion
+	
+}
+
+}
diff --git a/mcs/mcs/.cvsignore b/mcs/mcs/.cvsignore
new file mode 100644
index 00000000000..64db93b4a63
--- /dev/null
+++ b/mcs/mcs/.cvsignore
@@ -0,0 +1,9 @@
+compiler.pdb
+compiler.exe
+compiler.suo
+compiler.csproj
+compiler.csproj.user
+cs-parser.cs
+y.output
+*.pdb
+mcs
diff --git a/mcs/mcs/ChangeLog b/mcs/mcs/ChangeLog
new file mode 100755
index 00000000000..6748bf0045d
--- /dev/null
+++ b/mcs/mcs/ChangeLog
@@ -0,0 +1,8974 @@
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* decl.cs (MemberCache.AddMethods): Ignore varargs methods.
+
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* struct.cs (MyStructInfo.ctor): Make this work with empty
+	structs; it's not allowed to use foreach() on null.
+
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* codegen.cs (CodeGen.InitMonoSymbolWriter): Tell the symbol
+	writer the full pathname of the generated assembly.
+
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* statements.cs (FlowBranching.UsageVector.MergeChildren):
+	A `finally' block never returns or breaks; improved handling of
+	unreachable code.
+
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (Throw.Resolve): Allow `throw null'.
+
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (MemberAccess.ResolveMemberAccess): If this is an
+	EventExpr, don't do a DeclaredOnly MemberLookup, but check whether
+	`ee.EventInfo.DeclaringType == ec.ContainerType'.  The
+	MemberLookup would return a wrong event if this is an explicit
+	interface implementation and the class has an event with the same
+	name.
+
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (Block.AddChildVariableNames): New public method.
+	(Block.AddChildVariableName): Likewise.
+	(Block.IsVariableNameUsedInChildBlock): Likewise.
+	(Block.AddVariable): Check whether a variable name has already
+	been used in a child block.
+
+	* cs-parser.jay (declare_local_variables): Mark all variable names
+	from the current block as being used in a child block in the
+	implicit block.
+
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* codegen.cs (CodeGen.InitializeSymbolWriter): Abort if we can't
+	find the symbol writer.
+
+	* driver.cs: csc also allows the arguments to /define being
+	separated by commas, not only by semicolons.
+
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* interface.cs (Interface.GetMembers): Added static check for events.
+
+2002-08-15  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (MethodData.EmitDestructor): In the Expression.MemberLookup
+	call, use ec.ContainerType.BaseType as queried_type and invocation_type.
+
+	* ecore.cs (Expression.MemberLookup): Added documentation and explained
+	why the MethodData.EmitDestructor() change was necessary.
+
+2002-08-20  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (TypeContainer.FindMembers): Added static check for events.
+
+	* decl.cs (MemberCache.AddMembers): Handle events like normal members.
+
+	* typemanager.cs (TypeHandle.GetMembers): When queried for events only,
+	use Type.GetEvents(), not Type.FindMembers().
+
+2002-08-20  Martin Baulig  <martin@gnome.org>
+
+	* decl.cs (MemberCache): Added a special method cache which will
+	be used for method-only searched.  This ensures that a method
+	search will return a MethodInfo with the correct ReflectedType for
+	inherited methods.	
+
+2002-08-20  Martin Baulig  <martin@gnome.org>
+
+	* decl.cs (DeclSpace.FindMembers): Made this public.
+
+2002-08-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* delegate.cs: fixed build on windows.
+	[FIXME:  Filed as bug #29150: MCS must report these errors.]
+
+2002-08-19  Ravi Pratap  <ravi@ximian.com>
+
+	* ecore.cs (StandardConversionExists): Return a false
+	if we are trying to convert the void type to anything else
+	since that is not allowed.
+
+	* delegate.cs (DelegateInvocation.DoResolve): Ensure that
+	we flag error 70 in the event an event is trying to be accessed
+	directly from outside the declaring type.
+
+2002-08-20  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs, decl.cs: Moved MemberList, IMemberContainer and
+	MemberCache from typemanager.cs to decl.cs.
+
+2002-08-19  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (TypeContainer): Implement IMemberContainer.
+	(TypeContainer.DefineMembers): Create the MemberCache.
+	(TypeContainer.FindMembers): Do better BindingFlags checking; only
+	return public members if BindingFlags.Public was given, check
+	whether members are static.
+
+2002-08-16  Martin Baulig  <martin@gnome.org>
+
+	* decl.cs (DeclSpace.Define): Splitted this in Define and
+	DefineMembers.  DefineMembers is called first and initializes the
+	MemberCache.
+
+	* rootcontext.cs (RootContext.DefineMembers): New function.  Calls
+	DefineMembers() on all our DeclSpaces.
+
+	* class.cs (TypeContainer.Define): Moved all code to DefineMembers(),
+	but call DefineMembers() on all nested interfaces.  We call their
+	Define() in our new Define() function.
+
+	* interface.cs (Interface): Implement IMemberContainer.
+	(Interface.Define): Moved all code except the attribute stuf to
+	DefineMembers().
+	(Interface.DefineMembers): Initialize the member cache.
+
+	* typemanager.cs (IMemberFinder): Removed this interface, we don't
+	need this anymore since we can use MemberCache.FindMembers directly.
+
+2002-08-19  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (MemberCache): When creating the cache for an
+	interface type, add all inherited members.
+	(TypeManager.MemberLookup_FindMembers): Changed `ref bool searching'
+	to `out bool used_cache' and documented it.
+	(TypeManager.MemberLookup): If we already used the cache in the first
+	iteration, we don't need to do the interfaces check.
+
+2002-08-19  Martin Baulig  <martin@gnome.org>
+
+	* decl.cs (DeclSpace.FindMembers): New abstract method.  Moved this
+	here from IMemberFinder and don't implement this interface anymore.
+	(DeclSpace.MemberCache): Moved here from IMemberFinder.
+
+	* typemanager.cs (IMemberFinder): This interface is now only used by
+	classes which actually support the member cache.
+	(TypeManager.builder_to_member_finder): Renamed to builder_to_declspace
+	since we only put DeclSpaces into this Hashtable.
+	(MemberLookup_FindMembers): Use `builder_to_declspace' if the type is
+	a dynamic type and TypeHandle.GetTypeHandle() otherwise.
+
+2002-08-16  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (ICachingMemberFinder): Removed.
+	(IMemberFinder.MemberCache): New property.
+	(TypeManager.FindMembers): Merged this with RealFindMembers().
+	This function will never be called from TypeManager.MemberLookup()
+	so we can't use the cache here, just the IMemberFinder.
+	(TypeManager.MemberLookup_FindMembers): Check whether the
+	IMemberFinder has a MemberCache and call the cache's FindMembers
+	function.
+	(MemberCache): Rewrote larger parts of this yet another time and
+	cleaned it up a bit.
+
+2002-08-15  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs (LoadArgs): Support quoting.
+
+	(Usage): Show the CSC-like command line arguments.
+
+	Improved a few error messages.
+
+2002-08-15  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (IMemberContainer.Type): New property.
+	(IMemberContainer.IsInterface): New property.
+
+	The following changes are conditional to BROKEN_RUNTIME, which is
+	defined at the top of the file.
+
+	* typemanager.cs (MemberCache.MemberCache): Don't add the base
+	class'es members, but add all members from TypeHandle.ObjectType
+	if we're an interface.
+	(MemberCache.AddMembers): Set the Declared flag if member.DeclaringType
+	is the current type.
+	(MemberCache.CacheEntry.Container): Removed this field.
+	(TypeHandle.GetMembers): Include inherited members.
+
+2002-08-14  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* typemanager.cs: fixed compilation and added a comment on a field that
+	is never used.
+
+2002-08-15  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (ConstructorInitializer.Resolve): In the
+	Expression.MemberLookup call, use the queried_type as
+	invocation_type.
+
+	* typemanager.cs (IMemberContainer.GetMembers): Removed the `bool
+	declared' attribute, it's always true.
+	(IMemberContainer.Parent, IMemberContainer.Name): New properties.
+	(TypeManager.MemberLookup_FindMembers): [FIXME FIXME FIXME] Added
+	temporary wrapper for FindMembers which tells MemberLookup whether
+	members from the base classes are included in the return value.
+	This will go away soon.
+	(TypeManager.MemberLookup): Use this temporary hack here; once the
+	new MemberCache is completed, we don't need to do the DeclaredOnly
+	looping here anymore since the MemberCache will take care of this.
+	(TypeManager.IsSubclassOrNestedChildOf): Allow `type == parent'.
+	(MemberCache): When creating the MemberCache for a class, get
+	members from the current class and all its base classes.
+	(MemberCache.CacheEntry.Container): New field.  This is a
+	temporary hack until the Mono runtime is fixed to distinguish
+	between ReflectedType and DeclaringType.  It allows us to use MCS
+	with both the MS runtime and the unfixed Mono runtime without
+	problems and without accecting performance.
+	(MemberCache.SearchMembers): The DeclaredOnly looping from
+	TypeManager.MemberLookup is now done here.	
+
+2002-08-14  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (MyStructInfo.MyStructInfo): Don't call
+	Type.GetFields on dynamic types but get the fields from the
+	corresponding TypeContainer.
+	(MyStructInfo.GetStructInfo): Added check for enum types.
+
+	* typemanager.cs (MemberList.IsSynchronized): Implemented.
+	(MemberList.SyncRoot): Implemented.
+	(TypeManager.FilterWithClosure): No need to check permissions if
+	closure_start_type == closure_invocation_type, don't crash if
+	closure_invocation_type is null.
+
+2002-08-13  Martin Baulig  <martin@gnome.org>
+
+	Rewrote TypeContainer.FindMembers to use a member cache.  This
+	gives us a speed increase of about 35% for the self-hosting MCS
+	build and of about 15-20% for the class libs (both on GNU/Linux).
+
+	* report.cs (Timer): New class to get enhanced profiling.  This
+	whole class is "TIMER" conditional since it remarkably slows down
+	compilation speed.
+
+	* class.cs (MemberList): New class.  This is an IList wrapper
+	which we're now using instead of passing MemberInfo[]'s around to
+	avoid copying this array unnecessarily.
+	(IMemberFinder.FindMember): Return a MemberList, not a MemberInfo [].
+	(ICachingMemberFinder, IMemberContainer): New interface.
+	(TypeManager.FilterWithClosure): If `criteria' is null, the name
+	has already been checked, otherwise use it for the name comparision.
+	(TypeManager.FindMembers): Renamed to RealMemberFinder and
+	provided wrapper which tries to use ICachingMemberFinder.FindMembers
+	if possible.  Returns a MemberList, not a MemberInfo [].
+	(TypeHandle): New class, implements IMemberContainer.  We create
+	one instance of this class per type, it contains a MemberCache
+	which is used to do the member lookups.
+	(MemberCache): New class.  Each instance of this class contains
+	all members of a type and a name-based hash table.
+	(MemberCache.FindMembers): This is our new member lookup
+	function.  First, it looks up all members of the requested name in
+	the hash table.  Then, it walks this list and sorts out all
+	applicable members and returns them.
+
+2002-08-13  Martin Baulig  <martin@gnome.org>
+
+	In addition to a nice code cleanup, this gives us a performance
+	increase of about 1.4% on GNU/Linux - not much, but it's already
+	half a second for the self-hosting MCS compilation.
+
+	* typemanager.cs (IMemberFinder): New interface.  It is used by
+	TypeManager.FindMembers to call FindMembers on a TypeContainer,
+	Enum, Delegate or Interface.
+	(TypeManager.finder_to_member_finder): New PtrHashtable.
+	(TypeManager.finder_to_container): Removed.
+	(TypeManager.finder_to_delegate): Removed.
+	(TypeManager.finder_to_interface): Removed.
+	(TypeManager.finder_to_enum): Removed.
+
+	* interface.cs (Interface): Implement IMemberFinder.
+
+	* delegate.cs (Delegate): Implement IMemberFinder.
+
+	* enum.cs (Enum): Implement IMemberFinder.
+
+	* class.cs (TypeContainer): Implement IMemberFinder.
+
+2002-08-12  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (TypeExpr.DoResolveType): Mark this as virtual.
+
+2002-08-12  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (ITypeExpression): New interface for expressions which
+	resolve to a type.
+	(TypeExpression): Renamed to TypeLookupExpression.
+	(Expression.DoResolve): If we're doing a types-only lookup, the
+	expression must implement the ITypeExpression interface and we
+	call DoResolveType() on it.
+	(SimpleName): Implement the new ITypeExpression interface.
+	(SimpleName.SimpleNameResolve): Removed the ec.OnlyLookupTypes
+	hack, the situation that we're only looking up types can't happen
+	anymore when this method is called.  Moved the type lookup code to
+	DoResolveType() and call it.
+	(SimpleName.DoResolveType): This ITypeExpression interface method
+	is now doing the types-only lookup.
+	(TypeExpr, TypeLookupExpression): Implement ITypeExpression.
+	(ResolveFlags): Added MaskExprClass.
+
+	* expression.cs (MemberAccess): Implement the ITypeExpression
+	interface.
+	(MemberAccess.DoResolve): Added support for a types-only lookup
+	when we're called via ITypeExpression.DoResolveType().
+	(ComposedCast): Implement the ITypeExpression interface.
+
+	* codegen.cs (EmitContext.OnlyLookupTypes): Removed.  Call
+	Expression.Resolve() with ResolveFlags.Type instead.
+
+2002-08-12  Martin Baulig  <martin@gnome.org>
+
+	* interface.cs (Interface.Define): Apply attributes.
+
+	* attribute.cs (Attribute.ApplyAttributes): Added support for
+	interface attributes.
+
+2002-08-11  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (Block.Emit): Only check the "this" variable if we
+	do not always throw an exception.
+
+	* ecore.cs (PropertyExpr.DoResolveLValue): Implemented, check
+	whether the property has a set accessor.
+
+2002-08-11  Martin Baulig  <martin@gnome.org>
+
+	Added control flow analysis support for structs.
+
+	* ecore.cs (ResolveFlags): Added `DisableFlowAnalysis' to resolve
+	with control flow analysis turned off.
+	(IVariable): New interface.
+	(SimpleName.SimpleNameResolve): If MemberAccess.ResolveMemberAccess
+	returns an IMemberExpr, call DoResolve/DoResolveLValue on it.
+	(FieldExpr.DoResolve): Resolve the instance expression with flow
+	analysis turned off and do the definite assignment check after the
+	resolving when we know what the expression will resolve to.
+
+	* expression.cs (LocalVariableReference, ParameterReference):
+	Implement the new IVariable interface, only call the flow analysis
+	code if ec.DoFlowAnalysis is true.
+	(This): Added constructor which takes a Block argument.  Implement
+	the new IVariable interface.
+	(MemberAccess.DoResolve, MemberAccess.DoResolveLValue): Call
+	DoResolve/DoResolveLValue on the result of ResolveMemberLookup().
+	This does the definite assignment checks for struct members.
+
+	* class.cs (Constructor.Emit): If this is a non-static `struct'
+	constructor which doesn't have any initializer, call
+	Block.AddThisVariable() to tell the flow analysis code that all
+	struct elements must be initialized before control returns from
+	the constructor.
+
+	* statement.cs (MyStructInfo): New public class.
+	(UsageVector.this [VariableInfo vi]): Added `int field_idx'
+	argument to this indexer.  If non-zero, check an individual struct
+	member, not the whole struct.
+	(FlowBranching.CheckOutParameters): Check struct members.
+	(FlowBranching.IsVariableAssigned, SetVariableAssigned): Added
+	overloaded versions of these methods which take an additional
+	`int field_idx' argument to check struct members.
+	(FlowBranching.IsParameterAssigned, SetParameterAssigned): Added
+	overloaded versions of these methods which take an additional
+	`string field_name' argument to check struct member.s
+	(VariableInfo): Implement the IVariable interface.
+	(VariableInfo.StructInfo): New public property.  Returns the
+	MyStructInfo instance of the variable if it's a struct or null.
+	(Block.AddThisVariable): New public method.  This is called from
+	Constructor.Emit() for non-static `struct' constructor which do
+	not have any initializer.  It creates a special variable for the
+	"this" instance variable which will be checked by the flow
+	analysis code to ensure that all of the struct's fields are
+	initialized before control returns from the constructor.
+	(UsageVector): Added support for struct members.  If a
+	variable/parameter is a struct with N members, we reserve a slot
+	in the usage vector for each member.  A struct is considered fully
+	initialized if either the struct itself (slot 0) or all its
+	members are initialized.
+
+2002-08-08  Martin Baulig  <martin@gnome.org>
+
+	* driver.cs (Driver.MainDriver): Only report an error CS5001
+	if there were no compilation errors.
+
+	* codegen.cs (EmitContext.EmitContext): Use the DeclSpace's
+	`UnsafeContext' property to determine whether the parent is in
+	unsafe context rather than checking the parent's ModFlags:
+	classes nested in an unsafe class are unsafe as well.
+
+2002-08-08  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (UsageVector.MergeChildren): Distinguish between
+	`Breaks' and `Returns' everywhere, don't set `Breaks' anymore if
+	we return.  Added test17() and test18() to test-154.cs.
+
+2002-08-08  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (TypeManager.FilterWithClosure): If we have
+	Family access, make sure the invoking type isn't a subclass of the
+	queried type (that'd be a CS1540).
+
+	* ecore.cs (Expression.MemberLookup): Added overloaded version of
+	this method which takes an additional `Type invocation_type'.
+
+	* expression.cs (BaseAccess.DoResolve): Use the base type as
+	invocation and query type.
+	(MemberAccess.DoResolve): If the lookup failed and we're about to
+	report a CS0122, try a lookup with the ec.ContainerType - if this
+	succeeds, we must report a CS1540.
+
+2002-08-08  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (IMemberExpr): Added `bool IsInstance' property.
+	(MethodGroupExpr): Implement the IMemberExpr interface.
+
+	* expression (MemberAccess.ResolveMemberAccess): No need to have
+	any special code for MethodGroupExprs anymore, they're now
+	IMemberExprs.	
+
+2002-08-08  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (TypeManager.FilterWithClosure): Check Assembly,
+	Family, FamANDAssem and FamORAssem permissions.
+	(TypeManager.IsSubclassOrNestedChildOf): New public method.
+
+2002-08-08  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (FlowBranchingType): Added LOOP_BLOCK.
+	(UsageVector.MergeChildren): `break' breaks unless we're in a switch
+	or loop block.
+
+Thu Aug 8 10:28:07 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* driver.cs: implemented /resource option to embed managed resources.
+
+2002-08-07  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (FieldBase.Initializer): Renamed to `init' and made private.
+	(FieldBase.HasFieldInitializer): New public property.
+	(FieldBase.GetInitializerExpression): New public method.  Resolves and
+	returns the field initializer and makes sure it is only resolved once.
+	(TypeContainer.EmitFieldInitializers): Call
+	FieldBase.GetInitializerExpression to get the initializer, this ensures
+	that it isn't resolved multiple times.
+
+	* codegen.cs (EmitContext): Added `bool IsFieldInitialier'.  This tells
+	the resolving process (SimpleName/MemberLookup) that we're currently
+	emitting a field initializer (which must not access any instance members,
+	this is an error CS0236).
+
+	* ecore.cs (SimpleName.Error_ObjectRefRequired): Added EmitContext
+	argument, if the `IsFieldInitializer' flag is set, we must report and
+	error CS0236 and not an error CS0120.	
+
+2002-08-07  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (IMemberExpr): New public interface.
+	(FieldExpr, PropertyExpr, EventExpr): Implement IMemberExpr.
+	(SimpleName.SimpleNameResolve): Call MemberAccess.ResolveMemberAccess
+	if the expression is an IMemberExpr.
+
+	* expression.cs (MemberAccess.ResolveMemberAccess): Allow `left'
+	to be null, implicitly default to `this' if we're non-static in
+	this case.  Simplified the code a lot by using the new IMemberExpr
+	interface.  Also fixed bug #28176 here.
+
+2002-08-06  Martin Baulig  <martin@gnome.org>
+
+	* cs-parser.jay (SimpleLookup): Removed.  We need to create
+	ParameterReferences during semantic analysis so that we can do a
+	type-only search when resolving Cast, TypeOf and SizeOf.
+	(block): Pass the `current_local_parameters' to the Block's
+	constructor.
+
+	* class.cs (ConstructorInitializer): Added `Parameters parameters'
+	argument to the constructor.
+	(ConstructorInitializer.Resolve): Create a temporary implicit
+	block with the parameters.
+
+	* ecore.cs (SimpleName.SimpleNameResolve): Resolve parameter
+	references here if we aren't doing a type-only search.
+
+	* statement.cs (Block): Added constructor which takes a
+	`Parameters parameters' argument.
+	(Block.Parameters): New public property.
+
+	* support.cs (InternalParameters.Parameters): Renamed `parameters'
+	to `Parameters' and made it public readonly.
+
+2002-08-06  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (Expression.Warning): Made this public as well.
+
+	* report.cs (Report.Debug): Print the contents of collections.
+
+2002-08-06  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (Expression.ResolveFlags): New [Flags] enum.  This is
+	used to tell Resolve() which kinds of expressions it may return.
+	(Expression.Resolve): Added overloaded version of this method which
+	takes a `ResolveFlags flags' argument.  This can be used to tell
+	Resolve() which kinds of expressions it may return.  Reports a
+	CS0118 on error.
+	(Expression.ResolveWithSimpleName): Removed, use Resolve() with
+	ResolveFlags.SimpleName.
+	(Expression.Error118): Added overloaded version of this method which
+	takes a `ResolveFlags flags' argument.  It uses the flags to determine
+	which kinds of expressions are allowed.
+
+	* expression.cs (Argument.ResolveMethodGroup): New public method.
+	Resolves an argument, but allows a MethodGroup to be returned.
+	This is used when invoking a delegate.
+
+	* TODO: Updated a bit.
+
+2002-08-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	Fixed compilation with csc.
+
+	* ecore.cs: Expression.Error made public. Is this correct? Should
+	Warning be made public too?
+
+	* expression.cs: use ea.Location instead of ea.loc.
+	[FIXME:  Filed as bug #28607: MCS must report these errors.]
+
+2002-08-06  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (Expression.loc): Moved the location here instead of
+	duplicating it in all derived classes.
+	(Expression.Location): New public property.
+	(Expression.Error, Expression.Warning): Made them non-static and
+	removed the location argument.
+	(Expression.Warning): Added overloaded version which takes an
+	`int level' argument.
+	(Expression.Error118): Make this non-static and removed the
+	expression and location arguments.
+	(TypeExpr): Added location argument to the constructor.
+
+	* expression.cs (StaticCallExpr): Added location argument to
+	the constructor.
+	(Indirection, PointerArithmetic): Likewise.
+	(CheckedExpr, UnCheckedExpr): Likewise.
+	(ArrayAccess, IndexerAccess, UserCast, ArrayPtr): Likewise.
+	(StringPtr): Likewise.
+
+
+2002-08-05  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (BaseAccess.DoResolve): Actually report errors.
+
+	* assign.cs (Assign.DoResolve): Check whether the source
+	expression is a value or variable.
+
+	* statement.cs (Try.Resolve): Set ec.InTry/InCatch/InFinally
+	while resolving the corresponding blocks.
+
+	* interface.cs (Interface.GetInterfaceTypeByName): Actually report
+	an error, don't silently return null.
+
+	* statement.cs (Block.AddVariable): Do the error reporting here
+	and distinguish between CS0128 and CS0136.
+	(Block.DoResolve): Report all unused labels (warning CS0164).
+	(LabeledStatement): Pass the location to the constructor.
+	(LabeledStatement.HasBeenReferenced): New property.
+	(LabeledStatement.Resolve): Set it to true here.
+
+	* statement.cs (Return.Emit): Return success even after reporting
+	a type mismatch error (CS0126 or CS0127), this is what csc does and
+	it avoids confusing the users with any consecutive errors.
+
+2002-08-05  Martin Baulig  <martin@gnome.org>
+
+	* enum.cs (Enum.LookupEnumValue): Catch circular definitions.
+
+	* const.cs (Const.LookupConstantValue): Catch circular definitions.
+
+	* expression.cs (MemberAccess.DoResolve): Silently return if an
+	error has already been reported.
+
+	* ecore.cs (Expression.MemberLookupFinal): Silently return if an
+	error has already been reported.
+
+2002-08-05  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (UsageVector): Only initialize the `parameters'
+	vector if we actually have any "out" parameters.
+
+2002-08-05  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (Binary.ResolveOperator): When combining delegates,
+	they must have the same type.
+
+2002-08-05  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (TypeManager.GetArgumentTypes): Don't call
+	PropertyInfo.GetIndexParameters() on dynamic types, this doesn't
+	work with the ms runtime and we also don't need it: if we're a
+	PropertyBuilder and not in the `indexer_arguments' hash, then we
+	are a property and not an indexer.
+
+	* class.cs (TypeContainer.AsAccessible): Use Type.IsArray,
+	Type.IsPointer and Type.IsByRef instead of Type.HasElementType
+	since the latter one doesn't work with the ms runtime.
+
+2002-08-03  Martin Baulig  <martin@gnome.org>
+
+	Fixed bugs #27998 and #22735.
+
+	* class.cs (Method.IsOperator): New public field.
+	(Method.CheckBase): Report CS0111 if there's already a method
+	with the same parameters in the current class.  Report CS0508 when
+	attempting to change the return type of an inherited method.
+	(MethodData.Emit): Report CS0179 if a method doesn't have a body
+	and it's not marked abstract or extern.
+	(PropertyBase): New abstract base class for Property and Indexer.
+	(PropertyBase.CheckBase): Moved here from Property and made it work
+	for indexers.
+	(PropertyBase.Emit): Moved here from Property.Emit, Indexer.Emit is
+	the same so we can reuse it there.
+	(Property, Indexer): Derive from PropertyBase.
+	(MethodSignature.inheritable_property_signature_filter): New delegate
+	to find properties and indexers.
+
+	* decl.cs (MemberCore.CheckMethodAgainstBase): Added `string name'
+	argument and improved error reporting.
+
+	* parameter.cs (Parameters.GetEmptyReadOnlyParameters): Renamed to
+	EmptyReadOnlyParameters and made it a property.
+
+	* typemanager.cs (TypeManager.GetArgumentTypes): Added overloaded
+	version of this method which takes a `PropertyInfo indexer'.
+	(TypeManager.RegisterIndexer): New method.
+
+	* class.cs: Added myself as author of this file :-)
+
+2002-08-03  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* class.cs: fixed compilation on windoze.
+
+2002-08-03  Martin Baulig  <martin@gnome.org>
+
+	* interface.cs (Interface.GetInterfaceBases): Check whether all
+	base interfaces are at least as accessible than the current one.
+
+	* class.cs (TypeContainer.GetClassBases): Check whether base types
+	are at least as accessible than the current type.
+	(TypeContainer.AsAccessible): Implemented and made non-static.
+	(MemberBase.CheckParameters): Report errors if the accessibility
+	checks fail.
+
+	* delegate.cs (Delegate.Delegate): The default visibility is
+	internal for top-level types and private for nested types.
+	(Delegate.Define): Report errors if the accessibility checks fail.
+
+	* enum.cs (Enum.Enum): The default visibility is internal for
+	top-level types and private for nested types.
+	(Enum.DefineType): Compute the correct visibility.
+
+	* modifiers.cs (Modifiers.TypeAttr): Added a version of this
+	function which takes a `bool is_toplevel' instead of a TypeContainer.
+
+	* typemanager.cs (TypeManager.IsBuiltinType): `void' is also a
+	builtin type.
+
+2002-08-02  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (LocalVariableReferenc): Added constructor which
+	takes additional `VariableInfo vi' and `bool is_readonly' arguments.
+	(LocalVariableReference.IsReadOnly): New property.
+	(LocalVariableReference.DoResolveLValue): Report a CS1604 if the
+	variable is readonly, use our own readonly flag to do this; you can
+	use the new constructor to get a writable reference to a read-only
+	variable.
+
+	* cs-parser.jay (foreach_statement, using_statement): Get a writable
+	reference to the local variable.
+
+2002-08-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs (ResolveCore): Also include System.Exception
+
+	* statement.cs (Block.Emit): Do not emit the dead-code warnings if
+	we reach an EmptyStatement.
+
+	(Catch.DoResolve, Throw.DoResolve): Throwing the System.Exception
+	is also fine.
+
+	* expression.cs (Binary.ResolveOperator): Check error result in
+	two places.
+
+	use brtrue/brfalse directly and avoid compares to null.
+
+2002-08-02  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (TypeContainer.Define): Define all nested interfaces here.
+	Fixes bug #28407, added test-155.cs.
+
+2002-08-01  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (Event.EmitDefaultMethod): Make this work with static
+	events.  Fixes #28311, added verify-3.cs.
+
+2002-08-01  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (ForeachHelperMethods): Added `enumerator_type' and
+	`is_disposable' fields.
+	(Foreach.GetEnumeratorFilter): Set `hm.enumerator_type' and
+	`hm.is_disposable' if we're using the collection pattern.
+	(Foreach.EmitCollectionForeach): Use the correct type for the
+	enumerator's local variable, only emit the try/finally block if
+	necessary (fixes #27713).
+
+2002-08-01  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (Expression.report118): Renamed to Error118 and made
+	it public static.
+
+	* statement.cs (Throw.Resolve): Check whether the expression is of
+	the correct type (CS0118) and whether the type derives from
+	System.Exception (CS0155).
+	(Catch.Resolve): New method.  Do the type lookup here and check
+	whether it derives from System.Exception (CS0155).
+	(Catch.CatchType, Catch.IsGeneral): New public properties.
+
+	* typemanager.cs (TypeManager.exception_type): Added.
+
+2002-07-31  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs: Updated About function.
+
+2002-07-31  Martin Baulig  <martin@gnome.org>
+
+	Implemented Control Flow Analysis.
+
+	* codegen.cs (EmitContext.DoFlowAnalysis): New public variable.
+	(EmitContext.CurrentBranching): Added.
+	(EmitContext.StartFlowBranching): Added.
+	(EmitContext.EndFlowBranching): Added.
+	(EmitContext.KillFlowBranching): Added.
+	(EmitContext.IsVariableAssigned): Added.
+	(EmitContext.SetVariableAssigned): Added.
+	(EmitContext.IsParameterAssigned): Added.
+	(EmitContext.SetParameterAssigned): Added.
+	(EmitContext.EmitTopBlock): Added `InternalParameters ip' argument.
+	Added control flow analysis stuff here.
+
+	* expression.cs (Unary.DoResolve): If the operator is Oper.AddressOf,
+	resolve the expression as lvalue.
+	(LocalVariableReference.DoResolve): Check whether the variable has
+	already been assigned.
+	(ParameterReference.DoResolveLValue): Override lvalue resolve to mark
+	the parameter as assigned here.
+	(ParameterReference.DoResolve): Check whether the parameter has already
+	been assigned.
+	(Argument.Resolve): If it's a `ref' or `out' argument, resolve the
+	expression as lvalue.
+
+	* statement.cs (FlowBranching): New class for the flow analysis code.
+	(Goto): Resolve the label in Resolve, not in Emit; added flow analysis.
+	(LabeledStatement.IsDefined): New public property.
+	(LabeledStatement.AddUsageVector): New public method to tell flow
+	analyis that the label may be reached via a forward jump.
+	(GotoCase): Lookup and resolve the label in Resolve, not in Emit; added
+	flow analysis.
+	(VariableInfo.Number): New public field.  This is used by flow analysis
+	to number all locals of a block.
+	(Block.CountVariables): New public property.  This is the number of
+	local variables in this block (including the locals from all parent
+	blocks).
+	(Block.EmitMeta): Number all the variables.
+
+	* statement.cs: Added flow analysis support to all classes.
+
+2002-07-31  Martin Baulig  <martin@gnome.org>
+
+	* driver.cs: Added "--mcs-debug" argument if MCS_DEBUG is defined.
+	To get debugging messages, compile mcs with /define:MCS_DEBUG and
+	then use this argument.
+
+	* report.cs (Report.Debug): Renamed to conditional to "MCS_DEBUG".
+
+	* makefile.gnu (MCS_FLAGS): Include $(MCS_DEFINES), the user may
+	use this to specify /define options.
+
+2002-07-29  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (Fixed): Moved all code that does variable lookups
+	and resolvings from Emit to Resolve.
+
+	* statement.cs (For): Moved all code that does variable lookups
+	and resolvings from Emit to Resolve.
+
+	* statement.cs (Using): Moved all code that does variable lookups
+	and resolvings from Emit to Resolve.
+
+2002-07-29  Martin Baulig  <martin@gnome.org>
+
+	* attribute.cs (Attribute.Resolve): Explicitly catch a
+	System.NullReferenceException when creating the
+	CustromAttributeBuilder and report a different warning message.
+
+2002-07-29  Martin Baulig  <martin@gnome.org>
+
+	* support.cs (ParameterData.ParameterName): Added method to
+	get the name of a parameter.
+
+	* typemanager.cs (TypeManager.IsValueType): New public method.
+
+2002-07-29  Martin Baulig  <martin@gnome.org>
+
+	* parameter.cs (Parameter.Modifier): Added `ISBYREF = 8'.  This
+	is a flag which specifies that it's either ref or out.
+	(Parameter.GetParameterInfo (DeclSpace, int, out bool)): Changed
+	the out parameter to `out Parameter.Modifier mod', also set the
+	Parameter.Modifier.ISBYREF flag on it if it's either ref or out.
+
+	* support.cs (InternalParameters.ParameterModifier): Distinguish
+	between Parameter.Modifier.OUT and Parameter.Modifier.REF, set the
+	Parameter.Modifier.ISBYREF flag if it's either ref or out.
+
+	* expression.cs (Argument.GetParameterModifier): Distinguish
+	between Parameter.Modifier.OUT and Parameter.Modifier.REF, set the
+	Parameter.Modifier.ISBYREF flag if it's either ref or out.
+
+2002-07-29  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (ParameterReference.ParameterReference): Added
+	`Location loc' argument to the constructor.
+
+	* cs-parser.jay: Pass location to ParameterReference.
+
+2002-07-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Try): Initialize the location.
+
+	* cs-parser.jay: pass location to Try.
+
+	* expression.cs (Unary.Reduce): Change the prototype to return
+	whether a constant fold could be performed or not.  The result is
+	returned in an out parameters.  In the case of Indirection and
+	AddressOf, we want to perform the full tests.
+
+2002-07-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Statement.Emit): Flag dead code.
+
+2002-07-27  Andrew Birkett  <andy@nobugs.org>
+
+	* expression.cs (Unary.Reduce): Handle AddressOf and Indirection.
+
+2002-07-27  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (MethodData.Define): Put back call to
+	TypeManager.AddMethod(), accidentally commented this out.
+
+	* report.cs (Debug): New public method to print debugging information,
+	this is `[Conditional ("DEBUG")]'.
+
+2002-07-26  Martin Baulig  <martin@gnome.org>
+
+	* cs-parser.jay (CSharpParser): Added `Stack switch_stack'.
+	(switch_statement): Push the current_block to the switch_stack and
+	pop it again when we're done with the switch.
+	(switch_section): The new block is a child of the current_block.
+	Fixes bug #24007, added test-152.cs.
+
+2002-07-27  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (Invocation.EmitArguments): When calling a varargs
+	function with only its fixed arguments, we need to pass an empty
+	array.
+
+2002-07-27  Martin Baulig  <martin@gnome.org>
+
+	Mono 0.13 has been released.
+
+2002-07-25  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs: Rename --resource to --linkres, because that is what
+	we do currently, we dont support --resource yet.
+
+	* cs-tokenizer.cs: Fix test for reporting endif mismatches.
+
+2002-07-25  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (MethodData): New public class.  This is a `method builder'
+	class for a method or one accessor of a Property/Indexer/Event.
+	(MethodData.GetMethodFlags): Moved here from MemberBase.
+	(MethodData.ApplyAttributes): Likewise.
+	(MethodData.ApplyObsoleteAttribute): Likewise.
+	(MethodData.ApplyConditionalAttribute): Likewise.
+	(MethodData.ApplyDllImportAttribute): Likewise.
+	(MethodData.CheckAbstractAndExternal): Likewise.
+	(MethodData.Define): Formerly knows as MemberBase.DefineMethod().
+	(MethodData.Emit): Formerly known as Method.Emit().
+	(MemberBase): Moved everything which was specific to a single
+	accessor/method to MethodData.
+	(Method): Create a new MethodData and call Define() and Emit() on it.
+	(Property, Indexer, Event): Create a new MethodData objects for each
+	accessor and call Define() and Emit() on them.
+
+2002-07-25  Martin Baulig  <martin@gnome.org>
+
+	Made MethodCore derive from MemberBase to reuse the code from there.
+	MemberBase now also checks for attributes.
+
+	* class.cs (MethodCore): Derive from MemberBase, not MemberCore.
+	(MemberBase.GetMethodFlags): Moved here from class Method and marked
+	as virtual.
+	(MemberBase.DefineAccessor): Renamed to DefineMethod(), added
+	`CallingConventions cc' and `Attributes opt_attrs' arguments.
+	(MemberBase.ApplyAttributes): New virtual method; applies the
+	attributes to a method or accessor.
+	(MemberBase.ApplyObsoleteAttribute): New protected virtual method.
+	(MemberBase.ApplyConditionalAttribute): Likewise.
+	(MemberBase.ApplyDllImportAttribute): Likewise.
+	(MemberBase.CheckAbstractAndExternal): Likewise.
+	(MethodCore.ParameterTypes): This is now a property instead of a
+	method, it's initialized from DoDefineParameters().
+	(MethodCore.ParameterInfo): Removed the set accessor.
+	(MethodCore.DoDefineParameters): New protected virtual method to
+	initialize ParameterTypes and ParameterInfo.
+	(Method.GetReturnType): We can now simply return the MemberType.
+	(Method.GetMethodFlags): Override the MemberBase version and add
+	the conditional flags.
+	(Method.CheckBase): Moved some code from Define() here, call
+	DoDefineParameters() here.
+	(Method.Define): Use DoDefine() and DefineMethod() from MemberBase
+	here to avoid some larger code duplication.
+	(Property.Emit, Indexer.Emit): Call CheckAbstractAndExternal() to
+	ensure that abstract and external accessors don't declare a body.
+
+	* attribute.cs (Attribute.GetValidPieces): Make this actually work:
+	`System.Attribute.GetCustomAttributes (attr.Type)' does a recursive
+	lookup in the attribute's parent classes, so we need to abort as soon
+	as we found the first match.
+	(Attribute.Obsolete_GetObsoleteMessage): Return the empty string if
+	the attribute has no arguments.
+
+	* typemanager.cs (TypeManager.AddMethod): Now takes a MemberBase instead
+	of a Method.
+
+2002-07-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* cs-parser.jay: reverted previous patch.
+
+2002-07-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* cs-parser.jay: fixed bug #22119.
+
+2002-07-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* attribute.cs: fixed compilation. The error was:
+	"attribute.cs(571,17): error CS0177: The out parameter 'is_error' must 
+	be assigned to before control leaves the current method."
+	[FIXME:  Filed as bug #28186: MCS must report this error.]
+
+2002-07-25  Martin Baulig  <martin@gnome.org>
+
+	* attribute.cs (Attribute.Conditional_GetConditionName): New static
+	method to pull the condition name ouf of a Conditional attribute.
+	(Attribute.Obsolete_GetObsoleteMessage): New static method to pull
+	the obsolete message and error flag out of an Obsolete attribute.
+
+	* class.cs (Method.GetMethodFlags): New public method to get the
+	TypeManager.MethodFlags for this method.
+	(Method.ApplyConditionalAttribute, Method.ApplyObsoleteAttribute): New
+	private methods.
+	(Method.Define): Get and apply the Obsolete and Conditional attributes;
+	if we're overriding a virtual function, set the new private variable
+	`parent_method'; call the new TypeManager.AddMethod().
+
+	* typemanager.cs (TypeManager.AddMethod): New static method.  Stores
+	the MethodBuilder and the Method in a PtrHashtable.
+	(TypeManager.builder_to_method): Added for this purpose.
+	(TypeManager.MethodFlags): Added IsObsoleteError.
+	(TypeManager.GetMethodFlags): Added `Location loc' argument.  Lookup
+	Obsolete and Conditional arguments in MethodBuilders.  If we discover
+	an Obsolete attribute, emit an appropriate warning 618 / error 619 with
+	the message from the attribute.
+
+2002-07-24  Martin Baulig  <martin@gnome.org>
+
+	* cs-tokenizer.cs: Eat up trailing whitespaces and one-line comments in
+	preprocessor directives, ensure that the argument to #define/#undef is
+	exactly one identifier and that it's actually an identifier.
+
+	Some weeks ago I did a `#define DEBUG 1' myself and wondered why this
+	did not work ....
+
+2002-07-24  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (Foreach.ForeachHelperMethods): Added `Type element_type',
+	initialize it to TypeManager.object_type in the constructor.
+	(Foreach.GetEnumeratorFilter): Set `hm.element_type' to the return type
+	of the `hm.get_current' method if we're using the collection pattern.
+	(Foreach.EmitCollectionForeach): Use `hm.element_type' as the source type
+	for the explicit conversion to make it work when we're using the collection
+	pattern and the `Current' property has a different return type than `object'.
+	Fixes #27713.
+
+2002-07-24  Martin Baulig  <martin@gnome.org>
+
+	* delegate.cs (Delegate.VerifyMethod): Simply return null if the method
+	does not match, but don't report any errors.  This method is called in
+	order for all methods in a MethodGroupExpr until a matching method is
+	found, so we don't want to bail out if the first method doesn't match.
+	(NewDelegate.DoResolve): If none of the methods in the MethodGroupExpr
+	matches, report the 123.  Fixes #28070.
+
+2002-07-24  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (ArrayAccess.EmitStoreOpcode): Moved the
+	TypeManager.TypeToCoreType() to the top of the method so the
+	following equality checks will work.  Fixes #28107.
+
+2002-07-24  Martin Baulig  <martin@gnome.org>
+
+	* cfold.cs (ConstantFold.DoConstantNumericPromotions): "If either
+	operand is of type uint, and the other operand is of type sbyte,
+	short or int, the operands are converted to type long." -
+	Actually do what this comment already told us.  Fixes bug #28106,
+	added test-150.cs.
+
+2002-07-24  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (MethodBase): New abstract class.  This is now a base
+	class for Property, Indexer and Event to avoid some code duplication
+	in their Define() and DefineMethods() methods.
+	(MethodBase.DoDefine, MethodBase.DefineAccessor): Provide virtual
+	generic methods for Define() and DefineMethods().
+	(FieldBase): Derive from MemberBase, not MemberCore.
+	(Property): Derive from MemberBase, not MemberCore.
+	(Property.DefineMethod): Moved all the code from this method to the
+	new MethodBase.DefineAccessor(), just call it with appropriate
+	argumetnts.
+	(Property.Define): Call the new Property.DoDefine(), this does some
+	sanity checks and we don't need to duplicate the code everywhere.
+	(Event): Derive from MemberBase, not MemberCore.
+	(Event.Define): Use the new MethodBase.DefineAccessor() to define the
+	accessors, this will also make them work with interface events.
+	(Indexer): Derive from MemberBase, not MemberCore.
+	(Indexer.DefineMethod): Removed, call MethodBase.DefineAccessor() insstead.
+	(Indexer.Define): Use the new MethodBase functions.
+
+	* interface.cs (InterfaceEvent.InterfaceEvent): Added `Location loc'
+	argument to the constructor.
+	(Interface.FindMembers): Added support for interface events.
+	(Interface.PopluateEvent): Implemented.
+
+	Added test-149.cs for this.  This also fixes bugs #26067 and #24256.
+
+2002-07-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (TypeContainer.AddMethod): Adding methods do not use IsValid,
+	but this is required to check for a method name being the same as
+	the containing class.  
+
+	Handle this now.
+
+2002-07-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* interface.cs: initialize variable.
+
+2002-07-23  Martin Baulig  <martin@gnome.org>
+
+	Implemented the IndexerName attribute in interfaces.
+
+	* class.cs (TypeContainer.DefineIndexers): Don't set the indexer
+	name if this is an explicit interface implementation.
+	(Indexer.InterfaceIndexerName): New public variable.  If we're
+	implementing an interface indexer, this is the IndexerName in that
+	interface.  Otherwise, it's the IndexerName.
+	(Indexer.DefineMethod): If we're implementing interface indexer,
+	set InterfaceIndexerName.  Use the new Pending.IsInterfaceIndexer
+	and Pending.ImplementIndexer methods.
+	(Indexer.Define): Also define the PropertyBuilder if we're
+	implementing an interface indexer and this is neither an explicit
+	interface implementation nor do the IndexerName match the one in
+	the interface.
+
+	* pending.cs (TypeAndMethods): Added `MethodInfo [] need_proxy'.
+	If a method is defined here, then we always need to create a proxy
+	for it.  This is used when implementing interface indexers.
+	(Pending.IsInterfaceIndexer): New public method.
+	(Pending.ImplementIndexer): New public method.
+	(Pending.InterfaceMethod): Added `MethodInfo need_proxy' argument.
+	This is used when implementing interface indexers to define a proxy
+	if necessary.
+	(Pending.VerifyPendingMethods): Look in the `need_proxy' array and
+	define a proxy if necessary.
+
+	* interface.cs (Interface.IndexerName): New public variable.
+	(Interface.PopulateIndexer): Set the IndexerName.
+	(Interface.DefineIndexers): New private method.  Populate all the
+	indexers and make sure their IndexerNames match.
+
+	* typemanager.cs (IndexerPropertyName): Added support for interface
+	indexers.
+
+2002-07-22  Martin Baulig  <martin@gnome.org>
+
+	* codegen.cs (EmitContext.HasReturnLabel): New public variable.
+	(EmitContext.EmitTopBlock): Always mark the ReturnLabel and emit a
+	ret if HasReturnLabel.
+	(EmitContext.TryCatchLevel, LoopBeginTryCatchLevel): New public
+	variables.
+
+	* statement.cs (Do.Emit, While.Emit, For.Emit, Foreach.Emit): Save
+	and set the ec.LoopBeginTryCatchLevel.
+	(Try.Emit): Increment the ec.TryCatchLevel while emitting the block.
+	(Continue.Emit): If the ec.LoopBeginTryCatchLevel is smaller than
+	the current ec.TryCatchLevel, the branch goes out of an exception
+	block.  In this case, we need to use Leave and not Br.
+
+2002-07-22  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (Try.Emit): Emit an explicit ret after the end of the
+	block unless the block does not always return or it is contained in
+	another try { ... } catch { ... } block.  Fixes bug #26506.
+	Added verify-1.cs to the test suite.
+
+2002-07-22  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (Switch.TableSwitchEmit): If we don't have a default,
+	then we do not always return.  Fixes bug #24985.
+
+2002-07-22  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (Invocation.OverloadedResolve): Do the BetterFunction()
+	lookup on a per-class level; ie. walk up the class hierarchy until we
+	found at least one applicable method, then choose the best among them.
+	Fixes bug #24463 and test-29.cs.
+
+2002-07-22  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (TypeManager.ArrayContainsMethod): Don't check the
+	return types of the methods.  The return type is not part of the
+	signature and we must not check it to make the `new' modifier work.
+	Fixes bug #27999, also added test-147.cs.
+	(TypeManager.TypeToCoreType): Added TypeManager.type_type.
+
+	* expression.cs (Invocation.DoResolve): Call TypeManager.TypeToCoreType()
+	on the method's return type.
+
+2002-07-21  Martin Baulig  <martin@gnome.org>
+
+	* assign.cs: Make this work if the rightmost source is a constant and
+	we need to do an implicit type conversion.  Also adding a few more tests
+	to test-38.cs which should have caught this.
+
+	* makefile.gnu: Disable debugging, there's already the mcs-mono2.exe
+	target in the makefile for this.  The makefile.gnu is primarily intended
+	for end-users who don't want to debug the compiler.
+
+2002-07-21  Martin Baulig  <martin@gnome.org>
+
+	* assign.cs: Improved the Assign class so it can now handle embedded
+	assignments (X = Y = Z = something).  As a side-effect this'll now also
+	consume less local variables.  test-38.cs now passes with MCS, added
+	a few new test cases to that test.
+
+2002-07-20  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (Binary.EmitBranchable): Emit correct unsigned branch
+	instructions.  Fixes bug #27977, also added test-146.cs.
+
+2002-07-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* cs-tokenizer.cs: fixed getHex ().
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (Invocation.EmitParams): Use TypeManager.LookupType(),
+	not Type.GetType() to lookup the array type.  This is needed when
+	we're constructing an array of a user-defined type.
+	(ArrayAccess.EmitDynamicInitializers): Only emit the Ldelema for
+	single-dimensional arrays, but also for single-dimensial arrays of
+	type decimal.
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (New.DoEmit): Create a new LocalTemporary each time
+	this function is called, it's not allowed to share LocalBuilders
+	among ILGenerators.
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (Argument.Resolve): Report an error 118 when trying
+	to pass a type as argument.
+
+2002-07-18  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (Expression.ImplicitNumericConversion): Don't emit a
+	Conv_R_Un for the signed `long' type.
+
+2002-07-15  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (MemberAccess.DoResolve): Do not reuse the field
+	`expr' for the temporary result, as that will fail if we do
+	multiple resolves on the same expression.
+
+2002-07-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (SimpleNameResolve): Use ec.DeclSpace instead of
+	ec.TypeContainer for looking up aliases. 
+
+	* class.cs (TypeContainer): Remove LookupAlias from here.
+
+	* decl.cs (DeclSpace); Move here.
+
+2002-07-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (FindMembers): Only call filter if the constructor
+	bulider is not null.
+
+	Also handle delegates in `NestedTypes' now.  Now we will perform
+	type lookups using the standard resolution process.  This also
+	fixes a bug.
+
+	* decl.cs (DeclSpace.ResolveType): New type resolution routine.
+	This uses Expressions (the limited kind that can be parsed by the
+	tree) instead of strings.
+
+	* expression.cs (ComposedCast.ToString): Implement, used to flag
+	errors since now we have to render expressions.
+
+	(ArrayCreation): Kill FormElementType.  Use ComposedCasts in
+	FormArrayType. 
+
+	* ecore.cs (SimpleName.ToString): ditto.
+
+	* cs-parser.jay: Instead of using strings to assemble types, use
+	Expressions to assemble the type (using SimpleName, ComposedCast,
+	MemberAccess).  This should fix the type lookups in declarations,
+	because we were using a different code path for this.
+
+	* statement.cs (Block.Resolve): Continue processing statements
+	even when there is an error.
+
+2002-07-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Event.Define): Also remove the `remove' method from
+	the list of pending items.
+
+	* expression.cs (ParameterReference): Use ldarg.N (0..3) to
+	generate more compact code. 
+
+2002-07-17  Martin Baulig  <martin@gnome.org>
+
+	* const.cs (Const.LookupConstantValue): Add support for constant
+	`unchecked' and `checked' expressions.
+	Also adding test case test-140.cs for this.
+
+2002-07-17  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (Foreach.GetEnumeratorFilter): When compiling corlib,
+	check whether mi.ReturnType implements the IEnumerator interface; the
+	`==' and the IsAssignableFrom() will fail in this situation.
+
+2002-07-16  Ravi Pratap  <ravi@ximian.com>
+
+	* ecore.cs (SimpleName.SimpleNameResolve) : Apply Gonzalo's fix 
+	here too.
+
+2002-07-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* expression.cs: fixed bug #27811.
+
+2002-07-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (ParameterReference.AddressOf): Patch from Paolo
+	Molaro: when we are a ref, the value already contains a pointer
+	value, do not take the address of it.
+
+2002-07-14 Rafael Teixeira <rafaelteixeirabr@hotmail.com>
+	* removed mb-parser.jay and mb-tokenizer.cs
+
+Sat Jul 13 19:38:03 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* expression.cs: check against the building corlib void type.
+
+Sat Jul 13 19:35:58 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ecore.cs: fix for valuetype static readonly fields: when 
+	initializing them, we need their address, not the address of a copy.
+
+Sat Jul 13 17:32:53 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* typemanager.cs: register also enum_type in corlib.
+
+Sat Jul 13 15:59:47 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.cs: allow calling this (but not base) initializers in structs.
+
+Sat Jul 13 15:12:06 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ecore.cs: make sure we compare against the building base types
+	in GetTypeSize ().
+
+Sat Jul 13 15:10:32 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* typemanager.cs: fix TypeToCoreType() to handle void and object
+	(corlib gets no more typerefs after this change).
+
+2002-07-12  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (ArrayCreation.EmitArrayArguments): use
+	Conv.Ovf.U4 for unsigned and Conv.Ovf.I4 for signed.
+
+	(ArrayAccess.LoadArrayAndArguments): Use Conv_Ovf_I and
+	Conv_Ovf_I_Un for the array arguments.  Even if C# allows longs as
+	array indexes, the runtime actually forbids them.
+
+	* ecore.cs (ExpressionToArrayArgument): Move the conversion code
+	for array arguments here.
+
+	* expression.cs (EmitLoadOpcode): System.Char is a U2, use that
+	instead of the default for ValueTypes.
+
+	(New.DoEmit): Use IsValueType instead of
+	IsSubclassOf (value_type)
+	(New.DoResolve): ditto.
+	(Invocation.EmitCall): ditto.
+
+	* assign.cs (Assign): ditto.
+
+	* statement.cs (Unsafe): Ok, so I got the semantics wrong.
+	Statements *are* currently doing part of their resolution during
+	Emit.  
+
+	Expressions do always resolve during resolve, but statements are
+	only required to propagate resolution to their children.
+
+2002-07-11  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs (CSCParseOption): Finish the /r: and /lib: support.
+
+	(LoadAssembly): Do not add the dll if it is already specified
+	
+	(MainDriver): Add the System directory to the link path at the end,
+	after all the other -L arguments. 
+
+	* expression.cs (ArrayAccess.EmitLoadOpcode): I was using the
+	wrong opcode for loading bytes and bools (ldelem.i1 instead of
+	ldelem.u1) and using the opposite for sbytes.
+
+	This fixes Digger, and we can finally run it.
+
+	* driver.cs (UnixParseOption): Move the option parsing here.  
+	(CSCParseOption): Implement CSC-like parsing of options.
+
+	We now support both modes of operation, the old Unix way, and the
+	new CSC-like way.  This should help those who wanted to make cross
+	platform makefiles.
+
+	The only thing broken is that /r:, /reference: and /lib: are not
+	implemented, because I want to make those have the same semantics
+	as the CSC compiler has, and kill once and for all the confussion
+	around this.   Will be doing this tomorrow.
+
+	* statement.cs (Unsafe.Resolve): The state is checked during
+	resolve, not emit, so we have to set the flags for IsUnsfe here.
+
+2002-07-10  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (MemberAccess.ResolveMemberAccess): Since we can
+	not catch the Error_ObjectRefRequired in SimpleName (as it is
+	possible to have a class/instance variable name that later gets
+	deambiguated), we have to check this here. 	
+
+2002-07-10  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer.GetFieldFromEvent): Move away from here,
+	make static and put into Expression.
+
+	(Event.Define): Register the private field of the event with the 
+	TypeManager so that GetFieldFromEvent can get at it.
+
+	(TypeManager.RegisterPrivateFieldOfEvent): Implement to
+	keep track of the private field associated with an event which
+	has no accessors.
+
+	(TypeManager.GetPrivateFieldOfEvent): Implement to get at the
+	private field.
+
+	* ecore.cs (GetFieldFromEvent): RE-write to use the above methods.
+	
+2002-07-10  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Binary.EmitBranchable): this routine emits the
+	Binary expression in a branchable context.  This basically means:
+	we need to branch somewhere, not just get the value on the stack.
+
+	This works together with Statement.EmitBoolExpression.
+
+	* statement.cs (Statement.EmitBoolExpression): Use
+	EmitBranchable. 
+
+2002-07-09  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (For): Reduce the number of jumps in loops.
+
+	(For): Implement loop inversion for the For statement.
+
+	(Break): We can be breaking out of a Try/Catch controlled section
+	(foreach might have an implicit try/catch clause), so we need to
+	use Leave instead of Br.
+
+	* ecore.cs (FieldExpr.AddressOf): Fix for test-139 (augmented
+	now).  If the instace expression supports IMemoryLocation, we use
+	the AddressOf method from the IMemoryLocation to extract the
+	address instead of emitting the instance.
+
+	This showed up with `This', as we were emitting the instance
+	always (Emit) instead of the Address of This.  Particularly
+	interesting when This is a value type, as we dont want the Emit
+	effect (which was to load the object).
+	
+2002-07-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* attribute.cs: Pass the entry point to the DefinePInvokeMethod
+
+	* statement.cs (Checked): Set the CheckedState during the resolve
+	process too, as the ConvCast operations track the checked state on
+	the resolve process, and not emit.
+
+	* cs-parser.jay (namespace_member_declaration): Flag that we have
+	found a declaration when we do.  This is used to flag error 1529
+
+	* driver.cs: Report ok when we display the help only.
+
+2002-07-06  Andrew Birkett  <adb@tardis.ed.ac.uk>
+
+	* cs-tokenizer.cs (xtoken): Improve handling of string literals.
+
+2002-07-04  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-tokenizer.cs (define): We also have to track locally the
+	defines.  AllDefines is just used for the Conditional Attribute,
+	but we also need the local defines for the current source code. 
+
+2002-07-03  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (While, For, Do): These loops can exit through a
+	Break statement, use this information to tell whether the
+	statement is the last piece of code.
+
+	(Break): Flag that we break.
+
+	* codegen.cs (EmitContexts): New `Breaks' state variable.
+
+2002-07-03  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (TypeContainer.MethodModifiersValid): Allow override
+	modifiers in method declarations in structs.  Otherwise, you won't
+	be able to override things like Object.Equals().
+
+2002-07-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Method, Property, Indexer): Do not allow the public
+	modifier to be used in explicit interface implementations.
+
+	(TypeContainer.MethodModifiersValid): Catch virtual, abstract and
+	override modifiers in method declarations in structs
+
+2002-07-02   Andrew Birkett <adb@tardis.ed.ac.uk>
+
+	* cs-tokenizer.cs (adjust_int, adjust_real): Do not abort on
+	integer or real overflow, report an error
+
+2002-07-02  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (TypeManager.InitCoreTypes): When compiling
+	corlib, dynamically call AssemblyBuilder.SetCorlibTypeBuilders()
+	to tell the runtime about our newly created System.Object and
+	System.ValueType types.
+
+2002-07-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (This): Use Stobj/Ldobj when we are a member of a
+	struct instead of Ldarg/Starg.
+
+2002-07-02  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (Indirection.Indirection): Call
+	TypeManager.TypeToCoreType() on `expr.Type.GetElementType ()'.
+
+2002-07-02  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (ArrayAccess.EmitStoreOpcode): If the type is a
+	ValueType, call TypeManager.TypeToCoreType() on it.
+	(Invocations.EmitParams): Call TypeManager.TypeToCoreType() on
+	the OpCodes.Newarr argument.
+
+2002-07-02  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (Invocation.EmitCall): When compiling corlib,
+	replace all calls to the system's System.Array type to calls to
+	the newly created one.
+
+	* typemanager.cs (TypeManager.InitCodeHelpers): Added a few more
+	System.Array methods.
+	(TypeManager.InitCoreTypes): When compiling corlib, get the methods
+	from the system's System.Array type which must be replaced.
+
+Tue Jul 2 19:05:05 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* typemanager.cs: load unverifiable_code_ctor so we can build
+	corlib using the correct type. Avoid using GetTypeCode() with
+	TypeBuilders.
+	* rootcontext.cs: uses TypeManager.unverifiable_code_ctor and
+	TypeManager.object_type to allow building corlib.
+
+Tue Jul 2 19:03:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ecore.cs: handle System.Enum separately in LoadFromPtr().
+
+2002-07-01  Martin Baulig  <martin@gnome.org>
+
+	* class.cs: Make the last change actually work, we need to check
+	whether `ifaces != null' to avoid a crash.
+
+Mon Jul 1 16:15:03 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.cs: when we build structs without fields that implement
+	interfaces, we need to add the interfaces separately, since there is
+	no API to both set the size and add the interfaces at type creation
+	time.
+
+Mon Jul 1 14:50:47 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* expression.cs: the dimension arguments to the array constructors
+	need to be converted if they are a long.
+
+Mon Jul 1 12:26:12 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.cs: don't emit ldarg.0 if there is no parent constructor
+	(fixes showstopper for corlib).
+
+2002-06-29  Martin Baulig  <martin@gnome.org>
+
+	MCS now compiles corlib on GNU/Linux :-)
+
+	* attribute.cs (Attribute.ApplyAttributes): Treat Accessors like Method,
+	ie. check for MethodImplOptions.InternalCall.
+
+	* class.cs (TypeContainer.DefineType): When compiling corlib, both parent
+	and TypeManager.attribute_type are null, so we must explicitly check
+	whether parent is not null to find out whether it's an attribute type.
+	(Property.Emit): Always call Attribute.ApplyAttributes() on the GetBuilder
+	and SetBuilder, not only if the property is neither abstract nor external.
+	This is necessary to set the MethodImplOptions on the accessor methods.
+	(Indexer.Emit): Call Attribute.ApplyAttributes() on the GetBuilder and
+	SetBuilder, see Property.Emit().
+
+	* rootcontext.cs (RootContext.PopulateTypes): When compiling corlib, don't
+	populate "System.Object", "System.ValueType" and "System.Attribute" since
+	they've already been populated from BootCorlib_PopulateCoreTypes().
+
+2002-06-29  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (Expression.ImplicitReferenceConversionExists): If expr
+	is the NullLiteral, we also need to make sure that target_type is not
+	an enum type.	
+
+2002-06-29  Martin Baulig  <martin@gnome.org>
+
+	* rootcontext.cs (RootContext.ResolveCore): We must initialize
+	`TypeManager.multicast_delegate_type' and `TypeManager.delegate_type'
+	before calling BootstrapCorlib_ResolveDelegate ().
+
+2002-06-27  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* statement.cs: fixed build-breaker. All tests passed ok.
+
+2002-06-27  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (TypeManager.VerifyUnManaged): Added explicit check
+	for System.Decimal when compiling corlib.
+
+2002-06-27  Martin Baulig  <martin@gnome.org>
+
+	* statement.cs (Switch.TableSwitchEmit): Make this work with empty
+	switch blocks which contain nothing but a default clause.
+
+2002-06-26  Andrew  <adb@tardis.ed.ac.uk>
+
+       * ../errors/cs1501-3.cs: Added new test for struct ctr typechecks.
+
+2002-06-27  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (PropertyExpr.PropertyExpr): Call
+	TypeManager.TypeToCoreType() on the `pi.PropertyType'.
+
+	* typemanager.cs (TypeManager.TypeToCoreType): Return if the type
+	is already a TypeBuilder.
+
+2002-06-27  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (Expression.ImplicitReferenceConversionExists): Use
+	`target_type == TypeManager.array_type', not IsAssignableFrom() in
+	the "from an array-type to System.Array" case.  This makes it work
+	when compiling corlib.
+
+2002-06-27  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (Expression.SimpleNameResolve): If the expression is a
+	non-static PropertyExpr, set its InstanceExpression.  This makes
+	the `ICollection.Count' property work in System/Array.cs.
+
+2002-06-25  Andrew Birkett  <adb@tardis.ed.ac.uk>
+
+	* driver.cs: Made error handling more consistent.  Errors now
+	tracked by Report class, so many methods which used to return int
+	now return void.  Main() now prints success/failure and 
+	errors/warnings message.
+
+	Renamed '--probe' compiler argument to '--expect-error'.  Removed
+	the magic number return values (123 and 124).  Now, if the
+	expected error occurs, the compiler exits with success (exit value
+	0).  If the compilation completes without seeing that particular
+	error, the compiler exits with failure (exit value 1).  The
+	makefile in mcs/errors has been changed to handle the new behaviour.
+
+	* report.cs: Made 'expected error' number a property and renamed
+	it from 'Probe' to 'ExpectedError'.
+
+	* genericparser.cs: Removed error handling support, since it is
+	now all done by Report class.
+
+	* cs-parser.jay, mb-parser.jay: Errors are tracked by Report
+	class, so parse() no longer returns an int.
+
+	* namespace.cs: Use Report.Error instead of GenericParser.error
+
+2002-06-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (TypeContainer.AddMethod, TypeContainer.AddIndexer,
+	TypeContainer.AddOperator): At the front of the list put the
+	explicit implementations, so they get resolved/defined first. 
+
+2002-06-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (TypeContainer.VerifyImplements): Verifies that a given
+	interface type is implemented by this TypeContainer.  Used during
+	explicit interface implementation.
+
+	(Property.Define, Indexer.Define, Method.Define): Validate that
+	the given interface in the explicit implementation is one of the
+	base classes for the containing type.
+
+	Also if we are explicitly implementing an interface, but there is
+	no match in the pending implementation table, report an error.
+
+	(Property.Define): Only define the property if we are
+	not explicitly implementing a property from an interface.  Use the
+	correct name also for those properties (the same CSC uses,
+	although that is really not needed).
+	
+	(Property.Emit): Do not emit attributes for explicitly implemented
+	properties, as there is no TypeBuilder.
+
+	(Indexer.Emit): ditto.
+
+	Hiding then means that we do not really *implement* a pending
+	implementation, which makes code fail.
+
+2002-06-22  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (Expression.Constantify): Call TypeManager.TypeToCoreType() on
+	the return value of Object.GetType().  [FIXME: we need to do this whenever
+	we get a type back from the reflection library].
+
+Fri Jun 21 13:37:57 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* typemanager.cs: make ExpandInterfaces() slip duplicated interfaces.
+
+2002-06-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* attribute.cs: Return null if we can not look up the type.
+
+	* class.cs (TypeContainer.GetClassBases): Use ExpandInterfaces on
+	the interface types found.
+
+	* interface.cs (Interface.GetInterfaceBases): Use ExpandInterfaces on the
+	interface types found.
+
+	* typemanager.cs (GetInterfaces): Make this routine returns alll
+	the interfaces and work around the lame differences between
+	System.Type and System.Reflection.Emit.TypeBuilder in the results
+	result for GetInterfaces.
+	
+	(ExpandInterfaces): Given an array of interface types, expand and
+	eliminate repeated ocurrences of an interface.  This expands in
+	context like: IA; IB : IA; IC : IA, IB; the interface "IC" to
+	be IA, IB, IC.
+	
+2002-06-21  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (TypeManager.EnumToUnderlying): It's now safe to call this function
+	on System.Enum.
+
+2002-06-21  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (TypeManager.TypeToCoreType): New function.  When compiling corlib
+	and called with one of the core types, return the corresponding typebuilder for
+	that type.
+
+	* expression.cs (ArrayAccess.DoResolve): Call TypeManager.TypeToCoreType() on the
+	element type.
+
+2002-06-21  Martin Baulig  <martin@gnome.org>
+
+	* ecore.cs (Expression.ExplicitReferenceConversionExists): Use
+	`target_type.IsArray' instead of `target_type.IsSubclassOf (TypeManager.array_type)'.
+	(Expression.ConvertReferenceExplicit): Likewise.
+
+	* expression.cs (ElementAccess.DoResolve): Likewise.
+	(ElementAccess.DoResolveLValue): Likewise.
+
+2002-06-10  Martin Baulig  <martin@gnome.org>
+
+	* interface.cs (Interface.PopulateIndexer): When creating the setter, we need to
+	add the "value" parameter to the parameter list.
+
+	* statement.cs (Fixed.Emit): Pass the return value of the child block's Emit()
+	to our caller.
+
+2002-06-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (ArrayCreation.ExpressionToArrayArgument): Convert
+	the argument to an int, uint, long or ulong, per the spec.  Also
+	catch negative constants in array creation.
+
+Thu Jun 20 17:56:48 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.cs: do not allow the same interface to appear twice in
+	the definition list.
+
+Wed Jun 19 22:33:37 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ecore.cs: don't use ldlen with System.Array.
+
+Wed Jun 19 20:57:40 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* ecore.cs: stobj requires a type argument. Handle indirect stores on enums.
+
+Wed Jun 19 20:17:59 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* modifiers.cs: produce correct field attributes for protected
+	internal. Easy fix so miguel can work on ther harder stuff:-)
+
+2002-06-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* pending.cs: New file.  Move the code from class.cs here.
+	Support clearning the pending flag for all methods (when not doing
+	explicit interface implementation).
+
+Tue Jun 18 10:36:22 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* rootcontext.cs: added a couple more types needed to bootstrap.
+
+2002-06-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (GetConstructor): Use DeclaredOnly to look the
+	constructor in the type, instead of any constructor in the type
+	hierarchy.  Thanks to Paolo for finding this bug (it showed up as
+	a bug in the Mono runtime when applying the params attribute). 
+
+2002-06-16  Rafael Teixeira  <rafaelteixeirabr@hotmail.com>
+	* changed namespace.cs to use "GenericParser.error(...)" instead of "CSharpParser.error(...)"
+
+2002-06-14  Rachel Hestilow  <hestilow@ximian.com>
+
+	* expression.cs (Unary.ResolveOperator): Use TypeManager
+	to resolve the type.
+	
+2002-06-13  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (enum_member_declaration): Pass in the attributes
+	attached.
+
+	* enum.cs (AddEnumMember): Add support to store the attributes associated 
+	with each member too.
+
+	* attribute.cs (CheckAttribute, ApplyAttributes): Update to handle
+	field builders too - this takes care of the enum member case.
+
+2002-06-10  Rachel Hestilow  <hestilow@ximian.com>
+
+	* typemanager.cs (TypeManager.VerifyUnManaged): Allow
+	address-of operator on both value types and pointers.
+	
+2002-06-10  Martin Baulig  <martin@gnome.org>
+
+	* interface.cs (Interface.PopulateIndexer): Add the indexer's
+	PropertyBuilder to the `property_builders' list.
+
+	* expression.cs (Indexers.GetIndexersForTypeOrInterface): New private method.
+	(Indexers.GetIndexersForType): Call GetIndexersForTypeOrInterface() on the
+	`lookup_type' and all its interfaces.  Unfortunately, Type.FindMembers() won't
+	find any indexers which are inherited from an interface.
+
+2002-06-09  Martin Baulig  <martin@gnome.org>
+
+	* const.cs (Const.LookupConstantValue): Convert `Expr' to a literal of
+	the same type as the constant if necessary.  There's also a test-130.cs
+	for this.
+
+	* enum.cs (Enum.ChangeEnumType): Moved to typemanager.cs and made public.
+
+	* typemanager.cs (TypeManager.ChangeType): Previously known as
+	Enum.ChangeEnumType().
+
+2002-06-09  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (Cast.TryReduce): Added support for consts.
+
+2002-06-08  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Accessor): Hold attributes information so we can pass
+	it along.
+
+	* cs-parser.jay (get_accessor_declaration, set_accessor_declaration):
+	Modify to pass in attributes attached to the methods.
+
+	(add_accessor_declaration, remove_accessor_declaration): Ditto.
+
+	* attribute.cs (ApplyAttributes, CheckAttribute): Update accordingly
+	to handle the Accessor kind :-)
+
+	* class.cs (Property.Emit, Event.Emit): Apply attributes to the accessors
+	
+2002-06-08  Martin Baulig  <martin@gnome.org>
+
+	* expression.cs (Unary.TryReduceNegative): Added support for
+	ULongConstants.
+
+2002-06-08  Martin Baulig  <martin@gnome.org>
+
+	* enum.cs (Enum.LookupEnumValue): Don't report an error if the
+	name can't be found in the `defined_names' - the caller will do a
+	MemberLookup in this case and thus find methods in System.Enum
+	such as Enum.IsDefined().
+
+2002-06-08  Martin Baulig  <martin@gnome.org>
+
+	* enum.cs (Enum.ChangeEnumType): This is a custom version of
+	Convert.ChangeType() which works with TypeBuilder created types.
+	(Enum.LookupEnumValue, Enum.Define): Use it here.
+
+	* class.cs (TypeContainer.RegisterRequiredImplementations): Added
+	`TypeBuilder.BaseType != null' check.
+	(TypeContainer.FindMembers): Only lookup parent members if we
+	actually have a parent.
+	(Method.EmitDestructor): Added `ec.ContainerType.BaseType != null' check.
+	(ConstructorInitializer.Resolve): Likewise.
+
+	* interface.cs (Interface.FindMembers): Added
+	`TypeBuilder.BaseType != null' check.
+
+	* rootcontext.cs (RootContext.ResolveCore): Added
+	"System.Runtime.CompilerServices.IndexerNameAttribute" to
+	classes_second_stage.
+
+	* typemanager.cs (TypeManager.InitCoreTypes): Don't initialize
+	debug_type and trace_type when compiling with --nostdlib.	
+
+2002-06-07  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (TypeContainer): Added `have_nonstatic_fields' field.
+	(AddField): Set it to true when adding a non-static field.
+	(DefineType): Use `have_nonstatic_fields' to find out whether we
+	have non-static fields, not `Fields != null'.
+
+2002-06-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (SimpleNameResolve): Removed simple bug (we were
+	dereferencing a null on the static-field code path)
+
+2002-05-30  Martin Baulig  <martin@gnome.org>
+
+	* codegen.cs (InitMonoSymbolWriter): Added `string[] args' argument
+	to take command line arguments.  Use reflection to call the new
+	custom `Initialize' function on the symbol writer and pass it the
+	command line arguments.
+
+	* driver.cs (--debug-args): New command line argument to pass command
+	line arguments to the symbol writer.
+
+2002-05-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* assign.cs (DoResolve): Forgot to do the implicit conversion to
+	the target type for indexers and properties.  Thanks to Joe for
+	catching this.
+
+2002-05-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (MethodFlags): returns the method flags
+	(Obsolete/ShouldIgnore) that control warning emission and whether
+	the invocation should be made, or ignored. 
+
+	* expression.cs (Invocation.Emit): Remove previous hack, we should
+	not do this on matching a base type, we should do this based on an attribute
+
+	Only emit calls to System.Diagnostics.Debug and
+	System.Diagnostics.Trace if the TRACE and DEBUG defines are passed
+	on the command line.
+
+	* rootcontext.cs: Global settings for tracing and debugging.
+
+	* cs-tokenizer.cs (define): New utility function to track
+	defines.   Set the global settings for TRACE and DEBUG if found.
+
+2002-05-25  Ravi Pratap  <ravi@ximian.com>
+
+	* interface.cs (Populate*): Pass in the TypeContainer as well as
+	the DeclSpace as parameters so that we can create EmitContexts and
+	then use that to apply attributes etc.
+
+	(PopulateMethod, PopulateEvent, PopulateProperty)
+	(PopulateIndexer): Apply attributes everywhere.
+
+	* attribute.cs (CheckAttribute): Include InterfaceMethod, InterfaceEvent
+	etc.
+
+	(ApplyAttributes): Update accordingly.
+
+	We now apply interface attributes for all members too.
+
+2002-05-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Indexer.Define); Correctly check if we are explicit
+	implementation (instead of checking the Name for a ".", we
+	directly look up if the InterfaceType was specified).
+
+	Delay the creation of the PropertyBuilder.
+
+	Only create the PropertyBuilder if we are not an explicit
+	interface implementation.   This means that explicit interface
+	implementation members do not participate in regular function
+	lookups, and hence fixes another major ambiguity problem in
+	overload resolution (that was the visible effect).
+
+	(DefineMethod): Return whether we are doing an interface
+	implementation. 
+	
+	* typemanager.cs: Temporary hack until we get attributes in
+	interfaces (Ravi is working on that) and we get IndexerName
+	support in interfaces.
+
+	* interface.cs: Register the indexers as properties.
+
+	* attribute.cs (Attribute.Resolve): Catch the error, and emit a
+	warning, I have verified that this is a bug in the .NET runtime
+	(JavaScript suffers of the same problem).
+
+	* typemanager.cs (MemberLookup): When looking up members for
+	interfaces, the parent of an interface is the implicit
+	System.Object (so we succeed in searches of Object methods in an
+	interface method invocation.  Example:  IEnumerable x;  x.ToString
+	()) 
+
+2002-05-25  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Event): Events should also register if they do
+	implement the methods that an interface requires.
+
+	* typemanager.cs (MemberLookup); use the new GetInterfaces
+	method. 
+
+	(GetInterfaces): The code used to lookup interfaces for a type is
+	used in more than one place, factor it here. 
+
+	* driver.cs: Track the errors at the bottom of the file, we kept
+	on going.
+
+	* delegate.cs (NewDelegate.Emit): We have to emit a null as the
+	instance if the method we are calling is static!
+
+2002-05-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* attribute.cs (ApplyAttributes): Make this function filter out
+	the IndexerName attribute (as that attribute in reality is never
+	applied) and return the string constant for the IndexerName
+	attribute. 
+
+	* class.cs (TypeContainer.Emit): Validate that all the indexers
+	have the same IndexerName attribute, and if so, set the
+	DefaultName attribute on the class. 
+
+	* typemanager.cs: The return value might contain other stuff (not
+	only methods).  For instance, consider a method with an "Item"
+	property and an Item method.
+
+	* class.cs: If there is a problem with the parameter types,
+	return. 
+
+2002-05-24  Ravi Pratap  <ravi@ximian.com>
+
+	* ecore.cs (ImplicitConversionExists): Wrapper function which also
+	looks at user defined conversion after making a call to 
+	StandardConversionExists - we need this for overload resolution.
+
+	* expression.cs : Update accordingly the various method calls.
+
+	This fixes 2 bugs filed against implicit user defined conversions 
+
+2002-05-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs: Track the result of the assignment.
+
+2002-05-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (MemberAccess): Improved error reporting for
+	inaccessible members.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* makefile (mcs-mono2.exe): New target.  This is mcs compiled with
+	itself with debugging support.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs ("System.Runtime.InteropServices.StructLayoutAttribute"):
+	Removed, this isn't needed anymore.
+
+2002-05-20  Martin Baulig  <martin@gnome.org>
+
+	* typemanager.cs (InitEnumUnderlyingTypes): "System.Char" can't
+	be underlying type for an enum.
+
+2002-05-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (InitEnumUnderlyingTypes): New helper function
+	that splits out the loading of just the core types.
+
+	* rootcontext.cs (ResolveCore): Split the struct resolution in
+	two, so we can load the enumeration underlying types before any
+	enums are used.
+
+	* expression.cs (Is): Bandaid until we fix properly Switch (see
+	bug #24985 for details).
+
+	* typemanager.cs (ImplementsInterface): The hashtable will contain
+	a null if there are no interfaces implemented.
+
+2002-05-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay (indexer_declarator): It is fine to have array
+	parameters
+
+2002-05-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs: (RegisterBuilder): New function used to register
+	TypeBuilders that implement interfaces.  Since
+	TypeBuilder.GetInterfaces (as usual) does not work with lame
+	Reflection.Emit. 
+	(AddUserType): register interfaces.
+
+	(ImplementsInterface): Use the builder_to_ifaces hash if we are
+	dealing with TypeBuilder.  Also, arrays are showing up as
+	SymbolTypes, which are not TypeBuilders, but whose GetInterfaces
+	methods can not be invoked on them!
+
+	* ecore.cs (ExplicitReferenceConversionExists): Made public.
+	(ImplicitReferenceConversionExists): Split out from
+	StandardConversionExists. 
+
+	* expression.cs (As): We were only implementing one of the three
+	cases for the as operator.  We now implement them all.
+	(Is): Implement the various other cases for Is as well.
+
+	* typemanager.cs (CACHE): New define used to control if we want or
+	not the FindMembers cache.  Seems to have a negative impact on
+	performance currently
+
+	(MemberLookup): Nested types have full acess to
+	enclosing type members
+
+	Remove code that coped with instance/static returns for events, we
+	now catch this in RealFindMembers.
+
+	(RealFindMembers): only perform static lookup if the instance
+	lookup did not return a type or an event.  
+
+2002-05-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* assign.cs (CompoundAssign): We pass more semantic information
+	now to Compound Assignments than we did before: now we have all
+	the information at hand, and now we resolve the target *before* we
+	do the expression expansion, which allows the "CacheValue" method
+	to have the effect we intended (before, a [x] += 1 would generate
+	two differen ArrayAccess expressions from the ElementAccess,
+	during the resolution process).
+
+	(CompoundAssign.DoResolve): Resolve target and original_source here.
+
+2002-05-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (ArrayAccess): dropped debugging information. 
+
+	* typemanager.cs: Small bug fix: I was always returning i_members,
+	instead of one of i_members or s_members (depending on which had
+	the content).
+
+	* assign.cs (IAssignMethod.CacheTemporaries): New method.  This
+	method is invoked before any code generation takes place, and it
+	is a mechanism to inform that the expression will be invoked more
+	than once, and that the method should use temporary values to
+	avoid having side effects
+
+	(Assign.Emit): Call CacheTemporaries in the IAssignMethod.
+	
+	* ecore.cs (Expression.CacheTemporaries): Provide empty default
+	implementation.
+
+	* expression.cs (Indirection, ArrayAccess): Add support for
+	CacheTemporaries in these two bad boys. 
+
+	* ecore.cs (LoadFromPtr): figure out on our own if we need to use
+	ldobj or ldind_ref.  
+	(StoreFromPtr): Handle stobj as well.
+
+	* expression.cs (UnaryMutator): Share more code.
+	
+	* typemanager.cs (FindMembers): Thanks to Paolo for tracking this
+	down: I was not tracking the Filter function as well, which
+	was affecting the results of the cache.
+
+2002-05-15  Miguel de Icaza  <miguel@ximian.com>
+
+	* attribute.cs: Remove the hack to handle the CharSet property on
+	StructLayouts. 
+
+2002-05-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* attribute.cs (DoResolve): More uglyness, we now only try to
+	resolve the attribute partially, to extract the CharSet
+	information (only if we are a StructLayout attribute).  Otherwise 
+
+	(GetExtraTypeInfo): Add some code to conditionally kill in the
+	future this.   I am more and more convinced that the .NET
+	framework has special code to handle the attribute setting on
+	certain elements.
+
+	* expression.cs (IsParamsMethodApplicable): Revert my previous
+	foreach change here, it was wrong.
+
+2002-05-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-tokenizer.cs: (pp_primary): Eat the ')' at the end.
+	(pp_expr): do not abort on unknown input, just return.
+	(eval): abort if there are pending chars.
+
+	* attribute.cs (Attribute.Resolve): Positional parameters are
+	optional.  Deal with that case.
+
+	* class.cs (DefineType): Call Attribute.GetExtraTypeInfo to fetch
+	the Ansi/Unicode/Auto information for the type.
+
+	(TypeContainer.DefineType): instantiate the EmitContext here, as
+	we will be using it during the type definition (to resolve
+	attributes) and during the emit phase.
+
+	* attribute.cs (Attribute.GetExtraTypeInfo): This routine is used
+	to pull type information out of the attributes
+
+	(Attribute.Resolve): track the constructor builder, and allow for
+	multiple invocations (structs and classes will use this).
+
+	* ecore.cs (MemberLookupFinal): new version with all the
+	parameters customizable.
+
+	* expression.cs (New.DoResolve): Use MemberLookupFinal to locate
+	constructors.  Return if the result value is null (as the error
+	would have been flagged already by MemberLookupFinal)
+
+	Do not allow instances of abstract classes or interfaces to be
+	created.
+	
+	* class.cs: (MethodSignature.InheritableMemberSignatureCompare):
+	We have to compare the assembly property here when dealing with
+	FamANDAssem and Assembly access modifiers, because we might be
+	creating an assembly from *modules* (that means that we are not
+	getting TypeBuilders for types defined in other modules that are
+	part of this assembly).
+
+	(Method.Emit): If the method is marked abstract and has a body,
+	emit an error. 
+
+	(TypeContainer.DefineMembers): If both the defined member and the
+	parent name match are methods, then do not emit any warnings: let
+	the Method.Define routine take care of flagging warnings.  But if
+	there is a mismatch (method overrides something else, or method is
+	overriwritten by something, then emit warning).
+
+	(MethodSignature.MemberSignatureCompare): If the sig.ret_type is
+	set to null, this means `do not check for the return type on the
+	signature'. 
+
+	(Method.Define): set the return type for the method signature to
+	null, so that we get methods with the same name and parameters and
+	different return types.  This is used to flag warning 114 (you are
+	hiding a method, and you probably want to use the new/override
+	keywords instead).
+
+	* typemanager.cs (MemberLookup): Implemented proper access
+	control, closing a long standing set of bug reports.  The problem
+	was that the Framework only has two bits: Public and NonPublic,
+	and NonPublic includes private and protected methods, but we need
+	to enforce the FamANDAssem, FamOrAssem and Family. 
+
+2002-05-11  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (GotoCase): Return true: Ammounts to giving up
+	knowledge on whether we return or not, and letting the other case
+	be responsible for it.
+
+2002-05-10  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs: Do not load directories for each file processed, only
+	do it if there is a pattern.
+
+	* ecore.cs: Report readonly assigns here as well, as we might have
+	been resolved only by MemberAccess.
+
+	(SimpleName.SimpleNameResolve): Also be useful for LValue
+	resolution.   We need this to propagate assign to local readonly variables
+
+	* typemanager.cs: Use a ptrhashtable for the criteria, because we
+	do not want to reuse potential criteria memory.
+
+	* class.cs (MyEventBuilder): Set reflected_type;
+
+	* ecore.cs (Constantify): Added support for constifying bools.
+
+	(RootContext.LookupType): Added a cache for values looked up in
+	the declaration space.
+
+	* typemanager.cs (FindMembers): Now is a front-end to
+	RealFindMembers, and provides a two-level hashtable-based cache to
+	the request.  
+
+	15% performance improvement: from 22.5 to 19.2 seconds.
+
+	* expression.cs (IsParamsMethodApplicable): use foreach.
+	(Invocation.DoResolve): ditto.
+	(New.DoResolve): ditto.
+	(ArrayCreation.DoResolve): ditto.
+
+	* ecore.cs (FindMostEncompassingType): use foreach.
+
+	* delegate.cs (NewDelegate.DoResolve): Use foreach
+
+	* ecore.cs (Expression.FindMostSpecificSource): Use foreach.
+	(RemoveMethods): use foreach.
+
+	* expression.cs (Invocation.MakeUnionSet): Optimization: Use two
+	nested foreach statements instead of for, and also break out of
+	the inner loop once a match is found.
+	
+	(Invocation.OverloadResolve): Use foreach, simplify the code. 
+
+2002-05-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* cfold.cs (BinaryFold): During an enumeration evaluation context,
+	we actually unwrap the expression to allow for extra information
+	to be extracted. 
+
+	* expression.cs: Use Shr_Un on unsigned operations. 
+
+2002-05-08  Ravi Pratap  <ravi@ximian.com>
+
+	* ecore.cs (FindMostEncompass*): Fix trivial bug where the set of 
+	applicable operators was not being considered correctly. This closes
+	the bug Miguel reported.
+
+Wed May 8 16:40:50 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* attribute.cs: check that the type derives from System.Attribute
+	and report the correct error in that case (moved the duplicate code to
+	its own method, too).
+
+Wed May 8 11:50:31 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* attribute.cs: lookup attribute type name as the spec says: first the
+	bare attribute name and then name + "Attribute" (nant compiles with
+	mcs after this fix).
+
+2002-05-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Unary.TryReduceNegative): Ah!  Tricky!  Tricky!
+	Because of the way we parse things, we should try to see if a
+	UIntConstant can fit in an integer.
+
+2002-05-07  Ravi Pratap  <ravi@ximian.com>
+
+	* ecore.cs (GetConversionOperators): Do not pick up op_True operators
+	when we are in an explicit context.
+
+	(ConvertReferenceExplicit): When converting from Iface type S to Class
+	T make sure the rules are implemented as an OR.
+
+	* parameter.cs (ParameterType): Make it a property for now although the
+	purpose really isn't anything immediate.
+	
+	* expression.cs (Is*Applicable): Do better checking on the parameter type
+	of a ref/out parameter. The ones from the system assemblies are already 
+	marked with the correct type so we don't need to do any correction.
+
+	* ecore.cs (StandardConversionExists): Conversion from Interface types to 
+	the object type is standard too so include that.
+
+2002-05-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (StandardConversionExists): Augment with missing code:
+	deal with IntConstant, LongConstants and Enumerations.
+
+	* assign.cs: Report the error, instead of failing silently
+
+	* rootcontext.cs (AddGlobalAttributes): Track attributes on the
+	typecontainer that they are declared, because the
+	typecontainer/namespace will have the list of using clauses that
+	need to be applied.
+
+	Assembly Attributes were escaping the normal registration
+	mechanism. 
+
+	(EmitCode): Apply attributes within an EmitContext that represents
+	the container they were declared on.
+	
+	* cs-parser.jay: Track bases for structs.  How did I get this wrong?
+
+2002-05-06  Ravi Pratap  <ravi@ximian.com>
+
+	* ecore.cs (FindMostEncompassingType, FindMostEncompassedType):
+	Revamp completely - make much cleaner as we now operate only
+	on a set of Types.
+
+	(FindMostSpecificSource, FindMostSpecificTarget): New methods
+	to implement the logic detailed in the spec more correctly.
+
+	(UserDefinedConversion): Update accordingly.
+
+2002-05-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs: Return flow analysis information up.
+
+	* cs-tokenizer.cs (adjust_real): Share code between LITERAL_DOUBLE
+	and the default.
+
+	(token): Do not consume an extra character before calling
+	decimal_digits.
+
+2002-05-06  Piers Haken	<piersh@friskit.com>
+
+	* cs-parser.jay: add 'override' attribute to System.Object.Finalize
+
+2002-05-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Constructor.Emit): Set the IsStatic flag in the
+	EmitContext during the instance constructor initializer
+	resolution, to stop access to instance variables.
+
+	This is mandated by the spec, last paragraph of the `constructor
+	initializers' section. 
+
+2002-05-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay, class.cs (Accessor): new class used to represent
+	an accessor (get or set).  In the past we used `null' to represent
+	a missing accessor.  But this is ambiguous because there was no
+	way to tell in abstract indexers/properties if one of them was
+	specified.
+
+	Now there is a way of addressing that.
+
+	* expression.cs (Indexers.GetIndexersForType): Use TypeManager.MemberLookup
+	instead of FindMembers.
+
+	* class.cs (TypeContainer.EmitFieldInitializer): Do not typecast
+	the result of Assign.Resolve as Assign, but rather as ExpressionStatement.
+
+	* attribute.cs: Treat indexers and properties as the same in terms
+	of applying attributes
+
+	* ecore.cs (FindMostEncompassedType): Use statically initialized
+	EmptyExpressions()s like we do elsewhere to avoid creating useless
+	objects (and we take this out of the tight loop).
+
+	(GetConversionOperators): Move the code to extract the actual
+	operators to a separate routine to clean things up.
+
+2002-05-04  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (FieldExpr): Remove un-needed tests for null, since now
+	events are always registered FieldBuilders.
+	
+	* class.cs (FieldBase): New class shared by Fields 
+
+	* delegate.cs: If we are a toplevel delegate, use our full name.
+	If we are a nested delegate, then only use our tail name.
+
+2002-05-02  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (IsApplicable): Ensure that we add the "&" to
+	ref/out types before comparing it with the type of the argument.
+
+	(IsParamsMethodApplicable): Ditto.
+
+	(Argument.Type): Use TypeManager.LookupType instead of Type.GetType - 
+	silly me ;-)
+
+	* delegate.cs : Handle the case when we have more than one applicable
+	method. Flag an error only when we finish checking all.
+
+2002-05-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: Add support for boolean static initializers.
+
+2002-05-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* attribute.cs: Use proper cast for Events, since we use a MyEventBuilder.
+
+	* parameter.cs (ComputeParameterTypes,
+	ComputeAndDefineParameterTypes): Better error handling: now we
+	clear the `types' cache if we fail during any of the type lookups.
+	We also return the status code correctly to our caller
+
+	* delegate.cs: If we fail to define a delegate, abort the extra
+	steps. 
+
+	* expression.cs (Binary.ResolveOperator): for
+	operator==(object,object) and operator !=(object, object) we also
+	have to verify that there is an implicit conversion from one to
+	the other.
+
+	(ArrayAccess.DoResolve): Array Access can operate on
+	non-variables. 
+
+2002-04-30  Miguel de Icaza  <miguel@ximian.com>
+
+	* assign.cs (CompoundAssign): A new class used as a "flag" that
+	the assignment actually is happening as part of a compound
+	assignment operator.
+
+	During compound assignment, a few new rules exist to enable things
+	like:
+
+	byte b |= 1 + 2
+
+	From the spec:
+	
+	x op= y can be evaluated as x = (T) (x op y) (ie, an explicit cast
+	to the type of x) if y is implicitly convertible to the type of x,
+	and the operator is a builtin operator and the return type of the
+	operator is explicitly convertible to the type of x. 
+
+	* rootcontext.cs: Reset warning level to 2.  4 catches various
+	"interesting" features in mcs, we must clean this up at some
+	point, but currently am trying to kill other bugs ;-)
+
+	* ecore.cs (SimpleName.SimpleNameResolve): Perform member lookups
+	in container classes as well.  
+
+	* expression.cs (Binary.ResolveOperator): Handle string case
+	before anything else (as operator overloading does emit an error
+	before doing anything else).
+
+	This code could go away when we move to a table driven model, but
+	i could not come up with a good plan last night.
+	
+2002-04-30  Lawrence Pit <loz@cable.a2000.nl>
+
+	* typemanager.cs (CSharpName): reimplementation using regex.
+	* class.cs: added null check for fields in Emit
+	* rootcontext.cs: set warninglevel to 4
+
+2002-04-29  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (CSharpName): reimplemented with Lupus
+	suggestion.
+
+2002-04-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (If): correclty implement Resolve, because we were
+	not catching sem errors in there.  The same process is needed
+	everywhere else. 
+	(Return, StatementExpression, For, While, Do, Throw, Lock): Implement Resolve
+	
+
+	(Statement.Warning_DeadCodeFound): Factorize code.
+	(While): Report dead code here too.
+
+	(Statement): Added Resolve virtual method to allow
+	for resolution split from the emit code.
+
+2002-04-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (EmitBoolExpression): No longer try to resolve the
+	expression here.    
+	(MakeBoolean): New utility function that resolve, implicitly
+	converts to boolean and tags the expression. 
+	
+
+	(If, Do): Implement dead code elimination.
+	(While): Implement loop inversion
+
+	(Do, While, For, If): Resolve the expression prior to calling our
+	code generation.
+
+2002-04-22  Lawrence Pit <loz@cable.a2000.nl>
+
+	* class.cs:
+	  - added method Report28 (warning: program has more than one entry point)
+	  - added method IsEntryPoint, implements paragraph 10.1 of the spec
+	  - modified method Method.Define, the part at the end of the method
+
+	* rootcontext.cs: added static public Location EntryPointLocation;
+	  
+	* ../errors/cs0028.cs : Add test case for the above warning.		  
+
+	* typemanager.cs:
+	  - modified method CSharpName to allow arrays of primitive type to
+	    be printed nicely (e.g. instead of System.Int32[][] it now prints
+	    int[][])
+	  - added method CSharpSignature: returns the signature of a method
+	    in string format to be used in reporting errors, warnings, etc.
+
+	* support.cs: InternalParameters.ParameterDesc variable tmp initialized
+	with String.Empty.
+	
+2002-04-26  Ravi Pratap  <ravi@ximian.com>
+
+	* delegate.cs (Define): Fix extremely silly bug where I was
+	setting the type of the 'object' parameter of the BeginInvoke
+	method to System.IAsyncResult instead of System.Object ;-)
+
+2002-04-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (ConstructorInitializer.Resolve): Also use DeclaredOnly
+	here. 
+
+	(Constructor.Emit): return if we fail to initialize the
+	constructor.  Another door closed!  
+
+	* expression.cs (New.DoResolve): Improve error message (from -6 to
+	1501).  Use DeclaredOnly lookup to find the exact constructor.
+
+	* typemanager.cs (MemberLookup): If DeclaredOnly is set, do not
+	loop.  This is useful.
+
+	* cs-parser.jay: Adjust the default parameters so that destructors
+	have the proper signature.
+
+2002-04-26  Martin Baulig  <martin@gnome.org>
+
+	* driver.cs (LoadAssembly): If `assembly' contains any characters
+	which are only valid in path names and not in assembly names
+	(currently slash, backslash and point), use Assembly.LoadFrom ()
+	instead of Assembly.Load () on the `assembly' (before iteration
+	over the link_paths).
+
+2002-04-26  Martin Baulig  <martin@gnome.org>
+
+	* cs-tokenizer.cs (is_hex): Correctly handle lowercase chars.
+
+2002-04-25  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Property): use the new typemanager.MemberLookup
+
+	(TypeContainer.MemberLookup): Implement using the
+	TypeManager.MemberLookup now. 
+	
+	* typemanager.cs: Make MemberLookup a function of the TypeManager,
+	and return MemberInfos, so that these can be used without an
+	EmitContext (what we had before).
+
+2002-04-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: Fix the case where the argument to params if the
+	type of the params.  I omitted handling this before.   Fixed
+
+2002-04-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs: Call BootCorlib_PopulateCoreType
+
+	* class.cs (Property.CheckBase): Check for properties only, not
+	for all members. 
+
+	* interface.cs: Temporary hack: try/catch around the
+	CustomAttributeBuilder, because I am getting an exception that I
+	do not understand.
+
+	* rootcontext.cs (BootCorlib_PopulateCoreType): Populate some
+	types whose definitions are required to be there (attributes are
+	defined before standard types).
+
+	Compute definitions as we boot the various types, as they are used
+	immediately (value_type class will need object_type, but if we do
+	not initialize object_type, we will pass a null, which will let
+	the runtime pick the System.Object from the existing corlib, which
+	is not what we want).
+
+2002-04-22  Patrik Torstensson <totte@labs2.com>
+
+	* cs-tokenizer.cs: fixed a number of trim() issues.
+
+2002-04-22  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Argument.Type): Ensure that we return the correct
+	type when we have out or ref parameters [in which case we 
+	append a "&"].
+	
+2002-04-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Property, Indexer): Allow extern modifier in there. 
+
+	* typemanager.cs (InitBaseTypes): Initializes object_type and
+	value_type, since those will be used early on during the bootstrap
+	process to compile corlib.
+
+	(InitCoreTypes): Move code from here to InitBaseTypes.
+
+2002-04-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (PropertyExpr): Optimize calls to Array::get_Length on
+	single-dimension arrays as using the ldlen opcode.  
+
+	Daniel Lewis discovered this optimization.  
+
+	* typemanager.cs: Add signature for System.Array::get_Length
+
+2002-04-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* statement.cs: report the error when the foreach does not apply to an
+	array nor a collection.
+
+2002-04-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: Add implicit conversions to the operator ~.
+
+	* constant.cs (DecimalConstant.Emit): Emit decimal value.
+
+	* typemanager.cs: Locate the decimal constructor.
+
+2002-04-17  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* attribute.cs: use the new property of TypeOf.
+	* expression.cs: added 'get' property around typearg.
+
+	These changes fix a build breaker reported by NickD. Is this the
+	correct way to fix?  If not, please, revert my changes and make it
+	work :-).
+
+2002-04-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* attribute.cs: Add support for typeof in attribute invocations.
+	I am not sure that this is right though.
+
+2002-04-14  Duncan Mak  <duncan@ximian.com>
+
+	* cfold.cs (BinaryFold): Catch DivideByZeroException in the
+	Binary.Operator.Division case.
+
+2002-04-13  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (DefineType): Ensure that we do a proper check on
+	attribute types and also register it with the TypeManager.
+
+	(TypeContainer.Targets): The default for attribute types is
+	AttributeTargets.All.
+	
+	* attribute.cs (ApplyAttributes): Registering the attribute type
+	is done elsewhere, not when we discover we have a Usage attribute.
+
+2002-04-12  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (VerifyArgumentsCompat): Implement Miguel's suggestion
+	and get rid of is_delegate parameter.
+
+	* everywhere : update.
+	
+2002-04-12  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (compilation_unit): Revamp completely to use
+	some new ideas that I got from Rhys' grammar to solve the problems
+	with assembly level attributes.
+
+	(outer_declaration): New grammar production.
+
+	(attribute_sections): Add.
+
+	(opt_attributes): Base on attribute_sections
+
+	(namespace_declaration): Allow opt_attributes to tackle the case
+	when we have assembly level attributes - we are clever in this
+	regard now ;-)
+
+	* attribute.cs (ApplyAttributes): Do not worry about assembly 
+	attributes in the non-global context.
+
+	* rootcontext.cs (AddGlobalAttributes): Go back to using this
+	instead of SetGlobalAttributes.
+
+	* class.cs, rootcontext.cs : Ensure we define and generate 
+	attribute types before anything else.
+
+	* attribute.cs (CheckAttribute and GetValidPlaces): Handle the exception
+	and flag the new error -20 for the case when the attribute type
+	does not have valid targets specified. csc does not catch this.
+
+	* ../errors/errors.txt : update for error # -20
+
+2002-04-11  Ravi Pratap  <ravi@ximian.com>
+
+	* support.cs (InternalParameters.ParameterModifier): Do some null
+	checking and return sane values.
+
+	* class.cs (Method.Define): If we are a PInvoke method, ensure
+	that we are static and extern. Report error # 601
+
+	* ../errors/cs0601.cs : Add test case for the above error.
+
+2002-04-07  Ravi Pratap  <ravi@ximian.com>
+
+	* rootcontext.cs (attribute_types): We need to keep type of
+	all attribute types separately and emit code for them first.
+
+	(RegisterAttribute) : Implement.
+
+	* class.cs (DefineType): Check if the current Type is a custom
+	attribute type and register it accordingly.
+
+	* rootcontext.cs (AddGlobalAttributes): Fix silly bug where we were
+	adding the first attribute twice and rename to
+
+	(SetGlobalAttributes): this.
+
+	* rootcontext.cs (NamespaceLookup): Run through the aliases too and perform
+	lookups.
+
+	* attribute.cs (ApplyAttributes): Take an additional argument telling us
+	if we are processing global arguments. Hmm, I am unsure of this.
+
+2002-04-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* expression.cs: added static array of strings to avoid calling
+	Enum.ToString () for Operator in Binary. Significant recover of
+	performance.
+
+2002-04-10  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (FindMembers): Allow the Builders of the various
+	members to be null.  If they are skip them.  This only happens
+	during the PInvoke declaration.
+
+2002-04-09  Miguel de Icaza  <miguel@ximian.com>
+
+	* parameter.cs (Parameters.ComputeParameterTypes): Flag the
+	failure, so we do not keep going afterwards.
+
+	* expression.cs: (Invocation.OverloadResolve): I believe Ravi
+	wanted to pass `false' as the `is_delegate' argument.  If this is
+	the case, why not use delegate_type == null to mean `is_delegate =
+	false' and anything else as is_delegate = true.
+
+Tue Apr  9 05:40:12  2002 Piers Haken <piersh@friskit.com>
+
+	* statement.cs: fixed SimpleSwitchEmit to make 'goto case' goto the
+	code for the section, not the beginning of the tests.
+
+2002-04-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* cfold.cs: Handle operator + (Enum x, Underlying x) 
+
+	* expression.cs (Binary): same.  Warn about errors where we have
+	Enum/Enum in operator + as well.
+
+Mon Apr  8 06:29:03  2002 Piers Haken <piersh@friskit.com>
+
+	* statement.cs:
+		- added support for switch(bool)
+		- optimize loading of I8/U8 constants (ldc.i4, iconv_i8)
+		- add TableSwitchEmit() to handle table-based switch statements
+
+2002-04-05  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Invocation.OverloadResolve): Factor out code which
+	does parameter compatibility checking with arguments so that we can 
+	re-use the code even from Delegate.VerifyApplicability
+
+	(VerifyArgumentsCompat): Move above code here.
+
+	* delegate.cs (VerifyApplicability): Get rid of duplicate code
+	and instead make a call to the above method.
+
+2002-03-31  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (attribute_type): Corresponds to System.Attribute.
+	We use it to keep track of classes which are attribute types.
+
+2002-04-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* delegate.cs (Delegate.Define): Correctly define the types in the
+	presence of fixed and array parameters.
+
+	* class.cs (TypeContainers.FindMembers): Use NonPublic flag while
+	doing FindMembers.
+
+	* ecore.cs (Expression.MemberLookup): Reset binding flags to not
+	include NonPublic after the first iteration.
+
+	* class.cs (Indexer.CheckBase): Only check if both parents are
+	non-null. 
+	
+	* cs-parser.jay (accessor_body): If empty, set to null.
+
+	* ecore.cs (SimpleName.SimpleNameResolve): We did not have the
+	same code path here to resolve constants names that we did have in
+	MemberAccess.DoResolve.  There is too much code duplicated here.
+
+2002-04-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs, makefile: Drop Statementcollection and just use ArrayLists
+
+	* ecore.cs: Optimize UserDefinedConversion by minimizing the calls
+	to MakeUnionSet.
+
+	* cs-tokenizer.cs: Reuse a single StringBuilder for assembling
+	tokens, numbers and strings.
+
+	* ecore.cs (MethodGroupExpr): Make Emit warn about missing
+	parenthesis.
+
+	* delegate.cs: Use ComputeAndDefineParameterTypes for both the
+	asyncronous parameters and the regular parameters.  
+
+	* codegen.cs (CodeGen.Init): Use the constructor that allows us to
+	specify the target directory.
+
+	* expression.cs: (This.DoResolve): Simplify
+	(As.Emit): Optimize, do not generate IsInst if the expression is
+	always of the given type.
+
+	(Is.DoResolve): Bug fix, we were reporting both always/never for
+	the is expression.
+
+	* (Invocation.MakeUnionSet): Simplify vastly and optimize, we were
+	creating too many unnecessary arrays.
+
+2002-03-31  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (EmitFieldInitializer): Use Assign expression to assign
+	fields instead of rolling our own initializer.   Takes care of all
+	implicit conversions, and drops unnecessary static checks/argument.
+
+2002-03-31  Dick Porter  <dick@ximian.com>
+
+	* driver.cs: use the GetDirectories() return values properly, and
+	use "/" as path separator.
+
+2002-03-30  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Unary): Optimize - - expr into expr.
+	(Binary): Optimize a + (-b) into a -b.
+
+	* codegen.cs (CodeGen): Made all methods static.
+
+2002-03-29  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs: 
+
+	* decl.cs: Rename `definition' into `TypeBuilder' and drop the
+	TypeBuilder property.
+
+	* cs-parser.jay: Drop the use of RecordXXX and use RecordDecl
+	instead. 
+
+	* tree.cs: Removed the various RecordXXXX, and replaced with a
+	single RecordDecl.  Removed all the accessor methods, and just
+	left a single access point Type 
+
+	* enum.cs: Rename DefineEnum to DefineType.
+
+	* decl.cs: New abstract method `DefineType' used to unify the
+	Defines for Enumerations, Interfaces, TypeContainers and
+	Delegates.
+
+	(FindType): Moved LookupInterfaceOrClass here.  Moved the
+	LookupBaseClasses method that used to live in class.cs and
+	interface.cs here, and renamed to FindType.
+	
+	* delegate.cs: Implement DefineType.  Take advantage of the
+	refactored pattern for locating the parent builder without taking
+	the parent_builder argument (which we know does not work if we are
+	nested, and triggering a toplevel definition).
+
+2002-03-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* decl.cs (MemberCore.CheckMethodAgainstBase): Test if the
+	accessibility of a member has changed during override and report
+	an error if so.
+
+	* class.cs (Method.Define, Property.Define): Only complain on
+	overrides if the method is private, any other accessibility is
+	fine (and since we just checked the permission is the same, we are
+	good to go).
+
+	* cs-tokenizer.cs: only line, region, endregion, if, endif, else
+	and elif are processed always.  The other pre-processing
+	directives are only processed if we are "taking" the path
+
+2002-03-29  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (Method.Emit): Only emit symbolic debugging info if the
+	current location is not Null.
+
+	* codegen.cs (CodeGen.SaveSymbols): Split out symbol writing code into
+	a separate method so we can profile it.
+
+	* driver.cs (ShowTime): We need to use `(int) span.TotalSeconds' since
+	`span.Seconds' are just seconds, but no minutes or hours.
+	(MainDriver): Profile the CodeGen.SaveSymbols calls.
+
+2002-03-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Method.Define), (Property.Define), (Indexer.Define):
+	Remove the gratuitous set of Final:
+
+				// If an interface implementation, then we can set Final.
+				if (((flags & MethodAttributes.Abstract) == 0) &&
+				    implementing.DeclaringType.IsInterface)
+					flags |= MethodAttributes.Final;
+
+        I do not know what I was smoking when I used that.
+	
+
+	* cs-parser.jay, delegate.cs: Make Delegate be a DeclSpace, first
+	step into fixing the name resolution issues for delegates and
+	unifying the toplevel name resolution.
+
+2002-03-28  Martin Baulig  <martin@gnome.org>
+
+	* class.cs (Method.Emit): If we have a symbol writer, call its
+	OpenMethod(), CloseMethod() and SetMethodSourceRange() methods to
+	tell it about the current method.
+
+	* codegen.cs (EmitContext.Mark): New public method. Tell the symbol
+	writer that we're going to emit the first byte of IL code for a new
+	statement (a new source line).
+	(EmitContext.EmitTopBlock): If we have a symbol writer, call
+	EmitContext.Mark() before emitting any code.
+
+	* location.cs (SymbolDocument): Return null when we're Null.
+
+	* statement.cs (Statement): Moved the `Location loc' variable here.
+	(Statement.EmitBoolExpression): If we have a symbol writer, call
+	ec.Mark() before emitting any code to tell it that we're at the
+	beginning of a new statement.
+	(StatementExpression): Added `Location' argument to the constructor.
+	(Block): Added public readonly variable `StartLocation' and public
+	variable `EndLocation'.  The latter is to be set using SetEndLocation().
+	(Block): Added constructor which takes a start and end location.
+	(Block.SetEndLocation): New method. This sets the end location.
+	(Block.EmitMeta): If we have a symbol writer, tell it the names of the
+	local variables we create.
+	(Block.Emit): If we have a symbol writer, call ec.Mark() before emitting
+	each statement and do also mark the begin and end of the block.
+
+	* cs-parser.jay (block : OPEN_BRACE): Use the new `Block' constructor to
+	tell it the current lexer.Location, use Location.Null for the end of the
+	block.
+	(block : OPEN_BRACE opt_statement_list CLOSE_BRACE): When closing the
+	current block, set its end location using SetEndLocation().
+	(statement_expression): StatementExpression constructor now takes the
+	lexer.Location as additional argument.
+	(for_statement, declare_local_variables): Likewise.
+	(declare_local_variables): When creating a new implicit block, use the
+	new Block constructor and pass it the lexer.Location.
+
+2002-03-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (Expression.MemberLookup): On interfaces, lookup
+	members also on the parent interfaces recursively.
+
+2002-03-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* report.cs: Use new formats, since Gonzalo finished the missing
+	bits. 
+
+	* expression.cs (Binary.ResolveOperator): added missing operator|
+	operator& and operator^ for bool/bool.
+
+	* cs-parser.jay: CheckDef now takes a Location argument that is
+	used to report errors more precisly (instead of reporting the end
+	of a definition, we try to track something which is a lot closer
+	to the source of the problem).
+
+	* cs-tokenizer.cs: Track global token use, so we can properly flag
+	the use of #define/#undef after the first token has been seen.
+
+	Also, rename the reportXXXX to Error_DescriptiveName
+
+	* decl.cs (DeclSpace.IsTopLevel): Move property here from
+	TypeContainer, so that Enum and Interface can use this too.
+
+	* class.cs (TypeContainer.LookupInterfaceOrClass,
+	GetInterfaceOrClass, GetClassBases, DefineType): Drop the
+	`builder' argument.  Typically this was used to pass the parent
+	builder (a ModuleBuilder or a TypeBuilder from whoever triggered
+	the definition).  
+
+	The problem is that a nested class could trigger the definition of
+	a toplevel class, and the builder would be obviously wrong in that
+	case. 
+
+	So we drop this argument, and we compute dynamically the
+	TypeBuilder/ModuleBuilder (the correct information was available
+	to us anyways from DeclSpace.Parent)
+
+	* interface.cs (Interface.DefineInterface): Drop builder
+	parameter cleanup like class.cs
+
+	* enum.cs (Enum.DefineEnum): Drop builder parameter.  Clean up
+	like class.cs
+
+	* statement.cs (Switch.EmitObjectInteger): Emit short/ushort
+	values. 
+
+	(Try.Emit): Propagate the returns value from the statement.
+
+	(Return.Emit): Even if we are leavning 
+
+	* driver.cs: Catch IOExpcetion for Directory.GetFiles as well.
+
+	* modifiers.cs: Fix the computation of MethodAttributes flags.
+
+Tue Mar 26 21:14:36 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* driver.cs: allow compilation of files that start with '/'.
+	Add a default case when checking the argument of --target.
+
+2002-03-25  Miguel de Icaza  <miguel@ximian.com>
+
+	* interface.cs: Implement the same search algorithm for types in
+	the interface code.
+
+	* delegate.cs: Do not allow multiple definition.
+
+	* Recovered ChangeLog that got accidentally amputated
+
+	* interface.cs (Interface.DefineInterface): Prevent from double definitions.
+
+	* rootcontext.cs: Load manually enum to allow core classes to
+	contain enumerations.
+
+	* enum.cs, ecore.cs, driver.cs, attribute.cs, class.cs, expression.cs:
+	Update to new static methods in TypeManager.
+
+	* typemanager.cs (GetMethod, GetConstructor): Use our
+	implementation of FindMembers to find the members, since during
+	corlib compilation, the types are TypeBuilders and GetMethod and
+	GetConstructor do not work.
+
+	Make all methods in TypeManager static.
+
+	(InitCodeHelpers): Split the functionality from
+	the InitCodeTypes function.
+
+	* driver.cs: Call InitCodeHelpers after we have populated the
+	types. 
+
+	* cs-parser.jay (delegate_declaration): we did not used to compute
+	the delegate name correctly for void delegates.
+
+2002-03-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs (RootContext): Init the interface_resolve_order
+	and type_container_resolve_order always.
+
+	(ResolveCore, BootstrapCorlib_ResolveClass,
+	BootstrapCorlib_ResolveStruct): New functions to bootstrap the
+	compiler when compiling with --nostdlib
+
+	* class.cs (TypeContainer.DefineType): Check that our parent is
+	not null.  This test is most important when we are bootstraping
+	the core types.
+
+	* codegen.cs: Split out the symbol writing code.
+
+2002-03-25  Martin Baulig  <martin@gnome.org>
+
+	* driver.cs (-g): Made -g an alias for --debug.
+
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* codegen.cs (SymbolWriter): New public variable. Returns the
+	current symbol writer.
+	(CodeGen): Added `bool want_debugging_support' argument to the
+	 constructor. If true, tell the ModuleBuild that we want debugging
+	support and ask it for the ISymbolWriter.
+	(Save): If we have a symbol writer, call it's Close() method after
+	saving the assembly.
+
+	* driver.c (--debug): New command line argument to create a
+	debugger information file.
+
+	* location.cs (SymbolDocument): New public property. Returns an
+	ISymbolDocumentWriter object for the current source file or null
+	if we don't have a symbol writer.
+
+2002-03-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs (LoadAssembly): Correctly return when all the paths
+	have been tried and not before.
+
+	* statement.cs (Switch.Emit): return the actual coverage for this
+	statement (returns/not-returns)
+
+	(Switch.SimpleSwitchEmit): Do not generate jumps to the end of the
+	switch of the statement if we are the last switch section.  That
+	kills two problems: try/catch problems (we used to emit an empty
+	nop at the end) and switch statements where all branches would
+	return. 
+
+2002-03-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs: Add default assemblies (the equivalent to the
+	Microsoft CSC.RSP file)
+
+	* cs-tokenizer.cs: When updating `cols and setting it to zero,
+	also update tokens_seen and set it to false.
+
+	* driver.cs: Implement --recurse for Mike.
+
+	* driver.cs (SplitPathAndPattern): Small bug fix, I was not
+	correctly splitting out the paths.
+
+2002-03-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* interface.cs (Interface.PopulateProperty): Instead of using
+	`parent' as the declaration space for the set parameters, use
+	`this' 
+
+	* support.cs (InternalParameters): InternalParameters constructor
+	takes a DeclSpace instead of a TypeContainer.
+
+	* expression.cs (ArrayCreation.EmitDynamicInitializers): If value
+	types are being initialized, load the address of it before calling
+	the function.  
+
+	(New): Provide a mechanism to disable the generation of local
+	value type temporaries when the caller will be providing us with
+	an address to store it.
+
+	(ArrayCreation.EmitDynamicInitializers): Use it.
+
+2002-03-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Invocation.EmitArguments): Only probe for array
+	property if there is more than one argument.  Sorry about that.
+
+	* class.cs (Invocation.EmitArguments): Fix to emit arguments for
+	empty param arrays.
+	
+	* class.cs (Method.LabelParameters): Fix incorrect code path that
+	prevented the `ParamArrayAttribute' from being applied to the
+	params attribute.
+
+2002-03-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* support.cs (ReflectionParameters): Correctly compute whether the
+	last argument is a params array.  Fixes the problem with
+	string.Split ('a')
+
+	* typemanager.cs: Make the assemblies array always be non-null
+	(empty, but non-null)
+
+	* tree.cs (RecordDecl): New function that abstracts the recording
+	of names.  This reports error 101, and provides a pointer to the
+	previous declaration.  Fixes a crash in the compiler.
+
+	* cs-parser.jay (constructor_declaration): Update to new grammar,
+	and provide a constructor_body that can be empty.
+
+2002-03-15  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs: Add support for --resources.
+
+	* expression.cs: (FetchGetMethod, FetchAddressMethod, EmitAssign):
+	Make all types for the various array helper methods be integer.
+
+	* ecore.cs (Expression.ConvertNumericExplicit): Pass the
+	CheckState to ConvCast.
+
+	(ConvCast): Now it takes a `checked' state argument, to avoid
+	depending on the emit context for the conversion, and just using
+	the resolve time setting.
+
+	* expression.cs (ArrayCreation.EmitArrayArguments): New function,
+	instead of Invocation.EmitArguments.  We do not emit the original
+	arguments, instead we emit those which have been converted to
+	unsigned int expressions.
+
+	* statement.cs (Block.EmitMeta): Drop tracking of indexes.
+
+	* codegen.cs: ditto.
+
+	* expression.cs (LocalVariableReference): Drop the use of the
+	Store function that depended on the variable index.
+
+	* statement.cs (VariableInfo): Drop the `Idx' property from this
+	class, as this is not taking into account the indexes for
+	temporaries tat we generate during the execution, getting the
+	indexes wrong.
+
+	* class.cs: First emit class initializers, then call the parent
+	constructor. 
+
+	* expression.cs (Binary): Fix opcode emision.
+	(UnaryMutator.EmitCode): Support checked code generation
+
+	* ecore.cs (MemberLookup): TypeManager.FindMembers will return
+	matches for events for both the Static and Instance scans,
+	pointing to the same element.   Fix that.
+
+2002-03-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs (ResolveTree): Always set the
+	interface_resolve_order, because nested interfaces will be calling
+	into us.
+
+	* class.cs (GetInterfaceOrClass): Track the same resolution
+	process used by TypeManager.LookupType.  This fixes the nested
+	type lookups in class declarations (separate path from
+	LookupType). 
+
+	(TypeContainer.DefineType): Also define nested interfaces.
+	(TypeContainer.RegisterOrder): New public function used to
+	register the order in which child interfaces need to be closed.
+
+	Nested interfaces need to be closed after their parents have been
+	created. 
+	
+	* interface.cs (InterfaceAttr): Put all the logic for computing
+	the interface attribute here. 
+
+	(DefineInterface): Register our interface order with the
+	RootContext or with the TypeContainer depending on the case.
+
+2002-03-12  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: rework foreach statement to work with the new
+	changes to the policy on SimpleNames.
+	
+	* report.cs: support Stacktrace on warnings as well.
+
+	* makefile: drop --unsafe and /unsafe from the compile.
+
+2002-03-13  Ravi Pratap  <ravi@ximian.com>
+
+	* ecore.cs (StandardConversionExists): Modify to take an Expression
+	as the first parameter. Ensure we do null -> reference type conversion
+	checking.
+
+	* Everywhere : update calls accordingly, making use of MyEmptyExpr to store
+	temporary Expression objects.
+
+Wed Mar 13 12:32:40 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interface.cs: workaround bug in method overloading resolution
+	(there is already a bugzilla bug for it).
+
+2002-03-12  Miguel de Icaza  <miguel@ximian.com>
+
+	We could also solve this problem by having a separate path for
+	performing type lookups, instead of DoResolve, we could have a
+	ResolveType entry point, and only participating pieces of the
+	production (simplename, deref, array) would implement this. 
+	
+	* codegen.cs (EmitContext): New field OnlyLookupTypes used to
+	signal SimpleName to only resolve type names and not attempt to
+	resolve anything else.
+
+	* expression.cs (Cast): Set the flag.
+
+	* ecore.cs (SimpleName): Use the OnlyLookupTypes flag
+
+	* class.cs: Only report 108 if there is no `new' modifier.
+
+	* cs-parser.jay: rework foreach statement to work with the new
+	changes to the policy on SimpleNames.
+	
+	* report.cs: support Stacktrace on warnings as well.
+
+	* makefile: drop --unsafe and /unsafe from the compile.
+
+2002-03-11  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (SimpleName.SimpleNameResolve): Perform local variable
+	lookups here, instead of doing that at parse time.  This means
+	that our grammar will not introduce `LocalVariableReferences' as
+	expressions at this point.  That solves the problem of code like
+	this:
+
+	class X {
+	   static void Main ()
+	   { int X = 1;
+	    { X x = null }}}
+
+	This is only half the fix.  The full fix requires parameters to
+	also be handled in this way.
+
+	* Everywhere: Use ec.DeclSpace on calls to LookupType, as this
+	makes the use more obvious of the DeclSpace.  The
+	ec.TypeContainer.TypeBuilder is now only used to pull the
+	TypeBuilder for it.
+
+	My theory is that I can get rid of the TypeBuilder completely from
+	the EmitContext, and have typecasts where it is used (from
+	DeclSpace to where it matters).  
+
+	The only pending problem is that the code that implements Aliases
+	is on TypeContainer, and probably should go in DeclSpace.
+
+	* ecore.cs (SimpleName.SimpleNameResolve): Perform local variable
+	lookups here, instead of doing that at parse time.  This means
+	that our grammar will not introduce `LocalVariableReferences' as
+	expressions at this point.  That solves the problem of code like
+	this:
+
+	class X {
+	   static void Main ()
+	   { int X = 1;
+	    { X x = null }}}
+
+	This is only half the fix.  The full fix requires parameters to
+	also be handled in this way.
+
+	* class.cs (Property.DefineMethod): When implementing an interface
+	method, set newslot, when implementing an abstract method, do not
+	set the flag (before we tried never setting it, or always setting
+	it, which is the difference).
+	(Indexer.DefineMethod): same.
+	(Method.DefineMethod): same.
+
+	* ecore.cs: Only set the status used flag if we get back a Field.
+
+	* attribute.cs: Temporary hack, so Paolo can keep working.
+
+2002-03-08  Ravi Pratap  <ravi@ximian.com>
+
+	* attribute.cs (Attribute.UnmanagedType): This is to keep track of
+	the unmanaged type in the case we have a MarshalAs attribute.
+
+	(Resolve): Handle the case when we are parsing the special MarshalAs
+	attribute [we need to store the unmanaged type to use later]
+	
+	* typemanager.cs (marshal_as_attr_type): Built in type for the 
+	MarshalAs Attribute.
+
+	* attribute.cs (ApplyAttributes): Recognize the MarshalAs attribute 
+	on parameters and accordingly set the marshalling info.
+	
+2002-03-09  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs: Optimizing slightly by removing redundant code after
+	we switched to the `NoTypes' return value.
+	(Property.DefineMethod): use NoTypes here too.
+
+	This fixes the bug I introduced in my last batch of changes.
+
+2002-03-05  Ravi Pratap  <ravi@ximian.com>
+
+	* tree.cs (RecordEnum): Add. We now keep track of enums too.
+
+	* class.cs (LookupInterfaceOrClass): Check against the list of recorded
+	Enums since those are types too. 
+
+	* cs-parser.jay (enum_declaration): Record enums as we parse them.
+	
+	* enum.cs (DefineEnum): Return if the TypeBuilder has already been defined 
+	thanks to a call during the lookup process.
+
+2002-03-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Foreach): Lots of work to accomodate a particular
+	kind of foreach statement that I had not kept in mind.  It is
+	possible to have foreachs on classes that provide a GetEnumerator
+	method that return objects that implement the "pattern" for using
+	a foreach, there is no need to support GetEnumerator
+	specifically. 
+
+	This is needed to compile nant.
+
+	* decl.cs: Only report 114 if the member is not `Finalize' and if
+	the warning level is at least 2.
+
+	* class.cs: Moved the compare function from Method to
+	MethodSignature. 
+
+	(MethodSignature.InheritableMemberSignatureCompare): Add new
+	filter function that is used to extract inheritable methods from a
+	class. 
+
+	(Method.Define): Use the new `inheritable_method_signature_filter'
+	delegate
+
+	* cs-tokenizer.cs (get_cmd_arg): Do not add white space to the
+	command. 
+
+2002-03-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (Expression.ConvertReferenceExplicit): Removed dead code.
+
+	* cs-parser.jay: Add opt_semicolon to the interface declaration.
+
+	* expression.cs: Pass location information to
+	ConvertImplicitStandard. 
+
+	* class.cs: Added debugging code to track return values from
+	interfaces. 
+
+2002-03-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Is.DoResolve): If either side of the `is' is an
+	interface, do not flag the warning.
+
+	* ecore.cs (ImplicitReferenceConversion): We need a separate test
+	for interfaces
+
+	* report.cs: Allow for --fatal to be used with --probe.
+	
+	* typemanager.cs (NoTypes): Move the definition for the empty Type
+	array here. 
+
+	* class.cs (TypeContainer.FindMembers): Also look for methods defined by
+	properties. 
+	(TypeContainer.DefineProxy): New function used to proxy to parent
+	implementations when implementing interfaces.
+	(TypeContainer.ParentImplements): used to lookup if our parent
+	implements a public function that is required by an interface.
+	(TypeContainer.VerifyPendingMethods): Hook this up.
+
+	* typemanager.cs (TypeManager, AddModule, AddAssembly): Make the
+	`modules' and `assemblies' arraylists into arrays.  We only grow
+	these are the very early start up of the program, so this improves
+	the speedof LookupType (nicely measured).
+
+	* expression.cs (MakeByteBlob): Replaced unsafe code with
+	BitConverter, as suggested by Paolo.
+
+	* cfold.cs (ConstantFold.Binary): Special case: perform constant
+	folding of string concatenation, but if either side is a string,
+	and the other is not, then return null, and let the runtime use
+	the concatenation on the string plus the object (using
+	`Object.ToString'). 
+
+2002-03-04  Miguel de Icaza  <miguel@ximian.com>
+
+	Constant Folding has been implemented now.
+	
+	* expression.cs (Unary.Reduce): Do not throw an exception, catch
+	the error instead on types that are not supported in one's
+	complement. 
+
+	* constant.cs (Constant and all children): New set of functions to
+	perform implict and explicit conversions.
+	
+	* ecore.cs (EnumConstant): Implement the new functions to perform
+	conversion by proxying to the child expression.
+
+	* codegen.cs: (ConstantCheckState): Constant evaluation has its
+	own separate setting that can not be turned off from the command
+	line using --unchecked or --checked and is only controlled using
+	the checked/unchecked statements and expressions.  This setting is
+	used by the constant folder to flag errors.
+
+	* expression.cs (CheckedExpr, UncheckedExpr): Set the
+	ConstantCheckState as well.   
+
+	During Resolve, they also have to flag the state, because the
+	constant folder runs completely in the Resolve phase.
+
+	* statement.cs (Checked, Unchecked): Set the ConstantCheckState as
+	well.
+
+2002-03-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* cfold.cs: New file, this file contains the constant folder.
+	
+	* ecore.cs (IMemoryLocation.AddressOf): Now takes an extra
+	argument to track whether we are using the resulting address to
+	load or store a value and provide better error messages. 
+
+	(FieldExpr.Emit, FieldExpr.EmitAssign, FieldExpr.AddressOf): Use
+	new AddressOf arguments.
+
+	* statement.cs (Foreach.EmitCollectionForeach): Update
+
+	* expression.cs (Argument.Emit): Call AddressOf with proper
+	arguments to track usage.
+
+	(New.DoEmit): Call AddressOf with new arguments.
+
+	(Unary.Emit): Adjust AddressOf call.
+
+2002-03-01  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (member_access): Change the case for pre-defined types
+	to use a MemberAccess instead of a SimpleName. Thanks to Felix again for 
+	this suggestion.
+
+	* class.cs (Operator::Emit): If we are abstract or extern, we don't have
+	a method body.
+
+	* attribute.cs (CheckAttribute, ApplyAttribute): Ensure that we treat operators
+	essentially like methods and apply attributes like MethodImplOptions to them too.
+
+	* ecore.cs (SimpleName.SimpleNameResolve): Perform a check on ec.TypeContainer.TypeBuilder
+	not being null.
+
+	* codegen.cs (EmitContext): The constructor now takes in an extra argument specifying the
+	DeclSpace as the distinction is important. We provide sane defaults as usually the TypeContainer
+	is the DeclSpace.
+
+	* Update code everywhere accordingly.
+
+	* ecore.cs : Change references to ec.TypeContainer to ec.DeclSpace where appropriate.
+
+	* cs-parser.jay (enum_declaration): Set the current namespace of the enum.
+
+2002-02-28  Ravi Pratap  <ravi@ximian.com>
+
+	* rootcontext.cs (LookupType): As we cycle through the chain of namespaces
+	try performing lookups against those instead of jumping straight into using
+	the 'using' clauses.
+
+	(ImplicitParent): Add. Thanks to Felix Arrese-Igor for this idea.
+
+	(LookupType): Perform lookups in implicit parents too.
+
+	* class.cs (GetInterfaceOrClass): Modify to perform the exact same lookup
+	sequence as RootContext.LookupType. 
+
+	* rootcontext.cs (NamespaceLookup): Split out code from LookupType which tries 
+	the various cases of namespace lookups into this method.
+
+2002-03-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Add support for [Attribute ()] (empty arguments
+	in positional arguments)
+
+	* class.cs (Operator): Update the AllowedModifiers to contain
+	extern. 
+
+	* cs-parser.jay: Update operator declaration to allow for the
+	operator body to be empty.
+
+	* cs-tokenizer.cs: Added '\u' unicode support in strings and hex
+	values. 
+
+2002-02-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Method.Emit): Label parameters.
+
+	* driver.cs: Return 1 or 0 as the program exit code.
+
+2002-02-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: Special case the `null' object when trying to
+	auto-compute the type, as anything can be explicitly converted to
+	that. 
+
+	* ecore.cs (Expression.ConvertExplicit): Bug fix, thanks for
+	spotting this Paolo.
+
+	(Expression.ImplicitNumericConversion): Perform comparissions of
+	the type using the underlying type in the case of an enumeration
+	rather than using the enumeration type for the compare.
+
+	Cope with the underlying == type case, which is not possible to
+	catch before. 
+
+	(Expression.ConvertNumericExplicit): Perform comparissions of
+	the type using the underlying type in the case of an enumeration
+	rather than using the enumeration type for the compare.
+
+	* driver.cs: If the user does not supply an extension, assume .exe
+
+	* cs-parser.jay (if_statement): Rewrote so that we can track the
+	location for the if statement.
+
+	* expression.cs (Binary.ConstantFold): Only concat strings when
+	the operation is "+", not everything ;-)
+
+	* statement.cs (Statement.EmitBoolExpression): Take a location
+	argument. 
+	(If, While, Do): Track location.
+
+	* expression.cs (Binary.ResolveOperator): In the object + string
+	case, I was missing a call to ConvertImplicit
+
+2002-02-25  Ravi Pratap  <ravi@ximian.com>
+
+	* parameter.cs (Parameter.ExternalType): Take in extra DeclSpace and
+	Location arguments. Ensure we use RootContext.LookupType to do our work
+	and not try to do a direct Type.GetType and ModuleBuilder.GetType
+
+	* interface.cs (PopulateMethod): Handle the type of the parameter being
+	null gracefully.
+
+	* expression.cs (Invocation.BetterFunction): Handle the case when we 
+	have a params method with no fixed arguments and a call is made with no
+	arguments.
+
+2002-02-25  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-tokenizer.cs: Add support for the quote-escape-sequence in
+	the verbatim-string-literal
+
+	* support.cs (InternalParameters.ParameterModifier): handle null
+	fixed parameters.
+	(InternalParameters.ParameterType): ditto.
+
+	* parameter.cs (VerifyArgs): Also check if the fixed parameter is
+	duplicating the name of the variable parameter.
+	(GetParameterByName): Fix bug where we were not looking up array
+	paramters if they were the only present (thanks Paolo!).
+	(GetParameterInfo): We only have an empty set of types if both
+	fixed and array are set to null.
+	(GetParameterInfo-idx): Handle FixedParameter == null
+
+	* cs-parser.jay: Handle the case where there is no catch
+	statements (missing null test).
+
+2002-02-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs (MainDriver): Be conservative on our command line
+	handling.
+
+	Catch DirectoryNotFoundException when calling GetFiles.
+	
+	(SplitPathAndPattern): Used to split the input specification into
+	a path and a pattern that we can feed to Directory.GetFiles.
+
+2002-02-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Fixed): Implement the last case of the Fixed
+	statement (string handling).
+
+	* expression.cs (StringPtr): New class used to return a char * to
+	a string;  Used by the Fixed statement.
+
+	* typemanager.cs: Add char_ptr_type.  Add get_OffsetToStringData method.
+
+	* expression.cs (Binary.ResolveOperator): Remove redundant
+	MemberLookup pn parent type.
+	Optimize union call, we do not need a union if the types are the same.
+	(Unary.ResolveOperator): REmove redundant MemberLookup on parent
+	type.
+
+	Specialize the use of MemberLookup everywhere, instead of using
+	the default settings. 
+
+	(StackAlloc): Implement stackalloc keyword.
+
+	* cs-parser.jay: Add rule to parse stackalloc.
+	
+	* driver.cs: Handle /h, /help, /?
+
+	* expression.cs (MakeByteBlob): Removed the hacks we had in place
+	before we supported unsafe code.
+	
+	* makefile: add --unsafe to the self compilation of mcs.
+
+2002-02-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (PointerArithmetic): New class that is used to
+	perform pointer arithmetic.
+	(Binary.Resolve): Handle pointer arithmetic
+	Handle pointer comparission.
+	(ArrayPtr): Utility expression class that is used to take the
+	address of an array.
+
+	(ElementAccess): Implement array access for pointers
+	
+	* statement.cs (Fixed): Implement fixed statement for arrays, we
+	are missing one more case before we are done.
+
+	* expression.cs (Indirection): Implement EmitAssign and set the
+	ExprClass to Variable.  This allows pointer dereferences to be
+	treated as variables, and to have values assigned to them.
+	
+	* ecore.cs (Expression.StoreFromPtr): New utility function to
+	store values dereferencing.
+
+2002-02-20  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Binary.ResolveOperator): Ensure that we are
+	not trying to operate on a void type - this fixes the reported
+	bug.
+
+	* decl.cs (CheckMethodAgainstBase): Do not allow overriding if
+	the parent implementation is sealed.
+
+	* ../errors/cs0239.cs : Add.
+
+	* attribute.cs (ApplyAttributes): Handle Modulebuilders too.
+
+	* typemanager.cs (unverifiable_code_type): Corresponds to 
+	System.Security.UnverifiableCodeAttribute. We need to emit this for modules
+	which have unsafe code in them.
+
+	* rootcontext.cs (EmitCode): Emit the above attribute when we are in an 
+	unsafe context.
+
+2002-02-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-tokenizer.cs: Add support for @"litreal strings"
+
+	Make tokenizer accept pre-processor directives
+	on any column (remove the old C-like limitation). 
+
+	* rootcontext.cs (EmitCode): Emit any global attributes.
+	(AddGlobalAttributes): Used to keep track of assembly attributes. 
+
+	* attribute.cs (ApplyAttributes): Support AssemblyAttributes.
+
+	* cs-parser.jay: Add support for global attributes.  
+
+2002-02-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Indirection): New helper class.  Unary will
+	create Indirection classes to be able to implement the
+	IMemoryLocation interface on it.
+
+2002-02-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay (fixed_statement): reference the right statement.
+
+	* statement.cs (Fixed.Emit): Finish implementing the fixed
+	statement for the &x case.
+
+2002-02-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Property.Define, Method.Define): Remove newslot when
+	`implementing'.  
+
+	* modifiers.cs: My use of NewSlot when `Abstract' was set was
+	wrong.  NewSlot should only be used if the `new' keyword is present.
+
+	* driver.cs (GetSystemDir): Use CodeBase instead of FullName for
+	locating our system dir.  Sorry about this.
+
+2002-02-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs (GetSystemDir): Compute correctly the location of our
+	system assemblies.  I was using the compiler directory instead of
+	the library directory.
+
+2002-02-13  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (BetterFunction): Put back in what Miguel commented out
+	since it is the correct fix. The problem is elsewhere ;-)
+
+	(IsParamsMethodApplicable): Fix bug where we were not checking that the fixed
+	parameters of the parms method are themselves compatible or not !
+
+	(StandardConversionExists): Fix very dangerous bug where we were forgetting
+	to check that a class implements an interface before saying that an implicit
+	conversion was allowed. Use ImplementsInterface to do the checking.
+
+2002-02-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Method.Define): Track whether we are an explicit
+	implementation or not.  And only call DefineMethodOverride if we
+	are an explicit implementation.
+
+	(Property.DefineMethod): Ditto.
+
+2002-02-11  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (BetterFunction): Catch hideous bug which was
+	 preventing us from detecting ambiguous calls due to implicit casts i.e
+	cs0121.
+
+2002-01-29  Miguel de Icaza  <miguel@ximian.com>
+
+	* support.cs (Pair): Remove un-needed method.  I figured why I was
+	getting the error in cs-parser.jay, the variable in a foreach loop
+	is readonly, and the compiler does not really treat this as a variable.
+
+	* cs-parser.jay (fixed_statement): Fix grammar.  Use ASSIGN
+	instead of EQUALS in grammar.  
+
+	* typemanager.cs (VerifyUnmanaged): Report correct error (208)
+
+	* expression.cs (Unary.DoResolve): Check whether the argument is
+	managed or not.
+
+2002-01-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* support.cs: Api for Pair to set a value.  Despite the fact that
+	the variables are public the MS C# compiler refuses to compile
+	code that accesses the field if the variable is part of a foreach
+	statement. 
+
+	* statement.cs (Fixed): Begin implementation of the fixed
+	statement.
+
+	(Block.AddVariable): Return the VariableInfo on success and null
+	on failure instead of true/false. 
+
+	* cs-parser.jay (foreach): Catch errors on variables already
+	defined (we were ignoring this value before) and properly unwind
+	the block hierarchy
+
+	(fixed_statement): grammar for the fixed statement.
+
+2002-01-25  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (UnaryMutator.IsIncrementableNumber): Allow also
+	pointer types to be incretemented.
+
+	(SizeOf): Implement.
+
+	* cs-parser.jay (pointer_member_access): Implement
+	expr->IDENTIFIER production.
+
+	* expression.cs (IndexerAccess.DoResolve, ArrayAccess.DoResolve,
+	MemberAccess.DoResolve, Invocation.DoResolve): Check for pointers
+	on safe contexts.
+
+	(Unary): Implement indirection.
+
+	* ecore.cs (Expression.UnsafeError): Reports error 214 (pointer
+	use in non-unsafe context).
+
+	(SimpleName.DoResolve): Check for pointers in field access on safe
+	contexts. 
+
+	(Expression.LoadFromPtr): Factor the load-indirect code in this
+	function.  This was duplicated in UnboxCast and ParameterReference
+
+2002-01-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (ComposedCast): report an error if a pointer cast
+	is used in a safe region.
+
+	* ecore.cs (Expression.ConvertExplicit): Add rules for implicit
+	pointer type casts in unsafe context.
+
+	* codegen.cs (EmitContext): Set up IsUnsafe.
+
+	* cs-parser.jay (non_expression_type): Add productions for pointer
+	casts. 
+
+	* expression.cs (Invocation.EmitCall): Remove chunk of buggy
+	code.  We should not use force into static mode if the method is
+	not virtual.  Fixes bug in MIS
+
+	* statement.cs (Do.Emit, While.Emit, For.Emit,
+	Statement.EmitBoolExpression): Add support to Do and While to
+	propagate infinite loop as `I do return' semantics.
+
+	Improve the For case to also test for boolean constants.
+
+	* attribute.cs (Attribute.ApplyAttributes): Add ParameterBuilder
+	to the list of attributes we can add.
+
+	Remove `EmitContext' argument.
+
+	* class.cs (Method.Define): Apply parameter attributes.
+	(Constructor.Define): Apply parameter attributes.
+	(MethodCore.LabelParameters): Move here the core of labeling
+	parameters. 
+
+	* support.cs (ReflectionParameters.ParameterModifier,
+	InternalParameters.ParameterModifier): Use IsByRef on the type and
+	only return the OUT bit for these parameters instead of in/out/ref
+	flags.
+
+	This is because I miss-understood things.  The ParameterInfo.IsIn
+	and IsOut represent whether the parameter has the [In] and [Out]
+	attributes set.  
+
+2002-01-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (FieldExpr.Emit): Release temporaries.
+
+	* assign.cs (LocalTemporary.Release): new function.
+
+	* codegen.cs (EmitContext.GetTemporaryStorage,
+	EmitContext.FreeTemporaryStorage): Rework the way we deal with
+	temporary storage.  Now we can "put back" localbuilders when we
+	are done with them
+
+2002-01-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (FieldExpr.Emit): Handle initonly fields specially: we
+	need to make a copy of the variable to generate verifiable code.
+
+2002-01-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs: Compute dynamically the system directory.
+
+	* ecore.cs (CopyNewMethods): reworked, exposed, made public.
+	Slower, but more generally useful.  Used by the abstract
+	registering implementation. 
+
+	* expression.cs (ResolveMemberAccess): Reorder the way we evaluate
+	the rules for the special rule on Type/instances.  First check if
+	we have the same name, and if so, try that special static path
+	rather than the instance path.
+	
+2002-01-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Emit 642 (warning: possible empty statement) for
+	for, while and if.
+
+	* class.cs (TypeBuilder.DefineType): Do not allow inheritance from
+	Enum, ValueType, Delegate or Array for non-corlib compiles.
+
+	* cs-tokenizer.cs: Catch long identifiers (645)
+
+	* typemanager.cs (IndexerPropetyName): Ravi never tested this
+	piece of code.
+
+	* class.cs (TypeContainer.RegisterRequiredImplementations): Bug
+	fix, we were returning too early, so we were not registering
+	pending methods from abstract classes.
+
+	Do not register pending methods if the class is abstract.
+
+	* expression.cs (Conditional.DoResolve): Report circular implicit
+	conversions when we neecd to compute it for conditional
+	expressions. 
+
+	(Is.DoResolve): If the expression is always of the provided type,
+	flag warning 183.  If the expression can not ever be of the
+	provided type flag warning 184.
+
+	* class.cs: Catch 169 as well.
+
+	* ecore.cs (FieldExpr): For now in AddressOf mark as assigned and
+	read. 
+
+2002-01-18  Nick Drochak  <ndrochak@gol.com>
+
+	* makefile: remove path to beta2 csc.exe.  path to csc.exe must be in PATH instead.
+
+2002-01-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* interface.cs: (PopulateMethod): Check for pointers being defined
+	only if the unsafe context is active.
+	(PopulateProperty): ditto.
+	(PopulateIndexer): ditto.
+
+	* class.cs (Method, Method.Define): Allow `unsafe' modifier to be
+	specified.  If pointers are present, make sure that they are
+	present in an unsafe context.
+	(Constructor, Constructor.Define): ditto.
+	(Field, Field.Define): ditto.
+	(Property, Property.Define): ditto.
+	(Event, Event.Define): ditto.
+
+	* interface.cs (Interface.GetInterfaceTypeByName): Only lookup the
+	hashtable if there are classes or structs defined.
+
+	* expression.cs (LocalVariableReference.DoResolve): Simplify this
+	code, as the constant resolution moved.
+
+	* statement.cs (Block.EmitMeta): Resolve all constants as we emit
+	the metadata, so we can flag error 133. 
+
+	* decl.cs (MemberCore.UnsafeOK): New function to test that a
+	pointer is being declared in an unsafe context.
+
+2002-01-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* modifiers.cs (Modifiers.Check): Require a Location argument.
+	Report error 227 for Unsafe use.
+
+	* typemanager.cs: Remove IsPointerType, we should be using Type.IsPointer
+
+	* statement.cs (For.Emit): If the test is null, then report that
+	we do `return', as we wont reach anything afterwards.
+
+	(Switch.SwitchGoverningType): Track the expression that matched
+	the conversion.
+
+	* driver.cs: Allow negative numbers as an error code to flag.
+
+	* cs-parser.jay: Handle 1551.
+
+	* namespace.cs: Add 1537 checking (repeated using alias namespaces).
+
+2002-01-15  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Report 1518 (type declaration can only contain
+	class, struct, interface, enum or delegate)
+
+	(switch_label): Report 1523 (keywords `case' or `default' must
+	preced code)
+
+	(opt_switch_sections): Report 1522 (empty switch)
+
+	* driver.cs: Report 1515 (response file specified multiple times)
+	Report 1516 (Source file specified multiple times).
+
+	* expression.cs (Argument.Resolve): Signal 1510
+
+	(BaseAccess.Resolve, BaseIndexer.Resolve): Signal 1511 (base
+	access not allowed in static code)
+
+2002-01-11  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (IsPointerType): Utility method which we are going
+	to need a lot.
+
+	* ecore.cs (ImplicitReferenceConversion): A pointer type cannot be cast to
+	the object type, so we take care of that.
+
+	* expression.cs (FullMethodDesc): Also include the return type in descriptions.
+	
+	* support.cs (ParameterDesc): Fix minor bug which was causing params tags to be
+	added to non-params parameters :-)
+
+	* typemanager.cs (CSharpName): Include 'void' type too.	
+
+	(void_ptr_type): Include in the set of core types.
+
+	* ecore.cs (ConvertImplicit): Make use of ConvertImplicitStandard instead of 
+	duplicating code.
+
+	(ConvertImplicitStandard): Handle standard implicit pointer conversions when we have 
+	an unsafe context.
+
+	* cs-parser.jay (local_variable_pointer_type): Add support for 'void *' as I had 
+	completely forgotten about it.
+
+2002-01-10  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (pointer_type): Add. This begins our implementation
+	of parsing rules for unsafe code.
+
+	(unsafe_statement): Implement.
+
+	(embedded_statement): Modify to include the above.
+
+	* statement.cs (Unsafe): Implement new class for unsafe blocks.
+
+	* codegen.cs (EmitContext.InUnsafe): Add. This determines
+	if the current context is an unsafe one.
+
+	* cs-parser.jay (local_variable_pointer_type): Since local variable types
+	are handled differently, we need separate rules for them.
+
+	(local_variable_declaration): Update to use local_variable_pointer_type
+	to allow variable declarations of unmanaged pointer types.
+
+	* expression.cs (Unary.ResolveOperator): Ensure that the '&' operator is used only
+	in unsafe contexts.
+
+	* ../errors/cs0214.cs : Add.
+
+2002-01-16  Nick Drochak  <ndrochak@gol.com>
+
+	* makefile: remove 'response' file when cleaning.
+
+2002-01-15  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Report 1524.
+
+2002-01-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (RegisterMethod): drop checking if we have
+	registered this from here
+
+2002-01-12  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Method.EmitDestructor): Implement calling our base
+	destructor. 
+
+	* statement.cs (Try.Emit): Fix to reset the InFinally to the old
+	value of InFinally.
+
+	* codegen.cs (EmitContext.EmitTopBlock): Destructors will call
+	this routine and will wrap the call in a try/catch block.  Deal
+	with the case.
+
+2002-01-11  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (Expression.MemberLookup): instead of taking a
+	parameter `same_type' that was used to tell whether we could
+	access private members we compute our containing type from the
+	EmitContext.
+
+	(FieldExpr): Added partial support for volatile fields.  This does
+	not work for volatile fields exposed from assemblies, as I can not
+	figure out how to extract the modreq from it.
+
+	Updated all the source files to use this.
+
+	* codegen.cs (EmitContext): Compute ContainerType ahead of time,
+	because it is referenced by MemberLookup very often. 
+
+2002-01-09  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (IndexerPropertyName): If we have a TypeBuilder, use
+	TypeBuilder.GetCustomAttributes to retrieve what we need.
+
+	Get rid of redundant default_member_attr_type as this is the same as
+	default_member_type which already exists.
+
+	* interface.cs, attribute.cs : Update accordingly.
+	
+2002-01-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs: Enable IndexerPropertyName again.  It does not
+	work for TYpeBuilders though.  Ravi, can you please fix this?
+
+	* cs-tokenizer.cs: Accept _ as a name in pp-expressions.
+
+	* expression.cs (Argument.Emit): Handle the case of ref objects
+	being passed to ref functions;  
+
+	(ParameterReference.EmitLoad): Loads the content of the pointer
+	without dereferencing.
+
+2002-01-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-tokenizer.cs: Implemented the pre-processing expressions.
+
+2002-01-08  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Indexer.DefineMethod): Incorporate the interface
+	type in the name of the method if we are doing explicit interface
+	implementation.
+
+	* expression.cs (ConversionExists): Remove as it is completely obsolete.
+
+	(BetterConversion): Fix extremely trivial bug where we were referring to
+	ConversionExists instead of StandardConversionExists ! Hooray, things are fine
+	again !
+
+	* ../errors/bug16.cs : Add although we have fixed it.
+
+2002-01-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (BaseIndexer): Begin implementation.
+
+	* class.cs (TypeContainer.IsInterfaceMethod): Bug fix.
+
+	* cs-parser.jay (indexer_declarator): Use qualified_identifier
+	production directly to remove a shift/reduce, and implement
+	explicit interface implementation.
+
+	* cs-tokenizer.cs: Fix tokenizer, it was consuming one extra char
+	after a floating point suffix.
+
+	* expression.cs (DoNumericPromotions): Improved the conversion for
+	uint/uint.  If we have a constant, we avoid doing a typecast to a
+	larger type.
+
+	* class.cs (Indexer): Implement explicit interface implementation
+	for indexers.
+	
+Sat Jan 5 16:08:23 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.cs: make the default instance constructor public and hidebysig.
+
+2001-01-03  Ravi Pratap  <ravi@ximian.com>
+
+	* interface.cs (EmitDefaultMemberAttr): Make this helper method static
+	so we can call it from elsewhere.
+
+	* class.cs (TypeContainer.Emit): Emit the attribute here too. The rule is that
+	we emit it internally if the class has a defined indexer; otherwise the user
+	emits it by decorating the class definition with the DefaultMemberAttribute.
+
+	* attribute.cs (ApplyAttributes): Perform checks to see that the DefaultMember
+	attribute is not used on a type which defines an indexer.
+
+	* cs-tokenizer.cs (get_cmd_arg): Ensure we trim whitespace and also include the tab
+	character when we skip whitespace.
+
+	* ../errors/cs0646.cs : Add.
+
+2002-01-03  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (SimpleName.ResolveSimpleName): Report error 120
+	again. 
+
+	* makefile: Add practical target `mcs3.exe' which builds the third
+	generation compiler. 
+
+	* expression.cs (New): Fix structures constructor calling.
+
+	* class.cs (Property, Method, Indexer): Emit Final flag on the
+	method if we are an interface implementation and we are not
+	abstract. 
+
+	* ecore.cs (PropertyExpr): New public field `IsBase', tells
+	whether this property is referencing a `base' method.
+
+	* expression.cs (Invocation.EmitCall): take an extra argument:
+	is_base, this is used to determine whether the `call' or
+	`callvirt' opcode should be used.
+
+	
+	* delegate.cs: update EmitCall.
+
+	* class.cs (Method.Define): Set NewSlot for the cases where we are
+	not implementing an interface method.
+
+	(Property.Define): ditto.
+
+2002-01-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-tokenizer.cs: (Tokenizer.escape): Escape '\r' as '\r' not as
+	'r'.  Allows mcs to parse itself fully.
+
+2002-01-02  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (ArrayCreation.num_automatic_initializers): Keep track
+	of the number of initializers that require the InitializeArray method.
+
+	(CheckIndices): Store the Expression in all cases - not the plain value. Also
+	update the above field where necessary.
+
+	(MakeByteBlob): Update accordingly.
+
+	(DoEmit): Call EmitStaticInitializers only if the number of initializers is 
+	greater than 2.
+
+	(EmitDynamicInitializers): Update in accordance with the new optimization.
+
+	(ArrayAccess.EmitStoreOpcode): Include char type along with short and ushort - the
+	same OpCode applies.
+
+	* cs-parser.jay : Fix some glaring errors I introduced.
+
+2002-01-01  Ravi Pratap  <ravi@ximian.com> 
+
+	* parameters.cs (AddVariable, AddConstant): Pass in current_local_parameters
+	so that we can check for name clashes there too.
+
+	* typemanager.cs (default_member_attr_type): The attribute that we need to emit
+	for interface indexers.
+
+	* interfaces.cs (Define): Emit the default member attribute.
+
+	* expression.cs (MakeByteBlob): Fix extremely trivial bug where the wrong
+	variable was being referred to while setting the value ;-)
+
+2002-01-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (MakeByteBlob): Optimize: we do not need to fill
+	byte-by-byte information when we know the data is zero.
+
+	Make the block always a multiple of 4, because
+	DefineInitializedData has a bug.
+
+	* assign.cs: Fix, we should assign from the temporary, not from
+	the source. 
+
+	* expression.cs (MakeByteBlob): Fix my incorrect code.
+
+2001-12-31  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (EnumToUnderlying): This function is used to get
+	the underlying type from an enumeration, because it does not
+	always work. 
+
+	* constant.cs: Use the I4_S form for values between -128 and 127.
+
+	* statement.cs (Block.LookupLabel): Looks up a label.
+	(Block): Drop support for labeled blocks.
+
+	(LabeledStatement): New kind of statement that represents a label
+	only.
+
+	(Goto): Finally implement this bad boy.
+	
+	* cs-parser.jay: Update to reflect new mechanism to implement
+	labels.
+
+2001-12-30  Miguel de Icaza  <miguel@ximian.com>
+
+	* codegen.cs (EmitContext.This): a codegen property that keeps the
+	a single instance of this instead of creating many different this
+	instances. 
+
+	* delegate.cs (Delegate.DoResolve): Update to use the property;
+
+	* ecore.cs (SimpleName.SimpleNameResolve): Ditto
+
+	* expression.cs (BaseAccess.DoResolve): Ditto.
+
+2001-12-29  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (methodimpl_attr_type): Add to hold the type
+	corresponding to System.Runtime.CompilerServices.MethodImplAttribute.
+
+	(InitCoreTypes): Update accordingly.
+
+	* attribute.cs (Resolve): Remember if the attribute is a MethodImplAttribute
+	so we can quickly store the state.
+
+	(ApplyAttributes): Set the correct implementation flags
+	for InternalCall methods.
+
+2001-12-29  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (EmitCall): if a method is not virtual, then do
+	not use callvirt on it.
+
+	(ArrayAccess.EmitAssign): storing non-builtin value types (ie,
+	user defined stuff) requires the use of stobj, which takes an
+	address on the stack instead of an array and an index.  So emit
+	the Ldelema operation for it.
+
+	(EmitStoreOpcode): Use stobj for valuetypes.
+
+	(UnaryMutator.EmitCode): Use the right 1 value depending on
+	whether we are dealing with int64/uint64, float or doubles.
+
+	* class.cs (TypeContainer.AddConstructor): Fix the logic to define
+	constructors that I implemented last night.
+
+	(Constructor.IsDefault): Fix to work properly for static
+	constructors.
+
+	* cs-parser.jay (CheckDef): report method signature errors.
+	Update error number 103 to be 132.
+
+	* decl.cs: New AdditionResult enumeration value: MethodExists.
+	Although we do this check for methods later on in the semantic
+	analysis, catching repeated default constructors is so easy that
+	we catch these here. 
+	
+	* expression.cs (Binary.DoNumericPromotions): Fix the uint64 type
+	promotions code.
+
+	(ParameterReference.EmitAssign, Emit): handle
+	bools as bytes.
+
+	(ArrayAccess.EmitLoadOpcode): Handle bool type here.
+	(ArrayAccess.EmitStoreOpcode): ditto.
+
+	* cs-tokenizer.cs (is_punct): Eliminated empty computation.
+
+	* expression.cs (MakeByteBlob): Complete all the missing types
+	(uint, short, ushort, byte, sbyte)
+
+	* class.cs: Only init instance field initializers on instance
+	constructors. 
+
+	Rename `constructors' to instance_constructors. 
+
+	(TypeContainer.AddConstructor): Only add constructors to the list
+	if it is not static.
+
+	Make sure that we handle default_static_constructor independently
+	everywhere where we handle instance_constructors
+
+2001-12-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs: Do not lookup or create a base initializer for a
+	static constructor.
+
+	(ConstructorInitializer.Resolve): use the proper type to lookup
+	for constructors.
+
+	* cs-parser.jay: Report error 1585 (modifiers between type and name).
+
+	* enum.cs, interface.cs: Remove CloseType, this is taken care by
+	in DeclSpace. 
+
+	* decl.cs: CloseType is now an virtual method, the default
+	implementation just closes this type.
+	
+2001-12-28  Ravi Pratap  <ravi@ximian.com>
+
+	* attribute.cs (DefinePInvokeMethod): Set the implementation flags
+	to PreserveSig by default. Also emit HideBySig on such methods.
+
+	Basically, set the defaults to standard values.
+
+	* expression.cs (Invocation.BetterFunction): We need to make sure that for each
+	argument, if candidate is better, it can't be worse than the best !
+
+	(Invocation): Re-write bits to differentiate between methods being
+	applicable in their expanded form and their normal form - for params
+	methods of course.
+
+	Get rid of use_standard everywhere as only standard conversions are allowed
+	in overload resolution. 
+
+	More spec conformance.
+	
+2001-12-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs: Add --timestamp, to see where the compiler spends
+	most of its time.
+
+	* ecore.cs (SimpleName.DoResolve): Do not create an implicit
+	`this' in static code.
+
+	(SimpleName.DoResolve): Implement in terms of a helper function
+	that allows static-references to be passed upstream to
+	MemberAccess.
+
+	(Expression.ResolveWithSimpleName): Resolve specially simple
+	names when called by MemberAccess to implement the special
+	semantics. 
+
+	(Expression.ImplicitReferenceConversion): Handle conversions from
+	Null to reference types before others, as Null's type is
+	System.Object. 
+
+	* expression.cs (Invocation.EmitCall): Handle the special case of
+	calling methods declared on a reference type from a ValueType
+	(Base classes System.Object and System.Enum)
+
+	(MemberAccess.Resolve): Only perform lookups on Enumerations if
+	the left hand side is a TypeExpr, not on every enumeration. 
+
+	(Binary.Resolve): If types are reference types, then do a cast to
+	object on operators != and == of both arguments.
+	
+	* typemanager.cs (FindMembers): Extract instance and static
+	members if requested.
+
+	* interface.cs (PopulateProperty): Use void_type instead of null
+	as the return type for the setter method.
+
+	(PopulateIndexer): ditto.
+
+2001-12-27  Ravi Pratap  <ravi@ximian.com>
+
+	* support.cs (ReflectionParameters): Fix minor bug where we
+	were examining the wrong parameter for the ParamArray attribute.
+
+	Cope with requests for the type of the parameter at position
+	greater than the params parameter's. We now return the element
+	type of the params array as that makes more sense.
+
+	* expression.cs (Invocation.IsParamsMethodApplicable): Update 
+	accordingly as we no longer have to extract the element type
+	ourselves.
+
+	(Invocation.OverloadResolve): Update.
+
+2001-12-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Foreach.GetEnumeratorFilter): Do not compare
+	against IEnumerator, test whether the return value is a descendant
+	of the IEnumerator interface.
+
+	* class.cs (Indexer.Define): Use an auxiliary method to implement
+	the other bits of the method definition.  Begin support for
+	explicit interface implementation.
+
+	(Property.DefineMethod): Use TypeManager.void_type instead of null
+	for an empty return value.
+
+2001-12-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (MemberAccess.ResolveMemberAccess): if we are
+	dealing with a FieldExpr which is composed of a FieldBuilder, in
+	the code path we did extract the constant, but we should have
+	obtained the underlying value to be able to cast it (otherwise we
+	end up in an infinite loop, this is what Ravi was running into).
+
+	(ArrayCreation.UpdateIndices): Arrays might be empty.
+
+	(MemberAccess.ResolveMemberAccess): Add support for section
+	14.5.4.1 that deals with the special case of E.I when E is a type
+	and something else, that I can be a reference to a static member.
+
+	(ArrayCreation.MakeByteBlob): It is not an error to not be able to
+	handle a particular array type to create byte blobs, it is just
+	something we dont generate byteblobs for.
+
+	* cs-tokenizer.cs (get_cmd_arg): Ignore \r in commands and
+	arguments. 
+
+	* location.cs (Push): remove the key from the hashtable that we
+	are about to add.   This happens for empty files.
+
+	* driver.cs: Dispose files after we have parsed them.
+
+	(tokenize): new function that only runs the tokenizer on its
+	input, for speed testing.
+
+2001-12-26  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Event.Define): Define the private field only if there
+	are no accessors defined.
+
+	* expression.cs (ResolveMemberAccess): If there is no associated
+	field with the event, that means we have an event defined with its
+	own accessors and we should flag error cs0070 since transforming
+	ourselves into a field is not valid in that case.
+
+	* ecore.cs (SimpleName.DoResolve): Same as above.
+
+	* attribute.cs (DefinePInvokeMethod): Set the default calling convention
+	and charset to sane values.
+
+2001-12-25  Ravi Pratap  <ravi@ximian.com>
+
+	* assign.cs (DoResolve): Perform check on events only if they 
+	are being accessed outside the declaring type.
+
+	* cs-parser.jay (event_declarations): Update rules to correctly
+	set the type of the implicit parameter etc.
+
+	(add_accessor, remove_accessor): Set current local parameters.
+
+	* expression.cs (Binary): For delegate addition and subtraction,
+	cast the return value from the method into the appropriate delegate
+	type.
+
+2001-12-24  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (RegisterDelegateData, GetDelegateData): Get rid
+	of these as the workaround is unnecessary.
+
+	* delegate.cs (NewDelegate.DoResolve): Get rid of bits which registered
+	delegate data - none of that is needed at all.
+
+	Re-write bits to extract the instance expression and the delegate method
+	correctly.
+
+	* expression.cs (Binary.ResolveOperator): Handle the '-' binary operator 
+	on delegates too.
+
+	* attribute.cs (ApplyAttributes): New method to take care of common tasks
+	of attaching attributes instead of duplicating code everywhere.
+
+	* everywhere : Update code to do attribute emission using the above method.
+
+2001-12-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (IsParamsMethodApplicable): if there are not
+	parameters, return immediately.
+
+	* ecore.cs: The 0 literal can be implicity converted to an enum
+	type. 
+
+	(SimpleName.DoResolve): First lookup the type, then lookup the
+	members. 
+
+	(FieldExpr.Emit): If the InstanceExpression is a ValueType, we
+	want to get its address.  If the InstanceExpression is not
+	addressable, store the result in a temporary variable, then get
+	the address of it.
+
+	* codegen.cs: Only display 219 errors on warning level or above. 
+
+	* expression.cs (ArrayAccess): Make it implement the
+	IMemoryLocation interface.
+
+	(Binary.DoResolve): handle the operator == (object a, object b)
+	and operator != (object a, object b) without incurring into a
+	BoxedCast (because 5 != o should never be performed).
+
+	Handle binary enumerator operators.
+
+	(EmitLoadOpcode): Use Ldelema if the object we are loading is a
+	value type, otherwise use Ldelem_ref.
+
+	Use precomputed names;
+
+	(AddressOf): Implement address of
+
+	* cs-parser.jay (labeled_statement): Fix recursive block
+	addition by reworking the production.
+
+	* expression.cs (New.DoEmit): New has a special case:
+		
+		 If we are dealing with a ValueType, we have a few
+		 situations to deal with:
+		
+		    * The target of New is a ValueType variable, that is
+		      easy, we just pass this as the variable reference
+		
+		    * The target of New is being passed as an argument,
+		      to a boxing operation or a function that takes a
+		      ValueType.
+		
+		      In this case, we need to create a temporary variable
+		      that is the argument of New.
+
+
+2001-12-23  Ravi Pratap  <ravi@ximian.com>
+
+	* rootcontext.cs (LookupType): Check that current_type is not null before
+	going about looking at nested types.
+
+	* ecore.cs (EventExpr.EmitAddOrRemove): Rename from EmitAssign as we do
+	not implement the IAssignMethod interface any more.
+
+	* expression.cs (MemberAccess.ResolveMemberAccess): Handle EventExprs specially
+	where we tranform them into FieldExprs if they are being resolved from within
+	the declaring type.
+
+	* ecore.cs (SimpleName.DoResolve): Do the same here.
+
+	* assign.cs (DoResolve, Emit): Clean up code considerably. 
+
+	* ../errors/bug10.cs : Add.
+
+	* ../errors/cs0070.cs : Add.
+
+	* typemanager.cs : Use PtrHashtable for Delegate data hashtable etc.
+
+	* assign.cs : Get rid of EventIsLocal everywhere.
+	
+2001-12-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (ConvertIntLiteral): finished the implementation.
+
+	* statement.cs (SwitchLabel): Convert the value we are using as a
+	key before looking up the table.
+
+2001-12-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* codegen.cs (EmitTopBlock): Require a Location argument now.
+
+	* cs-parser.jay (constructor_declarator): We need to setup
+	current_local_parameters before we parse the
+	opt_constructor_initializer, to allow the variables to be bound
+	to the constructor arguments.
+
+	* rootcontext.cs (LookupType): First lookup nested classes in our
+	class and our parents before we go looking outside our class.
+
+	* expression.cs (ConstantFold): Extract/debox the values at the
+	beginnning. 
+
+	* rootcontext.cs (EmitCode): Resolve the constants first before we
+	resolve the types.  This is not really needed, but it helps debugging.
+
+	* statement.cs: report location.
+	
+	* cs-parser.jay: pass location to throw statement.
+
+	* driver.cs: Small bug fix.
+
+	* report.cs: Updated format to be 4-zero filled digits.
+
+2001-12-22  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (CheckIndices): Fix minor bug where the wrong
+	variable was being referred to ;-)
+
+	(DoEmit): Do not call EmitStaticInitializers when the 
+	underlying type is System.Object.
+
+2001-12-21  Ravi Pratap  <ravi@ximian.com>
+
+	* ecore.cs (EventExpr.Resolve): Implement to correctly set the type
+	and do the usual workaround for SRE.
+
+	* class.cs (MyEventBuilder.EventType): New member to get at the type
+	of the event, quickly.
+
+	* expression.cs (Binary.ResolveOperator): Handle delegate addition.
+
+	* assign.cs (Assign.DoResolve): Handle the case when the target
+	is an EventExpr and perform the necessary checks.
+
+	* ecore.cs (EventExpr.EmitAssign): Implement the IAssignMethod
+	interface.
+
+	(SimpleName.MemberStaticCheck): Include check for EventExpr.
+
+	(EventExpr): Set the type in the constructor itself since we 
+	are meant to be born fully resolved.
+
+	(EventExpr.Define): Revert code I wrote earlier.
+		
+	* delegate.cs (NewDelegate.Resolve): Handle the case when the MethodGroup's
+	instance expression is null. The instance expression is a This in that case
+	or a null, depending on whether it is a static method or not.
+
+	Also flag an error if the reference to a method is ambiguous i.e the MethodGroupExpr
+	refers to more than one method.
+
+	* assign.cs (DoResolve): Check whether the event belongs to the same Type container
+	and accordingly flag errors.
+
+2001-12-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Throw.Emit): Add support for re-throwing exceptions.
+
+2001-12-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* location.cs (ToString): Provide useful rutine.
+
+2001-12-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (Expression.ConvertIntLiteral): Do not return Constant
+	objects, return the actual integral boxed.
+
+	* statement.cs (SwitchLabel): define an ILLabel for each
+	SwitchLabel. 
+	
+	(Switch.CheckSwitch): If the value is a Literal, extract
+	the underlying literal.
+	
+	Also in the unused hashtable we had, add the SwitchLabel so we can
+	quickly look this value up.
+
+	* constant.cs: Implement a bunch of new constants.  Rewrite
+	Literal based on this.  Made changes everywhere to adapt to this.
+	
+	* expression.cs (Expression.MakeByteBlob): Optimize routine by
+	dereferencing array only once, and also copes with enumrations.
+
+	bytes are two bytes wide, not one.
+
+	(Cast): Perform constant conversions.
+	
+	* ecore.cs (TryImplicitIntConversion): Return literals instead of
+	wrappers to the literals here.
+
+	* expression.cs (DoNumericPromotions): long literals can converted
+	to ulong implicity (this is taken care of elsewhere, but I was
+	missing this spot).
+
+	* ecore.cs (Expression.Literalize): Make the return type Literal,
+	to improve type checking.
+
+	* rootcontext.cs: Lookup for nested classes in our class hierarchy.
+
+2001-12-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* literal.cs: Revert code from ravi that checked the bounds.  The
+	bounds are sane by the definition of the type itself. 
+
+	* typemanager.cs: Fix implementation of ImplementsInterface.  We
+	need to actually look up in our parent hierarchy for interfaces
+	implemented. 
+
+	* const.cs: Use the underlying type for enumerations
+
+	* delegate.cs: Compute the basename for the delegate creation,
+	that should fix the delegate test case, and restore the correct
+	Type Lookup semantics in rootcontext
+
+	* rootcontext.cs: Revert Ravi's last patch.  The correct way of
+	referencing a nested type with the Reflection API is using the "+"
+	sign. 
+
+	* cs-parser.jay: Do not require EOF token at the end.
+
+2001-12-20  Ravi Pratap  <ravi@ximian.com>
+
+	* rootcontext.cs (LookupType): Concatenate type names with
+	a '.' instead of a '+' The test suite passes again.
+
+	* enum.cs (Enum.DefineEnum): Set RTSpecialName on the 'value__'
+	field of the enumeration.
+
+	* expression.cs (MemberAccess.ResolveMemberAccess): Add support for
+	the case when the member is an EventExpr.
+
+	* ecore.cs (EventExpr.InstanceExpression): Every event which is not
+	static has an associated instance expression.
+
+	* typemanager.cs (RegisterEvent): The usual workaround, now for events.
+
+	(GetAddMethod, GetRemoveMethod): Workarounds, as usual.
+
+	* class.cs (Event.Define): Register event and perform appropriate checks
+	for error #111.
+
+ 	We define the Add and Remove methods even if the use provides none because
+	in that case, we provide default implementations ourselves.
+
+	Define a private field of the type of the event. This is done by the CSC compiler
+	and we should be doing it too ;-)
+
+	* typemanager.cs (delegate_combine_delegate_delegate, delegate_remove_delegate_delegate):
+	More methods we use in code we generate.
+
+	(multicast_delegate_type, delegate_type): Two separate types since the distinction
+	is important.
+
+	(InitCoreTypes): Update accordingly for the above.
+
+	* class.cs (Event.Emit): Generate code for default accessors that we provide
+
+	(EmitDefaultMethod): Do the job in the above.
+
+	* delegate.cs (DefineDelegate): Use TypeManager.multicast_delegate_type in the 
+	appropriate place.
+
+2001-12-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Indexer.Define): Fix bug, we were setting both Get/Set
+	builders even if we were missing one.
+
+	* interface.cs, class.cs, enum.cs: When calling DefineNestedType
+	pass the Basename as our class name instead of the Name.  The
+	basename will be correctly composed for us.
+
+	* parameter.cs (Paramters): Now takes a Location argument.
+
+	* decl.cs (DeclSpace.LookupType): Removed convenience function and
+	make all the code call directly LookupType in RootContext and take
+	this chance to pass the Location information everywhere.
+
+	* Everywhere: pass Location information.
+
+2001-12-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Constructor.Define): Updated way of detecting the
+	length of the parameters.
+
+	(TypeContainer.DefineType): Use basename as the type name for
+	nested types.
+
+	(TypeContainer.Define): Do not recursively define types here, as
+	definition is taken care in order by the RootContext.
+
+	* tree.cs: Keep track of namespaces in a per-file basis.
+
+	* parameter.cs (Parameter.ComputeSignature): Update to use
+	DeclSpace. 
+
+	(Parameters.GetSignature): ditto.
+
+	* interface.cs (InterfaceMethod.GetSignature): Take a DeclSpace
+	instead of a TypeContainer.
+
+	(Interface.SemanticAnalysis): Use `this' instead of our parent to
+	resolve names.  Because we need to be resolve in our context, not
+	our parents.
+	
+	* driver.cs: Implement response files.
+
+	* class.cs (TypeContainer.DefineType): If we are defined, do not
+	redefine ourselves.
+	
+	(Event.Emit): Emit the code for add/remove handlers.
+	(Event.Define): Save the MethodBuilders for add/remove.
+
+	* typemanager.cs: Use pair here too.
+
+	* cs-parser.jay: Replaced use of DictionaryEntry for Pair because
+	DictionaryEntry requires the first argument to be non-null.  
+	
+	(enum_declaration): Compute full name for registering the
+	enumeration.
+	
+	(delegate_declaration): Instead of using
+	formal_parameter_list, use opt_formal_parameter_list as the list
+	can be empty.
+
+	* cs-tokenizer.cs (PropertyParsing): renamed from `properties'
+	(EventParsing): New property that controls whether `add' and
+	`remove' are returned as tokens or identifiers (for events);
+
+2001-12-19  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Event.Define): Revamp use of EventBuilder completely. We now
+	use MyEventBuilder only and let it wrap the real builder for us.
+
+	(MyEventBuilder): Revamp constructor etc.
+
+	Implement all operations that we perform on EventBuilder in precisely the same
+	way here too.
+
+	(FindMembers): Update to use the EventBuilder member.
+
+	(Event.Emit): Update accordingly.
+
+2001-12-18  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (MyEventBuilder.Set*): Chain to the underlying builder
+	by calling the appropriate methods.
+
+	(GetCustomAttributes): Make stubs as they cannot possibly do anything
+	useful.
+
+	(Event.Emit): Use MyEventBuilder everywhere - even to set attributes.
+
+2001-12-17  Ravi Pratap  <ravi@ximian.com>
+
+	* delegate.cs (Delegate.Populate): Check that the return type
+	and various parameters types are indeed accessible.
+
+	* class.cs (Constructor.Define): Same here.
+
+	(Field.Define): Ditto.
+
+	(Event.Define): Ditto.
+
+	(Operator.Define): Check that the underlying Method defined itself
+	correctly - so it's MethodBuilder should not be null.
+
+	* delegate.cs (DelegateInvocation.DoResolve): Bale out if the type of the Instance
+	expression happens to be null.
+
+	* class.cs (MyEventBuilder): Workaround for SRE lameness. Implement various abstract
+	members but as of now we don't seem to be able to do anything really useful with it.
+
+	(FindMembers): Handle events separately by returning the MyEventBuilder of the event,
+	not the EventBuilder.
+
+2001-12-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-tokenizer.cs: Add support for defines.
+	Add support for #if, #elif, #else, #endif
+	
+	(eval_var): evaluates a variable.
+	(eval): stubbed for evaluating functions.
+
+	* cs-parser.jay: Pass the defines information
+
+	* driver.cs: Add --define command line option.
+
+	* decl.cs: Move MemberCore here.
+
+	Make it the base class for DeclSpace.  This allows us to catch and
+	report 108 and 109 for everything now.
+
+	* class.cs (TypeContainer.Define): Extract all the members
+	before populating and emit the warning 108 (new keyword required
+	to override) instead of having each member implement this.
+
+	(MemberCore.Define): New abstract method, we will be using this in
+	the warning reporting engine in Populate.
+	
+	(Operator.Define): Adjust to new MemberCore protocol. 
+
+	* const.cs (Const): This does not derive from Expression, it is a
+	temporary object we use to create fields, it is a MemberCore. 
+
+	* class.cs (Method.Define): Allow the entry point to be in a
+	specific class.
+
+	* driver.cs: Rewrite the argument handler to clean it up a bit.
+
+	* rootcontext.cs: Made it just an auxiliary namespace feature by
+	making everything static.
+
+	* driver.cs: Adapt code to use RootContext type name instead of
+	instance variable.
+
+	* delegate.cs: Remove RootContext argument.
+
+	* class.cs: (Struct, TypeContainer, Class): Remove RootContext
+	argument. 
+
+	* class.cs (Event.Define): The lookup can fail.
+	
+	* cs-tokenizer.cs: Begin implementation of pre-procesor. 
+
+	* expression.cs: Resolve the this instance before invoking the code.
+
+2001-12-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Add a production in element_access that allows
+	the thing to become a "type" reference.  This way we can parse
+	things like "(string [])" as a type.
+
+	Note that this still does not handle the more complex rules of
+	casts. 
+	
+
+	* delegate.cs (Delegate.Populate): Register the delegage constructor builder here. 
+
+	* ecore.cs: (CopyNewMethods): new utility function used to
+	assemble the list of methods from running FindMembers.
+
+	(MemberLookup): Rework FindMembers so that 
+
+2001-12-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (TypeContainer): Remove Delegates who fail to be
+	defined.
+
+	* delegate.cs (Populate): Verify that we dont get null return
+	values.   TODO: Check for AsAccessible.
+
+	* cs-parser.jay: Use basename to emit error 574 (destructor should
+	have the same name as container class), not the full name.
+
+	* cs-tokenizer.cs (adjust_int): Fit the integer in the best
+	possible representation.  
+
+	Also implements integer type suffixes U and L.
+
+2001-12-15  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (ArrayCreation.DoResolve): We need to do the
+	argument resolution *always*.
+
+	* decl.cs: Make this hold the namespace.  Hold the root context as
+	well.
+	(LookupType): Move here.
+
+	* enum.cs, class.cs, interface.cs: Adapt to new hierarchy.
+
+	* location.cs (Row, Name): Fixed the code, it was always returning
+	references to the first file.
+
+	* interface.cs: Register properties defined through interfaces.
+
+	* driver.cs: Add support for globbing on the command line
+
+	* class.cs (Field): Make it derive from MemberCore as well.
+	(Event): ditto.
+
+2001-12-15  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Event::Define): Check that the type of the event is a delegate
+	type else flag error #66.
+
+	Also, re-use TypeContainer.MethodModifiersValid here too as the rules are the
+	same.
+
+	* attribute.cs (DefinePInvokeMethod): Handle named arguments and process
+	values of EntryPoint, CharSet etc etc.
+
+	Pass in the values to TypeBuilder.DefinePInvokeMethod; determine Type etc neatly.
+
+	* class.cs (FindMembers): If a method is in transit, its MethodBuilder will
+	be null and we should ignore this. I am not sure if this is really clean. Apparently,
+	there's no way of avoiding hitting this because the call is coming from SimpleName.DoResolve,
+	which needs this to do its work.
+
+	* ../errors/cs0066.cs : Add.
+
+2001-12-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs: (GetPropertyGetter, GetPropertyGetter): New
+	helper functions.
+
+	* class.cs: (MethodSignature.MethodSignature): Removed hack that
+	clears out the parameters field.
+	(MemberSignatureCompare): Cleanup
+
+	(MemberCore): New base class used to share code between MethodCore
+	and Property.
+
+	(RegisterRequiredImplementations) BindingFlags.Public requires
+	either BindingFlags.Instace or Static.  Use instance here.
+
+	(Property): Refactored code to cope better with the full spec.
+
+	* parameter.cs (GetParameterInfo): Return an empty array instead
+	of null on error.
+
+	* class.cs (Property): Abstract or extern properties have no bodies.
+
+	* parameter.cs (GetParameterInfo): return a zero-sized array.
+
+	* class.cs (TypeContainer.MethodModifiersValid): Move all the
+	method modifier validation to the typecontainer so we can reuse
+	this on properties.
+
+	(MethodCore.ParameterTypes): return an empty sized array of types.
+
+	(Property.Define): Test property modifier validity.
+
+	Add tests for sealed/override too.
+
+	(Method.Emit): abstract or extern methods have no bodies.
+
+2001-12-14  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Method.IsPInvoke): Get rid of it as it is an expensive
+	thing.
+
+	(Method::Define, ::Emit): Modify accordingly.
+
+	* expression.cs (Invocation::OverloadResolve): Handle error # 121.
+
+	(ArrayCreation::MakeByteBlob): Handle floats and doubles.
+
+	* makefile: Pass in /unsafe.
+
+2001-12-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (MakeKey): Kill routine.
+	
+	* class.cs (TypeContainer.Define): Correctly define explicit
+	method implementations (they require the full interface name plus
+	the method name).
+
+	* typemanager.cs: Deply the PtrHashtable here and stop using the
+	lame keys.  Things work so much better.
+
+	This of course broke everyone who depended on `RegisterMethod' to
+	do the `test for existance' test.  This has to be done elsewhere.
+
+	* support.cs (PtrHashtable): A hashtable that avoid comparing with
+	the object stupid Equals method (because, that like fails all over
+	the place).  We still do not use it.
+
+	* class.cs (TypeContainer.SetRequiredInterface,
+	TypeContainer.RequireMethods): Killed these two routines and moved
+	all the functionality to RegisterRequiredImplementations.
+
+	(TypeContainer.RegisterRequiredImplementations): This routine now
+	registers all the implementations required in an array for the
+	interfaces and abstract methods.  We use an array of structures
+	which can be computed ahead of time to reduce memory usage and we
+	also assume that lookups are cheap as most classes will not
+	implement too many interfaces.
+
+	We also avoid creating too many MethodSignatures.
+
+	(TypeContainer.IsInterfaceMethod): Update and optionally does not
+	clear the "pending" bit if we find that there are problems with
+	the declaration.
+
+	(TypeContainer.VerifyPendingMethods): Update to report errors of
+	methods that look like implementations but are not.
+
+	(TypeContainer.Define): Add support for explicit interface method
+	implementation. 
+	
+2001-12-12  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs: Keep track of the parameters here instead of
+	being a feature of the TypeContainer.
+
+	* class.cs: Drop the registration of parameters here, as
+	InterfaceMethods are also interface declarations.
+
+	* delegate.cs: Register methods with the TypeManager not only with
+	the TypeContainer.  This code was buggy.
+
+	* interface.cs: Full registation here.
+
+2001-12-11  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: Remove reducer for binary expressions, it can not
+	be done this way.
+
+	* const.cs: Put here the code that used to go into constant.cs
+
+	* constant.cs: Put here the code for constants, this is a new base
+	class for Literals.
+
+	* literal.cs: Make Literal derive from Constant.
+
+2001-12-09  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Return.Emit): Report error 157 if the user
+	attempts to return from a finally block.
+
+	(Return.Emit): Instead of emitting a return, jump to the end of
+	the function.
+
+	* codegen.cs (EmitContext): ReturnValue, ReturnLabel: new
+	LocalBuilder to store the result of the function.  ReturnLabel is
+	the target where we jump.
+	
+
+2001-12-09  Radek Doulik  <rodo@ximian.com>
+
+	* cs-parser.jay: remember alias in current namespace
+
+	* ecore.cs (SimpleName::DoResolve): use aliases for types or
+	namespaces
+
+	* class.cs (LookupAlias): lookup alias in my_namespace
+
+	* namespace.cs (UsingAlias): add alias, namespace_or_type pair to
+	aliases hashtable
+	(LookupAlias): lookup alias in this and if needed in parent
+	namespaces
+
+2001-12-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* support.cs: 
+
+	* rootcontext.cs: (ModuleBuilder) Made static, first step into
+	making things static.  I need this to avoid passing the
+	TypeContainer when calling ParameterType.
+
+	* support.cs (InternalParameters.ParameterType): Remove ugly hack
+	that did string manipulation to compute the type and then call
+	GetType.  Use Parameter.ParameterType instead.
+
+	* cs-tokenizer.cs: Consume the suffix for floating values.
+
+	* expression.cs (ParameterReference): figure out whether this is a
+	reference parameter or not.  Kill an extra variable by computing
+	the arg_idx during emission.
+
+	* parameter.cs (Parameters.GetParameterInfo): New overloaded
+	function that returns whether a parameter is an out/ref value or not.
+
+	(Parameter.ParameterType): The type of the parameter (base,
+	without ref/out applied).
+	
+	(Parameter.Resolve): Perform resolution here.
+	(Parameter.ExternalType): The full type (with ref/out applied).
+
+	* statement.cs (Using.Emit, Using.EmitExpression): Implement
+	support for expressions on the using statement.
+
+2001-12-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Using.EmitLocalVariableDecls): Split the
+	localvariable handling of the using statement.
+
+	(Block.EmitMeta): Keep track of variable count across blocks.  We
+	were reusing slots on separate branches of blocks.
+
+	(Try.Emit): Emit the general code block, we were not emitting it. 
+
+	Check the type of the declaration to be an IDisposable or
+	something that can be implicity converted to it. 
+
+	Emit conversions if required.
+
+	* ecore.cs (EmptyExpression): New utility class.
+	(Expression.ImplicitConversionExists): New utility function.
+
+2001-12-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Using): Implement.
+
+	* expression.cs (LocalVariableReference): Support read only variables.
+
+	* statement.cs: Remove the explicit emit for the Leave opcode.
+	(VariableInfo): Add a readonly field.
+
+2001-12-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (ConvCast): new class used to encapsulate the various
+	explicit integer conversions that works in both checked and
+	unchecked contexts.
+
+	(Expression.ConvertNumericExplicit): Use new ConvCast class to
+	properly generate the overflow opcodes.
+
+2001-12-04  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs: The correct type for the EmptyExpression is the
+	element_type, not the variable type.  Ravi pointed this out.
+
+2001-12-04  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Method::Define): Handle PInvoke methods specially
+	by using DefinePInvokeMethod instead of the usual one.
+
+	* attribute.cs (DefinePInvokeMethod): Implement as this is what is called
+	above to do the task of extracting information and defining the method.
+	
+2001-12-04  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (ArrayCreation::EmitStaticInitializers): Get rid
+	of the condition for string type.
+
+	(Emit): Move that here. 
+
+	(ArrayCreation::CheckIndices): Keep string literals in their expression
+	form.
+
+	(EmitDynamicInitializers): Handle strings appropriately.
+
+2001-12-04  Miguel de Icaza  <miguel@ximian.com>
+
+	* codegen.cs (EmitContext): Replace multiple variables with a
+	single pointer to the current Switch statement.
+
+	* statement.cs (GotoDefault, Switch): Adjust to cleaned up
+	EmitContext.
+
+2001-12-03  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs 
+
+	* statement.cs (GotoDefault), cs-parser.jay: Implement `goto
+	default'.
+	
+	(Foreach.Emit): Foreach on arrays was not setting
+	up the loop variables (for break/continue).
+
+	(GotoCase): Semi-implented.
+	
+2001-12-03  Ravi Pratap  <ravi@ximian.com>
+
+	* attribute.cs (CheckAttribute): Handle system attributes by using
+	Attribute.GetAttributes to examine information we need.
+
+	(GetValidPlaces): Same here.
+
+	* class.cs (Method::Define): Catch invalid use of extern and abstract together.
+
+	* typemanager.cs (dllimport_type): Core type for System.DllImportAttribute.
+
+	* class.cs (Method.IsPinvoke): Used to determine if we are a PInvoke method.
+
+	(Method::Define): Set appropriate flags if we have a DllImport attribute.
+
+	(Method::Emit): Handle the case when we are a PInvoke method.
+
+2001-12-03  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: Use ResolveWithSimpleName on compound names.
+
+2001-12-02  Ravi Pratap  <ravi@ximian.com>
+
+	* constant.cs (EmitConstant): Make sure we resolve the associated expression
+	before trying to reduce it.
+
+	* typemanager.cs (RegisterConstant, LookupConstant): Implement.
+
+	* constant.cs (LookupConstantValue): Implement.
+
+	(EmitConstant): Use the above in emitting the constant.
+
+	* expression.cs (MemberAccess::ResolveMemberAccess): Handle constants
+	that are user-defined by doing a LookupConstantValue on them.
+
+	(SimpleName::DoResolve): When we have a FieldExpr, cope with constants
+	too, like above.
+
+2001-11-29  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (BaseAccess, BaseIndexer): Also split this out.
+
+	(BaseAccess.DoResolve): Implement.
+
+	(MemberAccess.DoResolve): Split this routine into a
+	ResolveMemberAccess routine that can be used independently
+
+2001-11-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Probe, Is, As): Split Probe in two classes Is and
+	As that share bits of the implementation.  Is returns a boolean,
+	while As returns the Type that is being probed.
+
+2001-12-01  Ravi Pratap  <ravi@ximian.com>
+
+	* enum.cs (LookupEnumValue): Re-write various bits, return an object value
+	instead of a Literal - much easier.
+
+	(EnumInTransit): Remove - utterly useless :-)
+
+	(Populate): Re-write bits - remove duplicate code etc. The code is much neater now.
+
+	* expression.cs (MemberLookup): Cope with user-defined enums when they are in transit.
+
+	* enum.cs (LookupEnumValue): Auto-compute next values by going down the dependency
+	chain when we have no associated expression.
+
+2001-11-30  Ravi Pratap  <ravi@ximian.com>
+
+	* constant.cs (Define): Use Location while reporting the errror.
+
+	Also emit a warning when 'new' is used and there is no inherited
+	member to hide.
+
+	* enum.cs (EnumInTransit): Used to tell if an enum type is in the process of being 
+	populated.
+
+	(LookupEnumValue): Implement to lookup an enum member's value and define it
+	if necessary.
+
+	(Populate): Re-write accordingly to use the above routine.
+
+2001-11-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (This): Fix prototype for DoResolveLValue to
+	override the base class DoResolveLValue.
+
+	* cs-parser.cs: Report errors cs574 and cs575 (destructor
+	declarations) 
+
+	* ecore.cs (FieldExpr.EmitAssign): Handle value types specially
+	(we need to load the address of the field here).  This fixes
+	test-22. 
+	
+	(FieldExpr.DoResolveLValue): Call the DoResolve
+	function to initialize the Instance expression.
+	
+	* statement.cs (Foreach.Emit): Fix the bug where we did not invoke
+	correctly the GetEnumerator operation on a value type.
+
+	* cs-parser.jay: Add more simple parsing error catches.
+
+	* statement.cs (Switch): Add support for string switches.
+	Handle null specially.
+
+	* literal.cs (NullLiteral): Make NullLiteral objects singletons. 
+
+2001-11-28  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (local_constant_declaration): Use declare_local_constant.
+
+	(declare_local_constant): New helper function.
+
+	* statement.cs (AddConstant): Keep a separate record of constants
+
+	(IsConstant): Implement to determine if a variable is a constant.
+
+	(GetConstantExpression): Implement.
+
+	* expression.cs (LocalVariableReference): Handle the case when it is a constant.
+
+	* statement.cs (IsVariableDefined): Re-write.
+
+2001-11-27  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer::FindMembers): Look for constants
+	in the case when we are looking for MemberTypes.Field
+
+	* expression.cs (MemberAccess::DoResolve): Check that in the
+	case we are a FieldExpr and a Literal, we are not being accessed
+	by an instance reference.
+
+	* cs-parser.jay (local_constant_declaration): Implement.
+
+	(declaration_statement): Implement for constant declarations.
+
+2001-11-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Switch): Catch double defaults.
+
+	(Switch): More work on the switch() statement
+	implementation.  It works for integral values now, need to finish
+	string support.
+
+
+2001-11-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* ecore.cs (Expression.ConvertIntLiteral): New function to convert
+	integer literals into other integer literals.  To be used by
+	switch. 
+
+2001-11-24  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (ArrayCreation): Get rid of ArrayExprs : we save
+	some memory.
+
+	(EmitDynamicInitializers): Cope with the above since we extract data
+	directly from ArrayData now.
+
+	(ExpectInitializers): Keep track of whether initializers are mandatory
+	or not.
+
+	(Bounds): Make it a hashtable to prevent the same dimension being 
+	recorded for every element in that dimension.
+
+	(EmitDynamicInitializers): Fix bug which prevented the Set array method
+	from being found.
+
+	Also fix bug which was causing the indices to be emitted in the reverse
+	order.
+
+2001-11-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (ArrayCreation): Implement the bits that Ravi left
+	unfinished.  They do not work, because the underlying code is
+	sloppy.
+
+2001-11-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Remove bogus fixme.
+
+	* statement.cs (Switch, SwitchSection, SwithLabel): Started work
+	on Switch statement.
+	
+2001-11-23  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (IsDelegateType, IsEnumType): Fix logic to determine
+	the same. 
+	
+	* expression.cs (ArrayCreation::CheckIndices): Get rid of the require_constant
+	parameter. Apparently, any expression is allowed. 
+
+	(ValidateInitializers): Update accordingly.
+
+	(CheckIndices): Fix some tricky bugs thanks to recursion.
+
+	* delegate.cs (NewDelegate::DoResolve): Re-write large portions as 
+	I was being completely brain-dead.
+
+	(VerifyMethod, VerifyApplicability, VerifyDelegate): Make static
+	and re-write acordingly.
+
+	(DelegateInvocation): Re-write accordingly.
+
+	* expression.cs (ArrayCreation::Emit): Handle string initialization separately.
+
+	(MakeByteBlob): Handle types more correctly.
+
+	* expression.cs (ArrayCreation:Emit): Write preliminary code to do
+	initialization from expressions but it is incomplete because I am a complete
+	Dodo :-|
+
+2001-11-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (If.Emit): Fix a bug that generated incorrect code
+	on If.  Basically, we have to return `true' (ie, we do return to
+	our caller) only if both branches of the if return.
+
+	* expression.cs (Binary.Emit): LogicalOr and LogicalAnd are
+	short-circuit operators, handle them as short circuit operators. 
+
+	(Cast.DoResolve): Resolve type.
+	(Cast.Cast): Take an expression as the target type.
+
+	* cs-parser.jay (cast_expression): Remove old hack that only
+	allowed a limited set of types to be handled.  Now we take a
+	unary_expression and we resolve to a type during semantic
+	analysis.
+
+	Use the grammar productions from Rhys to handle casts (this is
+	not complete like Rhys syntax yet, we fail to handle that corner
+	case that C# has regarding (-x), but we will get there.
+	
+2001-11-22  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (EmitFieldInitializer): Take care of the case when we have a
+	field which is an array type.
+
+	* cs-parser.jay (declare_local_variables): Support array initialization too.
+
+	* typemanager.cs (MakeKey): Implement.
+
+	(everywhere): Use the above appropriately.
+
+	* cs-parser.jay (for_statement): Update for array initialization while
+	declaring variables.
+
+	* ecore.cs : The error message was correct, it's the variable's names that
+	were misleading ;-) Make the code more readable.
+
+	(MemberAccess::DoResolve): Fix the code which handles Enum literals to set
+	the correct type etc.
+
+	(ConvertExplicit): Handle Enum types by examining the underlying type.
+
+2001-11-21  Ravi Pratap  <ravi@ximian.com>
+
+	* parameter.cs (GetCallingConvention): Always return
+	CallingConventions.Standard for now.
+
+2001-11-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Binary.ResolveOperator): Update the values of `l'
+	and `r' after calling DoNumericPromotions.
+
+	* ecore.cs: Fix error message (the types were in the wrong order).
+
+	* statement.cs (Foreach.ProbeCollectionType): Need to pass
+	BindingFlags.Instance as well 
+
+	* ecore.cs (Expression.TryImplicitIntConversion): Wrap the result
+	implicit int literal conversion in an empty cast so that we
+	propagate the right type upstream.
+
+	(UnboxCast): new class used to unbox value types.
+	(Expression.ConvertExplicit): Add explicit type conversions done
+	by unboxing.
+
+	(Expression.ImplicitNumericConversion): Oops, forgot to test for
+	the target type before applying the implicit LongLiterals to ULong
+	literal cast.
+
+2001-11-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay (for_statement): Reworked the way For works: now
+	we declare manually any variables that are introduced in
+	for_initializer to solve the problem of having out-of-band code
+	emition (that is what got for broken).
+
+	(declaration_statement): Perform the actual variable declaration
+	that used to be done in local_variable_declaration here.
+
+	(local_variable_declaration): Do not declare anything, just pass
+	the information on a DictionaryEntry
+
+2001-11-20  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (ArrayCreation::CheckIndices): The story continues :-) Complete
+	re-write of the logic to now make it recursive.
+
+	(UpdateIndices): Re-write accordingly.
+
+	Store element data in a separate ArrayData list in the above methods.
+
+	(MakeByteBlob): Implement to dump the array data into a byte array.
+
+2001-11-19  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (ArrayCreation): Factor out some code from ValidateInitializers
+	into CheckIndices.
+
+	* constant.cs (Define): Implement.
+
+	(EmitConstant): Re-write fully.
+
+	Pass in location info.
+
+	* class.cs (Populate, Emit): Call Constant::Define and Constant::EmitConstant
+	respectively.
+
+	* cs-parser.jay (constant_declarator): Use VariableDeclaration instead of
+	DictionaryEntry since we need location info too.
+
+	(constant_declaration): Update accordingly.
+
+	* expression.cs (ArrayCreation): Make ValidateInitializers simpler by factoring
+	code into another method : UpdateIndices.
+
+2001-11-18  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (ArrayCreation::ValidateInitializers): Update to perform
+	some type checking etc.
+
+2001-11-17  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (ArrayCreation::ValidateInitializers): Implement
+	bits to provide dimension info if the user skips doing that.
+
+	Update second constructor to store the rank correctly.
+
+2001-11-16  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (ArrayCreation::ValidateInitializers): Poke around
+	and try to implement.
+
+	* ../errors/cs0150.cs : Add.
+
+	* ../errors/cs0178.cs : Add.
+
+2001-11-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs: Implement foreach on multi-dimensional arrays. 
+
+	* parameter.cs (Parameters.GetParameterByName): Also lookup the
+	name of the params argument.
+
+	* expression.cs: Use EmitStoreOpcode to get the right opcode while
+	initializing the array.
+
+	(ArrayAccess.EmitStoreOpcode): move the opcode generation here, so
+	we can use this elsewhere.
+
+	* statement.cs: Finish implementation of foreach for single
+	dimension arrays.
+
+	* cs-parser.jay: Use an out-of-band stack to pass information
+	around, I wonder why I need this.
+
+	foreach_block: Make the new foreach_block the current_block.
+
+	* parameter.cs (Parameters.GetEmptyReadOnlyParameters): New
+	function used to return a static Parameters structure.  Used for
+	empty parameters, as those are created very frequently.
+
+	* cs-parser.jay, class.cs: Use GetEmptyReadOnlyParameters
+
+2001-11-15  Ravi Pratap  <ravi@ximian.com>
+
+	* interface.cs : Default modifier is private, not public. The
+	make verify test passes again.
+
+2001-11-15  Ravi Pratap  <ravi@ximian.com>
+
+	* support.cs (ReflectionParameters): Fix logic to determine
+	whether the last parameter is a params one. Test 9 passes again.
+
+	* delegate.cs (Populate): Register the builders we define with
+	RegisterParameterForBuilder. Test 19 passes again.
+
+	* cs-parser.jay (property_declaration): Reference $6 instead
+	of $$ to get at the location.
+
+	(indexer_declaration): Similar stuff.
+
+	(attribute): Ditto.
+
+	* class.cs (Property): Register parameters for the Get and Set methods
+	if they exist. Test 23 passes again.
+
+	* expression.cs (ArrayCreation::Emit): Pass null for the method in the
+	call to EmitArguments as we are sure there aren't any params arguments. 
+	Test 32 passes again.
+
+	* suppor.cs (ParameterDesc, ParameterModifier): Fix trivial bug causing
+	IndexOutOfRangeException. 
+
+	* class.cs (Property::Define): Register property using TypeManager.RegisterProperty
+	Test 33 now passes again.
+	
+2001-11-15  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Kill horrendous hack ($??? = lexer.Location) that
+	broke a bunch of things.  Will have to come up with a better way
+	of tracking locations.
+
+	* statement.cs: Implemented foreach for single dimension arrays.
+
+2001-11-09  Miguel de Icaza  <miguel@ximian.com>
+
+	* enum.cs (Enum.Emit): Delay the lookup of loc until we run into
+	an error.  This removes the lookup from the critical path.
+
+	* cs-parser.jay: Removed use of temporary_loc, which is completely
+	broken. 
+
+2001-11-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* support.cs (ReflectionParameters.ParameterModifier): Report
+	whether the argument is a PARAMS argument or not.
+
+	* class.cs: Set the attribute `ParamArrayAttribute' on the
+	parameter argument.
+
+	* typemanager.cs: Define param_array_type (ParamArrayAttribute)
+	and cons_param_array_attribute (ConstructorInfo for
+	ParamArrayAttribute)., 
+
+	* codegen.cs: Emit the return using the `Return' statement, that
+	way we can report the error correctly for missing return values. 
+
+	* class.cs (Method.Emit): Clean up.
+
+	* expression.cs (Argument.Resolve): Take another argument: the
+	location where this argument is used.  Notice that this is not
+	part of the "Argument" class as to reduce the size of the
+	structure (we know the approximate location anyways).
+
+	Test if the argument is a variable-reference, if not, then
+	complain with a 206.
+
+	(Argument.Emit): Emit addresses of variables.
+
+	(Argument.FullDesc): Simplify.
+
+	(Invocation.DoResolve): Update for Argument.Resolve.
+
+	(ElementAccess.DoResolve): ditto.
+
+	* delegate.cs (DelegateInvocation.Emit): Invocation of Invoke
+	method should be virtual, as this method is always virtual.
+
+	(NewDelegate.DoResolve): Update for Argument.Resolve.
+
+	* class.cs (ConstructorInitializer.DoResolve): ditto.
+	
+	* attribute.cs (Attribute.Resolve): ditto.
+
+2001-11-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Foreach.Emit): Use EmitAssign instead of Store.
+
+	* expression.cs (ParameterReference): Drop IStackStorage and implement
+	IAssignMethod instead. 
+
+	(LocalVariableReference): ditto.
+	
+	* ecore.cs (FieldExpr): Drop IStackStorage and implement
+	IAssignMethod instead. 
+
+2001-11-13  Miguel de Icaza <miguel@ximian.com>
+
+	* parameter.cs, expression.cs, class.cs, ecore.cs: Made all
+	enumerations that are used in heavily used structures derive from
+	byte in a laughable and pathetic attempt to reduce memory usage.
+	This is the kind of pre-optimzations that you should not do at
+	home without adult supervision.
+
+	* expression.cs (UnaryMutator): New class, used to handle ++ and
+	-- separatedly from the other unary operators.  Cleans up the
+	code, and kills the ExpressionStatement dependency in Unary.
+
+	(Unary): Removed `method' and `Arguments' from this class, making
+	it smaller, and moving it all to SimpleCall, so I can reuse this
+	code in other locations and avoid creating a lot of transient data
+	strucutres when not required.
+
+	* cs-parser.jay: Adjust for new changes.
+
+2001-11-11  Miguel de Icaza  <miguel@ximian.com>
+
+	* enum.cs (Enum.Populate): If there is a failure during
+	definition, return
+
+	* cs-parser.jay (opt_enum_base): we used to catch type errors
+	here, but this is really incorrect.  The type error should be
+	catched during semantic analysis.
+
+2001-12-11  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (operator_declarator, conversion_operator_declarator): Set
+	current_local_parameters as expected since I, in my stupidity, had forgotten
+	to do this :-)
+
+	* attribute.cs (GetValidPlaces): Fix stupid bug.
+
+	* class.cs (Method::Emit): Perform check on applicability of attributes.
+
+	(Constructor::Emit): Ditto.
+
+	(Field::Emit): Ditto.
+
+	(Field.Location): Store location information.
+
+	(Property, Event, Indexer, Operator): Ditto.
+
+	* cs-parser.jay (field_declaration): Pass in location for each field.
+
+	* ../errors/cs0592.cs : Add.
+
+2001-11-12  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (attribute_usage_type): New static member for System.AttributeUsage.
+
+	(InitCoreTypes): Update accordingly.
+
+	(RegisterAttrType, LookupAttr): Implement.
+
+	* attribute.cs (Attribute.Targets, AllowMultiple, Inherited): New fields to hold
+	info about the same.
+
+	(Resolve): Update to populate the above as necessary.
+
+	(Error592): Helper.
+
+	(GetValidPlaces): Helper to the above.
+
+	(CheckAttribute): Implement to perform validity of attributes on declarative elements.
+
+	* class.cs (TypeContainer::Emit): Update attribute emission code to perform checking etc.
+
+2001-11-12  Ravi Pratap  <ravi@ximian.com>
+
+	* attribute.cs (Attribute::Resolve): Expand to handle named arguments too.
+
+	* ../errors/cs0617.cs : Add.
+
+2001-11-11  Ravi Pratap  <ravi@ximian.com>
+
+	* enum.cs (Emit): Rename to Populate to be more consistent with what
+	we expect it to do and when exactly it is called.
+
+	* class.cs, rootcontext.cs : Update accordingly.
+
+	* typemanager.cs (RegisterField, GetValue): Workarounds for the fact that
+	FieldInfo.GetValue does not work on dynamic types ! S.R.E lameness strikes again !
+
+	* enum.cs (Populate): Register fields with TypeManager.RegisterField.
+
+	* expression.cs (MemberAccess.DoResolve): Adjust code to obtain the value
+	of a fieldinfo using the above, when dealing with a FieldBuilder.
+
+2001-11-10  Ravi Pratap  <ravi@ximian.com>
+
+	* ../errors/cs0031.cs : Add.
+
+	* ../errors/cs1008.cs : Add.
+
+	* ../errrors/cs0543.cs : Add.
+
+	* enum.cs (DefineEnum): Check the underlying type and report an error if not a valid
+	enum type.
+
+	(FindMembers): Implement.
+
+	* typemanager.cs (FindMembers): Re-write to call the appropriate methods for
+	enums and delegates too.
+
+	(enum_types): Rename to builder_to_enum.
+
+	(delegate_types): Rename to builder_to_delegate.
+
+	* delegate.cs (FindMembers): Implement.
+
+2001-11-09  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (IsEnumType): Implement.
+
+	* enum.cs (Emit): Re-write parts to account for the underlying type
+	better and perform checking etc.
+
+	(GetNextDefaultValue): Helper to ensure we don't overshoot max value
+	of the underlying type.
+
+	* literal.cs (GetValue methods everywhere): Perform bounds checking and return
+	value
+
+	* enum.cs (error31): Helper to report error #31.
+
+	* cs-parser.jay (enum_declaration): Store location of each member too.
+
+	* enum.cs (member_to_location): New hashtable. 
+
+	(AddEnumMember): Update location hashtable.
+
+	(Emit): Use the location of each member while reporting errors.
+
+2001-11-09  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: A for_initializer if is a
+	local_variable_declaration really ammount to have an implicit
+	block with the variable declaration and no initializer for for.
+
+	* statement.cs (For.Emit): Cope with null initializers.
+
+	This fixes the infinite loop on for initializers.
+
+2001-11-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* enum.cs: More cleanup.
+
+	* ecore.cs: Remove dead code.
+
+	* class.cs (Property.Emit): More simplification.
+	(Event.Emit): ditto.
+
+	Reworked to have less levels of indentation.
+	
+2001-11-08  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Property): Emit attributes.
+
+	(Field): Ditto.
+	
+	(Event): Ditto.
+
+	(Indexer): Ditto.
+
+	(Operator): Ditto.
+
+	* enum.cs (Emit): Ditto.
+
+	* rootcontext.cs (ResolveTree, EmitCode, CloseTypes): Do the same for
+	Enums too.
+
+	* class.cs (Field, Event, etc.): Move attribute generation into the
+	Emit method everywhere.
+
+	* enum.cs (Enum): Revamp to use the same definition semantics as delegates so
+	we have a DefineEnum, CloseEnum etc. The previous way of doing things was not right
+	as we had no way of defining nested enums !
+
+	* rootcontext.cs : Adjust code accordingly.
+
+	* typemanager.cs (AddEnumType): To keep track of enum types separately.
+
+2001-11-07  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (EvalConstantExpression): Move into ecore.cs
+	
+	* enum.cs (Enum): Rename some members and make them public and readonly
+	according to our convention.
+
+	* modifiers.cs (EnumAttr): Implement as we need to set only visibility flags,
+	nothing else.
+
+	* enum.cs (Enum::Define): Use the above instead of TypeAttr.
+
+	(Enum::Emit): Write a simple version for now which doesn't try to compute
+	expressions. I shall modify this to be more robust in just a while.
+
+	* class.cs (TypeContainer::Emit): Make sure we include Enums too.
+
+	(TypeContainer::CloseType): Create the Enum types too.
+
+	* attribute.cs (Resolve): Use the new Reduce method instead of EvalConstantExpression.
+
+	* expression.cs (EvalConstantExpression): Get rid of completely.
+
+	* enum.cs (Enum::Emit): Use the new expression reducer. Implement assigning
+	user-defined values and other cases.
+
+	(IsValidEnumLiteral): Helper function.
+
+	* expression.cs (ExprClassfromMemberInfo): Modify to not do any literalizing 
+	out there in the case we had a literal FieldExpr.
+
+	(MemberAccess:DoResolve): Do the literalizing of the FieldExpr here.
+
+	(Literalize): Revamp a bit to take two arguments.
+	
+	(EnumLiteral): New class which derives from Literal to wrap enum literals.
+	
+2001-11-06  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (compilation_unit): Remove extra opt_attributes for now.
+
+	* expression.cs (ArrayCreation::ValidateInitializers): Implement.
+
+	(Resolve): Use the above to ensure we have proper initializers.
+
+2001-11-05  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Expression::EvalConstantExpression): New method to 
+	evaluate constant expressions.
+
+	* attribute.cs (Attribute::Resolve): Modify bits to use the above function.
+
+2001-11-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (ArrayCreation.Emit): Some bits to initialize data
+	in an array.
+
+	(Binary.ResolveOperator): Handle operator != (object a, object b)
+	and operator == (object a, object b);
+
+	(Binary.DoNumericPromotions): Indicate whether the numeric
+	promotion was possible.
+
+	(ArrayAccess.DoResolve, ArrayAccess.Emit, ArrayAccess.EmitAssign):
+	Implement.  
+
+	Made the ArrayAccess implement interface IAssignMethod instead of
+	IStackStore as the order in which arguments are passed reflects
+	this.
+
+	* assign.cs: Instead of using expr.ExprClass to select the way of
+	assinging, probe for the IStackStore/IAssignMethod interfaces.
+
+	* typemanager.cs: Load InitializeArray definition.
+
+	* rootcontext.cs (RootContext.MakeStaticData): Used to define
+	static data that can be used to initialize arrays. 
+
+2001-11-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: Handle operator== and operator!= for booleans.
+
+	(Conditioal.Reduce): Implement reducer for the ?: operator.
+
+	(Conditional.Resolve): Implement dead code elimination.
+
+	(Binary.Resolve): Catch string literals and return a new
+	concatenated string.
+
+	(Unary.Reduce): Implement reduction of unary expressions.
+
+	* ecore.cs: Split out the expression core handling here.
+
+	(Expression.Reduce): New method used to perform constant folding
+	and CSE.  This is needed to support constant-expressions. 
+	
+	* statement.cs (Statement.EmitBoolExpression): Pass true and false
+	targets, and optimize for !x.
+
+2001-11-04  Ravi Pratap  <ravi@ximian.com>
+
+	* attribute.cs (Attribute::Resolve): Implement guts. Note that resolution
+	of an attribute gives us a CustomAttributeBuilder which we use accordingly to
+	set custom atttributes.
+
+	* literal.cs (Literal::GetValue): New abstract method to return the actual
+	value of the literal, cast as an object.
+
+	(*Literal): Implement GetValue method.
+
+	* cs-parser.jay (positional_argument_list, named_argument_list): Add not just plain
+	expressions to the arraylist but objects of type Argument.
+
+	* class.cs (TypeContainer::Emit): Emit our attributes too.
+
+	(Method::Emit, Constructor::Emit): Ditto.
+
+	* cs-parser.jay (constructor_declaration): Set attributes too, which we seemed
+	to be ignoring earlier.
+
+2001-11-03  Ravi Pratap  <ravi@ximian.com>
+
+	* attribute.cs (AttributeSection::Define): Implement to do the business
+	of constructing a CustomAttributeBuilder.
+
+	(Attribute): New trivial class. Increases readability of code.	
+
+	* cs-parser.jay : Update accordingly.
+
+	(positional_argument_list, named_argument_list, named_argument): New rules
+
+	(attribute_arguments): Use the above so that we are more correct.
+	
+2001-11-02  Ravi Pratap  <ravi@ximian.com>
+	
+	* expression.cs (Invocation::IsParamsMethodApplicable): Implement
+	to perform all checks for a method with a params parameter.
+
+	(Invocation::OverloadResolve): Update to use the above method and therefore
+	cope correctly with params method invocations.
+
+	* support.cs (InternalParameters::ParameterDesc): Provide a desc for 
+	params too.
+
+	* class.cs (ConstructorInitializer::Resolve): Make sure we look for Non-public
+	constructors in our parent too because we can't afford to miss out on 
+	protected ones ;-)
+
+	* attribute.cs (AttributeSection): New name for the class Attribute
+
+	Other trivial changes to improve readability.
+
+	* cs-parser.jay (opt_attributes, attribute_section etc.): Modify to
+	use the new class names.
+	
+2001-11-01  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Method::Define): Complete definition for params types too
+
+	(Indexer::Define): Ditto.
+
+	* support.cs (InternalParameters::ParameterType, ParameterDesc, ParameterModifier):
+	Cope everywhere with a request for info about the array parameter.
+
+2001-11-01  Ravi Pratap  <ravi@ximian.com>
+
+	* tree.cs (RecordNamespace): Fix up to check for the correct key.
+
+	* cs-parser.jay (GetQualifiedIdentifier): New Helper method used in 
+	local_variable_type to extract the string corresponding to the type.
+
+	(local_variable_type): Fixup the action to use the new helper method.
+
+	* codegen.cs : Get rid of RefOrOutParameter, it's not the right way to 
+	go.
+
+	* expression.cs : Clean out code which uses the above.
+
+2001-10-31  Ravi Pratap  <ravi@ximian.com>
+	
+	* typemanager.cs (RegisterMethod): Check if we already have an existing key
+	and bale out if necessary by returning a false.
+
+	(RegisterProperty): Ditto.
+
+	* class.cs (everywhere): Check the return value from TypeManager.RegisterMethod
+	and print out appropriate error messages.
+
+	* interface.cs (everywhere): Ditto.
+
+	* cs-parser.jay (property_declaration, event_declaration, indexer_declaration): Pass
+	location to constructor.
+
+	* class.cs (Property, Event, Indexer): Update accordingly.
+
+	* ../errors/cs111.cs : Added.
+
+	* expression.cs (Invocation::IsApplicable): New static method to determine applicability
+	of a method, as laid down by the spec.
+
+	(Invocation::OverloadResolve): Use the above method.
+
+2001-10-31  Ravi Pratap  <ravi@ximian.com>
+
+	* support.cs (InternalParameters): Get rid of crap taking in duplicate info. We
+	now take a TypeContainer and a Parameters object.
+
+	(ParameterData): Modify return type of ParameterModifier method to be 
+	Parameter.Modifier and not a string.
+
+	(ReflectionParameters, InternalParameters): Update accordingly.
+
+	* expression.cs (Argument::GetParameterModifier): Same here.
+
+	* support.cs (InternalParameters::ParameterType): Find a better way of determining
+	if we are a ref/out parameter. Actually, the type shouldn't be holding the '&'
+	symbol in it at all so maybe this is only for now.
+
+2001-10-30  Ravi Pratap  <ravi@ximian.com>
+
+	* support.cs (InternalParameters): Constructor now takes an extra argument 
+	which is the actual Parameters class.
+
+	(ParameterDesc): Update to provide info on ref/out modifiers.
+
+	* class.cs (everywhere): Update call to InternalParameters to pass in
+	the second argument too.
+
+	* support.cs (ParameterData): Add ParameterModifier, which is a method 
+	to return the modifier info [ref/out etc]
+
+	(InternalParameters, ReflectionParameters): Implement the above.
+
+	* expression.cs (Argument::ParameterModifier): Similar function to return
+	info about the argument's modifiers.
+
+	(Invocation::OverloadResolve): Update to take into account matching modifiers 
+	too.
+
+	* class.cs (Indexer::Define): Actually define a Parameter object and put it onto
+	a new SetFormalParameters object which we pass to InternalParameters.
+
+2001-10-30  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (NewArray): Merge into the ArrayCreation class.
+
+2001-10-29  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (NewArray): Merge classes NewBuiltinArray and 
+	NewUserdefinedArray into one as there wasn't much of a use in having
+	two separate ones.
+
+	* expression.cs (Argument): Change field's name to ArgType from Type.
+
+	(Type): New readonly property which returns the proper type, taking into 
+	account ref/out modifiers.
+
+	(everywhere): Adjust code accordingly for the above.
+
+	* codegen.cs (EmitContext.RefOrOutParameter): New field to determine
+	whether we are emitting for a ref or out parameter.
+
+	* expression.cs (Argument::Emit): Use the above field to set the state.
+
+	(LocalVariableReference::Emit): Update to honour the flag and emit the
+	right stuff.
+
+	* parameter.cs (Attributes): Set the correct flags for ref parameters.
+
+	* expression.cs (Argument::FullDesc): New function to provide a full desc.
+
+	* support.cs (ParameterData): Add method ParameterDesc to the interface.
+
+	(ReflectionParameters, InternalParameters): Implement the above method.
+
+	* expression.cs (Invocation::OverloadResolve): Use the new desc methods in
+	reporting errors.
+
+	(Invocation::FullMethodDesc): Ditto. 
+
+2001-10-29  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Add extra production for the second form of array
+	creation. 
+
+	* expression.cs (ArrayCreation): Update to reflect the above
+	change. 
+
+	* Small changes to prepare for Array initialization.
+
+2001-10-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (ImplementsInterface): interface might be null;
+	Deal with this problem;
+
+	Also, we do store negative hits on the cache (null values), so use
+	this instead of calling t.GetInterfaces on the type everytime.
+
+2001-10-28  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (IsBuiltinType): New method to help determine the same.
+
+	* expression.cs (New::DoResolve): Get rid of array creation code and instead
+	split functionality out into different classes.
+
+	(New::FormArrayType): Move into NewBuiltinArray.
+
+	(Invocation::EmitArguments): Get rid of the MethodBase argument. Appears
+	quite useless.
+
+	(NewBuiltinArray): New class to handle creation of built-in arrays.
+
+	(NewBuiltinArray::DoResolve): Implement guts of array creation. Also take into
+	account creation of one-dimensional arrays.
+
+	(::Emit): Implement to use Newarr and Newobj opcodes accordingly.
+
+	(NewUserdefinedArray::DoResolve): Implement.
+
+	* cs-parser.jay (local_variable_type): Fix up to add the rank to the variable too.
+
+	* typemanager.cs (AddModule): Used to add a ModuleBuilder to the list of modules
+	we maintain inside the TypeManager. This is necessary to perform lookups on the
+	module builder.
+
+	(LookupType): Update to perform GetType on the module builders too.	
+
+	* driver.cs (Driver): Add the ModuleBuilder to the list maintained by the TypeManager.
+
+	* exprssion.cs (NewUserdefinedArray::Emit): Implement.
+
+2001-10-23  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (New::DoResolve): Implement guts of array creation.
+
+	(New::FormLookupType): Rename to FormArrayType and modify ever so slightly.
+	
+2001-10-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: Fix bug I introduced lsat night that broke
+	Delegates. 
+
+	(Expression.Resolve): Report a 246 error (can not resolve name)
+	if we find a SimpleName in the stream.
+	
+	(Expression.ResolveLValue): Ditto.
+	
+	(Expression.ResolveWithSimpleName): This function is a variant of
+	ResolveName, this one allows SimpleNames to be returned without a
+	warning.  The only consumer of SimpleNames is MemberAccess
+
+2001-10-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Invocation::DoResolve): Catch SimpleNames that
+	might arrive here.  I have my doubts that this is correct.
+
+	* statement.cs (Lock): Implement lock statement.
+
+	* cs-parser.jay: Small fixes to support `lock' and `using'
+
+	* cs-tokenizer.cs: Remove extra space
+
+	* driver.cs: New flag --checked, allows to turn on integer math
+	checking. 
+
+	* typemanger.cs: Load methodinfos for Threading.Monitor.Enter and
+	Threading.Monitor.Exit 
+	
+2001-10-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (IndexerAccess::DoResolveLValue): Set the
+	Expression Class to be IndexerAccess.
+
+	Notice that Indexer::DoResolve sets the eclass to Value.
+
+2001-10-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (TypeContainer::Emit): Emit code for indexers.
+
+	* assign.cs (IAssignMethod): New interface implemented by Indexers
+	and Properties for handling assignment.
+
+	(Assign::Emit): Simplify and reuse code. 
+	
+	* expression.cs (IndexerAccess, PropertyExpr): Implement
+	IAssignMethod, clean up old code. 
+
+2001-10-22  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (ImplementsInterface): New method to determine if a type
+	implements a given interface. Provides a nice cache too.
+
+	* expression.cs (ImplicitReferenceConversion): Update checks to use the above
+	method.
+
+	(ConvertReferenceExplicit): Ditto.
+
+	* delegate.cs (Delegate::Populate): Update to define the parameters on the 
+	various methods, with correct names etc.
+
+	* class.cs (Operator::OpType): New members Operator.UnaryPlus and 
+	Operator.UnaryNegation.
+
+	* cs-parser.jay (operator_declarator): Be a little clever in the case where
+	we have a unary plus or minus operator.
+
+	* expression.cs (Unary): Rename memebers of Operator enum to UnaryPlus and 
+	UnaryMinus.
+
+	* everywhere : update accordingly.
+
+	* everywhere : Change Negate and BitComplement to LogicalNot and OnesComplement
+	respectively.
+
+	* class.cs (Method::Define): For the case where we are implementing a method
+	inherited from an interface, we need to set the MethodAttributes.Final flag too. 
+	Also set MethodAttributes.NewSlot and MethodAttributes.HideBySig.
+	
+2001-10-21  Ravi Pratap  <ravi@ximian.com>
+
+	* interface.cs (FindMembers): Implement to work around S.R.E
+	lameness.
+
+	* typemanager.cs (IsInterfaceType): Implement.
+
+	(FindMembers): Update to handle interface types too.
+
+	* expression.cs (ImplicitReferenceConversion): Re-write bits which
+	use IsAssignableFrom as that is not correct - it doesn't work.
+
+	* delegate.cs (DelegateInvocation): Derive from ExpressionStatement
+	and accordingly override EmitStatement.
+
+	* expression.cs (ConvertReferenceExplicit): Re-write similary, this time
+	using the correct logic :-)
+
+2001-10-19  Ravi Pratap  <ravi@ximian.com>
+
+	* ../errors/cs-11.cs : Add to demonstrate error -11 
+
+2001-10-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* assign.cs (Assign::Resolve): Resolve right hand side first, and
+	then pass this as a hint to ResolveLValue.
+	
+	* expression.cs (FieldExpr): Add Location information
+
+	(FieldExpr::LValueResolve): Report assignment to readonly
+	variable. 
+	
+	(Expression::ExprClassFromMemberInfo): Pass location information.
+
+	(Expression::ResolveLValue): Add new method that resolves an
+	LValue. 
+
+	(Expression::DoResolveLValue): Default invocation calls
+	DoResolve. 
+
+	(Indexers): New class used to keep track of indexers in a given
+	Type. 
+
+	(IStackStore): Renamed from LValue, as it did not really describe
+	what this did.  Also ResolveLValue is gone from this interface and
+	now is part of Expression.
+
+	(ElementAccess): Depending on the element access type
+	
+	* typemanager.cs: Add `indexer_name_type' as a Core type
+	(System.Runtime.CompilerServices.IndexerNameAttribute)
+
+	* statement.cs (Goto): Take a location.
+	
+2001-10-18  Ravi Pratap  <ravi@ximian.com>
+
+	* delegate.cs (Delegate::VerifyDelegate): New method to verify
+	if two delegates are compatible.
+
+	(NewDelegate::DoResolve): Update to take care of the case when
+	we instantiate a delegate from another delegate.
+
+	* typemanager.cs (FindMembers): Don't even try to look up members
+	of Delegate types for now.
+
+2001-10-18  Ravi Pratap  <ravi@ximian.com>
+
+	* delegate.cs (NewDelegate): New class to take care of delegate
+	instantiation.
+
+	* expression.cs (New): Split the delegate related code out into 
+	the NewDelegate class.
+
+	* delegate.cs (DelegateInvocation): New class to handle delegate 
+	invocation.
+
+	* expression.cs (Invocation): Split out delegate related code into
+	the DelegateInvocation class.
+
+2001-10-17  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (New::DoResolve): Implement delegate creation fully
+	and according to the spec.
+
+	(New::DoEmit): Update to handle delegates differently.
+
+	(Invocation::FullMethodDesc): Fix major stupid bug thanks to me
+	because of which we were printing out arguments in reverse order !
+
+	* delegate.cs (VerifyMethod): Implement to check if the given method
+	matches the delegate.
+
+	(FullDelegateDesc): Implement.
+
+	(VerifyApplicability): Implement.
+
+	* expression.cs (Invocation::DoResolve): Update to accordingly handle
+	delegate invocations too.
+
+	(Invocation::Emit): Ditto.
+
+	* ../errors/cs1593.cs : Added.
+
+	* ../errors/cs1594.cs : Added.
+
+	* delegate.cs (InstanceExpression, TargetMethod): New properties.
+
+2001-10-16  Ravi Pratap  <ravi@ximian.com>
+
+	* typemanager.cs (intptr_type): Core type for System.IntPtr
+
+	(InitCoreTypes): Update for the same.
+
+	(iasyncresult_type, asynccallback_type): Ditto.
+
+	* delegate.cs (Populate): Fix to use System.Intptr as it is indeed
+	correct.
+
+	* typemanager.cs (AddDelegateType): Store a pointer to the Delegate class
+	too.
+
+	* delegate.cs (ConstructorBuilder, InvokeBuilder, ...): New members to hold
+	the builders for the 4 members of a delegate type :-)
+
+	(Populate): Define the BeginInvoke and EndInvoke methods on the delegate
+	type.
+
+	* expression.cs (New::DoResolve): Implement guts for delegate creation.
+
+	* ../errors/errors.txt : Update for an error (-11) which only we catch :-)
+
+2001-10-15  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Break::Emit): Implement.   
+	(Continue::Emit): Implement.
+
+	(For::Emit): Track old being/end loops;  Set Begin loop, ack end loop
+	(While::Emit): Track old being/end loops;  Set Begin loop, ack end loop
+	(Do::Emit): Track old being/end loops;  Set Begin loop, ack end loop
+	(Foreach::Emit): Track old being/end loops;  Set Begin loop, ack
+	end loop
+	
+	* codegen.cs (EmitContext::LoopEnd, EmitContext::LoopBegin): New
+	properties that track the label for the current loop (begin of the
+	loop and end of the loop).
+
+2001-10-15  Ravi Pratap  <ravi@ximian.com>
+
+	* delegate.cs (Emit): Get rid of it as there doesn't seem to be any ostensible
+	use of emitting anything at all.
+
+	* class.cs, rootcontext.cs : Get rid of calls to the same.
+
+	* delegate.cs (DefineDelegate): Make sure the class we define is also sealed.
+
+	(Populate): Define the constructor correctly and set the implementation
+	attributes.
+
+	* typemanager.cs (delegate_types): New hashtable to hold delegates that
+	have been defined.
+
+	(AddDelegateType): Implement.
+
+	(IsDelegateType): Implement helper method.
+
+	* delegate.cs (DefineDelegate): Use AddDelegateType instead of AddUserType.
+
+	* expression.cs (New::DoResolve): Check if we are trying to instantiate a delegate type
+	and accordingly handle it.
+
+	* delegate.cs (Populate): Take TypeContainer argument.
+	Implement bits to define the Invoke method. However, I still haven't figured out
+	how to take care of the native int bit :-(
+
+	* cs-parser.jay (delegate_declaration): Fixed the bug that I had introduced :-) 
+	Qualify the name of the delegate, not its return type !
+
+	* expression.cs (ImplicitReferenceConversion): Implement guts of implicit array
+	conversion.
+
+	(StandardConversionExists): Checking for array types turns out to be recursive.
+
+	(ConvertReferenceExplicit): Implement array conversion.
+
+	(ExplicitReferenceConversionExists): New method to determine precisely that :-)
+	
+2001-10-12  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (delegate_declaration): Store the fully qualified
+	name as it is a type declaration.
+
+	* delegate.cs (ReturnType, Name): Rename members to these. Make them 
+	readonly.
+
+	(DefineDelegate): Renamed from Define. Does the same thing essentially,
+	as TypeContainer::DefineType.
+
+	(Populate): Method in which all the definition of the various methods (Invoke)
+	etc is done.
+
+	(Emit): Emit any code, if necessary. I am not sure about this really, but let's
+	see.
+	
+	(CloseDelegate): Finally creates the delegate.
+
+	* class.cs (TypeContainer::DefineType): Update to define delegates.
+	(Populate, Emit and CloseType): Do the same thing here too.
+
+	* rootcontext.cs (ResolveTree, PopulateTypes, EmitCode, CloseTypes): Include
+	delegates in all these operations.
+
+2001-10-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: LocalTemporary: a new expression used to
+	reference a temporary that has been created.
+
+	* assign.cs: Handle PropertyAccess back here, so that we can
+	provide the proper semantic access to properties.
+
+	* expression.cs (Expression::ConvertReferenceExplicit): Implement
+	a few more explicit conversions. 
+
+	* modifiers.cs: `NEW' modifier maps to HideBySig.
+
+	* expression.cs (PropertyExpr): Make this into an
+	ExpressionStatement, and support the EmitStatement code path. 
+
+	Perform get/set error checking, clean up the interface.
+
+	* assign.cs: recognize PropertyExprs as targets, and if so, turn
+	them into toplevel access objects.
+
+2001-10-12  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: PropertyExpr::PropertyExpr: use work around the
+	SRE.
+
+	* typemanager.cs: Keep track here of our PropertyBuilders again to
+	work around lameness in SRE.
+
+2001-10-11  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (LValue::LValueResolve): New method in the
+	interface, used to perform a second resolution pass for LValues. 
+	
+	(This::DoResolve): Catch the use of this in static methods.
+
+	(This::LValueResolve): Implement.
+
+	(This::Store): Remove warning, assigning to `this' in structures
+	is 
+
+	(Invocation::Emit): Deal with invocation of
+	methods on value types.  We need to pass the address to structure
+	methods rather than the object itself.  (The equivalent code to
+	emit "this" for structures leaves the entire structure on the
+	stack instead of a pointer to it). 
+
+	(ParameterReference::DoResolve): Compute the real index for the
+	argument based on whether the method takes or not a `this' pointer
+	(ie, the method is static).
+
+	* codegen.cs (EmitContext::GetTemporaryStorage): Used to store
+	value types returned from functions when we need to invoke a
+	method on the sturcture.
+	
+
+2001-10-11  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer::DefineType): Method to actually do the business of
+	defining the type in the Modulebuilder or Typebuilder. This is to take
+	care of nested types which need to be defined on the TypeBuilder using
+	DefineNestedMethod.
+
+	(TypeContainer::GetClassBases): Implement. Essentially the code from the 
+	methods in RootContext, only ported to be part of TypeContainer.
+
+	(TypeContainer::GetInterfaceOrClass): Ditto.
+
+	(TypeContainer::LookupInterfaceOrClass, ::MakeFQN): Ditto.
+
+	* interface.cs (Interface::DefineInterface): New method. Does exactly
+	what RootContext.CreateInterface did earlier, only it takes care of nested types 
+	too.
+
+	(Interface::GetInterfaces): Move from RootContext here and port.
+
+	(Interface::GetInterfaceByName): Same here.
+
+	* rootcontext.cs (ResolveTree): Re-write.
+
+	(PopulateTypes): Re-write.
+
+	* class.cs (TypeContainer::Populate): Populate nested types too.
+	(TypeContainer::Emit): Emit nested members too.
+
+	* typemanager.cs (AddUserType): Do not make use of the FullName property,
+	instead just use the name argument passed in as it is already fully
+	qualified.
+
+	(FindMembers): Check in the Builders to TypeContainer mapping instead of the name
+	to TypeContainer mapping to see if a type is user-defined.
+
+	* class.cs (TypeContainer::CloseType): Implement. 
+
+	(TypeContainer::DefineDefaultConstructor): Use Basename, not Name while creating
+	the default constructor.
+	
+	(TypeContainer::Populate): Fix minor bug which led to creating default constructors
+	twice.
+
+	(Constructor::IsDefault): Fix up logic to determine if it is the default constructor
+
+	* interface.cs (CloseType): Create the type here.
+	
+	* rootcontext.cs (CloseTypes): Re-write to recursively close types by running through
+	the hierarchy.
+
+	Remove all the methods which are now in TypeContainer.
+
+2001-10-10  Ravi Pratap  <ravi@ximian.com>
+
+	* delegate.cs (Define): Re-write bits to define the delegate
+	correctly.
+
+2001-10-10  Miguel de Icaza  <miguel@ximian.com>
+
+	* makefile: Renamed the compiler to `mcs.exe' instead of compiler.exe
+
+	* expression.cs (ImplicitReferenceConversion): handle null as well
+	as a source to convert to any reference type.
+
+	* statement.cs (Return): Perform any implicit conversions to
+	expected return type.  
+
+	Validate use of return statement.  
+
+	* codegen.cs (EmitContext): Pass the expected return type here.
+
+	* class.cs (Method, Constructor, Property): Pass expected return
+	type to EmitContext.
+
+2001-10-09  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: Make DoResolve take an EmitContext instead of a
+	TypeContainer.
+
+	Replaced `l' and `location' for `loc', for consistency.
+	
+	(Error, Warning): Remove unneeded Tc argument.
+
+	* assign.cs, literal.cs, constant.cs: Update to new calling
+	convention. 
+	
+	* codegen.cs: EmitContext now contains a flag indicating whether
+	code is being generated in a static method or not.
+
+	* cs-parser.jay: DecomposeQI, new function that replaces the old
+	QualifiedIdentifier.  Now we always decompose the assembled
+	strings from qualified_identifier productions into a group of
+	memberaccesses.
+
+2001-10-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs: Deal with field-less struct types correctly now
+	by passing the size option to Define Type.
+
+	* class.cs: Removed hack that created one static field. 
+
+2001-10-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs: Moved most of the code generation here. 
+
+2001-10-09  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (New::DoResolve): Revert changes for array creation, doesn't
+	seem very right.
+
+	(ElementAccess): Remove useless bits for now - keep checks as the spec
+	says.
+
+2001-10-08  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (ElementAccess::DoResolve): Remove my crap code
+	and start performing checks according to the spec.
+
+2001-10-07  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (type_suffix*): Remove - they are redundant. Use
+	rank_specifiers instead.
+
+	(rank_specifiers): Change the order in which the rank specifiers are stored
+
+	(local_variable_declaration): Use opt_rank_specifier instead of type_suffixes.
+
+	* expression.cs (ElementAccess): Implement the LValue interface too.
+	
+2001-10-06  Ravi Pratap  <ravi@ximian.com>
+	
+	* expression.cs (ConvertExplicitStandard): Add. Same as ConvertExplicit
+	except that user defined conversions are not included.
+
+	(UserDefinedConversion): Update to use the ConvertExplicitStandard to 
+	perform the conversion of the return type, if necessary.
+
+	(New::DoResolve): Check whether we are creating an array or an object
+	and accordingly do the needful.
+
+	(New::Emit): Same here.
+
+	(New::DoResolve): Implement guts of array creation.
+
+	(New::FormLookupType): Helper function.
+
+2001-10-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* codegen.cs: Removed most of the code generation here, and move the
+	corresponding code generation bits to the statement classes. 
+
+	Added support for try/catch/finalize and throw.
+	
+	* cs-parser.jay: Added support for try/catch/finalize.
+
+	* class.cs: Catch static methods having the flags override,
+	virtual or abstract.
+
+	* expression.cs (UserCast): This user cast was not really doing
+	what it was supposed to do.  Which is to be born in fully resolved
+	state.  Parts of the resolution were being performed at Emit time! 
+
+	Fixed this code.
+
+2001-10-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs: Implicity convert the result from UserCast.
+
+2001-10-05  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Expression::FindMostEncompassingType): Fix bug which
+	prevented it from working correctly. 
+
+	(ConvertExplicit): Make the first try, a call to ConvertImplicitStandard, not
+	merely ConvertImplicit.
+
+2001-10-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs: Make the LookupTypeContainer function static,
+	and not per-instance.  
+
+	* class.cs: Make static FindMembers (the one that takes a Type
+	argument). 
+
+	* codegen.cs: Add EmitForeach here.
+
+	* cs-parser.jay: Make foreach a toplevel object instead of the
+	inline expansion, as we need to perform semantic analysis on it. 
+
+2001-10-05  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Expression::ImplicitUserConversion): Rename to
+	UserDefinedConversion.
+
+	(Expression::UserDefinedConversion): Take an extra argument specifying 
+	whether we look for explicit user conversions too.
+
+	(Expression::ImplicitUserConversion): Make it a call to UserDefinedConversion.
+
+	(UserDefinedConversion): Incorporate support for user defined explicit conversions.
+
+	(ExplicitUserConversion): Make it a call to UserDefinedConversion
+	with the appropriate arguments.
+
+	* cs-parser.jay (cast_expression): Record location too.
+
+	* expression.cs (Cast): Record location info.
+
+	(Expression::ConvertExplicit): Take location argument.
+
+	(UserImplicitCast): Change name to UserCast. Take an extra constructor argument
+	to determine if we are doing explicit conversions.
+
+	(UserCast::Emit): Update accordingly.
+
+	(Expression::ConvertExplicit): Report an error if everything fails.
+
+	* ../errors/cs0030.cs : Add.
+
+2001-10-04  Miguel de Icaza  <miguel@ximian.com>
+
+	* modifiers.cs: If the ABSTRACT keyword is present, also set the
+	virtual and newslot bits. 
+
+	* class.cs (TypeContainer::RegisterRequiredImplementations):
+	Record methods we need.
+
+	(TypeContainer::MakeKey): Helper function to make keys for
+	MethodBases, since the Methodbase key is useless.
+
+	(TypeContainer::Populate): Call RegisterRequiredImplementations
+	before defining the methods.   
+
+	Create a mapping for method_builders_to_methods ahead of time
+	instead of inside a tight loop.
+
+	(::RequireMethods):  Accept an object as the data to set into the
+	hashtable so we can report interface vs abstract method mismatch.
+
+2001-10-03  Miguel de Icaza  <miguel@ximian.com>
+
+	* report.cs: Make all of it static.
+
+	* rootcontext.cs: Drop object_type and value_type computations, as
+	we have those in the TypeManager anyways.
+
+	Drop report instance variable too, now it is a global.
+
+	* driver.cs: Use try/catch on command line handling.
+
+	Add --probe option to debug the error reporting system with a test
+	suite. 
+
+	* report.cs: Add support for exiting program when a probe
+	condition is reached.
+
+2001-10-03  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Binary::DoNumericPromotions): Fix the case when
+	we do a forcible conversion regardless of type, to check if 
+	ForceConversion returns a null.
+
+	(Binary::error19): Use location to report error.
+
+	(Unary::error23): Use location here too.
+
+	* ../errors/cs0019.cs : Check in.
+
+	* ../errors/cs0023.cs : Check in.
+
+	* expression.cs (Expression.MemberLookup): Return null for a rather esoteric
+	case of a non-null MethodInfo object with a length of 0 !
+
+	(Binary::ResolveOperator): Flag error if overload resolution fails to find
+	an applicable member - according to the spec :-)
+	Also fix logic to find members in base types.
+
+	(Unary::ResolveOperator): Same here.
+
+	(Unary::report23): Change name to error23 and make first argument a TypeContainer
+	as I was getting thoroughly confused between this and error19 :-)
+	
+	* expression.cs (Expression::ImplicitUserConversion): Re-write fully
+	(::FindMostEncompassedType): Implement.
+	(::FindMostEncompassingType): Implement.
+	(::StandardConversionExists): Implement.
+
+	(UserImplicitCast): Re-vamp. We now need info about most specific
+	source and target types so that we can do the necessary conversions.
+
+	(Invocation::MakeUnionSet): Completely re-write to make sure we form a proper
+	mathematical union with no duplicates.
+
+2001-10-03  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs (RootContext::PopulateTypes): Populate containers
+	in order from base classes to child classes, so that we can in
+	child classes look up in our parent for method names and
+	attributes (required for handling abstract, virtual, new, override
+	constructs: we need to instrospect our base class, and if we dont
+	populate the classes in order, the introspection might be
+	incorrect.  For example, a method could query its parent before
+	the parent has any methods and would determine that the parent has
+	no abstract methods (while it could have had them)).
+
+	(RootContext::CreateType): Record the order in which we define the
+	classes.
+
+2001-10-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (TypeContainer::Populate): Also method definitions can
+	fail now, keep track of this.
+
+	(TypeContainer::FindMembers): Implement support for
+	DeclaredOnly/noDeclaredOnly flag.
+
+	(Constructor::Emit) Return the ConstructorBuilder.
+
+	(Method::Emit) Return the MethodBuilder. 
+	Check for abstract or virtual methods to be public.
+
+	* rootcontext.cs (RootContext::CreateType): Register all the
+	abstract methods required for the class to be complete and the
+	interface methods that must be implemented. 
+
+	* cs-parser.jay: Report error 501 (method requires body if it is
+	not marked abstract or extern).
+
+	* expression.cs (TypeOf::Emit): Implement.
+
+	* typemanager.cs: runtime_handle_type, new global type.
+
+	* class.cs (Property::Emit): Generate code for properties.
+
+2001-10-02  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Unary::ResolveOperator): Find operators on base type
+	too - we now conform exactly to the spec.
+
+	(Binary::ResolveOperator): Same here.
+
+	* class.cs (Operator::Define): Fix minor quirk in the tests.
+
+	* ../errors/cs0215.cs : Added.
+
+	* ../errors/cs0556.cs : Added.
+
+	* ../errors/cs0555.cs : Added.
+
+2001-10-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-tokenizer.cs: Reimplemented Location to be a struct with a
+	single integer which is really efficient
+
+2001-10-01  Ravi Pratap  <ravi@ximian.com>
+
+	*  expression.cs (Expression::ImplicitUserConversion): Use location
+        even in the case when we are examining True operators.
+ 
+        * class.cs (Operator::Define): Perform extensive checks to conform
+        with the rules for operator overloading in the spec.
+
+	* expression.cs (Expression::ImplicitReferenceConversion): Implement
+	some of the other conversions mentioned in the spec.
+
+	* typemanager.cs (array_type): New static member for the System.Array built-in
+	type.
+
+	(cloneable_interface): For System.ICloneable interface.
+
+	* driver.cs (Driver::Driver): Initialize TypeManager's core types even before
+	we start resolving the tree and populating types.
+
+	* ../errors/errors.txt : Update for error numbers -7, -8, -9, -10
+ 
+2001-10-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Expression::ExprClassFromMemberInfo,
+	Expression::Literalize): Create literal expressions from
+	FieldInfos which are literals.
+
+	(ConvertNumericExplicit, ImplicitNumericConversion): Fix a few
+	type casts, because they were wrong.  The test suite in tests
+	caught these ones.
+
+	(ImplicitNumericConversion): ushort to ulong requires a widening
+	cast. 
+
+	Int32 constant to long requires widening cast as well.
+
+	* literal.cs (LongLiteral::EmitLong): Do not generate i4 constants
+	for integers because the type on the stack is not i4.
+
+2001-09-30  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (report118): require location argument. 
+
+	* parameter.cs: Do not dereference potential null value.
+
+	* class.cs: Catch methods that lack the `new' keyword when
+	overriding a name.  Report warnings when `new' is used without
+	anything being there to override.
+
+	* modifiers.cs: Handle `NEW' as MethodAttributes.NewSlot.
+
+	* class.cs: Only add constructor to hashtable if it is non-null
+	(as now constructors can fail on define).
+
+	(TypeManager, Class, Struct): Take location arguments.
+
+	Catch field instance initialization in structs as errors.
+
+	accepting_filter: a new filter for FindMembers that is static so
+	that we dont create an instance per invocation.
+
+	(Constructor::Define): Catch errors where a struct constructor is
+	parameterless 
+
+	* cs-parser.jay: Pass location information for various new
+	constructs. 
+	
+	* delegate.cs (Delegate): take a location argument.
+
+	* driver.cs: Do not call EmitCode if there were problesm in the
+	Definition of the types, as many Builders wont be there. 
+
+	* decl.cs (Decl::Decl): Require a location argument.
+
+	* cs-tokenizer.cs: Handle properly hex constants that can not fit
+	into integers, and find the most appropiate integer for it.
+
+	* literal.cs: Implement ULongLiteral.
+
+	* rootcontext.cs: Provide better information about the location of
+	failure when CreateType fails.
+	
+2001-09-29  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs (RootContext::PopulateTypes): Populates structs
+	as well.
+
+	* expression.cs (Binary::CheckShiftArguments): Add missing type
+	computation.
+	(Binary::ResolveOperator): Add type to the logical and and logical
+	or, Bitwise And/Or and Exclusive Or code paths, it was missing
+	before.
+
+	(Binary::DoNumericPromotions): In the case where either argument
+	is ulong (and most signed types combined with ulong cause an
+	error) perform implicit integer constant conversions as well.
+
+2001-09-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (UserImplicitCast): Method should always be
+	non-null. 
+	(Invocation::BetterConversion): Simplified test for IntLiteral.
+
+	(Expression::ImplicitNumericConversion): Split this routine out.
+	Put the code that performs implicit constant integer conversions
+	here. 
+
+	(Expression::Resolve): Become a wrapper around DoResolve so we can
+	check eclass and type being set after resolve.
+
+	(Invocation::Badness): Remove this dead function
+
+	(Binary::ResolveOperator): Do not compute the expensive argumnets
+	unless we have a union for it.
+
+	(Probe::Emit): Is needs to do an isinst and then
+	compare against null.
+
+	(::CanConvert): Added Location argument.  If the Location argument
+	is null (Location.Null), then we do not report errors.  This is
+	used by the `probe' mechanism of the Explicit conversion.  We do
+	not want to generate an error for something that the user
+	explicitly requested to be casted.  But the pipeline for an
+	explicit cast first tests for potential implicit casts.
+
+	So for now, if the Location is null, it means `Probe only' to
+	avoid adding another argument.   Might have to revise this
+	strategy later.
+
+	(ClassCast): New class used to type cast objects into arbitrary
+	classes (used in Explicit Reference Conversions).
+
+	Implement `as' as well.
+
+	Reverted all the patches from Ravi below: they were broken:
+
+		* The use of `level' as a mechanism to stop recursive
+		  invocations is wrong.  That was there just to catch the
+		  bug with a strack trace but not as a way of addressing
+		  the problem.
+
+		  To fix the problem we have to *understand* what is going
+		  on and the interactions and come up with a plan, not
+		  just get things going.
+
+		* The use of the type conversion cache that I proposed
+		  last night had an open topic: How does this work across
+		  protection domains.  A user defined conversion might not
+		  be public in the location where we are applying the
+		  conversion, a different conversion might be selected
+		  (ie, private A->B (better) but public B->A (worse),
+		  inside A, A->B applies, but outside it, B->A will
+		  apply).
+
+		* On top of that (ie, even if the above is solved),
+		  conversions in a cache need to be abstract.  Ie, `To
+		  convert from an Int to a Short use an OpcodeCast', not
+		  `To convert from an Int to a Short use the OpcodeCast on
+		  the variable 5' (which is what this patch was doing).
+	
+2001-09-28  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Invocation::ConversionExists): Re-write to use
+	the conversion cache
+	
+	(Expression::ConvertImplicit): Automatic bailing out if level != 0. Also
+	cache all conversions done, not just user-defined ones.
+
+	(Invocation::BetterConversion): The real culprit. Use ConversionExists
+	to determine if a conversion exists instead of acutually trying to 
+	perform the conversion. It's faster too.
+
+	(Expression::ConvertExplicit): Modify to use ConversionExists to check
+	and only then attempt the implicit conversion.
+
+2001-09-28  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (ConvertImplicit): Use a cache for conversions
+	already found. Check level of recursion and bail out if necessary.
+	
+2001-09-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (string_concat_string_string, string_concat_object_object):
+	Export standard methods that we expect for string operations.
+	
+	* statement.cs (Block::UsageWarning): Track usage of variables and
+	report the errors for not used variables.
+
+	* expression.cs (Conditional::Resolve, ::Emit): Implement ?:
+	operator. 
+
+2001-09-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* codegen.cs: remove unnneded code 
+
+	* expression.cs: Removed BuiltinTypeAccess class
+
+	Fix the order in which implicit conversions are
+	done.  
+
+	The previous fixed dropped support for boxed conversions (adding a
+	test to the test suite now)
+
+	(UserImplicitCast::CanConvert): Remove test for source being null,
+	that code is broken.  We should not feed a null to begin with, if
+	we do, then we should track the bug where the problem originates
+	and not try to cover it up here.
+
+	Return a resolved expression of type UserImplicitCast on success
+	rather than true/false.  Ravi: this is what I was talking about,
+	the pattern is to use a static method as a "constructor" for
+	objects. 
+
+	Also, do not create arguments until the very last minute,
+	otherwise we always create the arguments even for lookups that
+	will never be performed. 
+
+	(UserImplicitCast::Resolve): Eliminate, objects of type
+	UserImplicitCast are born in a fully resolved state. 
+	
+	* typemanager.cs (InitCoreTypes): Init also value_type
+	(System.ValueType). 
+
+	* expression.cs (Cast::Resolve): First resolve the child expression.
+
+	(LValue): Add new method AddressOf to be used by
+	the `&' operator.  
+
+	Change the argument of Store to take an EmitContext instead of an
+	ILGenerator, because things like FieldExpr need to be able to call
+	their children expression to generate the instance code. 
+
+	(Expression::Error, Expression::Warning): Sugar functions for
+	reporting errors.
+
+	(Expression::MemberLookup): Accept a TypeContainer instead of a
+	Report as the first argument.
+
+	(Expression::ResolvePrimary): Killed.  I still want to improve
+	this as currently the code is just not right.
+
+	(Expression::ResolveMemberAccess): Simplify, but it is still
+	wrong. 
+
+	(Unary::Resolve): Catch errors in AddressOf operators.
+
+	(LocalVariableReference::Emit, ::Store, ::AddressOf): typecast
+	index to a byte for the short-version, or the compiler will choose
+	the wrong Emit call, which generates the wrong data.
+
+	(ParameterReference::Emit, ::Store): same.
+
+	(FieldExpr::AddressOf): Implement.
+	
+	* typemanager.cs: TypeManager: made public variable instead of
+	property.
+	
+	* driver.cs: document --fatal.
+
+	* report.cs (ErrorMessage, WarningMessage): new names for the old
+	Error and Warning classes.
+
+	* cs-parser.jay (member_access): Turn built-in access to types
+	into a normal simplename
+
+2001-09-27  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Invocation::BetterConversion): Fix to cope
+	with q being null, since this was introducing a bug.
+
+	* expression.cs (ConvertImplicit): Do built-in conversions first.
+
+2001-09-27  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (UserImplicitCast::Resolve): Fix bug.
+
+2001-09-27  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer::AddConstructor): Fix a stupid bug
+	I had introduced long ago (what's new ?).
+
+	* expression.cs (UserImplicitCast::CanConvert): Static method to do 
+	the work of all the checking. 
+	(ConvertImplicit): Call CanConvert and only then create object if necessary.
+	(UserImplicitCast::CanConvert, ::Resolve): Re-write.
+
+	(Unary::Operator): Rename Add and Subtract to Addition and Subtraction because
+	that is the right way. 
+
+	(Invocation::MakeUnionSet): Convenience function to make unions of sets for 
+	overloading resolution. Use everywhere instead of cutting and pasting code.
+
+	(Binary::ResolveOperator): Use MakeUnionSet.
+
+	(UserImplicitCast::CanConvert, ::Resolve): Update to take care of the case when 
+	we have to convert to bool types. Not complete yet.
+	
+2001-09-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (TypeManager::CSharpName): support ushort.
+
+	* expression.cs (Expression::TryImplicitIntConversion): Attempts
+	to provide an expression that performsn an implicit constant int
+	conversion (section 6.1.6).
+	(Expression::ConvertImplicitRequired): Reworked to include
+	implicit constant expression conversions.
+
+	(Expression::ConvertNumericExplicit): Finished.
+
+	(Invocation::Emit): If InstanceExpression is null, then it means
+	that we perform a call on this.
+	
+2001-09-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Unary::Emit): Remove some dead code.
+	(Probe): Implement Resolve and Emit for `is'.
+	(Expression::ConvertImplicitRequired): Attempt to do constant
+	expression conversions here.  Maybe should be moved to
+	ConvertImplicit, but I am not sure.
+	(Expression::ImplicitLongConstantConversionPossible,
+	Expression::ImplicitIntConstantConversionPossible): New functions
+	that tell whether is it possible to apply an implicit constant
+	expression conversion.
+
+	(ConvertNumericExplicit): Started work on explicit numeric
+	conversions.
+
+	* cs-parser.jay: Update operator constants.
+
+	* parameter.cs (Parameters::GetParameterInfo): Hook up VerifyArgs
+	(Parameters::GetSignature): Hook up VerifyArgs here.
+	(Parameters::VerifyArgs): Verifies that no two arguments have the
+	same name. 
+
+	* class.cs (Operator): Update the operator names to reflect the
+	ones that the spec expects (as we are just stringizing the
+	operator names).
+	
+	* expression.cs (Unary::ResolveOperator): Fix bug: Use
+	MethodInfo's ReturnType instead of LookupMethodByBuilder as the
+	previous usage did only work for our methods.
+	(Expression::ConvertImplicit): Handle decimal implicit numeric
+	conversions as well.
+	(Expression::InternalTypeConstructor): Used to invoke constructors
+	on internal types for default promotions.
+
+	(Unary::Emit): Implement special handling for the pre/post
+	increment/decrement for overloaded operators, as they need to have
+	the same semantics as the other operators.
+
+	(Binary::ResolveOperator): ditto.
+	(Invocation::ConversionExists): ditto.
+	(UserImplicitCast::Resolve): ditto.
+	
+2001-09-26  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Unary::Emit and Binary::Emit): If we have an overloaded
+	operator, return after emitting body. Regression tests pass again !
+
+	* expression.cs (ConvertImplicit): Take TypeContainer as first argument
+	(Unary::ForceConversion, Binary::ForceConversion): Ditto.
+	(Invocation::OverloadResolve): Ditto.
+	(Invocation::BetterFunction, BetterConversion, ConversionExists): Ditto.
+
+	* everywhere : update calls to the above methods accordingly.
+
+2001-09-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* assign.cs (Assign): Make it inherit from ExpressionStatement.
+
+	* expression.cs (ExpressionStatement): New base class used for
+	expressions that can appear in statements, so that we can provide
+	an alternate path to generate expression that do not leave a value
+	on the stack.
+
+	(Expression::Emit, and all the derivatives): We no longer return
+	whether a value is left on the stack or not.  Every expression
+	after being emitted leaves a single value on the stack.
+
+	* codegen.cs (EmitContext::EmitStatementExpression): Use the
+	facilties of ExpressionStatement if possible.
+
+	* cs-parser.jay: Update statement_expression.
+
+2001-09-25  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs: Change the wording of message
+
+2001-09-25  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Binary::ResolveOperator): Had forgottten to set 
+	the type of the expression to the return type of the method if
+	we have an overloaded operator match ! The regression tests pass again !
+	(Unary::ResolveOperator): Ditto.
+
+	* expression.cs (Invocation::ConversionExists): Correct the member lookup
+	to find "op_Implicit", not "implicit" ;-)
+	(UserImplicitCast): New class to take care of user-defined implicit conversions.
+	(ConvertImplicit, ForceConversion): Take TypeContainer argument
+
+	* everywhere : Correct calls to the above accordingly.
+
+	* expression.cs (UserImplicitCast::Resolve, ::Emit): Implement.
+	(ConvertImplicit): Do user-defined conversion if it exists.
+
+2001-09-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* assign.cs: track location.
+	(Resolve): Use implicit conversions on assignment.
+
+	* literal.cs: Oops.  Not good, Emit of short access values should
+	pass (Bytes) or the wrong argument will be selected.
+
+	* expression.cs (Unary::Emit): Emit code for -expr.
+	
+	(Unary::ResolveOperator): Handle `Substract' for non-constants
+	(substract from zero from the non-constants).
+	Deal with Doubles as well. 
+	
+	(Expression::ConvertImplicitRequired): New routine that reports an
+	error if no implicit conversion exists. 
+
+	(Invocation::OverloadResolve): Store the converted implicit
+	expressions if we make them
+	
+2001-09-24  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (ConstructorInitializer): Take a Location argument.
+	(ConstructorBaseInitializer): Same here.
+	(ConstructorThisInitializer): Same here.
+
+	* cs-parser.jay : Update all calls accordingly.
+
+	* expression.cs (Unary, Binary, New): Take location argument.
+	Update accordingly everywhere.
+
+	* cs-parser.jay : Update all calls to the above to take a location
+	argument.
+
+	* class.cs : Ditto.
+
+2001-09-24  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Invocation::BetterFunction): Take TypeContainer argument
+	(Invocation::BetterConversion): Same here
+	(Invocation::ConversionExists): Ditto.
+
+	(Invocation::ConversionExists): Implement.
+
+2001-09-22  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (OverloadResolve): Improve some more to catch errors 1502 and 1503
+	Also take an additional TypeContainer argument.
+
+	* All over : Pass in TypeContainer as argument to OverloadResolve.
+
+	* typemanager.cs (CSharpName): Update to check for the string type and return
+	that too.
+
+	* expression.cs (Invocation::FullMethodDesc): New static method to return a string fully describing
+	a given method.
+	
+2001-09-21  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Invocation::OverloadResolve): Re-write to conform more to the spec.
+	(Invocation::BetterFunction): Implement.
+	(Invocation::BetterConversion): Implement.
+	(Invocation::ConversionExists): Skeleton, no implementation yet.
+
+	Okay, things work fine !
+
+2001-09-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs: declare and load enum_type, delegate_type and
+	void_type. 
+
+	* expression.cs (Expression::Emit): Now emit returns a value that
+	tells whether a value is left on the stack or not.  This strategy
+	might be reveted tomorrow with a mechanism that would address
+	multiple assignments.
+	(Expression::report118): Utility routine to report mismatches on
+	the ExprClass.
+
+	(Unary::Report23): Report impossible type/operator combination
+	utility function.
+
+	(Unary::IsIncrementableNumber): Whether the type can be
+	incremented or decremented with add.
+	(Unary::ResolveOperator): Also allow enumerations to be bitwise
+	complemented. 
+	(Unary::ResolveOperator): Implement ++, !, ~,
+
+	(Invocation::Emit): Deal with new Emit convetion.
+	
+	* All Expression derivatives: Updated their Emit method to return
+	whether they leave values on the stack or not.
+	
+	* codegen.cs (CodeGen::EmitStatement): Pop values left on the
+	stack for expressions that are statements. 
+
+2001-09-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (LValue): New interface.  Must be implemented by
+	LValue objects.
+	(LocalVariableReference, ParameterReference, FieldExpr): Implement
+	LValue interface.
+	
+	* assign.cs (Assign::Emit, Assign::Resolve): Use new LValue
+	interface for generating code, simplifies the code.
+
+2001-09-20  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (everywhere): Comment out return statements in ::Resolve
+	methods to avoid the warnings.
+
+2001-09-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs (parse): Report error 2001 if we can not open the
+	source file.
+
+	* expression.cs (SimpleName::ResolveSimpleName): Error if we can
+	not resolve it.
+
+	* cs-parser.jay (QualifierIdentifier): Pass location to SimpleName
+	object. 
+
+	* statement.cs (Block::EmitMeta): Reuse the count across all the variables,
+	otherwise nested blocks end up with the same index.
+
+	* codegen.cs (CodeGen::EmitTopBlock): Pass initial sequence
+
+	* expression.cs:  Instead of having FIXMEs in the Resolve
+	functions, throw exceptions so it is obvious that we are facing a
+	bug. 
+
+	* cs-parser.jay (invocation_expression): Pass Location information.
+
+	* codegen.cs (CodeGen::Save, CodeGen::CodeGen, CodeGen::Basename):
+	Use a basename for those routines because .NET does not like paths
+	on them. 
+
+	* class.cs (TypeContainer::AddMethod): Do not call DefineName if the name was
+	already defined.
+
+2001-09-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (TypeManager::CoreLookupType): A function to make sure that we
+	are loading the correct data types (throws an exception if not).
+	(TypeManager::InitCoreTypes): Use CoreLookupType
+
+	* expression.cs (Unary::ResolveOperator): return the child
+	expression for expressions which are just +expr.
+	(Unary::ResolveOperator): Return negative literals for -LITERAL
+	expressions (otherwise they are Unary {Literal}).
+	(Invocation::Badness): Take into account `Implicit constant
+	expression conversions'.
+
+	* literal.cs (LongLiteral): Implement long literal class.
+	(IntLiteral): export the `Value' of the intliteral. 
+
+2001-09-19  Ravi Pratap  <ravi@ximian.com>
+
+	* expression.cs (Binary::Emit): Finally get the emission right ! Woo!
+
+	* class.cs (Operator::Define): Change the methodname prefix to 'op_' 
+	instead of 'Operator'
+
+	* expression.cs (Binary::ResolveOperator): Update accordingly.
+	(Unary::Operator): Change names to 'Add' and 'Subtract' instead 'Plus'
+	and 'Minus'
+
+	* cs-parser.jay (unary_expression): Update to use the new names.
+
+	* gen-treedump.cs (GetUnary): Same here.
+
+	* expression.cs (Unary::Resolve): Implement.
+	(Binary::ResolveOperator): Re-write bits to quietly continue if no overloaded 
+	operators are found instead of making noise ;-)
+	(Unary::ResolveOperator): New method to do precisely the same thing which
+	Binary::ResolveOperator does for Binary expressions.
+	(Unary.method, .Arguments): Add.
+	(Unary::OperName): Implement.	
+	(Unary::ForceConversion): Copy and Paste !
+
+	* class.cs (Operator::Define): Fix a small bug for the case when we have 
+	a unary operator.
+
+	* expression.cs (Unary::Emit): Implement. Need to find the right Opcodes
+	for the inbuilt operators. Only overloading works for now ;-)
+
+2001-09-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (CheckedExpr::Resolve, CheckedExpr::Emit,
+	UnCheckedExpr::Resolve, UnCheckedExpr::Emit): Implement.
+
+	* expression.cs (This::Emit): Implement. 
+	(This::Resolve): Implement.
+	(TypeOf:Resolve): Implement.
+	(Expression::ResolveSimpleName): Add an implicit this to instance
+	field references. 
+	(MemberAccess::Resolve): Deal with Parameters and Fields. 
+	Bind instance variable to Field expressions.
+	(FieldExpr::Instance): New field used to track the expression that
+	represents the object instance.
+	(FieldExpr::Resolve): Track potential errors from MemberLookup not
+	binding 
+	(FieldExpr::Emit): Implement.
+
+	* codegen.cs (EmitIf, EmitStatement, EmitBlock): Propagate whether
+	the last instruction contains a return opcode to avoid generating
+	the last `ret' instruction (this generates correct code, and it is
+	nice to pass the peverify output).
+
+	* class.cs (TypeContainer::EmitFieldInitializers): Implement field
+	initializer for static and instance variables.
+	(Constructor::Emit): Allow initializer to be null in the case of
+	static constructors.  Only emit initializer for instance
+	constructors. 
+
+	(TypeContainer::FindMembers): Return a null array if there are no
+	matches.
+
+	Also fix the code for the MemberTypes.Method branch, as it was not
+	scanning that for operators (or tried to access null variables before).
+
+	* assign.cs (Assign::Emit): Handle instance and static fields. 
+
+	* TODO: Updated.
+
+	* driver.cs: Stop compilation if there are parse errors.
+
+	* cs-parser.jay (constructor_declaration): Provide default base
+	initializer for non-static constructors.
+	(constructor_declarator): Do not provide a default base
+	initializers if none was specified.
+	Catch the fact that constructors should not have parameters.
+
+	* class.cs: Do not emit parent class initializers for static
+	constructors, that should be flagged as an error.
+
+2001-09-18  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (RegisterMethodBuilder): Remove : it's unnecessary.
+	Move back code into TypeContainer::Populate.
+
+2001-09-18  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer::AddConstructor): Fix the check to
+	compare against Name, not Basename. 
+	(Operator::OpType): Change Plus and Minus to Add and Subtract.
+
+	* cs-parser.jay : Update accordingly.
+
+	* class.cs (TypeContainer::FindMembers): For the case where we are searching
+	for methods, don't forget to look into the operators too.
+	(RegisterMethodBuilder): Helper method to take care of this for
+	methods, constructors and operators.
+	(Operator::Define): Completely revamp.
+	(Operator.OperatorMethod, MethodName): New fields.
+	(TypeContainer::Populate): Move the registering of builders into
+	RegisterMethodBuilder.
+	(Operator::Emit): Re-write.
+
+	* expression.cs (Binary::Emit): Comment out code path to emit method
+	invocation stuff for the case when we have a user defined operator. I am
+	just not able to get it right !
+	
+2001-09-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Expression::OverloadResolve): Drop TypeContainer
+	argument. 
+
+	(Expression::MemberLookup): Provide a version that allows to
+	specify the MemberTypes and BindingFlags. 
+
+	* statement.cs (Block::GetVariableInfo): Forgot to recurse here,
+	so it was not fetching variable information from outer blocks.
+
+	* modifiers.cs: (Modifiers::TypeAttr): Invert condition on
+	Beforefieldinit as it was buggy.
+
+	* rootcontext.cs (::LookupInterfaceOrClass): Removed an Error -200
+	that Ravi put here.  
+
+	* class.cs (Constructor::Emit): Only emit if block is not null.
+	(TypeContainer::EmitDefaultConstructor): Removed routine, now we
+	deal with this by semantically definining it as if the user had
+	done it.
+
+	(TypeContainer::FindMembers): Removed ad-hoc hack to deal with
+	constructors as we now "emit" them at a higher level.
+
+	(TypeContainer::DefineDefaultConstructor): Used to define the
+	default constructors if none was provided.
+
+	(ConstructorInitializer): Add methods Resolve and Emit. 
+	
+	* expression.cs: Cast to ConstructorInfo instead of MethodInfo
+
+2001-09-17  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer::EmitDefaultConstructor): Register
+	the default constructor builder with our hashtable for methodbuilders
+	to methodcores.
+
+	* expression.cs (Invocation::OverloadResolve): Add a check for pd == null
+	and argument_count is 0 in which case we have a match.
+	(Binary::ResolveOperator): More null checking and miscellaneous coding
+	style cleanup.
+
+2001-09-17  Ravi Pratap  <ravi@ximian.com>
+
+	* rootcontext.cs (IsNameSpace): Compare against null.
+
+	* everywhere : Correct spelling to 'Greater' and to 'Subtract'
+
+	* class.cs (Operator::OpType): Change names to match the ones in Binary::Operator
+	and Unary::Operator.
+
+	* cs-parser.jay (operator_declaration, CheckBinaryOperator, CheckUnaryOperator): Update
+	accordingly.
+
+	* expression.cs (Binary::method): New member to hold the MethodBase for the case when
+	we have overloaded operators.
+	(Binary::ResolveOperator): Implement the part which does the operator overload
+	resolution.
+
+	* class.cs (Operator::Emit): Implement.
+	(TypeContainer::Emit): Emit the operators we have too.
+
+	* expression.cs (Binary::Emit): Update to emit the appropriate code for
+	the case when we have a user-defined operator.
+	
+2001-09-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs: Fix bug: tree.Namespaces might be null.
+
+2001-09-16  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (EmitStaticFieldInitializers, EmitFieldInitializers): Make public.
+	(TypeContainer::EmitConstructor): Remove and move code into Contructor::Emit.
+	(Constructor::Emit): Implement.
+	(EmitStaticFieldInitializers, EmitFieldInitializers): Ensure we return immediately
+	if we have no work to do. 
+	(TypeContainer::Emit): Pass in TypeContainer as argument to the constructor's 
+	Emit method.
+
+	* interface.cs (Interface::InterfaceAttr): Re-write to be more correct and complete.
+	(Interface::IsTopLevel): Add. Same as TypeContainer::IsTopLevel.
+
+	* class.cs (TypeContainer::IsTopLevel): Modify to use parent.Parent instead
+	of parent.parent.
+
+2001-09-15  Ravi Pratap  <ravi@ximian.com>
+
+	* tree.cs (Tree::namespaces): New hashtable to keep track of namespaces
+	in the source.
+	(Tree::RecordNamespace): Method to do what the name says ;-)
+	(Tree::Namespaces): Property to get at the namespaces hashtable.
+
+	* cs-parser.jay (namespace_declaration): Call RecordNamespace to 
+	keep track.
+
+	* rootcontext.cs (IsNamespace): Fixed it :-)
+
+2001-09-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (TypeContainer::FindMembers): Add support for
+	constructors. 
+	(MethodCore): New class that encapsulates both the shared aspects
+	of a Constructor and a Method.  
+	(Method, Constructor): Factored pieces into MethodCore.
+
+	* driver.cs: Added --fatal which makes errors throw exceptions.
+	Load System assembly as well as part of the standard library.
+
+	* report.cs: Allow throwing exceptions on errors for debugging.
+
+	* modifiers.cs: Do not use `parent', instead use the real type
+	container to evaluate permission settings.
+
+	* class.cs: Put Ravi's patch back in.  He is right, and we will
+	have to cope with the
+
+2001-09-14  Ravi Pratap  <ravi@ximian.com>
+
+	* modifiers.cs (TypeAttr, MethodAttr, FieldAttr): Map protected internal to
+	FamORAssem, not FamANDAssem.
+	
+2001-09-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* driver.cs: Added --parse option that only parses its input files
+	and terminates.
+
+	* class.cs: Reverted last change from Ravi to IsTopLevel.  That is
+	incorrect.  IsTopLevel is not used to tell whether an object is
+	root_types or not (that can be achieved by testing this ==
+	root_types).  But to see if this is a top-level *class* (not
+	necessarly our "toplevel" container). 
+
+2001-09-14  Ravi Pratap  <ravi@ximian.com>
+
+	* enum.cs (Enum::Define): Modify to call the Lookup method on the
+	parent instead of a direct call to GetType.
+
+2001-09-14  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer::TypeAttr): Remove property code and move it into
+	Modifiers.TypeAttr. This should just be a call to that method.
+
+	* modifiers.cs (TypeAttr): Re-write and take an extra argument, the TypeContainer
+	object so that we can determine if we are top-level or not.
+
+	* delegate.cs (Delegate::Define): Update call to TypeAttr method to pass in the 
+	TypeContainer too.
+
+	* enum.cs (Enum::Define): Ditto.
+
+	* modifiers.cs (FieldAttr): Re-write.
+
+	* class.cs (TypeContainer::IsTopLevel): Change accessibility to public.
+	(TypeContainer::HaveStaticConstructor): New property to provide access
+	to precisely that info.
+
+	* modifiers.cs (MethodAttr): Re-write.
+	(EventAttr): Remove altogether as there seems to be no ostensible use for it.
+
+	* class.cs (TypeContainer::IsTopLevel): Re-write. root_types doesn't seem to be the parent
+	of top-level types as claimed.
+	
+2001-09-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (MemberLookup): Fruitless attempt to lookup
+	constructors.  Maybe I need to emit default constructors?  That
+	might be it (currently .NET emits this for me automatically).
+	(Invocation::OverloadResolve): Cope with Arguments == null.
+	(Invocation::EmitArguments): new function, shared by the new
+	constructor and us.
+	(Invocation::Emit): Handle static and instance methods.  Emit
+	proper call instruction for virtual or non-virtual invocations.
+	(New::Emit): Implement.
+	(New::Resolve): Implement.
+	(MemberAccess:Resolve): Implement.
+	(MethodGroupExpr::InstanceExpression): used conforming to the spec
+	to track instances.
+	(FieldExpr::Resolve): Set type.
+
+	* support.cs: Handle empty arguments.
+		
+	* cs-parser.jay (CompositeLookup, QualifierIdentifier,
+	SimpleLookup): Auxiliary routines to help parse a qualifier
+	identifier.  
+
+	Update qualifier_identifier rule.
+
+	* codegen.cs: Removed debugging messages.
+
+	* class.cs: Make this a global thing, this acts just as a "key" to
+	objects that we might have around.
+
+	(Populate): Only initialize method_builders_to_methods once.
+
+	* expression.cs (PropertyExpr): Initialize type from the
+	PropertyType. 
+
+	* codegen.cs (EmitContext::EmitBoolExpression): Use propper
+	Resolve pattern.  Attempt to implicitly convert value to boolean.
+	Emit code.
+
+	* expression.cs: Set the type for the int32/int32 argument case.
+	(Binary::ResolveOperator): Set the return type to boolean for
+	comparission operators
+
+	* typemanager.cs: Remove debugging print code.
+
+	(Invocation::Resolve): resolve type.
+
+	* class.cs: Allocate a MemberInfo of the correct size, as the code
+	elsewhere depends on the test to reflect the correct contents.
+
+	(Method::) Keep track of parameters, due to System.Reflection holes
+
+	(TypeContainer::Populate): Keep track of MethodBuilders to Method
+	mapping here.
+
+	(TypeContainer::FindMembers): Use ArrayList and then copy an array
+	of the exact size and return that.
+
+	(Class::LookupMethodByBuilder): New function that maps
+	MethodBuilders to its methods.  Required to locate the information
+	on methods because System.Reflection bit us again.
+
+	* support.cs: New file, contains an interface ParameterData and
+	two implementations: ReflectionParameters and InternalParameters
+	used to access Parameter information.  We will need to grow this
+	as required.
+
+	* expression.cs (Invocation::GetParameterData): implement a cache
+	and a wrapper around the ParameterData creation for methods. 
+	(Invocation::OverloadResolve): Use new code.
+
+2001-09-13  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer::EmitField): Remove and move into 
+	(Field::Define): here and modify accordingly.
+	(Field.FieldBuilder): New member.
+	(TypeContainer::Populate): Update accordingly.
+	(TypeContainer::FindMembers): Implement.
+
+2001-09-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs: (VariableInfo::VariableType): New field to be
+	initialized with the full type once it is resolved. 
+
+2001-09-12  Miguel de Icaza  <miguel@ximian.com>
+
+	* parameter.cs (GetParameterInfo): Use a type cache to compute
+	things only once, and to reuse this information
+
+	* expression.cs (LocalVariableReference::Emit): Implement.
+	(OpcodeCast::Emit): fix.
+
+	(ParameterReference::Resolve): Implement.
+	(ParameterReference::Emit): Implement.
+
+	* cs-parser.jay: Fix bug introduced by Ravi, variable initializers
+	that are expressions need to stay as Expressions.
+
+	* typemanager.cs (CSharpName): Returns the C# name of a type if
+	possible. 
+
+	* expression.cs (Expression::ConvertImplicit): New function that
+	implements implicit type conversions.
+
+	(Expression::ImplicitReferenceConversion): Implements implicit
+	reference conversions.
+
+	(EmptyCast): New type for transparent casts.
+
+	(OpcodeCast): New type for casts of types that are performed with
+	a sequence of bytecodes.
+	
+	(BoxedCast): New type used for casting value types into reference
+	types.  Emits a box opcode.
+
+	(Binary::DoNumericPromotions): Implements numeric promotions of
+	and computation of the Binary::Type.
+
+	(Binary::EmitBranchable): Optimization.
+
+	(Binary::Emit): Implement code emission for expressions.
+	
+	* typemanager.cs (TypeManager): Added two new core types: sbyte
+	and byte.
+
+2001-09-12  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer::FindMembers): Method which does exactly
+	what Type.FindMembers does, only we don't have to use reflection. No
+	implementation yet.
+
+	* typemanager.cs (typecontainers): New hashtable to hold the corresponding
+	typecontainer objects as we need to get at them.
+	(TypeManager::AddUserType): Overload to take an extra argument, the TypeContainer.
+
+	* rootcontext.cs : Correspondingly modify called to AddUserType to pass the
+	typecontainer object.
+
+	* expression.cs (MemberLookup): Modify signature to take a RootContext object instead
+	of just a Report object.
+
+2001-09-11  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Event::Define): Go back to using the prefixes "add_" and
+	"remove_"
+	(TypeContainer::Populate): Now define the delegates of the type too.
+	(TypeContainer.Delegates): Property to access the list of delegates defined
+	in the type.
+
+	* delegates.cs (Delegate::Define): Implement partially.
+
+	* modifiers.cs (TypeAttr): Handle more flags.
+
+2001-09-11  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Indexer::Define): Fix for loop iteration condition to be just <
+	and not <=
+	(Operator::Define): Re-write logic to get types by using the LookupType method
+	instead of blindly doing a Type.GetType ! How stupid can I get ;-) ?
+ 	(Indexer::Define): Ditto.
+	(Event::Define): Ditto.
+	(Property::Define): Ditto.
+	
+2001-09-10  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer::Populate): Now define operators too. 
+	(TypeContainer.Operators): New property to access the list of operators
+	in a type.
+	(Operator.OperatorMethodBuilder): New member to hold the method builder
+	for the operator we are defining.
+	(Operator::Define): Implement.
+
+2001-09-10  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Event::Define): Make the prefixes of the accessor methods
+	addOn_ and removeOn_ 
+
+	* genericparser.cs (GenericParser::error): Overloaded method to handle the case
+	of the location being passed in too. Ideally, this should go later since all
+	error reporting should be done through the Report object.
+
+	* class.cs (TypeContainer.Indexers): New property to access the list of indexers.
+	(Populate): Iterate thru the indexers we have and define them too.
+	(Indexer.GetMethodBuilder, .SetMethodBuilder): New members to hold the method builders
+	for the get and set accessors.
+	(Indexer::Define): Implement.
+	
+2001-09-09  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (Binary::Resolve): Beginning of it.  I scratched
+	my previous implementation, did not work.
+
+	* typemanager.cs: Add a couple of missing types (the longs).
+
+	* literal.cs: Use TypeManager.bool_type instead of getting it.
+
+	* expression.cs (EventExpr): New kind of expressions.
+	(Expressio::ExprClassFromMemberInfo): finish
+
+2001-09-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* assign.cs: Emit stores to static fields differently.
+
+2001-09-08  Ravi Pratap  <ravi@ximian.com>
+
+	* Merge in changes and adjust code to tackle conflicts. Backed out my
+	code in Assign::Resolve ;-) 
+
+2001-09-08  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (CheckAttributeTarget): Modify call to error to use
+	instead Report.Error and also pass in the location.
+	(CSharpParser::Lexer): New readonly property to return the reference
+	to the Tokenizer object.
+	(declare_local_variables): Use Report.Error with location instead of plain 
+	old error.
+	(CheckDef): Ditto.
+
+	* class.cs (Operator::CheckUnaryOperator): Move into cs-parser.jay.
+	(Operator.CheckBinaryOperator): Ditto.
+
+	* cs-parser.jay (operator_declarator): Update accordingly.
+
+	* cs-parser.jay (CheckUnaryOperator): Modify to use Report.Error
+	(CheckBinaryOperator): Same here.
+
+	* rootcontext.cs (LookupType): Add an extra lookup which simply does a lookup
+	on the name without any prefixes of namespace names etc. This is because we
+	already might have something already fully qualified like 
+	'System.Console.WriteLine'
+
+	* assign.cs (Resolve): Begin implementation. Stuck ;-)
+
+2001-09-07  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-tokenizer.cs (location): Return a string which also contains
+	the file name.
+
+	* expression.cs (ElementAccess): New class for expressions of the
+	type 'element access.'
+	(BaseAccess): New class for expressions of the type 'base access.'
+	(CheckedExpr, UnCheckedExpr): New classes for Checked and Unchecked expressions
+	respectively.
+	
+	* cs-parser.jay (element_access): Implement action.
+	(base_access): Implement actions.
+	(checked_expression, unchecked_expression): Implement.
+
+	* cs-parser.jay (local_variable_type): Correct and implement.
+	(type_suffixes, type_suffix_list, type_suffix): Implement actions.
+
+	* cs-tokenizer.cs (real_type_suffix): Comment out the extra getchar.
+
+	* cs-parser.jay (rank_specifiers): Remove space while concatenating the type's
+	name and the specifiers.
+
+	* interface.cs (InterfaceAttr): New property to return the corresponding TypeAttributes
+	
+	* rootcontext.cs (CreateInterface): Use the InterfaceAttr property instead of 
+	making them all public ;-)
+
+	* cs-parser.jay (error): Remove entirely as we have an implementation in the base
+	class anyways.
+	
+2001-09-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* expression.cs (ExprClassFromMemberInfo): Return FieldExpr and
+	PropertyExprs.
+	(FieldExpr, PropertyExprs): New resolved expressions.
+	(SimpleName::MemberStaticCheck): Perform static checks for access
+	to non-static fields on static methods. Maybe this should be
+	generalized for MemberAccesses. 
+	(SimpleName::ResolveSimpleName): More work on simple name
+	resolution. 
+
+	* cs-parser.jay (primary_expression/qualified_identifier): track
+	the parameter index.
+
+	* codegen.cs (CodeGen::Save): Catch save exception, report error.
+	(EmitContext::EmitBoolExpression): Chain to expression generation
+	instead of temporary hack.
+	(::EmitStatementExpression): Put generic expression code generation.
+
+	* assign.cs (Assign::Emit): Implement variable assignments to
+	local variables, parameters and fields.
+
+2001-09-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs (Block::GetVariableInfo): New method, returns the
+	VariableInfo for a variable name in a block.
+	(Block::GetVariableType): Implement in terms of GetVariableInfo
+
+	* literal.cs (IntLiteral::Emit, FloatLiteral::Emit,
+	DoubleLiteral::Emit, CharLiteral::Emit, BoolLiteral::Emit): Implement
+
+2001-09-06  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (operator_declaration): Continue on my quest : update
+	to take attributes argument.
+	(event_declaration): Ditto.
+	(enum_declaration): Ditto.
+	(indexer_declaration): Ditto.
+	
+	* class.cs (Operator::Operator): Update constructor accordingly.
+	(Event::Event): Ditto.
+
+	* delegate.cs (Delegate::Delegate): Same here.
+
+	* enum.cs (Enum::Enum): Same here.
+	
+2001-09-05  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (CheckAttributeTarget): Update to use the right error number.
+
+	* ../tests/cs0658.cs : New file to demonstrate error 0658.
+
+	* attribute.cs (Attributes): New class to encapsulate all attributes which were
+	being passed around as an arraylist.
+	(Attributes::AddAttribute): Method to add attribute sections.
+
+	* cs-parser.jay (opt_attributes): Modify actions to use the new Attributes class.
+	(struct_declaration): Update accordingly.
+	(constant_declaration): Update.
+	(field_declaration): Update.
+	(method_header): Update.
+	(fixed_parameter): Update.
+	(parameter_array): Ditto.
+	(property_declaration): Ditto.
+	(destructor_declaration): Ditto.
+	
+	* class.cs (Struct::Struct): Update constructors accordingly.
+	(Class::Class): Ditto.
+	(Field::Field): Ditto.
+	(Method::Method): Ditto.
+	(Property::Property): Ditto.
+	(TypeContainer::OptAttribute): update property's return type.
+	
+	* interface.cs (Interface.opt_attributes): New member.
+	(Interface::Interface): Update to take the extra Attributes argument.
+
+	* parameter.cs (Parameter::Parameter): Ditto.
+
+	* constant.cs (Constant::Constant): Ditto.
+
+	* interface.cs (InterfaceMemberBase): New OptAttributes field.
+	(InterfaceMemberBase::InterfaceMemberBase): Update constructor to take 
+	the attributes as a parameter.
+	(InterfaceProperty): Update constructor call.
+	(InterfaceEvent): Ditto.
+	(InterfaceMethod): Ditto.
+	(InterfaceIndexer): Ditto.
+
+	* cs-parser.jay (interface_indexer_declaration): Update call to constructor to 
+	pass the attributes too.
+	(interface_event_declaration): Ditto.
+	(interface_property_declaration): Ditto.
+	(interface_method_declaration): Ditto.
+	(interface_declaration): Ditto.
+
+2001-09-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (Method::Define): Track the "static Main" definition to
+	create an entry point. 
+
+	* rootcontext.cs (RootContext::EntryPoint): MethodInfo that holds the
+	EntryPoint if we find it. 
+
+	* codegen.cs (EmitContext::EmitInvocation): Emit invocations.
+	(EmitContext::ig): Make this variable public.
+
+	* driver.cs: Make the default output file be the first file name
+	with the .exe extension.  
+
+	Detect empty compilations
+
+	Handle various kinds of output targets.  Handle --target and
+	rename -t to --dumper.
+
+	* expression.cs, literal.cs, assign.cs, constant.cs: All `Resolve'
+	methods inherited from Expression return now an Expression.  This
+	will is used during the tree rewriting as we resolve them during
+	semantic analysis.
+
+	(Expression::MemberLookup): Implements the MemberLookup (7.3) from
+	the spec.  Missing entirely is the information about
+	accessability of elements of it.
+
+	(Expression::ExprClassFromMemberInfo): New constructor for
+	Expressions that creates a fully initialized Expression based on
+	a MemberInfo that is one of Eventinfo, FieldINfo, PropertyInfo or
+	a Type.
+
+	(Invocation::Resolve): Begin implementing resolution of invocations.
+	
+	* literal.cs (StringLiteral):  Implement Emit.
+
+2001-09-05  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (error): Add new modifier because we are hiding an inherited
+	member.
+	
+2001-09-04  Ravi Pratap  <ravi@ximian.com>
+
+	* cs-parser.jay (attribute_arguments): Implement actions.
+	(attribute): Fix bug in production. Implement action.
+	(attribute_list): Implement.
+	(attribute_target): Implement.
+	(attribute_target_specifier, opt_target_specifier): Implement
+	(CheckAttributeTarget): New method to check if the attribute target
+	is valid.
+	(attribute_section): Implement.
+	(opt_attributes): Implement.
+
+	* attribute.cs : New file to handle attributes.
+	(Attribute): Class to hold attribute info.
+
+	* cs-parser.jay (opt_attribute_target_specifier): Remove production
+	(attribute_section): Modify production to use 2 different rules to 
+	achieve the same thing. 1 s/r conflict down !
+	Clean out commented, useless, non-reducing dimension_separator rules.
+	
+	* class.cs (TypeContainer.attributes): New member to hold list
+	of attributes for a type.
+	(Struct::Struct): Modify to take one more argument, the attribute list.
+	(Class::Class): Ditto.
+	(Field::Field): Ditto.
+	(Method::Method): Ditto.
+	(Property::Property): Ditto.
+	
+	* cs-parser.jay (struct_declaration): Update constructor call to
+	pass in the attributes too.
+	(class_declaration): Ditto.
+	(constant_declaration): Ditto.
+	(field_declaration): Ditto.
+	(method_header): Ditto.
+	(fixed_parameter): Ditto.
+	(parameter_array): Ditto.
+	(property_declaration): Ditto.
+
+	* constant.cs (Constant::Constant): Update constructor similarly.
+	Use System.Collections.
+
+	* parameter.cs (Parameter::Parameter): Update as above.
+
+2001-09-02  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (TypeContainer::AddDelegate): New method to add a delegate.
+	(TypeContainer.delegates): New member to hold list of delegates.
+
+	* cs-parser.jay (delegate_declaration): Implement the action correctly 
+	this time as I seem to be on crack ;-)
+
+2001-09-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs (RootContext::IsNamespace): new function, used to
+	tell whether an identifier represents a namespace.
+
+	* expression.cs (NamespaceExpr): A namespace expression, used only
+	temporarly during expression resolution.
+	(Expression::ResolveSimpleName, ::ResolvePrimary, ::ResolveName):
+	utility functions to resolve names on expressions.
+
+2001-09-01  Miguel de Icaza  <miguel@ximian.com>
+
+	* codegen.cs: Add hook for StatementExpressions. 
+
+	* class.cs: Fix inverted test for static flag in methods.
+
+2001-09-02  Ravi Pratap  <ravi@ximian.com>
+
+	* class.cs (Operator::CheckUnaryOperator): Correct error number used
+	to make it coincide with MS' number.
+	(Operator::CheckBinaryOperator): Ditto.
+
+	* ../errors/errors.txt : Remove error numbers added earlier.
+
+	* ../errors/cs1019.cs : Test case for error # 1019
+
+	* ../errros/cs1020.cs : Test case for error # 1020
+
+	* cs-parser.jay : Clean out commented cruft.
+	(dimension_separators, dimension_separator): Comment out. Ostensibly not
+	used anywhere - non-reducing rule.
+	(namespace_declarations): Non-reducing rule - comment out.
+
+	* enum.cs (Enum::AddEnum): Rename to AddEnumMember as I was getting confused
+	with TypeContainer::AddEnum.
+
+	* delegate.cs : New file for delegate handling classes.
+	(Delegate): Class for declaring delegates.
+
+	* makefile : Update.
+
+	* cs-parser.jay (delegate_declaration): Implement.
+
+2001-09-01  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* class.cs (Event::Define): Implement.
+	(Event.EventBuilder): New member.
+
+	* class.cs (TypeContainer::Populate): Update to define all enums and events
+	we have.
+	(Events): New property for the events arraylist we hold. Shouldn't we move to using
+	readonly fields for all these cases ?
+
+2001-08-31  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* class.cs (Property): Revamp to use the convention of making fields readonly.
+	Accordingly modify code elsewhere.
+
+	* class.cs : Apply patch from Mr. Mandar <go_mono@hotmail.com> for implementing
+	the Define method of the Property class.
+
+	* class.cs : Clean up applied patch and update references to variables etc. Fix 
+	trivial bug.
+	(TypeContainer::Populate): Update to define all the properties we have. Also
+	define all enumerations.
+
+	* enum.cs (Define): Implement.
+	
+2001-08-31  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* cs-parser.jay (overloadable_operator): The semantic value is an
+	enum of the Operator class.
+	(operator_declarator): Implement actions.
+	(operator_declaration): Implement.
+
+	* class.cs (Operator::CheckUnaryOperator): New static method to help in checking
+	validity of definitions.
+	(Operator::CheckBinaryOperator): Static method to check for binary operators
+	(TypeContainer::AddOperator): New method to add an operator to a type.
+
+	* cs-parser.jay (indexer_declaration): Added line to actually call the
+	AddIndexer method so it gets added ;-)
+
+	* ../errors/errors.txt : Update to include new error numbers. Are these numbers 
+	already taken care of by the MS compiler ?  
+
+2001-08-29  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* class.cs (Operator): New class for operator declarations.
+	(Operator::OpType): Enum for the various operators.
+
+2001-08-29  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* class.cs (TypeContainer::AddIndexer): Remove FIXME comment. We
+	ostensibly handle this in semantic analysis.
+
+	* cs-parser.jay (general_catch_clause): Comment out
+	(specific_catch_clauses, specific_catch_clause): Ditto.
+	(opt_general_catch_clause, opt_specific_catch_clauses): Ditto
+	(catch_args, opt_catch_args): New productions.
+	(catch_clause): Rewrite to use the new productions above
+	(catch_clauses): Modify accordingly.
+	(opt_catch_clauses): New production to use in try_statement
+	(try_statement): Revamp. Basically, we get rid of one unnecessary rule
+	and re-write the code in the actions to extract the specific and
+	general catch clauses by being a little smart ;-)
+
+	* ../tests/try.cs : Fix. It's not 'finalize' my friend, it's 'finally' !
+	Hooray, try and catch statements parse fine !
+	
+2001-08-28  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* statement.cs (Block::GetVariableType): Fix logic to extract the type
+	string from the hashtable of variables.
+
+	* cs-parser.jay (event_accessor_declarations): Trivial fix. Man, how did
+	I end up making that mistake ;-)
+	(catch_clauses): Fixed gross error which made Key and Value of the 
+	DictionaryEntry the same : $1 !!
+
+2001-08-28  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* cs-tokenizer.cs (initTokens): Add keywords 'add' and 'remove'
+
+	* cs-parser.jay (event_declaration): Correct to remove the semicolon
+	when the add and remove accessors are specified. 
+
+2001-08-28  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* cs-parser.jay (IndexerDeclaration): New helper class to hold
+	information about indexer_declarator.
+	(indexer_declarator): Implement actions.
+	(parsing_indexer): New local boolean used to keep track of whether
+	we are parsing indexers or properties. This is necessary because 
+	implicit_parameters come into picture even for the get accessor in the 
+	case of an indexer.
+	(get_accessor_declaration, set_accessor_declaration): Correspondingly modified.
+
+	* class.cs (Indexer): New class for indexer declarations.
+	(TypeContainer::AddIndexer): New method to add an indexer to a type.
+	(TypeContainer::indexers): New member to hold list of indexers for the
+	type.
+
+2001-08-27  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* cs-parser.jay (add_accessor_declaration): Implement action.
+	(remove_accessor_declaration): Implement action.
+	(event_accessors_declaration): Implement
+	(variable_declarators): swap statements for first rule - trivial.
+
+	* class.cs (Event): New class to hold information about event
+	declarations.
+	(TypeContainer::AddEvent): New method to add an event to a type
+	(TypeContainer::events): New member to hold list of events.
+
+	* cs-parser.jay (event_declaration): Implement actions.
+
+2001-08-27  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* cs-parser.jay (dim_separators): Implement. Make it a string
+	concatenating all the commas together, just as they appear.
+	(opt_dim_separators): Modify accordingly
+	(rank_specifiers): Update accordingly. Basically do the same
+	thing - instead, collect the brackets here.
+	(opt_rank_sepcifiers): Modify accordingly.
+	(array_type): Modify to actually return the complete type string
+	instead of ignoring the rank_specifiers.
+	(expression_list): Implement to collect the expressions
+	(variable_initializer): Implement. We make it a list of expressions
+	essentially so that we can handle the array_initializer case neatly too.
+	(variable_initializer_list): Implement.
+	(array_initializer): Make it a list of variable_initializers
+	(opt_array_initializer): Modify accordingly.
+
+	* expression.cs (New::NType): Add enumeration to help us
+	keep track of whether we have an object/delegate creation
+	or an array creation.
+	(New:NewType, New::Rank, New::Indices, New::Initializers): New
+	members to hold data about array creation.
+	(New:New): Modify to update NewType
+	(New:New): New Overloaded contructor for the array creation
+	case.
+
+	* cs-parser.jay (array_creation_expression): Implement to call
+	the overloaded New constructor.
+	
+2001-08-26  Ravi Pratap  <ravi@che.iitm.ac.in>
+
+	* class.cs (TypeContainer::Constructors): Return member
+	constructors instead of returning null.
+
+2001-08-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* typemanager.cs (InitCoreTypes): Initialize the various core
+	types after we have populated the type manager with the user
+	defined types (this distinction will be important later while
+	compiling corlib.dll)
+
+	* expression.cs, literal.cs, assign.cs, constant.cs: Started work
+	on Expression Classification.  Now all expressions have a method
+	`Resolve' and a method `Emit'.
+
+	* codegen.cs, cs-parser.jay: Fixed the bug that stopped code
+	generation from working.     Also add some temporary debugging
+	code. 
+	
+2001-08-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* codegen.cs: Lots of code generation pieces.  This is only the
+	beginning, will continue tomorrow with more touches of polish.  We
+	handle the fundamentals of if, while, do, for, return.  Others are
+	trickier and I need to start working on invocations soon.
+	
+	* gen-treedump.cs: Bug fix, use s.Increment here instead of
+	s.InitStatement. 
+
+	* codegen.cs (EmitContext): New struct, used during code
+	emission to keep a context.   Most of the code generation will be
+	here. 
+
+	* cs-parser.jay: Add embedded blocks to the list of statements of
+	this block.  So code generation proceeds in a top down fashion.
+
+2001-08-23  Miguel de Icaza  <miguel@ximian.com>
+
+	* statement.cs: Add support for multiple child blocks.
+
+2001-08-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* codegen.cs (EmitCode): New function, will emit the code for a
+	Block of code given a TypeContainer and its ILGenerator. 
+
+	* statement.cs (Block): Standard public readonly optimization.
+	(Block::Block constructors): Link children. 
+	(Block::Child): Child Linker.
+	(Block::EmitVariables): Emits IL variable declarations.
+
+	* class.cs: Drop support for MethodGroups here, delay until
+	Semantic Analysis.
+	(Method::): Applied the same simplification that I did before, and
+	move from Properties to public readonly fields.
+	(Method::ParameterTypes): Returns the parameter types for the
+	function, and implements a cache that will be useful later when I
+	do error checking and the semantic analysis on the methods is
+	performed.
+	(Constructor::GetCallingConvention): Renamed from CallingConvetion
+	and made a method, optional argument tells whether this is a class
+	or a structure to apply the `has-this' bit.
+	(Method::GetCallingConvention): Implement, returns the calling
+	convention. 
+	(Method::Define): Defines the type, a second pass is performed
+	later to populate the methods.
+
+	(Constructor::ParameterTypes): implement a cache similar to the
+	one on Method::ParameterTypes, useful later when we do semantic
+	analysis. 
+
+	(TypeContainer::EmitMethod):  New method.  Emits methods.
+
+	* expression.cs: Removed MethodGroup class from here.
+	
+	* parameter.cs (Parameters::GetCallingConvention): new method.
+
+2001-08-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (TypeContainer::Populate): Drop RootContext from the
+	argument. 
+
+	(Constructor::CallingConvention): Returns the calling convention.
+	(Constructor::ParameterTypes): Returns the constructor parameter
+	types. 
+	
+	(TypeContainer::AddConstructor): Keep track of default constructor
+	and the default static constructor.
+
+	(Constructor::) Another class that starts using `public readonly'
+	instead of properties. 
+
+	(Constructor::IsDefault): Whether this is a default constructor. 
+
+	(Field::) use readonly public fields instead of properties also.
+
+	(TypeContainer::TypeAttr, TypeContainer::AddConstructor): Keep
+	track of static constructors;  If none is used, turn on
+	BeforeFieldInit in the TypeAttributes. 
+
+	* cs-parser.jay (opt_argument_list): now the return can be null
+	for the cases where there are no arguments. 
+
+	(constructor_declarator): If there is no implicit `base' or
+	`this', then invoke the default parent constructor. 
+	
+	* modifiers.cs (MethodAttr): New static function maps a set of
+	modifiers flags into a MethodAttributes enum
+	(FieldAttr): renamed from `Map'.  So now we have FieldAttr,
+	MethodAttr, TypeAttr to represent the various mappings where the
+	modifiers are used.
+	(FieldAttr): Map also `readonly' to `FieldAttributes.InitOnly' 	
+
+2001-08-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* parameter.cs (GetParameterInfo): Fix bug where there would be no
+	method arguments.
+
+	* interface.cs (PopulateIndexer): Implemented the code generator
+	for interface indexers.
+
+2001-08-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* interface.cs (InterfaceMemberBase): Now we track the new status
+	here.  
+
+	(PopulateProperty): Implement property population.  Woohoo!  Got
+	Methods and Properties going today. 
+
+	Removed all the properties for interfaces, and replaced them with
+	`public readonly' fields. 
+
+2001-08-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* interface.cs (AddEvent, AddMethod, AddIndexer, AddProperty):
+	initialize their hashtables/arraylists only when they are needed
+	instead of doing this always.
+
+	* parameter.cs: Handle refs and out parameters.
+
+	* cs-parser.jay: Use an ArrayList to construct the arguments
+	instead of the ParameterCollection, and then cast that to a
+	Parameter[] array.
+
+	* parameter.cs: Drop the use of ParameterCollection and use
+	instead arrays of Parameters.
+
+	(GetParameterInfo): Use the Type, not the Name when resolving
+	types. 
+
+2001-08-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* parameter.cs: Eliminate the properties Name, Type and ModFlags,
+	and instead use public readonly fields.
+
+	* class.cs: Put back walking code for type containers.
+
+2001-08-11  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (MakeConstant): Code to define constants.
+
+	* rootcontext.cs (LookupType): New function.  Used to locate types 
+
+	
+2001-08-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs: OH MY!  My trick works!   It is amazing how nice
+	this System.Reflection code is.  Kudos to Microsoft
+	
+	* typemanager.cs: Implement a type cache and avoid loading all
+	types at boot time.  Wrap in LookupType the internals.  This made
+	the compiler so much faster.  Wow.  I rule!
+	
+	* driver.cs: Make sure we always load mscorlib first (for
+	debugging purposes, nothing really important).
+
+	* Renamespaced things that were on `CSC' to `CIR'.  Maybe I should
+	have moved to `CSC' rather than `CIR'.  Oh man!  The confussion!  
+
+	* rootcontext.cs: Lookup types on their namespace;  Lookup types
+	on namespaces that have been imported using the `using' keyword.
+
+	* class.cs (TypeContainer::TypeAttr): Virtualize.
+	(Class::TypeAttr): Return attributes suitable for this bad boy.
+	(Struct::TypeAttr): ditto.
+	Handle nested classes.
+	(TypeContainer::) Remove all the type visiting code, it is now
+	replaced with the rootcontext.cs code
+
+	* rootcontext.cs (GetClassBases): Added support for structs. 
+
+2001-08-06  Miguel de Icaza  <miguel@ximian.com>
+
+	* interface.cs, statement.cs, class.cs, parameter.cs,
+	rootcontext.cs, gen-treedump.cs, enum.cs, cs-parse.jay:
+	Drop use of TypeRefs, and use strings instead.
+
+2001-08-04  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs: 
+
+	* class.cs (Struct::Struct): set the SEALED flags after
+	checking the modifiers.
+	(TypeContainer::TypeAttr): new property, returns the
+	TypeAttributes for a class.  
+
+	* cs-parser.jay (type_list): Oops, list production was creating a
+	new list of base types.
+
+	* rootcontext.cs (StdLib): New property.
+	(GetInterfaceTypeByName): returns an interface by type name, and
+	encapsulates error handling here.
+	(GetInterfaces): simplified.
+	(ResolveTree): Encapsulated all the tree resolution here.
+	(CreateClass, GetClassBases, GetInterfaceOrClass): Create class
+	types. 
+	
+	* driver.cs: Add support for --nostdlib, to avoid loading the
+	default assemblies.
+	(Main): Do not put tree resolution here. 
+
+	* rootcontext.cs: Beginning of the class resolution.
+
+2001-08-03  Miguel de Icaza  <miguel@ximian.com>
+
+	* rootcontext.cs: Provide better error reporting. 
+
+	* cs-parser.jay (interface_base): set our $$ to be interfaces.
+
+	* rootcontext.cs (CreateInterface): Handle the case where there
+	are no parent interfaces.
+	
+	(CloseTypes): Routine to flush types at the end.
+	(CreateInterface): Track types.
+	(GetInterfaces): Returns an array of Types from the list of
+	defined interfaces.
+
+	* typemanager.c (AddUserType): Mechanism to track user types (puts
+	the type on the global type hash, and allows us to close it at the
+	end). 
+	
+2001-08-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* tree.cs: Removed RecordType, added RecordClass, RecordStruct and
+	RecordInterface instead.
+
+	* cs-parser.jay: Updated to reflect changes above.
+
+	* decl.cs (Definition): Keep track of the TypeBuilder type that
+	represents this type here.  Not sure we will use it in the long
+	run, but wont hurt for now.
+
+	* driver.cs: Smaller changes to accomodate the new code.
+
+	Call ResolveInterfaceBases, Call ResolveClassBases, Save assembly
+	when done. 
+
+	* rootcontext.cs (CreateInterface):  New method, used to create
+	the System.TypeBuilder type for interfaces.
+	(ResolveInterfaces): new entry point to resolve the interface
+	hierarchy. 
+	(CodeGen): Property, used to keep track of the code generator.
+
+2001-07-26  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Add a second production for delegate_declaration
+	with `VOID'.
+
+	(enum_body): Put an opt_comma here instead of putting it on
+	enum_body or enum_member_declarations so we can handle trailing
+	commas on enumeration members.  Gets rid of a shift/reduce.
+	
+	(type_list): Need a COMMA in the middle.
+
+	(indexer_declaration): Tell tokenizer to recognize get/set
+
+	* Remove old targets.
+
+	* Re-add the parser target.
+
+2001-07-13  Simon Cozens <simon@simon-cozens.org>
+
+	* cs-parser.jay: Add precendence rules for a number of operators
+	ot reduce the number of shift/reduce conflicts in the grammar.
+	
+2001-07-17  Miguel de Icaza  <miguel@ximian.com>
+
+	* tree.cs: moved IGenerator interface and renamed it to ITreeDump
+	and put it here.
+
+	Get rid of old crufty code.
+
+	* rootcontext.cs: Use this to keep track of the parsed
+	representation and the defined types available to the program. 
+
+	* gen-treedump.cs: adjust for new convention.
+
+	* type.cs: Split out the type manager, and the assembly builder
+	from here. 
+
+	* typemanager.cs: the type manager will live here now.
+
+	* cil-codegen.cs: And the code generator here. 
+
+2001-07-14  Sean MacIsaac  <macisaac@ximian.com>
+
+	* makefile: Fixed up for easy making.
+
+2001-07-13  Simon Cozens <simon@simon-cozens.org>
+
+	* cs-parser.jay (rank_specifier): Remove a conflict by reordering
+	the 
+
+	(unary_expression): Expand pre_increment_expression and
+	post_decrement_expression to reduce a shift/reduce.
+
+2001-07-11  Simon Cozens
+
+	* cs-tokenizer.cs: Hex numbers should begin with a 0.
+
+	Improve allow_keyword_as_indent name.
+
+2001-06-19  Miguel de Icaza  <miguel@ximian.com>
+
+	* Adjustments for Beta2. 
+
+2001-06-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* decl.cs: Added `Define' abstract method.
+	(InTransit): new property, used to catch recursive definitions. 
+
+	* interface.cs: Implement `Define'. 
+
+	* modifiers.cs: Map Modifiers.constants to
+	System.Reflection.TypeAttribute flags.
+
+	* class.cs: Keep track of types and user-defined types.
+	(BuilderInit): New method for creating an assembly
+	(ResolveType): New function to launch the resolution process, only
+	used by interfaces for now.
+
+	* cs-parser.jay: Keep track of Classes, Structs and Interfaces
+	that are inserted into the name space. 
+
+2001-06-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* ARGH.  I have screwed up my tree so many times due to the use of
+	rsync rather than using CVS.  Going to fix this at once. 
+
+	* driver.cs: Objetify driver.  Load assemblies, use assemblies to
+	load types.
+
+2001-06-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* Experiment successful: Use System.Type rather that our own
+	version of Type.  
+
+2001-05-25  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Removed nsAliases from here.
+
+	Use new namespaces, handle `using XXX;' 
+
+	* namespace.cs: Reimplemented namespace handling, use a recursive
+	definition of the class.  Now we can keep track of using clauses
+	and catch invalid using clauses.
+
+2001-05-24  Miguel de Icaza  <miguel@ximian.com>
+
+	* gen-treedump.cs: Adapted for all the renaming.
+
+	* expression.cs (Expression): this class now has a Type property
+	which returns an expression Type.
+
+	(Probe::, New::, TypeOf::, SizeOf::, Constant::): renamed from
+	`Type', as this has a different meaning now in the base
+
+2001-05-22  Miguel de Icaza  <miguel@ximian.com>
+
+	* interface.cs, class.cs: Removed from all the sources the
+	references to signature computation, as we can not do method
+	signature computation during the parsing time, as we are not
+	trying to solve at that point distinguishing:
+
+	class X {
+		void a (Blah x) {}
+		void a (NS.Blah x) {}
+	}
+
+	Which depending on the context might be valid or not, as we do not
+	know if Blah is the same thing as NS.Blah at that point.
+
+	* Redid everything so the code uses TypeRefs now instead of
+	Types.  TypeRefs are just temporary type placeholders, that need
+	to be resolved.  They initially have a pointer to a string and the
+	current scope in which they are used.  This is used later by the
+	compiler to resolve the reference to an actual Type. 
+
+	* DeclSpace is no longer a CIR.Type, and neither are
+	TypeContainers (Class and Struct) nor Interfaces nor Enums.  They
+	are all DeclSpaces, but no Types. 
+
+	* type.cs (TypeRefManager): This implements the TypeRef manager,
+	which keeps track of all the types that need to be resolved after
+	the parsing has finished. 
+
+2001-05-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* ARGH.  We are going to have to store `foreach' as a class rather
+	than resolving it, as we need to verify error 1579 after name
+	resolution.   *OR* we could keep a flag that says `This request to
+	IEnumerator comes from a foreach statement' which we can then use
+	to generate the error.
+
+2001-05-10  Miguel de Icaza  <miguel@ximian.com>
+
+	* class.cs (TypeContainer.AddMethod): we now add methods to the
+	MethodGroup instead of the method hashtable.  
+
+	* expression.cs: Add MethodGroup abstraction, which gets us one
+	step closer to the specification in the way we handle method
+	declarations.  
+
+	* cs-parser.jay (primary_expression): qualified_identifier now
+	tried to match up an identifier to a local variable reference or
+	to a parameter reference.
+
+	current_local_parameters is now a parser global variable that
+	points to the current parameters for the block, used during name
+	lookup.
+
+	(property_declaration): Now creates an implicit `value' argument to
+	the set accessor.
+
+2001-05-09  Miguel de Icaza  <miguel@ximian.com>
+
+	* parameter.cs: Do not use `param' arguments as part of the
+	signature, per the spec.
+
+2001-05-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* decl.cs: Base class for classes, structs and interfaces.  This
+	is the "Declaration Space" 
+
+	* cs-parser.jay: Use CheckDef for checking declaration errors
+	instead of having one on each function.
+
+	* class.cs: Factor out some code for handling error handling in
+	accordance to the "Declarations" section in the "Basic Concepts"
+	chapter in the ECMA C# spec.
+
+	* interface.cs: Make all interface member classes derive from
+	InterfaceMemberBase.
+
+2001-05-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* Many things: all interfaces are parsed and generated in
+	gen-treedump.  Support for member variables, constructors,
+	destructors, properties, constants is there.
+
+	Beginning of the IL backend, but very little done, just there for
+	testing purposes. 
+
+2001-04-29  Miguel de Icaza  <miguel@ximian.com>
+
+	* cs-parser.jay: Fix labeled statement.
+
+	* cs-tokenizer.cs (escape): Escape " and ' always.
+	ref_line, ref_name: keep track of the line/filename as instructed
+	by #line by the compiler.
+	Parse #line.
+
+2001-04-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* System.CodeDOM/CodeBinaryOperatorExpression.cs: Rearrange enum
+	to match the values in System.CodeDOM.
+
+	Divid renamed to Divide.
+
+	* System.CodeDOM/CodeForLoopStatement.cs: Always have valid
+	statements. 
+	(Statements.set): remove.
+
+	* System.CodeDOM/CodeCatchClause.cs: always have a valid
+	statements. 
+
+	* System.CodeDOM/CodeIfStatement.cs: trueStatements and
+	falseStatements always have valid values. 
+
+	* cs-parser.jay: Use System.CodeDOM now.
+
diff --git a/mcs/mcs/TODO b/mcs/mcs/TODO
new file mode 100644
index 00000000000..ef8d147e490
--- /dev/null
+++ b/mcs/mcs/TODO
@@ -0,0 +1,214 @@
+TODO:
+
+	1. Create a "partial" emit context for each TypeContainer..
+
+	2. EmitContext should be partially constructed.  No IL Generator.
+
+	interface_type review.
+
+	parameter_array, line 952: `note: must be a single dimension array type'.  Validate this
+
+Dead Code Elimination bugs:
+---------------------------
+
+	I should also resolve all the children expressions in Switch, Fixed, Using.
+
+Major tasks:
+------------
+
+	Pinned and volatile require type modifiers that can not be encoded
+	with Reflection.Emit.
+
+	Properties and 17.6.3: Finish it.
+
+	Implement base indexer access.
+
+readonly variables and ref/out
+	
+BUGS
+----
+
+* We suck at reporting what turns out to be error -6.  Use the standard error message
+  instead.
+
+* Check for Final when overriding, if the parent is Final, then we cant
+  allow an override.
+
+* Interface indexers
+
+	I have not figured out why the Microsoft version puts an
+	`instance' attribute, and I am not generating this `instance' attribute.
+
+	Explanation: The reason for the `instance' attribute on
+	indexers is that indexers only apply to instances
+
+* Break/Continue statements
+
+	A finally block should reset the InLoop/LoopBegin/LoopEnd, as
+	they are logically outside the scope of the loop.
+
+* Break/continue part 2.
+
+	They should transfer control to the finally block if inside a try/catch
+	block.
+
+* Method Registration and error CS111
+
+	The way we use the method registration to signal 111 is wrong.
+	
+	Method registration should only be used to register methodbuilders,
+	we need an alternate method of checking for duplicates.
+
+*
+> // CSC sets beforefieldinit
+> class X {
+>   // .cctor will be generated by compiler
+>   public static readonly object O = new System.Object ();
+>   public static void Main () {}
+> }
+> 
+
+PENDING TASKS
+-------------
+
+* IMprove error handling here:
+
+	public static Process ()
+
+	THat assumes that it is a constructor, check if its the same name
+	as the class, if not report a different error than the one we use now.
+
+* Merge test 89 and test-34
+
+* Revisit
+
+	Primary-expression, as it has now been split into 
+	non-array-creation-expression and array-creation-expression.
+		
+* Static flow analysis
+
+	Required to warn about reachability of code and definite
+	assignemt as well as missing returns on functions.
+
+* Code cleanup
+
+	The information when registering a method in InternalParameters
+	is duplicated, you can always get the types from the InternalParameters
+
+* Emit modreq for volatiles
+
+	Handle modreq from public apis.
+
+* Emit `pinned' for pinned local variables.
+
+	Both `modreq' and pinned will require special hacks in the compiler.
+
+* Make sure that we are pinning the right variable
+
+* Maybe track event usage?  Currently I am not tracking these, although they
+  are fields.
+
+* Merge tree.cs, rootcontext.cs
+
+OPTIMIZATIONS
+-------------
+
+* User Defined Conversions is doing way too many calls to do union sets that are not needed
+
+* Add test case for destructors
+
+* Places that use `Ldelema' are basically places where I will be
+  initializing a value type.  I could apply an optimization to 
+  disable the implicit local temporary from being created (by using
+  the method in New).
+
+* Dropping TypeContainer as an argument to EmitContext
+
+ 	My theory is that I can get rid of the TypeBuilder completely from
+	the EmitContext, and have typecasts where it is used (from
+	DeclSpace to where it matters).  
+
+	The only pending problem is that the code that implements Aliases
+	is on TypeContainer, and probably should go in DeclSpace.
+
+* Use of local temporary in UnaryMutator
+
+	We should get rid of the Localtemporary there for some cases
+
+* Emitcontext
+
+	Do we really need to instanciate this variable all the time?
+
+	It could be static for all we care, and just use it for making
+	sure that there are no recursive invocations on it.
+
+* ConvertImplicit
+
+	Currently ConvertImplicit will not catch things like:
+
+	- IntLiteral in a float context to generate a -FloatLiteral.
+	Instead it will perform an integer load followed by a conversion.
+
+* Tests
+
+	Write tests for the various reference conversions.  We have
+	test for all the numeric conversions.
+
+* Optimizations
+
+	In Indexers and Properties, probably support an EmitWithDup
+	That emits the code to call Get and then leaves a this pointer
+	in the stack, so that later a Store can be emitted using that
+	this pointer (consider Property++ or Indexer++)
+
+* Optimizations: variable allocation.
+
+	When local variables of a type are required, we should request
+	the variable and later release it when we are done, so that
+	the same local variable slot can be reused later on.
+
+* Add a cache for the various GetArrayMethod operations.
+
+* TypeManager.FindMembers:
+
+	Instead of having hundreds of builder_to_blah hash table, have
+	a single one that maps a TypeBuilder `t' to a set of classes
+	that implement an interface that supports FindMembers.
+
+* MakeUnionSet Callers
+
+	If the types are the same, there is no need to compute the unionset,
+ 	we can just use the list from one of the types.
+
+* Factor all the FindMembers in all the FindMembers providers.
+
+* Factor the lookup code for class declarations an interfaces
+  (interface.cs:GetInterfaceByName)
+
+RECOMMENDATIONS
+---------------
+
+* Use of lexer.Location in the parser
+
+	Currently we do:
+
+	TOKEN nt TERMINAL nt TERMINAL nt3 {
+		$$ = new Blah ($2, $4, $6, lexer.Location);
+	}
+
+	This is bad, because the lexer.Location is for the last item in `nt3'
+
+	We need to change that to use this pattern:
+
+	TOKEN { oob_stack.Push (lexer.Location) } nt TERMINAL nt TERMINAL nt3 {
+		$$ = new Blah ($3, $5, $7, (Location) oob_stack.Pop ());
+	}
+
+	Notice how numbering of the arguments changes as the
+	{ oob_stack.Push (lexer.Location) } takes a "slot"  in the productions.
+
+* local_variable_declaration
+
+	Not sure that this grammar is correct, we might have to
+	resolve this during semantic analysis.
+
diff --git a/mcs/mcs/assign.cs b/mcs/mcs/assign.cs
new file mode 100755
index 00000000000..225283189fd
--- /dev/null
+++ b/mcs/mcs/assign.cs
@@ -0,0 +1,492 @@
+//
+// assign.cs: Assignments.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Martin Baulig (martin@gnome.org)
+//
+// (C) 2001, 2002 Ximian, Inc.
+//
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   This interface is implemented by expressions that can be assigned to.
+	/// </summary>
+	/// <remarks>
+	///   This interface is implemented by Expressions whose values can not
+	///   store the result on the top of the stack.
+	///
+	///   Expressions implementing this (Properties, Indexers and Arrays) would
+	///   perform an assignment of the Expression "source" into its final
+	///   location.
+	///
+	///   No values on the top of the stack are expected to be left by
+	///   invoking this method.
+	/// </remarks>
+	public interface IAssignMethod {
+		//
+		// This method will emit the code for the actual assignment
+		//
+		void EmitAssign (EmitContext ec, Expression source);
+
+		//
+		// This method is invoked before any code generation takes
+		// place, and it is a mechanism to inform that the expression
+		// will be invoked more than once, and that the method should
+		// use temporary values to avoid having side effects
+		//
+		// Example: a [ g () ] ++
+		//
+		void CacheTemporaries (EmitContext ec);
+	}
+
+	/// <summary>
+	///   An Expression to hold a temporary value.
+	/// </summary>
+	/// <remarks>
+	///   The LocalTemporary class is used to hold temporary values of a given
+	///   type to "simulate" the expression semantics on property and indexer
+	///   access whose return values are void.
+	///
+	///   The local temporary is used to alter the normal flow of code generation
+	///   basically it creates a local variable, and its emit instruction generates
+	///   code to access this value, return its address or save its value.
+	/// </remarks>
+	public class LocalTemporary : Expression, IMemoryLocation {
+		LocalBuilder builder;
+		
+		public LocalTemporary (EmitContext ec, Type t)
+		{
+			type = t;
+			eclass = ExprClass.Value;
+			loc = Location.Null;
+			builder = ec.GetTemporaryStorage (t);
+		}
+
+		public void Release (EmitContext ec)
+		{
+			ec.FreeTemporaryStorage (builder);
+			builder = null;
+		}
+		
+		public LocalTemporary (LocalBuilder b, Type t)
+		{
+			type = t;
+			eclass = ExprClass.Value;
+			loc = Location.Null;
+			builder = b;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldloc, builder); 
+		}
+
+		public void Store (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Stloc, builder);
+		}
+
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			ec.ig.Emit (OpCodes.Ldloca, builder);
+		}
+	}
+
+	/// <summary>
+	///   The Assign node takes care of assigning the value of source into
+	///   the expression represented by target. 
+	/// </summary>
+	public class Assign : ExpressionStatement {
+		protected Expression target, source, real_source;
+		protected LocalTemporary temp = null, real_temp = null;
+		protected Assign embedded = null;
+		protected bool is_embedded = false;
+		protected bool must_free_temp = false;
+
+		public Assign (Expression target, Expression source, Location l)
+		{
+			this.target = target;
+			this.source = this.real_source = source;
+			this.loc = l;
+		}
+
+		protected Assign (Assign embedded, Location l)
+			: this (embedded.target, embedded.source, l)
+		{
+			this.is_embedded = true;
+		}
+
+		public Expression Target {
+			get {
+				return target;
+			}
+
+			set {
+				target = value;
+			}
+		}
+
+		public Expression Source {
+			get {
+				return source;
+			}
+
+			set {
+				source = value;
+			}
+		}
+
+		public static void error70 (EventInfo ei, Location l)
+		{
+			Report.Error (70, l, "The event '" + ei.Name +
+				      "' can only appear on the left-side of a += or -= (except when" +
+				      " used from within the type '" + ei.DeclaringType + "')");
+		}
+
+		//
+		// Will return either `this' or an instance of `New'.
+		//
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// Create an embedded assignment if our source is an assignment.
+			if (source is Assign)
+				source = embedded = new Assign ((Assign) source, loc);
+
+			real_source = source = source.Resolve (ec);
+			if (source == null)
+				return null;
+
+			//
+			// This is used in an embedded assignment.
+			// As an example, consider the statement "A = X = Y = Z".
+			//
+			if (is_embedded && !(source is Constant)) {
+				// If this is the innermost assignment (the "Y = Z" in our example),
+				// create a new temporary local, otherwise inherit that variable
+				// from our child (the "X = (Y = Z)" inherits the local from the
+				// "Y = Z" assignment).
+				if (embedded == null)
+					real_temp = temp = new LocalTemporary (ec, source.Type);
+				else
+					temp = embedded.temp;
+
+				// Set the source to the new temporary variable.
+				// This means that the following target.ResolveLValue () will tell
+				// the target to read it's source value from that variable.
+				source = temp;
+			}
+
+			// If we have an embedded assignment, use the embedded assignment's temporary
+			// local variable as source.
+			if (embedded != null)
+				source = (embedded.temp != null) ? embedded.temp : embedded.source;
+
+			target = target.ResolveLValue (ec, source);
+
+			if (target == null)
+				return null;
+
+			Type target_type = target.Type;
+			Type source_type = real_source.Type;
+
+			// If we're an embedded assignment, our parent will reuse our source as its
+			// source, it won't read from our target.
+			if (is_embedded)
+				type = source_type;
+			else
+				type = target_type;
+			eclass = ExprClass.Value;
+
+			//
+			// If we are doing a property assignment, then
+			// set the `value' field on the property, and Resolve
+			// it.
+			//
+			if (target is PropertyExpr){
+				PropertyExpr property_assign = (PropertyExpr) target;
+
+				if (source_type != target_type){
+					source = ConvertImplicitRequired (ec, source, target_type, loc);
+					if (source == null)
+						return null;
+				}
+
+				//
+				// FIXME: Maybe handle this in the LValueResolve
+				//
+				if (!property_assign.VerifyAssignable ())
+					return null;
+
+				return this;
+			}
+
+			if (target is IndexerAccess) {
+				return this;
+			}
+
+			if (target is EventExpr) {
+				EventInfo ei = ((EventExpr) target).EventInfo;
+
+				Expression ml = MemberLookup (
+					ec, ec.ContainerType, ei.Name,
+					MemberTypes.Event, AllBindingFlags | BindingFlags.DeclaredOnly, loc);
+
+				if (ml == null) {
+				        //
+					// If this is the case, then the Event does not belong 
+					// to this Type and so, according to the spec
+					// is allowed to only appear on the left hand of
+					// the += and -= operators
+					//
+					// Note that target will not appear as an EventExpr
+					// in the case it is being referenced within the same type container;
+					// it will appear as a FieldExpr in that case.
+					//
+					
+					if (!(source is Binary)) {
+						error70 (ei, loc);
+						return null;
+					} else {
+						Binary tmp = ((Binary) source);
+						if (tmp.Oper != Binary.Operator.Addition &&
+						    tmp.Oper != Binary.Operator.Subtraction) {
+							error70 (ei, loc);
+							return null;
+						}
+					}
+				}
+			}
+			
+			if (source is New && target_type.IsValueType){
+				New n = (New) source;
+
+				n.ValueTypeVariable = target;
+				return n;
+			}
+
+			if (target.eclass != ExprClass.Variable && target.eclass != ExprClass.EventAccess){
+				Report.Error (131, loc,
+					      "Left hand of an assignment must be a variable, " +
+					      "a property or an indexer");
+				return null;
+			}
+
+			if ((source.eclass == ExprClass.Type) && (source is TypeExpr)) {
+				source.Error118 ("variable or value");
+				return null;
+			} else if (source is MethodGroupExpr){
+				((MethodGroupExpr) source).ReportUsageError ();
+				return null;
+			}
+
+			if (target_type == source_type)
+				return this;
+			
+			//
+			// If this assignemnt/operator was part of a compound binary
+			// operator, then we allow an explicit conversion, as detailed
+			// in the spec. 
+			//
+
+			if (this is CompoundAssign){
+				CompoundAssign a = (CompoundAssign) this;
+				
+				Binary b = source as Binary;
+				if (b != null && b.IsBuiltinOperator){
+					//
+					// 1. if the source is explicitly convertible to the
+					//    target_type
+					//
+					
+					source = ConvertExplicit (ec, source, target_type, loc);
+					if (source == null){
+						Error_CannotConvertImplicit (loc, source_type, target_type);
+						return null;
+					}
+				
+					//
+					// 2. and the original right side is implicitly convertible to
+					// the type of target_type.
+					//
+					if (StandardConversionExists (a.original_source, target_type))
+						return this;
+
+					Error_CannotConvertImplicit (loc, a.original_source.Type, target_type);
+					return null;
+				}
+			}
+			
+			source = ConvertImplicitRequired (ec, source, target_type, loc);
+			if (source == null)
+				return null;
+
+			// If we're an embedded assignment, we need to create a new temporary variable
+			// for the converted value.  Our parent will use this new variable as its source.
+			// The same applies when we have an embedded assignment - in this case, we need
+			// to convert our embedded assignment's temporary local variable to the correct
+			// type and store it in a new temporary local.
+			if (is_embedded || embedded != null) {
+				type = target_type;
+				temp = new LocalTemporary (ec, type);
+				must_free_temp = true;
+			}
+			
+			return this;
+		}
+
+		Expression EmitEmbedded (EmitContext ec)
+		{
+			// Emit an embedded assignment.
+			
+			if (real_temp != null) {
+				// If we're the innermost assignment, `real_source' is the right-hand
+				// expression which gets assigned to all the variables left of it.
+				// Emit this expression and store its result in real_temp.
+				real_source.Emit (ec);
+				real_temp.Store (ec);
+			}
+
+			if (embedded != null)
+				embedded.EmitEmbedded (ec);
+
+			// This happens when we've done a type conversion, in this case source will be
+			// the expression which does the type conversion from real_temp.
+			// So emit it and store the result in temp; this is the var which will be read
+			// by our parent.
+			if (temp != real_temp) {
+				source.Emit (ec);
+				temp.Store (ec);
+			}
+
+			Expression temp_source = (temp != null) ? temp : source;
+			((IAssignMethod) target).EmitAssign (ec, temp_source);
+			return temp_source;
+		}
+
+		void ReleaseEmbedded (EmitContext ec)
+		{
+			if (embedded != null)
+				embedded.ReleaseEmbedded (ec);
+
+			if (real_temp != null)
+				real_temp.Release (ec);
+
+			if (must_free_temp)
+				temp.Release (ec);
+		}
+
+		void Emit (EmitContext ec, bool is_statement)
+		{
+			if (target is EventExpr) {
+				((EventExpr) target).EmitAddOrRemove (ec, source);
+				return;
+			}
+
+			//
+			// FIXME! We need a way to "probe" if the process can
+			// just use `dup' to propagate the result
+			// 
+			IAssignMethod am = (IAssignMethod) target;
+
+			if (this is CompoundAssign){
+				am.CacheTemporaries (ec);
+			}
+
+			Expression temp_source;
+			if (embedded != null) {
+				temp_source = embedded.EmitEmbedded (ec);
+
+				if (temp != null) {
+					source.Emit (ec);
+					temp.Store (ec);
+					temp_source = temp;
+				}
+			} else
+				temp_source = source;
+
+			if (is_statement)
+				am.EmitAssign (ec, temp_source);
+			else {
+				LocalTemporary tempo;
+
+				tempo = new LocalTemporary (ec, source.Type);
+
+				temp_source.Emit (ec);
+				tempo.Store (ec);
+				am.EmitAssign (ec, tempo);
+				tempo.Emit (ec);
+				tempo.Release (ec);
+			}
+
+			if (embedded != null) {
+				if (temp != null)
+					temp.Release (ec);
+				embedded.ReleaseEmbedded (ec);
+			}
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			Emit (ec, false);
+		}
+
+		public override void EmitStatement (EmitContext ec)
+		{
+			Emit (ec, true);
+		}
+	}
+
+	
+	//
+	// This class is used for compound assignments.  
+	//
+	class CompoundAssign : Assign {
+		Binary.Operator op;
+		public Expression original_source;
+		
+		public CompoundAssign (Binary.Operator op, Expression target, Expression source, Location l)
+			: base (target, source, l)
+		{
+			original_source = source;
+			this.op = op;
+		}
+
+		public Expression ResolveSource (EmitContext ec)
+		{
+			return original_source.Resolve (ec);
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			target = target.ResolveLValue (ec, source);
+			if (target == null)
+				return null;
+
+			original_source = original_source.Resolve (ec);
+			if (original_source == null)
+				return null;
+
+			//
+			// Only now we can decouple the original source/target
+			// into a tree, to guarantee that we do not have side
+			// effects.
+			//
+			source = new Binary (op, target, original_source, loc);
+			return base.DoResolve (ec);
+		}
+	}
+}
+
+
+
+
diff --git a/mcs/mcs/attribute.cs b/mcs/mcs/attribute.cs
new file mode 100644
index 00000000000..c1bb29a420e
--- /dev/null
+++ b/mcs/mcs/attribute.cs
@@ -0,0 +1,889 @@
+//

+// attribute.cs: Attribute Handler

+//

+// Author: Ravi Pratap (ravi@ximian.com)

+//

+// Licensed under the terms of the GNU GPL

+//

+// (C) 2001 Ximian, Inc (http://www.ximian.com)

+//

+//

+

+using System;

+using System.Diagnostics;

+using System.Collections;

+using System.Reflection;

+using System.Reflection.Emit;

+using System.Runtime.InteropServices;

+using System.Runtime.CompilerServices;

+using System.Text;

+

+namespace Mono.CSharp {

+

+	public class Attribute {

+		public readonly string    Name;

+		public readonly ArrayList Arguments;

+

+		Location Location;

+

+		public Type Type;

+		

+		//

+		// The following are only meaningful when the attribute

+		// being emitted is one of the builtin ones

+		//

+		AttributeTargets Targets;

+		bool AllowMultiple;

+		bool Inherited;

+

+		bool UsageAttr = false;

+		

+		MethodImplOptions ImplOptions;

+		UnmanagedType     UnmanagedType;

+		CustomAttributeBuilder cb;

+		

+		public Attribute (string name, ArrayList args, Location loc)

+		{

+			Name = name;

+			Arguments = args;

+			Location = loc;

+		}

+

+		void Error_InvalidNamedArgument (string name)

+		{

+			Report.Error (617, Location, "'" + name + "' is not a valid named attribute " +

+				      "argument. Named attribute arguments must be fields which are not " +

+				      "readonly, static or const, or properties with a set accessor which "+

+				      "are not static.");

+		}

+

+		void Error_AttributeArgumentNotValid ()

+		{

+			Report.Error (182, Location,

+				      "An attribute argument must be a constant expression, typeof " +

+				      "expression or array creation expression");

+		}

+

+		static void Error_AttributeConstructorMismatch (Location loc)

+		{

+			Report.Error (

+					-6, loc,

+					"Could not find a constructor for this argument list.");

+		}

+		

+		private Type CheckAttributeType (EmitContext ec) {

+			Type t;

+			bool isattributeclass = true;

+			

+			t = RootContext.LookupType (ec.DeclSpace, Name, true, Location);

+			if (t != null) {

+				isattributeclass = t.IsSubclassOf (TypeManager.attribute_type);

+				if (isattributeclass)

+					return t;

+			}

+			t = RootContext.LookupType (ec.DeclSpace, Name + "Attribute", true, Location);

+			if (t != null) {

+				if (t.IsSubclassOf (TypeManager.attribute_type))

+					return t;

+			}

+			if (!isattributeclass) {

+				Report.Error (616, Location, "'" + Name + "': is not an attribute class");

+				return null;

+			}

+			if (t != null) {

+				Report.Error (616, Location, "'" + Name + "Attribute': is not an attribute class");

+				return null;

+			}

+			Report.Error (

+				246, Location, "Could not find attribute '" + Name + "' (are you" +

+				" missing a using directive or an assembly reference ?)");

+			return null;

+		}

+

+		public Type ResolveType (EmitContext ec)

+		{

+			Type = CheckAttributeType (ec);

+			return Type;

+		}

+

+		

+		public CustomAttributeBuilder Resolve (EmitContext ec)

+		{

+			if (Type == null)

+				Type = CheckAttributeType (ec);

+			if (Type == null)

+				return null;

+

+			bool MethodImplAttr = false;

+			bool MarshalAsAttr = false;

+

+			UsageAttr = false;

+

+			if (Type == TypeManager.attribute_usage_type)

+				UsageAttr = true;

+			if (Type == TypeManager.methodimpl_attr_type)

+				MethodImplAttr = true;

+			if (Type == TypeManager.marshal_as_attr_type)

+				MarshalAsAttr = true;

+

+			// Now we extract the positional and named arguments

+			

+			ArrayList pos_args = new ArrayList ();

+			ArrayList named_args = new ArrayList ();

+			int pos_arg_count = 0;

+			

+			if (Arguments != null) {

+				pos_args = (ArrayList) Arguments [0];

+				if (pos_args != null)

+					pos_arg_count = pos_args.Count;

+				if (Arguments.Count > 1)

+					named_args = (ArrayList) Arguments [1];

+			}

+

+			object [] pos_values = new object [pos_arg_count];

+

+			//

+			// First process positional arguments 

+			//

+

+			int i;

+			for (i = 0; i < pos_arg_count; i++) {

+				Argument a = (Argument) pos_args [i];

+				Expression e;

+

+				if (!a.Resolve (ec, Location))

+					return null;

+

+				e = a.Expr;

+				if (e is Constant) {

+					pos_values [i] = ((Constant) e).GetValue ();

+				} else if (e is TypeOf) {

+					pos_values [i] = ((TypeOf) e).TypeArg;

+				} else {

+					Error_AttributeArgumentNotValid ();

+					return null;

+				}

+				

+				if (UsageAttr)

+					this.Targets = (AttributeTargets) pos_values [0];

+				

+				if (MethodImplAttr)

+					this.ImplOptions = (MethodImplOptions) pos_values [0];

+				

+				if (MarshalAsAttr)

+					this.UnmanagedType =

+					(System.Runtime.InteropServices.UnmanagedType) pos_values [0];

+			}

+

+			//

+			// Now process named arguments

+			//

+

+			ArrayList field_infos = new ArrayList ();

+			ArrayList prop_infos  = new ArrayList ();

+			ArrayList field_values = new ArrayList ();

+			ArrayList prop_values = new ArrayList ();

+			

+			for (i = 0; i < named_args.Count; i++) {

+				DictionaryEntry de = (DictionaryEntry) named_args [i];

+				string member_name = (string) de.Key;

+				Argument a  = (Argument) de.Value;

+				Expression e;

+				

+				if (!a.Resolve (ec, Location))

+					return null;

+

+				Expression member = Expression.MemberLookup (

+					ec, Type, member_name,

+					MemberTypes.Field | MemberTypes.Property,

+					BindingFlags.Public | BindingFlags.Instance,

+					Location);

+

+				if (member == null || !(member is PropertyExpr || member is FieldExpr)) {

+					Error_InvalidNamedArgument (member_name);

+					return null;

+				}

+

+				e = a.Expr;

+				if (member is PropertyExpr) {

+					PropertyExpr pe = (PropertyExpr) member;

+					PropertyInfo pi = pe.PropertyInfo;

+

+					if (!pi.CanWrite) {

+						Error_InvalidNamedArgument (member_name);

+						return null;

+					}

+

+					if (e is Constant) {

+						object o = ((Constant) e).GetValue ();

+						prop_values.Add (o);

+						

+						if (UsageAttr) {

+							if (member_name == "AllowMultiple")

+								this.AllowMultiple = (bool) o;

+							if (member_name == "Inherited")

+								this.Inherited = (bool) o;

+						}

+						

+					} else { 

+						Error_AttributeArgumentNotValid ();

+						return null;

+					}

+					

+					prop_infos.Add (pi);

+					

+				} else if (member is FieldExpr) {

+					FieldExpr fe = (FieldExpr) member;

+					FieldInfo fi = fe.FieldInfo;

+

+					if (fi.IsInitOnly) {

+						Error_InvalidNamedArgument (member_name);

+						return null;

+					}

+

+					//

+					// Handle charset here, and set the TypeAttributes

+					

+					if (e is Constant){

+						object value = ((Constant) e).GetValue ();

+						

+						field_values.Add (value);

+					} else { 

+						Error_AttributeArgumentNotValid ();

+						return null;

+					}

+					

+					field_infos.Add (fi);

+				}

+			}

+

+			Expression mg = Expression.MemberLookup (

+				ec, Type, ".ctor", MemberTypes.Constructor,

+				BindingFlags.Public | BindingFlags.Instance, Location);

+

+			if (mg == null) {

+				Error_AttributeConstructorMismatch (Location);

+				return null;

+			}

+

+			MethodBase constructor = Invocation.OverloadResolve (

+				ec, (MethodGroupExpr) mg, pos_args, Location);

+

+			if (constructor == null) {

+				Error_AttributeConstructorMismatch (Location);

+				return null;

+			}

+			

+			PropertyInfo [] prop_info_arr = new PropertyInfo [prop_infos.Count];

+			FieldInfo [] field_info_arr = new FieldInfo [field_infos.Count];

+			object [] field_values_arr = new object [field_values.Count];

+			object [] prop_values_arr = new object [prop_values.Count];

+

+			field_infos.CopyTo  (field_info_arr, 0);

+			field_values.CopyTo (field_values_arr, 0);

+

+			prop_values.CopyTo  (prop_values_arr, 0);

+			prop_infos.CopyTo   (prop_info_arr, 0);

+

+			try {

+				cb = new CustomAttributeBuilder (

+					(ConstructorInfo) constructor, pos_values,

+					prop_info_arr, prop_values_arr,

+					field_info_arr, field_values_arr); 

+			} catch (NullReferenceException) {

+				Report.Warning (

+					-23, Location,

+					"The compiler can not encode this attribute in the Mono runtime\n" +

+					"\tdue to a known bug in it.  We know about the problem and will\n" +

+					"\tfix it as soon as possible.");

+			} catch {

+				//

+				// Sample:

+				// using System.ComponentModel;

+				// [DefaultValue (CollectionChangeAction.Add)]

+				// class X { static void Main () {} }

+				//

+				Report.Warning (

+					-23, Location,

+					"The compiler can not encode this attribute in .NET due to\n" +

+					"\ta bug in the .NET runtime.  Try the Mono runtime");

+			}

+			

+			return cb;

+		}

+

+		static string GetValidPlaces (Attribute attr)

+		{

+			StringBuilder sb = new StringBuilder ();

+			AttributeTargets targets = 0;

+			

+			TypeContainer a = TypeManager.LookupAttr (attr.Type);

+

+			if (a == null) {

+				

+				System.Attribute [] attrs = null;

+				

+				try {

+					attrs = System.Attribute.GetCustomAttributes (attr.Type);

+					

+				} catch {

+					Report.Error (-20, attr.Location, "Cannot find attribute type " + attr.Name +

+						      " (maybe you forgot to set the usage using the" +

+						      " AttributeUsage attribute ?).");

+					return null;

+				}

+					

+				foreach (System.Attribute tmp in attrs)

+					if (tmp is AttributeUsageAttribute) {

+						targets = ((AttributeUsageAttribute) tmp).ValidOn;

+						break;

+					}

+			} else

+				targets = a.Targets;

+

+			

+			if ((targets & AttributeTargets.Assembly) != 0)

+				sb.Append ("'assembly' ");

+

+			if ((targets & AttributeTargets.Class) != 0)

+				sb.Append ("'class' ");

+

+			if ((targets & AttributeTargets.Constructor) != 0)

+				sb.Append ("'constructor' ");

+

+			if ((targets & AttributeTargets.Delegate) != 0)

+				sb.Append ("'delegate' ");

+

+			if ((targets & AttributeTargets.Enum) != 0)

+				sb.Append ("'enum' ");

+

+			if ((targets & AttributeTargets.Event) != 0)

+				sb.Append ("'event' ");

+

+			if ((targets & AttributeTargets.Field) != 0)

+				sb.Append ("'field' ");

+

+			if ((targets & AttributeTargets.Interface) != 0)

+				sb.Append ("'interface' ");

+

+			if ((targets & AttributeTargets.Method) != 0)

+				sb.Append ("'method' ");

+

+			if ((targets & AttributeTargets.Module) != 0)

+				sb.Append ("'module' ");

+

+			if ((targets & AttributeTargets.Parameter) != 0)

+				sb.Append ("'parameter' ");

+

+			if ((targets & AttributeTargets.Property) != 0)

+				sb.Append ("'property' ");

+

+			if ((targets & AttributeTargets.ReturnValue) != 0)

+				sb.Append ("'return value' ");

+

+			if ((targets & AttributeTargets.Struct) != 0)

+				sb.Append ("'struct' ");

+

+			return sb.ToString ();

+

+		}

+

+		public static void Error_AttributeNotValidForElement (Attribute a, Location loc)

+		{

+			Report.Error (

+				592, loc, "Attribute '" + a.Name +

+				"' is not valid on this declaration type. " +

+				"It is valid on " + GetValidPlaces (a) + "declarations only.");

+		}

+

+		public static bool CheckAttribute (Attribute a, object element)

+		{

+			TypeContainer attr = TypeManager.LookupAttr (a.Type);

+			AttributeTargets targets = 0;

+

+			

+			if (attr == null) {

+

+				System.Attribute [] attrs = null;

+				

+				try {

+					attrs = System.Attribute.GetCustomAttributes (a.Type);

+

+				} catch {

+					Report.Error (-20, a.Location, "Cannot find attribute type " + a.Name +

+						      " (maybe you forgot to set the usage using the" +

+						      " AttributeUsage attribute ?).");

+					return false;

+				}

+					

+				foreach (System.Attribute tmp in attrs)

+					if (tmp is AttributeUsageAttribute) 

+						targets = ((AttributeUsageAttribute) tmp).ValidOn;

+			} else

+				targets = attr.Targets;

+

+			if (element is Class) {

+				if ((targets & AttributeTargets.Class) != 0)

+					return true;

+				else

+					return false;

+				

+			} else if (element is Struct) {

+				if ((targets & AttributeTargets.Struct) != 0)

+					return true;

+				else

+					return false;

+			} else if (element is Constructor) {

+				if ((targets & AttributeTargets.Constructor) != 0)

+					return true;

+				else

+					return false;

+			} else if (element is Delegate) {

+				if ((targets & AttributeTargets.Delegate) != 0)

+					return true;

+				else

+					return false;

+			} else if (element is Enum) {

+				if ((targets & AttributeTargets.Enum) != 0)

+					return true;

+				else

+					return false;

+			} else if (element is Event || element is InterfaceEvent) {

+				if ((targets & AttributeTargets.Event) != 0)

+					return true;

+				else

+					return false;

+			} else if (element is Field || element is FieldBuilder) {

+				if ((targets & AttributeTargets.Field) != 0)

+					return true;

+				else

+					return false;

+			} else if (element is Interface) {

+				if ((targets & AttributeTargets.Interface) != 0)

+					return true;

+				else

+					return false;

+			} else if (element is Method || element is Operator || element is InterfaceMethod || element is Accessor) {

+				if ((targets & AttributeTargets.Method) != 0)

+					return true;

+				else

+					return false;

+			} else if (element is ParameterBuilder) {

+				if ((targets & AttributeTargets.Parameter) != 0)

+					return true;

+				else

+					return false;

+			} else if (element is Property || element is Indexer ||

+				   element is InterfaceProperty || element is InterfaceIndexer) {

+				if ((targets & AttributeTargets.Property) != 0)

+					return true;

+				else

+					return false;

+			} else if (element is AssemblyBuilder){

+				if ((targets & AttributeTargets.Assembly) != 0)

+					return true;

+				else

+					return false;

+			}

+

+			return false;

+		}

+

+		//

+		// This method should be invoked to pull the IndexerName attribute from an

+		// Indexer if it exists.

+		//

+		public static string ScanForIndexerName (EmitContext ec, Attributes opt_attrs)

+		{

+			if (opt_attrs == null)

+				return null;

+			if (opt_attrs.AttributeSections == null)

+				return null;

+

+			foreach (AttributeSection asec in opt_attrs.AttributeSections) {

+				if (asec.Attributes == null)

+					continue;

+

+				foreach (Attribute a in asec.Attributes){

+					if (a.ResolveType (ec) == null)

+						return null;

+					

+					if (a.Type != TypeManager.indexer_name_type)

+						continue;

+

+					//

+					// So we have found an IndexerName, pull the data out.

+					//

+					if (a.Arguments == null || a.Arguments [0] == null){

+						Error_AttributeConstructorMismatch (a.Location);

+						return null;

+					}

+					ArrayList pos_args = (ArrayList) a.Arguments [0];

+					if (pos_args.Count == 0){

+						Error_AttributeConstructorMismatch (a.Location);

+						return null;

+					}

+					

+					Argument arg = (Argument) pos_args [0];

+					if (!arg.Resolve (ec, a.Location))

+						return null;

+					

+					Expression e = arg.Expr;

+					if (!(e is StringConstant)){

+						Error_AttributeConstructorMismatch (a.Location);

+						return null;

+					}

+

+					//

+					// Remove the attribute from the list

+					//

+					asec.Attributes.Remove (a);

+

+					return (((StringConstant) e).Value);

+				}

+			}

+			return null;

+		}

+

+		//

+		// This pulls the condition name out of a Conditional attribute

+		//

+		public string Conditional_GetConditionName ()

+		{

+			//

+			// So we have a Conditional, pull the data out.

+			//

+			if (Arguments == null || Arguments [0] == null){

+				Error_AttributeConstructorMismatch (Location);

+				return null;

+			}

+

+			ArrayList pos_args = (ArrayList) Arguments [0];

+			if (pos_args.Count != 1){

+				Error_AttributeConstructorMismatch (Location);

+				return null;

+			}

+

+			Argument arg = (Argument) pos_args [0];	

+			if (!(arg.Expr is StringConstant)){

+				Error_AttributeConstructorMismatch (Location);

+				return null;

+			}

+

+			return ((StringConstant) arg.Expr).Value;

+		}

+

+		//

+		// This pulls the obsolete message and error flag out of an Obsolete attribute

+		//

+		public string Obsolete_GetObsoleteMessage (out bool is_error)

+		{

+			is_error = false;

+			//

+			// So we have an Obsolete, pull the data out.

+			//

+			if (Arguments == null || Arguments [0] == null)

+				return "";

+

+			ArrayList pos_args = (ArrayList) Arguments [0];

+			if (pos_args.Count == 0)

+				return "";

+			else if (pos_args.Count > 2){

+				Error_AttributeConstructorMismatch (Location);

+				return null;

+			}

+

+			Argument arg = (Argument) pos_args [0];	

+			if (!(arg.Expr is StringConstant)){

+				Error_AttributeConstructorMismatch (Location);

+				return null;

+			}

+

+			if (pos_args.Count == 2){

+				Argument arg2 = (Argument) pos_args [1];

+				if (!(arg2.Expr is BoolConstant)){

+					Error_AttributeConstructorMismatch (Location);

+					return null;

+				}

+				is_error = ((BoolConstant) arg2.Expr).Value;

+			}

+

+			return ((StringConstant) arg.Expr).Value;

+		}

+

+		//

+		// Applies the attributes to the `builder'.

+		//

+		public static void ApplyAttributes (EmitContext ec, object builder, object kind,

+						    Attributes opt_attrs, Location loc)

+		{

+			if (opt_attrs == null)

+				return;

+			if (opt_attrs.AttributeSections == null)

+				return;

+

+			foreach (AttributeSection asec in opt_attrs.AttributeSections) {

+				if (asec.Attributes == null)

+					continue;

+

+				if (asec.Target == "assembly" && !(builder is AssemblyBuilder))

+					continue;

+				

+				foreach (Attribute a in asec.Attributes) {

+					CustomAttributeBuilder cb = a.Resolve (ec);

+

+					if (cb == null)

+						continue;

+

+					if (!(kind is TypeContainer))

+						if (!CheckAttribute (a, kind)) {

+							Error_AttributeNotValidForElement (a, loc);

+							return;

+						}

+

+					if (kind is Method || kind is Operator || kind is InterfaceMethod ||

+					    kind is Accessor) {

+						if (a.Type == TypeManager.methodimpl_attr_type) {

+							if (a.ImplOptions == MethodImplOptions.InternalCall)

+								((MethodBuilder) builder).

+								SetImplementationFlags (

+									MethodImplAttributes.InternalCall |

+									MethodImplAttributes.Runtime);

+						} else if (a.Type != TypeManager.dllimport_type){

+							((MethodBuilder) builder).SetCustomAttribute (cb);

+						}

+					} else if (kind is Constructor) {

+						((ConstructorBuilder) builder).SetCustomAttribute (cb);

+					} else if (kind is Field) {

+						((FieldBuilder) builder).SetCustomAttribute (cb);

+					} else if (kind is Property || kind is Indexer ||

+						   kind is InterfaceProperty || kind is InterfaceIndexer) {

+						((PropertyBuilder) builder).SetCustomAttribute (cb);

+					} else if (kind is Event || kind is InterfaceEvent) {

+						((MyEventBuilder) builder).SetCustomAttribute (cb);

+					} else if (kind is ParameterBuilder) {

+

+						if (a.Type == TypeManager.marshal_as_attr_type) {

+							UnmanagedMarshal marshal =

+								UnmanagedMarshal.DefineUnmanagedMarshal (a.UnmanagedType);

+							

+							((ParameterBuilder) builder).SetMarshal (marshal);

+						} else 

+							((ParameterBuilder) builder).SetCustomAttribute (cb);

+						

+					} else if (kind is Enum) {

+						((TypeBuilder) builder).SetCustomAttribute (cb); 

+

+					} else if (kind is TypeContainer) {

+						TypeContainer tc = (TypeContainer) kind;

+						

+						if (a.UsageAttr) {

+							tc.Targets = a.Targets;

+							tc.AllowMultiple = a.AllowMultiple;

+							tc.Inherited = a.Inherited;

+							

+						} else if (a.Type == TypeManager.default_member_type) {

+							if (tc.Indexers != null) {

+								Report.Error (646, loc,

+								      "Cannot specify the DefaultMember attribute on" +

+								      " a type containing an indexer");

+								return;

+							}

+

+						} else {

+							if (!CheckAttribute (a, kind)) {

+								Error_AttributeNotValidForElement (a, loc);

+								return;

+							}

+						}

+

+						try {

+							((TypeBuilder) builder).SetCustomAttribute (cb);

+						} catch (System.ArgumentException) {

+							Report.Warning (

+								-21, loc,

+						"The CharSet named property on StructLayout\n"+

+						"\tdoes not work correctly on Microsoft.NET\n"+

+						"\tYou might want to remove the CharSet declaration\n"+

+						"\tor compile using the Mono runtime instead of the\n"+

+						"\tMicrosoft .NET runtime");

+						}

+						

+					} else if (kind is Interface) {

+						Interface iface = (Interface) kind;

+

+						if ((a.Type == TypeManager.default_member_type) &&

+						    (iface.InterfaceIndexers != null)) {

+							Report.Error (

+								646, loc,

+								"Cannot specify the DefaultMember attribute on" +

+								" a type containing an indexer");

+							return;

+						}

+

+						if (!CheckAttribute (a, kind)) {

+							Error_AttributeNotValidForElement (a, loc);

+							return;

+						}

+

+						((TypeBuilder) builder).SetCustomAttribute (cb);

+					} else if (kind is AssemblyBuilder){

+						((AssemblyBuilder) builder).SetCustomAttribute (cb);

+					} else if (kind is ModuleBuilder) {

+						((ModuleBuilder) builder).SetCustomAttribute (cb);

+					} else if (kind is FieldBuilder) {

+						((FieldBuilder) builder).SetCustomAttribute (cb);

+					} else

+						throw new Exception ("Unknown kind: " + kind);

+				}

+			}

+		}

+

+		public MethodBuilder DefinePInvokeMethod (EmitContext ec, TypeBuilder builder, string name,

+							  MethodAttributes flags, Type ret_type, Type [] param_types)

+		{

+			//

+			// We extract from the attribute the information we need 

+			//

+

+			if (Arguments == null) {

+				Console.WriteLine ("Internal error : this is not supposed to happen !");

+				return null;

+			}

+

+			Type = CheckAttributeType (ec);

+			if (Type == null)

+				return null;

+			

+			ArrayList named_args = new ArrayList ();

+			

+			ArrayList pos_args = (ArrayList) Arguments [0];

+			if (Arguments.Count > 1)

+				named_args = (ArrayList) Arguments [1];

+			

+

+			string dll_name = null;

+			

+			Argument tmp = (Argument) pos_args [0];

+

+			if (!tmp.Resolve (ec, Location))

+				return null;

+			

+			if (tmp.Expr is Constant)

+				dll_name = (string) ((Constant) tmp.Expr).GetValue ();

+			else { 

+				Error_AttributeArgumentNotValid ();

+				return null;

+			}

+

+			// Now we process the named arguments

+			CallingConvention cc = CallingConvention.Winapi;

+			CharSet charset = CharSet.Ansi;

+			bool preserve_sig = true;

+			bool exact_spelling = false;

+			bool set_last_err = false;

+			string entry_point = null;

+

+			for (int i = 0; i < named_args.Count; i++) {

+

+				DictionaryEntry de = (DictionaryEntry) named_args [i];

+

+				string member_name = (string) de.Key;

+				Argument a  = (Argument) de.Value;

+

+				if (!a.Resolve (ec, Location))

+					return null;

+

+				Expression member = Expression.MemberLookup (

+					ec, Type, member_name, 

+					MemberTypes.Field | MemberTypes.Property,

+					BindingFlags.Public | BindingFlags.Instance,

+					Location);

+

+				if (member == null || !(member is FieldExpr)) {

+					Error_InvalidNamedArgument (member_name);

+					return null;

+				}

+

+				if (member is FieldExpr) {

+					FieldExpr fe = (FieldExpr) member;

+					FieldInfo fi = fe.FieldInfo;

+

+					if (fi.IsInitOnly) {

+						Error_InvalidNamedArgument (member_name);

+						return null;

+					}

+

+					if (a.Expr is Constant) {

+						Constant c = (Constant) a.Expr;

+						

+						if (member_name == "CallingConvention")

+							cc = (CallingConvention) c.GetValue ();

+						else if (member_name == "CharSet")

+							charset = (CharSet) c.GetValue ();

+						else if (member_name == "EntryPoint")

+							entry_point = (string) c.GetValue ();

+						else if (member_name == "SetLastError")

+							set_last_err = (bool) c.GetValue ();

+						else if (member_name == "ExactSpelling")

+							exact_spelling = (bool) c.GetValue ();

+						else if (member_name == "PreserveSig")

+							preserve_sig = (bool) c.GetValue ();

+					} else { 

+						Error_AttributeArgumentNotValid ();

+						return null;

+					}

+					

+				}

+			}

+

+			if (entry_point == null)

+				entry_point = name;

+			

+			MethodBuilder mb = builder.DefinePInvokeMethod (

+				name, dll_name, entry_point, flags | MethodAttributes.HideBySig,

+				CallingConventions.Standard,

+				ret_type,

+				param_types,

+				cc,

+				charset);

+

+			if (preserve_sig)

+				mb.SetImplementationFlags (MethodImplAttributes.PreserveSig);

+			

+			return mb;

+		}

+		

+	}

+	

+	public class AttributeSection {

+		

+		public readonly string    Target;

+		public readonly ArrayList Attributes;

+		

+		public AttributeSection (string target, ArrayList attrs)

+		{

+			Target = target;

+			Attributes = attrs;

+		}

+		

+	}

+

+	public class Attributes {

+		public ArrayList AttributeSections;

+		public Location Location;

+

+		public Attributes (AttributeSection a, Location loc)

+		{

+			AttributeSections = new ArrayList ();

+			AttributeSections.Add (a);

+

+		}

+

+		public void AddAttribute (AttributeSection a)

+		{

+			if (a != null)

+				AttributeSections.Add (a);

+		}

+	}

+}

diff --git a/mcs/mcs/cfold.cs b/mcs/mcs/cfold.cs
new file mode 100755
index 00000000000..9da0bc08bf8
--- /dev/null
+++ b/mcs/mcs/cfold.cs
@@ -0,0 +1,1028 @@
+//
+// cfold.cs: Constant Folding
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2002 Ximian, Inc.
+//
+
+using System;
+
+namespace Mono.CSharp {
+
+	public class ConstantFold {
+
+		//
+		// Performs the numeric promotions on the left and right expresions
+		// and desposits the results on `lc' and `rc'.
+		//
+		// On success, the types of `lc' and `rc' on output will always match,
+		// and the pair will be one of:
+		//
+		//   (double, double)
+		//   (float, float)
+		//   (ulong, ulong)
+		//   (long, long)
+		//   (uint, uint)
+		//   (int, int)
+		//
+		static void DoConstantNumericPromotions (Binary.Operator oper,
+							 ref Constant left, ref Constant right,
+							 Location loc)
+		{
+			if (left is DoubleConstant || right is DoubleConstant){
+				//
+				// If either side is a double, convert the other to a double
+				//
+				if (!(left is DoubleConstant))
+					left = left.ToDouble (loc);
+
+				if (!(right is DoubleConstant))
+					right = right.ToDouble (loc);
+				return;
+			} else if (left is FloatConstant || right is FloatConstant) {
+				//
+				// If either side is a float, convert the other to a float
+				//
+				if (!(left is FloatConstant))
+					left = left.ToFloat (loc);
+
+				if (!(right is FloatConstant))
+					right = right.ToFloat (loc);
+;				return;
+			} else if (left is ULongConstant || right is ULongConstant){
+				//
+				// If either operand is of type ulong, the other operand is
+				// converted to type ulong.  or an error ocurrs if the other
+				// operand is of type sbyte, short, int or long
+				//
+				Constant match, other;
+					
+				if (left is ULongConstant){
+					other = right;
+					match = left;
+					if (!(right is ULongConstant))
+						right = right.ToULong (loc);
+				} else {
+					other = left;
+					match = right;
+					left = left.ToULong (loc);
+				}
+
+#if WRONG
+				if (other is SByteConstant || other is ShortConstant ||
+				    other is IntConstant || other is LongConstant){
+					Binary.Error_OperatorAmbiguous
+						(loc, oper, other.Type, match.Type);
+					left = null;
+					right = null;
+				}
+#endif
+				return;
+			} else if (left is LongConstant || right is LongConstant){
+				//
+				// If either operand is of type long, the other operand is converted
+				// to type long.
+				//
+				if (!(left is LongConstant))
+					left = left.ToLong (loc);
+				else if (!(right is LongConstant))
+					right = right.ToLong (loc);
+				return;
+			} else if (left is UIntConstant || right is UIntConstant){
+				//
+				// If either operand is of type uint, and the other
+				// operand is of type sbyte, short or int, the operands are
+				// converted to type long.
+				//
+				Constant match, other;
+				if (left is UIntConstant){
+					other = right;
+					match = left;
+				} else {
+					other = left;
+					match = right;
+				}
+
+				// Nothing to do.
+				if (other is UIntConstant)
+					return;
+
+				if (other is SByteConstant || other is ShortConstant ||
+				    other is IntConstant){
+					left = left.ToLong (loc);
+					right = right.ToLong (loc);
+				}
+
+				return;
+			} else {
+				//
+				// Force conversions to int32
+				//
+				if (!(left is IntConstant))
+					left = left.ToInt (loc);
+				if (!(right is IntConstant))
+					right = right.ToInt (loc);
+			}
+			return;
+		}
+
+		static void Error_CompileTimeOverflow (Location loc)
+		{
+			Report.Error (220, loc, "The operation overflows at compile time in checked mode");
+		}
+		
+		/// <summary>
+		///   Constant expression folder for binary operations.
+		///
+		///   Returns null if the expression can not be folded.
+		/// </summary>
+		static public Expression BinaryFold (EmitContext ec, Binary.Operator oper,
+						     Constant left, Constant right, Location loc)
+		{
+			Type lt = left.Type;
+			Type rt = right.Type;
+			Type result_type = null;
+			bool bool_res;
+			
+			//
+			// Enumerator folding
+			//
+			if (rt == lt && left is EnumConstant)
+				result_type = lt;
+
+			//
+			// During an enum evaluation, we need to unwrap enumerations
+			//
+			if (ec.InEnumContext){
+				if (left is EnumConstant)
+					left = ((EnumConstant) left).Child;
+				
+				if (right is EnumConstant)
+					right = ((EnumConstant) right).Child;
+			}
+			
+			switch (oper){
+			case Binary.Operator.BitwiseOr:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+				
+				if (left is IntConstant){
+					IntConstant v;
+					int res = ((IntConstant) left).Value | ((IntConstant) right).Value;
+					
+					v = new IntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is UIntConstant){
+					UIntConstant v;
+					uint res = ((UIntConstant)left).Value | ((UIntConstant)right).Value;
+					
+					v = new UIntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is LongConstant){
+					LongConstant v;
+					long res = ((LongConstant)left).Value | ((LongConstant)right).Value;
+					
+					v = new LongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is ULongConstant){
+					ULongConstant v;
+					ulong res = ((ULongConstant)left).Value |
+						((ULongConstant)right).Value;
+					
+					v = new ULongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				}
+				break;
+				
+			case Binary.Operator.BitwiseAnd:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+				
+				if (left is IntConstant){
+					IntConstant v;
+					int res = ((IntConstant) left).Value & ((IntConstant) right).Value;
+					
+					v = new IntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is UIntConstant){
+					UIntConstant v;
+					uint res = ((UIntConstant)left).Value & ((UIntConstant)right).Value;
+					
+					v = new UIntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is LongConstant){
+					LongConstant v;
+					long res = ((LongConstant)left).Value & ((LongConstant)right).Value;
+					
+					v = new LongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is ULongConstant){
+					ULongConstant v;
+					ulong res = ((ULongConstant)left).Value &
+						((ULongConstant)right).Value;
+					
+					v = new ULongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				}
+				break;
+
+			case Binary.Operator.ExclusiveOr:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+				
+				if (left is IntConstant){
+					IntConstant v;
+					int res = ((IntConstant) left).Value ^ ((IntConstant) right).Value;
+					
+					v = new IntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is UIntConstant){
+					UIntConstant v;
+					uint res = ((UIntConstant)left).Value ^ ((UIntConstant)right).Value;
+					
+					v = new UIntConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is LongConstant){
+					LongConstant v;
+					long res = ((LongConstant)left).Value ^ ((LongConstant)right).Value;
+					
+					v = new LongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				} else if (left is ULongConstant){
+					ULongConstant v;
+					ulong res = ((ULongConstant)left).Value ^
+						((ULongConstant)right).Value;
+					
+					v = new ULongConstant (res);
+					if (result_type == null)
+						return v;
+					else
+						return new EnumConstant (v, result_type);
+				}
+				break;
+
+			case Binary.Operator.Addition:
+				Constant result;
+				bool left_is_string = left is StringConstant;
+				bool right_is_string = right is StringConstant;
+
+				//
+				// If both sides are strings, then concatenate, if
+				// one is a string, and the other is not, then defer
+				// to runtime concatenation
+				//
+				if (left_is_string || right_is_string){
+					if (left_is_string && right_is_string)
+						return new StringConstant (
+							((StringConstant) left).Value +
+							((StringConstant) right).Value);
+					
+					return null;
+				}
+
+				//
+				// handle "E operator + (E x, U y)"
+				// handle "E operator + (Y y, E x)"
+				//
+				// note that E operator + (E x, E y) is invalid
+				//
+				Type wrap_as = null;
+				if (left is EnumConstant){
+					if (right is EnumConstant){
+						return null;
+					}
+					if (((EnumConstant) left).Child.Type != right.Type)
+						return null;
+
+					wrap_as = left.Type;
+				} else if (right is EnumConstant){
+					if (((EnumConstant) right).Child.Type != left.Type)
+						return null;
+					wrap_as = right.Type;
+				}
+
+				result = null;
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				try {
+					if (left is DoubleConstant){
+						double res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((DoubleConstant) left).Value +
+								       ((DoubleConstant) right).Value);
+						else
+							res = unchecked (((DoubleConstant) left).Value +
+									 ((DoubleConstant) right).Value);
+						
+						result = new DoubleConstant (res);
+					} else if (left is FloatConstant){
+						float res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((FloatConstant) left).Value +
+								       ((FloatConstant) right).Value);
+						else
+							res = unchecked (((FloatConstant) left).Value +
+									 ((FloatConstant) right).Value);
+						
+						result = new FloatConstant (res);
+					} else if (left is ULongConstant){
+						ulong res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((ULongConstant) left).Value +
+								       ((ULongConstant) right).Value);
+						else
+							res = unchecked (((ULongConstant) left).Value +
+									 ((ULongConstant) right).Value);
+
+						result = new ULongConstant (res);
+					} else if (left is LongConstant){
+						long res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((LongConstant) left).Value +
+								       ((LongConstant) right).Value);
+						else
+							res = unchecked (((LongConstant) left).Value +
+									 ((LongConstant) right).Value);
+						
+						result = new LongConstant (res);
+					} else if (left is UIntConstant){
+						uint res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((UIntConstant) left).Value +
+								       ((UIntConstant) right).Value);
+						else
+							res = unchecked (((UIntConstant) left).Value +
+									 ((UIntConstant) right).Value);
+						
+						result = new UIntConstant (res);
+					} else if (left is IntConstant){
+						int res;
+
+						if (ec.ConstantCheckState)
+							res = checked (((IntConstant) left).Value +
+								       ((IntConstant) right).Value);
+						else
+							res = unchecked (((IntConstant) left).Value +
+									 ((IntConstant) right).Value);
+
+						result = new IntConstant (res);
+					} else {
+						throw new Exception ( "Unexepected input: " + left);
+					}
+				} catch (OverflowException){
+					Error_CompileTimeOverflow (loc);
+				}
+
+				if (wrap_as != null)
+					return new EnumConstant (result, wrap_as);
+				else
+					return result;
+
+			case Binary.Operator.Subtraction:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				try {
+					if (left is DoubleConstant){
+						double res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((DoubleConstant) left).Value -
+								       ((DoubleConstant) right).Value);
+						else
+							res = unchecked (((DoubleConstant) left).Value -
+									 ((DoubleConstant) right).Value);
+						
+						return new DoubleConstant (res);
+					} else if (left is FloatConstant){
+						float res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((FloatConstant) left).Value -
+								       ((FloatConstant) right).Value);
+						else
+							res = unchecked (((FloatConstant) left).Value -
+									 ((FloatConstant) right).Value);
+						
+						return new FloatConstant (res);
+					} else if (left is ULongConstant){
+						ulong res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((ULongConstant) left).Value -
+								       ((ULongConstant) right).Value);
+						else
+							res = unchecked (((ULongConstant) left).Value -
+									 ((ULongConstant) right).Value);
+						
+						return new ULongConstant (res);
+					} else if (left is LongConstant){
+						long res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((LongConstant) left).Value -
+								       ((LongConstant) right).Value);
+						else
+							res = unchecked (((LongConstant) left).Value -
+									 ((LongConstant) right).Value);
+						
+						return new LongConstant (res);
+					} else if (left is UIntConstant){
+						uint res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((UIntConstant) left).Value -
+								       ((UIntConstant) right).Value);
+						else
+							res = unchecked (((UIntConstant) left).Value -
+									 ((UIntConstant) right).Value);
+						
+						return new UIntConstant (res);
+					} else if (left is IntConstant){
+						int res;
+
+						if (ec.ConstantCheckState)
+							res = checked (((IntConstant) left).Value -
+								       ((IntConstant) right).Value);
+						else
+							res = unchecked (((IntConstant) left).Value -
+									 ((IntConstant) right).Value);
+
+						return new IntConstant (res);
+					} else {
+						throw new Exception ( "Unexepected input: " + left);
+					}
+				} catch (OverflowException){
+					Error_CompileTimeOverflow (loc);
+				}
+				break;
+				
+			case Binary.Operator.Multiply:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				try {
+					if (left is DoubleConstant){
+						double res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((DoubleConstant) left).Value *
+								       ((DoubleConstant) right).Value);
+						else
+							res = unchecked (((DoubleConstant) left).Value *
+									 ((DoubleConstant) right).Value);
+						
+						return new DoubleConstant (res);
+					} else if (left is FloatConstant){
+						float res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((FloatConstant) left).Value *
+								       ((FloatConstant) right).Value);
+						else
+							res = unchecked (((FloatConstant) left).Value *
+									 ((FloatConstant) right).Value);
+						
+						return new FloatConstant (res);
+					} else if (left is ULongConstant){
+						ulong res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((ULongConstant) left).Value *
+								       ((ULongConstant) right).Value);
+						else
+							res = unchecked (((ULongConstant) left).Value *
+									 ((ULongConstant) right).Value);
+						
+						return new ULongConstant (res);
+					} else if (left is LongConstant){
+						long res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((LongConstant) left).Value *
+								       ((LongConstant) right).Value);
+						else
+							res = unchecked (((LongConstant) left).Value *
+									 ((LongConstant) right).Value);
+						
+						return new LongConstant (res);
+					} else if (left is UIntConstant){
+						uint res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((UIntConstant) left).Value *
+								       ((UIntConstant) right).Value);
+						else
+							res = unchecked (((UIntConstant) left).Value *
+									 ((UIntConstant) right).Value);
+						
+						return new UIntConstant (res);
+					} else if (left is IntConstant){
+						int res;
+
+						if (ec.ConstantCheckState)
+							res = checked (((IntConstant) left).Value *
+								       ((IntConstant) right).Value);
+						else
+							res = unchecked (((IntConstant) left).Value *
+									 ((IntConstant) right).Value);
+
+						return new IntConstant (res);
+					} else {
+						throw new Exception ( "Unexepected input: " + left);
+					}
+				} catch (OverflowException){
+					Error_CompileTimeOverflow (loc);
+				}
+				break;
+
+			case Binary.Operator.Division:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				try {
+					if (left is DoubleConstant){
+						double res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((DoubleConstant) left).Value /
+								       ((DoubleConstant) right).Value);
+						else
+							res = unchecked (((DoubleConstant) left).Value /
+									 ((DoubleConstant) right).Value);
+						
+						return new DoubleConstant (res);
+					} else if (left is FloatConstant){
+						float res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((FloatConstant) left).Value /
+								       ((FloatConstant) right).Value);
+						else
+							res = unchecked (((FloatConstant) left).Value /
+									 ((FloatConstant) right).Value);
+						
+						return new FloatConstant (res);
+					} else if (left is ULongConstant){
+						ulong res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((ULongConstant) left).Value /
+								       ((ULongConstant) right).Value);
+						else
+							res = unchecked (((ULongConstant) left).Value /
+									 ((ULongConstant) right).Value);
+						
+						return new ULongConstant (res);
+					} else if (left is LongConstant){
+						long res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((LongConstant) left).Value /
+								       ((LongConstant) right).Value);
+						else
+							res = unchecked (((LongConstant) left).Value /
+									 ((LongConstant) right).Value);
+						
+						return new LongConstant (res);
+					} else if (left is UIntConstant){
+						uint res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((UIntConstant) left).Value /
+								       ((UIntConstant) right).Value);
+						else
+							res = unchecked (((UIntConstant) left).Value /
+									 ((UIntConstant) right).Value);
+						
+						return new UIntConstant (res);
+					} else if (left is IntConstant){
+						int res;
+
+						if (ec.ConstantCheckState)
+							res = checked (((IntConstant) left).Value /
+								       ((IntConstant) right).Value);
+						else
+							res = unchecked (((IntConstant) left).Value /
+									 ((IntConstant) right).Value);
+
+						return new IntConstant (res);
+					} else {
+						throw new Exception ( "Unexepected input: " + left);
+					}
+				} catch (OverflowException){
+					Error_CompileTimeOverflow (loc);
+
+				} catch (DivideByZeroException) {
+					Report.Error (020, loc, "Division by constant zero");
+				}
+				
+				break;
+				
+			case Binary.Operator.Modulus:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				try {
+					if (left is DoubleConstant){
+						double res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((DoubleConstant) left).Value %
+								       ((DoubleConstant) right).Value);
+						else
+							res = unchecked (((DoubleConstant) left).Value %
+									 ((DoubleConstant) right).Value);
+						
+						return new DoubleConstant (res);
+					} else if (left is FloatConstant){
+						float res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((FloatConstant) left).Value %
+								       ((FloatConstant) right).Value);
+						else
+							res = unchecked (((FloatConstant) left).Value %
+									 ((FloatConstant) right).Value);
+						
+						return new FloatConstant (res);
+					} else if (left is ULongConstant){
+						ulong res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((ULongConstant) left).Value %
+								       ((ULongConstant) right).Value);
+						else
+							res = unchecked (((ULongConstant) left).Value %
+									 ((ULongConstant) right).Value);
+						
+						return new ULongConstant (res);
+					} else if (left is LongConstant){
+						long res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((LongConstant) left).Value %
+								       ((LongConstant) right).Value);
+						else
+							res = unchecked (((LongConstant) left).Value %
+									 ((LongConstant) right).Value);
+						
+						return new LongConstant (res);
+					} else if (left is UIntConstant){
+						uint res;
+						
+						if (ec.ConstantCheckState)
+							res = checked (((UIntConstant) left).Value %
+								       ((UIntConstant) right).Value);
+						else
+							res = unchecked (((UIntConstant) left).Value %
+									 ((UIntConstant) right).Value);
+						
+						return new UIntConstant (res);
+					} else if (left is IntConstant){
+						int res;
+
+						if (ec.ConstantCheckState)
+							res = checked (((IntConstant) left).Value %
+								       ((IntConstant) right).Value);
+						else
+							res = unchecked (((IntConstant) left).Value %
+									 ((IntConstant) right).Value);
+
+						return new IntConstant (res);
+					} else {
+						throw new Exception ( "Unexepected input: " + left);
+					}
+				} catch (OverflowException){
+					Error_CompileTimeOverflow (loc);
+				}
+				break;
+
+				//
+				// There is no overflow checking on left shift
+				//
+			case Binary.Operator.LeftShift:
+				IntConstant ic = right.ToInt (loc);
+				if (ic == null){
+					Binary.Error_OperatorCannotBeApplied (loc, "<<", lt, rt);
+					return null;
+				}
+				int lshift_val = ic.Value;
+
+				IntConstant lic;
+				if ((lic = left.ConvertToInt ()) != null)
+					return new IntConstant (lic.Value << lshift_val);
+
+				UIntConstant luic;
+				if ((luic = left.ConvertToUInt ()) != null)
+					return new UIntConstant (luic.Value << lshift_val);
+
+				LongConstant llc;
+				if ((llc = left.ConvertToLong ()) != null)
+					return new LongConstant (llc.Value << lshift_val);
+
+				ULongConstant lulc;
+				if ((lulc = left.ConvertToULong ()) != null)
+					return new ULongConstant (lulc.Value << lshift_val);
+
+				Binary.Error_OperatorCannotBeApplied (loc, "<<", lt, rt);
+				break;
+
+				//
+				// There is no overflow checking on right shift
+				//
+			case Binary.Operator.RightShift:
+				IntConstant sic = right.ToInt (loc);
+				if (sic == null){
+					Binary.Error_OperatorCannotBeApplied (loc, ">>", lt, rt);
+					return null;
+				}
+				int rshift_val = sic.Value;
+
+				IntConstant ric;
+				if ((ric = left.ConvertToInt ()) != null)
+					return new IntConstant (ric.Value >> rshift_val);
+
+				UIntConstant ruic;
+				if ((ruic = left.ConvertToUInt ()) != null)
+					return new UIntConstant (ruic.Value >> rshift_val);
+
+				LongConstant rlc;
+				if ((rlc = left.ConvertToLong ()) != null)
+					return new LongConstant (rlc.Value >> rshift_val);
+
+				ULongConstant rulc;
+				if ((rulc = left.ConvertToULong ()) != null)
+					return new ULongConstant (rulc.Value >> rshift_val);
+
+				Binary.Error_OperatorCannotBeApplied (loc, ">>", lt, rt);
+				break;
+
+			case Binary.Operator.LogicalAnd:
+				if (left is BoolConstant && right is BoolConstant){
+					return new BoolConstant (
+						((BoolConstant) left).Value &&
+						((BoolConstant) right).Value);
+				}
+				break;
+
+			case Binary.Operator.LogicalOr:
+				if (left is BoolConstant && right is BoolConstant){
+					return new BoolConstant (
+						((BoolConstant) left).Value ||
+						((BoolConstant) right).Value);
+				}
+				break;
+				
+			case Binary.Operator.Equality:
+				if (left is BoolConstant && right is BoolConstant){
+					return new BoolConstant (
+						((BoolConstant) left).Value ==
+						((BoolConstant) right).Value);
+				
+				}
+				if (left is StringConstant && right is StringConstant){
+					return new BoolConstant (
+						((StringConstant) left).Value ==
+						((StringConstant) right).Value);
+					
+				}
+				
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value ==
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value ==
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value ==
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value ==
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value ==
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value ==
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+
+			case Binary.Operator.Inequality:
+				if (left is BoolConstant && right is BoolConstant){
+					return new BoolConstant (
+						((BoolConstant) left).Value !=
+						((BoolConstant) right).Value);
+				}
+				if (left is StringConstant && right is StringConstant){
+					return new BoolConstant (
+						((StringConstant) left).Value !=
+						((StringConstant) right).Value);
+					
+				}
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value !=
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value !=
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value !=
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value !=
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value !=
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value !=
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+
+			case Binary.Operator.LessThan:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value <
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value <
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value <
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value <
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value <
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value <
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+				
+			case Binary.Operator.GreaterThan:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value >
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value >
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value >
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value >
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value >
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value >
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+
+			case Binary.Operator.GreaterThanOrEqual:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value >=
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value >=
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value >=
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value >=
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value >=
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value >=
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+
+			case Binary.Operator.LessThanOrEqual:
+				DoConstantNumericPromotions (oper, ref left, ref right, loc);
+				if (left == null || right == null)
+					return null;
+
+				bool_res = false;
+				if (left is DoubleConstant)
+					bool_res = ((DoubleConstant) left).Value <=
+						((DoubleConstant) right).Value;
+				else if (left is FloatConstant)
+					bool_res = ((FloatConstant) left).Value <=
+						((FloatConstant) right).Value;
+				else if (left is ULongConstant)
+					bool_res = ((ULongConstant) left).Value <=
+						((ULongConstant) right).Value;
+				else if (left is LongConstant)
+					bool_res = ((LongConstant) left).Value <=
+						((LongConstant) right).Value;
+				else if (left is UIntConstant)
+					bool_res = ((UIntConstant) left).Value <=
+						((UIntConstant) right).Value;
+				else if (left is IntConstant)
+					bool_res = ((IntConstant) left).Value <=
+						((IntConstant) right).Value;
+				else
+					return null;
+
+				return new BoolConstant (bool_res);
+			}
+					
+			return null;
+		}
+	}
+}
diff --git a/mcs/mcs/class.cs b/mcs/mcs/class.cs
new file mode 100755
index 00000000000..33692e8d83c
--- /dev/null
+++ b/mcs/mcs/class.cs
@@ -0,0 +1,4485 @@
+
+//
+// class.cs: Class and Struct handlers
+//
+// Authors: Miguel de Icaza (miguel@gnu.org)
+//          Martin Baulig (martin@gnome.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001, 2002 Ximian, Inc (http://www.ximian.com)
+//
+//
+#define CACHE
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Runtime.CompilerServices;
+using System.Diagnostics.SymbolStore;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   This is the base class for structs and classes.  
+	/// </summary>
+	public class TypeContainer : DeclSpace, IMemberContainer {
+		// Holds a list of classes and structures
+		ArrayList types;
+
+		// Holds the list of properties
+		ArrayList properties;
+
+		// Holds the list of enumerations
+		ArrayList enums;
+
+		// Holds the list of delegates
+		ArrayList delegates;
+		
+		// Holds the list of constructors
+		ArrayList instance_constructors;
+
+		// Holds the list of fields
+		ArrayList fields;
+
+		// Holds a list of fields that have initializers
+		ArrayList initialized_fields;
+
+		// Holds a list of static fields that have initializers
+		ArrayList initialized_static_fields;
+
+		// Holds the list of constants
+		ArrayList constants;
+
+		// Holds the list of
+		ArrayList interfaces;
+
+		// Holds order in which interfaces must be closed
+		ArrayList interface_order;
+		
+		// Holds the methods.
+		ArrayList methods;
+
+		// Holds the events
+		ArrayList events;
+
+		// Holds the indexers
+		ArrayList indexers;
+
+		// Holds the operators
+		ArrayList operators;
+
+		// The emit context for toplevel objects.
+		EmitContext ec;
+		
+		//
+		// Pointers to the default constructor and the default static constructor
+		//
+		Constructor default_constructor;
+		Constructor default_static_constructor;
+
+		//
+		// Whether we have seen a static constructor for this class or not
+		//
+		bool have_static_constructor = false;
+
+		//
+		// Whether we have at least one non-static field
+		//
+		bool have_nonstatic_fields = false;
+		
+		//
+		// This one is computed after we can distinguish interfaces
+		// from classes from the arraylist `type_bases' 
+		//
+		string     base_class_name;
+
+		ArrayList type_bases;
+
+		// Attributes for this type
+		protected Attributes attributes;
+
+		// Information in the case we are an attribute type
+
+		public AttributeTargets Targets = AttributeTargets.All;
+		public bool AllowMultiple = false;
+		public bool Inherited;
+
+		// The interfaces we implement.
+		Type [] ifaces;
+
+		// The parent member container and our member cache
+		IMemberContainer parent_container;
+		MemberCache member_cache;
+		
+		//
+		// The indexer name for this class
+		//
+		public string IndexerName;
+
+		public TypeContainer (TypeContainer parent, string name, Location l)
+			: base (parent, name, l)
+		{
+			string n;
+			types = new ArrayList ();
+
+			if (parent == null)
+				n = "";
+			else
+				n = parent.Name;
+
+			base_class_name = null;
+			
+			//Console.WriteLine ("New class " + name + " inside " + n);
+		}
+
+		public AdditionResult AddConstant (Const constant)
+		{
+			AdditionResult res;
+			string name = constant.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+			
+			if (constants == null)
+				constants = new ArrayList ();
+
+			constants.Add (constant);
+			DefineName (name, constant);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddEnum (Mono.CSharp.Enum e)
+		{
+			AdditionResult res;
+			string name = e.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			if (enums == null)
+				enums = new ArrayList ();
+
+			enums.Add (e);
+			DefineName (name, e);
+
+			return AdditionResult.Success;
+		}
+		
+		public AdditionResult AddClass (Class c)
+		{
+			AdditionResult res;
+			string name = c.Name;
+
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			DefineName (name, c);
+			types.Add (c);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddStruct (Struct s)
+		{
+			AdditionResult res;
+			string name = s.Name;
+			
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			DefineName (name, s);
+			types.Add (s);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddDelegate (Delegate d)
+		{
+			AdditionResult res;
+			string name = d.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			if (delegates == null)
+				delegates = new ArrayList ();
+			
+			DefineName (name, d);
+			delegates.Add (d);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddMethod (Method method)
+		{
+			string name = method.Name;
+			Object value = defined_names [name];
+			
+			if (value != null && (!(value is Method)))
+				return AdditionResult.NameExists;
+
+			if (name == Basename)
+				return AdditionResult.EnclosingClash;
+
+			if (methods == null)
+				methods = new ArrayList ();
+
+			if (method.Name.IndexOf (".") != -1)
+				methods.Insert (0, method);
+			else 
+				methods.Add (method);
+			
+			if (value != null)
+				DefineName (name, method);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddConstructor (Constructor c)
+		{
+			if (c.Name != Basename) 
+				return AdditionResult.NotAConstructor;
+
+			bool is_static = (c.ModFlags & Modifiers.STATIC) != 0;
+			
+			if (is_static){
+				have_static_constructor = true;
+				if (default_static_constructor != null){
+					Console.WriteLine ("I have a static constructor already");
+					Console.WriteLine ("   " + default_static_constructor);
+					return AdditionResult.MethodExists;
+				}
+
+				default_static_constructor = c;
+			} else {
+				if (c.IsDefault ()){
+					if (default_constructor != null)
+						return AdditionResult.MethodExists;
+					default_constructor = c;
+				}
+				
+				if (instance_constructors == null)
+					instance_constructors = new ArrayList ();
+				
+				instance_constructors.Add (c);
+			}
+			
+			return AdditionResult.Success;
+		}
+		
+		public AdditionResult AddInterface (Interface iface)
+		{
+			AdditionResult res;
+			string name = iface.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+			
+			if (interfaces == null)
+				interfaces = new ArrayList ();
+			interfaces.Add (iface);
+			DefineName (name, iface);
+			
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddField (Field field)
+		{
+			AdditionResult res;
+			string name = field.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+			
+			if (fields == null)
+				fields = new ArrayList ();
+			
+			fields.Add (field);
+			
+			if (field.HasInitializer){
+				if ((field.ModFlags & Modifiers.STATIC) != 0){
+					if (initialized_static_fields == null)
+						initialized_static_fields = new ArrayList ();
+
+					initialized_static_fields.Add (field);
+
+					//
+					// We have not seen a static constructor,
+					// but we will provide static initialization of fields
+					//
+					have_static_constructor = true;
+				} else {
+					if (initialized_fields == null)
+						initialized_fields = new ArrayList ();
+				
+					initialized_fields.Add (field);
+				}
+			}
+
+			if ((field.ModFlags & Modifiers.STATIC) == 0)
+				have_nonstatic_fields = true;
+
+			DefineName (name, field);
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddProperty (Property prop)
+		{
+			AdditionResult res;
+			string name = prop.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			if (properties == null)
+				properties = new ArrayList ();
+
+			if (prop.Name.IndexOf (".") != -1)
+				properties.Insert (0, prop);
+			else
+				properties.Add (prop);
+			DefineName (name, prop);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddEvent (Event e)
+		{
+			AdditionResult res;
+			string name = e.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			if (events == null)
+				events = new ArrayList ();
+			
+			events.Add (e);
+			DefineName (name, e);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddIndexer (Indexer i)
+		{
+			if (indexers == null)
+				indexers = new ArrayList ();
+
+			if (i.InterfaceType != null)
+				indexers.Insert (0, i);
+			else
+				indexers.Add (i);
+
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddOperator (Operator op)
+		{
+			if (operators == null)
+				operators = new ArrayList ();
+
+			operators.Add (op);
+
+			return AdditionResult.Success;
+		}
+
+		public void RegisterOrder (Interface iface)
+		{
+			if (interface_order == null)
+				interface_order = new ArrayList ();
+
+			interface_order.Add (iface);
+		}
+		
+		public ArrayList Types {
+			get {
+				return types;
+			}
+		}
+
+		public ArrayList Methods {
+			get {
+				return methods;
+			}
+		}
+
+		public ArrayList Constants {
+			get {
+				return constants;
+			}
+		}
+
+		public ArrayList Interfaces {
+			get {
+				return interfaces;
+			}
+		}
+		
+		public string Base {
+			get {
+				return base_class_name;
+			}
+		}
+		
+		public ArrayList Bases {
+			get {
+				return type_bases;
+			}
+
+			set {
+				type_bases = value;
+			}
+		}
+
+		public ArrayList Fields {
+			get {
+				return fields;
+			}
+
+			set {
+				fields = value;
+			}
+		}
+
+		public ArrayList InstanceConstructors {
+			get {
+				return instance_constructors;
+			}
+		}
+
+		public ArrayList Properties {
+			get {
+				return properties;
+			}
+		}
+
+		public ArrayList Events {
+			get {
+				return events;
+			}
+		}
+		
+		public ArrayList Enums {
+			get {
+				return enums;
+			}
+		}
+
+		public ArrayList Indexers {
+			get {
+				return indexers;
+			}
+		}
+
+		public ArrayList Operators {
+			get {
+				return operators;
+			}
+		}
+
+		public ArrayList Delegates {
+			get {
+				return delegates;
+			}
+		}
+		
+		public Attributes OptAttributes {
+			get {
+				return attributes;
+			}
+		}
+		
+		public bool HaveStaticConstructor {
+			get {
+				return have_static_constructor;
+			}
+		}
+		
+		public virtual TypeAttributes TypeAttr {
+			get {
+				return Modifiers.TypeAttr (ModFlags, this);
+			}
+		}
+
+		//
+		// Emits the instance field initializers
+		//
+		public bool EmitFieldInitializers (EmitContext ec)
+		{
+			ArrayList fields;
+			ILGenerator ig = ec.ig;
+			Expression instance_expr;
+			
+			if (ec.IsStatic){
+				fields = initialized_static_fields;
+				instance_expr = null;
+			} else {
+				fields = initialized_fields;
+				instance_expr = new This (Location.Null).Resolve (ec);
+			}
+
+			if (fields == null)
+				return true;
+
+			foreach (Field f in fields){
+				Expression e = f.GetInitializerExpression (ec);
+				if (e == null)
+					return false;
+
+				Location l = f.Location;
+				FieldExpr fe = new FieldExpr (f.FieldBuilder, l);
+				fe.InstanceExpression = instance_expr;
+				Expression a = new Assign (fe, e, l);
+
+				a = a.Resolve (ec);
+				if (a == null)
+					return false;
+
+				if (a is ExpressionStatement)
+					((ExpressionStatement) a).EmitStatement (ec);
+				else {
+					throw new Exception ("Assign.Resolve returned a non ExpressionStatement");
+				}
+			}
+
+			return true;
+		}
+		
+		//
+		// Defines the default constructors
+		//
+		void DefineDefaultConstructor (bool is_static)
+		{
+			Constructor c;
+			int mods = 0;
+
+			c = new Constructor (Basename, Parameters.EmptyReadOnlyParameters,
+					     new ConstructorBaseInitializer (
+						     null, Parameters.EmptyReadOnlyParameters,
+						     Location.Null),
+					     Location.Null);
+			
+			if (is_static)
+				mods = Modifiers.STATIC;
+
+			c.ModFlags = mods;
+
+			AddConstructor (c);
+			
+			c.Block = new Block (null);
+			
+		}
+
+		public void ReportStructInitializedInstanceError ()
+		{
+			string n = TypeBuilder.FullName;
+			
+			foreach (Field f in initialized_fields){
+				Report.Error (
+					573, Location,
+					"`" + n + "." + f.Name + "': can not have " +
+					"instance field initializers in structs");
+			}
+		}
+
+		/// <remarks>
+		///  The pending methods that need to be implemented (interfaces or abstract methods)
+		/// </remarks>
+		public PendingImplementation Pending;
+
+		/// <summary>
+		///   This function computes the Base class and also the
+		///   list of interfaces that the class or struct @c implements.
+		///   
+		///   The return value is an array (might be null) of
+		///   interfaces implemented (as Types).
+		///   
+		///   The @parent argument is set to the parent object or null
+		///   if this is `System.Object'. 
+		/// </summary>
+		Type [] GetClassBases (bool is_class, out Type parent, out bool error)
+		{
+			ArrayList bases = Bases;
+			int count;
+			int start, j, i;
+
+			error = false;
+
+			if (is_class)
+				parent = null;
+			else
+				parent = TypeManager.value_type;
+
+			if (bases == null){
+				if (is_class){
+					if (RootContext.StdLib)
+						parent = TypeManager.object_type;
+					else if (Name != "System.Object")
+						parent = TypeManager.object_type;
+				} else {
+					//
+					// If we are compiling our runtime,
+					// and we are defining ValueType, then our
+					// parent is `System.Object'.
+					//
+					if (!RootContext.StdLib && Name == "System.ValueType")
+						parent = TypeManager.object_type;
+				}
+
+				return null;
+			}
+
+			//
+			// Bases should be null if there are no bases at all
+			//
+			count = bases.Count;
+
+			if (is_class){
+				Expression name = (Expression) bases [0];
+				name = ResolveTypeExpr (name, false, Location);
+
+				if (name == null){
+					error = true;
+					return null;
+				}
+
+				Type first = name.Type;
+
+				if (first.IsClass){
+					parent = first;
+					start = 1;
+				} else {
+					parent = TypeManager.object_type;
+					start = 0;
+				}
+
+				if (!AsAccessible (parent, ModFlags))
+					Report.Error (60, Location,
+						      "Inconsistent accessibility: base class `" +
+						      TypeManager.CSharpName (parent) + "' is less " +
+						      "accessible than class `" +
+						      Name + "'");
+
+			} else {
+				start = 0;
+			}
+
+			Type [] ifaces = new Type [count-start];
+			
+			for (i = start, j = 0; i < count; i++, j++){
+				Expression name = (Expression) bases [i];
+				Expression resolved = ResolveTypeExpr (name, false, Location);
+				bases [i] = resolved;
+				Type t = resolved.Type;
+
+				if (t == null){
+					error = true;
+					return null;
+				}
+
+				if (is_class == false && !t.IsInterface){
+					Report.Error (527, "In Struct `" + Name + "', type `"+
+						      name +"' is not an interface");
+					error = true;
+					return null;
+				}
+				
+				if (t.IsSealed) {
+					string detail = "";
+					
+					if (t.IsValueType)
+						detail = " (a class can not inherit from a struct/enum)";
+							
+					Report.Error (509, "class `"+ Name +
+						      "': Cannot inherit from sealed class `"+
+						      bases [i]+"'"+detail);
+					error = true;
+					return null;
+				}
+
+				if (t.IsClass) {
+					if (parent != null){
+						Report.Error (527, "In Class `" + Name + "', type `"+
+							      name+"' is not an interface");
+						error = true;
+						return null;
+					}
+				}
+
+				for (int x = 0; x < j; x++) {
+					if (t == ifaces [x]) {
+						Report.Error (528, "`" + name + "' is already listed in interface list");
+						error = true;
+						return null;
+					}
+				}
+
+				ifaces [j] = t;
+			}
+
+			return TypeManager.ExpandInterfaces (ifaces);
+		}
+		
+		//
+		// Defines the type in the appropriate ModuleBuilder or TypeBuilder.
+		//
+		public override TypeBuilder DefineType ()
+		{
+			Type parent;
+			bool error;
+			bool is_class;
+
+			if (TypeBuilder != null)
+				return TypeBuilder;
+			
+			if (InTransit)
+				return null;
+			
+			InTransit = true;
+
+			if (this is Class)
+				is_class = true;
+			else
+				is_class = false;
+
+			ec = new EmitContext (this, Mono.CSharp.Location.Null, null, null, ModFlags);
+
+			ifaces = GetClassBases (is_class, out parent, out error); 
+			
+			if (error)
+				return null;
+
+			if (is_class && parent != null){
+				if (parent == TypeManager.enum_type ||
+				    (parent == TypeManager.value_type && RootContext.StdLib) ||
+				    parent == TypeManager.delegate_type ||
+				    parent == TypeManager.array_type){
+					Report.Error (
+						644, Location, "`" + Name + "' cannot inherit from " +
+						"special class `" + TypeManager.CSharpName (parent) + "'");
+					return null;
+				}
+			}
+
+			if (!is_class && TypeManager.value_type == null)
+				throw new Exception ();
+
+			TypeAttributes type_attributes = TypeAttr;
+
+			// if (parent_builder is ModuleBuilder) {
+			if (IsTopLevel){
+				ModuleBuilder builder = CodeGen.ModuleBuilder;
+				
+				//
+				// Structs with no fields need to have a ".size 1"
+				// appended
+				//
+
+				if (!is_class && !have_nonstatic_fields)
+					TypeBuilder = builder.DefineType (Name,
+									  type_attributes,
+									  parent, 
+									  PackingSize.Unspecified, 1);
+				else
+				//
+				// classes or structs with fields
+				//
+					TypeBuilder = builder.DefineType (Name,
+									  type_attributes,
+									  parent,
+									  ifaces);
+			} else {
+				TypeBuilder builder = Parent.TypeBuilder;
+				
+				//
+				// Structs with no fields need to have a ".size 1"
+				// appended
+				//
+				if (!is_class && !have_nonstatic_fields)
+					TypeBuilder = builder.DefineNestedType (Basename,
+										type_attributes,
+										parent, 
+										PackingSize.Unspecified);
+				else {
+					//
+					// classes or structs with fields
+					//
+					TypeBuilder = builder.DefineNestedType (Basename,
+										type_attributes,
+										parent,
+										ifaces);
+				}
+			}
+
+			// add interfaces that were not added at type creation (weird API issue)
+			if (!is_class && !have_nonstatic_fields && (ifaces != null)) {
+				foreach (Type i in ifaces)
+					TypeBuilder.AddInterfaceImplementation (i);
+			}
+			
+			//
+			// Finish the setup for the EmitContext
+			//
+			ec.ContainerType = TypeBuilder;
+
+			TypeManager.AddUserType (Name, TypeBuilder, this, ifaces);
+
+			if ((parent != null) &&
+			    (parent == TypeManager.attribute_type ||
+			     parent.IsSubclassOf (TypeManager.attribute_type))) {
+				RootContext.RegisterAttribute (this);
+				TypeManager.RegisterAttrType (TypeBuilder, this);
+			} else
+				RootContext.RegisterOrder (this); 
+				
+			if (Interfaces != null) {
+				foreach (Interface iface in Interfaces)
+					iface.DefineType ();
+			}
+			
+			if (Types != null) {
+				foreach (TypeContainer tc in Types)
+					tc.DefineType ();
+			}
+
+			if (Delegates != null) {
+				foreach (Delegate d in Delegates)
+					d.DefineType ();
+			}
+
+			if (Enums != null) {
+				foreach (Enum en in Enums)
+					en.DefineType ();
+			}
+
+			InTransit = false;
+			return TypeBuilder;
+		}
+
+
+		/// <summary>
+		///   Defines the MemberCore objects that are in the `list' Arraylist
+		///
+		///   The `defined_names' array contains a list of members defined in
+		///   a base class
+		/// </summary>
+		static ArrayList remove_list = new ArrayList ();
+		void DefineMembers (ArrayList list, MemberInfo [] defined_names)
+		{
+			int idx;
+			
+			remove_list.Clear ();
+
+			foreach (MemberCore mc in list){
+				if (!mc.Define (this)){
+					remove_list.Add (mc);
+					continue;
+				}
+						
+				if (defined_names == null)
+					continue;
+
+				idx = Array.BinarySearch (defined_names, mc.Name, mif_compare);
+				if (idx < 0){
+					if (RootContext.WarningLevel >= 4){
+						if ((mc.ModFlags & Modifiers.NEW) != 0)
+							Warning_KewywordNewNotRequired (mc.Location, mc);
+					}
+					continue;
+				}
+
+				MemberInfo match = defined_names [idx];
+
+				if (match is PropertyInfo && ((mc.ModFlags & Modifiers.OVERRIDE) != 0))
+					continue;
+
+				//
+				// If we are both methods, let the method resolution emit warnings
+				//
+				if (match is MethodBase && mc is MethodCore)
+					continue; 
+				
+				if ((mc.ModFlags & Modifiers.NEW) == 0)
+					Warning_KeywordNewRequired (mc.Location, defined_names [idx]);
+			}
+			
+			foreach (object o in remove_list)
+				list.Remove (o);
+			
+			remove_list.Clear ();
+		}
+
+		//
+		// Defines the indexers, and also verifies that the IndexerNameAttribute in the
+		// class is consisten.  Either it is `Item' or it is the name defined by all the
+		// indexers with the `IndexerName' attribute.
+		//
+		// Turns out that the IndexerNameAttribute is applied to each indexer,
+		// but it is never emitted, instead a DefaultName attribute is attached
+		// to the class.
+		//
+		void DefineIndexers ()
+		{
+			string class_indexer_name = null;
+			
+			foreach (Indexer i in Indexers){
+				string name;
+				
+				i.Define (this);
+
+				name = i.IndexerName;
+
+				if (i.InterfaceType != null)
+					continue;
+
+				if (class_indexer_name == null){
+					class_indexer_name = name;
+					continue;
+				}
+				
+				if (name == class_indexer_name)
+					continue;
+				
+				Report.Error (
+					668, "Two indexers have different names, " +
+					" you should use the same name for all your indexers");
+			}
+			if (class_indexer_name == null)
+				class_indexer_name = "Item";
+			IndexerName = class_indexer_name;
+		}
+
+		static void Report1530 (Location loc)
+		{
+			Report.Error (1530, loc, "Keyword new not allowed for namespace elements");
+		}
+
+		/// <summary>
+		///   Populates our TypeBuilder with fields and methods
+		/// </summary>
+		public override bool DefineMembers (TypeContainer parent)
+		{
+			MemberInfo [] defined_names = null;
+
+			if (interface_order != null){
+				foreach (Interface iface in interface_order)
+					if ((iface.ModFlags & Modifiers.NEW) == 0)
+						iface.DefineMembers (this);
+					else
+						Report1530 (iface.Location);
+			}
+
+			if (RootContext.WarningLevel > 1){
+				Type ptype;
+
+				//
+				// This code throws an exception in the comparer
+				// I guess the string is not an object?
+				//
+				ptype = TypeBuilder.BaseType;
+				if (ptype != null){
+					defined_names = (MemberInfo []) FindMembers (
+						ptype, MemberTypes.All & ~MemberTypes.Constructor,
+						BindingFlags.Public | BindingFlags.Instance |
+						BindingFlags.Static, null, null);
+
+					Array.Sort (defined_names, mif_compare);
+				}
+			}
+			
+			if (constants != null)
+				DefineMembers (constants, defined_names);
+
+			if (fields != null)
+				DefineMembers (fields, defined_names);
+
+			if (this is Class){
+				if (instance_constructors == null){
+					if (default_constructor == null)
+						DefineDefaultConstructor (false);
+				}
+
+				if (initialized_static_fields != null &&
+				    default_static_constructor == null)
+					DefineDefaultConstructor (true);
+			}
+
+			if (this is Struct){
+				//
+				// Structs can not have initialized instance
+				// fields
+				//
+				if (initialized_static_fields != null &&
+				    default_static_constructor == null)
+					DefineDefaultConstructor (true);
+
+				if (initialized_fields != null)
+					ReportStructInitializedInstanceError ();
+			}
+
+			Pending = PendingImplementation.GetPendingImplementations (this);
+			
+			//
+			// Constructors are not in the defined_names array
+			//
+			if (instance_constructors != null)
+				DefineMembers (instance_constructors, null);
+		
+			if (default_static_constructor != null)
+				default_static_constructor.Define (this);
+			
+			if (methods != null)
+				DefineMembers (methods, defined_names);
+
+			if (properties != null)
+				DefineMembers (properties, defined_names);
+
+			if (events != null)
+				DefineMembers (events, defined_names);
+
+			if (indexers != null) {
+				DefineIndexers ();
+			} else
+				IndexerName = "Item";
+
+			if (operators != null)
+				DefineMembers (operators, null);
+
+			if (enums != null)
+				DefineMembers (enums, defined_names);
+			
+			if (delegates != null)
+				DefineMembers (delegates, defined_names);
+
+#if CACHE
+			if (TypeBuilder.BaseType != null)
+				parent_container = TypeManager.LookupMemberContainer (TypeBuilder.BaseType);
+
+			member_cache = new MemberCache (this);
+#endif
+
+			return true;
+		}
+
+		public override bool Define (TypeContainer parent)
+		{
+			if (interface_order != null){
+				foreach (Interface iface in interface_order)
+					if ((iface.ModFlags & Modifiers.NEW) == 0)
+						iface.Define (this);
+			}
+
+			return true;
+		}
+
+		/// <summary>
+		///   This function is based by a delegate to the FindMembers routine
+		/// </summary>
+		static bool AlwaysAccept (MemberInfo m, object filterCriteria)
+		{
+			return true;
+		}
+
+		/// <summary>
+		///   This filter is used by FindMembers, and we just keep
+		///   a global for the filter to `AlwaysAccept'
+		/// </summary>
+		static MemberFilter accepting_filter;
+
+		
+		/// <summary>
+		///   A member comparission method based on name only
+		/// </summary>
+		static IComparer mif_compare;
+
+		static TypeContainer ()
+		{
+			accepting_filter = new MemberFilter (AlwaysAccept);
+			mif_compare = new MemberInfoCompare ();
+		}
+		
+		/// <summary>
+		///   This method returns the members of this type just like Type.FindMembers would
+		///   Only, we need to use this for types which are _being_ defined because MS' 
+		///   implementation can't take care of that.
+		/// </summary>
+		//
+		// FIXME: return an empty static array instead of null, that cleans up
+		// some code and is consistent with some coding conventions I just found
+		// out existed ;-)
+		//
+		//
+		// Notice that in various cases we check if our field is non-null,
+		// something that would normally mean that there was a bug elsewhere.
+		//
+		// The problem happens while we are defining p-invoke methods, as those
+		// will trigger a FindMembers, but this happens before things are defined
+		//
+		// Since the whole process is a no-op, it is fine to check for null here.
+		//
+		public override MemberList FindMembers (MemberTypes mt, BindingFlags bf,
+							MemberFilter filter, object criteria)
+		{
+			ArrayList members = new ArrayList ();
+
+			int modflags = 0;
+			if ((bf & BindingFlags.Public) != 0)
+				modflags |= Modifiers.PUBLIC | Modifiers.PROTECTED |
+					Modifiers.INTERNAL;
+			if ((bf & BindingFlags.NonPublic) != 0)
+				modflags |= Modifiers.PRIVATE;
+
+			int static_mask = 0, static_flags = 0;
+			switch (bf & (BindingFlags.Static | BindingFlags.Instance)) {
+			case BindingFlags.Static:
+				static_mask = static_flags = Modifiers.STATIC;
+				break;
+
+			case BindingFlags.Instance:
+				static_mask = Modifiers.STATIC;
+				static_flags = 0;
+				break;
+
+			default:
+				static_mask = static_flags = 0;
+				break;
+			}
+
+			Timer.StartTimer (TimerType.TcFindMembers);
+
+			if (filter == null)
+				filter = accepting_filter; 
+
+			if ((mt & MemberTypes.Field) != 0) {
+				if (fields != null) {
+					foreach (Field f in fields) {
+						if ((f.ModFlags & modflags) == 0)
+							continue;
+						if ((f.ModFlags & static_mask) != static_flags)
+							continue;
+
+						FieldBuilder fb = f.FieldBuilder;
+						if (fb != null && filter (fb, criteria) == true)
+							members.Add (fb);
+					}
+				}
+
+				if (constants != null) {
+					foreach (Const con in constants) {
+						if ((con.ModFlags & modflags) == 0)
+							continue;
+						if ((con.ModFlags & static_mask) != static_flags)
+							continue;
+
+						FieldBuilder fb = con.FieldBuilder;
+						if (fb != null && filter (fb, criteria) == true)
+							members.Add (fb);
+					}
+				}
+			}
+
+			if ((mt & MemberTypes.Method) != 0) {
+				if (methods != null) {
+					foreach (Method m in methods) {
+						if ((m.ModFlags & modflags) == 0)
+							continue;
+						if ((m.ModFlags & static_mask) != static_flags)
+							continue;
+						
+						MethodBuilder mb = m.MethodBuilder;
+
+						if (mb != null && filter (mb, criteria) == true)
+							members.Add (mb);
+					}
+				}
+
+				if (operators != null){
+					foreach (Operator o in operators) {
+						if ((o.ModFlags & modflags) == 0)
+							continue;
+						if ((o.ModFlags & static_mask) != static_flags)
+							continue;
+						
+						MethodBuilder ob = o.OperatorMethodBuilder;
+						if (ob != null && filter (ob, criteria) == true)
+							members.Add (ob);
+					}
+				}
+
+				if (properties != null){
+					foreach (Property p in properties){
+						if ((p.ModFlags & modflags) == 0)
+							continue;
+						if ((p.ModFlags & static_mask) != static_flags)
+							continue;
+						
+						MethodBuilder b;
+
+						b = p.GetBuilder;
+						if (b != null && filter (b, criteria) == true)
+							members.Add (b);
+
+						b = p.SetBuilder;
+						if (b != null && filter (b, criteria) == true)
+							members.Add (b);
+					}
+				}
+
+				if (indexers != null){
+					foreach (Indexer ix in indexers){
+						if ((ix.ModFlags & modflags) == 0)
+							continue;
+						if ((ix.ModFlags & static_mask) != static_flags)
+							continue;
+						
+						MethodBuilder b;
+
+						b = ix.GetBuilder;
+						if (b != null && filter (b, criteria) == true)
+							members.Add (b);
+
+						b = ix.SetBuilder;
+						if (b != null && filter (b, criteria) == true)
+							members.Add (b);
+					}
+				}
+			}
+
+			if ((mt & MemberTypes.Event) != 0) {
+				if (events != null)
+				        foreach (Event e in events) {
+						if ((e.ModFlags & modflags) == 0)
+							continue;
+						if ((e.ModFlags & static_mask) != static_flags)
+							continue;
+
+						MemberInfo eb = e.EventBuilder;
+						if (eb != null && filter (eb, criteria) == true)
+						        members.Add (e.EventBuilder);
+					}
+			}
+			
+			if ((mt & MemberTypes.Property) != 0){
+				if (properties != null)
+					foreach (Property p in properties) {
+						if ((p.ModFlags & modflags) == 0)
+							continue;
+						if ((p.ModFlags & static_mask) != static_flags)
+							continue;
+
+						MemberInfo pb = p.PropertyBuilder;
+						if (pb != null && filter (pb, criteria) == true) {
+							members.Add (p.PropertyBuilder);
+						}
+					}
+
+				if (indexers != null)
+					foreach (Indexer ix in indexers) {
+						if ((ix.ModFlags & modflags) == 0)
+							continue;
+						if ((ix.ModFlags & static_mask) != static_flags)
+							continue;
+
+						MemberInfo ib = ix.PropertyBuilder;
+						if (ib != null && filter (ib, criteria) == true) {
+							members.Add (ix.PropertyBuilder);
+						}
+					}
+			}
+			
+			if ((mt & MemberTypes.NestedType) != 0) {
+				if (types != null){
+					foreach (TypeContainer t in types) {
+						if ((t.ModFlags & modflags) == 0)
+							continue;
+
+						TypeBuilder tb = t.TypeBuilder;
+						if (tb != null && (filter (tb, criteria) == true))
+								members.Add (tb);
+					}
+				}
+
+				if (enums != null){
+					foreach (Enum en in enums){
+						if ((en.ModFlags & modflags) == 0)
+							continue;
+
+						TypeBuilder tb = en.TypeBuilder;
+						if (tb != null && (filter (tb, criteria) == true))
+							members.Add (tb);
+					}
+				}
+				
+				if (delegates != null){
+					foreach (Delegate d in delegates){
+						if ((d.ModFlags & modflags) == 0)
+							continue;
+
+						TypeBuilder tb = d.TypeBuilder;
+						if (tb != null && (filter (tb, criteria) == true))
+							members.Add (tb);
+					}
+				}
+
+				if (interfaces != null){
+					foreach (Interface iface in interfaces){
+						if ((iface.ModFlags & modflags) == 0)
+							continue;
+
+						TypeBuilder tb = iface.TypeBuilder;
+						if (tb != null && (filter (tb, criteria) == true))
+							members.Add (tb);
+					}
+				}
+			}
+
+			if ((mt & MemberTypes.Constructor) != 0){
+				if (((bf & BindingFlags.Instance) != 0) && (instance_constructors != null)){
+					foreach (Constructor c in instance_constructors){
+						ConstructorBuilder cb = c.ConstructorBuilder;
+						if (cb != null)
+							if (filter (cb, criteria) == true)
+								members.Add (cb);
+					}
+				}
+
+				if (((bf & BindingFlags.Static) != 0) && (default_static_constructor != null)){
+					ConstructorBuilder cb =
+						default_static_constructor.ConstructorBuilder;
+					
+					if (cb != null)
+					if (filter (cb, criteria) == true)
+						members.Add (cb);
+				}
+			}
+
+			//
+			// Lookup members in parent if requested.
+			//
+			if (((bf & BindingFlags.DeclaredOnly) == 0) && (TypeBuilder.BaseType != null)) {
+				MemberList list = FindMembers (TypeBuilder.BaseType, mt, bf, filter, criteria);
+				members.AddRange (list);
+			}
+
+			Timer.StopTimer (TimerType.TcFindMembers);
+
+			return new MemberList (members);
+		}
+
+		public override MemberCache MemberCache {
+			get {
+				return member_cache;
+			}
+		}
+
+		public static MemberList FindMembers (Type t, MemberTypes mt, BindingFlags bf,
+						      MemberFilter filter, object criteria)
+		{
+			TypeContainer tc = TypeManager.LookupTypeContainer (t);
+
+			if (tc != null)
+				return tc.FindMembers (mt, bf, filter, criteria);
+			else
+				return new MemberList (t.FindMembers (mt, bf, filter, criteria));
+		}
+
+		//
+		// FindMethods will look for methods not only in the type `t', but in
+		// any interfaces implemented by the type.
+		//
+		public static MethodInfo [] FindMethods (Type t, BindingFlags bf,
+							 MemberFilter filter, object criteria)
+		{
+			return null;
+		}
+
+		/// <summary>
+		///   Emits the values for the constants
+		/// </summary>
+		public void EmitConstants ()
+		{
+			if (constants != null)
+				foreach (Const con in constants)
+					con.EmitConstant (this);
+			return;
+		}
+
+		/// <summary>
+		///   Emits the code, this step is performed after all
+		///   the types, enumerations, constructors
+		/// </summary>
+		public void Emit ()
+		{
+			if (instance_constructors != null)
+				foreach (Constructor c in instance_constructors)
+					c.Emit (this);
+
+			if (default_static_constructor != null)
+				default_static_constructor.Emit (this);
+			
+			if (methods != null)
+				foreach (Method m in methods)
+					m.Emit (this);
+
+			if (operators != null)
+				foreach (Operator o in operators)
+					o.Emit (this);
+
+			if (properties != null)
+				foreach (Property p in properties)
+					p.Emit (this);
+
+			if (indexers != null){
+				foreach (Indexer ix in indexers)
+					ix.Emit (this);
+				
+				CustomAttributeBuilder cb = Interface.EmitDefaultMemberAttr (
+					this, IndexerName, ModFlags, Location);
+				TypeBuilder.SetCustomAttribute (cb);
+			}
+			
+			if (fields != null)
+				foreach (Field f in fields)
+					f.Emit (this);
+
+			if (events != null){
+				foreach (Event e in Events)
+					e.Emit (this);
+			}
+
+			if (Pending != null)
+				if (Pending.VerifyPendingMethods ())
+					return;
+			
+			Attribute.ApplyAttributes (ec, TypeBuilder, this, OptAttributes, Location);
+
+			//
+			// Check for internal or private fields that were never assigned
+			//
+			if (fields != null && RootContext.WarningLevel >= 3) {
+				foreach (Field f in fields) {
+					if ((f.ModFlags & Modifiers.PUBLIC) != 0)
+						continue;
+
+					if (f.status == 0){
+						Report.Warning (
+							169, f.Location, "Private field " +
+							MakeName (f.Name) + " is never used");
+						continue;
+					}
+
+					//
+					// Only report 649 on level 4
+					//
+					if (RootContext.WarningLevel < 4)
+						continue;
+
+					if ((f.status & Field.Status.ASSIGNED) != 0)
+						continue;
+
+					Report.Warning (
+						649, f.Location,
+						"Field " + MakeName (f.Name) + " is never assigned " +
+						" to and will always have its default value");
+				}
+			}
+			
+//			if (types != null)
+//				foreach (TypeContainer tc in types)
+//					tc.Emit ();
+		}
+		
+		public override void CloseType ()
+		{
+			try {
+				if (!Created){
+					Created = true;
+					TypeBuilder.CreateType ();
+				}
+			} catch (TypeLoadException){
+				//
+				// This is fine, the code still created the type
+				//
+//				Report.Warning (-20, "Exception while creating class: " + TypeBuilder.Name);
+//				Console.WriteLine (e.Message);
+			} catch {
+				Console.WriteLine ("In type: " + Name);
+				throw;
+			}
+			
+			if (Enums != null)
+				foreach (Enum en in Enums)
+					en.CloseType ();
+
+			if (interface_order != null){
+				foreach (Interface iface in interface_order)
+					iface.CloseType ();
+			}
+			
+			if (Types != null){
+				foreach (TypeContainer tc in Types)
+					if (tc is Struct)
+						tc.CloseType ();
+
+				foreach (TypeContainer tc in Types)
+					if (!(tc is Struct))
+						tc.CloseType ();
+			}
+
+			if (Delegates != null)
+				foreach (Delegate d in Delegates)
+					d.CloseDelegate ();
+		}
+
+		public string MakeName (string n)
+		{
+			return "`" + Name + "." + n + "'";
+		}
+
+		public void Warning_KeywordNewRequired (Location l, MemberInfo mi)
+		{
+			Report.Warning (
+				108, l, "The keyword new is required on " + 
+				MakeName (mi.Name) + " because it hides `" +
+				mi.ReflectedType.Name + "." + mi.Name + "'");
+		}
+
+		public void Warning_KewywordNewNotRequired (Location l, MemberCore mc)
+		{
+			Report.Warning (
+				109, l, "The member " + MakeName (mc.Name) + " does not hide an " +
+				"inherited member, the keyword new is not required");
+		}
+		
+		public static int CheckMember (string name, MemberInfo mi, int ModFlags)
+		{
+			return 0;
+		}
+
+		//
+		// Performs the validation on a Method's modifiers (properties have
+		// the same properties).
+		//
+		public bool MethodModifiersValid (int flags, string n, Location loc)
+		{
+			const int vao = (Modifiers.VIRTUAL | Modifiers.ABSTRACT | Modifiers.OVERRIDE);
+			const int va = (Modifiers.VIRTUAL | Modifiers.ABSTRACT);
+			const int nv = (Modifiers.NEW | Modifiers.VIRTUAL);
+			bool ok = true;
+			string name = MakeName (n);
+			
+			//
+			// At most one of static, virtual or override
+			//
+			if ((flags & Modifiers.STATIC) != 0){
+				if ((flags & vao) != 0){
+					Report.Error (
+						112, loc, "static method " + name + "can not be marked " +
+						"as virtual, abstract or override");
+					ok = false;
+				}
+			}
+
+			if (this is Struct){
+				if ((flags & va) != 0){
+					Modifiers.Error_InvalidModifier (loc, "virtual or abstract");
+					ok = false;
+				}
+			}
+
+			if ((flags & Modifiers.OVERRIDE) != 0 && (flags & nv) != 0){
+				Report.Error (
+					113, loc, name +
+					" marked as override cannot be marked as new or virtual");
+				ok = false;
+			}
+
+			//
+			// If the declaration includes the abstract modifier, then the
+			// declaration does not include static, virtual or extern
+			//
+			if ((flags & Modifiers.ABSTRACT) != 0){
+				if ((flags & Modifiers.EXTERN) != 0){
+					Report.Error (
+						180, loc, name + " can not be both abstract and extern");
+					ok = false;
+				}
+
+				if ((flags & Modifiers.VIRTUAL) != 0){
+					Report.Error (
+						503, loc, name + " can not be both abstract and virtual");
+					ok = false;
+				}
+
+				if ((ModFlags & Modifiers.ABSTRACT) == 0){
+					Report.Error (
+						513, loc, name +
+						" is abstract but its container class is not");
+					ok = false;
+
+				}
+			}
+
+			if ((flags & Modifiers.PRIVATE) != 0){
+				if ((flags & vao) != 0){
+					Report.Error (
+						621, loc, name +
+						" virtual or abstract members can not be private");
+					ok = false;
+				}
+			}
+
+			if ((flags & Modifiers.SEALED) != 0){
+				if ((flags & Modifiers.OVERRIDE) == 0){
+					Report.Error (
+						238, loc, name +
+						" cannot be sealed because it is not an override");
+					ok = false;
+				}
+			}
+
+			return ok;
+		}
+
+		// Access level of a type.
+		enum AccessLevel {
+			Public			= 0,
+			ProtectedInternal	= 1,
+			Internal		= 2,
+			Protected		= 3,
+			Private			= 4
+		}
+
+		// Check whether `flags' denotes a more restricted access than `level'
+		// and return the new level.
+		static AccessLevel CheckAccessLevel (AccessLevel level, int flags)
+		{
+			AccessLevel old_level = level;
+
+			if ((flags & Modifiers.INTERNAL) != 0) {
+				if ((flags & Modifiers.PROTECTED) != 0) {
+					if ((int) level < (int) AccessLevel.ProtectedInternal)
+						level = AccessLevel.ProtectedInternal;
+				} else {
+					if ((int) level < (int) AccessLevel.Internal)
+						level = AccessLevel.Internal;
+				}
+			} else if ((flags & Modifiers.PROTECTED) != 0) {
+				if ((int) level < (int) AccessLevel.Protected)
+					level = AccessLevel.Protected;
+			} else if ((flags & Modifiers.PRIVATE) != 0)
+				level = AccessLevel.Private;
+
+			return level;
+		}
+
+		// Return the access level for a new member which is defined in the current
+		// TypeContainer with access modifiers `flags'.
+		AccessLevel GetAccessLevel (int flags)
+		{
+			if ((flags & Modifiers.PRIVATE) != 0)
+				return AccessLevel.Private;
+
+			AccessLevel level;
+			if (!IsTopLevel && (Parent != null))
+				level = Parent.GetAccessLevel (flags);
+			else
+				level = AccessLevel.Public;
+
+			return CheckAccessLevel (CheckAccessLevel (level, flags), ModFlags);
+		}
+
+		// Return the access level for type `t', but don't give more access than `flags'.
+		static AccessLevel GetAccessLevel (Type t, int flags)
+		{
+			if (((flags & Modifiers.PRIVATE) != 0) || t.IsNestedPrivate)
+				return AccessLevel.Private;
+
+			AccessLevel level;
+			if (TypeManager.IsBuiltinType (t))
+				return AccessLevel.Public;
+			else if ((t.DeclaringType != null) && (t != t.DeclaringType))
+				level = GetAccessLevel (t.DeclaringType, flags);
+			else {
+				level = CheckAccessLevel (AccessLevel.Public, flags);
+			}
+
+			if (t.IsNestedPublic)
+				return level;
+
+			if (t.IsNestedAssembly || t.IsNotPublic) {
+				if ((int) level < (int) AccessLevel.Internal)
+					level = AccessLevel.Internal;
+			}
+
+			if (t.IsNestedFamily) {
+				if ((int) level < (int) AccessLevel.Protected)
+					level = AccessLevel.Protected;
+			}
+
+			if (t.IsNestedFamORAssem) {
+				if ((int) level < (int) AccessLevel.ProtectedInternal)
+					level = AccessLevel.ProtectedInternal;
+			}
+
+			return level;
+		}
+
+		//
+		// Returns true if `parent' is as accessible as the flags `flags'
+		// given for this member.
+		//
+		public bool AsAccessible (Type parent, int flags)
+		{
+			while (parent.IsArray || parent.IsPointer || parent.IsByRef)
+				parent = parent.GetElementType ();
+
+			AccessLevel level = GetAccessLevel (flags);
+			AccessLevel level2 = GetAccessLevel (parent, flags);
+
+			return (int) level >= (int) level2;
+		}
+
+		Hashtable builder_and_args;
+		
+		public bool RegisterMethod (MethodBuilder mb, InternalParameters ip, Type [] args)
+		{
+			if (builder_and_args == null)
+				builder_and_args = new Hashtable ();
+			return true;
+		}
+
+		/// <summary>
+		///   Performs checks for an explicit interface implementation.  First it
+		///   checks whether the `interface_type' is a base inteface implementation.
+		///   Then it checks whether `name' exists in the interface type.
+		/// </summary>
+		public bool VerifyImplements (Type interface_type, string full, string name, Location loc)
+		{
+			bool found = false;
+
+			if (ifaces != null){
+				foreach (Type t in ifaces){
+					if (t == interface_type){
+						found = true;
+						break;
+					}
+				}
+			}
+			
+			if (!found){
+				Report.Error (540, "`" + full + "': containing class does not implement interface `" + interface_type.FullName + "'");
+				return false;
+			}
+
+			return true;
+		}
+
+		public static void Error_ExplicitInterfaceNotMemberInterface (Location loc, string name)
+		{
+			Report.Error (539, loc, "Explicit implementation: `" + name + "' is not a member of the interface");
+		}
+
+		//
+		// IMemberContainer
+		//
+
+		string IMemberContainer.Name {
+			get {
+				return Name;
+			}
+		}
+
+		Type IMemberContainer.Type {
+			get {
+				return TypeBuilder;
+			}
+		}
+
+		IMemberContainer IMemberContainer.Parent {
+			get {
+				return parent_container;
+			}
+		}
+
+		MemberCache IMemberContainer.MemberCache {
+			get {
+				return member_cache;
+			}
+		}
+
+		bool IMemberContainer.IsInterface {
+			get {
+				return false;
+			}
+		}
+
+		MemberList IMemberContainer.GetMembers (MemberTypes mt, BindingFlags bf)
+		{
+			return FindMembers (mt, bf | BindingFlags.DeclaredOnly, null, null);
+		}
+	}
+
+	public class Class : TypeContainer {
+		// <summary>
+		//   Modifiers allowed in a class declaration
+		// </summary>
+		public const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.ABSTRACT |
+			Modifiers.SEALED |
+			Modifiers.UNSAFE;
+
+		public Class (TypeContainer parent, string name, int mod, Attributes attrs, Location l)
+			: base (parent, name, l)
+		{
+			int accmods;
+
+			if (parent.Parent == null)
+				accmods = Modifiers.INTERNAL;
+			else
+				accmods = Modifiers.PRIVATE;
+
+			this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, l);
+			this.attributes = attrs;
+		}
+
+		//
+		// FIXME: How do we deal with the user specifying a different
+		// layout?
+		//
+		public override TypeAttributes TypeAttr {
+			get {
+				return base.TypeAttr | TypeAttributes.AutoLayout | TypeAttributes.Class;
+			}
+		}
+	}
+
+	public class Struct : TypeContainer {
+		// <summary>
+		//   Modifiers allowed in a struct declaration
+		// </summary>
+		public const int AllowedModifiers =
+			Modifiers.NEW       |
+			Modifiers.PUBLIC    |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL  |
+			Modifiers.UNSAFE    |
+			Modifiers.PRIVATE;
+
+		public Struct (TypeContainer parent, string name, int mod, Attributes attrs, Location l)
+			: base (parent, name, l)
+		{
+			int accmods;
+			
+			if (parent.Parent == null)
+				accmods = Modifiers.INTERNAL;
+			else
+				accmods = Modifiers.PRIVATE;
+			
+			this.ModFlags = Modifiers.Check (AllowedModifiers, mod, accmods, l);
+
+			this.ModFlags |= Modifiers.SEALED;
+			this.attributes = attrs;
+			
+		}
+
+		//
+		// FIXME: Allow the user to specify a different set of attributes
+		// in some cases (Sealed for example is mandatory for a class,
+		// but what SequentialLayout can be changed
+		//
+		public override TypeAttributes TypeAttr {
+			get {
+				return base.TypeAttr |
+					TypeAttributes.SequentialLayout |
+					TypeAttributes.Sealed |
+					TypeAttributes.BeforeFieldInit;
+			}
+		}
+	}
+
+	public abstract class MethodCore : MemberBase {
+		public readonly Parameters Parameters;
+		Block block;
+		
+		//
+		// Parameters, cached for semantic analysis.
+		//
+		protected InternalParameters parameter_info;
+		protected Type [] parameter_types;
+
+		public MethodCore (Expression type, int mod, int allowed_mod, string name,
+				   Attributes attrs, Parameters parameters, Location loc)
+			: base (type, mod, allowed_mod, name, attrs, loc)
+		{
+			Parameters = parameters;
+		}
+		
+		//
+		//  Returns the System.Type array for the parameters of this method
+		//
+		public Type [] ParameterTypes {
+			get {
+				return parameter_types;
+			}
+		}
+
+		public InternalParameters ParameterInfo
+		{
+			get {
+				return parameter_info;
+			}
+		}
+		
+		public Block Block {
+			get {
+				return block;
+			}
+
+			set {
+				block = value;
+			}
+		}
+
+		protected virtual bool DoDefineParameters (TypeContainer parent)
+		{
+			// Check if arguments were correct
+			parameter_types = Parameters.GetParameterInfo (parent);
+			if ((parameter_types == null) || !CheckParameters (parent, parameter_types))
+				return false;
+
+			parameter_info = new InternalParameters (parent, Parameters);
+
+			return true;
+		}
+
+		public CallingConventions GetCallingConvention (bool is_class)
+		{
+			CallingConventions cc = 0;
+			
+			cc = Parameters.GetCallingConvention ();
+
+			if (is_class)
+				if ((ModFlags & Modifiers.STATIC) == 0)
+					cc |= CallingConventions.HasThis;
+
+			// FIXME: How is `ExplicitThis' used in C#?
+			
+			return cc;
+		}
+
+		public void LabelParameters (EmitContext ec, Type [] parameters, MethodBase builder)
+		{
+			//
+			// Define each type attribute (in/out/ref) and
+			// the argument names.
+			//
+			Parameter [] p = Parameters.FixedParameters;
+			int i = 0;
+			
+			MethodBuilder mb = null;
+			ConstructorBuilder cb = null;
+
+			if (builder is MethodBuilder)
+				mb = (MethodBuilder) builder;
+			else
+				cb = (ConstructorBuilder) builder;
+
+			if (p != null){
+				for (i = 0; i < p.Length; i++) {
+					ParameterBuilder pb;
+					
+					if (mb == null)
+						pb = cb.DefineParameter (
+							i + 1, p [i].Attributes, p [i].Name);
+					else 
+						pb = mb.DefineParameter (
+							i + 1, p [i].Attributes, p [i].Name);
+					
+					Attributes attr = p [i].OptAttributes;
+					if (attr != null)
+						Attribute.ApplyAttributes (ec, pb, pb, attr, Location);
+				}
+			}
+
+			if (Parameters.ArrayParameter != null){
+				ParameterBuilder pb;
+				Parameter array_param = Parameters.ArrayParameter;
+				
+				if (mb == null)
+					pb = cb.DefineParameter (
+						i + 1, array_param.Attributes,
+						array_param.Name);
+				else
+					pb = mb.DefineParameter (
+						i + 1, array_param.Attributes,
+						array_param.Name);
+					
+				CustomAttributeBuilder a = new CustomAttributeBuilder (
+					TypeManager.cons_param_array_attribute, new object [0]);
+				
+				pb.SetCustomAttribute (a);
+			}
+		}
+	}
+	
+	public class Method : MethodCore {
+		public MethodBuilder MethodBuilder;
+		public MethodData MethodData;
+
+		/// <summary>
+		///   Modifiers allowed in a class declaration
+		/// </summary>
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.STATIC |
+			Modifiers.VIRTUAL |
+			Modifiers.SEALED |
+			Modifiers.OVERRIDE |
+			Modifiers.ABSTRACT |
+		        Modifiers.UNSAFE |
+			Modifiers.EXTERN;
+
+		//
+		// return_type can be "null" for VOID values.
+		//
+		public Method (Expression return_type, int mod, string name, Parameters parameters,
+			       Attributes attrs, Location l)
+			: base (return_type, mod, AllowedModifiers, name, attrs, parameters, l)
+		{ }
+
+		//
+		// Returns the `System.Type' for the ReturnType of this
+		// function.  Provides a nice cache.  (used between semantic analysis
+		// and actual code generation
+		//
+		public Type GetReturnType (TypeContainer parent)
+		{
+			return MemberType;
+		}
+
+		// Whether this is an operator method.
+		public bool IsOperator;
+
+                void DuplicateEntryPoint (MethodInfo b, Location location)
+                {
+                        Report.Error (
+                                17, location,
+                                "Program `" + CodeGen.FileName +
+                                "'  has more than one entry point defined: `" +
+                                TypeManager.CSharpSignature(b) + "'");
+                }
+
+                void Report28 (MethodInfo b)
+                {
+			if (RootContext.WarningLevel < 4) 
+				return;
+				
+                        Report.Warning (
+                                28, Location,
+                                "`" + TypeManager.CSharpSignature(b) +
+                                "' has the wrong signature to be an entry point");
+                }
+
+                public bool IsEntryPoint (MethodBuilder b, InternalParameters pinfo)
+                {
+                        if (b.ReturnType != TypeManager.void_type &&
+                            b.ReturnType != TypeManager.int32_type)
+                                return false;
+
+                        if (pinfo.Count == 0)
+                                return true;
+
+                        if (pinfo.Count > 1)
+                                return false;
+
+                        Type t = pinfo.ParameterType(0);
+                        if (t.IsArray &&
+                            (t.GetArrayRank() == 1) &&
+                            (t.GetElementType() == TypeManager.string_type) &&
+                            (pinfo.ParameterModifier(0) == Parameter.Modifier.NONE))
+                                return true;
+                        else
+                                return false;
+                }
+
+		//
+		// Checks our base implementation if any
+		//
+		protected override bool CheckBase (TypeContainer parent)
+		{
+			// Check whether arguments were correct.
+			if (!DoDefineParameters (parent))
+				return false;
+
+			MethodSignature ms = new MethodSignature (Name, null, ParameterTypes);
+			if (!IsOperator) {
+				MemberList mi_this;
+
+				mi_this = TypeContainer.FindMembers (
+					parent.TypeBuilder, MemberTypes.Method,
+					BindingFlags.NonPublic | BindingFlags.Public |
+					BindingFlags.Static | BindingFlags.Instance |
+					BindingFlags.DeclaredOnly,
+					MethodSignature.method_signature_filter, ms);
+
+				if (mi_this.Count > 0) {
+					Report.Error (111, Location, "Class `" + parent.Name + "' " +
+						      "already defines a member called `" + Name + "' " +
+						      "with the same parameter types");
+					return false;
+				}
+			}
+
+			//
+			// Verify if the parent has a type with the same name, and then
+			// check whether we have to create a new slot for it or not.
+			//
+			Type ptype = parent.TypeBuilder.BaseType;
+
+			// ptype is only null for System.Object while compiling corlib.
+			if (ptype != null){
+				MemberList mi, mi_static, mi_instance;
+
+				mi_static = TypeContainer.FindMembers (
+					ptype, MemberTypes.Method,
+					BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static,
+					MethodSignature.inheritable_method_signature_filter, ms);
+
+				mi_instance = TypeContainer.FindMembers (
+					ptype, MemberTypes.Method,
+					BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance,
+					MethodSignature.inheritable_method_signature_filter,
+					ms);
+
+				if (mi_instance.Count > 0){
+					mi = mi_instance;
+				} else if (mi_static.Count > 0)
+					mi = mi_static;
+				else
+					mi = null;
+
+				if (mi != null && mi.Count > 0){
+					parent_method = (MethodInfo) mi [0];
+					string name = parent_method.DeclaringType.Name + "." +
+						parent_method.Name;
+
+					if (!CheckMethodAgainstBase (parent, flags, parent_method, name))
+						return false;
+
+					if ((ModFlags & Modifiers.NEW) == 0) {
+						Type parent_ret = TypeManager.TypeToCoreType (
+							parent_method.ReturnType);
+
+						if (parent_ret != MemberType) {
+							Report.Error (
+								508, parent.MakeName (Name) + ": cannot " +
+								"change return type when overriding " +
+								"inherited member " + name);
+							return false;
+						}
+					}
+				} else {
+					if ((ModFlags & Modifiers.NEW) != 0)
+						WarningNotHiding (parent);
+
+					if ((ModFlags & Modifiers.OVERRIDE) != 0){
+						Report.Error (115, Location,
+							      parent.MakeName (Name) +
+							      " no suitable methods found to override");
+					}
+				}
+			} else if ((ModFlags & Modifiers.NEW) != 0)
+				WarningNotHiding (parent);
+
+			return true;
+		}
+
+		//
+		// Creates the type
+		//
+		public override bool Define (TypeContainer parent)
+		{
+			if (!DoDefine (parent))
+				return false;
+
+			if (!CheckBase (parent))
+				return false;
+
+			CallingConventions cc = GetCallingConvention (parent is Class);
+
+			MethodData = new MethodData (this, null, MemberType, ParameterTypes,
+						     ParameterInfo, cc, OptAttributes,
+						     ModFlags, flags, true);
+
+			if (!MethodData.Define (parent))
+				return false;
+
+			MethodBuilder = MethodData.MethodBuilder;
+			
+			//
+			// This is used to track the Entry Point,
+			//
+			if (Name == "Main" &&
+			    ((ModFlags & Modifiers.STATIC) != 0) && 
+			    (RootContext.MainClass == null ||
+			     RootContext.MainClass == parent.TypeBuilder.FullName)){
+                                if (IsEntryPoint (MethodBuilder, ParameterInfo)) {
+                                        if (RootContext.EntryPoint == null) {
+                                                RootContext.EntryPoint = MethodBuilder;
+                                                RootContext.EntryPointLocation = Location;
+                                        } else {
+                                                DuplicateEntryPoint (RootContext.EntryPoint, RootContext.EntryPointLocation);
+                                                DuplicateEntryPoint (MethodBuilder, Location);
+                                        }
+                                } else                                 	
+                               	        Report28(MethodBuilder);
+			}
+
+			return true;
+		}
+
+		//
+		// Emits the code
+		// 
+		public void Emit (TypeContainer parent)
+		{
+			MethodData.Emit (parent, Block, this);
+		}
+	}
+
+	public abstract class ConstructorInitializer {
+		ArrayList argument_list;
+		ConstructorInfo parent_constructor;
+		Parameters parameters;
+		Location loc;
+		
+		public ConstructorInitializer (ArrayList argument_list, Parameters parameters,
+					       Location loc)
+		{
+			this.argument_list = argument_list;
+			this.parameters = parameters;
+			this.loc = loc;
+		}
+
+		public ArrayList Arguments {
+			get {
+				return argument_list;
+			}
+		}
+
+		public bool Resolve (EmitContext ec)
+		{
+			Expression parent_constructor_group;
+			Type t;
+
+			ec.CurrentBlock = new Block (null, true, parameters);
+
+			if (argument_list != null){
+				foreach (Argument a in argument_list){
+					if (!a.Resolve (ec, loc))
+						return false;
+				}
+			}
+
+			ec.CurrentBlock = null;
+
+			if (this is ConstructorBaseInitializer) {
+				if (ec.ContainerType.BaseType == null)
+					return true;
+
+				t = ec.ContainerType.BaseType;
+				if (ec.ContainerType.IsValueType) {
+					Report.Error (522, loc,
+						"structs cannot call base class constructors");
+					return false;
+				}
+			} else
+				t = ec.ContainerType;
+
+			parent_constructor_group = Expression.MemberLookup (
+				ec, t, t, ".ctor", 
+				MemberTypes.Constructor,
+				BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly,
+				loc);
+			
+			if (parent_constructor_group == null){
+				Report.Error (1501, loc,
+				       "Can not find a constructor for this argument list");
+				return false;
+			}
+			
+			parent_constructor = (ConstructorInfo) Invocation.OverloadResolve (ec, 
+				(MethodGroupExpr) parent_constructor_group, argument_list, loc);
+			
+			if (parent_constructor == null){
+				Report.Error (1501, loc,
+				       "Can not find a constructor for this argument list");
+				return false;
+			}
+			
+			return true;
+		}
+
+		public void Emit (EmitContext ec)
+		{
+			if (parent_constructor != null)
+				ec.ig.Emit (OpCodes.Ldarg_0);
+			if (argument_list != null)
+				Invocation.EmitArguments (ec, null, argument_list);
+			if (parent_constructor != null)
+				ec.ig.Emit (OpCodes.Call, parent_constructor);
+		}
+	}
+
+	public class ConstructorBaseInitializer : ConstructorInitializer {
+		public ConstructorBaseInitializer (ArrayList argument_list, Parameters pars, Location l) :
+			base (argument_list, pars, l)
+		{
+		}
+	}
+
+	public class ConstructorThisInitializer : ConstructorInitializer {
+		public ConstructorThisInitializer (ArrayList argument_list, Parameters pars, Location l) :
+			base (argument_list, pars, l)
+		{
+		}
+	}
+	
+	public class Constructor : MethodCore {
+		public ConstructorBuilder ConstructorBuilder;
+		public ConstructorInitializer Initializer;
+		new public Attributes OptAttributes;
+
+		// <summary>
+		//   Modifiers allowed for a constructor.
+		// </summary>
+		const int AllowedModifiers =
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.STATIC |
+			Modifiers.UNSAFE |
+			Modifiers.PRIVATE;
+
+		//
+		// The spec claims that static is not permitted, but
+		// my very own code has static constructors.
+		//
+		public Constructor (string name, Parameters args, ConstructorInitializer init, Location l)
+			: base (null, 0, AllowedModifiers, name, null, args, l)
+		{
+			Initializer = init;
+		}
+
+		//
+		// Returns true if this is a default constructor
+		//
+		public bool IsDefault ()
+		{
+			if ((ModFlags & Modifiers.STATIC) != 0)
+				return  (Parameters.FixedParameters == null ? true : Parameters.Empty) &&
+					(Parameters.ArrayParameter == null ? true : Parameters.Empty);
+			
+			else
+				return  (Parameters.FixedParameters == null ? true : Parameters.Empty) &&
+					(Parameters.ArrayParameter == null ? true : Parameters.Empty) &&
+					(Initializer is ConstructorBaseInitializer) &&
+					(Initializer.Arguments == null);
+		}
+
+		//
+		// Creates the ConstructorBuilder
+		//
+		public override bool Define (TypeContainer parent)
+		{
+			MethodAttributes ca = (MethodAttributes.RTSpecialName |
+					       MethodAttributes.SpecialName);
+
+			// Check if arguments were correct.
+			if (!DoDefineParameters (parent))
+				return false;
+
+			if ((ModFlags & Modifiers.STATIC) != 0)
+				ca |= MethodAttributes.Static;
+			else {
+				if (parent is Struct && ParameterTypes.Length == 0){
+					Report.Error (
+						568, Location, 
+						"Structs can not contain explicit parameterless " +
+						"constructors");
+					return false;
+				}
+				ca |= MethodAttributes.Public | MethodAttributes.HideBySig;
+			}
+
+			ConstructorBuilder = parent.TypeBuilder.DefineConstructor (
+				ca, GetCallingConvention (parent is Class), ParameterTypes);
+
+			//
+			// HACK because System.Reflection.Emit is lame
+			//
+			if (!TypeManager.RegisterMethod (ConstructorBuilder, ParameterInfo, ParameterTypes)) {
+				Report.Error (
+					111, Location,
+					"Class `" +parent.Name+ "' already contains a definition with the " +
+					"same return value and parameter types for constructor `" + Name
+					+ "'");
+				return false;
+			}
+
+			return true;
+		}
+
+		//
+		// Emits the code
+		//
+		public void Emit (TypeContainer parent)
+		{
+			ILGenerator ig = ConstructorBuilder.GetILGenerator ();
+			EmitContext ec = new EmitContext (parent, Location, ig, null, ModFlags, true);
+
+			if ((ModFlags & Modifiers.STATIC) == 0){
+				if (parent is Class && Initializer == null)
+					Initializer = new ConstructorBaseInitializer (
+						null, Parameters.EmptyReadOnlyParameters, parent.Location);
+
+
+				//
+				// Spec mandates that Initializers will not have
+				// `this' access
+				//
+				ec.IsStatic = true;
+				if (Initializer != null && !Initializer.Resolve (ec))
+					return;
+				ec.IsStatic = false;
+			}
+
+			LabelParameters (ec, ParameterTypes, ConstructorBuilder);
+			
+			//
+			// Classes can have base initializers and instance field initializers.
+			//
+			if (parent is Class){
+				if ((ModFlags & Modifiers.STATIC) == 0)
+					parent.EmitFieldInitializers (ec);
+			}
+			if (Initializer != null)
+				Initializer.Emit (ec);
+			
+			if ((ModFlags & Modifiers.STATIC) != 0)
+				parent.EmitFieldInitializers (ec);
+
+			Attribute.ApplyAttributes (ec, ConstructorBuilder, this, OptAttributes, Location);
+
+			// If this is a non-static `struct' constructor and doesn't have any
+			// initializer, it must initialize all of the struct's fields.
+			if ((parent is Struct) && ((ModFlags & Modifiers.STATIC) == 0) &&
+			    (Initializer == null))
+				Block.AddThisVariable (parent, Location);
+
+			ec.EmitTopBlock (Block, ParameterInfo, Location);
+		}
+	}
+
+	public class MethodData {
+		//
+		// The return type of this method
+		//
+		public readonly Type ReturnType;
+		public readonly Type[] ParameterTypes;
+		public readonly InternalParameters ParameterInfo;
+		public readonly CallingConventions CallingConventions;
+		public readonly Attributes OptAttributes;
+		public readonly Location Location;
+
+		//
+		// Are we implementing an interface ?
+		//
+		public bool IsImplementing = false;
+
+		//
+		// Protected data.
+		//
+		protected MemberBase member;
+		protected int modifiers;
+		protected MethodAttributes flags;
+		protected bool is_method;
+		protected string accessor_name;
+		ArrayList conditionals;
+
+		MethodBuilder builder = null;
+		public MethodBuilder MethodBuilder {
+			get {
+				return builder;
+			}
+		}
+
+		public MethodData (MemberBase member, string name, Type return_type,
+				   Type [] parameter_types, InternalParameters parameters,
+				   CallingConventions cc, Attributes opt_attrs,
+				   int modifiers, MethodAttributes flags, bool is_method)
+		{
+			this.member = member;
+			this.accessor_name = name;
+			this.ReturnType = return_type;
+			this.ParameterTypes = parameter_types;
+			this.ParameterInfo = parameters;
+			this.CallingConventions = cc;
+			this.OptAttributes = opt_attrs;
+			this.modifiers = modifiers;
+			this.flags = flags;
+			this.is_method = is_method;
+			this.Location = member.Location;
+			this.conditionals = new ArrayList ();
+		}
+
+		//
+		// Attributes.
+		//
+		Attribute dllimport_attribute = null;
+		string obsolete = null;
+		bool obsolete_error = false;
+
+		public virtual bool ApplyAttributes (Attributes opt_attrs, bool is_method)
+		{
+			if ((opt_attrs == null) || (opt_attrs.AttributeSections == null))
+				return true;
+
+			foreach (AttributeSection asec in opt_attrs.AttributeSections) {
+				if (asec.Attributes == null)
+					continue;
+					
+				foreach (Attribute a in asec.Attributes) {
+					if (a.Name == "Conditional") {
+						if (!ApplyConditionalAttribute (a))
+							return false;
+					} else if (a.Name == "Obsolete") {
+						if (!ApplyObsoleteAttribute (a))
+							return false;
+					} else if (a.Name.IndexOf ("DllImport") != -1) {
+						if (!is_method) {
+							a.Type = TypeManager.dllimport_type;
+							Attribute.Error_AttributeNotValidForElement (a, Location);
+							return false;
+						}
+						if (!ApplyDllImportAttribute (a))
+							return false;
+					}
+				}
+			}
+
+			return true;
+		}
+
+		//
+		// Applies the `DllImport' attribute to the method.
+		//
+		protected virtual bool ApplyDllImportAttribute (Attribute a)
+		{
+			const int extern_static = Modifiers.EXTERN | Modifiers.STATIC;
+			if ((modifiers & extern_static) != extern_static) {
+				Report.Error (601, Location,
+					      "The DllImport attribute must be specified on a method " +
+					      "marked `static' and `extern'.");
+				return false;
+			}
+
+			flags |= MethodAttributes.PinvokeImpl;
+			dllimport_attribute = a;
+			return true;
+		}
+
+		//
+		// Applies the `Obsolete' attribute to the method.
+		//
+		protected virtual bool ApplyObsoleteAttribute (Attribute a)
+		{
+			if (obsolete != null) {
+				Report.Error (579, Location, "Duplicate `Obsolete' attribute");
+				return false;
+			}
+
+			obsolete = a.Obsolete_GetObsoleteMessage (out obsolete_error);
+			return obsolete != null;
+		}
+
+		//
+		// Applies the `Conditional' attribute to the method.
+		//
+		protected virtual bool ApplyConditionalAttribute (Attribute a)
+		{
+			// The Conditional attribute is only valid on methods.
+			if (!is_method) {
+				Attribute.Error_AttributeNotValidForElement (a, Location);
+				return false;
+			}
+
+			string condition = a.Conditional_GetConditionName ();
+
+			if (condition == null)
+				return false;
+
+			if (ReturnType != TypeManager.void_type) {
+				Report.Error (578, Location,
+					      "Conditional not valid on `" + member.Name + "' " +
+					      "because its return type is not void");
+				return false;
+			}
+
+			if ((modifiers & Modifiers.OVERRIDE) != 0) {
+				Report.Error (243, Location,
+					      "Conditional not valid on `" + member.Name + "' " +
+					      "because it is an override method");
+				return false;
+			}
+
+			if (member.IsExplicitImpl) {
+				Report.Error (577, Location,
+					      "Conditional not valid on `" + member.Name + "' " +
+					      "because it is an explicit interface implementation");
+				return false;
+			}
+
+			if (IsImplementing) {
+				Report.Error (623, Location,
+					      "Conditional not valid on `" + member.Name + "' " +
+					      "because it is an interface method");
+				return false;
+			}
+
+			conditionals.Add (condition);
+
+			return true;
+		}
+
+		//
+		// Checks whether this method should be ignored due to its Conditional attributes.
+		//
+		bool ShouldIgnore (Location loc)
+		{
+			// When we're overriding a virtual method, we implicitly inherit the
+			// Conditional attributes from our parent.
+			if (member.ParentMethod != null) {
+				TypeManager.MethodFlags flags = TypeManager.GetMethodFlags (
+					member.ParentMethod, loc);
+
+				if ((flags & TypeManager.MethodFlags.ShouldIgnore) != 0)
+					return true;
+			}
+
+			foreach (string condition in conditionals)
+				if (RootContext.AllDefines [condition] == null)
+					return true;
+
+			return false;
+		}
+
+		//
+		// Returns the TypeManager.MethodFlags for this method.
+		// This emits an error 619 / warning 618 if the method is obsolete.
+		// In the former case, TypeManager.MethodFlags.IsObsoleteError is returned.
+		//
+		public virtual TypeManager.MethodFlags GetMethodFlags (Location loc)
+		{
+			TypeManager.MethodFlags flags = 0;
+
+			if (obsolete != null) {
+				if (obsolete_error) {
+					Report.Error (619, loc, "Method `" + member.Name +
+						      "' is obsolete: `" + obsolete + "'");
+					return TypeManager.MethodFlags.IsObsoleteError;
+				} else
+					Report.Warning (618, loc, "Method `" + member.Name +
+							"' is obsolete: `" + obsolete + "'");
+
+				flags |= TypeManager.MethodFlags.IsObsolete;
+			}
+
+			if (ShouldIgnore (loc))
+			    flags |= TypeManager.MethodFlags.ShouldIgnore;
+
+			return flags;
+		}
+
+		public virtual bool Define (TypeContainer parent)
+		{
+			MethodInfo implementing = null;
+			string method_name, name, prefix;
+
+			if (OptAttributes != null)
+				if (!ApplyAttributes (OptAttributes, is_method))
+					return false;
+
+			if (member.IsExplicitImpl)
+				prefix = member.InterfaceType.FullName + ".";
+			else
+				prefix = "";
+
+			if (accessor_name != null)
+				name = accessor_name + "_" + member.ShortName;
+			else
+				name = member.ShortName;
+			method_name = prefix + name;
+				
+			if (parent.Pending != null){
+				if (member is Indexer)
+					implementing = parent.Pending.IsInterfaceIndexer (
+						member.InterfaceType, ReturnType, ParameterTypes);
+				else
+					implementing = parent.Pending.IsInterfaceMethod (
+						member.InterfaceType, name, ReturnType, ParameterTypes);
+
+				if (member.InterfaceType != null && implementing == null){
+					TypeContainer.Error_ExplicitInterfaceNotMemberInterface (
+						Location, name);
+					return false;
+				}
+			}
+
+			//
+			// For implicit implementations, make sure we are public, for
+			// explicit implementations, make sure we are private.
+			//
+			if (implementing != null){
+				//
+				// Setting null inside this block will trigger a more
+				// verbose error reporting for missing interface implementations
+				//
+				// The "candidate" function has been flagged already
+				// but it wont get cleared
+				//
+				if (!member.IsExplicitImpl){
+					//
+					// We already catch different accessibility settings
+					// so we just need to check that we are not private
+					//
+					if ((modifiers & Modifiers.PRIVATE) != 0)
+						implementing = null;
+					
+					//
+					// Static is not allowed
+					//
+					if ((modifiers & Modifiers.STATIC) != 0)
+						implementing = null;
+				} else {
+					if ((modifiers & (Modifiers.PUBLIC | Modifiers.ABSTRACT | Modifiers.VIRTUAL)) != 0){
+						Modifiers.Error_InvalidModifier (Location, "public, virtual or abstract");
+						implementing = null;
+					}
+				}
+			}
+			
+			//
+			// If implementing is still valid, set flags
+			//
+			if (implementing != null){
+				//
+				// When implementing interface methods, set NewSlot.
+				//
+				if (implementing.DeclaringType.IsInterface)
+					flags |= MethodAttributes.NewSlot;
+				
+				flags |=
+					MethodAttributes.Virtual |
+					MethodAttributes.HideBySig;
+
+				// Get the method name from the explicit interface.
+				if (member.InterfaceType != null) {
+					name = implementing.Name;
+					method_name = prefix + name;
+				}
+
+				IsImplementing = true;
+			}
+
+			//
+			// Create the MethodBuilder for the method
+			//
+			if ((flags & MethodAttributes.PinvokeImpl) != 0) {
+				if ((modifiers & Modifiers.STATIC) == 0) {
+					Report.Error (601, Location,
+						      "The DllImport attribute must be specified on " +
+						      "a method marked 'static' and 'extern'.");
+					return false;
+				}
+				
+				EmitContext ec = new EmitContext (
+					parent, Location, null, ReturnType, modifiers);
+				
+				builder = dllimport_attribute.DefinePInvokeMethod (
+					ec, parent.TypeBuilder, method_name, flags,
+					ReturnType, ParameterTypes);
+			} else
+				builder = parent.TypeBuilder.DefineMethod (
+					method_name, flags, CallingConventions,
+					ReturnType, ParameterTypes);
+
+			if (builder == null)
+				return false;
+
+			if (IsImplementing) {
+				//
+				// clear the pending implemntation flag
+				//
+				if (member is Indexer) {
+					parent.Pending.ImplementIndexer (
+						member.InterfaceType, builder, ReturnType,
+						ParameterTypes, true);
+				} else
+					parent.Pending.ImplementMethod (
+						member.InterfaceType, name, ReturnType,
+						ParameterTypes, member.IsExplicitImpl);
+
+				if (member.IsExplicitImpl)
+					parent.TypeBuilder.DefineMethodOverride (
+						builder, implementing);
+			}
+
+			if (!TypeManager.RegisterMethod (builder, ParameterInfo, ParameterTypes)) {
+				Report.Error (111, Location,
+					      "Class `" + parent.Name +
+					      "' already contains a definition with the " +
+					      "same return value and parameter types as the " +
+					      "'get' method of property `" + member.Name + "'");
+				return false;
+			}
+
+			TypeManager.AddMethod (builder, this);
+
+			return true;
+		}
+
+		//
+		// Emits the code
+		// 
+		public virtual void Emit (TypeContainer parent, Block block, object kind)
+		{
+			ILGenerator ig;
+			EmitContext ec;
+
+			if ((flags & MethodAttributes.PinvokeImpl) == 0)
+				ig = builder.GetILGenerator ();
+			else
+				ig = null;
+
+			ec = new EmitContext (parent, Location, ig, ReturnType, modifiers);
+
+			if (OptAttributes != null)
+				Attribute.ApplyAttributes (ec, builder, kind, OptAttributes, Location);
+
+			if (member is MethodCore)
+				((MethodCore) member).LabelParameters (ec, ParameterTypes, MethodBuilder);
+
+			//
+			// abstract or extern methods have no bodies
+			//
+			if ((modifiers & (Modifiers.ABSTRACT | Modifiers.EXTERN)) != 0){
+				if (block == null)
+					return;
+
+				//
+				// abstract or extern methods have no bodies.
+				//
+				if ((modifiers & Modifiers.ABSTRACT) != 0)
+					Report.Error (
+						500, Location, "Abstract method `" +
+						TypeManager.CSharpSignature (builder) +
+						"' can not have a body");
+
+				if ((modifiers & Modifiers.EXTERN) != 0)
+					Report.Error (
+						179, Location, "External method `" +
+						TypeManager.CSharpSignature (builder) +
+						"' can not have a body");
+
+				return;
+			}
+
+			//
+			// Methods must have a body unless they're extern or abstract
+			//
+			if (block == null) {
+				Report.Error (
+					501, Location, "Method `" +
+					TypeManager.CSharpSignature (builder) +
+					"' must declare a body since it is not marked " +
+					"abstract or extern");
+				return;
+			}
+
+			//
+			// Handle destructors specially
+			//
+			// FIXME: This code generates buggy code
+			//
+			if (member.Name == "Finalize" && ReturnType == TypeManager.void_type)
+				EmitDestructor (ec, block);
+			else {
+				ISymbolWriter sw = CodeGen.SymbolWriter;
+
+				if ((sw != null) && !Location.IsNull (Location) &&
+				    !Location.IsNull (block.EndLocation)) {
+					Location end = block.EndLocation;
+					MethodToken token = MethodBuilder.GetToken ();
+					sw.OpenMethod (new SymbolToken (token.Token));
+					sw.SetMethodSourceRange (Location.SymbolDocument,
+								 Location.Row, 0,
+								 end.SymbolDocument,
+								 end.Row, 0);
+
+					ec.EmitTopBlock (block, ParameterInfo, Location);
+
+					sw.CloseMethod ();
+				} else
+					ec.EmitTopBlock (block, ParameterInfo, Location);
+			}
+		}
+
+		void EmitDestructor (EmitContext ec, Block block)
+		{
+			ILGenerator ig = ec.ig;
+			
+			Label finish = ig.DefineLabel ();
+			bool old_in_try = ec.InTry;
+			
+			ig.BeginExceptionBlock ();
+			ec.InTry = true;
+			ec.ReturnLabel = finish;
+			ec.HasReturnLabel = true;
+			ec.EmitTopBlock (block, null, Location);
+			ec.InTry = old_in_try;
+			
+			// ig.MarkLabel (finish);
+			bool old_in_finally = ec.InFinally;
+			ec.InFinally = true;
+			ig.BeginFinallyBlock ();
+			
+			if (ec.ContainerType.BaseType != null) {
+				Expression member_lookup = Expression.MemberLookup (
+					ec, ec.ContainerType.BaseType, ec.ContainerType.BaseType, "Finalize",
+					MemberTypes.Method, Expression.AllBindingFlags, Location);
+
+				if (member_lookup != null){
+					MethodGroupExpr parent_destructor = ((MethodGroupExpr) member_lookup);
+				
+					ig.Emit (OpCodes.Ldarg_0);
+					ig.Emit (OpCodes.Call, (MethodInfo) parent_destructor.Methods [0]);
+				}
+			}
+			ec.InFinally = old_in_finally;
+			
+			ig.EndExceptionBlock ();
+			//ig.MarkLabel (ec.ReturnLabel);
+			ig.Emit (OpCodes.Ret);
+		}
+	}
+
+	abstract public class MemberBase : MemberCore {
+		public Expression Type;
+		public readonly Attributes OptAttributes;
+
+		protected MethodAttributes flags;
+
+		//
+		// The "short" name of this property / indexer / event.  This is the
+		// name without the explicit interface.
+		//
+		public string ShortName;
+
+		//
+		// The type of this property / indexer / event
+		//
+		public Type MemberType;
+
+		//
+		// If true, this is an explicit interface implementation
+		//
+		public bool IsExplicitImpl = false;
+
+		//
+		// The name of the interface we are explicitly implementing
+		//
+		public string ExplicitInterfaceName = null;
+
+		//
+		// If true, the interface type we are explicitly implementing
+		//
+		public Type InterfaceType = null;
+
+		//
+		// The method we're overriding if this is an override method.
+		//
+		protected MethodInfo parent_method = null;
+		public MethodInfo ParentMethod {
+			get {
+				return parent_method;
+			}
+		}
+
+		//
+		// The constructor is only exposed to our children
+		//
+		protected MemberBase (Expression type, int mod, int allowed_mod, string name,
+				      Attributes attrs, Location loc)
+			: base (name, loc)
+		{
+			Type = type;
+			ModFlags = Modifiers.Check (allowed_mod, mod, Modifiers.PRIVATE, loc);
+			OptAttributes = attrs;
+		}
+
+		protected virtual bool CheckBase (TypeContainer parent)
+		{
+			return true;
+		}
+
+		protected virtual bool CheckParameters (TypeContainer parent, Type [] parameters)
+		{
+			bool error = false;
+
+			foreach (Type partype in parameters){
+				if (partype.IsPointer && !UnsafeOK (parent))
+					error = true;
+
+				if (parent.AsAccessible (partype, ModFlags))
+					continue;
+
+				if (this is Indexer)
+					Report.Error (55, Location,
+						      "Inconsistent accessibility: parameter type `" +
+						      TypeManager.CSharpName (partype) + "' is less " +
+						      "accessible than indexer `" + Name + "'");
+				else
+					Report.Error (51, Location,
+						      "Inconsistent accessibility: parameter type `" +
+						      TypeManager.CSharpName (partype) + "' is less " +
+						      "accessible than method `" + Name + "'");
+				error = true;
+			}
+
+			return !error;
+		}
+
+		protected virtual bool DoDefine (TypeContainer parent)
+		{
+			if (Name == null)
+				Name = "this";
+
+			if (!parent.MethodModifiersValid (ModFlags, Name, Location))
+				return false;
+
+			flags = Modifiers.MethodAttr (ModFlags);
+
+			// Lookup Type, verify validity
+			MemberType = parent.ResolveType (Type, false, Location);
+			if (MemberType == null)
+				return false;
+
+			// verify accessibility
+			if (!parent.AsAccessible (MemberType, ModFlags)) {
+				if (this is Property)
+					Report.Error (53, Location,
+						      "Inconsistent accessibility: property type `" +
+						      TypeManager.CSharpName (MemberType) + "' is less " +
+						      "accessible than property `" + Name + "'");
+				else if (this is Indexer)
+					Report.Error (54, Location,
+						      "Inconsistent accessibility: indexer return type `" +
+						      TypeManager.CSharpName (MemberType) + "' is less " +
+						      "accessible than indexer `" + Name + "'");
+				else if (this is Method)
+					Report.Error (50, Location,
+						      "Inconsistent accessibility: return type `" +
+						      TypeManager.CSharpName (MemberType) + "' is less " +
+						      "accessible than method `" + Name + "'");
+				else
+					Report.Error (52, Location,
+						      "Inconsistent accessibility: field type `" +
+						      TypeManager.CSharpName (MemberType) + "' is less " +
+						      "accessible than field `" + Name + "'");
+				return false;
+			}
+
+			if (MemberType.IsPointer && !UnsafeOK (parent))
+				return false;
+			
+			//
+			// Check for explicit interface implementation
+			//
+			if ((ExplicitInterfaceName == null) && (Name.IndexOf (".") != -1)){
+				int pos = Name.LastIndexOf (".");
+
+				ExplicitInterfaceName = Name.Substring (0, pos);
+				ShortName = Name.Substring (pos + 1);
+			} else
+				ShortName = Name;
+
+			if (ExplicitInterfaceName != null) {
+				InterfaceType  = RootContext.LookupType (
+					parent, ExplicitInterfaceName, false, Location);
+				if (InterfaceType == null)
+					return false;
+
+				// Compute the full name that we need to export.
+				Name = InterfaceType.FullName + "." + ShortName;
+				
+				if (!parent.VerifyImplements (InterfaceType, ShortName, Name, Location))
+					return false;
+				
+				IsExplicitImpl = true;
+			} else
+				IsExplicitImpl = false;
+
+			return true;
+		}
+	}
+
+	//
+	// Fields and Events both generate FieldBuilders, we use this to share 
+	// their common bits.  This is also used to flag usage of the field
+	//
+	abstract public class FieldBase : MemberBase {
+		public FieldBuilder  FieldBuilder;
+		public Status status;
+
+		[Flags]
+		public enum Status : byte { ASSIGNED = 1, USED = 2 }
+
+		//
+		// The constructor is only exposed to our children
+		//
+		protected FieldBase (Expression type, int mod, int allowed_mod, string name,
+				     object init, Attributes attrs, Location loc)
+			: base (type, mod, allowed_mod, name, attrs, loc)
+		{
+			this.init = init;
+		}
+
+		//
+		// Whether this field has an initializer.
+		//
+		public bool HasInitializer {
+			get {
+				return init != null;
+			}
+		}
+
+		// Private.
+		readonly Object init;
+		Expression init_expr;
+		bool init_expr_initialized = false;
+
+		//
+		// Resolves and returns the field initializer.
+		//
+		public Expression GetInitializerExpression (EmitContext ec)
+		{
+			if (init_expr_initialized)
+				return init_expr;
+
+			Expression e;
+			if (init is Expression)
+				e = (Expression) init;
+			else
+				e = new ArrayCreation (Type, "", (ArrayList)init, Location);
+
+			ec.IsFieldInitializer = true;
+			e = e.DoResolve (ec);
+			ec.IsFieldInitializer = false;
+
+			init_expr = e;
+			init_expr_initialized = true;
+
+			return init_expr;
+		}
+	}
+
+	//
+	// The Field class is used to represents class/struct fields during parsing.
+	//
+	public class Field : FieldBase {
+		// <summary>
+		//   Modifiers allowed in a class declaration
+		// </summary>
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.STATIC |
+		        Modifiers.VOLATILE |
+		        Modifiers.UNSAFE |
+			Modifiers.READONLY;
+
+		public Field (Expression type, int mod, string name, Object expr_or_array_init,
+			      Attributes attrs, Location loc)
+			: base (type, mod, AllowedModifiers, name, expr_or_array_init, attrs, loc)
+		{
+		}
+
+		public override bool Define (TypeContainer parent)
+		{
+			Type t = parent.ResolveType (Type, false, Location);
+			
+			if (t == null)
+				return false;
+
+			if (!parent.AsAccessible (t, ModFlags)) {
+				Report.Error (52, Location,
+					      "Inconsistent accessibility: field type `" +
+					      TypeManager.CSharpName (t) + "' is less " +
+					      "accessible than field `" + Name + "'");
+				return false;
+			}
+
+			if (t.IsPointer && !UnsafeOK (parent))
+				return false;
+				
+			if (RootContext.WarningLevel > 1){
+				Type ptype = parent.TypeBuilder.BaseType;
+
+				// ptype is only null for System.Object while compiling corlib.
+				if (ptype != null){
+					TypeContainer.FindMembers (
+						ptype, MemberTypes.Method,
+						BindingFlags.Public |
+						BindingFlags.Static | BindingFlags.Instance,
+						System.Type.FilterName, Name);
+				}
+			}
+
+			if ((ModFlags & Modifiers.VOLATILE) != 0){
+				if (!t.IsClass){
+					if (TypeManager.IsEnumType (t))
+						t = TypeManager.EnumToUnderlying (t);
+
+					if (!((t == TypeManager.bool_type) ||
+					      (t == TypeManager.sbyte_type) ||
+					      (t == TypeManager.byte_type) ||
+					      (t == TypeManager.short_type) ||    
+					      (t == TypeManager.ushort_type) ||
+					      (t == TypeManager.int32_type) ||    
+					      (t == TypeManager.uint32_type) ||    
+					      (t == TypeManager.char_type) ||    
+					      (t == TypeManager.float_type))){
+						Report.Error (
+							677, Location, parent.MakeName (Name) +
+							" A volatile field can not be of type `" +
+							TypeManager.CSharpName (t) + "'");
+						return false;
+					}
+				}
+			}
+			
+			FieldBuilder = parent.TypeBuilder.DefineField (
+				Name, t, Modifiers.FieldAttr (ModFlags));
+
+			TypeManager.RegisterFieldBase (FieldBuilder, this);
+			return true;
+		}
+
+		public void Emit (TypeContainer tc)
+		{
+			EmitContext ec = new EmitContext (tc, Location, null,
+							  FieldBuilder.FieldType, ModFlags);
+
+			Attribute.ApplyAttributes (ec, FieldBuilder, this, OptAttributes, Location);
+		}
+	}
+
+	//
+	// `set' and `get' accessors are represented with an Accessor.
+	// 
+	public class Accessor {
+		//
+		// Null if the accessor is empty, or a Block if not
+		//
+		public Block Block;
+		public Attributes OptAttributes;
+		
+		public Accessor (Block b, Attributes attrs)
+		{
+			Block = b;
+			OptAttributes = attrs;
+		}
+	}
+
+	//
+	// Properties and Indexers both generate PropertyBuilders, we use this to share 
+	// their common bits.
+	//
+	abstract public class PropertyBase : MethodCore {
+		public Accessor Get, Set;
+		public PropertyBuilder PropertyBuilder;
+		public MethodBuilder GetBuilder, SetBuilder;
+		public MethodData GetData, SetData;
+
+		protected EmitContext ec;
+
+		public PropertyBase (Expression type, string name, int mod_flags, int allowed_mod,
+				     Parameters parameters, Accessor get_block, Accessor set_block,
+				     Attributes attrs, Location loc)
+			: base (type, mod_flags, allowed_mod, name, attrs, parameters, loc)
+		{
+			Get = get_block;
+			Set = set_block;
+		}
+
+		protected override bool DoDefine (TypeContainer parent)
+		{
+			if (!base.DoDefine (parent))
+				return false;
+
+			ec = new EmitContext (parent, Location, null, MemberType, ModFlags);
+
+			return true;
+		}
+
+		//
+		// Checks our base implementation if any
+		//
+		protected override bool CheckBase (TypeContainer parent)
+		{
+			// Check whether arguments were correct.
+			if (!DoDefineParameters (parent))
+				return false;
+
+			MethodSignature ms = new MethodSignature (Name, null, ParameterTypes);
+			MemberList props_this;
+
+			props_this = TypeContainer.FindMembers (
+				parent.TypeBuilder, MemberTypes.Property,
+				BindingFlags.NonPublic | BindingFlags.Public |
+				BindingFlags.Static | BindingFlags.Instance |
+				BindingFlags.DeclaredOnly,
+				MethodSignature.method_signature_filter, ms);
+
+			if (props_this.Count > 0) {
+				Report.Error (111, Location, "Class `" + parent.Name + "' " +
+					      "already defines a member called `" + Name + "' " +
+					      "with the same parameter types");
+				return false;
+			}
+
+			//
+			// Find properties with the same name on the base class
+			//
+			MemberList props;
+			MemberList props_static = TypeContainer.FindMembers (
+				parent.TypeBuilder.BaseType, MemberTypes.Property,
+				BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Static,
+				MethodSignature.inheritable_property_signature_filter, ms);
+
+			MemberList props_instance = TypeContainer.FindMembers (
+				parent.TypeBuilder.BaseType, MemberTypes.Property,
+				BindingFlags.NonPublic | BindingFlags.Public | BindingFlags.Instance,
+				MethodSignature.inheritable_property_signature_filter,
+				ms);
+
+			//
+			// Find if we have anything
+			//
+			if (props_static.Count > 0)
+				props = props_static;
+			else if (props_instance.Count > 0)
+				props = props_instance;
+			else
+				props = null;
+
+			//
+			// If we have something on the base.
+			if (props != null && props.Count > 0){
+				PropertyInfo pi = (PropertyInfo) props [0];
+
+				MethodInfo inherited_get = TypeManager.GetPropertyGetter (pi);
+				MethodInfo inherited_set = TypeManager.GetPropertySetter (pi);
+
+				MethodInfo reference = inherited_get == null ?
+					inherited_set : inherited_get;
+				
+				if (reference != null) {
+					string name = reference.DeclaringType.Name + "." + Name;
+
+					if (!CheckMethodAgainstBase (parent, flags, reference, name))
+						return false;
+				}
+
+				if (((ModFlags & Modifiers.NEW) == 0) && (pi.PropertyType != MemberType)) {
+					Report.Error (508, parent.MakeName (Name) + ": cannot " +
+						      "change return type when overriding inherited " +
+						      "member `" + pi.DeclaringType + "." + pi.Name + "'");
+					return false;
+				}
+			} else {
+				if ((ModFlags & Modifiers.NEW) != 0)
+					WarningNotHiding (parent);
+				
+				if ((ModFlags & Modifiers.OVERRIDE) != 0){
+					if (this is Indexer)
+						Report.Error (115, Location,
+							      parent.MakeName (Name) +
+							      " no suitable indexers found to override");
+					else
+						Report.Error (115, Location,
+							      parent.MakeName (Name) +
+							      " no suitable properties found to override");
+					return false;
+				}
+			}
+			return true;
+		}
+
+		public void Emit (TypeContainer tc)
+		{
+			//
+			// The PropertyBuilder can be null for explicit implementations, in that
+			// case, we do not actually emit the ".property", so there is nowhere to
+			// put the attribute
+			//
+			if (PropertyBuilder != null)
+				Attribute.ApplyAttributes (ec, PropertyBuilder, this, OptAttributes, Location);
+
+			if (GetData != null)
+				GetData.Emit (tc, Get.Block, Get);
+
+			if (SetData != null)
+				SetData.Emit (tc, Set.Block, Set);
+		}
+	}
+			
+	public class Property : PropertyBase {
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.STATIC |
+			Modifiers.SEALED |
+			Modifiers.OVERRIDE |
+			Modifiers.ABSTRACT |
+		        Modifiers.UNSAFE |
+			Modifiers.EXTERN |
+			Modifiers.VIRTUAL;
+
+		public Property (Expression type, string name, int mod_flags,
+				 Accessor get_block, Accessor set_block,
+				 Attributes attrs, Location loc)
+			: base (type, name, mod_flags, AllowedModifiers,
+				Parameters.EmptyReadOnlyParameters,
+				get_block, set_block, attrs, loc)
+		{
+		}
+
+		public override bool Define (TypeContainer parent)
+		{
+			if (!DoDefine (parent))
+				return false;
+
+			if (!CheckBase (parent))
+				return false;
+
+			flags |= MethodAttributes.HideBySig | MethodAttributes.SpecialName;
+
+			if (Get != null) {
+				Type [] parameters = TypeManager.NoTypes;
+
+				InternalParameters ip = new InternalParameters (
+					parent, Parameters.EmptyReadOnlyParameters);
+
+				GetData = new MethodData (this, "get", MemberType,
+							  parameters, ip, CallingConventions.Standard,
+							  Get.OptAttributes, ModFlags, flags, false);
+
+				if (!GetData.Define (parent))
+					return false;
+
+				GetBuilder = GetData.MethodBuilder;
+			}
+
+			if (Set != null) {
+				Type [] parameters = new Type [1];
+				parameters [0] = MemberType;
+
+				Parameter [] parms = new Parameter [1];
+				parms [0] = new Parameter (Type, "value", Parameter.Modifier.NONE, null);
+				InternalParameters ip = new InternalParameters (
+					parent, new Parameters (parms, null, Location));
+
+				SetData = new MethodData (this, "set", TypeManager.void_type,
+							  parameters, ip, CallingConventions.Standard,
+							  Set.OptAttributes, ModFlags, flags, false);
+
+				if (!SetData.Define (parent))
+					return false;
+
+				SetBuilder = SetData.MethodBuilder;
+				SetBuilder.DefineParameter (1, ParameterAttributes.None, "value"); 
+			}
+
+			// FIXME - PropertyAttributes.HasDefault ?
+			
+			PropertyAttributes prop_attr =
+			PropertyAttributes.RTSpecialName |
+			PropertyAttributes.SpecialName;
+
+			if (!IsExplicitImpl){
+				PropertyBuilder = parent.TypeBuilder.DefineProperty (
+					Name, prop_attr, MemberType, null);
+				
+				if (Get != null)
+					PropertyBuilder.SetGetMethod (GetBuilder);
+				
+				if (Set != null)
+					PropertyBuilder.SetSetMethod (SetBuilder);
+
+				//
+				// HACK for the reasons exposed above
+				//
+				if (!TypeManager.RegisterProperty (PropertyBuilder, GetBuilder, SetBuilder)) {
+					Report.Error (
+						111, Location,
+						"Class `" + parent.Name +
+						"' already contains a definition for the property `" +
+						Name + "'");
+					return false;
+				}
+			}
+			return true;
+		}
+	}
+
+	/// </summary>
+	///  Gigantic workaround  for lameness in SRE follows :
+	///  This class derives from EventInfo and attempts to basically
+	///  wrap around the EventBuilder so that FindMembers can quickly
+	///  return this in it search for members
+	/// </summary>
+	public class MyEventBuilder : EventInfo {
+		
+		//
+		// We use this to "point" to our Builder which is
+		// not really a MemberInfo
+		//
+		EventBuilder MyBuilder;
+		
+		//
+		// We "catch" and wrap these methods
+		//
+		MethodInfo raise, remove, add;
+
+		EventAttributes attributes;
+		Type declaring_type, reflected_type, event_type;
+		string name;
+
+		public MyEventBuilder (TypeBuilder type_builder, string name, EventAttributes event_attr, Type event_type)
+		{
+			MyBuilder = type_builder.DefineEvent (name, event_attr, event_type);
+
+			// And now store the values in our own fields.
+			
+			declaring_type = type_builder;
+
+			reflected_type = type_builder;
+			
+			attributes = event_attr;
+			this.name = name;
+			this.event_type = event_type;
+		}
+		
+		//
+		// Methods that you have to override.  Note that you only need 
+		// to "implement" the variants that take the argument (those are
+		// the "abstract" methods, the others (GetAddMethod()) are 
+		// regular.
+		//
+		public override MethodInfo GetAddMethod (bool nonPublic)
+		{
+			return add;
+		}
+		
+		public override MethodInfo GetRemoveMethod (bool nonPublic)
+		{
+			return remove;
+		}
+		
+		public override MethodInfo GetRaiseMethod (bool nonPublic)
+		{
+			return raise;
+		}
+		
+		//
+		// These methods make "MyEventInfo" look like a Builder
+		//
+		public void SetRaiseMethod (MethodBuilder raiseMethod)
+		{
+			raise = raiseMethod;
+			MyBuilder.SetRaiseMethod (raiseMethod);
+		}
+
+		public void SetRemoveOnMethod (MethodBuilder removeMethod)
+		{
+			remove = removeMethod;
+			MyBuilder.SetRemoveOnMethod (removeMethod);
+		}
+
+		public void SetAddOnMethod (MethodBuilder addMethod)
+		{
+			add = addMethod;
+			MyBuilder.SetAddOnMethod (addMethod);
+		}
+
+		public void SetCustomAttribute (CustomAttributeBuilder cb)
+		{
+			MyBuilder.SetCustomAttribute (cb);
+		}
+		
+		public override object [] GetCustomAttributes (bool inherit)
+		{
+			// FIXME : There's nothing which can be seemingly done here because
+			// we have no way of getting at the custom attribute objects of the
+			// EventBuilder !
+			return null;
+		}
+
+		public override object [] GetCustomAttributes (Type t, bool inherit)
+		{
+			// FIXME : Same here !
+			return null;
+		}
+
+		public override bool IsDefined (Type t, bool b)
+		{
+			return true;
+		}
+
+		public override EventAttributes Attributes {
+			get {
+				return attributes;
+			}
+		}
+
+		public override string Name {
+			get {
+				return name;
+			}
+		}
+
+		public override Type DeclaringType {
+			get {
+				return declaring_type;
+			}
+		}
+
+		public override Type ReflectedType {
+			get {
+				return reflected_type;
+			}
+		}
+
+		public Type EventType {
+			get {
+				return event_type;
+			}
+		}
+	}
+	
+	public class Event : FieldBase {
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.STATIC |
+			Modifiers.VIRTUAL |
+			Modifiers.SEALED |
+			Modifiers.OVERRIDE |
+			Modifiers.UNSAFE |
+			Modifiers.ABSTRACT;
+
+		public readonly Accessor  Add;
+		public readonly Accessor  Remove;
+		public MyEventBuilder     EventBuilder;
+
+		MethodBuilder AddBuilder, RemoveBuilder;
+		MethodData AddData, RemoveData;
+		
+		public Event (Expression type, string name, Object init, int mod, Accessor add,
+			      Accessor remove, Attributes attrs, Location loc)
+			: base (type, mod, AllowedModifiers, name, init, attrs, loc)
+		{
+			Add = add;
+			Remove = remove;
+		}
+
+		public override bool Define (TypeContainer parent)
+		{
+			EventAttributes e_attr = EventAttributes.RTSpecialName | EventAttributes.SpecialName;
+
+			if (!DoDefine (parent))
+				return false;
+
+			if (!MemberType.IsSubclassOf (TypeManager.delegate_type)) {
+				Report.Error (66, Location, "'" + parent.Name + "." + Name +
+					      "' : event must be of a delegate type");
+				return false;
+			}
+
+			Type [] parameter_types = new Type [1];
+			parameter_types [0] = MemberType;
+
+			Parameter [] parms = new Parameter [1];
+			parms [0] = new Parameter (Type, "value", Parameter.Modifier.NONE, null);
+			InternalParameters ip = new InternalParameters (
+				parent, new Parameters (parms, null, Location)); 
+
+			if (!CheckBase (parent))
+				return false;
+
+			//
+			// Now define the accessors
+			//
+			AddData = new MethodData (this, "add", TypeManager.void_type,
+						  parameter_types, ip, CallingConventions.Standard,
+						  (Add != null) ? Add.OptAttributes : null,
+						  ModFlags, flags, false);
+
+			if (!AddData.Define (parent))
+				return false;
+
+			AddBuilder = AddData.MethodBuilder;
+			AddBuilder.DefineParameter (1, ParameterAttributes.None, "value");
+
+			RemoveData = new MethodData (this, "remove", TypeManager.void_type,
+						     parameter_types, ip, CallingConventions.Standard,
+						     (Remove != null) ? Remove.OptAttributes : null,
+						     ModFlags, flags, false);
+
+			if (!RemoveData.Define (parent))
+				return false;
+
+			RemoveBuilder = RemoveData.MethodBuilder;
+			RemoveBuilder.DefineParameter (1, ParameterAttributes.None, "value");
+
+			if (!IsExplicitImpl){
+				EventBuilder = new MyEventBuilder (
+					parent.TypeBuilder, Name, e_attr, MemberType);
+					
+				if (Add == null && Remove == null) {
+					FieldBuilder = parent.TypeBuilder.DefineField (
+						Name, MemberType, FieldAttributes.FamANDAssem);
+					TypeManager.RegisterPrivateFieldOfEvent (
+						(EventInfo) EventBuilder, FieldBuilder);
+					TypeManager.RegisterFieldBase (FieldBuilder, this);
+				}
+			
+				EventBuilder.SetAddOnMethod (AddBuilder);
+				EventBuilder.SetRemoveOnMethod (RemoveBuilder);
+
+				if (!TypeManager.RegisterEvent (EventBuilder, AddBuilder, RemoveBuilder)) {
+					Report.Error (111, Location,
+						      "Class `" + parent.Name +
+						      "' already contains a definition for the event `" +
+						      Name + "'");
+					return false;
+				}
+			}
+			
+			return true;
+		}
+
+		void EmitDefaultMethod (EmitContext ec, bool is_add)
+		{
+			ILGenerator ig = ec.ig;
+			MethodInfo method = null;
+			
+			if (is_add)
+				method = TypeManager.delegate_combine_delegate_delegate;
+			else
+				method = TypeManager.delegate_remove_delegate_delegate;
+
+			if ((ModFlags & Modifiers.STATIC) != 0) {
+				ig.Emit (OpCodes.Ldsfld, (FieldInfo) FieldBuilder);
+				ig.Emit (OpCodes.Ldarg_0);
+				ig.Emit (OpCodes.Call, method);
+				ig.Emit (OpCodes.Castclass, MemberType);
+				ig.Emit (OpCodes.Stsfld, (FieldInfo) FieldBuilder);
+			} else {
+				ig.Emit (OpCodes.Ldarg_0);
+				ig.Emit (OpCodes.Ldarg_0);
+				ig.Emit (OpCodes.Ldfld, (FieldInfo) FieldBuilder);
+				ig.Emit (OpCodes.Ldarg_1);
+				ig.Emit (OpCodes.Call, method);
+				ig.Emit (OpCodes.Castclass, MemberType);
+				ig.Emit (OpCodes.Stfld, (FieldInfo) FieldBuilder);
+			}
+			ig.Emit (OpCodes.Ret);
+		}
+
+		public void Emit (TypeContainer tc)
+		{
+			EmitContext ec;
+
+			ec = new EmitContext (tc, Location, null, MemberType, ModFlags);
+			Attribute.ApplyAttributes (ec, EventBuilder, this, OptAttributes, Location);
+
+			if (Add != null)
+				AddData.Emit (tc, Add.Block, Add);
+			else {
+				ILGenerator ig = AddData.MethodBuilder.GetILGenerator ();
+				ec = new EmitContext (tc, Location, ig, TypeManager.void_type, ModFlags);
+				EmitDefaultMethod (ec, true);
+			}
+
+			if (Remove != null)
+				RemoveData.Emit (tc, Remove.Block, Remove);
+			else {
+				ILGenerator ig = RemoveData.MethodBuilder.GetILGenerator ();
+				ec = new EmitContext (tc, Location, ig, TypeManager.void_type, ModFlags);
+				EmitDefaultMethod (ec, false);
+			}
+		}
+		
+	}
+
+	//
+	// FIXME: This does not handle:
+	//
+	//   int INTERFACENAME [ args ]
+	//   Does not 
+	//
+	// Only:
+	// 
+	// int this [ args ]
+ 
+	public class Indexer : PropertyBase {
+
+		const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE |
+			Modifiers.VIRTUAL |
+			Modifiers.SEALED |
+			Modifiers.OVERRIDE |
+			Modifiers.UNSAFE |
+			Modifiers.EXTERN |
+			Modifiers.ABSTRACT;
+
+		public string IndexerName;
+		public string InterfaceIndexerName;
+
+		//
+		// Are we implementing an interface ?
+		//
+		bool IsImplementing = false;
+		
+		public Indexer (Expression type, string int_type, int flags, Parameters parameters,
+				Accessor get_block, Accessor set_block, Attributes attrs, Location loc)
+			: base (type, "", flags, AllowedModifiers, parameters, get_block, set_block,
+				attrs, loc)
+		{
+			ExplicitInterfaceName = int_type;
+		}
+
+		public override bool Define (TypeContainer parent)
+		{
+			PropertyAttributes prop_attr =
+				PropertyAttributes.RTSpecialName |
+				PropertyAttributes.SpecialName;
+			
+			if (!DoDefine (parent))
+				return false;
+
+			IndexerName = Attribute.ScanForIndexerName (ec, OptAttributes);
+			if (IndexerName == null)
+				IndexerName = "Item";
+			else if (IsExplicitImpl)
+				Report.Error (592, Location,
+					      "Attribute 'IndexerName' is not valid on this declaration " +
+					      "type. It is valid on `property' declarations only.");
+
+			ShortName = IndexerName;
+			if (IsExplicitImpl) {
+				InterfaceIndexerName = TypeManager.IndexerPropertyName (InterfaceType);
+				Name = InterfaceType.FullName + "." + IndexerName;
+			} else {
+				InterfaceIndexerName = IndexerName;
+				Name = ShortName;
+			}
+
+			if (!CheckBase (parent))
+				return false;
+
+			if (Get != null){
+                                InternalParameters ip = new InternalParameters (parent, Parameters);
+
+				GetData = new MethodData (this, "get", MemberType,
+							  ParameterTypes, ip, CallingConventions.Standard,
+							  Get.OptAttributes, ModFlags, flags, false);
+
+				if (!GetData.Define (parent))
+					return false;
+
+				GetBuilder = GetData.MethodBuilder;
+			}
+			
+			if (Set != null){
+				int top = ParameterTypes.Length;
+				Type [] set_pars = new Type [top + 1];
+				ParameterTypes.CopyTo (set_pars, 0);
+				set_pars [top] = MemberType;
+
+				Parameter [] fixed_parms = Parameters.FixedParameters;
+
+				if (fixed_parms == null){
+					throw new Exception ("We currently do not support only array arguments in an indexer");
+					// BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
+					// BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
+					//
+					// Here is the problem: the `value' parameter has
+					// to come *after* the array parameter in the declaration
+					// like this:
+					// X (object [] x, Type value)
+					// .param [0]
+					//
+					// BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
+					// BUG BUG BUG BUG BUG BUG BUG BUG BUG BUG
+					
+				}
+				
+				Parameter [] tmp = new Parameter [fixed_parms.Length + 1];
+
+
+				fixed_parms.CopyTo (tmp, 0);
+				tmp [fixed_parms.Length] = new Parameter (
+					Type, "value", Parameter.Modifier.NONE, null);
+
+				Parameters set_formal_params = new Parameters (tmp, null, Location);
+				
+				InternalParameters ip = new InternalParameters (parent, set_formal_params);
+
+				SetData = new MethodData (this, "set", TypeManager.void_type,
+							  set_pars, ip, CallingConventions.Standard,
+							  Set.OptAttributes, ModFlags, flags, false);
+
+				if (!SetData.Define (parent))
+					return false;
+
+				SetBuilder = SetData.MethodBuilder;
+			}
+
+			//
+			// Now name the parameters
+			//
+			Parameter [] p = Parameters.FixedParameters;
+			if (p != null) {
+				int i;
+				
+				for (i = 0; i < p.Length; ++i) {
+					if (Get != null)
+						GetBuilder.DefineParameter (
+							i + 1, p [i].Attributes, p [i].Name);
+
+					if (Set != null)
+						SetBuilder.DefineParameter (
+							i + 1, p [i].Attributes, p [i].Name);
+				}
+
+				if (Set != null)
+					SetBuilder.DefineParameter (
+						i + 1, ParameterAttributes.None, "value");
+					
+				if (i != ParameterTypes.Length) {
+					Parameter array_param = Parameters.ArrayParameter;
+					SetBuilder.DefineParameter (
+						i + 1, array_param.Attributes, array_param.Name);
+				}
+			}
+
+			if (GetData != null)
+				IsImplementing = GetData.IsImplementing;
+			else if (SetData != null)
+				IsImplementing = SetData.IsImplementing;
+
+			//
+			// Define the PropertyBuilder if one of the following conditions are met:
+			// a) we're not implementing an interface indexer.
+			// b) the indexer has a different IndexerName and this is no
+			//    explicit interface implementation.
+			//
+			if (!IsExplicitImpl) {
+				PropertyBuilder = parent.TypeBuilder.DefineProperty (
+					IndexerName, prop_attr, MemberType, ParameterTypes);
+
+				if (GetData != null)
+					PropertyBuilder.SetGetMethod (GetBuilder);
+
+				if (SetData != null)
+					PropertyBuilder.SetSetMethod (SetBuilder);
+				
+				TypeManager.RegisterIndexer (PropertyBuilder, GetBuilder, SetBuilder,
+							     ParameterTypes);
+			}
+
+			return true;
+		}
+	}
+
+	public class Operator : MemberCore {
+
+		const int AllowedModifiers =
+			Modifiers.PUBLIC |
+			Modifiers.UNSAFE |
+			Modifiers.EXTERN |
+			Modifiers.STATIC;
+
+		const int RequiredModifiers =
+			Modifiers.PUBLIC |
+			Modifiers.STATIC;
+
+		public enum OpType : byte {
+
+			// Unary operators
+			LogicalNot,
+			OnesComplement,
+			Increment,
+			Decrement,
+			True,
+			False,
+
+			// Unary and Binary operators
+			Addition,
+			Subtraction,
+
+			UnaryPlus,
+			UnaryNegation,
+			
+			// Binary operators
+			Multiply,
+			Division,
+			Modulus,
+			BitwiseAnd,
+			BitwiseOr,
+			ExclusiveOr,
+			LeftShift,
+			RightShift,
+			Equality,
+			Inequality,
+			GreaterThan,
+			LessThan,
+			GreaterThanOrEqual,
+			LessThanOrEqual,
+
+			// Implicit and Explicit
+			Implicit,
+			Explicit
+		};
+
+		public readonly OpType OperatorType;
+		public readonly Expression ReturnType;
+		public readonly Expression FirstArgType, SecondArgType;
+		public readonly string FirstArgName, SecondArgName;
+		public readonly Block  Block;
+		public Attributes      OptAttributes;
+		public MethodBuilder   OperatorMethodBuilder;
+		
+		public string MethodName;
+		public Method OperatorMethod;
+
+		public Operator (OpType type, Expression ret_type, int flags,
+				 Expression arg1type, string arg1name,
+				 Expression arg2type, string arg2name,
+				 Block block, Attributes attrs, Location loc)
+			: base ("", loc)
+		{
+			OperatorType = type;
+			ReturnType = ret_type;
+			ModFlags = Modifiers.Check (AllowedModifiers, flags, Modifiers.PUBLIC, loc);
+			FirstArgType = arg1type;
+			FirstArgName = arg1name;
+			SecondArgType = arg2type;
+			SecondArgName = arg2name;
+			Block = block;
+			OptAttributes = attrs;
+		}
+
+		string Prototype (TypeContainer parent)
+		{
+			return parent.Name + ".operator " + OperatorType + " (" + FirstArgType + "," +
+				SecondArgType + ")";
+		}
+		
+		public override bool Define (TypeContainer parent)
+		{
+			int length = 1;
+			MethodName = "op_" + OperatorType;
+			
+			if (SecondArgType != null)
+				length = 2;
+			
+			Parameter [] param_list = new Parameter [length];
+
+			if ((ModFlags & RequiredModifiers) != RequiredModifiers){
+				Report.Error (
+					558, Location, 
+					"User defined operators `" +
+					Prototype (parent) +
+					"' must be declared static and public");
+				return false;
+			}
+
+			param_list[0] = new Parameter (FirstArgType, FirstArgName,
+						       Parameter.Modifier.NONE, null);
+			if (SecondArgType != null)
+				param_list[1] = new Parameter (SecondArgType, SecondArgName,
+							       Parameter.Modifier.NONE, null);
+			
+			OperatorMethod = new Method (ReturnType, ModFlags, MethodName,
+						     new Parameters (param_list, null, Location),
+						     OptAttributes, Mono.CSharp.Location.Null);
+
+			OperatorMethod.IsOperator = true;			
+			OperatorMethod.Define (parent);
+
+			if (OperatorMethod.MethodBuilder == null)
+				return false;
+			
+			OperatorMethodBuilder = OperatorMethod.MethodBuilder;
+
+			Type [] param_types = OperatorMethod.ParameterTypes;
+			Type declaring_type = OperatorMethodBuilder.DeclaringType;
+			Type return_type = OperatorMethod.GetReturnType (parent);
+			Type first_arg_type = param_types [0];
+
+			// Rules for conversion operators
+			
+			if (OperatorType == OpType.Implicit || OperatorType == OpType.Explicit) {
+				if (first_arg_type == return_type && first_arg_type == declaring_type){
+					Report.Error (
+						555, Location,
+						"User-defined conversion cannot take an object of the " +
+						"enclosing type and convert to an object of the enclosing" +
+						" type");
+					return false;
+				}
+				
+				if (first_arg_type != declaring_type && return_type != declaring_type){
+					Report.Error (
+						556, Location, 
+						"User-defined conversion must convert to or from the " +
+						"enclosing type");
+					return false;
+				}
+				
+				if (first_arg_type == TypeManager.object_type ||
+				    return_type == TypeManager.object_type){
+					Report.Error (
+						-8, Location,
+						"User-defined conversion cannot convert to or from " +
+						"object type");
+					return false;
+				}
+
+				if (first_arg_type.IsInterface || return_type.IsInterface){
+					Report.Error (
+						552, Location,
+						"User-defined conversion cannot convert to or from an " +
+						"interface type");
+					return false;
+				}
+				
+				if (first_arg_type.IsSubclassOf (return_type) ||
+				    return_type.IsSubclassOf (first_arg_type)){
+					Report.Error (
+						-10, Location,
+						"User-defined conversion cannot convert between types " +
+						"that derive from each other");
+					return false;
+				}
+			} else if (SecondArgType == null) {
+				// Checks for Unary operators
+				
+				if (first_arg_type != declaring_type){
+					Report.Error (
+						562, Location,
+						"The parameter of a unary operator must be the " +
+						"containing type");
+					return false;
+				}
+				
+				if (OperatorType == OpType.Increment || OperatorType == OpType.Decrement) {
+					if (return_type != declaring_type){
+						Report.Error (
+							559, Location,
+							"The parameter and return type for ++ and -- " +
+							"must be the containing type");
+						return false;
+					}
+					
+				}
+				
+				if (OperatorType == OpType.True || OperatorType == OpType.False) {
+					if (return_type != TypeManager.bool_type){
+						Report.Error (
+							215, Location,
+							"The return type of operator True or False " +
+							"must be bool");
+						return false;
+					}
+				}
+				
+			} else {
+				// Checks for Binary operators
+				
+				if (first_arg_type != declaring_type &&
+				    param_types [1] != declaring_type){
+					Report.Error (
+						563, Location,
+						"One of the parameters of a binary operator must " +
+						"be the containing type");
+					return false;
+				}
+			}
+
+			return true;
+		}
+		
+		public void Emit (TypeContainer parent)
+		{
+			EmitContext ec = new EmitContext (parent, Location, null, null, ModFlags);
+			Attribute.ApplyAttributes (ec, OperatorMethodBuilder, this, OptAttributes, Location);
+
+			//
+			// abstract or extern methods have no bodies
+			//
+			if ((ModFlags & (Modifiers.ABSTRACT | Modifiers.EXTERN)) != 0)
+				return;
+			
+			OperatorMethod.Block = Block;
+			OperatorMethod.Emit (parent);
+		}
+	}
+
+	//
+	// This is used to compare method signatures
+	//
+	struct MethodSignature {
+		public string Name;
+		public Type RetType;
+		public Type [] Parameters;
+		
+		/// <summary>
+		///    This delegate is used to extract methods which have the
+		///    same signature as the argument
+		/// </summary>
+		public static MemberFilter method_signature_filter;
+
+		/// <summary>
+		///   This delegate is used to extract inheritable methods which
+		///   have the same signature as the argument.  By inheritable,
+		///   this means that we have permissions to override the method
+		///   from the current assembly and class
+		/// </summary>
+		public static MemberFilter inheritable_method_signature_filter;
+
+		/// <summary>
+		///   This delegate is used to extract inheritable methods which
+		///   have the same signature as the argument.  By inheritable,
+		///   this means that we have permissions to override the method
+		///   from the current assembly and class
+		/// </summary>
+		public static MemberFilter inheritable_property_signature_filter;
+		
+		static MethodSignature ()
+		{
+			method_signature_filter = new MemberFilter (MemberSignatureCompare);
+			inheritable_method_signature_filter = new MemberFilter (
+				InheritableMemberSignatureCompare);
+			inheritable_property_signature_filter = new MemberFilter (
+				InheritablePropertySignatureCompare);
+		}
+		
+		public MethodSignature (string name, Type ret_type, Type [] parameters)
+		{
+			Name = name;
+			RetType = ret_type;
+
+			if (parameters == null)
+				Parameters = TypeManager.NoTypes;
+			else
+				Parameters = parameters;
+		}
+		
+		public override int GetHashCode ()
+		{
+			return Name.GetHashCode ();
+		}
+
+		public override bool Equals (Object o)
+		{
+			MethodSignature other = (MethodSignature) o;
+
+			if (other.Name != Name)
+				return false;
+
+			if (other.RetType != RetType)
+				return false;
+			
+			if (Parameters == null){
+				if (other.Parameters == null)
+					return true;
+				return false;
+			}
+
+			if (other.Parameters == null)
+				return false;
+			
+			int c = Parameters.Length;
+			if (other.Parameters.Length != c)
+				return false;
+
+			for (int i = 0; i < c; i++)
+				if (other.Parameters [i] != Parameters [i])
+					return false;
+
+			return true;
+		}
+
+		static bool MemberSignatureCompare (MemberInfo m, object filter_criteria)
+		{
+			MethodSignature sig = (MethodSignature) filter_criteria;
+
+			if (m.Name != sig.Name)
+				return false;
+
+			Type ReturnType;
+			MethodInfo mi = m as MethodInfo;
+			PropertyInfo pi = m as PropertyInfo;
+
+			if (mi != null)
+				ReturnType = mi.ReturnType;
+			else if (pi != null)
+				ReturnType = pi.PropertyType;
+			else
+				return false;
+			
+			//
+			// we use sig.RetType == null to mean `do not check the
+			// method return value.  
+			//
+			if (sig.RetType != null)
+				if (ReturnType != sig.RetType)
+					return false;
+
+			Type [] args;
+			if (mi != null)
+				args = TypeManager.GetArgumentTypes (mi);
+			else
+				args = TypeManager.GetArgumentTypes (pi);
+			Type [] sigp = sig.Parameters;
+
+			if (args.Length != sigp.Length)
+				return false;
+
+			for (int i = args.Length; i > 0; ){
+				i--;
+				if (args [i] != sigp [i])
+					return false;
+			}
+			return true;
+		}
+
+		//
+		// This filter should be used when we are requesting methods that
+		// we want to override.
+		//
+		// This makes a number of assumptions, for example
+		// that the methods being extracted are of a parent
+		// class (this means we know implicitly that we are
+		// being called to find out about members by a derived
+		// class).
+		// 
+		static bool InheritableMemberSignatureCompare (MemberInfo m, object filter_criteria)
+		{
+		        if (MemberSignatureCompare (m, filter_criteria)){
+				MethodInfo mi = (MethodInfo) m;
+				MethodAttributes prot = mi.Attributes & MethodAttributes.MemberAccessMask;
+
+				// If only accessible to the current class.
+				if (prot == MethodAttributes.Private)
+					return false;
+
+				// If only accessible to the defining assembly or 
+				if (prot == MethodAttributes.FamANDAssem ||
+				    prot == MethodAttributes.Assembly){
+					if (m.DeclaringType.Assembly == CodeGen.AssemblyBuilder)
+						return true;
+					else
+						return false;
+				}
+
+				// Anything else (FamOrAssembly and Public) is fine
+				return true;
+			}
+			return false;
+		}
+
+		//
+		// This filter should be used when we are requesting properties that
+		// we want to override.
+		//
+		// This makes a number of assumptions, for example
+		// that the methods being extracted are of a parent
+		// class (this means we know implicitly that we are
+		// being called to find out about members by a derived
+		// class).
+		// 
+		static bool InheritablePropertySignatureCompare (MemberInfo m, object filter_criteria)
+		{
+		        if (MemberSignatureCompare (m, filter_criteria)){
+				PropertyInfo pi = (PropertyInfo) m;
+
+				MethodInfo inherited_get = TypeManager.GetPropertyGetter (pi);
+				MethodInfo inherited_set = TypeManager.GetPropertySetter (pi);
+
+				MethodInfo mi = inherited_get == null ? inherited_set : inherited_get;
+
+				MethodAttributes prot = mi.Attributes & MethodAttributes.MemberAccessMask;
+
+				// If only accessible to the current class.
+				if (prot == MethodAttributes.Private)
+					return false;
+
+				// If only accessible to the defining assembly or 
+				if (prot == MethodAttributes.FamANDAssem ||
+				    prot == MethodAttributes.Assembly){
+					if (m.DeclaringType.Assembly == CodeGen.AssemblyBuilder)
+						return true;
+					else
+						return false;
+				}
+
+				// Anything else (FamOrAssembly and Public) is fine
+				return true;
+			}
+			return false;
+		}
+	}
+}
diff --git a/mcs/mcs/codegen.cs b/mcs/mcs/codegen.cs
new file mode 100755
index 00000000000..8c18dc29b57
--- /dev/null
+++ b/mcs/mcs/codegen.cs
@@ -0,0 +1,658 @@
+//
+// codegen.cs: The code generator
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Diagnostics.SymbolStore;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///    Code generator class.
+	/// </summary>
+	public class CodeGen {
+		static AppDomain current_domain;
+		public static AssemblyBuilder AssemblyBuilder;
+		public static ModuleBuilder   ModuleBuilder;
+
+		static public ISymbolWriter SymbolWriter;
+
+		public static string Basename (string name)
+		{
+			int pos = name.LastIndexOf ("/");
+
+			if (pos != -1)
+				return name.Substring (pos + 1);
+
+			pos = name.LastIndexOf ("\\");
+			if (pos != -1)
+				return name.Substring (pos + 1);
+
+			return name;
+		}
+
+		public static string Dirname (string name)
+		{
+			int pos = name.LastIndexOf ("/");
+
+			if (pos != -1)
+				return name.Substring (0, pos);
+
+			pos = name.LastIndexOf ("\\");
+			if (pos != -1)
+				return name.Substring (0, pos);
+
+			return ".";
+		}
+
+		static string TrimExt (string name)
+		{
+			int pos = name.LastIndexOf (".");
+
+			return name.Substring (0, pos);
+		}
+
+		static public string FileName;
+
+		//
+		// This routine initializes the Mono runtime SymbolWriter.
+		//
+		static bool InitMonoSymbolWriter (string basename, string output_file,
+						  string[] debug_args)
+		{
+			string symbol_output = basename + "-debug.s";
+
+			Type itype = SymbolWriter.GetType ();
+			if (itype == null)
+				return false;
+
+			Type[] arg_types = new Type [3];
+			arg_types [0] = typeof (string);
+			arg_types [1] = typeof (string);
+			arg_types [2] = typeof (string[]);
+
+			MethodInfo initialize = itype.GetMethod ("Initialize", arg_types);
+			if (initialize == null)
+				return false;
+
+			object[] args = new object [3];
+			args [0] = output_file;
+			args [1] = symbol_output;
+			args [2] = debug_args;
+
+			initialize.Invoke (SymbolWriter, args);
+			return true;
+		}
+
+		//
+		// Initializes the symbol writer
+		//
+		static void InitializeSymbolWriter (string basename, string output_file,
+						    string[] args)
+		{
+			SymbolWriter = ModuleBuilder.GetSymWriter ();
+
+			//
+			// If we got an ISymbolWriter instance, initialize it.
+			//
+			if (SymbolWriter == null) {
+				Report.Error (
+					-18, "Cannot find any symbol writer");
+				return;
+			}
+			
+			//
+			// Due to lacking documentation about the first argument of the
+			// Initialize method, we cannot use Microsoft's default symbol
+			// writer yet.
+			//
+			// If we're using the mono symbol writer, the SymbolWriter object
+			// is of type MonoSymbolWriter - but that's defined in a dynamically
+			// loaded DLL - that's why we're doing a comparision based on the type
+			// name here instead of using `SymbolWriter is MonoSymbolWriter'.
+			//
+			Type sym_type = ((object) SymbolWriter).GetType ();
+			
+			switch (sym_type.Name){
+			case "MonoSymbolWriter":
+				if (!InitMonoSymbolWriter (basename, output_file, args))
+					Report.Error (
+						-18, "Cannot initialize the symbol writer");
+				break;
+
+			default:
+				Report.Error (
+					-18, "Cannot generate debugging information on this platform");
+				break;
+			}
+		}
+
+		//
+		// Initializes the code generator variables
+		//
+		static public void Init (string name, string output, bool want_debugging_support,
+					 string[] debug_args)
+		{
+			AssemblyName an;
+
+			FileName = output;
+			an = new AssemblyName ();
+			an.Name = TrimExt (Basename (name));
+			current_domain = AppDomain.CurrentDomain;
+			AssemblyBuilder = current_domain.DefineDynamicAssembly (
+				an, AssemblyBuilderAccess.RunAndSave, Dirname (name));
+
+			//
+			// Pass a path-less name to DefineDynamicModule.  Wonder how
+			// this copes with output in different directories then.
+			// FIXME: figure out how this copes with --output /tmp/blah
+			//
+			// If the third argument is true, the ModuleBuilder will dynamically
+			// load the default symbol writer.
+			//
+			ModuleBuilder = AssemblyBuilder.DefineDynamicModule (
+				Basename (name), Basename (output), want_debugging_support);
+
+			if (want_debugging_support) {
+				int pos = output.LastIndexOf (".");
+
+				string basename;
+				if (pos > 0)
+					basename = output.Substring (0, pos);
+				else
+					basename = output;
+
+				InitializeSymbolWriter (basename, output, debug_args);
+			}
+		}
+
+		static public void Save (string name)
+		{
+			try {
+				AssemblyBuilder.Save (Basename (name));
+			} catch (System.IO.IOException io){
+				Report.Error (16, "Coult not write to file `"+name+"', cause: " + io.Message);
+			}
+		}
+
+		static public void SaveSymbols ()
+		{
+			if (SymbolWriter != null) {
+				// If we have a symbol writer, call its Close() method to write
+				// the symbol file to disk.
+				//
+				// When using Mono's default symbol writer, the Close() method must
+				// be called after the assembly has already been written to disk since
+				// it opens the assembly and reads its metadata.
+				SymbolWriter.Close ();
+			}
+		}
+	}
+
+	/// <summary>
+	///   An Emit Context is created for each body of code (from methods,
+	///   properties bodies, indexer bodies or constructor bodies)
+	/// </summary>
+	public class EmitContext {
+		public DeclSpace DeclSpace;
+		public TypeContainer TypeContainer;
+		public ILGenerator   ig;
+
+		/// <summary>
+		///   This variable tracks the `checked' state of the compilation,
+		///   it controls whether we should generate code that does overflow
+		///   checking, or if we generate code that ignores overflows.
+		///
+		///   The default setting comes from the command line option to generate
+		///   checked or unchecked code plus any source code changes using the
+		///   checked/unchecked statements or expressions.   Contrast this with
+		///   the ConstantCheckState flag.
+		/// </summary>
+		
+		public bool CheckState;
+
+		/// <summary>
+		///   The constant check state is always set to `true' and cant be changed
+		///   from the command line.  The source code can change this setting with
+		///   the `checked' and `unchecked' statements and expressions. 
+		/// </summary>
+		public bool ConstantCheckState;
+
+		/// <summary>
+		///   Whether we are emitting code inside a static or instance method
+		/// </summary>
+		public bool IsStatic;
+
+		/// <summary>
+		///   Whether we are emitting a field initializer
+		/// </summary>
+		public bool IsFieldInitializer;
+
+		/// <summary>
+		///   The value that is allowed to be returned or NULL if there is no
+		///   return type.
+		/// </summary>
+		public Type ReturnType;
+
+		/// <summary>
+		///   Points to the Type (extracted from the TypeContainer) that
+		///   declares this body of code
+		/// </summary>
+		public Type ContainerType;
+		
+		/// <summary>
+		///   Whether this is generating code for a constructor
+		/// </summary>
+		public bool IsConstructor;
+
+		/// <summary>
+		///   Whether we're control flow analysis enabled
+		/// </summary>
+		public bool DoFlowAnalysis;
+		
+		/// <summary>
+		///   Keeps track of the Type to LocalBuilder temporary storage created
+		///   to store structures (used to compute the address of the structure
+		///   value on structure method invocations)
+		/// </summary>
+		public Hashtable temporary_storage;
+
+		public Block CurrentBlock;
+
+		/// <summary>
+		///   The location where we store the return value.
+		/// </summary>
+		LocalBuilder return_value;
+
+		/// <summary>
+		///   The location where return has to jump to return the
+		///   value
+		/// </summary>
+		public Label ReturnLabel;
+
+		/// <summary>
+		///   If we already defined the ReturnLabel
+		/// </summary>
+		public bool HasReturnLabel;
+
+		/// <summary>
+		///   Whether we are in a Finally block
+		/// </summary>
+		public bool InFinally;
+
+		/// <summary>
+		///   Whether we are in a Try block
+		/// </summary>
+		public bool InTry;
+
+		/// <summary>
+		///   Whether we are in a Catch block
+		/// </summary>
+		public bool InCatch;
+
+		/// <summary>
+		///  Whether we are inside an unsafe block
+		/// </summary>
+		public bool InUnsafe;
+
+		/// <summary>
+		///   Whether we break from a loop or not
+		/// </summary>
+		public bool Breaks;
+		
+		/// <summary>
+		///   Location for this EmitContext
+		/// </summary>
+		public Location loc;
+
+		/// <summary>
+		///   Used to flag that it is ok to define types recursively, as the
+		///   expressions are being evaluated as part of the type lookup
+		///   during the type resolution process
+		/// </summary>
+		public bool ResolvingTypeTree;
+		
+		/// <summary>
+		///   Inside an enum definition, we do not resolve enumeration values
+		///   to their enumerations, but rather to the underlying type/value
+		///   This is so EnumVal + EnumValB can be evaluated.
+		///
+		///   There is no "E operator + (E x, E y)", so during an enum evaluation
+		///   we relax the rules
+		/// </summary>
+		public bool InEnumContext;
+
+		protected Stack FlowStack;
+		
+		public EmitContext (TypeContainer parent, DeclSpace ds, Location l, ILGenerator ig,
+				    Type return_type, int code_flags, bool is_constructor)
+		{
+			this.ig = ig;
+
+			TypeContainer = parent;
+			DeclSpace = ds;
+			CheckState = RootContext.Checked;
+			ConstantCheckState = true;
+			
+			IsStatic = (code_flags & Modifiers.STATIC) != 0;
+			ReturnType = return_type;
+			IsConstructor = is_constructor;
+			CurrentBlock = null;
+			
+			if (parent != null){
+				// Can only be null for the ResolveType contexts.
+				ContainerType = parent.TypeBuilder;
+				if (parent.UnsafeContext)
+					InUnsafe = true;
+				else
+					InUnsafe = (code_flags & Modifiers.UNSAFE) != 0;
+			}
+			loc = l;
+
+			FlowStack = new Stack ();
+			
+			if (ReturnType == TypeManager.void_type)
+				ReturnType = null;
+		}
+
+		public EmitContext (TypeContainer tc, Location l, ILGenerator ig,
+				    Type return_type, int code_flags, bool is_constructor)
+			: this (tc, tc, l, ig, return_type, code_flags, is_constructor)
+		{
+		}
+
+		public EmitContext (TypeContainer tc, Location l, ILGenerator ig,
+				    Type return_type, int code_flags)
+			: this (tc, tc, l, ig, return_type, code_flags, false)
+		{
+		}
+
+		public FlowBranching CurrentBranching {
+			get {
+				return (FlowBranching) FlowStack.Peek ();
+			}
+		}
+
+		// <summary>
+		//   Starts a new code branching.  This inherits the state of all local
+		//   variables and parameters from the current branching.
+		// </summary>
+		public FlowBranching StartFlowBranching (FlowBranchingType type, Location loc)
+		{
+			FlowBranching cfb = new FlowBranching (CurrentBranching, type, null, loc);
+
+			FlowStack.Push (cfb);
+
+			return cfb;
+		}
+
+		// <summary>
+		//   Starts a new code branching for block `block'.
+		// </summary>
+		public FlowBranching StartFlowBranching (Block block)
+		{
+			FlowBranching cfb;
+			FlowBranchingType type;
+
+			if (CurrentBranching.Type == FlowBranchingType.SWITCH)
+				type = FlowBranchingType.SWITCH_SECTION;
+			else
+				type = FlowBranchingType.BLOCK;
+
+			cfb = new FlowBranching (CurrentBranching, type, block, block.StartLocation);
+
+			FlowStack.Push (cfb);
+
+			return cfb;
+		}
+
+		// <summary>
+		//   Ends a code branching.  Merges the state of locals and parameters
+		//   from all the children of the ending branching.
+		// </summary>
+		public FlowReturns EndFlowBranching ()
+		{
+			FlowBranching cfb = (FlowBranching) FlowStack.Pop ();
+
+			return CurrentBranching.MergeChild (cfb);
+		}
+
+		// <summary>
+		//   Kills the current code branching.  This throws away any changed state
+		//   information and should only be used in case of an error.
+		// </summary>
+		public void KillFlowBranching ()
+		{
+			FlowBranching cfb = (FlowBranching) FlowStack.Pop ();
+		}
+
+		// <summary>
+		//   Checks whether the local variable `vi' is already initialized
+		//   at the current point of the method's control flow.
+		//   If this method returns false, the caller must report an
+		//   error 165.
+		// </summary>
+		public bool IsVariableAssigned (VariableInfo vi)
+		{
+			if (DoFlowAnalysis)
+				return CurrentBranching.IsVariableAssigned (vi);
+			else
+				return true;
+		}
+
+		// <summary>
+		//   Marks the local variable `vi' as being initialized at the current
+		//   current point of the method's control flow.
+		// </summary>
+		public void SetVariableAssigned (VariableInfo vi)
+		{
+			if (DoFlowAnalysis)
+				CurrentBranching.SetVariableAssigned (vi);
+		}
+
+		// <summary>
+		//   Checks whether the parameter `number' is already initialized
+		//   at the current point of the method's control flow.
+		//   If this method returns false, the caller must report an
+		//   error 165.  This is only necessary for `out' parameters and the
+		//   call will always succeed for non-`out' parameters.
+		// </summary>
+		public bool IsParameterAssigned (int number)
+		{
+			if (DoFlowAnalysis)
+				return CurrentBranching.IsParameterAssigned (number);
+			else
+				return true;
+		}
+
+		// <summary>
+		//   Marks the parameter `number' as being initialized at the current
+		//   current point of the method's control flow.  This is only necessary
+		//   for `out' parameters.
+		// </summary>
+		public void SetParameterAssigned (int number)
+		{
+			if (DoFlowAnalysis)
+				CurrentBranching.SetParameterAssigned (number);
+		}
+
+		public void EmitTopBlock (Block block, InternalParameters ip, Location loc)
+		{
+			bool has_ret = false;
+
+//			Console.WriteLine ("Emitting: " + loc);
+
+			if (CodeGen.SymbolWriter != null)
+				Mark (loc);
+
+			if (block != null){
+				int errors = Report.Errors;
+
+				block.EmitMeta (this, block);
+
+				if (Report.Errors == errors){
+					bool old_do_flow_analysis = DoFlowAnalysis;
+					DoFlowAnalysis = true;
+
+					FlowBranching cfb = new FlowBranching (block, ip, loc);
+					FlowStack.Push (cfb);
+
+					if (!block.Resolve (this)) {
+						FlowStack.Pop ();
+						DoFlowAnalysis = old_do_flow_analysis;
+						return;
+					}
+
+					cfb = (FlowBranching) FlowStack.Pop ();
+					cfb.MergeTopBlock ();
+
+					DoFlowAnalysis = old_do_flow_analysis;
+
+					has_ret = block.Emit (this);
+
+					if (Report.Errors == errors){
+						if (RootContext.WarningLevel >= 3)
+							block.UsageWarning ();
+					}
+				}
+			}
+
+			if (ReturnType != null && !has_ret){
+				//
+				// FIXME: we need full flow analysis to implement this
+				// correctly and emit an error instead of a warning.
+				//
+				//
+				Report.Error (161, loc, "Not all code paths return a value");
+				return;
+			}
+
+			if (HasReturnLabel)
+				ig.MarkLabel (ReturnLabel);
+			if (return_value != null){
+				ig.Emit (OpCodes.Ldloc, return_value);
+				ig.Emit (OpCodes.Ret);
+			} else {
+				if (!InTry){
+					if (!has_ret || HasReturnLabel)
+						ig.Emit (OpCodes.Ret);
+				}
+			}
+		}
+
+		/// <summary>
+		///   This is called immediately before emitting an IL opcode to tell the symbol
+		///   writer to which source line this opcode belongs.
+		/// </summary>
+		public void Mark (Location loc)
+		{
+			if (!Location.IsNull (loc)) {
+				ISymbolDocumentWriter doc = loc.SymbolDocument;
+
+				if (doc != null)
+					ig.MarkSequencePoint (doc, loc.Row, 0,  loc.Row, 0);
+			}		}
+
+
+		/// <summary>
+		///   Returns a temporary storage for a variable of type t as 
+		///   a local variable in the current body.
+		/// </summary>
+		public LocalBuilder GetTemporaryStorage (Type t)
+		{
+			LocalBuilder location;
+			
+			if (temporary_storage != null){
+				location = (LocalBuilder) temporary_storage [t];
+				if (location != null)
+					return location;
+			}
+			
+			location = ig.DeclareLocal (t);
+			
+			return location;
+		}
+
+		public void FreeTemporaryStorage (LocalBuilder b)
+		{
+			// Empty for now.
+		}
+
+		/// <summary>
+		///   Current loop begin and end labels.
+		/// </summary>
+		public Label LoopBegin, LoopEnd;
+
+		/// <summary>
+		///   Whether we are inside a loop and break/continue are possible.
+		/// </summary>
+		public bool  InLoop;
+
+		/// <summary>
+		///   This is incremented each time we enter a try/catch block and
+		///   decremented if we leave it.
+		/// </summary>
+		public int   TryCatchLevel;
+
+		/// <summary>
+		///   The TryCatchLevel at the begin of the current loop.
+		/// </summary>
+		public int   LoopBeginTryCatchLevel;
+
+		/// <summary>
+		///   Default target in a switch statement.   Only valid if
+		///   InSwitch is true
+		/// </summary>
+		public Label DefaultTarget;
+
+		/// <summary>
+		///   If this is non-null, points to the current switch statement
+		/// </summary>
+		public Switch Switch;
+
+		/// <summary>
+		///   ReturnValue creates on demand the LocalBuilder for the
+		///   return value from the function.  By default this is not
+		///   used.  This is only required when returns are found inside
+		///   Try or Catch statements.
+		/// </summary>
+		public LocalBuilder TemporaryReturn ()
+		{
+			if (return_value == null){
+				return_value = ig.DeclareLocal (ReturnType);
+				ReturnLabel = ig.DefineLabel ();
+				HasReturnLabel = true;
+			}
+
+			return return_value;
+		}
+
+		/// <summary>
+	        ///   A dynamic This that is shared by all variables in a emitcontext.
+		///   Created on demand.
+		/// </summary>
+		public Expression my_this;
+		public Expression This {
+			get {
+				if (my_this == null) {
+					if (CurrentBlock != null)
+						my_this = new This (CurrentBlock, loc);
+					else
+						my_this = new This (loc);
+
+					my_this = my_this.Resolve (this);
+				}
+
+				return my_this;
+			}
+		}
+	}
+}
diff --git a/mcs/mcs/compiler.csproj b/mcs/mcs/compiler.csproj
new file mode 100755
index 00000000000..2d7b4b800b1
--- /dev/null
+++ b/mcs/mcs/compiler.csproj
@@ -0,0 +1,243 @@
+<VisualStudioProject>
+    <CSHARP
+        ProjectType = "Local"
+        ProductVersion = "7.0.9466"
+        SchemaVersion = "1.0"
+        ProjectGuid = "{896D1461-B76B-41C0-ABE6-ACA2BB4F7B5A}"
+    >
+        <Build>
+            <Settings
+                ApplicationIcon = ""
+                AssemblyKeyContainerName = ""
+                AssemblyName = "compiler"
+                AssemblyOriginatorKeyFile = ""
+                DefaultClientScript = "JScript"
+                DefaultHTMLPageLayout = "Grid"
+                DefaultTargetSchema = "IE50"
+                DelaySign = "false"
+                OutputType = "Exe"
+                RootNamespace = "CIR"
+                StartupObject = ""
+            >
+                <Config
+                    Name = "Debug"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "DEBUG;TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "true"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "true"
+                    Optimize = "false"
+                    OutputPath = "bin\Debug\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+                <Config
+                    Name = "Release"
+                    AllowUnsafeBlocks = "false"
+                    BaseAddress = "285212672"
+                    CheckForOverflowUnderflow = "false"
+                    ConfigurationOverrideFile = ""
+                    DefineConstants = "TRACE"
+                    DocumentationFile = ""
+                    DebugSymbols = "false"
+                    FileAlignment = "4096"
+                    IncrementalBuild = "true"
+                    Optimize = "true"
+                    OutputPath = "bin\Release\"
+                    RegisterForComInterop = "false"
+                    RemoveIntegerChecks = "false"
+                    TreatWarningsAsErrors = "false"
+                    WarningLevel = "4"
+                />
+            </Settings>
+            <References>
+                <Reference
+                    Name = "System"
+                    AssemblyName = "System"
+                />
+                <Reference
+                    Name = "System.Data"
+                    AssemblyName = "System.Data"
+                />
+                <Reference
+                    Name = "System.XML"
+                    AssemblyName = "System.Xml"
+                />
+                <Reference
+                    Name = "System.Web.Services"
+                    AssemblyName = "System.Web.Services"
+                />
+            </References>
+        </Build>
+        <Files>
+            <Include>
+                <File
+                    RelPath = "assign.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "attribute.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "cfold.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "class.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "codegen.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "const.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "constant.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "cs-parser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "cs-parser.jay"
+                    SubType = "Code"
+                    BuildAction = "None"
+                />
+                <File
+                    RelPath = "cs-tokenizer.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "decl.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "delegate.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "driver.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "ecore.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "enum.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "expression.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "genericparser.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "interface.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "literal.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "location.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "modifiers.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "namespace.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "parameter.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "parameterCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "report.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "rootcontext.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "statement.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "statementCollection.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "support.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "tree.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <File
+                    RelPath = "typemanager.cs"
+                    SubType = "Code"
+                    BuildAction = "Compile"
+                />
+                <Folder
+                    RelPath = "Web References\"
+                    WebReferences = "TRUE"
+                />
+            </Include>
+        </Files>
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/mcs/mcs/compiler.csproj.user b/mcs/mcs/compiler.csproj.user
new file mode 100755
index 00000000000..5e4ef0f27d8
--- /dev/null
+++ b/mcs/mcs/compiler.csproj.user
@@ -0,0 +1,48 @@
+<VisualStudioProject>
+    <CSHARP>
+        <Build>
+            <Settings ReferencePath = "" >
+                <Config
+                    Name = "Debug"
+                    EnableASPDebugging = "false"
+                    EnableASPXDebugging = "false"
+                    EnableUnmanagedDebugging = "false"
+                    EnableSQLServerDebugging = "false"
+                    RemoteDebugEnabled = "false"
+                    RemoteDebugMachine = ""
+                    StartAction = "Project"
+                    StartArguments = "b.cs"
+                    StartPage = ""
+                    StartProgram = ""
+                    StartURL = ""
+                    StartWorkingDirectory = "\mono\mcs\mcs"
+                    StartWithIE = "false"
+                />
+                <Config
+                    Name = "Release"
+                    EnableASPDebugging = "false"
+                    EnableASPXDebugging = "false"
+                    EnableUnmanagedDebugging = "false"
+                    EnableSQLServerDebugging = "false"
+                    RemoteDebugEnabled = "false"
+                    RemoteDebugMachine = ""
+                    StartAction = "Project"
+                    StartArguments = ""
+                    StartPage = ""
+                    StartProgram = ""
+                    StartURL = ""
+                    StartWorkingDirectory = ""
+                    StartWithIE = "false"
+                />
+            </Settings>
+        </Build>
+        <OtherProjectSettings
+            CopyProjectDestinationFolder = ""
+            CopyProjectUncPath = ""
+            CopyProjectOption = "0"
+            ProjectView = "ProjectFiles"
+            ProjectTrust = "0"
+        />
+    </CSHARP>
+</VisualStudioProject>
+
diff --git a/mcs/mcs/compiler.doc b/mcs/mcs/compiler.doc
new file mode 100644
index 00000000000..fafb61ed531
--- /dev/null
+++ b/mcs/mcs/compiler.doc
@@ -0,0 +1,114 @@
+Compiler operation
+
+The compiler has a number of phases:
+
+* Parsing.
+
+	Initially the compiler parses all the source files and keeps a
+	parsed representation in memory.  Very syntax error checking
+	is performed at this point.
+
+	The compiler stores the information in classes whose names
+	represent the language construct, for example, the "if"
+	construct is stored in an `If' class.  A class is stored in a
+	`Class'.
+
+* The TypeManager
+
+	The TypeManager loads all the assemblies that were referenced
+	by the programmer.  The CLR type system is used as our
+	repository for types defined as well.
+
+	So the same interface that is used to query the types,
+	properties and flags about system types is the same interface
+	that we use for our types.
+
+	As we work our way through the code generation and semantic
+	analysis, new types are entered into the Type system through
+	the use of System.Reflection.Emit.  The TypeManager will
+	lookup types on both the user defined types and on the system
+	defined ones.
+
+	So special care has to be used.  The order in which we
+	proceeed from here is important. 
+
+* Base class resolution and type definition.
+
+	Once the parsing has happened, the compiler resolves the
+	inheritance tree for interfaces.   This is done recursively
+	and we catch recursive interface definitions here.
+
+	After this is done, we continue on with classes.  Classes have
+	can have an optional "parent" inherit from or the implicit
+	System.Object class (for normal builds, builds with /nostdlib
+	will allow you to compile class System.Object with no parent).
+
+	At this point we do some error checking and verify that the
+	inherits/implements section of a class is correct (since we
+	have previously built the interface inheritance).
+
+	By the time we are done, all classes, structs and interfaces
+	have been created using System.Reflection.Emit and registered
+	with the Type Manager.
+
+	This allows us to define fields and resolve argument names for
+	methods, properties, indexers and events. 
+
+* Field generation
+
+	Fields are generated next, we go through all the type
+	containers (classes and structs) and enter the fields into
+	their types.
+
+* Method, Properties, Indexers and events definitions
+
+	Now all the methods, constructors, properties, indexers and
+	events are entered.  They are only `defined' using
+	System.Reflection.Emit.  No code generation will happen until
+	everything has been entered into System.Reflection.Emit.
+
+	This is important because to actually generate code we need to
+	know everything about the environment in which the code is
+	being generated.
+
+* Code Generation
+
+	At this point all the definitions have been entered into the
+	type manager through System.Reflection.Emit.  We can now use
+	System.Reflection to query all the information about the
+	types. 
+
+	Your normal semantic analysis and code generation phase lives
+	here.
+
+* Statements
+
+	Most of the statements are handled in the codegen.cs file.
+
+* Expressions
+
+* Error reporting
+
+	We should try to use the `Report.Error' and `Report.Warning'
+	classes which are part of the RootContext (there is even a
+	property to access it).
+
+	Error reporting should try to use the same codes that the
+	Microsoft compiler uses (if only so we can track which errors
+	we handle and which ones we dont).
+
+	If there is an error which is specific to MSC, use negative
+	numbers, and register the number in mcs/errors/errors.txt
+
+	Try to write a test case for any error that you run into the
+	code of the compiler if there is none already.
+
+	Put your test case in a file called csNNNN.cs in the
+	mcs/errors directory, and have the first two lines be:
+
+	// csNNNN.cs: This is the description.
+	// Line: XXX
+
+	Where `XXX' is the line where the error ocurrs.  We will later
+	use this as a regression test suite for catching errors in the
+	compiler. 
diff --git a/mcs/mcs/compiler.sln b/mcs/mcs/compiler.sln
new file mode 100755
index 00000000000..3b94d64a492
--- /dev/null
+++ b/mcs/mcs/compiler.sln
@@ -0,0 +1,21 @@
+Microsoft Visual Studio Solution File, Format Version 7.00

+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "compiler", "compiler.csproj", "{896D1461-B76B-41C0-ABE6-ACA2BB4F7B5A}"

+EndProject

+Global

+	GlobalSection(SolutionConfiguration) = preSolution

+		ConfigName.0 = Debug

+		ConfigName.1 = Release

+	EndGlobalSection

+	GlobalSection(ProjectDependencies) = postSolution

+	EndGlobalSection

+	GlobalSection(ProjectConfiguration) = postSolution

+		{896D1461-B76B-41C0-ABE6-ACA2BB4F7B5A}.Debug.ActiveCfg = Debug|.NET

+		{896D1461-B76B-41C0-ABE6-ACA2BB4F7B5A}.Debug.Build.0 = Debug|.NET

+		{896D1461-B76B-41C0-ABE6-ACA2BB4F7B5A}.Release.ActiveCfg = Release|.NET

+		{896D1461-B76B-41C0-ABE6-ACA2BB4F7B5A}.Release.Build.0 = Release|.NET

+	EndGlobalSection

+	GlobalSection(ExtensibilityGlobals) = postSolution

+	EndGlobalSection

+	GlobalSection(ExtensibilityAddIns) = postSolution

+	EndGlobalSection

+EndGlobal

diff --git a/mcs/mcs/const.cs b/mcs/mcs/const.cs
new file mode 100755
index 00000000000..2708592a86e
--- /dev/null
+++ b/mcs/mcs/const.cs
@@ -0,0 +1,232 @@
+//
+// const.cs: Constant declarations.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+//
+
+//
+// This is needed because the following situation arises:
+//
+//     The FieldBuilder is declared with the real type for an enumeration
+//
+//     When we attempt to set the value for the constant, the FieldBuilder.SetConstant
+//     function aborts because it requires its argument to be of the same type
+//
+
+namespace Mono.CSharp {
+
+	using System;
+	using System.Reflection;
+	using System.Reflection.Emit;
+	using System.Collections;
+
+	public class Const : MemberCore {
+		public Expression ConstantType;
+		public Expression Expr;
+		public Attributes  OptAttributes;
+		public FieldBuilder FieldBuilder;
+
+		object ConstantValue = null;
+		Type type;
+
+		bool in_transit = false;
+
+		public const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE;
+
+		public Const (Expression constant_type, string name, Expression expr, int mod_flags,
+			      Attributes attrs, Location loc)
+			: base (name, loc)
+		{
+			ConstantType = constant_type;
+			Name = name;
+			Expr = expr;
+			ModFlags = Modifiers.Check (AllowedModifiers, mod_flags, Modifiers.PRIVATE, loc);
+			OptAttributes = attrs;
+		}
+
+		public FieldAttributes FieldAttr {
+			get {
+				return FieldAttributes.Literal | FieldAttributes.Static |
+					Modifiers.FieldAttr (ModFlags) ;
+			}
+		}
+
+#if DEBUG
+		void dump_tree (Type t)
+		{
+			Console.WriteLine ("Dumping hierarchy");
+			while (t != null){
+				Console.WriteLine ("   " + t.FullName + " " +
+					(t.GetType ().IsEnum ? "yes" : "no"));
+				t = t.BaseType;
+			}
+		}
+#endif
+
+		/// <summary>
+		///   Defines the constant in the @parent
+		/// </summary>
+		public override bool Define (TypeContainer parent)
+		{
+			type = parent.ResolveType (ConstantType, false, Location);
+
+			if (type == null)
+				return false;
+
+			if (!TypeManager.IsBuiltinType (type) &&
+			    (!type.IsSubclassOf (TypeManager.enum_type))) {
+				Report.Error (
+					-3, Location,
+					"Constant type is not valid (only system types are allowed)");
+				return false;
+			}
+
+			Type ptype = parent.TypeBuilder.BaseType;
+
+			if (ptype != null) {
+				MemberList list = TypeContainer.FindMembers (
+					ptype, MemberTypes.Field, BindingFlags.Public,
+					Type.FilterName, Name);
+				
+				if (list.Count == 0)
+					if ((ModFlags & Modifiers.NEW) != 0)
+						WarningNotHiding (parent);
+
+			} else if ((ModFlags & Modifiers.NEW) != 0)
+				WarningNotHiding (parent);
+
+			FieldBuilder = parent.TypeBuilder.DefineField (Name, type, FieldAttr);
+
+			TypeManager.RegisterConstant (FieldBuilder, this);
+
+			return true;
+		}
+
+		/// <summary>
+		///  Looks up the value of a constant field. Defines it if it hasn't
+		///  already been. Similar to LookupEnumValue in spirit.
+		/// </summary>
+		public object LookupConstantValue (EmitContext ec)
+		{
+			if (ConstantValue != null)
+				return ConstantValue;
+
+			if (in_transit) {
+				Report.Error (110, Location,
+					      "The evaluation of the constant value for `" +
+					      Name + "' involves a circular definition.");
+				return null;
+			}
+
+			in_transit = true;
+			int errors = Report.Errors;
+
+			Expr = Expr.Resolve (ec);
+
+			in_transit = false;
+
+			if (Expr == null) {
+				if (errors == Report.Errors)
+					Report.Error (150, Location, "A constant value is expected");
+				return null;
+			}
+
+			if (!(Expr is Constant)) {
+				UnCheckedExpr un_expr = Expr as UnCheckedExpr;
+				CheckedExpr ch_expr = Expr as CheckedExpr;
+
+				if ((un_expr != null) && (un_expr.Expr is Constant))
+					Expr = un_expr.Expr;
+				else if ((ch_expr != null) && (ch_expr.Expr is Constant))
+					Expr = ch_expr.Expr;
+				else {
+					Report.Error (150, Location, "A constant value is expected");
+					return null;
+				}
+			}
+
+			ConstantValue = ((Constant) Expr).GetValue ();
+
+			if (type != Expr.Type) {
+				try {
+					ConstantValue = TypeManager.ChangeType (ConstantValue, type);
+				} catch {
+					Expression.Error_CannotConvertImplicit (Location, Expr.Type, type);
+					return null;
+				}
+
+				if (type == TypeManager.int32_type)
+					Expr = new IntConstant ((int) ConstantValue);
+				else if (type == TypeManager.uint32_type)
+					Expr = new UIntConstant ((uint) ConstantValue);
+				else if (type == TypeManager.int64_type)
+					Expr = new LongConstant ((long) ConstantValue);
+				else if (type == TypeManager.uint64_type)
+					Expr = new ULongConstant ((ulong) ConstantValue);
+				else if (type == TypeManager.float_type)
+					Expr = new FloatConstant ((float) ConstantValue);
+				else if (type == TypeManager.double_type)
+					Expr = new DoubleConstant ((double) ConstantValue);
+				else if (type == TypeManager.string_type)
+					Expr = new StringConstant ((string) ConstantValue);
+				else if (type == TypeManager.short_type)
+					Expr = new ShortConstant ((short) ConstantValue);
+				else if (type == TypeManager.ushort_type)
+					Expr = new UShortConstant ((ushort) ConstantValue);
+				else if (type == TypeManager.sbyte_type)
+					Expr = new SByteConstant ((sbyte) ConstantValue);
+				else if (type == TypeManager.byte_type)
+					Expr = new ByteConstant ((byte) ConstantValue);
+				else if (type == TypeManager.char_type)
+					Expr = new CharConstant ((char) ConstantValue);
+				else if (type == TypeManager.bool_type)
+					Expr = new BoolConstant ((bool) ConstantValue);
+			}
+
+			if (type.IsEnum){
+				//
+				// This sadly does not work for our user-defined enumerations types ;-(
+				//
+				try {
+					ConstantValue = System.Enum.ToObject (
+						type, ConstantValue);
+				} catch (ArgumentException){
+					Report.Error (
+						-16, Location,
+						".NET SDK 1.0 does not permit to create the constant "+
+						" field from a user-defined enumeration");
+				}
+			}
+
+			FieldBuilder.SetConstant (ConstantValue);
+
+			if (!TypeManager.RegisterFieldValue (FieldBuilder, ConstantValue))
+				return null;
+
+			return ConstantValue;
+		}
+		
+		
+		/// <summary>
+		///  Emits the field value by evaluating the expression
+		/// </summary>
+		public void EmitConstant (TypeContainer parent)
+		{
+			EmitContext ec = new EmitContext (parent, Location, null, type, ModFlags);
+			LookupConstantValue (ec);
+			
+			return;
+		}
+	}
+}
+
+
diff --git a/mcs/mcs/constant.cs b/mcs/mcs/constant.cs
new file mode 100755
index 00000000000..44a4c07b672
--- /dev/null
+++ b/mcs/mcs/constant.cs
@@ -0,0 +1,974 @@
+//
+// constant.cs: Constants.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+//
+
+namespace Mono.CSharp {
+
+	using System;
+	using System.Reflection.Emit;
+
+	/// <summary>
+	///   Base class for constants and literals.
+	/// </summary>
+	public abstract class Constant : Expression {
+		/// <remarks>
+		///   This is different from ToString in that ToString
+		///   is supposed to be there for debugging purposes,
+		///   and is not guaranteed to be useful for anything else,
+		///   AsString() will provide something that can be used
+		///   for round-tripping C# code.  Maybe it can be used
+		///   for IL assembly as well.
+		/// </remarks>
+		public abstract string AsString ();
+
+		override public string ToString ()
+		{
+			return this.GetType ().Name + " (" + AsString () + ")";
+		}
+
+		/// <summary>
+		///  This is used to obtain the actual value of the literal
+		///  cast into an object.
+		/// </summary>
+		public abstract object GetValue ();
+
+		/// <summary>
+		///   Constants are always born in a fully resolved state
+		/// </summary>
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return this;
+		}
+
+		//
+		// The various ToXXXX conversion functions are used by the constant
+		// folding evaluator.   A null value is returned if the conversion is
+		// not possible.   
+		//
+		// Note: not all the patterns for catching `implicit_conv' are the same.
+		// some implicit conversions can never be performed between two types
+		// even if the conversion would be lossless (for example short to uint),
+		// but some conversions are explicitly permitted by the standard provided
+		// that there will be no loss of information (for example, int to uint).
+		//
+		public DoubleConstant ToDouble (Location loc)
+		{
+			DoubleConstant c = ConvertToDouble ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.double_type);
+
+			return c;
+		}
+
+		public FloatConstant ToFloat (Location loc)
+		{
+			FloatConstant c = ConvertToFloat ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.float_type);
+
+			return c;
+		}
+
+		public ULongConstant ToULong (Location loc)
+		{
+			ULongConstant c = ConvertToULong ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.uint64_type);
+
+			return c;
+		}
+
+		public LongConstant ToLong (Location loc)
+		{
+			LongConstant c = ConvertToLong ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.int64_type);
+
+			return c;
+		}
+		
+		public UIntConstant ToUInt (Location loc)
+		{
+			UIntConstant c = ConvertToUInt ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.uint32_type);
+
+			return c;
+		}
+
+		public IntConstant ToInt (Location loc)
+		{
+			IntConstant c = ConvertToInt ();
+
+			if (c == null)
+				Error_CannotConvertImplicit (loc, Type, TypeManager.int32_type);
+
+			return c;
+		}
+		
+		public virtual DoubleConstant ConvertToDouble ()
+		{
+			return null;
+		}
+
+		public virtual FloatConstant ConvertToFloat ()
+		{
+			return null;
+		}
+
+		public virtual ULongConstant ConvertToULong ()
+		{
+			return null;
+		}
+
+		public virtual LongConstant ConvertToLong ()
+		{
+			return null;
+		}
+
+		public virtual UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public virtual IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+	
+	public class BoolConstant : Constant {
+		public readonly bool Value;
+		
+		public BoolConstant (bool val)
+		{
+			type = TypeManager.bool_type;
+			eclass = ExprClass.Value;
+
+			Value = val;
+		}
+
+		override public string AsString ()
+		{
+			return Value ? "true" : "false";
+		}
+
+		public override object GetValue ()
+		{
+			return (object) Value;
+		}
+				
+		
+		public override void Emit (EmitContext ec)
+		{
+			if (Value)
+				ec.ig.Emit (OpCodes.Ldc_I4_1);
+			else
+				ec.ig.Emit (OpCodes.Ldc_I4_0);
+		}
+	}
+
+	public class ByteConstant : Constant {
+		public readonly byte Value;
+
+		public ByteConstant (byte v)
+		{
+			type = TypeManager.byte_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return new ULongConstant (Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return new UIntConstant (Value);
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return new IntConstant (Value);
+		}
+	}
+
+	public class CharConstant : Constant {
+		public readonly char Value;
+
+		public CharConstant (char v)
+		{
+			type = TypeManager.char_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, Value);
+		}
+
+		static public string descape (char c)
+		{
+			switch (c){
+			case '\a':
+				return "\\a"; 
+			case '\b':
+				return "\\b"; 
+			case '\n':
+				return "\\n"; 
+			case '\t':
+				return "\\t"; 
+			case '\v':
+				return "\\v"; 
+			case '\r':
+				return "\\r"; 
+			case '\\':
+				return "\\\\";
+			case '\f':
+				return "\\f"; 
+			case '\0':
+				return "\\0"; 
+			case '"':
+				return "\\\""; 
+			case '\'':
+				return "\\\'"; 
+			}
+			return c.ToString ();
+		}
+
+		public override string AsString ()
+		{
+			return "\"" + descape (Value) + "\"";
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return new ULongConstant (Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return new UIntConstant (Value);
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return new IntConstant (Value);
+		}
+	}
+
+	public class SByteConstant : Constant {
+		public readonly sbyte Value;
+
+		public SByteConstant (sbyte v)
+		{
+			type = TypeManager.sbyte_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			if (Value >= 0)
+				return new ULongConstant ((ulong) Value);
+			
+			return null;
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return new IntConstant (Value);
+		}
+	}
+
+	public class ShortConstant : Constant {
+		public readonly short Value;
+
+		public ShortConstant (short v)
+		{
+			type = TypeManager.short_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return null;
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return new IntConstant (Value);
+		}
+	}
+
+	public class UShortConstant : Constant {
+		public readonly ushort Value;
+
+		public UShortConstant (ushort v)
+		{
+			type = TypeManager.ushort_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return new ULongConstant (Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return new UIntConstant (Value);
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return new IntConstant (Value);
+		}
+	}
+
+	public class IntConstant : Constant {
+		public readonly int Value;
+
+		public IntConstant (int v)
+		{
+			type = TypeManager.int32_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		static public void EmitInt (ILGenerator ig, int i)
+		{
+			switch (i){
+			case -1:
+				ig.Emit (OpCodes.Ldc_I4_M1);
+				break;
+				
+			case 0:
+				ig.Emit (OpCodes.Ldc_I4_0);
+				break;
+				
+			case 1:
+				ig.Emit (OpCodes.Ldc_I4_1);
+				break;
+				
+			case 2:
+				ig.Emit (OpCodes.Ldc_I4_2);
+				break;
+				
+			case 3:
+				ig.Emit (OpCodes.Ldc_I4_3);
+				break;
+				
+			case 4:
+				ig.Emit (OpCodes.Ldc_I4_4);
+				break;
+				
+			case 5:
+				ig.Emit (OpCodes.Ldc_I4_5);
+				break;
+				
+			case 6:
+				ig.Emit (OpCodes.Ldc_I4_6);
+				break;
+				
+			case 7:
+				ig.Emit (OpCodes.Ldc_I4_7);
+				break;
+				
+			case 8:
+				ig.Emit (OpCodes.Ldc_I4_8);
+				break;
+
+			default:
+				if (i >= -128 && i <= 127){
+					ig.Emit (OpCodes.Ldc_I4_S, (sbyte) i);
+				} else
+					ig.Emit (OpCodes.Ldc_I4, i);
+				break;
+			}
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			EmitInt (ec.ig, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			if (Value < 0)
+				return null;
+
+			return new ULongConstant ((ulong) Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			if (Value < 0)
+				return null;
+
+			return new UIntConstant ((uint) Value);
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return this;
+		}
+	}
+
+	public class UIntConstant : Constant {
+		public readonly uint Value;
+
+		public UIntConstant (uint v)
+		{
+			type = TypeManager.uint32_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			IntLiteral.EmitInt (ec.ig, unchecked ((int) Value));
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return new ULongConstant (Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return new LongConstant (Value);
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return this;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+
+	public class LongConstant : Constant {
+		public readonly long Value;
+
+		public LongConstant (long v)
+		{
+			type = TypeManager.int64_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			EmitLong (ig, Value);
+		}
+
+		static public void EmitLong (ILGenerator ig, long l)
+		{
+			if ((l >> 32) == 0){
+				IntLiteral.EmitInt (ig, unchecked ((int) l));
+				ig.Emit (OpCodes.Conv_I8);
+			} else {
+				ig.Emit (OpCodes.Ldc_I8, l);
+			}
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			if (Value < 0)
+				return null;
+			
+			return new ULongConstant ((ulong) Value);
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return this;
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+
+	public class ULongConstant : Constant {
+		public readonly ulong Value;
+
+		public ULongConstant (ulong v)
+		{
+			type = TypeManager.uint64_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			LongLiteral.EmitLong (ig, unchecked ((long) Value));
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return new FloatConstant (Value);
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return this;
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return null;
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+
+	public class FloatConstant : Constant {
+		public readonly float Value;
+
+		public FloatConstant (float v)
+		{
+			type = TypeManager.float_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldc_R4, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return new DoubleConstant (Value);
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return this;
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return null;
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+
+	public class DoubleConstant : Constant {
+		public readonly double Value;
+
+		public DoubleConstant (double v)
+		{
+			type = TypeManager.double_type;
+			eclass = ExprClass.Value;
+			Value = v;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldc_R8, Value);
+		}
+
+		public override string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return this;
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return null;
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return null;
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return null;
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return null;
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return null;
+		}
+	}
+
+	public class DecimalConstant : Constant {
+		public readonly decimal Value;
+
+		public DecimalConstant (decimal d)
+		{
+			type = TypeManager.decimal_type;
+			eclass = ExprClass.Value;
+			Value = d;
+		}
+
+		override public string AsString ()
+		{
+			return Value.ToString ();
+		}
+
+		public override object GetValue ()
+		{
+			return (object) Value;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			int [] words = Decimal.GetBits (Value);
+			
+			//
+			// FIXME: we could optimize this, and call a better 
+			// constructor
+			//
+
+			ILGenerator ig = ec.ig;
+			
+			IntConstant.EmitInt (ig, words [0]);
+			IntConstant.EmitInt (ig, words [1]);
+			IntConstant.EmitInt (ig, words [2]);
+
+			// sign
+			IntConstant.EmitInt (ig, words [3] >> 31);
+
+			// power
+			IntConstant.EmitInt (ig, (words [3] >> 16) & 0xff);
+
+			ig.Emit (OpCodes.Newobj, TypeManager.void_decimal_ctor_five_args);
+		}
+	}
+
+	public class StringConstant : Constant {
+		public readonly string Value;
+
+		public StringConstant (string s)
+		{
+			type = TypeManager.string_type;
+			eclass = ExprClass.Value;
+			Value = s;
+		}
+
+		// FIXME: Escape the string.
+		override public string AsString ()
+		{
+			return "\"" + Value + "\"";
+		}
+
+		public override object GetValue ()
+		{
+			return Value;
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldstr, Value);
+		}
+	}
+
+}
+
+
diff --git a/mcs/mcs/cs-parser.jay b/mcs/mcs/cs-parser.jay
new file mode 100755
index 00000000000..515115e1806
--- /dev/null
+++ b/mcs/mcs/cs-parser.jay
@@ -0,0 +1,3895 @@
+%{
+//
+// cs-parser.jay: The Parser for the C# compiler
+//
+// Authors: Miguel de Icaza (miguel@gnu.org)
+//          Ravi Pratap     (ravi@ximian.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+// TODO:
+//   (1) Figure out why error productions dont work.  `type-declaration' is a
+//       great spot to put an `error' because you can reproduce it with this input:
+//	 "public X { }"
+//
+//
+using System.Text;
+using System;
+
+namespace Mono.CSharp
+{
+	using System.Collections;
+	using Mono.Languages;
+
+	/// <summary>
+	///    The C# Parser
+	/// </summary>
+	public class CSharpParser : GenericParser {
+		Namespace     current_namespace;
+		TypeContainer current_container;
+	
+		// <summary>
+		//   Current block is used to add statements as we find
+		//   them.  
+		// </summary>
+
+		Block      current_block;
+
+		// <summary>
+		//   Current interface is used by the various declaration
+		//   productions in the interface declaration to "add"
+		//   the interfaces as we find them.
+		// </summary>
+		Interface  current_interface;
+
+		// <summary>
+		//   This is used by the unary_expression code to resolve
+		//   a name against a parameter.  
+		// </summary>
+		Parameters current_local_parameters;
+
+		// <summary>
+		//   Using during property parsing to describe the implicit
+		//   value parameter that is passed to the "set" and "get"accesor
+		//   methods (properties and indexers).
+		// </summary>
+		Expression implicit_value_parameter_type;
+		Parameters indexer_parameters;
+
+		// <summary>
+		//   Used to determine if we are parsing the get/set pair
+		//   of an indexer or a property
+		// </summmary>
+		bool  parsing_indexer;
+
+		//
+		// An out-of-band stack.
+		//
+		Stack oob_stack;
+
+		//
+		// Switch stack.
+		//
+		Stack switch_stack;
+%}
+
+%token EOF
+%token NONE   /* This token is never returned by our lexer */
+%token ERROR		// This is used not by the parser, but by the tokenizer.
+			// do not remove.
+
+/*
+ *These are the C# keywords
+ */
+%token ABSTRACT	
+%token AS
+%token ADD
+%token ASSEMBLY
+%token BASE	
+%token BOOL	
+%token BREAK	
+%token BYTE	
+%token CASE	
+%token CATCH	
+%token CHAR	
+%token CHECKED	
+%token CLASS	
+%token CONST	
+%token CONTINUE	
+%token DECIMAL	
+%token DEFAULT	
+%token DELEGATE	
+%token DO	
+%token DOUBLE	
+%token ELSE	
+%token ENUM	
+%token EVENT	
+%token EXPLICIT	
+%token EXTERN	
+%token FALSE	
+%token FINALLY	
+%token FIXED	
+%token FLOAT	
+%token FOR	
+%token FOREACH	
+%token GOTO	
+%token IF	
+%token IMPLICIT	
+%token IN	
+%token INT	
+%token INTERFACE
+%token INTERNAL	
+%token IS	
+%token LOCK	
+%token LONG	
+%token NAMESPACE
+%token NEW	
+%token NULL	
+%token OBJECT	
+%token OPERATOR	
+%token OUT	
+%token OVERRIDE	
+%token PARAMS	
+%token PRIVATE	
+%token PROTECTED
+%token PUBLIC	
+%token READONLY	
+%token REF	
+%token RETURN	
+%token REMOVE
+%token SBYTE	
+%token SEALED	
+%token SHORT	
+%token SIZEOF	
+%token STACKALLOC
+%token STATIC	
+%token STRING	
+%token STRUCT	
+%token SWITCH	
+%token THIS	
+%token THROW	
+%token TRUE	
+%token TRY	
+%token TYPEOF	
+%token UINT	
+%token ULONG	
+%token UNCHECKED
+%token UNSAFE	
+%token USHORT	
+%token USING	
+%token VIRTUAL	
+%token VOID	
+%token VOLATILE
+%token WHILE	
+
+/* C# keywords which are not really keywords */
+%token GET           "get"
+%token SET           "set"
+
+/* C# single character operators/punctuation. */
+%token OPEN_BRACE    "{"
+%token CLOSE_BRACE   "}"
+%token OPEN_BRACKET  "["
+%token CLOSE_BRACKET "]"
+%token OPEN_PARENS   "("
+%token CLOSE_PARENS  ")"
+%token DOT           "."
+%token COMMA         ","
+%token COLON         ":"
+%token SEMICOLON     ";"
+%token TILDE         "~"
+
+%token PLUS           "+"
+%token MINUS          "-"
+%token BANG           "!"
+%token ASSIGN         "="
+%token OP_LT          "<"
+%token OP_GT          ">"
+%token BITWISE_AND    "&"
+%token BITWISE_OR     "|"
+%token STAR           "*"
+%token PERCENT        "%"
+%token DIV            "/"
+%token CARRET         "^"
+%token INTERR         "?"
+
+/* C# multi-character operators. */
+%token OP_INC                 "++"
+%token OP_DEC                 "--"
+%token OP_SHIFT_LEFT          "<<"
+%token OP_SHIFT_RIGHT         ">>"
+%token OP_LE                  "<="
+%token OP_GE                  ">="
+%token OP_EQ                  "=="
+%token OP_NE                  "!="
+%token OP_AND                 "&&"
+%token OP_OR                  "||"
+%token OP_MULT_ASSIGN         "*="
+%token OP_DIV_ASSIGN          "/="
+%token OP_MOD_ASSIGN          "%="
+%token OP_ADD_ASSIGN          "+="
+%token OP_SUB_ASSIGN          "-="
+%token OP_SHIFT_LEFT_ASSIGN   "<<="
+%token OP_SHIFT_RIGHT_ASSIGN  ">>="
+%token OP_AND_ASSIGN          "&="
+%token OP_XOR_ASSIGN          "^="
+%token OP_OR_ASSIGN           "|="
+%token OP_PTR                 "->"
+
+/* Numbers */
+%token LITERAL_INTEGER           "int literal"
+%token LITERAL_FLOAT             "float literal"
+%token LITERAL_DOUBLE            "double literal"
+%token LITERAL_DECIMAL           "decimal literal"
+%token LITERAL_CHARACTER         "character literal"
+%token LITERAL_STRING            "string literal"
+
+%token IDENTIFIER
+
+/* Add precedence rules to solve dangling else s/r conflict */
+%nonassoc LOWPREC
+%nonassoc IF
+%nonassoc ELSE
+%right ASSIGN
+%left OP_OR
+%left OP_AND
+%left BITWISE_OR
+%left BITWISE_AND
+%left OP_SHIFT_LEFT OP_SHIFT_RIGHT
+%left PLUS MINUS
+%left STAR DIV PERCENT
+%right BANG CARRET UMINUS
+%nonassoc OP_INC OP_DEC
+%left OPEN_PARENS
+%left OPEN_BRACKET OPEN_BRACE
+%left DOT
+%nonassoc HIGHPREC
+
+%start compilation_unit
+%%
+
+compilation_unit
+        : outer_declarations opt_EOF
+        | outer_declarations attribute_sections opt_EOF
+        | attribute_sections opt_EOF
+        ;
+	
+opt_EOF
+	: /* empty */
+	| EOF
+	;
+
+outer_declarations
+        : outer_declaration
+        | outer_declarations outer_declaration
+        ;
+ 
+outer_declaration
+        : using_directive
+        | namespace_member_declaration
+        ;
+  
+using_directives
+	: using_directive 
+	| using_directives using_directive
+	;
+
+using_directive
+	: using_alias_directive
+	| using_namespace_directive
+	;
+
+using_alias_directive
+	: USING IDENTIFIER ASSIGN 
+	  namespace_or_type_name SEMICOLON
+	  {
+		  current_namespace.UsingAlias ((string) $2, (string) $4, lexer.Location);
+	  }
+	;
+
+using_namespace_directive
+	: USING namespace_name SEMICOLON 
+	  {
+		current_namespace.Using ((string) $2, lexer.Location);
+          }
+	;
+
+//
+// Strictly speaking, namespaces don't have attributes but
+// we parse global attributes along with namespace declarations and then
+// detach them
+// 
+namespace_declaration
+	: opt_attributes NAMESPACE qualified_identifier 
+	{
+		Attributes attrs = (Attributes) $1;
+
+		if (attrs != null) {
+			foreach (AttributeSection asec in attrs.AttributeSections)
+				if (asec.Target == "assembly")
+					RootContext.AddGlobalAttribute (
+						current_container, asec, lexer.Location);
+		}
+
+		current_namespace = RootContext.Tree.RecordNamespace (current_namespace, name, (string) $3);
+	} 
+	  namespace_body opt_semicolon
+	  { 
+		current_namespace = current_namespace.Parent;
+	  }
+	;
+
+opt_semicolon
+	: /* empty */
+	| SEMICOLON
+	;
+
+opt_comma
+	: /* empty */
+	| COMMA
+	;
+
+qualified_identifier
+	: IDENTIFIER
+	| qualified_identifier DOT IDENTIFIER { 
+	    $$ = (($1).ToString ()) + "." + ($3.ToString ()); }
+	;
+
+
+namespace_name
+	: namespace_or_type_name
+	;
+
+namespace_body
+	: OPEN_BRACE
+	  opt_using_directives
+	  opt_namespace_member_declarations
+	  CLOSE_BRACE
+	  {
+	  }
+	;
+
+opt_using_directives
+	: /* empty */
+	| using_directives
+	;
+
+opt_namespace_member_declarations
+	: /* empty */
+	| namespace_member_declarations
+	;
+
+namespace_member_declarations
+	: namespace_member_declaration
+	| namespace_member_declarations namespace_member_declaration
+	;
+
+namespace_member_declaration
+	: type_declaration
+	  {
+		string name = "";
+		int mod_flags;
+
+		if ($1 is Class){
+			Class c = (Class) $1;
+			mod_flags = c.ModFlags;
+			name = c.Name;
+		} else if ($1 is Struct){
+			Struct s = (Struct) $1;
+			mod_flags = s.ModFlags;
+			name = s.Name;
+		} else
+			break;
+
+		if ((mod_flags & (Modifiers.PRIVATE|Modifiers.PROTECTED)) != 0){
+			Report.Error (
+				1527, lexer.Location, 
+				"Namespace elements cant be explicitly " +
+			        "declared private or protected in `" + name + "'");
+		}
+		current_namespace.DeclarationFound = true;
+	  }
+	| namespace_declaration
+	;
+
+type_declaration
+	: class_declaration		
+	| struct_declaration		
+	| interface_declaration		
+	| enum_declaration		
+	| delegate_declaration
+//
+// Enable this when we have handled all errors, because this acts as a generic fallback
+//
+//	| error {
+//		Report.Error (1518, lexer.Location, "Expected class, struct, interface, enum or delegate");
+//	  }
+	;
+
+//
+// Attributes 17.2
+//
+
+opt_attributes
+        : /* empty */
+	| attribute_sections { $$ = $1; }
+        ;
+ 
+attribute_sections
+	: attribute_section
+          {
+		AttributeSection sect = (AttributeSection) $1;
+
+		if (sect.Target == "assembly")
+			RootContext.AddGlobalAttribute (current_container, sect, lexer.Location);
+		  
+	        $$ = new Attributes ((AttributeSection) $1, lexer.Location);
+          }
+	| attribute_sections attribute_section
+	  {
+		Attributes attrs = null;
+		AttributeSection sect = (AttributeSection) $2;
+
+		if (sect.Target == "assembly")
+			RootContext.AddGlobalAttribute (current_container, sect, lexer.Location);
+
+		if ($1 != null) {
+			attrs = (Attributes) $1;
+			attrs.AddAttribute (sect);
+		}
+		
+		$$ = attrs;
+	  }
+	;
+
+attribute_section
+	: OPEN_BRACKET attribute_target_specifier attribute_list CLOSE_BRACKET
+	  {
+		string target = null;
+		
+		if ($2 != null)
+			target = (string) $2;
+		
+		$$ = new AttributeSection (target, (ArrayList) $3);
+ 	  }
+        | OPEN_BRACKET attribute_list CLOSE_BRACKET
+	  {
+		$$ = new AttributeSection (null, (ArrayList) $2);
+	  }
+	;
+ 
+attribute_target_specifier
+	: attribute_target COLON
+	  {
+		$$ = $1;
+	  }
+	;
+
+attribute_target
+	: IDENTIFIER
+	  {
+		CheckAttributeTarget ((string) $1);
+		$$ = $1;
+	  }
+        | EVENT  { $$ = "event"; }	  
+        | RETURN { $$ = "return"; }
+	;
+
+attribute_list
+	: attribute
+	  {
+		ArrayList attrs = new ArrayList ();
+		attrs.Add ($1);
+
+		$$ = attrs;
+	       
+	  }
+	| attribute_list COMMA attribute
+	  {
+		ArrayList attrs = (ArrayList) $1;
+		attrs.Add ($3);
+
+		$$ = attrs;
+	  }
+	;
+
+attribute
+	: attribute_name
+	  {
+		$$ = lexer.Location;
+	  }
+	  opt_attribute_arguments
+	  {
+		$$ = new Attribute ((string) $1, (ArrayList) $3, (Location) $2);
+	  }
+	;
+
+attribute_name
+	: type_name  { /* reserved attribute name or identifier: 17.4 */ }
+	;
+
+opt_attribute_arguments
+	: /* empty */   { $$ = null; }
+	| OPEN_PARENS attribute_arguments CLOSE_PARENS
+	  {
+		$$ = $2;
+	  }
+	;
+
+
+attribute_arguments
+	: opt_positional_argument_list
+	  {
+		if ($1 == null)
+			$$ = null;
+		else {
+			ArrayList args = new ArrayList ();
+			args.Add ($1);
+		
+			$$ = args;
+		}
+	  }
+        | positional_argument_list COMMA named_argument_list
+	  {
+		ArrayList args = new ArrayList ();
+		args.Add ($1);
+		args.Add ($3);
+
+		$$ = args;
+	  }
+        | named_argument_list
+	  {
+		ArrayList args = new ArrayList ();
+		args.Add (null);
+		args.Add ($1);
+		
+		$$ = args;
+	  }
+        ;
+
+
+opt_positional_argument_list
+	: /* empty */ 		{ $$ = null; } 
+	| positional_argument_list
+	;
+
+positional_argument_list
+	: expression
+	  {
+		ArrayList args = new ArrayList ();
+		args.Add (new Argument ((Expression) $1, Argument.AType.Expression));
+
+		$$ = args;
+	  }
+        | positional_argument_list COMMA expression
+	 {
+		ArrayList args = (ArrayList) $1;
+		args.Add (new Argument ((Expression) $3, Argument.AType.Expression));
+
+		$$ = args;
+	 }
+        ;
+
+named_argument_list
+	: named_argument
+	  {
+		ArrayList args = new ArrayList ();
+		args.Add ($1);
+
+		$$ = args;
+	  }
+        | named_argument_list COMMA named_argument
+	  {	  
+		ArrayList args = (ArrayList) $1;
+		args.Add ($3);
+
+		$$ = args;
+	  }
+        ;
+
+named_argument
+	: IDENTIFIER ASSIGN expression
+	  {
+		$$ = new DictionaryEntry (
+			(string) $1, 
+			new Argument ((Expression) $3, Argument.AType.Expression));
+	  }
+	;
+
+		  
+class_body
+	:  OPEN_BRACE opt_class_member_declarations CLOSE_BRACE
+	;
+
+opt_class_member_declarations
+	: /* empty */
+	| class_member_declarations
+	;
+
+class_member_declarations
+	: class_member_declaration
+	| class_member_declarations 
+	  class_member_declaration
+	;
+
+class_member_declaration
+	: constant_declaration			// done
+	| field_declaration			// done
+	| method_declaration			// done
+	| property_declaration			// done
+	| event_declaration			// done
+	| indexer_declaration			// done
+	| operator_declaration			// done
+	| constructor_declaration		// done
+	| destructor_declaration		// done
+	| type_declaration
+	;
+
+struct_declaration
+	: opt_attributes
+	  opt_modifiers
+	  STRUCT IDENTIFIER
+	  { 
+		Struct new_struct;
+		string full_struct_name = MakeName ((string) $4);
+
+		new_struct = new Struct (current_container, full_struct_name, (int) $2, 
+					 (Attributes) $1, lexer.Location);
+		current_container = new_struct;
+		current_container.Namespace = current_namespace;
+		RootContext.Tree.RecordDecl (full_struct_name, new_struct);
+	  }
+	  opt_class_base
+	  struct_body
+	  opt_semicolon
+	  {
+		Struct new_struct = (Struct) current_container;
+
+		if ($6 != null)
+			new_struct.Bases = (ArrayList) $6;
+
+		current_container = current_container.Parent;
+		CheckDef (current_container.AddStruct (new_struct), new_struct.Name, new_struct.Location);
+		$$ = new_struct;
+	  }
+	;
+
+struct_body
+	: OPEN_BRACE opt_struct_member_declarations CLOSE_BRACE
+	;
+
+opt_struct_member_declarations
+	: /* empty */
+	| struct_member_declarations
+	;
+
+struct_member_declarations
+	: struct_member_declaration
+	| struct_member_declarations struct_member_declaration
+	;
+
+struct_member_declaration
+	: constant_declaration
+	| field_declaration
+	| method_declaration
+	| property_declaration
+	| event_declaration
+	| indexer_declaration
+	| operator_declaration
+	| constructor_declaration
+	| type_declaration
+
+	/*
+	 * This is only included so we can flag error 575: 
+	 * destructors only allowed on class types
+	 */
+	| destructor_declaration 
+	;
+
+constant_declaration
+	: opt_attributes 
+	  opt_modifiers
+	  CONST
+	  type
+	  constant_declarators
+	  SEMICOLON
+	  {
+		foreach (VariableDeclaration constant in (ArrayList) $5){
+			Location l = constant.Location;
+
+			Const c = new Const (
+				(Expression) $4, (string) constant.identifier, 
+				(Expression) constant.expression_or_array_initializer, (int) $2, 
+				(Attributes) $1, l);
+
+			CheckDef (current_container.AddConstant (c), c.Name, l);
+		}
+	  }
+	;
+
+constant_declarators
+	: constant_declarator 
+	  {
+		ArrayList constants = new ArrayList ();
+		constants.Add ($1);
+		$$ = constants;
+	  }
+	| constant_declarators COMMA constant_declarator
+	  {
+		ArrayList constants = (ArrayList) $1;
+
+		constants.Add ($3);
+	  }
+	;
+
+constant_declarator
+	: IDENTIFIER ASSIGN constant_expression
+	  {
+		$$ = new VariableDeclaration ((string) $1, $3, lexer.Location);
+	  }
+	;
+
+field_declaration
+	: opt_attributes
+	  opt_modifiers
+	  type 
+	  variable_declarators
+	  SEMICOLON
+	  { 
+		Expression type = (Expression) $3;
+		int mod = (int) $2;
+
+		foreach (VariableDeclaration var in (ArrayList) $4){
+			Location l = var.Location;
+
+			Field field = new Field (type, mod, var.identifier, 
+						 var.expression_or_array_initializer, 
+						 (Attributes) $1, l);
+
+			CheckDef (current_container.AddField (field), field.Name, l);
+		}
+	  }
+	;
+
+variable_declarators
+	: variable_declarator 
+	  {
+		ArrayList decl = new ArrayList ();
+		decl.Add ($1);
+		$$ = decl;
+	  }
+	| variable_declarators COMMA variable_declarator
+	  {
+		ArrayList decls = (ArrayList) $1;
+		decls.Add ($3);
+		$$ = $1;
+	  }
+	;
+
+variable_declarator
+	: IDENTIFIER ASSIGN variable_initializer
+	  {
+		$$ = new VariableDeclaration ((string) $1, $3, lexer.Location);
+	  }
+	| IDENTIFIER
+	  {
+		$$ = new VariableDeclaration ((string) $1, null, lexer.Location);
+	  }
+	;
+
+variable_initializer
+	: expression
+	  {
+		$$ = $1;
+	  }
+	| array_initializer
+	  {
+		$$ = $1;
+	  }
+	| STACKALLOC type OPEN_BRACKET expression CLOSE_BRACKET
+	  {
+		$$ = new StackAlloc ((Expression) $2, (Expression) $4, lexer.Location);
+	  }
+	;
+
+method_declaration
+	: method_header
+	  method_body
+	  {
+		Method method = (Method) $1;
+		Block b = (Block) $2;
+		const int extern_abstract = (Modifiers.EXTERN | Modifiers.ABSTRACT);
+
+		if (b == null){
+			if ((method.ModFlags & extern_abstract) == 0){
+				Report.Error (
+					501, lexer.Location,  current_container.MakeName (method.Name) +
+				        "must declare a body because it is not marked abstract or extern");
+			}
+		} else {
+			if ((method.ModFlags & Modifiers.EXTERN) != 0){
+				Report.Error (
+					179, lexer.Location, current_container.MakeName (method.Name) +
+					" is declared extern, but has a body");
+			}
+		}
+
+		method.Block = (Block) $2;
+		CheckDef (current_container.AddMethod (method), method.Name, method.Location);
+
+		current_local_parameters = null;
+	  }
+	;
+
+opt_error_modifier
+	: /* empty */
+	| modifiers 
+	  {
+		int m = (int) $1;
+		int i = 1;
+
+		while (m != 0){
+			if ((i & m) != 0){
+				Report.Error (
+					1585, lexer.Location, "Member modifier `" + 
+					Modifiers.Name (i) + "' must precede member type and name");
+			}
+			m &= ~i;
+			i = i << 1;
+		}
+	  }
+	;
+
+method_header
+	: opt_attributes
+	  opt_modifiers
+	  type
+	  member_name
+	  OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS 
+	  {
+		Method method = new Method ((Expression) $3, (int) $2, (string) $4, 
+					    (Parameters) $6, (Attributes) $1, lexer.Location);
+
+		current_local_parameters = (Parameters) $6;
+
+		$$ = method;
+	  }
+	| opt_attributes
+	  opt_modifiers
+	  VOID
+	  member_name
+	  OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS 
+	  {
+		Method method = new Method (TypeManager.system_void_expr, (int) $2, (string) $4, 
+					    (Parameters) $6, (Attributes) $1, lexer.Location);
+
+		current_local_parameters = (Parameters) $6;
+		$$ = method;
+	  }
+	;
+
+method_body
+	: block
+	| SEMICOLON		{ $$ = null; }
+	;
+
+opt_formal_parameter_list
+	: /* empty */			{ $$ = Parameters.EmptyReadOnlyParameters; }
+	| formal_parameter_list
+	;
+
+formal_parameter_list
+	: fixed_parameters		
+	  { 
+		ArrayList pars_list = (ArrayList) $1;
+
+		Parameter [] pars = new Parameter [pars_list.Count];
+		pars_list.CopyTo (pars);
+
+	  	$$ = new Parameters (pars, null, lexer.Location); 
+	  } 
+	| fixed_parameters COMMA parameter_array
+	  {
+		ArrayList pars_list = (ArrayList) $1;
+
+		Parameter [] pars = new Parameter [pars_list.Count];
+		pars_list.CopyTo (pars);
+
+		$$ = new Parameters (pars, (Parameter) $3, lexer.Location); 
+	  }
+	| parameter_array 
+	  {
+		$$ = new Parameters (null, (Parameter) $1, lexer.Location);
+	  }
+	;
+
+fixed_parameters
+	: fixed_parameter	
+	  {
+		ArrayList pars = new ArrayList ();
+
+		pars.Add ($1);
+		$$ = pars;
+	  }
+	| fixed_parameters COMMA fixed_parameter
+	  {
+		ArrayList pars = (ArrayList) $1;
+
+		pars.Add ($3);
+		$$ = $1;
+	  }
+	;
+
+fixed_parameter
+	: opt_attributes
+	  opt_parameter_modifier
+	  type
+	  IDENTIFIER
+	  {
+		$$ = new Parameter ((Expression) $3, (string) $4, (Parameter.Modifier) $2, (Attributes) $1);
+	  }
+	;
+
+opt_parameter_modifier
+	: /* empty */		{ $$ = Parameter.Modifier.NONE; }
+	| parameter_modifier
+	;
+
+parameter_modifier
+	: REF			{ $$ = Parameter.Modifier.REF | Parameter.Modifier.ISBYREF; }
+	| OUT			{ $$ = Parameter.Modifier.OUT | Parameter.Modifier.ISBYREF; }
+	;
+
+parameter_array
+	: opt_attributes PARAMS type IDENTIFIER
+	  { 
+		$$ = new Parameter ((Expression) $3, (string) $4, Parameter.Modifier.PARAMS, (Attributes) $1);
+		note ("type must be a single-dimension array type"); 
+	  }
+	;
+
+member_name 
+	: qualified_identifier
+	;
+
+property_declaration
+	: opt_attributes
+	  opt_modifiers
+	  type member_name
+	  OPEN_BRACE 
+	  {
+		implicit_value_parameter_type = (Expression) $3;
+
+		lexer.PropertyParsing = true;
+
+		$$ = lexer.Location;
+	  }
+	  accessor_declarations 
+	  {
+		lexer.PropertyParsing = false;
+	  }
+	  CLOSE_BRACE
+	  { 
+		Property prop;
+		Pair pair = (Pair) $7;
+		Accessor get_block = (Accessor) pair.First;
+		Accessor set_block = (Accessor) pair.Second;
+
+		Location loc = (Location) $6;
+		prop = new Property ((Expression) $3, (string) $4, (int) $2, get_block, set_block,
+				     (Attributes) $1, loc);
+		
+		CheckDef (current_container.AddProperty (prop), prop.Name, loc);
+		implicit_value_parameter_type = null;
+	  }
+	;
+
+accessor_declarations
+	: get_accessor_declaration opt_set_accessor_declaration
+	  { 
+		$$ = new Pair ($1, $2);
+	  }
+	| set_accessor_declaration opt_get_accessor_declaration
+	  {
+		$$ = new Pair ($2, $1);
+	  }
+	;
+
+opt_get_accessor_declaration
+	: /* empty */			{ $$ = null; }
+	| get_accessor_declaration
+	;
+
+opt_set_accessor_declaration
+	: /* empty */			{ $$ = null; }
+	| set_accessor_declaration
+	;
+
+get_accessor_declaration
+	: opt_attributes GET
+	  {
+		// If this is not the case, then current_local_parameters has already
+		// been set in indexer_declaration
+		if (parsing_indexer == false)
+			current_local_parameters = null;
+		else 
+			current_local_parameters = indexer_parameters;
+		lexer.PropertyParsing = false;
+	  }
+          accessor_body
+	  {
+		$$ = new Accessor ((Block) $4, (Attributes) $1);
+		current_local_parameters = null;
+		lexer.PropertyParsing = true;
+	  }
+	;
+
+set_accessor_declaration
+	: opt_attributes SET 
+	  {
+		Parameter [] args;
+		Parameter implicit_value_parameter = new Parameter (
+			implicit_value_parameter_type, "value", 
+			Parameter.Modifier.NONE, null);
+
+		if (parsing_indexer == false) {
+			args  = new Parameter [1];
+			args [0] = implicit_value_parameter;
+			current_local_parameters = new Parameters (args, null, lexer.Location);
+		} else {
+			Parameter [] fpars = indexer_parameters.FixedParameters;
+
+			if (fpars != null){
+				int count = fpars.Length;
+
+				args = new Parameter [count + 1];
+				fpars.CopyTo (args, 0);
+				args [count] = implicit_value_parameter;
+			} else 
+				args = null;
+			current_local_parameters = new Parameters (
+				args, indexer_parameters.ArrayParameter, lexer.Location);
+		}
+		
+		lexer.PropertyParsing = false;
+	  }
+	  accessor_body
+	  {
+		$$ = new Accessor ((Block) $4, (Attributes) $1);
+		current_local_parameters = null;
+		lexer.PropertyParsing = true;
+	  }
+	;
+
+accessor_body
+	: block 
+	| SEMICOLON		{ $$ = null; }
+	;
+
+interface_declaration
+	: opt_attributes
+	  opt_modifiers
+	  INTERFACE IDENTIFIER
+	  {
+		Interface new_interface;
+		string full_interface_name = MakeName ((string) $4);
+
+		new_interface = new Interface (current_container, full_interface_name, (int) $2, 
+					       (Attributes) $1, lexer.Location);
+		if (current_interface != null) {
+			Location l = lexer.Location;
+			Report.Error (-2, l, "Internal compiler error: interface inside interface");
+		}
+		current_interface = new_interface;
+		new_interface.Namespace = current_namespace;
+		RootContext.Tree.RecordDecl (full_interface_name, new_interface);
+	  }
+	  opt_interface_base
+	  interface_body opt_semicolon
+	  { 
+		Interface new_interface = (Interface) current_interface;
+
+		if ($6 != null)
+			new_interface.Bases = (ArrayList) $6;
+
+		current_interface = null;
+		CheckDef (current_container.AddInterface (new_interface), 
+			  new_interface.Name, new_interface.Location);
+	  }
+	;
+
+opt_interface_base
+	: /* empty */			  { $$ = null; }
+	| interface_base
+	;
+
+interface_base
+	: COLON interface_type_list	  { $$ = $2; }
+	;
+
+interface_type_list
+	: interface_type
+	  {
+		ArrayList interfaces = new ArrayList ();
+
+		interfaces.Add ($1);
+		$$ = interfaces;
+	  }
+	| interface_type_list COMMA interface_type
+	  {
+		ArrayList interfaces = (ArrayList) $1;
+		interfaces.Add ($3);
+		$$ = interfaces;
+	  }
+	;
+
+interface_body
+	: OPEN_BRACE
+	  opt_interface_member_declarations
+	  CLOSE_BRACE
+	;
+
+opt_interface_member_declarations
+	: /* empty */
+	| interface_member_declarations
+	;
+
+interface_member_declarations
+	: interface_member_declaration
+	| interface_member_declarations interface_member_declaration
+	;
+
+interface_member_declaration
+	: interface_method_declaration		
+	  { 
+		InterfaceMethod m = (InterfaceMethod) $1;
+
+		CheckDef (current_interface.AddMethod (m), m.Name, m.Location);
+	  }
+	| interface_property_declaration	
+	  { 
+		InterfaceProperty p = (InterfaceProperty) $1;
+
+		CheckDef (current_interface.AddProperty (p), p.Name, p.Location);
+          }
+	| interface_event_declaration 
+          { 
+		InterfaceEvent e = (InterfaceEvent) $1;
+
+		CheckDef (current_interface.AddEvent (e), e.Name, lexer.Location);
+	  }
+	| interface_indexer_declaration
+	  { 
+		InterfaceIndexer i = (InterfaceIndexer) $1;
+
+		CheckDef (current_interface.AddIndexer (i), "indexer", i.Location);
+	  }
+	;
+
+opt_new
+	: /* empty */	{ $$ = false; }
+	| NEW		{ $$ = true; }
+	;
+
+interface_method_declaration
+	: opt_attributes opt_new type IDENTIFIER 
+	  OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS
+	  SEMICOLON
+	  {
+		$$ = new InterfaceMethod ((Expression) $3, (string) $4, (bool) $2, 
+					  (Parameters) $6, (Attributes) $1, lexer.Location);
+	  }
+	| opt_attributes opt_new VOID IDENTIFIER 
+	  OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS
+	  SEMICOLON
+	  {
+		$$ = new InterfaceMethod (
+			TypeManager.system_void_expr, (string) $4, (bool) $2, (Parameters) $6, 
+					  (Attributes) $1, lexer.Location);
+	  }
+	;
+
+interface_property_declaration
+	: opt_attributes
+	  opt_new
+	  type IDENTIFIER 
+	  OPEN_BRACE 
+	  { lexer.PropertyParsing = true; }
+	  interface_accesors 
+	  { lexer.PropertyParsing = false; }
+	  CLOSE_BRACE
+	  {
+	        int gs = (int) $7;
+
+		$$ = new InterfaceProperty ((Expression) $3, (string) $4, (bool) $2, 
+					    (gs & 1) == 1, (gs & 2) == 2, (Attributes) $1,
+					    lexer.Location);
+	  }
+	;
+
+interface_accesors
+	: opt_attributes GET SEMICOLON		{ $$ = 1; }
+	| opt_attributes SET SEMICOLON		{ $$ = 2; }
+	| opt_attributes GET SEMICOLON opt_attributes SET SEMICOLON 
+	  { $$ = 3; }
+	| opt_attributes SET SEMICOLON opt_attributes GET SEMICOLON
+	  { $$ = 3; }
+	;
+
+interface_event_declaration
+	: opt_attributes opt_new EVENT type IDENTIFIER SEMICOLON
+	  {
+		$$ = new InterfaceEvent ((Expression) $4, (string) $5, (bool) $2, (Attributes) $1,
+					 lexer.Location);
+	  }
+	;
+
+interface_indexer_declaration 
+	: opt_attributes opt_new type THIS 
+	  OPEN_BRACKET formal_parameter_list CLOSE_BRACKET
+	  OPEN_BRACE 
+	  { lexer.PropertyParsing = true; }
+	  interface_accesors 
+	  { lexer.PropertyParsing = false; }
+	  CLOSE_BRACE
+	  {
+		int a_flags = (int) $10;
+
+	  	bool do_get = (a_flags & 1) == 1;
+		bool do_set = (a_flags & 2) == 2;
+
+		$$ = new InterfaceIndexer ((Expression) $3, (Parameters) $6, do_get, do_set,
+					   (bool) $2, (Attributes) $1, lexer.Location);
+	  }
+	;
+
+operator_declaration
+	: opt_attributes opt_modifiers operator_declarator operator_body
+	  {
+		OperatorDeclaration decl = (OperatorDeclaration) $3;
+		
+		Operator op = new Operator (decl.optype, decl.ret_type, (int) $2, decl.arg1type, decl.arg1name,
+					    decl.arg2type, decl.arg2name, (Block) $4, (Attributes) $1, decl.location);
+
+		// Note again, checking is done in semantic analysis
+		current_container.AddOperator (op);
+
+		current_local_parameters = null;
+	  }
+	;
+
+operator_body 
+	: block
+	| SEMICOLON { $$ = null; }
+	; 
+operator_declarator
+	: type OPERATOR overloadable_operator 
+	  OPEN_PARENS type IDENTIFIER CLOSE_PARENS
+	{
+		Operator.OpType op = (Operator.OpType) $3;
+		CheckUnaryOperator (op);
+
+		if (op == Operator.OpType.Addition)
+			op = Operator.OpType.UnaryPlus;
+
+		if (op == Operator.OpType.Subtraction)
+			op = Operator.OpType.UnaryNegation;
+
+		Parameter [] pars = new Parameter [1];
+
+		pars [0] = new Parameter ((Expression) $5, (string) $6, Parameter.Modifier.NONE, null);
+
+		current_local_parameters = new Parameters (pars, null, lexer.Location);
+
+		$$ = new OperatorDeclaration (op, (Expression) $1, (Expression) $5, (string) $6,
+					      null, null, lexer.Location);
+	}
+	| type OPERATOR overloadable_operator
+	  OPEN_PARENS 
+		type IDENTIFIER COMMA
+	  	type IDENTIFIER 
+	  CLOSE_PARENS
+        {
+	       CheckBinaryOperator ((Operator.OpType) $3);
+
+	       Parameter [] pars = new Parameter [2];
+
+	       pars [0] = new Parameter ((Expression) $5, (string) $6, Parameter.Modifier.NONE, null);
+	       pars [1] = new Parameter ((Expression) $8, (string) $9, Parameter.Modifier.NONE, null);
+
+	       current_local_parameters = new Parameters (pars, null, lexer.Location);
+	       
+	       $$ = new OperatorDeclaration ((Operator.OpType) $3, (Expression) $1, 
+					     (Expression) $5, (string) $6,
+					     (Expression) $8, (string) $9, lexer.Location);
+        }
+	| conversion_operator_declarator
+	;
+
+overloadable_operator
+// Unary operators:
+	: BANG   { $$ = Operator.OpType.LogicalNot; }
+        | TILDE  { $$ = Operator.OpType.OnesComplement; }  
+        | OP_INC { $$ = Operator.OpType.Increment; }
+        | OP_DEC { $$ = Operator.OpType.Decrement; }
+        | TRUE   { $$ = Operator.OpType.True; }
+        | FALSE  { $$ = Operator.OpType.False; }
+// Unary and binary:
+        | PLUS { $$ = Operator.OpType.Addition; }
+        | MINUS { $$ = Operator.OpType.Subtraction; }
+// Binary:
+        | STAR { $$ = Operator.OpType.Multiply; }
+        | DIV {  $$ = Operator.OpType.Division; }
+        | PERCENT { $$ = Operator.OpType.Modulus; }
+        | BITWISE_AND { $$ = Operator.OpType.BitwiseAnd; }
+        | BITWISE_OR { $$ = Operator.OpType.BitwiseOr; }
+        | CARRET { $$ = Operator.OpType.ExclusiveOr; }
+        | OP_SHIFT_LEFT { $$ = Operator.OpType.LeftShift; }
+        | OP_SHIFT_RIGHT { $$ = Operator.OpType.RightShift; }
+        | OP_EQ { $$ = Operator.OpType.Equality; }
+        | OP_NE { $$ = Operator.OpType.Inequality; }
+        | OP_GT { $$ = Operator.OpType.GreaterThan; }
+        | OP_LT { $$ = Operator.OpType.LessThan; }
+        | OP_GE { $$ = Operator.OpType.GreaterThanOrEqual; }
+        | OP_LE { $$ = Operator.OpType.LessThanOrEqual; }
+	;
+
+conversion_operator_declarator
+	: IMPLICIT OPERATOR type OPEN_PARENS type IDENTIFIER CLOSE_PARENS
+	  {
+		Parameter [] pars = new Parameter [1];
+
+		pars [0] = new Parameter ((Expression) $5, (string) $6, Parameter.Modifier.NONE, null);
+
+		current_local_parameters = new Parameters (pars, null, lexer.Location);  
+		  
+		$$ = new OperatorDeclaration (Operator.OpType.Implicit, (Expression) $3, (Expression) $5, (string) $6,
+					      null, null, lexer.Location);
+	  }
+	| EXPLICIT OPERATOR type OPEN_PARENS type IDENTIFIER CLOSE_PARENS
+	  {
+		Parameter [] pars = new Parameter [1];
+
+		pars [0] = new Parameter ((Expression) $5, (string) $6, Parameter.Modifier.NONE, null);
+
+		current_local_parameters = new Parameters (pars, null, lexer.Location);  
+		  
+		$$ = new OperatorDeclaration (Operator.OpType.Explicit, (Expression) $3, (Expression) $5, (string) $6,
+					      null, null, lexer.Location);
+	  }
+	| IMPLICIT error 
+	  {
+		syntax_error (lexer.Location, "'operator' expected");
+	  }
+	| EXPLICIT error 
+	  {
+		syntax_error (lexer.Location, "'operator' expected");
+	  }
+	;
+
+constructor_declaration
+	: opt_attributes
+	  opt_modifiers
+	  constructor_declarator
+	  constructor_body
+	  { 
+		Constructor c = (Constructor) $3;
+		c.Block = (Block) $4;
+		c.ModFlags = (int) $2;
+		c.OptAttributes = (Attributes) $1;
+
+		if ((c.ModFlags & Modifiers.STATIC) != 0){
+			if ((c.ModFlags & Modifiers.Accessibility) != 0) {
+				Report.Error (
+					515, c.Location, 
+					"Access modifiers are not allowed on static constructors");
+			}
+
+			if (c.Initializer != null){
+				Report.Error (
+					514, c.Location, 
+					"Static constructors can not have an explicit this or base " +
+					"constructor invocations");
+			}
+
+			if (!c.Parameters.Empty){
+				Report.Error (
+					132, c.Location, "Static constructors should not have parameters");
+			}
+		} 
+		
+		CheckDef (current_container.AddConstructor (c), c.Name, c.Location);
+
+		current_local_parameters = null;
+	  }
+	;
+
+constructor_declarator
+	: IDENTIFIER 
+	  OPEN_PARENS opt_formal_parameter_list CLOSE_PARENS 
+	  {
+		oob_stack.Push (lexer.Location);
+
+		current_local_parameters = (Parameters) $3;
+	  }
+	  opt_constructor_initializer
+	  {
+		Location l = (Location) oob_stack.Pop ();
+		$$ = new Constructor ((string) $1, (Parameters) $3, (ConstructorInitializer) $6, l);
+	  }
+	;
+
+constructor_body
+	: block
+	| SEMICOLON 		{ $$ = null; }
+	;
+
+opt_constructor_initializer
+	: /* empty */			{ $$ = null; }
+	| constructor_initializer
+	;
+
+constructor_initializer
+	: COLON BASE OPEN_PARENS opt_argument_list CLOSE_PARENS
+	  {
+		$$ = new ConstructorBaseInitializer ((ArrayList) $4, current_local_parameters, lexer.Location);
+	  }
+	| COLON THIS OPEN_PARENS opt_argument_list CLOSE_PARENS
+	  {
+		$$ = new ConstructorThisInitializer ((ArrayList) $4, current_local_parameters, lexer.Location);
+	  }
+	;
+
+destructor_declaration
+	: opt_attributes TILDE IDENTIFIER OPEN_PARENS CLOSE_PARENS block
+	  {
+		if ((string) $3 != current_container.Basename){
+			Report.Error (574, lexer.Location, "Name of destructor must match name of class");
+		} else if (!(current_container is Class)){
+			Report.Error (575, lexer.Location, "Destructors are only allowed in class types");
+		} else {
+			Location l = lexer.Location;
+
+			int m;
+			if (!RootContext.StdLib && current_container.Name == "System.Object")
+				m = Modifiers.PROTECTED | Modifiers.VIRTUAL;
+			else
+				m = Modifiers.PROTECTED | Modifiers.OVERRIDE;
+
+			Method d = new Method (
+				TypeManager.system_void_expr, m, "Finalize", 
+				new Parameters (null, null, l), (Attributes) $1, l);
+		  
+			d.Block = (Block) $6;
+			CheckDef (current_container.AddMethod (d), d.Name, d.Location);
+		}
+	  }
+	;
+
+event_declaration
+	: opt_attributes
+	  opt_modifiers
+	  EVENT type variable_declarators SEMICOLON
+	  {
+		foreach (VariableDeclaration var in (ArrayList) $5) {
+
+			Event e = new Event ((Expression) $4, var.identifier, 
+					     var.expression_or_array_initializer,
+					     (int) $2, null, null, (Attributes) $1, lexer.Location);
+
+			CheckDef (current_container.AddEvent (e), e.Name, e.Location);
+				       
+		}
+	  }
+	| opt_attributes
+	  opt_modifiers
+	  EVENT type member_name
+	  OPEN_BRACE
+	  {
+		implicit_value_parameter_type = (Expression) $4;  
+		lexer.EventParsing = true;
+		oob_stack.Push (lexer.Location);
+	  }
+	  event_accessor_declarations
+	  {
+		lexer.EventParsing = false;  
+	  }
+	  CLOSE_BRACE
+	  {
+		Location loc = (Location) oob_stack.Pop ();
+
+		Pair pair = (Pair) $8;
+		Accessor add_accessor = null;
+		Accessor rem_accessor = null;
+
+		if (pair.First != null)
+			add_accessor = (Accessor) pair.First;
+		if (pair.Second != null)
+			rem_accessor = (Accessor) pair.Second;
+		
+		Event e = new Event ((Expression) $4, (string) $5, null, (int) $2, add_accessor, rem_accessor,
+				     (Attributes) $1, loc);
+		
+		CheckDef (current_container.AddEvent (e), e.Name, loc);
+		implicit_value_parameter_type = null;
+	  }
+	;
+
+event_accessor_declarations
+	: add_accessor_declaration remove_accessor_declaration
+	{
+		$$ = new Pair ($1, $2);
+	}
+	| remove_accessor_declaration add_accessor_declaration
+	{
+		$$ = new Pair ($2, $1);
+	}	
+	;
+
+add_accessor_declaration
+	: opt_attributes ADD
+	  {
+		Parameter [] args = new Parameter [1];
+		Parameter implicit_value_parameter = new Parameter (
+			implicit_value_parameter_type, "value", 
+			Parameter.Modifier.NONE, null);
+
+		args [0] = implicit_value_parameter;
+		
+		current_local_parameters = new Parameters (args, null, lexer.Location);  
+		lexer.EventParsing = false;
+	  }
+          block
+	  {
+		$$ = new Accessor ((Block) $4, (Attributes) $1);
+		lexer.EventParsing = true;
+	  }
+	;
+
+remove_accessor_declaration
+	: opt_attributes REMOVE
+	  {
+		Parameter [] args = new Parameter [1];
+		Parameter implicit_value_parameter = new Parameter (
+			implicit_value_parameter_type, "value", 
+			Parameter.Modifier.NONE, null);
+
+		args [0] = implicit_value_parameter;
+		
+		current_local_parameters = new Parameters (args, null, lexer.Location);  
+		lexer.EventParsing = false;
+	  }
+          block
+	  {
+		$$ = new Accessor ((Block) $4, (Attributes) $1);
+		lexer.EventParsing = true;
+	  }
+	;
+
+indexer_declaration
+	: opt_attributes opt_modifiers indexer_declarator 
+	  OPEN_BRACE 
+	  {
+		IndexerDeclaration decl = (IndexerDeclaration) $3;
+
+		implicit_value_parameter_type = decl.type;
+		
+		lexer.PropertyParsing = true;
+		parsing_indexer  = true;
+		
+		indexer_parameters = decl.param_list;
+		oob_stack.Push (lexer.Location);
+	  }
+          accessor_declarations 
+	  {
+		  lexer.PropertyParsing = false;
+		  parsing_indexer  = false;
+	  }
+	  CLOSE_BRACE
+	  { 
+		// The signature is computed from the signature of the indexer.  Look
+	 	// at section 3.6 on the spec
+		Location loc = (Location) oob_stack.Pop ();
+		Indexer indexer;
+		IndexerDeclaration decl = (IndexerDeclaration) $3;
+		Pair pair = (Pair) $6;
+		Accessor get_block = (Accessor) pair.First;
+		Accessor set_block = (Accessor) pair.Second;
+
+		indexer = new Indexer (decl.type, decl.interface_type, (int) $2, decl.param_list,
+				       get_block, set_block, (Attributes) $1, loc);
+
+		// Note that there is no equivalent of CheckDef for this case
+		// We shall handle this in semantic analysis
+		
+		current_container.AddIndexer (indexer);
+		
+		current_local_parameters = null;
+		implicit_value_parameter_type = null;
+		indexer_parameters = null;
+	  }
+	;
+
+indexer_declarator
+	: type THIS OPEN_BRACKET opt_formal_parameter_list CLOSE_BRACKET
+	  {
+		Parameters pars = (Parameters) $4;
+
+		if (pars.FixedParameters == null && pars.ArrayParameter == null){
+			Report.Error (1551, lexer.Location, "Indexers must have at least one parameter");
+		}
+
+		$$ = new IndexerDeclaration ((Expression) $1, null, pars);
+	  }
+	| type qualified_identifier DOT THIS OPEN_BRACKET opt_formal_parameter_list CLOSE_BRACKET
+	  {
+		Parameters pars = (Parameters) $6;
+
+		if (pars.FixedParameters == null && pars.ArrayParameter == null){
+			Report.Error (1551, lexer.Location, "Indexers must have at least one parameter");
+		}
+		$$ = new IndexerDeclaration ((Expression) $1, (string) $2, pars);
+	  }
+	;
+
+enum_declaration
+	: opt_attributes
+	  opt_modifiers
+	  ENUM IDENTIFIER 
+	  opt_enum_base
+	  enum_body
+	  opt_semicolon
+	  { 
+		Location enum_location = lexer.Location;
+
+		string full_name = MakeName ((string) $4);
+		Enum e = new Enum (current_container, (Expression) $5, (int) $2, full_name, 
+				   (Attributes) $1, enum_location);
+		
+		foreach (VariableDeclaration ev in (ArrayList) $6) {
+			Location loc = (Location) ev.Location;
+
+			CheckDef (e.AddEnumMember (ev.identifier, 
+						   (Expression) ev.expression_or_array_initializer,
+						   loc, ev.OptAttributes),
+				  ev.identifier, loc);
+		}
+
+		e.Namespace = current_namespace;
+
+		CheckDef (current_container.AddEnum (e), full_name, enum_location);
+		RootContext.Tree.RecordDecl (full_name, e);
+
+	  }
+	;
+
+opt_enum_base
+	: /* empty */		{ $$ = TypeManager.system_int32_expr; }
+	| COLON type		{ $$ = $2;   }
+	;
+
+enum_body
+	: OPEN_BRACE opt_enum_member_declarations CLOSE_BRACE
+	  {
+		$$ = $2;
+	  }
+	;
+
+opt_enum_member_declarations
+	: /* empty */			{ $$ = new ArrayList (); }
+	| enum_member_declarations opt_comma { $$ = $1; }
+	;
+
+enum_member_declarations
+	: enum_member_declaration 
+	  {
+		ArrayList l = new ArrayList ();
+
+		l.Add ($1);
+		$$ = l;
+	  }
+	| enum_member_declarations COMMA enum_member_declaration
+	  {
+		ArrayList l = (ArrayList) $1;
+
+		l.Add ($3);
+
+		$$ = l;
+	  }
+	;
+
+enum_member_declaration
+	: opt_attributes IDENTIFIER 
+	  {
+		$$ = new VariableDeclaration ((string) $2, null, lexer.Location, (Attributes) $1);
+	  }
+	| opt_attributes IDENTIFIER
+	  {
+		  $$ = lexer.Location;
+	  }
+          ASSIGN expression
+	  { 
+		$$ = new VariableDeclaration ((string) $2, $5, lexer.Location, (Attributes) $1);
+	  }
+	;
+
+delegate_declaration
+	: opt_attributes
+	  opt_modifiers
+	  DELEGATE type	  
+	  IDENTIFIER OPEN_PARENS 
+	  opt_formal_parameter_list
+	  CLOSE_PARENS 
+	  SEMICOLON
+	  {
+		Location l = lexer.Location;
+		Delegate del = new Delegate (current_container, (Expression) $4, (int) $2, 
+		                             MakeName ((string) $5), (Parameters) $7, 
+					     (Attributes) $1, l);
+		  
+		del.Namespace = current_namespace;
+		CheckDef (current_container.AddDelegate (del), del.Name, l);
+	  }	
+	| opt_attributes
+	  opt_modifiers
+	  DELEGATE VOID	  
+	  IDENTIFIER OPEN_PARENS 
+	  opt_formal_parameter_list
+	  CLOSE_PARENS 
+	  SEMICOLON
+	  {
+		Location l = lexer.Location;
+		Delegate del = new Delegate (
+			current_container,
+			TypeManager.system_void_expr, (int) $2, MakeName ((string) $5), 
+			(Parameters) $7, (Attributes) $1, l);
+
+		del.Namespace = current_namespace;
+		CheckDef (current_container.AddDelegate (del), del.Name, l);
+	  }
+	;
+
+type_name
+	: namespace_or_type_name
+	;
+
+namespace_or_type_name
+	: qualified_identifier
+	;
+
+/* 
+ * Before you think of adding a return_type, notice that we have been
+ * using two rules in the places where it matters (one rule using type
+ * and another identical one that uses VOID as the return type).  This
+ * gets rid of a shift/reduce couple
+ */
+type
+	: type_name {  	/* class_type */
+		/* 
+	           This does interfaces, delegates, struct_types, class_types, 
+	           parent classes, and more! 4.2 
+	         */
+		$$ = DecomposeQI ((string) $1, lexer.Location);
+	  }
+	| builtin_types
+	| array_type
+	| pointer_type	  
+	;
+
+
+pointer_type
+	: type STAR
+	  {
+		//
+		// Note that here only unmanaged types are allowed but we
+		// can't perform checks during this phase - we do it during
+		// semantic analysis.
+		//
+		$$ = new ComposedCast ((Expression) $1, "*", lexer.Location);
+	  }
+	| VOID STAR
+	  {
+		$$ = new ComposedCast (TypeManager.system_void_expr, "*", lexer.Location);
+	  }
+	;
+
+non_expression_type
+	: builtin_types	
+	| non_expression_type rank_specifier
+	  {
+		$$ = new ComposedCast ((Expression) $1, (string) $2, lexer.Location);
+	  }
+	| non_expression_type STAR
+	  {
+		$$ = new ComposedCast ((Expression) $1, "*", lexer.Location);
+	  }
+	| expression rank_specifiers 
+	  {
+		$$ = new ComposedCast ((Expression) $1, (string) $2, lexer.Location);
+	  }
+	| expression STAR 
+	  {
+		$$ = new ComposedCast ((Expression) $1, "*", lexer.Location);
+	  }
+	;
+
+type_list
+	: type
+	  {
+		ArrayList types = new ArrayList ();
+
+		types.Add ($1);
+		$$ = types;
+	  }
+	| type_list COMMA type
+	  {
+		ArrayList types = (ArrayList) $1;
+
+		types.Add ($3);
+		$$ = types;
+	  }
+	;
+
+/*
+ * replaces all the productions for isolating the various
+ * simple types, but we need this to reuse it easily in local_variable_type
+ */
+builtin_types
+	: OBJECT	{ $$ = TypeManager.system_object_expr; }
+	| STRING	{ $$ = TypeManager.system_string_expr; }
+	| BOOL		{ $$ = TypeManager.system_boolean_expr; }
+	| DECIMAL	{ $$ = TypeManager.system_decimal_expr; }
+	| FLOAT		{ $$ = TypeManager.system_single_expr; }
+	| DOUBLE	{ $$ = TypeManager.system_double_expr; }
+	| integral_type
+	;
+
+integral_type
+	: SBYTE		{ $$ = TypeManager.system_sbyte_expr; }
+	| BYTE		{ $$ = TypeManager.system_byte_expr; }
+	| SHORT		{ $$ = TypeManager.system_int16_expr; }
+	| USHORT	{ $$ = TypeManager.system_uint16_expr; }
+	| INT		{ $$ = TypeManager.system_int32_expr; }
+	| UINT		{ $$ = TypeManager.system_uint32_expr; }
+	| LONG		{ $$ = TypeManager.system_int64_expr; }
+	| ULONG		{ $$ = TypeManager.system_uint64_expr; }
+	| CHAR		{ $$ = TypeManager.system_char_expr; }
+	| VOID		{ $$ = TypeManager.system_void_expr; }
+	;
+
+interface_type
+	: type_name
+	;
+
+array_type
+	: type rank_specifiers
+	  {
+		$$ = new ComposedCast ((Expression) $1, (string) $2, lexer.Location);
+	  }
+	;
+
+//
+// Expressions, section 7.5
+//
+primary_expression
+	: literal
+	  {
+		// 7.5.1: Literals
+	  }
+ 
+	| qualified_identifier
+	  {
+		string name = (string) $1;
+
+		$$ = null;
+		$$ = DecomposeQI (name, lexer.Location);
+	  }
+	| parenthesized_expression
+	| member_access
+	| invocation_expression
+	| element_access
+	| this_access
+	| base_access
+	| post_increment_expression
+	| post_decrement_expression
+	| new_expression
+	| typeof_expression
+	| sizeof_expression
+	| checked_expression
+	| unchecked_expression
+	| pointer_member_access
+	;
+
+literal
+	: boolean_literal
+	| integer_literal
+	| real_literal
+	| LITERAL_CHARACTER     { $$ = new CharLiteral ((char) lexer.Value); }
+	| LITERAL_STRING        { $$ = new StringLiteral ((string) lexer.Value); }
+	| NULL			{ $$ = NullLiteral.Null; }
+	;
+
+real_literal
+	: LITERAL_FLOAT         { $$ = new FloatLiteral ((float) lexer.Value); }
+	| LITERAL_DOUBLE        { $$ = new DoubleLiteral ((double) lexer.Value); }
+	| LITERAL_DECIMAL       { $$ = new DecimalLiteral ((decimal) lexer.Value); }
+	;
+
+integer_literal
+	: LITERAL_INTEGER       { 
+		object v = lexer.Value;
+
+		if (v is int)
+			$$ = new IntLiteral ((Int32) v); 
+		else if (v is uint)
+			$$ = new UIntLiteral ((UInt32) v);
+		else if (v is long)
+			$$ = new LongLiteral ((Int64) v);
+		else if (v is ulong)
+			$$ = new ULongLiteral ((UInt64) v);
+		else
+			Console.WriteLine ("OOPS.  Unexpected result from scanner");
+	  }
+	;
+
+boolean_literal
+	: TRUE			{ $$ = new BoolLiteral (true); }
+	| FALSE			{ $$ = new BoolLiteral (false); }
+	;
+
+parenthesized_expression
+	: OPEN_PARENS expression CLOSE_PARENS
+	  { $$ = $2; }
+	;
+
+member_access
+	: primary_expression DOT IDENTIFIER
+	  {
+		$$ = new MemberAccess ((Expression) $1, (string) $3, lexer.Location);
+	  }
+	| predefined_type DOT IDENTIFIER
+	  {
+		$$ = new MemberAccess ((Expression) $1, (string) $3, lexer.Location);
+	  }
+	;
+
+predefined_type
+	: builtin_types
+	;
+
+invocation_expression
+	: primary_expression OPEN_PARENS opt_argument_list CLOSE_PARENS
+	  {
+		if ($1 == null) {
+			Location l = lexer.Location;
+			Report.Error (1, l, "THIS IS CRAZY");
+		}
+		$$ = new Invocation ((Expression) $1, (ArrayList) $3, lexer.Location);
+	  }
+	; 
+
+opt_argument_list
+	: /* empty */		{ $$ = null; }
+	| argument_list
+	;
+
+argument_list
+	: argument		
+	  { 
+		ArrayList list = new ArrayList ();
+		list.Add ($1);
+		$$ = list;
+	  }
+	| argument_list COMMA argument
+	  {
+		ArrayList list = (ArrayList) $1;
+		list.Add ($3);
+		$$ = list;
+	  }
+	;
+
+argument
+	: expression
+	  {
+		$$ = new Argument ((Expression) $1, Argument.AType.Expression);
+	  }
+	| REF variable_reference 
+	  { 
+		$$ = new Argument ((Expression) $2, Argument.AType.Ref);
+	  }
+	| OUT variable_reference 
+	  { 
+		$$ = new Argument ((Expression) $2, Argument.AType.Out);
+	  }
+	;
+
+variable_reference
+	: expression { note ("section 5.4"); $$ = $1; }
+	;
+
+element_access
+	: primary_expression OPEN_BRACKET expression_list CLOSE_BRACKET	
+	  {
+		$$ = new ElementAccess ((Expression) $1, (ArrayList) $3, lexer.Location);
+	  }
+	| primary_expression rank_specifiers
+	  {
+		// So the super-trick is that primary_expression
+		// can only be either a SimpleName or a MemberAccess. 
+		// The MemberAccess case arises when you have a fully qualified type-name like :
+		// Foo.Bar.Blah i;
+		// SimpleName is when you have
+		// Blah i;
+		  
+		Expression expr = (Expression) $1;  
+		if (!(expr is SimpleName || expr is MemberAccess)) {
+			Location l = lexer.Location;
+			Report.Error (-1, l, "Invalid Type definition");
+			$$ = "System.Object";
+		}
+		
+		//
+		// So we extract the string corresponding to the SimpleName
+		// or MemberAccess
+		// 
+		$$ = new SimpleName (GetQualifiedIdentifier (expr) + (string) $2, lexer.Location);
+	  }
+	;
+
+expression_list
+	: expression
+	  {
+		ArrayList list = new ArrayList ();
+		list.Add ($1);
+		$$ = list;
+	  }
+	| expression_list COMMA expression
+	  {
+		ArrayList list = (ArrayList) $1;
+		list.Add ($3);
+		$$ = list;
+	  }
+	;
+
+this_access
+	: THIS
+	  {
+		$$ = new This (current_block, lexer.Location);
+	  }
+	;
+
+base_access
+	: BASE DOT IDENTIFIER
+	  {
+		$$ = new BaseAccess ((string) $3, lexer.Location);
+	  }
+	| BASE OPEN_BRACKET expression_list CLOSE_BRACKET
+	  {
+		$$ = new BaseIndexerAccess ((ArrayList) $3, lexer.Location);
+	  }
+	;
+
+post_increment_expression
+	: primary_expression OP_INC
+	  {
+		$$ = new UnaryMutator (UnaryMutator.Mode.PostIncrement,
+				       (Expression) $1, lexer.Location);
+	  }
+	;
+
+post_decrement_expression
+	: primary_expression OP_DEC
+	  {
+		$$ = new UnaryMutator (UnaryMutator.Mode.PostDecrement,
+				       (Expression) $1, lexer.Location);
+	  }
+	;
+
+new_expression
+	: object_or_delegate_creation_expression
+	| array_creation_expression
+	;
+
+object_or_delegate_creation_expression
+	: NEW type OPEN_PARENS opt_argument_list CLOSE_PARENS
+	  {
+		$$ = new New ((Expression) $2, (ArrayList) $4, lexer.Location);
+	  }
+	;
+
+array_creation_expression
+	: NEW type OPEN_BRACKET expression_list CLOSE_BRACKET 
+	  opt_rank_specifier
+	  opt_array_initializer
+	  {
+		$$ = new ArrayCreation ((Expression) $2, (ArrayList) $4, (string) $6, (ArrayList) $7, lexer.Location);
+	  }
+	| NEW type rank_specifiers array_initializer
+	  {
+		$$ = new ArrayCreation ((Expression) $2, (string) $3, (ArrayList) $4, lexer.Location);
+	  }
+	| NEW type error 
+	  {
+		Report.Error (1526, lexer.Location, "new expression requires () or [] after type");
+	  }
+	;
+
+opt_rank_specifier
+	: /* empty */
+	  {
+		  $$ = "";
+	  }
+	| rank_specifiers
+	  {
+			$$ = $1;
+	  }
+	;
+
+rank_specifiers
+	: rank_specifier
+	  {
+		  $$ = $1;
+	  }
+	| rank_specifiers rank_specifier
+	  {
+		  $$ = (string) $2 + (string) $1;
+	  }     	
+        ;
+
+rank_specifier
+	: OPEN_BRACKET opt_dim_separators CLOSE_BRACKET
+	  {
+		$$ = "[" + (string) $2 + "]";
+	  }
+	;
+
+opt_dim_separators
+	: /* empty */
+	  {
+		$$ = "";
+	  }
+	| dim_separators
+	  {
+		  $$ = $1;
+	  }		  
+	;
+
+dim_separators
+	: COMMA
+	  {
+		$$ = ",";
+	  }
+	| dim_separators COMMA
+	  {
+		$$ = (string) $1 + ",";
+	  }
+	;
+
+opt_array_initializer
+	: /* empty */
+	  {
+		$$ = null;
+	  }
+        | array_initializer
+	  {
+		$$ = $1;
+	  }
+	;
+
+array_initializer
+	: OPEN_BRACE CLOSE_BRACE
+	  {
+		ArrayList list = new ArrayList ();
+		$$ = list;
+	  }
+	| OPEN_BRACE variable_initializer_list opt_comma CLOSE_BRACE
+	  {
+		$$ = (ArrayList) $2;
+	  }
+	;
+
+variable_initializer_list
+	: variable_initializer
+	  {
+		ArrayList list = new ArrayList ();
+		list.Add ($1);
+		$$ = list;
+	  }
+	| variable_initializer_list COMMA variable_initializer
+	  {
+		ArrayList list = (ArrayList) $1;
+		list.Add ($3);
+		$$ = list;
+	  }
+	;
+
+typeof_expression
+	: TYPEOF OPEN_PARENS type CLOSE_PARENS
+	  {
+		$$ = new TypeOf ((Expression) $3, lexer.Location);
+	  }
+	;
+
+sizeof_expression
+	: SIZEOF OPEN_PARENS type CLOSE_PARENS { 
+		$$ = new SizeOf ((Expression) $3, lexer.Location);
+	  }
+	;
+
+checked_expression
+	: CHECKED OPEN_PARENS expression CLOSE_PARENS
+	  {
+		$$ = new CheckedExpr ((Expression) $3, lexer.Location);
+	  }
+	;
+
+unchecked_expression
+	: UNCHECKED OPEN_PARENS expression CLOSE_PARENS
+	  {
+		$$ = new UnCheckedExpr ((Expression) $3, lexer.Location);
+	  }
+	;
+
+pointer_member_access 
+	: primary_expression OP_PTR IDENTIFIER
+	  {
+		Expression deref;
+
+		deref = new Unary (Unary.Operator.Indirection, (Expression) $1, lexer.Location);
+		$$ = new MemberAccess (deref, (string) $3, lexer.Location);
+	  }
+
+unary_expression
+	: primary_expression
+	| BANG prefixed_unary_expression
+	  {
+		$$ = new Unary (Unary.Operator.LogicalNot, (Expression) $2, lexer.Location);
+	  }
+	| TILDE prefixed_unary_expression
+	  {
+		$$ = new Unary (Unary.Operator.OnesComplement, (Expression) $2, lexer.Location);
+	  }
+        | OPEN_PARENS expression CLOSE_PARENS unary_expression
+	  {
+		  $$ = new Cast ((Expression) $2, (Expression) $4, lexer.Location);
+	  }
+        | OPEN_PARENS non_expression_type CLOSE_PARENS prefixed_unary_expression
+	  {
+		  $$ = new Cast ((Expression) $2, (Expression) $4, lexer.Location);
+	  }
+	;
+
+	//
+	// The idea to split this out is from Rhys' grammar
+	// to solve the problem with casts.
+	//
+prefixed_unary_expression
+	: unary_expression
+	| PLUS prefixed_unary_expression
+	  { 
+	  	$$ = new Unary (Unary.Operator.UnaryPlus, (Expression) $2, lexer.Location);
+	  } 
+	| MINUS prefixed_unary_expression 
+	  { 
+		$$ = new Unary (Unary.Operator.UnaryNegation, (Expression) $2, lexer.Location);
+	  }
+	| OP_INC prefixed_unary_expression 
+	  {
+		$$ = new UnaryMutator (UnaryMutator.Mode.PreIncrement,
+				       (Expression) $2, lexer.Location);
+	  }
+	| OP_DEC prefixed_unary_expression 
+	  {
+		$$ = new UnaryMutator (UnaryMutator.Mode.PreDecrement,
+				       (Expression) $2, lexer.Location);
+	  }
+	| STAR prefixed_unary_expression
+	  {
+		$$ = new Unary (Unary.Operator.Indirection, (Expression) $2, lexer.Location);
+	  }
+	| BITWISE_AND prefixed_unary_expression
+	  {
+		$$ = new Unary (Unary.Operator.AddressOf, (Expression) $2, lexer.Location);
+	  }
+	;
+
+pre_increment_expression
+	: OP_INC prefixed_unary_expression 
+	  {
+		$$ = new UnaryMutator (UnaryMutator.Mode.PreIncrement,
+				       (Expression) $2, lexer.Location);
+	  }
+	;
+
+pre_decrement_expression
+	: OP_DEC prefixed_unary_expression 
+	  {
+		$$ = new UnaryMutator (UnaryMutator.Mode.PreDecrement,
+				       (Expression) $2, lexer.Location);
+	  }
+	;
+
+multiplicative_expression
+	: prefixed_unary_expression
+	| multiplicative_expression STAR prefixed_unary_expression
+	  {
+		$$ = new Binary (Binary.Operator.Multiply, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| multiplicative_expression DIV prefixed_unary_expression
+	  {
+		$$ = new Binary (Binary.Operator.Division, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| multiplicative_expression PERCENT prefixed_unary_expression 
+	  {
+		$$ = new Binary (Binary.Operator.Modulus, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	;
+
+additive_expression
+	: multiplicative_expression
+	| additive_expression PLUS multiplicative_expression 
+	  {
+		$$ = new Binary (Binary.Operator.Addition, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| additive_expression MINUS multiplicative_expression
+	  {
+		$$ = new Binary (Binary.Operator.Subtraction, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	;
+
+shift_expression
+	: additive_expression
+	| shift_expression OP_SHIFT_LEFT additive_expression
+	  {
+		$$ = new Binary (Binary.Operator.LeftShift, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| shift_expression OP_SHIFT_RIGHT additive_expression
+	  {
+		$$ = new Binary (Binary.Operator.RightShift, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	; 
+
+relational_expression
+	: shift_expression
+	| relational_expression OP_LT shift_expression
+	  {
+		$$ = new Binary (Binary.Operator.LessThan, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| relational_expression OP_GT shift_expression
+	  {
+		$$ = new Binary (Binary.Operator.GreaterThan, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| relational_expression OP_LE shift_expression
+	  {
+		$$ = new Binary (Binary.Operator.LessThanOrEqual, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| relational_expression OP_GE shift_expression
+	  {
+		$$ = new Binary (Binary.Operator.GreaterThanOrEqual, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| relational_expression IS type
+	  {
+		$$ = new Is ((Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| relational_expression AS type
+	  {
+		$$ = new As ((Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	;
+
+equality_expression
+	: relational_expression
+	| equality_expression OP_EQ relational_expression
+	  {
+		$$ = new Binary (Binary.Operator.Equality, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| equality_expression OP_NE relational_expression
+	  {
+		$$ = new Binary (Binary.Operator.Inequality, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	; 
+
+and_expression
+	: equality_expression
+	| and_expression BITWISE_AND equality_expression
+	  {
+		$$ = new Binary (Binary.Operator.BitwiseAnd, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	;
+
+exclusive_or_expression
+	: and_expression
+	| exclusive_or_expression CARRET and_expression
+	  {
+		$$ = new Binary (Binary.Operator.ExclusiveOr, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	;
+
+inclusive_or_expression
+	: exclusive_or_expression
+	| inclusive_or_expression BITWISE_OR exclusive_or_expression
+	  {
+		$$ = new Binary (Binary.Operator.BitwiseOr, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	;
+
+conditional_and_expression
+	: inclusive_or_expression
+	| conditional_and_expression OP_AND inclusive_or_expression
+	  {
+		$$ = new Binary (Binary.Operator.LogicalAnd, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	;
+
+conditional_or_expression
+	: conditional_and_expression
+	| conditional_or_expression OP_OR conditional_and_expression
+	  {
+		$$ = new Binary (Binary.Operator.LogicalOr, 
+			         (Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	;
+
+conditional_expression
+	: conditional_or_expression
+	| conditional_or_expression INTERR expression COLON expression 
+	  {
+		$$ = new Conditional ((Expression) $1, (Expression) $3, (Expression) $5, lexer.Location);
+	  }
+	;
+
+assignment_expression
+	: prefixed_unary_expression ASSIGN expression
+	  {
+		$$ = new Assign ((Expression) $1, (Expression) $3, lexer.Location);
+	  }
+	| prefixed_unary_expression OP_MULT_ASSIGN expression
+	  {
+		Location l = lexer.Location;
+
+		$$ = new CompoundAssign (
+			Binary.Operator.Multiply, (Expression) $1, (Expression) $3, l);
+	  }
+	| prefixed_unary_expression OP_DIV_ASSIGN expression
+	  {
+		Location l = lexer.Location;
+
+		$$ = new CompoundAssign (
+			Binary.Operator.Division, (Expression) $1, (Expression) $3, l);
+	  }
+	| prefixed_unary_expression OP_MOD_ASSIGN expression
+	  {
+		Location l = lexer.Location;
+
+		$$ = new CompoundAssign (
+			Binary.Operator.Modulus, (Expression) $1, (Expression) $3, l);
+	  }
+	| prefixed_unary_expression OP_ADD_ASSIGN expression
+	  {
+		Location l = lexer.Location;
+
+		$$ = new CompoundAssign (
+			Binary.Operator.Addition, (Expression) $1, (Expression) $3, l);
+	  }
+	| prefixed_unary_expression OP_SUB_ASSIGN expression
+	  {
+		Location l = lexer.Location;
+
+		$$ = new CompoundAssign (
+			Binary.Operator.Subtraction, (Expression) $1, (Expression) $3, l);
+	  }
+	| prefixed_unary_expression OP_SHIFT_LEFT_ASSIGN expression
+	  {
+		Location l = lexer.Location;
+
+		$$ = new CompoundAssign (
+			Binary.Operator.LeftShift, (Expression) $1, (Expression) $3, l);
+	  }
+	| prefixed_unary_expression OP_SHIFT_RIGHT_ASSIGN expression
+	  {
+		Location l = lexer.Location;
+
+		$$ = new CompoundAssign (
+			Binary.Operator.RightShift, (Expression) $1, (Expression) $3, l);
+	  }
+	| prefixed_unary_expression OP_AND_ASSIGN expression
+	  {
+		Location l = lexer.Location;
+
+		$$ = new CompoundAssign (
+			Binary.Operator.BitwiseAnd, (Expression) $1, (Expression) $3, l);
+	  }
+	| prefixed_unary_expression OP_OR_ASSIGN expression
+	  {
+		Location l = lexer.Location;
+
+		$$ = new CompoundAssign (
+			Binary.Operator.BitwiseOr, (Expression) $1, (Expression) $3, l);
+	  }
+	| prefixed_unary_expression OP_XOR_ASSIGN expression
+	  {
+		Location l = lexer.Location;
+
+		$$ = new CompoundAssign (
+			Binary.Operator.ExclusiveOr, (Expression) $1, (Expression) $3, l);
+	  }
+	;
+
+expression
+	: conditional_expression
+	| assignment_expression
+	;
+
+constant_expression
+	: expression
+	;
+
+boolean_expression
+	: expression
+	;
+
+//
+// 10 classes
+//
+class_declaration
+	: opt_attributes
+	  opt_modifiers
+	  CLASS IDENTIFIER
+	  {
+		Class new_class;
+		string name;
+
+		name = MakeName ((string) $4);
+
+		new_class = new Class (current_container, name, (int) $2, 
+				       (Attributes) $1, lexer.Location);
+		current_container = new_class;
+		current_container.Namespace = current_namespace;
+		RootContext.Tree.RecordDecl (name, new_class);
+	  }
+	  opt_class_base
+	  class_body 
+	  opt_semicolon 
+	  {
+		Class new_class = (Class) current_container;
+
+		if ($6 != null)
+			new_class.Bases = (ArrayList) $6;
+
+		current_container = current_container.Parent;
+		CheckDef (current_container.AddClass (new_class), new_class.Name, new_class.Location);
+
+		$$ = new_class;
+	  }
+	;	
+
+opt_modifiers
+	: /* empty */		{ $$ = (int) 0; }
+	| modifiers
+	;
+
+modifiers
+	: modifier
+	| modifiers modifier
+	  { 
+		int m1 = (int) $1;
+		int m2 = (int) $2;
+
+		if ((m1 & m2) != 0) {
+			Location l = lexer.Location;
+			Report.Error (1004, l, "Duplicate modifier: `" + Modifiers.Name (m2) + "'");
+		}
+		$$ = (int) (m1 | m2);
+	  }
+        ;
+
+modifier
+	: NEW			{ $$ = Modifiers.NEW; }
+	| PUBLIC		{ $$ = Modifiers.PUBLIC; }
+	| PROTECTED		{ $$ = Modifiers.PROTECTED; }
+	| INTERNAL		{ $$ = Modifiers.INTERNAL; }
+	| PRIVATE		{ $$ = Modifiers.PRIVATE; }
+	| ABSTRACT		{ $$ = Modifiers.ABSTRACT; }
+	| SEALED		{ $$ = Modifiers.SEALED; }
+	| STATIC		{ $$ = Modifiers.STATIC; }
+	| READONLY		{ $$ = Modifiers.READONLY; }
+	| VIRTUAL		{ $$ = Modifiers.VIRTUAL; }
+	| OVERRIDE 		{ $$ = Modifiers.OVERRIDE; }
+	| EXTERN		{ $$ = Modifiers.EXTERN; }
+	| VOLATILE		{ $$ = Modifiers.VOLATILE; }
+	| UNSAFE		{ $$ = Modifiers.UNSAFE; }
+	;
+
+opt_class_base
+	: /* empty */		{ $$ = null; }
+	| class_base		{ $$ = $1;   }
+	;
+
+class_base
+	: COLON type_list { $$ = $2; }
+	;
+
+//
+// Statements (8.2)
+//
+
+//
+// A block is "contained" on the following places:
+//	method_body
+//	property_declaration as part of the accessor body (get/set)
+//      operator_declaration
+//	constructor_declaration
+//	destructor_declaration
+//	event_declaration as part of add_accessor_declaration or remove_accessor_declaration
+//      
+block
+	: OPEN_BRACE 
+	  {
+		current_block = new Block (current_block, current_local_parameters,
+					   lexer.Location, Location.Null);
+	  } 
+	  opt_statement_list CLOSE_BRACE 
+	  { 
+		while (current_block.Implicit)
+			current_block = current_block.Parent;
+		$$ = current_block;
+		current_block.SetEndLocation (lexer.Location);
+		current_block = current_block.Parent;
+	  }
+	;
+
+opt_statement_list
+	: /* empty */
+	| statement_list 
+	;
+
+statement_list
+	: statement
+	| statement_list statement
+	;
+
+statement
+	: declaration_statement
+	  {
+		if ((Block) $1 != current_block){
+			current_block.AddStatement ((Statement) $1);
+			current_block = (Block) $1;
+		}
+	  }
+	| embedded_statement
+	  {
+		Statement s = (Statement) $1;
+
+
+		current_block.AddStatement ((Statement) $1);
+	  }
+	| labeled_statement
+	;
+
+embedded_statement
+	: block
+	| empty_statement
+        | expression_statement
+	| selection_statement
+	| iteration_statement
+	| jump_statement		  
+	| try_statement
+	| checked_statement
+	| unchecked_statement
+	| lock_statement
+	| using_statement
+	| unsafe_statement
+	| fixed_statement
+	;
+
+empty_statement
+	: SEMICOLON
+	  {
+		  $$ = new EmptyStatement ();
+	  }
+	;
+
+labeled_statement
+	: IDENTIFIER COLON 
+	  {
+		LabeledStatement labeled = new LabeledStatement ((string) $1, lexer.Location);
+
+		if (!current_block.AddLabel ((string) $1, labeled)){
+			Location l = lexer.Location;
+			Report.Error (140, l, "The label '" + ((string) $1) + "' is a duplicate");
+		}	
+		current_block.AddStatement (labeled);
+	  }
+	  statement
+	;
+
+declaration_statement
+	: local_variable_declaration SEMICOLON
+	  {
+		DictionaryEntry de = (DictionaryEntry) $1;
+
+		$$ = declare_local_variables ((Expression) de.Key, (ArrayList) de.Value, lexer.Location);
+	  }
+
+	| local_constant_declaration SEMICOLON
+	  {
+		DictionaryEntry de = (DictionaryEntry) $1;
+
+		$$ = declare_local_constant ((Expression) de.Key, (VariableDeclaration) de.Value);
+	  }
+	;
+
+/* 
+ * The following is from Rhys' grammar:
+ * > Types in local variable declarations must be recognized as 
+ * > expressions to prevent reduce/reduce errors in the grammar.
+ * > The expressions are converted into types during semantic analysis.
+ */
+local_variable_type
+	: primary_expression opt_rank_specifier
+	  { 
+		// FIXME: Do something smart here regarding the composition of the type.
+
+		// Ok, the above "primary_expression" is there to get rid of
+		// both reduce/reduce and shift/reduces in the grammar, it should
+		// really just be "type_name".  If you use type_name, a reduce/reduce
+		// creeps up.  If you use qualified_identifier (which is all we need
+		// really) two shift/reduces appear.
+		// 
+
+		// So the super-trick is that primary_expression
+		// can only be either a SimpleName or a MemberAccess. 
+		// The MemberAccess case arises when you have a fully qualified type-name like :
+		// Foo.Bar.Blah i;
+		// SimpleName is when you have
+		// Blah i;
+		  
+		Expression expr = (Expression) $1;  
+		if (!(expr is SimpleName || expr is MemberAccess)) {
+			Location l = lexer.Location;
+			Report.Error (-1, l, "Invalid Type definition");
+			$$ = TypeManager.system_object_expr;
+		}
+		
+		//
+		// So we extract the string corresponding to the SimpleName
+		// or MemberAccess
+		// 
+		if ((string) $2 == "")
+			$$ = $1;
+		else
+			$$ = new ComposedCast ((Expression) $1, (string) $2, lexer.Location);
+	  }
+	| builtin_types opt_rank_specifier
+	  {
+		if ((string) $2 == "")
+			$$ = $1;
+		else
+			$$ = new ComposedCast ((Expression) $1, (string) $2, lexer.Location);
+	  }
+        ;
+
+local_variable_pointer_type
+	: primary_expression STAR
+	  {
+		Expression expr = (Expression) $1;  
+		if (!(expr is SimpleName || expr is MemberAccess)) {
+			Location l = lexer.Location;
+			Report.Error (-1, l, "Invalid Type definition");
+			$$ = "System.Object";
+		}
+		
+		$$ = new ComposedCast ((Expression) $1, "*", lexer.Location);
+	  }
+        | builtin_types STAR
+	  {
+		$$ = new ComposedCast ((Expression) $1, "*", lexer.Location);;
+	  }
+        | VOID STAR
+	  {
+		$$ = new ComposedCast (TypeManager.system_void_expr, "*", lexer.Location);;
+	  }
+	| local_variable_pointer_type STAR
+          {
+		$$ = new ComposedCast ((Expression) $1, "*", lexer.Location);
+	  }
+        ;
+
+local_variable_declaration
+	: local_variable_type variable_declarators
+	  {
+		$$ = new DictionaryEntry ($1, $2);
+	  }
+        | local_variable_pointer_type opt_rank_specifier variable_declarators
+	{
+		Expression t;
+
+		if ((string) $2 == "")
+			t = (Expression) $1;
+		else
+			t = new ComposedCast ((Expression) $1, (string) $2, lexer.Location);
+		$$ = new DictionaryEntry (t, $3);
+	}
+ 	;
+
+local_constant_declaration
+	: CONST local_variable_type constant_declarator
+	  {
+		$$ = new DictionaryEntry ($2, $3);
+	  }
+	;
+
+expression_statement
+	: statement_expression SEMICOLON
+	  {
+		$$ = $1;
+	  }
+	;
+
+	//
+	// We have to do the wrapping here and not in the case above,
+	// because statement_expression is used for example in for_statement
+	//
+statement_expression
+	: invocation_expression		{ $$ = new StatementExpression ((ExpressionStatement) $1, lexer.Location); }
+	| object_creation_expression	{ $$ = new StatementExpression ((ExpressionStatement) $1, lexer.Location); }
+	| assignment_expression		{ $$ = new StatementExpression ((ExpressionStatement) $1, lexer.Location); }
+	| post_increment_expression	{ $$ = new StatementExpression ((ExpressionStatement) $1, lexer.Location); }
+	| post_decrement_expression	{ $$ = new StatementExpression ((ExpressionStatement) $1, lexer.Location); }
+	| pre_increment_expression	{ $$ = new StatementExpression ((ExpressionStatement) $1, lexer.Location); }
+	| pre_decrement_expression	{ $$ = new StatementExpression ((ExpressionStatement) $1, lexer.Location); }
+	| error {
+		Report.Error (1002, lexer.Location, "Expecting `;'");
+	  }
+	;
+
+object_creation_expression
+	: object_or_delegate_creation_expression
+	  { note ("complain if this is a delegate maybe?"); } 
+	;
+
+selection_statement
+	: if_statement
+	| switch_statement
+	; 
+
+if_statement
+	: if_statement_open if_statement_rest
+	  {
+		$$ = $2;
+	  }
+	;
+
+if_statement_open
+	: IF OPEN_PARENS 
+	  {
+	   	oob_stack.Push (lexer.Location);
+	  }
+	;
+
+if_statement_rest
+	: boolean_expression CLOSE_PARENS 
+	  embedded_statement
+	  { 
+		Location l = (Location) oob_stack.Pop ();
+
+		$$ = new If ((Expression) $1, (Statement) $3, l);
+
+		if (RootContext.WarningLevel >= 3){
+			if ($3 is EmptyStatement)
+				Report.Warning (642, lexer.Location, "Possibly mistaken empty statement");
+		}
+
+	  }
+	| boolean_expression CLOSE_PARENS
+	  embedded_statement ELSE embedded_statement
+	  {
+		Location l = (Location) oob_stack.Pop ();
+
+		$$ = new If ((Expression) $1, (Statement) $3, (Statement) $5, l);
+	  }
+	;
+
+switch_statement
+	: SWITCH OPEN_PARENS 
+	  { 
+		oob_stack.Push (lexer.Location);
+		switch_stack.Push (current_block);
+	  }
+	  expression CLOSE_PARENS 
+	  switch_block
+	  {
+		$$ = new Switch ((Expression) $4, (ArrayList) $6, (Location) oob_stack.Pop ());
+		current_block = (Block) switch_stack.Pop ();
+	  }
+	;
+
+switch_block
+	: OPEN_BRACE
+	  opt_switch_sections
+	  CLOSE_BRACE
+	  {
+		$$ = $2;
+	  }
+	;
+
+opt_switch_sections
+	: /* empty */ 		
+          {
+	  	Report.Error (1522, lexer.Location, "Empty switch block"); 
+	  }
+	| switch_sections
+	;
+
+switch_sections
+	: switch_section 
+	  {
+		ArrayList sections = new ArrayList ();
+
+		sections.Add ($1);
+		$$ = sections;
+	  }
+	| switch_sections switch_section
+	  {
+		ArrayList sections = (ArrayList) $1;
+
+		sections.Add ($2);
+		$$ = sections;
+	  }
+	;
+
+switch_section
+	: switch_labels
+	  {
+		current_block = new Block (current_block);
+	  }
+ 	  statement_list 
+	  {
+		while (current_block.Implicit)
+			current_block = current_block.Parent;
+		$$ = new SwitchSection ((ArrayList) $1, current_block);
+	  }
+	;
+
+switch_labels
+	: switch_label 
+	  {
+		ArrayList labels = new ArrayList ();
+
+		labels.Add ($1);
+		$$ = labels;
+	  }
+	| switch_labels switch_label 
+	  {
+		ArrayList labels = (ArrayList) ($1);
+		labels.Add ($2);
+
+		$$ = labels;
+	  }
+	;
+
+switch_label
+	: CASE constant_expression COLON 	{ $$ = new SwitchLabel ((Expression) $2, lexer.Location); }
+	| DEFAULT COLON				{ $$ = new SwitchLabel (null, lexer.Location); }
+	| error {
+		Report.Error (
+			1523, lexer.Location, 
+			"The keyword case or default must precede code in switch block");
+	  }
+	;
+
+iteration_statement
+	: while_statement
+	| do_statement
+	| for_statement
+	| foreach_statement
+	;
+
+while_statement
+	: WHILE OPEN_PARENS 
+	{
+		oob_stack.Push (lexer.Location);
+	}
+	boolean_expression CLOSE_PARENS embedded_statement
+	{
+		Location l = (Location) oob_stack.Pop ();
+		$$ = new While ((Expression) $4, (Statement) $6, l);
+	
+		if (RootContext.WarningLevel >= 3){
+			if ($6 is EmptyStatement)
+				Report.Warning (642, lexer.Location, "Possibly mistaken empty statement");
+		}
+	}
+	;
+
+do_statement
+	: DO embedded_statement 
+	  WHILE OPEN_PARENS boolean_expression CLOSE_PARENS SEMICOLON
+	  {
+		$$ = new Do ((Statement) $2, (Expression) $5, lexer.Location);
+	  }
+	;
+
+for_statement
+	: FOR OPEN_PARENS 
+	  opt_for_initializer SEMICOLON
+	  {
+		Block assign_block = new Block (current_block);
+		current_block = assign_block;
+
+		if ($3 is DictionaryEntry){
+			DictionaryEntry de = (DictionaryEntry) $3;
+			
+			Expression type = (Expression) de.Key;
+			ArrayList var_declarators = (ArrayList) de.Value;
+
+			foreach (VariableDeclaration decl in var_declarators){
+
+				VariableInfo vi;
+
+				vi = current_block.AddVariable (
+					type, decl.identifier, current_local_parameters, decl.Location);
+				if (vi == null)
+					continue;
+
+				Location l = lexer.Location;
+				Expression expr;
+				if (decl.expression_or_array_initializer is Expression){
+					expr = (Expression) decl.expression_or_array_initializer;
+				} else {
+					ArrayList init = (ArrayList) decl.expression_or_array_initializer;
+					expr = new ArrayCreation (type, "", init, decl.Location);
+				}
+					
+				LocalVariableReference var;
+				var = new LocalVariableReference (assign_block, decl.identifier, l);
+					
+				Assign a = new Assign (var, expr, decl.Location);
+					
+				assign_block.AddStatement (new StatementExpression (a, lexer.Location));
+			}
+			
+			$3 = null;
+		} 
+		oob_stack.Push (lexer.Location);
+	  } 
+	  opt_for_condition SEMICOLON
+	  opt_for_iterator CLOSE_PARENS 
+	  embedded_statement
+	  {
+		Location l = (Location) oob_stack.Pop ();
+
+		For f = new For ((Statement) $3, (Expression) $6, (Statement) $8, (Statement) $10, l);
+
+		if (RootContext.WarningLevel >= 3){
+			if ($10 is EmptyStatement)
+				Report.Warning (642, lexer.Location, "Possibly mistaken empty statement");
+		}
+
+		current_block.AddStatement (f);
+		while (current_block.Implicit)
+			current_block = current_block.Parent;
+		$$ = current_block;
+		current_block = current_block.Parent;
+	  }
+	;
+
+opt_for_initializer
+	: /* empty */		{ $$ = new EmptyStatement (); }
+	| for_initializer	
+	;
+
+for_initializer
+	: local_variable_declaration
+	| statement_expression_list
+	;
+
+opt_for_condition
+	: /* empty */		{ $$ = null; }
+	| boolean_expression
+	;
+
+opt_for_iterator
+	: /* empty */		{ $$ = new EmptyStatement (); }
+	| for_iterator
+	;
+
+for_iterator
+	: statement_expression_list
+	;
+
+statement_expression_list
+	: statement_expression	
+	  {
+		// CHANGE: was `null'
+		Block b = new Block (current_block, true);   
+
+		b.AddStatement ((Statement) $1);
+		$$ = b;
+	  }
+	| statement_expression_list COMMA statement_expression
+	  {
+		Block b = (Block) $1;
+
+		b.AddStatement ((Statement) $3);
+		$$ = $1;
+	  }
+	;
+
+foreach_statement
+	: FOREACH OPEN_PARENS type IDENTIFIER IN 
+	  {
+		oob_stack.Push (lexer.Location);
+	  }
+	  expression CLOSE_PARENS 
+	  {
+		oob_stack.Push (current_block);
+
+		Block foreach_block = new Block (current_block, true);
+		LocalVariableReference v = null;
+		Location l = lexer.Location;
+		VariableInfo vi;
+
+		vi = foreach_block.AddVariable ((Expression) $3, (string) $4, current_local_parameters, l);
+		if (vi != null) {
+			vi.ReadOnly = true;
+
+			// Get a writable reference to this read-only variable.
+			v = new LocalVariableReference (foreach_block, (string) $4, l, vi, false);
+		}
+		current_block = foreach_block;
+
+		oob_stack.Push (v);
+		oob_stack.Push (current_block);
+	  } 
+	  embedded_statement 
+	  {
+		Block foreach_block = (Block) oob_stack.Pop ();
+		LocalVariableReference v = (LocalVariableReference) oob_stack.Pop ();
+		Block prev_block = (Block) oob_stack.Pop ();
+		Location l = (Location) oob_stack.Pop ();
+
+		current_block = prev_block;
+
+		if (v != null) {
+			Foreach f = new Foreach ((Expression) $3, v, (Expression) $7, (Statement) $10, l);
+			foreach_block.AddStatement (f);
+		}
+
+		$$ = foreach_block;
+	  }
+	;
+
+jump_statement
+	: break_statement
+	| continue_statement
+	| goto_statement
+	| return_statement
+	| throw_statement
+	;
+
+break_statement
+	: BREAK SEMICOLON
+	  {
+		$$ = new Break (lexer.Location);
+	  }
+	;
+
+continue_statement
+	: CONTINUE SEMICOLON
+	  {
+		$$ = new Continue (lexer.Location);
+	  }
+	;
+
+goto_statement
+	: GOTO IDENTIFIER SEMICOLON 
+	  {
+		$$ = new Goto (current_block, (string) $2, lexer.Location);
+	  }
+	| GOTO CASE constant_expression SEMICOLON
+	  {
+		$$ = new GotoCase ((Expression) $3, lexer.Location);
+	  }
+	| GOTO DEFAULT SEMICOLON 
+	  {
+		$$ = new GotoDefault (lexer.Location);
+	  }
+	; 
+
+return_statement
+	: RETURN opt_expression SEMICOLON
+	  {
+		$$ = new Return ((Expression) $2, lexer.Location);
+	  }
+	;
+
+throw_statement
+	: THROW opt_expression SEMICOLON
+	  {
+		$$ = new Throw ((Expression) $2, lexer.Location);
+	  }
+	;
+
+opt_expression
+	: /* empty */
+	| expression
+	;
+
+try_statement
+	: TRY block catch_clauses 
+	{
+		Catch g = null;
+		ArrayList s = new ArrayList ();
+		
+		foreach (Catch cc in (ArrayList) $3) {
+			if (cc.IsGeneral)
+				g = cc;
+			else
+				s.Add (cc);
+		}
+
+		// Now s contains the list of specific catch clauses
+		// and g contains the general one.
+		
+		$$ = new Try ((Block) $2, s, g, null, lexer.Location);
+	}
+	| TRY block opt_catch_clauses FINALLY block
+	  {
+		Catch g = null;
+		ArrayList s = new ArrayList ();
+		ArrayList catch_list = (ArrayList) $3;
+
+		if (catch_list != null){
+			foreach (Catch cc in catch_list) {
+				if (cc.IsGeneral)
+					g = cc;
+				else
+					s.Add (cc);
+			}
+		}
+
+		$$ = new Try ((Block) $2, s, g, (Block) $5, lexer.Location);
+	  }
+	| TRY block error 
+	  {
+		Report.Error (1524, lexer.Location, "Expected catch or finally");
+	  }
+	;
+
+opt_catch_clauses
+	: /* empty */  { $$ = null; }
+        | catch_clauses
+	;
+
+catch_clauses
+	: catch_clause 
+	  {
+		ArrayList l = new ArrayList ();
+
+		l.Add ($1);
+		$$ = l;
+	  }
+	| catch_clauses catch_clause
+	  {
+		ArrayList l = (ArrayList) $1;
+
+		l.Add ($2);
+		$$ = l;
+	  }
+	;
+
+opt_identifier
+	: /* empty */	{ $$ = null; }
+	| IDENTIFIER
+	;
+
+catch_clause 
+	: CATCH opt_catch_args 
+	{
+		Expression type = null;
+		string id = null;
+		
+		if ($2 != null) {
+			DictionaryEntry cc = (DictionaryEntry) $2;
+			type = (Expression) cc.Key;
+			id   = (string) cc.Value;
+
+			if (id != null){
+				ArrayList one = new ArrayList ();
+				Location loc = lexer.Location;
+
+				one.Add (new VariableDeclaration (id, null, loc));
+
+				$1 = current_block;
+				current_block = new Block (current_block);
+				Block b = declare_local_variables (type, one, loc);
+				current_block = b;
+			}
+		}
+	} block {
+		Expression type = null;
+		string id = null;
+
+		if ($2 != null){
+			DictionaryEntry cc = (DictionaryEntry) $2;
+			type = (Expression) cc.Key;
+			id   = (string) cc.Value;
+
+			if ($1 != null){
+				//
+				// FIXME: I can change this for an assignment.
+				//
+				while (current_block != (Block) $1)
+					current_block = current_block.Parent;
+			}
+		}
+
+
+		$$ = new Catch (type, id , (Block) $4, lexer.Location);
+	}
+        ;
+
+opt_catch_args
+	: /* empty */ { $$ = null; }
+        | catch_args
+	;	  
+
+catch_args 
+        : OPEN_PARENS type opt_identifier CLOSE_PARENS 
+        {
+		$$ = new DictionaryEntry ($2, $3);
+	}
+        ;
+
+checked_statement
+	: CHECKED block
+	  {
+		$$ = new Checked ((Block) $2);
+	  }
+	;
+
+unchecked_statement
+	: UNCHECKED block
+	  {
+		$$ = new Unchecked ((Block) $2);
+	  }
+	;
+
+unsafe_statement
+	: UNSAFE 
+	{
+		if (!RootContext.Unsafe){
+			Report.Error (227, lexer.Location, 
+				"Unsafe code can only be used if --unsafe is used");
+		}
+	} block {
+		$$ = new Unsafe ((Block) $3);
+	}
+	;
+
+fixed_statement
+	: FIXED OPEN_PARENS 
+	  pointer_type fixed_pointer_declarators 
+	  CLOSE_PARENS 
+	  {
+		Block assign_block = new Block (current_block, true);
+		ArrayList list = (ArrayList) $4;
+		Expression type = (Expression) $3;
+		Location l = lexer.Location;
+		int top = list.Count;
+
+		for (int i = 0; i < top; i++){
+			Pair p = (Pair) list [i];
+			VariableInfo v;
+
+			v = current_block.AddVariable (type, (string) p.First,current_local_parameters, l);
+			if (v == null)
+				continue;
+			v.ReadOnly = true;
+			p.First = v;
+			list [i] = p;
+		}
+		current_block.AddStatement (assign_block);
+		current_block = assign_block;
+		oob_stack.Push (assign_block);
+		oob_stack.Push (l);
+	  }
+	  embedded_statement 
+	  {
+		Location l = (Location) oob_stack.Pop ();
+		Block assign_block = (Block) oob_stack.Pop ();
+
+		ArrayList list = (ArrayList) $4;
+		int top = list.Count;
+
+		$$ = new Fixed ((Expression) $3, (ArrayList) $4, (Statement) $7, l);
+	  }
+	;
+
+fixed_pointer_declarators
+	: fixed_pointer_declarator	{ 
+	   	ArrayList declarators = new ArrayList (); 
+		declarators.Add ($1);
+		$$ = declarators;
+	  }
+	| fixed_pointer_declarators COMMA fixed_pointer_declarator
+	  {
+		ArrayList declarators = (ArrayList) $1;
+		declarators.Add ($3);
+		$$ = declarators;
+	  }
+	;
+
+fixed_pointer_declarator
+	: IDENTIFIER ASSIGN expression
+	  {	
+		$$ = new Pair ($1, $3);
+	  }
+	;
+
+lock_statement
+	: LOCK OPEN_PARENS expression CLOSE_PARENS 
+	  {
+		//
+ 	  } 
+	  embedded_statement
+	  {
+		$$ = new Lock ((Expression) $3, (Statement) $6, lexer.Location);
+	  }
+	;
+
+using_statement
+	: USING OPEN_PARENS resource_acquisition CLOSE_PARENS 
+	  {
+		Block assign_block = new Block (current_block);
+		current_block = assign_block;
+
+		oob_stack.Push (lexer.Location);
+		
+		if ($3 is DictionaryEntry){
+			DictionaryEntry de = (DictionaryEntry) $3;
+			Location l = lexer.Location;
+
+			Expression type = (Expression) de.Key;
+			ArrayList var_declarators = (ArrayList) de.Value;
+
+			ArrayList vars = new ArrayList ();
+
+			foreach (VariableDeclaration decl in var_declarators){
+
+				VariableInfo vi	= current_block.AddVariable (
+					type, decl.identifier, 
+					current_local_parameters, decl.Location);
+				if (vi == null)
+					continue;
+				vi.ReadOnly = true;
+
+				Expression expr;
+				if (decl.expression_or_array_initializer is Expression){
+					expr = (Expression) decl.expression_or_array_initializer;
+				} else {
+					ArrayList init = (ArrayList) decl.expression_or_array_initializer;
+					
+					expr = new ArrayCreation (type, "", init, decl.Location);
+				}
+
+				LocalVariableReference var;
+
+				// Get a writable reference to this read-only variable.
+				var = new LocalVariableReference (assign_block, decl.identifier, l, vi, false);
+
+				// This is so that it is not a warning on using variables
+				vi.Used = true;
+
+				vars.Add (new DictionaryEntry (var, expr));				
+
+				// Assign a = new Assign (var, expr, decl.Location);
+				// assign_block.AddStatement (new StatementExpression (a, lexer.Location));
+			}
+			$3 = new DictionaryEntry (type, vars);
+		 }
+	  } 
+	  embedded_statement
+	  {
+		Using u = new Using ($3, (Statement) $6, (Location) oob_stack.Pop ());
+		current_block.AddStatement (u);
+		while (current_block.Implicit)
+			current_block = current_block.Parent;
+		$$ = current_block;
+		current_block = current_block.Parent;
+	  }
+	; 
+
+resource_acquisition
+	: local_variable_declaration
+	| expression
+	;
+
+%%
+
+// <summary>
+//   A class used to pass around variable declarations and constants
+// </summary>
+public class VariableDeclaration {
+	public string identifier;
+	public object expression_or_array_initializer;
+	public Location Location;
+	public Attributes OptAttributes;
+
+	public VariableDeclaration (string id, object eoai, Location l, Attributes opt_attrs)
+	{
+		this.identifier = id;
+		this.expression_or_array_initializer = eoai;
+		this.Location = l;
+		this.OptAttributes = opt_attrs;
+	}
+
+	public VariableDeclaration (string id, object eoai, Location l) : this (id, eoai, l, null)
+	{
+	}
+}
+
+// <summary>
+//   A class used to hold info about an indexer declarator
+// </summary>
+
+public class IndexerDeclaration {
+	public Expression type;
+	public string interface_type;
+	public Parameters param_list;
+
+	public IndexerDeclaration (Expression type, string interface_type, Parameters param_list)
+	{
+		this.type = type;
+		this.interface_type = interface_type;
+		this.param_list = param_list;
+	}
+}
+
+// <summary>
+//  A class used to hold info about an operator declarator
+// </summary>
+
+public class OperatorDeclaration {
+	public Operator.OpType optype;
+	public Expression ret_type, arg1type, arg2type;
+	public string arg1name, arg2name;
+	public Location location;
+
+	public OperatorDeclaration (Operator.OpType op, Expression ret_type, 
+				    Expression arg1type, string arg1name,
+				    Expression arg2type, string arg2name, Location location)
+	{
+		optype = op;
+		this.ret_type = ret_type;
+		this.arg1type = arg1type;
+		this.arg1name = arg1name;
+		this.arg2type = arg2type;
+		this.arg2name = arg2name;
+		this.location = location;
+	}
+
+}
+
+// <summary>
+//   Given the @class_name name, it creates a fully qualified name
+//   based on the containing declaration space
+// </summary>
+string 
+MakeName (string class_name)
+{
+	string ns = current_namespace.Name;
+	string container_name = current_container.Name;
+
+	if (container_name == ""){
+		if (ns != "")
+			return ns + "." + class_name;
+		else
+			return class_name;
+	} else
+		return container_name + "." + class_name;
+}
+
+// <summary>
+//   Used to report back to the user the result of a declaration
+//   in the current declaration space
+// </summary>
+void 
+CheckDef (AdditionResult result, string name, Location l)
+{
+	if (result == AdditionResult.Success)
+		return;
+
+	switch (result){
+	case AdditionResult.NameExists:
+		Report.Error (102, l, "The container `" + current_container.Name + 
+				 "' already contains a definition for `"+
+				 name + "'");
+		break;
+
+
+		//
+		// This is handled only for static Constructors, because
+		// in reality we handle these by the semantic analysis later
+		//
+ 	case AdditionResult.MethodExists:
+  		Report.Error (
+			111, l, "Class `"+current_container.Name+
+  			"' already defines a member called '" + 
+  			name + "' with the same parameter types (more than one default constructor)");
+  		break;
+
+	case AdditionResult.EnclosingClash:
+		Report.Error (542, l, "Member names cannot be the same as their enclosing type");
+		break;
+		
+	case AdditionResult.NotAConstructor:
+		Report.Error (1520, l, "Class, struct, or interface method must have a return type");
+		break;
+	}
+}
+
+void 
+CheckDef (bool result, string name, Location l)
+{
+	if (result)
+		return;
+	CheckDef (AdditionResult.NameExists, name, l);
+}
+
+Expression DecomposeQI (string name, Location loc)
+{
+	Expression o;
+
+	if (name.IndexOf ('.') == -1){
+		return new SimpleName (name, loc);
+	} else {
+		int pos = name.LastIndexOf (".");
+		string left = name.Substring (0, pos);
+		string right = name.Substring (pos + 1);
+
+		o = DecomposeQI (left, loc);
+
+		return new MemberAccess (o, right, loc);
+	}
+}
+
+// <summary>
+//  This method is used to get at the complete string representation of
+//  a fully-qualified type name, hiding inside a MemberAccess ;-)
+//  This is necessary because local_variable_type admits primary_expression
+//  as the type of the variable. So we do some extra checking
+// </summary>
+string GetQualifiedIdentifier (Expression expr)
+{
+	if (expr is SimpleName)
+		return ((SimpleName)expr).Name;
+	else if (expr is MemberAccess)
+		return GetQualifiedIdentifier (((MemberAccess)expr).Expr) + "." + ((MemberAccess) expr).Identifier;
+	else 
+		throw new Exception ("Expr has to be either SimpleName or MemberAccess! (" + expr + ")");
+	
+}
+
+Block declare_local_variables (Expression type, ArrayList variable_declarators, Location loc)
+{
+	Block implicit_block;
+	ArrayList inits = null;
+
+	//
+	// We use the `Used' property to check whether statements
+	// have been added to the current block.  If so, we need
+	// to create another block to contain the new declaration
+	// otherwise, as an optimization, we use the same block to
+	// add the declaration.
+	//
+	// FIXME: A further optimization is to check if the statements
+	// that were added were added as part of the initialization
+	// below.  In which case, no other statements have been executed
+	// and we might be able to reduce the number of blocks for
+	// situations like this:
+	//
+	// int j = 1;  int k = j + 1;
+	//
+	if (current_block.Used) {
+		implicit_block = new Block (current_block, true, loc, Location.Null);
+		implicit_block.AddChildVariableNames (current_block);
+	} else
+		implicit_block = current_block;
+
+	foreach (VariableDeclaration decl in variable_declarators){
+
+		if (implicit_block.AddVariable (type, decl.identifier, current_local_parameters, decl.Location) != null) {
+			if (decl.expression_or_array_initializer != null){
+				if (inits == null)
+					inits = new ArrayList ();
+				inits.Add (decl);
+			}
+		}
+	}
+
+	if (inits == null)
+		return implicit_block;
+
+	foreach (VariableDeclaration decl in inits){
+		Assign assign;
+		Expression expr;
+		
+		if (decl.expression_or_array_initializer is Expression){
+			expr = (Expression) decl.expression_or_array_initializer;
+
+		} else {
+			ArrayList init = (ArrayList) decl.expression_or_array_initializer;
+			
+			expr = new ArrayCreation (type, "", init, decl.Location);
+		}
+
+		LocalVariableReference var;
+		var = new LocalVariableReference (implicit_block, decl.identifier, loc);
+
+		assign = new Assign (var, expr, decl.Location);
+
+		implicit_block.AddStatement (new StatementExpression (assign, lexer.Location));
+	}
+	
+	return implicit_block;
+}
+
+Block declare_local_constant (Expression type, VariableDeclaration decl)
+{
+	Block implicit_block;
+
+	if (current_block.Used)
+		implicit_block = new Block (current_block, true);
+	else
+		implicit_block = current_block;
+
+	if (!(implicit_block.AddConstant (type, decl.identifier, (Expression) decl.expression_or_array_initializer,
+					  current_local_parameters, decl.Location))){
+	}
+	
+	return implicit_block;
+}
+
+void CheckAttributeTarget (string a)
+{
+	switch (a) {
+
+	case "assembly" : case "field" : case "method" : case "param" : case "property" : case "type" :
+		return;
+		
+	default :
+		Location l = lexer.Location;
+		Report.Error (658, l, "`" + a + "' is an invalid attribute target");
+		break;
+	}
+
+}
+
+void CheckUnaryOperator (Operator.OpType op)
+{
+	switch (op) {
+		
+	case Operator.OpType.LogicalNot: 
+	case Operator.OpType.OnesComplement: 
+	case Operator.OpType.Increment:
+	case Operator.OpType.Decrement:
+	case Operator.OpType.True: 
+	case Operator.OpType.False: 
+	case Operator.OpType.Addition: 
+	case Operator.OpType.Subtraction:
+		
+		break;
+		
+	default :
+		Location l = lexer.Location;
+		Report.Error (1019, l, "Overloadable unary operator expected"); 
+		break;
+		
+	}
+}
+
+void CheckBinaryOperator (Operator.OpType op)
+{
+	switch (op) {
+		
+	case Operator.OpType.Addition: 
+	case Operator.OpType.Subtraction: 
+	case Operator.OpType.Multiply:
+	case Operator.OpType.Division:
+	case Operator.OpType.Modulus: 
+	case Operator.OpType.BitwiseAnd: 
+	case Operator.OpType.BitwiseOr:
+	case Operator.OpType.ExclusiveOr: 
+	case Operator.OpType.LeftShift: 
+	case Operator.OpType.RightShift:
+	case Operator.OpType.Equality: 
+	case Operator.OpType.Inequality:
+	case Operator.OpType.GreaterThan: 
+	case Operator.OpType.LessThan: 
+	case Operator.OpType.GreaterThanOrEqual:
+	case Operator.OpType.LessThanOrEqual:
+		break;
+		
+	default :
+		Location l = lexer.Location;
+		Report.Error (1020, l, "Overloadable binary operator expected");
+		break;
+	}
+	
+}
+
+void syntax_error (Location l, string msg)
+{
+	Report.Error (1003, l, "Syntax error, " + msg);
+}
+
+void output (string s)
+{
+	Console.WriteLine (s);
+}
+
+void note (string s)
+{
+	// Used to put annotations
+}
+
+Tokenizer lexer;
+
+public Tokenizer Lexer {
+	get {
+		return lexer;
+	}
+}		   
+
+public CSharpParser (string name, System.IO.Stream input, ArrayList defines)
+{
+	current_namespace = new Namespace (null, "");
+	this.name = name;
+	this.input = input;
+	current_container = RootContext.Tree.Types;
+	current_container.Namespace = current_namespace;
+	oob_stack = new Stack ();
+	switch_stack = new Stack ();
+
+	lexer = new Tokenizer (input, name, defines);
+}
+
+public override void parse ()
+{
+	try {
+		if (yacc_verbose_flag)
+			yyparse (lexer, new yydebug.yyDebugSimple ());
+		else
+			yyparse (lexer);
+	} catch (Exception e){
+		// Please do not remove this, it is used during debugging
+		// of the grammar
+		//
+		Console.WriteLine (lexer.location + "  : Parsing error ");
+		Console.WriteLine (e);
+	}
+}
+
+/* end end end */
+}
diff --git a/mcs/mcs/cs-tokenizer.cs b/mcs/mcs/cs-tokenizer.cs
new file mode 100755
index 00000000000..5cecc98b7a7
--- /dev/null
+++ b/mcs/mcs/cs-tokenizer.cs
@@ -0,0 +1,1607 @@
+//

+// cs-tokenizer.cs: The Tokenizer for the C# compiler

+//                  This also implements the preprocessor

+//

+// Author: Miguel de Icaza (miguel@gnu.org)

+//

+// Licensed under the terms of the GNU GPL

+//

+// (C) 2001 Ximian, Inc (http://www.ximian.com)

+//

+

+/*

+ * TODO:

+ *   Make sure we accept the proper Unicode ranges, per the spec.

+ *   Report error 1032

+*/

+

+using System;

+using System.Text;

+using System.Collections;

+using System.IO;

+using System.Globalization;

+

+namespace Mono.CSharp

+{

+	/// <summary>

+	///    Tokenizer for C# source code. 

+	/// </summary>

+

+	public class Tokenizer : yyParser.yyInput

+	{

+		StreamReader reader;

+		public string ref_name;

+		public int ref_line = 1;

+		public int line = 1;

+		public int col = 1;

+		public int current_token;

+		bool handle_get_set = false;

+		bool handle_remove_add = false;

+		bool handle_assembly = false;

+

+		//

+		// Whether tokens have been seen on this line

+		//

+		bool tokens_seen = false;

+

+		//

+		// Whether a token has been seen on the file

+		// This is needed because `define' is not allowed to be used

+		// after a token has been seen.

+		//

+		bool any_token_seen = false;

+		

+		//

+		// Returns a verbose representation of the current location

+		//

+		public string location {

+			get {

+				string det;

+

+				if (current_token == Token.ERROR)

+					det = "detail: " + error_details;

+				else

+					det = "";

+				

+				// return "Line:     "+line+" Col: "+col + "\n" +

+				//       "VirtLine: "+ref_line +

+				//       " Token: "+current_token + " " + det;

+

+				return ref_name + " " + "(" + line + "," + col + "), Token:" + current_token + " " + det;

+			}

+		}

+

+		public bool PropertyParsing {

+			get {

+				return handle_get_set;

+			}

+

+			set {

+				handle_get_set = value;

+			}

+                }

+

+		public bool AssemblyTargetParsing {

+			get {

+				return handle_assembly;

+			}

+

+			set {

+				handle_assembly = value;

+			}

+		}

+

+		public bool EventParsing {

+			get {

+				return handle_remove_add;

+			}

+

+			set {

+				handle_remove_add = value;

+			}

+		}

+		

+		//

+		// Class variables

+		// 

+		static Hashtable keywords;

+		static NumberStyles styles;

+		static NumberFormatInfo csharp_format_info;

+		

+		//

+		// Values for the associated token returned

+		//

+		int putback_char;

+		Object val;

+

+		//

+		// Pre-processor

+		//

+		Hashtable defines;

+

+		const int TAKING        = 1;

+		const int TAKEN_BEFORE  = 2;

+		const int ELSE_SEEN     = 4;

+		const int PARENT_TAKING = 8;

+		

+		//

+		// pre-processor if stack state:

+		//

+		Stack ifstack;

+

+		static System.Text.StringBuilder id_builder;

+		static System.Text.StringBuilder string_builder;

+		static System.Text.StringBuilder number_builder;

+		

+		//

+		// Details about the error encoutered by the tokenizer

+		//

+		string error_details;

+		

+		public string error {

+			get {

+				return error_details;

+			}

+		}

+		

+		public int Line {

+			get {

+				return line;

+			}

+		}

+

+		public int Col {

+			get {

+				return col;

+			}

+		}

+		

+		static void InitTokens ()

+		{

+			keywords = new Hashtable ();

+

+			keywords.Add ("abstract", Token.ABSTRACT);

+			keywords.Add ("as", Token.AS);

+			keywords.Add ("add", Token.ADD);

+			keywords.Add ("assembly", Token.ASSEMBLY);

+			keywords.Add ("base", Token.BASE);

+			keywords.Add ("bool", Token.BOOL);

+			keywords.Add ("break", Token.BREAK);

+			keywords.Add ("byte", Token.BYTE);

+			keywords.Add ("case", Token.CASE);

+			keywords.Add ("catch", Token.CATCH);

+			keywords.Add ("char", Token.CHAR);

+			keywords.Add ("checked", Token.CHECKED);

+			keywords.Add ("class", Token.CLASS);

+			keywords.Add ("const", Token.CONST);

+			keywords.Add ("continue", Token.CONTINUE);

+			keywords.Add ("decimal", Token.DECIMAL);

+			keywords.Add ("default", Token.DEFAULT);

+			keywords.Add ("delegate", Token.DELEGATE);

+			keywords.Add ("do", Token.DO);

+			keywords.Add ("double", Token.DOUBLE);

+			keywords.Add ("else", Token.ELSE);

+			keywords.Add ("enum", Token.ENUM);

+			keywords.Add ("event", Token.EVENT);

+			keywords.Add ("explicit", Token.EXPLICIT);

+			keywords.Add ("extern", Token.EXTERN);

+			keywords.Add ("false", Token.FALSE);

+			keywords.Add ("finally", Token.FINALLY);

+			keywords.Add ("fixed", Token.FIXED);

+			keywords.Add ("float", Token.FLOAT);

+			keywords.Add ("for", Token.FOR);

+			keywords.Add ("foreach", Token.FOREACH);

+			keywords.Add ("goto", Token.GOTO);

+			keywords.Add ("get", Token.GET);

+			keywords.Add ("if", Token.IF);

+			keywords.Add ("implicit", Token.IMPLICIT);

+			keywords.Add ("in", Token.IN);

+			keywords.Add ("int", Token.INT);

+			keywords.Add ("interface", Token.INTERFACE);

+			keywords.Add ("internal", Token.INTERNAL);

+			keywords.Add ("is", Token.IS);

+			keywords.Add ("lock", Token.LOCK);

+			keywords.Add ("long", Token.LONG);

+			keywords.Add ("namespace", Token.NAMESPACE);

+			keywords.Add ("new", Token.NEW);

+			keywords.Add ("null", Token.NULL);

+			keywords.Add ("object", Token.OBJECT);

+			keywords.Add ("operator", Token.OPERATOR);

+			keywords.Add ("out", Token.OUT);

+			keywords.Add ("override", Token.OVERRIDE);

+			keywords.Add ("params", Token.PARAMS);

+			keywords.Add ("private", Token.PRIVATE);

+			keywords.Add ("protected", Token.PROTECTED);

+			keywords.Add ("public", Token.PUBLIC);

+			keywords.Add ("readonly", Token.READONLY);

+			keywords.Add ("ref", Token.REF);

+			keywords.Add ("remove", Token.REMOVE);

+			keywords.Add ("return", Token.RETURN);

+			keywords.Add ("sbyte", Token.SBYTE);

+			keywords.Add ("sealed", Token.SEALED);

+			keywords.Add ("set", Token.SET);

+			keywords.Add ("short", Token.SHORT);

+			keywords.Add ("sizeof", Token.SIZEOF);

+			keywords.Add ("stackalloc", Token.STACKALLOC);

+			keywords.Add ("static", Token.STATIC);

+			keywords.Add ("string", Token.STRING);

+			keywords.Add ("struct", Token.STRUCT);

+			keywords.Add ("switch", Token.SWITCH);

+			keywords.Add ("this", Token.THIS);

+			keywords.Add ("throw", Token.THROW);

+			keywords.Add ("true", Token.TRUE);

+			keywords.Add ("try", Token.TRY);

+			keywords.Add ("typeof", Token.TYPEOF);

+			keywords.Add ("uint", Token.UINT);

+			keywords.Add ("ulong", Token.ULONG);

+			keywords.Add ("unchecked", Token.UNCHECKED);

+			keywords.Add ("unsafe", Token.UNSAFE);

+			keywords.Add ("ushort", Token.USHORT);

+			keywords.Add ("using", Token.USING);

+			keywords.Add ("virtual", Token.VIRTUAL);

+			keywords.Add ("void", Token.VOID);

+			keywords.Add ("volatile", Token.VOLATILE);

+			keywords.Add ("while", Token.WHILE);

+		}

+

+		//

+		// Class initializer

+		// 

+		static Tokenizer ()

+		{

+			InitTokens ();

+			csharp_format_info = NumberFormatInfo.InvariantInfo;

+			styles = NumberStyles.Float;

+			

+			id_builder = new System.Text.StringBuilder ();

+			string_builder = new System.Text.StringBuilder ();

+			number_builder = new System.Text.StringBuilder ();

+		}

+

+		bool is_keyword (string name)

+		{

+			bool res;

+			

+			res = keywords.Contains (name);

+			if (handle_get_set == false && (name == "get" || name == "set"))

+				return false;

+			if (handle_remove_add == false && (name == "remove" || name == "add"))

+				return false;

+			if (handle_assembly == false && (name == "assembly"))

+				return false;

+			return res;

+		}

+

+		int GetKeyword (string name)

+		{

+			return (int) (keywords [name]);

+		}

+

+		public Location Location {

+			get {

+				return new Location (ref_line);

+			}

+		}

+

+		void define (string def)

+		{

+			if (!RootContext.AllDefines.Contains (def)){

+				RootContext.AllDefines [def] = true;

+			}

+			if (defines.Contains (def))

+				return;

+			defines [def] = true;

+		}

+		

+		public Tokenizer (System.IO.Stream input, string fname, ArrayList defs)

+		{

+			this.ref_name = fname;

+			reader = new System.IO.StreamReader (input);

+			putback_char = -1;

+

+			if (defs != null){

+				defines = new Hashtable ();

+				foreach (string def in defs)

+					define (def);

+			}

+

+			//

+			// FIXME: This could be `Location.Push' but we have to

+			// find out why the MS compiler allows this

+			//

+			Mono.CSharp.Location.Push (fname);

+		}

+

+		bool is_identifier_start_character (char c)

+		{

+			return Char.IsLetter (c) || c == '_' ;

+		}

+

+		bool is_identifier_part_character (char c)

+		{

+			return (Char.IsLetter (c) || Char.IsDigit (c) || c == '_');

+		}

+

+		int is_punct (char c, ref bool doread)

+		{

+			int d;

+			int t;

+

+			doread = false;

+

+			switch (c){

+			case '{':

+				return Token.OPEN_BRACE;

+			case '}':

+				return Token.CLOSE_BRACE;

+			case '[':

+				return Token.OPEN_BRACKET;

+			case ']':

+				return Token.CLOSE_BRACKET;

+			case '(':

+				return Token.OPEN_PARENS;

+			case ')':

+				return Token.CLOSE_PARENS;

+			case ',':

+				return Token.COMMA;

+			case ':':

+				return Token.COLON;

+			case ';':

+				return Token.SEMICOLON;

+			case '~':

+				return Token.TILDE;

+			case '?':

+				return Token.INTERR;

+			}

+

+			d = peekChar ();

+			if (c == '+'){

+				

+				if (d == '+')

+					t = Token.OP_INC;

+				else if (d == '=')

+					t = Token.OP_ADD_ASSIGN;

+				else

+					return Token.PLUS;

+				doread = true;

+				return t;

+			}

+			if (c == '-'){

+				if (d == '-')

+					t = Token.OP_DEC;

+				else if (d == '=')

+					t = Token.OP_SUB_ASSIGN;

+				else if (d == '>')

+					t = Token.OP_PTR;

+				else

+					return Token.MINUS;

+				doread = true;

+				return t;

+			}

+

+			if (c == '!'){

+				if (d == '='){

+					doread = true;

+					return Token.OP_NE;

+				}

+				return Token.BANG;

+			}

+

+			if (c == '='){

+				if (d == '='){

+					doread = true;

+					return Token.OP_EQ;

+				}

+				return Token.ASSIGN;

+			}

+

+			if (c == '&'){

+				if (d == '&'){

+					doread = true;

+					return Token.OP_AND;

+				} else if (d == '='){

+					doread = true;

+					return Token.OP_AND_ASSIGN;

+				}

+				return Token.BITWISE_AND;

+			}

+

+			if (c == '|'){

+				if (d == '|'){

+					doread = true;

+					return Token.OP_OR;

+				} else if (d == '='){

+					doread = true;

+					return Token.OP_OR_ASSIGN;

+				}

+				return Token.BITWISE_OR;

+			}

+

+			if (c == '*'){

+				if (d == '='){

+					doread = true;

+					return Token.OP_MULT_ASSIGN;

+				}

+				return Token.STAR;

+			}

+

+			if (c == '/'){

+				if (d == '='){

+					doread = true;

+					return Token.OP_DIV_ASSIGN;

+				}

+				return Token.DIV;

+			}

+

+			if (c == '%'){

+				if (d == '='){

+					doread = true;

+					return Token.OP_MOD_ASSIGN;

+				}

+				return Token.PERCENT;

+			}

+

+			if (c == '^'){

+				if (d == '='){

+					doread = true;

+					return Token.OP_XOR_ASSIGN;

+				}

+				return Token.CARRET;

+			}

+

+			if (c == '<'){

+				if (d == '<'){

+					getChar ();

+					d = peekChar ();

+

+					if (d == '='){

+						doread = true;

+						return Token.OP_SHIFT_LEFT_ASSIGN;

+					}

+					return Token.OP_SHIFT_LEFT;

+				} else if (d == '='){

+					doread = true;

+					return Token.OP_LE;

+				}

+				return Token.OP_LT;

+			}

+

+			if (c == '>'){

+				if (d == '>'){

+					getChar ();

+					d = peekChar ();

+

+					if (d == '='){

+						doread = true;

+						return Token.OP_SHIFT_RIGHT_ASSIGN;

+					}

+					return Token.OP_SHIFT_RIGHT;

+				} else if (d == '='){

+					doread = true;

+					return Token.OP_GE;

+				}

+				return Token.OP_GT;

+			}

+			return Token.ERROR;

+		}

+

+		bool decimal_digits (int c)

+		{

+			int d;

+			bool seen_digits = false;

+			

+			if (c != -1)

+				number_builder.Append ((char) c);

+			

+			while ((d = peekChar ()) != -1){

+				if (Char.IsDigit ((char)d)){

+					number_builder.Append ((char) d);

+					getChar ();

+					seen_digits = true;

+				} else

+					break;

+			}

+			

+			return seen_digits;

+		}

+

+		bool is_hex (char e)

+		{

+			return Char.IsDigit (e) || (e >= 'A' && e <= 'F') || (e >= 'a' && e <= 'f');

+		}

+		

+		void hex_digits (int c)

+		{

+			int d;

+

+			if (c != -1)

+				number_builder.Append ((char) c);

+			while ((d = peekChar ()) != -1){

+				char e = Char.ToUpper ((char) d);

+				

+				if (is_hex (e)){

+					number_builder.Append ((char) e);

+					getChar ();

+				} else

+					break;

+			}

+		}

+		

+		int real_type_suffix (int c)

+		{

+			int t;

+

+			switch (c){

+			case 'F': case 'f':

+				t =  Token.LITERAL_FLOAT;

+				break;

+			case 'D': case 'd':

+				t = Token.LITERAL_DOUBLE;

+				break;

+			case 'M': case 'm':

+				 t= Token.LITERAL_DECIMAL;

+				break;

+			default:

+				return Token.NONE;

+			}

+			return t;

+		}

+

+		int integer_type_suffix (ulong ul, int c)

+		{

+			bool is_unsigned = false;

+			bool is_long = false;

+

+			if (c != -1){

+				bool scanning = true;

+				do {

+					switch (c){

+					case 'U': case 'u':

+						if (is_unsigned)

+							scanning = false;

+						is_unsigned = true;

+						getChar ();

+						break;

+

+					case 'l':

+						if (!is_unsigned){

+							//

+							// if we have not seen anything in between

+							// report this error

+							//

+							Report.Warning (

+								78, Location,

+							"the 'l' suffix is easily confused with digit `1'," +

+							" use 'L' for clarity");

+						}

+						goto case 'L';

+						

+					case 'L': 

+						if (is_long)

+							scanning = false;

+						is_long = true;

+						getChar ();

+						break;

+						

+					default:

+						scanning = false;

+						break;

+					}

+					c = peekChar ();

+				} while (scanning);

+			}

+

+			if (is_long && is_unsigned){

+				val = ul;

+				return Token.LITERAL_INTEGER;

+			} else if (is_unsigned){

+				// uint if possible, or ulong else.

+

+				if ((ul & 0xffffffff00000000) == 0)

+					val = (uint) ul;

+				else

+					val = ul;

+			} else if (is_long){

+				// long if possible, ulong otherwise

+				if ((ul & 0x8000000000000000) != 0)

+					val = ul;

+				else

+					val = (long) ul;

+			} else {

+				// int, uint, long or ulong in that order

+				if ((ul & 0xffffffff00000000) == 0){

+					uint ui = (uint) ul;

+					

+					if ((ui & 0x80000000) != 0)

+						val = ui;

+					else

+						val = (int) ui;

+				} else {

+					if ((ul & 0x8000000000000000) != 0)

+						val = ul;

+					else

+						val = (long) ul;

+				}

+			}

+			return Token.LITERAL_INTEGER;

+		}

+				

+		//

+		// given `c' as the next char in the input decide whether

+		// we need to convert to a special type, and then choose

+		// the best representation for the integer

+		//

+		int adjust_int (int c)

+		{

+			try {

+				ulong ul = System.UInt64.Parse (number_builder.ToString ());

+				return integer_type_suffix (ul, c);

+			} catch (OverflowException) {

+				error_details = "Integral constant is too large";

+				Report.Error (1021, Location, error_details);

+				val = 0ul;

+				return Token.LITERAL_INTEGER;

+			}

+		}

+		

+		int adjust_real (int t)

+		{

+			string s = number_builder.ToString ();

+

+			switch (t){

+			case Token.LITERAL_DECIMAL:

+				try {

+					val = System.Decimal.Parse (s, styles, csharp_format_info);

+				} catch (OverflowException) {

+					val = 0m;     

+					error_details = "Floating-point constant is outside the range of the type 'decimal'";

+					Report.Error(594, Location, error_details);

+				}

+				break;

+			case Token.LITERAL_FLOAT:

+				try {

+					val = (float) System.Double.Parse (s, styles, csharp_format_info);

+				} catch (OverflowException) {

+					val = 0.0f;     

+					error_details = "Floating-point constant is outside the range of the type 'float'";

+					Report.Error(594, Location, error_details);

+				}

+				break;

+				

+			case Token.LITERAL_DOUBLE:

+			case Token.NONE:

+				t = Token.LITERAL_DOUBLE;

+				try {

+					val = System.Double.Parse (s, styles, csharp_format_info);

+				} catch (OverflowException) {

+					val = 0.0;     

+					error_details = "Floating-point constant is outside the range of the type 'double'";

+					Report.Error(594, Location, error_details);

+				}

+				break;

+			}

+			return t;

+		}

+

+		//

+		// Invoked if we know we have .digits or digits

+		//

+		int is_number (int c)

+		{

+			bool is_real = false;

+			int type;

+

+			number_builder.Length = 0;

+

+			if (Char.IsDigit ((char)c)){

+				if (c == '0' && peekChar () == 'x' || peekChar () == 'X'){

+					ulong ul;

+					getChar ();

+					hex_digits (-1);

+

+					string s = number_builder.ToString ();

+

+					ul = System.UInt64.Parse (s, NumberStyles.HexNumber);

+					return integer_type_suffix (ul, peekChar ());

+				}

+				decimal_digits (c);

+				c = getChar ();

+			}

+

+			//

+			// We need to handle the case of

+			// "1.1" vs "1.string" (LITERAL_FLOAT vs NUMBER DOT IDENTIFIER)

+			//

+			if (c == '.'){

+				if (decimal_digits ('.')){

+					is_real = true;

+					c = getChar ();

+				} else {

+					putback ('.');

+					number_builder.Length -= 1;

+					return adjust_int (-1);

+				}

+			}

+			

+			if (c == 'e' || c == 'E'){

+				is_real = true;

+				number_builder.Append ("e");

+				c = getChar ();

+				

+				if (c == '+')

+					number_builder.Append ((char) c);

+				else if (c == '-')

+					number_builder.Append ((char) c);

+				decimal_digits (-1);

+				c = getChar ();

+			}

+

+			type = real_type_suffix (c);

+			if (type == Token.NONE && !is_real){

+				putback (c);

+				return adjust_int (c);

+			} else 

+				is_real = true;

+

+			if (type == Token.NONE){

+				putback (c);

+			}

+			

+			if (is_real)

+				return adjust_real (type);

+

+			Console.WriteLine ("This should not be reached");

+			throw new Exception ("Is Number should never reach this point");

+		}

+

+		//

+		// Accepts exactly count (4 or 8) hex, no more no less

+		//

+		int getHex (int count, out bool error)

+		{

+			int [] buffer = new int [8];

+			int i;

+			int total = 0;

+			int c;

+			char e;

+			int top = count != -1 ? count : 4;

+			

+			getChar ();

+			error = false;

+			for (i = 0; i < top; i++){

+				c = getChar ();

+				e = Char.ToUpper ((char) c);

+				

+				if (!is_hex (e)){

+					error = true;

+					return 0;

+				}

+				if (Char.IsDigit (e))

+					c = (int) e - (int) '0';

+				else

+					c = (int) e - (int) 'A' + 10;

+				total = (total * 16) + c;

+				if (count == -1){

+					int p = peekChar ();

+					if (p == -1)

+						break;

+					if (!is_hex ((char)p))

+						break;

+				}

+			}

+			return total;

+		}

+

+		int escape (int c)

+		{

+			bool error;

+			int d;

+			int v;

+

+			d = peekChar ();

+			if (c != '\\')

+				return c;

+			

+			switch (d){

+			case 'a':

+				v = '\a'; break;

+			case 'b':

+				v = '\b'; break;

+			case 'n':

+				v = '\n'; break;

+			case 't':

+				v = '\t'; break;

+			case 'v':

+				v = '\v'; break;

+			case 'r':

+				v = '\r'; break;

+			case '\\':

+				v = '\\'; break;

+			case 'f':

+				v = '\f'; break;

+			case '0':

+				v = 0; break;

+			case '"':

+				v = '"'; break;

+			case '\'':

+				v = '\''; break;

+			case 'x':

+				v = getHex (-1, out error);

+				if (error)

+					goto default;

+				return v;

+			case 'u':

+				v = getHex (4, out error);

+				if (error)

+					goto default;

+				return v;

+			case 'U':

+				v = getHex (8, out error);

+				if (error)

+					goto default;

+				return v;

+			default:

+				Report.Error (1009, Location, "Unrecognized escape sequence in " + (char)d);

+				return -1;

+			}

+			getChar ();

+			return v;

+		}

+

+		int getChar ()

+		{

+			if (putback_char != -1){

+				int x = putback_char;

+				putback_char = -1;

+

+				return x;

+			}

+			return reader.Read ();

+		}

+

+		int peekChar ()

+		{

+			if (putback_char != -1)

+				return putback_char;

+			return reader.Peek ();

+		}

+

+		void putback (int c)

+		{

+			if (putback_char != -1)

+				throw new Exception ("This should not happen putback on putback");

+			putback_char = c;

+		}

+

+		public bool advance ()

+		{

+			return peekChar () != -1;

+		}

+

+		public Object Value {

+			get {

+				return val;

+			}

+		}

+

+		public Object value ()

+		{

+			return val;

+		}

+		

+		public int token ()

+		{

+			current_token = xtoken ();

+			return current_token;

+		}

+

+		static StringBuilder static_cmd_arg = new System.Text.StringBuilder ();

+		

+		void get_cmd_arg (out string cmd, out string arg)

+		{

+			int c;

+			

+			tokens_seen = false;

+			arg = "";

+			static_cmd_arg.Length = 0;

+				

+			while ((c = getChar ()) != -1 && (c != '\n') && (c != ' ') && (c != '\t')){

+				if (c == '\r')

+					continue;

+				static_cmd_arg.Append ((char) c);

+			}

+

+			cmd = static_cmd_arg.ToString ();

+

+			if (c == '\n'){

+				line++;

+				ref_line++;

+				return;

+			}

+

+			// skip over white space

+			while ((c = getChar ()) != -1 && (c != '\n') && ((c == ' ') || (c == '\t')))

+				;

+

+			if (c == '\n'){

+				line++;

+				ref_line++;

+				return;

+			}

+			

+			static_cmd_arg.Length = 0;

+			static_cmd_arg.Append ((char) c);

+			

+			while ((c = getChar ()) != -1 && (c != '\n')){

+				if (c == '\r')

+					continue;

+				static_cmd_arg.Append ((char) c);

+			}

+

+			if (c == '\n'){

+				line++;

+				ref_line++;

+			}

+			arg = static_cmd_arg.ToString ().Trim ();

+		}

+

+		//

+		// Handles the #line directive

+		//

+		bool PreProcessLine (string arg)

+		{

+			if (arg == "")

+				return false;

+

+			if (arg == "default"){

+				line = ref_line = line;

+				return false;

+			}

+			

+			try {

+				int pos;

+

+				if ((pos = arg.IndexOf (' ')) != -1 && pos != 0){

+					ref_line = System.Int32.Parse (arg.Substring (0, pos));

+					pos++;

+					

+					char [] quotes = { '\"' };

+					

+					ref_name = arg.Substring (pos). Trim(quotes);

+				} else {

+					ref_line = System.Int32.Parse (arg);

+				}

+			} catch {

+				return false;

+			}

+			

+			return true;

+		}

+

+		//

+		// Handles #define and #undef

+		//

+		void PreProcessDefinition (bool is_define, string arg)

+		{

+			if (arg == "" || arg == "true" || arg == "false"){

+				Report.Error(1001, Location, "Missing identifer to pre-processor directive");

+				return;

+			}

+

+			char[] whitespace = { ' ', '\t' };

+			if (arg.IndexOfAny (whitespace) != -1){

+				Report.Error(1025, Location, "Single-line comment or end-of-line expected");

+				return;

+			}

+

+			foreach (char c in arg){

+				if (!Char.IsLetter (c) && (c != '_')){

+					Report.Error(1001, Location, "Identifier expected");

+					return;

+				}

+			}

+

+			if (is_define){

+				if (defines == null)

+					defines = new Hashtable ();

+				define (arg);

+			} else {

+				if (defines == null)

+					return;

+				if (defines.Contains (arg))

+					defines.Remove (arg);

+			}

+		}

+

+		bool eval_val (string s)

+		{

+			if (s == "true")

+				return true;

+			if (s == "false")

+				return false;

+			

+			if (defines == null)

+				return false;

+			if (defines.Contains (s))

+				return true;

+

+			return false;

+		}

+

+		bool pp_primary (ref string s)

+		{

+			s = s.Trim ();

+			int len = s.Length;

+

+			if (len > 0){

+				char c = s [0];

+				

+				if (c == '('){

+					s = s.Substring (1);

+					bool val = pp_expr (ref s);

+					if (s.Length > 0 && s [0] == ')'){

+						s = s.Substring (1);

+						return val;

+					}

+					Error_InvalidDirective ();

+					return false;

+				}

+				

+				if (is_identifier_start_character(c)){

+					int j = 1;

+

+					while (j < len){

+						c = s [j];

+						

+						if (is_identifier_part_character(c)){

+							j++;

+							continue;

+						}

+						bool v = eval_val (s.Substring (0, j));

+						s = s.Substring (j);

+						return v;

+					}

+					bool vv = eval_val (s);

+					s = "";

+					return vv;

+				}

+			}

+			Error_InvalidDirective ();

+			return false;

+		}

+		

+		bool pp_unary (ref string s)

+		{

+			s = s.Trim ();

+			int len = s.Length;

+

+			if (len > 0){

+				if (s [0] == '!'){

+					if (len > 1 && s [1] == '='){

+						Error_InvalidDirective ();

+						return false;

+					}

+					s = s.Substring (1);

+					return ! pp_primary (ref s);

+				} else

+					return pp_primary (ref s);

+			} else {

+				Error_InvalidDirective ();

+				return false;

+			}

+		}

+		

+		bool pp_eq (ref string s)

+		{

+			bool va = pp_unary (ref s);

+

+			s = s.Trim ();

+			int len = s.Length;

+			if (len > 0){

+				if (s [0] == '='){

+					if (len > 2 && s [1] == '='){

+						s = s.Substring (2);

+						return va == pp_unary (ref s);

+					} else {

+						Error_InvalidDirective ();

+						return false;

+					}

+				} else if (s [0] == '!' && len > 1 && s [1] == '='){

+					s = s.Substring (2);

+

+					return va != pp_unary (ref s);

+

+				}

+			}

+

+			return va;

+				

+		}

+		

+		bool pp_and (ref string s)

+		{

+			bool va = pp_eq (ref s);

+

+			s = s.Trim ();

+			int len = s.Length;

+			if (len > 0){

+				if (s [0] == '&'){

+					if (len > 2 && s [1] == '&'){

+						s = s.Substring (2);

+						return va && pp_eq (ref s);

+					} else {

+						Error_InvalidDirective ();

+						return false;

+					}

+				} 

+			}

+			return va;

+		}

+		

+		//

+		// Evaluates an expression for `#if' or `#elif'

+		//

+		bool pp_expr (ref string s)

+		{

+			bool va = pp_and (ref s);

+

+			s = s.Trim ();

+			int len = s.Length;

+			if (len > 0){

+				char c = s [0];

+				

+				if (c == '|'){

+					if (len > 2 && s [1] == '|'){

+						s = s.Substring (2);

+						return va || pp_and (ref s);

+					} else {

+						Error_InvalidDirective ();

+						return false;

+					}

+				} 

+			}

+

+			return va;

+		}

+

+		bool eval (string s)

+		{

+			bool v = pp_expr (ref s);

+			s = s.Trim ();

+			if (s.Length != 0){

+				Error_InvalidDirective ();

+				return false;

+			}

+

+			return v;

+		}

+		

+		void Error_InvalidDirective ()

+		{

+			Report.Error (1517, Location, "Invalid pre-processor directive");

+		}

+

+		void Error_UnexpectedDirective (string extra)

+		{

+			Report.Error (

+				1028, Location,

+				"Unexpected processor directive (" + extra + ")");

+		}

+

+		void Error_TokensSeen ()

+		{

+			Report.Error (

+				1032, Location,

+				"Cannot define or undefine pre-processor symbols after a token in the file");

+		}

+		

+		//

+		// if true, then the code continues processing the code

+		// if false, the code stays in a loop until another directive is

+		// reached.

+		//

+		bool handle_preprocessing_directive (bool caller_is_taking)

+		{

+			char [] blank = { ' ', '\t' };

+			string cmd, arg;

+			

+			get_cmd_arg (out cmd, out arg);

+

+			// Eat any trailing whitespaces and single-line comments

+			if (arg.IndexOf ("//") != -1)

+				arg = arg.Substring (0, arg.IndexOf ("//"));

+			arg = arg.TrimEnd (' ', '\t');

+

+			//

+			// The first group of pre-processing instructions is always processed

+			//

+			switch (cmd){

+			case "line":

+				if (!PreProcessLine (arg))

+					Report.Error (

+						1576, Location,

+						"Argument to #line directive is missing or invalid");

+				return true;

+

+			case "region":

+				arg = "true";

+				goto case "if";

+

+			case "endregion":

+				goto case "endif";

+				

+			case "if":

+				if (arg == ""){

+					Error_InvalidDirective ();

+					return true;

+				}

+				bool taking = false;

+				if (ifstack == null)

+					ifstack = new Stack ();

+

+				if (ifstack.Count == 0){

+					taking = true;

+				} else {

+					int state = (int) ifstack.Peek ();

+					if ((state & TAKING) != 0)

+						taking = true;

+				}

+					

+				if (eval (arg) && taking){

+					ifstack.Push (TAKING | TAKEN_BEFORE | PARENT_TAKING);

+					return true;

+				} else {

+					ifstack.Push (taking ? PARENT_TAKING : 0);

+					return false;

+				}

+				

+			case "endif":

+				if (ifstack == null || ifstack.Count == 0){

+					Error_UnexpectedDirective ("no #if for this #endif");

+					return true;

+				} else {

+					ifstack.Pop ();

+					if (ifstack.Count == 0)

+						return true;

+					else {

+						int state = (int) ifstack.Peek ();

+

+						if ((state & TAKING) != 0)

+							return true;

+						else

+							return false;

+					}

+				}

+

+			case "elif":

+				if (ifstack == null || ifstack.Count == 0){

+					Error_UnexpectedDirective ("no #if for this #elif");

+					return true;

+				} else {

+					int state = (int) ifstack.Peek ();

+

+					if ((state & ELSE_SEEN) != 0){

+						Error_UnexpectedDirective ("#elif not valid after #else");

+						return true;

+					}

+

+					if ((state & (TAKEN_BEFORE | TAKING)) != 0)

+						return false;

+

+					if (eval (arg) && ((state & PARENT_TAKING) != 0)){

+						state = (int) ifstack.Pop ();

+						ifstack.Push (state | TAKING | TAKEN_BEFORE);

+						return true;

+					} else 

+						return false;

+				}

+

+			case "else":

+				if (ifstack == null || ifstack.Count == 0){

+					Report.Error (

+						1028, Location,

+						"Unexpected processor directive (no #if for this #else)");

+					return true;

+				} else {

+					int state = (int) ifstack.Peek ();

+

+					if ((state & ELSE_SEEN) != 0){

+						Error_UnexpectedDirective ("#else within #else");

+						return true;

+					}

+

+					ifstack.Pop ();

+					ifstack.Push (state | ELSE_SEEN);

+

+					if ((state & TAKEN_BEFORE) == 0){

+						if ((state & PARENT_TAKING) != 0)

+							return true;

+						else

+							return false;

+					}

+					return false;

+				}

+			}

+

+			//

+			// These are only processed if we are in a `taking' block

+			//

+			if (!caller_is_taking)

+				return false;

+					

+			switch (cmd){

+			case "define":

+				if (any_token_seen){

+					Error_TokensSeen ();

+					return true;

+				}

+				PreProcessDefinition (true, arg);

+				return true;

+

+			case "undef":

+				if (any_token_seen){

+					Error_TokensSeen ();

+					return true;

+				}

+				PreProcessDefinition (false, arg);

+				return true;

+

+			case "error":

+				Report.Error (1029, Location, "#error: '" + arg + "'");

+				return true;

+

+			case "warning":

+				Report.Warning (1030, Location, "#warning: '" + arg + "'");

+				return true;

+			}

+

+			Report.Error (1024, Location, "Preprocessor directive expected (got: " + cmd + ")");

+			return true;

+

+		}

+

+		private int consume_string(bool quoted) 

+		{

+			int c;

+			string_builder.Length = 0;

+								

+			while ((c = getChar ()) != -1){

+				if (c == '"'){

+					if (quoted && peekChar () == '"'){

+						string_builder.Append ((char) c);

+						getChar ();

+						continue;

+					} else {

+						val = string_builder.ToString ();

+						return Token.LITERAL_STRING;

+					}

+				}

+

+				if (c == '\n' && !quoted) {

+					Report.Error(1010, Location, "Newline in constant");

+				}

+

+				if (!quoted){

+					c = escape (c);

+					if (c == -1)

+						return Token.ERROR;

+				}

+				string_builder.Append ((char) c);

+			}

+

+			Report.Error (1039, Location, "Unterminated string literal");

+			return Token.EOF;

+		}

+

+		private int consume_identifier(int c, bool quoted) 

+		{

+			id_builder.Length = 0;

+

+			id_builder.Append ((char) c);

+					

+			while ((c = peekChar ()) != -1) {

+				if (is_identifier_part_character ((char) c)){

+					id_builder.Append ((char)getChar ());

+					col++;

+				} else 

+					break;

+			}

+					

+			string ids = id_builder.ToString ();

+

+			if (!is_keyword (ids) || quoted) {

+				val = ids;

+				if (ids.Length > 512){

+					Report.Error (

+						645, Location,

+						"Identifier too long (limit is 512 chars)");

+				}

+				return Token.IDENTIFIER;

+			}

+

+			// true, false and null are in the hash anyway.

+			return GetKeyword (ids);

+		}

+		

+		public int xtoken ()

+		{

+			int t;

+			bool doread = false;

+			int c;

+

+			val = null;

+			// optimization: eliminate col and implement #directive semantic correctly.

+			for (;(c = getChar ()) != -1; col++) {

+				if (is_identifier_start_character((char)c)){

+					tokens_seen = true;

+					return consume_identifier(c, false);

+				}

+

+				if (c == '.'){

+					tokens_seen = true;

+					if (Char.IsDigit ((char) peekChar ()))

+						return is_number (c);

+					return Token.DOT;

+				}

+				

+				if (Char.IsDigit ((char) c)){

+					tokens_seen = true;

+					return is_number (c);

+				}

+

+				// Handle double-slash comments.

+				if (c == '/'){

+					int d = peekChar ();

+				

+					if (d == '/'){

+						getChar ();

+						while ((d = getChar ()) != -1 && (d != '\n'))

+							col++;

+						line++;

+						ref_line++;

+						col = 0;

+						any_token_seen |= tokens_seen;

+						tokens_seen = false;

+						continue;

+					} else if (d == '*'){

+						getChar ();

+

+						while ((d = getChar ()) != -1){

+							if (d == '*' && peekChar () == '/'){

+								getChar ();

+								col++;

+								break;

+							}

+							if (d == '\n'){

+								line++;

+								ref_line++;

+								col = 0;

+								any_token_seen |= tokens_seen;

+								tokens_seen = false;

+							}

+						}

+						continue;

+					}

+				}

+

+				/* For now, ignore pre-processor commands */

+				// FIXME: In C# the '#' is not limited to appear

+				// on the first column.

+				if (c == '#' && !tokens_seen){

+					bool cont = true;

+					

+				start_again:

+					

+					cont = handle_preprocessing_directive (cont);

+

+					if (cont){

+						col = 0;

+						continue;

+					}

+					col = 1;

+

+					bool skipping = false;

+					for (;(c = getChar ()) != -1; col++){

+						if (c == '\n'){

+							col = 0;

+							line++;

+							ref_line++;

+							skipping = false;

+						} else if (c == ' ' || c == '\t' || c == '\v' || c == '\r')

+							continue;

+						else if (c != '#')

+							skipping = true;

+						if (c == '#' && !skipping)

+							goto start_again;

+					}

+					any_token_seen |= tokens_seen;

+					tokens_seen = false;

+					if (c == -1)

+						Report.Error (1027, Location, "#endif/#endregion expected");

+					continue;

+				}

+				

+				if ((t = is_punct ((char)c, ref doread)) != Token.ERROR){

+					tokens_seen = true;

+					if (doread){

+						getChar ();

+						col++;

+					}

+					return t;

+				}

+				

+				if (c == '"') {

+					return consume_string(false);

+				}

+

+				if (c == '\''){

+					c = getChar ();

+					tokens_seen = true;

+					if (c == '\''){

+						error_details = "Empty character literal";

+						Report.Error (1011, Location, error_details);

+						return Token.ERROR;

+					}

+					c = escape (c);

+					if (c == -1)

+						return Token.ERROR;

+					val = new System.Char ();

+					val = (char) c;

+					c = getChar ();

+

+					if (c != '\''){

+						error_details = "Too many characters in character literal";

+						Report.Error (1012, Location, error_details);

+

+						// Try to recover, read until newline or next "'"

+						while ((c = getChar ()) != -1){

+							if (c == '\n' || c == '\'')

+								break;

+							

+						}

+						return Token.ERROR;

+					}

+					return Token.LITERAL_CHARACTER;

+				}

+				

+				// white space

+				if (c == '\n'){

+					line++;

+					ref_line++;

+					col = 0;

+					any_token_seen |= tokens_seen;

+					tokens_seen = false;

+					continue;

+				}

+

+				if (c == ' ' || c == '\t' || c == '\f' || c == '\v' || c == '\r'){

+					if (c == '\t')

+						col = (((col + 8) / 8) * 8) - 1;

+					continue;

+				}

+

+				if (c == '@') {

+					c = getChar();

+					if (c == '"') {

+						tokens_seen = true;

+						return consume_string(true);

+					} else if (is_identifier_start_character((char) c)){

+						return consume_identifier(c, true);

+					} else {

+						Report.Error(1033, Location, "'@' must be followed by string constant or identifier");

+					}

+				}

+

+				error_details = ((char)c).ToString ();

+				

+				return Token.ERROR;

+			}

+

+			if (ifstack != null && ifstack.Count >= 1)

+				Report.Error (1027, Location, "#endif/#endregion expected");

+

+			return Token.EOF;

+		}

+	}

+}

+

diff --git a/mcs/mcs/decl.cs b/mcs/mcs/decl.cs
new file mode 100755
index 00000000000..5f673acacd3
--- /dev/null
+++ b/mcs/mcs/decl.cs
@@ -0,0 +1,1199 @@
+//
+// decl.cs: Declaration base class for structs, classes, enums and interfaces.
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+// TODO: Move the method verification stuff from the class.cs and interface.cs here
+//
+
+using System;
+using System.Collections;
+using System.Reflection.Emit;
+using System.Reflection;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   Base representation for members.  This is only used to keep track
+	///   of Name, Location and Modifier flags.
+	/// </summary>
+	public abstract class MemberCore {
+		/// <summary>
+		///   Public name
+		/// </summary>
+		public string Name;
+
+		/// <summary>
+		///   Modifier flags that the user specified in the source code
+		/// </summary>
+		public int ModFlags;
+
+		/// <summary>
+		///   Location where this declaration happens
+		/// </summary>
+		public readonly Location Location;
+
+		public MemberCore (string name, Location loc)
+		{
+			Name = name;
+			Location = loc;
+		}
+
+		protected void WarningNotHiding (TypeContainer parent)
+		{
+			Report.Warning (
+				109, Location,
+				"The member " + parent.MakeName (Name) + " does not hide an " +
+				"inherited member.  The keyword new is not required");
+							   
+		}
+
+		void Error_CannotChangeAccessModifiers (TypeContainer parent, MethodInfo parent_method,
+							string name)
+		{
+			//
+			// FIXME: report the old/new permissions?
+			//
+			Report.Error (
+				507, Location, parent.MakeName (Name) +
+				": can't change the access modifiers when overriding inherited " +
+				"member `" + name + "'");
+		}
+		
+		//
+		// Performs various checks on the MethodInfo `mb' regarding the modifier flags
+		// that have been defined.
+		//
+		// `name' is the user visible name for reporting errors (this is used to
+		// provide the right name regarding method names and properties)
+		//
+		protected bool CheckMethodAgainstBase (TypeContainer parent, MethodAttributes my_attrs,
+						       MethodInfo mb, string name)
+		{
+			bool ok = true;
+			
+			if ((ModFlags & Modifiers.OVERRIDE) != 0){
+				if (!(mb.IsAbstract || mb.IsVirtual)){
+					Report.Error (
+						506, Location, parent.MakeName (Name) +
+						": cannot override inherited member `" +
+						name + "' because it is not " +
+						"virtual, abstract or override");
+					ok = false;
+				}
+				
+				// Now we check that the overriden method is not final
+				
+				if (mb.IsFinal) {
+					Report.Error (239, Location, parent.MakeName (Name) + " : cannot " +
+						      "override inherited member `" + name +
+						      "' because it is sealed.");
+					ok = false;
+				}
+
+				//
+				// Check that the permissions are not being changed
+				//
+				MethodAttributes thisp = my_attrs & MethodAttributes.MemberAccessMask;
+				MethodAttributes parentp = mb.Attributes & MethodAttributes.MemberAccessMask;
+
+				if (thisp != parentp){
+					Error_CannotChangeAccessModifiers (parent, mb, name);
+					ok = false;
+				}
+			}
+
+			if (mb.IsVirtual || mb.IsAbstract){
+				if ((ModFlags & (Modifiers.NEW | Modifiers.OVERRIDE)) == 0){
+					if (Name != "Finalize"){
+						Report.Warning (
+							114, 2, Location, parent.MakeName (Name) + 
+							" hides inherited member `" + name +
+							"'.  To make the current member override that " +
+							"implementation, add the override keyword, " +
+							"otherwise use the new keyword");
+						ModFlags |= Modifiers.NEW;
+					}
+				}
+			} else {
+				if ((ModFlags & (Modifiers.NEW | Modifiers.OVERRIDE)) == 0){
+					if (Name != "Finalize"){
+						Report.Warning (
+							108, 1, Location, "The keyword new is required on " +
+							parent.MakeName (Name) + " because it hides " +
+							"inherited member `" + name + "'");
+						ModFlags |= Modifiers.NEW;
+					}
+				}
+			}
+
+			return ok;
+		}
+
+		public abstract bool Define (TypeContainer parent);
+
+		// 
+		// Whehter is it ok to use an unsafe pointer in this type container
+		//
+		public bool UnsafeOK (DeclSpace parent)
+		{
+			//
+			// First check if this MemberCore modifier flags has unsafe set
+			//
+			if ((ModFlags & Modifiers.UNSAFE) != 0)
+				return true;
+
+			if (parent.UnsafeContext)
+				return true;
+
+			Expression.UnsafeError (Location);
+			return false;
+		}
+	}
+
+	//
+	// FIXME: This is temporary outside DeclSpace, because I have to fix a bug
+	// in MCS that makes it fail the lookup for the enum
+	//
+
+		/// <summary>
+		///   The result value from adding an declaration into
+		///   a struct or a class
+		/// </summary>
+		public enum AdditionResult {
+			/// <summary>
+			/// The declaration has been successfully
+			/// added to the declation space.
+			/// </summary>
+			Success,
+
+			/// <summary>
+			///   The symbol has already been defined.
+			/// </summary>
+			NameExists,
+
+			/// <summary>
+			///   Returned if the declation being added to the
+			///   name space clashes with its container name.
+			///
+			///   The only exceptions for this are constructors
+			///   and static constructors
+			/// </summary>
+			EnclosingClash,
+
+			/// <summary>
+			///   Returned if a constructor was created (because syntactically
+			///   it looked like a constructor) but was not (because the name
+			///   of the method is not the same as the container class
+			/// </summary>
+			NotAConstructor,
+
+			/// <summary>
+			///   This is only used by static constructors to emit the
+			///   error 111, but this error for other things really
+			///   happens at another level for other functions.
+			/// </summary>
+			MethodExists
+		}
+
+	/// <summary>
+	///   Base class for structs, classes, enumerations and interfaces.  
+	/// </summary>
+	/// <remarks>
+	///   They all create new declaration spaces.  This
+	///   provides the common foundation for managing those name
+	///   spaces.
+	/// </remarks>
+	public abstract class DeclSpace : MemberCore {
+		/// <summary>
+		///   this points to the actual definition that is being
+		///   created with System.Reflection.Emit
+		/// </summary>
+		public TypeBuilder TypeBuilder;
+
+		/// <summary>
+		///   This variable tracks whether we have Closed the type
+		/// </summary>
+		public bool Created = false;
+		
+		//
+		// This is the namespace in which this typecontainer
+		// was declared.  We use this to resolve names.
+		//
+		public Namespace Namespace;
+
+		public Hashtable Cache = new Hashtable ();
+		
+		public string Basename;
+		
+		/// <summary>
+		///   defined_names is used for toplevel objects
+		/// </summary>
+		protected Hashtable defined_names;
+
+		TypeContainer parent;		
+
+		public DeclSpace (TypeContainer parent, string name, Location l)
+			: base (name, l)
+		{
+			Basename = name.Substring (1 + name.LastIndexOf ('.'));
+			defined_names = new Hashtable ();
+			this.parent = parent;
+		}
+
+		/// <summary>
+		///   Returns a status code based purely on the name
+		///   of the member being added
+		/// </summary>
+		protected AdditionResult IsValid (string name)
+		{
+			if (name == Basename)
+				return AdditionResult.EnclosingClash;
+
+			if (defined_names.Contains (name))
+				return AdditionResult.NameExists;
+
+			return AdditionResult.Success;
+		}
+
+		/// <summary>
+		///   Introduce @name into this declaration space and
+		///   associates it with the object @o.  Note that for
+		///   methods this will just point to the first method. o
+		/// </summary>
+		protected void DefineName (string name, object o)
+		{
+			defined_names.Add (name, o);
+		}
+
+		/// <summary>
+		///   Returns the object associated with a given name in the declaration
+		///   space.  This is the inverse operation of `DefineName'
+		/// </summary>
+		public object GetDefinition (string name)
+		{
+			return defined_names [name];
+		}
+		
+		bool in_transit = false;
+		
+		/// <summary>
+		///   This function is used to catch recursive definitions
+		///   in declarations.
+		/// </summary>
+		public bool InTransit {
+			get {
+				return in_transit;
+			}
+
+			set {
+				in_transit = value;
+			}
+		}
+
+		public TypeContainer Parent {
+			get {
+				return parent;
+			}
+		}
+
+		/// <summary>
+		///   Looks up the alias for the name
+		/// </summary>
+		public string LookupAlias (string name)
+		{
+			if (Namespace != null)
+				return Namespace.LookupAlias (name);
+			else
+				return null;
+		}
+		
+		// 
+		// root_types contains all the types.  All TopLevel types
+		// hence have a parent that points to `root_types', that is
+		// why there is a non-obvious test down here.
+		//
+		public bool IsTopLevel {
+			get {
+				if (parent != null){
+					if (parent.parent == null)
+						return true;
+				}
+				return false;
+			}
+		}
+
+		public virtual void CloseType ()
+		{
+			if (!Created){
+				try {
+					TypeBuilder.CreateType ();
+				} catch {
+					//
+					// The try/catch is needed because
+					// nested enumerations fail to load when they
+					// are defined.
+					//
+					// Even if this is the right order (enumerations
+					// declared after types).
+					//
+					// Note that this still creates the type and
+					// it is possible to save it
+				}
+				Created = true;
+			}
+		}
+
+		/// <remarks>
+		///  Should be overriten by the appropriate declaration space
+		/// <remarks>
+		public abstract TypeBuilder DefineType ();
+		
+		/// <summary>
+		///   Define all members, but don't apply any attributes or do anything which may
+		///   access not-yet-defined classes.  This method also creates the MemberCache.
+		/// </summary>
+		public abstract bool DefineMembers (TypeContainer parent);
+
+		//
+		// Whether this is an `unsafe context'
+		//
+		public bool UnsafeContext {
+			get {
+				if ((ModFlags & Modifiers.UNSAFE) != 0)
+					return true;
+				if (parent != null)
+					return parent.UnsafeContext;
+				return false;
+			}
+		}
+
+		public static string MakeFQN (string nsn, string name)
+		{
+			string prefix = (nsn == "" ? "" : nsn + ".");
+
+			return prefix + name;
+		}
+
+		EmitContext type_resolve_ec;
+		EmitContext GetTypeResolveEmitContext (TypeContainer parent, Location loc)
+		{
+			type_resolve_ec = new EmitContext (parent, this, loc, null, null, ModFlags, false);
+			type_resolve_ec.ResolvingTypeTree = true;
+
+			return type_resolve_ec;
+		}
+
+		// <summary>
+		//    Looks up the type, as parsed into the expression `e' 
+		// </summary>
+		public Type ResolveType (Expression e, bool silent, Location loc)
+		{
+			if (type_resolve_ec == null)
+				type_resolve_ec = GetTypeResolveEmitContext (parent, loc);
+			type_resolve_ec.loc = loc;
+			Expression d = e.Resolve (type_resolve_ec, ResolveFlags.Type);
+			if (d == null || d.eclass != ExprClass.Type){
+				if (!silent){
+					Report.Error (246, loc, "Cannot find type `"+ e.ToString () +"'");
+				}
+				return null;
+			}
+
+			return d.Type;
+		}
+
+		// <summary>
+		//    Resolves the expression `e' for a type, and will recursively define
+		//    types. 
+		// </summary>
+		public Expression ResolveTypeExpr (Expression e, bool silent, Location loc)
+		{
+			if (type_resolve_ec == null)
+				type_resolve_ec = GetTypeResolveEmitContext (parent, loc);
+
+			Expression d = e.Resolve (type_resolve_ec, ResolveFlags.Type);
+			if (d == null || d.eclass != ExprClass.Type){
+				if (!silent){
+					Report.Error (246, loc, "Cannot find type `"+ e +"'");
+				}
+				return null;
+			}
+
+			return d;
+		}
+		
+		Type LookupInterfaceOrClass (string ns, string name, out bool error)
+		{
+			DeclSpace parent;
+			Type t;
+
+			error = false;
+			name = MakeFQN (ns, name);
+			
+			t  = TypeManager.LookupType (name);
+			if (t != null)
+				return t;
+
+			parent = (DeclSpace) RootContext.Tree.Decls [name];
+			if (parent == null)
+				return null;
+			
+			t = parent.DefineType ();
+			if (t == null){
+				Report.Error (146, "Class definition is circular: `"+name+"'");
+				error = true;
+				return null;
+			}
+			return t;
+		}
+		
+		/// <summary>
+		///   GetType is used to resolve type names at the DeclSpace level.
+		///   Use this to lookup class/struct bases, interface bases or 
+		///   delegate type references
+		/// </summary>
+		///
+		/// <remarks>
+		///   Contrast this to LookupType which is used inside method bodies to 
+		///   lookup types that have already been defined.  GetType is used
+		///   during the tree resolution process and potentially define
+		///   recursively the type
+		/// </remarks>
+		public Type FindType (string name)
+		{
+			Type t;
+			bool error;
+
+			//
+			// For the case the type we are looking for is nested within this one
+			// or is in any base class
+			//
+			DeclSpace containing_ds = this;
+
+			while (containing_ds != null){
+				Type current_type = containing_ds.TypeBuilder;
+
+				while (current_type != null) {
+					string pre = current_type.FullName;
+					
+					t = LookupInterfaceOrClass (pre, name, out error);
+					if (error)
+						return null;
+				
+					if (t != null) 
+						return t;
+
+					current_type = current_type.BaseType;
+				}
+				containing_ds = containing_ds.Parent;
+			}
+			
+			//
+			// Attempt to lookup the class on our namespace and all it's implicit parents
+			//
+			for (string ns = Namespace.Name; ns != null; ns = RootContext.ImplicitParent (ns)) {
+
+				t = LookupInterfaceOrClass (ns, name, out error);
+				if (error)
+					return null;
+				
+				if (t != null) 
+					return t;
+			}
+			
+			//
+			// Attempt to do a direct unqualified lookup
+			//
+			t = LookupInterfaceOrClass ("", name, out error);
+			if (error)
+				return null;
+			
+			if (t != null)
+				return t;
+			
+			//
+			// Attempt to lookup the class on any of the `using'
+			// namespaces
+			//
+
+			for (Namespace ns = Namespace; ns != null; ns = ns.Parent){
+
+				t = LookupInterfaceOrClass (ns.Name, name, out error);
+				if (error)
+					return null;
+
+				if (t != null)
+					return t;
+
+				//
+				// Now check the using clause list
+				//
+				ArrayList using_list = ns.UsingTable;
+				
+				if (using_list == null)
+					continue;
+
+				foreach (string n in using_list){
+					t = LookupInterfaceOrClass (n, name, out error);
+					if (error)
+						return null;
+
+					if (t != null)
+						return t;
+				}
+				
+			}
+
+			//Report.Error (246, Location, "Can not find type `"+name+"'");
+			return null;
+		}
+
+		/// <remarks>
+		///   This function is broken and not what you're looking for.  It should only
+		///   be used while the type is still being created since it doesn't use the cache
+		///   and relies on the filter doing the member name check.
+		/// </remarks>
+		public abstract MemberList FindMembers (MemberTypes mt, BindingFlags bf,
+							MemberFilter filter, object criteria);
+
+		/// <remarks>
+		///   If we have a MemberCache, return it.  This property may return null if the
+		///   class doesn't have a member cache or while it's still being created.
+		/// </remarks>
+		public abstract MemberCache MemberCache {
+			get;
+		}
+	}
+
+	/// <summary>
+	///   This is a readonly list of MemberInfo's.      
+	/// </summary>
+	public class MemberList : IList {
+		public readonly IList List;
+		int count;
+
+		/// <summary>
+		///   Create a new MemberList from the given IList.
+		/// </summary>
+		public MemberList (IList list)
+		{
+			if (list != null)
+				this.List = list;
+			else
+				this.List = new ArrayList ();
+			count = List.Count;
+		}
+
+		/// <summary>
+		///   Concatenate the ILists `first' and `second' to a new MemberList.
+		/// </summary>
+		public MemberList (IList first, IList second)
+		{
+			ArrayList list = new ArrayList ();
+			list.AddRange (first);
+			list.AddRange (second);
+			count = list.Count;
+			List = list;
+		}
+
+		public static readonly MemberList Empty = new MemberList (new ArrayList ());
+
+		/// <summary>
+		///   Cast the MemberList into a MemberInfo[] array.
+		/// </summary>
+		/// <remarks>
+		///   This is an expensive operation, only use it if it's really necessary.
+		/// </remarks>
+		public static explicit operator MemberInfo [] (MemberList list)
+		{
+			Timer.StartTimer (TimerType.MiscTimer);
+			MemberInfo [] result = new MemberInfo [list.Count];
+			list.CopyTo (result, 0);
+			Timer.StopTimer (TimerType.MiscTimer);
+			return result;
+		}
+
+		// ICollection
+
+		public int Count {
+			get {
+				return count;
+			}
+		}
+
+		public bool IsSynchronized {
+			get {
+				return List.IsSynchronized;
+			}
+		}
+
+		public object SyncRoot {
+			get {
+				return List.SyncRoot;
+			}
+		}
+
+		public void CopyTo (Array array, int index)
+		{
+			List.CopyTo (array, index);
+		}
+
+		// IEnumerable
+
+		public IEnumerator GetEnumerator ()
+		{
+			return List.GetEnumerator ();
+		}
+
+		// IList
+
+		public bool IsFixedSize {
+			get {
+				return true;
+			}
+		}
+
+		public bool IsReadOnly {
+			get {
+				return true;
+			}
+		}
+
+		object IList.this [int index] {
+			get {
+				return List [index];
+			}
+
+			set {
+				throw new NotSupportedException ();
+			}
+		}
+
+		// FIXME: try to find out whether we can avoid the cast in this indexer.
+		public MemberInfo this [int index] {
+			get {
+				return (MemberInfo) List [index];
+			}
+		}
+
+		public int Add (object value)
+		{
+			throw new NotSupportedException ();
+		}
+
+		public void Clear ()
+		{
+			throw new NotSupportedException ();
+		}
+
+		public bool Contains (object value)
+		{
+			return List.Contains (value);
+		}
+
+		public int IndexOf (object value)
+		{
+			return List.IndexOf (value);
+		}
+
+		public void Insert (int index, object value)
+		{
+			throw new NotSupportedException ();
+		}
+
+		public void Remove (object value)
+		{
+			throw new NotSupportedException ();
+		}
+
+		public void RemoveAt (int index)
+		{
+			throw new NotSupportedException ();
+		}
+	}
+
+	/// <summary>
+	///   This interface is used to get all members of a class when creating the
+	///   member cache.  It must be implemented by all DeclSpace derivatives which
+	///   want to support the member cache and by TypeHandle to get caching of
+	///   non-dynamic types.
+	/// </summary>
+	public interface IMemberContainer {
+		/// <summary>
+		///   The name of the IMemberContainer.  This is only used for
+		///   debugging purposes.
+		/// </summary>
+		string Name {
+			get;
+		}
+
+		/// <summary>
+		///   The type of this IMemberContainer.
+		/// </summary>
+		Type Type {
+			get;
+		}
+
+		/// <summary>
+		///   Returns the IMemberContainer of the parent class or null if this
+		///   is an interface or TypeManger.object_type.
+		///   This is used when creating the member cache for a class to get all
+		///   members from the parent class.
+		/// </summary>
+		IMemberContainer Parent {
+			get;
+		}
+
+		/// <summary>
+		///   Whether this is an interface.
+		/// </summary>
+		bool IsInterface {
+			get;
+		}
+
+		/// <summary>
+		///   Returns all members of this class with the corresponding MemberTypes
+		///   and BindingFlags.
+		/// </summary>
+		/// <remarks>
+		///   When implementing this method, make sure not to return any inherited
+		///   members and check the MemberTypes and BindingFlags properly.
+		///   Unfortunately, System.Reflection is lame and doesn't provide a way to
+		///   get the BindingFlags (static/non-static,public/non-public) in the
+		///   MemberInfo class, but the cache needs this information.  That's why
+		///   this method is called multiple times with different BindingFlags.
+		/// </remarks>
+		MemberList GetMembers (MemberTypes mt, BindingFlags bf);
+
+		/// <summary>
+		///   Return the container's member cache.
+		/// </summary>
+		MemberCache MemberCache {
+			get;
+		}
+	}
+
+	/// <summary>
+	///   The MemberCache is used by dynamic and non-dynamic types to speed up
+	///   member lookups.  It has a member name based hash table; it maps each member
+	///   name to a list of CacheEntry objects.  Each CacheEntry contains a MemberInfo
+	///   and the BindingFlags that were initially used to get it.  The cache contains
+	///   all members of the current class and all inherited members.  If this cache is
+	///   for an interface types, it also contains all inherited members.
+	///
+	///   There are two ways to get a MemberCache:
+	///   * if this is a dynamic type, lookup the corresponding DeclSpace and then
+	///     use the DeclSpace.MemberCache property.
+	///   * if this not a dynamic type, call TypeHandle.GetTypeHandle() to get a
+	///     TypeHandle instance for the type and then use TypeHandle.MemberCache.
+	/// </summary>
+	public class MemberCache {
+		public readonly IMemberContainer Container;
+		protected Hashtable member_hash;
+		protected Hashtable method_hash;
+
+		/// <summary>
+		///   Create a new MemberCache for the given IMemberContainer `container'.
+		/// </summary>
+		public MemberCache (IMemberContainer container)
+		{
+			this.Container = container;
+
+			Timer.IncrementCounter (CounterType.MemberCache);
+			Timer.StartTimer (TimerType.CacheInit);
+
+			// If we have a parent class (we have a parent class unless we're
+			// TypeManager.object_type), we deep-copy its MemberCache here.
+			if (Container.Parent != null)
+				member_hash = SetupCache (Container.Parent.MemberCache);
+			else if (Container.IsInterface)
+				member_hash = SetupCacheForInterface ();
+			else
+				member_hash = new Hashtable ();
+
+			// If this is neither a dynamic type nor an interface, create a special
+			// method cache with all declared and inherited methods.
+			Type type = container.Type;
+			if (!(type is TypeBuilder) && !type.IsInterface) {
+				method_hash = new Hashtable ();
+				AddMethods (type);
+			}
+
+			// Add all members from the current class.
+			AddMembers (Container);
+
+			Timer.StopTimer (TimerType.CacheInit);
+		}
+
+		/// <summary>
+		///   Bootstrap this member cache by doing a deep-copy of our parent.
+		/// </summary>
+		Hashtable SetupCache (MemberCache parent)
+		{
+			Hashtable hash = new Hashtable ();
+
+			IDictionaryEnumerator it = parent.member_hash.GetEnumerator ();
+			while (it.MoveNext ()) {
+				hash [it.Key] = ((ArrayList) it.Value).Clone ();
+			}
+
+			return hash;
+		}
+
+		/// <summary>
+		///   Add the contents of `new_hash' to `hash'.
+		/// </summary>
+		void AddHashtable (Hashtable hash, Hashtable new_hash)
+		{
+			IDictionaryEnumerator it = new_hash.GetEnumerator ();
+			while (it.MoveNext ()) {
+				ArrayList list = (ArrayList) hash [it.Key];
+				if (list != null)
+					list.AddRange ((ArrayList) it.Value);
+				else
+					hash [it.Key] = ((ArrayList) it.Value).Clone ();
+			}
+		}
+
+		/// <summary>
+		///   Bootstrap the member cache for an interface type.
+		///   Type.GetMembers() won't return any inherited members for interface types,
+		///   so we need to do this manually.  Interfaces also inherit from System.Object.
+		/// </summary>
+		Hashtable SetupCacheForInterface ()
+		{
+			Hashtable hash = SetupCache (TypeHandle.ObjectType.MemberCache);
+			Type [] ifaces = TypeManager.GetInterfaces (Container.Type);
+
+			foreach (Type iface in ifaces) {
+				IMemberContainer iface_container =
+					TypeManager.LookupMemberContainer (iface);
+
+				MemberCache iface_cache = iface_container.MemberCache;
+				AddHashtable (hash, iface_cache.member_hash);
+			}
+
+			return hash;
+		}
+
+		/// <summary>
+		///   Add all members from class `container' to the cache.
+		/// </summary>
+		void AddMembers (IMemberContainer container)
+		{
+			// We need to call AddMembers() with a single member type at a time
+			// to get the member type part of CacheEntry.EntryType right.
+			AddMembers (MemberTypes.Constructor, container);
+			AddMembers (MemberTypes.Field, container);
+			AddMembers (MemberTypes.Method, container);
+			AddMembers (MemberTypes.Property, container);
+			AddMembers (MemberTypes.Event, container);
+			// Nested types are returned by both Static and Instance searches.
+			AddMembers (MemberTypes.NestedType,
+				    BindingFlags.Static | BindingFlags.Public, container);
+			AddMembers (MemberTypes.NestedType,
+				    BindingFlags.Static | BindingFlags.NonPublic, container);
+		}
+
+		void AddMembers (MemberTypes mt, IMemberContainer container)
+		{
+			AddMembers (mt, BindingFlags.Static | BindingFlags.Public, container);
+			AddMembers (mt, BindingFlags.Static | BindingFlags.NonPublic, container);
+			AddMembers (mt, BindingFlags.Instance | BindingFlags.Public, container);
+			AddMembers (mt, BindingFlags.Instance | BindingFlags.NonPublic, container);
+		}
+
+		/// <summary>
+		///   Add all members from class `container' with the requested MemberTypes and
+		///   BindingFlags to the cache.  This method is called multiple times with different
+		///   MemberTypes and BindingFlags.
+		/// </summary>
+		void AddMembers (MemberTypes mt, BindingFlags bf, IMemberContainer container)
+		{
+			MemberList members = container.GetMembers (mt, bf);
+			BindingFlags new_bf = (container == Container) ?
+				bf | BindingFlags.DeclaredOnly : bf;
+
+			foreach (MemberInfo member in members) {
+				string name = member.Name;
+
+				// We use a name-based hash table of ArrayList's.
+				ArrayList list = (ArrayList) member_hash [name];
+				if (list == null) {
+					list = new ArrayList ();
+					member_hash.Add (name, list);
+				}
+
+				// When this method is called for the current class, the list will
+				// already contain all inherited members from our parent classes.
+				// We cannot add new members in front of the list since this'd be an
+				// expensive operation, that's why the list is sorted in reverse order
+				// (ie. members from the current class are coming last).
+				list.Add (new CacheEntry (container, member, mt, bf));
+			}
+		}
+
+		/// <summary>
+		///   Add all declared and inherited methods from class `type' to the method cache.
+		/// </summary>
+		void AddMethods (Type type)
+		{
+			AddMethods (BindingFlags.Static | BindingFlags.Public, type);
+			AddMethods (BindingFlags.Static | BindingFlags.NonPublic, type);
+			AddMethods (BindingFlags.Instance | BindingFlags.Public, type);
+			AddMethods (BindingFlags.Instance | BindingFlags.NonPublic, type);
+		}
+
+		void AddMethods (BindingFlags bf, Type type)
+		{
+			MemberInfo [] members = type.GetMethods (bf);
+
+			foreach (MethodBase member in members) {
+				string name = member.Name;
+
+				// Varargs methods aren't allowed in C# code.
+				if ((member.CallingConvention & CallingConventions.VarArgs) != 0)
+					continue;
+
+				// We use a name-based hash table of ArrayList's.
+				ArrayList list = (ArrayList) method_hash [name];
+				if (list == null) {
+					list = new ArrayList ();
+					method_hash.Add (name, list);
+				}
+
+				// Unfortunately, the elements returned by Type.GetMethods() aren't
+				// sorted so we need to do this check for every member.
+				BindingFlags new_bf = bf;
+				if (member.DeclaringType == type)
+					new_bf |= BindingFlags.DeclaredOnly;
+
+				list.Add (new CacheEntry (Container, member, MemberTypes.Method, new_bf));
+			}
+		}
+
+		/// <summary>
+		///   Compute and return a appropriate `EntryType' magic number for the given
+		///   MemberTypes and BindingFlags.
+		/// </summary>
+		protected static EntryType GetEntryType (MemberTypes mt, BindingFlags bf)
+		{
+			EntryType type = EntryType.None;
+
+			if ((mt & MemberTypes.Constructor) != 0)
+				type |= EntryType.Constructor;
+			if ((mt & MemberTypes.Event) != 0)
+				type |= EntryType.Event;
+			if ((mt & MemberTypes.Field) != 0)
+				type |= EntryType.Field;
+			if ((mt & MemberTypes.Method) != 0)
+				type |= EntryType.Method;
+			if ((mt & MemberTypes.Property) != 0)
+				type |= EntryType.Property;
+			// Nested types are returned by static and instance searches.
+			if ((mt & MemberTypes.NestedType) != 0)
+				type |= EntryType.NestedType | EntryType.Static | EntryType.Instance;
+
+			if ((bf & BindingFlags.Instance) != 0)
+				type |= EntryType.Instance;
+			if ((bf & BindingFlags.Static) != 0)
+				type |= EntryType.Static;
+			if ((bf & BindingFlags.Public) != 0)
+				type |= EntryType.Public;
+			if ((bf & BindingFlags.NonPublic) != 0)
+				type |= EntryType.NonPublic;
+			if ((bf & BindingFlags.DeclaredOnly) != 0)
+				type |= EntryType.Declared;
+
+			return type;
+		}
+
+		/// <summary>
+		///   The `MemberTypes' enumeration type is a [Flags] type which means that it may
+		///   denote multiple member types.  Returns true if the given flags value denotes a
+		///   single member types.
+		/// </summary>
+		public static bool IsSingleMemberType (MemberTypes mt)
+		{
+			switch (mt) {
+			case MemberTypes.Constructor:
+			case MemberTypes.Event:
+			case MemberTypes.Field:
+			case MemberTypes.Method:
+			case MemberTypes.Property:
+			case MemberTypes.NestedType:
+				return true;
+
+			default:
+				return false;
+			}
+		}
+
+		/// <summary>
+		///   We encode the MemberTypes and BindingFlags of each members in a "magic"
+		///   number to speed up the searching process.
+		/// </summary>
+		[Flags]
+		protected enum EntryType {
+			None		= 0x000,
+
+			Instance	= 0x001,
+			Static		= 0x002,
+			MaskStatic	= Instance|Static,
+
+			Public		= 0x004,
+			NonPublic	= 0x008,
+			MaskProtection	= Public|NonPublic,
+
+			Declared	= 0x010,
+
+			Constructor	= 0x020,
+			Event		= 0x040,
+			Field		= 0x080,
+			Method		= 0x100,
+			Property	= 0x200,
+			NestedType	= 0x400,
+
+			MaskType	= Constructor|Event|Field|Method|Property|NestedType
+		}
+
+		protected struct CacheEntry {
+			public readonly IMemberContainer Container;
+			public readonly EntryType EntryType;
+			public readonly MemberInfo Member;
+
+			public CacheEntry (IMemberContainer container, MemberInfo member,
+					   MemberTypes mt, BindingFlags bf)
+			{
+				this.Container = container;
+				this.Member = member;
+				this.EntryType = GetEntryType (mt, bf);
+			}
+		}
+
+		/// <summary>
+		///   This is called each time we're walking up one level in the class hierarchy
+		///   and checks whether we can abort the search since we've already found what
+		///   we were looking for.
+		/// </summary>
+		protected bool DoneSearching (ArrayList list)
+		{
+			//
+			// We've found exactly one member in the current class and it's not
+			// a method or constructor.
+			//
+			if (list.Count == 1 && !(list [0] is MethodBase))
+				return true;
+
+			//
+			// Multiple properties: we query those just to find out the indexer
+			// name
+			//
+			if ((list.Count > 0) && (list [0] is PropertyInfo))
+				return true;
+
+			return false;
+		}
+
+		/// <summary>
+		///   Looks up members with name `name'.  If you provide an optional
+		///   filter function, it'll only be called with members matching the
+		///   requested member name.
+		///
+		///   This method will try to use the cache to do the lookup if possible.
+		///
+		///   Unlike other FindMembers implementations, this method will always
+		///   check all inherited members - even when called on an interface type.
+		///
+		///   If you know that you're only looking for methods, you should use
+		///   MemberTypes.Method alone since this speeds up the lookup a bit.
+		///   When doing a method-only search, it'll try to use a special method
+		///   cache (unless it's a dynamic type or an interface) and the returned
+		///   MemberInfo's will have the correct ReflectedType for inherited methods.
+		///   The lookup process will automatically restart itself in method-only
+		///   search mode if it discovers that it's about to return methods.
+		/// </summary>
+		public MemberList FindMembers (MemberTypes mt, BindingFlags bf, string name,
+					       MemberFilter filter, object criteria)
+		{
+			bool declared_only = (bf & BindingFlags.DeclaredOnly) != 0;
+			bool method_search = mt == MemberTypes.Method;
+			// If we have a method cache and we aren't already doing a method-only search,
+			// then we restart a method search if the first match is a method.
+			bool do_method_search = !method_search && (method_hash != null);
+
+			ArrayList applicable;
+
+			// If this is a method-only search, we try to use the method cache if
+			// possible; a lookup in the method cache will return a MemberInfo with
+			// the correct ReflectedType for inherited methods.
+			if (method_search && (method_hash != null))
+				applicable = (ArrayList) method_hash [name];
+			else
+				applicable = (ArrayList) member_hash [name];
+
+			if (applicable == null)
+				return MemberList.Empty;
+
+			ArrayList list = new ArrayList ();
+
+			Timer.StartTimer (TimerType.CachedLookup);
+
+			EntryType type = GetEntryType (mt, bf);
+
+			IMemberContainer current = Container;
+
+			// `applicable' is a list of all members with the given member name `name'
+			// in the current class and all its parent classes.  The list is sorted in
+			// reverse order due to the way how the cache is initialy created (to speed
+			// things up, we're doing a deep-copy of our parent).
+
+			for (int i = applicable.Count-1; i >= 0; i--) {
+				CacheEntry entry = (CacheEntry) applicable [i];
+
+				// This happens each time we're walking one level up in the class
+				// hierarchy.  If we're doing a DeclaredOnly search, we must abort
+				// the first time this happens (this may already happen in the first
+				// iteration of this loop if there are no members with the name we're
+				// looking for in the current class).
+				if (entry.Container != current) {
+					if (declared_only || DoneSearching (list))
+						break;
+
+					current = entry.Container;
+				}
+
+				// Is the member of the correct type ?
+				if ((entry.EntryType & type & EntryType.MaskType) == 0)
+					continue;
+
+				// Is the member static/non-static ?
+				if ((entry.EntryType & type & EntryType.MaskStatic) == 0)
+					continue;
+
+				// Apply the filter to it.
+				if (filter (entry.Member, criteria)) {
+					if ((entry.EntryType & EntryType.MaskType) != EntryType.Method)
+						do_method_search = false;
+					list.Add (entry.Member);
+				}
+			}
+
+			Timer.StopTimer (TimerType.CachedLookup);
+
+			// If we have a method cache and we aren't already doing a method-only
+			// search, we restart in method-only search mode if the first match is
+			// a method.  This ensures that we return a MemberInfo with the correct
+			// ReflectedType for inherited methods.
+			if (do_method_search && (list.Count > 0))
+				return FindMembers (MemberTypes.Method, bf, name, filter, criteria);
+
+			return new MemberList (list);
+		}
+	}
+}
diff --git a/mcs/mcs/delegate.cs b/mcs/mcs/delegate.cs
new file mode 100644
index 00000000000..875c86ea222
--- /dev/null
+++ b/mcs/mcs/delegate.cs
@@ -0,0 +1,756 @@
+//

+// delegate.cs: Delegate Handler

+//

+// Author: Ravi Pratap (ravi@ximian.com)

+//

+// Licensed under the terms of the GNU GPL

+//

+// (C) 2001 Ximian, Inc (http://www.ximian.com)

+//

+//

+

+using System;

+using System.Collections;

+using System.Reflection;

+using System.Reflection.Emit;

+using System.Text;

+

+namespace Mono.CSharp {

+

+	/// <summary>

+	///   Holds Delegates

+	/// </summary>

+	public class Delegate : DeclSpace {

+ 		public Expression ReturnType;

+		public Parameters      Parameters;

+		public Attributes      OptAttributes;

+

+		public ConstructorBuilder ConstructorBuilder;

+		public MethodBuilder      InvokeBuilder;

+		public MethodBuilder      BeginInvokeBuilder;

+		public MethodBuilder      EndInvokeBuilder;

+		

+		Type [] param_types;

+		Type ret_type;

+		

+		Expression instance_expr;

+		MethodBase delegate_method;

+	

+		const int AllowedModifiers =

+			Modifiers.NEW |

+			Modifiers.PUBLIC |

+			Modifiers.PROTECTED |

+			Modifiers.INTERNAL |

+		        Modifiers.UNSAFE |

+			Modifiers.PRIVATE;

+

+ 		public Delegate (TypeContainer parent, Expression type, int mod_flags,

+				 string name, Parameters param_list,

+				 Attributes attrs, Location l)

+			: base (parent, name, l)

+		{

+			this.ReturnType = type;

+			ModFlags        = Modifiers.Check (AllowedModifiers, mod_flags,

+							   IsTopLevel ? Modifiers.INTERNAL :

+							   Modifiers.PRIVATE, l);

+			Parameters      = param_list;

+			OptAttributes   = attrs;

+		}

+

+		public override TypeBuilder DefineType ()

+		{

+			TypeAttributes attr;

+

+			if (TypeBuilder != null)

+				return TypeBuilder;

+			

+			if (IsTopLevel) {

+				ModuleBuilder builder = CodeGen.ModuleBuilder;

+				attr = TypeAttributes.Public | TypeAttributes.Class | TypeAttributes.Sealed;

+

+				TypeBuilder = builder.DefineType (

+					Name, attr, TypeManager.multicast_delegate_type);

+			} else {

+				TypeBuilder builder = Parent.TypeBuilder;

+				attr = TypeAttributes.NestedPublic | TypeAttributes.Class |

+					TypeAttributes.Sealed;

+

+				string name = Name.Substring (1 + Name.LastIndexOf ('.'));

+				TypeBuilder = builder.DefineNestedType (

+					name, attr, TypeManager.multicast_delegate_type);

+			}

+

+			TypeManager.AddDelegateType (Name, TypeBuilder, this);

+

+			return TypeBuilder;

+		}

+

+ 		public override bool DefineMembers (TypeContainer container)

+		{

+			return true;

+		}

+

+ 		public override bool Define (TypeContainer container)

+		{

+			MethodAttributes mattr;

+			int i;

+

+			// FIXME: POSSIBLY make this static, as it is always constant

+			//

+			Type [] const_arg_types = new Type [2];

+			const_arg_types [0] = TypeManager.object_type;

+			const_arg_types [1] = TypeManager.intptr_type;

+

+			mattr = MethodAttributes.RTSpecialName | MethodAttributes.SpecialName |

+				MethodAttributes.HideBySig | MethodAttributes.Public;

+

+			ConstructorBuilder = TypeBuilder.DefineConstructor (mattr,

+									    CallingConventions.Standard,

+									    const_arg_types);

+

+			ConstructorBuilder.DefineParameter (1, ParameterAttributes.None, "object");

+			ConstructorBuilder.DefineParameter (2, ParameterAttributes.None, "method");

+			//

+			// HACK because System.Reflection.Emit is lame

+			//

+			//

+			// FIXME: POSSIBLY make these static, as they are always the same

+			Parameter [] fixed_pars = new Parameter [2];

+			fixed_pars [0] = new Parameter (null, null, Parameter.Modifier.NONE, null);

+			fixed_pars [1] = new Parameter (null, null, Parameter.Modifier.NONE, null);

+			Parameters const_parameters = new Parameters (fixed_pars, null, Location);

+			

+			TypeManager.RegisterMethod (

+				ConstructorBuilder,

+				new InternalParameters (const_arg_types, const_parameters),

+				const_arg_types);

+				

+			

+			ConstructorBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);

+

+			//

+			// Here the various methods like Invoke, BeginInvoke etc are defined

+			//

+			// First, call the `out of band' special method for

+			// defining recursively any types we need:

+			

+			if (!Parameters.ComputeAndDefineParameterTypes (this))

+				return false;

+			

+ 			param_types = Parameters.GetParameterInfo (this);

+			if (param_types == null)

+				return false;

+

+			//

+			// Invoke method

+			//

+

+			// Check accessibility

+			foreach (Type partype in param_types)

+				if (!container.AsAccessible (partype, ModFlags)) {

+					Report.Error (59, Location,

+						      "Inconsistent accessibility: parameter type `" +

+						      TypeManager.CSharpName (partype) + "` is less " +

+						      "accessible than delegate `" + Name + "'");

+					return false;

+				}

+			

+ 			ReturnType = ResolveTypeExpr (ReturnType, false, Location);

+   			ret_type = ReturnType.Type;

+			if (ret_type == null)

+				return false;

+

+			if (!container.AsAccessible (ret_type, ModFlags)) {

+				Report.Error (58, Location,

+					      "Inconsistent accessibility: return type `" +

+					      TypeManager.CSharpName (ret_type) + "` is less " +

+					      "accessible than delegate `" + Name + "'");

+				return false;

+			}

+

+			//

+			// We don't have to check any others because they are all

+			// guaranteed to be accessible - they are standard types.

+			//

+			

+  			CallingConventions cc = Parameters.GetCallingConvention ();

+

+ 			mattr = MethodAttributes.Public | MethodAttributes.HideBySig | MethodAttributes.Virtual;

+

+ 			InvokeBuilder = TypeBuilder.DefineMethod ("Invoke", 

+ 								  mattr,		     

+ 								  cc,

+ 								  ret_type,		     

+ 								  param_types);

+

+			i = 0;

+			if (Parameters.FixedParameters != null){

+				int top = Parameters.FixedParameters.Length;

+				Parameter p;

+				

+				for (; i < top; i++) {

+					p = Parameters.FixedParameters [i];

+

+					InvokeBuilder.DefineParameter (

+						i+1, p.Attributes, p.Name);

+				}

+			}

+			if (Parameters.ArrayParameter != null){

+				Parameter p = Parameters.ArrayParameter;

+				

+				InvokeBuilder.DefineParameter (

+					i+1, p.Attributes, p.Name);

+			}

+			

+			InvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);

+

+			TypeManager.RegisterMethod (InvokeBuilder,

+						    new InternalParameters (container, Parameters),

+						    param_types);

+

+			//

+			// BeginInvoke

+			//

+			int params_num = param_types.Length;

+			Type [] async_param_types = new Type [params_num + 2];

+

+			param_types.CopyTo (async_param_types, 0);

+

+			async_param_types [params_num] = TypeManager.asynccallback_type;

+			async_param_types [params_num + 1] = TypeManager.object_type;

+

+			mattr = MethodAttributes.Public | MethodAttributes.HideBySig |

+				MethodAttributes.Virtual | MethodAttributes.NewSlot;

+			

+			BeginInvokeBuilder = TypeBuilder.DefineMethod ("BeginInvoke",

+								       mattr,

+								       cc,

+								       TypeManager.iasyncresult_type,

+								       async_param_types);

+

+			i = 0;

+			if (Parameters.FixedParameters != null){

+				int top = Parameters.FixedParameters.Length;

+				Parameter p;

+				

+				for (i = 0 ; i < top; i++) {

+					p = Parameters.FixedParameters [i];

+

+					BeginInvokeBuilder.DefineParameter (

+						i+1, p.Attributes, p.Name);

+				}

+			}

+			if (Parameters.ArrayParameter != null){

+				Parameter p = Parameters.ArrayParameter;

+				

+				BeginInvokeBuilder.DefineParameter (

+					i+1, p.Attributes, p.Name);

+				i++;

+			}

+

+			BeginInvokeBuilder.DefineParameter (i + 1, ParameterAttributes.None, "callback");

+			BeginInvokeBuilder.DefineParameter (i + 2, ParameterAttributes.None, "object");

+			

+			BeginInvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);

+

+			Parameter [] async_params = new Parameter [params_num + 2];

+			int n = 0;

+			if (Parameters.FixedParameters != null){

+				Parameters.FixedParameters.CopyTo (async_params, 0);

+				n = Parameters.FixedParameters.Length;

+			}

+			if (Parameters.ArrayParameter != null)

+				async_params [n] = Parameters.ArrayParameter;

+			

+			async_params [params_num] = new Parameter (

+				TypeManager.system_asynccallback_expr, "callback",

+								   Parameter.Modifier.NONE, null);

+			async_params [params_num + 1] = new Parameter (

+				TypeManager.system_object_expr, "object",

+								   Parameter.Modifier.NONE, null);

+

+			Parameters async_parameters = new Parameters (async_params, null, Location);

+			

+			async_parameters.ComputeAndDefineParameterTypes (this);

+			TypeManager.RegisterMethod (BeginInvokeBuilder,

+						    new InternalParameters (container, async_parameters),

+						    async_param_types);

+

+			//

+			// EndInvoke

+			//

+			Type [] end_param_types = new Type [1];

+			end_param_types [0] = TypeManager.iasyncresult_type;

+			

+			EndInvokeBuilder = TypeBuilder.DefineMethod ("EndInvoke",

+								     mattr,

+								     cc,

+								     ret_type,

+								     end_param_types);

+			EndInvokeBuilder.DefineParameter (1, ParameterAttributes.None, "result");

+			

+			EndInvokeBuilder.SetImplementationFlags (MethodImplAttributes.Runtime);

+

+			Parameter [] end_params = new Parameter [1];

+			end_params [0] = new Parameter (

+				TypeManager.system_iasyncresult_expr, "result",

+							Parameter.Modifier.NONE, null);

+

+			TypeManager.RegisterMethod (

+				EndInvokeBuilder, new InternalParameters (

+					container,

+					new Parameters (

+						end_params, null, Location)),

+						    end_param_types);

+

+			return true;

+		}

+

+		/// <summary>

+		///  Verifies whether the method in question is compatible with the delegate

+		///  Returns the method itself if okay and null if not.

+		/// </summary>

+		public static MethodBase VerifyMethod (EmitContext ec, Type delegate_type, MethodBase mb,

+						       Location loc)

+		{

+			ParameterData pd = Invocation.GetParameterData (mb);

+

+			int pd_count = pd.Count;

+

+			Expression ml = Expression.MemberLookup (

+				ec, delegate_type, "Invoke", loc);

+

+			if (!(ml is MethodGroupExpr)) {

+				Report.Error (-100, loc, "Internal error : could not find Invoke method!");

+				return null;

+			}

+

+			MethodBase invoke_mb = ((MethodGroupExpr) ml).Methods [0];

+

+			ParameterData invoke_pd = Invocation.GetParameterData (invoke_mb);

+

+			if (invoke_pd.Count != pd_count)

+				return null;

+

+			for (int i = pd_count; i > 0; ) {

+				i--;

+

+				if (invoke_pd.ParameterType (i) == pd.ParameterType (i))

+					continue;

+				else

+					return null;

+			}

+

+			if (((MethodInfo) invoke_mb).ReturnType == ((MethodInfo) mb).ReturnType)

+				return mb;

+			else

+				return null;

+		}

+

+		// <summary>

+		//  Verifies whether the invocation arguments are compatible with the

+		//  delegate's target method

+		// </summary>

+		public static bool VerifyApplicability (EmitContext ec,

+							Type delegate_type,

+							ArrayList args,

+							Location loc)

+		{

+			int arg_count;

+

+			if (args == null)

+				arg_count = 0;

+			else

+				arg_count = args.Count;

+

+			Expression ml = Expression.MemberLookup (

+				ec, delegate_type, "Invoke", loc);

+			

+			if (!(ml is MethodGroupExpr)) {

+				Report.Error (-100, loc, "Internal error : could not find Invoke method!");

+				return false;

+			}

+			

+			MethodBase mb = ((MethodGroupExpr) ml).Methods [0];

+			ParameterData pd = Invocation.GetParameterData (mb);

+

+			int pd_count = pd.Count;

+

+			bool not_params_method = (pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS);

+

+			if (not_params_method && pd_count != arg_count) {

+				Report.Error (1593, loc,

+					      "Delegate '" + delegate_type.ToString ()

+					      + "' does not take '" + arg_count + "' arguments");

+				return false;

+			}

+

+			return Invocation.VerifyArgumentsCompat (ec, args, arg_count, mb, !not_params_method,

+								 delegate_type, loc);

+		}

+		

+		/// <summary>

+		///  Verifies whether the delegate in question is compatible with this one in

+		///  order to determine if instantiation from the same is possible.

+		/// </summary>

+		public static bool VerifyDelegate (EmitContext ec, Type delegate_type, Type probe_type, Location loc)

+		{

+			Expression ml = Expression.MemberLookup (

+				ec, delegate_type, "Invoke", loc);

+			

+			if (!(ml is MethodGroupExpr)) {

+				Report.Error (-100, loc, "Internal error : could not find Invoke method!");

+				return false;

+			}

+			

+			MethodBase mb = ((MethodGroupExpr) ml).Methods [0];

+			ParameterData pd = Invocation.GetParameterData (mb);

+

+			Expression probe_ml = Expression.MemberLookup (

+				ec, delegate_type, "Invoke", loc);

+			

+			if (!(probe_ml is MethodGroupExpr)) {

+				Report.Error (-100, loc, "Internal error : could not find Invoke method!");

+				return false;

+			}

+			

+			MethodBase probe_mb = ((MethodGroupExpr) probe_ml).Methods [0];

+			ParameterData probe_pd = Invocation.GetParameterData (probe_mb);

+			

+			if (((MethodInfo) mb).ReturnType != ((MethodInfo) probe_mb).ReturnType)

+				return false;

+

+			if (pd.Count != probe_pd.Count)

+				return false;

+

+			for (int i = pd.Count; i > 0; ) {

+				i--;

+

+				if (pd.ParameterType (i) != probe_pd.ParameterType (i) ||

+				    pd.ParameterModifier (i) != probe_pd.ParameterModifier (i))

+					return false;

+			}

+			

+			return true;

+		}

+		

+		public static string FullDelegateDesc (Type del_type, MethodBase mb, ParameterData pd)

+		{

+			StringBuilder sb = new StringBuilder (TypeManager.CSharpName (((MethodInfo) mb).ReturnType));

+			

+			sb.Append (" " + del_type.ToString ());

+			sb.Append (" (");

+

+			int length = pd.Count;

+			

+			for (int i = length; i > 0; ) {

+				i--;

+				

+				sb.Append (TypeManager.CSharpName (pd.ParameterType (length - i - 1)));

+				if (i != 0)

+					sb.Append (", ");

+			}

+			

+			sb.Append (")");

+			return sb.ToString ();

+			

+		}

+		

+		// Hack around System.Reflection as found everywhere else

+		public override MemberList FindMembers (MemberTypes mt, BindingFlags bf,

+							MemberFilter filter, object criteria)

+		{

+			ArrayList members = new ArrayList ();

+

+			if ((mt & MemberTypes.Method) != 0) {

+				if (ConstructorBuilder != null)

+				if (filter (ConstructorBuilder, criteria))

+					members.Add (ConstructorBuilder);

+

+				if (InvokeBuilder != null)

+				if (filter (InvokeBuilder, criteria))

+					members.Add (InvokeBuilder);

+

+				if (BeginInvokeBuilder != null)

+				if (filter (BeginInvokeBuilder, criteria))

+					members.Add (BeginInvokeBuilder);

+

+				if (EndInvokeBuilder != null)

+				if (filter (EndInvokeBuilder, criteria))

+					members.Add (EndInvokeBuilder);

+			}

+

+			return new MemberList (members);

+		}

+

+		public override MemberCache MemberCache {

+			get {

+				return null;

+			}

+		}

+

+		public void CloseDelegate ()

+		{

+			TypeBuilder.CreateType ();

+		}

+		

+		public Expression InstanceExpression {

+			get {

+				return instance_expr;

+			}

+			set {

+				instance_expr = value;

+			}

+		}

+

+		public MethodBase TargetMethod {

+			get {

+				return delegate_method;

+			}

+			set {

+				delegate_method = value;

+			}

+		}

+

+		public Type TargetReturnType {

+			get {

+				return ret_type;

+			}

+		}

+

+		public Type [] ParameterTypes {

+			get {

+				return param_types;

+			}

+		}

+		

+	}

+

+	public class NewDelegate : Expression {

+

+		public ArrayList Arguments;

+

+		MethodBase constructor_method;

+		MethodBase delegate_method;

+		Expression delegate_instance_expr;

+

+		public NewDelegate (Type type, ArrayList Arguments, Location loc)

+		{

+			this.type = type;

+			this.Arguments = Arguments;

+			this.loc  = loc; 

+		}

+

+		public override Expression DoResolve (EmitContext ec)

+		{

+			if (Arguments == null) {

+				Report.Error (-11, loc,

+					      "Delegate creation expression takes only one argument");

+				return null;

+			}

+

+			if (Arguments.Count != 1) {

+				Report.Error (-11, loc,

+					      "Delegate creation expression takes only one argument");

+				return null;

+			}

+

+			Expression ml = Expression.MemberLookup (

+				ec, type, ".ctor", loc);

+

+			if (!(ml is MethodGroupExpr)) {

+				Report.Error (-100, loc, "Internal error : Could not find delegate constructor!");

+				return null;

+			}

+

+			constructor_method = ((MethodGroupExpr) ml).Methods [0];

+			Argument a = (Argument) Arguments [0];

+			

+			if (!a.ResolveMethodGroup (ec, Location))

+				return null;

+			

+			Expression e = a.Expr;

+

+			Expression invoke_method = Expression.MemberLookup (

+				ec, type, "Invoke", MemberTypes.Method,

+				Expression.AllBindingFlags, loc);

+

+			if (invoke_method == null) {

+				Report.Error (-200, loc, "Internal error ! COuld not find Invoke method!");

+				return null;

+			}

+

+			if (e is MethodGroupExpr) {

+				MethodGroupExpr mg = (MethodGroupExpr) e;

+

+				foreach (MethodInfo mi in mg.Methods){

+					delegate_method  = Delegate.VerifyMethod (ec, type, mi, loc);

+

+					if (delegate_method != null)

+						break;

+				}

+					

+				if (delegate_method == null) {

+					string method_desc;

+					if (mg.Methods.Length > 1)

+						method_desc = mg.Methods [0].Name;

+					else

+						method_desc = Invocation.FullMethodDesc (mg.Methods [0]);

+

+					MethodBase dm = ((MethodGroupExpr) invoke_method).Methods [0];

+					ParameterData param = Invocation.GetParameterData (dm);

+					string delegate_desc = Delegate.FullDelegateDesc (type, dm, param);

+

+					Report.Error (123, loc, "Method '" + method_desc + "' does not " +

+						      "match delegate '" + delegate_desc + "'");

+

+					return null;

+				}

+						

+				if (mg.InstanceExpression != null)

+					delegate_instance_expr = mg.InstanceExpression.Resolve (ec);

+				else {

+					if (!ec.IsStatic)

+						delegate_instance_expr = ec.This;

+					else

+						delegate_instance_expr = null;

+				}

+

+				if (delegate_instance_expr != null)

+					if (delegate_instance_expr.Type.IsValueType)

+						delegate_instance_expr = new BoxedCast (delegate_instance_expr);

+				

+				eclass = ExprClass.Value;

+				return this;

+			}

+

+			Type e_type = e.Type;

+

+			if (!TypeManager.IsDelegateType (e_type)) {

+				Report.Error (-12, loc, "Cannot create a delegate from something " +

+					      "not a delegate or a method.");

+				return null;

+			}

+

+			// This is what MS' compiler reports. We could always choose

+			// to be more verbose and actually give delegate-level specifics

+			

+			if (!Delegate.VerifyDelegate (ec, type, e_type, loc)) {

+				Report.Error (29, loc, "Cannot implicitly convert type '" + e_type + "' " +

+					      "to type '" + type + "'");

+				return null;

+			}

+				

+			delegate_instance_expr = e;

+			delegate_method        = ((MethodGroupExpr) invoke_method).Methods [0];

+			

+			eclass = ExprClass.Value;

+			return this;

+		}

+		

+		public override void Emit (EmitContext ec)

+		{

+			if (delegate_instance_expr == null ||

+			    delegate_method.IsStatic)

+				ec.ig.Emit (OpCodes.Ldnull);

+			else

+				delegate_instance_expr.Emit (ec);

+			

+			ec.ig.Emit (OpCodes.Ldftn, (MethodInfo) delegate_method);

+			ec.ig.Emit (OpCodes.Newobj, (ConstructorInfo) constructor_method);

+		}

+	}

+

+	public class DelegateInvocation : ExpressionStatement {

+

+		public Expression InstanceExpr;

+		public ArrayList  Arguments;

+

+		MethodBase method;

+		

+		public DelegateInvocation (Expression instance_expr, ArrayList args, Location loc)

+		{

+			this.InstanceExpr = instance_expr;

+			this.Arguments = args;

+			this.loc = loc;

+		}

+

+		public override Expression DoResolve (EmitContext ec)

+		{

+			if (InstanceExpr is EventExpr) {

+				

+				EventInfo ei = ((EventExpr) InstanceExpr).EventInfo;

+				

+				Expression ml = MemberLookup (

+					ec, ec.ContainerType, ei.Name,

+					MemberTypes.Event, AllBindingFlags | BindingFlags.DeclaredOnly, loc);

+

+				if (ml == null) {

+				        //

+					// If this is the case, then the Event does not belong 

+					// to this Type and so, according to the spec

+					// cannot be accessed directly

+					//

+					// Note that target will not appear as an EventExpr

+					// in the case it is being referenced within the same type container;

+					// it will appear as a FieldExpr in that case.

+					//

+					

+					Assign.error70 (ei, loc);

+					return null;

+				}

+			}

+			

+			

+			Type del_type = InstanceExpr.Type;

+			if (del_type == null)

+				return null;

+			

+			if (Arguments != null){

+				foreach (Argument a in Arguments){

+					if (!a.Resolve (ec, loc))

+						return null;

+				}

+			}

+			

+			if (!Delegate.VerifyApplicability (ec, del_type, Arguments, loc))

+				return null;

+

+			Expression lookup = Expression.MemberLookup (ec, del_type, "Invoke", loc);

+			if (!(lookup is MethodGroupExpr)) {

+				Report.Error (-100, loc, "Internal error : could not find Invoke method!");

+				return null;

+			}

+			

+			method = ((MethodGroupExpr) lookup).Methods [0];

+			type = ((MethodInfo) method).ReturnType;

+			eclass = ExprClass.Value;

+			

+			return this;

+		}

+

+		public override void Emit (EmitContext ec)

+		{

+			Delegate del = TypeManager.LookupDelegate (InstanceExpr.Type);

+

+			//

+			// Invocation on delegates call the virtual Invoke member

+			// so we are always `instance' calls

+			//

+			Invocation.EmitCall (ec, false, false, InstanceExpr, method, Arguments, loc);

+		}

+

+		public override void EmitStatement (EmitContext ec)

+		{

+			Emit (ec);

+			// 

+			// Pop the return value if there is one

+			//

+			if (method is MethodInfo){

+				if (((MethodInfo) method).ReturnType != TypeManager.void_type)

+					ec.ig.Emit (OpCodes.Pop);

+			}

+		}

+

+	}

+}

diff --git a/mcs/mcs/driver.cs b/mcs/mcs/driver.cs
new file mode 100755
index 00000000000..d0abd8904c9
--- /dev/null
+++ b/mcs/mcs/driver.cs
@@ -0,0 +1,1279 @@
+//
+// driver.cs: The compiler command line driver.
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+
+namespace Mono.CSharp
+{
+	using System;
+	using System.Reflection;
+	using System.Reflection.Emit;
+	using System.Collections;
+	using System.IO;
+	using System.Text;
+	using System.Globalization;
+	using Mono.Languages;
+
+	enum Target {
+		Library, Exe, Module, WinExe
+	};
+	
+	/// <summary>
+	///    The compiler driver.
+	/// </summary>
+	public class Driver
+	{
+		
+		//
+		// Assemblies references to be linked.   Initialized with
+		// mscorlib.dll here.
+		static ArrayList references;
+
+		//
+		// If any of these fail, we ignore the problem.  This is so
+		// that we can list all the assemblies in Windows and not fail
+		// if they are missing on Linux.
+		//
+		static ArrayList soft_references;
+
+		// Lookup paths
+		static ArrayList link_paths;
+
+		// Whether we want Yacc to output its progress
+		static bool yacc_verbose = false;
+
+		// Whether we want to only run the tokenizer
+		static bool tokenize = false;
+		
+		static string first_source;
+
+		static Target target = Target.Exe;
+		static string target_ext = ".exe";
+
+		static bool want_debugging_support = false;
+		static ArrayList debug_arglist = new ArrayList ();
+
+		static bool parse_only = false;
+		static bool timestamps = false;
+
+		//
+		// Whether to load the initial config file (what CSC.RSP has by default)
+		// 
+		static bool load_default_config = true;
+
+		static Hashtable response_file_list;
+		static Hashtable source_files = new Hashtable ();
+
+		//
+		// A list of resource files
+		//
+		static ArrayList resources;
+		static ArrayList embedded_resources;
+		
+		//
+		// An array of the defines from the command line
+		//
+		static ArrayList defines;
+
+		//
+		// Output file
+		//
+		static string output_file = null;
+
+		//
+		// Last time we took the time
+		//
+		static DateTime last_time, first_time;
+		public static void ShowTime (string msg)
+		{
+			if (!timestamps)
+				return;
+
+			DateTime now = DateTime.Now;
+			TimeSpan span = now - last_time;
+			last_time = now;
+
+			Console.WriteLine (
+				"[{0:00}:{1:000}] {2}",
+				(int) span.TotalSeconds, span.Milliseconds, msg);
+		}
+
+		public static void ShowTotalTime (string msg)
+		{
+			if (!timestamps)
+				return;
+
+			DateTime now = DateTime.Now;
+			TimeSpan span = now - first_time;
+			last_time = now;
+
+			Console.WriteLine (
+				"[{0:00}:{1:000}] {2}",
+				(int) span.TotalSeconds, span.Milliseconds, msg);
+		}	       
+	       
+		static void tokenize_file (string input_file)
+		{
+			Stream input;
+
+			try {
+				input = File.OpenRead (input_file);
+			} catch {
+				Report.Error (2001, "Source file '" + input_file + "' could not be opened");
+				return;
+			}
+
+			using (input){
+				Tokenizer lexer = new Tokenizer (input, input_file, defines);
+				int token, tokens = 0, errors = 0;
+
+				while ((token = lexer.token ()) != Token.EOF){
+					Location l = lexer.Location;
+					tokens++;
+					if (token == Token.ERROR)
+						errors++;
+				}
+				Console.WriteLine ("Tokenized: " + tokens + " found " + errors + " errors");
+			}
+			
+			return;
+		}
+
+		// MonoTODO("Change error code for aborted compilation to something reasonable")]		
+		static void parse (string input_file)
+		{
+			CSharpParser parser;
+			Stream input;
+
+			try {
+				input = File.OpenRead (input_file);
+			} catch {
+				Report.Error (2001, "Source file '" + input_file + "' could not be opened");
+				return;
+			}
+
+			parser = new CSharpParser (input_file, input, defines);
+			parser.yacc_verbose = yacc_verbose;
+			try {
+				parser.parse ();
+			} catch (Exception ex) {
+				Report.Error(666, "Compilation aborted: " + ex);
+			} finally {
+				input.Close ();
+			}
+		}
+		
+		static void Usage ()
+		{
+			Console.WriteLine (
+				"Mono C# compiler, (C) 2001 Ximian, Inc.\n" +
+				"mcs [options] source-files\n" +
+				"   --about            About the Mono C# compiler\n" +
+				"   -checked[+|-]      Set default context to checked\n" +
+				"   -define:S1[;S2]    Defines one or more symbols (short: /d:)\n" +
+				"   -debug[+-]         Generate debugging information\n" + 
+				"   -g                 Generate debugging information\n" +
+				"   --debug-args X     Specify additional arguments for the\n" +
+				"                      symbol writer.\n" +
+				"   --fatal            Makes errors fatal\n" +
+				"   -lib:PATH1,PATH2   Adds the paths to the assembly link path\n" +
+				"   -main:class        Specified the class that contains the entry point\n" +
+				"   -noconfig[+|-]     Disables implicit references to assemblies\n" +
+				"   -nostdlib[+|-]     Does not load core libraries\n" +
+				"   -nowarn:W1[,W2]    Disables one or more warnings\n" + 
+				"   -out:FNAME         Specifies output file\n" +
+				"   --parse            Only parses the source file\n" +
+				"   --expect-error X   Expect that error X will be encountered\n" +
+				"   -recurse:SPEC      Recursively compiles the files in SPEC ([dir]/file)\n" + 
+				"   -linkresource:FILE Links FILE as a resource\n" +
+				"   -resource:FILE     Embed FILE as a resource\n" +
+				"   -reference:ASS     References the specified assembly (-r:ASS)\n" +
+				"   --stacktrace       Shows stack trace at error location\n" +
+				"   -target:KIND       Specifies the target (KIND is one of: exe, winexe, " +
+				                       "library, module), (short: /t:)\n" +
+				"   --timestamp        Displays time stamps of various compiler events\n" +
+				"   -unsafe[+|-]       Allows unsafe code\n" +
+				"   -warnaserror[+|-]  Treat warnings as errors\n" +
+				"   -warn:LEVEL        Sets warning level (the highest is 4, the default)\n" +
+				"   -v                 Verbose parsing (for debugging the parser)\n" +
+#if MCS_DEBUG					       
+				"   --mcs-debug X      Sets MCS debugging level to X\n" +
+#endif						       
+                                "   @file              Read response file for more options\n\n" +
+				"Options can be of the form -option or /option");
+		}
+
+		static void About ()
+		{
+			Console.WriteLine (
+				"The Mono C# compiler is (C) 2001, 2002 Ximian, Inc.\n\n" +
+				"The compiler source code is released under the terms of the GNU GPL\n\n" +
+
+				"For more information on Mono, visit the project Web site\n" +
+				"   http://www.go-mono.com\n\n" +
+
+				"The compiler was written by Miguel de Icaza, Ravi Pratap and Martin Baulig");
+			Environment.Exit (0);
+		}
+		
+		public static int Main (string[] args)
+		{
+			bool ok = MainDriver (args);
+			
+			if (ok && Report.Errors == 0) {
+				Console.Write("Compilation succeeded");
+				if (Report.Warnings > 0) {
+					Console.Write(" - {0} warning(s)", Report.Warnings);
+				} 
+				Console.WriteLine();
+				return 0;
+			} else {
+				Console.WriteLine("Compilation failed: {0} error(s), {1} warnings",
+					Report.Errors, Report.Warnings);
+				return 1;
+			}
+		}
+
+		static public void LoadAssembly (string assembly, bool soft)
+		{
+			Assembly a;
+			string total_log = "";
+
+			try {
+				char[] path_chars = { '/', '\\', '.' };
+
+				if (assembly.IndexOfAny (path_chars) != -1) {
+					a = Assembly.LoadFrom (assembly);
+				} else {
+					a = Assembly.Load (assembly);
+				}
+				TypeManager.AddAssembly (a);
+
+			} catch (FileNotFoundException){
+				foreach (string dir in link_paths){
+					string full_path;
+					if (assembly.EndsWith (".dll"))
+						full_path = dir + "/" + assembly;
+					else
+						full_path = dir + "/" + assembly + ".dll";
+
+					try {
+						a = Assembly.LoadFrom (full_path);
+						TypeManager.AddAssembly (a);
+						return;
+					} catch (FileNotFoundException ff) {
+						total_log += ff.FusionLog;
+						continue;
+					}
+				}
+				if (!soft) {
+					Report.Error (6, "Cannot find assembly `" + assembly + "'" );
+					Console.WriteLine ("Log: \n" + total_log);
+				}
+			} catch (BadImageFormatException f) {
+				Report.Error(6, "Cannot load assembly (bad file format)" + f.FusionLog);
+			} catch (FileLoadException f){
+				Report.Error(6, "Cannot load assembly " + f.FusionLog);
+			} catch (ArgumentNullException){
+				Report.Error(6, "Cannot load assembly (null argument)");
+			}
+		}
+
+		/// <summary>
+		///   Loads all assemblies referenced on the command line
+		/// </summary>
+		static public void LoadReferences ()
+		{
+			foreach (string r in references)
+				LoadAssembly (r, false);
+
+			foreach (string r in soft_references)
+				LoadAssembly (r, true);
+			
+			return;
+		}
+
+		static void SetupDefaultDefines ()
+		{
+			defines = new ArrayList ();
+			defines.Add ("__MonoCS__");
+		}
+
+		static string [] LoadArgs (string file)
+		{
+			StreamReader f;
+			ArrayList args = new ArrayList ();
+			string line;
+			try {
+				f = new StreamReader (file);
+			} catch {
+				return null;
+			}
+
+			StringBuilder sb = new StringBuilder ();
+			
+			while ((line = f.ReadLine ()) != null){
+				int t = line.Length;
+
+				for (int i = 0; i < t; i++){
+					char c = line [i];
+					
+					if (c == '"' || c == '\''){
+						char end = c;
+						
+						for (i++; i < t; i++){
+							c = line [i];
+
+							if (c == end)
+								break;
+							sb.Append (c);
+						}
+					} else if (c == ' '){
+						if (sb.Length > 0){
+							args.Add (sb.ToString ());
+							sb.Length = 0;
+						}
+					} else
+						sb.Append (c);
+				}
+				if (sb.Length > 0){
+					args.Add (sb.ToString ());
+					sb.Length = 0;
+				}
+			}
+
+			string [] ret_value = new string [args.Count];
+			args.CopyTo (ret_value, 0);
+
+			return ret_value;
+		}
+
+		//
+		// Returns the directory where the system assemblies are installed
+		//
+		static string GetSystemDir ()
+		{
+			Assembly [] assemblies = AppDomain.CurrentDomain.GetAssemblies ();
+
+			foreach (Assembly a in assemblies){
+				string codebase = a.CodeBase;
+				if (codebase.EndsWith ("corlib.dll")){
+					return codebase.Substring (0, codebase.LastIndexOf ("/"));
+				}
+			}
+
+			Report.Error (-15, "Can not compute my system path");
+			return "";
+		}
+
+		//
+		// Given a path specification, splits the path from the file/pattern
+		//
+		static void SplitPathAndPattern (string spec, out string path, out string pattern)
+		{
+			int p = spec.LastIndexOf ("/");
+			if (p != -1){
+				//
+				// Windows does not like /file.cs, switch that to:
+				// "\", "file.cs"
+				//
+				if (p == 0){
+					path = "\\";
+					pattern = spec.Substring (1);
+				} else {
+					path = spec.Substring (0, p);
+					pattern = spec.Substring (p + 1);
+				}
+				return;
+			}
+
+			p = spec.LastIndexOf ("\\");
+			if (p != -1){
+				path = spec.Substring (0, p);
+				pattern = spec.Substring (p + 1);
+				return;
+			}
+
+			path = ".";
+			pattern = spec;
+		}
+
+		static void ProcessFile (string f)
+		{
+			if (first_source == null)
+				first_source = f;
+
+			if (source_files.Contains (f)){
+				Report.Error (
+					1516,
+					"Source file `" + f + "' specified multiple times");
+				Environment.Exit (1);
+			} else
+				source_files.Add (f, f);
+					
+			if (tokenize) {
+				tokenize_file (f);
+			} else {
+				parse (f);
+			}
+		}
+
+		static void CompileFiles (string spec, bool recurse)
+		{
+			string path, pattern;
+
+			SplitPathAndPattern (spec, out path, out pattern);
+			if (pattern.IndexOf ("*") == -1){
+				ProcessFile (spec);
+				return;
+			}
+
+			string [] files = null;
+			try {
+				files = Directory.GetFiles (path, pattern);
+			} catch (System.IO.DirectoryNotFoundException) {
+				Report.Error (2001, "Source file `" + spec + "' could not be found");
+				return;
+			} catch (System.IO.IOException){
+				Report.Error (2001, "Source file `" + spec + "' could not be found");
+				return;
+			}
+			foreach (string f in files) {
+				ProcessFile (f);
+			}
+
+			if (!recurse)
+				return;
+			
+			string [] dirs = null;
+
+			try {
+				dirs = Directory.GetDirectories (path);
+			} catch {
+			}
+			
+			foreach (string d in dirs) {
+					
+				// Don't include path in this string, as each
+				// directory entry already does
+				CompileFiles (d + "/" + pattern, true);
+			}
+		}
+
+		static void DefineDefaultConfig ()
+		{
+			//
+			// For now the "default config" is harcoded into the compiler
+			// we can move this outside later
+			//
+			string [] default_config = {
+				"System",
+				"System.Xml",
+#if false
+				//
+				// Is it worth pre-loading all this stuff?
+				//
+				"Accessibility",
+				"System.Configuration.Install",
+				"System.Data",
+				"System.Design",
+				"System.DirectoryServices",
+				"System.Drawing.Design",
+				"System.Drawing",
+				"System.EnterpriseServices",
+				"System.Management",
+				"System.Messaging",
+				"System.Runtime.Remoting",
+				"System.Runtime.Serialization.Formatters.Soap",
+				"System.Security",
+				"System.ServiceProcess",
+				"System.Web",
+				"System.Web.RegularExpressions",
+				"System.Web.Services",
+				"System.Windows.Forms"
+#endif
+			};
+			
+			int p = 0;
+			foreach (string def in default_config)
+				soft_references.Insert (p++, def);
+		}
+
+		static void SetOutputFile (string name)
+		{
+			output_file = name;
+			string bname = CodeGen.Basename (output_file);
+			if (bname.IndexOf (".") == -1)
+				output_file += ".exe";
+		}
+
+		static void SetWarningLevel (string s)
+		{
+			int level = 0;
+
+			try {
+				level = Int32.Parse (s);
+			} catch {
+				Report.Error (
+					1900,
+					"--wlevel requires an value from 0 to 4");
+				Environment.Exit (1);
+			}
+			if (level < 0 || level > 4){
+				Report.Error (1900, "Warning level must be 0 to 4");
+				Environment.Exit (1);
+			} else
+				RootContext.WarningLevel = level;
+		}
+		//
+		// Currently handles the Unix-like command line options, but will be
+		// deprecated in favor of the CSCParseOption, which will also handle the
+		// options that start with a dash in the future.
+		//
+		static bool UnixParseOption (string arg, ref string [] args, ref int i)
+		{
+			switch (arg){
+			case "-v":
+				yacc_verbose = true;
+				return true;
+				
+			case "--parse":
+				parse_only = true;
+				return true;
+				
+			case "--main": case "-m":
+				if ((i + 1) >= args.Length){
+					Usage ();
+					Environment.Exit (1);
+				}
+				RootContext.MainClass = args [++i];
+				return true;
+				
+			case "--unsafe":
+				RootContext.Unsafe = true;
+				return true;
+				
+			case "/?": case "/h": case "/help":
+			case "--help":
+				Usage ();
+				Environment.Exit (0);
+				return true;
+				
+			case "--define":
+				if ((i + 1) >= args.Length){
+					Usage ();
+					Environment.Exit (1);
+				}
+				defines.Add (args [++i]);
+				return true;
+				
+			case "--expect-error": {
+				int code = 0;
+				
+				try {
+					code = Int32.Parse (
+						args [++i], NumberStyles.AllowLeadingSign);
+					Report.ExpectedError = code;
+				} catch {
+					Report.Error (-14, "Invalid number specified");
+				} 
+				return true;
+			}
+				
+			case "--tokenize": 
+				tokenize = true;
+				return true;
+				
+			case "-o": 
+			case "--output":
+				if ((i + 1) >= args.Length){
+					Usage ();
+					Environment.Exit (1);
+				}
+				SetOutputFile (args [++i]);
+				return true;
+				
+			case "--checked":
+				RootContext.Checked = true;
+				return true;
+				
+			case "--stacktrace":
+				Report.Stacktrace = true;
+				return true;
+				
+			case "--linkresource":
+			case "--linkres":
+				if ((i + 1) >= args.Length){
+					Usage ();
+					Console.WriteLine("Missing argument to --linkres"); 
+					Environment.Exit (1);
+				}
+				if (resources == null)
+					resources = new ArrayList ();
+				
+				resources.Add (args [++i]);
+				return true;
+				
+			case "--resource":
+			case "--res":
+				if ((i + 1) >= args.Length){
+					Usage ();
+					Console.WriteLine("Missing argument to --resource"); 
+					Environment.Exit (1);
+				}
+				if (embedded_resources == null)
+					embedded_resources = new ArrayList ();
+				
+				embedded_resources.Add (args [++i]);
+				return true;
+				
+			case "--target":
+				if ((i + 1) >= args.Length){
+					Environment.Exit (1);
+					return true;
+				}
+				
+				string type = args [++i];
+				switch (type){
+				case "library":
+					target = Target.Library;
+					target_ext = ".dll";
+					break;
+					
+				case "exe":
+					target = Target.Exe;
+					break;
+					
+				case "winexe":
+					target = Target.WinExe;
+					break;
+					
+				case "module":
+					target = Target.Module;
+					target_ext = ".dll";
+					break;
+				default:
+					Usage ();
+					Environment.Exit (1);
+					break;
+				}
+				return true;
+				
+			case "-r":
+				if ((i + 1) >= args.Length){
+					Usage ();
+					Environment.Exit (1);
+				}
+				
+				references.Add (args [++i]);
+				return true;
+				
+			case "-L":
+				if ((i + 1) >= args.Length){
+					Usage ();	
+					Environment.Exit (1);
+				}
+				link_paths.Add (args [++i]);
+				return true;
+				
+			case "--nostdlib":
+				RootContext.StdLib = false;
+				return true;
+				
+			case "--fatal":
+				Report.Fatal = true;
+				return true;
+				
+			case "--werror":
+				Report.WarningsAreErrors = true;
+				return true;
+				
+			case "--nowarn":
+				if ((i + 1) >= args.Length){
+					Usage ();
+					Environment.Exit (1);
+				}
+				int warn = 0;
+				
+				try {
+					warn = Int32.Parse (args [++i]);
+				} catch {
+					Usage ();
+					Environment.Exit (1);
+				}
+				Report.SetIgnoreWarning (warn);
+				return true;
+				
+			case "--wlevel":
+				if ((i + 1) >= args.Length){
+					Report.Error (
+						1900,
+						"--wlevel requires an value from 0 to 4");
+					Environment.Exit (1);
+				}
+
+				SetWarningLevel (args [++i]);
+				return true;
+
+#if MCS_DEBUG
+			case "--mcs-debug":
+				if ((i + 1) >= args.Length){
+					Console.WriteLine ("--mcs-debug requires an argument");
+					Environment.Exit (1);
+				}
+
+				try {
+					Report.DebugFlags = Int32.Parse (args [++i]);
+				} catch {
+					Console.WriteLine ("Invalid argument to --mcs-debug");
+					Environment.Exit (1);
+				}
+				return true;
+#endif
+				
+			case "--about":
+				About ();
+				return true;
+				
+			case "--recurse":
+				if ((i + 1) >= args.Length){
+					Console.WriteLine ("--recurse requires an argument");
+					Environment.Exit (1);
+				}
+				CompileFiles (args [++i], true); 
+				return true;
+				
+			case "--timestamp":
+				timestamps = true;
+				last_time = first_time = DateTime.Now;
+				debug_arglist.Add ("timestamp");
+				return true;
+				
+			case "--debug": case "-g":
+				want_debugging_support = true;
+				return true;
+				
+			case "--debug-args":
+				if ((i + 1) >= args.Length){
+					Console.WriteLine ("--debug-args requires an argument");
+					Environment.Exit (1);
+				}
+				char[] sep = { ',' };
+				debug_arglist.AddRange (args [++i].Split (sep));
+				return true;
+				
+			case "--noconfig":
+				load_default_config = false;
+				return true;
+			}
+
+			return false;
+		}
+
+		//
+		// Currently it is very basic option parsing, but eventually, this will
+		// be the complete option parser
+		//
+		static bool CSCParseOption (string option, ref string [] args, ref int i)
+		{
+			int idx = option.IndexOf (":");
+			string arg, value;
+
+			if (idx == -1){
+				arg = option;
+				value = "";
+			} else {
+				arg = option.Substring (0, idx);
+
+				value = option.Substring (idx + 1);
+			}
+
+			switch (arg){
+			case "/nologo":
+				return true;
+
+			case "/t":
+			case "/target":
+				switch (value){
+				case "exe":
+					target = Target.Exe;
+					break;
+
+				case "winexe":
+					target = Target.WinExe;
+					break;
+
+				case "library":
+					target = Target.Library;
+					target_ext = ".dll";
+					break;
+
+				case "module":
+					target = Target.Module;
+					target_ext = ".dll";
+					break;
+
+				default:
+					Usage ();
+					Environment.Exit (1);
+					break;
+				}
+				return true;
+
+			case "/out":
+				if (value == ""){
+					Usage ();
+					Environment.Exit (1);
+				}
+				SetOutputFile (value);
+				return true;
+
+			case "/optimize":
+			case "/optimize+":
+			case "/optimize-":
+			case "/incremental":
+			case "/incremental+":
+			case "/incremental-":
+				// nothing.
+				return true;
+
+			case "/d":
+			case "/define": {
+				string [] defs;
+
+				if (value == ""){
+					Usage ();
+					Environment.Exit (1);
+				}
+
+				defs = value.Split (new Char [] {';', ','});
+				foreach (string d in defs){
+					defines.Add (d);
+				}
+				return true;
+			}
+
+			case "/linkres":
+			case "/linkresource":
+				if (value == ""){
+					Console.WriteLine ("{0} requires an argument", arg);
+					Environment.Exit (1);
+				}
+				if (resources == null)
+					resources = new ArrayList ();
+				
+				resources.Add (value);
+				return true;
+				
+			case "/res":
+			case "/resource":
+				if (value == ""){
+					Console.WriteLine ("{0} requires an argument", arg);
+					Environment.Exit (1);
+				}
+				if (embedded_resources == null)
+					embedded_resources = new ArrayList ();
+				
+				embedded_resources.Add (value);
+				return true;
+				
+			case "/recurse":
+				if (value == ""){
+					Console.WriteLine ("/recurse requires an argument");
+					Environment.Exit (1);
+				}
+				CompileFiles (value, true); 
+				return true;
+
+			case "/r":
+			case "/reference":
+				if (value == ""){
+					Console.WriteLine ("/reference requires an argument");
+					Environment.Exit (1);
+				}
+				references.Add (value);
+				return true;
+
+			case "/lib": {
+				string [] libdirs;
+				
+				if (value == ""){
+					Console.WriteLine ("/lib requires an argument");
+					Environment.Exit (1);
+				}
+
+				libdirs = value.Split (new Char [] { ',' });
+				foreach (string dir in libdirs)
+					link_paths.Add (dir);
+				return true;
+			}
+				
+			case "/debug":
+			case "/debug+":
+				want_debugging_support = true;
+				return true;
+
+			case "/checked":
+			case "/checked+":
+				RootContext.Checked = true;
+				return true;
+
+			case "/checked-":
+				RootContext.Checked = false;
+				return true;
+
+			case "/unsafe":
+			case "/unsafe+":
+				RootContext.Unsafe = true;
+				return true;
+
+			case "/unsafe-":
+				RootContext.Unsafe = false;
+				return true;
+
+			case "/warnaserror":
+			case "/warnaserror+":
+				Report.WarningsAreErrors = true;
+				return true;
+
+			case "/warnaserror-":
+				Report.WarningsAreErrors = false;
+				return true;
+
+			case "/warn":
+				SetWarningLevel (value);
+				return true;
+
+			case "/nowarn": {
+				string [] warns;
+
+				if (value == ""){
+					Console.WriteLine ("/nowarn requires an argument");
+					Environment.Exit (1);
+				}
+				
+				warns = value.Split (new Char [] {','});
+				foreach (string wc in warns){
+					int warn = 0;
+					
+					try {
+						warn = Int32.Parse (wc);
+					} catch {
+						Usage ();
+						Environment.Exit (1);
+					}
+					Report.SetIgnoreWarning (warn);
+				}
+				return true;
+			}
+
+			case "/noconfig":
+				load_default_config = false;
+				return true;
+
+			case "/help":
+			case "/?":
+				Usage ();
+				Environment.Exit (0);
+				return true;
+
+			case "/main":
+			case "/m":
+				if (value == ""){
+					Console.WriteLine ("/main requires an argument");					
+					Environment.Exit (1);
+				}
+				RootContext.MainClass = value;
+				return true;
+
+			case "/nostdlib":
+			case "/nostdlib+":
+				RootContext.StdLib = false;
+				return true;
+
+			case "/nostdlib-":
+				RootContext.StdLib = true;
+				return true;
+
+			}
+			return false;
+		}
+		
+		/// <summary>
+		///    Parses the arguments, and drives the compilation
+		///    process.
+		/// </summary>
+		///
+		/// <remarks>
+		///    TODO: Mostly structured to debug the compiler
+		///    now, needs to be turned into a real driver soon.
+		/// </remarks>
+		// [MonoTODO("Change error code for unknown argument to something reasonable")]
+		static bool MainDriver (string [] args)
+		{
+			int i;
+			bool parsing_options = true;
+			
+			references = new ArrayList ();
+			soft_references = new ArrayList ();
+			link_paths = new ArrayList ();
+
+			SetupDefaultDefines ();
+			
+			//
+			// Setup defaults
+			//
+			// This is not required because Assembly.Load knows about this
+			// path.
+			//
+
+			int argc = args.Length;
+			for (i = 0; i < argc; i++){
+				string arg = args [i];
+
+				if (arg.StartsWith ("@")){
+					string [] new_args, extra_args;
+					string response_file = arg.Substring (1);
+
+					if (response_file_list == null)
+						response_file_list = new Hashtable ();
+					
+					if (response_file_list.Contains (response_file)){
+						Report.Error (
+							1515, "Response file `" + response_file +
+							"' specified multiple times");
+						Environment.Exit (1);
+					}
+					
+					response_file_list.Add (response_file, response_file);
+						    
+					extra_args = LoadArgs (response_file);
+					if (extra_args == null){
+						Report.Error (2011, "Unable to open response file: " +
+							      response_file);
+						return false;
+					}
+
+					new_args = new string [extra_args.Length + argc];
+					args.CopyTo (new_args, 0);
+					extra_args.CopyTo (new_args, argc);
+					args = new_args;
+					argc = new_args.Length;
+					continue;
+				}
+
+				if (parsing_options){
+					if (arg == "--"){
+						parsing_options = false;
+						continue;
+					}
+					
+					if (arg.StartsWith ("-")){
+						if (UnixParseOption (arg, ref args, ref i))
+							continue;
+
+						// Try a -CSCOPTION
+						string csc_opt = "/" + arg.Substring (1);
+						if (CSCParseOption (csc_opt, ref args, ref i))
+							continue;
+					} else {
+						if (arg.StartsWith ("/")){
+							if (CSCParseOption (arg, ref args, ref i))
+								continue;
+						}
+					}
+				}
+
+				CompileFiles (arg, false); 
+			}
+
+			if (tokenize)
+				return true;
+			
+			if (first_source == null){
+				Report.Error (2008, "No files to compile were specified");
+				return false;
+			}
+
+			if (Report.Errors > 0)
+				return false;
+			
+			if (parse_only)
+				return true;
+			
+			//
+			// Load Core Library for default compilation
+			//
+			if (RootContext.StdLib)
+				references.Insert (0, "mscorlib");
+
+			if (load_default_config)
+				DefineDefaultConfig ();
+
+			if (Report.Errors > 0){
+				return false;
+			}
+
+			//
+			// Load assemblies required
+			//
+			if (timestamps)
+				ShowTime ("Loading references");
+			link_paths.Add (GetSystemDir ());
+			LoadReferences ();
+			
+			if (timestamps)
+				ShowTime ("   References loaded");
+			
+			if (Report.Errors > 0){
+				return false;
+			}
+
+			//
+			// Quick hack
+			//
+			if (output_file == null){
+				int pos = first_source.LastIndexOf (".");
+
+				if (pos > 0)
+					output_file = first_source.Substring (0, pos) + target_ext;
+				else
+					output_file = first_source + target_ext;
+			}
+
+			string[] debug_args = new string [debug_arglist.Count];
+			debug_arglist.CopyTo (debug_args);
+			CodeGen.Init (output_file, output_file, want_debugging_support, debug_args);
+
+			TypeManager.AddModule (CodeGen.ModuleBuilder);
+
+			//
+			// Before emitting, we need to get the core
+			// types emitted from the user defined types
+			// or from the system ones.
+			//
+			if (timestamps)
+				ShowTime ("Initializing Core Types");
+			if (!RootContext.StdLib){
+				RootContext.ResolveCore ();
+				if (Report.Errors > 0)
+					return false;
+			}
+			
+			TypeManager.InitCoreTypes ();
+			if (timestamps)
+				ShowTime ("   Core Types done");
+
+			//
+			// The second pass of the compiler
+			//
+			if (timestamps)
+				ShowTime ("Resolving tree");
+			RootContext.ResolveTree ();
+			if (timestamps)
+				ShowTime ("Populate tree");
+			if (!RootContext.StdLib)
+				RootContext.BootCorlib_PopulateCoreTypes ();
+			RootContext.PopulateTypes ();
+			RootContext.DefineTypes ();
+			
+			TypeManager.InitCodeHelpers ();
+				
+			if (Report.Errors > 0){
+				return false;
+			}
+			
+			//
+			// The code generator
+			//
+			if (timestamps)
+				ShowTime ("Emitting code");
+			ShowTotalTime ("Total so far");
+			RootContext.EmitCode ();
+			if (timestamps)
+				ShowTime ("   done");
+
+			if (Report.Errors > 0){
+				return false;
+			}
+
+			if (timestamps)
+				ShowTime ("Closing types");
+
+			RootContext.CloseTypes ();
+
+			PEFileKinds k = PEFileKinds.ConsoleApplication;
+				
+			if (target == Target.Library || target == Target.Module)
+				k = PEFileKinds.Dll;
+			else if (target == Target.Exe)
+				k = PEFileKinds.ConsoleApplication;
+			else if (target == Target.WinExe)
+				k = PEFileKinds.WindowApplication;
+
+			if (target == Target.Exe || target == Target.WinExe){
+				MethodInfo ep = RootContext.EntryPoint;
+
+				if (ep == null){
+					if (Report.Errors == 0)
+						Report.Error (5001, "Program " + output_file +
+							      " does not have an entry point defined");
+					return false;
+				}
+				
+				CodeGen.AssemblyBuilder.SetEntryPoint (ep, k);
+			}
+
+			//
+			// Add the resources
+			//
+			if (resources != null){
+				foreach (string file in resources)
+					CodeGen.AssemblyBuilder.AddResourceFile (file, file);
+			}
+			
+			if (embedded_resources != null){
+				object[] margs = new object [2];
+				Type[] argst = new Type [2];
+				argst [0] = argst [1] = typeof (string);
+				MethodInfo embed_res = typeof (AssemblyBuilder).GetMethod ("EmbedResourceFile", argst);
+				if (embed_res == null) {
+					Report.Warning (0, new Location (-1), "Cannot embed resources on this runtime: try the Mono runtime instead.");
+				} else {
+					foreach (string file in embedded_resources) {
+						margs [0] = margs [1] = file;
+						embed_res.Invoke (CodeGen.AssemblyBuilder, margs);
+					}
+				}
+			}
+			
+			CodeGen.Save (output_file);
+			if (timestamps) {
+				ShowTime ("Saved output");
+				ShowTotalTime ("Total");
+			}
+
+			Timer.ShowTimers ();
+			
+			if (want_debugging_support) {
+				CodeGen.SaveSymbols ();
+				if (timestamps)
+					ShowTime ("Saved symbols");
+			}
+
+			if (Report.ExpectedError != 0){
+				Console.WriteLine("Failed to report expected error " + Report.ExpectedError);
+				Environment.Exit (1);
+				return false;
+			}
+
+			return (Report.Errors == 0);
+		}
+
+	}
+}
diff --git a/mcs/mcs/ecore.cs b/mcs/mcs/ecore.cs
new file mode 100755
index 00000000000..355ddca02b9
--- /dev/null
+++ b/mcs/mcs/ecore.cs
@@ -0,0 +1,4283 @@
+//
+// ecore.cs: Core of the Expression representation for the intermediate tree.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+//
+
+namespace Mono.CSharp {
+	using System;
+	using System.Collections;
+	using System.Diagnostics;
+	using System.Reflection;
+	using System.Reflection.Emit;
+	using System.Text;
+
+	/// <remarks>
+	///   The ExprClass class contains the is used to pass the 
+	///   classification of an expression (value, variable, namespace,
+	///   type, method group, property access, event access, indexer access,
+	///   nothing).
+	/// </remarks>
+	public enum ExprClass : byte {
+		Invalid,
+		
+		Value,
+		Variable,
+		Namespace,
+		Type,
+		MethodGroup,
+		PropertyAccess,
+		EventAccess,
+		IndexerAccess,
+		Nothing, 
+	}
+
+	/// <remarks>
+	///   This is used to tell Resolve in which types of expressions we're
+	///   interested.
+	/// </remarks>
+	[Flags]
+	public enum ResolveFlags {
+		// Returns Value, Variable, PropertyAccess, EventAccess or IndexerAccess.
+		VariableOrValue		= 1,
+
+		// Returns a type expression.
+		Type			= 2,
+
+		// Returns a method group.
+		MethodGroup		= 4,
+
+		// Allows SimpleNames to be returned.
+		// This is used by MemberAccess to construct long names that can not be
+		// partially resolved (namespace-qualified names for example).
+		SimpleName		= 8,
+
+		// Mask of all the expression class flags.
+		MaskExprClass		= 15,
+
+		// Disable control flow analysis while resolving the expression.
+		// This is used when resolving the instance expression of a field expression.
+		DisableFlowAnalysis	= 16
+	}
+
+	//
+	// This is just as a hint to AddressOf of what will be done with the
+	// address.
+	[Flags]
+	public enum AddressOp {
+		Store = 1,
+		Load  = 2,
+		LoadStore = 3
+	};
+	
+	/// <summary>
+	///   This interface is implemented by variables
+	/// </summary>
+	public interface IMemoryLocation {
+		/// <summary>
+		///   The AddressOf method should generate code that loads
+		///   the address of the object and leaves it on the stack.
+		///
+		///   The `mode' argument is used to notify the expression
+		///   of whether this will be used to read from the address or
+		///   write to the address.
+		///
+		///   This is just a hint that can be used to provide good error
+		///   reporting, and should have no other side effects. 
+		/// </summary>
+		void AddressOf (EmitContext ec, AddressOp mode);
+	}
+
+	/// <summary>
+	///   This interface is implemented by variables
+	/// </summary>
+	public interface IVariable {
+		/// <summary>
+		///   Checks whether the variable has already been assigned at
+		///   the current position of the method's control flow and
+		///   reports an appropriate error message if not.
+		///
+		///   If the variable is a struct, then this call checks whether
+		///   all of its fields (including all private ones) have been
+		///   assigned.
+		/// </summary>
+		bool IsAssigned (EmitContext ec, Location loc);
+
+		/// <summary>
+		///   Checks whether field `name' in this struct has been assigned.
+		/// </summary>
+		bool IsFieldAssigned (EmitContext ec, string name, Location loc);
+
+		/// <summary>
+		///   Tells the flow analysis code that the variable has already
+		///   been assigned at the current code position.
+		///
+		///   If the variable is a struct, this call marks all its fields
+		///   (including private fields) as being assigned.
+		/// </summary>
+		void SetAssigned (EmitContext ec);
+
+		/// <summary>
+		///   Tells the flow analysis code that field `name' in this struct
+		///   has already been assigned atthe current code position.
+		/// </summary>
+		void SetFieldAssigned (EmitContext ec, string name);
+	}
+
+	/// <summary>
+	///   This interface denotes an expression which evaluates to a member
+	///   of a struct or a class.
+	/// </summary>
+	public interface IMemberExpr
+	{
+		/// <summary>
+		///   The name of this member.
+		/// </summary>
+		string Name {
+			get;
+		}
+
+		/// <summary>
+		///   Whether this is an instance member.
+		/// </summary>
+		bool IsInstance {
+			get;
+		}
+
+		/// <summary>
+		///   Whether this is a static member.
+		/// </summary>
+		bool IsStatic {
+			get;
+		}
+
+		/// <summary>
+		///   The instance expression associated with this member, if it's a
+		///   non-static member.
+		/// </summary>
+		Expression InstanceExpression {
+			get; set;
+		}
+	}
+
+	/// <summary>
+	///   Expression which resolves to a type.
+	/// </summary>
+	public interface ITypeExpression
+	{
+		/// <summary>
+		///   Resolve the expression, but only lookup types.
+		/// </summary>
+		Expression DoResolveType (EmitContext ec);
+	}
+
+	/// <remarks>
+	///   Base class for expressions
+	/// </remarks>
+	public abstract class Expression {
+		public ExprClass eclass;
+		protected Type type;
+		protected Location loc;
+		
+		public Type Type {
+			get {
+				return type;
+			}
+
+			set {
+				type = value;
+			}
+		}
+
+		public Location Location {
+			get {
+				return loc;
+			}
+		}
+
+		/// <summary>
+		///   Utility wrapper routine for Error, just to beautify the code
+		/// </summary>
+		public void Error (int error, string s)
+		{
+			if (!Location.IsNull (loc))
+				Report.Error (error, loc, s);
+			else
+				Report.Error (error, s);
+		}
+
+		/// <summary>
+		///   Utility wrapper routine for Warning, just to beautify the code
+		/// </summary>
+		public void Warning (int warning, string s)
+		{
+			if (!Location.IsNull (loc))
+				Report.Warning (warning, loc, s);
+			else
+				Report.Warning (warning, s);
+		}
+
+		/// <summary>
+		///   Utility wrapper routine for Warning, only prints the warning if
+		///   warnings of level `level' are enabled.
+		/// </summary>
+		public void Warning (int warning, int level, string s)
+		{
+			if (level <= RootContext.WarningLevel)
+				Warning (warning, s);
+		}
+
+		static public void Error_CannotConvertType (Location loc, Type source, Type target)
+		{
+			Report.Error (30, loc, "Cannot convert type '" +
+				      TypeManager.CSharpName (source) + "' to '" +
+				      TypeManager.CSharpName (target) + "'");
+		}
+
+		/// <summary>
+		///   Performs semantic analysis on the Expression
+		/// </summary>
+		///
+		/// <remarks>
+		///   The Resolve method is invoked to perform the semantic analysis
+		///   on the node.
+		///
+		///   The return value is an expression (it can be the
+		///   same expression in some cases) or a new
+		///   expression that better represents this node.
+		///   
+		///   For example, optimizations of Unary (LiteralInt)
+		///   would return a new LiteralInt with a negated
+		///   value.
+		///   
+		///   If there is an error during semantic analysis,
+		///   then an error should be reported (using Report)
+		///   and a null value should be returned.
+		///   
+		///   There are two side effects expected from calling
+		///   Resolve(): the the field variable "eclass" should
+		///   be set to any value of the enumeration
+		///   `ExprClass' and the type variable should be set
+		///   to a valid type (this is the type of the
+		///   expression).
+		/// </remarks>
+		public abstract Expression DoResolve (EmitContext ec);
+
+		public virtual Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			return DoResolve (ec);
+		}
+		
+		/// <summary>
+		///   Resolves an expression and performs semantic analysis on it.
+		/// </summary>
+		///
+		/// <remarks>
+		///   Currently Resolve wraps DoResolve to perform sanity
+		///   checking and assertion checking on what we expect from Resolve.
+		/// </remarks>
+		public Expression Resolve (EmitContext ec, ResolveFlags flags)
+		{
+			// Are we doing a types-only search ?
+			if ((flags & ResolveFlags.MaskExprClass) == ResolveFlags.Type) {
+				ITypeExpression type_expr = this as ITypeExpression;
+
+				if (type_expr == null)
+					return null;
+
+				return type_expr.DoResolveType (ec);
+			}
+
+			bool old_do_flow_analysis = ec.DoFlowAnalysis;
+			if ((flags & ResolveFlags.DisableFlowAnalysis) != 0)
+				ec.DoFlowAnalysis = false;
+
+			Expression e;
+			if (this is SimpleName)
+				e = ((SimpleName) this).DoResolveAllowStatic (ec);
+			else 
+				e = DoResolve (ec);
+
+			ec.DoFlowAnalysis = old_do_flow_analysis;
+
+			if (e == null)
+				return null;
+
+			if (e is SimpleName){
+				SimpleName s = (SimpleName) e;
+
+				if ((flags & ResolveFlags.SimpleName) == 0) {
+					Report.Error (
+						103, loc,
+						"The name `" + s.Name + "' could not be found in `" +
+						ec.DeclSpace.Name + "'");
+					return null;
+				}
+
+				return s;
+			}
+
+			if ((e is TypeExpr) || (e is ComposedCast)) {
+				if ((flags & ResolveFlags.Type) == 0) {
+					e.Error118 (flags);
+					return null;
+				}
+
+				return e;
+			}
+
+			switch (e.eclass) {
+			case ExprClass.Type:
+				if ((flags & ResolveFlags.VariableOrValue) == 0) {
+					e.Error118 (flags);
+					return null;
+				}
+				break;
+
+			case ExprClass.MethodGroup:
+				if ((flags & ResolveFlags.MethodGroup) == 0) {
+					((MethodGroupExpr) e).ReportUsageError ();
+					return null;
+				}
+				break;
+
+			case ExprClass.Value:
+			case ExprClass.Variable:
+			case ExprClass.PropertyAccess:
+			case ExprClass.EventAccess:
+			case ExprClass.IndexerAccess:
+				if ((flags & ResolveFlags.VariableOrValue) == 0) {
+					e.Error118 (flags);
+					return null;
+				}
+				break;
+
+			default:
+				throw new Exception ("Expression " + e.GetType () +
+						     " ExprClass is Invalid after resolve");
+			}
+
+			if (e.type == null)
+				throw new Exception (
+					"Expression " + e.GetType () +
+					" did not set its type after Resolve\n" +
+					"called from: " + this.GetType ());
+
+			return e;
+		}
+
+		/// <summary>
+		///   Resolves an expression and performs semantic analysis on it.
+		/// </summary>
+		public Expression Resolve (EmitContext ec)
+		{
+			return Resolve (ec, ResolveFlags.VariableOrValue);
+		}
+
+		/// <summary>
+		///   Resolves an expression for LValue assignment
+		/// </summary>
+		///
+		/// <remarks>
+		///   Currently ResolveLValue wraps DoResolveLValue to perform sanity
+		///   checking and assertion checking on what we expect from Resolve
+		/// </remarks>
+		public Expression ResolveLValue (EmitContext ec, Expression right_side)
+		{
+			Expression e = DoResolveLValue (ec, right_side);
+
+			if (e != null){
+				if (e is SimpleName){
+					SimpleName s = (SimpleName) e;
+
+					Report.Error (
+						103, loc,
+						"The name `" + s.Name + "' could not be found in `" +
+						ec.DeclSpace.Name + "'");
+					return null;
+				}
+
+				if (e.eclass == ExprClass.Invalid)
+					throw new Exception ("Expression " + e +
+							     " ExprClass is Invalid after resolve");
+
+				if (e.eclass == ExprClass.MethodGroup) {
+					((MethodGroupExpr) e).ReportUsageError ();
+					return null;
+				}
+
+				if (e.type == null)
+					throw new Exception ("Expression " + e +
+							     " did not set its type after Resolve");
+			}
+
+			return e;
+		}
+		
+		/// <summary>
+		///   Emits the code for the expression
+		/// </summary>
+		///
+		/// <remarks>
+		///   The Emit method is invoked to generate the code
+		///   for the expression.  
+		/// </remarks>
+		public abstract void Emit (EmitContext ec);
+
+		/// <summary>
+		///   Protected constructor.  Only derivate types should
+		///   be able to be created
+		/// </summary>
+
+		protected Expression ()
+		{
+			eclass = ExprClass.Invalid;
+			type = null;
+		}
+
+		/// <summary>
+		///   Returns a literalized version of a literal FieldInfo
+		/// </summary>
+		///
+		/// <remarks>
+		///   The possible return values are:
+		///      IntConstant, UIntConstant
+		///      LongLiteral, ULongConstant
+		///      FloatConstant, DoubleConstant
+		///      StringConstant
+		///
+		///   The value returned is already resolved.
+		/// </remarks>
+		public static Constant Constantify (object v, Type t)
+		{
+			if (t == TypeManager.int32_type)
+				return new IntConstant ((int) v);
+			else if (t == TypeManager.uint32_type)
+				return new UIntConstant ((uint) v);
+			else if (t == TypeManager.int64_type)
+				return new LongConstant ((long) v);
+			else if (t == TypeManager.uint64_type)
+				return new ULongConstant ((ulong) v);
+			else if (t == TypeManager.float_type)
+				return new FloatConstant ((float) v);
+			else if (t == TypeManager.double_type)
+				return new DoubleConstant ((double) v);
+			else if (t == TypeManager.string_type)
+				return new StringConstant ((string) v);
+			else if (t == TypeManager.short_type)
+				return new ShortConstant ((short)v);
+			else if (t == TypeManager.ushort_type)
+				return new UShortConstant ((ushort)v);
+			else if (t == TypeManager.sbyte_type)
+				return new SByteConstant (((sbyte)v));
+			else if (t == TypeManager.byte_type)
+				return new ByteConstant ((byte)v);
+			else if (t == TypeManager.char_type)
+				return new CharConstant ((char)v);
+			else if (t == TypeManager.bool_type)
+				return new BoolConstant ((bool) v);
+			else if (TypeManager.IsEnumType (t)){
+				Constant e = Constantify (v, TypeManager.TypeToCoreType (v.GetType ()));
+
+				return new EnumConstant (e, t);
+			} else
+				throw new Exception ("Unknown type for constant (" + t +
+						     "), details: " + v);
+		}
+
+		/// <summary>
+		///   Returns a fully formed expression after a MemberLookup
+		/// </summary>
+		public static Expression ExprClassFromMemberInfo (EmitContext ec, MemberInfo mi, Location loc)
+		{
+			if (mi is EventInfo)
+				return new EventExpr ((EventInfo) mi, loc);
+			else if (mi is FieldInfo)
+				return new FieldExpr ((FieldInfo) mi, loc);
+			else if (mi is PropertyInfo)
+				return new PropertyExpr ((PropertyInfo) mi, loc);
+		        else if (mi is Type){
+				return new TypeExpr ((System.Type) mi, loc);
+			}
+
+			return null;
+		}
+
+		//
+		// FIXME: Probably implement a cache for (t,name,current_access_set)?
+		//
+		// This code could use some optimizations, but we need to do some
+		// measurements.  For example, we could use a delegate to `flag' when
+		// something can not any longer be a method-group (because it is something
+		// else).
+		//
+		// Return values:
+		//     If the return value is an Array, then it is an array of
+		//     MethodBases
+		//   
+		//     If the return value is an MemberInfo, it is anything, but a Method
+		//
+		//     null on error.
+		//
+		// FIXME: When calling MemberLookup inside an `Invocation', we should pass
+		// the arguments here and have MemberLookup return only the methods that
+		// match the argument count/type, unlike we are doing now (we delay this
+		// decision).
+		//
+		// This is so we can catch correctly attempts to invoke instance methods
+		// from a static body (scan for error 120 in ResolveSimpleName).
+		//
+		//
+		// FIXME: Potential optimization, have a static ArrayList
+		//
+
+		public static Expression MemberLookup (EmitContext ec, Type t, string name,
+						       MemberTypes mt, BindingFlags bf, Location loc)
+		{
+			return MemberLookup (ec, ec.ContainerType, t, name, mt, bf, loc);
+		}
+
+		//
+		// Lookup type `t' for code in class `invocation_type'.  Note that it's important
+		// to set `invocation_type' correctly since this method also checks whether the
+		// invoking class is allowed to access the member in class `t'.  When you want to
+		// explicitly do a lookup in the base class, you must set both `t' and `invocation_type'
+		// to the base class (although a derived class can access protected members of its base
+		// class it cannot do so through an instance of the base class (error CS1540)).
+		// 
+
+		public static Expression MemberLookup (EmitContext ec, Type invocation_type, Type t,
+						       string name, MemberTypes mt, BindingFlags bf,
+						       Location loc)
+		{
+			MemberInfo [] mi = TypeManager.MemberLookup (invocation_type, t, mt, bf, name);
+
+			if (mi == null)
+				return null;
+
+			int count = mi.Length;
+
+			if (count > 1)
+				return new MethodGroupExpr (mi, loc);
+
+			if (mi [0] is MethodBase)
+				return new MethodGroupExpr (mi, loc);
+
+			return ExprClassFromMemberInfo (ec, mi [0], loc);
+		}
+
+		public const MemberTypes AllMemberTypes =
+			MemberTypes.Constructor |
+			MemberTypes.Event       |
+			MemberTypes.Field       |
+			MemberTypes.Method      |
+			MemberTypes.NestedType  |
+			MemberTypes.Property;
+		
+		public const BindingFlags AllBindingFlags =
+			BindingFlags.Public |
+			BindingFlags.Static |
+			BindingFlags.Instance;
+
+		public static Expression MemberLookup (EmitContext ec, Type t, string name, Location loc)
+		{
+			return MemberLookup (ec, ec.ContainerType, t, name,
+					     AllMemberTypes, AllBindingFlags, loc);
+		}
+
+		public static Expression MethodLookup (EmitContext ec, Type t, string name, Location loc)
+		{
+			return MemberLookup (ec, ec.ContainerType, t, name,
+					     MemberTypes.Method, AllBindingFlags, loc);
+		}
+
+		/// <summary>
+		///   This is a wrapper for MemberLookup that is not used to "probe", but
+		///   to find a final definition.  If the final definition is not found, we
+		///   look for private members and display a useful debugging message if we
+		///   find it.
+		/// </summary>
+		public static Expression MemberLookupFinal (EmitContext ec, Type t, string name, 
+							    Location loc)
+		{
+			return MemberLookupFinal (ec, t, name, MemberTypes.Method, AllBindingFlags, loc);
+		}
+
+		public static Expression MemberLookupFinal (EmitContext ec, Type t, string name,
+							    MemberTypes mt, BindingFlags bf, Location loc)
+		{
+			Expression e;
+
+			int errors = Report.Errors;
+
+			e = MemberLookup (ec, ec.ContainerType, t, name, mt, bf, loc);
+
+			if (e != null)
+				return e;
+
+			// Error has already been reported.
+			if (errors < Report.Errors)
+				return null;
+			
+			e = MemberLookup (ec, t, name, AllMemberTypes,
+					  AllBindingFlags | BindingFlags.NonPublic, loc);
+			if (e == null){
+				Report.Error (
+					117, loc, "`" + t + "' does not contain a definition " +
+					"for `" + name + "'");
+			} else {
+				Report.Error (
+					122, loc, "`" + t + "." + name +
+					"' is inaccessible due to its protection level");
+			}
+			
+			return null;
+		}
+
+		static public MemberInfo GetFieldFromEvent (EventExpr event_expr)
+		{
+			EventInfo ei = event_expr.EventInfo;
+
+			return TypeManager.GetPrivateFieldOfEvent (ei);
+		}
+		
+		static EmptyExpression MyEmptyExpr;
+		static public Expression ImplicitReferenceConversion (Expression expr, Type target_type)
+		{
+			Type expr_type = expr.Type;
+
+			if (expr_type == null && expr.eclass == ExprClass.MethodGroup){
+				// if we are a method group, emit a warning
+
+				expr.Emit (null);
+			}
+			
+			if (target_type == TypeManager.object_type) {
+				//
+				// A pointer type cannot be converted to object
+				// 
+				if (expr_type.IsPointer)
+					return null;
+
+				if (expr_type.IsValueType)
+					return new BoxedCast (expr);
+				if (expr_type.IsClass || expr_type.IsInterface)
+					return new EmptyCast (expr, target_type);
+			} else if (expr_type.IsSubclassOf (target_type)) {
+				return new EmptyCast (expr, target_type);
+			} else {
+
+				// This code is kind of mirrored inside StandardConversionExists
+				// with the small distinction that we only probe there
+				//
+				// Always ensure that the code here and there is in sync
+				
+				// from the null type to any reference-type.
+				if (expr is NullLiteral && !target_type.IsValueType)
+					return new EmptyCast (expr, target_type);
+
+				// from any class-type S to any interface-type T.
+				if (expr_type.IsClass && target_type.IsInterface) {
+					if (TypeManager.ImplementsInterface (expr_type, target_type))
+						return new EmptyCast (expr, target_type);
+					else
+						return null;
+				}
+
+				// from any interface type S to interface-type T.
+				if (expr_type.IsInterface && target_type.IsInterface) {
+
+					if (TypeManager.ImplementsInterface (expr_type, target_type))
+						return new EmptyCast (expr, target_type);
+					else
+						return null;
+				}
+				
+				// from an array-type S to an array-type of type T
+				if (expr_type.IsArray && target_type.IsArray) {
+					if (expr_type.GetArrayRank () == target_type.GetArrayRank ()) {
+
+						Type expr_element_type = expr_type.GetElementType ();
+
+						if (MyEmptyExpr == null)
+							MyEmptyExpr = new EmptyExpression ();
+						
+						MyEmptyExpr.SetType (expr_element_type);
+						Type target_element_type = target_type.GetElementType ();
+
+						if (!expr_element_type.IsValueType && !target_element_type.IsValueType)
+							if (StandardConversionExists (MyEmptyExpr,
+										      target_element_type))
+								return new EmptyCast (expr, target_type);
+					}
+				}
+				
+				
+				// from an array-type to System.Array
+				if (expr_type.IsArray && target_type == TypeManager.array_type)
+					return new EmptyCast (expr, target_type);
+				
+				// from any delegate type to System.Delegate
+				if (expr_type.IsSubclassOf (TypeManager.delegate_type) &&
+				    target_type == TypeManager.delegate_type)
+					return new EmptyCast (expr, target_type);
+					
+				// from any array-type or delegate type into System.ICloneable.
+				if (expr_type.IsArray || expr_type.IsSubclassOf (TypeManager.delegate_type))
+					if (target_type == TypeManager.icloneable_type)
+						return new EmptyCast (expr, target_type);
+				
+				return null;
+
+			}
+			
+			return null;
+		}
+
+		/// <summary>
+		///   Handles expressions like this: decimal d; d = 1;
+		///   and changes them into: decimal d; d = new System.Decimal (1);
+		/// </summary>
+		static Expression InternalTypeConstructor (EmitContext ec, Expression expr, Type target)
+		{
+			ArrayList args = new ArrayList ();
+
+			args.Add (new Argument (expr, Argument.AType.Expression));
+
+			Expression ne = new New (new TypeExpr (target, Location.Null), args, Location.Null);
+
+			return ne.Resolve (ec);
+		}
+
+		/// <summary>
+		///   Implicit Numeric Conversions.
+		///
+		///   expr is the expression to convert, returns a new expression of type
+		///   target_type or null if an implicit conversion is not possible.
+		/// </summary>
+		static public Expression ImplicitNumericConversion (EmitContext ec, Expression expr,
+								    Type target_type, Location loc)
+		{
+			Type expr_type = expr.Type;
+			
+			//
+			// Attempt to do the implicit constant expression conversions
+
+			if (expr is IntConstant){
+				Expression e;
+				
+				e = TryImplicitIntConversion (target_type, (IntConstant) expr);
+
+				if (e != null)
+					return e;
+			} else if (expr is LongConstant && target_type == TypeManager.uint64_type){
+				//
+				// Try the implicit constant expression conversion
+				// from long to ulong, instead of a nice routine,
+				// we just inline it
+				//
+				long v = ((LongConstant) expr).Value;
+				if (v > 0)
+					return new ULongConstant ((ulong) v);
+			}
+
+			//
+			// If we have an enumeration, extract the underlying type,
+			// use this during the comparission, but wrap around the original
+			// target_type
+			//
+			Type real_target_type = target_type;
+
+			if (TypeManager.IsEnumType (real_target_type))
+				real_target_type = TypeManager.EnumToUnderlying (real_target_type);
+
+			if (expr_type == real_target_type)
+				return new EmptyCast (expr, target_type);
+			
+			if (expr_type == TypeManager.sbyte_type){
+				//
+				// From sbyte to short, int, long, float, double.
+				//
+				if (real_target_type == TypeManager.int32_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.short_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I2);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.byte_type){
+				//
+				// From byte to short, ushort, int, uint, long, ulong, float, double
+				// 
+				if ((real_target_type == TypeManager.short_type) ||
+				    (real_target_type == TypeManager.ushort_type) ||
+				    (real_target_type == TypeManager.int32_type) ||
+				    (real_target_type == TypeManager.uint32_type))
+					return new EmptyCast (expr, target_type);
+
+				if (real_target_type == TypeManager.uint64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.short_type){
+				//
+				// From short to int, long, float, double
+				// 
+				if (real_target_type == TypeManager.int32_type)
+					return new EmptyCast (expr, target_type);
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.ushort_type){
+				//
+				// From ushort to int, uint, long, ulong, float, double
+				//
+				if (real_target_type == TypeManager.uint32_type)
+					return new EmptyCast (expr, target_type);
+
+				if (real_target_type == TypeManager.uint64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+				if (real_target_type == TypeManager.int32_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I4);
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.int32_type){
+				//
+				// From int to long, float, double
+				//
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.uint32_type){
+				//
+				// From uint to long, ulong, float, double
+				//
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+				if (real_target_type == TypeManager.uint64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
+							       OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
+							       OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.int64_type){
+				//
+				// From long/ulong to float, double
+				//
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);	
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.uint64_type){
+				//
+				// From ulong to float, double
+				//
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
+							       OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R_Un,
+							       OpCodes.Conv_R4);	
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.char_type){
+				//
+				// From char to ushort, int, uint, long, ulong, float, double
+				// 
+				if ((real_target_type == TypeManager.ushort_type) ||
+				    (real_target_type == TypeManager.int32_type) ||
+				    (real_target_type == TypeManager.uint32_type))
+					return new EmptyCast (expr, target_type);
+				if (real_target_type == TypeManager.uint64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_U8);
+				if (real_target_type == TypeManager.int64_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_I8);
+				if (real_target_type == TypeManager.float_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R4);
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.float_type){
+				//
+				// float to double
+				//
+				if (real_target_type == TypeManager.double_type)
+					return new OpcodeCast (expr, target_type, OpCodes.Conv_R8);
+			}
+
+			return null;
+		}
+
+		//
+		// Tests whether an implicit reference conversion exists between expr_type
+		// and target_type
+		//
+		public static bool ImplicitReferenceConversionExists (Expression expr, Type target_type)
+		{
+			Type expr_type = expr.Type;
+			
+			//
+			// This is the boxed case.
+			//
+			if (target_type == TypeManager.object_type) {
+				if ((expr_type.IsClass) ||
+				    (expr_type.IsValueType) ||
+				    (expr_type.IsInterface))
+					return true;
+				
+			} else if (expr_type.IsSubclassOf (target_type)) {
+				return true;
+				
+			} else {
+				// Please remember that all code below actually comes
+				// from ImplicitReferenceConversion so make sure code remains in sync
+				
+				// from any class-type S to any interface-type T.
+				if (expr_type.IsClass && target_type.IsInterface) {
+					if (TypeManager.ImplementsInterface (expr_type, target_type))
+						return true;
+				}
+				
+				// from any interface type S to interface-type T.
+				if (expr_type.IsInterface && target_type.IsInterface)
+					if (TypeManager.ImplementsInterface (expr_type, target_type))
+						return true;
+				
+				// from an array-type S to an array-type of type T
+				if (expr_type.IsArray && target_type.IsArray) {
+					if (expr_type.GetArrayRank () == target_type.GetArrayRank ()) {
+						
+						Type expr_element_type = expr_type.GetElementType ();
+
+						if (MyEmptyExpr == null)
+							MyEmptyExpr = new EmptyExpression ();
+						
+						MyEmptyExpr.SetType (expr_element_type);
+						Type target_element_type = target_type.GetElementType ();
+						
+						if (!expr_element_type.IsValueType && !target_element_type.IsValueType)
+							if (StandardConversionExists (MyEmptyExpr,
+										      target_element_type))
+								return true;
+					}
+				}
+				
+				// from an array-type to System.Array
+				if (expr_type.IsArray && (target_type == TypeManager.array_type))
+					return true;
+				
+				// from any delegate type to System.Delegate
+				if (expr_type.IsSubclassOf (TypeManager.delegate_type) &&
+				    target_type == TypeManager.delegate_type)
+					if (target_type.IsAssignableFrom (expr_type))
+						return true;
+					
+				// from any array-type or delegate type into System.ICloneable.
+				if (expr_type.IsArray || expr_type.IsSubclassOf (TypeManager.delegate_type))
+					if (target_type == TypeManager.icloneable_type)
+						return true;
+				
+				// from the null type to any reference-type.
+				if (expr is NullLiteral && !target_type.IsValueType &&
+				    !TypeManager.IsEnumType (target_type))
+					return true;
+				
+			}
+
+			return false;
+		}
+
+		/// <summary>
+		///  Same as StandardConversionExists except that it also looks at
+		///  implicit user defined conversions - needed for overload resolution
+		/// </summary>
+		public static bool ImplicitConversionExists (EmitContext ec, Expression expr, Type target_type)
+		{
+			if (StandardConversionExists (expr, target_type) == true)
+				return true;
+
+			Expression dummy = ImplicitUserConversion (ec, expr, target_type, Location.Null);
+
+			if (dummy != null)
+				return true;
+
+			return false;
+		}
+		
+		/// <summary>
+		///  Determines if a standard implicit conversion exists from
+		///  expr_type to target_type
+		/// </summary>
+		public static bool StandardConversionExists (Expression expr, Type target_type)
+		{
+			Type expr_type = expr.Type;
+
+			if (expr_type == TypeManager.void_type)
+				return false;
+			
+			if (expr_type == target_type)
+				return true;
+
+			// First numeric conversions 
+
+			if (expr_type == TypeManager.sbyte_type){
+				//
+				// From sbyte to short, int, long, float, double.
+				//
+				if ((target_type == TypeManager.int32_type) || 
+				    (target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type)  ||
+				    (target_type == TypeManager.short_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+				
+			} else if (expr_type == TypeManager.byte_type){
+				//
+				// From byte to short, ushort, int, uint, long, ulong, float, double
+				// 
+				if ((target_type == TypeManager.short_type) ||
+				    (target_type == TypeManager.ushort_type) ||
+				    (target_type == TypeManager.int32_type) ||
+				    (target_type == TypeManager.uint32_type) ||
+				    (target_type == TypeManager.uint64_type) ||
+				    (target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+	
+			} else if (expr_type == TypeManager.short_type){
+				//
+				// From short to int, long, float, double
+				// 
+				if ((target_type == TypeManager.int32_type) ||
+				    (target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+					
+			} else if (expr_type == TypeManager.ushort_type){
+				//
+				// From ushort to int, uint, long, ulong, float, double
+				//
+				if ((target_type == TypeManager.uint32_type) ||
+				    (target_type == TypeManager.uint64_type) ||
+				    (target_type == TypeManager.int32_type) ||
+				    (target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+				    
+			} else if (expr_type == TypeManager.int32_type){
+				//
+				// From int to long, float, double
+				//
+				if ((target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+					
+			} else if (expr_type == TypeManager.uint32_type){
+				//
+				// From uint to long, ulong, float, double
+				//
+				if ((target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.uint64_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+					
+			} else if ((expr_type == TypeManager.uint64_type) ||
+				   (expr_type == TypeManager.int64_type)) {
+				//
+				// From long/ulong to float, double
+				//
+				if ((target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+				    
+			} else if (expr_type == TypeManager.char_type){
+				//
+				// From char to ushort, int, uint, long, ulong, float, double
+				// 
+				if ((target_type == TypeManager.ushort_type) ||
+				    (target_type == TypeManager.int32_type) ||
+				    (target_type == TypeManager.uint32_type) ||
+				    (target_type == TypeManager.uint64_type) ||
+				    (target_type == TypeManager.int64_type) ||
+				    (target_type == TypeManager.float_type) ||
+				    (target_type == TypeManager.double_type) ||
+				    (target_type == TypeManager.decimal_type))
+					return true;
+
+			} else if (expr_type == TypeManager.float_type){
+				//
+				// float to double
+				//
+				if (target_type == TypeManager.double_type)
+					return true;
+			}	
+			
+			if (ImplicitReferenceConversionExists (expr, target_type))
+				return true;
+			
+			if (expr is IntConstant){
+				int value = ((IntConstant) expr).Value;
+
+				if (target_type == TypeManager.sbyte_type){
+					if (value >= SByte.MinValue && value <= SByte.MaxValue)
+						return true;
+				} else if (target_type == TypeManager.byte_type){
+					if (Byte.MinValue >= 0 && value <= Byte.MaxValue)
+						return true;
+				} else if (target_type == TypeManager.short_type){
+					if (value >= Int16.MinValue && value <= Int16.MaxValue)
+						return true;
+				} else if (target_type == TypeManager.ushort_type){
+					if (value >= UInt16.MinValue && value <= UInt16.MaxValue)
+						return true;
+				} else if (target_type == TypeManager.uint32_type){
+					if (value >= 0)
+						return true;
+				} else if (target_type == TypeManager.uint64_type){
+					 //
+					 // we can optimize this case: a positive int32
+					 // always fits on a uint64.  But we need an opcode
+					 // to do it.
+					 //
+					if (value >= 0)
+						return true;
+				}
+				
+				if (value == 0 && expr is IntLiteral && TypeManager.IsEnumType (target_type))
+					return true;
+			}
+
+			if (expr is LongConstant && target_type == TypeManager.uint64_type){
+				//
+				// Try the implicit constant expression conversion
+				// from long to ulong, instead of a nice routine,
+				// we just inline it
+				//
+				long v = ((LongConstant) expr).Value;
+				if (v > 0)
+					return true;
+			}
+			
+			if (target_type.IsSubclassOf (TypeManager.enum_type) && expr is IntLiteral){
+				IntLiteral i = (IntLiteral) expr;
+
+				if (i.Value == 0)
+					return true;
+			}
+
+			return false;
+		}
+
+		//
+		// Used internally by FindMostEncompassedType, this is used
+		// to avoid creating lots of objects in the tight loop inside
+		// FindMostEncompassedType
+		//
+		static EmptyExpression priv_fmet_param;
+		
+		/// <summary>
+		///  Finds "most encompassed type" according to the spec (13.4.2)
+		///  amongst the methods in the MethodGroupExpr
+		/// </summary>
+		static Type FindMostEncompassedType (ArrayList types)
+		{
+			Type best = null;
+
+			if (priv_fmet_param == null)
+				priv_fmet_param = new EmptyExpression ();
+
+			foreach (Type t in types){
+				priv_fmet_param.SetType (t);
+				
+				if (best == null) {
+					best = t;
+					continue;
+				}
+				
+				if (StandardConversionExists (priv_fmet_param, best))
+					best = t;
+			}
+
+			return best;
+		}
+
+		//
+		// Used internally by FindMostEncompassingType, this is used
+		// to avoid creating lots of objects in the tight loop inside
+		// FindMostEncompassingType
+		//
+		static EmptyExpression priv_fmee_ret;
+		
+		/// <summary>
+		///  Finds "most encompassing type" according to the spec (13.4.2)
+		///  amongst the types in the given set
+		/// </summary>
+		static Type FindMostEncompassingType (ArrayList types)
+		{
+			Type best = null;
+
+			if (priv_fmee_ret == null)
+				priv_fmee_ret = new EmptyExpression ();
+
+			foreach (Type t in types){
+				priv_fmee_ret.SetType (best);
+
+				if (best == null) {
+					best = t;
+					continue;
+				}
+
+				if (StandardConversionExists (priv_fmee_ret, t))
+					best = t;
+			}
+			
+			return best;
+		}
+
+		//
+		// Used to avoid creating too many objects
+		//
+		static EmptyExpression priv_fms_expr;
+		
+		/// <summary>
+		///   Finds the most specific source Sx according to the rules of the spec (13.4.4)
+		///   by making use of FindMostEncomp* methods. Applies the correct rules separately
+		///   for explicit and implicit conversion operators.
+		/// </summary>
+		static public Type FindMostSpecificSource (MethodGroupExpr me, Type source_type,
+							   bool apply_explicit_conv_rules,
+							   Location loc)
+		{
+			ArrayList src_types_set = new ArrayList ();
+			
+			if (priv_fms_expr == null)
+				priv_fms_expr = new EmptyExpression ();
+			
+			//
+			// If any operator converts from S then Sx = S
+			//
+			foreach (MethodBase mb in me.Methods){
+				ParameterData pd = Invocation.GetParameterData (mb);
+				Type param_type = pd.ParameterType (0);
+
+				if (param_type == source_type)
+					return param_type;
+
+				if (apply_explicit_conv_rules) {
+					//
+					// From the spec :
+					// Find the set of applicable user-defined conversion operators, U.  This set
+					// consists of the
+					// user-defined implicit or explicit conversion operators declared by
+					// the classes or structs in D that convert from a type encompassing
+					// or encompassed by S to a type encompassing or encompassed by T
+					//
+					priv_fms_expr.SetType (param_type);
+					if (StandardConversionExists (priv_fms_expr, source_type))
+						src_types_set.Add (param_type);
+					else {
+						priv_fms_expr.SetType (source_type);
+						if (StandardConversionExists (priv_fms_expr, param_type))
+							src_types_set.Add (param_type);
+					}
+				} else {
+					//
+					// Only if S is encompassed by param_type
+					//
+					priv_fms_expr.SetType (source_type);
+					if (StandardConversionExists (priv_fms_expr, param_type))
+						src_types_set.Add (param_type);
+				}
+			}
+			
+			//
+			// Explicit Conv rules
+			//
+			if (apply_explicit_conv_rules) {
+				ArrayList candidate_set = new ArrayList ();
+
+				foreach (Type param_type in src_types_set){
+					priv_fms_expr.SetType (source_type);
+					
+					if (StandardConversionExists (priv_fms_expr, param_type))
+						candidate_set.Add (param_type);
+				}
+
+				if (candidate_set.Count != 0)
+					return FindMostEncompassedType (candidate_set);
+			}
+
+			//
+			// Final case
+			//
+			if (apply_explicit_conv_rules)
+				return FindMostEncompassingType (src_types_set);
+			else
+				return FindMostEncompassedType (src_types_set);
+		}
+
+		//
+		// Useful in avoiding proliferation of objects
+		//
+		static EmptyExpression priv_fmt_expr;
+		
+		/// <summary>
+		///  Finds the most specific target Tx according to section 13.4.4
+		/// </summary>
+		static public Type FindMostSpecificTarget (MethodGroupExpr me, Type target,
+							   bool apply_explicit_conv_rules,
+							   Location loc)
+		{
+			ArrayList tgt_types_set = new ArrayList ();
+			
+			if (priv_fmt_expr == null)
+				priv_fmt_expr = new EmptyExpression ();
+			
+			//
+			// If any operator converts to T then Tx = T
+			//
+			foreach (MethodInfo mi in me.Methods){
+				Type ret_type = mi.ReturnType;
+
+				if (ret_type == target)
+					return ret_type;
+
+				if (apply_explicit_conv_rules) {
+					//
+					// From the spec :
+					// Find the set of applicable user-defined conversion operators, U.
+					//
+					// This set consists of the
+					// user-defined implicit or explicit conversion operators declared by
+					// the classes or structs in D that convert from a type encompassing
+					// or encompassed by S to a type encompassing or encompassed by T
+					//
+					priv_fms_expr.SetType (ret_type);
+					if (StandardConversionExists (priv_fms_expr, target))
+						tgt_types_set.Add (ret_type);
+					else {
+						priv_fms_expr.SetType (target);
+						if (StandardConversionExists (priv_fms_expr, ret_type))
+							tgt_types_set.Add (ret_type);
+					}
+				} else {
+					//
+					// Only if T is encompassed by param_type
+					//
+					priv_fms_expr.SetType (ret_type);
+					if (StandardConversionExists (priv_fms_expr, target))
+						tgt_types_set.Add (ret_type);
+				}
+			}
+
+			//
+			// Explicit conv rules
+			//
+			if (apply_explicit_conv_rules) {
+				ArrayList candidate_set = new ArrayList ();
+
+				foreach (Type ret_type in tgt_types_set){
+					priv_fmt_expr.SetType (ret_type);
+					
+					if (StandardConversionExists (priv_fmt_expr, target))
+						candidate_set.Add (ret_type);
+				}
+
+				if (candidate_set.Count != 0)
+					return FindMostEncompassingType (candidate_set);
+			}
+			
+			//
+			// Okay, final case !
+			//
+			if (apply_explicit_conv_rules)
+				return FindMostEncompassedType (tgt_types_set);
+			else
+				return FindMostEncompassingType (tgt_types_set);
+		}
+		
+		/// <summary>
+		///  User-defined Implicit conversions
+		/// </summary>
+		static public Expression ImplicitUserConversion (EmitContext ec, Expression source,
+								 Type target, Location loc)
+		{
+			return UserDefinedConversion (ec, source, target, loc, false);
+		}
+
+		/// <summary>
+		///  User-defined Explicit conversions
+		/// </summary>
+		static public Expression ExplicitUserConversion (EmitContext ec, Expression source,
+								 Type target, Location loc)
+		{
+			return UserDefinedConversion (ec, source, target, loc, true);
+		}
+
+		/// <summary>
+		///   Computes the MethodGroup for the user-defined conversion
+		///   operators from source_type to target_type.  `look_for_explicit'
+		///   controls whether we should also include the list of explicit
+		///   operators
+		/// </summary>
+		static MethodGroupExpr GetConversionOperators (EmitContext ec,
+							       Type source_type, Type target_type,
+							       Location loc, bool look_for_explicit)
+		{
+			Expression mg1 = null, mg2 = null;
+			Expression mg5 = null, mg6 = null, mg7 = null, mg8 = null;
+			string op_name;
+
+			//
+			// FIXME : How does the False operator come into the picture ?
+			// This doesn't look complete and very correct !
+			//
+			if (target_type == TypeManager.bool_type && !look_for_explicit)
+				op_name = "op_True";
+			else
+				op_name = "op_Implicit";
+
+			MethodGroupExpr union3;
+			
+			mg1 = MethodLookup (ec, source_type, op_name, loc);
+			if (source_type.BaseType != null)
+				mg2 = MethodLookup (ec, source_type.BaseType, op_name, loc);
+
+			if (mg1 == null)
+				union3 = (MethodGroupExpr) mg2;
+			else if (mg2 == null)
+				union3 = (MethodGroupExpr) mg1;
+			else
+				union3 = Invocation.MakeUnionSet (mg1, mg2, loc);
+
+			mg1 = MethodLookup (ec, target_type, op_name, loc);
+			if (mg1 != null){
+				if (union3 != null)
+					union3 = Invocation.MakeUnionSet (union3, mg1, loc);
+				else
+					union3 = (MethodGroupExpr) mg1;
+			}
+
+			if (target_type.BaseType != null)
+				mg1 = MethodLookup (ec, target_type.BaseType, op_name, loc);
+			
+			if (mg1 != null){
+				if (union3 != null)
+					union3 = Invocation.MakeUnionSet (union3, mg1, loc);
+				else
+					union3 = (MethodGroupExpr) mg1;
+			}
+
+			MethodGroupExpr union4 = null;
+
+			if (look_for_explicit) {
+				op_name = "op_Explicit";
+
+				mg5 = MemberLookup (ec, source_type, op_name, loc);
+				if (source_type.BaseType != null)
+					mg6 = MethodLookup (ec, source_type.BaseType, op_name, loc);
+				
+				mg7 = MemberLookup (ec, target_type, op_name, loc);
+				if (target_type.BaseType != null)
+					mg8 = MethodLookup (ec, target_type.BaseType, op_name, loc);
+				
+				MethodGroupExpr union5 = Invocation.MakeUnionSet (mg5, mg6, loc);
+				MethodGroupExpr union6 = Invocation.MakeUnionSet (mg7, mg8, loc);
+
+				union4 = Invocation.MakeUnionSet (union5, union6, loc);
+			}
+			
+			return Invocation.MakeUnionSet (union3, union4, loc);
+		}
+		
+		/// <summary>
+		///   User-defined conversions
+		/// </summary>
+		static public Expression UserDefinedConversion (EmitContext ec, Expression source,
+								Type target, Location loc,
+								bool look_for_explicit)
+		{
+			MethodGroupExpr union;
+			Type source_type = source.Type;
+			MethodBase method = null;
+			
+			union = GetConversionOperators (ec, source_type, target, loc, look_for_explicit);
+			if (union == null)
+				return null;
+			
+			Type most_specific_source, most_specific_target;
+
+#if BLAH
+			foreach (MethodBase m in union.Methods){
+				Console.WriteLine ("Name: " + m.Name);
+				Console.WriteLine ("    : " + ((MethodInfo)m).ReturnType);
+			}
+#endif
+			
+			most_specific_source = FindMostSpecificSource (union, source_type, look_for_explicit, loc);
+			if (most_specific_source == null)
+				return null;
+
+			most_specific_target = FindMostSpecificTarget (union, target, look_for_explicit, loc);
+			if (most_specific_target == null) 
+				return null;
+			
+			int count = 0;
+
+			foreach (MethodBase mb in union.Methods){
+				ParameterData pd = Invocation.GetParameterData (mb);
+				MethodInfo mi = (MethodInfo) mb;
+				
+				if (pd.ParameterType (0) == most_specific_source &&
+				    mi.ReturnType == most_specific_target) {
+					method = mb;
+					count++;
+				}
+			}
+			
+			if (method == null || count > 1) {
+				Report.Error (-11, loc, "Ambiguous user defined conversion");
+				return null;
+			}
+			
+			//
+			// This will do the conversion to the best match that we
+			// found.  Now we need to perform an implict standard conversion
+			// if the best match was not the type that we were requested
+			// by target.
+			//
+			if (look_for_explicit)
+				source = ConvertExplicitStandard (ec, source, most_specific_source, loc);
+			else
+				source = ConvertImplicitStandard (ec, source, most_specific_source, loc);
+
+			if (source == null)
+				return null;
+
+			Expression e;
+			e =  new UserCast ((MethodInfo) method, source, loc);
+			if (e.Type != target){
+				if (!look_for_explicit)
+					e = ConvertImplicitStandard (ec, e, target, loc);
+				else
+					e = ConvertExplicitStandard (ec, e, target, loc);
+			} 
+			return e;
+		}
+		
+		/// <summary>
+		///   Converts implicitly the resolved expression `expr' into the
+		///   `target_type'.  It returns a new expression that can be used
+		///   in a context that expects a `target_type'. 
+		/// </summary>
+		static public Expression ConvertImplicit (EmitContext ec, Expression expr,
+							  Type target_type, Location loc)
+		{
+			Type expr_type = expr.Type;
+			Expression e;
+
+			if (expr_type == target_type)
+				return expr;
+
+			if (target_type == null)
+				throw new Exception ("Target type is null");
+
+			e = ConvertImplicitStandard (ec, expr, target_type, loc);
+			if (e != null)
+				return e;
+
+			e = ImplicitUserConversion (ec, expr, target_type, loc);
+			if (e != null)
+				return e;
+
+			return null;
+		}
+
+		
+		/// <summary>
+		///   Attempts to apply the `Standard Implicit
+		///   Conversion' rules to the expression `expr' into
+		///   the `target_type'.  It returns a new expression
+		///   that can be used in a context that expects a
+		///   `target_type'.
+		///
+		///   This is different from `ConvertImplicit' in that the
+		///   user defined implicit conversions are excluded. 
+		/// </summary>
+		static public Expression ConvertImplicitStandard (EmitContext ec, Expression expr,
+								  Type target_type, Location loc)
+		{
+			Type expr_type = expr.Type;
+			Expression e;
+
+			if (expr_type == target_type)
+				return expr;
+
+			e = ImplicitNumericConversion (ec, expr, target_type, loc);
+			if (e != null)
+				return e;
+
+			e = ImplicitReferenceConversion (expr, target_type);
+			if (e != null)
+				return e;
+
+			if (target_type.IsSubclassOf (TypeManager.enum_type) && expr is IntLiteral){
+				IntLiteral i = (IntLiteral) expr;
+
+				if (i.Value == 0)
+					return new EmptyCast (expr, target_type);
+			}
+
+			if (ec.InUnsafe) {
+				if (expr_type.IsPointer){
+					if (target_type == TypeManager.void_ptr_type)
+						return new EmptyCast (expr, target_type);
+
+					//
+					// yep, comparing pointer types cant be done with
+					// t1 == t2, we have to compare their element types.
+					//
+					if (target_type.IsPointer){
+						if (target_type.GetElementType()==expr_type.GetElementType())
+							return expr;
+					}
+				}
+				
+				if (target_type.IsPointer){
+					if (expr is NullLiteral)
+						return new EmptyCast (expr, target_type);
+				}
+			}
+
+			return null;
+		}
+
+		/// <summary>
+		///   Attemps to perform an implict constant conversion of the IntConstant
+		///   into a different data type using casts (See Implicit Constant
+		///   Expression Conversions)
+		/// </summary>
+		static protected Expression TryImplicitIntConversion (Type target_type, IntConstant ic)
+		{
+			int value = ic.Value;
+
+			//
+			// FIXME: This could return constants instead of EmptyCasts
+			//
+			if (target_type == TypeManager.sbyte_type){
+				if (value >= SByte.MinValue && value <= SByte.MaxValue)
+					return new SByteConstant ((sbyte) value);
+			} else if (target_type == TypeManager.byte_type){
+				if (Byte.MinValue >= 0 && value <= Byte.MaxValue)
+					return new ByteConstant ((byte) value);
+			} else if (target_type == TypeManager.short_type){
+				if (value >= Int16.MinValue && value <= Int16.MaxValue)
+					return new ShortConstant ((short) value);
+			} else if (target_type == TypeManager.ushort_type){
+				if (value >= UInt16.MinValue && value <= UInt16.MaxValue)
+					return new UShortConstant ((ushort) value);
+			} else if (target_type == TypeManager.uint32_type){
+				if (value >= 0)
+					return new UIntConstant ((uint) value);
+			} else if (target_type == TypeManager.uint64_type){
+				//
+				// we can optimize this case: a positive int32
+				// always fits on a uint64.  But we need an opcode
+				// to do it.
+				//
+				if (value >= 0)
+					return new ULongConstant ((ulong) value);
+			}
+			
+			if (value == 0 && ic is IntLiteral && TypeManager.IsEnumType (target_type))
+				return new EnumConstant (ic, target_type);
+
+			return null;
+		}
+
+		static public void Error_CannotConvertImplicit (Location loc, Type source, Type target)
+		{
+			string msg = "Cannot convert implicitly from `"+
+				TypeManager.CSharpName (source) + "' to `" +
+				TypeManager.CSharpName (target) + "'";
+
+			Report.Error (29, loc, msg);
+		}
+
+		/// <summary>
+		///   Attemptes to implicityly convert `target' into `type', using
+		///   ConvertImplicit.  If there is no implicit conversion, then
+		///   an error is signaled
+		/// </summary>
+		static public Expression ConvertImplicitRequired (EmitContext ec, Expression source,
+								  Type target_type, Location loc)
+		{
+			Expression e;
+			
+			e = ConvertImplicit (ec, source, target_type, loc);
+			if (e != null)
+				return e;
+
+			if (source is DoubleLiteral && target_type == TypeManager.float_type){
+				Report.Error (664, loc,
+					      "Double literal cannot be implicitly converted to " +
+					      "float type, use F suffix to create a float literal");
+			}
+			
+			Error_CannotConvertImplicit (loc, source.Type, target_type);
+
+			return null;
+		}
+
+		/// <summary>
+		///   Performs the explicit numeric conversions
+		/// </summary>
+		static Expression ConvertNumericExplicit (EmitContext ec, Expression expr, Type target_type)
+		{
+			Type expr_type = expr.Type;
+
+			//
+			// If we have an enumeration, extract the underlying type,
+			// use this during the comparission, but wrap around the original
+			// target_type
+			//
+			Type real_target_type = target_type;
+
+			if (TypeManager.IsEnumType (real_target_type))
+				real_target_type = TypeManager.EnumToUnderlying (real_target_type);
+
+			if (expr_type == TypeManager.sbyte_type){
+				//
+				// From sbyte to byte, ushort, uint, ulong, char
+				//
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I1_U1);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I1_U2);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I1_U4);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I1_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I1_CH);
+			} else if (expr_type == TypeManager.byte_type){
+				//
+				// From byte to sbyte and char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U1_I1);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U1_CH);
+			} else if (expr_type == TypeManager.short_type){
+				//
+				// From short to sbyte, byte, ushort, uint, ulong, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_U1);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_U2);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_U4);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I2_CH);
+			} else if (expr_type == TypeManager.ushort_type){
+				//
+				// From ushort to sbyte, byte, short, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U2_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U2_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U2_I2);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U2_CH);
+			} else if (expr_type == TypeManager.int32_type){
+				//
+				// From int to sbyte, byte, short, ushort, uint, ulong, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_U2);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_U4);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I4_CH);
+			} else if (expr_type == TypeManager.uint32_type){
+				//
+				// From uint to sbyte, byte, short, ushort, int, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_U2);
+				if (real_target_type == TypeManager.int32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_I4);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U4_CH);
+			} else if (expr_type == TypeManager.int64_type){
+				//
+				// From long to sbyte, byte, short, ushort, int, uint, ulong, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_U2);
+				if (real_target_type == TypeManager.int32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_I4);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_U4);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.I8_CH);
+			} else if (expr_type == TypeManager.uint64_type){
+				//
+				// From ulong to sbyte, byte, short, ushort, int, uint, long, char
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_U2);
+				if (real_target_type == TypeManager.int32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_I4);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_U4);
+				if (real_target_type == TypeManager.int64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_I8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.U8_CH);
+			} else if (expr_type == TypeManager.char_type){
+				//
+				// From char to sbyte, byte, short
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.CH_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.CH_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.CH_I2);
+			} else if (expr_type == TypeManager.float_type){
+				//
+				// From float to sbyte, byte, short,
+				// ushort, int, uint, long, ulong, char
+				// or decimal
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_U2);
+				if (real_target_type == TypeManager.int32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_I4);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_U4);
+				if (real_target_type == TypeManager.int64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_I8);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R4_CH);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} else if (expr_type == TypeManager.double_type){
+				//
+				// From double to byte, byte, short,
+				// ushort, int, uint, long, ulong,
+				// char, float or decimal
+				//
+				if (real_target_type == TypeManager.sbyte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_I1);
+				if (real_target_type == TypeManager.byte_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_U1);
+				if (real_target_type == TypeManager.short_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_I2);
+				if (real_target_type == TypeManager.ushort_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_U2);
+				if (real_target_type == TypeManager.int32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_I4);
+				if (real_target_type == TypeManager.uint32_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_U4);
+				if (real_target_type == TypeManager.int64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_I8);
+				if (real_target_type == TypeManager.uint64_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_U8);
+				if (real_target_type == TypeManager.char_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_CH);
+				if (real_target_type == TypeManager.float_type)
+					return new ConvCast (ec, expr, target_type, ConvCast.Mode.R8_R4);
+				if (real_target_type == TypeManager.decimal_type)
+					return InternalTypeConstructor (ec, expr, target_type);
+			} 
+
+			// decimal is taken care of by the op_Explicit methods.
+
+			return null;
+		}
+
+		/// <summary>
+		///  Returns whether an explicit reference conversion can be performed
+		///  from source_type to target_type
+		/// </summary>
+		public static bool ExplicitReferenceConversionExists (Type source_type, Type target_type)
+		{
+			bool target_is_value_type = target_type.IsValueType;
+			
+			if (source_type == target_type)
+				return true;
+			
+			//
+			// From object to any reference type
+			//
+			if (source_type == TypeManager.object_type && !target_is_value_type)
+				return true;
+					
+			//
+			// From any class S to any class-type T, provided S is a base class of T
+			//
+			if (target_type.IsSubclassOf (source_type))
+				return true;
+
+			//
+			// From any interface type S to any interface T provided S is not derived from T
+			//
+			if (source_type.IsInterface && target_type.IsInterface){
+				if (!target_type.IsSubclassOf (source_type))
+					return true;
+			}
+			    
+			//
+			// From any class type S to any interface T, provided S is not sealed
+			// and provided S does not implement T.
+			//
+			if (target_type.IsInterface && !source_type.IsSealed &&
+			    !TypeManager.ImplementsInterface (source_type, target_type))
+				return true;
+
+			//
+			// From any interface-type S to to any class type T, provided T is not
+			// sealed, or provided T implements S.
+			//
+			if (source_type.IsInterface &&
+			    (!target_type.IsSealed || TypeManager.ImplementsInterface (target_type, source_type)))
+				return true;
+			
+			
+			// From an array type S with an element type Se to an array type T with an 
+			// element type Te provided all the following are true:
+			//     * S and T differe only in element type, in other words, S and T
+			//       have the same number of dimensions.
+			//     * Both Se and Te are reference types
+			//     * An explicit referenc conversions exist from Se to Te
+			//
+			if (source_type.IsArray && target_type.IsArray) {
+				if (source_type.GetArrayRank () == target_type.GetArrayRank ()) {
+					
+					Type source_element_type = source_type.GetElementType ();
+					Type target_element_type = target_type.GetElementType ();
+					
+					if (!source_element_type.IsValueType && !target_element_type.IsValueType)
+						if (ExplicitReferenceConversionExists (source_element_type,
+										       target_element_type))
+							return true;
+				}
+			}
+			
+
+			// From System.Array to any array-type
+			if (source_type == TypeManager.array_type &&
+			    target_type.IsArray){
+				return true;
+			}
+
+			//
+			// From System delegate to any delegate-type
+			//
+			if (source_type == TypeManager.delegate_type &&
+			    target_type.IsSubclassOf (TypeManager.delegate_type))
+				return true;
+
+			//
+			// From ICloneable to Array or Delegate types
+			//
+			if (source_type == TypeManager.icloneable_type &&
+			    (target_type == TypeManager.array_type ||
+			     target_type == TypeManager.delegate_type))
+				return true;
+			
+			return false;
+		}
+
+		/// <summary>
+		///   Implements Explicit Reference conversions
+		/// </summary>
+		static Expression ConvertReferenceExplicit (Expression source, Type target_type)
+		{
+			Type source_type = source.Type;
+			bool target_is_value_type = target_type.IsValueType;
+
+			//
+			// From object to any reference type
+			//
+			if (source_type == TypeManager.object_type && !target_is_value_type)
+				return new ClassCast (source, target_type);
+
+
+			//
+			// From any class S to any class-type T, provided S is a base class of T
+			//
+			if (target_type.IsSubclassOf (source_type))
+				return new ClassCast (source, target_type);
+
+			//
+			// From any interface type S to any interface T provided S is not derived from T
+			//
+			if (source_type.IsInterface && target_type.IsInterface){
+				if (TypeManager.ImplementsInterface (source_type, target_type))
+					return null;
+				else
+					return new ClassCast (source, target_type);
+			}
+			    
+			//
+			// From any class type S to any interface T, provides S is not sealed
+			// and provided S does not implement T.
+			//
+			if (target_type.IsInterface && !source_type.IsSealed) {
+				if (TypeManager.ImplementsInterface (source_type, target_type))
+					return null;
+				else
+					return new ClassCast (source, target_type);
+				
+			}
+
+			//
+			// From any interface-type S to to any class type T, provided T is not
+			// sealed, or provided T implements S.
+			//
+			if (source_type.IsInterface) {
+				if (!target_type.IsSealed || TypeManager.ImplementsInterface (target_type, source_type))
+					return new ClassCast (source, target_type);
+				else
+					return null;
+			}
+			
+			// From an array type S with an element type Se to an array type T with an 
+			// element type Te provided all the following are true:
+			//     * S and T differe only in element type, in other words, S and T
+			//       have the same number of dimensions.
+			//     * Both Se and Te are reference types
+			//     * An explicit referenc conversions exist from Se to Te
+			//
+			if (source_type.IsArray && target_type.IsArray) {
+				if (source_type.GetArrayRank () == target_type.GetArrayRank ()) {
+					
+					Type source_element_type = source_type.GetElementType ();
+					Type target_element_type = target_type.GetElementType ();
+					
+					if (!source_element_type.IsValueType && !target_element_type.IsValueType)
+						if (ExplicitReferenceConversionExists (source_element_type,
+										       target_element_type))
+							return new ClassCast (source, target_type);
+				}
+			}
+			
+
+			// From System.Array to any array-type
+			if (source_type == TypeManager.array_type &&
+			    target_type.IsArray) {
+				return new ClassCast (source, target_type);
+			}
+
+			//
+			// From System delegate to any delegate-type
+			//
+			if (source_type == TypeManager.delegate_type &&
+			    target_type.IsSubclassOf (TypeManager.delegate_type))
+				return new ClassCast (source, target_type);
+
+			//
+			// From ICloneable to Array or Delegate types
+			//
+			if (source_type == TypeManager.icloneable_type &&
+			    (target_type == TypeManager.array_type ||
+			     target_type == TypeManager.delegate_type))
+				return new ClassCast (source, target_type);
+			
+			return null;
+		}
+		
+		/// <summary>
+		///   Performs an explicit conversion of the expression `expr' whose
+		///   type is expr.Type to `target_type'.
+		/// </summary>
+		static public Expression ConvertExplicit (EmitContext ec, Expression expr,
+							  Type target_type, Location loc)
+		{
+			Type expr_type = expr.Type;
+			Expression ne = ConvertImplicitStandard (ec, expr, target_type, loc);
+
+			if (ne != null)
+				return ne;
+
+			ne = ConvertNumericExplicit (ec, expr, target_type);
+			if (ne != null)
+				return ne;
+
+			//
+			// Unboxing conversion.
+			//
+			if (expr_type == TypeManager.object_type && target_type.IsValueType)
+				return new UnboxCast (expr, target_type);
+
+			//
+			// Enum types
+			//
+			if (expr_type.IsSubclassOf (TypeManager.enum_type)) {
+				Expression e;
+
+				//
+				// FIXME: Is there any reason we should have EnumConstant
+				// dealt with here instead of just using always the
+				// UnderlyingSystemType to wrap the type?
+				//
+				if (expr is EnumConstant)
+					e = ((EnumConstant) expr).Child;
+				else {
+					e = new EmptyCast (expr, TypeManager.EnumToUnderlying (expr_type));
+				}
+				
+				Expression t = ConvertImplicit (ec, e, target_type, loc);
+				if (t != null)
+					return t;
+				
+				return ConvertNumericExplicit (ec, e, target_type);
+			}
+			
+			ne = ConvertReferenceExplicit (expr, target_type);
+			if (ne != null)
+				return ne;
+
+			if (ec.InUnsafe){
+				if (target_type.IsPointer){
+					if (expr_type.IsPointer)
+						return new EmptyCast (expr, target_type);
+					
+					if (expr_type == TypeManager.sbyte_type ||
+					    expr_type == TypeManager.byte_type ||
+					    expr_type == TypeManager.short_type ||
+					    expr_type == TypeManager.ushort_type ||
+					    expr_type == TypeManager.int32_type ||
+					    expr_type == TypeManager.uint32_type ||
+					    expr_type == TypeManager.uint64_type ||
+					    expr_type == TypeManager.int64_type)
+						return new OpcodeCast (expr, target_type, OpCodes.Conv_U);
+				}
+				if (expr_type.IsPointer){
+					if (target_type == TypeManager.sbyte_type ||
+					    target_type == TypeManager.byte_type ||
+					    target_type == TypeManager.short_type ||
+					    target_type == TypeManager.ushort_type ||
+					    target_type == TypeManager.int32_type ||
+					    target_type == TypeManager.uint32_type ||
+					    target_type == TypeManager.uint64_type ||
+					    target_type == TypeManager.int64_type){
+						Expression e = new EmptyCast (expr, TypeManager.uint32_type);
+						Expression ci, ce;
+
+						ci = ConvertImplicitStandard (ec, e, target_type, loc);
+
+						if (ci != null)
+							return ci;
+
+						ce = ConvertNumericExplicit (ec, e, target_type);
+						if (ce != null)
+							return ce;
+						//
+						// We should always be able to go from an uint32
+						// implicitly or explicitly to the other integral
+						// types
+						//
+						throw new Exception ("Internal compiler error");
+					}
+				}
+			}
+			
+			ne = ExplicitUserConversion (ec, expr, target_type, loc);
+			if (ne != null)
+				return ne;
+
+			Error_CannotConvertType (loc, expr_type, target_type);
+			return null;
+		}
+
+		/// <summary>
+		///   Same as ConvertExplicit, only it doesn't include user defined conversions
+		/// </summary>
+		static public Expression ConvertExplicitStandard (EmitContext ec, Expression expr,
+								  Type target_type, Location l)
+		{
+			Expression ne = ConvertImplicitStandard (ec, expr, target_type, l);
+
+			if (ne != null)
+				return ne;
+
+			ne = ConvertNumericExplicit (ec, expr, target_type);
+			if (ne != null)
+				return ne;
+
+			ne = ConvertReferenceExplicit (expr, target_type);
+			if (ne != null)
+				return ne;
+
+			Error_CannotConvertType (l, expr.Type, target_type);
+			return null;
+		}
+
+		static string ExprClassName (ExprClass c)
+		{
+			switch (c){
+			case ExprClass.Invalid:
+				return "Invalid";
+			case ExprClass.Value:
+				return "value";
+			case ExprClass.Variable:
+				return "variable";
+			case ExprClass.Namespace:
+				return "namespace";
+			case ExprClass.Type:
+				return "type";
+			case ExprClass.MethodGroup:
+				return "method group";
+			case ExprClass.PropertyAccess:
+				return "property access";
+			case ExprClass.EventAccess:
+				return "event access";
+			case ExprClass.IndexerAccess:
+				return "indexer access";
+			case ExprClass.Nothing:
+				return "null";
+			}
+			throw new Exception ("Should not happen");
+		}
+		
+		/// <summary>
+		///   Reports that we were expecting `expr' to be of class `expected'
+		/// </summary>
+		public void Error118 (string expected)
+		{
+			string kind = "Unknown";
+			
+			kind = ExprClassName (eclass);
+
+			Error (118, "Expression denotes a `" + kind +
+			       "' where a `" + expected + "' was expected");
+		}
+
+		public void Error118 (ResolveFlags flags)
+		{
+			ArrayList valid = new ArrayList (10);
+
+			if ((flags & ResolveFlags.VariableOrValue) != 0) {
+				valid.Add ("variable");
+				valid.Add ("value");
+			}
+
+			if ((flags & ResolveFlags.Type) != 0)
+				valid.Add ("type");
+
+			if ((flags & ResolveFlags.MethodGroup) != 0)
+				valid.Add ("method group");
+
+			if ((flags & ResolveFlags.SimpleName) != 0)
+				valid.Add ("simple name");
+
+			if (valid.Count == 0)
+				valid.Add ("unknown");
+
+			StringBuilder sb = new StringBuilder ();
+			for (int i = 0; i < valid.Count; i++) {
+				if (i > 0)
+					sb.Append (", ");
+				else if (i == valid.Count)
+					sb.Append (" or ");
+				sb.Append (valid [i]);
+			}
+
+			string kind = ExprClassName (eclass);
+
+			Error (119, "Expression denotes a `" + kind + "' where " +
+			       "a `" + sb.ToString () + "' was expected");
+		}
+		
+		static void Error_ConstantValueCannotBeConverted (Location l, string val, Type t)
+		{
+			Report.Error (31, l, "Constant value `" + val + "' cannot be converted to " +
+				      TypeManager.CSharpName (t));
+		}
+
+		public static void UnsafeError (Location loc)
+		{
+			Report.Error (214, loc, "Pointers may only be used in an unsafe context");
+		}
+		
+		/// <summary>
+		///   Converts the IntConstant, UIntConstant, LongConstant or
+		///   ULongConstant into the integral target_type.   Notice
+		///   that we do not return an `Expression' we do return
+		///   a boxed integral type.
+		///
+		///   FIXME: Since I added the new constants, we need to
+		///   also support conversions from CharConstant, ByteConstant,
+		///   SByteConstant, UShortConstant, ShortConstant
+		///
+		///   This is used by the switch statement, so the domain
+		///   of work is restricted to the literals above, and the
+		///   targets are int32, uint32, char, byte, sbyte, ushort,
+		///   short, uint64 and int64
+		/// </summary>
+		public static object ConvertIntLiteral (Constant c, Type target_type, Location loc)
+		{
+			string s = "";
+
+			if (c.Type == target_type)
+				return ((Constant) c).GetValue ();
+
+			//
+			// Make into one of the literals we handle, we dont really care
+			// about this value as we will just return a few limited types
+			// 
+			if (c is EnumConstant)
+				c = ((EnumConstant)c).WidenToCompilerConstant ();
+
+			if (c is IntConstant){
+				int v = ((IntConstant) c).Value;
+				
+				if (target_type == TypeManager.uint32_type){
+					if (v >= 0)
+						return (uint) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= Char.MinValue && v <= Char.MaxValue)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v >= SByte.MinValue && v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v >= Int16.MinValue && v <= UInt16.MaxValue)
+						return (short) v;
+				} else if (target_type == TypeManager.ushort_type){
+					if (v >= UInt16.MinValue && v <= UInt16.MaxValue)
+						return (ushort) v;
+				} else if (target_type == TypeManager.int64_type)
+					return (long) v;
+			        else if (target_type == TypeManager.uint64_type){
+					if (v > 0)
+						return (ulong) v;
+				}
+
+				s = v.ToString ();
+			} else if (c is	UIntConstant){
+				uint v = ((UIntConstant) c).Value;
+
+				if (target_type == TypeManager.int32_type){
+					if (v <= Int32.MaxValue)
+						return (int) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= Char.MinValue && v <= Char.MaxValue)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v <= UInt16.MaxValue)
+						return (short) v;
+				} else if (target_type == TypeManager.ushort_type){
+					if (v <= UInt16.MaxValue)
+						return (ushort) v;
+				} else if (target_type == TypeManager.int64_type)
+					return (long) v;
+			        else if (target_type == TypeManager.uint64_type)
+					return (ulong) v;
+				s = v.ToString ();
+			} else if (c is	LongConstant){ 
+				long v = ((LongConstant) c).Value;
+
+				if (target_type == TypeManager.int32_type){
+					if (v >= UInt32.MinValue && v <= UInt32.MaxValue)
+						return (int) v;
+				} else if (target_type == TypeManager.uint32_type){
+					if (v >= 0 && v <= UInt32.MaxValue)
+						return (uint) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= Char.MinValue && v <= Char.MaxValue)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v >= SByte.MinValue && v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v >= Int16.MinValue && v <= UInt16.MaxValue)
+						return (short) v;
+				} else if (target_type == TypeManager.ushort_type){
+					if (v >= UInt16.MinValue && v <= UInt16.MaxValue)
+						return (ushort) v;
+			        } else if (target_type == TypeManager.uint64_type){
+					if (v > 0)
+						return (ulong) v;
+				}
+				s = v.ToString ();
+			} else if (c is	ULongConstant){
+				ulong v = ((ULongConstant) c).Value;
+
+				if (target_type == TypeManager.int32_type){
+					if (v <= Int32.MaxValue)
+						return (int) v;
+				} else if (target_type == TypeManager.uint32_type){
+					if (v <= UInt32.MaxValue)
+						return (uint) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= Char.MinValue && v <= Char.MaxValue)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v <= (int) SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v <= UInt16.MaxValue)
+						return (short) v;
+				} else if (target_type == TypeManager.ushort_type){
+					if (v <= UInt16.MaxValue)
+						return (ushort) v;
+			        } else if (target_type == TypeManager.int64_type){
+					if (v <= Int64.MaxValue)
+						return (long) v;
+				}
+				s = v.ToString ();
+			} else if (c is ByteConstant){
+				byte v = ((ByteConstant) c).Value;
+				
+				if (target_type == TypeManager.int32_type)
+					return (int) v;
+				else if (target_type == TypeManager.uint32_type)
+					return (uint) v;
+				else if (target_type == TypeManager.char_type)
+					return (char) v;
+				else if (target_type == TypeManager.sbyte_type){
+					if (v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type)
+					return (short) v;
+				else if (target_type == TypeManager.ushort_type)
+					return (ushort) v;
+			        else if (target_type == TypeManager.int64_type)
+					return (long) v;
+				else if (target_type == TypeManager.uint64_type)
+					return (ulong) v;
+				s = v.ToString ();
+			} else if (c is SByteConstant){
+				sbyte v = ((SByteConstant) c).Value;
+				
+				if (target_type == TypeManager.int32_type)
+					return (int) v;
+				else if (target_type == TypeManager.uint32_type){
+					if (v >= 0)
+						return (uint) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= 0)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= 0)
+						return (byte) v;
+				} else if (target_type == TypeManager.short_type)
+					return (short) v;
+				else if (target_type == TypeManager.ushort_type){
+					if (v >= 0)
+						return (ushort) v;
+			        } else if (target_type == TypeManager.int64_type)
+					return (long) v;
+				else if (target_type == TypeManager.uint64_type){
+					if (v >= 0)
+						return (ulong) v;
+				}
+				s = v.ToString ();
+			} else if (c is ShortConstant){
+				short v = ((ShortConstant) c).Value;
+				
+				if (target_type == TypeManager.int32_type){
+					return (int) v;
+				} else if (target_type == TypeManager.uint32_type){
+					if (v >= 0)
+						return (uint) v;
+				} else if (target_type == TypeManager.char_type){
+					if (v >= 0)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v >= SByte.MinValue && v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.ushort_type){
+					if (v >= 0)
+						return (ushort) v;
+			        } else if (target_type == TypeManager.int64_type)
+					return (long) v;
+				else if (target_type == TypeManager.uint64_type)
+					return (ulong) v;
+
+				s = v.ToString ();
+			} else if (c is UShortConstant){
+				ushort v = ((UShortConstant) c).Value;
+				
+				if (target_type == TypeManager.int32_type)
+					return (int) v;
+				else if (target_type == TypeManager.uint32_type)
+					return (uint) v;
+				else if (target_type == TypeManager.char_type){
+					if (v >= Char.MinValue && v <= Char.MaxValue)
+						return (char) v;
+				} else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v <= SByte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v <= Int16.MaxValue)
+						return (short) v;
+			        } else if (target_type == TypeManager.int64_type)
+					return (long) v;
+				else if (target_type == TypeManager.uint64_type)
+					return (ulong) v;
+
+				s = v.ToString ();
+			} else if (c is CharConstant){
+				char v = ((CharConstant) c).Value;
+				
+				if (target_type == TypeManager.int32_type)
+					return (int) v;
+				else if (target_type == TypeManager.uint32_type)
+					return (uint) v;
+				else if (target_type == TypeManager.byte_type){
+					if (v >= Byte.MinValue && v <= Byte.MaxValue)
+						return (byte) v;
+				} else if (target_type == TypeManager.sbyte_type){
+					if (v <= SByte.MaxValue)
+						return (sbyte) v;
+				} else if (target_type == TypeManager.short_type){
+					if (v <= Int16.MaxValue)
+						return (short) v;
+				} else if (target_type == TypeManager.ushort_type)
+					return (short) v;
+			        else if (target_type == TypeManager.int64_type)
+					return (long) v;
+				else if (target_type == TypeManager.uint64_type)
+					return (ulong) v;
+
+				s = v.ToString ();
+			}
+			Error_ConstantValueCannotBeConverted (loc, s, target_type);
+			return null;
+		}
+
+		//
+		// Load the object from the pointer.  
+		//
+		public static void LoadFromPtr (ILGenerator ig, Type t)
+		{
+			if (t == TypeManager.int32_type)
+				ig.Emit (OpCodes.Ldind_I4);
+			else if (t == TypeManager.uint32_type)
+				ig.Emit (OpCodes.Ldind_U4);
+			else if (t == TypeManager.short_type)
+				ig.Emit (OpCodes.Ldind_I2);
+			else if (t == TypeManager.ushort_type)
+				ig.Emit (OpCodes.Ldind_U2);
+			else if (t == TypeManager.char_type)
+				ig.Emit (OpCodes.Ldind_U2);
+			else if (t == TypeManager.byte_type)
+				ig.Emit (OpCodes.Ldind_U1);
+			else if (t == TypeManager.sbyte_type)
+				ig.Emit (OpCodes.Ldind_I1);
+			else if (t == TypeManager.uint64_type)
+				ig.Emit (OpCodes.Ldind_I8);
+			else if (t == TypeManager.int64_type)
+				ig.Emit (OpCodes.Ldind_I8);
+			else if (t == TypeManager.float_type)
+				ig.Emit (OpCodes.Ldind_R4);
+			else if (t == TypeManager.double_type)
+				ig.Emit (OpCodes.Ldind_R8);
+			else if (t == TypeManager.bool_type)
+				ig.Emit (OpCodes.Ldind_I1);
+			else if (t == TypeManager.intptr_type)
+				ig.Emit (OpCodes.Ldind_I);
+			else if (TypeManager.IsEnumType (t)) {
+				if (t == TypeManager.enum_type)
+					ig.Emit (OpCodes.Ldind_Ref);
+				else
+					LoadFromPtr (ig, TypeManager.EnumToUnderlying (t));
+			} else if (t.IsValueType)
+				ig.Emit (OpCodes.Ldobj, t);
+			else
+				ig.Emit (OpCodes.Ldind_Ref);
+		}
+
+		//
+		// The stack contains the pointer and the value of type `type'
+		//
+		public static void StoreFromPtr (ILGenerator ig, Type type)
+		{
+			if (type.IsEnum)
+				type = TypeManager.EnumToUnderlying (type);
+			if (type == TypeManager.int32_type || type == TypeManager.uint32_type)
+				ig.Emit (OpCodes.Stind_I4);
+			else if (type == TypeManager.int64_type || type == TypeManager.uint64_type)
+				ig.Emit (OpCodes.Stind_I8);
+			else if (type == TypeManager.char_type || type == TypeManager.short_type ||
+				 type == TypeManager.ushort_type)
+				ig.Emit (OpCodes.Stind_I2);
+			else if (type == TypeManager.float_type)
+				ig.Emit (OpCodes.Stind_R4);
+			else if (type == TypeManager.double_type)
+				ig.Emit (OpCodes.Stind_R8);
+			else if (type == TypeManager.byte_type || type == TypeManager.sbyte_type ||
+				 type == TypeManager.bool_type)
+				ig.Emit (OpCodes.Stind_I1);
+			else if (type == TypeManager.intptr_type)
+				ig.Emit (OpCodes.Stind_I);
+			else if (type.IsValueType)
+				ig.Emit (OpCodes.Stobj, type);
+			else
+				ig.Emit (OpCodes.Stind_Ref);
+		}
+		
+		//
+		// Returns the size of type `t' if known, otherwise, 0
+		//
+		public static int GetTypeSize (Type t)
+		{
+			t = TypeManager.TypeToCoreType (t);
+			if (t == TypeManager.int32_type ||
+			    t == TypeManager.uint32_type ||
+			    t == TypeManager.float_type)
+			        return 4;
+			else if (t == TypeManager.int64_type ||
+				 t == TypeManager.uint64_type ||
+				 t == TypeManager.double_type)
+			        return 8;
+			else if (t == TypeManager.byte_type ||
+				 t == TypeManager.sbyte_type ||
+				 t == TypeManager.bool_type) 	
+			        return 1;
+			else if (t == TypeManager.short_type ||
+				 t == TypeManager.char_type ||
+				 t == TypeManager.ushort_type)
+				return 2;
+			else
+				return 0;
+		}
+
+		//
+		// Default implementation of IAssignMethod.CacheTemporaries
+		//
+		public void CacheTemporaries (EmitContext ec)
+		{
+		}
+
+		static void Error_NegativeArrayIndex (Location loc)
+		{
+			Report.Error (284, loc, "Can not create array with a negative size");
+		}
+		
+		//
+		// Converts `source' to an int, uint, long or ulong.
+		//
+		public Expression ExpressionToArrayArgument (EmitContext ec, Expression source, Location loc)
+		{
+			Expression target;
+			
+			bool old_checked = ec.CheckState;
+			ec.CheckState = true;
+			
+			target = ConvertImplicit (ec, source, TypeManager.int32_type, loc);
+			if (target == null){
+				target = ConvertImplicit (ec, source, TypeManager.uint32_type, loc);
+				if (target == null){
+					target = ConvertImplicit (ec, source, TypeManager.int64_type, loc);
+					if (target == null){
+						target = ConvertImplicit (ec, source, TypeManager.uint64_type, loc);
+						if (target == null)
+							Expression.Error_CannotConvertImplicit (loc, source.Type, TypeManager.int32_type);
+					}
+				}
+			} 
+			ec.CheckState = old_checked;
+
+			//
+			// Only positive constants are allowed at compile time
+			//
+			if (target is Constant){
+				if (target is IntConstant){
+					if (((IntConstant) target).Value < 0){
+						Error_NegativeArrayIndex (loc);
+						return null;
+					}
+				}
+
+				if (target is LongConstant){
+					if (((LongConstant) target).Value < 0){
+						Error_NegativeArrayIndex (loc);
+						return null;
+					}
+				}
+				
+			}
+
+			return target;
+		}
+		
+	}
+
+	/// <summary>
+	///   This is just a base class for expressions that can
+	///   appear on statements (invocations, object creation,
+	///   assignments, post/pre increment and decrement).  The idea
+	///   being that they would support an extra Emition interface that
+	///   does not leave a result on the stack.
+	/// </summary>
+	public abstract class ExpressionStatement : Expression {
+
+		/// <summary>
+		///   Requests the expression to be emitted in a `statement'
+		///   context.  This means that no new value is left on the
+		///   stack after invoking this method (constrasted with
+		///   Emit that will always leave a value on the stack).
+		/// </summary>
+		public abstract void EmitStatement (EmitContext ec);
+	}
+
+	/// <summary>
+	///   This kind of cast is used to encapsulate the child
+	///   whose type is child.Type into an expression that is
+	///   reported to return "return_type".  This is used to encapsulate
+	///   expressions which have compatible types, but need to be dealt
+	///   at higher levels with.
+	///
+	///   For example, a "byte" expression could be encapsulated in one
+	///   of these as an "unsigned int".  The type for the expression
+	///   would be "unsigned int".
+	///
+	/// </summary>
+	public class EmptyCast : Expression {
+		protected Expression child;
+
+		public EmptyCast (Expression child, Type return_type)
+		{
+			eclass = child.eclass;
+			type = return_type;
+			this.child = child;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			child.Emit (ec);
+		}
+	}
+
+	/// <summary>
+	///  This class is used to wrap literals which belong inside Enums
+	/// </summary>
+	public class EnumConstant : Constant {
+		public Constant Child;
+
+		public EnumConstant (Constant child, Type enum_type)
+		{
+			eclass = child.eclass;
+			this.Child = child;
+			type = enum_type;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			Child.Emit (ec);
+		}
+
+		public override object GetValue ()
+		{
+			return Child.GetValue ();
+		}
+
+		//
+		// Converts from one of the valid underlying types for an enumeration
+		// (int32, uint32, int64, uint64, short, ushort, byte, sbyte) to
+		// one of the internal compiler literals: Int/UInt/Long/ULong Literals.
+		//
+		public Constant WidenToCompilerConstant ()
+		{
+			Type t = TypeManager.EnumToUnderlying (Child.Type);
+			object v = ((Constant) Child).GetValue ();;
+			
+			if (t == TypeManager.int32_type)
+				return new IntConstant ((int) v);
+			if (t == TypeManager.uint32_type)
+				return new UIntConstant ((uint) v);
+			if (t == TypeManager.int64_type)
+				return new LongConstant ((long) v);
+			if (t == TypeManager.uint64_type)
+				return new ULongConstant ((ulong) v);
+			if (t == TypeManager.short_type)
+				return new ShortConstant ((short) v);
+			if (t == TypeManager.ushort_type)
+				return new UShortConstant ((ushort) v);
+			if (t == TypeManager.byte_type)
+				return new ByteConstant ((byte) v);
+			if (t == TypeManager.sbyte_type)
+				return new SByteConstant ((sbyte) v);
+
+			throw new Exception ("Invalid enumeration underlying type: " + t);
+		}
+
+		//
+		// Extracts the value in the enumeration on its native representation
+		//
+		public object GetPlainValue ()
+		{
+			Type t = TypeManager.EnumToUnderlying (Child.Type);
+			object v = ((Constant) Child).GetValue ();;
+			
+			if (t == TypeManager.int32_type)
+				return (int) v;
+			if (t == TypeManager.uint32_type)
+				return (uint) v;
+			if (t == TypeManager.int64_type)
+				return (long) v;
+			if (t == TypeManager.uint64_type)
+				return (ulong) v;
+			if (t == TypeManager.short_type)
+				return (short) v;
+			if (t == TypeManager.ushort_type)
+				return (ushort) v;
+			if (t == TypeManager.byte_type)
+				return (byte) v;
+			if (t == TypeManager.sbyte_type)
+				return (sbyte) v;
+
+			return null;
+		}
+		
+		public override string AsString ()
+		{
+			return Child.AsString ();
+		}
+
+		public override DoubleConstant ConvertToDouble ()
+		{
+			return Child.ConvertToDouble ();
+		}
+
+		public override FloatConstant ConvertToFloat ()
+		{
+			return Child.ConvertToFloat ();
+		}
+
+		public override ULongConstant ConvertToULong ()
+		{
+			return Child.ConvertToULong ();
+		}
+
+		public override LongConstant ConvertToLong ()
+		{
+			return Child.ConvertToLong ();
+		}
+
+		public override UIntConstant ConvertToUInt ()
+		{
+			return Child.ConvertToUInt ();
+		}
+
+		public override IntConstant ConvertToInt ()
+		{
+			return Child.ConvertToInt ();
+		}
+	}
+
+	/// <summary>
+	///   This kind of cast is used to encapsulate Value Types in objects.
+	///
+	///   The effect of it is to box the value type emitted by the previous
+	///   operation.
+	/// </summary>
+	public class BoxedCast : EmptyCast {
+
+		public BoxedCast (Expression expr)
+			: base (expr, TypeManager.object_type)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			base.Emit (ec);
+			
+			ec.ig.Emit (OpCodes.Box, child.Type);
+		}
+	}
+
+	public class UnboxCast : EmptyCast {
+		public UnboxCast (Expression expr, Type return_type)
+			: base (expr, return_type)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			Type t = type;
+			ILGenerator ig = ec.ig;
+			
+			base.Emit (ec);
+			ig.Emit (OpCodes.Unbox, t);
+
+			LoadFromPtr (ig, t);
+		}
+	}
+	
+	/// <summary>
+	///   This is used to perform explicit numeric conversions.
+	///
+	///   Explicit numeric conversions might trigger exceptions in a checked
+	///   context, so they should generate the conv.ovf opcodes instead of
+	///   conv opcodes.
+	/// </summary>
+	public class ConvCast : EmptyCast {
+		public enum Mode : byte {
+			I1_U1, I1_U2, I1_U4, I1_U8, I1_CH,
+			U1_I1, U1_CH,
+			I2_I1, I2_U1, I2_U2, I2_U4, I2_U8, I2_CH,
+			U2_I1, U2_U1, U2_I2, U2_CH,
+			I4_I1, I4_U1, I4_I2, I4_U2, I4_U4, I4_U8, I4_CH,
+			U4_I1, U4_U1, U4_I2, U4_U2, U4_I4, U4_CH,
+			I8_I1, I8_U1, I8_I2, I8_U2, I8_I4, I8_U4, I8_U8, I8_CH,
+			U8_I1, U8_U1, U8_I2, U8_U2, U8_I4, U8_U4, U8_I8, U8_CH,
+			CH_I1, CH_U1, CH_I2,
+			R4_I1, R4_U1, R4_I2, R4_U2, R4_I4, R4_U4, R4_I8, R4_U8, R4_CH,
+			R8_I1, R8_U1, R8_I2, R8_U2, R8_I4, R8_U4, R8_I8, R8_U8, R8_CH, R8_R4
+		}
+
+		Mode mode;
+		bool checked_state;
+		
+		public ConvCast (EmitContext ec, Expression child, Type return_type, Mode m)
+			: base (child, return_type)
+		{
+			checked_state = ec.CheckState;
+			mode = m;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			base.Emit (ec);
+
+			if (checked_state){
+				switch (mode){
+				case Mode.I1_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.I1_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.I1_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.I1_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.I1_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+
+				case Mode.U1_I1: ig.Emit (OpCodes.Conv_Ovf_I1_Un); break;
+				case Mode.U1_CH: /* nothing */ break;
+
+				case Mode.I2_I1: ig.Emit (OpCodes.Conv_Ovf_I1); break;
+				case Mode.I2_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.I2_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.I2_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.I2_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.I2_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+
+				case Mode.U2_I1: ig.Emit (OpCodes.Conv_Ovf_I1_Un); break;
+				case Mode.U2_U1: ig.Emit (OpCodes.Conv_Ovf_U1_Un); break;
+				case Mode.U2_I2: ig.Emit (OpCodes.Conv_Ovf_I2_Un); break;
+				case Mode.U2_CH: /* nothing */ break;
+
+				case Mode.I4_I1: ig.Emit (OpCodes.Conv_Ovf_I1); break;
+				case Mode.I4_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.I4_I2: ig.Emit (OpCodes.Conv_Ovf_I2); break;
+				case Mode.I4_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.I4_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.I4_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.I4_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+
+				case Mode.U4_I1: ig.Emit (OpCodes.Conv_Ovf_I1_Un); break;
+				case Mode.U4_U1: ig.Emit (OpCodes.Conv_Ovf_U1_Un); break;
+				case Mode.U4_I2: ig.Emit (OpCodes.Conv_Ovf_I2_Un); break;
+				case Mode.U4_U2: ig.Emit (OpCodes.Conv_Ovf_U2_Un); break;
+				case Mode.U4_I4: ig.Emit (OpCodes.Conv_Ovf_I4_Un); break;
+				case Mode.U4_CH: ig.Emit (OpCodes.Conv_Ovf_U2_Un); break;
+
+				case Mode.I8_I1: ig.Emit (OpCodes.Conv_Ovf_I1); break;
+				case Mode.I8_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.I8_I2: ig.Emit (OpCodes.Conv_Ovf_I2); break;
+				case Mode.I8_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.I8_I4: ig.Emit (OpCodes.Conv_Ovf_I4); break;
+				case Mode.I8_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.I8_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.I8_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+
+				case Mode.U8_I1: ig.Emit (OpCodes.Conv_Ovf_I1_Un); break;
+				case Mode.U8_U1: ig.Emit (OpCodes.Conv_Ovf_U1_Un); break;
+				case Mode.U8_I2: ig.Emit (OpCodes.Conv_Ovf_I2_Un); break;
+				case Mode.U8_U2: ig.Emit (OpCodes.Conv_Ovf_U2_Un); break;
+				case Mode.U8_I4: ig.Emit (OpCodes.Conv_Ovf_I4_Un); break;
+				case Mode.U8_U4: ig.Emit (OpCodes.Conv_Ovf_U4_Un); break;
+				case Mode.U8_I8: ig.Emit (OpCodes.Conv_Ovf_I8_Un); break;
+				case Mode.U8_CH: ig.Emit (OpCodes.Conv_Ovf_U2_Un); break;
+
+				case Mode.CH_I1: ig.Emit (OpCodes.Conv_Ovf_I1_Un); break;
+				case Mode.CH_U1: ig.Emit (OpCodes.Conv_Ovf_U1_Un); break;
+				case Mode.CH_I2: ig.Emit (OpCodes.Conv_Ovf_I2_Un); break;
+
+				case Mode.R4_I1: ig.Emit (OpCodes.Conv_Ovf_I1); break;
+				case Mode.R4_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.R4_I2: ig.Emit (OpCodes.Conv_Ovf_I2); break;
+				case Mode.R4_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.R4_I4: ig.Emit (OpCodes.Conv_Ovf_I4); break;
+				case Mode.R4_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.R4_I8: ig.Emit (OpCodes.Conv_Ovf_I8); break;
+				case Mode.R4_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.R4_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+
+				case Mode.R8_I1: ig.Emit (OpCodes.Conv_Ovf_I1); break;
+				case Mode.R8_U1: ig.Emit (OpCodes.Conv_Ovf_U1); break;
+				case Mode.R8_I2: ig.Emit (OpCodes.Conv_Ovf_I2); break;
+				case Mode.R8_U2: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.R8_I4: ig.Emit (OpCodes.Conv_Ovf_I4); break;
+				case Mode.R8_U4: ig.Emit (OpCodes.Conv_Ovf_U4); break;
+				case Mode.R8_I8: ig.Emit (OpCodes.Conv_Ovf_I8); break;
+				case Mode.R8_U8: ig.Emit (OpCodes.Conv_Ovf_U8); break;
+				case Mode.R8_CH: ig.Emit (OpCodes.Conv_Ovf_U2); break;
+				case Mode.R8_R4: ig.Emit (OpCodes.Conv_R4); break;
+				}
+			} else {
+				switch (mode){
+				case Mode.I1_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.I1_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.I1_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.I1_U8: ig.Emit (OpCodes.Conv_I8); break;
+				case Mode.I1_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.U1_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.U1_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.I2_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.I2_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.I2_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.I2_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.I2_U8: ig.Emit (OpCodes.Conv_I8); break;
+				case Mode.I2_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.U2_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.U2_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.U2_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.U2_CH: /* nothing */ break;
+
+				case Mode.I4_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.I4_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.I4_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.I4_U4: /* nothing */ break;
+				case Mode.I4_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.I4_U8: ig.Emit (OpCodes.Conv_I8); break;
+				case Mode.I4_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.U4_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.U4_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.U4_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.U4_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.U4_I4: /* nothing */ break;
+				case Mode.U4_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.I8_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.I8_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.I8_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.I8_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.I8_I4: ig.Emit (OpCodes.Conv_I4); break;
+				case Mode.I8_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.I8_U8: /* nothing */ break;
+				case Mode.I8_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.U8_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.U8_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.U8_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.U8_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.U8_I4: ig.Emit (OpCodes.Conv_I4); break;
+				case Mode.U8_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.U8_I8: /* nothing */ break;
+				case Mode.U8_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.CH_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.CH_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.CH_I2: ig.Emit (OpCodes.Conv_I2); break;
+
+				case Mode.R4_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.R4_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.R4_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.R4_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.R4_I4: ig.Emit (OpCodes.Conv_I4); break;
+				case Mode.R4_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.R4_I8: ig.Emit (OpCodes.Conv_I8); break;
+				case Mode.R4_U8: ig.Emit (OpCodes.Conv_U8); break;
+				case Mode.R4_CH: ig.Emit (OpCodes.Conv_U2); break;
+
+				case Mode.R8_I1: ig.Emit (OpCodes.Conv_I1); break;
+				case Mode.R8_U1: ig.Emit (OpCodes.Conv_U1); break;
+				case Mode.R8_I2: ig.Emit (OpCodes.Conv_I2); break;
+				case Mode.R8_U2: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.R8_I4: ig.Emit (OpCodes.Conv_I4); break;
+				case Mode.R8_U4: ig.Emit (OpCodes.Conv_U4); break;
+				case Mode.R8_I8: ig.Emit (OpCodes.Conv_I8); break;
+				case Mode.R8_U8: ig.Emit (OpCodes.Conv_U8); break;
+				case Mode.R8_CH: ig.Emit (OpCodes.Conv_U2); break;
+				case Mode.R8_R4: ig.Emit (OpCodes.Conv_R4); break;
+				}
+			}
+		}
+	}
+	
+	public class OpcodeCast : EmptyCast {
+		OpCode op, op2;
+		bool second_valid;
+		
+		public OpcodeCast (Expression child, Type return_type, OpCode op)
+			: base (child, return_type)
+			
+		{
+			this.op = op;
+			second_valid = false;
+		}
+
+		public OpcodeCast (Expression child, Type return_type, OpCode op, OpCode op2)
+			: base (child, return_type)
+			
+		{
+			this.op = op;
+			this.op2 = op2;
+			second_valid = true;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			base.Emit (ec);
+			ec.ig.Emit (op);
+
+			if (second_valid)
+				ec.ig.Emit (op2);
+		}			
+	}
+
+	/// <summary>
+	///   This kind of cast is used to encapsulate a child and cast it
+	///   to the class requested
+	/// </summary>
+	public class ClassCast : EmptyCast {
+		public ClassCast (Expression child, Type return_type)
+			: base (child, return_type)
+			
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			base.Emit (ec);
+
+			ec.ig.Emit (OpCodes.Castclass, type);
+		}			
+		
+	}
+	
+	/// <summary>
+	///   SimpleName expressions are initially formed of a single
+	///   word and it only happens at the beginning of the expression.
+	/// </summary>
+	///
+	/// <remarks>
+	///   The expression will try to be bound to a Field, a Method
+	///   group or a Property.  If those fail we pass the name to our
+	///   caller and the SimpleName is compounded to perform a type
+	///   lookup.  The idea behind this process is that we want to avoid
+	///   creating a namespace map from the assemblies, as that requires
+	///   the GetExportedTypes function to be called and a hashtable to
+	///   be constructed which reduces startup time.  If later we find
+	///   that this is slower, we should create a `NamespaceExpr' expression
+	///   that fully participates in the resolution process. 
+	///   
+	///   For example `System.Console.WriteLine' is decomposed into
+	///   MemberAccess (MemberAccess (SimpleName ("System"), "Console"), "WriteLine")
+	///   
+	///   The first SimpleName wont produce a match on its own, so it will
+	///   be turned into:
+	///   MemberAccess (SimpleName ("System.Console"), "WriteLine").
+	///   
+	///   System.Console will produce a TypeExpr match.
+	///   
+	///   The downside of this is that we might be hitting `LookupType' too many
+	///   times with this scheme.
+	/// </remarks>
+	public class SimpleName : Expression, ITypeExpression {
+		public readonly string Name;
+		
+		public SimpleName (string name, Location l)
+		{
+			Name = name;
+			loc = l;
+		}
+
+		public static void Error_ObjectRefRequired (EmitContext ec, Location l, string name)
+		{
+			if (ec.IsFieldInitializer)
+				Report.Error (
+					236, l,
+					"A field initializer cannot reference the non-static field, " +
+					"method or property `"+name+"'");
+			else
+				Report.Error (
+					120, l,
+					"An object reference is required " +
+					"for the non-static field `"+name+"'");
+		}
+		
+		//
+		// Checks whether we are trying to access an instance
+		// property, method or field from a static body.
+		//
+		Expression MemberStaticCheck (EmitContext ec, Expression e)
+		{
+			if (e is IMemberExpr){
+				IMemberExpr member = (IMemberExpr) e;
+				
+				if (!member.IsStatic){
+					Error_ObjectRefRequired (ec, loc, Name);
+					return null;
+				}
+			}
+
+			return e;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return SimpleNameResolve (ec, null, false);
+		}
+
+		public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			return SimpleNameResolve (ec, right_side, false);
+		}
+		
+
+		public Expression DoResolveAllowStatic (EmitContext ec)
+		{
+			return SimpleNameResolve (ec, null, true);
+		}
+
+		public Expression DoResolveType (EmitContext ec)
+		{
+			//
+			// Stage 3: Lookup symbol in the various namespaces. 
+			//
+			DeclSpace ds = ec.DeclSpace;
+			Type t;
+			string alias_value;
+
+			if ((t = RootContext.LookupType (ds, Name, true, loc)) != null)
+				return new TypeExpr (t, loc);
+				
+			//
+			// Stage 2 part b: Lookup up if we are an alias to a type
+			// or a namespace.
+			//
+			// Since we are cheating: we only do the Alias lookup for
+			// namespaces if the name does not include any dots in it
+			//
+				
+			alias_value = ec.DeclSpace.LookupAlias (Name);
+				
+			if (Name.IndexOf ('.') == -1 && alias_value != null) {
+				if ((t = RootContext.LookupType (ds, alias_value, true, loc)) != null)
+					return new TypeExpr (t, loc);
+					
+				// we have alias value, but it isn't Type, so try if it's namespace
+				return new SimpleName (alias_value, loc);
+			}
+				
+			if (ec.ResolvingTypeTree){
+				Type dt = ec.DeclSpace.FindType (Name);
+				if (dt != null)
+					return new TypeExpr (dt, loc);
+			}
+
+			// No match, maybe our parent can compose us
+			// into something meaningful.
+			return this;
+		}
+
+		/// <remarks>
+		///   7.5.2: Simple Names. 
+		///
+		///   Local Variables and Parameters are handled at
+		///   parse time, so they never occur as SimpleNames.
+		///
+		///   The `allow_static' flag is used by MemberAccess only
+		///   and it is used to inform us that it is ok for us to 
+		///   avoid the static check, because MemberAccess might end
+		///   up resolving the Name as a Type name and the access as
+		///   a static type access.
+		///
+		///   ie: Type Type; .... { Type.GetType (""); }
+		///
+		///   Type is both an instance variable and a Type;  Type.GetType
+		///   is the static method not an instance method of type.
+		/// </remarks>
+		Expression SimpleNameResolve (EmitContext ec, Expression right_side, bool allow_static)
+		{
+			Expression e = null;
+
+			//
+			// Stage 1: Performed by the parser (binding to locals or parameters).
+			//
+			Block current_block = ec.CurrentBlock;
+			if (current_block != null && current_block.IsVariableDefined (Name)){
+				LocalVariableReference var;
+
+				var = new LocalVariableReference (ec.CurrentBlock, Name, loc);
+
+				if (right_side != null)
+					return var.ResolveLValue (ec, right_side);
+				else
+					return var.Resolve (ec);
+			}
+
+			if (current_block != null){
+				int idx = -1;
+				Parameter par = null;
+				Parameters pars = current_block.Parameters;
+				if (pars != null)
+					par = pars.GetParameterByName (Name, out idx);
+
+				if (par != null) {
+					ParameterReference param;
+					
+					param = new ParameterReference (pars, idx, Name, loc);
+
+					if (right_side != null)
+						return param.ResolveLValue (ec, right_side);
+					else
+						return param.Resolve (ec);
+				}
+			}
+
+			//
+			// Stage 2: Lookup members 
+			//
+
+			//
+			// For enums, the TypeBuilder is not ec.DeclSpace.TypeBuilder
+			// Hence we have two different cases
+			//
+
+			DeclSpace lookup_ds = ec.DeclSpace;
+			do {
+				if (lookup_ds.TypeBuilder == null)
+					break;
+
+				e = MemberLookup (ec, lookup_ds.TypeBuilder, Name, loc);
+				if (e != null)
+					break;
+
+				//
+				// Classes/structs keep looking, enums break
+				//
+				if (lookup_ds is TypeContainer)
+					lookup_ds = ((TypeContainer) lookup_ds).Parent;
+				else
+					break;
+			} while (lookup_ds != null);
+				
+			if (e == null && ec.ContainerType != null)
+				e = MemberLookup (ec, ec.ContainerType, Name, loc);
+
+			if (e == null)
+				return DoResolveType (ec);
+
+			if (e is TypeExpr)
+				return e;
+
+			if (e is IMemberExpr) {
+				e = MemberAccess.ResolveMemberAccess (ec, e, null, loc, this);
+				if (e == null)
+					return null;
+
+				IMemberExpr me = e as IMemberExpr;
+				if (me == null)
+					return e;
+
+				// This fails if ResolveMemberAccess() was unable to decide whether
+				// it's a field or a type of the same name.
+				if (!me.IsStatic && (me.InstanceExpression == null))
+					return e;
+
+				if (right_side != null)
+					e = e.DoResolveLValue (ec, right_side);
+				else
+					e = e.DoResolve (ec);
+
+				return e;				
+			}
+
+			if (ec.IsStatic || ec.IsFieldInitializer){
+				if (allow_static)
+					return e;
+
+				return MemberStaticCheck (ec, e);
+			} else
+				return e;
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			//
+			// If this is ever reached, then we failed to
+			// find the name as a namespace
+			//
+
+			Error (103, "The name `" + Name +
+			       "' does not exist in the class `" +
+			       ec.DeclSpace.Name + "'");
+		}
+
+		public override string ToString ()
+		{
+			return Name;
+		}
+	}
+	
+	/// <summary>
+	///   Fully resolved expression that evaluates to a type
+	/// </summary>
+	public class TypeExpr : Expression, ITypeExpression {
+		public TypeExpr (Type t, Location l)
+		{
+			Type = t;
+			eclass = ExprClass.Type;
+			loc = l;
+		}
+
+		public virtual Expression DoResolveType (EmitContext ec)
+		{
+			return this;
+		}
+
+		override public Expression DoResolve (EmitContext ec)
+		{
+			return this;
+		}
+
+		override public void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should never be called");
+		}
+	}
+
+	/// <summary>
+	///   Used to create types from a fully qualified name.  These are just used
+	///   by the parser to setup the core types.  A TypeLookupExpression is always
+	///   classified as a type.
+	/// </summary>
+	public class TypeLookupExpression : TypeExpr {
+		string name;
+		
+		public TypeLookupExpression (string name) : base (null, Location.Null)
+		{
+			this.name = name;
+		}
+
+		public override Expression DoResolveType (EmitContext ec)
+		{
+			if (type == null)
+				type = RootContext.LookupType (ec.DeclSpace, name, false, Location.Null);
+			return this;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return DoResolveType (ec);
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should never be called");
+		}
+
+		public override string ToString ()
+		{
+			return name;
+		}
+	}
+
+	/// <summary>
+	///   MethodGroup Expression.
+	///  
+	///   This is a fully resolved expression that evaluates to a type
+	/// </summary>
+	public class MethodGroupExpr : Expression, IMemberExpr {
+		public MethodBase [] Methods;
+		Expression instance_expression = null;
+		
+		public MethodGroupExpr (MemberInfo [] mi, Location l)
+		{
+			Methods = new MethodBase [mi.Length];
+			mi.CopyTo (Methods, 0);
+			eclass = ExprClass.MethodGroup;
+			type = TypeManager.object_type;
+			loc = l;
+		}
+
+		public MethodGroupExpr (ArrayList list, Location l)
+		{
+			Methods = new MethodBase [list.Count];
+
+			try {
+				list.CopyTo (Methods, 0);
+			} catch {
+				foreach (MemberInfo m in list){
+					if (!(m is MethodBase)){
+						Console.WriteLine ("Name " + m.Name);
+						Console.WriteLine ("Found a: " + m.GetType ().FullName);
+					}
+				}
+				throw;
+			}
+			loc = l;
+			eclass = ExprClass.MethodGroup;
+			type = TypeManager.object_type;
+		}
+		
+		//
+		// `A method group may have associated an instance expression' 
+		// 
+		public Expression InstanceExpression {
+			get {
+				return instance_expression;
+			}
+
+			set {
+				instance_expression = value;
+			}
+		}
+
+		public string Name {
+			get {
+				return Methods [0].Name;
+			}
+		}
+
+		public bool IsInstance {
+			get {
+				foreach (MethodBase mb in Methods)
+					if (!mb.IsStatic)
+						return true;
+
+				return false;
+			}
+		}
+
+		public bool IsStatic {
+			get {
+				foreach (MethodBase mb in Methods)
+					if (mb.IsStatic)
+						return true;
+
+				return false;
+			}
+		}
+		
+		override public Expression DoResolve (EmitContext ec)
+		{
+			return this;
+		}
+
+		public void ReportUsageError ()
+		{
+			Report.Error (654, loc, "Method `" + Methods [0].DeclaringType + "." +
+				      Methods [0].Name + "()' is referenced without parentheses");
+		}
+
+		override public void Emit (EmitContext ec)
+		{
+			ReportUsageError ();
+		}
+
+		bool RemoveMethods (bool keep_static)
+		{
+			ArrayList smethods = new ArrayList ();
+
+			foreach (MethodBase mb in Methods){
+				if (mb.IsStatic == keep_static)
+					smethods.Add (mb);
+			}
+
+			if (smethods.Count == 0)
+				return false;
+
+			Methods = new MethodBase [smethods.Count];
+			smethods.CopyTo (Methods, 0);
+
+			return true;
+		}
+		
+		/// <summary>
+		///   Removes any instance methods from the MethodGroup, returns
+		///   false if the resulting set is empty.
+		/// </summary>
+		public bool RemoveInstanceMethods ()
+		{
+			return RemoveMethods (true);
+		}
+
+		/// <summary>
+		///   Removes any static methods from the MethodGroup, returns
+		///   false if the resulting set is empty.
+		/// </summary>
+		public bool RemoveStaticMethods ()
+		{
+			return RemoveMethods (false);
+		}
+	}
+
+	/// <summary>
+	///   Fully resolved expression that evaluates to a Field
+	/// </summary>
+	public class FieldExpr : Expression, IAssignMethod, IMemoryLocation, IMemberExpr {
+		public readonly FieldInfo FieldInfo;
+		Expression instance_expr;
+		
+		public FieldExpr (FieldInfo fi, Location l)
+		{
+			FieldInfo = fi;
+			eclass = ExprClass.Variable;
+			type = fi.FieldType;
+			loc = l;
+		}
+
+		public string Name {
+			get {
+				return FieldInfo.Name;
+			}
+		}
+
+		public bool IsInstance {
+			get {
+				return !FieldInfo.IsStatic;
+			}
+		}
+
+		public bool IsStatic {
+			get {
+				return FieldInfo.IsStatic;
+			}
+		}
+
+		public Expression InstanceExpression {
+			get {
+				return instance_expr;
+			}
+
+			set {
+				instance_expr = value;
+			}
+		}
+
+		override public Expression DoResolve (EmitContext ec)
+		{
+			if (!FieldInfo.IsStatic){
+				if (instance_expr == null){
+					throw new Exception ("non-static FieldExpr without instance var\n" +
+							     "You have to assign the Instance variable\n" +
+							     "Of the FieldExpr to set this\n");
+				}
+
+				// Resolve the field's instance expression while flow analysis is turned
+				// off: when accessing a field "a.b", we must check whether the field
+				// "a.b" is initialized, not whether the whole struct "a" is initialized.
+				instance_expr = instance_expr.Resolve (ec, ResolveFlags.VariableOrValue |
+								       ResolveFlags.DisableFlowAnalysis);
+				if (instance_expr == null)
+					return null;
+			}
+
+			// If the instance expression is a local variable or parameter.
+			IVariable var = instance_expr as IVariable;
+			if ((var != null) && !var.IsFieldAssigned (ec, FieldInfo.Name, loc))
+				return null;
+
+			return this;
+		}
+
+		void Report_AssignToReadonly (bool is_instance)
+		{
+			string msg;
+			
+			if (is_instance)
+				msg = "Readonly field can not be assigned outside " +
+				"of constructor or variable initializer";
+			else
+				msg = "A static readonly field can only be assigned in " +
+				"a static constructor";
+
+			Report.Error (is_instance ? 191 : 198, loc, msg);
+		}
+		
+		override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			IVariable var = instance_expr as IVariable;
+			if (var != null)
+				var.SetFieldAssigned (ec, FieldInfo.Name);
+
+			Expression e = DoResolve (ec);
+
+			if (e == null)
+				return null;
+			
+			if (!FieldInfo.IsInitOnly)
+				return this;
+
+			//
+			// InitOnly fields can only be assigned in constructors
+			//
+
+			if (ec.IsConstructor)
+				return this;
+
+			Report_AssignToReadonly (true);
+			
+			return null;
+		}
+
+		override public void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			bool is_volatile = false;
+
+			if (FieldInfo is FieldBuilder){
+				FieldBase f = TypeManager.GetField (FieldInfo);
+
+				if ((f.ModFlags & Modifiers.VOLATILE) != 0)
+					is_volatile = true;
+				
+				f.status |= Field.Status.USED;
+			}
+			
+			if (FieldInfo.IsStatic){
+				if (is_volatile)
+					ig.Emit (OpCodes.Volatile);
+				
+				ig.Emit (OpCodes.Ldsfld, FieldInfo);
+			} else {
+				if (instance_expr.Type.IsValueType){
+					IMemoryLocation ml;
+					LocalTemporary tempo = null;
+					
+					if (!(instance_expr is IMemoryLocation)){
+						tempo = new LocalTemporary (
+							ec, instance_expr.Type);
+
+						InstanceExpression.Emit (ec);
+						tempo.Store (ec);
+						ml = tempo;
+					} else
+						ml = (IMemoryLocation) instance_expr;
+
+					ml.AddressOf (ec, AddressOp.Load);
+				} else 
+					instance_expr.Emit (ec);
+
+				if (is_volatile)
+					ig.Emit (OpCodes.Volatile);
+				
+				ig.Emit (OpCodes.Ldfld, FieldInfo);
+			}
+		}
+
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			FieldAttributes fa = FieldInfo.Attributes;
+			bool is_static = (fa & FieldAttributes.Static) != 0;
+			bool is_readonly = (fa & FieldAttributes.InitOnly) != 0;
+			ILGenerator ig = ec.ig;
+
+			if (is_readonly && !ec.IsConstructor){
+				Report_AssignToReadonly (!is_static);
+				return;
+			}
+			
+			if (!is_static){
+				Expression instance = instance_expr;
+
+				if (instance.Type.IsValueType){
+					if (instance is IMemoryLocation){
+						IMemoryLocation ml = (IMemoryLocation) instance;
+
+						ml.AddressOf (ec, AddressOp.Store);
+					} else
+						throw new Exception ("The " + instance + " of type " +
+								     instance.Type +
+								     " represents a ValueType and does " +
+								     "not implement IMemoryLocation");
+				} else
+					instance.Emit (ec);
+			}
+			source.Emit (ec);
+
+			if (FieldInfo is FieldBuilder){
+				FieldBase f = TypeManager.GetField (FieldInfo);
+				
+				if ((f.ModFlags & Modifiers.VOLATILE) != 0)
+					ig.Emit (OpCodes.Volatile);
+			}
+			
+			if (is_static)
+				ig.Emit (OpCodes.Stsfld, FieldInfo);
+			else 
+				ig.Emit (OpCodes.Stfld, FieldInfo);
+
+			if (FieldInfo is FieldBuilder){
+				FieldBase f = TypeManager.GetField (FieldInfo);
+
+				f.status |= Field.Status.ASSIGNED;
+			}
+		}
+		
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			ILGenerator ig = ec.ig;
+			
+			if (FieldInfo is FieldBuilder){
+				FieldBase f = TypeManager.GetField (FieldInfo);
+				if ((f.ModFlags & Modifiers.VOLATILE) != 0)
+					ig.Emit (OpCodes.Volatile);
+			}
+
+			if (FieldInfo is FieldBuilder){
+				FieldBase f = TypeManager.GetField (FieldInfo);
+
+				if ((mode & AddressOp.Store) != 0)
+					f.status |= Field.Status.ASSIGNED;
+				if ((mode & AddressOp.Load) != 0)
+					f.status |= Field.Status.USED;
+			}
+
+			//
+			// Handle initonly fields specially: make a copy and then
+			// get the address of the copy.
+			//
+			if (FieldInfo.IsInitOnly){
+				if (ec.IsConstructor) {
+					ig.Emit (OpCodes.Ldsflda, FieldInfo);
+				} else {
+					LocalBuilder local;
+				
+					Emit (ec);
+					local = ig.DeclareLocal (type);
+					ig.Emit (OpCodes.Stloc, local);
+					ig.Emit (OpCodes.Ldloca, local);
+				}
+				return;
+			}
+
+			if (FieldInfo.IsStatic)
+				ig.Emit (OpCodes.Ldsflda, FieldInfo);
+			else {
+				if (instance_expr is IMemoryLocation)
+					((IMemoryLocation)instance_expr).AddressOf (ec, AddressOp.LoadStore);
+				else
+					instance_expr.Emit (ec);
+				ig.Emit (OpCodes.Ldflda, FieldInfo);
+			}
+		}
+	}
+	
+	/// <summary>
+	///   Expression that evaluates to a Property.  The Assign class
+	///   might set the `Value' expression if we are in an assignment.
+	///
+	///   This is not an LValue because we need to re-write the expression, we
+	///   can not take data from the stack and store it.  
+	/// </summary>
+	public class PropertyExpr : ExpressionStatement, IAssignMethod, IMemberExpr {
+		public readonly PropertyInfo PropertyInfo;
+		public bool IsBase;
+		MethodInfo [] Accessors;
+		bool is_static;
+		
+		Expression instance_expr;
+
+		public PropertyExpr (PropertyInfo pi, Location l)
+		{
+			PropertyInfo = pi;
+			eclass = ExprClass.PropertyAccess;
+			is_static = false;
+			loc = l;
+			Accessors = TypeManager.GetAccessors (pi);
+
+			if (Accessors != null)
+				foreach (MethodInfo mi in Accessors){
+					if (mi != null)
+						if (mi.IsStatic)
+							is_static = true;
+				}
+			else
+				Accessors = new MethodInfo [2];
+			
+			type = TypeManager.TypeToCoreType (pi.PropertyType);
+		}
+
+		public string Name {
+			get {
+				return PropertyInfo.Name;
+			}
+		}
+
+		public bool IsInstance {
+			get {
+				return !is_static;
+			}
+		}
+
+		public bool IsStatic {
+			get {
+				return is_static;
+			}
+		}
+		
+		//
+		// The instance expression associated with this expression
+		//
+		public Expression InstanceExpression {
+			set {
+				instance_expr = value;
+			}
+
+			get {
+				return instance_expr;
+			}
+		}
+
+		public bool VerifyAssignable ()
+		{
+			if (!PropertyInfo.CanWrite){
+				Report.Error (200, loc, 
+					      "The property `" + PropertyInfo.Name +
+					      "' can not be assigned to, as it has not set accessor");
+				return false;
+			}
+
+			return true;
+		}
+
+		override public Expression DoResolve (EmitContext ec)
+		{
+			if (!PropertyInfo.CanRead){
+				Report.Error (154, loc, 
+					      "The property `" + PropertyInfo.Name +
+					      "' can not be used in " +
+					      "this context because it lacks a get accessor");
+				return null;
+			}
+
+			return this;
+		}
+
+		override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			if (!PropertyInfo.CanWrite){
+				Report.Error (154, loc, 
+					      "The property `" + PropertyInfo.Name +
+					      "' can not be used in " +
+					      "this context because it lacks a set accessor");
+				return null;
+			}
+
+			return this;
+		}
+
+		override public void Emit (EmitContext ec)
+		{
+			MethodInfo method = Accessors [0];
+
+			//
+			// Special case: length of single dimension array is turned into ldlen
+			//
+			if (method == TypeManager.int_array_get_length){
+				Type iet = instance_expr.Type;
+
+				//
+				// System.Array.Length can be called, but the Type does not
+				// support invoking GetArrayRank, so test for that case first
+				//
+				if (iet != TypeManager.array_type && (iet.GetArrayRank () == 1)){
+					instance_expr.Emit (ec);
+					ec.ig.Emit (OpCodes.Ldlen);
+					return;
+				}
+			}
+
+			Invocation.EmitCall (ec, IsBase, IsStatic, instance_expr, method, null, loc);
+			
+		}
+
+		//
+		// Implements the IAssignMethod interface for assignments
+		//
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			Argument arg = new Argument (source, Argument.AType.Expression);
+			ArrayList args = new ArrayList ();
+
+			args.Add (arg);
+			Invocation.EmitCall (ec, false, IsStatic, instance_expr, Accessors [1], args, loc);
+		}
+
+		override public void EmitStatement (EmitContext ec)
+		{
+			Emit (ec);
+			ec.ig.Emit (OpCodes.Pop);
+		}
+	}
+
+	/// <summary>
+	///   Fully resolved expression that evaluates to an Event
+	/// </summary>
+	public class EventExpr : Expression, IMemberExpr {
+		public readonly EventInfo EventInfo;
+		public Expression instance_expr;
+
+		bool is_static;
+		MethodInfo add_accessor, remove_accessor;
+		
+		public EventExpr (EventInfo ei, Location loc)
+		{
+			EventInfo = ei;
+			this.loc = loc;
+			eclass = ExprClass.EventAccess;
+
+			add_accessor = TypeManager.GetAddMethod (ei);
+			remove_accessor = TypeManager.GetRemoveMethod (ei);
+			
+			if (add_accessor.IsStatic || remove_accessor.IsStatic)
+				is_static = true;
+
+			if (EventInfo is MyEventBuilder)
+				type = ((MyEventBuilder) EventInfo).EventType;
+			else
+				type = EventInfo.EventHandlerType;
+		}
+
+		public string Name {
+			get {
+				return EventInfo.Name;
+			}
+		}
+
+		public bool IsInstance {
+			get {
+				return !is_static;
+			}
+		}
+
+		public bool IsStatic {
+			get {
+				return is_static;
+			}
+		}
+
+		public Expression InstanceExpression {
+			get {
+				return instance_expr;
+			}
+
+			set {
+				instance_expr = value;
+			}
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// We are born fully resolved
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should not happen I think");
+		}
+
+		public void EmitAddOrRemove (EmitContext ec, Expression source)
+		{
+			Expression handler = ((Binary) source).Right;
+			
+			Argument arg = new Argument (handler, Argument.AType.Expression);
+			ArrayList args = new ArrayList ();
+				
+			args.Add (arg);
+			
+			if (((Binary) source).Oper == Binary.Operator.Addition)
+				Invocation.EmitCall (
+					ec, false, IsStatic, instance_expr, add_accessor, args, loc);
+			else
+				Invocation.EmitCall (
+					ec, false, IsStatic, instance_expr, remove_accessor, args, loc);
+		}
+	}
+}	
diff --git a/mcs/mcs/enum.cs b/mcs/mcs/enum.cs
new file mode 100755
index 00000000000..003506f0b6e
--- /dev/null
+++ b/mcs/mcs/enum.cs
@@ -0,0 +1,481 @@
+//
+// enum.cs: Enum handling.
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//         Ravi Pratap     (ravi@ximian.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   Enumeration container
+	/// </summary>
+	public class Enum : DeclSpace {
+		ArrayList ordered_enums;
+		
+		public Expression BaseType;
+		public Attributes  OptAttributes;
+		
+		public Type UnderlyingType;
+
+		Hashtable member_to_location;
+		Hashtable member_to_attributes;
+
+		//
+		// This is for members that have been defined
+		//
+		Hashtable member_to_value;
+
+		//
+		// This is used to mark members we're currently defining
+		//
+		Hashtable in_transit;
+		
+		ArrayList field_builders;
+		
+		public const int AllowedModifiers =
+			Modifiers.NEW |
+			Modifiers.PUBLIC |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL |
+			Modifiers.PRIVATE;
+
+		public Enum (TypeContainer parent, Expression type, int mod_flags, string name, Attributes attrs, Location l)
+			: base (parent, name, l)
+		{
+			this.BaseType = type;
+			ModFlags = Modifiers.Check (AllowedModifiers, mod_flags,
+						    IsTopLevel ? Modifiers.INTERNAL : Modifiers.PRIVATE, l);
+			OptAttributes = attrs;
+
+			ordered_enums = new ArrayList ();
+			member_to_location = new Hashtable ();
+			member_to_value = new Hashtable ();
+			in_transit = new Hashtable ();
+			field_builders = new ArrayList ();
+		}
+
+		/// <summary>
+		///   Adds @name to the enumeration space, with @expr
+		///   being its definition.  
+		/// </summary>
+		public AdditionResult AddEnumMember (string name, Expression expr, Location loc,
+						     Attributes opt_attrs)
+		{
+			if (defined_names.Contains (name))
+				return AdditionResult.NameExists;
+
+			DefineName (name, expr);
+
+			ordered_enums.Add (name);
+			member_to_location.Add (name, loc);
+
+			if (member_to_attributes == null)
+				member_to_attributes = new Hashtable ();
+
+			member_to_attributes.Add (name, opt_attrs);
+			
+			return AdditionResult.Success;
+		}
+
+		//
+		// This is used by corlib compilation: we map from our
+		// type to a type that is consumable by the DefineField
+		//
+		Type MapToInternalType (Type t)
+		{
+			if (t == TypeManager.int32_type)
+				return typeof (int);
+			if (t == TypeManager.int64_type)
+				return typeof (long);
+			if (t == TypeManager.uint32_type)
+				return typeof (uint);
+			if (t == TypeManager.uint64_type)
+				return typeof (ulong);
+			if (t == TypeManager.float_type)
+				return typeof (float);
+			if (t == TypeManager.double_type)
+				return typeof (double);
+			if (t == TypeManager.byte_type)
+				return typeof (byte);
+			if (t == TypeManager.sbyte_type)
+				return typeof (sbyte);
+			if (t == TypeManager.char_type)
+				return typeof (char);
+			if (t == TypeManager.short_type)
+				return typeof (short);
+			if (t == TypeManager.ushort_type)
+				return typeof (ushort);
+
+			throw new Exception ();
+		}
+		
+		public override TypeBuilder DefineType ()
+		{
+			if (TypeBuilder != null)
+				return TypeBuilder;
+
+			TypeAttributes attr = Modifiers.TypeAttr (ModFlags, IsTopLevel);
+
+			attr |= TypeAttributes.Class | TypeAttributes.Sealed;
+
+			UnderlyingType = ResolveType (BaseType, false, Location);
+
+			if (UnderlyingType != TypeManager.int32_type &&
+			    UnderlyingType != TypeManager.uint32_type &&
+			    UnderlyingType != TypeManager.int64_type &&
+			    UnderlyingType != TypeManager.uint64_type &&
+			    UnderlyingType != TypeManager.short_type &&
+			    UnderlyingType != TypeManager.ushort_type &&
+			    UnderlyingType != TypeManager.byte_type  &&
+			    UnderlyingType != TypeManager.sbyte_type) {
+				Report.Error (1008, Location,
+					      "Type byte, sbyte, short, ushort, int, uint, " +
+					      "long, or ulong expected (got: " +
+					      TypeManager.CSharpName (UnderlyingType) + ")");
+				return null;
+			}
+
+			if (IsTopLevel) {
+				ModuleBuilder builder = CodeGen.ModuleBuilder;
+
+				TypeBuilder = builder.DefineType (Name, attr, TypeManager.enum_type);
+			} else {
+				TypeBuilder builder = Parent.TypeBuilder;
+
+				TypeBuilder = builder.DefineNestedType (
+					Basename, attr, TypeManager.enum_type);
+			}
+
+			//
+			// Call MapToInternalType for corlib
+			//
+			TypeBuilder.DefineField ("value__", UnderlyingType,
+						 FieldAttributes.Public | FieldAttributes.SpecialName
+						 | FieldAttributes.RTSpecialName);
+
+			TypeManager.AddEnumType (Name, TypeBuilder, this);
+
+			return TypeBuilder;
+		}
+
+	        bool IsValidEnumConstant (Expression e)
+		{
+			if (!(e is Constant))
+				return false;
+
+			if (e is IntConstant || e is UIntConstant || e is LongConstant ||
+			    e is ByteConstant || e is SByteConstant || e is ShortConstant ||
+			    e is UShortConstant || e is ULongConstant || e is EnumConstant)
+				return true;
+			else
+				return false;
+		}
+
+		object GetNextDefaultValue (object default_value)
+		{
+			if (UnderlyingType == TypeManager.int32_type) {
+				int i = (int) default_value;
+				
+				if (i < System.Int32.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.uint32_type) {
+				uint i = (uint) default_value;
+
+				if (i < System.UInt32.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.int64_type) {
+				long i = (long) default_value;
+
+				if (i < System.Int64.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.uint64_type) {
+				ulong i = (ulong) default_value;
+
+				if (i < System.UInt64.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.short_type) {
+				short i = (short) default_value;
+
+				if (i < System.Int16.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.ushort_type) {
+				ushort i = (ushort) default_value;
+
+				if (i < System.UInt16.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.byte_type) {
+				byte i = (byte) default_value;
+
+				if (i < System.Byte.MaxValue)
+					return ++i;
+				else
+					return null;
+			} else if (UnderlyingType == TypeManager.sbyte_type) {
+				sbyte i = (sbyte) default_value;
+
+				if (i < System.SByte.MaxValue)
+					return ++i;
+				else
+					return null;
+			}
+
+			return null;
+		}
+
+		void Error_ConstantValueCannotBeConverted (object val, Location loc)
+		{
+			if (val is Constant)
+				Report.Error (31, loc, "Constant value '" + ((Constant) val).AsString () +
+					      "' cannot be converted" +
+					      " to a " + TypeManager.CSharpName (UnderlyingType));
+			else 
+				Report.Error (31, loc, "Constant value '" + val +
+					      "' cannot be converted" +
+					      " to a " + TypeManager.CSharpName (UnderlyingType));
+			return;
+		}
+
+		/// <summary>
+		///  This is used to lookup the value of an enum member. If the member is undefined,
+		///  it attempts to define it and return its value
+		/// </summary>
+		public object LookupEnumValue (EmitContext ec, string name, Location loc)
+		{
+			object default_value = null;
+			Constant c = null;
+
+			default_value = member_to_value [name];
+
+			if (default_value != null)
+				return default_value;
+
+			//
+			// This may happen if we're calling a method in System.Enum, for instance
+			// Enum.IsDefined().
+			//
+			if (!defined_names.Contains (name))
+				return null;
+
+			if (in_transit.Contains (name)) {
+				Report.Error (110, loc, "The evaluation of the constant value for `" +
+					      Name + "." + name + "' involves a circular definition.");
+				return null;
+			}
+
+			//
+			// So if the above doesn't happen, we have a member that is undefined
+			// We now proceed to define it 
+			//
+			Expression val = this [name];
+
+			if (val == null) {
+				
+				int idx = ordered_enums.IndexOf (name);
+
+				if (idx == 0)
+					default_value = 0;
+				else {
+					for (int i = 0; i < idx; ++i) {
+						string n = (string) ordered_enums [i];
+						Location m_loc = (Mono.CSharp.Location)
+							member_to_location [n];
+						in_transit.Add (name, true);
+						default_value = LookupEnumValue (ec, n, m_loc);
+						in_transit.Remove (name);
+						if (default_value == null)
+							return null;
+					}
+					
+					default_value = GetNextDefaultValue (default_value);
+				}
+				
+			} else {
+				bool old = ec.InEnumContext;
+				ec.InEnumContext = true;
+				in_transit.Add (name, true);
+				val = val.Resolve (ec);
+				in_transit.Remove (name);
+				ec.InEnumContext = old;
+				
+				if (val == null)
+					return null;
+
+				if (IsValidEnumConstant (val)) {
+					c = (Constant) val;
+					default_value = c.GetValue ();
+					
+					if (default_value == null) {
+						Error_ConstantValueCannotBeConverted (c, loc);
+						return null;
+					}
+					
+				} else {
+					Report.Error (
+						1008, loc,
+						"Type byte, sbyte, short, ushort, int, uint, long, or " +
+						"ulong expected (have: " + val + ")");
+					return null;
+				}
+			}
+
+			FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
+					| FieldAttributes.Literal;
+			
+			FieldBuilder fb = TypeBuilder.DefineField (name, UnderlyingType, attr);
+
+			try {
+				default_value = TypeManager.ChangeType (default_value, UnderlyingType);
+			} catch {
+				Error_ConstantValueCannotBeConverted (c, loc);
+				return null;
+			}
+
+			fb.SetConstant (default_value);
+			field_builders.Add (fb);
+			member_to_value [name] = default_value;
+
+			if (!TypeManager.RegisterFieldValue (fb, default_value))
+				return null;
+
+			//
+			// Now apply attributes
+			//
+			Attribute.ApplyAttributes (ec, fb, fb, (Attributes) member_to_attributes [name], loc); 
+			
+			return default_value;
+		}
+
+		public override bool DefineMembers (TypeContainer parent)
+		{
+			return true;
+		}
+		
+		public override bool Define (TypeContainer parent)
+		{
+			//
+			// If there was an error during DefineEnum, return
+			//
+			if (TypeBuilder == null)
+				return false;
+			
+			EmitContext ec = new EmitContext (parent, this, Location, null,
+							  UnderlyingType, ModFlags, false);
+			
+			object default_value = 0;
+			
+			FieldAttributes attr = FieldAttributes.Public | FieldAttributes.Static
+				             | FieldAttributes.Literal;
+
+			
+			foreach (string name in ordered_enums) {
+				//
+				// Have we already been defined, thanks to some cross-referencing ?
+				// 
+				if (member_to_value.Contains (name))
+					continue;
+				
+				Location loc = (Mono.CSharp.Location) member_to_location [name];
+
+				if (this [name] != null) {
+					default_value = LookupEnumValue (ec, name, loc);
+
+					if (default_value == null)
+						return true;
+
+				} else {
+					FieldBuilder fb = TypeBuilder.DefineField (
+						name, UnderlyingType, attr);
+					
+					if (default_value == null) {
+					   Report.Error (543, loc, "Enumerator value for '" + name + "' is too large to " +
+							      "fit in its type");
+						return false;
+					}
+					
+					try {
+						default_value = TypeManager.ChangeType (default_value, UnderlyingType);
+					} catch {
+						Error_ConstantValueCannotBeConverted (default_value, loc);
+						return false;
+					}
+
+					fb.SetConstant (default_value);
+					field_builders.Add (fb);
+					member_to_value [name] = default_value;
+					
+					if (!TypeManager.RegisterFieldValue (fb, default_value))
+						return false;
+
+					//
+					// Apply attributes on the enum member
+					//
+					Attribute.ApplyAttributes (ec, fb, fb, (Attributes) member_to_attributes [name], loc);
+				}
+
+				default_value = GetNextDefaultValue (default_value);
+			}
+			
+			Attribute.ApplyAttributes (ec, TypeBuilder, this, OptAttributes, Location);
+
+			return true;
+		}
+		
+		//
+		// IMemberFinder
+		//
+		public override MemberList FindMembers (MemberTypes mt, BindingFlags bf,
+							MemberFilter filter, object criteria)
+		{
+			ArrayList members = new ArrayList ();
+
+			if ((mt & MemberTypes.Field) != 0) {
+				foreach (FieldBuilder fb in field_builders)
+					if (filter (fb, criteria) == true)
+						members.Add (fb);
+			}
+
+			return new MemberList (members);
+		}
+
+		public override MemberCache MemberCache {
+			get {
+				return null;
+			}
+		}
+
+		public ArrayList ValueNames {
+			get {
+				return ordered_enums;
+			}
+		}
+
+		// indexer
+		public Expression this [string name] {
+			get {
+				return (Expression) defined_names [name];
+			}
+		}
+	}
+}
diff --git a/mcs/mcs/errors.cs b/mcs/mcs/errors.cs
new file mode 100755
index 00000000000..e69de29bb2d
--- /dev/null
+++ b/mcs/mcs/errors.cs
diff --git a/mcs/mcs/expression.cs b/mcs/mcs/expression.cs
new file mode 100755
index 00000000000..11a41d12461
--- /dev/null
+++ b/mcs/mcs/expression.cs
@@ -0,0 +1,6761 @@
+//
+// expression.cs: Expression representation for the IL tree.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+//
+#define USE_OLD
+
+namespace Mono.CSharp {
+	using System;
+	using System.Collections;
+	using System.Reflection;
+	using System.Reflection.Emit;
+	using System.Text;
+
+	/// <summary>
+	///   This is just a helper class, it is generated by Unary, UnaryMutator
+	///   when an overloaded method has been found.  It just emits the code for a
+	///   static call.
+	/// </summary>
+	public class StaticCallExpr : ExpressionStatement {
+		ArrayList args;
+		MethodInfo mi;
+
+		StaticCallExpr (MethodInfo m, ArrayList a, Location l)
+		{
+			mi = m;
+			args = a;
+
+			type = m.ReturnType;
+			eclass = ExprClass.Value;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// We are born fully resolved
+			//
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			if (args != null) 
+				Invocation.EmitArguments (ec, mi, args);
+
+			ec.ig.Emit (OpCodes.Call, mi);
+			return;
+		}
+		
+		static public Expression MakeSimpleCall (EmitContext ec, MethodGroupExpr mg,
+							 Expression e, Location loc)
+		{
+			ArrayList args;
+			MethodBase method;
+			
+			args = new ArrayList (1);
+			args.Add (new Argument (e, Argument.AType.Expression));
+			method = Invocation.OverloadResolve (ec, (MethodGroupExpr) mg, args, loc);
+
+			if (method == null)
+				return null;
+
+			return new StaticCallExpr ((MethodInfo) method, args, loc);
+		}
+
+		public override void EmitStatement (EmitContext ec)
+		{
+			Emit (ec);
+			if (TypeManager.TypeToCoreType (type) != TypeManager.void_type)
+				ec.ig.Emit (OpCodes.Pop);
+		}
+	}
+	
+	/// <summary>
+	///   Unary expressions.  
+	/// </summary>
+	///
+	/// <remarks>
+	///   Unary implements unary expressions.   It derives from
+	///   ExpressionStatement becuase the pre/post increment/decrement
+	///   operators can be used in a statement context.
+	/// </remarks>
+	public class Unary : Expression {
+		public enum Operator : byte {
+			UnaryPlus, UnaryNegation, LogicalNot, OnesComplement,
+			Indirection, AddressOf,  TOP
+		}
+
+		public Operator Oper;
+		public Expression Expr;
+		
+		public Unary (Operator op, Expression expr, Location loc)
+		{
+			this.Oper = op;
+			this.Expr = expr;
+			this.loc = loc;
+		}
+
+		/// <summary>
+		///   Returns a stringified representation of the Operator
+		/// </summary>
+		static public string OperName (Operator oper)
+		{
+			switch (oper){
+			case Operator.UnaryPlus:
+				return "+";
+			case Operator.UnaryNegation:
+				return "-";
+			case Operator.LogicalNot:
+				return "!";
+			case Operator.OnesComplement:
+				return "~";
+			case Operator.AddressOf:
+				return "&";
+			case Operator.Indirection:
+				return "*";
+			}
+
+			return oper.ToString ();
+		}
+
+		static string [] oper_names;
+
+		static Unary ()
+		{
+			oper_names = new string [(int)Operator.TOP];
+
+			oper_names [(int) Operator.UnaryPlus] = "op_UnaryPlus";
+			oper_names [(int) Operator.UnaryNegation] = "op_UnaryNegation";
+			oper_names [(int) Operator.LogicalNot] = "op_LogicalNot";
+			oper_names [(int) Operator.OnesComplement] = "op_OnesComplement";
+			oper_names [(int) Operator.Indirection] = "op_Indirection";
+			oper_names [(int) Operator.AddressOf] = "op_AddressOf";
+		}
+
+		void Error23 (Type t)
+		{
+			Error (
+				23, "Operator " + OperName (Oper) +
+				" cannot be applied to operand of type `" +
+				TypeManager.CSharpName (t) + "'");
+		}
+
+		/// <remarks>
+		///   The result has been already resolved:
+		///
+		///   FIXME: a minus constant -128 sbyte cant be turned into a
+		///   constant byte.
+		/// </remarks>
+		static Expression TryReduceNegative (Constant expr)
+		{
+			Expression e = null;
+			
+			if (expr is IntConstant)
+				e = new IntConstant (-((IntConstant) expr).Value);
+			else if (expr is UIntConstant){
+				uint value = ((UIntConstant) expr).Value;
+
+				if (value < 2147483649)
+					return new IntConstant (-(int)value);
+				else
+					e = new LongConstant (value);
+			}
+			else if (expr is LongConstant)
+				e = new LongConstant (-((LongConstant) expr).Value);
+			else if (expr is ULongConstant){
+				ulong value = ((ULongConstant) expr).Value;
+
+				if (value < 9223372036854775809)
+					return new LongConstant(-(long)value);
+			}
+			else if (expr is FloatConstant)
+				e = new FloatConstant (-((FloatConstant) expr).Value);
+			else if (expr is DoubleConstant)
+				e = new DoubleConstant (-((DoubleConstant) expr).Value);
+			else if (expr is DecimalConstant)
+				e = new DecimalConstant (-((DecimalConstant) expr).Value);
+			else if (expr is ShortConstant)
+				e = new IntConstant (-((ShortConstant) expr).Value);
+			else if (expr is UShortConstant)
+				e = new IntConstant (-((UShortConstant) expr).Value);
+			return e;
+		}
+
+		// <summary>
+		//   This routine will attempt to simplify the unary expression when the
+		//   argument is a constant.  The result is returned in `result' and the
+		//   function returns true or false depending on whether a reduction
+		//   was performed or not
+		// </summary>
+		bool Reduce (EmitContext ec, Constant e, out Expression result)
+		{
+			Type expr_type = e.Type;
+			
+			switch (Oper){
+			case Operator.UnaryPlus:
+				result = e;
+				return true;
+				
+			case Operator.UnaryNegation:
+				result = TryReduceNegative (e);
+				return true;
+				
+			case Operator.LogicalNot:
+				if (expr_type != TypeManager.bool_type) {
+					result = null;
+					Error23 (expr_type);
+					return false;
+				}
+				
+				BoolConstant b = (BoolConstant) e;
+				result = new BoolConstant (!(b.Value));
+				return true;
+				
+			case Operator.OnesComplement:
+				if (!((expr_type == TypeManager.int32_type) ||
+				      (expr_type == TypeManager.uint32_type) ||
+				      (expr_type == TypeManager.int64_type) ||
+				      (expr_type == TypeManager.uint64_type) ||
+				      (expr_type.IsSubclassOf (TypeManager.enum_type)))){
+					result = null;
+					Error23 (expr_type);
+					return false;
+				}
+
+				if (e is EnumConstant){
+					EnumConstant enum_constant = (EnumConstant) e;
+					Expression reduced;
+					
+					if (Reduce (ec, enum_constant.Child, out reduced)){
+						result = new EnumConstant ((Constant) reduced, enum_constant.Type);
+						return true;
+					} else {
+						result = null;
+						return false;
+					}
+				}
+
+				if (expr_type == TypeManager.int32_type){
+					result = new IntConstant (~ ((IntConstant) e).Value);
+				} else if (expr_type == TypeManager.uint32_type){
+					result = new UIntConstant (~ ((UIntConstant) e).Value);
+				} else if (expr_type == TypeManager.int64_type){
+					result = new LongConstant (~ ((LongConstant) e).Value);
+				} else if (expr_type == TypeManager.uint64_type){
+					result = new ULongConstant (~ ((ULongConstant) e).Value);
+				} else {
+					result = null;
+					Error23 (expr_type);
+					return false;
+				}
+				return true;
+
+			case Operator.AddressOf:
+				result = this;
+				return false;
+
+			case Operator.Indirection:
+				result = this;
+				return false;
+			}
+			throw new Exception ("Can not constant fold: " + Oper.ToString());
+		}
+
+		Expression ResolveOperator (EmitContext ec)
+		{
+			Type expr_type = Expr.Type;
+
+			//
+			// Step 1: Perform Operator Overload location
+			//
+			Expression mg;
+			string op_name;
+			
+			op_name = oper_names [(int) Oper];
+
+			mg = MemberLookup (ec, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
+			
+			if (mg != null) {
+				Expression e = StaticCallExpr.MakeSimpleCall (
+					ec, (MethodGroupExpr) mg, Expr, loc);
+
+				if (e == null){
+					Error23 (expr_type);
+					return null;
+				}
+				
+				return e;
+			}
+
+			// Only perform numeric promotions on:
+			// +, - 
+
+			if (expr_type == null)
+				return null;
+			
+			//
+			// Step 2: Default operations on CLI native types.
+			//
+
+			// Attempt to use a constant folding operation.
+			if (Expr is Constant){
+				Expression result;
+				
+				if (Reduce (ec, (Constant) Expr, out result))
+					return result;
+			}
+
+			switch (Oper){
+			case Operator.LogicalNot:
+				if (expr_type != TypeManager.bool_type) {
+					Error23 (Expr.Type);
+					return null;
+				}
+				
+				type = TypeManager.bool_type;
+				return this;
+
+			case Operator.OnesComplement:
+				if (!((expr_type == TypeManager.int32_type) ||
+				      (expr_type == TypeManager.uint32_type) ||
+				      (expr_type == TypeManager.int64_type) ||
+				      (expr_type == TypeManager.uint64_type) ||
+				      (expr_type.IsSubclassOf (TypeManager.enum_type)))){
+					Expression e;
+
+					e = ConvertImplicit (ec, Expr, TypeManager.int32_type, loc);
+					if (e != null){
+						type = TypeManager.int32_type;
+						return this;
+					}
+					e = ConvertImplicit (ec, Expr, TypeManager.uint32_type, loc);
+					if (e != null){
+						type = TypeManager.uint32_type;
+						return this;
+					}
+					e = ConvertImplicit (ec, Expr, TypeManager.int64_type, loc);
+					if (e != null){
+						type = TypeManager.int64_type;
+						return this;
+					}
+					e = ConvertImplicit (ec, Expr, TypeManager.uint64_type, loc);
+					if (e != null){
+						type = TypeManager.uint64_type;
+						return this;
+					}
+					Error23 (expr_type);
+					return null;
+				}
+				type = expr_type;
+				return this;
+
+			case Operator.AddressOf:
+				if (Expr.eclass != ExprClass.Variable){
+					Error (211, "Cannot take the address of non-variables");
+					return null;
+				}
+				
+				if (!ec.InUnsafe) {
+					UnsafeError (loc); 
+					return null;
+				}
+				
+				if (!TypeManager.VerifyUnManaged (Expr.Type, loc)){
+					return null;
+				}
+				
+				string ptr_type_name = Expr.Type.FullName + "*";
+				type = TypeManager.LookupType (ptr_type_name);
+				
+				return this;
+
+			case Operator.Indirection:
+				if (!ec.InUnsafe){
+					UnsafeError (loc);
+					return null;
+				}
+				
+				if (!expr_type.IsPointer){
+					Error (
+						193,
+						"The * or -> operator can only be applied to pointers");
+					return null;
+				}
+				
+				//
+				// We create an Indirection expression, because
+				// it can implement the IMemoryLocation.
+				// 
+				return new Indirection (Expr, loc);
+			
+			case Operator.UnaryPlus:
+				//
+				// A plus in front of something is just a no-op, so return the child.
+				//
+				return Expr;
+
+			case Operator.UnaryNegation:
+				//
+				// Deals with -literals
+				// int     operator- (int x)
+				// long    operator- (long x)
+				// float   operator- (float f)
+				// double  operator- (double d)
+				// decimal operator- (decimal d)
+				//
+				Expression expr = null;
+
+				//
+				// transform - - expr into expr
+				//
+				if (Expr is Unary){
+					Unary unary = (Unary) Expr;
+					
+					if (unary.Oper == Operator.UnaryNegation)
+						return unary.Expr;
+				}
+
+				//
+				// perform numeric promotions to int,
+				// long, double.
+				//
+				//
+				// The following is inneficient, because we call
+				// ConvertImplicit too many times.
+				//
+				// It is also not clear if we should convert to Float
+				// or Double initially.
+				//
+				if (expr_type == TypeManager.uint32_type){
+					//
+					// FIXME: handle exception to this rule that
+					// permits the int value -2147483648 (-2^31) to
+					// bt wrote as a decimal interger literal
+					//
+					type = TypeManager.int64_type;
+					Expr = ConvertImplicit (ec, Expr, type, loc);
+					return this;
+				}
+
+				if (expr_type == TypeManager.uint64_type){
+					//
+					// FIXME: Handle exception of `long value'
+					// -92233720368547758087 (-2^63) to be wrote as
+					// decimal integer literal.
+					//
+					Error23 (expr_type);
+					return null;
+				}
+
+				if (expr_type == TypeManager.float_type){
+					type = expr_type;
+					return this;
+				}
+				
+				expr = ConvertImplicit (ec, Expr, TypeManager.int32_type, loc);
+				if (expr != null){
+					Expr = expr;
+					type = expr.Type;
+					return this;
+				} 
+
+				expr = ConvertImplicit (ec, Expr, TypeManager.int64_type, loc);
+				if (expr != null){
+					Expr = expr;
+					type = expr.Type;
+					return this;
+				}
+
+				expr = ConvertImplicit (ec, Expr, TypeManager.double_type, loc);
+				if (expr != null){
+					Expr = expr;
+					type = expr.Type;
+					return this;
+				}
+				
+				Error23 (expr_type);
+				return null;
+			}
+
+			Error (187, "No such operator '" + OperName (Oper) + "' defined for type '" +
+			       TypeManager.CSharpName (expr_type) + "'");
+			return null;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			if (Oper == Operator.AddressOf)
+				Expr = Expr.ResolveLValue (ec, new EmptyExpression ());
+			else
+				Expr = Expr.Resolve (ec);
+			
+			if (Expr == null)
+				return null;
+
+			eclass = ExprClass.Value;
+			return ResolveOperator (ec);
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Type expr_type = Expr.Type;
+			
+			switch (Oper) {
+			case Operator.UnaryPlus:
+				throw new Exception ("This should be caught by Resolve");
+				
+			case Operator.UnaryNegation:
+				Expr.Emit (ec);
+				ig.Emit (OpCodes.Neg);
+				break;
+				
+			case Operator.LogicalNot:
+				Expr.Emit (ec);
+				ig.Emit (OpCodes.Ldc_I4_0);
+				ig.Emit (OpCodes.Ceq);
+				break;
+				
+			case Operator.OnesComplement:
+				Expr.Emit (ec);
+				ig.Emit (OpCodes.Not);
+				break;
+				
+			case Operator.AddressOf:
+				((IMemoryLocation)Expr).AddressOf (ec, AddressOp.LoadStore);
+				break;
+				
+			default:
+				throw new Exception ("This should not happen: Operator = "
+						     + Oper.ToString ());
+			}
+		}
+
+		/// <summary>
+		///   This will emit the child expression for `ec' avoiding the logical
+		///   not.  The parent will take care of changing brfalse/brtrue
+		/// </summary>
+		public void EmitLogicalNot (EmitContext ec)
+		{
+			if (Oper != Operator.LogicalNot)
+				throw new Exception ("EmitLogicalNot can only be called with !expr");
+
+			Expr.Emit (ec);
+		}
+
+		public override string ToString ()
+		{
+			return "Unary (" + Oper + ", " + Expr + ")";
+		}
+		
+	}
+
+	//
+	// Unary operators are turned into Indirection expressions
+	// after semantic analysis (this is so we can take the address
+	// of an indirection).
+	//
+	public class Indirection : Expression, IMemoryLocation, IAssignMethod {
+		Expression expr;
+		LocalTemporary temporary;
+		bool have_temporary;
+		
+		public Indirection (Expression expr, Location l)
+		{
+			this.expr = expr;
+			this.type = TypeManager.TypeToCoreType (expr.Type.GetElementType ());
+			eclass = ExprClass.Variable;
+			loc = l;
+		}
+
+		void LoadExprValue (EmitContext ec)
+		{
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			if (temporary != null){
+				if (have_temporary){
+					temporary.Emit (ec);
+					return;
+				}
+				expr.Emit (ec);
+				ec.ig.Emit (OpCodes.Dup);
+				temporary.Store (ec);
+				have_temporary = true;
+			} else
+				expr.Emit (ec);
+			
+			LoadFromPtr (ig, Type);
+		}
+
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			if (temporary != null){
+				if (have_temporary){
+					temporary.Emit (ec);
+					return;
+				}
+				expr.Emit (ec);
+				ec.ig.Emit (OpCodes.Dup);
+				temporary.Store (ec);
+				have_temporary = true;
+			} else
+				expr.Emit (ec);
+
+			source.Emit (ec);
+			StoreFromPtr (ec.ig, type);
+		}
+		
+		public void AddressOf (EmitContext ec, AddressOp Mode)
+		{
+			if (temporary != null){
+				if (have_temporary){
+					temporary.Emit (ec);
+					return;
+				}
+				expr.Emit (ec);
+				ec.ig.Emit (OpCodes.Dup);
+				temporary.Store (ec);
+				have_temporary = true;
+			} else
+				expr.Emit (ec);
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// Born fully resolved
+			//
+			return this;
+		}
+
+		public new void CacheTemporaries (EmitContext ec)
+		{
+			temporary = new LocalTemporary (ec, type);
+		}
+	}
+	
+	/// <summary>
+	///   Unary Mutator expressions (pre and post ++ and --)
+	/// </summary>
+	///
+	/// <remarks>
+	///   UnaryMutator implements ++ and -- expressions.   It derives from
+	///   ExpressionStatement becuase the pre/post increment/decrement
+	///   operators can be used in a statement context.
+	///
+	/// FIXME: Idea, we could split this up in two classes, one simpler
+	/// for the common case, and one with the extra fields for more complex
+	/// classes (indexers require temporary access;  overloaded require method)
+	///
+	/// Maybe we should have classes PreIncrement, PostIncrement, PreDecrement,
+	/// PostDecrement, that way we could save the `Mode' byte as well.  
+	/// </remarks>
+	public class UnaryMutator : ExpressionStatement {
+		public enum Mode : byte {
+			PreIncrement, PreDecrement, PostIncrement, PostDecrement
+		}
+		
+		Mode mode;
+		Expression expr;
+		LocalTemporary temp_storage;
+
+		//
+		// This is expensive for the simplest case.
+		//
+		Expression method;
+			
+		public UnaryMutator (Mode m, Expression e, Location l)
+		{
+			mode = m;
+			loc = l;
+			expr = e;
+		}
+
+		static string OperName (Mode mode)
+		{
+			return (mode == Mode.PreIncrement || mode == Mode.PostIncrement) ?
+				"++" : "--";
+		}
+		
+		void Error23 (Type t)
+		{
+			Error (
+				23, "Operator " + OperName (mode) + 
+				" cannot be applied to operand of type `" +
+				TypeManager.CSharpName (t) + "'");
+		}
+
+		/// <summary>
+		///   Returns whether an object of type `t' can be incremented
+		///   or decremented with add/sub (ie, basically whether we can
+		///   use pre-post incr-decr operations on it, but it is not a
+		///   System.Decimal, which we require operator overloading to catch)
+		/// </summary>
+		static bool IsIncrementableNumber (Type t)
+		{
+			return (t == TypeManager.sbyte_type) ||
+				(t == TypeManager.byte_type) ||
+				(t == TypeManager.short_type) ||
+				(t == TypeManager.ushort_type) ||
+				(t == TypeManager.int32_type) ||
+				(t == TypeManager.uint32_type) ||
+				(t == TypeManager.int64_type) ||
+				(t == TypeManager.uint64_type) ||
+				(t == TypeManager.char_type) ||
+				(t.IsSubclassOf (TypeManager.enum_type)) ||
+				(t == TypeManager.float_type) ||
+				(t == TypeManager.double_type) ||
+				(t.IsPointer && t != TypeManager.void_ptr_type);
+		}
+
+		Expression ResolveOperator (EmitContext ec)
+		{
+			Type expr_type = expr.Type;
+
+			//
+			// Step 1: Perform Operator Overload location
+			//
+			Expression mg;
+			string op_name;
+			
+			if (mode == Mode.PreIncrement || mode == Mode.PostIncrement)
+				op_name = "op_Increment";
+			else 
+				op_name = "op_Decrement";
+
+			mg = MemberLookup (ec, expr_type, op_name, MemberTypes.Method, AllBindingFlags, loc);
+
+			if (mg == null && expr_type.BaseType != null)
+				mg = MemberLookup (ec, expr_type.BaseType, op_name,
+						   MemberTypes.Method, AllBindingFlags, loc);
+			
+			if (mg != null) {
+				method = StaticCallExpr.MakeSimpleCall (
+					ec, (MethodGroupExpr) mg, expr, loc);
+
+				type = method.Type;
+				return this;
+			}
+
+			//
+			// The operand of the prefix/postfix increment decrement operators
+			// should be an expression that is classified as a variable,
+			// a property access or an indexer access
+			//
+			type = expr_type;
+			if (expr.eclass == ExprClass.Variable){
+				if (IsIncrementableNumber (expr_type) ||
+				    expr_type == TypeManager.decimal_type){
+					return this;
+				}
+			} else if (expr.eclass == ExprClass.IndexerAccess){
+				IndexerAccess ia = (IndexerAccess) expr;
+				
+				temp_storage = new LocalTemporary (ec, expr.Type);
+				
+				expr = ia.ResolveLValue (ec, temp_storage);
+				if (expr == null)
+					return null;
+
+				return this;
+			} else if (expr.eclass == ExprClass.PropertyAccess){
+				PropertyExpr pe = (PropertyExpr) expr;
+
+				if (pe.VerifyAssignable ())
+					return this;
+
+				return null;
+			} else {
+				expr.Error118 ("variable, indexer or property access");
+				return null;
+			}
+
+			Error (187, "No such operator '" + OperName (mode) + "' defined for type '" +
+			       TypeManager.CSharpName (expr_type) + "'");
+			return null;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			expr = expr.Resolve (ec);
+			
+			if (expr == null)
+				return null;
+
+			eclass = ExprClass.Value;
+			return ResolveOperator (ec);
+		}
+
+		static int PtrTypeSize (Type t)
+		{
+			return GetTypeSize (t.GetElementType ());
+		}
+
+		//
+		// Loads the proper "1" into the stack based on the type
+		//
+		static void LoadOne (ILGenerator ig, Type t)
+		{
+			if (t == TypeManager.uint64_type || t == TypeManager.int64_type)
+				ig.Emit (OpCodes.Ldc_I8, 1L);
+			else if (t == TypeManager.double_type)
+				ig.Emit (OpCodes.Ldc_R8, 1.0);
+			else if (t == TypeManager.float_type)
+				ig.Emit (OpCodes.Ldc_R4, 1.0F);
+			else if (t.IsPointer){
+				int n = PtrTypeSize (t);
+				
+				if (n == 0)
+					ig.Emit (OpCodes.Sizeof, t);
+				else
+					IntConstant.EmitInt (ig, n);
+			} else 
+				ig.Emit (OpCodes.Ldc_I4_1);
+		}
+
+		
+		//
+		// FIXME: We need some way of avoiding the use of temp_storage
+		// for some types of storage (parameters, local variables,
+		// static fields) and single-dimension array access.
+		//
+		void EmitCode (EmitContext ec, bool is_expr)
+		{
+			ILGenerator ig = ec.ig;
+			IAssignMethod ia = (IAssignMethod) expr;
+			Type expr_type = expr.Type;
+			
+			if (temp_storage == null)
+				temp_storage = new LocalTemporary (ec, expr_type);
+
+			ia.CacheTemporaries (ec);
+			ig.Emit (OpCodes.Nop);
+			switch (mode){
+			case Mode.PreIncrement:
+			case Mode.PreDecrement:
+				if (method == null){
+					expr.Emit (ec);
+
+					LoadOne (ig, expr_type);
+					
+					//
+					// Select the opcode based on the check state (then the type)
+					// and the actual operation
+					//
+					if (ec.CheckState){
+						if (expr_type == TypeManager.int32_type ||
+						    expr_type == TypeManager.int64_type){
+							if (mode == Mode.PreDecrement)
+								ig.Emit (OpCodes.Sub_Ovf);
+							else
+								ig.Emit (OpCodes.Add_Ovf);
+						} else if (expr_type == TypeManager.uint32_type ||
+							   expr_type == TypeManager.uint64_type){
+							if (mode == Mode.PreDecrement)
+								ig.Emit (OpCodes.Sub_Ovf_Un);
+							else
+								ig.Emit (OpCodes.Add_Ovf_Un);
+						} else {
+							if (mode == Mode.PreDecrement)
+								ig.Emit (OpCodes.Sub_Ovf);
+							else
+								ig.Emit (OpCodes.Add_Ovf);
+						}
+					} else {
+						if (mode == Mode.PreDecrement)
+							ig.Emit (OpCodes.Sub);
+						else
+							ig.Emit (OpCodes.Add);
+					}
+				} else 
+					method.Emit (ec);
+
+				temp_storage.Store (ec);
+				ia.EmitAssign (ec, temp_storage);
+				if (is_expr)
+					temp_storage.Emit (ec);
+				break;
+				
+			case Mode.PostIncrement:
+			case Mode.PostDecrement:
+				if (is_expr)
+					expr.Emit (ec);
+				
+				if (method == null){
+					if (!is_expr)
+						expr.Emit (ec);
+					else
+						ig.Emit (OpCodes.Dup);
+
+					LoadOne (ig, expr_type);
+					
+					if (ec.CheckState){
+						if (expr_type == TypeManager.int32_type ||
+						    expr_type == TypeManager.int64_type){
+							if (mode == Mode.PostDecrement)
+								ig.Emit (OpCodes.Sub_Ovf);
+							else
+								ig.Emit (OpCodes.Add_Ovf);
+						} else if (expr_type == TypeManager.uint32_type ||
+							   expr_type == TypeManager.uint64_type){
+							if (mode == Mode.PostDecrement)
+								ig.Emit (OpCodes.Sub_Ovf_Un);
+							else
+								ig.Emit (OpCodes.Add_Ovf_Un);
+						} else {
+							if (mode == Mode.PostDecrement)
+								ig.Emit (OpCodes.Sub_Ovf);
+							else
+								ig.Emit (OpCodes.Add_Ovf);
+						}
+					} else {
+						if (mode == Mode.PostDecrement)
+							ig.Emit (OpCodes.Sub);
+						else
+							ig.Emit (OpCodes.Add);
+					}
+				} else {
+					method.Emit (ec);
+				}
+				
+				temp_storage.Store (ec);
+				ia.EmitAssign (ec, temp_storage);
+				break;
+			}
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			EmitCode (ec, true);
+			
+		}
+		
+		public override void EmitStatement (EmitContext ec)
+		{
+			EmitCode (ec, false);
+		}
+
+	}
+
+	/// <summary>
+	///   Base class for the `Is' and `As' classes. 
+	/// </summary>
+	///
+	/// <remarks>
+	///   FIXME: Split this in two, and we get to save the `Operator' Oper
+	///   size. 
+	/// </remarks>
+	public abstract class Probe : Expression {
+		public readonly Expression ProbeType;
+		protected Expression expr;
+		protected Type probe_type;
+		
+		public Probe (Expression expr, Expression probe_type, Location l)
+		{
+			ProbeType = probe_type;
+			loc = l;
+			this.expr = expr;
+		}
+
+		public Expression Expr {
+			get {
+				return expr;
+			}
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			probe_type = ec.DeclSpace.ResolveType (ProbeType, false, loc);
+
+			if (probe_type == null)
+				return null;
+
+			expr = expr.Resolve (ec);
+			
+			return this;
+		}
+	}
+
+	/// <summary>
+	///   Implementation of the `is' operator.
+	/// </summary>
+	public class Is : Probe {
+		public Is (Expression expr, Expression probe_type, Location l)
+			: base (expr, probe_type, l)
+		{
+		}
+
+		enum Action {
+			AlwaysTrue, AlwaysNull, AlwaysFalse, LeaveOnStack, Probe
+		}
+
+		Action action;
+		
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			expr.Emit (ec);
+
+			switch (action){
+			case Action.AlwaysFalse:
+				ig.Emit (OpCodes.Pop);
+				IntConstant.EmitInt (ig, 0);
+				return;
+			case Action.AlwaysTrue:
+				ig.Emit (OpCodes.Pop);
+				ig.Emit (OpCodes.Nop);
+				IntConstant.EmitInt (ig, 1);
+				return;
+			case Action.LeaveOnStack:
+				// the `e != null' rule.
+				return;
+			case Action.Probe:
+				ig.Emit (OpCodes.Isinst, probe_type);
+				ig.Emit (OpCodes.Ldnull);
+				ig.Emit (OpCodes.Cgt_Un);
+				return;
+			}
+			throw new Exception ("never reached");
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Expression e = base.DoResolve (ec);
+
+			if ((e == null) || (expr == null))
+				return null;
+
+			Type etype = expr.Type;
+			bool warning_always_matches = false;
+			bool warning_never_matches = false;
+
+			type = TypeManager.bool_type;
+			eclass = ExprClass.Value;
+
+			//
+			// First case, if at compile time, there is an implicit conversion
+			// then e != null (objects) or true (value types)
+			//
+			e = ConvertImplicitStandard (ec, expr, probe_type, loc);
+			if (e != null){
+				expr = e;
+				if (etype.IsValueType)
+					action = Action.AlwaysTrue;
+				else
+					action = Action.LeaveOnStack;
+
+				warning_always_matches = true;
+			} else if (ExplicitReferenceConversionExists (etype, probe_type)){
+				//
+				// Second case: explicit reference convresion
+				//
+				if (expr is NullLiteral)
+					action = Action.AlwaysFalse;
+				else
+					action = Action.Probe;
+			} else {
+				action = Action.AlwaysFalse;
+				warning_never_matches = true;
+			}
+			
+			if (RootContext.WarningLevel >= 1){
+				if (warning_always_matches)
+					Warning (
+						183,
+						"The expression is always of type `" +
+						TypeManager.CSharpName (probe_type) + "'");
+				else if (warning_never_matches){
+					if (!(probe_type.IsInterface || expr.Type.IsInterface))
+						Warning (
+							184,
+							"The expression is never of type `" +
+							TypeManager.CSharpName (probe_type) + "'");
+				}
+			}
+
+			return this;
+		}				
+	}
+
+	/// <summary>
+	///   Implementation of the `as' operator.
+	/// </summary>
+	public class As : Probe {
+		public As (Expression expr, Expression probe_type, Location l)
+			: base (expr, probe_type, l)
+		{
+		}
+
+		bool do_isinst = false;
+		
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			expr.Emit (ec);
+
+			if (do_isinst)
+				ig.Emit (OpCodes.Isinst, probe_type);
+		}
+
+		static void Error_CannotConvertType (Type source, Type target, Location loc)
+		{
+			Report.Error (
+				39, loc, "as operator can not convert from `" +
+				TypeManager.CSharpName (source) + "' to `" +
+				TypeManager.CSharpName (target) + "'");
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Expression e = base.DoResolve (ec);
+
+			if (e == null)
+				return null;
+
+			type = probe_type;
+			eclass = ExprClass.Value;
+			Type etype = expr.Type;
+			
+			e = ConvertImplicit (ec, expr, probe_type, loc);
+			if (e != null){
+				expr = e;
+				do_isinst = false;
+				return this;
+			}
+
+			if (ExplicitReferenceConversionExists (etype, probe_type)){
+				do_isinst = true;
+				return this;
+			}
+
+			Error_CannotConvertType (etype, probe_type, loc);
+			return null;
+		}				
+	}
+	
+	/// <summary>
+	///   This represents a typecast in the source language.
+	///
+	///   FIXME: Cast expressions have an unusual set of parsing
+	///   rules, we need to figure those out.
+	/// </summary>
+	public class Cast : Expression {
+		Expression target_type;
+		Expression expr;
+			
+		public Cast (Expression cast_type, Expression expr, Location loc)
+		{
+			this.target_type = cast_type;
+			this.expr = expr;
+			this.loc = loc;
+		}
+
+		public Expression TargetType {
+			get {
+				return target_type;
+			}
+		}
+
+		public Expression Expr {
+			get {
+				return expr;
+			}
+			set {
+				expr = value;
+			}
+		}
+
+		/// <summary>
+		///   Attempts to do a compile-time folding of a constant cast.
+		/// </summary>
+		Expression TryReduce (EmitContext ec, Type target_type)
+		{
+			if (expr is ByteConstant){
+				byte v = ((ByteConstant) expr).Value;
+	
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is SByteConstant){
+				sbyte v = ((SByteConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is ShortConstant){
+				short v = ((ShortConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is UShortConstant){
+				ushort v = ((UShortConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is IntConstant){
+				int v = ((IntConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is UIntConstant){
+				uint v = ((UIntConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is LongConstant){
+				long v = ((LongConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is ULongConstant){
+				ulong v = ((ULongConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is FloatConstant){
+				float v = ((FloatConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.double_type)
+					return new DoubleConstant ((double) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+			if (expr is DoubleConstant){
+				double v = ((DoubleConstant) expr).Value;
+	
+				if (target_type == TypeManager.byte_type)
+					return new ByteConstant ((byte) v);
+				if (target_type == TypeManager.sbyte_type)
+					return new SByteConstant ((sbyte) v);
+				if (target_type == TypeManager.short_type)
+					return new ShortConstant ((short) v);
+				if (target_type == TypeManager.ushort_type)
+					return new UShortConstant ((ushort) v);
+				if (target_type == TypeManager.int32_type)
+					return new IntConstant ((int) v);
+				if (target_type == TypeManager.uint32_type)
+					return new UIntConstant ((uint) v);
+				if (target_type == TypeManager.int64_type)
+					return new LongConstant ((long) v);
+				if (target_type == TypeManager.uint64_type)
+					return new ULongConstant ((ulong) v);
+				if (target_type == TypeManager.float_type)
+					return new FloatConstant ((float) v);
+				if (target_type == TypeManager.char_type)
+					return new CharConstant ((char) v);
+			}
+
+			return null;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			expr = expr.Resolve (ec);
+			if (expr == null)
+				return null;
+
+			int errors = Report.Errors;
+
+			target_type = target_type.Resolve (ec, ResolveFlags.Type);
+			
+			if (target_type == null){
+				if (errors == Report.Errors)
+					Error (-10, "Can not resolve type");
+				return null;
+			}
+
+			type = target_type.Type;
+			eclass = ExprClass.Value;
+			
+			if (type == null)
+				return null;
+
+			if (expr is Constant){
+				Expression e = TryReduce (ec, type);
+
+				if (e != null)
+					return e;
+			}
+			
+			expr = ConvertExplicit (ec, expr, type, loc);
+			return expr;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			//
+			// This one will never happen
+			//
+			throw new Exception ("Should not happen");
+		}
+	}
+
+	/// <summary>
+	///   Binary operators
+	/// </summary>
+	public class Binary : Expression {
+		public enum Operator : byte {
+			Multiply, Division, Modulus,
+			Addition, Subtraction,
+			LeftShift, RightShift,
+			LessThan, GreaterThan, LessThanOrEqual, GreaterThanOrEqual, 
+			Equality, Inequality,
+			BitwiseAnd,
+			ExclusiveOr,
+			BitwiseOr,
+			LogicalAnd,
+			LogicalOr,
+			TOP
+		}
+
+		Operator oper;
+		Expression left, right;
+
+		//
+		// After resolution, method might contain the operator overload
+		// method.
+		//
+		protected MethodBase method;
+		ArrayList  Arguments;
+
+		bool DelegateOperation;
+
+		// This must be kept in sync with Operator!!!
+		static string [] oper_names;
+
+		static Binary ()
+		{
+			oper_names = new string [(int) Operator.TOP];
+
+			oper_names [(int) Operator.Multiply] = "op_Multiply";
+			oper_names [(int) Operator.Division] = "op_Division";
+			oper_names [(int) Operator.Modulus] = "op_Modulus";
+			oper_names [(int) Operator.Addition] = "op_Addition";
+			oper_names [(int) Operator.Subtraction] = "op_Subtraction";
+			oper_names [(int) Operator.LeftShift] = "op_LeftShift";
+			oper_names [(int) Operator.RightShift] = "op_RightShift";
+			oper_names [(int) Operator.LessThan] = "op_LessThan";
+			oper_names [(int) Operator.GreaterThan] = "op_GreaterThan";
+			oper_names [(int) Operator.LessThanOrEqual] = "op_LessThanOrEqual";
+			oper_names [(int) Operator.GreaterThanOrEqual] = "op_GreaterThanOrEqual";
+			oper_names [(int) Operator.Equality] = "op_Equality";
+			oper_names [(int) Operator.Inequality] = "op_Inequality";
+			oper_names [(int) Operator.BitwiseAnd] = "op_BitwiseAnd";
+			oper_names [(int) Operator.BitwiseOr] = "op_BitwiseOr";
+			oper_names [(int) Operator.ExclusiveOr] = "op_ExclusiveOr";
+			oper_names [(int) Operator.LogicalOr] = "op_LogicalOr";
+			oper_names [(int) Operator.LogicalAnd] = "op_LogicalAnd";
+		}
+
+		public Binary (Operator oper, Expression left, Expression right, Location loc)
+		{
+			this.oper = oper;
+			this.left = left;
+			this.right = right;
+			this.loc = loc;
+		}
+
+		public Operator Oper {
+			get {
+				return oper;
+			}
+			set {
+				oper = value;
+			}
+		}
+		
+		public Expression Left {
+			get {
+				return left;
+			}
+			set {
+				left = value;
+			}
+		}
+
+		public Expression Right {
+			get {
+				return right;
+			}
+			set {
+				right = value;
+			}
+		}
+
+
+		/// <summary>
+		///   Returns a stringified representation of the Operator
+		/// </summary>
+		static string OperName (Operator oper)
+		{
+			switch (oper){
+			case Operator.Multiply:
+				return "*";
+			case Operator.Division:
+				return "/";
+			case Operator.Modulus:
+				return "%";
+			case Operator.Addition:
+				return "+";
+			case Operator.Subtraction:
+				return "-";
+			case Operator.LeftShift:
+				return "<<";
+			case Operator.RightShift:
+				return ">>";
+			case Operator.LessThan:
+				return "<";
+			case Operator.GreaterThan:
+				return ">";
+			case Operator.LessThanOrEqual:
+				return "<=";
+			case Operator.GreaterThanOrEqual:
+				return ">=";
+			case Operator.Equality:
+				return "==";
+			case Operator.Inequality:
+				return "!=";
+			case Operator.BitwiseAnd:
+				return "&";
+			case Operator.BitwiseOr:
+				return "|";
+			case Operator.ExclusiveOr:
+				return "^";
+			case Operator.LogicalOr:
+				return "||";
+			case Operator.LogicalAnd:
+				return "&&";
+			}
+
+			return oper.ToString ();
+		}
+
+		public override string ToString ()
+		{
+			return "operator " + OperName (oper) + "(" + left.ToString () + ", " +
+				right.ToString () + ")";
+		}
+		
+		Expression ForceConversion (EmitContext ec, Expression expr, Type target_type)
+		{
+			if (expr.Type == target_type)
+				return expr;
+
+			return ConvertImplicit (ec, expr, target_type, new Location (-1));
+		}
+
+		public static void Error_OperatorAmbiguous (Location loc, Operator oper, Type l, Type r)
+		{
+			Report.Error (
+				34, loc, "Operator `" + OperName (oper) 
+				+ "' is ambiguous on operands of type `"
+				+ TypeManager.CSharpName (l) + "' "
+				+ "and `" + TypeManager.CSharpName (r)
+				+ "'");
+		}
+
+		//
+		// Note that handling the case l == Decimal || r == Decimal
+		// is taken care of by the Step 1 Operator Overload resolution.
+		//
+		bool DoNumericPromotions (EmitContext ec, Type l, Type r)
+		{
+			if (l == TypeManager.double_type || r == TypeManager.double_type){
+				//
+				// If either operand is of type double, the other operand is
+				// conveted to type double.
+				//
+				if (r != TypeManager.double_type)
+					right = ConvertImplicit (ec, right, TypeManager.double_type, loc);
+				if (l != TypeManager.double_type)
+					left = ConvertImplicit (ec, left, TypeManager.double_type, loc);
+				
+				type = TypeManager.double_type;
+			} else if (l == TypeManager.float_type || r == TypeManager.float_type){
+				//
+				// if either operand is of type float, the other operand is
+				// converted to type float.
+				//
+				if (r != TypeManager.double_type)
+					right = ConvertImplicit (ec, right, TypeManager.float_type, loc);
+				if (l != TypeManager.double_type)
+					left = ConvertImplicit (ec, left, TypeManager.float_type, loc);
+				type = TypeManager.float_type;
+			} else if (l == TypeManager.uint64_type || r == TypeManager.uint64_type){
+				Expression e;
+				Type other;
+				//
+				// If either operand is of type ulong, the other operand is
+				// converted to type ulong.  or an error ocurrs if the other
+				// operand is of type sbyte, short, int or long
+				//
+				if (l == TypeManager.uint64_type){
+					if (r != TypeManager.uint64_type){
+						if (right is IntConstant){
+							IntConstant ic = (IntConstant) right;
+							
+							e = TryImplicitIntConversion (l, ic);
+							if (e != null)
+								right = e;
+						} else if (right is LongConstant){
+							long ll = ((LongConstant) right).Value;
+
+							if (ll > 0)
+								right = new ULongConstant ((ulong) ll);
+						} else {
+							e = ImplicitNumericConversion (ec, right, l, loc);
+							if (e != null)
+								right = e;
+						}
+					}
+					other = right.Type;
+				} else {
+					if (left is IntConstant){
+						e = TryImplicitIntConversion (r, (IntConstant) left);
+						if (e != null)
+							left = e;
+					} else if (left is LongConstant){
+						long ll = ((LongConstant) left).Value;
+						
+						if (ll > 0)
+							left = new ULongConstant ((ulong) ll);
+					} else {
+						e = ImplicitNumericConversion (ec, left, r, loc);
+						if (e != null)
+							left = e;
+					}
+					other = left.Type;
+				}
+
+				if ((other == TypeManager.sbyte_type) ||
+				    (other == TypeManager.short_type) ||
+				    (other == TypeManager.int32_type) ||
+				    (other == TypeManager.int64_type))
+					Error_OperatorAmbiguous (loc, oper, l, r);
+				type = TypeManager.uint64_type;
+			} else if (l == TypeManager.int64_type || r == TypeManager.int64_type){
+				//
+				// If either operand is of type long, the other operand is converted
+				// to type long.
+				//
+				if (l != TypeManager.int64_type)
+					left = ConvertImplicit (ec, left, TypeManager.int64_type, loc);
+				if (r != TypeManager.int64_type)
+					right = ConvertImplicit (ec, right, TypeManager.int64_type, loc);
+
+				type = TypeManager.int64_type;
+			} else if (l == TypeManager.uint32_type || r == TypeManager.uint32_type){
+				//
+				// If either operand is of type uint, and the other
+				// operand is of type sbyte, short or int, othe operands are
+				// converted to type long.
+				//
+				Type other = null;
+				
+				if (l == TypeManager.uint32_type){
+					if (right is IntConstant){
+						IntConstant ic = (IntConstant) right;
+						int val = ic.Value;
+						
+						if (val >= 0)
+							right = new UIntConstant ((uint) val);
+
+						type = l;
+						return true;
+					}
+					other = r;
+				} 
+				else if (r == TypeManager.uint32_type){
+					if (left is IntConstant){
+						IntConstant ic = (IntConstant) left;
+						int val = ic.Value;
+						
+						if (val >= 0)
+							left = new UIntConstant ((uint) val);
+
+						type = r;
+						return true;
+					}
+					
+					other = l;
+				}
+
+				if ((other == TypeManager.sbyte_type) ||
+				    (other == TypeManager.short_type) ||
+				    (other == TypeManager.int32_type)){
+					left = ForceConversion (ec, left, TypeManager.int64_type);
+					right = ForceConversion (ec, right, TypeManager.int64_type);
+					type = TypeManager.int64_type;
+				} else {
+					//
+					// if either operand is of type uint, the other
+					// operand is converd to type uint
+					//
+					left = ForceConversion (ec, left, TypeManager.uint32_type);
+					right = ForceConversion (ec, right, TypeManager.uint32_type);
+					type = TypeManager.uint32_type;
+				} 
+			} else if (l == TypeManager.decimal_type || r == TypeManager.decimal_type){
+				if (l != TypeManager.decimal_type)
+					left = ConvertImplicit (ec, left, TypeManager.decimal_type, loc);
+				if (r != TypeManager.decimal_type)
+					right = ConvertImplicit (ec, right, TypeManager.decimal_type, loc);
+
+				type = TypeManager.decimal_type;
+			} else {
+				Expression l_tmp, r_tmp;
+
+				l_tmp = ForceConversion (ec, left, TypeManager.int32_type);
+				if (l_tmp == null)
+					return false;
+				
+				r_tmp = ForceConversion (ec, right, TypeManager.int32_type);
+				if (r_tmp == null)
+					return false;
+
+				left = l_tmp;
+				right = r_tmp;
+				
+				type = TypeManager.int32_type;
+			}
+
+			return true;
+		}
+
+		static public void Error_OperatorCannotBeApplied (Location loc, string name, Type l, Type r)
+		{
+			Report.Error (19, loc,
+			       "Operator " + name + " cannot be applied to operands of type `" +
+			       TypeManager.CSharpName (l) + "' and `" +
+			       TypeManager.CSharpName (r) + "'");
+		}
+		
+		void Error_OperatorCannotBeApplied ()
+		{
+			Error_OperatorCannotBeApplied (loc, OperName (oper), left.Type, right.Type);
+		}
+
+		static bool is_32_or_64 (Type t)
+		{
+			return (t == TypeManager.int32_type || t == TypeManager.uint32_type ||
+				t == TypeManager.int64_type || t == TypeManager.uint64_type);
+		}
+
+		static bool is_unsigned (Type t)
+		{
+			return (t == TypeManager.uint32_type || t == TypeManager.uint64_type ||
+				t == TypeManager.short_type || t == TypeManager.byte_type);
+		}
+					
+		Expression CheckShiftArguments (EmitContext ec)
+		{
+			Expression e;
+			Type l = left.Type;
+			Type r = right.Type;
+
+			e = ForceConversion (ec, right, TypeManager.int32_type);
+			if (e == null){
+				Error_OperatorCannotBeApplied ();
+				return null;
+			}
+			right = e;
+
+			if (((e = ConvertImplicit (ec, left, TypeManager.int32_type, loc)) != null) ||
+			    ((e = ConvertImplicit (ec, left, TypeManager.uint32_type, loc)) != null) ||
+			    ((e = ConvertImplicit (ec, left, TypeManager.int64_type, loc)) != null) ||
+			    ((e = ConvertImplicit (ec, left, TypeManager.uint64_type, loc)) != null)){
+				left = e;
+				type = e.Type;
+
+				return this;
+			}
+			Error_OperatorCannotBeApplied ();
+			return null;
+		}
+
+		Expression ResolveOperator (EmitContext ec)
+		{
+			Type l = left.Type;
+			Type r = right.Type;
+
+			bool overload_failed = false;
+
+			//
+			// Step 1: Perform Operator Overload location
+			//
+			Expression left_expr, right_expr;
+				
+			string op = oper_names [(int) oper];
+				
+			MethodGroupExpr union;
+			left_expr = MemberLookup (ec, l, op, MemberTypes.Method, AllBindingFlags, loc);
+			if (r != l){
+				right_expr = MemberLookup (
+					ec, r, op, MemberTypes.Method, AllBindingFlags, loc);
+				union = Invocation.MakeUnionSet (left_expr, right_expr, loc);
+			} else
+				union = (MethodGroupExpr) left_expr;
+				
+			if (union != null) {
+				Arguments = new ArrayList ();
+				Arguments.Add (new Argument (left, Argument.AType.Expression));
+				Arguments.Add (new Argument (right, Argument.AType.Expression));
+				
+				method = Invocation.OverloadResolve (ec, union, Arguments, Location.Null);
+				if (method != null) {
+					MethodInfo mi = (MethodInfo) method;
+					
+					type = mi.ReturnType;
+					return this;
+				} else {
+					overload_failed = true;
+				}
+			}	
+			
+			//
+			// Step 2: Default operations on CLI native types.
+			//
+
+			//
+			// Step 0: String concatenation (because overloading will get this wrong)
+			//
+			if (oper == Operator.Addition){
+				//
+				// If any of the arguments is a string, cast to string
+				//
+				
+				if (l == TypeManager.string_type){
+					
+					if (r == TypeManager.void_type) {
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+					
+					if (r == TypeManager.string_type){
+						if (left is Constant && right is Constant){
+							StringConstant ls = (StringConstant) left;
+							StringConstant rs = (StringConstant) right;
+							
+							return new StringConstant (
+								ls.Value + rs.Value);
+						}
+						
+						// string + string
+						method = TypeManager.string_concat_string_string;
+					} else {
+						// string + object
+						method = TypeManager.string_concat_object_object;
+						right = ConvertImplicit (ec, right,
+									 TypeManager.object_type, loc);
+					}
+					type = TypeManager.string_type;
+
+					Arguments = new ArrayList ();
+					Arguments.Add (new Argument (left, Argument.AType.Expression));
+					Arguments.Add (new Argument (right, Argument.AType.Expression));
+
+					return this;
+					
+				} else if (r == TypeManager.string_type){
+					// object + string
+
+					if (l == TypeManager.void_type) {
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+					
+					method = TypeManager.string_concat_object_object;
+					left = ConvertImplicit (ec, left, TypeManager.object_type, loc);
+					Arguments = new ArrayList ();
+					Arguments.Add (new Argument (left, Argument.AType.Expression));
+					Arguments.Add (new Argument (right, Argument.AType.Expression));
+
+					type = TypeManager.string_type;
+
+					return this;
+				}
+
+				//
+				// Transform a + ( - b) into a - b
+				//
+				if (right is Unary){
+					Unary right_unary = (Unary) right;
+
+					if (right_unary.Oper == Unary.Operator.UnaryNegation){
+						oper = Operator.Subtraction;
+						right = right_unary.Expr;
+						r = right.Type;
+					}
+				}
+			}
+
+			if (oper == Operator.Equality || oper == Operator.Inequality){
+				if (l == TypeManager.bool_type || r == TypeManager.bool_type){
+					if (r != TypeManager.bool_type || l != TypeManager.bool_type){
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+					
+					type = TypeManager.bool_type;
+					return this;
+				}
+
+				//
+				// operator != (object a, object b)
+				// operator == (object a, object b)
+				//
+				// For this to be used, both arguments have to be reference-types.
+				// Read the rationale on the spec (14.9.6)
+				//
+				// Also, if at compile time we know that the classes do not inherit
+				// one from the other, then we catch the error there.
+				//
+				if (!(l.IsValueType || r.IsValueType)){
+					type = TypeManager.bool_type;
+
+					if (l == r)
+						return this;
+					
+					if (l.IsSubclassOf (r) || r.IsSubclassOf (l))
+						return this;
+
+					//
+					// Also, a standard conversion must exist from either one
+					//
+					if (!(StandardConversionExists (left, r) ||
+					      StandardConversionExists (right, l))){
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+					//
+					// We are going to have to convert to an object to compare
+					//
+					if (l != TypeManager.object_type)
+						left = new EmptyCast (left, TypeManager.object_type);
+					if (r != TypeManager.object_type)
+						right = new EmptyCast (right, TypeManager.object_type);
+
+					//
+					// FIXME: CSC here catches errors cs254 and cs252
+					//
+					return this;
+				}
+			}
+
+			// Only perform numeric promotions on:
+			// +, -, *, /, %, &, |, ^, ==, !=, <, >, <=, >=
+			//
+			if (oper == Operator.Addition || oper == Operator.Subtraction) {
+				if (l.IsSubclassOf (TypeManager.delegate_type) &&
+				    r.IsSubclassOf (TypeManager.delegate_type)) {
+					
+					Arguments = new ArrayList ();
+					Arguments.Add (new Argument (left, Argument.AType.Expression));
+					Arguments.Add (new Argument (right, Argument.AType.Expression));
+					
+					if (oper == Operator.Addition)
+						method = TypeManager.delegate_combine_delegate_delegate;
+					else
+						method = TypeManager.delegate_remove_delegate_delegate;
+
+					if (l != r) {
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+
+					DelegateOperation = true;
+					type = l;
+					return this;
+				}
+
+				//
+				// Pointer arithmetic:
+				//
+				// T* operator + (T* x, int y);
+				// T* operator + (T* x, uint y);
+				// T* operator + (T* x, long y);
+				// T* operator + (T* x, ulong y);
+				//
+				// T* operator + (int y,   T* x);
+				// T* operator + (uint y,  T *x);
+				// T* operator + (long y,  T *x);
+				// T* operator + (ulong y, T *x);
+				//
+				// T* operator - (T* x, int y);
+				// T* operator - (T* x, uint y);
+				// T* operator - (T* x, long y);
+				// T* operator - (T* x, ulong y);
+				//
+				// long operator - (T* x, T *y)
+				//
+				if (l.IsPointer){
+					if (r.IsPointer && oper == Operator.Subtraction){
+						if (r == l)
+							return new PointerArithmetic (
+								false, left, right, TypeManager.int64_type,
+								loc);
+					} else if (is_32_or_64 (r))
+						return new PointerArithmetic (
+							oper == Operator.Addition, left, right, l, loc);
+				} else if (r.IsPointer && is_32_or_64 (l) && oper == Operator.Addition)
+					return new PointerArithmetic (
+						true, right, left, r, loc);
+			}
+			
+			//
+			// Enumeration operators
+			//
+			bool lie = TypeManager.IsEnumType (l);
+			bool rie = TypeManager.IsEnumType (r);
+			if (lie || rie){
+				Expression temp;
+
+				//
+				// operator + (E e, U x)
+				//
+				if (oper == Operator.Addition){
+					if (lie && rie){
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+
+					Type enum_type = lie ? l : r;
+					Type other_type = lie ? r : l;
+					Type underlying_type = TypeManager.EnumToUnderlying (enum_type);
+;
+					
+					if (underlying_type != other_type){
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+
+					type = enum_type;
+					return this;
+				}
+				
+				if (!rie){
+					temp = ConvertImplicit (ec, right, l, loc);
+					if (temp != null)
+						right = temp;
+					else {
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+				} if (!lie){
+					temp = ConvertImplicit (ec, left, r, loc);
+					if (temp != null){
+						left = temp;
+						l = r;
+					} else {
+						Error_OperatorCannotBeApplied ();
+						return null;
+					}
+				}
+
+				if (oper == Operator.Equality || oper == Operator.Inequality ||
+				    oper == Operator.LessThanOrEqual || oper == Operator.LessThan ||
+				    oper == Operator.GreaterThanOrEqual || oper == Operator.GreaterThan){
+					type = TypeManager.bool_type;
+					return this;
+				}
+
+				if (oper == Operator.BitwiseAnd ||
+				    oper == Operator.BitwiseOr ||
+				    oper == Operator.ExclusiveOr){
+					type = l;
+					return this;
+				}
+				return null;
+			}
+			
+			if (oper == Operator.LeftShift || oper == Operator.RightShift)
+				return CheckShiftArguments (ec);
+
+			if (oper == Operator.LogicalOr || oper == Operator.LogicalAnd){
+				if (l != TypeManager.bool_type || r != TypeManager.bool_type){
+					Error_OperatorCannotBeApplied ();
+					return null;
+				}
+
+				type = TypeManager.bool_type;
+				return this;
+			} 
+
+			//
+			// operator & (bool x, bool y)
+			// operator | (bool x, bool y)
+			// operator ^ (bool x, bool y)
+			//
+			if (l == TypeManager.bool_type && r == TypeManager.bool_type){
+				if (oper == Operator.BitwiseAnd ||
+				    oper == Operator.BitwiseOr ||
+				    oper == Operator.ExclusiveOr){
+					type = l;
+					return this;
+				}
+			}
+			
+			//
+			// Pointer comparison
+			//
+			if (l.IsPointer && r.IsPointer){
+				if (oper == Operator.Equality || oper == Operator.Inequality ||
+				    oper == Operator.LessThan || oper == Operator.LessThanOrEqual ||
+				    oper == Operator.GreaterThan || oper == Operator.GreaterThanOrEqual){
+					type = TypeManager.bool_type;
+					return this;
+				}
+			}
+			
+			//
+			// We are dealing with numbers
+			//
+			if (overload_failed){
+				Error_OperatorCannotBeApplied ();
+				return null;
+			}
+
+			if (!DoNumericPromotions (ec, l, r)){
+				Error_OperatorCannotBeApplied ();
+				return null;
+			}
+
+			if (left == null || right == null)
+				return null;
+
+			//
+			// reload our cached types if required
+			//
+			l = left.Type;
+			r = right.Type;
+			
+			if (oper == Operator.BitwiseAnd ||
+			    oper == Operator.BitwiseOr ||
+			    oper == Operator.ExclusiveOr){
+				if (l == r){
+					if (!((l == TypeManager.int32_type) ||
+					      (l == TypeManager.uint32_type) ||
+					      (l == TypeManager.int64_type) ||
+					      (l == TypeManager.uint64_type)))
+						type = l;
+				} else {
+					Error_OperatorCannotBeApplied ();
+					return null;
+				}
+			}
+
+			if (oper == Operator.Equality ||
+			    oper == Operator.Inequality ||
+			    oper == Operator.LessThanOrEqual ||
+			    oper == Operator.LessThan ||
+			    oper == Operator.GreaterThanOrEqual ||
+			    oper == Operator.GreaterThan){
+				type = TypeManager.bool_type;
+			}
+
+			return this;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			left = left.Resolve (ec);
+			right = right.Resolve (ec);
+
+			if (left == null || right == null)
+				return null;
+
+			if (left.Type == null)
+				throw new Exception (
+					"Resolve returned non null, but did not set the type! (" +
+					left + ") at Line: " + loc.Row);
+			if (right.Type == null)
+				throw new Exception (
+					"Resolve returned non null, but did not set the type! (" +
+					right + ") at Line: "+ loc.Row);
+
+			eclass = ExprClass.Value;
+
+			if (left is Constant && right is Constant){
+				Expression e = ConstantFold.BinaryFold (
+					ec, oper, (Constant) left, (Constant) right, loc);
+				if (e != null)
+					return e;
+			}
+
+			return ResolveOperator (ec);
+		}
+
+		/// <remarks>
+		///   EmitBranchable is called from Statement.EmitBoolExpression in the
+		///   context of a conditional bool expression.  This function will return
+		///   false if it is was possible to use EmitBranchable, or true if it was.
+		///
+		///   The expression's code is generated, and we will generate a branch to `target'
+		///   if the resulting expression value is equal to isTrue
+		/// </remarks>
+		public bool EmitBranchable (EmitContext ec, Label target, bool onTrue)
+		{
+			if (method != null)
+				return false;
+
+			ILGenerator ig = ec.ig;
+
+			//
+			// This is more complicated than it looks, but its just to avoid
+			// duplicated tests: basically, we allow ==, !=, >, <, >= and <=
+			// but on top of that we want for == and != to use a special path
+			// if we are comparing against null
+			//
+			if (oper == Operator.Equality || oper == Operator.Inequality){
+				bool my_on_true = oper == Operator.Inequality ? onTrue : !onTrue;
+				
+				if (left is NullLiteral){
+					right.Emit (ec);
+					if (my_on_true)
+						ig.Emit (OpCodes.Brtrue, target);
+					else
+						ig.Emit (OpCodes.Brfalse, target);
+					return true;
+				} else if (right is NullLiteral){
+					left.Emit (ec);
+					if (my_on_true)
+						ig.Emit (OpCodes.Brtrue, target);
+					else
+						ig.Emit (OpCodes.Brfalse, target);
+					return true;
+				} 
+			} else if (!(oper == Operator.LessThan ||
+				      oper == Operator.GreaterThan ||
+				      oper == Operator.LessThanOrEqual ||
+				      oper == Operator.GreaterThanOrEqual))
+				return false;
+			
+
+			
+			left.Emit (ec);
+			right.Emit (ec);
+
+			bool isUnsigned = is_unsigned (left.Type);
+
+			switch (oper){
+			case Operator.Equality:
+				if (onTrue)
+					ig.Emit (OpCodes.Beq, target);
+				else
+					ig.Emit (OpCodes.Bne_Un, target);
+				break;
+
+			case Operator.Inequality:
+				if (onTrue)
+					ig.Emit (OpCodes.Bne_Un, target);
+				else
+					ig.Emit (OpCodes.Beq, target);
+				break;
+
+			case Operator.LessThan:
+				if (onTrue)
+					if (isUnsigned)
+						ig.Emit (OpCodes.Blt_Un, target);
+					else
+						ig.Emit (OpCodes.Blt, target);
+				else
+					if (isUnsigned)
+						ig.Emit (OpCodes.Bge_Un, target);
+					else
+						ig.Emit (OpCodes.Bge, target);
+				break;
+
+			case Operator.GreaterThan:
+				if (onTrue)
+					if (isUnsigned)
+						ig.Emit (OpCodes.Bgt_Un, target);
+					else
+						ig.Emit (OpCodes.Bgt, target);
+				else
+					if (isUnsigned)
+						ig.Emit (OpCodes.Ble_Un, target);
+					else
+						ig.Emit (OpCodes.Ble, target);
+				break;
+
+			case Operator.LessThanOrEqual:
+				if (onTrue)
+					if (isUnsigned)
+						ig.Emit (OpCodes.Ble_Un, target);
+					else
+						ig.Emit (OpCodes.Ble, target);
+				else
+					if (isUnsigned)
+						ig.Emit (OpCodes.Bgt_Un, target);
+					else
+						ig.Emit (OpCodes.Bgt, target);
+				break;
+
+
+			case Operator.GreaterThanOrEqual:
+				if (onTrue)
+					if (isUnsigned)
+						ig.Emit (OpCodes.Bge_Un, target);
+					else
+						ig.Emit (OpCodes.Bge, target);
+				else
+					if (isUnsigned)
+						ig.Emit (OpCodes.Blt_Un, target);
+					else
+						ig.Emit (OpCodes.Blt, target);
+				break;
+
+			default:
+				return false;
+			}
+			
+			return true;
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Type l = left.Type;
+			Type r = right.Type;
+			OpCode opcode;
+
+			if (method != null) {
+
+				// Note that operators are static anyway
+				
+				if (Arguments != null) 
+					Invocation.EmitArguments (ec, method, Arguments);
+				
+				if (method is MethodInfo)
+					ig.Emit (OpCodes.Call, (MethodInfo) method);
+				else
+					ig.Emit (OpCodes.Call, (ConstructorInfo) method);
+
+				if (DelegateOperation)
+					ig.Emit (OpCodes.Castclass, type);
+					
+				return;
+			}
+
+			//
+			// Handle short-circuit operators differently
+			// than the rest
+			//
+			if (oper == Operator.LogicalAnd){
+				Label load_zero = ig.DefineLabel ();
+				Label end = ig.DefineLabel ();
+				
+				left.Emit (ec);
+				ig.Emit (OpCodes.Brfalse, load_zero);
+				right.Emit (ec);
+				ig.Emit (OpCodes.Br, end);
+				ig.MarkLabel (load_zero);
+				ig.Emit (OpCodes.Ldc_I4_0);
+				ig.MarkLabel (end);
+				return;
+			} else if (oper == Operator.LogicalOr){
+				Label load_one = ig.DefineLabel ();
+				Label end = ig.DefineLabel ();
+				
+				left.Emit (ec);
+				ig.Emit (OpCodes.Brtrue, load_one);
+				right.Emit (ec);
+				ig.Emit (OpCodes.Br, end);
+				ig.MarkLabel (load_one);
+				ig.Emit (OpCodes.Ldc_I4_1);
+				ig.MarkLabel (end);
+				return;
+			}
+			
+			left.Emit (ec);
+			right.Emit (ec);
+
+			switch (oper){
+			case Operator.Multiply:
+				if (ec.CheckState){
+					if (l == TypeManager.int32_type || l == TypeManager.int64_type)
+						opcode = OpCodes.Mul_Ovf;
+					else if (l==TypeManager.uint32_type || l==TypeManager.uint64_type)
+						opcode = OpCodes.Mul_Ovf_Un;
+					else
+						opcode = OpCodes.Mul;
+				} else
+					opcode = OpCodes.Mul;
+
+				break;
+
+			case Operator.Division:
+				if (l == TypeManager.uint32_type || l == TypeManager.uint64_type)
+					opcode = OpCodes.Div_Un;
+				else
+					opcode = OpCodes.Div;
+				break;
+
+			case Operator.Modulus:
+				if (l == TypeManager.uint32_type || l == TypeManager.uint64_type)
+					opcode = OpCodes.Rem_Un;
+				else
+					opcode = OpCodes.Rem;
+				break;
+
+			case Operator.Addition:
+				if (ec.CheckState){
+					if (l == TypeManager.int32_type || l == TypeManager.int64_type)
+						opcode = OpCodes.Add_Ovf;
+					else if (l==TypeManager.uint32_type || l==TypeManager.uint64_type)
+						opcode = OpCodes.Add_Ovf_Un;
+					else
+						opcode = OpCodes.Add;
+				} else
+					opcode = OpCodes.Add;
+				break;
+
+			case Operator.Subtraction:
+				if (ec.CheckState){
+					if (l == TypeManager.int32_type || l == TypeManager.int64_type)
+						opcode = OpCodes.Sub_Ovf;
+					else if (l==TypeManager.uint32_type || l==TypeManager.uint64_type)
+						opcode = OpCodes.Sub_Ovf_Un;
+					else
+						opcode = OpCodes.Sub;
+				} else
+					opcode = OpCodes.Sub;
+				break;
+
+			case Operator.RightShift:
+				if (l == TypeManager.uint32_type || l == TypeManager.uint64_type)
+					opcode = OpCodes.Shr_Un;
+				else
+					opcode = OpCodes.Shr;
+				break;
+				
+			case Operator.LeftShift:
+				opcode = OpCodes.Shl;
+				break;
+
+			case Operator.Equality:
+				opcode = OpCodes.Ceq;
+				break;
+
+			case Operator.Inequality:
+				ec.ig.Emit (OpCodes.Ceq);
+				ec.ig.Emit (OpCodes.Ldc_I4_0);
+				
+				opcode = OpCodes.Ceq;
+				break;
+
+			case Operator.LessThan:
+				opcode = OpCodes.Clt;
+				break;
+
+			case Operator.GreaterThan:
+				opcode = OpCodes.Cgt;
+				break;
+
+			case Operator.LessThanOrEqual:
+				ec.ig.Emit (OpCodes.Cgt);
+				ec.ig.Emit (OpCodes.Ldc_I4_0);
+				
+				opcode = OpCodes.Ceq;
+				break;
+
+			case Operator.GreaterThanOrEqual:
+				ec.ig.Emit (OpCodes.Clt);
+				ec.ig.Emit (OpCodes.Ldc_I4_1);
+				
+				opcode = OpCodes.Sub;
+				break;
+
+			case Operator.BitwiseOr:
+				opcode = OpCodes.Or;
+				break;
+
+			case Operator.BitwiseAnd:
+				opcode = OpCodes.And;
+				break;
+
+			case Operator.ExclusiveOr:
+				opcode = OpCodes.Xor;
+				break;
+
+			default:
+				throw new Exception ("This should not happen: Operator = "
+						     + oper.ToString ());
+			}
+
+			ig.Emit (opcode);
+		}
+
+		public bool IsBuiltinOperator {
+			get {
+				return method == null;
+			}
+		}
+	}
+
+	public class PointerArithmetic : Expression {
+		Expression left, right;
+		bool is_add;
+
+		//
+		// We assume that `l' is always a pointer
+		//
+		public PointerArithmetic (bool is_addition, Expression l, Expression r, Type t,
+					  Location loc)
+		{
+			type = t;
+			eclass = ExprClass.Variable;
+			this.loc = loc;
+			left = l;
+			right = r;
+			is_add = is_addition;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// We are born fully resolved
+			//
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			Type op_type = left.Type;
+			ILGenerator ig = ec.ig;
+			int size = GetTypeSize (op_type.GetElementType ());
+			
+			if (right.Type.IsPointer){
+				//
+				// handle (pointer - pointer)
+				//
+				left.Emit (ec);
+				right.Emit (ec);
+				ig.Emit (OpCodes.Sub);
+
+				if (size != 1){
+					if (size == 0)
+						ig.Emit (OpCodes.Sizeof, op_type);
+					else 
+						IntLiteral.EmitInt (ig, size);
+					ig.Emit (OpCodes.Div);
+				}
+				ig.Emit (OpCodes.Conv_I8);
+			} else {
+				//
+				// handle + and - on (pointer op int)
+				//
+				left.Emit (ec);
+				ig.Emit (OpCodes.Conv_I);
+				right.Emit (ec);
+				if (size != 1){
+					if (size == 0)
+						ig.Emit (OpCodes.Sizeof, op_type);
+					else 
+						IntLiteral.EmitInt (ig, size);
+					ig.Emit (OpCodes.Mul);
+				}
+				if (is_add)
+					ig.Emit (OpCodes.Add);
+				else
+					ig.Emit (OpCodes.Sub);
+			}
+		}
+	}
+	
+	/// <summary>
+	///   Implements the ternary conditiona operator (?:)
+	/// </summary>
+	public class Conditional : Expression {
+		Expression expr, trueExpr, falseExpr;
+		
+		public Conditional (Expression expr, Expression trueExpr, Expression falseExpr, Location l)
+		{
+			this.expr = expr;
+			this.trueExpr = trueExpr;
+			this.falseExpr = falseExpr;
+			this.loc = l;
+		}
+
+		public Expression Expr {
+			get {
+				return expr;
+			}
+		}
+
+		public Expression TrueExpr {
+			get {
+				return trueExpr;
+			}
+		}
+
+		public Expression FalseExpr {
+			get {
+				return falseExpr;
+			}
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			expr = expr.Resolve (ec);
+
+			if (expr.Type != TypeManager.bool_type)
+				expr = Expression.ConvertImplicitRequired (
+					ec, expr, TypeManager.bool_type, loc);
+			
+			trueExpr = trueExpr.Resolve (ec);
+			falseExpr = falseExpr.Resolve (ec);
+
+			if (expr == null || trueExpr == null || falseExpr == null)
+				return null;
+
+			eclass = ExprClass.Value;
+			if (trueExpr.Type == falseExpr.Type)
+				type = trueExpr.Type;
+			else {
+				Expression conv;
+				Type true_type = trueExpr.Type;
+				Type false_type = falseExpr.Type;
+
+				if (trueExpr is NullLiteral){
+					type = false_type;
+					return this;
+				} else if (falseExpr is NullLiteral){
+					type = true_type;
+					return this;
+				}
+				
+				//
+				// First, if an implicit conversion exists from trueExpr
+				// to falseExpr, then the result type is of type falseExpr.Type
+				//
+				conv = ConvertImplicit (ec, trueExpr, false_type, loc);
+				if (conv != null){
+					//
+					// Check if both can convert implicitl to each other's type
+					//
+					if (ConvertImplicit (ec, falseExpr, true_type, loc) != null){
+						Error (172,
+						       "Can not compute type of conditional expression " +
+						       "as `" + TypeManager.CSharpName (trueExpr.Type) +
+						       "' and `" + TypeManager.CSharpName (falseExpr.Type) +
+						       "' convert implicitly to each other");
+						return null;
+					}
+					type = false_type;
+					trueExpr = conv;
+				} else if ((conv = ConvertImplicit(ec, falseExpr, true_type,loc))!= null){
+					type = true_type;
+					falseExpr = conv;
+				} else {
+					Error (173, "The type of the conditional expression can " +
+					       "not be computed because there is no implicit conversion" +
+					       " from `" + TypeManager.CSharpName (trueExpr.Type) + "'" +
+					       " and `" + TypeManager.CSharpName (falseExpr.Type) + "'");
+					return null;
+				}
+			}
+
+			if (expr is BoolConstant){
+				BoolConstant bc = (BoolConstant) expr;
+
+				if (bc.Value)
+					return trueExpr;
+				else
+					return falseExpr;
+			}
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label false_target = ig.DefineLabel ();
+			Label end_target = ig.DefineLabel ();
+
+			expr.Emit (ec);
+			ig.Emit (OpCodes.Brfalse, false_target);
+			trueExpr.Emit (ec);
+			ig.Emit (OpCodes.Br, end_target);
+			ig.MarkLabel (false_target);
+			falseExpr.Emit (ec);
+			ig.MarkLabel (end_target);
+		}
+
+	}
+
+	/// <summary>
+	///   Local variables
+	/// </summary>
+	public class LocalVariableReference : Expression, IAssignMethod, IMemoryLocation, IVariable {
+		public readonly string Name;
+		public readonly Block Block;
+		VariableInfo variable_info;
+		bool is_readonly;
+		
+		public LocalVariableReference (Block block, string name, Location l)
+		{
+			Block = block;
+			Name = name;
+			loc = l;
+			eclass = ExprClass.Variable;
+		}
+
+		// Setting `is_readonly' to false will allow you to create a writable
+		// reference to a read-only variable.  This is used by foreach and using.
+		public LocalVariableReference (Block block, string name, Location l,
+					       VariableInfo variable_info, bool is_readonly)
+			: this (block, name, l)
+		{
+			this.variable_info = variable_info;
+			this.is_readonly = is_readonly;
+		}
+
+		public VariableInfo VariableInfo {
+			get {
+				if (variable_info == null) {
+					variable_info = Block.GetVariableInfo (Name);
+					is_readonly = variable_info.ReadOnly;
+				}
+				return variable_info;
+			}
+		}
+
+		public bool IsAssigned (EmitContext ec, Location loc)
+		{
+			return VariableInfo.IsAssigned (ec, loc);
+		}
+
+		public bool IsFieldAssigned (EmitContext ec, string name, Location loc)
+		{
+			return VariableInfo.IsFieldAssigned (ec, name, loc);
+		}
+
+		public void SetAssigned (EmitContext ec)
+		{
+			VariableInfo.SetAssigned (ec);
+		}
+
+		public void SetFieldAssigned (EmitContext ec, string name)
+		{
+			VariableInfo.SetFieldAssigned (ec, name);
+		}
+
+		public bool IsReadOnly {
+			get {
+				if (variable_info == null) {
+					variable_info = Block.GetVariableInfo (Name);
+					is_readonly = variable_info.ReadOnly;
+				}
+				return is_readonly;
+			}
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			VariableInfo vi = VariableInfo;
+
+			if (Block.IsConstant (Name)) {
+				Expression e = Block.GetConstantExpression (Name);
+
+				vi.Used = true;
+				return e;
+			}
+
+			if (ec.DoFlowAnalysis && !IsAssigned (ec, loc))
+				return null;
+
+			type = vi.VariableType;
+			return this;
+		}
+
+		override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			VariableInfo vi = VariableInfo;
+
+			if (ec.DoFlowAnalysis)
+				ec.SetVariableAssigned (vi);
+
+			Expression e = DoResolve (ec);
+
+			if (e == null)
+				return null;
+
+			if (is_readonly){
+				Error (1604, "cannot assign to `" + Name + "' because it is readonly");
+				return null;
+			}
+			
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			VariableInfo vi = VariableInfo;
+			ILGenerator ig = ec.ig;
+
+			ig.Emit (OpCodes.Ldloc, vi.LocalBuilder);
+			vi.Used = true;
+		}
+		
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			ILGenerator ig = ec.ig;
+			VariableInfo vi = VariableInfo;
+
+			vi.Assigned = true;
+
+			source.Emit (ec);
+			
+			ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+		}
+		
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			VariableInfo vi = VariableInfo;
+
+			ec.ig.Emit (OpCodes.Ldloca, vi.LocalBuilder);
+		}
+	}
+
+	/// <summary>
+	///   This represents a reference to a parameter in the intermediate
+	///   representation.
+	/// </summary>
+	public class ParameterReference : Expression, IAssignMethod, IMemoryLocation, IVariable {
+		Parameters pars;
+		String name;
+		int idx;
+		public Parameter.Modifier mod;
+		public bool is_ref, is_out;
+		
+		public ParameterReference (Parameters pars, int idx, string name, Location loc)
+		{
+			this.pars = pars;
+			this.idx  = idx;
+			this.name = name;
+			this.loc = loc;
+			eclass = ExprClass.Variable;
+		}
+
+		public bool IsAssigned (EmitContext ec, Location loc)
+		{
+			if (!is_out || !ec.DoFlowAnalysis)
+				return true;
+
+			if (!ec.CurrentBranching.IsParameterAssigned (idx)) {
+				Report.Error (165, loc,
+					      "Use of unassigned local variable `" + name + "'");
+				return false;
+			}
+
+			return true;
+		}
+
+		public bool IsFieldAssigned (EmitContext ec, string field_name, Location loc)
+		{
+			if (!is_out || !ec.DoFlowAnalysis)
+				return true;
+
+			if (ec.CurrentBranching.IsParameterAssigned (idx))
+				return true;
+
+			if (!ec.CurrentBranching.IsParameterAssigned (idx, field_name)) {
+				Report.Error (170, loc,
+					      "Use of possibly unassigned field `" + field_name + "'");
+				return false;
+			}
+
+			return true;
+		}
+
+		public void SetAssigned (EmitContext ec)
+		{
+			if (is_out && ec.DoFlowAnalysis)
+				ec.CurrentBranching.SetParameterAssigned (idx);
+		}
+
+		public void SetFieldAssigned (EmitContext ec, string field_name)
+		{
+			if (is_out && ec.DoFlowAnalysis)
+				ec.CurrentBranching.SetParameterAssigned (idx, field_name);
+		}
+
+		//
+		// Notice that for ref/out parameters, the type exposed is not the
+		// same type exposed externally.
+		//
+		// for "ref int a":
+		//   externally we expose "int&"
+		//   here we expose       "int".
+		//
+		// We record this in "is_ref".  This means that the type system can treat
+		// the type as it is expected, but when we generate the code, we generate
+		// the alternate kind of code.
+		//
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = pars.GetParameterInfo (ec.DeclSpace, idx, out mod);
+			is_ref = (mod & Parameter.Modifier.ISBYREF) != 0;
+			is_out = (mod & Parameter.Modifier.OUT) != 0;
+			eclass = ExprClass.Variable;
+
+			if (is_out && ec.DoFlowAnalysis && !IsAssigned (ec, loc))
+				return null;
+
+			return this;
+		}
+
+		override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			type = pars.GetParameterInfo (ec.DeclSpace, idx, out mod);
+			is_ref = (mod & Parameter.Modifier.ISBYREF) != 0;
+			is_out = (mod & Parameter.Modifier.OUT) != 0;
+			eclass = ExprClass.Variable;
+
+			if (is_out && ec.DoFlowAnalysis)
+				ec.SetParameterAssigned (idx);
+
+			return this;
+		}
+
+		static void EmitLdArg (ILGenerator ig, int x)
+		{
+			if (x <= 255){
+				switch (x){
+				case 0: ig.Emit (OpCodes.Ldarg_0); break;
+				case 1: ig.Emit (OpCodes.Ldarg_1); break;
+				case 2: ig.Emit (OpCodes.Ldarg_2); break;
+				case 3: ig.Emit (OpCodes.Ldarg_3); break;
+				default: ig.Emit (OpCodes.Ldarg_S, (byte) x); break;
+				}
+			} else
+				ig.Emit (OpCodes.Ldarg, x);
+		}
+		
+		//
+		// This method is used by parameters that are references, that are
+		// being passed as references:  we only want to pass the pointer (that
+		// is already stored in the parameter, not the address of the pointer,
+		// and not the value of the variable).
+		//
+		public void EmitLoad (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			int arg_idx = idx;
+
+			if (!ec.IsStatic)
+				arg_idx++;
+
+			EmitLdArg (ig, arg_idx);
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			int arg_idx = idx;
+
+			if (!ec.IsStatic)
+				arg_idx++;
+
+			EmitLdArg (ig, arg_idx);
+
+			if (!is_ref)
+				return;
+
+			//
+			// If we are a reference, we loaded on the stack a pointer
+			// Now lets load the real value
+			//
+			LoadFromPtr (ig, type);
+		}
+
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			ILGenerator ig = ec.ig;
+			int arg_idx = idx;
+
+			if (!ec.IsStatic)
+				arg_idx++;
+
+			if (is_ref)
+				EmitLdArg (ig, arg_idx);
+			
+			source.Emit (ec);
+
+			if (is_ref)
+				StoreFromPtr (ig, type);
+			else {
+				if (arg_idx <= 255)
+					ig.Emit (OpCodes.Starg_S, (byte) arg_idx);
+				else
+					ig.Emit (OpCodes.Starg, arg_idx);
+			}
+		}
+
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			int arg_idx = idx;
+
+			if (!ec.IsStatic)
+				arg_idx++;
+
+			if (is_ref){
+				if (arg_idx <= 255)
+					ec.ig.Emit (OpCodes.Ldarg_S, (byte) arg_idx);
+				else
+					ec.ig.Emit (OpCodes.Ldarg, arg_idx);
+			} else {
+				if (arg_idx <= 255)
+					ec.ig.Emit (OpCodes.Ldarga_S, (byte) arg_idx);
+				else
+					ec.ig.Emit (OpCodes.Ldarga, arg_idx);
+			}
+		}
+	}
+	
+	/// <summary>
+	///   Used for arguments to New(), Invocation()
+	/// </summary>
+	public class Argument {
+		public enum AType : byte {
+			Expression,
+			Ref,
+			Out
+		};
+
+		public readonly AType ArgType;
+		public Expression Expr;
+		
+		public Argument (Expression expr, AType type)
+		{
+			this.Expr = expr;
+			this.ArgType = type;
+		}
+
+		public Type Type {
+			get {
+				if (ArgType == AType.Ref || ArgType == AType.Out)
+					return TypeManager.LookupType (Expr.Type.ToString () + "&");
+				else
+					return Expr.Type;
+			}
+		}
+
+		public Parameter.Modifier GetParameterModifier ()
+		{
+			switch (ArgType) {
+			case AType.Out:
+				return Parameter.Modifier.OUT | Parameter.Modifier.ISBYREF;
+
+			case AType.Ref:
+				return Parameter.Modifier.REF | Parameter.Modifier.ISBYREF;
+
+			default:
+				return Parameter.Modifier.NONE;
+			}
+		}
+
+	        public static string FullDesc (Argument a)
+		{
+			return (a.ArgType == AType.Ref ? "ref " :
+				(a.ArgType == AType.Out ? "out " : "")) +
+				TypeManager.CSharpName (a.Expr.Type);
+		}
+
+		public bool ResolveMethodGroup (EmitContext ec, Location loc)
+		{
+			// FIXME: csc doesn't report any error if you try to use `ref' or
+			//        `out' in a delegate creation expression.
+			Expr = Expr.Resolve (ec, ResolveFlags.VariableOrValue | ResolveFlags.MethodGroup);
+			if (Expr == null)
+				return false;
+
+			return true;
+		}
+		
+		public bool Resolve (EmitContext ec, Location loc)
+		{
+			if (ArgType == AType.Ref) {
+				Expr = Expr.Resolve (ec);
+				if (Expr == null)
+					return false;
+
+				Expr = Expr.ResolveLValue (ec, Expr);
+			} else if (ArgType == AType.Out)
+				Expr = Expr.ResolveLValue (ec, new EmptyExpression ());
+			else
+				Expr = Expr.Resolve (ec);
+
+			if (Expr == null)
+				return false;
+
+			if (ArgType == AType.Expression)
+				return true;
+
+			if (Expr.eclass != ExprClass.Variable){
+				//
+				// We just probe to match the CSC output
+				//
+				if (Expr.eclass == ExprClass.PropertyAccess ||
+				    Expr.eclass == ExprClass.IndexerAccess){
+					Report.Error (
+						206, loc,
+						"A property or indexer can not be passed as an out or ref " +
+						"parameter");
+				} else {
+					Report.Error (
+						1510, loc,
+						"An lvalue is required as an argument to out or ref");
+				}
+				return false;
+			}
+				
+			return true;
+		}
+
+		public void Emit (EmitContext ec)
+		{
+			//
+			// Ref and Out parameters need to have their addresses taken.
+			//
+			// ParameterReferences might already be references, so we want
+			// to pass just the value
+			//
+			if (ArgType == AType.Ref || ArgType == AType.Out){
+				AddressOp mode = AddressOp.Store;
+
+				if (ArgType == AType.Ref)
+					mode |= AddressOp.Load;
+				
+				if (Expr is ParameterReference){
+					ParameterReference pr = (ParameterReference) Expr;
+
+					if (pr.is_ref)
+						pr.EmitLoad (ec);
+					else {
+						
+						pr.AddressOf (ec, mode);
+					}
+				} else
+					((IMemoryLocation)Expr).AddressOf (ec, mode);
+			} else
+				Expr.Emit (ec);
+		}
+	}
+
+	/// <summary>
+	///   Invocation of methods or delegates.
+	/// </summary>
+	public class Invocation : ExpressionStatement {
+		public readonly ArrayList Arguments;
+
+		Expression expr;
+		MethodBase method = null;
+		bool is_base;
+		
+		static Hashtable method_parameter_cache;
+
+		static Invocation ()
+		{
+			method_parameter_cache = new PtrHashtable ();
+		}
+			
+		//
+		// arguments is an ArrayList, but we do not want to typecast,
+		// as it might be null.
+		//
+		// FIXME: only allow expr to be a method invocation or a
+		// delegate invocation (7.5.5)
+		//
+		public Invocation (Expression expr, ArrayList arguments, Location l)
+		{
+			this.expr = expr;
+			Arguments = arguments;
+			loc = l;
+		}
+
+		public Expression Expr {
+			get {
+				return expr;
+			}
+		}
+
+		/// <summary>
+		///   Returns the Parameters (a ParameterData interface) for the
+		///   Method `mb'
+		/// </summary>
+		public static ParameterData GetParameterData (MethodBase mb)
+		{
+			object pd = method_parameter_cache [mb];
+			object ip;
+			
+			if (pd != null)
+				return (ParameterData) pd;
+
+			
+			ip = TypeManager.LookupParametersByBuilder (mb);
+			if (ip != null){
+				method_parameter_cache [mb] = ip;
+
+				return (ParameterData) ip;
+			} else {
+				ParameterInfo [] pi = mb.GetParameters ();
+				ReflectionParameters rp = new ReflectionParameters (pi);
+				method_parameter_cache [mb] = rp;
+
+				return (ParameterData) rp;
+			}
+		}
+
+		/// <summary>
+		///  Determines "better conversion" as specified in 7.4.2.3
+		///  Returns : 1 if a->p is better
+		///            0 if a->q or neither is better 
+		/// </summary>
+		static int BetterConversion (EmitContext ec, Argument a, Type p, Type q, Location loc)
+		{
+			Type argument_type = a.Type;
+			Expression argument_expr = a.Expr;
+
+			if (argument_type == null)
+				throw new Exception ("Expression of type " + a.Expr + " does not resolve its type");
+
+			if (p == q)
+				return 0;
+			
+			if (argument_type == p)
+				return 1;
+
+			if (argument_type == q)
+				return 0;
+
+			//
+			// Now probe whether an implicit constant expression conversion
+			// can be used.
+			//
+			// An implicit constant expression conversion permits the following
+			// conversions:
+			//
+			//    * A constant-expression of type `int' can be converted to type
+			//      sbyte, byute, short, ushort, uint, ulong provided the value of
+			//      of the expression is withing the range of the destination type.
+			//
+			//    * A constant-expression of type long can be converted to type
+			//      ulong, provided the value of the constant expression is not negative
+			//
+			// FIXME: Note that this assumes that constant folding has
+			// taken place.  We dont do constant folding yet.
+			//
+
+			if (argument_expr is IntConstant){
+				IntConstant ei = (IntConstant) argument_expr;
+				int value = ei.Value;
+				
+				if (p == TypeManager.sbyte_type){
+					if (value >= SByte.MinValue && value <= SByte.MaxValue)
+						return 1;
+				} else if (p == TypeManager.byte_type){
+					if (Byte.MinValue >= 0 && value <= Byte.MaxValue)
+						return 1;
+				} else if (p == TypeManager.short_type){
+					if (value >= Int16.MinValue && value <= Int16.MaxValue)
+						return 1;
+				} else if (p == TypeManager.ushort_type){
+					if (value >= UInt16.MinValue && value <= UInt16.MaxValue)
+						return 1;
+				} else if (p == TypeManager.uint32_type){
+					//
+					// we can optimize this case: a positive int32
+					// always fits on a uint32
+					//
+					if (value >= 0)
+						return 1;
+				} else if (p == TypeManager.uint64_type){
+					//
+					// we can optimize this case: a positive int32
+					// always fits on a uint64
+					//
+					if (value >= 0)
+						return 1;
+				}
+			} else if (argument_type == TypeManager.int64_type && argument_expr is LongConstant){
+				LongConstant lc = (LongConstant) argument_expr;
+				
+				if (p == TypeManager.uint64_type){
+					if (lc.Value > 0)
+						return 1;
+				}
+			}
+
+			if (q == null) {
+				Expression tmp = ConvertImplicit (ec, argument_expr, p, loc);
+				
+				if (tmp != null)
+					return 1;
+				else
+					return 0;
+			}
+
+			Expression p_tmp = new EmptyExpression (p);
+			Expression q_tmp = new EmptyExpression (q);
+			
+			if (StandardConversionExists (p_tmp, q) == true &&
+			    StandardConversionExists (q_tmp, p) == false)
+				return 1;
+
+			if (p == TypeManager.sbyte_type)
+				if (q == TypeManager.byte_type || q == TypeManager.ushort_type ||
+				    q == TypeManager.uint32_type || q == TypeManager.uint64_type)
+					return 1;
+
+			if (p == TypeManager.short_type)
+				if (q == TypeManager.ushort_type || q == TypeManager.uint32_type ||
+				    q == TypeManager.uint64_type)
+					return 1;
+
+			if (p == TypeManager.int32_type)
+				if (q == TypeManager.uint32_type || q == TypeManager.uint64_type)
+					return 1;
+
+			if (p == TypeManager.int64_type)
+				if (q == TypeManager.uint64_type)
+					return 1;
+
+			return 0;
+		}
+		
+		/// <summary>
+		///  Determines "Better function"
+		/// </summary>
+		/// <remarks>
+		///    and returns an integer indicating :
+		///    0 if candidate ain't better
+		///    1 if candidate is better than the current best match
+		/// </remarks>
+		static int BetterFunction (EmitContext ec, ArrayList args,
+					   MethodBase candidate, MethodBase best,
+					   bool expanded_form, Location loc)
+		{
+			ParameterData candidate_pd = GetParameterData (candidate);
+			ParameterData best_pd;
+			int argument_count;
+		
+			if (args == null)
+				argument_count = 0;
+			else
+				argument_count = args.Count;
+
+			int cand_count = candidate_pd.Count;
+
+			if (cand_count == 0 && argument_count == 0)
+				return 1;
+
+			if (candidate_pd.ParameterModifier (cand_count - 1) != Parameter.Modifier.PARAMS)
+				if (cand_count != argument_count)
+					return 0;
+			
+			if (best == null) {
+				int x = 0;
+
+				if (argument_count == 0 && cand_count == 1 &&
+				    candidate_pd.ParameterModifier (cand_count - 1) == Parameter.Modifier.PARAMS)
+					return 1;
+				
+				for (int j = argument_count; j > 0;) {
+					j--;
+
+					Argument a = (Argument) args [j];
+					Type t = candidate_pd.ParameterType (j);
+
+					if (candidate_pd.ParameterModifier (j) == Parameter.Modifier.PARAMS)
+						if (expanded_form)
+							t = t.GetElementType ();
+
+					x = BetterConversion (ec, a, t, null, loc);
+					
+					if (x <= 0)
+						break;
+				}
+
+				if (x > 0)
+					return 1;
+				else
+					return 0;
+			}
+
+			best_pd = GetParameterData (best);
+
+			int rating1 = 0, rating2 = 0;
+			
+			for (int j = 0; j < argument_count; ++j) {
+				int x, y;
+				
+				Argument a = (Argument) args [j];
+
+				Type ct = candidate_pd.ParameterType (j);
+				Type bt = best_pd.ParameterType (j);
+
+				if (candidate_pd.ParameterModifier (j) == Parameter.Modifier.PARAMS)
+					if (expanded_form)
+						ct = ct.GetElementType ();
+
+				if (best_pd.ParameterModifier (j) == Parameter.Modifier.PARAMS)
+					if (expanded_form)
+						bt = bt.GetElementType ();
+				
+				x = BetterConversion (ec, a, ct, bt, loc);
+				y = BetterConversion (ec, a, bt, ct, loc);
+
+				if (x < y)
+					return 0;
+				
+				rating1 += x;
+				rating2 += y;
+			}
+
+			if (rating1 > rating2)
+				return 1;
+			else
+				return 0;
+		}
+
+		public static string FullMethodDesc (MethodBase mb)
+		{
+			string ret_type = "";
+
+			if (mb is MethodInfo)
+				ret_type = TypeManager.CSharpName (((MethodInfo) mb).ReturnType);
+			
+			StringBuilder sb = new StringBuilder (ret_type + " " + mb.Name);
+			ParameterData pd = GetParameterData (mb);
+
+			int count = pd.Count;
+			sb.Append (" (");
+			
+			for (int i = count; i > 0; ) {
+				i--;
+
+				sb.Append (pd.ParameterDesc (count - i - 1));
+				if (i != 0)
+					sb.Append (", ");
+			}
+			
+			sb.Append (")");
+			return sb.ToString ();
+		}
+
+		public static MethodGroupExpr MakeUnionSet (Expression mg1, Expression mg2, Location loc)
+		{
+			MemberInfo [] miset;
+			MethodGroupExpr union;
+
+			if (mg1 == null){
+				if (mg2 == null)
+					return null;
+				return (MethodGroupExpr) mg2;
+			} else {
+				if (mg2 == null)
+					return (MethodGroupExpr) mg1;
+			}
+			
+			MethodGroupExpr left_set = null, right_set = null;
+			int length1 = 0, length2 = 0;
+			
+			left_set = (MethodGroupExpr) mg1;
+			length1 = left_set.Methods.Length;
+			
+			right_set = (MethodGroupExpr) mg2;
+			length2 = right_set.Methods.Length;
+			
+			ArrayList common = new ArrayList ();
+
+			foreach (MethodBase l in left_set.Methods){
+				foreach (MethodBase r in right_set.Methods){
+					if (l != r)
+						continue;
+					common.Add (r);
+					break;
+				}
+			}
+			
+			miset = new MemberInfo [length1 + length2 - common.Count];
+			left_set.Methods.CopyTo (miset, 0);
+			
+			int k = length1;
+
+			foreach (MemberInfo mi in right_set.Methods){
+				if (!common.Contains (mi))
+					miset [k++] = mi;
+			}
+			
+			union = new MethodGroupExpr (miset, loc);
+			
+			return union;
+		}
+
+		/// <summary>
+		///  Determines is the candidate method, if a params method, is applicable
+		///  in its expanded form to the given set of arguments
+		/// </summary>
+		static bool IsParamsMethodApplicable (EmitContext ec, ArrayList arguments, MethodBase candidate)
+		{
+			int arg_count;
+			
+			if (arguments == null)
+				arg_count = 0;
+			else
+				arg_count = arguments.Count;
+			
+			ParameterData pd = GetParameterData (candidate);
+			
+			int pd_count = pd.Count;
+
+			if (pd_count == 0)
+				return false;
+			
+			if (pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS)
+				return false;
+			
+			if (pd_count - 1 > arg_count)
+				return false;
+			
+			if (pd_count == 1 && arg_count == 0)
+				return true;
+
+			//
+			// If we have come this far, the case which remains is when the number of parameters
+			// is less than or equal to the argument count.
+			//
+			for (int i = 0; i < pd_count - 1; ++i) {
+
+				Argument a = (Argument) arguments [i];
+
+				Parameter.Modifier a_mod = a.GetParameterModifier () &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+				Parameter.Modifier p_mod = pd.ParameterModifier (i) &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+
+				if (a_mod == p_mod) {
+
+					if (a_mod == Parameter.Modifier.NONE)
+						if (!ImplicitConversionExists (ec, a.Expr, pd.ParameterType (i)))
+							return false;
+										
+					if ((a_mod & Parameter.Modifier.ISBYREF) != 0) {
+						Type pt = pd.ParameterType (i);
+
+						if (!pt.IsByRef)
+							pt = TypeManager.LookupType (pt.FullName + "&");
+						
+						if (pt != a.Type)
+							return false;
+					}
+				} else
+					return false;
+				
+			}
+
+			Type element_type = pd.ParameterType (pd_count - 1).GetElementType ();
+
+			for (int i = pd_count - 1; i < arg_count; i++) {
+				Argument a = (Argument) arguments [i];
+				
+				if (!StandardConversionExists (a.Expr, element_type))
+					return false;
+			}
+			
+			return true;
+		}
+
+		/// <summary>
+		///  Determines if the candidate method is applicable (section 14.4.2.1)
+		///  to the given set of arguments
+		/// </summary>
+		static bool IsApplicable (EmitContext ec, ArrayList arguments, MethodBase candidate)
+		{
+			int arg_count;
+
+			if (arguments == null)
+				arg_count = 0;
+			else
+				arg_count = arguments.Count;
+
+			ParameterData pd = GetParameterData (candidate);
+
+			int pd_count = pd.Count;
+
+			if (arg_count != pd.Count)
+				return false;
+			
+			for (int i = arg_count; i > 0; ) {
+				i--;
+
+				Argument a = (Argument) arguments [i];
+
+				Parameter.Modifier a_mod = a.GetParameterModifier () &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+				Parameter.Modifier p_mod = pd.ParameterModifier (i) &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+
+				if (a_mod == p_mod ||
+				    (a_mod == Parameter.Modifier.NONE && p_mod == Parameter.Modifier.PARAMS)) {
+					if (a_mod == Parameter.Modifier.NONE)
+						if (!ImplicitConversionExists (ec, a.Expr, pd.ParameterType (i)))
+							return false;
+					
+					if ((a_mod & Parameter.Modifier.ISBYREF) != 0) {
+						Type pt = pd.ParameterType (i);
+
+						if (!pt.IsByRef)
+							pt = TypeManager.LookupType (pt.FullName + "&");
+
+						if (pt != a.Type)
+							return false;
+					}
+				} else
+					return false;
+			}
+
+			return true;
+		}
+		
+		
+
+		/// <summary>
+		///   Find the Applicable Function Members (7.4.2.1)
+		///
+		///   me: Method Group expression with the members to select.
+		///       it might contain constructors or methods (or anything
+		///       that maps to a method).
+		///
+		///   Arguments: ArrayList containing resolved Argument objects.
+		///
+		///   loc: The location if we want an error to be reported, or a Null
+		///        location for "probing" purposes.
+		///
+		///   Returns: The MethodBase (either a ConstructorInfo or a MethodInfo)
+		///            that is the best match of me on Arguments.
+		///
+		/// </summary>
+		public static MethodBase OverloadResolve (EmitContext ec, MethodGroupExpr me,
+							  ArrayList Arguments, Location loc)
+		{
+			ArrayList afm = new ArrayList ();
+			MethodBase method = null;
+			Type current_type = null;
+			int argument_count;
+			ArrayList candidates = new ArrayList ();
+			
+
+			foreach (MethodBase candidate in me.Methods){
+				int x;
+
+				// If we're going one level higher in the class hierarchy, abort if
+				// we already found an applicable method.
+				if (candidate.DeclaringType != current_type) {
+					current_type = candidate.DeclaringType;
+					if (method != null)
+						break;
+				}
+
+				// Check if candidate is applicable (section 14.4.2.1)
+				if (!IsApplicable (ec, Arguments, candidate))
+					continue;
+
+				candidates.Add (candidate);
+				x = BetterFunction (ec, Arguments, candidate, method, false, loc);
+				
+				if (x == 0)
+					continue;
+
+				method = candidate;
+			}
+
+			if (Arguments == null)
+				argument_count = 0;
+			else
+				argument_count = Arguments.Count;
+			
+			//
+			// Now we see if we can find params functions, applicable in their expanded form
+			// since if they were applicable in their normal form, they would have been selected
+			// above anyways
+			//
+			bool chose_params_expanded = false;
+			
+			if (method == null) {
+				candidates = new ArrayList ();
+				foreach (MethodBase candidate in me.Methods){
+					if (!IsParamsMethodApplicable (ec, Arguments, candidate))
+						continue;
+
+					candidates.Add (candidate);
+
+					int x = BetterFunction (ec, Arguments, candidate, method, true, loc);
+					if (x == 0)
+						continue;
+
+					method = candidate; 
+					chose_params_expanded = true;
+				}
+			}
+
+			if (method == null)
+				return null;
+
+			//
+			// Now check that there are no ambiguities i.e the selected method
+			// should be better than all the others
+			//
+
+			foreach (MethodBase candidate in candidates){
+ 				if (candidate == method)
+ 					continue;
+
+				//
+				// If a normal method is applicable in the sense that it has the same
+				// number of arguments, then the expanded params method is never applicable
+				// so we debar the params method.
+				//
+				if (IsParamsMethodApplicable (ec, Arguments, candidate) &&
+				    IsApplicable (ec, Arguments, method))
+					continue;
+					
+				int x = BetterFunction (ec, Arguments, method, candidate,
+							chose_params_expanded, loc);
+
+				if (x != 1) {
+ 					Report.Error (
+ 						121, loc,
+ 						"Ambiguous call when selecting function due to implicit casts");
+					return null;
+ 				}
+			}
+
+			//
+			// And now check if the arguments are all compatible, perform conversions
+			// if necessary etc. and return if everything is all right
+			//
+
+			if (VerifyArgumentsCompat (ec, Arguments, argument_count, method,
+						   chose_params_expanded, null, loc))
+				return method;
+			else
+				return null;
+		}
+
+		public static bool VerifyArgumentsCompat (EmitContext ec, ArrayList Arguments,
+							  int argument_count,
+							  MethodBase method, 
+							  bool chose_params_expanded,
+							  Type delegate_type,
+							  Location loc)
+		{
+			ParameterData pd = GetParameterData (method);
+			int pd_count = pd.Count;
+			
+			for (int j = 0; j < argument_count; j++) {
+				Argument a = (Argument) Arguments [j];
+				Expression a_expr = a.Expr;
+				Type parameter_type = pd.ParameterType (j);
+
+				if (pd.ParameterModifier (j) == Parameter.Modifier.PARAMS &&
+				    chose_params_expanded)
+					parameter_type = parameter_type.GetElementType ();
+
+				if (a.Type != parameter_type){
+					Expression conv;
+					
+					conv = ConvertImplicit (ec, a_expr, parameter_type, loc);
+
+					if (conv == null) {
+						if (!Location.IsNull (loc)) {
+							if (delegate_type == null) 
+								Report.Error (1502, loc,
+								       "The best overloaded match for method '" +
+								       FullMethodDesc (method) +
+								       "' has some invalid arguments");
+							else
+								Report.Error (1594, loc,
+									      "Delegate '" + delegate_type.ToString () +
+									      "' has some invalid arguments.");
+							Report.Error (1503, loc,
+							 "Argument " + (j+1) +
+							 ": Cannot convert from '" + Argument.FullDesc (a) 
+							 + "' to '" + pd.ParameterDesc (j) + "'");
+						}
+						
+						return false;
+					}
+					
+					//
+					// Update the argument with the implicit conversion
+					//
+					if (a_expr != conv)
+						a.Expr = conv;
+				}
+
+				Parameter.Modifier a_mod = a.GetParameterModifier () &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+				Parameter.Modifier p_mod = pd.ParameterModifier (j) &
+					~(Parameter.Modifier.OUT | Parameter.Modifier.REF);
+
+				
+				if (a_mod != p_mod &&
+				    pd.ParameterModifier (pd_count - 1) != Parameter.Modifier.PARAMS) {
+					if (!Location.IsNull (loc)) {
+						Console.WriteLine ("A:P: " + a.GetParameterModifier ());
+						Console.WriteLine ("PP:: " + pd.ParameterModifier (j));
+						Console.WriteLine ("PT:  " + parameter_type.IsByRef);
+						Report.Error (1502, loc,
+						       "The best overloaded match for method '" + FullMethodDesc (method)+
+						       "' has some invalid arguments");
+						Report.Error (1503, loc,
+						       "Argument " + (j+1) +
+						       ": Cannot convert from '" + Argument.FullDesc (a) 
+						       + "' to '" + pd.ParameterDesc (j) + "'");
+					}
+					
+					return false;
+				}
+			}
+
+			return true;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// First, resolve the expression that is used to
+			// trigger the invocation
+			//
+			if (expr is BaseAccess)
+				is_base = true;
+
+			expr = expr.Resolve (ec, ResolveFlags.VariableOrValue | ResolveFlags.MethodGroup);
+			if (expr == null)
+				return null;
+
+			if (!(expr is MethodGroupExpr)) {
+				Type expr_type = expr.Type;
+
+				if (expr_type != null){
+					bool IsDelegate = TypeManager.IsDelegateType (expr_type);
+					if (IsDelegate)
+						return (new DelegateInvocation (
+							this.expr, Arguments, loc)).Resolve (ec);
+				}
+			}
+
+			if (!(expr is MethodGroupExpr)){
+				expr.Error118 (ResolveFlags.MethodGroup);
+				return null;
+			}
+
+			//
+			// Next, evaluate all the expressions in the argument list
+			//
+			if (Arguments != null){
+				foreach (Argument a in Arguments){
+					if (!a.Resolve (ec, loc))
+						return null;
+				}
+			}
+
+			method = OverloadResolve (ec, (MethodGroupExpr) this.expr, Arguments, loc);
+
+			if (method == null){
+				Error (-6,
+				       "Could not find any applicable function for this argument list");
+				return null;
+			}
+
+			if (method is MethodInfo)
+				type = TypeManager.TypeToCoreType (((MethodInfo)method).ReturnType);
+
+			if (type.IsPointer){
+				if (!ec.InUnsafe){
+					UnsafeError (loc);
+					return null;
+				}
+			}
+			
+			eclass = ExprClass.Value;
+			return this;
+		}
+
+		// <summary>
+		//   Emits the list of arguments as an array
+		// </summary>
+		static void EmitParams (EmitContext ec, int idx, ArrayList arguments)
+		{
+			ILGenerator ig = ec.ig;
+			int count = arguments.Count - idx;
+			Argument a = (Argument) arguments [idx];
+			Type t = a.Expr.Type;
+			string array_type = t.FullName + "[]";
+			LocalBuilder array;
+
+			array = ig.DeclareLocal (TypeManager.LookupType (array_type));
+			IntConstant.EmitInt (ig, count);
+			ig.Emit (OpCodes.Newarr, TypeManager.TypeToCoreType (t));
+			ig.Emit (OpCodes.Stloc, array);
+
+			int top = arguments.Count;
+			for (int j = idx; j < top; j++){
+				a = (Argument) arguments [j];
+				
+				ig.Emit (OpCodes.Ldloc, array);
+				IntConstant.EmitInt (ig, j - idx);
+				a.Emit (ec);
+				
+				ArrayAccess.EmitStoreOpcode (ig, t);
+			}
+			ig.Emit (OpCodes.Ldloc, array);
+		}
+		
+		/// <summary>
+		///   Emits a list of resolved Arguments that are in the arguments
+		///   ArrayList.
+		/// 
+		///   The MethodBase argument might be null if the
+		///   emission of the arguments is known not to contain
+		///   a `params' field (for example in constructors or other routines
+		///   that keep their arguments in this structure)
+		/// </summary>
+		public static void EmitArguments (EmitContext ec, MethodBase mb, ArrayList arguments)
+		{
+			ParameterData pd;
+			if (mb != null)
+				pd = GetParameterData (mb);
+			else
+				pd = null;
+
+			//
+			// If we are calling a params method with no arguments, special case it
+			//
+			if (arguments == null){
+				if (pd != null && pd.Count > 0 &&
+				    pd.ParameterModifier (0) == Parameter.Modifier.PARAMS){
+					ILGenerator ig = ec.ig;
+
+					IntConstant.EmitInt (ig, 0);
+					ig.Emit (OpCodes.Newarr, pd.ParameterType (0).GetElementType ());
+				}
+
+				return;
+			}
+
+			int top = arguments.Count;
+
+			for (int i = 0; i < top; i++){
+				Argument a = (Argument) arguments [i];
+
+				if (pd != null){
+					if (pd.ParameterModifier (i) == Parameter.Modifier.PARAMS){
+						//
+						// Special case if we are passing the same data as the
+						// params argument, do not put it in an array.
+						//
+						if (pd.ParameterType (i) == a.Type)
+							a.Emit (ec);
+						else
+							EmitParams (ec, i, arguments);
+						return;
+					}
+				}
+					    
+				a.Emit (ec);
+			}
+
+			if (pd != null && pd.Count > top &&
+			    pd.ParameterModifier (top) == Parameter.Modifier.PARAMS){
+				ILGenerator ig = ec.ig;
+
+				IntConstant.EmitInt (ig, 0);
+				ig.Emit (OpCodes.Newarr, pd.ParameterType (top).GetElementType ());
+			}
+		}
+
+		/// <remarks>
+		///   is_base tells whether we want to force the use of the `call'
+		///   opcode instead of using callvirt.  Call is required to call
+		///   a specific method, while callvirt will always use the most
+		///   recent method in the vtable.
+		///
+		///   is_static tells whether this is an invocation on a static method
+		///
+		///   instance_expr is an expression that represents the instance
+		///   it must be non-null if is_static is false.
+		///
+		///   method is the method to invoke.
+		///
+		///   Arguments is the list of arguments to pass to the method or constructor.
+		/// </remarks>
+		public static void EmitCall (EmitContext ec, bool is_base,
+					     bool is_static, Expression instance_expr,
+					     MethodBase method, ArrayList Arguments, Location loc)
+		{
+			ILGenerator ig = ec.ig;
+			bool struct_call = false;
+
+			Type decl_type = method.DeclaringType;
+
+			if (!RootContext.StdLib) {
+				// Replace any calls to the system's System.Array type with calls to
+				// the newly created one.
+				if (method == TypeManager.system_int_array_get_length)
+					method = TypeManager.int_array_get_length;
+				else if (method == TypeManager.system_int_array_get_rank)
+					method = TypeManager.int_array_get_rank;
+				else if (method == TypeManager.system_object_array_clone)
+					method = TypeManager.object_array_clone;
+				else if (method == TypeManager.system_int_array_get_length_int)
+					method = TypeManager.int_array_get_length_int;
+				else if (method == TypeManager.system_int_array_get_lower_bound_int)
+					method = TypeManager.int_array_get_lower_bound_int;
+				else if (method == TypeManager.system_int_array_get_upper_bound_int)
+					method = TypeManager.int_array_get_upper_bound_int;
+				else if (method == TypeManager.system_void_array_copyto_array_int)
+					method = TypeManager.void_array_copyto_array_int;
+			}
+
+			//
+			// This checks the `ConditionalAttribute' on the method, and the
+			// ObsoleteAttribute
+			//
+			TypeManager.MethodFlags flags = TypeManager.GetMethodFlags (method, loc);
+			if ((flags & TypeManager.MethodFlags.IsObsoleteError) != 0)
+				return;
+			if ((flags & TypeManager.MethodFlags.ShouldIgnore) != 0)
+				return;
+			
+			if (!is_static){
+				if (decl_type.IsValueType)
+					struct_call = true;
+				//
+				// If this is ourselves, push "this"
+				//
+				if (instance_expr == null){
+					ig.Emit (OpCodes.Ldarg_0);
+				} else {
+					//
+					// Push the instance expression
+					//
+					if (instance_expr.Type.IsValueType){
+						//
+						// Special case: calls to a function declared in a 
+						// reference-type with a value-type argument need
+						// to have their value boxed.  
+
+						struct_call = true;
+						if (decl_type.IsValueType){
+							//
+							// If the expression implements IMemoryLocation, then
+							// we can optimize and use AddressOf on the
+							// return.
+							//
+							// If not we have to use some temporary storage for
+							// it.
+							if (instance_expr is IMemoryLocation){
+								((IMemoryLocation)instance_expr).
+									AddressOf (ec, AddressOp.LoadStore);
+							}
+							else {
+								Type t = instance_expr.Type;
+								
+								instance_expr.Emit (ec);
+								LocalBuilder temp = ig.DeclareLocal (t);
+								ig.Emit (OpCodes.Stloc, temp);
+								ig.Emit (OpCodes.Ldloca, temp);
+							}
+						} else {
+							instance_expr.Emit (ec);
+							ig.Emit (OpCodes.Box, instance_expr.Type);
+						} 
+					} else
+						instance_expr.Emit (ec);
+				}
+			}
+
+			EmitArguments (ec, method, Arguments);
+
+			if (is_static || struct_call || is_base){
+				if (method is MethodInfo) {
+					ig.Emit (OpCodes.Call, (MethodInfo) method);
+				} else
+					ig.Emit (OpCodes.Call, (ConstructorInfo) method);
+			} else {
+				if (method is MethodInfo)
+					ig.Emit (OpCodes.Callvirt, (MethodInfo) method);
+				else
+					ig.Emit (OpCodes.Callvirt, (ConstructorInfo) method);
+			}
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			MethodGroupExpr mg = (MethodGroupExpr) this.expr;
+
+			EmitCall (
+				ec, is_base, method.IsStatic, mg.InstanceExpression, method, Arguments, loc);
+		}
+		
+		public override void EmitStatement (EmitContext ec)
+		{
+			Emit (ec);
+
+			// 
+			// Pop the return value if there is one
+			//
+			if (method is MethodInfo){
+				Type ret = ((MethodInfo)method).ReturnType;
+				if (TypeManager.TypeToCoreType (ret) != TypeManager.void_type)
+					ec.ig.Emit (OpCodes.Pop);
+			}
+		}
+	}
+
+	//
+	// This class is used to "disable" the code generation for the
+	// temporary variable when initializing value types.
+	//
+	class EmptyAddressOf : EmptyExpression, IMemoryLocation {
+		public void AddressOf (EmitContext ec, AddressOp Mode)
+		{
+			// nothing
+		}
+	}
+	
+	/// <summary>
+	///    Implements the new expression 
+	/// </summary>
+	public class New : ExpressionStatement {
+		public readonly ArrayList Arguments;
+		public readonly Expression RequestedType;
+
+		MethodBase method = null;
+
+		//
+		// If set, the new expression is for a value_target, and
+		// we will not leave anything on the stack.
+		//
+		Expression value_target;
+		bool value_target_set = false;
+		
+		public New (Expression requested_type, ArrayList arguments, Location l)
+		{
+			RequestedType = requested_type;
+			Arguments = arguments;
+			loc = l;
+		}
+
+		public Expression ValueTypeVariable {
+			get {
+				return value_target;
+			}
+
+			set {
+				value_target = value;
+				value_target_set = true;
+			}
+		}
+
+		//
+		// This function is used to disable the following code sequence for
+		// value type initialization:
+		//
+		// AddressOf (temporary)
+		// Construct/Init
+		// LoadTemporary
+		//
+		// Instead the provide will have provided us with the address on the
+		// stack to store the results.
+		//
+		static Expression MyEmptyExpression;
+		
+		public void DisableTemporaryValueType ()
+		{
+			if (MyEmptyExpression == null)
+				MyEmptyExpression = new EmptyAddressOf ();
+
+			//
+			// To enable this, look into:
+			// test-34 and test-89 and self bootstrapping.
+			//
+			// For instance, we can avoid a copy by using `newobj'
+			// instead of Call + Push-temp on value types.
+//			value_target = MyEmptyExpression;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = ec.DeclSpace.ResolveType (RequestedType, false, loc);
+			
+			if (type == null)
+				return null;
+			
+			bool IsDelegate = TypeManager.IsDelegateType (type);
+			
+			if (IsDelegate)
+				return (new NewDelegate (type, Arguments, loc)).Resolve (ec);
+
+			if (type.IsInterface || type.IsAbstract){
+				Error (
+					144, "It is not possible to create instances of interfaces " +
+					"or abstract classes");
+				return null;
+			}
+			
+			bool is_struct = false;
+			is_struct = type.IsValueType;
+			eclass = ExprClass.Value;
+
+			//
+			// SRE returns a match for .ctor () on structs (the object constructor), 
+			// so we have to manually ignore it.
+			//
+			if (is_struct && Arguments == null)
+				return this;
+			
+			Expression ml;
+			ml = MemberLookupFinal (ec, type, ".ctor",
+						MemberTypes.Constructor,
+						AllBindingFlags | BindingFlags.DeclaredOnly, loc);
+
+			if (ml == null)
+				return null;
+			
+			if (! (ml is MethodGroupExpr)){
+				if (!is_struct){
+					ml.Error118 ("method group");
+					return null;
+				}
+			}
+
+			if (ml != null) {
+				if (Arguments != null){
+					foreach (Argument a in Arguments){
+						if (!a.Resolve (ec, loc))
+							return null;
+					}
+				}
+
+				method = Invocation.OverloadResolve (ec, (MethodGroupExpr) ml,
+								     Arguments, loc);
+				
+			}
+
+			if (method == null) { 
+                                if (!is_struct || Arguments.Count > 0) {
+        				Error (1501,
+	        			       "New invocation: Can not find a constructor for " +
+		        		       "this argument list");
+			        	return null;
+                                }
+			}
+			return this;
+		}
+
+		//
+		// This DoEmit can be invoked in two contexts:
+		//    * As a mechanism that will leave a value on the stack (new object)
+		//    * As one that wont (init struct)
+		//
+		// You can control whether a value is required on the stack by passing
+		// need_value_on_stack.  The code *might* leave a value on the stack
+		// so it must be popped manually
+		//
+		// If we are dealing with a ValueType, we have a few
+		// situations to deal with:
+		//
+		//    * The target is a ValueType, and we have been provided
+		//      the instance (this is easy, we are being assigned).
+		//
+		//    * The target of New is being passed as an argument,
+		//      to a boxing operation or a function that takes a
+		//      ValueType.
+		//
+		//      In this case, we need to create a temporary variable
+		//      that is the argument of New.
+		//
+		// Returns whether a value is left on the stack
+		//
+		bool DoEmit (EmitContext ec, bool need_value_on_stack)
+		{
+			bool is_value_type = type.IsValueType;
+			ILGenerator ig = ec.ig;
+
+			if (is_value_type){
+				IMemoryLocation ml;
+
+				// Allow DoEmit() to be called multiple times.
+				// We need to create a new LocalTemporary each time since
+				// you can't share LocalBuilders among ILGeneators.
+				if (!value_target_set)
+					value_target = new LocalTemporary (ec, type);
+					
+				ml = (IMemoryLocation) value_target;
+				ml.AddressOf (ec, AddressOp.Store);
+			}
+
+			if (method != null)
+				Invocation.EmitArguments (ec, method, Arguments);
+
+			if (is_value_type){
+				if (method == null)
+					ig.Emit (OpCodes.Initobj, type);
+				else 
+					ig.Emit (OpCodes.Call, (ConstructorInfo) method);
+                                if (need_value_on_stack){
+                                        value_target.Emit (ec);
+                                        return true;
+                                }
+                                return false;
+			} else {
+				ig.Emit (OpCodes.Newobj, (ConstructorInfo) method);
+				return true;
+			}
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			DoEmit (ec, true);
+		}
+		
+		public override void EmitStatement (EmitContext ec)
+		{
+			if (DoEmit (ec, false))
+				ec.ig.Emit (OpCodes.Pop);
+		}
+	}
+
+	/// <summary>
+	///   14.5.10.2: Represents an array creation expression.
+	/// </summary>
+	///
+	/// <remarks>
+	///   There are two possible scenarios here: one is an array creation
+	///   expression that specifies the dimensions and optionally the
+	///   initialization data and the other which does not need dimensions
+	///   specified but where initialization data is mandatory.
+	/// </remarks>
+	public class ArrayCreation : ExpressionStatement {
+		Expression requested_base_type;
+		ArrayList initializers;
+
+		//
+		// The list of Argument types.
+		// This is used to construct the `newarray' or constructor signature
+		//
+		ArrayList arguments;
+
+		//
+		// Method used to create the array object.
+		//
+		MethodBase new_method = null;
+		
+		Type array_element_type;
+		Type underlying_type;
+		bool is_one_dimensional = false;
+		bool is_builtin_type = false;
+		bool expect_initializers = false;
+		int num_arguments = 0;
+		int dimensions = 0;
+		string rank;
+
+		ArrayList array_data;
+
+		Hashtable bounds;
+
+		//
+		// The number of array initializers that we can handle
+		// via the InitializeArray method - through EmitStaticInitializers
+		//
+		int num_automatic_initializers;
+		
+		public ArrayCreation (Expression requested_base_type, ArrayList exprs, string rank, ArrayList initializers, Location l)
+		{
+			this.requested_base_type = requested_base_type;
+			this.initializers = initializers;
+			this.rank = rank;
+			loc = l;
+
+			arguments = new ArrayList ();
+
+			foreach (Expression e in exprs) {
+				arguments.Add (new Argument (e, Argument.AType.Expression));
+				num_arguments++;
+			}
+		}
+
+		public ArrayCreation (Expression requested_base_type, string rank, ArrayList initializers, Location l)
+		{
+			this.requested_base_type = requested_base_type;
+			this.initializers = initializers;
+			this.rank = rank;
+			loc = l;
+
+			//this.rank = rank.Substring (0, rank.LastIndexOf ("["));
+			//
+			//string tmp = rank.Substring (rank.LastIndexOf ("["));
+			//
+			//dimensions = tmp.Length - 1;
+			expect_initializers = true;
+		}
+
+		public Expression FormArrayType (Expression base_type, int idx_count, string rank)
+		{
+			StringBuilder sb = new StringBuilder (rank);
+			
+			sb.Append ("[");
+			for (int i = 1; i < idx_count; i++)
+				sb.Append (",");
+			
+			sb.Append ("]");
+
+			return new ComposedCast (base_type, sb.ToString (), loc);
+		}
+
+		void error178 ()
+		{
+			Error (178, "Incorrectly structured array initializer");
+		}
+		
+		public bool CheckIndices (EmitContext ec, ArrayList probe, int idx, bool specified_dims)
+		{
+			if (specified_dims) { 
+				Argument a = (Argument) arguments [idx];
+				
+				if (!a.Resolve (ec, loc))
+					return false;
+				
+				if (!(a.Expr is Constant)) {
+					Error (150, "A constant value is expected");
+					return false;
+				}
+				
+				int value = (int) ((Constant) a.Expr).GetValue ();
+				
+				if (value != probe.Count) {
+					error178 ();
+					return false;
+				}
+				
+				bounds [idx] = value;
+			}
+			
+			foreach (object o in probe) {
+				if (o is ArrayList) {
+					bool ret = CheckIndices (ec, (ArrayList) o, idx + 1, specified_dims);
+					if (!ret)
+						return false;
+				} else {
+					Expression tmp = (Expression) o;
+					tmp = tmp.Resolve (ec);
+					if (tmp == null)
+						continue;
+
+					// Console.WriteLine ("I got: " + tmp);
+					// Handle initialization from vars, fields etc.
+
+					Expression conv = ConvertImplicitRequired (
+						ec, tmp, underlying_type, loc);
+					
+					if (conv == null) 
+						return false;
+
+					if (conv is StringConstant)
+						array_data.Add (conv);
+					else if (conv is Constant) {
+						array_data.Add (conv);
+						num_automatic_initializers++;
+					} else
+						array_data.Add (conv);
+				}
+			}
+
+			return true;
+		}
+		
+		public void UpdateIndices (EmitContext ec)
+		{
+			int i = 0;
+			for (ArrayList probe = initializers; probe != null;) {
+				if (probe.Count > 0 && probe [0] is ArrayList) {
+					Expression e = new IntConstant (probe.Count);
+					arguments.Add (new Argument (e, Argument.AType.Expression));
+
+					bounds [i++] =  probe.Count;
+					
+					probe = (ArrayList) probe [0];
+					
+				} else {
+					Expression e = new IntConstant (probe.Count);
+					arguments.Add (new Argument (e, Argument.AType.Expression));
+
+					bounds [i++] = probe.Count;
+					probe = null;
+				}
+			}
+
+		}
+		
+		public bool ValidateInitializers (EmitContext ec, Type array_type)
+		{
+			if (initializers == null) {
+				if (expect_initializers)
+					return false;
+				else
+					return true;
+			}
+			
+			if (underlying_type == null)
+				return false;
+			
+			//
+			// We use this to store all the date values in the order in which we
+			// will need to store them in the byte blob later
+			//
+			array_data = new ArrayList ();
+			bounds = new Hashtable ();
+			
+			bool ret;
+
+			if (arguments != null) {
+				ret = CheckIndices (ec, initializers, 0, true);
+				return ret;
+			} else {
+				arguments = new ArrayList ();
+
+				ret = CheckIndices (ec, initializers, 0, false);
+				
+				if (!ret)
+					return false;
+				
+				UpdateIndices (ec);
+				
+				if (arguments.Count != dimensions) {
+					error178 ();
+					return false;
+				}
+
+				return ret;
+			}
+		}
+
+		void Error_NegativeArrayIndex ()
+		{
+			Error (284, "Can not create array with a negative size");
+		}
+		
+		//
+		// Converts `source' to an int, uint, long or ulong.
+		//
+		Expression ExpressionToArrayArgument (EmitContext ec, Expression source)
+		{
+			Expression target;
+			
+			bool old_checked = ec.CheckState;
+			ec.CheckState = true;
+			
+			target = ConvertImplicit (ec, source, TypeManager.int32_type, loc);
+			if (target == null){
+				target = ConvertImplicit (ec, source, TypeManager.uint32_type, loc);
+				if (target == null){
+					target = ConvertImplicit (ec, source, TypeManager.int64_type, loc);
+					if (target == null){
+						target = ConvertImplicit (ec, source, TypeManager.uint64_type, loc);
+						if (target == null)
+							Expression.Error_CannotConvertImplicit (loc, source.Type, TypeManager.int32_type);
+					}
+				}
+			} 
+			ec.CheckState = old_checked;
+
+			//
+			// Only positive constants are allowed at compile time
+			//
+			if (target is Constant){
+				if (target is IntConstant){
+					if (((IntConstant) target).Value < 0){
+						Error_NegativeArrayIndex ();
+						return null;
+					}
+				}
+
+				if (target is LongConstant){
+					if (((LongConstant) target).Value < 0){
+						Error_NegativeArrayIndex ();
+						return null;
+					}
+				}
+				
+			}
+
+			return target;
+		}
+
+		//
+		// Creates the type of the array
+		//
+		bool LookupType (EmitContext ec)
+		{
+			StringBuilder array_qualifier = new StringBuilder (rank);
+
+			//
+			// `In the first form allocates an array instace of the type that results
+			// from deleting each of the individual expression from the expression list'
+			//
+			if (num_arguments > 0) {
+				array_qualifier.Append ("[");
+				for (int i = num_arguments-1; i > 0; i--)
+					array_qualifier.Append (",");
+				array_qualifier.Append ("]");				
+			}
+
+			//
+			// Lookup the type
+			//
+			Expression array_type_expr;
+			array_type_expr = new ComposedCast (requested_base_type, array_qualifier.ToString (), loc);
+			type = ec.DeclSpace.ResolveType (array_type_expr, false, loc);
+
+			if (type == null)
+				return false;
+
+			underlying_type = type;
+			if (underlying_type.IsArray)
+				underlying_type = TypeManager.TypeToCoreType (underlying_type.GetElementType ());
+			dimensions = type.GetArrayRank ();
+
+			return true;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			int arg_count;
+
+			if (!LookupType (ec))
+				return null;
+			
+			//
+			// First step is to validate the initializers and fill
+			// in any missing bits
+			//
+			if (!ValidateInitializers (ec, type))
+				return null;
+
+			if (arguments == null)
+				arg_count = 0;
+			else {
+				arg_count = arguments.Count;
+				foreach (Argument a in arguments){
+					if (!a.Resolve (ec, loc))
+						return null;
+
+					Expression real_arg = ExpressionToArrayArgument (ec, a.Expr, loc);
+					if (real_arg == null)
+						return null;
+
+					a.Expr = real_arg;
+				}
+			}
+			
+			array_element_type = TypeManager.TypeToCoreType (type.GetElementType ());
+
+			if (arg_count == 1) {
+				is_one_dimensional = true;
+				eclass = ExprClass.Value;
+				return this;
+			}
+
+			is_builtin_type = TypeManager.IsBuiltinType (type);
+
+			if (is_builtin_type) {
+				Expression ml;
+				
+				ml = MemberLookup (ec, type, ".ctor", MemberTypes.Constructor,
+						   AllBindingFlags, loc);
+				
+				if (!(ml is MethodGroupExpr)) {
+					ml.Error118 ("method group");
+					return null;
+				}
+				
+				if (ml == null) {
+					Error (-6, "New invocation: Can not find a constructor for " +
+						      "this argument list");
+					return null;
+				}
+				
+				new_method = Invocation.OverloadResolve (ec, (MethodGroupExpr) ml, arguments, loc);
+
+				if (new_method == null) {
+					Error (-6, "New invocation: Can not find a constructor for " +
+						      "this argument list");
+					return null;
+				}
+				
+				eclass = ExprClass.Value;
+				return this;
+			} else {
+				ModuleBuilder mb = CodeGen.ModuleBuilder;
+				ArrayList args = new ArrayList ();
+				
+				if (arguments != null) {
+					for (int i = 0; i < arg_count; i++)
+						args.Add (TypeManager.int32_type);
+				}
+				
+				Type [] arg_types = null;
+
+				if (args.Count > 0)
+					arg_types = new Type [args.Count];
+				
+				args.CopyTo (arg_types, 0);
+				
+				new_method = mb.GetArrayMethod (type, ".ctor", CallingConventions.HasThis, null,
+							    arg_types);
+
+				if (new_method == null) {
+					Error (-6, "New invocation: Can not find a constructor for " +
+						      "this argument list");
+					return null;
+				}
+				
+				eclass = ExprClass.Value;
+				return this;
+			}
+		}
+
+		public static byte [] MakeByteBlob (ArrayList array_data, Type underlying_type, Location loc)
+		{
+			int factor;
+			byte [] data;
+			byte [] element;
+			int count = array_data.Count;
+
+			factor = GetTypeSize (underlying_type);
+			if (factor == 0)
+				return null;
+
+			data = new byte [(count * factor + 4) & ~3];
+			int idx = 0;
+			
+			for (int i = 0; i < count; ++i) {
+				object v = array_data [i];
+
+				if (v is EnumConstant)
+					v = ((EnumConstant) v).Child;
+				
+				if (v is Constant && !(v is StringConstant))
+					v = ((Constant) v).GetValue ();
+				else {
+					idx += factor;
+					continue;
+				}
+				
+				if (underlying_type == TypeManager.int64_type){
+					if (!(v is Expression)){
+						long val = (long) v;
+						
+						for (int j = 0; j < factor; ++j) {
+							data [idx + j] = (byte) (val & 0xFF);
+							val = (val >> 8);
+						}
+					}
+				} else if (underlying_type == TypeManager.uint64_type){
+					if (!(v is Expression)){
+						ulong val = (ulong) v;
+
+						for (int j = 0; j < factor; ++j) {
+							data [idx + j] = (byte) (val & 0xFF);
+							val = (val >> 8);
+						}
+					}
+				} else if (underlying_type == TypeManager.float_type) {
+					if (!(v is Expression)){
+						element = BitConverter.GetBytes ((float) v);
+							
+						for (int j = 0; j < factor; ++j)
+							data [idx + j] = element [j];
+					}
+				} else if (underlying_type == TypeManager.double_type) {
+					if (!(v is Expression)){
+						element = BitConverter.GetBytes ((double) v);
+
+						for (int j = 0; j < factor; ++j)
+							data [idx + j] = element [j];
+					}
+				} else if (underlying_type == TypeManager.char_type){
+					if (!(v is Expression)){
+						int val = (int) ((char) v);
+						
+						data [idx] = (byte) (val & 0xff);
+						data [idx+1] = (byte) (val >> 8);
+					}
+				} else if (underlying_type == TypeManager.short_type){
+					if (!(v is Expression)){
+						int val = (int) ((short) v);
+					
+						data [idx] = (byte) (val & 0xff);
+						data [idx+1] = (byte) (val >> 8);
+					}
+				} else if (underlying_type == TypeManager.ushort_type){
+					if (!(v is Expression)){
+						int val = (int) ((ushort) v);
+					
+						data [idx] = (byte) (val & 0xff);
+						data [idx+1] = (byte) (val >> 8);
+					}
+				} else if (underlying_type == TypeManager.int32_type) {
+					if (!(v is Expression)){
+						int val = (int) v;
+					
+						data [idx]   = (byte) (val & 0xff);
+						data [idx+1] = (byte) ((val >> 8) & 0xff);
+						data [idx+2] = (byte) ((val >> 16) & 0xff);
+						data [idx+3] = (byte) (val >> 24);
+					}
+				} else if (underlying_type == TypeManager.uint32_type) {
+					if (!(v is Expression)){
+						uint val = (uint) v;
+					
+						data [idx]   = (byte) (val & 0xff);
+						data [idx+1] = (byte) ((val >> 8) & 0xff);
+						data [idx+2] = (byte) ((val >> 16) & 0xff);
+						data [idx+3] = (byte) (val >> 24);
+					}
+				} else if (underlying_type == TypeManager.sbyte_type) {
+					if (!(v is Expression)){
+						sbyte val = (sbyte) v;
+						data [idx] = (byte) val;
+					}
+				} else if (underlying_type == TypeManager.byte_type) {
+					if (!(v is Expression)){
+						byte val = (byte) v;
+						data [idx] = (byte) val;
+					}
+				} else if (underlying_type == TypeManager.bool_type) {
+					if (!(v is Expression)){
+						bool val = (bool) v;
+						data [idx] = (byte) (val ? 1 : 0);
+					}
+				} else
+					throw new Exception ("Unrecognized type in MakeByteBlob");
+
+                                idx += factor;
+			}
+
+			return data;
+		}
+
+		//
+		// Emits the initializers for the array
+		//
+		void EmitStaticInitializers (EmitContext ec, bool is_expression)
+		{
+			//
+			// First, the static data
+			//
+			FieldBuilder fb;
+			ILGenerator ig = ec.ig;
+			
+			byte [] data = MakeByteBlob (array_data, underlying_type, loc);
+			
+			if (data != null) {
+				fb = RootContext.MakeStaticData (data);
+
+				if (is_expression)
+					ig.Emit (OpCodes.Dup);
+				ig.Emit (OpCodes.Ldtoken, fb);
+				ig.Emit (OpCodes.Call,
+					 TypeManager.void_initializearray_array_fieldhandle);
+			}
+		}
+		
+		//
+		// Emits pieces of the array that can not be computed at compile
+		// time (variables and string locations).
+		//
+		// This always expect the top value on the stack to be the array
+		//
+		void EmitDynamicInitializers (EmitContext ec, bool is_expression)
+		{
+			ILGenerator ig = ec.ig;
+			int dims = bounds.Count;
+			int [] current_pos = new int [dims];
+			int top = array_data.Count;
+			LocalBuilder temp = ig.DeclareLocal (type);
+
+			ig.Emit (OpCodes.Stloc, temp);
+
+			MethodInfo set = null;
+
+			if (dims != 1){
+				Type [] args;
+				ModuleBuilder mb = null;
+				mb = CodeGen.ModuleBuilder;
+				args = new Type [dims + 1];
+
+				int j;
+				for (j = 0; j < dims; j++)
+					args [j] = TypeManager.int32_type;
+
+				args [j] = array_element_type;
+				
+				set = mb.GetArrayMethod (
+					type, "Set",
+					CallingConventions.HasThis | CallingConventions.Standard,
+					TypeManager.void_type, args);
+			}
+			
+			for (int i = 0; i < top; i++){
+
+				Expression e = null;
+
+				if (array_data [i] is Expression)
+					e = (Expression) array_data [i];
+
+				if (e != null) {
+					//
+					// Basically we do this for string literals and
+					// other non-literal expressions
+					//
+					if (e is StringConstant || !(e is Constant) ||
+					    num_automatic_initializers <= 2) {
+						Type etype = e.Type;
+						
+						ig.Emit (OpCodes.Ldloc, temp);
+
+						for (int idx = dims; idx > 0; ) {
+							idx--;
+							IntConstant.EmitInt (ig, current_pos [idx]);
+						}
+
+						//
+						// If we are dealing with a struct, get the
+						// address of it, so we can store it.
+						//
+						if ((dims == 1) &&
+						    etype.IsSubclassOf (TypeManager.value_type) &&
+						    (!TypeManager.IsBuiltinType (etype) ||
+						     etype == TypeManager.decimal_type)) {
+							if (e is New){
+								New n = (New) e;
+
+								//
+								// Let new know that we are providing
+								// the address where to store the results
+								//
+								n.DisableTemporaryValueType ();
+							}
+									     
+							ig.Emit (OpCodes.Ldelema, etype);
+						}
+
+						e.Emit (ec);
+						
+						if (dims == 1)
+							ArrayAccess.EmitStoreOpcode (ig, array_element_type);
+						else 
+							ig.Emit (OpCodes.Call, set);
+					}
+				}
+				
+				//
+				// Advance counter
+				//
+				for (int j = 0; j < dims; j++){
+					current_pos [j]++;
+					if (current_pos [j] < (int) bounds [j])
+						break;
+					current_pos [j] = 0;
+				}
+			}
+
+			if (is_expression)
+				ig.Emit (OpCodes.Ldloc, temp);
+		}
+
+		void EmitArrayArguments (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			foreach (Argument a in arguments) {
+				Type atype = a.Type;
+				a.Emit (ec);
+
+				if (atype == TypeManager.uint64_type)
+					ig.Emit (OpCodes.Conv_Ovf_U4);
+				else if (atype == TypeManager.int64_type)
+					ig.Emit (OpCodes.Conv_Ovf_I4);
+			}
+		}
+		
+		void DoEmit (EmitContext ec, bool is_statement)
+		{
+			ILGenerator ig = ec.ig;
+			
+			EmitArrayArguments (ec);
+			if (is_one_dimensional)
+				ig.Emit (OpCodes.Newarr, array_element_type);
+			else {
+				if (is_builtin_type) 
+					ig.Emit (OpCodes.Newobj, (ConstructorInfo) new_method);
+				else 
+					ig.Emit (OpCodes.Newobj, (MethodInfo) new_method);
+			}
+			
+			if (initializers != null){
+				//
+				// FIXME: Set this variable correctly.
+				// 
+				bool dynamic_initializers = true;
+
+				if (underlying_type != TypeManager.string_type &&
+				    underlying_type != TypeManager.object_type) {
+					if (num_automatic_initializers > 2)
+						EmitStaticInitializers (ec, dynamic_initializers || !is_statement);
+				}
+				
+				if (dynamic_initializers)
+					EmitDynamicInitializers (ec, !is_statement);
+			}
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			DoEmit (ec, false);
+		}
+
+		public override void EmitStatement (EmitContext ec)
+		{
+			DoEmit (ec, true);
+		}
+		
+	}
+	
+	/// <summary>
+	///   Represents the `this' construct
+	/// </summary>
+	public class This : Expression, IAssignMethod, IMemoryLocation, IVariable {
+
+		Block block;
+		VariableInfo vi;
+		
+		public This (Block block, Location loc)
+		{
+			this.loc = loc;
+			this.block = block;
+		}
+
+		public This (Location loc)
+		{
+			this.loc = loc;
+		}
+
+		public bool IsAssigned (EmitContext ec, Location loc)
+		{
+			if (vi == null)
+				return true;
+
+			return vi.IsAssigned (ec, loc);
+		}
+
+		public bool IsFieldAssigned (EmitContext ec, string field_name, Location loc)
+		{
+			if (vi == null)
+				return true;
+
+			return vi.IsFieldAssigned (ec, field_name, loc);
+		}
+
+		public void SetAssigned (EmitContext ec)
+		{
+			if (vi != null)
+				vi.SetAssigned (ec);
+		}
+
+		public void SetFieldAssigned (EmitContext ec, string field_name)
+		{	
+			if (vi != null)
+				vi.SetFieldAssigned (ec, field_name);
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			eclass = ExprClass.Variable;
+			type = ec.ContainerType;
+
+			if (ec.IsStatic){
+				Error (26, "Keyword this not valid in static code");
+				return null;
+			}
+
+			if (block != null)
+				vi = block.ThisVariable;
+
+			return this;
+		}
+
+		override public Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			DoResolve (ec);
+
+			VariableInfo vi = ec.CurrentBlock.ThisVariable;
+			if (vi != null)
+				vi.SetAssigned (ec);
+			
+			if (ec.TypeContainer is Class){
+				Error (1604, "Cannot assign to `this'");
+				return null;
+			}
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			ig.Emit (OpCodes.Ldarg_0);
+			if (ec.TypeContainer is Struct)
+				ig.Emit (OpCodes.Ldobj, type);
+		}
+
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			ILGenerator ig = ec.ig;
+			
+			if (ec.TypeContainer is Struct){
+				ig.Emit (OpCodes.Ldarg_0);
+				source.Emit (ec);
+				ig.Emit (OpCodes.Stobj, type);
+			} else {
+				source.Emit (ec);
+				ig.Emit (OpCodes.Starg, 0);
+			}
+		}
+
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			ec.ig.Emit (OpCodes.Ldarg_0);
+
+			// FIMXE
+			// FIGURE OUT WHY LDARG_S does not work
+			//
+			// consider: struct X { int val; int P { set { val = value; }}}
+			//
+			// Yes, this looks very bad. Look at `NOTAS' for
+			// an explanation.
+			// ec.ig.Emit (OpCodes.Ldarga_S, (byte) 0);
+		}
+	}
+
+	/// <summary>
+	///   Implements the typeof operator
+	/// </summary>
+	public class TypeOf : Expression {
+		public readonly Expression QueriedType;
+		Type typearg;
+		
+		public TypeOf (Expression queried_type, Location l)
+		{
+			QueriedType = queried_type;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			typearg = ec.DeclSpace.ResolveType (QueriedType, false, loc);
+
+			if (typearg == null)
+				return null;
+
+			type = TypeManager.type_type;
+			eclass = ExprClass.Type;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldtoken, typearg);
+			ec.ig.Emit (OpCodes.Call, TypeManager.system_type_get_type_from_handle);
+		}
+
+		public Type TypeArg { 
+			get { return typearg; }
+		}
+	}
+
+	/// <summary>
+	///   Implements the sizeof expression
+	/// </summary>
+	public class SizeOf : Expression {
+		public readonly Expression QueriedType;
+		Type type_queried;
+		
+		public SizeOf (Expression queried_type, Location l)
+		{
+			this.QueriedType = queried_type;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type_queried = ec.DeclSpace.ResolveType (QueriedType, false, loc);
+			if (type_queried == null)
+				return null;
+
+			type = TypeManager.int32_type;
+			eclass = ExprClass.Value;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			int size = GetTypeSize (type_queried);
+
+			if (size == 0)
+				ec.ig.Emit (OpCodes.Sizeof, type_queried);
+			else
+				IntConstant.EmitInt (ec.ig, size);
+		}
+	}
+
+	/// <summary>
+	///   Implements the member access expression
+	/// </summary>
+	public class MemberAccess : Expression, ITypeExpression {
+		public readonly string Identifier;
+		Expression expr;
+		Expression member_lookup;
+		
+		public MemberAccess (Expression expr, string id, Location l)
+		{
+			this.expr = expr;
+			Identifier = id;
+			loc = l;
+		}
+
+		public Expression Expr {
+			get {
+				return expr;
+			}
+		}
+
+		static void error176 (Location loc, string name)
+		{
+			Report.Error (176, loc, "Static member `" +
+				      name + "' cannot be accessed " +
+				      "with an instance reference, qualify with a " +
+				      "type name instead");
+		}
+
+		static bool IdenticalNameAndTypeName (EmitContext ec, Expression left_original, Location loc)
+		{
+			if (left_original == null)
+				return false;
+
+			if (!(left_original is SimpleName))
+				return false;
+
+			SimpleName sn = (SimpleName) left_original;
+
+			Type t = RootContext.LookupType (ec.DeclSpace, sn.Name, true, loc);
+			if (t != null)
+				return true;
+
+			return false;
+		}
+		
+		public static Expression ResolveMemberAccess (EmitContext ec, Expression member_lookup,
+							      Expression left, Location loc,
+							      Expression left_original)
+		{
+			bool left_is_type, left_is_explicit;
+
+			// If `left' is null, then we're called from SimpleNameResolve and this is
+			// a member in the currently defining class.
+			if (left == null) {
+				left_is_type = ec.IsStatic || ec.IsFieldInitializer;
+				left_is_explicit = false;
+
+				// Implicitly default to `this' unless we're static.
+				if (!ec.IsStatic && !ec.IsFieldInitializer && !ec.InEnumContext)
+					left = ec.This;
+			} else {
+				left_is_type = left is TypeExpr;
+				left_is_explicit = true;
+			}
+
+			if (member_lookup is FieldExpr){
+				FieldExpr fe = (FieldExpr) member_lookup;
+				FieldInfo fi = fe.FieldInfo;
+				Type decl_type = fi.DeclaringType;
+				
+				if (fi is FieldBuilder) {
+					Const c = TypeManager.LookupConstant ((FieldBuilder) fi);
+					
+					if (c != null) {
+						object o = c.LookupConstantValue (ec);
+						object real_value = ((Constant) c.Expr).GetValue ();
+
+						return Constantify (real_value, fi.FieldType);
+					}
+				}
+
+				if (fi.IsLiteral) {
+					Type t = fi.FieldType;
+					
+					object o;
+
+					if (fi is FieldBuilder)
+						o = TypeManager.GetValue ((FieldBuilder) fi);
+					else
+						o = fi.GetValue (fi);
+					
+					if (decl_type.IsSubclassOf (TypeManager.enum_type)) {
+						Expression enum_member = MemberLookup (
+							ec, decl_type, "value__", MemberTypes.Field,
+							AllBindingFlags, loc); 
+
+						Enum en = TypeManager.LookupEnum (decl_type);
+
+						Constant c;
+						if (en != null)
+							c = Constantify (o, en.UnderlyingType);
+						else 
+							c = Constantify (o, enum_member.Type);
+						
+						return new EnumConstant (c, decl_type);
+					}
+					
+					Expression exp = Constantify (o, t);
+
+					if (left_is_explicit && !left_is_type) {
+						error176 (loc, fe.FieldInfo.Name);
+						return null;
+					}
+					
+					return exp;
+				}
+
+				if (fi.FieldType.IsPointer && !ec.InUnsafe){
+					UnsafeError (loc);
+					return null;
+				}
+			}
+
+			if (member_lookup is EventExpr) {
+
+				EventExpr ee = (EventExpr) member_lookup;
+				
+				//
+				// If the event is local to this class, we transform ourselves into
+				// a FieldExpr
+				//
+
+				if (ee.EventInfo.DeclaringType == ec.ContainerType) {
+					MemberInfo mi = GetFieldFromEvent (ee);
+
+					if (mi == null) {
+						//
+						// If this happens, then we have an event with its own
+						// accessors and private field etc so there's no need
+						// to transform ourselves : we should instead flag an error
+						//
+						Assign.error70 (ee.EventInfo, loc);
+						return null;
+					}
+
+					Expression ml = ExprClassFromMemberInfo (ec, mi, loc);
+					
+					if (ml == null) {
+						Report.Error (-200, loc, "Internal error!!");
+						return null;
+					}
+					
+					return ResolveMemberAccess (ec, ml, left, loc, left_original);
+				}
+			}
+			
+			if (member_lookup is IMemberExpr) {
+				IMemberExpr me = (IMemberExpr) member_lookup;
+
+				if (left_is_type){
+					if (!me.IsStatic){
+						if (IdenticalNameAndTypeName (ec, left_original, loc))
+							return member_lookup;
+
+						SimpleName.Error_ObjectRefRequired (ec, loc, me.Name);
+						return null;
+					}
+				} else {
+					if (!me.IsInstance){
+						if (IdenticalNameAndTypeName (ec, left_original, loc))
+							return member_lookup;
+
+						if (left_is_explicit) {
+							error176 (loc, me.Name);
+							return null;
+						}
+					}
+
+					//
+					// Since we can not check for instance objects in SimpleName,
+					// becaue of the rule that allows types and variables to share
+					// the name (as long as they can be de-ambiguated later, see 
+					// IdenticalNameAndTypeName), we have to check whether left 
+					// is an instance variable in a static context
+					//
+					// However, if the left-hand value is explicitly given, then
+					// it is already our instance expression, so we aren't in
+					// static context.
+					//
+
+					if (ec.IsStatic && !left_is_explicit && left is IMemberExpr){
+						IMemberExpr mexp = (IMemberExpr) left;
+
+						if (!mexp.IsStatic){
+							SimpleName.Error_ObjectRefRequired (ec, loc, mexp.Name);
+							return null;
+						}
+					}
+
+					me.InstanceExpression = left;
+				}
+
+				return member_lookup;
+			}
+
+			if (member_lookup is TypeExpr){
+				member_lookup.Resolve (ec, ResolveFlags.Type);
+				return member_lookup;
+			}
+			
+			Console.WriteLine ("Left is: " + left);
+			Report.Error (-100, loc, "Support for [" + member_lookup + "] is not present yet");
+			Environment.Exit (0);
+			return null;
+		}
+		
+		public Expression DoResolve (EmitContext ec, Expression right_side, ResolveFlags flags)
+		{
+			if (type != null)
+				throw new Exception ();
+			//
+			// Resolve the expression with flow analysis turned off, we'll do the definite
+			// assignment checks later.  This is because we don't know yet what the expression
+			// will resolve to - it may resolve to a FieldExpr and in this case we must do the
+			// definite assignment check on the actual field and not on the whole struct.
+			//
+
+			Expression original = expr;
+			expr = expr.Resolve (ec, flags | ResolveFlags.DisableFlowAnalysis);
+
+			if (expr == null)
+				return null;
+
+			if (expr is SimpleName){
+				SimpleName child_expr = (SimpleName) expr;
+				
+				Expression new_expr = new SimpleName (child_expr.Name + "." + Identifier, loc);
+
+				return new_expr.Resolve (ec, flags);
+			}
+					
+			//
+			// TODO: I mailed Ravi about this, and apparently we can get rid
+			// of this and put it in the right place.
+			// 
+			// Handle enums here when they are in transit.
+			// Note that we cannot afford to hit MemberLookup in this case because
+			// it will fail to find any members at all
+			//
+
+			int errors = Report.Errors;
+			
+			Type expr_type = expr.Type;
+			if ((expr is TypeExpr) && (expr_type.IsSubclassOf (TypeManager.enum_type))){
+				
+				Enum en = TypeManager.LookupEnum (expr_type);
+				
+				if (en != null) {
+					object value = en.LookupEnumValue (ec, Identifier, loc);
+
+					if (value != null){
+						Constant c = Constantify (value, en.UnderlyingType);
+						return new EnumConstant (c, expr_type);
+					}
+				}
+			}
+
+			if (expr_type.IsPointer){
+				Error (23, "The `.' operator can not be applied to pointer operands (" +
+				       TypeManager.CSharpName (expr_type) + ")");
+				return null;
+			}
+
+			member_lookup = MemberLookup (ec, expr_type, Identifier, loc);
+
+			if (member_lookup == null){
+				// Error has already been reported.
+				if (errors < Report.Errors)
+					return null;
+
+				//
+				// Try looking the member up from the same type, if we find
+				// it, we know that the error was due to limited visibility
+				//
+				object lookup = TypeManager.MemberLookup (
+					expr_type, expr_type, AllMemberTypes, AllBindingFlags, Identifier);
+				if (lookup == null)
+					Error (117, "`" + expr_type + "' does not contain a " +
+					       "definition for `" + Identifier + "'");
+				else if ((expr_type != ec.ContainerType) &&
+					 ec.ContainerType.IsSubclassOf (expr_type)){
+
+					// Although a derived class can access protected members of
+					// its base class it cannot do so through an instance of the
+					// base class (CS1540).  If the expr_type is a parent of the
+					// ec.ContainerType and the lookup succeeds with the latter one,
+					// then we are in this situation.
+
+					lookup = TypeManager.MemberLookup (
+						ec.ContainerType, ec.ContainerType, AllMemberTypes,
+						AllBindingFlags, Identifier);
+
+					if (lookup != null)
+						Error (1540, "Cannot access protected member `" +
+						       expr_type + "." + Identifier + "' " +
+						       "via a qualifier of type `" +
+						       TypeManager.CSharpName (expr_type) + "'; the " +
+						       "qualifier must be of type `" +
+						       TypeManager.CSharpName (ec.ContainerType) + "' " +
+						       "(or derived from it)");
+					else
+						Error (122, "`" + expr_type + "." + Identifier + "' " +
+						       "is inaccessible because of its protection level");
+				} else
+					Error (122, "`" + expr_type + "." + Identifier + "' " +
+					       "is inaccessible because of its protection level");
+					      
+				return null;
+			}
+
+			if (member_lookup is TypeExpr){
+				member_lookup.Resolve (ec, ResolveFlags.Type);
+				return member_lookup;
+			} else if ((flags & ResolveFlags.MaskExprClass) == ResolveFlags.Type)
+				return null;
+			
+			member_lookup = ResolveMemberAccess (ec, member_lookup, expr, loc, original);
+			if (member_lookup == null)
+				return null;
+
+			// The following DoResolve/DoResolveLValue will do the definite assignment
+			// check.
+
+			if (right_side != null)
+				member_lookup = member_lookup.DoResolveLValue (ec, right_side);
+			else
+				member_lookup = member_lookup.DoResolve (ec);
+
+			return member_lookup;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return DoResolve (ec, null, ResolveFlags.VariableOrValue |
+					  ResolveFlags.SimpleName | ResolveFlags.Type);
+		}
+
+		public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			return DoResolve (ec, right_side, ResolveFlags.VariableOrValue |
+					  ResolveFlags.SimpleName | ResolveFlags.Type);
+		}
+
+		public Expression DoResolveType (EmitContext ec)
+		{
+			return DoResolve (ec, null, ResolveFlags.Type);
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should not happen");
+		}
+
+		public override string ToString ()
+		{
+			return expr + "." + Identifier;
+		}
+	}
+
+	/// <summary>
+	///   Implements checked expressions
+	/// </summary>
+	public class CheckedExpr : Expression {
+
+		public Expression Expr;
+
+		public CheckedExpr (Expression e, Location l)
+		{
+			Expr = e;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			bool last_const_check = ec.ConstantCheckState;
+
+			ec.ConstantCheckState = true;
+			Expr = Expr.Resolve (ec);
+			ec.ConstantCheckState = last_const_check;
+			
+			if (Expr == null)
+				return null;
+
+			eclass = Expr.eclass;
+			type = Expr.Type;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			bool last_check = ec.CheckState;
+			bool last_const_check = ec.ConstantCheckState;
+			
+			ec.CheckState = true;
+			ec.ConstantCheckState = true;
+			Expr.Emit (ec);
+			ec.CheckState = last_check;
+			ec.ConstantCheckState = last_const_check;
+		}
+		
+	}
+
+	/// <summary>
+	///   Implements the unchecked expression
+	/// </summary>
+	public class UnCheckedExpr : Expression {
+
+		public Expression Expr;
+
+		public UnCheckedExpr (Expression e, Location l)
+		{
+			Expr = e;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			bool last_const_check = ec.ConstantCheckState;
+
+			ec.ConstantCheckState = false;
+			Expr = Expr.Resolve (ec);
+			ec.ConstantCheckState = last_const_check;
+
+			if (Expr == null)
+				return null;
+
+			eclass = Expr.eclass;
+			type = Expr.Type;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			bool last_check = ec.CheckState;
+			bool last_const_check = ec.ConstantCheckState;
+			
+			ec.CheckState = false;
+			ec.ConstantCheckState = false;
+			Expr.Emit (ec);
+			ec.CheckState = last_check;
+			ec.ConstantCheckState = last_const_check;
+		}
+		
+	}
+
+	/// <summary>
+	///   An Element Access expression.
+	///
+	///   During semantic analysis these are transformed into 
+	///   IndexerAccess or ArrayAccess 
+	/// </summary>
+	public class ElementAccess : Expression {
+		public ArrayList  Arguments;
+		public Expression Expr;
+		
+		public ElementAccess (Expression e, ArrayList e_list, Location l)
+		{
+			Expr = e;
+
+			loc  = l;
+			
+			if (e_list == null)
+				return;
+			
+			Arguments = new ArrayList ();
+			foreach (Expression tmp in e_list)
+				Arguments.Add (new Argument (tmp, Argument.AType.Expression));
+			
+		}
+
+		bool CommonResolve (EmitContext ec)
+		{
+			Expr = Expr.Resolve (ec);
+
+			if (Expr == null) 
+				return false;
+
+			if (Arguments == null)
+				return false;
+
+			foreach (Argument a in Arguments){
+				if (!a.Resolve (ec, loc))
+					return false;
+			}
+
+			return true;
+		}
+
+		Expression MakePointerAccess ()
+		{
+			Type t = Expr.Type;
+
+			if (t == TypeManager.void_ptr_type){
+				Error (
+					242,
+					"The array index operation is not valid for void pointers");
+				return null;
+			}
+			if (Arguments.Count != 1){
+				Error (
+					196,
+					"A pointer must be indexed by a single value");
+				return null;
+			}
+			Expression p = new PointerArithmetic (true, Expr, ((Argument)Arguments [0]).Expr,
+							      t, loc);
+			return new Indirection (p, loc);
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			if (!CommonResolve (ec))
+				return null;
+
+			//
+			// We perform some simple tests, and then to "split" the emit and store
+			// code we create an instance of a different class, and return that.
+			//
+			// I am experimenting with this pattern.
+			//
+			Type t = Expr.Type;
+
+			if (t.IsArray)
+				return (new ArrayAccess (this, loc)).Resolve (ec);
+			else if (t.IsPointer)
+				return MakePointerAccess ();
+			else
+				return (new IndexerAccess (this, loc)).Resolve (ec);
+		}
+
+		public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			if (!CommonResolve (ec))
+				return null;
+
+			Type t = Expr.Type;
+			if (t.IsArray)
+				return (new ArrayAccess (this, loc)).ResolveLValue (ec, right_side);
+			else if (t.IsPointer)
+				return MakePointerAccess ();
+			else
+				return (new IndexerAccess (this, loc)).ResolveLValue (ec, right_side);
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should never be reached");
+		}
+	}
+
+	/// <summary>
+	///   Implements array access 
+	/// </summary>
+	public class ArrayAccess : Expression, IAssignMethod, IMemoryLocation {
+		//
+		// Points to our "data" repository
+		//
+		ElementAccess ea;
+
+		LocalTemporary [] cached_locations;
+		
+		public ArrayAccess (ElementAccess ea_data, Location l)
+		{
+			ea = ea_data;
+			eclass = ExprClass.Variable;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			ExprClass eclass = ea.Expr.eclass;
+
+#if false
+			// As long as the type is valid
+			if (!(eclass == ExprClass.Variable || eclass == ExprClass.PropertyAccess ||
+			      eclass == ExprClass.Value)) {
+				ea.Expr.Error118 ("variable or value");
+				return null;
+			}
+#endif
+
+			Type t = ea.Expr.Type;
+			if (t.GetArrayRank () != ea.Arguments.Count){
+				ea.Error (22,
+					  "Incorrect number of indexes for array " +
+					  " expected: " + t.GetArrayRank () + " got: " +
+					  ea.Arguments.Count);
+				return null;
+			}
+			type = TypeManager.TypeToCoreType (t.GetElementType ());
+			if (type.IsPointer && !ec.InUnsafe){
+				UnsafeError (ea.Location);
+				return null;
+			}
+
+			foreach (Argument a in ea.Arguments){
+				Type argtype = a.Type;
+
+				if (argtype == TypeManager.int32_type ||
+				    argtype == TypeManager.uint32_type ||
+				    argtype == TypeManager.int64_type ||
+				    argtype == TypeManager.uint64_type)
+					continue;
+
+				//
+				// Mhm.  This is strage, because the Argument.Type is not the same as
+				// Argument.Expr.Type: the value changes depending on the ref/out setting.
+				//
+				// Wonder if I will run into trouble for this.
+				//
+				a.Expr = ExpressionToArrayArgument (ec, a.Expr, ea.Location);
+				if (a.Expr == null)
+					return null;
+			}
+			
+			eclass = ExprClass.Variable;
+
+			return this;
+		}
+
+		/// <summary>
+		///    Emits the right opcode to load an object of Type `t'
+		///    from an array of T
+		/// </summary>
+		static public void EmitLoadOpcode (ILGenerator ig, Type type)
+		{
+			if (type == TypeManager.byte_type || type == TypeManager.bool_type)
+				ig.Emit (OpCodes.Ldelem_U1);
+			else if (type == TypeManager.sbyte_type)
+				ig.Emit (OpCodes.Ldelem_I1);
+			else if (type == TypeManager.short_type)
+				ig.Emit (OpCodes.Ldelem_I2);
+			else if (type == TypeManager.ushort_type || type == TypeManager.char_type)
+				ig.Emit (OpCodes.Ldelem_U2);
+			else if (type == TypeManager.int32_type)
+				ig.Emit (OpCodes.Ldelem_I4);
+			else if (type == TypeManager.uint32_type)
+				ig.Emit (OpCodes.Ldelem_U4);
+			else if (type == TypeManager.uint64_type)
+				ig.Emit (OpCodes.Ldelem_I8);
+			else if (type == TypeManager.int64_type)
+				ig.Emit (OpCodes.Ldelem_I8);
+			else if (type == TypeManager.float_type)
+				ig.Emit (OpCodes.Ldelem_R4);
+			else if (type == TypeManager.double_type)
+				ig.Emit (OpCodes.Ldelem_R8);
+			else if (type == TypeManager.intptr_type)
+				ig.Emit (OpCodes.Ldelem_I);
+			else if (type.IsValueType){
+				ig.Emit (OpCodes.Ldelema, type);
+				ig.Emit (OpCodes.Ldobj, type);
+			} else 
+				ig.Emit (OpCodes.Ldelem_Ref);
+		}
+
+		/// <summary>
+		///    Emits the right opcode to store an object of Type `t'
+		///    from an array of T.  
+		/// </summary>
+		static public void EmitStoreOpcode (ILGenerator ig, Type t)
+		{
+			t = TypeManager.TypeToCoreType (t);
+			if (t == TypeManager.byte_type || t == TypeManager.sbyte_type ||
+			    t == TypeManager.bool_type)
+				ig.Emit (OpCodes.Stelem_I1);
+			else if (t == TypeManager.short_type || t == TypeManager.ushort_type || t == TypeManager.char_type)
+				ig.Emit (OpCodes.Stelem_I2);
+			else if (t == TypeManager.int32_type || t == TypeManager.uint32_type)
+				ig.Emit (OpCodes.Stelem_I4);
+			else if (t == TypeManager.int64_type || t == TypeManager.uint64_type)
+				ig.Emit (OpCodes.Stelem_I8);
+			else if (t == TypeManager.float_type)
+				ig.Emit (OpCodes.Stelem_R4);
+			else if (t == TypeManager.double_type)
+				ig.Emit (OpCodes.Stelem_R8);
+			else if (t == TypeManager.intptr_type)
+				ig.Emit (OpCodes.Stelem_I);
+			else if (t.IsValueType)
+				ig.Emit (OpCodes.Stobj, t);
+			else
+				ig.Emit (OpCodes.Stelem_Ref);
+		}
+
+		MethodInfo FetchGetMethod ()
+		{
+			ModuleBuilder mb = CodeGen.ModuleBuilder;
+			int arg_count = ea.Arguments.Count;
+			Type [] args = new Type [arg_count];
+			MethodInfo get;
+			
+			for (int i = 0; i < arg_count; i++){
+				//args [i++] = a.Type;
+				args [i] = TypeManager.int32_type;
+			}
+			
+			get = mb.GetArrayMethod (
+				ea.Expr.Type, "Get",
+				CallingConventions.HasThis |
+				CallingConventions.Standard,
+				type, args);
+			return get;
+		}
+				
+
+		MethodInfo FetchAddressMethod ()
+		{
+			ModuleBuilder mb = CodeGen.ModuleBuilder;
+			int arg_count = ea.Arguments.Count;
+			Type [] args = new Type [arg_count];
+			MethodInfo address;
+			string ptr_type_name;
+			Type ret_type;
+			
+			ptr_type_name = type.FullName + "&";
+			ret_type = Type.GetType (ptr_type_name);
+			
+			//
+			// It is a type defined by the source code we are compiling
+			//
+			if (ret_type == null){
+				ret_type = mb.GetType (ptr_type_name);
+			}
+
+			for (int i = 0; i < arg_count; i++){
+				//args [i++] = a.Type;
+				args [i] = TypeManager.int32_type;
+			}
+			
+			address = mb.GetArrayMethod (
+				ea.Expr.Type, "Address",
+				CallingConventions.HasThis |
+				CallingConventions.Standard,
+				ret_type, args);
+
+			return address;
+		}
+
+		//
+		// Load the array arguments into the stack.
+		//
+		// If we have been requested to cache the values (cached_locations array
+		// initialized), then load the arguments the first time and store them
+		// in locals.  otherwise load from local variables.
+		//
+		void LoadArrayAndArguments (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			if (cached_locations == null){
+				ea.Expr.Emit (ec);
+				foreach (Argument a in ea.Arguments){
+					Type argtype = a.Expr.Type;
+					
+					a.Expr.Emit (ec);
+					
+					if (argtype == TypeManager.int64_type)
+						ig.Emit (OpCodes.Conv_Ovf_I);
+					else if (argtype == TypeManager.uint64_type)
+						ig.Emit (OpCodes.Conv_Ovf_I_Un);
+				}
+				return;
+			}
+
+			if (cached_locations [0] == null){
+				cached_locations [0] = new LocalTemporary (ec, ea.Expr.Type);
+				ea.Expr.Emit (ec);
+				ig.Emit (OpCodes.Dup);
+				cached_locations [0].Store (ec);
+				
+				int j = 1;
+				
+				foreach (Argument a in ea.Arguments){
+					Type argtype = a.Expr.Type;
+					
+					cached_locations [j] = new LocalTemporary (ec, TypeManager.intptr_type /* a.Expr.Type */);
+					a.Expr.Emit (ec);
+					if (argtype == TypeManager.int64_type)
+						ig.Emit (OpCodes.Conv_Ovf_I);
+					else if (argtype == TypeManager.uint64_type)
+						ig.Emit (OpCodes.Conv_Ovf_I_Un);
+
+					ig.Emit (OpCodes.Dup);
+					cached_locations [j].Store (ec);
+					j++;
+				}
+				return;
+			}
+
+			foreach (LocalTemporary lt in cached_locations)
+				lt.Emit (ec);
+		}
+
+		public new void CacheTemporaries (EmitContext ec)
+		{
+			cached_locations = new LocalTemporary [ea.Arguments.Count + 1];
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			int rank = ea.Expr.Type.GetArrayRank ();
+			ILGenerator ig = ec.ig;
+
+			LoadArrayAndArguments (ec);
+			
+			if (rank == 1)
+				EmitLoadOpcode (ig, type);
+			else {
+				MethodInfo method;
+				
+				method = FetchGetMethod ();
+				ig.Emit (OpCodes.Call, method);
+			}
+		}
+
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			int rank = ea.Expr.Type.GetArrayRank ();
+			ILGenerator ig = ec.ig;
+			Type t = source.Type;
+
+			LoadArrayAndArguments (ec);
+
+			//
+			// The stobj opcode used by value types will need
+			// an address on the stack, not really an array/array
+			// pair
+			//
+			if (rank == 1){
+				if (t.IsValueType && !TypeManager.IsBuiltinType (t))
+					ig.Emit (OpCodes.Ldelema, t);
+			}
+			
+			source.Emit (ec);
+
+			if (rank == 1)
+				EmitStoreOpcode (ig, t);
+			else {
+				ModuleBuilder mb = CodeGen.ModuleBuilder;
+				int arg_count = ea.Arguments.Count;
+				Type [] args = new Type [arg_count + 1];
+				MethodInfo set;
+				
+				for (int i = 0; i < arg_count; i++){
+					//args [i++] = a.Type;
+					args [i] = TypeManager.int32_type;
+				}
+
+				args [arg_count] = type;
+				
+				set = mb.GetArrayMethod (
+					ea.Expr.Type, "Set",
+					CallingConventions.HasThis |
+					CallingConventions.Standard,
+					TypeManager.void_type, args);
+				
+				ig.Emit (OpCodes.Call, set);
+			}
+		}
+
+		public void AddressOf (EmitContext ec, AddressOp mode)
+		{
+			int rank = ea.Expr.Type.GetArrayRank ();
+			ILGenerator ig = ec.ig;
+
+			LoadArrayAndArguments (ec);
+
+			if (rank == 1){
+				ig.Emit (OpCodes.Ldelema, type);
+			} else {
+				MethodInfo address = FetchAddressMethod ();
+				ig.Emit (OpCodes.Call, address);
+			}
+		}
+	}
+
+	
+	class Indexers {
+		public ArrayList getters, setters;
+		static Hashtable map;
+
+		static Indexers ()
+		{
+			map = new Hashtable ();
+		}
+
+		Indexers (MemberInfo [] mi)
+		{
+			foreach (PropertyInfo property in mi){
+				MethodInfo get, set;
+				
+				get = property.GetGetMethod (true);
+				if (get != null){
+					if (getters == null)
+						getters = new ArrayList ();
+
+					getters.Add (get);
+				}
+				
+				set = property.GetSetMethod (true);
+				if (set != null){
+					if (setters == null)
+						setters = new ArrayList ();
+					setters.Add (set);
+				}
+			}
+		}
+
+		static private Indexers GetIndexersForTypeOrInterface (Type caller_type, Type lookup_type)
+		{
+			Indexers ix = (Indexers) map [lookup_type];
+			
+			if (ix != null)
+				return ix;
+
+			string p_name = TypeManager.IndexerPropertyName (lookup_type);
+
+			MemberInfo [] mi = TypeManager.MemberLookup (
+				caller_type, lookup_type, MemberTypes.Property,
+				BindingFlags.Public | BindingFlags.Instance, p_name);
+
+			if (mi == null || mi.Length == 0)
+				return null;
+
+			ix = new Indexers (mi);
+			map [lookup_type] = ix;
+
+			return ix;
+		}
+		
+		static public Indexers GetIndexersForType (Type caller_type, Type lookup_type, Location loc) 
+		{
+			Indexers ix = (Indexers) map [lookup_type];
+			
+			if (ix != null)
+				return ix;
+
+			ix = GetIndexersForTypeOrInterface (caller_type, lookup_type);
+			if (ix != null)
+				return ix;
+
+			Type [] ifaces = TypeManager.GetInterfaces (lookup_type);
+			if (ifaces != null) {
+				foreach (Type itype in ifaces) {
+					ix = GetIndexersForTypeOrInterface (caller_type, itype);
+					if (ix != null)
+						return ix;
+				}
+			}
+
+			Report.Error (21, loc,
+				      "Type `" + TypeManager.CSharpName (lookup_type) +
+				      "' does not have any indexers defined");
+			return null;
+		}
+	}
+
+	/// <summary>
+	///   Expressions that represent an indexer call.
+	/// </summary>
+	public class IndexerAccess : Expression, IAssignMethod {
+		//
+		// Points to our "data" repository
+		//
+		ElementAccess ea;
+		MethodInfo get, set;
+		Indexers ilist;
+		ArrayList set_arguments;
+		
+		public IndexerAccess (ElementAccess ea_data, Location l)
+		{
+			ea = ea_data;
+			eclass = ExprClass.Value;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Type indexer_type = ea.Expr.Type;
+			
+			//
+			// Step 1: Query for all `Item' *properties*.  Notice
+			// that the actual methods are pointed from here.
+			//
+			// This is a group of properties, piles of them.  
+
+			if (ilist == null)
+				ilist = Indexers.GetIndexersForType (
+					ec.ContainerType, indexer_type, ea.Location);
+
+
+			//
+			// Step 2: find the proper match
+			//
+			if (ilist != null && ilist.getters != null && ilist.getters.Count > 0){
+				Location loc = ea.Location;
+				
+				get = (MethodInfo) Invocation.OverloadResolve (
+					ec, new MethodGroupExpr (ilist.getters, loc), ea.Arguments, loc);
+			}
+
+			if (get == null){
+				ea.Error (154, "indexer can not be used in this context, because " +
+					  "it lacks a `get' accessor");
+				return null;
+			}
+
+			type = get.ReturnType;
+			if (type.IsPointer && !ec.InUnsafe){
+				UnsafeError (ea.Location);
+				return null;
+			}
+			
+			eclass = ExprClass.IndexerAccess;
+			return this;
+		}
+
+		public override Expression DoResolveLValue (EmitContext ec, Expression right_side)
+		{
+			Type indexer_type = ea.Expr.Type;
+			Type right_type = right_side.Type;
+
+			if (ilist == null)
+				ilist = Indexers.GetIndexersForType (
+					ec.ContainerType, indexer_type, ea.Location);
+
+			if (ilist != null && ilist.setters != null && ilist.setters.Count > 0){
+				Location loc = ea.Location;
+				
+				set_arguments = (ArrayList) ea.Arguments.Clone ();
+				set_arguments.Add (new Argument (right_side, Argument.AType.Expression));
+
+				set = (MethodInfo) Invocation.OverloadResolve (
+					ec, new MethodGroupExpr (ilist.setters, loc), set_arguments, loc);
+			}
+			
+			if (set == null){
+				ea.Error (200, "indexer X.this [" + TypeManager.CSharpName (right_type) +
+					  "] lacks a `set' accessor");
+				return null;
+			}
+
+			type = TypeManager.void_type;
+			eclass = ExprClass.IndexerAccess;
+			return this;
+		}
+		
+		public override void Emit (EmitContext ec)
+		{
+			Invocation.EmitCall (ec, false, false, ea.Expr, get, ea.Arguments, ea.Location);
+		}
+
+		//
+		// source is ignored, because we already have a copy of it from the
+		// LValue resolution and we have already constructed a pre-cached
+		// version of the arguments (ea.set_arguments);
+		//
+		public void EmitAssign (EmitContext ec, Expression source)
+		{
+			Invocation.EmitCall (ec, false, false, ea.Expr, set, set_arguments, ea.Location);
+		}
+	}
+
+	/// <summary>
+	///   The base operator for method names
+	/// </summary>
+	public class BaseAccess : Expression {
+		string member;
+		
+		public BaseAccess (string member, Location l)
+		{
+			this.member = member;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Expression member_lookup;
+			Type current_type = ec.ContainerType;
+			Type base_type = current_type.BaseType;
+			Expression e;
+
+			if (ec.IsStatic){
+				Error (1511,
+					      "Keyword base is not allowed in static method");
+				return null;
+			}
+			
+			member_lookup = MemberLookup (ec, base_type, base_type, member,
+						      AllMemberTypes, AllBindingFlags, loc);
+			if (member_lookup == null) {
+				Error (117,
+					      TypeManager.CSharpName (base_type) + " does not " +
+					      "contain a definition for `" + member + "'");
+				return null;
+			}
+
+			Expression left;
+			
+			if (ec.IsStatic)
+				left = new TypeExpr (base_type, loc);
+			else
+				left = ec.This;
+			
+			e = MemberAccess.ResolveMemberAccess (ec, member_lookup, left, loc, null);
+
+			if (e is PropertyExpr){
+				PropertyExpr pe = (PropertyExpr) e;
+
+				pe.IsBase = true;
+			}
+
+			return e;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should never be called"); 
+		}
+	}
+
+	/// <summary>
+	///   The base indexer operator
+	/// </summary>
+	public class BaseIndexerAccess : Expression {
+		ArrayList Arguments;
+		
+		public BaseIndexerAccess (ArrayList args, Location l)
+		{
+			Arguments = args;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			Type current_type = ec.ContainerType;
+			Type base_type = current_type.BaseType;
+			Expression member_lookup;
+
+			if (ec.IsStatic){
+				Error (1511,
+					      "Keyword base is not allowed in static method");
+				return null;
+			}
+			
+			member_lookup = MemberLookup (ec, base_type, base_type, "get_Item",
+						      MemberTypes.Method, AllBindingFlags, loc);
+			if (member_lookup == null)
+				return null;
+
+			return MemberAccess.ResolveMemberAccess (ec, member_lookup, ec.This, loc, null);
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("Should never be called");
+		}
+	}
+	
+	/// <summary>
+	///   This class exists solely to pass the Type around and to be a dummy
+	///   that can be passed to the conversion functions (this is used by
+	///   foreach implementation to typecast the object return value from
+	///   get_Current into the proper type.  All code has been generated and
+	///   we only care about the side effect conversions to be performed
+	///
+	///   This is also now used as a placeholder where a no-action expression
+	///   is needed (the `New' class).
+	/// </summary>
+	public class EmptyExpression : Expression {
+		public EmptyExpression ()
+		{
+			type = TypeManager.object_type;
+			eclass = ExprClass.Value;
+			loc = Location.Null;
+		}
+
+		public EmptyExpression (Type t)
+		{
+			type = t;
+			eclass = ExprClass.Value;
+			loc = Location.Null;
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			// nothing, as we only exist to not do anything.
+		}
+
+		//
+		// This is just because we might want to reuse this bad boy
+		// instead of creating gazillions of EmptyExpressions.
+		// (CanConvertImplicit uses it)
+		//
+		public void SetType (Type t)
+		{
+			type = t;
+		}
+	}
+
+	public class UserCast : Expression {
+		MethodBase method;
+		Expression source;
+		
+		public UserCast (MethodInfo method, Expression source, Location l)
+		{
+			this.method = method;
+			this.source = source;
+			type = method.ReturnType;
+			eclass = ExprClass.Value;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// We are born fully resolved
+			//
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			source.Emit (ec);
+			
+			if (method is MethodInfo)
+				ig.Emit (OpCodes.Call, (MethodInfo) method);
+			else
+				ig.Emit (OpCodes.Call, (ConstructorInfo) method);
+
+		}
+	}
+
+	// <summary>
+	//   This class is used to "construct" the type during a typecast
+	//   operation.  Since the Type.GetType class in .NET can parse
+	//   the type specification, we just use this to construct the type
+	//   one bit at a time.
+	// </summary>
+	public class ComposedCast : Expression, ITypeExpression {
+		Expression left;
+		string dim;
+		
+		public ComposedCast (Expression left, string dim, Location l)
+		{
+			this.left = left;
+			this.dim = dim;
+			loc = l;
+		}
+
+		public Expression DoResolveType (EmitContext ec)
+		{
+			left = left.Resolve (ec, ResolveFlags.Type);
+			if (left == null)
+				return null;
+
+			type = RootContext.LookupType (
+				ec.DeclSpace, left.Type.FullName + dim, false, loc);
+			if (type == null)
+				return null;
+
+			if (!ec.ResolvingTypeTree){
+				//
+				// If the above flag is set, this is being invoked from the ResolveType function.
+				// Upper layers take care of the type validity in this context.
+				//
+			if (!ec.InUnsafe && type.IsPointer){
+				UnsafeError (loc);
+				return null;
+			}
+			}
+			
+			eclass = ExprClass.Type;
+			return this;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			return DoResolveType (ec);
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			throw new Exception ("This should never be called");
+		}
+
+		public override string ToString ()
+		{
+			return left + dim;
+		}
+	}
+
+	//
+	// This class is used to represent the address of an array, used
+	// only by the Fixed statement, this is like the C "&a [0]" construct.
+	//
+	public class ArrayPtr : Expression {
+		Expression array;
+		
+		public ArrayPtr (Expression array, Location l)
+		{
+			Type array_type = array.Type.GetElementType ();
+
+			this.array = array;
+			
+			string array_ptr_type_name = array_type.FullName + "*";
+			
+			type = Type.GetType (array_ptr_type_name);
+			if (type == null){
+				ModuleBuilder mb = CodeGen.ModuleBuilder;
+				
+				type = mb.GetType (array_ptr_type_name);
+			}
+
+			eclass = ExprClass.Value;
+			loc = l;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			array.Emit (ec);
+			IntLiteral.EmitInt (ig, 0);
+			ig.Emit (OpCodes.Ldelema, array.Type.GetElementType ());
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// We are born fully resolved
+			//
+			return this;
+		}
+	}
+
+	//
+	// Used by the fixed statement
+	//
+	public class StringPtr : Expression {
+		LocalBuilder b;
+		
+		public StringPtr (LocalBuilder b, Location l)
+		{
+			this.b = b;
+			eclass = ExprClass.Value;
+			type = TypeManager.char_ptr_type;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			// This should never be invoked, we are born in fully
+			// initialized state.
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			ig.Emit (OpCodes.Ldloc, b);
+			ig.Emit (OpCodes.Conv_I);
+			ig.Emit (OpCodes.Call, TypeManager.int_get_offset_to_string_data);
+			ig.Emit (OpCodes.Add);
+		}
+	}
+	
+	//
+	// Implements the `stackalloc' keyword
+	//
+	public class StackAlloc : Expression {
+		Type otype;
+		Expression t;
+		Expression count;
+		
+		public StackAlloc (Expression type, Expression count, Location l)
+		{
+			t = type;
+			this.count = count;
+			loc = l;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			count = count.Resolve (ec);
+			if (count == null)
+				return null;
+			
+			if (count.Type != TypeManager.int32_type){
+				count = ConvertImplicitRequired (ec, count, TypeManager.int32_type, loc);
+				if (count == null)
+					return null;
+			}
+
+			if (ec.InCatch || ec.InFinally){
+				Error (255,
+					      "stackalloc can not be used in a catch or finally block");
+				return null;
+			}
+
+			otype = ec.DeclSpace.ResolveType (t, false, loc);
+
+			if (otype == null)
+				return null;
+
+			if (!TypeManager.VerifyUnManaged (otype, loc))
+				return null;
+
+			string ptr_name = otype.FullName + "*";
+			type = Type.GetType (ptr_name);
+			if (type == null){
+				ModuleBuilder mb = CodeGen.ModuleBuilder;
+				
+				type = mb.GetType (ptr_name);
+			}
+			eclass = ExprClass.Value;
+
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			int size = GetTypeSize (otype);
+			ILGenerator ig = ec.ig;
+				
+			if (size == 0)
+				ig.Emit (OpCodes.Sizeof, otype);
+			else
+				IntConstant.EmitInt (ig, size);
+			count.Emit (ec);
+			ig.Emit (OpCodes.Mul);
+			ig.Emit (OpCodes.Localloc);
+		}
+	}
+}
diff --git a/mcs/mcs/gen-il.cs b/mcs/mcs/gen-il.cs
new file mode 100755
index 00000000000..2dfeecc974c
--- /dev/null
+++ b/mcs/mcs/gen-il.cs
@@ -0,0 +1,100 @@
+// gen-il.cs: Generates MSIL code from the CIR.Tree
+//
+// Author: Miguel de Icaza (miguel@ximian.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc. (http://www.ximian.com)
+//
+
+using System;
+using System.IO;
+using System.Collections;
+using CIR;
+
+namespace MSIL {
+
+	public class Generator : CIR.ITreeDump {
+		StreamWriter o;
+		int indent = 0;
+		
+		void output (string s)
+		{
+			Console.Write (s);
+			o.Write (s);
+		}
+
+		void space ()
+		{
+			output (new String (' ', indent * 2));
+		}
+
+		void ioutput (string s)
+		{
+			space ();
+			output (s);
+		}
+
+		void ioutputl (string s)
+		{
+			ioutput (s + "\n");
+		}
+
+		string ClassAttributes (Class c)
+		{
+			// FIXME
+			return "";
+		}
+
+		string ILName (string name)
+		{
+			return name;
+		}
+
+		string ClassExtends (Class c)
+		{
+			return "";
+		}
+		
+		void GenerateFromClass (Class c)
+		{
+			ioutputl (".class " + ClassAttributes (c) + " " + ILName (c.Name));
+			ioutputl (ClassExtends (c));
+			ioutputl ("{");
+			indent++;
+
+			
+
+			indent--;
+			ioutputl ("}");
+		}
+		
+		void GenerateFromTypes (TypeContainer types)
+		{
+			if (types.Types == null)
+				return;
+			
+			foreach (DictionaryEntry de in types.Types){
+				TypeContainer type = (TypeContainer) de.Value;
+				
+				if (type is Class)
+					GenerateFromClass ((Class) type);
+			}
+			
+		}
+		
+		public int GenerateFromTree (Tree tree, StreamWriter os)
+		{
+			this.o = os;
+
+			ioutputl (".assembly test.exe { }");
+			GenerateFromTypes (tree.Types);
+			return 0;
+		}
+
+		public void ParseOptions (string options)
+		{
+		}
+		
+	}
+}
diff --git a/mcs/mcs/gen-treedump.cs b/mcs/mcs/gen-treedump.cs
new file mode 100755
index 00000000000..8ad20e812d7
--- /dev/null
+++ b/mcs/mcs/gen-treedump.cs
@@ -0,0 +1,988 @@
+// cs-treedump.cs: Dumps the parsed tree to standard output
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc. (http://www.ximian.com)
+//
+// TODO:
+//	Variable declarations
+//      Fix precedence rules to lower the number of parenthesis.
+//
+
+using System;
+using System.IO;
+using System.Collections;
+using CIR;
+
+namespace Generator {
+	
+	public class TreeDump : CIR.ITreeDump {
+		StreamWriter o;
+		int indent;
+		bool indented;
+		bool tag_values;
+		
+		void space ()
+		{
+			if (!indented)
+				output (new String (' ', indent * 8));
+			indented = true;
+		}
+
+		void output (string s)
+		{
+			Console.Write (s);
+			//o.Write (s);
+		}
+
+		void newline ()
+		{
+			output ("\n");
+			indented = false;
+		}
+
+		void output_newline (string s)
+		{
+			output (s);
+			newline ();
+		}
+		
+		void ioutput (string s)
+		{
+			space ();
+			output (s);
+		}
+
+		string GetParameter (Parameter par)
+		{
+			Parameter.Modifier f = par.ModFlags;
+			string mod = "";
+			
+			switch (f){
+			case Parameter.Modifier.REF:
+				mod = "ref "; break;
+			case Parameter.Modifier.OUT:
+				mod = "out "; break;
+			case Parameter.Modifier.PARAMS:
+				mod = "params "; break;
+			case Parameter.Modifier.NONE:
+				mod = ""; break;
+			}
+			return mod + par.Type + " " + par.Name;
+		}
+
+		string GetUnary (Unary u, int paren_level)
+		{
+			string e;
+			bool left = true;
+			string s = "0_ERROR>";
+			int prec = 0;
+			
+			switch (u.Oper){
+			case Unary.Operator.UnaryPlus:
+				prec = 10;
+				s = "+";
+				break;
+				
+			case Unary.Operator.UnaryNegation:
+				prec = 10;
+				s = "-";
+				break;
+				
+			case Unary.Operator.LogicalNot:
+				s = "!";
+				prec = 10;
+				break;
+				
+			case Unary.Operator.OnesComplement:
+				prec = 10;
+				s = "~";
+				break;
+				
+			case Unary.Operator.Indirection:
+				prec = 10;
+				s = "*";
+				break;
+				
+			case Unary.Operator.AddressOf:
+				prec = 10;
+				s = "&";
+				break;
+				
+			case Unary.Operator.PreIncrement:
+				prec = 11;
+				s = "++";
+				break;
+				
+			case Unary.Operator.PreDecrement:
+				prec = 11;
+				s = "--";
+				break;
+				
+			case Unary.Operator.PostDecrement:
+				left = false;
+				prec = 12;
+				s = "--";
+				break;
+				
+			case Unary.Operator.PostIncrement:
+				s = "++";
+				prec = 12;
+				left = false;
+				break;
+			}
+
+			e = GetExpression (u.Expr, prec);
+			if (left)
+				e = s + e;
+			else
+				e = e + s;
+			
+			if (prec < paren_level)
+				return "(" + e + ")";
+			else
+				return e;
+		}
+
+		string GetBinary (Binary b, int paren_level)
+		{
+			string l, r;
+			string op = null;
+			bool assoc_left = true;
+			int prec = 0;
+			
+			switch (b.Oper){
+				case Binary.Operator.Multiply:
+					prec = 9;
+					op = "*"; break;
+
+			        case Binary.Operator.Division:
+					prec = 9;
+					op = "/"; break;
+				
+				case Binary.Operator.Modulus:
+					prec = 9;
+					op = "%"; break;
+				
+				case Binary.Operator.Addition:
+					prec = 8;
+					op = "+"; break;
+				
+				case Binary.Operator.Subtraction:
+					prec = 8;
+					op = "-"; break;
+				
+				case Binary.Operator.LeftShift:
+					prec = 7;
+					op = "<<"; break;
+				
+				case Binary.Operator.RightShift:
+					prec = 7;
+					op = ">>"; break;
+				
+				case Binary.Operator.LessThan:
+					prec = 6;
+					op = "<"; break;
+				
+				case Binary.Operator.GreaterThan:
+					prec = 6;
+					op = ">"; break;
+				
+				case Binary.Operator.LessThanOrEqual:
+					prec = 6;
+					op = "<="; break;
+				
+				case Binary.Operator.GreaterThanOrEqual:
+					prec = 6;
+					op = ">="; break;
+				
+				case Binary.Operator.Equality:
+					prec = 5;
+					op = "=="; break;
+				
+				case Binary.Operator.Inequality:
+					prec = 5;
+					op = "!="; break;
+				
+				case Binary.Operator.BitwiseAnd:
+					prec = 4;
+					op = "&"; break;
+				
+				case Binary.Operator.BitwiseOr:
+					prec = 2;
+					op = "|"; break;
+				
+				case Binary.Operator.LogicalAnd:
+					prec = 1;
+					op = "&&"; break;
+				
+				case Binary.Operator.LogicalOr:
+					prec = 0;
+					op = "||"; break;
+				
+				case Binary.Operator.ExclusiveOr:
+					prec = 3;
+					op = "^"; break;
+			}
+
+			l = GetExpression (b.Left, prec - (assoc_left ? 0 : 1));
+			r = GetExpression (b.Right, prec - (assoc_left ? 0 : 1));
+			
+			if (prec <= paren_level)
+				return "(" + l + " " + op + " " + r + ")";
+			else
+				return l + " " + op + " " + r;
+		}
+
+		string GetCast (Cast c)
+		{
+			return "(" + c.TargetType + ") (" + GetExpression (c.Expr, 0) + ")";
+		}
+
+		string GetConditional (Conditional c)
+		{
+			return "(" + GetExpression (c.Expr, 0) + ") ? (" +
+				GetExpression (c.TrueExpr, 0) + ") : (" +
+				GetExpression (c.FalseExpr, 0) + ")";
+		}
+
+		string GetAssign (Assign a)
+		{
+			return GetExpression (a.Target, 0) + " = " + GetExpression (a.Source, 0);
+		}
+
+		string GetArguments (ArrayList args)
+		{
+			string r = "";
+			
+			if (args != null){
+				int top = args.Count;
+				
+				for (int i = 0; i < top; i++){
+					Argument arg = (Argument) args [i];
+						
+					switch (arg.ArgType){
+						case Argument.AType.Ref:
+							r += "ref "; break;
+						case Argument.AType.Out:
+							r += "out "; break;
+					}
+					r += GetExpression (arg.Expr, 0);
+
+					if (i+1 != top)
+						r += ", ";
+				}
+			}
+
+			return "(" + r + ")";
+		}
+		
+		string GetInvocation (Invocation i)
+		{
+			return GetExpression (i.Expr, 0) + " " + GetArguments (i.Arguments);
+		}
+
+		string GetNew (New n)
+		{
+			return "new " + n.RequestedType + GetArguments (n.Arguments);
+		}
+
+		string GetTypeOf (TypeOf t)
+		{
+			return "typeof (" + t.QueriedType + ")";
+		}
+
+		string GetSizeOf (SizeOf t)
+		{
+			return "sizeof (" + t.QueriedType + ")";
+		}
+
+		string GetMemberAccess (MemberAccess m)
+		{
+			return GetExpression (m.Expr, 0) +
+				(tag_values ? "/* member access */ . " : ".") +
+				m.Identifier;
+		}
+
+		string GetSimpleName (SimpleName n)
+		{
+			string s = n.Name;
+			
+			if (s.StartsWith ("0_"))
+				return "id_" + s;
+			else
+				return s;
+		}
+
+		string GetProbe (Probe p)
+		{
+			string s = GetExpression (p.Expr, 6);
+
+			if (p.Oper == CIR.Probe.Operator.Is)
+				s += " is ";
+			else if (p.Oper == CIR.Probe.Operator.As)
+				s += " as ";
+			else
+				s += "UNHANDLED";
+
+			s += p.ProbeType;
+
+			return s;
+		}
+
+		string GetLocalVariableReference (LocalVariableReference l)
+		{
+			if (tag_values)
+				return "/* local var: */" + l.Name;
+			else
+				return l.Name;
+		}
+
+		string GetParameterReference (ParameterReference r)
+		{
+			if (tag_values)
+				return "/* par: */ " + r.Name;
+			else
+				return r.Name;
+		}
+		
+		string GetExpression (Expression e, int paren_level)
+		{
+			if (e == null){
+				return "<NULL EXPRESSION>";
+			}
+			
+			if (e is Unary)
+				return GetUnary ((Unary) e, paren_level);
+			else if (e is Binary)
+				return GetBinary ((Binary) e, paren_level);
+			else if (e is Cast)
+				return GetCast ((Cast) e);
+			else if (e is Conditional)
+				return GetConditional ((Conditional) e);
+			else if (e is SimpleName)
+				return GetSimpleName ((SimpleName)e);
+			else if (e is LocalVariableReference)
+				return GetLocalVariableReference ((LocalVariableReference) e);
+			else if (e is ParameterReference)
+				return GetParameterReference ((ParameterReference) e);
+			else if (e is Assign)
+				return GetAssign ((Assign) e);
+			else if (e is Literal)
+				return e.ToString ();
+			else if (e is Invocation)
+				return GetInvocation ((Invocation) e);
+			else if (e is New)
+				return GetNew ((New) e);
+			else if (e is This)
+				return "this";
+			else if (e is TypeOf)
+				return GetTypeOf ((TypeOf) e);
+			else if (e is SizeOf)
+				return GetSizeOf ((SizeOf) e);
+			else if (e is MemberAccess)
+				return GetMemberAccess ((MemberAccess) e);
+			else if (e is Probe)
+				return GetProbe ((Probe) e);
+			else
+				return "WARNING {" + e.ToString () + "} WARNING";
+		}
+		
+		void GenerateParameters (Parameters pars)
+		{
+			Parameter [] pfixed;
+			Parameter parray;
+
+			pfixed = pars.FixedParameters;
+
+			if (pfixed != null){
+				for (int i = 0; i < pfixed.Length; i++){
+					output (GetParameter (pfixed [i]));
+					if (i+1 != pfixed.Length)
+						output (", ");
+				}
+			}
+
+			parray = pars.ArrayParameter;
+			if (parray != null){
+				output (GetParameter (parray));
+			}
+		}
+
+		void GenerateIf (If s)
+		{
+			bool do_indent;
+			
+			output ("if (" + GetExpression (s.Expr, 0) + ") ");
+			do_indent = !(s.TrueStatement is Block);
+			if (do_indent)
+				indent++;
+			GenerateStatement (s.TrueStatement, true, false, false);
+			if (do_indent)
+				indent--;
+			if (s.FalseStatement != null){
+				ioutput ("else");
+				newline ();
+				GenerateStatement (s.FalseStatement, false, true, false);
+			}
+		}
+
+		void GenerateDo (Do s)
+		{
+			output ("do"); newline ();
+			indent++;
+			GenerateStatement (s.EmbeddedStatement, false, false, false);
+			indent--;
+			output (" while (" + GetExpression (s.Expr, 0) + ");");
+			newline ();
+		}
+
+		void GenerateWhile (While s)
+		{
+			output ("while (" + GetExpression (s.Expr, 0) + ")");
+			GenerateStatement (s.Statement, true, true, false);
+		}
+
+		void GenerateFor (For s)
+		{
+			output ("for (");
+			if (! (s.InitStatement is EmptyStatement))
+				GenerateStatement (s.InitStatement, true, true, true);
+			output ("; ");
+			output (GetExpression (s.Test, 0));
+			output ("; ");
+			if (! (s.Increment is EmptyStatement))
+				GenerateStatement (s.Increment, true, true, true);
+			output (") ");
+			GenerateStatement (s.Statement, true, true, false);
+		}
+
+		void GenerateReturn (Return s)
+		{
+			output ("return " +
+				(s.Expr != null ?
+				 GetExpression (s.Expr, 0) : "" + ";") +
+				";");
+			newline ();
+		}
+
+		void GenerateGoto (Goto s)
+		{
+			output ("goto " + s.Target + ";");
+			newline ();
+		}
+
+		void GenerateThrow (Throw s)
+		{
+		}
+
+		void GenerateStatementExpression (StatementExpression s)
+		{
+			output (GetExpression (s.Expr, 0) + ";");
+			newline ();
+		}
+
+		void GenerateSwitchLabels (ArrayList labels)
+		{
+			foreach (SwitchLabel sl in labels){
+				Expression lab = sl.Label;
+				
+				if (lab == null){
+					ioutput ("default:");
+					newline ();
+				} else {
+					ioutput ("case " + GetExpression (lab, 0) + ":");
+					newline ();
+				}
+			}
+		}
+		
+		void GenerateSwitch (Switch s)
+		{
+			output_newline ("switch (" + GetExpression (s.Expr, 0) + ")");
+			foreach (SwitchSection ss in s.Sections){
+				GenerateSwitchLabels (ss.Labels);
+				GenerateBlock (ss.Block, false, false);
+			}
+		}
+		
+		void GenerateChecked (Checked c)
+		{
+			output ("checked ");
+			GenerateBlock (c.Block, false, false);
+		}
+
+		void GenerateUnchecked (Unchecked c)
+		{
+			output ("unchecked ");
+			GenerateBlock (c.Block, false, false);
+		}
+
+		void GenerateCatchClauses (ArrayList list)
+		{
+			foreach (Catch c in list){
+				space ();
+				output ("catch ");
+				
+				if (c.Type != null){
+					output ("(" + c.Type +
+						(c.Name != null ? " " + c.Name : "") + ")");
+				} 
+				GenerateBlock (c.Block, false, false);
+			}
+		}
+
+		void GenerateTry (Try t)
+		{
+			output ("try");
+			GenerateBlock (t.Block, false, false);
+
+			if (t.Specific != null){
+				GenerateCatchClauses (t.Specific);
+			}
+
+			if (t.General != null){
+				space ();
+				output ("catch");
+				GenerateBlock (t.Block, false, false);
+			}
+
+			if (t.Fini != null){
+				GenerateBlock (t.Fini, false, false);
+			}
+		}
+		
+		void GenerateStatement (Statement s, bool doPlacement, bool blockFlushesLine, bool embedded)
+		{
+			if (s == null){
+				output ("WARNING: got a null Statement");
+				newline ();
+				return;
+			}
+
+			if (doPlacement){
+				if (s is Block){
+					GenerateBlock ((Block) s, doPlacement, embedded);
+					return;
+				} else 
+					newline ();
+			} 
+				
+			space ();
+			if (s is If)
+				GenerateIf ((If) s);
+			else if (s is Do)
+				GenerateDo ((Do) s);
+			else if (s is While)
+				GenerateWhile ((While) s);
+			else if (s is For)
+				GenerateFor ((For) s);
+			else if (s is Return)
+				GenerateReturn ((Return) s);
+			else if (s is Goto)
+				GenerateGoto ((Goto) s);
+			else if (s is Throw)
+				GenerateThrow ((Throw) s);
+			else if (s is Break)
+				output_newline ("break;");
+			else if (s is Continue)
+				output_newline ("continue;");
+			else if (s is EmptyStatement)
+				output_newline ("/* empty statement */;");
+			else if (s is Block)
+				GenerateBlock ((Block) s, doPlacement, embedded);
+			else if (s is StatementExpression)
+				GenerateStatementExpression ((StatementExpression) s);
+			else if (s is Switch)
+				GenerateSwitch ((Switch) s);
+			else if (s is Checked)
+				GenerateChecked ((Checked) s);
+			else if (s is Unchecked)
+				GenerateUnchecked ((Unchecked) s);
+			else if (s is Try)
+				GenerateTry ((Try) s);
+			else {
+				System.Type t = s.GetType ();
+
+				output ("\n*****UNKNOWN Statement:" + t.ToString ());
+			}
+		}
+
+		//
+		// embedded is used only for things like the For thing
+		// that has blocks but for display purposes we want to keep
+		// without newlines.
+		void GenerateBlock (Block b, bool doPlacement, bool embedded)
+		{
+			if (b.Label != null)
+				output (b.Label + ":");
+
+			if (!b.Implicit){
+				if (!doPlacement)
+					space ();
+			
+				output ("{");
+				if (!embedded)
+					newline ();
+				indent++;
+			}
+
+			if (b.Variables != null){
+				foreach (DictionaryEntry entry in b.Variables){
+					VariableInfo vi = (VariableInfo) entry.Value;
+					
+					space ();
+					output_newline (
+						vi.Type + " " +
+						(string) entry.Key + ";");
+				}
+				newline ();
+			}
+			
+			foreach (Statement s in b.Statements){
+				GenerateStatement (s, false, true, false);
+			}
+			
+			if (!b.Implicit){
+				indent--;
+				ioutput ("}");
+				if (!embedded)
+					newline ();
+			}
+		}
+		
+		void GenerateMethod (Method m)
+		{
+			ioutput (GetModifiers (m.ModFlags) +
+				 m.ReturnType + " " +
+				 m.Name + " (");
+			GenerateParameters (m.Parameters);
+			output_newline (")");
+			
+
+			GenerateBlock (m.Block, false, false);
+			newline ();
+		}
+
+		void GenerateInterfaceMethod (InterfaceMethod imethod)
+		{
+			space ();
+			output (imethod.IsNew ? "new " : "");
+			output (imethod.ReturnType + " " + imethod.Name + " (");
+			GenerateParameters (imethod.Parameters);
+			output (");");
+			newline ();
+		}
+
+		void GenerateInterfaceProperty (InterfaceProperty iprop)
+		{
+			space ();
+			output (iprop.IsNew ? "new " : "");
+			output (iprop.Type + " " + iprop.Name + " { ");
+			if (iprop.HasGet) output ("get; ");
+			if (iprop.HasSet) output ("set; ");
+			output ("}");
+			newline ();
+		}
+		
+		void GenerateInterfaceEvent (InterfaceEvent ievent)
+		{
+			space ();
+			output ((ievent.IsNew ? "new " : "") + "event ");
+			output (ievent.Type + " " + ievent.Name + ";");
+			newline ();
+		}
+		
+		void GenerateInterfaceIndexer (InterfaceIndexer iindexer)
+		{
+			space ();
+			output (iindexer.IsNew ? "new " : "");
+			output (iindexer.Type + " this [");
+			output (iindexer.Parameters + "] {");
+			if (iindexer.HasGet) output ("get; ");
+			if (iindexer.HasSet) output ("set; ");
+			output ("}");
+			newline ();
+		}
+
+		string GenIfaceBases (Interface iface)
+		{
+			return GenBases (iface.Bases);
+		}
+		
+		void GenerateInterface (Interface iface)
+		{
+			ioutput (GetModifiers (iface.ModFlags) + "interface " +
+				 ClassName (iface.Name) + GenIfaceBases (iface) + " {");
+			newline ();
+			indent++;
+			
+			if (iface.InterfaceMethods != null){
+				foreach (DictionaryEntry de in iface.InterfaceMethods){
+					InterfaceMethod method = (InterfaceMethod) de.Value;
+					GenerateInterfaceMethod (method);
+				}
+			}
+
+			if (iface.InterfaceProperties != null){
+				foreach (DictionaryEntry de in iface.InterfaceProperties){
+					InterfaceProperty iprop = (InterfaceProperty) de.Value;
+					GenerateInterfaceProperty (iprop);
+				}
+			}
+
+			if (iface.InterfaceEvents != null){
+				foreach (DictionaryEntry de in iface.InterfaceEvents){
+					InterfaceEvent ievent = (InterfaceEvent) de.Value;
+					GenerateInterfaceEvent (ievent);
+				}
+			}
+
+			if (iface.InterfaceIndexers != null){
+				foreach (DictionaryEntry de in iface.InterfaceIndexers){
+					InterfaceIndexer iindexer = (InterfaceIndexer) de.Value;
+					GenerateInterfaceIndexer (iindexer);
+				}
+			}
+			indent--;
+			ioutput ("}");
+			newline ();
+			newline ();
+		}
+
+		void GenerateField (Field f)
+		{
+			space ();
+			output (GetModifiers (f.ModFlags) + 
+				f.Type + " " + f.Name);
+			if (f.Initializer != null){
+				if (f.Initializer is Expression)
+					output (" = " + GetExpression ((Expression) f.Initializer, 0));
+				else
+					output ("ADD SUPPORT FOR ARRAYS");
+			}
+			output (";");
+			newline ();
+		}
+
+		void GenerateConstructor (Constructor c)
+		{
+			ConstructorInitializer init = c.Initializer;
+
+			space ();
+			output (GetModifiers (c.ModFlags) + c.Name + " (");
+			GenerateParameters (c.Parameters);
+			output (")");
+
+			if (init != null){
+				if (init is ConstructorThisInitializer)
+					output (": this (");
+				else
+					output (": base (");
+				output (GetArguments (init.Arguments));
+				output (")");
+			}
+			newline ();
+			GenerateBlock (c.Block, false, false);
+		}
+
+		void GenerateProperty (Property prop)
+		{
+			space ();
+			output (GetModifiers (prop.ModFlags) + prop.Type +
+				" " + prop.Name + " {");
+			newline ();
+			indent++;
+			if (prop.Get != null){
+				space ();
+				output ("get ");
+				GenerateBlock (prop.Get, false, false);
+				newline (); 
+			}
+
+			if (prop.Set != null){
+				space ();
+				output ("set ");
+				GenerateBlock (prop.Set, false, false);
+			}
+			indent--;
+			space ();
+			output ("}");
+			newline ();
+		}
+
+		void GenerateEnum (CIR.Enum e)
+		{
+			space ();
+			output ("enum " + e.Name + " {");
+			newline ();
+
+			indent++;
+			foreach (string name in e.ValueNames){
+				Expression expr = e [name];
+
+				space ();
+
+				output (name);
+				if (expr != null)
+					output (" = " + GetExpression (expr, 0));
+
+				output (",");
+				newline ();
+			}
+			indent--;
+			space ();
+			output_newline ("}");
+		}
+		
+		void GenerateTypeContainerData (TypeContainer tc)
+		{
+			if (tc.Constants != null){
+				foreach (Constant c in tc.Constants){
+					space ();
+
+					output ("const " + c.ConstantType + " " + c.Name + " = " +
+						GetExpression (c.Expr, 0) + ";");
+					newline ();
+				}
+				newline ();
+			}
+
+			if (tc.Enums != null){
+				foreach (CIR.Enum e in tc.Enums)
+					GenerateEnum (e);
+			}
+
+			if (tc.Fields != null){
+				foreach (Field f in tc.Fields)
+					GenerateField (f);
+				newline ();
+			}
+
+			if (tc.Constructors != null){
+				foreach (Constructor c in tc.Constructors)
+					GenerateConstructor (c);
+
+				newline ();
+					
+			}
+
+			if (tc.Properties != null){
+				foreach (Property prop in tc.Properties)
+					GenerateProperty (prop);
+			}
+			
+			GenerateFromTypes (tc);
+			
+			if (tc.Methods != null){
+				foreach (Method m in tc.Methods){
+					GenerateMethod (m);
+				}
+			}
+		}
+
+		string GetModifiers (int mod_flags)
+		{
+			string s = "";
+
+			for (int i = 1; i <= (int) CIR.Modifiers.TOP; i <<= 1){
+				if ((mod_flags & i) != 0)
+					s += Modifiers.Name (i) + " ";
+			}
+
+			return s;
+		}
+
+		string ClassName (string name)
+		{
+			return name;
+			//return name.Substring (1 + name.LastIndexOf ("."));
+		}
+
+		string GenBases (ArrayList bases)
+		{
+			if (bases == null)
+				return "";
+
+			string res = ": ";
+			int top = bases.Count;
+			for (int i = 0; i < bases.Count; i++){
+				Type t = (Type) bases [i];
+
+				res += t.Name;
+				if (i + 1 != top)
+					res += ", ";
+			}
+			return res;
+		}
+		
+		string GenClassBases (Class c)
+		{
+			return GenBases (c.Bases);
+		}
+		
+		void GenerateFromClass (Class c)
+		{
+			ioutput (GetModifiers (c.ModFlags) + "class " + ClassName (c.Name) +
+				 " " + GenClassBases (c) + " {");
+			newline ();
+			indent++;
+			
+			GenerateTypeContainerData (c);
+
+			indent--;
+			ioutput ("}");
+			newline ();
+			newline ();
+		}
+
+		void GenerateFromStruct (Struct s)
+		{
+			GenerateTypeContainerData (s);
+		}
+		
+		void GenerateFromTypes (TypeContainer types)
+		{
+			if (types.Types == null)
+				return;
+			
+			foreach (DictionaryEntry de in types.Types){
+				TypeContainer type = (TypeContainer) de.Value;
+				
+				if (type is Class)
+					GenerateFromClass ((Class) type);
+				if (type is Struct)
+					GenerateFromStruct ((Struct) type);
+					
+			}
+
+			if (types.Interfaces != null){
+				foreach (DictionaryEntry de in types.Interfaces){
+					Interface iface = (Interface) de.Value;
+
+					GenerateInterface (iface);
+				}
+			}
+		}
+		
+		public int Dump (Tree tree, StreamWriter output)
+		{
+			this.o = output;
+
+			indent = 0;
+			GenerateFromTypes (tree.Types);
+
+			return 0;
+		}
+
+		public void ParseOptions (string options)
+		{
+			if (options == "tag")
+				tag_values = true;
+		}
+	}
+}
+
+
diff --git a/mcs/mcs/genericparser.cs b/mcs/mcs/genericparser.cs
new file mode 100644
index 00000000000..522987d6f30
--- /dev/null
+++ b/mcs/mcs/genericparser.cs
@@ -0,0 +1,61 @@
+//
+// GenericParser.cs: The Base Parser for the Mono compilers
+//
+// Author: A Rafael D Teixeira (rafaelteixeirabr@hotmail.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// Copyright (C) 2001 Ximian, Inc.
+//
+using System;
+using System.Text;
+
+namespace Mono.Languages
+{
+	using System.Collections;
+
+	/// <summary>
+	/// Base class to support multiple Jay generated parsers
+	/// </summary>
+	public abstract class GenericParser
+	{
+		// Name of the file we are parsing
+		public string name;
+
+		// Input stream to parse from.
+		public System.IO.Stream input;
+
+		public abstract void parse ();
+
+		public virtual string[] extensions()
+		{
+			string [] list = { ".cs" };
+			return list;
+		}
+
+		public GenericParser()
+		{
+			//
+			// DO NOTHING: Derived classes should do their iniatilization here duties
+			//
+		}
+
+		protected bool yacc_verbose_flag = false;
+
+		public bool yacc_verbose
+		{
+			set
+			{
+				yacc_verbose_flag = value;
+			}
+
+			get
+			{
+				return yacc_verbose_flag;
+			}
+		}
+	}
+}
+
+
+
diff --git a/mcs/mcs/interface.cs b/mcs/mcs/interface.cs
new file mode 100755
index 00000000000..dce7b2c5f1e
--- /dev/null
+++ b/mcs/mcs/interface.cs
@@ -0,0 +1,1043 @@
+//
+// interface.cs: Interface handler
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+#define CACHE
+using System.Collections;
+using System;
+using System.IO;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   Interfaces
+	/// </summary>
+	public class Interface : DeclSpace, IMemberContainer {
+		const MethodAttributes interface_method_attributes =
+			MethodAttributes.Public |
+			MethodAttributes.Abstract |
+			MethodAttributes.HideBySig |
+			MethodAttributes.NewSlot |
+			MethodAttributes.Virtual;
+
+		const MethodAttributes property_attributes =
+			MethodAttributes.Public |
+			MethodAttributes.Abstract |
+			MethodAttributes.HideBySig |
+			MethodAttributes.NewSlot |
+			MethodAttributes.SpecialName |
+			MethodAttributes.Virtual;
+		
+		ArrayList bases;
+		
+		ArrayList defined_method;
+		ArrayList defined_indexer;
+		ArrayList defined_events;
+		ArrayList defined_properties;
+
+		ArrayList method_builders;
+		ArrayList property_builders;
+		ArrayList event_builders;
+		
+		Attributes OptAttributes;
+
+		public string IndexerName;
+
+		IMemberContainer parent_container;
+		MemberCache member_cache;
+
+		// These will happen after the semantic analysis
+		
+		// Hashtable defined_indexers;
+		// Hashtable defined_methods;
+		
+		/// <summary>
+		///   Modifiers allowed in a class declaration
+		/// </summary>
+		public const int AllowedModifiers =
+			Modifiers.NEW       |
+			Modifiers.PUBLIC    |
+			Modifiers.PROTECTED |
+			Modifiers.INTERNAL  |
+		 	Modifiers.UNSAFE    |
+			Modifiers.PRIVATE;
+
+		public Interface (TypeContainer parent, string name, int mod, Attributes attrs, Location l)
+			: base (parent, name, l)
+		{
+			ModFlags = Modifiers.Check (AllowedModifiers, mod, Modifiers.PRIVATE, l);
+			OptAttributes = attrs;
+			
+			method_builders = new ArrayList ();
+			property_builders = new ArrayList ();
+			event_builders = new ArrayList ();
+		}
+
+		public AdditionResult AddMethod (InterfaceMethod imethod)
+		{
+			string name = imethod.Name;
+			Object value = defined_names [name];
+
+			if (value != null){
+				if (!(value is InterfaceMethod))
+					return AdditionResult.NameExists;
+			} 
+
+			if (defined_method == null)
+				defined_method = new ArrayList ();
+
+			defined_method.Add (imethod);
+			if (value == null)
+				DefineName (name, imethod);
+			
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddProperty (InterfaceProperty iprop)
+		{
+			AdditionResult res;
+			string name = iprop.Name;
+
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			DefineName (name, iprop);
+
+			if (defined_properties == null)
+				defined_properties = new ArrayList ();
+
+			defined_properties.Add (iprop);
+			return AdditionResult.Success;
+		}
+
+		public AdditionResult AddEvent (InterfaceEvent ievent)
+		{
+			string name = ievent.Name;
+			AdditionResult res;
+			
+			if ((res = IsValid (name)) != AdditionResult.Success)
+				return res;
+
+			DefineName (name, ievent);
+
+			if (defined_events == null)
+				defined_events = new ArrayList ();
+
+			defined_events.Add (ievent);
+			return AdditionResult.Success;
+		}
+
+		public bool AddIndexer (InterfaceIndexer iindexer)
+		{
+			if (defined_indexer == null)
+				defined_indexer = new ArrayList ();
+			
+			defined_indexer.Add (iindexer);
+			return true;
+		}
+		
+		public ArrayList InterfaceMethods {
+			get {
+				return defined_method;
+			}
+		}
+
+		public ArrayList InterfaceProperties {
+			get {
+				return defined_properties;
+			}
+		}
+
+		public ArrayList InterfaceEvents {
+			get {
+				return defined_events;
+			}
+		}
+
+		public ArrayList InterfaceIndexers {
+			get {
+				return defined_indexer;
+			}
+		}
+
+		public ArrayList Bases {
+			get {
+				return bases;
+			}
+
+			set {
+				bases = value;
+			}
+		}
+
+		public virtual TypeAttributes InterfaceAttr {
+			get {
+				TypeAttributes x = TypeAttributes.Interface | TypeAttributes.Abstract;
+
+				if (IsTopLevel == false) {
+					
+					if ((ModFlags & Modifiers.PROTECTED) != 0
+					    && (ModFlags & Modifiers.INTERNAL) != 0)
+						x |= TypeAttributes.NestedFamORAssem;
+					else if ((ModFlags & Modifiers.PROTECTED) != 0)
+						x |= TypeAttributes.NestedFamily;
+					else if ((ModFlags & Modifiers.INTERNAL) != 0)
+						x |= TypeAttributes.NestedAssembly;
+					else if ((ModFlags & Modifiers.PUBLIC) != 0)
+						x |= TypeAttributes.NestedPublic;
+					else
+						x |= TypeAttributes.NestedPrivate;
+				} else {
+					if ((ModFlags & Modifiers.PUBLIC) != 0)
+						x |= TypeAttributes.Public;
+					else if ((ModFlags & Modifiers.PRIVATE) != 0)
+						x |= TypeAttributes.NotPublic;
+				}
+				
+				if ((ModFlags & Modifiers.ABSTRACT) != 0)
+					x |= TypeAttributes.Abstract;
+				
+				if ((ModFlags & Modifiers.SEALED) != 0)
+					x |= TypeAttributes.Sealed;
+
+				return x;
+			}
+		}
+		
+		void Error111 (InterfaceMemberBase ib)
+		{
+			Report.Error (
+				111,
+				"Interface `" + Name + "' already contains a definition with the " +
+				"same return value and parameter types for member `" + ib.Name + "'");
+		}
+
+		bool RegisterMethod (MethodBase mb, InternalParameters ip, Type [] types)
+		{
+			if (!TypeManager.RegisterMethod (mb, ip, types))
+				return false;
+
+			method_builders.Add (mb);
+			return true;
+		}
+
+		public MethodInfo [] GetMethods ()
+		{
+			int n = method_builders.Count;
+			MethodInfo [] mi = new MethodInfo [n];
+			
+			method_builders.CopyTo (mi, 0);
+
+			return mi;
+		}
+
+		// Hack around System.Reflection as found everywhere else
+		public override MemberList FindMembers (MemberTypes mt, BindingFlags bf,
+							MemberFilter filter, object criteria)
+		{
+			ArrayList members = new ArrayList ();
+
+			if ((mt & MemberTypes.Method) != 0) {
+				foreach (MethodBuilder mb in method_builders)
+					if (filter (mb, criteria))
+						members.Add (mb);
+			}
+
+			if ((mt & MemberTypes.Property) != 0) {
+				foreach (PropertyBuilder pb in property_builders)
+				        if (filter (pb, criteria))
+				                members.Add (pb);
+			}
+
+			if ((mt & MemberTypes.Event) != 0) {
+				foreach (MyEventBuilder eb in event_builders)
+				        if (filter (eb, criteria))
+				                members.Add (eb);
+			}
+
+			if (((bf & BindingFlags.DeclaredOnly) == 0) && (TypeBuilder.BaseType != null)) {
+				MemberList parent_mi;
+				
+				parent_mi = TypeContainer.FindMembers (
+					TypeBuilder.BaseType, mt, bf, filter, criteria);
+
+				members.AddRange (parent_mi);
+			}
+
+			return new MemberList (members);
+		}
+
+		public override MemberCache MemberCache {
+			get {
+				return member_cache;
+			}
+		}
+
+		//
+		// Populates the methods in the interface
+		//
+		void PopulateMethod (TypeContainer parent, DeclSpace decl_space, InterfaceMethod im)
+		{
+			Type return_type = this.ResolveType (im.ReturnType, false, im.Location);
+			Type [] arg_types = im.ParameterTypes (this);
+			MethodBuilder mb;
+			Parameter [] p;
+			int i;
+
+			if (return_type == null)
+				return;
+
+			if (return_type.IsPointer && !UnsafeOK (this))
+				return;
+
+			foreach (Type t in arg_types){
+
+				if (t == null)
+					return;
+				
+				if (t.IsPointer && !UnsafeOK (this))
+					return;
+			}
+			
+			//
+			// Create the method
+			//
+			mb = TypeBuilder.DefineMethod (
+				im.Name, interface_method_attributes,
+				return_type, arg_types);
+
+			InternalParameters ip = new InternalParameters (arg_types, im.Parameters);
+			
+			if (!RegisterMethod (mb, ip, arg_types)) {
+				Error111 (im);
+				return;
+			}
+
+			//
+			// Define each type attribute (in/out/ref) and
+			// the argument names.
+			//
+			p = im.Parameters.FixedParameters;
+			if (p != null){
+				for (i = 0; i < p.Length; i++)
+					mb.DefineParameter (i + 1, p [i].Attributes, p [i].Name);
+
+				if (i != arg_types.Length)
+					Console.WriteLine ("Implement the type definition for params");
+			}
+
+			EmitContext ec = new EmitContext (parent, decl_space, Location, null,
+							  return_type, ModFlags, false);
+
+			if (im.OptAttributes != null)
+				Attribute.ApplyAttributes (ec, mb, im, im.OptAttributes, Location);
+		}
+
+		//
+		// Populates the properties in the interface
+		//
+		void PopulateProperty (TypeContainer parent, DeclSpace decl_space, InterfaceProperty ip)
+		{
+			PropertyBuilder pb;
+			MethodBuilder get = null, set = null;
+			ip.Type = this.ResolveTypeExpr (ip.Type, false, ip.Location);
+			Type prop_type = ip.Type.Type;
+			Type [] setter_args = new Type [1];
+
+			if (prop_type == null)
+				return;
+
+			if (prop_type.IsPointer && !UnsafeOK (this))
+				return;
+			
+			setter_args [0] = prop_type;
+
+			//
+			// FIXME: properties are missing the following
+			// flags: hidebysig newslot specialname
+			//
+			pb = TypeBuilder.DefineProperty (
+				ip.Name, PropertyAttributes.None,
+				prop_type, null);
+
+			if (ip.HasGet){
+				get = TypeBuilder.DefineMethod (
+					"get_" + ip.Name, property_attributes ,
+					prop_type, null);
+
+				//
+				// HACK because System.Reflection.Emit is lame
+				//
+				Type [] null_types = null;
+				InternalParameters inp = new InternalParameters
+					(null_types, Parameters.EmptyReadOnlyParameters);
+				
+				if (!RegisterMethod (get, inp, null)) {
+					Error111 (ip);
+					return;
+				}
+				
+				pb.SetGetMethod (get);
+			}
+
+			if (ip.HasSet){
+				setter_args [0] = prop_type;
+
+				set = TypeBuilder.DefineMethod (
+					"set_" + ip.Name, property_attributes,
+					TypeManager.void_type, setter_args);
+
+				set.DefineParameter (1, ParameterAttributes.None, "value");
+				pb.SetSetMethod (set);
+
+				//
+				// HACK because System.Reflection.Emit is lame
+				//
+				Parameter [] parms = new Parameter [1];
+				parms [0] = new Parameter (ip.Type, "value", Parameter.Modifier.NONE, null);
+				InternalParameters ipp = new InternalParameters (
+					this, new Parameters (parms, null, Location.Null));
+					
+				if (!RegisterMethod (set, ipp, setter_args)) {
+					Error111 (ip);
+					return;
+				}
+			}
+
+			EmitContext ec = new EmitContext (parent, decl_space, Location, null,
+							  null, ModFlags, false);
+
+			if (ip.OptAttributes != null)
+				Attribute.ApplyAttributes (ec, pb, ip, ip.OptAttributes, Location);
+
+			TypeManager.RegisterProperty (pb, get, set);
+			property_builders.Add (pb);
+		}
+
+		//
+		// Populates the events in the interface
+		//
+		void PopulateEvent (TypeContainer parent, DeclSpace decl_space, InterfaceEvent ie)
+		{
+			//
+		        // FIXME: We need to do this after delegates have been
+			// declared or we declare them recursively.
+			//
+			MyEventBuilder eb;
+			MethodBuilder add = null, remove = null;
+			ie.Type = this.ResolveTypeExpr (ie.Type, false, ie.Location);
+			Type event_type = ie.Type.Type;
+
+			if (event_type == null)
+				return;
+
+			if (event_type.IsPointer && !UnsafeOK (this))
+				return;
+
+			Type [] parameters = new Type [1];
+			parameters [0] = event_type;
+
+			eb = new MyEventBuilder (TypeBuilder, ie.Name,
+						 EventAttributes.None, event_type);
+
+			//
+			// Now define the accessors
+			//
+			string add_name = "add_" + ie.Name;
+			
+			add = TypeBuilder.DefineMethod (
+				add_name, property_attributes, null, parameters);
+			add.DefineParameter (1, ParameterAttributes.None, "value");
+			eb.SetAddOnMethod (add);
+
+			string remove_name = "remove_" + ie.Name;
+			remove = TypeBuilder.DefineMethod (
+				remove_name, property_attributes, null, parameters);
+			remove.DefineParameter (1, ParameterAttributes.None, "value");
+			eb.SetRemoveOnMethod (remove);
+
+			Parameter [] parms = new Parameter [1];
+			parms [0] = new Parameter (ie.Type, "value", Parameter.Modifier.NONE, null);
+			InternalParameters ip = new InternalParameters (
+				this, new Parameters (parms, null, Location.Null));
+
+			if (!RegisterMethod (add, ip, parameters)) {
+				Error111 (ie);
+				return;
+			}
+			
+			if (!RegisterMethod (remove, ip, parameters)) {
+				Error111 (ie);
+				return;
+			}
+
+			EmitContext ec = new EmitContext (parent, decl_space, Location, null,
+							  null, ModFlags, false);
+
+
+			if (ie.OptAttributes != null)
+				Attribute.ApplyAttributes (ec, eb, ie, ie.OptAttributes, Location);
+
+			TypeManager.RegisterEvent (eb, add, remove);
+			event_builders.Add (eb);
+		}
+
+		//
+		// Populates the indexers in the interface
+		//
+		void PopulateIndexer (TypeContainer parent, DeclSpace decl_space, InterfaceIndexer ii)
+		{
+			PropertyBuilder pb;
+			ii.Type = this.ResolveTypeExpr (ii.Type, false, ii.Location);
+			Type prop_type = ii.Type.Type;
+			Type [] arg_types = ii.ParameterTypes (this);
+			Type [] value_arg_types;
+
+			if (prop_type == null)
+				return;
+
+			if (prop_type.IsPointer && !UnsafeOK (this))
+				return;
+			
+			//
+			// Sets up the extra invisible `value' argument for setters.
+			// 
+			if (arg_types != null){
+				int count = arg_types.Length;
+				value_arg_types = new Type [count + 1];
+
+				arg_types.CopyTo (value_arg_types, 0);
+				value_arg_types [count] = prop_type;
+
+				foreach (Type t in arg_types){
+					if (t.IsPointer && !UnsafeOK (this))
+						return;
+				}
+			} else {
+				value_arg_types = new Type [1];
+
+				value_arg_types [1] = prop_type;
+			}
+
+			EmitContext ec = new EmitContext (parent, decl_space, Location, null,
+							  null, ModFlags, false);
+
+			IndexerName = Attribute.ScanForIndexerName (ec, ii.OptAttributes);
+			if (IndexerName == null)
+				IndexerName = "Item";
+			
+			pb = TypeBuilder.DefineProperty (
+				IndexerName, PropertyAttributes.None,
+				prop_type, arg_types);
+			
+			MethodBuilder set_item = null, get_item = null;
+			if (ii.HasGet){
+				Parameter [] p = ii.Parameters.FixedParameters;
+				
+				get_item = TypeBuilder.DefineMethod (
+					"get_" + IndexerName, property_attributes,
+					prop_type, arg_types);
+				pb.SetGetMethod (get_item);
+				//
+				// HACK because System.Reflection.Emit is lame
+				//
+				InternalParameters ip = new InternalParameters (
+					arg_types, ii.Parameters);
+				
+				if (!RegisterMethod (get_item, ip, arg_types)) {
+					Error111 (ii);
+					return;
+				}
+
+				if (p != null){
+					for (int i = 0; i < p.Length; i++)
+						get_item.DefineParameter (
+							i + 1,
+							p [i].Attributes, p [i].Name);
+				}
+			}
+
+			if (ii.HasSet){
+				Parameter [] p = ii.Parameters.FixedParameters;
+				Parameter [] pv;
+				int i = 0;
+				
+				pv = new Parameter [p.Length + 1];
+				p.CopyTo (pv, 0);
+				pv [p.Length] = new Parameter (ii.Type, "value", Parameter.Modifier.NONE, null);
+				Parameters value_params = new Parameters (pv, null, Location.Null);
+				value_params.GetParameterInfo (decl_space);
+				
+				set_item = TypeBuilder.DefineMethod (
+					"set_" + IndexerName, property_attributes,
+					TypeManager.void_type, value_arg_types);
+				pb.SetSetMethod (set_item);
+				//
+				// HACK because System.Reflection.Emit is lame
+				//
+				InternalParameters ip = new InternalParameters (
+					value_arg_types, value_params);
+				if (!RegisterMethod (set_item, ip, value_arg_types)) {
+					Error111 (ii);
+					return;
+				}
+
+				if (p != null){
+					for (; i < p.Length; i++)
+						set_item.DefineParameter (
+							i + 1,
+							p [i].Attributes, p [i].Name);
+				}
+				
+				set_item.DefineParameter (i + 1, ParameterAttributes.None, "value");
+			}
+
+			if (ii.OptAttributes != null)
+				Attribute.ApplyAttributes (ec, pb, ii, ii.OptAttributes, Location);
+
+			property_builders.Add (pb);
+		}
+
+		/// <summary>
+		///   Performs the semantic analysis for all the interface members
+		///   that were declared
+		/// </summary>
+		bool SemanticAnalysis ()
+		{
+			Hashtable methods = new Hashtable ();
+
+			
+			if (defined_method != null){
+				foreach (InterfaceMethod im in defined_method){
+					string sig = im.GetSignature (this);
+					
+					//
+					// If there was an undefined Type on the signatures
+					// 
+					if (sig == null)
+						continue;
+					
+					if (methods [sig] != null){
+						Error111 (im);
+						return false;
+					}
+				}
+			}
+
+			//
+			// FIXME: Here I should check i
+			// 
+			return true;
+		}
+
+		Type GetInterfaceTypeByName (string name)
+		{
+			Type t = FindType (name);
+
+			if (t == null) {
+				Report.Error (246, Location, "The type or namespace `" + name +
+					      "' could not be found");
+				return null;
+			}
+			
+			if (t.IsInterface)
+				return t;
+				
+			string cause;
+			
+			if (t.IsValueType)
+				cause = "is a struct";
+			else if (t.IsClass) 
+				cause = "is a class";
+			else
+				cause = "Should not happen.";
+			
+			Report.Error (527, Location, "`"+name+"' " + cause +
+				      ", need an interface instead");
+			
+			return null;
+		}
+		
+		//
+		// Returns the list of interfaces that this interface implements
+		// Or null if it does not implement any interface.
+		//
+		// Sets the error boolean accoringly.
+		//
+		Type [] GetInterfaceBases (out bool error)
+		{
+			Type [] tbases;
+			int i;
+
+			error = false;
+			if (Bases == null)
+				return null;
+			
+			tbases = new Type [Bases.Count];
+			i = 0;
+
+			foreach (string name in Bases){
+				Type t;
+
+				t = GetInterfaceTypeByName (name);
+				if (t == null){
+					error = true;
+					return null;
+				}
+
+				if (!Parent.AsAccessible (t, ModFlags))
+					Report.Error (61, Location,
+						      "Inconsistent accessibility: base interface `" +
+						      TypeManager.CSharpName (t) + "' is less " +
+						      "accessible than interface `" +
+						      Name + "'");
+
+				tbases [i++] = t;
+			}
+			
+			return TypeManager.ExpandInterfaces (tbases);
+		}
+		
+		//
+		// <summary>
+		//  Defines the Interface in the appropriate ModuleBuilder or TypeBuilder
+		// </summary>
+		//
+		// TODO:
+		//   Rework the way we recurse, because for recursive
+		//   definitions of interfaces (A:B and B:A) we report the
+		//   error twice, rather than once.  
+		
+		public override TypeBuilder DefineType ()
+		{
+			Type [] ifaces;
+			bool error;
+
+			if (TypeBuilder != null)
+				return TypeBuilder;
+			
+			if (InTransit)
+				return null;
+			
+			InTransit = true;
+			
+			ifaces = GetInterfaceBases (out error);
+
+			if (error)
+				return null;
+
+			if (IsTopLevel) {
+				ModuleBuilder builder = CodeGen.ModuleBuilder;
+
+				TypeBuilder = builder.DefineType (
+					Name,
+					InterfaceAttr,
+					(Type)null,   // Parent Type
+					ifaces);
+				RootContext.RegisterOrder (this);
+			} else {
+				TypeBuilder builder = Parent.TypeBuilder;
+
+				TypeBuilder = builder.DefineNestedType (
+					Basename,
+					InterfaceAttr,
+					(Type) null, //parent type
+					ifaces);
+
+				TypeContainer tc = TypeManager.LookupTypeContainer (builder);
+				tc.RegisterOrder (this);
+			}
+
+			TypeManager.AddUserInterface (Name, TypeBuilder, this, ifaces);
+			InTransit = false;
+
+			return TypeBuilder;
+		}
+
+		//
+		// Defines the indexers, and also verifies that the IndexerNameAttribute in the
+		// interface is consistent.  Either it is `Item' or it is the name defined by all the
+		// indexers with the `IndexerName' attribute.
+		//
+		// Turns out that the IndexerNameAttribute is applied to each indexer,
+		// but it is never emitted, instead a DefaultName attribute is attached
+		// to the interface
+		//
+		void DefineIndexers (TypeContainer parent)
+		{
+			string interface_indexer_name = null;
+
+			foreach (InterfaceIndexer ii in defined_indexer){
+
+				PopulateIndexer (parent, this, ii);
+
+				if (interface_indexer_name == null){
+					interface_indexer_name = IndexerName;
+					continue;
+				}
+				
+				if (IndexerName == interface_indexer_name)
+					continue;
+				
+				Report.Error (
+					668, "Two indexers have different names, " +
+					" you should use the same name for all your indexers");
+			}
+			if (interface_indexer_name == null)
+				interface_indexer_name = "Item";
+			IndexerName = interface_indexer_name;
+		}
+		
+		/// <summary>
+		///   Performs semantic analysis, and then generates the IL interfaces
+		/// </summary>
+		public override bool DefineMembers (TypeContainer parent)
+		{
+			if (!SemanticAnalysis ())
+				return false;
+
+			if (defined_method != null){
+				foreach (InterfaceMethod im in defined_method)
+					PopulateMethod (parent, this, im);
+			}
+
+			if (defined_properties != null){
+				foreach (InterfaceProperty ip in defined_properties)
+					PopulateProperty (parent, this, ip);
+			}
+
+			if (defined_events != null)
+				foreach (InterfaceEvent ie in defined_events)
+					PopulateEvent (parent, this, ie);
+
+			if (defined_indexer != null) {
+				DefineIndexers (parent);
+
+				CustomAttributeBuilder cb = EmitDefaultMemberAttr (
+					parent, IndexerName, ModFlags, Location);
+				if (cb != null)
+					TypeBuilder.SetCustomAttribute (cb);
+ 			}
+
+#if CACHE
+			if (TypeBuilder.BaseType != null)
+				parent_container = TypeManager.LookupMemberContainer (TypeBuilder.BaseType);
+
+			member_cache = new MemberCache (this);
+#endif
+
+			return true;
+		}
+
+		/// <summary>
+		///   Applies all the attributes.
+		/// </summary>
+		public override bool Define (TypeContainer parent)
+		{
+			if (OptAttributes != null) {
+				EmitContext ec = new EmitContext (parent, this, Location, null, null,
+								  ModFlags, false);
+				Attribute.ApplyAttributes (ec, TypeBuilder, this, OptAttributes, Location);
+			}
+
+			return true;
+		}
+
+		public static CustomAttributeBuilder EmitDefaultMemberAttr (TypeContainer parent,
+									    string name,
+									    int flags,
+									    Location loc)
+		{
+			EmitContext ec = new EmitContext (parent, loc, null, null, flags);
+
+			Expression ml = Expression.MemberLookup (ec, TypeManager.default_member_type,
+								 ".ctor", MemberTypes.Constructor,
+								 BindingFlags.Public | BindingFlags.Instance,
+								 Location.Null);
+			
+			if (!(ml is MethodGroupExpr)) {
+				Console.WriteLine ("Internal error !!!!");
+				return null;
+			}
+			
+			MethodGroupExpr mg = (MethodGroupExpr) ml;
+
+			MethodBase constructor = mg.Methods [0];
+
+			string [] vals = { name };
+
+			CustomAttributeBuilder cb = null;
+			try {
+				cb = new CustomAttributeBuilder ((ConstructorInfo) constructor, vals);
+			} catch {
+				Report.Warning (-100, "Can not set the indexer default member attribute");
+			}
+
+			return cb;
+		}
+
+		//
+		// IMemberContainer
+		//
+
+		string IMemberContainer.Name {
+			get {
+				return Name;
+			}
+		}
+
+		Type IMemberContainer.Type {
+			get {
+				return TypeBuilder;
+			}
+		}
+
+		IMemberContainer IMemberContainer.Parent {
+			get {
+				return parent_container;
+			}
+		}
+
+		MemberCache IMemberContainer.MemberCache {
+			get {
+				return member_cache;
+			}
+		}
+
+		bool IMemberContainer.IsInterface {
+			get {
+				return true;
+			}
+		}
+
+		MemberList IMemberContainer.GetMembers (MemberTypes mt, BindingFlags bf)
+		{
+			// Interfaces only contain instance members.
+			if ((bf & BindingFlags.Instance) == 0)
+				return MemberList.Empty;
+			if ((bf & BindingFlags.Public) == 0)
+				return MemberList.Empty;
+
+			ArrayList members = new ArrayList ();
+
+			if ((mt & MemberTypes.Method) != 0)
+				members.AddRange (method_builders);
+
+			if ((mt & MemberTypes.Property) != 0)
+				members.AddRange (property_builders);
+
+			if ((mt & MemberTypes.Event) != 0)
+				members.AddRange (event_builders);
+
+			return new MemberList (members);
+		}
+	}
+
+	public class InterfaceMemberBase {
+		public readonly string Name;
+		public readonly bool IsNew;
+		public Attributes OptAttributes;
+		
+		public InterfaceMemberBase (string name, bool is_new, Attributes attrs)
+		{
+			Name = name;
+			IsNew = is_new;
+			OptAttributes = attrs;
+		}
+	}
+	
+	public class InterfaceProperty : InterfaceMemberBase {
+		public readonly bool HasSet;
+		public readonly bool HasGet;
+		public readonly Location Location;
+		public Expression Type;
+		
+		public InterfaceProperty (Expression type, string name,
+					  bool is_new, bool has_get, bool has_set,
+					  Attributes attrs, Location loc)
+			: base (name, is_new, attrs)
+		{
+			Type = type;
+			HasGet = has_get;
+			HasSet = has_set;
+			Location = loc;
+		}
+	}
+
+	public class InterfaceEvent : InterfaceMemberBase {
+		public readonly Location Location;
+		public Expression Type;
+		
+		public InterfaceEvent (Expression type, string name, bool is_new, Attributes attrs,
+				       Location loc)
+			: base (name, is_new, attrs)
+		{
+			Type = type;
+			Location = loc;
+		}
+	}
+	
+	public class InterfaceMethod : InterfaceMemberBase {
+		public readonly Expression ReturnType;
+		public readonly Parameters Parameters;
+		public readonly Location Location;
+		
+		public InterfaceMethod (Expression return_type, string name, bool is_new, Parameters args,
+					Attributes attrs, Location l)
+			: base (name, is_new, attrs)
+		{
+			this.ReturnType = return_type;
+			this.Parameters = args;
+			Location = l;
+		}
+
+		/// <summary>
+		///   Returns the signature for this interface method
+		/// </summary>
+		public string GetSignature (DeclSpace ds)
+		{
+			Type ret = ds.ResolveType (ReturnType, false, Location);
+			string args = Parameters.GetSignature (ds);
+
+			if ((ret == null) || (args == null))
+				return null;
+			
+			return (IsNew ? "new-" : "") + ret.FullName + "(" + args + ")";
+		}
+
+		public Type [] ParameterTypes (DeclSpace ds)
+		{
+			return Parameters.GetParameterInfo (ds);
+		}
+	}
+
+	public class InterfaceIndexer : InterfaceMemberBase {
+		public readonly bool HasGet, HasSet;
+		public readonly Parameters Parameters;
+		public readonly Location Location;
+		public Expression Type;
+		
+		public InterfaceIndexer (Expression type, Parameters args, bool do_get, bool do_set,
+					 bool is_new, Attributes attrs, Location loc)
+			: base ("", is_new, attrs)
+		{
+			Type = type;
+			Parameters = args;
+			HasGet = do_get;
+			HasSet = do_set;
+			Location = loc;
+		}
+
+		public Type [] ParameterTypes (DeclSpace ds)
+		{
+			return Parameters.GetParameterInfo (ds);
+		}
+	}
+}
diff --git a/mcs/mcs/literal.cs b/mcs/mcs/literal.cs
new file mode 100755
index 00000000000..a307030db6a
--- /dev/null
+++ b/mcs/mcs/literal.cs
@@ -0,0 +1,187 @@
+//
+// literal.cs: Literal representation for the IL tree.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+//
+// Notice that during parsing we create objects of type Literal, but the
+// types are not loaded (thats why the Resolve method has to assign the
+// type at that point).
+//
+// Literals differ from the constants in that we know we encountered them
+// as a literal in the source code (and some extra rules apply there) and
+// they have to be resolved (since during parsing we have not loaded the
+// types yet) while constants are created only after types have been loaded
+// and are fully resolved when born.
+//
+
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace Mono.CSharp {
+
+	public class NullLiteral : Constant {
+		public static readonly NullLiteral Null;
+		
+		static NullLiteral ()
+		{
+			Null = new NullLiteral ();
+		}
+			
+		public NullLiteral ()
+		{
+			if (Null != null)
+				throw new Exception ("More than one null has been created!");
+			eclass = ExprClass.Value;
+		}
+		
+		override public string AsString ()
+		{
+			return "null";
+		}
+
+		public override object GetValue ()
+		{
+			return null;
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.object_type;
+			return this;
+		}
+
+		public override void Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Ldnull);
+		}
+	}
+
+	public class BoolLiteral : BoolConstant {
+		public BoolLiteral (bool val) : base (val)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.bool_type;
+			return this;
+		}
+	}
+
+	public class CharLiteral : CharConstant {
+		public CharLiteral (char c) : base (c)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.char_type;
+			return this;
+		}
+	}
+
+	public class IntLiteral : IntConstant {
+		public IntLiteral (int l) : base (l)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.int32_type;
+			return this;
+		}
+	}
+
+	public class UIntLiteral : UIntConstant {
+		public UIntLiteral (uint l) : base (l)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.uint32_type;
+			return this;
+		}
+	}
+	
+	public class LongLiteral : LongConstant {
+		public LongLiteral (long l) : base (l)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.int64_type;
+
+			return this;
+		}
+	}
+
+	public class ULongLiteral : ULongConstant {
+		public ULongLiteral (ulong l) : base (l)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.uint64_type;
+			return this;
+		}
+	}
+	
+	public class FloatLiteral : FloatConstant {
+		
+		public FloatLiteral (float f) : base (f)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.float_type;
+			return this;
+		}
+	}
+
+	public class DoubleLiteral : DoubleConstant {
+		public DoubleLiteral (double d) : base (d)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.double_type;
+
+			return this;
+		}
+	}
+
+	public class DecimalLiteral : DecimalConstant {
+		public DecimalLiteral (decimal d) : base (d)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.decimal_type;
+			return this;
+		}
+	}
+
+	public class StringLiteral : StringConstant {
+		public StringLiteral (string s) : base (s)
+		{
+		}
+
+		public override Expression DoResolve (EmitContext ec)
+		{
+			type = TypeManager.string_type;
+
+			return this;
+		}
+	}
+}
diff --git a/mcs/mcs/location.cs b/mcs/mcs/location.cs
new file mode 100644
index 00000000000..1b32f32de6e
--- /dev/null
+++ b/mcs/mcs/location.cs
@@ -0,0 +1,151 @@
+//
+// location.cs: Keeps track of the location of source code entity
+//
+// Author:
+//   Miguel de Icaza
+//
+// (C) 2001 Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Diagnostics.SymbolStore;
+
+namespace Mono.CSharp {
+	/// <summary>
+	///   Keeps track of the location in the program
+	/// </summary>
+	///
+	/// <remarks>
+	///   This uses a compact representation and a couple of auxiliary
+	///   structures to keep track of tokens to (file,line) mappings.
+	///
+	///   We could probably also keep track of columns by storing those
+	///   in 8 bits (and say, map anything after char 255 to be `255+').
+	/// </remarks>
+	public struct Location {
+		public int token; 
+
+		static Hashtable map;
+		static Hashtable sym_docs;
+		static ArrayList list;
+		static int global_count;
+		static int module_base;
+
+		public readonly static Location Null;
+		
+		static Location ()
+		{
+			map = new Hashtable ();
+			list = new ArrayList ();
+			sym_docs = new Hashtable ();
+			global_count = 0;
+			module_base = 0;
+			Null.token = -1;
+		}
+
+		static public void Push (string name)
+		{
+			map.Remove (global_count);
+			map.Add (global_count, name);
+			list.Add (global_count);
+			module_base = global_count;
+		}
+		
+		public Location (int row)
+		{
+			if (row < 0)
+				token = -1;
+			else {
+				token = module_base + row;
+				if (global_count < token)
+					global_count = token;
+			}
+		}
+
+		public override string ToString ()
+		{
+			return Name + ": (" + Row + ")";
+		}
+		
+		/// <summary>
+		///   Whether the Location is Null
+		/// </summary>
+		static public bool IsNull (Location l)
+		{
+			return l.token == -1;
+		}
+
+		public string Name {
+			get {
+				int best = 0;
+				
+				if (token < 0)
+					return "Internal";
+
+				foreach (int b in list){
+					if (token > b)
+						best = b;
+				}
+				return (string) map [best];
+			}
+		}
+
+		public int Row {
+			get {
+				int best = 0;
+				
+				if (token < 0)
+					return 1;
+				
+				foreach (int b in list){
+					if (token > b)
+						best = b;
+				}
+				return token - best;
+			}
+		}
+
+		// The ISymbolDocumentWriter interface is used by the symbol writer to
+		// describe a single source file - for each source file there's exactly
+		// one corresponding ISymbolDocumentWriter instance.
+		//
+		// This class has an internal hash table mapping source document names
+		// to such ISymbolDocumentWriter instances - so there's exactly one
+		// instance per document.
+		//
+		// This property returns the ISymbolDocumentWriter instance which belongs
+		// to the location's source file.
+		//
+		// If we don't have a symbol writer, this property is always null.
+		public ISymbolDocumentWriter SymbolDocument {
+			get {
+				ISymbolWriter sw = CodeGen.SymbolWriter;
+				ISymbolDocumentWriter doc;
+
+				if (token < 0)
+					return null;
+
+				// If we don't have a symbol writer, return null.
+				if (sw == null)
+					return null;
+
+				if (sym_docs.Contains (Name))
+					// If we already created an ISymbolDocumentWriter
+					// instance for this document, return it.
+					doc = (ISymbolDocumentWriter) sym_docs [Name];
+				else {
+					// Create a new ISymbolDocumentWriter instance and
+					// store it in the hash table.
+					doc = sw.DefineDocument (Name, SymLanguageType.CSharp,
+								 SymLanguageVendor.Microsoft,
+								 SymDocumentType.Text);
+
+					sym_docs.Add (Name, doc);
+				}
+
+				return doc;
+			}
+		}
+	}
+}
diff --git a/mcs/mcs/makefile b/mcs/mcs/makefile
new file mode 100755
index 00000000000..f31d0d31663
--- /dev/null
+++ b/mcs/mcs/makefile
@@ -0,0 +1,105 @@
+CSC=csc.exe
+CSCFLAGS=/nologo /debug+ /debug:full  /optimize
+
+VERSION=0.13
+
+COMMON_SOURCES = cs-parser.cs cs-tokenizer.cs tree.cs location.cs
+
+COMPILER_SOURCES = \
+	assign.cs			\
+	attribute.cs			\
+	driver.cs $(COMMON_SOURCES) 	\
+	cfold.cs			\
+	class.cs 			\
+	codegen.cs			\
+	const.cs			\
+	constant.cs			\
+	decl.cs				\
+	delegate.cs			\
+	enum.cs				\
+	ecore.cs			\
+	expression.cs 			\
+	genericparser.cs		\
+	interface.cs			\
+	literal.cs			\
+	modifiers.cs 			\
+	namespace.cs			\
+	parameter.cs			\
+	pending.cs			\
+	report.cs			\
+	rootcontext.cs			\
+	statement.cs			\
+	support.cs			\
+	typemanager.cs
+
+TEST_TOKENIZER_SOURCES = test-token.cs $(COMMON_SOURCES)
+
+all: mcs.exe
+
+mcs.exe: cs-parser.cs $(COMPILER_SOURCES)
+	$(CSC) $(CSCFLAGS) /target:exe /r:System.dll /out:mcs.exe $(COMPILER_SOURCES)
+
+res:
+	echo --target exe -o mcs2.exe $(COMPILER_SOURCES) > response
+
+dum: cs-parser.cs
+	$(TIME) $(RUNTIME) ./mcs.exe --target exe -o mcs2.exe $(COMPILER_SOURCES)
+
+mcs2.exe: mcs.exe
+	$(TIME) $(RUNTIME) ./mcs.exe $(XFLAGS) --target exe -o mcs2.exe $(COMPILER_SOURCES)
+
+mcs3.exe: mcs2.exe
+	$(TIME) $(RUNTIME) ./mcs2.exe --target exe -o mcs3.exe $(COMPILER_SOURCES)
+
+mcs-mono.exe: cs-parser.cs $(COMPILER_SOURCES) 
+	mono --precompile @mcs.exe mcs.exe --timestamp -o mcs-mono.exe $(COMPILER_SOURCES) 
+mm:
+	mint $(MINTFLAGS) ./mcs.exe $(MCSFLAGS) --target exe -o mcs4.exe $(COMPILER_SOURCES)
+
+mcs-mono2.exe: cs-parser.cs $(COMPILER_SOURCES)
+	mono mcs.exe --timestamp -o mcs-mono2.exe -g $(COMPILER_SOURCES)
+
+mcs-mono3.exe: cs-parser.cs $(COMPILER_SOURCES)
+	mono --debug mcs-mono2.exe -o mcs-mono3.exe -g $(COMPILER_SOURCES)
+
+mcs-mono4.exe: cs-parser.cs $(COMPILER_SOURCES)
+	mono --debug mcs-mono3.exe -o mcs-mono4.exe -g $(COMPILER_SOURCES)
+
+monomcs: cs-parser.cs
+	mcs $(MCSFLAGS) --target exe -o mcs4.exe $(COMPILER_SOURCES)
+
+test: mcs3.exe
+	ls -l mcs2.exe mcs3.exe
+
+docs: cs-parser.cs
+	$(CSC) $(CSCFLAGS) /doc:docs.xml /nowarn:1591 /target:exe /r:System.dll /out:mcs.exe $(COMPILER_SOURCES)
+
+windows: all
+
+linux: all
+
+opt:
+	$(CSC) /optimize+ /target:exe /r:System.dll /out:mcs.exe $(COMPILER_SOURCES)
+
+old: test-tokenizer.exe
+test-tokenizer.exe: $(TEST_TOKENIZER_SOURCES)
+	$(CSC) /target:exe /out:test-tokenizer.exe $(TEST_TOKENIZER_SOURCES)
+
+bison:
+	perl -pe 's/\015//' < cs-parser.jay > x.y
+	bison --debug --verbose x.y
+
+cs-parser.cs: cs-parser.jay
+	../jay/jay -ctv < ../jay/skeleton.cs cs-parser.jay > cs-parser.cs
+
+pn:
+	../jay/jay -ctv < ../jay/skeleton.cs cs-parser.jay | grep -v '#line' > cs-parser.cs
+
+#statementCollection.cs: X-Collection.cs
+#	sed -e "s/@CONTAINEE@/Statement/g" -e "s/@arrayname@/statements/g" < X-Collection.cs > statementCollection.cs
+
+#parameterCollection.cs: X-Collection.cs
+#	sed -e "s/@CONTAINEE@/Parameter/g" -e "s/@arrayname@/parameters/g" < X-Collection.cs > parameterCollection.cs
+
+clean:
+	rm -f mcs.exe cs-parser.cs y.output mcs.pdb *~ .*~ mcs.log response
diff --git a/mcs/mcs/makefile.gnu b/mcs/mcs/makefile.gnu
new file mode 100644
index 00000000000..8d39eb4c053
--- /dev/null
+++ b/mcs/mcs/makefile.gnu
@@ -0,0 +1,54 @@
+MCS = mcs
+MCS_FLAGS = /target:exe $(MCS_DEFINES)
+INSTALL = /usr/bin/install
+prefix = /usr
+
+COMMON_SOURCES = cs-parser.cs cs-tokenizer.cs tree.cs location.cs
+
+COMPILER_SOURCES = \
+	assign.cs			\
+	attribute.cs			\
+	driver.cs $(COMMON_SOURCES) 	\
+	cfold.cs			\
+	class.cs 			\
+	codegen.cs			\
+	const.cs			\
+	constant.cs			\
+	decl.cs				\
+	delegate.cs			\
+	enum.cs				\
+	ecore.cs			\
+	expression.cs 			\
+	genericparser.cs		\
+	interface.cs			\
+	literal.cs			\
+	modifiers.cs 			\
+	namespace.cs			\
+	parameter.cs			\
+	pending.cs			\
+	report.cs			\
+	rootcontext.cs			\
+	statement.cs			\
+	support.cs			\
+	typemanager.cs
+
+TEST_TOKENIZER_SOURCES = test-token.cs $(COMMON_SOURCES)
+
+all: mcs.exe
+
+mcs.exe: $(COMPILER_SOURCES)
+	$(MCS) $(MCS_FLAGS) -o $@ $(COMPILER_SOURCES)
+
+mcs-mono2.exe: $(COMPILER_SOURCES)
+	$(MCS) $(MCS_FLAGS) --debug -o $@ $(COMPILER_SOURCES)
+
+cs-parser.cs: cs-parser.jay
+	../jay/jay -ctv < ../jay/skeleton.cs $^ > $@
+
+clean:
+	-rm -f *.exe cs-parser.cs y.output
+
+install: all
+	mkdir -p $(prefix)/bin/
+	$(INSTALL) -m 755 mcs.exe $(prefix)/bin/
+
diff --git a/mcs/mcs/mcs.exe.config b/mcs/mcs/mcs.exe.config
new file mode 100644
index 00000000000..cf61d4baa0b
--- /dev/null
+++ b/mcs/mcs/mcs.exe.config
@@ -0,0 +1,11 @@
+<configuration>

+  <system.diagnostics>

+    <trace autoflush="true" indentsize="4">

+      <listeners>

+        <add name="compilerLogListener" type="System.Diagnostics.TextWriterTraceListener,System"

+             initializeData="mcs.log" />

+        <remove type="System.Diagnostics.DefaultTraceListener,System"/>

+      </listeners>

+    </trace>

+  </system.diagnostics>

+</configuration>

diff --git a/mcs/mcs/modifiers.cs b/mcs/mcs/modifiers.cs
new file mode 100755
index 00000000000..a5cf6f62c03
--- /dev/null
+++ b/mcs/mcs/modifiers.cs
@@ -0,0 +1,241 @@
+//
+// modifiers.cs: Modifier handling.
+// 
+using System;
+using System.Reflection;
+
+namespace Mono.CSharp {
+	public class Modifiers {
+
+		//
+		// The ordering of the following 4 constants
+		// has been carefully done.
+		//
+		public const int PROTECTED = 0x0001;
+		public const int PUBLIC    = 0x0002;
+		public const int PRIVATE   = 0x0004;
+		public const int INTERNAL  = 0x0008;
+		public const int NEW       = 0x0010;
+		public const int ABSTRACT  = 0x0020;
+		public const int SEALED    = 0x0040;
+		public const int STATIC    = 0x0080;
+		public const int READONLY  = 0x0100;
+		public const int VIRTUAL   = 0x0200;
+		public const int OVERRIDE  = 0x0400;
+		public const int EXTERN    = 0x0800;
+		public const int VOLATILE  = 0x1000;
+		public const int UNSAFE    = 0x2000;
+		public const int TOP       = 0x2000;
+
+		public const int Accessibility =
+			PUBLIC | PROTECTED | INTERNAL | PRIVATE;
+		
+		static public string Name (int i)
+		{
+			string s = "";
+			
+			switch (i) {
+			case Modifiers.NEW:
+				s = "new"; break;
+			case Modifiers.PUBLIC:
+				s = "public"; break;
+			case Modifiers.PROTECTED:
+				s = "protected"; break;
+			case Modifiers.INTERNAL:
+				s = "internal"; break;
+			case Modifiers.PRIVATE:
+				s = "private"; break;
+			case Modifiers.ABSTRACT:
+				s = "abstract"; break;
+			case Modifiers.SEALED:
+				s = "sealed"; break;
+			case Modifiers.STATIC:
+				s = "static"; break;
+			case Modifiers.READONLY:
+				s = "readonly"; break;
+			case Modifiers.VIRTUAL:
+				s = "virtual"; break;
+			case Modifiers.OVERRIDE:
+				s = "override"; break;
+			case Modifiers.EXTERN:
+				s = "extern"; break;
+			case Modifiers.VOLATILE:
+				s = "volatile"; break;
+			}
+
+			return s;
+		}
+
+		public static TypeAttributes TypeAttr (int mod_flags, bool is_toplevel)
+		{
+			TypeAttributes t = 0;
+
+			if (is_toplevel){
+				if ((mod_flags & PUBLIC) != 0)
+					t |= TypeAttributes.Public;
+				if ((mod_flags & PRIVATE) != 0)
+					t |= TypeAttributes.NotPublic;
+			} else {
+				if ((mod_flags & PUBLIC) != 0)
+					t |= TypeAttributes.NestedPublic;
+				if ((mod_flags & PRIVATE) != 0)
+					t |= TypeAttributes.NestedPrivate;
+				if ((mod_flags & PROTECTED) != 0 && (mod_flags & INTERNAL) != 0)
+					t |= TypeAttributes.NestedFamORAssem;
+				if ((mod_flags & PROTECTED) != 0)
+					t |= TypeAttributes.NestedFamily;
+				if ((mod_flags & INTERNAL) != 0)
+					t |= TypeAttributes.NestedAssembly;
+			}
+			
+			if ((mod_flags & SEALED) != 0)
+				t |= TypeAttributes.Sealed;
+			if ((mod_flags & ABSTRACT) != 0)
+				t |= TypeAttributes.Abstract;
+
+			return t;
+		}
+		
+		public static TypeAttributes TypeAttr (int mod_flags, TypeContainer caller)
+		{
+			TypeAttributes t = TypeAttr (mod_flags, caller.IsTopLevel);
+
+			// If we do not have static constructors, static methods
+			// can be invoked without initializing the type.
+			if (!caller.HaveStaticConstructor)
+				t |= TypeAttributes.BeforeFieldInit;
+				
+			return t;
+		}
+
+		public static FieldAttributes FieldAttr (int mod_flags)
+		{
+			FieldAttributes fa = 0;
+
+			if ((mod_flags & PUBLIC) != 0)
+				fa |= FieldAttributes.Public;
+			if ((mod_flags & PRIVATE) != 0)
+				fa |= FieldAttributes.Private;
+			if ((mod_flags & PROTECTED) != 0){
+				if ((mod_flags & INTERNAL) != 0)
+					fa |= FieldAttributes.FamORAssem;
+				else 
+					fa |= FieldAttributes.Family;
+			} else {
+				if ((mod_flags & INTERNAL) != 0)
+					fa |= FieldAttributes.Assembly;
+			}
+			
+			if ((mod_flags & STATIC) != 0)
+				fa |= FieldAttributes.Static;
+			if ((mod_flags & READONLY) != 0)
+				fa |= FieldAttributes.InitOnly;
+
+			return fa;
+		}
+
+		public static MethodAttributes MethodAttr (int mod_flags)
+		{
+			MethodAttributes ma = 0;
+
+			if ((mod_flags & PUBLIC) != 0)
+				ma |= MethodAttributes.Public;
+			if ((mod_flags & PRIVATE) != 0)
+				ma |= MethodAttributes.Private;
+			if ((mod_flags & PROTECTED) != 0){
+				if ((mod_flags & INTERNAL) != 0)
+					ma |= MethodAttributes.FamORAssem;
+				else 
+					ma |= MethodAttributes.Family;
+			} else {
+				if ((mod_flags & INTERNAL) != 0)
+					ma |= MethodAttributes.Assembly;
+			}
+
+			if ((mod_flags & STATIC) != 0)
+				ma |= MethodAttributes.Static;
+			if ((mod_flags & ABSTRACT) != 0){
+				ma |= MethodAttributes.Abstract | MethodAttributes.Virtual |
+					MethodAttributes.HideBySig;
+			}
+			if ((mod_flags & SEALED) != 0)
+				ma |= MethodAttributes.Final;
+
+			if ((mod_flags & VIRTUAL) != 0)
+				ma |= MethodAttributes.Virtual;
+
+			if ((mod_flags & OVERRIDE) != 0)
+				ma |= MethodAttributes.Virtual | MethodAttributes.HideBySig;
+			else {
+				if ((ma & MethodAttributes.Virtual) != 0)
+					ma |= MethodAttributes.NewSlot;
+			}
+			
+			if ((mod_flags & NEW) != 0)
+				ma |= MethodAttributes.HideBySig;
+			
+			return ma;
+		}
+
+		// <summary>
+		//   Checks the object @mod modifiers to be in @allowed.
+		//   Returns the new mask.  Side effect: reports any
+		//   incorrect attributes. 
+		// </summary>
+		public static int Check (int allowed, int mod, int def_access, Location l)
+		{
+			int invalid_flags  = (~allowed) & mod;
+			int i;
+
+			if (invalid_flags == 0){
+				int a = mod;
+
+				if ((mod & Modifiers.UNSAFE) != 0){
+					if (!RootContext.Unsafe){
+						Report.Error (227, l,
+							      "Unsafe code requires the --unsafe command " +
+							      "line option to be specified");
+					}
+				}
+				
+				//
+				// If no accessibility bits provided
+				// then provide the defaults.
+				//
+				if ((mod & Accessibility) == 0){
+					mod |= def_access;
+					return mod;
+				}
+
+				//
+				// Make sure that no conflicting accessibility
+				// bits have been set.  Protected+Internal is
+				// allowed, that is why they are placed on bits
+				// 1 and 4 (so the shift 3 basically merges them)
+				//
+				a &= 15;
+				a |= (a >> 3);
+				a = ((a & 2) >> 1) + (a & 5);
+				a = ((a & 4) >> 2) + (a & 3);
+				if (a > 1)
+					Report.Error (107, l, "More than one protection modifier specified");
+				
+				return mod;
+			}
+			
+			for (i = 1; i < TOP; i <<= 1){
+				if ((i & invalid_flags) == 0)
+					continue;
+
+				Error_InvalidModifier (l, Name (i));
+			}
+
+			return allowed & mod;
+		}
+
+		public static void Error_InvalidModifier (Location l, string name)
+		{
+			Report.Error (106, l, "the modifier " + name + " is not valid for this item");
+		}
+	}
+}
diff --git a/mcs/mcs/namespace.cs b/mcs/mcs/namespace.cs
new file mode 100755
index 00000000000..d01bde48642
--- /dev/null
+++ b/mcs/mcs/namespace.cs
@@ -0,0 +1,129 @@
+//
+// namespace.cs: Tracks namespaces
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+using System;
+using System.Collections;
+using Mono.Languages;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   Keeps track of the namespaces defined in the C# code.
+	/// </summary>
+	public class Namespace {
+		Namespace parent;
+		string name;
+		ArrayList using_clauses;
+		Hashtable aliases;
+		public bool DeclarationFound = false;
+		
+		/// <summary>
+		///   Constructor Takes the current namespace and the
+		///   name.  This is bootstrapped with parent == null
+		///   and name = ""
+		/// </summary>
+		public Namespace (Namespace parent, string name)
+		{
+			this.name = name;
+			this.parent = parent;
+		}
+
+		/// <summary>
+		///   The qualified name of the current namespace
+		/// </summary>
+		public string Name {
+			get {
+				string pname = parent != null ? parent.Name : "";
+				
+				if (pname == "")
+					return name;
+				else
+					return parent.Name + "." + name;
+			}
+		}
+
+		/// <summary>
+		///   The parent of this namespace, used by the parser to "Pop"
+		///   the current namespace declaration
+		/// </summary>
+		public Namespace Parent {
+			get {
+				return parent;
+			}
+		}
+
+		/// <summary>
+		///   Records a new namespace for resolving name references
+		/// </summary>
+		public void Using (string ns, Location loc)
+		{
+			if (DeclarationFound){
+				Report.Error (1529, loc, "A using clause must precede all other namespace elements");
+				return;
+			}
+
+			if (using_clauses == null)
+				using_clauses = new ArrayList ();
+
+			using_clauses.Add (ns);
+		}
+
+		public ArrayList UsingTable {
+			get {
+				return using_clauses;
+			}
+		}
+
+		public void UsingAlias (string alias, string namespace_or_type, Location loc)
+		{
+			if (aliases == null)
+				aliases = new Hashtable ();
+			
+			if (aliases.Contains (alias)){
+				Report.Error (1537, loc, "The using alias `" + alias +
+					      "' appeared previously in this namespace");
+				return;
+			}
+					
+			aliases [alias] = namespace_or_type;
+		}
+
+		public string LookupAlias (string alias)
+		{
+			string value = null;
+
+			// System.Console.WriteLine ("Lookup " + alias + " in " + name);
+
+			if (aliases != null)
+				value = (string) (aliases [alias]);
+			if (value == null && Parent != null)
+				value = Parent.LookupAlias (alias);
+
+			return value;
+		}
+
+		/// <summary>
+		///   Used to validate that all the using clauses are correct
+		///   after we are finished parsing all the files
+		/// </summary>
+		public void VerifyUsing ()
+		{
+			foreach (DictionaryEntry de in using_clauses){
+				if (de.Value == null){
+					string name = (string) de.Key;
+					
+					Report.Error (234, "The type or namespace `" +
+							    name + "' does not exist in the " +
+							    "class or namespace `" + name + "'");
+				}
+			}
+		}
+
+	}
+}
+
diff --git a/mcs/mcs/old-code.cs b/mcs/mcs/old-code.cs
new file mode 100755
index 00000000000..271ffa2a7f5
--- /dev/null
+++ b/mcs/mcs/old-code.cs
@@ -0,0 +1,216 @@
+#else
+
+		bla bla bla
+		//
+		// This code is more conformant to the spec (it follows it step by step),
+		// but it has not been tested yet, and there is nothing here that is not
+		// caught by the above code.  But it might be a better foundation to improve
+		// on in the future
+		//
+		public ResolveTypeMemberAccess (EmitContext ec, Expression member_lookup,
+						Expression left, Location loc)
+		{
+			if (member_lookup is TypeExpr){
+				member_lookup.Resolve (ec);
+				return member_lookup;
+			}
+			
+			if (member_lookup is MethodGroupExpr){
+				if (!mg.RemoveStaticMethods ()){
+					SimpleName.Error120 (loc, mg.Methods [0].Name); 
+					return null;
+				}
+				
+				return member_lookup;
+			}
+			
+			if (member_lookup is PropertyExpr){
+				PropertyExpr pe = (PropertyExpr) member_lookup;
+					
+					if (!pe.IsStatic){
+						SimpleName.Error120 (loc, pe.PropertyInfo.Name);
+						return null;
+					}
+					return pe;
+			}
+			
+			if (member_lookup is FieldExpr){
+				FieldExpr fe = (FieldExpr) member_lookup;
+				FieldInfo fi = fe.FieldInfo;
+				
+				if (fi is FieldBuilder) {
+					Const c = TypeManager.LookupConstant ((FieldBuilder) fi);
+					
+					if (c != null) {
+						object o = c.LookupConstantValue (ec);
+						return Constantify (o, fi.FieldType);
+					}
+				}
+				
+				if (fi.IsLiteral) {
+					Type t = fi.FieldType;
+					Type decl_type = fi.DeclaringType;
+					object o;
+					
+					if (fi is FieldBuilder)
+						o = TypeManager.GetValue ((FieldBuilder) fi);
+					else
+						o = fi.GetValue (fi);
+					
+					if (decl_type.IsSubclassOf (TypeManager.enum_type)) {
+						Expression enum_member = MemberLookup (
+							ec, decl_type, "value__", loc); 
+						
+						Enum en = TypeManager.LookupEnum (decl_type);
+						
+						Constant c;
+						if (en != null)
+							c = Constantify (o, en.UnderlyingType);
+						else 
+							c = Constantify (o, enum_member.Type);
+						
+						return new EnumConstant (c, decl_type);
+					}
+					
+					Expression exp = Constantify (o, t);
+					
+					return exp;
+				}
+
+				if (!fe.FieldInfo.IsStatic){
+					error176 (loc, fe.FieldInfo.Name);
+					return null;
+				}
+				return member_lookup;
+			}
+
+			if (member_lookup is EventExpr){
+
+				EventExpr ee = (EventExpr) member_lookup;
+				
+				//
+				// If the event is local to this class, we transform ourselves into
+				// a FieldExpr
+				//
+
+				Expression ml = MemberLookup (
+					ec, ec.TypeContainer.TypeBuilder, ee.EventInfo.Name,
+					MemberTypes.Event, AllBindingFlags, loc);
+
+				if (ml != null) {
+					MemberInfo mi = ec.TypeContainer.GetFieldFromEvent ((EventExpr) ml);
+
+					ml = ExprClassFromMemberInfo (ec, mi, loc);
+					
+					if (ml == null) {
+						Report.Error (-200, loc, "Internal error!!");
+						return null;
+					}
+
+					return ResolveMemberAccess (ec, ml, left, loc);
+				}
+
+				if (!ee.IsStatic) {
+					SimpleName.Error120 (loc, ee.EventInfo.Name);
+					return null;
+				}
+				
+				return ee;
+			}
+
+			Console.WriteLine ("Left is: " + left);
+			Report.Error (-100, loc, "Support for [" + member_lookup + "] is not present yet");
+			Environment.Exit (0);
+
+			return null;
+		}
+		
+		public ResolveInstanceMemberAccess (EmitContext ec, Expression member_lookup,
+						    Expression left, Location loc)
+		{
+			if (member_lookup is MethodGroupExpr){
+				//
+				// Instance.MethodGroup
+				//
+				if (!mg.RemoveStaticMethods ()){
+					error176 (loc, mg.Methods [0].Name);
+					return null;
+				}
+				
+				mg.InstanceExpression = left;
+					
+				return member_lookup;
+			}
+
+			if (member_lookup is PropertyExpr){
+				PropertyExpr pe = (PropertyExpr) member_lookup;
+
+				if (pe.IsStatic){
+					error176 (loc, pe.PropertyInfo.Name);
+					return null;
+				}
+				pe.InstanceExpression = left;
+				
+				return pe;
+			}
+
+			Type left_type = left.type;
+
+			if (left_type.IsValueType){
+			} else {
+				
+			}
+		}
+		
+		public override Expression DoResolve (EmitContext ec)
+		{
+			//
+			// We are the sole users of ResolveWithSimpleName (ie, the only
+			// ones that can cope with it
+			//
+			expr = expr.ResolveWithSimpleName (ec);
+
+			if (expr == null)
+				return null;
+
+			if (expr is SimpleName){
+				SimpleName child_expr = (SimpleName) expr;
+				
+				expr = new SimpleName (child_expr.Name + "." + Identifier, loc);
+
+				return expr.ResolveWithSimpleName (ec);
+			}
+
+			//
+			// Handle enums here when they are in transit.
+			// Note that we cannot afford to hit MemberLookup in this case because
+			// it will fail to find any members at all (Why?)
+			//
+
+			Type expr_type = expr.Type;
+			if (expr_type.IsSubclassOf (TypeManager.enum_type)) {
+				
+				Enum en = TypeManager.LookupEnum (expr_type);
+				
+				if (en != null) {
+					object value = en.LookupEnumValue (ec, Identifier, loc);
+
+					if (value == null)
+						return null;
+					
+					Constant c = Constantify (value, en.UnderlyingType);
+					return new EnumConstant (c, expr_type);
+				}
+			}
+
+			member_lookup = MemberLookup (ec, expr.Type, Identifier, loc);
+
+			if (member_lookup == null)
+				return null;
+
+			if (expr is TypeExpr)
+				return ResolveTypeMemberAccess (ec, member_lookup, expr, loc);
+			else
+				return ResolveInstanceMemberAccess (ec, member_lookup, expr, loc);
+		}
+#endif
diff --git a/mcs/mcs/parameter.cs b/mcs/mcs/parameter.cs
new file mode 100755
index 00000000000..ab125da9719
--- /dev/null
+++ b/mcs/mcs/parameter.cs
@@ -0,0 +1,422 @@
+//
+// parameter.cs: Parameter definition.
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+//
+//
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Collections;
+
+namespace Mono.CSharp {
+
+
+	/// <summary>
+	///   Represents a single method parameter
+	/// </summary>
+	public class Parameter {
+		[Flags]
+		public enum Modifier : byte {
+			NONE    = 0,
+			REF     = 1,
+			OUT     = 2,
+			PARAMS  = 4,
+			// This is a flag which says that it's either REF or OUT.
+			ISBYREF = 8
+		}
+
+		public readonly Expression TypeName;
+		public readonly Modifier ModFlags;
+		public Attributes OptAttributes;
+		public readonly string Name;
+		public Type parameter_type;
+		
+		public Parameter (Expression type, string name, Modifier mod, Attributes attrs)
+		{
+			Name = name;
+			ModFlags = mod;
+			TypeName = type;
+			OptAttributes = attrs;
+		}
+
+		// <summary>
+		//   Resolve is used in method definitions
+		// </summary>
+		public bool Resolve (DeclSpace ds, Location l)
+		{
+			parameter_type = ds.ResolveType (TypeName, false, l);
+			return parameter_type != null;
+		}
+
+		// <summary>
+		//   ResolveAndDefine is used by delegate declarations, because
+		//   they happen during the initial tree resolution process
+		// </summary>
+		public bool ResolveAndDefine (DeclSpace ds)
+		{
+			// FIXME: Should use something else instead of Location.Null
+			parameter_type = ds.ResolveType (TypeName, true, Location.Null);
+			return parameter_type != null;
+		}
+		
+		public Type ExternalType (DeclSpace ds, Location l)
+		{
+			if ((ModFlags & Parameter.Modifier.ISBYREF) != 0){
+				string n = parameter_type.FullName + "&";
+
+				Type t = RootContext.LookupType (ds, n, false, l);
+
+				return t;
+			}
+			
+			return parameter_type;
+		}
+
+		public Type ParameterType {
+			get {
+				return parameter_type;
+			}
+		}
+		
+		public ParameterAttributes Attributes {
+			get {
+				switch (ModFlags){
+				case Modifier.NONE:
+					return ParameterAttributes.None;
+				case Modifier.REF:
+					return ParameterAttributes.None;
+				case Modifier.OUT:
+					return ParameterAttributes.Out;
+				case Modifier.PARAMS:
+					return 0;
+				}
+				
+				return ParameterAttributes.None;
+			}
+		}
+		
+		/// <summary>
+		///   Returns the signature for this parameter evaluating it on the
+		///   @tc context
+		/// </summary>
+		public string GetSignature (DeclSpace ds, Location loc)
+		{
+			if (parameter_type == null){
+				if (!Resolve (ds, loc))
+					return null;
+			}
+
+			return ExternalType (ds, loc).FullName;
+		}
+	}
+
+	/// <summary>
+	///   Represents the methods parameters
+	/// </summary>
+	public class Parameters {
+		public Parameter [] FixedParameters;
+		public readonly Parameter ArrayParameter;
+		string signature;
+		Type [] types;
+		Location loc;
+		
+		static Parameters empty_parameters;
+		
+		public Parameters (Parameter [] fixed_parameters, Parameter array_parameter, Location l)
+		{
+			FixedParameters = fixed_parameters;
+			ArrayParameter  = array_parameter;
+			loc = l;
+		}
+
+		/// <summary>
+		///   This is used to reuse a set of empty parameters, because they
+		///   are common
+		/// </summary>
+		public static Parameters EmptyReadOnlyParameters {
+			get {
+				if (empty_parameters == null)
+					empty_parameters = new Parameters (null, null, Location.Null);
+			
+				return empty_parameters;
+			}
+		}
+		
+		public bool Empty {
+			get {
+				return (FixedParameters == null) && (ArrayParameter == null);
+			}
+		}
+		
+		public void ComputeSignature (DeclSpace ds)
+		{
+			signature = "";
+			if (FixedParameters != null){
+				for (int i = 0; i < FixedParameters.Length; i++){
+					Parameter par = FixedParameters [i];
+					
+					signature += par.GetSignature (ds, loc);
+				}
+			}
+			//
+			// Note: as per the spec, the `params' arguments (ArrayParameter)
+			// are not used in the signature computation for a method
+			//
+		}
+
+		static void error100 (string name)
+		{
+			Report.Error (
+				100, "The parameter name `" + name + "' is a duplicate");
+		}
+		
+		public bool VerifyArgs ()
+		{
+			int count;
+			int i, j;
+
+			if (FixedParameters == null)
+				return true;
+			
+			count = FixedParameters.Length;
+			string array_par_name = ArrayParameter != null ? ArrayParameter.Name : null;
+			for (i = 0; i < count; i++){
+				string base_name = FixedParameters [i].Name;
+				
+				for (j = i + 1; j < count; j++){
+					if (base_name != FixedParameters [j].Name)
+						continue;
+					error100 (base_name);
+					return false;
+				}
+
+				if (base_name == array_par_name){
+					error100 (base_name);
+					return false;
+				}
+			}
+			return true;
+		}
+		
+		/// <summary>
+		///    Returns the signature of the Parameters evaluated in
+		///    the @tc environment
+		/// </summary>
+		public string GetSignature (DeclSpace ds)
+		{
+			if (signature == null){
+				VerifyArgs ();
+				ComputeSignature (ds);
+			}
+			
+			return signature;
+		}
+		
+		/// <summary>
+		///    Returns the paramenter information based on the name
+		/// </summary>
+		public Parameter GetParameterByName (string name, out int idx)
+		{
+			idx = 0;
+			int i = 0;
+
+			if (FixedParameters != null){
+				foreach (Parameter par in FixedParameters){
+					if (par.Name == name){
+						idx = i;
+						return par;
+					}
+					i++;
+				}
+			}
+
+			if (ArrayParameter != null){
+				if (name == ArrayParameter.Name){
+					idx = i;
+					return ArrayParameter;
+				}
+			}
+			
+			return null;
+		}
+
+		bool ComputeParameterTypes (DeclSpace ds)
+		{
+			int extra = (ArrayParameter != null) ? 1 : 0;
+			int i = 0;
+			int pc;
+
+			if (FixedParameters == null)
+				pc = extra;
+			else
+				pc = extra + FixedParameters.Length;
+
+			types = new Type [pc];
+			
+			if (!VerifyArgs ()){
+				FixedParameters = null;
+				return false;
+			}
+
+			bool failed = false;
+			if (FixedParameters != null){
+				foreach (Parameter p in FixedParameters){
+					Type t = null;
+					
+					if (p.Resolve (ds, loc))
+						t = p.ExternalType (ds, loc);
+					else
+						failed = true;
+					
+					types [i] = t;
+					i++;
+				}
+			}
+			
+			if (failed)
+				types = null;
+			
+			if (extra > 0){
+				if (ArrayParameter.Resolve (ds, loc))
+					types [i] = ArrayParameter.ExternalType (ds, loc);
+				else
+					return false;
+			}
+
+			return true;
+		}
+
+		//
+		// This variant is used by Delegates, because they need to
+		// resolve/define names, instead of the plain LookupType
+		//
+		public bool ComputeAndDefineParameterTypes (DeclSpace ds)
+		{
+			int extra = (ArrayParameter != null) ? 1 : 0;
+			int i = 0;
+			int pc;
+
+			if (FixedParameters == null)
+				pc = extra;
+			else
+				pc = extra + FixedParameters.Length;
+			
+			types = new Type [pc];
+			
+			if (!VerifyArgs ()){
+				FixedParameters = null;
+				return false;
+			}
+
+			bool ok_flag = true;
+			
+			if (FixedParameters != null){
+				foreach (Parameter p in FixedParameters){
+					Type t = null;
+					
+					if (p.ResolveAndDefine (ds))
+						t = p.ExternalType (ds, loc);
+					else
+						ok_flag = false;
+					
+					types [i] = t;
+					i++;
+				}
+			}
+			
+			if (extra > 0){
+				if (ArrayParameter.ResolveAndDefine (ds))
+					types [i] = ArrayParameter.ExternalType (ds, loc);
+				else
+					ok_flag = false;
+			}
+
+			//
+			// invalidate the cached types
+			//
+			if (!ok_flag){
+				types = null;
+			}
+			
+			return ok_flag;
+		}
+		
+		/// <summary>
+		///   Returns the argument types as an array
+		/// </summary>
+		static Type [] no_types = new Type [0];
+		
+		public Type [] GetParameterInfo (DeclSpace ds)
+		{
+			if (types != null)
+				return types;
+			
+			if (FixedParameters == null && ArrayParameter == null)
+				return no_types;
+
+			if (ComputeParameterTypes (ds) == false){
+				types = null;
+				return null;
+			}
+
+			return types;
+		}
+
+		/// <summary>
+		///   Returns the type of a given parameter, and stores in the `is_out'
+		///   boolean whether this is an out or ref parameter.
+		///
+		///   Note that the returned type will not contain any dereference in this
+		///   case (ie, you get "int" for a ref int instead of "int&"
+		/// </summary>
+		public Type GetParameterInfo (DeclSpace ds, int idx, out Parameter.Modifier mod)
+		{
+			mod = Parameter.Modifier.NONE;
+			
+			if (!VerifyArgs ()){
+				FixedParameters = null;
+				return null;
+			}
+
+			if (FixedParameters == null && ArrayParameter == null)
+				return null;
+			
+			if (types == null)
+				if (ComputeParameterTypes (ds) == false)
+					return null;
+
+			//
+			// If this is a request for the variable lenght arg.
+			//
+			int array_idx = (FixedParameters != null ? FixedParameters.Length : 0);
+			if (idx == array_idx)
+				return types [idx];
+
+			//
+			// Otherwise, it is a fixed parameter
+			//
+			Parameter p = FixedParameters [idx];
+			mod = p.ModFlags;
+
+			if ((mod & (Parameter.Modifier.REF | Parameter.Modifier.OUT)) != 0)
+				mod |= Parameter.Modifier.ISBYREF;
+
+			return p.ParameterType;
+		}
+
+		public CallingConventions GetCallingConvention ()
+		{
+			// For now this is the only correc thing to do
+			return CallingConventions.Standard;
+		}
+	}
+}
+		
+	
+
diff --git a/mcs/mcs/parameterCollection.cs b/mcs/mcs/parameterCollection.cs
new file mode 100755
index 00000000000..222742544b1
--- /dev/null
+++ b/mcs/mcs/parameterCollection.cs
@@ -0,0 +1,166 @@
+//
+// System.CodeDOM CodeParameterCollection Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+namespace Mono.CSharp {
+
+	using System.Collections;
+	using System;
+	
+	public class ParameterCollection : IList, ICollection, IEnumerable {
+
+		ArrayList parameters;
+		
+		//
+		// Constructors
+		//
+		public ParameterCollection ()
+		{
+			parameters = new ArrayList ();
+		}
+
+		//
+		// Properties
+		//
+		public int Count {
+			get {
+				return parameters.Count;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public void Add (Parameter value)
+		{
+			parameters.Add (value);
+		}
+
+		public void AddRange (Parameter [] values)
+		{
+			foreach (Parameter ca in values) 
+				parameters.Add (ca);
+
+		}
+
+		public void Clear ()
+		{
+			parameters.Clear ();
+		}
+
+		private class Enumerator : IEnumerator {
+			private ParameterCollection collection;
+			private int currentIndex = -1;
+
+			internal Enumerator (ParameterCollection collection)
+			{
+				this.collection = collection;
+			}
+
+			public object Current {
+				get {
+					if (currentIndex == collection.Count)
+						throw new InvalidOperationException ();
+					return collection [currentIndex];
+				}
+			}
+
+			public bool MoveNext ()
+			{
+				if (currentIndex > collection.Count)
+					throw new InvalidOperationException ();
+				return ++currentIndex < collection.Count;
+			}
+
+			public void Reset ()
+			{
+				currentIndex = -1;
+			}
+		}
+		
+		public IEnumerator GetEnumerator ()
+		{
+			return new ParameterCollection.Enumerator (this);
+		}
+
+		//
+		// IList method implementations
+		//
+		public int Add (object value)
+		{
+			return parameters.Add (value);
+		}
+
+		public bool Contains (Object value)
+		{
+			return parameters.Contains (value);
+		}
+
+		public int IndexOf (Object value)
+		{
+			return parameters.IndexOf (value);
+		}
+
+		public void Insert (int index, Object value)
+		{
+			parameters [index] = value;
+		}
+
+		public object this[int index] {
+			get {
+				return parameters [index];
+			}
+
+			set {
+				parameters [index] = value;
+			}
+		}
+
+		public void Remove (object value)
+		{
+			parameters.Remove (value);
+		}
+
+		public void RemoveAt (int index)
+		{
+			parameters.RemoveAt (index);
+		}
+
+		//
+		// ICollection method implementations
+		//
+		public void CopyTo (Array array, int index)
+		{
+			parameters.CopyTo (array, index);
+		}
+
+		public object SyncRoot {
+			get {
+				return parameters.SyncRoot;
+			}
+		}
+
+		public bool IsReadOnly {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsSynchronized {
+			get {
+				return parameters.IsSynchronized;
+			}
+		}
+
+		public bool IsFixedSize {
+			get {
+				return false;
+			}
+		}
+	}
+}
diff --git a/mcs/mcs/parser.cs b/mcs/mcs/parser.cs
new file mode 100755
index 00000000000..c30a354ff91
--- /dev/null
+++ b/mcs/mcs/parser.cs
@@ -0,0 +1,23 @@
+

+namespace Compiler {

+

+	using System;

+

+	abstract public class Parser {

+		public string name;

+		public System.IO.Stream input;

+		

+		public Parser (Mono.CSharp.Tree tree, string name, System.IO.Stream stream) 

+		{

+			this.tree = tree;

+			this.name = name;

+			this.input = stream;

+		}

+

+		public string getName (){

+			return name;

+		}

+

+		abstract public int parse ();

+	}

+}

diff --git a/mcs/mcs/pending.cs b/mcs/mcs/pending.cs
new file mode 100755
index 00000000000..251bfd54a5a
--- /dev/null
+++ b/mcs/mcs/pending.cs
@@ -0,0 +1,513 @@
+//
+// pending.cs: Pending method implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001, 2002 Ximian, Inc (http://www.ximian.com)
+//
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+
+namespace Mono.CSharp {
+
+	struct TypeAndMethods {
+		public Type          type;
+		public MethodInfo [] methods;
+		
+		// Far from ideal, but we want to avoid creating a copy
+		// of methods above.
+		public Type [][]     args;
+		
+		//
+		// This flag on the method says `We found a match, but
+		// because it was private, we could not use the match
+		//
+		public bool []       found;
+
+		// If a method is defined here, then we always need to
+		// create a proxy for it.  This is used when implementing
+		// an interface's indexer with a different IndexerName.
+		public MethodInfo [] need_proxy;
+	}
+
+	public class PendingImplementation {
+		/// <summary>
+		///   The container for this PendingImplementation
+		/// </summary>
+		TypeContainer container;
+		
+		/// <summary>
+		///   This filter is used by FindMembers, and it is used to
+		///   extract only virtual/abstract fields
+		/// </summary>
+		static MemberFilter virtual_method_filter;
+
+		/// <summary>
+		///   This is the array of TypeAndMethods that describes the pending implementations
+		///   (both interfaces and abstract methods in parent class)
+		/// </summary>
+		TypeAndMethods [] pending_implementations;
+
+		static bool IsVirtualFilter (MemberInfo m, object filterCriteria)
+		{
+			if (!(m is MethodInfo))
+				return false;
+
+			return ((MethodInfo) m).IsVirtual;
+		}
+
+		/// <summary>
+		///   Inits the virtual_method_filter
+		/// </summary>
+		static PendingImplementation ()
+		{
+			virtual_method_filter = new MemberFilter (IsVirtualFilter);
+		}
+
+		// <remarks>
+		//   Returns a list of the abstract methods that are exposed by all of our
+		//   parents that we must implement.  Notice that this `flattens' the
+		//   method search space, and takes into account overrides.  
+		// </remarks>
+		static ArrayList GetAbstractMethods (Type t)
+		{
+			ArrayList list = null;
+			bool searching = true;
+			Type current_type = t;
+			
+			do {
+				MemberList mi;
+				
+				mi = TypeContainer.FindMembers (
+					current_type, MemberTypes.Method,
+					BindingFlags.Public | BindingFlags.Instance |
+					BindingFlags.DeclaredOnly,
+					virtual_method_filter, null);
+
+				if (current_type == TypeManager.object_type)
+					searching = false;
+				else {
+					current_type = current_type.BaseType;
+					if (!current_type.IsAbstract)
+						searching = false;
+				}
+
+				if (mi.Count == 0)
+					continue;
+
+				if (mi.Count == 1 && !(mi [0] is MethodBase))
+					searching = false;
+				else 
+					list = TypeManager.CopyNewMethods (list, mi);
+			} while (searching);
+
+			if (list == null)
+				return null;
+			
+			for (int i = 0; i < list.Count; i++){
+				while (list.Count > i && !((MethodInfo) list [i]).IsAbstract)
+					list.RemoveAt (i);
+			}
+
+			if (list.Count == 0)
+				return null;
+
+			return list;
+		}
+
+		PendingImplementation (TypeContainer container, Type [] ifaces, ArrayList abstract_methods, int total)
+		{
+			TypeBuilder type_builder = container.TypeBuilder;
+			
+			this.container = container;
+			pending_implementations = new TypeAndMethods [total];
+
+			int i = 0;
+			if (ifaces != null){
+				foreach (Type t in ifaces){
+					MethodInfo [] mi;
+
+					if (t is TypeBuilder){
+						Interface iface;
+
+						iface = TypeManager.LookupInterface (t);
+						
+						mi = iface.GetMethods ();
+					} else
+						mi = t.GetMethods ();
+
+					int count = mi.Length;
+					pending_implementations [i].type = t;
+					pending_implementations [i].methods = mi;
+					pending_implementations [i].args = new Type [count][];
+					pending_implementations [i].found = new bool [count];
+					pending_implementations [i].need_proxy = new MethodInfo [count];
+
+					int j = 0;
+					foreach (MethodInfo m in mi){
+						Type [] types = TypeManager.GetArgumentTypes (m);
+
+						pending_implementations [i].args [j] = types;
+						j++;
+					}
+					i++;
+				}
+			}
+
+			if (abstract_methods != null){
+				int count = abstract_methods.Count;
+				pending_implementations [i].methods = new MethodInfo [count];
+				pending_implementations [i].need_proxy = new MethodInfo [count];
+				
+				abstract_methods.CopyTo (pending_implementations [i].methods, 0);
+				pending_implementations [i].found = new bool [count];
+				pending_implementations [i].args = new Type [count][];
+				pending_implementations [i].type = type_builder;
+				
+				int j = 0;
+				foreach (MemberInfo m in abstract_methods){
+					MethodInfo mi = (MethodInfo) m;
+					
+					Type [] types = TypeManager.GetArgumentTypes (mi);
+					
+					pending_implementations [i].args [j] = types;
+					j++;
+				}
+			}
+		}
+		
+		//
+		// Factory method: if there are pending implementation methods, we return a PendingImplementation
+		// object, otherwise we return null.
+		//
+		// Register method implementations are either abstract methods
+		// flagged as such on the base class or interface methods
+		//
+		static public PendingImplementation GetPendingImplementations (TypeContainer container)
+		{
+			TypeBuilder type_builder = container.TypeBuilder;
+			Type [] ifaces;
+			Type b = type_builder.BaseType;
+			int icount = 0;
+
+			//
+			// Notice that TypeBuilders will only return the interfaces that the Type
+			// is supposed to implement, not all the interfaces that the type implements.
+			//
+			// Completely broken.  Anyways, we take advantage of this, so we only register
+			// the implementations that we need, as they are those that are listed by the
+			// TypeBuilder.
+			//
+			ifaces = type_builder.GetInterfaces ();
+#if DEBUG
+			{
+				Type x = type_builder;
+
+				while (x != null){
+					Type [] iff = x.GetInterfaces ();
+					Console.WriteLine ("Type: " + x.Name);
+					
+					foreach (Type tt in iff){
+						Console.WriteLine ("  Iface: " + tt.Name);
+					}
+					x = x.BaseType;
+				}
+			}
+#endif
+					
+			icount = ifaces.Length;
+
+			//
+			// If we are implementing an abstract class, and we are not
+			// ourselves abstract, and there are abstract methods (C# allows
+			// abstract classes that have no abstract methods), then allocate
+			// one slot.
+			//
+			// We also pre-compute the methods.
+			//
+			bool implementing_abstract = ((b != null) && b.IsAbstract && !type_builder.IsAbstract);
+			ArrayList abstract_methods = null;
+
+			if (implementing_abstract){
+				abstract_methods = GetAbstractMethods (b);
+				
+				if (abstract_methods == null)
+					implementing_abstract = false;
+			}
+			
+			int total = icount +  (implementing_abstract ? 1 : 0);
+			if (total == 0)
+				return null;
+
+			return new PendingImplementation (container, ifaces, abstract_methods, total);
+		}
+
+		public enum Operation {
+			//
+			// If you change this, review the whole InterfaceMethod routine as there
+			// are a couple of assumptions on these three states
+			//
+			Lookup, ClearOne, ClearAll
+		}
+
+		/// <summary>
+		///   Whether the specified method is an interface method implementation
+		/// </summary>
+		public MethodInfo IsInterfaceMethod (Type t, string name, Type ret_type, Type [] args)
+		{
+			return InterfaceMethod (t, name, ret_type, args, Operation.Lookup, null);
+		}
+
+		public MethodInfo IsInterfaceIndexer (Type t, Type ret_type, Type [] args)
+		{
+			return InterfaceMethod (t, null, ret_type, args, Operation.Lookup, null);
+		}
+
+		public void ImplementMethod (Type t, string name, Type ret_type, Type [] args, bool clear_one) 
+		{
+			InterfaceMethod (t, name, ret_type, args,
+					 clear_one ? Operation.ClearOne : Operation.ClearAll, null);
+		}
+
+		public void ImplementIndexer (Type t, MethodInfo mi, Type ret_type, Type [] args, bool clear_one) 
+		{
+			InterfaceMethod (t, mi.Name, ret_type, args,
+					 clear_one ? Operation.ClearOne : Operation.ClearAll, mi);
+		}
+		
+		/// <remarks>
+		///   If a method in Type `t' (or null to look in all interfaces
+		///   and the base abstract class) with name `Name', return type `ret_type' and
+		///   arguments `args' implements an interface, this method will
+		///   return the MethodInfo that this method implements.
+		///
+		///   If `name' is null, we operate solely on the method's signature.  This is for
+		///   instance used when implementing indexers.
+		///
+		///   The `Operation op' controls whether to lookup, clear the pending bit, or clear
+		///   all the methods with the given signature.
+		///
+		///   The `MethodInfo need_proxy' is used when we're implementing an interface's
+		///   indexer in a class.  If the new indexer's IndexerName does not match the one
+		///   that was used in the interface, then we always need to create a proxy for it.
+		///
+		/// </remarks>
+		public MethodInfo InterfaceMethod (Type t, string name, Type ret_type, Type [] args,
+						   Operation op, MethodInfo need_proxy)
+		{
+			int arg_len = args.Length;
+
+			if (pending_implementations == null)
+				return null;
+
+			foreach (TypeAndMethods tm in pending_implementations){
+				if (!(t == null || tm.type == t))
+					continue;
+
+				int i = 0;
+				foreach (MethodInfo m in tm.methods){
+					if (m == null){
+						i++;
+						continue;
+					}
+
+					// `need_proxy' is not null when we're implementing an
+					// interface indexer and this is Clear(One/All) operation.
+					// If `name' is null, then we do a match solely based on the
+					// signature and not on the name (this is done in the Lookup
+					// for an interface indexer).
+					if ((name != null) && (need_proxy == null) && (name != m.Name)){
+						i++;
+						continue;
+					}
+
+					if (ret_type != m.ReturnType){
+						if (!((ret_type == null && m.ReturnType == TypeManager.void_type) ||
+						      (m.ReturnType == null && ret_type == TypeManager.void_type)))
+						{
+							i++;
+							continue;
+						}
+					}
+
+					//
+					// Check if we have the same parameters
+					//
+					if (tm.args [i].Length != arg_len){
+						i++;
+						continue;
+					}
+
+					int j, top = args.Length;
+					bool fail = false;
+					
+					for (j = 0; j < top; j++){
+						if (tm.args [i][j] != args[j]){
+							fail = true;
+							break;
+						}
+					}
+					if (fail){
+						i++;
+						continue;
+					}
+
+					if (op != Operation.Lookup){
+						// If `t != null', then this is an explicitly interface
+						// implementation and we can always clear the method.
+						// `need_proxy' is not null if we're implementing an
+						// interface indexer.  In this case, we need to create
+						// a proxy if the implementation's IndexerName doesn't
+						// match the IndexerName in the interface.
+						if ((t == null) && (need_proxy != null) && (name != m.Name))
+							tm.need_proxy [i] = need_proxy;
+						else
+							tm.methods [i] = null;
+					}
+					tm.found [i] = true;
+
+					//
+					// Lookups and ClearOne return
+					//
+					if (op != Operation.ClearAll)
+						return m;
+				}
+
+				// If a specific type was requested, we can stop now.
+				if (tm.type == t)
+					return null;
+			}
+			return null;
+		}
+
+		/// <summary>
+		///   C# allows this kind of scenarios:
+		///   interface I { void M (); }
+		///   class X { public void M (); }
+		///   class Y : X, I { }
+		///
+		///   For that case, we create an explicit implementation function
+		///   I.M in Y.
+		/// </summary>
+		void DefineProxy (Type iface, MethodInfo parent_method, MethodInfo iface_method,
+				  Type [] args)
+		{
+			MethodBuilder proxy;
+
+			string proxy_name = iface.Name + "." + iface_method.Name;
+
+			proxy = container.TypeBuilder.DefineMethod (
+				proxy_name,
+				MethodAttributes.HideBySig |
+				MethodAttributes.NewSlot |
+				MethodAttributes.Virtual,
+				CallingConventions.Standard | CallingConventions.HasThis,
+				parent_method.ReturnType, args);
+
+			int top = args.Length;
+			ILGenerator ig = proxy.GetILGenerator ();
+
+			ig.Emit (OpCodes.Ldarg_0);
+			for (int i = 0; i < top; i++){
+				switch (i){
+				case 0:
+					ig.Emit (OpCodes.Ldarg_1); break;
+				case 1:
+					ig.Emit (OpCodes.Ldarg_2); break;
+				case 2:
+					ig.Emit (OpCodes.Ldarg_3); break;
+				default:
+					ig.Emit (OpCodes.Ldarg, i - 1); break;
+				}
+			}
+			ig.Emit (OpCodes.Call, parent_method);
+			ig.Emit (OpCodes.Ret);
+
+			container.TypeBuilder.DefineMethodOverride (proxy, iface_method);
+		}
+		
+		/// <summary>
+		///   This function tells whether one of our parent classes implements
+		///   the given method (which turns out, it is valid to have an interface
+		///   implementation in a parent
+		/// </summary>
+		bool ParentImplements (Type iface_type, MethodInfo mi)
+		{
+			MethodSignature ms;
+			
+			Type [] args = TypeManager.GetArgumentTypes (mi);
+			ms = new MethodSignature (mi.Name, mi.ReturnType, args);
+			MemberList list = TypeContainer.FindMembers (
+				container.TypeBuilder.BaseType, MemberTypes.Method | MemberTypes.Property,
+				BindingFlags.Public | BindingFlags.Instance,
+				MethodSignature.method_signature_filter, ms);
+
+			if (list.Count == 0)
+				return false;
+
+			DefineProxy (iface_type, (MethodInfo) list [0], mi, args);
+			return true;
+		}
+
+		/// <summary>
+		///   Verifies that any pending abstract methods or interface methods
+		///   were implemented.
+		/// </summary>
+		public bool VerifyPendingMethods ()
+		{
+			int top = pending_implementations.Length;
+			bool errors = false;
+			int i;
+			
+			for (i = 0; i < top; i++){
+				Type type = pending_implementations [i].type;
+				int j = 0;
+				
+				foreach (MethodInfo mi in pending_implementations [i].methods){
+					if (mi == null)
+						continue;
+
+					if (type.IsInterface){
+						MethodInfo need_proxy =
+							pending_implementations [i].need_proxy [j];
+
+						if (need_proxy != null) {
+							Type [] args = TypeManager.GetArgumentTypes (mi);
+							DefineProxy (type, need_proxy, mi, args);
+							continue;
+						}
+
+						if (ParentImplements (type, mi))
+							continue;
+
+						string extra = "";
+						
+						if (pending_implementations [i].found [j])
+							extra = ".  (method might be private or static)";
+						Report.Error (
+							536, container.Location,
+							"`" + container.Name + "' does not implement " +
+							"interface member `" +
+							type.FullName + "." + mi.Name + "'" + extra);
+					} else {
+						Report.Error (
+							534, container.Location,
+							"`" + container.Name + "' does not implement " +
+							"inherited abstract member `" +
+							type.FullName + "." + mi.Name + "'");
+					}
+					errors = true;
+					j++;
+				}
+			}
+			return errors;
+		}
+	} /* end of class */
+}
diff --git a/mcs/mcs/report.cs b/mcs/mcs/report.cs
new file mode 100644
index 00000000000..50c355f8ae7
--- /dev/null
+++ b/mcs/mcs/report.cs
@@ -0,0 +1,359 @@
+//
+// report.cs: report errors and warnings.
+//
+// Author: Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc. (http://www.ximian.com)
+//
+
+//
+// FIXME: currently our class library does not support custom number format strings
+//
+using System;
+using System.Text;
+using System.Collections;
+using System.Diagnostics;
+
+namespace Mono.CSharp {
+
+	/// <summary>
+	///   This class is used to report errors and warnings t te user.
+	/// </summary>
+	public class Report {
+		/// <summary>  
+		///   Errors encountered so far
+		/// </summary>
+		static public int Errors;
+
+		/// <summary>  
+		///   Warnings encountered so far
+		/// </summary>
+		static public int Warnings;
+
+		/// <summary>  
+		///   Whether errors should be throw an exception
+		/// </summary>
+		static public bool Fatal;
+		
+		/// <summary>  
+		///   Whether warnings should be considered errors
+		/// </summary>
+		static public bool WarningsAreErrors;
+
+		/// <summary>  
+		///   Whether to dump a stack trace on errors. 
+		/// </summary>
+		static public bool Stacktrace;
+		
+		//
+		// If the 'expected' error code is reported then the
+                // compilation succeeds.
+		//
+		// Used for the test suite to excercise the error codes
+		//
+		static int expected_error = 0;
+
+		//
+		// Keeps track of the warnings that we are ignoring
+		//
+		static Hashtable warning_ignore_table;
+		
+		static void Check (int code)
+		{
+			if (code == expected_error){
+				if (Fatal)
+					throw new Exception ();
+				
+				Environment.Exit (0);
+			}
+		}
+		
+		static public void RealError (string msg)
+		{
+			Errors++;
+			Console.WriteLine (msg);
+
+			if (Stacktrace)
+				Console.WriteLine (new StackTrace ().ToString ());
+			if (Fatal)
+				throw new Exception (msg);
+		}
+
+		static public void Error (int code, Location l, string text)
+		{
+			string msg = String.Format (
+				"{0}({1}) error CS{2:0000}: {3}", l.Name, l.Row, code, text);
+//				"{0}({1}) error CS{2}: {3}", l.Name, l.Row, code, text);
+			
+			RealError (msg);
+			Check (code);
+		}
+
+		static public void Warning (int code, Location l, string text)
+		{
+			if (warning_ignore_table != null){
+				if (warning_ignore_table.Contains (code))
+					return;
+			}
+			
+			if (WarningsAreErrors)
+				Error (code, l, text);
+			else {
+				string row;
+				
+				if (Location.IsNull (l))
+					row = "";
+				else
+					row = l.Row.ToString ();
+				
+				Console.WriteLine (String.Format (
+					"{0}({1}) warning CS{2:0000}: {3}",
+//					"{0}({1}) warning CS{2}: {3}",
+					l.Name,  row, code, text));
+				Warnings++;
+				Check (code);
+
+				if (Stacktrace)
+					Console.WriteLine (new StackTrace ().ToString ());
+			}
+		}
+		
+		static public void Warning (int code, string text)
+		{
+			Warning (code, Location.Null, text);
+		}
+
+		static public void Warning (int code, int level, string text)
+		{
+			if (RootContext.WarningLevel >= level)
+				Warning (code, Location.Null, text);
+		}
+
+		static public void Warning (int code, int level, Location l, string text)
+		{
+			if (RootContext.WarningLevel >= level)
+				Warning (code, l, text);
+		}
+
+		static public void Error (int code, string text)
+		{
+			string msg = String.Format ("error CS{0:0000}: {1}", code, text);
+//			string msg = String.Format ("error CS{0}: {1}", code, text);
+			
+			RealError (msg);
+			Check (code);
+		}
+
+		static public void Message (Message m)
+		{
+			if (m is ErrorMessage)
+				Error (m.code, m.text);
+			else
+				Warning (m.code, m.text);
+		}
+
+		static public void SetIgnoreWarning (int code)
+		{
+			if (warning_ignore_table == null)
+				warning_ignore_table = new Hashtable ();
+
+			warning_ignore_table [code] = true;
+		}
+		
+                static public int ExpectedError {
+                        set {
+                                expected_error = value;
+                        }
+                        get {
+                                return expected_error;
+                        }
+                }
+
+		public static int DebugFlags = 0;
+
+		[Conditional ("MCS_DEBUG")]
+		static public void Debug (string message, params object[] args)
+		{
+			Debug (4, message, args);
+		}
+			
+		[Conditional ("MCS_DEBUG")]
+		static public void Debug (int category, string message, params object[] args)
+		{
+			if ((category & DebugFlags) == 0)
+				return;
+
+			StringBuilder sb = new StringBuilder (message);
+
+			if ((args != null) && (args.Length > 0)) {
+				sb.Append (": ");
+
+				bool first = true;
+				foreach (object arg in args) {
+					if (first)
+						first = false;
+					else
+						sb.Append (",");
+					if (arg == null)
+						sb.Append ("null");
+					else if (arg is ICollection)
+						sb.Append (PrintCollection ((ICollection) arg));
+					else
+						sb.Append (arg);
+				}
+			}
+
+			Console.WriteLine (sb.ToString ());
+		}
+
+		static public string PrintCollection (ICollection collection)
+		{
+			StringBuilder sb = new StringBuilder ();
+
+			sb.Append (collection.GetType ());
+			sb.Append ("(");
+
+			bool first = true;
+			foreach (object o in collection) {
+				if (first)
+					first = false;
+				else
+					sb.Append (",");
+				sb.Append (o);
+			}
+
+			sb.Append (")");
+			return sb.ToString ();
+		}
+	}
+
+	public class Message {
+		public int code;
+		public string text;
+		
+		public Message (int code, string text)
+		{
+			this.code = code;
+			this.text = text;
+		}
+	}
+
+	public class WarningMessage : Message {
+		public WarningMessage (int code, string text) : base (code, text)
+		{
+		}
+	}
+
+	public class ErrorMessage : Message {
+		public ErrorMessage (int code, string text) : base (code, text)
+		{
+		}
+
+		//
+		// For compatibility reasons with old code.
+		//
+		public static void report_error (string error)
+		{
+			Console.Write ("ERROR: ");
+			Console.WriteLine (error);
+		}
+	}
+
+	public enum TimerType {
+		FindMembers	= 0,
+		TcFindMembers	= 1,
+		MemberLookup	= 2,
+		CachedLookup	= 3,
+		CacheInit	= 4,
+		MiscTimer	= 5,
+		CountTimers	= 6
+	}
+
+	public enum CounterType {
+		FindMembers	= 0,
+		MemberCache	= 1,
+		MiscCounter	= 2,
+		CountCounters	= 3
+	}
+
+	public class Timer
+	{
+		static DateTime[] timer_start;
+		static TimeSpan[] timers;
+		static long[] timer_counters;
+		static long[] counters;
+
+		static Timer ()
+		{
+			timer_start = new DateTime [(int) TimerType.CountTimers];
+			timers = new TimeSpan [(int) TimerType.CountTimers];
+			timer_counters = new long [(int) TimerType.CountTimers];
+			counters = new long [(int) CounterType.CountCounters];
+
+			for (int i = 0; i < (int) TimerType.CountTimers; i++) {
+				timer_start [i] = DateTime.Now;
+				timers [i] = TimeSpan.Zero;
+			}
+		}
+
+		[Conditional("TIMER")]
+		static public void IncrementCounter (CounterType which)
+		{
+			++counters [(int) which];
+		}
+
+		[Conditional("TIMER")]
+		static public void StartTimer (TimerType which)
+		{
+			timer_start [(int) which] = DateTime.Now;
+		}
+
+		[Conditional("TIMER")]
+		static public void StopTimer (TimerType which)
+		{
+			timers [(int) which] += DateTime.Now - timer_start [(int) which];
+			++timer_counters [(int) which];
+		}
+
+		[Conditional("TIMER")]
+		static public void ShowTimers ()
+		{
+			ShowTimer (TimerType.FindMembers, "- FindMembers timer");
+			ShowTimer (TimerType.TcFindMembers, "- TypeContainer.FindMembers timer");
+			ShowTimer (TimerType.MemberLookup, "- MemberLookup timer");
+			ShowTimer (TimerType.CachedLookup, "- CachedLookup timer");
+			ShowTimer (TimerType.CacheInit, "- Cache init");
+			ShowTimer (TimerType.MiscTimer, "- Misc timer");
+
+			ShowCounter (CounterType.FindMembers, "- Find members");
+			ShowCounter (CounterType.MemberCache, "- Member cache");
+			ShowCounter (CounterType.MiscCounter, "- Misc counter");
+		}
+
+		static public void ShowCounter (CounterType which, string msg)
+		{
+			Console.WriteLine ("{0} {1}", counters [(int) which], msg);
+		}
+
+		static public void ShowTimer (TimerType which, string msg)
+		{
+			Console.WriteLine (
+				"[{0:00}:{1:000}] {2} (used {3} times)",
+				(int) timers [(int) which].TotalSeconds,
+				timers [(int) which].Milliseconds, msg,
+				timer_counters [(int) which]);
+		}
+	}
+
+	public class InternalErrorException : Exception {
+		public InternalErrorException ()
+			: base ("Internal error")
+		{
+		}
+
+		public InternalErrorException (string message)
+			: base (message)
+		{
+		}
+	}
+}
diff --git a/mcs/mcs/rootcontext.cs b/mcs/mcs/rootcontext.cs
new file mode 100755
index 00000000000..9d7ac28af78
--- /dev/null
+++ b/mcs/mcs/rootcontext.cs
@@ -0,0 +1,830 @@
+//
+// rootcontext.cs: keeps track of our tree representation, and assemblies loaded.
+//
+// Author: Miguel de Icaza (miguel@ximian.com)
+//         Ravi Pratap     (ravi@ximian.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Diagnostics;
+
+namespace Mono.CSharp {
+
+	public class RootContext {
+
+		//
+		// Contains the parsed tree
+		//
+		static Tree tree;
+
+		//
+		// This hashtable contains all of the #definitions across the source code
+		// it is used by the ConditionalAttribute handler.
+		//
+		public static Hashtable AllDefines = new Hashtable ();
+		
+		//
+		// The list of global attributes (those that target the assembly)
+		//
+		static Hashtable global_attributes = new Hashtable ();
+		
+		//
+		// Whether we are being linked against the standard libraries.
+		// This is only used to tell whether `System.Object' should
+		// have a parent or not.
+		//
+		public static bool StdLib = true;
+
+		//
+		// This keeps track of the order in which classes were defined
+		// so that we can poulate them in that order.
+		//
+		// Order is important, because we need to be able to tell by
+		// examining the parent's list of methods which ones are virtual
+		// or abstract as well as the parent names (to implement new, 
+		// override).
+		//
+		static ArrayList type_container_resolve_order;
+		static ArrayList interface_resolve_order;
+		static ArrayList attribute_types;
+
+		//
+		// Holds a reference to the Private Implementation Details
+		// class.
+		//
+		static TypeBuilder impl_details_class;
+
+		public static int WarningLevel = 2;
+		
+		//
+		// Constructor
+		//
+		static RootContext ()
+		{
+			tree = new Tree ();
+			interface_resolve_order = new ArrayList ();
+			type_container_resolve_order = new ArrayList ();
+		}
+
+		static public Tree Tree {
+			get {
+				return tree;
+			}
+		}
+
+		static public string MainClass;
+		
+		public static void RegisterOrder (Interface iface)
+		{
+			interface_resolve_order.Add (iface);
+		}
+		
+		public static void RegisterOrder (TypeContainer tc)
+		{
+			type_container_resolve_order.Add (tc);
+		}
+
+		public static void RegisterAttribute (TypeContainer tc)
+		{
+			if (attribute_types == null)
+				attribute_types = new ArrayList ();
+			
+			attribute_types.Add (tc);
+		}
+		
+		// 
+		// The default compiler checked state
+		//
+		static public bool Checked = false;
+
+		//
+		// Whether to allow Unsafe code
+		//
+		static public bool Unsafe = false;
+		
+		static string MakeFQN (string nsn, string name)
+		{
+			string prefix = (nsn == "" ? "" : nsn + ".");
+
+			return prefix + name;
+		}
+		       
+		// <remarks>
+		//   This function is used to resolve the hierarchy tree.
+		//   It processes interfaces, structs and classes in that order.
+		//
+		//   It creates the TypeBuilder's as it processes the user defined
+		//   types.  
+		// </remarks>
+		static public void ResolveTree ()
+		{
+			//
+			// Process the attribute types separately and before anything else
+			//
+			if (attribute_types != null)
+				foreach (TypeContainer tc in attribute_types)
+					tc.DefineType ();
+			
+			//
+			// Interfaces are processed next, as classes and
+			// structs might inherit from an object or implement
+			// a set of interfaces, we need to be able to tell
+			// them appart by just using the TypeManager.
+			//
+			TypeContainer root = Tree.Types;
+
+			ArrayList ifaces = root.Interfaces;
+			if (ifaces != null){
+				foreach (Interface i in ifaces) 
+					i.DefineType ();
+			}
+
+			
+			foreach (TypeContainer tc in root.Types) 
+				tc.DefineType ();
+
+			if (root.Delegates != null)
+				foreach (Delegate d in root.Delegates) 
+					d.DefineType ();
+
+			if (root.Enums != null)
+				foreach (Enum e in root.Enums)
+					e.DefineType ();
+			
+		}
+
+		static void Error_TypeConflict (string name, Location loc)
+		{
+			Report.Error (
+				520, loc, "`" + name + "' conflicts with a predefined type");
+		}
+
+		static void Error_TypeConflict (string name)
+		{
+			Report.Error (
+				520, "`" + name + "' conflicts with a predefined type");
+		}
+
+		//
+		// Resolves a single class during the corlib bootstrap process
+		//
+		static TypeBuilder BootstrapCorlib_ResolveClass (TypeContainer root, string name)
+		{
+			object o = root.GetDefinition (name);
+			if (o == null){
+				Report.Error (518, "The predefined type `" + name + "' is not defined");
+				return null;
+			}
+
+			if (!(o is Class)){
+				if (o is DeclSpace){
+					DeclSpace d = (DeclSpace) o;
+
+					Error_TypeConflict (name, d.Location);
+				} else
+					Error_TypeConflict (name);
+
+				return null;
+			}
+
+			return ((DeclSpace) o).DefineType ();
+		}
+
+		//
+		// Resolves a struct during the corlib bootstrap process
+		//
+		static void BootstrapCorlib_ResolveStruct (TypeContainer root, string name)
+		{
+			object o = root.GetDefinition (name);
+			if (o == null){
+				Report.Error (518, "The predefined type `" + name + "' is not defined");
+				return;
+			}
+
+			if (!(o is Struct)){
+				if (o is DeclSpace){
+					DeclSpace d = (DeclSpace) o;
+
+					Error_TypeConflict (name, d.Location);
+				} else
+					Error_TypeConflict (name);
+
+				return;
+			}
+
+			((DeclSpace) o).DefineType ();
+		}
+
+		//
+		// Resolves a struct during the corlib bootstrap process
+		//
+		static void BootstrapCorlib_ResolveInterface (TypeContainer root, string name)
+		{
+			object o = root.GetDefinition (name);
+			if (o == null){
+				Report.Error (518, "The predefined type `" + name + "' is not defined");
+				return;
+			}
+
+			if (!(o is Interface)){
+				if (o is DeclSpace){
+					DeclSpace d = (DeclSpace) o;
+
+					Error_TypeConflict (name, d.Location);
+				} else
+					Error_TypeConflict (name);
+
+				return;
+			}
+
+			((DeclSpace) o).DefineType ();
+		}
+
+		//
+		// Resolves a delegate during the corlib bootstrap process
+		//
+		static void BootstrapCorlib_ResolveDelegate (TypeContainer root, string name)
+		{
+			object o = root.GetDefinition (name);
+			if (o == null){
+				Report.Error (518, "The predefined type `" + name + "' is not defined");
+				Environment.Exit (0);
+			}
+
+			if (!(o is Delegate)){
+				Error_TypeConflict (name);
+				return;
+			}
+
+			((DeclSpace) o).DefineType ();
+		}
+		
+
+		/// <summary>
+		///    Resolves the core types in the compiler when compiling with --nostdlib
+		/// </summary>
+		static public void ResolveCore ()
+		{
+			TypeContainer root = Tree.Types;
+
+			TypeManager.object_type = BootstrapCorlib_ResolveClass (root, "System.Object");
+			TypeManager.value_type = BootstrapCorlib_ResolveClass (root, "System.ValueType");
+			TypeManager.attribute_type = BootstrapCorlib_ResolveClass (root, "System.Attribute");
+			
+			string [] interfaces_first_stage = {
+				"System.IComparable", "System.ICloneable",
+				"System.IConvertible",
+				
+				"System.Collections.IEnumerable",
+				"System.Collections.ICollection",
+				"System.Collections.IEnumerator",
+				"System.Collections.IList", 
+				"System.IAsyncResult",
+				"System.IDisposable",
+				
+				"System.Runtime.Serialization.ISerializable",
+
+				"System.Reflection.IReflect",
+				"System.Reflection.ICustomAttributeProvider"
+			};
+
+			foreach (string iname in interfaces_first_stage)
+				BootstrapCorlib_ResolveInterface (root, iname);
+
+			//
+			// These are the base value types
+			//
+			string [] structs_first_stage = {
+				"System.Byte",    "System.SByte",
+				"System.Int16",   "System.UInt16",
+				"System.Int32",   "System.UInt32",
+				"System.Int64",   "System.UInt64",
+			};
+
+			foreach (string cname in structs_first_stage)
+				BootstrapCorlib_ResolveStruct (root, cname);
+
+			//
+			// Now, we can load the enumerations, after this point,
+			// we can use enums.
+			//
+			TypeManager.InitEnumUnderlyingTypes ();
+
+			string [] structs_second_stage = {
+				"System.Single",  "System.Double",
+				"System.Char",    "System.Boolean",
+				"System.Decimal", "System.Void",
+				"System.RuntimeFieldHandle",
+				"System.RuntimeTypeHandle",
+				"System.IntPtr"
+			};
+			
+			foreach (string cname in structs_second_stage)
+				BootstrapCorlib_ResolveStruct (root, cname);
+			
+			//
+			// These are classes that depends on the core interfaces
+			//
+			string [] classes_second_stage = {
+				"System.Reflection.MemberInfo",
+				"System.Type",
+				"System.Exception",
+
+				//
+				// These are not really important in the order, but they
+				// are used by the compiler later on (typemanager/CoreLookupType-d)
+				//
+				"System.Runtime.CompilerServices.RuntimeHelpers",
+				"System.Reflection.DefaultMemberAttribute",
+				"System.Threading.Monitor",
+				
+				"System.AttributeUsageAttribute",
+				"System.Runtime.InteropServices.DllImportAttribute",
+				"System.Runtime.CompilerServices.MethodImplAttribute",
+				"System.Runtime.InteropServices.MarshalAsAttribute",
+				"System.Diagnostics.ConditionalAttribute",
+				"System.ObsoleteAttribute",
+				"System.ParamArrayAttribute",
+				"System.Security.UnverifiableCodeAttribute",
+				"System.Runtime.CompilerServices.IndexerNameAttribute",
+			};
+
+			// We must store them here before calling BootstrapCorlib_ResolveDelegate.
+			TypeManager.string_type = BootstrapCorlib_ResolveClass (root, "System.String");
+			TypeManager.enum_type = BootstrapCorlib_ResolveClass (root, "System.Enum");
+			TypeManager.array_type = BootstrapCorlib_ResolveClass (root, "System.Array");
+			TypeManager.multicast_delegate_type = BootstrapCorlib_ResolveClass (root, "System.MulticastDelegate");
+			TypeManager.delegate_type = BootstrapCorlib_ResolveClass (root, "System.Delegate");
+			
+			foreach (string cname in classes_second_stage)
+				BootstrapCorlib_ResolveClass (root, cname);
+
+			BootstrapCorlib_ResolveDelegate (root, "System.AsyncCallback");
+		}
+			
+		// <summary>
+		//   Closes all open types
+		// </summary>
+		//
+		// <remarks>
+		//   We usually use TypeBuilder types.  When we are done
+		//   creating the type (which will happen after we have added
+		//   methods, fields, etc) we need to "Define" them before we
+		//   can save the Assembly
+		// </remarks>
+		static public void CloseTypes ()
+		{
+			TypeContainer root = Tree.Types;
+			
+			ArrayList ifaces = root.Interfaces;
+
+			if (root.Enums != null)
+				foreach (Enum en in root.Enums)
+					en.CloseType ();
+
+			if (attribute_types != null)
+				foreach (TypeContainer tc in attribute_types)
+					tc.CloseType ();
+			
+			foreach (Interface iface in interface_resolve_order)
+				iface.CloseType ();
+
+			//
+			// We do this in two passes, first we close the structs,
+			// then the classes, because it seems the code needs it this
+			// way.  If this is really what is going on, we should probably
+			// make sure that we define the structs in order as well.
+			//
+			foreach (TypeContainer tc in type_container_resolve_order){
+				if (tc is Struct && tc.Parent == tree.Types){
+					tc.CloseType ();
+				}
+			}
+
+			foreach (TypeContainer tc in type_container_resolve_order){
+				if (!(tc is Struct && tc.Parent == tree.Types))
+					tc.CloseType ();					
+			}
+			
+			if (root.Delegates != null)
+				foreach (Delegate d in root.Delegates)
+					d.CloseDelegate ();
+
+
+			//
+			// If we have a <PrivateImplementationDetails> class, close it
+			//
+			if (impl_details_class != null){
+				impl_details_class.CreateType ();
+			}
+		}
+
+		//
+		// This idea is from Felix Arrese-Igor
+		//
+		// Returns : the implicit parent of a composite namespace string
+		//   eg. Implicit parent of A.B is A
+		//
+		static public string ImplicitParent (string ns)
+		{
+			int i = ns.LastIndexOf (".");
+			if (i < 0)
+				return null;
+			
+			return ns.Substring (0, i);
+		}
+
+		static Type NamespaceLookup (Namespace curr_ns, string name)
+		{
+			Type t;
+			
+			//
+			// Try in the current namespace and all its implicit parents
+			//
+			for (string ns = curr_ns.Name; ns != null; ns = ImplicitParent (ns)) {
+				t = TypeManager.LookupType (MakeFQN (ns, name));
+				if (t != null)
+					return t;
+			}
+			
+			//
+			// It's possible that name already is fully qualified. So we do
+			// a simple direct lookup without adding any namespace names
+			//
+			t = TypeManager.LookupType (name); 
+			if (t != null)
+				return t;
+
+			//
+			// Try the aliases in the current namespace
+			//
+			string alias = curr_ns.LookupAlias (name);
+
+			if (alias != null) {
+				t = TypeManager.LookupType (alias);
+				if (t != null)
+					return t;
+
+				t = TypeManager.LookupType (MakeFQN (alias, name));
+				if (t != null)
+					return t;
+			}
+			
+			for (Namespace ns = curr_ns; ns != null; ns = ns.Parent) {
+				//
+				// Look in the namespace ns
+				//
+				t = TypeManager.LookupType (MakeFQN (ns.Name, name));
+				if (t != null)
+					return t;
+				
+				//
+				// Then try with the using clauses
+				//
+				ArrayList using_list = ns.UsingTable;
+
+				if (using_list == null)
+					continue;
+
+				foreach (string n in using_list) {
+					t = TypeManager.LookupType (MakeFQN (n, name));
+					if (t != null)
+						return t;
+				}
+
+				//
+				// Try with aliases
+				//
+				string a = ns.LookupAlias (name);
+				if (a != null) {
+					t = TypeManager.LookupType (a);
+					if (t != null)
+						return t;
+
+					t = TypeManager.LookupType (MakeFQN (a, name));
+					if (t != null)
+						return t;
+				}
+			}
+
+			return null;
+		}
+		
+		//
+		// Public function used to locate types, this can only
+		// be used after the ResolveTree function has been invoked.
+		//
+		// Returns: Type or null if they type can not be found.
+		//
+		// Come to think of it, this should be a DeclSpace
+		//
+		static public Type LookupType (DeclSpace ds, string name, bool silent, Location loc)
+		{
+			Type t;
+
+			if (ds.Cache.Contains (name)){
+				t = (Type) ds.Cache [name];
+				if (t != null)
+					return t;
+			} else {
+				//
+				// For the case the type we are looking for is nested within this one
+				// or is in any base class
+				//
+				DeclSpace containing_ds = ds;
+				while (containing_ds != null){
+					Type current_type = containing_ds.TypeBuilder;
+					
+					while (current_type != null) {
+						//
+						// nested class
+						//
+						t = TypeManager.LookupType (current_type.FullName + "+" + name);
+						if (t != null){
+							ds.Cache [name] = t;
+							return t;
+						}
+						
+						current_type = current_type.BaseType;
+					}
+					
+					containing_ds = containing_ds.Parent;
+				}
+				
+				t = NamespaceLookup (ds.Namespace, name);
+				if (t != null){
+					ds.Cache [name] = t;
+					return t;
+				}
+			}
+
+			if (!silent)
+				Report.Error (246, loc, "Cannot find type `"+name+"'");
+			
+			return null;
+		}
+
+		// <summary>
+		//   This is the silent version of LookupType, you can use this
+		//   to `probe' for a type
+		// </summary>
+		static public Type LookupType (TypeContainer tc, string name, Location loc)
+		{
+			return LookupType (tc, name, true, loc);
+		}
+
+		static public bool IsNamespace (string name)
+		{
+			Namespace ns;
+
+			if (tree.Namespaces != null){
+				ns = (Namespace) tree.Namespaces [name];
+
+				if (ns != null)
+					return true;
+			}
+
+			return false;
+		}
+
+		static void Report1530 (Location loc)
+		{
+			Report.Error (1530, loc, "Keyword new not allowed for namespace elements");
+		}
+		
+		static public void PopulateCoreType (TypeContainer root, string name)
+		{
+			DeclSpace ds = (DeclSpace) root.GetDefinition (name);
+
+			ds.DefineMembers (root);
+			ds.Define (root);
+		}
+		
+		static public void BootCorlib_PopulateCoreTypes ()
+		{
+			TypeContainer root = tree.Types;
+
+			PopulateCoreType (root, "System.Object");
+			PopulateCoreType (root, "System.ValueType");
+			PopulateCoreType (root, "System.Attribute");
+		}
+		
+		// <summary>
+		//   Populates the structs and classes with fields and methods
+		// </summary>
+		//
+		// This is invoked after all interfaces, structs and classes
+		// have been defined through `ResolveTree' 
+		static public void PopulateTypes ()
+		{
+			TypeContainer root = Tree.Types;
+
+			if (attribute_types != null)
+				foreach (TypeContainer tc in attribute_types)
+					tc.DefineMembers (root);
+			
+			if (interface_resolve_order != null){
+				foreach (Interface iface in interface_resolve_order)
+					if ((iface.ModFlags & Modifiers.NEW) == 0)
+						iface.DefineMembers (root);
+					else
+						Report1530 (iface.Location);
+			}
+
+
+			if (type_container_resolve_order != null){
+				foreach (TypeContainer tc in type_container_resolve_order) {
+					// When compiling corlib, these types have already been
+					// populated from BootCorlib_PopulateCoreTypes ().
+					if (!RootContext.StdLib &&
+					    ((tc.Name == "System.Object") ||
+					     (tc.Name == "System.Attribute") ||
+					     (tc.Name == "System.ValueType")))
+						continue;
+
+					if ((tc.ModFlags & Modifiers.NEW) == 0)
+						tc.DefineMembers (root);
+					else
+						Report1530 (tc.Location);
+				}
+			}
+
+			ArrayList delegates = root.Delegates;
+			if (delegates != null){
+				foreach (Delegate d in delegates)
+					if ((d.ModFlags & Modifiers.NEW) == 0)
+						d.DefineMembers (root);
+					else
+						Report1530 (d.Location);
+			}
+
+			ArrayList enums = root.Enums;
+			if (enums != null){
+				foreach (Enum en in enums)
+					if ((en.ModFlags & Modifiers.NEW) == 0)
+						en.DefineMembers (root);
+					else
+						Report1530 (en.Location);
+			}
+		}
+
+		static public void DefineTypes ()
+		{
+			TypeContainer root = Tree.Types;
+
+			if (attribute_types != null)
+				foreach (TypeContainer tc in attribute_types)
+					tc.Define (root);
+			
+			if (interface_resolve_order != null){
+				foreach (Interface iface in interface_resolve_order)
+					if ((iface.ModFlags & Modifiers.NEW) == 0)
+						iface.Define (root);
+			}
+
+
+			if (type_container_resolve_order != null){
+				foreach (TypeContainer tc in type_container_resolve_order) {
+					// When compiling corlib, these types have already been
+					// populated from BootCorlib_PopulateCoreTypes ().
+					if (!RootContext.StdLib &&
+					    ((tc.Name == "System.Object") ||
+					     (tc.Name == "System.Attribute") ||
+					     (tc.Name == "System.ValueType")))
+						continue;
+
+					if ((tc.ModFlags & Modifiers.NEW) == 0)
+						tc.Define (root);
+				}
+			}
+
+			ArrayList delegates = root.Delegates;
+			if (delegates != null){
+				foreach (Delegate d in delegates)
+					if ((d.ModFlags & Modifiers.NEW) == 0)
+						d.Define (root);
+			}
+
+			ArrayList enums = root.Enums;
+			if (enums != null){
+				foreach (Enum en in enums)
+					if ((en.ModFlags & Modifiers.NEW) == 0)
+						en.Define (root);
+			}
+		}
+
+		static public void EmitCode ()
+		{
+			//
+			// Because of the strange way in which we do things, global
+			// attributes must be processed first.
+			//
+			if (global_attributes.Count > 0){
+				AssemblyBuilder ab = CodeGen.AssemblyBuilder;
+				TypeContainer dummy = new TypeContainer (null, "", new Location (-1));
+				EmitContext temp_ec = new EmitContext (
+					dummy, Mono.CSharp.Location.Null, null, null, 0, false);
+			
+				foreach (DictionaryEntry de in global_attributes){
+					Namespace ns = (Namespace) de.Key;
+					Attributes attrs = (Attributes) de.Value;
+					
+					dummy.Namespace = ns;
+					Attribute.ApplyAttributes (temp_ec, ab, ab, attrs, attrs.Location);
+				}
+			}
+
+			if (attribute_types != null)
+				foreach (TypeContainer tc in attribute_types)
+					tc.Emit ();
+			
+			if (type_container_resolve_order != null) {
+				foreach (TypeContainer tc in type_container_resolve_order)
+					tc.EmitConstants ();
+				
+				foreach (TypeContainer tc in type_container_resolve_order)
+					tc.Emit ();
+			}
+			
+			if (Unsafe) {
+				if (TypeManager.unverifiable_code_ctor == null) {
+					Console.WriteLine ("Internal error ! Cannot set unverifiable code attribute.");
+					return;
+				}
+				
+				CustomAttributeBuilder cb = new CustomAttributeBuilder (TypeManager.unverifiable_code_ctor, new object [0]);
+				CodeGen.ModuleBuilder.SetCustomAttribute (cb);
+			}
+		}
+		
+		//
+		// Public Field, used to track which method is the public entry
+		// point.
+		//
+		static public MethodInfo EntryPoint;
+
+                //
+                // Track the location of the entry point.
+                //
+                static public Location EntryPointLocation;
+
+		//
+		// These are used to generate unique names on the structs and fields.
+		//
+		static int field_count;
+		
+		//
+		// Makes an initialized struct, returns the field builder that
+		// references the data.  Thanks go to Sergey Chaban for researching
+		// how to do this.  And coming up with a shorter mechanism than I
+		// was able to figure out.
+		//
+		// This works but makes an implicit public struct $ArrayType$SIZE and
+		// makes the fields point to it.  We could get more control if we did
+		// use instead:
+		//
+		// 1. DefineNestedType on the impl_details_class with our struct.
+		//
+		// 2. Define the field on the impl_details_class
+		//
+		static public FieldBuilder MakeStaticData (byte [] data)
+		{
+			FieldBuilder fb;
+			int size = data.Length;
+			
+			if (impl_details_class == null)
+				impl_details_class = CodeGen.ModuleBuilder.DefineType (
+					"<PrivateImplementationDetails>", TypeAttributes.NotPublic, TypeManager.object_type);
+
+			fb = impl_details_class.DefineInitializedData (
+				"$$field-" + (field_count++), data,
+				FieldAttributes.Static | FieldAttributes.Assembly);
+			
+			return fb;
+		}
+
+		//
+		// Adds a global attribute that was declared in `container', 
+		// the attribute is in `attr', and it was defined at `loc'
+		//
+		static public void AddGlobalAttribute (TypeContainer container,
+						       AttributeSection attr, Location loc)
+		{
+			Namespace ns = container.Namespace;
+			Attributes a = (Attributes) global_attributes [ns];
+
+			if (a == null)
+				global_attributes [ns] = new Attributes (attr, loc);
+			else
+				a.AddAttribute (attr);
+		}
+	}
+}
+	      
+
diff --git a/mcs/mcs/statement.cs b/mcs/mcs/statement.cs
new file mode 100755
index 00000000000..3b4d3e805ef
--- /dev/null
+++ b/mcs/mcs/statement.cs
@@ -0,0 +1,5167 @@
+//
+// statement.cs: Statement representation for the IL tree.
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//   Martin Baulig (martin@gnome.org)
+//
+// (C) 2001, 2002 Ximian, Inc.
+//
+
+using System;
+using System.Text;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Diagnostics;
+
+namespace Mono.CSharp {
+
+	using System.Collections;
+	
+	public abstract class Statement {
+		public Location loc;
+		
+		///
+		/// Resolves the statement, true means that all sub-statements
+		/// did resolve ok.
+		//
+		public virtual bool Resolve (EmitContext ec)
+		{
+			return true;
+		}
+		
+		/// <summary>
+		///   Return value indicates whether all code paths emitted return.
+		/// </summary>
+		public abstract bool Emit (EmitContext ec);
+		
+		public static Expression ResolveBoolean (EmitContext ec, Expression e, Location loc)
+		{
+			e = e.Resolve (ec);
+			if (e == null)
+				return null;
+			
+			if (e.Type != TypeManager.bool_type){
+				e = Expression.ConvertImplicit (ec, e, TypeManager.bool_type,
+								new Location (-1));
+			}
+
+			if (e == null){
+				Report.Error (
+					31, loc, "Can not convert the expression to a boolean");
+			}
+
+			if (CodeGen.SymbolWriter != null)
+				ec.Mark (loc);
+
+			return e;
+		}
+		
+		/// <remarks>
+		///    Encapsulates the emission of a boolean test and jumping to a
+		///    destination.
+		///
+		///    This will emit the bool expression in `bool_expr' and if
+		///    `target_is_for_true' is true, then the code will generate a 
+		///    brtrue to the target.   Otherwise a brfalse. 
+		/// </remarks>
+		public static void EmitBoolExpression (EmitContext ec, Expression bool_expr,
+						       Label target, bool target_is_for_true)
+		{
+			ILGenerator ig = ec.ig;
+			
+			bool invert = false;
+			if (bool_expr is Unary){
+				Unary u = (Unary) bool_expr;
+				
+				if (u.Oper == Unary.Operator.LogicalNot){
+					invert = true;
+
+					u.EmitLogicalNot (ec);
+				}
+			} else if (bool_expr is Binary){
+				Binary b = (Binary) bool_expr;
+
+				if (b.EmitBranchable (ec, target, target_is_for_true))
+					return;
+			}
+
+			if (!invert)
+				bool_expr.Emit (ec);
+
+			if (target_is_for_true){
+				if (invert)
+					ig.Emit (OpCodes.Brfalse, target);
+				else
+					ig.Emit (OpCodes.Brtrue, target);
+			} else {
+				if (invert)
+					ig.Emit (OpCodes.Brtrue, target);
+				else
+					ig.Emit (OpCodes.Brfalse, target);
+			}
+		}
+
+		public static void Warning_DeadCodeFound (Location loc)
+		{
+			Report.Warning (162, loc, "Unreachable code detected");
+		}
+	}
+
+	public class EmptyStatement : Statement {
+		public override bool Resolve (EmitContext ec)
+		{
+			return true;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			return false;
+		}
+	}
+	
+	public class If : Statement {
+		Expression expr;
+		public Statement TrueStatement;
+		public Statement FalseStatement;
+		
+		public If (Expression expr, Statement trueStatement, Location l)
+		{
+			this.expr = expr;
+			TrueStatement = trueStatement;
+			loc = l;
+		}
+
+		public If (Expression expr,
+			   Statement trueStatement,
+			   Statement falseStatement,
+			   Location l)
+		{
+			this.expr = expr;
+			TrueStatement = trueStatement;
+			FalseStatement = falseStatement;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			Report.Debug (1, "START IF BLOCK", loc);
+
+			expr = ResolveBoolean (ec, expr, loc);
+			if (expr == null){
+				return false;
+			}
+			
+			ec.StartFlowBranching (FlowBranchingType.BLOCK, loc);
+			
+			if (!TrueStatement.Resolve (ec)) {
+				ec.KillFlowBranching ();
+				return false;
+			}
+
+			ec.CurrentBranching.CreateSibling ();
+
+			if ((FalseStatement != null) && !FalseStatement.Resolve (ec)) {
+				ec.KillFlowBranching ();
+				return false;
+			}
+					
+			ec.EndFlowBranching ();
+
+			Report.Debug (1, "END IF BLOCK", loc);
+
+			return true;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label false_target = ig.DefineLabel ();
+			Label end;
+			bool is_true_ret, is_false_ret;
+
+			//
+			// Dead code elimination
+			//
+			if (expr is BoolConstant){
+				bool take = ((BoolConstant) expr).Value;
+
+				if (take){
+					if (FalseStatement != null){
+						Warning_DeadCodeFound (FalseStatement.loc);
+					}
+					return TrueStatement.Emit (ec);
+				} else {
+					Warning_DeadCodeFound (TrueStatement.loc);
+					if (FalseStatement != null)
+						return FalseStatement.Emit (ec);
+				}
+			}
+			
+			EmitBoolExpression (ec, expr, false_target, false);
+
+			is_true_ret = TrueStatement.Emit (ec);
+			is_false_ret = is_true_ret;
+
+			if (FalseStatement != null){
+				bool branch_emitted = false;
+				
+				end = ig.DefineLabel ();
+				if (!is_true_ret){
+					ig.Emit (OpCodes.Br, end);
+					branch_emitted = true;
+				}
+
+				ig.MarkLabel (false_target);
+				is_false_ret = FalseStatement.Emit (ec);
+
+				if (branch_emitted)
+					ig.MarkLabel (end);
+			} else {
+				ig.MarkLabel (false_target);
+				is_false_ret = false;
+			}
+
+			return is_true_ret && is_false_ret;
+		}
+	}
+
+	public class Do : Statement {
+		public Expression expr;
+		public readonly Statement  EmbeddedStatement;
+		
+		public Do (Statement statement, Expression boolExpr, Location l)
+		{
+			expr = boolExpr;
+			EmbeddedStatement = statement;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			bool ok = true;
+
+			ec.StartFlowBranching (FlowBranchingType.LOOP_BLOCK, loc);
+
+			if (!EmbeddedStatement.Resolve (ec))
+				ok = false;
+
+			ec.EndFlowBranching ();
+
+			expr = ResolveBoolean (ec, expr, loc);
+			if (expr == null)
+				ok = false;
+			
+			return ok;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label loop = ig.DefineLabel ();
+			Label old_begin = ec.LoopBegin;
+			Label old_end = ec.LoopEnd;
+			bool  old_inloop = ec.InLoop;
+			bool old_breaks = ec.Breaks;
+			int old_loop_begin_try_catch_level = ec.LoopBeginTryCatchLevel;
+			
+			ec.LoopBegin = ig.DefineLabel ();
+			ec.LoopEnd = ig.DefineLabel ();
+			ec.InLoop = true;
+			ec.LoopBeginTryCatchLevel = ec.TryCatchLevel;
+				
+			ig.MarkLabel (loop);
+			ec.Breaks = false;
+			EmbeddedStatement.Emit (ec);
+			bool breaks = ec.Breaks;
+			ig.MarkLabel (ec.LoopBegin);
+
+			//
+			// Dead code elimination
+			//
+			if (expr is BoolConstant){
+				bool res = ((BoolConstant) expr).Value;
+
+				if (res)
+					ec.ig.Emit (OpCodes.Br, loop); 
+			} else
+				EmitBoolExpression (ec, expr, loop, true);
+			
+			ig.MarkLabel (ec.LoopEnd);
+
+			ec.LoopBeginTryCatchLevel = old_loop_begin_try_catch_level;
+			ec.LoopBegin = old_begin;
+			ec.LoopEnd = old_end;
+			ec.InLoop = old_inloop;
+			ec.Breaks = old_breaks;
+
+			//
+			// Inform whether we are infinite or not
+			//
+			if (expr is BoolConstant){
+				BoolConstant bc = (BoolConstant) expr;
+
+				if (bc.Value == true)
+					return breaks == false;
+			}
+			
+			return false;
+		}
+	}
+
+	public class While : Statement {
+		public Expression expr;
+		public readonly Statement Statement;
+		
+		public While (Expression boolExpr, Statement statement, Location l)
+		{
+			this.expr = boolExpr;
+			Statement = statement;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			bool ok = true;
+
+			expr = ResolveBoolean (ec, expr, loc);
+			if (expr == null)
+				return false;
+
+			ec.StartFlowBranching (FlowBranchingType.LOOP_BLOCK, loc);
+
+			if (!Statement.Resolve (ec))
+				ok = false;
+
+			ec.EndFlowBranching ();
+
+			return ok;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label old_begin = ec.LoopBegin;
+			Label old_end = ec.LoopEnd;
+			bool old_inloop = ec.InLoop;
+			bool old_breaks = ec.Breaks;
+			Label while_loop = ig.DefineLabel ();
+			int old_loop_begin_try_catch_level = ec.LoopBeginTryCatchLevel;
+			bool ret;
+			
+			ec.LoopBegin = ig.DefineLabel ();
+			ec.LoopEnd = ig.DefineLabel ();
+			ec.InLoop = true;
+			ec.LoopBeginTryCatchLevel = ec.TryCatchLevel;
+
+			ig.Emit (OpCodes.Br, ec.LoopBegin);
+			ig.MarkLabel (while_loop);
+
+			//
+			// Inform whether we are infinite or not
+			//
+			if (expr is BoolConstant){
+				BoolConstant bc = (BoolConstant) expr;
+
+				ig.MarkLabel (ec.LoopBegin);
+				if (bc.Value == false){
+					Warning_DeadCodeFound (Statement.loc);
+					ret = false;
+				} else {
+					bool breaks;
+					
+					ec.Breaks = false;
+					Statement.Emit (ec);
+					breaks = ec.Breaks;
+					ig.Emit (OpCodes.Br, ec.LoopBegin);
+					
+					//
+					// Inform that we are infinite (ie, `we return'), only
+					// if we do not `break' inside the code.
+					//
+					ret = breaks == false;
+				}
+				ig.MarkLabel (ec.LoopEnd);
+			} else {
+				Statement.Emit (ec);
+			
+				ig.MarkLabel (ec.LoopBegin);
+
+				EmitBoolExpression (ec, expr, while_loop, true);
+				ig.MarkLabel (ec.LoopEnd);
+
+				ret = false;
+			}	
+
+			ec.LoopBegin = old_begin;
+			ec.LoopEnd = old_end;
+			ec.InLoop = old_inloop;
+			ec.Breaks = old_breaks;
+			ec.LoopBeginTryCatchLevel = old_loop_begin_try_catch_level;
+
+			return ret;
+		}
+	}
+
+	public class For : Statement {
+		Expression Test;
+		readonly Statement InitStatement;
+		readonly Statement Increment;
+		readonly Statement Statement;
+		
+		public For (Statement initStatement,
+			    Expression test,
+			    Statement increment,
+			    Statement statement,
+			    Location l)
+		{
+			InitStatement = initStatement;
+			Test = test;
+			Increment = increment;
+			Statement = statement;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			bool ok = true;
+
+			if (InitStatement != null){
+				if (!InitStatement.Resolve (ec))
+					ok = false;
+			}
+
+			if (Test != null){
+				Test = ResolveBoolean (ec, Test, loc);
+				if (Test == null)
+					ok = false;
+			}
+
+			if (Increment != null){
+				if (!Increment.Resolve (ec))
+					ok = false;
+			}
+
+			ec.StartFlowBranching (FlowBranchingType.LOOP_BLOCK, loc);
+
+			if (!Statement.Resolve (ec))
+				ok = false;
+
+			ec.EndFlowBranching ();
+
+			return ok;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label old_begin = ec.LoopBegin;
+			Label old_end = ec.LoopEnd;
+			bool old_inloop = ec.InLoop;
+			bool old_breaks = ec.Breaks;
+			int old_loop_begin_try_catch_level = ec.LoopBeginTryCatchLevel;
+			Label loop = ig.DefineLabel ();
+			Label test = ig.DefineLabel ();
+			
+			if (InitStatement != null)
+				if (! (InitStatement is EmptyStatement))
+					InitStatement.Emit (ec);
+
+			ec.LoopBegin = ig.DefineLabel ();
+			ec.LoopEnd = ig.DefineLabel ();
+			ec.InLoop = true;
+			ec.LoopBeginTryCatchLevel = ec.TryCatchLevel;
+
+			ig.Emit (OpCodes.Br, test);
+			ig.MarkLabel (loop);
+			ec.Breaks = false;
+			Statement.Emit (ec);
+			bool breaks = ec.Breaks;
+
+			ig.MarkLabel (ec.LoopBegin);
+			if (!(Increment is EmptyStatement))
+				Increment.Emit (ec);
+
+			ig.MarkLabel (test);
+			//
+			// If test is null, there is no test, and we are just
+			// an infinite loop
+			//
+			if (Test != null)
+				EmitBoolExpression (ec, Test, loop, true);
+			else
+				ig.Emit (OpCodes.Br, loop);
+			ig.MarkLabel (ec.LoopEnd);
+
+			ec.LoopBegin = old_begin;
+			ec.LoopEnd = old_end;
+			ec.InLoop = old_inloop;
+			ec.Breaks = old_breaks;
+			ec.LoopBeginTryCatchLevel = old_loop_begin_try_catch_level;
+			
+			//
+			// Inform whether we are infinite or not
+			//
+			if (Test != null){
+				if (Test is BoolConstant){
+					BoolConstant bc = (BoolConstant) Test;
+
+					if (bc.Value)
+						return breaks == false;
+				}
+				return false;
+			} else
+				return true;
+		}
+	}
+	
+	public class StatementExpression : Statement {
+		Expression expr;
+		
+		public StatementExpression (ExpressionStatement expr, Location l)
+		{
+			this.expr = expr;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			expr = (Expression) expr.Resolve (ec);
+			return expr != null;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			
+			if (expr is ExpressionStatement)
+				((ExpressionStatement) expr).EmitStatement (ec);
+			else {
+				expr.Emit (ec);
+				ig.Emit (OpCodes.Pop);
+			}
+
+			return false;
+		}
+
+		public override string ToString ()
+		{
+			return "StatementExpression (" + expr + ")";
+		}
+	}
+
+	/// <summary>
+	///   Implements the return statement
+	/// </summary>
+	public class Return : Statement {
+		public Expression Expr;
+		
+		public Return (Expression expr, Location l)
+		{
+			Expr = expr;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			if (Expr != null){
+				Expr = Expr.Resolve (ec);
+				if (Expr == null)
+					return false;
+			}
+
+			FlowBranching.UsageVector vector = ec.CurrentBranching.CurrentUsageVector;
+
+			if (ec.CurrentBranching.InTryBlock ())
+				ec.CurrentBranching.AddFinallyVector (vector);
+
+			vector.Returns = FlowReturns.ALWAYS;
+			return true;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			if (ec.InFinally){
+				Report.Error (157,loc,"Control can not leave the body of the finally block");
+				return false;
+			}
+			
+			if (ec.ReturnType == null){
+				if (Expr != null){
+					Report.Error (127, loc, "Return with a value not allowed here");
+					return true;
+				}
+			} else {
+				if (Expr == null){
+					Report.Error (126, loc, "An object of type `" +
+						      TypeManager.CSharpName (ec.ReturnType) + "' is " +
+						      "expected for the return statement");
+					return true;
+				}
+
+				if (Expr.Type != ec.ReturnType)
+					Expr = Expression.ConvertImplicitRequired (
+						ec, Expr, ec.ReturnType, loc);
+
+				if (Expr == null)
+					return true;
+
+				Expr.Emit (ec);
+
+				if (ec.InTry || ec.InCatch)
+					ec.ig.Emit (OpCodes.Stloc, ec.TemporaryReturn ());
+			}
+
+			if (ec.InTry || ec.InCatch) {
+				if (!ec.HasReturnLabel) {
+					ec.ReturnLabel = ec.ig.DefineLabel ();
+					ec.HasReturnLabel = true;
+				}
+				ec.ig.Emit (OpCodes.Leave, ec.ReturnLabel);
+			} else
+				ec.ig.Emit (OpCodes.Ret);
+
+			return true; 
+		}
+	}
+
+	public class Goto : Statement {
+		string target;
+		Block block;
+		LabeledStatement label;
+		
+		public override bool Resolve (EmitContext ec)
+		{
+			label = block.LookupLabel (target);
+			if (label == null){
+				Report.Error (
+					159, loc,
+					"No such label `" + target + "' in this scope");
+				return false;
+			}
+
+			// If this is a forward goto.
+			if (!label.IsDefined)
+				label.AddUsageVector (ec.CurrentBranching.CurrentUsageVector);
+
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.ALWAYS;
+
+			return true;
+		}
+		
+		public Goto (Block parent_block, string label, Location l)
+		{
+			block = parent_block;
+			loc = l;
+			target = label;
+		}
+
+		public string Target {
+			get {
+				return target;
+			}
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			Label l = label.LabelTarget (ec);
+			ec.ig.Emit (OpCodes.Br, l);
+			
+			return false;
+		}
+	}
+
+	public class LabeledStatement : Statement {
+		public readonly Location Location;
+		string label_name;
+		bool defined;
+		bool referenced;
+		Label label;
+
+		ArrayList vectors;
+		
+		public LabeledStatement (string label_name, Location l)
+		{
+			this.label_name = label_name;
+			this.Location = l;
+		}
+
+		public Label LabelTarget (EmitContext ec)
+		{
+			if (defined)
+				return label;
+			label = ec.ig.DefineLabel ();
+			defined = true;
+
+			return label;
+		}
+
+		public bool IsDefined {
+			get {
+				return defined;
+			}
+		}
+
+		public bool HasBeenReferenced {
+			get {
+				return referenced;
+			}
+		}
+
+		public void AddUsageVector (FlowBranching.UsageVector vector)
+		{
+			if (vectors == null)
+				vectors = new ArrayList ();
+
+			vectors.Add (vector.Clone ());
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			if (vectors != null)
+				ec.CurrentBranching.CurrentUsageVector.MergeJumpOrigins (vectors);
+
+			referenced = true;
+
+			return true;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			LabelTarget (ec);
+			ec.ig.MarkLabel (label);
+
+			return false;
+		}
+	}
+	
+
+	/// <summary>
+	///   `goto default' statement
+	/// </summary>
+	public class GotoDefault : Statement {
+		
+		public GotoDefault (Location l)
+		{
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			ec.CurrentBranching.CurrentUsageVector.Returns = FlowReturns.UNREACHABLE;
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.ALWAYS;
+			return true;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			if (ec.Switch == null){
+				Report.Error (153, loc, "goto default is only valid in a switch statement");
+				return false;
+			}
+
+			if (!ec.Switch.GotDefault){
+				Report.Error (159, loc, "No default target on switch statement");
+				return false;
+			}
+			ec.ig.Emit (OpCodes.Br, ec.Switch.DefaultTarget);
+			return false;
+		}
+	}
+
+	/// <summary>
+	///   `goto case' statement
+	/// </summary>
+	public class GotoCase : Statement {
+		Expression expr;
+		Label label;
+		
+		public GotoCase (Expression e, Location l)
+		{
+			expr = e;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			if (ec.Switch == null){
+				Report.Error (153, loc, "goto case is only valid in a switch statement");
+				return false;
+			}
+
+			expr = expr.Resolve (ec);
+			if (expr == null)
+				return false;
+
+			if (!(expr is Constant)){
+				Report.Error (159, loc, "Target expression for goto case is not constant");
+				return false;
+			}
+
+			object val = Expression.ConvertIntLiteral (
+				(Constant) expr, ec.Switch.SwitchType, loc);
+
+			if (val == null)
+				return false;
+					
+			SwitchLabel sl = (SwitchLabel) ec.Switch.Elements [val];
+
+			if (sl == null){
+				Report.Error (
+					159, loc,
+					"No such label 'case " + val + "': for the goto case");
+			}
+
+			label = sl.ILLabelCode;
+
+			ec.CurrentBranching.CurrentUsageVector.Returns = FlowReturns.UNREACHABLE;
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.ALWAYS;
+			return true;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			ec.ig.Emit (OpCodes.Br, label);
+			return true;
+		}
+	}
+	
+	public class Throw : Statement {
+		Expression expr;
+		
+		public Throw (Expression expr, Location l)
+		{
+			this.expr = expr;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			if (expr != null){
+				expr = expr.Resolve (ec);
+				if (expr == null)
+					return false;
+
+				ExprClass eclass = expr.eclass;
+
+				if (!(eclass == ExprClass.Variable || eclass == ExprClass.PropertyAccess ||
+				      eclass == ExprClass.Value || eclass == ExprClass.IndexerAccess)) {
+					expr.Error118 ("value, variable, property or indexer access ");
+					return false;
+				}
+
+				Type t = expr.Type;
+				
+				if ((t != TypeManager.exception_type) &&
+				    !t.IsSubclassOf (TypeManager.exception_type) &&
+				    !(expr is NullLiteral)) {
+					Report.Error (155, loc,
+						      "The type caught or thrown must be derived " +
+						      "from System.Exception");
+					return false;
+				}
+			}
+
+			ec.CurrentBranching.CurrentUsageVector.Returns = FlowReturns.EXCEPTION;
+			return true;
+		}
+			
+		public override bool Emit (EmitContext ec)
+		{
+			if (expr == null){
+				if (ec.InCatch)
+					ec.ig.Emit (OpCodes.Rethrow);
+				else {
+					Report.Error (
+						156, loc,
+						"A throw statement with no argument is only " +
+						"allowed in a catch clause");
+				}
+				return false;
+			}
+
+			expr.Emit (ec);
+
+			ec.ig.Emit (OpCodes.Throw);
+
+			return true;
+		}
+	}
+
+	public class Break : Statement {
+		
+		public Break (Location l)
+		{
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.ALWAYS;
+			return true;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			if (ec.InLoop == false && ec.Switch == null){
+				Report.Error (139, loc, "No enclosing loop or switch to continue to");
+				return false;
+			}
+
+			ec.Breaks = true;
+			if (ec.InTry || ec.InCatch)
+				ig.Emit (OpCodes.Leave, ec.LoopEnd);
+			else
+				ig.Emit (OpCodes.Br, ec.LoopEnd);
+
+			return false;
+		}
+	}
+
+	public class Continue : Statement {
+		
+		public Continue (Location l)
+		{
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			ec.CurrentBranching.CurrentUsageVector.Breaks = FlowReturns.ALWAYS;
+			return true;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			Label begin = ec.LoopBegin;
+			
+			if (!ec.InLoop){
+				Report.Error (139, loc, "No enclosing loop to continue to");
+				return false;
+			} 
+
+			//
+			// UGH: Non trivial.  This Br might cross a try/catch boundary
+			// How can we tell?
+			//
+			// while () {
+			//   try { ... } catch { continue; }
+			// }
+			//
+			// From:
+			// try {} catch { while () { continue; }}
+			//
+			if (ec.TryCatchLevel > ec.LoopBeginTryCatchLevel)
+				ec.ig.Emit (OpCodes.Leave, begin);
+			else if (ec.TryCatchLevel < ec.LoopBeginTryCatchLevel)
+				throw new Exception ("Should never happen");
+			else
+				ec.ig.Emit (OpCodes.Br, begin);
+			return false;
+		}
+	}
+
+	// <summary>
+	//   This is used in the control flow analysis code to specify whether the
+	//   current code block may return to its enclosing block before reaching
+	//   its end.
+	// </summary>
+	public enum FlowReturns {
+		// It can never return.
+		NEVER,
+
+		// This means that the block contains a conditional return statement
+		// somewhere.
+		SOMETIMES,
+
+		// The code always returns, ie. there's an unconditional return / break
+		// statement in it.
+		ALWAYS,
+
+		// The code always throws an exception.
+		EXCEPTION,
+
+		// The current code block is unreachable.  This happens if it's immediately
+		// following a FlowReturns.ALWAYS block.
+		UNREACHABLE
+	}
+
+	// <summary>
+	//   This is a special bit vector which can inherit from another bit vector doing a
+	//   copy-on-write strategy.  The inherited vector may have a smaller size than the
+	//   current one.
+	// </summary>
+	public class MyBitVector {
+		public readonly int Count;
+		public readonly MyBitVector InheritsFrom;
+
+		bool is_dirty;
+		BitArray vector;
+
+		public MyBitVector (int Count)
+			: this (null, Count)
+		{ }
+
+		public MyBitVector (MyBitVector InheritsFrom, int Count)
+		{
+			this.InheritsFrom = InheritsFrom;
+			this.Count = Count;
+		}
+
+		// <summary>
+		//   Checks whether this bit vector has been modified.  After setting this to true,
+		//   we won't use the inherited vector anymore, but our own copy of it.
+		// </summary>
+		public bool IsDirty {
+			get {
+				return is_dirty;
+			}
+
+			set {
+				if (!is_dirty)
+					initialize_vector ();
+			}
+		}
+
+		// <summary>
+		//   Get/set bit `index' in the bit vector.
+		// </summary>
+		public bool this [int index]
+		{
+			get {
+				if (index > Count)
+					throw new ArgumentOutOfRangeException ();
+
+				// We're doing a "copy-on-write" strategy here; as long
+				// as nobody writes to the array, we can use our parent's
+				// copy instead of duplicating the vector.
+
+				if (vector != null)
+					return vector [index];
+				else if (InheritsFrom != null) {
+					BitArray inherited = InheritsFrom.Vector;
+
+					if (index < inherited.Count)
+						return inherited [index];
+					else
+						return false;
+				} else
+					return false;
+			}
+
+			set {
+				if (index > Count)
+					throw new ArgumentOutOfRangeException ();
+
+				// Only copy the vector if we're actually modifying it.
+
+				if (this [index] != value) {
+					initialize_vector ();
+
+					vector [index] = value;
+				}
+			}
+		}
+
+		// <summary>
+		//   If you explicitly convert the MyBitVector to a BitArray, you will get a deep
+		//   copy of the bit vector.
+		// </summary>
+		public static explicit operator BitArray (MyBitVector vector)
+		{
+			vector.initialize_vector ();
+			return vector.Vector;
+		}
+
+		// <summary>
+		//   Performs an `or' operation on the bit vector.  The `new_vector' may have a
+		//   different size than the current one.
+		// </summary>
+		public void Or (MyBitVector new_vector)
+		{
+			BitArray new_array = new_vector.Vector;
+
+			initialize_vector ();
+
+			int upper;
+			if (vector.Count < new_array.Count)
+				upper = vector.Count;
+			else
+				upper = new_array.Count;
+
+			for (int i = 0; i < upper; i++)
+				vector [i] = vector [i] | new_array [i];
+		}
+
+		// <summary>
+		//   Perfonrms an `and' operation on the bit vector.  The `new_vector' may have
+		//   a different size than the current one.
+		// </summary>
+		public void And (MyBitVector new_vector)
+		{
+			BitArray new_array = new_vector.Vector;
+
+			initialize_vector ();
+
+			int lower, upper;
+			if (vector.Count < new_array.Count)
+				lower = upper = vector.Count;
+			else {
+				lower = new_array.Count;
+				upper = vector.Count;
+			}
+
+			for (int i = 0; i < lower; i++)
+				vector [i] = vector [i] & new_array [i];
+
+			for (int i = lower; i < upper; i++)
+				vector [i] = false;
+		}
+
+		// <summary>
+		//   This does a deep copy of the bit vector.
+		// </summary>
+		public MyBitVector Clone ()
+		{
+			MyBitVector retval = new MyBitVector (Count);
+
+			retval.Vector = Vector;
+
+			return retval;
+		}
+
+		BitArray Vector {
+			get {
+				if (vector != null)
+					return vector;
+				else if (!is_dirty && (InheritsFrom != null))
+					return InheritsFrom.Vector;
+
+				initialize_vector ();
+
+				return vector;
+			}
+
+			set {
+				initialize_vector ();
+
+				for (int i = 0; i < Math.Min (vector.Count, value.Count); i++)
+					vector [i] = value [i];
+			}
+		}
+
+		void initialize_vector ()
+		{
+			if (vector != null)
+				return;
+
+			vector = new BitArray (Count, false);
+			if (InheritsFrom != null)
+				Vector = InheritsFrom.Vector;
+
+			is_dirty = true;
+		}
+
+		public override string ToString ()
+		{
+			StringBuilder sb = new StringBuilder ("MyBitVector (");
+
+			BitArray vector = Vector;
+			sb.Append (Count);
+			sb.Append (",");
+			if (!IsDirty)
+				sb.Append ("INHERITED - ");
+			for (int i = 0; i < vector.Count; i++) {
+				if (i > 0)
+					sb.Append (",");
+				sb.Append (vector [i]);
+			}
+			
+			sb.Append (")");
+			return sb.ToString ();
+		}
+	}
+
+	// <summary>
+	//   The type of a FlowBranching.
+	// </summary>
+	public enum FlowBranchingType {
+		// Normal (conditional or toplevel) block.
+		BLOCK,
+
+		// A loop block.
+		LOOP_BLOCK,
+
+		// Try/Catch block.
+		EXCEPTION,
+
+		// Switch block.
+		SWITCH,
+
+		// Switch section.
+		SWITCH_SECTION
+	}
+
+	// <summary>
+	//   A new instance of this class is created every time a new block is resolved
+	//   and if there's branching in the block's control flow.
+	// </summary>
+	public class FlowBranching {
+		// <summary>
+		//   The type of this flow branching.
+		// </summary>
+		public readonly FlowBranchingType Type;
+
+		// <summary>
+		//   The block this branching is contained in.  This may be null if it's not
+		//   a top-level block and it doesn't declare any local variables.
+		// </summary>
+		public readonly Block Block;
+
+		// <summary>
+		//   The parent of this branching or null if this is the top-block.
+		// </summary>
+		public readonly FlowBranching Parent;
+
+		// <summary>
+		//   Start-Location of this flow branching.
+		// </summary>
+		public readonly Location Location;
+
+		// <summary>
+		//   A list of UsageVectors.  A new vector is added each time control flow may
+		//   take a different path.
+		// </summary>
+		public ArrayList Siblings;
+
+		//
+		// Private
+		//
+		InternalParameters param_info;
+		int[] param_map;
+		MyStructInfo[] struct_params;
+		int num_params;
+		ArrayList finally_vectors;
+
+		static int next_id = 0;
+		int id;
+
+		// <summary>
+		//   Performs an `And' operation on the FlowReturns status
+		//   (for instance, a block only returns ALWAYS if all its siblings
+		//   always return).
+		// </summary>
+		public static FlowReturns AndFlowReturns (FlowReturns a, FlowReturns b)
+		{
+			if (b == FlowReturns.UNREACHABLE)
+				return a;
+
+			switch (a) {
+			case FlowReturns.NEVER:
+				if (b == FlowReturns.NEVER)
+					return FlowReturns.NEVER;
+				else
+					return FlowReturns.SOMETIMES;
+
+			case FlowReturns.SOMETIMES:
+				return FlowReturns.SOMETIMES;
+
+			case FlowReturns.ALWAYS:
+				if ((b == FlowReturns.ALWAYS) || (b == FlowReturns.EXCEPTION))
+					return FlowReturns.ALWAYS;
+				else
+					return FlowReturns.SOMETIMES;
+
+			case FlowReturns.EXCEPTION:
+				if (b == FlowReturns.EXCEPTION)
+					return FlowReturns.EXCEPTION;
+				else if (b == FlowReturns.ALWAYS)
+					return FlowReturns.ALWAYS;
+				else
+					return FlowReturns.SOMETIMES;
+			}
+
+			return b;
+		}
+
+		// <summary>
+		//   The vector contains a BitArray with information about which local variables
+		//   and parameters are already initialized at the current code position.
+		// </summary>
+		public class UsageVector {
+			// <summary>
+			//   If this is true, then the usage vector has been modified and must be
+			//   merged when we're done with this branching.
+			// </summary>
+			public bool IsDirty;
+
+			// <summary>
+			//   The number of parameters in this block.
+			// </summary>
+			public readonly int CountParameters;
+
+			// <summary>
+			//   The number of locals in this block.
+			// </summary>
+			public readonly int CountLocals;
+
+			// <summary>
+			//   If not null, then we inherit our state from this vector and do a
+			//   copy-on-write.  If null, then we're the first sibling in a top-level
+			//   block and inherit from the empty vector.
+			// </summary>
+			public readonly UsageVector InheritsFrom;
+
+			//
+			// Private.
+			//
+			MyBitVector locals, parameters;
+			FlowReturns real_returns, real_breaks;
+			bool returns_set, breaks_set, is_finally;
+
+			static int next_id = 0;
+			int id;
+
+			//
+			// Normally, you should not use any of these constructors.
+			//
+			public UsageVector (UsageVector parent, int num_params, int num_locals)
+			{
+				this.InheritsFrom = parent;
+				this.CountParameters = num_params;
+				this.CountLocals = num_locals;
+				this.real_returns = FlowReturns.NEVER;
+				this.real_breaks = FlowReturns.NEVER;
+
+				if (parent != null) {
+					locals = new MyBitVector (parent.locals, CountLocals);
+					if (num_params > 0)
+						parameters = new MyBitVector (parent.parameters, num_params);
+				} else {
+					locals = new MyBitVector (null, CountLocals);
+					if (num_params > 0)
+						parameters = new MyBitVector (null, num_params);
+				}
+
+				id = ++next_id;
+			}
+
+			public UsageVector (UsageVector parent)
+				: this (parent, parent.CountParameters, parent.CountLocals)
+			{ }
+
+			// <summary>
+			//   This does a deep copy of the usage vector.
+			// </summary>
+			public UsageVector Clone ()
+			{
+				UsageVector retval = new UsageVector (null, CountParameters, CountLocals);
+
+				retval.locals = locals.Clone ();
+				if (parameters != null)
+					retval.parameters = parameters.Clone ();
+				retval.real_returns = real_returns;
+				retval.real_breaks = real_breaks;
+
+				return retval;
+			}
+
+			// 
+			// State of parameter `number'.
+			//
+			public bool this [int number]
+			{
+				get {
+					if (number == -1)
+						return true;
+					else if (number == 0)
+						throw new ArgumentException ();
+
+					return parameters [number - 1];
+				}
+
+				set {
+					if (number == -1)
+						return;
+					else if (number == 0)
+						throw new ArgumentException ();
+
+					parameters [number - 1] = value;
+				}
+			}
+
+			//
+			// State of the local variable `vi'.
+			// If the local variable is a struct, use a non-zero `field_idx'
+			// to check an individual field in it.
+			//
+			public bool this [VariableInfo vi, int field_idx]
+			{
+				get {
+					if (vi.Number == -1)
+						return true;
+					else if (vi.Number == 0)
+						throw new ArgumentException ();
+
+					return locals [vi.Number + field_idx - 1];
+				}
+
+				set {
+					if (vi.Number == -1)
+						return;
+					else if (vi.Number == 0)
+						throw new ArgumentException ();
+
+					locals [vi.Number + field_idx - 1] = value;
+				}
+			}
+
+			// <summary>
+			//   Specifies when the current block returns.
+			// </summary>
+			public FlowReturns Returns {
+				get {
+					return real_returns;
+				}
+
+				set {
+					real_returns = value;
+					returns_set = true;
+				}
+			}
+
+			// <summary>
+			//   Specifies whether control may return to our containing block
+			//   before reaching the end of this block.  This happens if there
+			//   is a break/continue/goto/return in it.
+			// </summary>
+			public FlowReturns Breaks {
+				get {
+					return real_breaks;
+				}
+
+				set {
+					real_breaks = value;
+					breaks_set = true;
+				}
+			}
+
+			// <summary>
+			//   Merge a child branching.
+			// </summary>
+			public FlowReturns MergeChildren (FlowBranching branching, ICollection children)
+			{
+				MyBitVector new_locals = null;
+				MyBitVector new_params = null;
+
+				FlowReturns new_returns = FlowReturns.NEVER;
+				FlowReturns new_breaks = FlowReturns.NEVER;
+				bool new_returns_set = false, new_breaks_set = false;
+				bool breaks;
+
+				Report.Debug (1, "MERGING CHILDREN", branching, this);
+
+				foreach (UsageVector child in children) {
+					Report.Debug (1, "  MERGING CHILD", child, child.is_finally);
+
+					if (!child.is_finally) {
+						// If Returns is already set, perform an
+						// `And' operation on it, otherwise just set just.
+						if (!new_returns_set) {
+							new_returns = child.Returns;
+							new_returns_set = true;
+						} else
+							new_returns = AndFlowReturns (
+								new_returns, child.Returns);
+
+						// If Breaks is already set, perform an
+						// `And' operation on it, otherwise just set just.
+						if (!new_breaks_set) {
+							new_breaks = child.Breaks;
+							new_breaks_set = true;
+						} else
+							new_breaks = AndFlowReturns (
+								new_breaks, child.Breaks);
+
+						// Check whether control may reach the end of this sibling.
+						// This happens unless we either always return or always break.
+						if ((child.Returns == FlowReturns.EXCEPTION) ||
+						    (child.Returns == FlowReturns.ALWAYS) ||
+						    ((branching.Type != FlowBranchingType.SWITCH_SECTION) &&
+						     (branching.Type != FlowBranchingType.LOOP_BLOCK) &&
+						     (child.Breaks == FlowReturns.ALWAYS)))
+							breaks = true;
+						else
+							breaks = false;
+					} else
+						breaks = false;
+
+					// Ignore unreachable children.
+					if (child.Returns == FlowReturns.UNREACHABLE)
+						continue;
+
+					// A local variable is initialized after a flow branching if it
+					// has been initialized in all its branches which do neither
+					// always return or always throw an exception.
+					//
+					// If a branch may return, but does not always return, then we
+					// can treat it like a never-returning branch here: control will
+					// only reach the code position after the branching if we did not
+					// return here.
+					//
+					// It's important to distinguish between always and sometimes
+					// returning branches here:
+					//
+					//    1   int a;
+					//    2   if (something) {
+					//    3      return;
+					//    4      a = 5;
+					//    5   }
+					//    6   Console.WriteLine (a);
+					//
+					// The if block in lines 3-4 always returns, so we must not look
+					// at the initialization of `a' in line 4 - thus it'll still be
+					// uninitialized in line 6.
+					//
+					// On the other hand, the following is allowed:
+					//
+					//    1   int a;
+					//    2   if (something)
+					//    3      a = 5;
+					//    4   else
+					//    5      return;
+					//    6   Console.WriteLine (a);
+					//
+					// Here, `a' is initialized in line 3 and we must not look at
+					// line 5 since it always returns.
+					// 
+					if (!breaks) {
+						if (new_locals != null)
+							new_locals.And (child.locals);
+						else {
+							new_locals = locals.Clone ();
+							new_locals.Or (child.locals);
+						}
+					}
+
+					// An `out' parameter must be assigned in all branches which do
+					// not always throw an exception.
+					if (!child.is_finally && (child.Returns != FlowReturns.EXCEPTION)) {
+						if (parameters != null) {
+							if (new_params != null)
+								new_params.And (child.parameters);
+							else {
+								new_params = parameters.Clone ();
+								new_params.Or (child.parameters);
+							}
+						}
+					}
+
+					// If we always return, check whether all `out' parameters have
+					// been assigned.
+					if ((child.Returns == FlowReturns.ALWAYS) && (child.parameters != null)) {
+						branching.CheckOutParameters (
+							child.parameters, branching.Location);
+					}
+				}
+
+				// Set new `Returns' status.
+				if (!returns_set) {
+					Returns = new_returns;
+					returns_set = true;
+				} else
+					Returns = AndFlowReturns (Returns, new_returns);
+
+				//
+				// We've now either reached the point after the branching or we will
+				// never get there since we always return or always throw an exception.
+				//
+				// If we can reach the point after the branching, mark all locals and
+				// parameters as initialized which have been initialized in all branches
+				// we need to look at (see above).
+				//
+
+				bool or_locals = (Returns == FlowReturns.NEVER) ||
+					(Returns == FlowReturns.SOMETIMES);
+				if ((branching.Type != FlowBranchingType.SWITCH_SECTION) &&
+				    (branching.Type != FlowBranchingType.LOOP_BLOCK))
+					or_locals &= ((Breaks == FlowReturns.NEVER) ||
+						      (Breaks == FlowReturns.SOMETIMES));
+
+				if ((new_locals != null) && or_locals) {
+					locals.Or (new_locals);
+				}
+
+				if ((new_params != null) && (Breaks == FlowReturns.NEVER))
+					parameters.Or (new_params);
+
+				//
+				// If we may have returned (this only happens if there was a reachable
+				// `return' statement in one of the branches), then we may return to our
+				// parent block before reaching the end of the block, so set `Breaks'.
+				//
+				if ((Returns != FlowReturns.NEVER) && (Returns != FlowReturns.SOMETIMES)) {
+					// real_breaks = Returns;
+					// breaks_set = true;
+				} else if (branching.Type == FlowBranchingType.BLOCK) {
+					//
+					// If this is not a loop or switch block, `break' actually breaks.
+					//
+
+					if (!breaks_set) {
+						Breaks = new_breaks;
+						breaks_set = true;
+					} else
+						Breaks = AndFlowReturns (Breaks, new_breaks);
+				}
+
+				if (new_returns == FlowReturns.EXCEPTION)
+					Breaks = FlowReturns.UNREACHABLE;
+
+				Report.Debug (1, "MERGING CHILDREN DONE", new_params, new_locals,
+					      new_returns, new_breaks, this);
+
+				return new_returns;
+			}
+
+			// <summary>
+			//   Tells control flow analysis that the current code position may be reached with
+			//   a forward jump from any of the origins listed in `origin_vectors' which is a
+			//   list of UsageVectors.
+			//
+			//   This is used when resolving forward gotos - in the following example, the
+			//   variable `a' is uninitialized in line 8 becase this line may be reached via
+			//   the goto in line 4:
+			//
+			//      1     int a;
+			//
+			//      3     if (something)
+			//      4        goto World;
+			//
+			//      6     a = 5;
+			//
+			//      7  World:
+			//      8     Console.WriteLine (a);
+			//
+			// </summary>
+			public void MergeJumpOrigins (ICollection origin_vectors)
+			{
+				Report.Debug (1, "MERGING JUMP ORIGIN", this);
+
+				real_breaks = FlowReturns.NEVER;
+				breaks_set = false;
+
+				foreach (UsageVector vector in origin_vectors) {
+					Report.Debug (1, "  MERGING JUMP ORIGIN", vector);
+
+					locals.And (vector.locals);
+					if (parameters != null)
+						parameters.And (vector.parameters);
+					Breaks = AndFlowReturns (Breaks, vector.Breaks);
+				}
+
+				Report.Debug (1, "MERGING JUMP ORIGIN DONE", this);
+			}
+
+			// <summary>
+			//   This is used at the beginning of a finally block if there were
+			//   any return statements in the try block or one of the catch blocks.
+			// </summary>
+			public void MergeFinallyOrigins (ICollection finally_vectors)
+			{
+				Report.Debug (1, "MERGING FINALLY ORIGIN", this);
+
+				real_breaks = FlowReturns.NEVER;
+				breaks_set = false;
+
+				foreach (UsageVector vector in finally_vectors) {
+					Report.Debug (1, "  MERGING FINALLY ORIGIN", vector);
+
+					if (parameters != null)
+						parameters.And (vector.parameters);
+					Breaks = AndFlowReturns (Breaks, vector.Breaks);
+				}
+
+				is_finally = true;
+
+				Report.Debug (1, "MERGING FINALLY ORIGIN DONE", this);
+			}
+
+			// <summary>
+			//   Performs an `or' operation on the locals and the parameters.
+			// </summary>
+			public void Or (UsageVector new_vector)
+			{
+				locals.Or (new_vector.locals);
+				if (parameters != null)
+					parameters.Or (new_vector.parameters);
+			}
+
+			// <summary>
+			//   Performs an `and' operation on the locals.
+			// </summary>
+			public void AndLocals (UsageVector new_vector)
+			{
+				locals.And (new_vector.locals);
+			}
+
+			// <summary>
+			//   Returns a deep copy of the parameters.
+			// </summary>
+			public MyBitVector Parameters {
+				get {
+					if (parameters != null)
+						return parameters.Clone ();
+					else
+						return null;
+				}
+			}
+
+			// <summary>
+			//   Returns a deep copy of the locals.
+			// </summary>
+			public MyBitVector Locals {
+				get {
+					return locals.Clone ();
+				}
+			}
+
+			//
+			// Debugging stuff.
+			//
+
+			public override string ToString ()
+			{
+				StringBuilder sb = new StringBuilder ();
+
+				sb.Append ("Vector (");
+				sb.Append (id);
+				sb.Append (",");
+				sb.Append (Returns);
+				sb.Append (",");
+				sb.Append (Breaks);
+				if (parameters != null) {
+					sb.Append (" - ");
+					sb.Append (parameters);
+				}
+				sb.Append (" - ");
+				sb.Append (locals);
+				sb.Append (")");
+
+				return sb.ToString ();
+			}
+		}
+
+		FlowBranching (FlowBranchingType type, Location loc)
+		{
+			this.Siblings = new ArrayList ();
+			this.Block = null;
+			this.Location = loc;
+			this.Type = type;
+			id = ++next_id;
+		}
+
+		// <summary>
+		//   Creates a new flow branching for `block'.
+		//   This is used from Block.Resolve to create the top-level branching of
+		//   the block.
+		// </summary>
+		public FlowBranching (Block block, InternalParameters ip, Location loc)
+			: this (FlowBranchingType.BLOCK, loc)
+		{
+			Block = block;
+			Parent = null;
+
+			int count = (ip != null) ? ip.Count : 0;
+
+			param_info = ip;
+			param_map = new int [count];
+			struct_params = new MyStructInfo [count];
+			num_params = 0;
+
+			for (int i = 0; i < count; i++) {
+				Parameter.Modifier mod = param_info.ParameterModifier (i);
+
+				if ((mod & Parameter.Modifier.OUT) == 0)
+					continue;
+
+				param_map [i] = ++num_params;
+
+				Type param_type = param_info.ParameterType (i);
+
+				struct_params [i] = MyStructInfo.GetStructInfo (param_type);
+				if (struct_params [i] != null)
+					num_params += struct_params [i].Count;
+			}
+
+			Siblings = new ArrayList ();
+			Siblings.Add (new UsageVector (null, num_params, block.CountVariables));
+		}
+
+		// <summary>
+		//   Creates a new flow branching which is contained in `parent'.
+		//   You should only pass non-null for the `block' argument if this block
+		//   introduces any new variables - in this case, we need to create a new
+		//   usage vector with a different size than our parent's one.
+		// </summary>
+		public FlowBranching (FlowBranching parent, FlowBranchingType type,
+				      Block block, Location loc)
+			: this (type, loc)
+		{
+			Parent = parent;
+			Block = block;
+
+			if (parent != null) {
+				param_info = parent.param_info;
+				param_map = parent.param_map;
+				struct_params = parent.struct_params;
+				num_params = parent.num_params;
+			}
+
+			UsageVector vector;
+			if (Block != null)
+				vector = new UsageVector (parent.CurrentUsageVector, num_params,
+							  Block.CountVariables);
+			else
+				vector = new UsageVector (Parent.CurrentUsageVector);
+
+			Siblings.Add (vector);
+
+			switch (Type) {
+			case FlowBranchingType.EXCEPTION:
+				finally_vectors = new ArrayList ();
+				break;
+
+			default:
+				break;
+			}
+		}
+
+		// <summary>
+		//   Returns the branching's current usage vector.
+		// </summary>
+		public UsageVector CurrentUsageVector
+		{
+			get {
+				return (UsageVector) Siblings [Siblings.Count - 1];
+			}
+		}
+
+		// <summary>
+		//   Creates a sibling of the current usage vector.
+		// </summary>
+		public void CreateSibling ()
+		{
+			Siblings.Add (new UsageVector (Parent.CurrentUsageVector));
+
+			Report.Debug (1, "CREATED SIBLING", CurrentUsageVector);
+		}
+
+		// <summary>
+		//   Creates a sibling for a `finally' block.
+		// </summary>
+		public void CreateSiblingForFinally ()
+		{
+			if (Type != FlowBranchingType.EXCEPTION)
+				throw new NotSupportedException ();
+
+			CreateSibling ();
+
+			CurrentUsageVector.MergeFinallyOrigins (finally_vectors);
+		}
+
+		// <summary>
+		//   Check whether all `out' parameters have been assigned.
+		// </summary>
+		public void CheckOutParameters (MyBitVector parameters, Location loc)
+		{
+			if (InTryBlock ())
+				return;
+
+			for (int i = 0; i < param_map.Length; i++) {
+				int index = param_map [i];
+
+				if (index == 0)
+					continue;
+
+				if (parameters [index - 1])
+					continue;
+
+				// If it's a struct, we must ensure that all its fields have
+				// been assigned.  If the struct has any non-public fields, this
+				// can only be done by assigning the whole struct.
+
+				MyStructInfo struct_info = struct_params [index - 1];
+				if ((struct_info == null) || struct_info.HasNonPublicFields) {
+					Report.Error (
+						177, loc, "The out parameter `" +
+						param_info.ParameterName (i) + "' must be " +
+						"assigned before control leave the current method.");
+					param_map [i] = 0;
+					continue;
+				}
+
+
+				for (int j = 0; j < struct_info.Count; j++) {
+					if (!parameters [index + j]) {
+						Report.Error (
+							177, loc, "The out parameter `" +
+							param_info.ParameterName (i) + "' must be " +
+							"assigned before control leave the current method.");
+						param_map [i] = 0;
+						break;
+					}
+				}
+			}
+		}
+
+		// <summary>
+		//   Merge a child branching.
+		// </summary>
+		public FlowReturns MergeChild (FlowBranching child)
+		{
+			return CurrentUsageVector.MergeChildren (child, child.Siblings);
+		}
+
+		// <summary>
+		//   Does the toplevel merging.
+		// </summary>
+		public FlowReturns MergeTopBlock ()
+		{
+			if ((Type != FlowBranchingType.BLOCK) || (Block == null))
+				throw new NotSupportedException ();
+
+			UsageVector vector = new UsageVector (null, num_params, Block.CountVariables);
+
+			vector.MergeChildren (this, Siblings);
+
+			Siblings.Clear ();
+			Siblings.Add (vector);
+
+			Report.Debug (1, "MERGING TOP BLOCK", vector);
+
+			if (vector.Returns != FlowReturns.EXCEPTION)
+				CheckOutParameters (CurrentUsageVector.Parameters, Location);
+
+			return vector.Returns;
+		}
+
+		public bool InTryBlock ()
+		{
+			if (finally_vectors != null)
+				return true;
+			else if (Parent != null)
+				return Parent.InTryBlock ();
+			else
+				return false;
+		}
+
+		public void AddFinallyVector (UsageVector vector)
+		{
+			if (finally_vectors != null) {
+				finally_vectors.Add (vector.Clone ());
+				return;
+			}
+
+			if (Parent != null)
+				Parent.AddFinallyVector (vector);
+			else
+				throw new NotSupportedException ();
+		}
+
+		public bool IsVariableAssigned (VariableInfo vi)
+		{
+			if (CurrentUsageVector.Breaks == FlowReturns.UNREACHABLE)
+				return true;
+			else
+				return CurrentUsageVector [vi, 0];
+		}
+
+		public bool IsVariableAssigned (VariableInfo vi, int field_idx)
+		{
+			if (CurrentUsageVector.Breaks == FlowReturns.UNREACHABLE)
+				return true;
+			else
+				return CurrentUsageVector [vi, field_idx];
+		}
+
+		public void SetVariableAssigned (VariableInfo vi)
+		{
+			if (CurrentUsageVector.Breaks == FlowReturns.UNREACHABLE)
+				return;
+
+			CurrentUsageVector [vi, 0] = true;
+		}
+
+		public void SetVariableAssigned (VariableInfo vi, int field_idx)
+		{
+			if (CurrentUsageVector.Breaks == FlowReturns.UNREACHABLE)
+				return;
+
+			CurrentUsageVector [vi, field_idx] = true;
+		}
+
+		public bool IsParameterAssigned (int number)
+		{
+			int index = param_map [number];
+
+			if (index == 0)
+				return true;
+
+			if (CurrentUsageVector [index])
+				return true;
+
+			// Parameter is not assigned, so check whether it's a struct.
+			// If it's either not a struct or a struct which non-public
+			// fields, return false.
+			MyStructInfo struct_info = struct_params [number];
+			if ((struct_info == null) || struct_info.HasNonPublicFields)
+				return false;
+
+			// Ok, so each field must be assigned.
+			for (int i = 0; i < struct_info.Count; i++)
+				if (!CurrentUsageVector [index + i])
+					return false;
+
+			return true;
+		}
+
+		public bool IsParameterAssigned (int number, string field_name)
+		{
+			int index = param_map [number];
+
+			if (index == 0)
+				return true;
+
+			int field_idx = struct_params [number] [field_name];
+
+			return CurrentUsageVector [index + field_idx];
+		}
+
+		public void SetParameterAssigned (int number)
+		{
+			if (param_map [number] == 0)
+				return;
+
+			if (CurrentUsageVector.Breaks == FlowReturns.NEVER)
+				CurrentUsageVector [param_map [number]] = true;
+		}
+
+		public void SetParameterAssigned (int number, string field_name)
+		{
+			int index = param_map [number];
+
+			if (index == 0)
+				return;
+
+			int field_idx = struct_params [number] [field_name];
+
+			if (CurrentUsageVector.Breaks == FlowReturns.NEVER)
+				CurrentUsageVector [index + field_idx] = true;
+		}
+
+		public override string ToString ()
+		{
+			StringBuilder sb = new StringBuilder ("FlowBranching (");
+
+			sb.Append (id);
+			sb.Append (",");
+			sb.Append (Type);
+			if (Block != null) {
+				sb.Append (" - ");
+				sb.Append (Block.ID);
+				sb.Append (" - ");
+				sb.Append (Block.StartLocation);
+			}
+			sb.Append (" - ");
+			sb.Append (Siblings.Count);
+			sb.Append (" - ");
+			sb.Append (CurrentUsageVector);
+			sb.Append (")");
+			return sb.ToString ();
+		}
+	}
+
+	public class MyStructInfo {
+		public readonly Type Type;
+		public readonly FieldInfo[] Fields;
+		public readonly FieldInfo[] NonPublicFields;
+		public readonly int Count;
+		public readonly int CountNonPublic;
+		public readonly bool HasNonPublicFields;
+
+		private static Hashtable field_type_hash = new Hashtable ();
+		private Hashtable field_hash;
+
+		// Private constructor.  To save memory usage, we only need to create one instance
+		// of this class per struct type.
+		private MyStructInfo (Type type)
+		{
+			this.Type = type;
+
+			if (type is TypeBuilder) {
+				TypeContainer tc = TypeManager.LookupTypeContainer (type);
+
+				ArrayList fields = tc.Fields;
+				if (fields != null) {
+					foreach (Field field in fields) {
+						if ((field.ModFlags & Modifiers.STATIC) != 0)
+							continue;
+						if ((field.ModFlags & Modifiers.PUBLIC) != 0)
+							++Count;
+						else
+							++CountNonPublic;
+					}
+				}
+
+				Fields = new FieldInfo [Count];
+				NonPublicFields = new FieldInfo [CountNonPublic];
+
+				Count = CountNonPublic = 0;
+				if (fields != null) {
+					foreach (Field field in fields) {
+						if ((field.ModFlags & Modifiers.STATIC) != 0)
+							continue;
+						if ((field.ModFlags & Modifiers.PUBLIC) != 0)
+							Fields [Count++] = field.FieldBuilder;
+						else
+							NonPublicFields [CountNonPublic++] =
+								field.FieldBuilder;
+					}
+				}
+				
+			} else {
+				Fields = type.GetFields (BindingFlags.Instance|BindingFlags.Public);
+				Count = Fields.Length;
+
+				NonPublicFields = type.GetFields (BindingFlags.Instance|BindingFlags.NonPublic);
+				CountNonPublic = NonPublicFields.Length;
+			}
+
+			Count += NonPublicFields.Length;
+
+			int number = 0;
+			field_hash = new Hashtable ();
+			foreach (FieldInfo field in Fields)
+				field_hash.Add (field.Name, ++number);
+
+			if (NonPublicFields.Length != 0)
+				HasNonPublicFields = true;
+
+			foreach (FieldInfo field in NonPublicFields)
+				field_hash.Add (field.Name, ++number);
+		}
+
+		public int this [string name] {
+			get {
+				if (field_hash.Contains (name))
+					return (int) field_hash [name];
+				else
+					return 0;
+			}
+		}
+
+		public FieldInfo this [int index] {
+			get {
+				if (index >= Fields.Length)
+					return NonPublicFields [index - Fields.Length];
+				else
+					return Fields [index];
+			}
+		}		       
+
+		public static MyStructInfo GetStructInfo (Type type)
+		{
+			if (!TypeManager.IsValueType (type) || TypeManager.IsEnumType (type))
+				return null;
+
+			if (!(type is TypeBuilder) && TypeManager.IsBuiltinType (type))
+				return null;
+
+			MyStructInfo info = (MyStructInfo) field_type_hash [type];
+			if (info != null)
+				return info;
+
+			info = new MyStructInfo (type);
+			field_type_hash.Add (type, info);
+			return info;
+		}
+
+		public static MyStructInfo GetStructInfo (TypeContainer tc)
+		{
+			MyStructInfo info = (MyStructInfo) field_type_hash [tc.TypeBuilder];
+			if (info != null)
+				return info;
+
+			info = new MyStructInfo (tc.TypeBuilder);
+			field_type_hash.Add (tc.TypeBuilder, info);
+			return info;
+		}
+	}
+	
+	public class VariableInfo : IVariable {
+		public Expression Type;
+		public LocalBuilder LocalBuilder;
+		public Type VariableType;
+		public readonly string Name;
+		public readonly Location Location;
+		public readonly int Block;
+
+		public int Number;
+		
+		public bool Used;
+		public bool Assigned;
+		public bool ReadOnly;
+		
+		public VariableInfo (Expression type, string name, int block, Location l)
+		{
+			Type = type;
+			Name = name;
+			Block = block;
+			LocalBuilder = null;
+			Location = l;
+		}
+
+		public VariableInfo (TypeContainer tc, int block, Location l)
+		{
+			VariableType = tc.TypeBuilder;
+			struct_info = MyStructInfo.GetStructInfo (tc);
+			Block = block;
+			LocalBuilder = null;
+			Location = l;
+		}
+
+		MyStructInfo struct_info;
+		public MyStructInfo StructInfo {
+			get {
+				return struct_info;
+			}
+		}
+
+		public bool IsAssigned (EmitContext ec, Location loc)
+		{
+			if (!ec.DoFlowAnalysis || ec.CurrentBranching.IsVariableAssigned (this))
+				return true;
+
+			MyStructInfo struct_info = StructInfo;
+			if ((struct_info == null) || (struct_info.HasNonPublicFields && (Name != null))) {
+				Report.Error (165, loc, "Use of unassigned local variable `" + Name + "'");
+				ec.CurrentBranching.SetVariableAssigned (this);
+				return false;
+			}
+
+			int count = struct_info.Count;
+
+			for (int i = 0; i < count; i++) {
+				if (!ec.CurrentBranching.IsVariableAssigned (this, i+1)) {
+					if (Name != null) {
+						Report.Error (165, loc,
+							      "Use of unassigned local variable `" +
+							      Name + "'");
+						ec.CurrentBranching.SetVariableAssigned (this);
+						return false;
+					}
+
+					FieldInfo field = struct_info [i];
+					Report.Error (171, loc,
+						      "Field `" + TypeManager.CSharpName (VariableType) +
+						      "." + field.Name + "' must be fully initialized " +
+						      "before control leaves the constructor");
+					return false;
+				}
+			}
+
+			return true;
+		}
+
+		public bool IsFieldAssigned (EmitContext ec, string name, Location loc)
+		{
+			if (!ec.DoFlowAnalysis || ec.CurrentBranching.IsVariableAssigned (this) ||
+			    (struct_info == null))
+				return true;
+
+			int field_idx = StructInfo [name];
+			if (field_idx == 0)
+				return true;
+
+			if (!ec.CurrentBranching.IsVariableAssigned (this, field_idx)) {
+				Report.Error (170, loc,
+					      "Use of possibly unassigned field `" + name + "'");
+				ec.CurrentBranching.SetVariableAssigned (this, field_idx);
+				return false;
+			}
+
+			return true;
+		}
+
+		public void SetAssigned (EmitContext ec)
+		{
+			if (ec.DoFlowAnalysis)
+				ec.CurrentBranching.SetVariableAssigned (this);
+		}
+
+		public void SetFieldAssigned (EmitContext ec, string name)
+		{
+			if (ec.DoFlowAnalysis && (struct_info != null))
+				ec.CurrentBranching.SetVariableAssigned (this, StructInfo [name]);
+		}
+
+		public bool Resolve (DeclSpace decl)
+		{
+			if (struct_info != null)
+				return true;
+
+			if (VariableType == null)
+				VariableType = decl.ResolveType (Type, false, Location);
+
+			if (VariableType == null)
+				return false;
+
+			struct_info = MyStructInfo.GetStructInfo (VariableType);
+
+			return true;
+		}
+
+		public void MakePinned ()
+		{
+			TypeManager.MakePinned (LocalBuilder);
+		}
+
+		public override string ToString ()
+		{
+			return "VariableInfo (" + Number + "," + Type + "," + Location + ")";
+		}
+	}
+		
+	/// <summary>
+	///   Block represents a C# block.
+	/// </summary>
+	///
+	/// <remarks>
+	///   This class is used in a number of places: either to represent
+	///   explicit blocks that the programmer places or implicit blocks.
+	///
+	///   Implicit blocks are used as labels or to introduce variable
+	///   declarations.
+	/// </remarks>
+	public class Block : Statement {
+		public readonly Block     Parent;
+		public readonly bool      Implicit;
+		public readonly Location  StartLocation;
+		public Location           EndLocation;
+
+		//
+		// The statements in this block
+		//
+		ArrayList statements;
+
+		//
+		// An array of Blocks.  We keep track of children just
+		// to generate the local variable declarations.
+		//
+		// Statements and child statements are handled through the
+		// statements.
+		//
+		ArrayList children;
+		
+		//
+		// Labels.  (label, block) pairs.
+		//
+		Hashtable labels;
+
+		//
+		// Keeps track of (name, type) pairs
+		//
+		Hashtable variables;
+
+		//
+		// Keeps track of constants
+		Hashtable constants;
+
+		//
+		// Maps variable names to ILGenerator.LocalBuilders
+		//
+		Hashtable local_builders;
+
+		bool used = false;
+
+		static int id;
+
+		int this_id;
+		
+		public Block (Block parent)
+			: this (parent, false, Location.Null, Location.Null)
+		{ }
+
+		public Block (Block parent, bool implicit_block)
+			: this (parent, implicit_block, Location.Null, Location.Null)
+		{ }
+
+		public Block (Block parent, bool implicit_block, Parameters parameters)
+			: this (parent, implicit_block, parameters, Location.Null, Location.Null)
+		{ }
+
+		public Block (Block parent, Location start, Location end)
+			: this (parent, false, start, end)
+		{ }
+
+		public Block (Block parent, Parameters parameters, Location start, Location end)
+			: this (parent, false, parameters, start, end)
+		{ }
+
+		public Block (Block parent, bool implicit_block, Location start, Location end)
+			: this (parent, implicit_block, Parameters.EmptyReadOnlyParameters,
+				start, end)
+		{ }
+
+		public Block (Block parent, bool implicit_block, Parameters parameters,
+			      Location start, Location end)
+		{
+			if (parent != null)
+				parent.AddChild (this);
+			
+			this.Parent = parent;
+			this.Implicit = implicit_block;
+			this.parameters = parameters;
+			this.StartLocation = start;
+			this.EndLocation = end;
+			this.loc = start;
+			this_id = id++;
+			statements = new ArrayList ();
+		}
+
+		public int ID {
+			get {
+				return this_id;
+			}
+		}
+
+		void AddChild (Block b)
+		{
+			if (children == null)
+				children = new ArrayList ();
+			
+			children.Add (b);
+		}
+
+		public void SetEndLocation (Location loc)
+		{
+			EndLocation = loc;
+		}
+
+		/// <summary>
+		///   Adds a label to the current block. 
+		/// </summary>
+		///
+		/// <returns>
+		///   false if the name already exists in this block. true
+		///   otherwise.
+		/// </returns>
+		///
+		public bool AddLabel (string name, LabeledStatement target)
+		{
+			if (labels == null)
+				labels = new Hashtable ();
+			if (labels.Contains (name))
+				return false;
+			
+			labels.Add (name, target);
+			return true;
+		}
+
+		public LabeledStatement LookupLabel (string name)
+		{
+			if (labels != null){
+				if (labels.Contains (name))
+					return ((LabeledStatement) labels [name]);
+			}
+
+			if (Parent != null)
+				return Parent.LookupLabel (name);
+
+			return null;
+		}
+
+		VariableInfo this_variable = null;
+
+		// <summary>
+		//   Returns the "this" instance variable of this block.
+		//   See AddThisVariable() for more information.
+		// </summary>
+		public VariableInfo ThisVariable {
+			get {
+				if (this_variable != null)
+					return this_variable;
+				else if (Parent != null)
+					return Parent.ThisVariable;
+				else
+					return null;
+			}
+		}
+
+		Hashtable child_variable_names;
+
+		// <summary>
+		//   Marks a variable with name @name as being used in a child block.
+		//   If a variable name has been used in a child block, it's illegal to
+		//   declare a variable with the same name in the current block.
+		// </summary>
+		public void AddChildVariableName (string name)
+		{
+			if (child_variable_names == null)
+				child_variable_names = new Hashtable ();
+
+			if (!child_variable_names.Contains (name))
+				child_variable_names.Add (name, true);
+		}
+
+		// <summary>
+		//   Marks all variables from block @block and all its children as being
+		//   used in a child block.
+		// </summary>
+		public void AddChildVariableNames (Block block)
+		{
+			if (block.Variables != null) {
+				foreach (string name in block.Variables.Keys)
+					AddChildVariableName (name);
+			}
+
+			foreach (Block child in block.children) {
+				if (child.Variables != null) {
+					foreach (string name in child.Variables.Keys)
+						AddChildVariableName (name);
+				}
+			}
+		}
+
+		// <summary>
+		//   Checks whether a variable name has already been used in a child block.
+		// </summary>
+		public bool IsVariableNameUsedInChildBlock (string name)
+		{
+			if (child_variable_names == null)
+				return false;
+
+			return child_variable_names.Contains (name);
+		}
+
+		// <summary>
+		//   This is used by non-static `struct' constructors which do not have an
+		//   initializer - in this case, the constructor must initialize all of the
+		//   struct's fields.  To do this, we add a "this" variable and use the flow
+		//   analysis code to ensure that it's been fully initialized before control
+		//   leaves the constructor.
+		// </summary>
+		public VariableInfo AddThisVariable (TypeContainer tc, Location l)
+		{
+			if (this_variable != null)
+				return this_variable;
+
+			this_variable = new VariableInfo (tc, ID, l);
+
+			if (variables == null)
+				variables = new Hashtable ();
+			variables.Add ("this", this_variable);
+
+			return this_variable;
+		}
+
+		public VariableInfo AddVariable (Expression type, string name, Parameters pars, Location l)
+		{
+			if (variables == null)
+				variables = new Hashtable ();
+
+			VariableInfo vi = GetVariableInfo (name);
+			if (vi != null) {
+				if (vi.Block != ID)
+					Report.Error (136, l, "A local variable named `" + name + "' " +
+						      "cannot be declared in this scope since it would " +
+						      "give a different meaning to `" + name + "', which " +
+						      "is already used in a `parent or current' scope to " +
+						      "denote something else");
+				else
+					Report.Error (128, l, "A local variable `" + name + "' is already " +
+						      "defined in this scope");
+				return null;
+			}
+
+			if (IsVariableNameUsedInChildBlock (name)) {
+				Report.Error (136, l, "A local variable named `" + name + "' " +
+					      "cannot be declared in this scope since it would " +
+					      "give a different meaning to `" + name + "', which " +
+					      "is already used in a `child' scope to denote something " +
+					      "else");
+				return null;
+			}
+
+			if (pars != null) {
+				int idx = 0;
+				Parameter p = pars.GetParameterByName (name, out idx);
+				if (p != null) {
+					Report.Error (136, l, "A local variable named `" + name + "' " +
+						      "cannot be declared in this scope since it would " +
+						      "give a different meaning to `" + name + "', which " +
+						      "is already used in a `parent or current' scope to " +
+						      "denote something else");
+					return null;
+				}
+			}
+			
+			vi = new VariableInfo (type, name, ID, l);
+
+			variables.Add (name, vi);
+
+			if (variables_initialized)
+				throw new Exception ();
+
+			// Console.WriteLine ("Adding {0} to {1}", name, ID);
+			return vi;
+		}
+
+		public bool AddConstant (Expression type, string name, Expression value, Parameters pars, Location l)
+		{
+			if (AddVariable (type, name, pars, l) == null)
+				return false;
+			
+			if (constants == null)
+				constants = new Hashtable ();
+
+			constants.Add (name, value);
+			return true;
+		}
+
+		public Hashtable Variables {
+			get {
+				return variables;
+			}
+		}
+
+		public VariableInfo GetVariableInfo (string name)
+		{
+			if (variables != null) {
+				object temp;
+				temp = variables [name];
+
+				if (temp != null){
+					return (VariableInfo) temp;
+				}
+			}
+
+			if (Parent != null)
+				return Parent.GetVariableInfo (name);
+
+			return null;
+		}
+		
+		public Expression GetVariableType (string name)
+		{
+			VariableInfo vi = GetVariableInfo (name);
+
+			if (vi != null)
+				return vi.Type;
+
+			return null;
+		}
+
+		public Expression GetConstantExpression (string name)
+		{
+			if (constants != null) {
+				object temp;
+				temp = constants [name];
+				
+				if (temp != null)
+					return (Expression) temp;
+			}
+			
+			if (Parent != null)
+				return Parent.GetConstantExpression (name);
+
+			return null;
+		}
+		
+		/// <summary>
+		///   True if the variable named @name has been defined
+		///   in this block
+		/// </summary>
+		public bool IsVariableDefined (string name)
+		{
+			// Console.WriteLine ("Looking up {0} in {1}", name, ID);
+			if (variables != null) {
+				if (variables.Contains (name))
+					return true;
+			}
+			
+			if (Parent != null)
+				return Parent.IsVariableDefined (name);
+
+			return false;
+		}
+
+		/// <summary>
+		///   True if the variable named @name is a constant
+		///  </summary>
+		public bool IsConstant (string name)
+		{
+			Expression e = null;
+			
+			e = GetConstantExpression (name);
+			
+			return e != null;
+		}
+		
+		/// <summary>
+		///   Use to fetch the statement associated with this label
+		/// </summary>
+		public Statement this [string name] {
+			get {
+				return (Statement) labels [name];
+			}
+		}
+
+		Parameters parameters = null;
+		public Parameters Parameters {
+			get {
+				if (Parent != null)
+					return Parent.Parameters;
+
+				return parameters;
+			}
+		}
+
+		/// <returns>
+		///   A list of labels that were not used within this block
+		/// </returns>
+		public string [] GetUnreferenced ()
+		{
+			// FIXME: Implement me
+			return null;
+		}
+
+		public void AddStatement (Statement s)
+		{
+			statements.Add (s);
+			used = true;
+		}
+
+		public bool Used {
+			get {
+				return used;
+			}
+		}
+
+		public void Use ()
+		{
+			used = true;
+		}
+
+		bool variables_initialized = false;
+		int count_variables = 0, first_variable = 0;
+
+		void UpdateVariableInfo (EmitContext ec)
+		{
+			DeclSpace ds = ec.DeclSpace;
+
+			first_variable = 0;
+
+			if (Parent != null)
+				first_variable += Parent.CountVariables;
+
+			count_variables = first_variable;
+			if (variables != null) {
+				foreach (VariableInfo vi in variables.Values) {
+					if (!vi.Resolve (ds)) {
+						vi.Number = -1;
+						continue;
+					}
+
+					vi.Number = ++count_variables;
+
+					if (vi.StructInfo != null)
+						count_variables += vi.StructInfo.Count;
+				}
+			}
+
+			variables_initialized = true;
+		}
+
+		//
+		// <returns>
+		//   The number of local variables in this block
+		// </returns>
+		public int CountVariables
+		{
+			get {
+				if (!variables_initialized)
+					throw new Exception ();
+
+				return count_variables;
+			}
+		}
+
+		/// <summary>
+		///   Emits the variable declarations and labels.
+		/// </summary>
+		/// <remarks>
+		///   tc: is our typecontainer (to resolve type references)
+		///   ig: is the code generator:
+		///   toplevel: the toplevel block.  This is used for checking 
+		///   		that no two labels with the same name are used.
+		/// </remarks>
+		public void EmitMeta (EmitContext ec, Block toplevel)
+		{
+			DeclSpace ds = ec.DeclSpace;
+			ILGenerator ig = ec.ig;
+
+			if (!variables_initialized)
+				UpdateVariableInfo (ec);
+
+			//
+			// Process this block variables
+			//
+			if (variables != null){
+				local_builders = new Hashtable ();
+				
+				foreach (DictionaryEntry de in variables){
+					string name = (string) de.Key;
+					VariableInfo vi = (VariableInfo) de.Value;
+
+					if (vi.VariableType == null)
+						continue;
+
+					vi.LocalBuilder = ig.DeclareLocal (vi.VariableType);
+
+					if (CodeGen.SymbolWriter != null)
+						vi.LocalBuilder.SetLocalSymInfo (name);
+
+					if (constants == null)
+						continue;
+
+					Expression cv = (Expression) constants [name];
+					if (cv == null)
+						continue;
+
+					Expression e = cv.Resolve (ec);
+					if (e == null)
+						continue;
+
+					if (!(e is Constant)){
+						Report.Error (133, vi.Location,
+							      "The expression being assigned to `" +
+							      name + "' must be constant (" + e + ")");
+						continue;
+					}
+
+					constants.Remove (name);
+					constants.Add (name, e);
+				}
+			}
+
+			//
+			// Now, handle the children
+			//
+			if (children != null){
+				foreach (Block b in children)
+					b.EmitMeta (ec, toplevel);
+			}
+		}
+
+		public void UsageWarning ()
+		{
+			string name;
+			
+			if (variables != null){
+				foreach (DictionaryEntry de in variables){
+					VariableInfo vi = (VariableInfo) de.Value;
+					
+					if (vi.Used)
+						continue;
+					
+					name = (string) de.Key;
+						
+					if (vi.Assigned){
+						Report.Warning (
+							219, vi.Location, "The variable `" + name +
+							"' is assigned but its value is never used");
+					} else {
+						Report.Warning (
+							168, vi.Location, "The variable `" +
+							name +
+							"' is declared but never used");
+					} 
+				}
+			}
+
+			if (children != null)
+				foreach (Block b in children)
+					b.UsageWarning ();
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			Block prev_block = ec.CurrentBlock;
+			bool ok = true;
+
+			ec.CurrentBlock = this;
+			ec.StartFlowBranching (this);
+
+			Report.Debug (1, "RESOLVE BLOCK", StartLocation);
+
+			if (!variables_initialized)
+				UpdateVariableInfo (ec);
+
+			foreach (Statement s in statements){
+				if (s.Resolve (ec) == false)
+					ok = false;
+			}
+
+			Report.Debug (1, "RESOLVE BLOCK DONE", StartLocation);
+
+			FlowReturns returns = ec.EndFlowBranching ();
+			ec.CurrentBlock = prev_block;
+
+			// If we're a non-static `struct' constructor which doesn't have an
+			// initializer, then we must initialize all of the struct's fields.
+			if ((this_variable != null) && (returns != FlowReturns.EXCEPTION) &&
+			    !this_variable.IsAssigned (ec, loc))
+				ok = false;
+
+			if ((labels != null) && (RootContext.WarningLevel >= 2)) {
+				foreach (LabeledStatement label in labels.Values)
+					if (!label.HasBeenReferenced)
+						Report.Warning (164, label.Location,
+								"This label has not been referenced");
+			}
+
+			return ok;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			bool is_ret = false, this_ret = false;
+			Block prev_block = ec.CurrentBlock;
+			bool warning_shown = false;
+
+			ec.CurrentBlock = this;
+
+			if (CodeGen.SymbolWriter != null) {
+				ec.Mark (StartLocation);
+				
+				foreach (Statement s in statements) {
+					ec.Mark (s.loc);
+					
+					if (is_ret && !warning_shown && !(s is EmptyStatement)){
+						warning_shown = true;
+						Warning_DeadCodeFound (s.loc);
+					}
+					this_ret = s.Emit (ec);
+					if (this_ret)
+						is_ret = true;
+				}
+
+				ec.Mark (EndLocation); 
+			} else {
+				foreach (Statement s in statements){
+					if (is_ret && !warning_shown && !(s is EmptyStatement)){
+						warning_shown = true;
+						Warning_DeadCodeFound (s.loc);
+					}
+					this_ret = s.Emit (ec);
+					if (this_ret)
+						is_ret = true;
+				}
+			}
+			
+			ec.CurrentBlock = prev_block;
+			return is_ret;
+		}
+	}
+
+	public class SwitchLabel {
+		Expression label;
+		object converted;
+		public Location loc;
+		public Label ILLabel;
+		public Label ILLabelCode;
+
+		//
+		// if expr == null, then it is the default case.
+		//
+		public SwitchLabel (Expression expr, Location l)
+		{
+			label = expr;
+			loc = l;
+		}
+
+		public Expression Label {
+			get {
+				return label;
+			}
+		}
+
+		public object Converted {
+			get {
+				return converted;
+			}
+		}
+
+		//
+		// Resolves the expression, reduces it to a literal if possible
+		// and then converts it to the requested type.
+		//
+		public bool ResolveAndReduce (EmitContext ec, Type required_type)
+		{
+			ILLabel = ec.ig.DefineLabel ();
+			ILLabelCode = ec.ig.DefineLabel ();
+
+			if (label == null)
+				return true;
+			
+			Expression e = label.Resolve (ec);
+
+			if (e == null)
+				return false;
+
+			if (!(e is Constant)){
+				Console.WriteLine ("Value is: " + label);
+				Report.Error (150, loc, "A constant value is expected");
+				return false;
+			}
+
+			if (e is StringConstant || e is NullLiteral){
+				if (required_type == TypeManager.string_type){
+					converted = label;
+					ILLabel = ec.ig.DefineLabel ();
+					return true;
+				}
+			}
+
+			converted = Expression.ConvertIntLiteral ((Constant) e, required_type, loc);
+			if (converted == null)
+				return false;
+
+			return true;
+		}
+	}
+
+	public class SwitchSection {
+		// An array of SwitchLabels.
+		public readonly ArrayList Labels;
+		public readonly Block Block;
+		
+		public SwitchSection (ArrayList labels, Block block)
+		{
+			Labels = labels;
+			Block = block;
+		}
+	}
+	
+	public class Switch : Statement {
+		public readonly ArrayList Sections;
+		public Expression Expr;
+
+		/// <summary>
+		///   Maps constants whose type type SwitchType to their  SwitchLabels.
+		/// </summary>
+		public Hashtable Elements;
+
+		/// <summary>
+		///   The governing switch type
+		/// </summary>
+		public Type SwitchType;
+
+		//
+		// Computed
+		//
+		bool got_default;
+		Label default_target;
+		Expression new_expr;
+
+		//
+		// The types allowed to be implicitly cast from
+		// on the governing type
+		//
+		static Type [] allowed_types;
+		
+		public Switch (Expression e, ArrayList sects, Location l)
+		{
+			Expr = e;
+			Sections = sects;
+			loc = l;
+		}
+
+		public bool GotDefault {
+			get {
+				return got_default;
+			}
+		}
+
+		public Label DefaultTarget {
+			get {
+				return default_target;
+			}
+		}
+
+		//
+		// Determines the governing type for a switch.  The returned
+		// expression might be the expression from the switch, or an
+		// expression that includes any potential conversions to the
+		// integral types or to string.
+		//
+		Expression SwitchGoverningType (EmitContext ec, Type t)
+		{
+			if (t == TypeManager.int32_type ||
+			    t == TypeManager.uint32_type ||
+			    t == TypeManager.char_type ||
+			    t == TypeManager.byte_type ||
+			    t == TypeManager.sbyte_type ||
+			    t == TypeManager.ushort_type ||
+			    t == TypeManager.short_type ||
+			    t == TypeManager.uint64_type ||
+			    t == TypeManager.int64_type ||
+			    t == TypeManager.string_type ||
+				t == TypeManager.bool_type ||
+				t.IsSubclassOf (TypeManager.enum_type))
+				return Expr;
+
+			if (allowed_types == null){
+				allowed_types = new Type [] {
+					TypeManager.sbyte_type,
+					TypeManager.byte_type,
+					TypeManager.short_type,
+					TypeManager.ushort_type,
+					TypeManager.int32_type,
+					TypeManager.uint32_type,
+					TypeManager.int64_type,
+					TypeManager.uint64_type,
+					TypeManager.char_type,
+					TypeManager.bool_type,
+					TypeManager.string_type
+				};
+			}
+
+			//
+			// Try to find a *user* defined implicit conversion.
+			//
+			// If there is no implicit conversion, or if there are multiple
+			// conversions, we have to report an error
+			//
+			Expression converted = null;
+			foreach (Type tt in allowed_types){
+				Expression e;
+				
+				e = Expression.ImplicitUserConversion (ec, Expr, tt, loc);
+				if (e == null)
+					continue;
+
+				if (converted != null){
+					Report.Error (-12, loc, "More than one conversion to an integral " +
+						      " type exists for type `" +
+						      TypeManager.CSharpName (Expr.Type)+"'");
+					return null;
+				} else
+					converted = e;
+			}
+			return converted;
+		}
+
+		void error152 (string n)
+		{
+			Report.Error (
+				152, "The label `" + n + ":' " +
+				"is already present on this switch statement");
+		}
+		
+		//
+		// Performs the basic sanity checks on the switch statement
+		// (looks for duplicate keys and non-constant expressions).
+		//
+		// It also returns a hashtable with the keys that we will later
+		// use to compute the switch tables
+		//
+		bool CheckSwitch (EmitContext ec)
+		{
+			Type compare_type;
+			bool error = false;
+			Elements = new Hashtable ();
+				
+			got_default = false;
+
+			if (TypeManager.IsEnumType (SwitchType)){
+				compare_type = TypeManager.EnumToUnderlying (SwitchType);
+			} else
+				compare_type = SwitchType;
+			
+			foreach (SwitchSection ss in Sections){
+				foreach (SwitchLabel sl in ss.Labels){
+					if (!sl.ResolveAndReduce (ec, SwitchType)){
+						error = true;
+						continue;
+					}
+
+					if (sl.Label == null){
+						if (got_default){
+							error152 ("default");
+							error = true;
+						}
+						got_default = true;
+						continue;
+					}
+					
+					object key = sl.Converted;
+
+					if (key is Constant)
+						key = ((Constant) key).GetValue ();
+
+					if (key == null)
+						key = NullLiteral.Null;
+					
+					string lname = null;
+					if (compare_type == TypeManager.uint64_type){
+						ulong v = (ulong) key;
+
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.int64_type){
+						long v = (long) key;
+
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.uint32_type){
+						uint v = (uint) key;
+
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.char_type){
+						char v = (char) key;
+						
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.byte_type){
+						byte v = (byte) key;
+						
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.sbyte_type){
+						sbyte v = (sbyte) key;
+						
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.short_type){
+						short v = (short) key;
+						
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.ushort_type){
+						ushort v = (ushort) key;
+						
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.string_type){
+						if (key is NullLiteral){
+							if (Elements.Contains (NullLiteral.Null))
+								lname = "null";
+							else
+								Elements.Add (NullLiteral.Null, null);
+						} else {
+							string s = (string) key;
+
+							if (Elements.Contains (s))
+								lname = s;
+							else
+								Elements.Add (s, sl);
+						}
+					} else if (compare_type == TypeManager.int32_type) {
+						int v = (int) key;
+
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					} else if (compare_type == TypeManager.bool_type) {
+						bool v = (bool) key;
+
+						if (Elements.Contains (v))
+							lname = v.ToString ();
+						else
+							Elements.Add (v, sl);
+					}
+					else
+					{
+						throw new Exception ("Unknown switch type!" +
+								     SwitchType + " " + compare_type);
+					}
+
+					if (lname != null){
+						error152 ("case + " + lname);
+						error = true;
+					}
+				}
+			}
+			if (error)
+				return false;
+			
+			return true;
+		}
+
+		void EmitObjectInteger (ILGenerator ig, object k)
+		{
+			if (k is int)
+				IntConstant.EmitInt (ig, (int) k);
+			else if (k is Constant) {
+				EmitObjectInteger (ig, ((Constant) k).GetValue ());
+			} 
+			else if (k is uint)
+				IntConstant.EmitInt (ig, unchecked ((int) (uint) k));
+			else if (k is long)
+			{
+				if ((long) k >= int.MinValue && (long) k <= int.MaxValue)
+				{
+					IntConstant.EmitInt (ig, (int) (long) k);
+					ig.Emit (OpCodes.Conv_I8);
+				}
+				else
+					LongConstant.EmitLong (ig, (long) k);
+			}
+			else if (k is ulong)
+			{
+				if ((ulong) k < (1L<<32))
+				{
+					IntConstant.EmitInt (ig, (int) (long) k);
+					ig.Emit (OpCodes.Conv_U8);
+				}
+				else
+				{
+					LongConstant.EmitLong (ig, unchecked ((long) (ulong) k));
+				}
+			}
+			else if (k is char)
+				IntConstant.EmitInt (ig, (int) ((char) k));
+			else if (k is sbyte)
+				IntConstant.EmitInt (ig, (int) ((sbyte) k));
+			else if (k is byte)
+				IntConstant.EmitInt (ig, (int) ((byte) k));
+			else if (k is short)
+				IntConstant.EmitInt (ig, (int) ((short) k));
+			else if (k is ushort)
+				IntConstant.EmitInt (ig, (int) ((ushort) k));
+			else if (k is bool)
+				IntConstant.EmitInt (ig, ((bool) k) ? 1 : 0);
+			else
+				throw new Exception ("Unhandled case");
+		}
+		
+		// structure used to hold blocks of keys while calculating table switch
+		class KeyBlock : IComparable
+		{
+			public KeyBlock (long _nFirst)
+			{
+				nFirst = nLast = _nFirst;
+			}
+			public long nFirst;
+			public long nLast;
+			public ArrayList rgKeys = null;
+			public int Length
+			{
+				get { return (int) (nLast - nFirst + 1); }
+			}
+			public static long TotalLength (KeyBlock kbFirst, KeyBlock kbLast)
+			{
+				return kbLast.nLast - kbFirst.nFirst + 1;
+			}
+			public int CompareTo (object obj)
+			{
+				KeyBlock kb = (KeyBlock) obj;
+				int nLength = Length;
+				int nLengthOther = kb.Length;
+				if (nLengthOther == nLength)
+					return (int) (kb.nFirst - nFirst);
+				return nLength - nLengthOther;
+			}
+		}
+
+		/// <summary>
+		/// This method emits code for a lookup-based switch statement (non-string)
+		/// Basically it groups the cases into blocks that are at least half full,
+		/// and then spits out individual lookup opcodes for each block.
+		/// It emits the longest blocks first, and short blocks are just
+		/// handled with direct compares.
+		/// </summary>
+		/// <param name="ec"></param>
+		/// <param name="val"></param>
+		/// <returns></returns>
+		bool TableSwitchEmit (EmitContext ec, LocalBuilder val)
+		{
+			int cElements = Elements.Count;
+			object [] rgKeys = new object [cElements];
+			Elements.Keys.CopyTo (rgKeys, 0);
+			Array.Sort (rgKeys);
+
+			// initialize the block list with one element per key
+			ArrayList rgKeyBlocks = new ArrayList ();
+			foreach (object key in rgKeys)
+				rgKeyBlocks.Add (new KeyBlock (Convert.ToInt64 (key)));
+
+			KeyBlock kbCurr;
+			// iteratively merge the blocks while they are at least half full
+			// there's probably a really cool way to do this with a tree...
+			while (rgKeyBlocks.Count > 1)
+			{
+				ArrayList rgKeyBlocksNew = new ArrayList ();
+				kbCurr = (KeyBlock) rgKeyBlocks [0];
+				for (int ikb = 1; ikb < rgKeyBlocks.Count; ikb++)
+				{
+					KeyBlock kb = (KeyBlock) rgKeyBlocks [ikb];
+					if ((kbCurr.Length + kb.Length) * 2 >=  KeyBlock.TotalLength (kbCurr, kb))
+					{
+						// merge blocks
+						kbCurr.nLast = kb.nLast;
+					}
+					else
+					{
+						// start a new block
+						rgKeyBlocksNew.Add (kbCurr);
+						kbCurr = kb;
+					}
+				}
+				rgKeyBlocksNew.Add (kbCurr);
+				if (rgKeyBlocks.Count == rgKeyBlocksNew.Count)
+					break;
+				rgKeyBlocks = rgKeyBlocksNew;
+			}
+
+			// initialize the key lists
+			foreach (KeyBlock kb in rgKeyBlocks)
+				kb.rgKeys = new ArrayList ();
+
+			// fill the key lists
+			int iBlockCurr = 0;
+			if (rgKeyBlocks.Count > 0) {
+				kbCurr = (KeyBlock) rgKeyBlocks [0];
+				foreach (object key in rgKeys)
+				{
+					bool fNextBlock = (key is UInt64) ? (ulong) key > (ulong) kbCurr.nLast : Convert.ToInt64 (key) > kbCurr.nLast;
+					if (fNextBlock)
+						kbCurr = (KeyBlock) rgKeyBlocks [++iBlockCurr];
+					kbCurr.rgKeys.Add (key);
+				}
+			}
+
+			// sort the blocks so we can tackle the largest ones first
+			rgKeyBlocks.Sort ();
+
+			// okay now we can start...
+			ILGenerator ig = ec.ig;
+			Label lblEnd = ig.DefineLabel ();	// at the end ;-)
+			Label lblDefault = ig.DefineLabel ();
+
+			Type typeKeys = null;
+			if (rgKeys.Length > 0)
+				typeKeys = rgKeys [0].GetType ();	// used for conversions
+
+			for (int iBlock = rgKeyBlocks.Count - 1; iBlock >= 0; --iBlock)
+			{
+				KeyBlock kb = ((KeyBlock) rgKeyBlocks [iBlock]);
+				lblDefault = (iBlock == 0) ? DefaultTarget : ig.DefineLabel ();
+				if (kb.Length <= 2)
+				{
+					foreach (object key in kb.rgKeys)
+					{
+						ig.Emit (OpCodes.Ldloc, val);
+						EmitObjectInteger (ig, key);
+						SwitchLabel sl = (SwitchLabel) Elements [key];
+						ig.Emit (OpCodes.Beq, sl.ILLabel);
+					}
+				}
+				else
+				{
+					// TODO: if all the keys in the block are the same and there are
+					//       no gaps/defaults then just use a range-check.
+					if (SwitchType == TypeManager.int64_type ||
+						SwitchType == TypeManager.uint64_type)
+					{
+						// TODO: optimize constant/I4 cases
+
+						// check block range (could be > 2^31)
+						ig.Emit (OpCodes.Ldloc, val);
+						EmitObjectInteger (ig, Convert.ChangeType (kb.nFirst, typeKeys));
+						ig.Emit (OpCodes.Blt, lblDefault);
+						ig.Emit (OpCodes.Ldloc, val);
+						EmitObjectInteger (ig, Convert.ChangeType (kb.nFirst, typeKeys));
+						ig.Emit (OpCodes.Bgt, lblDefault);
+
+						// normalize range
+						ig.Emit (OpCodes.Ldloc, val);
+						if (kb.nFirst != 0)
+						{
+							EmitObjectInteger (ig, Convert.ChangeType (kb.nFirst, typeKeys));
+							ig.Emit (OpCodes.Sub);
+						}
+						ig.Emit (OpCodes.Conv_I4);	// assumes < 2^31 labels!
+					}
+					else
+					{
+						// normalize range
+						ig.Emit (OpCodes.Ldloc, val);
+						int nFirst = (int) kb.nFirst;
+						if (nFirst > 0)
+						{
+							IntConstant.EmitInt (ig, nFirst);
+							ig.Emit (OpCodes.Sub);
+						}
+						else if (nFirst < 0)
+						{
+							IntConstant.EmitInt (ig, -nFirst);
+							ig.Emit (OpCodes.Add);
+						}
+					}
+
+					// first, build the list of labels for the switch
+					int iKey = 0;
+					int cJumps = kb.Length;
+					Label [] rgLabels = new Label [cJumps];
+					for (int iJump = 0; iJump < cJumps; iJump++)
+					{
+						object key = kb.rgKeys [iKey];
+						if (Convert.ToInt64 (key) == kb.nFirst + iJump)
+						{
+							SwitchLabel sl = (SwitchLabel) Elements [key];
+							rgLabels [iJump] = sl.ILLabel;
+							iKey++;
+						}
+						else
+							rgLabels [iJump] = lblDefault;
+					}
+					// emit the switch opcode
+					ig.Emit (OpCodes.Switch, rgLabels);
+				}
+
+				// mark the default for this block
+				if (iBlock != 0)
+					ig.MarkLabel (lblDefault);
+			}
+
+			// TODO: find the default case and emit it here,
+			//       to prevent having to do the following jump.
+			//       make sure to mark other labels in the default section
+
+			// the last default just goes to the end
+			ig.Emit (OpCodes.Br, lblDefault);
+
+			// now emit the code for the sections
+			bool fFoundDefault = false;
+			bool fAllReturn = true;
+			foreach (SwitchSection ss in Sections)
+			{
+				foreach (SwitchLabel sl in ss.Labels)
+				{
+					ig.MarkLabel (sl.ILLabel);
+					ig.MarkLabel (sl.ILLabelCode);
+					if (sl.Label == null)
+					{
+						ig.MarkLabel (lblDefault);
+						fFoundDefault = true;
+					}
+				}
+				fAllReturn &= ss.Block.Emit (ec);
+				//ig.Emit (OpCodes.Br, lblEnd);
+			}
+			
+			if (!fFoundDefault) {
+				ig.MarkLabel (lblDefault);
+				fAllReturn = false;
+			}
+			ig.MarkLabel (lblEnd);
+
+			return fAllReturn;
+		}
+		//
+		// This simple emit switch works, but does not take advantage of the
+		// `switch' opcode. 
+		// TODO: remove non-string logic from here
+		// TODO: binary search strings?
+		//
+		bool SimpleSwitchEmit (EmitContext ec, LocalBuilder val)
+		{
+			ILGenerator ig = ec.ig;
+			Label end_of_switch = ig.DefineLabel ();
+			Label next_test = ig.DefineLabel ();
+			Label null_target = ig.DefineLabel ();
+			bool default_found = false;
+			bool first_test = true;
+			bool pending_goto_end = false;
+			bool all_return = true;
+			bool is_string = false;
+			bool null_found;
+			
+			//
+			// Special processing for strings: we cant compare
+			// against null.
+			//
+			if (SwitchType == TypeManager.string_type){
+				ig.Emit (OpCodes.Ldloc, val);
+				is_string = true;
+				
+				if (Elements.Contains (NullLiteral.Null)){
+					ig.Emit (OpCodes.Brfalse, null_target);
+				} else
+					ig.Emit (OpCodes.Brfalse, default_target);
+
+				ig.Emit (OpCodes.Ldloc, val);
+				ig.Emit (OpCodes.Call, TypeManager.string_isinterneted_string);
+				ig.Emit (OpCodes.Stloc, val);
+			}
+
+			SwitchSection last_section;
+			last_section = (SwitchSection) Sections [Sections.Count-1];
+			
+			foreach (SwitchSection ss in Sections){
+				Label sec_begin = ig.DefineLabel ();
+
+				if (pending_goto_end)
+					ig.Emit (OpCodes.Br, end_of_switch);
+
+				int label_count = ss.Labels.Count;
+				null_found = false;
+				foreach (SwitchLabel sl in ss.Labels){
+					ig.MarkLabel (sl.ILLabel);
+					
+					if (!first_test){
+						ig.MarkLabel (next_test);
+						next_test = ig.DefineLabel ();
+					}
+					//
+					// If we are the default target
+					//
+					if (sl.Label == null){
+						ig.MarkLabel (default_target);
+						default_found = true;
+					} else {
+						object lit = sl.Converted;
+
+						if (lit is NullLiteral){
+							null_found = true;
+							if (label_count == 1)
+								ig.Emit (OpCodes.Br, next_test);
+							continue;
+									      
+						}
+						if (is_string){
+							StringConstant str = (StringConstant) lit;
+
+							ig.Emit (OpCodes.Ldloc, val);
+							ig.Emit (OpCodes.Ldstr, str.Value);
+							if (label_count == 1)
+								ig.Emit (OpCodes.Bne_Un, next_test);
+							else
+								ig.Emit (OpCodes.Beq, sec_begin);
+						} else {
+							ig.Emit (OpCodes.Ldloc, val);
+							EmitObjectInteger (ig, lit);
+							ig.Emit (OpCodes.Ceq);
+							if (label_count == 1)
+								ig.Emit (OpCodes.Brfalse, next_test);
+							else
+								ig.Emit (OpCodes.Brtrue, sec_begin);
+						}
+					}
+				}
+				if (label_count != 1 && ss != last_section)
+					ig.Emit (OpCodes.Br, next_test);
+				
+				if (null_found)
+					ig.MarkLabel (null_target);
+				ig.MarkLabel (sec_begin);
+				foreach (SwitchLabel sl in ss.Labels)

+					ig.MarkLabel (sl.ILLabelCode);
+				if (ss.Block.Emit (ec))
+					pending_goto_end = false;
+				else {
+					all_return = false;
+					pending_goto_end = true;
+				}
+				first_test = false;
+			}
+			if (!default_found){
+				ig.MarkLabel (default_target);
+				all_return = false;
+			}
+			ig.MarkLabel (next_test);
+			ig.MarkLabel (end_of_switch);
+			
+			return all_return;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			Expr = Expr.Resolve (ec);
+			if (Expr == null)
+				return false;
+
+			new_expr = SwitchGoverningType (ec, Expr.Type);
+			if (new_expr == null){
+				Report.Error (151, loc, "An integer type or string was expected for switch");
+				return false;
+			}
+
+			// Validate switch.
+			SwitchType = new_expr.Type;
+
+			if (!CheckSwitch (ec))
+				return false;
+
+			Switch old_switch = ec.Switch;
+			ec.Switch = this;
+			ec.Switch.SwitchType = SwitchType;
+
+			ec.StartFlowBranching (FlowBranchingType.SWITCH, loc);
+
+			bool first = true;
+			foreach (SwitchSection ss in Sections){
+				if (!first)
+					ec.CurrentBranching.CreateSibling ();
+				else
+					first = false;
+
+				if (ss.Block.Resolve (ec) != true)
+					return false;
+			}
+
+			ec.EndFlowBranching ();
+			ec.Switch = old_switch;
+
+			return true;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			// Store variable for comparission purposes
+			LocalBuilder value = ec.ig.DeclareLocal (SwitchType);
+			new_expr.Emit (ec);
+			ec.ig.Emit (OpCodes.Stloc, value);
+
+			ILGenerator ig = ec.ig;
+
+			default_target = ig.DefineLabel ();
+
+			//
+			// Setup the codegen context
+			//
+			Label old_end = ec.LoopEnd;
+			Switch old_switch = ec.Switch;
+			
+			ec.LoopEnd = ig.DefineLabel ();
+			ec.Switch = this;
+
+			// Emit Code.
+			bool all_return;
+			if (SwitchType == TypeManager.string_type)
+				all_return = SimpleSwitchEmit (ec, value);
+			else
+				all_return = TableSwitchEmit (ec, value);
+
+			// Restore context state. 
+			ig.MarkLabel (ec.LoopEnd);
+
+			//
+			// Restore the previous context
+			//
+			ec.LoopEnd = old_end;
+			ec.Switch = old_switch;
+			
+			return all_return;
+		}
+	}
+
+	public class Lock : Statement {
+		Expression expr;
+		Statement Statement;
+			
+		public Lock (Expression expr, Statement stmt, Location l)
+		{
+			this.expr = expr;
+			Statement = stmt;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			expr = expr.Resolve (ec);
+			return Statement.Resolve (ec) && expr != null;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			Type type = expr.Type;
+			bool val;
+			
+			if (type.IsValueType){
+				Report.Error (185, loc, "lock statement requires the expression to be " +
+					      " a reference type (type is: `" +
+					      TypeManager.CSharpName (type) + "'");
+				return false;
+			}
+
+			ILGenerator ig = ec.ig;
+			LocalBuilder temp = ig.DeclareLocal (type);
+				
+			expr.Emit (ec);
+			ig.Emit (OpCodes.Dup);
+			ig.Emit (OpCodes.Stloc, temp);
+			ig.Emit (OpCodes.Call, TypeManager.void_monitor_enter_object);
+
+			// try
+			Label end = ig.BeginExceptionBlock ();
+			bool old_in_try = ec.InTry;
+			ec.InTry = true;
+			Label finish = ig.DefineLabel ();
+			val = Statement.Emit (ec);
+			ec.InTry = old_in_try;
+			// ig.Emit (OpCodes.Leave, finish);
+
+			ig.MarkLabel (finish);
+			
+			// finally
+			ig.BeginFinallyBlock ();
+			ig.Emit (OpCodes.Ldloc, temp);
+			ig.Emit (OpCodes.Call, TypeManager.void_monitor_exit_object);
+			ig.EndExceptionBlock ();
+			
+			return val;
+		}
+	}
+
+	public class Unchecked : Statement {
+		public readonly Block Block;
+		
+		public Unchecked (Block b)
+		{
+			Block = b;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			return Block.Resolve (ec);
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			bool previous_state = ec.CheckState;
+			bool previous_state_const = ec.ConstantCheckState;
+			bool val;
+			
+			ec.CheckState = false;
+			ec.ConstantCheckState = false;
+			val = Block.Emit (ec);
+			ec.CheckState = previous_state;
+			ec.ConstantCheckState = previous_state_const;
+
+			return val;
+		}
+	}
+
+	public class Checked : Statement {
+		public readonly Block Block;
+		
+		public Checked (Block b)
+		{
+			Block = b;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			bool previous_state = ec.CheckState;
+			bool previous_state_const = ec.ConstantCheckState;
+			
+			ec.CheckState = true;
+			ec.ConstantCheckState = true;
+			bool ret = Block.Resolve (ec);
+			ec.CheckState = previous_state;
+			ec.ConstantCheckState = previous_state_const;
+
+			return ret;
+		}
+
+		public override bool Emit (EmitContext ec)
+		{
+			bool previous_state = ec.CheckState;
+			bool previous_state_const = ec.ConstantCheckState;
+			bool val;
+			
+			ec.CheckState = true;
+			ec.ConstantCheckState = true;
+			val = Block.Emit (ec);
+			ec.CheckState = previous_state;
+			ec.ConstantCheckState = previous_state_const;
+
+			return val;
+		}
+	}
+
+	public class Unsafe : Statement {
+		public readonly Block Block;
+
+		public Unsafe (Block b)
+		{
+			Block = b;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			bool previous_state = ec.InUnsafe;
+			bool val;
+			
+			ec.InUnsafe = true;
+			val = Block.Resolve (ec);
+			ec.InUnsafe = previous_state;
+
+			return val;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			bool previous_state = ec.InUnsafe;
+			bool val;
+			
+			ec.InUnsafe = true;
+			val = Block.Emit (ec);
+			ec.InUnsafe = previous_state;
+
+			return val;
+		}
+	}
+
+	// 
+	// Fixed statement
+	//
+	public class Fixed : Statement {
+		Expression type;
+		ArrayList declarators;
+		Statement statement;
+		Type expr_type;
+		FixedData[] data;
+
+		struct FixedData {
+			public bool is_object;
+			public VariableInfo vi;
+			public Expression expr;
+			public Expression converted;
+		}			
+
+		public Fixed (Expression type, ArrayList decls, Statement stmt, Location l)
+		{
+			this.type = type;
+			declarators = decls;
+			statement = stmt;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			expr_type = ec.DeclSpace.ResolveType (type, false, loc);
+			if (expr_type == null)
+				return false;
+
+			data = new FixedData [declarators.Count];
+
+			int i = 0;
+			foreach (Pair p in declarators){
+				VariableInfo vi = (VariableInfo) p.First;
+				Expression e = (Expression) p.Second;
+
+				vi.Number = -1;
+
+				//
+				// The rules for the possible declarators are pretty wise,
+				// but the production on the grammar is more concise.
+				//
+				// So we have to enforce these rules here.
+				//
+				// We do not resolve before doing the case 1 test,
+				// because the grammar is explicit in that the token &
+				// is present, so we need to test for this particular case.
+				//
+
+				//
+				// Case 1: & object.
+				//
+				if (e is Unary && ((Unary) e).Oper == Unary.Operator.AddressOf){
+					Expression child = ((Unary) e).Expr;
+
+					vi.MakePinned ();
+					if (child is ParameterReference || child is LocalVariableReference){
+						Report.Error (
+							213, loc, 
+							"No need to use fixed statement for parameters or " +
+							"local variable declarations (address is already " +
+							"fixed)");
+						return false;
+					}
+					
+					e = e.Resolve (ec);
+					if (e == null)
+						return false;
+
+					child = ((Unary) e).Expr;
+					
+					if (!TypeManager.VerifyUnManaged (child.Type, loc))
+						return false;
+
+					data [i].is_object = true;
+					data [i].expr = e;
+					data [i].converted = null;
+					data [i].vi = vi;
+					i++;
+
+					continue;
+				}
+
+				e = e.Resolve (ec);
+				if (e == null)
+					return false;
+
+				//
+				// Case 2: Array
+				//
+				if (e.Type.IsArray){
+					Type array_type = e.Type.GetElementType ();
+					
+					vi.MakePinned ();
+					//
+					// Provided that array_type is unmanaged,
+					//
+					if (!TypeManager.VerifyUnManaged (array_type, loc))
+						return false;
+
+					//
+					// and T* is implicitly convertible to the
+					// pointer type given in the fixed statement.
+					//
+					ArrayPtr array_ptr = new ArrayPtr (e, loc);
+					
+					Expression converted = Expression.ConvertImplicitRequired (
+						ec, array_ptr, vi.VariableType, loc);
+					if (converted == null)
+						return false;
+
+					data [i].is_object = false;
+					data [i].expr = e;
+					data [i].converted = converted;
+					data [i].vi = vi;
+					i++;
+
+					continue;
+				}
+
+				//
+				// Case 3: string
+				//
+				if (e.Type == TypeManager.string_type){
+					data [i].is_object = false;
+					data [i].expr = e;
+					data [i].converted = null;
+					data [i].vi = vi;
+					i++;
+				}
+			}
+
+			return statement.Resolve (ec);
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+
+			bool is_ret = false;
+
+			for (int i = 0; i < data.Length; i++) {
+				VariableInfo vi = data [i].vi;
+
+				//
+				// Case 1: & object.
+				//
+				if (data [i].is_object) {
+					//
+					// Store pointer in pinned location
+					//
+					data [i].expr.Emit (ec);
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+
+					is_ret = statement.Emit (ec);
+
+					// Clear the pinned variable.
+					ig.Emit (OpCodes.Ldc_I4_0);
+					ig.Emit (OpCodes.Conv_U);
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+
+					continue;
+				}
+
+				//
+				// Case 2: Array
+				//
+				if (data [i].expr.Type.IsArray){
+					//
+					// Store pointer in pinned location
+					//
+					data [i].converted.Emit (ec);
+					
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+
+					is_ret = statement.Emit (ec);
+					
+					// Clear the pinned variable.
+					ig.Emit (OpCodes.Ldc_I4_0);
+					ig.Emit (OpCodes.Conv_U);
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+
+					continue;
+				}
+
+				//
+				// Case 3: string
+				//
+				if (data [i].expr.Type == TypeManager.string_type){
+					LocalBuilder pinned_string = ig.DeclareLocal (TypeManager.string_type);
+					TypeManager.MakePinned (pinned_string);
+					
+					data [i].expr.Emit (ec);
+					ig.Emit (OpCodes.Stloc, pinned_string);
+
+					Expression sptr = new StringPtr (pinned_string, loc);
+					Expression converted = Expression.ConvertImplicitRequired (
+						ec, sptr, vi.VariableType, loc);
+					
+					if (converted == null)
+						continue;
+
+					converted.Emit (ec);
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+					
+					is_ret = statement.Emit (ec);
+
+					// Clear the pinned variable
+					ig.Emit (OpCodes.Ldnull);
+					ig.Emit (OpCodes.Stloc, pinned_string);
+				}
+			}
+
+			return is_ret;
+		}
+	}
+	
+	public class Catch {
+		public readonly string Name;
+		public readonly Block  Block;
+		public readonly Location Location;
+
+		Expression type;
+		
+		public Catch (Expression type, string name, Block block, Location l)
+		{
+			this.type = type;
+			Name = name;
+			Block = block;
+			Location = l;
+		}
+
+		public Type CatchType {
+			get {
+				if (type == null)
+					throw new InvalidOperationException ();
+
+				return type.Type;
+			}
+		}
+
+		public bool IsGeneral {
+			get {
+				return type == null;
+			}
+		}
+
+		public bool Resolve (EmitContext ec)
+		{
+			if (type != null) {
+				type = type.DoResolve (ec);
+				if (type == null)
+					return false;
+
+				Type t = type.Type;
+				if (t != TypeManager.exception_type && !t.IsSubclassOf (TypeManager.exception_type)){
+					Report.Error (155, Location,
+						      "The type caught or thrown must be derived " +
+						      "from System.Exception");
+					return false;
+				}
+			}
+
+			if (!Block.Resolve (ec))
+				return false;
+
+			return true;
+		}
+	}
+
+	public class Try : Statement {
+		public readonly Block Fini, Block;
+		public readonly ArrayList Specific;
+		public readonly Catch General;
+		
+		//
+		// specific, general and fini might all be null.
+		//
+		public Try (Block block, ArrayList specific, Catch general, Block fini, Location l)
+		{
+			if (specific == null && general == null){
+				Console.WriteLine ("CIR.Try: Either specific or general have to be non-null");
+			}
+			
+			this.Block = block;
+			this.Specific = specific;
+			this.General = general;
+			this.Fini = fini;
+			loc = l;
+		}
+
+		public override bool Resolve (EmitContext ec)
+		{
+			bool ok = true;
+			
+			ec.StartFlowBranching (FlowBranchingType.EXCEPTION, Block.StartLocation);
+
+			Report.Debug (1, "START OF TRY BLOCK", Block.StartLocation);
+
+			bool old_in_try = ec.InTry;
+			ec.InTry = true;
+
+			if (!Block.Resolve (ec))
+				ok = false;
+
+			ec.InTry = old_in_try;
+
+			FlowBranching.UsageVector vector = ec.CurrentBranching.CurrentUsageVector;
+
+			Report.Debug (1, "START OF CATCH BLOCKS", vector);
+
+			foreach (Catch c in Specific){
+				ec.CurrentBranching.CreateSibling ();
+				Report.Debug (1, "STARTED SIBLING FOR CATCH", ec.CurrentBranching);
+
+				if (c.Name != null) {
+					VariableInfo vi = c.Block.GetVariableInfo (c.Name);
+					if (vi == null)
+						throw new Exception ();
+
+					vi.Number = -1;
+				}
+
+				bool old_in_catch = ec.InCatch;
+				ec.InCatch = true;
+
+				if (!c.Resolve (ec))
+					ok = false;
+
+				ec.InCatch = old_in_catch;
+
+				FlowBranching.UsageVector current = ec.CurrentBranching.CurrentUsageVector;
+
+				if ((current.Returns == FlowReturns.NEVER) ||
+				    (current.Returns == FlowReturns.SOMETIMES)) {
+					vector.AndLocals (current);
+				}
+			}
+
+			if (General != null){
+				ec.CurrentBranching.CreateSibling ();
+				Report.Debug (1, "STARTED SIBLING FOR GENERAL", ec.CurrentBranching);
+
+				bool old_in_catch = ec.InCatch;
+				ec.InCatch = true;
+
+				if (!General.Resolve (ec))
+					ok = false;
+
+				ec.InCatch = old_in_catch;
+
+				FlowBranching.UsageVector current = ec.CurrentBranching.CurrentUsageVector;
+
+				if ((current.Returns == FlowReturns.NEVER) ||
+				    (current.Returns == FlowReturns.SOMETIMES)) {
+					vector.AndLocals (current);
+				}
+			}
+
+			ec.CurrentBranching.CreateSiblingForFinally ();
+			Report.Debug (1, "STARTED SIBLING FOR FINALLY", ec.CurrentBranching, vector);
+
+			if (Fini != null) {
+				bool old_in_finally = ec.InFinally;
+				ec.InFinally = true;
+
+				if (!Fini.Resolve (ec))
+					ok = false;
+
+				ec.InFinally = old_in_finally;
+			}
+
+			FlowBranching.UsageVector f_vector = ec.CurrentBranching.CurrentUsageVector;
+
+			FlowReturns returns = ec.EndFlowBranching ();
+
+			Report.Debug (1, "END OF FINALLY", ec.CurrentBranching, returns, vector, f_vector);
+
+			if ((returns == FlowReturns.SOMETIMES) || (returns == FlowReturns.ALWAYS)) {
+				ec.CurrentBranching.CheckOutParameters (f_vector.Parameters, loc);
+			}
+
+			ec.CurrentBranching.CurrentUsageVector.Or (vector);
+
+			Report.Debug (1, "END OF TRY", ec.CurrentBranching);
+
+			return ok;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			Label end;
+			Label finish = ig.DefineLabel ();;
+			bool returns;
+
+			ec.TryCatchLevel++;
+			end = ig.BeginExceptionBlock ();
+			bool old_in_try = ec.InTry;
+			ec.InTry = true;
+			returns = Block.Emit (ec);
+			ec.InTry = old_in_try;
+
+			//
+			// System.Reflection.Emit provides this automatically:
+			// ig.Emit (OpCodes.Leave, finish);
+
+			bool old_in_catch = ec.InCatch;
+			ec.InCatch = true;
+			DeclSpace ds = ec.DeclSpace;
+
+			foreach (Catch c in Specific){
+				VariableInfo vi;
+				
+				ig.BeginCatchBlock (c.CatchType);
+
+				if (c.Name != null){
+					vi = c.Block.GetVariableInfo (c.Name);
+					if (vi == null)
+						throw new Exception ("Variable does not exist in this block");
+
+					ig.Emit (OpCodes.Stloc, vi.LocalBuilder);
+				} else
+					ig.Emit (OpCodes.Pop);
+				
+				if (!c.Block.Emit (ec))
+					returns = false;
+			}
+
+			if (General != null){
+				ig.BeginCatchBlock (TypeManager.object_type);
+				ig.Emit (OpCodes.Pop);
+				if (!General.Block.Emit (ec))
+					returns = false;
+			}
+			ec.InCatch = old_in_catch;
+
+			ig.MarkLabel (finish);
+			if (Fini != null){
+				ig.BeginFinallyBlock ();
+				bool old_in_finally = ec.InFinally;
+				ec.InFinally = true;
+				Fini.Emit (ec);
+				ec.InFinally = old_in_finally;
+			}
+			
+			ig.EndExceptionBlock ();
+			ec.TryCatchLevel--;
+
+			if (!returns || ec.InTry || ec.InCatch)
+				return returns;
+
+			// Unfortunately, System.Reflection.Emit automatically emits a leave
+			// to the end of the finally block.  This is a problem if `returns'
+			// is true since we may jump to a point after the end of the method.
+			// As a workaround, emit an explicit ret here.
+
+			if (ec.ReturnType != null)
+				ec.ig.Emit (OpCodes.Ldloc, ec.TemporaryReturn ());
+			ec.ig.Emit (OpCodes.Ret);
+
+			return true;
+		}
+	}
+
+	//
+	// FIXME: We still do not support the expression variant of the using
+	// statement.
+	//
+	public class Using : Statement {
+		object expression_or_block;
+		Statement Statement;
+		ArrayList var_list;
+		Expression expr;
+		Type expr_type;
+		Expression conv;
+		Expression [] converted_vars;
+		ExpressionStatement [] assign;
+		
+		public Using (object expression_or_block, Statement stmt, Location l)
+		{
+			this.expression_or_block = expression_or_block;
+			Statement = stmt;
+			loc = l;
+		}
+
+		//
+		// Resolves for the case of using using a local variable declaration.
+		//
+		bool ResolveLocalVariableDecls (EmitContext ec)
+		{
+			bool need_conv = false;
+			expr_type = ec.DeclSpace.ResolveType (expr, false, loc);
+			int i = 0;
+
+			if (expr_type == null)
+				return false;
+
+			//
+			// The type must be an IDisposable or an implicit conversion
+			// must exist.
+			//
+			converted_vars = new Expression [var_list.Count];
+			assign = new ExpressionStatement [var_list.Count];
+			if (!TypeManager.ImplementsInterface (expr_type, TypeManager.idisposable_type)){
+				foreach (DictionaryEntry e in var_list){
+					Expression var = (Expression) e.Key;
+
+					var = var.ResolveLValue (ec, new EmptyExpression ());
+					if (var == null)
+						return false;
+					
+					converted_vars [i] = Expression.ConvertImplicit (
+						ec, var, TypeManager.idisposable_type, loc);
+
+					if (converted_vars [i] == null)
+						return false;
+					i++;
+				}
+				need_conv = true;
+			}
+
+			i = 0;
+			foreach (DictionaryEntry e in var_list){
+				LocalVariableReference var = (LocalVariableReference) e.Key;
+				Expression new_expr = (Expression) e.Value;
+				Expression a;
+
+				a = new Assign (var, new_expr, loc);
+				a = a.Resolve (ec);
+				if (a == null)
+					return false;
+
+				if (!need_conv)
+					converted_vars [i] = var;
+				assign [i] = (ExpressionStatement) a;
+				i++;
+			}
+
+			return true;
+		}
+
+		bool ResolveExpression (EmitContext ec)
+		{
+			if (!TypeManager.ImplementsInterface (expr_type, TypeManager.idisposable_type)){
+				conv = Expression.ConvertImplicit (
+					ec, expr, TypeManager.idisposable_type, loc);
+
+				if (conv == null)
+					return false;
+			}
+
+			return true;
+		}
+		
+		//
+		// Emits the code for the case of using using a local variable declaration.
+		//
+		bool EmitLocalVariableDecls (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			int i = 0;
+
+			bool old_in_try = ec.InTry;
+			ec.InTry = true;
+			for (i = 0; i < assign.Length; i++) {
+				assign [i].EmitStatement (ec);
+				
+				ig.BeginExceptionBlock ();
+			}
+			Statement.Emit (ec);
+			ec.InTry = old_in_try;
+
+			bool old_in_finally = ec.InFinally;
+			ec.InFinally = true;
+			var_list.Reverse ();
+			foreach (DictionaryEntry e in var_list){
+				LocalVariableReference var = (LocalVariableReference) e.Key;
+				Label skip = ig.DefineLabel ();
+				i--;
+				
+				ig.BeginFinallyBlock ();
+				
+				var.Emit (ec);
+				ig.Emit (OpCodes.Brfalse, skip);
+				converted_vars [i].Emit (ec);
+				ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
+				ig.MarkLabel (skip);
+				ig.EndExceptionBlock ();
+			}
+			ec.InFinally = old_in_finally;
+
+			return false;
+		}
+
+		bool EmitExpression (EmitContext ec)
+		{
+			//
+			// Make a copy of the expression and operate on that.
+			//
+			ILGenerator ig = ec.ig;
+			LocalBuilder local_copy = ig.DeclareLocal (expr_type);
+			if (conv != null)
+				conv.Emit (ec);
+			else
+				expr.Emit (ec);
+			ig.Emit (OpCodes.Stloc, local_copy);
+
+			bool old_in_try = ec.InTry;
+			ec.InTry = true;
+			ig.BeginExceptionBlock ();
+			Statement.Emit (ec);
+			ec.InTry = old_in_try;
+			
+			Label skip = ig.DefineLabel ();
+			bool old_in_finally = ec.InFinally;
+			ig.BeginFinallyBlock ();
+			ig.Emit (OpCodes.Ldloc, local_copy);
+			ig.Emit (OpCodes.Brfalse, skip);
+			ig.Emit (OpCodes.Ldloc, local_copy);
+			ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
+			ig.MarkLabel (skip);
+			ec.InFinally = old_in_finally;
+			ig.EndExceptionBlock ();
+
+			return false;
+		}
+		
+		public override bool Resolve (EmitContext ec)
+		{
+			if (expression_or_block is DictionaryEntry){
+				expr = (Expression) ((DictionaryEntry) expression_or_block).Key;
+				var_list = (ArrayList)((DictionaryEntry)expression_or_block).Value;
+
+				if (!ResolveLocalVariableDecls (ec))
+					return false;
+
+			} else if (expression_or_block is Expression){
+				expr = (Expression) expression_or_block;
+
+				expr = expr.Resolve (ec);
+				if (expr == null)
+					return false;
+
+				expr_type = expr.Type;
+
+				if (!ResolveExpression (ec))
+					return false;
+			}			
+
+			return Statement.Resolve (ec);
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			if (expression_or_block is DictionaryEntry)
+				return EmitLocalVariableDecls (ec);
+			else if (expression_or_block is Expression)
+				return EmitExpression (ec);
+
+			return false;
+		}
+	}
+
+	/// <summary>
+	///   Implementation of the foreach C# statement
+	/// </summary>
+	public class Foreach : Statement {
+		Expression type;
+		LocalVariableReference variable;
+		Expression expr;
+		Statement statement;
+		ForeachHelperMethods hm;
+		Expression empty, conv;
+		Type array_type, element_type;
+		Type var_type;
+		
+		public Foreach (Expression type, LocalVariableReference var, Expression expr,
+				Statement stmt, Location l)
+		{
+			this.type = type;
+			this.variable = var;
+			this.expr = expr;
+			statement = stmt;
+			loc = l;
+		}
+		
+		public override bool Resolve (EmitContext ec)
+		{
+			expr = expr.Resolve (ec);
+			if (expr == null)
+				return false;
+
+			var_type = ec.DeclSpace.ResolveType (type, false, loc);
+			if (var_type == null)
+				return false;
+			
+			//
+			// We need an instance variable.  Not sure this is the best
+			// way of doing this.
+			//
+			// FIXME: When we implement propertyaccess, will those turn
+			// out to return values in ExprClass?  I think they should.
+			//
+			if (!(expr.eclass == ExprClass.Variable || expr.eclass == ExprClass.Value ||
+			      expr.eclass == ExprClass.PropertyAccess)){
+				error1579 (expr.Type);
+				return false;
+			}
+
+			if (expr.Type.IsArray) {
+				array_type = expr.Type;
+				element_type = array_type.GetElementType ();
+
+				empty = new EmptyExpression (element_type);
+			} else {
+				hm = ProbeCollectionType (ec, expr.Type);
+				if (hm == null){
+					error1579 (expr.Type);
+					return false;
+				}
+
+				array_type = expr.Type;
+				element_type = hm.element_type;
+
+				empty = new EmptyExpression (hm.element_type);
+			}
+
+			//
+			// FIXME: maybe we can apply the same trick we do in the
+			// array handling to avoid creating empty and conv in some cases.
+			//
+			// Although it is not as important in this case, as the type
+			// will not likely be object (what the enumerator will return).
+			//
+			conv = Expression.ConvertExplicit (ec, empty, var_type, loc);
+			if (conv == null)
+				return false;
+
+			if (variable.ResolveLValue (ec, empty) == null)
+				return false;
+
+			if (!statement.Resolve (ec))
+				return false;
+
+			return true;
+		}
+		
+		//
+		// Retrieves a `public bool MoveNext ()' method from the Type `t'
+		//
+		static MethodInfo FetchMethodMoveNext (Type t)
+		{
+			MemberList move_next_list;
+			
+			move_next_list = TypeContainer.FindMembers (
+				t, MemberTypes.Method,
+				BindingFlags.Public | BindingFlags.Instance,
+				Type.FilterName, "MoveNext");
+			if (move_next_list.Count == 0)
+				return null;
+
+			foreach (MemberInfo m in move_next_list){
+				MethodInfo mi = (MethodInfo) m;
+				Type [] args;
+				
+				args = TypeManager.GetArgumentTypes (mi);
+				if (args != null && args.Length == 0){
+					if (mi.ReturnType == TypeManager.bool_type)
+						return mi;
+				}
+			}
+			return null;
+		}
+		
+		//
+		// Retrieves a `public T get_Current ()' method from the Type `t'
+		//
+		static MethodInfo FetchMethodGetCurrent (Type t)
+		{
+			MemberList move_next_list;
+			
+			move_next_list = TypeContainer.FindMembers (
+				t, MemberTypes.Method,
+				BindingFlags.Public | BindingFlags.Instance,
+				Type.FilterName, "get_Current");
+			if (move_next_list.Count == 0)
+				return null;
+
+			foreach (MemberInfo m in move_next_list){
+				MethodInfo mi = (MethodInfo) m;
+				Type [] args;
+
+				args = TypeManager.GetArgumentTypes (mi);
+				if (args != null && args.Length == 0)
+					return mi;
+			}
+			return null;
+		}
+
+		// 
+		// This struct records the helper methods used by the Foreach construct
+		//
+		class ForeachHelperMethods {
+			public EmitContext ec;
+			public MethodInfo get_enumerator;
+			public MethodInfo move_next;
+			public MethodInfo get_current;
+			public Type element_type;
+			public Type enumerator_type;
+			public bool is_disposable;
+
+			public ForeachHelperMethods (EmitContext ec)
+			{
+				this.ec = ec;
+				this.element_type = TypeManager.object_type;
+				this.enumerator_type = TypeManager.ienumerator_type;
+				this.is_disposable = true;
+			}
+		}
+		
+		static bool GetEnumeratorFilter (MemberInfo m, object criteria)
+		{
+			if (m == null)
+				return false;
+			
+			if (!(m is MethodInfo))
+				return false;
+			
+			if (m.Name != "GetEnumerator")
+				return false;
+
+			MethodInfo mi = (MethodInfo) m;
+			Type [] args = TypeManager.GetArgumentTypes (mi);
+			if (args != null){
+				if (args.Length != 0)
+					return false;
+			}
+			ForeachHelperMethods hm = (ForeachHelperMethods) criteria;
+			EmitContext ec = hm.ec;
+
+			//
+			// Check whether GetEnumerator is accessible to us
+			//
+			MethodAttributes prot = mi.Attributes & MethodAttributes.MemberAccessMask;
+
+			Type declaring = mi.DeclaringType;
+			if (prot == MethodAttributes.Private){
+				if (declaring != ec.ContainerType)
+					return false;
+			} else if (prot == MethodAttributes.FamANDAssem){
+				// If from a different assembly, false
+				if (!(mi is MethodBuilder))
+					return false;
+				//
+				// Are we being invoked from the same class, or from a derived method?
+				//
+				if (ec.ContainerType != declaring){
+					if (!ec.ContainerType.IsSubclassOf (declaring))
+						return false;
+				}
+			} else if (prot == MethodAttributes.FamORAssem){
+				if (!(mi is MethodBuilder ||
+				      ec.ContainerType == declaring ||
+				      ec.ContainerType.IsSubclassOf (declaring)))
+					return false;
+			} if (prot == MethodAttributes.Family){
+				if (!(ec.ContainerType == declaring ||
+				      ec.ContainerType.IsSubclassOf (declaring)))
+					return false;
+			}
+
+			//
+			// Ok, we can access it, now make sure that we can do something
+			// with this `GetEnumerator'
+			//
+
+			if (mi.ReturnType == TypeManager.ienumerator_type ||
+			    TypeManager.ienumerator_type.IsAssignableFrom (mi.ReturnType) ||
+			    (!RootContext.StdLib && TypeManager.ImplementsInterface (mi.ReturnType, TypeManager.ienumerator_type))) {
+				hm.move_next = TypeManager.bool_movenext_void;
+				hm.get_current = TypeManager.object_getcurrent_void;
+				return true;
+			}
+
+			//
+			// Ok, so they dont return an IEnumerable, we will have to
+			// find if they support the GetEnumerator pattern.
+			//
+			Type return_type = mi.ReturnType;
+
+			hm.move_next = FetchMethodMoveNext (return_type);
+			if (hm.move_next == null)
+				return false;
+			hm.get_current = FetchMethodGetCurrent (return_type);
+			if (hm.get_current == null)
+				return false;
+
+			hm.element_type = hm.get_current.ReturnType;
+			hm.enumerator_type = return_type;
+			hm.is_disposable = TypeManager.ImplementsInterface (
+				hm.enumerator_type, TypeManager.idisposable_type);
+
+			return true;
+		}
+		
+		/// <summary>
+		///   This filter is used to find the GetEnumerator method
+		///   on which IEnumerator operates
+		/// </summary>
+		static MemberFilter FilterEnumerator;
+		
+		static Foreach ()
+		{
+			FilterEnumerator = new MemberFilter (GetEnumeratorFilter);
+		}
+
+                void error1579 (Type t)
+                {
+                        Report.Error (1579, loc,
+                                      "foreach statement cannot operate on variables of type `" +
+                                      t.FullName + "' because that class does not provide a " +
+                                      " GetEnumerator method or it is inaccessible");
+                }
+
+		static bool TryType (Type t, ForeachHelperMethods hm)
+		{
+			MemberList mi;
+			
+			mi = TypeContainer.FindMembers (t, MemberTypes.Method,
+							BindingFlags.Public | BindingFlags.NonPublic |
+							BindingFlags.Instance,
+							FilterEnumerator, hm);
+
+			if (mi.Count == 0)
+				return false;
+
+			hm.get_enumerator = (MethodInfo) mi [0];
+			return true;	
+		}
+		
+		//
+		// Looks for a usable GetEnumerator in the Type, and if found returns
+		// the three methods that participate: GetEnumerator, MoveNext and get_Current
+		//
+		ForeachHelperMethods ProbeCollectionType (EmitContext ec, Type t)
+		{
+			ForeachHelperMethods hm = new ForeachHelperMethods (ec);
+
+			if (TryType (t, hm))
+				return hm;
+
+			//
+			// Now try to find the method in the interfaces
+			//
+			while (t != null){
+				Type [] ifaces = t.GetInterfaces ();
+
+				foreach (Type i in ifaces){
+					if (TryType (i, hm))
+						return hm;
+				}
+				
+				//
+				// Since TypeBuilder.GetInterfaces only returns the interface
+				// types for this type, we have to keep looping, but once
+				// we hit a non-TypeBuilder (ie, a Type), then we know we are
+				// done, because it returns all the types
+				//
+				if ((t is TypeBuilder))
+					t = t.BaseType;
+				else
+					break;
+			} 
+
+			return null;
+		}
+
+		//
+		// FIXME: possible optimization.
+		// We might be able to avoid creating `empty' if the type is the sam
+		//
+		bool EmitCollectionForeach (EmitContext ec)
+		{
+			ILGenerator ig = ec.ig;
+			LocalBuilder enumerator, disposable;
+
+			enumerator = ig.DeclareLocal (hm.enumerator_type);
+			if (hm.is_disposable)
+				disposable = ig.DeclareLocal (TypeManager.idisposable_type);
+			else
+				disposable = null;
+			
+			//
+			// Instantiate the enumerator
+			//
+			if (expr.Type.IsValueType){
+				if (expr is IMemoryLocation){
+					IMemoryLocation ml = (IMemoryLocation) expr;
+
+					ml.AddressOf (ec, AddressOp.Load);
+				} else
+					throw new Exception ("Expr " + expr + " of type " + expr.Type +
+							     " does not implement IMemoryLocation");
+				ig.Emit (OpCodes.Call, hm.get_enumerator);
+			} else {
+				expr.Emit (ec);
+				ig.Emit (OpCodes.Callvirt, hm.get_enumerator);
+			}
+			ig.Emit (OpCodes.Stloc, enumerator);
+
+			//
+			// Protect the code in a try/finalize block, so that
+			// if the beast implement IDisposable, we get rid of it
+			//
+			Label l;
+			bool old_in_try = ec.InTry;
+
+			if (hm.is_disposable) {
+				l = ig.BeginExceptionBlock ();
+				ec.InTry = true;
+			}
+			
+			Label end_try = ig.DefineLabel ();
+			
+			ig.MarkLabel (ec.LoopBegin);
+			ig.Emit (OpCodes.Ldloc, enumerator);
+			ig.Emit (OpCodes.Callvirt, hm.move_next);
+			ig.Emit (OpCodes.Brfalse, end_try);
+			ig.Emit (OpCodes.Ldloc, enumerator);
+			ig.Emit (OpCodes.Callvirt, hm.get_current);
+			variable.EmitAssign (ec, conv);
+			statement.Emit (ec);
+			ig.Emit (OpCodes.Br, ec.LoopBegin);
+			ig.MarkLabel (end_try);
+			ec.InTry = old_in_try;
+			
+			// The runtime provides this for us.
+			// ig.Emit (OpCodes.Leave, end);
+
+			//
+			// Now the finally block
+			//
+			if (hm.is_disposable) {
+				Label end_finally = ig.DefineLabel ();
+				bool old_in_finally = ec.InFinally;
+				ec.InFinally = true;
+				ig.BeginFinallyBlock ();
+			
+				ig.Emit (OpCodes.Ldloc, enumerator);
+				ig.Emit (OpCodes.Isinst, TypeManager.idisposable_type);
+				ig.Emit (OpCodes.Stloc, disposable);
+				ig.Emit (OpCodes.Ldloc, disposable);
+				ig.Emit (OpCodes.Brfalse, end_finally);
+				ig.Emit (OpCodes.Ldloc, disposable);
+				ig.Emit (OpCodes.Callvirt, TypeManager.void_dispose_void);
+				ig.MarkLabel (end_finally);
+				ec.InFinally = old_in_finally;
+
+				// The runtime generates this anyways.
+				// ig.Emit (OpCodes.Endfinally);
+
+				ig.EndExceptionBlock ();
+			}
+
+			ig.MarkLabel (ec.LoopEnd);
+			return false;
+		}
+
+		//
+		// FIXME: possible optimization.
+		// We might be able to avoid creating `empty' if the type is the sam
+		//
+		bool EmitArrayForeach (EmitContext ec)
+		{
+			int rank = array_type.GetArrayRank ();
+			ILGenerator ig = ec.ig;
+
+			LocalBuilder copy = ig.DeclareLocal (array_type);
+			
+			//
+			// Make our copy of the array
+			//
+			expr.Emit (ec);
+			ig.Emit (OpCodes.Stloc, copy);
+			
+			if (rank == 1){
+				LocalBuilder counter = ig.DeclareLocal (TypeManager.int32_type);
+
+				Label loop, test;
+				
+				ig.Emit (OpCodes.Ldc_I4_0);
+				ig.Emit (OpCodes.Stloc, counter);
+				test = ig.DefineLabel ();
+				ig.Emit (OpCodes.Br, test);
+
+				loop = ig.DefineLabel ();
+				ig.MarkLabel (loop);
+
+				ig.Emit (OpCodes.Ldloc, copy);
+				ig.Emit (OpCodes.Ldloc, counter);
+				ArrayAccess.EmitLoadOpcode (ig, var_type);
+
+				variable.EmitAssign (ec, conv);
+
+				statement.Emit (ec);
+
+				ig.MarkLabel (ec.LoopBegin);
+				ig.Emit (OpCodes.Ldloc, counter);
+				ig.Emit (OpCodes.Ldc_I4_1);
+				ig.Emit (OpCodes.Add);
+				ig.Emit (OpCodes.Stloc, counter);
+
+				ig.MarkLabel (test);
+				ig.Emit (OpCodes.Ldloc, counter);
+				ig.Emit (OpCodes.Ldloc, copy);
+				ig.Emit (OpCodes.Ldlen);
+				ig.Emit (OpCodes.Conv_I4);
+				ig.Emit (OpCodes.Blt, loop);
+			} else {
+				LocalBuilder [] dim_len   = new LocalBuilder [rank];
+				LocalBuilder [] dim_count = new LocalBuilder [rank];
+				Label [] loop = new Label [rank];
+				Label [] test = new Label [rank];
+				int dim;
+				
+				for (dim = 0; dim < rank; dim++){
+					dim_len [dim] = ig.DeclareLocal (TypeManager.int32_type);
+					dim_count [dim] = ig.DeclareLocal (TypeManager.int32_type);
+					test [dim] = ig.DefineLabel ();
+					loop [dim] = ig.DefineLabel ();
+				}
+					
+				for (dim = 0; dim < rank; dim++){
+					ig.Emit (OpCodes.Ldloc, copy);
+					IntLiteral.EmitInt (ig, dim);
+					ig.Emit (OpCodes.Callvirt, TypeManager.int_getlength_int);
+					ig.Emit (OpCodes.Stloc, dim_len [dim]);
+				}
+
+				for (dim = 0; dim < rank; dim++){
+					ig.Emit (OpCodes.Ldc_I4_0);
+					ig.Emit (OpCodes.Stloc, dim_count [dim]);
+					ig.Emit (OpCodes.Br, test [dim]);
+					ig.MarkLabel (loop [dim]);
+				}
+
+				ig.Emit (OpCodes.Ldloc, copy);
+				for (dim = 0; dim < rank; dim++)
+					ig.Emit (OpCodes.Ldloc, dim_count [dim]);
+
+				//
+				// FIXME: Maybe we can cache the computation of `get'?
+				//
+				Type [] args = new Type [rank];
+				MethodInfo get;
+
+				for (int i = 0; i < rank; i++)
+					args [i] = TypeManager.int32_type;
+
+				ModuleBuilder mb = CodeGen.ModuleBuilder;
+				get = mb.GetArrayMethod (
+					array_type, "Get",
+					CallingConventions.HasThis| CallingConventions.Standard,
+					var_type, args);
+				ig.Emit (OpCodes.Call, get);
+				variable.EmitAssign (ec, conv);
+				statement.Emit (ec);
+				ig.MarkLabel (ec.LoopBegin);
+				for (dim = rank - 1; dim >= 0; dim--){
+					ig.Emit (OpCodes.Ldloc, dim_count [dim]);
+					ig.Emit (OpCodes.Ldc_I4_1);
+					ig.Emit (OpCodes.Add);
+					ig.Emit (OpCodes.Stloc, dim_count [dim]);
+
+					ig.MarkLabel (test [dim]);
+					ig.Emit (OpCodes.Ldloc, dim_count [dim]);
+					ig.Emit (OpCodes.Ldloc, dim_len [dim]);
+					ig.Emit (OpCodes.Blt, loop [dim]);
+				}
+			}
+			ig.MarkLabel (ec.LoopEnd);
+			
+			return false;
+		}
+		
+		public override bool Emit (EmitContext ec)
+		{
+			bool ret_val;
+			
+			ILGenerator ig = ec.ig;
+			
+			Label old_begin = ec.LoopBegin, old_end = ec.LoopEnd;
+			bool old_inloop = ec.InLoop;
+			int old_loop_begin_try_catch_level = ec.LoopBeginTryCatchLevel;
+			ec.LoopBegin = ig.DefineLabel ();
+			ec.LoopEnd = ig.DefineLabel ();
+			ec.InLoop = true;
+			ec.LoopBeginTryCatchLevel = ec.TryCatchLevel;
+			
+			if (hm != null)
+				ret_val = EmitCollectionForeach (ec);
+			else
+				ret_val = EmitArrayForeach (ec);
+			
+			ec.LoopBegin = old_begin;
+			ec.LoopEnd = old_end;
+			ec.InLoop = old_inloop;
+			ec.LoopBeginTryCatchLevel = old_loop_begin_try_catch_level;
+
+			return ret_val;
+		}
+	}
+}
+
diff --git a/mcs/mcs/statementCollection.cs b/mcs/mcs/statementCollection.cs
new file mode 100755
index 00000000000..9e5141dfdc6
--- /dev/null
+++ b/mcs/mcs/statementCollection.cs
@@ -0,0 +1,166 @@
+//
+// System.CodeDOM CodeStatementCollection Class implementation
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc.
+//
+
+namespace Mono.CSharp {
+
+	using System.Collections;
+	using System;
+	
+	public class StatementCollection : IList, ICollection, IEnumerable {
+
+		ArrayList statements;
+		
+		//
+		// Constructors
+		//
+		public StatementCollection ()
+		{
+			statements = new ArrayList ();
+		}
+
+		//
+		// Properties
+		//
+		public int Count {
+			get {
+				return statements.Count;
+			}
+		}
+
+		//
+		// Methods
+		//
+		public void Add (Statement value)
+		{
+			statements.Add (value);
+		}
+
+		public void AddRange (Statement [] values)
+		{
+			foreach (Statement ca in values) 
+				statements.Add (ca);
+
+		}
+
+		public void Clear ()
+		{
+			statements.Clear ();
+		}
+
+		private class Enumerator : IEnumerator {
+			private StatementCollection collection;
+			private int currentIndex = -1;
+
+			internal Enumerator (StatementCollection collection)
+			{
+				this.collection = collection;
+			}
+
+			public object Current {
+				get {
+					if (currentIndex == collection.Count)
+						throw new InvalidOperationException ();
+					return collection [currentIndex];
+				}
+			}
+
+			public bool MoveNext ()
+			{
+				if (currentIndex > collection.Count)
+					throw new InvalidOperationException ();
+				return ++currentIndex < collection.Count;
+			}
+
+			public void Reset ()
+			{
+				currentIndex = -1;
+			}
+		}
+		
+		public IEnumerator GetEnumerator ()
+		{
+			return new StatementCollection.Enumerator (this);
+		}
+
+		//
+		// IList method implementations
+		//
+		public int Add (object value)
+		{
+			return statements.Add (value);
+		}
+
+		public bool Contains (Object value)
+		{
+			return statements.Contains (value);
+		}
+
+		public int IndexOf (Object value)
+		{
+			return statements.IndexOf (value);
+		}
+
+		public void Insert (int index, Object value)
+		{
+			statements [index] = value;
+		}
+
+		public object this[int index] {
+			get {
+				return statements [index];
+			}
+
+			set {
+				statements [index] = value;
+			}
+		}
+
+		public void Remove (object value)
+		{
+			statements.Remove (value);
+		}
+
+		public void RemoveAt (int index)
+		{
+			statements.RemoveAt (index);
+		}
+
+		//
+		// ICollection method implementations
+		//
+		public void CopyTo (Array array, int index)
+		{
+			statements.CopyTo (array, index);
+		}
+
+		public object SyncRoot {
+			get {
+				return statements.SyncRoot;
+			}
+		}
+
+		public bool IsReadOnly {
+			get {
+				return false;
+			}
+		}
+
+		public bool IsSynchronized {
+			get {
+				return statements.IsSynchronized;
+			}
+		}
+
+		public bool IsFixedSize {
+			get {
+				return false;
+			}
+		}
+	}
+}
diff --git a/mcs/mcs/support.cs b/mcs/mcs/support.cs
new file mode 100755
index 00000000000..3db32ac9da6
--- /dev/null
+++ b/mcs/mcs/support.cs
@@ -0,0 +1,258 @@
+//
+// support.cs: Support routines to work around the fact that System.Reflection.Emit
+// can not introspect types that are being constructed
+//
+// Author:
+//   Miguel de Icaza (miguel@ximian.com)
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+
+using System;
+using System.Text;
+using System.Reflection;
+using System.Collections;
+using System.Reflection.Emit;
+using System.Globalization;
+
+namespace Mono.CSharp {
+
+	public interface ParameterData {
+		Type ParameterType (int pos);
+		int  Count { get; }
+		string ParameterName (int pos);
+		string ParameterDesc (int pos);
+		Parameter.Modifier ParameterModifier (int pos);
+	}
+
+	public class ReflectionParameters : ParameterData {
+		ParameterInfo [] pi;
+		bool last_arg_is_params = false;
+		
+		public ReflectionParameters (ParameterInfo [] pi)
+		{
+			object [] attrs;
+			
+			this.pi = pi;
+
+			int count = pi.Length-1;
+
+			if (count >= 0) {
+				attrs = pi [count].GetCustomAttributes (TypeManager.param_array_type, true);
+
+				if (attrs == null)
+					return;
+				
+				if (attrs.Length == 0)
+					return;
+
+				last_arg_is_params = true;
+			}
+		}
+		       
+		public Type ParameterType (int pos)
+		{
+			if (last_arg_is_params && pos >= pi.Length - 1)
+				return pi [pi.Length - 1].ParameterType;
+			else 
+				return pi [pos].ParameterType;
+		}
+
+		public string ParameterName (int pos)
+		{
+			if (last_arg_is_params && pos >= pi.Length - 1)
+				return pi [pi.Length - 1].Name;
+			else 
+				return pi [pos].Name;
+		}
+
+		public string ParameterDesc (int pos)
+		{
+			StringBuilder sb = new StringBuilder ();
+
+			if (pi [pos].IsOut)
+				sb.Append ("out ");
+
+			if (pi [pos].IsIn)
+				sb.Append ("in ");
+
+			if (pos >= pi.Length - 1 && last_arg_is_params)
+				sb.Append ("params ");
+			
+			sb.Append (TypeManager.CSharpName (ParameterType (pos)));
+
+			return sb.ToString ();
+			
+		}
+
+		public Parameter.Modifier ParameterModifier (int pos)
+		{
+			int len = pi.Length;
+			
+			if (pos >= len - 1)
+				if (last_arg_is_params)
+					return Parameter.Modifier.PARAMS;
+			
+			Type t = pi [pos].ParameterType;
+			if (t.IsByRef)
+				return Parameter.Modifier.ISBYREF;
+			
+			return Parameter.Modifier.NONE;
+		}
+
+		public int Count {
+			get {
+				return pi.Length;
+			}
+		}
+		
+	}
+
+	public class InternalParameters : ParameterData {
+		Type [] param_types;
+
+		public readonly Parameters Parameters;
+		
+		public InternalParameters (Type [] param_types, Parameters parameters)
+		{
+			this.param_types = param_types;
+			this.Parameters = parameters;
+		}
+
+		public InternalParameters (DeclSpace ds, Parameters parameters)
+			: this (parameters.GetParameterInfo (ds), parameters)
+		{
+		}
+
+		public int Count {
+			get {
+				if (param_types == null)
+					return 0;
+
+				return param_types.Length;
+			}
+		}
+
+		public Type ParameterType (int pos)
+		{
+			if (param_types == null)
+				return null;
+
+			Parameter [] fixed_pars = Parameters.FixedParameters;
+			if (fixed_pars != null){
+				int len = fixed_pars.Length;
+				if (pos < len)
+					return Parameters.FixedParameters [pos].ParameterType;
+				else 
+					return Parameters.ArrayParameter.ParameterType;
+			} else
+				return Parameters.ArrayParameter.ParameterType;
+		}
+
+		public string ParameterName (int pos)
+		{
+			Parameter p;
+
+			if (pos >= Parameters.FixedParameters.Length)
+				p = Parameters.ArrayParameter;
+			else
+				p = Parameters.FixedParameters [pos];
+
+			return p.Name;
+		}
+
+		public string ParameterDesc (int pos)
+		{
+			string tmp = String.Empty;
+			Parameter p;
+
+			if (pos >= Parameters.FixedParameters.Length)
+				p = Parameters.ArrayParameter;
+			else
+				p = Parameters.FixedParameters [pos];
+			
+			if (p.ModFlags == Parameter.Modifier.REF)
+				tmp = "ref ";
+			else if (p.ModFlags == Parameter.Modifier.OUT)
+				tmp = "out ";
+			else if (p.ModFlags == Parameter.Modifier.PARAMS)
+				tmp = "params ";
+
+			Type t = ParameterType (pos);
+
+			return tmp + TypeManager.CSharpName (t);
+		}
+
+		public Parameter.Modifier ParameterModifier (int pos)
+		{
+			Parameter.Modifier mod;
+
+			if (Parameters.FixedParameters == null) {
+				if (Parameters.ArrayParameter != null) 
+					mod = Parameters.ArrayParameter.ModFlags;
+				else
+					mod = Parameter.Modifier.NONE;
+			} else if (pos >= Parameters.FixedParameters.Length)
+				mod = Parameters.ArrayParameter.ModFlags;
+			else
+				mod = Parameters.FixedParameters [pos].ModFlags;
+
+			if ((mod & (Parameter.Modifier.REF | Parameter.Modifier.OUT)) != 0)
+				mod |= Parameter.Modifier.ISBYREF;
+
+			return mod;
+		}
+		
+	}
+
+	class PtrHashtable : Hashtable {
+		class PtrComparer : IComparer {
+			public int Compare (object x, object y)
+			{
+				if (x == y)
+					return 0;
+				else
+					return 1;
+			}
+		}
+		
+		public PtrHashtable ()
+		{
+			comparer = new PtrComparer ();
+		}
+	}
+
+	//
+	// Compares member infos based on their name and
+	// also allows one argument to be a string
+	//
+	class MemberInfoCompare : IComparer {
+
+		public int Compare (object a, object b)
+		{
+			if (a == null || b == null){
+				Console.WriteLine ("Invalid information passed");
+				throw new Exception ();
+			}
+			
+			if (a is string)
+				return String.Compare ((string) a, ((MemberInfo)b).Name);
+
+			if (b is string)
+				return String.Compare (((MemberInfo)a).Name, (string) b);
+
+			return String.Compare (((MemberInfo)a).Name, ((MemberInfo)b).Name);
+		}
+	}
+
+	struct Pair {
+		public object First;
+		public object Second;
+		
+		public Pair (object f, object s)
+		{
+			First = f;
+			Second = s;
+		}
+	}
+}
diff --git a/mcs/mcs/tree.cs b/mcs/mcs/tree.cs
new file mode 100755
index 00000000000..2cf5be8ca5c
--- /dev/null
+++ b/mcs/mcs/tree.cs
@@ -0,0 +1,109 @@
+//
+// tree.cs: keeps a tree representation of the generated code
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+//
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.IO;
+
+namespace Mono.CSharp
+{
+
+	public interface ITreeDump {
+		int  Dump (Tree tree, StreamWriter output);
+		void ParseOptions (string options);
+	}
+
+	// <summary>
+	//   
+	//   We store here all the toplevel types that we have parsed,
+	//   this is the root of all information we have parsed.
+	// 
+	// </summary>
+	
+	public class Tree {
+		TypeContainer root_types;
+
+		// <summary>
+		//  Keeps track of namespaces defined in the source code
+		// </summary>
+		Hashtable namespaces;
+
+		// <summary>
+		//   Keeps track of all the types definied (classes, structs, ifaces, enums)
+		// </summary>
+		Hashtable decls;
+		
+		public Tree ()
+		{
+			root_types = new TypeContainer (null, "", new Location (-1));
+
+			decls = new Hashtable ();
+			namespaces = new Hashtable ();
+		}
+
+		public void RecordDecl (string name, DeclSpace ds)
+		{
+			if (decls.Contains (name)){
+				Report.Error (
+					101, ds.Location,
+					"There is already a definition for `" + name + "'");
+				DeclSpace other = (DeclSpace) decls [name];
+				Report.Error (0,
+					other.Location, "(Location of symbol related to previous error)");
+				return;
+			}
+			decls.Add (name, ds);
+		}
+		
+		public Namespace RecordNamespace (Namespace parent, string file, string name)
+		{
+			Namespace ns = new Namespace (parent, name);
+
+			if (namespaces.Contains (file)){
+				Hashtable ns_ns = (Hashtable) namespaces [file];
+
+				if (ns_ns.Contains (ns.Name))
+					return (Namespace) ns_ns [ns.Name];
+				ns_ns.Add (ns.Name, ns);
+			} else {
+				Hashtable new_table = new Hashtable ();
+				namespaces [file] = new_table;
+
+				new_table.Add (ns.Name, ns);
+			}
+
+			return ns;
+		}
+
+		//
+		// FIXME: Why are we using Types?
+		//
+                public TypeContainer Types {
+                        get {
+                                return root_types;
+                        }
+                }
+
+		public Hashtable Decls {
+			get {
+				return decls;
+			}
+		}
+
+		public Hashtable Namespaces {
+			get {
+				return namespaces;
+			}
+		}
+	}
+}
diff --git a/mcs/mcs/typemanager.cs b/mcs/mcs/typemanager.cs
new file mode 100755
index 00000000000..15abf98b796
--- /dev/null
+++ b/mcs/mcs/typemanager.cs
@@ -0,0 +1,2250 @@
+//
+// typemanager.cs: C# type manager
+//
+// Author: Miguel de Icaza (miguel@gnu.org)
+//         Ravi Pratap     (ravi@ximian.com)
+//
+// Licensed under the terms of the GNU GPL
+//
+// (C) 2001 Ximian, Inc (http://www.ximian.com)
+//
+//
+using System;
+using System.Globalization;
+using System.Collections;
+using System.Reflection;
+using System.Reflection.Emit;
+using System.Text.RegularExpressions;
+using System.Runtime.CompilerServices;
+using System.Diagnostics;
+
+namespace Mono.CSharp {
+
+public class TypeManager {
+	//
+	// A list of core types that the compiler requires or uses
+	//
+	static public Type object_type;
+	static public Type value_type;
+	static public Type string_type;
+	static public Type int32_type;
+	static public Type uint32_type;
+	static public Type int64_type;
+	static public Type uint64_type;
+	static public Type float_type;
+	static public Type double_type;
+	static public Type char_type;
+	static public Type char_ptr_type;
+	static public Type short_type;
+	static public Type decimal_type;
+	static public Type bool_type;
+	static public Type sbyte_type;
+	static public Type byte_type;
+	static public Type ushort_type;
+	static public Type enum_type;
+	static public Type delegate_type;
+	static public Type multicast_delegate_type;
+	static public Type void_type;
+	static public Type enumeration_type;
+	static public Type array_type;
+	static public Type runtime_handle_type;
+	static public Type icloneable_type;
+	static public Type type_type;
+	static public Type ienumerator_type;
+	static public Type idisposable_type;
+	static public Type default_member_type;
+	static public Type iasyncresult_type;
+	static public Type asynccallback_type;
+	static public Type intptr_type;
+	static public Type monitor_type;
+	static public Type runtime_field_handle_type;
+	static public Type attribute_type;
+	static public Type attribute_usage_type;
+	static public Type dllimport_type;
+	static public Type unverifiable_code_type;
+	static public Type methodimpl_attr_type;
+	static public Type marshal_as_attr_type;
+	static public Type param_array_type;
+	static public Type void_ptr_type;
+	static public Type indexer_name_type;
+	static public Type exception_type;
+	static public object obsolete_attribute_type;
+	static public object conditional_attribute_type;
+
+	//
+	// An empty array of types
+	//
+	static public Type [] NoTypes;
+
+
+	// 
+	// Expressions representing the internal types.  Used during declaration
+	// definition.
+	//
+	static public Expression system_object_expr, system_string_expr; 
+	static public Expression system_boolean_expr, system_decimal_expr;
+	static public Expression system_single_expr, system_double_expr;
+	static public Expression system_sbyte_expr, system_byte_expr;
+	static public Expression system_int16_expr, system_uint16_expr;
+	static public Expression system_int32_expr, system_uint32_expr;
+	static public Expression system_int64_expr, system_uint64_expr;
+	static public Expression system_char_expr, system_void_expr;
+	static public Expression system_asynccallback_expr;
+	static public Expression system_iasyncresult_expr;
+
+	//
+	// This is only used when compiling corlib
+	//
+	static public Type system_int32_type;
+	static public Type system_array_type;
+	static public Type system_type_type;
+	static public Type system_assemblybuilder_type;
+	static public MethodInfo system_int_array_get_length;
+	static public MethodInfo system_int_array_get_rank;
+	static public MethodInfo system_object_array_clone;
+	static public MethodInfo system_int_array_get_length_int;
+	static public MethodInfo system_int_array_get_lower_bound_int;
+	static public MethodInfo system_int_array_get_upper_bound_int;
+	static public MethodInfo system_void_array_copyto_array_int;
+	static public MethodInfo system_void_set_corlib_type_builders;
+
+	
+	//
+	// Internal, not really used outside
+	//
+	static Type runtime_helpers_type;
+	
+	//
+	// These methods are called by code generated by the compiler
+	//
+	static public MethodInfo string_concat_string_string;
+	static public MethodInfo string_concat_object_object;
+	static public MethodInfo string_isinterneted_string;
+	static public MethodInfo system_type_get_type_from_handle;
+	static public MethodInfo object_getcurrent_void;
+	static public MethodInfo bool_movenext_void;
+	static public MethodInfo void_dispose_void;
+	static public MethodInfo void_monitor_enter_object;
+	static public MethodInfo void_monitor_exit_object;
+	static public MethodInfo void_initializearray_array_fieldhandle;
+	static public MethodInfo int_getlength_int;
+	static public MethodInfo delegate_combine_delegate_delegate;
+	static public MethodInfo delegate_remove_delegate_delegate;
+	static public MethodInfo int_get_offset_to_string_data;
+	static public MethodInfo int_array_get_length;
+	static public MethodInfo int_array_get_rank;
+	static public MethodInfo object_array_clone;
+	static public MethodInfo int_array_get_length_int;
+	static public MethodInfo int_array_get_lower_bound_int;
+	static public MethodInfo int_array_get_upper_bound_int;
+	static public MethodInfo void_array_copyto_array_int;
+	
+	//
+	// The attribute constructors.
+	//
+	static public ConstructorInfo cons_param_array_attribute;
+	static public ConstructorInfo void_decimal_ctor_five_args;
+	static public ConstructorInfo unverifiable_code_ctor;
+	
+	// <remarks>
+	//   Holds the Array of Assemblies that have been loaded
+	//   (either because it is the default or the user used the
+	//   -r command line option)
+	// </remarks>
+	static Assembly [] assemblies;
+
+	// <remarks>
+	//  Keeps a list of module builders. We used this to do lookups
+	//  on the modulebuilder using GetType -- needed for arrays
+	// </remarks>
+	static ModuleBuilder [] modules;
+
+	// <remarks>
+	//   This is the type_cache from the assemblies to avoid
+	//   hitting System.Reflection on every lookup.
+	// </summary>
+	static Hashtable types;
+
+	// <remarks>
+	//  This is used to hotld the corresponding TypeContainer objects
+	//  since we need this in FindMembers
+	// </remarks>
+	static Hashtable typecontainers;
+
+	// <remarks>
+	//   Keeps track of those types that are defined by the
+	//   user's program
+	// </remarks>
+	static ArrayList user_types;
+
+	static PtrHashtable builder_to_declspace;
+
+	// <remarks>
+	//   Tracks the interfaces implemented by typebuilders.  We only
+	//   enter those who do implement or or more interfaces
+	// </remarks>
+	static PtrHashtable builder_to_ifaces;
+
+	// <remarks>
+	//   Maps MethodBase.RuntimeTypeHandle to a Type array that contains
+	//   the arguments to the method
+	// </remarks>
+	static Hashtable method_arguments;
+
+	// <remarks>
+	//   Maps PropertyBuilder to a Type array that contains
+	//   the arguments to the indexer
+	// </remarks>
+	static Hashtable indexer_arguments;
+
+	// <remarks>
+	//   Maybe `method_arguments' should be replaced and only
+	//   method_internal_params should be kept?
+	// <remarks>
+	static Hashtable method_internal_params;
+
+	// <remarks>
+	//  Keeps track of attribute types
+	// </remarks>
+
+	static Hashtable builder_to_attr;
+
+	// <remarks>
+	//  Keeps track of methods
+	// </remarks>
+
+	static Hashtable builder_to_method;
+
+	struct Signature {
+		public string name;
+		public Type [] args;
+	}
+
+	/// <summary>
+	///   A filter for Findmembers that uses the Signature object to
+	///   extract objects
+	/// </summary>
+	static bool SignatureFilter (MemberInfo mi, object criteria)
+	{
+		Signature sig = (Signature) criteria;
+
+		if (!(mi is MethodBase))
+			return false;
+		
+		if (mi.Name != sig.name)
+			return false;
+
+		int count = sig.args.Length;
+		
+		if (mi is MethodBuilder || mi is ConstructorBuilder){
+			Type [] candidate_args = GetArgumentTypes ((MethodBase) mi);
+
+			if (candidate_args.Length != count)
+				return false;
+			
+			for (int i = 0; i < count; i++)
+				if (candidate_args [i] != sig.args [i])
+					return false;
+			
+			return true;
+		} else {
+			ParameterInfo [] pars = ((MethodBase) mi).GetParameters ();
+
+			if (pars.Length != count)
+				return false;
+
+			for (int i = 0; i < count; i++)
+				if (pars [i].ParameterType != sig.args [i])
+					return false;
+			return true;
+		}
+	}
+
+	// A delegate that points to the filter above.
+	static MemberFilter signature_filter;
+
+	//
+	// These are expressions that represent some of the internal data types, used
+	// elsewhere
+	//
+	static void InitExpressionTypes ()
+	{
+		system_object_expr  = new TypeLookupExpression ("System.Object");
+		system_string_expr  = new TypeLookupExpression ("System.String");
+		system_boolean_expr = new TypeLookupExpression ("System.Boolean");
+		system_decimal_expr = new TypeLookupExpression ("System.Decimal");
+		system_single_expr  = new TypeLookupExpression ("System.Single");
+		system_double_expr  = new TypeLookupExpression ("System.Double");
+		system_sbyte_expr   = new TypeLookupExpression ("System.SByte");
+		system_byte_expr    = new TypeLookupExpression ("System.Byte");
+		system_int16_expr   = new TypeLookupExpression ("System.Int16");
+		system_uint16_expr  = new TypeLookupExpression ("System.UInt16");
+		system_int32_expr   = new TypeLookupExpression ("System.Int32");
+		system_uint32_expr  = new TypeLookupExpression ("System.UInt32");
+		system_int64_expr   = new TypeLookupExpression ("System.Int64");
+		system_uint64_expr  = new TypeLookupExpression ("System.UInt64");
+		system_char_expr    = new TypeLookupExpression ("System.Char");
+		system_void_expr    = new TypeLookupExpression ("System.Void");
+		system_asynccallback_expr = new TypeLookupExpression ("System.AsyncCallback");
+		system_iasyncresult_expr = new TypeLookupExpression ("System.IAsyncResult");
+	}
+	
+	static TypeManager ()
+	{
+		assemblies = new Assembly [0];
+		modules = null;
+		user_types = new ArrayList ();
+		
+		types = new Hashtable ();
+		typecontainers = new Hashtable ();
+		
+		builder_to_declspace = new PtrHashtable ();
+		builder_to_attr = new PtrHashtable ();
+		builder_to_method = new PtrHashtable ();
+		method_arguments = new PtrHashtable ();
+		method_internal_params = new PtrHashtable ();
+		indexer_arguments = new PtrHashtable ();
+		builder_to_ifaces = new PtrHashtable ();
+		
+		NoTypes = new Type [0];
+
+		signature_filter = new MemberFilter (SignatureFilter);
+		InitExpressionTypes ();
+	}
+
+	public static void AddUserType (string name, TypeBuilder t, Type [] ifaces)
+	{
+		try {
+			types.Add (name, t);
+		} catch {
+			Type prev = (Type) types [name];
+			TypeContainer tc = builder_to_declspace [prev] as TypeContainer;
+
+			if (tc != null){
+				//
+				// This probably never happens, as we catch this before
+				//
+				Report.Error (-17, "The type `" + name + "' has already been defined.");
+				return;
+			}
+
+			tc = builder_to_declspace [t] as TypeContainer;
+			
+			Report.Warning (
+				1595, "The type `" + name + "' is defined in an existing assembly;"+
+				" Using the new definition from: " + tc.Location);
+			Report.Warning (1595, "Previously defined in: " + prev.Assembly.FullName);
+			
+			types.Remove (name);
+			types.Add (name, t);
+		}
+		user_types.Add (t);
+			
+		if (ifaces != null)
+			builder_to_ifaces [t] = ifaces;
+	}
+
+	//
+	// This entry point is used by types that we define under the covers
+	// 
+	public static void RegisterBuilder (TypeBuilder tb, Type [] ifaces)
+	{
+		if (ifaces != null)
+			builder_to_ifaces [tb] = ifaces;
+	}
+	
+	public static void AddUserType (string name, TypeBuilder t, TypeContainer tc, Type [] ifaces)
+	{
+		builder_to_declspace.Add (t, tc);
+		typecontainers.Add (name, tc);
+		AddUserType (name, t, ifaces);
+	}
+
+	public static void AddDelegateType (string name, TypeBuilder t, Delegate del)
+	{
+		types.Add (name, t);
+		builder_to_declspace.Add (t, del);
+	}
+	
+	public static void AddEnumType (string name, TypeBuilder t, Enum en)
+	{
+		types.Add (name, t);
+		builder_to_declspace.Add (t, en);
+	}
+
+	public static void AddUserInterface (string name, TypeBuilder t, Interface i, Type [] ifaces)
+	{
+		AddUserType (name, t, ifaces);
+		builder_to_declspace.Add (t, i);
+	}
+
+	public static void AddMethod (MethodBuilder builder, MethodData method)
+	{
+		builder_to_method.Add (builder, method);
+	}
+
+	public static void RegisterAttrType (Type t, TypeContainer tc)
+	{
+		builder_to_attr.Add (t, tc);
+	}
+
+	/// <summary>
+	///   Returns the TypeContainer whose Type is `t' or null if there is no
+	///   TypeContainer for `t' (ie, the Type comes from a library)
+	/// </summary>
+	public static TypeContainer LookupTypeContainer (Type t)
+	{
+		return builder_to_declspace [t] as TypeContainer;
+	}
+
+	public static IMemberContainer LookupMemberContainer (Type t)
+	{
+		if (t is TypeBuilder) {
+			IMemberContainer container = builder_to_declspace [t] as IMemberContainer;
+			if (container != null)
+				return container;
+		}
+
+		return TypeHandle.GetTypeHandle (t);
+	}
+
+	public static Interface LookupInterface (Type t)
+	{
+		return builder_to_declspace [t] as Interface;
+	}
+
+	public static Delegate LookupDelegate (Type t)
+	{
+		return builder_to_declspace [t] as Delegate;
+	}
+
+	public static Enum LookupEnum (Type t)
+	{
+		return builder_to_declspace [t] as Enum;
+	}
+	
+	public static TypeContainer LookupAttr (Type t)
+	{
+		return (TypeContainer) builder_to_attr [t];
+	}
+	
+	/// <summary>
+	///   Registers an assembly to load types from.
+	/// </summary>
+	public static void AddAssembly (Assembly a)
+	{
+		int top = assemblies.Length;
+		Assembly [] n = new Assembly [top + 1];
+
+		assemblies.CopyTo (n, 0);
+		
+		n [top] = a;
+		assemblies = n;
+	}
+
+	/// <summary>
+	///  Registers a module builder to lookup types from
+	/// </summary>
+	public static void AddModule (ModuleBuilder mb)
+	{
+		int top = modules != null ? modules.Length : 0;
+		ModuleBuilder [] n = new ModuleBuilder [top + 1];
+
+		if (modules != null)
+			modules.CopyTo (n, 0);
+		n [top] = mb;
+		modules = n;
+	}
+
+	/// <summary>
+	///   Returns the Type associated with @name
+	/// </summary>
+	public static Type LookupType (string name)
+	{
+		Type t;
+
+		//
+		// First lookup in user defined and cached values
+		//
+
+		t = (Type) types [name];
+		if (t != null)
+			return t;
+
+		foreach (Assembly a in assemblies){
+			t = a.GetType (name);
+			if (t != null){
+				types [name] = t;
+
+				return t;
+			}
+		}
+
+		foreach (ModuleBuilder mb in modules) {
+			t = mb.GetType (name);
+			if (t != null) {
+				types [name] = t;
+				return t;
+			}
+		}
+		
+		return null;
+	}
+
+	/// <summary>
+	///   Returns the C# name of a type if possible, or the full type name otherwise
+	/// </summary>
+	static public string CSharpName (Type t)
+	{
+		return Regex.Replace (t.FullName, 
+			@"^System\." +
+			@"(Int32|UInt32|Int16|Uint16|Int64|UInt64|" +
+			@"Single|Double|Char|Decimal|Byte|SByte|Object|" +
+			@"Boolean|String|Void)" +
+			@"(\W+|\b)", 
+			new MatchEvaluator (CSharpNameMatch));
+	}	
+	
+	static String CSharpNameMatch (Match match) 
+	{
+		string s = match.Groups [1].Captures [0].Value;
+		return s.ToLower ().
+		Replace ("int32", "int").
+		Replace ("uint32", "uint").
+		Replace ("int16", "short").
+		Replace ("uint16", "ushort").
+		Replace ("int64", "long").
+		Replace ("uint64", "ulong").
+		Replace ("single", "float").
+		Replace ("boolean", "bool")
+		+ match.Groups [2].Captures [0].Value;
+	}
+
+        /// <summary>
+        ///   Returns the signature of the method
+        /// </summary>
+        static public string CSharpSignature (MethodBase mb)
+        {
+                string sig = "(";
+
+		//
+		// FIXME: We should really have a single function to do
+		// everything instead of the following 5 line pattern
+		//
+                ParameterData iparams = LookupParametersByBuilder (mb);
+
+		if (iparams == null){
+			ParameterInfo [] pi = mb.GetParameters ();
+			iparams = new ReflectionParameters (pi);
+		}
+		
+                for (int i = 0; i < iparams.Count; i++) {
+                        if (i > 0) {
+                                sig += ", ";
+                        }
+                        sig += iparams.ParameterDesc(i);
+                }
+                sig += ")";
+
+                return mb.DeclaringType.Name + "." + mb.Name + sig;
+        }
+
+	/// <summary>
+	///   Looks up a type, and aborts if it is not found.  This is used
+	///   by types required by the compiler
+	/// </summary>
+	static Type CoreLookupType (string name)
+	{
+		Type t = LookupType (name);
+
+		if (t == null){
+			Report.Error (518, "The predefined type `" + name + "' is not defined or imported");
+			Environment.Exit (0);
+		}
+
+		return t;
+	}
+
+	/// <summary>
+	///   Returns the MethodInfo for a method named `name' defined
+	///   in type `t' which takes arguments of types `args'
+	/// </summary>
+	static MethodInfo GetMethod (Type t, string name, Type [] args)
+	{
+		MemberList list;
+		Signature sig;
+
+		sig.name = name;
+		sig.args = args;
+		
+		list = FindMembers (t, MemberTypes.Method, instance_and_static | BindingFlags.Public,
+				    signature_filter, sig);
+		if (list.Count == 0) {
+			Report.Error (-19, "Can not find the core function `" + name + "'");
+			return null;
+		}
+
+		MethodInfo mi = list [0] as MethodInfo;
+		if (mi == null) {
+			Report.Error (-19, "Can not find the core function `" + name + "'");
+			return null;
+		}
+
+		return mi;
+	}
+
+	/// <summary>
+	///    Returns the ConstructorInfo for "args"
+	/// </summary>
+	static ConstructorInfo GetConstructor (Type t, Type [] args)
+	{
+		MemberList list;
+		Signature sig;
+
+		sig.name = ".ctor";
+		sig.args = args;
+		
+		list = FindMembers (t, MemberTypes.Constructor,
+				    instance_and_static | BindingFlags.Public | BindingFlags.DeclaredOnly,
+				    signature_filter, sig);
+		if (list.Count == 0){
+			Report.Error (-19, "Can not find the core constructor for type `" + t.Name + "'");
+			return null;
+		}
+
+		ConstructorInfo ci = list [0] as ConstructorInfo;
+		if (ci == null){
+			Report.Error (-19, "Can not find the core constructor for type `" + t.Name + "'");
+			return null;
+		}
+
+		return ci;
+	}
+
+	public static void InitEnumUnderlyingTypes ()
+	{
+
+		int32_type    = CoreLookupType ("System.Int32");
+		int64_type    = CoreLookupType ("System.Int64");
+		uint32_type   = CoreLookupType ("System.UInt32"); 
+		uint64_type   = CoreLookupType ("System.UInt64"); 
+		byte_type     = CoreLookupType ("System.Byte");
+		sbyte_type    = CoreLookupType ("System.SByte");
+		short_type    = CoreLookupType ("System.Int16");
+		ushort_type   = CoreLookupType ("System.UInt16");
+	}
+	
+	/// <remarks>
+	///   The types have to be initialized after the initial
+	///   population of the type has happened (for example, to
+	///   bootstrap the corlib.dll
+	/// </remarks>
+	public static void InitCoreTypes ()
+	{
+		object_type   = CoreLookupType ("System.Object");
+		value_type    = CoreLookupType ("System.ValueType");
+
+		InitEnumUnderlyingTypes ();
+
+		char_type     = CoreLookupType ("System.Char");
+		string_type   = CoreLookupType ("System.String");
+		float_type    = CoreLookupType ("System.Single");
+		double_type   = CoreLookupType ("System.Double");
+		char_ptr_type = CoreLookupType ("System.Char*");
+		decimal_type  = CoreLookupType ("System.Decimal");
+		bool_type     = CoreLookupType ("System.Boolean");
+		enum_type     = CoreLookupType ("System.Enum");
+
+		multicast_delegate_type = CoreLookupType ("System.MulticastDelegate");
+		delegate_type           = CoreLookupType ("System.Delegate");
+
+		array_type    = CoreLookupType ("System.Array");
+		void_type     = CoreLookupType ("System.Void");
+		type_type     = CoreLookupType ("System.Type");
+
+		runtime_field_handle_type = CoreLookupType ("System.RuntimeFieldHandle");
+		runtime_helpers_type = CoreLookupType ("System.Runtime.CompilerServices.RuntimeHelpers");
+		default_member_type  = CoreLookupType ("System.Reflection.DefaultMemberAttribute");
+		runtime_handle_type  = CoreLookupType ("System.RuntimeTypeHandle");
+		asynccallback_type   = CoreLookupType ("System.AsyncCallback");
+		iasyncresult_type    = CoreLookupType ("System.IAsyncResult");
+		ienumerator_type     = CoreLookupType ("System.Collections.IEnumerator");
+		idisposable_type     = CoreLookupType ("System.IDisposable");
+		icloneable_type      = CoreLookupType ("System.ICloneable");
+		monitor_type         = CoreLookupType ("System.Threading.Monitor");
+		intptr_type          = CoreLookupType ("System.IntPtr");
+
+		attribute_type       = CoreLookupType ("System.Attribute");
+		attribute_usage_type = CoreLookupType ("System.AttributeUsageAttribute");
+		dllimport_type       = CoreLookupType ("System.Runtime.InteropServices.DllImportAttribute");
+		methodimpl_attr_type = CoreLookupType ("System.Runtime.CompilerServices.MethodImplAttribute");
+		marshal_as_attr_type  = CoreLookupType ("System.Runtime.InteropServices.MarshalAsAttribute");
+		param_array_type      = CoreLookupType ("System.ParamArrayAttribute");
+
+		unverifiable_code_type= CoreLookupType ("System.Security.UnverifiableCodeAttribute");
+
+		void_ptr_type         = CoreLookupType ("System.Void*");
+
+		indexer_name_type     = CoreLookupType ("System.Runtime.CompilerServices.IndexerNameAttribute");
+
+		exception_type        = CoreLookupType ("System.Exception");
+
+		//
+		// Attribute types
+		//
+		obsolete_attribute_type = CoreLookupType ("System.ObsoleteAttribute");
+		conditional_attribute_type = CoreLookupType ("System.Diagnostics.ConditionalAttribute");
+
+		//
+		// When compiling corlib, store the "real" types here.
+		//
+		if (!RootContext.StdLib) {
+			system_int32_type = typeof (System.Int32);
+			system_array_type = typeof (System.Array);
+			system_type_type = typeof (System.Type);
+			system_assemblybuilder_type = typeof (System.Reflection.Emit.AssemblyBuilder);
+
+			Type [] void_arg = {  };
+			system_int_array_get_length = GetMethod (
+				system_array_type, "get_Length", void_arg);
+			system_int_array_get_rank = GetMethod (
+				system_array_type, "get_Rank", void_arg);
+			system_object_array_clone = GetMethod (
+				system_array_type, "Clone", void_arg);
+
+			Type [] system_int_arg = { system_int32_type };
+			system_int_array_get_length_int = GetMethod (
+				system_array_type, "GetLength", system_int_arg);
+			system_int_array_get_upper_bound_int = GetMethod (
+				system_array_type, "GetUpperBound", system_int_arg);
+			system_int_array_get_lower_bound_int = GetMethod (
+				system_array_type, "GetLowerBound", system_int_arg);
+
+			Type [] system_array_int_arg = { system_array_type, system_int32_type };
+			system_void_array_copyto_array_int = GetMethod (
+				system_array_type, "CopyTo", system_array_int_arg);
+
+			Type [] system_type_type_arg = { system_type_type, system_type_type, system_type_type };
+
+			try {
+			system_void_set_corlib_type_builders = GetMethod (
+				system_assemblybuilder_type, "SetCorlibTypeBuilders",
+				system_type_type_arg);
+
+			object[] args = new object [3];
+			args [0] = object_type;
+			args [1] = value_type;
+			args [2] = enum_type;
+
+			system_void_set_corlib_type_builders.Invoke (CodeGen.AssemblyBuilder, args);
+			} catch {
+				Console.WriteLine ("Corlib compilation is not supported in Microsoft.NET due to bugs in it");
+			}
+		}
+	}
+
+	//
+	// The helper methods that are used by the compiler
+	//
+	public static void InitCodeHelpers ()
+	{
+		//
+		// Now load the default methods that we use.
+		//
+		Type [] string_string = { string_type, string_type };
+		string_concat_string_string = GetMethod (
+			string_type, "Concat", string_string);
+
+		Type [] object_object = { object_type, object_type };
+		string_concat_object_object = GetMethod (
+			string_type, "Concat", object_object);
+
+		Type [] string_ = { string_type };
+		string_isinterneted_string = GetMethod (
+			string_type, "IsInterned", string_);
+		
+		Type [] runtime_type_handle = { runtime_handle_type };
+		system_type_get_type_from_handle = GetMethod (
+			type_type, "GetTypeFromHandle", runtime_type_handle);
+
+		Type [] delegate_delegate = { delegate_type, delegate_type };
+		delegate_combine_delegate_delegate = GetMethod (
+				delegate_type, "Combine", delegate_delegate);
+
+		delegate_remove_delegate_delegate = GetMethod (
+				delegate_type, "Remove", delegate_delegate);
+
+		//
+		// Void arguments
+		//
+		Type [] void_arg = {  };
+		object_getcurrent_void = GetMethod (
+			ienumerator_type, "get_Current", void_arg);
+		bool_movenext_void = GetMethod (
+			ienumerator_type, "MoveNext", void_arg);
+		void_dispose_void = GetMethod (
+			idisposable_type, "Dispose", void_arg);
+		int_get_offset_to_string_data = GetMethod (
+			runtime_helpers_type, "get_OffsetToStringData", void_arg);
+		int_array_get_length = GetMethod (
+			array_type, "get_Length", void_arg);
+		int_array_get_rank = GetMethod (
+			array_type, "get_Rank", void_arg);
+
+		//
+		// Int32 arguments
+		//
+		Type [] int_arg = { int32_type };
+		int_array_get_length_int = GetMethod (
+			array_type, "GetLength", int_arg);
+		int_array_get_upper_bound_int = GetMethod (
+			array_type, "GetUpperBound", int_arg);
+		int_array_get_lower_bound_int = GetMethod (
+			array_type, "GetLowerBound", int_arg);
+
+		//
+		// System.Array methods
+		//
+		object_array_clone = GetMethod (
+			array_type, "Clone", void_arg);
+		Type [] array_int_arg = { array_type, int32_type };
+		void_array_copyto_array_int = GetMethod (
+			array_type, "CopyTo", array_int_arg);
+		
+		//
+		// object arguments
+		//
+		Type [] object_arg = { object_type };
+		void_monitor_enter_object = GetMethod (
+			monitor_type, "Enter", object_arg);
+		void_monitor_exit_object = GetMethod (
+			monitor_type, "Exit", object_arg);
+
+		Type [] array_field_handle_arg = { array_type, runtime_field_handle_type };
+		
+		void_initializearray_array_fieldhandle = GetMethod (
+			runtime_helpers_type, "InitializeArray", array_field_handle_arg);
+
+		//
+		// Array functions
+		//
+		int_getlength_int = GetMethod (
+			array_type, "GetLength", int_arg);
+
+		//
+		// Decimal constructors
+		//
+		Type [] dec_arg = { int32_type, int32_type, int32_type, bool_type, byte_type };
+		void_decimal_ctor_five_args = GetConstructor (
+			decimal_type, dec_arg);
+		
+		//
+		// Attributes
+		//
+		cons_param_array_attribute = GetConstructor (
+			param_array_type, void_arg);
+
+		unverifiable_code_ctor = GetConstructor (
+			unverifiable_code_type, void_arg);
+		
+	}
+
+	const BindingFlags instance_and_static = BindingFlags.Static | BindingFlags.Instance;
+
+	static Hashtable type_hash = new Hashtable ();
+
+	/// <remarks>
+	///   This is the "old", non-cache based FindMembers() function.  We cannot use
+	///   the cache here because there is no member name argument.
+	/// </remarks>
+	public static MemberList FindMembers (Type t, MemberTypes mt, BindingFlags bf,
+					      MemberFilter filter, object criteria)
+	{
+		DeclSpace decl = (DeclSpace) builder_to_declspace [t];
+
+		//
+		// `builder_to_declspace' contains all dynamic types.
+		//
+		if (decl != null) {
+			MemberList list;
+			Timer.StartTimer (TimerType.FindMembers);
+			list = decl.FindMembers (mt, bf, filter, criteria);
+			Timer.StopTimer (TimerType.FindMembers);
+			return list;
+		}
+
+		//
+		// We have to take care of arrays specially, because GetType on
+		// a TypeBuilder array will return a Type, not a TypeBuilder,
+		// and we can not call FindMembers on this type.
+		//
+		if (t.IsSubclassOf (TypeManager.array_type))
+			return new MemberList (TypeManager.array_type.FindMembers (mt, bf, filter, criteria));
+
+		//
+		// Since FindMembers will not lookup both static and instance
+		// members, we emulate this behaviour here.
+		//
+		if ((bf & instance_and_static) == instance_and_static){
+			MemberInfo [] i_members = t.FindMembers (
+				mt, bf & ~BindingFlags.Static, filter, criteria);
+
+			int i_len = i_members.Length;
+			if (i_len == 1){
+				MemberInfo one = i_members [0];
+
+				//
+				// If any of these are present, we are done!
+				//
+				if ((one is Type) || (one is EventInfo) || (one is FieldInfo))
+					return new MemberList (i_members);
+			}
+				
+			MemberInfo [] s_members = t.FindMembers (
+				mt, bf & ~BindingFlags.Instance, filter, criteria);
+
+			int s_len = s_members.Length;
+			if (i_len > 0 || s_len > 0)
+				return new MemberList (i_members, s_members);
+			else {
+				if (i_len > 0)
+					return new MemberList (i_members);
+				else
+					return new MemberList (s_members);
+			}
+		}
+
+		return new MemberList (t.FindMembers (mt, bf, filter, criteria));
+	}
+
+
+	/// <summary>
+	///   This method is only called from within MemberLookup.  It tries to use the member
+	///   cache if possible and falls back to the normal FindMembers if not.  The `used_cache'
+	///   flag tells the caller whether we used the cache or not.  If we used the cache, then
+	///   our return value will already contain all inherited members and the caller don't need
+	///   to check base classes and interfaces anymore.
+	/// </summary>
+	private static MemberList MemberLookup_FindMembers (Type t, MemberTypes mt, BindingFlags bf,
+							    string name, out bool used_cache)
+	{
+		//
+		// We have to take care of arrays specially, because GetType on
+		// a TypeBuilder array will return a Type, not a TypeBuilder,
+		// and we can not call FindMembers on this type.
+		//
+		if (t.IsSubclassOf (TypeManager.array_type)) {
+			used_cache = true;
+			return TypeHandle.ArrayType.MemberCache.FindMembers (
+				mt, bf, name, FilterWithClosure_delegate, null);
+		}
+
+		//
+		// If this is a dynamic type, it's always in the `builder_to_declspace' hash table
+		// and we can ask the DeclSpace for the MemberCache.
+		//
+		if (t is TypeBuilder) {
+			DeclSpace decl = (DeclSpace) builder_to_declspace [t];
+			MemberCache cache = decl.MemberCache;
+
+			//
+			// If this DeclSpace has a MemberCache, use it.
+			//
+
+			if (cache != null) {
+				used_cache = true;
+				return cache.FindMembers (
+					mt, bf, name, FilterWithClosure_delegate, null);
+			}
+
+			// If there is no MemberCache, we need to use the "normal" FindMembers.
+
+			MemberList list;
+			Timer.StartTimer (TimerType.FindMembers);
+			list = decl.FindMembers (mt, bf | BindingFlags.DeclaredOnly,
+						 FilterWithClosure_delegate, name);
+			Timer.StopTimer (TimerType.FindMembers);
+			used_cache = false;
+			return list;
+		}
+
+		//
+		// This call will always succeed.  There is exactly one TypeHandle instance per
+		// type, TypeHandle.GetTypeHandle() will either return it or create a new one
+		// if it didn't already exist.
+		//
+		TypeHandle handle = TypeHandle.GetTypeHandle (t);
+
+		used_cache = true;
+		return handle.MemberCache.FindMembers (mt, bf, name, FilterWithClosure_delegate, null);
+	}
+
+	public static bool IsBuiltinType (Type t)
+	{
+		if (t == object_type || t == string_type || t == int32_type || t == uint32_type ||
+		    t == int64_type || t == uint64_type || t == float_type || t == double_type ||
+		    t == char_type || t == short_type || t == decimal_type || t == bool_type ||
+		    t == sbyte_type || t == byte_type || t == ushort_type || t == void_type)
+			return true;
+		else
+			return false;
+	}
+
+	public static bool IsDelegateType (Type t)
+	{
+		if (t.IsSubclassOf (TypeManager.delegate_type))
+			return true;
+		else
+			return false;
+	}
+	
+	public static bool IsEnumType (Type t)
+	{
+		if (t.IsSubclassOf (TypeManager.enum_type))
+			return true;
+		else
+			return false;
+	}
+	
+	public static bool IsValueType (Type t)
+	{
+		if (t.IsSubclassOf (TypeManager.value_type))
+			return true;
+		else
+			return false;
+	}
+	
+	public static bool IsInterfaceType (Type t)
+	{
+		Interface iface = builder_to_declspace [t] as Interface;
+
+		if (iface != null)
+			return true;
+		else
+			return false;
+	}
+
+	//
+	// Checks whether `type' is a subclass or nested child of `parent'.
+	//
+	public static bool IsSubclassOrNestedChildOf (Type type, Type parent)
+	{
+		do {
+			if ((type == parent) || type.IsSubclassOf (parent))
+				return true;
+
+			// Handle nested types.
+			type = type.DeclaringType;
+		} while (type != null);
+
+		return false;
+	}
+
+	/// <summary>
+	///   Returns the User Defined Types
+	/// </summary>
+	public static ArrayList UserTypes {
+		get {
+			return user_types;
+		}
+	}
+
+	public static Hashtable TypeContainers {
+		get {
+			return typecontainers;
+		}
+	}
+
+	static Hashtable builder_to_constant;
+
+	public static void RegisterConstant (FieldBuilder fb, Const c)
+	{
+		if (builder_to_constant == null)
+			builder_to_constant = new PtrHashtable ();
+
+		if (builder_to_constant.Contains (fb))
+			return;
+
+		builder_to_constant.Add (fb, c);
+	}
+
+	public static Const LookupConstant (FieldBuilder fb)
+	{
+		if (builder_to_constant == null)
+			return null;
+		
+		return (Const) builder_to_constant [fb];
+	}
+	
+	/// <summary>
+	///   Gigantic work around for missing features in System.Reflection.Emit follows.
+	/// </summary>
+	///
+	/// <remarks>
+	///   Since System.Reflection.Emit can not return MethodBase.GetParameters
+	///   for anything which is dynamic, and we need this in a number of places,
+	///   we register this information here, and use it afterwards.
+	/// </remarks>
+	static public bool RegisterMethod (MethodBase mb, InternalParameters ip, Type [] args)
+	{
+		if (args == null)
+			args = NoTypes;
+				
+		method_arguments.Add (mb, args);
+		method_internal_params.Add (mb, ip);
+		
+		return true;
+	}
+	
+	static public InternalParameters LookupParametersByBuilder (MethodBase mb)
+	{
+		if (! (mb is ConstructorBuilder || mb is MethodBuilder))
+			return null;
+		
+		if (method_internal_params.Contains (mb))
+			return (InternalParameters) method_internal_params [mb];
+		else
+			throw new Exception ("Argument for Method not registered" + mb);
+	}
+
+	/// <summary>
+	///    Returns the argument types for a method based on its methodbase
+	///
+	///    For dynamic methods, we use the compiler provided types, for
+	///    methods from existing assemblies we load them from GetParameters,
+	///    and insert them into the cache
+	/// </summary>
+	static public Type [] GetArgumentTypes (MethodBase mb)
+	{
+		if (method_arguments.Contains (mb))
+			return (Type []) method_arguments [mb];
+		else {
+			ParameterInfo [] pi = mb.GetParameters ();
+			int c = pi.Length;
+			Type [] types = new Type [c];
+			
+			for (int i = 0; i < c; i++)
+				types [i] = pi [i].ParameterType;
+
+			method_arguments.Add (mb, types);
+			return types;
+		}
+	}
+
+	/// <summary>
+	///    Returns the argument types for an indexer based on its PropertyInfo
+	///
+	///    For dynamic indexers, we use the compiler provided types, for
+	///    indexers from existing assemblies we load them from GetParameters,
+	///    and insert them into the cache
+	/// </summary>
+	static public Type [] GetArgumentTypes (PropertyInfo indexer)
+	{
+		if (indexer_arguments.Contains (indexer))
+			return (Type []) indexer_arguments [indexer];
+		else if (indexer is PropertyBuilder)
+			// If we're a PropertyBuilder and not in the
+			// `indexer_arguments' hash, then we're a property and
+			// not an indexer.
+			return NoTypes;
+		else {
+			ParameterInfo [] pi = indexer.GetIndexParameters ();
+			// Property, not an indexer.
+			if (pi == null)
+				return NoTypes;
+			int c = pi.Length;
+			Type [] types = new Type [c];
+			
+			for (int i = 0; i < c; i++)
+				types [i] = pi [i].ParameterType;
+
+			indexer_arguments.Add (indexer, types);
+			return types;
+		}
+	}
+	
+	// <remarks>
+	//  This is a workaround the fact that GetValue is not
+	//  supported for dynamic types
+	// </remarks>
+	static Hashtable fields = new Hashtable ();
+	static public bool RegisterFieldValue (FieldBuilder fb, object value)
+	{
+		if (fields.Contains (fb))
+			return false;
+
+		fields.Add (fb, value);
+
+		return true;
+	}
+
+	static public object GetValue (FieldBuilder fb)
+	{
+		return fields [fb];
+	}
+
+	static Hashtable fieldbuilders_to_fields = new Hashtable ();
+	static public bool RegisterFieldBase (FieldBuilder fb, FieldBase f)
+	{
+		if (fieldbuilders_to_fields.Contains (fb))
+			return false;
+
+		fieldbuilders_to_fields.Add (fb, f);
+		return true;
+	}
+
+	static public FieldBase GetField (FieldInfo fb)
+	{
+		return (FieldBase) fieldbuilders_to_fields [fb];
+	}
+	
+	static Hashtable events;
+
+	static public bool RegisterEvent (MyEventBuilder eb, MethodBase add, MethodBase remove)
+	{
+		if (events == null)
+			events = new Hashtable ();
+
+		if (events.Contains (eb))
+			return false;
+
+		events.Add (eb, new Pair (add, remove));
+
+		return true;
+	}
+
+	static public MethodInfo GetAddMethod (EventInfo ei)
+	{
+		if (ei is MyEventBuilder) {
+			Pair pair = (Pair) events [ei];
+
+			return (MethodInfo) pair.First;
+		} else
+			return ei.GetAddMethod ();
+	}
+
+	static public MethodInfo GetRemoveMethod (EventInfo ei)
+	{
+		if (ei is MyEventBuilder) {
+			Pair pair = (Pair) events [ei];
+
+			return (MethodInfo) pair.Second;
+		} else
+			return ei.GetAddMethod ();
+	}
+
+	static Hashtable priv_fields_events;
+
+	static public bool RegisterPrivateFieldOfEvent (EventInfo einfo, FieldBuilder builder)
+	{
+		if (priv_fields_events == null)
+			priv_fields_events = new Hashtable ();
+
+		if (priv_fields_events.Contains (einfo))
+			return false;
+
+		priv_fields_events.Add (einfo, builder);
+
+		return true;
+	}
+
+	static public MemberInfo GetPrivateFieldOfEvent (EventInfo ei)
+	{
+		return (MemberInfo) priv_fields_events [ei];
+	}
+		
+	static Hashtable properties;
+	
+	static public bool RegisterProperty (PropertyBuilder pb, MethodBase get, MethodBase set)
+	{
+		if (properties == null)
+			properties = new Hashtable ();
+
+		if (properties.Contains (pb))
+			return false;
+
+		properties.Add (pb, new Pair (get, set));
+
+		return true;
+	}
+
+	static public bool RegisterIndexer (PropertyBuilder pb, MethodBase get, MethodBase set, Type[] args)
+	{
+		if (!RegisterProperty (pb, get,set))
+			return false;
+
+		indexer_arguments.Add (pb, args);
+
+		return true;
+	}
+
+	//
+	// FIXME: we need to return the accessors depending on whether
+	// they are visible or not.
+	//
+	static public MethodInfo [] GetAccessors (PropertyInfo pi)
+	{
+		MethodInfo [] ret;
+
+		if (pi is PropertyBuilder){
+			Pair pair = (Pair) properties [pi];
+
+			ret = new MethodInfo [2];
+			ret [0] = (MethodInfo) pair.First;
+			ret [1] = (MethodInfo) pair.Second;
+
+			return ret;
+		} else {
+			MethodInfo [] mi = new MethodInfo [2];
+
+			//
+			// Why this and not pi.GetAccessors?
+			// Because sometimes index 0 is the getter
+			// sometimes it is 1
+			//
+			mi [0] = pi.GetGetMethod (true);
+			mi [1] = pi.GetSetMethod (true);
+
+			return mi;
+		}
+	}
+
+	static public MethodInfo GetPropertyGetter (PropertyInfo pi)
+	{
+		if (pi is PropertyBuilder){
+			Pair de = (Pair) properties [pi];
+
+			return (MethodInfo) de.Second;
+		} else
+			return pi.GetSetMethod ();
+	}
+
+	static public MethodInfo GetPropertySetter (PropertyInfo pi)
+	{
+		if (pi is PropertyBuilder){
+			Pair de = (Pair) properties [pi];
+
+			return (MethodInfo) de.First;
+		} else
+			return pi.GetGetMethod ();
+	}
+
+	/// <summary>
+	///   Given an array of interface types, expand and eliminate repeated ocurrences
+	///   of an interface.  
+	/// </summary>
+	///
+	/// <remarks>
+	///   This expands in context like: IA; IB : IA; IC : IA, IB; the interface "IC" to
+	///   be IA, IB, IC.
+	/// </remarks>
+	public static Type [] ExpandInterfaces (Type [] base_interfaces)
+	{
+		ArrayList new_ifaces = new ArrayList ();
+		
+		foreach (Type iface in base_interfaces){
+			if (!new_ifaces.Contains (iface))
+				new_ifaces.Add (iface);
+			
+			Type [] implementing = TypeManager.GetInterfaces (iface);
+			
+			foreach (Type imp in implementing){
+				if (!new_ifaces.Contains (imp))
+					new_ifaces.Add (imp);
+			}
+		}
+		Type [] ret = new Type [new_ifaces.Count];
+		new_ifaces.CopyTo (ret, 0);
+		return ret;
+	}
+		
+	/// <summary>
+	///   This function returns the interfaces in the type `t'.  Works with
+	///   both types and TypeBuilders.
+	/// </summary>
+	public static Type [] GetInterfaces (Type t)
+	{
+		//
+		// The reason for catching the Array case is that Reflection.Emit
+		// will not return a TypeBuilder for Array types of TypeBuilder types,
+		// but will still throw an exception if we try to call GetInterfaces
+		// on the type.
+		//
+		// Since the array interfaces are always constant, we return those for
+		// the System.Array
+		//
+		
+		if (t.IsArray)
+			t = TypeManager.array_type;
+		
+		if (t is TypeBuilder){
+			Type [] parent_ifaces;
+			
+			if (t.BaseType == null)
+				parent_ifaces = NoTypes;
+			else
+				parent_ifaces = GetInterfaces (t.BaseType);
+			Type [] type_ifaces = (Type []) builder_to_ifaces [t];
+			if (type_ifaces == null)
+				type_ifaces = NoTypes;
+
+			int parent_count = parent_ifaces.Length;
+			Type [] result = new Type [parent_count + type_ifaces.Length];
+			parent_ifaces.CopyTo (result, 0);
+			type_ifaces.CopyTo (result, parent_count);
+
+			return result;
+		} else
+			return t.GetInterfaces ();
+	}
+	
+	/// <remarks>
+	///  The following is used to check if a given type implements an interface.
+	///  The cache helps us reduce the expense of hitting Type.GetInterfaces everytime.
+	/// </remarks>
+	public static bool ImplementsInterface (Type t, Type iface)
+	{
+		Type [] interfaces;
+
+		//
+		// FIXME OPTIMIZATION:
+		// as soon as we hit a non-TypeBuiler in the interface
+		// chain, we could return, as the `Type.GetInterfaces'
+		// will return all the interfaces implement by the type
+		// or its parents.
+		//
+		do {
+			interfaces = GetInterfaces (t);
+
+			if (interfaces != null){
+				foreach (Type i in interfaces){
+					if (i == iface)
+						return true;
+				}
+			}
+			
+			t = t.BaseType;
+		} while (t != null);
+		
+		return false;
+	}
+
+	// This is a custom version of Convert.ChangeType() which works
+	// with the TypeBuilder defined types when compiling corlib.
+	public static object ChangeType (object value, Type conversionType)
+	{
+		if (!(value is IConvertible))
+			throw new ArgumentException ();
+
+		IConvertible convertValue = (IConvertible) value;
+		CultureInfo ci = CultureInfo.CurrentCulture;
+		NumberFormatInfo provider = ci.NumberFormat;
+
+		//
+		// We must use Type.Equals() here since `conversionType' is
+		// the TypeBuilder created version of a system type and not
+		// the system type itself.  You cannot use Type.GetTypeCode()
+		// on such a type - it'd always return TypeCode.Object.
+		//
+		if (conversionType.Equals (typeof (Boolean)))
+			return (object)(convertValue.ToBoolean (provider));
+		else if (conversionType.Equals (typeof (Byte)))
+			return (object)(convertValue.ToByte (provider));
+		else if (conversionType.Equals (typeof (Char)))
+			return (object)(convertValue.ToChar (provider));
+		else if (conversionType.Equals (typeof (DateTime)))
+			return (object)(convertValue.ToDateTime (provider));
+		else if (conversionType.Equals (typeof (Decimal)))
+			return (object)(convertValue.ToDecimal (provider));
+		else if (conversionType.Equals (typeof (Double)))
+			return (object)(convertValue.ToDouble (provider));
+		else if (conversionType.Equals (typeof (Int16)))
+			return (object)(convertValue.ToInt16 (provider));
+		else if (conversionType.Equals (typeof (Int32)))
+			return (object)(convertValue.ToInt32 (provider));
+		else if (conversionType.Equals (typeof (Int64)))
+			return (object)(convertValue.ToInt64 (provider));
+		else if (conversionType.Equals (typeof (SByte)))
+			return (object)(convertValue.ToSByte (provider));
+		else if (conversionType.Equals (typeof (Single)))
+			return (object)(convertValue.ToSingle (provider));
+		else if (conversionType.Equals (typeof (String)))
+			return (object)(convertValue.ToString (provider));
+		else if (conversionType.Equals (typeof (UInt16)))
+			return (object)(convertValue.ToUInt16 (provider));
+		else if (conversionType.Equals (typeof (UInt32)))
+			return (object)(convertValue.ToUInt32 (provider));
+		else if (conversionType.Equals (typeof (UInt64)))
+			return (object)(convertValue.ToUInt64 (provider));
+		else if (conversionType.Equals (typeof (Object)))
+			return (object)(value);
+		else 
+			throw new InvalidCastException ();
+	}
+
+	//
+	// This is needed, because enumerations from assemblies
+	// do not report their underlyingtype, but they report
+	// themselves
+	//
+	public static Type EnumToUnderlying (Type t)
+	{
+		if (t == TypeManager.enum_type)
+			return t;
+
+		t = t.UnderlyingSystemType;
+		if (!TypeManager.IsEnumType (t))
+			return t;
+	
+		if (t is TypeBuilder) {
+			// slow path needed to compile corlib
+			if (t == TypeManager.bool_type ||
+					t == TypeManager.byte_type ||
+					t == TypeManager.sbyte_type ||
+					t == TypeManager.char_type ||
+					t == TypeManager.short_type ||
+					t == TypeManager.ushort_type ||
+					t == TypeManager.int32_type ||
+					t == TypeManager.uint32_type ||
+					t == TypeManager.int64_type ||
+					t == TypeManager.uint64_type)
+				return t;
+			throw new Exception ("Unhandled typecode in enum " + " from " + t.AssemblyQualifiedName);
+		}
+		TypeCode tc = Type.GetTypeCode (t);
+
+		switch (tc){
+		case TypeCode.Boolean:
+			return TypeManager.bool_type;
+		case TypeCode.Byte:
+			return TypeManager.byte_type;
+		case TypeCode.SByte:
+			return TypeManager.sbyte_type;
+		case TypeCode.Char:
+			return TypeManager.char_type;
+		case TypeCode.Int16:
+			return TypeManager.short_type;
+		case TypeCode.UInt16:
+			return TypeManager.ushort_type;
+		case TypeCode.Int32:
+			return TypeManager.int32_type;
+		case TypeCode.UInt32:
+			return TypeManager.uint32_type;
+		case TypeCode.Int64:
+			return TypeManager.int64_type;
+		case TypeCode.UInt64:
+			return TypeManager.uint64_type;
+		}
+		throw new Exception ("Unhandled typecode in enum " + tc + " from " + t.AssemblyQualifiedName);
+	}
+
+	//
+	// When compiling corlib and called with one of the core types, return
+	// the corresponding typebuilder for that type.
+	//
+	public static Type TypeToCoreType (Type t)
+	{
+		if (RootContext.StdLib || (t is TypeBuilder))
+			return t;
+
+		TypeCode tc = Type.GetTypeCode (t);
+
+		switch (tc){
+		case TypeCode.Boolean:
+			return TypeManager.bool_type;
+		case TypeCode.Byte:
+			return TypeManager.byte_type;
+		case TypeCode.SByte:
+			return TypeManager.sbyte_type;
+		case TypeCode.Char:
+			return TypeManager.char_type;
+		case TypeCode.Int16:
+			return TypeManager.short_type;
+		case TypeCode.UInt16:
+			return TypeManager.ushort_type;
+		case TypeCode.Int32:
+			return TypeManager.int32_type;
+		case TypeCode.UInt32:
+			return TypeManager.uint32_type;
+		case TypeCode.Int64:
+			return TypeManager.int64_type;
+		case TypeCode.UInt64:
+			return TypeManager.uint64_type;
+		case TypeCode.String:
+			return TypeManager.string_type;
+		default:
+			if (t == typeof (void))
+				return TypeManager.void_type;
+			if (t == typeof (object))
+				return TypeManager.object_type;
+			if (t == typeof (System.Type))
+				return TypeManager.type_type;
+			return t;
+		}
+	}
+
+	/// <summary>
+	///   Utility function that can be used to probe whether a type
+	///   is managed or not.  
+	/// </summary>
+	public static bool VerifyUnManaged (Type t, Location loc)
+	{
+		if (t.IsValueType || t.IsPointer){
+			//
+			// FIXME: this is more complex, we actually need to
+			// make sure that the type does not contain any
+			// classes itself
+			//
+			return true;
+		}
+
+		if (!RootContext.StdLib && (t == TypeManager.decimal_type))
+			// We need this explicit check here to make it work when
+			// compiling corlib.
+			return true;
+
+		Report.Error (
+			208, loc,
+			"Cannot take the address or size of a variable of a managed type ('" +
+			CSharpName (t) + "')");
+		return false;	
+	}
+	
+	/// <summary>
+	///   Returns the name of the indexer in a given type.
+	/// </summary>
+	/// <remarks>
+	///   The default is not always `Item'.  The user can change this behaviour by
+	///   using the DefaultMemberAttribute in the class.
+	///
+	///   For example, the String class indexer is named `Chars' not `Item' 
+	/// </remarks>
+	public static string IndexerPropertyName (Type t)
+	{
+		if (t is TypeBuilder) {
+			if (t.IsInterface) {
+				Interface i = LookupInterface (t);
+
+				if ((i == null) || (i.IndexerName == null))
+					return "Item";
+
+				return i.IndexerName;
+			} else {
+				TypeContainer tc = LookupTypeContainer (t);
+
+				if ((tc == null) || (tc.IndexerName == null))
+					return "Item";
+
+				return tc.IndexerName;
+			}
+		}
+		
+		System.Attribute attr = System.Attribute.GetCustomAttribute (
+			t, TypeManager.default_member_type);
+		if (attr != null){
+			DefaultMemberAttribute dma = (DefaultMemberAttribute) attr;
+			return dma.MemberName;
+		}
+
+		return "Item";
+	}
+
+	public static void MakePinned (LocalBuilder builder)
+	{
+		//
+		// FIXME: Flag the "LocalBuilder" type as being
+		// pinned.  Figure out API.
+		//
+	}
+
+
+	//
+	// Returns whether the array of memberinfos contains the given method
+	//
+	static bool ArrayContainsMethod (MemberInfo [] array, MethodBase new_method)
+	{
+		Type [] new_args = TypeManager.GetArgumentTypes (new_method);
+		
+		foreach (MethodBase method in array){
+			if (method.Name != new_method.Name)
+				continue;
+			
+			Type [] old_args = TypeManager.GetArgumentTypes (method);
+			int old_count = old_args.Length;
+			int i;
+			
+			if (new_args.Length != old_count)
+				continue;
+			
+			for (i = 0; i < old_count; i++){
+				if (old_args [i] != new_args [i])
+					break;
+			}
+			if (i != old_count)
+				continue;
+
+			return true;
+		}
+		return false;
+	}
+	
+	//
+	// We copy methods from `new_members' into `target_list' if the signature
+	// for the method from in the new list does not exist in the target_list
+	//
+	// The name is assumed to be the same.
+	//
+	public static ArrayList CopyNewMethods (ArrayList target_list, MemberList new_members)
+	{
+		if (target_list == null){
+			target_list = new ArrayList ();
+
+			foreach (MemberInfo mi in new_members){
+				if (mi is MethodBase)
+					target_list.Add (mi);
+			}
+			return target_list;
+		}
+		
+		MemberInfo [] target_array = new MemberInfo [target_list.Count];
+		target_list.CopyTo (target_array, 0);
+		
+		foreach (MemberInfo mi in new_members){
+			MethodBase new_method = (MethodBase) mi;
+			
+			if (!ArrayContainsMethod (target_array, new_method))
+				target_list.Add (new_method);
+		}
+		return target_list;
+	}
+
+	[Flags]
+	public enum MethodFlags {
+		IsObsolete = 1,
+		IsObsoleteError = 2,
+		ShouldIgnore = 3
+	}
+	
+	//
+	// Returns the TypeManager.MethodFlags for this method.
+	// This emits an error 619 / warning 618 if the method is obsolete.
+	// In the former case, TypeManager.MethodFlags.IsObsoleteError is returned.
+	//
+	static public MethodFlags GetMethodFlags (MethodBase mb, Location loc)
+	{
+		MethodFlags flags = 0;
+		
+		if (mb.DeclaringType is TypeBuilder){
+			MethodData method = (MethodData) builder_to_method [mb];
+			if (method == null) {
+				// FIXME: implement Obsolete attribute on Property,
+				//        Indexer and Event.
+				return 0;
+			}
+
+			return method.GetMethodFlags (loc);
+		}
+
+		object [] attrs = mb.GetCustomAttributes (true);
+		foreach (object ta in attrs){
+			if (!(ta is System.Attribute)){
+				Console.WriteLine ("Unknown type in GetMethodFlags: " + ta);
+				continue;
+			}
+			System.Attribute a = (System.Attribute) ta;
+			if (a.TypeId == TypeManager.obsolete_attribute_type){
+				ObsoleteAttribute oa = (ObsoleteAttribute) a;
+
+				string method_desc = TypeManager.CSharpSignature (mb);
+
+				if (oa.IsError) {
+					Report.Error (619, loc, "Method `" + method_desc +
+						      "' is obsolete: `" + oa.Message + "'");
+					return MethodFlags.IsObsoleteError;
+				} else
+					Report.Warning (618, loc, "Method `" + method_desc +
+							"' is obsolete: `" + oa.Message + "'");
+
+				flags |= MethodFlags.IsObsolete;
+
+				continue;
+			}
+			
+			//
+			// Skip over conditional code.
+			//
+			if (a.TypeId == TypeManager.conditional_attribute_type){
+				ConditionalAttribute ca = (ConditionalAttribute) a;
+
+				if (RootContext.AllDefines [ca.ConditionString] == null)
+					flags |= MethodFlags.ShouldIgnore;
+			}
+		}
+
+		return flags;
+	}
+	
+#region MemberLookup implementation
+	
+	//
+	// Name of the member
+	//
+	static string   closure_name;
+
+	//
+	// Whether we allow private members in the result (since FindMembers
+	// uses NonPublic for both protected and private), we need to distinguish.
+	//
+	static bool     closure_private_ok;
+
+	//
+	// Who is invoking us and which type is being queried currently.
+	//
+	static Type     closure_invocation_type;
+	static Type     closure_queried_type;
+	static Type     closure_start_type;
+
+	//
+	// The assembly that defines the type is that is calling us
+	//
+	static Assembly closure_invocation_assembly;
+
+	//
+	// This filter filters by name + whether it is ok to include private
+	// members in the search
+	//
+	static internal bool FilterWithClosure (MemberInfo m, object filter_criteria)
+	{
+		//
+		// Hack: we know that the filter criteria will always be in the `closure'
+		// fields. 
+		//
+
+		if ((filter_criteria != null) && (m.Name != (string) filter_criteria))
+				return false;
+
+		if (closure_start_type == closure_invocation_type)
+			return true;
+
+		//
+		// Ugly: we need to find out the type of `m', and depending
+		// on this, tell whether we accept or not
+		//
+		if (m is MethodBase){
+			MethodBase mb = (MethodBase) m;
+			MethodAttributes ma = mb.Attributes & MethodAttributes.MemberAccessMask;
+
+			if (ma == MethodAttributes.Private)
+				return closure_private_ok || (closure_invocation_type == m.DeclaringType);
+
+			//
+			// FamAndAssem requires that we not only derivate, but we are on the
+			// same assembly.  
+			//
+			if (ma == MethodAttributes.FamANDAssem){
+				if (closure_invocation_assembly != mb.DeclaringType.Assembly)
+					return false;
+			}
+
+			// Assembly and FamORAssem succeed if we're in the same assembly.
+			if ((ma == MethodAttributes.Assembly) || (ma == MethodAttributes.FamORAssem)){
+				if (closure_invocation_assembly == mb.DeclaringType.Assembly)
+					return true;
+			}
+
+			// We already know that we aren't in the same assembly.
+			if (ma == MethodAttributes.Assembly)
+				return false;
+
+			// Family and FamANDAssem require that we derive.
+			if ((ma == MethodAttributes.Family) || (ma == MethodAttributes.FamANDAssem)){
+				if (closure_invocation_type == null)
+					return false;
+
+				if (!IsSubclassOrNestedChildOf (closure_invocation_type, mb.DeclaringType))
+					return false;
+
+				// Although a derived class can access protected members of its base class
+				// it cannot do so through an instance of the base class (CS1540).
+				if ((closure_invocation_type != closure_start_type) &&
+				    closure_invocation_type.IsSubclassOf (closure_start_type))
+					return false;
+
+				return true;
+			}
+
+			// Public.
+			return true;
+		}
+
+		if (m is FieldInfo){
+			FieldInfo fi = (FieldInfo) m;
+			FieldAttributes fa = fi.Attributes & FieldAttributes.FieldAccessMask;
+
+			if (fa == FieldAttributes.Private)
+				return closure_private_ok || (closure_invocation_type == m.DeclaringType);
+
+			//
+			// FamAndAssem requires that we not only derivate, but we are on the
+			// same assembly.  
+			//
+			if (fa == FieldAttributes.FamANDAssem){
+				if (closure_invocation_assembly != fi.DeclaringType.Assembly)
+					return false;
+			}
+
+			// Assembly and FamORAssem succeed if we're in the same assembly.
+			if ((fa == FieldAttributes.Assembly) || (fa == FieldAttributes.FamORAssem)){
+				if (closure_invocation_assembly == fi.DeclaringType.Assembly)
+					return true;
+			}
+
+			// We already know that we aren't in the same assembly.
+			if (fa == FieldAttributes.Assembly)
+				return false;
+
+			// Family and FamANDAssem require that we derive.
+			if ((fa == FieldAttributes.Family) || (fa == FieldAttributes.FamANDAssem)){
+				if (closure_invocation_type == null)
+					return false;
+
+				if (!IsSubclassOrNestedChildOf (closure_invocation_type, fi.DeclaringType))
+					return false;
+
+				// Although a derived class can access protected members of its base class
+				// it cannot do so through an instance of the base class (CS1540).
+				if ((closure_invocation_type != closure_start_type) &&
+				    closure_invocation_type.IsSubclassOf (closure_start_type))
+					return false;
+
+				return true;
+			}
+
+			// Public.
+			return true;
+		}
+
+		//
+		// EventInfos and PropertyInfos, return true
+		//
+		return true;
+	}
+
+	static MemberFilter FilterWithClosure_delegate = new MemberFilter (FilterWithClosure);
+
+	//
+	// Looks up a member called `name' in the `queried_type'.  This lookup
+	// is done by code that is contained in the definition for `invocation_type'.
+	//
+	// The binding flags are `bf' and the kind of members being looked up are `mt'
+	//
+	// Returns an array of a single element for everything but Methods/Constructors
+	// that might return multiple matches.
+	//
+	public static MemberInfo [] MemberLookup (Type invocation_type, Type queried_type, 
+						  MemberTypes mt, BindingFlags original_bf, string name)
+	{
+		Timer.StartTimer (TimerType.MemberLookup);
+
+		MemberInfo[] retval = RealMemberLookup (invocation_type, queried_type,
+							mt, original_bf, name);
+
+		Timer.StopTimer (TimerType.MemberLookup);
+
+		return retval;
+	}
+
+	static MemberInfo [] RealMemberLookup (Type invocation_type, Type queried_type, 
+					       MemberTypes mt, BindingFlags original_bf, string name)
+	{
+		BindingFlags bf = original_bf;
+		
+		ArrayList method_list = null;
+		Type current_type = queried_type;
+		bool searching = (original_bf & BindingFlags.DeclaredOnly) == 0;
+		bool private_ok;
+		bool always_ok_flag = false;
+		bool skip_iface_check = true, used_cache = false;
+
+		closure_name = name;
+		closure_invocation_type = invocation_type;
+		closure_invocation_assembly = invocation_type != null ? invocation_type.Assembly : null;
+		closure_start_type = queried_type;
+
+		//
+		// If we are a nested class, we always have access to our container
+		// type names
+		//
+		if (invocation_type != null){
+			string invocation_name = invocation_type.FullName;
+			if (invocation_name.IndexOf ('+') != -1){
+				string container = queried_type.FullName + "+";
+				int container_length = container.Length;
+				
+				if (invocation_name.Length > container_length){
+					string shared = invocation_name.Substring (0, container_length);
+				
+					if (shared == container)
+						always_ok_flag = true;
+				}
+			}
+		}
+		
+		do {
+			MemberList list;
+
+			//
+			// `NonPublic' is lame, because it includes both protected and
+			// private methods, so we need to control this behavior by
+			// explicitly tracking if a private method is ok or not.
+			//
+			// The possible cases are:
+			//    public, private and protected (internal does not come into the
+			//    equation)
+			//
+			if (invocation_type != null){
+				if (invocation_type == current_type){
+					private_ok = true;
+				} else
+					private_ok = always_ok_flag;
+				
+				if (private_ok || invocation_type.IsSubclassOf (current_type))
+					bf = original_bf | BindingFlags.NonPublic;
+			} else {
+				private_ok = false;
+				bf = original_bf & ~BindingFlags.NonPublic;
+			}
+
+			closure_private_ok = private_ok;
+			closure_queried_type = current_type;
+
+			Timer.StopTimer (TimerType.MemberLookup);
+
+			list = MemberLookup_FindMembers (current_type, mt, bf, name, out used_cache);
+
+			Timer.StartTimer (TimerType.MemberLookup);
+
+			//
+			// When queried for an interface type, the cache will automatically check all
+			// inherited members, so we don't need to do this here.  However, this only
+			// works if we already used the cache in the first iteration of this loop.
+			//
+			// If we used the cache in any further iteration, we can still terminate the
+			// loop since the cache always looks in all parent classes.
+			//
+
+			if (used_cache)
+				searching = false;
+			else
+				skip_iface_check = false;
+
+			if (current_type == TypeManager.object_type)
+				searching = false;
+			else {
+				current_type = current_type.BaseType;
+				
+				//
+				// This happens with interfaces, they have a null
+				// basetype.  Look members up in the Object class.
+				//
+				if (current_type == null)
+					current_type = TypeManager.object_type;
+			}
+			
+			if (list.Count == 0)
+				continue;
+			
+			//
+			// Events and types are returned by both `static' and `instance'
+			// searches, which means that our above FindMembers will
+			// return two copies of the same.
+			//
+			if (list.Count == 1 && !(list [0] is MethodBase)){
+				return (MemberInfo []) list;
+			}
+
+			//
+			// Multiple properties: we query those just to find out the indexer
+			// name
+			//
+			if (list [0] is PropertyInfo)
+				return (MemberInfo []) list;
+
+			//
+			// We found methods, turn the search into "method scan"
+			// mode.
+			//
+			
+			method_list = CopyNewMethods (method_list, list);
+			mt &= (MemberTypes.Method | MemberTypes.Constructor);
+		} while (searching);
+
+		if (method_list != null && method_list.Count > 0)
+			return (MemberInfo []) method_list.ToArray (typeof (MemberInfo));
+
+		//
+		// This happens if we already used the cache in the first iteration, in this case
+		// the cache already looked in all interfaces.
+		//
+		if (skip_iface_check)
+			return null;
+
+		//
+		// Interfaces do not list members they inherit, so we have to
+		// scan those.
+		// 
+		if (!queried_type.IsInterface)
+			return null;
+
+		if (queried_type.IsArray)
+			queried_type = TypeManager.array_type;
+		
+		Type [] ifaces = GetInterfaces (queried_type);
+		if (ifaces == null)
+			return null;
+		
+		foreach (Type itype in ifaces){
+			MemberInfo [] x;
+
+			x = MemberLookup (null, itype, mt, bf, name);
+			if (x != null)
+				return x;
+		}
+					
+		return null;
+	}
+#endregion
+	
+}
+
+/// <summary>
+///   There is exactly one instance of this class per type.
+/// </summary>
+public sealed class TypeHandle : IMemberContainer {
+	public readonly TypeHandle BaseType;
+
+	readonly int id = ++next_id;
+	static int next_id = 0;
+
+	/// <summary>
+	///   Lookup a TypeHandle instance for the given type.  If the type doesn't have
+	///   a TypeHandle yet, a new instance of it is created.  This static method
+	///   ensures that we'll only have one TypeHandle instance per type.
+	/// </summary>
+	public static TypeHandle GetTypeHandle (Type t)
+	{
+		TypeHandle handle = (TypeHandle) type_hash [t];
+		if (handle != null)
+			return handle;
+
+		handle = new TypeHandle (t);
+		type_hash.Add (t, handle);
+		return handle;
+	}
+
+	/// <summary>
+	///   Returns the TypeHandle for TypeManager.object_type.
+	/// </summary>
+	public static IMemberContainer ObjectType {
+		get {
+			if (object_type != null)
+				return object_type;
+
+			object_type = GetTypeHandle (TypeManager.object_type);
+
+			return object_type;
+		}
+	}
+
+	/// <summary>
+	///   Returns the TypeHandle for TypeManager.array_type.
+	/// </summary>
+	public static IMemberContainer ArrayType {
+		get {
+			if (array_type != null)
+				return array_type;
+
+			array_type = GetTypeHandle (TypeManager.array_type);
+
+			return array_type;
+		}
+	}
+
+	private static PtrHashtable type_hash = new PtrHashtable ();
+
+	private static TypeHandle object_type = null;
+	private static TypeHandle array_type = null;
+
+	private Type type;
+	private bool is_interface;
+	private MemberCache member_cache;
+
+	private TypeHandle (Type type)
+	{
+		this.type = type;
+		if (type.BaseType != null)
+			BaseType = GetTypeHandle (type.BaseType);
+		else if ((type != TypeManager.object_type) && (type != typeof (object)))
+			is_interface = true;
+		this.member_cache = new MemberCache (this);
+	}
+
+	// IMemberContainer methods
+
+	public string Name {
+		get {
+			return type.FullName;
+		}
+	}
+
+	public Type Type {
+		get {
+			return type;
+		}
+	}
+
+	public IMemberContainer Parent {
+		get {
+			return BaseType;
+		}
+	}
+
+	public bool IsInterface {
+		get {
+			return is_interface;
+		}
+	}
+
+	public MemberList GetMembers (MemberTypes mt, BindingFlags bf)
+	{
+		if (mt == MemberTypes.Event)
+			return new MemberList (type.GetEvents (bf | BindingFlags.DeclaredOnly));
+		else
+			return new MemberList (type.FindMembers (mt, bf | BindingFlags.DeclaredOnly,
+								 null, null));
+	}
+
+	// IMemberFinder methods
+
+	public MemberList FindMembers (MemberTypes mt, BindingFlags bf, string name,
+				       MemberFilter filter, object criteria)
+	{
+		return member_cache.FindMembers (mt, bf, name, filter, criteria);
+	}
+
+	public MemberCache MemberCache {
+		get {
+			return member_cache;
+		}
+	}
+
+	public override string ToString ()
+	{
+		if (BaseType != null)
+			return "TypeHandle (" + id + "," + Name + " : " + BaseType + ")";
+		else
+			return "TypeHandle (" + id + "," + Name + ")";
+	}
+}
+
+}
diff --git a/mcs/monoresgen/ChangeLog b/mcs/monoresgen/ChangeLog
new file mode 100755
index 00000000000..e867dc9ffad
--- /dev/null
+++ b/mcs/monoresgen/ChangeLog
@@ -0,0 +1,8 @@
+2002-08-19  Dick Porter  <dick@ximian.com>
+
+	* monoresgen.cs: Added ';' as a text format comment char
+
+Wed Aug 7 15:51:54 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monoresgen.cs: added the Mono implementation of resgen.
+
diff --git a/mcs/monoresgen/makefile.gnu b/mcs/monoresgen/makefile.gnu
new file mode 100755
index 00000000000..9cdc08e13e9
--- /dev/null
+++ b/mcs/monoresgen/makefile.gnu
@@ -0,0 +1,16 @@
+MCS = mcs
+MCS_FLAGS = /target:exe $(MCS_DEFINES)
+INSTALL = /usr/bin/install
+prefix = /usr
+
+SOURCES=monoresgen.cs
+
+all: monoresgen.exe
+
+monoresgen.exe: $(SOURCES)
+	$(MCS) $(MCS_FLAGS) -o $@ $(SOURCES)
+
+install: all
+	mkdir -p $(prefix)/bin/
+	$(INSTALL) -m 755 monoresgen.exe $(prefix)/bin/
+
diff --git a/mcs/monoresgen/monoresgen.cs b/mcs/monoresgen/monoresgen.cs
new file mode 100755
index 00000000000..e6dfbfcf914
--- /dev/null
+++ b/mcs/monoresgen/monoresgen.cs
@@ -0,0 +1,207 @@
+/*
+ * monoresgen: convert between the resource formats (.txt, .resources, .resx).
+ *
+ * Copyright (c) 2002 Ximian, Inc
+ *
+ * Author: Paolo Molaro (lupus@ximian.com)
+ */
+
+/*
+ * TODO:
+ * * escape/unescape in the .txt reader/writer to be able to roundtrip values with newlines
+ *   (unlike the MS ResGen utility)
+ * * add .po format to help traslators on unixy systems
+ */
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Resources;
+using System.Reflection;
+
+class ResGen {
+
+	static Assembly swf;
+	static Type resxr;
+	static Type resxw;
+
+	/*
+	 * We load the ResX format stuff on demand, since the classes are in 
+	 * System.Windows.Forms (!!!) and we can't depend on that assembly in mono, yet.
+	 */
+	static void LoadResX () {
+		if (swf != null)
+			return;
+		try {
+			swf = Assembly.LoadWithPartialName ("System.Windows.Forms");
+			resxr = swf.GetType ("System.Resources.ResXResourceReader");
+			resxw = swf.GetType ("System.Resources.ResXResourceWriter");
+		} catch (Exception e) {
+			throw new Exception ("Cannot load support for ResX format: " + e.Message);
+		}
+	}
+
+	static void Usage () {
+		Console.WriteLine ("Mono Resource Generator version 0.1");
+		Console.WriteLine ("Usage:");
+		Console.WriteLine ("\tmonoresgen source.ext [dest.ext]");
+		Console.WriteLine ();
+		Console.WriteLine ("Convert a resource file from one format to another.");
+		Console.WriteLine ("The currently supported formats are: '.txt' '.resources' '.resx'.");
+		Console.WriteLine ("If the destination file is not specified, source.resources will be used.");
+	}
+	
+	static IResourceReader GetReader (Stream stream, string name) {
+		string format = Path.GetExtension (name);
+		switch (format.ToLower ()) {
+		case ".txt":
+		case ".text":
+			return new TxtResourceReader (stream);
+		case ".resources":
+			return new ResourceReader (stream);
+		case ".resx":
+			LoadResX ();
+			return (IResourceReader)Activator.CreateInstance (resxr, new object[] {stream});
+		default:
+			throw new Exception ("Unknown format in file " + name);
+		}
+	}
+	
+	static IResourceWriter GetWriter (Stream stream, string name) {
+		string format = Path.GetExtension (name);
+		switch (format.ToLower ()) {
+		case ".txt":
+		case ".text":
+			return new TxtResourceWriter (stream);
+		case ".resources":
+			return new ResourceWriter (stream);
+		case ".resx":
+			LoadResX ();
+			return (IResourceWriter)Activator.CreateInstance (resxw, new object[] {stream});
+		default:
+			throw new Exception ("Unknown format in file " + name);
+		}
+	}
+	
+	static int Main (string[] args) {
+		FileStream source, dest;
+		string sname, dname;
+		IResourceReader reader;
+		IResourceWriter writer;
+
+		if (args.Length == 1) {
+			sname = args [0];
+			dname = Path.ChangeExtension (sname, "resources");
+		} else if (args.Length != 2) {
+			Usage ();
+			return 1;
+		} else {
+			sname = args [0];
+			dname = args [1];
+		}
+
+		try {
+			source = new FileStream (sname, FileMode.Open, FileAccess.Read);
+			dest = new FileStream (dname, FileMode.OpenOrCreate, FileAccess.Write);
+
+			reader = GetReader (source, sname);
+			writer = GetWriter (dest, dname);
+
+			foreach (DictionaryEntry e in reader) {
+				object val = e.Value;
+				if (val is string)
+					writer.AddResource ((string)e.Key, (string)e.Value);
+				else
+					writer.AddResource ((string)e.Key, e.Value);
+			}
+
+			reader.Close ();
+			writer.Close ();
+		} catch (Exception e) {
+			Console.WriteLine ("Error: {0}", e.Message);
+			return 1;
+		}
+		return 0;
+	}
+}
+
+class TxtResourceWriter : IResourceWriter {
+	StreamWriter s;
+	
+	public TxtResourceWriter (Stream stream) {
+		s = new StreamWriter (stream);
+	}
+	
+	public void AddResource (string name, byte[] value) {
+		throw new Exception ("Binary data not valid in a text resource file");
+	}
+	
+	public void AddResource (string name, object value) {
+		if (value is string) {
+			AddResource (name, (string)value);
+			return;
+		}
+		throw new Exception ("Objects not valid in a text resource file");
+	}
+	
+	/* FIXME: handle newlines */
+	public void AddResource (string name, string value) {
+		s.WriteLine ("{0}={1}", name, value);
+	}
+	
+	public void Close () {
+		s.Close ();
+	}
+	
+	public void Dispose () {}
+	
+	public void Generate () {}
+}
+
+class TxtResourceReader : IResourceReader {
+	Hashtable data;
+	Stream s;
+	
+	public TxtResourceReader (Stream stream) {
+		data = new Hashtable ();
+		s = stream;
+		Load ();
+	}
+	
+	public virtual void Close () {
+	}
+	
+	public IDictionaryEnumerator GetEnumerator() {
+		return data.GetEnumerator ();
+	}
+	
+	void Load () {
+		StreamReader reader = new StreamReader (s);
+		string line, key, val;
+		int epos, line_num = 0;
+		while ((line = reader.ReadLine ()) != null) {
+			line_num++;
+			line = line.Trim ();
+			if (line.Length == 0 || line [0] == '#' ||
+			    line [0] == ';')
+				continue;
+			epos = line.IndexOf ('=');
+			if (epos < 0) 
+				throw new Exception ("Invalid format at line " + line_num);
+			key = line.Substring (0, epos);
+			val = line.Substring (epos + 1);
+			key = key.Trim ();
+			val = val.Trim ();
+			if (key.Length == 0) 
+				throw new Exception ("Key is empty at line " + line_num);
+			data.Add (key, val);
+		}
+	}
+	
+	IEnumerator IEnumerable.GetEnumerator () {
+		return ((IResourceReader) this).GetEnumerator();
+	}
+
+	void IDisposable.Dispose () {}
+}
+
diff --git a/mcs/nant/.cvsignore b/mcs/nant/.cvsignore
new file mode 100755
index 00000000000..6e95567187d
--- /dev/null
+++ b/mcs/nant/.cvsignore
@@ -0,0 +1,2 @@
+NAnt.exe
+nant.exe
diff --git a/mcs/nant/ChangeLog b/mcs/nant/ChangeLog
new file mode 100644
index 00000000000..b8cf5a0b451
--- /dev/null
+++ b/mcs/nant/ChangeLog
@@ -0,0 +1,17 @@
+2002-04-28  Nick Drochak  <ndrochak@gol.com>
+
+	* makefile: Make NAnt.exe dependant on all the *.cs in src and each sub
+	dir.  Since we don't remove it on a 'make clean' it doesn't get rebuilt
+	when a new file is added or an existing one changed.
+
+2002-03-17  Nick Drochak  <ndrochak@gol.com>
+
+	* makefile: Do not remove the NAnt.exe on a 'make clean'.  This would
+	prevent other cleans from happening that need nant.
+
+2002/03/15  Nick Drochak <ndrochak@gol.com>
+
+	* makefile: Compile a version of NAnt with Mono's libs.  It only does
+	this if you 'make NAnt_mono.exe'. Of course, right now the resulting
+	exe probably is not going to work yet becuase of the immature class
+	libs.
diff --git a/mcs/nant/README-nant.txt b/mcs/nant/README-nant.txt
new file mode 100755
index 00000000000..66c04bef116
--- /dev/null
+++ b/mcs/nant/README-nant.txt
@@ -0,0 +1,62 @@
+NAnt

+

+What is it? 

+-----------

+NAnt is a .NET based build tool. In theory it is kind of like make without 

+make's wrinkles. In practice it's a lot like Ant. 

+  

+If you are not familiar with Jakarta Ant you can get more information at the

+Jakarta project web site.

+http://jakarta.apache.org/

+

+

+Why NAnt?

+---------

+Because Ant was too Java specific.

+Because Ant needed the Java runtime.  NAnt only needs the .NET runtime.

+

+

+The Latest Version

+------------------

+Details of the latest version can be found on the NAnt project web site

+http://nant.sourceforge.net/

+

+

+Documentation

+-------------

+Documentation is available in HTML format, in the doc/ directory.

+

+

+License

+-------

+Copyright (C) 2001 Gerry Shaw

+

+This program is free software; you can redistribute it and/or modify

+it under the terms of the GNU General Public License as published by

+the Free Software Foundation; either version 2 of the License, or

+(at your option) any later version.

+

+This program is distributed in the hope that it will be useful,

+but WITHOUT ANY WARRANTY; without even the implied warranty of

+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+GNU General Public License for more details.

+

+You should have received a copy of the GNU General Public License

+along with this program; if not, write to the Free Software

+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

+

+In addition, as a special exception, Gerry Shaw gives permission to link the 

+code of this program with the Microsoft .NET library (or with modified versions 

+of Microsoft .NET library that use the same license as the Microsoft .NET 

+library), and distribute linked combinations including the two.  You must obey 

+the GNU General Public License in all respects for all of the code used other 

+than the Microsoft .NET library.  If you modify this file, you may extend this 

+exception to your version of the file, but you are not obligated to do so.  If 

+you do not wish to do so, delete this exception statement from your version.

+

+A copy of the GNU General Public License is available in the COPYING.txt file 

+included with all NAnt distributions.

+

+For more licensing information refer to the GNU General Public License on the 

+GNU Project web site.

+http://www.gnu.org/copyleft/gpl.html

diff --git a/mcs/nant/doc/arrow.gif b/mcs/nant/doc/arrow.gif
new file mode 100755
index 00000000000..d5e5f8e771d
--- /dev/null
+++ b/mcs/nant/doc/arrow.gif
diff --git a/mcs/nant/doc/authors.html b/mcs/nant/doc/authors.html
new file mode 100755
index 00000000000..3b8ce57e47b
--- /dev/null
+++ b/mcs/nant/doc/authors.html
@@ -0,0 +1,43 @@
+<html>

+

+<head>

+	<meta http-equiv="Content-Language" content="en-ca">

+	<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">

+	<link rel="stylesheet" type="text/css" href="style.css" />

+	<title>NAnt Authors</title>

+</head>

+

+<body>

+	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="NavBar">

+		<tr><td class="NavBar-Cell" width="100%"><a title="NAnt home page" href="index.html"><b>NAnt</b></a> <img src="arrow.gif" alt="->"/> Authors</td></tr>

+	</table>

+

+	<h1><span class="N">N</span><span class="Ant">Ant</span> Authors</h1>

+

+	<h3>Lead Developer</h3>

+	<ul>

+		<li>Gerry Shaw (gerry_shaw@yahoo.com)</li>

+	</ul>

+

+	<h3>Developers</h3>

+	<ul>

+		<li>Ian MacLean (ian_maclean@another.com)</li>

+	</ul>

+

+	<h3>Code Contributions (sorted by name)</h3>

+	<ul>

+		<li>Mike Krueger (mike@icsharpcode.net)</li>

+		<li>Sergey Chaban (serge@wildwestsoftware.com)</li>

+	</ul>

+

+	<h3><a></a>Special Thanks To</h3>

+	<ul>

+		<li>The <a href="http://jakarta.apache.org/ant/">Ant</a> team on the Jakarta project.</li>

+		<li><a href="http://www.hazware.com/">Hazware</a> for the original XBuild source.</li>

+		<li><a href="http://nunit.sourceforge.net/">Philip Craig</a> for NUnit.</li>

+		<li><a href="http://msdn.microsoft.com/net/">Microsoft</a> for making .NET and C#.</li>

+		<li>Ximian for working on the <a href="http://www.go-mono.com">Mono</a> project ot make .NET a true open standard.</li>

+	</ul>

+</body>

+

+</html>

diff --git a/mcs/nant/doc/changelog.html b/mcs/nant/doc/changelog.html
new file mode 100755
index 00000000000..a5f3ac7e182
--- /dev/null
+++ b/mcs/nant/doc/changelog.html
@@ -0,0 +1,121 @@
+<html>

+

+<head>

+	<meta http-equiv="Content-Language" content="en-ca">

+	<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">

+	<link rel="stylesheet" type="text/css" href="style.css" />

+	<title>NAnt Change Log</title>

+</head>

+

+<body>

+	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="NavBar">

+		<tr><td class="NavBar-Cell" width="100%"><a title="NAnt home page" href="index.html"><b>NAnt</b></a> <img src="arrow.gif" alt="->"/> Change Log</td></tr>

+	</table>

+

+	<h1><span class="N">N</span><span class="Ant">Ant</span> Change Log</h1>

+

+	<h3>0.6.0 September 18, 2001</h3>

+	<ul>

+		<li>report build file xml errors in a useful way</li>

+		<li>report error location when tasks are missing required attributes</li>

+		<li>copy task updated - thanks to Ian MacLean</li>

+		<li>**/*.cs type pattern matching now available in file sets via DirectoryScanner class</li>

+		<li>Ian MacLean added as a project developer</li>

+		<li>added all the environment variables to properites, ie, &lt;echo message="path=${nant.env.PATH}"/&gt;</li>

+		<li>move task updated - thanks to Ian MacLean</li>

+		<li>sleep task added - thanks to Ian MacLean</li>

+		<li>DirectoryScanner and FileSet's scan for files AND directories now</li>

+		<li>FileSet's cache scan results, use Scan() to rescan</li>

+		<li>FileSet's auto initialize to their containing Task, this helps clean up the code</li>

+		<li>copy task can now copy full directory trees</li>

+		<li>added verbose attribute to copy task, default off, message gives number of files processed</li>

+		<li>fixed bug with any ExternalBase tasks hanging - thanks to Sergey Chaban for reporting</li>

+		<li>include task added</li>

+		<li>call task added</li>

+		<li>-verbose command line option added</li>

+		<li>build file can now build complete distribution, try 'nant dist'</li>

+	</ul>

+

+	<h3>0.5.0 August 22, 2001</h3>

+	<ul>

+		<li>complete overhaul of the web site and doc folder (all html files)</li>

+		<li>made src a parent folder to be able to hold multiple assemblies in anticipation of the NAnt.Tests.dll assembly</li>

+		<li>licensed changed to GNU General Public License</li>

+		<li>source code placed under CVS</li>

+		<li>tasks can now have attributes in base classes, see CompilerBase as an example - thanks to Mike Krueger</li>

+		<li>coding conventions posted on SourceForge in the document manager</li>

+		<li>task manager in SourceForge is now being used to track currently active tasks</li>

+		<li>namespace changed to SourceForge.NAnt</li>

+		<li>added basic command line parsing</li>

+		<li>added version resource</li>

+		<li>support for multiple build targets (try 'nant clean test')</li>

+		<li>BuildException added to report text position in the build file where errors occur - thanks to Ian MacLean</li>

+		<li>style task (xslt processing) added - thanks to Serge</li>

+		<li>executable is now signed with the NAnt.key</li>

+		<li>converted all public/protected fields to properties</li>

+		<li>added support for user define properties</li>

+		<li>added -set option (try 'nant -set:debug=true clean build')</li>

+		<li>changed verions number to 0.5 to reflect the number of changes in the code base</li>

+	</ul>

+

+	<h3>0.1.5 July 22, 2001</h3>

+	<ul>

+		<li>only compiles program if source file last write time > output last write time</li>

+		<li>refactored compiler code into common CompilerBase class</li>

+		<li>refactored compiler and exec task into common ExternalProgramBase class</li>

+		<li>added &lt;arg value="/win32res:filename"/&gt; element to all external program tasks</li>

+		<li>added Int32ValidatorAttribute and BooleanValidatorAttribute classes to perform error checking on task attributes after macro expansion but before task execution.  Search for BooleanValidator or Int32Validator in Tasks for examples.</li>

+		<li>changed Task attribute names to TaskAttributeAttribute and FileSetAttribute</li>

+		<li>removed default value for task attributes (set with initial value)</li>

+		<li>changes to Project class on how to initialize a project and run it</li>

+		<li>right aligned task prefixes to clean up output</li>

+		<li>added or enhanced these tasks

+			<ul>

+				<li>vbc, jsc, csc</li>

+				<li>move</li>

+				<li>nant</li>

+				<li>taskdef</li>

+				<li>tstamp</li>

+				<li>exec (failonerror attribute)</li>

+			</ul>

+		</li>

+	</ul>

+

+	<h3>0.1.4 July 19, 2001</h3>

+	<ul>

+		<li>added or enhanced these tasks

+			<ul>

+				<li>echo</li>

+				<li>fail</li>

+				<li>property</li>

+				<li>copy (respects basedir)</li>

+				<li>delete (respects basedir)</li>

+				<li>mkdir (respects basedir)</li>

+				<li>exec</li>

+			</ul>

+		</li>

+	</ul>

+

+	<h3>0.1.3 July 18, 2001</h3>

+	<ul>

+		<li>dependices working via depends attribute on targets</li>

+		<li>changed name from NBuild to NAnt</li>

+		<li>using the name "Parameter" to refer to the xml attributes in tasks because it was conflicting badly with .NET Attributes</li>

+		<li>added FileSetParameterAttribute so that fileset parameters would autoinit</li>

+		<li>renamed TaskAttributeAttribute to StringParameterAttribute</li>

+		<li>broke into seperate source files (one per class)</li>

+		<li>changed default build file from Project.xml to the first file with a .build extension</li>

+	</ul>

+

+	<h3>0.1.2 July 16, 2001</h3>

+	<ul>

+		<li>basic functionality to have NAnt build itself (csc task)</li>

+	</ul>

+

+	<h3>0.1.1 July 5, 2001</h3>

+	<ul>

+		<li>initial test version</li>

+	</ul>

+</body>

+

+</html>

diff --git a/mcs/nant/doc/index.html b/mcs/nant/doc/index.html
new file mode 100755
index 00000000000..635c2ca1233
--- /dev/null
+++ b/mcs/nant/doc/index.html
@@ -0,0 +1,43 @@
+<html>

+

+<head>

+	<meta http-equiv="Content-Language" content="en-ca">

+	<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">

+	<link rel="stylesheet" type="text/css" href="style.css" />

+	<title>NAnt - A .NET Build Tool</title>

+</head>

+

+<body>

+	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="NavBar">

+		<tr><td class="NavBar-Cell" width="100%"><b>NAnt</b> : A .NET Build Tool</td></tr>

+	</table>

+

+	<h1><span class="N">N</span><span class="Ant">Ant</span> Home Page</h1>

+

+	<p>September 18, 2001 Gerry Shaw -- <a title="Send email to Gerry Shaw" href="mailto:gerry_shaw@yahoo.com">gerry_shaw@yahoo.com</a></p>

+	<p>NAnt is a .NET based build tool. In theory it is kind of like make without make's wrinkles. In practice it's a lot like <a title="Ant home page" href="http://jakarta.apache.org/ant/">Ant</a>. NAnt has only been tested with Beta 2 .NET SDK, build 2914.</p>

+	<p>The idea for NAnt came from <a title="Hazware home page" href="http://www.hazware.com/xbHome.htm"> Hazware's XBuild</a> project. After emailing the author for a beta 2 version of the tool and getting no response I decided to port the code to .NET beta 2. Due to the number of changes from .NET beta 1 to beta 2 the result was a total rewrite.</p>

+	<ul>

+		<li><a title="NAnt files page on SourceForge" href="http://sourceforge.net/project/showfiles.php?group_id=31650"><b>Download latest version</b></a> from SourceForge</li>

+		<li><a title="NAnt web site on SourceForge" href="http://nant.sourceforge.net">Home page</a> on SourceForge</li>

+		<li><a title="NAnt project summary on SourceForge" href="http://sourceforge.net/projects/nant/">Project summary</a> on SourceForge</li>

+		<li><a title="Version history of NAnt" href="changelog.html">Changes</a></li>

+		<li><a title="Tasks still being worked on" href="todo.html">To do</a></li>

+		<li><a title="Project credits" href="authors.html">Authors</a></li>

+		<li><a title="Software license agreement" href="license.html">License</a></li>

+	</ul>

+

+	<h2>Getting Started</h2>

+	<p>Since the software is still in heavy development you are going to be on your own. You can see NAnt build itself by doing the following:</p>

+	<ol>

+		<li>Download the latest released version.</li>

+		<li>Unzip the distribution into a new folder.</li>

+		<li>Using a command prompt (so you can see the build output) cd into the

+			folder where NAnt was unzipped.</li>

+		<li>Type <code>bin\nant</code> at the command prompt to build NAnt.</li>

+	</ol>

+

+	<p><a href="http://sourceforge.net"><img valign="middle" src="http://sourceforge.net/sflogo.php?group_id=31650" width="88" height="31" border="0" alt="SourceForge logo (link to home page)"></a></p>

+</body>

+

+</html>

diff --git a/mcs/nant/doc/license.html b/mcs/nant/doc/license.html
new file mode 100755
index 00000000000..86d993bb13d
--- /dev/null
+++ b/mcs/nant/doc/license.html
@@ -0,0 +1,48 @@
+<html>

+

+<head>

+	<meta http-equiv="Content-Language" content="en-ca">

+	<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">

+	<link rel="stylesheet" type="text/css" href="style.css" />

+	<title>NAnt License</title>

+</head>

+

+<body>

+	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="NavBar">

+		<tr><td class="NavBar-Cell" width="100%"><a title="NAnt home page" href="index.html"><b>NAnt</b></a> <img src="arrow.gif" alt="->"/> License</td></tr>

+	</table>

+

+	<h1><span class="N">N</span><span class="Ant">Ant</span> License</h1>

+	<p>Copyright &copy 2001 Gerry Shaw</p>

+	<p>

+		This program is free software; you can redistribute it and/or modify

+		it under the terms of the GNU General Public License as published by

+		the Free Software Foundation; either version 2 of the License, or

+		(at your option) any later version.

+	</p>

+	<p>

+		This program is distributed in the hope that it will be useful,

+		but WITHOUT ANY WARRANTY; without even the implied warranty of

+		MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+		GNU General Public License for more details.

+	</p>

+	<p>

+		You should have received a copy of the GNU General Public License

+		along with this program; if not, write to the Free Software

+		Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA

+	</p>

+	<p>

+		<b>In addition, as a special exception</b>, Gerry Shaw gives permission to link the 

+		code of this program with the Microsoft .NET library (or with modified versions 

+		of Microsoft .NET library that use the same license as the Microsoft .NET 

+		library), and distribute linked combinations including the two.  You must obey 

+		the GNU General Public License in all respects for all of the code used other 

+		than the Microsoft .NET library.  If you modify this file, you may extend this 

+		exception to your version of the file, but you are not obligated to do so.  If 

+		you do not wish to do so, delete this exception statement from your version.

+	</p>

+	<p>A copy of the GNU General Public License is available in the COPYING.txt file included with all NAnt distributions.</p>

+	<p>The <a title="GNU home page" href="http://www.gnu.org/">GNU Project</a> has more information on the <a title="Full text of the GNU Public License" href="http://www.gnu.org/copyleft/gpl.html">GNU General Public License</a>.</p>

+</body>

+

+</html>

diff --git a/mcs/nant/doc/style.css b/mcs/nant/doc/style.css
new file mode 100755
index 00000000000..32613372a4c
--- /dev/null
+++ b/mcs/nant/doc/style.css
@@ -0,0 +1,71 @@
+body {

+	font-family: Georgia, "Times New Roman", Times, "New York", serif;

+	background: white;

+	color: black

+}

+

+h1, h2, h3, h4, h5, h6 {

+	font-family: Verdana, Arial, Helvetica, Geneva, SunSans-Regular, sans-serif

+}

+

+h1.LinkHeader, h2.LinkHeader, h3.LinkHeader { margin-bottom: -18 }

+

+h4 {

+	margin-bottom: 0.5em

+}

+

+h5 {

+	margin-bottom: -.8em;

+}

+

+

+hr {

+	color: gray

+}

+

+input {

+	font-family: Verdana, Arial, Helvetica, Geneva, SunSans-Regular, sans-serif;

+}

+

+a:link		{ color: #0000cc; }

+a:visited	{ color: purple }

+a:active	{ color: #cc0000 }

+a:hover		{ color: #cc0000; }

+

+/*

+

+Because HTML 4.0 strict does not include the border attribute for images we turn it off with a style

+but this totally messes up Navigator 4.7 so we can't use it.

+

+a:link img, a:visited img, a:active img {

+	border: none

+}

+*/

+

+/* have list items flush left against lists in a side bar use this style */

+ul.FlushLeft {

+	margin-left: 1.25em;

+	list-style-position: outside

+}

+

+.NavBar {

+	background-color: #dfff80;

+	border-color: #999966;

+	border-style: none none solid none;

+	border-width: 2px;

+}

+

+.NavBar-Cell {

+	font-family: Verdana, Arial, Helvetica, Geneva, SunSans-Regular, sans-serif;

+	font-size: 79%;

+}

+

+.SideBar {

+	font-size: 80%;

+	font-family: Verdana, Arial, Helvetica, Geneva, SunSans-Regular, sans-serif;

+	padding: 8px;

+}

+

+/* color scheme */

+.N			{ color: #99cc00; }

+.Ant		{ color: #ff9900; }

diff --git a/mcs/nant/doc/todo.html b/mcs/nant/doc/todo.html
new file mode 100755
index 00000000000..20cd3ba16ac
--- /dev/null
+++ b/mcs/nant/doc/todo.html
@@ -0,0 +1,55 @@
+<html>

+

+<head>

+	<meta http-equiv="Content-Language" content="en-ca">

+	<meta http-equiv="Content-Type" content="text/html; charset=windows-1252">

+	<link rel="stylesheet" type="text/css" href="style.css" />

+	<title>NAnt To Do</title>

+</head>

+

+<body>

+	<table width="100%" border="0" cellspacing="0" cellpadding="2" class="NavBar">

+		<tr><td class="NavBar-Cell" width="100%"><a title="NAnt home page" href="index.html"><b>NAnt</b></a> <img src="arrow.gif" alt="->" width="13" height="9"/> To Do</td></tr>

+	</table>

+

+	<h1><span class="N">N</span><span class="Ant">Ant</span> To Do</h1>

+	<p>The following is a rough guide to what features are being worked on and when they will be worked on in the future.</p>

+	<p>For a list of what is actively being worked refer to the <a title="SourceForge task manager for NAnt" href="https://sourceforge.net/pm/?group_id=31650">NAnt Task Manager</a> on SourceForge.</p>

+

+	<h3>0.7</h3>

+	<ul>

+		<li>command line parsing using clippy (another tool I'm working on that will be posted soon)</li>

+		<li>clippy task (for command line parsing)</li>

+		<li>nunit tests</li>

+		<li>nunit task</li>

+		<li>validate build file for valid xml and against a schema before starting build</li>

+		<li>code xml docs for all non private members</li>

+		<li>developer docs (code conventions, high level design)</li>

+		<li>post newsgroup announcment</li>

+		<li>request code review and project help</li>

+	</ul>

+

+	<h3>0.8</h3>

+	<ul>

+		<li>task documentation for users</li>

+		<li>zip task</li>

+		<li>ftp task</li>

+		<li>standard input support for tasks that require input (ie, passwords when copying files via scp to SourceForge)</li>

+	</ul>

+

+	<h3>1.0</h3>

+	<ul>

+		<li>official release</li>

+		<li>general cleanup</li>

+		<li>xml documentation</li>

+		<li>user documentation</li>

+		<li>post newsgroup announcment</li>

+	</ul>

+

+	<h3>1.1</h3>

+	<ul>

+		<li>additional optional but useful tasks (sql, touch, email, grep)</li>

+	</ul>

+</body>

+

+</html>
\ No newline at end of file
diff --git a/mcs/nant/makefile b/mcs/nant/makefile
new file mode 100755
index 00000000000..f0cced7a91c
--- /dev/null
+++ b/mcs/nant/makefile
@@ -0,0 +1,15 @@
+all: nant.exe
+linux: nant.exe
+windows: nant.exe
+
+nant.exe: NAnt.exe
+	-cp NAnt.exe nant.exe
+
+NAnt.exe: makefile src/*.cs src/Attributes/*.cs src/Tasks/*.cs src/Util/*.cs
+	csc /out:NAnt.exe /recurse:*.cs 
+
+NAnt_mono.exe: makefile
+	csc /out:NAnt_mono.exe /nostdlib /noconfig /recurse:*.cs /lib:../class/lib /r:corlib.dll /r:System.Xml.dll /r:System.dll /nowarn:1595
+
+clean:
+	rm -f NAnt_mono.exe
\ No newline at end of file
diff --git a/mcs/nant/readme.txt b/mcs/nant/readme.txt
new file mode 100755
index 00000000000..816b000c2e5
--- /dev/null
+++ b/mcs/nant/readme.txt
@@ -0,0 +1,4 @@
+This is an import of the Nant sources version 0.6.0 into the
+tree.  We are doing this because the binaries were not compatible
+across versions of .NET.
+
diff --git a/mcs/nant/src/AssemblyInfo.cs b/mcs/nant/src/AssemblyInfo.cs
new file mode 100755
index 00000000000..1bd25d5d050
--- /dev/null
+++ b/mcs/nant/src/AssemblyInfo.cs
@@ -0,0 +1,37 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+using System.Reflection;

+using System.Runtime.CompilerServices;

+

+[assembly: AssemblyTitle("NAnt")]

+[assembly: AssemblyDescription("A .NET Build Tool")]

+[assembly: AssemblyConfiguration("")]

+[assembly: AssemblyCompany("http://nant.sourceforge.net/")]

+[assembly: AssemblyProduct("NAnt")]

+[assembly: AssemblyCopyright("Copyright (C) 2001 Gerry Shaw")]

+[assembly: AssemblyTrademark("")]

+[assembly: AssemblyCulture("")]

+[assembly: AssemblyVersion("0.6.0.*")]

+

+// This will not compile with Visual Studio.  If you want to build a signed

+// executable use the NAnt build file.  To build under Visual Studio just

+// exclude this file from the build.

+[assembly: AssemblyDelaySign(false)]

+[assembly: AssemblyKeyName("")]

diff --git a/mcs/nant/src/Attributes/BooleanValidatorAttribute.cs b/mcs/nant/src/Attributes/BooleanValidatorAttribute.cs
new file mode 100755
index 00000000000..932b027d44d
--- /dev/null
+++ b/mcs/nant/src/Attributes/BooleanValidatorAttribute.cs
@@ -0,0 +1,42 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Reflection;

+

+    /// <summary>Indicates that field should be able to be converted into a Boolean.</summary>

+    [AttributeUsage(AttributeTargets.Field, Inherited=true)]

+    public class BooleanValidatorAttribute : ValidatorAttribute {

+

+        public BooleanValidatorAttribute() {

+        }

+

+        public override string Validate(object value) {

+            string errorMessage = null;

+            try {

+                Convert.ToBoolean(value);

+            } catch (Exception) {

+                errorMessage = String.Format("Cannot resolve to '{0}' to Boolean value.", value.ToString());

+            }

+            return errorMessage;

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Attributes/Int32ValidatorAttribute.cs b/mcs/nant/src/Attributes/Int32ValidatorAttribute.cs
new file mode 100755
index 00000000000..51d967d7520
--- /dev/null
+++ b/mcs/nant/src/Attributes/Int32ValidatorAttribute.cs
@@ -0,0 +1,63 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Reflection;

+

+    /// <summary>Indicates that field should be able to be converted into a Int32 within the given range.</summary>

+    [AttributeUsage(AttributeTargets.Field, Inherited=true)]

+    public class Int32ValidatorAttribute : ValidatorAttribute {

+

+        int _minValue = Int32.MinValue;

+        int _maxValue = Int32.MaxValue;

+

+        public Int32ValidatorAttribute() {

+        }

+

+        public Int32ValidatorAttribute(int minValue, int maxValue) {

+            MinValue = minValue;

+            MaxValue = maxValue;

+        }

+

+        public int MinValue {

+            get { return _minValue; }

+            set { _minValue = value; }

+        }

+

+        public int MaxValue {

+            get { return _maxValue; }

+            set { _maxValue = value; }

+        }

+

+        public override string Validate(object value) {

+            string errorMessage = null;

+            try {

+                Int32 intValue = Convert.ToInt32(value);

+                if (intValue < MinValue || intValue > MaxValue) {

+                    errorMessage = String.Format("Cannot resolve '{0}' to integer between '{1}' and '{2}'.", value.ToString(), MinValue, MaxValue);

+                }

+            } catch (Exception) {

+                errorMessage = String.Format("Cannot resolve '{0}' to integer value.", value.ToString());

+            }

+            return errorMessage;

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Attributes/TaskAttributeAttribute.cs b/mcs/nant/src/Attributes/TaskAttributeAttribute.cs
new file mode 100755
index 00000000000..060e25c3a31
--- /dev/null
+++ b/mcs/nant/src/Attributes/TaskAttributeAttribute.cs
@@ -0,0 +1,78 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Reflection;

+

+    /// <summary>Indicates that field should be treated as a xml attribute for the task.</summary>

+    /// <example>

+    /// Examples of how to specify task attributes

+    /// <code>

+    /// // task XmlType default is string

+    /// [TaskAttribute("out", Required=true)]

+    /// string _out = null; // assign default value here

+    ///

+    /// [TaskAttribute("optimize")]

+    /// [BooleanValidator()]

+    /// // during ExecuteTask you can safely use Convert.ToBoolean(_optimize)

+    /// string _optimize = Boolean.FalseString;

+    ///

+    /// [TaskAttribute("warnlevel")]

+    /// [Int32Validator(0,4)] // limit values to 0-4

+    /// // during ExecuteTask you can safely use Convert.ToInt32(_optimize)

+    /// string _warnlevel = "0";

+    ///

+    /// [TaskFileSet("sources")]

+    /// FileSet _sources = new FileSet();

+    /// </code>

+    /// NOTE: Attribute values must be of type of string if you want

+    /// to be able to have macros.  The field stores the exact value during

+    /// InitializeTask.  Just before ExecuteTask is called NAnt will expand

+    /// all the macros with the current values.

+    [AttributeUsage(AttributeTargets.Field, Inherited=true)]

+    public class TaskAttributeAttribute : Attribute {

+

+        string _name;

+        bool _required;

+        bool _expandText;

+

+        public TaskAttributeAttribute(string name) {

+            Name = name;

+            Required = false;

+            ExpandText = true;

+        }

+

+        public string Name {

+            get { return _name; }

+            set { _name = value; }

+        }

+

+        public bool Required {

+            get { return _required; }

+            set { _required = value; }

+        }

+

+        public bool ExpandText {

+            get { return _expandText; }

+            set { _expandText = value; }

+        }

+    }

+}

diff --git a/mcs/nant/src/Attributes/TaskFileSetAttribute.cs b/mcs/nant/src/Attributes/TaskFileSetAttribute.cs
new file mode 100755
index 00000000000..607f59fc4c5
--- /dev/null
+++ b/mcs/nant/src/Attributes/TaskFileSetAttribute.cs
@@ -0,0 +1,40 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Reflection;

+

+    /// <summary>Indicates that field should be treated as a xml file set for the task.</summary>

+    [AttributeUsage(AttributeTargets.Field, Inherited=true)]

+    public class TaskFileSetAttribute : Attribute {

+

+        string _name;

+

+        public TaskFileSetAttribute(string name) {

+            Name = name;

+        }

+

+        public string Name {

+            get { return _name; }

+            set { _name = value; }

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Attributes/TaskNameAttribute.cs b/mcs/nant/src/Attributes/TaskNameAttribute.cs
new file mode 100755
index 00000000000..bc7ffde1d2a
--- /dev/null
+++ b/mcs/nant/src/Attributes/TaskNameAttribute.cs
@@ -0,0 +1,45 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Reflection;

+

+    /// <summary>Indicates that class should be treated as a task.</summary>

+    /// <remarks>

+    /// Attach this attribute to a subclass of Task to have NAnt be able

+    /// to reconize it.  The name should be short but must not confict

+    /// with any other task already in use.

+    /// </remarks>

+    [AttributeUsage(AttributeTargets.Class, Inherited=false, AllowMultiple=false)]

+    public class TaskNameAttribute : Attribute {

+

+        string _name;

+

+        public TaskNameAttribute(string name) {

+            _name = name;

+        }

+

+        public string Name {

+            get { return _name; }

+            set { _name = value; }

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Attributes/ValidatorAttribute.cs b/mcs/nant/src/Attributes/ValidatorAttribute.cs
new file mode 100755
index 00000000000..053089cc497
--- /dev/null
+++ b/mcs/nant/src/Attributes/ValidatorAttribute.cs
@@ -0,0 +1,28 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Reflection;

+

+    public abstract class ValidatorAttribute : Attribute {

+        public abstract string Validate(object value);

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/BuildException.cs b/mcs/nant/src/BuildException.cs
new file mode 100755
index 00000000000..7940496d330
--- /dev/null
+++ b/mcs/nant/src/BuildException.cs
@@ -0,0 +1,85 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Ian MacLean (ian_maclean@another.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+

+    /// <summary>

+    /// Thrown whenever an error occurs during the build.

+    /// </summary>

+    public class BuildException : ApplicationException {

+

+        private Location _location = Location.UnknownLocation;

+

+        /// <summary>

+        /// Constructs a build exception with no descriptive information.

+        /// </summary>

+        public BuildException() : base() {

+        }

+

+        /// <summary>

+        /// Constructs an exception with a descriptive message.

+        /// </summary>

+        public BuildException(String message) : base(message) {

+        }

+

+        /// <summary>

+        /// Constructs an exception with a descriptive message and an

+        /// instance of the Exception that is the cause of the current Exception.

+        /// </summary>

+        public BuildException(String message, Exception e) : base(message, e) {

+        }

+

+        /// <summary>

+        /// Constructs an exception with a descriptive message and location

+        /// in the build file that caused the exception.

+        /// </summary>

+        /// <param name="location">Location in the build file where the exception occured.</param>

+        public BuildException(String message, Location location) : base(message) {

+            _location = location;

+        }

+

+        /// <summary>

+        /// Constructs an exception with the given descriptive message, the

+        /// location in the build file and an instance of the Exception that

+        /// is the cause of the current Exception.

+        /// </summary>

+        /// <param name="message">The error message that explains the reason for the exception.</param>

+        /// <param name="location">Location in the build file where the exception occured.</param>

+        /// <param name="e">An instance of Exception that is the cause of the current Exception.</param>

+        public BuildException(String message, Location location, Exception e) : base(message, e) {

+            _location = location;

+        }

+

+        public override string Message {

+            get {

+                string message = base.Message;

+

+                // only include location string if not empty

+                string locationString = _location.ToString();

+                if (locationString != String.Empty) {

+                    message = locationString + " " + message;

+                }

+                return message;

+            }

+        }

+    }

+}

diff --git a/mcs/nant/src/DirectoryScanner.cs b/mcs/nant/src/DirectoryScanner.cs
new file mode 100755
index 00000000000..a2baa303d38
--- /dev/null
+++ b/mcs/nant/src/DirectoryScanner.cs
@@ -0,0 +1,226 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+/*

+Examples:

+"**\*.class" matches all .class files/dirs in a directory tree.

+

+"test\a??.java" matches all files/dirs which start with an 'a', then two

+more characters and then ".java", in a directory called test.

+

+"**" matches everything in a directory tree.

+

+"**\test\**\XYZ*" matches all files/dirs that start with "XYZ" and where

+there is a parent directory called test (e.g. "abc\test\def\ghi\XYZ123").

+

+Example of usage:

+

+DirectoryScanner scanner = DirectoryScanner();

+scanner.Includes.Add("**\\*.class");

+scanner.Exlucdes.Add("modules\\*\\**");

+scanner.BaseDirectory = "test";

+scanner.Scan();

+foreach (string filename in GetIncludedFiles()) {

+    Console.WriteLine(filename);

+}

+*/

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Collections.Specialized;

+    using System.IO;

+    using System.Text;

+    using System.Text.RegularExpressions;

+

+    public class DirectoryScanner {

+

+        string _baseDirectory = Environment.CurrentDirectory;

+

+        // holds the nant patterns

+        StringCollection _includes = new StringCollection();

+        StringCollection _excludes = new StringCollection();

+

+        // holds the nant patterns converted to regular expression patterns

+        StringCollection _includePatterns = null;

+        StringCollection _excludePatterns = null;

+

+        // holds the result from a scan

+        StringCollection _fileNames = null;

+        StringCollection _directoryNames = null;

+

+        public StringCollection Includes {

+            get { return _includes; }

+        }

+

+        public StringCollection Excludes {

+            get { return _excludes; }

+        }

+

+        public string BaseDirectory {

+            get { return _baseDirectory; }

+            set { _baseDirectory = value; }

+        }

+

+        public StringCollection FileNames {

+            get {

+                if (_fileNames == null) {

+                    Scan();

+                }

+                return _fileNames;

+            }

+        }

+

+        public StringCollection DirectoryNames {

+            get {

+                if (_directoryNames == null) {

+                    Scan();

+                }

+                return _directoryNames;

+            }

+        }

+

+        public void Scan() {

+            _includePatterns = new StringCollection();

+            foreach (string pattern in Includes) {

+                _includePatterns.Add(ToRegexPattern(pattern));

+            }

+

+            _excludePatterns = new StringCollection();

+            foreach (string pattern in Excludes) {

+                _excludePatterns.Add(ToRegexPattern(pattern));

+            }

+

+            _fileNames      = new StringCollection();

+            _directoryNames = new StringCollection();

+

+            ScanDirectory(Path.GetFullPath(BaseDirectory));

+        }

+

+        void ScanDirectory(string path) {

+            // get info for the current directory

+            DirectoryInfo currentDirectoryInfo = new DirectoryInfo(path);

+

+            // scan subfolders

+            foreach (DirectoryInfo directoryInfo in currentDirectoryInfo.GetDirectories()) {

+                ScanDirectory(directoryInfo.FullName);

+            }

+

+            // scan files

+            foreach (FileInfo fileInfo in currentDirectoryInfo.GetFiles()) {

+                string filename = Path.Combine(path, fileInfo.Name);

+                if (IsPathIncluded(filename)) {

+                    _fileNames.Add(filename);

+                }

+            }

+

+            // Check current path last so that delete task will correctly

+            // delete empty directories.  This may *seem* like a special case

+            // but it is more like formalizing something in a way that makes

+            // writing the delete task easier :)

+            if (IsPathIncluded(path)) {

+                _directoryNames.Add(path);

+            }

+        }

+

+        bool IsPathIncluded(string path) {

+            bool included = false;

+

+            // check path against includes

+            foreach (string pattern in _includePatterns) {

+                Match m = Regex.Match(path, pattern);

+                if (m.Success) {

+                    included = true;

+                    break;

+                }

+            }

+

+            // check path against excludes

+            if (included) {

+                foreach (string pattern in _excludePatterns) {

+                    Match m = Regex.Match(path, pattern);

+                    if (m.Success) {

+                        included = false;

+                        break;

+                    }

+                }

+            }

+

+            return included;

+        }

+

+        string ToRegexPattern(string nantPattern) {

+

+            StringBuilder pattern = new StringBuilder(nantPattern);

+

+            // NAnt patterns can use either / \ as a directory seperator.

+            // We must replace both of these characters with Path.DirectorySeperatorChar

+            pattern.Replace('/',  Path.DirectorySeparatorChar);

+            pattern.Replace('\\', Path.DirectorySeparatorChar);

+

+            // Patterns MUST be full paths.

+            if (!Path.IsPathRooted(pattern.ToString())) {

+                pattern = new StringBuilder(Path.Combine(BaseDirectory, pattern.ToString()));

+            }

+

+            // The '\' character is a special character in regular expressions

+            // and must be escaped before doing anything else.

+            pattern.Replace(@"\", @"\\");

+

+            // Escape the rest of the regular expression special characters.

+            // NOTE: Characters other than . $ ^ { [ ( | ) * + ? \ match themselves.

+            // TODO: Decide if ] and } are missing from this list, the above

+            // list of characters was taking from the .NET SDK docs.

+            pattern.Replace(".", @"\.");

+            pattern.Replace("$", @"\$");

+            pattern.Replace("^", @"\^");

+            pattern.Replace("{", @"\{");

+            pattern.Replace("[", @"\[");

+            pattern.Replace("(", @"\(");

+            pattern.Replace(")", @"\)");

+            pattern.Replace("+", @"\+");

+

+            // Special case directory seperator string under Windows.

+            string seperator = Path.DirectorySeparatorChar.ToString();

+            if (seperator == @"\") {

+                seperator = @"\\";

+            }

+

+            // Convert NAnt pattern characters to regular expression patterns.

+

+            // SPECIAL CASE: to match subdirectory OR current directory.  If

+            // we don't do this then we can write something like 'src/**/*.cs'

+            // to match all the files ending in .cs in the src directory OR

+            // subdirectories of src.

+            pattern.Replace(seperator + "**", "(" + seperator + ".|)|");

+

+            // | is a place holder for * to prevent it from being replaced in next line

+            pattern.Replace("**", ".|");

+            pattern.Replace("*", "[^" + seperator + "]*");

+            pattern.Replace("?", "[^" + seperator + "]?");

+            pattern.Replace('|', '*'); // replace place holder string

+

+            // Help speed up the search

+            pattern.Insert(0, '^'); // start of line

+            pattern.Append('$'); // end of line

+

+            return pattern.ToString();

+        }

+    }

+}

diff --git a/mcs/nant/src/FileSet.cs b/mcs/nant/src/FileSet.cs
new file mode 100755
index 00000000000..4e934fc82d2
--- /dev/null
+++ b/mcs/nant/src/FileSet.cs
@@ -0,0 +1,132 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Collections.Specialized;

+    using System.IO;

+

+    public class FileSet {

+

+        /// <summary>

+        /// Used to determine if a file has a more recent last write time then the specified write time.

+        /// </summary>

+        /// <param name="fileNames">A collection of filenames to check last write times against.</param>

+        /// <param name="targetLastWriteTime">The datetime to compare against.</param>

+        /// <returns><c>True</c> if at least one file in <c>fileNames</c> has a last write time greater than <c>targetLastWriteTime</c>.</returns>

+        public static bool MoreRecentLastWriteTime(StringCollection fileNames, DateTime targetLastWriteTime) {

+            foreach (string fileName in fileNames) {

+                FileInfo fileInfo = new FileInfo(fileName);

+                if (!fileInfo.Exists) {

+                    return true;

+                }

+                if (fileInfo.LastWriteTime > targetLastWriteTime) {

+                    return true;

+                }

+            }

+            return false;

+        }

+

+        // We can't just use the DirectoryScanner's includes/excludes collections

+        // because when we do a Scan() we need to first expand any macros.

+

+        StringCollection _includes = new StringCollection();

+        StringCollection _excludes = new StringCollection();

+        DirectoryScanner _scanner = null;

+        string _baseDirectory;

+        bool _includeAllByDefault;

+        Task _task = null;

+

+        public FileSet(bool includeAllByDefault) {

+            IncludeAllByDefault = includeAllByDefault;

+            Excludes.Add("**/CVS/*");

+            Excludes.Add("**/.cvsignore");

+        }

+

+        /// <remarks>

+        /// Will be automagically set in Task.AutoInitializeAttributes() if

+        /// file set has TaskFileSetAttribute set on it.

+        /// </remarks>

+        // TODO: change this to IMacroExpander

+        public Task Task {

+            get { return _task; }

+            set { _task = value; }

+        }

+

+        public string BaseDirectory {

+            get { return _baseDirectory; }

+            set { _baseDirectory = value; }

+        }

+

+        /// <summary>Determines if scan should produce everything or nothing

+        /// if there are no Includes set.  Default false.</summary>

+        public bool IncludeAllByDefault {

+            get { return _includeAllByDefault; }

+            set { _includeAllByDefault = value; }

+        }

+

+        public StringCollection Includes {

+            get { return _includes; }

+        }

+

+        public StringCollection Excludes {

+            get { return _excludes; }

+        }

+

+        public void Scan() {

+            // get project (only for expanding macros)

+            Project expander = Task.Project;

+

+            _scanner = new DirectoryScanner();

+            _scanner.BaseDirectory = expander.GetFullPath(BaseDirectory);;

+

+            foreach (string path in Includes) {

+                _scanner.Includes.Add(expander.ExpandText(path));

+            }

+            if (Includes.Count <= 0 && IncludeAllByDefault) {

+                _scanner.Includes.Add("**");

+            }

+

+            foreach (string path in Excludes) {

+                _scanner.Excludes.Add(expander.ExpandText(path));

+            }

+

+            _scanner.Scan();

+        }

+

+        public StringCollection DirectoryNames {

+            get {

+                if (_scanner == null) {

+                    Scan();

+                }

+                return _scanner.DirectoryNames;

+            }

+        }

+

+        public StringCollection FileNames {

+            get {

+                if (_scanner == null) {

+                    Scan();

+                }

+                return _scanner.FileNames;

+            }

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Location.cs b/mcs/nant/src/Location.cs
new file mode 100755
index 00000000000..3a51279d371
--- /dev/null
+++ b/mcs/nant/src/Location.cs
@@ -0,0 +1,89 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Ian MacLean (ian_maclean@another.com)

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+    using System;

+    using System.IO;

+

+    /// <summary>

+    /// Stores the file name and line number in a file.

+    /// </summary>

+    public class Location {

+        string _fileName;

+        int _lineNumber;

+        int _columnNumber;

+

+        public static readonly Location UnknownLocation = new Location();

+

+        /// <summary>

+        /// Creates a location consisting of a file name and line number.

+        ///</summary>

+        public Location(string fileName, int lineNumber, int columnNumber) {

+            Uri uri = new Uri(fileName);

+            string strfileName = uri.LocalPath;  // convert from URI syntax to local path

+            Init(strfileName, lineNumber, columnNumber);

+        }

+

+        /// <summary>

+        /// Creates a location consisting of a file name but no line number.

+        ///</summary>

+        public Location(string fileName) {

+            Init(fileName, 0, 0);

+        }

+

+        /// <summary>

+        /// Creates an "unknown" location.

+        ///</summary>

+        private Location() {

+            Init(null, 0, 0);

+        }

+

+        /// <summary>

+        /// Private Init function.

+        ///</summary>

+        private void Init(string fileName, int lineNumber, int columnNumber) {

+            _fileName = fileName;

+            _lineNumber = lineNumber;

+            _columnNumber = columnNumber;

+        }

+

+        /// <summary>

+        /// Returns the file name, line number and a trailing space. An error

+        /// message can be appended easily. For unknown locations, returns

+        /// an empty string.

+        ///</summary>

+        public override string ToString() {

+            string message = "";

+

+            if (_fileName != null) {

+                message += _fileName;

+

+                if (_lineNumber != 0) {

+                    message += ":";

+                    message += _lineNumber.ToString();

+                }

+

+                message += ":";

+            }

+

+            return message;

+        }

+    }

+}

diff --git a/mcs/nant/src/NAnt.cs b/mcs/nant/src/NAnt.cs
new file mode 100755
index 00000000000..7a192036f98
--- /dev/null
+++ b/mcs/nant/src/NAnt.cs
@@ -0,0 +1,107 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Diagnostics;

+    using System.IO;

+    using System.Text.RegularExpressions;

+

+    public class NAnt {

+        public static int Main(string[] args) {

+            int returnCode = 0;

+

+            Log.IndentSize = 12;

+

+            Project project = new Project();

+

+            const string buildfileOption = "-buildfile:";

+            const string basedirOption = "-basedir:";

+            const string setOption = "-set:";

+            const string helpOption = "-h"; // allow -h and -help

+            const string verboseOption = "-verbose";

+

+            bool showHelp = false;

+

+            foreach (string arg in args) {

+                if (arg.StartsWith(buildfileOption)) {

+                    project.BuildFileName = arg.Substring(buildfileOption.Length);

+                } else if (arg.StartsWith(basedirOption)) {

+                    project.BaseDirectory = arg.Substring(basedirOption.Length);

+                } else if (arg.StartsWith(basedirOption)) {

+                    project.BaseDirectory = arg.Substring(basedirOption.Length);

+                } else if (arg.StartsWith(setOption)) {

+                    // TODO: implement user defined properties

+                    // user defined properties from command line or file should be

+                    // marked so that they cannot be overwritten by the build file

+                    // ie, once set they are set for the rest of the build.

+                    Match match = Regex.Match(arg, @"-set:(\w+)=(\w*)");

+                    if (match.Success) {

+                        string name = match.Groups[1].Value;

+                        string value = match.Groups[2].Value;

+                        project.Properties.AddReadOnly(name, value);

+                    }

+                } else if (arg.StartsWith(helpOption)) {

+                    showHelp = true;

+                } else if (arg.StartsWith(verboseOption)) {

+                    project.Verbose = true;

+                } else if (arg.Length > 0) {

+                    // must be a target (or mistake ;)

+                    project.BuildTargets.Add(arg);

+                }

+            }

+

+            // Get version information directly from assembly.  This takes more

+            // work but prevents the version numbers from getting out of sync.

+            ProcessModule module = Process.GetCurrentProcess().MainModule;

+            FileVersionInfo info = FileVersionInfo.GetVersionInfo(module.FileName);

+            string programName = Path.GetFileNameWithoutExtension(info.FileName); // in case the user has renamed the program

+

+            if (showHelp) {

+                const int optionPadding = 23;

+

+                Console.WriteLine("NAnt Version {0} Copyright (C) 2001 Gerry Shaw", info.FileMajorPart + "." + info.FileMinorPart + "." + info.FileBuildPart);

+                Console.WriteLine("http://nant.sourceforge.net/");

+                Console.WriteLine();

+                Console.WriteLine("NAnt comes with ABSOLUTELY NO WARRANTY.");

+                Console.WriteLine("This is free software, and you are welcome to redistribute it under certain");

+                Console.WriteLine("conditions set out by the GNU General Public License.  A copy of the license");

+                Console.WriteLine("is available in the distribution package and from the NAnt web site.");

+                Console.WriteLine();

+                Console.WriteLine("usage: {0} [options] [target]", programName);

+                Console.WriteLine();

+                Console.WriteLine("options:");

+                Console.WriteLine("  {0} use given buildfile", (buildfileOption + "<file>").PadRight(optionPadding));

+                Console.WriteLine("  {0} set project base directory", (basedirOption + "<dir>").PadRight(optionPadding));

+                Console.WriteLine("  {0} use value for given property", (setOption + "<property>=<value>").PadRight(optionPadding));

+                Console.WriteLine("  {0} print this message", helpOption.PadRight(optionPadding));

+                Console.WriteLine();

+                Console.WriteLine("If no buildfile is specified the first file ending in .build will be used.");

+            } else {

+                if (!project.Run()) {

+                    Console.WriteLine("Try `{0} -help' for more information.", programName);

+                    returnCode = 1; // set return code to indicate an error occurred

+                }

+            }

+            Log.Close();

+            return returnCode;

+        }

+    }

+}

diff --git a/mcs/nant/src/NAnt.exe b/mcs/nant/src/NAnt.exe
new file mode 100755
index 00000000000..a7a82b71366
--- /dev/null
+++ b/mcs/nant/src/NAnt.exe
diff --git a/mcs/nant/src/Project.cs b/mcs/nant/src/Project.cs
new file mode 100755
index 00000000000..9746dadcfdc
--- /dev/null
+++ b/mcs/nant/src/Project.cs
@@ -0,0 +1,332 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Ian MacLean (ian_maclean@another.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+    using System.Reflection;

+    using System.Text.RegularExpressions;

+    using System.Xml;

+    using System.Xml.XPath;

+    using System.Collections;

+    using System.Collections.Specialized;

+

+    /// <summary>

+    /// Central representation of an NAnt project.

+    /// </summary>

+    public class Project {

+

+        public static readonly string BuildFilePattern = "*.build";

+

+        /// <summary>

+        /// Finds the file name for the build file in the specified directory.

+        /// </summary>

+        /// <param name="directory">The directory to look for a build file.  When in doubt use Environment.CurrentDirectory for directory.</param>

+        /// <returns>The path to the build file or <c>null</c> if no build file could be found.</returns>

+        public static string FindBuildFileName(string directory) {

+            string buildFileName = null;

+

+            // find first file ending in .build

+            DirectoryInfo directoryInfo = new DirectoryInfo(directory);

+            FileInfo[] files = directoryInfo.GetFiles(BuildFilePattern);

+            if (files.Length > 0) {

+                buildFileName = Path.Combine(directory, files[0].Name);

+            }

+            return buildFileName;

+        }

+

+        string _name;

+        string _defaultTargetName;

+        string _baseDirectory;

+        string _buildFileName;

+        bool _verbose = false;

+

+        StringCollection _buildTargets = new StringCollection();

+        TaskCollection _tasks = new TaskCollection();

+        TargetCollection _targets = new TargetCollection();

+        XPathTextPositionMap _positionMap; // created when Xml document is loaded

+        TaskFactory _taskFactory; // created in constructor

+        PropertyDictionary _properties = new PropertyDictionary();

+

+        public Project() {

+            _taskFactory = new TaskFactory(this);

+        }

+

+        /// <summary>

+        /// The name of the project.

+        /// </summary>

+        public string Name {

+            get { return _name; }

+            set { _name = value; }

+        }

+

+        public string BaseDirectory {

+            get { return _baseDirectory; }

+            set { _baseDirectory = value; }

+        }

+

+        public string BuildFileName {

+            get { return _buildFileName; }

+            set { _buildFileName = value; }

+        }

+

+        /// <summary>

+        /// When true tasks should output more output.

+        /// </summary>

+        public bool Verbose {

+            get { return _verbose; }

+            set { _verbose = value; }

+        }

+

+        /// <summary>

+        /// The list of targets to built.

+        /// </summary>

+        /// <remarks>

+        /// Targets are built in the order they appear in the collection.  If

+        /// the collection is empty the default target will be built.

+        /// </remarks>

+        public StringCollection BuildTargets {

+            get { return _buildTargets; }

+        }

+

+        /// <summary>

+        /// The list of tasks to perform before any targets executed.

+        /// </summary>

+        /// <remarks>

+        /// Tasks are executed in the order they appear in the collection.

+        /// </remarks>

+        public TaskCollection Tasks {

+            get { return _tasks; }

+        }

+

+        public PropertyDictionary Properties {

+            get { return _properties; }

+        }

+

+        public TargetCollection Targets {

+            get { return _targets; }

+        }

+

+        public bool Run() {

+            bool buildResult = false;

+            try {

+                DateTime startTime = DateTime.Now;

+

+                if (BaseDirectory == null) {

+                    BaseDirectory = Environment.CurrentDirectory;

+                }

+                BaseDirectory = Path.GetFullPath(BaseDirectory);

+

+                if (BuildFileName == null || BuildFileName == String.Empty) {

+                    BuildFileName = FindBuildFileName(BaseDirectory);

+                    if (BuildFileName == null) {

+                        throw new BuildException(String.Format("Could not find a '{0}' file in '{1}'", BuildFilePattern, BaseDirectory));

+                    }

+                }

+

+                Log.WriteLine("Buildfile: {0}", BuildFileName);

+                if (Verbose) {

+                    Log.WriteLine("Base Directory: {0}", BaseDirectory);

+                }

+

+                XmlDocument doc = new XmlDocument();

+                try {

+                    doc.Load(BuildFileName);

+                    // TODO: validate against xsd schema

+                } catch (XmlException e) {

+                    throw new BuildException(String.Format("Could not load '{0}'", BuildFileName), e);

+                }

+

+                Initialize(doc);

+                Properties.Add("nant.buildfile", BuildFileName);

+

+                Execute();

+

+                Log.WriteLine();

+                Log.WriteLine("BUILD SUCCEEDED");

+

+                TimeSpan buildTime = DateTime.Now - startTime;

+                Log.WriteLine();

+                Log.WriteLine("Total time: {0} seconds", (int) buildTime.TotalSeconds);

+

+                buildResult = true;

+            } catch (BuildException e) {

+                Log.WriteLine();

+                Log.WriteLine("BUILD FAILED");

+                Log.WriteLine(e.Message);

+                if (e.InnerException != null) {

+                    Log.WriteLine(e.InnerException.Message);

+                }

+            } catch (Exception e) {

+                // all other exceptions should have been caught

+                Log.WriteLine();

+                Log.WriteLine("INTERNAL ERROR");

+                Log.WriteLine(e.ToString());

+            }

+            return buildResult;

+        }

+

+        public int AddTasks(string assemblyPath) {

+

+            Assembly assembly;

+            if (assemblyPath == null) {

+                assembly = Assembly.GetExecutingAssembly();

+            } else {

+                assembly = Assembly.LoadFrom(assemblyPath);

+            }

+

+            int taskCount = 0;

+            foreach(Type type in assembly.GetTypes()) {

+                if (type.IsSubclassOf(typeof(Task)) && !type.IsAbstract) {

+                    if (_taskFactory.Builders.Add(new TaskBuilder(type.FullName, assemblyPath))) {

+                        taskCount++;

+                    }

+                }

+            }

+            return taskCount;

+        }

+

+        public void Initialize(XmlDocument doc) {

+

+            Name = doc.SelectSingleNode("project/@name").Value;

+

+            // make it possible for user to override this value

+            if (BaseDirectory == null) {

+                BaseDirectory = doc.SelectSingleNode("project/@basedir").Value;

+            }

+

+            // used only if BuildTargets collection is empty

+            _defaultTargetName = doc.SelectSingleNode("project/@default").Value;

+

+            // initialize builtin tasks

+            AddTasks(null);

+

+            // init static built in properties

+            Properties.Add("nant.project.name", Name);

+            Properties.Add("nant.base.dir",     BaseDirectory);

+            Properties.Add("nant.default.name", _defaultTargetName);

+

+            // add all environment variables

+            IDictionary variables = Environment.GetEnvironmentVariables();

+            foreach (string name in variables.Keys) {

+                string value = (string) variables[name];

+                Properties.Add("nant.env." + name, value);

+            }

+

+            // Load line Xpath to linenumber array

+            _positionMap = new XPathTextPositionMap(doc.BaseURI);

+

+            // process all the non-target nodes (these are global tasks for the project)

+            XmlNodeList taskList = doc.SelectNodes("project/*[name() != 'target']");

+            foreach (XmlNode taskNode in taskList) {

+

+                // TODO: do somethiing like Project.CreateTask(taskNode) and have the project set the location

+                TextPosition textPosition = _positionMap.GetTextPosition(taskNode);

+

+                Task task = CreateTask(taskNode);

+                if (task != null) {

+                    Tasks.Add(task);

+                }

+            }

+

+            // execute global tasks now - before anything else

+            // this lets us include tasks that do things like add more tasks

+            foreach (Task task in Tasks) {

+                task.Execute();

+            }

+

+            // process all the targets

+            XmlNodeList targetList = doc.SelectNodes("project/target");

+            foreach (XmlNode targetNode in targetList) {

+                Target target = new Target(this);

+                target.Initialize(targetNode);

+                Targets.Add(target);

+            }

+        }

+

+        public void Execute() {

+            if (BuildTargets.Count == 0) {

+                BuildTargets.Add(_defaultTargetName);

+            }

+

+            foreach(string targetName in BuildTargets) {

+                Execute(targetName);

+            }

+        }

+

+        public void Execute(string targetName) {

+            Target target = Targets.Find(targetName);

+            if (target == null) {

+                throw new BuildException(String.Format("unknown target '{0}'", targetName));

+            }

+            target.Execute();

+        }

+

+        public Task CreateTask(XmlNode taskNode) {

+            return CreateTask(taskNode, null);

+        }

+

+        public Task CreateTask(XmlNode taskNode, Target target) {

+            Task task = _taskFactory.CreateTask(taskNode, target);

+            if (task != null) {

+                // save task location in case of error

+                TextPosition pos = _positionMap.GetTextPosition(taskNode);

+

+                // initialize the task

+                task.Initialize(taskNode, new Location(taskNode.BaseURI, pos.Line, pos.Column));

+            }

+            return task;

+        }

+

+        public string ExpandText(string input) {

+            string output = input;

+            if (input != null) {

+                const string pattern = @"\$\{([^\}]*)\}";

+                foreach (Match m in Regex.Matches(input, pattern)) {

+                    if (m.Length > 0) {

+

+                        string token         = m.ToString();

+                        string propertyName  = m.Groups[1].Captures[0].Value;

+                        string propertyValue = Properties[propertyName];

+

+                        if (propertyValue != null) {

+                            output = output.Replace(token, propertyValue);

+                        }

+                    }

+                }

+            }

+            return output;

+        }

+

+        public string GetFullPath(string path) {

+            string baseDir = ExpandText(BaseDirectory);

+

+            if (path != null) {

+                if (!Path.IsPathRooted(path)) {

+                    path = Path.Combine(baseDir, path);

+                }

+            } else {

+                path = baseDir;

+            }

+            return Path.GetFullPath(path);

+        }

+    }

+}

diff --git a/mcs/nant/src/PropertyDictionary.cs b/mcs/nant/src/PropertyDictionary.cs
new file mode 100755
index 00000000000..072ba46c0d2
--- /dev/null
+++ b/mcs/nant/src/PropertyDictionary.cs
@@ -0,0 +1,72 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System.Collections;

+    using System.Collections.Specialized;

+

+    public class PropertyDictionary : DictionaryBase {

+

+        /// <summary>

+        /// Maintains a list of the property names that are readonly.

+        /// </summary>

+        StringCollection _readOnlyProperties = new StringCollection();

+

+        /// <summary>

+        /// Adds a property that cannot be changed.

+        /// </summary>

+        /// <remarks>

+        /// Properties added with this method can never be changed.  Note that

+        /// they are removed if the <c>Clear</c> method is called.

+        /// </remarks>

+        /// <param name="name">Name of property</param>

+        /// <param name="value">Value of property</param>

+        public void AddReadOnly(string name, string value) {

+            if (!_readOnlyProperties.Contains(name)) {

+                _readOnlyProperties.Add(name);

+                Dictionary.Add(name, value);

+            }

+        }

+

+        /// <summary>

+        /// Adds a property to the collection.

+        /// </summary>

+        /// <param name="name">Name of property</param>

+        /// <param name="value">Value of property</param>

+        public void Add(string name, string value) {

+            if (!_readOnlyProperties.Contains(name)) {

+                Dictionary.Add(name, value);

+            }

+        }

+

+        public string this[string name] {

+            get { return (string) Dictionary[(object) name]; }

+            set {

+                if (!_readOnlyProperties.Contains(name)) {

+                    Dictionary[name] = value;

+                }

+            }

+        }

+

+        protected override void OnClear() {

+            _readOnlyProperties.Clear();

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Target.cs b/mcs/nant/src/Target.cs
new file mode 100755
index 00000000000..3e0de022c23
--- /dev/null
+++ b/mcs/nant/src/Target.cs
@@ -0,0 +1,115 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Ian MacLean (ian_maclean@another.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Collections.Specialized;

+    using System.Xml;

+

+    public class Target {

+

+        string _name;

+        Project _project;

+        bool _hasExecuted = false;

+        TaskCollection _tasks = new TaskCollection();

+        StringCollection _dependencies = new StringCollection();

+

+        public Target(Project project) {

+            Project = project;

+        }

+

+        public string Name {

+            get { return _name; }

+            set { _name = value; }

+        }

+

+        public Project Project {

+            get { return _project; }

+            set { _project = value; }

+        }

+

+        public bool HasExecuted {

+            get { return _hasExecuted; }

+        }

+

+        public TaskCollection Tasks {

+            get { return _tasks; }

+        }

+

+        public StringCollection Dependencies {

+            get { return _dependencies; }

+        }

+

+        public void Initialize(XmlNode targetNode) {

+            // get target name

+            XmlNode nameNode = targetNode.SelectSingleNode("@name");

+            if (nameNode == null) {

+                // TODO: add Location to exception

+                throw new BuildException("target must have a name attribute");

+            }

+            Name = nameNode.Value;

+

+            // add dependicies

+            XmlNode dependsNode = targetNode.SelectSingleNode("@depends");

+            if (dependsNode != null) {

+                string depends = dependsNode.Value;

+                foreach (string str in depends.Split(new char[]{','})) {

+                    string dependency = str.Trim();

+                    if (dependency.Length > 0) {

+                        Dependencies.Add(dependency);

+                    }

+                }

+            }

+

+            // select all the non-target nodes (these are global tasks for the project)

+            XmlNodeList taskList = targetNode.SelectNodes("*");

+            foreach (XmlNode taskNode in taskList) {

+                Task task = Project.CreateTask(taskNode, this);

+                if (task != null) {

+                    Tasks.Add(task);

+                }

+            }

+        }

+

+        public void Execute() {

+            if (!HasExecuted) {

+                try {

+                    foreach (string targetName in Dependencies) {

+                        Target target = Project.Targets.Find(targetName);

+                        if (target == null) {

+                            // TODO: add Location to exception

+                            throw new BuildException(String.Format("unknown dependent target '{0}' of target '{1}'", targetName, Name));

+                        }

+                        target.Execute();

+                    }

+

+                    Log.WriteLine();

+                    Log.WriteLine("{0}:", Name);

+                    foreach (Task task in Tasks) {

+                        task.Execute();

+                    }

+                } finally {

+                    _hasExecuted = true;

+                }

+            }

+        }

+    }

+}

diff --git a/mcs/nant/src/TargetCollection.cs b/mcs/nant/src/TargetCollection.cs
new file mode 100755
index 00000000000..c4f486b1302
--- /dev/null
+++ b/mcs/nant/src/TargetCollection.cs
@@ -0,0 +1,35 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Collections;

+

+    public class TargetCollection : ArrayList {

+

+        public Target Find(string targetName) {

+            foreach(Target target in this) {

+                if (target.Name == targetName)

+                    return target;

+            }

+            return null;

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Task.cs b/mcs/nant/src/Task.cs
new file mode 100755
index 00000000000..2a4eafaebd1
--- /dev/null
+++ b/mcs/nant/src/Task.cs
@@ -0,0 +1,192 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Mike Krueger (mike@icsharpcode.net)

+// Ian MacLean (ian_maclean@another.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Reflection;

+    using System.Xml;

+

+    public abstract class Task {

+

+        /// <summary>Gets and sets how much spacing log prefix names will be padded.</summary>

+        /// <remarks>

+        /// Includes characters for a space after the name and the [ ] brackets. Default is 12.

+        /// </remarks>

+        public static int LogPrefixPadding = Log.IndentSize;

+

+        Location _location = Location.UnknownLocation;

+        Target _target = null;

+        Project _project = null;

+

+        /// <summary>

+        /// Location in build file where task is defined.

+        /// </summary>

+        protected Location Location {

+            get { return _location; }

+            set { _location = value; }

+        }

+

+        public string Name {

+            get {

+                string name = null;

+                TaskNameAttribute taskName = (TaskNameAttribute) Attribute.GetCustomAttribute(GetType(), typeof(TaskNameAttribute));

+                if (taskName != null) {

+                    name = taskName.Name;

+                }

+                return name;

+            }

+        }

+

+        public string LogPrefix {

+            get {

+                string prefix = "[" + Name + "] ";

+                return prefix.PadLeft(LogPrefixPadding);

+            }

+        }

+

+        public Target Target {

+            get { return _target; }

+            set { _target = value; }

+        }

+

+        public Project Project {

+            get { return _project; }

+            set { _project = value; }

+        }

+

+        protected void AutoInitializeAttributes(XmlNode taskNode) {

+

+            // TODO: BooleanValidatorAttribute and Int32ValidatorAttribute implementation in Task

+

+            // Go down the inheritance tree to find the private fields in the object.

+            // We are looking for task attributes to initialize.

+            Type currentType = GetType();

+            while (currentType != typeof(object)) {

+                FieldInfo[] fieldInfoArray = currentType.GetFields(BindingFlags.NonPublic|BindingFlags.Instance);

+                foreach (FieldInfo fieldInfo in fieldInfoArray) {

+

+                    // process TaskAttribute attributes

+                    TaskAttributeAttribute taskAttribute = (TaskAttributeAttribute) Attribute.GetCustomAttribute(fieldInfo, typeof(TaskAttributeAttribute));

+                    if (taskAttribute != null) {

+

+                        // get value from xml file

+                        XmlNode node = taskNode.SelectSingleNode("@" + taskAttribute.Name);

+

+                        // check if its required

+                        if (node == null && taskAttribute.Required) {

+                            // TODO: add Location to exception

+                            throw new BuildException(String.Format("{0} is a required attribute.", taskAttribute.Name), Location);

+                        }

+

+                        if (node != null) {

+                            fieldInfo.SetValue(this, Convert.ChangeType(node.Value, fieldInfo.FieldType));

+                        }

+                    }

+

+                    // process TaskFileSet attributes

+                    TaskFileSetAttribute fileSetAttribute = (TaskFileSetAttribute) Attribute.GetCustomAttribute(fieldInfo, typeof(TaskFileSetAttribute));

+                    if (fileSetAttribute != null) {

+                        // have file set initialize itself

+                        FileSet fileSet = (FileSet) fieldInfo.GetValue(this);

+

+                        // set task fileset belongs to

+                        fileSet.Task = this;

+

+                        // load values from build file

+                        XmlNode fileSetNode = taskNode.SelectSingleNode(fileSetAttribute.Name);

+                        if (fileSetNode != null) {

+

+                            XmlNode baseDirectoryNode = fileSetNode.SelectSingleNode("@basedir");

+                            if (baseDirectoryNode != null) {

+                                fileSet.BaseDirectory = baseDirectoryNode.Value;

+                            }

+

+                            foreach (XmlNode node in fileSetNode.SelectNodes("includes")) {

+                                string pathname = node.SelectSingleNode("@name").Value;

+                                fileSet.Includes.Add(pathname);

+                            }

+

+                            foreach (XmlNode node in fileSetNode.SelectNodes("excludes")) {

+                                fileSet.Excludes.Add(node.SelectSingleNode("@name").Value);

+                            }

+                        }

+                    }

+                }

+                currentType = currentType.BaseType;

+            }

+        }

+

+        protected void AutoExpandAttributes() {

+

+            // Go down the inheritance tree to find the private fields in the object.

+            // We are looking for task attributes to initialize.

+            Type currentType = GetType();

+            while (currentType != typeof(object)) {

+                FieldInfo[] fieldInfoArray = currentType.GetFields(BindingFlags.NonPublic|BindingFlags.Instance);

+                foreach (FieldInfo fieldInfo in fieldInfoArray) {

+

+                    // proces string parameters

+                    TaskAttributeAttribute taskAttribute = (TaskAttributeAttribute) Attribute.GetCustomAttribute(fieldInfo, typeof(TaskAttributeAttribute));

+                    if (taskAttribute != null) {

+                        if (taskAttribute.ExpandText) {

+                            string value = (string) fieldInfo.GetValue(this);

+                            value = Project.ExpandText(value);

+                            fieldInfo.SetValue(this, value);

+                        }

+

+                        // if a field also has a validator attribute then ensure that value is correct

+                        ValidatorAttribute[] validators = (ValidatorAttribute[]) Attribute.GetCustomAttributes(fieldInfo, typeof(ValidatorAttribute));

+                        foreach (ValidatorAttribute validator in validators) {

+                            string errorMessage = validator.Validate(fieldInfo.GetValue(this));

+                            if (errorMessage != null) {

+                                throw new BuildException(String.Format("Error processing '{0}' attribute in <{1}> task: {2}", taskAttribute.Name, Name, errorMessage), Location);

+                            }

+                        }

+                    }

+                }

+                currentType = currentType.BaseType;

+            }

+        }

+

+        public void Initialize(XmlNode taskNode) {

+            Initialize(taskNode, null);

+        }

+

+        public void Initialize(XmlNode taskNode, Location location) {

+            if (location != null) {

+                _location = location;

+            }

+            AutoInitializeAttributes(taskNode);

+            InitializeTask(taskNode);

+        }

+

+        public void Execute() {

+            AutoExpandAttributes();

+            ExecuteTask();

+        }

+

+        protected virtual void InitializeTask(XmlNode taskNode) {

+        }

+

+        protected abstract void ExecuteTask();

+    }

+}

diff --git a/mcs/nant/src/TaskBuilder.cs b/mcs/nant/src/TaskBuilder.cs
new file mode 100755
index 00000000000..97b602b4828
--- /dev/null
+++ b/mcs/nant/src/TaskBuilder.cs
@@ -0,0 +1,84 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Reflection;

+

+    public class TaskBuilder {

+        

+        string _className;

+        string _assemblyFileName;

+        string _taskName;

+

+        public TaskBuilder(string className)

+            : this(className, null) {

+        }

+

+        public TaskBuilder(string className, string assemblyFileName) {

+            _className = className;

+            _assemblyFileName = assemblyFileName;

+

+            // get task name from attribute

+            Assembly assembly = GetAssembly();

+            TaskNameAttribute taskNameAttribute = (TaskNameAttribute) Attribute.GetCustomAttribute(assembly.GetType(ClassName), typeof(TaskNameAttribute));

+            _taskName = taskNameAttribute.Name;

+        }

+

+        public string ClassName {

+            get { return _className; }

+        }

+

+        public string AssemblyFileName {

+            get { return _assemblyFileName; }

+        }

+

+        public string TaskName {

+            get { return _taskName; }

+        }

+

+        private Assembly GetAssembly() {

+            Assembly assembly;

+            if (AssemblyFileName == null) {

+                assembly = Assembly.GetExecutingAssembly();

+            } else {

+                assembly = Assembly.LoadFrom(AssemblyFileName);

+            }

+            return assembly;

+        }

+

+        public Task CreateTask(Project project, Target target) {

+            Task task;

+            try {

+                Assembly assembly = GetAssembly();

+

+                // create instance (ignore case)

+                task = (Task) assembly.CreateInstance(ClassName, true);

+

+                // set default values

+                task.Project = project;

+                task.Target = target;

+            } catch (Exception) {

+                task = null;

+            }

+            return task;

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/TaskBuilderCollection.cs b/mcs/nant/src/TaskBuilderCollection.cs
new file mode 100755
index 00000000000..bb61c3171a3
--- /dev/null
+++ b/mcs/nant/src/TaskBuilderCollection.cs
@@ -0,0 +1,46 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Collections;

+

+    public class TaskBuilderCollection : ArrayList {

+

+        public bool Add(TaskBuilder builder) {

+            // prevent adding duplicate builders with the name task name

+            bool taskAdded = false;

+            if (GetBuilderForTask(builder.TaskName) == null) {

+                base.Add(builder);

+                taskAdded = true;

+            }

+            return taskAdded;

+        }

+

+        public TaskBuilder GetBuilderForTask(string taskName) {

+            foreach (TaskBuilder builder in this) {

+                if (builder.TaskName == taskName) {

+                    return builder;

+                }

+            }

+            return null;

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/TaskCollection.cs b/mcs/nant/src/TaskCollection.cs
new file mode 100755
index 00000000000..94d7afc4202
--- /dev/null
+++ b/mcs/nant/src/TaskCollection.cs
@@ -0,0 +1,26 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System.Collections;

+

+    public class TaskCollection : ArrayList {

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/TaskFactory.cs b/mcs/nant/src/TaskFactory.cs
new file mode 100755
index 00000000000..f1e4f7f718a
--- /dev/null
+++ b/mcs/nant/src/TaskFactory.cs
@@ -0,0 +1,57 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Xml;

+

+    internal class TaskFactory {

+

+        TaskBuilderCollection _builders = new TaskBuilderCollection();

+        Project _project;

+

+        public TaskFactory(Project project) {

+            Project = project;

+        }

+

+        public TaskBuilderCollection Builders {

+            get { return _builders; }

+        }

+

+        public Project Project {

+            get { return _project; }

+            set { _project = value; }

+        }

+

+        public Task CreateTask(XmlNode taskNode, Target target) {

+            string taskName = taskNode.Name;

+            Task task = null;

+

+            TaskBuilder builder = Builders.GetBuilderForTask(taskName);

+            if (builder != null) {

+                task = builder.CreateTask(Project, target);

+            } else {

+                throw new BuildException(String.Format("unknown task <{0}> in target <{1}>", taskName, target.Name));

+            }

+

+            return task;

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Tasks/CallTask.cs b/mcs/nant/src/Tasks/CallTask.cs
new file mode 100755
index 00000000000..08e24711746
--- /dev/null
+++ b/mcs/nant/src/Tasks/CallTask.cs
@@ -0,0 +1,41 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Collections.Specialized;

+    using System.Diagnostics;

+    using System.IO;

+    using System.Xml;

+

+    [TaskName("call")]

+    public class CallTask : Task {

+

+        [TaskAttribute("target", Required=true)]

+        string _target = null;

+

+        // Attribute properties

+        public string TargetName { get { return _target; } }

+

+        protected override void ExecuteTask() {

+            Project.Execute(TargetName);

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Tasks/ChangeLog b/mcs/nant/src/Tasks/ChangeLog
new file mode 100644
index 00000000000..68de36bb94a
--- /dev/null
+++ b/mcs/nant/src/Tasks/ChangeLog
@@ -0,0 +1,13 @@
+2002-04-26  Martin Baulig  <martin@gnome.org>
+
+	* CompilerBase.cs (WriteOption): New virtual method.  The default
+	implementation writes CSC-style command line options, but it can
+	be overridden in derived class to write mcs-style command line
+	arguments.
+	(ExecuteTask): Use the new virtual `WriteOption' method to write
+	options.
+
+	* CscTask.cs (WriteOptions): Use the new `WriteOption' method.
+
+	* McsTask.cs: New file.
+
diff --git a/mcs/nant/src/Tasks/CompilerBase.cs b/mcs/nant/src/Tasks/CompilerBase.cs
new file mode 100755
index 00000000000..39ffb2970af
--- /dev/null
+++ b/mcs/nant/src/Tasks/CompilerBase.cs
@@ -0,0 +1,195 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Mike Krueger (mike@icsharpcode.net)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Collections.Specialized;

+    using System.Diagnostics;

+    using System.IO;

+

+    public abstract class CompilerBase : ExternalProgramBase {

+

+        string _responseFileName;

+

+        // Microsoft common compiler options

+        [TaskAttribute("output", Required=true)]

+        string _output = null;

+

+        [TaskAttribute("target", Required=true)]

+        string _target = null;

+

+        [TaskAttribute("debug")]

+        [BooleanValidator()]

+        string _debug = Boolean.FalseString;

+

+        [TaskAttribute("define")]

+        string _define = null;

+

+        [TaskAttribute("win32icon")]

+        string _win32icon = null;

+

+        [TaskFileSet("references")]

+        FileSet _references = new FileSet(false);

+

+        [TaskFileSet("resources")]

+        FileSet _resources = new FileSet(false);

+

+        [TaskFileSet("modules")]

+        FileSet _modules = new FileSet(false);

+

+        [TaskFileSet("sources")]

+        FileSet _sources = new FileSet(true); // include all by default

+

+        public string Output        { get { return _output; } }

+        public string OutputTarget  { get { return _target; } }

+        public bool Debug           { get { return Convert.ToBoolean(_debug); } }

+        public string Define        { get { return _define; } }

+        public string Win32Icon     { get { return _win32icon; } }

+        public FileSet References   { get { return _references; } }

+        public FileSet Resources    { get { return _resources; } }

+        public FileSet Modules      { get { return _modules; } }

+        public FileSet Sources      { get { return _sources; } }

+

+        public override string ProgramFileName  { get { return Name; } }

+        public override string ProgramArguments { get { return "@" + _responseFileName; } }

+

+        protected virtual void WriteOptions(TextWriter writer) {

+        }

+

+	protected virtual void WriteOption(TextWriter writer, string name) {

+	    writer.WriteLine("/{0}", name);

+	}

+

+	protected virtual void WriteOption(TextWriter writer, string name, string arg) {

+	    writer.WriteLine("/{0}:{1}", name, arg);

+	}

+

+        protected string GetOutputPath() {

+            return Path.GetFullPath(Path.Combine(BaseDirectory, Project.ExpandText(Output)));

+        }

+

+        protected virtual bool NeedsCompiling() {

+            // return true as soon as we know we need to compile

+

+            FileInfo outputFileInfo = new FileInfo(GetOutputPath());

+            if (!outputFileInfo.Exists) {

+                return true;

+            }

+

+            if (FileSet.MoreRecentLastWriteTime(Sources.FileNames, outputFileInfo.LastWriteTime)) {

+                return true;

+            }

+            if (FileSet.MoreRecentLastWriteTime(References.FileNames, outputFileInfo.LastWriteTime)) {

+                return true;

+            }

+            if (FileSet.MoreRecentLastWriteTime(Modules.FileNames, outputFileInfo.LastWriteTime)) {

+                return true;

+            }

+

+            // if we made it here then we don't have to recompile

+            return false;

+        }

+

+        protected override void ExecuteTask() {

+            if (NeedsCompiling()) {

+                // create temp response file to hold compiler options

+                _responseFileName = Path.GetTempFileName();

+                StreamWriter writer = new StreamWriter(_responseFileName);

+

+                try {

+                    if (References.BaseDirectory == null) {

+                        References.BaseDirectory = BaseDirectory;

+                    }

+                    if (Modules.BaseDirectory == null) {

+                        Modules.BaseDirectory = BaseDirectory;

+                    }

+                    if (Sources.BaseDirectory == null) {

+                        Sources.BaseDirectory = BaseDirectory;

+                    }

+

+                    Log.WriteLine(LogPrefix + "Compiling {0} files to {1}", Sources.FileNames.Count, GetOutputPath());

+

+                    // specific compiler options

+                    WriteOptions(writer);

+

+                    // Microsoft common compiler options

+		    WriteOption(writer, "nologo");

+		    WriteOption(writer, "target", OutputTarget);

+		    WriteOption(writer, "out", GetOutputPath());

+                    if (Debug) {

+			WriteOption(writer, "debug");

+			WriteOption(writer, "define", "DEBUG");

+			WriteOption(writer, "define", "TRACE");

+                    }

+                    if (Define != null) {

+			WriteOption(writer, "define", Define);

+                    }

+                    if (Win32Icon != null) {

+			WriteOption(writer, "win32icon", Win32Icon);

+                    }

+                    foreach (string fileName in References.FileNames) {

+                        WriteOption(writer, "reference", fileName);

+                    }

+                    foreach (string fileName in Modules.FileNames) {

+                        WriteOption(writer, "addmodule", fileName);

+                    }

+                    foreach (string fileName in Resources.FileNames) {

+                        WriteOption(writer, "resource", fileName);

+                    }

+                    foreach (string fileName in Sources.FileNames) {

+                        writer.WriteLine(fileName);

+                    }

+                    // Make sure to close the response file otherwise contents

+                    // will not be written to disc and EXecuteTask() will fail.

+                    writer.Close();

+

+                    if (Verbose) {

+                        // display response file contents

+                        Log.WriteLine(LogPrefix + "Contents of " + _responseFileName);

+                        /*

+                        StreamReader reader = File.OpenText(_responseFileName);

+                        string line = reader.ReadLine();

+                        while (line != null) {

+                            Log.WriteLine(LogPrefix + "  " + line);

+                            line = reader.ReadLine();

+                        }

+                        reader.Close();

+                        */

+

+                        StreamReader reader = File.OpenText(_responseFileName);

+                        Log.WriteLine(reader.ReadToEnd());

+                        reader.Close();

+

+                    }

+

+                    // call base class to do the work

+                    base.ExecuteTask();

+

+                } finally {

+                    // make sure we delete response file even if an exception is thrown

+                    writer.Close(); // make sure stream is closed or file cannot be deleted

+                    File.Delete(_responseFileName);

+                    _responseFileName = null;

+                }

+            }

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/CopyTask.cs b/mcs/nant/src/Tasks/CopyTask.cs
new file mode 100755
index 00000000000..849eb023f9e
--- /dev/null
+++ b/mcs/nant/src/Tasks/CopyTask.cs
@@ -0,0 +1,196 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Ian MacLean (ian_maclean@another.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+    using System.Xml;

+    using System.Text;

+    using System.Collections;

+    using System.Collections.Specialized;

+

+    [TaskName("copy")]

+    public class CopyTask : Task {

+

+        [TaskAttribute("file")]

+        string _sourceFile = null;

+

+        [TaskAttribute("tofile")]

+        string _toFile = null;

+

+        [TaskAttribute("todir")]

+        string _toDirectory = null;

+

+        [TaskAttribute("filtering")]

+        [BooleanValidator()]

+        string _filtering = Boolean.FalseString;

+

+        [TaskAttribute("flatten")]

+        [BooleanValidator()]

+        string _flatten = Boolean.FalseString;

+

+        [TaskAttribute("includeEmptyDirs")]

+        [BooleanValidator()]

+        string _includeEmptyDirs = Boolean.FalseString;

+

+        [TaskFileSet("fileset")]

+        FileSet _fileset = new FileSet(true); // include all by default

+

+        [TaskAttribute("overwrite")]

+        [BooleanValidator()]

+        string _overwrite = Boolean.FalseString;

+

+        [TaskAttribute("verbose")]

+        [BooleanValidator()]

+        string _verbose = Boolean.FalseString;

+

+        [TaskAttribute("preserveLastModified")]

+        [BooleanValidator()]

+        string _preserveLastModified = Boolean.FalseString;

+

+        Hashtable _fileCopyMap = new Hashtable();

+

+        public string SourceFile        { get { return _sourceFile; } }

+        public string ToFile            { get { return _toFile; } }

+        public string ToDirectory       { get { return _toDirectory; } }

+        public bool Filtering           { get { return Convert.ToBoolean(_filtering); } }

+        public bool Flatten             { get { return Convert.ToBoolean(_flatten); } }

+        public bool IncludeEmptyDirs    { get { return Convert.ToBoolean(_includeEmptyDirs); } }

+        public bool Overwrite           { get { return Convert.ToBoolean(_overwrite); } }

+        public bool PreserveLastModified{ get { return Convert.ToBoolean(_preserveLastModified); } }

+        public FileSet CopyFileSet      { get { return _fileset; } }

+

+        public bool Verbose { 

+            get {

+                return (Project.Verbose || Convert.ToBoolean(_verbose));

+            } 

+        }

+

+        protected Hashtable FileCopyMap {

+            get { return _fileCopyMap; }

+        }

+

+        /// <summary>

+        /// Actually does the file (and possibly empty directory) copies.

+        /// </summary>

+        protected virtual void DoFileOperations() {

+            int fileCount = FileCopyMap.Keys.Count;

+            if (fileCount > 0) {

+                if (ToDirectory != null) {

+                    Log.WriteLine(LogPrefix + "Copying {0} files to {1}", fileCount, Project.GetFullPath(ToDirectory));

+                } else {

+                    Log.WriteLine(LogPrefix + "Copying {0} files", fileCount);

+                }

+

+                // loop thru our file list

+                foreach (string sourcePath in FileCopyMap.Keys) {

+                    string dstPath = (string)FileCopyMap[sourcePath];

+                    if (sourcePath == dstPath) {

+                        if (Verbose) {

+                            Log.WriteLine(LogPrefix + "Skipping self-copy of {0}" + sourcePath);

+                        }

+                        continue;

+                    }

+

+                    try {

+                        if (Verbose) {

+                            Log.WriteLine(LogPrefix + "Copying {0} to {1}", sourcePath, dstPath);

+                        }

+

+                        // create directory if not present

+                        string dstDirectory = Path.GetDirectoryName(dstPath);

+                        if (!Directory.Exists(dstDirectory)) {

+                            Directory.CreateDirectory(dstDirectory);

+                            if (Verbose) {

+                                Log.WriteLine(LogPrefix + "Created directory {0}", dstDirectory);

+                            }

+                        }

+

+                        File.Copy(sourcePath, dstPath, true);

+                    } catch (IOException ioe) {

+                        string msg = String.Format("Cannot copy {0} to {1}", sourcePath, dstPath);

+                        throw new BuildException(msg, Location, ioe);

+                    }

+                }

+            }

+

+            // TODO: handle empty directories in the fileset, refer to includeEmptyDirs attribute at

+            // http://jakarta.apache.org/ant/manual/CoreTasks/copy.html

+        }

+

+        protected override void ExecuteTask() {

+

+            string dstDirectoryPath = Project.GetFullPath(ToDirectory);

+            string srcFilePath = Project.GetFullPath(SourceFile);

+            FileInfo srcInfo = new FileInfo(srcFilePath);

+

+            string dstFilePath;

+            if (ToFile == null) {

+                dstFilePath = dstDirectoryPath + Path.DirectorySeparatorChar + srcInfo.Name;

+            } else {

+                dstFilePath = Project.GetFullPath(ToFile);

+            }

+

+            FileInfo dstInfo = new FileInfo(dstFilePath);

+            if (SourceFile != null) {

+                if (srcInfo.Exists) {

+                    // do the outdated check

+                    bool outdated = (!dstInfo.Exists) || (srcInfo.LastWriteTime > dstInfo.LastWriteTime);

+

+                    if (Overwrite || outdated) {

+                        // add to a copy map of absolute verified paths

+                        FileCopyMap.Add(srcFilePath, dstFilePath);

+                    }

+                } else {

+                    Log.WriteLine(LogPrefix + "Could not find file {0} to copy.", srcFilePath);

+                }

+            } else {

+                // get the complete path of the base directory of the fileset, ie, c:\work\nant\src

+                string srcBasePath = Project.GetFullPath(CopyFileSet.BaseDirectory);

+                string dstBasePath = Project.GetFullPath(ToDirectory);

+

+                // if source file not specified use fileset

+                foreach (string pathname in CopyFileSet.FileNames) {

+                    // replace the fileset path with the destination path

+                    // NOTE: big problems could occur if the file set base dir is rooted on a different drive

+                    string dstPath = pathname.Replace(srcBasePath, dstBasePath);

+

+                    srcInfo = new FileInfo(pathname);

+                    dstInfo = new FileInfo(dstPath);

+

+                    if (srcInfo.Exists) {

+                        // do the outdated check

+                        bool outdated = (!dstInfo.Exists) || (srcInfo.LastWriteTime > dstInfo.LastWriteTime);

+

+                        if (Overwrite || outdated) {

+                            FileCopyMap.Add(pathname, dstPath);

+                        }

+                    } else {

+                        Log.WriteLine(LogPrefix + "Could not find file {0} to copy.", srcFilePath);

+                    }

+                }

+            }

+

+            // do all the actual copy operations now...

+            DoFileOperations();

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/CscTask.cs b/mcs/nant/src/Tasks/CscTask.cs
new file mode 100755
index 00000000000..202082bcd8d
--- /dev/null
+++ b/mcs/nant/src/Tasks/CscTask.cs
@@ -0,0 +1,45 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Mike Krueger (mike@icsharpcode.net)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+

+    [TaskName("csc")]

+    public class CscTask : CompilerBase {

+

+        // C# specific compiler options

+        [TaskAttribute("doc")]

+        string _doc = null;

+

+        protected override void WriteOptions(TextWriter writer) {

+            WriteOption(writer, "fullpaths");

+            if (_doc != null) {

+                WriteOption(writer, "doc", _doc);

+            }

+        }

+

+        protected override bool NeedsCompiling() {

+            // TODO: add checks for any referenced files OR return false to always compile

+            return base.NeedsCompiling();

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/DeleteTask.cs b/mcs/nant/src/Tasks/DeleteTask.cs
new file mode 100755
index 00000000000..4d4abf25149
--- /dev/null
+++ b/mcs/nant/src/Tasks/DeleteTask.cs
@@ -0,0 +1,173 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+

+// TODO: move this into the task documentation (once we figure out how tasks

+// should be documented - xml??

+/*

+

+verbose: Show name of each deleted file ("true"/"false"). Default is "false"

+when omitted.

+

+quiet: If the file does not exist, do not display a diagnostic message or

+modify the exit status to reflect an error (unless Ant has been invoked with

+the -verbose or -debug switches). This means that if a file or directory cannot

+be deleted, then no error is reported. This setting emulates the -f option to

+the Unix "rm" command. ("true"/"false"). Default is "false" meaning things are

+"noisy". Setting this to true, implies setting failonerror to false.

+

+failonerror: This flag (which is only of relevance if 'quiet' is false),

+controls whether an error -such as a failure to delete a file- stops the build

+task, or is merely reported to the screen. The default is "true"

+

+*/

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+

+    [TaskName("delete")]

+    public class DeleteTask : Task {

+

+        [TaskAttribute("file")]

+        string _file = null;

+

+        [TaskAttribute("dir")]

+        string _dir = null;

+

+        [TaskAttribute("verbose")]

+        [BooleanValidator()]

+        string _verbose = Boolean.FalseString;

+

+        [TaskAttribute("failonerror")]

+        [BooleanValidator()]

+        string _failOnError = Boolean.TrueString;

+

+        /// <summary>If true then delete empty directories when using filesets.</summary>

+        [TaskAttribute("includeEmptyDirs")]

+        [BooleanValidator()]

+        string _includeEmptyDirs = Boolean.FalseString;

+

+        [TaskFileSet("fileset")]

+        FileSet _fileset = new FileSet(false);

+

+        public string FileName       { get { return _file; } }

+        public string DirectoryName  { get { return _dir; } }

+        public bool FailOnError      { get { return Convert.ToBoolean(_failOnError); } }

+        public bool IncludeEmptyDirectories { get { return Convert.ToBoolean(_includeEmptyDirs); } }

+        public FileSet DeleteFileSet { get { return _fileset; } }

+

+        public bool Verbose { 

+            get {

+                return (Project.Verbose || Convert.ToBoolean(_verbose));

+            } 

+        }

+

+        protected override void ExecuteTask() {

+

+            // limit task to deleting either a file or a directory or a file set

+            if (FileName != null && DirectoryName != null) {

+                throw new BuildException("Cannot specify 'file' and 'dir' in the same delete task", Location);

+            }

+

+            // try to delete specified file

+            if (FileName != null) {

+                string path = null;

+                try {

+                    path = Project.GetFullPath(FileName);

+                } catch (Exception e) {

+                    string msg = String.Format("Could not determine path from {0}", FileName);

+                    throw new BuildException(msg, Location, e);

+                }

+                DeleteFile(path);

+

+            // try to delete specified directory

+            } else if (DirectoryName != null) {

+                string path = null;

+                try {

+                    path = Project.GetFullPath(DirectoryName);

+                } catch (Exception e) {

+                    string msg = String.Format("Could not determine path from {0}", DirectoryName);

+                    throw new BuildException(msg, Location, e);

+                }

+                DeleteDirectory(path);

+

+            // delete files/directories in fileset

+            } else {

+                // only use the file set if file and dir attributes have NOT been set

+                foreach (string path in DeleteFileSet.FileNames) {

+                    DeleteFile(path);

+                }

+

+                if (IncludeEmptyDirectories) {

+                    foreach (string path in DeleteFileSet.DirectoryNames) {

+                        // only delete EMPTY directories (no files, no directories)

+                        DirectoryInfo dirInfo = new DirectoryInfo(path);

+

+                        if ((dirInfo.GetFiles().Length == 0) && (dirInfo.GetDirectories().Length == 0)) {

+                            DeleteDirectory(path);

+                        }

+                    }

+                }

+            }

+        }

+

+        void DeleteDirectory(string path) {

+            try {

+                if (Directory.Exists(path)) {

+                    if (Verbose) {

+                        Log.WriteLine(LogPrefix + "Deleting directory {0}", path);

+                    }

+                    if (path.Length > 10) {

+                        Directory.Delete(path, true);

+                    } else {

+                        // TODO: remove this once this task is fully tested and NAnt is at 1.0

+                        Console.WriteLine(LogPrefix + "Path {0} is too close to root to delete this early in development", path);

+                    }

+                } else {

+                    throw new DirectoryNotFoundException();

+                }

+            } catch (Exception e) {

+                if (FailOnError) {

+                    string msg = String.Format("Cannot delete directory {0}", path);

+                    throw new BuildException(msg, Location, e);

+                }

+            }

+        }

+

+        void DeleteFile(string path) {

+            try {

+                if (File.Exists(path)) {

+                    if (Verbose) {

+                        Log.WriteLine(LogPrefix + "Deleting file {0}", path);

+                    }

+                    File.Delete(path);

+                } else {

+                    throw new FileNotFoundException();

+                }

+            } catch (Exception e) {

+                if (FailOnError) {

+                    string msg = String.Format("Cannot delete file {0}", path);

+                    throw new BuildException(msg, Location, e);

+                }

+            }

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/EchoTask.cs b/mcs/nant/src/Tasks/EchoTask.cs
new file mode 100755
index 00000000000..871a4385b10
--- /dev/null
+++ b/mcs/nant/src/Tasks/EchoTask.cs
@@ -0,0 +1,34 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+

+    [TaskName("echo")]

+    public class EchoTask : Task {

+

+        [TaskAttribute("message", Required=true)]

+        string _message = null;

+

+        protected override void ExecuteTask() {

+            Log.WriteLine(LogPrefix + _message);

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/ExecTask.cs b/mcs/nant/src/Tasks/ExecTask.cs
new file mode 100755
index 00000000000..747c8ab5f46
--- /dev/null
+++ b/mcs/nant/src/Tasks/ExecTask.cs
@@ -0,0 +1,58 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+

+    [TaskName("exec")]

+    public class ExecTask : ExternalProgramBase {

+

+        [TaskAttribute("program", Required=true)]

+        string _program = null;

+

+        [TaskAttribute("commandline")]

+        string _commandline = null;

+

+        [TaskAttribute("basedir")]

+        string _baseDirectory = null;

+

+        // Stop the buildprocess if the command exits with a returncode other than 0.

+        [TaskAttribute("failonerror")]

+        [BooleanValidator()]

+        string _failonerror = Boolean.TrueString;

+

+        // TODO: change this to Int32Parameter to ensure value is a valid Int32 type after text expansion

+        [TaskAttribute("timeout")]

+        [Int32Validator()]

+        string _timeout = Int32.MaxValue.ToString();

+

+        public override string ProgramFileName  { get { return Project.GetFullPath(_program); } }

+        public override string ProgramArguments { get { return _commandline; } }

+        public override string BaseDirectory    { get { return Project.GetFullPath(_baseDirectory); } }

+        public override int    TimeOut          { get { return Convert.ToInt32(_timeout); } }

+        public override bool   FailOnError      { get { return Convert.ToBoolean(_failonerror); } }

+

+        protected override void ExecuteTask() {

+            Log.WriteLine(LogPrefix + "{0} {1}", Path.GetFileName(ProgramFileName), GetCommandLine());

+            base.ExecuteTask();

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Tasks/ExternalProgramBase.cs b/mcs/nant/src/Tasks/ExternalProgramBase.cs
new file mode 100755
index 00000000000..0bc938177a2
--- /dev/null
+++ b/mcs/nant/src/Tasks/ExternalProgramBase.cs
@@ -0,0 +1,130 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Collections.Specialized;

+    using System.Diagnostics;

+    using System.IO;

+    using System.Text;

+    using System.Xml;

+

+    public abstract class ExternalProgramBase : Task {

+

+        [TaskAttribute("verbose")]

+        [BooleanValidator()]

+        string _verbose = Boolean.FalseString;

+

+        public abstract string ProgramFileName { get; }

+        public abstract string ProgramArguments { get; }

+

+        public virtual string BaseDirectory {

+            get {

+                if (Project != null) {

+                    return Project.BaseDirectory;

+                } else {

+                    return null;

+                }

+            }

+        }

+

+        public virtual int TimeOut {

+            get { return Int32.MaxValue; }

+        }

+

+        public virtual bool FailOnError {

+            get { return true; }

+        }

+

+        public bool Verbose { 

+            get {

+                return (Project.Verbose || Convert.ToBoolean(_verbose));

+            } 

+        }

+

+        StringCollection _args = new StringCollection();

+

+        protected override void InitializeTask(XmlNode taskNode) {

+            // initialize the _args collection

+            foreach (XmlNode optionNode in taskNode.SelectNodes("arg")) {

+

+                // TODO: decide if we should enforce arg elements not being able

+                // to accept a file and value attribute on the same element.

+                // Ideally this would be down via schema and since it doesn't

+                // really hurt for now I'll leave it in.

+

+                XmlNode valueNode = optionNode.SelectSingleNode("@value");

+                if (valueNode != null) {

+                    _args.Add(Project.ExpandText(valueNode.Value));

+                }

+

+                XmlNode fileNode  = optionNode.SelectSingleNode("@file");

+                if (fileNode != null) {

+                    _args.Add(Project.GetFullPath(Project.ExpandText(fileNode.Value)));

+                }

+            }

+        }

+

+        public string GetCommandLine() {

+            // append any nested <arg> arguments to command line

+            StringBuilder arguments = new StringBuilder(ProgramArguments);

+            foreach (string arg in _args) {

+                arguments = arguments.Append(' ');

+                arguments = arguments.Append(arg);

+            }

+            return arguments.ToString();

+        }

+

+        protected override void ExecuteTask() {

+            try {

+                // create process to launch compiler (redirect standard output to temp buffer)

+                Process process = new Process();

+                process.StartInfo.FileName = ProgramFileName;

+                process.StartInfo.Arguments = GetCommandLine();

+                process.StartInfo.RedirectStandardOutput = true;

+                process.StartInfo.UseShellExecute = false;

+                process.StartInfo.WorkingDirectory = BaseDirectory;

+                if (Verbose) {

+                    Log.WriteLine(LogPrefix + "{0}>{1} {2}", process.StartInfo.WorkingDirectory, process.StartInfo.FileName, process.StartInfo.Arguments);

+                }

+                process.Start();

+ 

+                // display standard output

+                StreamReader reader = process.StandardOutput;

+                string output = reader.ReadToEnd();

+                if (output.Length > 0) {

+                    int indentLevel = Log.IndentLevel;

+                    Log.IndentLevel = 0;

+                    Log.WriteLine(output);

+                    Log.IndentLevel = indentLevel;

+                }

+

+                // wait for program to exit

+                process.WaitForExit(TimeOut);

+

+                if (FailOnError && process.ExitCode != 0) {

+                    throw new BuildException("Program error, see build log for details.");

+                }

+            } catch (Exception e) {

+                throw new BuildException(e.Message, Location, e);

+            }

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Tasks/FailTask.cs b/mcs/nant/src/Tasks/FailTask.cs
new file mode 100755
index 00000000000..2e6b7161fb5
--- /dev/null
+++ b/mcs/nant/src/Tasks/FailTask.cs
@@ -0,0 +1,38 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+

+    [TaskName("fail")]

+    public class FailTask : Task {

+

+        [TaskAttribute("message")]

+        string _message = null;

+

+        protected override void ExecuteTask() {

+            string message = _message;

+            if (message == null) {

+                message = "No message";

+            }

+            throw new BuildException(message);

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/IncludeTask.cs b/mcs/nant/src/Tasks/IncludeTask.cs
new file mode 100755
index 00000000000..637c3dabb5e
--- /dev/null
+++ b/mcs/nant/src/Tasks/IncludeTask.cs
@@ -0,0 +1,134 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Ian MacLean (ian_maclean@another.com)

+

+

+namespace SourceForge.NAnt {

+	

+    using System;

+    using System.Xml;

+    using System.Collections;

+    using System.Collections.Specialized;

+    

+    /// <summary>

+	/// Summary description for IncludeTask.

+	/// </summary>

+	

+    [TaskName("include")] // TODO make into ant:include

+    public class IncludeTask : Task {		

+        

+        /// <summary>hours to to add to the sleep time</summary>

+        [TaskAttribute("href", Required=true)]

+        string _href = null;

+                

+        // Attribute properties

+        public string Href                  { get { return _href; } }

+

+        XPathTextPositionMap _positionMap; // created when Xml document is loaded        

+        TaskCollection _tasks = new TaskCollection();

+          

+        // static members

+        static System.Collections.Stack _includesStack = new Stack();        

+        static bool IsIncluded( string href ) {

+            bool result = false;

+            IEnumerator stackenum = _includesStack.GetEnumerator();

+            while ( stackenum.MoveNext()) {

+                if ( href == (string)stackenum.Current ) {

+                    result = true; break;

+                }

+            }

+            return result;

+        }

+                              

+        protected void InitializeIncludedDocument(XmlDocument doc) {

+            

+            // Load line Xpath to linenumber array

+            _positionMap = new XPathTextPositionMap(doc.BaseURI);                        

+            

+            // process all the non-target nodes (these are global tasks for the project)

+            XmlNodeList taskList = doc.SelectNodes("project/*[name() != 'target']");

+            foreach (XmlNode taskNode in taskList) {

+

+                // TODO: do somethiing like Project.CreateTask(taskNode) and have the project set the location

+                TextPosition textPosition = _positionMap.GetTextPosition(taskNode);

+

+                Task task = Project.CreateTask(taskNode);

+                if (task != null) {

+                    // Store a local copy also so we can execute only those

+                    _tasks.Add(task);                

+                }

+            }    

+            

+            // execute global tasks now - before anything else

+            // this lets us include tasks that do things like add more tasks

+            // Here is where we should check for recursive dependencies

+            //

+            foreach (Task task in _tasks ) {

+                task.Execute();              

+            }

+

+            // process all the targets

+            XmlNodeList targetList = doc.SelectNodes("project/target");

+            foreach (XmlNode targetNode in targetList) {

+                Target target = new Target(Project);

+                target.Initialize(targetNode);

+                Project.Targets.Add(target);

+            }

+        }

+                                

+        /// <summary>

+        ///  verify parameters

+        ///</summary>

+        ///<param name="taskNode"> taskNode used to define this task instance </param>

+        protected override void InitializeTask(XmlNode taskNode) {

+          

+            //TODO check where we are in document - if not at top level then bail out on error ...          

+            // basic recursion check

+            if (IsIncluded( Project.GetFullPath(Href) )) {

+                throw new BuildException("Recursive includes are not allowed", Location);            

+            }           

+        }

+        

+        protected override void ExecuteTask() {

+            

+            string fullpath = Project.GetFullPath(Href);

+            // push ourselves onto the stack

+            _includesStack.Push(fullpath);

+            try {

+      

+                XmlDocument doc = new XmlDocument();

+               

+                // Handle local file case              

+                doc.Load(fullpath);

+                               

+                InitializeIncludedDocument(doc);

+            }

+            // Handling the case where a nested include causes an exception during initialization

+            catch ( BuildException ) {

+                throw;

+            }   

+            catch ( Exception e) {

+                throw new BuildException(e.Message, Location, e);

+            }

+            finally {

+              // Pop off the stack

+              _includesStack.Pop();  

+            }

+        }    

+    }

+}

diff --git a/mcs/nant/src/Tasks/JscTask.cs b/mcs/nant/src/Tasks/JscTask.cs
new file mode 100755
index 00000000000..e2944122aa7
--- /dev/null
+++ b/mcs/nant/src/Tasks/JscTask.cs
@@ -0,0 +1,40 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Mike Krueger (mike@icsharpcode.net)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+

+    [TaskName("jsc")]

+    public class JscTask : CompilerBase {

+

+        // TODO: add JScript.NET specific compiler options here (see CscTask)

+

+        protected override void WriteOptions(TextWriter writer) {

+            // TODO: add support for compiler specific options

+        }

+

+        protected override bool NeedsCompiling() {

+            // TODO: add checks for any referenced files OR return false to always compile

+            return base.NeedsCompiling();

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/McsTask.cs b/mcs/nant/src/Tasks/McsTask.cs
new file mode 100644
index 00000000000..3c5a0ee3f08
--- /dev/null
+++ b/mcs/nant/src/Tasks/McsTask.cs
@@ -0,0 +1,47 @@
+// NAnt - A .NET build tool
+// Copyright (C) 2002 Ximian, Inc.
+//
+// This program is free software; you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation; either version 2 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program; if not, write to the Free Software
+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+//
+// Martin Baulig (martin@gnome.org)
+
+using System;
+using System.IO;
+
+namespace SourceForge.NAnt
+{
+
+    [TaskName("mcs")]
+    public class McsTask : CompilerBase
+    {
+	protected override void WriteOption(TextWriter writer, string name) {
+	    if (name.Equals("nologo")) {
+		return;
+	    } else {
+		writer.WriteLine("--{0}", name);
+	    }
+	}
+
+	protected override void WriteOption(TextWriter writer, string name, string arg) {
+	    if (name.Equals("out")) {
+		writer.WriteLine("-o {0}", arg);
+	    } else if (name.Equals("reference")) {
+		writer.WriteLine("-r {0}", arg);
+	    } else {
+		writer.WriteLine("--{0} {1}", name, arg);
+	    }
+	}
+    }
+}
diff --git a/mcs/nant/src/Tasks/MkDirTask.cs b/mcs/nant/src/Tasks/MkDirTask.cs
new file mode 100755
index 00000000000..fca374b3408
--- /dev/null
+++ b/mcs/nant/src/Tasks/MkDirTask.cs
@@ -0,0 +1,49 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Ian MacLean (ian_maclean@another.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+

+    /// <summary>Creates a directory and any non-existent parent directories when necessary.</summary>

+    [TaskName("mkdir")]

+    public class MkDirTask : Task {

+

+        [TaskAttribute("dir", Required=true)]

+        string _dir = null; // the directory to create

+

+        protected override void ExecuteTask() {

+            try {

+                string directory = Project.GetFullPath(_dir);

+                if (!Directory.Exists(directory)) {

+                    Log.WriteLine(LogPrefix + "Creating directory {0}", directory);

+                    DirectoryInfo result = Directory.CreateDirectory(directory);

+                    if (result == null) {

+                        string msg = String.Format("Unknown error creating directory '{0}'", directory);

+                        throw new BuildException(msg, Location);

+                    }

+                }

+            } catch (Exception e) {

+                throw new BuildException(e.Message, Location, e);

+            }

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/MoveTask.cs b/mcs/nant/src/Tasks/MoveTask.cs
new file mode 100755
index 00000000000..2b63014ef0b
--- /dev/null
+++ b/mcs/nant/src/Tasks/MoveTask.cs
@@ -0,0 +1,71 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Ian MacLean (ian_maclean@another.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+

+    [TaskName("move")]

+    public class MoveTask : CopyTask {

+

+        /// <summary>

+        /// Actually does the file (and possibly empty directory) copies.

+        /// </summary>

+        protected override void DoFileOperations() {

+            if (FileCopyMap.Count > 0) {

+

+                // loop thru our file list

+                foreach (string sourcePath in FileCopyMap.Keys) {

+                    string destinationPath = (string)FileCopyMap[sourcePath];

+                    if (sourcePath == destinationPath) {

+                        Log.WriteLine(LogPrefix + "Skipping self-move of {0}" + sourcePath);

+                        continue;

+                    }

+

+                    try {

+                        // check if directory exists

+                        if (Directory.Exists(sourcePath)) {

+                            Log.WriteLine(LogPrefix + "moving directory {0} to {1}", sourcePath, destinationPath);

+                            Directory.Move(sourcePath, destinationPath);

+                        }

+                        else {

+

+                            DirectoryInfo todir = new DirectoryInfo(destinationPath);

+                            if ( !todir.Exists ) {

+                                Directory.CreateDirectory( Path.GetDirectoryName(destinationPath) );

+                            }

+

+                            Log.WriteLine(LogPrefix + "Moving {0} to {1}", sourcePath, destinationPath);

+                            // IM look into how Ant does this for directories

+                            File.Move(sourcePath, destinationPath);

+                        }

+

+                    } catch (IOException ioe) {

+                        string msg = String.Format("Failed to move {0} to {1}\n{2}", sourcePath, destinationPath, ioe.Message);

+                        throw new BuildException(msg, Location);

+                    }

+                }

+            }

+        }

+    }

+}

+

+

diff --git a/mcs/nant/src/Tasks/NantTask.cs b/mcs/nant/src/Tasks/NantTask.cs
new file mode 100755
index 00000000000..1462ae97097
--- /dev/null
+++ b/mcs/nant/src/Tasks/NantTask.cs
@@ -0,0 +1,65 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Collections.Specialized;

+    using System.Diagnostics;

+    using System.IO;

+    using System.Xml;

+

+    [TaskName("nant")]

+    public class NantTask : Task {

+

+        [TaskAttribute("buildfile")]

+        string _buildFileName = null;

+

+        [TaskAttribute("basedir")]

+        string _baseDirectory = null;

+

+        // TODO: add support for multiple targets

+        [TaskAttribute("target")]

+        string _target = null;

+

+        protected override void ExecuteTask() {

+            string directory = Project.GetFullPath(_baseDirectory);

+            string buildFileName = _buildFileName;

+            if (buildFileName == null) {

+                buildFileName = Project.FindBuildFileName(directory);

+            }

+

+            try {

+                Log.WriteLine(LogPrefix + "{0} {1}", buildFileName, _target);

+                Log.Indent();

+                Project project = new Project();

+                project.BaseDirectory = directory;

+                project.BuildFileName = buildFileName;

+                if (_target != null) {

+                    project.BuildTargets.Add(_target);

+                }

+                if (!project.Run()) {

+                    throw new BuildException("Nested build failed - refer to build log for exact reason.");

+                }

+            } finally {

+                Log.Unindent();

+            }

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Tasks/PropertyTask.cs b/mcs/nant/src/Tasks/PropertyTask.cs
new file mode 100755
index 00000000000..90933ca78ac
--- /dev/null
+++ b/mcs/nant/src/Tasks/PropertyTask.cs
@@ -0,0 +1,37 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+

+    [TaskName("property")]

+    public class PropertyTask : Task {

+

+        [TaskAttribute("name", Required=true)]

+        string _name = null;

+

+        [TaskAttribute("value", Required=true)]

+        string _value = String.Empty;

+

+        protected override void ExecuteTask() {

+            Project.Properties[_name] = _value;

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Tasks/SleepTask.cs b/mcs/nant/src/Tasks/SleepTask.cs
new file mode 100755
index 00000000000..d6c69cc90b1
--- /dev/null
+++ b/mcs/nant/src/Tasks/SleepTask.cs
@@ -0,0 +1,91 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Ian MacLean (ian_maclean@another.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Xml;

+    using System.Threading;

+

+    /// <summary>

+    /// A task for sleeping a short period of time, useful when a build or deployment process

+    /// requires an interval between tasks.

+    /// </summary>

+

+    [TaskName("sleep")]

+    public class SleepTask : Task   {

+

+        /// <summary>hours to to add to the sleep time</summary>

+        [TaskAttribute("hours")]

+        string _hours = null;

+

+        /// <summary>minutes to add to the sleep time</summary>

+        [TaskAttribute("minutes")]

+        string _minutes = 0.ToString();

+

+        /// <summary>seconds to add to the sleep time</summary>

+        [TaskAttribute("seconds")]

+        string _seconds = 0.ToString();

+

+        /// <summary>milliseconds to add to the sleep time</summary>

+        [TaskAttribute("milliseconds")]

+        string _milliseconds = 0.ToString();

+

+        /// <summary>flag controlling whether to break the build on an error</summary>

+        [TaskAttribute("failonerror")]

+        [BooleanValidator()]

+        string _failonerror = Boolean.FalseString;

+

+        // Attribute properties

+        public int Hours                  { get { return Convert.ToInt32(_hours); } }

+        public int Minutes                { get { return Convert.ToInt32(_minutes); } }

+        public int Seconds                { get { return Convert.ToInt32(_seconds); } }

+        public int Milliseconds           { get { return Convert.ToInt32(_milliseconds); } }

+        public bool FailOnError           { get { return Convert.ToBoolean(_failonerror); } }

+

+        ///return time to sleep

+        private int GetSleepTime() {

+            return ((((int) Hours * 60) + Minutes) * 60 + Seconds) * 1000 + Milliseconds;

+        }

+

+        ///<summary> return time to sleep </summary>

+        ///<param name="millis"> </param>

+        private void DoSleep(int millis ) {

+            Thread.Sleep(millis);

+        }

+

+        /// <summary>

+        ///  verify parameters

+        ///</summary>

+        ///<param name="taskNode"> taskNode used to define this task instance </param>

+        protected override void InitializeTask(XmlNode taskNode) {

+            if (GetSleepTime() < 0) {

+                throw new BuildException("Negative sleep periods are not supported", Location);

+            }

+        }

+

+        protected override void ExecuteTask() {

+            int sleepTime = GetSleepTime();

+            Log.WriteLine(LogPrefix + "sleeping for {0} milliseconds", sleepTime);

+            DoSleep(sleepTime);

+        }

+    }

+}

+

+

diff --git a/mcs/nant/src/Tasks/StyleTask.cs b/mcs/nant/src/Tasks/StyleTask.cs
new file mode 100755
index 00000000000..05117217d0b
--- /dev/null
+++ b/mcs/nant/src/Tasks/StyleTask.cs
@@ -0,0 +1,171 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Serge (serge@wildwestsoftware.com)

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+    using System.Xml;

+    using System.Xml.Xsl;

+    using System.Xml.XPath;

+    using System.Text.RegularExpressions;

+

+    [TaskName("style")]

+    public class StyleTask : Task {

+

+        // TODO: consider prefixing private fields with _ to stay consistent (gs)

+

+        [TaskAttribute("basedir", Required=false)]

+        string baseDir = null;

+

+        [TaskAttribute("destdir", Required=false)]

+        string destDir = null;

+

+        [TaskAttribute("extension", Required=false)]

+        string extension = "html";

+

+        [TaskAttribute("style", Required=true)]

+        string xsltFile = null;

+

+        [TaskAttribute("in", Required=true)]

+        string srcFile = null;

+

+        [TaskAttribute("out", Required=false)]

+        string destFile = null;

+

+        private static string GetPath(string dir, string file) {

+            // TODO: remove platform dependencies by using System.IO.Path (gs)

+            string d = (dir == null)

+                ? ""

+                : Regex.Replace(dir, "/", "\\");

+

+            return (d==null || d=="")

+                ? (file==null || file=="") ? "" : file

+                : d.EndsWith("\\")

+                ? d +file : d + "\\" + file;

+        }

+

+        private XmlReader CreateXmlReader(string dir, string file) {

+            string xmlPath = GetPath(dir, file);

+            XmlTextReader xmlReader = null;

+

+            try {

+                xmlReader = new XmlTextReader(new FileStream(xmlPath, FileMode.Open));

+            } catch (Exception) {

+                xmlReader = null;

+            }

+

+            return xmlReader;

+        }

+

+        private XmlWriter CreateXmlWriter(string dir, string file) {

+            string xmlPath = GetPath(dir, file);

+

+            XmlWriter xmlWriter = null;

+

+            string targetDir = Path.GetDirectoryName(Path.GetFullPath(xmlPath));

+            if (targetDir != null && targetDir != "" && !Directory.Exists(targetDir)) {

+                Directory.CreateDirectory(targetDir);

+            }

+

+            try {

+                // UTF-8 encoding will be used

+                xmlWriter = new XmlTextWriter(xmlPath, null);

+            } catch (Exception) {

+                xmlWriter = null;

+            }

+

+            return xmlWriter;

+        }

+

+        protected override void ExecuteTask() {

+            string destFile = this.destFile;

+

+            if (destFile == null || destFile == "") {

+                // TODO: use System.IO.Path (gs)

+                string ext = extension[0]=='.'

+                    ? extension

+                    : "." + extension;

+

+                int extPos = srcFile.LastIndexOf('.');

+

+                if (extPos == -1) {

+                    destFile = srcFile + ext;

+                } else {

+                    destFile = srcFile.Substring(0, extPos) + ext;

+                }

+            }

+

+            string srcPath = GetPath(baseDir, srcFile);

+            string destPath = GetPath(destDir, destFile);

+            string xsltPath = GetPath(baseDir, xsltFile);

+

+            FileInfo srcInfo = new FileInfo(srcPath);

+            FileInfo destInfo = new FileInfo(destPath);

+            FileInfo xsltInfo = new FileInfo(xsltPath);

+

+            if (!srcInfo.Exists) {

+                throw new BuildException("Unable to find source xml file.");

+            }

+            if (!xsltInfo.Exists) {

+                throw new BuildException("Unable to find stylesheet file.");

+            }

+

+            bool destOutdated = !destInfo.Exists

+                || srcInfo.LastWriteTime > destInfo.LastWriteTime

+                || xsltInfo.LastWriteTime > destInfo.LastWriteTime;

+

+            if (destOutdated) {

+                XmlReader xmlReader = CreateXmlReader(baseDir, srcFile);

+                XmlReader xslReader = CreateXmlReader(baseDir, xsltFile);

+                XmlWriter xmlWriter = CreateXmlWriter(destDir, destFile);

+

+                Log.WriteLine(LogPrefix + "Transforming into " + Path.GetFullPath(destDir));

+

+                // TODO: remove assignments from conditional statement (gs)

+                if (xmlReader != null && xslReader != null && xmlWriter != null) {

+                    XslTransform xslt = new XslTransform();

+                    XPathDocument xml = new XPathDocument(xmlReader);

+

+                    Log.WriteLine(LogPrefix + "Loading stylesheet " + Path.GetFullPath(xsltPath));

+                    try {

+                        xslt.Load(xslReader);

+                    } catch (XsltCompileException xce) {

+                        throw new BuildException(xce.Message, xce);

+                    } catch (Exception e) {

+                        throw new BuildException(e.Message, e);

+                    }

+

+                    Log.WriteLine(LogPrefix + "Processing " + Path.GetFullPath(srcPath) + " to " + Path.GetFullPath(destPath));

+                    try {

+                        xslt.Transform(xml, null, xmlWriter);

+                    } catch (Exception e) {

+                        throw new BuildException(e.Message, e);

+                    }

+                } else {

+                    // not sure how to deal with this...

+                    // TODO: remove this statement or do something useful (gs)

+                    // Can this condition occur? I would have thought

+                    // that an exception would be thrown. (gs)

+                }

+            }

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/TStampTask.cs b/mcs/nant/src/Tasks/TStampTask.cs
new file mode 100755
index 00000000000..1806a3040c4
--- /dev/null
+++ b/mcs/nant/src/Tasks/TStampTask.cs
@@ -0,0 +1,43 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+

+    /// <remarks>

+    /// Sets the following properties:

+    /// <ul>

+    ///   <li>nant.dateStamp to yyyyMMdd</li>

+    ///   <li>nant.timeStamp to HHmm</li>

+    ///   <li>nant.today using default DataTime.ToString() method</li>

+    /// </ul>

+    /// </remarks>

+    [TaskName("tstamp")]

+    public class TStampTask : Task {

+        protected override void ExecuteTask() {

+            DateTime now = DateTime.Now;

+            Log.WriteLine(LogPrefix + now.ToString());

+            Project.Properties["nant.dstamp"] = now.ToString("yyyyMMdd");

+            Project.Properties["nant.tstamp"] = now.ToString("HHmm");

+            Project.Properties["nant.today"] = now.ToString();

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/TaskDefTask.cs b/mcs/nant/src/Tasks/TaskDefTask.cs
new file mode 100755
index 00000000000..4c7eca7be4f
--- /dev/null
+++ b/mcs/nant/src/Tasks/TaskDefTask.cs
@@ -0,0 +1,42 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+

+    [TaskName("taskdef")]

+    public class TaskDefTask : Task {

+

+        [TaskAttribute("assembly", Required=true)]

+        string _assemblyFileName = null;

+

+        protected override void ExecuteTask() {

+            string assemblyFileName = Project.GetFullPath(_assemblyFileName);

+            try {

+                int taskCount = Project.AddTasks(assemblyFileName);

+                Log.WriteLine(LogPrefix + "Added {0} tasks from {1}", taskCount, assemblyFileName);

+            } catch (Exception e) {

+                Log.WriteLine(LogPrefix + "Adding tasks from {0}", assemblyFileName);

+                throw new BuildException(e.Message, Location, e);

+            }

+        }

+    }

+}

diff --git a/mcs/nant/src/Tasks/VbcTask.cs b/mcs/nant/src/Tasks/VbcTask.cs
new file mode 100755
index 00000000000..4f93787eed8
--- /dev/null
+++ b/mcs/nant/src/Tasks/VbcTask.cs
@@ -0,0 +1,40 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+// Mike Krueger (mike@icsharpcode.net)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+

+    [TaskName("vbc")]

+    public class VbcTask : CompilerBase {

+

+        // TODO: add JScript.NET specific compiler options here (see CscTask)

+

+        protected override void WriteOptions(TextWriter writer) {

+            // TODO: add support for compiler specific options

+        }

+

+        protected override bool NeedsCompiling() {

+            // TODO: add checks for any referenced files OR return false to always compile

+            return base.NeedsCompiling();

+        }

+    }

+}

diff --git a/mcs/nant/src/Util/Log.cs b/mcs/nant/src/Util/Log.cs
new file mode 100755
index 00000000000..b875663069d
--- /dev/null
+++ b/mcs/nant/src/Util/Log.cs
@@ -0,0 +1,155 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.Collections;

+    using System.IO;

+    using System.Text;

+

+    public class TextWriterCollection : ArrayList {

+    }

+

+    public class Log {

+

+        static bool _autoFlush  = false;

+        static int _indentLevel = 0;

+        static int _indentSize  = 4;

+

+        static TextWriterCollection _listeners;

+

+        protected Log() {

+        }

+

+        ~Log() {

+            // make sure we release any open file handles

+            Close();

+        }

+

+        public static bool AutoFlush {

+            get { return _autoFlush; }

+            set { _autoFlush = value; }

+        }

+

+        public static int IndentLevel {

+            get { return _indentLevel; }

+            set { _indentLevel = value; }

+        }

+

+        public static int IndentSize {

+            get { return _indentSize; }

+            set { _indentSize = value; }

+        }

+

+        public static TextWriterCollection Listeners {

+            get {

+                if (_listeners == null) {

+                    _listeners = new TextWriterCollection();

+                    _listeners.Add(Console.Out);

+                }

+                return _listeners;

+            }

+        }

+

+        public static void Close() {

+            foreach (TextWriter writer in Listeners) {

+                // never close the Console.Out writer

+                if (writer != Console.Out) {

+                    writer.Close();

+                }

+            }

+        }

+

+        public static void Flush() {

+            foreach (TextWriter writer in Listeners) {

+                writer.Flush();

+            }

+        }

+

+        public static void Indent() {

+            IndentLevel++;

+        }

+

+        public static void Unindent() {

+            if (IndentLevel <= 0) {

+                throw new InvalidOperationException("IndentLevel must be greater than zero before calling Unindent()");

+            }

+            IndentLevel--;

+        }

+

+        /// <summary>

+        /// Flag to indicate next string will start on a new line so that it can be indented.

+        /// </summary>

+        private static bool _newline = true;

+

+        private static void PreprocessValue(ref string value) {

+            // if we are starting a new line then first indent the string

+            if (_newline) {

+                if (IndentLevel > 0) {

+                    StringBuilder sb = new StringBuilder(value);

+                    sb.Insert(0, " ", IndentLevel * IndentSize);

+                    value = sb.ToString();

+                }

+                _newline = false;

+            }

+        }

+

+        public static void Write(string value) {

+            PreprocessValue(ref value);

+            foreach (TextWriter writer in Listeners) {

+                writer.Write(value);

+            }

+

+            if (AutoFlush) {

+                foreach (TextWriter writer in Listeners) {

+                    writer.Flush();

+                }

+            }

+        }

+

+        public static void WriteLine() {

+            WriteLine(String.Empty);

+        }

+

+        public static void WriteLine(string value) {

+            PreprocessValue(ref value);

+            foreach (TextWriter writer in Listeners) {

+                writer.WriteLine(value);

+            }

+

+            if (AutoFlush) {

+                foreach (TextWriter writer in Listeners) {

+                    writer.Flush();

+                }

+            }

+

+            // make sure we indent the next line

+            _newline = true;

+        }

+

+        public static void Write(string format, params object[] arg) {

+            Write(String.Format(format, arg));

+        }

+

+        public static void WriteLine(string format, params object[] arg) {

+            WriteLine(String.Format(format, arg));

+        }

+    }

+}
\ No newline at end of file
diff --git a/mcs/nant/src/Util/XmlNodeTextPositionMap.cs b/mcs/nant/src/Util/XmlNodeTextPositionMap.cs
new file mode 100755
index 00000000000..fd10caafd4f
--- /dev/null
+++ b/mcs/nant/src/Util/XmlNodeTextPositionMap.cs
@@ -0,0 +1,187 @@
+// NAnt - A .NET build tool

+// Copyright (C) 2001 Gerry Shaw

+//

+// This program is free software; you can redistribute it and/or modify

+// it under the terms of the GNU General Public License as published by

+// the Free Software Foundation; either version 2 of the License, or

+// (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA

+//

+// Gerry Shaw (gerry_shaw@yahoo.com)

+

+namespace SourceForge.NAnt {

+

+    using System;

+    using System.IO;

+    using System.Text.RegularExpressions;

+    using System.Xml;

+    using System.Xml.XPath;

+    using System.Collections;

+

+    public struct TextPosition {

+        public static readonly TextPosition InvalidPosition = new TextPosition(-1,-1);

+

+        public TextPosition(int line, int column) {

+            Line = line;

+            Column = column;

+        }

+

+        public int Line;

+        public int Column;

+    }

+

+    /// <summary>

+    /// Maps XML nodes to the text positions from their original source.

+    /// </summary>

+    public class XPathTextPositionMap {

+

+        Hashtable _map = new Hashtable();

+

+        public XPathTextPositionMap(string url) {

+            string parentXPath = "/"; // default to root

+            string previousXPath = "";

+            int previousDepth = 0;

+

+            // Load text reader

+            XmlTextReader reader = new XmlTextReader(url);

+            ArrayList indexAtDepth = new ArrayList();

+

+            // Explicitly load document XPath

+            _map.Add((object) "/", (object) new TextPosition(1, 1));

+

+            // loop thru all nodes in the document

+            while (reader.Read()) {

+                // reader to Node ...

+                if (   (reader.NodeType.ToString() != "Whitespace")  // Ignore those we aren't interested in

+                    && (reader.NodeType.ToString() != "EndElement")

+                    && (reader.NodeType.ToString() != "ProcessingInstruction")

+                    && (reader.NodeType.ToString() != "XmlDeclaration")

+                    ) {

+                    int level = reader.Depth;

+                    string currentXPath = "";

+

+                    // If we arr higher than before

+                    if (reader.Depth < previousDepth) {

+                        // Clear vars for new depth

+                        string[] list = parentXPath.Split('/');

+                        string newXPath = ""; // once appended to / will be root node ...

+

+                        for (int j = 1; j < level+1; j++) {

+                            newXPath += "/" + list[j];

+                        }

+

+                        // higher than before so trim xpath\

+                        parentXPath = newXPath; // one up from before

+

+                        // clear indexes for depth greater than ours

+                        indexAtDepth.RemoveRange(level+1, indexAtDepth.Count - (level+1));

+

+                    } else if (reader.Depth > previousDepth) {

+                        // we are lower

+                        parentXPath = previousXPath;

+                    }

+

+                    // End depth setup

+                    // Setup up index array

+                    // add any needed extra items ( usually only 1 )

+                    // would have uses array but not sure what maximum depth will be beforehand

+                    for (int index = indexAtDepth.Count; index < level+1; index++) {

+                        indexAtDepth.Add(0);

+                    }

+                    // Set child index

+                    if ((int) indexAtDepth[level] == 0) {

+                        // first time thru

+                        indexAtDepth[level] = 1;

+                    } else {

+                        indexAtDepth[level] = (int) indexAtDepth[level] + 1; // lower so append to xpath

+                    }

+

+                    // Do actual XPath generation

+                    if (parentXPath.EndsWith("/")) {

+                        currentXPath = parentXPath;

+                    } else {

+                        currentXPath = parentXPath + "/"; // add seperator

+                    }

+

+                    // Set the final XPath

+                    currentXPath += "child::node()[" + indexAtDepth[level] + "]";

+

+                    // Add to our hash structures

+                    _map.Add((object) currentXPath, (object) new TextPosition(reader.LineNumber, reader.LinePosition));

+

+                    // setup up loop vars for next iteration

+                    previousXPath = currentXPath;

+                    previousDepth = reader.Depth;

+                }

+            }

+        }

+

+        public TextPosition GetTextPosition(XmlNode node) {

+            string xpath = GetXPathFromNode(node);

+            return GetTextPosition(xpath);

+        }

+

+        public TextPosition GetTextPosition(string xpath) {

+            TextPosition pos;

+            if (_map.ContainsKey(xpath)) {

+                pos = (TextPosition) _map[xpath];

+            } else {

+                pos = TextPosition.InvalidPosition;

+            }

+            return pos;

+        }

+

+        private string GetXPathFromNode(XmlNode node) {

+            XPathNavigator nav = node.CreateNavigator();

+

+            string xpath = "";

+            int index = 0;

+

+            while (nav.NodeType.ToString() != "Root") {

+                // loop thru children until we find ourselves

+                XPathNavigator navParent = nav.Clone();

+                navParent.MoveToParent();

+                int parentIndex = 0;

+                navParent.MoveToFirstChild();

+                if (navParent.IsSamePosition(nav)) {

+                    index = parentIndex;

+                }

+                while (navParent.MoveToNext()) {

+                    parentIndex++;

+                    if (navParent.IsSamePosition(nav)) {

+                        index = parentIndex;

+                    }

+                }

+

+                nav.MoveToParent(); // do loop condiditon here

+

+                // if we are at doc and index = 0 then there is no xml proc instruction

+                if ((nav.NodeType.ToString()) != "Root" || (index == 0)) {

+                    index = index + 1; // special case at root to avoid processing instruction ..

+                }

+

+                string thisNode = "child::node()[" + index  + "]";

+

+                if (xpath == "") {

+                    xpath = thisNode;

+                } else {

+                    // build xpath string

+                    xpath = thisNode + "/" + xpath;

+                }

+            }

+

+            // prepend slash to ...

+            xpath = "/" + xpath;

+

+            return xpath;

+        }

+    }

+}

diff --git a/mcs/nunit/.cvsignore b/mcs/nunit/.cvsignore
new file mode 100644
index 00000000000..e9eebe20f68
--- /dev/null
+++ b/mcs/nunit/.cvsignore
@@ -0,0 +1,5 @@
+*.dll
+*.pdb
+NUnit.Prefs
+.makefrag
+.response
diff --git a/mcs/nunit/ChangeLog b/mcs/nunit/ChangeLog
new file mode 100644
index 00000000000..2508bd83791
--- /dev/null
+++ b/mcs/nunit/ChangeLog
@@ -0,0 +1,43 @@
+2002-08-04  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* makefile.gnu: make it use the freshly built mcs.
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	* makefile.gnu, list.unix: Added makefile.gnu for self-hosting
+	GNU/Linux build.
+
+	* src/NUnitConsole/makefile.gnu, src/NUnitConsole/list.unix: Likewise.
+
+2002-03-08  Nick Drochak  <ndrochak@gol.com>
+
+	* nunit.build: exclude all the obsolete stuff, and prevent csc from
+	linking any ms stuff to the dll and exe we are testing on Linux.
+
+2002-03-07  Nick Drochak  <ndrochak@gol.com>
+
+	* .cvsignore: ignore *.pdb files
+	* nunit.build: Build a version of NUnitCore.dll and NUnitConsole.exe
+	using mono's corlib. Use this to test on Linux under mint and mono.
+
+2002-03-06  Nick Drochak  <ndrochak@gol.com>
+
+	* nunit.build: Exclude obsolete class from build. Probably should
+	remove from cvs.
+
+2002-02-27  Martin Baulig  <martin@gnome.org>
+
+	Imported NUnit 1.11.
+
+	* nunit.build: Added NAnt build file for NUnit. In addition to
+	NUnitConsole.exe and NUnitCore.dll, we also create a small
+	NUnitBase.dll which just contains the source files which are needed
+	to run the tests on Linux.
+
+	* RunTests.cs: This is a simple test runner which is used when we
+	run the tests on Linux. It is linked into UNitBase.dll.
+
+	* makefile: Just call NAnt here.
+
+	* NUnitGUI.exe, NUnitTests.dll: Removed binaries.
+
diff --git a/mcs/nunit/RunTests.cs b/mcs/nunit/RunTests.cs
new file mode 100755
index 00000000000..e5369546900
--- /dev/null
+++ b/mcs/nunit/RunTests.cs
@@ -0,0 +1,79 @@
+using System;

+using System.IO;

+using System.Threading;

+using System.Globalization;

+

+using NUnit.Framework;

+

+namespace MonoTests {

+

+public class MyTestRunner {

+

+	static TextWriter fWriter = Console.Out;

+

+	protected static TextWriter Writer {

+		get { return fWriter; }

+	}

+

+	public static void Print(TestResult result) {

+		PrintErrors(result);

+		PrintFailures(result);

+		PrintHeader(result);

+	}

+

+	/// <summary>Prints the errors to the standard output.</summary>

+	public static void PrintErrors(TestResult result) {

+		if (result.ErrorCount != 0) {

+			if (result.ErrorCount == 1)

+				Writer.WriteLine("There was "+result.ErrorCount+" error:");

+			else

+				Writer.WriteLine("There were "+result.ErrorCount+" errors:");

+			

+			int i= 1;

+			foreach (TestFailure failure in result.Errors) {

+				Writer.WriteLine(i++ + ") "+failure+"("+failure.ThrownException.GetType().ToString()+")");

+				Writer.Write(failure.ThrownException);

+			}

+		}

+	}

+

+	/// <summary>Prints failures to the standard output.</summary>

+	public static void PrintFailures(TestResult result) {

+		if (result.FailureCount != 0) {

+			if (result.FailureCount == 1)

+				Writer.WriteLine("There was " + result.FailureCount + " failure:");

+			else

+				Writer.WriteLine("There were " + result.FailureCount + " failures:");

+			int i = 1;

+			foreach (TestFailure failure in result.Failures) {

+				Writer.Write(i++ + ") " + failure.FailedTest);

+				Exception t= failure.ThrownException;

+				if (t.Message != "")

+					Writer.WriteLine(" \"" + t.Message + "\"");

+				else {

+					Writer.WriteLine();

+					Writer.Write(failure.ThrownException);

+				}

+			}

+		}

+	}

+

+	/// <summary>Prints the header of the report.</summary>

+	public static void PrintHeader(TestResult result) {

+		if (result.WasSuccessful) {

+			Writer.WriteLine();

+			Writer.Write("OK");

+			Writer.WriteLine (" (" + result.RunCount + " tests)");

+			

+		} else {

+			Writer.WriteLine();

+			Writer.WriteLine("FAILURES!!!");

+			Writer.WriteLine("Tests Run: "+result.RunCount+ 

+					 ", Failures: "+result.FailureCount+

+					 ", Errors: "+result.ErrorCount);

+		}

+	}

+

+}

+

+}

diff --git a/mcs/nunit/list.unix b/mcs/nunit/list.unix
new file mode 100644
index 00000000000..0215692c2b4
--- /dev/null
+++ b/mcs/nunit/list.unix
@@ -0,0 +1,24 @@
+src/NUnitCore/ActiveTestSuite.cs
+src/NUnitCore/AssemblyInfo.cs
+src/NUnitCore/Assertion.cs
+src/NUnitCore/AssertionFailedError.cs
+src/NUnitCore/BaseTestRunner.cs
+src/NUnitCore/ExceptionTestCase.cs
+src/NUnitCore/ExpectExceptionAttribute.cs
+src/NUnitCore/IFailureDetailView.cs
+src/NUnitCore/IProtectable.cs
+src/NUnitCore/ITest.cs
+src/NUnitCore/ITestCollector.cs
+src/NUnitCore/ITestListener.cs
+src/NUnitCore/NUnitException.cs
+src/NUnitCore/RepeatedTest.cs
+src/NUnitCore/TestCase.cs
+src/NUnitCore/TestDecorator.cs
+src/NUnitCore/TestFailure.cs
+src/NUnitCore/TestResult.cs
+src/NUnitCore/TestSetup.cs
+src/NUnitCore/TestSuite.cs
+src/NUnitCore/Version.cs
+src/NUnitCore/AssemblyTestCollector.cs
+src/NUnitCore/ITestLoader.cs
+src/NUnitCore/StandardLoader.cs
diff --git a/mcs/nunit/makefile b/mcs/nunit/makefile
new file mode 100644
index 00000000000..ba70bb94770
--- /dev/null
+++ b/mcs/nunit/makefile
@@ -0,0 +1,14 @@
+NANT	= ../nant/NAnt.exe
+
+all: build
+
+linux: build
+
+windows: build
+
+build:
+	$(NANT) build
+
+clean:
+	$(NANT) clean
+
diff --git a/mcs/nunit/makefile.gnu b/mcs/nunit/makefile.gnu
new file mode 100644
index 00000000000..e3683ab655f
--- /dev/null
+++ b/mcs/nunit/makefile.gnu
@@ -0,0 +1,14 @@
+topdir = ..
+
+LIBRARY = ../class/lib/NUnitCore_mono.dll
+
+LIB_LIST = list.unix
+LIB_FLAGS = -r ../class/lib/corlib.dll -r ../class/lib/System.dll
+
+SOURCES_INCLUDE=./src/NUnitCore/*.cs
+SOURCES_EXCLUDE=/dev/null
+
+export MONO_PATH_PREFIX = ../class/lib:
+
+include ../class/library.make
+
diff --git a/mcs/nunit/nunit.build b/mcs/nunit/nunit.build
new file mode 100755
index 00000000000..ab085a314e7
--- /dev/null
+++ b/mcs/nunit/nunit.build
@@ -0,0 +1,85 @@
+<?xml version="1.0" encoding="iso-8859-1"?>

+

+<!-- NAnt build file for NUnit -->

+

+<project name="NUnit" default="build">

+	<property name="debug" value="true"/>

+

+	<target name="build">

+		<csc target="library" output="NUnitCore.dll" debug="${debug}">

+			<sources basedir="src/NUnitCore">

+				<includes name="*.cs"/>

+				<excludes name="SimpleTestCollector.cs"/>

+				<excludes name="ClassPathTestCollector.cs"/>

+				<excludes name="ReflectionUtils.cs"/>

+				<excludes name="ITestSuiteLoader.cs"/>

+				<excludes name="LoadingTestCollector.cs"/>

+				<excludes name="ReloadingTestSuiteLoader.cs"/>

+				<excludes name="StandardTestSuiteLoader.cs"/>

+				<excludes name="TestCaseClassLoader.cs"/>

+			</sources>

+		</csc>

+

+		<csc target="library" output="NUnitCore_mono.dll" debug="${debug}">

+			<sources basedir="src/NUnitCore">

+				<includes name="*.cs"/>

+				<excludes name="SimpleTestCollector.cs"/>

+				<excludes name="ClassPathTestCollector.cs"/>

+				<excludes name="ReflectionUtils.cs"/>

+				<excludes name="ITestSuiteLoader.cs"/>

+				<excludes name="LoadingTestCollector.cs"/>

+				<excludes name="ReloadingTestSuiteLoader.cs"/>

+				<excludes name="StandardTestSuiteLoader.cs"/>

+				<excludes name="TestCaseClassLoader.cs"/>

+			</sources>

+			<arg value="/r:..\class\lib\corlib.dll"/>

+			<arg value="/r:..\class\lib\System.dll"/>

+			<arg value="/nostdlib"/> 	<!-- don't reference mscorlib -->

+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->

+		</csc>

+

+		<csc target="library" output="NUnitBase.dll" debug="${debug}">

+			<sources>

+				<includes name="src/NUnitCore/*.cs"/>

+				<includes name="RunTests.cs"/>

+				<excludes name="src/NUnitCore/IFailureDetailView.cs"/>

+				<excludes name="src/NUnitCore/SimpleTestCollector.cs"/>

+			</sources>

+		</csc>

+

+		<csc target="exe" output="NUnitConsole.exe" debug="${debug}">

+			<sources basedir="src\NUnitConsole">

+				<includes name="*.cs"/>

+			</sources>

+			<references>

+				<includes name="NUnitCore.dll"/>

+			</references>

+		</csc>

+

+		<csc target="exe" output="NUnitConsole_mono.exe" debug="${debug}">

+			<sources basedir="src\NUnitConsole">

+				<includes name="*.cs"/>

+			</sources>

+			<references>

+				<includes name="NUnitCore_mono.dll"/>

+			</references>

+			<arg value="/nostdlib"/> 	<!-- don't reference mscorlib -->

+			<arg value="/noconfig"/>	<!-- don't reference ms assemblies -->

+			<arg value="/r:..\class\lib\corlib.dll"/>

+		</csc>

+	</target>

+

+	<target name="clean">

+		<delete file="NUnitCore.dll" failonerror="false"/>

+		<delete file="NUnitCore_mono.dll" failonerror="false"/>

+		<delete file="NUnitBase.dll" failonerror="false"/>

+		<delete file="NUnitConsole.exe" failonerror="false"/>

+		<delete file="NUnitConsole_mono.exe" failonerror="false"/>

+		<delete file="NUnitCore.pdb" failonerror="false"/>

+		<delete file="NUnitCore_mono.pdb" failonerror="false"/>

+		<delete file="NUnitBase.pdb" failonerror="false"/>

+		<delete file="NUnitConsole.pdb" failonerror="false"/>

+		<delete file="NUnitConsole_mono.pdb" failonerror="false"/>

+	</target>

+

+</project>

diff --git a/mcs/nunit/src/NUnitConsole/.cvsignore b/mcs/nunit/src/NUnitConsole/.cvsignore
new file mode 100644
index 00000000000..6ab3e7d65d9
--- /dev/null
+++ b/mcs/nunit/src/NUnitConsole/.cvsignore
@@ -0,0 +1,4 @@
+.makefrag-exe
+.response-exe
+NUnit.Prefs
+NUnitConsole_mono
diff --git a/mcs/nunit/src/NUnitConsole/AssemblyInfo.cs b/mcs/nunit/src/NUnitConsole/AssemblyInfo.cs
index be984e5c039..184c24203a1 100644
--- a/mcs/nunit/src/NUnitConsole/AssemblyInfo.cs
+++ b/mcs/nunit/src/NUnitConsole/AssemblyInfo.cs
@@ -50,6 +50,6 @@ using System.Runtime.CompilerServices;
 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

 //       documentation for more information on this.

 //

-[assembly: AssemblyDelaySign(false)]

-[assembly: AssemblyKeyFile(@"..\..\..\..\NUnit.key")]

-[assembly: AssemblyKeyName("")]

+//[assembly: AssemblyDelaySign(false)]

+//[assembly: AssemblyKeyFile(@"..\..\..\..\NUnit.key")]

+//[assembly: AssemblyKeyName("")]

diff --git a/mcs/nunit/src/NUnitConsole/NUnitConsole.xml b/mcs/nunit/src/NUnitConsole/NUnitConsole.xml
new file mode 100644
index 00000000000..7aaf89815df
--- /dev/null
+++ b/mcs/nunit/src/NUnitConsole/NUnitConsole.xml
@@ -0,0 +1,146 @@
+<?xml version="1.0"?>

+<doc>

+    <assembly>

+        <name>NUnitConsole</name>

+    </assembly>

+    <members>

+        <member name="T:NUnit.Top">

+            <summary>

+            

+            </summary>

+        </member>

+        <member name="M:NUnit.Top.Main(System.String[])">

+            <summary>

+            

+            </summary>

+            <param name="args"></param>

+        </member>

+        <member name="T:NUnit.TextUI.TestRunner">

+            <summary>A command line based tool to run tests.</summary><remarks>

+            <code>

+            C:\NUnitConsole.exe /t [/wait] TestCaseClass

+            </code>

+            TestRunner expects the name of a TestCase class as argument.

+            If this class defines a static <c>Suite</c> property it 

+            will be invoked and the returned test is run. Otherwise all 

+            the methods starting with "Test" having no arguments are run.

+            
+            When the wait command line argument is given TestRunner

+            waits until the users types RETURN.

+            
+            TestRunner prints a trace as the tests are executed followed by a

+            summary at the end.</remarks>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.#ctor">

+            <summary>

+            Constructs a TestRunner.

+            </summary>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.#ctor(System.IO.TextWriter)">

+            <summary>

+            Constructs a TestRunner using the given stream for all the output

+            </summary>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.AddError(NUnit.Framework.ITest,System.Exception)">

+            <summary>

+            

+            </summary>

+            <param name="test"></param>

+            <param name="t"></param>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.AddFailure(NUnit.Framework.ITest,NUnit.Framework.AssertionFailedError)">

+            <summary>

+            

+            </summary>

+            <param name="test"></param>

+            <param name="t"></param>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.CreateTestResult">

+            <summary>Creates the TestResult to be used for the test run.</summary>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.DoRun(NUnit.Framework.ITest,System.Boolean)">

+            <summary>

+            

+            </summary>

+            <param name="suite"></param>

+            <param name="wait"></param>

+            <returns></returns>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.EndTest(NUnit.Framework.ITest)">

+            <summary>

+            

+            </summary>

+            <param name="test"></param>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.GetLoader">

+            <summary>

+            

+            </summary>

+            <returns></returns>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.Print(NUnit.Framework.TestResult)">

+            <summary>

+            

+            </summary>

+            <param name="result"></param>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.PrintErrors(NUnit.Framework.TestResult)">

+            <summary>Prints the errors to the standard output.</summary>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.PrintFailures(NUnit.Framework.TestResult)">

+            <summary>Prints failures to the standard output.</summary>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.PrintHeader(NUnit.Framework.TestResult)">

+            <summary>Prints the header of the report.</summary>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.Run(System.Type)">

+            <summary>Runs a Suite extracted from a TestCase subclass.</summary>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.Run(NUnit.Framework.ITest)">

+            <summary>

+            

+            </summary>

+            <param name="suite"></param>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.RunAndWait(NUnit.Framework.ITest)">

+            <summary>Runs a single test and waits until the user

+            types RETURN.</summary>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.RunFailed(System.String)">

+            <summary>

+            

+            </summary>

+            <param name="message"></param>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.Start(System.String[])">

+            <summary>Starts a test run. Analyzes the command line arguments

+            and runs the given test suite.</summary>

+        </member>

+        <member name="M:NUnit.TextUI.TestRunner.StartTest(NUnit.Framework.ITest)">

+            <summary>

+            

+            </summary>

+            <param name="test"></param>

+        </member>

+        <member name="P:NUnit.TextUI.TestRunner.Writer">

+            <summary>

+            

+            </summary>

+        </member>

+        <member name="M:System.Collections.Hashtable.Synchronized(System.Collections.Hashtable)">

+            <summary>

+             Returns a synchronized (thread-safe)

+             wrapper for the Hashtable.

+            </summary>

+        </member>

+        <member name="M:System.Collections.Hashtable.GetHash(System.Object)">

+            <summary>Returns the hash code for the specified key.</summary>

+        </member>

+        <member name="M:System.Collections.Hashtable.KeyEquals(System.Object,System.Object)">

+            <summary>

+             Compares a specific Object with a specific key

+             in the Hashtable.

+            </summary>

+        </member>

+    </members>

+</doc>

diff --git a/mcs/nunit/src/NUnitConsole/list.unix b/mcs/nunit/src/NUnitConsole/list.unix
new file mode 100644
index 00000000000..98d8fe5e157
--- /dev/null
+++ b/mcs/nunit/src/NUnitConsole/list.unix
@@ -0,0 +1,3 @@
+AssemblyInfo.cs
+TestRunner.cs
+NUnitConsoleMain.cs
diff --git a/mcs/nunit/src/NUnitConsole/makefile.gnu b/mcs/nunit/src/NUnitConsole/makefile.gnu
new file mode 100644
index 00000000000..bc7e78aa0ad
--- /dev/null
+++ b/mcs/nunit/src/NUnitConsole/makefile.gnu
@@ -0,0 +1,14 @@
+topdir = ../../..
+PROGRAM = NUnitConsole_mono.exe
+
+PROGRAM_LIST = list.unix
+PROGRAM_FLAGS =	\
+	-r ../../../class/lib/corlib.dll	\
+	-r ../../../class/lib/System.dll 	\
+	-r ../../../class/lib/NUnitCore_mono.dll
+
+include ../../../class/executable.make
+
+MCS = mono $(topdir)/mcs/mcs.exe
+MCS_FLAGS = --target exe --noconfig
+
diff --git a/mcs/nunit/src/NUnitCore/AssemblyInfo.cs b/mcs/nunit/src/NUnitCore/AssemblyInfo.cs
index 6f48173a95a..bd0c7b8eee4 100644
--- a/mcs/nunit/src/NUnitCore/AssemblyInfo.cs
+++ b/mcs/nunit/src/NUnitCore/AssemblyInfo.cs
@@ -50,6 +50,6 @@ using System.Runtime.CompilerServices;
 //   (*) Delay Signing is an advanced option - see the Microsoft .NET Framework

 //       documentation for more information on this.

 //

-[assembly: AssemblyDelaySign(false)]

-[assembly: AssemblyKeyFile(@"..\..\..\..\NUnit.key")]

-[assembly: AssemblyKeyName("")]
\ No newline at end of file
+//[assembly: AssemblyDelaySign(false)]

+//[assembly: AssemblyKeyFile(@"..\..\..\..\NUnit.key")]

+//[assembly: AssemblyKeyName("")]
diff --git a/mcs/nunit/src/NUnitCore/IFailureDetailView.cs b/mcs/nunit/src/NUnitCore/IFailureDetailView.cs
index 424c5a096b7..55553b505ad 100644
--- a/mcs/nunit/src/NUnitCore/IFailureDetailView.cs
+++ b/mcs/nunit/src/NUnitCore/IFailureDetailView.cs
@@ -1,7 +1,6 @@
 namespace NUnit.Runner {

 

   using System;

-  using System.Windows.Forms;

 

   using NUnit.Framework;

 

@@ -15,11 +14,6 @@ namespace NUnit.Runner {
     void Clear();

 

     /// <summary>

-    /// Returns the component used to present the TraceView

-    /// </summary>

-    Control GetComponent();

-

-    /// <summary>

     /// Shows details of a TestFailure

     /// </summary>

     void ShowFailure(TestFailure failure);

diff --git a/mcs/nunit/src/NUnitCore/SimpleTestCollector.cs b/mcs/nunit/src/NUnitCore/SimpleTestCollector.cs
new file mode 100644
index 00000000000..e1f73ea959a
--- /dev/null
+++ b/mcs/nunit/src/NUnitCore/SimpleTestCollector.cs
@@ -0,0 +1,28 @@
+namespace NUnit.Runner {

+

+  using System;

+

+  /// <summary>

+  /// An implementation of a TestCollector that considers

+  /// a class to be a test class when it contains the

+  /// pattern "Test" in its name

+  /// <see cref="ITestCollector"/>

+  /// </summary>

+  public class SimpleTestCollector: ClassPathTestCollector {

+	/// <summary>

+	/// 

+	/// </summary>

+    public SimpleTestCollector() {

+    }

+	/// <summary>

+	/// 

+	/// </summary>

+	/// <param name="classFileName"></param>

+	/// <returns></returns>

+    protected override bool IsTestClass(string classFileName) {

+      return 

+        (classFileName.EndsWith(".dll") || classFileName.EndsWith(".exe")) && 

+        classFileName.IndexOf("Test") > 0;

+    }

+  }

+}
\ No newline at end of file
diff --git a/mcs/nunit/src/NUnitCore/TestSuite.cs b/mcs/nunit/src/NUnitCore/TestSuite.cs
index 7febc1150f5..ea40612de16 100644
--- a/mcs/nunit/src/NUnitCore/TestSuite.cs
+++ b/mcs/nunit/src/NUnitCore/TestSuite.cs
@@ -36,9 +36,10 @@ namespace NUnit.Framework
 		/// <summary>Constructs an empty TestSuite with a name.</summary>

 		public TestSuite(string name) 

 		{

-			if(name==null)

-				this.fName=String.Empty;

-			this.fName = name;

+			if(name == null)

+				this.fName = String.Empty;

+			else

+				this.fName = name;

 		}

 

 		/// <summary>Constructs an empty TestSuite with no name.</summary>

diff --git a/mcs/tests/ChangeLog b/mcs/tests/ChangeLog
new file mode 100755
index 00000000000..4a4458f0d2f
--- /dev/null
+++ b/mcs/tests/ChangeLog
@@ -0,0 +1,571 @@
+2002-08-11  Martin Baulig  <martin@gnome.org>
+
+	* test-162.cs: New test.
+
+2002-08-08  Martin Baulig  <martin@gnome.org>
+
+	* test-154.cs (test16): Added test for bug #28717.
+
+2002-08-08  Martin Baulig  <martin@gnome.org>
+
+	* test-161.cs: New test.
+
+2002-08-07  Martin Baulig  <martin@gnome.org>
+
+	* test-160.cs: New test for bug #28176.
+
+2002-08-07  Martin Baulig  <martin@gnome.org>
+
+	* test-158.cs: New test for bug #22119.
+
+2002-08-05  Martin Baulig  <martin@gnome.org>
+
+	* test-157.cs: Formerly known as ../errors/cs-20.cs
+
+2002-08-05  Martin Baulig  <martin@gnome.org>
+
+	* error-1.cs, error-2.cs: Moved to ../errors.
+
+2002-08-03  Martin Baulig  <martin@gnome.org>
+
+	* test-156.cs, error-2.cs: New tests.
+
+2002-08-02  Martin Baulig  <martin@gnome.org>
+
+	* makefile: Moved test-66.cs to TEST_NOPASS since there's currently
+	a bug in the runtime which makes this crash.
+
+	* test-155.cs: New test.
+
+2002-08-01  Martin Baulig  <martin@gnome.org>
+
+	* verify-3.cs: New test.
+
+2002-07-31  Martin Baulig  <martin@gnome.org>
+
+	* test-154.cs: New test for the flow analysis code.
+
+	* error-1.cs: Each method in this test must produce a compiler
+	error message.
+
+	* makefile (test-unsafe-mono): New target to compile and run all
+	the --unsafe tests wich MCS and the Mono runtime.
+
+2002-07-29  Martin Baulig  <martin@gnome.org>
+
+	* makefile: Put back test-152.cs.
+
+	* test-143.cs: Fixed a compilation error in this test.
+
+2002-07-27  Martin Baulig  <martin@gnome.org>
+
+	* test-153.cs: New test.
+
+2002-07-27  Martin Baulig  <martin@gnome.org>
+
+	* test-113.cs: Made this test actually work.
+
+2002-07-26  Martin Baulig  <martin@gnome.org>
+
+	* test-152.cs: New test for bug #24007.
+
+	* makefile: Disabled test-151.cs since it isn't fixed yet.
+
+2002-07-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* test-151.cs: New test. See bug #22119.
+	* makefile: added new test.
+
+2002-07-24  Martin Baulig  <martin@gnome.org>
+
+	* test-150.cs: New test.
+
+	* test-149.cs: New test.
+
+	* test-95.cs: .... and finally, another bug in MCS is fixed and
+	the syntax error in this test is caught.
+
+2002-07-23  Martin Baulig  <martin@gnome.org>
+
+	* test-148.cs: New test.
+
+2002-07-22  Martin Baulig  <martin@gnome.org>
+
+	* verify-2.cs: New test.
+
+2002-07-22  Martin Baulig  <martin@gnome.org>
+
+	* verify-1.cs: New test.  The verify-XXX.cs tests must be
+	compiled and then verified - either with `pedump --verify code'
+	or with PEverify.
+
+2002-07-22  Martin Baulig  <martin@gnome.org>
+
+	* makefile: test-29 now passes.
+
+2002-07-22  Martin Baulig  <martin@gnome.org>
+
+	* test.147.cs: New test for the `new' modifier.
+
+2002-07-21  Martin Baulig  <martin@gnome.org>
+
+	* test-38.cs: Added a few more test cases to this test.
+
+2002-07-20  Martin Baulig  <martin@gnome.org>
+
+	* test-38.cs: This test now passes with MCS.  Added a few more
+	test cases to it.
+
+	* test-52.cs: The order of the elements returned by
+	`IDictionary.Keys' is unspecified.
+
+	* makefile: The following tests fail under linux and have been
+	moved to TEST_NOPASS: 45, 53, 91, 106, 107, 122, 132, 133.
+	(test-compiler-mono): Compile all the TEST_NOPASS tests, but
+	don't run them.
+
+2002-07-20  Martin Baulig  <martin@gnome.org>
+
+	* README.tests: Added (empty) list of all the test cases.
+	When you add any test cases, please add them to this file.
+
+	* test-146.cs: Added test for bug #27977 which is now fixed.
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	* test-145.cs: Added test for bug #25318 which is now fixed.
+
+2002-07-17  Martin Baulig  <martin@gnome.org>
+
+	* test-144.cs: Added test for constant `unchecked' and `checked'
+	expressions in a constant assignment.
+
+2002-07-10  Ravi Pratap  <ravi@ximian.com>
+
+	* test-142.cs : Add. This ensures events can be accessed
+	correctly from subclasses etc.
+	
+2002-07-06  Andrew Birkett  <adb@tardis.ed.ac.uk>
+
+	* test-74.cs: Added test for \n in verbatim string.
+
+2002-06-27  Martin Baulig  <martin@gnome.org>
+
+	* makefile (test-compiler-mono): New target to compile and run
+	the tests with mcs and the mono jit.
+
+2002-06-25  Andrew Birkett  <adb@tardis.ed.ac.uk>
+
+	* makefile: The following tests fail under linux and have been 
+	moved to TEST_NOPASS: 40, 45, 52, 53, 91, 106, 107, 122, 132, 133
+
+	Windows-specific tests have been extracted, and are now run by the
+	test-windows rule (it'll be run under linux but fail)
+
+	The output format has been made less noisy, and is basically the
+	same as the tests in mcs/errors - like "Running test-1 ... OK".
+
+2002-06-13  Ravi Pratap  <ravi@ximian.com>
+
+	* test-131.cs : Add to test enum member attribute application.
+
+2002-06-10  Rachel Hestilow  <hestilow@ximian.com>
+
+	* unsafe-3.cs: New test for address-of-pointer.
+	
+2002-06-09  Martin Baulig  <martin@gnome.org>
+
+	* test-130.cs: New test for constants and casts.
+
+2002-06-09  Martin Baulig  <martin@gnome.org>
+
+	* test-129.cs: New test for unary minus.
+
+2002-06-08  Ravi Pratap  <ravi@ximian.com>
+
+	* test-128.cs : Add. This ensures we apply attributes to accessors
+	of events and properties.
+
+2002-06-08  Martin Baulig  <martin@gnome.org>
+
+	* test-127.cs: New test for Enum.IsDefined().
+
+2002-05-24  Ravi Pratap  <ravi@ximian.com>
+
+	* test-124.cs, test-125.cs : Add.
+
+	* makefile : update.
+
+2002-05-11  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-49.cs: Improve test.
+
+Wed May 8 16:48:11 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* test-118.cs: test alternate type lookup for attributes.
+
+2002-05-07  Ravi Pratap  <ravi@ximian.com>
+
+	* test-117.cs : Add.
+
+2002-05-05  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-28.cs: Improved test: before we were failing on abstract
+	indexers invoked in the same class (as the accessor would have no
+	body).
+
+2002-05-02  Ravi Pratap  <ravi@ximian.com>
+
+	* test-113.cs : Another test for overload resolution ;-)
+
+	* test-114.cs : Add.
+
+2002-04-28  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-108.cs: Improve test
+
+2002-04-26  Ravi Pratap  <ravi@ximian.com>
+
+	* test-105.cs, test-106.cs, test-107.cs : Add.
+
+2002-04-22  Ravi Pratap  <ravi@ximian.com>
+
+	* test-104.cs : Another overload resolution test !
+
+2002-04-05  Ravi Pratap  <ravi@ximian.com>
+
+	* test-101.cs : Add test from Paolo.
+
+	* test-102.cs : Another test for attribute emission.
+
+2002-04-05  Ravi Pratap  <ravi@ximian.com>
+
+	* test-90.cs : Fix bug where we had no class !
+
+	* test-96.cs : Here too !
+
+	* test-98.cs : Supply a missing Main.
+
+2002-03-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-18.cs: Augment test with the multi-flow try/catch.
+
+2002-03-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-49.cs: Improved test to excerise the coverage.
+
+2002-03-13  Ravi Pratap  <ravi@ximian.com>
+
+	* test-86.cs : Add. This is to check for correct overload resolution
+	with a null literal.
+
+2002-03-07  Ravi Pratap  <ravi@ximian.com>
+
+	* test-82.cs : Add.
+
+2002-03-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-52.cs: Expanded test to cover more cases of foreach.
+
+2002-03-05  Ravi Pratap  <ravi@ximian.com>
+
+	* test-81.cs : Add. 
+
+	* makefile : Update accordingly as this test passes.
+
+2002-02-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* unsafe-1.cs: Extend test.
+
+2002-01-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-7.cs: Fix test (i.i wsa invalid)
+
+2002-01-18  Nick Drochak  <ndrochak@gol.com>
+
+	* makefile: remove path to beta2 csc.exe.  path to csc.exe must be in PATH instead.
+
+2002-01-13  Ravi Pratap  <ravi@ximian.com>
+
+	* test-58.cs : Since it was a duplicate, replace with unsafe
+	code testing.
+
+2002-01-08  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-34.cs: Improve this test to check ref/ref cases.
+
+2002-01-02  Ravi Pratap  <ravi@ximian.com>
+
+	* test-45.cs : Augment to exercise support for array initialization
+	for various other types.
+
+2001-12-30  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-67.cs: Improve this test.
+
+2001-12-29  Ravi Pratap  <ravi@ximian.com>
+
+	* test-69.cs : Add. This tests support for methods which are
+	internal calls.
+
+2001-12-28  Ravi Pratap  <ravi@ximian.com>
+
+	* test-34.cs : Update to exercise the new overload resolution
+	code.
+
+2001-12-26  Ravi Pratap  <ravi@ximian.com>
+
+	* test-67.cs : Add. These are tests for explicit layout
+	of structs and classes.
+
+	* makefile : Update accordingly.
+	
+2001-12-25  Ravi Pratap  <ravi@ximian.com>
+
+	* test-57.cs : Update to exercise more of the code base for
+	events.
+
+2001-12-24  Ravi Pratap  <ravi@ximian.com>
+
+	* test-19.cs : Augment to exercise tests on delegates
+	defined in mscorlib.
+
+	* test-57.cs : Update to exercise the -= operator
+	as well.
+	
+2001-12-23  Ravi Pratap  <ravi@ximian.com>
+
+	* test-57.cs : Update.
+
+	* makefile : Update to include the above as it passes nicely.
+
+2001-12-21  Ravi Pratap  <ravi@ximian.com>
+
+	* test-19.cs : Augment to exercise code which fixed the bug
+	where we were not generating a This for the delegate's 
+	instance expression - for the non-static methods ie.
+
+2001-12-15  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-45.cs: Make test also use variables as arguments to new;
+	We used to have a bug in the compiler that did not resolve some of
+	the arguments.
+
+2001-12-15  Ravi Pratap  <ravi@ximian.com>
+
+	* makefile : Include test-52.cs in the suite, it works fine!
+
+	(NO_PASS): It's test-51 which doesn't seem to pass.
+
+	* test-50.cs : Augment some more to set named arguments on
+	the DllImport attribute.
+
+	* test-57.cs : Add. This tests support for Events and does not
+	pass yet.
+
+2001-12-14  Ravi Pratap  <ravi@ximian.com>
+
+	* test-45.cs : Update for float and double initialization.
+
+2001-12-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* makefile (test-30): Another test moved to the `pass' section.
+	This is explicit interface implementation.
+
+	(test-54): returning from catch exceptions has been working for
+	some time now. 
+
+2001-12-09  Radek Doulik  <rodo@ximian.com>
+
+	* makefile (TEST_SOURCES): added test-55 for using alias directive
+
+2001-12-06  Dietmar Maurer  <dietmar@ximian.com>
+
+	* makefile: added new target test-jit
+
+2001-12-04  Ravi Pratap <ravi@ximian.com>
+
+	* makefile : Update to include test 50 as it now passes.
+
+2001-12-04  Ravi Pratap <ravi@ximian.com>
+
+	* test-45.cs : Update for string initialization tests.
+
+2001-12-03  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-49.cs: Updated to test `goto default'
+
+	* test-43.cs: Test break and continue here.
+
+	* gen-cast-test.cs: Improved cast test generator.
+
+2001-12-03  Ravi Pratap <ravi@ximian.com>
+
+	* test-50.cs : Add. This does not pass yet.
+
+2001-12-02  Ravi Pratap  <ravi@ximian.com>
+
+	* test-40.cs : Update to now test recursive definitions with
+	constants hooked up.
+
+2001-12-01  Ravi Pratap  <ravi@ximian.com>
+
+	* test-40.cs : Update to do recursive enumeration definition.
+
+2001-11-28  Ravi Pratap  <ravi@ximian.com>
+
+	* test-48.cs : Add for constant emission tests.
+
+	* makefile : Update for the above as it passes nicely :-)
+
+2001-11-22  Ravi Pratap  <ravi@ximian.com>
+
+	* test-45.cs : Augment some more to test shorthand declaration
+	of variables/fields that are array types.
+
+2001-11-20  Ravi Pratap  <ravi@ximian.com>
+
+	* test-45.cs : Add for array initialization testing.
+
+2001-11-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-34.cs: Improve this test to check if we are actually
+	walking over the arguments in foreach.
+
+2001-11-15  Ravi Pratap  <ravi@ximian.com>
+
+	* makefile : Update to include test-33 again. All tests
+	pass again !
+
+2001-11-13  Ravi Pratap  <ravi@ximian.com>
+
+	* test-7.cs : Re-write to make the tests more robust.
+
+2001-11-12  Ravi Pratap  <ravi@ximian.com>
+
+	* test-39.cs : Update to test named arguments too.
+
+2001-11-11  Ravi Pratap  <ravi@ximian.com>
+
+	* test-40.cs : Update to be a little more useful.
+
+2001-11-08  Ravi Pratap  <ravi@ximian.com>
+
+	* test-39.cs : Add
+
+	* test-40.cs : Add
+
+	* makefile : Modify to include the above as they pass all tests.
+	
+2001-10-31  Ravi Pratap  <ravi@ximian.com>
+
+	* test-34.cs : Add 
+	
+2001-10-28  Ravi Pratap  <ravi@ximian.com>
+
+	* test-32.cs : Added to test array definition and creation.
+
+	* makefile : Updated accordingly.
+
+2001-10-22  Ravi Pratap  <ravi@ximian.com>
+
+	* makefile : New target 'verify' which uses the verifier to check
+	that executables produced by us are identical to the MSC produced ones.
+
+	* test-7.cs : Update to exercise more overloadable operators.
+
+2001-10-21  Ravi Pratap  <ravi@ximian.com>
+
+	* test-27.cs : Add to do various implicit and explicit
+	reference conversions.
+
+	* makefile : Update accordingly.
+
+2001-10-18  Ravi Pratap  <ravi@ximian.com>
+
+	* test-26.cs : Update to test delegate creation from another 
+	delegate.
+	
+2001-10-17  Ravi Pratap  <ravi@ximian.com>
+
+	* test-26.cs : Added to demonstrate delegate support.
+
+2001-10-16  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-25.cs: Added new test to excercise break/continue on
+	various loop constructs.
+
+	* test-24.cs: Test property use in expression and statement
+	contexts. 
+
+2001-10-14  Miguel de Icaza  <miguel@ximian.com>
+
+	* test-23.cs: Added new test for properties. 
+
+2001-10-12  Ravi Pratap  <ravi@ximian.com>
+
+	* test-21.cs : Update to actually do some checking and return
+	an appropriate value.
+
+2001-10-11  Ravi Pratap  <ravi@ximian.com>
+
+	* test-21.cs : Add. This is a test for testing our support
+	for nested types
+	
+2001-10-05  Ravi Pratap  <ravi@ximian.com>
+
+	* test-16.cs : Update to exercise the code which selects the best 
+	conversion operator based on "most encompassing/encompassed type"
+
+	* test-7.cs : Update here too.
+
+2001-10-05  Ravi Pratap  <ravi@ximian.com>
+
+	* test-7.cs : Update to do explicit conversion tests.
+
+	* makefile : small fix.
+
+2001-10-03  Ravi Pratap  <ravi@ximian.com>
+
+	* test-16.cs : Update to make the test more correct.
+
+2001-10-03  Ravi Pratap  <ravi@ximian.com>
+
+	* test-16.cs : Add.
+
+	* makefile : update accordingly.
+
+2001-10-02  Miguel de Icaza  <miguel@ximian.com>
+
+	* makefile (test-compiler): Add rm *.exe before launching tests.
+
+2001-10-02  Ravi Pratap  <ravi@ximian.com>
+
+	* test-13.cs : Added. 
+
+	* makefile : update accordingly.
+
+2001-09-27  Ravi Pratap  <ravi@ximian.com>
+
+	* test-7.cs : Revamp and add more operator tests. Still in progress.
+
+	* test-9,10.cs : Added by Miguel earlier.
+
+2001-09-26  Ravi Pratap  <ravi@ximian.com>
+
+	* test-7.cs : Update to return an exit code
+
+	* test-8.cs : Added by Miguel.
+
+2001-09-25  Ravi Pratap  <ravi@ximian.com>
+
+	* test-7.cs : Update to include implicit conversion tests.
+
+2001-09-21  Ravi Pratap  <ravi@ximian.com>
+
+	* test-7.cs : Add.
+
+2001-09-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* makefile (test-compiler): Abort tests on failure.
+
diff --git a/mcs/tests/README.tests b/mcs/tests/README.tests
new file mode 100644
index 00000000000..906923560a4
--- /dev/null
+++ b/mcs/tests/README.tests
@@ -0,0 +1,142 @@
+Test cases listed by Category:
+==============================
+
+* Binary operators
+
+  test-146.cs
+
+* Overloading
+
+  test-147.cs
+
+* Try/Catch blocks
+
+  verify-1.cs verify-2.cs
+
+* Indexers and Properties
+
+  test-148.cs
+
+* Events and Delegates
+
+  test-149.cs verify-3.cs
+
+* Constant Folding
+
+  test-150.cs
+
+* Switch blocks
+
+  test-152.cs
+
+* Member Access & Simple Names
+
+  test-151.cs test-159.cs test-160.cs test-161.cs
+
+* Invocation
+
+  test-153.cs
+
+* Flow Analysis
+
+  test-154.cs test-162.cs
+
+* Type Containers
+
+  test-155.cs test-156.cs
+
+* Attributes
+
+  test-157.cs test-158.cs
+
+Test cases listed by Number:
+============================
+
+test-146.cs
+-----------
+Test for Binary.EmitBrancheable() to ensure we're emitting correct
+unsinged branch targets.
+
+test-147.cs
+-----------
+Testing `new' modifier.
+
+test-148.cs
+-----------
+Testing the `IndexerName' attribute in interface indexers.
+
+test-149.cs
+-----------
+Testing interface events.
+
+test-150.cs
+-----------
+Test for folding of UIntConstants.  See bug #28106.
+FIXME:  We should all all possible test cases to this test.
+
+test-151.cs
+-----------
+
+  A.Iface b;
+  void doit (Object A) {
+    b = (A.Iface)A;
+ }
+
+test-152.cs
+-----------
+Scope of variables declared inside a switch case.
+
+test-153.cs
+-----------
+Testing invocation of varargs function.
+
+test-154.cs
+-----------
+Flow analysis: This test contains all situations which are "allowed".
+
+test-155.cs
+-----------
+Nested interfaces.
+
+test-156.cs
+-----------
+Check whether base types are at least as accessible than the current type.
+
+test-157.cs
+-----------
+Attributes.
+
+test-158.cs
+-----------
+Attributes.
+
+test-159.cs
+-----------
+SimpleNameLookup: Cast to `A.Iface' type when there's a parameter called `A'.
+
+test-160.cs
+-----------
+ResolveMemberLookup: `B look; return look.s.a' must work in static context.
+
+test-161.cs
+-----------
+ResolveMemberLookup: Field initializer references `DateTime.Now' when there's
+an instance property/field `DateTime'.
+
+test-162.cs
+-----------
+Control Flow Analysis wrt. structs.
+
+verify-1.cs
+-----------
+Test whether we do not jump out of the method in a Try/Finally block.
+
+verify-2.cs
+-----------
+Test whether `return' in a Try/Catch block actually returns.  Test
+whether continue uses Leave when the branch is across Try/Catch
+boundaries.
+
+verify-3.cs
+-----------
+Checks default add/remove method of static events.
diff --git a/mcs/tests/c1.cs b/mcs/tests/c1.cs
new file mode 100755
index 00000000000..8b81c046864
--- /dev/null
+++ b/mcs/tests/c1.cs
@@ -0,0 +1,7 @@
+// cs0146.cs: circular class definition
+// Line: 6
+class A : B {
+}
+
+class B : A {
+}
diff --git a/mcs/tests/c2.cs b/mcs/tests/c2.cs
new file mode 100755
index 00000000000..eeeb6f19e74
--- /dev/null
+++ b/mcs/tests/c2.cs
@@ -0,0 +1,2 @@
+class X {
+}
diff --git a/mcs/tests/casts.cs b/mcs/tests/casts.cs
new file mode 100755
index 00000000000..8934e4eee7e
--- /dev/null
+++ b/mcs/tests/casts.cs
@@ -0,0 +1,566 @@
+using System;
+class Test {
+

+	static void receive_int (int a)
+	{
+		Console.Write ("        ");
+		Console.WriteLine (a);
+	}
+
+	static void receive_uint (uint a)
+	{
+		Console.Write ("        ");
+		Console.WriteLine (a);
+	}
+
+	static void receive_short (short a)
+	{
+		Console.Write ("        ");
+		Console.WriteLine (a);
+	}
+
+	static void receive_ushort (ushort a)
+	{
+		Console.Write ("        ");
+		Console.WriteLine (a);
+	}
+
+	static void receive_long (long a)
+	{
+		Console.Write ("        ");
+		Console.WriteLine (a);
+	}
+
+	static void receive_ulong (ulong a)
+	{
+		Console.Write ("        ");
+		Console.WriteLine (a);
+	}
+
+	static void receive_sbyte (sbyte a)
+	{
+		Console.Write ("        ");
+		Console.WriteLine (a);
+	}
+
+	static void receive_byte (byte a)
+	{
+		Console.Write ("        ");
+		Console.WriteLine (a);
+	}
+
+	static void receive_char (char a)
+	{
+		Console.Write ("        ");
+		Console.WriteLine (a);
+	}
+
+	static void probe_int()
+	{
+		int zero = (int) 0;
+		int min = (int) int.MinValue;
+		int max = (int) int.MaxValue;
+

+		Console.WriteLine ("Testing: int");
+

+		Console.WriteLine ("   arg: int (int)");
+

+		receive_int (unchecked ((int) zero));
+		receive_int (unchecked ((int) min));
+		receive_int (unchecked ((int) max));
+		Console.WriteLine ("   arg: uint (int)");
+

+		receive_uint (unchecked ((uint) zero));
+		receive_uint (unchecked ((uint) min));
+		receive_uint (unchecked ((uint) max));
+		Console.WriteLine ("   arg: short (int)");
+

+		receive_short (unchecked ((short) zero));
+		receive_short (unchecked ((short) min));
+		receive_short (unchecked ((short) max));
+		Console.WriteLine ("   arg: ushort (int)");
+

+		receive_ushort (unchecked ((ushort) zero));
+		receive_ushort (unchecked ((ushort) min));
+		receive_ushort (unchecked ((ushort) max));
+		Console.WriteLine ("   arg: long (int)");
+

+		receive_long (unchecked ((long) zero));
+		receive_long (unchecked ((long) min));
+		receive_long (unchecked ((long) max));
+		Console.WriteLine ("   arg: ulong (int)");
+

+		receive_ulong (unchecked ((ulong) zero));
+		receive_ulong (unchecked ((ulong) min));
+		receive_ulong (unchecked ((ulong) max));
+		Console.WriteLine ("   arg: sbyte (int)");
+

+		receive_sbyte (unchecked ((sbyte) zero));
+		receive_sbyte (unchecked ((sbyte) min));
+		receive_sbyte (unchecked ((sbyte) max));
+		Console.WriteLine ("   arg: byte (int)");
+

+		receive_byte (unchecked ((byte) zero));
+		receive_byte (unchecked ((byte) min));
+		receive_byte (unchecked ((byte) max));
+		Console.WriteLine ("   arg: char (int)");
+

+		receive_char (unchecked ((char) zero));
+		receive_char (unchecked ((char) min));
+		receive_char (unchecked ((char) max));
+	}
+
+	static void probe_uint()
+	{
+		uint zero = (uint) 0;
+		uint min = (uint) uint.MinValue;
+		uint max = (uint) uint.MaxValue;
+

+		Console.WriteLine ("Testing: uint");
+

+		Console.WriteLine ("   arg: int (uint)");
+

+		receive_int (unchecked ((int) zero));
+		receive_int (unchecked ((int) min));
+		receive_int (unchecked ((int) max));
+		Console.WriteLine ("   arg: uint (uint)");
+

+		receive_uint (unchecked ((uint) zero));
+		receive_uint (unchecked ((uint) min));
+		receive_uint (unchecked ((uint) max));
+		Console.WriteLine ("   arg: short (uint)");
+

+		receive_short (unchecked ((short) zero));
+		receive_short (unchecked ((short) min));
+		receive_short (unchecked ((short) max));
+		Console.WriteLine ("   arg: ushort (uint)");
+

+		receive_ushort (unchecked ((ushort) zero));
+		receive_ushort (unchecked ((ushort) min));
+		receive_ushort (unchecked ((ushort) max));
+		Console.WriteLine ("   arg: long (uint)");
+

+		receive_long (unchecked ((long) zero));
+		receive_long (unchecked ((long) min));
+		receive_long (unchecked ((long) max));
+		Console.WriteLine ("   arg: ulong (uint)");
+

+		receive_ulong (unchecked ((ulong) zero));
+		receive_ulong (unchecked ((ulong) min));
+		receive_ulong (unchecked ((ulong) max));
+		Console.WriteLine ("   arg: sbyte (uint)");
+

+		receive_sbyte (unchecked ((sbyte) zero));
+		receive_sbyte (unchecked ((sbyte) min));
+		receive_sbyte (unchecked ((sbyte) max));
+		Console.WriteLine ("   arg: byte (uint)");
+

+		receive_byte (unchecked ((byte) zero));
+		receive_byte (unchecked ((byte) min));
+		receive_byte (unchecked ((byte) max));
+		Console.WriteLine ("   arg: char (uint)");
+

+		receive_char (unchecked ((char) zero));
+		receive_char (unchecked ((char) min));
+		receive_char (unchecked ((char) max));
+	}
+
+	static void probe_short()
+	{
+		short zero = (short) 0;
+		short min = (short) short.MinValue;
+		short max = (short) short.MaxValue;
+

+		Console.WriteLine ("Testing: short");
+

+		Console.WriteLine ("   arg: int (short)");
+

+		receive_int (unchecked ((int) zero));
+		receive_int (unchecked ((int) min));
+		receive_int (unchecked ((int) max));
+		Console.WriteLine ("   arg: uint (short)");
+

+		receive_uint (unchecked ((uint) zero));
+		receive_uint (unchecked ((uint) min));
+		receive_uint (unchecked ((uint) max));
+		Console.WriteLine ("   arg: short (short)");
+

+		receive_short (unchecked ((short) zero));
+		receive_short (unchecked ((short) min));
+		receive_short (unchecked ((short) max));
+		Console.WriteLine ("   arg: ushort (short)");
+

+		receive_ushort (unchecked ((ushort) zero));
+		receive_ushort (unchecked ((ushort) min));
+		receive_ushort (unchecked ((ushort) max));
+		Console.WriteLine ("   arg: long (short)");
+

+		receive_long (unchecked ((long) zero));
+		receive_long (unchecked ((long) min));
+		receive_long (unchecked ((long) max));
+		Console.WriteLine ("   arg: ulong (short)");
+

+		receive_ulong (unchecked ((ulong) zero));
+		receive_ulong (unchecked ((ulong) min));
+		receive_ulong (unchecked ((ulong) max));
+		Console.WriteLine ("   arg: sbyte (short)");
+

+		receive_sbyte (unchecked ((sbyte) zero));
+		receive_sbyte (unchecked ((sbyte) min));
+		receive_sbyte (unchecked ((sbyte) max));
+		Console.WriteLine ("   arg: byte (short)");
+

+		receive_byte (unchecked ((byte) zero));
+		receive_byte (unchecked ((byte) min));
+		receive_byte (unchecked ((byte) max));
+		Console.WriteLine ("   arg: char (short)");
+

+		receive_char (unchecked ((char) zero));
+		receive_char (unchecked ((char) min));
+		receive_char (unchecked ((char) max));
+	}
+
+	static void probe_ushort()
+	{
+		ushort zero = (ushort) 0;
+		ushort min = (ushort) ushort.MinValue;
+		ushort max = (ushort) ushort.MaxValue;
+

+		Console.WriteLine ("Testing: ushort");
+

+		Console.WriteLine ("   arg: int (ushort)");
+

+		receive_int (unchecked ((int) zero));
+		receive_int (unchecked ((int) min));
+		receive_int (unchecked ((int) max));
+		Console.WriteLine ("   arg: uint (ushort)");
+

+		receive_uint (unchecked ((uint) zero));
+		receive_uint (unchecked ((uint) min));
+		receive_uint (unchecked ((uint) max));
+		Console.WriteLine ("   arg: short (ushort)");
+

+		receive_short (unchecked ((short) zero));
+		receive_short (unchecked ((short) min));
+		receive_short (unchecked ((short) max));
+		Console.WriteLine ("   arg: ushort (ushort)");
+

+		receive_ushort (unchecked ((ushort) zero));
+		receive_ushort (unchecked ((ushort) min));
+		receive_ushort (unchecked ((ushort) max));
+		Console.WriteLine ("   arg: long (ushort)");
+

+		receive_long (unchecked ((long) zero));
+		receive_long (unchecked ((long) min));
+		receive_long (unchecked ((long) max));
+		Console.WriteLine ("   arg: ulong (ushort)");
+

+		receive_ulong (unchecked ((ulong) zero));
+		receive_ulong (unchecked ((ulong) min));
+		receive_ulong (unchecked ((ulong) max));
+		Console.WriteLine ("   arg: sbyte (ushort)");
+

+		receive_sbyte (unchecked ((sbyte) zero));
+		receive_sbyte (unchecked ((sbyte) min));
+		receive_sbyte (unchecked ((sbyte) max));
+		Console.WriteLine ("   arg: byte (ushort)");
+

+		receive_byte (unchecked ((byte) zero));
+		receive_byte (unchecked ((byte) min));
+		receive_byte (unchecked ((byte) max));
+		Console.WriteLine ("   arg: char (ushort)");
+

+		receive_char (unchecked ((char) zero));
+		receive_char (unchecked ((char) min));
+		receive_char (unchecked ((char) max));
+	}
+
+	static void probe_long()
+	{
+		long zero = (long) 0;
+		long min = (long) long.MinValue;
+		long max = (long) long.MaxValue;
+

+		Console.WriteLine ("Testing: long");
+

+		Console.WriteLine ("   arg: int (long)");
+

+		receive_int (unchecked ((int) zero));
+		receive_int (unchecked ((int) min));
+		receive_int (unchecked ((int) max));
+		Console.WriteLine ("   arg: uint (long)");
+

+		receive_uint (unchecked ((uint) zero));
+		receive_uint (unchecked ((uint) min));
+		receive_uint (unchecked ((uint) max));
+		Console.WriteLine ("   arg: short (long)");
+

+		receive_short (unchecked ((short) zero));
+		receive_short (unchecked ((short) min));
+		receive_short (unchecked ((short) max));
+		Console.WriteLine ("   arg: ushort (long)");
+

+		receive_ushort (unchecked ((ushort) zero));
+		receive_ushort (unchecked ((ushort) min));
+		receive_ushort (unchecked ((ushort) max));
+		Console.WriteLine ("   arg: long (long)");
+

+		receive_long (unchecked ((long) zero));
+		receive_long (unchecked ((long) min));
+		receive_long (unchecked ((long) max));
+		Console.WriteLine ("   arg: ulong (long)");
+

+		receive_ulong (unchecked ((ulong) zero));
+		receive_ulong (unchecked ((ulong) min));
+		receive_ulong (unchecked ((ulong) max));
+		Console.WriteLine ("   arg: sbyte (long)");
+

+		receive_sbyte (unchecked ((sbyte) zero));
+		receive_sbyte (unchecked ((sbyte) min));
+		receive_sbyte (unchecked ((sbyte) max));
+		Console.WriteLine ("   arg: byte (long)");
+

+		receive_byte (unchecked ((byte) zero));
+		receive_byte (unchecked ((byte) min));
+		receive_byte (unchecked ((byte) max));
+		Console.WriteLine ("   arg: char (long)");
+

+		receive_char (unchecked ((char) zero));
+		receive_char (unchecked ((char) min));
+		receive_char (unchecked ((char) max));
+	}
+
+	static void probe_ulong()
+	{
+		ulong zero = (ulong) 0;
+		ulong min = (ulong) ulong.MinValue;
+		ulong max = (ulong) ulong.MaxValue;
+

+		Console.WriteLine ("Testing: ulong");
+

+		Console.WriteLine ("   arg: int (ulong)");
+

+		receive_int (unchecked ((int) zero));
+		receive_int (unchecked ((int) min));
+		receive_int (unchecked ((int) max));
+		Console.WriteLine ("   arg: uint (ulong)");
+

+		receive_uint (unchecked ((uint) zero));
+		receive_uint (unchecked ((uint) min));
+		receive_uint (unchecked ((uint) max));
+		Console.WriteLine ("   arg: short (ulong)");
+

+		receive_short (unchecked ((short) zero));
+		receive_short (unchecked ((short) min));
+		receive_short (unchecked ((short) max));
+		Console.WriteLine ("   arg: ushort (ulong)");
+

+		receive_ushort (unchecked ((ushort) zero));
+		receive_ushort (unchecked ((ushort) min));
+		receive_ushort (unchecked ((ushort) max));
+		Console.WriteLine ("   arg: long (ulong)");
+

+		receive_long (unchecked ((long) zero));
+		receive_long (unchecked ((long) min));
+		receive_long (unchecked ((long) max));
+		Console.WriteLine ("   arg: ulong (ulong)");
+

+		receive_ulong (unchecked ((ulong) zero));
+		receive_ulong (unchecked ((ulong) min));
+		receive_ulong (unchecked ((ulong) max));
+		Console.WriteLine ("   arg: sbyte (ulong)");
+

+		receive_sbyte (unchecked ((sbyte) zero));
+		receive_sbyte (unchecked ((sbyte) min));
+		receive_sbyte (unchecked ((sbyte) max));
+		Console.WriteLine ("   arg: byte (ulong)");
+

+		receive_byte (unchecked ((byte) zero));
+		receive_byte (unchecked ((byte) min));
+		receive_byte (unchecked ((byte) max));
+		Console.WriteLine ("   arg: char (ulong)");
+

+		receive_char (unchecked ((char) zero));
+		receive_char (unchecked ((char) min));
+		receive_char (unchecked ((char) max));
+	}
+
+	static void probe_sbyte()
+	{
+		sbyte zero = (sbyte) 0;
+		sbyte min = (sbyte) sbyte.MinValue;
+		sbyte max = (sbyte) sbyte.MaxValue;
+

+		Console.WriteLine ("Testing: sbyte");
+

+		Console.WriteLine ("   arg: int (sbyte)");
+

+		receive_int (unchecked ((int) zero));
+		receive_int (unchecked ((int) min));
+		receive_int (unchecked ((int) max));
+		Console.WriteLine ("   arg: uint (sbyte)");
+

+		receive_uint (unchecked ((uint) zero));
+		receive_uint (unchecked ((uint) min));
+		receive_uint (unchecked ((uint) max));
+		Console.WriteLine ("   arg: short (sbyte)");
+

+		receive_short (unchecked ((short) zero));
+		receive_short (unchecked ((short) min));
+		receive_short (unchecked ((short) max));
+		Console.WriteLine ("   arg: ushort (sbyte)");
+

+		receive_ushort (unchecked ((ushort) zero));
+		receive_ushort (unchecked ((ushort) min));
+		receive_ushort (unchecked ((ushort) max));
+		Console.WriteLine ("   arg: long (sbyte)");
+

+		receive_long (unchecked ((long) zero));
+		receive_long (unchecked ((long) min));
+		receive_long (unchecked ((long) max));
+		Console.WriteLine ("   arg: ulong (sbyte)");
+

+		receive_ulong (unchecked ((ulong) zero));
+		receive_ulong (unchecked ((ulong) min));
+		receive_ulong (unchecked ((ulong) max));
+		Console.WriteLine ("   arg: sbyte (sbyte)");
+

+		receive_sbyte (unchecked ((sbyte) zero));
+		receive_sbyte (unchecked ((sbyte) min));
+		receive_sbyte (unchecked ((sbyte) max));
+		Console.WriteLine ("   arg: byte (sbyte)");
+

+		receive_byte (unchecked ((byte) zero));
+		receive_byte (unchecked ((byte) min));
+		receive_byte (unchecked ((byte) max));
+		Console.WriteLine ("   arg: char (sbyte)");
+

+		receive_char (unchecked ((char) zero));
+		receive_char (unchecked ((char) min));
+		receive_char (unchecked ((char) max));
+	}
+
+	static void probe_byte()
+	{
+		byte zero = (byte) 0;
+		byte min = (byte) byte.MinValue;
+		byte max = (byte) byte.MaxValue;
+

+		Console.WriteLine ("Testing: byte");
+

+		Console.WriteLine ("   arg: int (byte)");
+

+		receive_int (unchecked ((int) zero));
+		receive_int (unchecked ((int) min));
+		receive_int (unchecked ((int) max));
+		Console.WriteLine ("   arg: uint (byte)");
+

+		receive_uint (unchecked ((uint) zero));
+		receive_uint (unchecked ((uint) min));
+		receive_uint (unchecked ((uint) max));
+		Console.WriteLine ("   arg: short (byte)");
+

+		receive_short (unchecked ((short) zero));
+		receive_short (unchecked ((short) min));
+		receive_short (unchecked ((short) max));
+		Console.WriteLine ("   arg: ushort (byte)");
+

+		receive_ushort (unchecked ((ushort) zero));
+		receive_ushort (unchecked ((ushort) min));
+		receive_ushort (unchecked ((ushort) max));
+		Console.WriteLine ("   arg: long (byte)");
+

+		receive_long (unchecked ((long) zero));
+		receive_long (unchecked ((long) min));
+		receive_long (unchecked ((long) max));
+		Console.WriteLine ("   arg: ulong (byte)");
+

+		receive_ulong (unchecked ((ulong) zero));
+		receive_ulong (unchecked ((ulong) min));
+		receive_ulong (unchecked ((ulong) max));
+		Console.WriteLine ("   arg: sbyte (byte)");
+

+		receive_sbyte (unchecked ((sbyte) zero));
+		receive_sbyte (unchecked ((sbyte) min));
+		receive_sbyte (unchecked ((sbyte) max));
+		Console.WriteLine ("   arg: byte (byte)");
+

+		receive_byte (unchecked ((byte) zero));
+		receive_byte (unchecked ((byte) min));
+		receive_byte (unchecked ((byte) max));
+		Console.WriteLine ("   arg: char (byte)");
+

+		receive_char (unchecked ((char) zero));
+		receive_char (unchecked ((char) min));
+		receive_char (unchecked ((char) max));
+	}
+
+	static void probe_char()
+	{
+		char zero = (char) 0;
+		char min = (char) char.MinValue;
+		char max = (char) char.MaxValue;
+

+		Console.WriteLine ("Testing: char");
+

+		Console.WriteLine ("   arg: int (char)");
+

+		receive_int (unchecked ((int) zero));
+		receive_int (unchecked ((int) min));
+		receive_int (unchecked ((int) max));
+		Console.WriteLine ("   arg: uint (char)");
+

+		receive_uint (unchecked ((uint) zero));
+		receive_uint (unchecked ((uint) min));
+		receive_uint (unchecked ((uint) max));
+		Console.WriteLine ("   arg: short (char)");
+

+		receive_short (unchecked ((short) zero));
+		receive_short (unchecked ((short) min));
+		receive_short (unchecked ((short) max));
+		Console.WriteLine ("   arg: ushort (char)");
+

+		receive_ushort (unchecked ((ushort) zero));
+		receive_ushort (unchecked ((ushort) min));
+		receive_ushort (unchecked ((ushort) max));
+		Console.WriteLine ("   arg: long (char)");
+

+		receive_long (unchecked ((long) zero));
+		receive_long (unchecked ((long) min));
+		receive_long (unchecked ((long) max));
+		Console.WriteLine ("   arg: ulong (char)");
+

+		receive_ulong (unchecked ((ulong) zero));
+		receive_ulong (unchecked ((ulong) min));
+		receive_ulong (unchecked ((ulong) max));
+		Console.WriteLine ("   arg: sbyte (char)");
+

+		receive_sbyte (unchecked ((sbyte) zero));
+		receive_sbyte (unchecked ((sbyte) min));
+		receive_sbyte (unchecked ((sbyte) max));
+		Console.WriteLine ("   arg: byte (char)");
+

+		receive_byte (unchecked ((byte) zero));
+		receive_byte (unchecked ((byte) min));
+		receive_byte (unchecked ((byte) max));
+		Console.WriteLine ("   arg: char (char)");
+

+		receive_char (unchecked ((char) zero));
+		receive_char (unchecked ((char) min));
+		receive_char (unchecked ((char) max));
+	}
+
+	static void Main ()
+	{

+		probe_int ();
+		probe_uint ();
+		probe_short ();
+		probe_ushort ();
+		probe_long ();
+		probe_ulong ();
+		probe_sbyte ();
+		probe_byte ();
+		probe_char ();
+	}

+}
+

diff --git a/mcs/tests/co1.cs b/mcs/tests/co1.cs
new file mode 100755
index 00000000000..da1bdaab246
--- /dev/null
+++ b/mcs/tests/co1.cs
@@ -0,0 +1,4 @@
+class X {

+	const int x = 1;

+	const string s = "Hello";

+}

diff --git a/mcs/tests/cs1.cs b/mcs/tests/cs1.cs
new file mode 100755
index 00000000000..bfb3c74b3c8
--- /dev/null
+++ b/mcs/tests/cs1.cs
@@ -0,0 +1,5 @@
+class X {

+}

+

+struct Y {

+}

diff --git a/mcs/tests/csc-casts.out b/mcs/tests/csc-casts.out
new file mode 100755
index 00000000000..70ce7135da8
--- /dev/null
+++ b/mcs/tests/csc-casts.out
diff --git a/mcs/tests/gen-cast-test.cs b/mcs/tests/gen-cast-test.cs
new file mode 100755
index 00000000000..d1f9531d2f1
--- /dev/null
+++ b/mcs/tests/gen-cast-test.cs
@@ -0,0 +1,99 @@
+using System;
+
+class Stress {
+
+	static string mode = "unchecked";
+	
+	static string [] types = {
+		"int",   "uint",
+		"short", "ushort",
+		"long",  "ulong",
+		"sbyte", "byte", "char"
+		};
+	
+
+	static void w (string s)
+	{
+		Console.Write (s);
+	}
+
+	static void wl (string s)
+	{
+		Console.WriteLine (s);
+	}
+	
+	static void generate_receptors ()
+	{
+		foreach (string t in types){
+			w ("\tstatic void receive_" + t + " (" + t + " a)\n\t{\n");
+			w ("\t\tConsole.Write (\"        \");\n");
+			w ("\t\tConsole.WriteLine (a);\n");
+			w ("\t}\n\n");
+		}
+		
+	}
+
+	static void var (string type, string name, string init)
+	{
+		w ("\t\t" + type + " " + name + " = (" + type + ") " + init + ";\n");
+	}
+
+	static void call (string type, string name)
+	{
+		w ("\t\treceive_" + type + " (" + mode + "((" + type + ") " + name + "));\n");
+	}
+	
+	static void generate_emision ()
+	{
+		foreach (string type in types){
+			w ("\tstatic void probe_" + type + "()\n\t{\n");
+			var (type, "zero", "0");
+			var (type, "min", type + ".MinValue");
+			var (type, "max", type + ".MaxValue");
+			wl ("");
+
+			wl ("\t\tConsole.WriteLine (\"Testing: " + type + "\");\n");
+			foreach (string t in types){
+				wl ("\t\tConsole.WriteLine (\"   arg: " + t + " (" + type + ")\");\n");
+				call (t, "zero");
+				call (t, "min");
+				call (t, "max");
+			}
+			
+			w ("\t}\n\n");
+		}
+	}
+
+	static void generate_main ()
+	{
+		wl ("\tstatic void Main ()\n\t{");
+
+		foreach (string t in types){
+			w ("\t\tprobe_" + t + " ();\n");
+		}
+		wl ("\t}");
+	}
+	
+	static void Main (string [] args)
+	{
+		foreach (string arg in args){
+			if (arg == "-h" || arg == "--help"){
+				Console.WriteLine ("-h, --help     Shows help");
+				Console.WriteLine ("-c, --checked  Generate checked contexts");
+				return;
+			}
+			if (arg == "--checked" || arg == "-c"){
+				mode = "checked";
+				continue;
+			}
+		}
+		wl ("using System;\nclass Test {\n");
+
+		generate_receptors ();
+		generate_emision ();
+
+		generate_main ();
+			       
+		wl ("}\n");
+	}
+}
diff --git a/mcs/tests/gen-check.cs b/mcs/tests/gen-check.cs
new file mode 100755
index 00000000000..9077b141a74
--- /dev/null
+++ b/mcs/tests/gen-check.cs
@@ -0,0 +1,78 @@
+using System;
+
+class Stress {
+	
+	static string [] types = {
+		"int",   "uint",
+		"short", "ushort",
+		"long",  "ulong",
+		"sbyte", "byte", "char"
+		};
+	
+
+	static void w (string s)
+	{
+		Console.Write (s);
+	}
+
+	static void wl (string s)
+	{
+		Console.WriteLine (s);
+	}
+	
+	static void generate_receptors ()
+	{
+		foreach (string t in types){
+			w ("\tstatic void receive_" + t + " (" + t + " a)\n\t{\n");
+			w ("\t\tConsole.Write (\"        \");\n");
+			w ("\t\tConsole.WriteLine (a);\n");
+			w ("\t}\n\n");
+		}
+		
+	}
+
+	static void call (string type, string name)
+	{
+		w ("\t\treceive_" + type + " (checked ((" + type + ") var ));\n");
+	}
+
+	static void generate_emision ()
+	{
+		foreach (string type in types){
+			w ("\tstatic void probe_" + type + "()\n\t{\n");
+			if (type == "char")
+				w ("\t\t" + type + " var = (char) 0;");
+			else
+				w ("\t\t" + type + " var = 0;");					
+				
+			wl ("");
+
+			foreach (string t in types)
+				call (t, "var");
+			
+			w ("\t}\n\n");
+		}
+	}
+	
+	static void generate_main ()
+	{
+		wl ("\tstatic void Main ()\n\t{");
+
+		foreach (string t in types){
+			w ("\t\tprobe_" + t + " ();\n");
+		}
+		wl ("\t}");
+	}
+
+	static void Main (string [] args)
+	{
+		wl ("using System;\nclass Test {\n");
+
+		generate_receptors ();
+		generate_emision ();
+
+		generate_main ();
+			       
+		wl ("}\n");
+	}
+}
diff --git a/mcs/tests/i-recursive.cs b/mcs/tests/i-recursive.cs
new file mode 100644
index 00000000000..9c22e5876cc
--- /dev/null
+++ b/mcs/tests/i-recursive.cs
@@ -0,0 +1,5 @@
+interface A : B {
+}
+
+interface B : A {
+}
diff --git a/mcs/tests/i-three.cs b/mcs/tests/i-three.cs
new file mode 100755
index 00000000000..7c473f21657
--- /dev/null
+++ b/mcs/tests/i-three.cs
@@ -0,0 +1,11 @@
+interface A {
+}
+
+interface B : A{
+}
+
+interface C : A {
+}
+
+interface D : C {
+}
diff --git a/mcs/tests/i-undefined.cs b/mcs/tests/i-undefined.cs
new file mode 100644
index 00000000000..496795cd6db
--- /dev/null
+++ b/mcs/tests/i-undefined.cs
@@ -0,0 +1,2 @@
+interface A : B {
+}
diff --git a/mcs/tests/i1.cs b/mcs/tests/i1.cs
new file mode 100755
index 00000000000..00141820820
--- /dev/null
+++ b/mcs/tests/i1.cs
@@ -0,0 +1,2 @@
+interface A {

+}

diff --git a/mcs/tests/i2.cs b/mcs/tests/i2.cs
new file mode 100755
index 00000000000..9c22e5876cc
--- /dev/null
+++ b/mcs/tests/i2.cs
@@ -0,0 +1,5 @@
+interface A : B {
+}
+
+interface B : A {
+}
diff --git a/mcs/tests/i3.cs b/mcs/tests/i3.cs
new file mode 100755
index 00000000000..dff6c54db9d
--- /dev/null
+++ b/mcs/tests/i3.cs
@@ -0,0 +1,5 @@
+class X {
+}
+
+interface A : X {
+}
diff --git a/mcs/tests/i4.cs b/mcs/tests/i4.cs
new file mode 100755
index 00000000000..f89988f2cb3
--- /dev/null
+++ b/mcs/tests/i4.cs
@@ -0,0 +1,8 @@
+// cs0509.cs: base class is sealed
+// Line: 7
+struct V {
+	int v;
+}
+
+class X : V {
+}
diff --git a/mcs/tests/i5.cs b/mcs/tests/i5.cs
new file mode 100755
index 00000000000..e312377061b
--- /dev/null
+++ b/mcs/tests/i5.cs
@@ -0,0 +1,8 @@
+class A1 {
+}
+
+class A2 {
+}
+
+class B : A1, A2 {
+}
diff --git a/mcs/tests/i6.cs b/mcs/tests/i6.cs
new file mode 100755
index 00000000000..fa20da0ada8
--- /dev/null
+++ b/mcs/tests/i6.cs
@@ -0,0 +1,4 @@
+// cs0246.cs: can not find type `B'
+// Line: 4
+class X : D {
+}
diff --git a/mcs/tests/interfaces.cs b/mcs/tests/interfaces.cs
new file mode 100755
index 00000000000..6fcd9ec3061
--- /dev/null
+++ b/mcs/tests/interfaces.cs
@@ -0,0 +1,22 @@
+interface X {
+
+	// Methods
+	new int IntegerMethod (int a, int b);
+	new int IntegerMethod (int a, string c);
+	new int StringMethod ();
+	int A (string b);
+
+	// Properties
+	new string TheString { get; set; }
+	int TheInt { get; }
+	int TheInt2 { set; }
+	int TheInt3 { set; get; }
+
+	// Events
+	new event int MyEvent;
+	event string MyEvent2;
+
+	// Indexers
+}
+	
+	
diff --git a/mcs/tests/ix1.cs b/mcs/tests/ix1.cs
new file mode 100755
index 00000000000..984391d2fda
--- /dev/null
+++ b/mcs/tests/ix1.cs
@@ -0,0 +1,3 @@
+interface INTERFACE {
+	string PROPERTY { get; set; }
+}
diff --git a/mcs/tests/ix2.cs b/mcs/tests/ix2.cs
new file mode 100755
index 00000000000..c36b52ea2ac
--- /dev/null
+++ b/mcs/tests/ix2.cs
@@ -0,0 +1,15 @@
+using System;
+
+interface Blah {
+	string this [ int INDEX ] { get; set; }
+	string Item (int index);
+}
+
+public class Foo {
+
+	public static void Main ()
+	{
+		Console.WriteLine ("foo");
+	}
+}
+		
diff --git a/mcs/tests/makefile b/mcs/tests/makefile
new file mode 100755
index 00000000000..52eb8170b1b
--- /dev/null
+++ b/mcs/tests/makefile
@@ -0,0 +1,181 @@
+#
+# You can change "RUNTIME" to control what runtime to use
+# ie, make vs make RUNTIME=mono
+# 
+CSC=csc.exe
+
+MCS=../mcs/mcs.exe
+MCS2=mono ../mcs/mcs.exe
+VERIFY=../tools/verifier.exe
+
+TEST_SOURCES = \
+	test-1   test-2   test-3   test-4   test-5   test-6   test-7   test-8   test-9   test-10 \
+	test-11  test-12  test-13  test-14  test-15  test-16  test-17  test-18  test-19  test-20 \
+	test-21  test-22  test-23  test-24  test-25  test-26  test-27  test-28  test-29  test-30 \
+	test-31  test-32  test-33  test-34  test-35  test-36  test-37  test-38  test-39  test-40 \
+	test-41  test-42  test-43  test-44           test-46  test-47  test-48  test-49  \
+	test-51  test-52           test-54  test-55  test-56  test-57           test-59  test-60 \
+	test-61	 test-62  test-63  test-64  test-65                    test-68  test-69  test-70 \
+	test-71  test-72  test-73  test-74  test-75  test-76  test-77  test-78  test-79  test-80 \
+	test-81  test-82  test-83  test-84  test-85  test-86  test-87  test-88  test-89  test-90 \
+	         test-92  test-93  test-94  test-95  test-96  test-97  test-98  test-99  test-100\
+	test-101 test-102 test-103 test-104 test-105                   test-108 test-109 test-110\
+	test-111 test-112 test-113 test-114 test-115 test-116 test-117 test-118 test-119 \
+	test-121          test-123          test-125 test-126 test-127 test-128 test-129 test-130 \
+	test-131                   test-134 test-135 test-136 test-137 test-138 test-139 test-140 \
+	test-141 test-142 test-143 test-144 test-145 test-146 test-147 test-148 test-149 test-150 \
+	                  test-153 test-154 test-155 test-156 test-157 test-158 test-159 test-160 \
+	test-161 test-162
+
+UNSAFE_SOURCES = \
+	unsafe-1 unsafe-2 unsafe-3 test-58.cs
+
+WINDOWS_SOURCES = \
+	test-50 test-67
+
+# A test is a 'no pass' if it fails on either windows or linux
+# Test 120 does not pass because the MS.NET runtime is buggy.
+TEST_NOPASS = \
+	test-45  test-53  test-91  test-106 test-107 test-120 test-122 test-132 test-133 test-66
+
+all: test-compiler test-unsafe test-windows
+
+
+# Compile with mono, run with MS jit
+test-compiler:
+	@rm -f *.exe; \
+	for i in $(TEST_SOURCES); do \
+		echo -n "Running $$i ... "; \
+		if $(MCS) $$i.cs > /dev/null; then \
+			if $(RUNTIME) ./$$i.exe > /dev/null; then \
+				echo $$i: ok; \
+			else \
+				echo FAILED; exit 1; \
+			fi; \
+		else \
+			echo FAILED TO COMPILE; exit 1; \
+		fi \
+	done
+
+# Compile with mono, run with MS jit
+test-unsafe:
+	@for i in $(UNSAFE_SOURCES); do \
+		echo -n "Running (unsafe) $$i ... "; \
+		if $(MCS) --unsafe $$i.cs > /dev/null; then \
+			if $(RUNTIME) ./$$i.exe > /dev/null; then \
+				echo OK; \
+			else \
+				echo FAILED; exit 1; \
+			fi; \
+		else \
+			echo FAILED WHILE COMPILING; exit 1; \
+		fi \
+	done
+
+# Compiled (previously) with mono, run with mono jit
+test-jit:
+	@for i in $(TEST_SOURCES:.cs=.exe); do \
+		echo -n "Running jit $$i ... "; \
+		if mono ./$$i.exe > /dev/null; then \
+			echo OK; \
+		else \
+			echo FAILED; exit 1; \
+		fi \
+	done
+
+# Compiled with mono, run with MS jit
+test-windows:
+	@echo Running windows-only tests - these will fail on linux; \
+	for i in $(WINDOWS_SOURCES); do \
+		echo -n "Running $$i ... "; \
+		if $(MCS) $$i.cs > /dev/null; then \
+			if ./$$i.exe > /dev/null; then \
+				echo OK; \
+			else \
+				echo FAILED; exit 1; \
+			fi; \
+		else \
+			echo FAILED TO COMPILE; exit 1; \
+		fi \
+	done
+
+# Compile with mono, run with mono jit
+test-compiler-mono:
+	@rm -f *.exe; \
+	for i in $(TEST_SOURCES); do \
+		echo -n "Running $$i ... "; \
+		if $(MCS2) $$i.cs > /dev/null; then \
+			if mono ./$$i.exe > /dev/null; then \
+				echo OK; \
+			else \
+				echo FAILED; exit 1; \
+			fi; \
+		else \
+			echo FAILED TO COMPILE; exit 1; \
+		fi \
+	done
+	echo "Running NO_PASS tests ..."
+	for i in $(TEST_NOPASS); do \
+		echo -n "Running $$i ... "; \
+		if $(MCS2) $$i.cs > /dev/null; then \
+			echo OK; \
+		else \
+			echo FAILED TO COMPILE; exit 1; \
+		fi \
+	done
+
+# Compile with mono, run with mono jit
+test-unsafe-mono:
+	@rm -f *.exe; \
+	for i in $(UNSAFE_SOURCES); do \
+		echo -n "Running $$i ... "; \
+		if $(MCS2) --unsafe $$i.cs > /dev/null; then \
+			if mono ./$$i.exe > /dev/null; then \
+				echo OK; \
+			else \
+				echo FAILED; exit 1; \
+			fi; \
+		else \
+			echo FAILED TO COMPILE; exit 1; \
+		fi \
+	done
+
+verify:
+	@for i in $(TEST_SOURCES); do \
+		if $(MCS) -o mcs-gen-code.exe $$i.cs > /dev/null; then \
+	        	if $(CSC) /out:csc-gen-code.exe $$i.cs > /dev/null; then \
+				if $(VERIFY) mcs-gen-code.exe csc-gen-code.exe > /dev/null; then \
+					echo $$i: identical assemblies; \
+				else \
+					echo $$i: unidentical assemblies; exit; \
+				fi; \
+			fi \
+		fi \
+	done; \
+	echo Verification passed
+
+
+casts.cs: gen-cast-test.cs
+	$(CSC) /out:csc-cast.exe gen-cast-test.cs
+	./csc-cast > casts.cs
+
+casts-csc.exe: casts.cs
+	$(CSC) /out:casts-csc.exe casts.cs
+
+casts.exe: casts.cs
+	$(MCS) casts.cs
+
+csc-casts.out: casts-csc.exe
+	./casts-csc.exe > csc-casts.out
+
+msc-casts.out: casts.exe
+	./casts.exe > msc-casts.out
+
+test-casts: csc-casts.out msc-casts.out
+	cmp csc-casts.out msc-casts.out
+
+clean:
+	rm *.exe
+	rm *.out
+	rm casts.cs
+
diff --git a/mcs/tests/n1.cs b/mcs/tests/n1.cs
new file mode 100755
index 00000000000..b47fd24b2ca
--- /dev/null
+++ b/mcs/tests/n1.cs
@@ -0,0 +1,11 @@
+namespace A {

+	class X {

+		void Y () {}

+	}

+}

+

+namespace A {

+	class XX : X {

+		void YY () {}

+	}

+}

diff --git a/mcs/tests/n2.cs b/mcs/tests/n2.cs
new file mode 100755
index 00000000000..34c210e1fe7
--- /dev/null
+++ b/mcs/tests/n2.cs
@@ -0,0 +1,4 @@
+using System.Collections;
+
+class X : Queue {
+}
diff --git a/mcs/tests/s1.cs b/mcs/tests/s1.cs
new file mode 100755
index 00000000000..6c1191a86a0
--- /dev/null
+++ b/mcs/tests/s1.cs
@@ -0,0 +1,7 @@
+struct A {

+	int x;

+}

+

+struct B : A {

+	int y;

+}

diff --git a/mcs/tests/test-1.cs b/mcs/tests/test-1.cs
new file mode 100755
index 00000000000..adb1dd88a92
--- /dev/null
+++ b/mcs/tests/test-1.cs
@@ -0,0 +1,9 @@
+using System;
+
+class X {
+	static int Main (string [] args)
+	{
+		Console.WriteLine ("Hello, World!");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-10.cs b/mcs/tests/test-10.cs
new file mode 100644
index 00000000000..20e1cc6ee81
--- /dev/null
+++ b/mcs/tests/test-10.cs
@@ -0,0 +1,150 @@
+/*
+ * Test explicit numeric conversions.
+ */
+
+using System;
+
+class X {
+
+	void asbyte (byte a, ushort b, uint c, ulong d, char e)
+	{
+	}
+
+	void bsbyte ()
+	{
+		sbyte s = 0;
+
+		asbyte ((byte) s, (ushort) s, (uint) s, (ulong) s, (char) s);
+		asbyte (checked ((byte) s), checked ((ushort) s), checked ((uint) s), checked ((ulong) s), checked ((char) s));
+	}
+
+	void abyte (sbyte a, char b)
+	{
+	}
+
+	void bbyte ()
+	{
+		byte b = 0;
+
+		abyte ((sbyte) b, (char) b);
+		abyte (checked ((sbyte) b), checked ((char) b));
+	}
+
+	void ashort (sbyte a, byte b, ushort c, uint d, ulong e, char f)
+	{
+	}
+
+	void bshort ()
+	{
+		short a = 1;
+
+		ashort ((sbyte) a, (byte) a, (ushort) a, (uint) a, (ulong) a, (char) a);
+		ashort (checked ((sbyte) a), checked ((byte) a), checked ((ushort) a), checked ((uint) a), checked ((ulong) a), checked ((char) a));
+	}
+
+	void aushort (sbyte a, byte b, short c, char d)
+	{
+	}
+
+	void bushort ()
+	{
+		ushort a = 1;
+		aushort ((sbyte) a, (byte) a, (short) a, (char) a);
+		aushort (checked ((sbyte) a), checked ((byte) a), checked ((short) a), checked ((char) a));
+	}
+
+	void aint (sbyte a, byte b, short c, ushort d, uint e, ulong f, char g)
+	{
+	}
+
+	void bint ()
+	{
+		int a = 1;
+
+		aint ((sbyte) a, (byte) a, (short) a, (ushort) a, (uint) a, (ulong) a, (char) a);
+		aint (checked ((sbyte) a), checked ((byte) a), checked ((short) a), checked ((ushort) a), checked ((uint) a), checked ((ulong) a), checked ((char) a));
+	}
+
+	void auint (sbyte a, byte b, short c, ushort d, int e, char f)
+	{
+	}
+
+	void buint ()
+	{
+		uint a = 1;
+
+		auint ((sbyte) a, (byte) a, (short) a, (ushort) a, (int) a, (char) a);
+		auint (checked ((sbyte) a), checked ((byte) a), checked ((short) a), checked ((ushort) a), checked ((int) a), checked ((char) a));
+	}
+
+	void along (sbyte a, byte b, short c, ushort d, int e, uint f, ulong g, char h)
+	{
+	}
+
+	void blong ()
+	{
+		long a = 1;
+
+		along ((sbyte) a, (byte) a, (short) a, (ushort) a, (int) a, (uint) a, (ulong) a, (char) a);
+		along (checked ((sbyte) a), checked ((byte) a), checked ((short) a), checked ((ushort) a), checked ((int) a), checked ((uint) a), checked ((ulong) a), checked ((char) a));
+	}
+
+	void aulong (sbyte a, byte b, short c, ushort d, int e, uint f, long g, char h)
+	{
+	}
+
+	void bulong ()
+	{
+		ulong a = 1;
+
+		aulong ((sbyte) a, (byte) a, (short) a, (ushort) a, (int) a, (uint) a, (long) a, (char) a);
+		aulong (checked ((sbyte) a), checked ((byte) a), checked ((short) a), checked ((ushort) a), checked ((int) a), checked ((uint) a), checked ((long) a), checked ((char) a));
+	}
+
+	void achar (sbyte a, byte b, short c)
+	{
+
+	}
+
+	void bchar ()
+	{
+		char a = (char) 1;
+
+		achar ((sbyte) a, (byte) a, (short) a);
+		achar (checked ((sbyte) a), checked ((byte) a), checked ((short) a));
+	}
+
+	void afloat (sbyte a, byte b, short c, ushort d, int e, uint f, long ll, ulong g, char h, decimal dd)
+	{
+	}
+
+	void bfloat ()
+	{
+		float a = 1;
+
+		afloat ((sbyte) a, (byte) a, (short) a, (ushort) a, (int) a, (uint) a, (long) a,
+			(ulong) a, (char) a, (decimal) a);
+		afloat (checked ((sbyte) a), checked ((byte) a), checked ((short) a), checked ((ushort) a), checked ((int) a), checked ((uint) a), checked ((long) a),
+checked (			(ulong) a), checked ((char) a), checked ((decimal) a));
+	}
+
+	void adouble (sbyte a, byte b, short c, ushort d, int e, uint f, long ll, ulong g, char h,
+		      float ff, decimal dd)
+	{
+	}
+	
+	void bdouble ()
+	{
+		double a = 1;
+
+		adouble ((sbyte) a, (byte) a, (short) a, (ushort) a, (int) a, (uint) a, (long) a,
+			(ulong) a, (char) a, (float) a, (decimal) a);
+		adouble (checked ((sbyte) a), checked ((byte) a), checked ((short) a), checked ((ushort) a), checked ((int) a), checked ((uint) a), checked ((long) a),
+checked (			(ulong) a), checked ((char) a), checked ((float) a), (decimal) a);
+	}
+
+	static void Main ()
+	{
+
+	}
+}
diff --git a/mcs/tests/test-100.cs b/mcs/tests/test-100.cs
new file mode 100755
index 00000000000..da77cf3cdda
--- /dev/null
+++ b/mcs/tests/test-100.cs
@@ -0,0 +1,31 @@
+namespace GLib {
+
+	using System;
+	using System.Runtime.InteropServices;
+
+	public class Object  {
+		int v;
+
+		protected int Raw {
+			get {
+				return 1;
+			}
+			set {
+				v = value;
+			}
+		}       
+
+		[DllImport("bah", CallingConvention=CallingConvention.Cdecl)]
+		static extern void g_object_get (int obj);
+
+		public void GetProperty ()
+		{
+			g_object_get (Raw);
+		}
+
+		static int Main ()
+		{
+			return 0;
+		}
+	}
+}
diff --git a/mcs/tests/test-101.cs b/mcs/tests/test-101.cs
new file mode 100644
index 00000000000..c0256030fc0
--- /dev/null
+++ b/mcs/tests/test-101.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Reflection;
+
+namespace Test {
+	
+	public class MyAttribute: Attribute {
+		public string val;
+		public MyAttribute (string stuff) {
+			System.Console.WriteLine (stuff);
+			val = stuff;
+		}
+	}
+	
+	public class My2Attribute: MyAttribute {
+		public int ival;
+		public My2Attribute (string stuff, int blah) : base (stuff) {
+			System.Console.WriteLine ("ctor with int val"+stuff);
+			ival = blah;
+		}
+	}
+	
+	[My("testclass")]
+	[My2("testclass", 22)]
+	public class Test {
+		static public int Main() {
+			System.Reflection.MemberInfo info = typeof (Test);
+			object[] attributes = info.GetCustomAttributes (false);
+			for (int i = 0; i < attributes.Length; i ++) {
+				System.Console.WriteLine(attributes[i]);
+			}
+			if (attributes.Length != 2)
+				return 1;
+			MyAttribute attr = (MyAttribute) attributes [0];
+			if (attr.val != "testclass")
+				return 2;
+			return 0;
+		}
+	}
+}
diff --git a/mcs/tests/test-102.cs b/mcs/tests/test-102.cs
new file mode 100644
index 00000000000..39f018c1378
--- /dev/null
+++ b/mcs/tests/test-102.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Reflection;
+
+[assembly: AssemblyTitle ("Foo")]
+[assembly: AssemblyVersion ("1.0.2")]
+
+namespace N1 {
+		
+	[AttributeUsage (AttributeTargets.All)]
+	public class MineAttribute : Attribute {
+
+		string name;
+		
+		public MineAttribute (string s)
+		{
+			name = s;
+		}
+	}
+
+	interface A {
+		[Mine ("hello")]
+		void Hello ();
+	}	
+
+	public class Foo {	
+		
+		int i;
+		
+		[Mine ("Foo")]	
+		public static int Main ()
+		{
+			return 0;
+		}
+	}
+}
diff --git a/mcs/tests/test-103.cs b/mcs/tests/test-103.cs
new file mode 100755
index 00000000000..09974f4cc29
--- /dev/null
+++ b/mcs/tests/test-103.cs
@@ -0,0 +1,28 @@
+//
+// We should also allow overrides to work on protected methods.
+// Only private is not considered part of the override process.
+//
+abstract class A {
+        protected abstract int Foo ();
+}
+
+class B : A {
+        protected override int Foo ()
+	{
+		return 0;
+	}
+
+	public int M ()
+	{
+		return Foo ();
+	}
+}
+
+class Test {
+        public static int Main ()
+	{
+		return new B ().M ();
+        }
+}
+
+
diff --git a/mcs/tests/test-104.cs b/mcs/tests/test-104.cs
new file mode 100644
index 00000000000..82fcfac57fd
--- /dev/null
+++ b/mcs/tests/test-104.cs
@@ -0,0 +1,14 @@
+//
+// Test to ensure we do correct overload resolution
+//
+using System;
+
+class Test {
+        public static int Main(String[] args) {
+                int iTest = 1;
+
+                System.Threading.Interlocked.Increment(ref iTest);
+
+		return 0;
+        }
+}
diff --git a/mcs/tests/test-105.cs b/mcs/tests/test-105.cs
new file mode 100644
index 00000000000..ddfc2dbc05b
--- /dev/null
+++ b/mcs/tests/test-105.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+
+class Test {
+	delegate int SimpleDelegate (int a);
+
+	static int F (int a) {
+		Console.WriteLine ("Test.F from delegate: " + a);
+		Thread.Sleep (200);
+		return a;
+	}
+
+	static void async_callback (IAsyncResult ar)
+	{
+		Console.WriteLine ("Async Callback " + ar.AsyncState);
+	}
+	
+	static int Main () {
+		SimpleDelegate d = new SimpleDelegate (F);
+		AsyncCallback ac = new AsyncCallback (async_callback);
+		string state1 = "STATE1";
+		string state2 = "STATE2";
+		string state3 = "STATE3";
+		string state4 = "STATE4";
+		int fin = 0;
+		
+		IAsyncResult ar1 = d.BeginInvoke (1, ac, state1);
+		IAsyncResult ar2 = d.BeginInvoke (2, ac, state2);
+		IAsyncResult ar3 = d.BeginInvoke (3, ac, state3);
+		IAsyncResult ar4 = d.BeginInvoke (4, ac, state4);
+		
+		int res = d.EndInvoke (ar1);
+
+		Console.WriteLine ("Result = " + res);
+
+		try {
+			d.EndInvoke (ar1);
+		} catch (InvalidOperationException) {
+			Console.WriteLine ("cant execute EndInvoke twice ... OK");
+		}
+
+		ar1.AsyncWaitHandle.WaitOne ();
+		if (ar1.IsCompleted) fin++;
+		Console.WriteLine ("completed1: " + ar1.IsCompleted);
+		ar2.AsyncWaitHandle.WaitOne ();
+		if (ar2.IsCompleted) fin++;
+		Console.WriteLine ("completed2: " + ar2.IsCompleted);
+		ar3.AsyncWaitHandle.WaitOne ();
+		if (ar3.IsCompleted) fin++;
+		Console.WriteLine ("completed3: " + ar3.IsCompleted);
+		ar4.AsyncWaitHandle.WaitOne ();		
+		if (ar4.IsCompleted) fin++;
+		Console.WriteLine ("completed4: " + ar4.IsCompleted);
+
+		if (fin != 4)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-106.cs b/mcs/tests/test-106.cs
new file mode 100644
index 00000000000..52b5f61d9f1
--- /dev/null
+++ b/mcs/tests/test-106.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+
+class Test {
+	delegate int SimpleDelegate (int a);
+
+	static int cb_state = 0;
+	
+	static int F (int a) {
+		Console.WriteLine ("Test.F from delegate: " + a);
+		throw new NotImplementedException ();
+	}
+
+	static void async_callback (IAsyncResult ar)
+	{
+		Console.WriteLine ("Async Callback " + ar.AsyncState);
+		cb_state = 1;
+		throw new NotImplementedException ();
+	}
+	
+	static int Main () {
+		SimpleDelegate d = new SimpleDelegate (F);
+		AsyncCallback ac = new AsyncCallback (async_callback);
+		string state1 = "STATE1";
+		int res = 0;
+		
+		IAsyncResult ar1 = d.BeginInvoke (1, ac, state1);
+
+		ar1.AsyncWaitHandle.WaitOne ();
+
+		try {
+			res = d.EndInvoke (ar1);
+		} catch (NotImplementedException) {
+			res = 1;
+			Console.WriteLine ("received exception ... OK");
+		}
+
+		while (cb_state == 0)
+			Thread.Sleep (0);
+		
+		if (cb_state != 1)
+			return 1;
+		
+		if (res != 1)
+			return 2;
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-107.cs b/mcs/tests/test-107.cs
new file mode 100644
index 00000000000..a5639efa8f0
--- /dev/null
+++ b/mcs/tests/test-107.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+using System.Runtime.Remoting.Messaging;
+
+class Test {
+	delegate int SimpleDelegate (int a);
+
+	static int cb_state = 0;
+	
+	static int F (int a) {
+		Console.WriteLine ("Test.F from delegate: " + a);
+		throw new NotImplementedException ();
+	}
+
+	static void async_callback (IAsyncResult ar)
+	{
+		AsyncResult ares = (AsyncResult)ar;
+		AsyncCallback ac = new AsyncCallback (async_callback);
+		
+		Console.WriteLine ("Async Callback " + ar.AsyncState);
+		cb_state++;
+		SimpleDelegate d = (SimpleDelegate)ares.AsyncDelegate;
+
+		if (cb_state < 5)
+			d.BeginInvoke (cb_state, ac, cb_state);
+		
+		//throw new NotImplementedException ();
+	}
+	
+	static int Main () {
+		SimpleDelegate d = new SimpleDelegate (F);
+		AsyncCallback ac = new AsyncCallback (async_callback);
+		
+		IAsyncResult ar1 = d.BeginInvoke (cb_state, ac, cb_state);
+
+		ar1.AsyncWaitHandle.WaitOne ();
+
+
+		while (cb_state < 5)
+			Thread.Sleep (200);
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-108.cs b/mcs/tests/test-108.cs
new file mode 100755
index 00000000000..2edc56d9457
--- /dev/null
+++ b/mcs/tests/test-108.cs
@@ -0,0 +1,44 @@
+class X {
+
+	static int Main ()
+	{
+		int i = 0;
+		
+		if (false){
+			i = 1;
+			return 1;
+		}
+
+		if (true)
+			i = 2;
+		else
+			i = 3;
+
+		if (i != 2)
+			return 5;
+		
+		while (true){
+			i++;
+			if (i == 10)
+				break;
+		}
+
+		while (false){
+			i--;
+			return 3;
+		}
+
+		if (i != 10)
+			return 2;
+
+		do {
+			if (i++ == 20)
+				break;
+		} while (true);
+
+		if (i != 21)
+			return 4;
+		
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-109.cs b/mcs/tests/test-109.cs
new file mode 100755
index 00000000000..740155886cd
--- /dev/null
+++ b/mcs/tests/test-109.cs
@@ -0,0 +1,13 @@
+using System;
+
+class T {
+        static int Main ()
+	{
+		//
+		// Just a test to compile the following:
+		//
+                string a = "Time is: " + DateTime.Now;
+
+		return 0;
+        }
+}
diff --git a/mcs/tests/test-11.cs b/mcs/tests/test-11.cs
new file mode 100644
index 00000000000..c122201d472
--- /dev/null
+++ b/mcs/tests/test-11.cs
@@ -0,0 +1,27 @@
+using System;
+using System.IO;
+
+public class Test {
+
+	public static int boxtest ()
+	{
+		int i = 123;
+		object o = i;
+//		int j = (int) o;
+
+//		if (i != j)
+//			return 1;
+		
+		return 0;
+	}
+
+	public static int Main () {
+		if (boxtest () != 0)
+			return 1;
+
+		
+		return 0;
+	}
+}
+
+
diff --git a/mcs/tests/test-110.cs b/mcs/tests/test-110.cs
new file mode 100755
index 00000000000..b8900991ed3
--- /dev/null
+++ b/mcs/tests/test-110.cs
@@ -0,0 +1,32 @@
+//
+// Special test case for the Compound Assignment for the
+// second case (not the obvious one, but the one with 
+// implicit casts)
+
+using System;
+
+namespace test
+{
+        public class test
+        {
+                static int test_method(int vv)
+                {
+			byte b = 45;
+
+			// The cast below will force the expression into being
+			// a byte, and we basically make an explicit cast from
+			// the return of "<<" from int to byte (the right-side type
+			// of the compound assignemtn)
+                        b |= (byte)(vv << 1);
+
+                        return b;
+                }
+
+                public static int Main ()
+                {
+			if (test_method (1) != 47)
+				return 1;
+			return 0;
+                }
+        }
+}
diff --git a/mcs/tests/test-111.cs b/mcs/tests/test-111.cs
new file mode 100755
index 00000000000..4af5997bef9
--- /dev/null
+++ b/mcs/tests/test-111.cs
@@ -0,0 +1,11 @@
+class T {
+        static object get_obj() {
+                return new object ();
+        }
+        static int Main() {
+                object o = get_obj ();
+                if (o == "string")
+                        return 1;
+                return 0;
+        }
+}
diff --git a/mcs/tests/test-112.cs b/mcs/tests/test-112.cs
new file mode 100755
index 00000000000..c1c28547991
--- /dev/null
+++ b/mcs/tests/test-112.cs
@@ -0,0 +1,19 @@
+//
+// This tests the use of an array indexer on value exprclasses
+// and not only variables
+//
+class X {
+	static int [] g ()
+	{
+		int [] x = new int [5];
+		x [1] = 10;
+		return x;
+	}
+
+	static int Main ()
+	{
+		if (g () [1] == 10)
+				return 0;
+		return 1;
+	}
+}
diff --git a/mcs/tests/test-113.cs b/mcs/tests/test-113.cs
new file mode 100644
index 00000000000..c26268c1432
--- /dev/null
+++ b/mcs/tests/test-113.cs
@@ -0,0 +1,32 @@
+using System;
+
+class X {
+
+	IntPtr Raw;
+	
+	void g_object_get (IntPtr obj, string name, out string val, IntPtr term)
+	{
+		val = null;
+	}
+
+	public void GetProperty (String name, out String val)
+	{
+		g_object_get (Raw, name, out val, new IntPtr (0));
+	}
+
+	void g_object_get (IntPtr obj, string name, out bool val, IntPtr term)
+	{
+		val = true;
+	}
+	
+	public void GetProperty (String name, out bool val)
+	{
+		g_object_get (Raw, name, out val, new IntPtr (0));
+	}
+
+	public static int Main ()
+	{
+		return 0;
+	}
+	
+}
diff --git a/mcs/tests/test-114.cs b/mcs/tests/test-114.cs
new file mode 100644
index 00000000000..36925d310be
--- /dev/null
+++ b/mcs/tests/test-114.cs
@@ -0,0 +1,13 @@
+using System;
+
+class MyClass {
+
+	delegate bool IsAnything (Char c);
+
+	public static int Main () {
+		IsAnything validDigit;
+		validDigit = new IsAnything (Char.IsDigit);
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-115.cs b/mcs/tests/test-115.cs
new file mode 100755
index 00000000000..02b630e0225
--- /dev/null
+++ b/mcs/tests/test-115.cs
@@ -0,0 +1,42 @@
+//
+// This is a compile test, submitted by Joe.   We really need
+// a more thorough set of tests for the user defined explicit
+// conversions
+//
+using System;
+
+class A {
+	public static explicit operator X (A foo)
+	{
+		X myX = new X();
+
+		return myX;
+	}
+}
+
+class X {
+}
+
+class Y : X {
+}
+
+class blah {
+	public static int Main ()
+	{
+		A testA = new A();
+		
+		X testX = (X) testA;
+
+		try {
+			Y testY = (Y) testA;
+		} catch (InvalidCastException){
+			return 0;
+		}
+
+		//
+		// We should have thrown the exception above
+		//
+		return 1;
+	}
+}
+		
diff --git a/mcs/tests/test-116.cs b/mcs/tests/test-116.cs
new file mode 100755
index 00000000000..c5690ba62f1
--- /dev/null
+++ b/mcs/tests/test-116.cs
@@ -0,0 +1,12 @@
+//
+// Parsing tests
+//
+
+class X {
+	static int Main ()
+	{
+		double d = 1.4e-4;
+		// add more ;-)
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-117.cs b/mcs/tests/test-117.cs
new file mode 100644
index 00000000000..d6745124677
--- /dev/null
+++ b/mcs/tests/test-117.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections;
+
+public interface IFoo {
+
+}
+
+public class Blah : IFoo {
+
+	Hashtable table;
+
+	public Blah ()
+	{
+		table = new Hashtable ();
+	}
+
+	public static int Main ()
+	{
+		Blah b = new Blah ();
+
+		b.table.Add ("Ravi", (IFoo) b);
+
+		return 0;
+	}
+		
+	
+
+}
diff --git a/mcs/tests/test-118.cs b/mcs/tests/test-118.cs
new file mode 100755
index 00000000000..7e814876687
--- /dev/null
+++ b/mcs/tests/test-118.cs
@@ -0,0 +1,14 @@
+using System;
+using System.Security.Policy;
+using System.Threading;
+
+class Container {
+
+	// LoaderOptimization exists as an enum
+	// and LoaderOptimization is also the abbreviation for
+	// LoaderOptimizationAttribute
+	[LoaderOptimization (LoaderOptimization.SingleDomain)]
+	static int Main (string[] args) {
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-119.cs b/mcs/tests/test-119.cs
new file mode 100644
index 00000000000..be7d7695a22
--- /dev/null
+++ b/mcs/tests/test-119.cs
@@ -0,0 +1,50 @@
+class Value {
+	public static explicit operator int (Value val)
+	{
+		return 1;
+	}
+
+	public static explicit operator MyObject (Value val)
+	{
+		return new MyObject (1);
+	}	
+
+	public static explicit operator uint (Value val)
+	{
+		return 1;
+	}
+}
+
+class MyObject {
+	public MyObject (int i) {}
+}
+
+class Derived : MyObject {
+	public Derived (int i) : base (i) { }
+
+	Derived Blah ()
+	{
+		Value val = new Value ();
+
+		return (Derived) val;
+	}
+}
+
+class Test {
+	static int Main ()
+	{
+		Value v = new Value ();
+
+		v = null;
+
+		try {
+			// This will throw an exception.
+			// This test is more of a compile test, we need a real
+			// good test that does not require this lame catch.
+			Derived d = (Derived) v;
+		} catch {
+		}
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-12.cs b/mcs/tests/test-12.cs
new file mode 100644
index 00000000000..b788eb89dd1
--- /dev/null
+++ b/mcs/tests/test-12.cs
@@ -0,0 +1,44 @@
+/*
+ * Tests the ?: operator and the string concatenation
+ */
+
+using System;
+class X {
+	static int Main (string [] args)
+	{
+		string a = "hello";
+		string b = "1";
+		string c = a + b;
+		string d = a + 1;
+		string y;
+		
+		if (c != d)
+			return 1;
+		if (d != (a + b))
+			return 2;
+		if (d != x (a, b))
+			return 3;
+		if (d != x (a, 1))
+			return 4;
+
+		y = c == d ? "equal" : "not-equal";
+		if (y != "equal")
+			return 5;
+		y = b == a ? "oops" : "nice";
+		if (y != "nice")
+			return 6;
+		
+		Console.WriteLine (c);
+		return 0;
+	}
+
+	static string s (string a, int o)
+	{
+		return a + o;
+	}
+	static string x (string s, object o)
+	{
+		return s + o;
+	}
+
+}
diff --git a/mcs/tests/test-120.cs b/mcs/tests/test-120.cs
new file mode 100755
index 00000000000..5d4f5180a34
--- /dev/null
+++ b/mcs/tests/test-120.cs
@@ -0,0 +1,56 @@
+//
+// This tests checks that the compiler catches the special attributes
+// for in a struct for CharSet, and turns the right bit on the TypeAttribute
+//
+using System;
+using System.Reflection;
+using System.Runtime.InteropServices;
+
+[StructLayout(LayoutKind.Explicit, Size=32,CharSet=CharSet.Unicode)]
+struct MyUnicode
+{
+	[FieldOffset(0)] public float fh_float;
+	[FieldOffset(0)] public int fh_int;
+}
+
+[StructLayout(LayoutKind.Explicit, Size=32,CharSet=CharSet.Ansi)]
+struct MyAnsi
+{
+	[FieldOffset(0)] public float fh_float;
+	[FieldOffset(0)] public int fh_int;
+}
+[StructLayout(LayoutKind.Explicit, Size=32,CharSet=CharSet.Auto)]
+struct MyAuto
+{
+	[FieldOffset(0)] public float fh_float;
+	[FieldOffset(0)] public int fh_int;
+}
+
+class test
+{
+	
+	static int Main ()
+	{
+		Type t = typeof (MyUnicode);
+
+		if ((t.Attributes & TypeAttributes.UnicodeClass) != TypeAttributes.UnicodeClass){
+			Console.WriteLine ("Class MyUnicode does not have Unicode bit set");
+			return 1;
+		}
+
+		t = typeof (MyAuto);
+		if ((t.Attributes & TypeAttributes.AutoClass) != TypeAttributes.AutoClass){
+			Console.WriteLine ("Class MyAuto does not have Auto bit set");
+			return 2;
+		}
+
+		t = typeof (MyAnsi);
+
+		if ((t.Attributes & TypeAttributes.AnsiClass) != TypeAttributes.AnsiClass){
+			Console.WriteLine ("Class MyUnicode does not have Ansi bit set");
+			return 3;
+		}
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-121.cs b/mcs/tests/test-121.cs
new file mode 100755
index 00000000000..21e96bc967f
--- /dev/null
+++ b/mcs/tests/test-121.cs
@@ -0,0 +1,35 @@
+//
+// This test excercises the fact that array evaluation in UnaryMutator and 
+// CompoundAssign expressions should never mutate data more than once
+//
+class X {
+	static int g_calls;
+	
+	static int g ()
+	{
+		g_calls++;
+		return 0;
+	}
+
+	
+	static int Main ()
+	{
+		int [] a = new int [10];
+		int i = 0;
+		
+		a [0] = 1;
+
+		a [i++] += 3;
+
+		if (i != 1)
+			return 1;
+		if (a [0] != 4)
+			return 2;
+
+		a [g ()]++ ;
+
+		if (g_calls != 1)
+			return 3;
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-122.cs b/mcs/tests/test-122.cs
new file mode 100755
index 00000000000..27a08e8adde
--- /dev/null
+++ b/mcs/tests/test-122.cs
@@ -0,0 +1,21 @@
+//
+// Tests that a nested class has full access to its container members
+//
+// A compile-only test.
+//
+
+class A {
+        private static int X = 0;
+
+        class B {
+                void Foo ()
+                {
+                        ++ X;
+                }
+        }
+
+        public static int Main ()
+        {
+		return 0;
+        }
+}
diff --git a/mcs/tests/test-123.cs b/mcs/tests/test-123.cs
new file mode 100755
index 00000000000..87f7dbbfe01
--- /dev/null
+++ b/mcs/tests/test-123.cs
@@ -0,0 +1,47 @@
+class X {
+
+	static object get_non_null ()
+	{
+		return new X ();
+	}
+
+	static object get_null ()
+	{
+		return null;
+	}
+	
+	static int Main ()
+	{
+		int a = 5;
+		object o;
+		decimal d = 0M;
+		
+		//
+		// compile time
+		//
+		if (!(get_non_null () is object))
+			return 1;
+
+		if (get_null () is object)
+			return 2;
+
+		if (!(a is object))
+			return 3;
+
+		//
+		// explicit reference
+		//
+		if (null is object)
+			return 4;
+
+		o = a;
+		if (!(o is int))
+			return 5;
+
+		if (d is int)
+			return 6;
+
+		System.Console.WriteLine ("Is tests pass");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-124.cs b/mcs/tests/test-124.cs
new file mode 100644
index 00000000000..c28d9899d65
--- /dev/null
+++ b/mcs/tests/test-124.cs
@@ -0,0 +1,24 @@
+using System.Drawing;
+
+namespace N1
+{	
+	public class D
+	{
+		public static int Main ()
+		{
+			Rectangle rect = new Rectangle ();
+			N (rect);
+			
+			return 0;
+		}
+
+		public static bool N (RectangleF rect)
+		{
+			if (rect.X > rect.Y)
+				return true;
+			
+			return false;
+		}
+	}
+}
+
diff --git a/mcs/tests/test-125.cs b/mcs/tests/test-125.cs
new file mode 100644
index 00000000000..51217ef2697
--- /dev/null
+++ b/mcs/tests/test-125.cs
@@ -0,0 +1,100 @@
+using System;
+
+public class Fraction {
+
+	public Fraction(int numerator, int denominator) {
+		Console.WriteLine("In Fraction Constructor(int, int)");
+		this.numerator = numerator;
+		this.denominator = denominator;
+	}
+
+	public Fraction(int wholeNumber) {
+		Console.WriteLine("In Fraction Constructor(int)");
+		numerator = wholeNumber;
+		denominator = 1;
+	}
+
+	// this function is not recognised by mcs further down
+	public static implicit operator Fraction(int theInt) {
+		Console.WriteLine("In implicit conversion to Fraction");
+		return new Fraction(theInt);
+	}
+
+	public static explicit operator int(Fraction theFraction) {
+		Console.WriteLine("In explicit conversion to int");
+		return theFraction.numerator /
+			theFraction.denominator;
+	}
+
+	public static bool operator==(Fraction lhs, Fraction rhs) {
+		Console.WriteLine("In operator ==");
+		if (lhs.denominator == rhs.denominator &&
+		    lhs.numerator == rhs.numerator) {
+			return true;
+		}
+		// code here to handle unlike fraction
+		return false;
+	}
+
+	public static bool operator!=(Fraction lhs, Fraction rhs) {
+		Console.WriteLine("In operator !=");
+		return !(lhs == rhs);
+	}
+
+	public override bool Equals(object o) {
+		Console.WriteLine("In method Equals");
+		if (! (o is Fraction)) {
+			return false;
+		}
+		return this == (Fraction) o;
+	}
+  
+	public static Fraction operator+(Fraction lhs, Fraction rhs) {
+		Console.WriteLine("In operator +");
+		if (lhs.denominator == rhs.denominator) {
+			return new Fraction(lhs.numerator + rhs.numerator,
+					    lhs.denominator);
+		}
+
+		// simplistic solution for unlike fractions
+		// 1/2 + 3/4 == (1*4) + (3*2) / (2*4) == 10/8
+		int firstProduct = lhs.numerator * rhs.denominator;
+		int secondProduct = lhs.denominator * rhs.numerator;
+		return new Fraction(
+				    firstProduct + secondProduct,
+				    lhs.denominator * rhs.denominator);
+	}
+
+	public override string ToString() {
+		String s = numerator.ToString() + "/" +
+			denominator.ToString();
+		return s;
+	}
+
+	private int numerator;
+	private int denominator;
+}
+
+public class Tester {
+	public static int Main() {
+
+		Fraction f1 = new Fraction(3,4);
+		Console.WriteLine("f1: {0}", f1.ToString());
+
+		Fraction f2 = new Fraction(2,4);
+		Console.WriteLine("f2: {0}", f2.ToString());
+
+		Fraction f3 = f1 + f2;
+		Console.WriteLine("f1 + f2 = f3: {0}", f3.ToString());
+
+		Fraction f4 = f3 + 5;
+		Console.WriteLine("f3 + 5 = f4: {0}", f4.ToString());
+
+		Fraction f5 = new Fraction(2, 4);
+		if (f5 == f2) 
+			Console.WriteLine("f5: {0} == f2: {1}",	f5.ToString(), f2.ToString());
+		
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-126.cs b/mcs/tests/test-126.cs
new file mode 100755
index 00000000000..26ed4190a20
--- /dev/null
+++ b/mcs/tests/test-126.cs
@@ -0,0 +1,24 @@
+//
+// It is possible to invoke object methods in an interface.
+//
+using System;
+
+interface Iface {
+	void Method ();
+}
+
+class X : Iface {
+
+	void Iface.Method () {} 
+	
+	static int Main ()
+	{
+		X x = new X ();
+		Iface f = x;
+
+		if (f.ToString () != "X")
+			return 1;
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-127.cs b/mcs/tests/test-127.cs
new file mode 100755
index 00000000000..1ca2bed7449
--- /dev/null
+++ b/mcs/tests/test-127.cs
@@ -0,0 +1,23 @@
+//
+// It is possible to invoke Enum methods on an enum type.
+//
+using System;
+
+enum Test {
+	A,
+	B,
+	C
+}
+
+class X {
+
+	static int Main ()
+	{
+		Test test = Test.A;
+
+		if (!Test.IsDefined (typeof (Test), test))
+			return 1;
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-128.cs b/mcs/tests/test-128.cs
new file mode 100644
index 00000000000..21e5ec7b05b
--- /dev/null
+++ b/mcs/tests/test-128.cs
@@ -0,0 +1,41 @@
+using System;
+
+public class SimpleAttribute : Attribute {
+
+	string n;
+	
+	public SimpleAttribute (string name)
+	{
+		n = name;
+	}
+}
+
+public class Blah {
+
+	int i;
+
+	public int Value {
+
+		[Simple ("Foo!")]
+		get {
+			return i;
+		}
+
+		[Simple ("Bar !")]
+		set {
+			i = value;
+		}
+
+	}
+
+	public static int Main ()
+	{
+		//
+		// We need a better test which does reflection to check if the
+		// attributes have actually been applied etc.
+		//
+
+		return 0;
+	}
+
+}
diff --git a/mcs/tests/test-129.cs b/mcs/tests/test-129.cs
new file mode 100755
index 00000000000..11cf4b70e2c
--- /dev/null
+++ b/mcs/tests/test-129.cs
@@ -0,0 +1,17 @@
+//
+// Check unary minus.
+//
+using System;
+
+class X {
+
+	static int Main ()
+	{
+		short a = -32768;
+		int b = -2147483648;
+		long c = -9223372036854775808;
+		sbyte d = -128;
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-13.cs b/mcs/tests/test-13.cs
new file mode 100644
index 00000000000..f921ae55728
--- /dev/null
+++ b/mcs/tests/test-13.cs
@@ -0,0 +1,31 @@
+using System;
+
+class Foo {
+
+	public bool MyMethod ()
+	{
+		Console.WriteLine ("Base class method !");
+		return true;
+	}
+}
+
+class Blah : Foo {
+
+	public static int Main ()
+	{
+		Blah k = new Blah ();
+
+		Foo i = k;
+
+		if (i.MyMethod ())
+			return 0;
+		else
+			return 1;
+			       
+
+	}
+	
+}
+
+
+	       
diff --git a/mcs/tests/test-130.cs b/mcs/tests/test-130.cs
new file mode 100755
index 00000000000..be7b70df86c
--- /dev/null
+++ b/mcs/tests/test-130.cs
@@ -0,0 +1,30 @@
+//
+// Check casts.
+//
+using System;
+
+class X {
+
+	public const short a = 128;
+	public const int b = 0xffff;
+	public const double c = 123.4;
+
+	public const long d = 5;
+	// public const int e = 2147483648;
+
+	public const byte f = 127;
+
+	public const char c1 = (char) 0xffff;
+	public const char c2 = (char) 123.4;
+	public const char c3 = (char) a;
+	public const char c4 = (char) b;
+	public const char c5 = (char) c;
+
+	public const short s1 = (short) b;
+	public const short s2 = (short) c;
+
+	static int Main ()
+	{
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-131.cs b/mcs/tests/test-131.cs
new file mode 100644
index 00000000000..568576c96fa
--- /dev/null
+++ b/mcs/tests/test-131.cs
@@ -0,0 +1,35 @@
+using System;
+
+public class SimpleAttribute : Attribute {
+
+	string n;
+	
+	public SimpleAttribute (string name)
+	{
+		n = name;
+	}
+}
+
+public class Blah {
+
+	public enum Foo {
+
+		A,
+
+		[Simple ("second")]
+		B,
+
+		C
+	}
+
+	public static int Main ()
+	{
+		//
+		// We need a better test which does reflection to check if the
+		// attributes have actually been applied etc.
+		//
+
+		return 0;
+	}
+
+}
diff --git a/mcs/tests/test-132.cs b/mcs/tests/test-132.cs
new file mode 100755
index 00000000000..0ac9a986ce4
--- /dev/null
+++ b/mcs/tests/test-132.cs
@@ -0,0 +1,14 @@
+using System.Reflection;
+
+class T {
+	protected internal string s;
+	static int Main() {
+		FieldInfo f = typeof(T).GetField ("s", BindingFlags.NonPublic|BindingFlags.Instance);
+		if (f == null)
+			return 2;
+		FieldAttributes attrs = f.Attributes;
+		if ((attrs & FieldAttributes.FieldAccessMask) != FieldAttributes.FamORAssem)
+			return 1;
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-133.cs b/mcs/tests/test-133.cs
new file mode 100755
index 00000000000..1e27fc40631
--- /dev/null
+++ b/mcs/tests/test-133.cs
@@ -0,0 +1,36 @@
+using System;
+
+public struct S {
+	public int a, b;
+}
+
+class T {
+	enum OpCode : ushort { False }
+	enum OpFlags : ushort { None }
+	static void DecodeOp (ushort word, out OpCode op, out OpFlags flags) {
+		op = (OpCode)(word & 0x00ff);
+		flags = (OpFlags)(word & 0xff00);
+	}
+	static void get_struct (out S s) {
+		S ss;
+		ss.a = 1;
+		ss.b = 2;
+		s = ss;
+	}
+	static int Main() {
+		OpCode op;
+		OpFlags flags;
+		S s;
+		DecodeOp ((ushort)0x0203, out op, out flags);
+		if (op != (OpCode)0x3)
+			return 1;
+		if (flags != (OpFlags)0x200)
+			return 2;
+		get_struct (out s);
+		if (s.a != 1)
+			return 3;
+		if (s.b != 2)
+			return 4;
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-134.cs b/mcs/tests/test-134.cs
new file mode 100755
index 00000000000..35cb5c0c15b
--- /dev/null
+++ b/mcs/tests/test-134.cs
@@ -0,0 +1,69 @@
+//
+// This test checks if we implement all the interfaces inherited
+//
+
+interface IA {
+        void A ();
+}
+
+interface IB : IA {
+        void B ();
+}
+
+interface IC : IA, IB {
+	void C ();
+}
+
+interface ID : IC {
+}
+
+class AA : IC {
+	bool a, b, c;
+	public void A () { a = true; }
+	public void B () { b = true; }
+	public void C () { c = true; }
+
+	public bool OK {
+		get {
+			return a && b && c;
+		}
+	}
+}
+
+class BB : ID{
+	bool a, b, c;
+	public void A () { a = true; System.Console.WriteLine ("A"); }
+	public void B () { b = true; }
+	public void C () { c = true; }
+
+	public bool OK {
+		get {
+			return a && b && c;
+		}
+	}
+}
+
+class T: IB {
+        public void A () {}
+        public void B () {}
+
+        static int Main() {
+
+		BB bb = new BB ();
+		bb.A ();
+		bb.B ();
+		bb.C ();
+
+		if (!bb.OK)
+			return 1;
+
+		AA aa = new AA ();
+		aa.A ();
+		aa.B ();
+		aa.C ();
+		if (!aa.OK)
+			return 2;
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-135.cs b/mcs/tests/test-135.cs
new file mode 100755
index 00000000000..c7372e1755b
--- /dev/null
+++ b/mcs/tests/test-135.cs
@@ -0,0 +1,29 @@
+using System;
+using System.Reflection;
+// test bug bug#26264
+
+interface IA {
+        void doh();
+}
+interface IB {
+
+        IA Prop {get;}
+}
+class A : IA {
+        public void doh() {}
+}
+class T : IB {
+        IA IB.Prop {
+                get { return new A(); }
+        }
+        public A Prop {
+                get { return new A(); }
+        }
+        static int Main() {
+		PropertyInfo[] p = typeof (T).GetProperties (BindingFlags.Public| BindingFlags.NonPublic|BindingFlags.Instance);
+		if (p == null || p.Length != 1)
+			return 1;
+                return 0;
+        }
+}
+
diff --git a/mcs/tests/test-136.cs b/mcs/tests/test-136.cs
new file mode 100755
index 00000000000..562cdbee956
--- /dev/null
+++ b/mcs/tests/test-136.cs
@@ -0,0 +1,60 @@
+//
+// Tests that explicit and normal implementations of methods are handled
+// properly.  Before we used to have the normal method implementation
+// "implement" the classes, so that it would go into an infinite loop.
+// (bug #26334)
+//
+// Now explicit implementations are defined first.
+//
+using System;
+
+public interface IDiagnostic
+{
+	void Stop();
+} 
+public interface IAutomobile
+{
+	void Stop();
+}
+
+public class MyCar: IAutomobile, IDiagnostic {
+	public bool diag_stop, car_stop, auto_stop;
+	
+	void IDiagnostic.Stop() {
+		diag_stop = true;
+	}
+
+	public void Stop() {
+		car_stop = true;
+		IAutomobile self = (IAutomobile)this; // cast this
+		self.Stop(); // forwarding call
+	}
+
+	void IAutomobile.Stop()
+	{
+		auto_stop = true;
+	}
+}
+
+class TestConflict {
+	static int Main ()
+	{
+		MyCar car1 = new MyCar();
+		car1.Stop(); // calls the IAutomobile.Stop implementation
+		
+		IDiagnostic car2 = new MyCar();
+		car2.Stop();
+		
+		IAutomobile car3 = new MyCar();
+		car3.Stop();
+
+		if (!car1.car_stop)
+			return 1;
+
+		if (car1.diag_stop)
+			return 2;
+
+		Console.WriteLine ("ok");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-137.cs b/mcs/tests/test-137.cs
new file mode 100755
index 00000000000..ba11bb7fc39
--- /dev/null
+++ b/mcs/tests/test-137.cs
@@ -0,0 +1,45 @@
+//
+// Explicitly implement all the interface methods pending with the same name.
+//
+using System;
+
+interface A {
+	void X ();
+}
+
+interface B {
+	void X ();
+}
+
+class C : A, B {
+	int var;
+	
+	public void X ()
+	{
+		var++;
+	}
+
+	static int Main ()
+	{
+		C c = new C ();
+
+		A a = c;
+		B b = c;
+
+		if (c.var != 0)
+			return 1;
+		
+		a.X ();
+		if (c.var != 1)
+			return 2;
+		b.X ();
+		if (c.var != 2)
+			return 3;
+		c.X ();
+		if (c.var != 3)
+			return 4;
+
+		Console.WriteLine ("Test passes");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-138.cs b/mcs/tests/test-138.cs
new file mode 100755
index 00000000000..1581d2f99ec
--- /dev/null
+++ b/mcs/tests/test-138.cs
@@ -0,0 +1,9 @@
+// ensure the argument to newarr is converted to int32 or native int
+class T {
+	static int Main() {
+		char[] a;
+		long len = 10;
+		a = new char [len];
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-139.cs b/mcs/tests/test-139.cs
new file mode 100755
index 00000000000..be84d94fc98
--- /dev/null
+++ b/mcs/tests/test-139.cs
@@ -0,0 +1,48 @@
+//
+// This tests two uses of the `This' expression on structs; being used as an argument
+// and being used implicitly.
+//
+
+struct T {
+        int val;
+        void one () {
+
+		//
+		// First test: Pass this as an argument.
+		//
+                two (this);
+        }
+
+        void two (T t)  {
+		this = t;
+        }
+
+        void three (ref T t) {
+                two (t);
+        }
+
+
+        public override int GetHashCode () {
+		//
+		// Second test: do we correctly load this?
+		//
+                return val.GetHashCode();
+        }
+
+        static int  Main() 	
+	{
+		T t = new T ();
+
+		t.one ();
+
+		t.GetHashCode ();
+		
+		return 0;
+        }
+}
+
+
+
+
+
+        
diff --git a/mcs/tests/test-14.cs b/mcs/tests/test-14.cs
new file mode 100644
index 00000000000..dac824b6028
--- /dev/null
+++ b/mcs/tests/test-14.cs
@@ -0,0 +1,43 @@
+using System;
+
+namespace Obj {
+	interface Bah {
+		int H ();
+	}
+	class A : Bah {
+		public int F () {return 1;}
+		public virtual int G () {return 2;}
+		public int H () {return 10;}
+	}
+	class B : A {
+		public new int F () {return 3;}
+		public override int G () {return 4;}
+		public new int H () {return 11;}
+	}
+	class Test {
+		static public int Main () {
+			int result = 0;
+			B b = new B ();
+			A a = b;
+			if (a.F () != 1)
+				result |= 1 << 0;
+			if (b.F () != 3)
+				result |= 1 << 1;
+			if (b.G () != 4)
+				result |= 1 << 2;
+			if (a.G () != 4){
+				Console.WriteLine ("oops: " + a.G ());
+				result |= 1 << 3;
+			}
+			if (a.H () != 10)
+				result |= 1 << 4;
+			if (b.H () != 11)
+				result |= 1 << 5;
+			if (((A)b).H () != 10)
+				result |= 1 << 6;
+			if (((B)a).H () != 11)
+				result |= 1 << 7;
+			return result;
+		}
+	};
+};
diff --git a/mcs/tests/test-140.cs b/mcs/tests/test-140.cs
new file mode 100755
index 00000000000..03c9757b16b
--- /dev/null
+++ b/mcs/tests/test-140.cs
@@ -0,0 +1,28 @@
+//
+// We used to generate incorrect code for breaks in infinite while loops
+//
+using System;
+
+public class BreakTest
+{
+	static int ok = 0;
+	
+	public static void B ()
+	{
+		ok++;
+                while (true)
+                {
+			ok++;
+                        break;
+                }
+		ok++;
+	}
+	
+        public static int Main()
+        {
+		B ();
+		if (ok != 3)
+			return 1;
+		return 0;
+        }
+}
diff --git a/mcs/tests/test-141.cs b/mcs/tests/test-141.cs
new file mode 100755
index 00000000000..a540037bdeb
--- /dev/null
+++ b/mcs/tests/test-141.cs
@@ -0,0 +1,25 @@
+using System;
+
+class X {
+	public static int Main()
+	{
+		byte num1 = 105;
+		byte num2 = 150;
+		byte sum;
+
+		bool ok = false;
+		
+		// should generate OverflowException
+		try {
+			checked {
+				sum = (byte) (num1 - num2);
+			}
+		} catch (OverflowException){
+			ok = true;
+		}
+
+		if (ok)
+			return 0;
+		return 1;
+	}
+}
diff --git a/mcs/tests/test-142.cs b/mcs/tests/test-142.cs
new file mode 100644
index 00000000000..686283b0aaf
--- /dev/null
+++ b/mcs/tests/test-142.cs
@@ -0,0 +1,20 @@
+using System;
+
+public class TestClass : TestBaseClass {
+
+	public TestClass (EventHandler hndlr) : base ()
+	{
+		Blah += hndlr;
+	}
+
+	public static int Main ()
+	{
+		return 0;
+	}
+}
+
+public class TestBaseClass {
+
+	public event EventHandler Blah;
+
+}
diff --git a/mcs/tests/test-143.cs b/mcs/tests/test-143.cs
new file mode 100755
index 00000000000..3fb5ec2db83
--- /dev/null
+++ b/mcs/tests/test-143.cs
@@ -0,0 +1,27 @@
+using System;
+
+struct MonoEnumInfo {
+        int val;
+
+        void stuff() { val = 1; }
+
+        static int GetInfo (out MonoEnumInfo info) {
+		info = new MonoEnumInfo ();
+                info.stuff();
+                return info.val;
+        }
+
+        static int Main()
+	{
+		MonoEnumInfo m;
+
+		if (GetInfo (out m) != 1)
+			return 1;
+		
+		if (m.val != 1)
+			return 2;
+
+		return 0;
+	}
+};
+
diff --git a/mcs/tests/test-144.cs b/mcs/tests/test-144.cs
new file mode 100644
index 00000000000..3e1929415de
--- /dev/null
+++ b/mcs/tests/test-144.cs
@@ -0,0 +1,11 @@
+using System;
+
+public class Test
+{
+	const int A = unchecked ((int)0x80000000);
+	const int B = checked ((int)0x08000000);
+
+        public static void Main ()
+        {
+	}
+}
diff --git a/mcs/tests/test-145.cs b/mcs/tests/test-145.cs
new file mode 100644
index 00000000000..78cb9a6811d
--- /dev/null
+++ b/mcs/tests/test-145.cs
@@ -0,0 +1,11 @@
+using System;
+
+class JagArrayTest
+{
+  private static int [][] array = { new int [] { 1 }};
+
+  public static void Main() {
+      Console.WriteLine(array[0][0]);
+  }
+}
+
diff --git a/mcs/tests/test-146.cs b/mcs/tests/test-146.cs
new file mode 100644
index 00000000000..e45fb40f95a
--- /dev/null
+++ b/mcs/tests/test-146.cs
@@ -0,0 +1,58 @@
+using System;
+
+public class Test
+{
+        public static int Main ()
+        {
+		ulong a = 0;
+		bool[] r = new bool [16];
+
+		for (int i = 1; i < 16; i++)
+			r [i] = false;
+
+		if (a < System.UInt64.MaxValue)
+			r [0] = true;
+		if (a <= System.UInt64.MaxValue)
+			r [1] = true;
+		if (System.UInt64.MaxValue > a)
+			r [2] = true;
+		if (System.UInt64.MaxValue >= a)
+			r [3] = true;
+
+		float b = 0F;
+		if (b < System.UInt64.MaxValue)
+			r [4] = true;
+		if (b <= System.UInt64.MaxValue)
+			r [5] = true;
+		if (System.UInt64.MaxValue > b)
+			r [6] = true;
+		if (System.UInt64.MaxValue >= b)
+			r [7] = true;
+
+		ushort c = 0;
+		if (c < System.UInt16.MaxValue)
+			r [8] = true;
+		if (c <= System.UInt16.MaxValue)
+			r [9] = true;
+		if (System.UInt16.MaxValue > c)
+			r [10] = true;
+		if (System.UInt16.MaxValue >= c)
+			r [11] = true;
+
+		byte d = 0;
+		if (d < System.Byte.MaxValue)
+			r [12] = true;
+		if (d <= System.Byte.MaxValue)
+			r [13] = true;
+		if (System.Byte.MaxValue > d)
+			r [14] = true;
+		if (System.Byte.MaxValue >= d)
+			r [15] = true;
+
+		foreach (bool check in r)
+			if (!check)
+				return 1;
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-147.cs b/mcs/tests/test-147.cs
new file mode 100644
index 00000000000..8d7866cfd26
--- /dev/null
+++ b/mcs/tests/test-147.cs
@@ -0,0 +1,163 @@
+using System;
+
+public class X
+{
+	public long Value = 5;
+	public static long StaticValue = 6;
+
+	public static X Foo ()
+	{
+		return new X ();
+	}
+	
+	public static X Bar ()
+	{
+		return Foo ();
+	}
+
+	public X Baz ()
+	{
+		return Bar ();
+	}
+
+	public uint Property {
+		get {
+			return 3;
+		}
+	}
+
+	public static uint StaticProperty {
+		get {
+			return 20;
+		}
+	}
+
+	public int this [int index] {
+		get {
+			return 1;
+		}
+	}
+}
+
+public class Y : X
+{
+	new public long Value = 8;
+	new public static long StaticValue = 9;
+
+	public static new Y Foo ()
+	{
+		return new Y ();
+	}
+
+	public static new Y Bar ()
+	{
+		return Foo ();
+	}
+
+	public new Y Baz ()
+	{
+		return Bar ();
+	}
+
+	public new uint Property {
+		get {
+			return 4;
+		}
+	}
+
+	public new static uint StaticProperty {
+		get {
+			return 21;
+		}
+	}
+
+	public new int this [int index] {
+		get {
+			return 2;
+		}
+	}
+}
+
+public class Z : Y
+{
+	public int Test () {
+		if (Property != 4)
+			return 20;
+
+		if (StaticProperty != 21)
+			return 21;
+
+		if (((X) this).Property != 3)
+			return 22;
+
+		if (X.StaticProperty != 20)
+			return 23;
+
+		if (this [5] != 2)
+			return 24;
+
+		if (((X) this) [6] != 1)
+			return 25;
+
+		return 0;
+	}
+}
+
+public class Test
+{
+	public static int Main ()
+	{
+		Y y = new Y ();
+		X a,b,c,d;
+
+		a = Y.Bar ();
+		if (!(a is Y))
+			return 1;
+
+		b = y.Baz ();
+		if (!(b is Y))
+			return 2;
+
+		c = X.Bar ();
+		if (c is Y)
+			return 3;
+
+		d = ((X) y).Baz ();
+		if (d is Y)
+			return 4;
+
+		if (y.Value != 8)
+			return 5;
+
+		if (((X) y).Value != 5)
+			return 6;
+
+		if (Y.StaticValue != 9)
+			return 7;
+
+		if (X.StaticValue != 6)
+			return 8;
+
+		if (y.Property != 4)
+			return 9;
+
+		if (((X) y).Property != 3)
+			return 10;
+
+		if (y [5] != 2)
+			return 11;
+
+		if (((X) y) [7] != 1)
+			return 10;
+
+		if (X.StaticProperty != 20)
+			return 11;
+
+		if (Y.StaticProperty != 21)
+			return 12;
+
+		Z z = new Z ();
+
+		return z.Test ();
+	}
+}
diff --git a/mcs/tests/test-148.cs b/mcs/tests/test-148.cs
new file mode 100644
index 00000000000..5c29fe1322a
--- /dev/null
+++ b/mcs/tests/test-148.cs
@@ -0,0 +1,82 @@
+using System;
+using System.Runtime.CompilerServices;
+
+public interface X
+{
+	[IndexerName ("Foo")]
+	int this [int a] {
+		get;
+	}
+}
+
+public class Y : X
+{
+	int X.this [int a] {
+		get {
+			return 1;
+		}
+	}
+
+	[IndexerName ("Bar")]
+	public int this [int a] {
+		get {
+			return 2;
+		}
+	}
+
+	[IndexerName ("Bar")]
+	public long this [double a] {
+		get {
+			return 3;
+		}
+	}
+}
+
+public class Z : Y
+{
+	[IndexerName ("Whatever")]
+	new public long this [double a] {
+		get {
+			return 4;
+		}
+	}
+
+	public static int Test ()
+	{
+		Z z = new Z ();
+		X x = (X) z;
+		Y y = (Y) z;
+
+		Console.WriteLine (z [1]);
+		Console.WriteLine (y [2]);
+		Console.WriteLine (x [3]);
+
+		if (z [1] != 4)
+			return 1;
+		if (y [1] != 2)
+			return 2;
+		if (x [1] != 1)
+			return 3;
+
+		double index = 5;
+
+		Console.WriteLine (z [index]);
+		Console.WriteLine (y [index]);
+
+		if (z [index] != 4)
+			return 4;
+		if (y [index] != 3)
+			return 5;
+
+		return 0;
+	}
+
+	public static int Main ()
+	{
+		int result = Test ();
+
+		Console.WriteLine ("RESULT: " + result);
+
+		return result;
+	}
+}
diff --git a/mcs/tests/test-149.cs b/mcs/tests/test-149.cs
new file mode 100644
index 00000000000..006b8fed358
--- /dev/null
+++ b/mcs/tests/test-149.cs
@@ -0,0 +1,83 @@
+using System;
+
+public delegate long MyDelegate (int a);
+
+public interface X
+{
+	event EventHandler Foo;
+
+	event MyDelegate TestEvent;
+}
+
+public class Y : X
+{
+	static int a = 0;
+
+	event EventHandler X.Foo {
+		add {
+		}
+
+		remove {
+		}
+	}
+
+	public event EventHandler Foo;
+
+	public event MyDelegate TestEvent;
+
+	public int Test ()
+	{
+		X x = this;
+
+		Foo += new EventHandler (callback1);
+		TestEvent += new MyDelegate (callback2);
+
+		x.Foo += new EventHandler (callback3);
+
+		if (a != 0)
+			return 1;
+
+		Foo (this, new EventArgs ());
+		if (a != 1)
+			return 2;
+
+		if (TestEvent (2) != 4)
+			return 3;
+
+		if (a != 2)
+			return 4;
+
+		return 0;
+	}
+
+
+	private static void callback1 (object sender, EventArgs e)
+	{
+		a = 1;
+	}
+
+	private static long callback2 (int b)
+	{
+		a = b;
+		return a * a;
+	}
+
+	private static void callback3 (object sender, EventArgs e)
+	{
+		a = 3;
+	}
+}
+
+public class Z : Y
+{
+	public static int Main ()
+	{
+		Z z = new Z ();
+
+		int result = z.Test ();
+
+		Console.WriteLine ("TEST RESULT: " + result);
+
+		return result;
+	}
+}
diff --git a/mcs/tests/test-15.cs b/mcs/tests/test-15.cs
new file mode 100755
index 00000000000..c199bc13bcb
--- /dev/null
+++ b/mcs/tests/test-15.cs
@@ -0,0 +1,22 @@
+using System;
+
+interface Iface {
+	void A ();
+}
+
+class Implementor : Iface {
+	public void A () {}
+}
+
+class Run {
+
+	static int Main ()
+	{
+		Iface iface;
+		Implementor i = new Implementor ();
+
+		iface = i;
+		
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-150.cs b/mcs/tests/test-150.cs
new file mode 100644
index 00000000000..544d297fa7e
--- /dev/null
+++ b/mcs/tests/test-150.cs
@@ -0,0 +1,8 @@
+using System;
+class T {
+        public static int Main() {
+                if (Int32.MinValue == 0x80000000)
+                        return 1;
+                return 0;
+        }
+}
diff --git a/mcs/tests/test-151.cs b/mcs/tests/test-151.cs
new file mode 100644
index 00000000000..ab523eed154
--- /dev/null
+++ b/mcs/tests/test-151.cs
@@ -0,0 +1,16 @@
+using System;
+namespace A {
+        public class Iface {
+                void bah() {}
+        }
+        class my {
+                A.Iface b;
+                void doit (Object A) {
+                        b = (A.Iface)A;
+                }
+                public static int Main () {
+                        return 0;
+                }
+        }
+}
+
diff --git a/mcs/tests/test-152.cs b/mcs/tests/test-152.cs
new file mode 100644
index 00000000000..2b5c52c9446
--- /dev/null
+++ b/mcs/tests/test-152.cs
@@ -0,0 +1,24 @@
+using System;
+
+public class X
+{
+	public static int Main ()
+	{
+                int v = 10;
+                int a;
+
+                switch (v) {
+                case 0:
+                        int i = v + 1;
+                        a = i;
+                        break;
+                default:
+                        i = 5;
+                        a = i;
+                        break;
+                }
+                if (a != 5)
+                        return 1;
+                return 0;
+        }
+}
diff --git a/mcs/tests/test-153.cs b/mcs/tests/test-153.cs
new file mode 100644
index 00000000000..29419075afb
--- /dev/null
+++ b/mcs/tests/test-153.cs
@@ -0,0 +1,24 @@
+#define DEBUG
+using System;
+using System.Text;
+using System.Diagnostics;
+
+class Z
+{
+	static public void Test2 (string message, params object[] args)
+	{
+	}
+
+	static public void Test (string message, params object[] args)
+	{
+		Test2 (message, args);
+	}
+
+	static int Main ()
+	{
+		Test ("TEST");
+		Test ("Foo", 8);
+		Test ("Foo", 8, 9, "Hello");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-154.cs b/mcs/tests/test-154.cs
new file mode 100644
index 00000000000..56b5be7509f
--- /dev/null
+++ b/mcs/tests/test-154.cs
@@ -0,0 +1,300 @@
+using System;
+using System.Collections;
+
+public class X
+{
+	public static int Main ()
+	{
+		// This is a compilation-only test.
+		return 0;
+	}
+
+	// All code paths throw an exception, no need to set out parameters.
+	public static void test1 (out float f)
+	{
+		throw new NotSupportedException ();
+	}
+
+	// The while loop breaks but does not return, so this is ok.
+	public static void test2 (int a, out float f)
+	{
+		while (a > 0) {
+			if (a == 5)
+				continue;
+
+			Console.WriteLine (a);
+		}
+
+		f = 8.53F;
+	}
+
+	// a has been assigned in all code paths which do not return.
+	public static void test3 (long[] b, int c)
+	{
+		ICollection a;
+		if (b == null)
+			throw new ArgumentException ();
+		else
+			a = (ICollection) b;
+
+		Console.WriteLine (a);
+	}
+
+	// Forward goto, it's ok to set f after the target label.
+	public static int test4 (int b, out float f)
+	{
+		long a;
+
+		Console.WriteLine ("Hello World");
+
+		a = 5;
+
+		goto World;
+
+	World:
+		Console.WriteLine (a);
+
+		f = 8.53F;
+
+		return 0;
+	}
+
+	// try { ... } catch { ... } finally { ... } block
+	static public int test5 (out float f, long d)
+	{
+                int a;
+		long b = 8;
+
+		try {
+			f = 8.53F;
+
+			if (d == 500)
+				return 9;
+
+			a = 5;
+		} catch (NotSupportedException e) {
+			a = 9;
+		} catch (Exception e) {
+			return 9;
+		} finally {
+			f = 9.234F;
+		}
+
+		return a;
+        }
+
+	// Passing out parameter to method invocation
+	static public int test6 (out float f)
+	{
+		return test5 (out f, 50);
+	}
+
+	// Loop-variable of foreach() and for() loop.
+	static public long test7 (int[] a, int stop)
+	{
+		long b = 0;
+		foreach (int i in a)
+			b += i;
+
+		for (int i = 1; i < stop; i++)
+			b *= i;
+
+		return b;
+	}
+
+	// Initializing locals in initialize or test of for block
+	static public long test8 (int stop)
+	{
+		int i;
+		long b;
+		for (i = 1; (b = stop) > 3; i++) {
+			stop--;
+			b += i;
+		}
+		return b;
+	}
+
+	// Initializing locals in test of while block
+	static public long test9 (int stop)
+	{
+		long b;
+		while ((b = stop) > 3) {
+			stop--;
+			b += stop;
+		}
+		return b;
+	}
+
+	// Return in subblock
+	public static void test10 (int a, out float f)
+	{
+		if (a == 5) {
+			f = 8.53F;
+			return;
+		}
+
+		f = 9.0F;
+	}
+
+	// Switch block
+	public static long test11 (int a)
+	{
+		long b;
+
+		switch (a) {
+		case 5:
+			b = 1;
+			break;
+
+		case 9:
+			b = 3;
+			break;
+
+		default:
+			return 9;
+		}
+
+		return b;
+	}
+
+	// Try block which rethrows exception.
+	public static void test12 (out float f)
+	{
+		try {
+			f = 9.0F;
+		} catch {
+			throw new NotSupportedException ();
+		}
+	}
+
+	// Return in subblock.
+	public static void test13 (int a, out float f)
+	{
+		do {
+			if (a == 8) {
+				f = 8.5F;
+				return;
+			}
+		} while (false);
+
+		f = 1.3F;
+		return;
+	}
+
+	// Switch block with goto case / goto default.
+	public static long test14 (int a, out float f)
+	{
+		long b;
+
+		switch (a) {
+		case 1:
+			goto case 2;
+
+		case 2:
+			f = 9.53F;
+			return 9;
+
+		case 3:
+			goto default;
+
+		default:
+			b = 10;
+			break;
+		}
+
+		f = 10.0F;
+
+		return b;
+	}
+
+	// Forward goto, it's ok to set f before the jump.
+	public static int test15 (int b, out float f)
+	{
+		long a;
+
+		Console.WriteLine ("Hello World");
+
+		a = 5;
+		f = 8.53F;
+
+		goto World;
+
+	World:
+		Console.WriteLine (a);
+
+		return 0;
+	}
+
+	// `continue' breaks unless we're a loop block.
+	public static void test16 ()
+	{
+                int value;
+
+                for (int i = 0; i < 5; ++i) {
+                        if (i == 0) {
+                                continue;
+                        } else if (i == 1) {
+                                value = 2;
+                        } else {
+                                value = 0;
+                        }
+                        if (value > 0)
+                                return;
+                }
+	}
+
+	// `continue' in a nested if.
+	public static void test17 ()
+	{
+		 int value;
+		 long charCount = 9;
+		 long testit = 5;
+
+		 while (charCount > 0) {
+			 --charCount;
+
+			 if (testit == 8) {
+				 if (testit == 9)
+					 throw new Exception ();
+
+				 continue;
+			 } else {
+				 value = 0;
+			 }
+
+			 Console.WriteLine (value);
+		 }
+	}
+
+	// `out' parameter assigned after conditional exception.
+	static void test18 (int a, out int f)
+	{
+		try {
+			if (a == 5)
+				throw new Exception ();
+
+			f = 9;
+		} catch (IndexOutOfRangeException) {
+			throw new FormatException ();
+		}
+	}
+
+	// code after try/catch block is unreachable. always returns.
+        static int test19 () {
+                int res;
+                int a = Environment.NewLine.Length;
+                int fin = 0;
+
+                try {
+                        res = 10/a;
+                        throw new NotImplementedException ();
+                } catch (NotImplementedException e) {
+                        fin = 2;
+                        throw new NotImplementedException ();
+                } finally {
+                        fin = 1;
+                }
+                return res;
+        }
+
+}
diff --git a/mcs/tests/test-155.cs b/mcs/tests/test-155.cs
new file mode 100644
index 00000000000..6a0f083c2c1
--- /dev/null
+++ b/mcs/tests/test-155.cs
@@ -0,0 +1,23 @@
+using System;
+
+class Test {
+        public static int Main() {
+                Console.WriteLine("test");
+                TestClass tst = new TestClass();
+                tst.test("test");
+                TestInterface ti = (TestInterface)tst;
+                ti.test("test");
+		return 0;
+        }
+
+        public interface TestInterface {
+                string test(string name);
+        }
+
+        public class TestClass: TestInterface {
+                public string test(string name) {
+                    Console.WriteLine("test2");
+                    return name + " testar";
+                }
+        }
+}
diff --git a/mcs/tests/test-156.cs b/mcs/tests/test-156.cs
new file mode 100644
index 00000000000..43545820720
--- /dev/null
+++ b/mcs/tests/test-156.cs
@@ -0,0 +1,107 @@
+class Internal { }
+
+public class Public { }
+
+class X
+{
+	public class NestedPublic { }
+
+	internal class NestedAssembly { }
+
+	protected internal class NestedFamilyAndAssembly { }
+
+	protected class NestedFamily { }
+
+	private class NestedPrivate { }
+
+	static void Main () { }
+}
+
+public class A : Public { }
+
+class B : Public { }
+class C : Internal { }
+
+class D : X.NestedPublic { }
+class E : X.NestedAssembly { }
+class F : X.NestedFamilyAndAssembly { }
+
+public class Y
+{
+	public class YA : Public { }
+
+	class YB : Internal { }
+
+	class YC : X.NestedPublic { }
+	class YD : X.NestedAssembly { }
+	class YE : X.NestedFamilyAndAssembly { }
+
+	internal class YF : Internal { }
+
+	internal class YG : X.NestedAssembly { }
+	internal class YH : X.NestedFamilyAndAssembly { }
+
+	internal enum YI { A, B }
+
+	internal void Test (YI yi) { }
+}
+
+public class Z
+{
+	public class P : Y.YA { }
+}
+
+class W : X
+{
+	public class WA : NestedPublic { }
+	public class WB : NestedAssembly { }
+	public class WC : NestedFamilyAndAssembly { }
+	internal class WD : NestedPublic { }
+	internal class WE : NestedFamilyAndAssembly { }
+
+	private class WCA
+	{
+	}
+
+	private class WCB
+	{
+		public class WCD
+		{
+			public class WCE : WCA
+			{
+			}
+		}
+	}
+}
+
+class G
+{
+	public void Test (X x) { }
+
+	private enum Foo { A, B };
+
+	enum Bar { C, D };
+
+	private class I
+	{
+		public class J
+		{
+			public void Test (Foo foo) { }
+		}
+	}
+}
+
+public class H
+{
+	public void Test (int[] a) { }
+}
+
+internal interface L
+{
+	void Hello (string hello);
+}
+
+public class M : L
+{
+	public void Hello (string hello) { }
+}
diff --git a/mcs/tests/test-157.cs b/mcs/tests/test-157.cs
new file mode 100644
index 00000000000..a01ffc79c1c
--- /dev/null
+++ b/mcs/tests/test-157.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Reflection;
+
+namespace Test {
+	
+       	//[AttributeUsage (AttributeTargets.All)]
+	public class MyAttribute: Attribute {
+		public string val;
+		public MyAttribute (string stuff) {
+			System.Console.WriteLine (stuff);
+			val = stuff;
+		}
+	}
+	
+	[My("testclass")]
+	public class Test {
+		static public int Main() {
+			System.Reflection.MemberInfo info = typeof (Test);
+			object[] attributes = info.GetCustomAttributes (false);
+			for (int i = 0; i < attributes.Length; i ++) {
+				System.Console.WriteLine(attributes[i]);
+			}
+			if (attributes.Length != 1)
+				return 1;
+			MyAttribute attr = (MyAttribute) attributes [0];
+			if (attr.val != "testclass")
+				return 2;
+			return 0;
+		}
+	}
+}
diff --git a/mcs/tests/test-158.cs b/mcs/tests/test-158.cs
new file mode 100644
index 00000000000..80b26d88ed0
--- /dev/null
+++ b/mcs/tests/test-158.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Reflection;
+
+[AttributeUsage (AttributeTargets.All)]
+public class My : Attribute {
+	public object o;
+
+	public My (object o) {
+		this.o = o;
+	}
+	
+	[My(TypeCode.Empty)]
+	public class Test {
+		static public int Main() {
+			System.Reflection.MemberInfo info = typeof (Test);
+			object[] attributes = info.GetCustomAttributes (false);
+			for (int i = 0; i < attributes.Length; i ++) {
+				System.Console.WriteLine(attributes[i]);
+			}
+			if (attributes.Length != 1)
+				return 1;
+			My attr = (My) attributes [0];
+			if ((TypeCode) attr.o != TypeCode.Empty)
+				return 2;
+			return 0;
+		}
+	}
+}
diff --git a/mcs/tests/test-159.cs b/mcs/tests/test-159.cs
new file mode 100644
index 00000000000..d3d9f101014
--- /dev/null
+++ b/mcs/tests/test-159.cs
@@ -0,0 +1,15 @@
+using System;
+namespace A {
+        public class Iface {
+                void bah() {}
+        }
+        class my {
+                A.Iface b;
+                void doit (Object A) {
+                        b = (A.Iface)A;
+                }
+                public static int Main () {
+                        return 0;
+                }
+        }
+}
diff --git a/mcs/tests/test-16.cs b/mcs/tests/test-16.cs
new file mode 100644
index 00000000000..3c59e917e19
--- /dev/null
+++ b/mcs/tests/test-16.cs
@@ -0,0 +1,61 @@
+using System;
+
+namespace Mine {
+
+	public class Blah {
+
+		public static int operator + (Blah i, Blah j)
+		{
+			Console.WriteLine ("Base class binary + operator");
+			return 2; 
+		}
+
+		public static implicit operator int (Blah i)
+		{
+			Console.WriteLine ("Blah->int");
+			return 3;
+		}
+
+		public static implicit operator byte (Blah i)
+		{
+			Console.WriteLine ("Blah->byte");
+			return 0;
+		}
+		
+		public static implicit operator short (Blah i)
+		{
+			Console.WriteLine ("Blah->short");
+			return 1;
+		}
+		
+	}
+
+	public class Foo : Blah {
+
+		public static int Main ()
+		{
+			int number = new Foo () + new Foo () ;
+			Console.WriteLine (number);
+
+			Foo tmp = new Foo ();
+			
+			int k = tmp;
+
+			Console.WriteLine ("Convert from Foo to float");
+			float f = tmp;
+			Console.WriteLine ("Converted");
+
+			// The following will not work till we fix our UserCast::Emit
+			// to convert the return value on the stack.
+			if (f == 3)
+				Console.WriteLine ("Best implicit conversion selected correctly.");
+
+			Console.WriteLine ("F is {0}", f);
+
+			if (number == 2 && k == 3)
+				return 0;
+			else
+				return 1;
+		}
+	}
+}
diff --git a/mcs/tests/test-160.cs b/mcs/tests/test-160.cs
new file mode 100644
index 00000000000..c2083dd68c8
--- /dev/null
+++ b/mcs/tests/test-160.cs
@@ -0,0 +1,21 @@
+class B {
+        public S s;
+}
+class S {
+        public int a;
+}
+class T {
+	static B foo;
+
+        static int blah (object arg) {
+                B look = (B)arg;
+		foo.s.a = 9;
+		look.s.a = foo.s.a;
+                return look.s.a;
+        }
+
+        static int Main() {
+		// Compilation only test;
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-161.cs b/mcs/tests/test-161.cs
new file mode 100644
index 00000000000..9c4e7ade77e
--- /dev/null
+++ b/mcs/tests/test-161.cs
@@ -0,0 +1,25 @@
+using System;
+
+public class ZipEntry
+{
+	DateTime cal = DateTime.Now;
+
+	public ZipEntry(string name)
+	{
+	}
+
+	public ZipEntry(ZipEntry e)
+	{
+	}
+
+	public DateTime DateTime {
+		get {
+			return cal;
+		}
+	}
+
+	static int Main () {
+		// Compilation only test.
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-162.cs b/mcs/tests/test-162.cs
new file mode 100644
index 00000000000..284a423d0fb
--- /dev/null
+++ b/mcs/tests/test-162.cs
@@ -0,0 +1,91 @@
+using System;
+
+struct A
+{
+	public int a;
+	private long b;
+	private float c;
+
+	public A (int foo)
+	{
+		a = foo;
+		b = 8;
+		c = 9.0F;
+	}
+}
+
+struct B
+{
+	public int a;
+}
+
+struct C
+{
+	public long b;
+
+	public C (long foo)
+	{
+		b = foo;
+	}
+
+	// has `this' initializer, no need to initialize fields.
+	public C (string foo)
+		: this (500)
+	{ }
+}
+
+class X
+{
+	static void test_output (A x)
+	{
+	}
+
+	static void test_output (B y)
+	{
+	}
+
+	static void test1 ()
+	{
+		A x;
+
+		x.a = 5;
+		Console.WriteLine (x.a);
+	}
+
+	static void test2 ()
+	{
+		B y;
+
+		y.a = 5;
+		Console.WriteLine (y.a);
+		Console.WriteLine (y);
+	}
+
+	static void test3 ()
+	{
+		A x = new A (85);
+
+		Console.WriteLine (x);
+	}
+
+	static void test4 (A x)
+	{
+		x.a = 5;
+	}
+
+	static void test5 (out A x)
+	{
+		x = new A (85);
+	}
+
+	static void test6 (out B y)
+	{
+		y.a = 1;
+	}
+
+	public static int Main ()
+	{
+		// Compilation-only test.
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-17.cs b/mcs/tests/test-17.cs
new file mode 100755
index 00000000000..c6e2a95745c
--- /dev/null
+++ b/mcs/tests/test-17.cs
@@ -0,0 +1,45 @@
+//
+// This test excercises user defined conversions and an implicit
+// conversion to a type afterwards.
+//
+// 
+using System;
+
+class Blah {
+
+ public static int Main ()
+ {
+  Blah k = new Blah ();
+
+  float f = k;
+
+  if (f == 2){
+   Console.WriteLine ("Best implicit operator selected correctly");
+   return 0;
+  }
+  return 1;
+
+ }
+
+ public static implicit operator byte (Blah i)
+ {
+  Console.WriteLine ("Blah->byte");
+  return 0;
+ }
+
+
+ public static implicit operator short (Blah i)
+ {
+  Console.WriteLine ("Blah->short");
+  return 1;
+ }
+
+ public static implicit operator int (Blah i)
+ {
+  Console.WriteLine ("Blah->int");
+  return 2;
+ }
+
+
+}
+
diff --git a/mcs/tests/test-18.cs b/mcs/tests/test-18.cs
new file mode 100644
index 00000000000..eb2a02c0033
--- /dev/null
+++ b/mcs/tests/test-18.cs
@@ -0,0 +1,52 @@
+using System;
+
+class X {
+	static int i;
+	static int j;
+	
+	static void m ()
+	{
+		i = 0;
+		j = 0;
+		
+		try {
+			throw new ArgumentException ("Blah");
+		} catch (ArgumentException){
+			i = 1;
+		} catch (Exception){
+			i = 2;
+		} finally {
+			j = 1;
+		}
+	}
+
+	static int ret (int a)
+	{
+		try {
+			if (a == 1)
+				throw new Exception ();
+			
+			return 1;
+		} catch {
+			return 2;
+		}
+	}
+	
+	static int Main ()
+	{
+		m ();
+		if (i != 1)
+			return 1;
+		if (j != 1)
+			return 2;
+
+		if (ret (1) != 2)
+			return 3;
+
+		if (ret (10) != 1)
+			return 4;
+		
+		return 0;
+	}
+}
+
diff --git a/mcs/tests/test-19.cs b/mcs/tests/test-19.cs
new file mode 100755
index 00000000000..f63dff52958
--- /dev/null
+++ b/mcs/tests/test-19.cs
@@ -0,0 +1,114 @@
+using System;
+using System.Threading;
+using System.Reflection;
+
+class I {
+
+	public delegate string GetTextFn (string a);
+
+	static public GetTextFn GetText;
+
+	static string fn (string s)
+	{
+		return "(" + s + ")";
+	}
+	
+	static I ()
+	{
+		GetText = new GetTextFn (fn);
+	}
+}
+
+class X {
+
+	public delegate int Foo (int i, int j);
+	
+	private void Thread_func () {
+		Console.WriteLine ("Inside the thread !");
+	}
+
+	public int Func (int i, int j)
+	{
+		return i+j;
+	}
+
+	public void Bar ()
+	{
+		Foo my_func = new Foo (Func);
+
+		int result = my_func (2, 4);
+
+		Console.WriteLine ("Answer is : " + result);
+	}
+
+	static bool MyFilter (MemberInfo mi, object criteria)
+	{
+		Console.WriteLine ("You passed in : " + criteria);
+		return true;
+	}
+	
+	public static int Main ()
+	{
+		I.GetTextFn _ = I.GetText;
+
+	Console.WriteLine ("Value: " + I.GetText);
+		X x = new X ();
+
+		Thread thr = new Thread (new ThreadStart (x.Thread_func));
+
+		thr.Start ();
+		Console.WriteLine ("Inside main ");
+		thr.Join ();
+
+		Console.WriteLine (_("Hello"));
+
+		x.Bar ();
+
+		MemberFilter filter = new MemberFilter (MyFilter);
+
+		Type t = x.GetType ();
+
+		MemberInfo [] mi = t.FindMembers (MemberTypes.Method, BindingFlags.Static | BindingFlags.NonPublic,
+						  Type.FilterName, "MyFilter");
+
+		Console.WriteLine ("FindMembers called, mi = " + mi);
+		Console.WriteLine ("   Count: " + mi.Length);
+		if (!filter (mi [0], "MyFilter"))
+			return 1;
+
+		//
+		// This test is used to call into a delegate defined in a separate
+		// namespace, but which is still not a nested delegate inside a class
+		//
+		NameSpace.TestDelegate td = new NameSpace.TestDelegate (multiply_by_three);
+
+		if (td (8) != 24)
+			return 30;
+
+		//
+		// Check the names that were used to define the delegates
+		//
+		if (td.GetType ().FullName != "NameSpace.TestDelegate")
+			return 31;
+
+		if (_.GetType ().FullName != "I+GetTextFn")
+			return 32;
+		
+		Console.WriteLine ("Test passes");
+
+		return 0;
+	}
+
+	static int multiply_by_three (int v)
+	{
+		return v * 3;
+	}
+	
+}
+
+namespace NameSpace {
+
+	public delegate int TestDelegate (int a);
+
+}
+	
diff --git a/mcs/tests/test-2.cs b/mcs/tests/test-2.cs
new file mode 100755
index 00000000000..0a18d50767b
--- /dev/null
+++ b/mcs/tests/test-2.cs
@@ -0,0 +1,7 @@
+class X {
+	static int Main (string [] args)
+	{
+		System.Console.WriteLine ("Hello, World");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-20.cs b/mcs/tests/test-20.cs
new file mode 100755
index 00000000000..006bd45075e
--- /dev/null
+++ b/mcs/tests/test-20.cs
@@ -0,0 +1,70 @@
+//
+// This generates a warning
+//
+using System;
+
+class A {
+	public int a;
+
+	public void X ()
+	{
+		a = 1;
+	}
+}
+
+class B : A {
+	void X ()
+	{
+		a = 2;
+	}
+
+	public void TestB ()
+	{
+		X ();
+	}
+}
+
+class Ax {
+	public int a;
+
+	public virtual void A ()
+	{
+		a = 1;
+	}
+
+	public virtual void B ()
+	{
+		a = 3;
+	}
+}
+
+class Bx : Ax {
+	public override void A ()
+	{
+		a = 2;
+	}
+	public new void B ()
+	{
+		a = 4;
+	}
+}
+class Test {
+	static int Main ()
+	{
+		B b = new B ();
+
+		b.TestB ();
+		if (b.a != 2)
+			return 1;
+
+		Bx bx = new Bx ();
+		bx.A ();
+		if (b.a != 2)
+			return 2;
+		bx.B ();
+		Console.WriteLine ("a="+bx.a);
+		if (bx.a != 4)
+			return 3;
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-21.cs b/mcs/tests/test-21.cs
new file mode 100644
index 00000000000..cd125497bbb
--- /dev/null
+++ b/mcs/tests/test-21.cs
@@ -0,0 +1,35 @@
+using System;
+
+public class Blah {
+
+	public class Foo {
+
+		public Foo ()
+		{
+			Console.WriteLine ("Inside the Foo constructor now");
+		}
+		
+		public int Bar (int i, int j)
+		{
+			Console.WriteLine ("The Bar method");
+			return i+j;
+		}
+		
+		
+	}
+
+	public static int Main ()
+	{
+		Foo f = new Foo ();
+
+		int j = f.Bar (2, 3);
+		Console.WriteLine ("Blah.Foo.Bar returned " + j);
+		
+		if (j == 5)
+			return 0;
+		else
+			return 1;
+
+	}
+
+}
diff --git a/mcs/tests/test-22.cs b/mcs/tests/test-22.cs
new file mode 100644
index 00000000000..2e662494ddd
--- /dev/null
+++ b/mcs/tests/test-22.cs
@@ -0,0 +1,46 @@
+//
+// This test excercises invocations of methods in structures.
+//
+// Unlike classes, we can not just leave the result of a computed
+// structure in the IL stack as a result.  The reason is that the
+// result is the whole structure, not a pointer to it.
+//
+// This program excercises invocations to methods on structures
+//
+
+struct T {
+	public int a, b;
+}
+
+struct S {
+	T t;
+
+	public T GetT ()
+	{
+		return t;
+	}
+
+	public void Init ()
+	{
+		t.a = 1;
+		t.b = 2;
+	}
+}
+
+class M {
+	static int Main ()
+	{
+		S s = new S ();
+
+		s.Init ();
+		
+		if (s.GetT ().a != 1)
+			return 1;
+
+		if (s.GetT ().b != 2)
+			return 2;
+
+		return 0;
+	}
+}
+		
diff --git a/mcs/tests/test-23.cs b/mcs/tests/test-23.cs
new file mode 100644
index 00000000000..0723c667d95
--- /dev/null
+++ b/mcs/tests/test-23.cs
@@ -0,0 +1,106 @@
+//
+// Tests properties
+//
+using System;
+
+class X {
+	static int v;
+
+	static X ()
+	{
+		v = 10;
+	}
+
+	public static int Value {
+		get {
+			return v;
+		}
+
+		set {
+			v = value;
+		}
+	}
+
+	static int Main ()
+	{
+		if (Value != 10)
+			return 1;
+
+		Value = 4;
+
+		if (Value != 4)
+			return 2;
+
+		Y y = new Y ("hello");
+
+		if (y.Value != "hello")
+			return 3;
+
+		y.Value = "goodbye";
+		if (y.Value != "goodbye")
+			return 4;
+
+		Z z = new Z ();
+
+		if (Z.IVal != 4)
+			return 5;
+		Z.IVal = 10;
+		if (Z.IVal != 10)
+			return 6;
+
+		z.XVal = 23;
+		if (z.XVal != 23)
+			return 7;
+
+		return 0;
+	}
+}
+	
+class Y {
+	string init;
+	
+	public Y (string s)
+	{
+		init = s;
+	}
+
+	public string Value {
+		get {
+			return init;
+		}
+
+		set {
+			init = value;
+		}
+	}
+}
+
+struct Z {
+	static int val;
+	int xval;
+	
+	static Z ()
+	{
+		val = 4;
+	}
+
+	static public int IVal {
+		get {
+			return val;
+		}
+
+		set {
+			val= value;
+		}
+	}
+
+	public int XVal {
+		get {
+			return xval;
+		}
+
+		set {
+			xval = value;
+		}
+	}
+}
diff --git a/mcs/tests/test-24.cs b/mcs/tests/test-24.cs
new file mode 100644
index 00000000000..e69a844c93d
--- /dev/null
+++ b/mcs/tests/test-24.cs
@@ -0,0 +1,35 @@
+//
+// Properties intermixed in assignments
+//
+
+using System;
+
+class X {
+
+	static string v;
+
+	static string S {
+		get {
+			return v;
+		}
+		set {
+			v = value;
+		}
+	}
+
+	static string x, b;
+	
+	static int Main ()
+	{
+
+		x = S = b = "hlo";
+		if (x != "hlo")
+			return 1;
+		if (S != "hlo")
+			return 2;
+		if (b != "hlo")
+			return 3;
+		return 0;
+	}
+}
+		
diff --git a/mcs/tests/test-25.cs b/mcs/tests/test-25.cs
new file mode 100644
index 00000000000..a01a8daa4f1
--- /dev/null
+++ b/mcs/tests/test-25.cs
@@ -0,0 +1,65 @@
+//
+// Test the various iteration constructs, breaks and continues
+//
+// FIXME: Add foreach and more tests.
+//
+using System;
+
+class X {
+
+	static int Main ()
+	{
+		int i, j, t, k;
+		
+		for (i = 0; i < 10; i++){
+			if (i == 5)
+				break;
+		}
+
+		if (i != 5)
+			return 1;
+
+		t = 0;
+		k = 0;
+		for (i = 0; i < 10; i++){
+			for (j = 0; j < 10; j++){
+				if (j > 3)
+					break;
+				t++;
+
+				if (j >= 1)
+					continue;
+
+				k++;
+			}
+		}
+
+		if (t != 40)
+			return 2;
+		if (k != 10)
+			return 3;
+
+
+		t = 0;
+		do {
+			if (k == 5)
+				continue;
+			t++;
+		} while (--k > 0);
+
+		if (t != 9)
+			return 4;
+
+		t = 0;
+		do {
+			t++;
+			if (t == 5)
+				break;
+		} while (k++ < 10);
+
+		if (t != 5)
+			return 5;
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-26.cs b/mcs/tests/test-26.cs
new file mode 100644
index 00000000000..38b173ca3bd
--- /dev/null
+++ b/mcs/tests/test-26.cs
@@ -0,0 +1,72 @@
+using System;
+
+public class Blah {
+
+	public delegate int MyDelegate (int i, int j);
+	
+	public int Foo (int i, int j)
+	{
+		return i+j;
+	}
+
+	public static int Test1 ()
+	{
+		Blah f = new Blah ();
+
+		MyDelegate del = new MyDelegate (f.Foo);
+
+		MyDelegate another = new MyDelegate (del);
+
+		int number = del (2, 3);
+
+		int i = another (4, 6);
+		
+		Console.WriteLine ("Delegate invocation of one returned : " + number);
+
+		Console.WriteLine ("Delegate invocation of the other returned : " + i);
+
+		if (number == 5 && i == 10)
+			return 0;
+		else
+			return 1;
+	}
+	
+	public delegate int List (params int [] args);
+
+	public static int Adder (params int [] args)
+	{
+		int total = 0;
+		
+		foreach (int i in args)
+			total += i;
+
+		return total;
+	}
+
+	public static int Test2 ()
+	{
+		List my_adder = new List (Adder);
+
+		if (my_adder (1, 2, 3) != 6)
+			return 2;
+
+		return 0;
+	}
+	
+	public static int Main ()
+	{
+		int v;
+
+		v = Test1 ();
+		if (v != 0)
+			return v;
+
+		v = Test2 ();
+		if (v != 0)
+			return v;
+
+		Console.WriteLine ("All tests pass");
+		return 0;
+	}
+
+}
diff --git a/mcs/tests/test-27.cs b/mcs/tests/test-27.cs
new file mode 100644
index 00000000000..f1bd59b102a
--- /dev/null
+++ b/mcs/tests/test-27.cs
@@ -0,0 +1,97 @@
+using System;
+
+public interface Hello {
+
+	bool MyMethod (int i);
+}
+
+public interface Another : Hello {
+
+	int AnotherMethod (int i);
+}
+
+public class Foo : Hello, Another {
+
+	public bool MyMethod (int i)
+	{
+		if (i == 22)
+			return true;
+		else
+			return false;
+	}
+
+	public int AnotherMethod (int i)
+	{
+		return i * 10;
+	}
+	
+}
+
+public interface ITest {
+
+	bool TestMethod (int i, float j);
+}
+
+public class Blah : Foo {
+
+	public delegate void MyDelegate (int i, int j);
+
+	void Bar (int i, int j)
+	{
+		Console.WriteLine (i+j);
+	}
+	
+	public static int Main ()
+	{
+		Blah k = new Blah ();
+
+		Foo f = k;
+
+		object o = k;
+
+		if (f is Foo)
+			Console.WriteLine ("I am a Foo!");
+
+		Hello ihello = f;
+
+		Another ianother = f;
+
+		ihello = ianother; 
+
+		bool b = f.MyMethod (22);
+
+		MyDelegate del = new MyDelegate (k.Bar);
+
+		del (2, 3);
+		
+		Delegate tmp = del;
+
+		// Explicit reference conversions
+		
+		MyDelegate adel = (MyDelegate) tmp;
+
+		adel (4, 7);
+
+		Blah l = (Blah) o;
+
+		l.Bar (20, 30);
+
+		l = (Blah) f;
+
+		l.Bar (2, 5);
+
+		f = (Foo) ihello;
+
+		// The following cause exceptions even though they are supposed to work
+		// according to the spec
+
+		// This one sounds ridiculous !
+		// ITest t = (ITest) l;
+		
+		// ITest u = (ITest) ihello;
+
+		return 0;
+
+	}
+}
+
diff --git a/mcs/tests/test-28.cs b/mcs/tests/test-28.cs
new file mode 100644
index 00000000000..50f7dbb02bf
--- /dev/null
+++ b/mcs/tests/test-28.cs
@@ -0,0 +1,56 @@
+abstract class A {
+        protected abstract int this [int a] { get; }
+
+	public int EmulateIndexer (int a)
+	{
+		return this [a];
+	}
+}
+
+class B : A {
+	protected override int this [int a] { get { return a;}  }
+
+	public int M ()
+	{
+		return this [0];
+	}
+	
+}
+class X {
+	int v1, v2;
+	
+	int this [int a] {
+		get {
+			if (a == 0)
+				return v1;
+			else
+				return v2;
+		}
+
+		set {
+			if (a == 0)
+				v1 = value;
+			else
+				v2 = value;
+		}
+	}
+
+	static int Main ()
+	{
+		X x = new X ();
+
+		x [0] = 1;
+		if (x.v1 != 1)
+			return 1;
+
+		if (x [0] != 1)
+			return 2;
+
+		B bb = new B ();
+
+		if (bb.EmulateIndexer (10) != 10)
+			return 3;
+
+		return new B ().M ();
+	}
+}
diff --git a/mcs/tests/test-29.cs b/mcs/tests/test-29.cs
new file mode 100644
index 00000000000..6183126d277
--- /dev/null
+++ b/mcs/tests/test-29.cs
@@ -0,0 +1,40 @@
+//
+// Versioning, should choose Derived.Add (1)
+//
+using System;
+
+class Base {
+	public int val;
+	
+	public void Add (int x)
+	{
+		Console.WriteLine ("Incorrect method called");
+ 
+		val = 1;
+	}
+}
+
+class Derived : Base {
+	public void Add (double x)
+	{
+		Console.WriteLine ("Calling the derived class with double! Excellent!");
+		val = 2;
+	}
+}
+
+class Demo {
+
+	static int Main ()
+	{
+		Derived d = new Derived ();
+
+		d.Add (1);
+		if (d.val == 1)
+			return 1;
+
+		if (d.val == 2)
+			return 0;
+		return 2;
+
+	}
+}
diff --git a/mcs/tests/test-3.cs b/mcs/tests/test-3.cs
new file mode 100755
index 00000000000..5e7d4e1fab2
--- /dev/null
+++ b/mcs/tests/test-3.cs
@@ -0,0 +1,62 @@
+
+public class TestIntOps {
+
+	public static sbyte sbyte_add (sbyte a, sbyte b) {
+		return (sbyte)(a+b);
+	}
+
+	public static short short_add (short a, short b) {
+		return (short)(a+b);
+	}
+
+	public static double double_add (double a, double b) {
+		return a+b;
+	}
+
+	public static int int_add (int a, int b) {
+		return a+b;
+	}
+
+	public static int int_sub (int a, int b) {
+		return a-b;
+	}
+	
+	public static int int_mul (int a, int b) {
+		return a*b;
+	}
+	
+	public static int Main() {
+		int num = 1;
+
+		if (int_add (1, 1)   != 2)  return num;
+		num++;
+
+		if (int_add (31, -1) != 30) return num;
+		num++;
+
+		if (int_sub (31, -1) != 32) return num;
+		num++;
+
+		if (int_mul (12, 12) != 144) return num;
+		num++;
+
+		if (sbyte_add (1, 1) != 2)  return num;
+		num++;
+		
+		if (sbyte_add (31, -1) != 30)  return num;
+		num++;
+		
+		if (short_add (1, 1) != 2)  return num;
+		num++;
+		
+		if (short_add (31, -1) != 30)  return num;
+		num++;
+		
+		if (double_add (1.5, 1.5) != 3)  return num;
+		num++;
+
+		// add more meaningful tests
+	
+    	return 0;
+	}
+}
diff --git a/mcs/tests/test-30.cs b/mcs/tests/test-30.cs
new file mode 100644
index 00000000000..56c8308c02b
--- /dev/null
+++ b/mcs/tests/test-30.cs
@@ -0,0 +1,60 @@
+//
+// Tests whether we implement the correct methods from interfaces
+//
+
+using System;
+
+interface IA {
+	void Draw ();
+}
+
+interface IB {
+	void Draw ();
+}
+
+class X : IA, IB {
+	public bool ia_called;
+	public bool ib_called;
+	
+	void IA.Draw ()
+	{
+		ia_called = true;
+	}
+
+	void IB.Draw ()
+	{
+		ib_called = true;
+	}
+}
+
+class test {
+
+	static int Main ()
+	{
+		X x = new X ();
+
+		((IA) x).Draw ();
+		Console.WriteLine ("IA: " + x.ia_called);
+		Console.WriteLine ("IB: " + x.ib_called);
+
+		if (x.ib_called)
+			return 1;
+		if (!x.ia_called)
+			return 2;
+
+		X y = new X ();
+		((IB) y).Draw ();
+		Console.WriteLine ("IA: " + x.ia_called);
+		Console.WriteLine ("IB: " + x.ib_called);
+
+		if (!y.ib_called)
+			return 3;
+		if (y.ia_called)
+			return 4;
+
+		Console.WriteLine ("All tests pass");
+		return 0;
+	}
+}
+
+	
diff --git a/mcs/tests/test-31.cs b/mcs/tests/test-31.cs
new file mode 100644
index 00000000000..c7c31fed25e
--- /dev/null
+++ b/mcs/tests/test-31.cs
@@ -0,0 +1,41 @@
+//
+// Versioning test: make sure that we output a warning, but still call the derived
+// method
+//
+using System;
+
+class Base {
+	public int which;
+	
+	public virtual void A ()
+	{
+		which = 1;
+	}
+}
+
+class Derived :Base {
+	public virtual void A ()
+	{
+		which = 2;
+	}
+}
+
+class Test {
+	static int Main ()
+	{
+		Derived d = new Derived ();
+
+		//
+		// This should call Derived.A and output a warning.
+		//
+		d.A ();
+
+		
+		if (d.which == 1)
+			return 1;
+
+		Console.WriteLine ("Test passes");
+		
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-32.cs b/mcs/tests/test-32.cs
new file mode 100644
index 00000000000..94399b230e2
--- /dev/null
+++ b/mcs/tests/test-32.cs
@@ -0,0 +1,21 @@
+using System;
+
+public class Blah {
+
+	public static int Main ()
+	{
+		int [][] i = new int [2][];
+
+		int [,][] j = new int [3,6][];
+
+		Blah [] k = new Blah [2];
+
+		Blah [,][] l = new Blah [3,4][];
+
+		Uri [] uri = new Uri [4];
+
+		Console.WriteLine ("All arrays successfully created");
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-33.cs b/mcs/tests/test-33.cs
new file mode 100644
index 00000000000..3e908b2ef35
--- /dev/null
+++ b/mcs/tests/test-33.cs
@@ -0,0 +1,51 @@
+using System;

+

+namespace FirstOuter

+{

+	namespace FirstInner

+	{

+		public class First

+		{

+			public string MyIdentity { 

+				get {

+					return this.GetType().FullName;

+				}		

+			}

+		}

+	}

+	

+	public class Second : FirstInner.First {}

+	

+	namespace SecondInner

+	{

+		public class Third : FirstOuter.FirstInner.First {}

+	}

+	

+	namespace FirstInner // purposefully again

+	{

+		public class Fourth : First {} // must understand First in the nom qualified form

+	}

+}

+

+public class Fifth : FirstOuter.FirstInner.First {}

+

+class Application

+{

+	static int Main(string[] args)

+	{

+		FirstOuter.FirstInner.First V1 = new FirstOuter.FirstInner.First();

+		FirstOuter.Second V2 = new FirstOuter.Second();

+		FirstOuter.SecondInner.Third V3 = new FirstOuter.SecondInner.Third();

+		FirstOuter.FirstInner.Fourth V4 = new FirstOuter.FirstInner.Fourth();

+		Fifth V5 = new Fifth();

+	

+		Console.WriteLine("V1 is " + V1.MyIdentity);

+		Console.WriteLine("V2 is " + V2.MyIdentity);

+		Console.WriteLine("V3 is " + V3.MyIdentity);

+		Console.WriteLine("V4 is " + V4.MyIdentity);

+		Console.WriteLine("V5 is " + V5.MyIdentity);

+		

+		return 0;

+	}

+}

+

diff --git a/mcs/tests/test-34.cs b/mcs/tests/test-34.cs
new file mode 100644
index 00000000000..44a9fca10ca
--- /dev/null
+++ b/mcs/tests/test-34.cs
@@ -0,0 +1,90 @@
+//
+// This test tests both how arguments are selected in the presence
+// of ref/out modifiers and the params arguments.
+//
+using System;
+
+public class Blah {
+	static int got;
+	
+	public static void Foo (ref int i, ref int j)
+	{
+		got = 1;
+	}
+
+	public static int Bar (int j, params int [] args)
+	{
+		got = 2;
+		int total = 0;
+		
+		foreach (int i in args){
+			Console.WriteLine ("My argument: " + i);
+			total += i;
+		}
+
+		return total;
+	}
+
+	public static void Foo (int i, int j)
+	{
+		got = 3;
+	}
+
+	static void In (ref int a)
+	{
+		a++;
+	}
+
+	static void Out (ref int a)
+	{
+		In (ref a);
+	}
+
+	static int AddArray (params int [] valores)
+	{
+		int total = 0;
+		
+		for (int i = 0; i < valores.Length; i++)
+			total += valores [i];
+
+		return total;
+	}
+	
+	public static int Main ()
+	{
+		int i = 1;
+		int j = 2;
+
+		int [] arr = new int [2] { 0, 1 };
+
+		Foo (i, j);
+		if (got != 3)
+			return 1;
+		
+		Foo (ref i, ref j);
+		if (got != 1)
+			return 2;
+
+		if (Bar (i, j, 5, 4, 3, 3, 2) != 19)
+			return 4;
+
+		//if (Bar (1, arr) != 1)
+		//	return 5;
+		
+		if (got != 2)
+			return 3;
+
+		int k = 10;
+
+		Out (ref k);
+		if (k != 11)
+			return 10;
+
+		int [] arr2 = new int [2] {1, 2};
+
+		if (AddArray (arr2) != 3)
+			return 11;
+		
+		return  0;
+	}
+}
diff --git a/mcs/tests/test-35.cs b/mcs/tests/test-35.cs
new file mode 100755
index 00000000000..d9bc1d8338e
--- /dev/null
+++ b/mcs/tests/test-35.cs
@@ -0,0 +1,71 @@
+//
+// This test checks the !x optimization for if/while/for/do
+//
+class X {
+
+	static bool t = true;
+	static bool f = false;
+	static int j = 0;
+	
+	static void a ()
+	{
+		if (!t)
+			j = 1;
+	}
+
+	static void w (int x)
+	{
+		System.Console.WriteLine (" " + x);
+	}
+	
+	static int Main ()
+	{
+		int ok = 0, error = 0;
+		
+		if (!f)
+			ok = 1;
+		else
+			error++;
+
+		w (1);
+		if (f)
+			error++;
+		else
+			ok |= 2;
+
+		w(2);
+		if (t)
+			ok |= 4;
+		else
+			error++;
+
+		if (!t)
+			error++;
+		else
+			ok |= 8;
+
+		if (!(t && f == false))
+			error++;
+		else
+			ok |= 16;
+
+		int i = 0;
+		w(3);
+		do {
+			i++;
+		} while (!(i > 5));
+		if (i != 6)
+			error ++;
+		else
+			ok |= 32;
+		
+		w(100);
+		System.Console.WriteLine ("Value: " + t);
+		do {
+			i++;
+		} while (!t);
+		
+		System.Console.WriteLine ("Ok=" + ok + " Errors=" + error);
+		return ((ok == 63) && (error == 0)) ? 0 : 1;
+	}
+}
diff --git a/mcs/tests/test-36.cs b/mcs/tests/test-36.cs
new file mode 100755
index 00000000000..9f4897a82f4
--- /dev/null
+++ b/mcs/tests/test-36.cs
@@ -0,0 +1,46 @@
+//
+// This program excercises invoking foreach on structures
+// that implement GetEnumerator
+//
+
+using System;
+using System.Collections;
+struct X {
+	int [] a;
+
+		public IEnumerator GetEnumerator ()
+		{
+			a = new int [3] { 1, 2, 3};
+			return a.GetEnumerator ();
+		}
+	}
+
+class Y {
+	static X x;
+
+	static int Main ()
+	{
+		int total = 0;
+		x = new X ();
+
+		foreach (object a in x){
+			total += (int) a;
+		}
+
+		if (total != 6)
+			return 1;
+
+		total = 0;
+
+		//
+		// implicit block
+		//
+		foreach (object a in x)
+			total += (int) a;
+		if (total != 6)
+			return 2;
+		
+		return 0;
+	}
+}
+
diff --git a/mcs/tests/test-37.cs b/mcs/tests/test-37.cs
new file mode 100755
index 00000000000..91f54f4d9a0
--- /dev/null
+++ b/mcs/tests/test-37.cs
@@ -0,0 +1,136 @@
+//
+// This test excercises array access on single dimension, multi-dimension
+// and jagged arrays.
+//
+using System;
+
+class X {
+	static void m (int [] a)
+	{
+		a [0] = 0xdead;
+	}
+
+	static int test_int_single_dim ()
+	{
+		int [] a = new int [10];
+		int i;
+		
+		for (i = 0; i < 10; i++)
+			a [i] = i;
+
+		m (a);
+
+		if (a [0] != 0xdead)
+			return 1;
+
+		a [0] = 0;
+		for (i = 9; i >= 0; i--){
+			if (a [i] != i)
+				return 2;
+		}
+		return 0;
+	}
+
+	static int simple_test_double_dim ()
+	{
+		int [,] b = new int [10, 10];
+
+		b [0, 0] = 1;
+		b [4, 4] = 1;
+
+		if (b [0, 0] != b [4, 4])
+			return 20;
+		if (b [1, 1] != b [5, 5])
+			return 21;
+
+		return 0;
+	}
+	
+//	  static void dd (int [,] b)
+//	  {
+//		  int i, j;
+//
+//		  for (i = 0; i < 10; i++)
+//			  for (j = 0; j < 10; j++)
+//				  b [i, j] = b [i, j] + 1;
+//	  }
+//
+//	  static int test_int_double_dim ()
+//	  {
+//		  int [,] b = new int [10,10];
+//		  int i, j;
+//		  
+//		  for (i = 0; i < 10; i++)
+//			  for (j = 0; j < 10; j++)
+//				  b [i,j] = i * 10 + j;
+//
+//		  dd (b);
+//		  
+//		  for (i = 0; i < 10; i++)
+//			  for (j = 0; j < 10; j++)
+//				  if (b [i,j] != i *10 + j + 1){
+//					  Console.WriteLine ("Expecting " + (i * 10 + j + 1) + "got: " + b [i,j]);
+//					  return 10;
+//				  }
+//		  
+//		  return 0;
+//	  }
+
+//	  static int test_jagged ()
+//	  {
+//		  int [][] a = new int [10][];
+//		  int i;
+//		  
+//		  for (i = 0; i < 10; i++){
+//			  if (a [i] != null)
+//				  return 20;
+//			  
+//			  a [i] = new int [10];
+//
+//			  for (int j = 0; j < 10; j++){
+//				  int q;
+//				  a [i][j] = j * 10;
+//				  q = a [i][j] = j * 10;
+//				  
+//				  a [i][j]++;
+//
+//				  if (a [i][j] != q + 1)
+//					  return 21;
+//			  }
+//		  }
+//
+//		  return 0;
+//	  }
+
+	static int Main ()
+	{
+		int v;
+		
+		Console.WriteLine ("hello");
+		return 0;
+		
+		v = test_int_single_dim ();
+
+		if (v != 0)
+			return v;
+
+		//		v = test_int_double_dim ();
+		//		if (v != 0)
+		//			return v;
+		//
+		//		v = test_jagged ();
+
+		v = simple_test_double_dim ();
+		if (v != 0)
+			return v;
+
+		int [] a = new int [10];
+		int i;
+		for (i = 0; i < 10; i++){
+			a [i] = i;
+			//			a [i]++;
+			// Console.WriteLine ("Should be: " + (i + 1) + " it is = " + a [i]);
+		}
+		return 0;
+	}
+}	
diff --git a/mcs/tests/test-38.cs b/mcs/tests/test-38.cs
new file mode 100755
index 00000000000..73a388353f2
--- /dev/null
+++ b/mcs/tests/test-38.cs
@@ -0,0 +1,118 @@
+class X {
+	public int v1, v2;
+	int y;
+	
+	public int this [int a] {
+		get {
+			if (a == 0)
+				return v1;
+			else
+				return v2;
+		}
+
+		set {
+			if (a == 0)
+				v1 = value;
+			else
+				v2 = value;
+		}
+	}
+
+	public int Foo () {
+		return 8;
+	}
+
+	public int Bar {
+		get {
+			return y;
+		}
+
+		set {
+			y = value;
+		}
+	}
+}
+
+class Y {
+	public uint v1, v2;
+	uint y;
+	
+	public uint this [uint a] {
+		get {
+			if (a == 0)
+				return v1;
+			else
+				return v2;
+		}
+
+		set {
+			if (a == 0)
+				v1 = value;
+			else
+				v2 = value;
+		}
+	}
+
+	public uint Foo () {
+		return 8;
+	}
+
+	public uint Bar {
+		get {
+			return y;
+		}
+
+		set {
+			y = value;
+		}
+	}
+}
+
+class Test {
+
+	static int Main ()
+	{
+		X x = new X ();
+		Y y = new Y ();
+		int b;
+
+		x [0] = x [1] = 1;
+		x [0] = 1;
+		if (x.v1 != 1)
+			return 1;
+
+		if (x [0] != 1)
+			return 2;
+
+		double d;
+		long l;
+
+		d = l = b = x [0] = x [1] = x.Bar = x [2] = x [3] = x [4] = x.Foo ();
+
+		if (x.Bar != 8)
+			return 3;
+
+		if (l != 8)
+			return 4;
+
+		uint e, f;
+		e = 5;
+		e = f = 8;
+
+		if (e != 8)
+			return 5;
+
+		y [0] = y [1] = 9;
+		y [0] = y.Bar = 12;
+
+		if (y.Bar != 12)
+			return 6;
+
+		y.Bar = 15;
+		if (y.Bar != 15)
+			return 7;
+
+		return 0;
+		
+	}
+}
diff --git a/mcs/tests/test-39.cs b/mcs/tests/test-39.cs
new file mode 100644
index 00000000000..7366b1c0ce2
--- /dev/null
+++ b/mcs/tests/test-39.cs
@@ -0,0 +1,38 @@
+using System;
+[AttributeUsage (AttributeTargets.Class, AllowMultiple = true)]
+	public class SimpleAttribute : Attribute {
+
+		string name = null;
+
+		public string MyNamedArg;
+
+		private string secret;
+		
+		public SimpleAttribute (string name)
+		{
+			this.name = name;
+		}
+
+		public string AnotherArg {
+			get {
+				return secret;
+			}
+			set {
+				secret = value;
+			}
+		}
+		
+	}
+
+[Simple ("Dummy", MyNamedArg = "Dude!")]
+[Simple ("Vids", MyNamedArg = "Raj", AnotherArg = "Foo")]	
+	public class Blah {
+
+		public static int Main ()
+		{
+			Console.WriteLine ("A dummy app which tests attribute emission");
+			return 0;
+		}
+	}
+
+	
diff --git a/mcs/tests/test-4.cs b/mcs/tests/test-4.cs
new file mode 100755
index 00000000000..3023f6e9d1b
--- /dev/null
+++ b/mcs/tests/test-4.cs
@@ -0,0 +1,40 @@
+using System;
+class X {
+	bool sbyte_selected;
+	bool int_selected;
+
+	void test (sbyte s)
+	{
+		sbyte_selected = true;
+	}
+
+	void test (int i)
+	{
+		int_selected = true;
+	}
+
+	static int Main ()
+	{
+		X x = new X ();
+
+		x.test (1); 
+		if (x.sbyte_selected){
+			Console.WriteLine ("FAILED: Sbyte selected on constant int argument");
+			return 1;
+		} else {
+			Console.WriteLine ("OK: int selected for constant int");
+		}
+		
+		X y = new X ();
+		sbyte s = 10;
+
+		y.test (s);
+		if (y.sbyte_selected){
+			Console.WriteLine ("OK: sbyte selected for sbyte argument");
+		} else {
+			Console.WriteLine ("FAILED: sbyte not selected for sbyte argument");
+			return 1;
+		}
+		return 0;
+	}
+}		
diff --git a/mcs/tests/test-40.cs b/mcs/tests/test-40.cs
new file mode 100644
index 00000000000..1fa88aba072
--- /dev/null
+++ b/mcs/tests/test-40.cs
@@ -0,0 +1,79 @@
+using System;
+
+public class Blah {
+
+	enum Bar {
+		a = MyEnum.Foo,
+		b = A.c,
+		c = MyEnum.Bar,
+		d = myconstant
+	}
+	
+	public enum MyEnum : byte {
+		Foo = 254,
+		Bar = B.y
+	}
+
+	enum A {
+		a, b, c
+	}
+	
+	enum B {
+		x, y, z
+	}
+	
+	enum AA : byte { a, b }
+	enum BB : ulong { x, y }
+
+	const int myconstant = 30;
+
+	enum Compute { two = AA.b + BB.y }
+	
+	public static int Main ()
+	{
+		byte b = (byte) MyEnum.Foo;
+		
+		Console.WriteLine ("Foo has a value of " + b);
+
+		if (b != 254)
+			return 1;
+		
+		int i = (int) A.a;
+		int j = (int) B.x;
+		int k = (int) A.c;
+		int l = (int) AA.b + 1;
+
+		if (Compute.two != 2)
+			return 10;
+		if (i != j)
+			return 1;
+
+		if (k != l)
+			return 1;
+
+		A var = A.b;
+
+		i = (int) Bar.a;
+
+		if (i != 254)
+			return 1;
+
+		i = (int) Bar.b;
+
+		if (i != 2)
+			return 1;
+
+		j = (int) Bar.c;
+
+		if (j != 1)
+			return 1;
+
+		j = (int) Bar.d;
+
+		if (j != 30)
+			return 1;
+
+		Console.WriteLine ("Enum emission test okay");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-41.cs b/mcs/tests/test-41.cs
new file mode 100644
index 00000000000..cdf1fd45f89
--- /dev/null
+++ b/mcs/tests/test-41.cs
@@ -0,0 +1,93 @@
+//
+// This tests the ref access to parameters
+//
+using System;
+
+class X {
+
+	static void A (ref int a, ref uint b, ref sbyte c, ref byte d, ref long e, ref ulong f,
+		       ref short g, ref ushort h, ref char i, ref X x, ref float j, ref double k)
+	{
+		if (a == 1)
+			a = 2;
+
+		if (b == 1)
+			b = 2;
+
+		if (c == 1)
+			c = 2;
+
+		if (d == 1)
+			d = 2;
+
+		if (e == 1)
+			e = 2;
+
+		if (f == 1)
+			f = 2;
+
+		if (g == 1)
+			g = 2;
+
+		if (h == 1)
+			h = 2;
+
+		if (i == 'a')
+			i = 'b';
+
+		if (x == null)
+			x = new X ();
+
+		if (j == 1.0)
+			j = 2.0F;
+		if (k == 1.0)
+			k = 2.0;
+	}
+
+	static int Main ()
+	{
+		int a = 1;
+		uint b = 1;
+		sbyte c = 1;
+		byte d = 1;
+		long e = 1;
+		ulong f = 1;
+		short g = 1;
+		ushort h = 1;
+		char i = 'a';
+		float j = 1.0F;
+		double k = 1.0;
+		X x = null;
+
+		A (ref a, ref b, ref c, ref d, ref e, ref f, ref g, ref h, ref i, ref x, ref j, ref k);
+
+		if (a != 2)
+			return 1;
+		if (b != 2)
+			return 2;
+		if (c != 2)
+			return 3;
+		if (d != 2)
+			return 4;
+		if (e != 2)
+			return 5;
+		if (f != 2)
+			return 6;
+		if (g != 2)
+			return 7;
+		if (h != 2)
+			return 8;
+		if (i != 'b')
+			return 9;
+		if (j != 2.0)
+			return 10;
+		if (k != 2.0)
+			return 11;
+		if (x == null)
+			return 12;
+
+		Console.WriteLine ("Test passed");
+		return 0;
+	}
+}
+	
diff --git a/mcs/tests/test-42.cs b/mcs/tests/test-42.cs
new file mode 100755
index 00000000000..684324b8f93
--- /dev/null
+++ b/mcs/tests/test-42.cs
@@ -0,0 +1,184 @@
+//
+// This test exercises the various ways in which mutator operators can be
+// used in C# and the various different scenarios that the compiler would
+// have to deal with
+//
+// variables, linear arrays, multi-dimensional arrays, jagged arrays,
+// properties, indexers and overloaded ++ and --
+//
+
+class X {
+
+	public int v, p;
+	public int idx;
+	
+	public int this [int n] {
+		get {
+			idx = n;
+			return v;
+		}
+		set {
+			idx = n;
+			v = value;
+		}
+	}
+
+	public int P {
+		get {
+			return p;
+		}
+
+		set {
+			p = value;
+		}
+	}
+	
+}
+
+class Z {
+	int v;
+
+	public Z P {
+		get {
+			return null;
+		}
+
+		set {
+		}
+	}
+	
+	static public Z operator ++ (Z v)
+	{
+		v.v++;
+		return v;
+	}
+}
+
+class Y {
+
+	static int p_pre_increment (X x)
+	{
+		return ++x.P;
+	}
+
+	static int p_post_increment (X x)
+	{
+		return x.P++;
+	}
+
+	static int i_pre_increment (X x)
+	{
+		return ++x [100];
+	}
+
+	static int  i_post_increment (X x)
+	{
+		return x [14]++;
+	}
+
+	static Z overload_increment (Z z)
+	{
+		  return z++;
+	}
+	
+	static Z overload_pre_increment (Z z)
+	{
+		  return ++z;
+	}
+	
+	static Z ugly (Z z)
+	{
+		  return z.P++;
+	}
+
+	//
+	// Tests the ++ and -- operators on integers
+	//
+	static int simple (int i)
+	{
+		if (++i != 11)
+			return 1;
+		if (--i != 10)
+			return 2;
+		if (i++ != 10)
+			return 3;
+		if (i-- != 11)
+			return 4;
+		return 0;
+	}
+
+	static int arrays ()
+	{
+		int [] a = new int [10];
+		int i, j;
+		
+		for (i = 0; i < 10; i++)
+			a [i]++;
+
+		for (i = 0; i < 10; i++)
+			if (a [i] != 1)
+				return 100;
+
+		int [,] b = new int [10,10];
+		for (i = 0; i < 10; i++){
+			for (j = 0; j < 10; j++){
+				b [i,j] = i * 10 + j;
+				if (i < 5)
+					b [i,j]++;
+				else
+					++b [i,j];
+			}
+		}
+
+		for (i = 0; i < 10; i++){
+			for (j = 0; j < 10; j++){
+				if (b [i,j] != i * 10 + (j + 1))
+					return 101;
+			}
+		}
+		
+		return 0;
+	}
+	
+	static int Main ()
+	{
+		X x = new X ();
+		int c;
+		
+		if ((c = simple (10)) != 0)
+			return c;
+		
+		if (i_pre_increment (x) != 1)
+			return 5;
+		
+		if (x.idx != 100)
+			return 6;
+		
+		if (i_post_increment (x) != 1)
+			return 7;
+
+		if (x.idx != 14)
+			return 8;
+		
+		if (p_pre_increment (x) != 1)
+			return 9;
+
+		if (x.p != 1)
+			return 10;
+		
+		if (p_post_increment (x) != 1)
+			return 10;
+
+		if (x.p != 2)
+			return 11;
+
+		Z z = new Z();
+
+		overload_increment (z);
+
+		arrays ();
+		
+		return 0;
+	}
+	
+}
diff --git a/mcs/tests/test-43.cs b/mcs/tests/test-43.cs
new file mode 100755
index 00000000000..7d8deffe812
--- /dev/null
+++ b/mcs/tests/test-43.cs
@@ -0,0 +1,78 @@
+//
+// This test is used for testing the foreach array support
+//
+using System;
+
+class X {
+
+	static int test_single (int [] a)
+	{
+		int total = 0;
+
+		foreach (int i in a)
+			total += i;
+
+		return total;
+	}
+
+	static int test_continue (int [] a)
+	{
+		int total = 0;
+		int j = 0;
+		
+		foreach (int i in a){
+			j++;
+			if (j == 5)
+				continue;
+			total += i;
+		}
+
+		return total;
+	}
+
+	static int test_break (int [] a)
+	{
+		int total = 0;
+		int j = 0;
+
+		foreach (int i in a){
+			j++;
+			if (j == 5)
+				break;
+			total += i;
+		}
+
+		return total;
+	}
+	
+	static int Main ()
+	{
+		int [] a = new int [10];
+		int [] b = new int [2];
+
+		for (int i = 0; i < 10; i++)
+			a [i] = 10 + i;
+
+		for (int j = 0; j < 2; j++)
+			b [j] = 50 + j;
+
+		if (test_single (a) != 145)
+			return 1;
+
+		if (test_single (b) != 101)
+			return 2;
+
+		if (test_continue (a) != 131){
+			Console.WriteLine ("Expecting: 131, got " + test_continue (a));
+			return 3;
+		}
+
+		if (test_break (a) != 46){
+			Console.WriteLine ("Expecting: 46, got " + test_break (a));
+			return 4;
+		}
+		
+		return 0;
+	}
+}
+	
diff --git a/mcs/tests/test-44.cs b/mcs/tests/test-44.cs
new file mode 100755
index 00000000000..c1b896a5814
--- /dev/null
+++ b/mcs/tests/test-44.cs
@@ -0,0 +1,55 @@
+//
+// This test shows that the current way in which we handle blocks
+// and statements is broken.  The b [q,w] code is only executed 10
+// times instead of a 100
+//
+using System;
+
+class X {
+
+	static int dob (int [,]b)
+	{
+		int total = 0;
+		
+		foreach (int i in b)
+			total += i;
+
+		return total;
+	}
+
+	//
+	// This tests typecasting from an object to an array of ints
+	// and then doing foreach
+	//
+	static int count (object o)
+	{
+		int total = 0;
+
+		foreach (int i in (int []) o)
+			total += i;
+
+		return total;
+	}
+	
+	static int Main ()
+	{
+		int [,] b = new int [10,10];
+
+		for (int q = 0; q < 10; q++)
+			for (int w = 0; w < 10; w++)
+				b [q,w] = q * 10 + w;
+
+		if (dob (b) != 4950)
+			return 1;
+
+		int [] a = new int [10];
+		for (int i = 0; i < 10; i++)
+			a [i] = 2;
+
+		if (count (a) != 20)
+			return 2;
+		
+		return 0;
+	}
+}
+	
diff --git a/mcs/tests/test-45.cs b/mcs/tests/test-45.cs
new file mode 100644
index 00000000000..9d50a9c9420
--- /dev/null
+++ b/mcs/tests/test-45.cs
@@ -0,0 +1,101 @@
+using System;
+
+public class Blah {
+
+	private static int[] array = {0, 1, 2, 3};
+
+	private static int [,] bar = { {0,1}, {4,5}, {10,20} };
+
+	static string [] names = {
+		"Miguel", "Paolo", "Dietmar", "Dick", "Ravi"
+	};
+
+	public static int Main ()
+	{
+		int [] i = new int [4] { 0, 1, 2, 3 };
+
+		short [,] j = new short [4,2] { {0,1}, {2,3}, {4,5}, {6,7} };
+		
+		ushort [] a = { 4, 5, 6, 7 };
+
+		long [,,] m = new long [2,3,2] {{{0,1}, {2,3}, {4,5}}, {{6,7}, {8,9}, {10,11}}};
+
+		int foo = 1;
+		int [] k = new int [] { foo, foo+1, foo+4 };
+
+	        int [,] boo = new int [,] {{foo, foo+10}, {foo+3, foo+10}};
+
+		float [] f_array = new float [] { 1.23F, 4.5F, 6.24F };
+
+		double [] double_arr = new double [] { 34.4567, 90.1226, 54.9823 };
+
+		char [] c_arr = { 'A', 'B', 'C', 'M', 'R' };
+
+		byte [] b_arr = { 0, 3, 8, 10, 21 };
+
+		sbyte [] s_arr = { 10, 15, 30, 123 };
+		
+		if (a [2] != 6)
+			return 1;
+
+		if (s_arr [3] != 123)
+			return 2;
+		
+		if (i [2] != 2)
+			return 1;
+		
+		if (j [1,1] != 3)
+			return 1;
+
+		for (int t = 0; t < 4; ++t) {
+			if (array [t] != t)
+				return 1;
+			
+			if (a [t] != (t + 4))
+				return 1;
+		}
+
+		if (bar [2,1] != 20)
+			return 1;
+
+		if (k [2] != 5)
+			return 1;
+
+		if (m [1,1,1] != 9)
+			return 1;
+
+		if (boo [0,1] != 11)
+			return 1;
+
+		if (f_array [0] != 1.23F)
+			return 1;
+
+		if (double_arr [1] != 90.1226)
+			return 1;
+
+		foreach (string s in names)
+			Console.WriteLine ("Hello, " + s);
+
+		if (names [0] != "Miguel")
+			return 1;
+
+		if (c_arr [4] != 'R')
+			return 2;
+
+		int count = 10;
+
+		int [] x = new int [count];
+
+		for (int idx = 0; idx < count; idx++)
+			x [idx] = idx + 1;
+
+		for (int idx = count; idx > 0; ){
+			idx--;
+			if (x [idx] != idx + 1)
+				return 12;
+		}
+		Console.WriteLine ("Array initialization test okay.");
+				   
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-46.cs b/mcs/tests/test-46.cs
new file mode 100755
index 00000000000..6a4aa000a0b
--- /dev/null
+++ b/mcs/tests/test-46.cs
@@ -0,0 +1,127 @@
+//
+// This test probes the various explicit unboxing casts
+//
+using System;
+
+class X {
+	static int cast_int (object o) { return (int) o; }
+	static uint cast_uint (object o) { return (uint) o; }
+	static short cast_short (object o) { return (short) o; }
+	static char cast_char (object o) { return (char) o; }
+	static ushort cast_ushort (object o) { return (ushort) o; }
+	static byte cast_byte (object o) { return (byte) o; }
+	static sbyte cast_sbyte (object o) { return (sbyte) o; }
+	static long cast_long (object o) { return (long) o; }
+	static ulong cast_ulong (object o) { return (ulong) o; }
+	static float cast_float (object o) { return (float) o; }
+	static double cast_double (object o) { return (double) o; }
+	static bool cast_bool (object o) { return (bool) o; }
+
+	static int Main ()
+	{
+		if (cast_int ((object) -1) != -1)
+			return 1;
+		if (cast_int ((object) 1) != 1)
+			return 2;
+		if (cast_int ((object) Int32.MaxValue) != Int32.MaxValue)
+			return 1;
+		if (cast_int ((object) Int32.MinValue) != Int32.MinValue)
+			return 2;
+		if (cast_int ((object) 0) != 0)
+			return 3;
+
+		if (cast_uint ((object) (uint)0) != 0)
+			return 4;
+		if (cast_uint ((object) (uint) 1) != 1)
+			return 5;
+		if (cast_uint ((object) (uint) UInt32.MaxValue) != UInt32.MaxValue)
+			return 6;
+		if (cast_uint ((object) (uint) UInt32.MinValue) != UInt32.MinValue)
+			return 7;
+
+		if (cast_ushort ((object) (ushort) 1) != 1)
+			return 8;
+		if (cast_ushort ((object) (ushort) UInt16.MaxValue) != UInt16.MaxValue)
+			return 9;
+		if (cast_ushort ((object) (ushort) UInt16.MinValue) != UInt16.MinValue)
+			return 10;
+		if (cast_ushort ((object) (ushort) 0) != 0)
+			return 11;
+
+		if (cast_short ((object) (short)-1) != -1)
+			return 12;
+		if (cast_short ((object) (short) 1) != 1)
+			return 13;
+		if (cast_short ((object) (short) Int16.MaxValue) != Int16.MaxValue)
+			return 14;
+		if (cast_short ((object) (short) Int16.MinValue) != Int16.MinValue)
+			return 15;
+		if (cast_short ((object) (short) 0) != 0)
+			return 16;
+
+		if (cast_byte ((object) (byte)1) != 1)
+			return 17;
+		if (cast_byte ((object) (byte) Byte.MaxValue) != Byte.MaxValue)
+			return 18;
+		if (cast_byte ((object) (byte) Byte.MinValue) != Byte.MinValue)
+			return 19;
+		if (cast_byte ((object) (byte) 0) != 0)
+			return 20;
+
+		if (cast_sbyte ((object) (sbyte) -1) != -1)
+			return 21;
+		if (cast_sbyte ((object) (sbyte) 1) != 1)
+			return 22;
+		if (cast_sbyte ((object) (sbyte) SByte.MaxValue) != SByte.MaxValue)
+			return 23;
+		if (cast_sbyte ((object) (sbyte)SByte.MinValue) != SByte.MinValue)
+			return 24;
+		if (cast_sbyte ((object) (sbyte) 0) != 0)
+			return 25;
+		
+
+		if (cast_long ((object) (long) -1) != -1)
+			return 26;
+		if (cast_long ((object) (long) 1) != 1)
+			return 27;
+		if (cast_long ((object) (long) Int64.MaxValue) != Int64.MaxValue)
+			return 28;
+		if (cast_long ((object) (long) Int64.MinValue) != Int64.MinValue)
+			return 29;
+		if (cast_long ((object) (long) 0) != 0)
+			return 30;
+
+		if (cast_ulong ((object) (ulong) 0) != 0)
+			return 31;
+		if (cast_ulong ((object) (ulong) 1) != 1)
+			return 32;
+		if (cast_ulong ((object) (ulong) UInt64.MaxValue) != UInt64.MaxValue)
+			return 33;
+		if (cast_ulong ((object) (ulong) UInt64.MinValue) != UInt64.MinValue)
+			return 34;
+
+		if (cast_double ((object) (double) -1) != -1)
+			return 35;
+		if (cast_double ((object) (double) 1) != 1)
+			return 36;
+		if (cast_double ((object) (double) Double.MaxValue) != Double.MaxValue)
+			return 37;
+		if (cast_double ((object) (double) Double.MinValue) != Double.MinValue)
+			return 38;
+		if (cast_double ((object) (double) 0) != 0)
+			return 39;
+
+		if (cast_float ((object) (float) -1) != -1)
+			return 40;
+		if (cast_float ((object) (float) 1) != 1)
+			return 41;
+		if (cast_float ((object) (float)Single.MaxValue) != Single.MaxValue)
+			return 42;
+		if (cast_float ((object) (float) Single.MinValue) != Single.MinValue)
+			return 43;
+		if (cast_float ((object) (float) 0) != 0)
+			return 44;
+
+		return 0;
+	}
+}	
diff --git a/mcs/tests/test-47.cs b/mcs/tests/test-47.cs
new file mode 100755
index 00000000000..c269d0b6c71
--- /dev/null
+++ b/mcs/tests/test-47.cs
@@ -0,0 +1,95 @@
+//
+// Short-circuit evaluation tests
+//
+using System;
+
+class X {
+
+	static int t_count = 0;
+	static int f_count = 0;
+
+	static bool f ()
+	{
+		Console.WriteLine ("f");
+		f_count++;
+		return false;
+	}
+
+	static bool t ()
+	{
+		Console.WriteLine ("t");
+		t_count++;
+		return true;
+	}			
+	
+	static int Main ()
+	{
+		if (t () && t ()){
+			f_count--;
+		}
+		
+		if (t_count != 2)
+			return 1;
+
+		if (f_count != -1)
+			return 3;
+
+		f_count = 0;
+
+		if (t () && f ())
+			if (t_count != 3 && f_count == 1)
+				return 2;
+
+		if (f () && f ())
+			return 3;
+
+		if (f_count != 2)
+			return 4;
+
+		if (f () && t ())
+			return 5;
+
+		if (f_count != 3)
+			return 6;
+
+		if (t_count != 3)
+			return 7;
+
+		//
+		// reset
+		//
+		Console.WriteLine ("or");
+		
+		t_count = f_count = 0;
+
+		if (t () || t ()){
+			if (t_count != 1)
+				return 8;
+		} else
+			return 9;
+
+		if (t () || f ()){
+			if (f_count != 0)
+				return 10;
+			if (t_count != 2)
+				return 16;
+		} else
+			return 11;
+		
+		if (f () || f ()){
+			return 12;
+		} else
+			if (f_count != 2)
+				return 13;
+		
+		if (f () || t ()){
+			if (f_count != 3)
+				return 15;
+			if (t_count != 3)
+				return 17;
+		} else
+			return 14;
+			
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-48.cs b/mcs/tests/test-48.cs
new file mode 100644
index 00000000000..21b6857ba6c
--- /dev/null
+++ b/mcs/tests/test-48.cs
@@ -0,0 +1,30 @@
+using System;
+
+public class Blah {
+	
+	public const int i = 5;
+
+	public static int Main ()
+	{
+		const int foo = 10;
+		
+		int j = Blah.i;
+
+		if (j != 5)
+			return 1;
+
+		if (foo != 10)
+			return 1;
+
+		for (int i = 0; i < 5; ++i){
+			const int bar = 15;
+
+			Console.WriteLine (bar);
+			Console.WriteLine (foo);
+		}
+
+		Console.WriteLine ("Constant emission test okay");
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-49.cs b/mcs/tests/test-49.cs
new file mode 100755
index 00000000000..24d8b6b4799
--- /dev/null
+++ b/mcs/tests/test-49.cs
@@ -0,0 +1,503 @@
+//
+// This tests excercises a number of switch things:
+//
+// Code to test for multiple-labels is different that
+// code for a single label.
+//
+// Code for switching on strings is different from the integer
+// code.
+//
+// nulls (for strings) need to be handled specially since ceq will
+// throw an exception if there.
+//
+// null as a case statement needs to be caught specially
+// 
+using System;
+
+class X {
+	enum A {
+		a = 23333,
+	}
+
+	static int s (byte b)
+	{
+		switch (b){
+			case 0: return 255-0;
+			case 1: return 255-1;
+			case 2: return 255-2;
+			case 3: return 255-3;
+			case 4: return 255-4;
+			case 5: return 255-5;
+			case 6: return 255-6;
+			case 7: return 255-7;
+			case 8: return 255-8;
+			case 9: return 255-9;
+			case 10: return 255-10;
+			case 11: return 255-11;
+			case 12: return 255-12;
+			case 13: return 255-13;
+			case 14: return 255-14;
+			case 15: return 255-15;
+			case 16: return 255-16;
+			case 17: return 255-17;
+			case 18: return 255-18;
+			case 19: return 255-19;
+			case 20: return 255-20;
+			case 21: return 255-21;
+			case 22: return 255-22;
+			case 23: return 255-23;
+			case 24: return 255-24;
+			case 25: return 255-25;
+			case 26: return 255-26;
+			case 27: return 255-27;
+			case 28: return 255-28;
+			case 29: return 255-29;
+			case 30: return 255-30;
+			case 31: return 255-31;
+			case 32: return 255-32;
+			case 33: return 255-33;
+			case 34: return 255-34;
+			case 35: return 255-35;
+			case 36: return 255-36;
+			case 37: return 255-37;
+			case 38: return 255-38;
+			case 39: return 255-39;
+			case 40: return 255-40;
+			case 41: return 255-41;
+			case 42: return 255-42;
+			case 43: return 255-43;
+			case 44: return 255-44;
+			case 45: return 255-45;
+			case 46: return 255-46;
+			case 47: return 255-47;
+			case 48: return 255-48;
+			case 49: return 255-49;
+			case 50: return 255-50;
+			case 51: return 255-51;
+			case 52: return 255-52;
+			case 53: return 255-53;
+			case 54: return 255-54;
+			case 55: return 255-55;
+			case 56: return 255-56;
+			case 57: return 255-57;
+			case 58: return 255-58;
+			case 59: return 255-59;
+			case 60: return 255-60;
+			case 61: return 255-61;
+			case 62: return 255-62;
+			case 63: return 255-63;
+			case 64: return 255-64;
+			case 65: return 255-65;
+			case 66: return 255-66;
+			case 67: return 255-67;
+			case 68: return 255-68;
+			case 69: return 255-69;
+			case 70: return 255-70;
+			case 71: return 255-71;
+			case 72: return 255-72;
+			case 73: return 255-73;
+			case 74: return 255-74;
+			case 75: return 255-75;
+			case 76: return 255-76;
+			case 77: return 255-77;
+			case 78: return 255-78;
+			case 79: return 255-79;
+			case 80: return 255-80;
+			case 81: return 255-81;
+			case 82: return 255-82;
+			case 83: return 255-83;
+			case 84: return 255-84;
+			case 85: return 255-85;
+			case 86: return 255-86;
+			case 87: return 255-87;
+			case 88: return 255-88;
+			case 89: return 255-89;
+			case 90: return 255-90;
+			case 91: return 255-91;
+			case 92: return 255-92;
+			case 93: return 255-93;
+			case 94: return 255-94;
+			case 95: return 255-95;
+			case 96: return 255-96;
+			case 97: return 255-97;
+			case 98: return 255-98;
+			case 99: return 255-99;
+			case 100: return 255-100;
+			case 101: return 255-101;
+			case 102: return 255-102;
+			case 103: return 255-103;
+			case 104: return 255-104;
+			case 105: return 255-105;
+			case 106: return 255-106;
+			case 107: return 255-107;
+			case 108: return 255-108;
+			case 109: return 255-109;
+			case 110: return 255-110;
+			case 111: return 255-111;
+			case 112: return 255-112;
+			case 113: return 255-113;
+			case 114: return 255-114;
+			case 115: return 255-115;
+			case 116: return 255-116;
+			case 117: return 255-117;
+			case 118: return 255-118;
+			case 119: return 255-119;
+			case 120: return 255-120;
+			case 121: return 255-121;
+			case 122: return 255-122;
+			case 123: return 255-123;
+			case 124: return 255-124;
+			case 125: return 255-125;
+			case 126: return 255-126;
+			case 127: return 255-127;
+			case 128: return 255-128;
+			case 129: return 255-129;
+			case 130: return 255-130;
+			case 131: return 255-131;
+			case 132: return 255-132;
+			case 133: return 255-133;
+			case 134: return 255-134;
+			case 135: return 255-135;
+			case 136: return 255-136;
+			case 137: return 255-137;
+			case 138: return 255-138;
+			case 139: return 255-139;
+			case 140: return 255-140;
+			case 141: return 255-141;
+			case 142: return 255-142;
+			case 143: return 255-143;
+			case 144: return 255-144;
+			case 145: return 255-145;
+			case 146: return 255-146;
+			case 147: return 255-147;
+			case 148: return 255-148;
+			case 149: return 255-149;
+			case 150: return 255-150;
+			case 151: return 255-151;
+			case 152: return 255-152;
+			case 153: return 255-153;
+			case 154: return 255-154;
+			case 155: return 255-155;
+			case 156: return 255-156;
+			case 157: return 255-157;
+			case 158: return 255-158;
+			case 159: return 255-159;
+			case 160: return 255-160;
+			case 161: return 255-161;
+			case 162: return 255-162;
+			case 163: return 255-163;
+			case 164: return 255-164;
+			case 165: return 255-165;
+			case 166: return 255-166;
+			case 167: return 255-167;
+			case 168: return 255-168;
+			case 169: return 255-169;
+			case 170: return 255-170;
+			case 171: return 255-171;
+			case 172: return 255-172;
+			case 173: return 255-173;
+			case 174: return 255-174;
+			case 175: return 255-175;
+			case 176: return 255-176;
+			case 177: return 255-177;
+			case 178: return 255-178;
+			case 179: return 255-179;
+			case 180: return 255-180;
+			case 181: return 255-181;
+			case 182: return 255-182;
+			case 183: return 255-183;
+			case 184: return 255-184;
+			case 185: return 255-185;
+			case 186: return 255-186;
+			case 187: return 255-187;
+			case 188: return 255-188;
+			case 189: return 255-189;
+			case 190: return 255-190;
+			case 191: return 255-191;
+			case 192: return 255-192;
+			case 193: return 255-193;
+			case 194: return 255-194;
+			case 195: return 255-195;
+			case 196: return 255-196;
+			case 197: return 255-197;
+			case 198: return 255-198;
+			case 199: return 255-199;
+			case 200: return 255-200;
+			case 201: return 255-201;
+			case 202: return 255-202;
+			case 203: return 255-203;
+			case 204: return 255-204;
+			case 205: return 255-205;
+			case 206: return 255-206;
+			case 207: return 255-207;
+			case 208: return 255-208;
+			case 209: return 255-209;
+			case 210: return 255-210;
+			case 211: return 255-211;
+			case 212: return 255-212;
+			case 213: return 255-213;
+			case 214: return 255-214;
+			case 215: return 255-215;
+			case 216: return 255-216;
+			case 217: return 255-217;
+			case 218: return 255-218;
+			case 219: return 255-219;
+			case 220: return 255-220;
+			case 221: return 255-221;
+			case 222: return 255-222;
+			case 223: return 255-223;
+			case 224: return 255-224;
+			case 225: return 255-225;
+			case 226: return 255-226;
+			case 227: return 255-227;
+			case 228: return 255-228;
+			case 229: return 255-229;
+			case 230: return 255-230;
+			case 231: return 255-231;
+			case 232: return 255-232;
+			case 233: return 255-233;
+			case 234: return 255-234;
+			case 235: return 255-235;
+			case 236: return 255-236;
+			case 237: return 255-237;
+			case 238: return 255-238;
+			case 239: return 255-239;
+			case 240: return 255-240;
+			case 241: return 255-241;
+			case 242: return 255-242;
+			case 243: return 255-243;
+			case 244: return 255-244;
+			case 245: return 255-245;
+			case 246: return 255-246;
+			case 247: return 255-247;
+			case 248: return 255-248;
+			case 249: return 255-249;
+			case 250: return 255-250;
+			case 251: return 255-251;
+			case 252: return 255-252;
+			case 253: return 255-253;
+			case 254: return 255-254;
+			case 255: return 255-255;
+		}
+
+		return -1;
+	}
+
+	static int test (int v)
+	{
+		Console.WriteLine ("value: " + v);
+		switch (v){
+		case 1:
+		case 2:
+			return 1;
+			
+		case 3:
+			return 3;
+
+		case 4:
+			return 5;
+
+		default:
+			Console.WriteLine ("default");
+			return 6;
+		}
+
+		return 7;
+	}
+
+	static int tests (string s)
+	{
+		switch (s){
+		case "one":
+		case "two":
+			return 1;
+		case "three":
+			return 3;
+		case "four":
+			return 5;
+		case null:
+			return 9;
+		default:
+			return 6;
+		}
+
+		return 1;
+	}
+
+	static int testn (string s)
+	{
+		switch (s){
+		case "one":
+			return 1;
+			
+		default:
+			return 0;
+		}
+		return -1;
+	}
+
+	static int testm (string s)
+	{
+		switch (s){
+		case "one":
+			return 1;
+		}
+		return 100;
+	}
+
+	static int testo (string s)
+	{
+		switch (s){
+		case "one":
+			return 1;
+		case null:
+			return 100;
+		}
+		return 2;
+	}
+
+	static int testp (string s)
+	{
+		switch (s){
+		case "one":
+		case null:
+		case "two":
+			return 1;
+		case "three":
+			return 3;
+		}
+		return 4;
+	}
+
+	static int test_def (string s)
+	{
+		switch (s){
+		case "one":
+			goto default;
+		case "two":
+			return 1;
+		case "three":
+			return 2;
+		default:
+			return 3;
+		}
+		return 4;
+	}
+
+	static int test_coverage (int x)
+	{
+		switch (x){
+		case 0:
+			return 1;
+		default:
+			return 10;
+		}
+	}
+
+	static int test_goto (int a)
+	{
+		switch (a){
+		case 0:
+			goto case 2;
+		case 1:
+			return 10;
+		case 2:
+			return 20;
+		default:
+			return 100;
+		}
+	}
+	
+	static int Main ()
+	{
+		byte b;
+
+		for (b = 0; b < 255; b++){
+			if (s (b) != 255 - b){
+				Console.WriteLine ("Failed with: " + b + " [" + s (b) + "]");
+				return 1;
+			}
+		}
+
+		Console.WriteLine ("Batch 2");
+		if (test (1) != 1)
+			return 1;
+		if (test (2) != 1)
+			return 2;
+		if (test (3) != 3)
+			return 3;
+		if (test (4) != 5)
+			return 4;
+		if (test (100) != 6)
+			return 5;
+
+		if (tests ("one") != 1)
+			return 6;
+		if (tests ("two") != 1)
+			return 7;
+		if (tests ("three") != 3)
+			return 8;
+		if (tests ("four") != 5)
+			return 9;
+		if (tests (null) != 9)
+			return 10;
+		if (tests ("blah") != 6)
+			return 11;
+
+		if (testn ("one") != 1)
+			return 12;
+		if (testn ("hello") != 0)
+			return 13;
+		if (testn (null) != 0)
+			return 14;
+
+		if (testm ("one") != 1)
+			return 15;
+		if (testm ("two") != 100)
+			return 16;
+		if (testm (null) != 100)
+			return 17;
+
+		if (testo ("one") != 1)
+			return 18;
+		if (testo ("two") != 2)
+			return 19;
+		if (testo (null) != 100)
+			return 20;
+
+		if (testp ("one") != 1)
+			return 21;
+		if (testp (null) != 1)
+			return 22;
+		if (testp ("two") != 1)
+			return 23;
+		if (testp ("three") != 3)
+			return 24;
+		if (testp ("blah") != 4)
+			return 25;
+
+		if (test_def ("one") != 3)
+			return 26;
+		if (test_def ("two") != 1)
+			return 27;
+		if (test_def ("three") != 2)
+			return 28;
+		if (test_def (null) != 3)
+			return 29;
+
+		if (test_coverage (100) != 10)
+			return 30;
+
+		if (test_goto (0) != 20)
+			return 31;
+		if (test_goto (1) != 10)
+			return 32;
+		if (test_goto (2) != 20)
+			return 33;
+		if (test_goto (200) != 100)
+			return 34;
+		
+		Console.WriteLine ("All tests pass");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-5.cs b/mcs/tests/test-5.cs
new file mode 100755
index 00000000000..7b3bdbc7924
--- /dev/null
+++ b/mcs/tests/test-5.cs
@@ -0,0 +1,14 @@
+using System;
+
+class X {
+
+	static int Main ()
+	{
+		Console.WriteLine ("From 0 to 9");
+		
+		for (int i = 0; i < 10; i++)
+			Console.WriteLine (i);
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-50.cs b/mcs/tests/test-50.cs
new file mode 100644
index 00000000000..84636e887ff
--- /dev/null
+++ b/mcs/tests/test-50.cs
@@ -0,0 +1,15 @@
+using System;

+using System.Runtime.InteropServices;

+

+public class Blah {

+

+	[DllImport ("user32", CallingConvention = CallingConvention.StdCall, CharSet = CharSet.Auto)]

+	public static extern int MessageBox (int hWnd, string pText, string pCaption, int uType);

+

+	public static int Main ()

+	{

+		MessageBox (0, "Hello from Mono !", "PInvoke Test", 0);

+

+		return 0;

+	}

+}

diff --git a/mcs/tests/test-51.cs b/mcs/tests/test-51.cs
new file mode 100755
index 00000000000..3a6257747b6
--- /dev/null
+++ b/mcs/tests/test-51.cs
@@ -0,0 +1,89 @@
+//
+// This test is used to test the `base' implementation
+//
+using System;
+
+class Base {
+	public int b_int_field;
+	public string b_string_field;
+
+	public const  int b_const_three = 3;
+	
+	public int    b_int_property {
+		get {
+			return b_int_field;
+		}
+
+		set {
+			b_int_field = value;
+		}
+	}
+
+	public string b_get_id ()
+	{
+		return "Base";
+	}
+
+	public Base ()
+	{
+		b_int_field = 1;
+		b_string_field = "base";
+	}
+}
+
+class Derived : Base {
+	new int b_int_field;
+	new string b_string_field;
+	new const int b_const_three = 4;
+
+	new int b_int_property {
+			get {
+				return b_int_field;
+			}
+
+
+			set {
+				b_int_field = value;
+			}
+
+		}
+	
+	public Derived ()
+	{
+		b_int_field = 10;
+		b_string_field = "derived";
+	}
+	
+	public int Test ()
+	{
+		if (b_int_field != 10)
+			return 1;
+		if (base.b_int_field != 1)
+			return 2;
+		if (base.b_string_field != "base")
+			return 3;
+		if (b_string_field != "derived")
+			return 4;
+		base.b_int_property = 4;
+		if (b_int_property != 10)
+			return 5;
+		if (b_int_property != 10)
+			return 6;
+		if (base.b_int_property != 4)
+			return 7;
+		if (b_const_three != 4)
+			return 8;
+		if (Base.b_const_three != 3)
+			return 9;
+		System.Console.WriteLine ("All tests pass");
+		return 0;
+	}
+}
+
+class boot {
+	static int Main ()
+	{
+		Derived d = new Derived ();
+		return d.Test ();
+	}
+}
diff --git a/mcs/tests/test-52.cs b/mcs/tests/test-52.cs
new file mode 100755
index 00000000000..fe5415c1ea7
--- /dev/null
+++ b/mcs/tests/test-52.cs
@@ -0,0 +1,98 @@
+//
+// Tests the foreach on strings, and tests the implicit use of foreach
+// to pull the enumerator from the class and identify the pattern to be called
+//
+using System;
+using System.Collections;
+
+class Y {
+	int count = 0;
+	
+	public bool MoveNext ()
+	{
+		count++;
+		return count != 10;
+	}
+	
+	public object Current {
+		get {
+			return count;
+		}
+	}
+}
+
+class X {
+
+	static string [] a = {
+		"one", "two", "three"
+	};
+
+	public Y GetEnumerator ()
+	{
+		return new Y ();
+	}
+	
+	static int Main ()
+	{
+		//
+		// String test
+		//
+		string total = "";
+		
+		foreach (string s in a){
+			total = total + s;
+		}
+		if (total != "onetwothree")
+			return 1;
+
+		//
+		// Pattern test
+		//
+		X x = new X ();
+
+		int t = 0;
+		foreach (object o in x){
+			t += (int) o;
+		}
+		if (t != 45)
+			return 2;
+
+		//
+		// Looking for GetEnumerator on interfaces test
+		//
+		Hashtable xx = new Hashtable ();
+		xx.Add ("A", 10);
+		xx.Add ("B", 20);
+
+		IDictionary vars = xx;
+		string total2 = "";
+		foreach (string name in vars.Keys){
+			total2 = total2 + name;
+		}
+
+		if ((total2 != "AB") && (total2 != "BA"))
+			return 3;
+
+		ArrayList list = new ArrayList ();
+		list.Add ("one");
+		list.Add ("two");
+		list.Add ("three");
+		int count = 0;
+
+		//
+		// This test will make sure that `break' inside foreach will
+		// actually use a `leave' opcode instead of a `br' opcode
+		//
+		foreach (string s in list){
+			if (s == "two"){
+				break;
+			}
+			count++;
+		}
+		if (count != 1)
+			return 4;
+		
+		Console.WriteLine ("test passes");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-53.cs b/mcs/tests/test-53.cs
new file mode 100755
index 00000000000..34cdd0c2f94
--- /dev/null
+++ b/mcs/tests/test-53.cs
@@ -0,0 +1,119 @@
+//
+// Tests the using statement implementation
+//
+using System;
+using System.IO;
+
+class MyDispose : IDisposable {
+	public bool disposed;
+	
+	public void Dispose ()
+	{
+		disposed = true;
+	}
+}
+
+//
+// This class does not implement IDiposable, but has an implicit conversion
+// defined
+//
+class NoIDispose {
+	static public MyDispose x;
+
+	public NoIDispose ()
+	{
+	}
+	
+	static NoIDispose ()
+	{
+		x = new MyDispose ();
+	}
+	
+	public static implicit operator MyDispose (NoIDispose a)
+	{
+		return x;
+	}
+}
+
+class Y {
+	static void B ()
+	{
+		using (NoIDispose a = new NoIDispose ()){
+		}
+	}
+	
+}
+
+class X {
+	static int Main ()
+	{
+		MyDispose copy_a, copy_b, copy_c;
+
+		//
+		// Test whether the two `a' and `b' get disposed
+		//
+		using (MyDispose a = new MyDispose (), b = new MyDispose ()){
+			copy_a = a;
+			copy_b = b;
+		}
+
+		if (!copy_a.disposed)
+			return 1;
+		if (!copy_b.disposed)
+			return 2;
+
+		Console.WriteLine ("Nested using clause disposed");
+
+		//
+		// See if the variable `b' is disposed if there is
+		// an error thrown inside the using block.
+		//
+		copy_c = null;
+		try {
+			using (MyDispose c = new MyDispose ()){
+				copy_c = c;
+				throw new Exception ();
+			}
+		} catch {}
+
+		if (!copy_c.disposed)
+			return 3;
+		else
+			Console.WriteLine ("Disposal on finally block works");
+
+		//
+		// This should test if `a' is non-null before calling dispose
+		// implicitly
+		//
+		using (MyDispose d = null){
+		}
+
+		Console.WriteLine ("Null test passed");
+		
+		//
+		// This tests that a variable is permitted here if there is
+		// an implicit conversion to a type that implement IDisposable
+		//
+		using (NoIDispose a = new NoIDispose ()){
+		}
+
+		//
+		// See if we dispose the object that can be implicitly converted
+		// to IDisposable 
+		if (NoIDispose.x.disposed != true)
+			return 4;
+		else
+			Console.WriteLine ("Implicit conversion from type to IDisposable pass");
+
+		MyDispose bb = new MyDispose ();
+		using (bb){
+			
+		}
+		if (bb.disposed == false)
+			return 6;
+		
+		Console.WriteLine ("All tests pass");
+		return 0;
+	}
+}
+	
diff --git a/mcs/tests/test-54.cs b/mcs/tests/test-54.cs
new file mode 100755
index 00000000000..0eb5b692204
--- /dev/null
+++ b/mcs/tests/test-54.cs
@@ -0,0 +1,23 @@
+//
+// This test does not pass peverify because we dont return properly
+// from catch blocks
+//
+using System;
+
+class X {
+
+	bool v ()
+	{
+		try {
+			throw new Exception ();
+		} catch {
+			return false;
+		}
+		return true;
+	}
+
+	static int Main ()
+	{
+		return 0;
+	}		
+}
diff --git a/mcs/tests/test-55.cs b/mcs/tests/test-55.cs
new file mode 100755
index 00000000000..6058ee2a1ba
--- /dev/null
+++ b/mcs/tests/test-55.cs
@@ -0,0 +1,33 @@
+using c = System.Console;
+using s = System;
+
+namespace A {
+	namespace B {
+		class C {
+			public static void Hola () {
+				c.WriteLine ("Hola!");
+			}
+		}
+	}
+}
+
+namespace X {
+	namespace Y {
+		namespace Z {
+			class W {
+				public static void Ahoj () {
+					s.Console.WriteLine ("Ahoj!");
+				}
+			}
+		}
+	}
+}
+
+class App {
+	public static int Main () {
+		A.B.C.Hola ();
+		X.Y.Z.W.Ahoj ();
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-56.cs b/mcs/tests/test-56.cs
new file mode 100755
index 00000000000..286cb10dacd
--- /dev/null
+++ b/mcs/tests/test-56.cs
@@ -0,0 +1,96 @@
+//
+// Stress test properties and the various modes of 
+// declarations (virtual, overrides, abstract, new)
+//
+using System;
+
+interface I {
+	int P {
+		get; set;
+	}
+}
+
+abstract class A : I {
+	public int p;
+	public int q;
+	
+	public int P {
+		get { return p; }
+		set { p = value; }
+	}
+
+	public abstract int Q { get; set; }
+
+	public int r;
+	public virtual int R { get { return r; } set { r = value; } }
+}
+
+class B : A {
+	public int bp;
+
+	public new int P
+	{
+		get { return bp; }
+		set { bp = value; }
+	}
+
+	public override int Q {
+		get { return q; }
+		set { q = value; }
+	}
+}
+
+class C : A {
+	public override int Q {
+		get { return q; }
+		set { q = value; }
+	}
+
+	public int rr;
+	public override int R { get { return rr; } set { rr = value; } }
+}
+
+class M {
+
+	static int Main ()
+	{
+		B b = new B ();
+
+		b.P = 1;
+		b.R = 10;
+		b.Q = 20;
+				 
+		if (b.P != 1)
+			return 1;
+		if (b.bp != 1)
+			return 2;
+
+		if (b.R != 10)
+			return 3;
+		if (b.r != 10)
+			return 4;
+
+		if (b.Q != 20)
+			return 5;
+		if (b.q != 20)
+			return 6;
+
+		C c = new C ();
+
+		c.R = 10;
+		c.Q = 20;
+		c.P = 30;
+		if (c.R != 10)
+			return 7;
+		if (c.rr != 10)
+			return 8;
+		if (c.P != 30)
+			return 9;
+		if (c.p != 30)
+			return 10;
+
+		Console.WriteLine ("Test passes");
+		return 0;
+	}
+}
+	
diff --git a/mcs/tests/test-57.cs b/mcs/tests/test-57.cs
new file mode 100644
index 00000000000..2d23bdedb13
--- /dev/null
+++ b/mcs/tests/test-57.cs
@@ -0,0 +1,75 @@
+using System;
+
+public delegate void EventHandler (int i, int j);
+
+public class Button {
+
+	private EventHandler click;
+
+	public event EventHandler Click {
+		add    { click += value; }
+		remove { click -= value; }
+	}
+
+        public void OnClick (int i, int j)
+  	{
+  		if (click == null) {
+			Console.WriteLine ("Nothing to click!");
+			return;
+		}
+
+		click (i, j);
+ 	}
+
+	public void Reset ()
+	{
+		click = null;
+	}
+}
+
+public class Blah {
+
+	Button Button1 = new Button ();
+
+	public void Connect ()
+	{
+		Button1.Click += new EventHandler (Button1_Click);
+		Button1.Click += new EventHandler (Foo_Click);
+	}
+
+	public void Button1_Click (int i, int j)
+	{
+		Console.WriteLine ("Button1 was clicked !");
+		Console.WriteLine ("Answer : " + (i+j));
+	}
+
+	public void Foo_Click (int i, int j)
+	{
+		Console.WriteLine ("Foo was clicked !");
+		Console.WriteLine ("Answer : " + (i+j));
+	}
+
+	public void Disconnect ()
+	{
+		Console.WriteLine ("Disconnecting Button1's handler ...");
+		Button1.Click -= new EventHandler (Button1_Click);
+	}
+
+	public static int Main ()
+	{
+		Blah b = new Blah ();
+
+		b.Connect ();
+
+		b.Button1.OnClick (2, 3);
+
+		b.Disconnect ();
+
+		Console.WriteLine ("Now calling OnClick again");
+		b.Button1.OnClick (3, 7);
+
+		Console.WriteLine ("Events test passes");
+		return 0;
+	}
+	
+}
diff --git a/mcs/tests/test-58.cs b/mcs/tests/test-58.cs
new file mode 100755
index 00000000000..d7230ee45df
--- /dev/null
+++ b/mcs/tests/test-58.cs
@@ -0,0 +1,25 @@
+using System;
+using System.Reflection;
+
+public class Blah {
+	
+	public static int Main ()
+	{
+		unsafe {
+			int* i;
+			int foo = 10;
+
+			void* bar;
+
+			i = &foo;
+
+			bar = i;
+			
+			Console.WriteLine ("Address : {0}", (int) i);
+		}
+
+		return 0;
+	}	
+}
+
+		
diff --git a/mcs/tests/test-59.cs b/mcs/tests/test-59.cs
new file mode 100755
index 00000000000..f857ed84d12
--- /dev/null
+++ b/mcs/tests/test-59.cs
@@ -0,0 +1,89 @@
+//
+// Tests the varios type conversions.
+//
+using System;
+
+class X {
+
+	static int test_explicit ()
+	{
+		object x_int = 1;
+		object x_uint_1 = 1u;
+		object x_uint_2 = 1U;
+		object x_long_1 = 1l;
+		object x_long_2 = 1L;
+		object x_ulong_1 = 1ul;
+		object x_ulong_2 = 1UL;
+		object x_ulong_3 = 1lu;
+		object x_ulong_4 = 1Lu;
+		object x_ulong_5 = 1LU;
+
+		if (!(x_int is int))
+			return 1;
+
+		if (!(x_uint_1 is uint))
+			return 2;
+
+		if (!(x_uint_2 is uint))
+			return 3;
+
+		if (!(x_long_1 is long))
+			return 5;
+
+		if (!(x_long_2 is long))
+			return 6;
+
+		if (!(x_ulong_1 is ulong))
+			return 7;
+
+		if (!(x_ulong_2 is ulong))
+			return 8;
+		
+		if (!(x_ulong_3 is ulong))
+			return 9;
+
+		if (!(x_ulong_4 is ulong))
+			return 10;
+
+		if (!(x_ulong_5 is ulong))
+			return 11;
+
+		return 0;
+
+	}
+
+	static int test_implicit ()
+	{
+		object i_int = 1;
+		object i_uint = 0x80000000;
+		object i_long = 0x100000000;
+		object i_ulong = 0x8000000000000000;
+
+		if (!(i_int is int))
+			return 1;
+		if (!(i_uint is uint))
+			return 2;
+		if (!(i_long is long))
+			return 3;
+		if (!(i_ulong is ulong))
+			return 4;
+
+		return 0;
+	}
+	
+	static int Main ()
+	{
+		int v;
+		v = test_explicit ();
+
+		if (v != 0)
+			return v;
+
+		v = test_implicit ();
+		if (v != 0)
+			return 20 + v;
+
+		Console.WriteLine ("Tests pass");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-6.cs b/mcs/tests/test-6.cs
new file mode 100755
index 00000000000..b95d891b7c4
--- /dev/null
+++ b/mcs/tests/test-6.cs
@@ -0,0 +1,15 @@
+using System;
+
+class X {
+
+	static int Main ()
+	{
+		Console.WriteLine ("From 0 to 9");
+		int i;
+		
+		for (i = 0; i < 10; i++)
+			Console.WriteLine (i);
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-60.cs b/mcs/tests/test-60.cs
new file mode 100755
index 00000000000..04161d53448
--- /dev/null
+++ b/mcs/tests/test-60.cs
@@ -0,0 +1,20 @@
+//
+// Really lame test, but it should be fine for now
+//
+#if (X)
+#endif
+
+#if YY
+#errro this should not be printed
+#if X
+#elif Y
+#else
+#endif
+#else
+class X {
+	static int Main ()
+	{
+		return 0;
+	}
+}
+#endif
diff --git a/mcs/tests/test-61.cs b/mcs/tests/test-61.cs
new file mode 100755
index 00000000000..9d8c8532b0f
--- /dev/null
+++ b/mcs/tests/test-61.cs
@@ -0,0 +1,39 @@
+//
+// This tests checks that we allow the `get' and `set' keywords inside
+// the get and set blocks.  It does the same for Events special remove
+// and add keywords.
+//
+class X {
+	int Property {
+		get {
+			int get;
+			get = 1;
+			return get;
+		}
+		set {
+			int set;
+			set = value;
+		}
+	}
+
+	int P2 {
+		get { return 0; }
+	}
+
+	int P3 {
+		set {  }
+	}
+
+	public delegate void MyEvent ();
+	
+	public event MyEvent XX {
+		add { int add = 1; }
+		remove { int remove = 1; }
+	}
+
+	static int Main ()
+	{
+		return 0;
+	}
+}
+
diff --git a/mcs/tests/test-62.cs b/mcs/tests/test-62.cs
new file mode 100755
index 00000000000..550956009e0
--- /dev/null
+++ b/mcs/tests/test-62.cs
@@ -0,0 +1,28 @@
+// 
+// This test just makes sure that we can typecast to
+// array types, as this was introduced later into the
+// grammar.
+//
+
+class X {
+
+	X [] GetX ()
+	{
+		return (X []) null;
+	}
+
+	int [] getInt ()
+	{
+		return (int []) null;
+	}
+
+	int [,,] getMoreInt ()
+	{
+		return (int [,,]) null;
+	}
+
+	static int Main ()
+	{
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-63.cs b/mcs/tests/test-63.cs
new file mode 100755
index 00000000000..268c607f783
--- /dev/null
+++ b/mcs/tests/test-63.cs
@@ -0,0 +1,31 @@
+//
+// Tests rethrowing an exception
+//
+using System;
+
+class X {
+	static int Main ()
+	{
+		bool one = false, two = false;
+
+		try {
+			try {
+				throw new Exception ();
+			} catch (Exception e) {
+				one = true;
+				Console.WriteLine ("Caught");
+				throw;
+			} 
+		} catch {
+			two = true;
+			Console.WriteLine ("Again");
+		}
+		
+		if (one && two){
+			Console.WriteLine ("Ok");
+			return 0;
+		} else
+			Console.WriteLine ("Failed");
+		return 1;
+	}
+}
diff --git a/mcs/tests/test-64.cs b/mcs/tests/test-64.cs
new file mode 100755
index 00000000000..43c31d7559e
--- /dev/null
+++ b/mcs/tests/test-64.cs
@@ -0,0 +1,29 @@
+//
+// This just test that we can compile this code.
+//
+// The challenge here is that LookupType needs to first look
+// in classes defined in its class or parent classes before resorting
+// to lookups in the namespace.
+//
+
+class Operator {
+}
+
+class Blah {
+
+	public enum Operator { A, B };
+	
+	public Blah (Operator x)
+	{
+	}
+}
+
+class T {
+	static int Main ()
+	{
+		Blah b = new Blah (Blah.Operator.A);
+
+		return 0;
+	}
+}
+
diff --git a/mcs/tests/test-65.cs b/mcs/tests/test-65.cs
new file mode 100755
index 00000000000..b117ae309a4
--- /dev/null
+++ b/mcs/tests/test-65.cs
@@ -0,0 +1,51 @@
+//
+// This exercises the various ways in which the new operator works
+// with value types.
+//
+
+using System;
+
+struct S {
+	int v;
+}
+
+class X {
+	static bool receive, create, create_and_box;
+	
+	static void receiver (S x)
+	{
+		receive = true;
+	}
+
+	static object BoxS ()
+	{
+		create_and_box = true;
+		return new S ();
+	}
+
+	static S Plain ()
+	{
+		create = true;
+		return new S ();
+	}
+	
+	static int Main ()
+	{
+		object a = new S ();
+		receiver (new S ());
+		S s = Plain ();
+		object o = BoxS ();
+		
+		if (a == null)
+			return 1;
+		if (receive == false)
+			return 2;
+		if (create == false)
+			return 3;
+		if (create_and_box == false)
+			return 4;
+
+		Console.WriteLine ("Test pass");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-66.cs b/mcs/tests/test-66.cs
new file mode 100755
index 00000000000..7691f6e7334
--- /dev/null
+++ b/mcs/tests/test-66.cs
@@ -0,0 +1,134 @@
+//
+// This tests checks out field access to arrays
+//
+using System;
+
+struct A {
+	public int a;
+}
+
+class Y {
+	public object a;
+}
+
+class X {
+	static A [] a_single = new A [10];
+	static A [,] a_double = new A [10,10];
+	static Y [] o_single = new Y [10];
+	static Y [,] o_double = new Y [10,10];
+
+	static void FillOne ()
+	{
+		a_single [0].a = 1;
+	}
+	
+	static void FillSingle ()
+	{
+		int i;
+		
+		for (i = 0; i < 10; i++){
+			a_single [i].a = i + 1;
+		}
+	}
+
+	static void FillDouble ()
+	{
+		int i, j;
+		
+		for (i = 0; i < 10; i++)
+			for (j = 0; j < 10; j++)
+				a_double [i,j].a = i * j;
+	}
+
+	static void FillObject ()
+	{
+		int i;
+		
+		for (i = 0; i < 10; i++){
+			o_single [i] = new Y ();
+			o_single [i].a = (i + 1);
+		}
+	}
+
+	static void FillDoubleObject ()
+	{
+		int i, j;
+		
+		for (i = 0; i < 10; i++)
+			for (j = 0; j < 10; j++){
+				o_double [i,j] = new Y ();
+				o_double [i,j].a = i * j;
+			}
+	}
+	
+	static int TestSingle ()
+	{
+		int i;
+		
+		for (i = 0; i < 10; i++){
+			if (a_single [i].a != i + 1)
+				return 1;
+		}
+		return 0;
+	}
+
+	static int TestDouble ()
+	{
+		int i, j;
+
+		for (i = 0; i < 10; i++){		
+			for (j = 0; j < 10; j++)
+				if (a_double [i,j].a != (i *j))
+					return 2;
+		}
+
+		return 0;
+	}
+
+	static int TestObjectSingle ()
+	{
+		int i;
+		
+		for (i = 0; i < 10; i++){
+			if ((int)(o_single [i].a) != i + 1)
+				return 1;
+		}
+		return 0;
+	}
+
+	static int TestObjectDouble ()
+	{
+		int i, j;
+
+		for (i = 0; i < 10; i++){		
+			for (j = 0; j < 10; j++)
+				if (((int)o_double [i,j].a) != (i *j))
+					return 2;
+		}
+
+		return 0;
+	}
+	
+	static int Main ()
+	{
+		FillSingle ();
+		FillDouble ();
+		FillObject ();
+		FillDoubleObject ();
+		
+		if (TestSingle () != 0)
+			return 1;
+		
+		if (TestDouble () != 0)
+			return 2;
+
+		if (TestObjectSingle () != 0)
+			return 3;
+
+		if (TestObjectDouble () != 0)
+			return 4;
+
+		Console.WriteLine ("test passes");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-67.cs b/mcs/tests/test-67.cs
new file mode 100644
index 00000000000..7eb792ae690
--- /dev/null
+++ b/mcs/tests/test-67.cs
@@ -0,0 +1,93 @@
+using System;
+using System.Runtime.InteropServices;
+
+[StructLayout (LayoutKind.Sequential)]
+public class MySystemTime {
+	public ushort Year; 
+	public ushort Month;
+	public ushort DayOfWeek; 
+	public ushort Day; 
+	public ushort Hour; 
+	public ushort Minute; 
+	public ushort Second; 
+	public ushort Milliseconds; 
+}
+
+[StructLayout (LayoutKind.Sequential)]
+public struct Point {
+	public int x;
+	public int y;
+}
+
+[StructLayout (LayoutKind.Explicit)]
+public struct Rect {	
+	[FieldOffset (0)] public int left;
+	[FieldOffset (4)] public int top;
+	[FieldOffset (8)] public int right;
+	[FieldOffset (12)] public int bottom;
+}
+
+[StructLayout (LayoutKind.Explicit)]
+struct A {
+	[FieldOffset (0)]
+	public int a;
+	[FieldOffset (0)]
+	public byte b1;
+	[FieldOffset (1)]
+	public byte b2;
+	[FieldOffset (2)]
+	public byte b3;
+	[FieldOffset (3)]
+	public byte b4;
+}
+
+public class Blah {
+
+	[DllImport ("Kernel32.dll")]
+	public static extern void GetSystemTime (MySystemTime st);
+
+	[DllImport ("User32.dll")]
+	public static extern bool PtInRect (ref Rect r, Point p);	
+
+	public static int Main () {
+
+		MySystemTime st = new MySystemTime ();
+
+		GetSystemTime (st);
+
+		Console.WriteLine ("Today's date is : {0:0000}-{1:00}-{2:00}", st.Year, st.Month, st.Day);
+		Console.WriteLine ("The time now is : {0:00}:{1:00}:{2:00}", st.Hour, st.Minute, st.Second);
+
+		Rect r = new Rect ();
+
+		r.left = 10;
+		r.top  = 12;
+		r.right = 30;
+		r.bottom = 30;
+
+		Point p = new Point ();
+
+		p.x = 15;
+		p.y = 20;
+
+		if (!PtInRect (ref r, p))
+			return 1;
+
+		A a = new A ();
+
+		a.a = 0x12345678;
+
+		if (a.b1 != 0x78)
+			return 2;
+		if (a.b2 != 0x56)
+			return 3;
+		if (a.b3 != 0x34)
+			return 4;
+		if (a.b4 != 0x12)
+			return 5;
+		
+		Console.WriteLine ("Point lies inside rect");
+		Console.WriteLine ("Test passes");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-68.cs b/mcs/tests/test-68.cs
new file mode 100755
index 00000000000..df49dbc8786
--- /dev/null
+++ b/mcs/tests/test-68.cs
@@ -0,0 +1,23 @@
+//
+// Tests invocation of reference type functions with value type arguments
+//
+using System;
+enum A {
+	Hello
+}
+
+class X {
+
+	static int Main ()
+	{
+		if ("Hello" != A.Hello.ToString ())
+			return 1;
+
+		Console.WriteLine ("value is: " + (5.ToString ()));
+		if (5.ToString () != "5")
+			return 2;
+		
+		return 0;
+	}
+}
+	
diff --git a/mcs/tests/test-69.cs b/mcs/tests/test-69.cs
new file mode 100644
index 00000000000..be58166c258
--- /dev/null
+++ b/mcs/tests/test-69.cs
@@ -0,0 +1,13 @@
+using System;
+using System.Runtime.CompilerServices;
+
+public class Blah {
+
+	[MethodImpl (MethodImplOptions.InternalCall)]
+	private extern void Start_internal(IntPtr handle);
+
+	public static int Main ()
+	{
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-7.cs b/mcs/tests/test-7.cs
new file mode 100644
index 00000000000..d3a9a9f34b1
--- /dev/null
+++ b/mcs/tests/test-7.cs
@@ -0,0 +1,176 @@
+using System;
+
+namespace Mine {
+
+	public class Blah {
+
+		public int i;
+
+		public static int Main ()
+		{
+			Blah k, l;
+
+			k = new Blah (2) + new Blah (3);
+			if (k.i != 5)
+				return 1;
+			
+			k = ~ new Blah (5);
+			if (k.i != -6)
+				return 1;
+			
+			
+			k = + new Blah (4);
+			if (k.i != 4)
+				return 1;
+			
+			k = - new Blah (21);
+			if (k.i != -21)
+				return 1;
+
+			k = new Blah (22) - new Blah (21);
+			if (k.i != 1)
+				return 1;
+
+			if (!k)
+				Console.WriteLine ("! returned true");
+
+			int number = k;
+			if (number != 1)
+				return 1;
+			
+			k++;	
+			++k;
+
+			if (k)
+				Console.WriteLine ("k is definitely true");
+
+			k = new Blah (30);
+
+			double f = (double) k;
+
+			if (f != 30.0)
+				return 1;
+
+			int i = new Blah (5) * new Blah (10);
+
+			if (i != 50)
+				return 1;
+
+			k = new Blah (50);
+			l = new Blah (10);
+			
+			i = k / l;
+
+			if (i != 5)
+				return 1;
+
+			i = k % l;
+
+			if (i != 0)
+				return 1;
+			
+			return 0;
+		}
+	
+		public Blah (int v)
+		{
+			i = v;
+		}
+	
+		public static Blah operator + (Blah i, Blah j)
+		{
+			Blah b = new Blah (i.i + j.i);
+			Console.WriteLine ("Overload binary + operator");
+			return b;
+		}
+
+		public static Blah operator + (Blah i)
+		{
+			Console.WriteLine ("Overload unary + operator");
+			return new Blah (i.i);
+		}
+
+		public static Blah operator - (Blah i)
+		{
+			Console.WriteLine ("Overloaded unary - operator");
+			return new Blah (- i.i);
+		}
+
+		public static Blah operator - (Blah i, Blah j)
+		{
+			Blah b = new Blah (i.i - j.i);
+			Console.WriteLine ("Overloaded binary - operator");
+			return b;
+		}
+
+		public static int operator * (Blah i, Blah j)
+		{
+			Console.WriteLine ("Overloaded binary * operator");
+			return i.i * j.i;
+		}
+
+		public static int operator / (Blah i, Blah j)
+		{
+			Console.WriteLine ("Overloaded binary / operator");
+			return i.i / j.i;
+		}
+
+		public static int operator % (Blah i, Blah j)
+		{
+			Console.WriteLine ("Overloaded binary % operator");
+			return i.i % j.i;
+		}
+		
+		public static Blah operator ~ (Blah i)
+		{
+			Console.WriteLine ("Overloaded ~ operator");
+			return new Blah (~i.i);
+		}
+	
+		public static bool operator ! (Blah i)
+		{
+			Console.WriteLine ("Overloaded ! operator");
+			return (i.i == 1);
+		}
+
+		public static Blah operator ++ (Blah i)
+		{
+			Blah b = new Blah (i.i + 1);
+			Console.WriteLine ("Incrementing i");
+			return b;
+		}
+
+		public static Blah operator -- (Blah i)
+		{
+			Blah b = new Blah (i.i - 1);
+			Console.WriteLine ("Decrementing i");
+			return b;
+		}	
+	
+		public static bool operator true (Blah i)
+		{
+			Console.WriteLine ("Overloaded true operator");
+			return (i.i == 3);
+		}
+
+		public static bool operator false (Blah i)
+		{
+			Console.WriteLine ("Overloaded false operator");
+			return (i.i != 1);
+		}	
+	
+		public static implicit operator int (Blah i) 
+		{	
+			Console.WriteLine ("Converting implicitly from Blah->int");
+			return i.i;
+		}
+
+		public static explicit operator double (Blah i)
+		{
+			Console.WriteLine ("Converting explicitly from Blah->double");
+			return (double) i.i;
+		}
+
+	}
+
+}
diff --git a/mcs/tests/test-70.cs b/mcs/tests/test-70.cs
new file mode 100755
index 00000000000..6fe8da995e8
--- /dev/null
+++ b/mcs/tests/test-70.cs
@@ -0,0 +1,48 @@
+//
+// Tests the right settings for overrides
+//
+
+class X {
+
+	public virtual int A {
+		get {
+			return 1;
+		}
+	}
+
+	public virtual int B ()
+	{
+		return 1;
+	}
+}
+
+class Y : X {
+	public override int A {
+		get {
+			return base.A + 2;
+		}
+	}
+
+	public override int B ()
+	{
+		return base.B () + 1;
+	}
+}
+
+class Z {
+	static int Main ()
+	{
+		Y y = new Y ();
+		X x = new X ();
+				       
+		if (y.B () != 2)
+			return 1;
+		if (y.A != 3)
+			return 2;
+		if (x.A != 1)
+			return 3;
+		if (x.B () != 1)
+			return 4;
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-71.cs b/mcs/tests/test-71.cs
new file mode 100755
index 00000000000..e7bd956c5f6
--- /dev/null
+++ b/mcs/tests/test-71.cs
@@ -0,0 +1,28 @@
+//
+// struct with a constructor
+//
+using System;
+
+class X {
+
+	static void Main ()
+	{
+		MethodSignature ms = new MethodSignature ("hello", null, null);
+		
+		Console.WriteLine ("About to look for: " + ms.Name);
+	}
+}
+
+	struct MethodSignature {
+		public string Name;
+		public Type RetType;
+		public Type [] Parameters;
+		
+		public MethodSignature (string name, Type ret_type, Type [] parameters)
+		{
+			Name = name;
+			RetType = ret_type;
+			Parameters = parameters;
+		}
+	}
+		
diff --git a/mcs/tests/test-72.cs b/mcs/tests/test-72.cs
new file mode 100755
index 00000000000..06d1cee18f9
--- /dev/null
+++ b/mcs/tests/test-72.cs
@@ -0,0 +1,21 @@
+//
+// Compile test for referencing types on nested types
+//
+
+using System;
+
+public class outer {
+        public class inner {
+                public void meth(Object o) {
+                        inner inst = (inner)o;
+                }
+        }
+	
+	static int Main ()
+	{
+		// We only test that this compiles.
+		
+		return 0;
+	}
+  }
+
diff --git a/mcs/tests/test-73.cs b/mcs/tests/test-73.cs
new file mode 100755
index 00000000000..2acf9806895
--- /dev/null
+++ b/mcs/tests/test-73.cs
@@ -0,0 +1,28 @@
+//
+// This test is used to test that we do not use the .override
+// command on abstract method implementations.
+//
+
+public abstract class Abstract {
+	public abstract int A ();
+}
+
+public class Concrete : Abstract {
+	public override int A () {
+		return 1;
+	}
+}
+
+class Test {
+
+	static int Main ()
+	{
+		Concrete c = new Concrete ();
+
+		if (c.A () != 1)
+			return 1;
+
+		return 0;
+	}
+}
+	
diff --git a/mcs/tests/test-74.cs b/mcs/tests/test-74.cs
new file mode 100755
index 00000000000..0d134af57e9
--- /dev/null
+++ b/mcs/tests/test-74.cs
@@ -0,0 +1,29 @@
+//
+// This test excercises #pre-processor directives in non-1 column
+// as well as the literal strings
+//
+class X {
+	#if Blah
+	#else
+	static int Main ()
+	{
+	#endif
+		string s = @"Hola\";
+		string d = "Hola\\";
+		string e = @"Co""a";
+		string f = "Co\"a";
+
+		if (s != d)
+			return 1;
+		if (e != f)
+			return 2;
+
+		string g = "Hello\nworld";
+		string h = @"Hello
+world";
+		if (g != h) 
+			return 3;
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-75.cs b/mcs/tests/test-75.cs
new file mode 100755
index 00000000000..a16816cbbf0
--- /dev/null
+++ b/mcs/tests/test-75.cs
@@ -0,0 +1,36 @@
+//
+// This test probes using an operator overloaded in a parents' parent
+//
+
+class X {
+	public static bool called = false;
+	
+	static public X operator + (X a, X b)
+	{
+		called = true;
+		return null;
+	}
+}
+
+class Y : X {
+}
+
+class Z : Y {
+}
+
+class driver {
+
+	static int Main ()
+	{
+		Z a = new Z ();
+		Z b = new Z ();
+		X c = a + b;
+
+		if (X.called)
+			return 0;
+
+		return 1;
+	}
+
+}
+
diff --git a/mcs/tests/test-76.cs b/mcs/tests/test-76.cs
new file mode 100755
index 00000000000..91377cee80a
--- /dev/null
+++ b/mcs/tests/test-76.cs
@@ -0,0 +1,35 @@
+//
+// This test is used to verify that we handle functions that have
+// only an array parameter
+//
+
+using System;
+using System.Text;
+
+class foo {
+
+	static string strcat (params string [] values)
+	{
+		StringBuilder s = new StringBuilder ();
+		
+		foreach (string val in values) {
+			s.Append (val);
+		}
+
+		return s.ToString ();
+	}
+
+	public static int Main ()
+	{
+		if (strcat ("Hello", "World") != "HelloWorld")
+			return 1;
+
+		if (strcat () != "")
+			return 2;
+
+		if (strcat ("a", "b", "c", "d", "e") != "abcde")
+			return 3;
+
+		return 0;
+	}
+};
diff --git a/mcs/tests/test-77.cs b/mcs/tests/test-77.cs
new file mode 100755
index 00000000000..aca2001a39e
--- /dev/null
+++ b/mcs/tests/test-77.cs
@@ -0,0 +1,38 @@
+//
+// Tests the various string implicit conversions
+//
+
+class XX {
+
+	enum X {
+		A = 1
+	}
+	
+	static int Main ()
+	{
+		int one = 1;
+		int two = 2;
+		
+		if (("a" + "b") != "ab")
+			return 1;
+
+		if (("one" + one) != "one1")
+			return 2;
+
+		if ((one + "one") != "1one")
+			return 3;
+
+		if ((one + "two" + two) != "1two2")
+			return 4;
+
+		if ((X.A + "a") != "Aa")
+			return 5;
+
+		if (((int)X.A) + "a" != "1a")
+			return 6;
+		
+		System.Console.WriteLine ("test ok");
+		return 0;
+	}
+}
+	
diff --git a/mcs/tests/test-78.cs b/mcs/tests/test-78.cs
new file mode 100755
index 00000000000..3787fe6b9e2
--- /dev/null
+++ b/mcs/tests/test-78.cs
@@ -0,0 +1,59 @@
+//
+// This test exhibits an old bug where we did not
+// go into the underlying type for an enumeration, and
+// hence implicit and explicit casts were not working when
+// they were going from a type to an enum
+//
+
+namespace N1
+{	
+	public enum A
+	{
+		A_1, A_2, A_3
+	}
+
+	public class B
+	{
+		static bool ShortCasting ()
+		{
+			short i = 0;
+			N1.A a = N1.A.A_1;
+
+			i = (short) a;	//<- crash
+			a = (N1.A)i;//<- used to fail, can't convert
+
+			if (a != N1.A.A_1)
+				return false;
+			return true;
+		}
+
+		static bool IntCasting ()
+		{
+			int i = 0;
+			N1.A a = N1.A.A_1;
+
+			i = (int) a;//<- works fine
+			a = (N1.A)i;//<- used to fail, can't convert
+
+			if (a != N1.A.A_1)
+				return false;
+			return true;
+		}
+	
+		static int Main ()
+		{
+			if (!IntCasting ())
+				return 1;
+			if (!ShortCasting ())
+				return 2;
+			return 0;
+		}
+
+	}
+}
+
+
+
+
+
+
diff --git a/mcs/tests/test-79.cs b/mcs/tests/test-79.cs
new file mode 100755
index 00000000000..8a4012db8ad
--- /dev/null
+++ b/mcs/tests/test-79.cs
@@ -0,0 +1,17 @@
+//
+// This test excercises the compiler being able to compute
+// correctly the return type in the presence of null (as null
+// will be implicitly convertible to anything
+//
+class X {
+
+	static int Main ()
+	{
+		object o = null;
+
+		string s = o == null ? "string" : null;
+		string d = o == null ? null : "string";
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-8.cs b/mcs/tests/test-8.cs
new file mode 100644
index 00000000000..5de9804f341
--- /dev/null
+++ b/mcs/tests/test-8.cs
@@ -0,0 +1,29 @@
+class X {
+	static public int Main (string [] args)
+	{
+		int a, b, c, d;
+
+		a = b = 10;
+		c = d = 14;
+
+		if ((a + b) != 20)
+			return 1;
+		if ((a + d) != 24)
+			return 2;
+		if ((c + d) != 28)
+			return 3;
+		if ((b + c) != 24)
+			return 4;
+
+		if (a++ != 10)
+			return 5;
+		if (++a != 12)
+			return 6;
+		if (b-- != 10)
+			return 7;
+		if (--b != 8)
+			return 8;
+				
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-80.cs b/mcs/tests/test-80.cs
new file mode 100755
index 00000000000..ec2270b1c40
--- /dev/null
+++ b/mcs/tests/test-80.cs
@@ -0,0 +1,32 @@
+//
+// This test is used to check that we can actually use implementations
+// provided in our parent to interfaces declared afterwards.
+//
+
+using System;
+
+public interface A {
+ 	int Add (int a, int b);
+}
+
+public class X {
+	public int Add (int a, int b)
+	{
+		return a + b;
+	}
+}
+
+class Y : X, A {
+
+	static int Main ()
+	{
+		Y y = new Y ();
+		
+		if (y.Add (1, 1) != 2)
+			return 1;
+
+		Console.WriteLine ("parent interface implementation test passes");
+		return 0;
+	}
+	
+}
diff --git a/mcs/tests/test-81.cs b/mcs/tests/test-81.cs
new file mode 100644
index 00000000000..005708bfc86
--- /dev/null
+++ b/mcs/tests/test-81.cs
@@ -0,0 +1,37 @@
+//
+// Tests if we can invoke static members using the short
+// names
+//
+using System;
+
+namespace N1
+{	
+	public class A
+	{
+		int x;
+		string s;
+
+		void Bar ()
+		{
+			x = int.Parse ("0");
+			s = string.Format("{0}", x);
+		}
+
+		public static int Main ()
+		{
+			A a = new A ();
+
+			a.Bar ();
+			
+			if (a.x != 0)
+				return 1;
+
+			if (a.s != "0")
+				return 1;
+
+			Console.WriteLine ("Bar set s to " + a.s);
+
+			return 0;
+		}
+	}		
+}
diff --git a/mcs/tests/test-82.cs b/mcs/tests/test-82.cs
new file mode 100644
index 00000000000..9ff4032897b
--- /dev/null
+++ b/mcs/tests/test-82.cs
@@ -0,0 +1,40 @@
+//
+// Test to ensure that we correctly perform type lookups - thanks to Felix A.I
+//
+namespace N1
+{	
+	public enum A
+	{
+		A_1, A_2, A_3
+	}
+
+	namespace N2
+	{	
+		public class B
+		{
+			A member;
+
+			void Method (ref A a)
+			{
+			}
+
+			public static int Main ()
+			{
+				return 0;
+			}
+		}
+
+	}
+}
+
+namespace N1.N3
+{	
+	public class B
+	{
+		A member;
+
+		void Method (ref A a)
+		{
+		}
+	}
+}
diff --git a/mcs/tests/test-83.cs b/mcs/tests/test-83.cs
new file mode 100755
index 00000000000..f416ddb4a6d
--- /dev/null
+++ b/mcs/tests/test-83.cs
@@ -0,0 +1,47 @@
+//
+// This test probes that we treat events differently than fields
+// This used to cause a compiler crash.
+//
+using System;
+
+delegate void PersonArrivedHandler (object source, PersonArrivedArgs args);
+
+class PersonArrivedArgs /*: EventArgs*/ {
+    public string name;
+    public PersonArrivedArgs (string name) {
+	this.name = name;
+    }
+}
+
+class Greeter {
+    string greeting;
+
+    public Greeter (string greeting) {
+	this.greeting = greeting;
+    }
+
+    public void HandlePersonArrived (object source, PersonArrivedArgs args) {
+	Console.WriteLine(greeting, args.name);
+    }
+}
+
+class Room {
+    public event PersonArrivedHandler PersonArrived;
+
+    public Room () {
+	    // Assign a value to it, this also used to crash the compiler.
+	    PersonArrived = null;
+    }
+
+    public void AddPerson (string name) {
+	PersonArrived(this, null); //(this, PersonArrivedArgs(name));
+    }
+}
+
+class DelegateTest {
+    static int Main () {
+	return 0;
+    }
+}
+
+
diff --git a/mcs/tests/test-84.cs b/mcs/tests/test-84.cs
new file mode 100755
index 00000000000..e6b3d4e3f0d
--- /dev/null
+++ b/mcs/tests/test-84.cs
@@ -0,0 +1,22 @@
+//
+// This test shows how a variable can be created with the 
+// same name as the class, and then the class referenced again
+// 
+// This was a bug exposed by Digger, as we incorrectly tried to
+// do some work ahead of time during the resolution process
+// (ie, we created LocalVariableReferences for the int variable `Ghost', 
+// which stopped `Ghost' from being useful as a type afterwards
+//
+
+class Ghost {
+
+	static int Main ()
+	{
+		int Ghost = 0;
+		
+		if (true){
+			Ghost g = null;
+		}
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-85.cs b/mcs/tests/test-85.cs
new file mode 100755
index 00000000000..a50379568f3
--- /dev/null
+++ b/mcs/tests/test-85.cs
@@ -0,0 +1,23 @@
+//
+// This test declares a field variable called `UnmanagedType' of type
+// UnmanagedType.
+//
+// The test is used to test the cast of 0 to UnmanagedType, as before
+// that would have been resolved to a variable instead of a type.
+//
+using System.Runtime.InteropServices;
+
+class X {
+	static UnmanagedType UnmanagedType;
+
+	static int Main ()
+	{
+		UnmanagedType = (UnmanagedType) 0;
+
+		if (UnmanagedType != 0)
+			return 1;
+
+		return 0;
+	}
+}
+
diff --git a/mcs/tests/test-86.cs b/mcs/tests/test-86.cs
new file mode 100644
index 00000000000..faf1ae20a18
--- /dev/null
+++ b/mcs/tests/test-86.cs
@@ -0,0 +1,45 @@
+using System;
+
+namespace T {
+	public class T {
+		
+		static int method1 (Type t, int val)
+		{
+			Console.WriteLine ("You passed in " + val);
+			return 1;
+		}
+
+		static int method1 (Type t, Type[] types)
+		{
+			Console.WriteLine ("Wrong method called !");
+			return 2;
+		}
+
+		static int method2 (Type t, int val)
+		{
+			Console.WriteLine ("MEthod2 : " + val);
+			return 3;
+		}
+
+		static int method2 (Type t, Type [] types)
+		{
+			Console.WriteLine ("Correct one this time!");
+			return 4;
+		}
+		
+		public static int Main()
+		{
+			int i = method1 (null, 1);
+
+			if (i != 1)
+				return 1;
+			
+			i = method2 (null, null);
+			
+			if (i != 4)
+				return 1;
+			
+			return 0;
+		}
+	}
+}
diff --git a/mcs/tests/test-87.cs b/mcs/tests/test-87.cs
new file mode 100755
index 00000000000..56c53c9c7ce
--- /dev/null
+++ b/mcs/tests/test-87.cs
@@ -0,0 +1,47 @@
+//
+// Tests the lookup of names on nested classes.
+//
+// Tests nested interfaces
+//
+class Top {
+
+	class X {
+
+	}
+
+	class Y : X {
+	}
+
+	interface A {
+		int get_one ();
+	}
+
+	interface B : A {
+		int get_two ();
+	}
+
+	class XA : A {
+		public int get_one () { return 1; }
+	}
+
+	class XB : B {
+		public int get_one () { return 1; }
+		public int get_two () { return 2; }
+	}
+	
+	static int Main ()
+	{
+		XA x = new XA ();
+
+		if (x.get_one () != 1)
+			return 1;
+
+		XB b = new XB ();
+		if (x.get_one () != 1)
+			return 2;
+		if (b.get_two () != 2)
+			return 3;
+		return 0;
+	}
+}
+		
diff --git a/mcs/tests/test-88.cs b/mcs/tests/test-88.cs
new file mode 100755
index 00000000000..a45aafe7e5b
--- /dev/null
+++ b/mcs/tests/test-88.cs
@@ -0,0 +1,18 @@
+class X {
+
+static void f (string s)
+{
+s. Split ('a');
+}
+
+	static int Main ()
+	{
+		string s = "";
+		
+		s.Split ('a');
+		s.Split ();
+		s.Split ('a', 'b', 'c');
+		return 0;
+	}
+}
+	
diff --git a/mcs/tests/test-89.cs b/mcs/tests/test-89.cs
new file mode 100755
index 00000000000..3f1b86ed6b2
--- /dev/null
+++ b/mcs/tests/test-89.cs
@@ -0,0 +1,34 @@
+//
+// This test is used to make sure that we correctly create value
+// types in the presence of arrays.  Check bug 21801 for a history
+// of the bug
+//
+using System;
+
+struct X {
+	int value;
+	
+	X (int a)
+	{
+		value = a;
+	}
+
+	static X F (int a)
+	{
+		return new X (a);
+	}
+	
+	static int Main ()
+	{
+		X [] x = { new X (40), F (10) };
+
+		if (x [0].value != 40)
+			return 1;
+
+		if (x [1].value != 10)
+			return 2;
+
+		Console.WriteLine ("test ok");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-9.cs b/mcs/tests/test-9.cs
new file mode 100755
index 00000000000..4fd35e3714b
--- /dev/null
+++ b/mcs/tests/test-9.cs
@@ -0,0 +1,24 @@
+class X {
+	static public int Main (string [] args)
+	{
+		decimal a, b, c, d;
+
+		a = 0;
+		b = 1;
+		c = d = 3;
+
+		if (b + b + b != c)
+			return 1;
+
+		if (a != (b - 1))
+			return 2;
+
+		if (c != d)
+			return 3;
+
+		if (!(c == d))
+			return 4;
+		
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-90.cs b/mcs/tests/test-90.cs
new file mode 100755
index 00000000000..8d7c147ec3f
--- /dev/null
+++ b/mcs/tests/test-90.cs
@@ -0,0 +1,37 @@
+//
+// This test just makes sure that we can compile C.A, there used to be
+// a bug in the compiler that was doing the lookups in the wrong namespace
+//
+// 
+namespace N1
+{	
+	public enum A
+	{
+		A_1, A_2, A_3
+	}
+
+	public interface B
+	{
+		N1.A myProp 
+		{
+			get;
+			set;   // <-- This always worked.
+		}
+	}
+
+	public interface C
+	{
+		A myProp
+		{
+			get;
+			set;  // <-- This used to fail.
+		}
+	}
+
+	public class Blah {
+		static int Main  ()
+		{
+			return 0;
+		}
+	}
+}
diff --git a/mcs/tests/test-91.cs b/mcs/tests/test-91.cs
new file mode 100755
index 00000000000..11dddc6b45c
--- /dev/null
+++ b/mcs/tests/test-91.cs
@@ -0,0 +1,53 @@
+using System;
+using System.Reflection;
+
+class Test {
+
+	static protected internal void MyProtectedInternal () { }
+	static internal void MyInternal() { }
+	static public void MyPublic () { }
+	static void MyPrivate () {}
+	      
+	static int Main ()
+	{
+		Type myself = typeof (Test);
+		BindingFlags bf = BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.Public;
+		MethodAttributes mpia;
+		MethodInfo mpi;
+
+		//
+		// protected internal
+		//
+		mpi = myself.GetMethod ("MyProtectedInternal", bf);
+		mpia = mpi.Attributes & MethodAttributes.MemberAccessMask;
+		if (mpia != MethodAttributes.FamORAssem)
+			return 1;
+
+		//
+		// internal
+		//
+		mpi = myself.GetMethod ("MyInternal", bf);
+		mpia = mpi.Attributes & MethodAttributes.MemberAccessMask;
+		if (mpia != MethodAttributes.Assembly)
+			return 2;
+
+		//
+		// public
+		//
+		mpi = myself.GetMethod ("MyPublic", bf);
+		mpia = mpi.Attributes & MethodAttributes.MemberAccessMask;
+		if (mpia != MethodAttributes.Public)
+			return 3;
+
+		//
+		// private
+		//
+		mpi = myself.GetMethod ("MyPrivate", bf);
+		mpia = mpi.Attributes & MethodAttributes.MemberAccessMask;
+		if (mpia != MethodAttributes.Private)
+			return 4;
+
+		Console.WriteLine ("All tests pass");
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-92.cs b/mcs/tests/test-92.cs
new file mode 100755
index 00000000000..1de5aa71a7d
--- /dev/null
+++ b/mcs/tests/test-92.cs
@@ -0,0 +1,20 @@
+//
+// This test exposed a bug that Dan found:
+//
+// The InnerBase used to be the `builder' that was passed to InnerBase,
+// so even if InnerBase was a toplevel, it would be defined in the context
+// of being nested.  Buggy.
+//
+class Outer {
+	class Inner : InnerBase {
+	}
+}
+
+abstract class InnerBase {
+}
+
+class MainClass {
+	public static int Main () {
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-93.cs b/mcs/tests/test-93.cs
new file mode 100755
index 00000000000..0ce693979d6
--- /dev/null
+++ b/mcs/tests/test-93.cs
@@ -0,0 +1,47 @@
+//
+// This tests member lookups on inherited interfaces.
+//
+// The bug was exposed because FindMembers in MemberLookup
+// would not return all the members on interfaces, but only
+// the members from the most close type.
+//
+
+using System;
+using System.Collections;
+
+namespace N1
+{	
+	interface A
+	{
+		void method1 ();
+	}
+	
+	interface B:A
+	{
+		void method2 ();
+	}
+
+	public class C
+	{
+		void method (ref B p)
+		{
+			p.method2();//<- works declared in 'B'
+			p.method1();//<- fails declared in 'A'
+		}
+	}
+}
+
+
+class Test {
+        public static int Main () {
+                IList list = new ArrayList ();
+                int n = list.Count;
+
+		return 0;
+        }
+}
+
+
+
+
+
diff --git a/mcs/tests/test-94.cs b/mcs/tests/test-94.cs
new file mode 100755
index 00000000000..a8c5fea996f
--- /dev/null
+++ b/mcs/tests/test-94.cs
@@ -0,0 +1,59 @@
+using System;
+
+public interface IVehicle {
+	int Start ();
+	int Stop ();
+	int Turn ();
+}
+
+public class Base : IVehicle {
+	int IVehicle.Start () { return 1; }
+	public int Stop () { return 2; }
+	public virtual int Turn () { return 3; }
+}
+
+public class Derived1 : Base {
+	// replaces Base.Turn + IVehice.Turn
+	public override int Turn () { return 4; }
+}
+
+public class Derived2 : Base, IVehicle {
+	// legal - we redeclared IVehicle support
+	public new int Stop () { return 6; }
+	// legal - we redeclared IVehicle support
+	int IVehicle.Start () { return 5; }
+	// replaces IVehicle.Turn 
+	int IVehicle.Turn () { return 7; }
+	// replaces Base.Turn 
+	public override int Turn () { return 8; }
+}
+
+public class Test {
+
+	static int Main () {
+		Derived1 d1 = new Derived1 ();
+		Derived2 d2 = new Derived2 ();
+		Base b1 = d1;
+		Base b2 = d2;
+
+		if (d1.Turn () != 4)
+			return 1;
+		
+		if (((IVehicle)d1).Turn () != 4)
+			return 2;
+
+		if (((IVehicle)d2).Turn () != 7)
+			return 3;
+
+		if (b2.Turn () != 8)
+			return 4;
+		
+		if (((IVehicle)b2).Turn () != 7)
+			return 5;
+		
+		//Console.WriteLine ("TEST {0}", ((IVehicle)b2).Turn ());	
+
+		return 0;
+	}
+}
+
diff --git a/mcs/tests/test-95.cs b/mcs/tests/test-95.cs
new file mode 100755
index 00000000000..8a134a566e1
--- /dev/null
+++ b/mcs/tests/test-95.cs
@@ -0,0 +1,18 @@
+class X {
+
+	double d = 0;
+
+	X ()
+	{
+	}
+
+	static int Main ()
+	{
+		X x = new X ();
+
+		if (x.d != 0)
+			return 1;
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-96.cs b/mcs/tests/test-96.cs
new file mode 100755
index 00000000000..718a95f1749
--- /dev/null
+++ b/mcs/tests/test-96.cs
@@ -0,0 +1,20 @@
+//
+// Compilation test
+//
+// This used to be a bug in the name lookups in delegate declarations
+//
+namespace N1
+{	
+	public class A
+	{		
+		static int Main  ()
+		{
+			return 0;
+		}
+	}
+
+	//
+	// A used to not be resolved
+	//
+	public delegate void C(object sender, A a);
+}
diff --git a/mcs/tests/test-97.cs b/mcs/tests/test-97.cs
new file mode 100755
index 00000000000..612185cf1aa
--- /dev/null
+++ b/mcs/tests/test-97.cs
@@ -0,0 +1,18 @@
+//
+// This test excercises the simple name lookups on
+// unfinished enumerations.
+//
+
+public enum FL { 
+	EMPTY = 0, 
+	USHIFT = 11, 
+	USER0 = (1<<(USHIFT+0)),
+}
+
+class X {
+
+	static int Main ()
+	{
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-98.cs b/mcs/tests/test-98.cs
new file mode 100755
index 00000000000..17842abe407
--- /dev/null
+++ b/mcs/tests/test-98.cs
@@ -0,0 +1,18 @@
+class X {
+	int a;
+	Y x;
+	
+	void b ()
+	{
+		if (x.a == 1)
+			return;
+	}
+}
+
+class Y : X {
+
+	public static int Main ()
+	{
+		return 0;
+	}
+}
diff --git a/mcs/tests/test-99.cs b/mcs/tests/test-99.cs
new file mode 100755
index 00000000000..385330dfa55
--- /dev/null
+++ b/mcs/tests/test-99.cs
@@ -0,0 +1,25 @@
+using System;
+class X {
+	enum A : int {
+		a = 1, b, c
+	}
+	
+	static int Main ()
+	{
+		int v = 1;
+		object foo = (v + A.a);
+		object foo2 = (1 + A.a);
+
+		if (foo.GetType ().ToString () != "X+A"){
+			Console.WriteLine ("Expression evaluator bug in E operator + (U x, E y)");
+			return 1;
+		}
+		
+		if (foo2.GetType ().ToString () != "X+A"){
+			Console.WriteLine ("Constant folder bug in E operator + (U x, E y)");
+			return 2;
+		}
+
+		return 0;
+	}
+}
diff --git a/mcs/tests/try.cs b/mcs/tests/try.cs
new file mode 100755
index 00000000000..5bc1d408d0c
--- /dev/null
+++ b/mcs/tests/try.cs
@@ -0,0 +1,53 @@
+class t {
+
+	void a ()
+	{
+		int b;
+		
+		try {
+			b = 1;
+		} catch {
+			b = 2;
+		}
+	}
+
+	void b ()
+	{
+		int a;
+
+		try {
+			a = 1;
+		} catch (Exception) {
+			a = 2;
+		}
+	}
+
+	void c ()
+	{
+		int a;
+
+		try {
+			a = 2;
+		} catch (Exception e) {
+			a = 0x3;
+		} catch {
+			a = 0x1;
+		}
+	}
+
+	void d ()
+	{
+		int a;
+
+		try {
+			a = 2;
+		} catch (Exception e) {
+			a = 0x3;
+		} catch {
+			a = 0x1;
+		} finally {
+			a = 111;
+		}
+	}
+}
+			
diff --git a/mcs/tests/unsafe-1.cs b/mcs/tests/unsafe-1.cs
new file mode 100755
index 00000000000..b49bc0fe277
--- /dev/null
+++ b/mcs/tests/unsafe-1.cs
@@ -0,0 +1,163 @@
+//
+// Tests unsafe operators.  address-of, dereference, member access
+//
+using System;
+
+unsafe struct Y {
+	public int a;
+	public int s;
+}
+
+unsafe class X {
+	static int TestDereference ()
+	{
+		Y y;
+		Y *z; 
+		Y a;
+
+		z = &y;
+		y.a = 1;
+		y.s = 2;
+
+		a.a = z->a;
+		a.s = z->s;
+
+		if (a.a != y.a)
+			return 1;
+		if (a.s != y.s)
+			return 2;
+
+		return 0;
+	}
+
+	static int TestPtrAdd ()
+	{
+		int [] a = new int [10];
+		int i;
+		
+		for (i = 0; i < 10; i++)
+			a [i] = i;
+
+		i = 0;
+		fixed (int *b = &a [0]){ 
+			int *p = b;
+
+			for (i = 0; i < 10; i++){
+				if (*p != a [i])
+					return 10+i;
+				p++;
+			}
+		}
+		return 0;
+	}
+
+	static int i = 1;
+	static char c = 'a';
+	static long l = 123;
+	static double d = 1.2;
+	static float f = 1.3F;
+	static short s = 4;
+	
+	static int TestPtrAssign ()
+	{
+
+		fixed (int *ii = &i){
+			*ii = 10;
+		}
+
+		fixed (char *cc = &c){
+			*cc = 'b';
+		}
+
+		fixed (long *ll = &l){
+			*ll = 100;
+		}
+
+		fixed (double *dd = &d){
+			*dd = 3.0;
+		}
+
+		fixed (float *ff = &f){
+			*ff = 1.2F;
+		}
+
+		fixed (short *ss = &s){
+			*ss = 102;
+		}
+
+		if (i != 10)
+			return 100;
+		if (c != 'b')
+			return 101;
+		if (l != 100)
+			return 102;
+		if (d != 3.0)
+			return 103;
+		if (f != 1.2F)
+			return 104;
+		if (s != 102)
+			return 105;
+		return 0;
+	}
+
+	static int TestPtrArithmetic ()
+	{
+		char [] array = new char [10];
+		char *pb;
+
+		array [5] = 'j';
+		fixed (char *pa = array){
+			pb = pa + 1;
+
+
+			//
+			// This one tests pointer element access
+			//
+			if (pa [5] != 'j')
+				return 199;
+			
+			Console.WriteLine ("V: " + (pb - pa));
+			if ((pb - pa) != 1)
+				return 200;
+
+			pb++;
+
+			if (pb == pa)
+				return 201;
+			if (pb < pa)
+				return 202;
+			if (pa > pb)
+				return 203;
+			if (pa >= pb)
+				return 204;
+			if (pb <= pa)
+				return 205;
+			pb = pb - 2;
+			if (pb != pa){
+				Console.WriteLine ("VV: " + (pb - pa));
+				return 206;
+			}
+		}
+
+		return 0;
+	}
+	
+	static int Main ()
+	{
+		int v;
+
+		if ((v = TestDereference ()) != 0)
+			return v;
+
+		if ((v = TestPtrAdd ()) != 0)
+			return v;
+
+		if ((v = TestPtrAssign ()) != 0)
+			return v;
+
+		if ((v = TestPtrArithmetic ()) != 0)
+			return v;
+		Console.WriteLine ("Ok");
+		return 0;
+	}
+}
diff --git a/mcs/tests/unsafe-2.cs b/mcs/tests/unsafe-2.cs
new file mode 100755
index 00000000000..adedee29633
--- /dev/null
+++ b/mcs/tests/unsafe-2.cs
@@ -0,0 +1,25 @@
+//
+// This test excercises stackalloc, some pointer arithmetic,
+// and dereferences
+//
+using System;
+unsafe class X {
+	static int Main ()
+	{
+		char *ptr = stackalloc char [10];
+		int i;
+		
+		for (i = 0; i < 10; i++)
+			ptr [i] = (char) (i + 10);
+
+		for (i = 0; i < 10; i++){
+			if (*ptr != (char) (i + 10))
+				return 200 + i;
+			ptr++;
+		}
+		Console.WriteLine ("Ok");
+		return 0;
+	}
+}	
+
+
diff --git a/mcs/tests/unsafe-3.cs b/mcs/tests/unsafe-3.cs
new file mode 100644
index 00000000000..371b5bcdac2
--- /dev/null
+++ b/mcs/tests/unsafe-3.cs
@@ -0,0 +1,31 @@
+// this tests making a pointer to a pointer
+
+using System;
+
+unsafe class Foo
+{
+	public static int Main ()
+	{
+		int a;
+		int *b;
+		int **c;
+
+		a = 42;
+		b = &a;
+		c = &b;
+		
+		Console.WriteLine ("*c == b : {0}", *c == b);
+		Console.WriteLine ("**c == a : {0}", **c == a);
+
+		if (*c == b && **c == a)
+		{
+			Console.WriteLine ("Test passed");
+			return 0;
+		}
+		else
+		{
+			Console.WriteLine ("Test failed");
+			return 1;
+		}
+	}
+}
diff --git a/mcs/tests/unsafe-4.cs b/mcs/tests/unsafe-4.cs
new file mode 100755
index 00000000000..730bb4915a1
--- /dev/null
+++ b/mcs/tests/unsafe-4.cs
@@ -0,0 +1,21 @@
+unsafe class X {
+	static int v;
+	static int v_calls;
+	
+	static int* get_v ()
+	{
+		v_calls++;
+		return &v;
+	}
+	
+	static int Main ()
+	{
+		if ((*get_v ())++ != 0)
+			return 1;
+		if (v != 1)
+			return 2;
+		if (v_calls != 1)
+			return 3;
+		return 0;
+	}
+}
diff --git a/mcs/tests/verify-1.cs b/mcs/tests/verify-1.cs
new file mode 100644
index 00000000000..8c4a840918c
--- /dev/null
+++ b/mcs/tests/verify-1.cs
@@ -0,0 +1,40 @@
+using System;
+class T {
+        int stuff () {
+		try {
+			throw new Exception ();
+		} finally {
+			stuff_finally ();
+		}
+        }
+        int stuff2 () {
+		try {
+			throw new Exception ();
+		} catch {
+			try {
+				throw new Exception ();
+			} finally {
+				stuff_finally ();
+			}
+		} finally {
+			stuff_finally ();
+		}
+        }
+        int stuff3 () {
+		try {
+			throw new Exception ();
+		} catch {
+			try {
+				throw new Exception ();
+			} finally {
+				stuff_finally ();
+			}
+		} finally {
+			stuff_finally ();
+		}
+        }
+        void stuff_finally () {
+        }
+        static void Main() {
+        }
+}
diff --git a/mcs/tests/verify-2.cs b/mcs/tests/verify-2.cs
new file mode 100644
index 00000000000..e0655b25609
--- /dev/null
+++ b/mcs/tests/verify-2.cs
@@ -0,0 +1,41 @@
+using System;
+
+class X {
+	~X ()
+	{
+		Console.WriteLine ("DESTRUCTOR!");
+	}
+
+        public static int Test1()
+	{
+                try {
+                        return 8;
+                } catch (Exception) {}  
+                System.Console.WriteLine("Shouldn't get here");
+		return 9;
+        }
+
+	public static void Test2()
+	{
+		int[] vars = { 3, 4, 5 };
+
+		foreach (int a in vars) {
+			try {
+				continue;
+			} catch (Exception) {
+				break;
+			}
+		}
+	}
+
+        public static void Main() {
+		Test1 ();
+		Test2 ();
+
+                try {
+                        return;
+                } catch (Exception) {}  
+                System.Console.WriteLine("Shouldn't get here");
+		return;
+        }
+}
diff --git a/mcs/tests/verify-3.cs b/mcs/tests/verify-3.cs
new file mode 100644
index 00000000000..4c13a026fb6
--- /dev/null
+++ b/mcs/tests/verify-3.cs
@@ -0,0 +1,12 @@
+using System;
+
+public delegate void MyEventHandler (int a);
+
+public class X
+{
+	public static event MyEventHandler TestEvent;
+
+	public static void Main ()
+	{
+	}
+}
diff --git a/mcs/tools/.cvsignore b/mcs/tools/.cvsignore
new file mode 100644
index 00000000000..7d47302f00a
--- /dev/null
+++ b/mcs/tools/.cvsignore
@@ -0,0 +1,4 @@
+*.pdb
+*.exe
+*.dll
+cormissing.xml
diff --git a/mcs/tools/ChangeLog b/mcs/tools/ChangeLog
new file mode 100644
index 00000000000..da21df1c32e
--- /dev/null
+++ b/mcs/tools/ChangeLog
@@ -0,0 +1,124 @@
+2002-03-09  Martin Baulig  <martin@gnome.org>

+

+	* DumpCultureInfo.cs: New tool to dump culture info. Incomplete,

+	we need to get unicode support working before we can use this.

+

+2002-03-05  Gaurav Vaish <gvaish@iitk.ac.in>

+

+	* GenerateDelegate.cs: Generates delegates (EventHandler) as

+	  specified. The output is quite simple, a delegate that has

+	  the prototype as -->

+	  public delegate void <given-name>EventHandler(object sender,

+	     <given-name>EventArgs e)

+

+2002-03-01  Martin Baulig  <martin@gnome.org>

+

+	* scan-tests.pl: Catch exceptions when running the tests so that we

+	always run all the tests in a test suite even if some of them fail.

+

+2002-02-27  Martin Baulig  <martin@gnome.org>

+

+	* scan-tests.pl: Moved this script here from ../class/corlib/Test.

+

+2002-02-22  Nick Drochak  <ndrochak@gol.com>

+

+	* makefile: move corcompare to it's own directory to hold multiple

+	class files.  still makes old corcompare for now.  will remove that

+	soon.

+

+2002-02-18  Duncan Mak  <duncan@ximian.com>

+

+	* serialize.cs: When appropriate, changed Type.GetType calls to

+	the faster typeof operator.

+

+2002-02-19  Nick Drochak  <ndrochak@gol.com>

+

+	* corcompare.cs: Reorganized into collaberating classes to analyze

+	and generate reports.  Still needs to find the MonoTODO's, and

+	has a little more prototype code in there, but it's almost done.

+

+	* makefile: output XML file in the tools directory for now.

+

+2002-02-15  Nick Drochak  <ndrochak@gol.com>

+

+	* corcompare.cs: Adding stuff to collect all the missing and todo

+	information need to generate nice looking HTML pages.  Not quite 

+	done and needs some re-org, but Duncan can take a look.

+

+	* sample.xml: an example of how the XML will look that corcompare

+	will generate.  Can be used to start working on the XSLT.

+

+2002-02-13  Nick Drochak  <ndrochak@gol.com>

+

+	* makefile: 'clean' target now removes file generated by CorCompare

+

+2002-02-03  Duncan Mak  <duncan@ximian.com>

+

+	* serialize.cs: Added namespace block.

+

+2002-02-01  Duncan Mak  <duncan@ximian.com>

+

+	* serialize.cs: Added a new tool for serializing objects. It

+	can create new types dynamically, but can only handle

+	arguments that are of primitive types.

+

+2002-01-26  Gaurav Vaish <gvaish@iitk.ac.in>

+

+	* EnumCheckAssemblyCollection.cs,

+	* assemblies.xml:  Files related to EnumCheck checked-in. Now EnumCheck does

+	                   not have any path hardcoded. It takes the assemblies to

+	                   search from a xml files, which by default is assemblies.xml

+

+2002-01-25  Nick Drochak  <ndrochak@gol.com>

+

+	* .cvsignore: ignore .dll files now since we build NUnitCore.dll ourselves

+

+2002-01-18  Duncan Mak  <duncan@ximian.com>

+

+	* EnumCheck.cs: A checkin for Miguel to make EnumCheck not hardcode

+	path to corlib.dll.

+

+2002-01-19  Nick Drochak  <ndrochak@gol.com>

+

+	* makefile: corcompare works again now, so make xml of missing types

+	* CorCompare.cs: use exception that .NET v1 throws to get types in mono corlib

+

+2002-01-18  Nick Drochak  <ndrochak@gol.com>

+

+	* makefile: remove path to beta2 csc.exe.  path to csc.exe must be in PATH instead.

+	don't generate xml from corcompare for now.  it throws an error on v1.0 of .NET

+

+2002-01-17  Nick Drochak  <ndrochak@gol.com>

+

+	* IFaceDisco.cs, XMLUtil.cs: Added new files for interface discovery tool.

+	* makefile: added target for IFaceDisco.exe and added to clean target for same

+

+2002-01-08  John Barnette <jbarn@httcb.net>

+

+	* Removed todo.cs and related makefile data.

+

+

+

+2002-01-07  John Barnette <jbarn@httcb.net>

+

+	

+

+	* makefile: added todo target, fixed EnumCheck target, simplified clean

+

+	

+	* todo.cs: new file.  generates todo list XML and compares assemblies

+

+

+

+2002-01-07  Gaurav Vaish <gvaish@iitk.ac.in>

+

+	* EnumCheck.cs:  Get the numerical values of an enumeration.

+

+2002-01-06  Nick Drochak  <ndrochak@gol.com>

+

+	* corcompare.cs: Catch the FileNotFoundException and handle it nicely.

+

+2002-01-05  Nick Drochak  <ndrochak@gol.com>

+

+	* makefile: build corcompare

+	* corcompare.cs: add new file.  compares an assembly with mscorlib

diff --git a/mcs/tools/DumpCultureInfo.cs b/mcs/tools/DumpCultureInfo.cs
new file mode 100755
index 00000000000..a3c93fafa03
--- /dev/null
+++ b/mcs/tools/DumpCultureInfo.cs
@@ -0,0 +1,176 @@
+using System;
+using System.Threading;
+using System.Globalization;
+
+namespace Mono.Tools {
+
+        public class DumpCultureInfo {
+
+		internal static string ToUnicode (string input)
+		{
+			string output = "";
+			for (int i = 0; i < input.Length; i++) {
+				int chr = input [i];
+				output += "\\x" + chr.ToString ("x4");
+			}
+
+			return output;
+		}
+
+		public static void DumpNumberFormatInfo (CultureInfo culture)
+		{
+			NumberFormatInfo nfi = culture.NumberFormat;
+
+			string currency_group_sizes = "";
+			{
+				int[] group_sizes = nfi.CurrencyGroupSizes;
+
+				currency_group_sizes = "new int[" + group_sizes.Length + "] { ";
+				for (int i = 0; i < group_sizes.Length; i++) {
+					if (i > 0) currency_group_sizes += ", ";
+					currency_group_sizes += group_sizes[i] + " ";
+				}
+				currency_group_sizes += "}";
+			}
+
+			string number_group_sizes = "";
+			{
+				int[] group_sizes = nfi.NumberGroupSizes;
+
+				number_group_sizes = "new int[" + group_sizes.Length + "] { ";
+				for (int i = 0; i < group_sizes.Length; i++) {
+					if (i > 0) number_group_sizes += ", ";
+					number_group_sizes += group_sizes[i] + " ";
+				}
+				number_group_sizes += "}";
+			}
+
+			string percent_group_sizes = "";
+			{
+				int[] group_sizes = nfi.PercentGroupSizes;
+
+				percent_group_sizes = "new int[" + group_sizes.Length + "] { ";
+				for (int i = 0; i < group_sizes.Length; i++) {
+					if (i > 0) percent_group_sizes += ", ";
+					percent_group_sizes += group_sizes[i] + " ";
+				}
+				percent_group_sizes += "}";
+			}
+
+
+			Object[] data = { "\t\t\t\t",
+					  nfi.CurrencyDecimalDigits,
+					  ToUnicode (nfi.CurrencyDecimalSeparator),
+					  ToUnicode (nfi.CurrencyGroupSeparator),
+					  currency_group_sizes,
+					  nfi.CurrencyNegativePattern,
+					  nfi.CurrencyPositivePattern,
+					  ToUnicode (nfi.CurrencySymbol),
+					  ToUnicode (nfi.NaNSymbol),
+					  ToUnicode (nfi.NegativeInfinitySymbol),
+					  ToUnicode (nfi.NegativeSign),
+					  nfi.NumberDecimalDigits,
+					  ToUnicode (nfi.NumberDecimalSeparator),
+					  ToUnicode (nfi.NumberGroupSeparator),
+					  number_group_sizes,
+					  nfi.NumberNegativePattern,
+					  nfi.PercentDecimalDigits,
+					  ToUnicode (nfi.PercentDecimalSeparator),
+					  ToUnicode (nfi.PercentGroupSeparator),
+					  percent_group_sizes,
+					  nfi.PercentNegativePattern,
+					  nfi.PercentPositivePattern,
+					  ToUnicode (nfi.PercentSymbol),
+					  ToUnicode (nfi.PerMilleSymbol),
+					  ToUnicode (nfi.PositiveInfinitySymbol),
+					  ToUnicode (nfi.PositiveSign)
+			};
+
+			string format = "{0}currencyDecimalDigits\t\t= {1};\n"
+				+ "{0}currencyDecimalSeparator\t= \"{2}\";\n"
+				+ "{0}currencyGroupSeparator\t\t= \"{3}\";\n"
+				+ "{0}currencyGroupSizes\t\t= {4};\n"
+				+ "{0}currencyNegativePattern\t\t= {5};\n"
+				+ "{0}currencyPositivePattern\t\t= {6};\n"
+				+ "{0}currencySymbol\t\t\t= \"{7}\";\n\n"
+				+ "{0}naNSymbol\t\t\t= \"{8}\";\n"
+				+ "{0}negativeInfinitySymbol\t\t= \"{9}\";\n"
+				+ "{0}negativeSign\t\t\t= \"{10}\";\n\n"
+				+ "{0}numberDecimalDigits\t\t= {11};\n"
+				+ "{0}numberDecimalSeparator\t\t= \"{12}\";\n"
+				+ "{0}numberGroupSeparator\t\t= \"{13}\";\n"
+				+ "{0}numberGroupSizes\t\t= {14};\n"
+				+ "{0}numberNegativePattern\t\t= {15};\n"
+				+ "{0}percentDecimalDigits\t\t= {16};\n"
+				+ "{0}percentDecimalSeparator\t\t= \"{17}\";\n"
+				+ "{0}percentGroupSeparator\t\t= \"{18}\";\n"
+				+ "{0}percentGroupSizes\t\t= {19};\n"
+				+ "{0}percentNegativePattern\t\t= {20};\n"
+				+ "{0}percentPositivePattern\t\t= {21};\n"
+				+ "{0}percentSymbol\t\t\t= \"{22}\";\n\n"
+				+ "{0}perMilleSymbol\t\t\t= \"{23}\";\n"
+				+ "{0}positiveInfinitySymbol\t\t= \"{24}\";\n"
+				+ "{0}positiveSign\t\t\t= \"{25}\";\n";
+
+			string output = String.Format (format, data);
+
+			Object[] data2 = { "\t\t\t\t", "\t\t\t", culture.EnglishName,
+					   culture.LCID.ToString ("x4"), output };
+
+			string format2 = "{0}// {2}\n{1}case 0x{3}:\n{0}readOnly = false;\n\n"
+				+ "{4}\n{0}break;\n\n";
+
+			Console.WriteLine (String.Format (format2, data2));
+		}
+
+		public static int[] AllCultures = {
+			0x007F, 0x0001, 0x0401, 0x0801, 0x0C01, 0x1001, 0x1401, 0x1801,
+			0x1C01, 0x2001, 0x2401, 0x2801, 0x2C01, 0x3001, 0x3401, 0x3801,
+			0x3C01, 0x4001, 0x0002, 0x0402, 0x0003, 0x0403, 0x0004, 0x0404,
+			0x0804, 0x0C04, 0x1004, 0x1404, 0x7C04, 0x0005, 0x0405, 0x0006,
+			0x0406, 0x0007, 0x0407, 0x0807, 0x0C07, 0x1007, 0x1407, 0x0008,
+			0x0408, 0x0009, 0x0409, 0x0809, 0x0C09, 0x1009, 0x1409, 0x1809,
+			0x1C09, 0x2009, 0x2409, 0x2809, 0x2C09, 0x3009, 0x3409, 0x000A,
+			0x080A, 0x0C0A, 0x100A, 0x140A, 0x180A, 0x1C0A, 0x200A, 0x240A,
+			0x280A, 0x2C0A, 0x300A, 0x340A, 0x380A, 0x3C0A, 0x400A, 0x440A,
+			0x480A, 0x4C0A, 0x500A, 0x000B, 0x040B, 0x000C, 0x040C, 0x080C,
+			0x0C0C, 0x100C, 0x140C, 0x180C, 0x000D, 0x040D, 0x000E, 0x040E,
+			0x000F, 0x040F, 0x0010, 0x0410, 0x0810, 0x0011, 0x0411, 0x0012,
+			0x0412, 0x0013, 0x0413, 0x0813, 0x0014, 0x0414, 0x0814, 0x0015,
+			0x0415, 0x0016, 0x0416, 0x0816, 0x0018, 0x0418, 0x0019, 0x0419,
+			0x001A, 0x041A, 0x081A, 0x0C1A, 0x001B, 0x041B, 0x001C, 0x041C,
+			0x001D, 0x041D, 0x081D, 0x001E, 0x041E, 0x001F, 0x041F, 0x0020,
+			0x0420, 0x0021, 0x0421, 0x0022, 0x0422, 0x0023, 0x0423, 0x0024,
+			0x0424, 0x0025, 0x0425, 0x0026, 0x0426, 0x0027, 0x0427, 0x0029,
+			0x0429, 0x002A, 0x042A, 0x002B, 0x042B, 0x002C, 0x042C, 0x082C,
+			0x002D, 0x042D, 0x002F, 0x042F, 0x0036, 0x0436, 0x0037, 0x0437,
+			0x0038, 0x0438, 0x0039, 0x0439, 0x003E, 0x043E, 0x083E, 0x003F,
+			0x043F, 0x0040, 0x0440, 0x0041, 0x0441, 0x0043, 0x0443, 0x0843,
+			0x0044, 0x0444, 0x0046, 0x0446, 0x0047, 0x0447, 0x0049, 0x0449,
+			0x004A, 0x044A, 0x004B, 0x044B, 0x004E, 0x044E, 0x004F, 0x044F,
+			0x0050, 0x0450, 0x0056, 0x0456, 0x0057, 0x0457, 0x005A, 0x045A,
+			0x0065, 0x0465
+		};
+
+		public static int[] Cultures = {
+			// Invariant culture
+			0x007f,
+			// English
+			0x0409, 0x0809, 0x0c09, 0x1009,
+			// German
+			0x0407, 0x0807, 0x0c07, 0x1007, 0x1407
+		};
+
+		public static void Main ()
+		{
+			for (int i = 0; i < AllCultures.Length; i++) {
+				CultureInfo culture = new CultureInfo (AllCultures [i], false);
+
+				if (culture.IsNeutralCulture)
+					continue;
+
+				DumpNumberFormatInfo (culture);
+			}
+		}
+        }
+}
diff --git a/mcs/tools/EnumCheck.cs b/mcs/tools/EnumCheck.cs
new file mode 100644
index 00000000000..8c564cc7956
--- /dev/null
+++ b/mcs/tools/EnumCheck.cs
@@ -0,0 +1,132 @@
+/**

+ * Namespace: System.Web

+ * Class:     EnumCheck

+ *

+ * Author:  Gaurav Vaish

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.Xml;

+using System.Collections;

+using System.Reflection;

+

+namespace Mono.Enumerations

+{

+	public class EnumCheck

+	{

+		private string className;

+		private Type   type;

+		private EnumCheckAssemblyCollection ecac = new EnumCheckAssemblyCollection();

+		

+		public static string confFile = "assemblies.xml";

+

+		public EnumCheck(string className)

+		{

+			this.className = className;

+			ecac.Parse();

+		}

+

+		public void Display()

+		{

+			ecac.ConfigFile = confFile;

+			LoadType();

+			if(type == null || !type.IsEnum)

+			{

+				System.Console.Write("-->Failed to load the enumeration: " + className);

+				return;

+			}

+			Array ar = Enum.GetValues(type);

+			System.Console.WriteLine("-->Enumeration: {0}", type.ToString());

+			for(int i=0; i < ar.Length; i++)

+			{

+				Enum b = (Enum)ar.GetValue(i);

+				System.Console.Write(" {0}", Enum.Format(type, b, "G"));

+				System.Console.WriteLine(" ({0}) ", Enum.Format(type, b, "D"));

+			}

+		}

+

+		private void LoadType()

+		{

+			type = null;

+			foreach(string url in ecac)

+			{

+				try

+				{

+					Assembly assembly = Assembly.LoadFrom(url);

+					foreach(Type t in assembly.GetTypes())

+					{

+						if(!t.IsEnum)

+							continue;

+						if(className == t.ToString())

+						{

+							type = t;

+							break;

+						}

+					}

+				} catch(BadImageFormatException)

+				{

+				} catch(ReflectionTypeLoadException)

+				{

+				} catch(ArgumentException)

+				{

+				}

+				if(type != null)

+					return;

+			}

+		}

+

+		public static void PrintUsage()

+		{

+			System.Console.WriteLine("Usage:");

+			System.Console.WriteLine("EnumCheck [<enum> [<enum> [... ] ] ]");

+			System.Console.WriteLine("");

+			System.Console.WriteLine("enum := <namespace>[.<subnamespace>[...]].enum_name");

+			System.Console.WriteLine("");

+		}

+

+		public static void Main(string[] args)

+		{

+			if(args.Length > 0 && (args[0] == "--help" || args[0] == "-h"))

+			{

+				PrintUsage();

+				return;

+			}

+			EnumCheck check = null;

+			string bdir;

+			System.Console.Write("Enter assembly configuration file [{0}]:", confFile);

+			//System.Console.Write("[{0}]: ", confFile);

+			bdir = System.Console.ReadLine();

+			while(bdir.EndsWith("/") || bdir.EndsWith("\\"))

+			{

+				bdir = bdir.Substring(0, bdir.Length - 1);

+			}

+			if(bdir != "")

+			{

+				confFile = bdir;

+			}

+			if(args.Length != 0)

+			{

+				foreach(string clName in args)

+				{

+					check = new EnumCheck(clName);

+					check.Display();

+					System.Console.WriteLine("\n");

+				}

+			}

+			while(true)

+			{

+				System.Console.Write("Enter the name of the Enumeration (end to stop): ");

+				string clName = System.Console.ReadLine();

+				if(clName == "stop" || clName == "end" || clName.Length == 0)

+					break;

+				check = new EnumCheck(clName);

+				check.Display();

+				System.Console.WriteLine("\n");

+			}

+		}

+	}

+}

diff --git a/mcs/tools/EnumCheckAssemblyCollection.cs b/mcs/tools/EnumCheckAssemblyCollection.cs
new file mode 100644
index 00000000000..470492c25b5
--- /dev/null
+++ b/mcs/tools/EnumCheckAssemblyCollection.cs
@@ -0,0 +1,77 @@
+/**

+ * Namespace: System.Web

+ * Class:     EnumCheckAssembly

+ *

+ * Author:  Gaurav Vaish

+ * Contact: <gvaish@iitk.ac.in>

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2002)

+ */

+

+using System;

+using System.IO;

+using System.Xml;

+using System.Collections;

+using System.Reflection;

+

+namespace Mono.Enumerations

+{

+	public class EnumCheckAssemblyCollection: IEnumerable

+	{

+		public string ConfigFile = "assemblies.xml";

+		

+		private ArrayList assemblyList = new ArrayList();

+

+		public EnumCheckAssemblyCollection()

+		{

+		}

+

+		public void Parse()

+		{

+			Stream      fStream;

+			XmlReader   reader;

+			XmlDocument document;

+			string      url;

+

+			fStream = new FileStream(ConfigFile, FileMode.Open, FileAccess.Read, FileShare.Read);

+			reader = new XmlTextReader(fStream);

+			document = new XmlDocument();

+			document.Load(reader);

+			if(document.DocumentElement != null)

+			{

+				if(document.DocumentElement.LocalName == "assemblies")

+				{

+					foreach(XmlNode pathNode in document.DocumentElement)

+					{

+						if(pathNode.NodeType == XmlNodeType.Element && pathNode.LocalName=="path")

+						{

+							url = pathNode.Attributes["url"].Value;

+							while(url.EndsWith("\\") || url.EndsWith("/"))

+							{

+								url = url.Substring(0, url.Length - 1);

+							}

+							if(url == null || url.Length == 0)

+							{

+								continue;

+							}

+							foreach(XmlNode assemblyNode in pathNode.ChildNodes)

+							{

+								if(assemblyNode.LocalName == "assembly")

+								{

+									assemblyList.Add(url + "\\" + assemblyNode.Attributes["file"].Value);

+								}

+							}

+						}

+					}

+				}

+			}

+			fStream.Close();

+		}

+

+		public IEnumerator GetEnumerator()

+		{

+			return assemblyList.GetEnumerator();

+		}

+	}

+}

diff --git a/mcs/tools/GenerateDelegate.cs b/mcs/tools/GenerateDelegate.cs
new file mode 100644
index 00000000000..0ba8e78c0a0
--- /dev/null
+++ b/mcs/tools/GenerateDelegate.cs
@@ -0,0 +1,190 @@
+/**

+ * Namespace: com.mastergaurav.utils

+ * Class:     GenerateDelegate

+ *

+ * Author:  Gaurav Vaish

+ * Maintainer: gvaish@iitk.ac.in

+ * Contact: <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>

+ * Implementation: yes

+ * Status:  100%

+ *

+ * (C) Gaurav Vaish (2001)

+ */

+

+using System;

+using System.IO;

+

+namespace com.mastergaurav.Utils

+{

+	public class GenerateDelegate

+	{

+		public static string TargetDirectory = String.Empty;

+		public static string NamespaceName   = String.Empty;

+

+		public static readonly string PROLOGUE = "/**\n * Namespace: ";

+		public static readonly string DETAILS   = " *\n * Author: Gaurav Vaish\n" +

+		                                          " * Maintainer: gvaish@iitk.ac.in\n" +

+		                                          " * Contact:  <my_scripts2001@yahoo.com>, <gvaish@iitk.ac.in>\n" +

+		                                          " * Implementation: yes\n" +

+		                                          " * Status: 100%\n" +

+		                                          " *\n" +

+		                                          " * (C) Gaurav Vaish (2002)\n" +

+		                                          " */\n\n";

+		public static readonly string USING     = "using System;\n" +

+		                                          "using System.Web;\n" +

+		                                          "using System.Web.UI;\n\n";

+

+		public static readonly string NAMESPACE = "namespace ";

+

+		public static string AskForNamespace()

+		{

+			string nm = String.Empty;

+			System.Console.Write("Enter the name of the namespace: ");

+			nm = System.Console.ReadLine();

+			return nm;

+		}

+

+		public static string AskForMore()

+		{

+			string del = String.Empty;

+			System.Console.Write("Enter the name of the delegate (end to stop): ");

+			del = System.Console.ReadLine();

+			if(del == String.Empty || del == "end")

+				return String.Empty;

+			return del;

+		}

+

+		public static void Generate(string delName)

+		{

+			string fileName = TargetDirectory + "\\" + delName + "EventHandler.cs";

+			System.Console.Write("File: ");//, fileName);

+			System.Console.Write(fileName);

+			System.Console.Write("\tGenerating");

+

+			StreamWriter writer;

+			try

+			{

+				Stream stream = new FileStream(fileName, FileMode.Truncate, FileAccess.Write);

+				writer = new StreamWriter(stream);

+			} catch(FileNotFoundException)

+			{

+				writer = File.CreateText(fileName);

+			}

+			if(writer == null)

+			{

+				System.Console.WriteLine("Null writer...\n");

+				return;

+			}

+			writer.Write(PROLOGUE);

+			writer.Write(NamespaceName + "\n");

+			writer.Write(DETAILS);

+			writer.Write(NAMESPACE);

+			writer.Write(NamespaceName + "\n");

+			writer.Write("{\n");

+			writer.Write("\tpublic delegate void ");

+			writer.Write(delName);

+			writer.Write("EventHandler(object sender, ");

+			writer.Write(delName);

+			writer.Write("EventArgs e);\n");

+			writer.Write("}");

+

+			writer.Flush();

+			writer.Close();

+

+			System.Console.WriteLine("\tGenerated\n");

+		}

+

+		public static string GetTargetDir()

+		{

+			System.Console.Write("Enter target directory: ");

+			return System.Console.ReadLine();

+		}

+

+		public static void Usage(bool wrong)

+		{

+			if(wrong)

+			{

+				System.Console.WriteLine("Wrong # arguments.");

+			}

+			System.Console.WriteLine("Usage: GenerateDelegate [target-dir] [namespace] [delegate1 [delegate2 [...]]]");

+		}

+

+		public static bool IsHelp(string arg)

+		{

+			return (arg == "-h" || arg == "--help");

+		}

+

+		public static bool IsDirectory(string dirName)

+		{

+			FileAttributes attrs;

+			try

+			{

+				attrs = File.GetAttributes(dirName);

+				if( (attrs & FileAttributes.Directory) != FileAttributes.Directory)

+				{

+					Usage(true);

+					return false;

+				}

+			}catch(Exception e)

+			{

+				System.Console.WriteLine("Exception: {0}", e.ToString());

+				return false;

+			}

+			return true;

+		}

+

+		public static void Main(string[] args)

+		{

+			if(args.Length == 1 && IsHelp(args[0]))

+			{

+				Usage(false);

+				return;

+			}

+

+			if(args.Length == 0)

+			{

+				TargetDirectory = GetTargetDir();

+				while(TargetDirectory.EndsWith("\\"))

+				{

+					TargetDirectory = TargetDirectory.Substring(0, TargetDirectory.Length - 1);

+				}

+			} else

+			{

+				while(args[0].EndsWith("\\"))

+				{

+					args[0] = args[0].Substring(0, args[0].Length - 1);

+				}

+				TargetDirectory = args[0];

+			}

+

+			if(!IsDirectory(TargetDirectory))

+				return;

+

+			if(args.Length > 1)

+			{

+				NamespaceName = args[1];

+			} else

+			{

+				NamespaceName = AskForNamespace();

+			}

+

+			if(args.Length > 2)

+			{

+				int i=0;

+				foreach(string currArg in args)

+				{

+					if(i != 0)

+					{

+						Generate(currArg);

+					}

+					i++;

+				}

+			}

+			string delegateName = String.Empty;

+			while((delegateName = AskForMore()) != String.Empty)

+			{

+				Generate(delegateName);

+			}

+		}

+	}

+}

diff --git a/mcs/tools/IFaceDisco.cs b/mcs/tools/IFaceDisco.cs
new file mode 100644
index 00000000000..0f8a06225e9
--- /dev/null
+++ b/mcs/tools/IFaceDisco.cs
@@ -0,0 +1,105 @@
+// IFaceDisco.cs

+//

+// Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak

+

+using System;

+using System.Reflection;

+using System.Collections;

+using System.IO;

+

+namespace Mono.Util

+{

+	class IFaceDisco {

+		public static void Main(string[] args) {

+			Assembly					asm;

+			Type[]						asmTypes;

+			InterfaceMapping		map;

+			Type[]						interfaces;

+			ArrayList					TypesList					= new ArrayList();

+			ArrayList					implementingTypes	= new ArrayList();

+			string						asmFullPath				= null;

+			string						ifaceToDiscover		= null;

+			

+			if (args.Length < 1 || args.Length > 3) {

+				Usage();

+				return;

+			}

+

+			for (int i = 0; i < args.Length; i++) {

+				string arg = args[i];

+

+				if (arg.StartsWith("-") && ((i + 1) < args.Length)) {

+					if (arg == "--asm") {

+						asmFullPath = args[++i];

+					} else {

+						Usage();

+						return;

+					}

+				} else {

+					// allow only one interface to discover

+					if (ifaceToDiscover != null){

+						Usage();

+						return;

+					}

+					ifaceToDiscover = arg;

+				}

+			}

+

+			// find the assembly

+			if (null == asmFullPath){

+				asm = Assembly.GetAssembly(typeof (System.Object));

+			}

+			else {

+				try{

+					asm = Assembly.LoadFrom(asmFullPath);

+				}

+				catch(Exception e){

+					Console.WriteLine("Could not open assembly '{0}' for discovery. Error is: "+e.Message, asmFullPath);

+					return;

+				}

+			}

+			asmTypes = asm.GetTypes();

+

+			// examine all the public types

+			foreach(Type t in asmTypes) {

+				if (t.IsPublic) {

+					// find out which, if any, interfaces are "in" the type

+					interfaces= t.GetInterfaces();

+					if (null != interfaces){

+						// look for the interface we want to discover

+						foreach (Type iface in interfaces) {

+							// this area seems to throw an exception sometimes, just ignore it

+							try{

+								if (iface.FullName.ToLower() == args[0].ToLower()) {

+									// find out if this type is the one which "declares" the interface

+									map = t.GetInterfaceMap(iface);

+									if (map.TargetMethods[0].DeclaringType.FullName == t.FullName){

+										// if so, then we found a class to report

+										implementingTypes.Add(t.FullName);

+									} // if

+								}  // if

+							}catch{}

+						} // foreach

+					} // if

+				} // if

+			} // foreach

+

+			// sort the list to make it easier to find what you are looking for

+			implementingTypes.Sort();

+			Console.WriteLine(XMLUtil.ToXML(implementingTypes, "Type", "ImplementingTypes"));

+		} // Main()

+

+		private static void Usage() {

+			Console.WriteLine (

+				"Mono Interface Discovery Tool\n" +

+				"usage: ifacedisco [--asm assembly] interface\n\n" +

+				"  The full path to 'assembly' should be specified when using --asm.\n" +

+				"  If 'assembly' is not specified, the assembly that contains System.Object will be used.\n" +

+				"  Use the fully qualified form for 'interface', e.g. System.Runtime.Serialization.ISerializable\n"

+				);

+		} // Usage()

+

+	} // class IFaceDisco

+}  // namespace Mono.Util

diff --git a/mcs/tools/SqlSharp/SqlSharpCli.cs b/mcs/tools/SqlSharp/SqlSharpCli.cs
new file mode 100644
index 00000000000..87be0b72d8b
--- /dev/null
+++ b/mcs/tools/SqlSharp/SqlSharpCli.cs
@@ -0,0 +1,1214 @@
+//
+// SqlSharpCli.cs - main driver for SqlSharp
+//
+//                    Currently, only working on a command line interface for SqlSharp
+//
+//                    However, once GTK# and System.Windows.Forms are good-to-go,
+//                    I would like to create a SqlSharpGui using this.
+//
+//                    It would be nice if this is included as part of Mono
+//                    extra goodies under Mono.Data.SqlSharp.
+//
+//                    Also, this makes a good Test program for Mono System.Data.
+//                    For more information about Mono::, 
+//                    visit http://www.go-mono.com/
+//
+// To build SqlSharpCli.cs:
+// $ mcs SqlSharpCli.cs -r System.Data.dll
+//
+// To run with mono:
+// $ mono SqlSharpCli.exe
+//
+// To run with mint:
+// $ mint SqlSharpCli.exe
+//
+// To run batch commands and get the output, do something like:
+// $ cat commands.txt | mono SqlSharpCli.exe > results.txt
+//
+// Author:
+//    Daniel Morgan <danmorg@sc.rr.com>
+//
+// (C)Copyright 2002 Daniel Morgan
+//
+
+using System;
+using System.Collections;
+using System.Data;
+using System.Data.Common;
+using System.Data.OleDb;
+using System.Data.SqlClient;
+using System.IO;
+using System.Reflection;
+using System.Runtime.Remoting;
+using System.Text;
+
+namespace Mono.Data.SqlSharp {
+
+	public enum FileFormat {
+		Html,
+		Xml,
+		CommaSeparatedValues,
+		TabSeparated,
+		Normal
+	}
+
+	// SQL Sharp - Command Line Interface
+	public class SqlSharpCli {
+	
+		private IDbConnection conn = null;
+		
+		private string provider = "POSTGRESQL"; // name of internal provider
+		// {OleDb,SqlClient,MySql,Odbc,Oracle,PostgreSql} however, it
+		// can be set to LOADEXTPROVIDER to load an external provider
+		private string providerAssembly = ""; // filename of assembly
+		// for example: "Mono.Data.MySql"
+		private string providerConnectionClass = ""; // Connection class
+		// in the provider assembly that implements the IDbConnection 
+		// interface.  for example: "Mono.Data.MySql.MySqlConnection"
+
+		private StringBuilder build = null; // SQL string to build
+		private string buff = ""; // SQL string buffer
+
+		private string connectionString = 
+			"host=localhost;dbname=test;user=postgres";
+
+		private string inputFilename = "";
+		private string outputFilename = "";
+		private StreamReader inputFilestream = null;
+		private StreamWriter outputFilestream = null;
+
+		private FileFormat outputFileFormat = FileFormat.Html;
+
+		private bool silent = false;
+		private bool showHeader = true;
+
+		private Hashtable internalVariables = new Hashtable();
+		
+		// DisplayResult - used to Read() display a result set
+		//                   called by DisplayData()
+		public void DisplayResult(IDataReader reader, DataTable schemaTable) {
+
+			StringBuilder line = null;
+			StringBuilder hdrUnderline = null;
+			
+			int spacing = 0;
+			int columnSize = 0;
+			int c;
+			
+			char spacingChar = ' '; // a space
+			char underlineChar = '='; // an equal sign
+
+			string dataType; // .NET Type
+			string dataTypeName; // native Database type
+			DataRow row; // schema row
+
+			line = new StringBuilder();
+			hdrUnderline = new StringBuilder();
+
+			OutputLine("Fields in Query Result: " + 
+				reader.FieldCount);
+			OutputLine("");
+			
+			for(c = 0; c < schemaTable.Rows.Count; c++) {
+							
+				DataRow schemaRow = schemaTable.Rows[c];
+				string columnHeader = (string) schemaRow["ColumnName"];
+				int columnHeaderSize = columnHeader.Length;
+				
+				line.Append(columnHeader);
+				hdrUnderline.Append(underlineChar, columnHeaderSize);
+					
+				// spacing
+				columnSize = (int) schemaRow["ColumnSize"];
+				dataType = (string) schemaRow["DataType"];
+				dataTypeName = reader.GetDataTypeName(c);
+				
+				// columnSize correction based on data type
+				if(dataType.Equals("System.Boolean")) {
+					columnSize = 5;
+				}
+				if(provider.Equals("POSTGRESQL"))
+					if(dataTypeName.Equals("text"))				
+						columnSize = 32; // text will be truncated to 32
+
+				if(columnHeaderSize < columnSize) {
+					spacing = columnSize - columnHeaderSize;
+					line.Append(spacingChar, spacing);
+					hdrUnderline.Append(underlineChar, spacing);
+				}
+				line.Append(" ");
+				hdrUnderline.Append(" ");
+			}
+			OutputHeader(line.ToString());
+			line = null;
+			
+			OutputHeader(hdrUnderline.ToString());
+			OutputHeader("");
+			hdrUnderline = null;
+			
+			// DEBUG - need to know the columnSize
+			/*
+			line = new StringBuilder();
+			foreach(DataRow schemaRow in schemaTable.Rows) {
+				columnSize = (int) schemaRow["ColumnSize"];
+				line.Append(columnSize.ToString());
+				line.Append(" ");
+			}		
+			Console.WriteLine(line.ToString());
+			Console.WriteLine();
+			line = null;
+			*/
+								
+			int rows = 0;
+
+			// column data
+			while(reader.Read()) {
+				rows++;
+
+				line = new StringBuilder();
+				for(c = 0; c < reader.FieldCount; c++) {
+					int dataLen = 0;
+					string dataValue;
+					
+					row = schemaTable.Rows[c];
+					string colhdr = (string) row["ColumnName"];
+					columnSize = (int) row["ColumnSize"];
+					dataType = (string) row["DataType"];
+					dataTypeName = reader.GetDataTypeName(c);
+					
+					// certain types need to have the
+					// columnSize adjusted for display
+					// so the column will line up for each
+					// row and match the column header size
+					if(dataType.Equals("System.Boolean")) {
+						columnSize = 5;
+					}
+					if(provider.Equals("POSTGRESQL"))
+						if(dataTypeName.Equals("text"))				
+							columnSize = 32; // text will be truncated to 32
+												
+					if(reader.IsDBNull(c)) {
+						dataValue = "";
+						dataLen = 0;
+					}
+					else {
+						object obj = reader.GetValue(c);						
+							
+						dataValue = obj.ToString();
+						dataLen = dataValue.Length;
+						line.Append(dataValue);
+					}
+					line.Append(" ");
+
+					// spacing
+					spacingChar = ' ';
+					if(dataLen < columnSize) {
+						spacing = columnSize - dataLen;
+						line.Append(spacingChar, spacing);
+					}
+					spacingChar = ' ';
+					if(columnSize < colhdr.Length) {
+						spacing = colhdr.Length - columnSize;
+						line.Append(spacingChar, spacing);
+					}
+						
+				}
+				OutputData(line.ToString());
+				line = null;
+			}
+			OutputLine("\nRows retrieved: " + rows.ToString());
+		}
+		
+		public void OutputDataToHtmlFile(IDataReader rdr, DataTable dt) {
+                        		

+			StringBuilder strHtml = new StringBuilder();

+

+			strHtml.Append("<html> \n <head> <title>");

+			strHtml.Append("Results");

+			strHtml.Append("</title> </head>");

+			strHtml.Append("<body>");

+			strHtml.Append("<h1> Results </h1>");

+			strHtml.Append("<table border=1>");

+		

+			outputFilestream.WriteLine(strHtml.ToString());

+

+			strHtml = null;

+			strHtml = new StringBuilder();

+

+			strHtml.Append("<tr>");

+			foreach (DataRow schemaRow in dt.Rows) {

+				strHtml.Append("<td> <b>");

+				object dataObj = schemaRow["ColumnName"];

+				string sColumnName = dataObj.ToString();

+				strHtml.Append(sColumnName);

+				strHtml.Append("</b> </td>");

+			}

+			strHtml.Append("</tr>");

+			outputFilestream.WriteLine(strHtml.ToString());

+			strHtml = null;

+

+			int col = 0;

+			string dataValue = "";

+			

+			while(rdr.Read()) {

+				strHtml = new StringBuilder();

+

+				strHtml.Append("<tr>");

+				for(col = 0; col < rdr.FieldCount; col++) {

+						

+					// column data

+					if(rdr.IsDBNull(col) == true)

+						dataValue = "NULL";

+					else {

+						object obj = rdr.GetValue(col);

+						dataValue = obj.ToString();

+					}

+					strHtml.Append("<td>");

+					strHtml.Append(dataValue);

+					strHtml.Append("</td>");

+				}

+				strHtml.Append("\t\t</tr>");

+				outputFilestream.WriteLine(strHtml.ToString());

+				strHtml = null;

+			}

+			outputFilestream.WriteLine(" </table> </body> \n </html>");

+			strHtml = null;

+		}
+		
+		// DisplayData - used to display any Result Sets
+		//                 from execution of SQL SELECT Query or Queries
+		//                 called by DisplayData. 
+		//                 ExecuteSql() only calls this function
+		//                 for a Query, it does not get
+		//                 for a Command.
+		public void DisplayData(IDataReader reader) {
+
+			DataTable schemaTable = null;
+			int ResultSet = 0;
+
+			OutputLine("Display any result sets...");
+
+			do {
+				// by Default, SqlDataReader has the 
+				// first Result set if any
+
+				ResultSet++;
+				OutputLine("Display the result set " + ResultSet);
+				
+				schemaTable = reader.GetSchemaTable();
+				
+				if(reader.RecordsAffected >= 0) {
+					// SQL Command (INSERT, UPDATE, or DELETE)
+					// RecordsAffected >= 0
+					Console.WriteLine("SQL Command Records Affected: " + reader.RecordsAffected);
+				}
+				else if(schemaTable == null) {
+					// SQL Command (not INSERT, UPDATE, nor DELETE)
+					// RecordsAffected -1 and DataTable has a null reference
+					Console.WriteLine("SQL Command Executed.");
+				}
+				else {
+					// SQL Query (SELECT)
+					// RecordsAffected -1 and DataTable has a reference
+					OutputQueryResult(reader, schemaTable);
+				}
+
+				// get next result set (if anymore is left)
+			} while(reader.NextResult());
+		}
+
+		public void OutputQueryResult(IDataReader dreader, DataTable dtable) {
+			if(outputFilestream == null) {
+				DisplayResult(dreader, dtable);
+			}
+			else {
+				switch(outputFileFormat) {
+				case FileFormat.Normal:
+					DisplayResult(dreader, dtable);
+					break;
+				case FileFormat.Html:
+					OutputDataToHtmlFile(dreader, dtable);
+					break;
+				default:
+					Console.WriteLine("Error: Output data file format not supported.");
+					break;
+				}
+			}
+		}
+
+		public void BuildParameters(IDbCommand cmd) {
+			ParametersBuilder parmsBuilder = 

+				new ParametersBuilder(cmd, 

+				BindVariableCharacter.Semicolon);

+			

+			Console.WriteLine("GetParms...");

+			parmsBuilder.ParseParameters();

+			IList parms = (IList) cmd.Parameters;

+		

+			Console.WriteLine("Print each parm...");

+			for(int p = 0; p < parms.Count; p++) {

+				string theParmName;

+

+				IDataParameter prm = (IDataParameter) parms[p];

+				theParmName = prm.ParameterName;

+				

+				string inValue = "";

+				bool found;

+				found = GetInternalVariable(theParmName, out inValue);

+				if(found == true) {

+					prm.Value = inValue;

+				}

+				else {

+					Console.Write("Enter Parameter " + (p + 1).ToString() +

+						": " + theParmName + ": ");

+					inValue = Console.ReadLine();

+					prm.Value = inValue;

+				}

+			}
+			parmsBuilder = null;
+		}
+
+		// ExecuteSql - Execute the SQL Command(s) and/or Query(ies)
+		public void ExecuteSql(string sql) {
+			
+			Console.WriteLine("Execute SQL: " + sql);
+
+			IDbCommand cmd = null;
+			IDataReader reader = null;
+
+			cmd = conn.CreateCommand();
+
+			// set command properties
+			cmd.CommandType = CommandType.Text;
+			cmd.CommandText = sql;
+			cmd.Connection = conn;
+
+			BuildParameters(cmd);
+
+			try {
+				reader = cmd.ExecuteReader();
+				DisplayData(reader);
+				reader.Close();
+				reader = null;
+			}
+			catch(Exception e) {
+				Console.WriteLine("Exception Caught Executing SQL: " + e);
+				//if(reader != null) {
+				//	if(reader.IsClosed == false)
+				//		reader.Close();
+				reader = null;
+				//}
+			}
+			finally {
+				// cmd.Dispose();
+				cmd = null;
+			}
+		}
+
+		// ExecuteSql - Execute the SQL Commands (no SELECTs)
+		public void ExecuteSqlNonQuery(string sql) {
+			
+			Console.WriteLine("Execute SQL Non Query: " + sql);
+
+			IDbCommand cmd = null;
+			int rowsAffected = -1;
+			
+			cmd = conn.CreateCommand();
+
+			// set command properties
+			cmd.CommandType = CommandType.Text;
+			cmd.CommandText = sql;
+			cmd.Connection = conn;
+
+			BuildParameters(cmd);
+
+			try {
+				rowsAffected = cmd.ExecuteNonQuery();
+				cmd = null;
+				Console.WriteLine("Rows affected: " + rowsAffected);
+			}
+			catch(Exception e) {
+				Console.WriteLine("Exception Caught Executing SQL: " + e);
+			}
+			finally {
+				// cmd.Dispose();
+				cmd = null;
+			}
+		}
+
+		public void ExecuteSqlScalar(string sql) {
+			Console.WriteLine("Execute SQL Non Query: " + sql);
+
+			IDbCommand cmd = null;
+			string retrievedValue = "";
+			
+			cmd = conn.CreateCommand();
+
+			// set command properties
+			cmd.CommandType = CommandType.Text;
+			cmd.CommandText = sql;
+			cmd.Connection = conn;
+
+			BuildParameters(cmd);
+
+			try {
+				retrievedValue = (string) cmd.ExecuteScalar().ToString();
+				Console.WriteLine("Retrieved value: " + retrievedValue);
+			}
+			catch(Exception e) {
+				Console.WriteLine("Exception Caught Executing SQL: " + e);
+			}
+			finally {
+				// cmd.Dispose();
+				cmd = null;
+			}
+		}
+
+		public void ExecuteSqlXml(string sql) {
+			Console.WriteLine("Error: Not implemented yet.");
+		}
+
+		// like ShowHelp - but only show at the beginning
+		// only the most important commands are shown
+		// like help and quit
+		public void StartupHelp() {
+			Console.WriteLine(@"Type:  \Q to quit");
+			Console.WriteLine(@"       \ConnectionString to set the ConnectionString");
+			Console.WriteLine(@"       \Provider to set the Provider:");
+			Console.WriteLine(@"                 {OleDb,SqlClient,MySql,Odbc,");
+			Console.WriteLine(@"                  Oracle,PostgreSql)");
+			Console.WriteLine(@"       \Open to open the connection");
+			Console.WriteLine(@"       \Close to close the connection");
+			Console.WriteLine(@"       \Execute to execute SQL command(s)/queries(s)");
+			Console.WriteLine(@"       \h to show this help.");
+			Console.WriteLine(@"       \defaults to show default variables.");
+			Console.WriteLine();
+		}
+
+		// ShowHelp - show the help - command a user can enter
+		public void ShowHelp() {
+			Console.WriteLine("");
+			Console.WriteLine(@"Type:  \Q to quit");
+			Console.WriteLine(@"       \ConnectionString to set the ConnectionString");
+			Console.WriteLine(@"       \Provider to set the Provider:");
+			Console.WriteLine(@"                 {OleDb,SqlClient,MySql,Odbc,");
+			Console.WriteLine(@"                  Oracle,PostgreSql}");
+			Console.WriteLine(@"       \Open to open the connection");
+			Console.WriteLine(@"       \Close to close the connection");
+			Console.WriteLine(@"       \Execute to execute SQL command(s)/queries(s)");
+			Console.WriteLine(@"       \exenonquery execute an SQL non query (not a SELECT).");
+			Console.WriteLine(@"       \exescalar execute SQL to get a single row/single column result.");
+			Console.WriteLine(@"       \f FILENAME to read a batch of Sql# commands/queries from.");
+			Console.WriteLine(@"       \o FILENAME to write out the result of commands executed.");
+			Console.WriteLine(@"       \load FILENAME to load from file SQL commands into SQL buffer.");
+			Console.WriteLine(@"       \save FILENAME to save SQL commands from SQL buffer to file.");
+			Console.WriteLine(@"       \h to show this help.");
+			Console.WriteLine(@"       \defaults to show default variables, such as,");
+			Console.WriteLine(@"            Provider and ConnectionString.");
+			Console.WriteLine(@"       \s {TRUE, FALSE} to silent messages.");
+			Console.WriteLine(@"       \r reset (clear) the query buffer.");
+			Console.WriteLine(@"       \set NAME VALUE - set an internal variable.");
+			Console.WriteLine(@"       \unset NAME - remove an internal variable.");
+			Console.WriteLine(@"       \variable NAME - display the value of an internal variable.");
+			Console.WriteLine(@"       \loadprovider CLASS - load the provider");
+			Console.WriteLine(@"            use the complete name of its connection class.");
+			Console.WriteLine(@"       \loadextprovider ASSEMBLY CLASS - load the provider"); 
+			Console.WriteLine(@"            use the complete name of its assembly and");
+			Console.WriteLine(@"            its Connection class.");
+			Console.WriteLine(@"       \print - show what's in the SQL buffer now.");
+			Console.WriteLine();
+		}
+
+		// ShowDefaults - show defaults for connection variables
+		public void ShowDefaults() {
+			Console.WriteLine();
+			Console.WriteLine("The default Provider is " + provider);
+			if(provider.Equals("LOADEXTPROVIDER")) {
+				Console.WriteLine("          Assembly: " + 
+					providerAssembly);
+				Console.WriteLine("  Connection Class: " + 
+					providerConnectionClass);
+			}
+			Console.WriteLine();
+			Console.WriteLine("The default ConnectionString is: ");
+			Console.WriteLine("    \"" + connectionString + "\"");
+			Console.WriteLine();
+		}
+
+		// OpenDataSource - open connection to the data source
+		public void OpenDataSource() {
+			
+			Console.WriteLine("Attempt to Open...");
+
+			try {
+				switch(provider) {
+				case "OLEDB":
+					conn = new OleDbConnection();
+					break;
+				case "POSTGRESQL":
+					conn = new SqlConnection();
+					break;
+				case "LOADEXTPROVIDER":
+					if(LoadExternalProvider() == false)
+						return;
+					break;
+				default:
+					Console.WriteLine("Error: Bad argument or provider not supported.");
+					return;
+				}
+			}
+			catch(Exception e) {
+				Console.WriteLine("Error: Unable to create Connection object. " + e);
+				return;
+			}
+
+			conn.ConnectionString = connectionString;
+			
+			try {
+				conn.Open();
+				if(conn.State == ConnectionState.Open)
+					Console.WriteLine("Open was successfull.");
+			}
+			catch(Exception e) {
+				Console.WriteLine("Exception Caught Opening. " + e);
+				conn = null;
+			}
+		}
+
+		// CloseDataSource - close the connection to the data source
+		public void CloseDataSource() {
+			
+			if(conn != null) {
+				Console.WriteLine("Attempt to Close...");
+				try {
+					conn.Close();
+					Console.WriteLine("Close was successfull.");
+				}
+				catch(Exception e) {
+					Console.WriteLine("Exeception Caught Closing. " + e);
+				}
+				conn = null;
+			}
+		}
+
+		// ChangeProvider - change the provider string variable
+		public void ChangeProvider(string[] parms) {
+
+			if(parms.Length == 2) {
+				string parm = parms[1].ToUpper();
+				switch(parm) {
+				case "ORACLE":
+				case "ODBC":
+					Console.WriteLine("Error: Provider not currently supported.");
+					break;
+				case "MYSQL":
+					string[] extp = new string[3] {
+									      "\\loadextprovider",
+									      "Mono.Data.MySql",
+									      "Mono.Data.MySql.MySqlConnection"};
+					SetupExternalProvider(extp);
+					break;		
+				case "SQLCLIENT":
+					provider = "POSTGRESQL";
+					Console.WriteLine("Warning: Currently, the SqlClient provider is the PostgreSQL provider.");
+					break;
+				case "GDA":
+					provider = "OLEDB";
+					break;
+				case "OLEDB":
+				case "POSTGRESQL":
+					provider = parm;
+					break;
+				default:
+					Console.WriteLine("Error: " + "Bad argument or Provider not supported.");
+					break;
+				}
+				Console.WriteLine("The default Provider is " + provider);
+				if(provider.Equals("LOADEXTPROVIDER")) {
+					Console.WriteLine("          Assembly: " + 
+						providerAssembly);
+					Console.WriteLine("  Connection Class: " + 
+						providerConnectionClass);
+				}
+			}
+			else
+				Console.WriteLine("Error: provider only has one parameter.");
+		}
+
+		// ChangeConnectionString - change the connection string variable
+		public void ChangeConnectionString(string entry) {
+			
+			if(entry.Length > 18)
+				connectionString = entry.Substring(18, entry.Length - 18);
+			else
+				connectionString = "";
+		}
+
+		public void ReadCommandsFromFile(StreamReader inCmds) {
+		}
+
+		public void SetupOutputResultsFile(string[] parms) {

+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters");
+				return;
+			}
+			try {
+				outputFilestream = new StreamWriter(parms[1]);
+			}
+			catch(Exception e) {

+				Console.WriteLine("Error: Unable to setup output results file. " + e);

+				return;

+			}
+		}
+
+		public void SetupInputCommandsFile(string[] parms) {
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters");
+				return;
+			}
+			try {
+				inputFilestream = new StreamReader(parms[1]);
+			}
+			catch(Exception e) {

+				Console.WriteLine("Error: Unable to setup input commmands file. " + e);

+				return;

+			}	
+		}
+
+		public void LoadBufferFromFile(string[] parms) {
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters");
+				return;
+			}
+			string inFilename = parms[1];
+			try {
+				StreamReader sr = new StreamReader( inFilename);

+				StringBuilder buffer = new StringBuilder();

+				string NextLine;

+			

+				while((NextLine = sr.ReadLine()) != null) {

+					buffer.Append(NextLine);

+					buffer.Append("\n");

+				}

+				sr.Close();

+				buff = buffer.ToString();

+				build = null;

+				build = new StringBuilder();

+				build.Append(buff);

+			}

+			catch(Exception e) {

+				Console.WriteLine("Error: Unable to read file into SQL Buffer. " + e);

+			}

+		}
+
+		public void SaveBufferToFile(string[] parms) {
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters");
+				return;
+			}
+			string outFilename = parms[1];
+			try {
+				StreamWriter sw = new StreamWriter(outFilename);

+				sw.WriteLine(buff);

+				sw.Close();
+			}
+			catch(Exception e) {
+				Console.WriteLine("Error: Could not save SQL Buffer to file." + e);
+			}
+		}
+
+		public void SetupSilentMode(string[] parms) {
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters");
+				return;
+			}
+			string parm = parms[1].ToUpper();
+			if(parm.Equals("TRUE"))
+				silent = true;
+			else if(parm.Equals("FALSE"))
+				silent = false;
+			else
+				Console.WriteLine("Error: invalid parameter.");
+		}
+

+		public void SetInternalVariable(string[] parms) {
+			if(parms.Length < 2) {
+				Console.WriteLine("Error: wrong number of parameters.");
+				return;
+			}
+			string parm = parms[1];
+			StringBuilder ps = new StringBuilder();
+			
+			for(int i = 2; i < parms.Length; i++)
+				ps.Append(parms[i]);
+
+			internalVariables[parm] = ps.ToString();
+		}
+
+		public void UnSetInternalVariable(string[] parms) {
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters.");
+				return;
+			}
+			string parm = parms[1];
+
+			try {
+				internalVariables.Remove(parm);
+			}
+			catch(Exception e) {
+				Console.WriteLine("Error: internal variable does not exist.");
+			}
+		}
+
+		public void ShowInternalVariable(string[] parms) {
+			string internalVariableValue = "";
+
+			if(parms.Length != 2) {
+				Console.WriteLine("Error: wrong number of parameters.");
+				return;
+			}
+						
+			string parm = parms[1];
+
+			if(GetInternalVariable(parm, out internalVariableValue) == true)
+				Console.WriteLine("Internal Variable - Name: " + 
+					parm + "  Value: " + internalVariableValue);
+		}
+
+		public bool GetInternalVariable(string name, out string sValue) {
+			sValue = "";
+			bool valueReturned = false;
+
+			try {
+				if(internalVariables.ContainsKey(name) == true) {
+					sValue = (string) internalVariables[name];
+					valueReturned = true;
+				}
+				else
+					Console.WriteLine("Error: internal variable does not exist.");
+
+			}
+			catch(Exception e) {
+				Console.WriteLine("Error: internal variable does not exist.");
+			}
+			return valueReturned;
+		}
+
+		// to be used for loading .NET Data Providers that exist in
+		// the System.Data assembly, but are not explicitly handling
+		// in SQL#
+		public void LoadProvider(string[] parms) {
+			Console.WriteLine("Error: not implemented yet.");			
+		}
+
+		public void SetupExternalProvider(string[] parms) {
+			if(parms.Length != 3) {
+				Console.WriteLine("Error: Wrong number of parameters.");
+				return;
+			}
+			provider = "LOADEXTPROVIDER";
+			providerAssembly = parms[1];
+			providerConnectionClass = parms[2];
+		}
+
+		public bool LoadExternalProvider() {
+			
+			bool success = false;
+
+			// For example: for the MySQL provider in Mono.Data.MySql
+			//   \LoadExtProvider Mono.Data.MySql Mono.Data.MySql.MySqlConnection
+			//   \ConnectionString dbname=test
+			//   \open
+			//   insert into sometable (tid, tdesc, aint) values ('abc','def',12)
+			//   \exenonquery
+			//   \close
+			//   \quit
+
+			try {
+				Console.WriteLine("Loading external provider...");
+				Console.Out.Flush();
+
+				Assembly ps = Assembly.Load(providerAssembly);
+				Type typ = ps.GetType(providerConnectionClass);
+				conn = (IDbConnection) Activator.CreateInstance(typ);
+				success = true;
+				
+				Console.WriteLine("External provider loaded.");
+				Console.Out.Flush();
+			}
+			catch(FileNotFoundException f) {
+				Console.WriteLine("Error: unable to load the assembly of the provider: " + 
+					providerAssembly);
+			}
+			return success;
+		}
+
+		// used for outputting message, but if silent is set,
+		// don't display
+		public void OutputLine(string line) {
+			if(silent == false)
+				OutputData(line);
+		}
+
+		// used for outputting the header columns of a result
+		public void OutputHeader(string line) {
+			if(showHeader == true)
+				OutputData(line);
+		}
+
+		// OutputData() - used for outputting data
+		//  if an output filename is set, then the data will
+		//  go to a file; otherwise, it will go to the Console.
+		public void OutputData(string line) {
+			if(outputFilestream == null)
+				Console.WriteLine(line);
+			else
+				outputFilestream.WriteLine(line);
+		}
+
+		// HandleCommand - handle SqlSharpCli commands entered
+		public void HandleCommand(string entry) {		
+			string[] parms;
+			
+			parms = entry.Split(new char[1] {' '});
+			string userCmd = parms[0].ToUpper();
+
+			switch(userCmd) {
+			case "\\PROVIDER":
+				ChangeProvider(parms);
+				break;
+			case "\\CONNECTIONSTRING":
+				ChangeConnectionString(entry);
+				break;
+			case "\\LOADPROVIDER":
+				// TODO:
+				//SetupProvider(parms);
+				break;
+			case "\\LOADEXTPROVIDER":
+				SetupExternalProvider(parms);
+				break;
+			case "\\OPEN":
+				OpenDataSource();
+				break;
+			case "\\CLOSE":
+				CloseDataSource();
+				break;
+			case "\\S":
+				SetupSilentMode(parms);
+				break;
+			case "\\E":
+			case "\\EXECUTE":
+				// Execute SQL Commands or Queries
+				if(conn == null)
+					Console.WriteLine("Error: connection is not Open.");
+				else if(conn.State == ConnectionState.Closed)
+					Console.WriteLine("Error: connection is not Open.");
+				else {
+					if(build == null)
+						Console.WriteLine("Error: SQL Buffer is empty.");
+					else {
+						buff = build.ToString();
+						ExecuteSql(buff);
+					}
+					build = null;
+				}
+				break;
+			case "\\EXENONQUERY":
+				if(conn == null)
+					Console.WriteLine("Error: connection is not Open.");
+				else if(conn.State == ConnectionState.Closed)
+					Console.WriteLine("Error: connection is not Open.");
+				else {
+					if(build == null)
+						Console.WriteLine("Error: SQL Buffer is empty.");
+					else {
+						buff = build.ToString();
+						ExecuteSqlNonQuery(buff);
+					}
+					build = null;
+				}
+				break;
+			case "\\EXESCALAR":
+				if(conn == null)
+					Console.WriteLine("Error: connection is not Open.");
+				else if(conn.State == ConnectionState.Closed)
+					Console.WriteLine("Error: connection is not Open.");
+				else {
+					if(build == null)
+						Console.WriteLine("Error: SQL Buffer is empty.");
+					else {
+						buff = build.ToString();
+						ExecuteSqlScalar(buff);
+					}
+					build = null;
+				}
+				break;
+			case "\\F":
+				SetupInputCommandsFile(parms);
+				break;
+			case "\\O":
+				SetupOutputResultsFile(parms);
+				break;
+			case "\\LOAD":
+				// Load file into SQL buffer: \load FILENAME
+				LoadBufferFromFile(parms);
+				break;
+			case "\\SAVE":
+				// Save SQL buffer to file: \save FILENAME
+				SaveBufferToFile(parms);
+				break;
+			case "\\H":
+			case "\\HELP":
+				// Help
+				ShowHelp();
+				break;
+			case "\\DEFAULTS":
+				// show the defaults for provider and connection strings
+				ShowDefaults();
+				break;
+			case "\\Q": 
+			case "\\QUIT":
+				// Quit
+				break;
+			case "\\R": 
+				// reset (clear) the query buffer
+				build = null;
+				break;
+			case "\\SET":
+				// sets internal variable
+				// \set name value
+				SetInternalVariable(parms);
+				break;
+			case "\\UNSET":
+				// deletes internal variable
+				// \unset name
+				UnSetInternalVariable(parms);
+				break;
+			case "\\VARIABLE":
+				ShowInternalVariable(parms);
+				break;
+			case "\\PRINT":
+				if(build == null)
+					Console.WriteLine("SQL Buffer is empty.");
+				else
+					Console.WriteLine("SQL Bufer\n" + buff);
+			default:
+				// Error
+				Console.WriteLine("Error: Unknown user command.");
+				break;
+			}
+		}
+
+		public void DealWithArgs(string[] args) {
+			for(int a = 0; a < args.Length; a++) {
+				if(args[a].Substring(0,1).Equals("-")) {
+					string arg = args[a].ToUpper().Substring(1, args[a].Length - 1);
+					switch(arg) {
+					case "S":
+						silent = true;
+						break;
+					case "F":		
+						if(a + 1 >= args.Length)
+							Console.WriteLine("Error: Missing FILENAME for -f switch");
+						else {
+							inputFilename = args[a + 1];
+							inputFilestream = new StreamReader(inputFilename);
+						}
+						break;
+					case "O":
+						if(a + 1 >= args.Length)
+							Console.WriteLine("Error: Missing FILENAME for -o switch");
+						else {
+							outputFilename = args[a + 1];
+							outputFilestream = new StreamWriter(outputFilename);
+						}
+						break;
+					default:
+						Console.WriteLine("Error: Unknow switch: " + args[a]);
+						break;
+					}
+				}
+			}
+		}
+		
+		public string ReadSqlSharpCommand() {
+			string entry = "";
+
+			if(inputFilestream == null) {
+				Console.Write("\nSQL# ");
+				entry = Console.ReadLine();		
+			}
+			else {
+				try {
+					entry = inputFilestream.ReadLine();
+					if(entry == null) {
+						Console.WriteLine("Executing SQL# Commands from file done.");
+					}
+				}
+				catch(Exception e) {
+					Console.WriteLine("Error: Reading command from file.");
+				}
+				Console.Write("\nSQL# ");
+				entry = Console.ReadLine();
+			}
+			return entry;
+		}
+		
+		public void Run(string[] args) {
+
+			DealWithArgs(args);
+
+			string entry = "";
+			build = null;
+
+			if(silent == false) {
+				Console.WriteLine("Welcome to SQL#. The interactive SQL command-line client ");
+				Console.WriteLine("for Mono.Data.  See http://www.go-mono.com/ for more details.\n");
+						
+				StartupHelp();
+				ShowDefaults();
+			}
+			
+			while(entry.ToUpper().Equals("\\Q") == false &&
+				entry.ToUpper().Equals("\\QUIT") == false) {
+				
+				entry = ReadSqlSharpCommand();			
+				
+				if(entry.Substring(0,1).Equals("\\")) {
+					HandleCommand(entry);
+				}
+				else if(entry.IndexOf(";") >= 0) {
+					// most likely the end of SQL Command or Query found
+					// execute the SQL
+					if(conn == null)
+						Console.WriteLine("Error: connection is not Open.");
+					else if(conn.State == ConnectionState.Closed)
+						Console.WriteLine("Error: connection is not Open.");
+					else {
+						if(build == null) {
+							build = new StringBuilder();
+						}
+						build.Append(entry);
+						build.Append("\n");
+						buff = build.ToString();
+						ExecuteSql(buff);
+						build = null;
+					}
+				}
+				else {
+					// most likely a part of a SQL Command or Query found
+					// append this part of the SQL
+					if(build == null) {
+						build = new StringBuilder();
+					}
+					build.Append(entry + "\n");
+					buff = build.ToString();
+				}
+			}			
+			CloseDataSource();
+			if(outputFilestream != null)
+				outputFilestream.Close();
+		}
+	}
+
+	enum BindVariableCharacter {

+		Semicolon,    // ';'

+		At,           // '@'

+		QuestionMark  // '?'

+	}

+

+	public class ParametersBuilder {

+

+		private BindVariableCharacter bindCharSetting;

+		private char bindChar;

+		private IDataParameterCollection parms;

+		private string sql;

+		private IDbCommand cmd;

+			

+		private void SetBindCharacter() {

+			switch(bindCharSetting) {

+			case BindVariableCharacter.Semicolon:

+				bindChar = ':';

+				break;

+			case BindVariableCharacter.At:

+				bindChar = '@';

+				break;

+			case BindVariableCharacter.QuestionMark:

+				bindChar = '?';

+				break;

+			}

+		}

+

+		public ParametersBuilder(IDbCommand command, BindVariableCharacter bindVarChar) {

+			cmd = command;

+			sql = cmd.CommandText;

+			parms = cmd.Parameters;

+			bindCharSetting = bindVarChar;

+			SetBindCharacter();

+		}	

+

+		public int ParseParameters() {	

+

+			int numParms = 0;

+

+			IDataParameterCollection parms = cmd.Parameters;

+

+			char[] chars = sql.ToCharArray();

+			bool bStringConstFound = false;

+

+			for(int i = 0; i < chars.Length; i++) {

+				if(chars[i] == '\'') {

+					if(bStringConstFound == true)

+						bStringConstFound = false;

+					else

+						bStringConstFound = true;

+				}

+				else if(chars[i] == bindChar && 

+					bStringConstFound == false) {

+					StringBuilder parm = new StringBuilder();

+					i++;

+					while(i <= chars.Length) {

+						char ch;

+						if(i == chars.Length)

+							ch = ' '; // a space

+						else

+							ch = chars[i];

+

+						if(Char.IsLetterOrDigit(ch)) {

+							parm.Append(ch);

+						}

+						else {

+

+							string p = parm.ToString();

+							AddParameter(p);

+							numParms ++;

+							break;

+						}

+						i++;

+					}

+					i--;

+				}			

+			}

+			return numParms;

+		}

+

+		public void AddParameter (string p) {

+			Console.WriteLine("Add Parameter: " + p);

+			if(parms.Contains(p) == false) {

+				IDataParameter prm = cmd.CreateParameter();

+				prm.ParameterName = p;

+				prm.Direction = ParameterDirection.Input;

+				prm.DbType = DbType.String; // default

+				prm.Value = ""; // default

+				cmd.Parameters.Add(prm);

+			}

+		}

+	}
+
+	public class SqlSharpDriver {
+		public static void Main(string[] args) {
+			SqlSharpCli sqlCommandLineEngine = new SqlSharpCli();
+			sqlCommandLineEngine.Run(args);
+		}
+	}
+}
diff --git a/mcs/tools/XMLUtil.cs b/mcs/tools/XMLUtil.cs
new file mode 100644
index 00000000000..0643472ad28
--- /dev/null
+++ b/mcs/tools/XMLUtil.cs
@@ -0,0 +1,36 @@
+// IFaceDisco.cs

+//

+// Nick Drochak (ndrochak@gol.com)

+//

+// (C) 2001 Nick Drochak

+

+using System;

+using System.Text;

+using System.Collections;

+

+namespace Mono.Util

+{

+	class XMLUtil{

+		public static string ToXML(

+			ArrayList list, 

+			string itemWrap,

+			string listWrap)

+		{

+			if (null == itemWrap){

+				throw new ArgumentNullException("itemWrap");

+			}

+			if (null == listWrap){

+				throw new ArgumentNullException("listWrap");

+			}

+			StringBuilder output = new StringBuilder();

+			output.Append("<"+listWrap+">");

+			foreach(object o in list){

+				output.Append("\n<"+itemWrap+">");

+				output.Append(o.ToString());

+				output.Append("</"+itemWrap+">");

+			}

+			output.Append("\n</"+listWrap+">");

+			return output.ToString();

+		}

+	}

+}
\ No newline at end of file
diff --git a/mcs/tools/assemblies.xml b/mcs/tools/assemblies.xml
new file mode 100644
index 00000000000..1bf42d8c266
--- /dev/null
+++ b/mcs/tools/assemblies.xml
@@ -0,0 +1,20 @@
+<assemblies>

+	<path url="C:\WINNT\Microsoft.NET\Framework\v1.0.3705">

+		<assembly file="mscorlib.dll"/>

+		<assembly file="System.Web.dll"/>

+		<assembly file="System.dll"/>

+		<assembly file="System.Drawing.dll"/>

+		<assembly file="System.Security.dll"/>

+		<assembly file="System.Windows.Forms.dll"/>

+		<assembly file="System.Xml.dll"/>

+		<assembly file="System.Data.dll"/>

+		<assembly file="System.Design.dll"/>

+		<assembly file="System.EnterpriseServices.dll"/>

+		<assembly file="System.Management.dll"/>

+		<assembly file="System.Messaging.dll"/>

+		<assembly file="System.Runtime.Remoting.dll"/>

+		<assembly file="System.ServiceProcess.dll"/>

+		<assembly file="System.Web.RegularExpressions.dll"/>

+		<assembly file="System.Web.Services.dll"/>

+	</path>

+</assemblies>

diff --git a/mcs/tools/corcompare/.cvsignore b/mcs/tools/corcompare/.cvsignore
new file mode 100644
index 00000000000..bdab3e9737d
--- /dev/null
+++ b/mcs/tools/corcompare/.cvsignore
@@ -0,0 +1,3 @@
+*.pdb
+*.exe
+cormissing.xml
diff --git a/mcs/tools/corcompare/ChangeLog b/mcs/tools/corcompare/ChangeLog
new file mode 100644
index 00000000000..4e100611a23
--- /dev/null
+++ b/mcs/tools/corcompare/ChangeLog
@@ -0,0 +1,6 @@
+2002-02-25  Nick Drochak  <ndrochak@gol.com>

+

+	* ToDoAssembly.cs: remove unused code 

+	* ToDoNamespace.cs: using BindingFlags for GetMembers

+	* ToDoType.cs: throw exception if we encounter a member type

+	that we didn't expect. Also remove unused property.
\ No newline at end of file
diff --git a/mcs/tools/corcompare/CompletionInfo.cs b/mcs/tools/corcompare/CompletionInfo.cs
new file mode 100644
index 00000000000..ab497f31eb4
--- /dev/null
+++ b/mcs/tools/corcompare/CompletionInfo.cs
@@ -0,0 +1,573 @@
+// Mono.Util.CorCompare.CompletionInfo
+//
+// Author(s):
+//   Piers Haken (piersh@friskit.com)
+//
+// (C) 2001-2002 Piers Haken
+
+using System;
+using System.Reflection;
+using System.Xml;
+using System.Collections;
+
+namespace Mono.Util.CorCompare 
+{
+	#region
+	public struct CompletionType
+	{
+		private enum CompletionTypes
+		{
+			Present,
+			Missing,
+			Extra
+		}
+		private const int MASK_TYPE = 0x0f;
+		private const int MASK_TODO = 0x10;
+		//private const int MASK_ERROR = 0x20;
+		private int m_type;
+
+		private CompletionType (CompletionTypes type, bool fTodo)
+		{
+			m_type = (int) type;
+
+			if (fTodo)
+				m_type |= MASK_TODO;
+		}
+
+		public bool IsPresent
+		{
+			get { return Type == CompletionTypes.Present; }
+		}
+		public bool IsMissing
+		{
+			get { return Type == CompletionTypes.Missing; }
+		}
+		public bool IsExtra
+		{
+			get { return Type == CompletionTypes.Extra; }
+		}
+		public bool IsTodo
+		{
+			get { return (m_type & MASK_TODO) != 0; }
+		}
+		private CompletionTypes Type
+		{
+			get { return (CompletionTypes) (m_type & MASK_TYPE); }
+		}
+
+		public override string ToString ()
+		{
+			switch (Type)
+			{
+				case CompletionTypes.Missing:
+					return "missing";
+				case CompletionTypes.Extra:
+					return "extra";
+				case CompletionTypes.Present:
+					return "present";
+				default:
+					throw new Exception ("Invalid CompletionType: "+Type);
+			}
+		}
+
+		public static CompletionType Present
+		{
+			get { return new CompletionType (CompletionTypes.Present, false); }
+		}
+		public static CompletionType Missing
+		{
+			get { return new CompletionType (CompletionTypes.Missing, false); }
+		}
+		public static CompletionType Extra
+		{
+			get { return new CompletionType (CompletionTypes.Extra, false); }
+		}
+		public static CompletionType Compare (Object oMono, Object oMS)
+		{
+			if (oMono == null)
+				return Missing;
+			else if (oMS == null)
+				return Extra;
+			else
+				return Present;
+		}
+	}
+
+	/// <summary>
+	/// 	Represents the amount of work done on a node
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Piersh
+	/// 	created on - 3/2/2002 1:12:00 AM
+	/// </remarks>
+
+	public struct CompletionInfo
+	{
+		public int cPresent;
+		public int cExtra;
+		public int cMissing;
+		public int cTodo;
+
+		/// <summary>
+		/// converts a CompletionTypes into a CompletionInfo
+		/// sets the corresponding field to '1'
+		/// </summary>
+		/// <param name="ct">the CompletionTypes to convert</param>
+		public CompletionInfo (CompletionType ct)
+		{
+			cPresent = cTodo = cMissing = cExtra = 0;
+			if (ct.IsPresent)
+				cPresent = 1;
+			else if (ct.IsMissing)
+				cMissing = 1;
+			else if (ct.IsExtra)
+				cExtra = 1;
+
+			if (ct.IsTodo)
+				cTodo = 1;
+		}
+
+		/// <summary>
+		/// counts the total number of elements represented by this info
+		/// </summary>
+		public int cTotal
+		{
+			get
+			{
+				return cPresent + cTodo + cMissing;
+			}
+		}
+
+		/// <summary>
+		/// adds two CompletionInfos together
+		/// </summary>
+		/// <param name="m_nodeStatus"></param>
+		public void Add (CompletionInfo m_nodeStatus)
+		{
+			cPresent += m_nodeStatus.cPresent;
+			cTodo += m_nodeStatus.cTodo;
+			cMissing += m_nodeStatus.cMissing;
+			cExtra += m_nodeStatus.cExtra;
+		}
+
+		/// <summary>
+		/// subtracts two CompletionInfos
+		/// </summary>
+		/// <param name="m_nodeStatus"></param>
+		public void Sub (CompletionInfo m_nodeStatus)
+		{
+			cPresent -= m_nodeStatus.cPresent;
+			cTodo -= m_nodeStatus.cTodo;
+			cMissing -= m_nodeStatus.cMissing;
+			cExtra -= m_nodeStatus.cExtra;
+			if (cPresent < 0 || cTodo < 0 || cMissing < 0 || cExtra < 0)
+				throw new Exception ("Completion underflow on subtract");
+		}
+
+		/// <summary>
+		/// increments the corresponding field
+		/// </summary>
+		/// <param name="ct"></param>
+		public void Add (CompletionType ct)
+		{
+			Add (new CompletionInfo (ct));
+		}
+		/// <summary>
+		/// decrements the corresponding field
+		/// </summary>
+		/// <param name="ct"></param>
+		public void Sub (CompletionType ct)
+		{
+			Sub (new CompletionInfo (ct));
+		}
+
+		/// <summary>
+		/// adds appropriate 'missing', 'todo' & 'complete' attributes to an XmlElement
+		/// </summary>
+		/// <param name="elt"></param>
+		public void SetAttributes (XmlElement elt)
+		{
+			elt.SetAttribute ("present", cPresent.ToString ());
+			elt.SetAttribute ("missing", cMissing.ToString ());
+			elt.SetAttribute ("extra", cExtra.ToString ());
+			elt.SetAttribute ("todo", cTodo.ToString ());
+
+			//int percentComplete = (cTotal == 0) ? 100 : (100 - 100 * (cMissing + cExtra) / cTotal);
+			//elt.SetAttribute ("complete", percentComplete.ToString ());
+		}
+	}
+
+	#endregion
+
+	public enum PresenceTypes
+	{
+//		UNINITIALIZED = 0,
+		Missing = 0,
+		Present,
+		Extra
+	}
+
+	public enum ErrorTypes
+	{
+		// TODO: order is important here... (see Status.SetError ())
+//		UNINITIALIZED = 0,
+		OK = 0,
+		Todo,
+		Warning,
+		Error
+	}
+
+	public struct PresenceCounts
+	{
+		public int cMissing;
+		public int cPresent;
+		public int cExtra;
+
+		public PresenceCounts (PresenceTypes type)
+		{
+			cMissing = cPresent = cExtra = 0;
+			if (type == PresenceTypes.Missing)
+				cMissing = 1;
+			else if (type == PresenceTypes.Present)
+				cPresent = 1;
+			else if (type == PresenceTypes.Extra)
+				cExtra = 1;
+			else throw new Exception ("Invalid PresenceType");
+		}
+		public int Total
+		{
+			get { return cMissing + cPresent + cExtra; }
+		}
+		public void Add (PresenceCounts counts)
+		{
+			cMissing += counts.cMissing;
+			cPresent += counts.cPresent;
+			cExtra += counts.cExtra;
+		}
+		public void Sub (PresenceCounts counts)
+		{
+			cMissing -= counts.cMissing;
+			cPresent -= counts.cPresent;
+			cExtra -= counts.cExtra;
+
+			if (cMissing < 0 || cPresent < 0 || cExtra < 0)
+				throw new Exception ("Underflow");
+		}
+		public void Add (PresenceTypes type)
+		{
+			Add (new PresenceCounts (type));
+		}
+		public void Sub (PresenceTypes type)
+		{
+			Sub (new PresenceCounts (type));
+		}
+		public void SetAttributes (XmlElement elt, string strSuffix)
+		{
+			if (cMissing != 0)
+				elt.SetAttribute ("missing"+strSuffix, cMissing.ToString ());
+			if (cPresent != 0)
+				elt.SetAttribute ("present"+strSuffix, cPresent.ToString ());
+			if (cExtra != 0)
+				elt.SetAttribute ("extra"+strSuffix, cExtra.ToString ());
+		}
+	}
+
+	public struct ErrorCounts
+	{
+		public int cOK;
+		public int cTodo;
+		public int cWarning;
+		public int cError;
+
+		public ErrorCounts (ErrorTypes type)
+		{
+			cOK = cTodo = cWarning = cError = 0;
+			if (type == ErrorTypes.OK)
+				cOK = 1;
+			else if (type == ErrorTypes.Todo)
+				cTodo = 1;
+			else if (type == ErrorTypes.Warning)
+				cWarning = 1;
+			else if (type == ErrorTypes.Error)
+				cError = 1;
+			else throw new Exception ("Invalid ErrorType");
+		}
+		public int Total
+		{
+			get { return cOK + cTodo + cWarning + cError; }
+		}
+		public void Add (ErrorCounts counts)
+		{
+			cOK += counts.cOK;
+			cTodo += counts.cTodo;
+			cWarning += counts.cWarning;
+			cError += counts.cError;
+		}
+		public void Sub (ErrorCounts counts)
+		{
+			cOK -= counts.cOK;
+			cTodo -= counts.cTodo;
+			cWarning -= counts.cWarning;
+			cError -= counts.cError;
+			if (cOK < 0 || cTodo < 0 || cWarning < 0 || cError < 0)
+				throw new Exception ("Underflow");
+		}
+		public void Add (ErrorTypes type)
+		{
+			Add (new ErrorCounts (type));
+		}
+		public void Sub (ErrorTypes type)
+		{
+			Sub (new ErrorCounts (type));
+		}
+		public void SetAttributes (XmlElement elt, string strSuffix)
+		{
+			if (cOK != 0)
+				elt.SetAttribute ("ok"+strSuffix, cOK.ToString ());
+			if (cTodo != 0)
+				elt.SetAttribute ("todo"+strSuffix, cTodo.ToString ());
+			if (cWarning != 0)
+				elt.SetAttribute ("warning"+strSuffix, cWarning.ToString ());
+			if (cError != 0)
+				elt.SetAttribute ("error"+strSuffix, cError.ToString ());
+		}
+	}
+
+	public struct Status
+	{
+		public PresenceTypes presence;
+		public ErrorTypes error;
+
+		public string PresenceName
+		{
+			get
+			{
+				if (presence == PresenceTypes.Missing)
+					return "missing";
+				else if (presence == PresenceTypes.Present)
+					return "present";
+				else if (presence == PresenceTypes.Extra)
+					return "extra";
+				else throw new Exception ("Invalid PresenceType");
+			}
+		}
+		public string ErrorName
+		{
+			get
+			{
+				if (error == ErrorTypes.OK)
+					return "OK";
+				else if (error == ErrorTypes.Todo)
+					return "todo";
+				else if (error == ErrorTypes.Warning)
+					return "warning";
+				else if (error == ErrorTypes.Error)
+					return "error";
+				else throw new Exception ("Invalid ErrorType");
+			}
+		}
+		public void SetAttributes (XmlElement elt)
+		{
+			if (presence != PresenceTypes.Present)
+				elt.SetAttribute ("presence", PresenceName);
+			if (error != ErrorTypes.OK)
+				elt.SetAttribute ("error", ErrorName);
+		}
+	}
+
+	public struct StatusCounts
+	{
+		public PresenceCounts presenceCounts;
+		public ErrorCounts errorCounts;
+
+		public void Add (StatusCounts statusCounts)
+		{
+			presenceCounts.Add (statusCounts.presenceCounts);
+			errorCounts.Add (statusCounts.errorCounts);
+			if (presenceCounts.Total != errorCounts.Total)
+				throw new Exception ("invalid status counts");
+		}
+		public void Sub (StatusCounts statusCounts)
+		{
+			presenceCounts.Sub (statusCounts.presenceCounts);
+			errorCounts.Sub (statusCounts.errorCounts);
+			if (presenceCounts.Total != errorCounts.Total)
+				throw new Exception ("invalid status counts");
+		}
+		public void Add (Status status)
+		{
+			presenceCounts.Add (status.presence);
+			errorCounts.Add (status.error);
+			if (presenceCounts.Total != errorCounts.Total)
+				throw new Exception ("invalid status counts");
+		}
+		public void Sub (Status status)
+		{
+			presenceCounts.Sub (status.presence);
+			errorCounts.Sub (status.error);
+			if (presenceCounts.Total != errorCounts.Total)
+				throw new Exception ("invalid status counts");
+		}
+		public void SetAttributes (XmlElement elt, string strSuffix)
+		{
+			presenceCounts.SetAttributes (elt, strSuffix);
+			errorCounts.SetAttributes (elt, strSuffix);
+
+			int cTotal = presenceCounts.cMissing + presenceCounts.cPresent;
+			int cIncomplete =
+				presenceCounts.cMissing +
+				errorCounts.cTodo +
+				errorCounts.cWarning +
+				errorCounts.cError;
+
+			if (presenceCounts.Total != errorCounts.Total)
+				throw new Exception ("invalid status counts");
+
+			if (cTotal != 0)
+			{
+				int percentComplete = 100 * (cTotal - cIncomplete) / cTotal;
+				elt.SetAttribute ("complete" + strSuffix, percentComplete.ToString ());
+			}
+		}
+	}
+
+	public class NodeMessage
+	{
+		protected string msg;
+
+		public NodeMessage (string _msg)
+		{
+			msg = _msg;
+		}
+
+		public string Message
+		{
+			get { return msg; }
+		}
+	}
+
+	public class NodeStatus
+	{
+		public Status status;
+		protected StatusCounts statusCountsChildren;
+		protected StatusCounts statusCountsTotal;
+		protected IList lstWarnings;
+
+		public NodeStatus ()
+		{
+			status.error = ErrorTypes.OK;
+		}
+
+		/// <summary>
+		/// Constructs a NodeStatus by comparing the presence of two objects
+		/// it only sets the status.presence field
+		/// </summary>
+		/// <param name="objMono"></param>
+		/// <param name="objMS"></param>
+		public NodeStatus (Object objMono, Object objMS)
+		{
+			status.error = ErrorTypes.OK;
+			statusCountsChildren = statusCountsTotal = new StatusCounts ();
+			if (objMono == null)
+				status.presence = PresenceTypes.Missing;
+			else if (objMS == null)
+				status.presence = PresenceTypes.Extra;
+			else
+				status.presence = PresenceTypes.Present;
+		}
+		public void Add (NodeStatus statusChild)
+		{
+			if ((int) statusChild.status.error > (int) status.error)
+				status.error = statusChild.status.error;
+			statusCountsTotal.Add (statusChild.statusCountsTotal);
+			statusCountsChildren.Add (statusChild.statusCountsChildren);
+		}
+		public void AddChildren (NodeStatus statusChild)
+		{
+			statusCountsTotal.Add (statusChild.statusCountsTotal);
+			statusCountsTotal.Add (statusChild.status);
+			statusCountsChildren.Add (statusChild.status);
+		}
+
+		public void SubChildren (NodeStatus statusChild)
+		{
+			statusCountsTotal.Sub (statusChild.statusCountsTotal);
+			statusCountsTotal.Sub (statusChild.status);
+			statusCountsChildren.Sub (statusChild.status);
+		}
+
+		public void Add (StatusCounts statusCounts)
+		{
+			statusCountsChildren.Add (statusCounts);
+			statusCountsTotal.Add (statusCounts);
+		}
+
+		public void Sub (StatusCounts statusCounts)
+		{
+			statusCountsChildren.Sub (statusCounts);
+			statusCountsTotal.Sub (statusCounts);
+		}
+
+		public void Add (Status status)
+		{
+			statusCountsChildren.Add (status);
+			statusCountsTotal.Add (status);
+		}
+
+		public void Sub (Status status)
+		{
+			statusCountsChildren.Sub (status);
+			statusCountsTotal.Sub (status);
+		}
+
+
+		public bool IsMissing
+		{
+			get { return status.presence == PresenceTypes.Missing; }
+		}
+		public bool IsPresent
+		{
+			get { return status.presence == PresenceTypes.Present; }
+		}
+		public bool IsExtra
+		{
+			get { return status.presence == PresenceTypes.Extra; }
+		}
+
+		public void SetAttributes (XmlElement elt)
+		{
+			status.SetAttributes (elt);
+			statusCountsChildren.SetAttributes (elt, "");
+			statusCountsTotal.SetAttributes (elt, "_total");
+
+			// add any warning messages
+			if (lstWarnings != null)
+			{
+				XmlElement eltWarnings = elt.OwnerDocument.CreateElement ("warnings");
+				elt.AppendChild (eltWarnings);
+				foreach (NodeMessage msg in lstWarnings)
+				{
+					XmlElement eltWarning = elt.OwnerDocument.CreateElement ("warning");
+					eltWarnings.AppendChild (eltWarning);
+					eltWarning.SetAttribute ("text", msg.Message);
+				}
+			}
+
+			//int percentComplete = (cTotal == 0) ? 100 : (100 - 100 * (cMissing + cExtra) / cTotal);
+			//elt.SetAttribute ("complete", percentComplete.ToString ());
+		}
+		public void SetError (ErrorTypes errorNew)
+		{
+			// TODO: assumes order of error values
+			if ((int) errorNew > (int) status.error)
+				status.error = errorNew;
+		}
+		public void AddWarning (string strWarning)
+		{
+			if (lstWarnings == null)
+				lstWarnings = new ArrayList ();
+			lstWarnings.Add (new NodeMessage (strWarning));
+			SetError (ErrorTypes.Warning);
+		}
+	}
+}
\ No newline at end of file
diff --git a/mcs/tools/corcompare/CorCompare.cs b/mcs/tools/corcompare/CorCompare.cs
new file mode 100644
index 00000000000..bb956979fe3
--- /dev/null
+++ b/mcs/tools/corcompare/CorCompare.cs
@@ -0,0 +1,72 @@
+// Mono.Util.CorCompare.CorCompareDriver
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001-2002 Nick Drochak
+
+using System;
+using System.IO;
+
+namespace Mono.Util.CorCompare {
+
+	/// <summary>
+	/// 	Handles command line arguments, and generates appropriate report(s) 
+	/// 	based on those arguments
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Nick
+	/// 	created on - 2/20/2002 10:43:57 PM
+	/// </remarks>
+	class CorCompareDriver
+	{
+		public static void Main(string[] args) {
+			// make sure we were called with the proper usage
+			if (args.Length < 1) {
+				Console.WriteLine("Usage: CorCompare [-t][-n][-x outfile][-ms assembly][-f friendly_name] assembly_to_compare");
+				return;
+			}
+
+			bool fList = false;
+			string strXML = null;
+			string strMono = args [args.Length - 1];
+			string strMS = null;
+			string strFriendly = null;
+
+			for (int i = 0; i < args.Length-1; i++) {
+				if (args [i] == "-t") {
+					fList = true;
+				}
+				if (args [i] == "-n") {
+				}
+				if (args [i] == "-x") {
+					strXML = args [++i];
+				}
+				if (args [i] == "-ms") {
+					strMS = args [++i];
+				}
+				if (args [i] == "-f") {
+					strFriendly = args [++i];
+				}
+			}
+
+			if (strMS == null)
+				strMS = Path.GetFileNameWithoutExtension (strMono);
+
+			if (strFriendly == null)
+				strFriendly = strMS;
+
+			if (strXML == null)
+				strXML = strFriendly + ".xml";
+
+			ToDoAssembly td = ToDoAssembly.Load (strMono, strFriendly, strMS);
+
+			if (fList)
+				Console.WriteLine(td.CreateClassListReport());
+
+			if (strXML != null)
+				td.CreateXMLReport(strXML);
+
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/Makefile b/mcs/tools/corcompare/Makefile
new file mode 100644
index 00000000000..cd04b6f901a
--- /dev/null
+++ b/mcs/tools/corcompare/Makefile
@@ -0,0 +1,13 @@
+NANT	= ../../nant/NAnt.exe
+
+all: linux
+
+windows: linux
+
+linux: CorCompare.exe
+
+CorCompare.exe: *.cs
+	$(NANT) linux
+
+clean:
+	rm -f *.exe *.pdb *.dll
diff --git a/mcs/tools/corcompare/MissingAttribute.cs b/mcs/tools/corcompare/MissingAttribute.cs
new file mode 100644
index 00000000000..f155a8764bd
--- /dev/null
+++ b/mcs/tools/corcompare/MissingAttribute.cs
@@ -0,0 +1,136 @@
+// Mono.Util.CorCompare.MissingAttribute
+//
+// Author(s):
+//   Piers Haken (piersh@friskit.com)
+//
+// (C) 2001-2002 Piers Haken
+using System;
+using System.Xml;
+using System.Reflection;
+using System.Collections;
+
+namespace Mono.Util.CorCompare
+{
+
+	/// <summary>
+	/// 	Represents an Attribute that is completely missing
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Piersh
+	/// 	created on - 3/2/2002 9:47:00 pm
+	/// </remarks>
+	class MissingAttribute : MissingBase
+	{
+		// e.g. <attribute name="Equals" status="missing"/>
+		Object attributeMono;
+		Object attributeMS;
+		static Hashtable htIgnore;
+
+		static MissingAttribute ()
+		{
+			htIgnore = new Hashtable ();
+			htIgnore.Add ("System.Runtime.InteropServices.ClassInterfaceAttribute", null);
+			htIgnore.Add ("System.Diagnostics.DebuggerHiddenAttribute", null);
+			htIgnore.Add ("System.Diagnostics.DebuggerStepThroughAttribute", null);
+			htIgnore.Add ("System.Runtime.InteropServices.GuidAttribute", null);
+			htIgnore.Add ("System.Runtime.InteropServices.InterfaceTypeAttribute", null);
+			htIgnore.Add ("System.Runtime.InteropServices.ComVisibleAttribute", null);
+		}
+
+		public MissingAttribute (Object _attributeMono, Object _attributeMS) 
+		{
+			attributeMono = _attributeMono;
+			attributeMS = _attributeMS;
+			m_nodeStatus = new NodeStatus (attributeMono, attributeMS);
+		}
+
+		public override string Name 
+		{
+			get { return Attribute.ToString (); }
+		}
+
+		public override string Type
+		{
+			get { return "attribute"; }
+		}
+
+		public override NodeStatus Analyze ()
+		{
+			return m_nodeStatus;
+		}
+
+
+		public Object Attribute
+		{
+			get { return (attributeMono != null) ? attributeMono : attributeMS; }
+		}
+
+		/// <summary>
+		/// creates a map from a list of attributes
+		/// the hashtable maps from name to attribute
+		/// </summary>
+		/// <param name="rgAttributes">the list of attributes</param>
+		/// <returns>a map</returns>
+		public static Hashtable GetAttributeMap (Object [] rgAttributes)
+		{
+			Hashtable map = new Hashtable ();
+			foreach (Object attribute in rgAttributes)
+			{
+				if (attribute != null)
+				{
+					string strName = attribute.ToString ();
+					if (!map.Contains (strName) && !htIgnore.Contains (strName))
+						map.Add (strName, attribute);
+				}
+			}
+			return map;
+		}
+
+		/// <summary>
+		/// analyzes two sets of reflected attributes, generates a list
+		/// of MissingAttributes according to the completion of the first set wrt the second.
+		/// </summary>
+		/// <param name="rgAttributesMono">mono attributes</param>
+		/// <param name="rgAttributesMS">microsoft attributes</param>
+		/// <param name="rgAttributes">where the results are put</param>
+		/// <returns>completion info for the whole set</returns>
+		public static NodeStatus AnalyzeAttributes (Object [] rgAttributesMono, Object [] rgAttributesMS, ArrayList rgAttributes)
+		{
+			NodeStatus nodeStatus = new NodeStatus ();
+
+			Hashtable mapAttributesMono = (rgAttributesMono == null) ? new Hashtable () : MissingAttribute.GetAttributeMap (rgAttributesMono);
+			Hashtable mapAttributesMS   = (rgAttributesMS   == null) ? new Hashtable () : MissingAttribute.GetAttributeMap (rgAttributesMS);
+
+			foreach (Object attribute in mapAttributesMS.Values)
+			{
+				string strAttribute = attribute.ToString ();
+				Object attributeMono = mapAttributesMono [strAttribute];
+				MissingAttribute ma = new MissingAttribute (attributeMono, attribute);
+				rgAttributes.Add (ma);
+				NodeStatus nsAttribute = ma.Analyze ();
+				nodeStatus.AddChildren (nsAttribute);
+
+				if (attributeMono != null)
+					mapAttributesMono.Remove (strAttribute);
+			}
+			foreach (Object attribute in mapAttributesMono.Values)
+			{
+				if (attribute.ToString ().EndsWith ("MonoTODOAttribute"))
+				{
+					nodeStatus.SetError (ErrorTypes.Todo);
+					//nodeStatus.statusCountsChildren.errorCounts.Add (ErrorTypes.Todo);
+					//nodeStatus.statusCountsTotal.errorCounts.Add (ErrorTypes.Todo);
+					//nodeStatus.cTodo ++;	// this is where ALL the 'todo's come from
+				}
+				else
+				{
+					MissingAttribute ma = new MissingAttribute (attribute, null);
+					rgAttributes.Add (ma);
+					NodeStatus nsAttribute = ma.Analyze ();
+					nodeStatus.AddChildren (nsAttribute);
+				}
+			}
+			return nodeStatus;
+		}
+	}
+}
\ No newline at end of file
diff --git a/mcs/tools/corcompare/MissingBase.cs b/mcs/tools/corcompare/MissingBase.cs
new file mode 100644
index 00000000000..ec62043a32a
--- /dev/null
+++ b/mcs/tools/corcompare/MissingBase.cs
@@ -0,0 +1,134 @@
+// Mono.Util.CorCompare.MissingBase
+//
+// Author(s):
+//   Piers Haken (piersh@friskit.com)
+//
+// (C) 2001-2002 Piers Haken
+using System;
+using System.Xml;
+using System.Reflection;
+using System.Collections;
+
+namespace Mono.Util.CorCompare
+{
+	/// <summary>
+	/// Base class for all comparison items
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Piersh
+	/// 	created on - 3/3/2002 10:23:24 AM
+	/// </remarks>
+	public abstract class MissingBase
+	{
+		protected NodeStatus m_nodeStatus;
+		protected ArrayList rgAttributes;
+		protected NodeStatus nsAttributes;
+
+		public enum Accessibility
+		{
+			Public,
+			Assembly,
+			FamilyOrAssembly,
+			Family,
+			FamilyAndAssembly,
+			Private,
+		}
+
+		/// <summary>
+		/// The name of the element (eg "System.Xml")
+		/// </summary>
+		public abstract string Name { get ; }
+
+		/// <summary>
+		/// The type of the element (eg "namespace")
+		/// </summary>
+		public abstract string Type { get; }
+
+		/// <summary>
+		/// Generates an XmlElement describint this element
+		/// </summary>
+		/// <param name="doc">The document in which to create the element</param>
+		/// <returns></returns>
+		public virtual XmlElement CreateXML (XmlDocument doc)
+		{
+			XmlElement eltMissing = doc.CreateElement (Type);
+			eltMissing.SetAttribute ("name", Name);
+			//Status.status.SetAttributes (eltMissing);
+			Status.SetAttributes (eltMissing);
+
+			XmlElement eltAttributes = MissingBase.CreateMemberCollectionElement ("attributes", rgAttributes, nsAttributes, doc);
+			if (eltAttributes != null)
+				eltMissing.AppendChild (eltAttributes);
+
+			return eltMissing;
+		}
+
+		public virtual NodeStatus Status
+		{
+			get { return m_nodeStatus; }
+		}
+
+		public abstract NodeStatus Analyze ();
+
+		/// <summary>
+		/// Creates an XmlElement grouping together a set of sub-elements
+		/// </summary>
+		/// <param name="name">the name of the element to create</param>
+		/// <param name="rgMembers">a list of sub-elements</param>
+		/// <param name="doc">the document in which to create the element</param>
+		/// <returns></returns>
+		public static XmlElement CreateMemberCollectionElement (string name, ArrayList rgMembers, NodeStatus ns, XmlDocument doc)
+		{
+			XmlElement element = null;
+			if (rgMembers != null && rgMembers.Count > 0)
+			{
+				element = doc.CreateElement(name);
+				foreach (MissingBase mm in rgMembers)
+					element.AppendChild (mm.CreateXML (doc));
+
+				//ns.SetAttributes (element);
+			}
+			return element;
+		}
+		protected void AddFakeAttribute (bool fMono, bool fMS, string strName)
+		{
+			if (fMono || fMS)
+			{
+				MissingAttribute ma = new MissingAttribute (
+					(fMono) ? strName : null,
+					(fMS) ? strName : null);
+				ma.Analyze ();
+				rgAttributes.Add (ma);
+				nsAttributes.AddChildren (ma.Status);
+			}
+		}
+
+		protected void AddFlagWarning (bool fMono, bool fMS, string strName)
+		{
+			if (!fMono && fMS)
+				m_nodeStatus.AddWarning ("Should be " + strName);
+			else if (fMono && !fMS)
+				m_nodeStatus.AddWarning ("Should not be " + strName);
+		}
+
+		protected string AccessibilityToString (Accessibility ac)
+		{
+			switch (ac)
+			{
+				case Accessibility.Public:
+					return "public";
+				case Accessibility.Assembly:
+					return "internal";
+				case Accessibility.FamilyOrAssembly:
+					return "protected internal";
+				case Accessibility.Family:
+					return "protected";
+				case Accessibility.FamilyAndAssembly:
+					return "protected";	// TODO:
+				case Accessibility.Private:
+					return "private";
+			}
+			throw new Exception ("Invalid accessibility: "+ac.ToString ());
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/MissingConstructor.cs b/mcs/tools/corcompare/MissingConstructor.cs
new file mode 100644
index 00000000000..eda6f52b23a
--- /dev/null
+++ b/mcs/tools/corcompare/MissingConstructor.cs
@@ -0,0 +1,30 @@
+// Mono.Util.CorCompare.MissingConstructor
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001-2002 Nick Drochak
+
+using System;
+using System.Reflection;
+
+namespace Mono.Util.CorCompare {
+
+	/// <summary>
+	/// 	Represents a class event that is completely missing
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Nick
+	/// 	created on - 2/24/2002 10:43:57 PM
+	/// </remarks>
+	class MissingConstructor : MissingMethod {
+		// e.g. <method name="Equals" status="missing"/>
+		public MissingConstructor (MemberInfo infoMono, MemberInfo infoMS) : base (infoMono, infoMS) {}
+
+		public override string Type {
+			get {
+				return "constructor";
+			}
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/MissingEvent.cs b/mcs/tools/corcompare/MissingEvent.cs
new file mode 100644
index 00000000000..fb037c2319b
--- /dev/null
+++ b/mcs/tools/corcompare/MissingEvent.cs
@@ -0,0 +1,110 @@
+// Mono.Util.CorCompare.MissingEvent
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001-2002 Nick Drochak
+
+using System;
+using System.Reflection;
+using System.Xml;
+
+namespace Mono.Util.CorCompare {
+
+	/// <summary>
+	/// 	Represents a class event that is completely missing
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Nick
+	/// 	created on - 2/24/2002 10:43:57 PM
+	/// </remarks>
+	class MissingEvent : MissingMember {
+		// e.g. <method name="Equals" status="missing"/>
+		public MissingEvent (MemberInfo infoMono, MemberInfo infoMS) : base (infoMono, infoMS) {}
+		MissingMethod mmAdd;
+		MissingMethod mmRemove;
+		MissingMethod mmRaise;
+
+		public override string Type {
+			get {
+				return "event";
+			}
+		}
+
+		public override NodeStatus Analyze ()
+		{
+			m_nodeStatus = base.Analyze ();
+
+			EventInfo eiMono = (EventInfo) mInfoMono;
+			EventInfo eiMS   = (EventInfo) mInfoMS;
+
+			MemberInfo miAddMono, miRemoveMono, miRaiseMono;
+			if (eiMono == null)
+				miAddMono = miRemoveMono = miRaiseMono = null;
+			else
+			{
+				miAddMono = eiMono.GetAddMethod ();
+				miRemoveMono = eiMono.GetRemoveMethod ();
+				miRaiseMono = eiMono.GetRaiseMethod ();
+			}
+
+			MemberInfo miAddMS, miRemoveMS, miRaiseMS;
+			if (eiMS == null)
+				miAddMS = miRemoveMS = miRaiseMS = null;
+			else
+			{
+				miAddMS = eiMS.GetAddMethod ();
+				miRemoveMS = eiMS.GetRemoveMethod ();
+				miRaiseMS = eiMS.GetRaiseMethod ();
+			}
+
+			if (miAddMono != null || miAddMS != null)
+			{
+				mmAdd = new MissingMethod (miAddMono, miAddMS);
+				m_nodeStatus.AddChildren (mmAdd.Analyze ());
+			}
+			if (miRemoveMono != null || miRemoveMS != null)
+			{
+				mmRemove = new MissingMethod (miRemoveMono, miRemoveMS);
+				m_nodeStatus.AddChildren (mmRemove.Analyze ());
+			}
+			if (miRaiseMono != null || miRaiseMS != null)
+			{
+				mmRaise = new MissingMethod (miRemoveMono, miRemoveMS);
+				m_nodeStatus.AddChildren (mmRaise.Analyze ());
+			}
+			return m_nodeStatus;
+		}
+
+		public override XmlElement CreateXML (XmlDocument doc)
+		{
+			XmlElement eltMember = base.CreateXML (doc);
+
+			if (mInfoMono != null && mmRaise != null)
+			{
+				XmlElement eltAccessors = (XmlElement) eltMember.SelectSingleNode ("accessors");
+				if (eltAccessors == null)
+				{
+					eltAccessors = doc.CreateElement ("accessors");
+					eltMember.AppendChild (eltAccessors);
+				}
+				if (mmAdd != null)
+				{
+					XmlElement eltAdd = mmAdd.CreateXML (doc);
+					eltAccessors.AppendChild (eltAdd);
+				}
+				if (mmRemove != null)
+				{
+					XmlElement eltRemove = mmRemove.CreateXML (doc);
+					eltAccessors.AppendChild (eltRemove);
+				}
+				if (mmRaise != null)
+				{
+					XmlElement eltRaise = mmRaise.CreateXML (doc);
+					eltAccessors.AppendChild (eltRaise);
+				}
+			}
+			return eltMember;
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/MissingField.cs b/mcs/tools/corcompare/MissingField.cs
new file mode 100644
index 00000000000..12e598a2180
--- /dev/null
+++ b/mcs/tools/corcompare/MissingField.cs
@@ -0,0 +1,76 @@
+// Mono.Util.CorCompare.MissingField
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001-2002 Nick Drochak
+
+using System;
+using System.Reflection;
+
+namespace Mono.Util.CorCompare {
+
+	/// <summary>
+	/// 	Represents a class event that is completely missing
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Nick
+	/// 	created on - 2/24/2002 10:43:57 PM
+	/// </remarks>
+	class MissingField : MissingMember {
+		// e.g. <method name="Equals" status="missing"/>
+		public MissingField (MemberInfo infoMono, MemberInfo infoMS) : base (infoMono, infoMS) {}
+
+		public override string Type {
+			get {
+				return "field";
+			}
+		}
+
+		public override NodeStatus Analyze ()
+		{
+			base.Analyze ();
+
+			if (mInfoMono != null && mInfoMS != null)
+			{
+				FieldInfo fiMono = (FieldInfo) mInfoMono;
+				FieldInfo fiMS   = (FieldInfo) mInfoMS;
+
+				AddFakeAttribute (fiMono.IsNotSerialized, fiMS.IsNotSerialized, "System.NonSerializedAttribute");
+				AddFakeAttribute (fiMono.IsPinvokeImpl, fiMS.IsPinvokeImpl, "System.PInvokeImplAttribute");
+
+				AddFlagWarning (fiMono.IsStatic, fiMS.IsStatic, "static");
+				AddFlagWarning (fiMono.IsLiteral, fiMS.IsLiteral, "const");
+				AddFlagWarning (fiMono.IsInitOnly, fiMS.IsInitOnly, "readonly");
+
+				string strTypeMono = fiMono.FieldType.FullName;
+				string strTypeMS   =   fiMS.FieldType.FullName;
+				if (strTypeMono != strTypeMS)
+				{
+					Status.AddWarning ("Invalid type: is '"+strTypeMono+"', should be '"+strTypeMS+"'");
+				}
+
+				try
+				{
+					if (fiMono.IsStatic && fiMS.IsStatic &&
+						fiMono.IsLiteral && fiMS.IsLiteral)
+					{
+						object objMono = fiMono.GetValue (null);
+						object objMS = fiMS.GetValue (null);
+						long lMono = Convert.ToInt64 (objMono);
+						long lMS = Convert.ToInt64 (objMS);
+
+						if (lMono != lMS)
+						{
+							string strValMono = ((lMono < 0) ? "-0x" : "0x") + lMono.ToString ("x");
+							string strValMS   = ((lMS   < 0) ? "-0x" : "0x") +   lMS.ToString ("x");
+							Status.AddWarning ("Invalid value: is '"+strValMono+"', should be '"+strValMS+"'");
+						}
+					}
+				}
+				catch (Exception) {}
+			}
+			return m_nodeStatus;
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/MissingInterface.cs b/mcs/tools/corcompare/MissingInterface.cs
new file mode 100644
index 00000000000..d4c274b61e6
--- /dev/null
+++ b/mcs/tools/corcompare/MissingInterface.cs
@@ -0,0 +1,51 @@
+// Mono.Util.CorCompare.MissingField
+//
+// Author(s):
+//   Piers Haken (piersh@friskit.com)
+//
+// (C) 2002 Piers Haken
+
+using System;
+using System.Reflection;
+
+namespace Mono.Util.CorCompare 
+{
+
+	/// <summary>
+	/// 	Represents an interface implemented on a class
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Piers
+	/// 	created on - 10:34 AM 3/12/2002
+	/// </remarks>
+	class MissingInterface : MissingBase 
+	{
+		protected Type ifaceMono;
+		protected Type ifaceMS;
+
+		// e.g. <method name="Equals" status="missing"/>
+		public MissingInterface (Type _ifaceMono, Type _ifaceMS)
+		{
+			ifaceMono = _ifaceMono;
+			ifaceMS = _ifaceMS;
+			m_nodeStatus = new NodeStatus (ifaceMono, ifaceMS);
+		}
+
+		public override string Type 
+		{
+			get { return "interface"; }
+		}
+		public override string Name
+		{
+			get { return Interface.FullName; }
+		}
+		protected Type Interface
+		{
+			get { return (ifaceMono != null) ? ifaceMono : ifaceMS; }
+		}
+		public override NodeStatus Analyze ()
+		{
+			return m_nodeStatus;
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/MissingMember.cs b/mcs/tools/corcompare/MissingMember.cs
new file mode 100644
index 00000000000..2341c532b03
--- /dev/null
+++ b/mcs/tools/corcompare/MissingMember.cs
@@ -0,0 +1,138 @@
+using System;
+using System.Xml;
+using System.Reflection;
+using System.Collections;
+
+namespace Mono.Util.CorCompare
+{
+
+	/// <summary>
+	/// 	Represents a generic member that is completely missing
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Piersh
+	/// 	created on - 3/1/2002 3:37:00 am
+	/// </remarks>
+	abstract class MissingMember : MissingBase
+	{
+		// e.g. <method name="Equals" status="missing"/>
+		protected MemberInfo mInfoMono;
+		protected MemberInfo mInfoMS;
+
+		public MissingMember (MemberInfo infoMono, MemberInfo infoMS) 
+		{
+			mInfoMono = infoMono;
+			mInfoMS = infoMS;
+			m_nodeStatus = new NodeStatus (infoMono, infoMS);
+		}
+
+		public override string Name 
+		{
+			get { return Info.Name; }
+		}
+
+		public override NodeStatus Analyze ()
+		{
+			if (!Status.IsMissing)
+			{
+				rgAttributes = new ArrayList ();
+				nsAttributes = MissingAttribute.AnalyzeAttributes (
+					(mInfoMono == null) ? null : mInfoMono.GetCustomAttributes (false),
+					(mInfoMS   == null) ? null :   mInfoMS.GetCustomAttributes (false),
+					rgAttributes);
+
+				if (mInfoMono != null && mInfoMS != null)
+				{
+					Accessibility acMono = GetAccessibility (mInfoMono);
+					Accessibility acMS = GetAccessibility (mInfoMS);
+					if (acMono != acMS)
+						Status.AddWarning ("Should be "+AccessibilityToString (acMS));
+				}
+
+				m_nodeStatus.Add (nsAttributes);
+			}
+			return m_nodeStatus;
+		}
+
+		/// <summary>
+		/// returns the MemberInfo for this member.
+		/// if it's a missing member then the microsoft MemberInfo is returned instead
+		/// </summary>
+		public MemberInfo Info
+		{
+			get { return (mInfoMono != null) ? mInfoMono : mInfoMS; }
+		}
+
+		/// <summary>
+		/// returns the 'best' info for this member. the 'best' info is the microsoft info, if it's available, otherwise the mono info.
+		/// </summary>
+		public MemberInfo BestInfo
+		{
+			get { return (mInfoMS != null) ? mInfoMS : mInfoMono; }
+		}
+
+		public static string GetUniqueName (MemberInfo mi)
+		{
+			return (mi.MemberType).ToString () + mi.ToString ();
+		}
+
+		public static Accessibility GetAccessibility (MemberInfo mi)
+		{
+			switch (mi.MemberType)
+			{
+				case MemberTypes.Constructor:
+				case MemberTypes.Method:
+					MethodBase mb = (MethodBase) mi;
+					if (mb.IsPublic)
+						return Accessibility.Public;
+					else if (mb.IsAssembly)
+						return Accessibility.Assembly;
+					else if (mb.IsFamilyOrAssembly)
+						return Accessibility.FamilyOrAssembly;
+					else if (mb.IsFamily)
+						return Accessibility.Family;
+					else if (mb.IsFamilyAndAssembly)
+						return Accessibility.FamilyAndAssembly;
+					else if (mb.IsPrivate)
+						return Accessibility.Private;
+					break;
+				case MemberTypes.Field:
+					FieldInfo fi = (FieldInfo) mi;
+					if (fi.IsPublic)
+						return Accessibility.Public;
+					else if (fi.IsAssembly)
+						return Accessibility.Assembly;
+					else if (fi.IsFamilyOrAssembly)
+						return Accessibility.FamilyOrAssembly;
+					else if (fi.IsFamily)
+						return Accessibility.Family;
+					else if (fi.IsFamilyAndAssembly)
+						return Accessibility.FamilyAndAssembly;
+					else if (fi.IsPrivate)
+						return Accessibility.Private;
+					break;
+				case MemberTypes.NestedType:
+					Type ti = (Type) mi;
+					if (ti.IsNestedPublic)
+						return Accessibility.Public;
+					if (ti.IsNestedAssembly)
+						return Accessibility.Assembly;
+					else if (ti.IsNestedFamORAssem)
+						return Accessibility.FamilyOrAssembly;
+					else if (ti.IsNestedFamily)
+						return Accessibility.Family;
+					else if (ti.IsNestedFamANDAssem)
+						return Accessibility.FamilyAndAssembly;
+					else if (ti.IsNestedPrivate)
+						return Accessibility.Private;
+					break;
+				case MemberTypes.Event:
+				case MemberTypes.Property:
+					return Accessibility.Public;
+				default:
+					throw new Exception ("Missing handler for MemberType: "+mi.MemberType.ToString ());
+			}
+			throw new Exception ("Invalid accessibility: "+mi.ToString ());
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/MissingMethod.cs b/mcs/tools/corcompare/MissingMethod.cs
new file mode 100644
index 00000000000..306bbb66e81
--- /dev/null
+++ b/mcs/tools/corcompare/MissingMethod.cs
@@ -0,0 +1,58 @@
+// Mono.Util.CorCompare.MissingMethod
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001-2002 Nick Drochak
+
+using System;
+using System.Reflection;
+using System.Text;
+
+namespace Mono.Util.CorCompare {
+
+	/// <summary>
+	/// 	Represents a class method that is completely missing
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Nick
+	/// 	created on - 2/20/2002 10:43:57 PM
+	/// </remarks>
+	class MissingMethod : MissingMember 
+	{
+		// e.g. <method name="Equals" status="missing"/>
+		public MissingMethod (MemberInfo infoMono, MemberInfo infoMS) : base (infoMono, infoMS) {}
+
+		public override string Name {
+			get {
+				string s = Info.ToString();
+				int index = s.IndexOf(' ');
+				return s.Substring(index + 1);
+			}
+		}
+
+		public override string Type {
+			get {
+				return "method";
+			}
+		}
+
+		public override NodeStatus Analyze ()
+		{
+			m_nodeStatus = base.Analyze ();
+
+			if (mInfoMono != null && mInfoMS != null)
+			{
+				MethodBase miMono = (MethodBase) mInfoMono;
+				MethodBase miMS   = (MethodBase) mInfoMS;
+
+				AddFlagWarning (miMono.IsAbstract, miMS.IsAbstract, "abstract");
+				AddFlagWarning (miMono.IsStatic, miMS.IsStatic, "static");
+				AddFlagWarning (miMono.IsVirtual && !miMono.IsFinal, miMS.IsVirtual && !miMS.IsFinal, "virtual");
+				AddFlagWarning (miMono.IsConstructor, miMS.IsConstructor, "a constructor");
+				//AddFlagWarning (miMono.IsFinal, miMS.IsFinal, "sealed");
+			}
+			return m_nodeStatus;
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/MissingNameSpace.cs b/mcs/tools/corcompare/MissingNameSpace.cs
new file mode 100644
index 00000000000..b63168e0672
--- /dev/null
+++ b/mcs/tools/corcompare/MissingNameSpace.cs
@@ -0,0 +1,159 @@
+// Mono.Util.CorCompare.MissingNameSpace
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001-2002 Nick Drochak
+
+using System;
+using System.Collections;
+using System.Reflection;
+using System.Xml;
+
+namespace Mono.Util.CorCompare {
+
+	/// <summary>
+	/// 	Represents a namespace that has missing and/or MonoTODO classes.
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Nick
+	/// 	created on - 2/20/2002 10:43:57 PM
+	/// </remarks>
+	class MissingNameSpace : MissingBase
+	{
+		// e.g. <namespace name="System" missing="267" todo="453" complete="21">
+		protected ArrayList rgTypesMono, rgTypesMS;
+		string strNamespace;
+		ArrayList rgTypes = new ArrayList ();
+		protected static Hashtable htGhostTypes;
+		static string[] rgstrGhostTypes = {"System.Object", "System.ValueType", "System.Delegate", "System.Enum"};
+
+
+		static MissingNameSpace ()
+		{
+			htGhostTypes = new Hashtable ();
+
+			foreach (string strGhostType in rgstrGhostTypes)
+			{
+				htGhostTypes.Add (strGhostType, null);
+			}
+		}
+
+		public MissingNameSpace(string nameSpace, ArrayList _rgTypesMono, ArrayList _rgTypesMS)
+		{
+			strNamespace = nameSpace;
+			rgTypesMono = _rgTypesMono;
+			rgTypesMS = _rgTypesMS;
+			m_nodeStatus = new NodeStatus (_rgTypesMono, _rgTypesMS);
+		}
+
+		public virtual string [] MissingTypeNames (bool f)
+		{
+			return null;
+		}
+
+		public virtual ArrayList ToDoTypeNames
+		{
+			get { return null; }
+		}
+
+		public override string Name 
+		{
+			get { return strNamespace; }
+		}
+		public override string Type
+		{
+			get { return "namespace"; }
+		}
+
+
+		/// <summary>
+		/// first we go through all the microsoft types adding any mono types that match, or missing types otherwise
+		/// then we go through the unmatched mono types adding those
+		/// uses a hashtable to speed up lookups
+		/// </summary>
+		/// <returns></returns>
+		public override NodeStatus Analyze ()
+		{
+			Hashtable htMono = new Hashtable ();
+			if (rgTypesMono != null)
+			{
+				foreach (Type t in rgTypesMono)
+				{
+					htMono.Add (t.FullName, t);
+				}
+			}
+			if (rgTypesMS != null)
+			{
+				foreach (Type t in rgTypesMS)
+				{
+					Type tMono = (Type) htMono [t.FullName];
+					MissingType mt = null;
+					if (tMono == null)
+					{
+						if (t.IsPublic && !htGhostTypes.Contains (t.FullName))
+							mt = new MissingType (null, t);
+					}
+					else
+					{
+						htMono.Remove (t.FullName);
+						mt = new MissingType (tMono, t);
+					}
+					if (mt != null)
+					{
+						NodeStatus nsType = mt.Analyze ();
+						m_nodeStatus.AddChildren (nsType);
+						rgTypes.Add (mt);
+					}
+				}
+			}
+			// do any mono types that aren't in microsoft's namespace
+			foreach (Type tMono in htMono.Values)
+			{
+				if (tMono.IsPublic)
+				{
+					MissingType tdt = new MissingType (tMono, null);
+					NodeStatus nsType = tdt.Analyze ();
+					m_nodeStatus.AddChildren (nsType);
+					rgTypes.Add (tdt);
+				}
+			}
+			return m_nodeStatus;
+		}
+
+		public override XmlElement CreateXML (XmlDocument doc)
+		{
+			XmlElement eltNameSpace = base.CreateXML (doc);
+
+			// TODO: include complete namespaces?
+//			if (m_nodeStatus.statusCountsTotal.cMissing > 0 || m_nodeStatus.statusCountsTotal.cTodo > 0)
+			{
+				XmlElement eltClasses = doc.CreateElement("classes");
+				eltNameSpace.AppendChild (eltClasses);
+
+				foreach (MissingType type in rgTypes) 
+				{
+					XmlElement eltClass = type.CreateXML (doc);
+					if (eltClass != null)
+						eltClasses.AppendChild (eltClass);
+				}
+			}
+			return eltNameSpace;
+		}
+
+
+		public static ArrayList GetNamespaces(Type[] types) 
+		{
+			ArrayList nsList = new ArrayList();
+			foreach (Type t in types) 
+			{
+				if (!nsList.Contains(t.Namespace)) 
+				{
+					nsList.Add(t.Namespace);
+				}
+			}
+			return nsList;
+		}
+	}
+}
+
diff --git a/mcs/tools/corcompare/MissingNestedType.cs b/mcs/tools/corcompare/MissingNestedType.cs
new file mode 100644
index 00000000000..a2bc3417005
--- /dev/null
+++ b/mcs/tools/corcompare/MissingNestedType.cs
@@ -0,0 +1,36 @@
+// Mono.Util.CorCompare.MissingNestedType
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001-2002 Nick Drochak
+
+using System;
+using System.Reflection;
+
+namespace Mono.Util.CorCompare {
+
+	/// <summary>
+	/// 	Represents a class event that is completely missing
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Nick
+	/// 	created on - 2/24/2002 10:43:57 PM
+	/// </remarks>
+	class MissingNestedType : MissingMember {
+		// e.g. <method name="Equals" status="missing"/>
+		public MissingNestedType (MemberInfo infoMono, MemberInfo infoMS) : base (infoMono, infoMS) {}
+
+		public override string Type {
+			get {
+				return "nestedType";
+			}
+		}
+
+		public override string Name 
+		{
+			get { return Info.DeclaringType.Name + "+" + Info.Name; }
+		}
+
+	}
+}
diff --git a/mcs/tools/corcompare/MissingProperty.cs b/mcs/tools/corcompare/MissingProperty.cs
new file mode 100644
index 00000000000..d3eb711d4fb
--- /dev/null
+++ b/mcs/tools/corcompare/MissingProperty.cs
@@ -0,0 +1,108 @@
+// Mono.Util.CorCompare.MissingProperty
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001-2002 Nick Drochak
+
+using System;
+using System.Reflection;
+using System.Text;
+using System.Xml;
+
+namespace Mono.Util.CorCompare {
+
+	/// <summary>
+	/// 	Represents a missing property from a class
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Nick
+	/// 	created on - 2/20/2002 10:43:57 PM
+	/// </remarks>
+	class MissingProperty : MissingMember 
+	{
+		// e.g. <property name="Length" status="missing"/>
+		public MissingProperty (MemberInfo infoMono, MemberInfo infoMS) : base (infoMono, infoMS) {}
+
+		public override string Type 
+		{
+			get { return "property"; }
+		}
+
+		protected MissingMethod mmGet;
+		protected MissingMethod mmSet;
+
+		public override NodeStatus Analyze ()
+		{
+			m_nodeStatus = base.Analyze ();
+
+			PropertyInfo piMono = (PropertyInfo) mInfoMono;
+			PropertyInfo piMS   = (PropertyInfo) mInfoMS;
+
+			MemberInfo miGetMono, miSetMono;
+			if (piMono == null)
+				miGetMono = miSetMono = null;
+			else
+			{
+				miGetMono = piMono.GetGetMethod ();
+				miSetMono = piMono.GetSetMethod ();
+			}
+
+			MemberInfo miGetMS, miSetMS;
+			if (piMS == null)
+				miGetMS = miSetMS = null;
+			else
+			{
+				miGetMS = piMS.GetGetMethod ();
+				miSetMS = piMS.GetSetMethod ();
+			}
+
+			if (miGetMono != null || miGetMS != null)
+			{
+				mmGet = new MissingMethod (miGetMono, miGetMS);
+				m_nodeStatus.AddChildren (mmGet.Analyze ());
+			}
+			if (miSetMono != null || miSetMS != null)
+			{
+				mmSet = new MissingMethod (miSetMono, miSetMS);
+				m_nodeStatus.AddChildren (mmSet.Analyze ());
+			}
+
+			if (piMono != null && piMS != null)
+			{
+				string strTypeMono = piMono.PropertyType.FullName;
+				string strTypeMS   =   piMS.PropertyType.FullName;
+				if (strTypeMono != strTypeMS)
+					Status.AddWarning ("Invalid type: is '"+strTypeMono+"', should be '"+strTypeMS+"'");
+			}
+
+			return m_nodeStatus;
+		}
+
+		public override XmlElement CreateXML (XmlDocument doc)
+		{
+			XmlElement eltMember = base.CreateXML (doc);
+
+			if (mInfoMono != null)	// missing
+			{
+				if (mmGet != null || mmSet != null)
+				{
+					XmlElement eltAccessors = doc.CreateElement ("accessors");
+					eltMember.AppendChild (eltAccessors);
+
+					if (mmGet != null)
+					{
+						XmlElement eltGet = mmGet.CreateXML (doc);
+						eltAccessors.AppendChild (eltGet);
+					}
+					if (mmSet != null)
+					{
+						XmlElement eltSet = mmSet.CreateXML (doc);
+						eltAccessors.AppendChild (eltSet);
+					}
+				}
+			}
+			return eltMember;
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/MissingType.cs b/mcs/tools/corcompare/MissingType.cs
new file mode 100644
index 00000000000..013ec5503d3
--- /dev/null
+++ b/mcs/tools/corcompare/MissingType.cs
@@ -0,0 +1,493 @@
+// Mono.Util.CorCompare.MissingType
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001-2002 Nick Drochak
+
+using System;
+using System.Xml;
+using System.Reflection;
+using System.Collections;
+
+namespace Mono.Util.CorCompare 
+{
+
+	/// <summary>
+	/// 	Represents a class method that missing.
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Nick
+	/// 	created on - 2/20/2002 10:43:57 PM
+	/// </remarks>
+	class MissingType : MissingBase
+	{
+		// e.g. <class name="System.Byte" status="missing"/>
+		// e.g. <class name="System.Array" status="todo" missing="5" todo="6" complete="45">
+		Type typeMono, typeMS;
+//		ArrayList rgAttributes = new ArrayList ();
+		ArrayList rgMethods = new ArrayList ();
+		ArrayList rgProperties = new ArrayList ();
+		ArrayList rgEvents = new ArrayList ();
+		ArrayList rgFields = new ArrayList ();
+		ArrayList rgConstructors = new ArrayList ();
+		ArrayList rgNestedTypes = new ArrayList ();
+		ArrayList rgInterfaces = new ArrayList ();
+//		NodeStatus nsAttributes = new NodeStatus ();
+		NodeStatus nsMethods = new NodeStatus ();
+		NodeStatus nsProperties = new NodeStatus ();
+		NodeStatus nsEvents = new NodeStatus ();
+		NodeStatus nsFields = new NodeStatus ();
+		NodeStatus nsConstructors = new NodeStatus ();
+		NodeStatus nsNestedTypes = new NodeStatus ();
+		NodeStatus nsInterfaces = new NodeStatus ();
+
+		public MissingType (Type _typeMono, Type _typeMS)
+		{
+			typeMono = _typeMono;
+			typeMS = _typeMS;
+			m_nodeStatus = new NodeStatus (_typeMono, _typeMS);
+		}
+
+		public override string Name 
+		{
+			get
+			{
+				Type type = TypeInfoBest;
+				if (type.DeclaringType != null)
+					return type.DeclaringType.Name + "+" + type.Name;
+				return type.Name;
+			}
+		}
+
+		public override string Type
+		{
+			get
+			{
+				Type type = TypeInfo;
+				if (type.IsEnum)
+					return "enum";
+				else if (type.IsInterface)
+					return "interface";
+				else if (type.IsValueType)
+					return "struct";
+				else if (IsDelegate)
+					return "delegate";
+				else
+					return "class";
+			}
+		}
+
+		public Type TypeInfo
+		{
+			get { return (typeMono != null) ? typeMono : typeMS; }
+		}
+
+		public Type TypeInfoBest
+		{
+			get { return (typeMS == null) ? typeMono : typeMS; }
+		}
+
+		public bool IsDelegate
+		{
+			get
+			{
+				Type typeBest = TypeInfoBest;
+				if (typeBest.IsEnum || typeBest.IsInterface || typeBest.IsValueType)
+					return false;
+				Type type = typeBest.BaseType;
+				while (type != null)
+				{
+					if (type.FullName == "System.Delegate")
+						return true;
+					type = type.BaseType;
+				}
+				return false;
+			}
+		}
+
+		public MissingMember CreateMember (MemberInfo infoMono, MemberInfo infoMS)
+		{
+			MemberTypes mt = (infoMono != null) ? infoMono.MemberType : infoMS.MemberType;
+			MissingMember mm;
+			switch (mt)
+			{
+				case MemberTypes.Method:
+					mm = new MissingMethod (infoMono, infoMS);
+					break;
+				case MemberTypes.Property:
+					mm = new MissingProperty (infoMono, infoMS);
+					break;
+				case MemberTypes.Event:
+					mm = new MissingEvent (infoMono, infoMS);
+					break;
+				case MemberTypes.Field:
+					mm = new MissingField (infoMono, infoMS);
+					break;
+				case MemberTypes.Constructor:
+					mm = new MissingConstructor (infoMono, infoMS);
+					break;
+				case MemberTypes.NestedType:
+					mm = new MissingNestedType (infoMono, infoMS);
+					break;
+				default:
+					throw new Exception ("Unexpected MemberType: " + mt.ToString());
+			}
+			mm.Analyze ();
+			return mm;
+		}
+
+
+		public void AddMember (MissingMember mm)
+		{
+			switch (mm.Info.MemberType)
+			{
+				case MemberTypes.Method:
+					nsMethods.AddChildren (mm.Status);
+					rgMethods.Add (mm);
+					break;
+				case MemberTypes.Property:
+					nsProperties.AddChildren (mm.Status);
+					rgProperties.Add (mm);
+					break;
+				case MemberTypes.Event:
+					nsEvents.AddChildren (mm.Status);
+					rgEvents.Add (mm);
+					break;
+				case MemberTypes.Field:
+					nsFields.AddChildren (mm.Status);
+					rgFields.Add (mm);
+					break;
+				case MemberTypes.Constructor:
+					nsConstructors.AddChildren (mm.Status);
+					rgConstructors.Add (mm);
+					break;
+				case MemberTypes.NestedType:
+					nsNestedTypes.AddChildren (mm.Status);
+					rgNestedTypes.Add (mm);
+					break;
+				default:
+					throw new Exception ("Unexpected MemberType: " + mm.Info.ToString());
+			}
+		}
+
+		public void AddMember (MemberInfo infoMono, MemberInfo infoMS)
+		{
+			AddMember (CreateMember (infoMono, infoMS));
+		}
+
+		public override XmlElement CreateXML (XmlDocument doc)
+		{
+			XmlElement eltClass = base.CreateXML (doc);
+			XmlElement eltMember;
+
+			eltMember = MissingBase.CreateMemberCollectionElement ("methods", rgMethods, nsMethods, doc);
+			if (eltMember != null) 
+				eltClass.AppendChild (eltMember);
+
+			eltMember = MissingBase.CreateMemberCollectionElement ("properties", rgProperties, nsProperties, doc);
+			if (eltMember != null) 
+				eltClass.AppendChild (eltMember);
+
+			eltMember = MissingBase.CreateMemberCollectionElement ("events", rgEvents, nsEvents, doc);
+			if (eltMember != null) 
+				eltClass.AppendChild (eltMember);
+
+			eltMember = MissingBase.CreateMemberCollectionElement ("fields", rgFields, nsFields, doc);
+			if (eltMember != null) 
+				eltClass.AppendChild (eltMember);
+
+			eltMember = MissingBase.CreateMemberCollectionElement ("constructors", rgConstructors, nsConstructors, doc);
+			if (eltMember != null) 
+				eltClass.AppendChild (eltMember);
+
+			eltMember = MissingBase.CreateMemberCollectionElement ("nestedTypes", rgNestedTypes, nsNestedTypes, doc);
+			if (eltMember != null) 
+				eltClass.AppendChild (eltMember);
+
+			eltMember = MissingBase.CreateMemberCollectionElement ("interfaces", rgInterfaces, nsInterfaces, doc);
+			if (eltMember != null) 
+				eltClass.AppendChild (eltMember);
+
+			return eltClass;
+		}
+
+		public override NodeStatus Analyze ()
+		{
+			Hashtable htMono = new Hashtable ();
+			if (typeMono != null)
+			{
+				ArrayList rgIgnoreMono = new ArrayList ();
+				foreach (MemberInfo miMono in typeMono.GetMembers (BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic))
+				{
+					if (typeMono == miMono.DeclaringType)
+					{
+						string strName = MissingMember.GetUniqueName (miMono);
+						htMono.Add (strName, miMono);
+
+						// ignore any property/event accessors
+						if (miMono.MemberType == MemberTypes.Property)
+						{
+							PropertyInfo pi = (PropertyInfo) miMono;
+							MemberInfo miGet = pi.GetGetMethod ();
+							if (miGet != null)
+								rgIgnoreMono.Add (miGet);
+							MemberInfo miSet = pi.GetSetMethod ();
+							if (miSet != null)
+								rgIgnoreMono.Add (miSet);
+						}
+						else if (miMono.MemberType == MemberTypes.Event)
+						{
+							EventInfo ei = (EventInfo) miMono;
+							MemberInfo miAdd = ei.GetAddMethod ();
+							if (miAdd != null)
+								rgIgnoreMono.Add (miAdd);
+							MemberInfo miRemove = ei.GetRemoveMethod ();
+							if (miRemove != null)
+								rgIgnoreMono.Add (miRemove);
+							MemberInfo miRaise = ei.GetRaiseMethod ();
+							if (miRaise != null)
+								rgIgnoreMono.Add (miRaise);
+						}
+					}
+				}
+				foreach (MemberInfo miIgnore in rgIgnoreMono)
+					htMono.Remove (MissingMember.GetUniqueName (miIgnore));
+			}
+			Hashtable htMethodsMS = new Hashtable ();
+			if (typeMS != null)
+			{
+				ICollection colMembersMS = typeMS.GetMembers (BindingFlags.Static | BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
+				Hashtable htIgnoreMS = new Hashtable ();
+				foreach (MemberInfo miMS in colMembersMS)
+				{
+					// ignore any property/event accessors
+					if (miMS.MemberType == MemberTypes.Property)
+					{
+						PropertyInfo pi = (PropertyInfo) miMS;
+						MemberInfo miGet = pi.GetGetMethod ();
+						if (miGet != null)
+							htIgnoreMS.Add (miGet, miMS);
+						MemberInfo miSet = pi.GetSetMethod ();
+						if (miSet != null)
+							htIgnoreMS.Add (miSet, miMS);
+					}
+					else if (miMS.MemberType == MemberTypes.Event)
+					{
+						EventInfo ei = (EventInfo) miMS;
+						MemberInfo miAdd = ei.GetAddMethod ();
+						if (miAdd != null)
+							htIgnoreMS.Add (miAdd, miMS);
+						MemberInfo miRemove = ei.GetRemoveMethod ();
+						if (miRemove != null)
+							htIgnoreMS.Add (miRemove, miMS);
+						MemberInfo miRaise = ei.GetRaiseMethod ();
+						if (miRaise != null)
+							htIgnoreMS.Add (miRaise, miMS);
+					}
+				}
+				foreach (MemberInfo miMS in colMembersMS)
+				{
+					if (miMS != null && miMS.DeclaringType == typeMS && !htIgnoreMS.Contains (miMS))
+					{
+						string strNameUnique = MissingMember.GetUniqueName (miMS);
+						MemberInfo miMono = (MemberInfo) htMono [strNameUnique];
+
+						MissingMember mm = CreateMember (miMono, miMS);
+
+						bool fVisibleMS = IsVisible (miMS);
+						if (miMono == null)
+						{
+							if (fVisibleMS)
+								AddMember (mm);
+						}
+						else
+						{
+							if (miMono.MemberType != miMS.MemberType)
+							{
+								//AddMember (null, miMS);
+								//MissingMember mm2 = CreateMember (miMono, null);
+								//mm2.Status.AddWarning ("MemberType mismatch, is: '" + miMono.MemberType.ToString () + "' [should be: '" + miMS.MemberType.ToString ()+"']");
+								//AddMember (mm2);
+								mm.Status.AddWarning ("MemberType mismatch, is: '" + miMono.MemberType.ToString () + "' [should be: '" + miMS.MemberType.ToString ()+"']");
+								AddMember (mm);
+							}
+							else if (fVisibleMS || IsVisible (miMono))
+							{
+								AddMember (mm);
+							}
+
+							htMono.Remove (strNameUnique);
+						}
+
+						switch (miMS.MemberType)
+						{
+							case MemberTypes.Method:
+							{
+								string strNameMSFull = miMS.ToString ();
+								int ichMS = strNameMSFull.IndexOf (' ');
+								string strNameMS = strNameMSFull.Substring (ichMS + 1);
+								if (!htMethodsMS.Contains (strNameMS))
+									htMethodsMS.Add (strNameMSFull.Substring (ichMS + 1), miMS);
+								break;
+							}
+						}
+					}
+				}
+			}
+			foreach (MemberInfo miMono in htMono.Values)
+			{
+				if (IsVisible (miMono))
+				{
+					MissingMember mm = CreateMember (miMono, null);
+					switch (miMono.MemberType)
+					{
+						case MemberTypes.Method:
+						{
+							string strNameMonoFull = miMono.ToString ();
+							int ichMono = strNameMonoFull.IndexOf (' ');
+							string strNameMono = strNameMonoFull.Substring (ichMono + 1);
+							MemberInfo miMS = (MemberInfo) htMethodsMS [strNameMono];
+							if (miMS != null)
+							{
+								string strNameMSFull = miMS.ToString ();
+								int ichMS = strNameMSFull.IndexOf (' ');
+								string strReturnTypeMS = strNameMSFull.Substring (0, ichMS);
+								string strReturnTypeMono = strNameMonoFull.Substring (0, ichMono);
+								mm.Status.AddWarning ("Return type mismatch, is: '"+strReturnTypeMono+"' [should be: '"+strReturnTypeMS+"']");
+								//Console.WriteLine ("WARNING: Return type mismatch on "+miMS.DeclaringType.FullName+"."+strNameMono+", is: '"+strReturnTypeMono+"' [should be: '"+strReturnTypeMS+"']");
+							}
+							break;
+						}
+					}
+					AddMember (mm);
+				}
+			}
+
+			// compare the attributes
+			rgAttributes = new ArrayList ();
+			nsAttributes = MissingAttribute.AnalyzeAttributes (
+				(typeMono == null) ? null : typeMono.GetCustomAttributes (false),
+				(  typeMS == null) ? null :   typeMS.GetCustomAttributes (false),
+				rgAttributes);
+
+			rgInterfaces = new ArrayList ();
+			if (typeMono != null && typeMS != null)
+			{
+				// compare base types
+				string strBaseMono = (typeMono.BaseType == null) ? null : typeMono.BaseType.FullName;
+				string strBaseMS   = (  typeMS.BaseType == null) ? null :   typeMS.BaseType.FullName;
+				if (strBaseMono != strBaseMS)
+				{
+					m_nodeStatus.AddWarning ("Base class mismatch, is '"+strBaseMono+"' [should be: '"+strBaseMS+"']");
+					//Console.WriteLine ("WARNING: Base class mismatch on "+typeMono.FullName+", is: '"+strBaseMono+"' [should be: '"+strBaseMS+"']");
+				}
+
+				// compare the interfaces
+				Hashtable htInterfacesMono = new Hashtable ();
+				Type [] rgInterfacesMono = typeMono.GetInterfaces ();
+				foreach (Type ifaceMono in rgInterfacesMono)
+				{
+					if (ifaceMono != null)
+					{
+						string strName = ifaceMono.FullName;
+						htInterfacesMono.Add (strName, ifaceMono);
+					}
+				}
+				Type [] rgInterfacesMS = typeMS.GetInterfaces ();
+				foreach (Type ifaceMS in rgInterfacesMS)
+				{
+					if (ifaceMS != null)
+					{
+						string strName = ifaceMS.FullName;
+						Type ifaceMono = (Type) htInterfacesMono [strName];
+						MissingInterface mi = new MissingInterface (ifaceMono, ifaceMS);
+						mi.Analyze ();
+						rgInterfaces.Add (mi);
+						if (ifaceMono != null)
+							htInterfacesMono.Remove (strName);
+						nsInterfaces.AddChildren (mi.Status);
+					}
+				}
+				foreach (Type ifaceMono in htInterfacesMono.Values)
+				{
+					MissingInterface mi = new MissingInterface (ifaceMono, null);
+					mi.Analyze ();
+					rgInterfaces.Add (mi);
+					//Console.WriteLine ("WARNING: additional interface on "+typeMono.FullName+": '"+ifaceMono.FullName+"'");
+					nsInterfaces.AddChildren (mi.Status);
+				}
+
+				// serializable attribute
+				AddFakeAttribute (typeMono.IsSerializable, typeMS.IsSerializable, "System.SerializableAttribute");
+				AddFakeAttribute (typeMono.IsAutoLayout, typeMS.IsAutoLayout, "System.AutoLayoutAttribute");
+				AddFakeAttribute (typeMono.IsExplicitLayout, typeMS.IsExplicitLayout, "System.ExplicitLayoutAttribute");
+				AddFakeAttribute (typeMono.IsLayoutSequential, typeMS.IsLayoutSequential, "System.SequentialLayoutAttribute");
+
+				Accessibility accessibilityMono = GetAccessibility (typeMono);
+				Accessibility accessibilityMS   = GetAccessibility (typeMS);
+				if (accessibilityMono != accessibilityMS)
+					m_nodeStatus.AddWarning ("Should be "+AccessibilityToString (accessibilityMono));
+
+				AddFlagWarning (typeMono.IsSealed, typeMS.IsSealed, "sealed");
+				AddFlagWarning (typeMono.IsAbstract, typeMS.IsAbstract, "abstract");
+			}
+
+			// sum up the sub-sections
+			m_nodeStatus.Add (nsAttributes);
+			m_nodeStatus.Add (nsMethods);
+			m_nodeStatus.Add (nsProperties);
+			m_nodeStatus.Add (nsEvents);
+			m_nodeStatus.Add (nsFields);
+			m_nodeStatus.Add (nsConstructors);
+			m_nodeStatus.Add (nsNestedTypes);
+			m_nodeStatus.Add (nsInterfaces);
+
+			return m_nodeStatus;
+		}
+
+		static bool IsVisible (MemberInfo mi)
+		{
+			// this is just embarrasing, couldn't they have virtualized this?
+			switch (mi.MemberType)
+			{
+				case MemberTypes.Constructor:
+				case MemberTypes.Method:
+					return !((MethodBase) mi).IsPrivate && !((MethodBase) mi).IsFamilyAndAssembly && !((MethodBase) mi).IsAssembly;
+				case MemberTypes.Field:
+					return !((FieldInfo) mi).IsPrivate && !((FieldInfo) mi).IsFamilyAndAssembly && !((FieldInfo) mi).IsAssembly;
+				case MemberTypes.NestedType:
+					return !((Type) mi).IsNestedPrivate;
+				case MemberTypes.Property:	// great, now we have to look at the methods
+					PropertyInfo pi = (PropertyInfo) mi;
+					MethodInfo miAccessor = pi.GetGetMethod ();
+					if (miAccessor == null)
+						miAccessor = pi.GetSetMethod ();
+					if (miAccessor == null)
+						return false;
+					return IsVisible (miAccessor);
+				case MemberTypes.Event:	// ditto
+					EventInfo ei = (EventInfo) mi;
+					MethodInfo eiAccessor = ei.GetAddMethod ();
+					if (eiAccessor == null)
+						eiAccessor = ei.GetRemoveMethod ();
+					if (eiAccessor == null)
+						eiAccessor = ei.GetRaiseMethod ();
+					if (eiAccessor == null)
+						return false;
+					return IsVisible (eiAccessor);
+				default:
+					throw new Exception ("Missing handler for MemberType: "+mi.MemberType.ToString ());
+			}
+		}
+
+		static Accessibility GetAccessibility (Type type)
+		{
+			if (type.IsPublic)
+				return Accessibility.Public;
+			else if (type.IsNotPublic)
+				return Accessibility.Private;
+			return MissingMember.GetAccessibility (type);
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/TODO b/mcs/tools/corcompare/TODO
new file mode 100644
index 00000000000..355c8351eab
--- /dev/null
+++ b/mcs/tools/corcompare/TODO
@@ -0,0 +1,16 @@
+TODO

+for CorCompare - 2002/02/25

+

+	* The "methods" for a property's set and get are listed in the methods

+	element.  It would be cool to take them out of there and show that

+	info in the property element, like "SomeProp{ get; set; } if it's missing

+	both.

+

+	* The constructors are just listed as ".ctor" which is not very verbose.

+	What we really need here is the parameter list too, but I couldn't find

+	a way to get the parameters for constructors, only methods.

+

+	* Missing attributes on classes and members are not included at all.

+	

+	* Compare other assemblies besides corlib (then change name of

+	the utility of course :)
\ No newline at end of file
diff --git a/mcs/tools/corcompare/ToDoAssembly.cs b/mcs/tools/corcompare/ToDoAssembly.cs
new file mode 100644
index 00000000000..d95c0a42783
--- /dev/null
+++ b/mcs/tools/corcompare/ToDoAssembly.cs
@@ -0,0 +1,199 @@
+// Mono.Util.CorCompare.ToDoAssembly
+//
+// Author(s):
+//   Nick Drochak (ndrochak@gol.com)
+//
+// (C) 2001-2002 Nick Drochak
+
+using System;
+using System.Reflection;
+using System.Collections;
+using System.IO;
+using System.Text;
+using System.Xml;
+
+namespace Mono.Util.CorCompare {
+
+	/// <summary>
+	/// 	Represents an assembly that has missing or MonoTODO classes
+	/// </summary>
+	/// <remarks>
+	/// 	created by - Nick
+	/// 	created on - 2/20/2002 10:43:57 PM
+	/// </remarks>
+	class ToDoAssembly : MissingBase
+	{
+		// these types are in mono corlib, but not in the dll we are going to examine.
+		ArrayList MissingTypes = new ArrayList();
+		ArrayList rgNamespaces = new ArrayList();
+		string strName;
+		Assembly assMono;
+		Assembly assMS;
+		Type [] rgTypesMono;
+		Type [] rgTypesMS;
+
+		protected static Hashtable htGhostTypes;
+		private static string[] rgstrGhostTypes = {"System.Object", "System.ValueType", "System.Delegate", "System.Enum"};
+
+
+		static ToDoAssembly ()
+		{
+			htGhostTypes = new Hashtable ();
+
+			foreach (string strGhostType in rgstrGhostTypes)
+			{
+				htGhostTypes.Add (strGhostType, null);
+			}
+		}
+
+		public static ToDoAssembly Load (string strFileMono, string strName, string strNameMS)
+		{
+			Assembly assemblyMono = Assembly.LoadFrom (strFileMono);
+			Assembly assemblyMS = Assembly.LoadWithPartialName (strNameMS);
+
+			return new ToDoAssembly (strName, assemblyMono, assemblyMS);
+		}
+
+		public ToDoAssembly (string _strName, Assembly _assMono, Assembly _assMS)
+		{
+			strName = _strName;
+			assMono = _assMono;
+			assMS = _assMS;
+
+			rgTypesMono = assMono.GetTypes ();
+			rgTypesMS = assMS.GetTypes ();
+			m_nodeStatus = new NodeStatus (_assMono, _assMS);
+		}
+
+		public override string Name {
+			get {
+				return strName;
+			}
+		}
+
+		public override string Type
+		{
+			get { return "assembly"; }
+		}
+
+		private Hashtable GetNamespaceMap (Type [] rgTypes)
+		{
+			Hashtable mapTypes = new Hashtable ();
+			foreach (Type t in rgTypes)
+			{
+				if (t != null)
+				{
+					string strName = t.FullName;
+					string strNamespace = t.Namespace;
+					if (strNamespace != null && strNamespace.Length > 0 &&
+						strName != null && strName.Length > 0 &&
+						!strNamespace.StartsWith ("Microsoft.") &&
+						!htGhostTypes.Contains (strName))
+					{
+						ArrayList rgContainedTypes = (ArrayList) mapTypes [strNamespace];
+						if (rgContainedTypes == null)
+						{
+							rgContainedTypes = new ArrayList ();
+							mapTypes [strNamespace] = rgContainedTypes;
+						}
+						rgContainedTypes.Add (t);
+					}
+				}
+			}
+			return mapTypes;
+		}
+
+		public override NodeStatus Analyze ()
+		{
+			Hashtable mapTypesMono = GetNamespaceMap (rgTypesMono);
+			Hashtable mapTypesMS = GetNamespaceMap (rgTypesMS);
+
+			foreach (string strNamespaceMS in mapTypesMS.Keys)
+			{
+				if (strNamespaceMS != null)
+				{
+					ArrayList rgContainedTypesMS = (ArrayList) mapTypesMS [strNamespaceMS];
+					ArrayList rgContainedTypesMono = (ArrayList) mapTypesMono [strNamespaceMS];
+					MissingNameSpace mns = new MissingNameSpace (strNamespaceMS, rgContainedTypesMono, rgContainedTypesMS);
+					NodeStatus nsNamespace = mns.Analyze ();
+					m_nodeStatus.AddChildren (nsNamespace);
+					if (rgTypesMono != null)
+						mapTypesMono.Remove (strNamespaceMS);
+					rgNamespaces.Add (mns);
+				}
+			}
+			foreach (string strNamespaceMono in mapTypesMono.Keys)
+			{
+				if (strNamespaceMono != null)
+				{
+					ArrayList rgContainedTypesMono = (ArrayList) mapTypesMono [strNamespaceMono];
+					MissingNameSpace mns = new MissingNameSpace (strNamespaceMono, rgContainedTypesMono, null);
+					NodeStatus nsNamespace = mns.Analyze ();
+					m_nodeStatus.AddChildren (nsNamespace);
+					rgNamespaces.Add (mns);
+				}
+			}
+
+			rgAttributes = new ArrayList ();
+			NodeStatus nsAttributes = MissingAttribute.AnalyzeAttributes (
+				assMono.GetCustomAttributes (true),
+				assMS.GetCustomAttributes (true),
+				rgAttributes);
+			m_nodeStatus.Add (nsAttributes);
+
+			return m_nodeStatus;
+		}
+
+
+		public string CreateClassListReport() {
+			Analyze ();
+			if (rgNamespaces.Count == 0) return "";
+
+			StringBuilder output = new StringBuilder();
+			foreach (MissingNameSpace ns in rgNamespaces)
+			{
+				string[] missingTypes = ns.MissingTypeNames(true);
+				if (missingTypes != null && missingTypes.Length > 0) {
+					string joinedNames = String.Join("\n", missingTypes);
+					output.Append(joinedNames + "\n");
+				}
+			}
+			return output.ToString();
+		}
+
+		public override XmlElement CreateXML (XmlDocument doc)
+		{
+			XmlElement assemblyElem = base.CreateXML (doc);
+
+			if (rgNamespaces.Count > 0)
+			{
+				XmlElement eltNamespaces = doc.CreateElement ("namespaces");
+				assemblyElem.AppendChild (eltNamespaces);
+
+				foreach (MissingNameSpace ns in rgNamespaces)
+				{
+					XmlElement eltNameSpace = ns.CreateXML (doc);
+					if (eltNameSpace != null)
+						eltNamespaces.AppendChild (eltNameSpace);
+				}
+			}
+			return assemblyElem;
+		}
+
+		public void CreateXMLReport(string filename) {
+			Analyze();
+
+			XmlDocument outDoc;
+			outDoc = new XmlDocument();
+			outDoc.AppendChild(outDoc.CreateXmlDeclaration("1.0", null, null));
+
+			XmlElement assembliesElem = outDoc.CreateElement("assemblies");
+			outDoc.AppendChild(assembliesElem);
+
+			XmlElement assemblyElem = CreateXML (outDoc);
+			assembliesElem.AppendChild(assemblyElem);
+
+			outDoc.Save(filename);
+		}
+	}
+}
diff --git a/mcs/tools/corcompare/corcompare.build b/mcs/tools/corcompare/corcompare.build
new file mode 100644
index 00000000000..111cd018363
--- /dev/null
+++ b/mcs/tools/corcompare/corcompare.build
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+
+<project name="CorCompare" default="linux">
+	<target name="linux">
+		<csc target="exe" output="./CorCompare.exe" debug="true">
+			<sources>
+				<includes name="*.cs" />
+			</sources>
+		</csc>
+	</target>
+
+</project>
diff --git a/mcs/tools/corcompare/cormissing.xsl b/mcs/tools/corcompare/cormissing.xsl
new file mode 100644
index 00000000000..a87c396354c
--- /dev/null
+++ b/mcs/tools/corcompare/cormissing.xsl
@@ -0,0 +1,424 @@
+<?xml version="1.0" ?>
+<xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform" version="1.0">
+
+	<xsl:output method="html" indent="no"/>
+	<!--	<xsl:output method="xml"/>-->
+	<xsl:strip-space elements="*"/>
+
+	<xsl:template match="/">
+<!--
+		<HTML>
+			<HEAD>
+				<TITLE>
+					Mono Class Library Status
+				</TITLE>
+				<SCRIPT src="cormissing.js"></SCRIPT>
+				<LINK rel="stylesheet" type="text/css" href="cormissing.css"></LINK>
+			</HEAD>
+			<BODY onLoad="onLoad();">
+				<P>
+					<H1>Mono Class Library Status</H1>
+				</P>
+-->
+				<P>
+					<TABLE>
+						<TR>
+							<TD> <INPUT type="checkbox" ID="todo" onClick="selectTodo();" checked="1"/> </TD>
+							<TD> <IMG src="cm/st.gif"/> </TD>
+							<TD> TODO </TD>
+							<TD width="20"/>
+							<TD> <INPUT type="checkbox" ID="missing" onClick="selectMissing();" checked="1"/> </TD>
+							<TD> <IMG src="cm/sm.gif"/> </TD>
+							<TD> Missing </TD>
+						</TR>
+						<TR>
+							<TD> <INPUT type="checkbox" ID="extra" onClick="selectExtra();" checked="1"/> </TD>
+							<TD> <IMG src="cm/sx.gif"/> </TD>
+							<TD> Extra </TD>
+							<TD width="20"/>
+							<TD> <INPUT type="checkbox" ID="errors" onClick="selectErrors();" checked="1"/> </TD>
+							<TD> <IMG src="cm/se.gif"/> </TD>
+							<TD> Errors </TD>
+						</TR>
+						<TR>
+							<TD> </TD>
+							<TD> <IMG src="cm/sc.gif"/> </TD>
+							<TD> Completed </TD>
+						</TR>
+					</TABLE>
+				</P>
+				<DIV ID="ROOT">
+					<xsl:apply-templates/>
+				</DIV>
+<!--
+			</BODY>
+		</HTML>
+-->
+	</xsl:template>
+
+
+
+	<!-- assembly -->
+	<xsl:template match="/assemblies">
+		<xsl:apply-templates select="assembly">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="assemblies/assembly[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">y</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<!-- namespace -->
+	<xsl:template match="assembly/namespaces">
+		<xsl:apply-templates select="namespace">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="namespaces/namespace[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">n</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<xsl:template match="namespace/classes">
+		<xsl:apply-templates select="interface">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+		<xsl:apply-templates select="class">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+		<xsl:apply-templates select="struct">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+		<xsl:apply-templates select="delegate">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+		<xsl:apply-templates select="enum">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+
+	<!-- class -->
+	<xsl:template match="classes/class[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">c</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates select="attributes"/>
+				<xsl:apply-templates select="interfaces"/>
+				<xsl:apply-templates select="constructors"/>
+				<xsl:apply-templates select="./*[local-name() != 'attributes' and local-name() != 'constructors' and local-name() != 'interfaces']"/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<!-- struct -->
+	<xsl:template match="classes/struct[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">s</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+
+	<!-- interface -->
+	<xsl:template match="interfaces">
+		<xsl:apply-templates select="interface">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="interface[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">i</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<!-- delegate -->
+	<xsl:template match="classes/delegate[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">d</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<!-- enumeration -->
+	<xsl:template match="classes/enum[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">en</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<!-- method -->
+	<xsl:template match="methods">
+		<xsl:apply-templates select="method">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="methods/method[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">m</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<!-- property -->
+	<xsl:template match="properties">
+		<xsl:apply-templates select="property">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="properties/property[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">p</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<!-- event -->
+	<xsl:template match="events">
+		<xsl:apply-templates select="event">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="events/event[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">e</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<!-- constructor -->
+	<xsl:template match="constructors">
+		<xsl:apply-templates select="constructor">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="constructors/constructor[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">x</xsl:with-param>
+				<xsl:with-param name="image">m</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<!-- field -->
+	<xsl:template match="fields">
+		<xsl:apply-templates select="field">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="fields/field[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">f</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+	<!-- accessor -->
+	<xsl:template match="property/accessors">
+		<xsl:apply-templates select="method">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="property[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]/accessors/method[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">o</xsl:with-param>
+				<xsl:with-param name="image">m</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+	<!-- attribute -->
+	<xsl:template match="attributes">
+		<xsl:apply-templates select="attribute">
+			<xsl:sort select="@name"/>
+		</xsl:apply-templates>
+	</xsl:template>
+
+	<xsl:template match="attributes/attribute[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+		<DIV>
+			<xsl:call-template name="ELEMENT">
+				<xsl:with-param name="class">r</xsl:with-param>
+			</xsl:call-template>
+			<xsl:if test="not(@presence)">
+				<xsl:apply-templates/>
+			</xsl:if>
+		</DIV>
+	</xsl:template>
+
+
+
+	<!-- support templates -->
+
+	<xsl:template name="ELEMENT">
+		<xsl:param name="class"/>
+		<xsl:param name="image"/>
+			<xsl:attribute name="class">
+				<xsl:value-of select="$class"/>
+				<xsl:if test="./node() and local-name() != 'assembly'">_</xsl:if>
+			</xsl:attribute>
+			<xsl:call-template name="toggle"/>
+			<xsl:choose>
+				<xsl:when test="@error != 'todo'">
+					<xsl:element name="img">
+						<xsl:attribute name="src">cm/se.gif</xsl:attribute>
+						<xsl:attribute name="class">t</xsl:attribute>
+						<xsl:attribute name="title"><xsl:apply-templates select="warnings/warning" mode="hover"/></xsl:attribute>
+					</xsl:element>
+				</xsl:when>
+				<xsl:when test="@error = 'todo'">
+					<img src="cm/st.gif" class="t"/>
+				</xsl:when>
+				<xsl:when test="@presence = 'missing'">
+					<img src="cm/sm.gif" class="t"/>
+				</xsl:when>
+				<xsl:when test="@presence = 'extra'">
+					<img src="cm/sx.gif" class="t"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<img src="cm/sc.gif" class="t"/>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:choose>
+				<xsl:when test="$image">
+					<img src="cm/{$image}.gif" class="t"/>
+				</xsl:when>
+				<xsl:otherwise>
+					<img src="cm/{$class}.gif" class="t"/>
+				</xsl:otherwise>
+			</xsl:choose>
+			<xsl:call-template name="name"/>
+			<xsl:if test="not(@presence)">
+				<xsl:call-template name="status"/>
+			</xsl:if>
+	</xsl:template>
+
+	<xsl:template name="status">
+		<xsl:if test="@complete and @complete != 0">
+			<SPAN class="st">
+				<img src="cm/sc.gif"/>: <xsl:value-of select="@complete"/>%
+			</SPAN>
+		</xsl:if>
+		<xsl:if test="@todo_total">
+			<SPAN class="st">
+				<img src="cm/st.gif"/>: <xsl:value-of select="@todo_total"/>
+			</SPAN>
+		</xsl:if>
+		<xsl:if test="@missing_total">
+			<SPAN class="st">
+				<img src="cm/sm.gif"/>: <xsl:value-of select="@missing_total"/>
+			</SPAN>
+		</xsl:if>
+		<xsl:if test="@extra_total">
+			<SPAN class="st">
+				<img src="cm/sx.gif"/>: <xsl:value-of select="@extra_total"/>
+			</SPAN>
+		</xsl:if>
+		<xsl:if test="@warning_total">
+			<SPAN class="st">
+				<img src="cm/se.gif"/>: <xsl:value-of select="@warning_total"/>
+			</SPAN>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template name="toggle">
+		<xsl:choose>
+			<xsl:when test="not(@presence) and .//*[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence] and local-name() != 'assembly'">
+				<IMG src="cm/tp.gif" class="t"/>
+			</xsl:when>
+			<xsl:when test="not(@presence) and .//*[@missing_total or @todo_total or @extra_total or @warning_total or @error or @presence]">
+				<IMG src="cm/tm.gif" class="t"/>
+			</xsl:when>
+			<xsl:otherwise>
+				<IMG src="cm/tb.gif"/>
+			</xsl:otherwise>
+		</xsl:choose>
+	</xsl:template>
+
+	<xsl:template name="name">
+		<xsl:if test="@name">
+			<SPAN class="l"><xsl:value-of select="@name"/></SPAN>
+		</xsl:if>
+	</xsl:template>
+
+	<xsl:template match="warnings/warning" mode="hover"> WARNING: <xsl:value-of select="@text"/>
+	</xsl:template>
+
+</xsl:stylesheet>
diff --git a/mcs/tools/corcompare/transform.js b/mcs/tools/corcompare/transform.js
new file mode 100644
index 00000000000..9b23b3f6dea
--- /dev/null
+++ b/mcs/tools/corcompare/transform.js
@@ -0,0 +1,11 @@
+var xml = WScript.CreateObject ("MSXML2.DOMDocument");
+var xsl = WScript.CreateObject ("MSXML2.DOMDocument");
+
+xml.async = false;
+xsl.async = false;
+
+xml.load (WScript.Arguments (0));
+xsl.load (WScript.Arguments (1));
+
+WScript.Echo (xml.transformNode (xsl));
+
diff --git a/mcs/tools/ictool/Makefile b/mcs/tools/ictool/Makefile
new file mode 100644
index 00000000000..27fae41ae61
--- /dev/null
+++ b/mcs/tools/ictool/Makefile
@@ -0,0 +1,10 @@
+CSC=csc.exe
+CSCFLAGS=/nologo /debug+ /debug:full 
+
+all: ictool.exe
+
+ictool.exe: ictool.cs depgraph.cs peer.cs
+	$(CSC) $(CSCFLAGS) /out:ictool.exe ictool.cs depgraph.cs peer.cs
+
+clean:
+	rm -f *.exe *.pdb *.dll
diff --git a/mcs/tools/ictool/depgraph.cs b/mcs/tools/ictool/depgraph.cs
new file mode 100644
index 00000000000..57e96ff3e9c
--- /dev/null
+++ b/mcs/tools/ictool/depgraph.cs
@@ -0,0 +1,69 @@
+//

+// file:	depgraph.cs

+// author:	Dan Lewis (dihlewis@yahoo.co.uk)

+// 		(C) 2002

+//

+

+using System;

+using System.Collections;

+

+class DependencyGraph {

+	public DependencyGraph () {

+		nodes = new Hashtable ();

+	}

+

+	public void AddNode (object o) {

+		if (!nodes.Contains (o))

+			nodes.Add (o, new Node (o));

+	}

+

+	public void AddEdge (object from, object to) {

+		if (!nodes.Contains (from))

+			AddNode (from);

+		if (!nodes.Contains (to))

+			AddNode (from);

+

+		Node from_node = (Node)nodes[from];

+		Node to_node = (Node)nodes[to];

+

+		from_node.edges.Add (to_node);

+	}

+

+	public IList TopologicalSort () {

+		foreach (Node node in nodes.Values)

+			node.marked = false;

+

+		IList list = new ArrayList ();

+		foreach (Node node in nodes.Values) {

+			if (!node.marked)

+				Visit (node, list);

+		}

+

+		return list;

+	}

+

+	// private

+

+	private void Visit (Node node, IList list) {

+		node.marked = true;

+		foreach (Node adj in node.edges) {

+			if (!adj.marked)

+				Visit (adj, list);

+		}

+

+		list.Insert (0, node.value);

+	}

+

+	private class Node {

+		public Node (object o) {

+			this.value = o;

+			this.edges = new ArrayList ();

+		}

+

+		public object value;

+		public ArrayList edges;

+		public bool marked;

+	}

+

+	private Hashtable nodes;

+}

diff --git a/mcs/tools/ictool/ictool-config.xml b/mcs/tools/ictool/ictool-config.xml
new file mode 100644
index 00000000000..9716dc6ee04
--- /dev/null
+++ b/mcs/tools/ictool/ictool-config.xml
@@ -0,0 +1,105 @@
+<config>

+	<!-- assembly inputs -->

+	

+	<assemblypath path="..\..\class\lib"/>

+

+	<assembly file="corlib_cmp.dll"/>

+	<assembly file="System.dll"/>

+

+	<!-- output files -->

+

+	<outputpath path="."/>

+

+	<outputfile name="types" file="icall_types.h">

+		<include><![CDATA[#include "icall.h"]]></include>

+	</outputfile>

+

+	<outputfile name="methods" file="icall_methods.h"/>

+	<outputfile name="map" file="icall_map.c"/>

+

+	<!-- typemap -->

+

+	<typemap>

+		<!-- base types -->

+

+		<namespace name="System">

+

+			<!-- default types are taken from the running assembly -->

+

+			<type name="Object" peer="MonoObject" opaque="true" default="true"/>

+

+			<type name="Void" peer="void" opaque="true" default="true"/>

+			<type name="Boolean" peer="MonoBoolean" opaque="true" default="true"/>

+			<type name="Int64" peer="gint64" opaque="true" default="true"/>

+			<type name="Int32" peer="gint32" opaque="true" default="true"/>

+			<type name="Int16" peer="gint16" opaque="true" default="true"/>

+			<type name="Byte" peer="gint8" opaque="true" default="true"/>

+			<type name="UInt64" peer="guint64" opaque="true" default="true"/>

+			<type name="UInt32" peer="guint32" opaque="true" default="true"/>

+			<type name="UInt16" peer="guint16" opaque="true" default="true"/>

+			<type name="SByte" peer="guint8" opaque="true" default="true"/>

+			<type name="IntPtr" peer="gpointer" opaque="true" default="true"/>

+			<type name="UIntPtr" peer="gpointer" opaque="true" default="true"/>

+			<type name="Single" peer="gfloat" opaque="true" default="true"/>

+			<type name="Double" peer="gdouble" opaque="true" default="true"/>

+			<type name="Char" peer="gunichar2" opaque="true" default="true"/>

+			<type name="Array" peer="MonoArray" opaque="true" default="true"/>

+

+			<!-- non-defaulting system types -->

+

+			<type name="Decimal" peer="decimal_repr" opaque="true"/>

+			<type name="String" peer="MonoString" opaque="true"/>

+

+		</namespace>

+

+		<!-- reflection types -->

+

+		<namespace name="System">

+			<type name="RuntimeTypeHandle" peer="MonoType *" opaque="true"/>

+			<type name="RuntimeMethodHandle" peer="MonoMethod *" opaque="true"/>

+			<type name="RuntimeFieldHandle" peer="MonoClassField *" opaque="true"/>

+

+			<type name="Type" peer="MonoReflectionType"/>

+			<type name="MonoTypeInfo" peer="MonoTypeInfo"/>

+			<type name="MonoEnumInfo" peer="MonoEnumInfo"/>

+		</namespace>

+

+		<namespace name="System.Reflection">

+			<type name="MonoMethod" peer="MonoReflectionMethod"/>

+			<type name="MonoField" peer="MonoReflectionField"/>

+			<type name="MonoFieldInfo" peer="MonoFieldInfo"/>

+			<type name="MonoProperty" peer="MonoReflectionProperty"/>

+			<type name="ParameterInfo" peer="MonoParameterInfo"/>

+			<type name="MonoMethodInfo" peer="MonoMethodInfo"/>

+			<type name="MonoPropertyInfo" peer="MonoPropertyInfo"/>

+			<type name="Assembly" peer="MonoReflectionAssembly"/>

+			<type name="Module" peer="MonoReflectionModule"/>

+			<type name="AssemblyName" peer="MonoReflectionAssemblyName"/>

+		</namespace>

+

+		<namespace name="System.Reflection.Emit">

+			<type name="ILGenerator" peer="MonoReflectionILGen"/>

+			<type name="ILExceptionInfo" peer="MonoILExceptionInfo"/>

+			<type name="ILExceptionBlock" peer="MonoILExceptionBlock"/>

+			<type name="LocalBuilder" peer="MonoReflectionLocalBuilder"/>

+			<type name="ParameterBuilder" peer="MonoReflectionParamBuilder"/>

+			<type name="ConstructorBuilder" peer="MonoReflectionCtorBuilder"/>

+			<type name="MethodBuilder" peer="MonoReflectionMethodBuilder"/>

+			<type name="FieldBuilder" peer="MonoReflectionFieldBuilder"/>

+			<type name="PropertyBuilder" peer="MonoReflectionPropertyBuilder"/>

+			<type name="ModuleBuilder" peer="MonoReflectionModuleBuilder"/>

+			<type name="TypeBuilder" peer="MonoReflectionTypeBuilder"/>

+			<type name="Label" peer="MonoReflectionLabel"/>

+		</namespace>

+

+		<!-- enumerations -->

+

+		<namespace name="System.Net.Sockets">

+			<type name="SocketType" peer="MonoSocketType"/>

+			<type name="AddressFamily" peer="MonoAddressFamily"/>

+			<type name="ProtocolType" peer="MonoProtocolType"/>

+			<type name="SocketOptionLevel" peer="MonoSocketOptionLevel"/>

+			<type name="SocketOptionName" peer="MonoSocketOptionName"/>

+		</namespace>

+	</typemap>

+</config>

diff --git a/mcs/tools/ictool/ictool.cs b/mcs/tools/ictool/ictool.cs
new file mode 100644
index 00000000000..9b4e0dd4472
--- /dev/null
+++ b/mcs/tools/ictool/ictool.cs
@@ -0,0 +1,428 @@
+//

+// file:	ictool.cs

+// author:	Dan Lewis (dihlewis@yahoo.co.uk)

+// 		(C) 2002

+//

+// description:

+//

+// Tool for generating C prototypes and structures suitable for use by the runtime

+// from a list of supplied assemblies. See ictool-config.xml for configuration details.

+//

+

+using System;

+using System.IO;

+using System.Xml;

+using System.Reflection;

+using System.Collections;

+

+public class ICTool {

+	public static void Main (string[] args) {

+		string filename = "ictool-config.xml";

+		if (args.Length == 1) {

+			filename = args[0];

+		}

+		else if (args.Length > 1) {

+			Console.Error.WriteLine ("Usage: ictool.exe [config.xml]");

+			Environment.Exit (-1);

+		}

+

+		try {

+			Stream config = File.OpenRead (filename);

+			Configure (config);

+		}

+		catch (Exception e) {

+			Console.Error.WriteLine ("Error: could not read configuration file.");

+			Console.Error.WriteLine (e);

+			Environment.Exit (-1);

+		}

+

+		EmitPrototypes ();

+		EmitStructures ();

+	}

+

+	// private

+

+	private static void EmitPrototypes () {

+		StreamWriter methods_file = GetOutputFile ("methods");

+		StreamWriter map_file = GetOutputFile ("map");

+

+		// includes

+

+		methods_file.WriteLine ("#include \"{0}\"\n", output_files["types"]);

+		map_file.WriteLine ("#include \"{0}\"\n", output_files["methods"]);

+

+		map_file.Write (

+			"static gpointer icall_map [] = {\n\t"

+		);

+

+		ArrayList map_lines = new ArrayList ();

+

+		BindingFlags binding =

+			BindingFlags.DeclaredOnly |

+			BindingFlags.Instance |

+			BindingFlags.Static |

+			BindingFlags.Public |

+			BindingFlags.NonPublic;

+

+		foreach (Type type in types.Values) {

+			bool has_icall = false;

+			MethodInfo[] methods = type.GetMethods (binding);

+

+			foreach (MethodInfo method in methods) {

+				if (IsInternalCall (method)) {

+					has_icall = true;

+					break;

+				}

+			}

+

+			if (!has_icall)

+				continue;

+

+			methods_file.WriteLine ("\n/* {0} */\n", type.FullName);

+			//map_lines.Add (String.Format ("\n/* {0} */\n", type.FullName));

+			

+			foreach (MethodInfo method in methods) {

+				if (!IsInternalCall (method))

+					continue;

+

+				// function name

+

+				string func_name = String.Format ("ves_icall_{0}_{1}",

+					

+					type.FullName,

+					method.Name

+				);

+

+				func_name = func_name.Replace ('.', '_');

+

+				// map file

+

+				map_lines.Add (String.Format (

+					"\"{0}::{1}\", {2}",

+

+					type.FullName.Replace ('.', '_'),

+					method.Name,

+					func_name

+				));

+

+				// methods file

+

+				ArrayList args = new ArrayList ();

+

+				// FIXME: return types that are structs need to be inserted

+				// into the argument list as a destination pointer

+

+				// object/value instance pointer

+				

+				if (IsInstanceMethod (method)) {

+					args.Add (String.Format (

+						"{0}{1}",

+

+						peer_map.GetPeer (method.DeclaringType).GetTypedef (1),

+						"this"

+					));

+				}

+

+				// arguments

+

+				foreach (ParameterInfo param in method.GetParameters ()) {

+					Type arg_type = param.ParameterType;

+

+					int refs = 0;

+					if (arg_type.IsByRef) {

+						arg_type = arg_type.GetElementType ();

+						++ refs;

+					}

+

+					Peer arg_peer = peer_map.GetPeer (arg_type);

+					if (!arg_peer.IsValueType)

+						++ refs;

+

+					args.Add (String.Format ("{0}{1}", arg_peer.GetTypedef (refs), param.Name));

+				}

+

+				Peer ret = peer_map.GetPeer (method.ReturnType);

+				methods_file.WriteLine ("static {0}", ret.GetTypedef (ret.IsValueType ? 0 : 1));

+				methods_file.WriteLine ("{0} ({1});",

+					

+					func_name,

+					Join (", ", args)

+				);

+				methods_file.WriteLine ();

+			}

+

+		}

+

+		methods_file.Close ();

+

+		// write map file and close it

+

+		map_file.Write (

+			"{0}\n}};\n", Join (",\n\t", map_lines)

+		);

+

+		map_file.Close ();

+	}

+

+	private static bool IsInternalCall (MethodInfo meth) {

+		return (meth.GetMethodImplementationFlags () & MethodImplAttributes.InternalCall) != 0;

+	}

+

+	private static bool IsInstanceMethod (MethodInfo meth) {

+		return (meth.CallingConvention & CallingConventions.HasThis) != 0;

+	}

+

+	private static void EmitStructures () {

+		StreamWriter file = GetOutputFile ("types");

+

+		// build dependency graph

+		

+		DependencyGraph dg = new DependencyGraph ();

+		foreach (Peer peer in peer_map.Peers) {

+			dg.AddNode (peer);

+

+			// peer depends on nearest base

+

+			if (peer.NearestBase != null)

+				dg.AddEdge (peer.NearestBase, peer);

+

+			// peer depends on any value types used for fields

+

+			foreach (PeerField field in peer.Fields) {

+				if (field.Peer.IsValueType)

+					dg.AddEdge (field.Peer, peer);

+			}

+		}

+

+		// write structures in order

+

+		foreach (Peer peer in dg.TopologicalSort ()) {

+			if (peer.IsOpaque)

+				continue;

+

+			if (peer.IsEnum) {

+				file.WriteLine ("typedef {0} {1};", peer.UnderlyingPeer.Name, peer.Name);

+				file.WriteLine ("enum _{0} {{", peer.Name);

+

+				ArrayList enum_lines = new ArrayList ();

+				foreach (string name in peer.EnumConstants.Keys) {

+					enum_lines.Add (String.Format ("\t{0}_{1} = {2}",

+						peer.Name,

+						name,

+						peer.EnumConstants[name]

+					));

+				}

+				

+				file.WriteLine ("{0}\n}};\n", Join (",\n", enum_lines));

+			}

+			else {

+				file.WriteLine ("typedef struct _{0} {{", peer.Name);

+

+				// base type

+				

+				if (peer.NearestBase != null) {

+					file.WriteLine ("\t{0} __base;", peer.NearestBase.Name);

+					file.WriteLine ();

+				}

+

+				// fields

+				

+				foreach (PeerField field in peer.Fields) {

+					bool use_struct = true;

+					if (field.Peer.IsValueType || field.Peer.IsOpaque)

+						use_struct = false;

+				

+					file.WriteLine ("\t{0}{1}{2};",

+						use_struct ? "struct _" : "",

+						field.Peer.GetTypedef (field.Peer.IsValueType ? 0 : 1),

+						field.Name

+					);

+				}

+

+				file.WriteLine ("}} {0};\n", peer.Name);

+			}

+		}

+	}

+

+	private static void LoadAssemblies () {

+		types = new Hashtable ();

+

+		foreach (string filename in assemblies) {

+			Assembly assembly;

+

+			// find assembly

+

+			FileInfo info = null;

+			foreach (string path in assembly_paths) {

+				info = new FileInfo (Path.Combine (path, filename));

+				if (info.Exists)

+					break;

+			}

+

+			if (!info.Exists) {

+				Console.Error.WriteLine ("Error: assembly {0} not found.", filename);

+				Environment.Exit (-1);

+			}

+

+			// load assembly

+

+			assembly = Assembly.LoadFrom (info.FullName);

+

+			// load types

+

+			ArrayList loaded_types;

+			

+			try {

+				loaded_types = new ArrayList (assembly.GetTypes ());

+			}

+			catch (ReflectionTypeLoadException e) {

+				loaded_types = new ArrayList ();

+				foreach (Type type in e.Types) {

+					if (type != null)

+						loaded_types.Add (type);

+				}

+

+				foreach (Exception f in e.LoaderExceptions) {

+					if (f is TypeLoadException) {

+						Console.Error.WriteLine ("Warning: {0} could not be loaded from assembly {1}.",

+							((TypeLoadException)f).TypeName,

+							filename

+						);

+					}

+					else

+						Console.Error.WriteLine (f);

+				}

+			}

+

+			// add to type dictionary

+

+			foreach (Type type in loaded_types) {

+				if (!types.Contains (type.FullName))

+					types.Add (type.FullName, type);

+			}

+		}

+	}

+

+	private static void Configure (Stream input) {

+		XmlDocument doc = new XmlDocument ();

+		doc.Load (input);

+

+		// assemblies

+

+		assembly_paths = new ArrayList ();

+		assembly_paths.Add (".");

+

+		foreach (XmlNode node in doc.SelectNodes ("config/assemblypath")) {

+			assembly_paths.Add (node.Attributes["path"].Value);

+		}

+

+		assemblies = new ArrayList ();

+		foreach (XmlNode node in doc.SelectNodes ("config/assembly")) {

+			assemblies.Add (node.Attributes["file"].Value);

+		}

+

+		LoadAssemblies ();

+

+		// outputfiles

+

+		output_path = ".";

+		XmlNode path_node = doc.SelectSingleNode ("config/outputpath");

+		if (path_node != null)

+			output_path = path_node.Attributes["path"].Value;

+

+		output_files = new Hashtable ();

+		output_includes = new Hashtable ();

+		foreach (XmlNode node in doc.SelectNodes ("config/outputfile")) {

+			string name = node.Attributes["name"].Value;

+			output_files.Add (name, node.Attributes["file"].Value);

+

+			foreach (XmlNode child in node.ChildNodes) {

+				if (child.Name == "include")

+					output_includes[name] = child.InnerText;

+			}

+		}

+

+		// typemap

+

+		peer_map = new PeerMap ();

+		foreach (XmlNode node in doc.SelectNodes ("config/typemap/namespace")) {

+			string ns = node.Attributes["name"].Value;

+

+			foreach (XmlNode child in node.ChildNodes) {

+				if (child.Name == "type") {

+					string name = child.Attributes["name"].Value;

+					string peer_name = child.Attributes["peer"].Value;

+

+					bool opaque = false;

+					if (child.Attributes["opaque"] != null && child.Attributes["opaque"].Value == "true")

+						opaque = true;

+

+					String fullname = String.Format ("{0}.{1}", ns, name);

+					

+					Type type;

+					if (child.Attributes["default"] != null && child.Attributes["default"].Value == "true")

+						type = Type.GetType (fullname);

+					else

+						type = (Type)types [fullname];

+

+					if (type != null)

+						peer_map.Add (new Peer (type, peer_name, opaque));

+				}

+			}

+		}

+

+		peer_map.ResolvePeers ();

+	}

+

+	private static StreamWriter GetOutputFile (string name) {

+		string filename = Path.Combine (output_path, (string)output_files[name]);

+		StreamWriter file = File.CreateText (filename);

+		file.AutoFlush = true;

+

+		file.Write (

+

+// (verbatim string)

+		

+@"/**

+ *  {0}

+ *

+ *  This file was automatically generated on {1} by ictool.exe from

+ *  the following assemblies:

+ *    {2}

+ */

+ 

+",

+

+			output_files[name],

+			DateTime.Now.ToString ("d"),

+			Join (", ", assemblies)

+		);

+

+		if (output_includes.Contains (name)) {

+			file.WriteLine (output_includes [name]);

+			file.WriteLine ();

+		}

+

+		return file;

+	}

+

+	private static string Join (string separator, ICollection values) {

+		// note to microsoft: please implement this in String :)

+

+		string[] strs = new string[values.Count];

+

+		int i = 0;

+		foreach (object value in values)

+			strs[i ++] = value.ToString ();

+

+		return String.Join (separator, strs);

+	}

+	

+	private static ArrayList assembly_paths;

+	private static ArrayList assemblies;

+	private static string output_path;

+	private static Hashtable output_files;

+	private static Hashtable output_includes;

+	private static PeerMap peer_map;

+	private static Hashtable types;

+}

diff --git a/mcs/tools/ictool/peer.cs b/mcs/tools/ictool/peer.cs
new file mode 100644
index 00000000000..6c3e0998f41
--- /dev/null
+++ b/mcs/tools/ictool/peer.cs
@@ -0,0 +1,284 @@
+//

+// file:	peer.cs

+// author:	Dan Lewis (dihlewis@yahoo.co.uk)

+// 		(C) 2002

+//

+

+using System;

+using System.Reflection;

+using System.Collections;

+

+class Peer {

+	public Peer (Type clr_type, string name, bool is_opaque) {

+		this.clr_type = clr_type;

+		this.name = name;

+		this.is_opaque = is_opaque;

+

+		this.nearest_base = null;	// resolve later

+		this.underlying = null;

+		this.enum_constants = null;

+		this.fields = new PeerFieldCollection ();

+

+		this.is_enum = CLRIsEnum (clr_type);

+		this.is_value_type = CLRIsValueType (clr_type);

+	}

+

+	public string Name {

+		get { return name; }

+	}

+

+	public Type CLRType {

+		get { return clr_type; }

+	}

+

+	public bool IsOpaque {

+		get { return is_opaque; }

+	}

+

+	public bool IsValueType {

+		get { return is_value_type; }

+	}

+

+	public bool IsEnum {

+		get { return is_enum; }

+	}

+

+	public Peer NearestBase {

+		get { return nearest_base; }

+		set { nearest_base = value; }

+	}

+

+	public Peer UnderlyingPeer {

+		get { return underlying; }

+		set { underlying = value; }

+	}

+

+	public IDictionary EnumConstants {

+		get { return enum_constants; }

+		set { enum_constants = value; }

+	}

+

+	public PeerFieldCollection Fields {

+		get { return fields; }

+	}

+

+	public string GetTypedef (int refs) {

+		if (refs == 0)

+			return String.Format ("{0} ", name);

+

+		return String.Format ("{0} {1}", name, new string ('*', refs));

+	}

+

+	// internal

+

+	internal static bool CLRIsValueType (Type clr_type) {

+		return clr_type.IsValueType;

+		/*

+		if (clr_type.BaseType == null)

+			return false;

+	

+		return

+			clr_type.BaseType.FullName == "System.ValueType" ||

+			clr_type.BaseType.FullName == "System.Enum";

+		*/

+	}

+

+	internal static bool CLRIsEnum (Type clr_type) {

+		return clr_type.IsEnum;

+		/*

+		if (clr_type.BaseType == null)

+			return false;

+

+		return clr_type.BaseType.FullName == "System.Enum";

+		*/

+	}

+

+	internal static Type CLRUnderlyingType (Type clr_type) {

+		return Enum.GetUnderlyingType (clr_type);

+		/*

+		Type ebase = type.BaseType;

+

+		return (Type)ebase.InvokeMember ("GetUnderlyingType",

+			BindingFlags.Public | BindingFlags.InvokeMethod | BindingFlags.Static,

+			null, null,

+			new object[] { type }

+		);

+		*/

+	}

+

+	// private

+

+	private Type clr_type;

+	private bool is_opaque;

+	private bool is_value_type;

+	private bool is_enum;

+

+	private string name;

+	private Peer nearest_base;

+	private Peer underlying;

+	private IDictionary enum_constants;

+	private PeerFieldCollection fields;

+}

+

+class PeerField {

+	public PeerField (Peer peer, string name) {

+		this.peer = peer;

+		this.name = name;

+	}

+

+	public Peer Peer {

+		get { return peer; }

+	}

+

+	public string Name {

+		get { return name; }

+	}

+

+	private Peer peer;

+	private string name;

+}

+

+class PeerFieldCollection : CollectionBase {

+	public void Add (PeerField f) {

+		List.Add (f);

+	}

+

+	public PeerField this[int i] {

+		get { return (PeerField)List[i]; }

+	}

+}

+

+class PeerMap {

+	public PeerMap () {

+		peers = new Hashtable ();

+	}

+

+	public void Add (Peer peer) {

+		Add (peer.CLRType, peer);

+	}

+

+	public void Add (Type clr_type, Peer peer) {

+		peers.Add (clr_type, peer);

+	}

+

+	public ICollection Peers {

+		get { return peers.Values; }

+	}

+

+	public Peer this[Type clr_type] {

+		get {

+			if (peers.Contains (clr_type))

+				return (Peer)peers[clr_type];

+

+			return null;

+		}

+	}

+

+	public Peer GetPeer (Type clr_type) {

+		Peer peer;

+

+		if (Peer.CLRIsValueType (clr_type)) {

+			peer = this[clr_type];

+			if (peer != null)

+				return peer;

+

+			if (Peer.CLRIsEnum (clr_type)) {

+				peer = this[Peer.CLRUnderlyingType (clr_type)];

+				if (peer != null)

+				return peer;

+

+				throw new ArgumentException ("Could not find peer or underlying peer for enum " + clr_type);

+			}

+			else

+				throw new ArgumentException ("Could not find peer for value type " + clr_type);

+		}

+		else {

+			Type type = clr_type;

+			while (type != null) {

+				peer = this[type];

+				if (peer != null)

+					return peer;

+

+				type = type.BaseType;

+			}

+

+			throw new ArgumentException ("Could not find peer for class " + clr_type);

+		}

+	}

+

+	public void ResolvePeers () {

+		BindingFlags binding =

+			BindingFlags.DeclaredOnly |

+			BindingFlags.Instance |

+			BindingFlags.NonPublic |

+			BindingFlags.Public;

+

+		// base type

+

+		foreach (Peer peer in Peers) {

+			if (peer.IsOpaque || peer.IsValueType || peer.CLRType.BaseType == null)

+				continue;

+

+			peer.NearestBase = GetPeer (peer.CLRType.BaseType);

+			if (peer.NearestBase == null) {

+				Console.Error.WriteLine ("Error: cannot find an internal base type for {0}.", peer.Name);

+				Environment.Exit (-1);

+			}

+		}

+

+		// fields

+

+		foreach (Peer peer in Peers) {

+			if (peer.IsOpaque || peer.IsEnum)

+				continue;

+

+			Type clr_base = null;

+			if (peer.NearestBase != null)

+				clr_base = peer.NearestBase.CLRType;

+

+			Stack declared = new Stack ();

+			Type type = peer.CLRType;

+

+			while (type != clr_base) {

+				declared.Push (type);

+				type = type.BaseType;

+			}

+

+			// build declared field list

+

+			while (declared.Count > 0) {

+				type = (Type)declared.Pop ();

+				foreach (FieldInfo info in type.GetFields (binding)) {

+					PeerField field = new PeerField (

+						GetPeer (info.FieldType),

+						info.Name

+					);

+

+					peer.Fields.Add (field);

+				}

+			}

+		}

+

+		// enums

+

+		foreach (Peer peer in Peers) {

+			if (peer.IsOpaque || !peer.IsEnum)

+				continue;

+

+			Type clr_type = peer.CLRType;

+

+			// constants

+

+			Hashtable constants = new Hashtable ();

+			foreach (string name in Enum.GetNames (clr_type))

+				constants.Add (name, (int)Enum.Parse (clr_type, name));

+

+			peer.UnderlyingPeer = GetPeer (Enum.GetUnderlyingType (clr_type));

+			peer.EnumConstants = constants;

+		}

+	}

+

+	// private

+

+	private Hashtable peers;

+}

diff --git a/mcs/tools/makefile b/mcs/tools/makefile
new file mode 100644
index 00000000000..79791c49c0a
--- /dev/null
+++ b/mcs/tools/makefile
@@ -0,0 +1,45 @@
+CSC=csc.exe
+CSCRIPT=$(WINDIR)/system32/cscript.exe
+CSCFLAGS=/nologo /debug+ /debug:full 
+
+windows: linux
+
+linux: monostyle.exe verifier.exe GenerateDelegate.exe EnumCheck.exe IFaceDisco.exe ./corcompare/CorCompare.exe
+#linux: verifier.exe GenerateDelegate.exe EnumCheck.exe IFaceDisco.exe ./corcompare/CorCompare.exe update
+
+monostyle.exe: monostyle.cs
+	$(CSC) $(CSCFLAGS) monostyle.cs
+	
+GenerateDelegate.exe: GenerateDelegate.cs
+	$(CSC) $(CSCFLAGS) /out:$@ $<
+
+verifier.exe: verifier.cs
+	$(CSC) $(CSCFLAGS) verifier.cs
+
+./corcompare/CorCompare.exe: dummy
+	(cd corcompare; make CorCompare.exe)
+
+update: ../../mono/doc/pending-classes
+
+cormissing.xml: ./corcompare/CorCompare.exe ../class/lib/corlib_cmp.dll
+	./corcompare/CorCompare.exe -x cormissing.xml -f corlib -ms mscorlib ../class/lib/corlib_cmp.dll
+
+../../mono/doc/pending-classes: ./corcompare/cormissing.xsl cormissing.xml
+	$(CSCRIPT) /nologo ./corcompare/transform.js cormissing.xml ./corcompare/cormissing.xsl > ../../mono/doc/pending-classes
+
+
+EnumCheck: EnumCheck.exe
+
+EnumCheck.exe: EnumCheck.cs EnumCheckAssemblyCollection.cs
+	$(CSC) $(CSCFLAGS) /out:EnumCheck.exe EnumCheck.cs EnumCheckAssemblyCollection.cs
+
+IFaceDisco.exe: IFaceDisco.cs XMLUtil.cs
+	$(CSC) $(CSCFLAGS) /out:IFaceDisco.exe IFaceDisco.cs XMLUtil.cs
+
+clean:
+	(cd corcompare; make clean)
+	rm -f *.exe *.pdb *.dll
+	rm -f cormissing.xml
+	rm -f ../../mono/doc/pending-classes.in
+
+dummy:
diff --git a/mcs/tools/monostyle.cs b/mcs/tools/monostyle.cs
new file mode 100644
index 00000000000..930700b130e
--- /dev/null
+++ b/mcs/tools/monostyle.cs
@@ -0,0 +1,366 @@
+//	monostyle.cs
+//
+//	Adam Treat (manyoso@yahoo.com)
+//	(C) 2002 Adam Treat
+//
+//	This program is free software; you can redistribute it and/or modify
+//	it under the terms of the GNU General Public License as published by
+//	the Free Software Foundation; either version 2 of the License, or
+//	(at your option) any later version.
+
+using System;
+using System.IO;
+using System.Text.RegularExpressions;
+using System.Collections.Specialized;
+
+namespace Mono.Util {
+
+	class MonoStyle {
+
+		string file;
+		StringCollection filebuffer;
+		bool linespace = true;
+
+		void Usage()
+		{
+			Console.Write (
+				"monostyle -f file.cs -l <true|false> > output.cs\n\n" +
+				"   -f || /-f || --file  file.cs        The csharp source file to parse.\n\n" +
+				"   -l || /-l || --line  <true|false>   Specifies wether to use line spacing.\n\n");
+		}
+
+		public static void Main (string[] args)
+		{
+			MonoStyle style = new MonoStyle(args);
+		}
+
+		public MonoStyle (string[] args)
+		{
+			int argc = args.Length;
+			for(int i = 0; i < argc; i++) {
+				string arg = args[i];
+				// The "/" switch is there for wine users, like me ;-)
+				if(arg.StartsWith("-") || arg.StartsWith("/")) {
+					switch(arg) {
+						case "-l": case "/-l": case "--line":
+						if((i + 1) >= argc) {
+							Usage();
+							return;
+						}
+						if (args[i++] == "false") {
+							linespace = false;
+						}
+						continue;
+						case "-f": case "/-f": case "--file":
+						if((i + 1) >= argc) {
+							Usage();
+							return;
+						}
+						file = args[++i];
+						continue;
+						default:
+						Usage();
+						return;
+					}
+				}
+			}
+			if(file == null) {
+				Usage();
+				return;
+			}
+			filebuffer = new StringCollection();
+			StreamReader sr = new StreamReader(file);
+			FillBuffer(sr);
+			FixMonoStyle();
+			PrintToConsole();
+		}
+
+		public void FillBuffer(StreamReader sr)
+		{
+			sr.BaseStream.Seek(0, SeekOrigin.Begin);
+			while (sr.Peek() > -1) {
+				filebuffer.Add(sr.ReadLine());
+			}
+			sr.Close();
+		}
+
+		public void FixMonoStyle()
+		{
+			for (int i=0; i < filebuffer.Count; i++) {
+				IsBadMonoStyle(filebuffer[i]);
+			}
+		}
+
+		public void PrintToConsole()
+		{
+			for (int i=0; i < filebuffer.Count; i++) {
+				Console.WriteLine(filebuffer[i]);
+			}
+		}
+
+		public void IsBadMonoStyle(String str)
+		{
+			if (IsBadMonoType(str)) {
+				FixHangingBrace(str);
+			} else if(IsBadMonoFlow(str)) {
+				FixHangingBrace(str);
+			} else if(IsBadMonoFunction(str)) {
+				FixEndBrace(str);
+			} else if(IsBadMonoProperty(str)) {
+				FixHangingBrace(str);
+			} else {
+			}
+   		}
+
+		public void FixHangingBrace(String str)
+		{
+			int strloc = filebuffer.IndexOf(str);
+			int brcloc = FindHangingBrace(strloc);
+			int diff = brcloc - strloc;
+			if (brcloc > 0) {
+				for (int i = 0; i < diff+1; i++) {
+					filebuffer.RemoveAt(strloc);
+				}
+				filebuffer.Insert(strloc, str + " {");
+				if (linespace) {
+					filebuffer.Insert(strloc+1, "");
+				}
+			} else {}
+		}
+
+		public int FindHangingBrace(int strloc)
+		{
+			strloc++;
+			bool found = false;
+			while (!found) {
+				try {
+					string str = filebuffer[strloc++];
+					found = IsHangingBrace(str);
+					if (!found && !IsBlankLine(str)) {
+						return -1;
+					}
+				 } catch (Exception) {
+					return -1;
+				}
+			}
+			return strloc -1;
+   		}
+
+		public void FixEndBrace(String str)
+		{
+			int strloc = filebuffer.IndexOf(str);
+			filebuffer.RemoveAt(strloc);
+			filebuffer.Insert(strloc, RemoveEndBrace(str));
+			filebuffer.Insert(strloc+1, AddHangingBrace(str));
+		}
+
+		public static bool IsBadMonoType(String str)
+		{
+			if ( IsType(str) && !EndWithBrace(str)) {
+				return true;
+			} else {
+				return false;
+			}
+   		}
+
+		public static bool IsBadMonoFlow(String str)
+		{
+			if (IsFlow(str) && !EndWithBrace(str)) {
+				return true;
+			} else {
+				return false;
+			}
+   		}
+
+		public static bool IsBadMonoFunction(String str)
+		{
+			if (IsFunction(str) && EndWithBrace(str)) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+
+		public static bool IsBadMonoProperty(String str)
+		{
+			if (IsProperty(str) && !EndWithBrace(str)) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+
+		public static bool IsType(String str)
+		{
+			if (	!IsComment(str) && (
+					IsNameSpace(str) ||
+					IsClass(str) ||
+					IsStruct(str) ||
+					IsEnum(str) )) {
+				return true;
+			} else {
+				return false;
+			}
+   		}
+
+		public static bool IsFlow(String str)
+		{
+			if (	!IsComment(str) && (
+					IsIf(str) ||
+					IsElse(str) ||
+					IsElseIf(str) ||
+					IsTry(str) ||
+					IsCatch(str) ||
+					IsFinally(str) ||
+					IsFor(str) ||
+					IsForEach(str) ||
+					IsWhile(str) ||
+					IsSwitch(str) ||
+					IsCase(str) )) {
+				return true;
+			} else {
+				return false;
+			}
+   		}
+
+		public static bool IsFunction(String str)
+		{
+			if (	Regex.IsMatch(str, @"^\s*(\w+)\s+(\w+).*\(+") &&
+					!IsDeclaration(str) &&
+					!IsComment(str) &&
+					!IsType(str) &&
+					!IsFlow(str) ) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+
+		public static bool IsProperty(String str)
+		{
+			if (	Regex.IsMatch(str, @"^\s*(\w+)\s+(\w+).*") &&
+					!IsDeclaration(str) &&
+					!IsComment(str) &&
+					!IsType(str) &&
+					!IsFlow(str) &&
+					!IsFunction(str) ) {
+				return true;
+			} else {
+				return false;
+			}
+		}
+
+		public static string RemoveEndBrace(String str)
+		{
+			Regex rg = new Regex(@"\{\s*$");
+			return rg.Replace(str, "");
+   		}
+
+		public static string AddHangingBrace(String str)
+		{
+			Regex rg = new Regex(@"\S+\s*");
+			string blank = rg.Replace(str,"");
+			return blank + "{";
+   		}
+
+		public static bool IsDeclaration(String str)
+		{
+			return Regex.IsMatch(str, @"\;\s*$");
+		}
+
+		public static bool IsComment(String str)
+		{
+			return Regex.IsMatch(str, @"^(\s*\/+|\s*\*+|\s*\#+)");
+   		}
+
+		public static bool EndWithBrace(String str)
+		{
+			return Regex.IsMatch(str, @"\{\s*$");
+   		}
+
+		public static bool IsHangingBrace(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+)\{");
+   		}
+
+		public static bool IsBlankLine(String str)
+		{
+			return Regex.IsMatch(str, @"^\s*$");
+   		}
+
+		public static bool IsNameSpace(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+)namespace\s+");
+   		}
+
+		public static bool IsClass(String str)
+		{
+			return Regex.IsMatch(str, @"\s+class\s+");
+   		}
+
+		public static bool IsStruct(String str)
+		{
+			return Regex.IsMatch(str, @"\s+struct\s+");
+   		}
+
+		public static bool IsEnum(String str)
+		{
+			return Regex.IsMatch(str, @"\s+enum\s+");
+   		}
+
+		public static bool IsIf(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)if(\s+|\(+|$)");
+   		}
+
+		public static bool IsElse(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)else(\s+|\{+|$)");
+   		}
+
+		public static bool IsElseIf(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)else if(\s+|\(+|$)");
+   		}
+
+		public static bool IsTry(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)try(\s+|\(+|$)");
+   		}
+
+		public static bool IsCatch(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)catch(\s+|\(+|$)");
+   		}
+
+		public static bool IsFinally(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)finally(\s+|\{+|$)");
+   		}
+
+		public static bool IsFor(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)for(\s+|\(+|$)");
+   		}
+
+		public static bool IsForEach(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)foreach(\s+|\(+|$)");
+   		}
+
+		public static bool IsWhile(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)while(\s+|\(+|$)");
+   		}
+
+		public static bool IsSwitch(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)switch(\s+|\(+|$)");
+   		}
+
+		public static bool IsCase(String str)
+		{
+			return Regex.IsMatch(str, @"(^|\s+|\}+)case(\s+|\(+|$)");
+   		}
+	}
+}
diff --git a/mcs/tools/sample_cast_const.cs b/mcs/tools/sample_cast_const.cs
new file mode 100755
index 00000000000..04969312cde
--- /dev/null
+++ b/mcs/tools/sample_cast_const.cs
@@ -0,0 +1,49 @@
+using System;
+
+class X {
+	static void w (string s)
+	{
+		Console.WriteLine ("\t" + s);
+	}
+	
+	static void Main ()
+	{
+		object [,] names = 
+			{ { "Byte", "byte" },
+			  { "SByte", "sbyte" },
+			  { "Short", "short" },
+			  { "UShort", "ushort" },
+			  { "Int", "int32" },
+			  { "UInt", "uint32" },
+			  { "Long", "int64" },
+			  { "ULong", "uint64" },
+			  { "Float", "float" },
+			  { "Double", "double" },
+			  { null, null }
+			};
+
+		for (int i = 0; names [i,0] != null; i++){
+			string big = names [i, 0] + "Constant";
+			string small = "TypeManager." + names [i, 1] + "_type";
+			string nat = ((string) names [i,0]).ToLower ();
+			
+			w ("\t\tif (expr is " + big + "){");
+			w ("\t\t\t" + nat + " v = ((" + big + ") expr).Value;");
+			w ("");
+
+			for (int j = 0; names [j,0] != null; j++){
+				string b = names [j, 0] + "Constant";
+				string s = "TypeManager." + names [j, 1] + "_type";
+				string n = ((string) names [j,0]).ToLower ();
+
+				if (i == j)
+					continue;
+				
+				w ("\t\t\tif (target_type == " + s + ")");
+				w ("\t\t\t\treturn new " + b + " ((" + n + ") v);");
+			}
+			w ("\t\t}");
+		}
+	}
+}
+	
diff --git a/mcs/tools/scan-tests.pl b/mcs/tools/scan-tests.pl
new file mode 100755
index 00000000000..5cb0f8625f5
--- /dev/null
+++ b/mcs/tools/scan-tests.pl
@@ -0,0 +1,163 @@
+#!/usr/bin/perl -w
+
+use strict;
+use Carp;
+
+my @allfiles;
+
+my @badsuites = qw[System\.Collections/HashtableTest System\.Collections/StackTest System\.Collections\.Specialized\.BasicOperationsTest];
+my @badtests = qw[PathTest:TestGetTempFileName XmlTextReaderTests:TestIsNameChar XmlTextReaderTests:TestIsFirstNameChar ByteTest:TestParse];
+my @mapfiles = ('s,^MonoTests\.(.*)/,$1/,',
+		's,^Ximian\.Mono\.Tests(.*)/,,',
+		's,^System\.Net/,,',
+		's,^Collections\.Specialized\.,,',
+		's,^Text\.RegularExpressions\.,,'
+		);
+my @maptests = ();
+my @mapnamespace = ();
+
+die "Usage: $0 input output" unless $#ARGV == 1;
+
+my $namespace = 'MonoTests';
+
+sub parse_test {
+    my ($filename, $namespace, $testname, $suite) = @_;
+
+    foreach (@badsuites) {
+	return if $filename =~ /$_/;
+    }
+
+    my $map;
+    foreach $map (@mapfiles) {
+	eval "\$filename =~ $map";
+    }
+
+    foreach (@allfiles) {
+	return if $filename eq $_->[0];
+    }
+
+    # print STDERR "PARSE: |$filename|\n";
+
+    push @allfiles, [$filename,$namespace,$testname,$suite,[]];
+
+    my $INPUT;
+    open $INPUT, $filename or croak "open ($filename): $!";
+    while (defined ($_ = <$INPUT>)) {
+	if (/^\s*namespace\s*([\w\.]+?)\s*$/) {
+	    $namespace = $1;
+	    next;
+	}
+	if (/^\s*suite\.AddTest\s*\((.*)\.(.*?)\.Suite\)/) {
+	    my $filename = (defined $namespace) ? qq[$namespace.$1/$2.cs] : qq[$1/$2.cs];
+	    my $nsprefix = (defined $namespace) ? qq[$namespace.$1] : qq[MonoTests.$1];
+	    parse_test ($filename, $nsprefix, $1, $2);
+	    next;
+	}
+	if (/^\s*suite\.AddTest\s*\((.*?)\.Suite\)/) {
+	    my $filename = (defined $namespace) ? qq[$namespace/$1.cs] : qq[$1.cs];
+	    parse_test ($filename, $namespace, '', $1);
+	    next;
+	}
+	if (/^\s*suite\.AddTest\s*\(\s*new\s+TestSuite\s*\(\s*typeof\(\s*(.*)\s*\)\s*\)\s*\);/) {
+	    my $filename = (defined $namespace) ? qq[$namespace/$1.cs] : qq[$1.cs];
+	    parse_test ($filename, $namespace, '', $1);
+	    next;
+	}
+    }
+    close $INPUT;
+}
+
+parse_test ($ARGV[0], undef, '', '');
+
+my $file;
+foreach $file (@allfiles) {
+    my ($filename,$namespace,$testname,$suite) = @$file;
+
+    open SUITE, $filename or croak "open ($filename): $!";
+    while (defined ($_ = <SUITE>)) {
+	next unless /^\s*public\s+void\s+(Test.*?)\s*\(\s*\)/;
+	push @{$file->[4]}, $1;
+    }
+    close SUITE;
+}
+
+open OUTPUT, "> $ARGV[1]" or croak "open (> $ARGV[1]): $!";
+select OUTPUT;
+
+print qq[using NUnit.Framework;\n];
+print qq[using System;\n];
+print qq[using System.Threading;\n];
+print qq[using System.Globalization;\n\n];
+
+
+my $alltest;
+foreach $alltest (@allfiles) {
+
+    my ($filename,$namespace,$testname,$suite,$tests) = @$alltest;
+    my @tests = @$tests;
+
+    next unless defined $namespace;
+    next unless $#tests >= 0;
+
+    # print STDERR "DOING TEST: |$testname|$filename|\n";
+
+    $namespace .= ".$testname" unless $testname eq '';
+
+    print qq[namespace $namespace\n\{\n];
+    print qq[\tpublic class Run$suite : $suite\n\t\{\n];
+    print qq[\t\tprotected override void RunTest ()\n\t\t\{\n];
+#    print qq[\t\t\tbool errorThrown = false;\n\n];
+    my $test;
+  testloop:
+    foreach $test (@tests) {
+	my $badtest;
+	$filename =~ s/\.cs$//;
+	my $fullname = qq[$filename:$test];
+	# print STDERR "TEST: |$fullname|\n";
+	foreach $badtest (@badtests) {
+	    next testloop if $fullname =~ /$badtest/;
+	}
+#	print qq[\t\t\ttry \{\n\t\t\t\t$test ();\n\t\t\t\} catch \{\n];
+#	print qq[\t\t\t\tConsole.WriteLine ("$namespace:$suite:$test failed");\n];
+#	print qq[\t\t\t\terrorThrown = true;\n];
+#	print qq[\t\t\t\}\n];
+	print qq[\t\t\t$test ();\n];
+#	print qq[\t\t\tConsole.WriteLine ("$namespace:$suite:$test DONE");\n];
+    }
+    print qq[\n];
+#    print qq[\t\t\tif (errorThrown)\n\t\t\t\tthrow new ArgumentException ();\n];
+    print qq[\t\t\}\n\t\}\n];
+    print qq[\}\n\n];
+}
+
+print qq[namespace $namespace\n\{\n];
+print qq[\tpublic class RunAllTests\n\t\{\n];
+print qq[\t\tpublic static void AddAllTests (TestSuite suite)\n];
+print qq[\t\t\{\n];
+
+foreach $alltest (@allfiles) {
+    my ($filename,$namespace,$testname,$suite,$tests) = @$alltest;
+    my @tests = @$tests;
+
+    next unless defined $namespace;
+    next unless $#tests >= 0;
+
+    $namespace .= ".$testname" unless $testname eq '';
+
+    print qq[\t\t\tsuite.AddTest (new $namespace.Run$suite ());\n];
+}
+
+print qq[\t\t\}\n\t\}\n\}\n\n];
+
+print qq[class MainApp\n\{\n];
+print qq[\tpublic static void Main()\n\t\{\n];
+print qq[\t\tThread.CurrentThread.CurrentCulture = new CultureInfo ("en-US");\n\n];
+print qq[\t\tTestResult result = new TestResult ();\n];
+print qq[\t\tTestSuite suite = new TestSuite ();\n];
+print qq[\t\t$namespace.RunAllTests.AddAllTests (suite);\n];
+print qq[\t\tsuite.Run (result);\n];
+print qq[\t\tMonoTests.MyTestRunner.Print (result);\n];
+print qq[\t\}\n\}\n\n];
+
+close OUTPUT;
+
diff --git a/mcs/tools/serialize.cs b/mcs/tools/serialize.cs
new file mode 100755
index 00000000000..01b83f83b87
--- /dev/null
+++ b/mcs/tools/serialize.cs
@@ -0,0 +1,138 @@
+//
+// Serialize.cs
+//
+// This program creates a SerializationInfo and requests an object
+// to serialize itself.
+//
+// We serialize because we need to know the *exact* names that are
+// used for the values being serialized.
+//
+// Author: Miguel de Icaza
+//	   Duncan Mak
+//
+// (C) Ximian, Inc.
+//
+
+using System;
+using System.Collections;
+using System.Globalization;
+using System.Runtime.Serialization;
+using System.Runtime.Serialization.Formatters.Soap;
+using System.IO;
+
+namespace Mono.Serialize {
+	class Driver {
+		static object StaticCreateObject ()
+		{
+			//
+			// Change the object type here.
+			//
+			return null;
+		}
+
+		static object LiveCreateObject (Type obj, Type[] types, string[] values)
+		{
+			if (types.Length != values.Length)
+				throw new ArgumentException ();
+			
+			object[] a = new object [types.Length];
+			
+			for (int i = 0; i < a.Length; i++)
+				a [i] = Convert.ChangeType (values [i], types [i]);
+			
+			return Activator.CreateInstance (obj, a);
+		}
+        
+		static void Main (string[] args)
+		{
+			object x = null;
+			string strTypes = null;
+			string argValues = null;
+			
+			if (args.Length == 1) {
+				Type t = Type.GetType (args[0]);
+				Console.WriteLine ("\nPlease enter the arguments to the constructor for type {0}", t.ToString());
+				strTypes = Console.ReadLine ();
+				Console.WriteLine ("\nPlease enter the values");
+				argValues = Console.ReadLine ();
+				Type[] types = ToTypeArray (strTypes.Split (','));
+				string[] param = argValues.Split (',');
+				
+				x = LiveCreateObject (t, types, param);
+			} else {
+				x = StaticCreateObject ();
+			}
+			
+			string fileName = x.GetType().FullName + ".xml";
+			Stream output = new FileStream (fileName, FileMode.Create,
+							FileAccess.Write, FileShare.None);
+			IFormatter formatter = new SoapFormatter ();
+			
+			formatter.Serialize ((Stream) output, x);
+			output.Close ();
+		}
+		
+		public static Type[] ToTypeArray (string[] strTypes)
+		{
+			Type[] t = new Type [strTypes.Length];
+			
+			for (int i = 0; i < strTypes.Length; i++)
+				t [i] = StringToType (strTypes [i]);
+			return t;
+		}
+		
+		public static Type StringToType (string s)
+		{
+			switch (s) {
+			case "bool":
+				return typeof (System.Boolean);
+				break;
+			case "byte":
+				return typeof (System.Byte);
+				break;
+			case "sbyte":
+				return typeof (System.SByte);
+				break;
+			case "char":
+				return typeof (System.Char);
+				break;
+			case "decimal":
+				return typeof (System.Decimal);
+				break;
+			case "double":
+				return typeof (System.Double);
+				break;
+			case "float":
+				return typeof (System.Single);
+				break;
+			case "int":
+				return typeof (System.Int32);
+				break;
+			case "uint":
+				return typeof (System.UInt32);
+				break;
+			case "long":
+				return typeof (System.Int64);
+				break;
+			case "ulong":
+				return typeof (System.UInt64);
+				break;
+			case "object":
+				return typeof (System.Object);
+				break;
+			case "short":
+				return typeof (System.Int16);
+				break;
+			case "ushort":
+				return typeof (System.UInt16);
+				break;
+			case "string":
+				return typeof (System.String);
+				break;
+			default:
+				return Type.GetType (s);
+				break;
+			}
+		}
+	}
+}
diff --git a/mcs/tools/verifier.cs b/mcs/tools/verifier.cs
new file mode 100644
index 00000000000..25268147b26
--- /dev/null
+++ b/mcs/tools/verifier.cs
@@ -0,0 +1,1587 @@
+//
+// verifier.cs: compares two assemblies and reports differences.
+//
+// Author:
+//   Sergey Chaban (serge@wildwestsoftware.com)
+//
+// (C) Sergey Chaban (serge@wildwestsoftware.com)
+//
+
+using System;
+using System.IO;
+using System.Collections;
+using System.Reflection;
+
+namespace Mono.Verifier {
+
+
+
+	////////////////////////////////
+	// Collections
+	////////////////////////////////
+
+	public abstract class MemberCollection : IEnumerable {
+
+		public delegate MemberInfo [] InfoQuery (Type type, BindingFlags bindings);
+		public delegate bool MemberComparer (MemberInfo mi1, MemberInfo mi2);
+
+		protected SortedList list;
+		protected MemberComparer comparer;
+
+		protected BindingFlags bindings;
+
+		protected MemberCollection (Type type, InfoQuery query, MemberComparer comparer, BindingFlags bindings)
+		{
+			if (query == null)
+				throw new NullReferenceException ("Invalid query delegate.");
+
+			if (comparer == null)
+				throw new NullReferenceException ("Invalid comparer.");
+
+			this.comparer = comparer;
+			this.bindings = bindings;
+
+			this.list = new SortedList ();
+
+			MemberInfo [] data = query (type, bindings);
+			foreach (MemberInfo info in data) {
+				this.list [info.Name] = info;
+			}
+		}
+
+
+
+		public MemberInfo this [string name] {
+			get {
+				return list [name] as MemberInfo;
+			}
+		}
+
+
+		public override int GetHashCode ()
+		{
+			return list.GetHashCode ();
+		}
+
+
+		public override bool Equals (object o)
+		{
+			bool res = (o is MemberCollection);
+			if (res) {
+				MemberCollection another = o as MemberCollection;
+				IEnumerator it = GetEnumerator ();
+				while (it.MoveNext () && res) {
+					MemberInfo inf1 = it.Current as MemberInfo;
+					MemberInfo inf2 = another [inf1.Name];
+					res &= comparer (inf1, inf2);
+				}
+			}
+			return res;
+		}
+
+
+
+		public static bool operator == (MemberCollection c1, MemberCollection c2)
+		{
+			return c1.Equals (c2);
+		}
+
+		public static bool operator != (MemberCollection c1, MemberCollection c2)
+		{
+			return !(c1 == c2);
+		}
+
+
+
+		public IEnumerator GetEnumerator()
+		{
+			return new Iterator (this);
+		}
+
+
+		internal class Iterator : IEnumerator  {
+			private MemberCollection host;
+			private int pos;
+
+			internal Iterator (MemberCollection host)
+			{
+				this.host=host;
+				this.Reset ();
+			}
+
+			/// <summary></summary>
+			public object Current
+			{
+				get {
+					if (host != null && pos >=0 && pos < host.list.Count) {
+						return host.list.GetByIndex (pos);
+					} else {
+						return null;
+					}
+				}
+			}
+
+			/// <summary></summary>
+			public bool MoveNext ()
+			{
+				if (host!=null) {
+					return (++pos) < host.list.Count;
+				} else {
+					return false;
+				}
+			}
+
+			/// <summary></summary>
+			public void Reset ()
+			{
+				this.pos = -1;
+			}
+		}
+
+	}
+
+
+
+
+	//--- Method collections
+
+	/// <summary>
+	/// Abstract collection of class' methods.
+	/// </summary>
+	public abstract class MethodCollectionBase : MemberCollection {
+
+
+		protected MethodCollectionBase (Type type, BindingFlags bindings)
+		       : base (type, new InfoQuery (Query), new MemberComparer (Comparer), bindings)
+		{
+		}
+
+
+		private static MemberInfo [] Query (Type type, BindingFlags bindings)
+		{
+			// returns MethodInfo []
+			return type.GetMethods (bindings);
+		}
+
+		private static bool Comparer (MemberInfo mi1, MemberInfo mi2)
+		{
+			bool res = false;
+			if (mi1 is MethodInfo && (mi2 == null || mi2 is MethodInfo)) {
+				MethodInfo inf1 = mi1 as MethodInfo;
+				MethodInfo inf2 = mi2 as MethodInfo;
+				res = Compare.Methods (inf1, inf2);
+			} else {
+				Verifier.log.Write ("internal-error", "Wrong comparer arguments.", ImportanceLevel.HIGH);
+			}
+			return res;
+		}
+	}
+
+
+
+	/// <summary>
+	/// Collection of public instance methods of a class.
+	/// </summary>
+	public class PublicMethods : MethodCollectionBase {
+
+		public PublicMethods (Type type)
+		       : base (type, BindingFlags.Public | BindingFlags.Instance)
+		{
+		}
+	}
+
+	/// <summary>
+	/// Collection of public static methods of a class.
+	/// </summary>
+	public class PublicStaticMethods : MethodCollectionBase {
+
+		public PublicStaticMethods (Type type)
+		       : base (type, BindingFlags.Public | BindingFlags.Static)
+		{
+		}
+	}
+
+	/// <summary>
+	/// Collection of non-public instance methods of a class.
+	/// </summary>
+	public class NonPublicMethods : MethodCollectionBase {
+
+		public NonPublicMethods (Type type)
+		       : base (type, BindingFlags.NonPublic | BindingFlags.Instance)
+		{
+		}
+	}
+
+	/// <summary>
+	/// Collection of non-public static methods of a class.
+	/// </summary>
+	public class NonPublicStaticMethods : MethodCollectionBase {
+
+		public NonPublicStaticMethods (Type type)
+		       : base (type, BindingFlags.NonPublic | BindingFlags.Static)
+		{
+		}
+	}
+
+
+
+
+
+	//--- Field collections
+
+	public abstract class FieldCollectionBase : MemberCollection {
+
+
+		protected FieldCollectionBase (Type type, BindingFlags bindings)
+		       : base (type, new InfoQuery (Query), new MemberComparer (Comparer), bindings)
+		{
+		}
+
+
+		private static MemberInfo [] Query (Type type, BindingFlags bindings)
+		{
+			// returns FieldInfo []
+			return type.GetFields (bindings);
+		}
+
+		private static bool Comparer (MemberInfo mi1, MemberInfo mi2)
+		{
+			bool res = false;
+			if (mi1 is FieldInfo && (mi2 == null || mi2 is FieldInfo)) {
+				FieldInfo inf1 = mi1 as FieldInfo;
+				FieldInfo inf2 = mi2 as FieldInfo;
+				res = Compare.Fields (inf1, inf2);
+			} else {
+				Verifier.log.Write ("internal-error", "Wrong comparer arguments.", ImportanceLevel.HIGH);
+			}
+			return res;
+		}
+	}
+
+
+	public class PublicFields : FieldCollectionBase {
+
+		public PublicFields (Type type)
+		       : base (type, BindingFlags.Public | BindingFlags.Instance)
+		{
+		}
+	}
+
+	public class PublicStaticFields : FieldCollectionBase {
+
+		public PublicStaticFields (Type type)
+		       : base (type, BindingFlags.Public | BindingFlags.Static)
+		{
+		}
+	}
+
+	public class NonPublicFields : FieldCollectionBase {
+
+		public NonPublicFields (Type type)
+		       : base (type, BindingFlags.NonPublic | BindingFlags.Instance)
+		{
+		}
+	}
+
+	public class NonPublicStaticFields : FieldCollectionBase {
+
+		public NonPublicStaticFields (Type type)
+		       : base (type, BindingFlags.NonPublic | BindingFlags.Static)
+		{
+		}
+	}
+
+
+
+
+
+	public abstract class AbstractTypeStuff {
+		public readonly Type type;
+
+		public AbstractTypeStuff (Type type)
+		{
+			if (type == null)
+				throw new NullReferenceException ("Invalid type.");
+
+			this.type = type;
+		}
+
+		public override int GetHashCode ()
+		{
+			return type.GetHashCode ();
+		}
+
+		public static bool operator == (AbstractTypeStuff t1, AbstractTypeStuff t2)
+		{
+			if ((t1 as object) == null) {
+				if ((t2 as object) == null) return true;
+				return false;
+			}
+			return t1.Equals (t2);
+		}
+
+		public static bool operator != (AbstractTypeStuff t1, AbstractTypeStuff t2)
+		{
+			return !(t1 == t2);
+		}
+
+		public override bool Equals (object o)
+		{
+			return (o is AbstractTypeStuff && CompareTypes (o as AbstractTypeStuff));
+		}
+
+		protected virtual bool CompareTypes (AbstractTypeStuff that)
+		{
+			Verifier.Log.Write ("info", "Comparing types.", ImportanceLevel.LOW);
+			bool res;
+
+			res = Compare.Types (this.type, that.type);
+
+			return res;
+		}
+
+	}
+
+
+
+
+	/// <summary>
+	///  Represents a class.
+	/// </summary>
+	public class ClassStuff : AbstractTypeStuff {
+
+		public PublicMethods publicMethods;
+		public PublicStaticMethods publicStaticMethods;
+		public NonPublicMethods nonpublicMethods;
+		public NonPublicStaticMethods nonpublicStaticMethods;
+
+		public PublicFields publicFields;
+		public PublicStaticFields publicStaticFields;
+		public NonPublicFields nonpublicFields;
+		public NonPublicStaticFields nonpublicStaticFields;
+
+		public ClassStuff (Type type) : base (type)
+		{
+			publicMethods = new PublicMethods (type);
+			publicStaticMethods = new PublicStaticMethods (type);
+			nonpublicMethods = new NonPublicMethods (type);
+			nonpublicStaticMethods = new NonPublicStaticMethods (type);
+
+			publicFields = new PublicFields (type);
+			publicStaticFields = new PublicStaticFields (type);
+			nonpublicFields = new NonPublicFields (type);
+			nonpublicStaticFields = new NonPublicStaticFields (type);
+		}
+
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+
+		private bool CompareMethods (ClassStuff that)
+		{
+			bool res = true;
+			bool ok;
+
+			Verifier.Log.Write ("info", "Comparing public instance methods.", ImportanceLevel.LOW);
+			ok = (this.publicMethods == that.publicMethods);
+			res &= ok;
+			if (!ok && Verifier.stopOnError) return res;
+
+			Verifier.Log.Write ("info", "Comparing public static methods.", ImportanceLevel.LOW);
+			ok = (this.publicStaticMethods == that.publicStaticMethods);
+			res &= ok;
+			if (!ok && Verifier.stopOnError) return res;
+
+			Verifier.Log.Write ("info", "Comparing non-public instance methods.", ImportanceLevel.LOW);
+			ok = (this.nonpublicMethods == that.nonpublicMethods);
+			res &= ok;
+			if (!ok && Verifier.stopOnError) return res;
+
+			Verifier.Log.Write ("info", "Comparing non-public static methods.", ImportanceLevel.LOW);
+			ok = (this.nonpublicStaticMethods == that.nonpublicStaticMethods);
+			res &= ok;
+			if (!ok && Verifier.stopOnError) return res;
+
+			return res;
+		}
+
+
+		private bool CompareFields (ClassStuff that)
+		{
+			bool res = true;
+			bool ok;
+
+			Verifier.Log.Write ("info", "Comparing public instance fields.", ImportanceLevel.LOW);
+			ok = (this.publicFields == that.publicFields);
+			res &= ok;
+			if (!ok && Verifier.stopOnError) return res;
+
+			Verifier.Log.Write ("info", "Comparing public static fields.", ImportanceLevel.LOW);
+			ok = (this.publicStaticFields == that.publicStaticFields);
+			res &= ok;
+			if (!ok && Verifier.stopOnError) return res;
+
+			Verifier.Log.Write ("info", "Comparing non-public instance fields.", ImportanceLevel.LOW);
+			ok = (this.nonpublicFields == that.nonpublicFields);
+			res &= ok;
+			if (!ok && Verifier.stopOnError) return res;
+
+			Verifier.Log.Write ("info", "Comparing non-public static fields.", ImportanceLevel.LOW);
+			ok = (this.nonpublicStaticFields == that.nonpublicStaticFields);
+			res &= ok;
+			if (!ok && Verifier.stopOnError) return res;
+
+			return res;
+		}
+
+
+		public override bool Equals (object o)
+		{
+			bool res = (o is ClassStuff);
+			if (res) {
+				ClassStuff that = o as ClassStuff;
+
+				res &= this.CompareTypes (that);
+				if (!res && Verifier.stopOnError) return res;
+
+				res &= this.CompareMethods (that);
+				if (!res && Verifier.stopOnError) return res;
+
+				res &= this.CompareFields (that);
+				if (!res && Verifier.stopOnError) return res;
+
+			}
+			return res;
+		}
+
+	}
+
+
+
+	/// <summary>
+	///  Represents an interface.
+	/// </summary>
+	public class InterfaceStuff : AbstractTypeStuff {
+
+		public PublicMethods publicMethods;
+
+		public InterfaceStuff (Type type) : base (type)
+		{
+			publicMethods = new PublicMethods (type);
+		}
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+
+		public override bool Equals (object o)
+		{
+			bool res = (o is InterfaceStuff);
+			if (res) {
+				bool ok;
+				InterfaceStuff that = o as InterfaceStuff;
+
+				res = this.CompareTypes (that);
+				if (!res && Verifier.stopOnError) return res;
+
+				Verifier.Log.Write ("info", "Comparing interface methods.", ImportanceLevel.LOW);
+				ok = (this.publicMethods == that.publicMethods);
+				res &= ok;
+				if (!ok && Verifier.stopOnError) return res;
+			}
+			return res;
+		}
+
+	}
+
+
+
+	/// <summary>
+	///  Represents an enumeration.
+	/// </summary>
+	public class EnumStuff : AbstractTypeStuff {
+
+		//public FieldInfo [] members;
+
+		public string baseType;
+		public Hashtable enumTable;
+		public bool isFlags;
+
+		public EnumStuff (Type type) : base (type)
+		{
+			//members = type.GetFields (BindingFlags.Public | BindingFlags.Static);
+
+			Array values = Enum.GetValues (type);
+			Array names = Enum.GetNames (type);
+
+			baseType = Enum.GetUnderlyingType (type).Name;
+
+			enumTable = new Hashtable ();
+
+			object [] attrs = type.GetCustomAttributes (false);
+			isFlags = (attrs != null && attrs.Length > 0);
+			if (isFlags) {
+				foreach (object attr in attrs) {
+					isFlags |= (attr is FlagsAttribute);
+				}
+			}
+
+			int indx = 0;
+			foreach (string id in names) {
+				enumTable [id] = Convert.ToInt64(values.GetValue(indx) as Enum);
+				++indx;
+			}
+		}
+
+		public override int GetHashCode ()
+		{
+			return base.GetHashCode ();
+		}
+
+		public override bool Equals (object o)
+		{
+			bool res = (o is EnumStuff);
+			bool ok;
+
+			if (res) {
+				EnumStuff that = o as EnumStuff;
+				ok = this.CompareTypes (that);
+				res &= ok;
+				if (!ok && Verifier.stopOnError) return res;
+
+				ok = (this.baseType == that.baseType);
+				res &= ok;
+				if (!ok) {
+					Verifier.log.Write ("error",
+						String.Format ("Underlying types mismatch [{0}, {1}].", this.baseType, that.baseType),
+						ImportanceLevel.MEDIUM);
+					if (Verifier.stopOnError) return res;
+				}
+
+				Verifier.Log.Write ("info", "Comparing [Flags] attribute.");
+				ok = !(this.isFlags ^ that.isFlags);
+				res &= ok;
+				if (!ok) {
+					Verifier.log.Write ("error",
+						String.Format ("[Flags] attribute mismatch ({0} : {1}).", this.isFlags ? "Yes" : "No", that.isFlags ? "Yes" : "No"),
+					    ImportanceLevel.MEDIUM);
+					if (Verifier.stopOnError) return res;
+				}
+
+				Verifier.Log.Write ("info", "Comparing enum values.");
+
+				ICollection names = enumTable.Keys;
+				foreach (string id in names) {
+					ok = that.enumTable.ContainsKey (id);
+					res &= ok;
+					if (!ok) {
+						Verifier.log.Write ("error", String.Format("{0} absent in enumeration.", id),
+							ImportanceLevel.MEDIUM);
+						if (Verifier.stopOnError) return res;
+					}
+
+					if (ok) {
+						long val1 = (long) this.enumTable [id];
+						long val2 = (long) that.enumTable [id];
+						ok = (val1 == val2);
+						res &= ok;
+						if (!ok) {
+							Verifier.log.Write ("error",
+								String.Format ("Enum values mismatch [{0}: {1} != {2}].", id, val1, val2),
+								ImportanceLevel.MEDIUM);
+							if (Verifier.stopOnError) return res;
+						}
+					}
+				}
+			}
+			return res;
+		}
+	}
+
+
+
+	public sealed class TypeArray {
+		public static readonly TypeArray empty = new TypeArray (Type.EmptyTypes);
+
+		public Type [] types;
+
+		public TypeArray (Type [] types)
+		{
+			this.types = new Type [types.Length];
+			for (int i = 0; i < types.Length; i++) {
+				this.types.SetValue (types.GetValue (i), i);
+			}
+		}
+	}
+
+
+
+	public class AssemblyLoader {
+		public delegate void Hook (TypeArray assemblyTypes);
+
+		private static Hashtable cache;
+
+		private Hook hook;
+
+		static AssemblyLoader ()
+		{
+			cache = new Hashtable (11);
+		}
+
+		public AssemblyLoader (Hook hook)
+		{
+			if (hook == null)
+				throw new NullReferenceException ("Invalid loader hook.");
+
+			this.hook = hook;
+		}
+
+
+		public bool LoadFrom (string assemblyName)
+		{
+			bool res = false;
+			try {
+				TypeArray types = TypeArray.empty;
+
+				lock (cache) {
+					if (cache.Contains (assemblyName)) {
+						types = (cache [assemblyName] as TypeArray);
+						if (types == null) types = TypeArray.empty;
+					} else {
+						Assembly asm = Assembly.LoadFrom (assemblyName);
+						Type [] allTypes = asm.GetTypes ();
+						if (allTypes == null) allTypes = Type.EmptyTypes;
+						types = new TypeArray (allTypes);
+						cache [assemblyName] = types;
+					}
+				}
+				hook (types);
+				res = true;
+			} catch (ReflectionTypeLoadException rtle) {
+				// FIXME: Should we try to recover? Use loaded portion of types.
+				Type [] loaded = rtle.Types;
+				for (int i = 0, xCnt = 0; i < loaded.Length; i++) {
+					if (loaded [i] == null) {
+						Verifier.log.Write ("fatal error",
+						    String.Format ("Unable to load {0}, reason - {1}", loaded [i], rtle.LoaderExceptions [xCnt++]),
+						    ImportanceLevel.LOW);
+					}
+				}
+			} catch (FileNotFoundException fnfe) {
+					Verifier.log.Write ("fatal error", fnfe.ToString (), ImportanceLevel.LOW);
+			} catch (Exception x) {
+					Verifier.log.Write ("fatal error", x.ToString (), ImportanceLevel.LOW);
+			}
+
+			return res;
+		}
+
+	}
+
+
+
+
+	public abstract class AbstractTypeCollection : SortedList {
+
+		private AssemblyLoader loader;
+
+		public AbstractTypeCollection ()
+		{
+			loader = new AssemblyLoader (new AssemblyLoader.Hook (LoaderHook));
+		}
+
+		public AbstractTypeCollection (string assemblyName) : this ()
+		{
+			LoadFrom (assemblyName);
+		}
+
+		public abstract void LoaderHook (TypeArray types);
+
+
+		public bool LoadFrom (string assemblyName)
+		{
+			return loader.LoadFrom (assemblyName);
+		}
+
+	}
+
+
+
+	public class ClassCollection : AbstractTypeCollection {
+
+		public ClassCollection () : base ()
+		{
+		}
+
+		public ClassCollection (string assemblyName)
+		: base (assemblyName)
+		{
+		}
+
+
+		public override void LoaderHook (TypeArray types)
+		{
+			foreach (Type type in types.types) {
+				if (type.IsClass) {
+					this [type.FullName] = new ClassStuff (type);
+				}
+			}
+		}
+
+	}
+
+
+	public class InterfaceCollection : AbstractTypeCollection {
+
+		public InterfaceCollection () : base ()
+		{
+		}
+
+		public InterfaceCollection (string assemblyName)
+		: base (assemblyName)
+		{
+		}
+
+
+		public override void LoaderHook (TypeArray types)
+		{
+			foreach (Type type in types.types) {
+				if (type.IsInterface) {
+					this [type.FullName] = new InterfaceStuff (type);
+				}
+			}
+		}
+
+	}
+
+
+
+	public class EnumCollection : AbstractTypeCollection {
+
+		public EnumCollection () : base ()
+		{
+		}
+
+		public EnumCollection (string assemblyName)
+		: base (assemblyName)
+		{
+		}
+
+		public override void LoaderHook (TypeArray types)
+		{
+			foreach (Type type in types.types) {
+				if (type.IsEnum) {
+					this [type.FullName] = new EnumStuff (type);
+				}
+			}
+		}
+	}
+
+
+
+	public class AssemblyStuff {
+
+		public string name;
+		public bool valid;
+
+		public ClassCollection classes;
+		public InterfaceCollection interfaces;
+		public EnumCollection enums;
+
+
+		protected delegate bool Comparer (AssemblyStuff asm1, AssemblyStuff asm2);
+		private static ArrayList comparers;
+
+		static AssemblyStuff ()
+		{
+			comparers = new ArrayList ();
+			comparers.Add (new Comparer (CompareNumClasses));
+			comparers.Add (new Comparer (CompareNumInterfaces));
+			comparers.Add (new Comparer (CompareClasses));
+			comparers.Add (new Comparer (CompareInterfaces));
+			comparers.Add (new Comparer (CompareEnums));
+		}
+
+		protected static bool CompareNumClasses (AssemblyStuff asm1, AssemblyStuff asm2)
+		{
+			bool res = (asm1.classes.Count == asm2.classes.Count);
+			if (!res) Verifier.Log.Write ("error", "Number of classes mismatch.", ImportanceLevel.MEDIUM);
+			return res;
+		}
+
+		protected static bool CompareNumInterfaces (AssemblyStuff asm1, AssemblyStuff asm2)
+		{
+			bool res = (asm1.interfaces.Count == asm2.interfaces.Count);
+			if (!res) Verifier.Log.Write ("error", "Number of interfaces mismatch.", ImportanceLevel.MEDIUM);
+			return res;
+		}
+
+
+		protected static bool CompareClasses (AssemblyStuff asm1, AssemblyStuff asm2)
+		{
+			bool res = true;
+			Verifier.Log.Write ("info", "Comparing classes.");
+
+			foreach (DictionaryEntry c in asm1.classes) {
+				string className = c.Key as string;
+
+				if (Verifier.Excluded.Contains (className)) {
+					Verifier.Log.Write ("info", String.Format ("Ignoring class {0}.", className), ImportanceLevel.MEDIUM);
+					continue;
+				}
+
+				Verifier.Log.Write ("class", className);
+
+				ClassStuff class1 = c.Value as ClassStuff;
+				ClassStuff class2 = asm2.classes [className] as ClassStuff;
+
+				if (class2 == null) {
+					Verifier.Log.Write ("error", String.Format ("There is no such class in {0}", asm2.name));
+					res = false;
+					if (Verifier.stopOnError || !Verifier.ignoreMissingTypes) return res;
+					continue;
+				}
+
+				res &= (class1 == class2);
+				if (!res && Verifier.stopOnError) return res;
+			}
+
+			return res;
+		}
+
+
+		protected static bool CompareInterfaces (AssemblyStuff asm1, AssemblyStuff asm2)
+		{
+			bool res = true;
+			Verifier.Log.Write ("info", "Comparing interfaces.");
+
+			foreach (DictionaryEntry ifc in asm1.interfaces) {
+				string ifcName = ifc.Key as string;
+				Verifier.Log.Write ("interface", ifcName);
+
+				InterfaceStuff ifc1 = ifc.Value as InterfaceStuff;
+				InterfaceStuff ifc2 = asm2.interfaces [ifcName] as InterfaceStuff;
+
+				if (ifc2 == null) {
+					Verifier.Log.Write ("error", String.Format ("There is no such interface in {0}", asm2.name));
+					res = false;
+					if (Verifier.stopOnError || !Verifier.ignoreMissingTypes) return res;
+					continue;
+				}
+
+				res &= (ifc1 == ifc2);
+				if (!res && Verifier.stopOnError) return res;
+
+			}
+
+			return res;
+		}
+
+
+		protected static bool CompareEnums (AssemblyStuff asm1, AssemblyStuff asm2)
+		{
+			bool res = true;
+			Verifier.Log.Write ("info", "Comparing enums.");
+
+			foreach (DictionaryEntry e in asm1.enums) {
+				string enumName = e.Key as string;
+				Verifier.Log.Write ("enum", enumName);
+
+				EnumStuff e1 = e.Value as EnumStuff;
+				EnumStuff e2 = asm2.enums [enumName] as EnumStuff;
+
+				if (e2 == null) {
+					Verifier.Log.Write ("error", String.Format ("There is no such enum in {0}", asm2.name));
+					res = false;
+					if (Verifier.stopOnError || !Verifier.ignoreMissingTypes) return res;
+					continue;
+				}
+				res &= (e1 == e2);
+				if (!res && Verifier.stopOnError) return res;
+			}
+
+			return res;
+		}
+
+
+
+		public AssemblyStuff (string assemblyName)
+		{
+			this.name = assemblyName;
+			valid = false;
+		}
+
+		public bool Load ()
+		{
+			bool res = true;
+			bool ok;
+
+			classes = new ClassCollection ();
+			ok = classes.LoadFrom (name);
+			res &= ok;
+			if (!ok) Verifier.log.Write ("error", String.Format ("Unable to load classes from {0}.", name), ImportanceLevel.HIGH);
+
+			interfaces = new InterfaceCollection ();
+			ok = interfaces.LoadFrom (name);
+			res &= ok;
+			if (!ok) Verifier.log.Write ("error", String.Format ("Unable to load interfaces from {0}.", name), ImportanceLevel.HIGH);
+
+			enums = new EnumCollection ();
+			ok = enums.LoadFrom (name);
+			res &= ok;
+			if (!ok) Verifier.log.Write ("error", String.Format ("Unable to load enums from {0}.", name), ImportanceLevel.HIGH);
+
+			valid = res;
+			return res;
+		}
+
+
+		public override bool Equals (object o)
+		{
+			bool res = (o is AssemblyStuff);
+			if (res) {
+				AssemblyStuff that = o as AssemblyStuff;
+				IEnumerator it = comparers.GetEnumerator ();
+				while ((res || !Verifier.stopOnError) && it.MoveNext ()) {
+					Comparer compare = it.Current as Comparer;
+					res &= compare (this, that);
+				}
+			}
+			return res;
+		}
+
+
+		public static bool operator == (AssemblyStuff asm1, AssemblyStuff asm2)
+		{
+			return asm1.Equals (asm2);
+		}
+
+		public static bool operator != (AssemblyStuff asm1, AssemblyStuff asm2)
+		{
+			return !(asm1 == asm2);
+		}
+
+		public override int GetHashCode ()
+		{
+			return classes.GetHashCode () ^ interfaces.GetHashCode ();
+		}
+
+
+		public override string ToString ()
+		{
+			string res;
+			if (valid) {
+				res = String.Format ("Asssembly {0}, valid, {1} classes, {2} interfaces, {3} enums.",
+				             name, classes.Count, interfaces.Count, enums.Count);
+			} else {
+				res = String.Format ("Asssembly {0}, invalid.", name);
+			}
+			return res;
+		}
+
+	}
+
+
+
+
+	////////////////////////////////
+	// Compare
+	////////////////////////////////
+
+	public sealed class Compare {
+
+		private Compare ()
+		{
+		}
+
+
+		public static bool Parameters (ParameterInfo[] params1, ParameterInfo[] params2)
+		{
+			bool res = true;
+			if (params1.Length != params2.Length) {
+				Verifier.Log.Write ("Parameter count mismatch.");
+				return false;
+			}
+
+			int count = params1.Length;
+
+			for (int i = 0; i < count && res; i++) {
+				if (params1 [i].Name != params2 [i].Name) {
+					Verifier.Log.Write ("error", String.Format ("Parameters names mismatch {0}, {1}.", params1 [i].Name, params2 [i].Name));
+					res = false;
+					if (Verifier.stopOnError) break;
+				}
+
+				Verifier.Log.Write ("parameter", params1 [i].Name);
+
+				if (!Compare.Types (params1 [i].ParameterType, params2 [i].ParameterType)) {
+					Verifier.Log.Write ("error", String.Format ("Parameters types mismatch {0}, {1}.", params1 [i].ParameterType, params2 [i].ParameterType));
+					res = false;
+					if (Verifier.stopOnError) break;
+				}
+
+
+				if (Verifier.checkOptionalFlags) {
+					if (params1 [i].IsIn != params2 [i].IsIn) {
+						Verifier.Log.Write ("error", "[in] mismatch.");
+						res = false;
+						if (Verifier.stopOnError) break;
+					}
+
+					if (params1 [i].IsOut != params2 [i].IsOut) {
+						Verifier.Log.Write ("error", "[out] mismatch.");
+						res = false;
+						if (Verifier.stopOnError) break;
+					}
+
+					if (params1 [i].IsRetval != params2 [i].IsRetval) {
+						Verifier.Log.Write ("error", "[ref] mismatch.");
+						res = false;
+						if (Verifier.stopOnError) break;
+					}
+
+					if (params1 [i].IsOptional != params2 [i].IsOptional) {
+						Verifier.Log.Write ("error", "Optional flag mismatch.");
+						res = false;
+						if (Verifier.stopOnError) break;
+					}
+
+				} // checkOptionalFlags
+
+
+			}
+
+			return res;
+		}
+
+
+
+		public static bool Methods (MethodInfo mi1, MethodInfo mi2)
+		{
+			
+			if (mi2 == null) {
+				Verifier.Log.Write ("error", String.Format ("There is no such method {0}.", mi1.Name), ImportanceLevel.MEDIUM);
+				return false;
+			}
+
+
+			Verifier.Log.Flush ();
+			Verifier.Log.Write ("method", String.Format ("{0}.", mi1.Name));
+			bool res = true;
+			bool ok;
+			string expected;
+
+			ok = Compare.Types (mi1.ReturnType, mi2.ReturnType);
+			res &= ok;
+			if (!ok) {
+				Verifier.Log.Write ("error", "Return types mismatch.", ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+
+
+
+			ok = (mi1.IsAbstract == mi2.IsAbstract);
+			res &= ok;
+			if (!ok) {
+				expected = (mi1.IsAbstract) ? "abstract" : "non-abstract";
+				Verifier.Log.Write ("error", String.Format ("Expected to be {0}.", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+			ok = (mi1.IsVirtual == mi2.IsVirtual);
+			res &= ok;
+			if (!ok) {
+				expected = (mi1.IsVirtual) ? "virtual" : "non-virtual";
+				Verifier.Log.Write ("error", String.Format ("Expected to be {0}.", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+			ok = (mi1.IsFinal == mi2.IsFinal);
+			res &= ok;
+			if (!ok) {
+				expected = (mi1.IsFinal) ? "final" : "overridable";
+				Verifier.Log.Write ("error", String.Format ("Expected to be {0}.", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+
+
+			// compare access modifiers
+
+			ok = (mi1.IsPrivate == mi2.IsPrivate);
+			res &= ok;
+			if (!ok) {
+				expected = (mi1.IsPublic) ? "public" : "private";
+				Verifier.Log.Write ("error", String.Format ("Accessibility levels mismatch (expected [{0}]).", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+
+			ok = (mi1.IsFamily == mi2.IsFamily);
+			res &= ok;
+			if (!ok) {
+				expected = (mi1.IsFamily) ? "protected" : "!protected";
+				Verifier.Log.Write ("error", String.Format ("Accessibility levels mismatch (expected [{0}]).", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+			ok = (mi1.IsAssembly == mi2.IsAssembly);
+			res &= ok;
+			if (!ok) {
+				expected = (mi1.IsAssembly) ? "internal" : "!internal";
+				Verifier.Log.Write ("error", String.Format ("Accessibility levels mismatch (expected [{0}]).", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+
+			ok = (mi1.IsStatic == mi2.IsStatic);
+			res &= ok;
+			if (!ok) {
+				expected = (mi1.IsStatic) ? "static" : "instance";
+				Verifier.Log.Write ("error", String.Format ("Accessibility levels mismatch (expected [{0}]).", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+
+
+			// parameters
+
+			ok = Compare.Parameters (mi1.GetParameters (), mi2.GetParameters ());
+			res &= ok;
+			if (!ok && Verifier.stopOnError) return res;
+
+
+			ok = (mi1.CallingConvention == mi2.CallingConvention);
+			res &= ok;
+			if (!ok) {
+				Verifier.Log.Write ("error", "Calling conventions mismatch.", ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+
+
+
+			return res;
+		}
+
+
+		public static bool Fields (FieldInfo fi1, FieldInfo fi2)
+		{
+			if (fi2 == null) {
+				Verifier.Log.Write ("error", String.Format ("There is no such field {0}.", fi1.Name), ImportanceLevel.MEDIUM);
+				return false;
+			}
+
+			bool res = true;
+			bool ok;
+			string expected;
+
+			Verifier.Log.Write ("field", String.Format ("{0}.", fi1.Name));
+
+			ok = (fi1.IsPrivate == fi2.IsPrivate);
+			res &= ok;
+			if (!ok) {
+				expected = (fi1.IsPublic) ? "public" : "private";
+				Verifier.Log.Write ("error", String.Format ("Accessibility levels mismatch (expected [{0}]).", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+			ok = (fi1.IsFamily == fi2.IsFamily);
+			res &= ok;
+			if (!ok) {
+				expected = (fi1.IsFamily) ? "protected" : "!protected";
+				Verifier.Log.Write ("error", String.Format ("Accessibility levels mismatch (expected [{0}]).", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+			ok = (fi1.IsAssembly == fi2.IsAssembly);
+			res &= ok;
+			if (!ok) {
+				expected = (fi1.IsAssembly) ? "internal" : "!internal";
+				Verifier.Log.Write ("error", String.Format ("Accessibility levels mismatch (expected [{0}]).", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+			ok = (fi1.IsInitOnly == fi2.IsInitOnly);
+			res &= ok;
+			if (!ok) {
+				expected = (fi1.IsInitOnly) ? "readonly" : "!readonly";
+				Verifier.Log.Write ("error", String.Format ("Accessibility levels mismatch (expected [{0}]).", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+			ok = (fi1.IsStatic == fi2.IsStatic);
+			res &= ok;
+			if (!ok) {
+				expected = (fi1.IsStatic) ? "static" : "instance";
+				Verifier.Log.Write ("error", String.Format ("Accessibility levels mismatch (expected [{0}]).", expected), ImportanceLevel.MEDIUM);
+				if (Verifier.stopOnError) return res;
+			}
+
+			return res;
+		}
+
+
+
+		public static bool Types (Type type1, Type type2)
+		{
+			// NOTE:
+			// simply calling type1.Equals (type2) won't work,
+			// types are in different assemblies hence they have
+			// different (fully-qualified) names.
+			int eqFlags = 0;
+			eqFlags |= (type1.IsAbstract  == type2.IsAbstract)  ? 0 : 0x001;
+			eqFlags |= (type1.IsClass     == type2.IsClass)     ? 0 : 0x002;
+			eqFlags |= (type1.IsValueType == type2.IsValueType) ? 0 : 0x004;
+			eqFlags |= (type1.IsPublic    == type2.IsPublic)    ? 0 : 0x008;
+			eqFlags |= (type1.IsSealed    == type2.IsSealed)    ? 0 : 0x010;
+			eqFlags |= (type1.IsEnum      == type2.IsEnum)      ? 0 : 0x020;
+			eqFlags |= (type1.IsPointer   == type2.IsPointer)   ? 0 : 0x040;
+			eqFlags |= (type1.IsPrimitive == type2.IsPrimitive) ? 0 : 0x080;
+			bool res = (eqFlags == 0);
+
+			if (!res) {
+				// TODO: convert flags into descriptive message.
+				Verifier.Log.Write ("error", "Types mismatch (0x" + eqFlags.ToString("X") + ").", ImportanceLevel.HIGH);
+			}
+
+
+			bool ok;
+
+			ok = (type1.Attributes & TypeAttributes.BeforeFieldInit) ==
+			     (type2.Attributes & TypeAttributes.BeforeFieldInit);
+			if (!ok) {
+				Verifier.Log.Write ("error", "Types attributes mismatch: BeforeFieldInit.", ImportanceLevel.HIGH);
+			}
+			res &= ok;
+
+			ok = (type1.Attributes & TypeAttributes.ExplicitLayout) ==
+			     (type2.Attributes & TypeAttributes.ExplicitLayout);
+			if (!ok) {
+				Verifier.Log.Write ("error", "Types attributes mismatch: ExplicitLayout.", ImportanceLevel.HIGH);
+			}
+			res &= ok;
+
+			ok = (type1.Attributes & TypeAttributes.SequentialLayout) ==
+			     (type2.Attributes & TypeAttributes.SequentialLayout);
+			if (!ok) {
+				Verifier.Log.Write ("error", "Types attributes mismatch: SequentialLayout.", ImportanceLevel.HIGH);
+			}
+			res &= ok;
+
+			ok = (type1.Attributes & TypeAttributes.Serializable) ==
+			     (type2.Attributes & TypeAttributes.Serializable);
+			if (!ok) {
+				Verifier.Log.Write ("error", "Types attributes mismatch: Serializable.", ImportanceLevel.HIGH);
+			}
+			res &= ok;
+
+			return res;
+		}
+
+	}
+
+
+
+
+	////////////////////////////////
+	// Log
+	////////////////////////////////
+
+	public enum ImportanceLevel : int {
+		LOW = 0, MEDIUM, HIGH
+	}
+
+
+	public interface ILogger {
+
+		void Write (string tag, string msg, ImportanceLevel importance);
+		void Write (string msg, ImportanceLevel level);
+		void Write (string tag, string msg);
+		void Write (string msg);
+		ImportanceLevel DefaultImportance {get; set;}
+		void Flush ();
+		void Close ();
+	}
+
+
+	public abstract class AbstractLogger : ILogger {
+		private ImportanceLevel defImportance = ImportanceLevel.MEDIUM;
+
+		public abstract void Write (string tag, string msg, ImportanceLevel importance);
+		public abstract void Write (string msg, ImportanceLevel level);
+
+		public virtual void Write (string tag, string msg)
+		{
+			Write (tag, msg, DefaultImportance);
+		}
+
+		public virtual void Write (string msg)
+		{
+			Write (msg, DefaultImportance);
+		}
+
+		public virtual ImportanceLevel DefaultImportance {
+			get {
+				return defImportance;
+			}
+			set {
+				defImportance = value < ImportanceLevel.LOW
+				                 ? ImportanceLevel.LOW
+				                 : value > ImportanceLevel.HIGH
+				                   ? ImportanceLevel.HIGH
+				                   : value;
+			}
+		}
+
+		public abstract void Flush ();
+		public abstract void Close ();
+
+	}
+
+
+
+	public class TextLogger : AbstractLogger {
+
+		private TextWriter writer;
+
+		public TextLogger (TextWriter writer)
+		{
+			if (writer == null)
+				throw new NullReferenceException ();
+
+			this.writer = writer;
+		}
+
+		private void DoWrite (string tag, string msg)
+		{
+			if (tag != null && tag.Length > 0) {
+				writer.WriteLine ("[{0}]\t{1}", tag, msg);
+			} else {
+				writer.WriteLine ("\t\t" + msg);
+			}
+		}
+
+		public override void Write (string tag, string msg, ImportanceLevel importance)
+		{
+			int v = Log.VerboseLevel;
+			switch (v) {
+			case 0 :
+				break;
+			case 1 :
+				if (importance >= ImportanceLevel.HIGH) {
+					DoWrite (tag, msg);
+				}
+				break;
+			case 2 :
+				if (importance >= ImportanceLevel.MEDIUM) {
+					DoWrite (tag, msg);
+				}
+				break;
+			case 3 :
+				DoWrite (tag, msg);
+				break;
+			default:
+				break;
+			}
+		}
+
+		public override void Write (string msg, ImportanceLevel importance)
+		{
+			Write (null, msg, importance);
+		}
+
+		public override void Flush ()
+		{
+			Console.Out.Flush ();
+		}
+
+		public override void Close ()
+		{
+			if (writer != Console.Out && writer != Console.Error) {
+				writer.Close ();
+			}
+		}
+	}
+
+
+
+	public sealed class Log {
+
+		private static int verbose = 3;
+
+		private ArrayList consumers;
+
+		public Log (bool useDefault)
+		{
+			consumers = new ArrayList ();
+			if (useDefault) AddConsumer (new TextLogger (Console.Out));
+		}
+
+		public Log () : this (true)
+		{
+		}
+
+
+		public static int VerboseLevel {
+			get {
+				return verbose;
+			}
+			set {
+				verbose = (value < 0)
+				           ? 0
+				           : (value > 3)
+				             ? 3 : value;
+			}
+		}
+
+		public void AddConsumer (ILogger consumer)
+		{
+			consumers.Add (consumer);
+		}
+
+
+		public void Write (string tag, string msg, ImportanceLevel importance)
+		{
+			foreach (ILogger logger in consumers) {
+				if (tag == null || tag == "") {
+					logger.Write (msg, importance);
+				} else {
+					logger.Write (tag, msg, importance);
+				}
+			}
+		}
+
+		public void Write (string msg, ImportanceLevel importance)
+		{
+			Write (null, msg, importance);
+		}
+
+
+		public void Write (string tag, string msg)
+		{
+			foreach (ILogger logger in consumers) {
+				if (tag == null || tag == "") {
+					logger.Write (msg);
+				} else {
+					logger.Write (tag, msg);
+				}
+			}
+		}
+
+		public void Write (string msg)
+		{
+			Write (null, msg);
+		}
+
+
+		public void Flush ()
+		{
+			foreach (ILogger logger in consumers) {
+				logger.Flush ();
+			}
+		}
+
+
+		public void Close ()
+		{
+			foreach (ILogger logger in consumers) {
+				logger.Flush ();
+				logger.Close ();
+			}
+		}
+
+	}
+
+
+
+
+
+
+	////////////////////////////////
+	// Main
+	////////////////////////////////
+
+	public class Verifier {
+
+		public static readonly Log log = new Log ();
+		public static bool stopOnError = false;
+		public static bool ignoreMissingTypes = true;
+		public static bool checkOptionalFlags = true;
+
+		private static readonly IList excluded;
+
+		static Verifier ()
+		{
+			excluded = new ArrayList ();
+			excluded.Add ("<PrivateImplementationDetails>");
+		}
+
+
+		private Verifier ()
+		{
+		}
+
+		public static Log Log {
+			get {
+				return log;
+			}
+		}
+
+		public static IList Excluded {
+			get {
+				return excluded;
+			}
+		}
+
+
+
+		public static void Main (String [] args)
+		{
+			if (args.Length < 2) {
+				Console.WriteLine ("Usage: verifier assembly1 assembly2");
+			} else {
+				string name1 = args [0];
+				string name2 = args [1];
+
+				bool ok = false;
+
+				AssemblyStuff asm1 = new AssemblyStuff (name1);
+				AssemblyStuff asm2 = new AssemblyStuff (name2);
+				ok = asm1.Load ();
+				if (!ok) {
+					Console.WriteLine ("Unable to load assembly {0}.", name1);
+					Environment.Exit (-1);
+				}
+
+				ok = asm2.Load ();
+				if (!ok) {
+					Console.WriteLine ("Unable to load assembly {0}.", name2);
+					Environment.Exit (-1);
+				}
+
+
+				try {
+					ok = (asm1 == asm2);
+				} catch {
+					ok = false;
+				} finally {
+					Log.Close ();
+				}
+
+				if (!ok) {
+					Console.WriteLine ("--- not equal");
+					Environment.Exit (-1);
+				}
+			}
+		}
+
+	}
+
+
+}
+
diff --git a/mono.pc.in b/mono.pc.in
new file mode 100644
index 00000000000..0a9053b1ebd
--- /dev/null
+++ b/mono.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+
+Name: Mono
+Description: Mono Runtime
+Version: @VERSION@
+Requires: glib-2.0 gmodule-2.0
+Libs: -L${libdir} -lmono
+Cflags: -I${includedir}
diff --git a/mono.spec.in b/mono.spec.in
new file mode 100644
index 00000000000..ba6eb49461e
--- /dev/null
+++ b/mono.spec.in
@@ -0,0 +1,79 @@
+Summary: The mono CIL runtime, suitable for running .NET code
+Name: mono
+Version: @VERSION@
+Release: 1
+License: LGPL
+Group: System Environment/Base
+# the original file is in .gz format but I want to save a few bytes
+Source0: http://go-mono.com/archive/mono-0.14.tar.gz
+URL: http://go-mono.com/
+BuildRoot: %{_tmppath}/%{name}-root
+Requires: /sbin/ldconfig
+BuildRequires: libgc-devel
+BuildRequires: bison
+Packager: Miguel de Icaza <miguel@ximian.com>
+Requires: mono-classes
+
+%description
+The Mono runtime implements a JIT engine for the ECMA CLI virtual machine (as
+well as a byte code interpreter, the class loader, the garbage collector, threading system and
+metadata access libraries.
+
+%package devel
+Summary: Files and programs needed for mono development
+Group: Development/Tools
+PreReq: %{name} = %{version}-%{release}
+
+%description devel
+Header files, programs and documentation needed to develop programs with
+the Mono .NET implementation
+
+%prep
+%setup -q
+
+%build
+./configure
+make
+
+%install
+rm -rf %{buildroot}
+%makeinstall
+
+%clean
+rm -rf %{buildroot}
+
+%post -p /sbin/ldconfig
+
+%postun -p /sbin/ldconfig
+
+%files
+%defattr(-, root, root)
+%doc AUTHORS COPYING.LIB ChangeLog NEWS README
+%{_bindir}/mono
+%{_bindir}/mint
+%{_libdir}/*.so.*
+%{_mandir}/man1/mono.*
+%{_mandir}/man1/mint.*
+%{_mandir}/man5/*
+
+%files devel
+%defattr(-, root, root)
+%{_bindir}/monodis
+%{_bindir}/monograph
+%{_libdir}/*.a
+%{_libdir}/*.la
+%{_libdir}/*.so
+%{_libdir}/pkgconfig/*
+%{_includedir}/*
+%{_mandir}/man1/monodis.*
+%{_mandir}/man1/monostyle.*
+%{_mandir}/man1/monoburg.*
+%{_mandir}/man1/mcs.*
+%{_datadir}/%{name}/*
+
+%changelog
+* Wed Aug 21 2002 Miguel de Icaza <miguel@ximian.com>
+Few touches, check into cvs
+
+* Mon Aug 19 2002 Daniel Resare <noa@resare.com>
+- Initial RPM release.
diff --git a/mono/Makefile.am b/mono/Makefile.am
index 75a6be2d90a..8a94b95a692 100644
--- a/mono/Makefile.am
+++ b/mono/Makefile.am
@@ -1,9 +1,9 @@
-# Currently the jit needs some work before it will build on windows
+# the handles dir doesn't apply to windows
 if PLATFORM_WIN32
-SUBDIRS = io-layer monoburg metadata cil dis \
-	arch monograph interpreter wrapper tests
+SUBDIRS = utils io-layer monoburg os metadata cil dis \
+	arch monograph interpreter jit tests benchmark
 else
-SUBDIRS = io-layer monoburg metadata cil dis \
-	arch monograph interpreter jit wrapper tests
+SUBDIRS = utils io-layer monoburg os metadata cil dis \
+	arch monograph interpreter jit tests benchmark handles
 endif
 
diff --git a/mono/arch/ChangeLog b/mono/arch/ChangeLog
index f42d38eef02..67216cdbb7c 100644
--- a/mono/arch/ChangeLog
+++ b/mono/arch/ChangeLog
@@ -1,3 +1,100 @@
+2002-08-20  Mark Crichton <crichton@gimp.org>
+
+	* sparc/tramp.c (mono_create_trampoline): Now works on Sparc.  Tested
+	on an Ultra 2 running Linux.
+
+Mon Aug 5 19:21:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* x86/tramp.c: fix random memory read in mono_create_method_pointer.
+
+2002-08-05  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86/tramp.c (mono_create_trampoline): fixed stack_size bug
+
+2002-08-01  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86/tramp.c (mono_create_method_pointer): allocate space for
+	value types.
+	(mono_create_trampoline): also push the value type pointer for
+	methods returning value types.
+	(mono_create_method_pointer): support valuetype returns.
+
+2002-07-31  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86/tramp.c: remove code to handle PInvoke because this is no
+	longer needed.
+	(mono_create_method_pointer): return method->addr for pinvoke methods
+
+Fri Jul 19 14:18:36 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* x86/tramp.c: fix float loads. Simple delegate marshaling fix.
+
+2002-07-08  Radek Doulik  <rodo@ximian.com>
+
+	* ppc/tramp.c: marshaling for SZARRAY
+
+2002-07-05  Radek Doulik  <rodo@ximian.com>
+
+	* ppc/tramp.c: removed magic hack
+
+Tue Jun 18 10:21:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* x86/tramp.c: marshal simple arrays correctly.
+
+2002-05-27  Miguel de Icaza  <miguel@ximian.com>
+
+	* x86/x86-codegen.h: Set the standard header format.
+
+2002-05-23  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86/tramp.c (mono_create_method_pointer): removed the magic
+	trick to store the function pointer in the prolog and use the same
+	mechanism as in the jit.
+
+2002-05-13  Radek Doulik  <rodo@ximian.com>
+
+	* ppc/tramp.c (emit_save_parameters): fix I8 parameters
+
+2002-05-06  Sergey Chaban  <serge@wildwestsoftware.com>
+
+	* x86/x86-codegen.h: added missing shifts;
+	8-bit ALU operations (reg-reg);
+	macro for FPU ops with integer operand;
+	FIST macro (without pop);
+
+Mon Apr 22 12:57:31 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* x86/x86-codegen.h: added loop instructions and made x86_patch fully
+	useful.
+
+2002-04-20  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86/tramp.c (mono_create_trampoline): support internalcall
+	String constructors
+
+Sat Apr 6 16:29:40 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* x86/tramp.c: fix advancement of argument position on the stack.
+
+Sat Mar 16 19:12:57 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* x86/tramp.c: increase default allocated size for trampolines
+	and assert on overflow.
+
+2002-03-14  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86/tramp.c (mono_create_trampoline): dont use fld/fst to copy
+	R8 values
+
+Mon Mar 11 16:14:29 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* x86/x86-codegen.h: addex x86_clear_reg() and changed
+	x86_mov_reg_imm() to not check for imm == 0.
+
+Thu Feb 28 12:34:21 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* x86/tramp.c: start handling of more complex marshaling stuff.
+
 2002-02-25  Sergey Chaban  <serge@wildwestsoftware.com>
 
 	* arm: added ARM support code.
diff --git a/mono/arch/arm/Makefile.am b/mono/arch/arm/Makefile.am
index 8608db78f24..afce5cd673d 100644
--- a/mono/arch/arm/Makefile.am
+++ b/mono/arch/arm/Makefile.am
@@ -11,8 +11,7 @@ libmonoarch_arm_la_SOURCES = $(BUILT_SOURCES) \
 	arm-codegen.c \
 	arm-codegen.h \
 	arm-dis.c \
-	arm-dis.h \
-	#
+	arm-dis.h
 
 arm_dpimacros.h: dpiops.sh mov_macros.th dpi_macros.th cmp_macros.th
 	bash ./dpiops.sh
diff --git a/mono/arch/arm/tramp.c b/mono/arch/arm/tramp.c
index 0a7c47d470b..3e5af332e17 100644
--- a/mono/arch/arm/tramp.c
+++ b/mono/arch/arm/tramp.c
@@ -22,7 +22,6 @@
 
 
 /* prototypes for private functions (to avoid compiler warnings) */
-MonoString* mono_string_new_wrapper (const char* text);
 void flush_icache (void);
 void* alloc_code_buff (int num_instr);
 
@@ -45,14 +44,6 @@ void* alloc_code_buff (int num_instr);
 
 
 
-/*
- * Invokes mono_string_new for the current AppDomain.
- */
-MonoString* mono_string_new_wrapper (const char* text)
-{
-	return text == NULL ? NULL : mono_string_new(mono_domain_get(), text);
-}
-
 
 void flush_icache ()
 {
diff --git a/mono/arch/ppc/tramp.c b/mono/arch/ppc/tramp.c
index 0e012963c12..6fc89a19f14 100644
--- a/mono/arch/ppc/tramp.c
+++ b/mono/arch/ppc/tramp.c
@@ -21,6 +21,8 @@
 #endif
 #endif
 
+#define DEBUG(x)
+
 /* gpointer
 fake_func (gpointer (*callme)(gpointer), stackval *retval, void *this_obj, stackval *arguments)
 {
@@ -90,18 +92,15 @@ add_general (guint *gr, guint *stack_size, guint *code_size, gboolean simple)
 }
 
 static void inline
-calculate_sizes (MonoMethod *method, guint *stack_size, guint *code_size, guint *strings, gint runtime)
+calculate_sizes (MonoMethodSignature *sig, guint *stack_size, guint *code_size, gboolean string_ctor)
 {
-	MonoMethodSignature *sig;
 	guint i, fr, gr;
 	guint32 simpletype;
 
 	fr = gr = 0;
 	*stack_size = MINIMAL_STACK_SIZE*4;
 	*code_size  = (PROLOG_INS + CALL_INS + EPILOG_INS)*4;
-	*strings = 0;
 
-	sig = method->signature;
 	if (sig->hasthis) {
 		add_general (&gr, stack_size, code_size, TRUE);
 	}
@@ -125,10 +124,14 @@ calculate_sizes (MonoMethod *method, guint *stack_size, guint *code_size, guint
 		case MONO_TYPE_I:
 		case MONO_TYPE_U:
 		case MONO_TYPE_PTR:
-		case MONO_TYPE_SZARRAY:
 		case MONO_TYPE_CLASS:
 		case MONO_TYPE_OBJECT:
+		case MONO_TYPE_STRING:
+			add_general (&gr, stack_size, code_size, TRUE);
+			break;
+		case MONO_TYPE_SZARRAY:
 			add_general (&gr, stack_size, code_size, TRUE);
+			*code_size += 4;
 			break;
 		case MONO_TYPE_VALUETYPE:
 			if (sig->params [i]->data.klass->enumtype) {
@@ -141,15 +144,6 @@ calculate_sizes (MonoMethod *method, guint *stack_size, guint *code_size, guint
 			add_general (&gr, stack_size, code_size, TRUE);
 			*code_size += 4;
 			break;
-		case MONO_TYPE_STRING:
-			if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || runtime) {
-				add_general (&gr, stack_size, code_size, TRUE);
-				break;
-			}
-			(*strings) ++;
-			*code_size += 12*4;
-			*stack_size += 4;
-			break;
 		case MONO_TYPE_I8:
 			add_general (&gr, stack_size, code_size, FALSE);
 			break;
@@ -167,7 +161,7 @@ calculate_sizes (MonoMethod *method, guint *stack_size, guint *code_size, guint
 		}
 	}
 
-	if (sig->ret->byref) {
+	if (sig->ret->byref || string_ctor) {
 		*code_size += 8;
 	} else {
 		simpletype = sig->ret->type;
@@ -189,13 +183,8 @@ enum_retvalue:
 		case MONO_TYPE_R8:
 		case MONO_TYPE_SZARRAY:
 		case MONO_TYPE_ARRAY:
-			*code_size += 8;
-			break;
 		case MONO_TYPE_STRING:
 			*code_size += 8;
-			if (!(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) && !runtime) {
-				*code_size += 16;
-			}
 			break;
 		case MONO_TYPE_I8:
 			*code_size += 12;
@@ -214,23 +203,14 @@ enum_retvalue:
 		}
 	}
 
-	if (*strings) {
-		/* space to keep parameters and prepared strings */
-		 *stack_size += 8;
-		 *code_size += 16;
-		 if (sig->hasthis) {
-			 *stack_size += 4;
-			 *code_size  += 12;
-		 }
-	}
 	/* align stack size to 16 */
-	printf ("      stack size: %d (%d)\n       code size: %d\n", (*stack_size + 15) & ~15, *stack_size, *code_size);
+	DEBUG (printf ("      stack size: %d (%d)\n       code size: %d\n", (*stack_size + 15) & ~15, *stack_size, *code_size));
 	*stack_size = (*stack_size + 15) & ~15;
 
 }
 
 static inline guint8 *
-emit_prolog (guint8 *p, MonoMethod *method, guint stack_size, guint strings)
+emit_prolog (guint8 *p, MonoMethodSignature *sig, guint stack_size)
 {
 	/* function prolog */
 	ppc_stwu (p, ppc_r1, -stack_size, ppc_r1);     /* sp      <--- sp - stack_size, sp[0] <---- sp save sp, alloc stack */
@@ -239,28 +219,15 @@ emit_prolog (guint8 *p, MonoMethod *method, guint stack_size, guint strings)
 	ppc_stw  (p, ppc_r0, stack_size + 4, ppc_r1);  /* sp[-4]  <--- LR      save return address for "callme" */
 	ppc_mr   (p, ppc_r31, ppc_r1);                 /* r31     <--- sp */
 
-	/* handle our parameters */
-	if (strings) {
-		ppc_stw  (p, ppc_r30, stack_size - 16, ppc_r1);
-		ppc_stw  (p, ppc_r29, stack_size - 12, ppc_r1);
-		if (method->signature->hasthis) {
-			ppc_stw  (p, ppc_r28, 24, ppc_r1);
-		}
-		ppc_mr   (p, ppc_r30, ppc_r6);                        /* args */
-		ppc_mr   (p, ppc_r29, ppc_r3);                        /* callme */
-		if (method->signature->hasthis) {
-			ppc_mr   (p, ppc_r28, ppc_r5);                /* this */
-		}
-	} else {
-		ppc_mr   (p, ppc_r12, ppc_r6);                        /* keep "arguments" in register */
-		ppc_mr   (p, ppc_r0, ppc_r3);                         /* keep "callme" in register */
-	}
+	ppc_mr   (p, ppc_r12, ppc_r6);                        /* keep "arguments" in register */
+	ppc_mr   (p, ppc_r0, ppc_r3);                         /* keep "callme" in register */
+
 	ppc_stw  (p, ppc_r4, stack_size - 12, ppc_r31);               /* preserve "retval", sp[+8] */
 
 	return p;
 }
 
-#define ARG_BASE strings ? ppc_r30 : ppc_r12
+#define ARG_BASE ppc_r12
 #define SAVE_4_IN_GENERIC_REGISTER \
 			if (gr < GENERAL_REGS) { \
 				ppc_lwz  (p, ppc_r3 + gr, i*16, ARG_BASE); \
@@ -272,32 +239,15 @@ emit_prolog (guint8 *p, MonoMethod *method, guint stack_size, guint strings)
 			}
 
 inline static guint8*
-emit_save_parameters (guint8 *p, MonoMethod *method, guint stack_size, guint strings, gint runtime)
+emit_save_parameters (guint8 *p, MonoMethodSignature *sig, guint stack_size)
 {
-	MonoMethodSignature *sig;
 	guint i, fr, gr, act_strs, stack_par_pos;
 	guint32 simpletype;
 
 	fr = gr = 0;
 	act_strs = 0;
-	sig = method->signature;
 	stack_par_pos = 8;
 
-	if (strings) {
-		for (i = 0; i < sig->param_count; ++i) {
-			if (!sig->params [i]->byref && sig->params [i]->type == MONO_TYPE_STRING
-			    && !((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || runtime)) {
-				ppc_lis  (p, ppc_r0,     (guint32) mono_string_to_utf8 >> 16);
-				ppc_lwz  (p, ppc_r3, i*16, ppc_r30);
-				ppc_ori  (p, ppc_r0, ppc_r0, (guint32) mono_string_to_utf8 & 0xffff);
-				ppc_mtlr (p, ppc_r0);
-				ppc_blrl (p);
-				ppc_stw  (p, ppc_r3, stack_size - 24 - act_strs, ppc_r31);
-				act_strs += 4;
-			}
-		}
-	}
-
 	if (sig->hasthis) {
 		ppc_mr (p, ppc_r3, ppc_r5);
 		gr ++;
@@ -323,11 +273,21 @@ emit_save_parameters (guint8 *p, MonoMethod *method, guint stack_size, guint str
 		case MONO_TYPE_I:
 		case MONO_TYPE_U:
 		case MONO_TYPE_PTR:
-		case MONO_TYPE_SZARRAY:
 		case MONO_TYPE_CLASS:
 		case MONO_TYPE_OBJECT:
+		case MONO_TYPE_STRING:
+		case MONO_TYPE_SZARRAY:
 			SAVE_4_IN_GENERIC_REGISTER;
 			break;
+			/* g_warning ("untested marshaling\n");
+				if (gr < GENERAL_REGS) {
+					ppc_lwz  (p, ppc_r3 + gr, i*16, ARG_BASE);
+					ppc_lwz  (p, ppc_r3 + gr, G_STRUCT_OFFSET (MonoArray, vector), ppc_r3 + gr);
+					gr ++;
+				} else {
+					NOT_IMPLEMENTED ("save marshalled SZARRAY on stack");
+				}
+				break; */
 		case MONO_TYPE_VALUETYPE:
 			if (sig->params [i]->data.klass->enumtype) {
 				simpletype = sig->params [i]->data.klass->enum_basetype->type;
@@ -344,26 +304,13 @@ emit_save_parameters (guint8 *p, MonoMethod *method, guint stack_size, guint str
 				NOT_IMPLEMENTED ("save value type on stack");
 			}
 			break;
-		case MONO_TYPE_STRING:
-			if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || runtime) {
-				SAVE_4_IN_GENERIC_REGISTER;
-			} else {
-				if (gr < 8) {
-					ppc_lwz (p, ppc_r3 + gr, stack_size - 24 - act_strs, ppc_r31);
-					gr ++;
-					act_strs += 4;
-				} else
-					NOT_IMPLEMENTED ("string on stack");
-			}
-			break;
 		case MONO_TYPE_I8:
 			if (gr < 7) {
 				if (gr & 1)
 					gr ++;
-				g_warning ("check endianess");
 				ppc_lwz  (p, ppc_r3 + gr, i*16, ARG_BASE);
 				gr ++;
-				ppc_lwz  (p, ppc_r3 + gr, i*17, ARG_BASE);
+				ppc_lwz  (p, ppc_r3 + gr, i*16 + 4, ARG_BASE);
 				gr ++;
 			} else {
 				NOT_IMPLEMENTED ("i8 on stack");
@@ -406,29 +353,28 @@ alloc_code_memory (guint code_size)
 #else
 	p = g_malloc (code_size);
 #endif
-	printf ("           align: %p (%d)\n", p, (guint)p % 4);
+	DEBUG (printf ("           align: %p (%d)\n", p, (guint)p % 4));
 
 	return p;
 }
 
-static MonoString*
+/* static MonoString*
 mono_string_new_wrapper (const char *text)
 {
 	return text ? mono_string_new (mono_domain_get (), text) : NULL;
-}
+} */
 
 static inline guint8 *
-emit_call_and_store_retval (guint8 *p, MonoMethod *method, guint stack_size, guint strings, gint runtime)
+emit_call_and_store_retval (guint8 *p, MonoMethodSignature *sig, guint stack_size, gboolean string_ctor)
 {
-	MonoMethodSignature *sig = method->signature;
 	guint32 simpletype;
 
 	/* call "callme" */
-	ppc_mtlr (p, strings ? ppc_r29 : ppc_r0);
+	ppc_mtlr (p, ppc_r0);
 	ppc_blrl (p);
 
 	/* get return value */
-	if (sig->ret->byref) {
+	if (sig->ret->byref || string_ctor) {
 		ppc_lwz  (p, ppc_r9, stack_size - 12, ppc_r31);        /* load "retval" address */
 		ppc_stw  (p, ppc_r3, 0, ppc_r9);                       /* save return value (r3) to "retval" */
 	} else {
@@ -455,20 +401,9 @@ enum_retvalue:
 		case MONO_TYPE_OBJECT:
 		case MONO_TYPE_SZARRAY:
 		case MONO_TYPE_ARRAY:
-			ppc_lwz  (p, ppc_r9, stack_size - 12, ppc_r31);        /* load "retval" address */
-			ppc_stw  (p, ppc_r3, 0, ppc_r9);                       /* save return value (r3) to "retval" */
-			break;
 		case MONO_TYPE_STRING:
-			if (!(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) && !runtime) {
-				ppc_lis  (p, ppc_r0,     (guint32) mono_string_new_wrapper >> 16);
-				ppc_ori  (p, ppc_r0, ppc_r0, (guint32) mono_string_new_wrapper & 0xffff);
-				ppc_mtlr (p, ppc_r0);
-				ppc_blrl (p);
-			}
-
 			ppc_lwz  (p, ppc_r9, stack_size - 12, ppc_r31);        /* load "retval" address */
 			ppc_stw  (p, ppc_r3, 0, ppc_r9);                       /* save return value (r3) to "retval" */
-
 			break;
 		case MONO_TYPE_R4:
 			ppc_lwz  (p, ppc_r9, stack_size - 12, ppc_r31);        /* load "retval" address */
@@ -479,7 +414,6 @@ enum_retvalue:
 			ppc_stfd (p, ppc_f1, 0, ppc_r9);                       /* save return value (f1) to "retval" */
 			break;
 		case MONO_TYPE_I8:
-			g_warning ("check endianess");
 			ppc_lwz  (p, ppc_r9, stack_size - 12, ppc_r31);        /* load "retval" address */
 			ppc_stw  (p, ppc_r3, 0, ppc_r9);                       /* save return value (r3) to "retval" */
 			ppc_stw  (p, ppc_r4, 4, ppc_r9);                       /* save return value (r3) to "retval" */
@@ -502,34 +436,8 @@ enum_retvalue:
 }
 
 static inline guint8 *
-emit_epilog (guint8 *p, MonoMethod *method, guint stack_size, guint strings, gboolean runtime)
+emit_epilog (guint8 *p, MonoMethodSignature *sig, guint stack_size)
 {
-	if (strings) {
-		MonoMethodSignature *sig = method->signature;
-		guint i, act_strs;
-
-		/* free allocated memory */
-		act_strs = 0;
-		for (i = 0; i < sig->param_count; ++i) {
-			if (!sig->params [i]->byref && sig->params [i]->type == MONO_TYPE_STRING
-			    && !((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || runtime)) {
-				ppc_lis  (p, ppc_r0,     (guint32) g_free >> 16);
-				ppc_lwz  (p, ppc_r3, stack_size - 24 - act_strs, ppc_r31);
-				ppc_ori  (p, ppc_r0, ppc_r0, (guint32) g_free & 0xffff);
-				ppc_mtlr (p, ppc_r0);
-				ppc_blrl (p);
-				act_strs += 4;
-			}
-		}
-
-		/* restore volatile registers */
-		ppc_lwz  (p, ppc_r30, stack_size - 16, ppc_r1);
-		ppc_lwz  (p, ppc_r29, stack_size - 12, ppc_r1);
-		if (method->signature->hasthis) {
-			ppc_lwz  (p, ppc_r28, 24, ppc_r1);
-		}
-	}
-
 	/* function epilog */
 	ppc_lwz  (p, ppc_r11, 0,  ppc_r1);        /* r11     <--- sp[0]   load backchain from caller's function */
 	ppc_lwz  (p, ppc_r0, 4, ppc_r11);         /* r0      <--- r11[4]  load return address */
@@ -542,19 +450,19 @@ emit_epilog (guint8 *p, MonoMethod *method, guint stack_size, guint strings, gbo
 }
 
 MonoPIFunc
-mono_create_trampoline (MonoMethod *method, int runtime)
+mono_create_trampoline (MonoMethodSignature *sig, gboolean string_ctor)
 {
 	guint8 *p, *code_buffer;
-	guint stack_size, code_size, strings;
+	guint stack_size, code_size;
 
-	printf ("\nPInvoke [start emiting] %s\n", method->name);
-	calculate_sizes (method, &stack_size, &code_size, &strings, runtime);
+	DEBUG (printf ("\nPInvoke [start emiting]\n"));
+	calculate_sizes (sig, &stack_size, &code_size, string_ctor);
 
 	p = code_buffer = alloc_code_memory (code_size);
-	p = emit_prolog (p, method, stack_size, strings);
-	p = emit_save_parameters (p, method, stack_size, strings, runtime);
-	p = emit_call_and_store_retval (p, method, stack_size, strings, runtime);
-	p = emit_epilog (p, method, stack_size, strings, runtime);
+	p = emit_prolog (p, sig, stack_size);
+	p = emit_save_parameters (p, sig, stack_size);
+	p = emit_call_and_store_retval (p, sig, stack_size, string_ctor);
+	p = emit_epilog (p, sig, stack_size);
 
 	/* {
 		guchar *cp;
@@ -570,10 +478,10 @@ mono_create_trampoline (MonoMethod *method, int runtime)
 	}
 #endif
 
-	printf ("emited code size: %d\n", p - code_buffer);
+	DEBUG (printf ("emited code size: %d\n", p - code_buffer));
 	flush_icache (code_buffer, p - code_buffer);
 
-	printf ("PInvoke [end emiting]\n");
+	DEBUG (printf ("PInvoke [end emiting]\n"));
 
 	return (MonoPIFunc) code_buffer;
 	/* return fake_func; */
@@ -599,27 +507,21 @@ void *
 mono_create_method_pointer (MonoMethod *method)
 {
 	MonoMethodSignature *sig;
+	MonoJitInfo *ji;
 	guint8 *p, *code_buffer;
-	guint i, code_size, stack_size, stackval_arg_pos, local_pos, local_start, reg_param, stack_param;
+	guint i, align = 0, code_size, stack_size, stackval_arg_pos, local_pos, local_start, reg_param, stack_param,
+		this_flag;
 	guint32 simpletype;
 
-	code_size = 512;
-	stack_size = 512;
+	code_size = 1024;
+	stack_size = 1024;
 	stack_param = 0;
 
 	sig = method->signature;
 
 	p = code_buffer = g_malloc (code_size);
 
-	printf ("\nDelegate [start emiting] %s\n", method->name);
-
-	/* jump after header which consist of "Mono" + method ptr */
-	ppc_b (p, 3);
-	*p = 'M'; p ++;
-	*p = 'o'; p ++;
-	*p = 'n'; p ++;
-	*p = 'o'; p ++;
-	*(void **) p = method; p += 4;
+	DEBUG (printf ("\nDelegate [start emiting] %s\n", method->name));
 
 	/* prolog */
 	ppc_stwu (p, ppc_r1, -stack_size, ppc_r1);     /* sp      <--- sp - stack_size, sp[0] <---- sp save sp, alloc stack */
@@ -646,13 +548,22 @@ mono_create_method_pointer (MonoMethod *method)
 	if (sig->hasthis) {
 		ppc_stw  (p, ppc_r3, (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, obj)), ppc_r31);
 		reg_param = 1;
-	} else {
+	} else if (sig->param_count) {
+		DEBUG (printf ("save r%d\n", 3));
 		ppc_stw  (p, ppc_r3, local_pos, ppc_r31);
 		local_pos += 4;
 		reg_param = 0;
 	}
-	ppc_stw (p, ppc_r4, local_pos, ppc_r31); local_pos += 4;
-	ppc_stw (p, ppc_r5, local_pos, ppc_r31); local_pos += 4;
+
+	this_flag = (sig->hasthis ? 1 : 0);
+	if (sig->param_count) {
+		gint save_count = MAX (3, MIN (8, sig->param_count - 1));
+		for (i = reg_param; i < save_count; i ++) {
+			ppc_stw (p, ppc_r4 + i, local_pos, ppc_r31);
+			local_pos += 4;
+			DEBUG (printf ("save r%d\n", 4 + i));
+		}
+	}
 
 	/* set MonoInvocation::stack_args */
 	stackval_arg_pos = MINV_POS + sizeof (MonoInvocation);
@@ -661,69 +572,30 @@ mono_create_method_pointer (MonoMethod *method)
 
 	/* add stackval arguments */
 	for (i = 0; i < sig->param_count; ++i) {
-#define CALL_STACKVAL_FROM_DATA \
-		ppc_lis  (p, ppc_r0, (guint32) stackval_from_data >> 16); \
-		ppc_ori  (p, ppc_r0, ppc_r0, (guint32) stackval_from_data & 0xffff); \
-		ppc_mtlr (p, ppc_r0); \
-		ppc_blrl (p)
-#define CALL_SIZE_4 \
-			if (reg_param < 3 - (sig->hasthis ? 1 : 0)) { \
-				ppc_addi (p, ppc_r5, ppc_r31, local_start + (reg_param - (sig->hasthis ? 1 : 0))*4); \
-				reg_param ++; \
-			} else if (reg_param < 8) { \
-				ppc_stw  (p, ppc_r3 + reg_param, local_pos, ppc_r31); \
-				ppc_addi (p, ppc_r5, ppc_r31, local_pos); \
-				reg_param ++; \
-			} else { \
-				ppc_addi (p, ppc_r5, stack_size + 8 + stack_param, ppc_r31); \
-				stack_param ++; \
-			} \
-			ppc_lis  (p, ppc_r3, (guint32) sig->params [i] >> 16); \
-			ppc_addi (p, ppc_r4, ppc_r31, stackval_arg_pos); \
-			stackval_arg_pos ++; \
-			ppc_ori  (p, ppc_r3, ppc_r3, (guint32) sig->params [i] & 0xffff); \
-\
-			CALL_STACKVAL_FROM_DATA
-
-		if (sig->params [i]->byref) {
-			CALL_SIZE_4;
-			continue;
-		}
-		simpletype = sig->params [i]->type;
-	enum_calc_size:
-		switch (simpletype) {
-		case MONO_TYPE_BOOLEAN:
-		case MONO_TYPE_I1:
-		case MONO_TYPE_U1:
-		case MONO_TYPE_I2:
-		case MONO_TYPE_U2:
-		case MONO_TYPE_CHAR:
-		case MONO_TYPE_I4:
-		case MONO_TYPE_U4:
-		case MONO_TYPE_I:
-		case MONO_TYPE_U:
-		case MONO_TYPE_PTR:
-		case MONO_TYPE_SZARRAY:
-		case MONO_TYPE_CLASS:
-		case MONO_TYPE_OBJECT:
-		case MONO_TYPE_STRING:
-			CALL_SIZE_4;
-			break;
-		case MONO_TYPE_VALUETYPE:
-			NOT_IMPLEMENTED ("value type");
-			break;
-		case MONO_TYPE_I8:
-			NOT_IMPLEMENTED ("i8");
-			break;
-		case MONO_TYPE_R4:
-			NOT_IMPLEMENTED ("r4");
-			break;
-		case MONO_TYPE_R8:
-			NOT_IMPLEMENTED ("r8");
-			break;
-		default:
-			g_error ("Can't delegate 0x%x type", sig->params [i]->type);
+		if (reg_param < 8) {
+			ppc_addi (p, ppc_r5, ppc_r31, local_start + (reg_param - this_flag)*4);
+			reg_param ++;
+		} else {
+			ppc_addi (p, ppc_r5, stack_size + 8 + stack_param, ppc_r31);
+			stack_param ++;
 		}
+		ppc_lis  (p, ppc_r3, (guint32) sig->params [i] >> 16);
+		ppc_addi (p, ppc_r4, ppc_r31, stackval_arg_pos);
+
+		ppc_ori  (p, ppc_r3, ppc_r3, (guint32) sig->params [i] & 0xffff);
+		ppc_lis  (p, ppc_r0, (guint32) stackval_from_data >> 16);
+		ppc_li   (p, ppc_r6, sig->pinvoke);
+		ppc_ori  (p, ppc_r0, ppc_r0, (guint32) stackval_from_data & 0xffff);
+		ppc_mtlr (p, ppc_r0);
+		ppc_blrl (p);
+
+		/* fixme: alignment */
+		DEBUG (printf ("arg_pos %d --> ", stackval_arg_pos));
+		if (sig->pinvoke)
+			stackval_arg_pos += 4*mono_type_native_stack_size (sig->params [i], &align);
+		else
+			stackval_arg_pos += 4*mono_type_stack_size (sig->params [i], &align);
+		DEBUG (printf ("%d\n", stackval_arg_pos));
 	}
 
 	/* return value storage */
@@ -741,16 +613,22 @@ mono_create_method_pointer (MonoMethod *method)
 
 	/* move retval from stackval to proper place (r3/r4/...) */
 	if (sig->ret->byref) {
+		DEBUG (printf ("ret by ref\n"));
 		ppc_lwz (p, ppc_r3, stackval_arg_pos, ppc_r31);
 	} else {
+	enum_retvalue:
 		switch (sig->ret->type) {
 		case MONO_TYPE_VOID:
 			break;
 		case MONO_TYPE_BOOLEAN:
 		case MONO_TYPE_I1:
 		case MONO_TYPE_U1:
+			ppc_lbz (p, ppc_r3, stackval_arg_pos, ppc_r31);
+			break;
 		case MONO_TYPE_I2:
 		case MONO_TYPE_U2:
+			ppc_lhz (p, ppc_r3, stackval_arg_pos, ppc_r31);
+			break;
 		case MONO_TYPE_I4:
 		case MONO_TYPE_U4:
 		case MONO_TYPE_I:
@@ -762,7 +640,7 @@ mono_create_method_pointer (MonoMethod *method)
 			break;
 		case MONO_TYPE_I8:
 			ppc_lwz (p, ppc_r3, stackval_arg_pos, ppc_r31);
-			ppc_lwz (p, ppc_r4, stackval_arg_pos + 1, ppc_r31);
+			ppc_lwz (p, ppc_r4, stackval_arg_pos + 4, ppc_r31);
 			break;
 		case MONO_TYPE_R4:
 			ppc_lfs (p, ppc_f1, stackval_arg_pos, ppc_r31);
@@ -770,6 +648,13 @@ mono_create_method_pointer (MonoMethod *method)
 		case MONO_TYPE_R8:
 			ppc_lfd (p, ppc_f1, stackval_arg_pos, ppc_r31);
 			break;
+		case MONO_TYPE_VALUETYPE:
+			if (sig->ret->data.klass->enumtype) {
+				simpletype = sig->ret->data.klass->enum_basetype->type;
+				goto enum_retvalue;
+			}
+			NOT_IMPLEMENTED ("value type as ret val from delegate");
+			break;
 		default:
 			g_error ("Type 0x%x not handled yet in thunk creation", sig->ret->type);
 			break;
@@ -784,25 +669,17 @@ mono_create_method_pointer (MonoMethod *method)
 	ppc_mr   (p, ppc_r1, ppc_r11);            /* sp      <--- r11     restore stack */
 	ppc_blr  (p);                             /* return */
 
-	printf ("emited code size: %d\n", p - code_buffer);
+	DEBUG (printf ("emited code size: %d\n", p - code_buffer));
 	flush_icache (code_buffer, p - code_buffer);
 
-	printf ("Delegate [end emiting]\n");
+	DEBUG (printf ("Delegate [end emiting]\n"));
 
-	return (MonoPIFunc) code_buffer;
-}
+	ji = g_new0 (MonoJitInfo, 1);
+	ji->method = method;
+	ji->code_size = p - code_buffer;
+	ji->code_start = code_buffer;
 
+	mono_jit_info_table_add (mono_root_domain, ji);
 
-/*
- * mono_create_method_pointer () will insert a pointer to the MonoMethod
- * so that the interp can easily get at the data: this function will retrieve 
- * the method from the code stream.
- */
-MonoMethod*
-mono_method_pointer_get (void *code)
-{
-	unsigned char *c = code;
-	if (c [4] != 'M' || c [5] != 'o' || c [6] != 'n' || c [7] != 'o')
-		return NULL;
-	return *(MonoMethod**)(c + 8);
+	return ji->code_start;
 }
diff --git a/mono/arch/sparc/tramp.c b/mono/arch/sparc/tramp.c
index 8bc08ea531a..f7e9b69eca8 100644
--- a/mono/arch/sparc/tramp.c
+++ b/mono/arch/sparc/tramp.c
@@ -3,10 +3,11 @@
  * Create trampolines to invoke arbitrary functions.
  * 
  * Copyright (C) Ximian Inc.
- * 
+ *
  * Authors: Paolo Molaro (lupus@ximian.com)
  *          Jeffrey Stedfast <fejj@ximian.com>
- * 
+ *	    Mark Crichton <crichton@gimp.org>
+ *
  */
 
 #include "config.h"
@@ -23,21 +24,17 @@
 #define THIS_POS	sparc_i2
 #define ARGP_POS	sparc_i3
 #define LOC_POS	-4
+#define MINV_POS 8
 
 #define ARG_SIZE	sizeof (stackval)
 
-static void
-fake_func (void (*callme)(gpointer, gpointer), stackval *retval, void *this_obj, stackval *arguments)
-{
-	//*(gpointer*)retval = (gpointer)(*callme) (arguments [0].data.p, arguments [1].data.p, arguments [2].data.p);
-	//*(gdouble*) retval = (gdouble)(*callme) (arguments [0].data.f);
-	
-	/* internal_from_handle() */
-	/* return (gpointer)(*callme) (((MonoType *)arguments [0].data.p)->data.klass); */
-	
-	/* InitializeArray() */
-	return (*callme) (arguments [0].data.p, arguments [1].data.p);
-}
+/* Some assembly... */
+#define flushi(addr)    __asm__ __volatile__ ("flush %0"::"r"(addr):"memory")
+
+
+/* WARNING:  This code WILL BREAK.  We do not currently check the status
+ * of the registers.  Things can get trampled.  You have been warned.
+ */
 
 static const char *
 mono_type (int type)
@@ -113,9 +110,8 @@ mono_type (int type)
 }
 
 static void
-calculate_sizes (MonoMethod *method, guint32 *local_size, guint32 *stack_size, guint32 *code_size, int runtime)
+calculate_sizes (MonoMethodSignature *sig, guint32 *local_size, guint32 *stack_size, guint32 *code_size, gboolean string_ctor)
 {
-	MonoMethodSignature *sig = method->signature;
 	guint32 local = 0, stack = 0, code = 6;
 	guint32 simpletype;
 	int i;
@@ -145,6 +141,7 @@ calculate_sizes (MonoMethod *method, guint32 *local_size, guint32 *stack_size, g
 		case MONO_TYPE_I:
 		case MONO_TYPE_U:
 		case MONO_TYPE_PTR:
+		case MONO_TYPE_STRING:
 		case MONO_TYPE_R4:
 		case MONO_TYPE_SZARRAY:
 		case MONO_TYPE_CLASS:
@@ -163,17 +160,6 @@ calculate_sizes (MonoMethod *method, guint32 *local_size, guint32 *stack_size, g
 			stack += 4;
 			code += i < 6 ? 1 : 3;
 			break;
-		case MONO_TYPE_STRING:
-			if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || runtime) {
-				stack += 4;
-				code += i < 6 ? 1 : 3;
-				break;
-			}
-			
-			stack += 4;
-			code += 5;
-			local++;
-			break;
 		case MONO_TYPE_I8:
 			stack += 8;
 			code += i < 6 ? 2 : 3;
@@ -206,20 +192,14 @@ calculate_sizes (MonoMethod *method, guint32 *local_size, guint32 *stack_size, g
 		case MONO_TYPE_U:
 		case MONO_TYPE_CLASS:
 		case MONO_TYPE_OBJECT:
+		case MONO_TYPE_PTR:
+		case MONO_TYPE_STRING:
 		case MONO_TYPE_R4:
 		case MONO_TYPE_R8:
 		case MONO_TYPE_SZARRAY:
 		case MONO_TYPE_ARRAY:
 			code += 2;
 			break;
-#if 0
-		case MONO_TYPE_STRING:
-			code += 2;
-			if (!(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) && !runtime) {
-				code += 4;
-			}
-			break;
-#endif
 		case MONO_TYPE_I8:
 			code += 3;
 			break;
@@ -246,7 +226,10 @@ calculate_sizes (MonoMethod *method, guint32 *local_size, guint32 *stack_size, g
 	
 	stack += MINFRAME + (local * 4);
 	
-	fprintf (stderr, "\tstack size: %d (%d)\n\tcode size: %d\n", STACKALIGN(stack), stack, code);
+#ifdef DEBUG_SPARC_TRAMP
+	fprintf (stderr, "\tstack size: %d (%d)\n\tcode size: %d\n", 
+		 STACKALIGN(stack), stack, code); 
+#endif
 	
 	*local_size = local;
 	*stack_size = STACKALIGN(stack);
@@ -260,18 +243,23 @@ mono_string_new_wrapper (const char *text)
 }
 
 MonoPIFunc
-mono_create_trampoline (MonoMethod *method, int runtime)
+mono_create_trampoline (MonoMethodSignature *sig, gboolean string_ctor)
 {
-	MonoMethodSignature *sig;
 	guint32 *p, *code_buffer;
 	guint32 local_size, stack_size, code_size;
 	guint32 arg_pos, simpletype;
+	static GHashTable *cache = NULL;
 	int i, stringp, cur_out_reg;
-	
-	sig = method->signature;
-	
-	fprintf (stderr, "\nPInvoke [start emiting] %s\n", method->name);
-	calculate_sizes (method, &local_size, &stack_size, &code_size, runtime);
+	MonoPIFunc res;
+
+	if (!cache)
+		cache = g_hash_table_new ((GHashFunc)mono_signature_hash,
+		            (GCompareFunc)mono_metadata_signature_equal);
+
+	if ((res = (MonoPIFunc)g_hash_table_lookup(cache, sig)))
+		return res;
+
+	calculate_sizes (sig, &local_size, &stack_size, &code_size, string_ctor);
 	
 	code_buffer = p = alloca (code_size * 4);
 	cur_out_reg = sparc_o0;
@@ -286,25 +274,6 @@ mono_create_trampoline (MonoMethod *method, int runtime)
 	sparc_st_imm (p, sparc_i3, sparc_fp, 80);
 #endif
 	
-	/*
-	 * We store some local vars here to handle string pointers.
-	 * and align to 16 byte boundary...
-	 */
-#if 0
-	if (local_size) {
-		x86_alu_reg_imm (p, X86_SUB, X86_ESP, local_size * 4);
-		stack_size = (stack_size * local_size * 4) % 16;
-	} else {
-		stack_size = stack_size % 16;
-	}
-	if (stack_size)
-		x86_alu_reg_imm (p, X86_SUB, X86_ESP, stack_size);
-#endif
-	
-	/*
-	 * %i3 has the pointer to the args.
-	 */
-	
 	if (sig->hasthis) {
 		sparc_mov_reg_reg (p, sparc_i2, cur_out_reg);
 		cur_out_reg++;
@@ -316,7 +285,13 @@ mono_create_trampoline (MonoMethod *method, int runtime)
 		arg_pos = ARG_SIZE * i;
 		
 		if (sig->params[i]->byref) {
-			fprintf (stderr, "\tpushing params[%d] (byref): type=%s;\n", i, mono_type (sig->params[i]->type));
+
+#ifdef DEBUG_SPARC_TRAMP
+			fprintf (stderr, "\tpushing params[%d] (byref):"\
+					 " type=%s;\n", i
+					 ,mono_type(sig->params[i]->type));
+#endif
+
 			sparc_ld_imm (p, sparc_i3, arg_pos, cur_out_reg);
 			cur_out_reg++;
 			continue;
@@ -324,7 +299,12 @@ mono_create_trampoline (MonoMethod *method, int runtime)
 		
 		simpletype = sig->params[i]->type;
 enum_marshal:
-		fprintf (stderr, "\tpushing params[%d]: type=%s;\n", i, mono_type (simpletype));
+
+#ifdef DEBUG_SPARC_TRAMP
+		fprintf (stderr, "\tpushing params[%d]: type=%s;\n",
+                         i, mono_type (simpletype));
+#endif
+
 		switch (simpletype) {
 		case MONO_TYPE_BOOLEAN:
 		case MONO_TYPE_I1:
@@ -337,6 +317,7 @@ enum_marshal:
 		case MONO_TYPE_I:
 		case MONO_TYPE_U:
 		case MONO_TYPE_PTR:
+		case MONO_TYPE_STRING:
 		case MONO_TYPE_R4:
 		case MONO_TYPE_SZARRAY:
 		case MONO_TYPE_CLASS:
@@ -356,36 +337,6 @@ enum_marshal:
 				cur_out_reg++;
 			}
 			break;
-		case MONO_TYPE_STRING:
-			if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || runtime) {
-				sparc_ld_imm (p, sparc_i3, arg_pos, cur_out_reg);
-				cur_out_reg++;
-				break;
-			}
-			
-#if 0
-			sparc_sethi (p, mono_string_to_utf8, sparc_l0);
-			sparc_or_imm (p, 0, sparc_l0, mono_string_to_utf8, sparc_l1);
-			
-			x86_push_membase (p, X86_EDX, arg_pos);
-			x86_mov_reg_imm (p, X86_EDX, mono_string_to_utf8);
-			x86_call_reg (p, X86_EDX);
-			x86_alu_reg_imm (p, X86_ADD, X86_ESP, 4);
-			x86_push_reg (p, X86_EAX);
-			/*
-			 * Store the pointer in a local we'll free later.
-			 */
-			stringp++;
-			x86_mov_membase_reg (p, X86_EBP, LOC_POS * stringp, X86_EAX, 4);
-			/*
-			 * we didn't save the reg: restore it here.
-			 */
-			if (i > 1)
-				x86_mov_reg_membase (p, X86_EDX, X86_EBP, ARGP_POS, 4);
-#endif
-			fprintf (stderr, "MONO_TYPE_STRING not yet fully supported.\n");
-			exit (1);
-			break;
 		case MONO_TYPE_I8:
 			sparc_ld_imm (p, sparc_i3, arg_pos, cur_out_reg);
 			cur_out_reg++;
@@ -413,25 +364,26 @@ enum_marshal:
 	 * Long integers are in EAX:EDX.
 	 * FP values are on the FP stack.
 	 */
-#if 0
-	if (sig->ret->byref) {
-		x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
-		x86_mov_regp_reg (p, X86_ECX, X86_EAX, 4);
+	if (sig->ret->byref || string_ctor) {
+		sparc_st (p, sparc_o0, sparc_i1, 0);
 	} else {
 		simpletype = sig->ret->type;
+
+#ifdef DEBUG_SPARC_TRAMP
+                fprintf (stderr, "\tret type: %s;\n", mono_type (simpletype));
+#endif
+
 enum_retvalue:
 		switch (simpletype) {
 		case MONO_TYPE_BOOLEAN:
 		case MONO_TYPE_I1:
 		case MONO_TYPE_U1:
-			x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
-			x86_mov_regp_reg (p, X86_ECX, X86_EAX, 1);
+			sparc_stb (p, sparc_o0, sparc_i1, 0);
 			break;
 		case MONO_TYPE_CHAR:
 		case MONO_TYPE_I2:
 		case MONO_TYPE_U2:
-			x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
-			x86_mov_regp_reg (p, X86_ECX, X86_EAX, 2);
+			sparc_sth (p, sparc_o0, sparc_i1, 0);
 			break;
 		case MONO_TYPE_I4:
 		case MONO_TYPE_U4:
@@ -441,39 +393,18 @@ enum_retvalue:
 		case MONO_TYPE_OBJECT:
 		case MONO_TYPE_SZARRAY:
 		case MONO_TYPE_ARRAY:
-			x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
-			x86_mov_regp_reg (p, X86_ECX, X86_EAX, 4);
-			break;
-		case MONO_TYPE_STRING: 
-			if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || runtime) {
-				x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
-				x86_mov_regp_reg (p, X86_ECX, X86_EAX, 4);
-				break;
-			}
-			
-			/* If the argument is non-null, then convert the value back */
-			x86_alu_reg_reg (p, X86_OR, X86_EAX, X86_EAX);
-			x86_branch8 (p, X86_CC_EQ, 11, FALSE);
-			x86_push_reg (p, X86_EAX);
-			x86_mov_reg_imm (p, X86_EDX, mono_string_new);
-			x86_call_reg (p, X86_EDX);
-			x86_alu_reg_imm (p, X86_ADD, X86_ESP, 4);
-			
-			x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
-			x86_mov_regp_reg (p, X86_ECX, X86_EAX, 4);
+		case MONO_TYPE_STRING:
+		case MONO_TYPE_PTR:
+			sparc_st (p, sparc_o0, sparc_i1, 0);
 			break;
 		case MONO_TYPE_R4:
-			x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
-			x86_fst_membase (p, X86_ECX, 0, FALSE, TRUE);
+			sparc_stf (p, sparc_f0, sparc_i1, 0);
 			break;
 		case MONO_TYPE_R8:
-			x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
-			x86_fst_membase (p, X86_ECX, 0, TRUE, TRUE);
+			sparc_stdf (p, sparc_f0, sparc_i1, 0);
 			break;
 		case MONO_TYPE_I8:
-			x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
-			x86_mov_regp_reg (p, X86_ECX, X86_EAX, 4);
-			x86_mov_membase_reg (p, X86_ECX, 4, X86_EDX, 4);
+			sparc_std (p, sparc_o0, sparc_i1, 0);
 			break;
 		case MONO_TYPE_VALUETYPE:
 			if (sig->ret->data.klass->enumtype) {
@@ -486,54 +417,105 @@ enum_retvalue:
 			g_error ("Can't handle as return value 0x%x", sig->ret->type);
 		}
 	}
-#endif
 	
-#if 0
-	/* free the allocated strings... */
-	if (!(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)) {
-		if (local_size)
-			x86_mov_reg_imm (p, X86_EDX, g_free);
-		for (i = 1; i <= local_size; ++i) {
-			x86_push_membase (p, X86_EBP, LOC_POS * i);
-			x86_call_reg (p, X86_EDX);
-		}
-	}
-#endif
 	/*
 	 * Standard epilog.
 	 * 8 may be 12 when returning structures (to skip unimp opcode).
 	 */
 	sparc_jmpl_imm (p, sparc_i7, 8, sparc_zero);
 	sparc_restore (p, sparc_zero, sparc_zero, sparc_zero);
-	
+
+#if DEBUG_SPARC_TRAMP
 	{
 		unsigned char *inptr, *inend;
 		
 		inptr = (unsigned char *) code_buffer;
 		inend = (unsigned char *) p;
 		
-		printf (".text\n.align 4\n.globl main\n.type main,function\nmain:\n");
+		fprintf (stderr,".text\n.align 4\n.globl main\n.type main,function\nmain:\n");
 		while (inptr < inend) {
-			printf (".byte 0x%x\n", *inptr);
+			fprintf (stderr, ".byte 0x%x\n", *inptr);
 			inptr++;
 		}
-		fflush (stdout);
+		fflush (stderr);
 	}
-	
-	fprintf (stderr, "PInvoke [finish emiting] %s\n", method->name);
-	
-	/* FIXME: need to flush */
-	return g_memdup (code_buffer, 4 * (p - code_buffer));
+#endif
+
+	res = (MonoPIFunc)g_memdup (code_buffer, 4 * (p - code_buffer));
+
+	/* So here's the deal...
+	 * UltraSPARC will flush a whole cache line at a time
+	 * BUT, older SPARCs won't.
+	 * So, be compatable and flush dwords at a time...
+	 */
+
+	for (i = 0; i < ((p - code_buffer)/2); i++)
+		flushi((res + (i*8)));
+
+	g_hash_table_insert(cache, sig, res);
+
+	return res;
 }
 
 void *
 mono_create_method_pointer (MonoMethod *method)
 {
+	MonoMethodSignature *sig;
+	MonoJitInfo *ji;
+	guint32 stack_size;
+	unsigned char *p, *code_buffer;
+
+	if (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL && method->addr) {
+		ji = g_new0 (MonoJitInfo, 1);
+		ji->method = method;
+		ji->code_size = 1;
+		ji->code_start = method->addr;
+
+		mono_jit_info_table_add (mono_root_domain, ji);
+		return method->addr;
+	}
+
+	sig = method->signature;
+
+	code_buffer = p = alloca (1024); /* Ok, this might overflow. */
+
+	stack_size = STACKALIGN(((sig->param_count + 1) * 4) + MINFRAME);
+
+	/* Prologue */
+	/* SPARC rocks, 'nuff said */
+	sparc_save_imm(p, sparc_sp, -stack_size, sparc_sp);
+
+	/* Initialize the structure with zeros.  GO GO GADGET G0! */
+	sparc_st(p, sparc_g0, (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, ex)), 0);
+	sparc_st(p, sparc_g0, (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, ex_handler)), 0);
+	sparc_st(p, sparc_g0, (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, child)), 0);
+	sparc_st(p, sparc_g0, (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, parent)), 0);
+
+	/* set the method pointer */
+	/* 32 bit runtime -- Any thoughts on doing sparc64? */
+	sparc_ld_imm(p, (guint32) method >> 16, 0, sparc_o0);
+	sparc_or_imm(p, 0, sparc_o0, (guint32) method & 0xffff, sparc_o0);
+	sparc_st(p, sparc_o0, (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, method)),0);
+	{
+		unsigned char *inptr, *inend;
+
+		inptr = (unsigned char *) code_buffer;
+		inend = (unsigned char *) p;
+
+		fprintf (stderr,".text\n.align 4\n.globl main\n.type main,function\nmain:\n");
+		while (inptr < inend) {
+			fprintf (stderr, ".byte 0x%x\n", *inptr);
+			inptr++;
+		}
+		fflush (stderr);
+        }
+
 	return NULL;
 }
 
 MonoMethod*
 mono_method_pointer_get (void *code)
 {
+	g_warning("mono_method_pointer_get: IMPLEMENT ME\n");
 	return NULL;
 }
diff --git a/mono/arch/x86/test.c b/mono/arch/x86/test.c
index a9695dc2a97..3511e8fdaf0 100644
--- a/mono/arch/x86/test.c
+++ b/mono/arch/x86/test.c
@@ -8,7 +8,7 @@
 int main() {
 	unsigned char code [16000];
 	unsigned char *p = code;
-	unsigned char *target;
+	unsigned char *target, *start, *end;
 	unsigned long mem_addr = 0xdeadbeef;
 	int size, i;
 
@@ -174,8 +174,12 @@ int main() {
 
 	target = p;
 
+	start = p;
 	x86_jump32 (p, mem_addr);
+	x86_patch (start, target);
+	start = p;
 	x86_jump8 (p, 12);
+	x86_patch (start, target);
 	x86_jump_reg (p, X86_EAX);
 	x86_jump_membase (p, X86_EDX, 16);
 
diff --git a/mono/arch/x86/tramp.c b/mono/arch/x86/tramp.c
index 8c861cd6b01..b6dfeb203fe 100644
--- a/mono/arch/x86/tramp.c
+++ b/mono/arch/x86/tramp.c
@@ -3,17 +3,21 @@
  * 
  * Copyright (C) Ximian Inc.
  * 
- * Author: Paolo Molaro (lupus@ximian.com)
+ * Authors: 
+ *   Paolo Molaro (lupus@ximian.com)
+ *   Dietmar Maurer (dietmar@ximian.com)
  * 
  */
 
 #include "config.h"
 #include <stdlib.h>
+#include <string.h>
 #include "x86-codegen.h"
 #include "mono/metadata/class.h"
 #include "mono/metadata/tabledefs.h"
 #include "mono/interpreter/interp.h"
 #include "mono/metadata/appdomain.h"
+#include "mono/metadata/marshal.h"
 
 /*
  * The resulting function takes the form:
@@ -27,34 +31,37 @@
 
 #define ARG_SIZE	sizeof (stackval)
 
-static MonoString*
-mono_string_new_wrapper (const char *text)
-{
-	MonoDomain *domain = mono_domain_get ();
-
-	return mono_string_new (domain, text);
-}
-
 MonoPIFunc
-mono_create_trampoline (MonoMethod *method, int runtime)
+mono_create_trampoline (MonoMethodSignature *sig, gboolean string_ctor)
 {
-	MonoMethodSignature *sig;
 	unsigned char *p, *code_buffer;
-	guint32 local_size = 0, stack_size = 0, code_size = 30;
+	guint32 stack_size = 0, code_size = 50;
 	guint32 arg_pos, simpletype;
 	int i, stringp;
+	static GHashTable *cache = NULL;
+	MonoPIFunc res;
+
+	if (!cache) 
+		cache = g_hash_table_new ((GHashFunc)mono_signature_hash, 
+					  (GCompareFunc)mono_metadata_signature_equal);
+
+	if ((res = (MonoPIFunc)g_hash_table_lookup (cache, sig)))
+		return res;
 
-	sig = method->signature;
-	
 	if (sig->hasthis) {
 		stack_size += sizeof (gpointer);
-		code_size += 5;
+		code_size += 10;
 	}
 	
+	if (sig->ret->type == MONO_TYPE_VALUETYPE && !sig->ret->byref && !sig->ret->data.klass->enumtype) {
+		stack_size += sizeof (gpointer);
+		code_size += 5;
+	}
+
 	for (i = 0; i < sig->param_count; ++i) {
 		if (sig->params [i]->byref) {
 			stack_size += sizeof (gpointer);
-			code_size += i < 10 ? 5 : 8;
+			code_size += 20;
 			continue;
 		}
 		simpletype = sig->params [i]->type;
@@ -75,24 +82,26 @@ enum_calc_size:
 		case MONO_TYPE_SZARRAY:
 		case MONO_TYPE_CLASS:
 		case MONO_TYPE_OBJECT:
+		case MONO_TYPE_STRING:
 			stack_size += 4;
 			code_size += i < 10 ? 5 : 8;
 			break;
-		case MONO_TYPE_VALUETYPE:
+		case MONO_TYPE_VALUETYPE: {
+			int size;
 			if (sig->params [i]->data.klass->enumtype) {
 				simpletype = sig->params [i]->data.klass->enum_basetype->type;
 				goto enum_calc_size;
 			}
-			if (mono_class_value_size (sig->params [i]->data.klass, NULL) != 4)
-				g_error ("can only marshal enums, not generic structures (size: %d)", mono_class_value_size (sig->params [i]->data.klass, NULL));
-			stack_size += 4;
-			code_size += i < 10 ? 5 : 8;
-			break;
-		case MONO_TYPE_STRING:
-			stack_size += 4;
-			code_size += 20;
-			local_size++;
+			if ((size = mono_class_value_size (sig->params [i]->data.klass, NULL)) != 4) {
+				stack_size += size + 3;
+				stack_size &= ~3;
+				code_size += 32;
+			} else {
+				stack_size += 4;
+				code_size += i < 10 ? 5 : 8;
+			}
 			break;
+		}
 		case MONO_TYPE_I8:
 			stack_size += 8;
 			code_size += i < 10 ? 5 : 8;
@@ -117,15 +126,11 @@ enum_calc_size:
 	x86_push_reg (p, X86_EBP);
 	x86_mov_reg_reg (p, X86_EBP, X86_ESP, 4);
 	/*
-	 * We store some local vars here to handle string pointers.
 	 * and align to 16 byte boundary...
 	 */
-	if (local_size) {
-		x86_alu_reg_imm (p, X86_SUB, X86_ESP, local_size * 4);
-		stack_size = (stack_size * local_size * 4) % 16;
-	} else {
-		stack_size = stack_size % 16;
-	}
+	stack_size += 15;
+	stack_size &= ~15;
+
 	if (stack_size)
 		x86_alu_reg_imm (p, X86_SUB, X86_ESP, stack_size);
 
@@ -158,55 +163,51 @@ enum_marshal:
 		case MONO_TYPE_I:
 		case MONO_TYPE_U:
 		case MONO_TYPE_PTR:
-		case MONO_TYPE_SZARRAY:
-		case MONO_TYPE_CLASS:
 		case MONO_TYPE_OBJECT:
+		case MONO_TYPE_STRING:
+			x86_push_membase (p, X86_EDX, arg_pos);
+			break;
 		case MONO_TYPE_R4:
+			x86_alu_reg_imm (p, X86_SUB, X86_ESP, 4);
+			x86_fld_membase (p, X86_EDX, arg_pos, TRUE);
+			x86_fst_membase (p, X86_ESP, 0, FALSE, TRUE);
+			break;
+		case MONO_TYPE_CLASS:
+			x86_push_membase (p, X86_EDX, arg_pos);
+			break;
+		case MONO_TYPE_SZARRAY:
 			x86_push_membase (p, X86_EDX, arg_pos);
 			break;
 		case MONO_TYPE_VALUETYPE:
 			if (!sig->params [i - 1]->data.klass->enumtype) {
-				/* it's a structure that fits in 4 bytes, need to push the value pointed to */
-				x86_mov_reg_membase (p, X86_EAX, X86_EDX, arg_pos, 4);
-				x86_push_regp (p, X86_EAX);
+				int size = mono_class_value_size (sig->params [i - 1]->data.klass, NULL);
+				if (size == 4) {
+					/* it's a structure that fits in 4 bytes, need to push the value pointed to */
+					x86_mov_reg_membase (p, X86_EAX, X86_EDX, arg_pos, 4);
+					x86_push_regp (p, X86_EAX);
+				} else {
+					int ss = size;
+					ss += 3;
+					ss &= ~3;
+
+					x86_alu_reg_imm (p, X86_SUB, X86_ESP, ss);
+					x86_push_imm (p, size);
+					x86_push_membase (p, X86_EDX, arg_pos);
+					x86_lea_membase (p, X86_EAX, X86_ESP, 2*4);
+					x86_push_reg (p, X86_EAX);
+					x86_mov_reg_imm (p, X86_EAX, memcpy);
+					x86_call_reg (p, X86_EAX);
+					x86_alu_reg_imm (p, X86_ADD, X86_ESP, 12);
+				}
 			} else {
 				/* it's an enum value */
 				simpletype = sig->params [i - 1]->data.klass->enum_basetype->type;
 				goto enum_marshal;
 			}
 			break;
-		case MONO_TYPE_R8:
-			x86_alu_reg_imm (p, X86_SUB, X86_ESP, 8);
-			x86_fld_membase (p, X86_EDX, arg_pos, TRUE);
-			x86_fst_membase (p, X86_ESP, 0, TRUE, TRUE);
-			break;
-		case MONO_TYPE_STRING:
-			/* 
-			 * If it is an internalcall we assume it's the object we want.
-			 * Yet another reason why MONO_TYPE_STRING should not be used to indicate char*.
-			 */
-			if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || runtime) {
-				x86_push_membase (p, X86_EDX, arg_pos);
-				break;
-			}
-			/*if (frame->method->flags & PINVOKE_ATTRIBUTE_CHAR_SET_ANSI*/
-			x86_push_membase (p, X86_EDX, arg_pos);
-			x86_mov_reg_imm (p, X86_EDX, mono_string_to_utf8);
-			x86_call_reg (p, X86_EDX);
-			x86_alu_reg_imm (p, X86_ADD, X86_ESP, 4);
-			x86_push_reg (p, X86_EAX);
-			/*
-			 * Store the pointer in a local we'll free later.
-			 */
-			stringp++;
-			x86_mov_membase_reg (p, X86_EBP, LOC_POS * stringp, X86_EAX, 4);
-			/*
-			 * we didn't save the reg: restore it here.
-			 */
-			if (i > 1)
-				x86_mov_reg_membase (p, X86_EDX, X86_EBP, ARGP_POS, 4);
-			break;
 		case MONO_TYPE_I8:
+		case MONO_TYPE_U8:
+		case MONO_TYPE_R8:
 			x86_push_membase (p, X86_EDX, arg_pos + 4);
 			x86_push_membase (p, X86_EDX, arg_pos);
 			break;
@@ -224,6 +225,14 @@ enum_marshal:
 		}
 	}
 
+	if (sig->ret->type == MONO_TYPE_VALUETYPE && !sig->ret->byref) {
+		MonoClass *klass = sig->ret->data.klass;
+		if (!klass->enumtype) {
+			x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
+			x86_push_membase (p, X86_ECX, 0);
+		}
+	}
+
 	/* 
 	 * Insert call to function 
 	 */
@@ -236,12 +245,13 @@ enum_marshal:
 	 * Long integers are in EAX:EDX.
 	 * FP values are on the FP stack.
 	 */
-	if (sig->ret->byref) {
+
+	if (sig->ret->byref || string_ctor) {
 		x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
 		x86_mov_regp_reg (p, X86_ECX, X86_EAX, 4);
 	} else {
 		simpletype = sig->ret->type;
-enum_retvalue:
+	enum_retvalue:
 		switch (simpletype) {
 		case MONO_TYPE_BOOLEAN:
 		case MONO_TYPE_I1:
@@ -267,20 +277,6 @@ enum_retvalue:
 			x86_mov_regp_reg (p, X86_ECX, X86_EAX, 4);
 			break;
 		case MONO_TYPE_STRING: 
-			if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || runtime) {
-				x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
-				x86_mov_regp_reg (p, X86_ECX, X86_EAX, 4);
-				break;
-			}
-
-			/* If the argument is non-null, then convert the value back */
-			x86_alu_reg_reg (p, X86_OR, X86_EAX, X86_EAX);
-			x86_branch8 (p, X86_CC_EQ, 11, FALSE);
-			x86_push_reg (p, X86_EAX);
-			x86_mov_reg_imm (p, X86_EDX, mono_string_new_wrapper);
-			x86_call_reg (p, X86_EDX);
-			x86_alu_reg_imm (p, X86_ADD, X86_ESP, 4);
-
 			x86_mov_reg_membase (p, X86_ECX, X86_EBP, RETVAL_POS, 4);
 			x86_mov_regp_reg (p, X86_ECX, X86_EAX, 4);
 			break;
@@ -310,27 +306,21 @@ enum_retvalue:
 	}
 
 	/*
-	 * free the allocated strings.
-	 */
-	if (!(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)) {
-		for (i = 1; i <= local_size; ++i) {
-			x86_mov_reg_imm (p, X86_EDX, g_free);
-			x86_push_membase (p, X86_EBP, LOC_POS * i);
-			x86_call_reg (p, X86_EDX);
-		}
-	}
-	/*
 	 * Standard epilog.
 	 */
 	x86_leave (p);
 	x86_ret (p);
 
-	return g_memdup (code_buffer, p - code_buffer);
+	g_assert (p - code_buffer < code_size);
+	res = (MonoPIFunc)g_memdup (code_buffer, p - code_buffer);
+
+	g_hash_table_insert (cache, sig, res);
+
+	return res;
 }
 
 #define MINV_POS  (- sizeof (MonoInvocation))
 #define STACK_POS (MINV_POS - sizeof (stackval) * sig->param_count)
-#define OBJ_POS   8
 #define TYPE_OFFSET (G_STRUCT_OFFSET (stackval, type))
 
 /*
@@ -347,30 +337,63 @@ void *
 mono_create_method_pointer (MonoMethod *method)
 {
 	MonoMethodSignature *sig;
+	MonoJitInfo *ji;
 	unsigned char *p, *code_buffer;
 	gint32 local_size;
 	gint32 stackval_pos, arg_pos = 8;
-	int i;
+	int i, size, align, cpos;
+	int *vtbuf;
 
 	/*
 	 * If it is a static P/Invoke method, we can just return the pointer
 	 * to the method implementation.
 	 */
+	if (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL && method->addr) {
+		ji = g_new0 (MonoJitInfo, 1);
+		ji->method = method;
+		ji->code_size = 1;
+		ji->code_start = method->addr;
+
+		mono_jit_info_table_add (mono_root_domain, ji);
+		return method->addr;
+	}
+
 	sig = method->signature;
 
 	code_buffer = p = alloca (512); /* FIXME: check for overflows... */
+	vtbuf = alloca (sizeof(int)*sig->param_count);
 
 	local_size = sizeof (MonoInvocation) + sizeof (stackval) * (sig->param_count + 1);
+
+	local_size += 7;
+	local_size &= ~7;
+
 	stackval_pos = -local_size;
 
+	cpos = 0;
+	for (i = 0; i < sig->param_count; i++) {
+		MonoType *type = sig->params [i];
+		vtbuf [i] = -1;
+		if (type->type == MONO_TYPE_VALUETYPE) {
+			MonoClass *klass = type->data.klass;
+			if (klass->enumtype)
+				continue;
+			size = mono_class_native_size (klass, &align);
+			cpos += align - 1;
+			cpos &= ~(align - 1);
+			vtbuf [i] = cpos;
+			cpos += size;
+		}	
+	}
+
+	cpos += 7;
+	cpos &= ~7;
+
+	local_size += cpos;
+
 	/*
-	 * Standard function prolog with magic trick.
+	 * Standard function prolog.
 	 */
-	x86_jump_code (p, code_buffer + 8);
-	*p++ = 'M';
-	*p++ = 'o';
-	*(void**)p = method;
-	p += 4;
 	x86_push_reg (p, X86_EBP);
 	x86_mov_reg_reg (p, X86_EBP, X86_ESP, 4);
 	x86_alu_reg_imm (p, X86_SUB, X86_ESP, local_size);
@@ -388,6 +411,9 @@ mono_create_method_pointer (MonoMethod *method)
 	 */
 	x86_mov_membase_imm (p, X86_EBP, (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, method)), (int)method, 4);
 
+	if (sig->ret->type == MONO_TYPE_VALUETYPE && !sig->ret->byref && !sig->ret->data.klass->enumtype) 
+		arg_pos += 4;
+
 	/*
 	 * Handle this.
 	 */
@@ -396,7 +422,7 @@ mono_create_method_pointer (MonoMethod *method)
 			/*
 			 * Grab it from the stack, otherwise it's already in ECX.
 			 */
-			x86_mov_reg_membase (p, X86_ECX, X86_EBP, OBJ_POS, 4);
+			x86_mov_reg_membase (p, X86_ECX, X86_EBP, arg_pos, 4);
 			arg_pos += 4;
 		}
 		x86_mov_membase_reg (p, X86_EBP, (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, obj)), X86_ECX, 4);
@@ -409,28 +435,25 @@ mono_create_method_pointer (MonoMethod *method)
 	x86_lea_membase (p, X86_EAX, X86_EBP, stackval_pos);
 	x86_mov_membase_reg (p, X86_EBP, (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, stack_args)), X86_EAX, 4);
 	for (i = 0; i < sig->param_count; ++i) {
+		if (vtbuf [i] >= 0) {
+			x86_lea_membase (p, X86_EAX, X86_EBP, - local_size + vtbuf [i]);
+			x86_mov_membase_reg (p, X86_EBP, stackval_pos, X86_EAX, 4);
+		}
 		x86_mov_reg_imm (p, X86_ECX, stackval_from_data);
 		x86_lea_membase (p, X86_EDX, X86_EBP, arg_pos);
 		x86_lea_membase (p, X86_EAX, X86_EBP, stackval_pos);
+		x86_push_imm (p, sig->pinvoke);
 		x86_push_reg (p, X86_EDX);
 		x86_push_reg (p, X86_EAX);
 		x86_push_imm (p, sig->params [i]);
 		x86_call_reg (p, X86_ECX);
-		x86_alu_reg_imm (p, X86_SUB, X86_ESP, 12);
+		x86_alu_reg_imm (p, X86_SUB, X86_ESP, 16);
 		stackval_pos += sizeof (stackval);
-		arg_pos += 4;
-		if (!sig->params [i]->byref) {
-			switch (sig->params [i]->type) {
-			case MONO_TYPE_I8:
-			case MONO_TYPE_R8:
-				arg_pos += 4;
-				break;
-			case MONO_TYPE_VALUETYPE:
-				g_assert_not_reached (); /* Not implemented yet. */
-			default:
-				break;
-			}
-		}
+		/* fixme: alignment */
+		if (sig->pinvoke)
+			arg_pos += mono_type_native_stack_size (sig->params [i], &align);
+		else
+			arg_pos += mono_type_stack_size (sig->params [i], &align);
 	}
 
 	/*
@@ -438,6 +461,13 @@ mono_create_method_pointer (MonoMethod *method)
 	 */
 	x86_lea_membase (p, X86_EAX, X86_EBP, stackval_pos);
 	x86_mov_membase_reg (p, X86_EBP, (MINV_POS + G_STRUCT_OFFSET (MonoInvocation, retval)), X86_EAX, 4);
+	if (sig->ret->type == MONO_TYPE_VALUETYPE && !sig->ret->byref) {
+		MonoClass *klass  = sig->ret->data.klass;
+		if (!klass->enumtype) {
+			x86_mov_reg_membase (p, X86_ECX, X86_EBP, 8, 4);
+			x86_mov_membase_reg (p, X86_EBP, stackval_pos, X86_ECX, 4);
+		}
+	}
 
 	/*
 	 * Call the method.
@@ -446,7 +476,7 @@ mono_create_method_pointer (MonoMethod *method)
 	x86_push_reg (p, X86_EAX);
 	x86_mov_reg_imm (p, X86_EDX, ves_exec_method);
 	x86_call_reg (p, X86_EDX);
-
+	
 	/*
 	 * Move the return value to the proper place.
 	 */
@@ -454,6 +484,8 @@ mono_create_method_pointer (MonoMethod *method)
 	if (sig->ret->byref) {
 		x86_mov_reg_membase (p, X86_EAX, X86_EAX, 0, 4);
 	} else {
+		int simpletype = sig->ret->type;	
+	enum_retvalue:
 		switch (sig->ret->type) {
 		case MONO_TYPE_VOID:
 			break;
@@ -476,6 +508,21 @@ mono_create_method_pointer (MonoMethod *method)
 		case MONO_TYPE_R8:
 			x86_fld_membase (p, X86_EAX, 0, TRUE);
 			break;
+		case MONO_TYPE_VALUETYPE:
+			if (sig->ret->data.klass->enumtype) {
+				simpletype = sig->ret->data.klass->enum_basetype->type;
+				goto enum_retvalue;
+			}
+		
+			x86_push_imm (p, sig->pinvoke);
+			x86_push_membase (p, X86_EBP, stackval_pos);
+			x86_push_reg (p, X86_EAX);
+			x86_push_imm (p, sig->ret);
+			x86_mov_reg_imm (p, X86_ECX, stackval_to_data);
+			x86_call_reg (p, X86_ECX);
+			x86_alu_reg_imm (p, X86_SUB, X86_ESP, 16);
+			
+			break;
 		default:
 			g_error ("Type 0x%x not handled yet in thunk creation", sig->ret->type);
 			break;
@@ -489,19 +536,13 @@ mono_create_method_pointer (MonoMethod *method)
 	x86_ret (p);
 
 	g_assert (p - code_buffer < 512);
-	return g_memdup (code_buffer, p - code_buffer);
-}
 
-/*
- * mono_create_method_pointer () will insert a pointer to the MonoMethod
- * so that the interp can easily get at the data: this function will retrieve 
- * the method from the code stream.
- */
-MonoMethod*
-mono_method_pointer_get (void *code)
-{
-	unsigned char *c = code;
-	if (c [2] != 'M' || c [3] != 'o')
-		return NULL;
-	return *(MonoMethod**)(c + sizeof (gpointer));
+	ji = g_new0 (MonoJitInfo, 1);
+	ji->method = method;
+	ji->code_size = p - code_buffer;
+	ji->code_start = g_memdup (code_buffer, p - code_buffer);
+
+	mono_jit_info_table_add (mono_root_domain, ji);
+
+	return ji->code_start;
 }
diff --git a/mono/arch/x86/x86-codegen.h b/mono/arch/x86/x86-codegen.h
index b57e50e3d58..cea7d895cf8 100644
--- a/mono/arch/x86/x86-codegen.h
+++ b/mono/arch/x86/x86-codegen.h
@@ -1,8 +1,15 @@
-/* Copyright (C)  2000 Intel Corporation.  All rights reserved.
-   Copyright (C)  2001 Ximian, Inc. 
-//
-// $Header: /home/miguel/third-conversion/public/mono/mono/arch/x86/x86-codegen.h,v 1.22 2002/02/11 07:42:10 lupus Exp $
-*/
+/*
+ * x86-codegen.h: Macros for generating x86 code
+ *
+ * Authors:
+ *   Paolo Molaro (lupus@ximian.com)
+ *   Intel Corporation (ORP Project)
+ *   Sergey Chaban (serge@wildwestsoftware.com)
+ *   Dietmar Maurer (dietmar@ximian.com)
+ * 
+ * Copyright (C)  2000 Intel Corporation.  All rights reserved.
+ * Copyright (C)  2001, 2002 Ximian, Inc.
+ */
 
 #ifndef X86_H
 #define X86_H
@@ -41,6 +48,10 @@ typedef enum {
 typedef enum {
 	X86_SHLD,
 	X86_SHLR,
+	X86_ROL = 0,
+	X86_ROR = 1,
+	X86_RCL = 2,
+	X86_RCR = 3,
 	X86_SHL = 4,
 	X86_SHR = 5,
 	X86_SAR = 7,
@@ -208,6 +219,7 @@ typedef union {
 #define x86_is_imm16(imm)            (((int)(imm) >= -(1<<16) && (int)(imm) <= ((1<<16)-1)))
 
 #define x86_reg_emit(inst,r,regno)   do { x86_address_byte ((inst), 3, (r), (regno)); } while (0)
+#define x86_reg8_emit(inst,r,regno,is_rh,is_rnoh)   do {x86_address_byte ((inst), 3, (is_rh)?((r)|4):(r), (is_rnoh)?((regno)|4):(regno));} while (0)
 #define x86_regp_emit(inst,r,regno)  do { x86_address_byte ((inst), 0, (r), (regno)); } while (0)
 #define x86_mem_emit(inst,r,disp)    do { x86_address_byte ((inst), 0, (r), 5); x86_imm_emit32((inst), (disp)); } while (0)
 
@@ -254,21 +266,39 @@ typedef union {
 			x86_address_byte ((inst), (shift), (indexreg), (basereg));	\
 			x86_imm_emit8 ((inst), (disp));	\
 		} else {	\
-			x86_address_byte ((inst), 0, (r), 4);	\
+			x86_address_byte ((inst), 2, (r), 4);	\
 			x86_address_byte ((inst), (shift), (indexreg), 5);	\
 			x86_imm_emit32 ((inst), (disp));	\
 		}	\
 	} while (0)
 
-/* disp will need to be relative to the start position... */
-#define x86_patch(ins,disp)	\
+/*
+ * target is the position in the code where to jump to:
+ * target = code;
+ * .. output loop code...
+ * x86_mov_reg_imm (code, X86_EAX, 0);
+ * loop = code;
+ * x86_loop (code, -1);
+ * ... finish method
+ *
+ * patch displacement
+ * x86_patch (loop, target);
+ *
+ * ins should point at the start of the instruction that encodes a target.
+ * the instruction is inspected for validity and the correct displacement
+ * is inserted.
+ */
+#define x86_patch(ins,target)	\
 	do {	\
 		unsigned char* pos = (ins) + 1;	\
-		int size = 0;	\
-		switch (*(ins)) {	\
-		case 0xe9: ++size; break;	\
-		case 0x0f: ++size; ++pos; break;	\
-		case 0xeb:	\
+		int disp, size = 0;	\
+		switch (*(unsigned char*)(ins)) {	\
+		case 0xe8: case 0xe9: ++size; break; /* call, jump32 */	\
+		case 0x0f: if (!(*pos >= 0x70 && *pos <= 0x8f)) assert (0);	\
+		   ++size; ++pos; break; /* prefix for 32-bit disp */	\
+		case 0xe0: case 0xe1: case 0xe2: /* loop */	\
+		case 0xeb: /* jump8 */	\
+		/* conditional jump opcodes */	\
 		case 0x70: case 0x71: case 0x72: case 0x73:	\
 		case 0x74: case 0x75: case 0x76: case 0x77:	\
 		case 0x78: case 0x79: case 0x7a: case 0x7b:	\
@@ -276,8 +306,10 @@ typedef union {
 			break;	\
 		default: assert (0);	\
 		}	\
-		if (size) x86_imm_emit32 (pos, (disp));	\
-		else x86_imm_emit8 (pos, (disp));	\
+		disp = (target) - pos;	\
+		if (size) x86_imm_emit32 (pos, disp - 4);	\
+		else if (x86_is_imm8 (disp - 1)) x86_imm_emit8 (pos, disp - 1);	\
+		else assert (0);	\
 	} while (0)
 
 #define x86_breakpoint(inst) \
@@ -288,6 +320,10 @@ typedef union {
 #define x86_cld(inst) do { *(inst)++ =(unsigned char)0xfc; } while (0)
 #define x86_stosb(inst) do { *(inst)++ =(unsigned char)0xaa; } while (0)
 #define x86_stosl(inst) do { *(inst)++ =(unsigned char)0xab; } while (0)
+#define x86_stosd(inst) x86_stosl((inst))
+#define x86_movsb(inst) do { *(inst)++ =(unsigned char)0xa4; } while (0)
+#define x86_movsl(inst) do { *(inst)++ =(unsigned char)0xa5; } while (0)
+#define x86_movsd(inst) x86_movsl((inst))
 
 #define x86_prefix(inst,p) do { *(inst)++ =(unsigned char) (p); } while (0)
 
@@ -473,6 +509,21 @@ typedef union {
 		x86_reg_emit ((inst), (dreg), (reg));	\
 	} while (0)
 
+/**
+ * @x86_alu_reg8_reg8:
+ * Supports ALU operations between two 8-bit registers.
+ * dreg := dreg opc reg
+ * X86_Reg_No enum is used to specify the registers.
+ * Additionally is_*_h flags are used to specify what part
+ * of a given 32-bit register is used - high (TRUE) or low (FALSE).
+ * For example: dreg = X86_EAX, is_dreg_h = TRUE -> use AH
+ */
+#define x86_alu_reg8_reg8(inst,opc,dreg,reg,is_dreg_h,is_reg_h)	\
+	do {	\
+		*(inst)++ = (((unsigned char)(opc)) << 3) + 2;	\
+		x86_reg8_emit ((inst), (dreg), (reg), (is_dreg_h), (is_reg_h));	\
+	} while (0)
+
 #define x86_alu_reg_mem(inst,opc,reg,mem)	\
 	do {	\
 		*(inst)++ = (((unsigned char)(opc)) << 3) + 3;	\
@@ -814,14 +865,15 @@ typedef union {
 		x86_memindex_emit ((inst), (reg), (basereg), (disp), (indexreg), (shift));	\
 	} while (0)
 
+/*
+ * Note: x86_clear_reg () chacnges the condition code!
+ */
+#define x86_clear_reg(inst,reg) x86_alu_reg_reg((inst), X86_XOR, (reg), (reg))
+
 #define x86_mov_reg_imm(inst,reg,imm)	\
 	do {	\
-		if ((imm) == 0) {	\
-			x86_alu_reg_reg ((inst), X86_XOR, (reg), (reg));	\
-		} else {	\
-			*(inst)++ = (unsigned char)0xb8 + (reg);	\
-			x86_imm_emit32 ((inst), (imm));	\
-		}	\
+		*(inst)++ = (unsigned char)0xb8 + (reg);	\
+		x86_imm_emit32 ((inst), (imm));	\
 	} while (0)
 
 #define x86_mov_mem_imm(inst,mem,imm,size)	\
@@ -945,6 +997,12 @@ typedef union {
 		x86_mem_emit ((inst), (opc), (mem));	\
 	} while (0)
 
+#define x86_fp_op_membase(inst,opc,basereg,disp,is_double)	\
+	do {	\
+		*(inst)++ = (is_double) ? (unsigned char)0xdc : (unsigned char)0xd8;	\
+		x86_membase_emit ((inst), (opc), (basereg), (disp));	\
+	} while (0)
+
 #define x86_fp_op(inst,opc,index)	\
 	do {	\
 		*(inst)++ = (unsigned char)0xd8;	\
@@ -958,6 +1016,19 @@ typedef union {
 		*(inst)++ = (unsigned char)0xc0+(map[(opc)]<<3)+((index)&0x07);	\
 	} while (0)
 
+/**
+ * @x86_fp_int_op_membase
+ * Supports FPU operations between ST(0) and integer operand in memory.
+ * Operation encoded using X86_FP_Opcode enum.
+ * Operand is addressed by [basereg + disp].
+ * is_int specifies whether operand is int32 (TRUE) or int16 (FALSE).
+ */
+#define x86_fp_int_op_membase(inst,opc,basereg,disp,is_int)	\
+	do {	\
+		*(inst)++ = (is_int) ? (unsigned char)0xda : (unsigned char)0xde;	\
+		x86_membase_emit ((inst), opc, (basereg), (disp));	\
+	} while (0)
+
 #define x86_fstp(inst,index)	\
 	do {	\
 		*(inst)++ = (unsigned char)0xdd;	\
@@ -970,6 +1041,12 @@ typedef union {
 		*(inst)++ = (unsigned char)0xd9;	\
 	} while (0)
 
+#define x86_fucompp(inst)	\
+	do {	\
+		*(inst)++ = (unsigned char)0xda;	\
+		*(inst)++ = (unsigned char)0xe9;	\
+	} while (0)
+
 #define x86_fnstsw(inst)	\
 	do {	\
 		*(inst)++ = (unsigned char)0xdf;	\
@@ -1018,12 +1095,30 @@ typedef union {
 		*(inst)++ = (unsigned char)0xc8 + ((index) & 0x07);	\
 	} while (0)
 
+#define x86_fcomi(inst,index)	\
+	do {	\
+		*(inst)++ = (unsigned char)0xdb;	\
+		*(inst)++ = (unsigned char)0xf0 + ((index) & 0x07);	\
+	} while (0)
+
 #define x86_fcomip(inst,index)	\
 	do {	\
 		*(inst)++ = (unsigned char)0xdf;	\
 		*(inst)++ = (unsigned char)0xf0 + ((index) & 0x07);	\
 	} while (0)
 
+#define x86_fucomi(inst,index)	\
+	do {	\
+		*(inst)++ = (unsigned char)0xdb;	\
+		*(inst)++ = (unsigned char)0xe8 + ((index) & 0x07);	\
+	} while (0)
+
+#define x86_fucomip(inst,index)	\
+	do {	\
+		*(inst)++ = (unsigned char)0xdf;	\
+		*(inst)++ = (unsigned char)0xe8 + ((index) & 0x07);	\
+	} while (0)
+
 #define x86_fld(inst,mem,is_double)	\
 	do {	\
 		*(inst)++ = (is_double) ? (unsigned char)0xdd : (unsigned char)0xd9;	\
@@ -1036,7 +1131,7 @@ typedef union {
 		x86_membase_emit ((inst), 0, (basereg), (disp));	\
 	} while (0)
 
-#define x86_fld80(inst,mem)	\
+#define x86_fld80_mem(inst,mem)	\
 	do {	\
 		*(inst)++ = (unsigned char)0xdb;	\
 		x86_mem_emit ((inst), 5, (mem));	\
@@ -1100,6 +1195,20 @@ typedef union {
 		x86_membase_emit ((inst), 2 + ((pop_stack) ? 1 : 0), (basereg), (disp));	\
 	} while (0)
 
+#define x86_fst80_mem(inst,mem)	\
+	do {	\
+		*(inst)++ = (unsigned char)0xdb;	\
+		x86_mem_emit ((inst), 7, (mem));	\
+	} while (0)
+
+
+#define x86_fst80_membase(inst,basereg,disp)	\
+	do {	\
+		*(inst)++ = (unsigned char)0xdb;	\
+		x86_membase_emit ((inst), 7, (basereg), (disp));	\
+	} while (0)
+
+
 #define x86_fist_pop(inst,mem,is_long)	\
 	do {	\
 		if ((is_long)) {	\
@@ -1122,6 +1231,24 @@ typedef union {
 		}	\
 	} while (0)
 
+/**
+ * @x86_fist_membase
+ * Converts content of ST(0) to integer and stores it at memory location
+ * addressed by [basereg + disp].
+ * is_int specifies whether destination is int32 (TRUE) or int16 (FALSE).
+ */
+#define x86_fist_membase(inst,basereg,disp,is_int)	\
+	do {	\
+		if ((is_int)) {	\
+			*(inst)++ = (unsigned char)0xdb;	\
+			x86_membase_emit ((inst), 2, (basereg), (disp));	\
+		} else {	\
+			*(inst)++ = (unsigned char)0xdf;	\
+			x86_membase_emit ((inst), 2, (basereg), (disp));	\
+		}	\
+	} while (0)
+
+
 #define x86_push_reg(inst,reg)	\
 	do {	\
 		*(inst)++ = (unsigned char)0x50 + (reg);	\
@@ -1179,6 +1306,24 @@ typedef union {
 #define x86_popad(inst)  do { *(inst)++ = (unsigned char)0x61; } while (0)
 #define x86_popfd(inst)  do { *(inst)++ = (unsigned char)0x9d; } while (0)
 
+#define x86_loop(inst,imm)	\
+	do {	\
+		*(inst)++ = (unsigned char)0xe2;	\
+		x86_imm_emit8 ((inst), (imm));	\
+	} while (0)
+
+#define x86_loope(inst,imm)	\
+	do {	\
+		*(inst)++ = (unsigned char)0xe1;	\
+		x86_imm_emit8 ((inst), (imm));	\
+	} while (0)
+
+#define x86_loopne(inst,imm)	\
+	do {	\
+		*(inst)++ = (unsigned char)0xe0;	\
+		x86_imm_emit8 ((inst), (imm));	\
+	} while (0)
+
 #define x86_jump32(inst,imm)	\
 	do {	\
 		*(inst)++ = (unsigned char)0xe9;	\
@@ -1331,9 +1476,9 @@ typedef union {
 
 #define x86_call_code(inst,target)	\
 	do {	\
-		int offset = (unsigned char*)(target) - (inst);	\
-		offset -= 5;	\
-		x86_call_imm ((inst), offset);	\
+		int _x86_offset = (unsigned char*)(target) - (inst);	\
+		_x86_offset -= 5;	\
+		x86_call_imm ((inst), _x86_offset);	\
 	} while (0)
 
 #define x86_ret(inst) do { *(inst)++ = (unsigned char)0xc3; } while (0)
@@ -1391,6 +1536,8 @@ typedef union {
 #define x86_fsin(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xfe; } while (0)
 #define x86_fcos(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xff; } while (0)
 #define x86_fabs(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xe1; } while (0)
+#define x86_ftst(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xe4; } while (0)
+#define x86_fxam(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xe5; } while (0)
 #define x86_fpatan(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xf3; } while (0)
 #define x86_fprem(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xf8; } while (0)
 #define x86_fprem1(inst) do { *(inst)++ = (unsigned char)0xd9; *(inst)++ = (unsigned char)0xf5; } while (0)
diff --git a/mono/benchmark/.cvsignore b/mono/benchmark/.cvsignore
new file mode 100644
index 00000000000..2ac00fb6fc3
--- /dev/null
+++ b/mono/benchmark/.cvsignore
@@ -0,0 +1,5 @@
+Makefile.in
+Makefile
+*.stdout
+.deps
+.libs
diff --git a/mono/benchmark/Makefile.am b/mono/benchmark/Makefile.am
new file mode 100644
index 00000000000..00b5f44c880
--- /dev/null
+++ b/mono/benchmark/Makefile.am
@@ -0,0 +1,46 @@
+TEST_PROG=../jit/mono
+
+CSC=mcs
+
+
+TESTSRC=			\
+	fib.cs 			\
+	life.cs 		\
+	castclass.cs		\
+	isinst.cs		\
+	inline1.cs		\
+	inline2.cs		\
+	inline3.cs		\
+	muldiv.cs		\
+	loops.cs		\
+	initlocals.cs		\
+	logic.cs		\
+	bulkcpy.il		\
+	math.cs
+
+TESTSI_TMP=$(TESTSRC:.cs=.exe)
+TESTSI=$(TESTSI_TMP:.il=.exe)
+
+EXTRA_DIST=test-driver $(TESTSRC)
+
+%.exe: %.il
+	ilasm $< /OUTPUT=$@
+
+%.exe: %.cs
+	$(CSC) $<
+
+test: $(TEST_PROG) $(TESTSI)
+	@failed=0; \
+	passed=0; \
+	for i in $(TESTSI); do	\
+		if ./test-driver $(TEST_PROG) $$i; \
+		then \
+			passed=`expr $${passed} + 1`; \
+		else \
+			failed=`expr $${failed} + 1`; \
+		fi \
+	done; \
+	echo "$${passed} test(s) passed. $${failed} test(s) failed."
+
+check:
+	@echo no check yet
diff --git a/mono/benchmark/bulkcpy.il b/mono/benchmark/bulkcpy.il
new file mode 100644
index 00000000000..f4c5481718c
--- /dev/null
+++ b/mono/benchmark/bulkcpy.il
@@ -0,0 +1,680 @@
+.assembly BulkCpy {}

+

+.class public auto ansi sealed beforefieldinit BulkCpy {

+

+	.field public static unsigned int8 Data at RandomData

+

+	.method static public void Main() il managed {

+		.entrypoint

+

+		.locals (

+			int32 count,

+			int32 start,

+			int32 elapsed,

+			unsigned int8[] buff1,

+			unsigned int8[] buff2,

+			unsigned int8& pinned dest1,

+			unsigned int8& pinned dest2,

+			int32 size

+		)

+

+		ldc.i4 2053

+		stloc size

+

+		ldloc size

+		newarr [mscorlib]System.Byte

+		dup

+		stloc buff1

+		ldc.i4.0

+		ldelema [mscorlib]System.Byte

+		stloc dest1

+

+		ldloc size

+		newarr [mscorlib]System.Byte

+		dup

+		stloc buff2

+		ldc.i4.0

+		ldelema [mscorlib]System.Byte

+		stloc dest2

+

+

+		ldc.i4 1000000

+		stloc count

+

+		call int32 [mscorlib]System.Environment::get_TickCount()

+		stloc start

+

+	loop:

+		ldloc dest1

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 2053

+		cpblk

+

+		ldloc dest1

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 0

+		cpblk

+

+		ldloc dest2

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 1

+		cpblk

+

+		ldloc dest1

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 2

+		cpblk

+

+		ldloc dest2

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 3

+		cpblk

+

+		ldloc dest1

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 4

+		cpblk

+

+		ldloc dest2

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 5

+		cpblk

+

+		ldloc dest1

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 6

+		cpblk

+

+		ldloc dest2

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 7

+		cpblk

+

+		ldloc dest1

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 8

+		cpblk

+

+		ldloc dest2

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 9

+		cpblk

+

+		ldloc dest1

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 10

+		cpblk

+

+		ldloc dest2

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 11

+		cpblk

+

+		ldloc dest1

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 12

+		cpblk

+

+		ldloc dest2

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 13

+		cpblk

+

+		ldloc dest1

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 14

+		cpblk

+

+		ldloc dest2

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 15

+		cpblk

+

+		ldloc dest1

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 16

+		cpblk

+

+		ldloc dest2

+		ldsflda unsigned int8 BulkCpy::Data

+		ldc.i4 2053

+		cpblk

+

+		ldloc count

+		ldc.i4.1

+		sub

+		dup

+		stloc count

+		brtrue loop

+

+

+		call int32 [mscorlib]System.Environment::get_TickCount()

+		ldloc start

+		sub

+		stloc elapsed

+

+		ldstr "Elapsed : {0} ms."

+		ldloc elapsed

+		box [mscorlib]System.Int32

+		call void [mscorlib]System.Console::WriteLine(string, object)

+

+		ret

+	}

+

+}

+

+

+.data RandomData = bytearray (

+	25 4e d7 23 b9 f8 fb ef 

+	4e c2 b6 23 a9 16 d1 2a 

+	eb f6 89 78 3f 35 26 c0 

+	21 43 82 4c 27 f0 b2 cb 

+	70 d7 ed b6 fb e6 80 cf 

+	c9 f7 d5 72 9e e8 31 02 

+	d1 25 61 8b ff f4 eb 3e 

+	f9 6b 69 bd 15 7a d6 cd 

+	08 9e bd 58 d4 32 59 25 

+	43 51 76 b8 db 4c 32 61 

+	68 69 ee ea e7 eb 33 a1 

+	ac 2d dc 9c 43 58 b9 df 

+	79 c1 61 71 4e d8 3a b0 

+	5b 9a 8b 12 7a d9 b5 b1 

+	76 ec 6b 75 5b b9 dc 92 

+	18 88 43 3c 38 11 51 a3 

+	4b c3 ff f0 79 c9 d2 86 

+	b1 89 9f 47 b0 4f fb e6 

+	ae be 8f 35 0d f8 0d 2f 

+	56 12 92 5c e3 9e c7 55 

+	b5 e3 c0 2f 6d f1 fd 97 

+	e0 c5 bb c0 25 59 1a e9 

+	92 3b d8 63 16 b3 4c 3f 

+	45 f1 f3 84 08 b1 b6 1b 

+	38 01 6e 78 85 60 34 c2 

+	ce 5f f1 db 48 bf eb 40 

+	85 37 b7 73 b9 0d 23 a0 

+	76 cd 03 fc 5a 6c b3 44 

+	9f 41 ca 06 e7 ea ed bb 

+	85 52 0b 53 1d ee 02 c7 

+	57 6f 9e d4 22 49 0c b8 

+	b1 73 05 c2 9c 2d a6 3c 

+	69 b8 d0 f3 74 26 87 f0 

+	b7 6c d3 c3 0f a4 b5 c9 

+	f8 1b 58 c5 c3 04 4c f6 

+	8e 19 a2 22 47 af db 27 

+	fa 97 b5 be a0 5d 1d e5 

+	4b cc cc e2 66 f3 a6 2a 

+	e3 cb 5a 3c 68 a1 d9 91 

+	d5 8a c4 3a 94 d9 cb 63 

+	f3 63 2c 65 c9 b6 06 e2 

+	61 81 31 03 00 14 27 c7 

+	36 7b 5b 84 1f 7b 2a f3 

+	96 8d 9f 2d d1 43 84 1d 

+	d8 67 43 43 4d 49 2a db 

+	43 4d 77 19 a0 7f 84 fd 

+	87 e6 a4 94 bf be 69 b7 

+	5d 1f 87 0e 7e 21 23 bc 

+	f7 9c 2b 1b 70 1a 03 2c 

+	60 28 53 19 c1 73 c7 4d 

+	8a b4 85 58 d9 a4 ce 4c 

+	27 08 a9 2e 0e 72 b0 6d 

+	1f 78 88 31 e5 39 5f d6 

+	ce 4d 84 e5 33 a7 7c 7f 

+	8e f9 68 98 0b 9e e9 5f 

+	f0 96 62 98 11 6e 3b 11 

+	4e bb a2 ea d0 dd d9 a0 

+	73 ce 62 c1 8d bd 50 63 

+	1d f6 73 dc b9 21 04 6b 

+	77 fd 7c 8e e5 58 de 46 

+	32 39 48 f6 63 12 86 bd 

+	3f 3b 0d 0a 35 3f 43 50 

+	31 d2 b4 71 60 18 42 00 

+	37 d3 c5 99 70 04 7f 9d 

+	ae a4 98 32 33 90 9b 14 

+	52 fc 41 a4 9f 2f 74 07 

+	36 70 19 bd 46 39 4d 80 

+	cf 9b 0a 11 36 67 62 c2 

+	bb ac 15 a0 54 7d e1 24 

+	de 30 c5 a2 f8 11 45 ed 

+	af fd a5 0a 36 6d 31 15 

+	6d 0a 3b e0 a6 3c 51 c1 

+	6e 55 d8 62 cf cd 25 64 

+	72 a8 cd 1b 51 9a 94 c8 

+	75 64 41 e8 57 68 89 9c 

+	49 10 14 2f 39 4b de 0c 

+	ea b5 d0 df 64 6c c1 84 

+	07 55 d9 90 be 92 62 9b 

+	f8 17 14 40 61 5c ca 4a 

+	88 2d a1 b2 fc 2f 4e a0 

+	7d f9 32 38 31 00 01 73 

+	eb fa 88 18 7a 02 d4 24 

+	02 c6 cc a3 4f 1f 7c b5 

+	bf e5 43 44 c0 1e 17 f2 

+	4c 1d 0c c8 7c a6 68 87 

+	cb 97 9a 83 b7 5c d9 a1 

+	e6 a3 4e d9 96 8e e4 13 

+	f8 1e 57 66 fe d0 f9 5a 

+	6f 9b ec 78 70 dc a5 11 

+	4b a5 0a 4d 65 94 b2 09 

+	cd f1 04 39 44 b2 dc af 

+	de 3d 92 35 21 09 c6 f4 

+	c2 c2 aa 56 16 ed d9 a8 

+	e4 e3 c4 73 f2 54 a5 19 

+	8d cc a8 c1 93 a4 99 77 

+	19 b7 76 e6 9c 23 aa 5b 

+	b7 52 c6 c9 d2 9d a8 eb 

+	3e e2 73 07 1f 79 b6 20 

+	aa 75 96 5d 3d 93 a8 f4 

+	f4 dd fd 92 57 5a 32 3e 

+	d1 63 ed 94 d9 b4 6b 90 

+	c5 90 a2 12 93 73 da 01 

+	66 f0 79 9b e3 c1 74 53 

+	19 d8 6a 2a eb 25 78 3d 

+	7b 6c ac 2f 68 68 91 0e 

+	5e 73 c5 94 cf a0 93 7d 

+	bf ea b5 b9 e7 02 cd 26 

+	c1 50 32 47 89 5e 77 21 

+	12 94 e6 af ec 7d f9 49 

+	30 93 9d 9c 37 a2 1e 1a 

+	20 da 1e 16 ad 66 f5 31 

+	f5 33 81 fe cf b4 74 48 

+	c0 1b 2f 4a 73 ee f8 28 

+	53 47 b0 38 05 84 11 23 

+	cb 7d e9 66 05 ce 3b d0 

+	09 f7 b3 39 75 71 54 62 

+	a6 3b dd ec 81 3e cf 92 

+	3c 1e 49 3d 8e 1f 89 6b 

+	5b aa 9c 2b 04 79 b7 65 

+	90 9d 71 30 86 b9 12 ac 

+	0d 01 50 55 f3 86 c1 6c 

+	ca 0d 14 1b 29 92 19 9f 

+	3a 9e d6 ac 15 5a 6e 56 

+	07 51 95 0b 5c ea e0 ee 

+	f2 2b 13 d0 16 db 3e c3 

+	0b 8e 1e 2c 8d d1 32 2e 

+	1e 27 ec 6e 45 0d 2f 6d 

+	09 f5 fa 7f 61 7f 78 48 

+	eb 22 4b ad 7b 62 c7 45 

+	19 9f 23 a7 74 0e 79 97 

+	b6 33 74 49 34 ee 1b 61 

+	7d be 8d d7 2f 6f 94 c1 

+	49 35 06 13 c3 1b 5a 51 

+	8f 52 02 9c 22 64 75 8f 

+	77 f3 80 ac 34 f1 d4 1c 

+	90 b0 69 f1 e9 88 27 01 

+	4f 10 0e 5f e6 9a 80 e6 

+	aa 63 12 6f c6 dc 9d 71 

+	47 7e 1c b0 48 cf b7 73 

+	e7 fb e7 dc ad 54 71 43 

+	7f 7c 75 7a 22 54 93 65 

+	b1 90 b4 7f 89 87 f3 71 

+	27 e6 b5 ea be 70 e3 8c 

+	5a 5e a1 cb 50 6e 76 b5 

+	ae bd 32 57 82 7f 9f 22 

+	78 85 49 3c 60 30 c3 2e 

+	24 25 2e e4 df 69 f5 2e 

+	0f 89 a8 cf bd 14 4b e7 

+	09 cb 67 38 e9 8e 0e 4a 

+	63 0c ce 63 f0 7c 82 8d 

+	9a a3 65 b9 02 c9 e1 3b 

+	ec 8a c6 db 57 8b 1f a3 

+	4a 67 22 66 01 5b c5 a9 

+	25 40 80 c4 43 4b d5 55 

+	ef 2b 44 a7 84 f0 a3 5d 

+	1a fd a2 f3 9e cf c6 ca 

+	47 72 95 04 47 b2 08 b6 

+	fa a0 9a a8 ee 26 8c 4c 

+	35 32 1a df 7f 62 c4 5e 

+	6f c6 f3 94 d3 e4 1a df 

+	68 6b 62 bf d4 04 3d 71 

+	41 dc b8 c3 27 e1 fd 8f 

+	6f b0 59 0f bf c2 c4 35 

+	22 65 a3 7e 3c 30 b6 33 

+	a3 38 f8 2c 52 e7 eb 05 

+	b2 e7 f0 a5 16 d4 12 94 

+	cf b7 8a df 5e 86 78 70 

+	0b 94 d5 87 dc 90 bb ab 

+	b8 c2 ca 04 74 17 02 a3 

+	7c 82 76 a3 41 c7 1e 3f 

+	13 be a8 e5 29 aa 9b cd 

+	27 ef 3e f6 83 bf e4 e5 

+	67 37 a4 a8 e5 6f 90 c2 

+	a8 f9 39 64 60 3b d7 07 

+	38 2a d3 d1 38 15 67 3b 

+	e8 2f 49 17 12 6f af e5 

+	3b d2 ab ba 65 8d b5 c7 

+	57 58 a7 72 83 ad 48 01 

+	8e e1 fc 61 80 eb 1d d8 

+	39 54 7e 10 12 a3 6d fc 

+	29 67 57 69 fd 71 35 28 

+	1d fe cd fa ba 34 ce 3f 

+	15 8f 5a 5b b9 22 78 40 

+	63 15 85 5e 7a 09 ba 6d 

+	16 c1 8d a6 59 01 7f 5b 

+	b0 26 96 8e fb 0b 5b bc 

+	f2 2a b5 f3 8c 62 cf b6 

+	2e 02 d4 0d 0b 63 2e 08 

+	8c 67 59 23 b7 84 27 04 

+	37 b9 e6 8e f9 3a a9 46 

+	62 b2 d8 82 50 3d 88 50 

+	37 b9 fd 85 5c d8 45 0a 

+	19 d5 6b 8a b0 58 c9 d9 

+	9b e9 62 d8 3f 3a c7 24 

+	0e 64 70 06 0b 69 fc 5a 

+	3e c5 7f 63 0a 44 97 a1 

+	c6 dd f9 4e d0 f6 8a bd 

+	25 5c 01 93 6b 69 eb 04 

+	3f 13 05 8e 0d 04 7d e4 

+	f3 90 a6 56 19 d5 82 81 

+	13 f6 65 9c 52 0d f4 df 

+	a0 56 08 ad 72 94 d5 59 

+	ed cb 7f 74 32 54 84 df 

+	64 55 ca 22 69 b9 16 d9 

+	9b 01 5a 3b dd d5 8a db 

+	31 f6 78 67 26 aa 86 be 

+	6d 2a d1 46 6c c5 b1 96 

+	55 e2 76 a8 e1 2b 0b 60 

+	01 79 8c 5e 74 39 69 bb 

+	b8 9c 4d 54 9a 91 e0 cb 

+	8b 13 d6 b6 3f 2a e4 f9 

+	48 02 a5 d8 60 00 1c ae 

+	d3 fb cb 5c de 2c 53 2d 

+	d1 2c 8d ba 3a cb 7f 8b 

+	2a b6 22 7b 27 0d ed b4 

+	70 1b 32 1a 25 65 89 9f 

+	30 b9 ec 5d 4b eb 08 6c 

+	a2 05 98 f1 ed cc ad 63 

+	f6 90 ba 66 d2 9b ef 32 

+	2a f0 98 ec 64 60 24 e0 

+	a4 9a 8e 10 1a 15 82 5f 

+	d9 cd ed bf b2 e1 0b 5c 

+	02 d8 51 90 c6 d5 88 39 

+	6e 46 24 27 cf a7 90 bd 

+	36 84 12 80 a8 07 62 d4 

+	12 ab c7 1b 29 7a 21 3d 

+	9b 03 13 f4 f1 c8 66 f4 

+	eb 10 0c a6 2c 86 8e 0b 

+	90 a8 f7 dc 87 d6 c1 69 

+	f9 5b 9d 8a b1 b4 a6 63 

+	15 57 6f b5 cb 84 e6 a7 

+	7b 68 96 97 c9 fc 48 e7 

+	c6 cd e8 35 46 57 87 0a 

+	0c ac fb d8 40 69 b5 e8 

+	4a 9b f6 74 51 8e 0d 1c 

+	74 47 92 2c 6a 0e 3c 68 

+	8a e1 2f 38 ee 01 82 71 

+	48 c3 02 d7 23 a2 01 99 

+	51 b2 00 00 17 0e 70 0f 

+	aa 6d 25 48 da e2 43 5e 

+	9f 29 8d bd 22 75 58 ba 

+	3c 57 4b da df 5b b5 c6 

+	f9 7a 1d f8 15 a0 6b 74 

+	44 c1 7a f3 7d c5 8b 19 

+	a5 09 f0 87 0a 3a 9a c0 

+	15 77 ee 25 2f 6f ab b8 

+	ab d2 a1 d5 7b 3e ec 59 

+	ef 6e 42 26 86 94 da e2 

+	5a 56 02 c7 29 80 d9 98 

+	ea c2 9d 72 8c 64 44 8b 

+	1a 1a dd dc 9f 14 0a 2f 

+	70 f0 9e d2 ad 74 1f a1 

+	a7 a3 70 13 c0 05 c2 b3 

+	24 09 da 04 7c 88 17 07 

+	2e e7 0d f8 f5 38 f3 73 

+	f7 98 2c 7b 35 4d 55 c8 

+	7f a5 09 c2 99 45 fc 64 

+	3a a6 30 ca 15 6e 38 29 

+	a5 e2 73 d7 30 b4 7a e8 

+	24 07 50 38 2d d2 72 73 

+	e1 15 9e c9 b1 93 6e 3a 

+	9d 79 cf 8a e1 00 49 2a 

+	c4 4b ea d8 7d dd c7 61 

+	6b 7f 86 88 53 36 5a 39 

+	52 0a 3c 26 8c 63 2c 94 

+	b7 7b 42 1a e7 ef 77 27 

+	10 d5 5d 49 49 44 ba 4e 

+	c4 42 ee f7 cb 76 bd 37 

+	c9 f7 a7 83 d9 ac f9 7b 

+	62 de 3d 7b 3e be 6a 2b 

+	31 0b 9f 18 4e b5 d2 98 

+	1f 80 b4 60 21 10 f2 24 

+	fd 99 3d a3 46 3a 93 66 

+	f6 76 db 5a 5c d0 1a da 

+	dd fe d8 3d 81 0d 10 1c 

+	88 57 4b f1 d6 bd 54 62 

+	bd 32 40 8b 1d 01 86 b5 

+	cd 26 aa 58 cf a8 ed 9a 

+	c0 fd 7f 8c 86 93 ac f3 

+	95 19 ca 41 ba 3a b4 88 

+	29 8b 1b 5f c3 04 7a e5 

+	53 55 d9 a7 b6 f5 00 37 

+	bc ce 37 d2 69 bc e6 8b 

+	12 91 d0 18 4f 12 af 23 

+	98 ed c0 3d ad 59 12 a6 

+	6c 9c 64 35 05 cc dd f3 

+	7f 7e 46 2d 97 e4 0a 42 

+	23 cc d9 c6 f0 7e 3c 47 

+	ae 95 41 d3 bc e2 75 7a 

+	f3 66 cd 29 7a 0a 46 39 

+	64 77 32 3a a5 d3 ec 8a 

+	f4 ca 1d c7 56 2a b8 ad 

+	47 76 c1 92 47 bc ed 9f 

+	4a 6a 0a 10 d9 8a d8 49 

+	4e 9f 38 14 0b 5d 5f b5 

+	da 0a 34 e2 65 c5 b7 65 

+	a7 94 d3 cd 22 7d c9 cf 

+	9f 08 b0 71 35 11 26 9c 

+	2f 5f f6 7c ab ac 0d 2f 

+	3f 1b 30 bd 48 da 11 32 

+	23 db 60 14 2c 68 99 68 

+	7c 73 d8 5e a3 3f 25 5b 

+	8d be 7e 52 e1 33 aa 63 

+	29 67 29 7b 38 34 fd a1 

+	ae b8 a8 eb f8 fc 4c 2c 

+	4c 30 90 b5 f2 5e 74 0b 

+	7a f6 7b 65 c6 e5 54 6c 

+	d0 0b 54 90 c3 ee df 60 

+	3f 33 84 fd 70 ef 42 f5 

+	24 fa b1 94 ca 17 27 f2 

+	3d 97 be 8c 92 49 47 b9 

+	ee 00 0f 9c 5b ac f8 08 

+	8e f2 25 72 6d 2a ba 4f 

+	0a 28 16 d2 9e bf e3 a0 

+	81 0f c9 d5 9c 49 27 0b 

+	91 d6 e6 a1 c3 0e 48 d8 

+	40 80 ad 4b e8 37 ba 2c 

+	74 21 15 7c 90 88 1c 90 

+	99 72 8f 4b ec 64 49 2c 

+	7d 06 fe cb 59 f6 82 7a 

+	fe be 8c 64 5b 82 7c b7 

+	79 a0 56 37 9c 37 d0 0c 

+	df 5c 12 a3 84 f3 8b 06 

+	f2 2d b4 94 c7 2f 7e 1a 

+	0e 84 1f 64 33 91 f8 f1 

+	dc 76 ae b1 7c bb bd 26 

+	b9 de 1d e3 d7 f7 e0 cb 

+	5d 24 12 7a 08 a3 76 b3 

+	24 f1 e3 a1 dd ec 53 4f 

+	0b 56 05 97 da f6 6a 0f 

+	c7 34 d9 97 d3 ca 3b d3 

+	f0 a0 8c 68 88 12 7d c1 

+	5e 89 a5 00 0b 9e ba 71 

+	2c 59 2b 12 a2 28 17 01 

+	8c 84 20 d7 08 7e 10 fa 

+	ac 0b 5e 8d a4 9f 46 6b 

+	69 d4 0c dc 75 69 cb 55 

+	e0 ea dc 93 75 66 cc b4 

+	a5 1e 2e 30 94 e2 82 5e 

+	7d ef 64 46 44 d4 2d cf 

+	b8 b8 cd 23 c2 af f6 7a 

+	da fa 97 9e c7 3e be 81 

+	23 93 a9 3b da 06 d8 65 

+	a0 7f 9b f4 e9 85 40 57 

+	76 e1 fa bf bd 3a c8 97 

+	e2 51 87 10 da fd ac 36 

+	65 a9 08 a8 ba 3a 86 99 

+	64 4f e4 d8 55 bd 55 d5 

+	92 1e 58 94 ed 95 36 91 

+	f5 0a 33 9d 7f 9e dc 92 

+	5e 6e 6a 17 0b 5a 77 0d 

+	02 db 21 43 3c 66 00 16 

+	df 82 4a 6d 37 9e d9 94 

+	bd 33 9d 68 a7 7a f4 c2 

+	ab b2 f3 78 53 16 f0 c1 

+	51 bd 13 d7 14 1c b4 5e 

+	67 55 de 32 22 7f 82 8a 

+	b2 fa 8c 8a ee 2a b8 db 

+	35 3b fe c9 cd 2b 34 c4 

+	59 2b 40 91 ec 53 38 13 

+	f3 66 fc 18 3f 47 7d bf 

+	d3 bd 57 4a 66 0b 6f 9e 

+	bd 2a e5 6d 1d ed bc e1 

+	30 94 cb 8b fb de 54 a0 

+	8e 21 42 25 6f 9d 78 44 

+	be 92 4a a4 96 78 78 7c 

+	a9 39 39 42 27 11 60 29 

+	98 fe e8 4e 9a 97 af 1e 

+	3d 70 fb f6 91 e8 54 97 

+	d7 26 b8 99 37 bc fc 26 

+	97 a5 f3 6d f9 58 b5 e0 

+	d9 86 94 c3 eb f7 b7 66 

+	04 71 5d 47 90 89 a6 5c 

+	e8 28 34 de 39 37 b7 5b 

+	c2 aa 84 05 b3 16 df 6b 

+	52 0b 98 03 16 dc 9a a0 

+	95 08 8b 39 6b 5e 7b 4e 

+	a0 94 f0 94 d6 cc c2 b8 

+	96 7d 03 e8 34 bb 8b 39 

+	54 66 19 af 06 d1 39 71 

+	44 c4 62 9c 55 f3 9e b8 

+	ce 68 a8 d6 d1 4c 24 21 

+	01 55 df 60 11 44 bf c0 

+	39 69 d2 af fe ea ef 5d 

+	48 04 5e 93 73 f1 f7 c8 

+	8e 15 5e 9b e4 07 5b 7a 

+	f3 ab b3 50 55 dc 8f 5f 

+	cd 2f 4a 5c f7 96 8a b7 

+	84 f8 15 72 7c af 08 8a 

+	f3 85 37 a0 7b 57 6f 87 

+	dd be aa 70 f4 f9 50 73 

+	ba 3b 11 65 b2 05 89 6c 

+	a0 90 c3 06 d6 c2 dd ce 

+	47 b4 93 82 49 56 3f 3c 

+	3b f8 f9 7c 79 d6 9f 19 

+	d8 81 22 4e c3 13 00 33 

+	8f 3f 37 c8 83 d2 97 c2 

+	a2 2a e6 b2 03 15 97 b4 

+	79 ba 35 42 13 02 a6 63 

+	2c 4e d1 54 67 47 9e ca 

+	0e 70 f7 b2 0b 86 ac 17 

+	2b 20 cb 97 c8 72 7c 98 

+	11 28 55 e9 73 e8 58 c4 

+	67 26 c1 7e 21 0c c5 95 

+	fd 8f 58 b9 f6 71 24 00 

+	0d 12 8f 5d 43 63 fa a6 

+	52 04 3e e4 16 c9 cf cd 

+	f6 76 ad 6b 96 94 e2 54 

+	6f b8 b3 2d bf d5 8e 09 

+	bf f6 82 4c 10 f9 50 2d 

+	d4 14 36 93 69 de 20 b4 

+	89 6e 71 42 3a 96 4e 9f 

+	4f 0b 6d fb f9 79 92 2d 

+	c6 ea c6 e1 f8 ee 0c c4 

+	38 21 06 de 4b e9 93 97 

+	b5 ec 8e 22 59 1d d1 3b 

+	13 08 76 b5 dc ac f6 94 

+	b9 06 0e 68 9d 95 0b 73 

+	e2 44 8c 8e ed c9 f3 a8 

+	e3 9e de 4c 18 82 5c f2 

+	24 15 90 9f 41 e1 fc 4a 

+	89 89 7e 3d 75 9c 5b 7d 

+	0a 43 51 bb 9f 03 27 05 

+	aa 8d d2 a5 03 0a 3e f5 

+	3e d9 bc 0b 94 ec 7e 3f 

+	2f 57 6e 70 e5 5c 0c d4 

+	32 42 2d e0 b2 da f5 24 

+	29 a0 59 07 4e ad 61 83 

+	bc ce 4e c9 cb 5b 82 4e 

+	c9 b4 63 20 b0 2e f0 ac 

+	fc 1e 26 90 90 bb 94 c1 

+	60 2c 68 b0 5f de 12 74 

+	22 5a 62 b7 63 ed d9 bf 

+	db 46 63 0f b6 0c c8 aa 

+	95 2d c3 03 1d 09 c9 db 

+	6b 9b d8 69 b6 17 39 60 

+	33 ab d7 fc 53 40 84 09 

+	c8 ad 7d d5 9c 32 30 a8 

+	f2 3c 24 e9 a0 7b 40 77 

+	25 3f 24 e6 b8 d1 67 49 

+	12 9e fa 87 01 83 9f 36 

+	88 3f 0f a9 11 48 be 61 

+	74 36 81 13 df 6e 3a b4 

+	71 32 29 7d c3 00 4d 57 

+	53 4c f4 be 67 2c 91 d0 

+	d2 69 ea d4 50 4e c7 57 

+	86 95 37 bf e3 ce 70 d4 

+	06 0d 23 b7 6d 30 a0 98 

+	1e 23 d6 d6 a7 a1 e5 47 

+	71 4f 1e 20 d7 36 6c d4 

+	37 e3 91 cc d3 c8 af 08 

+	a2 ea e7 d4 3c 3f 0f 92 

+	1a e4 20 c5 b1 7f 5e 80 

+	d7 0d 1f 73 e7 cd f8 18 

+	70 1d ea d4 39 57 65 b9 

+	ea d2 7f 9c 52 c6 0f b8 

+	c5 83 be 87 09 dd bd 37 

+	9b 09 e2 47 a2 26 8b 35 

+	3e ce 7b 44 bb aa a1 cb 

+	67 66 d8 53 4a 80 e9 7a 

+	15 87 00 3e b9 0f ad 6c 

+	c5 83 a7 90 a6 3f 22 73 

+	e4 e5 50 3f 42 0a 4b ab 

+	d9 9f 16 f1 d8 49 20 b1 

+	73 d6 d3 d7 ef 6f b6 f9 

+	72 ab e3 b2 ee 06 dd ee 

+	0d 0a 1e 48 e0 b1 95 10 

+	fc 4e cd 10 e0 e4 f6 4a 

+	61 6a 0c b1 9c 3c 2c 89 

+	a4 a2 2e 14 42 03 1f 7c 

+	9e c8 83 a4 a8 fd 66 f3 

+	60 44 bc f0 87 f2 42 38 

+	22 79 b3 38 02 9c 67 4a 

+	9d 6a 49 3d a5 16 eb 09 

+	f6 6e 53 4e 96 81 18 80 

+	d1 27 d5 5f eb 0d f5 0f 

+	8e 1b 45 e4 f8 03 1c 7d 

+	fd 8d b6 f5 45 1d e3 a9 

+	0a 1c 8e 26 9d a2 34 e3 

+	94 b4 7c a1 de 1b 42 14 

+	47 8c 8b 07 21 1c 79 d0 

+	fe b5 ec 60 33 94 df 9a 

+	b4 a4 c1 51 a5 1c 75 75 

+	80 f0 a6 44 c2 d6 d0 07 

+	3e f8 26 83 95 3a a7 8d 

+	a7 9e e6 a6 36 82 6f bc 

+	f7 b3 22 7e 0f b5 c6 e2 

+	83 ba 5a 7a dc b3 51 b1 

+	b9 19 d8 3c 3c 27 e8 41 

+	b6 0d 26 88 1f a6 31 10 

+	fa 95 13 fb ee 09 dc 8f 

+	48 d6 cc ab c0 34 df 67 

+	26 7c 98 f9 31 f2 4b d7 

+	26 a1 a1 d4 1f 61 62 df 

+	82 61 65 99 3d 75 57 75 

+	56 2f 70 08 95 35 4c 10 

+	e2 58 ca 36 78 73 db 46 

+	4c 18 54 6d 2e e7 de 0a 

+	31 fa bc ec 88 52 08 6b 

+	74 16 d2 b5 b7 46 3f 1d 

+	d2 81 f8 2f 51 88 27 d1 

+	61 4b d1 28 60 2b 3a c2 

+	9a a1 da ed b3 14 3d a7 

+	a1 b7 58 ac 13 e6 99 69 

+	ef 48 c4 76 ac 0f b9 0b 

+	69 e5 62 db 27 e3 a0 53 

+	21 05 99 65 c2 b8 c4 6c 

+	c7 25 6a 42 fa 7f 78 76 

+	da e6 87 e4 02 d0 0e 6a 

+	28 61 59 29 87 d6 d8 61 

+	5c f9 39 4d 69 d8 39 6b 

+	75 72 b0 3f 30 b3 4c f9 

+)

diff --git a/mono/benchmark/castclass.cs b/mono/benchmark/castclass.cs
new file mode 100755
index 00000000000..0864a1a35ed
--- /dev/null
+++ b/mono/benchmark/castclass.cs
@@ -0,0 +1,27 @@
+using System;
+
+public class Test {
+
+	int tmp = 1;
+	
+	public static int Main (string[] args) {
+		int repeat = 1;
+		
+		
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		object a = new Test ();
+		
+		for (int i = 0; i < (repeat * 5000); i++)
+			for (int j = 0; j < 100000; j++)
+				if (((Test)a).tmp != 1)
+					return 1;
+		
+		return 0;
+	}
+}
+
+
diff --git a/mono/benchmark/divun.cs b/mono/benchmark/divun.cs
new file mode 100644
index 00000000000..ba1cd1f13d8
--- /dev/null
+++ b/mono/benchmark/divun.cs
@@ -0,0 +1,26 @@
+using System;
+
+class X {
+
+	public static int DivUn(int x) {
+		x *= 163859;
+		x = (int) ((uint)x / 5);
+		x = (int) ((uint)x / 25);
+		x = (int) ((uint)x / 10);
+		x = (int) ((uint)x / 128);
+		x = (int) ((uint)x / 43);
+		x = (int) ((uint)x / 2);
+		x = (int) ((uint)x / 4);
+		x = (int) ((uint)x / 1);
+		return x;
+	}
+
+	public static int Main() {
+		int x = 1;
+		for (int i=0; i < 100000000; ++i) x += DivUn(12345);
+		// x |= -1; // check for overflow case
+		x = (int) ((uint)x / 1025);		
+		return x;
+	}
+
+}
diff --git a/mono/benchmark/fib.cs b/mono/benchmark/fib.cs
new file mode 100755
index 00000000000..44c398493f6
--- /dev/null
+++ b/mono/benchmark/fib.cs
@@ -0,0 +1,26 @@
+using System;
+
+public class Fib {
+
+	public static int fib (int n) {
+		if (n < 2)
+			return 1;
+		return fib(n-2)+fib(n-1);
+	}
+	public static int Main (string[] args) {
+		int repeat = 1;
+		
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		for (int i = 0; i < (repeat * 50); i++)
+			if (fib (32) != 3524578)
+				return 1;
+		
+		return 0;
+	}
+}
+
+
diff --git a/mono/benchmark/initlocals.cs b/mono/benchmark/initlocals.cs
new file mode 100644
index 00000000000..dc7b3737dc2
--- /dev/null
+++ b/mono/benchmark/initlocals.cs
@@ -0,0 +1,33 @@
+// Foo() benefits from definite assignment analysis
+
+using System;
+
+class Test {
+	static void Foo () {
+		int a, b, c, d, e, f, g;
+		int h, i, j, k, l, m, n;
+
+		for (int x = 0; x < 2; ++x) {
+			a = 0;
+			b = a;
+			c = a;
+			d = b;
+			e = c;
+			f = 1;
+			g = 2;
+			h = a + b;
+			i = h + h;
+			j = 1 + b + c;
+			k = i + j;
+			l = f + g;
+			m = k + l;
+			n = l + l;
+		}
+	}
+		
+
+	static void Main () {
+		for (int i = 0; i < 100000000; ++ i)
+			Foo ();
+	}
+}
diff --git a/mono/benchmark/inline1.cs b/mono/benchmark/inline1.cs
new file mode 100755
index 00000000000..883a81ddcd1
--- /dev/null
+++ b/mono/benchmark/inline1.cs
@@ -0,0 +1,24 @@
+using System;
+
+public class Test {
+
+	public static void test (int n) {
+	}
+
+	public static int Main (string[] args) {
+		int repeat = 1;
+		
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		for (int i = 0; i < repeat; i++)
+			for (int j = 0; j < 500000000; j++)
+				test (12345);
+		
+		return 0;
+	}
+}
+
+
diff --git a/mono/benchmark/inline2.cs b/mono/benchmark/inline2.cs
new file mode 100644
index 00000000000..548a1e01158
--- /dev/null
+++ b/mono/benchmark/inline2.cs
@@ -0,0 +1,36 @@
+using System;
+
+public class Test {
+
+	public static void test0 () {
+		test1 (0);
+	}
+	public static void test1 (int a) {
+		test2 (0, 1);
+	}
+	public static void test2 (int a, int b) {
+		test3 (0, 1, 2);
+	}
+	public static void test3 (int a, int b, int c) {
+		test4 (0, 1, 2, 3);
+	}
+	public static void test4 (int a, int b, int c, int d) {
+	}
+
+	public static int Main (string[] args) {
+		int repeat = 1;
+		
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		for (int i = 0; i < repeat; i++)
+			for (int j = 0; j < 500000000; j++)
+				test0 ();
+		
+		return 0;
+	}
+}
+
+
diff --git a/mono/benchmark/inline3.cs b/mono/benchmark/inline3.cs
new file mode 100644
index 00000000000..40e8c4445ff
--- /dev/null
+++ b/mono/benchmark/inline3.cs
@@ -0,0 +1,52 @@
+using System;
+
+public class Test {
+
+	public static int test0 ()
+	{
+		return test1 (1);
+	}
+	public static int test1 (int a)
+	{
+		return test2 (a, 2);
+	}
+	
+	public static int test2 (int a, int b)
+	{
+		return test3 (a, b, 3);
+	}
+	
+	public static int test3 (int a, int b, int c)
+	{
+		return test4 (a, b, c, 4);
+	}
+	
+	public static int test4 (int a, int b, int c, int d)
+	{
+		return a + b + c + d;
+	}
+
+	public static int run ()
+	{
+		return test0 ();
+	}
+
+	public static int Main (string[] args) {
+		int repeat = 1;
+		
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		for (int i = 0; i < repeat; i++)
+			for (int j = 0; j < 500000000; j++)
+				if (test0 () != 10)
+					return 1;
+		
+		
+		return 0;
+	}
+}
+
+
diff --git a/mono/benchmark/isinst.cs b/mono/benchmark/isinst.cs
new file mode 100755
index 00000000000..7d5008147ea
--- /dev/null
+++ b/mono/benchmark/isinst.cs
@@ -0,0 +1,24 @@
+using System;
+
+public class Test {
+
+	public static int Main (string[] args) {
+		int repeat = 1;
+
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		object a = new Test ();
+		
+		for (int i = 0; i < (repeat * 5000); i++)
+			for (int j = 0; j < 100000; j++)
+				if (!(a is Test))
+					return 1;
+		
+		return 0;
+	}
+}
+
+
diff --git a/mono/benchmark/life.cs b/mono/benchmark/life.cs
new file mode 100644
index 00000000000..a0c8d5b0be8
--- /dev/null
+++ b/mono/benchmark/life.cs
@@ -0,0 +1,74 @@
+// created on 03/03/2002 at 15:12
+using System;
+
+class App {
+    static String s0, s1, s2, s3, s4, s5, s6, s7, s8, s9, s10, s11, s12, s13, s14, s15;
+    static int[] offsets = {-16, -15, -14, -1, 1, 14, 15, 16};
+    public static int Main(String[] args) {
+	    int i2 = 500;
+	    int i0;
+	    double n2;
+	    DateTime start, end;
+	    start = DateTime.Now;
+	s0 = "               ";

+	s1 = "               ";

+	s2 = "               ";

+	s3 = "      ***      ";

+	s4 = "               ";

+	s5 = "               ";

+	s6 = "         *     ";

+	s7 = "         *     ";

+	s8 = "         *     ";

+	s9 = "     *         ";

+	s10 ="     *         ";

+	s11 ="     *         ";

+	s12 ="               ";

+	s13 ="               ";

+	s14 ="               ";

+	s15 ="";

+	s15 = s0+s1+s2+s3+s4+s5+s6+s7+s8+s9+s10+s11+s12+s13+s14;

+	dump();

+	i0 =0;


+	while (i0++ < i2) {

+		generate();

+		dump();

+	}
        

+	end = DateTime.Now;

+	n2 = (end-start).TotalMilliseconds;

+	Console.WriteLine("{0} generations in {1} milliseconds, {2} gen/sec.",

+	i2, (int)n2, (int)(i2/(n2/1000)));

+	return 0;

+}

    
+static void generate() {

+	int i0, i1, i2, i3;

+	i0 = s15.Length;

+	s1 = "";

+	i1 = 0;

+	do {

+		i2 = 0;

+		foreach (int offset in offsets) {

+			i3 = (offset + i0 + i1) % i0;

+			if (s15.Substring(i3, 1) == "*")

+				i2++;

+		}
            
+		if (s15.Substring(i1, 1) == "*") {

+			if (i2 < 2 || i2 > 3) {

+				s1 += " ";

+			} else {

+				s1 += "*";

+			}

+		} else {

+			if (i2 == 3) {

+				s1 += "*";

+			} else {

+				s1 += "*";

+			}

+		}

+	} while (++i1 < i0);

+	s15 = s1;

+}

+static void dump() {

+	;

+}

+}



+
diff --git a/mono/benchmark/logic.cs b/mono/benchmark/logic.cs
new file mode 100755
index 00000000000..f9cdecbf80f
--- /dev/null
+++ b/mono/benchmark/logic.cs
@@ -0,0 +1,89 @@
+/* this code is part of the pnetmark benchmark - i have only done some small
+ * modification
+ */
+
+/*
+ * LogicBenchmark.cs - Implementation of the "LogicBenchmark" class.
+ *
+ * Copyright (C) 2001  Southern Storm Software, Pty Ltd.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */
+
+using System;
+
+public class Logic {
+
+	public static void logic_run ()
+	{
+		int iter;
+
+		// Initialize.
+		bool flag1 = true;
+		bool flag2 = true;
+		bool flag3 = true;
+		bool flag4 = true;
+		bool flag5 = true;
+		bool flag6 = true;
+		bool flag7 = true;
+		bool flag8 = true;
+		bool flag9 = true;
+		bool flag10 = true;
+		bool flag11 = true;
+		bool flag12 = true;
+		bool flag13 = true;
+
+		// First set of tests.
+		for(iter = 0; iter < 2000000; ++iter) {
+			if((flag1 || flag2) && (flag3 || flag4) &&
+			   (flag5 || flag6 || flag7))
+				{
+				flag8 = !flag8;
+				flag9 = !flag9;
+				flag10 = !flag10;
+				flag11 = !flag11;
+				flag12 = !flag12;
+				flag13 = !flag13;
+				flag1 = !flag1;
+				flag2 = !flag2;
+				flag3 = !flag3;
+				flag4 = !flag4;
+				flag5 = !flag5;
+				flag6 = !flag6;
+				flag1 = !flag1;
+				flag2 = !flag2;
+				flag3 = !flag3;
+				flag4 = !flag4;
+				flag5 = !flag5;
+				flag6 = !flag6;
+			}
+		}
+	}
+	
+	public static int Main (string[] args) {
+		int repeat = 1;
+		
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		for (int i = 0; i < (repeat * 50); i++)
+			logic_run ();
+		
+		return 0;
+	}
+}
+
+
diff --git a/mono/benchmark/loops.cs b/mono/benchmark/loops.cs
new file mode 100755
index 00000000000..da009e14e86
--- /dev/null
+++ b/mono/benchmark/loops.cs
@@ -0,0 +1,45 @@
+using System;
+
+public class NestedLoop {
+	static public int nest_test () {
+		int n = 16;
+		int x = 0;
+		int a = n;
+		while (a-- != 0) {
+		    int b = n;
+		    while (b-- != 0) {
+			int c = n;
+			while (c-- != 0) {
+			    int d = n;
+	    		while (d-- != 0) {
+				int e = n;
+				while (e-- != 0) {
+				    int f = n;
+				    while (f-- != 0) {
+					x++;
+				    }
+				}
+	    		}
+			}
+		    }
+		}
+		return x;
+	}
+
+	public static int Main (string[] args) {
+		int repeat = 1;
+		
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		for (int i = 0; i < repeat*10; i++)
+			if (nest_test () != 16777216)
+				return 1;
+		
+		return 0;
+	}
+}
+
+
diff --git a/mono/benchmark/math.cs b/mono/benchmark/math.cs
new file mode 100755
index 00000000000..4ad824275e9
--- /dev/null
+++ b/mono/benchmark/math.cs
@@ -0,0 +1,31 @@
+using System;
+
+public class MulDiv {
+
+	public static double mathtest (int n) {
+		double res = 0;
+
+		for (int j = 0; j < 200000; j++) {
+			res += Math.Sin (j);
+			res += Math.Cos (j);
+		}
+		
+		return res;
+	}
+	
+	public static int Main (string[] args) {
+		int repeat = 1;
+		
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		for (int i = 0; i < (repeat * 50); i++)
+			mathtest (1000);
+		
+		return 0;
+	}
+}
+
+
diff --git a/mono/benchmark/muldiv.cs b/mono/benchmark/muldiv.cs
new file mode 100755
index 00000000000..1b1353e0a8a
--- /dev/null
+++ b/mono/benchmark/muldiv.cs
@@ -0,0 +1,34 @@
+using System;
+
+public class MulDiv {
+
+	public static int muldiv (int n) {
+		int res = n;
+
+		for (int j = 0; j < 1048; j++) {
+			for (int i = 0; i < (n * 4); i++) {
+				n = (n / 256);
+				n++;
+				n = n * 128;
+			}
+		}
+		
+		return res;
+	}
+	
+	public static int Main (string[] args) {
+		int repeat = 1;
+		
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		for (int i = 0; i < (repeat * 50); i++)
+			muldiv (1000);
+		
+		return 0;
+	}
+}
+
+
diff --git a/mono/benchmark/test-driver b/mono/benchmark/test-driver
new file mode 100755
index 00000000000..b62810db1d9
--- /dev/null
+++ b/mono/benchmark/test-driver
@@ -0,0 +1,39 @@
+#!/usr/bin/perl -w
+
+my $interpreter = shift;
+my $test = shift;
+my $output = $test;
+my $stdout = $test.'.stdout';
+my $stderr = $test.'.stderr';
+
+$output =~ s/\.exe$/.output/;
+
+$| = 0;
+print "Testing $test... ";
+
+for ($c = 20 - length ($test); $c > 0; $c--) { print " "; }
+
+my $res = system("/usr/bin/time -o .res -f '%U' $interpreter $test 2>/dev/null 1>$stdout");
+
+if ($res) {
+	printf ("failed $? (%d) signal (%d).\n", $? >> 8, $? & 127);
+	exit (1);
+} elsif (-f $output) {
+	print "failed output.\n" if (read_file ($output) ne read_file ($stdout));
+	exit (1);
+} else {
+        $t = `cat .res`;
+	$t =~ s/\n//;
+	print "pass. $t\n";
+	#unlink ($result);
+}
+exit (0);
+
+sub read_file {
+	local ($/);
+	my $out = shift;
+	open (F, "<$out") || die $!;
+	$out = <F>;
+	close(F);
+	return $out;
+}
diff --git a/mono/benchmark/zipmark.cs b/mono/benchmark/zipmark.cs
new file mode 100644
index 00000000000..30e7037d639
--- /dev/null
+++ b/mono/benchmark/zipmark.cs
@@ -0,0 +1,4068 @@
+// zipmark.cs

+// (This file is the NZipLib sources with a crude benchmark class attached -

+//  2002-15-05 Dan Lewis <dihlewis@yahoo.co.uk>)

+// -------------------------------------------------------------------------

+//

+// NZipLib source:

+// Copyright (C) 2001 Mike Krueger

+//

+// This file was translated from java, it was part of the GNU Classpath

+// Copyright (C) 2001 Free Software Foundation, Inc.

+//

+// This program is free software; you can redistribute it and/or

+// modify it under the terms of the GNU General Public License

+// as published by the Free Software Foundation; either version 2

+// of the License, or (at your option) any later version.

+//

+// This program is distributed in the hope that it will be useful,

+// but WITHOUT ANY WARRANTY; without even the implied warranty of

+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

+// GNU General Public License for more details.

+//

+// You should have received a copy of the GNU General Public License

+// along with this program; if not, write to the Free Software

+// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.

+//

+// As a special exception, if you link this library with other files to

+// produce an executable, this library does not by itself cause the

+// resulting executable to be covered by the GNU General Public License.

+// This exception does not however invalidate any other reasons why the

+// executable file might be covered by the GNU General Public License.

+

+using System;

+using System.IO;

+using NZlib.Streams;

+using NZlib.Checksums;

+using NZlib.Compression;

+

+class ZipMark {

+	static int Iterations = 1000;

+	static int BlockSize = 1024;

+

+	public static void Main (string [] args)

+	{

+		if (args.Length == 0 || args.Length > 3) {

+			Console.WriteLine ("Usage: zipmark FILE [ITERATIONS] [BLOCKSIZE]");

+			return;

+		}

+	

+		string filename = args [0];

+		FileInfo file = new FileInfo (filename);

+		if (!file.Exists) {

+			Console.WriteLine ("Couldn't find file {0}", filename);

+			return;

+		}

+

+		FileStream fs = file.OpenRead ();

+

+		byte [] raw = new byte [file.Length];

+		int count = fs.Read (raw, 0, (int)file.Length);

+		fs.Close ();

+

+		if (count != file.Length) {

+			Console.WriteLine ("Couldn't read file {0}", filename);

+			return;

+		}

+

+		Deflater def = new Deflater (Deflater.BEST_COMPRESSION, false);

+		Inflater inf = new Inflater (false);

+

+		// 1. Count deflated size

+

+		int cooked_size = Deflate (def, raw, null);

+		byte [] cooked = new byte [cooked_size];

+

+		// 2. Deflate & Inflate

+

+		if (args.Length > 1)

+			Iterations = Int32.Parse (args [1]);

+		if (args.Length > 2)

+			BlockSize = Int32.Parse (args [2]);

+

+		for (int i = 0; i < Iterations; ++ i) {

+			Deflate (def, raw, cooked);

+			Inflate (inf, cooked, raw);

+		}

+

+		return;

+	}

+

+	static int Deflate (Deflater def, byte [] src, byte [] dest)

+	{

+		bool count;

+		int offset, length, remain;

+		

+		if (dest == null) {

+			dest = new byte [BlockSize];

+			count = true;

+		} else

+			count = false;

+		

+		def.Reset ();

+		def.SetInput (src);

+

+		offset = 0;

+		while (!def.IsFinished) {

+			if (def.IsNeedingInput)

+				def.Finish ();

+

+			remain = Math.Min (dest.Length - offset, BlockSize);

+			if (remain == 0)

+				break;

+

+			length = def.Deflate (dest, offset, remain);

+			if (!count)

+				offset += length;

+		}

+

+		return def.TotalOut;

+	}

+

+	static int Inflate (Inflater inf, byte [] src, byte [] dest)

+	{

+		int offset, length, remain;

+	

+		inf.Reset ();

+		inf.SetInput (src);

+

+		offset = 0;

+		while (!inf.IsNeedingInput) {

+			remain = Math.Min (dest.Length - offset, BlockSize);

+			if (remain == 0)

+				break;

+

+			length = inf.Inflate (dest, offset, remain);

+			offset += length;

+		}

+

+		return inf.TotalOut;

+	}

+}

+

+// ----------------------  NZipLib sources from here on --------------------------

+

+namespace NZlib.Compression {

+	

+	/// <summary>

+	/// This is the Deflater class.  The deflater class compresses input

+	/// with the deflate algorithm described in RFC 1951.  It has several

+	/// compression levels and three different strategies described below.

+	///

+	/// This class is <i>not</i> thread safe.  This is inherent in the API, due

+	/// to the split of deflate and setInput.

+	/// 

+	/// author of the original java version : Jochen Hoenicke

+	/// </summary>

+	public class Deflater

+	{

+		/// <summary>

+		/// The best and slowest compression level.  This tries to find very

+		/// long and distant string repetitions.

+		/// </summary>

+		public static  int BEST_COMPRESSION = 9;

+		

+		/// <summary>

+		/// The worst but fastest compression level.

+		/// </summary>

+		public static  int BEST_SPEED = 1;

+		

+		/// <summary>

+		/// The default compression level.

+		/// </summary>

+		public static  int DEFAULT_COMPRESSION = -1;

+		

+		/// <summary>

+		/// This level won't compress at all but output uncompressed blocks.

+		/// </summary>

+		public static  int NO_COMPRESSION = 0;

+		

+		/// <summary>

+		/// The default strategy.

+		/// </summary>

+		public static  int DEFAULT_STRATEGY = 0;

+		

+		

+		/// <summary>

+		/// This strategy will only allow longer string repetitions.  It is

+		/// useful for random data with a small character set.

+		/// </summary>

+		public static  int FILTERED = 1;

+		

+		/// <summary>

+		/// This strategy will not look for string repetitions at all.  It

+		/// only encodes with Huffman trees (which means, that more common

+		/// characters get a smaller encoding.

+		/// </summary>

+		public static  int HUFFMAN_ONLY = 2;

+		

+		/// <summary>

+		/// The compression method.  This is the only method supported so far.

+		/// There is no need to use this constant at all.

+		/// </summary>

+		public static  int DEFLATED = 8;

+		

+		/*

+		* The Deflater can do the following state transitions:

+			*

+			* (1) -> INIT_STATE   ----> INIT_FINISHING_STATE ---.

+			*        /  | (2)      (5)                         |

+			*       /   v          (5)                         |

+			*   (3)| SETDICT_STATE ---> SETDICT_FINISHING_STATE |(3)

+			*       \   | (3)                 |        ,-------'

+			*        |  |                     | (3)   /

+			*        v  v          (5)        v      v

+			* (1) -> BUSY_STATE   ----> FINISHING_STATE

+			*                                | (6)

+			*                                v

+			*                           FINISHED_STATE

+			*    \_____________________________________/

+			*          | (7)

+			*          v

+			*        CLOSED_STATE

+			*

+			* (1) If we should produce a header we start in INIT_STATE, otherwise

+			*     we start in BUSY_STATE.

+			* (2) A dictionary may be set only when we are in INIT_STATE, then

+			*     we change the state as indicated.

+			* (3) Whether a dictionary is set or not, on the first call of deflate

+			*     we change to BUSY_STATE.

+			* (4) -- intentionally left blank -- :)

+			* (5) FINISHING_STATE is entered, when flush() is called to indicate that

+			*     there is no more INPUT.  There are also states indicating, that

+			*     the header wasn't written yet.

+			* (6) FINISHED_STATE is entered, when everything has been flushed to the

+			*     internal pending output buffer.

+			* (7) At any time (7)

+			*

+			*/

+			

+		private static  int IS_SETDICT              = 0x01;

+		private static  int IS_FLUSHING             = 0x04;

+		private static  int IS_FINISHING            = 0x08;

+		

+		private static  int INIT_STATE              = 0x00;

+		private static  int SETDICT_STATE           = 0x01;

+//		private static  int INIT_FINISHING_STATE    = 0x08;

+//		private static  int SETDICT_FINISHING_STATE = 0x09;

+		private static  int BUSY_STATE              = 0x10;

+		private static  int FLUSHING_STATE          = 0x14;

+		private static  int FINISHING_STATE         = 0x1c;

+		private static  int FINISHED_STATE          = 0x1e;

+		private static  int CLOSED_STATE            = 0x7f;

+		

+		/// <summary>

+		/// Compression level.

+		/// </summary>

+		private int level;

+		

+		/// <summary>

+		/// should we include a header.

+		/// </summary>

+		private bool noHeader;

+		

+//		/// <summary>

+//		/// Compression strategy.

+//		/// </summary>

+//		private int strategy;

+		

+		/// <summary>

+		/// The current state.

+		/// </summary>

+		private int state;

+		

+		/// <summary>

+		/// The total bytes of output written.

+		/// </summary>

+		private int totalOut;

+		

+		/// <summary>

+		/// The pending output.

+		/// </summary>

+		private DeflaterPending pending;

+		

+		/// <summary>

+		/// The deflater engine.

+		/// </summary>

+		private DeflaterEngine engine;

+		

+		/// <summary>

+		/// Creates a new deflater with default compression level.

+		/// </summary>

+		public Deflater() : this(DEFAULT_COMPRESSION, false)

+		{

+			

+		}

+		

+		/// <summary>

+		/// Creates a new deflater with given compression level.

+		/// </summary>

+		/// <param name="lvl">

+		/// the compression level, a value between NO_COMPRESSION

+		/// and BEST_COMPRESSION, or DEFAULT_COMPRESSION.

+		/// </param>

+		/// <exception cref="System.ArgumentOutOfRangeException">if lvl is out of range.</exception>

+		public Deflater(int lvl) : this(lvl, false)

+		{

+			

+		}

+		

+		/// <summary>

+		/// Creates a new deflater with given compression level.

+		/// </summary>

+		/// <param name="lvl">

+		/// the compression level, a value between NO_COMPRESSION

+		/// and BEST_COMPRESSION.

+		/// </param>

+		/// <param name="nowrap">

+		/// true, if we should suppress the deflate header at the

+		/// beginning and the adler checksum at the end of the output.  This is

+		/// useful for the GZIP format.

+		/// </param>

+		/// <exception cref="System.ArgumentOutOfRangeException">if lvl is out of range.</exception>

+		public Deflater(int lvl, bool nowrap)

+		{

+			if (lvl == DEFAULT_COMPRESSION) {

+				lvl = 6;

+			} else if (lvl < NO_COMPRESSION || lvl > BEST_COMPRESSION) {

+				throw new ArgumentOutOfRangeException("lvl");

+			}

+			

+			pending = new DeflaterPending();

+			engine = new DeflaterEngine(pending);

+			this.noHeader = nowrap;

+			SetStrategy(DEFAULT_STRATEGY);

+			SetLevel(lvl);

+			Reset();

+		}

+		

+		

+		/// <summary>

+		/// Resets the deflater.  The deflater acts afterwards as if it was

+		/// just created with the same compression level and strategy as it

+		/// had before.

+		/// </summary>

+		public void Reset()

+		{

+			state = (noHeader ? BUSY_STATE : INIT_STATE);

+			totalOut = 0;

+			pending.Reset();

+			engine.Reset();

+		}

+		

+		/// <summary>

+		/// Gets the current adler checksum of the data that was processed so far.

+		/// </summary>

+		public int Adler {

+			get {

+				return engine.Adler;

+			}

+		}

+		

+		/// <summary>

+		/// Gets the number of input bytes processed so far.

+		/// </summary>

+		public int TotalIn {

+			get {

+				return engine.TotalIn;

+			}

+		}

+		

+		/// <summary>

+		/// Gets the number of output bytes so far.

+		/// </summary>

+		public int TotalOut {

+			get {

+				return totalOut;

+			}

+		}

+		

+		/// <summary>

+		/// Flushes the current input block.  Further calls to deflate() will

+		/// produce enough output to inflate everything in the current input

+		/// block.  This is not part of Sun's JDK so I have made it package

+		/// private.  It is used by DeflaterOutputStream to implement

+		/// flush().

+		/// </summary>

+		public void Flush() 

+		{

+			state |= IS_FLUSHING;

+		}

+		

+		/// <summary>

+		/// Finishes the deflater with the current input block.  It is an error

+		/// to give more input after this method was called.  This method must

+		/// be called to force all bytes to be flushed.

+		/// </summary>

+		public void Finish() 

+		{

+			state |= IS_FLUSHING | IS_FINISHING;

+		}

+		

+		/// <summary>

+		/// Returns true if the stream was finished and no more output bytes

+		/// are available.

+		/// </summary>

+		public bool IsFinished {

+			get {

+				return state == FINISHED_STATE && pending.IsFlushed;

+			}

+		}

+		

+		/// <summary>

+		/// Returns true, if the input buffer is empty.

+		/// You should then call setInput(). 

+		/// NOTE: This method can also return true when the stream

+		/// was finished.

+		/// </summary>

+		public bool IsNeedingInput {

+			get {

+				return engine.NeedsInput();

+			}

+		}

+		

+		/// <summary>

+		/// Sets the data which should be compressed next.  This should be only

+		/// called when needsInput indicates that more input is needed.

+		/// If you call setInput when needsInput() returns false, the

+		/// previous input that is still pending will be thrown away.

+		/// The given byte array should not be changed, before needsInput() returns

+		/// true again.

+		/// This call is equivalent to <code>setInput(input, 0, input.length)</code>.

+		/// </summary>

+		/// <param name="input">

+		/// the buffer containing the input data.

+		/// </param>

+		/// <exception cref="System.InvalidOperationException">

+		/// if the buffer was finished() or ended().

+		/// </exception>

+		public void SetInput(byte[] input)

+		{

+			SetInput(input, 0, input.Length);

+		}

+		

+		/// <summary>

+		/// Sets the data which should be compressed next.  This should be

+		/// only called when needsInput indicates that more input is needed.

+		/// The given byte array should not be changed, before needsInput() returns

+		/// true again.

+		/// </summary>

+		/// <param name="input">

+		/// the buffer containing the input data.

+		/// </param>

+		/// <param name="off">

+		/// the start of the data.

+		/// </param>

+		/// <param name="len">

+		/// the length of the data.

+		/// </param>

+		/// <exception cref="System.InvalidOperationException">

+		/// if the buffer was finished() or ended() or if previous input is still pending.

+		/// </exception>

+		public void SetInput(byte[] input, int off, int len)

+		{

+			if ((state & IS_FINISHING) != 0) {

+				throw new InvalidOperationException("finish()/end() already called");

+			}

+			engine.SetInput(input, off, len);

+		}

+		

+		/// <summary>

+		/// Sets the compression level.  There is no guarantee of the exact

+		/// position of the change, but if you call this when needsInput is

+		/// true the change of compression level will occur somewhere near

+		/// before the end of the so far given input.

+		/// </summary>

+		/// <param name="lvl">

+		/// the new compression level.

+		/// </param>

+		public void SetLevel(int lvl)

+		{

+			if (lvl == DEFAULT_COMPRESSION) {

+				lvl = 6;

+			} else if (lvl < NO_COMPRESSION || lvl > BEST_COMPRESSION) {

+				throw new ArgumentOutOfRangeException("lvl");

+			}

+			

+			

+			if (level != lvl) {

+				level = lvl;

+				engine.SetLevel(lvl);

+			}

+		}

+		

+		/// <summary>

+		/// Sets the compression strategy. Strategy is one of

+		/// DEFAULT_STRATEGY, HUFFMAN_ONLY and FILTERED.  For the exact

+		/// position where the strategy is changed, the same as for

+		/// setLevel() applies.

+		/// </summary>

+		/// <param name="stgy">

+		/// the new compression strategy.

+		/// </param>

+		public void SetStrategy(int stgy)

+		{

+			if (stgy != DEFAULT_STRATEGY && stgy != FILTERED && stgy != HUFFMAN_ONLY) {

+			    throw new Exception();

+			}

+			engine.Strategy = stgy;

+		}

+		

+		/// <summary>

+		/// Deflates the current input block to the given array.  It returns

+		/// the number of bytes compressed, or 0 if either

+		/// needsInput() or finished() returns true or length is zero.

+		/// </summary>

+		/// <param name="output">

+		/// the buffer where to write the compressed data.

+		/// </param>

+		public int Deflate(byte[] output)

+		{

+			return Deflate(output, 0, output.Length);

+		}

+		

+		/// <summary>

+		/// Deflates the current input block to the given array.  It returns

+		/// the number of bytes compressed, or 0 if either

+		/// needsInput() or finished() returns true or length is zero.

+		/// </summary>

+		/// <param name="output">

+		/// the buffer where to write the compressed data.

+		/// </param>

+		/// <param name="offset">

+		/// the offset into the output array.

+		/// </param>

+		/// <param name="length">

+		/// the maximum number of bytes that may be written.

+		/// </param>

+		/// <exception cref="System.InvalidOperationException">

+		/// if end() was called.

+		/// </exception>

+		/// <exception cref="System.ArgumentOutOfRangeException">

+		/// if offset and/or length don't match the array length.

+		/// </exception>

+		public int Deflate(byte[] output, int offset, int length)

+		{

+			int origLength = length;

+			

+			if (state == CLOSED_STATE) {

+				throw new InvalidOperationException("Deflater closed");

+			}

+			

+			if (state < BUSY_STATE) {

+				/* output header */

+				int header = (DEFLATED +

+				              ((DeflaterConstants.MAX_WBITS - 8) << 4)) << 8;

+				int level_flags = (level - 1) >> 1;

+				if (level_flags < 0 || level_flags > 3) {

+					level_flags = 3;

+				}

+				header |= level_flags << 6;

+				if ((state & IS_SETDICT) != 0) {

+					/* Dictionary was set */

+					header |= DeflaterConstants.PRESET_DICT;

+				}

+				header += 31 - (header % 31);

+				

+				

+				pending.WriteShortMSB(header);

+				if ((state & IS_SETDICT) != 0) {

+					int chksum = engine.Adler;

+					engine.ResetAdler();

+					pending.WriteShortMSB(chksum >> 16);

+					pending.WriteShortMSB(chksum & 0xffff);

+				}

+				

+				state = BUSY_STATE | (state & (IS_FLUSHING | IS_FINISHING));

+			}

+			

+			for (;;) {

+				int count = pending.Flush(output, offset, length);

+				offset   += count;

+				totalOut += count;

+				length   -= count;

+				

+				if (length == 0 || state == FINISHED_STATE) {

+					break;

+				}

+				

+				if (!engine.Deflate((state & IS_FLUSHING) != 0, (state & IS_FINISHING) != 0)) {

+					if (state == BUSY_STATE) {

+						/* We need more input now */

+						return origLength - length;

+					} else if (state == FLUSHING_STATE) {

+						if (level != NO_COMPRESSION) {

+							/* We have to supply some lookahead.  8 bit lookahead

+							 * are needed by the zlib inflater, and we must fill

+							 * the next byte, so that all bits are flushed.

+							 */

+							int neededbits = 8 + ((-pending.BitCount) & 7);

+							while (neededbits > 0) {

+								/* write a static tree block consisting solely of

+								 * an EOF:

+								 */

+								pending.WriteBits(2, 10);

+								neededbits -= 10;

+							}

+						}

+						state = BUSY_STATE;

+					} else if (state == FINISHING_STATE) {

+						pending.AlignToByte();

+						/* We have completed the stream */

+						if (!noHeader) {

+							int adler = engine.Adler;

+							pending.WriteShortMSB(adler >> 16);

+							pending.WriteShortMSB(adler & 0xffff);

+						}

+						state = FINISHED_STATE;

+					}

+				}

+			}

+			return origLength - length;

+		}

+		

+		/// <summary>

+		/// Sets the dictionary which should be used in the deflate process.

+		/// This call is equivalent to <code>setDictionary(dict, 0, dict.Length)</code>.

+		/// </summary>

+		/// <param name="dict">

+		/// the dictionary.

+		/// </param>

+		/// <exception cref="System.InvalidOperationException">

+		/// if setInput () or deflate () were already called or another dictionary was already set.

+		/// </exception>

+		public void SetDictionary(byte[] dict)

+		{

+			SetDictionary(dict, 0, dict.Length);

+		}

+		

+		/// <summary>

+		/// Sets the dictionary which should be used in the deflate process.

+		/// The dictionary should be a byte array containing strings that are

+		/// likely to occur in the data which should be compressed.  The

+		/// dictionary is not stored in the compressed output, only a

+		/// checksum.  To decompress the output you need to supply the same

+		/// dictionary again.

+		/// </summary>

+		/// <param name="dict">

+		/// the dictionary.

+		/// </param>

+		/// <param name="offset">

+		/// an offset into the dictionary.

+		/// </param>

+		/// <param name="length">

+		/// the length of the dictionary.

+		/// </param>

+		/// <exception cref="System.InvalidOperationException">

+		/// if setInput () or deflate () were already called or another dictionary was already set.

+		/// </exception>

+		public void SetDictionary(byte[] dict, int offset, int length)

+		{

+			if (state != INIT_STATE) {

+				throw new InvalidOperationException();

+			}

+			

+			state = SETDICT_STATE;

+			engine.SetDictionary(dict, offset, length);

+		}

+	}

+}

+

+namespace NZlib.Compression {

+	

+	/// <summary>

+	/// This class contains constants used for the deflater.

+	/// </summary>

+	public class DeflaterConstants 

+	{

+		public const bool DEBUGGING = false;

+		

+		public const int STORED_BLOCK = 0;

+		public const int STATIC_TREES = 1;

+		public const int DYN_TREES    = 2;

+		public const int PRESET_DICT  = 0x20;

+		

+		public const int DEFAULT_MEM_LEVEL = 8;

+		

+		public const int MAX_MATCH = 258;

+		public const int MIN_MATCH = 3;

+		

+		public const int MAX_WBITS = 15;

+		public const int WSIZE = 1 << MAX_WBITS;

+		public const int WMASK = WSIZE - 1;

+		

+		public const int HASH_BITS = DEFAULT_MEM_LEVEL + 7;

+		public const int HASH_SIZE = 1 << HASH_BITS;

+		public const int HASH_MASK = HASH_SIZE - 1;

+		public const int HASH_SHIFT = (HASH_BITS + MIN_MATCH - 1) / MIN_MATCH;

+		

+		public const int MIN_LOOKAHEAD = MAX_MATCH + MIN_MATCH + 1;

+		public const int MAX_DIST = WSIZE - MIN_LOOKAHEAD;

+		

+		public const int PENDING_BUF_SIZE = 1 << (DEFAULT_MEM_LEVEL + 8);

+		public static int MAX_BLOCK_SIZE = Math.Min(65535, PENDING_BUF_SIZE-5);

+		

+		public const int DEFLATE_STORED = 0;

+		public const int DEFLATE_FAST   = 1;

+		public const int DEFLATE_SLOW   = 2;

+		

+		public static int[] GOOD_LENGTH = { 0, 4, 4, 4, 4, 8,  8,  8,  32,  32 };

+		public static int[] MAX_LAZY    = { 0, 4, 5, 6, 4,16, 16, 32, 128, 258 };

+		public static int[] NICE_LENGTH = { 0, 8,16,32,16,32,128,128, 258, 258 };

+		public static int[] MAX_CHAIN   = { 0, 4, 8,32,16,32,128,256,1024,4096 };

+		public static int[] COMPR_FUNC  = { 0, 1, 1, 1, 1, 2,  2,  2,   2,   2 };

+	}

+}

+

+namespace NZlib.Compression {

+	

+	public class DeflaterEngine : DeflaterConstants 

+	{

+		private  static int TOO_FAR = 4096;

+		

+		private int ins_h;

+//		private byte[] buffer;

+		private short[] head;

+		private short[] prev;

+		

+		private int matchStart, matchLen;

+		private bool prevAvailable;

+		private int blockStart;

+		private int strstart, lookahead;

+		private byte[] window;

+		

+		private int strategy, max_chain, max_lazy, niceLength, goodLength;

+		

+		/// <summary>

+		/// The current compression function.

+		/// </summary>

+		private int comprFunc;

+		

+		/// <summary>

+		/// The input data for compression.

+		/// </summary>

+		private byte[] inputBuf;

+		

+		/// <summary>

+		/// The total bytes of input read.

+		/// </summary>

+		private int totalIn;

+		

+		/// <summary>

+		/// The offset into inputBuf, where input data starts.

+		/// </summary>

+		private int inputOff;

+		

+		/// <summary>

+		/// The end offset of the input data.

+		/// </summary>

+		private int inputEnd;

+		

+		private DeflaterPending pending;

+		private DeflaterHuffman huffman;

+		

+		/// <summary>

+		/// The adler checksum

+		/// </summary>

+		private Adler32 adler;

+		

+		public DeflaterEngine(DeflaterPending pending) 

+		{

+			this.pending = pending;

+			huffman = new DeflaterHuffman(pending);

+			adler = new Adler32();

+			

+			window = new byte[2*WSIZE];

+			head   = new short[HASH_SIZE];

+			prev   = new short[WSIZE];

+			

+			/* We start at index 1, to avoid a implementation deficiency, that

+			* we cannot build a repeat pattern at index 0.

+			*/

+			blockStart = strstart = 1;

+		}

+		

+		public void Reset()

+		{

+			huffman.Reset();

+			adler.Reset();

+			blockStart = strstart = 1;

+			lookahead = 0;

+			totalIn   = 0;

+			prevAvailable = false;

+			matchLen = MIN_MATCH - 1;

+			

+			for (int i = 0; i < HASH_SIZE; i++) {

+				head[i] = 0;

+			}

+			

+			for (int i = 0; i < WSIZE; i++) {

+				prev[i] = 0;

+			}

+		}

+		

+		public void ResetAdler()

+		{

+			adler.Reset();

+		}

+		

+		public int Adler {

+			get {

+				return (int)adler.Value;

+			}

+		}

+		

+		public int TotalIn {

+			get {

+				return totalIn;

+			}

+		}

+		

+		public int Strategy {

+			get {

+				return strategy;

+			}

+			set {

+				strategy = value;

+			}

+		}

+		

+		public void SetLevel(int lvl)

+		{

+			goodLength = DeflaterConstants.GOOD_LENGTH[lvl];

+			max_lazy   = DeflaterConstants.MAX_LAZY[lvl];

+			niceLength = DeflaterConstants.NICE_LENGTH[lvl];

+			max_chain  = DeflaterConstants.MAX_CHAIN[lvl];

+			

+			if (DeflaterConstants.COMPR_FUNC[lvl] != comprFunc) {

+//				if (DeflaterConstants.DEBUGGING) {

+//					Console.WriteLine("Change from "+comprFunc +" to "

+//					                  + DeflaterConstants.COMPR_FUNC[lvl]);

+//				}

+				switch (comprFunc) {

+					case DEFLATE_STORED:

+						if (strstart > blockStart) {

+							huffman.FlushStoredBlock(window, blockStart,

+							                         strstart - blockStart, false);

+							blockStart = strstart;

+						}

+						UpdateHash();

+						break;

+					case DEFLATE_FAST:

+						if (strstart > blockStart) {

+							huffman.FlushBlock(window, blockStart, strstart - blockStart,

+							                   false);

+							blockStart = strstart;

+						}

+						break;

+					case DEFLATE_SLOW:

+						if (prevAvailable) {

+							huffman.TallyLit(window[strstart-1] & 0xff);

+						}

+						if (strstart > blockStart) {

+							huffman.FlushBlock(window, blockStart, strstart - blockStart,

+							                   false);

+							blockStart = strstart;

+						}

+						prevAvailable = false;

+						matchLen = MIN_MATCH - 1;

+						break;

+				}

+				comprFunc = COMPR_FUNC[lvl];

+			}

+		}

+		

+		private void UpdateHash() 

+		{

+//			if (DEBUGGING) {

+//				Console.WriteLine("updateHash: "+strstart);

+//			}

+			ins_h = (window[strstart] << HASH_SHIFT) ^ window[strstart + 1];

+		}

+		

+		private int InsertString() 

+		{

+			short match;

+			int hash = ((ins_h << HASH_SHIFT) ^ window[strstart + (MIN_MATCH -1)]) & HASH_MASK;

+			

+//			if (DEBUGGING) {

+//				if (hash != (((window[strstart] << (2*HASH_SHIFT)) ^ 

+//				              (window[strstart + 1] << HASH_SHIFT) ^ 

+//				              (window[strstart + 2])) & HASH_MASK)) {

+//						throw new Exception("hash inconsistent: "+hash+"/"

+//						                    +window[strstart]+","

+//						                    +window[strstart+1]+","

+//						                    +window[strstart+2]+","+HASH_SHIFT);

+//					}

+//			}

+			

+			prev[strstart & WMASK] = match = head[hash];

+			head[hash] = (short)strstart;

+			ins_h = hash;

+			return match & 0xffff;

+		}

+		

+		public void FillWindow()

+		{

+			while (lookahead < DeflaterConstants.MIN_LOOKAHEAD && inputOff < inputEnd) {

+				int more = 2*WSIZE - lookahead - strstart;

+				

+				/* If the window is almost full and there is insufficient lookahead,

+				* move the upper half to the lower one to make room in the upper half.

+				*/

+				if (strstart >= WSIZE + MAX_DIST) {

+					System.Array.Copy(window, WSIZE, window, 0, WSIZE);

+					matchStart -= WSIZE;

+					strstart -= WSIZE;

+					blockStart -= WSIZE;

+					

+					/* Slide the hash table (could be avoided with 32 bit values

+					 * at the expense of memory usage).

+					 */

+					 for (int i = 0; i < HASH_SIZE; i++) {

+					 	int m = head[i];

+					 	head[i] = m >= WSIZE ? (short) (m - WSIZE) : (short)0;

+					 }

+					 more += WSIZE;

+				}

+				

+				if (more > inputEnd - inputOff) {

+					more = inputEnd - inputOff;

+				}

+				

+				System.Array.Copy(inputBuf, inputOff, window, strstart + lookahead, more);

+				adler.Update(inputBuf, inputOff, more);

+				inputOff  += more;

+				totalIn   += more;

+				lookahead += more;

+				

+				if (lookahead >= MIN_MATCH) {

+					UpdateHash();

+				}

+			}

+		}

+		

+		private bool FindLongestMatch(int curMatch) 

+		{

+			int chainLength = this.max_chain;

+			int niceLength  = this.niceLength;

+			short[] prev    = this.prev;

+			int scan        = this.strstart;

+			int match;

+			int best_end = this.strstart + matchLen;

+			int best_len = Math.Max(matchLen, MIN_MATCH - 1);

+			

+			int limit = Math.Max(strstart - MAX_DIST, 0);

+			

+			int strend = strstart + MAX_MATCH - 1;

+			byte scan_end1 = window[best_end - 1];

+			byte scan_end  = window[best_end];

+			

+			/* Do not waste too much time if we already have a good match: */

+			if (best_len >= this.goodLength) {

+				chainLength >>= 2;

+			}

+			

+			/* Do not look for matches beyond the end of the input. This is necessary

+			* to make deflate deterministic.

+			*/

+			if (niceLength > lookahead) {

+				niceLength = lookahead;

+			}

+			

+			if (DeflaterConstants.DEBUGGING && strstart > 2*WSIZE - MIN_LOOKAHEAD) {

+			    throw new InvalidOperationException("need lookahead");

+			}

+			

+			do {

+				if (DeflaterConstants.DEBUGGING && curMatch >= strstart) {

+					throw new InvalidOperationException("future match");

+				}

+				if (window[curMatch + best_len] != scan_end      || 

+				    window[curMatch + best_len - 1] != scan_end1 || 

+				    window[curMatch] != window[scan]             || 

+				    window[curMatch+1] != window[scan + 1]) {

+				    continue;

+				}

+				

+				match = curMatch + 2;

+				scan += 2;

+				

+				/* We check for insufficient lookahead only every 8th comparison;

+				* the 256th check will be made at strstart+258.

+				*/

+				while (window[++scan] == window[++match] && 

+				       window[++scan] == window[++match] && 

+				       window[++scan] == window[++match] && 

+				       window[++scan] == window[++match] && 

+				       window[++scan] == window[++match] && 

+				       window[++scan] == window[++match] && 

+				       window[++scan] == window[++match] && 

+				       window[++scan] == window[++match] && scan < strend) ;

+				

+				if (scan > best_end) {

+					//  	if (DeflaterConstants.DEBUGGING && ins_h == 0)

+					//  	  System.err.println("Found match: "+curMatch+"-"+(scan-strstart));

+					matchStart = curMatch;

+					best_end = scan;

+					best_len = scan - strstart;

+					if (best_len >= niceLength) {

+						break;

+					}

+					

+					scan_end1  = window[best_end-1];

+					scan_end   = window[best_end];

+				}

+				scan = strstart;

+			} while ((curMatch = (prev[curMatch & WMASK] & 0xffff)) > limit && --chainLength != 0);

+			

+			matchLen = Math.Min(best_len, lookahead);

+			return matchLen >= MIN_MATCH;

+		}

+		

+		public void SetDictionary(byte[] buffer, int offset, int length) 

+		{

+			if (DeflaterConstants.DEBUGGING && strstart != 1) {

+				throw new InvalidOperationException("strstart not 1");

+			}

+			adler.Update(buffer, offset, length);

+			if (length < MIN_MATCH) {

+				return;

+			}

+			if (length > MAX_DIST) {

+				offset += length - MAX_DIST;

+				length = MAX_DIST;

+			}

+			

+			System.Array.Copy(buffer, offset, window, strstart, length);

+			

+			UpdateHash();

+			--length;

+			while (--length > 0) {

+				InsertString();

+				strstart++;

+			}

+			strstart += 2;

+			blockStart = strstart;

+		}

+		

+		private bool DeflateStored(bool flush, bool finish)

+		{

+			if (!flush && lookahead == 0) {

+				return false;

+			}

+			

+			strstart += lookahead;

+			lookahead = 0;

+			

+			int storedLen = strstart - blockStart;

+			

+			if ((storedLen >= DeflaterConstants.MAX_BLOCK_SIZE) || /* Block is full */

+				(blockStart < WSIZE && storedLen >= MAX_DIST) ||   /* Block may move out of window */

+				flush) {

+				bool lastBlock = finish;

+				if (storedLen > DeflaterConstants.MAX_BLOCK_SIZE) {

+					storedLen = DeflaterConstants.MAX_BLOCK_SIZE;

+					lastBlock = false;

+				}

+				

+//				if (DeflaterConstants.DEBUGGING) {

+//					Console.WriteLine("storedBlock["+storedLen+","+lastBlock+"]");

+//				}

+					

+				huffman.FlushStoredBlock(window, blockStart, storedLen, lastBlock);

+				blockStart += storedLen;

+				return !lastBlock;

+			}

+			return true;

+		}

+		

+		private bool DeflateFast(bool flush, bool finish)

+		{

+			if (lookahead < MIN_LOOKAHEAD && !flush) {

+				return false;

+			}

+			

+			while (lookahead >= MIN_LOOKAHEAD || flush) {

+				if (lookahead == 0) {

+					/* We are flushing everything */

+					huffman.FlushBlock(window, blockStart, strstart - blockStart, finish);

+					blockStart = strstart;

+					return false;

+				}

+				

+				int hashHead;

+				if (lookahead >= MIN_MATCH && 

+				    (hashHead = InsertString()) != 0 && 

+				    strategy != Deflater.HUFFMAN_ONLY && 

+				    strstart - hashHead <= MAX_DIST && 

+				    FindLongestMatch(hashHead)) {

+					/* longestMatch sets matchStart and matchLen */

+//					if (DeflaterConstants.DEBUGGING) {

+//						for (int i = 0 ; i < matchLen; i++) {

+//							if (window[strstart+i] != window[matchStart + i]) {

+//								throw new Exception();

+//							}

+//						}

+//					}

+					

+					huffman.TallyDist(strstart - matchStart, matchLen);

+					

+					lookahead -= matchLen;

+					if (matchLen <= max_lazy && lookahead >= MIN_MATCH) {

+						while (--matchLen > 0) {

+							++strstart;

+							InsertString();

+						}

+						++strstart;

+					} else {

+						strstart += matchLen;

+						if (lookahead >= MIN_MATCH - 1) {

+							UpdateHash();

+						}

+					}

+					matchLen = MIN_MATCH - 1;

+					continue;

+				} else {

+					/* No match found */

+					huffman.TallyLit(window[strstart] & 0xff);

+					++strstart;

+					--lookahead;

+				}

+				

+				if (huffman.IsFull()) {

+					bool lastBlock = finish && lookahead == 0;

+					huffman.FlushBlock(window, blockStart, strstart - blockStart,

+					                   lastBlock);

+					blockStart = strstart;

+					return !lastBlock;

+				}

+			}

+			return true;

+		}

+		

+		private bool DeflateSlow(bool flush, bool finish)

+		{

+			if (lookahead < MIN_LOOKAHEAD && !flush) {

+				return false;

+			}

+			

+			while (lookahead >= MIN_LOOKAHEAD || flush) {

+				if (lookahead == 0) {

+					if (prevAvailable) {

+						huffman.TallyLit(window[strstart-1] & 0xff);

+					}

+					prevAvailable = false;

+					

+					/* We are flushing everything */

+					if (DeflaterConstants.DEBUGGING && !flush) {

+						throw new Exception("Not flushing, but no lookahead");

+					}

+					huffman.FlushBlock(window, blockStart, strstart - blockStart,

+					                   finish);

+					blockStart = strstart;

+					return false;

+				}

+				

+				int prevMatch = matchStart;

+				int prevLen = matchLen;

+				if (lookahead >= MIN_MATCH) {

+					int hashHead = InsertString();

+					if (strategy != Deflater.HUFFMAN_ONLY && hashHead != 0 && strstart - hashHead <= MAX_DIST && FindLongestMatch(hashHead))

+						{

+							/* longestMatch sets matchStart and matchLen */

+							

+							/* Discard match if too small and too far away */

+							if (matchLen <= 5 && (strategy == Deflater.FILTERED || (matchLen == MIN_MATCH && strstart - matchStart > TOO_FAR))) {

+								matchLen = MIN_MATCH - 1;

+							}

+						}

+				}

+				

+				/* previous match was better */

+				if (prevLen >= MIN_MATCH && matchLen <= prevLen) {

+//					if (DeflaterConstants.DEBUGGING) {

+//						for (int i = 0 ; i < matchLen; i++) {

+//							if (window[strstart-1+i] != window[prevMatch + i])

+//								throw new Exception();

+//						}

+//					}

+					huffman.TallyDist(strstart - 1 - prevMatch, prevLen);

+					prevLen -= 2;

+					do {

+						strstart++;

+						lookahead--;

+						if (lookahead >= MIN_MATCH) {

+							InsertString();

+						}

+					} while (--prevLen > 0);

+					strstart ++;

+					lookahead--;

+					prevAvailable = false;

+					matchLen = MIN_MATCH - 1;

+				} else {

+					if (prevAvailable) {

+						huffman.TallyLit(window[strstart-1] & 0xff);

+					}

+					prevAvailable = true;

+					strstart++;

+					lookahead--;

+				}

+				

+				if (huffman.IsFull()) {

+					int len = strstart - blockStart;

+					if (prevAvailable) {

+						len--;

+					}

+					bool lastBlock = (finish && lookahead == 0 && !prevAvailable);

+					huffman.FlushBlock(window, blockStart, len, lastBlock);

+					blockStart += len;

+					return !lastBlock;

+				}

+			}

+			return true;

+		}

+		

+		public bool Deflate(bool flush, bool finish)

+		{

+			bool progress;

+			do {

+				FillWindow();

+				bool canFlush = flush && inputOff == inputEnd;

+//				if (DeflaterConstants.DEBUGGING) {

+//					Console.WriteLine("window: ["+blockStart+","+strstart+","

+//					                  +lookahead+"], "+comprFunc+","+canFlush);

+//				}

+				switch (comprFunc) {

+					case DEFLATE_STORED:

+						progress = DeflateStored(canFlush, finish);

+					break;

+					case DEFLATE_FAST:

+						progress = DeflateFast(canFlush, finish);

+					break;

+					case DEFLATE_SLOW:

+						progress = DeflateSlow(canFlush, finish);

+					break;

+					default:

+						throw new InvalidOperationException("unknown comprFunc");

+				}

+			} while (pending.IsFlushed && progress); /* repeat while we have no pending output and progress was made */

+			return progress;

+		}

+		

+		public void SetInput(byte[] buf, int off, int len)

+		{

+			if (inputOff < inputEnd) {

+				throw new InvalidOperationException("Old input was not completely processed");

+			}

+			

+			int end = off + len;

+			

+			/* We want to throw an ArrayIndexOutOfBoundsException early.  The

+			* check is very tricky: it also handles integer wrap around.

+			*/

+			if (0 > off || off > end || end > buf.Length) {

+				throw new ArgumentOutOfRangeException();

+			}

+			

+			inputBuf = buf;

+			inputOff = off;

+			inputEnd = end;

+		}

+		

+		public bool NeedsInput()

+		{

+			return inputEnd == inputOff;

+		}

+	}

+}

+

+namespace NZlib.Compression {

+	

+	/// <summary>

+	/// This is the DeflaterHuffman class.

+	/// 

+	/// This class is <i>not</i> thread safe.  This is inherent in the API, due

+	/// to the split of deflate and setInput.

+	/// 

+	/// author of the original java version : Jochen Hoenicke

+	/// </summary>

+	public class DeflaterHuffman

+	{

+		private static  int BUFSIZE = 1 << (DeflaterConstants.DEFAULT_MEM_LEVEL + 6);

+		private static  int LITERAL_NUM = 286;

+		private static  int DIST_NUM = 30;

+		private static  int BITLEN_NUM = 19;

+		private static  int REP_3_6    = 16;

+		private static  int REP_3_10   = 17;

+		private static  int REP_11_138 = 18;

+		private static  int EOF_SYMBOL = 256;

+		private static  int[] BL_ORDER = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };

+		

+		private static byte[] bit4Reverse = {

+			0,

+			8,

+			4,

+			12,

+			2,

+			10,

+			6,

+			14,

+			1,

+			9,

+			5,

+			13,

+			3,

+			11,

+			7,

+			15

+		};

+		

+		

+		public class Tree 

+		{

+			public short[] freqs;

+			public short[] codes;

+			public byte[]  length;

+			public int[]   bl_counts;

+			public int     minNumCodes, numCodes;

+			public int     maxLength;

+			DeflaterHuffman dh;

+			

+			public Tree(DeflaterHuffman dh, int elems, int minCodes, int maxLength) 

+			{

+				this.dh =  dh;

+				this.minNumCodes = minCodes;

+				this.maxLength  = maxLength;

+				freqs  = new short[elems];

+				bl_counts = new int[maxLength];

+			}

+			

+			public void Reset() 

+			{

+				for (int i = 0; i < freqs.Length; i++) {

+					freqs[i] = 0;

+				}

+				codes = null;

+				length = null;

+			}

+			

+			public void WriteSymbol(int code)

+			{

+//				if (DeflaterConstants.DEBUGGING) {

+//					freqs[code]--;

+//					//  	  Console.Write("writeSymbol("+freqs.length+","+code+"): ");

+//				}

+				dh.pending.WriteBits(codes[code] & 0xffff, length[code]);

+			}

+			

+			public void CheckEmpty()

+			{

+				bool empty = true;

+				for (int i = 0; i < freqs.Length; i++) {

+					if (freqs[i] != 0) {

+						Console.WriteLine("freqs["+i+"] == "+freqs[i]);

+						empty = false;

+					}

+				}

+				if (!empty) {

+					throw new Exception();

+				}

+				Console.WriteLine("checkEmpty suceeded!");

+			}

+			

+			public void SetStaticCodes(short[] stCodes, byte[] stLength)

+			{

+				codes = stCodes;

+				length = stLength;

+			}

+			

+			public void BuildCodes() 

+			{

+				int numSymbols = freqs.Length;

+				int[] nextCode = new int[maxLength];

+				int code = 0;

+				codes = new short[freqs.Length];

+				

+//				if (DeflaterConstants.DEBUGGING) {

+//					Console.WriteLine("buildCodes: "+freqs.Length);

+//				}

+				

+				for (int bits = 0; bits < maxLength; bits++) {

+					nextCode[bits] = code;

+					code += bl_counts[bits] << (15 - bits);

+//					if (DeflaterConstants.DEBUGGING) {

+//						Console.WriteLine("bits: "+(bits+1)+" count: "+bl_counts[bits]

+//						                  +" nextCode: "+code); // HACK : Integer.toHexString(

+//					}

+				}

+				if (DeflaterConstants.DEBUGGING && code != 65536) {

+					throw new Exception("Inconsistent bl_counts!");

+				}

+				

+				for (int i=0; i < numCodes; i++) {

+					int bits = length[i];

+					if (bits > 0) {

+//						if (DeflaterConstants.DEBUGGING) {

+//								Console.WriteLine("codes["+i+"] = rev(" + nextCode[bits-1]+")," // HACK : Integer.toHexString(

+//								                  +bits);

+//						}

+						codes[i] = BitReverse(nextCode[bits-1]);

+						nextCode[bits-1] += 1 << (16 - bits);

+					}

+				}

+			}

+			

+			private void BuildLength(int[] childs)

+			{

+				this.length = new byte [freqs.Length];

+				int numNodes = childs.Length / 2;

+				int numLeafs = (numNodes + 1) / 2;

+				int overflow = 0;

+				

+				for (int i = 0; i < maxLength; i++) {

+					bl_counts[i] = 0;

+				}

+				

+				/* First calculate optimal bit lengths */

+				int[] lengths = new int[numNodes];

+				lengths[numNodes-1] = 0;

+				

+				for (int i = numNodes - 1; i >= 0; i--) {

+					if (childs[2*i+1] != -1) {

+						int bitLength = lengths[i] + 1;

+						if (bitLength > maxLength) {

+							bitLength = maxLength;

+							overflow++;

+						}

+						lengths[childs[2*i]] = lengths[childs[2*i+1]] = bitLength;

+					} else {

+						/* A leaf node */

+						int bitLength = lengths[i];

+						bl_counts[bitLength - 1]++;

+						this.length[childs[2*i]] = (byte) lengths[i];

+					}

+				}

+				

+//				if (DeflaterConstants.DEBUGGING) {

+//					Console.WriteLine("Tree "+freqs.Length+" lengths:");

+//					for (int i=0; i < numLeafs; i++) {

+//						Console.WriteLine("Node "+childs[2*i]+" freq: "+freqs[childs[2*i]]

+//						                  + " len: "+length[childs[2*i]]);

+//					}

+//				}

+				

+				if (overflow == 0) {

+					return;

+				}

+				

+				int incrBitLen = maxLength - 1;

+				do {

+					/* Find the first bit length which could increase: */

+					while (bl_counts[--incrBitLen] == 0)

+						;

+					

+					/* Move this node one down and remove a corresponding

+					* amount of overflow nodes.

+					*/

+					do {

+						bl_counts[incrBitLen]--;

+						bl_counts[++incrBitLen]++;

+						overflow -= 1 << (maxLength - 1 - incrBitLen);

+					} while (overflow > 0 && incrBitLen < maxLength - 1);

+				} while (overflow > 0);

+				

+				/* We may have overshot above.  Move some nodes from maxLength to

+				* maxLength-1 in that case.

+				*/

+				bl_counts[maxLength-1] += overflow;

+				bl_counts[maxLength-2] -= overflow;

+				

+				/* Now recompute all bit lengths, scanning in increasing

+				* frequency.  It is simpler to reconstruct all lengths instead of

+				* fixing only the wrong ones. This idea is taken from 'ar'

+				* written by Haruhiko Okumura.

+				*

+				* The nodes were inserted with decreasing frequency into the childs

+				* array.

+				*/

+				int nodePtr = 2 * numLeafs;

+				for (int bits = maxLength; bits != 0; bits--) {

+					int n = bl_counts[bits-1];

+					while (n > 0) {

+						int childPtr = 2*childs[nodePtr++];

+						if (childs[childPtr + 1] == -1) {

+							/* We found another leaf */

+							length[childs[childPtr]] = (byte) bits;

+							n--;

+						}

+					}

+				}

+//				if (DeflaterConstants.DEBUGGING) {

+//					Console.WriteLine("*** After overflow elimination. ***");

+//					for (int i=0; i < numLeafs; i++) {

+//						Console.WriteLine("Node "+childs[2*i]+" freq: "+freqs[childs[2*i]]

+//						                  + " len: "+length[childs[2*i]]);

+//					}

+//				}

+			}

+			

+			public void BuildTree()

+			{

+				int numSymbols = freqs.Length;

+				

+				/* heap is a priority queue, sorted by frequency, least frequent

+				* nodes first.  The heap is a binary tree, with the property, that

+				* the parent node is smaller than both child nodes.  This assures

+				* that the smallest node is the first parent.

+				*

+				* The binary tree is encoded in an array:  0 is root node and

+				* the nodes 2*n+1, 2*n+2 are the child nodes of node n.

+				*/

+				int[] heap = new int[numSymbols];

+				int heapLen = 0;

+				int maxCode = 0;

+				for (int n = 0; n < numSymbols; n++) {

+					int freq = freqs[n];

+					if (freq != 0) {

+						/* Insert n into heap */

+						int pos = heapLen++;

+						int ppos;

+						while (pos > 0 && freqs[heap[ppos = (pos - 1) / 2]] > freq) {

+							heap[pos] = heap[ppos];

+							pos = ppos;

+						}

+						heap[pos] = n;

+						

+						maxCode = n;

+					}

+				}

+				

+				/* We could encode a single literal with 0 bits but then we

+				* don't see the literals.  Therefore we force at least two

+				* literals to avoid this case.  We don't care about order in

+				* this case, both literals get a 1 bit code.

+				*/

+				while (heapLen < 2) {

+					int node = maxCode < 2 ? ++maxCode : 0;

+					heap[heapLen++] = node;

+				}

+				

+				numCodes = Math.Max(maxCode + 1, minNumCodes);

+				

+				int numLeafs = heapLen;

+				int[] childs = new int[4*heapLen - 2];

+				int[] values = new int[2*heapLen - 1];

+				int numNodes = numLeafs;

+				for (int i = 0; i < heapLen; i++) {

+					int node = heap[i];

+					childs[2*i]   = node;

+					childs[2*i+1] = -1;

+					values[i] = freqs[node] << 8;

+					heap[i] = i;

+				}

+				

+				/* Construct the Huffman tree by repeatedly combining the least two

+				* frequent nodes.

+				*/

+				do {

+					int first = heap[0];

+					int last  = heap[--heapLen];

+					

+					/* Propagate the hole to the leafs of the heap */

+					int ppos = 0;

+					int path = 1;

+					while (path < heapLen) {

+						if (path + 1 < heapLen && values[heap[path]] > values[heap[path+1]]) {

+							path++;

+						}

+						

+						heap[ppos] = heap[path];

+						ppos = path;

+						path = path * 2 + 1;

+					}

+					

+					/* Now propagate the last element down along path.  Normally

+					* it shouldn't go too deep.

+					*/

+					int lastVal = values[last];

+					while ((path = ppos) > 0 && values[heap[ppos = (path - 1)/2]] > lastVal) {

+						heap[path] = heap[ppos];

+					}

+					heap[path] = last;

+					

+					

+					int second = heap[0];

+					

+					/* Create a new node father of first and second */

+					last = numNodes++;

+					childs[2*last] = first;

+					childs[2*last+1] = second;

+					int mindepth = Math.Min(values[first] & 0xff, values[second] & 0xff);

+					values[last] = lastVal = values[first] + values[second] - mindepth + 1;

+					

+					/* Again, propagate the hole to the leafs */

+					ppos = 0;

+					path = 1;

+					while (path < heapLen) {

+						if (path + 1 < heapLen && values[heap[path]] > values[heap[path+1]]) {

+							path++;

+						}

+						

+						heap[ppos] = heap[path];

+						ppos = path;

+						path = ppos * 2 + 1;

+					}

+					

+					/* Now propagate the new element down along path */

+					while ((path = ppos) > 0 && values[heap[ppos = (path - 1)/2]] > lastVal) {

+						heap[path] = heap[ppos];

+					}

+					heap[path] = last;

+				} while (heapLen > 1);

+				

+				if (heap[0] != childs.Length / 2 - 1) {

+					throw new Exception("Weird!");

+				}

+				BuildLength(childs);

+			}

+			

+			public int GetEncodedLength()

+			{

+				int len = 0;

+				for (int i = 0; i < freqs.Length; i++) {

+					len += freqs[i] * length[i];

+				}

+				return len;

+			}

+			

+			public void CalcBLFreq(Tree blTree) 

+			{

+				int max_count;               /* max repeat count */

+				int min_count;               /* min repeat count */

+				int count;                   /* repeat count of the current code */

+				int curlen = -1;             /* length of current code */

+				

+				int i = 0;

+				while (i < numCodes) {

+					count = 1;

+					int nextlen = length[i];

+					if (nextlen == 0) {

+						max_count = 138;

+						min_count = 3;

+					} else {

+						max_count = 6;

+						min_count = 3;

+						if (curlen != nextlen) {

+							blTree.freqs[nextlen]++;

+							count = 0;

+						}

+					}

+					curlen = nextlen;

+					i++;

+					

+					while (i < numCodes && curlen == length[i]) {

+						i++;

+						if (++count >= max_count) {

+							break;

+						}

+					}

+					

+					if (count < min_count) {

+						blTree.freqs[curlen] += (short)count;

+					} else if (curlen != 0) {

+						blTree.freqs[REP_3_6]++;

+					} else if (count <= 10) {

+						blTree.freqs[REP_3_10]++;

+					} else {

+						blTree.freqs[REP_11_138]++;

+					}

+				}

+			}

+			

+			public void WriteTree(Tree blTree)

+			{

+				int max_count;               /* max repeat count */

+				int min_count;               /* min repeat count */

+				int count;                   /* repeat count of the current code */

+				int curlen = -1;             /* length of current code */

+				

+				int i = 0;

+				while (i < numCodes) {

+					count = 1;

+					int nextlen = length[i];

+					if (nextlen == 0) {

+						max_count = 138;

+						min_count = 3;

+					} else {

+						max_count = 6;

+						min_count = 3;

+						if (curlen != nextlen) {

+							blTree.WriteSymbol(nextlen);

+							count = 0;

+						}

+					}

+					curlen = nextlen;

+					i++;

+					

+					while (i < numCodes && curlen == length[i]) {

+						i++;

+						if (++count >= max_count) {

+							break;

+						}

+					}

+					

+					if (count < min_count) {

+						while (count-- > 0) {

+							blTree.WriteSymbol(curlen);

+						}

+					}

+					else if (curlen != 0) {

+						blTree.WriteSymbol(REP_3_6);

+						dh.pending.WriteBits(count - 3, 2);

+					} else if (count <= 10) {

+						blTree.WriteSymbol(REP_3_10);

+						dh.pending.WriteBits(count - 3, 3);

+					} else {

+						blTree.WriteSymbol(REP_11_138);

+						dh.pending.WriteBits(count - 11, 7);

+					}

+				}

+			}

+		}

+		

+		public DeflaterPending pending;

+		private Tree literalTree, distTree, blTree;

+		

+		private short[] d_buf;

+		private byte[] l_buf;

+		private int last_lit;

+		private int extra_bits;

+		

+		private static short[] staticLCodes;

+		private static byte[]  staticLLength;

+		private static short[] staticDCodes;

+		private static byte[]  staticDLength;

+		

+		/// <summary>

+		/// Reverse the bits of a 16 bit value.

+		/// </summary>

+		public static short BitReverse(int value) 

+		{

+			return (short) (bit4Reverse[value & 0xF] << 12

+			                | bit4Reverse[(value >> 4) & 0xF] << 8

+			                | bit4Reverse[(value >> 8) & 0xF] << 4

+			                | bit4Reverse[value >> 12]);

+		}

+		

+		

+		static DeflaterHuffman() 

+		{

+			/* See RFC 1951 3.2.6 */

+			/* Literal codes */

+			staticLCodes = new short[LITERAL_NUM];

+			staticLLength = new byte[LITERAL_NUM];

+			int i = 0;

+			while (i < 144) {

+				staticLCodes[i] = BitReverse((0x030 + i) << 8);

+				staticLLength[i++] = 8;

+			}

+			while (i < 256) {

+				staticLCodes[i] = BitReverse((0x190 - 144 + i) << 7);

+				staticLLength[i++] = 9;

+			}

+			while (i < 280) {

+				staticLCodes[i] = BitReverse((0x000 - 256 + i) << 9);

+				staticLLength[i++] = 7;

+			}

+			while (i < LITERAL_NUM) {

+				staticLCodes[i] = BitReverse((0x0c0 - 280 + i)  << 8);

+				staticLLength[i++] = 8;

+			}

+			

+			/* Distant codes */

+			staticDCodes = new short[DIST_NUM];

+			staticDLength = new byte[DIST_NUM];

+			for (i = 0; i < DIST_NUM; i++) {

+				staticDCodes[i] = BitReverse(i << 11);

+				staticDLength[i] = 5;

+			}

+		}

+		

+		public DeflaterHuffman(DeflaterPending pending)

+		{

+			this.pending = pending;

+			

+			literalTree = new Tree(this, LITERAL_NUM, 257, 15);

+			distTree    = new Tree(this, DIST_NUM, 1, 15);

+			blTree      = new Tree(this, BITLEN_NUM, 4, 7);

+			

+			d_buf = new short[BUFSIZE];

+			l_buf = new byte [BUFSIZE];

+		}

+		

+		public void Reset() 

+		{

+			last_lit = 0;

+			extra_bits = 0;

+			literalTree.Reset();

+			distTree.Reset();

+			blTree.Reset();

+		}

+		

+		private int L_code(int len) 

+		{

+			if (len == 255) {

+				return 285;

+			}

+			

+			int code = 257;

+			while (len >= 8) {

+				code += 4;

+				len >>= 1;

+			}

+			return code + len;

+		}

+		

+		private int D_code(int distance) 

+		{

+			int code = 0;

+			while (distance >= 4) {

+				code += 2;

+				distance >>= 1;

+			}

+			return code + distance;

+		}

+		

+		public void SendAllTrees(int blTreeCodes)

+		{

+			blTree.BuildCodes();

+			literalTree.BuildCodes();

+			distTree.BuildCodes();

+			pending.WriteBits(literalTree.numCodes - 257, 5);

+			pending.WriteBits(distTree.numCodes - 1, 5);

+			pending.WriteBits(blTreeCodes - 4, 4);

+			for (int rank = 0; rank < blTreeCodes; rank++) {

+				pending.WriteBits(blTree.length[BL_ORDER[rank]], 3);

+			}

+			literalTree.WriteTree(blTree);

+			distTree.WriteTree(blTree);

+//			if (DeflaterConstants.DEBUGGING) {

+//				blTree.CheckEmpty();

+//			}

+		}

+		

+		public void CompressBlock()

+		{

+			for (int i = 0; i < last_lit; i++) {

+				int litlen = l_buf[i] & 0xff;

+				int dist = d_buf[i];

+				if (dist-- != 0) {

+//					if (DeflaterConstants.DEBUGGING) {

+//						Console.Write("["+(dist+1)+","+(litlen+3)+"]: ");

+//					}

+					

+					int lc = L_code(litlen);

+					literalTree.WriteSymbol(lc);

+					

+					int bits = (lc - 261) / 4;

+					if (bits > 0 && bits <= 5) {

+						pending.WriteBits(litlen & ((1 << bits) - 1), bits);

+					}

+					

+					int dc = D_code(dist);

+					distTree.WriteSymbol(dc);

+					

+					bits = dc / 2 - 1;

+					if (bits > 0) {

+						pending.WriteBits(dist & ((1 << bits) - 1), bits);

+					}

+				} else {

+//					if (DeflaterConstants.DEBUGGING) {

+//						if (litlen > 32 && litlen < 127) {

+//							Console.Write("("+(char)litlen+"): ");

+//						} else {

+//							Console.Write("{"+litlen+"}: ");

+//						}

+//					}

+					literalTree.WriteSymbol(litlen);

+				}

+			}

+//			if (DeflaterConstants.DEBUGGING) {

+//				Console.Write("EOF: ");

+//			}

+			literalTree.WriteSymbol(EOF_SYMBOL);

+//			if (DeflaterConstants.DEBUGGING) {

+//				literalTree.CheckEmpty();

+//				distTree.CheckEmpty();

+//			}

+		}

+		

+		public void FlushStoredBlock(byte[] stored, int stored_offset, int stored_len, bool lastBlock)

+		{

+//			if (DeflaterConstants.DEBUGGING) {

+//				Console.WriteLine("Flushing stored block "+ stored_len);

+//			}

+			pending.WriteBits((DeflaterConstants.STORED_BLOCK << 1)

+			                  + (lastBlock ? 1 : 0), 3);

+			pending.AlignToByte();

+			pending.WriteShort(stored_len);

+			pending.WriteShort(~stored_len);

+			pending.WriteBlock(stored, stored_offset, stored_len);

+			Reset();

+		}

+		

+		public void FlushBlock(byte[] stored, int stored_offset, int stored_len, bool lastBlock)

+		{

+			literalTree.freqs[EOF_SYMBOL]++;

+			

+			/* Build trees */

+			literalTree.BuildTree();

+			distTree.BuildTree();

+			

+			/* Calculate bitlen frequency */

+			literalTree.CalcBLFreq(blTree);

+			distTree.CalcBLFreq(blTree);

+			

+			/* Build bitlen tree */

+			blTree.BuildTree();

+			

+			int blTreeCodes = 4;

+			for (int i = 18; i > blTreeCodes; i--) {

+				if (blTree.length[BL_ORDER[i]] > 0) {

+					blTreeCodes = i+1;

+				}

+			}

+			int opt_len = 14 + blTreeCodes * 3 + blTree.GetEncodedLength() + 

+			              literalTree.GetEncodedLength() + distTree.GetEncodedLength() + 

+			              extra_bits;

+			

+			int static_len = extra_bits;

+			for (int i = 0; i < LITERAL_NUM; i++) {

+				static_len += literalTree.freqs[i] * staticLLength[i];

+			}

+			for (int i = 0; i < DIST_NUM; i++) {

+				static_len += distTree.freqs[i] * staticDLength[i];

+			}

+			if (opt_len >= static_len) {

+				/* Force static trees */

+				opt_len = static_len;

+			}

+			

+			if (stored_offset >= 0 && stored_len+4 < opt_len >> 3) {

+				/* Store Block */

+//				if (DeflaterConstants.DEBUGGING) {

+//					Console.WriteLine("Storing, since " + stored_len + " < " + opt_len

+//					                  + " <= " + static_len);

+//				}

+				FlushStoredBlock(stored, stored_offset, stored_len, lastBlock);

+			} else if (opt_len == static_len) {

+				/* Encode with static tree */

+				pending.WriteBits((DeflaterConstants.STATIC_TREES << 1) + (lastBlock ? 1 : 0), 3);

+				literalTree.SetStaticCodes(staticLCodes, staticLLength);

+				distTree.SetStaticCodes(staticDCodes, staticDLength);

+				CompressBlock();

+				Reset();

+			} else {

+				/* Encode with dynamic tree */

+				pending.WriteBits((DeflaterConstants.DYN_TREES << 1) + (lastBlock ? 1 : 0), 3);

+				SendAllTrees(blTreeCodes);

+				CompressBlock();

+				Reset();

+			}

+		}

+		

+		public bool IsFull()

+		{

+			return last_lit + 16 >= BUFSIZE; // HACK: This was == 'last_lit == BUFSIZE', but errors occured with DeflateFast

+		}

+		

+		public bool TallyLit(int lit)

+		{

+//			if (DeflaterConstants.DEBUGGING) {

+//				if (lit > 32 && lit < 127) {

+//					Console.WriteLine("("+(char)lit+")");

+//				} else {

+//					Console.WriteLine("{"+lit+"}");

+//				}

+//			}

+			d_buf[last_lit] = 0;

+			l_buf[last_lit++] = (byte)lit;

+			literalTree.freqs[lit]++;

+			return IsFull();

+		}

+		

+		public bool TallyDist(int dist, int len)

+		{

+//			if (DeflaterConstants.DEBUGGING) {

+//				Console.WriteLine("["+dist+","+len+"]");

+//			}

+			

+			d_buf[last_lit]   = (short)dist;

+			l_buf[last_lit++] = (byte)(len - 3);

+			

+			int lc = L_code(len - 3);

+			literalTree.freqs[lc]++;

+			if (lc >= 265 && lc < 285) {

+				extra_bits += (lc - 261) / 4;

+			}

+			

+			int dc = D_code(dist - 1);

+			distTree.freqs[dc]++;

+			if (dc >= 4) {

+				extra_bits += dc / 2 - 1;

+			}

+			return IsFull();

+		}

+	}

+}

+

+namespace NZlib.Compression {

+	

+	/// <summary>

+	/// This class stores the pending output of the Deflater.

+	/// 

+	/// author of the original java version : Jochen Hoenicke

+	/// </summary>

+	public class DeflaterPending : PendingBuffer

+	{

+		public DeflaterPending() : base(DeflaterConstants.PENDING_BUF_SIZE)

+		{

+		}

+	}

+}

+

+namespace NZlib.Compression {

+	

+	/// <summary>

+	/// Inflater is used to decompress data that has been compressed according

+	/// to the "deflate" standard described in rfc1950.

+	///

+	/// The usage is as following.  First you have to set some input with

+	/// <code>setInput()</code>, then inflate() it.  If inflate doesn't

+	/// inflate any bytes there may be three reasons:

+	/// <ul>

+	/// <li>needsInput() returns true because the input buffer is empty.

+	/// You have to provide more input with <code>setInput()</code>.

+	/// NOTE: needsInput() also returns true when, the stream is finished.

+	/// </li>

+	/// <li>needsDictionary() returns true, you have to provide a preset

+	///    dictionary with <code>setDictionary()</code>.</li>

+	/// <li>finished() returns true, the inflater has finished.</li>

+	/// </ul>

+	/// Once the first output byte is produced, a dictionary will not be

+	/// needed at a later stage.

+	///

+	/// author of the original java version : John Leuner, Jochen Hoenicke

+	/// </summary>

+	public class Inflater

+	{

+		/// <summary>

+		/// Copy lengths for literal codes 257..285

+		/// </summary>

+		private static int[] CPLENS = {

+			3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31,

+			35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258

+		};

+		

+		/// <summary>

+		/// Extra bits for literal codes 257..285

+		/// </summary>

+		private static int[] CPLEXT = {

+			0, 0, 0, 0, 0, 0, 0, 0, 1, 1, 1, 1, 2, 2, 2, 2,

+			3, 3, 3, 3, 4, 4, 4, 4, 5, 5, 5, 5, 0

+		};

+		

+		/// <summary>

+		/// Copy offsets for distance codes 0..29

+		/// </summary>

+		private static int[] CPDIST = {

+			1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193,

+			257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145,

+			8193, 12289, 16385, 24577

+		};

+		

+		/// <summary>

+		/// Extra bits for distance codes

+		/// </summary>

+		private static int[] CPDEXT = {

+			0, 0, 0, 0, 1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 6, 6,

+			7, 7, 8, 8, 9, 9, 10, 10, 11, 11,

+			12, 12, 13, 13

+		};

+		

+		/// <summary>

+		/// This are the state in which the inflater can be.

+		/// </summary>

+		private const int DECODE_HEADER           = 0;

+		private const int DECODE_DICT             = 1;

+		private const int DECODE_BLOCKS           = 2;

+		private const int DECODE_STORED_LEN1      = 3;

+		private const int DECODE_STORED_LEN2      = 4;

+		private const int DECODE_STORED           = 5;

+		private const int DECODE_DYN_HEADER       = 6;

+		private const int DECODE_HUFFMAN          = 7;

+		private const int DECODE_HUFFMAN_LENBITS  = 8;

+		private const int DECODE_HUFFMAN_DIST     = 9;

+		private const int DECODE_HUFFMAN_DISTBITS = 10;

+		private const int DECODE_CHKSUM           = 11;

+		private const int FINISHED                = 12;

+		

+		/// <summary>

+		/// This variable contains the current state.

+		/// </summary>

+		private int mode;

+		

+		/// <summary>

+		/// The adler checksum of the dictionary or of the decompressed

+		/// stream, as it is written in the header resp. footer of the

+		/// compressed stream. 

+		/// Only valid if mode is DECODE_DICT or DECODE_CHKSUM.

+		/// </summary>

+		private int readAdler;

+		

+		/// <summary>

+		/// The number of bits needed to complete the current state.  This

+		/// is valid, if mode is DECODE_DICT, DECODE_CHKSUM,

+		/// DECODE_HUFFMAN_LENBITS or DECODE_HUFFMAN_DISTBITS.

+		/// </summary>

+		private int neededBits;

+		private int repLength, repDist;

+		private int uncomprLen;

+		

+		/// <summary>

+		/// True, if the last block flag was set in the last block of the

+		/// inflated stream.  This means that the stream ends after the

+		/// current block.

+		/// </summary>

+		private bool isLastBlock;

+		

+		/// <summary>

+		/// The total number of inflated bytes.

+		/// </summary>

+		private int totalOut;

+		

+		/// <summary>

+		/// The total number of bytes set with setInput().  This is not the

+		/// value returned by getTotalIn(), since this also includes the

+		/// unprocessed input.

+		/// </summary>

+		private int totalIn;

+		

+		/// <summary>

+		/// This variable stores the nowrap flag that was given to the constructor.

+		/// True means, that the inflated stream doesn't contain a header nor the

+		/// checksum in the footer.

+		/// </summary>

+		private bool nowrap;

+		

+		private StreamManipulator input;

+		private OutputWindow outputWindow;

+		private InflaterDynHeader dynHeader;

+		private InflaterHuffmanTree litlenTree, distTree;

+		private Adler32 adler;

+		

+		/// <summary>

+		/// Creates a new inflater.

+		/// </summary>

+		public Inflater() : this(false)

+		{

+		}

+		

+		/// <summary>

+		/// Creates a new inflater.

+		/// </summary>

+		/// <param name="nowrap">

+		/// true if no header and checksum field appears in the

+		/// stream.  This is used for GZIPed input.  For compatibility with

+		/// Sun JDK you should provide one byte of input more than needed in

+		/// this case.

+		/// </param>

+		public Inflater(bool nowrap)

+		{

+			this.nowrap = nowrap;

+			this.adler = new Adler32();

+			input = new StreamManipulator();

+			outputWindow = new OutputWindow();

+			mode = nowrap ? DECODE_BLOCKS : DECODE_HEADER;

+		}

+		

+		/// <summary>

+		/// Resets the inflater so that a new stream can be decompressed.  All

+		/// pending input and output will be discarded.

+		/// </summary>

+		public void Reset()

+		{

+			mode = nowrap ? DECODE_BLOCKS : DECODE_HEADER;

+			totalIn = totalOut = 0;

+			input.Reset();

+			outputWindow.Reset();

+			dynHeader = null;

+			litlenTree = null;

+			distTree = null;

+			isLastBlock = false;

+			adler.Reset();

+		}

+		

+		/// <summary>

+		/// Decodes the deflate header.

+		/// </summary>

+		/// <returns>

+		/// false if more input is needed.

+		/// </returns>

+		/// <exception cref="System.FormatException">

+		/// if header is invalid.

+		/// </exception>

+		private bool DecodeHeader()

+		{

+			int header = input.PeekBits(16);

+			if (header < 0) {

+				return false;

+			}

+			input.DropBits(16);

+			/* The header is written in "wrong" byte order */

+			header = ((header << 8) | (header >> 8)) & 0xffff;

+			if (header % 31 != 0) {

+				throw new FormatException("Header checksum illegal");

+			}

+			

+			if ((header & 0x0f00) != (Deflater.DEFLATED << 8)) {

+				throw new FormatException("Compression Method unknown");

+			}

+			

+			/* Maximum size of the backwards window in bits.

+			* We currently ignore this, but we could use it to make the

+			* inflater window more space efficient. On the other hand the

+			* full window (15 bits) is needed most times, anyway.

+			int max_wbits = ((header & 0x7000) >> 12) + 8;

+			*/

+			

+			if ((header & 0x0020) == 0) { // Dictionary flag?

+				mode = DECODE_BLOCKS;

+			} else {

+				mode = DECODE_DICT;

+				neededBits = 32;

+			}

+			return true;

+		}

+		

+		/// <summary>

+		/// Decodes the dictionary checksum after the deflate header.

+		/// </summary>

+		/// <returns>

+		/// false if more input is needed.

+		/// </returns>

+		private bool DecodeDict()

+		{

+			while (neededBits > 0) {

+				int dictByte = input.PeekBits(8);

+				if (dictByte < 0) {

+					return false;

+				}

+				input.DropBits(8);

+				readAdler = (readAdler << 8) | dictByte;

+				neededBits -= 8;

+			}

+			return false;

+		}

+		

+		/// <summary>

+		/// Decodes the huffman encoded symbols in the input stream.

+		/// </summary>

+		/// <returns>

+		/// false if more input is needed, true if output window is

+		/// full or the current block ends.

+		/// </returns>

+		/// <exception cref="System.FormatException">

+		/// if deflated stream is invalid.

+		/// </exception>

+		private bool DecodeHuffman()

+		{

+			int free = outputWindow.GetFreeSpace();

+			while (free >= 258) {

+				int symbol;

+				switch (mode) {

+					case DECODE_HUFFMAN:

+						/* This is the inner loop so it is optimized a bit */

+						while (((symbol = litlenTree.GetSymbol(input)) & ~0xff) == 0) {

+							outputWindow.Write(symbol);

+							if (--free < 258) {

+								return true;

+							}

+						}

+						if (symbol < 257) {

+							if (symbol < 0) {

+								return false;

+							} else {

+								/* symbol == 256: end of block */

+								distTree = null;

+								litlenTree = null;

+								mode = DECODE_BLOCKS;

+								return true;

+							}

+						}

+						

+						try {

+							repLength = CPLENS[symbol - 257];

+							neededBits = CPLEXT[symbol - 257];

+						} catch (Exception) {

+							throw new FormatException("Illegal rep length code");

+						}

+						goto case DECODE_HUFFMAN_LENBITS;/* fall through */

+					case DECODE_HUFFMAN_LENBITS:

+						if (neededBits > 0) {

+							mode = DECODE_HUFFMAN_LENBITS;

+							int i = input.PeekBits(neededBits);

+							if (i < 0) {

+								return false;

+							}

+							input.DropBits(neededBits);

+							repLength += i;

+						}

+						mode = DECODE_HUFFMAN_DIST;

+						goto case DECODE_HUFFMAN_DIST;/* fall through */

+					case DECODE_HUFFMAN_DIST:

+						symbol = distTree.GetSymbol(input);

+						if (symbol < 0) {

+							return false;

+						}

+						try {

+							repDist = CPDIST[symbol];

+							neededBits = CPDEXT[symbol];

+						} catch (Exception) {

+							throw new FormatException("Illegal rep dist code");

+						}

+						

+						goto case DECODE_HUFFMAN_DISTBITS;/* fall through */

+					case DECODE_HUFFMAN_DISTBITS:

+						if (neededBits > 0) {

+							mode = DECODE_HUFFMAN_DISTBITS;

+							int i = input.PeekBits(neededBits);

+							if (i < 0) {

+								return false;

+							}

+							input.DropBits(neededBits);

+							repDist += i;

+						}

+						outputWindow.Repeat(repLength, repDist);

+						free -= repLength;

+						mode = DECODE_HUFFMAN;

+						break;

+					default:

+						throw new FormatException();

+				}

+			}

+			return true;

+		}

+		

+		/// <summary>

+		/// Decodes the adler checksum after the deflate stream.

+		/// </summary>

+		/// <returns>

+		/// false if more input is needed.

+		/// </returns>

+		/// <exception cref="System.FormatException">

+		/// DataFormatException, if checksum doesn't match.

+		/// </exception>

+		private bool DecodeChksum()

+		{

+			while (neededBits > 0) {

+				int chkByte = input.PeekBits(8);

+				if (chkByte < 0) {

+					return false;

+				}

+				input.DropBits(8);

+				readAdler = (readAdler << 8) | chkByte;

+				neededBits -= 8;

+			}

+			if ((int) adler.Value != readAdler) {

+				throw new FormatException("Adler chksum doesn't match: "

+				                          + (int)adler.Value

+				                          + " vs. " + readAdler);

+			}

+			mode = FINISHED;

+			return false;

+		}

+		

+		/// <summary>

+		/// Decodes the deflated stream.

+		/// </summary>

+		/// <returns>

+		/// false if more input is needed, or if finished.

+		/// </returns>

+		/// <exception cref="System.FormatException">

+		/// DataFormatException, if deflated stream is invalid.

+		/// </exception>

+		private bool Decode()

+		{

+			switch (mode) {

+				case DECODE_HEADER:

+					return DecodeHeader();

+				case DECODE_DICT:

+					return DecodeDict();

+				case DECODE_CHKSUM:

+					return DecodeChksum();

+				

+				case DECODE_BLOCKS:

+					if (isLastBlock) {

+						if (nowrap) {

+							mode = FINISHED;

+							return false;

+						} else {

+							input.SkipToByteBoundary();

+							neededBits = 32;

+							mode = DECODE_CHKSUM;

+							return true;

+						}

+					}

+					

+					int type = input.PeekBits(3);

+					if (type < 0) {

+						return false;

+					}

+					input.DropBits(3);

+					

+					if ((type & 1) != 0) {

+						isLastBlock = true;

+					}

+					switch (type >> 1) {

+						case DeflaterConstants.STORED_BLOCK:

+							input.SkipToByteBoundary();

+							mode = DECODE_STORED_LEN1;

+							break;

+						case DeflaterConstants.STATIC_TREES:

+							litlenTree = InflaterHuffmanTree.defLitLenTree;

+							distTree = InflaterHuffmanTree.defDistTree;

+							mode = DECODE_HUFFMAN;

+							break;

+						case DeflaterConstants.DYN_TREES:

+							dynHeader = new InflaterDynHeader();

+							mode = DECODE_DYN_HEADER;

+							break;

+						default:

+							throw new FormatException("Unknown block type "+type);

+					}

+					return true;

+				

+				case DECODE_STORED_LEN1: {

+					if ((uncomprLen = input.PeekBits(16)) < 0) {

+						return false;

+					}

+					input.DropBits(16);

+					mode = DECODE_STORED_LEN2;

+				}

+				goto case DECODE_STORED_LEN2; /* fall through */

+				case DECODE_STORED_LEN2: {

+					int nlen = input.PeekBits(16);

+					if (nlen < 0) {

+						return false;

+					}

+					input.DropBits(16);

+					if (nlen != (uncomprLen ^ 0xffff)) {

+						throw new FormatException("broken uncompressed block");

+					}

+					mode = DECODE_STORED;

+				}

+				goto case DECODE_STORED;/* fall through */

+				case DECODE_STORED: {

+					int more = outputWindow.CopyStored(input, uncomprLen);

+					uncomprLen -= more;

+					if (uncomprLen == 0) {

+						mode = DECODE_BLOCKS;

+						return true;

+					}

+					return !input.IsNeedingInput;

+				}

+				

+				case DECODE_DYN_HEADER:

+					if (!dynHeader.Decode(input)) {

+						return false;

+					}

+					

+					litlenTree = dynHeader.BuildLitLenTree();

+					distTree = dynHeader.BuildDistTree();

+					mode = DECODE_HUFFMAN;

+					goto case DECODE_HUFFMAN; /* fall through */

+				case DECODE_HUFFMAN:

+				case DECODE_HUFFMAN_LENBITS:

+				case DECODE_HUFFMAN_DIST:

+				case DECODE_HUFFMAN_DISTBITS:

+					return DecodeHuffman();

+				case FINISHED:

+					return false;

+				default:

+					throw new FormatException();

+			}

+		}

+			

+		/// <summary>

+		/// Sets the preset dictionary.  This should only be called, if

+		/// needsDictionary() returns true and it should set the same

+		/// dictionary, that was used for deflating.  The getAdler()

+		/// function returns the checksum of the dictionary needed.

+		/// </summary>

+		/// <param name="buffer">

+		/// the dictionary.

+		/// </param>

+		/// <exception cref="System.InvalidOperationException">

+		/// if no dictionary is needed.

+		/// </exception>

+		/// <exception cref="System.ArgumentException">

+		/// if the dictionary checksum is wrong.

+		/// </exception>

+		public void SetDictionary(byte[] buffer)

+		{

+			SetDictionary(buffer, 0, buffer.Length);

+		}

+		

+		/// <summary>

+		/// Sets the preset dictionary.  This should only be called, if

+		/// needsDictionary() returns true and it should set the same

+		/// dictionary, that was used for deflating.  The getAdler()

+		/// function returns the checksum of the dictionary needed.

+		/// </summary>

+		/// <param name="buffer">

+		/// the dictionary.

+		/// </param>

+		/// <param name="off">

+		/// the offset into buffer where the dictionary starts.

+		/// </param>

+		/// <param name="len">

+		/// the length of the dictionary.

+		/// </param>

+		/// <exception cref="System.InvalidOperationException">

+		/// if no dictionary is needed.

+		/// </exception>

+		/// <exception cref="System.ArgumentException">

+		/// if the dictionary checksum is wrong.

+		/// </exception>

+		/// <exception cref="System.ArgumentOutOfRangeException">

+		/// if the off and/or len are wrong.

+		/// </exception>

+		public void SetDictionary(byte[] buffer, int off, int len)

+		{

+			if (!IsNeedingDictionary) {

+				throw new InvalidOperationException();

+			}

+			

+			adler.Update(buffer, off, len);

+			if ((int) adler.Value != readAdler) {

+				throw new ArgumentException("Wrong adler checksum");

+			}

+			adler.Reset();

+			outputWindow.CopyDict(buffer, off, len);

+			mode = DECODE_BLOCKS;

+		}

+		

+		/// <summary>

+		/// Sets the input.  This should only be called, if needsInput()

+		/// returns true.

+		/// </summary>

+		/// <param name="buf">

+		/// the input.

+		/// </param>

+		/// <exception cref="System.InvalidOperationException">

+		/// if no input is needed.

+		/// </exception>

+		public void SetInput(byte[] buf)

+		{

+			SetInput(buf, 0, buf.Length);

+		}

+		

+		/// <summary>

+		/// Sets the input.  This should only be called, if needsInput()

+		/// returns true.

+		/// </summary>

+		/// <param name="buf">

+		/// the input.

+		/// </param>

+		/// <param name="off">

+		/// the offset into buffer where the input starts.

+		/// </param>

+		/// <param name="len">

+		/// the length of the input.

+		/// </param>

+		/// <exception cref="System.InvalidOperationException">

+		/// if no input is needed.

+		/// </exception>

+		/// <exception cref="System.ArgumentOutOfRangeException">

+		/// if the off and/or len are wrong.

+		/// </exception>

+		public void SetInput(byte[] buf, int off, int len)

+		{

+			input.SetInput(buf, off, len);

+			totalIn += len;

+		}

+		

+		/// <summary>

+		/// Inflates the compressed stream to the output buffer.  If this

+		/// returns 0, you should check, whether needsDictionary(),

+		/// needsInput() or finished() returns true, to determine why no

+		/// further output is produced.

+		/// </summary>

+		/// <param name = "buf">

+		/// the output buffer.

+		/// </param>

+		/// <returns>

+		/// the number of bytes written to the buffer, 0 if no further

+		/// output can be produced.

+		/// </returns>

+		/// <exception cref="System.ArgumentOutOfRangeException">

+		/// if buf has length 0.

+		/// </exception>

+		/// <exception cref="System.FormatException">

+		/// if deflated stream is invalid.

+		/// </exception>

+		public int Inflate(byte[] buf)

+		{

+			return Inflate(buf, 0, buf.Length);

+		}

+		

+		/// <summary>

+		/// Inflates the compressed stream to the output buffer.  If this

+		/// returns 0, you should check, whether needsDictionary(),

+		/// needsInput() or finished() returns true, to determine why no

+		/// further output is produced.

+		/// </summary>

+		/// <param name = "buf">

+		/// the output buffer.

+		/// </param>

+		/// <param name = "off">

+		/// the offset into buffer where the output should start.

+		/// </param>

+		/// <param name = "len">

+		/// the maximum length of the output.

+		/// </param>

+		/// <returns>

+		/// the number of bytes written to the buffer, 0 if no further output can be produced.

+		/// </returns>

+		/// <exception cref="System.ArgumentOutOfRangeException">

+		/// if len is &lt;= 0.

+		/// </exception>

+		/// <exception cref="System.ArgumentOutOfRangeException">

+		/// if the off and/or len are wrong.

+		/// </exception>

+		/// <exception cref="System.FormatException">

+		/// if deflated stream is invalid.

+		/// </exception>

+		public int Inflate(byte[] buf, int off, int len)

+		{

+			if (len <= 0) {

+				throw new ArgumentOutOfRangeException("len <= 0");

+			}

+			int count = 0;

+			int more;

+			do {

+				if (mode != DECODE_CHKSUM) {

+					/* Don't give away any output, if we are waiting for the

+					* checksum in the input stream.

+					*

+					* With this trick we have always:

+					*   needsInput() and not finished()

+					*   implies more output can be produced.

+					*/

+					more = outputWindow.CopyOutput(buf, off, len);

+					adler.Update(buf, off, more);

+					off += more;

+					count += more;

+					totalOut += more;

+					len -= more;

+					if (len == 0) {

+						return count;

+					}

+				}

+			} while (Decode() || (outputWindow.GetAvailable() > 0 &&

+			                      mode != DECODE_CHKSUM));

+			return count;

+		}

+		

+		/// <summary>

+		/// Returns true, if the input buffer is empty.

+		/// You should then call setInput(). 

+		/// NOTE: This method also returns true when the stream is finished.

+		/// </summary>

+		public bool IsNeedingInput {

+			get {

+				return input.IsNeedingInput;

+			}

+		}

+		

+		/// <summary>

+		/// Returns true, if a preset dictionary is needed to inflate the input.

+		/// </summary>

+		public bool IsNeedingDictionary {

+			get {

+				return mode == DECODE_DICT && neededBits == 0;

+			}

+		}

+		

+		/// <summary>

+		/// Returns true, if the inflater has finished.  This means, that no

+		/// input is needed and no output can be produced.

+		/// </summary>

+		public bool IsFinished {

+			get {

+				return mode == FINISHED && outputWindow.GetAvailable() == 0;

+			}

+		}

+		

+		/// <summary>

+		/// Gets the adler checksum.  This is either the checksum of all

+		/// uncompressed bytes returned by inflate(), or if needsDictionary()

+		/// returns true (and thus no output was yet produced) this is the

+		/// adler checksum of the expected dictionary.

+		/// </summary>

+		/// <returns>

+		/// the adler checksum.

+		/// </returns>

+		public int Adler {

+			get {

+				return IsNeedingDictionary ? readAdler : (int) adler.Value;

+			}

+		}

+		

+		/// <summary>

+		/// Gets the total number of output bytes returned by inflate().

+		/// </summary>

+		/// <returns>

+		/// the total number of output bytes.

+		/// </returns>

+		public int TotalOut {

+			get {

+				return totalOut;

+			}

+		}

+		

+		/// <summary>

+		/// Gets the total number of processed compressed input bytes.

+		/// </summary>

+		/// <returns>

+		/// the total number of bytes of processed input bytes.

+		/// </returns>

+		public int TotalIn {

+			get {

+				return totalIn - RemainingInput;

+			}

+		}

+		

+		/// <summary>

+		/// Gets the number of unprocessed input.  Useful, if the end of the

+		/// stream is reached and you want to further process the bytes after

+		/// the deflate stream.

+		/// </summary>

+		/// <returns>

+		/// the number of bytes of the input which were not processed.

+		/// </returns>

+		public int RemainingInput {

+			get {

+				return input.AvailableBytes;

+			}

+		}

+	}

+}

+

+namespace NZlib.Compression {

+	

+	public class InflaterDynHeader

+	{

+		private const int LNUM   = 0;

+		private const int DNUM   = 1;

+		private const int BLNUM  = 2;

+		private const int BLLENS = 3;

+		private const int LLENS  = 4;

+		private const int DLENS  = 5;

+		private const int LREPS  = 6;

+		private const int DREPS  = 7;

+		private const int FINISH = 8;

+		

+		private byte[] blLens;

+		private byte[] litlenLens;

+		private byte[] distLens;

+		

+		private InflaterHuffmanTree blTree;

+		

+		private int mode;

+		private int lnum, dnum, blnum;

+		private int repBits;

+		private byte repeatedLen;

+		private int ptr;

+		

+		private static int[] BL_ORDER = { 16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15 };

+		

+		public InflaterDynHeader()

+		{

+		}

+		

+		public bool Decode(StreamManipulator input)

+		{

+			decode_loop:

+			for (;;) {

+				switch (mode) {

+					case LNUM:

+						lnum = input.PeekBits(5);

+						if (lnum < 0) {

+							return false;

+						}

+						lnum += 257;

+						input.DropBits(5);

+						litlenLens = new byte[lnum];

+						//  	    System.err.println("LNUM: "+lnum);

+						mode = DNUM;

+						goto case DNUM;/* fall through */

+					case DNUM:

+						dnum = input.PeekBits(5);

+						if (dnum < 0) {

+							return false;

+						}

+						dnum++;

+						input.DropBits(5);

+						distLens = new byte[dnum];

+						//  	    System.err.println("DNUM: "+dnum);

+						mode = BLNUM;

+						goto case BLNUM;/* fall through */

+					case BLNUM:

+						blnum = input.PeekBits(4);

+						if (blnum < 0) {

+							return false;

+						}

+						blnum += 4;

+						input.DropBits(4);

+						blLens = new byte[19];

+						ptr = 0;

+						//  	    System.err.println("BLNUM: "+blnum);

+						mode = BLLENS;

+						goto case BLLENS;/* fall through */

+					case BLLENS:

+						while (ptr < blnum) {

+							int len = input.PeekBits(3);

+							if (len < 0) {

+								return false;

+							}

+							input.DropBits(3);

+							//  		System.err.println("blLens["+BL_ORDER[ptr]+"]: "+len);

+							blLens[BL_ORDER[ptr]] = (byte) len;

+							ptr++;

+						}

+						blTree = new InflaterHuffmanTree(blLens);

+						blLens = null;

+						ptr = 0;

+						mode = LLENS;

+						goto case LLENS;/* fall through */

+					case LLENS:

+						while (ptr < lnum) {

+							int symbol = blTree.GetSymbol(input);

+							if (symbol < 0) {

+								return false;

+							}

+							switch (symbol) {

+								default:

+									//  		    System.err.println("litlenLens["+ptr+"]: "+symbol);

+									litlenLens[ptr++] = (byte) symbol;

+									break;

+								case 16: /* repeat last len 3-6 times */

+									if (ptr == 0) {

+										throw new Exception("Repeating, but no prev len");

+									}

+									

+									//  		    System.err.println("litlenLens["+ptr+"]: repeat");

+									repeatedLen = litlenLens[ptr-1];

+									repBits = 2;

+									for (int i = 3; i-- > 0; ) {

+										if (ptr >= lnum) {

+											throw new Exception();

+										}

+										litlenLens[ptr++] = repeatedLen;

+									}

+									mode = LREPS;

+									goto decode_loop;

+								case 17: /* repeat zero 3-10 times */

+									//  		    System.err.println("litlenLens["+ptr+"]: zero repeat");

+									repeatedLen = 0;

+									repBits = 3;

+									for (int i = 3; i-- > 0; ) {

+										if (ptr >= lnum) {

+											throw new Exception();

+										}

+										litlenLens[ptr++] = repeatedLen;

+									}

+									mode = LREPS;

+									goto decode_loop;

+								case 18: /* repeat zero 11-138 times */

+									//  		    System.err.println("litlenLens["+ptr+"]: zero repeat");

+									repeatedLen = 0;

+									repBits = 7;

+									for (int i = 11; i-- > 0; ) {

+										if (ptr >= lnum) {

+											throw new Exception();

+										}

+										litlenLens[ptr++] = repeatedLen;

+									}

+									mode = LREPS;

+									goto decode_loop;

+							}

+						}

+						ptr = 0;

+						mode = DLENS;

+						goto case DLENS;/* fall through */

+						case DLENS:

+							while (ptr < dnum) {

+								int symbol = blTree.GetSymbol(input);

+								if (symbol < 0) {

+									return false;

+								}

+								switch (symbol) {

+									default:

+										distLens[ptr++] = (byte) symbol;

+										//  		    System.err.println("distLens["+ptr+"]: "+symbol);

+										break;

+									case 16: /* repeat last len 3-6 times */

+										if (ptr == 0) {

+											throw new Exception("Repeating, but no prev len");

+										}

+										//  		    System.err.println("distLens["+ptr+"]: repeat");

+										repeatedLen = distLens[ptr-1];

+										repBits = 2;

+										for (int i = 3; i-- > 0; ) {

+											if (ptr >= dnum) {

+												throw new Exception();

+											}

+											distLens[ptr++] = repeatedLen;

+										}

+										mode = DREPS;

+										goto decode_loop;

+									case 17: /* repeat zero 3-10 times */

+										//  		    System.err.println("distLens["+ptr+"]: repeat zero");

+										repeatedLen = 0;

+										repBits = 3;

+										for (int i = 3; i-- > 0; ) {

+											if (ptr >= dnum) {

+												throw new Exception();

+											}

+											distLens[ptr++] = repeatedLen;

+										}

+										mode = DREPS;

+										goto decode_loop;

+									case 18: /* repeat zero 11-138 times */

+										//  		    System.err.println("distLens["+ptr+"]: repeat zero");

+										repeatedLen = 0;

+										repBits = 7;

+										for (int i = 11; i-- > 0; ) {

+											if (ptr >= dnum) {

+												throw new Exception();

+											}

+											distLens[ptr++] = repeatedLen;

+										}

+										mode = DREPS;

+										goto decode_loop;

+								}

+							}

+							mode = FINISH;

+						return true;

+					case LREPS:

+						{

+							int count = input.PeekBits(repBits);

+							if (count < 0) {

+								return false;

+							}

+							input.DropBits(repBits);

+							//  	      System.err.println("litlenLens repeat: "+repBits);

+							while (count-- > 0) {

+								if (ptr >= lnum) {

+									throw new Exception();

+								}

+								litlenLens[ptr++] = repeatedLen;

+							}

+						}

+						mode = LLENS;

+						goto decode_loop;

+					case DREPS:

+						{

+							int count = input.PeekBits(repBits);

+							if (count < 0) {

+								return false;

+							}

+							input.DropBits(repBits);

+							while (count-- > 0) {

+								if (ptr >= dnum) {

+									throw new Exception();

+								}

+								distLens[ptr++] = repeatedLen;

+							}

+						}

+						mode = DLENS;

+						goto decode_loop;

+				}

+			}

+		}

+		

+		public InflaterHuffmanTree BuildLitLenTree()

+		{

+			return new InflaterHuffmanTree(litlenLens);

+		}

+		

+		public InflaterHuffmanTree BuildDistTree()

+		{

+			return new InflaterHuffmanTree(distLens);

+		}

+	}

+}

+

+namespace NZlib.Compression {

+	

+	public class InflaterHuffmanTree 

+	{

+		private static int MAX_BITLEN = 15;

+		private short[] tree;

+		

+		public static InflaterHuffmanTree defLitLenTree, defDistTree;

+		

+		static InflaterHuffmanTree()

+		{

+			try {

+				byte[] codeLengths = new byte[288];

+				int i = 0;

+				while (i < 144) {

+					codeLengths[i++] = 8;

+				}

+				while (i < 256) {

+					codeLengths[i++] = 9;

+				}

+				while (i < 280) {

+					codeLengths[i++] = 7;

+				}

+				while (i < 288) {

+					codeLengths[i++] = 8;

+				}

+				defLitLenTree = new InflaterHuffmanTree(codeLengths);

+				

+				codeLengths = new byte[32];

+				i = 0;

+				while (i < 32) {

+					codeLengths[i++] = 5;

+				}

+				defDistTree = new InflaterHuffmanTree(codeLengths);

+			} catch (Exception) {

+				throw new ApplicationException("InflaterHuffmanTree: static tree length illegal");

+			}

+		}

+		

+		/// <summary>

+		/// Constructs a Huffman tree from the array of code lengths.

+		/// </summary>

+		/// <param name = "codeLengths">

+		/// the array of code lengths

+		/// </param>

+		public InflaterHuffmanTree(byte[] codeLengths)

+		{

+			BuildTree(codeLengths);

+		}

+		

+		private void BuildTree(byte[] codeLengths)

+		{

+			int[] blCount  = new int[MAX_BITLEN + 1];

+			int[] nextCode = new int[MAX_BITLEN + 1];

+			

+			for (int i = 0; i < codeLengths.Length; i++) {

+				int bits = codeLengths[i];

+				if (bits > 0)

+					blCount[bits]++;

+			}

+			

+			int code = 0;

+			int treeSize = 512;

+			for (int bits = 1; bits <= MAX_BITLEN; bits++) {

+				nextCode[bits] = code;

+				code += blCount[bits] << (16 - bits);

+				if (bits >= 10) {

+					/* We need an extra table for bit lengths >= 10. */

+					int start = nextCode[bits] & 0x1ff80;

+					int end   = code & 0x1ff80;

+					treeSize += (end - start) >> (16 - bits);

+				}

+			}

+			if (code != 65536) {

+				throw new Exception("Code lengths don't add up properly.");

+			}

+			/* Now create and fill the extra tables from longest to shortest

+			* bit len.  This way the sub trees will be aligned.

+			*/

+			tree = new short[treeSize];

+			int treePtr = 512;

+			for (int bits = MAX_BITLEN; bits >= 10; bits--) {

+				int end   = code & 0x1ff80;

+				code -= blCount[bits] << (16 - bits);

+				int start = code & 0x1ff80;

+				for (int i = start; i < end; i += 1 << 7) {

+					tree[DeflaterHuffman.BitReverse(i)] = (short) ((-treePtr << 4) | bits);

+					treePtr += 1 << (bits-9);

+				}

+			}

+			

+			for (int i = 0; i < codeLengths.Length; i++) {

+				int bits = codeLengths[i];

+				if (bits == 0) {

+					continue;

+				}

+				code = nextCode[bits];

+				int revcode = DeflaterHuffman.BitReverse(code);

+				if (bits <= 9) {

+					do {

+						tree[revcode] = (short) ((i << 4) | bits);

+						revcode += 1 << bits;

+					} while (revcode < 512);

+				} else {

+					int subTree = tree[revcode & 511];

+					int treeLen = 1 << (subTree & 15);

+					subTree = -(subTree >> 4);

+					do {

+						tree[subTree | (revcode >> 9)] = (short) ((i << 4) | bits);

+						revcode += 1 << bits;

+					} while (revcode < treeLen);

+				}

+				nextCode[bits] = code + (1 << (16 - bits));

+			}

+			

+		}

+		

+		/// <summary>

+		/// Reads the next symbol from input.  The symbol is encoded using the

+		/// huffman tree.

+		/// </summary>

+		/// <param name="input">

+		/// input the input source.

+		/// </param>

+		/// <returns>

+		/// the next symbol, or -1 if not enough input is available.

+		/// </returns>

+		public int GetSymbol(StreamManipulator input)

+		{

+			int lookahead, symbol;

+			if ((lookahead = input.PeekBits(9)) >= 0) {

+				if ((symbol = tree[lookahead]) >= 0) {

+					input.DropBits(symbol & 15);

+					return symbol >> 4;

+				}

+				int subtree = -(symbol >> 4);

+				int bitlen = symbol & 15;

+				if ((lookahead = input.PeekBits(bitlen)) >= 0) {

+					symbol = tree[subtree | (lookahead >> 9)];

+					input.DropBits(symbol & 15);

+					return symbol >> 4;

+				} else {

+					int bits = input.AvailableBits;

+					lookahead = input.PeekBits(bits);

+					symbol = tree[subtree | (lookahead >> 9)];

+					if ((symbol & 15) <= bits) {

+						input.DropBits(symbol & 15);

+						return symbol >> 4;

+					} else {

+						return -1;

+					}

+				}

+			} else {

+				int bits = input.AvailableBits;

+				lookahead = input.PeekBits(bits);

+				symbol = tree[lookahead];

+				if (symbol >= 0 && (symbol & 15) <= bits) {

+					input.DropBits(symbol & 15);

+					return symbol >> 4;

+				} else {

+					return -1;

+				}

+			}

+		}

+	}

+}

+

+namespace NZlib.Compression {

+	

+	/// <summary>

+	/// This class is general purpose class for writing data to a buffer.

+	/// 

+	/// It allows you to write bits as well as bytes

+	/// Based on DeflaterPending.java

+	/// 

+	/// author of the original java version : Jochen Hoenicke

+	/// </summary>

+	public class PendingBuffer

+	{

+		protected byte[] buf;

+		int    start;

+		int    end;

+		

+		uint    bits;

+		int    bitCount;

+		

+		public PendingBuffer() : this( 4096 )

+		{

+			

+		}

+		

+		public PendingBuffer(int bufsize)

+		{

+			buf = new byte[bufsize];

+		}

+		

+		public void Reset() 

+		{

+			start = end = bitCount = 0;

+		}

+		

+		public void WriteByte(int b)

+		{

+			if (DeflaterConstants.DEBUGGING && start != 0)

+				throw new Exception();

+			buf[end++] = (byte) b;

+		}

+		

+		public void WriteShort(int s)

+		{

+			if (DeflaterConstants.DEBUGGING && start != 0) {

+				throw new Exception();

+			}

+			buf[end++] = (byte) s;

+			buf[end++] = (byte) (s >> 8);

+		}

+		

+		public void WriteInt(int s)

+		{

+			if (DeflaterConstants.DEBUGGING && start != 0) {

+				throw new Exception();

+			}

+			buf[end++] = (byte) s;

+			buf[end++] = (byte) (s >> 8);

+			buf[end++] = (byte) (s >> 16);

+			buf[end++] = (byte) (s >> 24);

+		}

+		

+		public void WriteBlock(byte[] block, int offset, int len)

+		{

+			if (DeflaterConstants.DEBUGGING && start != 0) {

+				throw new Exception();

+			}

+			System.Array.Copy(block, offset, buf, end, len);

+			end += len;

+		}

+		

+		public int BitCount {

+			get {

+				return bitCount;

+			}

+		}

+		

+		public void AlignToByte() 

+		{

+			if (DeflaterConstants.DEBUGGING && start != 0) {

+				throw new Exception();

+			}

+			if (bitCount > 0) {

+				buf[end++] = (byte) bits;

+				if (bitCount > 8) {

+					buf[end++] = (byte) (bits >> 8);

+				}

+			}

+			bits = 0;

+			bitCount = 0;

+		}

+		

+		public void WriteBits(int b, int count)

+		{

+			if (DeflaterConstants.DEBUGGING && start != 0) {

+				throw new Exception();

+			}

+//			if (DeflaterConstants.DEBUGGING) {

+//				Console.WriteLine("writeBits("+b+","+count+")");

+//			}

+			bits |= (uint)(b << bitCount);

+			bitCount += count;

+			if (bitCount >= 16) {

+				buf[end++] = (byte) bits;

+				buf[end++] = (byte) (bits >> 8);

+				bits >>= 16;

+				bitCount -= 16;

+			}

+		}

+		

+		public void WriteShortMSB(int s) 

+		{

+			if (DeflaterConstants.DEBUGGING && start != 0) {

+				throw new Exception();

+			}

+			buf[end++] = (byte) (s >> 8);

+			buf[end++] = (byte) s;

+		}

+		

+		public bool IsFlushed {

+			get {

+				return end == 0;

+			}

+		}

+		

+		/// <summary>

+		/// Flushes the pending buffer into the given output array.  If the

+		/// output array is to small, only a partial flush is done.

+		/// </summary>

+		/// <param name="output">

+		/// the output array;

+		/// </param>

+		/// <param name="offset">

+		/// the offset into output array;

+		/// </param>

+		/// <param name="length">		

+		/// length the maximum number of bytes to store;

+		/// </param>

+		/// <exception name="ArgumentOutOfRangeException">

+		/// IndexOutOfBoundsException if offset or length are invalid.

+		/// </exception>

+		public int Flush(byte[] output, int offset, int length) 

+		{

+			if (bitCount >= 8) {

+				buf[end++] = (byte) bits;

+				bits >>= 8;

+				bitCount -= 8;

+			}

+			if (length > end - start) {

+				length = end - start;

+				System.Array.Copy(buf, start, output, offset, length);

+				start = 0;

+				end = 0;

+			} else {

+				System.Array.Copy(buf, start, output, offset, length);

+				start += length;

+			}

+			return length;

+		}

+		

+		public byte[] ToByteArray()

+		{

+			byte[] ret = new byte[ end - start ];

+			System.Array.Copy(buf, start, ret, 0, ret.Length);

+			start = 0;

+			end = 0;

+			return ret;

+		}

+	}

+}	

+

+namespace NZlib.Checksums {

+	

+	/// <summary>

+	/// Computes Adler32 checksum for a stream of data. An Adler32

+	/// checksum is not as reliable as a CRC32 checksum, but a lot faster to

+	/// compute.

+	/// 

+	/// The specification for Adler32 may be found in RFC 1950.

+	/// ZLIB Compressed Data Format Specification version 3.3)

+	/// 

+	/// 

+	/// From that document:

+	/// 

+	///      "ADLER32 (Adler-32 checksum)

+	///       This contains a checksum value of the uncompressed data

+	///       (excluding any dictionary data) computed according to Adler-32

+	///       algorithm. This algorithm is a 32-bit extension and improvement

+	///       of the Fletcher algorithm, used in the ITU-T X.224 / ISO 8073

+	///       standard.

+	/// 

+	///       Adler-32 is composed of two sums accumulated per byte: s1 is

+	///       the sum of all bytes, s2 is the sum of all s1 values. Both sums

+	///       are done modulo 65521. s1 is initialized to 1, s2 to zero.  The

+	///       Adler-32 checksum is stored as s2*65536 + s1 in most-

+	///       significant-byte first (network) order."

+	/// 

+	///  "8.2. The Adler-32 algorithm

+	/// 

+	///    The Adler-32 algorithm is much faster than the CRC32 algorithm yet

+	///    still provides an extremely low probability of undetected errors.

+	/// 

+	///    The modulo on unsigned long accumulators can be delayed for 5552

+	///    bytes, so the modulo operation time is negligible.  If the bytes

+	///    are a, b, c, the second sum is 3a + 2b + c + 3, and so is position

+	///    and order sensitive, unlike the first sum, which is just a

+	///    checksum.  That 65521 is prime is important to avoid a possible

+	///    large class of two-byte errors that leave the check unchanged.

+	///    (The Fletcher checksum uses 255, which is not prime and which also

+	///    makes the Fletcher check insensitive to single byte changes 0 -

+	///    255.)

+	/// 

+	///    The sum s1 is initialized to 1 instead of zero to make the length

+	///    of the sequence part of s2, so that the length does not have to be

+	///    checked separately. (Any sequence of zeroes has a Fletcher

+	///    checksum of zero.)"

+	/// </summary>

+	/// <see cref="NZlib.Streams.InflaterInputStream"/>

+	/// <see cref="NZlib.Streams.DeflaterOutputStream"/>

+	public sealed class Adler32 : IChecksum

+	{

+		/// <summary>

+		/// largest prime smaller than 65536

+		/// </summary>

+		readonly static uint BASE = 65521;

+		

+		uint checksum;

+		

+		/// <summary>

+		/// Returns the Adler32 data checksum computed so far.

+		/// </summary>

+		public long Value {

+			get {

+				return (long) checksum & 0xFFFFFFFFL;

+			}

+		}

+		

+		/// <summary>

+		/// Creates a new instance of the <code>Adler32</code> class.

+		/// The checksum starts off with a value of 1.

+		/// </summary>

+		public Adler32()

+		{

+			Reset();

+		}

+		

+		/// <summary>

+		/// Resets the Adler32 checksum to the initial value.

+		/// </summary>

+		public void Reset()

+		{

+			checksum = 1; //Initialize to 1

+		}

+		

+		/// <summary>

+		/// Updates the checksum with the byte b.

+		/// </summary>

+		/// <param name="bval">

+		/// the data value to add. The high byte of the int is ignored.

+		/// </param>

+		public void Update(int bval)

+		{

+			//We could make a length 1 byte array and call update again, but I

+			//would rather not have that overhead

+			uint s1 = checksum & 0xFFFF;

+			uint s2 = checksum >> 16;

+			

+			s1 = (s1 + ((uint)bval & 0xFF)) % BASE;

+			s2 = (s1 + s2) % BASE;

+			

+			checksum = (s2 << 16) + s1;

+		}

+		

+		/// <summary>

+		/// Updates the checksum with the bytes taken from the array.

+		/// </summary>

+		/// <param name="buffer">

+		/// buffer an array of bytes

+		/// </param>

+		public void Update(byte[] buffer)

+		{

+			Update(buffer, 0, buffer.Length);

+		}

+		

+		/// <summary>

+		/// Updates the checksum with the bytes taken from the array.

+		/// </summary>

+		/// <param name="buf">

+		/// an array of bytes

+		/// </param>

+		/// <param name="off">

+		/// the start of the data used for this update

+		/// </param>

+		/// <param name="len">

+		/// the number of bytes to use for this update

+		/// </param>

+		public void Update(byte[] buf, int off, int len)

+		{

+			if (buf == null) {

+				throw new ArgumentNullException("buf");

+			}

+			

+			if (off < 0 || len < 0 || off + len > buf.Length) {

+				throw new ArgumentOutOfRangeException();

+			}

+			

+			//(By Per Bothner)

+			uint s1 = checksum & 0xFFFF;

+			uint s2 = checksum >> 16;

+			

+			while (len > 0) {

+				// We can defer the modulo operation:

+				// s1 maximally grows from 65521 to 65521 + 255 * 3800

+				// s2 maximally grows by 3800 * median(s1) = 2090079800 < 2^31

+				int n = 3800;

+				if (n > len) {

+					n = len;

+				}

+				len -= n;

+				while (--n >= 0) {

+					s1 = s1 + (uint)(buf[off++] & 0xFF);

+					s2 = s2 + s1;

+				}

+				s1 %= BASE;

+				s2 %= BASE;

+			}

+			

+			checksum = (s2 << 16) | s1;

+		}

+	}

+}

+

+namespace NZlib.Checksums {

+	

+	/// <summary>

+	/// Generate a table for a byte-wise 32-bit CRC calculation on the polynomial:

+	/// x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1.

+	///

+	/// Polynomials over GF(2) are represented in binary, one bit per coefficient,

+	/// with the lowest powers in the most significant bit.  Then adding polynomials

+	/// is just exclusive-or, and multiplying a polynomial by x is a right shift by

+	/// one.  If we call the above polynomial p, and represent a byte as the

+	/// polynomial q, also with the lowest power in the most significant bit (so the

+	/// byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p,

+	/// where a mod b means the remainder after dividing a by b.

+	///

+	/// This calculation is done using the shift-register method of multiplying and

+	/// taking the remainder.  The register is initialized to zero, and for each

+	/// incoming bit, x^32 is added mod p to the register if the bit is a one (where

+	/// x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by

+	/// x (which is shifting right by one and adding x^32 mod p if the bit shifted

+	/// out is a one).  We start with the highest power (least significant bit) of

+	/// q and repeat for all eight bits of q.

+	///

+	/// The table is simply the CRC of all possible eight bit values.  This is all

+	/// the information needed to generate CRC's on data a byte at a time for all

+	/// combinations of CRC register values and incoming bytes.

+	/// </summary>

+	public sealed class Crc32 : IChecksum

+	{

+		readonly static uint CrcSeed = 0xFFFFFFFF;

+		

+		readonly static uint[] CrcTable = new uint[] {

+			0x00000000, 0x77073096, 0xEE0E612C, 0x990951BA, 0x076DC419,

+			0x706AF48F, 0xE963A535, 0x9E6495A3, 0x0EDB8832, 0x79DCB8A4,

+			0xE0D5E91E, 0x97D2D988, 0x09B64C2B, 0x7EB17CBD, 0xE7B82D07,

+			0x90BF1D91, 0x1DB71064, 0x6AB020F2, 0xF3B97148, 0x84BE41DE,

+			0x1ADAD47D, 0x6DDDE4EB, 0xF4D4B551, 0x83D385C7, 0x136C9856,

+			0x646BA8C0, 0xFD62F97A, 0x8A65C9EC, 0x14015C4F, 0x63066CD9,

+			0xFA0F3D63, 0x8D080DF5, 0x3B6E20C8, 0x4C69105E, 0xD56041E4,

+			0xA2677172, 0x3C03E4D1, 0x4B04D447, 0xD20D85FD, 0xA50AB56B,

+			0x35B5A8FA, 0x42B2986C, 0xDBBBC9D6, 0xACBCF940, 0x32D86CE3,

+			0x45DF5C75, 0xDCD60DCF, 0xABD13D59, 0x26D930AC, 0x51DE003A,

+			0xC8D75180, 0xBFD06116, 0x21B4F4B5, 0x56B3C423, 0xCFBA9599,

+			0xB8BDA50F, 0x2802B89E, 0x5F058808, 0xC60CD9B2, 0xB10BE924,

+			0x2F6F7C87, 0x58684C11, 0xC1611DAB, 0xB6662D3D, 0x76DC4190,

+			0x01DB7106, 0x98D220BC, 0xEFD5102A, 0x71B18589, 0x06B6B51F,

+			0x9FBFE4A5, 0xE8B8D433, 0x7807C9A2, 0x0F00F934, 0x9609A88E,

+			0xE10E9818, 0x7F6A0DBB, 0x086D3D2D, 0x91646C97, 0xE6635C01,

+			0x6B6B51F4, 0x1C6C6162, 0x856530D8, 0xF262004E, 0x6C0695ED,

+			0x1B01A57B, 0x8208F4C1, 0xF50FC457, 0x65B0D9C6, 0x12B7E950,

+			0x8BBEB8EA, 0xFCB9887C, 0x62DD1DDF, 0x15DA2D49, 0x8CD37CF3,

+			0xFBD44C65, 0x4DB26158, 0x3AB551CE, 0xA3BC0074, 0xD4BB30E2,

+			0x4ADFA541, 0x3DD895D7, 0xA4D1C46D, 0xD3D6F4FB, 0x4369E96A,

+			0x346ED9FC, 0xAD678846, 0xDA60B8D0, 0x44042D73, 0x33031DE5,

+			0xAA0A4C5F, 0xDD0D7CC9, 0x5005713C, 0x270241AA, 0xBE0B1010,

+			0xC90C2086, 0x5768B525, 0x206F85B3, 0xB966D409, 0xCE61E49F,

+			0x5EDEF90E, 0x29D9C998, 0xB0D09822, 0xC7D7A8B4, 0x59B33D17,

+			0x2EB40D81, 0xB7BD5C3B, 0xC0BA6CAD, 0xEDB88320, 0x9ABFB3B6,

+			0x03B6E20C, 0x74B1D29A, 0xEAD54739, 0x9DD277AF, 0x04DB2615,

+			0x73DC1683, 0xE3630B12, 0x94643B84, 0x0D6D6A3E, 0x7A6A5AA8,

+			0xE40ECF0B, 0x9309FF9D, 0x0A00AE27, 0x7D079EB1, 0xF00F9344, 

+			0x8708A3D2, 0x1E01F268, 0x6906C2FE, 0xF762575D, 0x806567CB,

+			0x196C3671, 0x6E6B06E7, 0xFED41B76, 0x89D32BE0, 0x10DA7A5A,

+			0x67DD4ACC, 0xF9B9DF6F, 0x8EBEEFF9, 0x17B7BE43, 0x60B08ED5,

+			0xD6D6A3E8, 0xA1D1937E, 0x38D8C2C4, 0x4FDFF252, 0xD1BB67F1,

+			0xA6BC5767, 0x3FB506DD, 0x48B2364B, 0xD80D2BDA, 0xAF0A1B4C,

+			0x36034AF6, 0x41047A60, 0xDF60EFC3, 0xA867DF55, 0x316E8EEF,

+			0x4669BE79, 0xCB61B38C, 0xBC66831A, 0x256FD2A0, 0x5268E236,

+			0xCC0C7795, 0xBB0B4703, 0x220216B9, 0x5505262F, 0xC5BA3BBE,

+			0xB2BD0B28, 0x2BB45A92, 0x5CB36A04, 0xC2D7FFA7, 0xB5D0CF31,

+			0x2CD99E8B, 0x5BDEAE1D, 0x9B64C2B0, 0xEC63F226, 0x756AA39C,

+			0x026D930A, 0x9C0906A9, 0xEB0E363F, 0x72076785, 0x05005713,

+			0x95BF4A82, 0xE2B87A14, 0x7BB12BAE, 0x0CB61B38, 0x92D28E9B,

+			0xE5D5BE0D, 0x7CDCEFB7, 0x0BDBDF21, 0x86D3D2D4, 0xF1D4E242,

+			0x68DDB3F8, 0x1FDA836E, 0x81BE16CD, 0xF6B9265B, 0x6FB077E1,

+			0x18B74777, 0x88085AE6, 0xFF0F6A70, 0x66063BCA, 0x11010B5C,

+			0x8F659EFF, 0xF862AE69, 0x616BFFD3, 0x166CCF45, 0xA00AE278,

+			0xD70DD2EE, 0x4E048354, 0x3903B3C2, 0xA7672661, 0xD06016F7,

+			0x4969474D, 0x3E6E77DB, 0xAED16A4A, 0xD9D65ADC, 0x40DF0B66,

+			0x37D83BF0, 0xA9BCAE53, 0xDEBB9EC5, 0x47B2CF7F, 0x30B5FFE9,

+			0xBDBDF21C, 0xCABAC28A, 0x53B39330, 0x24B4A3A6, 0xBAD03605,

+			0xCDD70693, 0x54DE5729, 0x23D967BF, 0xB3667A2E, 0xC4614AB8,

+			0x5D681B02, 0x2A6F2B94, 0xB40BBE37, 0xC30C8EA1, 0x5A05DF1B, 

+			0x2D02EF8D

+		};

+		

+		/// <summary>

+		/// The crc data checksum so far.

+		/// </summary>

+		uint crc = 0;

+		

+		/// <summary>

+		/// Returns the CRC32 data checksum computed so far.

+		/// </summary>

+		public long Value {

+			get {

+				return (long)crc;

+			}

+		}

+		

+		/// <summary>

+		/// Resets the CRC32 data checksum as if no update was ever called.

+		/// </summary>

+		public void Reset() 

+		{ 

+			crc = 0; 

+		}

+		

+		/// <summary>

+		/// Updates the checksum with the int bval.

+		/// </summary>

+		/// <param name = "bval">

+		/// the byte is taken as the lower 8 bits of bval

+		/// </param>

+		public void Update(int bval)

+		{

+			crc ^= CrcSeed;

+			crc  = CrcTable[(crc ^ bval) & 0xFF] ^ (crc >> 8);

+			crc ^= CrcSeed;

+		}

+		

+		/// <summary>

+		/// Updates the checksum with the bytes taken from the array.

+		/// </summary>

+		/// <param name="buffer">

+		/// buffer an array of bytes

+		/// </param>

+		public void Update(byte[] buffer)

+		{

+			Update(buffer, 0, buffer.Length);

+		}

+		

+		/// <summary>

+		/// Adds the byte array to the data checksum.

+		/// </summary>

+		/// <param name = "buf">

+		/// the buffer which contains the data

+		/// </param>

+		/// <param name = "off">

+		/// the offset in the buffer where the data starts

+		/// </param>

+		/// <param name = "len">

+		/// the length of the data

+		/// </param>

+		public void Update(byte[] buf, int off, int len)

+		{

+			if (buf == null) {

+				throw new ArgumentNullException("buf");

+			}

+			

+			if (off < 0 || len < 0 || off + len > buf.Length) {

+				throw new ArgumentOutOfRangeException();

+			}

+			

+			crc ^= CrcSeed;

+			

+			while (--len >= 0) {

+				crc = CrcTable[(crc ^ buf[off++]) & 0xFF] ^ (crc >> 8);

+			}

+			

+			crc ^= CrcSeed;

+		}

+	}

+}

+

+namespace NZlib.Checksums {

+	

+	/// <summary>

+	/// Interface to compute a data checksum used by checked input/output streams.

+	/// A data checksum can be updated by one byte or with a byte array. After each

+	/// update the value of the current checksum can be returned by calling

+	/// <code>getValue</code>. The complete checksum object can also be reset

+	/// so it can be used again with new data.

+	/// </summary>

+	public interface IChecksum

+	{

+		/// <summary>

+		/// Returns the data checksum computed so far.

+		/// </summary>

+		long Value {

+			get;

+		}

+		

+		/// <summary>

+		/// Resets the data checksum as if no update was ever called.

+		/// </summary>

+		void Reset();

+		

+		/// <summary>

+		/// Adds one byte to the data checksum.

+		/// </summary>

+		/// <param name = "bval">

+		/// the data value to add. The high byte of the int is ignored.

+		/// </param>

+		void Update(int bval);

+		

+		/// <summary>

+		/// Updates the data checksum with the bytes taken from the array.

+		/// </summary>

+		/// <param name="buffer">

+		/// buffer an array of bytes

+		/// </param>

+		void Update(byte[] buffer);

+		

+		/// <summary>

+		/// Adds the byte array to the data checksum.

+		/// </summary>

+		/// <param name = "buf">

+		/// the buffer which contains the data

+		/// </param>

+		/// <param name = "off">

+		/// the offset in the buffer where the data starts

+		/// </param>

+		/// <param name = "len">

+		/// the length of the data

+		/// </param>

+		void Update(byte[] buf, int off, int len);

+	}

+}

+

+namespace NZlib.Streams {

+	

+	/// <summary>

+	/// Contains the output from the Inflation process.

+	/// We need to have a window so that we can refer backwards into the output stream

+	/// to repeat stuff.

+	///

+	/// author of the original java version : John Leuner

+	/// </summary>

+	public class OutputWindow

+	{

+		private static int WINDOW_SIZE = 1 << 15;

+		private static int WINDOW_MASK = WINDOW_SIZE - 1;

+		

+		private byte[] window = new byte[WINDOW_SIZE]; //The window is 2^15 bytes

+		private int window_end  = 0;

+		private int window_filled = 0;

+		

+		public void Write(int abyte)

+		{

+			if (window_filled++ == WINDOW_SIZE) {

+				throw new InvalidOperationException("Window full");

+			}

+			window[window_end++] = (byte) abyte;

+			window_end &= WINDOW_MASK;

+		}

+		

+		

+		private void SlowRepeat(int rep_start, int len, int dist)

+		{

+			while (len-- > 0) {

+				window[window_end++] = window[rep_start++];

+				window_end &= WINDOW_MASK;

+				rep_start &= WINDOW_MASK;

+			}

+		}

+		

+		public void Repeat(int len, int dist)

+		{

+			if ((window_filled += len) > WINDOW_SIZE) {

+				throw new InvalidOperationException("Window full");

+			}

+			

+			int rep_start = (window_end - dist) & WINDOW_MASK;

+			int border = WINDOW_SIZE - len;

+			if (rep_start <= border && window_end < border) {

+				if (len <= dist) {

+					System.Array.Copy(window, rep_start, window, window_end, len);

+					window_end += len;

+				}				else {

+					/* We have to copy manually, since the repeat pattern overlaps.

+					*/

+					while (len-- > 0) {

+						window[window_end++] = window[rep_start++];

+					}

+				}

+			} else {

+				SlowRepeat(rep_start, len, dist);

+			}

+		}

+		

+		public int CopyStored(StreamManipulator input, int len)

+		{

+			len = Math.Min(Math.Min(len, WINDOW_SIZE - window_filled), input.AvailableBytes);

+			int copied;

+			

+			int tailLen = WINDOW_SIZE - window_end;

+			if (len > tailLen) {

+				copied = input.CopyBytes(window, window_end, tailLen);

+				if (copied == tailLen) {

+					copied += input.CopyBytes(window, 0, len - tailLen);

+				}

+			} else {

+				copied = input.CopyBytes(window, window_end, len);

+			}

+			

+			window_end = (window_end + copied) & WINDOW_MASK;

+			window_filled += copied;

+			return copied;

+		}

+		

+		public void CopyDict(byte[] dict, int offset, int len)

+		{

+			if (window_filled > 0) {

+				throw new InvalidOperationException();

+			}

+			

+			if (len > WINDOW_SIZE) {

+				offset += len - WINDOW_SIZE;

+				len = WINDOW_SIZE;

+			}

+			System.Array.Copy(dict, offset, window, 0, len);

+			window_end = len & WINDOW_MASK;

+		}

+		

+		public int GetFreeSpace()

+		{

+			return WINDOW_SIZE - window_filled;

+		}

+		

+		public int GetAvailable()

+		{

+			return window_filled;

+		}

+		

+		public int CopyOutput(byte[] output, int offset, int len)

+		{

+			int copy_end = window_end;

+			if (len > window_filled) {

+				len = window_filled;

+			} else {

+				copy_end = (window_end - window_filled + len) & WINDOW_MASK;

+			}

+			

+			int copied = len;

+			int tailLen = len - copy_end;

+			

+			if (tailLen > 0) {

+				System.Array.Copy(window, WINDOW_SIZE - tailLen,

+				                  output, offset, tailLen);

+				offset += tailLen;

+				len = copy_end;

+			}

+			System.Array.Copy(window, copy_end - len, output, offset, len);

+			window_filled -= copied;

+			if (window_filled < 0) {

+				throw new InvalidOperationException();

+			}

+			return copied;

+		}

+		

+		public void Reset()

+		{

+			window_filled = window_end = 0;

+		}

+	}

+}

+

+namespace NZlib.Streams {

+	

+	/// <summary>

+	/// This class allows us to retrieve a specified amount of bits from

+	/// the input buffer, as well as copy big byte blocks.

+	///

+	/// It uses an int buffer to store up to 31 bits for direct

+	/// manipulation.  This guarantees that we can get at least 16 bits,

+	/// but we only need at most 15, so this is all safe.

+	///

+	/// There are some optimizations in this class, for example, you must

+	/// never peek more then 8 bits more than needed, and you must first

+	/// peek bits before you may drop them.  This is not a general purpose

+	/// class but optimized for the behaviour of the Inflater.

+	///

+	/// authors of the original java version : John Leuner, Jochen Hoenicke

+	/// </summary>

+	public class StreamManipulator

+	{

+		private byte[] window;

+		private int window_start = 0;

+		private int window_end = 0;

+		

+		private uint buffer = 0;

+		private int bits_in_buffer = 0;

+		

+		/// <summary>

+		/// Get the next n bits but don't increase input pointer.  n must be

+		/// less or equal 16 and if you if this call succeeds, you must drop

+		/// at least n-8 bits in the next call.

+		/// </summary>

+		/// <returns>

+		/// the value of the bits, or -1 if not enough bits available.  */

+		/// </returns>

+		public int PeekBits(int n)

+		{

+			if (bits_in_buffer < n) {

+				if (window_start == window_end) {

+					return -1;

+				}

+				buffer |= (uint)((window[window_start++] & 0xff |

+				                 (window[window_start++] & 0xff) << 8) << bits_in_buffer);

+				bits_in_buffer += 16;

+			}

+			return (int)(buffer & ((1 << n) - 1));

+		}

+		

+		/// <summary>

+		/// Drops the next n bits from the input.  You should have called peekBits

+		/// with a bigger or equal n before, to make sure that enough bits are in

+		/// the bit buffer.

+		/// </summary>

+		public void DropBits(int n)

+		{

+			buffer >>= n;

+			bits_in_buffer -= n;

+		}

+		

+		/// <summary>

+		/// Gets the next n bits and increases input pointer.  This is equivalent

+		/// to peekBits followed by dropBits, except for correct error handling.

+		/// </summary>

+		/// <returns>

+		/// the value of the bits, or -1 if not enough bits available.

+		/// </returns>

+		public int GetBits(int n)

+		{

+			int bits = PeekBits(n);

+			if (bits >= 0) {

+				DropBits(n);

+			}

+			return bits;

+		}

+		

+		/// <summary>

+		/// Gets the number of bits available in the bit buffer.  This must be

+		/// only called when a previous peekBits() returned -1.

+		/// </summary>

+		/// <returns>

+		/// the number of bits available.

+		/// </returns>

+		public int AvailableBits {

+			get {

+				return bits_in_buffer;

+			}

+		}

+		

+		/// <summary>

+		/// Gets the number of bytes available.

+		/// </summary>

+		/// <returns>

+		/// the number of bytes available.

+		/// </returns>

+		public int AvailableBytes {

+			get {

+				return window_end - window_start + (bits_in_buffer >> 3);

+			}

+		}

+		

+		/// <summary>

+		/// Skips to the next byte boundary.

+		/// </summary>

+		public void SkipToByteBoundary()

+		{

+			buffer >>= (bits_in_buffer & 7);

+			bits_in_buffer &= ~7;

+		}

+		

+		public bool IsNeedingInput {

+			get {

+				return window_start == window_end;

+			}

+		}

+		

+		/// <summary>

+		/// Copies length bytes from input buffer to output buffer starting

+		/// at output[offset].  You have to make sure, that the buffer is

+		/// byte aligned.  If not enough bytes are available, copies fewer

+		/// bytes.

+		/// </summary>

+		/// <param name="output">

+		/// the buffer.

+		/// </param>

+		/// <param name="offset">

+		/// the offset in the buffer.

+		/// </param>

+		/// <param name="length">

+		/// the length to copy, 0 is allowed.

+		/// </param>

+		/// <returns>

+		/// the number of bytes copied, 0 if no byte is available.

+		/// </returns>

+		public int CopyBytes(byte[] output, int offset, int length)

+		{

+			if (length < 0) {

+				throw new ArgumentOutOfRangeException("length negative");

+			}

+			if ((bits_in_buffer & 7) != 0)   {

+				/* bits_in_buffer may only be 0 or 8 */

+				throw new InvalidOperationException("Bit buffer is not aligned!");

+			}

+			

+			int count = 0;

+			while (bits_in_buffer > 0 && length > 0) {

+				output[offset++] = (byte) buffer;

+				buffer >>= 8;

+				bits_in_buffer -= 8;

+				length--;

+				count++;

+			}

+			if (length == 0) {

+				return count;

+			}

+			

+			int avail = window_end - window_start;

+			if (length > avail) {

+				length = avail;

+			}

+			System.Array.Copy(window, window_start, output, offset, length);

+			window_start += length;

+			

+			if (((window_start - window_end) & 1) != 0) {

+				/* We always want an even number of bytes in input, see peekBits */

+				buffer = (uint)(window[window_start++] & 0xff);

+				bits_in_buffer = 8;

+			}

+			return count + length;

+		}

+		

+		public StreamManipulator()

+		{

+		}

+		

+		public void Reset()

+		{

+			buffer = (uint)(window_start = window_end = bits_in_buffer = 0);

+		}

+		

+		public void SetInput(byte[] buf, int off, int len)

+		{

+			if (window_start < window_end) {

+				throw new InvalidOperationException("Old input was not completely processed");

+			}

+			

+			int end = off + len;

+			

+			/* We want to throw an ArrayIndexOutOfBoundsException early.  The

+			* check is very tricky: it also handles integer wrap around.

+			*/

+			if (0 > off || off > end || end > buf.Length) {

+				throw new ArgumentOutOfRangeException();

+			}

+			

+			if ((len & 1) != 0) {

+				/* We always want an even number of bytes in input, see peekBits */

+				buffer |= (uint)((buf[off++] & 0xff) << bits_in_buffer);

+				bits_in_buffer += 8;

+			}

+			

+			window = buf;

+			window_start = off;

+			window_end = end;

+		}

+	}

+}

diff --git a/mono/cil/cil-opcodes.xml b/mono/cil/cil-opcodes.xml
index dfd5fb106cb..0a8813feff2 100644
--- a/mono/cil/cil-opcodes.xml
+++ b/mono/cil/cil-opcodes.xml
@@ -293,5 +293,15 @@
 <opcode name="illegal" input="Pop0" output="Push0" args="InlineNone" o1="0x00" o2="0x00" flow="meta"/>

 <opcode name="endmac" input="Pop0" output="Push0" args="InlineNone" o1="0x00" o2="0x00" flow="meta"/>

 

+<opcode name="mono_func1" input="Pop1" output="PushI" args="ShortInlineI" o1="0xF0" o2="0x00" flow="next"/>

+<opcode name="mono_proc2" input="PopI+PopI" output="Push0" args="ShortInlineI" o1="0xF0" o2="0x01" flow="next"/>

+<opcode name="mono_proc3" input="PopI+PopI+PopI" output="Push0" args="ShortInlineI" o1="0xF0" o2="0x02" flow="next"/>

+<opcode name="mono_free" input="Pop1" output="Push0" args="InlineNone" o1="0xF0" o2="0x03" flow="next"/>

+<opcode name="mono_objaddr" input="Pop1" output="PushI" args="InlineNone" o1="0xF0" o2="0x04" flow="next"/>

+<opcode name="mono_ldptr" input="Pop0" output="PushI" args="InlineI" o1="0xF0" o2="0x05" flow="next"/>

+

+<opcode name="mono_vtaddr" input="Pop1" output="PushI" args="InlineNone" o1="0xF0" o2="0x06" flow="next"/>

+<opcode name="mono_newobj" input="Pop0" output="PushRef" args="InlineType" o1="0xF0" o2="0x07" flow="next"/>

+<opcode name="mono_retobj" input="PopI" output="Push0" args="InlineType" o1="0xF0" o2="0x08" flow="return"/>

 

 </opdesc>

diff --git a/mono/cil/opcode.def b/mono/cil/opcode.def
index 9331159500d..9ba219339e3 100644
--- a/mono/cil/opcode.def
+++ b/mono/cil/opcode.def
@@ -291,6 +291,15 @@ OPDEF(CEE_UNUSED55, "unused55", Pop0, Push0, InlineNone, X, 2, 0xFE, 0x21, NEXT)
 OPDEF(CEE_UNUSED70, "unused70", Pop0, Push0, InlineNone, X, 2, 0xFE, 0x22, NEXT)
 OPDEF(CEE_ILLEGAL, "illegal", Pop0, Push0, InlineNone, X, 2, 0x00, 0x00, META)
 OPDEF(CEE_ENDMAC, "endmac", Pop0, Push0, InlineNone, X, 2, 0x00, 0x00, META)
+OPDEF(CEE_MONO_FUNC1, "mono_func1", Pop1, PushI, ShortInlineI, X, 2, 0xF0, 0x00, NEXT)
+OPDEF(CEE_MONO_PROC2, "mono_proc2", PopI+PopI, Push0, ShortInlineI, X, 2, 0xF0, 0x01, NEXT)
+OPDEF(CEE_MONO_PROC3, "mono_proc3", PopI+PopI+PopI, Push0, ShortInlineI, X, 2, 0xF0, 0x02, NEXT)
+OPDEF(CEE_MONO_FREE, "mono_free", Pop1, Push0, InlineNone, X, 2, 0xF0, 0x03, NEXT)
+OPDEF(CEE_MONO_OBJADDR, "mono_objaddr", Pop1, PushI, InlineNone, X, 2, 0xF0, 0x04, NEXT)
+OPDEF(CEE_MONO_LDPTR, "mono_ldptr", Pop0, PushI, InlineI, X, 2, 0xF0, 0x05, NEXT)
+OPDEF(CEE_MONO_VTADDR, "mono_vtaddr", Pop1, PushI, InlineNone, X, 2, 0xF0, 0x06, NEXT)
+OPDEF(CEE_MONO_NEWOBJ, "mono_newobj", Pop0, PushRef, InlineType, X, 2, 0xF0, 0x07, NEXT)
+OPDEF(CEE_MONO_RETOBJ, "mono_retobj", PopI, Push0, InlineType, X, 2, 0xF0, 0x08, RETURN)
 #ifndef OPALIAS
 #define _MONO_CIL_OPALIAS_DEFINED_
 #define OPALIAS(a,s,r)
diff --git a/mono/dis/ChangeLog b/mono/dis/ChangeLog
index 78aa5ef154e..ea1eacc2670 100644
--- a/mono/dis/ChangeLog
+++ b/mono/dis/ChangeLog
@@ -1,4 +1,116 @@
 
+Tue Aug 6 12:40:09 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* main.c: use mono_image_get_entry_point ().
+
+Fri Jul 26 11:41:32 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* main.c, dump.h, dump.c: output hash value in File table.
+	Add dumper function for DeclSecurity table.
+
+Fri Jul 19 14:20:10 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* main.c: handle null parent.
+
+2002-07-02  Martin Baulig  <martin@gnome.org>
+
+	* get.c (dis_stringify_object_with_class): New static function to
+	stringify an object when we already have its class.
+	(dis_stringify_object): Get the class and call dis_stringify_object().
+	(get_method): Call dis_stringify_object_with_class() since we already
+	have the object's class.
+
+Thu Jun 20 11:50:38 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* main.c, dump.c, dump.h: code to dump the MethodImpl table.
+
+Mon Jun 17 17:31:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* get.h, get.c: get_marshal_info() to get a marshal descriptor.
+	* main.c, dump.h, dump.c: added code to dump the FieldMarshl table.
+
+Tue Jun 11 14:11:12 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* get.c: handle modulerefs.
+	* main.c: fix --mscorlib argument handling.
+
+Fri Jun 7 19:39:43 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* get.c: handle typerefs of nested types. Don't print "."
+	with an empty namespace.
+
+Sat Jun 1 13:57:17 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* main.c: print byte values correctly.
+
+2002-05-20  Martin Baulig  <martin@gnome.org>
+
+	* main.c: Added `--output=FILENAME' command line option.
+
+	* monodis.1: Documented it here.
+
+Thu May 16 17:21:07 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* main.c, dump,c, get.h, get.c: diassemble custom attributes.
+
+Wed May 15 16:02:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* main.c: output field RVA data.
+
+Fri May 10 21:00:52 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* main.c: print field offset info if needed.
+
+Wed May 1 17:07:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* dump.c, dump.h, main.c: dump ExportedTypes table.
+	* get.c: fix get_module (), remove magic numbers.
+	* monodis.1: update manpage (hi miguel!:)
+
+Mon Apr 29 12:12:35 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* dump.c, dump.h, main.c: support for dumping the manifest resource table.
+
+Mon Apr 15 11:35:05 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* dump.c, dump.h, get.c, get.h, main.c: support for dumping the
+	module table and guid values.
+
+Mon Apr 8 17:15:04 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* main.c: removed unneeded runtime invoke support.
+
+Thu Mar 28 16:52:11 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* dis-cil.c, dump.c, get.c, main.c, util.h: spring warning cleanup.
+
+Thu Mar 28 11:29:58 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* util.c: when an invalid flags combination is seen,
+	return the string "invalid-flags", so disassembly can continue.
+
+Tue Mar 19 18:15:29 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* dis-cil.c: use unsigned for variables.
+
+Sat Mar 16 19:13:57 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* dump.c: handle TypeSpec token in memberref table dump.
+
+2002-03-08  Nick Drochak  <ndrochak@gol.com>
+
+	* monodis.1: Add info about new parameter
+	* main.c: Add flag to remember if user wants to us mscorlib for
+	non-corilb assembly names
+	* get.c(get_typedef): use mscorlib for assembly name only
+	if user specifies it with a command line parameter. Default
+	behavior is now to use actual assembly name.
+ 
+Tue Mar 5 18:11:01 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* dump.c: print index of the methodsemantics table.
+	* main.cs: print event information.
+
 Wed Feb 20 22:10:48 CET 2002 Paolo Molaro <lupus@ximian.com>
 
 	* dump.c: fix the fix and more complete custom attribute decoder.
diff --git a/mono/dis/Makefile.am b/mono/dis/Makefile.am
index 2e36ea8d865..9bec7ec8a3c 100644
--- a/mono/dis/Makefile.am
+++ b/mono/dis/Makefile.am
@@ -2,7 +2,7 @@ INCLUDES = $(GLIB_CFLAGS) -I$(top_srcdir)
 
 bin_PROGRAMS = monodis
 
-lib_LIBRARIES = libmonodis.a
+noinst_LIBRARIES = libmonodis.a
 
 libmonodis_a_SOURCES =	\
 	get.c		\
@@ -20,8 +20,9 @@ monodis_SOURCES =	\
 
 monodis_LDADD = 			\
 	libmonodis.a			\
-	../metadata/libmetadata.a 	\
-	../io-layer/libwapi.a		\
+	../metadata/libmetadata.la 	\
+	../io-layer/libwapi.la		\
+	../utils/libmonoutils.la	\
 	$(GMODULE_LIBS) 		\
 	$(GLIB_LIBS) 
 
diff --git a/mono/dis/dis-cil.c b/mono/dis/dis-cil.c
index 617a823cf2c..a250356a0d7 100644
--- a/mono/dis/dis-cil.c
+++ b/mono/dis/dis-cil.c
@@ -59,7 +59,7 @@ dissasemble_cil (MonoImage *m, MonoMethodHeader *mh)
 	const MonoOpcode *entry;
 	char indent[1024];
 	int i, indent_level = 0;
-	char *clause_names[] = {"catch", "filter", "finally", "fault"};
+	const char *clause_names[] = {"catch", "filter", "finally", "fault"};
 
 	indent [0] = 0;
 
@@ -144,7 +144,8 @@ dissasemble_cil (MonoImage *m, MonoMethodHeader *mh)
 			break;
 			
 		case MonoInlineR: {
-			double r = *(double *) ptr;
+			double r;
+			readr8 (ptr, &r);
 			fprintf (output, "%g", r);
 			ptr += 8;
 			break;
@@ -175,16 +176,16 @@ dissasemble_cil (MonoImage *m, MonoMethodHeader *mh)
 		case MonoInlineSwitch: {
 			guint32 count = read32 (ptr);
 			const unsigned char *endswitch;
-			guint32 i;
+			guint32 n;
 			
 			ptr += 4;
 			endswitch = ptr + sizeof (guint32) * count;
 			fprintf (output, "(\n");
 			CODE_INDENT;
-			for (i = 0; i < count; i++){
+			for (n = 0; n < count; n++){
 				fprintf (output, "\t%sIL_%04x%s", indent, 
 					endswitch-start+read32 (ptr), 
-					i == count - 1 ? ")" : ",\n");
+					n == count - 1 ? ")" : ",\n");
 				ptr += 4;
 			}
 			CODE_UNINDENT;
@@ -213,9 +214,9 @@ dissasemble_cil (MonoImage *m, MonoMethodHeader *mh)
 		}
 
 		case MonoInlineVar: {
-			gint16 var_idx = read16 (ptr);
+			guint16 var_idx = read16 (ptr);
 
-			fprintf (output, "variable-%d\n", var_idx);
+			fprintf (output, "%d\n", var_idx);
 			ptr += 2;
 			break;
 		}
@@ -237,7 +238,8 @@ dissasemble_cil (MonoImage *m, MonoMethodHeader *mh)
 		}
 
 		case MonoShortInlineR: {
-			float f = *(float *) ptr;
+			float f;
+			readr4 (ptr, &f);
 
 			fprintf (output, "%g", (double) f);
 			ptr += 4;
@@ -245,7 +247,7 @@ dissasemble_cil (MonoImage *m, MonoMethodHeader *mh)
 		}
 
 		case MonoShortInlineVar: {
-			signed char x = *ptr;
+			unsigned char x = *ptr;
 
 			fprintf (output, "%d", (int) x);
 			ptr++;
diff --git a/mono/dis/dump.c b/mono/dis/dump.c
index 7e4c06bee6e..203d7db0ea2 100644
--- a/mono/dis/dump.c
+++ b/mono/dis/dump.c
@@ -199,9 +199,9 @@ dump_table_memberref (MonoImage *m)
 {
 	MonoTableInfo *t = &m->tables [MONO_TABLE_MEMBERREF];
 	int i, kind, idx;
-	char *ks, *x, *xx;
+	char *x, *xx;
 	char *sig;
-	const char *blob;
+	const char *blob, *ks;
 
 	fprintf (output, "MemberRef Table (1..%d)\n", t->rows);
 
@@ -229,7 +229,11 @@ dump_table_memberref (MonoImage *m)
 		case 3:
 			ks = "MethodDef"; break;
 		case 4:
-			ks = "TypeSpec"; break;
+			ks = "TypeSpec";
+			xx = get_typespec (m, idx);
+			x = g_strconcat (xx, ".", mono_metadata_string_heap (m, cols [MONO_MEMBERREF_NAME]), NULL);
+			g_free (xx);
+			break;
 		default:
 			g_error ("Unknown tag: %d\n", kind);
 		}
@@ -287,7 +291,7 @@ dump_table_constant (MonoImage *m)
 
 	for (i = 0; i < t->rows; i++){
 		guint32 cols [MONO_CONSTANT_SIZE];
-		char *parent = desc [cols [MONO_CONSTANT_PARENT] & HASCONSTANT_MASK];
+		const char *parent = desc [cols [MONO_CONSTANT_PARENT] & HASCONSTANT_MASK];
 		
 		mono_metadata_decode_row (t, i, cols, MONO_CONSTANT_SIZE);
 
@@ -391,18 +395,80 @@ void
 dump_table_file (MonoImage *m)
 {
 	MonoTableInfo *t = &m->tables [MONO_TABLE_FILE];
-	int i;
+	int i, j, len;
 	fprintf (output, "File Table (1..%d)\n", t->rows);
 
 	for (i = 0; i < t->rows; i++){
 		guint32 cols [MONO_FILE_SIZE];
-		const char *name;
+		const char *name, *hash;
 		
 		mono_metadata_decode_row (t, i, cols, MONO_FILE_SIZE);
 
 		name = mono_metadata_string_heap (m, cols [MONO_FILE_NAME]);
-		fprintf (output, "%d: %s %s\n", i + 1, name, 
+		fprintf (output, "%d: %s %s [", i + 1, name, 
 				cols [MONO_FILE_FLAGS] & 0x1 ? "nometadata" : "containsmetadata");
+		hash = mono_metadata_blob_heap (m, cols [MONO_FILE_HASH_VALUE]);
+		len = mono_metadata_decode_blob_size (hash, &hash);
+		for (j = 0; j < len; ++j)
+			fprintf (output, "%s%02X", j? " ": "", hash [j] & 0xff);
+		fprintf (output, "]\n");
+	}
+	
+}
+
+static char*
+get_manifest_implementation (MonoImage *m, guint32 idx)
+{
+	guint32 row;
+	const char* table = "";
+	if (!idx)
+		return g_strdup ("current module");
+	row = idx >> IMPLEMENTATION_BITS;
+	switch (idx & IMPLEMENTATION_MASK) {
+	case IMPLEMENTATION_FILE:
+		table = "file";
+		break;
+	case IMPLEMENTATION_ASSEMBLYREF:
+		table = "assemblyref";
+		break;
+	case IMPLEMENTATION_EXP_TYPE:
+	default:
+		g_assert_not_reached ();
+	}
+	return g_strdup_printf ("%s %d", table, row);
+}
+
+static const char*
+get_manifest_flags (guint32 mf)
+{
+	mf &= 3;
+	switch (mf) {
+	case 1: return "public";
+	case 2: return "private";
+	default:
+		return "";
+	}
+}
+
+void
+dump_table_manifest (MonoImage *m)
+{
+	MonoTableInfo *t = &m->tables [MONO_TABLE_MANIFESTRESOURCE];
+	int i;
+	fprintf (output, "Manifestresource Table (1..%d)\n", t->rows);
+
+	for (i = 0; i < t->rows; i++){
+		guint32 cols [MONO_MANIFEST_SIZE];
+		const char *name, *mf;
+		char *impl;
+		
+		mono_metadata_decode_row (t, i, cols, MONO_MANIFEST_SIZE);
+
+		name = mono_metadata_string_heap (m, cols [MONO_MANIFEST_NAME]);
+		mf = get_manifest_flags (cols [MONO_MANIFEST_FLAGS]);
+		impl = get_manifest_implementation (m, cols [MONO_MANIFEST_IMPLEMENTATION]);
+		fprintf (output, "%d: %s '%s' at offset %u in %s\n", i + 1, mf, name, cols [MONO_MANIFEST_OFFSET], impl);
+		g_free (impl);
 	}
 	
 }
@@ -427,6 +493,27 @@ dump_table_moduleref (MonoImage *m)
 }
 
 void
+dump_table_module (MonoImage *m)
+{
+	MonoTableInfo *t = &m->tables [MONO_TABLE_MODULE];
+	int i;
+	fprintf (output, "ModuleRef Table (1..%d)\n", t->rows);
+
+	for (i = 0; i < t->rows; i++){
+		guint32 cols [MONO_MODULE_SIZE];
+		const char *name;
+		char *guid;
+		
+		mono_metadata_decode_row (t, i, cols, MONO_MODULE_SIZE);
+
+		name = mono_metadata_string_heap (m, cols [MONO_MODULE_NAME]);
+		guid = get_guid (m, cols [MONO_MODULE_MVID]);
+		fprintf (output, "%d: %s %d %s\n", i + 1, name, cols [MONO_MODULE_MVID], guid);
+	}
+	
+}
+
+void
 dump_table_method (MonoImage *m)
 {
 	MonoTableInfo *t = &m->tables [MONO_TABLE_METHOD];
@@ -467,6 +554,42 @@ dump_table_method (MonoImage *m)
 	
 }
 
+static guint32
+method_dor_to_token (guint32 idx) {
+	switch (idx & METHODDEFORREF_MASK) {
+	case METHODDEFORREF_METHODDEF:
+		return MONO_TOKEN_METHOD_DEF | (idx >> METHODDEFORREF_BITS);
+	case METHODDEFORREF_METHODREF:
+		return MONO_TOKEN_MEMBER_REF | (idx >> METHODDEFORREF_BITS);
+	}
+	return -1;
+}
+
+void
+dump_table_methodimpl (MonoImage *m)
+{
+	MonoTableInfo *t = &m->tables [MONO_TABLE_METHODIMPL];
+	MonoTableInfo *td = &m->tables [MONO_TABLE_TYPEDEF];
+	int i;
+
+	fprintf (output, "MethodImpl Table (1..%d)\n", t->rows);
+
+	for (i = 1; i <= t->rows; i++){
+		guint32 cols [MONO_METHODIMPL_SIZE];
+		char *class, *impl, *decl;
+
+		mono_metadata_decode_row (t, i - 1, cols, MONO_METHODIMPL_SIZE);
+		class = get_typedef (m, cols [MONO_METHODIMPL_CLASS]);
+		impl = get_method (m, method_dor_to_token (cols [MONO_METHODIMPL_BODY]));
+		decl = get_method (m, method_dor_to_token (cols [MONO_METHODIMPL_DECLARATION]));
+		fprintf (output, "%d: %s\n\tdecl: %s\n\timpl: %s\n", i, class, decl, impl);
+		g_free (class);
+		g_free (impl);
+		g_free (decl);
+	}
+	
+}
+
 static map_t semantics_map [] = {
 		{1, "setter"},
 		{2, "getter"},
@@ -490,9 +613,9 @@ dump_table_methodsem (MonoImage *m)
 		
 		mono_metadata_decode_row (t, i - 1, cols, MONO_METHOD_SEMA_SIZE);
 		semantics = flags (cols [MONO_METHOD_SEMA_SEMANTICS], semantics_map);
-		is_property = cols [MONO_METHOD_SEMA_ASSOCIATION] & 1;
-		index = cols [MONO_METHOD_SEMA_ASSOCIATION] >> 1;
-		fprintf (output, "%d: %s method: %d %s %d\n", i, semantics,
+		is_property = cols [MONO_METHOD_SEMA_ASSOCIATION] & HAS_SEMANTICS_MASK;
+		index = cols [MONO_METHOD_SEMA_ASSOCIATION] >> HAS_SEMANTICS_BITS;
+		fprintf (output, "%d: [%d] %s method: %d %s %d\n", i, cols [MONO_METHOD_SEMA_ASSOCIATION], semantics,
 						cols [MONO_METHOD_SEMA_METHOD] - 1, 
 						is_property? "property" : "event",
 						index);
@@ -521,7 +644,7 @@ has_cattr_get_table (MonoImage *m, guint32 val)
 {
 	guint32 t = val & CUSTOM_ATTR_MASK;
 	guint32 index = val >> CUSTOM_ATTR_BITS;
-	char *table;
+	const char *table;
 
 	switch (t) {
 	case CUSTOM_ATTR_METHODDEF:
@@ -687,10 +810,15 @@ handle_enum:
 			break;
 		}
 	}
-	/*
-	 * FIXME: handle named args only when all the type are handled in fixed args.
-	 * slen = read16 (p);
-	 */
+	slen = read16 (p);
+	if (slen) {
+		g_string_sprintfa (res, " %d named args: (", slen);
+		slen = len - (p - value) + 1;
+		for (i = 0; i < slen; ++i) {
+			g_string_sprintfa (res, " %02X", (p [i] & 0xff));
+		}
+		g_string_append_c (res, ')');
+	}
 	s = res->str;
 	g_string_free (res, FALSE);
 	return s;
@@ -757,3 +885,102 @@ dump_table_nestedclass (MonoImage *m)
 	
 }
 
+void
+dump_table_exported (MonoImage *m)
+{
+	MonoTableInfo *t = &m->tables [MONO_TABLE_EXPORTEDTYPE];
+	guint32 cols [MONO_EXP_TYPE_SIZE];
+	int i;
+	const char *name, *nspace;
+	fprintf (output, "ExportedType Table (1..%d)\n", t->rows);
+
+	for (i = 1; i <= t->rows; i++) {
+		mono_metadata_decode_row (t, i - 1, cols, MONO_EXP_TYPE_SIZE);
+		name = mono_metadata_string_heap (m, cols [MONO_EXP_TYPE_NAME]);
+		nspace = mono_metadata_string_heap (m, cols [MONO_EXP_TYPE_NAMESPACE]);
+		fprintf (output, "%d: %s %s\n", i, name, nspace);
+	}
+	
+}
+
+void
+dump_table_field_marshal (MonoImage *m)
+{
+	MonoTableInfo *t = &m->tables [MONO_TABLE_FIELDMARSHAL];
+	guint32 cols [MONO_FIELD_MARSHAL_SIZE];
+	int i, is_field, idx;
+	const char *blob;
+	char *native;
+	
+	fprintf (output, "FieldMarshal Table (1..%d)\n", t->rows);
+
+	for (i = 1; i <= t->rows; i++) {
+		mono_metadata_decode_row (t, i - 1, cols, MONO_FIELD_MARSHAL_SIZE);
+		blob = mono_metadata_blob_heap (m, cols [MONO_FIELD_MARSHAL_NATIVE_TYPE]);
+		native = get_marshal_info (m, blob);
+		is_field = (cols [MONO_FIELD_MARSHAL_PARENT] & HAS_FIELD_MARSHAL_MASK) == HAS_FIELD_MARSHAL_FIELDSREF;
+		idx = cols [MONO_FIELD_MARSHAL_PARENT] >> HAS_FIELD_MARSHAL_BITS;
+		fprintf (output, "%d: (0x%04x) %s %d: %s\n", i, cols [MONO_FIELD_MARSHAL_PARENT], is_field? "Field" : "Param", idx, native);
+		g_free (native);
+	}
+	
+}
+
+static const char*
+get_security_action (int val) {
+	static char buf [32];
+
+	switch (val) {
+	case SECURITY_ACTION_DEMAND:
+		return "Demand";
+	case SECURITY_ACTION_ASSERT:
+		return "Assert";
+	case SECURITY_ACTION_DENY:
+		return "Deny";
+	case SECURITY_ACTION_PERMITONLY:
+		return "PermitOnly";
+	case SECURITY_ACTION_LINKDEMAND:
+		return "LinkDemand";
+	case SECURITY_ACTION_INHERITDEMAND:
+		return "InheritanceDemand";
+	case SECURITY_ACTION_REQMIN:
+		return "RequestMinimum";
+	case SECURITY_ACTION_REQOPT:
+		return "RequestOptional";
+	case SECURITY_ACTION_REQREFUSE:
+		return "RequestRefuse";
+	default:
+		g_snprintf (buf, sizeof (buf), "0x%04X", val);
+		return buf;
+	}
+}
+
+void 
+dump_table_declsec (MonoImage *m)
+{
+	MonoTableInfo *t = &m->tables [MONO_TABLE_DECLSECURITY];
+	guint32 cols [MONO_DECL_SECURITY_SIZE];
+	int i, len;
+	guint32 idx;
+	const char *blob, *action;
+	const char* parent[] = {
+		"TypeDef", "MethodDef", "Assembly", ""
+	};
+	
+	fprintf (output, "DeclSecurity Table (1..%d)\n", t->rows);
+
+	for (i = 1; i <= t->rows; i++) {
+		mono_metadata_decode_row (t, i - 1, cols, MONO_DECL_SECURITY_SIZE);
+		blob = mono_metadata_blob_heap (m, cols [MONO_DECL_SECURITY_PERMISSIONSET]);
+		len = mono_metadata_decode_blob_size (blob, &blob);
+		action = get_security_action (cols [MONO_DECL_SECURITY_ACTION]);
+		idx = cols [MONO_DECL_SECURITY_PARENT];
+		fprintf (output, "%d: %s on %s %d%s", i, action, parent [idx & HAS_DECL_SECURITY_MASK], idx >> HAS_DECL_SECURITY_BITS, len? ":\n\t":"\n");
+		if (!len)
+			continue;
+		for (idx = 0; idx < len; ++idx)
+			fprintf (output, "%c", blob [idx]);
+		fprintf (output, "\n");
+	}
+}
+
diff --git a/mono/dis/dump.h b/mono/dis/dump.h
index 79fd6bb0d27..40470d86f8e 100644
--- a/mono/dis/dump.h
+++ b/mono/dis/dump.h
@@ -5,17 +5,23 @@ void dump_table_assemblyref  (MonoImage *m);
 void dump_table_class_layout (MonoImage *m);
 void dump_table_constant     (MonoImage *m);
 void dump_table_customattr   (MonoImage *m);
+void dump_table_declsec      (MonoImage *m);
 void dump_table_property     (MonoImage *m);
 void dump_table_property_map (MonoImage *m);
 void dump_table_event        (MonoImage *m);
 void dump_table_file         (MonoImage *m);
 void dump_table_moduleref    (MonoImage *m);
+void dump_table_module       (MonoImage *m);
 void dump_table_method       (MonoImage *m);
+void dump_table_methodimpl   (MonoImage *m);
 void dump_table_methodsem    (MonoImage *m);
 void dump_table_field        (MonoImage *m);
+void dump_table_manifest     (MonoImage *m);
 void dump_table_memberref    (MonoImage *m);
 void dump_table_param        (MonoImage *m);
 void dump_table_typedef      (MonoImage *m);
 void dump_table_typeref      (MonoImage *m);
+void dump_table_exported     (MonoImage *m);
 void dump_table_nestedclass  (MonoImage *m);
 void dump_table_interfaceimpl (MonoImage *m);
+void dump_table_field_marshal (MonoImage *m);
diff --git a/mono/dis/get.c b/mono/dis/get.c
index 72b38040e28..ebe11b5a3ef 100644
--- a/mono/dis/get.c
+++ b/mono/dis/get.c
@@ -16,17 +16,21 @@
 #include "util.h"
 #include "get.h"
 #include <mono/metadata/class.h>
+#include <mono/metadata/marshal.h>
+
+extern gboolean substitute_with_mscorlib_p;
 
 char *
 get_typedef (MonoImage *m, int idx)
 {
 	guint32 cols [MONO_TYPEDEF_SIZE];
+	const char *ns;
 
 	mono_metadata_decode_row (&m->tables [MONO_TABLE_TYPEDEF], idx - 1, cols, MONO_TYPEDEF_SIZE);
 
+	ns = mono_metadata_string_heap (m, cols [MONO_TYPEDEF_NAMESPACE]);
 	return g_strdup_printf (
-		"%s.%s",
-		mono_metadata_string_heap (m, cols [MONO_TYPEDEF_NAMESPACE]),
+		"%s%s%s", ns, *ns?".":"",
 		mono_metadata_string_heap (m, cols [MONO_TYPEDEF_NAME]));
 }
 
@@ -40,7 +44,7 @@ get_module (MonoImage *m, int idx)
 	 */
 	g_assert (idx == 1);
 	    
-	mono_metadata_decode_row (&m->tables [MONO_TABLE_MODULEREF], idx - 1, cols, MONO_MODULE_SIZE);
+	mono_metadata_decode_row (&m->tables [MONO_TABLE_MODULE], idx - 1, cols, MONO_MODULE_SIZE);
 
 	return g_strdup (mono_metadata_string_heap (m, cols [MONO_MODULE_NAME]));
 }
@@ -203,35 +207,33 @@ get_typeref (MonoImage *m, int idx)
 	t = mono_metadata_string_heap (m, cols [MONO_TYPEREF_NAME]);
 	s = mono_metadata_string_heap (m, cols [MONO_TYPEREF_NAMESPACE]);
 
-	rs_idx = cols [MONO_TYPEREF_SCOPE] >> 2;
-	/*
-	 * Two bits in Beta2.
-	 * ECMA spec claims 3 bits
-	 */
-	table = cols [MONO_TYPEREF_SCOPE] & 3;
+	rs_idx = cols [MONO_TYPEREF_SCOPE] >> RESOLTION_SCOPE_BITS;
+	table = cols [MONO_TYPEREF_SCOPE] & RESOLTION_SCOPE_MASK;
 	
 	switch (table){
-	case 0: /* Module */
+	case RESOLTION_SCOPE_MODULE: /* Module */
 		x = get_module (m, rs_idx);
-		ret = g_strdup_printf ("TODO:TypeRef-Module [%s] %s.%s", x, s, t);
+		ret = g_strdup_printf ("[%s] %s%s%s", x, s, *s?".":"", t);
 		g_free (x);
 		break;
 
-	case 1: /* ModuleRef */
+	case RESOLTION_SCOPE_MODULEREF: /* ModuleRef */
 		ret = g_strdup_printf ("TODO:TypeRef-ModuleRef (%s.%s)", s, t);
 		break;
 			      
-	case 2: /*
+	case RESOLTION_SCOPE_ASSEMBLYREF: /*
 		 * AssemblyRef (ECMA docs claim it is 3, but it looks to
 		 * me like it is 2 (tokens are prefixed with 0x23)
 		 */
 		x = get_assemblyref (m, rs_idx);
-		ret = g_strdup_printf ("[%s]%s.%s", x, s, t);
+		ret = g_strdup_printf ("[%s]%s%s%s", x, s, *s?".":"", t);
 		g_free (x);
 		break;
 		
-	case 4: /* TypeRef */
-		ret =  g_strdup_printf ("TODO:TypeRef-TypeRef: TYPEREF! (%s.%s)", s, t);
+	case RESOLTION_SCOPE_TYPEREF: /* TypeRef */
+		x = get_typeref (m, rs_idx);
+		ret =  g_strdup_printf ("%s/%s", x, t);
+		g_free (x);
 		break;
 		
 	default:
@@ -280,7 +282,7 @@ get_typedef_or_ref (MonoImage *m, guint32 dor_token)
 		break;
 
 	default:
-		g_error ("Unhandled encoding for typedef-or-ref coded index");
+		g_error ("Unhandled encoding for typedef-or-ref coded index 0x%08x", dor_token);
 
 	}
 	
@@ -433,7 +435,7 @@ dis_stringify_param (MonoImage *m, MonoType *param)
 {
 	char *t;
 	char *result;
-	char *out = param->attrs & 2 ? "[out] ": "";
+	const char *out = param->attrs & 2 ? "[out] ": "";
 	t = dis_stringify_type (m, param);
 	result = g_strconcat (out, t, NULL);
 	g_free (t);
@@ -498,31 +500,40 @@ dis_stringify_method_signature (MonoImage *m, MonoMethodSignature *method, int m
 }
 
 static char *
-dis_stringify_object (MonoImage *m, MonoType *type)
+dis_stringify_object_with_class (MonoImage *m, MonoClass *c)
 {
-	char *otype = type->type == MONO_TYPE_CLASS? "class" : "valuetype";
-	char *assemblyref = NULL;
-	MonoClass *c = type->data.klass;
-	if (!c)
-		return g_strdup ("Unknown");
+	/* FIXME: handle MONO_TYPE_OBJECT ... */
+	const char *otype = c->byval_arg.type == MONO_TYPE_CLASS? "class" : "valuetype";
+	char *assemblyref = NULL, *result;
 	if (m != c->image) {
-		/* we cheat */
-		if (!strcmp ("corlib", c->image->assembly_name))
-			assemblyref = g_strdup_printf ("[%s]", "mscorlib");
-		else
-			assemblyref = g_strdup_printf ("[%s]", c->image->assembly_name);
+		if (c->image->assembly_name) {
+			/* we cheat */
+			if (substitute_with_mscorlib_p && !strcmp ("corlib", c->image->assembly_name))
+				assemblyref = g_strdup_printf ("[%s]", "mscorlib");
+			else
+				assemblyref = g_strdup_printf ("[%s]", c->image->assembly->aname.name);
+		} else {
+			assemblyref = g_strdup_printf ("[.module %s]", c->image->module_name);
+		}
 	}
-	otype = g_strdup_printf ("%s %s%s%s%s", otype, assemblyref?assemblyref:"", c->name_space, 
+	result = g_strdup_printf ("%s %s%s%s%s", otype, assemblyref?assemblyref:"", c->name_space, 
 				*c->name_space?".":"", c->name);
 	g_free (assemblyref);
-	return otype;
+	return result;
+}
+
+static char *
+dis_stringify_object (MonoImage *m, MonoType *type)
+{
+	MonoClass *c = mono_class_from_mono_type (type);
+	return dis_stringify_object_with_class (m, c);
 }
 
 char*
 dis_stringify_type (MonoImage *m, MonoType *type)
 {
-	char *bare = NULL, *pinned = "", *byref = "";
-	char *mods = NULL;
+	const char *pinned = "", *byref = "";
+	char *bare = NULL, *mods = NULL;
 	char *result;
 
 	if (type->num_mods)
@@ -990,10 +1001,11 @@ get_method (MonoImage *m, guint32 token)
 	MonoMethod *mh;
 
 	mh = mono_get_method (m, token, NULL);
-	if (mh)
-		name = g_strdup_printf ("%s.%s::%s", mh->klass->name_space, 
-				mh->klass->name, mh->name); 
-	else
+	if (mh) {
+		sig = dis_stringify_object_with_class (m, mh->klass);
+		name = g_strdup_printf ("%s::%s", sig, mh->name);
+		g_free (sig);
+	} else
 		name = NULL;
 
 	switch (mono_metadata_token_code (token)){
@@ -1060,24 +1072,30 @@ get_constant (MonoImage *m, MonoTypeEnum t, guint32 blob_index)
 	case MONO_TYPE_I4:
 		return g_strdup_printf ("int32(%d)", read32 (ptr));
 		
-	case MONO_TYPE_I8:
-		/*
-		 * FIXME: This is not endian portable, does only 
-		 * matter for debugging, but still.
-		 * Need also to fix unaligned access.
-		 */
-		return g_strdup_printf ("0x%08x%08x", *(guint32 *) ptr, *(guint32 *) (ptr + 4));
-		
-	case MONO_TYPE_U8:
-		return g_strdup_printf ("0x%08x%08x", *(guint32 *) ptr, *(guint32 *) (ptr + 4));		
-	case MONO_TYPE_R4:
-		return g_strdup_printf ("%g", (double) (* (float *) ptr));
-		
-	case MONO_TYPE_R8:
-		return g_strdup_printf ("%g", * (double *) ptr);
-		
+	case MONO_TYPE_I8: {
+		guint32 low, high;
+		low = read32 (ptr);
+		high = read32 (ptr + 4);
+		return g_strdup_printf ("0x%08x%08x", high, low);
+	}
+	case MONO_TYPE_U8: {
+		guint32 low, high;
+		low = read32 (ptr);
+		high = read32 (ptr + 4);
+		return g_strdup_printf ("0x%08x%08x", high, low);
+	}
+	case MONO_TYPE_R4: {
+		float r;
+		readr4 (ptr, &r);
+		return g_strdup_printf ("%g", (double) r);
+	}
+	case MONO_TYPE_R8: {
+		double r;
+		readr8 (ptr, &r);
+		return g_strdup_printf ("%g", r);
+	}
 	case MONO_TYPE_STRING: {
-		int len, i, j, e;
+		int i, j, e;
 		char *res;
 		e = len = 0;
 		for (i = 0; !ptr [i+1]; i += 2){
@@ -1189,7 +1207,7 @@ get_token_type (MonoImage *m, guint32 token)
 		break;
 
 	default:
-		g_error ("Unhandled encoding for typedef-or-ref coded index");
+		g_error ("Unhandled encoding for token 0x%08x", token);
 
 	}
 	
@@ -1198,3 +1216,177 @@ get_token_type (MonoImage *m, guint32 token)
 
 	return s;
 }
+
+char *
+get_guid (MonoImage *m, guint32 guid_index)
+{
+	const unsigned char *guid;
+	char *result;
+
+	guid = mono_metadata_guid_heap (m, guid_index);
+
+	result = g_strdup_printf ("{%02X%02X%02X%02X-%02X%02X-%02X%02X-%02X%02X-%02X%02X%02X%02X%02X%02X}", 
+			guid [3], guid [2], guid [1], guid [0], guid [5], guid [4], guid [7], guid [6],
+			guid [8], guid [9], guid [10], guid [11], guid [12], guid [13], guid [14], guid [15]);
+	return result;
+}
+
+GList *
+dis_get_custom_attrs (MonoImage *m, guint32 token)
+{
+	GList *list = NULL;
+	guint32 idx, i, j, len, mtoken;
+	guint32 cols [MONO_CUSTOM_ATTR_SIZE];
+	MonoTableInfo *ca;
+	char *method;
+	GString *attr;
+	const char *val;
+
+	idx = mono_metadata_token_index (token);
+	idx <<= CUSTOM_ATTR_BITS;
+	
+	switch (mono_metadata_token_table (token)) {
+	case MONO_TABLE_TYPEDEF:
+		idx |= CUSTOM_ATTR_TYPEDEF;
+		break;
+	case MONO_TABLE_ASSEMBLY:
+		idx |= CUSTOM_ATTR_ASSEMBLY;
+		break;
+	case MONO_TABLE_PROPERTY:
+		idx |= CUSTOM_ATTR_PROPERTY;
+		break;
+	case MONO_TABLE_EVENT:
+		idx |= CUSTOM_ATTR_EVENT;
+		break;
+	case MONO_TABLE_FIELD:
+		idx |= CUSTOM_ATTR_FIELDDEF;
+		break;
+	case MONO_TABLE_METHOD:
+		idx |= CUSTOM_ATTR_METHODDEF;
+		break;
+	case MONO_TABLE_PARAM:
+		idx |= CUSTOM_ATTR_PARAMDEF;
+		break;
+	default:
+		g_print ("Missing custom attr get support for token 0x%08x\n", token);
+		return NULL;
+	}
+
+	ca = &m->tables [MONO_TABLE_CUSTOMATTRIBUTE];
+	/* the table is not sorted */
+	for (i = 0; i < ca->rows; ++i) {
+		mono_metadata_decode_row (ca, i, cols, MONO_CUSTOM_ATTR_SIZE);
+		if (cols [MONO_CUSTOM_ATTR_PARENT] != idx)
+			continue;
+		mtoken = cols [MONO_CUSTOM_ATTR_TYPE] >> CUSTOM_ATTR_TYPE_BITS;
+		switch (cols [MONO_CUSTOM_ATTR_TYPE] & CUSTOM_ATTR_TYPE_MASK) {
+		case CUSTOM_ATTR_TYPE_METHODDEF:
+			mtoken |= MONO_TOKEN_METHOD_DEF;
+			break;
+		case CUSTOM_ATTR_TYPE_MEMBERREF:
+			mtoken |= MONO_TOKEN_MEMBER_REF;
+			break;
+		default:
+			g_error ("Unknown table for custom attr type %08x", cols [MONO_CUSTOM_ATTR_TYPE]);
+			break;
+		}
+		method = get_method (m, mtoken);
+		val = mono_metadata_blob_heap (m, cols [MONO_CUSTOM_ATTR_VALUE]);
+		len = mono_metadata_decode_value (val, &val);
+		attr = g_string_new (".custom ");
+		g_string_sprintfa (attr, "%s = (", method);
+		for (j = 0; j < len; ++j) {
+			if (len > 4 && !(j % 16))
+				g_string_append (attr, "\n\t\t");
+			g_string_sprintfa (attr, " %02X", (val [j] & 0xff));
+		}
+		g_string_append_c (attr, ')');
+		list = g_list_append (list, attr->str);
+		g_string_free (attr, FALSE);
+		g_free (method);
+	}
+	return list;
+}
+
+char*
+get_marshal_info (MonoImage *m, const char *blob) {
+	int len, size = 0;
+
+	len = mono_metadata_decode_blob_size (blob, &blob);
+
+	switch (*blob) {
+	case MONO_NATIVE_BOOLEAN:
+		return g_strdup ("bool");
+	case MONO_NATIVE_I1:
+		return g_strdup ("int8");
+	case MONO_NATIVE_U1:
+		return g_strdup ("unsigned int8");
+	case MONO_NATIVE_I2:
+		return g_strdup ("int16");
+	case MONO_NATIVE_U2:
+		return g_strdup ("unsigned int16");
+	case MONO_NATIVE_I4:
+		return g_strdup ("int32");
+	case MONO_NATIVE_U4:
+		return g_strdup ("unsigned int32");
+	case MONO_NATIVE_I8:
+		return g_strdup ("int64");
+	case MONO_NATIVE_U8:
+		return g_strdup ("unsigned int64");
+	case MONO_NATIVE_R4:
+		return g_strdup ("float32");
+	case MONO_NATIVE_R8:
+		return g_strdup ("float64");
+	case MONO_NATIVE_CURRENCY:
+		return g_strdup ("currency");
+	case MONO_NATIVE_BSTR:
+		return g_strdup ("bstr");
+	case MONO_NATIVE_LPSTR:
+		return g_strdup ("lpstr");
+	case MONO_NATIVE_LPWSTR:
+		return g_strdup ("lpwstr");
+	case MONO_NATIVE_LPTSTR:
+		return g_strdup ("lptstr");
+	case MONO_NATIVE_BYVALTSTR:
+		return g_strdup_printf ("fixed sysstring [%d]", size);
+	case MONO_NATIVE_IUNKNOWN:
+		return g_strdup ("iunknown");
+	case MONO_NATIVE_IDISPATCH:
+		return g_strdup ("idispatch");
+	case MONO_NATIVE_STRUCT:
+		return g_strdup ("struct");
+	case MONO_NATIVE_INTERFACE:
+		return g_strdup ("interface");
+	case MONO_NATIVE_SAFEARRAY:
+		return g_strdup ("safearray");
+	case MONO_NATIVE_BYVALARRAY:
+		return g_strdup_printf ("fixed array [%d]", size);
+	case MONO_NATIVE_INT:
+		return g_strdup ("int");
+	case MONO_NATIVE_UINT:
+		return g_strdup ("unsigned int");
+	case MONO_NATIVE_VBBYREFSTR:
+		return g_strdup ("vbbyrefstr");
+	case MONO_NATIVE_ANSIBSTR:
+		return g_strdup ("ansi bstr");
+	case MONO_NATIVE_TBSTR:
+		return g_strdup ("tbstr");
+	case MONO_NATIVE_VARIANTBOOL:
+		return g_strdup ("variant bool");
+	case MONO_NATIVE_FUNC:
+		return g_strdup ("method");
+	case MONO_NATIVE_ASANY:
+		return g_strdup ("as any");
+	case MONO_NATIVE_LPARRAY:
+		return g_strdup ("[]");
+	case MONO_NATIVE_LPSTRUCT:
+		return g_strdup ("lpstruct");
+	case MONO_NATIVE_CUSTOM:
+		return g_strdup ("custom");
+	case MONO_NATIVE_ERROR:
+		return g_strdup ("error");
+	default:
+		return g_strdup ("unknown");
+	}
+}
+
diff --git a/mono/dis/get.h b/mono/dis/get.h
index f4241c2ba78..116549d1c5c 100644
--- a/mono/dis/get.h
+++ b/mono/dis/get.h
@@ -18,7 +18,10 @@ char *get_token               (MonoImage *m, guint32 token);
 char *get_token_type          (MonoImage *m, guint32 token);
 char *get_typespec            (MonoImage *m, guint32 blob_idx);
 char *get_method              (MonoImage *m, guint32 token);
+char *get_guid                (MonoImage *m, guint32 guid_index);
+char *get_marshal_info        (MonoImage *m, const char *blob);
 
+GList *dis_get_custom_attrs   (MonoImage *m, guint32 token);
 
 char *dis_stringify_type      (MonoImage *m, MonoType *type);
 char *dis_stringify_token     (MonoImage *m, guint32 token);
diff --git a/mono/dis/main.c b/mono/dis/main.c
index f79e8d752c3..390d5c6d5d5 100644
--- a/mono/dis/main.c
+++ b/mono/dis/main.c
@@ -17,6 +17,7 @@
 #include <string.h>
 #include <glib.h>
 #include <stdlib.h>
+#include <errno.h>
 #include "meta.h"
 #include "util.h"
 #include "dump.h"
@@ -24,12 +25,15 @@
 #include "dis-cil.h"
 #include <mono/metadata/loader.h>
 #include <mono/metadata/assembly.h>
+#include <mono/metadata/appdomain.h>
 
 FILE *output;
 
 /* True if you want to get a dump of the header data */
 gboolean dump_header_data_p = FALSE;
 
+gboolean substitute_with_mscorlib_p = FALSE;
+
 int dump_table = -1;
 
 static void
@@ -44,6 +48,19 @@ dump_header_data (MonoImage *img)
 }
 
 static void
+dump_cattrs (MonoImage *m, guint32 token, const char *indent)
+{
+	GList *tmp, *list;
+
+	list = dis_get_custom_attrs (m, token);
+	for (tmp = list; tmp; tmp = tmp->next) {
+		fprintf (output, "%s%s\n", indent, (char*)tmp->data);
+		g_free (tmp->data);
+	}
+	g_list_free (list);
+}
+
+static void
 dis_directive_assembly (MonoImage *m)
 {
 	MonoTableInfo *t  = &m->tables [MONO_TABLE_ASSEMBLY];
@@ -54,16 +71,16 @@ dis_directive_assembly (MonoImage *m)
 
 	mono_metadata_decode_row (t, 0, cols, MONO_ASSEMBLY_SIZE);
 	
+	fprintf (output, ".assembly '%s'\n{\n",
+		 mono_metadata_string_heap (m, cols [MONO_ASSEMBLY_NAME]));
+	dump_cattrs (m, MONO_TOKEN_ASSEMBLY | 1, "  ");
 	fprintf (output,
-		 ".assembly '%s'\n"
-		 "{\n"
 		 "  .hash algorithm 0x%08x\n"
 		 "  .ver  %d:%d:%d:%d"
 		 "%s %s"
 		 "%s"
 		 "\n"
 		 "}\n",
-		 mono_metadata_string_heap (m, cols [MONO_ASSEMBLY_NAME]),
 		 cols [MONO_ASSEMBLY_HASH_ALG],
 		 cols [MONO_ASSEMBLY_MAJOR_VERSION], cols [MONO_ASSEMBLY_MINOR_VERSION], 
 		 cols [MONO_ASSEMBLY_BUILD_NUMBER], cols [MONO_ASSEMBLY_REV_NUMBER],
@@ -167,6 +184,8 @@ dis_field_list (MonoImage *m, guint32 start, guint32 end)
 {
 	MonoTableInfo *t = &m->tables [MONO_TABLE_FIELD];
 	guint32 cols [MONO_FIELD_SIZE];
+	char rva_desc [32];
+	guint32 rva;
 	int i;
 
 	if (end > t->rows + 1) {
@@ -175,12 +194,23 @@ dis_field_list (MonoImage *m, guint32 start, guint32 end)
 	}
 			
 	for (i = start; i < end; i++){
-		char *sig, *flags;
+		char *sig, *flags, *attrs = NULL;
+		guint32 field_offset = -1;
 		
 		mono_metadata_decode_row (t, i, cols, MONO_FIELD_SIZE);
 		sig = get_field_signature (m, cols [MONO_FIELD_SIGNATURE]);
 		flags = field_flags (cols [MONO_FIELD_FLAGS]);
+
+		if (cols [MONO_FIELD_FLAGS] & FIELD_ATTRIBUTE_HAS_FIELD_RVA) {
+			mono_metadata_field_info (m, i, NULL, &rva, NULL);
+			g_snprintf (rva_desc, sizeof (rva_desc), " at D_%08x", rva);
+		} else {
+			rva_desc [0] = 0;
+		}
 		
+		mono_metadata_field_info (m, i, &field_offset, NULL, NULL);
+		if (field_offset != -1)
+			attrs = g_strdup_printf ("[%d]", field_offset);
 		if (cols [MONO_FIELD_FLAGS] & FIELD_ATTRIBUTE_LITERAL){
 			char *lit;
 			guint32 const_cols [MONO_CONSTANT_SIZE];
@@ -198,12 +228,14 @@ dis_field_list (MonoImage *m, guint32 start, guint32 end)
 				 mono_metadata_string_heap (m, cols [MONO_FIELD_NAME]));
 			fprintf (output, "%s\n", lit);
 			g_free (lit);
-		} else 
-			fprintf (output, "    .field %s %s %s\n",
-				 flags, sig,
-				 mono_metadata_string_heap (m, cols [MONO_FIELD_NAME]));
+		} else
+			fprintf (output, "    .field %s %s %s %s%s\n",
+				 attrs? attrs: "", flags, sig,
+				 mono_metadata_string_heap (m, cols [MONO_FIELD_NAME]), rva_desc);
+		g_free (attrs);
 		g_free (flags);
 		g_free (sig);
+		dump_cattrs (m, MONO_TOKEN_FIELD_DEF | (i + 1), "    ");
 	}
 }
 
@@ -365,14 +397,15 @@ dis_code (MonoImage *m, guint32 rva)
 	MonoMethodHeader *mh;
 	MonoCLIImageInfo *ii = m->image_info;
 	const char *ptr = mono_cli_rva_map (ii, rva);
-	char *loc;
+	const char *loc;
+	guint32 entry_point;
 
 	if (rva == 0)
 		return;
 
 	mh = mono_metadata_parse_mh (m, ptr);
-	if (ii->cli_cli_header.ch_entry_point){
-		loc = mono_metadata_locate_token (m, ii->cli_cli_header.ch_entry_point);
+	if ((entry_point = mono_image_get_entry_point (m))){
+		loc = mono_metadata_locate_token (m, entry_point);
 		if (rva == read32 (loc))
 			fprintf (output, "\t.entrypoint\n");
 	}
@@ -475,9 +508,11 @@ dis_method_list (MonoImage *m, guint32 start, guint32 end)
 		g_free (impl_flags);
 		
 		fprintf (output, "    {\n");
+		dump_cattrs (m, MONO_TOKEN_METHOD_DEF | (i + 1), "        ");
+		/* FIXME: need to sump also param custom attributes */
 		fprintf (output, "        // Method begins at RVA 0x%x\n", cols [MONO_METHOD_RVA]);
 		dis_code (m, cols [MONO_METHOD_RVA]);
-		fprintf (output, "    }\n\n");
+		fprintf (output, "    } // end of method %s\n\n", sig_str);
 		mono_metadata_free_method_signature (ms);
 		g_free (sig_str);
 	}
@@ -494,7 +529,7 @@ static int
 table_locator (const void *a, const void *b)
 {
 	plocator_t *loc = (plocator_t *) a;
-	char *bb = (char *) b;
+	const char *bb = (const char *) b;
 	guint32 table_index = (bb - loc->t->base) / loc->t->row_size;
 	guint32 col;
 	
@@ -517,7 +552,7 @@ dis_property_methods (MonoImage *m, guint32 prop)
 	MonoTableInfo *msemt = &m->tables [MONO_TABLE_METHODSEMANTICS];
 	guint32 cols [MONO_METHOD_SEMA_SIZE];
 	char *sig;
-	char *type[] = {NULL, ".set", ".get", NULL, ".other"};
+	const char *type[] = {NULL, ".set", ".get", NULL, ".other"};
 
 	start = mono_metadata_methods_from_property (m, prop, &end);
 	while (start < end) {
@@ -589,12 +624,77 @@ dis_property_list (MonoImage *m, guint32 typedef_row)
 	for (i = start; i < end; ++i) {
 		char *sig = dis_property_signature (m, i);
 		fprintf (output, "\t.property %s\n\t{\n", sig);
+		dump_cattrs (m, MONO_TOKEN_PROPERTY | (i + 1), "\t\t");
 		dis_property_methods (m, i);
 		fprintf (output, "\t}\n");
 		g_free (sig);
 	}
 }
 
+static char*
+dis_event_signature (MonoImage *m, guint32 event_idx)
+{
+	MonoTableInfo *et = &m->tables [MONO_TABLE_EVENT];
+	const char *name;
+	char *type, *res;
+	guint32 cols [MONO_EVENT_SIZE];
+	
+	mono_metadata_decode_row (et, event_idx, cols, MONO_EVENT_SIZE);
+	name = mono_metadata_string_heap (m, cols [MONO_EVENT_NAME]);
+	type = get_typedef_or_ref (m, cols [MONO_EVENT_TYPE]);
+
+	res = g_strdup_printf ("%s %s", type, name);
+	g_free (type);
+	return res;
+}
+
+static void
+dis_event_methods (MonoImage *m, guint32 event)
+{
+	guint start, end;
+	MonoTableInfo *msemt = &m->tables [MONO_TABLE_METHODSEMANTICS];
+	guint32 cols [MONO_METHOD_SEMA_SIZE];
+	char *sig;
+	const char *type;
+
+	start = mono_metadata_methods_from_event (m, event, &end);
+	while (start < end) {
+		mono_metadata_decode_row (msemt, start, cols, MONO_METHOD_SEMA_SIZE);
+		sig = dis_stringify_method_signature (m, NULL, cols [MONO_METHOD_SEMA_METHOD]);
+		switch (cols [MONO_METHOD_SEMA_SEMANTICS]) {
+		case METHOD_SEMANTIC_OTHER:
+			type = ".other"; break;
+		case METHOD_SEMANTIC_ADD_ON:
+			type = ".addon"; break;
+		case METHOD_SEMANTIC_REMOVE_ON:
+			type = ".removeon"; break;
+		case METHOD_SEMANTIC_FIRE:
+			type = ".fire"; break;
+		default:
+			break;
+		}
+		fprintf (output, "\t\t%s %s\n", type, sig);
+		g_free (sig);
+		++start;
+	}
+}
+
+static void
+dis_event_list (MonoImage *m, guint32 typedef_row)
+{
+	guint start, end, i;
+	start = mono_metadata_events_from_typedef (m, typedef_row, &end);
+
+	for (i = start; i < end; ++i) {
+		char *sig = dis_event_signature (m, i);
+		fprintf (output, "\t.event %s\n\t{\n", sig);
+		dump_cattrs (m, MONO_TOKEN_EVENT | (i + 1), "\t\t");
+		dis_event_methods (m, i);
+		fprintf (output, "\t}\n");
+		g_free (sig);
+	}
+}
+
 static void
 dis_interfaces (MonoImage *m, guint32 typedef_row)
 {
@@ -666,15 +766,18 @@ dis_type (MonoImage *m, int n)
 	name = mono_metadata_string_heap (m, cols [MONO_TYPEDEF_NAME]);
 
 	if ((cols [MONO_TYPEDEF_FLAGS] & TYPE_ATTRIBUTE_CLASS_SEMANTIC_MASK) == TYPE_ATTRIBUTE_CLASS){
-		char *base = get_typedef_or_ref (m, cols [MONO_TYPEDEF_EXTENDS]);
 		fprintf (output, "  .class %s%s\n", typedef_flags (cols [MONO_TYPEDEF_FLAGS]), name);
-		fprintf (output, "  \textends %s\n", base);
-		g_free (base);
+		if (cols [MONO_TYPEDEF_EXTENDS]) {
+			char *base = get_typedef_or_ref (m, cols [MONO_TYPEDEF_EXTENDS]);
+			fprintf (output, "  \textends %s\n", base);
+			g_free (base);
+		}
 	} else
 		fprintf (output, "  .class interface %s%s\n", typedef_flags (cols [MONO_TYPEDEF_FLAGS]), name);
 	
 	dis_interfaces (m, n + 1);
 	fprintf (output, "  {\n");
+	dump_cattrs (m, MONO_TOKEN_TYPE_DEF | (n + 1), "    ");
 
 	if (mono_metadata_packing_from_typedef (m, n + 1, &packing_size, &class_size)) {
 		fprintf (output, "    .pack %d\n", packing_size);
@@ -703,8 +806,9 @@ dis_type (MonoImage *m, int n)
 		dis_method_list (m, cols [MONO_TYPEDEF_METHOD_LIST] - 1, last);
 
 	dis_property_list (m, n);
+	dis_event_list (m, n);
 
-	fprintf (output, "  }\n");
+	fprintf (output, "  } // end of type %s%s%s\n", nspace, *nspace? ".": "", name);
 	if (*nspace)
 		fprintf (output, "}\n");
 	fprintf (output, "\n");
@@ -726,30 +830,73 @@ dis_types (MonoImage *m)
 		dis_type (m, i);
 }
 
+/**
+ * dis_data:
+ * @m: metadata context
+ *
+ * disassembles all data blobs references in the FieldRVA table in the @m context
+ */
+static void
+dis_data (MonoImage *m)
+{
+	MonoTableInfo *t = &m->tables [MONO_TABLE_FIELDRVA];
+	MonoTableInfo *ft = &m->tables [MONO_TABLE_FIELD];
+	int i, b;
+	const char *rva, *sig;
+	guint32 align, size;
+	guint32 cols [MONO_FIELD_RVA_SIZE];
+	MonoType *type;
+
+	for (i = 0; i < t->rows; i++) {
+		mono_metadata_decode_row (t, i, cols, MONO_FIELD_RVA_SIZE);
+		rva = mono_cli_rva_map (m->image_info, cols [MONO_FIELD_RVA_RVA]);
+		sig = mono_metadata_blob_heap (m, mono_metadata_decode_row_col (ft, cols [MONO_FIELD_RVA_FIELD] -1, MONO_FIELD_SIGNATURE));
+		mono_metadata_decode_value (sig, &sig);
+		/* FIELD signature == 0x06 */
+		g_assert (*sig == 0x06);
+		type = mono_metadata_parse_field_type (m, 0, sig + 1, &sig);
+		mono_class_init (mono_class_from_mono_type (type));
+		size = mono_class_value_size (mono_class_from_mono_type (type), &align);
+		fprintf (output, ".data D_%08x = bytearray (", cols [MONO_FIELD_RVA_RVA]);
+		for (b = 0; b < size; ++b) {
+			if (!(b % 16))
+				fprintf (output, "\n\t");
+			fprintf (output, " %02x", rva [b] & 0xff);
+		}
+		fprintf (output, ") // size: %d\n", size);
+	}
+}
+
 struct {
-	char *name;
+	const char *name;
 	int table;
 	void (*dumper) (MonoImage *m);
 } table_list [] = {
 	{ "--assembly",    MONO_TABLE_ASSEMBLY,    dump_table_assembly },
 	{ "--assemblyref", MONO_TABLE_ASSEMBLYREF, dump_table_assemblyref },
 	{ "--fields",      MONO_TABLE_FIELD,       dump_table_field },
+	{ "--marshal",     MONO_TABLE_FIELDMARSHAL,	dump_table_field_marshal },
 	{ "--memberref",   MONO_TABLE_MEMBERREF,   dump_table_memberref },
 	{ "--param",       MONO_TABLE_PARAM,       dump_table_param },
 	{ "--typedef",     MONO_TABLE_TYPEDEF,     dump_table_typedef },
 	{ "--typeref",     MONO_TABLE_TYPEREF,     dump_table_typeref },
+	{ "--exported",    MONO_TABLE_EXPORTEDTYPE,     dump_table_exported },
 	{ "--nested",      MONO_TABLE_NESTEDCLASS, dump_table_nestedclass },
 	{ "--interface",   MONO_TABLE_INTERFACEIMPL,     dump_table_interfaceimpl },
 	{ "--classlayout", MONO_TABLE_CLASSLAYOUT, dump_table_class_layout },
 	{ "--constant",    MONO_TABLE_CONSTANT,    dump_table_constant },
 	{ "--customattr",  MONO_TABLE_CUSTOMATTRIBUTE,    dump_table_customattr },
+	{ "--declsec",     MONO_TABLE_DECLSECURITY, dump_table_declsec },
 	{ "--property",    MONO_TABLE_PROPERTY,    dump_table_property },
 	{ "--propertymap", MONO_TABLE_PROPERTYMAP, dump_table_property_map },
 	{ "--event",       MONO_TABLE_EVENT,       dump_table_event },
 	{ "--file",        MONO_TABLE_FILE,        dump_table_file },
 	{ "--moduleref",   MONO_TABLE_MODULEREF,   dump_table_moduleref },
+	{ "--module",      MONO_TABLE_MODULE,      dump_table_module },
 	{ "--method",      MONO_TABLE_METHOD,      dump_table_method },
+	{ "--methodimpl",  MONO_TABLE_METHODIMPL,  dump_table_methodimpl },
 	{ "--methodsem",   MONO_TABLE_METHODSEMANTICS,      dump_table_methodsem },
+	{ "--manifest",    MONO_TABLE_MANIFESTRESOURCE,     dump_table_manifest },
 	{ NULL, -1 }
 };
 
@@ -763,10 +910,10 @@ static void
 disassemble_file (const char *file)
 {
 	MonoAssembly *ass;
-	enum MonoImageOpenStatus status;
+	MonoImageOpenStatus status;
 	MonoImage *img;
 
-	ass = mono_assembly_open (file, NULL, &status);
+	ass = mono_assembly_open (file, &status);
 	if (ass == NULL){
 		fprintf (stderr, "Error while trying to process %s\n", file);
 		return;
@@ -782,6 +929,7 @@ disassemble_file (const char *file)
 		dis_directive_assemblyref (img);
 		dis_directive_assembly (img);
 		dis_types (img);
+		dis_data (img);
 	}
 	
 	mono_image_close (img);
@@ -790,7 +938,7 @@ disassemble_file (const char *file)
 static void
 usage (void)
 {
-	GString *args = g_string_new ("[--help] ");
+	GString *args = g_string_new ("[--output=filename] [--help] [--mscorlib] ");
 	int i;
 	
 	for (i = 0; table_list [i].name != NULL; i++){
@@ -818,7 +966,18 @@ main (int argc, char *argv [])
 				usage ();
 			else if (argv [i][1] == 'd')
 				dump_header_data_p = TRUE;
-			else if (strcmp (argv [i], "--help") == 0)
+			else if (strcmp (argv [i], "--mscorlib") == 0) {
+				substitute_with_mscorlib_p = TRUE;
+				continue;
+			} else if (strncmp (argv [i], "--output=", 9) == 0) {
+				output = fopen (argv [i]+9, "w");
+				if (output == NULL) {
+					fprintf (stderr, "Can't open output file `%s': %s\n",
+						 argv [i]+9, strerror (errno));
+					exit (1);
+				}
+				continue;
+			} else if (strcmp (argv [i], "--help") == 0)
 				usage ();
 			for (j = 0; table_list [j].name != NULL; j++) {
 				if (strcmp (argv [i], table_list [j].name) == 0)
diff --git a/mono/dis/monodis.1 b/mono/dis/monodis.1
index f34d34344bf..a670f388772 100644
--- a/mono/dis/monodis.1
+++ b/mono/dis/monodis.1
@@ -10,18 +10,23 @@ monodis \- CIL image content dumper and disassembler.
 .SH SYNOPSIS
 .PP
 .B monodis
-[\-hd] [\-\-help] 
+[\-h] [\-\-help] 
+[\-\-output=FILENAME]
+[\-\-mscorlib]
 [\-\-assembly]
 [\-\-assemblyref]
 [\-\-classlayout]
 [\-\-constant]
 [\-\-event]
+[\-\-exported]
 [\-\-fields]
 [\-\-file]
 [\-\-interface]
+[\-\-manifest]
 [\-\-memberref]
 [\-\-method]
 [\-\-methodsem]
+[\-\-module]
 [\-\-moduleref]
 [\-\-param]
 [\-\-property]
@@ -38,43 +43,83 @@ The following Generic options are supported:
 .I "--help", "-h"
 Displays usage instructions.
 .TP
+.I "--output=FILENAME"
+Write output into \fIFILENAME\fP.
+.TP
+.I "--mscorlib"
+For non-corlib assemblies, use "mscorlib" as the assembly name. This
+is useful for round-tripping the IL with ilasm.
+.TP
 .I "--assembly"
 Dumps the contents of the assembly table
+.TP
 .I "--assemblyref"
 Dumps the contents of the assemblyref table
+.TP
 .I "--classlayout"
 Dumps the contents of the classlayout table
+.TP
 .I "--constant"
 Dumps the contents of the constant table
+.TP
 .I "--event"
 Dumps the contents of the event table
+.TP
+.I "--exported"
+Dumps the contents of the ExportedTypes table
+.TP
 .I "--fields"
 Dumps the contents of the fields table
+.TP
 .I "--file"
 Dumps the contents of the file table
+.TP
 .I "--interface"
 Dumps the contents of the interface table
+.TP
+.I "--manifest"
+Dumps the contents of the manifest table.
+.TP
 .I "--memberref"
 Dumps the contents of the memberref table
+.TP
 .I "--method"
 Dumps the contents of the method table
+.TP
 .I "--methodsem"
 Dumps the contents of the methodsem table
+.TP
+.I "--module"
+Dumps the contents of the module table
+.TP
 .I "--moduleref"
 Dumps the contents of the moduleref table
+.TP
 .I "--param"
 Dumps the contents of the param table
+.TP
 .I "--property"
 Dumps the contents of the property table
+.TP
 .I "--propertymap"
 Dumps the contents of the propertymap table
+.TP
 .I "--typedef"
 Dumps the contents of the typedef table
+.TP
 .I "--typeref"
 Dumps the contents of the typeref table
 .PP
 If no flags are specified the program dumps the content of the image
 in a format that can be used to rountrip the code. 
+.PP
+.SH ENVIRONMENT VARIABLES
+.TP
+.I "MONO_PATH"
+Provides a search path to mono and mint where to look for library files.
+Directories are separated by the platform path separator (colons on unix). Example:
+.B /home/username/lib:/usr/local/mono/lib
+.PP
 .SH AUTHOR
 monodis was written by Miguel de Icaza, Paolo Molaro and Dietmar Maurer.
 .SH SEE ALSO
diff --git a/mono/dis/util.c b/mono/dis/util.c
index 004bbd683bc..997f67fe2b7 100644
--- a/mono/dis/util.c
+++ b/mono/dis/util.c
@@ -27,8 +27,7 @@ map (guint32 code, map_t *table)
 	for (i = 0; table [i].str != NULL; i++)
 		if (table [i].code == code)
 			return table [i].str;
-	g_assert_not_reached ();
-	return "";
+	return "invalid-flags";
 }
 
 /**
diff --git a/mono/dis/util.h b/mono/dis/util.h
index c6647c7d2ec..4c33534049e 100644
--- a/mono/dis/util.h
+++ b/mono/dis/util.h
@@ -1,7 +1,7 @@
 
 typedef struct {
 	int code;
-	char *str;
+	const char *str;
 } map_t;
 
 const char *map       (guint32 code, map_t *table);
diff --git a/mono/handles/.cvsignore b/mono/handles/.cvsignore
new file mode 100644
index 00000000000..4ad75e1e41e
--- /dev/null
+++ b/mono/handles/.cvsignore
@@ -0,0 +1,7 @@
+.deps
+.libs
+Makefile
+Makefile.in
+hps
+scratch
+shmdel
diff --git a/mono/handles/ChangeLog b/mono/handles/ChangeLog
new file mode 100644
index 00000000000..f4ed279de03
--- /dev/null
+++ b/mono/handles/ChangeLog
@@ -0,0 +1,15 @@
+
+Sat Jun 1 13:54:29 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* shmdel.c: use return instead of exit in main().
+
+2002-04-30  Dick Porter  <dick@ximian.com>
+
+	* shmdel.c:
+	* scratch.c:
+	* hps.c:
+	* Makefile.am: Some tools to help debug shared memory handles:
+	'hps' shows handle status, 'scratch' displays info about scratch
+	data (such as handle names), 'shmdel' deletes the shared memory
+	segment.
+
diff --git a/mono/handles/Makefile.am b/mono/handles/Makefile.am
new file mode 100644
index 00000000000..4c57428ebdd
--- /dev/null
+++ b/mono/handles/Makefile.am
@@ -0,0 +1,31 @@
+
+noinst_PROGRAMS = hps scratch shmdel
+
+INCLUDES = 				\
+	-I$(top_srcdir)			\
+	$(GMODULE_CFLAGS)		\
+	$(GLIB_CFLAGS)
+
+hps_LDADD = \
+	../io-layer/libwapi.la		\
+	../utils/libmonoutils.la		\
+	$(GLIB_LIBS)			\
+	$(GMODULE_LIBS) 		\
+	-lm
+
+scratch_LDADD = \
+	../io-layer/libwapi.la		\
+	../utils/libmonoutils.la		\
+	$(GLIB_LIBS)			\
+	$(GMODULE_LIBS) 		\
+	-lm
+
+shmdel_LDADD = \
+	../io-layer/libwapi.la		\
+	../utils/libmonoutils.la		\
+	$(GLIB_LIBS)			\
+	$(GMODULE_LIBS) 		\
+	-lm
+
+EXTRA_DIST = ChangeLog
+
diff --git a/mono/handles/hps.c b/mono/handles/hps.c
new file mode 100644
index 00000000000..53974fbeb56
--- /dev/null
+++ b/mono/handles/hps.c
@@ -0,0 +1,204 @@
+#include <config.h>
+#include <glib.h>
+
+#include <mono/io-layer/io-layer.h>
+
+/* We're digging into handle internals here... */
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/wapi-private.h>
+
+static const guchar *unused_details (struct _WapiHandleShared *handle);
+static const guchar *file_details (struct _WapiHandleShared *handle);
+static const guchar *console_details (struct _WapiHandleShared *handle);
+static const guchar *thread_details (struct _WapiHandleShared *handle);
+static const guchar *sem_details (struct _WapiHandleShared *handle);
+static const guchar *mutex_details (struct _WapiHandleShared *handle);
+static const guchar *event_details (struct _WapiHandleShared *handle);
+static const guchar *socket_details (struct _WapiHandleShared *handle);
+static const guchar *find_details (struct _WapiHandleShared *handle);
+static const guchar *process_details (struct _WapiHandleShared *handle);
+static const guchar *pipe_details (struct _WapiHandleShared *handle);
+
+/* This depends on the ordering of the enum WapiHandleType in
+ * io-layer/wapi-private.h
+ */
+static const char *typename[]={
+	"Unused",
+	"File",
+	"Console",
+	"Thread",
+	"Sem",
+	"Mutex",
+	"Event",
+	"Socket",
+	"Find",
+	"Process",
+	"Pipe",
+	"Error!!"
+};
+
+/* So does this... */
+static const guchar * (*details[])(struct _WapiHandleShared *)=
+{
+	unused_details,
+	file_details,
+	console_details,
+	thread_details,
+	sem_details,
+	mutex_details,
+	event_details,
+	socket_details,
+	find_details,
+	process_details,
+	pipe_details,
+	unused_details,
+};
+
+int main (int argc, char **argv)
+{
+	guint32 idx;
+	gboolean success;
+	int shm_id;
+	
+	_wapi_shared_data=_wapi_shm_attach (FALSE, &success, &shm_id);
+	if(success==FALSE) {
+		g_error ("Failed to attach shared memory! (tried shared memory ID 0x%x)", shm_id);
+		exit (-1);
+	}
+	
+	/* Make sure index 0 is actually unused */
+	for(idx=0; idx<_WAPI_MAX_HANDLES; idx++) {
+		struct _WapiHandleShared *shared=&_wapi_shared_data->handles[idx];
+		
+		if(shared->type!=WAPI_HANDLE_UNUSED) {
+			g_print ("%4x [%7s] %4u %s (%s)\n", idx,
+				 typename[shared->type], shared->ref,
+				 shared->signalled?"Sg":"Un",
+				 details[shared->type](shared));
+		}
+	}
+	
+	exit (0);
+}
+
+static const guchar *unused_details (struct _WapiHandleShared *handle)
+{
+	return("unused details");
+}
+
+static const guchar *file_details (struct _WapiHandleShared *handle)
+{
+	static guchar buf[80];
+	guchar *name;
+	struct _WapiHandle_file *file=&handle->u.file;
+	
+	name=_wapi_handle_scratch_lookup_as_string (file->filename);
+	
+	g_snprintf (buf, sizeof(buf),
+		    "[%20s] acc: %c%c%c, shr: %c%c%c, attrs: %5u",
+		    name==NULL?(guchar *)"":name,
+		    file->fileaccess&GENERIC_READ?'R':'.',
+		    file->fileaccess&GENERIC_WRITE?'W':'.',
+		    file->fileaccess&GENERIC_EXECUTE?'X':'.',
+		    file->sharemode&FILE_SHARE_READ?'R':'.',
+		    file->sharemode&FILE_SHARE_WRITE?'W':'.',
+		    file->sharemode&FILE_SHARE_DELETE?'D':'.',
+		    file->attrs);
+
+	if(name!=NULL) {
+		g_free (name);
+	}
+	
+	return(buf);
+}
+
+static const guchar *console_details (struct _WapiHandleShared *handle)
+{
+	return(file_details (handle));
+}
+
+static const guchar *thread_details (struct _WapiHandleShared *handle)
+{
+	static guchar buf[80];
+	struct _WapiHandle_thread *thr=&handle->u.thread;
+
+	g_snprintf (buf, sizeof(buf),
+		    "proc: %p, state: %d, exit: %u",
+		    thr->process_handle, thr->state, thr->exitstatus);
+	
+	return(buf);
+}
+
+static const guchar *sem_details (struct _WapiHandleShared *handle)
+{
+	static guchar buf[80];
+	struct _WapiHandle_sem *sem=&handle->u.sem;
+	
+	g_snprintf (buf, sizeof(buf), "val: %5u, max: %5d",
+		    sem->val, sem->max);
+	
+	return(buf);
+}
+
+static const guchar *mutex_details (struct _WapiHandleShared *handle)
+{
+	static guchar buf[80];
+	guchar *name;
+	struct _WapiHandle_mutex *mut=&handle->u.mutex;
+	
+	name=_wapi_handle_scratch_lookup_as_string (mut->name);
+	
+	g_snprintf (buf, sizeof(buf), "[%20s] own: %5d:%5ld, count: %5u",
+		    name==NULL?(guchar *)"":name, mut->pid, mut->tid,
+		    mut->recursion);
+
+	if(name!=NULL) {
+		g_free (name);
+	}
+	
+	return(buf);
+}
+
+static const guchar *event_details (struct _WapiHandleShared *handle)
+{
+	static guchar buf[80];
+	struct _WapiHandle_event *event=&handle->u.event;
+
+	g_snprintf (buf, sizeof(buf), "manual: %s",
+		    event->manual?"TRUE":"FALSE");
+	
+	return(buf);
+}
+
+static const guchar *socket_details (struct _WapiHandleShared *handle)
+{
+	/* Nothing to see here */
+	return("");
+}
+
+static const guchar *find_details (struct _WapiHandleShared *handle)
+{
+	static guchar buf[80];
+	struct _WapiHandle_find *find=&handle->u.find;
+	
+	g_snprintf (buf, sizeof(buf), "count: %5d",
+		    find->count);
+	
+	return(buf);
+}
+
+static const guchar *process_details (struct _WapiHandleShared *handle)
+{
+	static guchar buf[80];
+	struct _WapiHandle_process *proc=&handle->u.process;
+	
+	g_snprintf (buf, sizeof(buf), "pid: %5u",
+		    proc->id);
+	
+	return(buf);
+}
+
+static const guchar *pipe_details (struct _WapiHandleShared *handle)
+{
+	return(file_details (handle));
+}
diff --git a/mono/handles/scratch.c b/mono/handles/scratch.c
new file mode 100644
index 00000000000..3ad845b0ace
--- /dev/null
+++ b/mono/handles/scratch.c
@@ -0,0 +1,70 @@
+#include <config.h>
+#include <glib.h>
+#include <unistd.h>
+
+#include <mono/io-layer/io-layer.h>
+
+/* We're digging into handle internals here... */
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/wapi-private.h>
+
+#define HDRSIZE sizeof(struct _WapiScratchHeader)
+
+static guchar *printable (guchar *data, guint32 datalen)
+{
+	static guchar buf[32];
+	guint32 i;
+	
+	if(datalen>=32) {
+		datalen=31;
+	}
+
+	for(i=0; i<datalen; i++) {
+		if(g_ascii_isprint (data[i])) {
+			buf[i]=data[i];
+		} else {
+			buf[i]='.';
+		}
+	}
+	buf[i]='\0';
+
+	return(buf);
+}
+
+int main (int argc, char **argv)
+{
+	guint32 idx=0;
+	struct _WapiScratchHeader *hdr;
+	gboolean success;
+	int shm_id;
+	
+	_wapi_shared_data=_wapi_shm_attach (FALSE, &success, &shm_id);
+	if(success==FALSE) {
+		g_error ("Failed to attach shared memory! (tried shared memory ID 0x%x)", shm_id);
+		exit (-1);
+	}
+
+	hdr=(struct _WapiScratchHeader *)&_wapi_shared_data->scratch_base[0];
+	if(hdr->flags==0 && hdr->length==0) {
+		g_print ("Scratch space unused\n");
+		exit (0);
+	}
+	
+	while(idx < _WAPI_SHM_SCRATCH_SIZE) {
+		hdr=(struct _WapiScratchHeader *)&_wapi_shared_data->scratch_base[idx];
+		if(hdr->flags & WAPI_SHM_SCRATCH_FREE) {
+			g_print ("Free block at %6d (index %6d), length %6d\n",
+				 idx, idx+HDRSIZE, hdr->length);
+		} else {
+			guchar *data=&_wapi_shared_data->scratch_base[idx+HDRSIZE];
+			
+			g_print ("Used block at %6d (index %6d), length %6d, [%s]\n",
+				 idx, idx+HDRSIZE, hdr->length,
+				 printable (data, hdr->length));
+		}
+
+		idx+=(hdr->length+HDRSIZE);
+	}
+	
+	exit (0);
+}
diff --git a/mono/handles/shmdel.c b/mono/handles/shmdel.c
new file mode 100644
index 00000000000..173fc664dfe
--- /dev/null
+++ b/mono/handles/shmdel.c
@@ -0,0 +1,12 @@
+#include <config.h>
+#include <glib.h>
+
+/* We're digging into handle internals here... */
+#include <mono/io-layer/shared.h>
+
+int main (int argc, char **argv)
+{
+	_wapi_shm_destroy ();
+	
+	return 0;
+}
diff --git a/mono/interpreter/ChangeLog b/mono/interpreter/ChangeLog
index d97d9a74395..21ca43690b5 100644
--- a/mono/interpreter/ChangeLog
+++ b/mono/interpreter/ChangeLog
@@ -1,3 +1,290 @@
+2002-08-07  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (interp_walk_stack): removed the createdelegate icall
+
+2002-08-02  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (get_virtual_method): support proxies
+	(ves_exec_method): impl. LDFLD/STFLD for proxies.
+
+Fri Aug 2 13:00:41 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c, interp.h: implemented exception trap for runtime_invoke
+	and handle exceptions across managed/unmanaged boundaries.
+
+2002-08-01  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (stackval_from_data): add pinvoke argument
+	(stackval_to_data): add pinvoke argument. We need consider the
+	fact that unmanages structures may have different sizes.
+	(ves_pinvoke_method): do not call stackval_from_data if the result
+	is a value type.
+
+Wed Jul 31 17:47:11 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: simplified some more branch code.
+
+Wed Jul 31 16:50:42 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: fixed indentation, simplified some code.
+
+Wed Jul 31 14:29:43 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: fix so that mint can at least get to executing Main().
+
+2002-07-31  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c: use the new marshaling code. better delegate/remoting 
+	support.
+	(ves_exec_method): bug fix - directly jump to handle_exception.
+
+2002-07-29  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (main): install compile_method handler
+
+Wed Jul 24 13:02:12 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: implemented stack walking function.
+
+Fri Jul 19 14:21:18 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: fix float boxing on LE systems.
+
+Sat Jul 13 19:54:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: advance ip in conv.r.un.
+
+2002-07-01  Dick Porter  <dick@ximian.com>
+
+	* interp.c (ves_exec): Removed unneeded argument to
+	mono_runtime_run_main()
+
+2002-06-25  Dick Porter  <dick@ximian.com>
+
+	* interp.c (ves_exec): Pass the assembly to mono_runtime_run_main
+
+Wed Jun 19 17:01:37 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: un-broke after stack trace changes.
+
+Fri May 31 16:17:20 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c, hacks.h: compiler compatibility fixes.
+
+Fri May 31 13:25:57 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c, mint.1: added --config command line option.
+
+Thu May 30 14:14:16 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: lookup P/Invoke method addr only when needed.
+
+2002-05-29  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (ves_exec_method): free type in CEE_SIZEOF
+
+Tue May 28 16:10:49 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: fixed SIZEOF to work with typedef/typeref.
+
+Fri May 24 15:33:50 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: added partial async delegate and remoting support.
+
+Thu May 23 18:45:38 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: special case string ctors in invoke.
+	Handle null object in throw. Misc integer type mismatch fixes.
+
+2002-05-23  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (ves_runtime_method): share more code with the jit.
+
+Wed May 22 12:31:40 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: fixed finally handling. In trace mode show
+	exception handling operations and the contents of the stack in the same
+	line as the executing instruction.
+
+2002-05-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* interp.c: Updated help display.
+
+2002-05-20  Radek Doulik  <rodo@ximian.com>
+
+	* interp.c (dump_stack): print boxed values for --noptr
+	(ves_exec_method): use stackval_to_data as pointed out by lupus
+
+2002-05-17  Radek Doulik  <rodo@ximian.com>
+
+	* interp.c (dump_stack): if --noptr then print content of strings
+	in form [str:<printed string>]
+
+2002-05-16  Radek Doulik  <rodo@ximian.com>
+
+	* interp.c (ves_exec_method): use data.i instead of data.l in i32
+	case
+	(ves_exec_method): set type in I64 <--> I32 conversions
+
+2002-05-15  Radek Doulik  <rodo@ximian.com>
+
+	* interp.c (ves_runtime_method): moved stackval_from_data call
+	inside #else branch, consulted on irc with lupus
+
+2002-05-15  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (ves_exec_method): use new mono_unhandled_exception()
+
+2002-05-14  Radek Doulik  <rodo@ximian.com>
+
+	* interp.c: introduced new --noptr option to suppres pointer
+	address printing. I find this useful for comparing trace outputs
+	while porting to ppc
+
+Tue May 14 16:37:55 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: some finally handling fixes and compilation fixes for
+	changes in the runtime lib.
+
+2002-04-30  Dick Porter  <dick@ximian.com>
+
+	* interp.c: Tell glib to not abort when g_log() etc print
+	recursively
+
+Mon Apr 22 16:52:03 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: handle muslticast delegates. Implement a couple more
+	convert opcodes. Pretend we spend some time jitting...
+
+2002-04-20  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (ves_exec_method): support internalcall String constructors
+
+2002-04-19  Dan Lewis  <dihlewis@yahoo.co.uk>
+	
+	* interp.c: support for new szarray format.
+
+Tue Apr 16 20:12:58 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: removed profiling code (moved to common library).
+	Implemented inlining for some special methods.
+
+2002-04-15 	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* interp.c: Using fullnames when adding icall's (array)
+
+Wed Apr 10 16:07:23 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: quick implementation for opcodes needed by the new parse
+	routines in corlib.
+
+Tue Apr 9 13:08:26 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: make the interp thread-safe wrt the metadata lib.
+
+Mon Apr 8 17:15:48 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: display return value with --trace.
+	Call mono_runtime_init ().
+
+2002-04-06  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (interp_mono_runtime_invoke): handle more types,
+	removed runtime_exec_main
+
+Thu Apr 4 11:36:52 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: don't try to get an IL opcode for runtime and internal
+	call methods.
+
+Thu Mar 28 16:54:51 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: spring warning cleanup.
+
+Thu Mar 28 12:03:28 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: check obj address in stfld.
+
+2002-03-27  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (ves_exec_method): CASTCLASS: fix for transparent proxy
+
+Tue Mar 26 20:09:10 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: set frame->ip before dumping the stack trace.
+
+Tue Mar 26 19:54:45 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: remove glib mem vtable code.
+
+2002-03-26  Dick Porter  <dick@ximian.com>
+
+	* interp.c: Show thread ID's in trace output.
+		
+	New option "--traceclassinit" to put debug output around
+	runtime_class_init().
+
+	Make sure all options are displayed in usage().
+
+Tue Mar 26 17:03:14 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: support fieldrefs when accessing instance fields.
+
+Mon Mar 25 12:59:52 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: allow tracing to be done on a per-method basis.
+	Fix interp_mono_runtime_invoke() to deal correcttly with the return
+	value. Disable glib mem vtable setting.
+
+Thu Mar 21 18:08:37 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: set stack trace info when throwing an exception.
+
+Thu Mar 21 17:32:46 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: intern strings before executing a method (and don't 
+	intern command line arguments anymore). Add sanity checks in alloca
+	use.
+
+Sat Mar 16 19:15:18 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: restore frame on return from unmanaged calls.
+	Add support for continuing execution up to x IL insn.
+	Fix exception handling when an exception is raised in the catch
+	handler of the same method that issued the first one.
+
+2002-03-11  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (ves_runtime_method): set method_info field
+
+Mon Mar 11 14:48:07 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: corlib consistency checls moved to libmetadata.
+
+Mon Mar 11 11:27:27 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: use the new facilities in debug-helpers to
+	disassemble CIL code and match method names to MonoMethods.
+
+Thu Mar 7 17:20:59 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: Boehm-GC enable. Fix some overflow opcodes.
+
+Tue Mar 5 18:12:40 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: fix non-debug build and some more opcode work.
+
+Mon Mar 4 11:21:44 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: print the address of 'this' in tracing mode.
+
+Thu Feb 28 19:18:59 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* interp.c: add checks for more binary consistency.
+
+2002-02-27  Dietmar Maurer  <dietmar@ximian.com>
+
+	* interp.c (interp_mono_runtime_invoke): use alloca instead of g_new0
 
 Tue Feb 26 11:43:34 CET 2002 Paolo Molaro <lupus@ximian.com>
 
diff --git a/mono/interpreter/Makefile.am b/mono/interpreter/Makefile.am
index b43f9588190..147d510c992 100644
--- a/mono/interpreter/Makefile.am
+++ b/mono/interpreter/Makefile.am
@@ -11,9 +11,12 @@ mint_SOURCES =		\
 	interp.c	
 
 mint_LDADD =				\
-	../arch/libmonoarch.la	\
-	../metadata/libmetadata.a	\
-	../io-layer/libwapi.a	\
+	../arch/libmonoarch.la		\
+	../metadata/libmonoruntime.la	\
+	../metadata/libmetadata.la	\
+	../io-layer/libwapi.la		\
+	../utils/libmonoutils.la	\
+	../os/libmonoos.la		\
 	$(GLIB_LIBS)			\
 	$(GMODULE_LIBS) 		\
 	-lm
diff --git a/mono/interpreter/hacks.h b/mono/interpreter/hacks.h
index ccf074a4991..030bf9a9eeb 100644
--- a/mono/interpreter/hacks.h
+++ b/mono/interpreter/hacks.h
@@ -5,6 +5,8 @@
 #include <math.h>
 
 /* which are not defined on FreeBSD */
+#ifdef __GNUC__
+
 #ifndef isunordered
 #   define isunordered(u, v)                              \
     (__extension__                                        \
@@ -40,6 +42,30 @@
         !isunordered(__x, __y) && __x > __y; }))
 #endif
 
+#else
+
+#ifndef isunordered
+#   define isunordered(u, v) (isnan(u) || isnan(v))
+#endif
+
+#ifndef islessgreater
+#   define islessgreater(x, u) (!isunordered (x, y) && (x < y) || (y < x))
+#endif
+
+#ifndef islessequal
+#   define islessequal(x, y) (!isunordered(x, y) && x <= y)
+#endif
+
+#ifndef isless
+#   define isless(x, y) (!isunordered(x, y) && x < y) 
+#endif
+
+#ifndef isgreater
+#   define isgreater(x, y) (!isunordered(x, y) && x > y)
+#endif
+
+#endif
+
 /*
  * Attempt at using the goto label construct of GNU GCC:
  * it turns out this does give some benefit: 5-15% speedup.
diff --git a/mono/interpreter/interp.c b/mono/interpreter/interp.c
index 464a4402e4a..5dce9596558 100644
--- a/mono/interpreter/interp.c
+++ b/mono/interpreter/interp.c
@@ -9,8 +9,11 @@
  *   Miguel de Icaza (miguel@ximian.com)
  *   Dietmar Maurer (dietmar@ximian.com)
  *
- * (C) 2001 Ximian, Inc.
+ * (C) 2001, 2002 Ximian, Inc.
  */
+#ifndef __USE_ISOC99
+#define __USE_ISOC99
+#endif
 #include "config.h"
 #include <stdio.h>
 #include <string.h>
@@ -19,6 +22,10 @@
 #include <setjmp.h>
 #include <signal.h>
 
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
+
 #ifdef HAVE_ALLOCA_H
 #   include <alloca.h>
 #else
@@ -37,13 +44,20 @@
 #include <mono/metadata/tokentype.h>
 #include <mono/metadata/loader.h>
 #include <mono/metadata/threads.h>
+#include <mono/metadata/threadpool.h>
+#include <mono/metadata/profiler-private.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/reflection.h>
 #include <mono/metadata/exception.h>
 #include <mono/metadata/verify.h>
 #include <mono/metadata/opcodes.h>
+#include <mono/metadata/debug-helpers.h>
 #include <mono/io-layer/io-layer.h>
 #include <mono/metadata/socket-io.h>
+#include <mono/metadata/mono-config.h>
+#include <mono/metadata/marshal.h>
+#include <mono/os/util.h>
+
 /*#include <mono/cli/types.h>*/
 #include "interp.h"
 #include "hacks.h"
@@ -53,23 +67,12 @@
 #define finite _finite
 #endif
 
-typedef struct {
-	union {
-		GTimer *timer;
-		MonoMethod *method;
-	} u;
-	guint64 count;
-	double total;
-} MethodProfile;
-
 /* If true, then we output the opcodes as we interpret them */
-static int tracing = 0;
+static int global_tracing = 0;
+static int global_no_pointers = 0;
 
 static int debug_indent_level = 0;
 
-static GHashTable *profiling = NULL;
-static GHashTable *profiling_classes = NULL;
-
 /*
  * Pull the list of opcodes
  */
@@ -95,6 +98,7 @@ enum {
 		(frame)->ex_handler = NULL;	\
 		(frame)->ex = NULL;	\
 		(frame)->child = NULL;	\
+		(frame)->invoke_trap = 0;	\
 	} while (0)
 
 void ves_exec_method (MonoInvocation *frame);
@@ -104,44 +108,95 @@ typedef void (*ICallMethod) (MonoInvocation *frame);
 static guint32 die_on_exception = 0;
 static guint32 frame_thread_id = 0;
 
+#define DEBUG_INTERP 1
+#if DEBUG_INTERP
+
+static unsigned long opcode_count = 0;
+static unsigned long fcall_count = 0;
+static int break_on_method = 0;
+static GList *db_methods = NULL;
+
 static void
-interp_ex_handler (MonoException *ex) {
-	MonoInvocation *frame = TlsGetValue (frame_thread_id);
-	frame->ex = ex;
-	longjmp (*(jmp_buf*)frame->locals, 1);
+output_indent (void)
+{
+	int h;
+
+	for (h = 0; h < debug_indent_level; h++)
+		g_print ("  ");
 }
 
 static void
-runtime_object_init (MonoObject *obj)
+db_match_method (gpointer data, gpointer user_data)
 {
-	int i;
-	MonoInvocation call;
-	MonoMethod *method = NULL;
-	MonoClass *klass = obj->vtable->klass;
+	MonoMethod *m = (MonoMethod*)user_data;
+	MonoMethodDesc *desc = data;
 
-	for (i = 0; i < klass->method.count; ++i) {
-		if (!strcmp (".ctor", klass->methods [i]->name) &&
-		    klass->methods [i]->signature->param_count == 0) {
-			method = klass->methods [i];
-			break;
-		}
-	}
+	if (mono_method_desc_full_match (desc, m))
+		break_on_method = 1;
+}
 
-	call.obj = obj;
+#define DEBUG_ENTER()	\
+	fcall_count++;	\
+	g_list_foreach (db_methods, db_match_method, (gpointer)frame->method);	\
+	if (break_on_method) tracing=2;	\
+	break_on_method = 0;	\
+	if (tracing) {	\
+		char *mn, *args = dump_stack (frame->stack_args, frame->stack_args+signature->param_count);	\
+		debug_indent_level++;	\
+		output_indent ();	\
+		mn = mono_method_full_name (frame->method, FALSE); \
+		g_print ("(%d) Entering %s (", GetCurrentThreadId(), mn);	\
+		g_free (mn); \
+		if (signature->hasthis) { \
+			if (global_no_pointers) { \
+				g_print ("this%s ", frame->obj ? "" : "=null"); \
+			} else { \
+				g_print ("%p ", frame->obj); } \
+		} \
+		g_print ("%s)\n", args);	\
+		g_free (args);	\
+	}	\
+	if (mono_profiler_events & MONO_PROFILE_ENTER_LEAVE)	\
+		mono_profiler_method_enter (frame->method);
 
-	g_assert (method);
-	INIT_FRAME (&call, NULL, obj, NULL, NULL, method);
+#define DEBUG_LEAVE()	\
+	if (tracing) {	\
+		char *mn, *args;	\
+		if (signature->ret->type != MONO_TYPE_VOID)	\
+			args = dump_stack (frame->retval, frame->retval + 1);	\
+		else	\
+			args = g_strdup ("");	\
+		output_indent ();	\
+		mn = mono_method_full_name (frame->method, FALSE); \
+		g_print ("(%d) Leaving %s", GetCurrentThreadId(),  mn);	\
+		g_free (mn); \
+		g_print (" => %s\n", args);	\
+		g_free (args);	\
+		debug_indent_level--;	\
+	}	\
+	if (mono_profiler_events & MONO_PROFILE_ENTER_LEAVE)	\
+		mono_profiler_method_leave (frame->method);
 
-	ves_exec_method (&call);
-}
+#else
+
+#define DEBUG_ENTER()
+#define DEBUG_LEAVE()
 
+#endif
+
+static void
+interp_ex_handler (MonoException *ex) {
+	MonoInvocation *frame = TlsGetValue (frame_thread_id);
+	frame->ex = ex;
+	longjmp (*(jmp_buf*)frame->locals, 1);
+}
 
 static void
 ves_real_abort (int line, MonoMethod *mh,
 		const unsigned char *ip, stackval *stack, stackval *sp)
 {
 	MonoMethodNormal *mm = (MonoMethodNormal *)mh;
-	fprintf (stderr, "Execution aborted in method: %s\n", mh->name);
+	fprintf (stderr, "Execution aborted in method: %s::%s\n", mh->klass->name, mh->name);
 	fprintf (stderr, "Line=%d IP=0x%04x, Aborted execution\n", line,
 		 ip-mm->header->code);
 	g_print ("0x%04x %02x\n",
@@ -149,31 +204,12 @@ ves_real_abort (int line, MonoMethod *mh,
 	if (sp > stack)
 		printf ("\t[%d] %d 0x%08x %0.5f\n", sp-stack, sp[-1].type, sp[-1].data.i, sp[-1].data.f);
 }
-#define ves_abort() do {ves_real_abort(__LINE__, frame->method, ip, frame->stack, sp); THROW_EX (mono_get_exception_execution_engine (), ip);} while (0);
+#define ves_abort() do {ves_real_abort(__LINE__, frame->method, ip, frame->stack, sp); THROW_EX (mono_get_exception_execution_engine (NULL), ip);} while (0);
 
-/*
- * runtime_class_init:
- * @klass: klass that needs to be initialized
- *
- * This routine calls the class constructor for @class.
- */
-static void
-runtime_class_init (MonoClass *klass)
+static gpointer
+interp_create_remoting_trampoline (MonoMethod *method)
 {
-	MonoMethod *method;
-	MonoInvocation call;
-	int i;
-
-	for (i = 0; i < klass->method.count; ++i) {
-		method = klass->methods [i];
-		if ((method->flags & METHOD_ATTRIBUTE_SPECIAL_NAME) && 
-		    (strcmp (".cctor", method->name) == 0)) {
-			INIT_FRAME (&call, NULL, NULL, NULL, NULL, method);
-			ves_exec_method (&call);
-			return;
-		}
-	}
-	/* No class constructor found */
+	return mono_marshal_get_remoting_invoke (method);
 }
 
 static MonoMethod*
@@ -182,27 +218,34 @@ get_virtual_method (MonoDomain *domain, MonoMethod *m, stackval *objs)
 	MonoObject *obj;
 	MonoClass *klass;
 	MonoMethod **vtable;
+	gboolean is_proxy = FALSE;
+	MonoMethod *res;
 
 	if ((m->flags & METHOD_ATTRIBUTE_FINAL) || !(m->flags & METHOD_ATTRIBUTE_VIRTUAL))
 			return m;
 
-	g_assert (m->klass->inited);
-
 	obj = objs->data.p;
-	klass = obj->vtable->klass;
-	vtable = (MonoMethod **)obj->vtable->vtable;
+	if ((klass = obj->vtable->klass) == mono_defaults.transparent_proxy_class) {
+		klass = ((MonoTransparentProxy *)obj)->klass;
+		is_proxy = TRUE;
+	}
+	vtable = (MonoMethod **)klass->vtable;
 
 	if (m->klass->flags & TYPE_ATTRIBUTE_INTERFACE) {
-		return *(MonoMethod**)(obj->vtable->interface_offsets [m->klass->interface_id] + (m->slot<<2));
+		res = *(MonoMethod**)((char*)obj->vtable->interface_offsets [m->klass->interface_id] + (m->slot<<2));
+	} else {
+		res = vtable [m->slot];
 	}
+	g_assert (res);
 
-	g_assert (vtable [m->slot]);
-
-	return vtable [m->slot];
+	if (is_proxy)
+		return mono_marshal_get_remoting_invoke (res);
+	
+	return res;
 }
 
 void inline
-stackval_from_data (MonoType *type, stackval *result, const char *data)
+stackval_from_data (MonoType *type, stackval *result, char *data, gboolean pinvoke)
 {
 	if (type->byref) {
 		switch (type->type) {
@@ -280,11 +323,17 @@ stackval_from_data (MonoType *type, stackval *result, const char *data)
 		return;
 	case MONO_TYPE_VALUETYPE:
 		if (type->data.klass->enumtype) {
-			return stackval_from_data (type->data.klass->enum_basetype, result, data);
+			return stackval_from_data (type->data.klass->enum_basetype, result, data, pinvoke);
 		} else {
+			int size;
 			result->type = VAL_VALUET;
 			result->data.vt.klass = type->data.klass;
-			memcpy (result->data.vt.vt, data, mono_class_value_size (type->data.klass, NULL));
+			
+			if (pinvoke)
+				size = mono_class_native_size (type->data.klass, NULL);
+			else
+				size = mono_class_value_size (type->data.klass, NULL);
+			memcpy (result->data.vt.vt, data, size);
 		}
 		return;
 	default:
@@ -293,14 +342,15 @@ stackval_from_data (MonoType *type, stackval *result, const char *data)
 	}
 }
 
-static void inline
-stackval_to_data (MonoType *type, stackval *val, char *data)
+void inline
+stackval_to_data (MonoType *type, stackval *val, char *data, gboolean pinvoke)
 {
 	if (type->byref) {
 		gpointer *p = (gpointer*)data;
 		*p = val->data.p;
 		return;
 	}
+	//printf ("TODAT0 %p\n", data);
 	switch (type->type) {
 	case MONO_TYPE_I1:
 	case MONO_TYPE_U1: {
@@ -362,9 +412,16 @@ stackval_to_data (MonoType *type, stackval *val, char *data)
 	}
 	case MONO_TYPE_VALUETYPE:
 		if (type->data.klass->enumtype) {
-			return stackval_to_data (type->data.klass->enum_basetype, val, data);
+			return stackval_to_data (type->data.klass->enum_basetype, val, data, pinvoke);
 		} else {
-			memcpy (data, val->data.vt.vt, mono_class_value_size (type->data.klass, NULL));
+			int size;
+
+			if (pinvoke)
+				size = mono_class_native_size (type->data.klass, NULL);
+			else
+				size = mono_class_value_size (type->data.klass, NULL);
+
+			memcpy (data, val->data.vt.vt, size);
 		}
 		return;
 	default:
@@ -413,22 +470,25 @@ ves_array_set (MonoInvocation *frame)
 
 	g_assert (ac->rank >= 1);
 
-	pos = sp [0].data.i - ao->bounds [0].lower_bound;
-	for (i = 1; i < ac->rank; i++) {
-		if ((t = sp [i].data.i - ao->bounds [i].lower_bound) >= 
-		    ao->bounds [i].length) {
-			g_warning ("wrong array index");
-			g_assert_not_reached ();
+	pos = sp [0].data.i;
+	if (ao->bounds != NULL) {
+		pos -= ao->bounds [0].lower_bound;
+		for (i = 1; i < ac->rank; i++) {
+			if ((t = sp [i].data.i - ao->bounds [i].lower_bound) >= 
+			    ao->bounds [i].length) {
+				g_warning ("wrong array index");
+				g_assert_not_reached ();
+			}
+			pos = pos*ao->bounds [i].length + sp [i].data.i - 
+				ao->bounds [i].lower_bound;
 		}
-		pos = pos*ao->bounds [i].length + sp [i].data.i - 
-			ao->bounds [i].lower_bound;
 	}
 
 	esize = mono_array_element_size (ac);
 	ea = mono_array_addr_with_size (ao, esize, pos);
 
 	mt = frame->method->signature->params [ac->rank];
-	stackval_to_data (mt, &sp [ac->rank], ea);
+	stackval_to_data (mt, &sp [ac->rank], ea, FALSE);
 }
 
 static void 
@@ -448,16 +508,19 @@ ves_array_get (MonoInvocation *frame)
 
 	g_assert (ac->rank >= 1);
 
-	pos = sp [0].data.i - ao->bounds [0].lower_bound;
-	for (i = 1; i < ac->rank; i++)
-		pos = pos*ao->bounds [i].length + sp [i].data.i - 
-			ao->bounds [i].lower_bound;
+	pos = sp [0].data.i;
+	if (ao->bounds != NULL) {
+		pos -= ao->bounds [0].lower_bound;
+		for (i = 1; i < ac->rank; i++)
+			pos = pos*ao->bounds [i].length + sp [i].data.i - 
+				ao->bounds [i].lower_bound;
+	}
 
 	esize = mono_array_element_size (ac);
 	ea = mono_array_addr_with_size (ao, esize, pos);
 
 	mt = frame->method->signature->ret;
-	stackval_from_data (mt, frame->retval, ea);
+	stackval_from_data (mt, frame->retval, ea, FALSE);
 }
 
 static void
@@ -476,10 +539,13 @@ ves_array_element_address (MonoInvocation *frame)
 
 	g_assert (ac->rank >= 1);
 
-	pos = sp [0].data.i - ao->bounds [0].lower_bound;
-	for (i = 1; i < ac->rank; i++)
-		pos = pos*ao->bounds [i].length + sp [i].data.i - 
-			ao->bounds [i].lower_bound;
+	pos = sp [0].data.i;
+	if (ao->bounds != NULL) {
+		pos -= ao->bounds [0].lower_bound;
+		for (i = 1; i < ac->rank; i++)
+			pos = pos*ao->bounds [i].length + sp [i].data.i - 
+				ao->bounds [i].lower_bound;
+	}
 
 	esize = mono_array_element_size (ac);
 	ea = mono_array_addr_with_size (ao, esize, pos);
@@ -488,17 +554,47 @@ ves_array_element_address (MonoInvocation *frame)
 	frame->retval->data.p = ea;
 }
 
+static void
+interp_walk_stack (MonoStackWalk func, gpointer user_data)
+{
+	MonoInvocation *frame = TlsGetValue (frame_thread_id);
+	int il_offset;
+	MonoMethodHeader *hd;
+
+	while (frame) {
+		if (!frame->method || (frame->method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) || 
+				(frame->method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME)))
+			il_offset = -1;
+		else {
+			hd = ((MonoMethodNormal*)frame->method)->header;
+			il_offset = frame->ip - hd->code;
+		}
+		if (func (frame->method, -1, il_offset, user_data))
+			return;
+		frame = frame->parent;
+	}
+}
+
 static void 
-ves_pinvoke_method (MonoInvocation *frame)
+ves_pinvoke_method (MonoInvocation *frame, MonoMethodSignature *sig, MonoFunc addr, gboolean string_ctor)
 {
 	jmp_buf env;
 	MonoPIFunc func;
-	
-	if (setjmp(env))
+
+	if (setjmp (env)) {
+		TlsSetValue (frame_thread_id, frame->args);
 		return;
-	if (!frame->method->info)
-		frame->method->info = mono_create_trampoline (frame->method, 0);
-	func = (MonoPIFunc)frame->method->info;
+	}
+
+	if (frame->method) {
+		if (!frame->method->info) {
+			func = frame->method->info = mono_create_trampoline (sig, string_ctor);
+		} else { 
+			func = (MonoPIFunc)frame->method->info;
+		}
+	} else {
+		func = mono_create_trampoline (sig, string_ctor);
+	}
 
 	/* 
 	 * frame->locals and args are unused for P/Invoke methods, so we reuse them. 
@@ -510,8 +606,15 @@ ves_pinvoke_method (MonoInvocation *frame)
 	frame->args = (char*)TlsGetValue (frame_thread_id);
 	TlsSetValue (frame_thread_id, frame);
 
-	func ((MonoFunc)frame->method->addr, &frame->retval->data.p, frame->obj, frame->stack_args);
-	stackval_from_data (frame->method->signature->ret, frame->retval, (const char*)&frame->retval->data.p);
+	func (addr, &frame->retval->data.p, frame->obj, frame->stack_args);
+
+	if (string_ctor) {
+		stackval_from_data (&mono_defaults.string_class->byval_arg, 
+				    frame->retval, (char*)&frame->retval->data.p, sig->pinvoke);
+ 	} else if (!MONO_TYPE_ISSTRUCT (sig->ret))
+		stackval_from_data (sig->ret, frame->retval, (char*)&frame->retval->data.p, sig->pinvoke);
+
+	TlsSetValue (frame_thread_id, frame->args);
 }
 
 /*
@@ -524,73 +627,174 @@ ves_runtime_method (MonoInvocation *frame)
 {
 	const char *name = frame->method->name;
 	MonoObject *obj = (MonoObject*)frame->obj;
-	MonoDelegate *delegate = (MonoDelegate*)frame->obj;
+	MonoMulticastDelegate *delegate = (MonoMulticastDelegate*)frame->obj;
+	MonoInvocation call;
+	MonoMethod *nm;
 
-	mono_class_init (mono_defaults.delegate_class);
+
+	mono_class_init (frame->method->klass);
 	
-	if (*name == '.' && (strcmp (name, ".ctor") == 0) && obj &&
-			mono_object_isinst (obj, mono_defaults.delegate_class)) {
-		delegate->target = frame->stack_args[0].data.p;
-		delegate->method_ptr = frame->stack_args[1].data.p;
-		return;
-	}
-	if (*name == 'I' && (strcmp (name, "Invoke") == 0) && obj &&
-			mono_object_isinst (obj, mono_defaults.delegate_class)) {
-		MonoPIFunc func;
-		guchar *code;
-		MonoMethod *method;
+	if (obj && mono_object_isinst (obj, mono_defaults.multicastdelegate_class)) {
+		if (*name == '.' && (strcmp (name, ".ctor") == 0)) {
+			mono_delegate_ctor (obj, frame->stack_args[0].data.p, frame->stack_args[1].data.p);
+			return;
+		}
+		if (*name == 'I' && (strcmp (name, "Invoke") == 0)) {
+			guchar *code;
+			MonoJitInfo *ji;
+			MonoMethod *method;
 		
-		code = (guchar*)delegate->method_ptr;
-		method = mono_method_pointer_get (code);
-		/* FIXME: check for NULL method */
-		if (!method->addr)
-			method->addr = mono_create_trampoline (method, 1);
-		func = method->addr;
-		/* FIXME: need to handle exceptions across managed/unmanaged boundaries */
-		func ((MonoFunc)delegate->method_ptr, &frame->retval->data.p, delegate->target, frame->stack_args);
-		stackval_from_data (frame->method->signature->ret, frame->retval, (const char*)&frame->retval->data.p);
-		return;
+			while (delegate) {
+
+				code = (guchar*)delegate->delegate.method_ptr;
+				if ((ji = mono_jit_info_table_find (mono_root_domain, code))) {
+					method = ji->method;
+					INIT_FRAME(&call,frame,delegate->delegate.target,frame->stack_args,frame->retval,method);
+					ves_exec_method (&call);
+					frame->ex = call.ex;
+					if (frame->ex)
+						return;
+				} else {
+					g_assert_not_reached ();
+				}
+
+				delegate = delegate->prev;
+			}
+			return;
+		}
+		if (*name == 'B' && (strcmp (name, "BeginInvoke") == 0)) {
+			nm = mono_marshal_get_delegate_begin_invoke (frame->method);
+			INIT_FRAME(&call,frame,obj,frame->stack_args,frame->retval,nm);
+			ves_exec_method (&call);
+			frame->ex = call.ex;
+			return;
+		}
+		if (*name == 'E' && (strcmp (name, "EndInvoke") == 0)) {
+			nm = mono_marshal_get_delegate_end_invoke (frame->method);
+			INIT_FRAME(&call,frame,obj,frame->stack_args,frame->retval,nm);
+			ves_exec_method (&call);
+			frame->ex = call.ex;
+			return;
+		}
 	}
+
+	if (obj && mono_object_isinst (obj, mono_defaults.array_class)) {
+		if (*name == 'S' && (strcmp (name, "Set") == 0)) {
+			ves_array_set (frame);
+			return;
+		}
+		if (*name == 'G' && (strcmp (name, "Get") == 0)) {
+			ves_array_get (frame);
+			return;
+		}
+		if (*name == 'A' && (strcmp (name, "Address") == 0)) {
+			ves_array_element_address (frame);
+			return;
+		}
+	}
+	
 	g_error ("Don't know how to exec runtime method %s.%s::%s", 
 			frame->method->klass->name_space, frame->method->klass->name,
 			frame->method->name);
 }
 
-static void
+static char*
 dump_stack (stackval *stack, stackval *sp)
 {
 	stackval *s = stack;
+	GString *str = g_string_new ("");
 	
 	if (sp == stack)
-		return;
+		return g_string_free (str, FALSE);
 	
 	while (s < sp) {
 		switch (s->type) {
-		case VAL_I32: printf ("[%d] ", s->data.i); break;
-		case VAL_I64: printf ("[%lld] ", s->data.l); break;
-		case VAL_DOUBLE: printf ("[%0.5f] ", s->data.f); break;
-		case VAL_VALUET: printf ("[vt: %p] ", s->data.vt.vt); break;
-#if 0
+		case VAL_I32: g_string_sprintfa (str, "[%d] ", s->data.i); break;
+		case VAL_I64: g_string_sprintfa (str, "[%lld] ", s->data.l); break;
+		case VAL_DOUBLE: g_string_sprintfa (str, "[%0.5f] ", s->data.f); break;
+		case VAL_VALUET:
+			if (!global_no_pointers)
+				g_string_sprintfa (str, "[vt: %p] ", s->data.vt.vt);
+			else
+				g_string_sprintfa (str, "[vt%s] ", s->data.vt.vt ? "" : "=null");
+			break;
 		case VAL_OBJ: {
 			MonoObject *obj =  s->data.p;
-			if (obj && obj->klass == mono_defaults.string_class) {
-				char *str = mono_string_to_utf8 ((MonoString*)obj);
-				printf ("\"%s\" ", str);
-				g_free (str);
-				break;
+			if (global_no_pointers && obj && obj->vtable) {
+				MonoClass *klass = mono_object_class (obj);
+				if (klass == mono_defaults.string_class) {
+					char *utf8 = mono_string_to_utf8 ((MonoString*) obj);
+					g_string_sprintfa (str, "[str:%s] ", utf8);
+					g_free (utf8);
+					break;
+				} else if (klass == mono_defaults.sbyte_class) {
+					g_string_sprintfa (str, "[b:%d] ",
+							   *(gint8 *)((guint8 *) obj + sizeof (MonoObject)));
+					break;
+				} else if (klass == mono_defaults.int16_class) {
+					g_string_sprintfa (str, "[b:%d] ",
+							   *(gint16 *)((guint8 *) obj + sizeof (MonoObject)));
+					break;
+				} else if (klass == mono_defaults.int32_class) {
+					g_string_sprintfa (str, "[b:%d] ",
+							   *(gint32 *)((guint8 *) obj + sizeof (MonoObject)));
+					break;
+				} else if (klass == mono_defaults.byte_class) {
+					g_string_sprintfa (str, "[b:%u] ",
+							   *(guint8 *)((guint8 *) obj + sizeof (MonoObject)));
+					break;
+				} else if (klass == mono_defaults.char_class
+					   || klass == mono_defaults.uint16_class) {
+					g_string_sprintfa (str, "[b:%u] ",
+							   *(guint16 *)((guint8 *) obj + sizeof (MonoObject)));
+					break;
+				} else if (klass == mono_defaults.uint32_class) {
+					g_string_sprintfa (str, "[b:%u] ",
+							   *(guint32 *)((guint8 *) obj + sizeof (MonoObject)));
+					break;
+				} else if (klass == mono_defaults.int64_class) {
+					g_string_sprintfa (str, "[b:%lld] ",
+							   *(gint64 *)((guint8 *) obj + sizeof (MonoObject)));
+					break;
+				} else if (klass == mono_defaults.uint64_class) {
+					g_string_sprintfa (str, "[b:%llu] ",
+							   *(guint64 *)((guint8 *) obj + sizeof (MonoObject)));
+					break;
+				} else if (klass == mono_defaults.double_class) {
+					g_string_sprintfa (str, "[b:%0.5f] ",
+							   *(gdouble *)((guint8 *) obj + sizeof (MonoObject)));
+					break;
+				} else if (klass == mono_defaults.single_class) {
+					g_string_sprintfa (str, "[b:%0.5f] ",
+							   *(gfloat *)((guint8 *) obj + sizeof (MonoObject)));
+					break;
+				} else if (klass == mono_defaults.boolean_class) {
+					g_string_sprintfa (str, "[b:%s] ",
+							   *(gboolean *)((guint8 *) obj + sizeof (MonoObject))
+							   ? "true" : "false");
+					break;
+				}
 			}
+			/* fall thru */
 		}
-#endif
-		default: printf ("[%p] ", s->data.p); break;
+		default:
+			if (!global_no_pointers)
+				g_string_sprintfa (str, "[%p] ", s->data.p);
+			else
+				g_string_sprintfa (str, s->data.p ? "[ptr] " : "[null] ");
+			break;
 		}
 		++s;
 	}
+	return g_string_free (str, FALSE);
 }
 
-static void
+static char*
 dump_frame (MonoInvocation *inv)
 {
+	GString *str = g_string_new ("");
 	int i;
+	char *args;
 	for (i = 0; inv; inv = inv->parent, ++i) {
 		MonoClass *k = inv->method->klass;
 		int codep;
@@ -608,58 +812,40 @@ dump_frame (MonoInvocation *inv)
 			opname = mono_opcode_names [codep];
 			codep = inv->ip - hd->code;
 		}
-		g_print ("#%d: 0x%05x %-10s in %s.%s::%s (", i, codep, opname,
-						k->name_space, k->name, inv->method->name);
-		dump_stack (inv->stack_args, inv->stack_args + inv->method->signature->param_count);
-		g_print (")\n");
+		args = dump_stack (inv->stack_args, inv->stack_args + inv->method->signature->param_count);
+		g_string_sprintfa (str, "#%d: 0x%05x %-10s in %s.%s::%s (%s)\n", i, codep, opname,
+						k->name_space, k->name, inv->method->name, args);
+		g_free (args);
 	}
+	return g_string_free (str, FALSE);
 }
 
-#define DEBUG_INTERP 1
-#if DEBUG_INTERP
+static CRITICAL_SECTION metadata_lock;
 
-static unsigned long opcode_count = 0;
-static unsigned long fcall_count = 0;
-static int break_on_method = 0;
-static GList *db_methods = NULL;
-
-static void
-output_indent (void)
-{
-	int h;
-
-	for (h = 0; h < debug_indent_level; h++)
-		g_print ("  ");
-}
+typedef enum {
+	INLINE_STRING_LENGTH = 1,
+	INLINE_ARRAY_LENGTH,
+	INLINE_ARRAY_RANK,
+	INLINE_TYPE_ELEMENT_TYPE
+} InlineMethod;
 
 static void
-db_match_method (gpointer data, gpointer user_data)
-{
-	MonoMethod *m = (MonoMethod*)user_data;
-	char *startname, *startclass;
-
-	if (strcmp((char*)data, m->name) == 0) {
-		break_on_method = 1;
-		return;
-	}
-	startname = strrchr ((char*)data, ':');
-	if (!startname)
-		return;
-	if (strcmp(startname + 1, m->name) != 0)
-		return;
-	startclass = (char*)data;
-	if (memcmp (startclass, m->klass->name, startname-startclass) == 0)
-		break_on_method = 1;
-	/* ignore namespace */
-}
-
-static guint32*
-calc_offsets (MonoMethodHeader *header, MonoMethodSignature *signature)
+calc_offsets (MonoImage *image, MonoMethod *method)
 {
 	int i, align, size, offset = 0;
+	MonoMethodHeader *header = ((MonoMethodNormal*)method)->header;
+	MonoMethodSignature *signature = method->signature;
 	int hasthis = signature->hasthis;
-	guint32 *offsets = g_new0 (guint32, 2 + header->num_locals + signature->param_count + signature->hasthis);
+	register const unsigned char *ip, *end;
+	const MonoOpcode *opcode;
+	guint32 token;
+	MonoMethod *m;
+	MonoClass *class;
+	MonoDomain *domain = mono_domain_get ();
+	guint32 *offsets;
 
+	mono_profiler_method_jit (method); /* sort of... */
+	offsets = g_new0 (guint32, 2 + header->num_locals + signature->param_count + signature->hasthis);
 	for (i = 0; i < header->num_locals; ++i) {
 		size = mono_type_size (header->locals [i], &align);
 		offset += align - 1;
@@ -676,57 +862,118 @@ calc_offsets (MonoMethodHeader *header, MonoMethodSignature *signature)
 		offset += sizeof (gpointer);
 	}
 	for (i = 0; i < signature->param_count; ++i) {
-		size = mono_type_size (signature->params [i], &align);
+		if (signature->pinvoke)
+			size = mono_type_native_stack_size (signature->params [i], &align);
+		else
+			size = mono_type_stack_size (signature->params [i], &align);
 		offset += align - 1;
 		offset &= ~(align - 1);
 		offsets [2 + hasthis + header->num_locals + i] = offset;
 		offset += size;
 	}
 	offsets [1] = offset;
-	return offsets;
-}
 
-#define DEBUG_ENTER()	\
-	fcall_count++;	\
-	g_list_foreach (db_methods, db_match_method, (gpointer)frame->method);	\
-	if (break_on_method) G_BREAKPOINT ();	\
-	break_on_method = 0;	\
-	if (tracing) {	\
-		MonoClass *klass = frame->method->klass;	\
-		debug_indent_level++;	\
-		output_indent ();	\
-		g_print ("Entering %s.%s::%s (", klass->name_space, klass->name, frame->method->name);	\
-		dump_stack (frame->stack_args, frame->stack_args+frame->method->signature->param_count);	\
-		g_print (")\n");	\
-	}	\
-	if (profiling) {	\
-		if (!(profile_info = g_hash_table_lookup (profiling, frame->method))) {	\
-			profile_info = g_new0 (MethodProfile, 1);	\
-			profile_info->u.timer = g_timer_new ();	\
-			g_hash_table_insert (profiling, frame->method, profile_info);	\
-		}	\
-		profile_info->count++;	\
-		g_timer_start (profile_info->u.timer);	\
-	}
+	EnterCriticalSection (&metadata_lock);
+	/* intern the strings in the method. */
+	ip = header->code;
+	end = ip + header->code_size;
+	while (ip < end) {
+		i = *ip;
+		if (*ip == 0xfe) {
+			ip++;
+			i = *ip + 256;
+		}
+		opcode = &mono_opcodes [i];
+		switch (opcode->argument) {
+		case MonoInlineNone:
+			++ip;
+			break;
+		case MonoInlineString:
+			mono_ldstr (domain, image, mono_metadata_token_index (read32 (ip + 1)));
+			ip += 5;
+			break;
+		case MonoInlineType:
+			if (method->wrapper_type == MONO_WRAPPER_NONE) {
+				class = mono_class_get (image, read32 (ip + 1));
+				mono_class_init (class);
+				if (!(class->flags & TYPE_ATTRIBUTE_INTERFACE))
+					mono_class_vtable (domain, class);
+			}
+			ip += 5;
+			break;
+		case MonoInlineField:
+			token = read32 (ip + 1);
+			if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF) {
+				mono_field_from_memberref (image, token, &class);
+			} else {
+				class = mono_class_get (image, 
+					MONO_TOKEN_TYPE_DEF | mono_metadata_typedef_from_field (image, token & 0xffffff));
+			}
+			mono_class_init (class);
+			mono_class_vtable (domain, class);
+			ip += 5;
+			break;
+		case MonoInlineMethod:
+			if (method->wrapper_type == MONO_WRAPPER_NONE) {
+				m = mono_get_method (image, read32 (ip + 1), NULL);
+				mono_class_init (m->klass);
+				if (!(m->klass->flags & TYPE_ATTRIBUTE_INTERFACE))
+					mono_class_vtable (domain, m->klass);
+			}
+			ip += 5;
+			break;
+		case MonoInlineTok:
+		case MonoInlineSig:
+		case MonoShortInlineR:
+		case MonoInlineI:
+		case MonoInlineBrTarget:
+			ip += 5;
+			break;
+		case MonoInlineVar:
+			ip += 3;
+			break;
+		case MonoShortInlineVar:
+		case MonoShortInlineI:
+		case MonoShortInlineBrTarget:
+			ip += 2;
+			break;
+		case MonoInlineSwitch: {
+			guint32 n;
+			++ip;
+			n = read32 (ip);
+			ip += 4;
+			ip += 4 * n;
+			break;
+		}
+		case MonoInlineR:
+		case MonoInlineI8:
+			ip += 9;
+			break;
+		default:
+			g_assert_not_reached ();
+		}
 
-#define DEBUG_LEAVE()	\
-	if (tracing) {	\
-		MonoClass *klass = frame->method->klass;	\
-		output_indent ();	\
-		g_print ("Leaving %s.%s::%s\n", klass->name_space, klass->name, frame->method->name);	\
-		debug_indent_level--;	\
-	}	\
-	if (profiling) {	\
-		g_timer_stop (profile_info->u.timer);	\
-		profile_info->total += g_timer_elapsed (profile_info->u.timer, NULL);	\
 	}
+	method->info = offsets;
 
-#else
-
-#define DEBUG_ENTER()
-#define DEBUG_LEAVE()
-
-#endif
+	/*
+	 * We store the inline info in addr, since it's unused for IL methods.
+	 */
+	if (method->klass == mono_defaults.string_class) {
+		if (strcmp (method->name, "get_Length") == 0)
+			method->addr = GUINT_TO_POINTER (INLINE_STRING_LENGTH);
+	} else if (method->klass == mono_defaults.array_class) {
+		if (strcmp (method->name, "get_Length") == 0)
+			method->addr = GUINT_TO_POINTER (INLINE_ARRAY_LENGTH);
+		else if (strcmp (method->name, "get_Rank") == 0 || strcmp (method->name, "GetRank") == 0)
+			method->addr = GUINT_TO_POINTER (INLINE_ARRAY_RANK);
+	} else if (method->klass == mono_defaults.monotype_class) {
+		if (strcmp (method->name, "GetElementType") == 0)
+			method->addr = GUINT_TO_POINTER (INLINE_TYPE_ELEMENT_TYPE);
+	}
+	LeaveCriticalSection (&metadata_lock);
+	mono_profiler_method_end_jit (method, MONO_PROFILE_OK);
+}
 
 #define LOCAL_POS(n)            (frame->locals + offsets [2 + (n)])
 #define LOCAL_TYPE(header, n)   ((header)->locals [(n)])
@@ -737,8 +984,12 @@ calc_offsets (MonoMethodHeader *header, MonoMethodSignature *signature)
 
 #define THROW_EX(exception,ex_ip)	\
 		do {\
+			char *stack_trace;	\
 			frame->ip = (ex_ip);		\
+			stack_trace = dump_frame (frame);	\
 			frame->ex = (MonoException*)(exception);	\
+			frame->ex->stack_trace = mono_string_new (domain, stack_trace);	\
+			g_free (stack_trace);	\
 			goto handle_exception;	\
 		} while (0)
 
@@ -753,14 +1004,17 @@ struct _vtallocation {
 /*
  * we don't use vtallocation->next, yet
  */
-#define vt_alloc(vtype,sp)	\
+#define vt_alloc(vtype,sp,native)	\
 	if ((vtype)->type == MONO_TYPE_VALUETYPE && !(vtype)->data.klass->enumtype) {	\
 		if (!(vtype)->byref) {	\
 			guint32 align;	\
-			guint32 size = mono_class_value_size ((vtype)->data.klass, &align);	\
-			if (!vtalloc || vtalloc->size < size) {	\
+			guint32 size; \
+                        if (native) size = mono_class_native_size ((vtype)->data.klass, &align);	\
+                        else size = mono_class_value_size ((vtype)->data.klass, &align);	\
+			if (!vtalloc || vtalloc->size <= size) {	\
 				vtalloc = alloca (sizeof (vtallocation) + size);	\
 				vtalloc->size = size;	\
+				g_assert (size < 10000);	\
 			}	\
 			(sp)->data.vt.vt = vtalloc->data;	\
 			vtalloc = NULL;	\
@@ -794,51 +1048,67 @@ verify_method (MonoMethod *m)
 	mono_free_verify_list (errors);
 }
 
+#define MYGUINT64_MAX 18446744073709551615UL
+#define MYGINT64_MAX 9223372036854775807LL
+#define MYGINT64_MIN (-MYGINT64_MAX -1LL)
+
+#define MYGUINT32_MAX 4294967295U
+#define MYGINT32_MAX 2147483647
+#define MYGINT32_MIN (-MYGINT32_MAX -1)
+	
 #define CHECK_ADD_OVERFLOW(a,b) \
-	(gint32)(b) >= 0 ? (gint32)(INT_MAX) - (gint32)(b) < (gint32)(a) ? -1 : 0	\
-	: (gint32)(INT_MIN) - (gint32)(b) > (gint32)(a) ? +1 : 0
+	(gint32)(b) >= 0 ? (gint32)(MYGINT32_MAX) - (gint32)(b) < (gint32)(a) ? -1 : 0	\
+	: (gint32)(MYGINT32_MIN) - (gint32)(b) > (gint32)(a) ? +1 : 0
 
 #define CHECK_ADD_OVERFLOW_UN(a,b) \
-	(guint32)(UINT_MAX) - (guint32)(b) < (guint32)(a) ? -1 : 0
+	(guint32)(MYGUINT32_MAX) - (guint32)(b) < (guint32)(a) ? -1 : 0
 
 #define CHECK_ADD_OVERFLOW64(a,b) \
-	(gint64)(b) >= 0 ? (gint64)(LLONG_MAX) - (gint64)(b) < (gint64)(a) ? -1 : 0	\
-	: (gint64)(LLONG_MIN) - (gint64)(b) > (gint64)(a) ? +1 : 0
+	(gint64)(b) >= 0 ? (gint64)(MYGINT64_MAX) - (gint64)(b) < (gint64)(a) ? -1 : 0	\
+	: (gint64)(MYGINT64_MIN) - (gint64)(b) > (gint64)(a) ? +1 : 0
 
-#ifndef GUINT64_MAX
-#define GUINT64_MAX 18446744073709551615UL
-#endif
-	
 #define CHECK_ADD_OVERFLOW64_UN(a,b) \
-	(guint64)(GUINT64_MAX) - (guint64)(b) < (guint64)(a) ? -1 : 0
+	(guint64)(MYGUINT64_MAX) - (guint64)(b) < (guint64)(a) ? -1 : 0
 
 static MonoObject*
-interp_mono_runtime_invoke (MonoMethod *method, void *obj, void **params)
+interp_mono_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject **exc)
 {
-	MonoInvocation frame;
-	MonoObject *retval;
+	MonoInvocation frame, *parent;
+	MonoObject *retval = NULL;
 	MonoMethodSignature *sig = method->signature;
-	int i, type;
+	MonoClass *klass = mono_class_from_mono_type (sig->ret);
+	int i, type, isobject = 0;
 	void *ret;
-	stackval *args = g_new0 (stackval, sig->param_count);
+	stackval result;
+	stackval *args = alloca (sizeof (stackval) * sig->param_count);
 
 	/* FIXME: Set frame for execption handling.  */
 
-	/* allocate ret object. */
-	if (sig->ret->type == MONO_TYPE_VOID) {
-		retval = NULL;
-		ret = NULL;
-	} else {
-		MonoClass *klass = mono_class_from_mono_type (sig->ret);
-		if (klass->valuetype) {
-			retval = mono_object_new (mono_domain_get (), mono_class_from_mono_type (sig->ret));
-			ret = ((char*)retval) + sizeof (MonoObject);
-		} else {
-			ret = &retval;
-		}
+	switch (sig->ret->type) {
+	case MONO_TYPE_VOID:
+		break;
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_ARRAY:
+	case MONO_TYPE_SZARRAY:
+		isobject = 1;
+		break;
+	case MONO_TYPE_VALUETYPE:
+		retval = mono_object_new (mono_domain_get (), klass);
+		ret = ((char*)retval) + sizeof (MonoObject);
+		if (!sig->ret->data.klass->enumtype)
+			result.data.vt.vt = ret;
+		break;
+	default:
+		retval = mono_object_new (mono_domain_get (), klass);
+		ret = ((char*)retval) + sizeof (MonoObject);
+		break;
 	}
+
 	for (i = 0; i < sig->param_count; ++i) {
 		if (sig->params [i]->byref) {
+			args [i].type = VAL_POINTER;
 			args [i].data.p = params [i];
 			continue;
 		}
@@ -884,22 +1154,40 @@ handle_enum:
 				type = sig->params [i]->data.klass->enum_basetype->type;
 				goto handle_enum;
 			} else {
-				g_warning ("generic valutype %s not handled in runtime invoke", sig->params [i]->data.klass->name);
+				args [i].type = VAL_POINTER;
+				args [i].data.p = params [i];
+				args [i].data.vt.klass = NULL;
 			}
 			break;
 		case MONO_TYPE_STRING:
+		case MONO_TYPE_CLASS:
+		case MONO_TYPE_ARRAY:
+		case MONO_TYPE_SZARRAY:
+		case MONO_TYPE_OBJECT:
 			args [i].type = VAL_OBJ;
 			args [i].data.p = params [i];
 			args [i].data.vt.klass = NULL;
 			break;
 		default:
-			g_error ("type 0x%x not handled in invoke", sig->params [i]->type);
+			g_error ("type 0x%x not handled in  runtime invoke", sig->params [i]->type);
 		}
 	}
 
-	INIT_FRAME(&frame,NULL,obj,args,ret,method);
+	/* chain with managed parent if any */
+	parent = TlsGetValue (frame_thread_id);
+	INIT_FRAME(&frame,parent,obj,args,&result,method);
+	if (exc)
+		frame.invoke_trap = 1;
 	ves_exec_method (&frame);
-	g_free (args);
+	if (exc && frame.ex) {
+		*exc = frame.ex;
+		return NULL;
+	}
+	if (sig->ret->type == MONO_TYPE_VOID && !method->string_ctor)
+		return NULL;
+	if (isobject || method->string_ctor)
+		return result.data.p;
+	stackval_to_data (sig->ret, &result, ret, sig->pinvoke);
 	return retval;
 }
 
@@ -922,47 +1210,44 @@ ves_exec_method (MonoInvocation *frame)
 	MonoMethodHeader *header;
 	MonoMethodSignature *signature;
 	MonoImage *image;
+	GSList *finally_ips = NULL;
 	const unsigned char *endfinally_ip;
 	register const unsigned char *ip;
 	register stackval *sp;
 	void **args_pointers;
 	guint32 *offsets;
+	gint il_ins_count = -1;
+	gint tracing = global_tracing;
 	unsigned char tail_recursion = 0;
 	unsigned char unaligned_address = 0;
 	unsigned char volatile_address = 0;
 	vtallocation *vtalloc = NULL;
-	MethodProfile *profile_info;
 	GOTO_LABEL_VARS;
 
-	mono_class_init (frame->method->klass);
+	if (frame->method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)
+		frame->method = mono_marshal_get_native_wrapper (frame->method);
+
+	signature = frame->method->signature;
 
 	DEBUG_ENTER ();
 
 	if (frame->method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) {
 		if (!frame->method->addr) {
-			frame->ex = (MonoException*)mono_get_exception_missing_method ();
-			DEBUG_LEAVE ();
-			return;
-		}
-		if (frame->method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
-			ves_pinvoke_method (frame);
-		} else {
-			ICallMethod icall = (ICallMethod)frame->method->addr;
-			icall (frame);
-		}
-		if (frame->ex)
-			goto handle_exception;
-		DEBUG_LEAVE ();
-		return;
-	} 
-
-	if (frame->method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
-		if (!frame->method->addr) {
-			frame->ex = (MonoException*)mono_get_exception_missing_method ();
-			DEBUG_LEAVE ();
-			return;
+			/* ugly, but needed by the iflags setting in loader.c */
+			if (frame->method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) {
+				ves_runtime_method (frame);
+				if (frame->ex)
+					goto handle_exception;
+				DEBUG_LEAVE ();
+				return;
+			}
+			if (frame->method->addr) {
+				frame->ex = (MonoException*)mono_get_exception_missing_method ();
+				goto handle_exception;
+			}
 		}
-		ves_pinvoke_method (frame);
+		ves_pinvoke_method (frame, frame->method->signature, frame->method->addr, 
+			    frame->method->string_ctor);
 		if (frame->ex)
 			goto handle_exception;
 		DEBUG_LEAVE ();
@@ -980,21 +1265,21 @@ ves_exec_method (MonoInvocation *frame)
 	/*verify_method (frame->method);*/
 
 	header = ((MonoMethodNormal *)frame->method)->header;
-	signature = frame->method->signature;
 	image = frame->method->klass->image;
 
+	if (!frame->method->info)
+		calc_offsets (image, frame->method);
+	offsets = frame->method->info;
+
 	/*
 	 * with alloca we get the expected huge performance gain
 	 * stackval *stack = g_new0(stackval, header->max_stack);
 	 */
-
+	g_assert (header->max_stack < 10000);
 	sp = frame->stack = alloca (sizeof (stackval) * header->max_stack);
 
-	if (!frame->method->info)
-		frame->method->info = calc_offsets (header, signature);
-	offsets = frame->method->info;
-
 	if (header->num_locals) {
+		g_assert (offsets [0] < 10000);
 		frame->locals = alloca (offsets [0]);
 		/* 
 		 * yes, we do it unconditionally, because it needs to be done for
@@ -1009,7 +1294,9 @@ ves_exec_method (MonoInvocation *frame)
 		int i;
 		int has_this = signature->hasthis;
 
+		g_assert (offsets [1] < 10000);
 		frame->args = alloca (offsets [1]);
+		g_assert ((signature->param_count + has_this) < 1000);
 		args_pointers = alloca (sizeof(void*) * (signature->param_count + has_this));
 		if (has_this) {
 			gpointer *this_arg;
@@ -1018,7 +1305,7 @@ ves_exec_method (MonoInvocation *frame)
 		}
 		for (i = 0; i < signature->param_count; ++i) {
 			args_pointers [i + has_this] = frame->args + offsets [2 + header->num_locals + has_this + i];
-			stackval_to_data (signature->params [i], frame->stack_args + i, args_pointers [i + has_this]);
+			stackval_to_data (signature->params [i], frame->stack_args + i, args_pointers [i + has_this], signature->pinvoke);
 		}
 	}
 
@@ -1039,14 +1326,22 @@ ves_exec_method (MonoInvocation *frame)
 #if DEBUG_INTERP
 		opcode_count++;
 		if (tracing > 1) {
+			char *ins, *discode;
+			if (sp > frame->stack) {
+				ins = dump_stack (frame->stack, sp);
+			} else {
+				ins = g_strdup ("");
+			}
 			output_indent ();
-			g_print ("stack: ");
-			dump_stack (frame->stack, sp);
-			g_print ("\n");
-			output_indent ();
-			g_print ("0x%04x: %s\n", ip-header->code,
-				 *ip == 0xfe ? mono_opcode_names [256 + ip [1]] : mono_opcode_names [*ip]);
+			discode = mono_disasm_code_one (NULL, frame->method, ip);
+			discode [strlen (discode) - 1] = 0; /* no \n */
+			g_print ("(%d) %-29s %s\n", GetCurrentThreadId(), discode, ins);
+			g_free (ins);
+			g_free (discode);
 		}
+		if (il_ins_count > 0)
+			if (!(--il_ins_count))
+				G_BREAKPOINT ();
 #endif
 		
 		SWITCH (*ip) {
@@ -1063,8 +1358,8 @@ ves_exec_method (MonoInvocation *frame)
 		CASE (CEE_LDARG_3) {
 			int n = (*ip)-CEE_LDARG_0;
 			++ip;
-			vt_alloc (ARG_TYPE (signature, n), sp);
-			stackval_from_data (ARG_TYPE (signature, n), sp, ARG_POS (n));
+			vt_alloc (ARG_TYPE (signature, n), sp, signature->pinvoke);
+			stackval_from_data (ARG_TYPE (signature, n), sp, ARG_POS (n), signature->pinvoke);
 			++sp;
 			BREAK;
 		}
@@ -1080,8 +1375,8 @@ ves_exec_method (MonoInvocation *frame)
 				++sp;
 				BREAK;
 			} else {
-				vt_alloc (LOCAL_TYPE (header, n), sp);
-				stackval_from_data (LOCAL_TYPE (header, n), sp, LOCAL_POS (n));
+				vt_alloc (LOCAL_TYPE (header, n), sp, FALSE);
+				stackval_from_data (LOCAL_TYPE (header, n), sp, LOCAL_POS (n), FALSE);
 			}
 			++sp;
 			BREAK;
@@ -1098,15 +1393,15 @@ ves_exec_method (MonoInvocation *frame)
 				*p = sp->data.i;
 				BREAK;
 			} else {
-				stackval_to_data (LOCAL_TYPE (header, n), sp, LOCAL_POS (n));
+				stackval_to_data (LOCAL_TYPE (header, n), sp, LOCAL_POS (n), FALSE);
 				vt_free (sp);
 				BREAK;
 			}
 		}
 		CASE (CEE_LDARG_S)
 			++ip;
-			vt_alloc (ARG_TYPE (signature, *ip), sp);
-			stackval_from_data (ARG_TYPE (signature, *ip), sp, ARG_POS (*ip));
+			vt_alloc (ARG_TYPE (signature, *ip), sp, signature->pinvoke);
+			stackval_from_data (ARG_TYPE (signature, *ip), sp, ARG_POS (*ip), signature->pinvoke);
 			++sp;
 			++ip;
 			BREAK;
@@ -1132,14 +1427,14 @@ ves_exec_method (MonoInvocation *frame)
 		CASE (CEE_STARG_S)
 			++ip;
 			--sp;
-			stackval_to_data (ARG_TYPE (signature, *ip), sp, ARG_POS (*ip));
+			stackval_to_data (ARG_TYPE (signature, *ip), sp, ARG_POS (*ip), signature->pinvoke);
 			vt_free (sp);
 			++ip;
 			BREAK;
 		CASE (CEE_LDLOC_S)
 			++ip;
-			vt_alloc (LOCAL_TYPE (header, *ip), sp);
-			stackval_from_data (LOCAL_TYPE (header, *ip), sp, LOCAL_POS (*ip));
+			vt_alloc (LOCAL_TYPE (header, *ip), sp, FALSE);
+			stackval_from_data (LOCAL_TYPE (header, *ip), sp, LOCAL_POS (*ip), FALSE);
 			++ip;
 			++sp;
 			BREAK;
@@ -1165,7 +1460,7 @@ ves_exec_method (MonoInvocation *frame)
 		CASE (CEE_STLOC_S)
 			++ip;
 			--sp;
-			stackval_to_data (LOCAL_TYPE (header, *ip), sp, LOCAL_POS (*ip));
+			stackval_to_data (LOCAL_TYPE (header, *ip), sp, LOCAL_POS (*ip), FALSE);
 			vt_free (sp);
 			++ip;
 			BREAK;
@@ -1199,7 +1494,7 @@ ves_exec_method (MonoInvocation *frame)
 		CASE (CEE_LDC_I4_S) 
 			++ip;
 			sp->type = VAL_I32;
-			sp->data.i = *(gint8 *)ip;
+			sp->data.i = *(const gint8 *)ip;
 			++ip;
 			++sp;
 			BREAK;
@@ -1238,8 +1533,8 @@ ves_exec_method (MonoInvocation *frame)
 		CASE (CEE_DUP) 
 			if (sp [-1].type == VAL_VALUET) {
 				MonoClass *c = sp [-1].data.vt.klass;
-				vt_alloc (&c->byval_arg, sp);
-				stackval_from_data (&c->byval_arg, sp, sp [-1].data.vt.vt);
+				vt_alloc (&c->byval_arg, sp, FALSE);
+				stackval_from_data (&c->byval_arg, sp, sp [-1].data.vt.vt, FALSE);
 			} else {
 				*sp = sp [-1]; 
 			}
@@ -1261,6 +1556,7 @@ ves_exec_method (MonoInvocation *frame)
 			guint32 token;
 			int virtual = *ip == CEE_CALLVIRT;
 			int calli = *ip == CEE_CALLI;
+			unsigned char *code = NULL;
 
 			/*
 			 * We ignore tail recursion for now.
@@ -1273,12 +1569,18 @@ ves_exec_method (MonoInvocation *frame)
 			token = read32 (ip);
 			ip += 4;
 			if (calli) {
-				unsigned char *code;
+				MonoJitInfo *ji;
 				--sp;
 				code = sp->data.p;
-				child_frame.method = mono_method_pointer_get (code);
-				/* check for NULL with native code */
-				csignature = child_frame.method->signature;
+				if (frame->method->wrapper_type != MONO_WRAPPER_NONE) {
+					csignature = (MonoMethodSignature *)mono_method_get_wrapper_data (frame->method, token);
+					child_frame.method = NULL;
+				} else if ((ji = mono_jit_info_table_find (mono_root_domain, code))) {
+					child_frame.method = ji->method;
+				} else {
+					g_assert_not_reached ();
+				}
+				g_assert (code);
 			} else {
 				child_frame.method = mono_get_method (image, token, NULL);
 				if (!child_frame.method)
@@ -1293,6 +1595,7 @@ ves_exec_method (MonoInvocation *frame)
 						THROW_EX (mono_get_exception_missing_method (), ip -5);
 				}
 			}
+
 			g_assert (csignature->call_convention == MONO_CALL_DEFAULT);
 			/* decrement by the actual number of args */
 			if (csignature->param_count) {
@@ -1308,7 +1611,8 @@ ves_exec_method (MonoInvocation *frame)
 				 * It may also be a TP from LD(S)FLDA
 				 * g_assert (sp->type == VAL_OBJ || sp->type == VAL_VALUETA);
 				 */
-				if (sp->type == VAL_OBJ && child_frame.method->klass->valuetype) /* unbox it */
+				if (sp->type == VAL_OBJ && child_frame.method &&
+				    child_frame.method->klass->valuetype) /* unbox it */
 					child_frame.obj = (char*)sp->data.p + sizeof (MonoObject);
 				else
 					child_frame.obj = sp->data.p;
@@ -1316,7 +1620,7 @@ ves_exec_method (MonoInvocation *frame)
 				child_frame.obj = NULL;
 			}
 			if (csignature->ret->type != MONO_TYPE_VOID) {
-				vt_alloc (csignature->ret, &retval);
+				vt_alloc (csignature->ret, &retval, csignature->pinvoke);
 				child_frame.retval = &retval;
 			} else {
 				child_frame.retval = NULL;
@@ -1325,7 +1629,46 @@ ves_exec_method (MonoInvocation *frame)
 			child_frame.ex = NULL;
 			child_frame.ex_handler = NULL;
 
-			ves_exec_method (&child_frame);
+			if (!child_frame.method) {
+				g_assert (code);
+				ves_pinvoke_method (&child_frame, csignature, code, FALSE);
+			} else if (csignature->hasthis && sp->type == VAL_OBJ &&
+					((MonoObject *)sp->data.p)->vtable->klass == mono_defaults.transparent_proxy_class) {
+				g_assert (child_frame.method);
+				child_frame.method = mono_marshal_get_remoting_invoke (child_frame.method);
+				ves_exec_method (&child_frame);
+			} else {
+				switch (GPOINTER_TO_UINT (child_frame.method->addr)) {
+				case INLINE_STRING_LENGTH:
+					retval.type = VAL_I32;
+					retval.data.i = ((MonoString*)sp->data.p)->length;
+					/*g_print ("length of '%s' is %d\n", mono_string_to_utf8 (sp->data.p), retval.data.i);*/
+					break;
+				case INLINE_ARRAY_LENGTH:
+					retval.type = VAL_I32;
+					retval.data.i = mono_array_length ((MonoArray*)sp->data.p);
+					break;
+				case INLINE_ARRAY_RANK:
+					retval.type = VAL_I32;
+					retval.data.i = mono_object_class (sp->data.p)->rank;
+					break;
+				case INLINE_TYPE_ELEMENT_TYPE:
+					retval.type = VAL_OBJ;
+					{
+						MonoClass *c = mono_class_from_mono_type (((MonoReflectionType*)sp->data.p)->type);
+						retval.data.vt.klass = NULL;
+						if (c->enumtype && c->enum_basetype) /* types that are modifierd typebuilkders may not have enum_basetype set */
+							retval.data.p = mono_type_get_object (domain, c->enum_basetype);
+						else if (c->element_class)
+							retval.data.p = mono_type_get_object (domain, &c->element_class->byval_arg);
+						else
+							retval.data.p = NULL;
+					}
+					break;
+				default:
+					ves_exec_method (&child_frame);
+				}
+			}
 
 			while (endsp > sp) {
 				--endsp;
@@ -1352,7 +1695,7 @@ ves_exec_method (MonoInvocation *frame)
 				--sp;
 				if (sp->type == VAL_VALUET) {
 					/* the caller has already allocated the memory */
-					stackval_from_data (signature->ret, frame->retval, sp->data.vt.vt);
+					stackval_from_data (signature->ret, frame->retval, sp->data.vt.vt, signature->pinvoke);
 					vt_free (sp);
 				} else {
 					*frame->retval = *sp;
@@ -1378,8 +1721,14 @@ ves_exec_method (MonoInvocation *frame)
 		CASE (CEE_BRFALSE) /* Fall through */
 		CASE (CEE_BRFALSE_S) {
 			int result;
-			int near_jump = *ip == CEE_BRFALSE_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BRFALSE_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			--sp;
 			switch (sp->type) {
 			case VAL_I32: result = sp->data.i == 0; break;
@@ -1387,20 +1736,21 @@ ves_exec_method (MonoInvocation *frame)
 			case VAL_DOUBLE: result = sp->data.f ? 0: 1; break;
 			default: result = sp->data.p == NULL; break;
 			}
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_BRTRUE) /* Fall through */
 		CASE (CEE_BRTRUE_S) {
 			int result;
-			int near_jump = *ip == CEE_BRTRUE_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BRTRUE_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			--sp;
 			switch (sp->type) {
 			case VAL_I32: result = sp->data.i != 0; break;
@@ -1408,20 +1758,21 @@ ves_exec_method (MonoInvocation *frame)
 			case VAL_DOUBLE: result = sp->data.f ? 1 : 0; break;
 			default: result = sp->data.p != NULL; break;
 			}
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_BEQ) /* Fall through */
 		CASE (CEE_BEQ_S) {
 			int result;
-			int near_jump = *ip == CEE_BEQ_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BEQ_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			sp -= 2;
 			if (sp->type == VAL_I32)
 				result = sp [0].data.i == (gint)GET_NATI (sp [1]);
@@ -1431,20 +1782,21 @@ ves_exec_method (MonoInvocation *frame)
 				result = sp [0].data.f == sp [1].data.f;
 			else
 				result = (gint)GET_NATI (sp [0]) == (gint)GET_NATI (sp [1]);
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_BGE) /* Fall through */
 		CASE (CEE_BGE_S) {
 			int result;
-			int near_jump = *ip == CEE_BGE_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BGE_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			sp -= 2;
 			if (sp->type == VAL_I32)
 				result = sp [0].data.i >= (gint)GET_NATI (sp [1]);
@@ -1454,20 +1806,21 @@ ves_exec_method (MonoInvocation *frame)
 				result = sp [0].data.f >= sp [1].data.f;
 			else
 				result = (gint)GET_NATI (sp [0]) >= (gint)GET_NATI (sp [1]);
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_BGT) /* Fall through */
 		CASE (CEE_BGT_S) {
 			int result;
-			int near_jump = *ip == CEE_BGT_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BGT_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			sp -= 2;
 			if (sp->type == VAL_I32)
 				result = sp [0].data.i > (gint)GET_NATI (sp [1]);
@@ -1477,20 +1830,21 @@ ves_exec_method (MonoInvocation *frame)
 				result = sp [0].data.f > sp [1].data.f;
 			else
 				result = (gint)GET_NATI (sp [0]) > (gint)GET_NATI (sp [1]);
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_BLT) /* Fall through */
 		CASE (CEE_BLT_S) {
 			int result;
-			int near_jump = *ip == CEE_BLT_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BLT_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			sp -= 2;
 			if (sp->type == VAL_I32)
 				result = sp[0].data.i < (gint)GET_NATI(sp[1]);
@@ -1500,22 +1854,21 @@ ves_exec_method (MonoInvocation *frame)
 				result = sp[0].data.f < sp[1].data.f;
 			else
 				result = (gint)GET_NATI(sp[0]) < (gint)GET_NATI(sp[1]);
-			if (result) {
-				if (near_jump)
-					ip += 1 + (signed char)*ip;
-				else
-					ip += 4 + (gint32) read32 (ip);
-				BREAK;
-			} else {
-				ip += near_jump ? 1: 4;
-				BREAK;
-			}
+			if (result)
+				ip += broffset;
+			BREAK;
 		}
 		CASE (CEE_BLE) /* fall through */
 		CASE (CEE_BLE_S) {
 			int result;
-			int near_jump = *ip == CEE_BLE_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BLE_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			sp -= 2;
 
 			if (sp->type == VAL_I32)
@@ -1532,20 +1885,21 @@ ves_exec_method (MonoInvocation *frame)
 				 */
 				result = (gint)GET_NATI (sp [0]) <= (gint)GET_NATI (sp [1]);
 			}
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_BNE_UN) /* Fall through */
 		CASE (CEE_BNE_UN_S) {
 			int result;
-			int near_jump = *ip == CEE_BNE_UN_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BNE_UN_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			sp -= 2;
 			if (sp->type == VAL_I32)
 				result = (guint32)sp [0].data.i != (guint32)GET_NATI (sp [1]);
@@ -1556,20 +1910,21 @@ ves_exec_method (MonoInvocation *frame)
 					(sp [0].data.f != sp [1].data.f);
 			else
 				result = GET_NATI (sp [0]) != GET_NATI (sp [1]);
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_BGE_UN) /* Fall through */
 		CASE (CEE_BGE_UN_S) {
 			int result;
-			int near_jump = *ip == CEE_BGE_UN_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BGE_UN_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			sp -= 2;
 			if (sp->type == VAL_I32)
 				result = (guint32)sp [0].data.i >= (guint32)GET_NATI (sp [1]);
@@ -1579,20 +1934,21 @@ ves_exec_method (MonoInvocation *frame)
 				result = !isless (sp [0].data.f,sp [1].data.f);
 			else
 				result = GET_NATI (sp [0]) >= GET_NATI (sp [1]);
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_BGT_UN) /* Fall through */
 		CASE (CEE_BGT_UN_S) {
 			int result;
-			int near_jump = *ip == CEE_BGT_UN_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BGT_UN_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			sp -= 2;
 			if (sp->type == VAL_I32)
 				result = (guint32)sp [0].data.i > (guint32)GET_NATI (sp [1]);
@@ -1602,20 +1958,21 @@ ves_exec_method (MonoInvocation *frame)
 				result = isgreater (sp [0].data.f, sp [1].data.f);
 			else
 				result = GET_NATI (sp [0]) > GET_NATI (sp [1]);
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_BLE_UN) /* Fall through */
 		CASE (CEE_BLE_UN_S) {
 			int result;
-			int near_jump = *ip == CEE_BLE_UN_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BLE_UN_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			sp -= 2;
 			if (sp->type == VAL_I32)
 				result = (guint32)sp [0].data.i <= (guint32)GET_NATI (sp [1]);
@@ -1625,20 +1982,21 @@ ves_exec_method (MonoInvocation *frame)
 				result = islessequal (sp [0].data.f, sp [1].data.f);
 			else
 				result = GET_NATI (sp [0]) <= GET_NATI (sp [1]);
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_BLT_UN) /* Fall through */
 		CASE (CEE_BLT_UN_S) {
 			int result;
-			int near_jump = *ip == CEE_BLT_UN_S;
-			++ip;
+			int broffset;
+			if (*ip == CEE_BLT_UN_S) {
+				broffset = (signed char)ip [1];
+				ip += 2;
+			} else {
+				broffset = (gint32) read32 (ip + 1);
+				ip += 5;
+			}
 			sp -= 2;
 			if (sp->type == VAL_I32)
 				result = (guint32)sp[0].data.i < (guint32)GET_NATI(sp[1]);
@@ -1649,13 +2007,8 @@ ves_exec_method (MonoInvocation *frame)
 					(sp [0].data.f < sp [1].data.f);
 			else
 				result = GET_NATI(sp[0]) < GET_NATI(sp[1]);
-			if (result) {
-				if (near_jump)
-					ip += (signed char)*ip;
-				else
-					ip += (gint32) read32 (ip);
-			}
-			ip += near_jump ? 1: 4;
+			if (result)
+				ip += broffset;
 			BREAK;
 		}
 		CASE (CEE_SWITCH) {
@@ -1872,7 +2225,7 @@ ves_exec_method (MonoInvocation *frame)
 				if (GET_NATI (sp [0]) == 0)
 					THROW_EX (mono_get_exception_divide_by_zero (), ip - 1);
 				val = (mono_u)sp [-1].data.p;
-				val /= (guint64)sp [0].data.p;
+				val /= (mono_u)sp [0].data.p;
 				sp [-1].data.p = (gpointer)val;
 			}
 			BREAK;
@@ -2090,7 +2443,27 @@ ves_exec_method (MonoInvocation *frame)
 			}
 			sp [-1].type = VAL_I64;
 			BREAK;
-		CASE (CEE_CONV_R4) /* Fall through */
+		CASE (CEE_CONV_R4) {
+			++ip;
+			switch (sp [-1].type) {
+			case VAL_DOUBLE:
+				sp [-1].data.f = (float)sp [-1].data.f;
+				break;
+			case VAL_I64:
+				sp [-1].data.f = (float)sp [-1].data.l;
+				break;
+			case VAL_VALUET:
+				ves_abort();
+			case VAL_I32:
+				sp [-1].data.f = (float)sp [-1].data.i;
+				break;
+			default:
+				sp [-1].data.f = (float)sp [-1].data.nati;
+				break;
+			}
+			sp [-1].type = VAL_DOUBLE;
+			BREAK;
+		}
 		CASE (CEE_CONV_R8) {
 			++ip;
 			switch (sp [-1].type) {
@@ -2127,7 +2500,7 @@ ves_exec_method (MonoInvocation *frame)
 			case VAL_VALUET:
 				ves_abort();
 			case VAL_I32:
-				sp [-1].data.l = (guint64) sp [-1].data.i;
+				sp [-1].data.l = sp [-1].data.i & 0xffffffff;
 				break;
 			default:
 				sp [-1].data.l = (guint64) sp [-1].data.nati;
@@ -2152,21 +2525,26 @@ ves_exec_method (MonoInvocation *frame)
 			++ip;
 			token = read32 (ip);
 			ip += 4;
-			c = mono_class_get (image, token);
+
+			if (frame->method->wrapper_type != MONO_WRAPPER_NONE)
+				c = (MonoClass *)mono_method_get_wrapper_data (frame->method, token);
+			else
+				c = mono_class_get (image, token);
+
 			addr = sp [-1].data.vt.vt;
-			vt_alloc (&c->byval_arg, &sp [-1]);
-			stackval_from_data (&c->byval_arg, &sp [-1], addr);
+			vt_alloc (&c->byval_arg, &sp [-1], FALSE);
+			stackval_from_data (&c->byval_arg, &sp [-1], addr, FALSE);
 			BREAK;
 		}
 		CASE (CEE_LDSTR) {
 			MonoObject *o;
-			guint32 index;
+			guint32 str_index;
 
 			ip++;
-			index = mono_metadata_token_index (read32 (ip));
+			str_index = mono_metadata_token_index (read32 (ip));
 			ip += 4;
 
-			o = (MonoObject*)mono_ldstr (domain, image, index);
+			o = (MonoObject*)mono_ldstr (domain, image, str_index);
 			sp->type = VAL_OBJ;
 			sp->data.p = o;
 			sp->data.vt.klass = NULL;
@@ -2181,6 +2559,7 @@ ves_exec_method (MonoInvocation *frame)
 			stackval valuetype_this;
 			stackval *endsp = sp;
 			guint32 token;
+			stackval retval;
 
 			frame->ip = ip;
 
@@ -2193,11 +2572,11 @@ ves_exec_method (MonoInvocation *frame)
 
 			csig = child_frame.method->signature;
 			newobj_class = child_frame.method->klass;
-			if (profiling_classes) {
+			/*if (profiling_classes) {
 				guint count = GPOINTER_TO_UINT (g_hash_table_lookup (profiling_classes, newobj_class));
 				count++;
 				g_hash_table_insert (profiling_classes, newobj_class, GUINT_TO_POINTER (count));
-			}
+			}*/
 				
 
 			if (newobj_class->parent == mono_defaults.array_class) {
@@ -2211,7 +2590,7 @@ ves_exec_method (MonoInvocation *frame)
 			 */
 			if (newobj_class->valuetype) {
 				void *zero;
-				vt_alloc (&newobj_class->byval_arg, &valuetype_this);
+				vt_alloc (&newobj_class->byval_arg, &valuetype_this, csig->pinvoke);
 				if (!newobj_class->enumtype && (newobj_class->byval_arg.type == MONO_TYPE_VALUETYPE)) {
 					zero = valuetype_this.data.vt.vt;
 					child_frame.obj = valuetype_this.data.vt.vt;
@@ -2220,10 +2599,14 @@ ves_exec_method (MonoInvocation *frame)
 					zero = &valuetype_this;
 					child_frame.obj = &valuetype_this;
 				}
-				stackval_from_data (&newobj_class->byval_arg, &valuetype_this, zero);
+				stackval_from_data (&newobj_class->byval_arg, &valuetype_this, zero, csig->pinvoke);
 			} else {
-				o = mono_object_new (domain, newobj_class);
-				child_frame.obj = o;
+				if (newobj_class != mono_defaults.string_class) {
+					o = mono_object_new (domain, newobj_class);
+					child_frame.obj = o;
+				} else {
+					child_frame.retval = &retval;
+				}
 			}
 
 			if (csig->param_count) {
@@ -2258,6 +2641,8 @@ ves_exec_method (MonoInvocation *frame)
 array_constructed:
 			if (newobj_class->valuetype && !newobj_class->enumtype) {
 				*sp = valuetype_this;
+			} else if (newobj_class == mono_defaults.string_class) {
+				*sp = retval;
 			} else {
 				sp->type = VAL_OBJ;
 				sp->data.p = o;
@@ -2279,8 +2664,6 @@ array_constructed:
 			token = read32 (ip);
 			c = mono_class_get (image, token);
 
-			mono_class_init (c);
-
 			g_assert (sp [-1].type == VAL_OBJ);
 
 			if ((o = sp [-1].data.p)) {
@@ -2293,6 +2676,13 @@ array_constructed:
 					    vt->interface_offsets [c->interface_id])
 						found = TRUE;
 				} else {
+					if (oclass == mono_defaults.transparent_proxy_class) {
+						/* fixme: add check for IRemotingTypeInfo */
+						MonoRealProxy *rp = ((MonoTransparentProxy *)o)->rp;
+						MonoType *type;
+						type = rp->class_to_proxy->type;
+						oclass = mono_class_from_mono_type (type);
+					}
 					/* handle array casts */
 					if (oclass->rank && oclass->rank == c->rank) {
 						if ((oclass->element_class->baseval - c->element_class->baseval) <= c->element_class->diffval) {
@@ -2317,6 +2707,7 @@ array_constructed:
 			BREAK;
 		}
 		CASE (CEE_CONV_R_UN)
+			++ip;
 			switch (sp [-1].type) {
 			case VAL_DOUBLE:
 				break;
@@ -2344,8 +2735,10 @@ array_constructed:
 			++ip;
 			token = read32 (ip);
 			
-			c = mono_class_get (image, token);
-			mono_class_init (c);
+			if (frame->method->wrapper_type != MONO_WRAPPER_NONE)
+				c = (MonoClass *)mono_method_get_wrapper_data (frame->method, token);
+			else 
+				c = mono_class_get (image, token);
 			
 			o = sp [-1].data.p;
 			if (!o)
@@ -2362,14 +2755,18 @@ array_constructed:
 		}
 		CASE (CEE_THROW)
 			--sp;
+			frame->ex_handler = NULL;
+			if (!sp->data.p)
+				sp->data.p = mono_get_exception_null_reference ();
 			THROW_EX (sp->data.p, ip);
 			BREAK;
 		CASE (CEE_LDFLDA) /* Fall through */
 		CASE (CEE_LDFLD) {
 			MonoObject *obj;
 			MonoClassField *field;
-			guint32 token, offset;
+			guint32 token;
 			int load_addr = *ip == CEE_LDFLDA;
+			char *addr;
 
 			if (!sp [-1].data.p)
 				THROW_EX (mono_get_exception_null_reference (), ip);
@@ -2380,21 +2777,31 @@ array_constructed:
 
 			if (sp [-1].type == VAL_OBJ) {
 				obj = sp [-1].data.p;
-				field = mono_class_get_field (obj->vtable->klass, token);
-				offset = field->offset;
-			} else { /* valuetype */
-				/*g_assert (sp [-1].type == VAL_VALUETA); */
+
+				if (obj->vtable->klass == mono_defaults.transparent_proxy_class) {
+					MonoClass *klass = ((MonoTransparentProxy*)obj)->klass;
+					field = mono_class_get_field (klass, token);
+					addr = mono_load_remote_field (obj, klass, field, NULL);
+				} else {
+					if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF)
+						field = mono_field_from_memberref (image, token, NULL);
+					else
+						field = mono_class_get_field (obj->vtable->klass, token);
+					addr = (char*)obj + field->offset;
+				}				
+			} else {
 				obj = sp [-1].data.vt.vt;
 				field = mono_class_get_field (sp [-1].data.vt.klass, token);
-				offset = field->offset - sizeof (MonoObject);
+				addr = (char*)obj + field->offset - sizeof (MonoObject);
 			}
+
 			if (load_addr) {
 				sp [-1].type = VAL_TP;
-				sp [-1].data.p = (char*)obj + offset;
+				sp [-1].data.p = addr;
 				sp [-1].data.vt.klass = mono_class_from_mono_type (field->type);
 			} else {
-				vt_alloc (field->type, &sp [-1]);
-				stackval_from_data (field->type, &sp [-1], (char*)obj + offset);
+				vt_alloc (field->type, &sp [-1], FALSE);
+				stackval_from_data (field->type, &sp [-1], addr, FALSE);
 				
 			}
 			BREAK;
@@ -2404,25 +2811,41 @@ array_constructed:
 			MonoClassField *field;
 			guint32 token, offset;
 
+			sp -= 2;
+			
+			if (!sp [0].data.p)
+				THROW_EX (mono_get_exception_null_reference (), ip);
+			
 			++ip;
 			token = read32 (ip);
 			ip += 4;
 			
-			sp -= 2;
-			
 			if (sp [0].type == VAL_OBJ) {
 				obj = sp [0].data.p;
-				field = mono_class_get_field (obj->vtable->klass, token);
-				offset = field->offset;
-			} else { /* valuetype */
-				/*g_assert (sp->type == VAL_VALUETA); */
+
+				if (obj->vtable->klass == mono_defaults.transparent_proxy_class) {
+					MonoClass *klass = ((MonoTransparentProxy*)obj)->klass;
+					field = mono_class_get_field (klass, token);
+
+					mono_store_remote_field (obj, klass, field, &sp [1].data);
+					offset = field->offset;
+				} else {
+					if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF)
+						field = mono_field_from_memberref (image, token, NULL);
+					else
+						field = mono_class_get_field (obj->vtable->klass, token);
+					offset = field->offset;
+					stackval_to_data (field->type, &sp [1], (char*)obj + offset, FALSE);
+					vt_free (&sp [1]);
+				}
+			} else {
 				obj = sp [0].data.vt.vt;
 				field = mono_class_get_field (sp [0].data.vt.klass, token);
 				offset = field->offset - sizeof (MonoObject);
+				stackval_to_data (field->type, &sp [1], (char*)obj + offset, FALSE);
+				vt_free (&sp [1]);
 			}
 
-			stackval_to_data (field->type, &sp [1], (char*)obj + offset);
-			vt_free (&sp [1]);
 			BREAK;
 		}
 		CASE (CEE_LDSFLD) /* Fall through */
@@ -2441,11 +2864,9 @@ array_constructed:
 			/* need to handle fieldrefs */
 			if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF) {
 				field = mono_field_from_memberref (image, token, &klass);
-				mono_class_init (klass);
 			} else {
 				klass = mono_class_get (image, 
 					MONO_TOKEN_TYPE_DEF | mono_metadata_typedef_from_field (image, token & 0xffffff));
-				mono_class_init (klass);
 				field = mono_class_get_field (klass, token);
 			}
 			g_assert (field);
@@ -2458,8 +2879,8 @@ array_constructed:
 				sp->data.p = addr;
 				sp->data.vt.klass = mono_class_from_mono_type (field->type);
 			} else {
-				vt_alloc (field->type, sp);
-				stackval_from_data (field->type, sp, addr);
+				vt_alloc (field->type, sp, FALSE);
+				stackval_from_data (field->type, sp, addr, FALSE);
 			}
 			++sp;
 			BREAK;
@@ -2479,11 +2900,9 @@ array_constructed:
 			/* need to handle fieldrefs */
 			if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF) {
 				field = mono_field_from_memberref (image, token, &klass);
-				mono_class_init (klass);
 			} else {
 				klass = mono_class_get (image, 
 					MONO_TOKEN_TYPE_DEF | mono_metadata_typedef_from_field (image, token & 0xffffff));
-				mono_class_init (klass);
 				field = mono_class_get_field (klass, token);
 			}
 			g_assert (field);
@@ -2491,7 +2910,7 @@ array_constructed:
 			vt = mono_class_vtable (domain, klass);
 			addr = (char*)(vt->data) + field->offset;
 
-			stackval_to_data (field->type, sp, addr);
+			stackval_to_data (field->type, sp, addr, FALSE);
 			vt_free (sp);
 			BREAK;
 		}
@@ -2515,8 +2934,6 @@ array_constructed:
 				sp [-1].data.l = (guint64)sp [-1].data.f;
 				break;
 			case VAL_I64:
-				if (sp [-1].data.l < 0)
-					THROW_EX (mono_get_exception_overflow (), ip);
 				break;
 			case VAL_VALUET:
 				ves_abort();
@@ -2525,8 +2942,6 @@ array_constructed:
 				sp [-1].data.l = (guint64)sp [-1].data.i;
 				break;
 			default:
-				if ((gint64)sp [-1].data.nati < 0)
-					THROW_EX (mono_get_exception_overflow (), ip);
 				sp [-1].data.l = (guint64)sp [-1].data.nati;
 				break;
 			}
@@ -2540,7 +2955,7 @@ array_constructed:
 		CASE (CEE_CONV_OVF_U8_UN) {
 			switch (sp [-1].type) {
 			case VAL_DOUBLE:
-				if (sp [-1].data.f < 0 || sp [-1].data.f > GUINT64_MAX)
+				if (sp [-1].data.f < 0 || sp [-1].data.f > MYGUINT64_MAX)
 					THROW_EX (mono_get_exception_overflow (), ip);
 				sp [-1].data.l = (guint64)sp [-1].data.f;
 				break;
@@ -2645,15 +3060,19 @@ array_constructed:
 			ip++;
 			token = read32 (ip);
 
-			class = mono_class_get (image, token);
-			mono_class_init (class);
+			if (frame->method->wrapper_type != MONO_WRAPPER_NONE)
+				class = (MonoClass *)mono_method_get_wrapper_data (frame->method, token);
+			else
+				class = mono_class_get (image, token);
 			g_assert (class != NULL);
 
 			sp [-1].type = VAL_OBJ;
 			if (class->byval_arg.type == MONO_TYPE_VALUETYPE && !class->enumtype) 
 				sp [-1].data.p = mono_value_box (domain, class, sp [-1].data.p);
-			else
+			else {
+				stackval_to_data (&class->byval_arg, &sp [-1], (char*)&sp [-1], FALSE);
 				sp [-1].data.p = mono_value_box (domain, class, &sp [-1]);
+			}
 			/* need to vt_free (sp); */
 
 			ip += 4;
@@ -2667,17 +3086,22 @@ array_constructed:
 
 			ip++;
 			token = read32 (ip);
-			class = mono_class_get (image, token);
+
+			if (frame->method->wrapper_type != MONO_WRAPPER_NONE)
+				class = (MonoClass *)mono_method_get_wrapper_data (frame->method, token);
+			else
+				class = mono_class_get (image, token);
+
 			o = (MonoObject*) mono_array_new (domain, class, sp [-1].data.i);
 			ip += 4;
 
 			sp [-1].type = VAL_OBJ;
 			sp [-1].data.p = o;
-			if (profiling_classes) {
+			/*if (profiling_classes) {
 				guint count = GPOINTER_TO_UINT (g_hash_table_lookup (profiling_classes, o->vtable->klass));
 				count++;
 				g_hash_table_insert (profiling_classes, o->vtable->klass, GUINT_TO_POINTER (count));
-			}
+			}*/
 
 			BREAK;
 		}
@@ -2786,7 +3210,7 @@ array_constructed:
 				sp [0].type = VAL_I32;
 				break;
 			case CEE_LDELEM_I8:
-				sp [0].data.l = mono_array_get (o, gint64, aindex);
+				sp [0].data.l = mono_array_get (o, guint64, aindex);
 				sp [0].type = VAL_I64;
 				break;
 			case CEE_LDELEM_R4:
@@ -2889,7 +3313,33 @@ array_constructed:
 		CASE (CEE_UNUSED16) 
 		CASE (CEE_UNUSED17) ves_abort(); BREAK;
 		CASE (CEE_CONV_OVF_I1)
-		CASE (CEE_CONV_OVF_U1) ves_abort(); BREAK;
+			if (sp [-1].type == VAL_I32) {
+				if (sp [-1].data.i < 128 || sp [-1].data.i > 127)
+					THROW_EX (mono_get_exception_overflow (), ip);
+				sp [-1].data.i = (gint8)sp [-1].data.i;
+			} else if (sp [-1].type == VAL_I64) {
+				if (sp [-1].data.l < 128 || sp [-1].data.l > 127)
+					THROW_EX (mono_get_exception_overflow (), ip);
+				sp [-1].data.i = (gint8)sp [-1].data.l;
+			} else {
+				ves_abort();
+			}
+			++ip;
+			BREAK;
+		CASE (CEE_CONV_OVF_U1)
+			if (sp [-1].type == VAL_I32) {
+				if (sp [-1].data.i < 0 || sp [-1].data.i > 255)
+					THROW_EX (mono_get_exception_overflow (), ip);
+				sp [-1].data.i = (gint8)sp [-1].data.i;
+			} else if (sp [-1].type == VAL_I64) {
+				if (sp [-1].data.l < 0 || sp [-1].data.l > 255)
+					THROW_EX (mono_get_exception_overflow (), ip);
+				sp [-1].data.i = (gint8)sp [-1].data.l;
+			} else {
+				ves_abort();
+			}
+			++ip;
+			BREAK;
 		CASE (CEE_CONV_OVF_I2)
 		CASE (CEE_CONV_OVF_U2)
 			++ip;
@@ -2901,28 +3351,53 @@ array_constructed:
 			}
 			BREAK;
 		CASE (CEE_CONV_OVF_I4)
-			++ip;
 			/* FIXME: handle other cases */
 			if (sp [-1].type == VAL_I32) {
 				/* defined as NOP */
 			} else if(sp [-1].type == VAL_I64) {
 				sp [-1].data.i = (gint32)sp [-1].data.l;
-				break;
+				sp [-1].type = VAL_I32;
 			} else {
 				ves_abort();
 			}
+			++ip;
 			BREAK;
 		CASE (CEE_CONV_OVF_U4)
+			/* FIXME: handle other cases */
+			if (sp [-1].type == VAL_I32) {
+				/* defined as NOP */
+			} else if(sp [-1].type == VAL_I64) {
+				sp [-1].data.i = (guint32)sp [-1].data.l;
+				sp [-1].type = VAL_I32;
+			} else {
+				ves_abort();
+			}
 			++ip;
+			BREAK;
+		CASE (CEE_CONV_OVF_I8)
 			/* FIXME: handle other cases */
 			if (sp [-1].type == VAL_I32) {
+				sp [-1].data.l = (guint64)sp [-1].data.i;
+				sp [-1].type = VAL_I64;
+			} else if(sp [-1].type == VAL_I64) {
 				/* defined as NOP */
 			} else {
 				ves_abort();
 			}
+			++ip;
+			BREAK;
+		CASE (CEE_CONV_OVF_U8)
+			/* FIXME: handle other cases */
+			if (sp [-1].type == VAL_I32) {
+				sp [-1].data.l = (guint64) sp [-1].data.i;
+				sp [-1].type = VAL_I64;
+			} else if(sp [-1].type == VAL_I64) {
+				/* defined as NOP */
+			} else {
+				ves_abort();
+			}
+			++ip;
 			BREAK;
-		CASE (CEE_CONV_OVF_I8) ves_abort(); BREAK;
-		CASE (CEE_CONV_OVF_U8) ves_abort(); BREAK;
 		CASE (CEE_UNUSED50) 
 		CASE (CEE_UNUSED18) 
 		CASE (CEE_UNUSED19) 
@@ -2954,8 +3429,8 @@ array_constructed:
 			++ip;
 			handle = mono_ldtoken (image, read32 (ip), &handle_class);
 			ip += 4;
-			vt_alloc (&handle_class->byval_arg, sp);
-			stackval_from_data (&handle_class->byval_arg, sp, (char*)&handle);
+			vt_alloc (&handle_class->byval_arg, sp, FALSE);
+			stackval_from_data (&handle_class->byval_arg, sp, (char*)&handle, FALSE);
 			++sp;
 			BREAK;
 		}
@@ -2983,6 +3458,25 @@ array_constructed:
 			BREAK;
 		CASE (CEE_CONV_OVF_U) ves_abort(); BREAK;
 		CASE (CEE_ADD_OVF)
+			--sp;
+			/* FIXME: check overflow */
+			if (sp->type == VAL_I32) {
+				if (CHECK_ADD_OVERFLOW (sp [-1].data.i, GET_NATI (sp [0])))
+					THROW_EX (mono_get_exception_overflow (), ip);
+				sp [-1].data.i = (gint32)sp [-1].data.i + (gint32)GET_NATI (sp [0]);
+			} else if (sp->type == VAL_I64) {
+				if (CHECK_ADD_OVERFLOW64 (sp [-1].data.l, sp [0].data.l))
+					THROW_EX (mono_get_exception_overflow (), ip);
+				sp [-1].data.l = (gint64)sp [-1].data.l + (gint64)sp [0].data.l;
+			} else if (sp->type == VAL_DOUBLE)
+				sp [-1].data.f += sp [0].data.f;
+			else {
+				char *p = sp [-1].data.p;
+				p += GET_NATI (sp [0]);
+				sp [-1].data.p = p;
+			}
+			++ip;
+			BREAK;
 		CASE (CEE_ADD_OVF_UN)
 			--sp;
 			/* FIXME: check overflow, make unsigned */
@@ -3044,6 +3538,11 @@ array_constructed:
 			}
 			BREAK;
 		CASE (CEE_ENDFINALLY)
+			if (finally_ips) {
+				ip = finally_ips->data;
+				finally_ips = g_slist_remove (finally_ips, ip);
+				goto main_loop;
+			}
 			if (frame->ex)
 				goto handle_fault;
 			/*
@@ -3080,12 +3579,178 @@ array_constructed:
 				frame->ex = NULL;
 				frame->ex_handler = NULL;
 			}
-#endif
+#else
 			frame->ex = NULL;
 			frame->ex_handler = NULL;
 			endfinally_ip = ip;
 			goto handle_finally;
 			BREAK;
+#endif
+		CASE (CEE_UNUSED41)
+			++ip;
+		        switch (*ip) {
+			case CEE_MONO_FUNC1: {
+				MonoMarshalConv conv;
+				++ip;
+
+				conv = *ip;
+
+				++ip;
+
+				sp--;
+
+				sp->type = VAL_I32;
+				sp->data.vt.klass = NULL;
+
+				switch (conv) {
+				case MONO_MARSHAL_CONV_STR_LPWSTR:
+					sp->data.p = mono_string_to_utf16 (sp->data.p);
+					break;
+				case MONO_MARSHAL_CONV_LPSTR_STR:
+					sp->data.p = mono_string_new_wrapper (sp->data.p);
+					break;
+				case MONO_MARSHAL_CONV_STR_LPTSTR:
+				case MONO_MARSHAL_CONV_STR_LPSTR:
+					sp->data.p = mono_string_to_utf8 (sp->data.p);
+					break;
+				case MONO_MARSHAL_CONV_STR_BSTR:
+					sp->data.p = mono_string_to_bstr (sp->data.p);
+					break;
+				case MONO_MARSHAL_CONV_STR_TBSTR:
+				case MONO_MARSHAL_CONV_STR_ANSIBSTR:
+					sp->data.p = mono_string_to_ansibstr (sp->data.p);
+					break;
+				case MONO_MARSHAL_CONV_SB_LPSTR:
+					sp->data.p = mono_string_builder_to_utf8 (sp->data.p);
+					break;
+				case MONO_MARSHAL_CONV_ARRAY_SAVEARRAY:
+					sp->data.p = mono_array_to_savearray (sp->data.p);
+					break;
+				case MONO_MARSHAL_CONV_ARRAY_LPARRAY:
+					sp->data.p = mono_array_to_lparray (sp->data.p);
+					break;
+				case MONO_MARSHAL_CONV_DEL_FTN:
+					sp->data.p = mono_delegate_to_ftnptr (sp->data.p);
+					break;
+				case MONO_MARSHAL_CONV_STRARRAY_STRLPARRAY:
+					sp->data.p = mono_marshal_string_array (sp->data.p);
+					break;
+				default:
+					g_assert_not_reached ();
+				}
+				sp++; 
+				break;
+			}
+			case CEE_MONO_PROC2: {
+				MonoMarshalConv conv;
+				++ip;
+				conv = *ip;
+				++ip;
+
+				sp -= 2;
+
+				switch (conv) {
+				case MONO_MARSHAL_CONV_LPSTR_SB:
+					mono_string_utf8_to_builder (sp [0].data.p, sp [1].data.p);
+					break;
+				case MONO_MARSHAL_FREE_ARRAY:
+					mono_marshal_free_array (sp [0].data.p, sp [1].data.i);
+					break;
+				default:
+					g_assert_not_reached ();
+				}				 
+				break;
+			}
+			case CEE_MONO_PROC3: {
+				MonoMarshalConv conv;
+				++ip;
+				conv = *ip;
+				++ip;
+
+				sp -= 3;
+
+				switch (conv) {
+				case MONO_MARSHAL_CONV_STR_BYVALSTR:
+					mono_string_to_byvalstr (sp [0].data.p, sp [1].data.p, sp [2].data.i);
+					break;
+				case MONO_MARSHAL_CONV_STR_BYVALWSTR:
+					mono_string_to_byvalwstr (sp [0].data.p, sp [1].data.p, sp [2].data.i);
+					break;
+				default:
+					g_assert_not_reached ();
+				}
+				break;
+			}
+			case CEE_MONO_VTADDR: {
+				++ip;
+
+				sp->type = VAL_VALUETA;
+				/* do nothing? */
+				break;
+			}
+			case CEE_MONO_LDPTR: {
+				guint32 token;
+				++ip;
+				
+				token = read32 (ip);
+				ip += 4;
+				
+				sp->type = VAL_I32;
+				sp->data.p = mono_method_get_wrapper_data (frame->method, token);
+				sp->data.vt.klass = NULL;
+				++sp;
+				break;
+			}
+			case CEE_MONO_FREE: {
+				++ip;
+
+				sp -= 1;
+				g_free (sp->data.p);
+				break;
+			}
+			case CEE_MONO_OBJADDR: {
+				++ip;
+
+				sp->type = VAL_MP;
+				/* do nothing? */
+				break;
+			}
+			case CEE_MONO_NEWOBJ: {
+				MonoClass *class;
+				guint32 token;
+
+				++ip;
+				token = read32 (ip);
+				ip += 4;
+
+				class = (MonoClass *)mono_method_get_wrapper_data (frame->method, token);
+				sp->data.p = mono_object_new (domain, class);
+				sp++;
+				break;
+			}
+			case CEE_MONO_RETOBJ: {
+				MonoClass *class;
+				guint32 token;
+
+				++ip;
+				token = read32 (ip);
+				ip += 4;
+
+				sp--;
+
+				class = (MonoClass *)mono_method_get_wrapper_data (frame->method, token);
+				
+				stackval_from_data (signature->ret, frame->retval, sp->data.vt.vt, signature->pinvoke);
+
+				if (sp > frame->stack)
+					g_warning ("more values on stack: %d", sp-frame->stack);
+				DEBUG_LEAVE ();
+				return;
+			}
+			default:
+				g_error ("Unimplemented opcode: 0xF0 %02x at 0x%x\n", *ip, ip-header->code);
+			}
+			BREAK;
 		CASE (CEE_UNUSED26) 
 		CASE (CEE_UNUSED27) 
 		CASE (CEE_UNUSED28) 
@@ -3101,7 +3766,6 @@ array_constructed:
 		CASE (CEE_UNUSED38) 
 		CASE (CEE_UNUSED39) 
 		CASE (CEE_UNUSED40) 
-		CASE (CEE_UNUSED41) 
 		CASE (CEE_UNUSED42) 
 		CASE (CEE_UNUSED43) 
 		CASE (CEE_UNUSED44) 
@@ -3237,13 +3901,19 @@ array_constructed:
 				++ip;
 				token = read32 (ip);
 				ip += 4;
-				m = mono_get_method (image, token, NULL);
+
+				if (frame->method->wrapper_type != MONO_WRAPPER_NONE)
+					m = (MonoMethod *)mono_method_get_wrapper_data (frame->method, token);
+				else 
+					m = mono_get_method (image, token, NULL);
+
 				if (!m)
 					THROW_EX (mono_get_exception_missing_method (), ip - 5);
 				if (virtual) {
 					--sp;
 					if (!sp->data.p)
 						THROW_EX (mono_get_exception_null_reference (), ip - 5);
+					
 					m = get_virtual_method (domain, m, sp);
 				}
 				sp->type = VAL_NATI;
@@ -3258,8 +3928,8 @@ array_constructed:
 				++ip;
 				arg_pos = read16 (ip);
 				ip += 2;
-				vt_alloc (ARG_TYPE (signature, arg_pos), sp);
-				stackval_from_data (ARG_TYPE (signature, arg_pos), sp, ARG_POS (arg_pos));
+				vt_alloc (ARG_TYPE (signature, arg_pos), sp, signature->pinvoke);
+				stackval_from_data (ARG_TYPE (signature, arg_pos), sp, ARG_POS (arg_pos), signature->pinvoke);
 				++sp;
 				break;
 			}
@@ -3282,7 +3952,6 @@ array_constructed:
 					sp->type = VAL_TP;
 
 				++sp;
-				++ip;
 				break;
 			}
 			case CEE_STARG: {
@@ -3291,7 +3960,7 @@ array_constructed:
 				arg_pos = read16 (ip);
 				ip += 2;
 				--sp;
-				stackval_to_data (ARG_TYPE (signature, arg_pos), sp, ARG_POS (arg_pos));
+				stackval_to_data (ARG_TYPE (signature, arg_pos), sp, ARG_POS (arg_pos), signature->pinvoke);
 				vt_free (sp);
 				break;
 			}
@@ -3300,8 +3969,8 @@ array_constructed:
 				++ip;
 				loc_pos = read16 (ip);
 				ip += 2;
-				vt_alloc (LOCAL_TYPE (header, loc_pos), sp);
-				stackval_from_data (LOCAL_TYPE (header, loc_pos), sp, LOCAL_POS (loc_pos));
+				vt_alloc (LOCAL_TYPE (header, loc_pos), sp, FALSE);
+				stackval_from_data (LOCAL_TYPE (header, loc_pos), sp, LOCAL_POS (loc_pos), FALSE);
 				++sp;
 				break;
 			}
@@ -3332,16 +4001,18 @@ array_constructed:
 				loc_pos = read16 (ip);
 				ip += 2;
 				--sp;
-				stackval_to_data (LOCAL_TYPE (header, loc_pos), sp, LOCAL_POS (loc_pos));
+				stackval_to_data (LOCAL_TYPE (header, loc_pos), sp, LOCAL_POS (loc_pos), FALSE);
 				vt_free (sp);
 				break;
 			}
 			case CEE_LOCALLOC:
+				--sp;
 				if (sp != frame->stack)
-					THROW_EX (mono_get_exception_execution_engine (), ip - 1);
+					THROW_EX (mono_get_exception_execution_engine (NULL), ip - 1);
 				++ip;
 				sp->data.p = alloca (sp->data.i);
 				sp->type = VAL_TP;
+				sp++;
 				break;
 			case CEE_UNUSED57: ves_abort(); break;
 			case CEE_ENDFILTER: ves_abort(); break;
@@ -3367,7 +4038,7 @@ array_constructed:
 				 * behavior described in Partition II, 3.5).
 				 */
 				--sp;
-				g_assert (sp->type == VAL_VALUETA);
+				g_assert (sp->type == VAL_VALUETA || sp->type == VAL_TP);
 				memset (sp->data.vt.vt, 0, mono_class_value_size (sp->data.vt.klass, NULL));
 				break;
 			}
@@ -3406,15 +4077,22 @@ array_constructed:
 			case CEE_UNUSED: ves_abort(); break;
 			case CEE_SIZEOF: {
 				guint32 token;
-				MonoType *type;
 				int align;
 				++ip;
 				token = read32 (ip);
 				ip += 4;
-				type = mono_type_create_from_typespec (image, token);
+				if (mono_metadata_token_table (token) == MONO_TABLE_TYPESPEC) {
+					MonoType *type = mono_type_create_from_typespec (image, token);
+					sp->data.i = mono_type_size (type, &align);
+					mono_metadata_free_type (type);
+				} else {
+					MonoClass *szclass = mono_class_get (image, token);
+					mono_class_init (szclass);
+					if (!szclass->valuetype)
+						THROW_EX (mono_exception_from_name (mono_defaults.corlib, "System", "InvalidProgramException"), ip - 5);
+					sp->data.i = mono_class_value_size (szclass, &align);
+				}
 				sp->type = VAL_I32;
-				sp->data.i = mono_type_size (type, &align);
-				mono_metadata_free_type (type);
 				++sp;
 				break;
 			}
@@ -3448,12 +4126,18 @@ array_constructed:
 		char *message;
 		MonoObject *ex_obj;
 
+#if DEBUG_INTERP
+		if (tracing)
+			g_print ("* Handling exception '%s' at IL_%04x\n", mono_object_class (frame->ex)->name, frame->ip - header->code);
+#endif
 		if (die_on_exception)
 			goto die_on_ex;
 		
 		for (inv = frame; inv; inv = inv->parent) {
 			if (inv->method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)
 				continue;
+			if (inv->method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME))
+				continue;
 			hd = ((MonoMethodNormal*)inv->method)->header;
 			ip_offset = inv->ip - hd->code;
 			for (i = 0; i < hd->num_clauses; ++i) {
@@ -3466,6 +4150,10 @@ array_constructed:
 							 * and fault blocks before branching to the handler code.
 							 */
 							inv->ex_handler = clause;
+#if DEBUG_INTERP
+							if (tracing)
+								g_print ("* Found handler at '%s'\n", inv->method->name);
+#endif
 							/*
 							 * It seems that if the catch handler is found in the same method,
 							 * it gets executed before the finally handler.
@@ -3485,13 +4173,13 @@ array_constructed:
 		/*
 		 * If we get here, no handler was found: print a stack trace.
 		 */
+		for (inv = frame; inv; inv = inv->parent) {
+			if (inv->invoke_trap)
+				goto handle_finally;
+		}
 die_on_ex:
 		ex_obj = (MonoObject*)frame->ex;
-		message = frame->ex->message? mono_string_to_utf8 (frame->ex->message): NULL;
-		g_print ("Unhandled exception %s.%s %s.\n", ex_obj->vtable->klass->name_space, ex_obj->vtable->klass->name,
-				message?message:"");
-		g_free (message);
-		dump_frame (frame);
+		mono_unhandled_exception (ex_obj);
 		exit (1);
 	}
 	handle_finally:
@@ -3500,7 +4188,12 @@ die_on_ex:
 		guint32 ip_offset;
 		MonoExceptionClause *clause;
 		
-		if (frame->method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
+#if DEBUG_INTERP
+		if (tracing)
+			g_print ("* Handle finally\n");
+#endif
+		if ((frame->method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) 
+				|| (frame->method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME))) {
 			DEBUG_LEAVE ();
 			return;
 		}
@@ -3508,14 +4201,24 @@ die_on_ex:
 
 		for (i = 0; i < header->num_clauses; ++i) {
 			clause = &header->clauses [i];
-			if (MONO_OFFSET_IN_CLAUSE (clause, ip_offset)) {
+			if (clause == frame->ex_handler)
+				break;
+			if (MONO_OFFSET_IN_CLAUSE (clause, ip_offset) && !(MONO_OFFSET_IN_CLAUSE (clause, endfinally_ip - header->code))) {
 				if (clause->flags == MONO_EXCEPTION_CLAUSE_FINALLY) {
 					ip = header->code + clause->handler_offset;
-					goto main_loop;
-				} else
-					break;
+					finally_ips = g_slist_append (finally_ips, ip);
+#if DEBUG_INTERP
+					if (tracing)
+						g_print ("* Found finally at IL_%04x with exception: %s\n", clause->handler_offset, frame->ex? "yes": "no");
+#endif
+				}
 			}
 		}
+		if (finally_ips) {
+			ip = finally_ips->data;
+			finally_ips = g_slist_remove (finally_ips, ip);
+			goto main_loop;
+		}
 
 		/*
 		 * If an exception is set, we need to execute the fault handler, too,
@@ -3532,11 +4235,19 @@ die_on_ex:
 		guint32 ip_offset;
 		MonoExceptionClause *clause;
 		
+#if DEBUG_INTERP
+		if (tracing)
+			g_print ("* Handle fault\n");
+#endif
 		ip_offset = frame->ip - header->code;
 		for (i = 0; i < header->num_clauses; ++i) {
 			clause = &header->clauses [i];
 			if (clause->flags == 3 && MONO_OFFSET_IN_CLAUSE (clause, ip_offset)) {
 				ip = header->code + clause->handler_offset;
+#if DEBUG_INTERP
+				if (tracing)
+					g_print ("* Executing handler at IL_%04x\n", clause->handler_offset);
+#endif
 				goto main_loop;
 			}
 		}
@@ -3548,6 +4259,10 @@ die_on_ex:
 		 * is corrently not assigned in the ECMA specs: LAMESPEC.
 		 */
 		if (frame->ex_handler) {
+#if DEBUG_INTERP
+			if (tracing)
+				g_print ("* Executing handler at IL_%04x\n", frame->ex_handler->handler_offset);
+#endif
 			ip = header->code + frame->ex_handler->handler_offset;
 			sp = frame->stack;
 			sp->type = VAL_OBJ;
@@ -3561,67 +4276,52 @@ die_on_ex:
 	
 }
 
-static gint32
-runtime_exec_main (MonoMethod *method, MonoArray *args)
-{
-	stackval result;
-	stackval argv_array;
-	MonoInvocation call;
-
-	argv_array.type = VAL_OBJ;
-	argv_array.data.p = args;
-	argv_array.data.vt.klass = NULL;
-
-	if (args)
-		INIT_FRAME (&call, NULL, NULL, &argv_array, &result, method);
-	else 
-		INIT_FRAME (&call, NULL, NULL, NULL, &result, method);
-
-	ves_exec_method (&call);
-
-	return result.data.i;
-
-}
-
 static int 
 ves_exec (MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[])
 {
-	MonoArray *args = NULL;
 	MonoImage *image = assembly->image;
 	MonoCLIImageInfo *iinfo;
 	MonoMethod *method;
-	int i;
+	MonoObject *exc = NULL;
+	int rval;
 
 	iinfo = image->image_info;
 	method = mono_get_method (image, iinfo->cli_cli_header.ch_entry_point, NULL);
 	if (!method)
 		g_error ("No entry point method found in %s", image->name);
 
-	if (method->signature->param_count) {
-		args = (MonoArray*)mono_array_new (domain, mono_defaults.string_class, argc);
-		for (i = 0; i < argc; ++i) {
-			MonoString *arg = mono_string_new (domain, argv [i]);
-			mono_array_set (args, gpointer, i, mono_string_intern (arg));
-		}
-	}
-	
-	return mono_runtime_exec_main (method, args);
+	rval = mono_runtime_run_main (method, argc, argv, &exc);
+
+	return rval;
 }
 
 static void
 usage (void)
 {
 	fprintf (stderr,
-		 "mint %s, the Mono ECMA CLI interpreter, (C) 2001 Ximian, Inc.\n\n"
-		 "Usage is: mint [options] executable args...\n", VERSION);
+		 "mint %s, the Mono ECMA CLI interpreter, (C) 2001, 2002 Ximian, Inc.\n\n"
+		 "Usage is: mint [options] executable args...\n\n", VERSION);
 	fprintf (stderr,
-		 "Valid Options are:\n"
-		 "--trace\n"
-		 "--dieonex\n"
-		 "--profile\n"
-		 "--debug method_name\n"
-		 "--print-vtable\n"
-		 "--opcode-count\n");
+		 "Runtime Debugging:\n"
+#ifdef DEBUG_INTERP
+		 "   --debug\n"
+#endif
+		 "   --dieonex\n"
+		 "   --noptr\t\t\tdon't print pointer addresses in trace output\n"
+		 "   --opcode-count\n"
+		 "   --print-vtable\n"
+		 "   --traceclassinit\n"
+		 "\n"
+		 "Development:\n"
+		 "   --debug method_name\n"
+		 "   --profile\n"
+		 "   --trace\n"
+		 "   --traceops\n"
+		 "\n"
+		 "Runtime:\n"
+		 "   --config filename  load the specified config file instead of the default\n"
+		 "   --workers n        maximum number of worker threads\n"
+		);
 	exit (1);
 }
 
@@ -3640,266 +4340,41 @@ test_load_class (MonoImage* image)
 }
 #endif
 
-typedef struct {
-	char *name;
-	guint64 offset;
-} FieldDesc;
-
-typedef struct {
-	char *name;
-	FieldDesc *fields;
-} ClassDesc;
-
-static FieldDesc 
-typebuilder_fields[] = {
-	{"tname", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, name)},
-	{"nspace", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, nspace)},
-	{"parent", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, parent)},
-	{"interfaces", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, interfaces)},
-	{"methods", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, methods)},
-	{"properties", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, properties)},
-	{"fields", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, fields)},
-	{"attrs", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, attrs)},
-	{"table_idx", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, table_idx)},
-	{NULL, 0}
-};
-
-static FieldDesc 
-modulebuilder_fields[] = {
-	{"types", G_STRUCT_OFFSET (MonoReflectionModuleBuilder, types)},
-	{"table_idx", G_STRUCT_OFFSET (MonoReflectionModuleBuilder, table_idx)},
-	{NULL, 0}
-};
-
-static FieldDesc 
-assemblybuilder_fields[] = {
-	{"entry_point", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, entry_point)},
-	{"modules", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, modules)},
-	{"name", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, name)},
-	{NULL, 0}
-};
-
-static FieldDesc 
-ctorbuilder_fields[] = {
-	{"ilgen", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, ilgen)},
-	{"parameters", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, parameters)},
-	{"attrs", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, attrs)},
-	{"iattrs", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, iattrs)},
-	{"table_idx", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, table_idx)},
-	{"call_conv", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, call_conv)},
-	{"type", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, type)},
-	{NULL, 0}
-};
-
-static FieldDesc 
-methodbuilder_fields[] = {
-	{"mhandle", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, mhandle)},
-	{"rtype", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, rtype)},
-	{"parameters", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, parameters)},
-	{"attrs", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, attrs)},
-	{"iattrs", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, iattrs)},
-	{"name", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, name)},
-	{"table_idx", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, table_idx)},
-	{"code", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, code)},
-	{"ilgen", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, ilgen)},
-	{"type", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, type)},
-	{"pinfo", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, pinfo)},
-	{"pi_dll", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, dll)},
-	{"pi_entry", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, dllentry)},
-	{"ncharset", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, charset)},
-	{"native_cc", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, native_cc)},
-	{"call_conv", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, call_conv)},
-	{NULL, 0}
-};
-
-static FieldDesc 
-fieldbuilder_fields[] = {
-	{"attrs", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, attrs)},
-	{"type", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, type)},
-	{"name", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, name)},
-	{"def_value", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, def_value)},
-	{"offset", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, offset)},
-	{"table_idx", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, table_idx)},
-	{NULL, 0}
-};
-
-static FieldDesc 
-propertybuilder_fields[] = {
-	{"attrs", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, attrs)},
-	{"name", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, name)},
-	{"type", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, type)},
-	{"parameters", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, parameters)},
-	{"def_value", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, def_value)},
-	{"set_method", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, set_method)},
-	{"get_method", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, get_method)},
-	{"table_idx", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, table_idx)},
-	{NULL, 0}
-};
-
-static FieldDesc 
-ilgenerator_fields[] = {
-	{"code", G_STRUCT_OFFSET (MonoReflectionILGen, code)},
-	{"mbuilder", G_STRUCT_OFFSET (MonoReflectionILGen, mbuilder)},
-	{"code_len", G_STRUCT_OFFSET (MonoReflectionILGen, code_len)},
-	{"max_stack", G_STRUCT_OFFSET (MonoReflectionILGen, max_stack)},
-	{"cur_stack", G_STRUCT_OFFSET (MonoReflectionILGen, cur_stack)},
-	{"locals", G_STRUCT_OFFSET (MonoReflectionILGen, locals)},
-	{"ex_handlers", G_STRUCT_OFFSET (MonoReflectionILGen, ex_handlers)},
-	{NULL, 0}
-};
-
-static ClassDesc
-emit_classes_to_check [] = {
-	{"TypeBuilder", typebuilder_fields},
-	{"ModuleBuilder", modulebuilder_fields},
-	{"AssemblyBuilder", assemblybuilder_fields},
-	{"ConstructorBuilder", ctorbuilder_fields},
-	{"MethodBuilder", methodbuilder_fields},
-	{"FieldBuilder", fieldbuilder_fields},
-	{"PropertyBuilder", propertybuilder_fields},
-	{"ILGenerator", ilgenerator_fields},
-	{NULL, NULL}
-};
-
-static FieldDesc 
-delegate_fields[] = {
-	{"target_type", G_STRUCT_OFFSET (MonoDelegate, target_type)},
-	{"m_target", G_STRUCT_OFFSET (MonoDelegate, target)},
-	{"method", G_STRUCT_OFFSET (MonoDelegate, method)},
-	{"method_ptr", G_STRUCT_OFFSET (MonoDelegate, method_ptr)},
-	{NULL, 0}
-};
-
-static ClassDesc
-system_classes_to_check [] = {
-	{"Delegate", delegate_fields},
-	{NULL, NULL}
-};
-
-typedef struct {
-	char *name;
-	ClassDesc *types;
-} NameSpaceDesc;
-
-static NameSpaceDesc
-namespaces_to_check[] = {
-	{"System.Reflection.Emit", emit_classes_to_check},
-	{"System", system_classes_to_check},
-	{NULL, NULL}
-};
-
-static void
-check_corlib (MonoImage *corlib)
-{
-	MonoClass *klass;
-	MonoClassField *field;
-	FieldDesc *fdesc;
-	ClassDesc *cdesc;
-	NameSpaceDesc *ndesc;
-
-	for (ndesc = namespaces_to_check; ndesc->name; ++ndesc) {
-		for (cdesc = ndesc->types; cdesc->name; ++cdesc) {
-			klass = mono_class_from_name (corlib, ndesc->name, cdesc->name);
-			if (!klass)
-				g_error ("Cannot find class %s", cdesc->name);
-			mono_class_init (klass);
-			for (fdesc = cdesc->fields; fdesc->name; ++fdesc) {
-				field = mono_class_get_field_from_name (klass, fdesc->name);
-				if (!field || (field->offset != fdesc->offset))
-					g_error ("field `%s' mismatch in class %s (%ld != %ld)", fdesc->name, cdesc->name, (long) fdesc->offset, (long) (field?field->offset:-1));
-			}
-		}
-	}
-}
-
-static gint
-compare_profile (MethodProfile *profa, MethodProfile *profb)
-{
-	return (gint)((profb->total - profa->total)*1000);
-}
-
-static void
-build_profile (MonoMethod *m, MethodProfile *prof, GList **funcs)
-{
-	g_timer_destroy (prof->u.timer);
-	prof->u.method = m;
-	*funcs = g_list_insert_sorted (*funcs, prof, (GCompareFunc)compare_profile);
-}
+static MonoException * segv_exception = NULL;
 
 static void
-output_profile (GList *funcs)
-{
-	GList *tmp;
-	MethodProfile *p;
-	char buf [256];
-
-	if (funcs)
-		g_print ("Method name\t\t\t\t\tTotal (ms) Calls Per call (ms)\n");
-	for (tmp = funcs; tmp; tmp = tmp->next) {
-		p = tmp->data;
-		if (!(gint)(p->total*1000))
-			continue;
-		g_snprintf (buf, sizeof (buf), "%s.%s::%s(%d)",
-			p->u.method->klass->name_space, p->u.method->klass->name,
-			p->u.method->name, p->u.method->signature->param_count);
-		printf ("%-52s %7d %7ld %7d\n", buf,
-			(gint)(p->total*1000), p->count, (gint)((p->total*1000)/p->count));
-	}
-}
-
-typedef struct {
-	MonoClass *klass;
-	guint count;
-} NewobjProfile;
-
-static gint
-compare_newobj_profile (NewobjProfile *profa, NewobjProfile *profb)
+segv_handler (int signum)
 {
-	return (gint)profb->count - (gint)profa->count;
+	signal (signum, segv_handler);
+	mono_raise_exception (segv_exception);
 }
 
-static void
-build_newobj_profile (MonoClass *class, gpointer count, GList **funcs)
+static MonoBoolean
+ves_icall_get_frame_info (gint32 skip, MonoBoolean need_file_info, 
+			  MonoReflectionMethod **method, 
+			  gint32 *iloffset, gint32 *native_offset,
+			  MonoString **file, gint32 *line, gint32 *column)
 {
-	NewobjProfile *prof = g_new (NewobjProfile, 1);
-	prof->klass = class;
-	prof->count = GPOINTER_TO_UINT (count);
-	*funcs = g_list_insert_sorted (*funcs, prof, (GCompareFunc)compare_newobj_profile);
+	if (iloffset)
+		*iloffset = 0;
+	if (native_offset)
+		*native_offset = 0;
+	if (method)
+		*method = NULL;
+	if (line)
+		*line = 0;
+	if (column)
+		*column = 0;
+	if (file)
+		*file = mono_string_new (mono_domain_get (), "unknown");
+
+	return TRUE;
 }
 
-static void
-output_newobj_profile (GList *proflist)
+static MonoArray *
+ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info)
 {
-	GList *tmp;
-	NewobjProfile *p;
-	MonoClass *klass;
-	char* isarray;
-	char buf [256];
-
-	if (proflist)
-		g_print ("\n%-52s %9s\n", "Objects created:", "count");
-	for (tmp = proflist; tmp; tmp = tmp->next) {
-		p = tmp->data;
-		klass = p->klass;
-		if (strcmp (klass->name, "Array") == 0) {
-			isarray = "[]";
-			klass = klass->element_class;
-		} else {
-			isarray = "";
-		}
-		g_snprintf (buf, sizeof (buf), "%s.%s%s",
-			klass->name_space, klass->name, isarray);
-		g_print ("%-52s %9d\n", buf, p->count);
-	}
-}
-
-static MonoException * segv_exception = NULL;
-
-static void
-segv_handler (int signum)
-{
-	signal (signum, segv_handler);
-	mono_raise_exception (segv_exception);
+	return NULL;
 }
 
 int 
@@ -3907,33 +4382,43 @@ main (int argc, char *argv [])
 {
 	MonoDomain *domain;
 	MonoAssembly *assembly;
-	GList *profile = NULL;
 	int retval = 0, i, ocount = 0;
-	char *file;
+	char *file, *error, *config_file = NULL;
 
 	if (argc < 2)
 		usage ();
 
 	for (i = 1; i < argc && argv [i][0] == '-'; i++){
 		if (strcmp (argv [i], "--trace") == 0)
-			tracing = 1;
+			global_tracing = 1;
+		if (strcmp (argv [i], "--noptr") == 0)
+			global_no_pointers = 1;
 		if (strcmp (argv [i], "--traceops") == 0)
-			tracing = 2;
+			global_tracing = 2;
 		if (strcmp (argv [i], "--dieonex") == 0)
 			die_on_exception = 1;
 		if (strcmp (argv [i], "--print-vtable") == 0)
 			mono_print_vtable = TRUE;
-		if (strcmp (argv [i], "--profile") == 0) {
-			profiling = g_hash_table_new (g_direct_hash, g_direct_equal);
-			profiling_classes = g_hash_table_new (g_direct_hash, g_direct_equal);
-		}
+		if (strcmp (argv [i], "--profile") == 0)
+			mono_profiler_install_simple ();
 		if (strcmp (argv [i], "--opcode-count") == 0)
 			ocount = 1;
+		if (strcmp (argv [i], "--config") == 0)
+			config_file = argv [++i];
+		if (strcmp (argv [i], "--workers") == 0) {
+			mono_worker_threads = atoi (argv [++i]);
+			if (mono_worker_threads < 1)
+				mono_worker_threads = 1;
+		}
 		if (strcmp (argv [i], "--help") == 0)
 			usage ();
 #if DEBUG_INTERP
-		if (strcmp (argv [i], "--debug") == 0)
-			db_methods = g_list_append (db_methods, argv [++i]);
+		if (strcmp (argv [i], "--debug") == 0) {
+			MonoMethodDesc *desc = mono_method_desc_new (argv [++i], FALSE);
+			if (!desc)
+				g_error ("Invalid method name '%s'", argv [i]);
+			db_methods = g_list_append (db_methods, desc);
+		}
 #endif
 	}
 	
@@ -3942,24 +4427,29 @@ main (int argc, char *argv [])
 	if (!file)
 		usage ();
 
+	mono_set_rootdir (argv [0]);
+	mono_config_parse (config_file);
+	
+	g_log_set_always_fatal (G_LOG_LEVEL_ERROR);
+	g_log_set_fatal_mask (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR);
+
 	mono_init_icall ();
-	mono_add_internal_call ("__array_Set", ves_array_set);
-	mono_add_internal_call ("__array_Get", ves_array_get);
-	mono_add_internal_call ("__array_Address", ves_array_element_address);
+	mono_add_internal_call ("System.Diagnostics.StackFrame::get_frame_info", ves_icall_get_frame_info);
+	mono_add_internal_call ("System.Diagnostics.StackTrace::get_trace", ves_icall_get_trace);
 
 	frame_thread_id = TlsAlloc ();
 	TlsSetValue (frame_thread_id, NULL);
 
-	mono_install_runtime_class_init (runtime_class_init);
-	mono_install_runtime_object_init (runtime_object_init);
-	mono_install_runtime_exec_main (runtime_exec_main);
+	mono_install_compile_method (mono_create_method_pointer);
 	mono_install_runtime_invoke (interp_mono_runtime_invoke);
+	mono_install_remoting_trampoline (interp_create_remoting_trampoline);
 
 	mono_install_handler (interp_ex_handler);
+	mono_install_stack_walk (interp_walk_stack);
 
+	InitializeCriticalSection (&metadata_lock);
 	domain = mono_init (file);
-	mono_thread_init (domain);
-	mono_network_init ();
+	mono_runtime_init (domain, NULL);
 
 	assembly = mono_domain_assembly_open (domain, file);
 
@@ -3972,30 +4462,20 @@ main (int argc, char *argv [])
 #ifdef RUN_TEST
 	test_load_class (assembly->image);
 #else
-	check_corlib (mono_defaults.corlib);
+	error = mono_verify_corlib ();
+	if (error) {
+		fprintf (stderr, "Corlib not in sync with this runtime: %s\n", error);
+		exit (1);
+	}
 	segv_exception = mono_get_exception_null_reference ();
 	segv_exception->message = mono_string_new (domain, "Segmentation fault");
 	signal (SIGSEGV, segv_handler);
-	/*
-	 * skip the program name from the args.
-	 */
-	++i;
+
 	retval = ves_exec (domain, assembly, argc - i, argv + i);
 #endif
-	if (profiling) {
-		g_hash_table_foreach (profiling, (GHFunc)build_profile, &profile);
-		output_profile (profile);
-		g_list_free (profile);
-		profile = NULL;
-		
-		g_hash_table_foreach (profiling_classes, (GHFunc)build_newobj_profile, &profile);
-		output_newobj_profile (profile);
-		g_list_free (profile);
-	}
+	mono_profiler_shutdown ();
 	
-	mono_network_cleanup ();
-	mono_thread_cleanup ();
-
+	mono_runtime_cleanup (domain);
 	mono_domain_unload (domain, TRUE);
 
 #if DEBUG_INTERP
@@ -4006,6 +4486,3 @@ main (int argc, char *argv [])
 #endif
 	return retval;
 }
-
-
-
diff --git a/mono/interpreter/interp.h b/mono/interpreter/interp.h
index da619ca6ac1..90460932a74 100644
--- a/mono/interpreter/interp.h
+++ b/mono/interpreter/interp.h
@@ -58,6 +58,7 @@ struct _MonoInvocation {
 	stackval       *stack_args; /* parent */
 	stackval       *stack;
 	/* exception info */
+	int             invoke_trap;
 	const unsigned char  *ip;
 	MonoException     *ex;
 	MonoExceptionClause *ex_handler;
@@ -65,15 +66,16 @@ struct _MonoInvocation {
 
 void mono_init_icall (void);
 
-void inline stackval_from_data (MonoType *type, stackval *result, const char *data);
+void inline stackval_from_data (MonoType *type, stackval *result, char *data, gboolean pinvoke);
+void inline stackval_to_data (MonoType *type, stackval *val, char *data, gboolean pinvoke);
 void ves_exec_method (MonoInvocation *frame);
 
-typedef void (*MonoFunc) ();
+typedef void (*MonoFunc) (void);
 typedef void (*MonoPIFunc) (MonoFunc callme, void *retval, void *obj_this, stackval *arguments);
 
 /*
  * defined in an arch specific file.
  */
-MonoPIFunc mono_create_trampoline (MonoMethod *method, int runtime);
+MonoPIFunc
+mono_create_trampoline (MonoMethodSignature *sig, gboolean string_ctor);
 void *mono_create_method_pointer (MonoMethod *method);
-MonoMethod *mono_method_pointer_get (void *code);
diff --git a/mono/interpreter/mint.1 b/mono/interpreter/mint.1
index b343e964e74..de35edfc2c9 100644
--- a/mono/interpreter/mint.1
+++ b/mono/interpreter/mint.1
@@ -10,7 +10,8 @@ mint \- Mono ECMA-CLI interpreter.
 .SH SYNOPSIS
 .PP
 .B mint
-[\-\-help] [\-\-opcode\-count] [\-\-trace]
+[\-\-help] [\-\-opcode\-count] [\-\-trace] [\-\-traceops] [\-\-profile]
+[\-\-config filename] [\-\-debug method]
 program.exe [arguments...]
 .SH DESCRIPTION
 The \fImint\fP program is an interpreter for ECMA CLI byte codes.  It
@@ -26,8 +27,20 @@ The following Generic options are supported:
 .I "--help", "-h"
 Displays usage instructions.
 .TP
+.I "--config filename"
+Load the specified configuration file instead of the default one(s).
+The default files are /etc/mono/config and ~/.mono/config or the file
+specified in the MONO_CONFIG environment variable, if set.
+.TP
 .I "--trace"
-Displays opcodes and stack state as the interpreter executes the image
+Traces execution showing when methods are entered and left.
+.I "--traceops"
+Traces execution at the instruction level and displays the stack contents.
+.I "--traceclassinit"
+Shows when classes are initialized
+.TP
+.I "--noptr"
+Suppresses printing of pointer addresses in trace output.
 .TP
 .I "--profile"
 Performs runtime profiling of the code and displays statistics at the
@@ -40,11 +53,19 @@ Displays the number of opcodes executed.
 Aborts execution upon hitting an exception.
 .TP
 .I "--debug method"
-Debugs the method whose name is `method'
+Debugs the method whose name is `method'.  You can specify the method
+like this: `class:method' or `class::method'
 .TP
 .I "--opcode-count"
 Displays the number of opcodes executed
 .PP
+.SH ENVIRONMENT VARIABLES
+.TP
+.I "MONO_PATH"
+Provides a search path to mono and mint where to look for library files.
+Directories are separated by the platform path separator (colons on unix). Example:
+.B /home/username/lib:/usr/local/mono/lib
+.PP
 .SH FILES
 Assemblies are lodaed from the installation lib directory.  If you set
 `prefix' to /usr, the assemblies will be located in /usr/lib.
diff --git a/mono/io-layer/.cvsignore b/mono/io-layer/.cvsignore
index cffa6011938..f4e769a61d2 100644
--- a/mono/io-layer/.cvsignore
+++ b/mono/io-layer/.cvsignore
@@ -2,3 +2,6 @@
 .libs
 Makefile
 Makefile.in
+mono-handle-d
+*.lo
+*.la
diff --git a/mono/io-layer/ChangeLog b/mono/io-layer/ChangeLog
index 4a396b4fa31..4fc0dc96e0b 100644
--- a/mono/io-layer/ChangeLog
+++ b/mono/io-layer/ChangeLog
@@ -1,3 +1,471 @@
+2002-08-20  Dick Porter  <dick@ximian.com>
+
+	* handles.c (_wapi_handle_scratch_store): Made stored byte lengths
+	multiples of 4 bytes, to keep header structures aligned.  Needed
+	for sparc, at least. (Patch from crichton@gimp.org)
+
+	* handles.c: Removed 'disable_shm' variable (we've defaulted to
+	building with shm enabled for months now)
+
+2002-08-19  Dick Porter  <dick@ximian.com>
+
+	* daemon.c: Rewrote the poll() loop to use GIOChannels instead,
+	for legacy NeXT-based systems.
+
+2002-08-12  Dick Porter  <dick@ximian.com>
+
+	* atomic.h: Rename some parameters to avoid c++ keywords (Patch
+	from Joseph Wenninger <kde@jowenn.at>)
+
+2002-08-05  Dietmar Maurer  <dietmar@ximian.com>
+
+	* threads.c: use fast spinlocks by default
+
+2002-08-02  Dick Porter  <dick@ximian.com>
+
+	* io.c (GetStdHandle): Add a handle reference when returning a
+	duplicate console handle.  This fixes the unref_handle errors in
+	NUnit.
+
+2002-08-01  Dietmar Maurer  <dietmar@ximian.com>
+
+	* threads.c (TLS_PTHREAD_MUTEX): define this because else some
+	tests does not work
+
+2002-08-01  Dick Porter  <dick@ximian.com>
+
+	* threads.c: Use atomic spinlocks in TLS functions
+
+	* mono-spinlock.h:
+	* Makefile.am: Added mono-spinlock.h
+
+2002-07-21  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* daemon-messages.c: #include <sys/types.h> and <sys/sockets.h> -
+	these are needed for sendmsg() and also for struct msghdr (at
+	least on Solaris). Solaris still won't build because struct msghdr
+	doesn't have msg_flags, msg_control, or msg_controllen members.
+	(CMSG_SPACE): Define for systems that don't have it.
+	(CMSG_LEN): Same.
+
+2002-07-20  Dick Porter  <dick@ximian.com>
+
+	* wapi-private.h:
+	* io-private.h:
+	* io.h:
+	* io.c:
+	* handles.c: Implemented pipe handles
+	
+	* handles.c:
+	* daemon.c: Fixed bug in handle closing.
+
+	* shared.c:
+	* daemon.c: Forked processes now close all open file descriptors.
+
+Fri Jul 19 19:05:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* sockets.h, io-layer.h, critical-sections.h: don't include config.h
+	in header files.
+
+2002-07-19  Martin Baulig  <martin@gnome.org>
+
+	* threads.c (ExitThread): Call exit() if no threads has been
+	created yet.
+
+2002-07-17  Dick Porter  <dick@ximian.com>
+
+	* daemon-messages.c: Freebsd fixes from Andreas Kohn
+	<andreas.kohn@gmx.net>
+
+2002-07-15  Dick Porter  <dick@ximian.com>
+
+	* io.c: Removed bogus console_flush() method, that was just cut
+	and pasted from file_flush when I separated the two handle types.
+
+2002-07-12  Dick Porter  <dick@ximian.com>
+
+	* io.c (convert_from_flags): Fixed misunderstanding wrt fcntl
+	flags.  Fixes bug 27633.
+
+2002-07-12  Dick Porter  <dick@ximian.com>
+
+	* wapi-private.h:
+	* handles.c:
+	* daemon.c: Use size of sockaddr_un.sun_path from config.h
+
+2002-07-12  Dick Porter  <dick@ximian.com>
+
+	* processes.c (CreateProcess): Send stdin, stdout and stderr
+	handles if the startup info doesnt specify new ones
+
+	* io.c (GetStdHandle): Return the same handle when the same
+	standard handle is requested
+
+	* handles.c: Pass file descriptors when forking
+
+	* daemon.c: Use supplied file descriptors when forking a new
+	process
+
+	* daemon-messages.h: 
+	* daemon-messages.c: Pass stdin, stdout and stderr file
+	descriptors to the daemon (used when forking)
+
+2002-07-11  Miguel de Icaza  <miguel@ximian.com>
+
+	* daemon.c (_wapi_daemon_main): Use sizeof
+	(main_socket_address.sun_path) instead of hardcoded 108 value.
+
+	* handles.c (shared_init): Use sizeof
+	(shared_socket_address.sun_path) instead of hardcoded 108 value.
+
+2002-07-10  Dennis Haney  <davh@davh.dk>
+
+	* shared.c:
+	* handles.c:
+	* daemon.c: Lots of documentation, some added error checking, and
+	code readability improvements.
+
+	* daemon-messages.h: Add the Error request type to improve error
+	checking.
+
+	* daemon-messages.c: Do a bit more error checking on send() and
+	recv(), and log errors with a higher severity level.
+
+2002-07-04  Dick Porter  <dick@ximian.com>
+
+	* daemon.c (process_process_fork): Fix argument handling, due to
+	buggy understanding of g_strsplit() behaviour.
+
+2002-07-03  Dick Porter  <dick@ximian.com>
+
+	* threads.h:
+	* threads.c: Implement OpenThread().  Define access-control values
+	for thread handles.
+
+	* wapi.h:
+	* processes.h:
+	* access.h:
+	* Makefile.am: Added access.h, to hold shared access-control
+	definitions
+
+2002-07-02  Dick Porter  <dick@ximian.com>
+
+	* wapi-private.h (_WAPI_HANDLE_VERSION): New protocol version
+	
+2002-07-02  Dick Porter  <dick@ximian.com>
+
+	* handles.c (shared_init): Make a second attempt to contact the
+	daemon if the shared memory attach succeeds, but the connect()
+	fails. (This copes with the daemon crashing without cleaning up
+	the shared memory.)
+
+	* Makefile.am: 
+	* daemon-private.h:
+	* daemon.c:
+	* shared.c (_wapi_shm_attach): Don't exec() anything when we fork
+	the daemon, it's now built into the library.
+
+2002-06-25  Dick Porter  <dick@ximian.com>
+
+	* handles.c:
+	* handles-private.h:
+	* daemon-messages.h:
+	* daemon.c: Process forking and handle data management
+
+	* processes.h:
+	* process-private.h:
+	* processes.c: Process forking and other support functions
+
+2002-06-25  Dick Porter  <dick@ximian.com>
+
+	* versioninfo.h: PE resource decoding
+
+	* unicode.c (_wapi_unicode_to_utf8): g_utf16_to_utf8 doesnt need
+	to be told the string length
+
+	* io.c: Removed the ACTUALLY_DO_UNICODE option.  Fixed some leaks.
+	Moved _wapi_time_t_to_filetime and the WapiFileTime typedef to
+	timefuncs.c
+
+2002-06-12  Dick Porter  <dick@ximian.com>
+
+	* daemon.c: 
+	* daemon-messages.c: Handle SIGPIPE in a non-stupid way in the
+	daemon, if MSG_NOSIGNAL isn't available.  Thanks to Jaroslaw
+	Kowalski <jarek@atm.com.pl> for pointing out the bogosity.
+
+2002-06-10  Jaroslaw Kowalski <jarek@atm.com.pl>
+
+	* sockets.c, daemon-messages.c: Prevent SIGPIPE from being raised
+	when writing to a closed socket.
+
+2002-06-08  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* mono-mutex.c (mono_once): New convenience function for my
+	previous fix.
+
+	* handles.c:
+	* error.c: 
+	* critical-sections.c: 
+	* threads.c: 
+	* sockets.c: 
+	* semaphores.c: 
+	* processes.c: 
+	* mutexes.c: 
+	* io.c: 
+	* events.c: 
+	* atomic.c: Use mono_once() rather than pthread_once().
+
+2002-06-06  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* handles.c (_wapi_handle_new): pthread_once() is not atomic, so
+	if multiple threads all try to call _wapi_handle_new() before the
+	shared data has been initialized, it is possible that we could get
+	into a condition where shared_init() is being executed and later
+	threads will pass by pthread_once() due to the fact that it has
+	already been called and so therefor will attempt to use the shared
+	data before it has been completely initialized. If we instead use
+	a standard mutex locking mechanism around shared_init(), we can
+	avoid the situation entirely. By wrapping the mutex locking in a
+	check to see if we've already initialized the data, we can even
+	avoid wasting resources by having to lock/unlock the mutex in any
+	later calls (the only time we'd have to worry about
+	locking/unlocking is the initial race to call shared_init() at
+	startup).
+
+Sat Jun 1 13:27:11 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* atomic.h: inline asm fixes from Dennis Haney (davh@davh.dk).
+
+Fri May 31 16:21:54 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* daemon.c, handles.c: rename "sun" local var since it's apparently
+	a #define on Solaris.
+
+Fri May 31 15:40:14 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* daemon-messages.c: work-around MSG_NOSIGNAL missing on some
+	platforms.
+
+2002-05-15  Dick Porter  <dick@ximian.com>
+
+	* wait.c: Fix a deadlock in WaitForMultipleObjects
+
+2002-05-14  Dick Porter  <dick@ximian.com>
+
+	* io.c: Fix a cut&paste error, found by
+	Jaroslaw Kowalski <jarek@atm.com.pl>
+
+2002-05-10  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* io.c:	Nasty typo.
+
+2002-05-09  Dick Porter  <dick@ximian.com>
+
+	* threads.c: 
+	* semaphores.c: 
+	* processes.c: 
+	* mutexes.c: 
+	* handles-private.h: 
+	* events.c: 
+	* Makefile.am: Remove now-unused file wait-private.h
+
+2002-05-08  Dick Porter  <dick@ximian.com>
+
+	* shared.c: Better error messages, and report when daemon
+	connection fails rather than blocking forever.  Do some more
+	shared memory sanity checking.
+
+	* handles.c: Better error messages when connecting to shared
+	memory and the handle daemon.  Fall back to non-shared handles if
+	an error occurs.  Set the default back to 'shared handles'.  Fix a
+	crashing bug in scratch space allocation that mangled the block
+	headers.
+
+2002-05-07  Miguel de Icaza  <miguel@ximian.com>
+
+	* handles.c (shared_init): Disable SHM for now, people have too
+	many problems with this, and the diagnostics are not helping.
+
+2002-05-06  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* io.c: CreateFile sets win32 last error.
+
+2002-05-05  Dick Porter  <dick@ximian.com>
+
+	* wapi-private.h: 
+	* handles-private.h:
+	* io.c: 
+	* io-private.h:
+	* mutexes.c: 
+	* mutex-private.h: 
+	* processes.c: 
+	* process-private.h: 
+	* semaphores.c: 
+	* semaphore-private.h: 
+	* sockets.c: 
+	* socket-private.h: 
+	* events.c: 
+	* event-private.h: Simplify the WapiHandleOps struct: take out all
+	the file-specific entries, leaving just the items that operate on
+	handles themselves.  Split the close operation into shared and
+	private parts: shared close is called by the daemon.
+
+	* handles.c: As above, but also pass handle allocation, ref and
+	unref operations to the daemon.  Populate the handle_ops array at
+	compile time, because the daemon needs to call ops on handles too.
+	Don't bother to track open handle counts any more, the daemon does
+	that.
+	
+	* threads.c: 
+	* thread-private.h: As above, but also make the thread data
+	handle-private.
+
+	* shared.c: Fork a handle daemon if the calling process created
+	the shared memory segment.
+
+	* daemon.c:
+	* daemon-messages.c:
+	* daemon-messages.h:
+	* Makefile.am: Build a daemon to manage handle allocation and
+	destruction without needing to lock the shared memory
+
+2002-04-30  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* atomic.c: Changed to use a normal mutex rather than a spinlock
+	since a lot of platforms seem to not have them :\
+
+2002-04-30  Dick Porter  <dick@ximian.com>
+
+	* Completely rewrote the handle waiting code: removed the helper
+	thread and its attendant complexity.  All handle waiting is now
+	abstracted into the WaitForSingleObject() and
+	WaitForMultipleObjects() functions.
+
+	* Implemented inter-process sharing of handles using sysv shared
+	memory.  This makes handles even more opaque, with a handle now
+	just an index into an array.
+	
+2002-04-25  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* io.c: unitialized pointer in GetCurrentDirectory.
+
+Sat Apr 20 13:37:39 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* threads.c: destroy the mutex at thread destruction
+	(if/when thread destruction code will be actually called).
+	When protecting a tls data pointer from the gc, use also the 
+	thread id in the key.
+	
+Wed Apr 17 18:36:27 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* timed-thread.c: avoid race condition when setting the thread to
+	detached.
+
+2002-04-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* jit.h: to more #include lines to avoid breaking compilation
+	under windows when upgrading mingw and w32api to version
+	1.3 (thanks Dick!).
+
+2002-04-16  Dick Porter  <dick@ximian.com>
+
+	* atomic.h: Explanatory comment about lack of 80386 support
+
+2002-04-15  Dick Porter  <dick@ximian.com>
+
+	* atomic.h: use xaddl for InterlockedIncrement() and
+	InterlockedDecrement().  Use cmpxchgl in a loop for
+	InterlockedExchange() and InterlockedExchangePointer().
+
+Mon Apr 15 13:31:22 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* unicode.c: fix unicode_len() to not access uninitialized memory
+	(and updated to conform to mono code style).
+
+Fri Mar 29 17:15:11 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* io.c: EEXISTS is ignored for directory creation.
+	* mono-mutex.h: remove silly "pragma }" that emacs users insert
+	because they use a broken editor:-)
+
+2002-03-28  Dick Porter  <dick@ximian.com>
+
+	* sockets.h: 
+	* sockets.c: 
+	* io.c: 
+	* handles.h: 
+	* handles.c: Warning cleanups
+
+2002-03-27  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* unicode.h, unicode.c: changed to gunichar2
+	* io.h, io.c: changed strings to gunichar2*, added
+	SetFileAttributes(), GetCurrentDirectory(), SetCurrentDirectory(),
+	some fixes to FindFirstFile() and friends.
+
+2002-03-26  Dick Porter  <dick@ximian.com>
+
+	* types.h: Implement the large integer struct
+
+	* timefuncs.h:
+	* timefuncs.c: Dummy functions that don't yet implement
+	QueryPerformanceCounter() and QueryPerformanceFrequency()
+
+	* threads.h:
+	* threads.c: Implement SleepEx()
+
+	* system.h:
+	* system.c: Beginnings of GetSystemInfo()
+
+	* mono-mutex.c (pthread_mutex_timedlock): Fix a ms/ns conversion
+	thinko
+
+	* context.h:
+	* context.c: Dummy function that doesnt yet implement
+	GetThreadContext()
+
+	* atomic.h: 
+	* atomic.c: Interlocked functions
+
+Mon Mar 25 13:01:40 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* threads.c: use a gc-safe hash table to store tls pointers.
+
+2002-03-22  Dick Porter  <dick@ximian.com>
+
+	* threads.c: Fix a race condition where a thread can start and
+	exit before the handle has been properly initialised (no reason
+	why the handle couldn't be initialised beforehand, so do so)
+
+	Fix a ms to ns conversion magnitude thinko.
+
+2002-03-21  Dick Porter  <dick@ximian.com>
+
+	* semaphores.c: Fix a problem when waiting for one or more
+	semaphores, and another semaphore is Released (all waiting
+	semaphores assumed they were signalled)
+
+2002-03-29  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* io.h, io.c, uglify.h: added MoveFile, CopyFile, CreateDirectory,
+	RemoveDirectory, GetFileAttributes, GetFileAttributesEx
+
+2002-03-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* threads.c (Sleep): bug fix: 1ms == 1000000ns
+
+2002-03-19  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* io.h, io.c, events.c, mutexes.c, semaphores.c, sockets.c,
+	threads.c, io.c: added flush method to handles.
+
+	* io.c: FlushFileBuffers() and FindFirstFile() functions.
+
+Thu Mar 7 17:21:52 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* threads.c, timed-thread.c, wait.c: Boehm-GC anable.
+
 2002-02-20  Dick Porter  <dick@ximian.com>
 
 	* io-layer.h: Always build without cygwin support on windows
diff --git a/mono/io-layer/Makefile.am b/mono/io-layer/Makefile.am
index 553803ea07a..43d5f16919d 100644
--- a/mono/io-layer/Makefile.am
+++ b/mono/io-layer/Makefile.am
@@ -1,15 +1,18 @@
-lib_LIBRARIES = libwapi.a
+noinst_LTLIBRARIES = libwapi.la
 
 INCLUDES = \
 	$(GLIB_CFLAGS)		\
 	$(GMODULE_CFLAGS)	\
 	-D_WAPI_BUILDING=1	\
-	-I$(top_srcdir)		\
-	#
+	-DMONO_BINDIR=\""$(bindir)"\"	\
+	-I$(top_srcdir)	
 
 libwapiincludedir = $(includedir)/mono/io-layer
 
 OTHER_H = \
+	access.h	\
+	atomic.h	\
+	context.h	\
 	critical-sections.h	\
 	error.h		\
 	events.h	\
@@ -17,75 +20,103 @@ OTHER_H = \
 	io.h		\
 	io-layer.h	\
 	macros.h	\
+	mono-mutex.h	\
 	mutexes.h	\
+	processes.h	\
 	semaphores.h	\
 	sockets.h	\
 	status.h	\
+	system.h	\
 	threads.h	\
+	timefuncs.h	\
+	types.h		\
 	uglify.h	\
+	versioninfo.h	\
 	wait.h		\
-	wapi.h		\
-	#
+	wapi.h	
 
 OTHER_SRC = \
+	access.h		\
+	atomic.c		\
+	atomic.h		\
+	context.c		\
+	context.h		\
 	critical-sections.c	\
 	critical-sections.h	\
+	daemon.c		\
+	daemon-private.h	\
+	daemon-messages.c	\
+	daemon-messages.h	\
 	error.c			\
 	error.h			\
 	events.c		\
 	events.h		\
+	event-private.h		\
 	handles.c		\
 	handles.h		\
 	handles-private.h	\
 	io.c			\
 	io.h			\
+	io-private.h		\
 	io-layer.h		\
 	macros.h		\
 	misc.c			\
 	misc-private.h		\
 	mutexes.c		\
 	mutexes.h		\
+	mutex-private.h		\
 	mono-mutex.c		\
 	mono-mutex.h		\
+	mono-spinlock.h		\
+	processes.c		\
+	processes.h		\
+	process-private.h	\
 	semaphores.c		\
 	semaphores.h		\
+	semaphore-private.h	\
+	shared.c		\
+	shared.h		\
 	sockets.c		\
 	sockets.h		\
+	socket-private.h	\
 	status.h		\
+	system.c		\
+	system.h		\
 	threads.c		\
 	threads.h		\
+	thread-private.h	\
+	timefuncs.c		\
+	timefuncs.h		\
+	timefuncs-private.h	\
 	timed-thread.c		\
 	timed-thread.h		\
+	types.h			\
 	uglify.h		\
 	unicode.c		\
 	unicode.h		\
+	versioninfo.h		\
 	wait.c			\
 	wait.h			\
-	wait-private.h		\
 	wapi.h			\
-	wapi-private.h		\
-	#
+	wapi-private.h
 
 WINDOWS_H = \
-	io-layer.h		\
-	#
+	io-layer.h
 
 WINDOWS_SRC = \
 	io-layer.h		\
-	io-layer-dummy.c	\
-	#
+	io-layer-dummy.c
 
 if PLATFORM_WIN32
-libwapi_a_SOURCES = $(WINDOWS_SRC)
+libwapi_la_SOURCES = $(WINDOWS_SRC)
 libwapiinclude_HEADERS = $(WINDOWS_H)
 else
-libwapi_a_SOURCES = $(OTHER_SRC)
+libwapi_la_SOURCES = $(OTHER_SRC)
 libwapiinclude_HEADERS = $(OTHER_H)
 endif
 
 EXTRA_DIST =	\
 	$(WINDOWS_SRC)	\
-	$(OTHER_SRC)	\
-	#
+	$(OTHER_SRC)
 
 
diff --git a/mono/io-layer/access.h b/mono/io-layer/access.h
new file mode 100644
index 00000000000..2cb48b308ac
--- /dev/null
+++ b/mono/io-layer/access.h
@@ -0,0 +1,20 @@
+/*
+ * access.h:  Access control definitions
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_ACCESS_H_
+#define _WAPI_ACCESS_H_
+
+#include <glib.h>
+
+#include <mono/io-layer/wapi.h>
+
+#define SYNCHRONIZE			0x00100000
+#define STANDARD_RIGHTS_REQUIRED	0x000f0000
+
+#endif /* _WAPI_ACCESS_H_ */
diff --git a/mono/io-layer/atomic.c b/mono/io-layer/atomic.c
new file mode 100644
index 00000000000..1bf0bf416ac
--- /dev/null
+++ b/mono/io-layer/atomic.c
@@ -0,0 +1,140 @@
+/*
+ * atomic.c:  Workarounds for atomic operations for platforms that dont have
+ *	      really atomic asm functions in atomic.h
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+#include <pthread.h>
+
+#include "mono/io-layer/wapi.h"
+
+#ifndef WAPI_ATOMIC_ASM
+#warning "Atomic functions are not atomic!"
+
+static pthread_mutex_t spin;
+static mono_once_t spin_once=MONO_ONCE_INIT;
+
+static void spin_init(void)
+{
+	pthread_mutex_init(&spin, 0);
+	g_warning("Using non-atomic functions!");
+}
+
+gint32 InterlockedCompareExchange(volatile gint32 *dest, gint32 exch,
+				  gint32 comp)
+{
+	gint32 old;
+	
+	mono_once(&spin_once, spin_init);
+	pthread_mutex_lock(&spin);
+	
+	old= *dest;
+	if(old==comp) {
+		*dest=exch;
+	}
+	
+	pthread_mutex_unlock(&spin);
+
+	return(old);
+}
+
+gpointer InterlockedCompareExchangePointer(volatile gpointer *dest,
+					   gpointer exch, gpointer comp)
+{
+	gpointer old;
+	
+	mono_once(&spin_once, spin_init);
+	pthread_mutex_lock(&spin);
+	
+	old= *dest;
+	if(old==comp) {
+		*dest=exch;
+	}
+	
+	pthread_mutex_unlock(&spin);
+
+	return(old);
+}
+
+gint32 InterlockedIncrement(volatile gint32 *dest)
+{
+	gint32 ret;
+	
+	mono_once(&spin_once, spin_init);
+	pthread_mutex_lock(&spin);
+	
+	*dest++;
+	ret= *dest;
+	
+	pthread_mutex_unlock(&spin);
+	
+	return(ret);
+}
+
+gint32 InterlockedDecrement(volatile gint32 *dest)
+{
+	gint32 ret;
+	
+	mono_once(&spin_once, spin_init);
+	pthread_mutex_lock(&spin);
+	
+	*dest--;
+	ret= *dest;
+	
+	pthread_mutex_unlock(&spin);
+	
+	return(ret);
+}
+
+gint32 InterlockedExchange(volatile gint32 *dest, gint32 exch)
+{
+	gint32 ret;
+	
+	mono_once(&spin_once, spin_init);
+	pthread_mutex_lock(&spin);
+
+	ret=*dest;
+	*dest=exch;
+	
+	pthread_mutex_unlock(&spin);
+	
+	return(ret);
+}
+
+gpointer InterlockedExchangePointer(volatile gpointer *dest, gpointer exch)
+{
+	gpointer ret;
+	
+	mono_once(&spin_once, spin_init);
+	pthread_mutex_lock(&spin);
+	
+	ret=*dest;
+	*dest=exch;
+	
+	pthread_mutex_unlock(&spin);
+	
+	return(ret);
+}
+
+gint32 InterlockedExchangeAdd(volatile gint32 *dest, gint32 add)
+{
+	gint32 ret;
+	
+	mono_once(&spin_once, spin_init);
+	pthread_mutex_lock(&spin);
+
+	ret= *dest;
+	*dest+=add;
+	
+	pthread_mutex_unlock(&spin);
+	
+	return(ret);
+}
+
+#endif
diff --git a/mono/io-layer/atomic.h b/mono/io-layer/atomic.h
new file mode 100644
index 00000000000..063f202a840
--- /dev/null
+++ b/mono/io-layer/atomic.h
@@ -0,0 +1,120 @@
+/*
+ * atomic.h:  Atomic operations
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_ATOMIC_H_
+#define _WAPI_ATOMIC_H_
+
+#include <glib.h>
+
+#include "mono/io-layer/wapi.h"
+
+#ifdef __i386__
+#define WAPI_ATOMIC_ASM
+
+/*
+ * NB: The *Pointer() functions here assume that
+ * sizeof(pointer)==sizeof(gint32)
+ *
+ * NB2: These asm functions assume 486+ (some of the opcodes dont
+ * exist on 386).  If this becomes an issue, we can get configure to
+ * fall back to the non-atomic C versions of these calls.
+ */
+
+static inline gint32 InterlockedCompareExchange(volatile gint32 *dest,
+						gint32 exch, gint32 comp)
+{
+	gint32 old;
+
+	__asm__ __volatile__ ("lock; cmpxchgl %2, %0"
+			      : "=m" (*dest), "=a" (old)
+			      : "r" (exch), "m" (*dest), "a" (comp));	
+	return(old);
+}
+
+static inline gpointer InterlockedCompareExchangePointer(volatile gpointer *dest, gpointer exch, gpointer comp)
+{
+	gpointer old;
+
+	__asm__ __volatile__ ("lock; cmpxchgl %2, %0"
+			      : "=m" (*dest), "=a" (old)
+			      : "r" (exch), "m" (*dest), "a" (comp));	
+	return(old);
+}
+
+static inline gint32 InterlockedIncrement(volatile gint32 *val)
+{
+	gint32 tmp;
+	
+	__asm__ __volatile__ ("lock; xaddl %0, %1"
+			      : "=r" (tmp), "=m" (*val)
+			      : "0" (1), "m" (*val));
+
+	return(tmp+1);
+}
+
+static inline gint32 InterlockedDecrement(volatile gint32 *val)
+{
+	gint32 tmp;
+	
+	__asm__ __volatile__ ("lock; xaddl %0, %1"
+			      : "=r" (tmp), "=m" (*val)
+			      : "0" (-1), "m" (*val));
+
+	return(tmp-1);
+}
+
+/*
+ * See
+ * http://msdn.microsoft.com/library/en-us/dnmag00/html/win320700.asp?frame=true
+ * for the reasons for using cmpxchg and a loop here.
+ */
+static inline gint32 InterlockedExchange(volatile gint32 *val, gint32 new_val)
+{
+	gint32 ret;
+	
+	__asm__ __volatile__ ("1:; lock; cmpxchgl %2, %0; jne 1b"
+			      : "=m" (*val), "=a" (ret)
+			      : "r" (new_val), "m" (*val), "a" (*val));
+
+	return(ret);
+}
+
+static inline gpointer InterlockedExchangePointer(volatile gpointer *val,
+						  gpointer new_val)
+{
+	gpointer ret;
+	
+	__asm__ __volatile__ ("1:; lock; cmpxchgl %2, %0; jne 1b"
+			      : "=m" (*val), "=a" (ret)
+			      : "r" (new_val), "m" (*val), "a" (*val));
+
+	return(ret);
+}
+
+static inline gint32 InterlockedExchangeAdd(volatile gint32 *val, gint32 add)
+{
+	gint32 ret;
+	
+	__asm__ __volatile__ ("lock; xaddl %0, %1"
+			      : "=r" (ret), "=m" (*val)
+			      : "0" (add), "m" (*val));
+	
+	return(ret);
+}
+#else
+extern gint32 InterlockedCompareExchange(volatile gint32 *dest, gint32 exch, gint32 comp);
+extern gpointer InterlockedCompareExchangePointer(volatile gpointer *dest, gpointer exch, gpointer comp);
+extern gint32 InterlockedIncrement(volatile gint32 *dest);
+extern gint32 InterlockedDecrement(volatile gint32 *dest);
+extern gint32 InterlockedExchange(volatile gint32 *dest, gint32 exch);
+extern gpointer InterlockedExchangePointer(volatile gpointer *dest, gpointer exch);
+extern gint32 InterlockedExchangeAdd(volatile gint32 *dest, gint32 add);
+#endif
+
+#endif /* _WAPI_ATOMIC_H_ */
diff --git a/mono/io-layer/context.c b/mono/io-layer/context.c
new file mode 100644
index 00000000000..75155a40ac8
--- /dev/null
+++ b/mono/io-layer/context.c
@@ -0,0 +1,22 @@
+/*
+ * context.c:  Processor-specific register contexts
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+#include <pthread.h>
+
+#include "mono/io-layer/wapi.h"
+
+gboolean GetThreadContext(gpointer handle G_GNUC_UNUSED, WapiContext *context G_GNUC_UNUSED)
+{
+	return(FALSE);
+}
+
+
+
diff --git a/mono/io-layer/context.h b/mono/io-layer/context.h
new file mode 100644
index 00000000000..3cf0c9718cd
--- /dev/null
+++ b/mono/io-layer/context.h
@@ -0,0 +1,86 @@
+/*
+ * context.h:  Processor-specific register contexts
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_CONTEXT_H_
+#define _WAPI_CONTEXT_H_
+
+#include <glib.h>
+
+#include "mono/io-layer/wapi.h"
+
+/* This part is x86-specific.  MSDN states that CONTEXT is defined
+ * also for MIPS, Alpha and PPC processors.
+ */
+
+#define SIZE_OF_80387_REGISTERS 80
+
+#define CONTEXT_i386 0x00010000
+#define CONTEXT_i486 0x00010000
+
+#define CONTEXT_CONTROL			(CONTEXT_i386 | 0x00000001L)
+#define CONTEXT_INTEGER			(CONTEXT_i386 | 0x00000002L)
+#define CONTEXT_SEGMENTS		(CONTEXT_i386 | 0x00000004L)
+#define CONTEXT_FLOATING_POINT		(CONTEXT_i386 | 0x00000008L)
+#define CONTEXT_DEBUG_REGISTERS		(CONTEXT_i386 | 0x00000010L)
+#define CONTEXT_EXTENDED_REGISTERS	(CONTEXT_i386 | 0x00000020L)
+
+#define CONTEXT_FULL (CONTEXT_CONTROL | CONTEXT_INTEGER | CONTEXT_SEGMENTS)
+
+#define MAXIMUM_SUPPORTED_EXTENSION 512
+
+typedef struct 
+{
+	guint32 ControlWord;
+	guint32 StatusWord;
+	guint32 TagWord;
+	guint32 ErrorOffset;
+	guint32 ErrorSelector;
+	guint32 DataOffset;
+	guint32 DataSelector;
+	guint8 RegisterArea[SIZE_OF_80387_REGISTERS];
+	guint32 Cr0NpxState;
+} WapiFloatingSaveArea;
+
+typedef struct 
+{
+	guint32 ContextFlags;
+	guint32 Dr0;
+	guint32 Dr1;
+	guint32 Dr2;
+	guint32 Dr3;
+	guint32 Dr6;
+	guint32 Dr7;
+	
+	WapiFloatingSaveArea FloatSave;
+	
+	guint32 SegGs;
+	guint32 SegFs;
+	guint32 SegEs;
+	guint32 SegDs;
+	
+	guint32 Edi;
+	guint32 Esi;
+	guint32 Ebx;
+	guint32 Edx;
+	guint32 Ecx;
+	guint32 Eax;
+	
+	guint32 Ebp;
+	guint32 Eip;
+	guint32 SegCs;
+	guint32 EFlags;
+	guint32 Esp;
+	guint32 SegSs;
+	
+	guint8 ExtendedRegisters[MAXIMUM_SUPPORTED_EXTENSION];
+} WapiContext;
+
+extern gboolean GetThreadContext(gpointer handle, WapiContext *context);
+
+#endif /* _WAPI_COMPEX_H_ */
diff --git a/mono/io-layer/critical-sections.c b/mono/io-layer/critical-sections.c
index e21c161fb20..e3b4326bdc5 100644
--- a/mono/io-layer/critical-sections.c
+++ b/mono/io-layer/critical-sections.c
@@ -1,3 +1,12 @@
+/*
+ * critical-sections.c:  Critical sections
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <pthread.h>
@@ -17,7 +26,7 @@
  * here but I'd need a mutex around the critical section structure
  * anyway.  So I may as well just use a pthread mutex.
  */
-static pthread_once_t attr_key_once=PTHREAD_ONCE_INIT;
+static mono_once_t attr_key_once=MONO_ONCE_INIT;
 static mono_mutexattr_t attr;
 
 static void attr_init(void)
@@ -34,7 +43,7 @@ static void attr_init(void)
  */
 void InitializeCriticalSection(WapiCriticalSection *section)
 {
-	pthread_once(&attr_key_once, attr_init);
+	mono_once(&attr_key_once, attr_init);
 	mono_mutex_init(&section->mutex, &attr);
 }
 
diff --git a/mono/io-layer/critical-sections.h b/mono/io-layer/critical-sections.h
index b9fdfd5abb8..4ddafddab84 100644
--- a/mono/io-layer/critical-sections.h
+++ b/mono/io-layer/critical-sections.h
@@ -1,8 +1,15 @@
+/*
+ * critical-sections.h:  Critical sections
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_CRITICAL_SECTIONS_H_
 #define _WAPI_CRITICAL_SECTIONS_H_
 
-#include <config.h>
-
 #include <glib.h>
 #include <pthread.h>
 
diff --git a/mono/io-layer/daemon-messages.c b/mono/io-layer/daemon-messages.c
new file mode 100644
index 00000000000..0aa7cbb34b1
--- /dev/null
+++ b/mono/io-layer/daemon-messages.c
@@ -0,0 +1,248 @@
+/*
+ * daemon-messages.c:  Communications to and from the handle daemon
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+#include <pthread.h>
+#include <errno.h>
+#include <string.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+/* Freebsd needs this included explicitly, but it doesn't hurt on Linux */
+#include <sys/uio.h>
+
+#ifndef HAVE_MSG_NOSIGNAL
+#include <signal.h>
+#endif
+
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/daemon-messages.h>
+
+/* Solaris doesn't define these */
+#ifndef CMSG_LEN
+#define CMSG_LEN(size)    (sizeof (struct cmsghdr) + (size))
+#endif
+#ifndef CMSG_SPACE
+#define CMSG_SPACE(size)  (sizeof (struct cmsghdr) + (size))
+#endif
+
+/* Send request on fd, wait for response (called by applications, not
+ * the daemon, indirectly through _wapi_daemon_request_response and
+ * _wapi_daemon_request_response_with_fds)
+ */
+static void _wapi_daemon_request_response_internal (int fd,
+						    struct msghdr *msg,
+						    WapiHandleResponse *resp)
+{
+	static pthread_mutex_t req_mutex=PTHREAD_MUTEX_INITIALIZER;
+	int ret;
+#ifndef HAVE_MSG_NOSIGNAL
+	void (*old_sigpipe)(int);
+#endif
+
+	/* Serialise requests to the daemon from the same process.  We
+	 * rely on request turnaround time being minimal anyway, so
+	 * performance shouldnt suffer from the mutex.
+	 */
+	pthread_mutex_lock (&req_mutex);
+	
+#ifdef HAVE_MSG_NOSIGNAL
+	ret=sendmsg (fd, msg, MSG_NOSIGNAL);
+#else
+	old_sigpipe = signal (SIGPIPE, SIG_IGN);
+	ret=sendmsg (fd, msg, 0);
+#endif
+	if(ret!=sizeof(WapiHandleRequest)) {
+		if(errno==EPIPE) {
+			g_critical (G_GNUC_PRETTY_FUNCTION ": The handle daemon vanished!");
+			exit (-1);
+		} else {
+			g_warning (G_GNUC_PRETTY_FUNCTION ": Send error: %s",
+				   strerror (errno));
+			g_assert_not_reached ();
+		}
+	}
+
+#ifdef HAVE_MSG_NOSIGNAL
+	ret=recv (fd, resp, sizeof(WapiHandleResponse), MSG_NOSIGNAL);
+#else
+	ret=recv (fd, resp, sizeof(WapiHandleResponse), 0);
+	signal (SIGPIPE, old_sigpipe);
+#endif
+	if(ret==-1) {
+		if(errno==EPIPE) {
+			g_critical (G_GNUC_PRETTY_FUNCTION ": The handle daemon vanished!");
+			exit (-1);
+		} else {
+			g_warning (G_GNUC_PRETTY_FUNCTION ": Send error: %s",
+				   strerror (errno));
+			g_assert_not_reached ();
+		}
+	}
+
+	pthread_mutex_unlock (&req_mutex);
+}
+
+/* Send request on fd with filedescriptors, wait for response (called
+ * by applications, not the daemon)
+ */
+void _wapi_daemon_request_response_with_fds (int fd, WapiHandleRequest *req,
+					     WapiHandleResponse *resp,
+					     int in_fd, int out_fd, int err_fd)
+{
+	struct msghdr msg={0};
+	struct cmsghdr *cmsg;
+	struct iovec iov;
+	char cmsgdata[CMSG_SPACE (sizeof(int)*3)];
+	int *fdptr;
+	
+	msg.msg_name=NULL;
+	msg.msg_namelen=0;
+	msg.msg_iov=&iov;
+	msg.msg_iovlen=1;
+	msg.msg_control=cmsgdata;
+	msg.msg_controllen=sizeof(cmsgdata);
+	msg.msg_flags=0;
+
+	iov.iov_base=req;
+	iov.iov_len=sizeof(WapiHandleRequest);
+
+	cmsg=CMSG_FIRSTHDR (&msg);
+	cmsg->cmsg_len=CMSG_LEN (sizeof(int)*3);
+	cmsg->cmsg_level=SOL_SOCKET;
+	cmsg->cmsg_type=SCM_RIGHTS;
+	fdptr=(int *)CMSG_DATA (cmsg);
+	fdptr[0]=in_fd;
+	fdptr[1]=out_fd;
+	fdptr[2]=err_fd;
+
+	msg.msg_controllen=CMSG_SPACE (sizeof(int)*3);
+
+	_wapi_daemon_request_response_internal (fd, &msg, resp);
+}
+
+/* Send request on fd, wait for response (called by applications, not
+ * the daemon)
+ */
+void _wapi_daemon_request_response (int fd, WapiHandleRequest *req,
+				    WapiHandleResponse *resp)
+{
+	struct msghdr msg={0};
+	struct iovec iov;
+	
+	msg.msg_name=NULL;
+	msg.msg_namelen=0;
+	msg.msg_iov=&iov;
+	msg.msg_iovlen=1;
+	msg.msg_control=NULL;
+	msg.msg_controllen=0;
+	msg.msg_flags=0;
+
+	iov.iov_base=req;
+	iov.iov_len=sizeof(WapiHandleRequest);
+
+	_wapi_daemon_request_response_internal (fd, &msg, resp);
+}
+
+/* Read request on fd (called by the daemon) */
+int _wapi_daemon_request (int fd, WapiHandleRequest *req, int *fds,
+			  gboolean *has_fds)
+{
+	int ret;
+	struct msghdr msg;
+	struct iovec iov;
+	struct cmsghdr *cmsg;
+	guchar cmsgdata[CMSG_SPACE (sizeof(int)*3)];
+	
+	msg.msg_name=NULL;
+	msg.msg_namelen=0;
+	msg.msg_iov=&iov;
+	msg.msg_iovlen=1;
+	msg.msg_control=cmsgdata;
+	msg.msg_controllen=sizeof(cmsgdata);
+	msg.msg_flags=0;
+	iov.iov_base=req;
+	iov.iov_len=sizeof(WapiHandleRequest);
+	
+#ifdef HAVE_MSG_NOSIGNAL
+	ret=recvmsg (fd, &msg, MSG_NOSIGNAL);
+#else
+	ret=recvmsg (fd, &msg, 0);
+#endif
+	if(ret==-1 || ret!= sizeof(WapiHandleRequest)) {
+		/* Make sure we dont do anything with this response */
+		req->type=WapiHandleRequestType_Error;
+		
+#ifdef DEBUG
+		g_warning (G_GNUC_PRETTY_FUNCTION ": Recv error: %s",
+			   strerror (errno));
+#endif
+		/* The next loop around poll() should tidy up */
+	}
+
+#ifdef DEBUG
+	if(msg.msg_flags & MSG_OOB) {
+		g_message (G_GNUC_PRETTY_FUNCTION ": OOB data received");
+	}
+	if(msg.msg_flags & MSG_CTRUNC) {
+		g_message (G_GNUC_PRETTY_FUNCTION ": ancillary data was truncated");
+	}
+	g_message (G_GNUC_PRETTY_FUNCTION ": msg.msg_controllen=%d",
+		   msg.msg_controllen);
+#endif
+
+	cmsg=CMSG_FIRSTHDR (&msg);
+	if(cmsg!=NULL && cmsg->cmsg_level==SOL_SOCKET &&
+	   cmsg->cmsg_type==SCM_RIGHTS) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": cmsg->cmsg_len=%d",
+			   cmsg->cmsg_len);
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": cmsg->level=%d cmsg->type=%d", cmsg->cmsg_level,
+			   cmsg->cmsg_type);
+#endif
+
+		memcpy (fds, (int *)CMSG_DATA (cmsg), sizeof(int)*3);
+		*has_fds=TRUE;
+
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": fd[0]=%d, fd[1]=%d, fd[2]=%d", fds[0], fds[1],
+			   fds[2]);
+#endif
+	} else {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": no ancillary data");
+#endif
+		*has_fds=FALSE;
+	}
+
+	return(ret);
+}
+
+/* Send response on fd (called by the daemon) */
+int _wapi_daemon_response (int fd, WapiHandleResponse *resp)
+{
+	int ret;
+	
+#ifdef HAVE_MSG_NOSIGNAL
+	ret=send (fd, resp, sizeof(WapiHandleResponse), MSG_NOSIGNAL);
+#else
+	ret=send (fd, resp, sizeof(WapiHandleResponse), 0);
+#endif
+#ifdef DEBUG
+	if(ret==-1 || ret != sizeof(WapiHandleResponse)) {
+		g_warning (G_GNUC_PRETTY_FUNCTION ": Send error: %s",
+			   strerror (errno));
+		/* The next loop around poll() should tidy up */
+	}
+#endif
+
+	return(ret);
+}
diff --git a/mono/io-layer/daemon-messages.h b/mono/io-layer/daemon-messages.h
new file mode 100644
index 00000000000..ecbf1082175
--- /dev/null
+++ b/mono/io-layer/daemon-messages.h
@@ -0,0 +1,153 @@
+/*
+ * daemon-messages.h:  Communications to and from the handle daemon
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_DAEMON_MESSAGES_H_
+#define _WAPI_DAEMON_MESSAGES_H_
+
+#include <mono/io-layer/wapi-private.h>
+
+typedef enum {
+	WapiHandleRequestType_Error,
+	WapiHandleRequestType_New,
+	WapiHandleRequestType_Open,
+	WapiHandleRequestType_Close,
+	WapiHandleRequestType_Scratch,
+	WapiHandleRequestType_ScratchFree,
+	WapiHandleRequestType_ProcessFork,
+} WapiHandleRequestType;
+
+typedef struct 
+{
+	WapiHandleType type;
+} WapiHandleRequest_New;
+
+typedef struct 
+{
+	guint32 handle;
+} WapiHandleRequest_Open;
+
+typedef struct 
+{
+	guint32 handle;
+} WapiHandleRequest_Close;
+
+typedef struct
+{
+	guint32 length;
+} WapiHandleRequest_Scratch;
+
+typedef struct
+{
+	guint32 idx;
+} WapiHandleRequest_ScratchFree;
+
+typedef struct 
+{
+	guint32 cmd;
+	guint32 args;
+	guint32 env;
+	guint32 dir;
+	guint32 stdin_handle;
+	guint32 stdout_handle;
+	guint32 stderr_handle;
+	gboolean inherit;
+	guint32 flags;
+} WapiHandleRequest_ProcessFork;
+
+typedef struct 
+{
+	WapiHandleRequestType type;
+	union 
+	{
+		WapiHandleRequest_New new;
+		WapiHandleRequest_Open open;
+		WapiHandleRequest_Close close;
+		WapiHandleRequest_Scratch scratch;
+		WapiHandleRequest_ScratchFree scratch_free;
+		WapiHandleRequest_ProcessFork process_fork;
+	} u;
+} WapiHandleRequest;
+
+typedef enum {
+	WapiHandleResponseType_Error,
+	WapiHandleResponseType_New,
+	WapiHandleResponseType_Open,
+	WapiHandleResponseType_Close,
+	WapiHandleResponseType_Scratch,
+	WapiHandleResponseType_ScratchFree,
+	WapiHandleResponseType_ProcessFork,
+} WapiHandleResponseType;
+
+typedef struct 
+{
+	guint32 reason;
+} WapiHandleResponse_Error;
+
+typedef struct 
+{
+	WapiHandleType type;
+	guint32 handle;
+} WapiHandleResponse_New;
+
+typedef struct 
+{
+	WapiHandleType type;
+	guint32 handle;
+} WapiHandleResponse_Open;
+
+typedef struct 
+{
+	gboolean destroy;
+} WapiHandleResponse_Close;
+
+typedef struct
+{
+	guint32 idx;
+} WapiHandleResponse_Scratch;
+
+typedef struct
+{
+	guint32 dummy;
+} WapiHandleResponse_ScratchFree;
+
+typedef struct
+{
+	guint32 process_handle;
+	guint32 thread_handle;
+	guint32 pid;
+	guint32 tid;
+} WapiHandleResponse_ProcessFork;
+
+typedef struct
+{
+	WapiHandleResponseType type;
+	union
+	{
+		WapiHandleResponse_Error error;
+		WapiHandleResponse_New new;
+		WapiHandleResponse_Open open;
+		WapiHandleResponse_Close close;
+		WapiHandleResponse_Scratch scratch;
+		WapiHandleResponse_ScratchFree scratch_free;
+		WapiHandleResponse_ProcessFork process_fork;
+	} u;
+} WapiHandleResponse;
+
+extern void _wapi_daemon_request_response (int fd, WapiHandleRequest *req,
+					   WapiHandleResponse *resp);
+extern void _wapi_daemon_request_response_with_fds (int fd,
+						    WapiHandleRequest *req,
+						    WapiHandleResponse *resp,
+						    int in_fd, int out_fd,
+						    int err_fd);
+extern int _wapi_daemon_request (int fd, WapiHandleRequest *req, int *fds,
+				 gboolean *has_fds);
+extern int _wapi_daemon_response (int fd, WapiHandleResponse *resp);
+
+#endif /* _WAPI_DAEMON_MESSAGES_H_ */
diff --git a/mono/io-layer/daemon-private.h b/mono/io-layer/daemon-private.h
new file mode 100644
index 00000000000..f370d3d95ba
--- /dev/null
+++ b/mono/io-layer/daemon-private.h
@@ -0,0 +1,21 @@
+/*
+ * daemon-private.h:  External daemon functions
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_DAEMON_PRIVATE_H_
+#define _WAPI_DAEMON_PRIVATE_H_
+
+typedef enum {
+	DAEMON_STARTING = 0,
+	DAEMON_RUNNING  = 1,
+	DAEMON_DIED_AT_STARTUP = 2,
+} _wapi_daemon_status;
+
+extern void _wapi_daemon_main (void);
+
+#endif /* _WAPI_DAEMON_PRIVATE_H_ */
diff --git a/mono/io-layer/daemon.c b/mono/io-layer/daemon.c
new file mode 100644
index 00000000000..fcfc7da169f
--- /dev/null
+++ b/mono/io-layer/daemon.c
@@ -0,0 +1,1020 @@
+/*
+ * daemon.c:  The handle daemon
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+
+#include <stdio.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
+#include <sys/poll.h>
+#include <stdlib.h>
+#include <unistd.h>
+#include <errno.h>
+#include <signal.h>
+#include <sys/wait.h>
+
+#include <mono/io-layer/io-layer.h>
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/daemon-messages.h>
+#include <mono/io-layer/timefuncs-private.h>
+#include <mono/io-layer/daemon-private.h>
+
+#undef DEBUG
+
+/* Keep track of the number of clients */
+static int nfds=0;
+/* Array to keep track of handles that have been referenced by the
+ * daemon.
+ */
+static guint32 *daemon_handles=NULL;
+/* The socket which we listen to new connections on */
+static int main_sock;
+
+/* Set to TRUE by the SIGCHLD signal handler */
+static volatile gboolean check_processes=FALSE;
+
+static gboolean fd_activity (GIOChannel *channel, GIOCondition condition,
+			     gpointer data);
+
+
+/* Deletes the shared memory segment.  If we're exiting on error,
+ * clients will get EPIPEs.
+ */
+static void cleanup (void)
+{
+	_wapi_shm_destroy ();
+}
+
+/* If there is only one socket, and no child processes, we can exit.
+ * We test for child processes by counting handle references held by
+ * the daemon.
+ */
+static void maybe_exit (void)
+{
+	guint32 i;
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Seeing if we should exit");
+#endif
+
+	if(nfds>1) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Still got clients");
+#endif
+		return;
+	}
+
+	for(i=0; i<_WAPI_MAX_HANDLES; i++) {
+		if(daemon_handles[i]>0) {
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": Still got handle references");
+#endif
+			return;
+		}
+	}
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Byebye");
+#endif
+
+	cleanup ();
+	exit (0);
+}
+
+/*
+ * signal_handler:
+ * @unused: unused
+ *
+ * Called if daemon receives a SIGTERM or SIGINT
+ */
+static void signal_handler (int unused)
+{
+	cleanup ();
+	exit (-1);
+}
+
+/*
+ * sigchld_handler:
+ * @unused: unused
+ *
+ * Called if daemon receives a SIGCHLD, and notes that a process needs
+ * to be wait()ed for.
+ */
+static void sigchld_handler (int unused)
+{
+	/* Notice that a child process died */
+	check_processes=TRUE;
+}
+
+/*
+ * startup:
+ *
+ * Bind signals and attach to shared memory
+ */
+static void startup (void)
+{
+	struct sigaction sa;
+	gboolean success;
+	int shm_id;
+	
+	sa.sa_handler=signal_handler;
+	sigemptyset (&sa.sa_mask);
+	sa.sa_flags=0;
+	sigaction (SIGINT, &sa, NULL);
+	sigaction (SIGTERM, &sa, NULL);
+	
+#ifndef HAVE_MSG_NOSIGNAL
+	sa.sa_handler=SIG_IGN;
+	sigaction (SIGPIPE, &sa, NULL);
+#endif
+
+	sa.sa_handler=sigchld_handler;
+	sa.sa_flags=SA_NOCLDSTOP;
+	sigaction (SIGCHLD, &sa, NULL);
+	
+	_wapi_shared_data=_wapi_shm_attach (TRUE, &success, &shm_id);
+	if(success==FALSE) {
+		g_error ("Failed to attach shared memory! (tried shared memory ID 0x%x)", shm_id);
+		exit (-1);
+	}
+
+	/* Leave the first byte NULL so we create the socket in the
+	 * abstrace namespace, not on the filesystem.  (Lets see how
+	 * portable _that_ is :)
+	 *
+	 * The name is intended to be unique, not cryptographically
+	 * secure...
+	 */
+	snprintf (_wapi_shared_data->daemon+1, MONO_SIZEOF_SUNPATH-2,
+		  "mono-handle-daemon-%d-%d-%ld", getuid (), getpid (),
+		  time (NULL));
+}
+
+
+/*
+ * ref_handle:
+ * @open_handles: An array of handles referenced by the calling client
+ * @handle: handle to inc refcnt
+ *
+ * Increase ref count of handle for the calling client.  Handle 0 is
+ * ignored.
+ */
+static void ref_handle (guint32 *open_handles, guint32 handle)
+{
+	if(handle==0) {
+		return;
+	}
+	
+	_wapi_shared_data->handles[handle].ref++;
+	open_handles[handle]++;
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION
+		   ": handle 0x%x ref now %d (%d this process)", handle,
+		   _wapi_shared_data->handles[handle].ref,
+		   open_handles[handle]);
+#endif
+}
+
+/*
+ * unref_handle:
+ * @open_handles: An array of handles referenced by the calling client
+ * @handle: handle to inc refcnt
+ *
+ * Decrease ref count of handle for the calling client. If global ref
+ * count reaches 0 it is free'ed. Return TRUE if the local ref count
+ * is 0. Handle 0 is ignored.
+ */
+static gboolean unref_handle (guint32 *open_handles, guint32 handle)
+{
+	gboolean destroy=FALSE;
+	
+	if(handle==0) {
+		return(FALSE);
+	}
+	
+	if (open_handles[handle] == 0) {
+                g_warning(G_GNUC_PRETTY_FUNCTION
+                          ": unref on %d called when ref was already 0", 
+                          handle);
+                return TRUE;
+        }
+
+	_wapi_shared_data->handles[handle].ref--;
+	open_handles[handle]--;
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION
+		   ": handle 0x%x ref now %d (%d this process)", handle,
+		   _wapi_shared_data->handles[handle].ref,
+		   open_handles[handle]);
+#endif
+
+	if(open_handles[handle]==0) {
+		/* This client has released the handle */
+		destroy=TRUE;
+	}
+	
+	if(_wapi_shared_data->handles[handle].ref==0) {
+		if (open_handles[handle]!=0) {
+			g_warning (G_GNUC_PRETTY_FUNCTION ": per-process open_handles mismatch, set to %d, should be 0", open_handles[handle]);
+		}
+		
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Destroying handle 0x%x",
+			   handle);
+#endif
+		
+		_wapi_handle_ops_close_shared (GUINT_TO_POINTER (handle));
+		
+		mono_mutex_destroy (&_wapi_shared_data->handles[handle].signal_mutex);
+		pthread_cond_destroy (&_wapi_shared_data->handles[handle].signal_cond);
+		memset (&_wapi_shared_data->handles[handle].u, '\0', sizeof(_wapi_shared_data->handles[handle].u));
+	}
+
+	if(open_handles==daemon_handles) {
+		/* The daemon released a reference, so see if it's
+		 * ready to exit
+		 */
+		maybe_exit ();
+	}
+	
+	return(destroy);
+}
+
+/*
+ * add_fd:
+ * @fd: Filehandle to add
+ *
+ * Create a new GIOChannel, and add it to the main loop event sources.
+ */
+static void add_fd(int fd)
+{
+	GIOChannel *io_channel;
+	guint32 *refs;
+	
+	io_channel=g_io_channel_unix_new (fd);
+	
+	/* Turn off all encoding and buffering crap */
+	g_io_channel_set_encoding (io_channel, NULL, NULL);
+	g_io_channel_set_buffered (io_channel, FALSE);
+	
+	refs=g_new0 (guint32, _WAPI_MAX_HANDLES);
+	if(daemon_handles==NULL) {
+		/* We rely on the daemon channel being created first.
+		 * That's safe, because every other channel is the
+		 * result of an accept() on the daemon channel.
+		 */
+		daemon_handles=refs;
+	}
+	
+	g_io_add_watch (io_channel, G_IO_IN|G_IO_ERR|G_IO_HUP|G_IO_NVAL,
+			fd_activity, refs);
+
+	nfds++;
+}
+
+/*
+ * rem_fd:
+ * @channel: GIOChannel to close
+ *
+ * Closes the IO channel. Closes all handles that it may have open. If
+ * only main_sock is left, the daemon is shut down.
+ */
+static void rem_fd(GIOChannel *channel, guint32 *open_handles)
+{
+	guint32 handle_count;
+	int i, j;
+	
+	if(g_io_channel_unix_get_fd (channel) == main_sock) {
+		/* We shouldn't be deleting the daemon's fd */
+		g_warning (G_GNUC_PRETTY_FUNCTION ": Deleting daemon fd!");
+		cleanup ();
+		exit (-1);
+	}
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Removing client fd %d",
+		   g_io_channel_unix_get_fd (channel));
+#endif
+
+	g_io_channel_shutdown (channel, TRUE, NULL);
+
+	for(i=0; i<_WAPI_MAX_HANDLES; i++) {
+		handle_count=open_handles[i];
+		
+		for(j=0; j<handle_count; j++) {
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": closing handle 0x%x for client at index %d", i, g_io_channel_unix_get_fd (channel));
+#endif
+			/* Ignore the hint to the client to destroy
+			 * the handle private data
+			 */
+			unref_handle (open_handles, i);
+		}
+	}
+	
+	g_free (open_handles);
+	
+	nfds--;
+	if(nfds==1) {
+		/* Just the master socket left, so see if we can
+		 * cleanup and exit
+		 */
+		maybe_exit ();
+	}
+}
+
+static gboolean process_compare (gpointer handle, gpointer user_data)
+{
+	struct _WapiHandle_process *process_handle;
+	gboolean ok;
+	pid_t pid;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_PROCESS,
+				(gpointer *)&process_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up process handle %p", handle);
+		return(FALSE);
+	}
+
+	pid=GPOINTER_TO_UINT (user_data);
+	if(process_handle->id==pid) {
+		return(TRUE);
+	} else {
+		return(FALSE);
+	}
+}
+
+static gboolean process_thread_compare (gpointer handle, gpointer user_data)
+{
+	struct _WapiHandle_thread *thread_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
+				(gpointer *)&thread_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up thread handle %p", handle);
+		return(FALSE);
+	}
+
+	if(thread_handle->process_handle==user_data) {
+		/* Signal the handle.  Don't use
+		 * _wapi_handle_set_signal_state() unless we have
+		 * process-shared pthread support.
+		 */
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Set thread handle %p signalled, because its process died", handle);
+#endif
+
+		thread_handle->exitstatus=0;
+
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+		_wapi_handle_lock_handle (handle);
+		_wapi_handle_set_signal_state (handle, TRUE, TRUE);
+		_wapi_handle_unlock_handle (handle);
+#else
+		/* Just tweak the signal state directly.  This is not
+		 * recommended behaviour, but it works for threads
+		 * because they can never become unsignalled.  There
+		 * are some nasty kludges in the handle waiting code
+		 * to cope with missing condition signals for when
+		 * process-shared pthread support is missing.
+		 */
+		_wapi_shared_data->handles[GPOINTER_TO_UINT (handle)].signalled=TRUE;
+#endif /* _POSIX_THREAD_PROCESS_SHARED */
+	}
+	
+	/* Return false to keep searching */
+	return(FALSE);
+}
+
+/* Find the handle associated with pid, mark it dead and record exit
+ * status.  Finds all thread handles associated with this process
+ * handle, and marks those signalled too, with exitstatus '0'.  It
+ * also drops the daemon's reference to the handle, and the thread
+ * pointed at by main_thread.
+ */
+static void process_post_mortem (pid_t pid, int status)
+{
+	gpointer process_handle;
+	struct _WapiHandle_process *process_handle_data;
+	
+	process_handle=_wapi_search_handle (WAPI_HANDLE_PROCESS,
+					    process_compare,
+					    GUINT_TO_POINTER (pid),
+					    (gpointer *)&process_handle_data,
+					    NULL);
+	if(process_handle==0) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": Couldn't find handle for process %d!", pid);
+	} else {
+		/* Signal the handle.  Don't use
+		 * _wapi_handle_set_signal_state() unless we have
+		 * process-shared pthread support.
+		 */
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": Set process %d exitstatus to %d", pid,
+			   WEXITSTATUS (status));
+#endif
+		
+		/* Technically WEXITSTATUS is only valid if the
+		 * process exited normally, but I don't care if the
+		 * process caught a signal or not.
+		 */
+		process_handle_data->exitstatus=WEXITSTATUS (status);
+		_wapi_time_t_to_filetime (time (NULL),
+					  &process_handle_data->exit_time);
+
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+		_wapi_handle_lock_handle (process_handle);
+		_wapi_handle_set_signal_state (process_handle, TRUE, TRUE);
+		_wapi_handle_unlock_handle (process_handle);
+#else
+		/* Just tweak the signal state directly.  This is not
+		 * recommended behaviour, but it works for processes
+		 * because they can never become unsignalled.  There
+		 * are some nasty kludges in the handle waiting code
+		 * to cope with missing condition signals for when
+		 * process-shared pthread support is missing.
+		 */
+		_wapi_shared_data->handles[GPOINTER_TO_UINT (process_handle)].signalled=TRUE;
+#endif /* _POSIX_THREAD_PROCESS_SHARED */
+	}
+
+	/* Find all threads that have their process
+	 * handle==process_handle.  Ignore the return value, all the
+	 * work will be done in the compare func
+	 */
+	(void)_wapi_search_handle (WAPI_HANDLE_THREAD, process_thread_compare,
+				   process_handle, NULL, NULL);
+
+	unref_handle (daemon_handles,
+		      GPOINTER_TO_UINT (process_handle_data->main_thread));
+	unref_handle (daemon_handles, GPOINTER_TO_UINT (process_handle));
+}
+
+static void process_died (void)
+{
+	int status;
+	pid_t pid;
+	
+	check_processes=FALSE;
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Reaping processes");
+#endif
+
+	while(TRUE) {
+		pid=waitpid (-1, &status, WNOHANG);
+		if(pid==0 || pid==-1) {
+			/* Finished waiting.  I was checking pid==-1
+			 * separately but was getting ECHILD when
+			 * there were no more child processes (which
+			 * doesnt seem to conform to the man page)
+			 */
+			return;
+		} else {
+			/* pid contains the ID of a dead process */
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": process %d reaped", pid);
+#endif
+			process_post_mortem (pid, status);
+		}
+	}
+}
+
+
+/*
+ * send_reply:
+ * @channel: channel to send reply to
+ * @resp: Package to send
+ *
+ * Send a package to a client
+ */
+static void send_reply (GIOChannel *channel, WapiHandleResponse *resp)
+{
+	/* send message */
+	_wapi_daemon_response (g_io_channel_unix_get_fd (channel), resp);
+}
+
+/*
+ * process_new:
+ * @channel: The client making the request
+ * @open_handles: An array of handles referenced by this client
+ * @type: type to init handle to
+ *
+ * Find a free handle and initialize it to 'type', increase refcnt and
+ * send back a reply to the client.
+ */
+static void process_new (GIOChannel *channel, guint32 *open_handles,
+			 WapiHandleType type)
+{
+	guint32 handle;
+	WapiHandleResponse resp;
+	
+	/* handle might be set to 0.  This is handled at the client end */
+	handle=_wapi_handle_new_internal (type);
+	ref_handle (open_handles, handle);
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": returning new handle 0x%x",
+		   handle);
+#endif
+
+	resp.type=WapiHandleResponseType_New;
+	resp.u.new.type=type;
+	resp.u.new.handle=handle;
+			
+	send_reply (channel, &resp);
+}
+
+/*
+ * process_open:
+ * @channel: The client making the request
+ * @open_handles: An array of handles referenced by this client
+ * @handle: handle no.
+ *
+ * Increase refcnt on a previously created handle and send back a
+ * response to the client.
+ */
+static void process_open (GIOChannel *channel, guint32 *open_handles,
+			  guint32 handle)
+{
+	WapiHandleResponse resp;
+	struct _WapiHandleShared *shared=&_wapi_shared_data->handles[handle];
+		
+	if(shared->type!=WAPI_HANDLE_UNUSED && handle!=0) {
+		ref_handle (open_handles, handle);
+
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": returning new handle 0x%x", handle);
+#endif
+
+		resp.type=WapiHandleResponseType_Open;
+		resp.u.new.type=shared->type;
+		resp.u.new.handle=handle;
+			
+		send_reply (channel, &resp);
+
+		return;
+	}
+
+	resp.type=WapiHandleResponseType_Open;
+	resp.u.new.handle=0;
+			
+	send_reply (channel, &resp);
+}
+
+/*
+ * process_close:
+ * @channel: The client making the request
+ * @open_handles: An array of handles referenced by this client
+ * @handle: handle no.
+ *
+ * Decrease refcnt on a previously created handle and send back a
+ * response to the client with notice of it being destroyed.
+ */
+static void process_close (GIOChannel *channel, guint32 *open_handles,
+			   guint32 handle)
+{
+	WapiHandleResponse resp;
+	
+	resp.type=WapiHandleResponseType_Close;
+	resp.u.close.destroy=unref_handle (open_handles, handle);
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": unreffing handle 0x%x", handle);
+#endif
+			
+	send_reply (channel, &resp);
+}
+
+/*
+ * process_scratch:
+ * @channel: The client making the request
+ * @length: allocate this much scratch space
+ *
+ * Allocate some scratch space and send a reply to the client.
+ */
+static void process_scratch (GIOChannel *channel, guint32 length)
+{
+	WapiHandleResponse resp;
+	
+	resp.type=WapiHandleResponseType_Scratch;
+	resp.u.scratch.idx=_wapi_handle_scratch_store_internal (length);
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": allocating scratch index 0x%x",
+		   resp.u.scratch.idx);
+#endif
+			
+	send_reply (channel, &resp);
+}
+
+/*
+ * process_scratch_free:
+ * @channel: The client making the request
+ * @scratch_idx: deallocate this scratch space
+ *
+ * Deallocate scratch space and send a reply to the client.
+ */
+static void process_scratch_free (GIOChannel *channel, guint32 scratch_idx)
+{
+	WapiHandleResponse resp;
+	
+	resp.type=WapiHandleResponseType_ScratchFree;
+	_wapi_handle_scratch_delete_internal (scratch_idx);
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": deleting scratch index 0x%x",
+		   scratch_idx);
+#endif
+			
+	send_reply (channel, &resp);
+}
+
+/*
+ * process_process_fork:
+ * @channel: The client making the request
+ * @open_handles: An array of handles referenced by this client
+ * @process_fork: Describes the process to fork
+ * @fds: stdin, stdout, and stderr for the new process
+ *
+ * Forks a new process, and returns the process and thread data to the
+ * client.
+ */
+static void process_process_fork (GIOChannel *channel, guint32 *open_handles,
+				  WapiHandleRequest_ProcessFork process_fork,
+				  int *fds)
+{
+	WapiHandleResponse resp;
+	guint32 process_handle, thread_handle;
+	struct _WapiHandle_process *process_handle_data;
+	struct _WapiHandle_thread *thread_handle_data;
+	pid_t pid;
+	
+	resp.type=WapiHandleResponseType_ProcessFork;
+	
+	/* Create handles first, so the child process can store exec
+	 * errors.  Either handle might be set to 0, if this happens
+	 * just reply to the client without bothering to fork.  The
+	 * client must check if either handle is 0 and take
+	 * appropriate error handling action.
+	 */
+	process_handle=_wapi_handle_new_internal (WAPI_HANDLE_PROCESS);
+	ref_handle (daemon_handles, process_handle);
+	ref_handle (open_handles, process_handle);
+	
+	thread_handle=_wapi_handle_new_internal (WAPI_HANDLE_THREAD);
+	ref_handle (daemon_handles, thread_handle);
+	ref_handle (open_handles, thread_handle);
+	
+	if(process_handle==0 || thread_handle==0) {
+		/* unref_handle() copes with the handle being 0 */
+		unref_handle (daemon_handles, process_handle);
+		unref_handle (open_handles, process_handle);
+		unref_handle (daemon_handles, thread_handle);
+		unref_handle (open_handles, thread_handle);
+		process_handle=0;
+		thread_handle=0;
+	} else {
+		char *cmd=NULL, *args=NULL;
+			
+		/* Get usable copies of the cmd and args now rather
+		 * than in the child process.  This is to prevent the
+		 * race condition where the parent can return the
+		 * reply to the client, which then promptly deletes
+		 * the scratch data before the new process gets to see
+		 * it.
+		 */
+		cmd=_wapi_handle_scratch_lookup_as_string (process_fork.cmd);
+		if(process_fork.args!=0) {
+			args=_wapi_handle_scratch_lookup_as_string (process_fork.args);
+		}
+
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": forking");
+#endif
+
+		_wapi_lookup_handle (GUINT_TO_POINTER (process_handle),
+				     WAPI_HANDLE_PROCESS,
+				     (gpointer *)&process_handle_data, NULL);
+
+		_wapi_lookup_handle (GUINT_TO_POINTER (thread_handle),
+				     WAPI_HANDLE_THREAD,
+				     (gpointer *)&thread_handle_data, NULL);
+
+		/* Fork, exec cmd with args and optional env, and
+		 * return the handles with pid and blank thread id
+		 */
+		pid=fork ();
+		if(pid==-1) {
+			process_handle_data->exec_errno=errno;
+		} else if (pid==0) {
+			/* child */
+			char **argv, *full_args;
+			GError *gerr=NULL;
+			gboolean ret;
+			int i;
+				
+			/* should we detach from the process group? 
+			 * We're already running without a controlling
+			 * tty...
+			 */
+
+			/* Connect stdin, stdout and stderr */
+			dup2 (fds[0], 0);
+			dup2 (fds[1], 1);
+			dup2 (fds[2], 2);
+
+			if(process_fork.inherit!=TRUE) {
+				/* FIXME: do something here */
+			}
+				
+			/* Close all file descriptors */
+			for(i=3; i<getdtablesize (); i++) {
+				close (i);
+			}
+			
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": exec()ing [%s] args [%s]", cmd, args);
+#endif		
+		
+			if(args!=NULL) {
+				full_args=g_strconcat (cmd, " ", args, NULL);
+			} else {
+				full_args=g_strdup (cmd);
+			}
+			ret=g_shell_parse_argv (full_args, NULL, &argv, &gerr);
+			
+			g_free (full_args);
+
+			if(ret==FALSE) {
+				/* FIXME: Could do something with the
+				 * GError here
+				 */
+				process_handle_data->exec_errno=gerr->code;
+				exit (-1);
+			}
+			
+
+#ifdef DEBUG
+			{
+				i=0;
+				while(argv[i]!=NULL) {
+					g_message ("arg %d: [%s]", i, argv[i]);
+					i++;
+				}
+			}
+#endif
+			
+			
+			/* exec */
+			execv (cmd, argv);
+		
+			/* bummer! */
+			process_handle_data->exec_errno=errno;
+			exit (-1);
+		}
+		/* parent */
+		
+		/* store pid */
+		process_handle_data->id=pid;
+		process_handle_data->main_thread=GUINT_TO_POINTER (thread_handle);
+		_wapi_time_t_to_filetime (time (NULL),
+					  &process_handle_data->create_time);
+		
+		/* FIXME: if env==0, inherit the env from the current
+		 * process
+		 */
+		process_handle_data->env=process_fork.env;
+
+		thread_handle_data->process_handle=GUINT_TO_POINTER (process_handle);
+
+		resp.u.process_fork.pid=pid;
+	}
+			
+	resp.u.process_fork.process_handle=process_handle;
+	resp.u.process_fork.thread_handle=thread_handle;
+
+	send_reply (channel, &resp);
+}
+
+/*
+ * read_message:
+ * @channel: The client to read the request from
+ * @open_handles: An array of handles referenced by this client
+ *
+ * Read a message (A WapiHandleRequest) from a client and dispatch
+ * whatever it wants to the process_* calls.
+ */
+static void read_message (GIOChannel *channel, guint32 *open_handles)
+{
+	WapiHandleRequest req;
+	int fds[3]={0, 1, 2};
+	int ret;
+	gboolean has_fds=FALSE;
+	
+	/* Reading data */
+	ret=_wapi_daemon_request (g_io_channel_unix_get_fd (channel), &req,
+				  fds, &has_fds);
+	if(ret==0) {
+		/* Other end went away */
+#ifdef DEBUG
+		g_message ("Read 0 bytes on fd %d, closing it",
+			   g_io_channel_unix_get_fd (channel));
+#endif
+
+		rem_fd (channel, open_handles);
+		return;
+	}
+	
+	switch(req.type) {
+	case WapiHandleRequestType_New:
+		process_new (channel, open_handles, req.u.new.type);
+		break;
+	case WapiHandleRequestType_Open:
+#ifdef DEBUG
+		g_assert(req.u.open.handle < _WAPI_MAX_HANDLES);
+#endif
+		process_open (channel, open_handles, req.u.open.handle);
+		break;
+	case WapiHandleRequestType_Close:
+#ifdef DEBUG
+		g_assert(req.u.close.handle < _WAPI_MAX_HANDLES);
+#endif
+		process_close (channel, open_handles, req.u.close.handle);
+		break;
+	case WapiHandleRequestType_Scratch:
+		process_scratch (channel, req.u.scratch.length);
+		break;
+	case WapiHandleRequestType_ScratchFree:
+		process_scratch_free (channel, req.u.scratch_free.idx);
+		break;
+	case WapiHandleRequestType_ProcessFork:
+		process_process_fork (channel, open_handles,
+				      req.u.process_fork, fds);
+		break;
+	case WapiHandleRequestType_Error:
+		/* fall through */
+	default:
+		/* Catch bogus requests */
+		/* FIXME: call rem_fd? */
+		break;
+	}
+
+	if(has_fds==TRUE) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": closing %d", fds[0]);
+		g_message (G_GNUC_PRETTY_FUNCTION ": closing %d", fds[1]);
+		g_message (G_GNUC_PRETTY_FUNCTION ": closing %d", fds[2]);
+#endif
+		
+		close (fds[0]);
+		close (fds[1]);
+		close (fds[2]);
+	}
+}
+
+/*
+ * fd_activity:
+ * @channel: The IO channel that is active
+ * @condition: The condition that has been satisfied
+ * @data: A pointer to an array of handles referenced by this client
+ *
+ * The callback called by the main loop when there is activity on an
+ * IO channel.
+ */
+static gboolean fd_activity (GIOChannel *channel, GIOCondition condition,
+			     gpointer data)
+{
+	if(condition & (G_IO_HUP | G_IO_ERR | G_IO_NVAL)) {
+#ifdef DEBUG
+		g_message ("fd %d error", g_io_channel_unix_get_fd (channel));
+#endif
+
+		rem_fd (channel, data);
+		return(FALSE);
+	}
+
+	if(condition & (G_IO_IN | G_IO_PRI)) {
+		if(g_io_channel_unix_get_fd (channel)==main_sock) {
+			int newsock;
+			struct sockaddr addr;
+			socklen_t addrlen=sizeof(struct sockaddr);
+			
+			newsock=accept (main_sock, &addr, &addrlen);
+			if(newsock==-1) {
+				g_critical ("accept error: %s", strerror (errno));
+				cleanup ();
+				exit (-1);
+			}
+
+#ifdef DEBUG
+			g_message ("accept returning %d", newsock);
+#endif
+
+			add_fd (newsock);
+		} else {
+#ifdef DEBUG
+			g_message ("reading data on fd %d",
+				   g_io_channel_unix_get_fd (channel));
+#endif
+
+			read_message (channel, data);
+		}
+		return(TRUE);
+	}
+	
+	return(FALSE);	/* remove source */
+}
+
+/*
+ * _wapi_daemon_main:
+ *
+ * Open socket, create shared mem segment and begin listening for
+ * clients.
+ */
+void _wapi_daemon_main(void)
+{
+	struct sockaddr_un main_socket_address;
+	int ret;
+
+#ifdef DEBUG
+	g_message ("Starting up...");
+#endif
+
+	startup ();
+	
+	main_sock=socket(PF_UNIX, SOCK_STREAM, 0);
+
+	main_socket_address.sun_family=AF_UNIX;
+	memcpy(main_socket_address.sun_path, _wapi_shared_data->daemon,
+	       MONO_SIZEOF_SUNPATH);
+
+	ret=bind(main_sock, (struct sockaddr *)&main_socket_address,
+		 sizeof(struct sockaddr_un));
+	if(ret==-1) {
+		g_critical ("bind failed: %s", strerror (errno));
+		_wapi_shared_data->daemon_running=DAEMON_DIED_AT_STARTUP;
+		exit(-1);
+	}
+
+#ifdef DEBUG
+	g_message("bound");
+#endif
+
+	ret=listen(main_sock, 5);
+	if(ret==-1) {
+		g_critical ("listen failed: %s", strerror (errno));
+		_wapi_shared_data->daemon_running=DAEMON_DIED_AT_STARTUP;
+		exit(-1);
+	}
+
+#ifdef DEBUG
+	g_message("listening");
+#endif
+
+	add_fd(main_sock);
+
+	/* We're finished setting up, let everyone else know we're
+	 * ready.  From now on, it's up to us to delete the shared
+	 * memory segment when appropriate.
+	 */
+	_wapi_shared_data->daemon_running=DAEMON_RUNNING;
+
+	while(TRUE) {
+		if(check_processes==TRUE) {
+			process_died ();
+		}
+		
+#ifdef DEBUG
+		g_message ("polling");
+#endif
+
+		/* Block until something happens. We don't use
+		 * g_main_loop_run() because we rely on the SIGCHLD
+		 * signal interrupting poll() so we can reap child
+		 * processes as soon as they die, without burning cpu
+		 * time by polling the flag.
+		 */
+		g_main_context_iteration (g_main_context_default (), TRUE);
+	}
+}
+
diff --git a/mono/io-layer/error.c b/mono/io-layer/error.c
index 462df564016..4e91047580c 100644
--- a/mono/io-layer/error.c
+++ b/mono/io-layer/error.c
@@ -1,3 +1,12 @@
+/*
+ * error.c:  Error reporting
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <pthread.h>
@@ -5,7 +14,7 @@
 #include "mono/io-layer/wapi.h"
 
 static pthread_key_t error_key;
-static pthread_once_t error_key_once=PTHREAD_ONCE_INIT;
+static mono_once_t error_key_once=MONO_ONCE_INIT;
 
 static void error_init(void)
 {
@@ -25,7 +34,7 @@ guint32 GetLastError(void)
 	guint32 err;
 	void *errptr;
 	
-	pthread_once(&error_key_once, error_init);
+	mono_once(&error_key_once, error_init);
 	errptr=pthread_getspecific(error_key);
 	err=GPOINTER_TO_UINT(errptr);
 	
@@ -41,6 +50,6 @@ guint32 GetLastError(void)
 void SetLastError(guint32 code)
 {
 	/* Set the thread-local error code */
-	pthread_once(&error_key_once, error_init);
+	mono_once(&error_key_once, error_init);
 	pthread_setspecific(error_key, GUINT_TO_POINTER(code));
 }
diff --git a/mono/io-layer/error.h b/mono/io-layer/error.h
index f900a7172a3..e07156d0d36 100644
--- a/mono/io-layer/error.h
+++ b/mono/io-layer/error.h
@@ -1,3 +1,12 @@
+/*
+ * error.h:  Error reporting
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_ERROR_H_
 #define _WAPI_ERROR_H_
 
diff --git a/mono/io-layer/event-private.h b/mono/io-layer/event-private.h
new file mode 100644
index 00000000000..e0046554f11
--- /dev/null
+++ b/mono/io-layer/event-private.h
@@ -0,0 +1,31 @@
+/*
+ * event-private.h:  Private definitions for event handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_EVENT_PRIVATE_H_
+#define _WAPI_EVENT_PRIVATE_H_
+
+#include <config.h>
+#include <glib.h>
+#include <pthread.h>
+
+#include <mono/io-layer/mono-mutex.h>
+
+extern struct _WapiHandleOps _wapi_event_ops;
+
+struct _WapiHandle_event
+{
+	gboolean manual;
+};
+
+struct _WapiHandlePrivate_event
+{
+	int dummy;
+};
+
+#endif /* _WAPI_EVENT_PRIVATE_H_ */
diff --git a/mono/io-layer/events.c b/mono/io-layer/events.c
index 748ec8824ed..60dfea7299e 100644
--- a/mono/io-layer/events.c
+++ b/mono/io-layer/events.c
@@ -1,450 +1,92 @@
+/*
+ * events.c:  Event handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <pthread.h>
 #include <string.h>
 
-#include "mono/io-layer/wapi.h"
-#include "wapi-private.h"
-#include "wait-private.h"
-#include "handles-private.h"
-#include "misc-private.h"
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/misc-private.h>
+
+#include <mono/io-layer/mono-mutex.h>
 
-#include "mono-mutex.h"
+#include <mono/io-layer/event-private.h>
 
 #undef DEBUG
 
-/* event_wait() uses the event-private condition to signal that the
- * event has been set
- *
- * Hold mutex before setting the event, and before the final test
- * Hold rwlock for reading while testing the event
- * Hold rwlock for writing before resetting the event
- */
-struct _WapiHandle_event
-{
-	WapiHandle handle;
-	mono_mutex_t mutex;
-	pthread_cond_t cond;
-	pthread_rwlock_t rwlock;
-	gboolean manual;
-};
+static void event_close_shared (gpointer handle);
+static void event_signal(gpointer handle);
+static void event_own (gpointer handle);
 
-/* event_wait_multiple() uses the global condition to signal that an
- * event has been set
- */
-static mono_mutex_t event_signal_mutex = MONO_MUTEX_INITIALIZER;
-static pthread_cond_t event_signal_cond = PTHREAD_COND_INITIALIZER;
-
-static void event_close(WapiHandle *handle);
-static gboolean event_wait(WapiHandle *handle, WapiHandle *signal, guint32 ms);
-static guint32 event_wait_multiple(gpointer data);
-static void event_signal(WapiHandle *handle);
-
-static struct _WapiHandleOps event_ops = {
-	event_close,		/* close */
-	NULL,			/* getfiletype */
-	NULL,			/* readfile */
-	NULL,			/* writefile */
-	NULL,			/* seek */
-	NULL,			/* setendoffile */
-	NULL,			/* getfilesize */
-	NULL,			/* getfiletime */
-	NULL,			/* setfiletime */
-	event_wait,		/* wait */
-	event_wait_multiple,	/* wait_multiple */
+struct _WapiHandleOps _wapi_event_ops = {
+	event_close_shared,	/* close_shared */
+	NULL,			/* close_private */
 	event_signal,		/* signal */
+	event_own,		/* own */
+	NULL,			/* is_owned */
 };
 
-static void event_close(WapiHandle *handle)
-{
-	struct _WapiHandle_event *event_handle=(struct _WapiHandle_event *)handle;
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": closing event handle %p",
-		  event_handle);
-#endif
+static mono_once_t event_ops_once=MONO_ONCE_INIT;
 
-	mono_mutex_destroy(&event_handle->mutex);
-	pthread_cond_destroy(&event_handle->cond);
-	pthread_rwlock_destroy(&event_handle->rwlock);
+static void event_ops_init (void)
+{
+	_wapi_handle_register_capabilities (WAPI_HANDLE_EVENT,
+					    WAPI_HANDLE_CAP_WAIT |
+					    WAPI_HANDLE_CAP_SIGNAL);
 }
 
-static gboolean event_wait(WapiHandle *handle, WapiHandle *signal, guint32 ms)
+static void event_close_shared(gpointer handle)
 {
-	struct _WapiHandle_event *event_handle=(struct _WapiHandle_event *)handle;
-	struct timespec timeout;
-	int ret;
-
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": waiting on event handle %p for %d ms", handle, ms);
-#endif
-
-	mono_mutex_lock(&event_handle->mutex);
-
-	/* Signal this handle after we have obtained the event lock */
-	if(signal!=NULL) {
-		signal->ops->signal(signal);
-	}
-	
-	/* First check if the handle is already signalled */
-	if(handle->signalled==TRUE) {
-		/* If this is an auto-reset event, reset the state to
-		 * unsignalled
-		 */
-	
-#ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION
-			  ": event handle %p already signalled", handle);
-#endif
-
-		if(event_handle->manual==FALSE) {
-#ifdef DEBUG
-			g_message(G_GNUC_PRETTY_FUNCTION
-				  ": resetting auto event handle %p", handle);
-#endif
-			handle->signalled=FALSE;
-		}
-		mono_mutex_unlock(&event_handle->mutex);
-		
-		return(TRUE);
-	}
-
-	/* We'll have to wait for it then */
-	if(ms!=INFINITE) {
-		_wapi_calc_timeout(&timeout, ms);
-	}
-	
-again:
-	/* Acquire a read lock so that the signal status can't be
-	 * reset without us noticing. (PulseEvent and ResetEvent will
-	 * gain a write lock before changing the status to
-	 * unsignalled, which will block while one or more threads
-	 * hold a read lock.)
-	 */
-	pthread_rwlock_rdlock(&event_handle->rwlock);
-		
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": waiting for event handle %p to be signalled", handle);
-#endif
-
-	if(ms==INFINITE) {
-		ret=mono_cond_wait(&event_handle->cond,
-				   &event_handle->mutex);
-	} else {
-		ret=mono_cond_timedwait(&event_handle->cond,
-					&event_handle->mutex, &timeout);
-	}
-
-	if(ret==0) {
-		/* Condition was signalled, so hopefully event is
-		 * signalled now.  (It might not be if its an
-		 * auto-reset event and someone else got in before
-		 * us.)
-		 */
-	
-#ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": event handle %p signalled",
-			  handle);
-#endif
-		if(handle->signalled==TRUE) {
-	
-#ifdef DEBUG
-			g_message(G_GNUC_PRETTY_FUNCTION
-				  ": event handle %p still signalled", handle);
-#endif
-			/* If this is an auto-reset event, reset the
-			 * state to unsignalled
-			 */
-			if(event_handle->manual==FALSE) {
-#ifdef DEBUG
-				g_message(G_GNUC_PRETTY_FUNCTION
-					  ": resetting auto event handle %p",
-					  handle);
-#endif
-				handle->signalled=FALSE;
-			}
-			pthread_rwlock_unlock(&event_handle->rwlock);
-			mono_mutex_unlock(&event_handle->mutex);
-			
-			return(TRUE);
-		}
-	
-#ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION
-			  ": event handle %p no longer signalled", handle);
-#endif
-
-		/* Better luck next time */
-		
-		/* Drop the rwlock briefly so that another thread has
-		 * a chance to reset the event
-		 */
-		pthread_rwlock_unlock(&event_handle->rwlock);
-		goto again;
+	struct _WapiHandle_event *event_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_EVENT,
+				(gpointer *)&event_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up event handle %p", handle);
+		return;
 	}
-
-	/* Timeout or other error */
 	
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": wait on event handle %p error: %s", handle,
-		  strerror(ret));
+	g_message(G_GNUC_PRETTY_FUNCTION ": closing event handle %p", handle);
 #endif
-	
-	pthread_rwlock_unlock(&event_handle->rwlock);
-	mono_mutex_unlock(&event_handle->mutex);
-	
-	return(FALSE);
 }
 
-static gboolean event_count_signalled(WaitQueueItem *item, guint32 numhandles,
-				      gboolean waitall, guint32 *retcount)
+static void event_signal(gpointer handle)
 {
-	guint32 count, i;
-	gboolean ret;
-	
-	/* Lock all the handles, with backoff */
-again:
-	for(i=0; i<numhandles; i++) {
-		struct _WapiHandle_event *event_handle;
-		
-		event_handle=g_ptr_array_index(
-			item->handles[WAPI_HANDLE_EVENT], i);
-		
-		ret=mono_mutex_trylock(&event_handle->mutex);
-		if(ret!=0) {
-			/* Bummer */
-			while(i--) {
-				event_handle=g_ptr_array_index(
-					item->handles[WAPI_HANDLE_EVENT], i);
-				mono_mutex_unlock(&event_handle->mutex);
-			}
-
-			/* It's not possible for two threads calling
-			 * WaitForMultipleObjects to both be calling
-			 * this function simultaneously, because the
-			 * global event_signal_mutex is held.
-			 * Therefore any collision is with a single
-			 * lock from one of the functions that deal
-			 * with single event handles.  It's just about
-			 * theoretically possible for the other
-			 * threads to keep locking an event in a tight
-			 * loop but eventually we will get the lock.
-			 */
-			sched_yield();
-			
-			goto again;
-		}
-	}
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Locked all event handles");
-#endif
-	
-	count=_wapi_handle_count_signalled(item, WAPI_HANDLE_EVENT);
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": %d event handles signalled",
-		  count);
-#endif
-	
-	if((waitall==TRUE && count==numhandles) ||
-	   (waitall==FALSE && count>0)) {
-		/* done */
-		ret=TRUE;
-	} else {
-		ret=FALSE;
-	}
-	
-	for(i=0; i<numhandles; i++) {
-		struct _WapiHandle_event *event_handle;
-		
-		event_handle=g_ptr_array_index(
-			item->handles[WAPI_HANDLE_EVENT], i);
-		
-		mono_mutex_unlock(&event_handle->mutex);
-	}
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Returning %d", ret);
-#endif
-
-	*retcount=count;
-	return(ret);
+	ResetEvent(handle);
 }
 
-static guint32 event_wait_multiple(gpointer data)
+static void event_own (gpointer handle)
 {
-	WaitQueueItem *item=(WaitQueueItem *)data;
-	struct timespec timeout;
-	guint32 iterations;
-	guint32 numhandles, count, i;
-	gboolean done;
-	int ret;
-
-	numhandles=item->handles[WAPI_HANDLE_EVENT]->len;
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": waiting on %d event handles for %d ms", numhandles,
-		  item->timeout);
-#endif
-
-	/* First, check if any of the handles are already
-	 * signalled. If waitall is specified we only return if all
-	 * handles have been signalled.
-	 */
-	done=event_count_signalled(item, numhandles, item->waitall, &count);
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Preliminary check found %d handles signalled", count);
-#endif
-
-	if(done==TRUE) {
-		item->waited[WAPI_HANDLE_EVENT]=TRUE;
-		item->waitcount[WAPI_HANDLE_EVENT]=count;
-		
-		return(count);
+	struct _WapiHandle_event *event_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_EVENT,
+				(gpointer *)&event_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up event handle %p", handle);
+		return;
 	}
 	
-	/* We'll have to wait then */
-	
-	mono_mutex_lock(&event_signal_mutex);
-	
-	iterations=0;
-	do {
-		iterations++;
-		
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Wait iteration %d",
-			  iterations);
+	g_message(G_GNUC_PRETTY_FUNCTION ": owning event handle %p", handle);
 #endif
 
-		/* If the timeout isnt INFINITE but greater than 1s,
-		 * split the timeout into 1s chunks.
-		 *
-		 * This is so that ResetEvent() wont block forever if
-		 * another thread is waiting on multiple events, with
-		 * some already signalled, and ResetEvent() wants to
-		 * reset one of the signalled ones.  (1s is a bit of a
-		 * long wait too, this might need to be tuned.)
-		 */
-
-		if((item->timeout!=INFINITE) &&
-		   (item->timeout < (iterations*1000))) {
-			_wapi_calc_timeout(
-				&timeout, item->timeout-((iterations-1)*1000));
-		} else {
-			_wapi_calc_timeout(&timeout, 1000);
-		}
-		
-		/* Acquire a read lock on all handles so that the
-		 * signal status can't be reset without us
-		 * noticing. (PulseEvent and ResetEvent will gain a
-		 * write lock before changing the status to
-		 * unsignalled, which will block while one or more
-		 * threads hold a read lock.)
-		 */
-		for(i=0; i<numhandles; i++) {
-			struct _WapiHandle_event *event_handle;
-			
-			event_handle=g_ptr_array_index(
-				item->handles[WAPI_HANDLE_EVENT], i);
-			
-			pthread_rwlock_rdlock(&event_handle->rwlock);
-		}
-		
-		ret=mono_cond_timedwait(&event_signal_cond,
-					   &event_signal_mutex, &timeout);
-
-		if(ret==0) {
-			/* Condition was signalled, so hopefully an
-			 * event is signalled now.  (It might not be
-			 * if it was an auto-reset event and someone
-			 * else got in before us.)
-			 */
-			done=event_count_signalled(item, numhandles,
-						   item->waitall, &count);
-	
-#ifdef DEBUG
-			g_message(G_GNUC_PRETTY_FUNCTION
-				  ": signal check found %d handles signalled",
-				  count);
-#endif
-			
-			if(done==TRUE) {
-#ifdef DEBUG
-				g_message(G_GNUC_PRETTY_FUNCTION
-					  ": Returning wait success");
-#endif
-
-				for(i=0; i<numhandles; i++) {
-					struct _WapiHandle_event *event_handle;
-				
-					event_handle=g_ptr_array_index(item->handles[WAPI_HANDLE_EVENT], i);
-			
-					pthread_rwlock_unlock(&event_handle->rwlock);
-				}
-
-				item->waited[WAPI_HANDLE_EVENT]=TRUE;
-				item->waitcount[WAPI_HANDLE_EVENT]=count;
-				
-				return(count);
-			}
-		} else {
-#ifdef DEBUG
-			g_message(G_GNUC_PRETTY_FUNCTION ": Wait error %s",
-				  strerror(ret));
-#endif
-		}
-
-#ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION
-			  ": Still waiting for more event handles");
-#endif
-		/* Drop the rwlocks briefly so that another thread has
-		 * a chance to reset any of the events
-		 */
-		for(i=0; i<numhandles; i++) {
-			struct _WapiHandle_event *event_handle;
-				
-			event_handle=g_ptr_array_index(
-				item->handles[WAPI_HANDLE_EVENT], i);
-			
-			pthread_rwlock_unlock(&event_handle->rwlock);
-		}
-	} while((item->timeout==INFINITE) ||
-		(item->timeout > (iterations * 1000)));
-
-	/* Timeout or other error */
-	
-	for(i=0; i<numhandles; i++) {
-		struct _WapiHandle_event *event_handle;
-		
-		event_handle=g_ptr_array_index(
-			item->handles[WAPI_HANDLE_EVENT], i);
-		
-		pthread_rwlock_unlock(&event_handle->rwlock);
+	if(event_handle->manual==FALSE) {
+		_wapi_handle_set_signal_state (handle, FALSE, FALSE);
 	}
-
-	mono_mutex_unlock(&event_signal_mutex);
-
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Returning wait failed");
-#endif
-	
-	item->waited[WAPI_HANDLE_EVENT]=TRUE;
-	item->waitcount[WAPI_HANDLE_MUTEX]=0;
-	
-	return(0);
-}
-
-static void event_signal(WapiHandle *handle)
-{
-	ResetEvent(handle);
 }
 
 /**
@@ -467,23 +109,37 @@ static void event_signal(WapiHandle *handle)
  *
  * Return value: A new handle, or %NULL on error.
  */
-WapiHandle *CreateEvent(WapiSecurityAttributes *security G_GNUC_UNUSED, gboolean manual,
-			gboolean initial, const guchar *name G_GNUC_UNUSED)
+gpointer CreateEvent(WapiSecurityAttributes *security G_GNUC_UNUSED, gboolean manual,
+		     gboolean initial, const guchar *name G_GNUC_UNUSED)
 {
 	struct _WapiHandle_event *event_handle;
-	WapiHandle *handle;
+	gpointer handle;
+	gboolean ok;
 	
-	event_handle=(struct _WapiHandle_event *)g_new0(struct _WapiHandle_event, 1);
-	handle=(WapiHandle *)event_handle;
-	_WAPI_HANDLE_INIT(handle, WAPI_HANDLE_EVENT, event_ops);
+	mono_once (&event_ops_once, event_ops_init);
+
+	handle=_wapi_handle_new (WAPI_HANDLE_EVENT);
+	if(handle==_WAPI_HANDLE_INVALID) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error creating event handle");
+		return(NULL);
+	}
+	
+	_wapi_handle_lock_handle (handle);
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_EVENT,
+				(gpointer *)&event_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up event handle %p", handle);
+		_wapi_handle_unlock_handle (handle);
+		return(NULL);
+	}
 	
-	mono_mutex_init(&event_handle->mutex, NULL);
-	pthread_cond_init(&event_handle->cond, NULL);
-	pthread_rwlock_init(&event_handle->rwlock, NULL);
 	event_handle->manual=manual;
 
 	if(initial==TRUE) {
-		handle->signalled=TRUE;
+		_wapi_handle_set_signal_state (handle, TRUE, FALSE);
 	}
 	
 #ifdef DEBUG
@@ -491,6 +147,8 @@ WapiHandle *CreateEvent(WapiSecurityAttributes *security G_GNUC_UNUSED, gboolean
 		  handle);
 #endif
 
+	_wapi_handle_unlock_handle (handle);
+	
 	return(handle);
 }
 
@@ -509,56 +167,55 @@ WapiHandle *CreateEvent(WapiSecurityAttributes *security G_GNUC_UNUSED, gboolean
  * Return value: %TRUE on success, %FALSE otherwise.  (Currently only
  * ever returns %TRUE).
  */
-gboolean PulseEvent(WapiHandle *handle)
+gboolean PulseEvent(gpointer handle)
 {
-	struct _WapiHandle_event *event_handle=(struct _WapiHandle_event *)handle;
+	struct _WapiHandle_event *event_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_EVENT,
+				(gpointer *)&event_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up event handle %p", handle);
+		return(FALSE);
+	}
 	
-	mono_mutex_lock(&event_handle->mutex);
+	_wapi_handle_lock_handle (handle);
 
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION ": Pulsing event handle %p", handle);
 #endif
 
-	handle->signalled=TRUE;
-	
-	/* Tell everyone blocking on WaitForSingleObject */
 	if(event_handle->manual==TRUE) {
-		pthread_cond_broadcast(&event_handle->cond);
+		_wapi_handle_set_signal_state (handle, TRUE, TRUE);
 	} else {
-		pthread_cond_signal(&event_handle->cond);
+		_wapi_handle_set_signal_state (handle, TRUE, FALSE);
 	}
-	mono_mutex_unlock(&event_handle->mutex);
-
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Informed single waits for event handle %p", handle);
-#endif
-	
-	/* Tell everyone blocking on WaitForMultipleObjects */
-	mono_mutex_lock(&event_signal_mutex);
-	pthread_cond_broadcast(&event_signal_cond);
-	mono_mutex_unlock(&event_signal_mutex);
 
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Informed multiple waits for event handles");
-#endif
+	_wapi_handle_unlock_handle (handle);
 	
-	/* Reset the handle signal state */
-
-	/* This rwlock blocks until no other thread holds a read lock.
-	 * This ensures that we can't reset the event until every
-	 * waiting thread has had a chance to examine it
-	 */
-	pthread_rwlock_wrlock(&event_handle->rwlock);
+	if(event_handle->manual==TRUE) {
+		/* For a manual-reset event, we're about to try and
+		 * get the handle lock again, so give other threads a
+		 * chance
+		 */
+		sched_yield ();
 
+		/* Reset the handle signal state */
+		/* I'm not sure whether or not we need a barrier here
+		 * to make sure that all threads waiting on the event
+		 * have proceeded.  Currently we rely on broadcasting
+		 * a condition.
+		 */
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Obtained write lock on event handle %p", handle);
+		g_message(G_GNUC_PRETTY_FUNCTION
+			  ": Obtained write lock on event handle %p", handle);
 #endif
 
-	handle->signalled=FALSE;
-	pthread_rwlock_unlock(&event_handle->rwlock);
+		_wapi_handle_lock_handle (handle);
+		_wapi_handle_set_signal_state (handle, FALSE, FALSE);
+		_wapi_handle_unlock_handle (handle);
+	}
 
 	return(TRUE);
 }
@@ -572,42 +229,44 @@ gboolean PulseEvent(WapiHandle *handle)
  * Return value: %TRUE on success, %FALSE otherwise.  (Currently only
  * ever returns %TRUE).
  */
-gboolean ResetEvent(WapiHandle *handle)
+gboolean ResetEvent(gpointer handle)
 {
-	struct _WapiHandle_event *event_handle=(struct _WapiHandle_event *)handle;
+	struct _WapiHandle_event *event_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_EVENT,
+				(gpointer *)&event_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up event handle %p", handle);
+		return(FALSE);
+	}
 
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION ": Resetting event handle %p",
 		  handle);
 #endif
 
-	/* Test for the current state, because another thread might be
-	 * waiting forever on an unsignalled event with the read lock
-	 * held.  Theres no point going for the write lock if we dont
-	 * need it.
-	 */
-	mono_mutex_lock(&event_handle->mutex);
-	if(handle->signalled==FALSE) {
+	_wapi_handle_lock_handle (handle);
+	if(_wapi_handle_issignalled (handle)==FALSE) {
 
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": No need to reset event handle %p", handle);
 #endif
 
-		mono_mutex_unlock(&event_handle->mutex);
+		_wapi_handle_unlock_handle (handle);
 		return(TRUE);
 	}
-	mono_mutex_unlock(&event_handle->mutex);
 	
-	pthread_rwlock_wrlock(&event_handle->rwlock);
-
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION
 		  ": Obtained write lock on event handle %p", handle);
 #endif
 
-	handle->signalled=FALSE;
-	pthread_rwlock_unlock(&event_handle->rwlock);
+	_wapi_handle_set_signal_state (handle, FALSE, FALSE);
+
+	_wapi_handle_unlock_handle (handle);
 	
 	return(TRUE);
 }
@@ -626,41 +285,33 @@ gboolean ResetEvent(WapiHandle *handle)
  * Return value: %TRUE on success, %FALSE otherwise.  (Currently only
  * ever returns %TRUE).
  */
-gboolean SetEvent(WapiHandle *handle)
+gboolean SetEvent(gpointer handle)
 {
-	struct _WapiHandle_event *event_handle=(struct _WapiHandle_event *)handle;
+	struct _WapiHandle_event *event_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_EVENT,
+				(gpointer *)&event_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up event handle %p", handle);
+		return(FALSE);
+	}
 	
-	mono_mutex_lock(&event_handle->mutex);
+	_wapi_handle_lock_handle (handle);
 
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION ": Setting event handle %p", handle);
 #endif
 
-	handle->signalled=TRUE;
-	
-	/* Tell everyone blocking on WaitForSingleObject */
 	if(event_handle->manual==TRUE) {
-		pthread_cond_broadcast(&event_handle->cond);
+		_wapi_handle_set_signal_state (handle, TRUE, TRUE);
 	} else {
-		pthread_cond_signal(&event_handle->cond);
+		_wapi_handle_set_signal_state (handle, TRUE, FALSE);
 	}
-	mono_mutex_unlock(&event_handle->mutex);
 
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Informed single waits for event handle %p", handle);
-#endif
-	
-	/* Tell everyone blocking on WaitForMultipleObjects */
-	mono_mutex_lock(&event_signal_mutex);
-	pthread_cond_broadcast(&event_signal_cond);
-	mono_mutex_unlock(&event_signal_mutex);
+	_wapi_handle_unlock_handle (handle);
 
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Informed multiple waits for event handles");
-#endif
-	
 	return(TRUE);
 }
 
diff --git a/mono/io-layer/events.h b/mono/io-layer/events.h
index e2e27c05ff9..7ae5247ba34 100644
--- a/mono/io-layer/events.h
+++ b/mono/io-layer/events.h
@@ -1,11 +1,21 @@
+/*
+ * events.h:  Event handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_EVENTS_H_
 #define _WAPI_EVENTS_H_
 
 #include <glib.h>
 
-extern WapiHandle *CreateEvent(WapiSecurityAttributes *security, gboolean manual, gboolean initial, const guchar *name);
-extern gboolean PulseEvent(WapiHandle *handle);
-extern gboolean ResetEvent(WapiHandle *handle);
-extern gboolean SetEvent(WapiHandle *handle);
+extern gpointer CreateEvent(WapiSecurityAttributes *security, gboolean manual,
+			    gboolean initial, const guchar *name);
+extern gboolean PulseEvent(gpointer handle);
+extern gboolean ResetEvent(gpointer handle);
+extern gboolean SetEvent(gpointer handle);
 
 #endif /* _WAPI_EVENTS_H_ */
diff --git a/mono/io-layer/handles-private.h b/mono/io-layer/handles-private.h
index fa7149ce2b8..9331547ca72 100644
--- a/mono/io-layer/handles-private.h
+++ b/mono/io-layer/handles-private.h
@@ -1,12 +1,182 @@
+/*
+ * handles-private.h:  Internal operations on handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_HANDLES_PRIVATE_H_
 #define _WAPI_HANDLES_PRIVATE_H_
 
 #include <config.h>
 #include <glib.h>
 
-#include "wait-private.h"
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/shared.h>
+
+#undef DEBUG
+
+extern struct _WapiHandleShared_list *_wapi_shared_data;
+extern struct _WapiHandlePrivate_list *_wapi_private_data;
+
+extern guint32 _wapi_handle_new_internal (WapiHandleType type);
+extern gpointer _wapi_handle_new (WapiHandleType type);
+extern gboolean _wapi_lookup_handle (gpointer handle, WapiHandleType type,
+				     gpointer *shared, gpointer *private);
+extern gpointer _wapi_search_handle (WapiHandleType type,
+				     gboolean (*check)(gpointer, gpointer),
+				     gpointer user_data,
+				     gpointer *shared, gpointer *private);
+extern void _wapi_handle_ref (gpointer handle);
+extern void _wapi_handle_unref (gpointer handle);
+extern guint32 _wapi_handle_scratch_store_internal (guint32 bytes);
+extern guint32 _wapi_handle_scratch_store (gconstpointer data, guint32 bytes);
+extern gconstpointer _wapi_handle_scratch_lookup (guint32 idx);
+extern guchar *_wapi_handle_scratch_lookup_as_string (guint32 idx);
+extern void _wapi_handle_scratch_delete_internal (guint32 idx);
+extern void _wapi_handle_scratch_delete (guint32 idx);
+extern void _wapi_handle_register_capabilities (WapiHandleType type,
+						WapiHandleCapability caps);
+extern gboolean _wapi_handle_test_capabilities (gpointer handle,
+						WapiHandleCapability caps);
+extern void _wapi_handle_ops_close_shared (gpointer handle);
+extern void _wapi_handle_ops_close_private (gpointer handle);
+extern void _wapi_handle_ops_signal (gpointer handle);
+extern void _wapi_handle_ops_own (gpointer handle);
+extern gboolean _wapi_handle_ops_isowned (gpointer handle);
+
+extern gboolean _wapi_handle_count_signalled_handles (guint32 numhandles,
+						      gpointer *handles,
+						      gboolean waitall,
+						      guint32 *retcount,
+						      guint32 *lowest);
+extern void _wapi_handle_unlock_handles (guint32 numhandles,
+					 gpointer *handles);
+extern int _wapi_handle_wait_signal (void);
+extern int _wapi_handle_timedwait_signal (struct timespec *timeout);
+extern int _wapi_handle_wait_signal_handle (gpointer handle);
+extern int _wapi_handle_timedwait_signal_handle (gpointer handle,
+						 struct timespec *timeout);
+extern gboolean _wapi_handle_process_fork (guint32 cmd, guint32 args,
+					   guint32 env, guint32 dir,
+					   gboolean inherit, guint32 flags,
+					   gpointer stdin_handle,
+					   gpointer stdout_handle,
+					   gpointer stderr_handle,
+					   gpointer *process_handle,
+					   gpointer *thread_handle,
+					   guint32 *pid, guint32 *tid);
+
+static inline WapiHandleType _wapi_handle_type (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	
+	return(_wapi_shared_data->handles[idx].type);
+}
+
+static inline void _wapi_handle_set_signal_state (gpointer handle,
+						  gboolean state,
+						  gboolean broadcast)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": setting state of %p to %s (broadcast %s)", handle, state?"TRUE":"FALSE", broadcast?"TRUE":"FALSE");
+#endif
+
+	if(state==TRUE) {
+		/* Tell everyone blocking on a single handle */
+
+		/* This function _must_ be called with
+		 * handle->signal_mutex locked
+		 */
+		_wapi_shared_data->handles[idx].signalled=state;
+		
+		if(broadcast==TRUE) {
+			pthread_cond_broadcast (&_wapi_shared_data->handles[idx].signal_cond);
+		} else {
+			pthread_cond_signal (&_wapi_shared_data->handles[idx].signal_cond);
+		}
+
+		/* Tell everyone blocking on multiple handles that something
+		 * was signalled
+		 */
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+		mono_mutex_lock (&_wapi_shared_data->signal_mutex);
+		pthread_cond_broadcast (&_wapi_shared_data->signal_cond);
+		mono_mutex_unlock (&_wapi_shared_data->signal_mutex);
+#else
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": lock global signal mutex");
+#endif
+
+		mono_mutex_lock (&_wapi_private_data->signal_mutex);
+		pthread_cond_broadcast (&_wapi_private_data->signal_cond);
+
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unlock global signal mutex");
+#endif
+
+		mono_mutex_unlock (&_wapi_private_data->signal_mutex);
+#endif /* _POSIX_THREAD_PROCESS_SHARED */
+	} else {
+		_wapi_shared_data->handles[idx].signalled=state;
+	}
+}
+
+static inline gboolean _wapi_handle_issignalled (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+
+	return(_wapi_shared_data->handles[idx].signalled);
+}
+
+static inline int _wapi_handle_lock_signal_mutex (void)
+{
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": lock global signal mutex");
+#endif
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+	return(mono_mutex_lock (&_wapi_shared_data->signal_mutex));
+#else
+	return(mono_mutex_lock (&_wapi_private_data->signal_mutex));
+#endif /* _POSIX_THREAD_PROCESS_SHARED */
+}
+
+static inline int _wapi_handle_unlock_signal_mutex (void)
+{
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": unlock global signal mutex");
+#endif
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+	return(mono_mutex_unlock (&_wapi_shared_data->signal_mutex));
+#else
+	return(mono_mutex_unlock (&_wapi_private_data->signal_mutex));
+#endif /* _POSIX_THREAD_PROCESS_SHARED */
+}
+
+static inline int _wapi_handle_lock_handle (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": locking handle %p", handle);
+#endif
+	
+	return(mono_mutex_lock (&_wapi_shared_data->handles[idx].signal_mutex));
+}
+
+static inline int _wapi_handle_unlock_handle (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
 
-extern guint32 _wapi_handle_count_signalled(WaitQueueItem *item, WapiHandleType type);
-extern void _wapi_handle_set_lowest(WaitQueueItem *item, guint32 idx);
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": unlocking handle %p", handle);
+#endif
+	
+	return(mono_mutex_unlock (&_wapi_shared_data->handles[idx].signal_mutex));
+}
 
 #endif /* _WAPI_HANDLES_PRIVATE_H_ */
diff --git a/mono/io-layer/handles.c b/mono/io-layer/handles.c
index f5414d3f6c7..501b4c5e831 100644
--- a/mono/io-layer/handles.c
+++ b/mono/io-layer/handles.c
@@ -1,65 +1,741 @@
+/*
+ * handles.c:  Generic and internal operations on handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <pthread.h>
+#include <errno.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/socket.h>
+#include <sys/un.h>
 
-#include "mono/io-layer/wapi.h"
-#include "wapi-private.h"
-#include "handles-private.h"
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
 
-#include "mono-mutex.h"
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/mono-mutex.h>
+#include <mono/io-layer/shared.h>
+#include <mono/io-layer/misc-private.h>
+#include <mono/io-layer/daemon-messages.h>
 
 #undef DEBUG
 
-guint32 _wapi_handle_count_signalled(WaitQueueItem *item, WapiHandleType type)
+/*
+ * This flag _MUST_ remain set to FALSE in the daemon process.  When
+ * we exec()d a standalone daemon, that happened because shared_init()
+ * didnt get called in the daemon process.  Now we just fork() without
+ * exec(), we need to ensure that the fork() happens when shared is
+ * still FALSE.
+ *
+ * This is further complicated by the second attempt to start the
+ * daemon if the connect() fails.
+ */
+static gboolean shared=FALSE;
+
+static WapiHandleCapability handle_caps[WAPI_HANDLE_COUNT]={0};
+static struct _WapiHandleOps *handle_ops[WAPI_HANDLE_COUNT]={
+	NULL,
+	&_wapi_file_ops,
+	&_wapi_console_ops,
+	&_wapi_thread_ops,
+	&_wapi_sem_ops,
+	&_wapi_mutex_ops,
+	&_wapi_event_ops,
+	&_wapi_socket_ops,
+	&_wapi_find_ops,
+	&_wapi_process_ops,
+	&_wapi_pipe_ops,
+};
+
+static int daemon_sock;
+
+static pthread_mutexattr_t mutex_shared_attr;
+static pthread_condattr_t cond_shared_attr;
+
+struct _WapiHandleShared_list *_wapi_shared_data=NULL;
+struct _WapiHandlePrivate_list *_wapi_private_data=NULL;
+
+static void shared_init (void)
 {
-	guint32 i, ret=0;
+	struct sockaddr_un shared_socket_address;
+	gboolean tried_once=FALSE;
+	int ret;
+
+attach_again:
+
+#ifndef DISABLE_SHARED_HANDLES
+	if(getenv ("MONO_DISABLE_SHM"))
+#endif
+	{
+		shared=FALSE;
+#ifndef DISABLE_SHARED_HANDLES
+	} else {
+		int shm_id;
+		gboolean success;
+		
+		/* Ensure that shared==FALSE while _wapi_shm_attach()
+		 * calls fork()
+		 */
+		shared=FALSE;
+		
+		_wapi_shared_data=_wapi_shm_attach (FALSE, &success, &shm_id);
+		shared=success;
+		if(shared==FALSE) {
+			g_warning ("Failed to attach shared memory! "
+				   "(tried shared memory ID 0x%x). "
+				   "Falling back to non-shared handles",
+				   shm_id);
+		}
+#endif /* DISABLE_SHARED_HANDLES */
+	}
 	
-	/* Count how many of the interesting thread handles are signalled */
-	for(i=0; i<item->handles[type]->len; i++) {
-		WapiHandle *handle;
 
-		handle=(WapiHandle *)g_ptr_array_index(item->handles[type], i);
+	if(shared==TRUE) {
+		daemon_sock=socket (PF_UNIX, SOCK_STREAM, 0);
+		shared_socket_address.sun_family=AF_UNIX;
+		memcpy (shared_socket_address.sun_path,
+			_wapi_shared_data->daemon, MONO_SIZEOF_SUNPATH);
+		ret=connect (daemon_sock, (struct sockaddr *)&shared_socket_address,
+			     sizeof(struct sockaddr_un));
+		if(ret==-1) {
+			if(tried_once==TRUE) {
+				g_warning (G_GNUC_PRETTY_FUNCTION
+					   "connect to daemon failed: %s",
+					   strerror (errno));
+				/* Fall back to private handles */
+				shared=FALSE;
+			} else {
+				/* It's possible that the daemon
+				 * crashed without destroying the
+				 * shared memory segment (thus fooling
+				 * subsequent processes into thinking
+				 * the daemon is still active).
+				 * 
+				 * Destroy the shared memory segment
+				 * and try once more.  This won't
+				 * break running apps, but no new apps
+				 * will be able to see the current
+				 * shared memory segment.
+				 */
+				tried_once=TRUE;
+				_wapi_shm_destroy ();
+				
+				goto attach_again;
+			}
+		}
+	}
+
+	if(shared==FALSE) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Checking handle %p",
-			  handle);
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": Using process-private handles");
+#endif
+		_wapi_shared_data=
+			g_malloc0 (sizeof(struct _WapiHandleShared_list)+
+				   _WAPI_SHM_SCRATCH_SIZE);
+	}
+	_wapi_private_data=g_new0 (struct _WapiHandlePrivate_list, 1);
+
+	pthread_mutexattr_init (&mutex_shared_attr);
+	pthread_condattr_init (&cond_shared_attr);
+
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+	pthread_mutexattr_setpshared (&mutex_shared_attr,
+				      PTHREAD_PROCESS_SHARED);
+	pthread_condattr_setpshared (&cond_shared_attr,
+				     PTHREAD_PROCESS_SHARED);
 #endif
+}
+
+/*
+ * _wapi_handle_new_internal:
+ * @type: Init handle to this type
+ *
+ * Search for a free handle and initialize it. Return the handle on
+ * succes and 0 on failure.
+ */
+guint32 _wapi_handle_new_internal (WapiHandleType type)
+{
+	guint32 i;
+	static guint32 last=1;
+	
+	/* A linear scan should be fast enough.  Start from the last
+	 * allocation, assuming that handles are allocated more often
+	 * than they're freed. Leave 0 (NULL) as a guard
+	 */
+again:
+	for(i=last; i<_WAPI_MAX_HANDLES; i++) {
+		struct _WapiHandleShared *shared=&_wapi_shared_data->handles[i];
 		
-		if(handle->signalled==TRUE) {
-			guint32 idx;
-			
+		if(shared->type==WAPI_HANDLE_UNUSED) {
+			last=i+1;
+			shared->type=type;
+			shared->signalled=FALSE;
+			mono_mutex_init (&_wapi_shared_data->handles[i].signal_mutex, &mutex_shared_attr);
+			pthread_cond_init (&_wapi_shared_data->handles[i].signal_cond, &cond_shared_attr);
+
+			return(i);
+		}
+	}
+
+	if(last>1) {
+		/* Try again from the beginning */
+		last=1;
+		goto again;
+	}
+
+	return(0);
+}
+
+gpointer _wapi_handle_new (WapiHandleType type)
+{
+	static mono_once_t shared_init_once = MONO_ONCE_INIT;
+	static pthread_mutex_t scan_mutex=PTHREAD_MUTEX_INITIALIZER;
+	guint32 idx;
+	gpointer handle;
+	WapiHandleRequest new;
+	WapiHandleResponse new_resp;
+#if HAVE_BOEHM_GC
+	gboolean tried_collect=FALSE;
+#endif
+	
+	mono_once (&shared_init_once, shared_init);
+	
+again:
+	if(shared==TRUE) {
+		new.type=WapiHandleRequestType_New;
+		new.u.new.type=type;
+	
+		_wapi_daemon_request_response (daemon_sock, &new, &new_resp);
+	
+		if (new_resp.type==WapiHandleResponseType_New) {
+			idx=new_resp.u.new.handle;
+		} else {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": bogus daemon response, type %d",
+				   new_resp.type);
+			g_assert_not_reached ();
+		}
+	} else {
+		pthread_mutex_lock (&scan_mutex);
+		idx=_wapi_handle_new_internal (type);
+		pthread_mutex_unlock (&scan_mutex);
+	}
+		
+	if(idx==0) {
+		g_warning (G_GNUC_PRETTY_FUNCTION ": Ran out of handles!");
+
+#if HAVE_BOEHM_GC
+		/* See if we can reclaim some handles by forcing a GC
+		 * collection
+		 */
+		if(tried_collect==FALSE) {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": Seeing if GC collection helps...");
+			GC_gcollect ();
+			tried_collect=TRUE;
+			goto again;
+		} else {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": didn't help, returning error");
+		}
+#endif
+	
+		return(GUINT_TO_POINTER (_WAPI_HANDLE_INVALID));
+	}
+
+	handle=GUINT_TO_POINTER (idx);
+
 #ifdef DEBUG
-			g_message(G_GNUC_PRETTY_FUNCTION
-				  ": Handle %p signalled", handle);
+	g_message (G_GNUC_PRETTY_FUNCTION ": Allocated new handle %p", handle);
 #endif
 
-			idx=g_array_index(item->waitindex[type], guint32, i);
-			_wapi_handle_set_lowest(item, idx);
-			
-			ret++;
+	return(handle);
+}
+
+gboolean _wapi_lookup_handle (gpointer handle, WapiHandleType type,
+			      gpointer *shared, gpointer *private)
+{
+	struct _WapiHandleShared *shared_handle_data;
+	struct _WapiHandlePrivate *private_handle_data;
+	guint32 idx=GPOINTER_TO_UINT (handle);
+
+	shared_handle_data=&_wapi_shared_data->handles[idx];
+
+	if(shared_handle_data->type!=type) {
+		return(FALSE);
+	}
+
+	if(shared!=NULL) {
+		*shared=&shared_handle_data->u;
+	}
+	
+	if(private!=NULL) {
+		private_handle_data=&_wapi_private_data->handles[idx];
+
+		*private=&private_handle_data->u;
+	}
+	
+	return(TRUE);
+}
+
+gpointer _wapi_search_handle (WapiHandleType type,
+			      gboolean (*check)(gpointer test, gpointer user),
+			      gpointer user_data,
+			      gpointer *shared, gpointer *private)
+{
+	struct _WapiHandleShared *shared_handle_data;
+	struct _WapiHandlePrivate *private_handle_data;
+	guint32 i;
+
+	for(i=1; i<_WAPI_MAX_HANDLES; i++) {
+		struct _WapiHandleShared *shared=&_wapi_shared_data->handles[i];
+		
+		if(shared->type==type) {
+			if(check (GUINT_TO_POINTER (i), user_data)==TRUE) {
+				break;
+			}
 		}
 	}
 
+	if(i==_WAPI_MAX_HANDLES) {
+		return(GUINT_TO_POINTER (0));
+	}
+	
+	if(shared!=NULL) {
+		shared_handle_data=&_wapi_shared_data->handles[i];
+
+		*shared=&shared_handle_data->u;
+	}
+	
+	if(private!=NULL) {
+		private_handle_data=&_wapi_private_data->handles[i];
+
+		*private=&private_handle_data->u;
+	}
+	
+	return(GUINT_TO_POINTER (i));
+}
+
+void _wapi_handle_ref (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+
+	if(shared==TRUE) {
+		WapiHandleRequest req;
+		WapiHandleResponse resp;
+	
+		req.type=WapiHandleRequestType_Open;
+		req.u.open.handle=idx;
+	
+		_wapi_daemon_request_response (daemon_sock, &req, &resp);
+		if(resp.type!=WapiHandleResponseType_Open) {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": bogus daemon response, type %d",
+				   resp.type);
+			g_assert_not_reached ();
+		}
+	} else {
+		_wapi_shared_data->handles[idx].ref++;
+	
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": %d signalled handles", ret);
+		g_message (G_GNUC_PRETTY_FUNCTION ": handle %p ref now %d",
+			   handle, _wapi_shared_data->handles[idx].ref);
 #endif
+	}
+}
 
-	return(ret);
+void _wapi_handle_unref (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	gboolean destroy;
+	
+	if(shared==TRUE) {
+		WapiHandleRequest req;
+		WapiHandleResponse resp;
+	
+		req.type=WapiHandleRequestType_Close;
+		req.u.close.handle=GPOINTER_TO_UINT (handle);
+	
+		_wapi_daemon_request_response (daemon_sock, &req, &resp);
+		if(resp.type!=WapiHandleResponseType_Close) {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": bogus daemon response, type %d",
+				   resp.type);
+			g_assert_not_reached ();
+		} else {
+			destroy=resp.u.close.destroy;
+		}
+	} else {
+		_wapi_shared_data->handles[idx].ref--;
+	
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": handle %p ref now %d",
+			   handle, _wapi_shared_data->handles[idx].ref);
+#endif
+
+		/* Possible race condition here if another thread refs
+		 * the handle between here and setting the type to
+		 * UNUSED.  I could lock a mutex, but I'm not sure
+		 * that allowing a handle reference to reach 0 isn't
+		 * an application bug anyway.
+		 */
+		destroy=(_wapi_shared_data->handles[idx].ref==0);
+	}
+
+	if(destroy==TRUE) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Destroying handle %p",
+			   handle);
+#endif
+		
+		if(shared==FALSE) {
+			_wapi_handle_ops_close_shared (handle);
+
+			mono_mutex_destroy (&_wapi_shared_data->handles[idx].signal_mutex);
+			pthread_cond_destroy (&_wapi_shared_data->handles[idx].signal_cond);
+			memset (&_wapi_shared_data->handles[idx].u, '\0', sizeof(_wapi_shared_data->handles[idx].u));
+		
+		}
+
+		_wapi_handle_ops_close_private (handle);
+		_wapi_shared_data->handles[idx].type=WAPI_HANDLE_UNUSED;
+	}
 }
 
-void _wapi_handle_set_lowest(WaitQueueItem *item, guint32 idx)
+#define HDRSIZE sizeof(struct _WapiScratchHeader)
+
+/*
+ * _wapi_handle_scratch_store_internal:
+ * @bytes: Allocate no. bytes
+ *
+ * Like malloc(3) except its for the shared memory segment's scratch
+ * part. Memory block returned is zeroed out.
+ */
+guint32 _wapi_handle_scratch_store_internal (guint32 bytes)
 {
-	mono_mutex_lock(&item->mutex);
+	guint32 idx=0, last_idx=0;
+	struct _WapiScratchHeader *hdr, *last_hdr;
+	gboolean last_was_free=FALSE;
+	guchar *storage=&_wapi_shared_data->scratch_base[0];
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION
+		   ": looking for %d bytes of scratch space (%d bytes total)",
+		   bytes, _WAPI_SHM_SCRATCH_SIZE);
+#endif
+
+	hdr=(struct _WapiScratchHeader *)&storage[0];
+	if(hdr->flags==0 && hdr->length==0) {
+		/* Need to initialise scratch data */
+		hdr->flags |= WAPI_SHM_SCRATCH_FREE;
+		hdr->length = _WAPI_SHM_SCRATCH_SIZE - HDRSIZE;
+	}
+	
+	while(idx< _WAPI_SHM_SCRATCH_SIZE) {
+		hdr=(struct _WapiScratchHeader *)&storage[idx];
+		
+		/* Do a simple first-fit allocation, coalescing
+		 * adjacent free blocks as we progress through the
+		 * scratch space
+		 */
+		if(hdr->flags & WAPI_SHM_SCRATCH_FREE &&
+		   hdr->length >= bytes + HDRSIZE) {
+			/* found space */
+			guint32 old_length=hdr->length;
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": found suitable free size at %d, length %d", idx, hdr->length);
+#endif
+
+			hdr->flags &= ~WAPI_SHM_SCRATCH_FREE;
+			hdr->length=bytes;
+			idx += HDRSIZE;
+
+			/* Put a new header in at the end of the used
+			 * space
+			 */
+			hdr=(struct _WapiScratchHeader *)&storage[idx+bytes];
+			hdr->flags |= WAPI_SHM_SCRATCH_FREE;
+			hdr->length = old_length-bytes-HDRSIZE;
 
-	if(item->lowest_signal>idx) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Set %p lowest index to %d",
-			  item, idx);
+			g_message (G_GNUC_PRETTY_FUNCTION ": new header at %d, length %d", idx+bytes, hdr->length);
 #endif
+			
+			/*
+			 * It was memset(0..) when free/made so no need to do it here
+			 */
+
+			return(idx);
+		} else if(hdr->flags & WAPI_SHM_SCRATCH_FREE &&
+			  last_was_free == FALSE) {
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": found too-small free block at %d, length %d (previous used)", idx, hdr->length);
+#endif
+
+			/* save this point in case we can coalesce it with
+			 * the next block, if that is free.
+			 */
+			last_was_free=TRUE;
+			last_idx=idx;
+			last_hdr=hdr;
+			idx+=(hdr->length+HDRSIZE);
+		} else if (hdr->flags & WAPI_SHM_SCRATCH_FREE &&
+			   last_was_free == TRUE) {
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": found too-small free block at %d, length %d (previous free)", idx, hdr->length);
+#endif
+
+			/* This block and the previous are both free,
+			 * so coalesce them
+			 */
+			last_hdr->length += (hdr->length + HDRSIZE);
+
+			/* If the new block is now big enough, use it
+			 * (next time round the loop)
+			 */
+			if(last_hdr->length >= bytes + HDRSIZE) {
+				idx=last_idx;
+			} else {
+				/* leave the last free info as it is,
+				 * in case the next block is also free
+				 * and can be coalesced too
+				 */
+				idx=last_idx+last_hdr->length+HDRSIZE;
+			}
+		} else {
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": found used block at %d, length %d", idx,
+				   hdr->length);
+#endif
+
+			/* must be used, try next chunk */
+			idx+=(hdr->length+HDRSIZE);
+
+			/* Don't let the coalescing blow away this block */
+			last_was_free=FALSE;
+		}
+	}
+	
+	return(0);
+}
+
+guint32 _wapi_handle_scratch_store (gconstpointer data, guint32 bytes)
+{
+	static pthread_mutex_t scratch_mutex=PTHREAD_MUTEX_INITIALIZER;
+	guint32 idx;
+	
+	/* No point storing no data */
+	if(bytes==0) {
+		return(0);
+	}
+
+	/* Align bytes to 32 bits (needed for sparc at least) */
+	bytes = (((bytes) + 3) & (~3));
+
+	if(shared==TRUE) {
+		WapiHandleRequest scratch;
+		WapiHandleResponse scratch_resp;
+	
+		scratch.type=WapiHandleRequestType_Scratch;
+		scratch.u.scratch.length=bytes;
+	
+		_wapi_daemon_request_response (daemon_sock, &scratch,
+					       &scratch_resp);
+	
+		if(scratch_resp.type==WapiHandleResponseType_Scratch) {
+			idx=scratch_resp.u.scratch.idx;
+		} else {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": bogus daemon response, type %d",
+				   scratch_resp.type);
+			g_assert_not_reached ();
+		}
+	} else {
+		pthread_mutex_lock (&scratch_mutex);
+		idx=_wapi_handle_scratch_store_internal (bytes);
+		pthread_mutex_unlock (&scratch_mutex);
+		
+		if(idx==0) {
+			/* Failed to allocate space */
+			return(0);
+		}
+	}
+
+	memcpy (&_wapi_shared_data->scratch_base[idx], data, bytes);
+	
+	return(idx);
+}
+
+guchar *_wapi_handle_scratch_lookup_as_string (guint32 idx)
+{
+	struct _WapiScratchHeader *hdr;
+	guchar *str;
+	guchar *storage=&_wapi_shared_data->scratch_base[0];
+	
+	if(idx < HDRSIZE || idx > _WAPI_SHM_SCRATCH_SIZE) {
+		return(NULL);
+	}
+	
+	hdr=(struct _WapiScratchHeader *)&storage[idx - HDRSIZE];
+	str=g_malloc0 (hdr->length+1);
+	memcpy (str, &storage[idx], hdr->length);
+
+	return(str);
+}
+
+gconstpointer _wapi_handle_scratch_lookup (guint32 idx)
+{
+	guchar *storage=&_wapi_shared_data->scratch_base[0];
+	
+	if(idx < HDRSIZE || idx > _WAPI_SHM_SCRATCH_SIZE) {
+		return(NULL);
+	}
+	
+	return(&storage[idx]);
+}
+
+/*
+ * _wapi_handle_scratch_delete_internal:
+ * @idx: Index to free block
+ *
+ * Like free(3) except its for the shared memory segment's scratch
+ * part.
+ */
+void _wapi_handle_scratch_delete_internal (guint32 idx)
+{
+	struct _WapiScratchHeader *hdr;
+	guchar *storage=&_wapi_shared_data->scratch_base[0];
 	
-		item->lowest_signal=idx;
+	if(idx < HDRSIZE || idx > _WAPI_SHM_SCRATCH_SIZE) {
+		return;
 	}
 	
-	mono_mutex_unlock(&item->mutex);
+	hdr=(struct _WapiScratchHeader *)&storage[idx - HDRSIZE];
+	memset (&storage[idx], '\0', hdr->length);
+	hdr->flags |= WAPI_SHM_SCRATCH_FREE;
+	
+	/* We could coalesce forwards here if the next block is also
+	 * free, but the _store() function will do that anyway.
+	 */
+}
+
+void _wapi_handle_scratch_delete (guint32 idx)
+{
+	if(shared==TRUE) {
+		WapiHandleRequest scratch_free;
+		WapiHandleResponse scratch_free_resp;
+	
+		scratch_free.type=WapiHandleRequestType_ScratchFree;
+		scratch_free.u.scratch_free.idx=idx;
+	
+		_wapi_daemon_request_response (daemon_sock, &scratch_free,
+					       &scratch_free_resp);
+	
+		if(scratch_free_resp.type!=WapiHandleResponseType_ScratchFree) {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": bogus daemon response, type %d",
+				   scratch_free_resp.type);
+			g_assert_not_reached ();
+		}
+	} else {
+		_wapi_handle_scratch_delete_internal (idx);
+	}
+}
+
+void _wapi_handle_register_capabilities (WapiHandleType type,
+					 WapiHandleCapability caps)
+{
+	handle_caps[type]=caps;
+}
+
+gboolean _wapi_handle_test_capabilities (gpointer handle,
+					 WapiHandleCapability caps)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	WapiHandleType type;
+
+	type=_wapi_shared_data->handles[idx].type;
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": testing 0x%x against 0x%x (%d)",
+		   handle_caps[type], caps, handle_caps[type] & caps);
+#endif
+	
+	return((handle_caps[type] & caps)!=0);
+}
+
+void _wapi_handle_ops_close_shared (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	WapiHandleType type;
+
+	type=_wapi_shared_data->handles[idx].type;
+
+	if(handle_ops[type]!=NULL && handle_ops[type]->close_shared!=NULL) {
+		handle_ops[type]->close_shared (handle);
+	}
+}
+
+void _wapi_handle_ops_close_private (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	WapiHandleType type;
+
+	type=_wapi_shared_data->handles[idx].type;
+
+	if(handle_ops[type]!=NULL && handle_ops[type]->close_private!=NULL) {
+		handle_ops[type]->close_private (handle);
+	}
+}
+
+void _wapi_handle_ops_signal (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	WapiHandleType type;
+
+	type=_wapi_shared_data->handles[idx].type;
+
+	if(handle_ops[type]!=NULL && handle_ops[type]->signal!=NULL) {
+		handle_ops[type]->signal (handle);
+	}
+}
+
+void _wapi_handle_ops_own (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	WapiHandleType type;
+
+	type=_wapi_shared_data->handles[idx].type;
+
+	if(handle_ops[type]!=NULL && handle_ops[type]->own_handle!=NULL) {
+		handle_ops[type]->own_handle (handle);
+	}
+}
+
+gboolean _wapi_handle_ops_isowned (gpointer handle)
+{
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	WapiHandleType type;
+
+	type=_wapi_shared_data->handles[idx].type;
+
+	if(handle_ops[type]!=NULL && handle_ops[type]->is_owned!=NULL) {
+		return(handle_ops[type]->is_owned (handle));
+	} else {
+		return(FALSE);
+	}
 }
 
 /**
@@ -73,94 +749,325 @@ void _wapi_handle_set_lowest(WaitQueueItem *item, guint32 idx)
  *
  * Return value: %TRUE on success, %FALSE otherwise.
  */
-gboolean CloseHandle(WapiHandle *handle)
+gboolean CloseHandle(gpointer handle)
 {
-	g_return_val_if_fail(handle->ref>0, FALSE);
-	
-	handle->ref--;
-	if(handle->ref==0) {
-		if(handle->ops->close!=NULL) {
-			handle->ops->close(handle);
-		}
-		
-		g_free(handle);		/* maybe this should be in
-					 * ops, cuurently ops->close()
-					 * is being used to free
-					 * handle data
-					 */
-	}
+	_wapi_handle_unref (handle);
 	
 	return(TRUE);
 }
 
-/**
- * SignalObjectAndWait:
- * @signal: An object to signal
- * @wait: An object to wait for
- * @timeout: The maximum time in milliseconds to wait for
- * @alertable: Specifies whether the function returnes when the system
- * queues an I/O completion routine or an APC for the calling thread.
- *
- * Atomically signals @signal and waits for @wait to become signalled,
- * or @timeout ms elapses.  If @timeout is zero, the object's state is
- * tested and the function returns immediately.  If @timeout is
- * %INFINITE, the function waits forever.
- *
- * @signal can be a semaphore, mutex or event object.
- *
- * If @alertable is %TRUE and the system queues an I/O completion
- * routine or an APC for the calling thread, the function returns and
- * the thread calls the completion routine or APC function.  If
- * %FALSE, the function does not return, and the thread does not call
- * the completion routine or APC function.  A completion routine is
- * queued when the ReadFileEx() or WriteFileEx() function in which it
- * was specified has completed.  The calling thread is the thread that
- * initiated the read or write operation.  An APC is queued when
- * QueueUserAPC() is called.  Currently completion routines and APC
- * functions are not supported.
- *
- * Return value: %WAIT_ABANDONED - @wait is a mutex that was not
- * released by the owning thread when it exited.  Ownershop of the
- * mutex object is granted to the calling thread and the mutex is set
- * to nonsignalled.  %WAIT_IO_COMPLETION - the wait was ended by one
- * or more user-mode asynchronous procedure calls queued to the
- * thread.  %WAIT_OBJECT_0 - The state of @wait is signalled.
- * %WAIT_TIMEOUT - The @timeout interval elapsed and @wait's state is
- * still not signalled.  %WAIT_FAILED - an error occurred.
- */
-guint32 SignalObjectAndWait(WapiHandle *signal, WapiHandle *wait,
-			    guint32 timeout, gboolean alertable)
+gboolean _wapi_handle_count_signalled_handles (guint32 numhandles,
+					       gpointer *handles,
+					       gboolean waitall,
+					       guint32 *retcount,
+					       guint32 *lowest)
 {
-	gboolean waited;
-	guint32 ret;
+	guint32 count, i, iter=0;
+	gboolean ret;
 	
-	if(signal->ops->signal==NULL) {
-		return(WAIT_FAILED);
+	/* Lock all the handles, with backoff */
+again:
+	for(i=0; i<numhandles; i++) {
+		guint32 idx=GPOINTER_TO_UINT (handles[i]);
+		
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": attempting to lock %p",
+			   handles[i]);
+#endif
+
+		ret=mono_mutex_trylock (&_wapi_shared_data->handles[idx].signal_mutex);
+		if(ret!=0) {
+			/* Bummer */
+			struct timespec sleepytime;
+			
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": attempt failed for %p", handles[i]);
+#endif
+
+			while(i--) {
+				idx=GPOINTER_TO_UINT (handles[i]);
+				mono_mutex_unlock (&_wapi_shared_data->handles[idx].signal_mutex);
+			}
+
+			/* If iter ever reaches 100 the nanosleep will
+			 * return EINVAL immediately, but we have a
+			 * design flaw if that happens.
+			 */
+			iter++;
+			if(iter==100) {
+				g_warning (G_GNUC_PRETTY_FUNCTION
+					   ": iteration overflow!");
+				iter=1;
+			}
+			
+			sleepytime.tv_sec=0;
+			sleepytime.tv_nsec=10000000 * iter;	/* 10ms*iter */
+			
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": Backing off for %d ms", iter*10);
+#endif
+			nanosleep (&sleepytime, NULL);
+			
+			goto again;
+		}
 	}
 	
-	if(wait->ops->wait==NULL) {
-		return(WAIT_FAILED);
-	}
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Locked all handles");
+#endif
 
-	waited=wait->ops->wait(wait, signal, timeout);
-	if(waited==TRUE) {
-		/* Object signalled before timeout expired */
+	count=0;
+	*lowest=numhandles;
+	
+	for(i=0; i<numhandles; i++) {
+		guint32 idx=GPOINTER_TO_UINT (handles[i]);
+		
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Object %p signalled",
-			  wait);
+		g_message (G_GNUC_PRETTY_FUNCTION ": Checking handle %p",
+			   handles[i]);
 #endif
-		ret=WAIT_OBJECT_0;
+
+		if(((_wapi_handle_test_capabilities (handles[i], WAPI_HANDLE_CAP_OWN)==TRUE) &&
+		    (_wapi_handle_ops_isowned (handles[i])==TRUE)) ||
+		   (_wapi_shared_data->handles[idx].signalled==TRUE)) {
+			count++;
+			
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": Handle %p signalled", handles[i]);
+#endif
+			if(*lowest>i) {
+				*lowest=i;
+			}
+		}
+	}
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": %d event handles signalled",
+		   count);
+#endif
+
+	if((waitall==TRUE && count==numhandles) ||
+	   (waitall==FALSE && count>0)) {
+		ret=TRUE;
 	} else {
+		ret=FALSE;
+	}
+	
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Object %p wait timed out",
-			  wait);
+	g_message (G_GNUC_PRETTY_FUNCTION ": Returning %d", ret);
 #endif
-		ret=WAIT_TIMEOUT;
+
+	*retcount=count;
+	
+	return(ret);
+}
+
+void _wapi_handle_unlock_handles (guint32 numhandles, gpointer *handles)
+{
+	guint32 i;
+	
+	for(i=0; i<numhandles; i++) {
+		guint32 idx=GPOINTER_TO_UINT (handles[i]);
+		
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unlocking handle %p",
+			   handles[i]);
+#endif
+
+		mono_mutex_unlock (&_wapi_shared_data->handles[idx].signal_mutex);
+	}
+}
+
+/* Process-shared handles (currently only process and thread handles
+ * are allowed, and they only work because once signalled they can't
+ * become unsignalled) are waited for by one process and signalled by
+ * another.  Without process-shared conditions, the waiting process
+ * will block forever.  To get around this, the four handle waiting
+ * functions use a short timeout when _POSIX_THREAD_PROCESS_SHARED is
+ * not available.  They also return "success" if the fake timeout
+ * expired, and let the caller check signal status.
+ */
+int _wapi_handle_wait_signal (void)
+{
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+	return(mono_cond_wait (&_wapi_shared_data->signal_cond,
+			       &_wapi_shared_data->signal_mutex));
+#else
+	struct timespec fake_timeout;
+	int ret;
+	
+	_wapi_calc_timeout (&fake_timeout, 100);
+
+	ret=mono_cond_timedwait (&_wapi_private_data->signal_cond,
+				 &_wapi_private_data->signal_mutex,
+				 &fake_timeout);
+	if(ret==ETIMEDOUT) {
+		ret=0;
+	}
+
+	return(ret);
+#endif /* _POSIX_THREAD_PROCESS_SHARED */
+}
+
+int _wapi_handle_timedwait_signal (struct timespec *timeout)
+{
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+	return(mono_cond_timedwait (&_wapi_shared_data->signal_cond,
+				    &_wapi_shared_data->signal_mutex,
+				    timeout));
+#else
+	struct timespec fake_timeout;
+	int ret;
+	
+	_wapi_calc_timeout (&fake_timeout, 100);
+	
+	if((fake_timeout.tv_sec>timeout->tv_sec) ||
+	   (fake_timeout.tv_sec==timeout->tv_sec &&
+	    fake_timeout.tv_nsec > timeout->tv_nsec)) {
+		/* Real timeout is less than 100ms time */
+		ret=mono_cond_timedwait (&_wapi_private_data->signal_cond,
+					 &_wapi_private_data->signal_mutex,
+					 timeout);
+	} else {
+		ret=mono_cond_timedwait (&_wapi_private_data->signal_cond,
+					 &_wapi_private_data->signal_mutex,
+					 &fake_timeout);
+		if(ret==ETIMEDOUT) {
+			ret=0;
+		}
 	}
+	
+	return(ret);
+#endif /* _POSIX_THREAD_PROCESS_SHARED */
+}
+
+int _wapi_handle_wait_signal_handle (gpointer handle)
+{
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	
+	return(mono_cond_wait (&_wapi_shared_data->handles[idx].signal_cond,
+			       &_wapi_shared_data->handles[idx].signal_mutex));
+#else
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	struct timespec fake_timeout;
+	int ret;
+	
+	_wapi_calc_timeout (&fake_timeout, 100);
+	
+	ret=mono_cond_timedwait (&_wapi_shared_data->handles[idx].signal_cond,
+				 &_wapi_shared_data->handles[idx].signal_mutex,
+				 &fake_timeout);
+	if(ret==ETIMEDOUT) {
+		ret=0;
+	}
+
+	return(ret);
+#endif /* _POSIX_THREAD_PROCESS_SHARED */
+}
 
-	if(alertable==TRUE) {
-		/* Deal with queued APC or IO completion routines */
+int _wapi_handle_timedwait_signal_handle (gpointer handle,
+					  struct timespec *timeout)
+{
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	
+	return(mono_cond_timedwait (&_wapi_shared_data->handles[idx].signal_cond,
+				    &_wapi_shared_data->handles[idx].signal_mutex,
+				    timeout));
+#else
+	guint32 idx=GPOINTER_TO_UINT (handle);
+	struct timespec fake_timeout;
+	int ret;
+	
+	_wapi_calc_timeout (&fake_timeout, 100);
+	
+	if((fake_timeout.tv_sec>timeout->tv_sec) ||
+	   (fake_timeout.tv_sec==timeout->tv_sec &&
+	    fake_timeout.tv_nsec > timeout->tv_nsec)) {
+		/* Real timeout is less than 100ms time */
+		ret=mono_cond_timedwait (&_wapi_shared_data->handles[idx].signal_cond,
+					 &_wapi_shared_data->handles[idx].signal_mutex,
+					 timeout);
+	} else {
+		ret=mono_cond_timedwait (&_wapi_shared_data->handles[idx].signal_cond,
+					 &_wapi_shared_data->handles[idx].signal_mutex,
+					 &fake_timeout);
+		if(ret==ETIMEDOUT) {
+			ret=0;
+		}
 	}
 	
 	return(ret);
+#endif /* _POSIX_THREAD_PROCESS_SHARED */
+}
+
+gboolean _wapi_handle_process_fork (guint32 cmd, guint32 args, guint32 env,
+				    guint32 dir, gboolean inherit,
+				    guint32 flags, gpointer stdin_handle,
+				    gpointer stdout_handle,
+				    gpointer stderr_handle,
+				    gpointer *process_handle,
+				    gpointer *thread_handle, guint32 *pid,
+				    guint32 *tid)
+{
+	WapiHandleRequest fork_proc;
+	WapiHandleResponse fork_proc_resp;
+	int in_fd, out_fd, err_fd;
+	
+	if(shared!=TRUE) {
+		return(FALSE);
+	}
+
+	fork_proc.type=WapiHandleRequestType_ProcessFork;
+	fork_proc.u.process_fork.cmd=cmd;
+	fork_proc.u.process_fork.args=args;
+	fork_proc.u.process_fork.env=env;
+	fork_proc.u.process_fork.dir=dir;
+	fork_proc.u.process_fork.stdin_handle=GPOINTER_TO_UINT (stdin_handle);
+	fork_proc.u.process_fork.stdout_handle=GPOINTER_TO_UINT (stdout_handle);
+	fork_proc.u.process_fork.stderr_handle=GPOINTER_TO_UINT (stderr_handle);
+	fork_proc.u.process_fork.inherit=inherit;
+	fork_proc.u.process_fork.flags=flags;
+	
+	in_fd=_wapi_file_handle_to_fd (stdin_handle);
+	out_fd=_wapi_file_handle_to_fd (stdout_handle);
+	err_fd=_wapi_file_handle_to_fd (stderr_handle);
+
+	if(in_fd==-1 || out_fd==-1 || err_fd==-1) {
+		/* We were given duff handles */
+		/* FIXME: error code */
+		return(FALSE);
+	}
+	
+	_wapi_daemon_request_response_with_fds (daemon_sock, &fork_proc,
+						&fork_proc_resp, in_fd,
+						out_fd, err_fd);
+	if(fork_proc_resp.type==WapiHandleResponseType_ProcessFork) {
+		*process_handle=GUINT_TO_POINTER (fork_proc_resp.u.process_fork.process_handle);
+		*thread_handle=GUINT_TO_POINTER (fork_proc_resp.u.process_fork.thread_handle);
+		*pid=fork_proc_resp.u.process_fork.pid;
+		*tid=fork_proc_resp.u.process_fork.tid;
+
+		/* If there was an internal error, the handles will be
+		 * 0.  If there was an error forking or execing, the
+		 * handles will have values, and process_handle's
+		 * exec_errno will be set, and the handle will be
+		 * signalled immediately.
+		 */
+		if(process_handle==0 || thread_handle==0) {
+			return(FALSE);
+		} else {
+			return(TRUE);
+		}
+	} else {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": bogus daemon response, type %d",
+			   fork_proc_resp.type);
+		g_assert_not_reached ();
+	}
+	
+	return(FALSE);
 }
diff --git a/mono/io-layer/handles.h b/mono/io-layer/handles.h
index 5e4d424b221..0591baa17cf 100644
--- a/mono/io-layer/handles.h
+++ b/mono/io-layer/handles.h
@@ -1,12 +1,17 @@
+/*
+ * handles.h:  Generic operations on handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_HANDLES_H_
 #define _WAPI_HANDLES_H_
 
-#define INVALID_HANDLE_VALUE (WapiHandle *)-1
-
-typedef struct _WapiHandle WapiHandle;
+#define INVALID_HANDLE_VALUE (gpointer)-1
 
-extern gboolean CloseHandle(WapiHandle *handle);
-extern guint32 SignalObjectAndWait(WapiHandle *signal, WapiHandle *wait,
-				   guint32 timeout, gboolean alertable);
+extern gboolean CloseHandle(gpointer handle);
 
 #endif /* _WAPI_HANDLES_H_ */
diff --git a/mono/io-layer/io-layer-dummy.c b/mono/io-layer/io-layer-dummy.c
index d0d088fa433..f6e150a37ec 100644
--- a/mono/io-layer/io-layer-dummy.c
+++ b/mono/io-layer/io-layer-dummy.c
@@ -1,2 +1,11 @@
+/*
+ * io-layer-dummy.c:  Dummy file to fill the library on windows
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 extern char *_mono_iolayer_dummylib;
 char *_mono_iolayer_dummylib="This is a dummy library that isn't needed on Windows";
diff --git a/mono/io-layer/io-layer.h b/mono/io-layer/io-layer.h
index 3656ae0ebcb..b1fac0f709b 100644
--- a/mono/io-layer/io-layer.h
+++ b/mono/io-layer/io-layer.h
@@ -1,24 +1,27 @@
+/*
+ * io-layer.h: Include the right files depending on platform.  This
+ * file is the only entry point into the io-layer library.
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _MONO_IOLAYER_IOLAYER_H_
 #define _MONO_IOLAYER_IOLAYER_H_
 
-#include <config.h>
-
-#if defined(PLATFORM_WIN32)
+#if defined(__WIN32__)
 /* Native win32 */
 #define UNICODE
 #define _UNICODE
 #define __USE_W32_SOCKETS
+#include <w32api.h>
 #include <windows.h>
+#include <ws2tcpip.h>
 #else	/* EVERYONE ELSE */
 #include "mono/io-layer/wapi.h"
 #include "mono/io-layer/uglify.h"
 #endif /* PLATFORM_WIN32 */
 
-#ifdef HAVE_SYS_FILIO_H
-#include <sys/filio.h>     /* defines FIONBIO and FIONREAD */
-#endif
-#ifdef HAVE_SYS_SOCKIO_H
-#include <sys/sockio.h>    /* defines SIOCATMARK */
-#endif
-
 #endif /* _MONO_IOLAYER_IOLAYER_H_ */
diff --git a/mono/io-layer/io-private.h b/mono/io-layer/io-private.h
new file mode 100644
index 00000000000..59a35fb80f8
--- /dev/null
+++ b/mono/io-layer/io-private.h
@@ -0,0 +1,52 @@
+/*
+ * io-private.h:  Private definitions for file, console and find handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_IO_PRIVATE_H_
+#define _WAPI_IO_PRIVATE_H_
+
+#include <config.h>
+#include <glib.h>
+#include <glob.h>
+
+extern struct _WapiHandleOps _wapi_file_ops;
+extern struct _WapiHandleOps _wapi_console_ops;
+extern struct _WapiHandleOps _wapi_find_ops;
+extern struct _WapiHandleOps _wapi_pipe_ops;
+
+/* Currently used for both FILE, CONSOLE and PIPE handle types.  This may
+ * have to change in future.
+ */
+struct _WapiHandle_file
+{
+	guint32 filename;
+	guint32 security_attributes;
+	guint32 fileaccess;
+	guint32 sharemode;
+	guint32 attrs;
+};
+
+struct _WapiHandlePrivate_file
+{
+	int fd;
+};
+
+struct _WapiHandle_find
+{
+	glob_t glob;
+	size_t count;
+};
+
+struct _WapiHandlePrivate_find
+{
+	int dummy;
+};
+
+extern int _wapi_file_handle_to_fd (gpointer handle);
+
+#endif /* _WAPI_IO_PRIVATE_H_ */
diff --git a/mono/io-layer/io.c b/mono/io-layer/io.c
index f09d4a5bbd7..ada88dbdc06 100644
--- a/mono/io-layer/io.c
+++ b/mono/io-layer/io.c
@@ -1,3 +1,12 @@
+/*
+ * io.c:  File, console and find handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <fcntl.h>
@@ -7,99 +16,300 @@
 #include <sys/poll.h>
 #include <sys/stat.h>
 #include <sys/types.h>
+#include <glob.h>
+#include <stdio.h>
 #include <utime.h>
 
-#include "mono/io-layer/wapi.h"
-#include "unicode.h"
-#include "wapi-private.h"
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/unicode.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/io-private.h>
+#include <mono/io-layer/timefuncs-private.h>
 
 #undef DEBUG
-#define ACTUALLY_DO_UNICODE
-
-/* Currently used for both FILE and CONSOLE handle types.  This may
- * have to change in future.
- */
-struct _WapiHandle_file
-{
-	WapiHandle handle;
-	int fd;
-	guchar *filename;
-	WapiSecurityAttributes *security_attributes;
-	guint32 fileaccess;
-	guint32 sharemode;
-	guint32 attrs;
-};
 
-static void file_close(WapiHandle *handle);
+static void file_close_shared (gpointer handle);
+static void file_close_private (gpointer handle);
 static WapiFileType file_getfiletype(void);
-static gboolean file_read(WapiHandle *handle, gpointer buffer,
+static gboolean file_read(gpointer handle, gpointer buffer,
 			  guint32 numbytes, guint32 *bytesread,
 			  WapiOverlapped *overlapped);
-static gboolean file_write(WapiHandle *handle, gconstpointer buffer,
+static gboolean file_write(gpointer handle, gconstpointer buffer,
 			   guint32 numbytes, guint32 *byteswritten,
 			   WapiOverlapped *overlapped);
-static guint32 file_seek(WapiHandle *handle, gint32 movedistance,
+static gboolean file_flush(gpointer handle);
+static guint32 file_seek(gpointer handle, gint32 movedistance,
 			 gint32 *highmovedistance, WapiSeekMethod method);
-static gboolean file_setendoffile(WapiHandle *handle);
-static guint32 file_getfilesize(WapiHandle *handle, guint32 *highsize);
-static gboolean file_getfiletime(WapiHandle *handle, WapiFileTime *create_time,
+static gboolean file_setendoffile(gpointer handle);
+static guint32 file_getfilesize(gpointer handle, guint32 *highsize);
+static gboolean file_getfiletime(gpointer handle, WapiFileTime *create_time,
 				 WapiFileTime *last_access,
 				 WapiFileTime *last_write);
-static gboolean file_setfiletime(WapiHandle *handle,
+static gboolean file_setfiletime(gpointer handle,
 				 const WapiFileTime *create_time,
 				 const WapiFileTime *last_access,
 				 const WapiFileTime *last_write);
 
 /* File handle is only signalled for overlapped IO */
-static struct _WapiHandleOps file_ops = {
-	file_close,		/* close */
-	file_getfiletype,	/* getfiletype */
-	file_read,		/* readfile */
-	file_write,		/* writefile */
-	file_seek,		/* seek */
-	file_setendoffile,	/* setendoffile */
-	file_getfilesize,	/* getfilesize */
-	file_getfiletime,	/* getfiletime */
-	file_setfiletime,	/* setfiletime */
-	NULL,			/* wait */
-	NULL,			/* wait_multiple */
+struct _WapiHandleOps _wapi_file_ops = {
+	file_close_shared,	/* close_shared */
+	file_close_private,	/* close_private */
 	NULL,			/* signal */
+	NULL,			/* own */
+	NULL,			/* is_owned */
 };
 
+static void console_close_shared (gpointer handle);
+static void console_close_private (gpointer handle);
 static WapiFileType console_getfiletype(void);
+static gboolean console_read(gpointer handle, gpointer buffer,
+			     guint32 numbytes, guint32 *bytesread,
+			     WapiOverlapped *overlapped);
+static gboolean console_write(gpointer handle, gconstpointer buffer,
+			      guint32 numbytes, guint32 *byteswritten,
+			      WapiOverlapped *overlapped);
 
 /* Console is mostly the same as file, except it can block waiting for
  * input or output
  */
-static struct _WapiHandleOps console_ops = {
-	file_close,		/* close */
-	console_getfiletype,	/* getfiletype */
-	file_read,		/* readfile */
-	file_write,		/* writefile */
-	NULL,			/* seek */
-	NULL,			/* setendoffile */
-	NULL,			/* getfilesize */
-	NULL,			/* getfiletime */
-	NULL,			/* setfiletime */
-	NULL,			/* FIXME: wait */
-	NULL,			/* FIXME: wait_multiple */
+struct _WapiHandleOps _wapi_console_ops = {
+	console_close_shared,	/* close_shared */
+	console_close_private,	/* close_private */
 	NULL,			/* signal */
+	NULL,			/* own */
+	NULL,			/* is_owned */
 };
 
-static void file_close(WapiHandle *handle)
+/* Find handle has no ops.
+ */
+struct _WapiHandleOps _wapi_find_ops = {
+	NULL,			/* close_shared */
+	NULL,			/* close_private */
+	NULL,			/* signal */
+	NULL,			/* own */
+	NULL,			/* is_owned */
+};
+
+static void pipe_close_shared (gpointer handle);
+static void pipe_close_private (gpointer handle);
+static WapiFileType pipe_getfiletype (void);
+static gboolean pipe_read (gpointer handle, gpointer buffer, guint32 numbytes,
+			   guint32 *bytesread, WapiOverlapped *overlapped);
+static gboolean pipe_write (gpointer handle, gconstpointer buffer,
+			    guint32 numbytes, guint32 *byteswritten,
+			    WapiOverlapped *overlapped);
+
+/* Pipe handles
+ */
+struct _WapiHandleOps _wapi_pipe_ops = {
+	pipe_close_shared,	/* close_shared */
+	pipe_close_private,	/* close_private */
+	NULL,			/* signal */
+	NULL,			/* own */
+	NULL,			/* is_owned */
+};
+
+static struct {
+	/* File, console and pipe handles */
+	WapiFileType (*getfiletype)(void);
+	
+	/* File, console and pipe handles */
+	gboolean (*readfile)(gpointer handle, gpointer buffer,
+			     guint32 numbytes, guint32 *bytesread,
+			     WapiOverlapped *overlapped);
+	gboolean (*writefile)(gpointer handle, gconstpointer buffer,
+			      guint32 numbytes, guint32 *byteswritten,
+			      WapiOverlapped *overlapped);
+	gboolean (*flushfile)(gpointer handle);
+	
+	/* File handles */
+	guint32 (*seek)(gpointer handle, gint32 movedistance,
+			gint32 *highmovedistance, WapiSeekMethod method);
+	gboolean (*setendoffile)(gpointer handle);
+	guint32 (*getfilesize)(gpointer handle, guint32 *highsize);
+	gboolean (*getfiletime)(gpointer handle, WapiFileTime *create_time,
+				WapiFileTime *last_access,
+				WapiFileTime *last_write);
+	gboolean (*setfiletime)(gpointer handle,
+				const WapiFileTime *create_time,
+				const WapiFileTime *last_access,
+				const WapiFileTime *last_write);
+} io_ops[WAPI_HANDLE_COUNT]={
+	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* file */
+	{file_getfiletype,
+	 file_read, file_write,
+	 file_flush, file_seek,
+	 file_setendoffile,
+	 file_getfilesize,
+	 file_getfiletime,
+	 file_setfiletime},
+	/* console */
+	{console_getfiletype,
+	 console_read,
+	 console_write,
+	 NULL, NULL, NULL, NULL, NULL, NULL},
+	/* thread */
+	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* sem */
+	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* mutex */
+	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* event */
+	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* socket (will need at least read and write) */
+	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* find */
+	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* process */
+	{NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL},
+	/* pipe */
+	{pipe_getfiletype,
+	 pipe_read,
+	 pipe_write,
+	 NULL, NULL, NULL, NULL, NULL, NULL},
+};
+
+
+static mono_once_t io_ops_once=MONO_ONCE_INIT;
+
+static void io_ops_init (void)
+{
+/* 	_wapi_handle_register_capabilities (WAPI_HANDLE_FILE, */
+/* 					    WAPI_HANDLE_CAP_WAIT); */
+/* 	_wapi_handle_register_capabilities (WAPI_HANDLE_CONSOLE, */
+/* 					    WAPI_HANDLE_CAP_WAIT); */
+}
+
+/* Some utility functions.
+ */
+
+static guint32 _wapi_stat_to_file_attributes (struct stat *buf)
+{
+	guint32 attrs = 0;
+
+	/* FIXME: this could definitely be better */
+
+	if (S_ISDIR (buf->st_mode))
+		attrs |= FILE_ATTRIBUTE_DIRECTORY;
+	else
+		attrs |= FILE_ATTRIBUTE_ARCHIVE;
+	
+	if (!(buf->st_mode & S_IWUSR))
+		attrs |= FILE_ATTRIBUTE_READONLY;
+	
+	return attrs;
+}
+
+static void _wapi_set_last_error_from_errno (void)
 {
-	struct _WapiHandle_file *file_handle=(struct _WapiHandle_file *)handle;
+	/* mapping ideas borrowed from wine. they may need some work */
+
+	switch (errno) {
+	case EACCES: case EPERM: case EROFS:
+		SetLastError (ERROR_ACCESS_DENIED);
+		break;
+	
+	case EAGAIN:
+		SetLastError (ERROR_SHARING_VIOLATION);
+		break;
+	
+	case EBUSY:
+		SetLastError (ERROR_LOCK_VIOLATION);
+		break;
+	
+	case EEXIST:
+		SetLastError (ERROR_FILE_EXISTS);
+		break;
+	
+	case EINVAL: case ESPIPE:
+		SetLastError (ERROR_SEEK);
+		break;
+	
+	case EISDIR:
+		SetLastError (ERROR_CANNOT_MAKE);
+		break;
+	
+	case ENFILE: case EMFILE:
+		SetLastError (ERROR_NO_MORE_FILES);
+		break;
+
+	case ENOENT: case ENOTDIR:
+		SetLastError (ERROR_FILE_NOT_FOUND);
+		break;
+	
+	case ENOSPC:
+		SetLastError (ERROR_HANDLE_DISK_FULL);
+		break;
+	
+	case ENOTEMPTY:
+		SetLastError (ERROR_DIR_NOT_EMPTY);
+		break;
+
+	case ENOEXEC:
+		SetLastError (ERROR_BAD_FORMAT);
+		break;
+
+	case ENAMETOOLONG:
+		SetLastError (ERROR_FILENAME_EXCED_RANGE);
+		break;
+	
+	default:
+		g_message ("Unknown errno: %s\n", strerror (errno));
+		SetLastError (ERROR_GEN_FAILURE);
+		break;
+	}
+}
+
+/* Handle ops.
+ */
+static void file_close_shared (gpointer handle)
+{
+	struct _WapiHandle_file *file_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE,
+				(gpointer *)&file_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		return;
+	}
 	
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": closing file handle %p with fd %d",
-		  file_handle, file_handle->fd);
+	g_message(G_GNUC_PRETTY_FUNCTION ": closing file handle %p", handle);
 #endif
 	
-	close(file_handle->fd);
-	if(file_handle->filename!=NULL) {
-		g_free(file_handle->filename);
-		file_handle->filename=NULL;
+	if(file_handle->filename!=0) {
+		_wapi_handle_scratch_delete (file_handle->filename);
+		file_handle->filename=0;
+	}
+	if(file_handle->security_attributes!=0) {
+		_wapi_handle_scratch_delete (file_handle->security_attributes);
+		file_handle->security_attributes=0;
+	}
+}
+
+static void file_close_private (gpointer handle)
+{
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE, NULL,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		return;
 	}
+	
+#ifdef DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION ": closing file handle %p with fd %d",
+		  handle, file_private_handle->fd);
+#endif
+	
+	close(file_private_handle->fd);
 }
 
 static WapiFileType file_getfiletype(void)
@@ -107,13 +317,24 @@ static WapiFileType file_getfiletype(void)
 	return(FILE_TYPE_DISK);
 }
 
-static gboolean file_read(WapiHandle *handle, gpointer buffer,
+static gboolean file_read(gpointer handle, gpointer buffer,
 			  guint32 numbytes, guint32 *bytesread,
 			  WapiOverlapped *overlapped G_GNUC_UNUSED)
 {
-	struct _WapiHandle_file *file_handle=(struct _WapiHandle_file *)handle;
+	struct _WapiHandle_file *file_handle;
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
 	int ret;
 	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE,
+				(gpointer *)&file_handle,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		return(FALSE);
+	}
+	
 	if(bytesread!=NULL) {
 		*bytesread=0;
 	}
@@ -121,18 +342,18 @@ static gboolean file_read(WapiHandle *handle, gpointer buffer,
 	if(!(file_handle->fileaccess&GENERIC_READ) &&
 	   !(file_handle->fileaccess&GENERIC_ALL)) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_READ access: %u", handle, file_handle->fd, file_handle->fileaccess);
+		g_message(G_GNUC_PRETTY_FUNCTION": handle %p fd %d doesn't have GENERIC_READ access: %u", handle, file_private_handle->fd, file_handle->fileaccess);
 #endif
 
 		return(FALSE);
 	}
 	
-	ret=read(file_handle->fd, buffer, numbytes);
+	ret=read(file_private_handle->fd, buffer, numbytes);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": read of handle %p fd %d error: %s", handle,
-			  file_handle->fd, strerror(errno));
+			  file_private_handle->fd, strerror(errno));
 #endif
 
 		return(FALSE);
@@ -145,13 +366,24 @@ static gboolean file_read(WapiHandle *handle, gpointer buffer,
 	return(TRUE);
 }
 
-static gboolean file_write(WapiHandle *handle, gconstpointer buffer,
+static gboolean file_write(gpointer handle, gconstpointer buffer,
 			   guint32 numbytes, guint32 *byteswritten,
 			   WapiOverlapped *overlapped G_GNUC_UNUSED)
 {
-	struct _WapiHandle_file *file_handle=(struct _WapiHandle_file *)handle;
+	struct _WapiHandle_file *file_handle;
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
 	int ret;
 	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE,
+				(gpointer *)&file_handle,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		return(FALSE);
+	}
+	
 	if(byteswritten!=NULL) {
 		*byteswritten=0;
 	}
@@ -159,18 +391,18 @@ static gboolean file_write(WapiHandle *handle, gconstpointer buffer,
 	if(!(file_handle->fileaccess&GENERIC_WRITE) &&
 	   !(file_handle->fileaccess&GENERIC_ALL)) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_WRITE access: %u", handle, file_handle->fd, file_handle->fileaccess);
+		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_WRITE access: %u", handle, file_private_handle->fd, file_handle->fileaccess);
 #endif
 
 		return(FALSE);
 	}
 	
-	ret=write(file_handle->fd, buffer, numbytes);
+	ret=write(file_private_handle->fd, buffer, numbytes);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": write of handle %p fd %d error: %s", handle,
-			  file_handle->fd, strerror(errno));
+			  file_private_handle->fd, strerror(errno));
 #endif
 
 		return(FALSE);
@@ -182,19 +414,69 @@ static gboolean file_write(WapiHandle *handle, gconstpointer buffer,
 	return(TRUE);
 }
 
-static guint32 file_seek(WapiHandle *handle, gint32 movedistance,
+static gboolean file_flush(gpointer handle)
+{
+	struct _WapiHandle_file *file_handle;
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
+	int ret;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE,
+				(gpointer *)&file_handle,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		return(FALSE);
+	}
+
+	if(!(file_handle->fileaccess&GENERIC_WRITE) &&
+	   !(file_handle->fileaccess&GENERIC_ALL)) {
+#ifdef DEBUG
+		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_WRITE access: %u", handle, file_private_handle->fd, file_handle->fileaccess);
+#endif
+
+		return(FALSE);
+	}
+
+	ret=fsync(file_private_handle->fd);
+	if (ret==-1) {
+#ifdef DEBUG
+		g_message(G_GNUC_PRETTY_FUNCTION
+			  ": write of handle %p fd %d error: %s", handle,
+			  file_private_handle->fd, strerror(errno));
+#endif
+
+		return(FALSE);
+	}
+	
+	return(TRUE);
+}
+
+static guint32 file_seek(gpointer handle, gint32 movedistance,
 			 gint32 *highmovedistance, WapiSeekMethod method)
 {
-	struct _WapiHandle_file *file_handle=(struct _WapiHandle_file *)handle;
+	struct _WapiHandle_file *file_handle;
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
 	off_t offset, newpos;
 	int whence;
 	guint32 ret;
 	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE,
+				(gpointer *)&file_handle,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		return(INVALID_SET_FILE_POINTER);
+	}
+	
 	if(!(file_handle->fileaccess&GENERIC_READ) &&
 	   !(file_handle->fileaccess&GENERIC_WRITE) &&
 	   !(file_handle->fileaccess&GENERIC_ALL)) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_READ or GENERIC_WRITE access: %u", handle, file_handle->fd, file_handle->fileaccess);
+		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_READ or GENERIC_WRITE access: %u", handle, file_private_handle->fd, file_handle->fileaccess);
 #endif
 
 		return(INVALID_SET_FILE_POINTER);
@@ -242,20 +524,20 @@ static guint32 file_seek(WapiHandle *handle, gint32 movedistance,
 #ifdef HAVE_LARGE_FILE_SUPPORT
 	g_message(G_GNUC_PRETTY_FUNCTION
 		  ": moving handle %p fd %d by %lld bytes from %d", handle,
-		  file_handle->fd, offset, whence);
+		  file_private_handle->fd, offset, whence);
 #else
 	g_message(G_GNUC_PRETTY_FUNCTION
 		  ": moving handle %p fd %d by %ld bytes from %d", handle,
-		  file_handle->fd, offset, whence);
+		  file_private_handle->fd, offset, whence);
 #endif
 #endif
 
-	newpos=lseek(file_handle->fd, offset, whence);
+	newpos=lseek(file_private_handle->fd, offset, whence);
 	if(newpos==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": lseek on handle %p fd %d returned error %s",
-			  handle, file_handle->fd, strerror(errno));
+			  handle, file_private_handle->fd, strerror(errno));
 #endif
 
 		return(INVALID_SET_FILE_POINTER);
@@ -285,24 +567,35 @@ static guint32 file_seek(WapiHandle *handle, gint32 movedistance,
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION
 		  ": move of handle %p fd %d returning %d/%d", handle,
-		  file_handle->fd, ret,
+		  file_private_handle->fd, ret,
 		  highmovedistance==NULL?0:*highmovedistance);
 #endif
 
 	return(ret);
 }
 
-static gboolean file_setendoffile(WapiHandle *handle)
+static gboolean file_setendoffile(gpointer handle)
 {
-	struct _WapiHandle_file *file_handle=(struct _WapiHandle_file *)handle;
+	struct _WapiHandle_file *file_handle;
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
 	struct stat statbuf;
 	off_t size, pos;
 	int ret;
 	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE,
+				(gpointer *)&file_handle,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		return(FALSE);
+	}
+	
 	if(!(file_handle->fileaccess&GENERIC_WRITE) &&
 	   !(file_handle->fileaccess&GENERIC_ALL)) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_WRITE access: %u", handle, file_handle->fd, file_handle->fileaccess);
+		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_WRITE access: %u", handle, file_private_handle->fd, file_handle->fileaccess);
 #endif
 
 		return(FALSE);
@@ -314,24 +607,24 @@ static gboolean file_setendoffile(WapiHandle *handle)
 	 * than the length, truncate the file.
 	 */
 	
-	ret=fstat(file_handle->fd, &statbuf);
+	ret=fstat(file_private_handle->fd, &statbuf);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": handle %p fd %d fstat failed: %s", handle,
-			  file_handle->fd, strerror(errno));
+			  file_private_handle->fd, strerror(errno));
 #endif
 
 		return(FALSE);
 	}
 	size=statbuf.st_size;
 
-	pos=lseek(file_handle->fd, (off_t)0, SEEK_CUR);
+	pos=lseek(file_private_handle->fd, (off_t)0, SEEK_CUR);
 	if(pos==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": handle %p fd %d lseek failed: %s", handle,
-			  file_handle->fd, strerror(errno));
+			  file_private_handle->fd, strerror(errno));
 #endif
 
 		return(FALSE);
@@ -339,12 +632,13 @@ static gboolean file_setendoffile(WapiHandle *handle)
 	
 	if(pos>size) {
 		/* extend */
-		ret=write(file_handle->fd, "", 1);
+		ret=write(file_private_handle->fd, "", 1);
 		if(ret==-1) {
 #ifdef DEBUG
 			g_message(G_GNUC_PRETTY_FUNCTION
 				  ": handle %p fd %d extend write failed: %s",
-				  handle, file_handle->fd, strerror(errno));
+				  handle, file_private_handle->fd,
+				  strerror(errno));
 #endif
 
 			return(FALSE);
@@ -354,12 +648,12 @@ static gboolean file_setendoffile(WapiHandle *handle)
 	/* always truncate, because the extend write() adds an extra
 	 * byte to the end of the file
 	 */
-	ret=ftruncate(file_handle->fd, pos);
+	ret=ftruncate(file_private_handle->fd, pos);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": handle %p fd %d ftruncate failed: %s", handle,
-			  file_handle->fd, strerror(errno));
+			  file_private_handle->fd, strerror(errno));
 #endif
 		
 		return(FALSE);
@@ -368,29 +662,40 @@ static gboolean file_setendoffile(WapiHandle *handle)
 	return(TRUE);
 }
 
-static guint32 file_getfilesize(WapiHandle *handle, guint32 *highsize)
+static guint32 file_getfilesize(gpointer handle, guint32 *highsize)
 {
-	struct _WapiHandle_file *file_handle=(struct _WapiHandle_file *)handle;
+	struct _WapiHandle_file *file_handle;
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
 	struct stat statbuf;
 	guint32 size;
 	int ret;
 	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE,
+				(gpointer *)&file_handle,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		return(INVALID_FILE_SIZE);
+	}
+	
 	if(!(file_handle->fileaccess&GENERIC_READ) &&
 	   !(file_handle->fileaccess&GENERIC_WRITE) &&
 	   !(file_handle->fileaccess&GENERIC_ALL)) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_READ or GENERIC_WRITE access: %u", handle, file_handle->fd, file_handle->fileaccess);
+		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_READ or GENERIC_WRITE access: %u", handle, file_private_handle->fd, file_handle->fileaccess);
 #endif
 
 		return(INVALID_FILE_SIZE);
 	}
 
-	ret=fstat(file_handle->fd, &statbuf);
+	ret=fstat(file_private_handle->fd, &statbuf);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": handle %p fd %d fstat failed: %s", handle,
-			  file_handle->fd, strerror(errno));
+			  file_private_handle->fd, strerror(errno));
 #endif
 
 		return(INVALID_FILE_SIZE);
@@ -417,30 +722,41 @@ static guint32 file_getfilesize(WapiHandle *handle, guint32 *highsize)
 	return(size);
 }
 
-static gboolean file_getfiletime(WapiHandle *handle, WapiFileTime *create_time,
+static gboolean file_getfiletime(gpointer handle, WapiFileTime *create_time,
 				 WapiFileTime *last_access,
 				 WapiFileTime *last_write)
 {
-	struct _WapiHandle_file *file_handle=(struct _WapiHandle_file *)handle;
+	struct _WapiHandle_file *file_handle;
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
 	struct stat statbuf;
 	guint64 create_ticks, access_ticks, write_ticks;
 	int ret;
 	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE,
+				(gpointer *)&file_handle,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		return(FALSE);
+	}
+	
 	if(!(file_handle->fileaccess&GENERIC_READ) &&
 	   !(file_handle->fileaccess&GENERIC_ALL)) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_READ access: %u", handle, file_handle->fd, file_handle->fileaccess);
+		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_READ access: %u", handle, file_private_handle->fd, file_handle->fileaccess);
 #endif
 
 		return(FALSE);
 	}
 	
-	ret=fstat(file_handle->fd, &statbuf);
+	ret=fstat(file_private_handle->fd, &statbuf);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": handle %p fd %d fstat failed: %s", handle,
-			  file_handle->fd, strerror(errno));
+			  file_private_handle->fd, strerror(errno));
 #endif
 
 		return(FALSE);
@@ -494,31 +810,43 @@ static gboolean file_getfiletime(WapiHandle *handle, WapiFileTime *create_time,
 	return(TRUE);
 }
 
-static gboolean file_setfiletime(WapiHandle *handle,
+static gboolean file_setfiletime(gpointer handle,
 				 const WapiFileTime *create_time G_GNUC_UNUSED,
 				 const WapiFileTime *last_access,
 				 const WapiFileTime *last_write)
 {
-	struct _WapiHandle_file *file_handle=(struct _WapiHandle_file *)handle;
+	struct _WapiHandle_file *file_handle;
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
+	guchar *name;
 	struct utimbuf utbuf;
 	struct stat statbuf;
 	guint64 access_ticks, write_ticks;
 	int ret;
 	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE,
+				(gpointer *)&file_handle,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		return(FALSE);
+	}
+	
 	if(!(file_handle->fileaccess&GENERIC_WRITE) &&
 	   !(file_handle->fileaccess&GENERIC_ALL)) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_WRITE access: %u", handle, file_handle->fd, file_handle->fileaccess);
+		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_WRITE access: %u", handle, file_private_handle->fd, file_handle->fileaccess);
 #endif
 
 		return(FALSE);
 	}
 
-	if(file_handle->filename==NULL) {
+	if(file_handle->filename==0) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": handle %p fd %d unknown filename", handle,
-			  file_handle->fd);
+			  file_private_handle->fd);
 #endif
 
 		return(FALSE);
@@ -527,12 +855,12 @@ static gboolean file_setfiletime(WapiHandle *handle,
 	/* Get the current times, so we can put the same times back in
 	 * the event that one of the FileTime structs is NULL
 	 */
-	ret=fstat(file_handle->fd, &statbuf);
+	ret=fstat(file_private_handle->fd, &statbuf);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": handle %p fd %d fstat failed: %s", handle,
-			  file_handle->fd, strerror(errno));
+			  file_private_handle->fd, strerror(errno));
 #endif
 
 		return(FALSE);
@@ -560,26 +888,337 @@ static gboolean file_setfiletime(WapiHandle *handle,
 		  utbuf.actime, utbuf.modtime);
 #endif
 
-	ret=utime(file_handle->filename, &utbuf);
+	name=_wapi_handle_scratch_lookup_as_string (file_handle->filename);
+
+	ret=utime(name, &utbuf);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
 			  ": handle %p [%s] fd %d utime failed: %s", handle,
-			  file_handle->filename, file_handle->fd,
-			  strerror(errno));
-#endif
+			  name, file_private_handle->fd, strerror(errno));
 
+#endif
+		g_free (name);
 		return(FALSE);
 	}
 
+	g_free (name);
+	
 	return(TRUE);
 }
 
+static void console_close_shared (gpointer handle)
+{
+	struct _WapiHandle_file *console_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_CONSOLE,
+				(gpointer *)&console_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up console handle %p", handle);
+		return;
+	}
+	
+#ifdef DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION ": closing console handle %p", handle);
+#endif
+	
+	if(console_handle->filename!=0) {
+		_wapi_handle_scratch_delete (console_handle->filename);
+		console_handle->filename=0;
+	}
+	if(console_handle->security_attributes!=0) {
+		_wapi_handle_scratch_delete (console_handle->security_attributes);
+		console_handle->security_attributes=0;
+	}
+}
+
+static void console_close_private (gpointer handle)
+{
+	struct _WapiHandlePrivate_file *console_private_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_CONSOLE, NULL,
+				(gpointer *)&console_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up console handle %p", handle);
+		return;
+	}
+	
+#ifdef DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION
+		  ": closing console handle %p with fd %d", handle,
+		  console_private_handle->fd);
+#endif
+	
+	close(console_private_handle->fd);
+}
+
 static WapiFileType console_getfiletype(void)
 {
 	return(FILE_TYPE_CHAR);
 }
 
+static gboolean console_read(gpointer handle, gpointer buffer,
+			     guint32 numbytes, guint32 *bytesread,
+			     WapiOverlapped *overlapped G_GNUC_UNUSED)
+{
+	struct _WapiHandle_file *console_handle;
+	struct _WapiHandlePrivate_file *console_private_handle;
+	gboolean ok;
+	int ret;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_CONSOLE,
+				(gpointer *)&console_handle,
+				(gpointer *)&console_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up console handle %p", handle);
+		return(FALSE);
+	}
+	
+	if(bytesread!=NULL) {
+		*bytesread=0;
+	}
+	
+	if(!(console_handle->fileaccess&GENERIC_READ) &&
+	   !(console_handle->fileaccess&GENERIC_ALL)) {
+#ifdef DEBUG
+		g_message(G_GNUC_PRETTY_FUNCTION": handle %p fd %d doesn't have GENERIC_READ access: %u", handle, console_private_handle->fd, console_handle->fileaccess);
+#endif
+
+		return(FALSE);
+	}
+	
+	ret=read(console_private_handle->fd, buffer, numbytes);
+	if(ret==-1) {
+#ifdef DEBUG
+		g_message(G_GNUC_PRETTY_FUNCTION
+			  ": read of handle %p fd %d error: %s", handle,
+			  console_private_handle->fd, strerror(errno));
+#endif
+
+		return(FALSE);
+	}
+	
+	if(bytesread!=NULL) {
+		*bytesread=ret;
+	}
+	
+	return(TRUE);
+}
+
+static gboolean console_write(gpointer handle, gconstpointer buffer,
+			      guint32 numbytes, guint32 *byteswritten,
+			      WapiOverlapped *overlapped G_GNUC_UNUSED)
+{
+	struct _WapiHandle_file *console_handle;
+	struct _WapiHandlePrivate_file *console_private_handle;
+	gboolean ok;
+	int ret;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_CONSOLE,
+				(gpointer *)&console_handle,
+				(gpointer *)&console_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up console handle %p", handle);
+		return(FALSE);
+	}
+	
+	if(byteswritten!=NULL) {
+		*byteswritten=0;
+	}
+	
+	if(!(console_handle->fileaccess&GENERIC_WRITE) &&
+	   !(console_handle->fileaccess&GENERIC_ALL)) {
+#ifdef DEBUG
+		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_WRITE access: %u", handle, console_private_handle->fd, console_handle->fileaccess);
+#endif
+
+		return(FALSE);
+	}
+	
+	ret=write(console_private_handle->fd, buffer, numbytes);
+	if(ret==-1) {
+#ifdef DEBUG
+		g_message(G_GNUC_PRETTY_FUNCTION
+			  ": write of handle %p fd %d error: %s", handle,
+			  console_private_handle->fd, strerror(errno));
+#endif
+
+		return(FALSE);
+	}
+	if(byteswritten!=NULL) {
+		*byteswritten=ret;
+	}
+	
+	return(TRUE);
+}
+
+static void pipe_close_shared (gpointer handle)
+{
+	struct _WapiHandle_file *pipe_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_PIPE,
+				(gpointer *)&pipe_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up pipe handle %p", handle);
+		return;
+	}
+	
+#ifdef DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION ": closing pipe handle %p", handle);
+#endif
+	
+	if(pipe_handle->filename!=0) {
+		_wapi_handle_scratch_delete (pipe_handle->filename);
+		pipe_handle->filename=0;
+	}
+	if(pipe_handle->security_attributes!=0) {
+		_wapi_handle_scratch_delete (pipe_handle->security_attributes);
+		pipe_handle->security_attributes=0;
+	}
+}
+
+static void pipe_close_private (gpointer handle)
+{
+	struct _WapiHandlePrivate_file *pipe_private_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_PIPE, NULL,
+				(gpointer *)&pipe_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up pipe handle %p", handle);
+		return;
+	}
+	
+#ifdef DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION
+		  ": closing pipe handle %p with fd %d", handle,
+		  pipe_private_handle->fd);
+#endif
+	
+	close(pipe_private_handle->fd);
+}
+
+static WapiFileType pipe_getfiletype(void)
+{
+	return(FILE_TYPE_PIPE);
+}
+
+static gboolean pipe_read (gpointer handle, gpointer buffer,
+			   guint32 numbytes, guint32 *bytesread,
+			   WapiOverlapped *overlapped G_GNUC_UNUSED)
+{
+	struct _WapiHandle_file *pipe_handle;
+	struct _WapiHandlePrivate_file *pipe_private_handle;
+	gboolean ok;
+	int ret;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_PIPE,
+				(gpointer *)&pipe_handle,
+				(gpointer *)&pipe_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up pipe handle %p", handle);
+		return(FALSE);
+	}
+	
+	if(bytesread!=NULL) {
+		*bytesread=0;
+	}
+	
+	if(!(pipe_handle->fileaccess&GENERIC_READ) &&
+	   !(pipe_handle->fileaccess&GENERIC_ALL)) {
+#ifdef DEBUG
+		g_message(G_GNUC_PRETTY_FUNCTION": handle %p fd %d doesn't have GENERIC_READ access: %u", handle, pipe_private_handle->fd, pipe_handle->fileaccess);
+#endif
+
+		return(FALSE);
+	}
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION
+		   ": reading up to %d bytes from pipe %p (fd %d)", numbytes,
+		   handle, pipe_private_handle->fd);
+#endif
+
+	ret=read(pipe_private_handle->fd, buffer, numbytes);
+	if(ret==-1) {
+#ifdef DEBUG
+		g_message(G_GNUC_PRETTY_FUNCTION
+			  ": read of handle %p fd %d error: %s", handle,
+			  pipe_private_handle->fd, strerror(errno));
+#endif
+
+		return(FALSE);
+	}
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": read %d bytes from pipe", ret);
+#endif
+
+	if(bytesread!=NULL) {
+		*bytesread=ret;
+	}
+	
+	return(TRUE);
+}
+
+static gboolean pipe_write(gpointer handle, gconstpointer buffer,
+			   guint32 numbytes, guint32 *byteswritten,
+			   WapiOverlapped *overlapped G_GNUC_UNUSED)
+{
+	struct _WapiHandle_file *pipe_handle;
+	struct _WapiHandlePrivate_file *pipe_private_handle;
+	gboolean ok;
+	int ret;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_PIPE,
+				(gpointer *)&pipe_handle,
+				(gpointer *)&pipe_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up pipe handle %p", handle);
+		return(FALSE);
+	}
+	
+	if(byteswritten!=NULL) {
+		*byteswritten=0;
+	}
+	
+	if(!(pipe_handle->fileaccess&GENERIC_WRITE) &&
+	   !(pipe_handle->fileaccess&GENERIC_ALL)) {
+#ifdef DEBUG
+		g_message(G_GNUC_PRETTY_FUNCTION ": handle %p fd %d doesn't have GENERIC_WRITE access: %u", handle, pipe_private_handle->fd, pipe_handle->fileaccess);
+#endif
+
+		return(FALSE);
+	}
+	
+	ret=write(pipe_private_handle->fd, buffer, numbytes);
+	if(ret==-1) {
+#ifdef DEBUG
+		g_message(G_GNUC_PRETTY_FUNCTION
+			  ": write of handle %p fd %d error: %s", handle,
+			  pipe_private_handle->fd, strerror(errno));
+#endif
+
+		return(FALSE);
+	}
+	if(byteswritten!=NULL) {
+		*byteswritten=ret;
+	}
+	
+	return(TRUE);
+}
+
 static int convert_flags(guint32 fileaccess, guint32 createmode)
 {
 	int flags=0;
@@ -632,11 +1271,15 @@ static guint32 convert_from_flags(int flags)
 {
 	guint32 fileaccess=0;
 	
-	if(flags&O_RDONLY) {
+#ifndef O_ACCMODE
+#define O_ACCMODE (O_RDONLY|O_WRONLY|O_RDWR)
+#endif
+
+	if((flags & O_ACCMODE) == O_RDONLY) {
 		fileaccess=GENERIC_READ;
-	} else if (flags&O_WRONLY) {
+	} else if ((flags & O_ACCMODE) == O_WRONLY) {
 		fileaccess=GENERIC_WRITE;
-	} else if (flags&O_RDWR) {
+	} else if ((flags & O_ACCMODE) == O_RDWR) {
 		fileaccess=GENERIC_READ|GENERIC_WRITE;
 	} else {
 #ifdef DEBUG
@@ -690,17 +1333,21 @@ static mode_t convert_perms(guint32 sharemode)
  *
  * Return value: the new handle, or %INVALID_HANDLE_VALUE on error.
  */
-WapiHandle *CreateFile(const guchar *name, guint32 fileaccess,
-		       guint32 sharemode, WapiSecurityAttributes *security,
-		       guint32 createmode, guint32 attrs,
-		       WapiHandle *template G_GNUC_UNUSED)
+gpointer CreateFile(const gunichar2 *name, guint32 fileaccess,
+		    guint32 sharemode, WapiSecurityAttributes *security,
+		    guint32 createmode, guint32 attrs,
+		    gpointer template G_GNUC_UNUSED)
 {
 	struct _WapiHandle_file *file_handle;
-	WapiHandle *handle;
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gpointer handle;
+	gboolean ok;
 	int flags=convert_flags(fileaccess, createmode);
 	mode_t perms=convert_perms(sharemode);
-	guchar *filename;
+	gchar *filename;
 	int ret;
+
+	mono_once (&io_ops_once, io_ops_init);
 	
 	if(name==NULL) {
 #ifdef DEBUG
@@ -709,9 +1356,8 @@ WapiHandle *CreateFile(const guchar *name, guint32 fileaccess,
 
 		return(INVALID_HANDLE_VALUE);
 	}
-	filename=_wapi_unicode_to_utf8(name);
 
-#ifdef ACTUALLY_DO_UNICODE
+	filename=_wapi_unicode_to_utf8(name);
 	if(filename==NULL) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
@@ -720,49 +1366,64 @@ WapiHandle *CreateFile(const guchar *name, guint32 fileaccess,
 
 		return(INVALID_HANDLE_VALUE);
 	}
-#endif
 	
-#ifdef ACTUALLY_DO_UNICODE
 	ret=open(filename, flags, perms);
-#else
-	ret=open(name, flags, perms);
-#endif
 	
 	if(ret==-1) {
 #ifdef DEBUG
-#ifdef ACTUALLY_DO_UNICODE
-		g_message(G_GNUC_PRETTY_FUNCTION ": Error opening file %s: %s",
-			  filename, strerror(errno));
-#else
 		g_message(G_GNUC_PRETTY_FUNCTION ": Error opening file %s: %s",
 			  filename, strerror(errno));
 #endif
-#endif
+		_wapi_set_last_error_from_errno ();
+		g_free (filename);
+
 		return(INVALID_HANDLE_VALUE);
 	}
 
-	file_handle=g_new0(struct _WapiHandle_file, 1);
-	handle=(WapiHandle *)file_handle;
+	handle=_wapi_handle_new (WAPI_HANDLE_FILE);
+	if(handle==_WAPI_HANDLE_INVALID) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error creating file handle");
+		g_free (filename);
+
+		return(INVALID_HANDLE_VALUE);
+	}
+
+	_wapi_handle_lock_handle (handle);
 	
-	_WAPI_HANDLE_INIT(handle, WAPI_HANDLE_FILE, file_ops);
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE,
+				(gpointer *)&file_handle,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up file handle %p", handle);
+		_wapi_handle_unlock_handle (handle);
+		g_free (filename);
 
-	file_handle->fd=ret;
-#ifdef ACTUALLY_DO_UNICODE
-	file_handle->filename=filename;
-#else
-	file_handle->filename=g_strdup(name);
-#endif
-	file_handle->security_attributes=security;
+		return(INVALID_HANDLE_VALUE);
+	}
+
+	file_private_handle->fd=ret;
+	file_handle->filename=_wapi_handle_scratch_store (filename,
+							  strlen (filename));
+	if(security!=NULL) {
+		file_handle->security_attributes=_wapi_handle_scratch_store (
+			security, sizeof(WapiSecurityAttributes));
+	}
+	
 	file_handle->fileaccess=fileaccess;
 	file_handle->sharemode=sharemode;
 	file_handle->attrs=attrs;
 	
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": returning handle %p [%s] with fd %d",
-		  handle, file_handle->filename, file_handle->fd);
+		  ": returning handle %p with fd %d", handle,
+		  file_private_handle->fd);
 #endif
 
+	_wapi_handle_unlock_handle (handle);
+	g_free (filename);
+	
 	return(handle);
 }
 
@@ -775,9 +1436,9 @@ WapiHandle *CreateFile(const guchar *name, guint32 fileaccess,
  *
  * Return value: %TRUE on success, %FALSE otherwise.
  */
-gboolean DeleteFile(const guchar *name)
+gboolean DeleteFile(const gunichar2 *name)
 {
-	guchar *filename;
+	gchar *filename;
 	int ret;
 	
 	if(name==NULL) {
@@ -789,7 +1450,6 @@ gboolean DeleteFile(const guchar *name)
 	}
 
 	filename=_wapi_unicode_to_utf8(name);
-#ifdef ACTUALLY_DO_UNICODE
 	if(filename==NULL) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION
@@ -798,13 +1458,8 @@ gboolean DeleteFile(const guchar *name)
 
 		return(FALSE);
 	}
-#endif
 	
-#ifdef ACTUALLY_DO_UNICODE
 	ret=unlink(filename);
-#else
-	ret=unlink(name);
-#endif
 	
 	g_free(filename);
 
@@ -816,6 +1471,175 @@ gboolean DeleteFile(const guchar *name)
 }
 
 /**
+ * MoveFile:
+ * @name: a pointer to a NULL-terminated unicode string, that names
+ * the file to be moved.
+ * @dest_name: a pointer to a NULL-terminated unicode string, that is the
+ * new name for the file.
+ *
+ * Renames file @name to @dest_name
+ *
+ * Return value: %TRUE on success, %FALSE otherwise.
+ */
+gboolean MoveFile (const gunichar2 *name, const gunichar2 *dest_name)
+{
+	gchar *utf8_name, *utf8_dest_name;
+	int result;
+
+	utf8_name = _wapi_unicode_to_utf8 (name);
+	if (utf8_name == NULL) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unicode conversion returned NULL");
+#endif
+		
+		return FALSE;
+	}
+
+	utf8_dest_name = _wapi_unicode_to_utf8 (dest_name);
+	if (utf8_dest_name == NULL) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unicode conversion returned NULL");
+#endif
+
+		g_free (utf8_name);
+		return FALSE;
+	}
+
+	result = rename (utf8_name, utf8_dest_name);
+	g_free (utf8_name);
+	g_free (utf8_dest_name);
+
+	if (result == 0)
+		return TRUE;
+	
+	switch (errno) {
+	case EEXIST:
+		SetLastError (ERROR_ALREADY_EXISTS);
+		break;
+	
+	default:
+		_wapi_set_last_error_from_errno ();
+		break;
+	}
+
+	return FALSE;
+}
+
+/**
+ * CopyFile:
+ * @name: a pointer to a NULL-terminated unicode string, that names
+ * the file to be copied.
+ * @dest_name: a pointer to a NULL-terminated unicode string, that is the
+ * new name for the file.
+ * @fail_if_exists: if TRUE and dest_name exists, the copy will fail.
+ *
+ * Copies file @name to @dest_name
+ *
+ * Return value: %TRUE on success, %FALSE otherwise.
+ */
+gboolean CopyFile (const gunichar2 *name, const gunichar2 *dest_name,
+		   gboolean fail_if_exists)
+{
+	gpointer src, dest;
+	guint32 attrs;
+	char *buffer;
+	int remain, n;
+
+	attrs = GetFileAttributes (name);
+	if (attrs == -1) {
+		SetLastError (ERROR_FILE_NOT_FOUND);
+		return  FALSE;
+	}
+	
+	src = CreateFile (name, GENERIC_READ, FILE_SHARE_READ | FILE_SHARE_WRITE,
+			  NULL, OPEN_EXISTING, 0, NULL);
+	if (src == INVALID_HANDLE_VALUE) {
+		_wapi_set_last_error_from_errno ();
+		return FALSE;
+	}
+	
+	dest = CreateFile (dest_name, GENERIC_WRITE, 0, NULL,
+			   fail_if_exists ? CREATE_NEW : CREATE_ALWAYS, attrs, NULL);
+	if (dest == INVALID_HANDLE_VALUE) {
+		_wapi_set_last_error_from_errno ();
+		CloseHandle (src);
+		return FALSE;
+	}
+
+	buffer = g_new (gchar, 2048);
+
+	for (;;) {
+		if (ReadFile (src, buffer,sizeof (buffer), &remain, NULL) == 0) {
+			_wapi_set_last_error_from_errno ();
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": read failed.");
+#endif
+			
+			CloseHandle (dest);
+			CloseHandle (src);
+			return FALSE;
+		}
+
+		if (remain == 0)
+			break;
+
+		while (remain > 0) {
+			if (WriteFile (dest, buffer, remain, &n, NULL) == 0) {
+				_wapi_set_last_error_from_errno ();
+#ifdef DEBUG
+				g_message (G_GNUC_PRETTY_FUNCTION ": write failed.");
+#endif
+				
+				CloseHandle (dest);
+				CloseHandle (src);
+				return FALSE;
+			}
+
+			remain -= n;
+		}
+	}
+
+	g_free (buffer);
+
+	CloseHandle (dest);
+	CloseHandle (src);
+	return TRUE;
+}
+
+static gboolean console_find_fd (gpointer handle, gpointer user_data)
+{
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
+	guint32 fd;
+
+	fd=GPOINTER_TO_UINT (user_data);
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION
+		   ": Looking up a console handle for fd %d", fd);
+#endif
+
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_CONSOLE, NULL,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up console handle %p", handle);
+		return(FALSE);
+	}
+	
+	if(file_private_handle->fd==fd) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": Returning console handle %p", handle);
+#endif
+	
+		return(TRUE);
+	} else {
+		return(FALSE);
+	}
+}
+
+/**
  * GetStdHandle:
  * @stdhandle: specifies the file descriptor
  *
@@ -824,23 +1648,32 @@ gboolean DeleteFile(const guchar *name)
  *
  * Return value: the handle, or %INVALID_HANDLE_VALUE on error
  */
-WapiHandle *GetStdHandle(WapiStdHandle stdhandle)
+
+gpointer GetStdHandle(WapiStdHandle stdhandle)
 {
 	struct _WapiHandle_file *file_handle;
-	WapiHandle *handle;
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
+	gpointer handle;
+	const guchar *name;
 	int flags, fd;
+
+	mono_once (&io_ops_once, io_ops_init);
 	
 	switch(stdhandle) {
 	case STD_INPUT_HANDLE:
 		fd=0;
+		name="<stdin>";
 		break;
 
 	case STD_OUTPUT_HANDLE:
 		fd=1;
+		name="<stdout>";
 		break;
 
 	case STD_ERROR_HANDLE:
 		fd=2;
+		name="<stderr>";
 		break;
 
 	default:
@@ -865,27 +1698,52 @@ WapiHandle *GetStdHandle(WapiStdHandle stdhandle)
 
 		return(INVALID_HANDLE_VALUE);
 	}
+
+	/* See if we already have a handle for this fd */
+	handle=_wapi_search_handle (WAPI_HANDLE_CONSOLE, console_find_fd,
+				    GUINT_TO_POINTER (fd), NULL, NULL);
+	if(handle==0) {
+		/* Create a new one */
+		handle=_wapi_handle_new (WAPI_HANDLE_CONSOLE);
+		if(handle==_WAPI_HANDLE_INVALID) {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": error creating file handle");
+			return(NULL);
+		}
+
+		_wapi_handle_lock_handle (handle);
 	
-	file_handle=g_new0(struct _WapiHandle_file, 1);
-	handle=(WapiHandle *)file_handle;
+		ok=_wapi_lookup_handle (handle, WAPI_HANDLE_CONSOLE,
+					(gpointer *)&file_handle,
+					(gpointer *)&file_private_handle);
+		if(ok==FALSE) {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": error looking up console handle %p",
+				   handle);
+			_wapi_handle_unlock_handle (handle);
+			return(NULL);
+		}
 	
-	_WAPI_HANDLE_INIT(handle, WAPI_HANDLE_CONSOLE, console_ops);
-
-	file_handle->fd=fd;
-	/* We might want to set file_handle->filename to something
-	 * like "<stdin>" if we ever want to display handle internal
-	 * details somehow
-	 */
-	file_handle->security_attributes=/*some default*/NULL;
-	file_handle->fileaccess=convert_from_flags(flags);
-	file_handle->sharemode=0;
-	file_handle->attrs=0;
+		file_private_handle->fd=fd;
+		file_handle->filename=_wapi_handle_scratch_store (name, strlen (name));
+		/* some default security attributes might be needed */
+		file_handle->security_attributes=0;
+		file_handle->fileaccess=convert_from_flags(flags);
+		file_handle->sharemode=0;
+		file_handle->attrs=0;
 	
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": returning handle %p with fd %d",
-		  handle, file_handle->fd);
+		g_message(G_GNUC_PRETTY_FUNCTION
+			  ": returning handle %p with fd %d", handle,
+			  file_private_handle->fd);
 #endif
 
+		_wapi_handle_unlock_handle (handle);
+	} else {
+		/* Add a reference to this reused handle */
+		_wapi_handle_ref (handle);
+	}
+	
 	return(handle);
 }
 
@@ -916,15 +1774,17 @@ WapiHandle *GetStdHandle(WapiStdHandle stdhandle)
  * read due to an attempt to read past the end of the file), %FALSE on
  * error.
  */
-gboolean ReadFile(WapiHandle *handle, gpointer buffer, guint32 numbytes,
+gboolean ReadFile(gpointer handle, gpointer buffer, guint32 numbytes,
 		  guint32 *bytesread, WapiOverlapped *overlapped)
 {
-	if(handle->ops->readfile==NULL) {
+	WapiHandleType type=_wapi_handle_type (handle);
+	
+	if(io_ops[type].readfile==NULL) {
 		return(FALSE);
 	}
 	
-	return(handle->ops->readfile(handle, buffer, numbytes, bytesread,
-				     overlapped));
+	return(io_ops[type].readfile (handle, buffer, numbytes, bytesread,
+				      overlapped));
 }
 
 /**
@@ -952,15 +1812,38 @@ gboolean ReadFile(WapiHandle *handle, gpointer buffer, guint32 numbytes,
  *
  * Return value: %TRUE if the write succeeds, %FALSE on error.
  */
-gboolean WriteFile(WapiHandle *handle, gconstpointer buffer, guint32 numbytes,
+gboolean WriteFile(gpointer handle, gconstpointer buffer, guint32 numbytes,
 		   guint32 *byteswritten, WapiOverlapped *overlapped)
 {
-	if(handle->ops->writefile==NULL) {
+	WapiHandleType type=_wapi_handle_type (handle);
+	
+	if(io_ops[type].writefile==NULL) {
 		return(FALSE);
 	}
 	
-	return(handle->ops->writefile(handle, buffer, numbytes, byteswritten,
-				      overlapped));
+	return(io_ops[type].writefile (handle, buffer, numbytes, byteswritten,
+				       overlapped));
+}
+
+/**
+ * FlushFileBuffers:
+ * @handle: Handle to open file.  The handle must have
+ * %GENERIC_WRITE access.
+ *
+ * Flushes buffers of the file and causes all unwritten data to
+ * be written.
+ *
+ * Return value: %TRUE on success, %FALSE otherwise.
+ */
+gboolean FlushFileBuffers(gpointer handle)
+{
+	WapiHandleType type=_wapi_handle_type (handle);
+	
+	if(io_ops[type].flushfile==NULL) {
+		return(FALSE);
+	}
+	
+	return(io_ops[type].flushfile (handle));
 }
 
 /**
@@ -973,13 +1856,15 @@ gboolean WriteFile(WapiHandle *handle, gconstpointer buffer, guint32 numbytes,
  *
  * Return value: %TRUE on success, %FALSE otherwise.
  */
-gboolean SetEndOfFile(WapiHandle *handle)
+gboolean SetEndOfFile(gpointer handle)
 {
-	if(handle->ops->setendoffile==NULL) {
+	WapiHandleType type=_wapi_handle_type (handle);
+	
+	if(io_ops[type].setendoffile==NULL) {
 		return(FALSE);
 	}
 	
-	return(handle->ops->setendoffile(handle));
+	return(io_ops[type].setendoffile (handle));
 }
 
 /**
@@ -1011,15 +1896,17 @@ gboolean SetEndOfFile(WapiHandle *handle)
  * If @highmovedistance is not %NULL, the high 32 bits of the new file
  * pointer are stored there.  On failure, %INVALID_SET_FILE_POINTER.
  */
-guint32 SetFilePointer(WapiHandle *handle, gint32 movedistance,
+guint32 SetFilePointer(gpointer handle, gint32 movedistance,
 		       gint32 *highmovedistance, WapiSeekMethod method)
 {
-	if(handle->ops->seek==NULL) {
-		return(INVALID_SET_FILE_POINTER);
+	WapiHandleType type=_wapi_handle_type (handle);
+	
+	if(io_ops[type].seek==NULL) {
+		return(FALSE);
 	}
 	
-	return(handle->ops->seek(handle, movedistance, highmovedistance,
-				 method));
+	return(io_ops[type].seek (handle, movedistance, highmovedistance,
+				  method));
 }
 
 /**
@@ -1033,13 +1920,15 @@ guint32 SetFilePointer(WapiHandle *handle, gint32 movedistance,
  * %FILE_TYPE_CHAR - @handle is a character device, such as a console.
  * %FILE_TYPE_PIPE - @handle is a named or anonymous pipe.
  */
-WapiFileType GetFileType(WapiHandle *handle)
+WapiFileType GetFileType(gpointer handle)
 {
-	if(handle->ops->getfiletype==NULL) {
+	WapiHandleType type=_wapi_handle_type (handle);
+	
+	if(io_ops[type].getfiletype==NULL) {
 		return(FILE_TYPE_UNKNOWN);
 	}
 	
-	return(handle->ops->getfiletype());
+	return(io_ops[type].getfiletype ());
 }
 
 /**
@@ -1058,13 +1947,15 @@ WapiFileType GetFileType(WapiHandle *handle)
  * @highsize is non-%NULL then the high 32 bits of the file size are
  * stored here.  On failure %INVALID_FILE_SIZE is returned.
  */
-guint32 GetFileSize(WapiHandle *handle, guint32 *highsize)
+guint32 GetFileSize(gpointer handle, guint32 *highsize)
 {
-	if(handle->ops->getfilesize==NULL) {
-		return(INVALID_FILE_SIZE);
+	WapiHandleType type=_wapi_handle_type (handle);
+	
+	if(io_ops[type].getfilesize==NULL) {
+		return(FALSE);
 	}
 	
-	return(handle->ops->getfilesize(handle, highsize));
+	return(io_ops[type].getfilesize (handle, highsize));
 }
 
 /**
@@ -1092,15 +1983,17 @@ guint32 GetFileSize(WapiHandle *handle, guint32 *highsize)
  *
  * Return value: %TRUE on success, %FALSE otherwise.
  */
-gboolean GetFileTime(WapiHandle *handle, WapiFileTime *create_time,
+gboolean GetFileTime(gpointer handle, WapiFileTime *create_time,
 		     WapiFileTime *last_access, WapiFileTime *last_write)
 {
-	if(handle->ops->getfiletime==NULL) {
+	WapiHandleType type=_wapi_handle_type (handle);
+	
+	if(io_ops[type].getfiletime==NULL) {
 		return(FALSE);
 	}
 	
-	return(handle->ops->getfiletime(handle, create_time, last_access,
-					last_write));
+	return(io_ops[type].getfiletime (handle, create_time, last_access,
+					 last_write));
 }
 
 /**
@@ -1126,16 +2019,18 @@ gboolean GetFileTime(WapiHandle *handle, WapiFileTime *create_time,
  *
  * Return value: %TRUE on success, %FALSE otherwise.
  */
-gboolean SetFileTime(WapiHandle *handle, const WapiFileTime *create_time,
+gboolean SetFileTime(gpointer handle, const WapiFileTime *create_time,
 		     const WapiFileTime *last_access,
 		     const WapiFileTime *last_write)
 {
-	if(handle->ops->setfiletime==NULL) {
+	WapiHandleType type=_wapi_handle_type (handle);
+	
+	if(io_ops[type].setfiletime==NULL) {
 		return(FALSE);
 	}
 	
-	return(handle->ops->setfiletime(handle, create_time, last_access,
-					last_write));
+	return(io_ops[type].setfiletime (handle, create_time, last_access,
+					 last_write));
 }
 
 /* A tick is a 100-nanosecond interval.  File time epoch is Midnight,
@@ -1297,3 +2192,600 @@ gboolean FileTimeToSystemTime(const WapiFileTime *file_time,
 	
 	return(TRUE);
 }
+
+gpointer FindFirstFile (const gunichar2 *pattern, WapiFindData *find_data)
+{
+	struct _WapiHandle_find *find_handle;
+	gpointer handle;
+	gboolean ok;
+	gchar *utf8_pattern = NULL;
+	int result;
+	
+	if (pattern == NULL) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": pattern is NULL");
+#endif
+
+		return INVALID_HANDLE_VALUE;
+	}
+
+	utf8_pattern = _wapi_unicode_to_utf8 (pattern);
+	if (utf8_pattern == NULL) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unicode conversion returned NULL");
+#endif
+		
+		return INVALID_HANDLE_VALUE;
+	}
+	
+	handle=_wapi_handle_new (WAPI_HANDLE_FIND);
+	if(handle==_WAPI_HANDLE_INVALID) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error creating find handle");
+		g_free (utf8_pattern);
+		
+		return(INVALID_HANDLE_VALUE);
+	}
+
+	_wapi_handle_lock_handle (handle);
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FIND,
+				(gpointer *)&find_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up find handle %p", handle);
+		_wapi_handle_unlock_handle (handle);
+		g_free (utf8_pattern);
+		
+		return(INVALID_HANDLE_VALUE);
+	}
+	
+	result = glob (utf8_pattern, 0, NULL, &find_handle->glob);
+	g_free (utf8_pattern);
+
+	if (result != 0) {
+		globfree (&find_handle->glob);
+		_wapi_handle_unlock_handle (handle);
+		_wapi_handle_unref (handle);
+
+		switch (result) {
+#ifdef GLOB_NOMATCH
+		case GLOB_NOMATCH:
+			SetLastError (ERROR_NO_MORE_FILES);
+			break;
+#endif
+
+		default:
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": glob failed with code %d.", result);
+#endif
+
+			break;
+		}
+
+		return INVALID_HANDLE_VALUE;
+	}
+
+	find_handle->count = 0;
+	if (!FindNextFile (handle, find_data)) {
+		FindClose (handle);
+		SetLastError (ERROR_NO_MORE_FILES);
+		return INVALID_HANDLE_VALUE;
+	}
+
+	_wapi_handle_unlock_handle (handle);
+
+	return (handle);
+}
+
+gboolean FindNextFile (gpointer handle, WapiFindData *find_data)
+{
+	struct _WapiHandle_find *find_handle;
+	gboolean ok;
+	struct stat buf;
+	const gchar *filename;
+	
+	gchar *base_filename;
+	gunichar2 *utf16_basename;
+	time_t create_time;
+	int i;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FIND,
+				(gpointer *)&find_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up find handle %p", handle);
+		SetLastError (ERROR_INVALID_HANDLE);
+		return(FALSE);
+	}
+
+	if (find_handle->count >= find_handle->glob.gl_pathc) {
+		SetLastError (ERROR_NO_MORE_FILES);
+		return FALSE;
+	}
+
+	/* stat next glob match */
+
+	filename = find_handle->glob.gl_pathv [find_handle->count ++];
+	if (stat (filename, &buf) != 0) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": stat failed: %s", filename);
+#endif
+
+		SetLastError (ERROR_NO_MORE_FILES);
+		return FALSE;
+	}
+
+	/* fill data block */
+
+	if (buf.st_mtime < buf.st_ctime)
+		create_time = buf.st_mtime;
+	else
+		create_time = buf.st_ctime;
+	
+	find_data->dwFileAttributes = _wapi_stat_to_file_attributes (&buf);
+
+	_wapi_time_t_to_filetime (create_time, &find_data->ftCreationTime);
+	_wapi_time_t_to_filetime (buf.st_atime, &find_data->ftLastAccessTime);
+	_wapi_time_t_to_filetime (buf.st_mtime, &find_data->ftLastWriteTime);
+
+	if (find_data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+		find_data->nFileSizeHigh = 0;
+		find_data->nFileSizeLow = 0;
+	}
+	else {
+		find_data->nFileSizeHigh = buf.st_size >> 32;
+		find_data->nFileSizeLow = buf.st_size & 0xFFFFFFFF;
+	}
+
+	find_data->dwReserved0 = 0;
+	find_data->dwReserved1 = 0;
+
+	base_filename = g_path_get_basename (filename);
+	utf16_basename = g_utf8_to_utf16 (base_filename, MAX_PATH, NULL, NULL, NULL);
+
+	i = 0;
+	while (utf16_basename [i] != 0) {	/* copy basename */
+		find_data->cFileName [i] = utf16_basename [i];
+		++ i;
+	}
+
+	find_data->cFileName[i] = 0;		/* null terminate */
+	find_data->cAlternateFileName [0] = 0;	/* not used */
+
+	g_free (base_filename);
+	g_free (utf16_basename);
+	return TRUE;
+}
+
+/**
+ * FindClose:
+ * @wapi_handle: the find handle to close.
+ *
+ * Closes find handle @wapi_handle
+ *
+ * Return value: %TRUE on success, %FALSE otherwise.
+ */
+gboolean FindClose (gpointer handle)
+{
+	struct _WapiHandle_find *find_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FIND,
+				(gpointer *)&find_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up find handle %p", handle);
+		SetLastError (ERROR_INVALID_HANDLE);
+		return(FALSE);
+	}
+	
+	globfree (&find_handle->glob);
+	_wapi_handle_unref (handle);
+
+	return TRUE;
+}
+
+/**
+ * CreateDirectory:
+ * @name: a pointer to a NULL-terminated unicode string, that names
+ * the directory to be created.
+ * @security: ignored for now
+ *
+ * Creates directory @name
+ *
+ * Return value: %TRUE on success, %FALSE otherwise.
+ */
+gboolean CreateDirectory (const gunichar2 *name, WapiSecurityAttributes *security)
+{
+	gchar *utf8_name;
+	int result;
+	
+	utf8_name = _wapi_unicode_to_utf8 (name);
+	if (utf8_name == NULL) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unicode conversion returned NULL");
+#endif
+	
+		return FALSE;
+	}
+
+	result = mkdir (utf8_name, 0777);
+	g_free (utf8_name);
+
+	if (result == 0)
+		return TRUE;
+
+	switch (errno) {
+	case EEXIST:
+		return TRUE;
+	default:
+		_wapi_set_last_error_from_errno ();
+		break;
+	}
+	
+	return FALSE;
+}
+
+/**
+ * RemoveDirectory:
+ * @name: a pointer to a NULL-terminated unicode string, that names
+ * the directory to be removed.
+ *
+ * Removes directory @name
+ *
+ * Return value: %TRUE on success, %FALSE otherwise.
+ */
+gboolean RemoveDirectory (const gunichar2 *name)
+{
+	gchar *utf8_name;
+	int result;
+
+	utf8_name = _wapi_unicode_to_utf8 (name);
+	if (utf8_name == NULL) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unicode conversion returned NULL");
+#endif
+		
+		return FALSE;
+	}
+
+	result = rmdir (utf8_name);
+	g_free (utf8_name);
+
+	if (result == 0)
+		return TRUE;
+	
+	_wapi_set_last_error_from_errno ();
+	return FALSE;
+}
+
+/**
+ * GetFileAttributes:
+ * @name: a pointer to a NULL-terminated unicode filename.
+ *
+ * Gets the attributes for @name;
+ *
+ * Return value: -1 on failure
+ */
+guint32 GetFileAttributes (const gunichar2 *name)
+{
+	gchar *utf8_name;
+	struct stat buf;
+	int result;
+	
+	utf8_name = _wapi_unicode_to_utf8 (name);
+	if (utf8_name == NULL) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unicode conversion returned NULL");
+#endif
+
+		SetLastError (ERROR_INVALID_PARAMETER);
+		return -1;
+	}
+
+	result = stat (utf8_name, &buf);
+	g_free (utf8_name);
+
+	if (result != 0) {
+		SetLastError (ERROR_FILE_NOT_FOUND);
+		return -1;
+	}
+	
+	return _wapi_stat_to_file_attributes (&buf);
+}
+
+/**
+ * GetFileAttributesEx:
+ * @name: a pointer to a NULL-terminated unicode filename.
+ * @level: must be GetFileExInfoStandard
+ * @info: pointer to a WapiFileAttributesData structure
+ *
+ * Gets attributes, size and filetimes for @name;
+ *
+ * Return value: %TRUE on success, %FALSE on failure
+ */
+gboolean GetFileAttributesEx (const gunichar2 *name, WapiGetFileExInfoLevels level, gpointer info)
+{
+	gchar *utf8_name;
+	WapiFileAttributesData *data;
+
+	struct stat buf;
+	time_t create_time;
+	int result;
+	
+	if (level != GetFileExInfoStandard) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": info level %d not supported.", level);
+#endif
+
+		return FALSE;
+	}
+
+	utf8_name = _wapi_unicode_to_utf8 (name);
+	if (utf8_name == NULL) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unicode conversion returned NULL");
+#endif
+
+		SetLastError (ERROR_INVALID_PARAMETER);
+		return FALSE;
+	}
+
+	result = stat (utf8_name, &buf);
+	g_free (utf8_name);
+
+	if (result != 0) {
+		SetLastError (ERROR_FILE_NOT_FOUND);
+		return FALSE;
+	}
+
+	/* fill data block */
+
+	data = (WapiFileAttributesData *)info;
+
+	if (buf.st_mtime < buf.st_ctime)
+		create_time = buf.st_mtime;
+	else
+		create_time = buf.st_ctime;
+	
+	data->dwFileAttributes = _wapi_stat_to_file_attributes (&buf);
+
+	_wapi_time_t_to_filetime (create_time, &data->ftCreationTime);
+	_wapi_time_t_to_filetime (buf.st_atime, &data->ftLastAccessTime);
+	_wapi_time_t_to_filetime (buf.st_mtime, &data->ftLastWriteTime);
+
+	if (data->dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY) {
+		data->nFileSizeHigh = 0;
+		data->nFileSizeLow = 0;
+	}
+	else {
+		data->nFileSizeHigh = buf.st_size >> 32;
+		data->nFileSizeLow = buf.st_size & 0xFFFFFFFF;
+	}
+
+	return TRUE;
+}
+
+/**
+ * SetFileAttributes
+ * @name: name of file
+ * @attrs: attributes to set
+ *
+ * Changes the attributes on a named file.
+ *
+ * Return value: %TRUE on success, %FALSE on failure.
+ */
+extern gboolean SetFileAttributes (const gunichar2 *name, guint32 attrs)
+{
+	/* FIXME: think of something clever to do on unix */
+	
+	SetLastError (ERROR_INVALID_FUNCTION);
+	return FALSE;
+}
+
+/**
+ * GetCurrentDirectory
+ * @length: size of the buffer
+ * @buffer: pointer to buffer that recieves path
+ *
+ * Retrieves the current directory for the current process.
+ *
+ * Return value: number of characters in buffer on success, zero on failure
+ */
+extern guint32 GetCurrentDirectory (guint32 length, gunichar2 *buffer)
+{
+	gchar *path;
+	gunichar2 *utf16_path, *ptr;
+	glong count = 0;
+	
+	path = g_get_current_dir ();
+	if (path == NULL)
+		return 0;
+	
+	/* if buffer too small, return number of characters required.
+	 * this is plain dumb.
+	 */
+	
+	count = strlen (path) + 1;
+	if (count > length)
+		return count;
+	
+	utf16_path = g_utf8_to_utf16 (path, -1, NULL, NULL, NULL);
+	if (utf16_path == NULL)
+		return 0;
+
+	ptr = utf16_path;
+	while (*ptr)
+		*buffer ++ = *ptr ++;
+	
+	*buffer = 0;
+	
+	g_free (utf16_path);
+	g_free (path);
+
+	return count;
+}
+
+/**
+ * SetCurrentDirectory
+ * @path: path to new directory
+ *
+ * Changes the directory path for the current process.
+ *
+ * Return value: %TRUE on success, %FALSE on failure.
+ */
+extern gboolean SetCurrentDirectory (const gunichar2 *path)
+{
+	gchar *utf8_path;
+	gboolean result;
+
+	utf8_path = _wapi_unicode_to_utf8 (path);
+	if (chdir (utf8_path) != 0) {
+		_wapi_set_last_error_from_errno ();
+		result = FALSE;
+	}
+	else
+		result = TRUE;
+
+	g_free (utf8_path);
+	return result;
+}
+
+int _wapi_file_handle_to_fd (gpointer handle)
+{
+	struct _WapiHandlePrivate_file *file_private_handle;
+	gboolean ok;
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": looking up fd for %p", handle);
+#endif
+
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_CONSOLE, NULL,
+				(gpointer *)&file_private_handle);
+	if(ok==FALSE) {
+		ok=_wapi_lookup_handle (handle, WAPI_HANDLE_FILE, NULL,
+					(gpointer *)&file_private_handle);
+		if(ok==FALSE) {
+			ok=_wapi_lookup_handle (handle, WAPI_HANDLE_PIPE, NULL,
+						(gpointer *)&file_private_handle);
+			if(ok==FALSE) {
+#ifdef DEBUG
+				g_message (G_GNUC_PRETTY_FUNCTION
+					   ": returning -1");
+#endif
+				return(-1);
+			}
+		}
+	}
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": returning %d",
+		   file_private_handle->fd);
+#endif
+	
+	return(file_private_handle->fd);
+}
+
+gboolean CreatePipe (gpointer *readpipe, gpointer *writepipe,
+		     WapiSecurityAttributes *security G_GNUC_UNUSED, guint32 size)
+{
+	struct _WapiHandle_file *pipe_read_handle;
+	struct _WapiHandle_file *pipe_write_handle;
+	struct _WapiHandlePrivate_file *pipe_read_private_handle;
+	struct _WapiHandlePrivate_file *pipe_write_private_handle;
+	gpointer read_handle;
+	gpointer write_handle;
+	gboolean ok;
+	int filedes[2];
+	int ret;
+	
+	mono_once (&io_ops_once, io_ops_init);
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Creating pipe");
+#endif
+
+	ret=pipe (filedes);
+	if(ret==-1) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Error creating pipe: %s",
+			   strerror (errno));
+#endif
+		
+		_wapi_set_last_error_from_errno ();
+		return(FALSE);
+	}
+	
+	/* filedes[0] is open for reading, filedes[1] for writing */
+
+	read_handle=_wapi_handle_new (WAPI_HANDLE_PIPE);
+	if(read_handle==_WAPI_HANDLE_INVALID) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error creating pipe read handle");
+		close (filedes[0]);
+		close (filedes[1]);
+		return(FALSE);
+	}
+	
+	_wapi_handle_lock_handle (read_handle);
+
+	ok=_wapi_lookup_handle (read_handle, WAPI_HANDLE_PIPE,
+				(gpointer *)&pipe_read_handle,
+				(gpointer *)&pipe_read_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION ": error looking up pipe handle %p", read_handle);
+		_wapi_handle_unlock_handle (read_handle);
+		close (filedes[0]);
+		close (filedes[1]);
+		return(FALSE);
+	}
+	
+	write_handle=_wapi_handle_new (WAPI_HANDLE_PIPE);
+	if(write_handle==_WAPI_HANDLE_INVALID) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error creating pipe write handle");
+		_wapi_handle_unlock_handle (read_handle);
+		_wapi_handle_unref (read_handle);
+		
+		close (filedes[0]);
+		close (filedes[1]);
+		return(FALSE);
+	}
+	
+	_wapi_handle_lock_handle (write_handle);
+
+	ok=_wapi_lookup_handle (write_handle, WAPI_HANDLE_PIPE,
+				(gpointer *)&pipe_write_handle,
+				(gpointer *)&pipe_write_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION ": error looking up pipe handle %p", read_handle);
+		_wapi_handle_unlock_handle (read_handle);
+		_wapi_handle_unref (read_handle);
+		_wapi_handle_unlock_handle (write_handle);
+		close (filedes[0]);
+		close (filedes[1]);
+		return(FALSE);
+	}
+	
+	pipe_read_private_handle->fd=filedes[0];
+	pipe_read_handle->fileaccess=GENERIC_READ;
+	
+	*readpipe=read_handle;
+
+	pipe_write_private_handle->fd=filedes[1];
+	pipe_write_handle->fileaccess=GENERIC_WRITE;
+	
+	*writepipe=write_handle;
+
+	_wapi_handle_unlock_handle (read_handle);
+	_wapi_handle_unlock_handle (write_handle);
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION
+		   ": Returning pipe: read handle %p, write handle %p",
+		   read_handle, write_handle);
+#endif
+
+	return(TRUE);
+}
diff --git a/mono/io-layer/io.h b/mono/io-layer/io.h
index b52e02e0ec4..a0c037d22ba 100644
--- a/mono/io-layer/io.h
+++ b/mono/io-layer/io.h
@@ -1,9 +1,19 @@
+/*
+ * io.h: File, console and find handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_IO_H_
 #define _WAPI_IO_H_
 
 #include <stdlib.h>
 
 #include "mono/io-layer/wapi.h"
+#include "mono/io-layer/timefuncs.h"
 
 typedef struct _WapiSecurityAttributes WapiSecurityAttributes;
 
@@ -22,7 +32,7 @@ struct _WapiOverlapped
 	guint32 InternalHigh;
 	guint32 Offset;
 	guint32 OffsetHigh;
-	WapiHandle *hEvent;
+	gpointer hEvent;
 };
 
 #define GENERIC_READ	0x80000000
@@ -65,6 +75,8 @@ struct _WapiOverlapped
 #define FILE_FLAG_OVERLAPPED			0x40000000
 #define FILE_FLAG_WRITE_THROUGH			0x80000000
 
+#define MAX_PATH	260
+
 typedef enum {
 	STD_INPUT_HANDLE=-10,
 	STD_OUTPUT_HANDLE=-11,
@@ -85,11 +97,10 @@ typedef enum {
 	FILE_TYPE_REMOTE=0x8000,
 } WapiFileType;
 
-typedef struct 
-{
-	guint32 dwLowDateTime;
-	guint32 dwHighDateTime;
-} WapiFileTime;
+typedef enum {
+	GetFileExInfoStandard=0x0000,
+	GetFileExMaxInfoLevel=0x0001
+} WapiGetFileExInfoLevels;
 
 typedef struct 
 {
@@ -103,28 +114,77 @@ typedef struct
 	guint16 wMilliseconds;
 } WapiSystemTime;
 
+typedef struct
+{
+	guint32 dwFileAttributes;
+	WapiFileTime ftCreationTime;
+	WapiFileTime ftLastAccessTime;
+	WapiFileTime ftLastWriteTime;
+	guint32 nFileSizeHigh;
+	guint32 nFileSizeLow;
+	guint32 dwReserved0;
+	guint32 dwReserved1;
+	gunichar2 cFileName [MAX_PATH];
+	gunichar2 cAlternateFileName [14];
+} WapiFindData;
+
+typedef struct
+{
+	guint32 dwFileAttributes;
+	WapiFileTime ftCreationTime;
+	WapiFileTime ftLastAccessTime;
+	WapiFileTime ftLastWriteTime;
+	guint32 nFileSizeHigh;
+	guint32 nFileSizeLow;
+} WapiFileAttributesData;
+
 #define INVALID_SET_FILE_POINTER ((guint32)-1)
 #define INVALID_FILE_SIZE ((guint32)0xFFFFFFFF)
 
-extern WapiHandle *CreateFile(const guchar *name, guint32 fileaccess,
-			      guint32 sharemode,
-			      WapiSecurityAttributes *security,
-			      guint32 createmode,
-			      guint32 attrs, WapiHandle *template);
-extern gboolean DeleteFile(const guchar *name);
-extern WapiHandle *GetStdHandle(WapiStdHandle stdhandle);
-extern gboolean ReadFile(WapiHandle *handle, gpointer buffer, guint32 numbytes,
+extern gpointer CreateFile(const gunichar2 *name, guint32 fileaccess,
+			   guint32 sharemode,
+			   WapiSecurityAttributes *security,
+			   guint32 createmode,
+			   guint32 attrs, gpointer tmplate);
+extern gboolean DeleteFile(const gunichar2 *name);
+extern gpointer GetStdHandle(WapiStdHandle stdhandle);
+extern gboolean ReadFile(gpointer handle, gpointer buffer, guint32 numbytes,
 			 guint32 *bytesread, WapiOverlapped *overlapped);
-extern gboolean WriteFile(WapiHandle *handle, gconstpointer buffer,
+extern gboolean WriteFile(gpointer handle, gconstpointer buffer,
 			  guint32 numbytes, guint32 *byteswritten,
 			  WapiOverlapped *overlapped);
-extern gboolean SetEndOfFile(WapiHandle *handle);
-extern guint32 SetFilePointer(WapiHandle *handle, gint32 movedistance,
+extern gboolean FlushFileBuffers(gpointer handle);
+extern gboolean SetEndOfFile(gpointer handle);
+extern guint32 SetFilePointer(gpointer handle, gint32 movedistance,
 			      gint32 *highmovedistance, WapiSeekMethod method);
-extern WapiFileType GetFileType(WapiHandle *handle);
-extern guint32 GetFileSize(WapiHandle *handle, guint32 *highsize);
-extern gboolean GetFileTime(WapiHandle *handle, WapiFileTime *create_time, WapiFileTime *last_access, WapiFileTime *last_write);
-extern gboolean SetFileTime(WapiHandle *handle, const WapiFileTime *create_time, const WapiFileTime *last_access, const WapiFileTime *last_write);
-extern gboolean FileTimeToSystemTime(const WapiFileTime *file_time, WapiSystemTime *system_time);
+extern WapiFileType GetFileType(gpointer handle);
+extern guint32 GetFileSize(gpointer handle, guint32 *highsize);
+extern gboolean GetFileTime(gpointer handle, WapiFileTime *create_time,
+			    WapiFileTime *last_access,
+			    WapiFileTime *last_write);
+extern gboolean SetFileTime(gpointer handle, const WapiFileTime *create_time,
+			    const WapiFileTime *last_access,
+			    const WapiFileTime *last_write);
+extern gboolean FileTimeToSystemTime(const WapiFileTime *file_time,
+				     WapiSystemTime *system_time);
+extern gpointer FindFirstFile (const gunichar2 *pattern,
+			       WapiFindData *find_data);
+extern gboolean FindNextFile (gpointer handle, WapiFindData *find_data);
+extern gboolean FindClose (gpointer handle);
+extern gboolean CreateDirectory (const gunichar2 *name,
+				 WapiSecurityAttributes *security);
+extern gboolean RemoveDirectory (const gunichar2 *name);
+extern gboolean MoveFile (const gunichar2 *name, const gunichar2 *dest_name);
+extern gboolean CopyFile (const gunichar2 *name, const gunichar2 *dest_name,
+			  gboolean fail_if_exists);
+extern guint32 GetFileAttributes (const gunichar2 *name);
+extern gboolean GetFileAttributesEx (const gunichar2 *name,
+				     WapiGetFileExInfoLevels level,
+				     gpointer info);
+extern gboolean SetFileAttributes (const gunichar2 *name, guint32 attrs);
+extern guint32 GetCurrentDirectory (guint32 length, gunichar2 *buffer);
+extern gboolean SetCurrentDirectory (const gunichar2 *path);
+extern gboolean CreatePipe (gpointer *readpipe, gpointer *writepipe,
+			    WapiSecurityAttributes *security, guint32 size);
 
 #endif /* _WAPI_IO_H_ */
diff --git a/mono/io-layer/macros.h b/mono/io-layer/macros.h
index cda5a3d5069..b8e08b3d36f 100644
--- a/mono/io-layer/macros.h
+++ b/mono/io-layer/macros.h
@@ -1,3 +1,12 @@
+/*
+ * macros.h:  Useful macros
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_MACROS_H_
 #define _WAPI_MACROS_H_
 
diff --git a/mono/io-layer/misc-private.h b/mono/io-layer/misc-private.h
index 188d45cbdeb..00b209c4eb5 100644
--- a/mono/io-layer/misc-private.h
+++ b/mono/io-layer/misc-private.h
@@ -1,3 +1,12 @@
+/*
+ * misc-private.h:  Miscellaneous internal support functions
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_MISC_PRIVATE_H_
 #define _WAPI_MISC_PRIVATE_H_
 
diff --git a/mono/io-layer/misc.c b/mono/io-layer/misc.c
index 0b814cd8666..67ffbeed501 100644
--- a/mono/io-layer/misc.c
+++ b/mono/io-layer/misc.c
@@ -1,3 +1,12 @@
+/*
+ * misc.c:  Miscellaneous internal support functions
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <sys/time.h>
diff --git a/mono/io-layer/mono-mutex.c b/mono/io-layer/mono-mutex.c
index 87cbb6c576f..604afbe7103 100644
--- a/mono/io-layer/mono-mutex.c
+++ b/mono/io-layer/mono-mutex.c
@@ -44,7 +44,7 @@ pthread_mutex_timedlock (pthread_mutex_t *mutex, const struct timespec *timeout)
 	
 	/* This is just to avoid a completely busy wait */
 	sleepytime.tv_sec = 0;
-	sleepytime.tv_nsec = 10000;	/* 10ms */
+	sleepytime.tv_nsec = 10000000;	/* 10ms */
 	
 	while ((retcode = pthread_mutex_trylock (mutex)) == EBUSY) {
 		gettimeofday (&timenow, NULL);
@@ -62,6 +62,21 @@ pthread_mutex_timedlock (pthread_mutex_t *mutex, const struct timespec *timeout)
 #endif /* HAVE_PTHREAD_MUTEX_TIMEDLOCK */
 
 
+int
+mono_once (mono_once_t *once, void (*once_init) (void))
+{
+	if (!once->complete) {
+		pthread_mutex_lock (&once->mutex);
+		if (!once->complete) {
+			once_init ();
+			once->complete = TRUE;
+		}
+		pthread_mutex_unlock (&once->mutex);
+	}
+	
+	return 0;
+}
+
 
 #ifdef USE_MONO_MUTEX
 
diff --git a/mono/io-layer/mono-mutex.h b/mono/io-layer/mono-mutex.h
index f9f058507f8..8e233167629 100644
--- a/mono/io-layer/mono-mutex.h
+++ b/mono/io-layer/mono-mutex.h
@@ -29,6 +29,7 @@ extern "C" {
 #pragma }
 #endif /* __cplusplus */
 
+#include <glib.h>
 #include <pthread.h>
 #include <time.h>
 
@@ -38,6 +39,16 @@ extern int pthread_mutex_timedlock (pthread_mutex_t *mutex,
 #endif /* HAVE_PTHREAD_MUTEX_TIMEDLOCK */
 
 
+typedef struct {
+	pthread_mutex_t mutex;
+	gboolean complete;
+} mono_once_t;
+
+#define MONO_ONCE_INIT { PTHREAD_MUTEX_INITIALIZER, FALSE }
+
+int mono_once (mono_once_t *once, void (*once_init) (void));
+
+
 #ifdef USE_MONO_MUTEX
 
 #define MONO_THREAD_NONE ((pthread_t)~0)
diff --git a/mono/io-layer/mono-spinlock.h b/mono/io-layer/mono-spinlock.h
new file mode 100644
index 00000000000..2ba4100b981
--- /dev/null
+++ b/mono/io-layer/mono-spinlock.h
@@ -0,0 +1,20 @@
+/*
+ * mono-spinlock.h:  Lightweight spinlocks, for internal use only
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_MONO_SPINLOCK_H_
+#define _WAPI_MONO_SPINLOCK_H_
+
+#include <glib.h>
+
+#include <mono/io-layer/wapi.h>
+
+#define MONO_SPIN_LOCK(lock)	while((InterlockedCompareExchange(&lock, 1, 0))!=0)
+#define MONO_SPIN_UNLOCK(lock)	lock=0
+
+#endif /* _WAPI_MONO_SPINLOCK_H_ */
diff --git a/mono/io-layer/mutex-private.h b/mono/io-layer/mutex-private.h
new file mode 100644
index 00000000000..cb702a749fd
--- /dev/null
+++ b/mono/io-layer/mutex-private.h
@@ -0,0 +1,33 @@
+/*
+ * mutex-private.h:  Private definitions for mutex handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_MUTEX_PRIVATE_H_
+#define _WAPI_MUTEX_PRIVATE_H_
+
+#include <config.h>
+#include <glib.h>
+#include <pthread.h>
+#include <sys/types.h>
+
+extern struct _WapiHandleOps _wapi_mutex_ops;
+
+struct _WapiHandle_mutex
+{
+	guint32 name;
+	pid_t pid;
+	pthread_t tid;
+	guint32 recursion;
+};
+
+struct _WapiHandlePrivate_mutex
+{
+	int dummy;
+};
+
+#endif /* _WAPI_MUTEX_PRIVATE_H_ */
diff --git a/mono/io-layer/mutexes.c b/mono/io-layer/mutexes.c
index 6a9c4b24259..0949a687134 100644
--- a/mono/io-layer/mutexes.c
+++ b/mono/io-layer/mutexes.c
@@ -1,288 +1,146 @@
+/*
+ * mutexes.c:  Mutex handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <pthread.h>
 #include <string.h>
+#include <unistd.h>
 
-#include "mono/io-layer/wapi.h"
-#include "wapi-private.h"
-#include "wait-private.h"
-#include "misc-private.h"
-#include "handles-private.h"
-
-#include "mono-mutex.h"
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/misc-private.h>
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/mono-mutex.h>
+#include <mono/io-layer/mutex-private.h>
 
 #undef DEBUG
 
-struct _WapiHandle_mutex
-{
-	WapiHandle handle;
-	mono_mutex_t mutex;
-	pthread_t tid;
-	guint32 recursion;
-};
-
-static void mutex_close(WapiHandle *handle);
-static gboolean mutex_wait(WapiHandle *handle, WapiHandle *signal, guint32 ms);
-static guint32 mutex_wait_multiple(gpointer data);
-static void mutex_signal(WapiHandle *handle);
+static void mutex_close_shared (gpointer handle);
+static void mutex_signal(gpointer handle);
+static void mutex_own (gpointer handle);
+static gboolean mutex_is_owned (gpointer handle);
 
-static struct _WapiHandleOps mutex_ops = {
-	mutex_close,		/* close */
-	NULL,			/* getfiletype */
-	NULL,			/* readfile */
-	NULL,			/* writefile */
-	NULL,			/* seek */
-	NULL,			/* setendoffile */
-	NULL,			/* getfilesize */
-	NULL,			/* getfiletime */
-	NULL,			/* setfiletime */
-	mutex_wait,		/* wait */
-	mutex_wait_multiple,	/* wait_multiple */
+struct _WapiHandleOps _wapi_mutex_ops = {
+	mutex_close_shared,	/* close_shared */
+	NULL,			/* close_private */
 	mutex_signal,		/* signal */
+	mutex_own,		/* own */
+	mutex_is_owned,		/* is_owned */
 };
 
-static void mutex_close(WapiHandle *handle)
-{
-	struct _WapiHandle_mutex *mutex_handle=(struct _WapiHandle_mutex *)handle;
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": closing mutex handle %p",
-		  mutex_handle);
-#endif
+static mono_once_t mutex_ops_once=MONO_ONCE_INIT;
 
-	mono_mutex_destroy(&mutex_handle->mutex);
+static void mutex_ops_init (void)
+{
+	_wapi_handle_register_capabilities (WAPI_HANDLE_MUTEX,
+					    WAPI_HANDLE_CAP_WAIT |
+					    WAPI_HANDLE_CAP_SIGNAL |
+					    WAPI_HANDLE_CAP_OWN);
 }
 
-static gboolean mutex_wait(WapiHandle *handle, WapiHandle *signal, guint32 ms)
+static void mutex_close_shared (gpointer handle)
 {
-	struct _WapiHandle_mutex *mutex_handle=(struct _WapiHandle_mutex *)handle;
-	pthread_t tid=pthread_self();
-	int ret;
+	struct _WapiHandle_mutex *mutex_handle;
+	gboolean ok;
 	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": waiting for mutex handle %p",
-		  mutex_handle);
-#endif
-
-	/* Signal this handle now.  It really doesn't matter if some
-	 * other thread grabs the mutex before we can
-	 */
-	if(signal!=NULL) {
-		signal->ops->signal(signal);
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_MUTEX,
+				(gpointer *)&mutex_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up mutex handle %p", handle);
+		return;
 	}
-
-	if(mutex_handle->tid==tid) {
-		/* We already own this mutex, so just increase the count and
-		 * return TRUE
-		 */
-
-		mutex_handle->recursion++;
 	
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION
-			  ": Already own mutex handle %p (recursion %d)",
-			  mutex_handle, mutex_handle->recursion);
+	g_message(G_GNUC_PRETTY_FUNCTION ": closing mutex handle %p", handle);
 #endif
 
-		return(TRUE);
+	if(mutex_handle->name!=0) {
+		_wapi_handle_scratch_delete (mutex_handle->name);
+		mutex_handle->name=0;
 	}
+}
+
+static void mutex_signal(gpointer handle)
+{
+	ReleaseMutex(handle);
+}
+
+static void mutex_own (gpointer handle)
+{
+	struct _WapiHandle_mutex *mutex_handle;
+	gboolean ok;
 	
-	if(ms==INFINITE) {
-		ret=mono_mutex_lock(&mutex_handle->mutex);
-	} else {
-		struct timespec timeout;
-		
-		_wapi_calc_timeout(&timeout, ms);
-		
-		ret=mono_mutex_timedlock(&mutex_handle->mutex, &timeout);
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_MUTEX,
+				(gpointer *)&mutex_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up mutex handle %p", handle);
+		return;
 	}
-
-	if(ret==0) {
-		/* Mutex locked */
 	
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Locking mutex handle %p",
-			  mutex_handle);
+	g_message(G_GNUC_PRETTY_FUNCTION ": owning mutex handle %p", handle);
 #endif
 
-		mutex_handle->tid=tid;
-		mutex_handle->recursion=1;
-
-		return(TRUE);
-	} else {
-		/* ret might be ETIMEDOUT for timeout, or other for error */
+	_wapi_handle_set_signal_state (handle, FALSE, FALSE);
 	
+	mutex_handle->pid=getpid ();
+	mutex_handle->tid=pthread_self ();
+	mutex_handle->recursion++;
+
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION
-			  ": Failed to lock mutex handle %p: %s", mutex_handle,
-			  strerror(ret));
+	g_message (G_GNUC_PRETTY_FUNCTION
+		   ": mutex handle %p locked %d times by %d:%ld", handle,
+		   mutex_handle->recursion, mutex_handle->pid,
+		   mutex_handle->tid);
 #endif
-		return(FALSE);
-	}
 }
 
-static guint32 mutex_wait_multiple(gpointer data G_GNUC_UNUSED)
+static gboolean mutex_is_owned (gpointer handle)
 {
-	WaitQueueItem *item=(WaitQueueItem *)data;
-	GPtrArray *needed;
-	int ret;
-	guint32 numhandles;
-	struct timespec timeout;
-	pthread_t tid=pthread_self();
-	guint32 i, iterations;
-	
-	numhandles=item->handles[WAPI_HANDLE_MUTEX]->len;
+	struct _WapiHandle_mutex *mutex_handle;
+	gboolean ok;
 	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": waiting on %d mutex handles for %d ms", numhandles,
-		  item->timeout);
-#endif
-
-	/*
-	 * See which ones we need to lock
-	 */
-	needed=g_ptr_array_new();
-	for(i=0; i<numhandles; i++) {
-		struct _WapiHandle_mutex *mutex_handle;
-		
-		mutex_handle=g_ptr_array_index(
-			item->handles[WAPI_HANDLE_MUTEX], i);
-		
-		if(mutex_handle->tid!=tid) {
-			/* We don't have this one, so add it to the list */
-			g_ptr_array_add(needed, mutex_handle);
-		}
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_MUTEX,
+				(gpointer *)&mutex_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up mutex handle %p", handle);
+		return(FALSE);
 	}
-
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": need to lock %d mutex handles",
-		  needed->len);
-#endif
-	
-	iterations=0;
-	do {
-		iterations++;
-		
-		/* If the timeout isnt INFINITE but greater than 1s,
-		 * split the timeout into 1s chunks
-		 */
-		if((item->timeout!=INFINITE) &&
-		   (item->timeout < (iterations*1000))) {
-			_wapi_calc_timeout(
-				&timeout, item->timeout-((iterations-1)*1000));
-		} else {
-			_wapi_calc_timeout(&timeout, 1000);
-		}
 	
-		/* Try and lock as many mutexes as we can until we run
-		 * out of time, but to avoid deadlocks back off if we
-		 * fail to lock one
-		 */
-		for(i=0; i<needed->len; i++) {
-			struct _WapiHandle_mutex *mutex_handle;
-
-			mutex_handle=g_ptr_array_index(needed, i);
-		
-#ifdef DEBUG
-			g_message(G_GNUC_PRETTY_FUNCTION
-				  ": Locking %d mutex %p (owner %ld, me %ld)",
-				  i, mutex_handle, mutex_handle->tid, tid);
-#endif
-
-			ret=mono_mutex_timedlock(&mutex_handle->mutex,
-						 &timeout);
-
-#ifdef DEBUG
-			g_message(G_GNUC_PRETTY_FUNCTION ": timedlock ret %s",
-				  strerror(ret));
-#endif
-
-			if(ret!=0) {
-				/* ETIMEDOUT is the most likely, but
-				 * fail on other error too
-				 */
-
 #ifdef DEBUG
-				g_message(G_GNUC_PRETTY_FUNCTION
-					  ": Lock %d mutex failed: %s", i,
-					  strerror(ret));
+	g_message(G_GNUC_PRETTY_FUNCTION
+		  ": testing ownership mutex handle %p", handle);
 #endif
 
-				while(i--) {
+	if(mutex_handle->recursion>0 &&
+	   mutex_handle->pid==getpid () &&
+	   mutex_handle->tid==pthread_self ()) {
 #ifdef DEBUG
-					g_message(G_GNUC_PRETTY_FUNCTION
-						  ": Releasing %d mutex", i);
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": mutex handle %p owned by %d:%ld", handle,
+			   getpid (), pthread_self ());
 #endif
-					mutex_handle=g_ptr_array_index(needed,
-								       i);
-					mono_mutex_unlock(&mutex_handle->mutex);
-				}
-
-				break;
-			}
-
-			/* OK, got that one. Don't record it as ours
-			 * though until we get them all
-			 */
-		}
 
-		if(i==needed->len) {
-			/* We've locked all the mutexes.  Update the
-			 * ones we already had, and record that the
-			 * new ones belong to us
-			 */
-			for(i=0; i<numhandles; i++) {
-				struct _WapiHandle_mutex *mutex_handle;
-				guint32 idx;
-
-				mutex_handle=g_ptr_array_index(
-					item->handles[WAPI_HANDLE_MUTEX], i);
-		
-				idx=g_array_index(
-					item->waitindex[WAPI_HANDLE_MUTEX],
-					guint32, i);
-				_wapi_handle_set_lowest(item, idx);
-				
+		return(TRUE);
+	} else {
 #ifdef DEBUG
-				g_message(G_GNUC_PRETTY_FUNCTION
-					  ": Updating mutex %p", mutex_handle);
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": mutex handle %p not owned by %d:%ld", handle,
+			   getpid (), pthread_self ());
 #endif
-				
-				if(mutex_handle->tid==tid) {
-					/* We already own this mutex,
-					 * so just increase the count
-					 */
-					mutex_handle->recursion++;
-				} else {
-					mutex_handle->tid=tid;
-					mutex_handle->recursion=1;
-				}
-			}
-		
-			g_ptr_array_free(needed, FALSE);
-
-			item->waited[WAPI_HANDLE_MUTEX]=TRUE;
-			item->waitcount[WAPI_HANDLE_MUTEX]=numhandles;
-			
-			return(numhandles);
-		}
-	} while((item->timeout==INFINITE) ||
-		(item->timeout > (iterations * 1000)));
-
-	/* Didn't get all the locks, and timeout isn't INFINITE */
-		
-	g_ptr_array_free(needed, FALSE);
-
-	item->waited[WAPI_HANDLE_MUTEX]=TRUE;
-	item->waitcount[WAPI_HANDLE_MUTEX]=0;
-	
-	return(0);
-}
 
-static void mutex_signal(WapiHandle *handle)
-{
-	ReleaseMutex(handle);
+		return(FALSE);
+	}
 }
 
 /**
@@ -291,7 +149,7 @@ static void mutex_signal(WapiHandle *handle)
  * @owned: If %TRUE, the mutex is created with the calling thread
  * already owning the mutex.
  * @name:Pointer to a string specifying the name of this mutex, or
- * %NULL.  Currently ignored.
+ * %NULL.
  *
  * Creates a new mutex handle.  A mutex is signalled when no thread
  * owns it.  A thread acquires ownership of the mutex by waiting for
@@ -304,26 +162,51 @@ static void mutex_signal(WapiHandle *handle)
  *
  * Return value: A new handle, or %NULL on error.
  */
-WapiHandle *CreateMutex(WapiSecurityAttributes *security G_GNUC_UNUSED, gboolean owned G_GNUC_UNUSED,
-			const guchar *name G_GNUC_UNUSED)
+gpointer CreateMutex(WapiSecurityAttributes *security G_GNUC_UNUSED, gboolean owned,
+			const guchar *name)
 {
 	struct _WapiHandle_mutex *mutex_handle;
-	WapiHandle *handle;
+	gpointer handle;
+	gboolean ok;
+	
+	mono_once (&mutex_ops_once, mutex_ops_init);
 	
-	mutex_handle=(struct _WapiHandle_mutex *)g_new0(struct _WapiHandle_mutex, 1);
-	handle=(WapiHandle *)mutex_handle;
-	_WAPI_HANDLE_INIT(handle, WAPI_HANDLE_MUTEX, mutex_ops);
+	handle=_wapi_handle_new (WAPI_HANDLE_MUTEX);
+	if(handle==_WAPI_HANDLE_INVALID) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error creating mutex handle");
+		return(NULL);
+	}
 
-	mono_mutex_init(&mutex_handle->mutex, NULL);
+	_wapi_handle_lock_handle (handle);
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_MUTEX,
+				(gpointer *)&mutex_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up mutex handle %p", handle);
+		_wapi_handle_unlock_handle (handle);
+		return(NULL);
+	}
+
+	if(name!=NULL) {
+		mutex_handle->name=_wapi_handle_scratch_store (name,
+							       strlen (name));
+	}
+	
 	if(owned==TRUE) {
-		pthread_t tid=pthread_self();
-		
-		mono_mutex_lock(&mutex_handle->mutex);
-		
-		mutex_handle->tid=tid;
-		mutex_handle->recursion=1;
+		mutex_own (handle);
+	} else {
+		_wapi_handle_set_signal_state (handle, TRUE, FALSE);
 	}
 	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": returning mutex handle %p",
+		   handle);
+#endif
+
+	_wapi_handle_unlock_handle (handle);
+
 	return(handle);
 }
 
@@ -336,21 +219,34 @@ WapiHandle *CreateMutex(WapiSecurityAttributes *security G_GNUC_UNUSED, gboolean
  * Return value: %TRUE on success, %FALSE otherwise.  This function
  * fails if the calling thread does not own the mutex @handle.
  */
-gboolean ReleaseMutex(WapiHandle *handle)
+gboolean ReleaseMutex(gpointer handle)
 {
-	struct _WapiHandle_mutex *mutex_handle=(struct _WapiHandle_mutex *)handle;
+	struct _WapiHandle_mutex *mutex_handle;
+	gboolean ok;
 	pthread_t tid=pthread_self();
+	pid_t pid=getpid ();
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_MUTEX,
+				(gpointer *)&mutex_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up mutex handle %p", handle);
+		return(FALSE);
+	}
+
+	_wapi_handle_lock_handle (handle);
 	
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION ": Releasing mutex handle %p",
-		  mutex_handle);
+		  handle);
 #endif
 
-	if(mutex_handle->tid!=tid) {
+	if(mutex_handle->tid!=tid || mutex_handle->pid!=pid) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": We don't own mutex handle %p (owned by %ld, me %ld)", mutex_handle, mutex_handle->tid, tid);
+		g_message(G_GNUC_PRETTY_FUNCTION ": We don't own mutex handle %p (owned by %d:%ld, me %d:%ld)", handle, mutex_handle->pid, mutex_handle->tid, pid, tid);
 #endif
 
+		_wapi_handle_unlock_handle (handle);
 		return(FALSE);
 	}
 
@@ -360,12 +256,15 @@ gboolean ReleaseMutex(WapiHandle *handle)
 	if(mutex_handle->recursion==0) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": Unlocking mutex handle %p",
-			  mutex_handle);
+			  handle);
 #endif
 
+		mutex_handle->pid=0;
 		mutex_handle->tid=0;
-		mono_mutex_unlock(&mutex_handle->mutex);
+		_wapi_handle_set_signal_state (handle, TRUE, FALSE);
 	}
+
+	_wapi_handle_unlock_handle (handle);
 	
 	return(TRUE);
 }
diff --git a/mono/io-layer/mutexes.h b/mono/io-layer/mutexes.h
index 04e579413bc..3caa06e5d45 100644
--- a/mono/io-layer/mutexes.h
+++ b/mono/io-layer/mutexes.h
@@ -1,9 +1,19 @@
+/*
+ * mutexes.h: Mutex handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_MUTEXES_H_
 #define _WAPI_MUTEXES_H_
 
 #include <glib.h>
 
-extern WapiHandle *CreateMutex(WapiSecurityAttributes *security, gboolean owned, const guchar *name);
-extern gboolean ReleaseMutex(WapiHandle *handle);
+extern gpointer CreateMutex(WapiSecurityAttributes *security, gboolean owned,
+			    const guchar *name);
+extern gboolean ReleaseMutex(gpointer handle);
 
 #endif /* _WAPI_MUTEXES_H_ */
diff --git a/mono/io-layer/process-private.h b/mono/io-layer/process-private.h
new file mode 100644
index 00000000000..98e01c67794
--- /dev/null
+++ b/mono/io-layer/process-private.h
@@ -0,0 +1,34 @@
+/*
+ * process-private.h: Private definitions for process handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_PROCESS_PRIVATE_H_
+#define _WAPI_PROCESS_PRIVATE_H_
+
+#include <config.h>
+#include <glib.h>
+
+extern struct _WapiHandleOps _wapi_process_ops;
+
+struct _WapiHandle_process
+{
+	pid_t id;
+	guint32 exec_errno;
+	guint32 exitstatus;
+	gpointer main_thread;
+	guint32 env;
+	WapiFileTime create_time;
+	WapiFileTime exit_time;
+};
+
+struct _WapiHandlePrivate_process
+{
+	int dummy;
+};
+
+#endif /* _WAPI_PROCESS_PRIVATE_H_ */
diff --git a/mono/io-layer/processes.c b/mono/io-layer/processes.c
new file mode 100644
index 00000000000..231e4d57276
--- /dev/null
+++ b/mono/io-layer/processes.c
@@ -0,0 +1,622 @@
+/*
+ * processes.c:  Process handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#include <config.h>
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#include "mono/utils/mono-hash.h"
+#endif
+#include <glib.h>
+#include <string.h>
+#include <pthread.h>
+#include <sched.h>
+#include <sys/time.h>
+#include <errno.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/unicode.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/misc-private.h>
+#include <mono/io-layer/mono-mutex.h>
+#include <mono/io-layer/process-private.h>
+#include <mono/io-layer/threads.h>
+
+#undef DEBUG
+
+static void process_close_shared (gpointer handle);
+
+struct _WapiHandleOps _wapi_process_ops = {
+	process_close_shared,		/* close_shared */
+	NULL,				/* close_private */
+	NULL,				/* signal */
+	NULL,				/* own */
+	NULL,				/* is_owned */
+};
+
+static mono_once_t process_current_once=MONO_ONCE_INIT;
+static gpointer current_process=NULL;
+
+static mono_once_t process_ops_once=MONO_ONCE_INIT;
+
+static void process_ops_init (void)
+{
+	_wapi_handle_register_capabilities (WAPI_HANDLE_PROCESS,
+					    WAPI_HANDLE_CAP_WAIT);
+}
+
+static void process_close_shared (gpointer handle G_GNUC_UNUSED)
+{
+#ifdef DEBUG
+	struct _WapiHandle_process *process_handle;
+	gboolean ok;
+
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_PROCESS,
+				(gpointer *)&process_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up process handle %p", handle);
+		return;
+	}
+
+	g_message (G_GNUC_PRETTY_FUNCTION
+		   ": closing process handle %p with id %d", handle,
+		   process_handle->id);
+#endif
+}
+
+gboolean CreateProcess (const gunichar2 *appname, gunichar2 *cmdline,
+			WapiSecurityAttributes *process_attrs G_GNUC_UNUSED,
+			WapiSecurityAttributes *thread_attrs G_GNUC_UNUSED,
+			gboolean inherit_handles, guint32 create_flags,
+			gpointer environ, const gunichar2 *cwd,
+			WapiStartupInfo *startup,
+			WapiProcessInformation *process_info)
+{
+	gchar *cmd=NULL, *prog, *args=NULL, *dir=NULL;
+	gunichar2 *environp;
+	guint32 env=0, stored_dir=0, stored_prog=0, stored_args=0;
+	guint32 env_count=0, i;
+	gboolean ret=FALSE;
+	gpointer stdin_handle, stdout_handle, stderr_handle;
+	guint32 pid, tid;
+	gpointer process_handle, thread_handle;
+	
+	mono_once (&process_ops_once, process_ops_init);
+	
+	/* appname and cmdline specify the executable and its args:
+	 *
+	 * If appname is not NULL, it is the name of the executable.
+	 * Otherwise the executable is the first token in cmdline.
+	 *
+	 * Executable searching:
+	 *
+	 * If appname is not NULL, it can specify the full path and
+	 * file name, or else a partial name and the current directory
+	 * will be used.  There is no additional searching.
+	 *
+	 * If appname is NULL, the first whitespace-delimited token in
+	 * cmdline is used.  If the name does not contain a full
+	 * directory path, the search sequence is:
+	 *
+	 * 1) The directory containing the current process
+	 * 2) The current working directory
+	 * 3) The windows system directory  (Ignored)
+	 * 4) The windows directory (Ignored)
+	 * 5) $PATH
+	 *
+	 * Just to make things more interesting, tokens can contain
+	 * white space if they are surrounded by quotation marks.  I'm
+	 * beginning to understand just why windows apps are generally
+	 * so crap, with an API like this :-(
+	 */
+	if(appname!=NULL) {
+		cmd=_wapi_unicode_to_utf8 (appname);
+		if(cmd==NULL) {
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": unicode conversion returned NULL");
+#endif
+
+			goto cleanup;
+		}
+
+		/* Turn all the slashes round the right way */
+		for(i=0; i<strlen (cmd); i++) {
+			if(cmd[i]=='\\') {
+				cmd[i]='/';
+			}
+		}
+	}
+	
+	if(cmdline!=NULL) {
+		args=_wapi_unicode_to_utf8 (cmdline);
+		if(args==NULL) {
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": unicode conversion returned NULL");
+#endif
+
+			goto cleanup;
+		}
+
+		/* Turn all the slashes round the right way */
+		for(i=0; i<strlen (args); i++) {
+			if(args[i]=='\\') {
+				args[i]='/';
+			}
+		}
+	}
+
+	if(cwd!=NULL) {
+		dir=_wapi_unicode_to_utf8 (cwd);
+		if(dir==NULL) {
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": unicode conversion returned NULL");
+#endif
+
+			goto cleanup;
+		}
+
+		/* Turn all the slashes round the right way */
+		for(i=0; i<strlen (dir); i++) {
+			if(dir[i]=='\\') {
+				dir[i]='/';
+			}
+		}
+		stored_dir=_wapi_handle_scratch_store (dir, strlen (dir));
+	}
+	
+	/* environ is a block of NULL-terminated strings, which is
+	 * itself NULL-terminated. Of course, passing an array of
+	 * string pointers would have made things too easy :-(
+	 */
+	/* Not sure whether I should turn the w32 env block into
+	 * proper env vars, or just leave it to be read back by other
+	 * w32 emulation functions.
+	 */
+	if(environ!=NULL) {
+		/* env_count counts bytes, not chars */
+		for(environp=(gunichar2 *)environ; *environp;
+		    env_count+=2, environp++) {
+			while(*environp) {
+				env_count+=2;
+				environp++;
+			}
+		}
+
+		env=_wapi_handle_scratch_store (environ, env_count);
+	}
+
+	/* We can't put off locating the executable any longer :-( */
+	if(cmd!=NULL) {
+		if(g_ascii_isalpha (cmd[0]) && (cmd[1]==':')) {
+			/* Strip off the drive letter.  I can't
+			 * believe that CP/M holdover is still
+			 * visible...
+			 */
+			memmove (cmd, cmd+2, strlen (cmd)-2);
+			cmd[strlen (cmd)-2]='\0';
+		}
+
+		if(cmd[0]=='/') {
+			/* Assume full path given */
+			prog=g_strdup (cmd);
+		} else {
+			/* Search for file named by cmd in the current
+			 * directory
+			 */
+			char *curdir=g_get_current_dir ();
+
+			prog=g_strdup_printf ("%s/%s", curdir, cmd);
+			g_free (curdir);
+		}
+	} else {
+		gchar *token=NULL;
+		
+		/* Dig out the first token from args, taking quotation
+		 * marks into account
+		 */
+
+		/* FIXME: move the contents of args down when token
+		 * has been set (otherwise argv[0] is duplicated)
+		 */
+		/* Assume the opening quote will always be the first
+		 * character
+		 */
+		if(args[0]=='\"') {
+			for(i=1; args[i]!='\0' && args[i]!='\"'; i++);
+			if(g_ascii_isspace (args[i+1])) {
+				/* We found the first token */
+				token=g_strndup (args+1, i-1);
+			} else {
+				/* Quotation mark appeared in the
+				 * middle of the token.  Just give the
+				 * whole first token, quotes and all,
+				 * to exec.
+				 */
+			}
+		}
+		
+		if(token==NULL) {
+			/* No quote mark, or malformed */
+			for(i=0; args[i]!='\0'; i++) {
+				if(g_ascii_isspace (args[i])) {
+					token=g_strndup (args, i);
+					break;
+				}
+			}
+		}
+
+		if(token==NULL && args[0]!='\0') {
+			/* Must be just one token in the string */
+			token=g_strdup (args);
+		}
+		
+		if(token==NULL) {
+			/* Give up */
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": Couldn't find what to exec");
+#endif
+
+			goto cleanup;
+		}
+		
+		if(g_ascii_isalpha (token[0]) && (token[1]==':')) {
+			/* Strip off the drive letter.  I can't
+			 * believe that CP/M holdover is still
+			 * visible...
+			 */
+			memmove (token, token+2, strlen (token)-2);
+			token[strlen (token)-2]='\0';
+		}
+
+		if(token[0]=='/') {
+			/* Assume full path given */
+			prog=g_strdup (token);
+		} else {
+			char *curdir=g_get_current_dir ();
+
+			/* FIXME: Need to record the directory
+			 * containing the current process, and check
+			 * that for the new executable as the first
+			 * place to look
+			 */
+
+			prog=g_strdup_printf ("%s/%s", curdir, token);
+			g_free (curdir);
+
+			/* I assume X_OK is the criterion to use,
+			 * rather than F_OK
+			 */
+			if(access (prog, X_OK)!=0) {
+				g_free (prog);
+				prog=g_find_program_in_path (token);
+				if(prog==NULL) {
+#ifdef DEBUG
+					g_message (G_GNUC_PRETTY_FUNCTION ": Couldn't find executable %s", token);
+#endif
+
+					g_free (token);
+					goto cleanup;
+				}
+			}
+		}
+
+		g_free (token);
+	}
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Exec prog [%s] args [%s]",
+		   prog, args);
+#endif
+	
+	stored_prog=_wapi_handle_scratch_store (prog, strlen (prog));
+	stored_args=_wapi_handle_scratch_store (args, strlen (args));
+	
+	stdin_handle=GetStdHandle (STD_INPUT_HANDLE);
+	stdout_handle=GetStdHandle (STD_OUTPUT_HANDLE);
+	stderr_handle=GetStdHandle (STD_ERROR_HANDLE);
+	
+	if(startup!=NULL) {
+		if(startup->dwFlags & STARTF_USESTDHANDLES) {
+			stdin_handle=startup->hStdInput;
+			stdout_handle=startup->hStdOutput;
+			stderr_handle=startup->hStdError;
+		}
+	}
+	
+	ret=_wapi_handle_process_fork (stored_prog, stored_args, env,
+				       stored_dir, inherit_handles,
+				       create_flags, stdin_handle,
+				       stdout_handle, stderr_handle,
+				       &process_handle, &thread_handle, &pid,
+				       &tid);
+	
+	if(ret==TRUE && process_info!=NULL) {
+		process_info->hProcess=process_handle;
+		process_info->hThread=thread_handle;
+		process_info->dwProcessId=pid;
+		process_info->dwThreadId=tid;
+	}
+	
+cleanup:
+	if(cmd!=NULL) {
+		g_free (cmd);
+	}
+	if(prog!=NULL) {
+		g_free (prog);
+	}
+	if(stored_prog!=0) {
+		_wapi_handle_scratch_delete (stored_prog);
+	}
+	if(args!=NULL) {
+		g_free (args);
+	}
+	if(stored_args!=0) {
+		_wapi_handle_scratch_delete (stored_args);
+	}
+	if(dir!=NULL) {
+		g_free (dir);
+	}
+	if(stored_dir!=0) {
+		_wapi_handle_scratch_delete (stored_dir);
+	}
+	if(env!=0) {
+		_wapi_handle_scratch_delete (env);
+	}
+	
+	return(ret);
+}
+
+static gboolean process_compare (gpointer handle, gpointer user_data)
+{
+	struct _WapiHandle_process *process_handle;
+	gboolean ok;
+	pid_t pid;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_PROCESS,
+				(gpointer *)&process_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up process handle %p", handle);
+		return(FALSE);
+	}
+
+	pid=GPOINTER_TO_UINT (user_data);
+	if(process_handle->id==pid) {
+		return(TRUE);
+	} else {
+		return(FALSE);
+	}
+}
+	
+static void process_set_current (void)
+{
+	struct _WapiHandle_process *process_handle;
+	gboolean ok;
+	pid_t pid=getpid ();
+	
+	current_process=_wapi_search_handle (WAPI_HANDLE_PROCESS,
+					     process_compare,
+					     GUINT_TO_POINTER (pid),
+					     (gpointer *)&process_handle,
+					     NULL);
+	if(current_process==0) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": Need to create my own process handle");
+#endif
+
+		current_process=_wapi_handle_new (WAPI_HANDLE_PROCESS);
+		if(current_process==_WAPI_HANDLE_INVALID) {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": error creating process handle");
+			return;
+		}
+
+		ok=_wapi_lookup_handle (current_process, WAPI_HANDLE_PROCESS,
+					(gpointer *)&process_handle, NULL);
+		if(ok==FALSE) {
+			g_warning (G_GNUC_PRETTY_FUNCTION
+				   ": error looking up process handle %p",
+				   current_process);
+			return;
+		}
+
+		process_handle->id=pid;
+	} else {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Found my process handle");
+#endif
+	}
+}
+
+/* Returns a pseudo handle that doesn't need to be closed afterwards */
+gpointer GetCurrentProcess (void)
+{
+	mono_once (&process_current_once, process_set_current);
+		
+	return((gpointer)-1);
+}
+
+guint32 GetCurrentProcessId (void)
+{
+	mono_once (&process_current_once, process_set_current);
+		
+	return(getpid ());
+}
+
+static gboolean process_enum (gpointer handle, gpointer user_data)
+{
+	GPtrArray *processes=user_data;
+	
+	g_ptr_array_add (processes, handle);
+	
+	/* Return false to keep searching */
+	return(FALSE);
+}
+
+gboolean EnumProcesses (guint32 *pids, guint32 len, guint32 *needed)
+{
+	GPtrArray *processes=g_ptr_array_new ();
+	guint32 fit, i;
+	
+	_wapi_search_handle (WAPI_HANDLE_PROCESS, process_enum, processes,
+			     NULL, NULL);
+	
+	fit=len/sizeof(guint32);
+	for(i=0; i<fit && i<processes->len; i++) {
+		struct _WapiHandle_process *process_handle;
+		gboolean ok;
+
+		ok=_wapi_lookup_handle (g_ptr_array_index (processes, i),
+					WAPI_HANDLE_PROCESS,
+					(gpointer *)&process_handle, NULL);
+		if(ok==FALSE) {
+			g_warning (G_GNUC_PRETTY_FUNCTION ": error looking up process handle %p", g_ptr_array_index (processes, i));
+			g_ptr_array_free (processes, FALSE);
+			return(FALSE);
+		}
+
+		pids[i]=process_handle->id;
+	}
+
+	g_ptr_array_free (processes, FALSE);
+	
+	*needed=i*sizeof(guint32);
+	
+	return(TRUE);
+}
+
+static gboolean process_open_compare (gpointer handle, gpointer user_data)
+{
+	struct _WapiHandle_process *process_handle;
+	gboolean ok;
+	pid_t pid;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_PROCESS,
+				(gpointer *)&process_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up process handle %p", handle);
+		return(FALSE);
+	}
+
+	pid=GPOINTER_TO_UINT (user_data);
+
+	/* It's possible to have more than one process handle with the
+	 * same pid, but only the one running process can be
+	 * unsignalled
+	 */
+	if(process_handle->id==pid &&
+	   _wapi_handle_issignalled (handle)==FALSE) {
+		return(TRUE);
+	} else {
+		return(FALSE);
+	}
+}
+
+gpointer OpenProcess (guint32 access G_GNUC_UNUSED, gboolean inherit G_GNUC_UNUSED, guint32 pid)
+{
+	/* Find the process handle that corresponds to pid */
+	gpointer handle;
+	
+	mono_once (&process_current_once, process_set_current);
+
+	handle=_wapi_search_handle (WAPI_HANDLE_PROCESS, process_open_compare,
+				    GUINT_TO_POINTER (pid), NULL, NULL);
+	if(handle==0) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Can't find pid %d", pid);
+#endif
+
+		/* Set an error code */
+	
+		return(NULL);
+	}
+
+	_wapi_handle_ref (handle);
+	
+	return(handle);
+}
+
+gboolean GetExitCodeProcess (gpointer process, guint32 *code)
+{
+	struct _WapiHandle_process *process_handle;
+	gboolean ok;
+	
+	mono_once (&process_current_once, process_set_current);
+
+	if(code==NULL) {
+		return(FALSE);
+	}
+	
+	ok=_wapi_lookup_handle (process, WAPI_HANDLE_PROCESS,
+				(gpointer *)&process_handle, NULL);
+	if(ok==FALSE) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Can't find process %p",
+			   process);
+#endif
+		
+		return(FALSE);
+	}
+	
+	/* A process handle is only signalled if the process has exited */
+	if(_wapi_handle_issignalled (process)==TRUE) {
+		*code=process_handle->exitstatus;
+	} else {
+		*code=STILL_ACTIVE;
+	}
+	
+	return(TRUE);
+}
+
+gboolean GetProcessTimes (gpointer process, WapiFileTime *create_time,
+			  WapiFileTime *exit_time, WapiFileTime *kernel_time,
+			  WapiFileTime *user_time)
+{
+	struct _WapiHandle_process *process_handle;
+	gboolean ok;
+	
+	mono_once (&process_current_once, process_set_current);
+
+	if(create_time==NULL || exit_time==NULL || kernel_time==NULL ||
+	   user_time==NULL) {
+		/* Not sure if w32 allows NULLs here or not */
+		return(FALSE);
+	}
+	
+	ok=_wapi_lookup_handle (process, WAPI_HANDLE_PROCESS,
+				(gpointer *)&process_handle, NULL);
+	if(ok==FALSE) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Can't find process %p",
+			   process);
+#endif
+		
+		return(FALSE);
+	}
+	
+	*create_time=process_handle->create_time;
+
+	/* A process handle is only signalled if the process has
+	 * exited.  Otherwise exit_time isn't set
+	 */
+	if(_wapi_handle_issignalled (process)==TRUE) {
+		*exit_time=process_handle->exit_time;
+	}
+	
+	return(TRUE);
+}
diff --git a/mono/io-layer/processes.h b/mono/io-layer/processes.h
new file mode 100644
index 00000000000..b28c9198234
--- /dev/null
+++ b/mono/io-layer/processes.h
@@ -0,0 +1,121 @@
+/*
+ * processes.h:  Process handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_PROCESSES_H_
+#define _WAPI_PROCESSES_H_
+
+#include <glib.h>
+
+#include <mono/io-layer/handles.h>
+#include <mono/io-layer/access.h>
+
+typedef enum {
+	STARTF_USESHOWWINDOW=0x001,
+	STARTF_USESIZE=0x002,
+	STARTF_USEPOSITION=0x004,
+	STARTF_USECOUNTCHARS=0x008,
+	STARTF_USEFILLATTRIBUTE=0x010,
+	STARTF_RUNFULLSCREEN=0x020,
+	STARTF_FORCEONFEEDBACK=0x040,
+	STARTF_FORCEOFFFEEDBACK=0x080,
+	STARTF_USESTDHANDLES=0x100,
+} WapiStartupFlags;
+
+
+typedef struct _WapiStartupInfo WapiStartupInfo;
+
+struct _WapiStartupInfo 
+{
+	guint32 cb;
+	guchar *lpReserved;
+	guchar *lpDesktop;
+	guchar *lpTitle;
+	guint32 dwX;
+	guint32 dwY;
+	guint32 dwXSize;
+	guint32 dwYSize;
+	guint32 dwXCountChars;
+	guint32 dwYCountChars;
+	guint32 dwFillAttribute;
+	WapiStartupFlags dwFlags;
+	guint16 wShowWindow;
+	guint16 cbReserved2;
+	guint8 *lpReserved2;
+	gpointer hStdInput;
+	gpointer hStdOutput;
+	gpointer hStdError;
+};
+
+typedef struct _WapiProcessInformation WapiProcessInformation;
+
+struct _WapiProcessInformation 
+{
+	gpointer hProcess;
+	gpointer hThread;
+	guint32 dwProcessId;
+	guint32 dwThreadId;
+};
+
+	
+#define DEBUG_PROCESS 0x00000001
+#define DEBUG_ONLY_THIS_PROCESS 0x00000002
+#define CREATE_SUSPENDED 0x00000004
+#define DETACHED_PROCESS 0x00000008
+#define CREATE_NEW_CONSOLE 0x00000010
+#define NORMAL_PRIORITY_CLASS 0x00000020
+#define IDLE_PRIORITY_CLASS 0x00000040
+#define HIGH_PRIORITY_CLASS 0x00000080
+#define REALTIME_PRIORITY_CLASS 0x00000100
+#define CREATE_NEW_PROCESS_GROUP 0x00000200
+#define CREATE_UNICODE_ENVIRONMENT 0x00000400
+#define CREATE_SEPARATE_WOW_VDM 0x00000800
+#define CREATE_SHARED_WOW_VDM 0x00001000
+#define CREATE_FORCEDOS 0x00002000
+#define BELOW_NORMAL_PRIORITY_CLASS 0x00004000
+#define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000
+#define CREATE_BREAKAWAY_FROM_JOB 0x01000000
+#define CREATE_WITH_USERPROFILE 0x02000000
+#define CREATE_DEFAULT_ERROR_MODE 0x04000000
+#define CREATE_NO_WINDOW 0x08000000
+
+#ifdef NEW_STUFF
+#define CREATE_PRESERVE_CODE_AUTHZ_LEVEL find out the value for this one...
+#endif
+
+#define	PROCESS_TERMINATE		0x0001
+#define	PROCESS_CREATE_THREAD		0x0002
+#define	PROCESS_SET_SESSIONID		0x0004
+#define	PROCESS_VM_OPERATION		0x0008
+#define	PROCESS_VM_READ			0x0010
+#define	PROCESS_VM_WRITE		0x0020
+#define	PROCESS_DUP_HANDLE		0x0040
+#define	PROCESS_CREATE_PROCESS		0x0080
+#define	PROCESS_SET_QUOTA		0x0100
+#define	PROCESS_SET_INFORMATION		0x0200
+#define	PROCESS_QUERY_INFORMATION	0x0400
+#define	PROCESS_ALL_ACCESS		(STANDARD_RIGHTS_REQUIRED | SYNCHRONIZE | 0xfff)
+
+extern gboolean CreateProcess (const gunichar2 *appname, gunichar2 *cmdline,
+			       WapiSecurityAttributes *process_attrs,
+			       WapiSecurityAttributes *thread_attrs,
+			       gboolean inherit_handles, guint32 create_flags,
+			       gpointer environ, const gunichar2 *cwd,
+			       WapiStartupInfo *startup,
+			       WapiProcessInformation *process_info);
+extern gpointer GetCurrentProcess (void);
+extern guint32 GetCurrentProcessId (void);
+extern gboolean EnumProcesses (guint32 *pids, guint32 len, guint32 *needed);
+extern gpointer OpenProcess (guint32 access, gboolean inherit, guint32 pid);
+extern gboolean GetExitCodeProcess (gpointer process, guint32 *code);
+extern gboolean GetProcessTimes (gpointer process, WapiFileTime *create_time,
+				 WapiFileTime *exit_time,
+				 WapiFileTime *kernel_time,
+				 WapiFileTime *user_time);
+
+#endif /* _WAPI_PROCESSES_H_ */
diff --git a/mono/io-layer/semaphore-private.h b/mono/io-layer/semaphore-private.h
new file mode 100644
index 00000000000..97d8340d0a6
--- /dev/null
+++ b/mono/io-layer/semaphore-private.h
@@ -0,0 +1,30 @@
+/*
+ * semaphore-private.h:  Private definitions for semaphore handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_SEMAPHORE_PRIVATE_H_
+#define _WAPI_SEMAPHORE_PRIVATE_H_
+
+#include <config.h>
+#include <glib.h>
+
+extern struct _WapiHandleOps _wapi_sem_ops;
+
+/* emulate sem_t, so that we can prod the internal state more easily */
+struct _WapiHandle_sem
+{
+	guint32 val;
+	gint32 max;
+};
+
+struct _WapiHandlePrivate_sem
+{
+	int dummy;
+};
+
+#endif /* _WAPI_SEMAPHORE_PRIVATE_H_ */
diff --git a/mono/io-layer/semaphores.c b/mono/io-layer/semaphores.c
index a8f0ea8245b..728e16d9a4f 100644
--- a/mono/io-layer/semaphores.c
+++ b/mono/io-layer/semaphores.c
@@ -1,3 +1,12 @@
+/*
+ * semaphores.c:  Semaphore handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <pthread.h>
@@ -6,54 +15,37 @@
 #include <string.h>
 #include <sys/time.h>
 
-#include "mono/io-layer/wapi.h"
-#include "wapi-private.h"
-#include "wait-private.h"
-#include "misc-private.h"
-#include "handles-private.h"
-
-#include "mono-mutex.h"
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/misc-private.h>
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/mono-mutex.h>
+#include <mono/io-layer/semaphore-private.h>
 
 #undef DEBUG
 
-/* emulate sem_t, so that we can prod the internal state more easily */
-struct _WapiHandle_sem
-{
-	WapiHandle handle;
-	guint32 val;
-	gint32 max;
-};
+static void sema_close_shared (gpointer handle);
+static void sema_signal(gpointer handle);
+static void sema_own (gpointer handle);
 
-/* This mutex controls access to _all_ semaphores and should not be
- * locked for long periods.
- *
- * This global mutex and cond is really for wait_multiple, so we dont
- * have to try and lock multiple handle mutexes and conditions.
- */
-static mono_mutex_t sem_mutex=MONO_MUTEX_INITIALIZER;
-static pthread_cond_t sem_cond=PTHREAD_COND_INITIALIZER;
-
-static void sema_close(WapiHandle *handle);
-static gboolean sema_wait(WapiHandle *handle, WapiHandle *signal, guint32 ms);
-static guint32 sema_wait_multiple(gpointer data);
-static void sema_signal(WapiHandle *handle);
-
-static struct _WapiHandleOps sem_ops = {
-	sema_close,		/* close */
-	NULL,			/* getfiletype */
-	NULL,			/* readfile */
-	NULL,			/* writefile */
-	NULL,			/* seek */
-	NULL,			/* setendoffile */
-	NULL,			/* getfilesize */
-	NULL,			/* getfiletime */
-	NULL,			/* setfiletime */
-	sema_wait,		/* wait */
-	sema_wait_multiple,	/* wait_multiple */
+struct _WapiHandleOps _wapi_sem_ops = {
+	sema_close_shared,	/* close_shared */
+	NULL,			/* close_private */
 	sema_signal,		/* signal */
+	sema_own,		/* own */
+	NULL,			/* is_owned */
 };
 
-static void sema_close(WapiHandle *handle G_GNUC_UNUSED)
+static mono_once_t sem_ops_once=MONO_ONCE_INIT;
+
+static void sem_ops_init (void)
+{
+	_wapi_handle_register_capabilities (WAPI_HANDLE_SEM,
+					    WAPI_HANDLE_CAP_WAIT |
+					    WAPI_HANDLE_CAP_SIGNAL);
+}
+
+static void sema_close_shared (gpointer handle G_GNUC_UNUSED)
 {
 	/* Not really much to do here */
 #ifdef DEBUG
@@ -61,202 +53,40 @@ static void sema_close(WapiHandle *handle G_GNUC_UNUSED)
 #endif
 }
 
-static gboolean sema_wait(WapiHandle *handle, WapiHandle *signal, guint32 ms)
+static void sema_signal(gpointer handle)
 {
-	struct _WapiHandle_sem *sem_handle=(struct _WapiHandle_sem *)handle;
-	gboolean waited;
-	int ret;
-	
-	mono_mutex_lock(&sem_mutex);
-	
-	/* Signal this handle after we have obtained the semaphore
-	 * global lock
-	 */
-	if(signal!=NULL) {
-		signal->ops->signal(signal);
-	}
-	
-	/* Shortcut when ms==0 */
-	if(ms==0) {
-		/* Just poll */
-#ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Polling");
-#endif
-		if(sem_handle->val>0) {
-			waited=TRUE;
-		} else {
-			waited=FALSE;
-		}
-		goto end;
-	}
-	
-	/* Check state first */
-	if(sem_handle->val>0) {
-		waited=TRUE;
-		goto end;
-	}
-	
-	if(ms==INFINITE) {
-		ret=mono_cond_wait(&sem_cond, &sem_mutex);
-		waited=TRUE;
-	} else {
-		struct timespec timeout;
-
-		_wapi_calc_timeout(&timeout, ms);
-		
-		ret=mono_cond_timedwait(&sem_cond, &sem_mutex, &timeout);
-		if(ret==0) {
-			waited=TRUE;
-		} else {
-			/* ret might be ETIMEDOUT for timeout, or
-			 * other for error */
-			waited=FALSE;
-		}
-	}
-	
-end:
-	if(waited==TRUE) {
-		sem_handle->val--;
-	}
-	
-	mono_mutex_unlock(&sem_mutex);
-	return(waited);
+	ReleaseSemaphore(handle, 1, NULL);
 }
 
-static guint32 sema_wait_multiple(gpointer data G_GNUC_UNUSED)
+static void sema_own (gpointer handle)
 {
-	WaitQueueItem *item=(WaitQueueItem *)data;
-	guint32 numhandles, count;
-	struct timespec timeout;
-	guint32 i;
-	int ret;
-	
-	numhandles=item->handles[WAPI_HANDLE_SEM]->len;
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": waiting on %d sem handles for %d ms", numhandles,
-		  item->timeout);
-#endif
-
-	mono_mutex_lock(&sem_mutex);
-	
-	/* First, check if any of the handles are already signalled.
-	 * If waitall is specified we only return if all handles have
-	 * been signalled.
-	 */
-	for(count=0, i=0; i<numhandles; i++) {
-		struct _WapiHandle_sem *sem_handle;
-		
-		sem_handle=g_ptr_array_index(item->handles[WAPI_HANDLE_SEM],
-					     i);
-		if(sem_handle->val>0) {
-			count++;
-		}
-	}
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Preliminary check found %d handles signalled", count);
-#endif
-
-	if((item->waitall==TRUE && count==numhandles) ||
-	   (item->waitall==FALSE && count>0)) {
-		goto success;
-	}
-	
-	/* OK, we need to wait for some */
-	if(item->timeout!=INFINITE) {
-		_wapi_calc_timeout(&timeout, item->timeout);
-	}
+	struct _WapiHandle_sem *sem_handle;
+	gboolean ok;
 	
-	/* We can restart from here without resetting the timeout,
-	 * because it is calculated from absolute time, not an offset.
-	 */
-again:
-	if(item->timeout==INFINITE) {
-		ret=mono_cond_wait(&sem_cond, &sem_mutex);
-	} else {
-		ret=mono_cond_timedwait(&sem_cond, &sem_mutex, &timeout);
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_SEM,
+				(gpointer *)&sem_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up sem handle %p", handle);
+		return;
 	}
 	
-	if(ret==ETIMEDOUT) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Wait timed out");
+	g_message(G_GNUC_PRETTY_FUNCTION ": owning sem handle %p", handle);
 #endif
 
-		goto success;
-	}
-
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Sem posted, checking status");
-#endif
-
-	/* A semaphore was posted, so see if it was one we are
-	 * interested in
-	 */
-	for(count=0, i=0; i<numhandles; i++) {
-		struct _WapiHandle_sem *sem_handle;
-		
-		sem_handle=g_ptr_array_index(item->handles[WAPI_HANDLE_SEM],
-					     i);
-		if(sem_handle->val>0) {
-			count++;
-		}
-	}
-
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Check after sem post found %d handles signalled", count);
-#endif
-
-	if((item->waitall==TRUE && count==numhandles) ||
-	   (item->waitall==FALSE && count>0)) {
-		goto success;
-	}
+	sem_handle->val--;
 	
-	/* Either we have waitall set with more handles to wait for, or
-	 * the sem that was posted wasn't interesting to us
-	 */
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Waiting a bit longer");
+	g_message (G_GNUC_PRETTY_FUNCTION ": sem %p val now %d", handle,
+		   sem_handle->val);
 #endif
 
-	goto again;
-	
-success:
-	item->waited[WAPI_HANDLE_SEM]=TRUE;
-	item->waitcount[WAPI_HANDLE_SEM]=count;
-
-	if((item->waitall==TRUE && count==numhandles) ||
-	   (item->waitall==FALSE && count>0)) {
-		/* Decrease all waited semaphores */
-		for(i=0; i<numhandles; i++) {
-			struct _WapiHandle_sem *sem_handle;
-			guint32 idx;
-			
-			sem_handle=g_ptr_array_index(
-				item->handles[WAPI_HANDLE_SEM], i);
-
-			idx=g_array_index(item->waitindex[WAPI_HANDLE_SEM],
-					  guint32, i);
-			_wapi_handle_set_lowest(item, idx);
-			
-			if(sem_handle->val>0) {
-				sem_handle->val--;
-			}
-		}
+	if(sem_handle->val==0) {
+		_wapi_handle_set_signal_state (handle, FALSE, FALSE);
 	}
-
-	mono_mutex_unlock(&sem_mutex);
-
-	return(count);
 }
 
-static void sema_signal(WapiHandle *handle)
-{
-	ReleaseSemaphore(handle, 1, NULL);
-}
 
 /**
  * CreateSemaphore:
@@ -276,10 +106,13 @@ static void sema_signal(WapiHandle *handle)
  *
  * Return value: a new handle, or NULL
  */
-WapiHandle *CreateSemaphore(WapiSecurityAttributes *security G_GNUC_UNUSED, gint32 initial, gint32 max, const guchar *name G_GNUC_UNUSED)
+gpointer CreateSemaphore(WapiSecurityAttributes *security G_GNUC_UNUSED, gint32 initial, gint32 max, const guchar *name G_GNUC_UNUSED)
 {
 	struct _WapiHandle_sem *sem_handle;
-	WapiHandle *handle;
+	gpointer handle;
+	gboolean ok;
+	
+	mono_once (&sem_ops_once, sem_ops_init);
 	
 	if(max<=0) {
 #ifdef DEBUG
@@ -297,17 +130,38 @@ WapiHandle *CreateSemaphore(WapiSecurityAttributes *security G_GNUC_UNUSED, gint
 		return(NULL);
 	}
 	
-	sem_handle=(struct _WapiHandle_sem *)g_new0(struct _WapiHandle_sem, 1);
-	handle=(WapiHandle *)sem_handle;
-	_WAPI_HANDLE_INIT(handle, WAPI_HANDLE_SEM, sem_ops);
+	handle=_wapi_handle_new (WAPI_HANDLE_SEM);
+	if(handle==_WAPI_HANDLE_INVALID) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error creating semaphore handle");
+		return(NULL);
+	}
+
+	_wapi_handle_lock_handle (handle);
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_SEM,
+				(gpointer *)&sem_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error lookup up semaphore handle %p", handle);
+		_wapi_handle_unlock_handle (handle);
+		return(NULL);
+	}
 
 	sem_handle->val=initial;
 	sem_handle->max=max;
 
+	if(initial!=0) {
+		_wapi_handle_set_signal_state (handle, TRUE, FALSE);
+	}
+
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Created semaphore handle %p",
-		  handle);
+	g_message(G_GNUC_PRETTY_FUNCTION
+		  ": Created semaphore handle %p initial %d max %d", handle,
+		  initial, max);
 #endif
+
+	_wapi_handle_unlock_handle (handle);
 	
 	return(handle);
 }
@@ -324,13 +178,26 @@ WapiHandle *CreateSemaphore(WapiSecurityAttributes *security G_GNUC_UNUSED, gint
  *
  * Return value: %TRUE on success, %FALSE otherwise.
  */
-gboolean ReleaseSemaphore(WapiHandle *handle, gint32 count, gint32 *prevcount)
+gboolean ReleaseSemaphore(gpointer handle, gint32 count, gint32 *prevcount)
 {
-	struct _WapiHandle_sem *sem_handle=(struct _WapiHandle_sem *)handle;
+	struct _WapiHandle_sem *sem_handle;
+	gboolean ok;
 	gboolean ret=FALSE;
 	
-	
-	mono_mutex_lock(&sem_mutex);
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_SEM,
+				(gpointer *)&sem_handle, NULL);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up sem handle %p", handle);
+		return(FALSE);
+	}
+
+	_wapi_handle_lock_handle (handle);
+
+#ifdef DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION ": sem %p val %d count %d",
+		  handle, sem_handle->val, count);
+#endif
 	
 	/* Do this before checking for count overflow, because overflowing max
 	 * is a listed technique for finding the current value
@@ -350,10 +217,17 @@ gboolean ReleaseSemaphore(WapiHandle *handle, gint32 count, gint32 *prevcount)
 	}
 	
 	sem_handle->val+=count;
-	pthread_cond_broadcast(&sem_cond);
+	_wapi_handle_set_signal_state (handle, TRUE, TRUE);
+	
 	ret=TRUE;
+
+#ifdef DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION ": sem %p val now %d", handle,
+		  sem_handle->val);
+#endif
 	
 end:
-	mono_mutex_unlock(&sem_mutex);
+	_wapi_handle_unlock_handle (handle);
+
 	return(ret);
 }
diff --git a/mono/io-layer/semaphores.h b/mono/io-layer/semaphores.h
index 21a8bd0e535..6ccba9ba6c1 100644
--- a/mono/io-layer/semaphores.h
+++ b/mono/io-layer/semaphores.h
@@ -1,9 +1,21 @@
+/*
+ * semaphores.h:  Semaphore handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_SEMAPHORES_H_
 #define _WAPI_SEMAPHORES_H_
 
 #include <glib.h>
 
-extern WapiHandle *CreateSemaphore(WapiSecurityAttributes *security, gint32 initial, gint32 max, const guchar *name);
-extern gboolean ReleaseSemaphore(WapiHandle *handle, gint32 count, gint32 *prevcount);
+extern gpointer CreateSemaphore(WapiSecurityAttributes *security,
+				gint32 initial, gint32 max,
+				const guchar *name);
+extern gboolean ReleaseSemaphore(gpointer handle, gint32 count,
+				 gint32 *prevcount);
 
 #endif /* _WAPI_SEMAPHORES_H_ */
diff --git a/mono/io-layer/shared.c b/mono/io-layer/shared.c
new file mode 100644
index 00000000000..6e9ca42e4c4
--- /dev/null
+++ b/mono/io-layer/shared.c
@@ -0,0 +1,264 @@
+/*
+ * shared.c:  Shared memory handling, and daemon launching
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+/*
+ * Code to support inter-process sharing of handles.
+ *
+ * I thought of using an mmap()ed file for this.  If linuxthreads
+ * supported PTHREAD_PROCESS_SHARED I would have done; however without
+ * that pthread support the only other inter-process IPC
+ * synchronisation option is a sysV semaphore, and if I'm going to use
+ * that I may as well take advantage of sysV shared memory too.
+ * Actually, semaphores seem to be buggy, or I was using them
+ * incorrectly :-).  I've replaced the sysV semaphore with a shared
+ * integer controlled with Interlocked functions.
+
+ * mmap() files have the advantage of avoiding namespace collisions,
+ * but have the disadvantage of needing cleaning up, and also msync().
+ * sysV shared memory has a really stupid way of getting random key
+ * IDs, which can lead to collisions.
+ *
+ * I deliberately don't ever delete the shared memory: I'd like to
+ * have been able to set the shared memory segment to destroy itself
+ * on last close, but it doesn't support that. (Setting IPC_RMID on a
+ * segment causes subsequent shmat() with the same key to get a new
+ * segment :-( ).  The function to delete the shared memory segment is
+ * only called from a debugging tool (mono/handles/shmdel).
+ *
+ * w32 processes do not have the POSIX parent-child relationship, so a
+ * process handle is available to any other process to find out exit
+ * status.  Handles are destroyed when the last reference to them is
+ * closed.  New handles can be created for long lasting items such as
+ * processes or threads, and also for named synchronisation objects so
+ * long as these haven't been deleted by having the last referencing
+ * handle closed.
+ */
+
+#include <config.h>
+#include <glib.h>
+#include <stdio.h>
+#include <unistd.h>
+#include <sys/types.h>
+#include <sys/ipc.h>
+#include <sys/shm.h>
+#include <errno.h>
+#include <string.h>
+#include <fcntl.h>
+
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/shared.h>
+#include <mono/io-layer/daemon-private.h>
+
+#undef DEBUG
+
+/*
+ * _wapi_shm_attach:
+ * @daemon: Is it the daemon trying to attach to the segment
+ * @success: Was it a success
+ * @shm_id: The ID of the segment created/attached to
+ *
+ * Attach to the shared memory segment or create it if it did not
+ * exist. If it was created and daemon was FALSE a new daemon is
+ * forked into existence. Returns the memory area the segment was
+ * attached to.
+ */
+gpointer _wapi_shm_attach (gboolean daemon, gboolean *success, int *shm_id)
+{
+	gpointer shm_seg;
+	key_t key;
+	gboolean fork_daemon=FALSE;
+	struct _WapiHandleShared_list *data;
+	int tries;
+	
+	/*
+	 * This is an attempt to get a unique key id.  The first arg
+	 * to ftok is a path, so when the config file support is done
+	 * we should use that.
+	 */
+	key=ftok (g_get_home_dir (), _WAPI_HANDLE_VERSION);
+	
+try_again:
+	*shm_id=shmget (key, sizeof(struct _WapiHandleShared_list)+
+			_WAPI_SHM_SCRATCH_SIZE, IPC_CREAT | IPC_EXCL | 0600);
+	if(*shm_id==-1 && errno==EEXIST) {
+		/* Cool, we dont have to fork the handle daemon, but
+		 * we still need to try and get the shm_id.
+		 */
+		*shm_id=shmget (key, 0, 0600);
+			
+		/* it's possible that the shared memory segment was
+		 * deleted in between seeing if it exists, and
+		 * attaching it.  If we got an error here, just try
+		 * attaching it again.
+		 */
+		if(*shm_id==-1) {
+			goto try_again;
+		}
+	} else if (*shm_id!=-1) {
+		/* We created the shared memory segment, so we need to
+		 * fork the handle daemon too
+		 */
+		fork_daemon=TRUE;
+
+		/* sysv shared mem is set to all zero when allocated,
+		 * so we don't need to do any more initialisation here
+		 */
+	} else {
+		/* Some error other than EEXIST */
+		g_critical (G_GNUC_PRETTY_FUNCTION ": shmget error: %s",
+			    strerror (errno));
+		exit (-1);
+	}
+	
+	/* From now on, we need to delete the shm segment before
+	 * exiting on error if we created it (ie, if
+	 * fork_daemon==TRUE)
+	 */
+	shm_seg=shmat (*shm_id, NULL, 0);
+	if(shm_seg==(gpointer)-1) {
+		g_critical (G_GNUC_PRETTY_FUNCTION ": shmat error: %s",
+			    strerror (errno));
+		if(fork_daemon==TRUE) {
+			_wapi_shm_destroy ();
+		}
+		exit (-1);
+	}
+
+	if(daemon==TRUE) {
+		/* No more to do in the daemon */
+		*success=TRUE;
+		return(shm_seg);
+	}
+		
+	data=shm_seg;
+
+	if(fork_daemon==TRUE) {
+		pid_t pid;
+			
+		pid=fork ();
+		if(pid==-1) {
+			g_critical (G_GNUC_PRETTY_FUNCTION ": fork error: %s",
+				    strerror (errno));
+			_wapi_shm_destroy ();
+			exit (-1);
+		} else if (pid==0) {
+			int i;
+			
+			/* child */
+			setsid ();
+			
+			/* FIXME: Clean up memory.  We can delete all
+			 * the managed data
+			 */
+			/* FIXME2: Set process title to something
+			 * informative
+			 */
+
+			/* Start the daemon with a clean sheet of file
+			 * descriptors
+			 */
+			for(i=3; i<getdtablesize (); i++) {
+				close (i);
+			}
+			
+			/* _wapi_daemon_main() does not return */
+			_wapi_daemon_main ();
+			
+			/* But just in case... */
+			data->daemon_running=DAEMON_DIED_AT_STARTUP;
+			exit (-1);
+		}
+		/* parent carries on */
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Daemon pid %d", pid);
+#endif
+	} else {
+		/* Do some sanity checking on the shared memory we
+		 * attached
+		 */
+		if(!(data->daemon_running==DAEMON_STARTING || 
+		     data->daemon_running==DAEMON_RUNNING ||
+		     data->daemon_running==DAEMON_DIED_AT_STARTUP) ||
+		   (strncmp (data->daemon+1, "mono-handle-daemon-", 19)!=0)) {
+			g_warning ("Shared memory sanity check failed.");
+			*success=FALSE;
+			return(NULL);
+		}
+	}
+		
+	for(tries=0; data->daemon_running==DAEMON_STARTING && tries < 100;
+	    tries++) {
+		/* wait for the daemon to sort itself out.  To be
+		 * completely safe, we should have a timeout before
+		 * giving up.
+		 */
+		struct timespec sleepytime;
+			
+		sleepytime.tv_sec=0;
+		sleepytime.tv_nsec=10000000;	/* 10ms */
+			
+		nanosleep (&sleepytime, NULL);
+	}
+	if(tries==100 && data->daemon_running==DAEMON_STARTING) {
+		/* Daemon didnt get going */
+		if(fork_daemon==TRUE) {
+			_wapi_shm_destroy ();
+		}
+		g_warning ("The handle daemon didnt start up properly");
+		*success=FALSE;
+		return(NULL);
+	}
+	
+	if(data->daemon_running==DAEMON_DIED_AT_STARTUP) {
+		/* Oh dear, the daemon had an error starting up */
+		if(fork_daemon==TRUE) {
+			_wapi_shm_destroy ();
+		}
+		g_warning ("Handle daemon failed to start");
+		*success=FALSE;
+		return(NULL);
+	}
+		
+	/* From now on, it's up to the daemon to delete the shared
+	 * memory segment
+	 */
+	
+	*success=TRUE;
+	return(shm_seg);
+}
+
+void _wapi_shm_destroy (void)
+{
+#ifndef DISABLE_SHARED_HANDLES
+	int shm_id;
+	key_t key;
+		
+	/*
+	 * This is an attempt to get a unique key id.  The
+	 * first arg to ftok is a path, so when the config
+	 * file support is done we should use that.
+	 */
+	key=ftok (g_get_home_dir (), _WAPI_HANDLE_VERSION);
+	
+	shm_id=shmget (key, 0, 0600);
+	if(shm_id==-1 && errno==ENOENT) {
+		return;
+	} else if (shm_id==-1) {
+		g_message (G_GNUC_PRETTY_FUNCTION ": shmget error: %s",
+			   strerror (errno));
+		exit (-1);
+	}
+	if(shmctl (shm_id, IPC_RMID, NULL)==-1) {
+		g_message (G_GNUC_PRETTY_FUNCTION ": shmctl error: %s",
+			   strerror (errno));
+		exit (-1);
+	}
+#endif /* DISABLE_SHARED_HANDLES */
+}
diff --git a/mono/io-layer/shared.h b/mono/io-layer/shared.h
new file mode 100644
index 00000000000..fe469898643
--- /dev/null
+++ b/mono/io-layer/shared.h
@@ -0,0 +1,30 @@
+/*
+ * shared.h:  Shared memory handle, and daemon launching
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_SHARED_H_
+#define _WAPI_SHARED_H_
+
+struct _WapiScratchHeader 
+{
+	/* These two can be merged */
+	guint32 flags;
+	guint32 length;
+};
+
+enum {
+	WAPI_SHM_SCRATCH_FREE=0x1,
+};
+
+#define _WAPI_SHM_SCRATCH_SIZE 409600
+
+extern gpointer _wapi_shm_attach (gboolean daemon, gboolean *success,
+				  int *shm_id);
+extern void _wapi_shm_destroy (void);
+
+#endif /* _WAPI_SHARED_H_ */
diff --git a/mono/io-layer/socket-private.h b/mono/io-layer/socket-private.h
new file mode 100644
index 00000000000..47f14c1315f
--- /dev/null
+++ b/mono/io-layer/socket-private.h
@@ -0,0 +1,28 @@
+/*
+ * socket-private.h:  Private definitions for socket handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_SOCKET_PRIVATE_H_
+#define _WAPI_SOCKET_PRIVATE_H_
+
+#include <config.h>
+#include <glib.h>
+
+extern struct _WapiHandleOps _wapi_socket_ops;
+
+struct _WapiHandle_socket
+{
+	int dummy;
+};
+
+struct _WapiHandlePrivate_socket
+{
+	int fd;
+};
+
+#endif /* _WAPI_SOCKET_PRIVATE_H_ */
diff --git a/mono/io-layer/sockets.c b/mono/io-layer/sockets.c
index 4294540edff..f62134f0fff 100644
--- a/mono/io-layer/sockets.c
+++ b/mono/io-layer/sockets.c
@@ -1,3 +1,12 @@
+/*
+ * sockets.c:  Socket handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <pthread.h>
@@ -14,46 +23,47 @@
 #endif
 #include <unistd.h>
 
-#include "mono/io-layer/wapi.h"
-#include "wapi-private.h"
+#ifndef HAVE_MSG_NOSIGNAL
+#include <signal.h>
+#endif
 
-#undef DEBUG
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/socket-private.h>
+#include <mono/io-layer/handles-private.h>
 
-struct _WapiHandle_socket
-{
-	WapiHandle handle;
-	int fd;
-};
+#undef DEBUG
 
 static guint32 startup_count=0;
 static GPtrArray *sockets=NULL;
 static pthread_key_t error_key;
-static pthread_once_t error_key_once=PTHREAD_ONCE_INIT;
-
-static void socket_close(WapiHandle *handle);
-
-static struct _WapiHandleOps socket_ops = {
-	socket_close,		/* close */
-	NULL,			/* getfiletype */
-	NULL,			/* readfile */
-	NULL,			/* writefile */
-	NULL,			/* seek */
-	NULL,			/* setendoffile */
-	NULL,			/* getfilesize */
-	NULL,			/* getfiletime */
-	NULL,			/* setfiletime */
-	NULL,			/* wait */
-	NULL,			/* wait_multiple */
+static mono_once_t error_key_once=MONO_ONCE_INIT;
+
+static void socket_close_private (gpointer handle);
+
+struct _WapiHandleOps _wapi_socket_ops = {
+	NULL,			/* close_shared */
+	socket_close_private,	/* close_private */
 	NULL,			/* signal */
+	NULL,			/* own */
+	NULL,			/* is_owned */
 };
 
-static void socket_close(WapiHandle *handle)
+static mono_once_t socket_ops_once=MONO_ONCE_INIT;
+
+static void socket_ops_init (void)
+{
+	/* No capabilities to register */
+}
+
+static void socket_close_private (gpointer handle)
 {
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": closing socket handle %p", handle);
+	g_message(G_GNUC_PRETTY_FUNCTION ": closing socket handle %p",
+		  handle);
 #endif
 
-	closesocket(handle);
+	closesocket(GPOINTER_TO_UINT (handle));
 }
 
 int WSAStartup(guint32 requested, WapiWSAData *data)
@@ -105,10 +115,10 @@ int WSACleanup(void)
 	
 	/* Close down all sockets */
 	for(i=0; i<sockets->len; i++) {
-		WapiHandle *handle;
+		gpointer handle;
 
 		handle=g_ptr_array_index(sockets, i);
-		handle->ops->close(handle);
+		_wapi_handle_ops_close_private (handle);
 	}
 
 	g_ptr_array_free(sockets, FALSE);
@@ -124,7 +134,7 @@ static void error_init(void)
 
 void WSASetLastError(int error)
 {
-	pthread_once(&error_key_once, error_init);
+	mono_once(&error_key_once, error_init);
 	pthread_setspecific(error_key, GINT_TO_POINTER(error));
 }
 
@@ -133,16 +143,17 @@ int WSAGetLastError(void)
 	int err;
 	void *errptr;
 	
-	pthread_once(&error_key_once, error_init);
+	mono_once(&error_key_once, error_init);
 	errptr=pthread_getspecific(error_key);
 	err=GPOINTER_TO_INT(errptr);
 	
 	return(err);
 }
 
-int closesocket(WapiHandle *handle)
+int closesocket(guint32 handle)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -150,14 +161,18 @@ int closesocket(WapiHandle *handle)
 		return(SOCKET_ERROR);
 	}
 	
-	if(handle->type!=WAPI_HANDLE_SOCKET) {
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
 		WSASetLastError(WSAENOTSOCK);
 		return(SOCKET_ERROR);
 	}
 	
-	g_ptr_array_remove_fast(sockets, handle);
+	g_ptr_array_remove_fast(sockets, GUINT_TO_POINTER (handle));
 	
-	ret=close(socket_handle->fd);
+	ret=close(socket_private_handle->fd);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": close error: %s",
@@ -182,11 +197,13 @@ int closesocket(WapiHandle *handle)
 	return(ret);
 }
 
-WapiHandle *_wapi_accept(WapiHandle *handle, struct sockaddr *addr, socklen_t *addrlen)
+guint32 _wapi_accept(guint32 handle, struct sockaddr *addr,
+		     socklen_t *addrlen)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
-	struct _WapiHandle_socket *new_socket_handle;
-	WapiHandle *new_handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	struct _WapiHandlePrivate_socket *new_socket_private_handle;
+	gpointer new_handle;
+	gboolean ok;
 	int fd;
 	
 	if(startup_count==0) {
@@ -194,7 +211,16 @@ WapiHandle *_wapi_accept(WapiHandle *handle, struct sockaddr *addr, socklen_t *a
 		return(INVALID_SOCKET);
 	}
 	
-	fd=accept(socket_handle->fd, addr, addrlen);
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(INVALID_SOCKET);
+	}
+	
+	fd=accept(socket_private_handle->fd, addr, addrlen);
 	if(fd==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": accept error: %s",
@@ -232,7 +258,9 @@ WapiHandle *_wapi_accept(WapiHandle *handle, struct sockaddr *addr, socklen_t *a
 		case EINVAL:
 			WSASetLastError(WSAEINVAL);
 			break;
+#ifdef ENOSR
 		case ENOSR:
+#endif
 		case ECONNABORTED:
 		case ESOCKTNOSUPPORT:
 		case EPROTONOSUPPORT:
@@ -249,26 +277,42 @@ WapiHandle *_wapi_accept(WapiHandle *handle, struct sockaddr *addr, socklen_t *a
 		
 		return(INVALID_SOCKET);
 	}
+
+	new_handle=_wapi_handle_new (WAPI_HANDLE_SOCKET);
+	if(new_handle==_WAPI_HANDLE_INVALID) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error creating socket handle");
+		return(INVALID_SOCKET);
+	}
+
+	_wapi_handle_lock_handle (new_handle);
 	
-	new_socket_handle=g_new0(struct _WapiHandle_socket, 1);
-	new_handle=(WapiHandle *)new_socket_handle;
-	
-	_WAPI_HANDLE_INIT(new_handle, WAPI_HANDLE_SOCKET, socket_ops);
+	ok=_wapi_lookup_handle (new_handle, WAPI_HANDLE_SOCKET, NULL,
+				(gpointer *)&new_socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		_wapi_handle_unlock_handle (new_handle);
+		return(INVALID_SOCKET);
+	}
 	
-	new_socket_handle->fd=fd;
+	new_socket_private_handle->fd=fd;
 	
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION
 		  ": returning newly accepted socket handle %p with fd %d",
-		  new_handle, new_socket_handle->fd);
+		  new_handle, new_socket_private_handle->fd);
 #endif
 
-	return(new_handle);
+	_wapi_handle_unlock_handle (new_handle);
+
+	return(GPOINTER_TO_UINT (new_handle));
 }
 
-int _wapi_bind(WapiHandle *handle, struct sockaddr *my_addr, socklen_t addrlen)
+int _wapi_bind(guint32 handle, struct sockaddr *my_addr, socklen_t addrlen)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -276,7 +320,16 @@ int _wapi_bind(WapiHandle *handle, struct sockaddr *my_addr, socklen_t addrlen)
 		return(SOCKET_ERROR);
 	}
 	
-	ret=bind(socket_handle->fd, my_addr, addrlen);
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
+	
+	ret=bind(socket_private_handle->fd, my_addr, addrlen);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": bind error: %s",
@@ -299,6 +352,11 @@ int _wapi_bind(WapiHandle *handle, struct sockaddr *my_addr, socklen_t addrlen)
 		case EFAULT:
 			WSASetLastError(WSAEFAULT);
 			break;
+	
+		case EADDRINUSE:
+			WSASetLastError(WSAEADDRINUSE);
+			break;
+
 		case EROFS:
 		case ENAMETOOLONG:
 		case ENOENT:
@@ -315,9 +373,11 @@ int _wapi_bind(WapiHandle *handle, struct sockaddr *my_addr, socklen_t addrlen)
 	return(ret);
 }
 
-int _wapi_connect(WapiHandle *handle, const struct sockaddr *serv_addr, socklen_t addrlen)
+int _wapi_connect(guint32 handle, const struct sockaddr *serv_addr,
+		  socklen_t addrlen)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -325,7 +385,16 @@ int _wapi_connect(WapiHandle *handle, const struct sockaddr *serv_addr, socklen_
 		return(SOCKET_ERROR);
 	}
 	
-	ret=connect(socket_handle->fd, serv_addr, addrlen);
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
+	
+	ret=connect(socket_private_handle->fd, serv_addr, addrlen);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": bind error: %s",
@@ -379,17 +448,28 @@ int _wapi_connect(WapiHandle *handle, const struct sockaddr *serv_addr, socklen_
 	return(ret);
 }
 
-int _wapi_getpeername(WapiHandle *handle, struct sockaddr *name, socklen_t *namelen)
+int _wapi_getpeername(guint32 handle, struct sockaddr *name,
+		      socklen_t *namelen)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
 		WSASetLastError(WSANOTINITIALISED);
 		return(SOCKET_ERROR);
 	}
+	
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
 
-	ret=getpeername(socket_handle->fd, name, namelen);
+	ret=getpeername(socket_private_handle->fd, name, namelen);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": getpeername error: %s",
@@ -422,17 +502,28 @@ int _wapi_getpeername(WapiHandle *handle, struct sockaddr *name, socklen_t *name
 	return(ret);
 }
 
-int _wapi_getsockname(WapiHandle *handle, struct sockaddr *name, socklen_t *namelen)
+int _wapi_getsockname(guint32 handle, struct sockaddr *name,
+		      socklen_t *namelen)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
 		WSASetLastError(WSANOTINITIALISED);
 		return(SOCKET_ERROR);
 	}
+	
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
 
-	ret=getsockname(socket_handle->fd, name, namelen);
+	ret=getsockname(socket_private_handle->fd, name, namelen);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": getsockname error: %s",
@@ -462,9 +553,11 @@ int _wapi_getsockname(WapiHandle *handle, struct sockaddr *name, socklen_t *name
 	return(ret);
 }
 
-int _wapi_getsockopt(WapiHandle *handle, int level, int optname, void *optval, socklen_t *optlen)
+int _wapi_getsockopt(guint32 handle, int level, int optname, void *optval,
+		     socklen_t *optlen)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -472,7 +565,17 @@ int _wapi_getsockopt(WapiHandle *handle, int level, int optname, void *optval, s
 		return(SOCKET_ERROR);
 	}
 	
-	ret=getsockopt(socket_handle->fd, level, optname, optval, optlen);
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
+	
+	ret=getsockopt(socket_private_handle->fd, level, optname, optval,
+		       optlen);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": getsockopt error: %s",
@@ -501,9 +604,10 @@ int _wapi_getsockopt(WapiHandle *handle, int level, int optname, void *optval, s
 	return(ret);
 }
 
-int _wapi_listen(WapiHandle *handle, int backlog)
+int _wapi_listen(guint32 handle, int backlog)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -511,7 +615,16 @@ int _wapi_listen(WapiHandle *handle, int backlog)
 		return(SOCKET_ERROR);
 	}
 	
-	ret=listen(socket_handle->fd, backlog);
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
+	
+	ret=listen(socket_private_handle->fd, backlog);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": listen error: %s",
@@ -540,14 +653,19 @@ int _wapi_listen(WapiHandle *handle, int backlog)
 	return(0);
 }
 
-int _wapi_recv(WapiHandle *handle, void *buf, size_t len, int flags)
+int _wapi_recv(guint32 handle, void *buf, size_t len, int recv_flags)
 {
-	return(_wapi_recvfrom(handle, buf, len, flags, NULL, 0));
+	return(_wapi_recvfrom(handle, buf, len, recv_flags, NULL, 0));
 }
 
-int _wapi_recvfrom(WapiHandle *handle, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen)
+int _wapi_recvfrom(guint32 handle, void *buf, size_t len, int recv_flags,
+		   struct sockaddr *from, socklen_t *fromlen)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+#ifndef HAVE_MSG_NOSIGNAL
+	void (*old_sigpipe)(int);	// old SIGPIPE handler
+#endif
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -555,7 +673,25 @@ int _wapi_recvfrom(WapiHandle *handle, void *buf, size_t len, int flags, struct
 		return(SOCKET_ERROR);
 	}
 	
-	ret=recvfrom(socket_handle->fd, buf, len, flags, from, fromlen);
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
+	
+#ifdef HAVE_MSG_NOSIGNAL
+	ret=recvfrom(socket_private_handle->fd, buf, len, recv_flags | MSG_NOSIGNAL, from,
+		     fromlen);
+#else
+	old_sigpipe = signal(SIGPIPE, SIG_IGN);
+	ret=recvfrom(socket_private_handle->fd, buf, len, recv_flags, from,
+		     fromlen);
+	signal(SIGPIPE, old_sigpipe);
+#endif
+
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": recv error: %s",
@@ -596,9 +732,13 @@ int _wapi_recvfrom(WapiHandle *handle, void *buf, size_t len, int flags, struct
 	return(ret);
 }
 
-int _wapi_send(WapiHandle *handle, const void *msg, size_t len, int flags)
+int _wapi_send(guint32 handle, const void *msg, size_t len, int send_flags)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+#ifndef HAVE_MSG_NOSIGNAL
+	void (*old_sigpipe)(int);	// old SIGPIPE handler
+#endif
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -606,7 +746,22 @@ int _wapi_send(WapiHandle *handle, const void *msg, size_t len, int flags)
 		return(SOCKET_ERROR);
 	}
 	
-	ret=send(socket_handle->fd, msg, len, flags);
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
+
+#ifdef HAVE_MSG_NOSIGNAL
+	ret=send(socket_private_handle->fd, msg, len, send_flags | MSG_NOSIGNAL);
+#else
+	old_sigpipe = signal(SIGPIPE, SIG_IGN);
+	ret=send(socket_private_handle->fd, msg, len, send_flags);
+	signal(SIGPIPE, old_sigpipe);
+#endif
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": send error: %s",
@@ -653,9 +808,14 @@ int _wapi_send(WapiHandle *handle, const void *msg, size_t len, int flags)
 	return(ret);
 }
 
-int _wapi_sendto(WapiHandle *handle, const void *msg, size_t len, int flags, const struct sockaddr *to, socklen_t tolen)
+int _wapi_sendto(guint32 handle, const void *msg, size_t len, int send_flags,
+		 const struct sockaddr *to, socklen_t tolen)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+#ifndef HAVE_MSG_NOSIGNAL
+	void (*old_sigpipe)(int);	// old SIGPIPE handler
+#endif
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -663,7 +823,22 @@ int _wapi_sendto(WapiHandle *handle, const void *msg, size_t len, int flags, con
 		return(SOCKET_ERROR);
 	}
 	
-	ret=sendto(socket_handle->fd, msg, len, flags, to, tolen);
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
+	
+#ifdef HAVE_MSG_NOSIGNAL
+	ret=sendto(socket_private_handle->fd, msg, len, send_flags | MSG_NOSIGNAL, to, tolen);
+#else
+	old_sigpipe = signal(SIGPIPE, SIG_IGN);
+	ret=sendto(socket_private_handle->fd, msg, len, send_flags, to, tolen);
+	signal(SIGPIPE, old_sigpipe);
+#endif
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": send error: %s",
@@ -710,9 +885,11 @@ int _wapi_sendto(WapiHandle *handle, const void *msg, size_t len, int flags, con
 	return(ret);
 }
 
-int _wapi_setsockopt(WapiHandle *handle, int level, int optname, const void *optval, socklen_t optlen)
+int _wapi_setsockopt(guint32 handle, int level, int optname,
+		     const void *optval, socklen_t optlen)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -720,7 +897,17 @@ int _wapi_setsockopt(WapiHandle *handle, int level, int optname, const void *opt
 		return(SOCKET_ERROR);
 	}
 	
-	ret=setsockopt(socket_handle->fd, level, optname, optval, optlen);
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
+	
+	ret=setsockopt(socket_private_handle->fd, level, optname, optval,
+		       optlen);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": setsockopt error: %s",
@@ -749,9 +936,10 @@ int _wapi_setsockopt(WapiHandle *handle, int level, int optname, const void *opt
 	return(ret);
 }
 
-int _wapi_shutdown(WapiHandle *handle, int how)
+int _wapi_shutdown(guint32 handle, int how)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -759,7 +947,16 @@ int _wapi_shutdown(WapiHandle *handle, int how)
 		return(SOCKET_ERROR);
 	}
 	
-	ret=shutdown(socket_handle->fd, how);
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(SOCKET_ERROR);
+	}
+	
+	ret=shutdown(socket_private_handle->fd, how);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": shutdown error: %s",
@@ -785,10 +982,11 @@ int _wapi_shutdown(WapiHandle *handle, int how)
 	return(ret);
 }
 
-WapiHandle *_wapi_socket(int domain, int type, int protocol)
+guint32 _wapi_socket(int domain, int type, int protocol)
 {
-	struct _WapiHandle_socket *socket_handle;
-	WapiHandle *handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gpointer handle;
+	gboolean ok;
 	int fd;
 	
 	fd=socket(domain, type, protocol);
@@ -800,27 +998,43 @@ WapiHandle *_wapi_socket(int domain, int type, int protocol)
 		return(INVALID_SOCKET);
 	}
 	
-	socket_handle=g_new0(struct _WapiHandle_socket, 1);
-	handle=(WapiHandle *)socket_handle;
+	mono_once (&socket_ops_once, socket_ops_init);
 	
-	_WAPI_HANDLE_INIT(handle, WAPI_HANDLE_SOCKET, socket_ops);
+	handle=_wapi_handle_new (WAPI_HANDLE_SOCKET);
+	if(handle==_WAPI_HANDLE_INVALID) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error creating socket handle");
+		return(INVALID_SOCKET);
+	}
+
+	_wapi_handle_lock_handle (handle);
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_SOCKET, NULL,
+				(gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle %p", handle);
+		_wapi_handle_unlock_handle (handle);
+		return(INVALID_SOCKET);
+	}
 	
-	socket_handle->fd=fd;
+	socket_private_handle->fd=fd;
 	
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION
 		  ": returning socket handle %p with fd %d", handle,
-		  socket_handle->fd);
+		  socket_private_handle->fd);
 #endif
 
-	return(handle);
+	_wapi_handle_unlock_handle (handle);
+
+	return(GPOINTER_TO_UINT (handle));
 }
 
 struct hostent *_wapi_gethostbyname(const char *hostname)
 {
 	struct hostent *he;
 	
-	
 	if(startup_count==0) {
 		WSASetLastError(WSANOTINITIALISED);
 		return(NULL);
@@ -858,9 +1072,10 @@ struct hostent *_wapi_gethostbyname(const char *hostname)
 	return(he);
 }
 
-int ioctlsocket(WapiHandle *handle, gint32 command, gpointer arg)
+int ioctlsocket(guint32 handle, gint32 command, gpointer arg)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
 	int ret;
 	
 	if(startup_count==0) {
@@ -868,7 +1083,11 @@ int ioctlsocket(WapiHandle *handle, gint32 command, gpointer arg)
 		return(SOCKET_ERROR);
 	}
 	
-	if(handle->type!=WAPI_HANDLE_SOCKET) {
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
 		WSASetLastError(WSAENOTSOCK);
 		return(SOCKET_ERROR);
 	}
@@ -883,7 +1102,7 @@ int ioctlsocket(WapiHandle *handle, gint32 command, gpointer arg)
 		return(SOCKET_ERROR);
 	}
 
-	ret=ioctl(socket_handle->fd, command, arg);
+	ret=ioctl(socket_private_handle->fd, command, arg);
 	if(ret==-1) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": ioctl error: %s",
@@ -951,24 +1170,54 @@ int _wapi_select(int nfds G_GNUC_UNUSED, fd_set *readfds, fd_set *writefds,
 	return(ret);
 }
 
-void _wapi_FD_CLR(WapiHandle *handle, fd_set *set)
+void _wapi_FD_CLR(guint32 handle, fd_set *set)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return;
+	}
 
-	FD_CLR(socket_handle->fd, set);
+	FD_CLR(socket_private_handle->fd, set);
 }
 
-int _wapi_FD_ISSET(WapiHandle *handle, fd_set *set)
+int _wapi_FD_ISSET(guint32 handle, fd_set *set)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return(0);
+	}
 
-	return(FD_ISSET(socket_handle->fd, set));
+	return(FD_ISSET(socket_private_handle->fd, set));
 }
 
-void _wapi_FD_SET(WapiHandle *handle, fd_set *set)
+void _wapi_FD_SET(guint32 handle, fd_set *set)
 {
-	struct _WapiHandle_socket *socket_handle=(struct _WapiHandle_socket *)handle;
+	struct _WapiHandlePrivate_socket *socket_private_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (GUINT_TO_POINTER (handle), WAPI_HANDLE_SOCKET,
+				NULL, (gpointer *)&socket_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up socket handle 0x%x", handle);
+		WSASetLastError(WSAENOTSOCK);
+		return;
+	}
 
-	FD_SET(socket_handle->fd, set);
+	FD_SET(socket_private_handle->fd, set);
 }
 
diff --git a/mono/io-layer/sockets.h b/mono/io-layer/sockets.h
index d5daefd521f..a1acc0bdc7f 100644
--- a/mono/io-layer/sockets.h
+++ b/mono/io-layer/sockets.h
@@ -1,3 +1,12 @@
+/*
+ * sockets.h:  Socket handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_SOCKETS_H_
 #define _WAPI_SOCKETS_H_
 
@@ -25,14 +34,14 @@ typedef struct
 	guchar *lpVendorInfo;
 } WapiWSAData;
 
-#define INVALID_SOCKET (WapiHandle *)-1
+#define INVALID_SOCKET (guint32)(~0)
 #define SOCKET_ERROR -1
 
 extern int WSAStartup(guint32 requested, WapiWSAData *data);
 extern int WSACleanup(void);
 extern void WSASetLastError(int error);
 extern int WSAGetLastError(void);
-extern int closesocket(WapiHandle *handle);
+extern int closesocket(guint32 handle);
 
 #ifndef _WAPI_BUILDING
 #define accept _wapi_accept
@@ -73,26 +82,39 @@ extern int closesocket(WapiHandle *handle);
 
 #endif /* _WAPI_BUILDING */
 
-extern WapiHandle *_wapi_accept(WapiHandle *handle, struct sockaddr *addr, socklen_t *addrlen);
-extern int _wapi_bind(WapiHandle *handle, struct sockaddr *my_addr, socklen_t addrlen);
-extern int _wapi_connect(WapiHandle *handle, const struct sockaddr *serv_addr, socklen_t addrlen);
-extern int _wapi_getpeername(WapiHandle *handle, struct sockaddr *name, socklen_t *namelen);
-extern int _wapi_getsockname(WapiHandle *handle, struct sockaddr *name, socklen_t *namelen);
-extern int _wapi_getsockopt(WapiHandle *handle, int level, int optname, void *optval, socklen_t *optlen);
-extern int _wapi_listen(WapiHandle *handle, int backlog);
-extern int _wapi_recv(WapiHandle *handle, void *buf, size_t len, int flags);
-extern int _wapi_recvfrom(WapiHandle *handle, void *buf, size_t len, int flags, struct sockaddr *from, socklen_t *fromlen);
-extern int _wapi_send(WapiHandle *handle, const void *msg, size_t len, int flags);
-extern int _wapi_sendto(WapiHandle *handle, const void *msg, size_t len, int flags, const struct sockaddr *to, socklen_t tolen);
-extern int _wapi_setsockopt(WapiHandle *handle, int level, int optname, const void *optval, socklen_t optlen);
-extern int _wapi_shutdown(WapiHandle *handle, int how);
-extern WapiHandle *_wapi_socket(int domain, int type, int protocol);;
+extern guint32 _wapi_accept(guint32 handle, struct sockaddr *addr,
+			    socklen_t *addrlen);
+extern int _wapi_bind(guint32 handle, struct sockaddr *my_addr,
+		      socklen_t addrlen);
+extern int _wapi_connect(guint32 handle, const struct sockaddr *serv_addr,
+			 socklen_t addrlen);
+extern int _wapi_getpeername(guint32 handle, struct sockaddr *name,
+			     socklen_t *namelen);
+extern int _wapi_getsockname(guint32 handle, struct sockaddr *name,
+			     socklen_t *namelen);
+extern int _wapi_getsockopt(guint32 handle, int level, int optname,
+			    void *optval, socklen_t *optlen);
+extern int _wapi_listen(guint32 handle, int backlog);
+extern int _wapi_recv(guint32 handle, void *buf, size_t len, int recv_flags);
+extern int _wapi_recvfrom(guint32 handle, void *buf, size_t len,
+			  int recv_flags, struct sockaddr *from,
+			  socklen_t *fromlen);
+extern int _wapi_send(guint32 handle, const void *msg, size_t len,
+		      int send_flags);
+extern int _wapi_sendto(guint32 handle, const void *msg, size_t len,
+			int send_flags, const struct sockaddr *to,
+			socklen_t tolen);
+extern int _wapi_setsockopt(guint32 handle, int level, int optname,
+			    const void *optval, socklen_t optlen);
+extern int _wapi_shutdown(guint32 handle, int how);
+extern guint32 _wapi_socket(int domain, int type, int protocol);;
 extern struct hostent *_wapi_gethostbyname(const char *hostname);
-extern int _wapi_select(int nfds, fd_set *readfds, fd_set *writefds, fd_set *exceptfds, struct timeval *timeout);
-extern void _wapi_FD_CLR(WapiHandle *handle, fd_set *set);
-extern int _wapi_FD_ISSET(WapiHandle *handle, fd_set *set);
-extern void _wapi_FD_SET(WapiHandle *handle, fd_set *set);
+extern int _wapi_select(int nfds, fd_set *readfds, fd_set *writefds,
+			fd_set *exceptfds, struct timeval *timeout);
+extern void _wapi_FD_CLR(guint32 handle, fd_set *set);
+extern int _wapi_FD_ISSET(guint32 handle, fd_set *set);
+extern void _wapi_FD_SET(guint32 handle, fd_set *set);
 
-extern int ioctlsocket(WapiHandle *handle, gint32 command, gpointer arg);
+extern int ioctlsocket(guint32 handle, gint32 command, gpointer arg);
 
 #endif /* _WAPI_SOCKETS_H_ */
diff --git a/mono/io-layer/status.h b/mono/io-layer/status.h
index cbbf12a55f4..68c7c1c9422 100644
--- a/mono/io-layer/status.h
+++ b/mono/io-layer/status.h
@@ -1,3 +1,12 @@
+/*
+ * status.h:  Status return codes
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_STATUS_H_
 #define _WAPI_STATUS_H_
 
diff --git a/mono/io-layer/system.c b/mono/io-layer/system.c
new file mode 100644
index 00000000000..1cedb180644
--- /dev/null
+++ b/mono/io-layer/system.c
@@ -0,0 +1,26 @@
+/*
+ * system.c:  System information
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+#include <sys/time.h>
+#include <stdlib.h>
+#include <unistd.h>
+
+#include "mono/io-layer/wapi.h"
+
+void GetSystemInfo(WapiSystemInfo *info)
+{
+	info->dwPageSize=getpagesize();
+
+	/* Fill in the rest of this junk. Maybe with libgtop */
+	info->dwNumberOfProcessors=1;
+}
+
+
diff --git a/mono/io-layer/system.h b/mono/io-layer/system.h
new file mode 100644
index 00000000000..847114a246a
--- /dev/null
+++ b/mono/io-layer/system.h
@@ -0,0 +1,42 @@
+/*
+ * system.h:  System information
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_SYSTEM_H_
+#define _WAPI_SYSTEM_H_
+
+#include <glib.h>
+
+typedef struct _WapiSystemInfo WapiSystemInfo;
+
+struct _WapiSystemInfo 
+{
+	union _anon_union
+	{
+		guint32 dwOemId;
+		struct _anon_struct
+		{
+			guint16 wProcessorArchitecture;
+			guint16 wReserved;
+		};
+	};
+	
+	guint32 dwPageSize;
+	gpointer lpMinimumApplicationAddress;
+	gpointer lpMaximumApplicationAddress;
+	guint32 /*_PTR?*/ dwActiveProcessorMask;
+	guint32 dwNumberOfProcessors;
+	guint32 dwProcessorType;
+	guint32 dwAllocationGranularity;
+	guint16 wProcessorLevel;
+	guint16 wProcessorRevision;
+};
+
+extern void GetSystemInfo(WapiSystemInfo *info);
+
+#endif /* _WAPI_SYSTEM_H_ */
diff --git a/mono/io-layer/thread-private.h b/mono/io-layer/thread-private.h
new file mode 100644
index 00000000000..533d6b0513b
--- /dev/null
+++ b/mono/io-layer/thread-private.h
@@ -0,0 +1,38 @@
+/*
+ * thread-private.h:  Private definitions for thread handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_THREAD_PRIVATE_H_
+#define _WAPI_THREAD_PRIVATE_H_
+
+#include <config.h>
+#include <glib.h>
+
+#include <mono/io-layer/timed-thread.h>
+
+extern struct _WapiHandleOps _wapi_thread_ops;
+
+typedef enum {
+	THREAD_STATE_START,
+	THREAD_STATE_EXITED,
+} WapiThreadState;
+
+struct _WapiHandle_thread
+{
+	WapiThreadState state;
+	guint32 exitstatus;
+	gpointer process_handle;
+};
+
+struct _WapiHandlePrivate_thread
+{
+	TimedThread *thread;
+	gboolean joined;
+};
+
+#endif /* _WAPI_THREAD_PRIVATE_H_ */
diff --git a/mono/io-layer/threads.c b/mono/io-layer/threads.c
index 3ed193d32cb..f662ebd33ae 100644
--- a/mono/io-layer/threads.c
+++ b/mono/io-layer/threads.c
@@ -1,4 +1,17 @@
+/*
+ * threads.c:  Thread handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#include "mono/utils/mono-hash.h"
+#endif
 #include <glib.h>
 #include <string.h>
 #include <pthread.h>
@@ -6,246 +19,138 @@
 #include <sys/time.h>
 #include <errno.h>
 
-#include "mono/io-layer/wapi.h"
-#include "wapi-private.h"
-#include "timed-thread.h"
-#include "wait-private.h"
-#include "handles-private.h"
-#include "misc-private.h"
-
-#include "mono-mutex.h"
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/timed-thread.h>
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/misc-private.h>
+#include <mono/io-layer/mono-mutex.h>
+#include <mono/io-layer/thread-private.h>
+#include <mono/io-layer/mono-spinlock.h>
 
 #undef DEBUG
+#undef TLS_DEBUG
+#undef TLS_PTHREAD_MUTEX
 
-typedef enum {
-	THREAD_STATE_START,
-	THREAD_STATE_EXITED,
-} WapiThreadState;
-
-struct _WapiHandle_thread
-{
-	WapiHandle handle;
-	WapiThreadState state;
-	TimedThread *thread;
-	guint32 exitstatus;
-};
-
-static mono_mutex_t thread_signal_mutex = MONO_MUTEX_INITIALIZER;
-static pthread_cond_t thread_signal_cond = PTHREAD_COND_INITIALIZER;
 
 /* Hash threads with tids. I thought of using TLS for this, but that
  * would have to set the data in the new thread, which is more hassle
  */
-static pthread_once_t thread_hash_once = PTHREAD_ONCE_INIT;
+static mono_once_t thread_hash_once = MONO_ONCE_INIT;
 static mono_mutex_t thread_hash_mutex = MONO_MUTEX_INITIALIZER;
 static GHashTable *thread_hash=NULL;
 
-static void thread_close(WapiHandle *handle);
-static gboolean thread_wait(WapiHandle *handle, WapiHandle *signal,
-			    guint32 ms);
-static guint32 thread_wait_multiple(gpointer data);
-
-static struct _WapiHandleOps thread_ops = {
-	thread_close,			/* close */
-	NULL,				/* getfiletype */
-	NULL,				/* readfile */
-	NULL,				/* writefile */
-	NULL,				/* seek */
-	NULL,				/* setendoffile */
-	NULL,				/* getfilesize */
-	NULL,				/* getfiletime */
-	NULL,				/* setfiletime */
-	thread_wait,			/* wait */
-	thread_wait_multiple,		/* wait_multiple */
+#if HAVE_BOEHM_GC
+static MonoGHashTable *tls_gc_hash = NULL;
+#endif
+
+static void thread_close_private (gpointer handle);
+static void thread_own (gpointer handle);
+
+struct _WapiHandleOps _wapi_thread_ops = {
+	NULL,				/* close_shared */
+	thread_close_private,		/* close_private */
 	NULL,				/* signal */
+	thread_own,			/* own */
+	NULL,				/* is_owned */
 };
 
-static void thread_close(WapiHandle *handle)
-{
-	struct _WapiHandle_thread *thread_handle=(struct _WapiHandle_thread *)handle;
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": closing thread handle %p with thread %p id %ld",
-		  thread_handle, thread_handle->thread,
-		  thread_handle->thread->id);
-#endif
+static mono_once_t thread_ops_once=MONO_ONCE_INIT;
 
-	g_free(thread_handle->thread);
+static void thread_ops_init (void)
+{
+	_wapi_handle_register_capabilities (WAPI_HANDLE_THREAD,
+					    WAPI_HANDLE_CAP_WAIT);
 }
 
-static gboolean thread_wait(WapiHandle *handle, WapiHandle *signal, guint32 ms)
+static void thread_close_private (gpointer handle)
 {
-	struct _WapiHandle_thread *thread_handle=(struct _WapiHandle_thread *)handle;
-	int ret;
-	
-	/* A thread can never become unsignalled after it was
-	 * signalled, so we can signal this handle now without
-	 * worrying about lost wakeups
-	 */
-	if(signal!=NULL) {
-		signal->ops->signal(signal);
+	struct _WapiHandlePrivate_thread *thread_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_THREAD, NULL,
+				(gpointer *)&thread_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up thread handle %p", handle);
+		return;
 	}
 	
-	if(handle->signalled==TRUE) {
-		/* Already signalled, so return straight away */
-#ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": thread handle %p already signalled, returning now", handle);
-#endif
-
-		return(TRUE);
-	}
-
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": waiting for %d ms for thread handle %p with id %ld", ms,
-		  thread_handle, thread_handle->thread->id);
+		  ": closing thread handle %p with thread %p id %ld",
+		  handle, thread_handle->thread,
+		  thread_handle->thread->id);
 #endif
 
-	if(ms==INFINITE) {
-		ret=_wapi_timed_thread_join(thread_handle->thread, NULL, NULL);
-	} else {
-		struct timespec timeout;
-
-		_wapi_calc_timeout(&timeout, ms);
-	
-		ret=_wapi_timed_thread_join(thread_handle->thread, &timeout,
-					    NULL);
-	}
-	
-	if(ret==0) {
-		/* Thread joined */
-		return(TRUE);
-	} else {
-		/* ret might be ETIMEDOUT for timeout, or other for error */
-		return(FALSE);
+	if(thread_handle->thread!=NULL) {
+		_wapi_timed_thread_destroy (thread_handle->thread);
 	}
 }
 
-static guint32 thread_wait_multiple(gpointer data)
+static void thread_own (gpointer handle)
 {
-	WaitQueueItem *item=(WaitQueueItem *)data;
-	int ret;
-	guint32 numhandles, count;
-	struct timespec timeout;
-	
-	numhandles=item->handles[WAPI_HANDLE_THREAD]->len;
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": waiting on %d thread handles for %d ms", numhandles,
-		  item->timeout);
-#endif
-
-	/* First, check if any of the handles are already
-	 * signalled. If waitall is specified we only return if all
-	 * handles have been signalled.
-	 */
-	count=_wapi_handle_count_signalled(item, WAPI_HANDLE_THREAD);
-
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Preliminary check found %d handles signalled", count);
-#endif
-
-	if((item->waitall==TRUE && count==numhandles) || 
-	   (item->waitall==FALSE && count>0)) {
-		goto success;
-	}
-	
-	/* OK, we need to wait for some */
-	if(item->timeout!=INFINITE) {
-		_wapi_calc_timeout(&timeout, item->timeout);
-	}
-	
-	/* We can restart from here without resetting the timeout,
-	 * because it is calculated from absolute time, not an offset
-	 */
-again:
-	mono_mutex_lock(&thread_signal_mutex);
-	if(item->timeout==INFINITE) {
-		ret=mono_cond_wait(&thread_signal_cond,
-				      &thread_signal_mutex);
-	} else {
-		ret=mono_cond_timedwait(&thread_signal_cond,
-					   &thread_signal_mutex,
-					   &timeout);
+	struct _WapiHandle_thread *thread_handle;
+	struct _WapiHandlePrivate_thread *thread_private_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
+				(gpointer *)&thread_handle,
+				(gpointer *)&thread_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up thread handle %p", handle);
+		return;
 	}
-	mono_mutex_unlock(&thread_signal_mutex);
-
-	if(ret==ETIMEDOUT) {
-		/* Check signalled state here, just in case a thread
-		 * exited between the first check and the cond wait.
-		 * We return the number of signalled handles, which
-		 * may be fewer than the total.
-		 */
-#ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Wait timed out");
-#endif
 
-		count=_wapi_handle_count_signalled(item, WAPI_HANDLE_THREAD);
-		goto success;
+	if(thread_private_handle->joined==FALSE) {
+		_wapi_timed_thread_join (thread_private_handle->thread, NULL,
+					 NULL);
+		thread_private_handle->joined=TRUE;
 	}
-	
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Thread exited, checking status");
-#endif
-
-	/* Another thread exited, so see if it was one we are
-	 * interested in
-	 */
-	count=_wapi_handle_count_signalled(item, WAPI_HANDLE_THREAD);
-
-#ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Check after thread exit found %d handles signalled",
-		  count);
-#endif
+}
 
-	if((item->waitall==TRUE && count==numhandles) ||
-	   (item->waitall==FALSE && count>0)) {
-		goto success;
+static void thread_exit(guint32 exitstatus, gpointer handle)
+{
+	struct _WapiHandle_thread *thread_handle;
+	struct _WapiHandlePrivate_thread *thread_private_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
+				(gpointer *)&thread_handle,
+				(gpointer *)&thread_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up thread handle %p", handle);
+		return;
 	}
 
-	/* Either we have waitall set with more handles to wait for,
-	 * or the thread that exited wasn't interesting to us
-	 */
+	_wapi_handle_lock_handle (handle);
+
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Waiting a bit longer");
+	g_message (G_GNUC_PRETTY_FUNCTION
+		   ": Recording thread handle %p exit status", handle);
 #endif
-
-	goto again;
-
-success:
-	item->waited[WAPI_HANDLE_THREAD]=TRUE;
-	item->waitcount[WAPI_HANDLE_THREAD]=count;
 	
-	return(count);
-}
-
-static void thread_exit(guint32 exitstatus, gpointer userdata)
-{
-	struct _WapiHandle_thread *thread_handle=(struct _WapiHandle_thread *)userdata;
-
 	thread_handle->exitstatus=exitstatus;
 	thread_handle->state=THREAD_STATE_EXITED;
-	thread_handle->handle.signalled=TRUE;
+	_wapi_handle_set_signal_state (handle, TRUE, TRUE);
+
+	_wapi_handle_unlock_handle (handle);
 	
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION
 		  ": Recording thread handle %p id %ld status as %d",
-		  thread_handle, thread_handle->thread->id, exitstatus);
+		  handle, thread_private_handle->thread->id, exitstatus);
 #endif
 
 	/* Remove this thread from the hash */
 	mono_mutex_lock(&thread_hash_mutex);
-	g_hash_table_remove(thread_hash, &thread_handle->thread->id);
+	g_hash_table_remove(thread_hash, &thread_private_handle->thread->id);
 	mono_mutex_unlock(&thread_hash_mutex);
-	
-	/* Signal any thread waiting on thread exit */
-	mono_mutex_lock(&thread_signal_mutex);
-	pthread_cond_broadcast(&thread_signal_cond);
-	mono_mutex_unlock(&thread_signal_mutex);
+
+	/* The thread is no longer active, so unref it */
+	_wapi_handle_unref (handle);
 }
 
 static void thread_hash_init(void)
@@ -269,21 +174,47 @@ static void thread_hash_init(void)
  *
  * Return value: a new handle, or NULL
  */
-WapiHandle *CreateThread(WapiSecurityAttributes *security G_GNUC_UNUSED, guint32 stacksize G_GNUC_UNUSED,
-			 WapiThreadStart start, gpointer param, guint32 create G_GNUC_UNUSED,
-			 guint32 *tid) 
+gpointer CreateThread(WapiSecurityAttributes *security G_GNUC_UNUSED, guint32 stacksize G_GNUC_UNUSED,
+		      WapiThreadStart start, gpointer param, guint32 create G_GNUC_UNUSED,
+		      guint32 *tid) 
 {
 	struct _WapiHandle_thread *thread_handle;
-	WapiHandle *handle;
+	struct _WapiHandlePrivate_thread *thread_private_handle;
+	gpointer handle;
+	gboolean ok;
 	int ret;
 	
-	pthread_once(&thread_hash_once, thread_hash_init);
+	mono_once(&thread_hash_once, thread_hash_init);
+	mono_once (&thread_ops_once, thread_ops_init);
 	
 	if(start==NULL) {
 		return(NULL);
 	}
 	
-	thread_handle=(struct _WapiHandle_thread *)g_new0(struct _WapiHandle_thread, 1);
+	handle=_wapi_handle_new (WAPI_HANDLE_THREAD);
+	if(handle==_WAPI_HANDLE_INVALID) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error creating thread handle");
+		return(NULL);
+	}
+
+	_wapi_handle_lock_handle (handle);
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
+				(gpointer *)&thread_handle,
+				(gpointer *)&thread_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up thread handle %p", handle);
+		_wapi_handle_unlock_handle (handle);
+		return(NULL);
+	}
+
+	/* Hold a reference while the thread is active, because we use
+	 * the handle to store thread exit information
+	 */
+	_wapi_handle_ref (handle);
+
 	thread_handle->state=THREAD_STATE_START;
 	
 	/* Lock around the thread create, so that the new thread cant
@@ -291,38 +222,66 @@ WapiHandle *CreateThread(WapiSecurityAttributes *security G_GNUC_UNUSED, guint32
 	 */
 	mono_mutex_lock(&thread_hash_mutex);
 	
-	ret=_wapi_timed_thread_create(&thread_handle->thread, NULL, start,
-				      thread_exit, param, thread_handle);
+	ret=_wapi_timed_thread_create(&thread_private_handle->thread, NULL,
+				      start, thread_exit, param, handle);
 	if(ret!=0) {
 #ifdef DEBUG
 		g_message(G_GNUC_PRETTY_FUNCTION ": Thread create error: %s",
 			  strerror(ret));
 #endif
 		mono_mutex_unlock(&thread_hash_mutex);
-		g_free(thread_handle);
+		_wapi_handle_unlock_handle (handle);
+		_wapi_handle_unref (handle);
+		
+		/* And again, because of the reference we took above */
+		_wapi_handle_unref (handle);
 		return(NULL);
 	}
 
-	g_hash_table_insert(thread_hash, &thread_handle->thread->id,
-			    thread_handle);
+	g_hash_table_insert(thread_hash, &thread_private_handle->thread->id,
+			    handle);
 	mono_mutex_unlock(&thread_hash_mutex);
-
-	handle=(WapiHandle *)thread_handle;
-	_WAPI_HANDLE_INIT(handle, WAPI_HANDLE_THREAD, thread_ops);
 	
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Started thread handle %p thread %p ID %ld", thread_handle,
-		  thread_handle->thread, thread_handle->thread->id);
+		  ": Started thread handle %p thread %p ID %ld", handle,
+		  thread_private_handle->thread,
+		  thread_private_handle->thread->id);
 #endif
 	
 	if(tid!=NULL) {
-		*tid=thread_handle->thread->id;
+		*tid=thread_private_handle->thread->id;
 	}
+
+	_wapi_handle_unlock_handle (handle);
 	
 	return(handle);
 }
 
+gpointer OpenThread (guint32 access G_GNUC_UNUSED, gboolean inherit G_GNUC_UNUSED, guint32 tid)
+{
+	gpointer ret=NULL;
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": looking up thread %d", tid);
+#endif
+
+	mono_mutex_lock(&thread_hash_mutex);
+	
+	ret=g_hash_table_lookup(thread_hash, &tid);
+	mono_mutex_unlock(&thread_hash_mutex);
+	
+	if(ret!=NULL) {
+		_wapi_handle_ref (ret);
+	}
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": returning thread handle %p", ret);
+#endif
+	
+	return(ret);
+}
+
 /**
  * ExitThread:
  * @exitcode: Sets the thread's exit code, which can be read from
@@ -334,6 +293,10 @@ WapiHandle *CreateThread(WapiSecurityAttributes *security G_GNUC_UNUSED, guint32
  */
 void ExitThread(guint32 exitcode)
 {
+	/* No thread created yet.  */
+	if (thread_hash == NULL)
+		exit(exitcode);
+
 	_wapi_timed_thread_exit(exitcode);
 }
 
@@ -347,14 +310,25 @@ void ExitThread(guint32 exitcode)
  *
  * Return value: %TRUE, or %FALSE on error.
  */
-gboolean GetExitCodeThread(WapiHandle *handle, guint32 *exitcode)
+gboolean GetExitCodeThread(gpointer handle, guint32 *exitcode)
 {
-	struct _WapiHandle_thread *thread_handle=(struct _WapiHandle_thread *)handle;
+	struct _WapiHandle_thread *thread_handle;
+	struct _WapiHandlePrivate_thread *thread_private_handle;
+	gboolean ok;
+	
+	ok=_wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
+				(gpointer *)&thread_handle,
+				(gpointer *)&thread_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up thread handle %p", handle);
+		return(FALSE);
+	}
 	
 #ifdef DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION
 		  ": Finding exit status for thread handle %p id %ld", handle,
-		  thread_handle->thread->id);
+		  thread_private_handle->thread->id);
 #endif
 
 	if(exitcode==NULL) {
@@ -406,9 +380,9 @@ guint32 GetCurrentThreadId(void)
  * (Unknown whether Windows has a possible failure here.  It may be
  * necessary to implement the pseudohandle-constant behaviour).
  */
-WapiHandle *GetCurrentThread(void)
+gpointer GetCurrentThread(void)
 {
-	WapiHandle *ret=NULL;
+	gpointer ret=NULL;
 	guint32 tid;
 	
 	tid=GetCurrentThreadId();
@@ -431,7 +405,7 @@ WapiHandle *GetCurrentThread(void)
  *
  * Return value: the previous suspend count, or 0xFFFFFFFF on error.
  */
-guint32 ResumeThread(WapiHandle *handle G_GNUC_UNUSED)
+guint32 ResumeThread(gpointer handle G_GNUC_UNUSED)
 {
 	return(0xFFFFFFFF);
 }
@@ -445,11 +419,30 @@ guint32 ResumeThread(WapiHandle *handle G_GNUC_UNUSED)
  *
  * Return value: the previous suspend count, or 0xFFFFFFFF on error.
  */
-guint32 SuspendThread(WapiHandle *handle G_GNUC_UNUSED)
+guint32 SuspendThread(gpointer handle G_GNUC_UNUSED)
 {
 	return(0xFFFFFFFF);
 }
 
+int
+PosixKillThread (gpointer handle, int signum)
+{
+	struct _WapiHandle_thread *thread_handle;
+	struct _WapiHandlePrivate_thread *thread_private_handle;
+	gboolean ok;
+	
+	ok = _wapi_lookup_handle (handle, WAPI_HANDLE_THREAD,
+				  (gpointer *)&thread_handle,
+				  (gpointer *)&thread_private_handle);
+	if(ok==FALSE) {
+		g_warning (G_GNUC_PRETTY_FUNCTION
+			   ": error looking up thread handle %p", handle);
+		return(FALSE);
+	}
+
+	return pthread_kill (thread_private_handle->thread->id, signum);
+}
+
 /*
  * We assume here that TLS_MINIMUM_AVAILABLE is less than
  * PTHREAD_KEYS_MAX, allowing enough overhead for a few TLS keys for
@@ -462,7 +455,11 @@ guint32 SuspendThread(WapiHandle *handle G_GNUC_UNUSED)
 
 static pthread_key_t TLS_keys[TLS_MINIMUM_AVAILABLE];
 static gboolean TLS_used[TLS_MINIMUM_AVAILABLE]={FALSE};
+#ifdef TLS_PTHREAD_MUTEX
 static mono_mutex_t TLS_mutex=MONO_MUTEX_INITIALIZER;
+#else
+static guint32 TLS_spinlock=0;
+#endif
 
 /**
  * TlsAlloc:
@@ -478,24 +475,48 @@ guint32 TlsAlloc(void)
 {
 	guint32 i;
 	
+#ifdef TLS_PTHREAD_MUTEX
 	mono_mutex_lock(&TLS_mutex);
+#else
+	MONO_SPIN_LOCK (TLS_spinlock);
+#endif
 	
 	for(i=0; i<TLS_MINIMUM_AVAILABLE; i++) {
 		if(TLS_used[i]==FALSE) {
 			TLS_used[i]=TRUE;
 			pthread_key_create(&TLS_keys[i], NULL);
 
+#ifdef TLS_PTHREAD_MUTEX
 			mono_mutex_unlock(&TLS_mutex);
+#else
+			MONO_SPIN_UNLOCK (TLS_spinlock);
+#endif
+	
+#ifdef TLS_DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": returning key %d",
+				   i);
+#endif
 			
 			return(i);
 		}
 	}
 
+#ifdef TLS_PTHREAD_MUTEX
 	mono_mutex_unlock(&TLS_mutex);
+#else
+	MONO_SPIN_UNLOCK (TLS_spinlock);
+#endif
+	
+#ifdef TLS_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": out of indices");
+#endif
+			
 	
 	return(TLS_OUT_OF_INDEXES);
 }
 
+#define MAKE_GC_ID(idx) (GUINT_TO_POINTER((idx)|(GetCurrentThreadId()<<8)))
+
 /**
  * TlsFree:
  * @idx: The TLS index to free
@@ -507,17 +528,37 @@ guint32 TlsAlloc(void)
  */
 gboolean TlsFree(guint32 idx)
 {
+#ifdef TLS_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": freeing key %d", idx);
+#endif
+
+#ifdef TLS_PTHREAD_MUTEX
 	mono_mutex_lock(&TLS_mutex);
+#else
+	MONO_SPIN_LOCK (TLS_spinlock);
+#endif
 	
 	if(TLS_used[idx]==FALSE) {
+#ifdef TLS_PTHREAD_MUTEX
 		mono_mutex_unlock(&TLS_mutex);
+#else
+		MONO_SPIN_UNLOCK (TLS_spinlock);
+#endif
 		return(FALSE);
 	}
 	
 	TLS_used[idx]=FALSE;
 	pthread_key_delete(TLS_keys[idx]);
 	
+#if HAVE_BOEHM_GC
+	mono_g_hash_table_remove (tls_gc_hash, MAKE_GC_ID (idx));
+#endif
+
+#ifdef TLS_PTHREAD_MUTEX
 	mono_mutex_unlock(&TLS_mutex);
+#else
+	MONO_SPIN_UNLOCK (TLS_spinlock);
+#endif
 	
 	return(TRUE);
 }
@@ -536,16 +577,40 @@ gpointer TlsGetValue(guint32 idx)
 {
 	gpointer ret;
 	
+#ifdef TLS_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": looking up key %d", idx);
+#endif
+
+#ifdef TLS_PTHREAD_MUTEX
 	mono_mutex_lock(&TLS_mutex);
+#else
+	MONO_SPIN_LOCK (TLS_spinlock);
+#endif
 	
 	if(TLS_used[idx]==FALSE) {
+#ifdef TLS_DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": key %d unused", idx);
+#endif
+
+#ifdef TLS_PTHREAD_MUTEX
 		mono_mutex_unlock(&TLS_mutex);
+#else
+		MONO_SPIN_UNLOCK (TLS_spinlock);
+#endif
 		return(NULL);
 	}
 	
 	ret=pthread_getspecific(TLS_keys[idx]);
+
+#ifdef TLS_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": returning %p", ret);
+#endif
 	
+#ifdef TLS_PTHREAD_MUTEX
 	mono_mutex_unlock(&TLS_mutex);
+#else
+	MONO_SPIN_UNLOCK (TLS_spinlock);
+#endif
 	
 	return(ret);
 }
@@ -562,21 +627,57 @@ gpointer TlsGetValue(guint32 idx)
 gboolean TlsSetValue(guint32 idx, gpointer value)
 {
 	int ret;
+
+#ifdef TLS_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": setting key %d to %p", idx,
+		   value);
+#endif
 	
+#ifdef TLS_PTHREAD_MUTEX
 	mono_mutex_lock(&TLS_mutex);
+#else
+	MONO_SPIN_LOCK (TLS_spinlock);
+#endif
 	
 	if(TLS_used[idx]==FALSE) {
+#ifdef TLS_DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": key %d unused", idx);
+#endif
+
+#ifdef TLS_PTHREAD_MUTEX
 		mono_mutex_unlock(&TLS_mutex);
+#else
+		MONO_SPIN_UNLOCK (TLS_spinlock);
+#endif
 		return(FALSE);
 	}
 	
 	ret=pthread_setspecific(TLS_keys[idx], value);
 	if(ret!=0) {
+#ifdef TLS_DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": pthread_setspecific error: %s", strerror (ret));
+#endif
+
+#ifdef TLS_PTHREAD_MUTEX
 		mono_mutex_unlock(&TLS_mutex);
+#else
+		MONO_SPIN_UNLOCK (TLS_spinlock);
+#endif
 		return(FALSE);
 	}
 	
+#if HAVE_BOEHM_GC
+	if (!tls_gc_hash)
+		tls_gc_hash = mono_g_hash_table_new(g_direct_hash, g_direct_equal);
+	mono_g_hash_table_insert (tls_gc_hash, MAKE_GC_ID (idx), value);
+#endif
+
+#ifdef TLS_PTHREAD_MUTEX
 	mono_mutex_unlock(&TLS_mutex);
+#else
+	MONO_SPIN_UNLOCK (TLS_spinlock);
+#endif
 	
 	return(TRUE);
 }
@@ -608,14 +709,14 @@ void Sleep(guint32 ms)
 	divvy=div((int)ms, 1000);
 	
 	req.tv_sec=divvy.quot;
-	req.tv_nsec=divvy.rem*1000;
+	req.tv_nsec=divvy.rem*1000000;
 	
 again:
 	ret=nanosleep(&req, &rem);
 	if(ret==-1) {
 		/* Sleep interrupted with rem time remaining */
 #ifdef DEBUG
-		guint32 rems=rem.tv_sec*1000 + rem.tv_nsec/1000;
+		guint32 rems=rem.tv_sec*1000 + rem.tv_nsec/1000000;
 		
 		g_message(G_GNUC_PRETTY_FUNCTION ": Still got %d ms to go",
 			  rems);
@@ -624,3 +725,13 @@ again:
 		goto again;
 	}
 }
+
+/* FIXME: implement alertable */
+void SleepEx(guint32 ms, gboolean alertable)
+{
+	if(alertable==TRUE) {
+		g_warning(G_GNUC_PRETTY_FUNCTION ": alertable not implemented");
+	}
+	
+	Sleep(ms);
+}
diff --git a/mono/io-layer/threads.h b/mono/io-layer/threads.h
index 1f26637af88..95ddc95104a 100644
--- a/mono/io-layer/threads.h
+++ b/mono/io-layer/threads.h
@@ -1,52 +1,58 @@
+/*
+ * threads.h:  Thread handles
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_THREADS_H_
 #define _WAPI_THREADS_H_
 
 #include <glib.h>
 
-#include "mono/io-layer/handles.h"
-#include "mono/io-layer/io.h"
-#include "mono/io-layer/status.h"
+#include <mono/io-layer/handles.h>
+#include <mono/io-layer/io.h>
+#include <mono/io-layer/status.h>
+#include <mono/io-layer/processes.h>
+#include <mono/io-layer/access.h>
 
 #define TLS_MINIMUM_AVAILABLE 64
 #define TLS_OUT_OF_INDEXES 0xFFFFFFFF
 
 #define STILL_ACTIVE STATUS_PENDING
 
-#define DEBUG_PROCESS 0x00000001
-#define DEBUG_ONLY_THIS_PROCESS 0x00000002
-#define CREATE_SUSPENDED 0x00000004
-#define DETACHED_PROCESS 0x00000008
-#define CREATE_NEW_CONSOLE 0x00000010
-#define NORMAL_PRIORITY_CLASS 0x00000020
-#define IDLE_PRIORITY_CLASS 0x00000040
-#define HIGH_PRIORITY_CLASS 0x00000080
-#define REALTIME_PRIORITY_CLASS 0x00000100
-#define CREATE_NEW_PROCESS_GROUP 0x00000200
-#define CREATE_UNICODE_ENVIRONMENT 0x00000400
-#define CREATE_SEPARATE_WOW_VDM 0x00000800
-#define CREATE_SHARED_WOW_VDM 0x00001000
-#define CREATE_FORCEDOS 0x00002000
-#define BELOW_NORMAL_PRIORITY_CLASS 0x00004000
-#define ABOVE_NORMAL_PRIORITY_CLASS 0x00008000
-#define CREATE_BREAKAWAY_FROM_JOB 0x01000000
-#define CREATE_WITH_USERPROFILE 0x02000000
-#define CREATE_DEFAULT_ERROR_MODE 0x04000000
-#define CREATE_NO_WINDOW 0x08000000
 
+#define THREAD_TERMINATE		0x0001
+#define THREAD_SUSPEND_RESUME		0x0002
+#define THREAD_GET_CONTEXT		0x0008
+#define THREAD_SET_CONTEXT		0x0010
+#define THREAD_SET_INFORMATION		0x0020
+#define THREAD_QUERY_INFORMATION	0x0040
+#define THREAD_SET_THREAD_TOKEN		0x0080
+#define THREAD_IMPERSONATE		0x0100
+#define THREAD_DIRECT_IMPERSONATION	0x0200
+#define THREAD_ALL_ACCESS		(STANDARD_RIGHTS_REQUIRED|SYNCHRONIZE|0x3ff)
 
 typedef guint32 (*WapiThreadStart)(gpointer);
 
-extern WapiHandle *CreateThread(WapiSecurityAttributes *security, guint32 stacksize, WapiThreadStart start, gpointer param, guint32 create, guint32 *tid);
+extern gpointer CreateThread(WapiSecurityAttributes *security,
+			     guint32 stacksize, WapiThreadStart start,
+			     gpointer param, guint32 create, guint32 *tid);
+extern gpointer OpenThread (guint32 access, gboolean inherit, guint32 tid);
 extern void ExitThread(guint32 exitcode) G_GNUC_NORETURN;
-extern gboolean GetExitCodeThread(WapiHandle *handle, guint32 *exitcode);
+extern gboolean GetExitCodeThread(gpointer handle, guint32 *exitcode);
 extern guint32 GetCurrentThreadId(void);
-extern WapiHandle *GetCurrentThread(void);
-extern guint32 ResumeThread(WapiHandle *handle);
-extern guint32 SuspendThread(WapiHandle *handle);
+extern gpointer GetCurrentThread(void);
+extern guint32 ResumeThread(gpointer handle);
+extern guint32 SuspendThread(gpointer handle);
 extern guint32 TlsAlloc(void);
 extern gboolean TlsFree(guint32 idx);
 extern gpointer TlsGetValue(guint32 idx);
 extern gboolean TlsSetValue(guint32 idx, gpointer value);
 extern void Sleep(guint32 ms);
+extern void SleepEx(guint32 ms, gboolean);
+extern int PosixKillThread (gpointer handle, int signum);
 
 #endif /* _WAPI_THREADS_H_ */
diff --git a/mono/io-layer/timed-thread.c b/mono/io-layer/timed-thread.c
index c4c8bf55745..37feeeb5365 100644
--- a/mono/io-layer/timed-thread.c
+++ b/mono/io-layer/timed-thread.c
@@ -1,5 +1,17 @@
+/*
+ * timed-thread.c:  Implementation of timed thread joining
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
 #include <pthread.h>
 
 #include "timed-thread.h"
@@ -14,7 +26,7 @@
  */
 
 static pthread_key_t timed_thread_key;
-static pthread_once_t timed_thread_once = PTHREAD_ONCE_INIT;
+static mono_once_t timed_thread_once = MONO_ONCE_INIT;
 
 static void timed_thread_init(void)
 {
@@ -68,8 +80,9 @@ static void *timed_thread_start_routine(gpointer args)
 {
 	TimedThread *thread = (TimedThread *)args;
 	
-	pthread_once(&timed_thread_once, timed_thread_init);
+	mono_once(&timed_thread_once, timed_thread_init);
 	pthread_setspecific(timed_thread_key, (void *)thread);
+	pthread_detach(thread->id);
 	_wapi_timed_thread_exit(thread->start_routine(thread->arg));
 }
 
@@ -104,7 +117,6 @@ int _wapi_timed_thread_create(TimedThread **threadp,
 		return(result);
 	}
 	
-	pthread_detach(thread->id);
 	return(0);
 }
 
@@ -139,3 +151,10 @@ int _wapi_timed_thread_join(TimedThread *thread, struct timespec *timeout,
 	return(result);
 }
 
+void _wapi_timed_thread_destroy (TimedThread *thread)
+{
+	mono_mutex_destroy (&thread->join_mutex);
+	pthread_cond_destroy (&thread->exit_cond);
+	
+	g_free(thread);
+}
diff --git a/mono/io-layer/timed-thread.h b/mono/io-layer/timed-thread.h
index 683472317e3..82c9d6c307e 100644
--- a/mono/io-layer/timed-thread.h
+++ b/mono/io-layer/timed-thread.h
@@ -1,3 +1,12 @@
+/*
+ * timed-thread.h:  Implementation of timed thread joining
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_TIMED_THREAD_H_
 #define _WAPI_TIMED_THREAD_H_
 
@@ -29,5 +38,6 @@ extern int _wapi_timed_thread_create(TimedThread **threadp,
 extern int _wapi_timed_thread_join(TimedThread *thread,
 				   struct timespec *timeout,
 				   guint32 *exitstatus);
+extern void _wapi_timed_thread_destroy (TimedThread *thread);
 
 #endif /* _WAPI_TIMED_THREAD_H_ */
diff --git a/mono/io-layer/timefuncs-private.h b/mono/io-layer/timefuncs-private.h
new file mode 100644
index 00000000000..6479d255467
--- /dev/null
+++ b/mono/io-layer/timefuncs-private.h
@@ -0,0 +1,18 @@
+/*
+ * timefuncs-private.h:  performance timer and other time private functions
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_TIMEFUNCS_PRIVATE_H_
+#define _WAPI_TIMEFUNCS_PRIVATE_H_
+
+#include <config.h>
+#include <glib.h>
+
+extern void _wapi_time_t_to_filetime (time_t timeval, WapiFileTime *filetime);
+
+#endif /* _WAPI_TIMEFUNCS_PRIVATE_H_ */
diff --git a/mono/io-layer/timefuncs.c b/mono/io-layer/timefuncs.c
new file mode 100644
index 00000000000..274fdd53536
--- /dev/null
+++ b/mono/io-layer/timefuncs.c
@@ -0,0 +1,36 @@
+/*
+ * timefuncs.c:  performance timer and other time functions
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+#include <sys/time.h>
+#include <stdlib.h>
+
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/timefuncs-private.h>
+
+void _wapi_time_t_to_filetime (time_t timeval, WapiFileTime *filetime)
+{
+	guint64 ticks;
+	
+	ticks = ((guint64)timeval * 10000000) + 116444736000000000UL;
+	filetime->dwLowDateTime = ticks & 0xFFFFFFFF;
+	filetime->dwHighDateTime = ticks >> 32;
+}
+
+gboolean QueryPerformanceCounter(WapiLargeInteger *count G_GNUC_UNUSED)
+{
+	return(FALSE);
+}
+
+gboolean QueryPerformanceFrequency(WapiLargeInteger *freq G_GNUC_UNUSED)
+{
+	return(FALSE);
+}
+
diff --git a/mono/io-layer/timefuncs.h b/mono/io-layer/timefuncs.h
new file mode 100644
index 00000000000..e2a86bbd4fe
--- /dev/null
+++ b/mono/io-layer/timefuncs.h
@@ -0,0 +1,26 @@
+/*
+ * timefuncs.h:  performance timer and other time functions
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_TIME_H_
+#define _WAPI_TIME_H_
+
+#include <glib.h>
+
+#include "mono/io-layer/wapi.h"
+
+typedef struct 
+{
+	guint32 dwLowDateTime;
+	guint32 dwHighDateTime;
+} WapiFileTime;
+
+gboolean QueryPerformanceCounter(WapiLargeInteger *count);
+gboolean QueryPerformanceFrequency(WapiLargeInteger *freq);
+
+#endif /* _WAPI_TIME_H_ */
diff --git a/mono/io-layer/types.h b/mono/io-layer/types.h
new file mode 100644
index 00000000000..a2b788c59cd
--- /dev/null
+++ b/mono/io-layer/types.h
@@ -0,0 +1,26 @@
+/*
+ * types.h:  Generic type definitions
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_TYPES_H_
+#define _WAPI_TYPES_H_
+
+#include <glib.h>
+
+typedef union 
+{
+	struct 
+	{
+		guint32 LowPart;
+		gint32 HighPart;
+	} u;
+	
+	guint64 QuadPart;
+} WapiLargeInteger;
+
+#endif /* _WAPI_TYPES_H_ */
diff --git a/mono/io-layer/uglify.h b/mono/io-layer/uglify.h
index 4ec65a4a083..96d219aa376 100644
--- a/mono/io-layer/uglify.h
+++ b/mono/io-layer/uglify.h
@@ -1,3 +1,12 @@
+/*
+ * uglify.h:  Optional header to provide the nasty w32 typedefs
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_UGLIFY_H_
 #define _WAPI_UGLIFY_H_
 
@@ -7,18 +16,28 @@
 
 #include "mono/io-layer/wapi.h"
 
-typedef const guchar *LPCTSTR;		/* replace this with gunichar */
+typedef const gunichar2 *LPCTSTR;
+typedef gunichar2 *LPTSTR;
+typedef guint8 BYTE;
+typedef guint8 *LPBYTE;
 typedef guint16 WORD;
 typedef guint32 DWORD;
+typedef gpointer PVOID;
 typedef gpointer LPVOID;
 typedef gboolean BOOL;
 typedef guint32 *LPDWORD;
 typedef gint32 LONG;
+typedef guint32 ULONG;
 typedef gint32 *PLONG;
+typedef guint64 LONGLONG;
+typedef gunichar2 TCHAR;
+
+typedef gpointer HANDLE;
+typedef gpointer *LPHANDLE;
+typedef guint32 SOCKET;
+typedef gpointer HMODULE;
 
-typedef WapiHandle *HANDLE;
-typedef WapiHandle **LPHANDLE;
-typedef WapiHandle *SOCKET;	/* NB: w32 defines this to be int */
+typedef WapiSecurityAttributes SECURITY_ATTRIBUTES;
 typedef WapiSecurityAttributes *LPSECURITY_ATTRIBUTES;
 typedef WapiOverlapped *LPOVERLAPPED;
 typedef WapiThreadStart LPTHREAD_START_ROUTINE;
@@ -30,10 +49,28 @@ typedef WapiSystemTime SYSTEMTIME;
 typedef WapiSystemTime *LPSYSTEMTIME;
 typedef WapiWSAData WSADATA;
 typedef WapiWSAData *LDWSADATA;
+typedef WapiLargeInteger LARGE_INTEGER;
+typedef WapiLargeInteger *PLARGE_INTEGER;
+typedef WapiSystemInfo SYSTEM_INFO;
+typedef WapiSystemInfo *LPSYSTEM_INFO;
+typedef WapiFloatingSaveArea FLOATING_SAVE_AREA;
+typedef WapiFloatingSaveArea *PFLOATING_SAVE_AREA;
+typedef WapiContext CONTEXT;
+typedef WapiContext *PCONTEXT;
+typedef WapiFindData WIN32_FIND_DATA;
+typedef WapiFindData *LPWIN32_FIND_DATA;
+typedef WapiFileAttributesData WIN32_FILE_ATTRIBUTE_DATA;
+typedef WapiGetFileExInfoLevels GET_FILEEX_INFO_LEVELS;
+typedef WapiStartupInfo STARTUPINFO;
+typedef WapiStartupInfo *LPSTARTUPINFO;
+typedef WapiProcessInformation PROCESS_INFORMATION;
+typedef WapiFixedFileInfo VS_FIXEDFILEINFO;
 
 #define CONST const
 #define VOID void
 
+#define IN
+#define OUT
 #define WINAPI
 
 #endif /* _WAPI_UGLIFY_H_ */
diff --git a/mono/io-layer/unicode.c b/mono/io-layer/unicode.c
index 36ea4f002aa..dbca82b857c 100644
--- a/mono/io-layer/unicode.c
+++ b/mono/io-layer/unicode.c
@@ -1,35 +1,31 @@
+/*
+ * unicode.c:  unicode conversion
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <pthread.h>
+#if HAVE_ICONV_H
 #include <iconv.h>
+#elif HAVE_GICONV_H
+#include <giconv.h>
+#endif
 #include <errno.h>
 
 #include "mono/io-layer/wapi.h"
 #include "unicode.h"
 
-/* This is a nasty kludge */
-static guint32 unicode_len(const guchar *str)
-{
-	guint32 len=0;
-	
-	do {
-		if(str[len]=='\0' && str[len+1]=='\0') {
-			return(len);
-		}
-
-		len+=2;
-	} while(1);
-}
-
-guchar *_wapi_unicode_to_utf8(const guchar *uni)
+gchar *_wapi_unicode_to_utf8(const gunichar2 *uni)
 {
 	GError *error = NULL;
 	gchar *res;
-	int len;
-
-	len = unicode_len(uni);
 	
-	res = g_utf16_to_utf8 ((gunichar2 *)uni, len, NULL, NULL, &error);
+	res = g_utf16_to_utf8 (uni, -1, NULL, NULL, &error);
 
 	g_assert (!error);
 
diff --git a/mono/io-layer/unicode.h b/mono/io-layer/unicode.h
index 55847b9ffdd..d50cabe8a44 100644
--- a/mono/io-layer/unicode.h
+++ b/mono/io-layer/unicode.h
@@ -1,3 +1,12 @@
+/*
+ * unicode.h:  unicode conversion
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_UNICODE_H_
 #define _WAPI_UNICODE_H_
 
@@ -5,6 +14,6 @@
 
 #include <glib.h>
 
-extern guchar *_wapi_unicode_to_utf8(const guchar *uni);
+extern gchar *_wapi_unicode_to_utf8 (const gunichar2 *uni);
 
 #endif /* _WAPI_UNICODE_H_ */
diff --git a/mono/io-layer/versioninfo.h b/mono/io-layer/versioninfo.h
new file mode 100644
index 00000000000..823ababc74a
--- /dev/null
+++ b/mono/io-layer/versioninfo.h
@@ -0,0 +1,160 @@
+/*
+ * versioninfo.h:  Version info structures found in PE file resources
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _WAPI_VERSIONINFO_H_
+#define _WAPI_VERSIONINFO_H_
+
+#include <glib.h>
+
+/*
+ * VS_VERSIONINFO:
+ *
+ * 2 bytes: Length in bytes (this block, and all child blocks. does _not_ include alignment padding between blocks)
+ * 2 bytes: Length in bytes of VS_FIXEDFILEINFO struct
+ * 2 bytes: Type (contains 1 if version resource contains text data and 0 if version resource contains binary data)
+ * Variable length unicode string (null terminated): Key (currently "VS_VERSION_INFO")
+ * Variable length padding to align VS_FIXEDFILEINFO on a 32-bit boundary
+ * VS_FIXEDFILEINFO struct
+ * Variable length padding to align Child struct on a 32-bit boundary
+ * Child struct (zero or one StringFileInfo structs, zero or one VarFileInfo structs)
+ */
+
+/*
+ * StringFileInfo:
+ *
+ * 2 bytes: Length in bytes (includes this block, as well as all Child blocks)
+ * 2 bytes: Value length (always zero)
+ * 2 bytes: Type (contains 1 if version resource contains text data and 0 if version resource contains binary data)
+ * Variable length unicode string: Key (currently "StringFileInfo")
+ * Variable length padding to align Child struct on a 32-bit boundary
+ * Child structs ( one or more StringTable structs.  Each StringTable struct's Key member indicates the appropriate language and code page for displaying the text in that StringTable struct.)
+ */
+
+/*
+ * StringTable:
+ *
+ * 2 bytes: Length in bytes (includes this block as well as all Child blocks, but excludes any padding between String blocks)
+ * 2 bytes: Value length (always zero)
+ * 2 bytes: Type (contains 1 if version resource contains text data and 0 if version resource contains binary data)
+ * Variable length unicode string: Key. An 8-digit hex number stored as a unicode string.  The four most significant digits represent the language identifier.  The four least significant digits represent the code page for which the data is formatted.
+ * Variable length padding to align Child struct on a 32-bit boundary
+ * Child structs (an array of one or more String structs (each aligned on a 32-bit boundary)
+ */
+
+/*
+ * String:
+ *
+ * 2 bytes: Length in bytes (of this block)
+ * 2 bytes: Value length (the length in words of the Value member)
+ * 2 bytes: Type (contains 1 if version resource contains text data and 0 if version resource contains binary data)
+ * Variable length unicode string: Key. arbitrary string, identifies data.
+ * Variable length padding to align Value on a 32-bit boundary
+ * Value: Variable length unicode string, holding data.
+ */
+
+/*
+ * VarFileInfo:
+ *
+ * 2 bytes: Length in bytes (includes this block, as well as all Child blocks)
+ * 2 bytes: Value length (always zero)
+ * 2 bytes: Type (contains 1 if version resource contains text data and 0 if version resource contains binary data)
+ * Variable length unicode string: Key (currently "VarFileInfo")
+ * Variable length padding to align Child struct on a 32-bit boundary
+ * Child structs (a Var struct)
+ */
+
+/*
+ * Var:
+ *
+ * 2 bytes: Length in bytes of this block
+ * 2 bytes: Value length in bytes of the Value
+ * 2 bytes: Type (contains 1 if version resource contains text data and 0 if version resource contains binary data)
+ * Variable length unicode string: Key ("Translation")
+ * Variable length padding to align Value on a 32-bit boundary
+ * Value: an array of one or more 4 byte values that are language and code page identifier pairs, low-order word containing a language identifier, and the high-order word containing a code page number.  Either word can be zero, indicating that the file is language or code page independent.
+ */
+
+typedef struct
+{
+	guint32 dwSignature;		/* Should contain 0xFEEF04BD
+					 * on le machines */
+	guint32 dwStrucVersion;
+	guint32 dwFileVersionMS;
+	guint32 dwFileVersionLS;
+	guint32 dwProductVersionMS;
+	guint32 dwProductVersionLS;
+	guint32 dwFileFlagsMask;
+	guint32 dwFileFlags;
+	guint32 dwFileOS;
+	guint32 dwFileType;
+	guint32 dwFileSubtype;
+	guint32 dwFileDateMS;
+	guint32 dwFileDateLS;
+} WapiFixedFileInfo;
+
+#define VS_FF_DEBUG		0x0001
+#define VS_FF_PRERELEASE	0x0002
+#define VS_FF_PATCHED		0x0004
+#define VS_FF_PRIVATEBUILD	0x0008
+#define VS_FF_INFOINFERRED	0x0010
+#define VS_FF_SPECIALBUILD	0x0020
+
+#define VOS_UNKNOWN		0x00000000
+#define VOS_DOS			0x00010000
+#define VOS_OS216		0x00020000
+#define VOS_OS232		0x00030000
+#define VOS_NT			0x00040000
+#define VOS__BASE		0x00000000
+#define VOS__WINDOWS16		0x00000001
+#define VOS__PM16		0x00000002
+#define VOS__PM32		0x00000003
+#define VOS__WINDOWS32		0x00000004
+/* Should "embrace and extend" here with some entries for linux etc */
+
+#define VOS_DOS_WINDOWS16	0x00010001
+#define VOS_DOS_WINDOWS32	0x00010004
+#define VOS_OS216_PM16		0x00020002
+#define VOS_OS232_PM32		0x00030003
+#define VOS_NT_WINDOWS32	0x00040004
+
+#define VFT_UNKNOWN		0x0000
+#define VFT_APP			0x0001
+#define VFT_DLL			0x0002
+#define VFT_DRV			0x0003
+#define VFT_FONT		0x0004
+#define VFT_VXD			0x0005
+#define VFT_STATIC_LIB		0x0007
+
+#define VFT2_UNKNOWN		0x0000
+#define VFT2_DRV_PRINTER	0x0001
+#define VFT2_DRV_KEYBOARD	0x0002
+#define VFT2_DRV_LANGUAGE	0x0003
+#define VFT2_DRV_DISPLAY	0x0004
+#define VFT2_DRV_MOUSE		0x0005
+#define VFT2_DRV_NETWORK	0x0006
+#define VFT2_DRV_SYSTEM		0x0007
+#define VFT2_DRV_INSTALLABLE	0x0008
+#define VFT2_DRV_SOUND		0x0009
+#define VFT2_DRV_COMM		0x000a
+#define VFT2_DRV_INPUTMETHOD	0x000b
+#define VFT2_FONT_RASTER	0x0001
+#define VFT2_FONT_VECTOR	0x0002
+#define VFT2_FONT_TRUETYPE	0x0003
+
+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
+#define VS_FFI_SIGNATURE	0xbd04effe
+#define VS_FFI_STRUCVERSION	0x00000100
+#else
+#define VS_FFI_SIGNATURE	0xfeef04bd
+#define VS_FFI_STRUCVERSION	0x00010000
+#endif
+
+#define VS_FFI_FILEFLAGSMASK	0x3f
+
+#endif /* _WAPI_VERSIONINFO_H_ */
diff --git a/mono/io-layer/wait-private.h b/mono/io-layer/wait-private.h
deleted file mode 100644
index 1f96f7c2b8e..00000000000
--- a/mono/io-layer/wait-private.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _WAPI_WAIT_PRIVATE_H_
-#define _WAPI_WAIT_PRIVATE_H_
-
-/* This is an internal, private header file */
-
-#include <config.h>
-
-#include <glib.h>
-#include <pthread.h>
-#include <semaphore.h>
-
-#include "wapi-private.h"
-#include "timed-thread.h"
-
-#include "mono-mutex.h"
-
-typedef enum {
-	WQ_NEW,
-	WQ_WAITING,
-	WQ_SIGNALLED,
-} WaitQueueState;
-
-typedef struct _WaitQueueItem 
-{
-	mono_mutex_t mutex;
-	sem_t wait_sem;
-	WaitQueueState state;
-	guint32 update, ack;
-	guint32 timeout;
-	gboolean waitall;
-	GPtrArray *handles[WAPI_HANDLE_COUNT];
-	TimedThread *thread[WAPI_HANDLE_COUNT];
-	gboolean waited[WAPI_HANDLE_COUNT];
-	guint32 waitcount[WAPI_HANDLE_COUNT];
-	/* waitindex must be kept synchronised with the handles array,
-	 * such that index n of one matches index n of the other
-	 */
-	GArray *waitindex[WAPI_HANDLE_COUNT];
-	guint32 lowest_signal;
-} WaitQueueItem;
-
-#endif /* _WAPI_WAIT_PRIVATE_H_ */
diff --git a/mono/io-layer/wait.c b/mono/io-layer/wait.c
index 36044bcec0e..695ac101cd1 100644
--- a/mono/io-layer/wait.c
+++ b/mono/io-layer/wait.c
@@ -1,366 +1,279 @@
+/*
+ * wait.c:  wait for handles to become signalled
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #include <config.h>
 #include <glib.h>
 #include <string.h>
+#include <errno.h>
 
-#include "mono/io-layer/wapi.h"
-#include "wait-private.h"
-#include "timed-thread.h"
-#include "handles-private.h"
-#include "wapi-private.h"
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
 
-#include "mono-mutex.h"
+#include <mono/io-layer/wapi.h>
+#include <mono/io-layer/handles-private.h>
+#include <mono/io-layer/wapi-private.h>
+#include <mono/io-layer/mono-mutex.h>
+#include <mono/io-layer/misc-private.h>
 
 #undef DEBUG
 
-static pthread_once_t wait_once=PTHREAD_ONCE_INIT;
-
-static GPtrArray *WaitQueue=NULL;
-
-static pthread_t wait_monitor_thread_id;
-static gboolean wait_monitor_thread_running=FALSE;
-static mono_mutex_t wait_monitor_mutex=MONO_MUTEX_INITIALIZER;
-static sem_t wait_monitor_sem;
-
-static void launch_tidy(guint32 exitcode G_GNUC_UNUSED, gpointer user)
+/**
+ * WaitForSingleObject:
+ * @handle: an object to wait for
+ * @timeout: the maximum time in milliseconds to wait for
+ *
+ * This function returns when either @handle is signalled, or @timeout
+ * ms elapses.  If @timeout is zero, the object's state is tested and
+ * the function returns immediately.  If @timeout is %INFINITE, the
+ * function waits forever.
+ *
+ * Return value: %WAIT_ABANDONED - @handle is a mutex that was not
+ * released by the owning thread when it exited.  Ownership of the
+ * mutex object is granted to the calling thread and the mutex is set
+ * to nonsignalled.  %WAIT_OBJECT_0 - The state of @handle is
+ * signalled.  %WAIT_TIMEOUT - The @timeout interval elapsed and
+ * @handle's state is still not signalled.  %WAIT_FAILED - an error
+ * occurred.
+ */
+guint32 WaitForSingleObject(gpointer handle, guint32 timeout)
 {
-	WaitQueueItem *item=(WaitQueueItem *)user;
+	guint32 ret, waited;
+	struct timespec abstime;
 	
+	if(_wapi_handle_test_capabilities (handle,
+					   WAPI_HANDLE_CAP_WAIT)==FALSE) {
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Informing monitor thread");
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": handle %p can't be waited for", handle);
 #endif
 
-	/* Update queue item */
-	mono_mutex_lock(&item->mutex);
-	item->update++;
-	mono_mutex_unlock(&item->mutex);
-	
-	/* Signal monitor */
-	sem_post(&wait_monitor_sem);
-}
-
-/* This function is called by the monitor thread to launch handle-type
- * specific threads to block in particular ways.
- *
- * The item mutex is held by the monitor thread when this function is
- * called.
- */
-static void launch_blocker_threads(WaitQueueItem *item)
-{
-	int i, ret;
+		return(WAIT_FAILED);
+	}
 	
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Launching blocker threads");
+	g_message (G_GNUC_PRETTY_FUNCTION ": locking handle %p", handle);
 #endif
 
-	for(i=0; i<WAPI_HANDLE_COUNT; i++) {
-		if(item->handles[i]->len>0) {
-			WapiHandle *handle;
+	_wapi_handle_lock_handle (handle);
 
-			handle=g_ptr_array_index(item->handles[i], 0);
-			g_assert(handle!=NULL);
-			g_assert(handle->ops->wait_multiple!=NULL);
-			
+	if(_wapi_handle_test_capabilities (handle,
+					   WAPI_HANDLE_CAP_OWN)==TRUE) {
+		if(_wapi_handle_ops_isowned (handle)==TRUE) {
 #ifdef DEBUG
-			g_message("Handle type %d active", i);
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": handle %p already owned", handle);
 #endif
-			item->waited[i]=FALSE;
-			
-			ret=_wapi_timed_thread_create(
-				&item->thread[i], NULL,
-				handle->ops->wait_multiple, launch_tidy, item,
-				item);
-			if(ret!=0) {
-				g_warning(G_GNUC_PRETTY_FUNCTION
-					  ": Thread create error: %s",
-					  strerror(ret));
-				return;
-			}
-		} else {
-			/* Pretend to have already waited for the
-			 * thread; it makes life easier for the
-			 * monitor thread.
-			 */
-			item->waited[i]=TRUE;
+			_wapi_handle_ops_own (handle);
+			ret=WAIT_OBJECT_0;
+			goto done;
 		}
 	}
-}
-
-static gboolean launch_threads_done(WaitQueueItem *item)
-{
-	int i;
 	
-	for(i=0; i<WAPI_HANDLE_COUNT; i++) {
-		if(item->waited[i]==FALSE) {
-			return(FALSE);
-		}
-	}
+	if(_wapi_handle_issignalled (handle)) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": handle %p already signalled", handle);
+#endif
 
-	return(TRUE);
-}
+		_wapi_handle_ops_own (handle);
+		ret=WAIT_OBJECT_0;
+		goto done;
+	}
 
-/* This is the main loop for the monitor thread.  It waits for a
- * signal to check the wait queue, then takes any action necessary on
- * any queue items that have indicated readiness.
- */
-static void *wait_monitor_thread(void *unused G_GNUC_UNUSED)
-{
-	guint i;
-	
-	/* Signal that the monitor thread is ready */
-	wait_monitor_thread_running=TRUE;
+	/* Have to wait for it */
+	if(timeout!=INFINITE) {
+		_wapi_calc_timeout (&abstime, timeout);
+	}
 	
-	while(TRUE) {
-		/* Use a semaphore rather than a cond so we dont miss
-		 * any signals
-		 */
-		sem_wait(&wait_monitor_sem);
-		
+	do {
+		if(timeout==INFINITE) {
+			waited=_wapi_handle_wait_signal_handle (handle);
+		} else {
+			waited=_wapi_handle_timedwait_signal_handle (handle,
+								     &abstime);
+		}
+
+		if(waited==0) {
+			/* Condition was signalled, so hopefully
+			 * handle is signalled now.  (It might not be
+			 * if someone else got in before us.)
+			 */
+			if(_wapi_handle_issignalled (handle)) {
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION
-			  ": Blocking thread doing stuff");
+				g_message (G_GNUC_PRETTY_FUNCTION
+					   ": handle %p signalled", handle);
 #endif
-		
-		/* We've been signalled, so scan the wait queue for
-		 * activity.
-		 */
-		mono_mutex_lock(&wait_monitor_mutex);
-		for(i=0; i<WaitQueue->len; i++) {
-			WaitQueueItem *item=g_ptr_array_index(WaitQueue, i);
-			
-			if(item->update > item->ack) {
-				/* Something changed */
-				mono_mutex_lock(&item->mutex);
-				item->ack=item->update;
-				
-				switch(item->state) {
-				case WQ_NEW:
-					/* Launch a new thread for each type of
-					 * handle to be waited for here.
-					 */
-					launch_blocker_threads(item);
-					
-					item->state=WQ_WAITING;
-					break;
-					
-				case WQ_WAITING:
-					/* See if we have waited for
-					 * the last blocker thread.
-					 */
-					if(launch_threads_done(item)) {
-						/* All handles have
-						 * been signalled, so
-						 * signal the waiting
-						 * thread.  Let the
-						 * waiting thread
-						 * remove this item
-						 * from the queue,
-						 * because it makes
-						 * the logic a lot
-						 * easier here.
-						 */
-						item->state=WQ_SIGNALLED;
-						sem_post(&item->wait_sem);
-					}
-					break;
-					
-				case WQ_SIGNALLED:
-					/* This shouldn't happen. Prod
-					 * the blocking thread again
-					 * just to make sure.
-					 */
-					g_warning(G_GNUC_PRETTY_FUNCTION
-						  ": Prodding blocker again");
-					sem_post(&item->wait_sem);
-					break;
-				}
-				
-				mono_mutex_unlock(&item->mutex);
+
+				_wapi_handle_ops_own (handle);
+				ret=WAIT_OBJECT_0;
+				goto done;
 			}
+		
+			/* Better luck next time */
 		}
+	} while(waited==0);
 
-		mono_mutex_unlock(&wait_monitor_mutex);
-	}
-	
-	return(NULL);
-}
-
-static void wait_init(void)
-{
-	int ret;
-	
+	/* Timeout or other error */
 #ifdef DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": Starting monitor thread");
+	g_message (G_GNUC_PRETTY_FUNCTION ": wait on handle %p error: %s",
+		   handle, strerror (ret));
 #endif
-	
-	WaitQueue=g_ptr_array_new();
-	
-	sem_init(&wait_monitor_sem, 0, 0);
-	
-	/* Launch a thread which manages the wait queue, and deals
-	 * with waiting for handles of various types.
-	 */
-	ret=pthread_create(&wait_monitor_thread_id, NULL,
-			   wait_monitor_thread, NULL);
-	if(ret!=0) {
-		g_warning(G_GNUC_PRETTY_FUNCTION
-			  ": Couldn't start handle monitor thread: %s",
-			  strerror(ret));
-	}
-	
-	/* Wait for the monitor thread to get going */
-	while(wait_monitor_thread_running==FALSE) {
-		sched_yield();
-	}
-}
 
-static WaitQueueItem *wait_item_new(guint32 timeout, gboolean waitall)
-{
-	WaitQueueItem *new;
-	int i;
-	
-	new=g_new0(WaitQueueItem, 1);
-	
-	mono_mutex_init(&new->mutex, NULL);
-	sem_init(&new->wait_sem, 0, 0);
-
-	new->update=1;		/* As soon as this item is queued it
-				 * will need attention.
-				 */
-	new->state=WQ_NEW;
-	new->timeout=timeout;
-	new->waitall=waitall;
-	new->lowest_signal=MAXIMUM_WAIT_OBJECTS;
+	ret=WAIT_TIMEOUT;
 	
-	for(i=0; i<WAPI_HANDLE_COUNT; i++) {
-		new->handles[i]=g_ptr_array_new();
-		new->waitindex[i]=g_array_new(FALSE, FALSE, sizeof(guint32));
-	}
+done:
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": unlocking handle %p", handle);
+#endif
 	
-	return(new);
+	_wapi_handle_unlock_handle (handle);
+	return(ret);
 }
 
-/* Adds our queue item to the work queue, and blocks until the monitor
- * thread thinks it's done the work.  Returns TRUE for done, FALSE for
- * timed out.  Sets lowest to the index of the first signalled handle
- * in the list.
+/**
+ * SignalObjectAndWait:
+ * @signal_handle: An object to signal
+ * @wait: An object to wait for
+ * @timeout: The maximum time in milliseconds to wait for
+ * @alertable: Specifies whether the function returnes when the system
+ * queues an I/O completion routine or an APC for the calling thread.
+ *
+ * Atomically signals @signal and waits for @wait to become signalled,
+ * or @timeout ms elapses.  If @timeout is zero, the object's state is
+ * tested and the function returns immediately.  If @timeout is
+ * %INFINITE, the function waits forever.
+ *
+ * @signal can be a semaphore, mutex or event object.
+ *
+ * If @alertable is %TRUE and the system queues an I/O completion
+ * routine or an APC for the calling thread, the function returns and
+ * the thread calls the completion routine or APC function.  If
+ * %FALSE, the function does not return, and the thread does not call
+ * the completion routine or APC function.  A completion routine is
+ * queued when the ReadFileEx() or WriteFileEx() function in which it
+ * was specified has completed.  The calling thread is the thread that
+ * initiated the read or write operation.  An APC is queued when
+ * QueueUserAPC() is called.  Currently completion routines and APC
+ * functions are not supported.
+ *
+ * Return value: %WAIT_ABANDONED - @wait is a mutex that was not
+ * released by the owning thread when it exited.  Ownershop of the
+ * mutex object is granted to the calling thread and the mutex is set
+ * to nonsignalled.  %WAIT_IO_COMPLETION - the wait was ended by one
+ * or more user-mode asynchronous procedure calls queued to the
+ * thread.  %WAIT_OBJECT_0 - The state of @wait is signalled.
+ * %WAIT_TIMEOUT - The @timeout interval elapsed and @wait's state is
+ * still not signalled.  %WAIT_FAILED - an error occurred.
  */
-static gboolean wait_for_item(WaitQueueItem *item, guint32 *lowest)
+guint32 SignalObjectAndWait(gpointer signal_handle, gpointer wait,
+			    guint32 timeout, gboolean alertable)
 {
-	gboolean ret;
-	int i;
-	
-	/* Add the wait item to the monitor queue, and signal the
-	 * monitor thread */
-	mono_mutex_lock(&wait_monitor_mutex);
-	g_ptr_array_add(WaitQueue, item);
-	sem_post(&wait_monitor_sem);
-	mono_mutex_unlock(&wait_monitor_mutex);
-	
-	/* Wait for the item to become ready */
-	sem_wait(&item->wait_sem);
+	guint32 ret, waited;
+	struct timespec abstime;
 	
-	mono_mutex_lock(&item->mutex);
+	if(_wapi_handle_test_capabilities (signal_handle,
+					   WAPI_HANDLE_CAP_SIGNAL)==FALSE) {
+		return(WAIT_FAILED);
+	}
 	
-	/* If waitall is TRUE, then the number signalled in each handle type
-	 * must be the length of the handle type array for the wait to be
-	 * successful.  Otherwise, any signalled handle is good enough
-	 */
-	if(item->waitall==TRUE) {
-		ret=TRUE;
-		for(i=0; i<WAPI_HANDLE_COUNT; i++) {
-			if(item->waitcount[i]!=item->handles[i]->len) {
-				ret=FALSE;
-				break;
-			}
-		}
-	} else {
-		ret=FALSE;
-		for(i=0; i<WAPI_HANDLE_COUNT; i++) {
-			if(item->waitcount[i]>0) {
-				ret=TRUE;
-				break;
-			}
-		}
+	if(_wapi_handle_test_capabilities (wait,
+					   WAPI_HANDLE_CAP_WAIT)==FALSE) {
+		return(WAIT_FAILED);
 	}
 
-	*lowest=item->lowest_signal;
-	
-	mono_mutex_unlock(&item->mutex);
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": locking handle %p", wait);
+#endif
 
-	return(ret);
-}
+	_wapi_handle_lock_handle (wait);
 
-static gboolean wait_dequeue_item(WaitQueueItem *item)
-{
-	gboolean ret;
-	
-	g_assert(WaitQueue!=NULL);
-	
-	mono_mutex_lock(&wait_monitor_mutex);
-	ret=g_ptr_array_remove_fast(WaitQueue, item);
-	mono_mutex_unlock(&wait_monitor_mutex);
-	
-	return(ret);
-}
+	_wapi_handle_ops_signal (signal_handle);
 
-static void wait_item_destroy(WaitQueueItem *item)
-{
-	int i;
-	
-	mono_mutex_destroy(&item->mutex);
-	sem_destroy(&item->wait_sem);
-	
-	for(i=0; i<WAPI_HANDLE_COUNT; i++) {
-		if(item->thread[i]!=NULL) {
-			g_free(item->thread[i]);
+	if(_wapi_handle_test_capabilities (wait, WAPI_HANDLE_CAP_OWN)==TRUE) {
+		if(_wapi_handle_ops_isowned (wait)==TRUE) {
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": handle %p already owned", wait);
+#endif
+			_wapi_handle_ops_own (wait);
+			ret=WAIT_OBJECT_0;
+			goto done;
 		}
-		g_ptr_array_free(item->handles[i], FALSE);
-		g_array_free(item->waitindex[i], FALSE);
 	}
-}
+	
+	if(_wapi_handle_issignalled (wait)) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": handle %p already signalled", wait);
+#endif
 
+		_wapi_handle_ops_own (wait);
+		ret=WAIT_OBJECT_0;
+		goto done;
+	}
 
-/**
- * WaitForSingleObject:
- * @handle: an object to wait for
- * @timeout: the maximum time in milliseconds to wait for
- *
- * This function returns when either @handle is signalled, or @timeout
- * ms elapses.  If @timeout is zero, the object's state is tested and
- * the function returns immediately.  If @timeout is %INFINITE, the
- * function waits forever.
- *
- * Return value: %WAIT_ABANDONED - @handle is a mutex that was not
- * released by the owning thread when it exited.  Ownership of the
- * mutex object is granted to the calling thread and the mutex is set
- * to nonsignalled.  %WAIT_OBJECT_0 - The state of @handle is
- * signalled.  %WAIT_TIMEOUT - The @timeout interval elapsed and
- * @handle's state is still not signalled.  %WAIT_FAILED - an error
- * occurred.
- */
-guint32 WaitForSingleObject(WapiHandle *handle, guint32 timeout)
-{
-	gboolean wait;
-	
-	if(handle->ops->wait==NULL) {
-		return(WAIT_FAILED);
+	/* Have to wait for it */
+	if(timeout!=INFINITE) {
+		_wapi_calc_timeout (&abstime, timeout);
 	}
+	
+	do {
+		if(timeout==INFINITE) {
+			waited=_wapi_handle_wait_signal_handle (wait);
+		} else {
+			waited=_wapi_handle_timedwait_signal_handle (wait,
+								     &abstime);
+		}
+
+		if(waited==0) {
+			/* Condition was signalled, so hopefully
+			 * handle is signalled now.  (It might not be
+			 * if someone else got in before us.)
+			 */
+			if(_wapi_handle_issignalled (wait)) {
+#ifdef DEBUG
+				g_message (G_GNUC_PRETTY_FUNCTION
+					   ": handle %p signalled", wait);
+#endif
 
-	wait=handle->ops->wait(handle, NULL, timeout);
-	if(wait==TRUE) {
-		/* Object signalled before timeout expired */
+				_wapi_handle_ops_own (wait);
+				ret=WAIT_OBJECT_0;
+				goto done;
+			}
+		
+			/* Better luck next time */
+		}
+	} while(waited==0);
+
+	/* Timeout or other error */
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Object %p signalled",
-			  handle);
+	g_message (G_GNUC_PRETTY_FUNCTION ": wait on handle %p error: %s",
+		   wait, strerror (ret));
 #endif
-		return(WAIT_OBJECT_0);
-	} else {
+
+	ret=WAIT_TIMEOUT;
+	
+done:
+
 #ifdef DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Object %p wait timed out",
-			  handle);
+	g_message (G_GNUC_PRETTY_FUNCTION ": unlocking handle %p", wait);
 #endif
-		return(WAIT_TIMEOUT);
+
+	_wapi_handle_unlock_handle (wait);
+
+	if(alertable==TRUE) {
+		/* Deal with queued APC or IO completion routines */
 	}
+	
+	return(ret);
 }
 
 /**
@@ -391,17 +304,15 @@ guint32 WaitForSingleObject(WapiHandle *handle, guint32 timeout)
  * %WAIT_TIMEOUT - The @timeout interval elapsed and no objects in
  * @handles are signalled.  %WAIT_FAILED - an error occurred.
  */
-guint32 WaitForMultipleObjects(guint32 numobjects, WapiHandle **handles,
+guint32 WaitForMultipleObjects(guint32 numobjects, gpointer *handles,
 			       gboolean waitall, guint32 timeout)
 {
-	WaitQueueItem *item;
 	GHashTable *dups;
-	gboolean duplicate=FALSE, bogustype=FALSE;
-	gboolean wait;
+	gboolean duplicate=FALSE, bogustype=FALSE, done;
+	guint32 count, lowest;
+	struct timespec abstime;
 	guint i;
-	guint32 lowest;
-	
-	pthread_once(&wait_once, wait_init);
+	guint32 ret;
 	
 	if(numobjects>MAXIMUM_WAIT_OBJECTS) {
 #ifdef DEBUG
@@ -426,11 +337,11 @@ guint32 WaitForMultipleObjects(guint32 numobjects, WapiHandle **handles,
 			break;
 		}
 
-		if(handles[i]->ops->wait_multiple==NULL) {
+		if(_wapi_handle_test_capabilities (handles[i], WAPI_HANDLE_CAP_WAIT)==FALSE) {
 #ifdef DEBUG
-			g_message(G_GNUC_PRETTY_FUNCTION
-				  ": Handle %p can't be waited for (type %d)",
-				  handles[i], handles[i]->type);
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": Handle %p can't be waited for",
+				   handles[i]);
 #endif
 
 			bogustype=TRUE;
@@ -457,23 +368,96 @@ guint32 WaitForMultipleObjects(guint32 numobjects, WapiHandle **handles,
 
 		return(WAIT_FAILED);
 	}
-	
-	item=wait_item_new(timeout, waitall);
 
-	/* Sort the handles by type */
-	for(i=0; i<numobjects; i++) {
-		g_ptr_array_add(item->handles[handles[i]->type], handles[i]);
-		g_array_append_val(item->waitindex[handles[i]->type], i);
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": locking handles");
+#endif
+
+	done=_wapi_handle_count_signalled_handles (numobjects, handles,
+						   waitall, &count, &lowest);
+	if(done==TRUE) {
+		for(i=0; i<numobjects; i++) {
+			_wapi_handle_ops_own (handles[i]);
+		}
+		
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unlocking handles");
+#endif
+
+		_wapi_handle_unlock_handles (numobjects, handles);
+		return(WAIT_OBJECT_0+lowest);
 	}
 	
-	wait=wait_for_item(item, &lowest);
-	wait_dequeue_item(item);
-	wait_item_destroy(item);
+	/* Have to wait for some or all handles to become signalled
+	 */
 
-	if(wait==FALSE) {
-		/* Wait timed out */
-		return(WAIT_TIMEOUT);
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": unlocking handles");
+#endif
+
+	_wapi_handle_unlock_handles (numobjects, handles);
+
+	if(timeout!=INFINITE) {
+		_wapi_calc_timeout (&abstime, timeout);
 	}
 
-	return(WAIT_OBJECT_0+lowest);
+	while(1) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": locking signal mutex");
+#endif
+
+		_wapi_handle_lock_signal_mutex ();
+
+		if(timeout==INFINITE) {
+			ret=_wapi_handle_wait_signal ();
+		} else {
+			ret=_wapi_handle_timedwait_signal (&abstime);
+		}
+
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": unlocking signal mutex");
+#endif
+
+		_wapi_handle_unlock_signal_mutex ();
+		
+		if(ret==0) {
+			/* Something was signalled ... */
+			done=_wapi_handle_count_signalled_handles (numobjects,
+								   handles,
+								   waitall,
+								   &count,
+								   &lowest);
+			if(done==TRUE) {
+				for(i=0; i<numobjects; i++) {
+					_wapi_handle_ops_own (handles[i]);
+				}
+
+#ifdef DEBUG
+				g_message (G_GNUC_PRETTY_FUNCTION ": unlocking handles");
+#endif
+
+				_wapi_handle_unlock_handles (numobjects,
+							     handles);
+
+				return(WAIT_OBJECT_0+lowest);
+			}
+
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": unlocking handles");
+#endif
+
+			_wapi_handle_unlock_handles (numobjects, handles);
+		} else {
+			/* Timeout or other error */
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION ": wait returned error: %s", strerror (ret));
+#endif
+
+			if(ret==ETIMEDOUT) {
+				return(WAIT_TIMEOUT);
+			} else {
+				return(WAIT_FAILED);
+			}
+		}
+	}
 }
diff --git a/mono/io-layer/wait.h b/mono/io-layer/wait.h
index b0218bd93cb..5c0111c758e 100644
--- a/mono/io-layer/wait.h
+++ b/mono/io-layer/wait.h
@@ -1,3 +1,12 @@
+/*
+ * wait.h:  wait for handles to become signalled
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_WAIT_H_
 #define _WAPI_WAIT_H_
 
@@ -16,7 +25,10 @@
 #define WAIT_TIMEOUT		STATUS_TIMEOUT
 #define WAIT_IO_COMPLETION	STATUS_USER_APC
 
-extern guint32 WaitForSingleObject(WapiHandle *handle, guint32 timeout);
-extern guint32 WaitForMultipleObjects(guint32 numobjects, WapiHandle **handles, gboolean waitall, guint32 timeout);
+extern guint32 WaitForSingleObject(gpointer handle, guint32 timeout);
+extern guint32 SignalObjectAndWait(gpointer signal_handle, gpointer wait,
+				   guint32 timeout, gboolean alertable);
+extern guint32 WaitForMultipleObjects(guint32 numobjects, gpointer *handles,
+				      gboolean waitall, guint32 timeout);
 
 #endif /* _WAPI_WAIT_H_ */
diff --git a/mono/io-layer/wapi-private.h b/mono/io-layer/wapi-private.h
index b0b19cae9ce..525b8a3a625 100644
--- a/mono/io-layer/wapi-private.h
+++ b/mono/io-layer/wapi-private.h
@@ -1,12 +1,31 @@
+/*
+ * wapi-private.h:  internal definitions of handles and shared memory layout
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_PRIVATE_H_
 #define _WAPI_PRIVATE_H_
 
 #include <config.h>
 #include <glib.h>
 
-#include "mono/io-layer/handles.h"
+#include <mono/io-layer/handles.h>
+#include <mono/io-layer/io.h>
+#include <mono/io-layer/daemon-private.h>
+
+/* Increment this whenever an incompatible change is made to the
+ * shared handle structure.
+ *
+ * If this ever reaches 255, we have problems :-(
+ */
+#define _WAPI_HANDLE_VERSION 6
 
 typedef enum {
+	WAPI_HANDLE_UNUSED=0,
 	WAPI_HANDLE_FILE,
 	WAPI_HANDLE_CONSOLE,
 	WAPI_HANDLE_THREAD,
@@ -14,61 +33,112 @@ typedef enum {
 	WAPI_HANDLE_MUTEX,
 	WAPI_HANDLE_EVENT,
 	WAPI_HANDLE_SOCKET,
+	WAPI_HANDLE_FIND,
+	WAPI_HANDLE_PROCESS,
+	WAPI_HANDLE_PIPE,
 	WAPI_HANDLE_COUNT,
 } WapiHandleType;
 
+typedef enum {
+	WAPI_HANDLE_CAP_WAIT=0x01,
+	WAPI_HANDLE_CAP_SIGNAL=0x02,
+	WAPI_HANDLE_CAP_OWN=0x04,
+} WapiHandleCapability;
+
 struct _WapiHandleOps 
 {
-	/* All handle types */
-	void (*close)(WapiHandle *handle);
+	void (*close_shared)(gpointer handle);
+	void (*close_private)(gpointer handle);
 
-	/* File, console and pipe handles */
-	WapiFileType (*getfiletype)(void);
-	
-	/* File and console handles */
-	gboolean (*readfile)(WapiHandle *handle, gpointer buffer,
-			     guint32 numbytes, guint32 *bytesread,
-			     WapiOverlapped *overlapped);
-	gboolean (*writefile)(WapiHandle *handle, gconstpointer buffer,
-			      guint32 numbytes, guint32 *byteswritten,
-			      WapiOverlapped *overlapped);
-	
-	/* File handles */
-	guint32 (*seek)(WapiHandle *handle, gint32 movedistance,
-			gint32 *highmovedistance, WapiSeekMethod method);
-	gboolean (*setendoffile)(WapiHandle *handle);
-	guint32 (*getfilesize)(WapiHandle *handle, guint32 *highsize);
-	gboolean (*getfiletime)(WapiHandle *handle, WapiFileTime *create_time,
-				WapiFileTime *last_access,
-				WapiFileTime *last_write);
-	gboolean (*setfiletime)(WapiHandle *handle,
-				const WapiFileTime *create_time,
-				const WapiFileTime *last_access,
-				const WapiFileTime *last_write);
-	
-	/* WaitForSingleObject */
-	gboolean (*wait)(WapiHandle *handle, WapiHandle *signal, guint32 ms);
+	/* SignalObjectAndWait */
+	void (*signal)(gpointer signal);
 
-	/* WaitForMultipleObjects */
-	guint32 (*wait_multiple)(gpointer data);
+	/* Called by WaitForSingleObject and WaitForMultipleObjects,
+	 * with the handle locked
+	 */
+	void (*own_handle)(gpointer handle);
 
-	/* SignalObjectAndWait */
-	void (*signal)(WapiHandle *signal);
+	/* Called by WaitForSingleObject and WaitForMultipleObjects, if the
+	 * handle in question is "ownable" (ie mutexes), to see if the current
+	 * thread already owns this handle
+	 */
+	gboolean (*is_owned)(gpointer handle);
 };
 
-struct _WapiHandle
+#include <mono/io-layer/event-private.h>
+#include <mono/io-layer/io-private.h>
+#include <mono/io-layer/mutex-private.h>
+#include <mono/io-layer/semaphore-private.h>
+#include <mono/io-layer/socket-private.h>
+#include <mono/io-layer/thread-private.h>
+#include <mono/io-layer/process-private.h>
+
+struct _WapiHandleShared
 {
 	WapiHandleType type;
 	guint ref;
 	gboolean signalled;
-	struct _WapiHandleOps *ops;
+	mono_mutex_t signal_mutex;
+	pthread_cond_t signal_cond;
+	
+	union 
+	{
+		struct _WapiHandle_event event;
+		struct _WapiHandle_file file;
+		struct _WapiHandle_find find;
+		struct _WapiHandle_mutex mutex;
+		struct _WapiHandle_sem sem;
+		struct _WapiHandle_socket sock;
+		struct _WapiHandle_thread thread;
+		struct _WapiHandle_process process;
+	} u;
+};
+
+#define _WAPI_MAX_HANDLES 4096
+#define _WAPI_HANDLE_INVALID (gpointer)-1
+
+/*
+ * This is the layout of the shared memory segment
+ */
+struct _WapiHandleShared_list
+{
+	guchar daemon[MONO_SIZEOF_SUNPATH];
+	_wapi_daemon_status daemon_running;
+	
+#ifdef _POSIX_THREAD_PROCESS_SHARED
+	mono_mutex_t signal_mutex;
+	pthread_cond_t signal_cond;
+#endif
+	struct _WapiHandleShared handles[_WAPI_MAX_HANDLES];
+	guchar scratch_base[0];
+};
+
+struct _WapiHandlePrivate
+{
+	union 
+	{
+		struct _WapiHandlePrivate_event event;
+		struct _WapiHandlePrivate_file file;
+		struct _WapiHandlePrivate_find find;
+		struct _WapiHandlePrivate_mutex mutex;
+		struct _WapiHandlePrivate_sem sem;
+		struct _WapiHandlePrivate_socket sock;
+		struct _WapiHandlePrivate_thread thread;
+		struct _WapiHandlePrivate_process process;
+	} u;
+};
+
+/* Per-process handle info. For lookup convenience, each index matches
+ * the corresponding shared data.
+ */
+struct _WapiHandlePrivate_list
+{
+#ifndef _POSIX_THREAD_PROCESS_SHARED
+	mono_mutex_t signal_mutex;
+	pthread_cond_t signal_cond;
+#endif
+	struct _WapiHandlePrivate handles[_WAPI_MAX_HANDLES];
 };
 
-#define _WAPI_HANDLE_INIT(_handle, _type, _ops)	G_STMT_START {\
-		_handle->type=_type;\
-		_handle->ref=1;\
-		_handle->signalled=FALSE;\
-		_handle->ops=&_ops;\
-	} G_STMT_END;
 
 #endif /* _WAPI_PRIVATE_H_ */
diff --git a/mono/io-layer/wapi.h b/mono/io-layer/wapi.h
index 9b87ed4a1d1..2b29e55aae4 100644
--- a/mono/io-layer/wapi.h
+++ b/mono/io-layer/wapi.h
@@ -1,17 +1,34 @@
+/*
+ * wapi.h:  Public include files
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
 #ifndef _WAPI_WAPI_H_
 #define _WAPI_WAPI_H_
 
+#include <mono/io-layer/types.h>
 #include <mono/io-layer/macros.h>
 #include <mono/io-layer/handles.h>
 #include <mono/io-layer/io.h>
+#include <mono/io-layer/access.h>
+#include <mono/io-layer/atomic.h>
+#include <mono/io-layer/context.h>
 #include <mono/io-layer/critical-sections.h>
 #include <mono/io-layer/error.h>
 #include <mono/io-layer/events.h>
 #include <mono/io-layer/mutexes.h>
+#include <mono/io-layer/processes.h>
 #include <mono/io-layer/semaphores.h>
 #include <mono/io-layer/sockets.h>
 #include <mono/io-layer/status.h>
+#include <mono/io-layer/system.h>
 #include <mono/io-layer/threads.h>
+#include <mono/io-layer/timefuncs.h>
+#include <mono/io-layer/versioninfo.h>
 #include <mono/io-layer/wait.h>
 
 #endif /* _WAPI_WAPI_H_ */
diff --git a/mono/jit/.cvsignore b/mono/jit/.cvsignore
index e4bc8205049..fa6b0f4f57f 100644
--- a/mono/jit/.cvsignore
+++ b/mono/jit/.cvsignore
@@ -1,6 +1,9 @@
 Makefile
 Makefile.in
 *.o
+*.exe
+*.lo
+*.la
 .libs
 .deps
 testjit
diff --git a/mono/jit/ChangeLog b/mono/jit/ChangeLog
index ec5e29d5145..75c797fe67e 100644
--- a/mono/jit/ChangeLog
+++ b/mono/jit/ChangeLog
@@ -1,3 +1,1315 @@
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* jit.c (match_debug_method): Don't include runtime invoke methods
+	in the search.
+
+	* mono.c (main): Accept `Main' as argument to --break to insert a
+	breakpoint on the application's main method.
+
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* debug-dwarf2.c (dwarf2_write_class_field): Don't include any static fields.
+	
+2002-08-21  Dietmar Maurer  <dietmar@ximian.com>
+
+	* exception.c (arch_handle_exception): don't set stack_trace to
+	null (so that it contains the full trace even when we rethrow the
+	exception).
+
+2002-08-19  Nick Drochak <ndrochak@gol.com>
+
+	* x86.brg (mono_llmult_ovf): Simplified the code greatly by refactoring
+	the algebraic form we are using.  This also eliminated a silly overflow
+	of the intermediate result that was causing troubles.
+
+2002-08-16  Nick Drochak <ndrochak@gol.com>
+
+	* x86.brg (mono_llmult_ovf): Flip ALL the bits, dummy. Now negative numbers
+	work.
+
+2002-08-15  Nick Drochak <ndrochak@gol.com>
+
+	* x86.brg (mono_llmult_ovf): Fix so it throws an overflow when result
+	will not fit in 64 bits.  Fixes bug #27375.
+
+Wed Aug 14 17:31:37 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* exception.c: updates for API changes in metadata/.
+
+2002-08-13  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_jit_init): use  ((gpointer)-1) as end_of_stack
+	address for the main thread.
+
+2002-08-12  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_analyze_stack): added support for Thread::Abort ()
+
+2002-08-08  Dietmar Maurer  <dietmar@ximian.com>
+
+	* exception.c (arch_handle_exception): simply return and let the
+	libpthread/kernel restore the context. This should work on recent
+	versions of linuxthreads.
+
+	* jit.c (mono_runtime_install_handlers): switch back to use
+	sigaction from libpthreads. As long as this does not make problems
+	we should use this instead of syscall.
+
+2002-08-07  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c: removed the createdelegate icall
+	(mono_analyze_stack): special case Array::Address()
+
+2002-08-06  Dietmar Maurer  <dietmar@ximian.com>
+
+	* emit-x86.c (arch_emit_prologue): make the call to
+	mono_get_lmf_addr relocatable.
+	(arch_jit_compile_cfg): do not waste memory
+	(arch_jit_compile_cfg): use a mempool to store native code. This
+	improves locality of code.
+
+2002-08-01  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_analyze_stack): impl. CEE_MONO_RETOBJ
+
+2002-07-30  Sergey Chaban <serge@wildwestsoftware.com>
+
+	* x86.brg (LOCALLOC): under Windows, if allocation size is bigger
+	than one page, it's necessary to allocate memory incrementally,
+	in page-size steps, performing stack-touch every time.
+	Also added LOCALLOC(CONST_I4) implementation.
+
+2002-07-27  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_get_runtime_method): code cleanup
+
+	* x86.brg: we do not need to save EAX/ECX/EDX in stmt:
+
+2002-07-24  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_analyze_stack): added CEE_TAIL (but it is ignored)
+
+Wed Jul 24 13:02:50 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* jit.c, jit.h, exception.c: implemented stack walking function.
+
+2002-07-24  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg (ARG_OBJ): removed zero sized object warning 
+
+2002-07-23  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_allocate_excvar): mark excvar as volatile
+
+	* emit-x86.c (enter_method): use arch_get_argument_info to get
+	stack layout.
+
+	* jit.c (mono_analyze_stack): use arch_get_argument_info to get
+	stack layout.
+	(mono_analyze_stack): removed unused code
+
+	* emit-x86.c (arch_allocate_arg): impl.
+
+2002-07-22  Dietmar Maurer  <dietmar@ximian.com>
+
+	* emit-x86.c (arch_allocate_var): fix alignment bug
+
+	* x86.brg (X86_CALL_BEGIN): add argument padding before emitting a call
+
+	* jit.c (mono_analyze_stack): s/k/k + 1/
+
+	* x86.brg (LOCALLOC): align to MONO_FRAME_ALIGNMENT
+
+	* emit-x86.c (arch_get_argument_info): impl.
+
+2002-07-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* exception.c (arch_handle_exception): Memory leak fix.
+
+2002-07-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_analyze_stack): avoid recursive inlining
+
+Fri Jul 19 18:45:11 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* emit-x86.c: temporary workaround for gcc bug.
+	* jit.h, jit.c, mono.c: move mono_jit_image to jit.c.
+	Don't include config.h in headers.
+
+2002-07-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: correctly align valuetype arguments on the stack
+
+	* jit.c (mono_analyze_stack): do not compute frame size here.
+
+	* x86.brg: use macros to avoid code duplication for CALL opcodes,
+	compute frame size in x86.brg
+
+2002-07-18  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg (ARG_OBJ): allow zero sized ARG_OBJ
+
+	* exception.c (arch_handle_exception): removed duplicated code,
+	added support for exception filters
+
+	* jit.c (mono_jit_compile_method): support exception filters
+
+2002-07-17  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_analyze_stack CEE_DIV): added fix from Zoltan Varga
+	(bug #27423)
+	* jit.c: s/ISSTRUCT/MONO_TYPE_ISSTRUCT/ 
+
+	* helpers.c (mono_map_ldind_type): added suggested changes from
+	Zoltan Varga (support MONO_TYPE_U), variou 64bit fixes
+
+	* jit.c (mono_analyze_stack): remove the vtype pointer from the
+	stack (fix bug #27420)
+
+2002-07-16  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg (CALL_VOID): fix bug #27751
+	(CONV_R_UN) use reg2 instead of reg1 for the negative check /fix bug 27849.
+
+	* jit.c (mono_analyze_stack): adjust valuetype size for pinvoke calls
+
+i2002-07-11  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg (freg): new rule freg: CALL_R8 (this, reg)
+
+2002-07-10  Dietmar Maurer  <dietmar@ximian.com>
+
+	* emit-x86.c (arch_emit_prologue): added code to save LMF
+
+2002-07-04  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg (LOCALLOC): added fix from Zoltan Varga (for bug #27396) 
+
+2002-07-05  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_add_method): Fix a bug in the `begin_scope' and
+	`end_scope' calculations when linear scan register allocation is disabled.
+
+2002-07-02  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* mono.c: removed the "RESULT: X" message.
+
+2002-07-01  Dietmar Maurer <dietmar@ximian.com>
+
+	* exception.c (arch_get_call_finally): restore caller saved
+	register used by global reg. allocation when calling finally
+	handlers (fixes bug #24943).
+
+2002-07-01  Dick Porter  <dick@ximian.com>
+
+	* jit.c (mono_jit_exec): Removed unneeded argument to
+	mono_runtime_run_main()
+
+2002-06-28  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (debug_generate_method_lines, mono_debug_add_method): Make methods
+	start on the nop instruction to make single-stepping into an already-JITed
+	method work.
+
+2002-06-26  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_source_location_from_address): Added
+	`guint32 *line_number' argument.  If it's not NULL, store the line number
+	there and return the file name without the line number.
+
+	* exception.c (ves_icall_get_trace): Fill in `sf->filename' and `sf->line'.
+	(ves_icall_get_frame_info): Likewise.
+
+2002-06-25  Dick Porter  <dick@ximian.com>
+
+	* jit.c (mono_jit_exec): Pass the assembly to mono_runtime_run_main
+
+2002-06-22  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_source_location_from_address): Small fix, an
+	unsigned number can never be smaller than zero, make that check
+	actually work.
+
+2002-06-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* exception.c (ves_icall_get_trace): new method to get the stack
+	trace from a Exception.
+
+2002-06-18  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (check_inlining): do not inline functions containing 
+	calls to stack query functions
+
+	* exception.c (ves_icall_get_frame_info): impl.
+
+Tue Jun 18 10:21:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* invoke.c: marshal simple arrays correctly.
+
+2002-06-17  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: added inlined versions of Math.Sin, Math.Cos, Math.Sqrt
+
+	* jit.c (mono_analyze_stack): impl. STARG
+	(mono_analyze_stack): impl. LDARGA
+
+	* exception.c (arch_handle_exception): correctly restore register
+	values when unwinding the stack (fixes bug 25698)
+
+2002-06-09  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_open_image): For MONO_DEBUG_FORMAT_DWARF2_PLUS,
+	the `%s-debug.s' file is in the same directory than its assembly.
+
+Sat Jun 1 13:24:01 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* message.c, emit-x86.c: kill warnings.
+
+2002-05-31  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: buf fix in REMOTE_STIND_OBJ
+	(mono_ldvirtftn): impl.
+	(mono_ldintftn): impl.
+	(mono_ldftn): impl.
+
+Fri May 31 13:26:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* mono.c: added --config command line option.
+
+Fri May 31 12:34:52 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* jit.c, jit.h: collect statistics about the number of basic blocks.
+
+2002-05-31  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_address_from_il_offset): New public function.
+	(mono_debug_add_method): Improved local variable info: correctly handle
+	variables in registers and their start/end scopes.
+
+2002-05-30  Martin Baulig  <martin@gnome.org>
+
+	* debug-dwarf2.c (dwarf2_write_string): Use "0x%lx" as fprintf() format,
+	not "%p" which seems to be broken on Windows/mingw32.
+
+2002-05-30  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg (reg): bug fix in LOCALLOC
+
+	* mono.c (main): new switch --nointrinsic to disable memcpy opt.
+
+	* x86.brg: added block copy/init optimizations from 
+	Serge (serge@wildwestsoftware.com)
+ 
+Thu May 30 14:13:12 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* invoke.cs: lookup P/Invoke method address only when needed.
+
+2002-05-29  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: bug fix in REMOTE_STIND_OBJ
+
+	* invoke.c (arch_create_native_wrapper): handle pointers to value types
+
+	* helpers.h: use mono_ prefix for all functions
+
+	* jit.c (mono_analyze_stack): fixed SIZEOF
+
+	* x86.brg: impl. LOCALLOC, INITBLK
+
+2002-05-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: impl. CKFINITE 
+
+	* jit.c (mono_analyze_stack): impl. CEE_CALLI
+
+	* x86.brg (JMP): impl. JMP opcode
+
+2002-05-27  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_cfg_new): reserve additional space to store ESP when
+	calling finally handlers.
+
+	* exception.c (arch_get_call_finally): save ESP before calling
+	finally handler.
+
+	* helpers.c (map_arg_type): move some generic helper function into
+	this file.
+
+	* mono.c (usage): new option --breakonex 
+
+	* exception.c (arch_exc_is_caught): only return FALSE if really
+	unhandled.
+
+	* jit.c (mono_thread_abort): free jit_tls
+
+2002-05-24  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg (stmt): use memmove to cope with overlapping
+	blocks. This is not required by the specs, so we can remove it
+	later if it turns out to be too slow (and use memcpy).
+
+	* jit.c (mono_analyze_stack): moved const. folding from x86.brg
+
+	* x86.brg: CPBLK impl.
+
+	* emit-x86.c (tree_emit): modified to support 3 nonterminals per
+	rule (used for CPBLK).
+
+Thu May 23 18:43:07 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* mono.c: remove generated code from hash when benchmarking/testing
+	method compilation.
+	* invoke.cs: special case string ctors.
+
+2002-05-23  Dietmar Maurer  <dietmar@ximian.com>
+
+	* *.c: code cleanups - tried to separate architecture dependent things. 
+
+2002-05-23  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_open): Don't call mono_debug_add_image().
+	(mono_debug_write_symbols): Only recreate the symbol file if
+	necessary.
+
+	* debug-private.h (MonoDebugHandle): Added `dirty' flag.
+
+	* mono.c (main): Call mono_debug_add_image() here.
+
+	* jit.c (mono_thread_abort): If we have debugging support, call
+	mono_debug_make_symbols() and G_BREAKPOINT().
+
+	* exception.c (arch_handle_exception): Don't G_BREAKPOINT() if we get
+	an unhandled exception.
+
+2002-05-23  Dietmar Maurer  <dietmar@ximian.com>
+
+	* delegate.c: move the thread pool to metadata/threadpool.c, code
+	cleanup.
+
+2002-05-22  Dietmar Maurer  <dietmar@ximian.com>
+
+	* exception.c (arch_exc_is_catched): impl. MS like exception
+	handling (added a check for unhandled exceptions)
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* debug-dwarf2-plus.c (mono_debug_open_assembly_dwarf2_plus): Only run
+	the assembler if necessary, ie. the assembler file is newer than the
+	symbol file or the symbol file does not exist.
+
+	* debug.c: Added "update_on_exit" argument to recreate the symbol file
+	when the JIT exists.
+
+	* debug-dwarf2.c: Produce assembler code which is free of comments and
+	extra whitespaces so that it's suitable for `as -f'.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* debug-dwarf2.c (dwarf2_write_section_end): Removed.  This is not needed
+	and not supported by all assemblers.
+	(dwarf2_write_2byte): Use ".word" instead of ".2byte" since ".2byte" is a
+	GNU extension.
+
+	* mono.c (--debug): Small fix in the argument parsing.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* debug.c: Added "dont_assemble" and "dont_precompile" argument for dwarf-plus.
+
+	* mono.c: Applied patch from Miguel:
+	(--debug): This is now a `--debug=[FORMAT]' argument where FORMAT defaults
+	to dwarf-plus.
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_source_location_from_address): Added support for the
+	dwarf2-plus format.
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_source_location_from_address): New function.
+	(mono_debug_il_offset_from_address): New function.
+
+	* exception.c (arch_handle_exception): If we have debugging support, include
+	information about the source location and IL offset in the stack trace.
+
+2002-05-21  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_analyze_stack): LDARG uses 16bit argument (fix bug
+	#25058)  
+
+	* x86.brg (stmt): removed unnecessary assertion
+
+	* jit.c (check_inlining):  we cant inline throw instructions
+	(because it breaks some basic block requirements)
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	* debug-private.h (MonoDebugFlags): New enum typedef.
+
+	* debug.c (mono_debug_open): Added a few useful arguments.  See the manpage
+	for details.
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_open_file): Renamed to mono_debug_open(), now takes
+	a `MonoAssembly *' argument instead of a `char *filename' one.  Also added
+	`const char **args' argument.
+
+	* mono.c (mono_jit_assembly): Renamed to mono_jit_compile_image(), added
+	`int verbose' argument and made it public.
+	(mono_jit_compile_class): New public function,  moved the code to compile
+	all methods in a class here from main().
+	(--compile): The argument can now also be an image (in `@imagename' format).
+	Updated documentation for this command line argument.
+	(--precompile): New command line argument to precompile an image/class/method
+	before executing the main app.  This argument can be given multiple times.
+	(--break): Renamed the "--debug" command line argument to "--break".
+	(--debug): New command line argument to specify the debugging format.
+	(--stabs, --dwarf, --dwarf-plus): Removed, obsoleted by "--debug".
+	(--debug-args): New command line argument.  This is a comma-separated list of
+	additional arguments for the symbol writer.
+	(usage): Beautified the help text a bit.
+
+	* debug-dwarf2-plus.c (mono_debug_open_assembly_dwarf2_plus): Use the new
+	public mono_jit_compile_image() function rather than duplication this
+	functionality here.
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	* debug-dwarf2-plus.c: This is now working again :-)
+
+	* debug.c (mono_debug_open_file): When using MONO_DEBUG_FORMAT_DWARF2_PLUS,
+	we create two MonoDebugHandles: one for MONO_DEBUG_FORMAT_DWARF2_PLUS and
+	one for the fallback MONO_DEBUG_FORMAT_DWARF2.
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	* jit.c (mono_debug_handle): Removed this global variable.
+
+	* debug.c (mono_debug_close): Removed.
+	(mono_debug_cleanup): New global function.
+	(mono_debug_add_image): New global function.
+	(mono_debug_handle_from_class): New global function.
+	(mono_debug_write_symbols): New global function.
+	(mono_debug_add_type): Removed `MonoDebugHandle *' argument.
+	(mono_debug_add_method): Likewise.
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	Work around a hard-to-fix bug in GDB and create a single dwarf/stabs
+	file for all assemblies.  Currently, the JIT doesn't put all methods
+	from a single assembly into a continuous region of memory.  We were
+	previously creating valid DWARF 2 files for this, but unfortunately
+	GDB's symbol tables get messed up when it reads more than one such file.
+
+	* debug-private.h (AssemblyDebugInfo): Moved `f', `producer_name',
+	`next_idx', `methods', `type_hash', `source_files' and `format'
+	into the MonoDebugHandle.
+
+	* debug.c (mono_debug_get_type): This now operates on the MonoDebugHandle,
+	not on the AssemblyDebugInfo.
+	(mono_debug_open_file): Moved some stuff here from mono_debug_open_assembly().
+
+	* debug-dwarf2.c (mono_debug_write_assembly_dwarf2): Renamed into
+	mono_debug_write_dwarf2().
+	(mono_debug_open_assembly_dwarf2): Removed.
+	(mono_debug_close_assembly_dwarf2): Removed.
+
+	* debug-stabs.c (mono_debug_write_assembly_stabs): Renamed into
+	mono_debug_write_stabs().
+	(mono_debug_open_assembly_stabs): Removed.
+	(mono_debug_close_assembly_stabs).
+
+	* debug-dwarf2-plus.c: This is currently broken. :-(
+
+2002-05-20  Martin Baulig  <martin@gnome.org>
+
+	* debug.h (mono_debug_format): New global variable.
+	(MonoDebugFormat): Added MONO_DEBUG_FORMAT_NONE.
+
+	* debug-private.h (MonoDebugHandle): Added `objfiles' field which is
+	a whitespace separated list of symbol files.
+	(AssemblyDebugInfo): Added `objfile' filed which is the name of the
+	symbol file.
+
+	* mono.c (main): Pass the assembly file name to mono_debug_open_file().
+
+	* debug.c (mono_debug_make_symbols): Link all symbol files into a big
+	`<assemblyname>.o' symbol file.
+
+2002-05-20  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (debug_load_method_lines): Check whether the assembly file
+	is newer than the IL file and recreate the IL file if necessary.
+
+2002-05-20  Miguel de Icaza  <miguel@ximian.com>
+
+	* mono.c Updated copyright years. 
+
+2002-05-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* mono.c (usage): Relayout command line options.
+
+2002-05-17  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg (reg): fixed array bound check
+
+	* emit-x86.c (enter_method): print method signature
+
+	* exception.c (arch_handle_exception): set trace info before we
+	call handlers.
+
+2002-05-16  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_find_final_block): make it work with mcs
+
+	* x86.brg: buf fix. if exception variable is allocated to a register. 
+
+	* jit.c (mono_find_final_block): bug fix.
+
+2002-05-15  Dietmar Maurer  <dietmar@ximian.com>
+
+	* delegate.c (arch_end_invoke): fix bug #24653, simplified the
+	code using new runtime_invoke feature.
+
+	* jit.c (mono_analyze_flow): try blocks are followed by handler
+	blocks, so we need to add all handler blocks as succesors.
+	(mono_thread_start_cb): set end_of_stack
+
+	* exception.c (arch_handle_exception): correctly save/restore caller
+	saved regs.
+
+	* emit-x86.c (arch_emit_prologue): correctly save/restore caller
+	saved regs.
+
+	* jit.c (mono_cfg_new): allocate space for caller saved registers.
+
+2002-05-14  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c: only use one TLS slot to store jit data
+
+	* exception.c (arch_handle_exception): print function signature,
+	use thread relative end_of_stack
+
+2002-05-13  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (OPT_BOOL): new. opt. for boolean variables - we simply
+	store them as 32 bit integers.
+	(mono_analyze_stack): we need to generate a temporary var for
+	SHL/SHR because the tree allocator can fail otherwise 
+
+	* exception.c (arch_handle_exception): EIP now points to the call
+	instruction, not to the instruction after the call. This fixes the
+	bug reported by Linus Upson (tests/exception8.cs)
+
+2002-05-11  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_analyze_flow): always allocate the forest array
+	(mono_stack_duplicate_used_var): impl.
+	(mono_copy_used_var): impl.
+
+	* x86.brg: bug fix in SHR/SHL
+
+	* emit-x86.c (arch_emit_prologue): check if live_in_set != NULL
+
+2002-05-11  Sergey Chaban <serge@wildwestsoftware.com>
+
+	* mono.c: new --fast-iconv command line option
+	to enable fast FP-to-integer conversion code.
+	* jit.c, jit.h: added global variable to store state
+	for the above option. This optimization is disabled
+	by default.
+	* x86.brg: added code to emit fast FP-to-integer
+	conversion sequences.
+
+2002-05-10  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* emit-x86.c: simple definite assignment analysis optimization for
+	uninitialized locals.
+
+Fri May 10 15:43:53 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* x86.brg, emit-x86.c: patch the branch targets with x86_patch().
+
+2002-05-10  Dietmar Maurer  <dietmar@ximian.com>
+
+	* linear-scan.c (mono_update_gen_set): improvement/bug fix
+
+	* x86.brg: added additional rules to handle global allocated registers
+
+	* mono.c (usage): the option is called --nols, and it dissables
+	linear scan.
+
+	* x86.brg: better LDIND_R4, LDIND_R8, STIND_R4, STIND_R8
+
+2002-05-09  Dietmar Maurer  <dietmar@ximian.com>
+
+	* linear-scan.c: linear scan reg. allocation and data flow analysis
+	use Paolo's great bitset implementation.
+
+	* jit.c (arch_allocate_var): add live range info
+	(mono_cfg_add_successor): create list of successors for basic
+	blocks.
+
+	* mono.c (main): new option --ls to enable linear scan
+
+	* exception.c (arch_handle_exception): print instruction pointer
+	relative to method start address.
+
+	* jit.c (mono_print_ctree): print register number if locals are
+	allocate in registers.
+
+	* emit-x86.c (arch_emit_prologue): initialize reg. allocated locals
+	(arch_emit_epilogue): take care when restoring save registers,
+	because the stack pointer may has changed.
+
+	* x86.brg: s/VAROFFSET/VARINFO/
+	modified to support global register allocation
+
+Mon May 6 15:38:15 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* jit.h, jit.c, emit-x86.c: x86 cpu detection code from Sergey.
+
+2002-05-03  Sergey Chaban <serge@wildwestsoftware.com>
+
+	* x86.brg: more coni4 optimizations
+	MUL: generate optimized code for some consts other
+	than powers of 2 (hardcoded impl. for 3, 5, 10 etc.);
+	DIV_UN: multiply with reciprocal instead of dividing;
+
+2002-05-03  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: use VAROFFSET macro
+
+	* emit-x86.c (tree_emit): allocate space for spilled regs in
+	activation frame instead of pushing them to the stack.
+
+	* x86.brg: replace BXX with CBRANCH/COMPARE
+	replaced CXX CSET/COMPARE
+
+	* emit-x86.c (arch_allocate_regs): improved register allocation
+
+2002-05-02  Dietmar Maurer  <dietmar@ximian.com>
+
+	* delegate.c (mono_delegate_cleanup): signal semaphore in order to
+	exit threads.
+
+2002-04-30  Dick Porter  <dick@ximian.com>
+
+	* mono.c (main): Tell glib to not abort when g_log() etc print
+	recursively
+
+2002-04-30  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: opt. LDELEMA impl.
+	(MUL) use shift when possible.
+	(DIV) use shift when possible.
+	impl. various opt. with coni4
+
+	* exception.c (arch_handle_exception): use ctx->SC_EBP in
+	end_of_stack check as suggested by Linus Upson <linus@linus.com>
+
+2002-04-29  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg (LDLEN, UNBOX): removed unnecessary NULL check.  
+
+	* exception.c: included the Freebsd patch from Sandro Tolaini
+	<sandro@focuseek.com>
+
+Mon Apr 29 15:18:00 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* mono.c, jit.c: use mono_runtime_run_main ().
+
+2002-04-29  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_analyze_stack): dont call methods on Object with
+	METHOD_ATTRIBUTE_FINAL directly because it breaks remoting.
+
+	* x86.brg: added more CONV_U rules
+
+	* jit.c (mono_analyze_stack): avoid recursive call of virtual
+	methods: fixes Bug #23778 
+	(mono_analyze_stack): emit right CONV_UX opcodes: fixes bug 23547
+
+	* exception.c (arch_handle_exception): only g_assert(cleanup) if
+	we really need it.
+
+2002-04-27	Patrik Torstensson <patrik.torstensson@intel.com>
+
+	* x86.brg: fixed bug in CONV_I8 (invalid stack correction)
+
+2002-04-27  Martin Baulig  <martin@gnome.org>
+
+	* jit.h (MonoFlowGrap): Renamed `epilogue_begin' to `epilogue_end',
+	there's already `epilog' so we don't need `epilogue_begin'.
+
+	* debug.c (mono_debug_add_method): Use `cfg->epilogue_end' to get the
+	size of the method's code.
+
+2002-04-25  Martin Baulig  <martin@gnome.org>
+
+	* debug-dwarf2.c (dwarf2_write_string_type): Reflect latest MonoString
+	changes.
+
+2002-04-25  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: enable stmt: STIND_I4 (addr, coni4) again,
+	added CONV_OVF_I4 (fix bug #23808)
+
+2002-04-23  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: code cleanup - use x86_patch ()
+
+	* jit.c (mono_analyze_stack): only use MB_TERM_CHECKTHIS when necessary
+	(mono_analyze_stack): don't store constants in temp. variables for CEE_DUP
+
+	* x86.brg (stmt): removed stmt: STIND_I4 (addr, coni4) rule
+	because it slows down performance.
+
+2002-04-21  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* emit-x86.c: enter_method handles 8-byte aligned parameters.
+
+2002-04-20  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* jit,h, jit.c, x86.brg: NEWOBJ_SPEC and NEWARR_SPEC terminals for
+	non-shared code.
+
+2002-04-20  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (check_inlining): added statistics about inlineing
+
+	* mono.c (usage): new switch --noinline to disable inlining
+
+	* jit.c (mono_analyze_stack): added a check for (this!=NULL) if we
+	inline methods (to keep semantics)
+
+	* x86.brg: added constant folding for inegers 
+
+	* emit-x86.c (tree_allocate_regs): handle the special case when
+	chain rules need a register.
+
+2002-04-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* invoke.c (arch_create_native_wrapper): do not save LMF for Strings
+
+	* jit.c (check_inlining): better inlining support
+
+2002-04-19  Dan Lewis  <dihlewis@yahoo.co.uk>
+	
+	* x86.brg: LDLEN uses max_length instead of bounds[0]
+	* jit.c: support for new szarray format
+
+2002-04-18  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (check_inlining): added inlining support
+
+2002-04-17  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: optimized version of castclass and isinst
+
+Wed Apr 17 12:34:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* emit-x86.c, invoke.c: track time spent compiling.
+
+Wed Apr 17 10:58:37 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* emit-x86.c, invoke.c: call profile callbacks if needed.
+	* jit.c, jit.h, mono.c: add --profile command line option.
+
+2002-04-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* jit.h: included mono/io-layer/io-layer.h to avoid breaking
+	compilation under windows when upgrading mingw and w32api to 
+	version	1.3 (thanks Dick!).
+
+2002-04-15  Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* jit.c: changed the array icalls to use full names
+
+2002-04-15  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: check the this pointer before calling
+	non-virtual functions
+
+	* emit-x86.c (arch_emit_prologue): initialize local vars.
+
+	* x86.brg: removed incredible clumsy code
+
+2002-04-13  Martin Baulig  <martin@gnome.org>
+
+	* debug-dwarf2.c (dwarf2_write_variable_location): New static func to write
+	the location of a variable.
+	(dwarf2_write_variable, dwarf2_write_parameter): Take a MonoDebugVarInfo
+	instead of a stack offset and use dwarf2_write_variable_location() to write
+	the location.
+
+2002-04-13  Martin Baulig  <martin@gnome.org>
+
+	* debug.c, debug-stabs.c, debug-dwarf2.c: Reflect latest debug-symfile.h
+	API changes.
+
+2002-04-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* Makefile.am: use of the new '-s' option in monoburg.
+
+2002-04-12  Martin Baulig  <martin@gnome.org>
+
+	* debug-dwarf2.c (dwarf2_write_variable): Emit info about the variable's
+	lifetime.
+
+2002-04-10  Sergey Chaban <serge@wildwestsoftware.com>
+	* win32-exception: added Win32 SEH exception filter that translates
+	CONTEXT to sigcontext;
+
+	* jit.c: added Win32 SEH init/reset calls, compute sigcontext address
+	in a platfrom-dependent way;
+
+	* jit.h: use win32-exception instead of signal if PLATFORM_WIN32
+	and avoid io-layer includes;
+
+	* delegate.c: do not include io-layer stuff if PLATFORM_WIN32
+	is defined;
+
+2002-04-09  Dietmar Maurer  <dietmar@ximian.com>
+
+	* delegate.c (arch_end_invoke): restore output arguments
+
+Mon Apr 8 17:16:40 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* jit.c: call mono_runtime_init ().
+
+2002-04-08  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_jit_cleanup): added more statistics
+
+	* invoke.c (arch_create_native_wrapper): special case EndInvoke -
+	we need to pass the MonoMethod pointer as first argument.
+
+	* delegate.c (mono_async_invoke): notify all listeners, not only a
+	single one.
+	(arch_end_invoke): we now pass a MonoMethod as first parameter and
+	use arch_method_call_message_new() to access the stack.
+	(arch_end_invoke): wait until we really finished processing
+	(async_invoke_abort): notify all listeners, not only a
+	single one.
+
+2002-04-06  Dietmar Maurer  <dietmar@ximian.com>
+
+	* message.c (arch_return_value): impl.
+	(arch_method_return_message_restore): consider delegate BeginInvoke
+
+	* jit.c: removed jit_exec_main()
+
+	* delegate.c (arch_begin_invoke): use the message builder to make
+	it architecture independent - still needs more cleanup.
+
+2002-04-05  Dietmar Maurer  <dietmar@ximian.com>
+
+	* delegate.c (mono_delegate_ctor): support for transparent proxy
+
+	* x86.brg (freg): bug fix in CONV_R* opcodes
+
+2002-04-04  Dietmar Maurer  <dietmar@ximian.com>
+
+	* message.c: added documentation
+
+2002-04-03  Dietmar Maurer  <dietmar@ximian.com>
+
+	* mono.c (main): use --trace instead of --trace-calls
+
+	* x86.brg: impl. REMOTE_STIND_XX
+
+	* message.c (mono_store_remote_field): impl.
+
+2002-03-30  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: impl. REMOTE_FIELD (load fields of remote objects)
+
+	* message.c (mono_load_remote_field): impl.
+
+	* jit.c (mono_analyze_stack): only call marshalbyref methods
+	through the vtable.
+	(mono_analyze_stack): consider marshalbyref objects in LDFLD
+
+Fri Mar 29 16:00:27 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* x86.brg: kill pointer arithmetric.
+
+2002-03-28  Martin Baulig  <martin@gnome.org>
+
+	* jit.c (mono_debug_insert_breakpoint): New global variable.
+	(mono_debug_last_breakpoint_address): New global variable.
+
+	* emit-x86.c (arch_compile_method): If `mono_debug_insert_breakpoint' is
+	non-zero, insert a breakpoint; if it's positive, decrement it when done.
+	Set `mono_debug_last_breakpoint_address' to the address of the last inserted
+	breakpoint.
+
+	* debug.h: Provide external declaration of `mono_debug_insert_breakpoint' and
+	`mono_debug_last_breakpoint_address', also documented them here.
+
+2002-03-28  Martin Baulig  <martin@gnome.org>
+
+	* debug-private.h (MonoDebugHandle): Renamed `format' to `default_format'.
+	(AssemblyDebugInfo): Added `format'.
+
+	* debug.c: Use the AssemblyDebugInfo's `format' field to determine the format,
+	this allows us choose the format on a per-assembly basis.
+	(mono_debug_open_assembly): When using MONO_DEBUG_FORMAT_DWARF2_PLUS, fall back
+	to MONO_DEBUG_FORMAT_DWARF2 if the symbol file does not exist, but the IL file
+	exists.
+	(debug_generate_method_lines): Generate correct IL offsets.
+
+2002-03-28  Martin Baulig  <martin@gnome.org>
+
+	* jit.h (MonoFlowGraph): Added `prologue_end' and `epilogue_start' fields.
+
+	* emit-x86.c (arch_compile_method): Set prologue_end and epilogue_start.
+
+	* debug-private.h (DebugMethodInfo): Renamed `frame_start_offset' to
+	`prologue_end_offset', added `epilogue_begin_offset' and `last_line'.
+
+	* debug.c (debug_generate_method_lines): Don't return if we don't have line
+	numbers, we still need to generate the IL offsets here. Emit line numbers
+	for `prologue_end_offset' (the first line of actual code) and 
+	`epilogue_begin_offset' (the line of the method's closing brace).
+	Don't crash if cfg->bblocks [i].forest is NULL.
+	(mono_debug_add_method): Don't crash if we don't have line numbers.
+	Initialize the newly added fields.
+
+	* debug-stabs.c: Record first and last line, emit filename info at the
+	beginning of the stab file, gdb ignores the types otherwise.
+
+	* debug-dwarf2.c: Use the new prologue_end_offset instead of guessing it;
+	emit line number info for the first and last line.
+
+2002-03-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* invoke.c (arch_create_delegate_trampoline): impl.
+
+Thu Mar 28 11:58:53 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Makefile.am, mono.c, jit.h, jit.c: build the libmono library
+	with the jit runtime to easy embedding. main() is moved to mono.c, now.
+	* jit.c: use opcode names from libmetadata.
+	* debug.h, debug.c: constify char* argument.
+
+2002-03-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c: catching SIGSEGV again, added proxy support
+
+2002-03-21  Dietmar Maurer  <dietmar@ximian.com>
+
+	* delegate.c (mono_delegate_init): remove unused worker threads
+
+2002-03-27  Mike Kestner <mkestner@speakeasy.net>
+
+	* delegate.c (arch_get_delegate_invoke): malloc a bigger area
+
+Tue Mar 26 19:54:45 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* jit.c: remove glib mem vtable code.
+
+2002-03-26  Martin Baulig  <martin@gnome.org>
+
+	* debug-dwarf2.c (write_method_lines_dwarf2): Don't generate method
+	lines if we don't have line number information.
+	(write_method_dwarf2): Use `minfo->method_info.this_offset' instead
+	of hardcoding 8.
+
+	* debug-stabs.c (write_method_stabs): Don't generate method lines if
+	we don't have line number information. Use `minfo->method_info.this_offset'
+	instead of hardcoding 8.
+
+	* debug.c (debug_generate_method_lines): Don't crash if we don't have
+	line number information.
+	(mono_debug_open_assembly): Don't generate line numbers for
+	MONO_DEBUG_FORMAT_DWARF2_PLUS.
+	(mono_debug_add_method): Don't store the 'this' offset in `param_offsets',
+	but it in the new `this_offset' field.
+	
+Mon Mar 25 13:03:35 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* debug.c (debug_generate_method_lines): Use correct addresses for
+	record_il_offset().
+
+Mon Mar 25 13:03:35 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* jit.c: do not set the glib mem vtable anymore.
+	* Makefile.am: link to libmonoutils.
+
+2002-03-25  Martin Baulig  <martin@gnome.org>
+
+	* debug.h (mono_debug_make_symbols): Documented this function.
+
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_add_method): Include the `this' offset in
+	the `minfo->method_info.param_offsets' array.
+
+2002-03-23  Martin Baulig  <martin@gnome.org>
+
+	* x86.brg (lreg: CONV_I8 (reg)): X86_XOR modifies the flags, so we need
+	to do it before the X86_CMP.
+	(reg: CLT (lreg, lreg)): Use correct x86_branch8() targets.
+	(reg: CLT (lreg, lreg)): Likewise.
+	(reg: CLT_UN (lreg, lreg)): Likewise.
+	(reg: CLT_UN (lreg, lreg)): Likewise.
+	(reg: CGT (lreg, lreg)): Likewise.
+	(reg: CGT (lreg, lreg)): Likewise.
+	(reg: CGT_UN (lreg, lreg)): Likewise.
+	(reg: CGT_UN (lreg, lreg)): Likewise.
+
+2002-03-23  Martin Baulig  <martin@gnome.org>
+
+	* debug-private.h (AssemblyDebugInfo): Added `_priv'.
+
+	* debug-dwarf2-plus.c
+	(mono_debug_open_assembly_dwarf2_plus): Open the symbol file here.
+	(mono_debug_close_assembly_dwarf2_plus): Close the symbol file here.
+	(mono_debug_write_assembly_dwarf2_plus): Only call
+	mono_debug_update_symbol_file() here.
+
+Thu Mar 21 17:35:48 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* jit.c: inter strings before executing a method.
+	Do not intern command line arguments anymore.
+
+2002-03-21  Martin Baulig  <martin@gnome.org>
+
+	* debug.h (MonoDebugFormat): Added MONO_DEBUG_FORMAT_DWARF2_PLUS.
+
+	* debug-dwarf2-plus.c: This debugging format reads a symbol file which has
+	been created by MCS and fills in all machine dependent stuff.
+
+	* debug-private.h (DebugMethodInfo): Added `MonoDebugMethodInfo method_info',
+	removed everything which is already in MonoDebugMethodInfo.
+
+	* debug.c (debug_generate_method_lines): Generate the MonoILOffsetInfo array.
+	(mono_debug_make_symbols): Don't open the file or call as, this is done in the
+	backend code.
+
+	* jit.c (main): Added "--dwarf-plus" command line option to use the new
+	MONO_DEBUG_FORMAT_DWARF2_PLUS debugging format.
+
+2002-03-21  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (usage): new option to specify maximum number of worker threads
+	(mono_analyze_stack): avoid cyclic dependency in CEE_LDFTN
+
+	* delegate.c (async_invoke_abort): added support for asynchronous exceptions
+	(arch_get_async_invoke): notify listeners before we call the
+	asynchronous callback
+
+2002-03-20  Dietmar Maurer  <dietmar@ximian.com>
+
+	* delegate.c (async_invoke_thread): support for domains
+	(async_invoke_thread): create workers only when needed
+
+2002-03-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* delegate.c (async_invoke_thread): initial support for BeginInvoke/EndInvoke
+
+2002-03-18  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: impl. lreg: XOR (lreg, lreg)
+	impl. REM (freg, freg)
+
+2002-03-17  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_open_assembly): Call mono_debug_get_type() on all
+	base types.
+
+	* debug-dwarf2.c: Added support for strings and arrays.
+
+2002-03-17  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_get_type): Recursively call this for all function members
+	of a class type.
+	(mono_debug_add_method): Don't mangle function names, this must be done by the
+	debugger backend if the debugging format needs mangled names.
+
+	* debug-dwarf2.c: Improved support for classes, added member functions.
+
+2002-03-16  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_get_type): Recursively call this for all members and
+	parent classes of a class type.
+
+	* debug-dwarf2.c: Added basic support for classes. Set source language to C++
+	since GDB doesn't like Java very much.
+
+2002-03-16  Martin Baulig  <martin@gnome.org>
+
+	* debug-dwarf2.c: Added support for enums.
+
+2002-03-15  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (mono_debug_get_type): Recursively call this for all members
+	of a struct type.
+
+	* debug-dwarf2.c: Added support for structs.
+
+2002-03-15  Dietmar Maurer  <dietmar@ximian.com>
+
+	* emit-x86.c (arch_create_jit_trampoline): adapt save/restore LMF
+	to new MonoLMF layout
+
+2002-03-14  Dietmar Maurer  <dietmar@ximian.com>
+
+	* emit-x86.c (arch_create_native_wrapper): new code to generate
+	wrappers for calling native functions.
+	(arch_create_native_wrapper): free allocated strings
+	(arch_handle_exception): made mono_jit_info_table domain dependent
+
+2002-03-14  Martin Baulig  <martin@gnome.org>
+
+	* debug.c (MonoDebugFormat): New public enums specifying which debugging
+	format to use.
+	(mono_debug_open_file): Added MonoDebugFormat argument.
+	(mono_debug_make_symbols): Don't take an argument to make it easier to call
+	this function from GDB. It's now safe to call this function multiple times;
+	it'll always write a complete debugging file.
+
+	* debug.c: Splitted this file into a general part which remains in this file
+	and the debugging format specific parts debug-stabs.c and debug-dwarf2.c.
+	All public functions now call a corresponding format specific function.
+
+	* debug.c: The following changes are private to debug.c:
+	(AssemblyDebugInfo, MonoDebugHandle): Moved declarations to debug-private.h.
+	(record_line_number, debug_generate_method_lines): New private functions.
+	(mono_debug_open_ass): Renamed to mono_debug_open_assembly; this function now
+	calls a debugging-format-specific function (mono_debug_open_assembly_stabs or
+	mono_debug_open_assembly_dwarf2).
+	(mono_debug_make_symbols): Calls mono_debug_write_assembly_stabs/dwarf2(). It's
+	now safe to call this function multiple times.
+	(mono_debug_get_type): New public function. This takes a `MonoClass *' and
+	returns an unique index for this type. It's used to ensure that we only write
+	each class once to the debugging file.
+	(mono_debug_add_method, mono_debug_add_type): Store all the data in an internal
+	data structure, but don't directly write to the debugging file. This is done
+	later from mono_debug_write_assembly().
+
+	* jit.c (main): Added "--dwarf" command line argument to generate DWARF 2
+	debugging output. Call mono_debug_close() on cleanup if necessary.
+
+2002-03-14  Martin Baulig  <martin@gnome.org>
+
+	* debug-private.h: New private header file.
+
+	* debug-stabs.c: Added the stabs type generation stuff which was
+	previously in debug.c.
+
+	* debug-dwarf.c: Started to implement type support. We're currently
+	only writing this most basic types to the dwarf file, but this will
+	change soon.
+
+2002-03-13  Martin Baulig  <martin@gnome.org>
+
+	* debug-stabs.c, debug-dwarf2.c: New files containing my new
+	debugging code. They're now in CVS, but not yet used anywhere.
+
+2002-03-11  Dietmar Maurer  <dietmar@ximian.com>
+
+	* emit-x86.c (mono_delegate_ctor): use C impl. instead of x86_*
+	macros, included new delegate code from Daniel Stodden. 
+	
+	
+Mon Mar 11 14:47:21 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* jit.c: verify that corlib and runtime are in sync.
+
+Mon Mar 11 11:30:56 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* emit-x86.c, jit.c: use the debug-helpers facilities to
+	describe and match a method when debugging.
+
+2002-03-10  Martin Baulig  <martin@gnome.org>
+
+	* emit-x86.c (arch_compile_method): When emitting stabs debugging
+	output, put a nop instruction at the start of all functions so that
+	the adresses won't change when using --debug.
+
+	* debug.c (mono_debug_add_method): `tree->cli_addr' is an offset into
+	the bytecode area, stabs needs a line number in the .il file. Use the
+	new info->moffsets to get the line number.
+	(AssemblyDebugInfo): Added `total_lines' and `moffsets' fields.
+	`moffsets' is an array of `total_lines' fields (total number of lines
+	in the .il file); for each line in the .il field, this array contains
+	the bytecode offset if it's an "IL_xxxx" line, -1 if it's the last line
+	of a method and 0 otherwise.
+	(debug_load_method_lines): Read the whole .il file and initialize the
+	info->moffsets field.
+
+2002-03-09  Martin Baulig  <martin@gnome.org>
+
+	* x86.brg (DIV_UN): Clear EDX before performing the division and remove
+	the unnecessary CDQ instruction.
+
+2002-03-07  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (mono_analyze_stack): only load addresses of value types
+	on the runtime stack.
+
+2002-03-07  Duncan Mak  <duncan@ximian.com>
+
+	* Makefile.am: A small patch fixing errors in vpath-based builds
+	(make clean failing to rerun monoburg due to BUILT_SOURCES usage),
+	committed for Daniel Stodden <stodden@in.tum.de>. 
+
+Thu Mar 7 17:22:52 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* jit.c: Boehm-GC enable.
+
+2002-03-07  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg (SAVE_LFM): bug fix: patch the saved IP because we
+	realloc that code sometimes!
+
+	* emit-x86.c (mono_compute_branches): support several types of
+	jump infos
+
+2002-03-06  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: impl. MUL_OVF_UN (reg, reg)
+
+	* jit.c (mono_find_final_block): find correct finally handler.
+
+	* emit-x86.c (arch_create_jit_trampoline): bug fix: preserve
+	caller saved registers.  
+
+2002-03-05  Dietmar Maurer  <dietmar@ximian.com>
+
+	* x86.brg: use x86_widen_reg for CONV opcodes
+
+2002-03-01  Dietmar Maurer  <dietmar@ximian.com>
+
+	* jit.c (MAKE_SPILLED_BI_ALU): remove unnecessary assertions
+
+	* emit-x86.c (arch_handle_exception): big fix - dont use
+	uninitialized next_bp
+	(arch_compile_method): make the jit thread save
+	(x86_magic_trampoline): moved lock/unlock to x86_magic_trampoline
+	to avoid need of recursive mutexes
+
+	* x86.brg: use new mono_assert macros
+
+2002-02-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* emit-x86.c (arch_create_jit_trampoline): save/restore LMF before
+	calling into unmanaged code (arch_compile_method).
+
+	* x86.brg: impl. CONV_I4 (freg) with correct rounding
+	(lreg): impl CALL_I8(INTF_ADDR)
+	impl. CONV_R_UN (reg)
+	bug fix im REM_UN
+
+2002-02-27  Dietmar Maurer  <dietmar@ximian.com>
+
+	* emit-x86.c (arch_runtime_invoke): impl. runtime invoke for the jit.
+
 2002-02-26  Dietmar Maurer  <dietmar@ximian.com>
 
 	* x86.brg: bug fix in CLT(lreg,lreg)
diff --git a/mono/jit/Makefile.am b/mono/jit/Makefile.am
index a9f581cddee..7083a039fe0 100644
--- a/mono/jit/Makefile.am
+++ b/mono/jit/Makefile.am
@@ -1,32 +1,57 @@
 INCLUDES = 				\
 	-I$(top_srcdir)			\
 	$(GMODULE_CFLAGS)		\
-	$(GLIB_CFLAGS)			
+	$(GLIB_CFLAGS)
 
 if X86
 bin_PROGRAMS = mono
+lib_LTLIBRARIES = libmono.la
+
+libmono_la_LIBADD = 	\
+	../metadata/libmonoruntime.la	\
+	../metadata/libmetadata.la	\
+	../io-layer/libwapi.la		\
+	../utils/libmonoutils.la	\
+	../os/libmonoos.la
+
 endif
 
-mono_SOURCES =			\
+libmono_la_SOURCES =		\
+	win32-exception.c	\
+	win32-exception.h	\
 	codegen.h		\
 	codegen-x86.c		\
 	emit-x86.c		\
-	jit.h			\
-	regset.h		\
 	regset.c		\
-	debug.h			\
+	debug-private.h		\
 	debug.c			\
-	jit.c
+	debug-stabs.c		\
+	debug-dwarf2.c		\
+	debug-dwarf2-plus.c	\
+	jit.c			\
+	trampoline.c		\
+	exception.c		\
+	linear-scan.c		\
+	helpers.h		\
+	helpers.c
+
+libmonoincludedir = $(includedir)/mono/jit
+libmonoinclude_HEADERS = \
+	jit.h			\
+	debug.h			\
+	regset.h
+
+mono_SOURCES = mono.c
 
+#mono_LDFLAGS=-static
 mono_LDADD =				\
-	../metadata/libmetadata.a	\
-	../io-layer/libwapi.a		\
+	libmono.la			\
 	$(GLIB_LIBS)			\
 	$(GMODULE_LIBS) 		\
 	-lm
 
 codegen-x86.c codegen.h: x86.brg
-	../monoburg/monoburg x86.brg -d codegen.h > codegen-x86.c
+	../monoburg/monoburg $(srcdir)/x86.brg -d codegen.h -s codegen-x86.c
 
 BUILT_SOURCES = codegen-x86.c codegen.h
 
diff --git a/mono/jit/TODO b/mono/jit/TODO
index d89f349a284..ab11a9232d9 100644
--- a/mono/jit/TODO
+++ b/mono/jit/TODO
@@ -1,17 +1,12 @@
 * 64bit integer mult with overflow checks + test bench
-* correctly align value types on the stack and in arrays
-* impl. marshalling attributes for pinvoke
 * raise exceptions everywhere
-* exceptions: save/restore floating point state
+* exceptions: save/restore floating point state?
 * implement all floating point instruction in x86.brg, we also need to check
   the floating branch instruction - some of them seems to be wrong, we need to
   write better tests for that.
 * document the functions and variables in the JIT 
 * implement a register set for FP registers (just count register usage on x86)
 
-* inline all calls in System.Math::*, we should use coprozessor instructions
-  directly whenever possible. 
-
 * Calling conventions:
 
 	Implement fast call
@@ -20,9 +15,14 @@
 
 	Implement CONV_OVF_XXX (constant) variants that emit either
 	loads or exceptions (as we can always tell)
-	
-	
-* thread does not work with the jit (mcs/tests/test-19.cs)??
-
+		
 * use short jump opcodes where possible (for backward jumps), will give better
   performance. 
+
+* Memory allocation of dynamic code.
+
+	The current interface to generate code and allocate the memory
+	for it is not very nice.
+
+	Use large buffers to allocate temporary code, rather than allocating
+	256 bytes every time, and hoping that it will be enough.  
\ No newline at end of file
diff --git a/mono/jit/debug-dwarf2-plus.c b/mono/jit/debug-dwarf2-plus.c
new file mode 100644
index 00000000000..c2f09f8f5ae
--- /dev/null
+++ b/mono/jit/debug-dwarf2-plus.c
@@ -0,0 +1,68 @@
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <sys/stat.h>
+#include <mono/metadata/class.h>
+#include <mono/metadata/debug-symfile.h>
+#include <mono/jit/codegen.h>
+#include <mono/jit/debug.h>
+
+#include "debug-private.h"
+
+static MonoDebugMethodInfo *
+method_info_func (MonoDebugSymbolFile *symfile, guint32 token, gpointer user_data)
+{
+	AssemblyDebugInfo *info = user_data;
+	MonoMethod *method;
+	DebugMethodInfo *minfo;
+
+	method = g_hash_table_lookup (info->image->method_cache, GINT_TO_POINTER (token));
+	if (!method)
+		return NULL;
+
+	minfo = g_hash_table_lookup (info->handle->methods, method);
+
+	return (MonoDebugMethodInfo *) minfo;
+}
+
+void
+mono_debug_open_assembly_dwarf2_plus (AssemblyDebugInfo *info)
+{
+	if (!(info->handle->flags & MONO_DEBUG_FLAGS_DONT_ASSEMBLE)) {
+		struct stat stata, statb;
+
+		if (stat (info->filename, &stata)) {
+			g_warning ("cannot access assembly file (%s): %s",
+				   info->filename, g_strerror (errno));
+			return;
+		}
+
+		/* If the stat() failed or the file is older. */
+		if (stat (info->objfile, &statb) || (statb.st_mtime < stata.st_mtime)) {
+			char *buf;
+
+			buf = g_strdup_printf ("as %s -o %s", info->filename, info->objfile);
+			system (buf);
+			g_free (buf);
+		}
+	}
+
+	if (!(info->handle->flags & MONO_DEBUG_FLAGS_DONT_PRECOMPILE))
+		mono_jit_compile_image (info->image, FALSE);
+
+	info->symfile = mono_debug_open_symbol_file (info->image, info->objfile, TRUE);
+}
+
+void
+mono_debug_close_assembly_dwarf2_plus (AssemblyDebugInfo *info)
+{
+	if (info->symfile)
+		mono_debug_close_symbol_file (info->symfile);
+}
+
+void
+mono_debug_write_assembly_dwarf2_plus (AssemblyDebugInfo *info)
+{
+	if (info->symfile)
+		mono_debug_update_symbol_file (info->symfile, method_info_func, info);
+}
diff --git a/mono/jit/debug-dwarf2.c b/mono/jit/debug-dwarf2.c
new file mode 100644
index 00000000000..13f0a773ce8
--- /dev/null
+++ b/mono/jit/debug-dwarf2.c
@@ -0,0 +1,1378 @@
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <mono/metadata/class.h>
+#include <mono/metadata/tabledefs.h>
+#include <mono/metadata/tokentype.h>
+#include <mono/jit/codegen.h>
+#include <mono/jit/debug.h>
+
+#include "debug-private.h"
+
+#define ABBREV_COMPILE_UNIT		1
+#define ABBREV_SUBPROGRAM		2
+#define ABBREV_SUBPROGRAM_RETVAL	3
+#define ABBREV_BASE_TYPE		4
+#define ABBREV_FORMAL_PARAMETER		5
+#define ABBREV_PARAMETER		6
+#define ABBREV_LOCAL_VARIABLE		7
+#define ABBREV_STRUCT_TYPE		8
+#define ABBREV_STRUCT_MEMBER		9
+#define ABBREV_STRUCT_ACCESS		10
+#define ABBREV_ENUM_TYPE		11
+#define ABBREV_ENUM_VALUE		12
+#define ABBREV_ENUM_VALUE_UNSIGNED	13
+#define ABBREV_ENUM_VALUE_SIGNED	14
+#define ABBREV_CLASS_TYPE		15
+#define ABBREV_CLASS_INHERITANCE	16
+#define ABBREV_POINTER_TYPE		17
+#define ABBREV_CLASS_METHOD		18
+#define ABBREV_CLASS_METHOD_RETVAL	19
+#define ABBREV_ARTIFICIAL_PARAMETER	20
+#define ABBREV_SIMPLE_ARRAY		21
+#define ABBREV_ARRAY			22
+#define ABBREV_SUBRANGE			23
+
+// The following constants are defined in the DWARF 2 specification
+#define DW_TAG_array_type		0x01
+#define DW_TAG_class_type		0x02
+#define DW_TAG_enumeration_type		0x04
+#define DW_TAG_formal_parameter		0x05
+#define DW_TAG_member			0x0d
+#define DW_TAG_pointer_type		0x0f
+#define DW_TAG_compile_unit		0x11
+#define DW_TAG_structure_type		0x13
+#define DW_TAG_inheritance		0x1c
+#define DW_TAG_subrange_type		0x21
+#define DW_TAG_access_declaration	0x23
+#define DW_TAG_base_type		0x24
+#define DW_TAG_enumerator		0x28
+#define DW_TAG_subprogram		0x2e
+#define DW_TAG_variable			0x34
+
+#define DW_CHILDREN_no			0
+#define DW_CHILDREN_yes			1
+
+#define DW_AT_location			0x02
+#define DW_AT_name			0x03
+#define DW_AT_byte_size			0x0b
+#define DW_AT_stmt_list			0x10
+#define DW_AT_low_pc			0x11
+#define DW_AT_high_pc			0x12
+#define DW_AT_language			0x13
+#define DW_AT_const_value		0x1c
+#define DW_AT_lower_bound		0x22
+#define DW_AT_producer			0x25
+#define DW_AT_start_scope		0x2c
+#define DW_AT_upper_bound		0x2f
+#define DW_AT_accessibility		0x32
+#define DW_AT_artificial		0x34
+#define DW_AT_calling_convention	0x36
+#define DW_AT_count			0x37
+#define DW_AT_data_member_location	0x38
+#define DW_AT_encoding			0x3e
+#define DW_AT_external			0x3f
+#define DW_AT_type			0x49
+#define DW_AT_virtuality		0x4c
+#define DW_AT_vtable_elem_location	0x4d
+
+/* Martin Baulig's extensions. */
+#define DW_AT_end_scope			0x2121
+
+#define DW_FORM_addr			0x01
+#define DW_FORM_block4			0x04
+#define DW_FORM_data2			0x05
+#define DW_FORM_data4			0x06
+#define DW_FORM_data8			0x07
+#define DW_FORM_string			0x08
+#define DW_FORM_data1			0x0b
+#define DW_FORM_flag			0x0c
+#define DW_FORM_sdata			0x0d
+#define DW_FORM_udata			0x0f
+#define DW_FORM_ref4			0x13
+
+#define DW_ATE_void			0x00
+#define DW_ATE_address			0x01
+#define DW_ATE_boolean			0x02
+#define DW_ATE_complex_float		0x03
+#define DW_ATE_float			0x04
+#define DW_ATE_signed			0x05
+#define DW_ATE_signed_char		0x06
+#define DW_ATE_unsigned			0x07
+#define DW_ATE_unsigned_char		0x08
+
+#define DW_OP_const1u			0x08
+#define DW_OP_const1s			0x09
+#define DW_OP_constu			0x10
+#define DW_OP_consts			0x11
+#define DW_OP_plus			0x22
+#define DW_OP_reg0			0x50
+#define DW_OP_breg0			0x70
+#define DW_OP_fbreg			0x91
+#define DW_OP_piece			0x93
+
+#define DW_CC_normal			1
+#define DW_CC_program			2
+#define DW_CC_nocall			3
+
+#define DW_ACCESS_public		1
+#define DW_ACCESS_protected		2
+#define DW_ACCESS_private		3
+
+#define DW_VIRTUALITY_none		0
+#define DW_VIRTUALITY_virtual		1
+#define DW_VIRTUALITY_pure_virtual	2
+
+#define DW_LANG_C_plus_plus		0x04
+#define DW_LANG_Java			0x0b
+// This is NOT in the standard, we're using Java for the moment. */
+#define DW_LANG_C_sharp			DW_LANG_C_plus_plus
+
+#define DW_LNS_extended_op		0
+#define DW_LNS_copy			1
+#define DW_LNS_advance_pc		2
+#define DW_LNS_advance_line		3
+#define DW_LNS_set_file			4
+#define DW_LNS_set_column		5
+#define DW_LNS_negate_stmt		6
+#define DW_LNS_set_basic_block		7
+#define DW_LNS_const_add_pc		8
+#define DW_LNS_fixed_advance_pc		9
+
+#define DW_LNE_end_sequence		1
+#define DW_LNE_set_address		2
+#define DW_LNE_define_file		3
+
+
+static const int line_base = 1, line_range = 8, opcode_base = 10;
+static const int standard_opcode_sizes [10] = {
+    0, 0, 1, 1, 1, 1, 0, 0, 0, 0
+};
+
+static void
+dwarf2_write_byte (FILE *f, int byte)
+{
+	fprintf (f, "\t.byte %d\n", byte);
+}
+
+static void
+dwarf2_write_2byte (FILE *f, int word)
+{
+	fprintf (f, "\t.word %d\n", word);
+}
+
+static void
+dwarf2_write_pair (FILE *f, int a, int b)
+{
+	fprintf (f, "\t.uleb128 %d, %d\n", a, b);
+}
+
+static void
+dwarf2_write_long (FILE *f, unsigned long value)
+{
+	fprintf (f, "\t.long %lu\n", value);
+}
+
+static void
+dwarf2_write_address (FILE *f, void *address)
+{
+	fprintf (f, "\t.long 0x%lx\n", address);
+}
+
+static void
+dwarf2_write_string (FILE *f, const char *string)
+{
+	fprintf (f, "\t.string \"%s\"\n", string);
+}
+
+static void
+dwarf2_write_sleb128 (FILE *f, long value)
+{
+	fprintf (f, "\t.sleb128 %ld\n", value);
+}
+
+static void
+dwarf2_write_uleb128 (FILE *f, unsigned long value)
+{
+	fprintf (f, "\t.uleb128 %lu\n", value);
+}
+
+static void
+dwarf2_write_section_start (FILE *f, const char *section)
+{
+	fprintf (f, "\t.section .%s\n", section);
+}
+
+static void
+dwarf2_write_label (FILE *f, const char *label)
+{
+	fprintf (f, ".L_%s:\n", label);
+}
+
+static void
+dwarf2_write_section_size (FILE *f, const char *start_label, const char *end_label)
+{
+	fprintf (f, "\t.long .L_%s - .L_%s\n", end_label, start_label);
+}
+
+static void
+dwarf2_write_ref4 (FILE *f, const char *target_label)
+{
+	fprintf (f, "\t.long .L_%s\n", target_label);
+}
+
+static void
+dwarf2_write_type_ref (FILE *f, unsigned long type_index)
+{
+	fprintf (f, "\t.long .L_TYPE_%lu - .L_debug_info_b\n", type_index);
+}
+
+static void
+dwarf2_write_type_ptr_ref (FILE *f, unsigned long idx)
+{
+	fprintf (f, "\t.long .L_TYPE_PTR_%lu - .L_debug_info_b\n", idx);
+}
+
+static void
+dwarf2_write_relative_ref (FILE *f, const gchar *name, unsigned long idx)
+{
+	fprintf (f, "\t.long .L_%s_%lu - .L_debug_info_b\n", name, idx);
+}
+
+static void
+dwarf2_write_dw_lns_copy (FILE *f)
+{
+	dwarf2_write_byte (f, DW_LNS_copy);
+}
+
+static void
+dwarf2_write_dw_lns_advance_pc (FILE *f, unsigned value)
+{
+	dwarf2_write_byte (f, DW_LNS_advance_pc);
+	dwarf2_write_uleb128 (f, value);
+}
+
+static void
+dwarf2_write_dw_lns_advance_line (FILE *f, int value)
+{
+	dwarf2_write_byte (f, DW_LNS_advance_line);
+	dwarf2_write_sleb128 (f, value);
+}
+
+static void
+dwarf2_write_dw_lns_set_file (FILE *f, unsigned value)
+{
+	dwarf2_write_byte (f, DW_LNS_set_file);
+	dwarf2_write_uleb128 (f, value + 1);
+}
+
+static void
+dwarf2_write_dw_lns_negate_stmt (FILE *f)
+{
+	dwarf2_write_byte (f, DW_LNS_negate_stmt);
+}
+
+#if 0 /* never used */
+static void
+dwarf2_write_dw_lns_set_basic_block (FILE *f)
+{
+	dwarf2_write_byte (f, DW_LNS_set_basic_block);
+}
+#endif
+
+static void
+dwarf2_write_dw_lne_end_sequence (FILE *f)
+{
+	dwarf2_write_byte (f, 0);
+	dwarf2_write_byte (f, 1);
+	dwarf2_write_byte (f, DW_LNE_end_sequence);
+}
+
+static void
+dwarf2_write_dw_lne_set_address (FILE *f, void *address)
+{
+	dwarf2_write_byte (f, 0);
+	dwarf2_write_byte (f, sizeof (address) + 1);
+	dwarf2_write_byte (f, DW_LNE_set_address);
+	dwarf2_write_address (f, address);
+}
+
+static void
+dwarf2_write_base_type (MonoDebugHandle *debug, int idx,
+			int type, int size, const gchar *name)
+{
+	char buffer [BUFSIZ];
+
+	sprintf (buffer, "TYPE_%d", idx);
+	dwarf2_write_label (debug->f, buffer);
+	// DW_TAG_basic_type
+	dwarf2_write_byte (debug->f, ABBREV_BASE_TYPE);
+	dwarf2_write_string (debug->f, name);
+	dwarf2_write_byte (debug->f, type);
+	dwarf2_write_byte (debug->f, size);
+}
+
+static void
+dwarf2_write_enum_value (MonoDebugHandle *debug, MonoClass *klass, int idx)
+{
+	const void *ptr;
+	guint32 field_index = idx + klass->field.first;
+	guint32 crow;
+
+	crow = mono_metadata_get_constant_index (klass->image, MONO_TOKEN_FIELD_DEF | (field_index + 1));
+	if (!crow) {
+		dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE);
+		dwarf2_write_string (debug->f, klass->fields [idx].name);
+		dwarf2_write_long (debug->f, 0);
+		return;
+	}
+
+	crow = mono_metadata_decode_row_col (&klass->image->tables [MONO_TABLE_CONSTANT], crow-1,
+					     MONO_CONSTANT_VALUE);
+
+	ptr = 1 + mono_metadata_blob_heap (klass->image, crow);
+
+	switch (klass->enum_basetype->type) {
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_U1:
+		dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE_UNSIGNED);
+		dwarf2_write_string (debug->f, klass->fields [idx].name);
+		dwarf2_write_uleb128 (debug->f, *(guint8 *) ptr);
+		break;
+	case MONO_TYPE_I1:
+		dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE_SIGNED);
+		dwarf2_write_string (debug->f, klass->fields [idx].name);
+		dwarf2_write_sleb128 (debug->f, *(gint8 *) ptr);
+		break;
+	case MONO_TYPE_CHAR:
+	case MONO_TYPE_U2:
+		dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE_UNSIGNED);
+		dwarf2_write_string (debug->f, klass->fields [idx].name);
+		dwarf2_write_uleb128 (debug->f, *(guint16 *) ptr);
+		break;
+	case MONO_TYPE_I2:
+		dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE_SIGNED);
+		dwarf2_write_string (debug->f, klass->fields [idx].name);
+		dwarf2_write_sleb128 (debug->f, *(gint16 *) ptr);
+		break;
+	case MONO_TYPE_U4:
+		dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE_UNSIGNED);
+		dwarf2_write_string (debug->f, klass->fields [idx].name);
+		dwarf2_write_uleb128 (debug->f, *(guint32 *) ptr);
+		break;
+	case MONO_TYPE_I4:
+		dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE_SIGNED);
+		dwarf2_write_string (debug->f, klass->fields [idx].name);
+		dwarf2_write_sleb128 (debug->f, *(gint32 *) ptr);
+		break;
+	case MONO_TYPE_U8:
+		dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE_UNSIGNED);
+		dwarf2_write_string (debug->f, klass->fields [idx].name);
+		dwarf2_write_uleb128 (debug->f, *(guint64 *) ptr);
+		break;
+	case MONO_TYPE_I8:
+		dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE_SIGNED);
+		dwarf2_write_string (debug->f, klass->fields [idx].name);
+		dwarf2_write_sleb128 (debug->f, *(gint64 *) ptr);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+}
+
+static void
+dwarf2_write_enum_type (MonoDebugHandle *debug, MonoClass *klass)
+{
+	int i;
+
+	// DW_TAG_enumeration_type
+	dwarf2_write_byte (debug->f, ABBREV_ENUM_TYPE);
+	dwarf2_write_string (debug->f, klass->name);
+	dwarf2_write_long (debug->f, klass->instance_size - sizeof (MonoObject));
+
+	for (i = 0; i < klass->field.count; i++) {
+		if (klass->fields [i].type->attrs & FIELD_ATTRIBUTE_LITERAL)
+			dwarf2_write_enum_value (debug, klass, i);
+	}
+
+	dwarf2_write_byte (debug->f, 0);
+	// DW_TAG_enumeration_type ends here
+}
+
+static void
+dwarf2_write_class_field (MonoDebugHandle *debug, MonoClass *klass, int idx,
+			  int type_index, int start_offset)
+{
+    MonoClass *subclass = mono_class_from_mono_type (klass->fields [idx].type);
+    char start [BUFSIZ], end [BUFSIZ];
+    static long label_index = 0;
+
+    // Don't include any static fields, they aren't supported yet.
+    // If a struct contains a static field which has the same type as
+    // the struct itself, we'd get a recursion loop there.
+    if (klass->fields [idx].type->attrs & FIELD_ATTRIBUTE_STATIC)
+	    return;
+
+    sprintf (start, "DSF1_%ld", ++label_index);
+    sprintf (end, "DSF2_%ld", label_index);
+
+    // DW_TAG_member
+    dwarf2_write_byte (debug->f, ABBREV_STRUCT_MEMBER);
+    dwarf2_write_string (debug->f, klass->fields [idx].name);
+    if (!subclass->valuetype)
+	dwarf2_write_type_ptr_ref (debug->f, type_index);
+    else
+	dwarf2_write_type_ref (debug->f, type_index);
+
+    if (klass->fields [idx].type->attrs & FIELD_ATTRIBUTE_PRIVATE)
+	dwarf2_write_byte (debug->f, DW_ACCESS_private);
+    else if (klass->fields [idx].type->attrs & FIELD_ATTRIBUTE_FAMILY)
+	dwarf2_write_byte (debug->f, DW_ACCESS_protected);
+    else
+	dwarf2_write_byte (debug->f, DW_ACCESS_public);
+
+    dwarf2_write_section_size (debug->f, start, end);
+    dwarf2_write_label (debug->f, start);
+    dwarf2_write_byte (debug->f, DW_OP_constu);
+    dwarf2_write_uleb128 (debug->f, klass->fields [idx].offset - start_offset);
+    dwarf2_write_label (debug->f, end);
+
+    dwarf2_write_long (debug->f, subclass->instance_size);
+}
+
+static void
+dwarf2_write_class_method (MonoDebugHandle *debug, MonoClass *klass, MonoMethod *method)
+{
+	MonoType *ret_type = NULL;
+	gchar **names;
+	int i;
+
+	if (method->signature->ret->type != MONO_TYPE_VOID)
+		ret_type = method->signature->ret;
+
+	// DW_TAG_subprogram
+	if (ret_type)
+		dwarf2_write_byte (debug->f, ABBREV_CLASS_METHOD_RETVAL);
+	else
+		dwarf2_write_byte (debug->f, ABBREV_CLASS_METHOD);
+	dwarf2_write_string (debug->f, method->name);
+
+	if (method->flags & METHOD_ATTRIBUTE_PUBLIC)
+		dwarf2_write_byte (debug->f, DW_ACCESS_public);
+	else if (method->flags & METHOD_ATTRIBUTE_PRIVATE)
+		dwarf2_write_byte (debug->f, DW_ACCESS_private);
+	else
+		dwarf2_write_byte (debug->f, DW_ACCESS_protected);
+
+	if (method->flags & METHOD_ATTRIBUTE_VIRTUAL)
+		dwarf2_write_byte (debug->f, DW_VIRTUALITY_pure_virtual);
+	else
+		dwarf2_write_byte (debug->f, DW_VIRTUALITY_none);
+
+	dwarf2_write_byte (debug->f, DW_CC_nocall);
+
+	if (ret_type) {
+		MonoClass *k = mono_class_from_mono_type (ret_type);
+		int type_index = mono_debug_get_type (debug, k);
+		dwarf2_write_type_ref (debug->f, type_index);
+	}
+
+	if (method->signature->hasthis) {
+		int type_index = mono_debug_get_type (debug, klass);
+
+		dwarf2_write_byte (debug->f, ABBREV_ARTIFICIAL_PARAMETER);
+		dwarf2_write_string (debug->f, "this");
+		dwarf2_write_type_ptr_ref (debug->f, type_index);
+		dwarf2_write_byte (debug->f, 1);
+	}
+
+	names = g_new (char *, method->signature->param_count);
+	mono_method_get_param_names (method, (const char **) names);
+
+	for (i = 0; i < method->signature->param_count; i++) {
+		MonoType *subtype = method->signature->params [i];
+		MonoClass *subklass = mono_class_from_mono_type (subtype);
+		int type_index = mono_debug_get_type (debug, subklass);
+
+		// DW_TAG_formal_parameter
+		dwarf2_write_byte (debug->f, ABBREV_FORMAL_PARAMETER);
+		dwarf2_write_string (debug->f, names [i]);
+		if (subklass->valuetype)
+			dwarf2_write_type_ref (debug->f, type_index);
+		else
+			dwarf2_write_type_ptr_ref (debug->f, type_index);
+	}
+
+	g_free (names);
+
+	dwarf2_write_byte (debug->f, 0);
+	// DW_TAG_subprogram ends here
+}
+
+static void
+dwarf2_write_struct_type (MonoDebugHandle *debug, MonoClass *klass)
+{
+	guint32 *idxs;
+	int i;
+
+	idxs = g_new0 (guint32, klass->field.last - klass->field.first + 1);
+	for (i = 0; i < klass->field.count; i++) {
+		MonoClass *subclass = mono_class_from_mono_type (klass->fields [i].type);
+		idxs [i] = mono_debug_get_type (debug, subclass);
+	}
+
+	// DW_TAG_structure_type
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_TYPE);
+	dwarf2_write_string (debug->f, klass->name);
+	dwarf2_write_long (debug->f, klass->instance_size - sizeof (MonoObject));
+
+	for (i = 0; i < klass->field.count; i++)
+		dwarf2_write_class_field (debug, klass, i, idxs [i], sizeof (MonoObject));
+
+	dwarf2_write_byte (debug->f, 0);
+	// DW_TAG_structure_type ends here
+
+	g_free (idxs);
+}
+
+static void
+dwarf2_write_class_type (MonoDebugHandle *debug, MonoClass *klass)
+{
+	guint32 *idxs;
+	int i;
+
+	idxs = g_new0 (guint32, klass->field.last - klass->field.first + 1);
+	for (i = 0; i < klass->field.count; i++) {
+		MonoClass *subclass = mono_class_from_mono_type (klass->fields [i].type);
+		idxs [i] = mono_debug_get_type (debug, subclass);
+	}
+
+	// DW_TAG_structure_type
+	dwarf2_write_byte (debug->f, ABBREV_CLASS_TYPE);
+	dwarf2_write_string (debug->f, klass->name);
+	dwarf2_write_long (debug->f, klass->instance_size);
+	if (klass->flags & TYPE_ATTRIBUTE_PUBLIC)
+		dwarf2_write_byte (debug->f, DW_ACCESS_public);
+	else
+		dwarf2_write_byte (debug->f, DW_ACCESS_private);
+
+	if (klass->parent && klass->parent->byval_arg.type == MONO_TYPE_CLASS) {
+		guint32 parent_index = mono_debug_get_type (debug, klass->parent);
+
+		// DW_TAG_inheritance
+		dwarf2_write_byte (debug->f, ABBREV_CLASS_INHERITANCE);
+		dwarf2_write_type_ref (debug->f, parent_index);
+		if (klass->parent->flags & TYPE_ATTRIBUTE_PUBLIC)
+			dwarf2_write_byte (debug->f, DW_ACCESS_public);
+		else
+			dwarf2_write_byte (debug->f, DW_ACCESS_private);
+	}
+
+	for (i = 0; i < klass->field.count; i++)
+		dwarf2_write_class_field (debug, klass, i, idxs [i], 0);
+
+	for (i = 0; i < klass->method.count; i++) {
+		if (!strcmp (klass->methods [i]->name, ".ctor"))
+			continue;
+
+		dwarf2_write_class_method (debug, klass, klass->methods [i]);
+	}
+
+	dwarf2_write_byte (debug->f, 0);
+	// DW_TAG_class_type ends here
+
+	g_free (idxs);
+}
+
+static void
+dwarf2_write_array (MonoDebugHandle *debug, const gchar *name, MonoClass *element_class,
+		    int rank, int idx)
+{
+	unsigned long uint32_index = mono_debug_get_type (debug, mono_defaults.uint32_class);
+	char buffer [BUFSIZ];
+	MonoArray array;
+
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_TYPE);
+	dwarf2_write_string (debug->f, name);
+	dwarf2_write_long (debug->f, sizeof (MonoArray));
+
+	// DW_TAG_structure_type
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_MEMBER);
+	dwarf2_write_string (debug->f, "max_length");
+	dwarf2_write_type_ref (debug->f, uint32_index);
+	dwarf2_write_byte (debug->f, DW_ACCESS_public);
+	dwarf2_write_long (debug->f, 2);
+	dwarf2_write_byte (debug->f, DW_OP_const1u);
+	dwarf2_write_byte (debug->f, (guchar *) &array.max_length - (guchar *) &array);
+	dwarf2_write_long (debug->f, 4);
+
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_MEMBER);
+	dwarf2_write_string (debug->f, "bounds");
+	dwarf2_write_relative_ref (debug->f, "ARRAY_BOUNDS_PTR", idx);
+	dwarf2_write_byte (debug->f, DW_ACCESS_public);
+	dwarf2_write_long (debug->f, 2);
+	dwarf2_write_byte (debug->f, DW_OP_const1u);
+	dwarf2_write_byte (debug->f, (guchar *) &array.bounds - (guchar *) &array);
+	dwarf2_write_long (debug->f, 4);
+
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_MEMBER);
+	dwarf2_write_string (debug->f, "vector");
+	dwarf2_write_relative_ref (debug->f, "ARRAY_PTR", idx);
+	dwarf2_write_byte (debug->f, DW_ACCESS_public);
+	dwarf2_write_long (debug->f, 2);
+	dwarf2_write_byte (debug->f, DW_OP_const1u);
+	dwarf2_write_byte (debug->f, (guchar *) &array.vector - (guchar *) &array);
+	dwarf2_write_long (debug->f, 4);
+
+	dwarf2_write_byte (debug->f, 0);
+	// DW_TAG_structure_type ends here
+
+	sprintf (buffer, "ARRAY_BOUNDS_PTR_%u", idx);
+	dwarf2_write_label (debug->f, buffer);
+
+	// DW_TAG_pointer_type
+	dwarf2_write_byte (debug->f, ABBREV_POINTER_TYPE);
+	dwarf2_write_relative_ref (debug->f, "ARRAY_BOUNDS", idx);
+
+	sprintf (buffer, "ARRAY_BOUNDS_%u", idx);
+	dwarf2_write_label (debug->f, buffer);
+
+	// DW_TAG_array_type
+	dwarf2_write_byte (debug->f, ABBREV_ARRAY);
+	dwarf2_write_string (debug->f, name);
+	dwarf2_write_type_ref (debug->f, uint32_index);
+	dwarf2_write_long (debug->f, rank * 2);
+
+	// DW_TAG_subrange_type
+	dwarf2_write_byte (debug->f, ABBREV_SUBRANGE);
+	dwarf2_write_long (debug->f, 0);
+	dwarf2_write_long (debug->f, rank-1);
+	dwarf2_write_long (debug->f, rank);
+
+	// DW_TAG_subrange_type
+	dwarf2_write_byte (debug->f, ABBREV_SUBRANGE);
+	dwarf2_write_long (debug->f, 0);
+	dwarf2_write_long (debug->f, 1);
+	dwarf2_write_long (debug->f, 2);
+
+	dwarf2_write_byte (debug->f, 0);
+	// DW_TAG_array_type ends here
+
+	sprintf (buffer, "ARRAY_PTR_%u", idx);
+	dwarf2_write_label (debug->f, buffer);
+
+	// DW_TAG_array_type
+	dwarf2_write_byte (debug->f, ABBREV_SIMPLE_ARRAY);
+	dwarf2_write_string (debug->f, name);
+	if (element_class->valuetype)
+		dwarf2_write_type_ref (debug->f, mono_debug_get_type (debug, element_class));
+	else
+		dwarf2_write_type_ptr_ref (debug->f, mono_debug_get_type (debug, element_class));
+}
+
+static void
+dwarf2_write_array_type (MonoDebugHandle *debug, MonoClass *klass, int idx)
+{
+	char buffer [BUFSIZ], *name;
+	int i;
+
+	buffer[0] = '\0';
+	for (i = 0; i < klass->rank; i++)
+		strcat (buffer, "[]");
+
+	name = g_strdup_printf ("%s%s", klass->element_class->name, buffer);
+
+	dwarf2_write_array (debug, name, klass->element_class, klass->rank, idx);
+
+	g_free (name);
+}
+
+static void
+dwarf2_write_string_type (MonoDebugHandle *debug, MonoClass *klass, int idx)
+{
+	unsigned long uint32_index = mono_debug_get_type (debug, mono_defaults.uint32_class);
+	char buffer [BUFSIZ];
+	MonoString string;
+
+	// DW_TAG_structure_type
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_TYPE);
+	dwarf2_write_string (debug->f, klass->name);
+	dwarf2_write_long (debug->f, sizeof (MonoString));
+
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_MEMBER);
+	dwarf2_write_string (debug->f, "length");
+	dwarf2_write_type_ref (debug->f, uint32_index);
+	dwarf2_write_byte (debug->f, DW_ACCESS_public);
+	dwarf2_write_long (debug->f, 2);
+	dwarf2_write_byte (debug->f, DW_OP_const1u);
+	dwarf2_write_byte (debug->f, (guchar *) &string.length - (guchar *) &string);
+	dwarf2_write_long (debug->f, 4);
+
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_MEMBER);
+	dwarf2_write_string (debug->f, "chars");
+	dwarf2_write_relative_ref (debug->f, "CHARS", idx);
+	dwarf2_write_byte (debug->f, DW_ACCESS_public);
+	dwarf2_write_long (debug->f, 2);
+	dwarf2_write_byte (debug->f, DW_OP_const1u);
+	dwarf2_write_byte (debug->f, (guchar *) &string.chars - (guchar *) &string);
+	dwarf2_write_long (debug->f, 4);
+
+	dwarf2_write_byte (debug->f, 0);
+	// DW_TAG_structure_type ends here
+
+	sprintf (buffer, "CHARS_%u", idx);
+	dwarf2_write_label (debug->f, buffer);
+
+	dwarf2_write_byte (debug->f, ABBREV_SIMPLE_ARRAY);
+	dwarf2_write_string (debug->f, "Char[]");
+	dwarf2_write_type_ref (debug->f, mono_debug_get_type (debug, mono_defaults.char_class));
+}
+
+static void
+dwarf2_write_class (MonoDebugHandle *debug, MonoClass *klass, int idx)
+{
+	char buffer [BUFSIZ];
+	int print = 0;
+
+	if (!strncmp (klass->name, "My", 2)) {
+		g_message (G_STRLOC ": %s - %s - %x", klass->name_space, klass->name, klass->flags);
+		print = 1;
+		// G_BREAKPOINT ();
+	}
+
+	if (!klass->valuetype) {
+		sprintf (buffer, "TYPE_PTR_%u", idx);
+		dwarf2_write_label (debug->f, buffer);
+
+		// DW_TAG_pointer_type
+		dwarf2_write_byte (debug->f, ABBREV_POINTER_TYPE);
+		dwarf2_write_type_ref (debug->f, idx);
+	}
+
+	sprintf (buffer, "TYPE_%u", idx);
+	dwarf2_write_label (debug->f, buffer);
+
+	if (klass->enumtype) {
+		dwarf2_write_enum_type (debug, klass);
+		return;
+	}
+
+	switch (klass->byval_arg.type) {
+	case MONO_TYPE_VALUETYPE:
+		dwarf2_write_struct_type (debug, klass);
+		break;
+	case MONO_TYPE_CLASS:
+		dwarf2_write_class_type (debug, klass);
+		break;
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:
+		dwarf2_write_array_type (debug, klass, idx);
+		break;
+	case MONO_TYPE_STRING:
+		dwarf2_write_string_type (debug, klass, idx);
+		break;
+	default:
+#if 0
+		g_message (G_STRLOC ": %s.%s - 0x%x - 0x%x", klass->name_space, klass->name,
+			   klass->byval_arg.type, klass->flags);
+#endif
+
+		// DW_TAG_basic_type
+		dwarf2_write_byte (debug->f, ABBREV_BASE_TYPE);
+		dwarf2_write_string (debug->f, klass->name);
+		dwarf2_write_byte (debug->f, DW_ATE_address);
+		dwarf2_write_byte (debug->f, 0);
+		break;
+	}
+}
+
+static void
+dwarf2_write_variable_location (MonoDebugHandle *debug, MonoDebugVarInfo *var)
+{
+	switch (var->index & MONO_DEBUG_VAR_ADDRESS_MODE_FLAGS) {
+	case MONO_DEBUG_VAR_ADDRESS_MODE_STACK:
+		/*
+		 * Variable is on the stack.
+		 *
+		 * If `index' is zero, use the normal frame register.  Otherwise, bits
+		 * 0..4 of `index' contain the frame register.
+		 *
+		 */
+
+		if (!var->index)
+			/* Use the normal frame register (%ebp on the i386). */
+			dwarf2_write_byte (debug->f, DW_OP_fbreg);
+		else
+			/* Use a custom frame register. */
+			dwarf2_write_byte (debug->f, DW_OP_breg0 + (var->index & 0x001f));
+		dwarf2_write_sleb128 (debug->f, var->offset);
+		break;
+
+	case MONO_DEBUG_VAR_ADDRESS_MODE_REGISTER:
+		/*
+		 * Variable is in the register whose number is contained in bits 0..4
+		 * of `index'.
+		 *
+		 */
+		dwarf2_write_byte (debug->f, DW_OP_reg0 + (var->index & 0x001f));
+		if (var->offset) {
+			dwarf2_write_byte (debug->f, DW_OP_consts);
+			dwarf2_write_sleb128 (debug->f, var->offset);
+			dwarf2_write_byte (debug->f, DW_OP_plus);
+		}
+		break;
+
+	case MONO_DEBUG_VAR_ADDRESS_MODE_TWO_REGISTERS:
+		/*
+		 * Variable is in two registers whose numbers are in bits 0..4 and 5..9 of 
+		 * the `index' field.
+		 */
+		dwarf2_write_byte (debug->f, DW_OP_reg0 + (var->index & 0x001f));
+		dwarf2_write_byte (debug->f, DW_OP_piece);
+		dwarf2_write_byte (debug->f, sizeof (int));
+
+		dwarf2_write_byte (debug->f, DW_OP_reg0 + ((var->index & 0x1f0) >> 5));
+		dwarf2_write_byte (debug->f, DW_OP_piece);
+		dwarf2_write_byte (debug->f, sizeof (int));
+
+		break;
+
+	default:
+		g_assert_not_reached ();
+	}
+}
+
+static void
+dwarf2_write_parameter (MonoDebugHandle *debug, DebugMethodInfo *minfo, const gchar *name,
+			MonoDebugVarInfo *var, MonoClass *klass)
+{
+	static long label_index = 0;
+	int type_index = mono_debug_get_type (debug, klass);
+	char start [BUFSIZ], end [BUFSIZ];
+
+	sprintf (start, "DT1_%ld", ++label_index);
+	sprintf (end, "DT2_%ld", label_index);
+		
+	// DW_TAG_format_parameter
+	dwarf2_write_byte (debug->f, ABBREV_PARAMETER);
+	dwarf2_write_string (debug->f, name);
+	if (klass->valuetype)
+		dwarf2_write_type_ref (debug->f, type_index);
+	else
+		dwarf2_write_type_ptr_ref (debug->f, type_index);
+	dwarf2_write_section_size (debug->f, start, end);
+	dwarf2_write_label (debug->f, start);
+	dwarf2_write_variable_location (debug, var);
+	dwarf2_write_label (debug->f, end);
+	dwarf2_write_long (debug->f, minfo->method_info.prologue_end);
+}
+
+static void
+dwarf2_write_variable (MonoDebugHandle *debug, DebugMethodInfo *minfo, const gchar *name,
+		       MonoDebugVarInfo *var, MonoClass *klass)
+{
+	static long label_index = 0;
+	int type_index = mono_debug_get_type (debug, klass);
+	char start [BUFSIZ], end [BUFSIZ];
+
+	sprintf (start, "DT3_%ld", ++label_index);
+	sprintf (end, "DT4_%ld", label_index);
+		
+	// DW_TAG_formal_parameter
+	dwarf2_write_byte (debug->f, ABBREV_LOCAL_VARIABLE);
+	dwarf2_write_string (debug->f, name);
+	if (klass->valuetype)
+		dwarf2_write_type_ref (debug->f, type_index);
+	else
+		dwarf2_write_type_ptr_ref (debug->f, type_index);
+	dwarf2_write_section_size (debug->f, start, end);
+	dwarf2_write_label (debug->f, start);
+	dwarf2_write_variable_location (debug, var);
+	dwarf2_write_label (debug->f, end);
+	dwarf2_write_address (debug->f, minfo->method_info.code_start + var->begin_scope);
+	dwarf2_write_address (debug->f, minfo->method_info.code_start + var->end_scope);
+}
+
+static void 
+write_method_lines_dwarf2 (MonoDebugHandle *debug, DebugMethodInfo *minfo)
+{
+	guint32 st_line = 0;
+	gpointer st_address = 0;
+	int i;
+
+	if (!minfo->line_numbers)
+		return;
+
+	// Start of statement program
+	dwarf2_write_dw_lns_set_file (debug->f, minfo->source_file);
+	dwarf2_write_dw_lns_advance_line (debug->f, minfo->start_line - 1);
+	dwarf2_write_dw_lne_set_address (debug->f, minfo->method_info.code_start);
+	dwarf2_write_dw_lns_negate_stmt (debug->f);
+	dwarf2_write_dw_lns_copy (debug->f);
+
+	st_line = minfo->start_line;
+	st_address = minfo->method_info.code_start;
+
+	for (i = 1; i < minfo->line_numbers->len; i++) {
+		DebugLineNumberInfo *lni = g_ptr_array_index (minfo->line_numbers, i);
+		gint32 line_inc, addr_inc, opcode;
+		int used_standard_opcode = 0;
+
+		line_inc = lni->line - st_line;
+		addr_inc = (char *)lni->address - (char *)st_address;
+
+		if (addr_inc < 0) {
+			dwarf2_write_dw_lne_set_address (debug->f, lni->address);
+			used_standard_opcode = 1;
+		} else if (addr_inc && !line_inc) {
+			dwarf2_write_dw_lns_advance_pc (debug->f, addr_inc);
+			used_standard_opcode = 1;
+		}
+
+		if ((line_inc < 0) || (line_inc >= line_range)) {
+			dwarf2_write_dw_lns_advance_pc (debug->f, addr_inc);
+			dwarf2_write_dw_lns_advance_line (debug->f, line_inc);
+			used_standard_opcode = 1;
+		} else if (line_inc > 0) {
+			opcode = (line_inc - 1) + (line_range * addr_inc) + opcode_base;
+			g_assert (opcode >= 0);
+
+			if (opcode >= 256) {
+				dwarf2_write_dw_lns_advance_pc (debug->f, addr_inc);
+				dwarf2_write_dw_lns_advance_line (debug->f, line_inc);
+				used_standard_opcode = 1;
+			} else
+				dwarf2_write_byte (debug->f, opcode);
+		}
+
+		if (used_standard_opcode)
+			dwarf2_write_dw_lns_copy (debug->f);
+
+		st_line += line_inc;
+		st_address = (char *)st_address + addr_inc;
+	}
+
+	dwarf2_write_dw_lne_set_address (debug->f,
+					 (char *)minfo->method_info.code_start +
+					 minfo->method_info.epilogue_begin);
+	dwarf2_write_dw_lns_advance_line (debug->f, minfo->last_line - st_line);
+	dwarf2_write_dw_lns_copy (debug->f);
+
+	dwarf2_write_dw_lns_copy (debug->f);
+	dwarf2_write_dw_lne_end_sequence (debug->f);
+}
+
+static void
+write_method_lines_func (gpointer key, gpointer value, gpointer user_data)
+{
+	write_method_lines_dwarf2 (user_data, value);
+}
+
+static void
+write_line_numbers (MonoDebugHandle *debug)
+{
+	/* State machine registers. */
+	int i;
+	
+	// Line number information.
+	dwarf2_write_section_start (debug->f, "debug_line");
+	dwarf2_write_label (debug->f, "debug_line_b");
+	dwarf2_write_section_size (debug->f, "DL1", "debug_line_e");
+	dwarf2_write_label (debug->f, "DL1");
+	dwarf2_write_2byte (debug->f, 2);
+	dwarf2_write_section_size (debug->f, "DL2", "DL3");
+	dwarf2_write_label (debug->f, "DL2");
+	// minimum instruction length
+	dwarf2_write_byte (debug->f, 1);
+	// default is statement
+	dwarf2_write_byte (debug->f, 1);
+	// line base
+	dwarf2_write_byte (debug->f, line_base);
+	// line range
+	dwarf2_write_byte (debug->f, line_range);
+	// opcode base
+	dwarf2_write_byte (debug->f, opcode_base);
+	// standard opcode sizes
+	for (i = 1; i < opcode_base; i++)
+		dwarf2_write_byte (debug->f, standard_opcode_sizes [i]);
+	// include directories
+	dwarf2_write_byte (debug->f, 0);
+	// file names
+	for (i = 0; i < debug->source_files->len; i++) {
+		gchar *source_file = g_ptr_array_index (debug->source_files, i);
+		dwarf2_write_string (debug->f, source_file);
+		dwarf2_write_uleb128 (debug->f, 0);
+		dwarf2_write_uleb128 (debug->f, 0);
+		dwarf2_write_uleb128 (debug->f, 0);
+	}
+	// end of list
+	dwarf2_write_byte (debug->f, 0);
+	dwarf2_write_label (debug->f, "DL3");
+
+	g_hash_table_foreach (debug->methods, write_method_lines_func, debug);
+
+	dwarf2_write_label (debug->f, "debug_line_e");
+}
+
+static void
+write_class_dwarf2 (MonoDebugHandle *debug, MonoClass *klass, guint idx)
+{
+	switch (klass->byval_arg.type) {
+	case MONO_TYPE_VOID:
+		dwarf2_write_base_type (debug, idx, DW_ATE_unsigned, 0, "Void");
+		break;
+	case MONO_TYPE_BOOLEAN:
+		dwarf2_write_base_type (debug, idx, DW_ATE_boolean, 1, "Boolean");
+		break;
+	case MONO_TYPE_CHAR:
+		dwarf2_write_base_type (debug, idx, DW_ATE_unsigned_char, 2, "Char");
+		break;
+	case MONO_TYPE_I1:
+		dwarf2_write_base_type (debug, idx, DW_ATE_signed, 1, "SByte");
+		break;
+	case MONO_TYPE_U1:
+		dwarf2_write_base_type (debug, idx, DW_ATE_unsigned, 1, "Byte");
+		break;
+	case MONO_TYPE_I2:
+		dwarf2_write_base_type (debug, idx, DW_ATE_signed, 2, "Int16");
+		break;
+	case MONO_TYPE_U2:
+		dwarf2_write_base_type (debug, idx, DW_ATE_unsigned, 2, "UInt16");
+		break;
+	case MONO_TYPE_I4:
+		dwarf2_write_base_type (debug, idx, DW_ATE_signed, 4, "Int32");
+		break;
+	case MONO_TYPE_U4:
+		dwarf2_write_base_type (debug, idx, DW_ATE_unsigned, 4, "UInt32");
+		break;
+	case MONO_TYPE_I8:
+		dwarf2_write_base_type (debug, idx, DW_ATE_signed, 8, "Int64");
+		break;
+	case MONO_TYPE_U8:
+		dwarf2_write_base_type (debug, idx, DW_ATE_unsigned, 8, "UInt64");
+		break;
+	case MONO_TYPE_R4:
+		dwarf2_write_base_type (debug, idx, DW_ATE_float, 4, "Float");
+		break;
+	case MONO_TYPE_R8:
+		dwarf2_write_base_type (debug, idx, DW_ATE_float, 8, "Double");
+		break;
+	default:
+		dwarf2_write_class (debug, klass, idx);
+		break;
+	}
+}
+
+static void
+write_class (gpointer key, gpointer value, gpointer user_data)
+{
+	write_class_dwarf2 (user_data, key, GPOINTER_TO_INT (value));
+}
+
+static void
+write_method_dwarf2 (MonoDebugHandle *debug, DebugMethodInfo *minfo)
+{
+	int is_external = 0, i;
+	MonoType *ret_type = NULL;
+	gchar **names;
+
+	if (minfo->method_info.method->signature->ret->type != MONO_TYPE_VOID)
+		ret_type = minfo->method_info.method->signature->ret;
+
+	// DW_TAG_subprogram
+	if (ret_type)
+		dwarf2_write_byte (debug->f, ABBREV_SUBPROGRAM_RETVAL);
+	else
+		dwarf2_write_byte (debug->f, ABBREV_SUBPROGRAM);
+	dwarf2_write_string (debug->f, minfo->name);
+	dwarf2_write_byte (debug->f, is_external);
+	dwarf2_write_address (debug->f, minfo->method_info.code_start);
+	dwarf2_write_address (debug->f, (char *)minfo->method_info.code_start + minfo->method_info.code_size);
+	dwarf2_write_byte (debug->f, DW_CC_nocall);
+	if (ret_type) {
+		MonoClass *klass = mono_class_from_mono_type (ret_type);
+		int type_index = mono_debug_get_type (debug, klass);
+		dwarf2_write_type_ref (debug->f, type_index);
+	}
+
+	if (minfo->method_info.method->signature->hasthis)
+		dwarf2_write_parameter (debug, minfo, "this", minfo->method_info.this_var,
+					minfo->method_info.method->klass);
+
+	names = g_new (char *, minfo->method_info.method->signature->param_count);
+	mono_method_get_param_names (minfo->method_info.method, (const char **) names);
+
+	for (i = 0; i < minfo->method_info.num_params; i++) {
+		MonoType *type = minfo->method_info.method->signature->params [i];
+		MonoClass *klass = mono_class_from_mono_type (type);
+
+		dwarf2_write_parameter (debug, minfo, names [i], &minfo->method_info.params [i], klass);
+	}
+
+	g_free (names);
+
+	for (i = 0; i < minfo->method_info.num_locals; i++) {
+		MonoMethodHeader *header = ((MonoMethodNormal*) minfo->method_info.method)->header;
+		MonoClass *klass = mono_class_from_mono_type (header->locals [i]);
+		char name [BUFSIZ];
+
+		sprintf (name, "V_%d", i);
+		dwarf2_write_variable (debug, minfo, name, &minfo->method_info.locals [i], klass);
+	}
+
+	dwarf2_write_byte (debug->f, 0);
+	// DW_TAG_subprogram ends here
+}
+
+static void
+write_method_func (gpointer key, gpointer value, gpointer user_data)
+{
+	write_method_dwarf2 (user_data, value);
+}
+
+void
+mono_debug_write_dwarf2 (MonoDebugHandle *debug)
+{
+	if (!(debug->f = fopen (debug->filename, "w"))) {
+		g_warning ("Can't create dwarf file `%s': %s", debug->filename, g_strerror (errno)); 
+		return;
+	}
+
+	// Produce assembler code which is free of comments and extra whitespaces.
+	fprintf (debug->f, "#NOAPP\n");
+
+	// DWARF 2 Abbreviation table.
+	dwarf2_write_section_start (debug->f, "debug_abbrev");
+	dwarf2_write_label (debug->f, "debug_abbrev");
+
+	dwarf2_write_byte (debug->f, ABBREV_COMPILE_UNIT);
+	dwarf2_write_byte (debug->f, DW_TAG_compile_unit);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_yes);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_language, DW_FORM_data2);
+	dwarf2_write_pair (debug->f, DW_AT_producer, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_stmt_list, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_SUBPROGRAM);
+	dwarf2_write_byte (debug->f, DW_TAG_subprogram);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_yes);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_external, DW_FORM_flag);
+	dwarf2_write_pair (debug->f, DW_AT_low_pc, DW_FORM_addr);
+	dwarf2_write_pair (debug->f, DW_AT_high_pc, DW_FORM_addr);
+	dwarf2_write_pair (debug->f, DW_AT_calling_convention, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_SUBPROGRAM_RETVAL);
+	dwarf2_write_byte (debug->f, DW_TAG_subprogram);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_yes);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_external, DW_FORM_flag);
+	dwarf2_write_pair (debug->f, DW_AT_low_pc, DW_FORM_addr);
+	dwarf2_write_pair (debug->f, DW_AT_high_pc, DW_FORM_addr);
+	dwarf2_write_pair (debug->f, DW_AT_calling_convention, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_BASE_TYPE);
+	dwarf2_write_byte (debug->f, DW_TAG_base_type);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_encoding, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, DW_AT_byte_size, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_FORMAL_PARAMETER);
+	dwarf2_write_byte (debug->f, DW_TAG_formal_parameter);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_ARTIFICIAL_PARAMETER);
+	dwarf2_write_byte (debug->f, DW_TAG_formal_parameter);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, DW_AT_artificial, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_PARAMETER);
+	dwarf2_write_byte (debug->f, DW_TAG_formal_parameter);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, DW_AT_location, DW_FORM_block4);
+	dwarf2_write_pair (debug->f, DW_AT_start_scope, DW_FORM_data4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_LOCAL_VARIABLE);
+	dwarf2_write_byte (debug->f, DW_TAG_variable);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, DW_AT_location, DW_FORM_block4);
+	dwarf2_write_pair (debug->f, DW_AT_start_scope, DW_FORM_addr);
+	dwarf2_write_pair (debug->f, DW_AT_end_scope, DW_FORM_addr);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_TYPE);
+	dwarf2_write_byte (debug->f, DW_TAG_structure_type);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_yes);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_byte_size, DW_FORM_data4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_MEMBER);
+	dwarf2_write_byte (debug->f, DW_TAG_member);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, DW_AT_accessibility, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, DW_AT_data_member_location, DW_FORM_block4);
+	dwarf2_write_pair (debug->f, DW_AT_byte_size, DW_FORM_data4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_STRUCT_ACCESS);
+	dwarf2_write_byte (debug->f, DW_TAG_access_declaration);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_accessibility, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_ENUM_TYPE);
+	dwarf2_write_byte (debug->f, DW_TAG_enumeration_type);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_yes);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_byte_size, DW_FORM_data4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE);
+	dwarf2_write_byte (debug->f, DW_TAG_enumerator);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_const_value, DW_FORM_data4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE_UNSIGNED);
+	dwarf2_write_byte (debug->f, DW_TAG_enumerator);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_const_value, DW_FORM_udata);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_ENUM_VALUE_SIGNED);
+	dwarf2_write_byte (debug->f, DW_TAG_enumerator);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_const_value, DW_FORM_sdata);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_CLASS_TYPE);
+	dwarf2_write_byte (debug->f, DW_TAG_class_type);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_yes);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_byte_size, DW_FORM_data4);
+	dwarf2_write_pair (debug->f, DW_AT_accessibility, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_CLASS_INHERITANCE);
+	dwarf2_write_byte (debug->f, DW_TAG_inheritance);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, DW_AT_accessibility, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_POINTER_TYPE);
+	dwarf2_write_byte (debug->f, DW_TAG_pointer_type);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_CLASS_METHOD);
+	dwarf2_write_byte (debug->f, DW_TAG_subprogram);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_yes);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_accessibility, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, DW_AT_virtuality, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, DW_AT_calling_convention, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_CLASS_METHOD_RETVAL);
+	dwarf2_write_byte (debug->f, DW_TAG_subprogram);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_yes);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_accessibility, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, DW_AT_virtuality, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, DW_AT_calling_convention, DW_FORM_data1);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_SIMPLE_ARRAY);
+	dwarf2_write_byte (debug->f, DW_TAG_array_type);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_ARRAY);
+	dwarf2_write_byte (debug->f, DW_TAG_array_type);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_yes);
+	dwarf2_write_pair (debug->f, DW_AT_name, DW_FORM_string);
+	dwarf2_write_pair (debug->f, DW_AT_type, DW_FORM_ref4);
+	dwarf2_write_pair (debug->f, DW_AT_byte_size, DW_FORM_data4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_byte (debug->f, ABBREV_SUBRANGE);
+	dwarf2_write_byte (debug->f, DW_TAG_subrange_type);
+	dwarf2_write_byte (debug->f, DW_CHILDREN_no);
+	dwarf2_write_pair (debug->f, DW_AT_lower_bound, DW_FORM_data4);
+	dwarf2_write_pair (debug->f, DW_AT_upper_bound, DW_FORM_data4);
+	dwarf2_write_pair (debug->f, DW_AT_count, DW_FORM_data4);
+	dwarf2_write_pair (debug->f, 0, 0);
+
+	dwarf2_write_label (debug->f, "debug_abbrev_e");
+
+	// Line numbers
+	write_line_numbers (debug);
+
+	// Compile unit header
+	dwarf2_write_section_start (debug->f, "debug_info");
+	dwarf2_write_label (debug->f, "debug_info_b");
+	dwarf2_write_section_size (debug->f, "DI1", "debug_info_e");
+	dwarf2_write_label (debug->f, "DI1");
+	dwarf2_write_2byte (debug->f, 2);
+	dwarf2_write_ref4 (debug->f, "debug_abbrev_b");
+	dwarf2_write_byte (debug->f, sizeof (gpointer));
+
+	// DW_TAG_compile_unit
+	dwarf2_write_byte (debug->f, ABBREV_COMPILE_UNIT);
+	dwarf2_write_string (debug->f, debug->name);
+	dwarf2_write_2byte (debug->f, DW_LANG_C_sharp);
+	dwarf2_write_string (debug->f, debug->producer_name);
+	dwarf2_write_ref4 (debug->f, "debug_lines_b");
+
+	// Methods
+	g_hash_table_foreach (debug->methods, write_method_func, debug);
+
+	// Derived types
+	g_hash_table_foreach (debug->type_hash, write_class, debug);
+
+	dwarf2_write_byte (debug->f, 0);
+	// DW_TAG_compile_unit ends here
+
+	dwarf2_write_label (debug->f, "debug_info_e");
+
+	fclose (debug->f);
+	debug->f = NULL;
+
+	if (!(debug->flags & MONO_DEBUG_FLAGS_DONT_ASSEMBLE)) {
+		char *buf;
+
+		/* yes, it's completely unsafe */
+		buf = g_strdup_printf ("as %s -o %s", debug->filename, debug->objfile);
+		system (buf);
+		g_free (buf);
+	}
+}
diff --git a/mono/jit/debug-private.h b/mono/jit/debug-private.h
new file mode 100644
index 00000000000..82a98d4d699
--- /dev/null
+++ b/mono/jit/debug-private.h
@@ -0,0 +1,94 @@
+#ifndef __MONO_JIT_DEBUG_PRIVATE_H__
+#define __MONO_JIT_DEBUG_PRIVATE_H__
+
+#include <mono/metadata/debug-symfile.h>
+
+#include "debug.h"
+
+typedef struct {
+	gpointer address;
+	guint32 line;
+	int is_basic_block;
+	int source_file;
+} DebugLineNumberInfo;
+
+typedef struct _AssemblyDebugInfo AssemblyDebugInfo;
+
+typedef enum {
+	MONO_DEBUG_FLAGS_NONE			= 0,
+	// Don't run the assembler.
+	MONO_DEBUG_FLAGS_DONT_ASSEMBLE		= (1 << 1),
+	// Install the generated *.il files in the assembly dir.
+	MONO_DEBUG_FLAGS_INSTALL_IL_FILES	= (1 << 2),
+	// Don't update the *.il files.
+	MONO_DEBUG_FLAGS_DONT_UPDATE_IL_FILES	= (1 << 3),
+	// Don't create any new *.il files.
+	MONO_DEBUG_FLAGS_DONT_CREATE_IL_FILES	= (1 << 4),
+	// Don't fallback to normal dwarf2.
+	MONO_DEBUG_FLAGS_DONT_FALLBACK		= (1 << 5),
+	// Don't precompile image.
+	MONO_DEBUG_FLAGS_DONT_PRECOMPILE	= (1 << 6),
+	// Update symbol file on exit.
+	MONO_DEBUG_FLAGS_UPDATE_ON_EXIT		= (1 << 7)
+} MonoDebugFlags;
+
+typedef struct {
+	MonoDebugMethodInfo method_info;
+	AssemblyDebugInfo *info;
+	gchar *name;
+	int source_file;
+	guint32 method_number;
+	guint32 start_line;
+	guint32 first_line;
+	guint32 last_line;
+	GPtrArray *line_numbers;
+} DebugMethodInfo;
+
+struct _AssemblyDebugInfo {
+	MonoDebugFormat format;
+	MonoDebugHandle *handle;
+	MonoDebugSymbolFile *symfile;
+	char *name;
+	char *ilfile;
+	char *filename;
+	char *objfile;
+	int source_file;
+	int total_lines;
+	int *mlines;
+	int *moffsets;
+	int nmethods;
+	MonoImage *image;
+	gpointer _priv;
+};
+
+struct _MonoDebugHandle {
+	MonoDebugHandle *next;
+	MonoDebugFormat format;
+	MonoDebugFlags flags;
+	char *name;
+	char *filename;
+	char *objfile;
+	char *producer_name;
+	GHashTable *type_hash;
+	GHashTable *methods;
+	GPtrArray *source_files;
+	int next_idx;
+	int next_klass_idx;
+	int dirty;
+	GList *info;
+	FILE *f;
+};
+
+guint32        mono_debug_get_type                   (MonoDebugHandle* debug, MonoClass *klass);
+
+void           mono_debug_open_assembly_dwarf2_plus  (AssemblyDebugInfo *info);
+
+void           mono_debug_write_assembly_dwarf2_plus (AssemblyDebugInfo *info);
+
+void           mono_debug_close_assembly_dwarf2_plus (AssemblyDebugInfo *info);
+
+void           mono_debug_write_stabs                (MonoDebugHandle *debug);
+
+void           mono_debug_write_dwarf2               (MonoDebugHandle *debug);
+
+#endif /* __MONO_JIT_DEBUG_PRIVATE_H__ */
diff --git a/mono/jit/debug-stabs.c b/mono/jit/debug-stabs.c
new file mode 100644
index 00000000000..40a2e67ac2a
--- /dev/null
+++ b/mono/jit/debug-stabs.c
@@ -0,0 +1,217 @@
+#include <stdlib.h>
+#include <string.h>
+#include <errno.h>
+#include <mono/metadata/class.h>
+#include <mono/metadata/tabledefs.h>
+#include <mono/metadata/tokentype.h>
+#include <mono/jit/codegen.h>
+#include <mono/jit/debug.h>
+
+#include "debug-private.h"
+
+typedef struct {
+	const char *name;
+	const char *spec;
+} BaseTypes;
+
+/*
+ * Not 64 bit clean.
+ * Note: same order of MonoTypeEnum.
+ */
+static BaseTypes
+base_types[] = {
+	{"", NULL},
+	{"Void", "(0,1)"},
+	{"Boolean", ";0;255;"},
+	{"Char", ";0;65535;"},
+	{"SByte", ";-128;127;"},
+	{"Byte", ";0;255;"},
+	{"Int16", ";-32768;32767;"},
+	{"UInt16", ";0;65535;"},
+	{"Int32", ";0020000000000;0017777777777;"},
+	{"UInt32", ";0000000000000;0037777777777;"},
+	{"Int64", ";01000000000000000000000;0777777777777777777777;"},
+	{"UInt64", ";0000000000000;01777777777777777777777;"},
+	{"Single", "r(0,8);4;0;"},
+	{"Double", "r(0,8);8;0;"},
+	{"String", "(0,41)=*(0,42)=xsMonoString:"}, /*string*/
+	{"", }, /*ptr*/
+	{"", }, /*byref*/
+	{"", }, /*valuetype*/
+	{"Class", "(0,44)=*(0,45)=xsMonoObject:"}, /*class*/
+	{"", }, /*unused*/
+	{"Array", }, /*array*/
+	{"", }, /*typedbyref*/
+	{"", }, /*unused*/
+	{"", }, /*unused*/
+	{"IntPtr", ";0020000000000;0017777777777;"},
+	{"UIntPtr", ";0000000000000;0037777777777;"},
+	{"", }, /*unused*/
+	{"FnPtr", "*(0,1)"}, /*fnptr*/
+	{"Object", "(0,47)=*(0,48)=xsMonoObject:"}, /*object*/
+	{"SzArray", "(0,50)=*(0,51))=xsMonoArray:"}, /*szarray*/
+	{NULL, NULL}
+};
+
+static void
+write_method_stabs (MonoDebugHandle *debug, DebugMethodInfo *minfo)
+{
+	int i;
+	MonoMethod *method = minfo->method_info.method;
+	MonoClass *klass = method->klass;
+	MonoMethodSignature *sig = method->signature;
+	char **names = g_new (char*, sig->param_count);
+	gchar *source_file;
+
+	source_file = g_ptr_array_index (debug->source_files, minfo->source_file);
+
+	fprintf (debug->f, ".stabs \"%s\",100,0,0,0\n", source_file);
+
+	fprintf (debug->f, ".stabs \"%s:F(0,%d)\",36,0,%d,%p\n", minfo->name, sig->ret->type,
+		 minfo->start_line, minfo->method_info.code_start);
+
+	/* params */
+	mono_method_get_param_names (method, (const char **)names);
+	if (sig->hasthis)
+		fprintf (debug->f, ".stabs \"this:p(0,%d)=(0,%d)\",160,0,%d,%d\n",
+			 debug->next_idx++, klass->byval_arg.type, minfo->start_line,
+			 minfo->method_info.this_var->offset);
+	for (i = 0; i < minfo->method_info.num_params; i++) {
+		int stack_offset = minfo->method_info.params [i].offset;
+
+		fprintf (debug->f, ".stabs \"%s:p(0,%d)=(0,%d)\",160,0,%d,%d\n",
+			 names [i], debug->next_idx++, sig->params [i]->type,
+			 minfo->start_line, stack_offset);
+	}
+
+	/* local vars */
+	for (i = 0; i < minfo->method_info.num_locals; ++i) {
+		MonoMethodHeader *header = ((MonoMethodNormal*)method)->header;
+		int stack_offset = minfo->method_info.locals [i].offset;
+
+		fprintf (debug->f, ".stabs \"local_%d:(0,%d)=(0,%d)\",128,0,%d,%d\n",
+			 i, debug->next_idx++, header->locals [i]->type, minfo->start_line, stack_offset);
+	}
+
+	if (minfo->line_numbers) {
+		fprintf (debug->f, ".stabn 68,0,%d,%d\n", minfo->start_line, 0);
+		fprintf (debug->f, ".stabn 68,0,%d,%d\n", minfo->first_line, minfo->method_info.prologue_end);
+
+		for (i = 1; i < minfo->line_numbers->len; i++) {
+			DebugLineNumberInfo *lni = g_ptr_array_index (minfo->line_numbers, i);
+
+			fprintf (debug->f, ".stabn 68,0,%d,%d\n", lni->line,
+				 (char *)lni->address - minfo->method_info.code_start);
+		}
+
+		fprintf (debug->f, ".stabn 68,0,%d,%d\n", minfo->last_line, minfo->method_info.epilogue_begin);
+	}
+
+	/* end of function */
+	fprintf (debug->f, ".stabs \"\",36,0,0,%d\n", minfo->method_info.code_size);
+
+	g_free (names);
+	fflush (debug->f);
+}
+
+static void
+get_enumvalue (MonoClass *klass, int idx, char *buf)
+{
+	guint32 const_cols [MONO_CONSTANT_SIZE];
+	const char *ptr;
+	guint32 crow = mono_metadata_get_constant_index (klass->image, MONO_TOKEN_FIELD_DEF | (idx + 1));
+
+	if (!crow) {
+		buf [0] = '0';
+		buf [1] = 0;
+		return;
+	}
+	mono_metadata_decode_row (&klass->image->tables [MONO_TABLE_CONSTANT], crow-1, const_cols, MONO_CONSTANT_SIZE);
+	ptr = mono_metadata_blob_heap (klass->image, const_cols [MONO_CONSTANT_VALUE]);
+	switch (const_cols [MONO_CONSTANT_TYPE]) {
+	case MONO_TYPE_U4:
+	case MONO_TYPE_I4:
+		/* FIXME: add other types... */
+	default:
+		g_snprintf (buf, 64, "%d", *(gint32*)ptr);
+	}
+}
+
+static void
+write_method_func (gpointer key, gpointer value, gpointer user_data)
+{
+	write_method_stabs (user_data, value);
+}
+
+static void
+write_class_stabs (MonoDebugHandle *debug, MonoClass *klass, int idx)
+{
+	char *name;
+	int i;
+	char buf [64];
+
+	/* output enums ...*/
+	if (klass->enumtype) {
+		name = g_strdup_printf ("%s%s%s", klass->name_space, klass->name_space [0]? "_": "", klass->name);
+		fprintf (debug->f, ".stabs \"%s:T%d=e", name, ++debug->next_idx);
+		g_free (name);
+		for (i = 0; i < klass->field.count; ++i) {
+			if (klass->fields [i].type->attrs & FIELD_ATTRIBUTE_LITERAL) {
+				get_enumvalue (klass, klass->field.first + i, buf);
+				fprintf (debug->f, "%s_%s=%s,", klass->name, klass->fields [i].name, buf);
+			}
+		}
+		fprintf (debug->f, ";\",128,0,0,0\n");
+	}
+	fflush (debug->f);
+}
+
+static void
+write_class (gpointer key, gpointer value, gpointer user_data)
+{
+	write_class_stabs (user_data, key, GPOINTER_TO_INT (value));
+}
+
+void
+mono_debug_write_stabs (MonoDebugHandle *debug)
+{
+	gchar *source_file;
+	int i;
+
+	if (!(debug->f = fopen (debug->filename, "w"))) {
+		g_warning ("Can't create stabs file `%s': %s", debug->filename, g_strerror (errno)); 
+		return;
+	}
+
+	source_file = g_ptr_array_index (debug->source_files, 0);
+
+	fprintf (debug->f, ".stabs \"%s\",100,0,0,0\n", source_file);
+
+	for (i = 0; base_types [i].name; ++i) {
+		if (! base_types [i].spec)
+			continue;
+		fprintf (debug->f, ".stabs \"%s:t(0,%d)=", base_types [i].name, i);
+		if (base_types [i].spec [0] == ';') {
+			fprintf (debug->f, "r(0,%d)%s\"", i, base_types [i].spec);
+		} else {
+			fprintf (debug->f, "%s\"", base_types [i].spec);
+		}
+		fprintf (debug->f, ",128,0,0,0\n");
+	}
+
+	g_hash_table_foreach (debug->methods, write_method_func, debug);
+
+	g_hash_table_foreach (debug->type_hash, write_class, debug);
+
+	fclose (debug->f);
+	debug->f = NULL;
+
+	if (!(debug->flags & MONO_DEBUG_FLAGS_DONT_ASSEMBLE)) {
+		char *buf;
+
+		/* yes, it's completely unsafe */
+		buf = g_strdup_printf ("as %s -o %s", debug->filename, debug->objfile);
+		system (buf);
+		g_free (buf);
+	}
+}
diff --git a/mono/jit/debug.c b/mono/jit/debug.c
index ada49bb3505..88761b7efb0 100644
--- a/mono/jit/debug.c
+++ b/mono/jit/debug.c
@@ -1,94 +1,133 @@
 #include <stdlib.h>
 #include <string.h>
+#include <errno.h>
+#include <sys/stat.h>
 #include <mono/metadata/class.h>
 #include <mono/metadata/tabledefs.h>
 #include <mono/metadata/tokentype.h>
 #include <mono/jit/codegen.h>
+#include <mono/jit/debug.h>
 
-typedef struct {
-	FILE *f;
-	char *filename;
-	char *name;
-	int *mlines;
-	int nmethods;
-	int next_idx;
-} AssemblyDebugInfo;
+#include "debug-private.h"
 
-struct _MonoDebugHandle {
-	char *name;
-	GList *info;
-};
+static MonoDebugHandle *mono_debug_handles = NULL;
+static MonoDebugHandle *mono_default_debug_handle = NULL;
 
-#include "debug.h"
-
-typedef struct {
-	char *name;
-	char *spec;
-} BaseTypes;
-
-/*
- * Not 64 bit clean.
- * Note: same order of MonoTypeEnum.
- */
-static BaseTypes
-base_types[] = {
-	{"", NULL},
-	{"Void", "(0,1)"},
-	{"Boolean", ";0;255;"},
-	{"Char", ";0;65535;"},
-	{"SByte", ";-128;127;"},
-	{"Byte", ";0;255;"},
-	{"Int16", ";-32768;32767;"},
-	{"UInt16", ";0;65535;"},
-	{"Int32", ";0020000000000;0017777777777;"},
-	{"UInt32", ";0000000000000;0037777777777;"},
-	{"Int64", ";01000000000000000000000;0777777777777777777777;"},
-	{"UInt64", ";0000000000000;01777777777777777777777;"},
-	{"Single", "r(0,8);4;0;"},
-	{"Double", "r(0,8);8;0;"},
-	{"String", "(0,41)=*(0,42)=xsMonoString:"}, /*string*/
-	{"", }, /*ptr*/
-	{"", }, /*byref*/
-	{"", }, /*valuetype*/
-	{"Class", "(0,44)=*(0,45)=xsMonoObject:"}, /*class*/
-	{"", }, /*unused*/
-	{"Array", }, /*array*/
-	{"", }, /*typedbyref*/
-	{"", }, /*unused*/
-	{"", }, /*unused*/
-	{"IntPtr", ";0020000000000;0017777777777;"},
-	{"UIntPtr", ";0000000000000;0037777777777;"},
-	{"", }, /*unused*/
-	{"FnPtr", "*(0,1)"}, /*fnptr*/
-	{"Object", "(0,47)=*(0,48)=xsMonoObject:"}, /*object*/
-	{"SzArray", "(0,50)=*(0,51))=xsMonoArray:"}, /*szarray*/
-	{NULL, NULL}
-};
+static void
+free_method_info (DebugMethodInfo *minfo)
+{
+	if (minfo->line_numbers)
+		g_ptr_array_free (minfo->line_numbers, TRUE);
+	g_free (minfo->method_info.params);
+	g_free (minfo->method_info.locals);
+	g_free (minfo);
+}
 
 static void
-output_std_stuff (AssemblyDebugInfo* debug)
+debug_arg_warning (const char *message)
 {
-	int i;
-	for (i = 0; base_types [i].name; ++i) {
-		if (! base_types [i].spec)
-			continue;
-		fprintf (debug->f, ".stabs \"%s:t(0,%d)=", base_types [i].name, i);
-		if (base_types [i].spec [0] == ';') {
-			fprintf (debug->f, "r(0,%d)%s\"", i, base_types [i].spec);
-		} else {
-			fprintf (debug->f, "%s\"", base_types [i].spec);
-		}
-		fprintf (debug->f, ",128,0,0,0\n");
-	}
+	g_warning ("Error while processing --debug-args arguments: %s", message);
 }
 
 MonoDebugHandle*
-mono_debug_open_file (char *filename)
+mono_debug_open (MonoAssembly *assembly, MonoDebugFormat format, const char **args)
 {
 	MonoDebugHandle *debug;
+	const char **ptr;
 	
 	debug = g_new0 (MonoDebugHandle, 1);
-	debug->name = g_strdup (filename);
+	debug->name = g_strdup (assembly->image->name);
+	debug->format = format;
+	debug->producer_name = g_strdup_printf ("Mono JIT compiler version %s", VERSION);
+	debug->next_idx = 100;
+	debug->dirty = TRUE;
+
+	debug->type_hash = g_hash_table_new (NULL, NULL);
+	debug->methods = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+						NULL, (GDestroyNotify) free_method_info);
+	debug->source_files = g_ptr_array_new ();
+
+	for (ptr = args; ptr && *ptr; ptr++) {
+		const char *arg = *ptr;
+		gchar *message;
+
+		switch (debug->format) {
+		case MONO_DEBUG_FORMAT_STABS:
+		case MONO_DEBUG_FORMAT_DWARF2:
+			if (!strncmp (arg, "filename=", 9)) {
+				if (debug->filename)
+					debug_arg_warning ("The `filename' argument can be given only once.");
+				debug->filename = g_strdup (arg + 9);
+				continue;
+			} else if (!strncmp (arg, "objfile=", 8)) {
+				if (debug->objfile)
+					debug_arg_warning ("The `objfile' argument can be given only once.");
+				debug->objfile = g_strdup (arg + 8);
+				continue;
+			} else if (!strcmp (arg, "install_il_files")) {
+				debug->flags |= MONO_DEBUG_FLAGS_INSTALL_IL_FILES;
+				continue;
+			} else if (!strcmp (arg, "dont_update_il_files")) {
+				debug->flags |= MONO_DEBUG_FLAGS_DONT_UPDATE_IL_FILES;
+				continue;
+			} else if (!strcmp (arg, "dont_create_il_files")) {
+				debug->flags |= MONO_DEBUG_FLAGS_DONT_CREATE_IL_FILES;
+				continue;
+			}
+			break;
+		case MONO_DEBUG_FORMAT_DWARF2_PLUS:
+			if (!strcmp (arg, "dont_fallback")) {
+				debug->flags |= MONO_DEBUG_FLAGS_DONT_FALLBACK;
+				continue;
+			} else if (!strcmp (arg, "dont_precompile")) {
+				debug->flags |= MONO_DEBUG_FLAGS_DONT_PRECOMPILE;
+				continue;
+			}
+			break;
+		default:
+			break;
+		}
+
+		if (!strcmp (arg, "dont_assemble")) {
+			debug->flags |= MONO_DEBUG_FLAGS_DONT_ASSEMBLE;
+			continue;
+		} else if (!strcmp (arg, "update_on_exit")) {
+			debug->flags |= MONO_DEBUG_FLAGS_UPDATE_ON_EXIT;
+			continue;
+		}
+
+		message = g_strdup_printf ("Unknown argument `%s'.", arg);
+		debug_arg_warning (message);
+		g_free (message);
+	}
+
+	switch (debug->format) {
+	case MONO_DEBUG_FORMAT_STABS:
+		if (!debug->filename)
+			debug->filename = g_strdup_printf ("%s-stabs.s", g_basename (debug->name));
+		if (!debug->objfile)
+			debug->objfile = g_strdup_printf ("%s.o", g_basename (debug->name));
+		break;
+	case MONO_DEBUG_FORMAT_DWARF2:
+		if (!debug->filename)
+			debug->filename = g_strdup_printf ("%s-dwarf.s", g_basename (debug->name));
+		if (!debug->objfile)
+			debug->objfile = g_strdup_printf ("%s.o", g_basename (debug->name));
+		break;
+	case MONO_DEBUG_FORMAT_DWARF2_PLUS:
+		if (!mono_default_debug_handle && !(debug->flags & MONO_DEBUG_FLAGS_DONT_FALLBACK))
+			mono_debug_open (assembly, MONO_DEBUG_FORMAT_DWARF2, NULL);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+
+	debug->next = mono_debug_handles;
+	mono_debug_handles = debug;
+
+	if (!mono_default_debug_handle && (debug->format != MONO_DEBUG_FORMAT_DWARF2_PLUS))
+		mono_default_debug_handle = debug;
+
 	return debug;
 }
 
@@ -98,221 +137,718 @@ debug_load_method_lines (AssemblyDebugInfo* info)
 	FILE *f;
 	char buf [1024];
 	int i, mnum;
-	char *name = g_strdup_printf ("%s.il", info->name);
+	int offset = -1;
+
+	if (!(info->handle->flags & MONO_DEBUG_FLAGS_DONT_UPDATE_IL_FILES)) {
+		char *command = g_strdup_printf ("monodis --output=%s %s",
+						 info->ilfile, info->image->name);
+		struct stat stata, statb;
+		int need_update = FALSE;
+
+		if (stat (info->image->name, &stata)) {
+			g_warning ("cannot access assembly file (%s): %s",
+				   info->image->name, g_strerror (errno));
+			g_free (command);
+			return;
+		}
+
+		/* If the stat() failed or the file is older. */
+		if (stat (info->ilfile, &statb)) {
+			/* Don't create any new *.il files if the user told us not to do so. */
+			if (!(info->handle->flags & MONO_DEBUG_FLAGS_DONT_CREATE_IL_FILES))
+				need_update = TRUE;
+		} else if (statb.st_mtime < stata.st_mtime)
+			need_update = TRUE;
+
+		if (need_update) {
+			g_print ("Recreating %s from %s.\n", info->ilfile, info->image->name);
+			if (system (command)) {
+				g_warning ("cannot create IL assembly file (%s): %s",
+					   command, g_strerror (errno));
+				g_free (command);
+				return;
+			}
+		}
+	}
 
 	/* use an env var with directories for searching. */
-	if (!(f = fopen (name, "r"))) {
-		g_warning ("cannot open IL assembly file %s", name);
-		g_free (name);
+	if (!(f = fopen (info->ilfile, "r"))) {
+		g_warning ("cannot open IL assembly file %s", info->ilfile);
 		return;
 	}
-	g_free (name);
+
+	info->total_lines = 100;
+	info->moffsets = g_malloc (info->total_lines * sizeof (int));
+
 	i = 0;
 	while (fgets (buf, sizeof (buf), f)) {
-		i++;
-		if (sscanf (buf, " // method line %d", &mnum) && mnum < info->nmethods) {
-			while (fgets (buf, sizeof (buf), f)) {
-				++i;
-				if (strstr (buf, "}"))
-					break; /* internalcall or runtime method */
-				if (strstr (buf, "IL_0000:"))
-					break;
+		int pos = i;
+
+		info->moffsets [i++] = offset;
+		if (i + 2 >= info->total_lines) {
+			info->total_lines += 100;
+			info->moffsets = g_realloc (info->moffsets, info->total_lines * sizeof (int));
+			g_assert (info->moffsets);
+		}
+
+		if (!sscanf (buf, " // method line %d", &mnum))
+			continue;
+
+		offset = 0;
+
+		if (mnum >= info->nmethods)
+			break;
+
+		while (fgets (buf, sizeof (buf), f)) {
+			int newoffset;
+
+			++i;
+			if (i + 2 >= info->total_lines) {
+				info->total_lines += 100;
+				info->moffsets = g_realloc (info->moffsets, info->total_lines * sizeof (int));
+				g_assert (info->moffsets);
 			}
-			/* g_print ("method %d found at %d\n", mnum, i); */
-			info->mlines [mnum] = i;
+
+			if (strstr (buf, "}")) {
+				offset = -1;
+				break;
+			}
+
+			if (sscanf (buf, " IL_%x:", &newoffset)) {
+				offset = newoffset;
+				if (!offset)
+					pos = i;
+			}
+
+			info->moffsets [i] = offset;
 		}
+		/* g_print ("method %d found at %d\n", mnum, pos); */
+		info->mlines [mnum] = pos;
 	}
 	fclose (f);
 }
 
-static AssemblyDebugInfo*
-mono_debug_open_ass (MonoDebugHandle* handle, MonoImage *image)
+static void
+record_line_number (DebugMethodInfo *minfo, gpointer address, guint32 line, int is_basic_block)
+{
+	DebugLineNumberInfo *lni = g_new0 (DebugLineNumberInfo, 1);
+
+	lni->address = address;
+	lni->line = line;
+	lni->is_basic_block = is_basic_block;
+	lni->source_file = minfo->source_file;
+
+	g_ptr_array_add (minfo->line_numbers, lni);
+}
+
+static void
+record_il_offset (GPtrArray *array, guint32 offset, guint32 address)
+{
+	MonoDebugILOffsetInfo *info = g_new0 (MonoDebugILOffsetInfo, 1);
+
+	info->offset = offset;
+	info->address = address;
+
+	g_ptr_array_add (array, info);
+}
+
+static void
+debug_generate_method_lines (AssemblyDebugInfo *info, DebugMethodInfo *minfo, MonoFlowGraph* cfg)
+{
+	guint32 st_address, st_line;
+	GPtrArray *il_offsets;
+	int i;
+
+	il_offsets = g_ptr_array_new ();
+	minfo->line_numbers = g_ptr_array_new ();
+
+	st_line = minfo->first_line;
+	st_address = minfo->method_info.prologue_end;
+
+	/* record_line_number takes absolute memory addresses. */
+	record_line_number (minfo, minfo->method_info.code_start, minfo->start_line, FALSE);
+	/* record_il_offsets uses offsets relative to minfo->method_info.code_start. */
+	record_il_offset (il_offsets, 0, st_address);
+
+	/* This is the first actual code line of the method. */
+	record_line_number (minfo, minfo->method_info.code_start + st_address, st_line, TRUE);
+
+	/* start lines of basic blocks */
+	for (i = 0; i < cfg->block_count; ++i) {
+		int j;
+
+		for (j = 0; cfg->bblocks [i].forest && (j < cfg->bblocks [i].forest->len); ++j) {
+			MBTree *t = (MBTree *) g_ptr_array_index (cfg->bblocks [i].forest, j);
+			gint32 line_inc = 0, addr_inc;
+
+			if (!i && !j) {
+				st_line = minfo->first_line;
+				st_address = t->addr;
+
+				record_line_number (minfo, cfg->start + st_address, st_line, TRUE);
+			}
+
+			addr_inc = t->addr - st_address;
+			st_address += addr_inc;
+
+			if (t->cli_addr != -1)
+				record_il_offset (il_offsets, t->cli_addr, st_address);
+
+			if (!info->moffsets)
+				continue;
+
+
+			if (t->cli_addr != -1) {
+				int *lines = info->moffsets + st_line;
+				int *k = lines;
+
+				while ((*k != -1) && (*k < t->cli_addr))
+					k++;
+
+				line_inc = k - lines;
+			}
+
+			st_line += line_inc;
+
+			record_line_number (minfo, minfo->method_info.code_start + st_address,
+					    st_line, j == 0);
+		}
+	}
+
+	minfo->method_info.num_il_offsets = il_offsets->len;
+	minfo->method_info.il_offsets = g_new0 (MonoDebugILOffsetInfo, il_offsets->len);
+	for (i = 0; i < il_offsets->len; i++) {
+		MonoDebugILOffsetInfo *il = (MonoDebugILOffsetInfo *) g_ptr_array_index (il_offsets, i);
+
+		minfo->method_info.il_offsets [i] = *il;
+	}
+
+	g_ptr_array_free (il_offsets, TRUE);
+}
+
+static AssemblyDebugInfo *
+mono_debug_get_image (MonoDebugHandle* debug, MonoImage *image)
 {
 	GList *tmp;
-	AssemblyDebugInfo* info;
+	AssemblyDebugInfo *info;
+
+	if (debug->format == MONO_DEBUG_FORMAT_NONE)
+		return NULL;
 
-	for (tmp = handle->info; tmp; tmp = tmp->next) {
+	for (tmp = debug->info; tmp; tmp = tmp->next) {
 		info = (AssemblyDebugInfo*)tmp->data;
-		if (strcmp (info->name, image->assembly_name) == 0)
+
+		if (info->image == image)
 			return info;
 	}
+
+	return NULL;
+}
+
+static AssemblyDebugInfo *
+mono_debug_open_image (MonoDebugHandle* debug, MonoImage *image)
+{
+	AssemblyDebugInfo *info;
+
+	info = mono_debug_get_image (debug, image);
+	if (info != NULL)
+		return info;
+
+	debug->dirty = TRUE;
+
 	info = g_new0 (AssemblyDebugInfo, 1);
-	info->filename = g_strdup_printf ("%s-stabs.s", image->assembly_name);
-	if (!(info->f = fopen (info->filename, "w"))) {
-		g_free (info->filename);
-		g_free (info);
-		return NULL;
-	}
+	info->image = image;
+	info->image->ref_count++;
 	info->name = g_strdup (image->assembly_name);
+	info->format = debug->format;
+	info->handle = debug;
+
+	info->source_file = debug->source_files->len;
+	g_ptr_array_add (debug->source_files, g_strdup_printf ("%s.il", image->assembly_name));
 
-	fprintf (info->f, ".stabs \"%s.il\",100,0,0,0\n", image->assembly_name);
-	output_std_stuff (info);
-	info->next_idx = 100;
-	handle->info = g_list_prepend (handle->info, info);
+	debug->info = g_list_prepend (debug->info, info);
 
 	info->nmethods = image->tables [MONO_TABLE_METHOD].rows + 1;
 	info->mlines = g_new0 (int, info->nmethods);
-	debug_load_method_lines (info);
+
+	switch (info->format) {
+	case MONO_DEBUG_FORMAT_STABS:
+	case MONO_DEBUG_FORMAT_DWARF2:
+		if (debug->flags & MONO_DEBUG_FLAGS_INSTALL_IL_FILES) {
+			gchar *dirname = g_path_get_dirname (image->name);
+			info->ilfile = g_strdup_printf ("%s/%s.il", dirname, info->name);
+			g_free (dirname);
+		} else
+			info->ilfile = g_strdup_printf ("%s.il", info->name);
+		break;
+	case MONO_DEBUG_FORMAT_DWARF2_PLUS: {
+		gchar *dirname = g_path_get_dirname (image->name);
+		info->filename = g_strdup_printf ("%s/%s-debug.s", dirname, info->name);
+		info->objfile = g_strdup_printf ("%s-debug.o", info->name);
+		mono_debug_open_assembly_dwarf2_plus (info);
+		g_free (dirname);
+		break;
+	}
+	default:
+		break;
+	}
+
+	if (debug->format != MONO_DEBUG_FORMAT_DWARF2_PLUS)
+		debug_load_method_lines (info);
+
 	return info;
 }
 
 void
-mono_debug_make_symbols (MonoDebugHandle* debug)
+mono_debug_add_image (MonoDebugHandle* debug, MonoImage *image)
+{
+	mono_debug_open_image (debug, image);
+}
+
+void
+mono_debug_write_symbols (MonoDebugHandle *debug)
 {
 	GList *tmp;
-	char *buf;
-	AssemblyDebugInfo* info;
 
-	for (tmp = debug->info; tmp; tmp = tmp->next) {
-		info = (AssemblyDebugInfo*)tmp->data;
-		/* yes, it's completely unsafe */
-		buf = g_strdup_printf ("as %s -o /tmp/%s.o", info->filename, info->name);
-		fflush (info->f);
-		system (buf);
-		g_free (buf);
+	if (!debug || !debug->dirty)
+		return;
+
+	switch (debug->format) {
+	case MONO_DEBUG_FORMAT_STABS:
+		mono_debug_write_stabs (debug);
+		break;
+	case MONO_DEBUG_FORMAT_DWARF2:
+		mono_debug_write_dwarf2 (debug);
+		break;
+	case MONO_DEBUG_FORMAT_DWARF2_PLUS:
+		for (tmp = debug->info; tmp; tmp = tmp->next) {
+			AssemblyDebugInfo *info = (AssemblyDebugInfo*)tmp->data;
+
+			mono_debug_write_assembly_dwarf2_plus (info);
+		}
+		break;
+	default:
+		g_assert_not_reached ();
 	}
+
+	debug->dirty = FALSE;
+}
+
+void
+mono_debug_make_symbols (void)
+{
+	MonoDebugHandle *debug;
+
+	for (debug = mono_debug_handles; debug; debug = debug->next)
+		mono_debug_write_symbols (debug);
 }
 
 static void
-mono_debug_close_ass (AssemblyDebugInfo* debug)
+mono_debug_close_assembly (AssemblyDebugInfo* info)
 {
-	fclose (debug->f);
-	g_free (debug->mlines);
-	g_free (debug->name);
-	g_free (debug->filename);
-	g_free (debug);
+	switch (info->format) {
+	case MONO_DEBUG_FORMAT_DWARF2_PLUS:
+		mono_debug_close_assembly_dwarf2_plus (info);
+		break;
+	default:
+		break;
+	}
+	g_free (info->mlines);
+	g_free (info->moffsets);
+	g_free (info->name);
+	g_free (info->ilfile);
+	g_free (info->filename);
+	g_free (info->objfile);
+	g_free (info);
 }
 
 void
-mono_debug_close (MonoDebugHandle* debug)
+mono_debug_cleanup (void)
 {
-	GList *tmp;
-	AssemblyDebugInfo* info;
+	MonoDebugHandle *debug, *temp;
 
-	for (tmp = debug->info; tmp; tmp = tmp->next) {
-		info = (AssemblyDebugInfo*)tmp->data;
-		mono_debug_close_ass (info);
+	for (debug = mono_debug_handles; debug; debug = temp) {
+		GList *tmp;
+
+		if (debug->flags & MONO_DEBUG_FLAGS_UPDATE_ON_EXIT)
+			mono_debug_write_symbols (debug);
+
+
+		for (tmp = debug->info; tmp; tmp = tmp->next) {
+			AssemblyDebugInfo* info = (AssemblyDebugInfo*)tmp->data;
+
+			mono_debug_close_assembly (info);
+		}
+
+		g_ptr_array_free (debug->source_files, TRUE);
+		g_hash_table_destroy (debug->methods);
+		g_hash_table_destroy (debug->type_hash);
+		g_free (debug->producer_name);
+		g_free (debug->name);
+
+		temp = debug->next;
+		g_free (debug);
 	}
-	g_free (debug->name);
-	g_free (debug);
+
+	mono_debug_handles = NULL;
+	mono_default_debug_handle = NULL;
 }
 
-void
-mono_debug_add_method (MonoDebugHandle* debug, MonoFlowGraph *cfg)
+guint32
+mono_debug_get_type (MonoDebugHandle *debug, MonoClass *klass)
+{
+	guint index, i;
+
+	mono_class_init (klass);
+
+	index = GPOINTER_TO_INT (g_hash_table_lookup (debug->type_hash, klass));
+	if (index)
+		return index;
+
+	debug->dirty = TRUE;
+
+	index = ++debug->next_klass_idx;
+	g_hash_table_insert (debug->type_hash, klass, GINT_TO_POINTER (index));
+
+	if (klass->enumtype)
+		return index;
+
+	switch (klass->byval_arg.type) {
+	case MONO_TYPE_CLASS:
+		if (klass->parent)
+			mono_debug_get_type (debug, klass->parent);
+
+		for (i = 0; i < klass->method.count; i++) {
+			MonoMethod *method = klass->methods [i];
+			MonoType *ret_type = NULL;
+			int j;
+
+			if (method->signature->ret->type != MONO_TYPE_VOID)
+				ret_type = method->signature->ret;
+
+			if (ret_type) {
+				MonoClass *ret_klass = mono_class_from_mono_type (ret_type);
+				mono_debug_get_type (debug, ret_klass);
+			}
+
+			for (j = 0; j < method->signature->param_count; j++) {
+				MonoType *sub_type = method->signature->params [j];
+				MonoClass *sub_klass = mono_class_from_mono_type (sub_type);
+				mono_debug_get_type (debug, sub_klass);
+			}
+		}
+		// fall through
+	case MONO_TYPE_VALUETYPE:
+		for (i = 0; i < klass->field.count; i++) {
+			MonoClass *subclass = mono_class_from_mono_type (klass->fields [i].type);
+			mono_debug_get_type (debug, subclass);
+		}
+		break;
+	case MONO_TYPE_ARRAY:
+	case MONO_TYPE_SZARRAY:
+		mono_debug_get_type (debug, klass->element_class);
+		break;
+	default:
+		break;
+	}
+
+	return index;
+}
+
+MonoDebugHandle *
+mono_debug_handle_from_class (MonoClass *klass)
+{
+	MonoDebugHandle *debug;
+
+	mono_class_init (klass);
+
+	for (debug = mono_debug_handles; debug; debug = debug->next) {
+		GList *tmp;
+
+		for (tmp = debug->info; tmp; tmp = tmp->next) {
+			AssemblyDebugInfo *info = (AssemblyDebugInfo*)tmp->data;
+
+			if (info->image == klass->image)
+				return debug;
+		}
+	}
+
+	return NULL;
+}
+
+static gint32
+il_offset_from_address (DebugMethodInfo *minfo, guint32 address)
+{
+	int i;
+
+	for (i = 0; i < minfo->method_info.num_il_offsets; i++) {
+		MonoDebugILOffsetInfo *ilo = &minfo->method_info.il_offsets [i];
+
+		if (ilo->address > address)
+			return ilo->offset;
+	}
+
+	return -1;
+}
+
+static gint32
+address_from_il_offset (DebugMethodInfo *minfo, guint32 il_offset)
 {
-	char *name;
-	int line = 0;
 	int i;
+
+	for (i = 0; i < minfo->method_info.num_il_offsets; i++) {
+		MonoDebugILOffsetInfo *ilo = &minfo->method_info.il_offsets [i];
+
+		if (ilo->offset > il_offset)
+			return ilo->address;
+	}
+
+	return -1;
+}
+
+void
+mono_debug_add_type (MonoClass *klass)
+{
+	MonoDebugHandle *debug = mono_debug_handle_from_class (klass);
+
+	g_assert (debug != NULL);
+
+	mono_debug_get_type (debug, klass);
+}
+
+static gint32
+il_offset_from_position (MonoFlowGraph *cfg, MonoPosition *pos)
+{
+	MonoBBlock *bblock;
+	MBTree *tree;
+
+	if (pos->abs_pos == 0)
+		return -1;
+
+	if (pos->pos.bid >= cfg->block_count)
+		return -1;
+
+	bblock = &cfg->bblocks [pos->pos.bid];
+	if (pos->pos.tid >= bblock->forest->len)
+		return -1;
+
+	tree = (MBTree *) g_ptr_array_index (bblock->forest, pos->pos.tid);
+
+	return tree->cli_addr;
+}
+
+void
+mono_debug_add_method (MonoFlowGraph *cfg)
+{
 	MonoMethod *method = cfg->method;
 	MonoClass *klass = method->klass;
-	MonoMethodSignature *sig = method->signature;
-	char **names = g_new (char*, sig->param_count);
-	AssemblyDebugInfo* info = mono_debug_open_ass (debug, klass->image);
+	int method_number = 0, line = 0, start_line = 0, end_line = 0, i;
+	MonoDebugHandle* debug;
+	AssemblyDebugInfo* info;
+	DebugMethodInfo *minfo;
+	char *name;
+
+	mono_class_init (klass);
 
-	/* FIXME: we should mangle the name better */
-	name = g_strdup_printf ("%s%s%s__%s_%p", klass->name_space, klass->name_space [0]? "_": "",
-			klass->name, method->name, method);
+	debug = mono_debug_handle_from_class (klass);
+	if (!debug) {
+		if (mono_default_debug_handle)
+			debug = mono_default_debug_handle;
+		else
+			return;
+	}
 
-	for (i = 0; name [i]; ++i)
-		if (name [i] == '.') name [i] = '_';
+	info = mono_debug_open_image (debug, klass->image);
 
-	mono_class_init (klass);
 	/*
 	 * Find the method index in the image.
 	 */
 	for (i = 0; klass->methods && i < klass->method.count; ++i) {
 		if (klass->methods [i] == method) {
-			line = info->mlines [klass->method.first + i + 1];
-			/*g_print ("method %d found at line %d\n", klass->method.first + i + 1, line);*/
+			method_number = klass->method.first + i + 1;
+			line = info->mlines [method_number];
 			break;
 		}
 	}
 
-	/*
-	 * We need to output all the basic info, if we change filename...
-	 * fprintf (info->f, ".stabs \"%s.il\",100,0,0,0\n", klass->image->assembly_name);
-	 */
-	fprintf (info->f, ".stabs \"%s:F(0,%d)\",36,0,%d,%p\n", name, sig->ret->type, line, cfg->start);
-
-	/* params */
-	mono_method_get_param_names (cfg->method, (const char **)names);
-	if (sig->hasthis)
-		fprintf (info->f, ".stabs \"this:p(0,%d)=(0,%d)\",160,0,%d,%d\n", info->next_idx++, klass->byval_arg.type, line, 8); /* FIXME */
-	for (i = 0; i < sig->param_count; ++i) {
-		int stack_offset = g_array_index (cfg->varinfo, MonoVarInfo, cfg->args_start_index + i + sig->hasthis).offset;
-		fprintf (info->f, ".stabs \"%s:p(0,%d)=(0,%d)\",160,0,%d,%d\n", names [i], info->next_idx++, sig->params [i]->type, line, stack_offset);
+	if (g_hash_table_lookup (debug->methods, method))
+		return;
+
+	debug->dirty = TRUE;
+
+	if (info->moffsets) {
+		/* info->moffsets contains -1 "outside" of functions. */
+		for (i = line; (i > 0) && (info->moffsets [i] == 0); i--)
+			;
+		start_line = i + 1;
+
+		for (i = start_line; info->moffsets [i] != -1; i++)
+			;
+		end_line = i;
 	}
-	/* local vars */
+
+	name = g_strdup_printf ("%s%s%s.%s", klass->name_space, klass->name_space [0]? ".": "",
+				klass->name, method->name);
+
+	minfo = g_new0 (DebugMethodInfo, 1);
+	minfo->name = name;
+	minfo->start_line = start_line;
+	minfo->first_line = line;
+	minfo->last_line = end_line;
+	minfo->source_file = info->source_file;
+	minfo->info = info;
+	minfo->method_info.code_start = cfg->start;
+	minfo->method_info.code_size = cfg->epilogue_end;
+	minfo->method_number = method_number;
+	minfo->method_info.method = method;
+	minfo->method_info.num_params = method->signature->param_count;
+	minfo->method_info.params = g_new0 (MonoDebugVarInfo, minfo->method_info.num_params);
+	minfo->method_info.prologue_end = cfg->prologue_end;
+	minfo->method_info.epilogue_begin = cfg->epilog;
+
+	if (method->signature->hasthis) {
+		MonoVarInfo *ptr = ((MonoVarInfo *) cfg->varinfo->data) + cfg->args_start_index;
+
+		minfo->method_info.this_var = g_new0 (MonoDebugVarInfo, 1);
+		minfo->method_info.this_var->offset = ptr->offset;
+	}
+
+	for (i = 0; i < minfo->method_info.num_params; i++) {
+		MonoVarInfo *ptr = ((MonoVarInfo *) cfg->varinfo->data) + cfg->args_start_index +
+			method->signature->hasthis;
+
+		minfo->method_info.params [i].offset = ptr [i].offset;
+	}
+
+	debug_generate_method_lines (info, minfo, cfg);
+
 	if (!method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME)) {
 		MonoMethodHeader *header = ((MonoMethodNormal*)method)->header;
-		for (i = 0; i < header->num_locals; ++i) {
-			int stack_offset = g_array_index (cfg->varinfo, MonoVarInfo, cfg->locals_start_index + i).offset;
-			fprintf (info->f, ".stabs \"local_%d:(0,%d)=(0,%d)\",128,0,%d,%d\n", i, info->next_idx++, header->locals [i]->type, line, stack_offset);
-		}
-	}
-	/* start lines of basic blocks */
-	for (i = 0; i < cfg->block_count; ++i) {
-		int j;
-		for (j = 0; j < cfg->bblocks [i].forest->len; ++j) {
-			MBTree *t = (MBTree *) g_ptr_array_index (cfg->bblocks [i].forest, j);
-			fprintf (info->f, ".stabn 68,0,%d,%d\n", line + t->cli_addr, t->addr);
+		MonoVarInfo *ptr = ((MonoVarInfo *) cfg->varinfo->data) + cfg->locals_start_index;
+		MonoDebugVarInfo *locals;
+
+		locals = g_new0 (MonoDebugVarInfo, header->num_locals);
+		for (i = 0; i < header->num_locals; i++) {
+			gint32 begin_offset, end_offset;
+			gint32 begin_scope, end_scope;
+
+			if (ptr [i].reg >= 0) {
+				locals [i].index = ptr [i].reg | MONO_DEBUG_VAR_ADDRESS_MODE_REGISTER;
+				locals [i].offset = 0;
+			} else
+				locals [i].offset = ptr [i].offset;
+
+			begin_offset = il_offset_from_position (cfg, &ptr [i].range.first_use);
+			end_offset = il_offset_from_position (cfg, &ptr [i].range.last_use);
+			if (end_offset >= 0)
+				end_offset++;
+
+			begin_scope = address_from_il_offset (minfo, begin_offset);
+			end_scope = address_from_il_offset (minfo, end_offset);
+
+			if (begin_scope > 0)
+				locals [i].begin_scope = begin_scope;
+			else
+				locals [i].begin_scope = minfo->method_info.prologue_end;
+			if (end_scope > 0)
+				locals [i].end_scope = end_scope;
+			else
+				locals [i].end_scope = minfo->method_info.epilogue_begin;
 		}
+
+		minfo->method_info.num_locals = header->num_locals;
+		minfo->method_info.locals = locals;
 	}
 
-	/* end of function */
-	fprintf (info->f, ".stabs \"\",36,0,0,%d\n", cfg->code - cfg->start);
-	g_free (name);
-	g_free (names);
-	fflush (info->f);
+	g_hash_table_insert (debug->methods, method, minfo);
 }
 
-static void
-get_enumvalue (MonoClass *klass, int index, char *buf)
+gchar *
+mono_debug_source_location_from_address (MonoMethod *method, guint32 address, guint32 *line_number)
 {
-	guint32 const_cols [MONO_CONSTANT_SIZE];
-	const char *ptr;
-	guint32 crow = mono_metadata_get_constant_index (klass->image, MONO_TOKEN_FIELD_DEF | (index + 1));
+	MonoDebugHandle *debug;
+	DebugMethodInfo *minfo = NULL;
+	int i;
 
-	if (!crow) {
-		buf [0] = '0';
-		buf [1] = 0;
-		return;
+	for (debug = mono_debug_handles; debug; debug = debug->next) {
+		minfo = g_hash_table_lookup (debug->methods, method);
+
+		if (minfo)
+			break;
 	}
-	mono_metadata_decode_row (&klass->image->tables [MONO_TABLE_CONSTANT], crow-1, const_cols, MONO_CONSTANT_SIZE);
-	ptr = mono_metadata_blob_heap (klass->image, const_cols [MONO_CONSTANT_VALUE]);
-	switch (const_cols [MONO_CONSTANT_TYPE]) {
-	case MONO_TYPE_U4:
-	case MONO_TYPE_I4:
-		/* FIXME: add other types... */
-	default:
-		g_snprintf (buf, 64, "%d", *(gint32*)ptr);
+
+	if (!minfo)
+		return NULL;
+
+	if (minfo->info->symfile) {
+		gint32 offset = il_offset_from_address (minfo, address);
+		
+		if (offset < 0)
+			return NULL;
+
+		return mono_debug_find_source_location (minfo->info->symfile, method, offset, line_number);
+	}
+
+	if (!minfo->line_numbers)
+		return NULL;
+
+	for (i = 0; i < minfo->line_numbers->len; i++) {
+		DebugLineNumberInfo *lni = g_ptr_array_index (minfo->line_numbers, i);
+
+		if ((gchar *)lni->address > minfo->method_info.code_start + address) {
+			gchar *source_file = g_ptr_array_index (debug->source_files, lni->source_file);
+
+			if (line_number) {
+				*line_number = lni->line;
+				return g_strdup (source_file);
+			} else
+				return g_strdup_printf ("%s:%d", source_file, lni->line);
+		}
 	}
+
+	return NULL;
 }
 
-void
-mono_debug_add_type (MonoDebugHandle* debug, MonoClass *klass)
+gint32
+mono_debug_il_offset_from_address (MonoMethod *method, gint32 address)
 {
-	char *name;
-	int i;
-	char buf [64];
-	AssemblyDebugInfo* info = mono_debug_open_ass (debug, klass->image);
+	MonoDebugHandle *debug;
+	DebugMethodInfo *minfo = NULL;
 
-	mono_class_init (klass);
+	if (address < 0)
+		return -1;
 
-	/* output enums ...*/
-	if (klass->enumtype) {
-		name = g_strdup_printf ("%s%s%s", klass->name_space, klass->name_space [0]? "_": "", klass->name);
-		fprintf (info->f, ".stabs \"%s:T%d=e", name, ++info->next_idx);
-		g_free (name);
-		for (i = 0; i < klass->field.count; ++i) {
-			if (klass->fields [i].type->attrs & FIELD_ATTRIBUTE_LITERAL) {
-				get_enumvalue (klass, klass->field.first + i, buf);
-				fprintf (info->f, "%s_%s=%s,", klass->name, klass->fields [i].name, buf);
-			}
-		}
-		fprintf (info->f, ";\",128,0,0,0\n");
+	for (debug = mono_debug_handles; debug; debug = debug->next) {
+		minfo = g_hash_table_lookup (debug->methods, method);
+
+		if (minfo)
+			break;
 	}
-	fflush (info->f);
 
+	if (!minfo || !minfo->method_info.il_offsets)
+		return -1;
+
+	return il_offset_from_address (minfo, address);
 }
 
+gint32
+mono_debug_address_from_il_offset (MonoMethod *method, gint32 il_offset)
+{
+	MonoDebugHandle *debug;
+	DebugMethodInfo *minfo = NULL;
+
+	if (il_offset < 0)
+		return -1;
+
+	for (debug = mono_debug_handles; debug; debug = debug->next) {
+		minfo = g_hash_table_lookup (debug->methods, method);
+
+		if (minfo)
+			break;
+	}
+
+	if (!minfo || !minfo->method_info.il_offsets)
+		return -1;
+
+	return address_from_il_offset (minfo, il_offset);
+}
diff --git a/mono/jit/debug.h b/mono/jit/debug.h
index 4fd20c2fd7e..c1bb4abee98 100644
--- a/mono/jit/debug.h
+++ b/mono/jit/debug.h
@@ -3,22 +3,87 @@
 
 #include <glib.h>
 #include <stdio.h>
+#include <mono/metadata/debug-symfile.h>
 #include <mono/metadata/loader.h>
 #include <mono/jit/jit.h>
 
 typedef struct _MonoDebugHandle MonoDebugHandle;
 
-extern MonoDebugHandle *mono_debug_handle;
+typedef enum {
+	MONO_DEBUG_FORMAT_NONE,
+	MONO_DEBUG_FORMAT_STABS,
+	MONO_DEBUG_FORMAT_DWARF2,
+	MONO_DEBUG_FORMAT_DWARF2_PLUS
+} MonoDebugFormat;
+
+extern MonoDebugFormat mono_debug_format;
 extern GList *mono_debug_methods;
 
-MonoDebugHandle* mono_debug_open_file (char *filename);
+/*
+ * This variable is intended to be set in a debugger.
+ *
+ * If it's non-zero, arch_compile_method() will insert a breakpoint next time
+ * it compiles a method.
+ *
+ * If it's positive, it acts as a counter which is decremented each time it's
+ * used. Set it to a negative value to make arch_compile_method() insert a
+ * breakpoint for each method.
+ *
+ * To use this, you should create a GDB macro like this:
+ *
+ *    define enter
+ *      set mono_debug_insert_breakpoint = 1
+ *      continue
+ *      set *mono_debug_last_breakpoint_address = 0x90
+ *      reload-symbol-files
+ *      frame
+ *    end
+ *
+ *    define reload-symbol-files
+ *      call mono_debug_make_symbols ()
+ *      add-symbol-file Test-debug.o
+ *      add-symbol-file /tmp/corlib.o
+ *    end
+ *
+ */
+extern int mono_debug_insert_breakpoint;
+
+/*
+ * This is set the the core address of the last inserted breakpoint. You can
+ * use this in GDB to unset the breakpoint.
+ */
+
+extern gchar *mono_debug_last_breakpoint_address;
+
+MonoDebugHandle* mono_debug_open (MonoAssembly *assembly, MonoDebugFormat format,
+				  const char **args);
+
+void           mono_debug_cleanup (void);
+
+void           mono_debug_add_image (MonoDebugHandle* debug, MonoImage *image);
+
+MonoDebugHandle* mono_debug_handle_from_class (MonoClass *klass);
+
+void           mono_debug_add_method (MonoFlowGraph *cfg);
+
+void           mono_debug_add_type (MonoClass *klass);
+
+gchar *        mono_debug_source_location_from_address (MonoMethod *method, guint32 address,
+							guint32 *line_number);
 
-void           mono_debug_close (MonoDebugHandle* debug);
+gint32         mono_debug_il_offset_from_address (MonoMethod *method, gint32 address);
 
-void           mono_debug_add_method (MonoDebugHandle* debug, MonoFlowGraph *cfg);
+gint32         mono_debug_address_from_il_offset (MonoMethod *method, gint32 il_offset);
 
-void           mono_debug_add_type (MonoDebugHandle* debug, MonoClass *klass);
+/* DEBUGGER PUBLIC FUNCTION:
+ *
+ * This is a public function which is supposed to be called from within a debugger
+ * each time the program stops. It's used to recreate the symbol file to tell the
+ * debugger about method addresses and such things. After calling this function,
+ * you must tell your debugger to reload its symbol file.
+ */
+void           mono_debug_make_symbols (void);
 
-void           mono_debug_make_symbols (MonoDebugHandle* debug);
+void           mono_debug_write_symbols (MonoDebugHandle* debug);
 
 #endif /* __MONO_JIT_DEBUG_H__ */
diff --git a/mono/jit/emit-x86.c b/mono/jit/emit-x86.c
index 515ecde93df..3f169db9c77 100644
--- a/mono/jit/emit-x86.c
+++ b/mono/jit/emit-x86.c
@@ -16,67 +16,213 @@
 #include <mono/metadata/cil-coff.h>
 #include <mono/metadata/tabledefs.h>
 #include <mono/metadata/class.h>
+#include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/mono-endian.h>
 #include <mono/arch/x86/x86-codegen.h>
+#include <mono/metadata/profiler-private.h>
 
 #include "jit.h"
+#include "helpers.h"
 #include "codegen.h"
 #include "debug.h"
 
+
+//#define DEBUG_REGALLOC
+//#define DEBUG_SPILLS
+
+const char *
+arch_get_reg_name (int regnum)
+{
+	switch (regnum) {
+	case 0:
+		return "EAX";
+	case 1:
+		return "ECX";
+	case 2:
+		return "EDX";
+	case 3:
+		return "EBX";
+	case 4:
+		return "ESP";
+	case 5:
+		return "EBP";
+	case 6:
+		return "ESI";
+	case 7:
+		return "EDI";
+	}
+
+	g_assert_not_reached ();
+	return NULL;
+}
+
+
+/* 
+ * we may want a x86-specific header or we 
+ * can just declare it extern in x86.brg.
+ */
+int mono_x86_have_cmov = 0;
+
+static int 
+cpuid (int id, int* p_eax, int* p_ebx, int* p_ecx, int* p_edx)
+{
+#ifdef PIC
+	return 0;
+#else
+	int have_cpuid = 0;
+	__asm__  __volatile__ (
+		"pushfl\n"
+		"popl %%eax\n"
+		"movl %%eax, %%edx\n"
+		"xorl $0x200000, %%eax\n"
+		"pushl %%eax\n"
+		"popfl\n"
+		"pushfl\n"
+		"popl %%eax\n"
+		"xorl %%edx, %%eax\n"
+		"andl $0x200000, %%eax\n"
+		"movl %%eax, %0"
+		: "=r" (have_cpuid)
+		:
+		: "%eax", "%edx"
+	);
+
+	if (have_cpuid) {
+		__asm__ __volatile__ ("cpuid"
+			: "=a" (*p_eax), "=b" (*p_ebx), "=c" (*p_ecx), "=d" (*p_edx)
+			: "a" (id));
+		return 1;
+	}
+	return 0;
+#endif
+}
+
+void
+mono_cpu_detect (void) {
+	int eax, ebx, ecx, edx;
+
+	/* Feature Flags function, flags returned in EDX. */
+	if (cpuid(1, &eax, &ebx, &ecx, &edx)) {
+		if (edx & (1U << 15)) {
+			mono_x86_have_cmov = 1;
+		}
+	}
+}
+
+/*
+ * arch_get_argument_info:
+ * @csig:  a method signature
+ * @param_count: the number of parameters to consider
+ * @arg_info: an array to store the result infos
+ *
+ * Gathers information on parameters such as size, alignment and
+ * padding. arg_info should be large enought to hold param_count + 1 entries. 
+ *
+ * Returns the size of the activation frame.
+ */
+int
+arch_get_argument_info (MonoMethodSignature *csig, int param_count, MonoJitArgumentInfo *arg_info)
+{
+	int k, frame_size = 0;
+	int size, align, pad;
+	int offset = 8;
+
+	if (MONO_TYPE_ISSTRUCT (csig->ret)) { 
+		frame_size += sizeof (gpointer);
+		offset += 4;
+	}
+
+	arg_info [0].offset = offset;
+
+	if (csig->hasthis) {
+		frame_size += sizeof (gpointer);
+		offset += 4;
+	}
+
+	arg_info [0].size = frame_size;
+
+	for (k = 0; k < param_count; k++) {
+		
+		if (csig->pinvoke)
+			size = mono_type_native_stack_size (csig->params [k], &align);
+		else
+			size = mono_type_stack_size (csig->params [k], &align);
+		
+		frame_size += pad = (align - (frame_size & (align - 1))) & (align - 1);	
+		arg_info [k].pad = pad;
+		frame_size += size;
+		arg_info [k + 1].pad = 0;
+		arg_info [k + 1].size = size;
+		offset += pad;
+		arg_info [k + 1].offset = offset;
+		offset += size;
+	}
+
+	align = MONO_FRAME_ALIGNMENT;
+	frame_size += pad = (align - (frame_size & (align - 1))) & (align - 1);
+	arg_info [k].pad = pad;
+
+	return frame_size;
+}
+
 static void
-enter_method (MonoMethod *method, gpointer ebp)
+enter_method (MonoMethod *method, char *ebp)
 {
 	int i, j;
 	MonoClass *class;
 	MonoObject *o;
+	MonoJitArgumentInfo *arg_info;
+	MonoMethodSignature *sig;
+	char *fname;
 
-	printf ("ENTER: %s.%s::%s\n(", method->klass->name_space,
-		method->klass->name, method->name);
-
+	fname = mono_method_full_name (method, TRUE);
+	printf ("ENTER: %s\n(", fname);
+	g_free (fname);
 	
-	if (((int)ebp & 3) != 0) {
+	if (((int)ebp & (MONO_FRAME_ALIGNMENT - 1)) != 0) {
 		g_error ("unaligned stack detected (%p)", ebp);
 	}
 
-	ebp += 8;
+	sig = method->signature;
 
-	if (ISSTRUCT (method->signature->ret)) {
-		int size, align;
-		
-		g_assert (!method->signature->ret->byref);
+	arg_info = alloca (sizeof (MonoJitArgumentInfo) * (sig->param_count + 1));
+
+	arch_get_argument_info (sig, sig->param_count, arg_info);
 
-		size = mono_type_stack_size (method->signature->ret, &align);
+	if (MONO_TYPE_ISSTRUCT (method->signature->ret)) {
+		g_assert (!method->signature->ret->byref);
 
-		printf ("VALUERET:%p, ", *((gpointer *)ebp));
-		ebp += sizeof (gpointer);
+		printf ("VALUERET:%p, ", *((gpointer *)(ebp + 8)));
 	}
 
 	if (method->signature->hasthis) {
+		gpointer *this = (gpointer *)(ebp + arg_info [0].offset);
 		if (method->klass->valuetype) {
-			printf ("value:%p, ", *((gpointer *)ebp));
+			printf ("value:%p, ", *this);
 		} else {
-			o = *((MonoObject **)ebp);
-
-			g_assert (o);
+			o = *((MonoObject **)this);
 
-			class = o->vtable->klass;
+			if (o) {
+				class = o->vtable->klass;
 
-			if (class == mono_defaults.string_class) {
-				printf ("this:[STRING:%p:%s], ", o, mono_string_to_utf8 ((MonoString *)o));
-			} else {
-				printf ("this:%p[%s.%s], ", o, class->name_space, class->name);
-			}
+				if (class == mono_defaults.string_class) {
+					printf ("this:[STRING:%p:%s], ", o, mono_string_to_utf8 ((MonoString *)o));
+				} else {
+					printf ("this:%p[%s.%s], ", o, class->name_space, class->name);
+				}
+			} else 
+				printf ("this:NULL, ");
 		}
-		ebp += sizeof (gpointer);
 	}
 
 	for (i = 0; i < method->signature->param_count; ++i) {
-		MonoType *type = method->signature->params [i];
-		int size, align;
-		size = mono_type_stack_size (type, &align);
+		gpointer *cpos = (gpointer *)(ebp + arg_info [i + 1].offset);
+		int size = arg_info [i + 1].size;
 
+		MonoType *type = method->signature->params [i];
+		
 		if (type->byref) {
-			printf ("[BYREF:%p], ", *((gpointer *)ebp)); 
+			printf ("[BYREF:%p], ", *cpos); 
 		} else switch (type->type) {
 			
 		case MONO_TYPE_BOOLEAN:
@@ -89,10 +235,10 @@ enter_method (MonoMethod *method, gpointer ebp)
 		case MONO_TYPE_U4:
 		case MONO_TYPE_I:
 		case MONO_TYPE_U:
-			printf ("%d, ", *((int *)(ebp)));
+			printf ("%d, ", *((int *)(cpos)));
 			break;
 		case MONO_TYPE_STRING: {
-			MonoString *s = *((MonoString **)ebp);
+			MonoString *s = *((MonoString **)cpos);
 			if (s) {
 				g_assert (((MonoObject *)s)->vtable->klass == mono_defaults.string_class);
 				printf ("[STRING:%p:%s], ", s, mono_string_to_utf8 (s));
@@ -102,18 +248,18 @@ enter_method (MonoMethod *method, gpointer ebp)
 		}
 		case MONO_TYPE_CLASS:
 		case MONO_TYPE_OBJECT: {
-			o = *((MonoObject **)ebp);
+			o = *((MonoObject **)cpos);
 			if (o) {
 				class = o->vtable->klass;
 		    
 				if (class == mono_defaults.string_class) {
 					printf ("[STRING:%p:%s], ", o, mono_string_to_utf8 ((MonoString *)o));
 				} else if (class == mono_defaults.int32_class) {
-					printf ("[INT32:%p:%d], ", o, *(gint32 *)((gpointer)o + sizeof (MonoObject)));
+					printf ("[INT32:%p:%d], ", o, *(gint32 *)((char *)o + sizeof (MonoObject)));
 				} else
 					printf ("[%s.%s:%p], ", class->name_space, class->name, o);
 			} else {
-				printf ("%p, ", *((gpointer *)(ebp)));				
+				printf ("%p, ", *((gpointer *)(cpos)));				
 			}
 			break;
 		}
@@ -121,30 +267,26 @@ enter_method (MonoMethod *method, gpointer ebp)
 		case MONO_TYPE_FNPTR:
 		case MONO_TYPE_ARRAY:
 		case MONO_TYPE_SZARRAY:
-			printf ("%p, ", *((gpointer *)(ebp)));
+			printf ("%p, ", *((gpointer *)(cpos)));
 			break;
 		case MONO_TYPE_I8:
-			printf ("%lld, ", *((gint64 *)(ebp)));
+			printf ("%lld, ", *((gint64 *)(cpos)));
 			break;
 		case MONO_TYPE_R4:
-			printf ("%f, ", *((float *)(ebp)));
+			printf ("%f, ", *((float *)(cpos)));
 			break;
 		case MONO_TYPE_R8:
-			printf ("%f, ", *((double *)(ebp)));
+			printf ("%f, ", *((double *)(cpos)));
 			break;
 		case MONO_TYPE_VALUETYPE: 
 			printf ("[");
 			for (j = 0; j < size; j++)
-				printf ("%02x,", *((guint8*)ebp +j));
+				printf ("%02x,", *((guint8*)cpos +j));
 			printf ("], ");
 			break;
 		default:
 			printf ("XX, ");
 		}
-
-		g_assert (align == 4);
-		ebp += size + 3;
-		ebp = (gpointer)((unsigned)ebp & ~(3));
 	}
 
 	printf (")\n");
@@ -154,9 +296,11 @@ static void
 leave_method (MonoMethod *method, int edx, int eax, double test)
 {
 	gint64 l;
+	char *fname;
 
-	printf ("LEAVE: %s.%s::%s ", method->klass->name_space,
-		method->klass->name, method->name);
+	fname = mono_method_full_name (method, TRUE);
+	printf ("LEAVE: %s", fname);
+	g_free (fname);
 
 	switch (method->signature->ret->type) {
 	case MONO_TYPE_VOID:
@@ -196,7 +340,9 @@ leave_method (MonoMethod *method, int edx, int eax, double test)
 			if (o->vtable->klass == mono_defaults.boolean_class) {
 				printf ("[BOOLEAN:%p:%d]", o, *((guint8 *)o + sizeof (MonoObject)));		
 			} else if  (o->vtable->klass == mono_defaults.int32_class) {
-				printf ("[INT32:%p:%d]", o, *((gint32 *)((gpointer)o + sizeof (MonoObject))));	
+				printf ("[INT32:%p:%d]", o, *((gint32 *)((char *)o + sizeof (MonoObject))));	
+			} else if  (o->vtable->klass == mono_defaults.int64_class) {
+				printf ("[INT64:%p:%lld]", o, *((gint64 *)((char *)o + sizeof (MonoObject))));	
 			} else
 				printf ("[%s.%s:%p]", o->vtable->klass->name_space, o->vtable->klass->name, o);
 		} else
@@ -235,20 +381,73 @@ leave_method (MonoMethod *method, int edx, int eax, double test)
 static void
 arch_emit_prologue (MonoFlowGraph *cfg)
 {
+	MonoMethod *method = cfg->method;
+	MonoMethodHeader *header = ((MonoMethodNormal *)method)->header;
+	int i, j, k, alloc_size, pos;
+
 	x86_push_reg (cfg->code, X86_EBP);
 	x86_mov_reg_reg (cfg->code, X86_EBP, X86_ESP, 4);
 
-	if (cfg->locals_size)
-		x86_alu_reg_imm (cfg->code, X86_SUB, X86_ESP, cfg->locals_size);
+	alloc_size = cfg->locals_size;
+	pos = 0;
+
+	if (method->save_lmf) {
+		
+		pos += sizeof (MonoLMF);
 
-	if (mono_regset_reg_used (cfg->rs, X86_EBX)) 
+		/* save the current IP */
+		cfg->lmfip_offset = cfg->code + 1 - cfg->start;
+		x86_push_imm (cfg->code, 0);
+		/* save all caller saved regs */
 		x86_push_reg (cfg->code, X86_EBX);
+		x86_push_reg (cfg->code, X86_EDI);
+		x86_push_reg (cfg->code, X86_ESI);
+		x86_push_reg (cfg->code, X86_EBP);
 
-	if (mono_regset_reg_used (cfg->rs, X86_EDI)) 
+		/* save method info */
+		x86_push_imm (cfg->code, method);
+	
+		/* get the address of lmf for the current thread */
+		mono_add_jump_info (cfg, cfg->code, MONO_JUMP_INFO_ABS, mono_get_lmf_addr);
+		x86_call_code (cfg->code, 0);
+
+		/* push lmf */
+		x86_push_reg (cfg->code, X86_EAX); 
+		/* push *lfm (previous_lmf) */
+		x86_push_membase (cfg->code, X86_EAX, 0);
+		/* *(lmf) = ESP */
+		x86_mov_membase_reg (cfg->code, X86_EAX, 0, X86_ESP, 4);
+	}
+
+#if 0
+	/* activation frame alignment check */
+	x86_mov_reg_reg (cfg->code, X86_EAX, X86_ESP, 4);
+	x86_alu_reg_imm (cfg->code, X86_AND, X86_EAX, MONO_FRAME_ALIGNMENT - 1);
+	x86_alu_reg_imm (cfg->code, X86_CMP, X86_EAX, 0);
+	x86_branch32 (cfg->code, X86_CC_EQ, 1, FALSE);
+	x86_breakpoint (cfg->code);
+
+#endif
+
+	if (mono_regset_reg_used (cfg->rs, X86_EBX)) {
+		x86_push_reg (cfg->code, X86_EBX);
+		pos += 4;
+	}
+
+	if (mono_regset_reg_used (cfg->rs, X86_EDI)) {
 		x86_push_reg (cfg->code, X86_EDI);
+		pos += 4;
+	}
 
-	if (mono_regset_reg_used (cfg->rs, X86_ESI))
+	if (mono_regset_reg_used (cfg->rs, X86_ESI)) {
 		x86_push_reg (cfg->code, X86_ESI);
+		pos += 4;
+	}
+
+	alloc_size -= pos;
+
+	if (alloc_size)
+		x86_alu_reg_imm (cfg->code, X86_SUB, X86_ESP, alloc_size);
 
 	if (mono_jit_trace_calls) {
 		x86_push_reg (cfg->code, X86_EBP);
@@ -257,6 +456,113 @@ arch_emit_prologue (MonoFlowGraph *cfg)
 		x86_call_reg (cfg->code, X86_EAX);
 		x86_alu_reg_imm (cfg->code, X86_ADD, X86_ESP, 8);
 	}
+	if (mono_jit_profile) {
+		x86_push_imm (cfg->code, cfg->method);
+		x86_mov_reg_imm (cfg->code, X86_EAX, mono_profiler_method_enter);
+		x86_call_reg (cfg->code, X86_EAX);
+		x86_alu_reg_imm (cfg->code, X86_ADD, X86_ESP, 4);
+	}
+
+	/* initialize local vars */
+	if (header->num_locals) {
+		gboolean unassigned_locals = TRUE;
+
+		if (cfg->bblocks [0].live_in_set) {
+			i = mono_bitset_find_first (cfg->bblocks [0].live_in_set, 
+						    cfg->locals_start_index - 1);
+			unassigned_locals = (i >= 0 && i < cfg->locals_start_index + 
+					     header->num_locals);
+		}
+
+		if (unassigned_locals && header->init_locals) {
+			MonoVarInfo *vi = &VARINFO (cfg, cfg->locals_start_index + header->num_locals - 1);
+			int offset = vi->offset;  
+			int size = - offset;
+			int inited = 0;
+			
+			/* do not clear caller saved registers */
+			size -= 12;
+
+			for (i = 0; i < header->num_locals; ++i) {
+				MonoVarInfo *rv = &VARINFO (cfg, cfg->locals_start_index + i);
+
+				if (rv->reg >= 0) {
+					int ind = 1 << rv->reg;
+					if (!(inited & ind))
+						x86_alu_reg_reg (cfg->code, X86_XOR, rv->reg, rv->reg);
+					inited |= ind;
+				}
+			}
+
+			if (size == 1 || size == 2 || size == 4) {
+				x86_mov_membase_imm (cfg->code, X86_EBP, offset, 0, size);
+				return;
+			}
+			
+			i = size / 4;
+			j = size % 4;
+
+			if (i < 3) {
+				for (k = 0; k < i; k++) {
+					x86_mov_membase_imm (cfg->code, X86_EBP, offset, 0, 4);
+					offset += 4;
+				}
+
+				if (j & 2) {
+					x86_mov_membase_imm (cfg->code, X86_EBP, offset, 0, 2);
+					offset += 2;
+				}
+				if (j & 1)
+					x86_mov_membase_imm (cfg->code, X86_EBP, offset, 0, 1);
+				return;
+			}
+			
+			if (i) {
+				if (!mono_regset_reg_used (cfg->rs, X86_EDI)) 
+					x86_push_reg (cfg->code, X86_EDI);
+				x86_lea_membase (cfg->code, X86_EDI, X86_EBP, offset);
+				x86_alu_reg_reg (cfg->code, X86_XOR, X86_EAX, X86_EAX);
+				x86_mov_reg_imm (cfg->code, X86_ECX, i);
+				x86_cld (cfg->code);
+				x86_prefix (cfg->code, X86_REP_PREFIX);
+				x86_stosl (cfg->code);
+				for (i = 0; i < j; i++)
+					x86_stosb (cfg->code);
+				if (!mono_regset_reg_used (cfg->rs, X86_EDI)) 
+					x86_pop_reg (cfg->code, X86_EDI);
+			} else {
+
+				g_assert (j == 3);
+				x86_mov_membase_imm (cfg->code, X86_EBP, offset, 0, 2);
+				x86_mov_membase_imm (cfg->code, X86_EBP, offset + 2, 0, 1);
+			}
+			
+		} else {
+
+			/* we always need to initialize object pointers */
+
+			for (i = 0; i < header->num_locals; ++i) {
+				MonoType *t = header->locals [i];
+				int offset = VARINFO (cfg, cfg->locals_start_index + i).offset;  
+
+				if (t->byref) {
+					x86_mov_membase_imm (cfg->code, X86_EBP, offset, 0, 4);
+					continue;
+				}
+
+				switch (t->type) {
+				case MONO_TYPE_STRING:
+				case MONO_TYPE_CLASS:
+				case MONO_TYPE_ARRAY:
+				case MONO_TYPE_SZARRAY:
+				case MONO_TYPE_OBJECT:
+					x86_mov_membase_imm (cfg->code, X86_EBP, offset, 0, 4);
+					break;
+				}
+
+			}
+		}
+	}
 }
 
 /**
@@ -268,6 +574,10 @@ arch_emit_prologue (MonoFlowGraph *cfg)
 static void
 arch_emit_epilogue (MonoFlowGraph *cfg)
 {
+	int pos;
+	/*
+	 * note: with trace and profiling the value on the FP stack may get clobbered.
+	 */
 	if (mono_jit_trace_calls) {
 		x86_fld_reg (cfg->code, 0);
 		x86_alu_reg_imm (cfg->code, X86_SUB, X86_ESP, 8);
@@ -282,212 +592,116 @@ arch_emit_epilogue (MonoFlowGraph *cfg)
 		x86_pop_reg (cfg->code, X86_EAX);
 		x86_alu_reg_imm (cfg->code, X86_ADD, X86_ESP, 8);
 	}
+	if (mono_jit_profile) {
+		x86_push_reg (cfg->code, X86_EAX);
+		x86_push_reg (cfg->code, X86_EDX);
+		x86_push_imm (cfg->code, cfg->method);
+		x86_mov_reg_imm (cfg->code, X86_EAX, mono_profiler_method_leave);
+		x86_call_reg (cfg->code, X86_EAX);
+		x86_alu_reg_imm (cfg->code, X86_ADD, X86_ESP, 4);
+		x86_pop_reg (cfg->code, X86_EDX);
+		x86_pop_reg (cfg->code, X86_EAX);
+	}
 
-	if (mono_regset_reg_used (cfg->rs, X86_ESI))
-		x86_pop_reg (cfg->code, X86_ESI);
+	if (cfg->method->save_lmf) {
+		pos = -sizeof (MonoLMF) - 4;
+	} else
+		pos = -4;
 
-	if (mono_regset_reg_used (cfg->rs, X86_EDI))
+	if (mono_regset_reg_used (cfg->rs, X86_EBX)) {
+		x86_mov_reg_membase (cfg->code, X86_EBX, X86_EBP, pos, 4);
+		pos -= 4;
+	}
+	if (mono_regset_reg_used (cfg->rs, X86_EDI)) {
+		x86_mov_reg_membase (cfg->code, X86_EDI, X86_EBP, pos, 4);
+		pos -= 4;
+	}
+	if (mono_regset_reg_used (cfg->rs, X86_ESI)) {
+		x86_mov_reg_membase (cfg->code, X86_ESI, X86_EBP, pos, 4);
+		pos -= 4;
+	}
+
+	if (cfg->method->save_lmf) {
+		pos = -sizeof (MonoLMF);
+
+		x86_lea_membase (cfg->code, X86_ESP, X86_EBP, pos);
+
+		/* ebx = previous_lmf */
+		x86_pop_reg (cfg->code, X86_EBX);
+		/* edi = lmf */
 		x86_pop_reg (cfg->code, X86_EDI);
+		/* *(lmf) = previous_lmf */
+		x86_mov_membase_reg (cfg->code, X86_EDI, 0, X86_EBX, 4);
+
+		/* discard method info */
+		x86_pop_reg (cfg->code, X86_ESI);
 
-	if (mono_regset_reg_used (cfg->rs, X86_EBX))
+		/* restore caller saved regs */
+		x86_pop_reg (cfg->code, X86_EBP);
+		x86_pop_reg (cfg->code, X86_ESI);
+		x86_pop_reg (cfg->code, X86_EDI);
 		x86_pop_reg (cfg->code, X86_EBX);
 
+	}
+
 	x86_leave (cfg->code);
 	x86_ret (cfg->code);
 }
 
-/*
- * get_unbox_trampoline:
- * @m: method pointer
- *
- * when value type methods are called through the vtable we need to unbox the
- * this argument. This method returns a pointer to a trampoline which does
- * unboxing before calling the method
- */
-static gpointer
-get_unbox_trampoline (MonoMethod *m)
+static void
+init_varinfo (MonoFlowGraph *cfg, MonoVarInfo *vi)
 {
-	gpointer p = arch_compile_method (m);
-	guint8 *code, *start;
-	int this_pos = 4;
-
-	if (!m->signature->ret->byref && m->signature->ret->type == MONO_TYPE_VALUETYPE)
-		this_pos = 8;
-	    
-	start = code = g_malloc (16);
-
-	x86_alu_membase_imm (code, X86_ADD, X86_ESP, this_pos, sizeof (MonoObject));
-	x86_jump_code (code, p);
-	g_assert ((code - start) < 16);
-
-	return start;
+	vi->range.last_use.abs_pos = 0;
+	vi->range.first_use.pos.bid = 0xffff;
+	vi->range.first_use.pos.tid = 0;	
+	vi->isvolatile = 0;
+	vi->reg = -1;
+	vi->varnum = cfg->varinfo->len;
 }
 
-/**
- * x86_magic_trampoline:
- * @eax: saved x86 register 
- * @ecx: saved x86 register 
- * @edx: saved x86 register 
- * @esi: saved x86 register 
- * @edi: saved x86 register 
- * @ebx: saved x86 register
- * @code: pointer into caller code
- * @method: the method to translate
- *
- * This method is called by the trampoline functions for virtual
- * methods. It inspects the caller code to find the address of the
- * vtable slot, then calls the JIT compiler and writes the address
- * of the compiled method back to the vtable. All virtual methods 
- * are called with: x86_call_membase (inst, basereg, disp). We always
- * use 32 bit displacement to ensure that the length of the call 
- * instruction is 6 bytes. We need to get the value of the basereg 
- * and the constant displacement.
- */
-static gpointer
-x86_magic_trampoline (int eax, int ecx, int edx, int esi, int edi, 
-		      int ebx, const guint8 *code, MonoMethod *m)
+int
+arch_allocate_arg (MonoFlowGraph *cfg, MonoJitArgumentInfo *info, MonoValueType type)
 {
-	guint8 reg;
-	gint32 disp;
-	gpointer o;
-
-	/* go to the start of the call instruction
-	 *
-	 * address_byte = (m << 6) | (o << 3) | reg
-	 * call opcode: 0xff address_byte displacement
-	 * 0xff m=1,o=2 imm8
-	 * 0xff m=2,o=2 imm32
-	 */
-	code -= 6;
-	if ((code [1] != 0xe8) && (code [3] == 0xff) && ((code [4] & 0x18) == 0x10) && ((code [4] >> 6) == 1)) {
-		reg = code [4] & 0x07;
-		disp = (signed char)code [5];
-	} else {
-		if ((code [0] == 0xff) && ((code [1] & 0x18) == 0x10) && ((code [1] >> 6) == 2)) {
-			reg = code [1] & 0x07;
-			disp = *((gint32*)(code + 2));
-		} else if ((code [1] == 0xe8)) {
-			gpointer addr = arch_compile_method (m);
-			g_assert (addr);
-			*((guint32*)(code + 2)) = (guint)addr - ((guint)code + 1) - 5; 
-			return addr;
-		} else {
-			printf ("%x %x %x %x %x %x \n", code [0], code [1], code [2], code [3],
-				code [4], code [5]);
-			g_assert_not_reached ();
-		}
-	}
+	MonoVarInfo vi;
 
-	switch (reg) {
-	case X86_EAX:
-		o = (gpointer)eax;
-		break;
-	case X86_EDX:
-		o = (gpointer)edx;
-		break;
-	case X86_ECX:
-		o = (gpointer)ecx;
-		break;
-	case X86_ESI:
-		o = (gpointer)esi;
-		break;
-	case X86_EDI:
-		o = (gpointer)edi;
-		break;
-	case X86_EBX:
-		o = (gpointer)ebx;
-		break;
-	default:
-		g_assert_not_reached ();
-	}
+	mono_jit_stats.allocate_var++;
 
-	o += disp;
+	init_varinfo (cfg, &vi);
+	vi.isvolatile = 1;
+	
+	SET_VARINFO (vi, type, MONO_ARGVAR, info->offset, info->size);
+	g_array_append_val (cfg->varinfo, vi);
 
-	if (m->klass->valuetype) {
-		return *((gpointer *)o) = get_unbox_trampoline (m);
-	} else
-		return *((gpointer *)o) = arch_compile_method (m);
+	return cfg->varinfo->len - 1;
 }
 
-/**
- * arch_create_jit_trampoline:
- * @method: pointer to the method info
- *
- * Creates a trampoline function for virtual methods. If the created
- * code is called it first starts JIT compilation of method,
- * and then calls the newly created method. I also replaces the
- * corresponding vtable entry (see x86_magic_trampoline).
- * 
- * Returns: a pointer to the newly created code 
- */
-gpointer
-arch_create_jit_trampoline (MonoMethod *method)
+int
+arch_allocate_var (MonoFlowGraph *cfg, int size, int align, MonoVarType vartype, MonoValueType type)
 {
-	MonoDomain *domain = mono_domain_get ();
-	guint8 *code, *buf;
-	static guint8 *vc = NULL;
-	GHashTable *jit_code_hash;
-
-	/* icalls use method->addr */
-	if (method->addr)
-		return method->addr;
-
-	/* previously created trampoline code */
-	if (method->info)
-		return method->info;
-
-	/* check if we already have JITed code */
-	if (mono_jit_share_code)
-		jit_code_hash = mono_root_domain->jit_code_hash;
-	else
-		jit_code_hash = domain->jit_code_hash;
-
-	if ((code = g_hash_table_lookup (jit_code_hash, method))) {
-		mono_jit_stats.methods_lookups++;
-		return code;
-	}
-
-	if (!vc) {
-		vc = buf = g_malloc (24);
-
-		/* push the return address onto the stack */
-		x86_push_membase (buf, X86_ESP, 4);
-
-		/* save all register values */
-		x86_push_reg (buf, X86_EBX);
-		x86_push_reg (buf, X86_EDI);
-		x86_push_reg (buf, X86_ESI);
-		x86_push_reg (buf, X86_EDX);
-		x86_push_reg (buf, X86_ECX);
-		x86_push_reg (buf, X86_EAX);
+	MonoVarInfo vi;
 
-		x86_call_code (buf, x86_magic_trampoline);
-		x86_alu_reg_imm (buf, X86_ADD, X86_ESP, 8*4);
+	mono_jit_stats.allocate_var++;
 
-		/* call the compiled method */
-		x86_jump_reg (buf, X86_EAX);
+	init_varinfo (cfg, &vi);
 
-		g_assert ((buf - vc) <= 24);
-	}
-
-	code = buf = g_malloc (16);
-	x86_push_imm (buf, method);
-	x86_jump_code (buf, vc);
-	g_assert ((buf - code) <= 16);
-
-	/* store trampoline address */
-	method->info = code;
+	if (size != sizeof (gpointer))
+		vi.isvolatile = 1;
+	
+	cfg->locals_size += size;
+	cfg->locals_size += align - 1;
+	cfg->locals_size &= ~(align - 1);
 
-	mono_jit_stats.method_trampolines++;
+	SET_VARINFO (vi, type, vartype, - cfg->locals_size, size);
+	g_array_append_val (cfg->varinfo, vi);
 
-	return code;
+	return cfg->varinfo->len - 1;
 }
 
-static void
+static gboolean
 mono_label_cfg (MonoFlowGraph *cfg)
 {
 	int i, j;
-	
+
 	for (i = 0; i < cfg->block_count; i++) {
 		GPtrArray *forest = cfg->bblocks [i].forest;
 		int top;
@@ -500,94 +714,150 @@ mono_label_cfg (MonoFlowGraph *cfg)
 		for (j = 0; j < top; j++) {
 			MBTree *t1 = (MBTree *) g_ptr_array_index (forest, j);
 			MBState *mbstate;
-
+			
 			mbstate =  mono_burg_label (t1, cfg);
+
 			if (!mbstate) {
-				cfg->invalid = 1;
-				if (mono_debug_handle)
-					return;
-				g_warning ("tree does not match");
-				mono_print_ctree (t1); printf ("\n\n");
+				if (mono_debug_format != MONO_DEBUG_FORMAT_NONE)
+					return FALSE;
+				g_warning ("tree does not match in %s: 0x%04x",
+					   mono_method_full_name (cfg->method, TRUE), t1->cli_addr);
+				mono_print_ctree (cfg, t1); printf ("\n\n");
 
-				mono_print_forest (forest);
+				mono_print_forest (cfg, forest);
 				g_assert_not_reached ();
 			}
 		}
 	}
-}
 
-static void
-tree_preallocate_regs (MBTree *tree, int goal, MonoRegSet *rs) 
-{
-	switch (tree->op) {
-	case MB_TERM_CALL_I4:
-	case MB_TERM_CALL_I8:
-	case MB_TERM_CALL_R8:
-//	case MB_TERM_CALL_VOID :
-		tree->reg1 = mono_regset_alloc_reg (rs, X86_EAX, tree->exclude_mask);
-		tree->reg2 = mono_regset_alloc_reg (rs, X86_EDX, tree->exclude_mask);
-		tree->reg3 = mono_regset_alloc_reg (rs, X86_ECX, tree->exclude_mask);
-		return;
-	default: break;
-	}
-
-	switch (goal) {
-	case MB_NTERM_reg:
-	case MB_NTERM_lreg: {
-		switch (tree->op) {
-		case MB_TERM_SHL:
-		case MB_TERM_SHR:
-		case MB_TERM_SHR_UN:
-			tree->exclude_mask |= (1 << X86_ECX);
-			tree->left->exclude_mask |= (1 << X86_ECX);
-			break;
-		case MB_TERM_MUL:
-		case MB_TERM_MUL_OVF:
-		case MB_TERM_MUL_OVF_UN:
-		case MB_TERM_DIV:
-		case MB_TERM_DIV_UN:
-		case MB_TERM_REM:
-		case MB_TERM_REM_UN:
-			tree->reg1 = mono_regset_alloc_reg (rs, X86_EAX, tree->exclude_mask);
-			tree->reg2 = mono_regset_alloc_reg (rs, X86_EDX, tree->exclude_mask);
-			if (goal == MB_NTERM_reg) {
-				tree->left->exclude_mask |= (1 << X86_EDX);
-				tree->right->exclude_mask |= (1 << X86_EDX) | (1 << X86_EAX);
-			}
-			break;
-		default:
-			break;
-		}
-		break;
-	}
-	default:
-		break;
-	}
+	return TRUE;
 }
 
-static void
-tree_allocate_regs (MBTree *tree, int goal, MonoRegSet *rs) 
+static gboolean
+tree_allocate_regs (MonoFlowGraph *cfg, MBTree *tree, int goal, MonoRegSet *rs, 
+		    guint8 exclude_mask, int *spillcount) 
 {
 	MBTree *kids[10];
 	int ern = mono_burg_rule (tree->state, goal);
 	const guint16 *nts = mono_burg_nts [ern];
+	guint8 left_exclude_mask = 0, right_exclude_mask = 0;
 	int i;
 	
+#ifdef DEBUG_REGALLOC
+	printf ("tree_allocate_regs start %d %08x %d %d\n",  tree->op, rs->free_mask, goal, 
+		(nts [0] && kids [0] == tree));
+#endif
+
 	mono_burg_kids (tree, ern, kids);
 
-	//printf ("RALLOC START %d %p %d\n",  tree->op, rs->free_mask, goal);
+	switch (tree->op) {
+	case MB_TERM_SHL:
+	case MB_TERM_SHR:
+	case MB_TERM_SHR_UN:
+		exclude_mask |= (1 << X86_ECX);
+		left_exclude_mask |= (1 << X86_ECX);
+		break;
+	case MB_TERM_MUL:
+	case MB_TERM_MUL_OVF:
+	case MB_TERM_MUL_OVF_UN:
+	case MB_TERM_DIV:
+	case MB_TERM_DIV_UN:
+	case MB_TERM_REM:
+	case MB_TERM_REM_UN:
+		if (goal == MB_NTERM_reg) {
+			left_exclude_mask |= (1 << X86_EDX);
+			right_exclude_mask |= (1 << X86_EDX) | (1 << X86_EAX);
+		}
+		break;
+	default:
+		break;
+	}
 
 	if (nts [0] && kids [0] == tree) {
 		/* chain rule */
-		tree_allocate_regs (kids [0], nts [0], rs);
-		return;
+		if (!tree_allocate_regs (cfg, kids [0], nts [0], rs, exclude_mask, spillcount))
+			return FALSE;
+		return TRUE;
 	}
 
-	for (i = 0; nts [i]; i++)
-		tree_preallocate_regs (kids [i], nts [i], rs);
+	if (tree->spilled) {
+		if (tree->reg1 >= 0)
+			(*spillcount)--;
+		if (tree->reg2 >= 0)
+			(*spillcount)--;
+		if (tree->reg3 >= 0)
+			(*spillcount)--;
+	}
+
+	tree->reg1 = -1;
+	tree->reg2 = -1;
+	tree->reg3 = -1;
+	
+	tree->spilled = 0;
+ 
+	if (nts [0]) {
+		if (nts [1]) { /* two kids */
+			MonoRegSet saved_rs;
+
+			if (!tree_allocate_regs (cfg, kids [0], nts [0], rs, left_exclude_mask, spillcount))
+				return FALSE;
+
+			saved_rs = *rs;
+
+			if (!tree_allocate_regs (cfg, kids [1], nts [1], rs, right_exclude_mask, spillcount)) {
+
+#ifdef DEBUG_REGALLOC
+				printf ("tree_allocate_regs try 1 failed %d %d %d %d\n", 
+					nts [1], kids [1]->reg1,
+					kids [1]->reg2,kids [1]->reg3);
+#endif
+				*rs = saved_rs;
+
+				if (kids [0]->reg1 != -1) {
+					right_exclude_mask |= 1 << kids [0]->reg1;
+					(*spillcount)++;
+				}
+				if (kids [0]->reg2 != -1) {
+					right_exclude_mask |= 1 << kids [0]->reg2;
+					(*spillcount)++;
+				}
+				if (kids [0]->reg3 != -1) {
+					right_exclude_mask |= 1 << kids [0]->reg3;
+					(*spillcount)++;
+				}
+
+				mono_regset_free_reg (rs, kids [0]->reg1);
+				mono_regset_free_reg (rs, kids [0]->reg2);
+				mono_regset_free_reg (rs, kids [0]->reg3);
+
+				kids [0]->spilled = 1;
+
+				if (!tree_allocate_regs (cfg, kids [1], nts [1], rs, right_exclude_mask, spillcount)) {
+#ifdef DEBUG_REGALLOC
+					printf ("tree_allocate_regs try 2 failed\n");
+#endif
+					return FALSE;
+				}
+#ifdef DEBUG_REGALLOC
+				printf ("tree_allocate_regs try 2 succesfull\n");
+#endif
+			}
+
+			if (nts [2]) {
+				if (nts [3]) /* we cant handle four kids */
+					g_assert_not_reached ();
+
+				if (!tree_allocate_regs (cfg, kids [2], nts [2], rs, right_exclude_mask, spillcount))
+					return FALSE;
+				
+			}
+
+		} else { /* one kid */
+			if (!tree_allocate_regs (cfg, kids [0], nts [0], rs, left_exclude_mask, spillcount))
+				return FALSE;			
+		}
+	}
 
-	for (i = 0; nts [i]; i++)
-		tree_allocate_regs (kids [i], nts [i], rs);
 
 	for (i = 0; nts [i]; i++) {
 		mono_regset_free_reg (rs, kids [i]->reg1);
@@ -595,22 +865,60 @@ tree_allocate_regs (MBTree *tree, int goal, MonoRegSet *rs)
 		mono_regset_free_reg (rs, kids [i]->reg3);
 	}
 
+	tree->emit = mono_burg_func [ern];
+
+	switch (tree->op) {
+	case MB_TERM_CALL_I4:
+	case MB_TERM_CALL_I8:
+	case MB_TERM_CALL_R8:
+	// case MB_TERM_CALL_VOID :
+		if ((tree->reg1 = mono_regset_alloc_reg (rs, X86_EAX, exclude_mask)) == -1)
+			return FALSE;
+		if ((tree->reg2 = mono_regset_alloc_reg (rs, X86_EDX, exclude_mask)) == -1)
+			return FALSE;
+		if ((tree->reg3 = mono_regset_alloc_reg (rs, X86_ECX, exclude_mask)) == -1)
+			return FALSE;
+		return TRUE;
+	}
+
 	switch (goal) {
 	case MB_NTERM_reg:
-		if (tree->reg1 < 0) { 
-			tree->reg1 = mono_regset_alloc_reg (rs, -1, tree->exclude_mask);
-			g_assert (tree->reg1 != -1);
+		switch (tree->op) {
+		case MB_TERM_MUL_OVF_UN:
+		case MB_TERM_DIV:
+		case MB_TERM_DIV_UN:
+		case MB_TERM_REM:
+		case MB_TERM_REM_UN:
+			if ((tree->reg1 = mono_regset_alloc_reg (rs, X86_EAX, exclude_mask)) == -1)
+				return FALSE;			
+			if ((tree->reg2 = mono_regset_alloc_reg (rs, X86_EDX, exclude_mask)) == -1)
+				return FALSE;
+			break;
+		default:
+			if ((tree->reg1 = mono_regset_alloc_reg (rs, -1, exclude_mask)) == -1)
+				return FALSE;
 		}
 		break;
 
 	case MB_NTERM_lreg:
-		if (tree->reg1 < 0) { 
-			tree->reg1 = mono_regset_alloc_reg (rs, -1, tree->exclude_mask);
-			g_assert (tree->reg1 != -1);
-		}
-		if (tree->reg2 < 0) { 
-			tree->reg2 = mono_regset_alloc_reg (rs, -1, tree->exclude_mask);
-			g_assert (tree->reg2 != -1);
+		switch (tree->op) {
+		case MB_TERM_MUL:
+		case MB_TERM_MUL_OVF:
+		case MB_TERM_MUL_OVF_UN:
+		case MB_TERM_DIV:
+		case MB_TERM_DIV_UN:
+		case MB_TERM_REM:
+		case MB_TERM_REM_UN:
+			if ((tree->reg1 = mono_regset_alloc_reg (rs, X86_EAX, exclude_mask)) == -1)
+				return FALSE;			
+			if ((tree->reg2 = mono_regset_alloc_reg (rs, X86_EDX, exclude_mask)) == -1)
+				return FALSE;
+			break;
+		default:
+			if ((tree->reg1 = mono_regset_alloc_reg (rs, -1, exclude_mask)) == -1)
+				return FALSE;
+			if ((tree->reg2 = mono_regset_alloc_reg (rs, -1, exclude_mask)) == -1)
+				return FALSE;
 		}
 		break;
 
@@ -620,36 +928,43 @@ tree_allocate_regs (MBTree *tree, int goal, MonoRegSet *rs)
       
 	case MB_NTERM_addr:
 		if (tree->op == MB_TERM_ADD) {
-			tree->reg1 = mono_regset_alloc_reg (rs, tree->left->reg1, tree->exclude_mask);
-			tree->reg2 = mono_regset_alloc_reg (rs, tree->right->reg1, tree->exclude_mask);
+			if ((tree->reg1 = mono_regset_alloc_reg (rs, tree->left->reg1, exclude_mask)) == -1)
+				return FALSE;
+			if ((tree->reg2 = mono_regset_alloc_reg (rs, tree->right->reg1, exclude_mask)) == -1)
+				return FALSE;
 		}
 		break;
 		
 	case MB_NTERM_base:
 		if (tree->op == MB_TERM_ADD) {
-			tree->reg1 = mono_regset_alloc_reg (rs, tree->left->reg1, tree->exclude_mask);
+			if ((tree->reg1 = mono_regset_alloc_reg (rs, tree->left->reg1, exclude_mask)) == -1)
+				return FALSE;
 		}
 		break;
 	       
 	case MB_NTERM_index:
 		if (tree->op == MB_TERM_SHL ||
 		    tree->op == MB_TERM_MUL) {
-			tree->reg1 = mono_regset_alloc_reg (rs, tree->left->reg1, tree->exclude_mask);
+			if ((tree->reg1 = mono_regset_alloc_reg (rs, tree->left->reg1, exclude_mask)) == -1)
+				return FALSE;
 		}
 		break;
 	       
 	default:
 		/* do nothing */
+		break;
 	}
 
-	//printf ("RALLOC END %d %p\n",  tree->op, rs->free_mask);
-	tree->emit = mono_burg_func [ern];
+#ifdef DEBUG_REGALLOC
+	printf ("tree_allocate_regs end %d %08x\n",  tree->op, rs->free_mask);
+#endif
+	return TRUE;
 }
 
 static void
 arch_allocate_regs (MonoFlowGraph *cfg)
 {
-	int i, j;
+	int i, j, max_spillcount = 0;
 	
 	for (i = 0; i < cfg->block_count; i++) {
 		GPtrArray *forest = cfg->bblocks [i].forest;
@@ -662,36 +977,124 @@ arch_allocate_regs (MonoFlowGraph *cfg)
 
 		for (j = 0; j < top; j++) {
 			MBTree *t1 = (MBTree *) g_ptr_array_index (forest, j);
-			//printf ("AREGSTART %d:%d %p\n", i, j, cfg->rs->free_mask);
-			tree_allocate_regs (t1, 1, cfg->rs);
-			//printf ("AREGENDT %d:%d %p\n", i, j, cfg->rs->free_mask);
+			int spillcount = 0;
+#ifdef DEBUG_REGALLOC
+			printf ("arch_allocate_regs start %d:%d %08x\n", i, j, cfg->rs->free_mask);
+#endif
+			if (!tree_allocate_regs (cfg, t1, 1, cfg->rs, 0, &spillcount)) {
+				mono_print_ctree (cfg, t1);
+				printf ("\n");
+				g_error ("register allocation failed");
+			}
+
+			max_spillcount = MAX (max_spillcount, spillcount);
+
+#ifdef DEBUG_REGALLOC
+			printf ("arch_allocate_regs end %d:%d %08x\n", i, j, cfg->rs->free_mask);
+#endif
 			g_assert (cfg->rs->free_mask == 0xffffffff);
 		}
 	}
+
+	/* allocate space for spilled regs */
+
+	cfg->spillvars = mono_mempool_alloc0 (cfg->mp, sizeof (gint) *  max_spillcount);
+	cfg->spillcount = max_spillcount;
+
+	for (i = 0; i < max_spillcount; i++) {
+		int spillvar;
+		spillvar = arch_allocate_var (cfg, sizeof (gpointer), sizeof (gpointer),
+					      MONO_TEMPVAR, VAL_I32);
+		cfg->spillvars [i] = VARINFO (cfg, spillvar).offset;
+	}
 }
 
 static void
-tree_emit (int goal, MonoFlowGraph *cfg, MBTree *tree) 
+tree_emit (int goal, MonoFlowGraph *cfg, MBTree *tree, int *spillcount) 
 {
 	MBTree *kids[10];
-	int i, ern = mono_burg_rule (tree->state, goal);
+	int ern = mono_burg_rule (tree->state, goal);
 	const guint16 *nts = mono_burg_nts [ern];
 	MBEmitFunc emit;
 	int offset;
 
 	mono_burg_kids (tree, ern, kids);
 
-	for (i = 0; nts [i]; i++) 
-		tree_emit (nts [i], cfg, kids [i]);
+	if (nts [0]) {
+		if (nts [1]) {
+			int spilloffset1, spilloffset2, spilloffset3;
+			
+			tree_emit (nts [0], cfg, kids [0], spillcount);
+
+			if (kids [0]->spilled) {
+#ifdef DEBUG_SPILLS
+				printf ("SPILL_REGS %d %03x %s.%s:%s\n", 
+					nts [0], cfg->code - cfg->start,
+					cfg->method->klass->name_space,
+					cfg->method->klass->name, cfg->method->name);
+
+				mono_print_ctree (cfg, kids [0]);printf ("\n\n");
+#endif
+				spilloffset1 = 0;
+				spilloffset2 = 0;
+				spilloffset3 = 0;
+
+				if (kids [0]->reg1 != -1) {
+					spilloffset1 = cfg->spillvars [(*spillcount)++];
+					x86_mov_membase_reg (cfg->code, X86_EBP, spilloffset1, 
+							     kids [0]->reg1, 4);
+				}
+				if (kids [0]->reg2 != -1) {
+					spilloffset2 = cfg->spillvars [(*spillcount)++];
+					x86_mov_membase_reg (cfg->code, X86_EBP, spilloffset2, 
+							     kids [0]->reg2, 4);
+				}
+				if (kids [0]->reg3 != -1) {
+					spilloffset3 = cfg->spillvars [(*spillcount)++];
+					x86_mov_membase_reg (cfg->code, X86_EBP, spilloffset3, 
+							     kids [0]->reg3, 4);
+				}
+			}
+
+			tree_emit (nts [1], cfg, kids [1], spillcount);
+
+			if (kids [0]->spilled) {
+
+#ifdef DEBUG_SPILLS
+				printf ("RELOAD_REGS %03x %s.%s:%s\n", 
+					cfg->code - cfg->start,
+					cfg->method->klass->name_space,
+					cfg->method->klass->name, cfg->method->name);
+#endif
+
+				if (kids [0]->reg3 != -1) 
+					x86_mov_reg_membase (cfg->code, kids [0]->reg3, X86_EBP, 
+							     spilloffset3, 4);
+				if (kids [0]->reg2 != -1) 
+					x86_mov_reg_membase (cfg->code, kids [0]->reg2, X86_EBP, 
+							     spilloffset2, 4);
+				if (kids [0]->reg1 != -1) 
+					x86_mov_reg_membase (cfg->code, kids [0]->reg1, X86_EBP, 
+							     spilloffset1, 4);
+			}
+
+			if (nts [2]) {
+				g_assert (!nts [3]);
+				tree_emit (nts [2], cfg, kids [2], spillcount);
+			}
+		} else {
+			tree_emit (nts [0], cfg, kids [0], spillcount);
+		}
+	}
+
+	g_assert ((*spillcount) <= cfg->spillcount);
 
 	tree->addr = offset = cfg->code - cfg->start;
 
-	// we assume an instruction uses a maximum of 128 bytes
+	/* we assume an instruction uses a maximum of 128 bytes */
 	if ((cfg->code_size - offset) <= 128) {
-		int add = MIN ((cfg->code_size * 2), 1024);
-
+		int add = MIN (cfg->code_size, 128);
 		cfg->code_size += add;
-		mono_jit_stats.allocated_code_size += add;
 		mono_jit_stats.code_reallocs++;
 		cfg->start = g_realloc (cfg->start, cfg->code_size);
 		g_assert (cfg->start);
@@ -707,7 +1110,7 @@ tree_emit (int goal, MonoFlowGraph *cfg, MBTree *tree)
 static void
 mono_emit_cfg (MonoFlowGraph *cfg)
 {
-	int i, j;
+	int i, j, spillcount;
 
 	for (i = 0; i < cfg->block_count; i++) {
 		MonoBBlock *bb = &cfg->bblocks [i];
@@ -724,7 +1127,8 @@ mono_emit_cfg (MonoFlowGraph *cfg)
 		for (j = 0; j < top; j++) {
 			MBTree *t1 = (MBTree *) g_ptr_array_index (forest, j);
 			
-			tree_emit (1, cfg, t1);
+			spillcount = 0;
+			tree_emit (1, cfg, t1, &spillcount);
 		}
 	}
 		
@@ -756,12 +1160,11 @@ mono_compute_branches (MonoFlowGraph *cfg)
 			if (t1->op == MB_TERM_SWITCH) {
 				MonoBBlock **jt = (MonoBBlock **)t1->data.p;
 				guint32 *rt = (guint32 *)t1->data.p;
-				
 				int m = *((guint32 *)t1->data.p) + 1;
-				int j;
+				int k;
 				
-				for (j = 1; j <= m; j++)
-					rt [j] = (int)(jt [j]->addr + cfg->start);
+				for (k = 1; k <= m; k++)
+					rt [k] = (int)(jt [k]->addr + cfg->start);
 				
 				/* emit the switch instruction again to update addresses */
 				cfg->code = cfg->start + t1->addr;
@@ -773,679 +1176,117 @@ mono_compute_branches (MonoFlowGraph *cfg)
 	cfg->code = end;
 
 	for (ji = cfg->jump_info; ji; ji = ji->next) {
-		gpointer *ip = GUINT_TO_POINTER (GPOINTER_TO_UINT (ji->ip) + cfg->start);
-		gpointer target;
+		unsigned char *ip = GUINT_TO_POINTER (GPOINTER_TO_UINT (ji->ip) + cfg->start);
+		unsigned char *target;
 
-		if (ji->target) {
-			target = ji->target;
-		} else if (ji->bb) {
-			target = ji->bb->addr + cfg->start;
-		} else {
-			/* special case - jump to epilog */
+		switch (ji->type) {
+		case MONO_JUMP_INFO_BB:
+			target = ji->data.bb->addr + cfg->start;
+			break;
+		case MONO_JUMP_INFO_ABS:
+			target = ji->data.target;
+			break;
+		case MONO_JUMP_INFO_EPILOG:
 			target = cfg->epilog + cfg->start;
+			break;
+		case MONO_JUMP_INFO_IP:
+			*(unsigned char**)ip = ip;
+			continue;
+		default:
+			g_assert_not_reached ();
 		}
-		*ip = target - GPOINTER_TO_UINT(ip) - 4;
+		x86_patch (ip, target);
+	}
+
+	/* patch the IP in the LMF saving code */
+	if (cfg->lmfip_offset) {
+		*((guint32 *)(cfg->start + cfg->lmfip_offset)) =  
+			(gint32)(cfg->start + cfg->lmfip_offset);
 	}
 }
 
 void
-mono_add_jump_info (MonoFlowGraph *cfg, gpointer ip, gpointer target, MonoBBlock *bb)
+mono_add_jump_info (MonoFlowGraph *cfg, gpointer ip, MonoJumpInfoType type, gpointer target)
 {
 	MonoJumpInfo *ji = mono_mempool_alloc (cfg->mp, sizeof (MonoJumpInfo));
 
+	ji->type = type;
 	ji->ip = GUINT_TO_POINTER (GPOINTER_TO_UINT (ip) - GPOINTER_TO_UINT (cfg->start));
-	ji->target = target;
+	ji->data.target = target;
 	ji->next = cfg->jump_info;
-	ji->bb = bb;
 
 	cfg->jump_info = ji;
 }
 
-static int
-match_debug_method (MonoMethod* method)
-{
-	GList *tmp = mono_debug_methods;
-
-	for (; tmp; tmp = tmp->next) {
-		if (strcmp (method->name, tmp->data) == 0) {
-			return 1;
-		}
-	}
-	return 0;
-}
-
-/**
- * arch_compile_method:
- * @method: pointer to the method info
- *
- * JIT compilation of a single method. 
- *
- * Returns: a pointer to the newly created code.
- */
-gpointer
-arch_compile_method (MonoMethod *method)
+MonoJitInfo *
+arch_jit_compile_cfg (MonoDomain *target_domain, MonoFlowGraph *cfg)
 {
-	MonoDomain *domain = mono_domain_get ();
-	MonoFlowGraph *cfg;
-	MonoMemPool *mp;
-	guint8 *addr;
-	GHashTable *jit_code_hash;
-
-	g_assert (!(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL));
-	g_assert (!(method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL));
-
-	if (mono_jit_share_code)
-		jit_code_hash = mono_root_domain->jit_code_hash;
-	else
-		jit_code_hash = domain->jit_code_hash;
-
-	if ((addr = g_hash_table_lookup (jit_code_hash, method))) {
-		mono_jit_stats.methods_lookups++;
-		return addr;
-	}
-
-	mono_jit_stats.methods_compiled++;
-	
-	mp = mono_mempool_new ();
-
-	if (mono_jit_trace_calls || mono_jit_dump_asm || mono_jit_dump_forest) {
-		printf ("Start JIT compilation of %s.%s:%s\n", method->klass->name_space,
-			method->klass->name, method->name);
-	}
-
-	if (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) {
-		MonoClassField *field;
-		const char *name = method->name;
-		static guint target_offset = 0;
-		static guint method_offset = 0;
-		guint8 *code;
-		gboolean delegate = FALSE;
-
-		if (method->klass->parent && 
-		    method->klass->parent->parent == mono_defaults.delegate_class)
-			delegate = TRUE;
-				
-		if (!target_offset) {
-			mono_class_init (mono_defaults.delegate_class);
-
-			field = mono_class_get_field_from_name (mono_defaults.delegate_class, "m_target");
-			target_offset = field->offset;
-			field = mono_class_get_field_from_name (mono_defaults.delegate_class, "method_ptr");
-			method_offset = field->offset;
-		}
-		
-		if (delegate && *name == '.' && (strcmp (name, ".ctor") == 0)) {
-			addr = code = g_malloc (32);
-			x86_push_reg (code, X86_EBP);
-			x86_mov_reg_reg (code, X86_EBP, X86_ESP, 4);
-			
-			/* load the this pointer */
-			x86_mov_reg_membase (code, X86_EAX, X86_EBP, 8, 4); 
-			/* load m_target arg */
-			x86_mov_reg_membase (code, X86_EDX, X86_EBP, 12, 4);
-			/* store mtarget */
-			x86_mov_membase_reg (code, X86_EAX, target_offset, X86_EDX, 4); 
-			/* load method_ptr arg */
-			x86_mov_reg_membase (code, X86_EDX, X86_EBP, 16, 4);
-			/* store method_ptr */
-			x86_mov_membase_reg (code, X86_EAX, method_offset, X86_EDX, 4); 
-
-			x86_leave (code);
-			x86_ret (code);
-
-			g_assert ((code - (guint8*)addr) < 32);
-
-		} else if (delegate && *name == 'I' && (strcmp (name, "Invoke") == 0)) {
-			MonoMethodSignature *csig = method->signature;
-			int i, arg_size, target, this_pos = 4;
-			guint8 *source;
-			
-			if (csig->ret->type == MONO_TYPE_VALUETYPE) {
-				g_assert (!csig->ret->byref);
-				this_pos = 8;
-			}
-
-			arg_size = 0;
-			if (csig->param_count) {
-				int align;
-				
-				for (i = 0; i < csig->param_count; ++i) {
-					arg_size += mono_type_stack_size (csig->params [i], &align);
-					g_assert (align == 4);
-				}
-			}
-
-			addr = g_malloc (64 + arg_size);
-
-			for (i = 0; i < 2; i ++) {
-				int j;
-
-				code = addr;
-				/* load the this pointer */
-				x86_mov_reg_membase (code, X86_EAX, X86_ESP, this_pos, 4);
-				/* load mtarget */
-				x86_mov_reg_membase (code, X86_EDX, X86_EAX, target_offset, 4); 
-				/* check if zero (static method call without this pointer) */
-				x86_alu_reg_imm (code, X86_CMP, X86_EDX, 0);
-				x86_branch32 (code, X86_CC_EQ, target, TRUE); 
-				source = code;
-
-				/* virtual delegate methods: we have to replace the this pointer 
-				 * withe the actual target */
-				x86_mov_membase_reg (code, X86_ESP, this_pos, X86_EDX, 4); 
-				/* jump to method_ptr() */
-				x86_jump_membase (code, X86_EAX, method_offset);
-
-				/* static delegate methods: we have to remove the this pointer 
-				 * from the activation frame - I do this do creating a new 
-				 * stack frame an copy all arguments except the this pointer */
-
-				target = code - source;
-				g_assert ((arg_size & 3) == 0);
-				for (j = 0; j < (arg_size>>2); j++) {
-					x86_push_membase (code, X86_ESP, (arg_size + this_pos));
-				}
-
-				if (this_pos == 8) 
-					x86_push_membase (code, X86_ESP, (arg_size + 4));
-				
-				x86_call_membase (code, X86_EAX, method_offset);
-				if (this_pos == 8) 
-					x86_alu_reg_imm (code, X86_ADD, X86_ESP, arg_size + 4);
-				else
-					x86_alu_reg_imm (code, X86_ADD, X86_ESP, arg_size);
-				
-				x86_ret (code);
-
-			}
-
-			g_assert ((code - (guint8*)addr) < (64 + arg_size));
+	MonoJitInfo *ji;
+	guint32 ls_used_mask = 0;
+	MonoMethod *method = cfg->method;
+	int offset, gap;
 
-		} else {
-			if (mono_debug_handle)
-				return NULL;
-			g_error ("Don't know how to exec runtime method %s.%s::%s", 
-				 method->klass->name_space, method->klass->name, method->name);
-		}
-	
-	} else {
-		MonoMethodHeader *header = ((MonoMethodNormal *)method)->header;
-		MonoJitInfo *ji = g_new0 (MonoJitInfo, 1);
-		gulong code_size_ratio;
+	ji = mono_mempool_alloc0 (target_domain->mp, sizeof (MonoJitInfo));
 		
-		cfg = mono_cfg_new (method, mp);
+	cfg->rs = mono_regset_new (X86_NREG);
+	mono_regset_reserve_reg (cfg->rs, X86_ESP);
+	mono_regset_reserve_reg (cfg->rs, X86_EBP);
 
-		mono_analyze_flow (cfg);
-		if (cfg->invalid)
-			return NULL;
+	/* we can use this regs for global register allocation */
+	mono_regset_reserve_reg (cfg->rs, X86_EBX);
+	mono_regset_reserve_reg (cfg->rs, X86_ESI);
 
-		mono_analyze_stack (cfg);
-		if (cfg->invalid)
-			return NULL;
-	
-		cfg->rs = mono_regset_new (X86_NREG);
-		mono_regset_reserve_reg (cfg->rs, X86_ESP);
-		mono_regset_reserve_reg (cfg->rs, X86_EBP);
-
-		cfg->code_size = MAX (header->code_size * 5, 256);
-		cfg->start = cfg->code = g_malloc (cfg->code_size);
-		mono_jit_stats.allocated_code_size += cfg->code_size;
-
-		if (match_debug_method (method))
-			x86_breakpoint (cfg->code);
-
-		if (mono_jit_dump_forest) {
-			int i;
-			printf ("FOREST %s.%s:%s\n", method->klass->name_space,
-				method->klass->name, method->name);
-			for (i = 0; i < cfg->block_count; i++) {
-				printf ("BLOCK %d:\n", i);
-				mono_print_forest (cfg->bblocks [i].forest);
-			}
-		}
+	if (mono_use_linear_scan) {
+		mono_linear_scan (cfg, &ls_used_mask);
+		cfg->rs->used_mask |= ls_used_mask;
+	}
 	
-		mono_label_cfg (cfg);
-		if (cfg->invalid)
-			return NULL;
-
-		arch_allocate_regs (cfg);
-
-		/* align to 8 byte boundary */
-		cfg->locals_size += 7;
-		cfg->locals_size &= ~7;
-
-		arch_emit_prologue (cfg);
-		mono_emit_cfg (cfg);
-		arch_emit_epilogue (cfg);		
-
-		addr = cfg->start;
-
-		code_size_ratio = cfg->code - cfg->start;
-		if (code_size_ratio > mono_jit_stats.biggest_method_size) {
-			mono_jit_stats.biggest_method_size = code_size_ratio;
-			mono_jit_stats.biggest_method = method;
-		}
-		code_size_ratio = (code_size_ratio * 100) / header->code_size;
-		if (code_size_ratio > mono_jit_stats.max_code_size_ratio) {
-			mono_jit_stats.max_code_size_ratio = code_size_ratio;
-			mono_jit_stats.max_ratio_method = method;
+	if (mono_jit_dump_forest) {
+		int i;
+		printf ("FOREST %s\n", mono_method_full_name (method, TRUE));
+		for (i = 0; i < cfg->block_count; i++) {
+			printf ("BLOCK %d:\n", i);
+			mono_print_forest (cfg, cfg->bblocks [i].forest);
 		}
-
-		mono_compute_branches (cfg);
-		
-		if (mono_jit_dump_asm) {
-			char *id = g_strdup_printf ("%s.%s_%s", method->klass->name_space,
-						    method->klass->name, method->name);
-			mono_disassemble_code (cfg->start, cfg->code - cfg->start, id);
-			g_free (id);
-		}
-		if (mono_debug_handle)
-			mono_debug_add_method (mono_debug_handle, cfg);
-
-		ji->code_size = cfg->code - cfg->start;
-		ji->used_regs = cfg->rs->used_mask;
-		ji->method = method;
-		ji->code_start = addr;
-		mono_jit_info_table_add (mono_jit_info_table, ji);
-
-		mono_jit_stats.native_code_size += ji->code_size;
-
-		if (header->num_clauses) {
-			int i, start_block, end_block;
-
-			ji->num_clauses = header->num_clauses;
-			ji->clauses = g_new0 (MonoJitExceptionInfo, header->num_clauses);
-
-			for (i = 0; i < header->num_clauses; i++) {
-				MonoExceptionClause *ec = &header->clauses [i];
-				MonoJitExceptionInfo *ei = &ji->clauses [i];
-			
-				ei->flags = ec->flags;
-				ei->token_or_filter = ec->token_or_filter;
-
-				g_assert (cfg->bcinfo [ec->try_offset].is_block_start);
-				start_block = cfg->bcinfo [ec->try_offset].block_id;
-				end_block = cfg->bcinfo [ec->try_offset + ec->try_len].block_id;
-				g_assert (cfg->bcinfo [ec->try_offset + ec->try_len].is_block_start);
-				
-				ei->try_start = cfg->start + cfg->bblocks [start_block].addr;
-				ei->try_end = cfg->start + cfg->bblocks [end_block].addr;
-				
-				g_assert (cfg->bcinfo [ec->handler_offset].is_block_start);
-				start_block = cfg->bcinfo [ec->handler_offset].block_id;
-				ei->handler_start = cfg->start + cfg->bblocks [start_block].addr;	
-				
-				//printf ("TEST %x %x %x\n", ei->try_start, ei->try_end, ei->handler_start);
-			}
-		}
-		
-		mono_regset_free (cfg->rs);
-
-		mono_cfg_free (cfg);
-
-		mono_mempool_destroy (mp);
-
 	}
-
-	if (mono_jit_trace_calls || mono_jit_dump_asm || mono_jit_dump_forest) {
-		printf ("END JIT compilation of %s.%s:%s %p %p\n", method->klass->name_space,
-			method->klass->name, method->name, method, addr);
-	}
-
-	g_hash_table_insert (jit_code_hash, method, addr);
-
-	return addr;
-}
-
-/*
- * arch_get_restore_context:
- *
- * Returns a pointer to a method which restores a previously saved sigcontext.
- */
-static gpointer
-arch_get_restore_context ()
-{
-	static guint8 *start = NULL;
-	guint8 *code;
-
-	if (start)
-		return start;
-
-	/* restore_contect (struct sigcontext *ctx) */
-	/* we do not restore X86_EAX, X86_EDX */
-
-	start = code = malloc (1024);
-	
-	/* load ctx */
-	x86_mov_reg_membase (code, X86_EAX, X86_ESP, 4, 4);
-
-	/* get return address, stored in EDX */
-	x86_mov_reg_membase (code, X86_EDX, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, eip), 4);
-
-	/* restore EBX */
-	x86_mov_reg_membase (code, X86_EBX, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, ebx), 4);
-	/* restore EDI */
-	x86_mov_reg_membase (code, X86_EDI, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, edi), 4);
-	/* restore ESI */
-	x86_mov_reg_membase (code, X86_ESI, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, esi), 4);
-	/* restore ESP */
-	x86_mov_reg_membase (code, X86_ESP, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, esp), 4);
-	/* restore EBP */
-	x86_mov_reg_membase (code, X86_EBP, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, ebp), 4);
-	/* restore ECX. the exception object is passed here to the catch handler */
-	x86_mov_reg_membase (code, X86_ECX, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, ecx), 4);
-
-	/* jump to the saved IP */
-	x86_jump_reg (code, X86_EDX);
-
-	return start;
-}
-
-/*
- * arch_get_call_finally:
- *
- * Returns a pointer to a method which calls a finally handler.
- */
-static gpointer
-arch_get_call_finally ()
-{
-	static guint8 start [28];
-	static int inited = 0;
-	guint8 *code;
-
-	if (inited)
-		return start;
-
-	inited = 1;
-	/* call_finally (struct sigcontext *ctx, unsigned long eip) */
-	code = start;
-
-	x86_push_reg (code, X86_EBP);
-	x86_mov_reg_reg (code, X86_EBP, X86_ESP, 4);
-	x86_push_reg (code, X86_EBX);
-	x86_push_reg (code, X86_EDI);
-	x86_push_reg (code, X86_ESI);
-
-	/* load ctx */
-	x86_mov_reg_membase (code, X86_EAX, X86_EBP, 8, 4);
-	/* load eip */
-	x86_mov_reg_membase (code, X86_ECX, X86_EBP, 12, 4);
-	/* save EBP */
-	x86_push_reg (code, X86_EBP);
-	/* set new EBP */
-	x86_mov_reg_membase (code, X86_EBP, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, ebp), 4);
-	/* call the handler */
-	x86_call_reg (code, X86_ECX);
-	/* restore EBP */
-	x86_pop_reg (code, X86_EBP);
-	/* restore saved regs */
-	x86_pop_reg (code, X86_ESI);
-	x86_pop_reg (code, X86_EDI);
-	x86_pop_reg (code, X86_EBX);
-	x86_leave (code);
-	x86_ret (code);
-
-	g_assert ((code - start) < 28);
-	return start;
-}
-
-/**
- * arch_handle_exception:
- * @ctx: saved processor state
- * @obj:
- */
-void
-arch_handle_exception (struct sigcontext *ctx, gpointer obj)
-{
-	MonoDomain *domain = mono_domain_get ();
-	MonoJitInfo *ji;
-	gpointer ip = (gpointer)ctx->eip;
-	static void (*restore_context) (struct sigcontext *);
-	static void (*call_finally) (struct sigcontext *, unsigned long);
-       
-	g_assert (ctx != NULL);
-	g_assert (obj != NULL);
-
-	ji = mono_jit_info_table_find (mono_jit_info_table, ip);
-
-	if (!restore_context)
-		restore_context = arch_get_restore_context ();
-	
-	if (!call_finally)
-		call_finally = arch_get_call_finally ();
-
-	if (ji) { /* we are inside managed code */
-		MonoMethod *m = ji->method;
-		unsigned next_bp;
-		int offset = 2;
-
-		if (ji->num_clauses) {
-			int i;
-
-			g_assert (ji->clauses);
 			
-			for (i = 0; i < ji->num_clauses; i++) {
-				MonoJitExceptionInfo *ei = &ji->clauses [i];
-
-				if (ei->try_start <= ip && ip <= (ei->try_end)) { 
-					/* catch block */
-					if (ei->flags == 0 && mono_object_isinst (obj, 
-					        mono_class_get (m->klass->image, ei->token_or_filter))) {
-					
-						ctx->eip = (unsigned long)ei->handler_start;
-						ctx->ecx = (unsigned long)obj;
-						restore_context (ctx);
-						g_assert_not_reached ();
-					}
-				}
-			}
-
-			/* no handler found - we need to call all finally handlers */
-			for (i = 0; i < ji->num_clauses; i++) {
-				MonoJitExceptionInfo *ei = &ji->clauses [i];
-
-				if (ei->try_start <= ip && ip < (ei->try_end) &&
-				    (ei->flags & MONO_EXCEPTION_CLAUSE_FINALLY)) {
-					call_finally (ctx, (unsigned long)ei->handler_start);
-				}
-			}
-		}
-
-		if (mono_object_isinst (obj, mono_defaults.exception_class)) {
-			char  *strace = mono_string_to_utf8 (((MonoException*)obj)->stack_trace);
-			char  *tmp;
-
-			if (!strcmp (strace, "TODO: implement stack traces")){
-				g_free (strace);
-				strace = g_strdup ("");
-			}
-
-			tmp = g_strdup_printf ("%sin %s.%s:%s ()\n", strace, m->klass->name_space,  
-					       m->klass->name, m->name);
-
-			g_free (strace);
-
-			((MonoException*)obj)->stack_trace = mono_string_new (domain, tmp);
-			g_free (tmp);
-		}
-
-		/* continue unwinding */
-
-		/* restore caller saved registers */
-		if (ji->used_regs & X86_ESI_MASK) {
-			ctx->esi = *((int *)ctx->ebp + offset);
-			offset++;
-		}
-		if (ji->used_regs & X86_EDI_MASK) {
-			ctx->edi = *((int *)ctx->ebp + offset);
-			offset++;
-		}
-		if (ji->used_regs & X86_EBX_MASK) {
-			ctx->ebx = *((int *)ctx->ebp + offset);
-		}
-
-		ctx->esp = ctx->ebp;
-		ctx->eip = *((int *)ctx->ebp + 1);
-		ctx->ebp = *((int *)ctx->ebp);
+	if (!mono_label_cfg (cfg))
+		return NULL;
 		
-		if (next_bp < (unsigned)mono_end_of_stack)
-			arch_handle_exception (ctx, obj);
-		else
-			mono_jit_abort (obj);
-
-	} else {
-		gpointer *lmf_addr = TlsGetValue (lmf_thread_id);
-		MonoLMF *lmf;
-		MonoMethod *m;
-
-		g_assert (lmf_addr);
-		lmf = *((MonoLMF **)lmf_addr);
-
-		if (!lmf)
-			mono_jit_abort (obj);
-
-		m = lmf->method;
-
-		*lmf_addr = lmf->previous_lmf;
-
-		ctx->esi = lmf->esi;
-		ctx->edi = lmf->edi;
-		ctx->ebx = lmf->ebx;
-		ctx->ebp = lmf->ebp;
-		ctx->eip = lmf->eip;
-		ctx->esp = (unsigned long)lmf;
-
-		if (mono_object_isinst (obj, mono_defaults.exception_class)) {
-			char  *strace = mono_string_to_utf8 (((MonoException*)obj)->stack_trace);
-			char  *tmp;
-
-			if (!strcmp (strace, "TODO: implement stack traces"))
-				strace = g_strdup ("");
-
-			tmp = g_strdup_printf ("%sin (unmanaged) %s.%s:%s ()\n", strace, m->klass->name_space,  
-					       m->klass->name, m->name);
-
-			g_free (strace);
-
-			((MonoException*)obj)->stack_trace = mono_string_new (domain, tmp);
-			g_free (tmp);
-		}
-
-		if (ctx->eip < (unsigned)mono_end_of_stack)
-			arch_handle_exception (ctx, obj);
-		else
-			mono_jit_abort (obj);
+	arch_allocate_regs (cfg);
+
+	/* align to 8 byte boundary */
+	cfg->locals_size += 7;
+	cfg->locals_size &= ~7;
+
+	arch_emit_prologue (cfg);
+	cfg->prologue_end = cfg->code - cfg->start;
+	mono_emit_cfg (cfg);
+	arch_emit_epilogue (cfg);		
+	cfg->epilogue_end = cfg->code - cfg->start;
+
+	offset = cfg->code - cfg->start;
+	gap = cfg->code_size - offset;
+	if (gap > 0) {
+		char *org = cfg->start;
+#if 0
+		cfg->start = g_realloc (cfg->start, offset);
+#else
+		cfg->start = mono_mempool_alloc (target_domain->code_mp, offset);
+		memcpy (cfg->start, org, offset);
+		g_free (org);
+#endif
+		cfg->code_size = offset;
+		cfg->code = cfg->start + offset;
 	}
 
-	g_assert_not_reached ();
-}
+	mono_compute_branches (cfg);
 
-static void
-throw_exception (unsigned long eax, unsigned long ecx, unsigned long edx, unsigned long ebx,
-		 unsigned long esi, unsigned long edi, unsigned long ebp, MonoObject *exc,
-		 unsigned long eip,  unsigned long esp)
-{
-	struct sigcontext ctx;
-
-	ctx.esp = esp;
-	ctx.eip = eip;
-	ctx.ebp = ebp;
-	ctx.edi = edi;
-	ctx.esi = esi;
-	ctx.ebx = ebx;
-	ctx.edx = edx;
-	ctx.ecx = ecx;
-	ctx.eax = eax;
-	
-	arch_handle_exception (&ctx, exc);
+	ji->code_size = cfg->code - cfg->start;
+	ji->used_regs = cfg->rs->used_mask;
+	ji->method = method;
+	ji->code_start = cfg->start;
 
-	g_assert_not_reached ();
+	return ji;
 }
 
-/**
- * arch_get_throw_exception:
- *
- * Returns a function pointer which can be used to raise 
- * exceptions. The returned function has the following 
- * signature: void (*func) (MonoException *exc); 
- * For example to raise an arithmetic exception you can use:
- *
- * x86_push_imm (code, mono_get_exception_arithmetic ()); 
- * x86_call_code (code, arch_get_throw_exception ()); 
- *
- */
-gpointer 
-arch_get_throw_exception (void)
-{
-	static guint8 start [24];
-	static int inited = 0;
-	guint8 *code;
-
-	if (inited)
-		return start;
-
-	inited = 1;
-	code = start;
-
-	x86_push_reg (code, X86_ESP);
-	x86_push_membase (code, X86_ESP, 4); /* IP */
-	x86_push_membase (code, X86_ESP, 12); /* exception */
-	x86_push_reg (code, X86_EBP);
-	x86_push_reg (code, X86_EDI);
-	x86_push_reg (code, X86_ESI);
-	x86_push_reg (code, X86_EBX);
-	x86_push_reg (code, X86_EDX);
-	x86_push_reg (code, X86_ECX);
-	x86_push_reg (code, X86_EAX);
-	x86_call_code (code, throw_exception);
-	/* we should never reach this breakpoint */
-	x86_breakpoint (code);
-
-	g_assert ((code - start) < 24);
-	return start;
-}
-
-/**
- * arch_get_throw_exception_by_name:
- *
- * Returns a function pointer which can be used to raise 
- * corlib exceptions. The returned function has the following 
- * signature: void (*func) (char *exc_name); 
- * For example to raise an arithmetic exception you can use:
- *
- * x86_push_imm (code, "ArithmeticException"); 
- * x86_call_code (code, arch_get_throw_exception ()); 
- *
- */
-gpointer 
-arch_get_throw_exception_by_name ()
-{
-	static guint8 start [32];
-	static int inited = 0;
-	guint8 *code;
-
-	if (inited)
-		return start;
-
-	inited = 1;
-	code = start;
-
-	/* fixme: we do not save EAX, EDX, ECD - unsure if we need that */
-
-	x86_push_membase (code, X86_ESP, 4); /* exception name */
-	x86_push_imm (code, "System");
-	x86_push_imm (code, mono_defaults.exception_class->image);
-	x86_call_code (code, mono_exception_from_name);
-	x86_alu_reg_imm (code, X86_ADD, X86_ESP, 12);
-	/* save the newly create object (overwrite exception name)*/
-	x86_mov_membase_reg (code, X86_ESP, 4, X86_EAX, 4);
-	x86_jump_code (code, arch_get_throw_exception ());
-
-	g_assert ((code - start) < 32);
-
-	return start;
-}	
-
-
-
-
diff --git a/mono/jit/exception.c b/mono/jit/exception.c
new file mode 100644
index 00000000000..864c1492fb7
--- /dev/null
+++ b/mono/jit/exception.c
@@ -0,0 +1,727 @@
+/*
+ * exception.c: exception support
+ *
+ * Authors:
+ *   Dietmar Maurer (dietmar@ximian.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+#include <signal.h>
+
+#include <mono/arch/x86/x86-codegen.h>
+#include <mono/metadata/appdomain.h>
+#include <mono/metadata/tabledefs.h>
+#include <mono/metadata/threads.h>
+#include <mono/metadata/debug-helpers.h>
+
+#include "jit.h"
+#include "codegen.h"
+#include "debug.h"
+
+#ifdef __FreeBSD__
+# define SC_EAX sc_eax
+# define SC_EBX sc_ebx
+# define SC_ECX sc_ecx
+# define SC_EDX sc_edx
+# define SC_EBP sc_ebp
+# define SC_EIP sc_eip
+# define SC_ESP sc_esp
+# define SC_EDI sc_edi
+# define SC_ESI sc_esi
+#else
+# define SC_EAX eax
+# define SC_EBX ebx
+# define SC_ECX ecx
+# define SC_EDX edx
+# define SC_EBP ebp
+# define SC_EIP eip
+# define SC_ESP esp
+# define SC_EDI edi
+# define SC_ESI esi
+#endif
+
+/*
+ * arch_get_restore_context:
+ *
+ * Returns a pointer to a method which restores a previously saved sigcontext.
+ */
+static gpointer
+arch_get_restore_context (void)
+{
+	static guint8 *start = NULL;
+	guint8 *code;
+
+	if (start)
+		return start;
+
+	/* restore_contect (struct sigcontext *ctx) */
+	/* we do not restore X86_EAX, X86_EDX */
+
+	start = code = g_malloc (1024);
+	
+	/* load ctx */
+	x86_mov_reg_membase (code, X86_EAX, X86_ESP, 4, 4);
+
+	/* get return address, stored in EDX */
+	x86_mov_reg_membase (code, X86_EDX, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_EIP), 4);
+	/* restore EBX */
+	x86_mov_reg_membase (code, X86_EBX, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_EBX), 4);
+	/* restore EDI */
+	x86_mov_reg_membase (code, X86_EDI, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_EDI), 4);
+	/* restore ESI */
+	x86_mov_reg_membase (code, X86_ESI, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_ESI), 4);
+	/* restore ESP */
+	x86_mov_reg_membase (code, X86_ESP, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_ESP), 4);
+	/* restore EBP */
+	x86_mov_reg_membase (code, X86_EBP, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_EBP), 4);
+	/* restore ECX. the exception object is passed here to the catch handler */
+	x86_mov_reg_membase (code, X86_ECX, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_ECX), 4);
+
+	/* jump to the saved IP */
+	x86_jump_reg (code, X86_EDX);
+
+	return start;
+}
+
+/*
+ * arch_get_call_filter:
+ *
+ * Returns a pointer to a method which calls an exception filter.
+ */
+static gpointer
+arch_get_call_filter (void)
+{
+	static guint8 start [64];
+	static int inited = 0;
+	guint8 *code;
+
+	if (inited)
+		return start;
+
+	inited = 1;
+	/* call_finally (struct sigcontext *ctx, unsigned long eip, gpointer exc) */
+	code = start;
+
+	x86_push_reg (code, X86_EBP);
+	x86_mov_reg_reg (code, X86_EBP, X86_ESP, 4);
+	x86_push_reg (code, X86_EBX);
+	x86_push_reg (code, X86_EDI);
+	x86_push_reg (code, X86_ESI);
+
+	/* load ctx */
+	x86_mov_reg_membase (code, X86_EAX, X86_EBP, 8, 4);
+	/* load eip */
+	x86_mov_reg_membase (code, X86_ECX, X86_EBP, 12, 4);
+	/* save EBP */
+	x86_push_reg (code, X86_EBP);
+	/* push exc */
+	x86_push_membase (code, X86_EBP, 16);
+	/* set new EBP */
+	x86_mov_reg_membase (code, X86_EBP, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_EBP), 4);
+	/* restore registers used by global register allocation (EBX & ESI) */
+	x86_mov_reg_membase (code, X86_EBX, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_EBX), 4);
+	x86_mov_reg_membase (code, X86_ESI, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_ESI), 4);
+	/* save the ESP - this is used by endfinally */
+	x86_mov_membase_reg (code, X86_EBP, mono_exc_esp_offset, X86_ESP, 4);
+	/* call the handler */
+	x86_call_reg (code, X86_ECX);
+	x86_alu_reg_imm (code, X86_ADD, X86_ESP, 4);
+	/* restore EBP */
+	x86_pop_reg (code, X86_EBP);
+	/* restore saved regs */
+	x86_pop_reg (code, X86_ESI);
+	x86_pop_reg (code, X86_EDI);
+	x86_pop_reg (code, X86_EBX);
+	x86_leave (code);
+	x86_ret (code);
+
+	g_assert ((code - start) < 64);
+	return start;
+}
+
+/*
+ * arch_get_call_finally:
+ *
+ * Returns a pointer to a method which calls a finally handler.
+ */
+static gpointer
+arch_get_call_finally (void)
+{
+	static guint8 start [64];
+	static int inited = 0;
+	guint8 *code;
+
+	if (inited)
+		return start;
+
+	inited = 1;
+	/* call_finally (struct sigcontext *ctx, unsigned long eip) */
+	code = start;
+
+	x86_push_reg (code, X86_EBP);
+	x86_mov_reg_reg (code, X86_EBP, X86_ESP, 4);
+	x86_push_reg (code, X86_EBX);
+	x86_push_reg (code, X86_EDI);
+	x86_push_reg (code, X86_ESI);
+
+	/* load ctx */
+	x86_mov_reg_membase (code, X86_EAX, X86_EBP, 8, 4);
+	/* load eip */
+	x86_mov_reg_membase (code, X86_ECX, X86_EBP, 12, 4);
+	/* save EBP */
+	x86_push_reg (code, X86_EBP);
+	/* set new EBP */
+	x86_mov_reg_membase (code, X86_EBP, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_EBP), 4);
+	/* restore registers used by global register allocation (EBX & ESI) */
+	x86_mov_reg_membase (code, X86_EBX, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_EBX), 4);
+	x86_mov_reg_membase (code, X86_ESI, X86_EAX,  G_STRUCT_OFFSET (struct sigcontext, SC_ESI), 4);
+	/* save the ESP - this is used by endfinally */
+	x86_mov_membase_reg (code, X86_EBP, mono_exc_esp_offset, X86_ESP, 4);
+	/* call the handler */
+	x86_call_reg (code, X86_ECX);
+	/* restore EBP */
+	x86_pop_reg (code, X86_EBP);
+	/* restore saved regs */
+	x86_pop_reg (code, X86_ESI);
+	x86_pop_reg (code, X86_EDI);
+	x86_pop_reg (code, X86_EBX);
+	x86_leave (code);
+	x86_ret (code);
+
+	g_assert ((code - start) < 64);
+	return start;
+}
+
+static MonoArray *
+glist_to_array (GList *list) 
+{
+	MonoDomain *domain = mono_domain_get ();
+	MonoArray *res;
+	int len, i;
+
+	if (!list)
+		return NULL;
+
+	len = g_list_length (list);
+	res = mono_array_new (domain, mono_defaults.int_class, len);
+
+	for (i = 0; list; list = list->next, i++)
+		mono_array_set (res, gpointer, i, list->data);
+
+	return res;
+}
+
+MonoArray *
+ves_icall_get_trace (MonoException *exc, gint32 skip, MonoBoolean need_file_info)
+{
+	MonoDomain *domain = mono_domain_get ();
+	MonoArray *res;
+	MonoArray *ta = exc->trace_ips;
+	int i, len;
+	
+	len = mono_array_length (ta);
+
+	res = mono_array_new (domain, mono_defaults.stack_frame_class, len > skip ? len - skip : 0);
+
+	for (i = skip; i < len; i++) {
+		MonoJitInfo *ji;
+		MonoStackFrame *sf = (MonoStackFrame *)mono_object_new (domain, mono_defaults.stack_frame_class);
+		gpointer ip = mono_array_get (ta, gpointer, i);
+
+		ji = mono_jit_info_table_find (domain, ip);
+		g_assert (ji != NULL);
+
+		sf->method = mono_method_get_object (domain, ji->method, NULL);
+		sf->native_offset = (char *)ip - (char *)ji->code_start;
+		sf->il_offset = mono_debug_il_offset_from_address (ji->method, sf->native_offset);
+
+		if (need_file_info) {
+			gchar *filename;
+
+			filename = mono_debug_source_location_from_address (ji->method, sf->native_offset, &sf->line);
+
+			sf->filename = mono_string_new (domain, filename ? filename : "<unknown>");
+			sf->column = 0;
+
+			g_free (filename);
+		}
+
+		mono_array_set (res, gpointer, i, sf);
+	}
+
+	return res;
+}
+
+void
+mono_jit_walk_stack (MonoStackWalk func, gpointer user_data) {
+	MonoDomain *domain = mono_domain_get ();
+	MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
+	MonoLMF *lmf = jit_tls->lmf;
+	MonoJitInfo *ji;
+	MonoMethod *m;
+	gpointer ip;
+	gpointer *bp;
+	gint native_offset, il_offset;
+
+	bp = (gpointer *)&func;
+	ip = bp [-1];
+	bp = &ip;
+
+	while ((unsigned)bp < (unsigned)jit_tls->end_of_stack) {
+		if ((ji = mono_jit_info_table_find (domain, ip))) {
+			m = ji->method;
+			native_offset = (char *)ip - (char *)ji->code_start;
+			ip = (gpointer)((char *)bp [1] - 5);
+			bp = bp [0];
+			il_offset = mono_debug_il_offset_from_address (m, native_offset);
+		} else {
+			if (!lmf)
+				break;
+			m = lmf->method;
+
+			bp = (gpointer)lmf->ebp;
+			ip = (gpointer)lmf->eip;
+			lmf = lmf->previous_lmf;
+
+			native_offset = il_offset = -1;
+		}
+		if (func (m, native_offset, il_offset, user_data))
+			return;
+	}
+}
+
+MonoBoolean
+ves_icall_get_frame_info (gint32 skip, MonoBoolean need_file_info, 
+			  MonoReflectionMethod **method, 
+			  gint32 *iloffset, gint32 *native_offset,
+			  MonoString **file, gint32 *line, gint32 *column)
+{
+	MonoDomain *domain = mono_domain_get ();
+	MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
+	MonoLMF *lmf = jit_tls->lmf;
+	gpointer *sf = (gpointer *)&skip;
+	gpointer ip = sf [-1];
+	int addr;
+	gpointer *bp = sf [-2];
+	MonoMethod *m = NULL;
+
+	do {
+		MonoJitInfo *ji;
+		addr = -1; /* unknown */
+
+		if ((ji = mono_jit_info_table_find (domain, ip))) {
+			m = ji->method;
+			addr = (char *)ip - (char *)ji->code_start;
+			ip = (gpointer)((char *)bp [1] - 5);
+			bp = bp [0];
+		} else {
+			if (!lmf)
+				return FALSE;
+			
+			m = lmf->method;
+
+			bp = (gpointer)lmf->ebp;
+			ip = (gpointer)lmf->eip;
+
+			lmf = lmf->previous_lmf;
+		}
+
+		if ((unsigned)bp >= (unsigned)jit_tls->end_of_stack)
+			return FALSE;
+
+	} while (skip-- > 0);
+
+	g_assert (m);
+
+	*method = mono_method_get_object (domain, m, NULL);
+	*iloffset = mono_debug_il_offset_from_address (m, addr);
+	*native_offset = addr;
+
+	if (need_file_info) {
+		gchar *filename;
+
+		filename = mono_debug_source_location_from_address (m, addr, line);
+
+		*file = mono_string_new (domain, filename ? filename : "<unknown>");
+		*column = 0;
+
+		g_free (filename);
+	}
+
+	return TRUE;
+}
+
+/**
+ * arch_handle_exception:
+ * @ctx: saved processor state
+ * @obj:
+ */
+gboolean
+arch_handle_exception (struct sigcontext *ctx, gpointer obj, gboolean test_only)
+{
+	MonoDomain *domain = mono_domain_get ();
+	MonoJitInfo *ji;
+	static void (*restore_context) (struct sigcontext *);
+	static void (*call_finally) (struct sigcontext *, unsigned long);
+	static int (*call_filter) (struct sigcontext *, gpointer, gpointer);
+	void (*cleanup) (MonoObject *exc);
+	MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
+	gpointer end_of_stack;
+	struct sigcontext ctx_cp;
+	MonoLMF *lmf = jit_tls->lmf;		
+	GList *trace_ips = NULL;
+	MonoMethod *m;
+
+	g_assert (ctx != NULL);
+	if (!obj) {
+		MonoException *ex = mono_get_exception_null_reference ();
+		ex->message = mono_string_new (domain, 
+		        "Object reference not set to an instance of an object");
+		obj = (MonoObject *)ex;
+	} 
+
+	g_assert (mono_object_isinst (obj, mono_defaults.exception_class));
+
+	if (!restore_context)
+		restore_context = arch_get_restore_context ();
+	
+	if (!call_finally)
+		call_finally = arch_get_call_finally ();
+
+	if (!call_filter)
+		call_filter = arch_get_call_filter ();
+
+	end_of_stack = jit_tls->end_of_stack;
+	g_assert (end_of_stack);
+
+	cleanup = jit_tls->abort_func;
+	g_assert (cleanup);
+	
+	if (!test_only) {
+		ctx_cp = *ctx;
+		if (!arch_handle_exception (&ctx_cp, obj, TRUE)) {
+			if (mono_break_on_exc) {
+				if (mono_debug_format != MONO_DEBUG_FORMAT_NONE)
+					mono_debug_make_symbols ();
+				G_BREAKPOINT ();
+			}
+			mono_unhandled_exception (obj);
+		}
+	}
+
+	while (1) {
+
+		ji = mono_jit_info_table_find (domain, (gpointer)ctx->SC_EIP);
+	
+		/* we are inside managed code if ji != NULL */
+		if (ji != NULL) {
+			int offset;
+			m = ji->method;			
+
+			if (m == mono_start_method) {
+				if (!test_only) {
+					jit_tls->lmf = lmf;
+					cleanup (obj);
+					g_assert_not_reached ();
+				} else {
+					((MonoException*)obj)->trace_ips = glist_to_array (trace_ips);
+					g_list_free (trace_ips);
+					return FALSE;
+				}
+			}
+			
+			if (test_only) {
+				char    *strace;
+				char    *tmp, *source_location, *tmpaddr, *fname;
+				gint32   address, iloffset;
+
+				trace_ips = g_list_append (trace_ips, (gpointer)ctx->SC_EIP);
+
+				if (!((MonoException*)obj)->stack_trace)
+					strace = g_strdup ("");
+				else
+					strace = mono_string_to_utf8 (((MonoException*)obj)->stack_trace);
+
+				address = (char *)ctx->SC_EIP - (char *)ji->code_start;
+
+				source_location = mono_debug_source_location_from_address (m, address, NULL);
+				iloffset = mono_debug_il_offset_from_address (m, address);
+
+				if (iloffset < 0)
+					tmpaddr = g_strdup_printf ("<0x%05x>", address);
+				else
+					tmpaddr = g_strdup_printf ("[0x%05x]", iloffset);
+
+				fname = mono_method_full_name (m, TRUE);
+
+				if (source_location)
+					tmp = g_strdup_printf ("%sin %s (at %s) %s\n", strace, tmpaddr,
+							       source_location, fname);
+				else
+					tmp = g_strdup_printf ("%sin %s %s\n", strace, tmpaddr,
+							       fname);
+				g_free (fname);
+				g_free (source_location);
+				g_free (strace);
+				g_free (tmpaddr);
+
+				((MonoException*)obj)->stack_trace = mono_string_new (domain, tmp);
+
+				g_free (tmp);
+			}
+			
+			if (ji->num_clauses) {
+				int i;
+				
+				g_assert (ji->clauses);
+			
+				for (i = 0; i < ji->num_clauses; i++) {
+					MonoJitExceptionInfo *ei = &ji->clauses [i];
+
+					if (ei->try_start <= (gpointer)ctx->SC_EIP && 
+					    (gpointer)ctx->SC_EIP <= ei->try_end) { 
+						/* catch block */
+						if ((ei->flags == MONO_EXCEPTION_CLAUSE_NONE && 
+						     mono_object_isinst (obj, mono_class_get (m->klass->image, ei->data.token))) ||
+						    ((ei->flags == MONO_EXCEPTION_CLAUSE_FILTER &&
+						      call_filter (ctx, ei->data.filter, obj)))) {
+							if (test_only) {
+								((MonoException*)obj)->trace_ips = glist_to_array (trace_ips);
+								g_list_free (trace_ips);
+								return TRUE;
+							}
+							ctx->SC_EIP = (unsigned long)ei->handler_start;
+							ctx->SC_ECX = (unsigned long)obj;
+							jit_tls->lmf = lmf;
+#if 1
+							return 0;
+#else
+							restore_context (ctx);
+							g_assert_not_reached ();
+#endif
+						}
+					}
+				}
+
+				/* no handler found - we need to call all finally handlers */
+				if (!test_only) {
+					for (i = 0; i < ji->num_clauses; i++) {
+						MonoJitExceptionInfo *ei = &ji->clauses [i];
+
+						if (ei->try_start <= (gpointer)ctx->SC_EIP && 
+						    (gpointer)ctx->SC_EIP < ei->try_end &&
+						    (ei->flags & MONO_EXCEPTION_CLAUSE_FINALLY)) {
+							call_finally (ctx, (unsigned long)ei->handler_start);
+						}
+					}
+				}
+			}
+
+			/* continue unwinding */
+
+			offset = -1;
+			/* restore caller saved registers */
+			if (ji->used_regs & X86_EBX_MASK) {
+				ctx->SC_EBX = *((int *)ctx->SC_EBP + offset);
+				offset--;
+			}
+			if (ji->used_regs & X86_EDI_MASK) {
+				ctx->SC_EDI = *((int *)ctx->SC_EBP + offset);
+				offset--;
+			}
+			if (ji->used_regs & X86_ESI_MASK) {
+				ctx->SC_ESI = *((int *)ctx->SC_EBP + offset);
+			}
+
+			ctx->SC_ESP = ctx->SC_EBP;
+			ctx->SC_EIP = *((int *)ctx->SC_EBP + 1) - 5;
+			ctx->SC_EBP = *((int *)ctx->SC_EBP);
+
+			if (ctx->SC_EBP > (unsigned)end_of_stack) {
+				if (!test_only) {
+					jit_tls->lmf = lmf;
+					cleanup (obj);
+					g_assert_not_reached ();
+				} else {
+					((MonoException*)obj)->trace_ips = glist_to_array (trace_ips);
+					g_list_free (trace_ips);
+					return FALSE;
+				}
+			}
+	
+		} else {
+			if (!lmf) {
+				if (!test_only) {
+					jit_tls->lmf = lmf;
+					cleanup (obj);
+					g_assert_not_reached ();
+				} else {
+					((MonoException*)obj)->trace_ips = glist_to_array (trace_ips);
+					g_list_free (trace_ips);
+					return FALSE;
+				}
+			}
+			
+			m = lmf->method;
+
+			if (test_only) {
+				char  *strace; 
+				char  *tmp;
+
+				trace_ips = g_list_append (trace_ips, lmf->method->info);
+
+				if (!((MonoException*)obj)->stack_trace)
+					strace = g_strdup ("");
+				else
+					strace = mono_string_to_utf8 (((MonoException*)obj)->stack_trace);
+
+				tmp = g_strdup_printf ("%sin (unmanaged) %s\n", strace, mono_method_full_name (m, TRUE));
+
+				g_free (strace);
+
+				((MonoException*)obj)->stack_trace = mono_string_new (domain, tmp);
+				g_free (tmp);
+			}
+
+			ctx->SC_ESI = lmf->esi;
+			ctx->SC_EDI = lmf->edi;
+			ctx->SC_EBX = lmf->ebx;
+			ctx->SC_EBP = lmf->ebp;
+			ctx->SC_EIP = lmf->eip;
+			ctx->SC_ESP = (unsigned long)&lmf->eip;
+
+			lmf = lmf->previous_lmf;
+
+			if (ctx->SC_EBP >= (unsigned)end_of_stack) {
+				if (!test_only) {
+					jit_tls->lmf = lmf;
+					cleanup (obj);
+					g_assert_not_reached ();
+				} else {
+					((MonoException*)obj)->trace_ips = glist_to_array (trace_ips);
+					g_list_free (trace_ips);
+					return FALSE;
+				}
+			}
+		}
+	}
+
+	g_assert_not_reached ();
+}
+
+static void
+throw_exception (unsigned long eax, unsigned long ecx, unsigned long edx, unsigned long ebx,
+		 unsigned long esi, unsigned long edi, unsigned long ebp, MonoObject *exc,
+		 unsigned long eip,  unsigned long esp)
+{
+	static void (*restore_context) (struct sigcontext *);
+	struct sigcontext ctx;
+
+	if (!restore_context)
+		restore_context = arch_get_restore_context ();
+
+	/* adjust eip so that it point to the call instruction */
+	eip -= 5;
+
+	ctx.SC_ESP = esp;
+	ctx.SC_EIP = eip;
+	ctx.SC_EBP = ebp;
+	ctx.SC_EDI = edi;
+	ctx.SC_ESI = esi;
+	ctx.SC_EBX = ebx;
+	ctx.SC_EDX = edx;
+	ctx.SC_ECX = ecx;
+	ctx.SC_EAX = eax;
+	
+	arch_handle_exception (&ctx, exc, FALSE);
+	restore_context (&ctx);
+
+	g_assert_not_reached ();
+}
+
+/**
+ * arch_get_throw_exception:
+ *
+ * Returns a function pointer which can be used to raise 
+ * exceptions. The returned function has the following 
+ * signature: void (*func) (MonoException *exc); 
+ * For example to raise an arithmetic exception you can use:
+ *
+ * x86_push_imm (code, mono_get_exception_arithmetic ()); 
+ * x86_call_code (code, arch_get_throw_exception ()); 
+ *
+ */
+gpointer 
+arch_get_throw_exception (void)
+{
+	static guint8 start [24];
+	static int inited = 0;
+	guint8 *code;
+
+	if (inited)
+		return start;
+
+	inited = 1;
+	code = start;
+
+	x86_push_reg (code, X86_ESP);
+	x86_push_membase (code, X86_ESP, 4); /* IP */
+	x86_push_membase (code, X86_ESP, 12); /* exception */
+	x86_push_reg (code, X86_EBP);
+	x86_push_reg (code, X86_EDI);
+	x86_push_reg (code, X86_ESI);
+	x86_push_reg (code, X86_EBX);
+	x86_push_reg (code, X86_EDX);
+	x86_push_reg (code, X86_ECX);
+	x86_push_reg (code, X86_EAX);
+	x86_call_code (code, throw_exception);
+	/* we should never reach this breakpoint */
+	x86_breakpoint (code);
+
+	g_assert ((code - start) < 24);
+	return start;
+}
+
+/**
+ * arch_get_throw_exception_by_name:
+ *
+ * Returns a function pointer which can be used to raise 
+ * corlib exceptions. The returned function has the following 
+ * signature: void (*func) (char *exc_name); 
+ * For example to raise an arithmetic exception you can use:
+ *
+ * x86_push_imm (code, "ArithmeticException"); 
+ * x86_call_code (code, arch_get_throw_exception ()); 
+ *
+ */
+gpointer 
+arch_get_throw_exception_by_name ()
+{
+	static guint8 start [32];
+	static int inited = 0;
+	guint8 *code;
+
+	if (inited)
+		return start;
+
+	inited = 1;
+	code = start;
+
+	/* fixme: we do not save EAX, EDX, ECD - unsure if we need that */
+
+	x86_push_membase (code, X86_ESP, 4); /* exception name */
+	x86_push_imm (code, "System");
+	x86_push_imm (code, mono_defaults.exception_class->image);
+	x86_call_code (code, mono_exception_from_name);
+	x86_alu_reg_imm (code, X86_ADD, X86_ESP, 12);
+	/* save the newly create object (overwrite exception name)*/
+	x86_mov_membase_reg (code, X86_ESP, 4, X86_EAX, 4);
+	x86_jump_code (code, arch_get_throw_exception ());
+
+	g_assert ((code - start) < 32);
+
+	return start;
+}	
diff --git a/mono/jit/helpers.c b/mono/jit/helpers.c
new file mode 100644
index 00000000000..d1fa9c57127
--- /dev/null
+++ b/mono/jit/helpers.c
@@ -0,0 +1,614 @@
+/*
+ * helpers.c: architecture independent helper functions
+ *
+ * Author:
+ *   Dietmar Maurer (dietmar@ximian.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
+#include <config.h>
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
+#include <glib.h>
+
+#include "codegen.h"
+#include "helpers.h"
+
+int
+mono_map_store_svt_type (int svt)
+{
+	switch (svt) {
+	case VAL_I32:
+		return MB_TERM_STIND_I4;
+	case VAL_POINTER:
+		return MB_TERM_STIND_REF;
+	case VAL_I64:
+		return MB_TERM_STIND_I8;
+	case VAL_DOUBLE:
+		return MB_TERM_STIND_R8;
+	default:
+		g_assert_not_reached ();
+	}
+
+	return 0;
+}
+
+void
+mono_get_val_sizes (MonoValueType type, int *size, int *align) 
+{ 
+	switch (type) {
+	case VAL_I32:
+		*size = *align = sizeof (gint32);
+		break;
+	case VAL_I64:
+		*size = *align = sizeof (gint64);
+		break;
+	case VAL_POINTER:
+		*size = *align = sizeof (gpointer);
+		break;
+	case VAL_DOUBLE:
+		*size = *align = sizeof (double);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+}
+
+/**
+ * mono_map_stind_type:
+ * @type: the type to map
+ *
+ * Translates the MonoType @type into the corresponding store opcode 
+ * for the code generator.
+ */
+int
+mono_map_stind_type (MonoType *type)
+{
+	if (type->byref) 
+		return MB_TERM_STIND_REF;
+
+	switch (type->type) {
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_BOOLEAN:
+		return MB_TERM_STIND_I1;	
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR:
+		return MB_TERM_STIND_I2;	
+#if SIZEOF_VOID_P == 4
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4:
+		return MB_TERM_STIND_I4;	
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:    
+		return MB_TERM_STIND_REF;
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+#if SIZEOF_VOID_P == 8
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+		return MB_TERM_STIND_I8;
+	case MONO_TYPE_R4:
+		return MB_TERM_STIND_R4;
+	case MONO_TYPE_R8:
+		return MB_TERM_STIND_R8;
+	case MONO_TYPE_VALUETYPE: 
+		if (type->data.klass->enumtype)
+			return mono_map_stind_type (type->data.klass->enum_basetype);
+		else
+			return MB_TERM_STIND_OBJ;
+	default:
+		g_warning ("unknown type %02x", type->type);
+		g_assert_not_reached ();
+	}
+
+	g_assert_not_reached ();
+	return -1;
+}
+
+/**
+ * mono_map_remote_stind_type:
+ * @type: the type to map
+ *
+ * Translates the MonoType @type into the corresponding remote store opcode 
+ * for the code generator.
+ */
+int
+mono_map_remote_stind_type (MonoType *type)
+{
+	if (type->byref) {
+		return MB_TERM_REMOTE_STIND_REF;
+	}
+
+	switch (type->type) {
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_BOOLEAN:
+		return MB_TERM_REMOTE_STIND_I1;	
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR:
+		return MB_TERM_REMOTE_STIND_I2;	
+#if SIZEOF_VOID_P == 4
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4:
+		return MB_TERM_REMOTE_STIND_I4;	
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:    
+		return MB_TERM_REMOTE_STIND_REF;
+#if SIZEOF_VOID_P == 8
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+		return MB_TERM_REMOTE_STIND_I8;
+	case MONO_TYPE_R4:
+		return MB_TERM_REMOTE_STIND_R4;
+	case MONO_TYPE_R8:
+		return MB_TERM_REMOTE_STIND_R8;
+	case MONO_TYPE_VALUETYPE: 
+		if (type->data.klass->enumtype)
+			return mono_map_remote_stind_type (type->data.klass->enum_basetype);
+		else
+			return MB_TERM_REMOTE_STIND_OBJ;
+	default:
+		g_warning ("unknown type %02x", type->type);
+		g_assert_not_reached ();
+	}
+
+	g_assert_not_reached ();
+	return -1;
+}
+
+int
+mono_map_starg_type (MonoType *type)
+{
+	if (type->byref) 
+		return MB_TERM_STIND_REF;
+
+	switch (type->type) {
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR:
+#if SIZEOF_VOID_P == 4
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4:
+		return MB_TERM_STIND_I4;
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:    
+		return MB_TERM_STIND_REF;
+#if SIZEOF_VOID_P == 8
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+		return MB_TERM_STIND_I8;
+	case MONO_TYPE_R4:
+		return MB_TERM_STIND_R4;
+	case MONO_TYPE_R8:
+		return MB_TERM_STIND_R8;
+	case MONO_TYPE_VALUETYPE: 
+		if (type->data.klass->enumtype)
+			return mono_map_starg_type (type->data.klass->enum_basetype);
+		else
+			return MB_TERM_STIND_OBJ;
+	default:
+		g_warning ("unknown type %02x", type->type);
+		g_assert_not_reached ();
+	}
+
+	g_assert_not_reached ();
+	return -1;
+}
+
+int
+mono_map_arg_type (MonoType *type)
+{
+	if (type->byref) 
+		return MB_TERM_ARG_I4;
+
+	switch (type->type) {
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR:
+#if SIZEOF_VOID_P == 4
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4:
+		return MB_TERM_ARG_I4;
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:    
+	case MONO_TYPE_STRING:
+#if SIZEOF_VOID_P == 8
+		return MB_TERM_ARG_I8;
+#else
+		return MB_TERM_ARG_I4;
+#endif
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+#if SIZEOF_VOID_P == 8
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+		return MB_TERM_ARG_I8;
+	case MONO_TYPE_R4:
+		return MB_TERM_ARG_R4;
+	case MONO_TYPE_R8:
+		return MB_TERM_ARG_R8;
+	case MONO_TYPE_VALUETYPE:
+		if (type->data.klass->enumtype)
+			return mono_map_arg_type (type->data.klass->enum_basetype);
+		else
+			return MB_TERM_ARG_OBJ;
+	default:
+		g_warning ("unknown type %02x", type->type);
+		g_assert_not_reached ();
+	}
+
+	g_assert_not_reached ();
+	return -1;
+}
+
+/**
+ * mono_map_ldind_type:
+ * @type: the type to map
+ *
+ * Translates the MonoType @type into the corresponding load opcode 
+ * for the code generator.
+ */
+int
+mono_map_ldind_type (MonoType *type, MonoValueType *svt)
+{
+	if (type->byref) {
+		*svt = VAL_POINTER;
+		return MB_TERM_LDIND_REF;
+	}
+
+	switch (type->type) {
+	case MONO_TYPE_I1:
+		*svt = VAL_I32;
+		return MB_TERM_LDIND_I1;
+	case MONO_TYPE_U1:
+	case MONO_TYPE_BOOLEAN:
+		*svt = VAL_I32;
+		return MB_TERM_LDIND_U1;
+	case MONO_TYPE_I2:
+		*svt = VAL_I32;
+		return MB_TERM_LDIND_I2;
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR:
+		*svt = VAL_I32;
+		return MB_TERM_LDIND_U2;
+#if SIZEOF_VOID_P == 4
+	case MONO_TYPE_I:
+#endif
+	case MONO_TYPE_I4:
+		*svt = VAL_I32;
+		return MB_TERM_LDIND_I4;
+#if SIZEOF_VOID_P == 4
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_U4:
+		*svt = VAL_I32;
+		return MB_TERM_LDIND_U4;
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:    
+		*svt = VAL_POINTER;
+		return MB_TERM_LDIND_REF;
+#if SIZEOF_VOID_P == 8
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+		*svt = VAL_I64;
+		return MB_TERM_LDIND_I8;
+	case MONO_TYPE_R4:
+		*svt = VAL_DOUBLE;
+		return MB_TERM_LDIND_R4;
+	case MONO_TYPE_R8:
+		*svt = VAL_DOUBLE;
+		return MB_TERM_LDIND_R8;
+	case MONO_TYPE_VALUETYPE:
+		if (type->data.klass->enumtype) {
+			return mono_map_ldind_type (type->data.klass->enum_basetype, svt);
+		} else {
+			*svt = VAL_UNKNOWN;
+			return MB_TERM_LDIND_OBJ;
+		}
+	default:
+		g_warning ("unknown type %02x", type->type);
+		g_assert_not_reached ();
+	}
+
+	g_assert_not_reached ();
+	return -1;
+}
+
+int
+mono_map_ldarg_type (MonoType *type, MonoValueType *svt)
+{
+	if (type->byref) {
+		*svt = VAL_POINTER;
+		return MB_TERM_LDIND_REF;
+	}
+
+	switch (type->type) {
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR:
+#if SIZEOF_VOID_P == 4
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4:
+		*svt = VAL_I32;
+		return MB_TERM_LDIND_U4;
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:    
+		*svt = VAL_POINTER;
+		return MB_TERM_LDIND_REF;
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+#if SIZEOF_VOID_P == 8
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+		*svt = VAL_I64;
+		return MB_TERM_LDIND_I8;
+	case MONO_TYPE_R4:
+		*svt = VAL_DOUBLE;
+		return MB_TERM_LDIND_R4;
+	case MONO_TYPE_R8:
+		*svt = VAL_DOUBLE;
+		return MB_TERM_LDIND_R8;
+	case MONO_TYPE_VALUETYPE:
+		if (type->data.klass->enumtype) {
+			return mono_map_ldarg_type (type->data.klass->enum_basetype, svt);
+		} else {
+			*svt = VAL_UNKNOWN;
+			return MB_TERM_LDIND_OBJ;
+		}
+	default:
+		g_warning ("unknown type %02x", type->type);
+		g_assert_not_reached ();
+	}
+
+	g_assert_not_reached ();
+	return -1;
+}
+
+/**
+ * mono_map_call_type:
+ * @type: the type to map
+ *
+ * Translates the MonoType @type into the corresponding call opcode 
+ * for the code generator.
+ */
+int
+mono_map_call_type (MonoType *type, MonoValueType *svt)
+{
+	if (type->byref) 
+		return MB_TERM_CALL_I4;
+
+	switch (type->type) {
+	case MONO_TYPE_VOID:
+		*svt = VAL_UNKNOWN;
+		return MB_TERM_CALL_VOID;
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR:
+#if SIZEOF_VOID_P == 4
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4:
+		*svt = VAL_I32;
+		return MB_TERM_CALL_I4;
+	case MONO_TYPE_VALUETYPE:
+		if (type->data.klass->enumtype) {
+			return mono_map_call_type (type->data.klass->enum_basetype, svt);
+		} else {
+			*svt = VAL_I32;
+			return MB_TERM_CALL_VOID;
+		}
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_SZARRAY: 
+		*svt = VAL_POINTER;
+#if SIZEOF_VOID_P == 8
+		return MB_TERM_CALL_I8;
+#else
+		return MB_TERM_CALL_I4;
+#endif
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+#if SIZEOF_VOID_P == 8
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+		*svt = VAL_I64;
+		return MB_TERM_CALL_I8;
+	case MONO_TYPE_R4:
+	case MONO_TYPE_R8:
+		*svt = VAL_DOUBLE;
+		return MB_TERM_CALL_R8;
+	default:
+		g_warning ("unknown type %02x", type->type);
+		g_assert_not_reached ();
+	}
+
+	g_assert_not_reached ();
+	return -1;
+}
+
+MBTree *
+mono_ctree_new (MonoMemPool *mp, int op, MBTree *left, MBTree *right)
+{
+	MBTree *t = mono_mempool_alloc0 (mp, sizeof (MBTree));
+
+	t->op = op;
+	t->left = left;
+	t->right = right;
+	t->reg1 = -1;
+	t->reg2 = -1;
+	t->reg3 = -1;
+	t->svt = VAL_UNKNOWN;
+	t->cli_addr = -1;
+	return t;
+}
+
+MBTree *
+mono_ctree_new_leaf (MonoMemPool *mp, int op)
+{
+	return mono_ctree_new (mp, op, NULL, NULL);
+}
+
+MBTree *
+mono_ctree_new_icon4 (MonoMemPool *mp, gint32 data)
+{
+	MBTree *t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
+	t1->data.i = data;
+	return t1;
+}
+
+/*
+ * prints the tree to stdout
+ */
+void
+mono_print_ctree (MonoFlowGraph *cfg, MBTree *tree)
+{
+	int arity;
+
+	if (!tree)
+		return;
+
+	arity = (tree->left != NULL) + (tree->right != NULL);
+
+	if (arity)
+		printf (" (%s", mono_burg_term_string [tree->op]);
+	else 
+		printf (" %s", mono_burg_term_string [tree->op]);
+
+	switch (tree->op) {
+	case MB_TERM_CONST_I4:
+		printf ("[%d]", tree->data.i);
+		break;
+	case MB_TERM_ADDR_L:
+		if (VARINFO (cfg, tree->data.i).reg >= 0)
+			printf ("[%s|%d]", arch_get_reg_name (VARINFO (cfg, tree->data.i).reg), 
+				tree->data.i);
+		else
+			printf ("[%d]", tree->data.i);
+		break;
+	}
+
+	g_assert (!(tree->right && !tree->left));
+
+	mono_print_ctree (cfg, tree->left);
+	mono_print_ctree (cfg, tree->right);
+
+	if (arity)
+		printf (")");
+}
+
+/*
+ * prints the whole forest to stdout
+ */
+void
+mono_print_forest (MonoFlowGraph *cfg, GPtrArray *forest)
+{
+	const int top = forest->len;
+	int i;
+
+	for (i = 0; i < top; i++) {
+		MBTree *t = (MBTree *) g_ptr_array_index (forest, i);
+		printf ("       ");
+		mono_print_ctree (cfg, t);
+		printf ("\n");
+	}
+
+}
+
+/**
+ * mono_disassemble_code:
+ * @code: a pointer to the code
+ * @size: the code size in bytes
+ *
+ * Disassemble to code to stdout.
+ */
+void
+mono_disassemble_code (guint8 *code, int size, char *id)
+{
+	int i;
+	FILE *ofd;
+
+	if (!(ofd = fopen ("/tmp/test.s", "w")))
+		g_assert_not_reached ();
+
+	fprintf (ofd, "%s:\n", id);
+
+	for (i = 0; i < size; ++i) 
+		fprintf (ofd, ".byte %d\n", (unsigned int) code [i]);
+
+	fclose (ofd);
+
+	system ("as /tmp/test.s -o /tmp/test.o;objdump -d /tmp/test.o"); 
+}
+
diff --git a/mono/jit/helpers.h b/mono/jit/helpers.h
new file mode 100644
index 00000000000..bcefb368570
--- /dev/null
+++ b/mono/jit/helpers.h
@@ -0,0 +1,61 @@
+/*
+ * Author:
+ *   Dietmar Maurer (dietmar@ximian.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
+#ifndef _MONO_JIT_HELPERS_H_
+#define _MONO_JIT_HELPERS_H_
+
+#include <config.h>
+
+#include "jit.h"
+
+int
+mono_map_store_svt_type    (int svt);
+
+void
+mono_get_val_sizes         (MonoValueType type, int *size, int *align);
+
+int
+mono_map_stind_type        (MonoType *type);
+
+int
+mono_map_remote_stind_type (MonoType *type);
+
+int
+mono_map_starg_type        (MonoType *type);
+
+int
+mono_map_arg_type          (MonoType *type);
+
+int
+mono_map_ldind_type        (MonoType *type, MonoValueType *svt);
+
+int
+mono_map_ldarg_type        (MonoType *type, MonoValueType *svt);
+
+int
+mono_map_call_type         (MonoType *type, MonoValueType *svt);
+
+MBTree *
+mono_ctree_new             (MonoMemPool *mp, int op, MBTree *left, 
+			    MBTree *right);
+MBTree *
+mono_ctree_new_leaf        (MonoMemPool *mp, int op);
+
+MBTree *
+mono_ctree_new_icon4       (MonoMemPool *mp, gint32 data);
+
+void
+mono_print_ctree           (MonoFlowGraph *cfg, MBTree *tree);
+
+void
+mono_print_forest          (MonoFlowGraph *cfg, GPtrArray *forest);
+
+void
+mono_disassemble_code      (guint8 *code, int size, char *id);
+
+
+#endif
diff --git a/mono/jit/jit.c b/mono/jit/jit.c
index 196b6329f6c..52842201a7a 100644
--- a/mono/jit/jit.c
+++ b/mono/jit/jit.c
@@ -1,5 +1,5 @@
 /*
- * testjit.c: The mono JIT compiler.
+ * jit.c: The mono JIT compiler.
  *
  * Author:
  *   Dietmar Maurer (dietmar@ximian.com)
@@ -8,18 +8,23 @@
  */
 
 #include <config.h>
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
 #include <glib.h>
 #include <stdlib.h>
 #include <stdarg.h>
 #include <string.h>
 #include <unistd.h>
 
+#include <mono/metadata/verify.h>
 #include <mono/metadata/assembly.h>
 #include <mono/metadata/loader.h>
 #include <mono/metadata/cil-coff.h>
 #include <mono/metadata/tabledefs.h>
 #include <mono/metadata/class.h>
 #include <mono/metadata/object.h>
+#include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/opcodes.h>
 #include <mono/metadata/mono-endian.h>
 #include <mono/metadata/tokentype.h>
@@ -28,31 +33,20 @@
 #include <mono/metadata/appdomain.h>
 #include <mono/arch/x86/x86-codegen.h>
 #include <mono/io-layer/io-layer.h>
+#include <mono/metadata/profiler-private.h>
+#include <mono/metadata/marshal.h>
 
 #include "jit.h"
+#include "helpers.h"
 #include "regset.h"
 #include "codegen.h"
 #include "debug.h"
 
-/*
- * Pull the list of opcodes
- */
-#define OPDEF(a,b,c,d,e,f,g,h,i,j) \
-	a = i,
-
-enum {
-#include "mono/cil/opcode.def"
-	LAST = 0xff
-};
-#undef OPDEF
-
-#define OPDEF(a,b,c,d,e,f,g,h,i,j) b,
-static char *opcode_names [] = {
-#include "mono/cil/opcode.def"	
-};
-#undef OPDEF
-
-#define SET_VARINFO(vi,t,k,o,s) do { vi.type=t; vi.kind=k; vi.offset=o; vi.size=s; } while (0)
+/* 
+ * if OPT_BOOL is defined we use 32bit to store boolean local variables.  This
+ * gives great speedup for boolean expressions, but unfortunately it changes
+ * semantics, so i disable it until we have a real solution  */
+/* #define OPT_BOOL */
 
 #define MAKE_CJUMP(name)                                                      \
 case CEE_##name:                                                              \
@@ -61,7 +55,8 @@ case CEE_##name##_S: {                                                        \
 	int near_jump = *ip == CEE_##name##_S;                                \
 	++ip;                                                                 \
 	sp -= 2;                                                              \
-	t1 = mono_ctree_new (mp, MB_TERM_##name, sp [0], sp [1]);             \
+        t1 = mono_ctree_new (mp, MB_TERM_COMPARE, sp [0], sp [1]);            \
+	t1 = mono_ctree_new (mp, MB_TERM_CBRANCH, t1, NULL);                  \
 	if (near_jump)                                                        \
 		target = cli_addr + 2 + (signed char) *ip;                    \
 	else                                                                  \
@@ -71,7 +66,8 @@ case CEE_##name##_S: {                                                        \
 	tbb = &cfg->bblocks [bcinfo [target].block_id];                       \
 	create_outstack (cfg, bb, stack, sp - stack);                         \
 	mark_reached (cfg, tbb, bb->outstack, bb->outdepth);                  \
-	t1->data.p = tbb;                                                     \
+	t1->data.bi.target = tbb;                                             \
+	t1->data.bi.cond = CEE_##name;                                        \
 	ADD_TREE (t1, cli_addr);                                              \
 	ip += near_jump ? 1: 4;		                                      \
 	break;                                                                \
@@ -86,12 +82,27 @@ case CEE_##name: {                                                            \
 	break;                                                                \
 }
 
+#ifndef ARCH_X86
+#define MAKE_SPILLED_BI_ALU1(name, s1, s2) {                                  \
+	t1 = mono_ctree_new (mp, MB_TERM_##name, s1, s2);                     \
+	PUSH_TREE (t1, s1->svt); }                                            
+#else
+#define MAKE_SPILLED_BI_ALU1(name, s1, s2)                                    \
+	t1 = mono_ctree_new (mp, MB_TERM_##name, s1, s2);                     \
+        t1->svt = s1->svt;                                                    \
+        t1 = mono_store_tree (cfg, -1, t1, &t2);                              \
+        g_assert (t1);                                                        \
+        ADD_TREE (t1, cli_addr);                                              \
+	PUSH_TREE (t2, t2->svt);                                              
+#endif
+
 #define MAKE_CMP(cname)                                                       \
 case CEE_##cname: {                                                           \
 	++ip;                                                                 \
 	sp -= 2;                                                              \
-	t1 = mono_ctree_new (mp, MB_TERM_##cname, sp [0], sp [1]);            \
-        g_assert (sp [0]->svt == sp [1]->svt);                                \
+	t1 = mono_ctree_new (mp, MB_TERM_COMPARE, sp [0], sp [1]);            \
+	t1 = mono_ctree_new (mp, MB_TERM_CSET, t1, NULL);                     \
+        t1->data.i = CEE_##cname;                                             \
 	PUSH_TREE (t1, VAL_I32);                                              \
 	break;                                                                \
 }
@@ -100,13 +111,7 @@ case CEE_##cname: {                                                           \
 case CEE_##name: {                                                            \
 	++ip;                                                                 \
 	sp -= 2;                                                              \
-	t1 = mono_ctree_new (mp, MB_TERM_##name, sp [0], sp [1]);             \
-        g_assert (sp [0]->svt == sp [1]->svt);                                \
-        t1->svt = sp [0]->svt;                                                \
-        t1 = mono_store_tree (cfg, -1, t1, &t2);                              \
-        g_assert (t1);                                                        \
-        ADD_TREE (t1, cli_addr);                                              \
-	PUSH_TREE (t2, t2->svt);                                              \
+	MAKE_SPILLED_BI_ALU1 (name, sp [0], sp [1])                           \
 	break;                                                                \
 }
 
@@ -181,6 +186,13 @@ case CEE_##name: {                                                            \
 	ADD_TREE (t1, cli_addr);                                              \
 	break;                                                                \
 }
+
+typedef struct {
+	MonoMethod *method;
+	MBTree **arg_map;
+	const unsigned char *end, *saved_ip;
+	MonoImage *saved_image;
+} MonoInlineInfo;
 	
 /* Whether to dump the assembly code after genreating it */
 gboolean mono_jit_dump_asm = FALSE;
@@ -191,21 +203,45 @@ gboolean mono_jit_dump_forest = FALSE;
 /* Whether to print function call traces */
 gboolean mono_jit_trace_calls = FALSE;
 
+/* Whether to insert in the code profile callbacks */
+gboolean mono_jit_profile = FALSE;
+
 /* Force jit to share code between application domains */
 gboolean mono_jit_share_code = FALSE;
 
-MonoDebugHandle *mono_debug_handle = NULL;
-GList *mono_debug_methods = NULL;
+/* use linear scan register allocation */
+gboolean mono_use_linear_scan = TRUE;
+
+/* inline code */
+gboolean mono_jit_inline_code = TRUE;
 
-gpointer mono_end_of_stack = NULL;
+/* inline memcpy */
+gboolean mono_inline_memcpy = TRUE;
 
-MonoJitInfoTable *mono_jit_info_table = NULL;
+/* Use alternative (faster) sequence to convert FP values to integers */
+gboolean mono_use_fast_iconv = FALSE;
 
-/* last managed frame (used by pinvoke) */ 
-guint32 lmf_thread_id = 0;
+/* TLS id to store jit data */
+guint32  mono_jit_tls_id;
+
+/* issue a breakpoint on unhandled excepions */
+gboolean mono_break_on_exc = FALSE;
+
+MonoDebugFormat mono_debug_format = MONO_DEBUG_FORMAT_NONE;
+GList *mono_debug_methods = NULL;
+
+/* If non-zero, insert a breakpoint when compiling the next method.
+ * If positive, interpret this variable as a counter and decrement
+ * it after setting the breakpoint. */
+int mono_debug_insert_breakpoint = 0;
+
+/* This is the address of the last breakpoint which was inserted. */
+gchar *mono_debug_last_breakpoint_address = NULL;
 
 MonoJitStats mono_jit_stats;
 
+CRITICAL_SECTION *metadata_section = NULL;
+
 /* 
  * We sometimes need static data, for example the forest generator need it to
  * store constants or class data.
@@ -223,584 +259,6 @@ mono_alloc_static0 (int size)
 
 typedef void (*MonoCCtor) (void);
 
-MonoJitInfoTable *
-mono_jit_info_table_new ()
-{
-	return g_array_new (FALSE, FALSE, sizeof (gpointer));
-}
-
-int
-mono_jit_info_table_index (MonoJitInfoTable *table, gpointer addr)
-{
-	int left = 0, right = table->len;
-
-	while (left < right) {
-		int pos = (left + right) / 2;
-		MonoJitInfo *ji = g_array_index (table, gpointer, pos);
-		gpointer start = ji->code_start;
-		gpointer end = start + ji->code_size;
-
-		if (addr < start)
-			right = pos;
-		else if (addr >= end) 
-			left = pos + 1;
-		else
-			return pos;
-	}
-
-	return left;
-}
-
-MonoJitInfo *
-mono_jit_info_table_find (MonoJitInfoTable *table, gpointer addr)
-{
-	int left = 0, right = table->len;
-
-	while (left < right) {
-		int pos = (left + right) / 2;
-		MonoJitInfo *ji = g_array_index (table, gpointer, pos);
-		gpointer start = ji->code_start;
-		gpointer end = start + ji->code_size;
-
-		if (addr < start)
-			right = pos;
-		else if (addr >= end) 
-			left = pos + 1;
-		else
-			return ji;
-	}
-
-	return NULL;
-}
-
-void
-mono_jit_info_table_add (MonoJitInfoTable *table, MonoJitInfo *ji)
-{
-	gpointer start = ji->code_start;
-	int pos = mono_jit_info_table_index (table, start);
-
-	//printf ("TESTADD %d %p\n", pos, ji->code_start);
-	g_array_insert_val (table, pos, ji);
-}
-
-/**
- * runtime_class_init:
- * @klass: the class to initialise
- *
- * Initialise the class @klass by calling the class constructor.
- */
-static void
-runtime_class_init (MonoClass *klass)
-{
-	MonoCCtor cctor;
-	MonoMethod *method;
-	int i;
-
-	if (mono_debug_handle)
-		mono_debug_add_type (mono_debug_handle, klass);
-	
-	for (i = 0; i < klass->method.count; ++i) {
-		method = klass->methods [i];
-		if ((method->flags & METHOD_ATTRIBUTE_SPECIAL_NAME) && 
-		    (strcmp (".cctor", method->name) == 0)) {
-	
-			cctor = arch_compile_method (method);
-			if (!cctor && mono_debug_handle)
-				return;
-			g_assert (cctor != NULL);
-			cctor ();
-			return;
-		}
-	}
-	/* No class constructor found */
-}
-
-static int
-map_store_svt_type (int svt)
-{
-	switch (svt) {
-	case VAL_I32:
-		return MB_TERM_STIND_I4;
-	case VAL_POINTER:
-		return MB_TERM_STIND_REF;
-	case VAL_I64:
-		return MB_TERM_STIND_I8;
-	case VAL_DOUBLE:
-		return MB_TERM_STIND_R8;
-	default:
-		g_assert_not_reached ();
-	}
-
-	return 0;
-}
-
-/**
- * map_stind_type:
- * @type: the type to map
- *
- * Translates the MonoType @type into the corresponding store opcode 
- * for the code generator.
- */
-static int
-map_stind_type (MonoType *type)
-{
-	if (type->byref) 
-		return MB_TERM_STIND_REF;
-
-	switch (type->type) {
-	case MONO_TYPE_I1:
-	case MONO_TYPE_U1:
-	case MONO_TYPE_BOOLEAN:
-		return MB_TERM_STIND_I1;	
-	case MONO_TYPE_I2:
-	case MONO_TYPE_U2:
-	case MONO_TYPE_CHAR:
-		return MB_TERM_STIND_I2;	
-	case MONO_TYPE_I:
-	case MONO_TYPE_I4:
-	case MONO_TYPE_U4:
-		return MB_TERM_STIND_I4;	
-	case MONO_TYPE_CLASS:
-	case MONO_TYPE_OBJECT:
-	case MONO_TYPE_STRING:
-	case MONO_TYPE_PTR:
-	case MONO_TYPE_SZARRAY:
-	case MONO_TYPE_ARRAY:    
-		return MB_TERM_STIND_REF;
-	case MONO_TYPE_I8:
-	case MONO_TYPE_U8:
-		return MB_TERM_STIND_I8;
-	case MONO_TYPE_R4:
-		return MB_TERM_STIND_R4;
-	case MONO_TYPE_R8:
-		return MB_TERM_STIND_R8;
-	case MONO_TYPE_VALUETYPE: 
-		if (type->data.klass->enumtype)
-			return map_stind_type (type->data.klass->enum_basetype);
-		else
-			return MB_TERM_STIND_OBJ;
-	default:
-		g_warning ("unknown type %02x", type->type);
-		g_assert_not_reached ();
-	}
-
-	g_assert_not_reached ();
-	return -1;
-}
-
-static int
-map_starg_type (MonoType *type)
-{
-	if (type->byref) 
-		return MB_TERM_STIND_REF;
-
-	switch (type->type) {
-	case MONO_TYPE_I1:
-	case MONO_TYPE_U1:
-	case MONO_TYPE_BOOLEAN:
-	case MONO_TYPE_I2:
-	case MONO_TYPE_U2:
-	case MONO_TYPE_CHAR:
-	case MONO_TYPE_I:
-	case MONO_TYPE_I4:
-	case MONO_TYPE_U4:
-		return MB_TERM_STIND_I4;
-	case MONO_TYPE_CLASS:
-	case MONO_TYPE_OBJECT:
-	case MONO_TYPE_STRING:
-	case MONO_TYPE_PTR:
-	case MONO_TYPE_SZARRAY:
-	case MONO_TYPE_ARRAY:    
-		return MB_TERM_STIND_REF;
-	case MONO_TYPE_I8:
-	case MONO_TYPE_U8:
-		return MB_TERM_STIND_I8;
-	case MONO_TYPE_R4:
-		return MB_TERM_STIND_R4;
-	case MONO_TYPE_R8:
-		return MB_TERM_STIND_R8;
-	case MONO_TYPE_VALUETYPE: 
-		if (type->data.klass->enumtype)
-			return map_starg_type (type->data.klass->enum_basetype);
-		else
-			return MB_TERM_STIND_OBJ;
-	default:
-		g_warning ("unknown type %02x", type->type);
-		g_assert_not_reached ();
-	}
-
-	g_assert_not_reached ();
-	return -1;
-}
-
-static int
-map_arg_type (MonoType *type, gboolean pinvoke)
-{
-	if (type->byref) 
-		return MB_TERM_ARG_I4;
-
-	switch (type->type) {
-	case MONO_TYPE_I1:
-	case MONO_TYPE_U1:
-	case MONO_TYPE_BOOLEAN:
-	case MONO_TYPE_I2:
-	case MONO_TYPE_U2:
-	case MONO_TYPE_CHAR:
-	case MONO_TYPE_I:
-	case MONO_TYPE_U:
-	case MONO_TYPE_I4:
-	case MONO_TYPE_U4:
-	case MONO_TYPE_CLASS:
-	case MONO_TYPE_OBJECT:
-	case MONO_TYPE_PTR:
-	case MONO_TYPE_SZARRAY:
-	case MONO_TYPE_ARRAY:    
-		return MB_TERM_ARG_I4;
-	case MONO_TYPE_STRING:
-		if (pinvoke)
-			return MB_TERM_ARG_STRING;
-		return MB_TERM_ARG_I4;
-	case MONO_TYPE_I8:
-	case MONO_TYPE_U8:
-		return MB_TERM_ARG_I8;
-	case MONO_TYPE_R4:
-		return MB_TERM_ARG_R4;
-	case MONO_TYPE_R8:
-		return MB_TERM_ARG_R8;
-	case MONO_TYPE_VALUETYPE:
-		if (type->data.klass->enumtype)
-			return map_arg_type (type->data.klass->enum_basetype, pinvoke);
-		else
-			return MB_TERM_ARG_OBJ;
-	default:
-		g_warning ("unknown type %02x", type->type);
-		g_assert_not_reached ();
-	}
-
-	g_assert_not_reached ();
-	return -1;
-}
-
-/**
- * map_ldind_type:
- * @type: the type to map
- *
- * Translates the MonoType @type into the corresponding load opcode 
- * for the code generator.
- */
-static int
-map_ldind_type (MonoType *type, MonoValueType *svt)
-{
-	if (type->byref) {
-		*svt = VAL_POINTER;
-		return MB_TERM_LDIND_REF;
-	}
-
-	switch (type->type) {
-	case MONO_TYPE_I1:
-		*svt = VAL_I32;
-		return MB_TERM_LDIND_I1;
-	case MONO_TYPE_U1:
-	case MONO_TYPE_BOOLEAN:
-		*svt = VAL_I32;
-		return MB_TERM_LDIND_U1;
-	case MONO_TYPE_I2:
-		*svt = VAL_I32;
-		return MB_TERM_LDIND_I2;
-	case MONO_TYPE_U2:
-	case MONO_TYPE_CHAR:
-		*svt = VAL_I32;
-		return MB_TERM_LDIND_U2;
-	case MONO_TYPE_I:
-	case MONO_TYPE_I4:
-		*svt = VAL_I32;
-		return MB_TERM_LDIND_I4;
-	case MONO_TYPE_U4:
-		*svt = VAL_I32;
-		return MB_TERM_LDIND_U4;
-	case MONO_TYPE_CLASS:
-	case MONO_TYPE_OBJECT:
-	case MONO_TYPE_STRING:
-	case MONO_TYPE_PTR:
-	case MONO_TYPE_SZARRAY:
-	case MONO_TYPE_ARRAY:    
-		*svt = VAL_POINTER;
-		return MB_TERM_LDIND_REF;
-	case MONO_TYPE_I8:
-	case MONO_TYPE_U8:
-		*svt = VAL_I64;
-		return MB_TERM_LDIND_I8;
-	case MONO_TYPE_R4:
-		*svt = VAL_DOUBLE;
-		return MB_TERM_LDIND_R4;
-	case MONO_TYPE_R8:
-		*svt = VAL_DOUBLE;
-		return MB_TERM_LDIND_R8;
-	case MONO_TYPE_VALUETYPE:
-		if (type->data.klass->enumtype) {
-			return map_ldind_type (type->data.klass->enum_basetype, svt);
-		} else {
-			*svt = VAL_UNKNOWN;
-			return MB_TERM_LDIND_OBJ;
-		}
-	default:
-		g_warning ("unknown type %02x", type->type);
-		g_assert_not_reached ();
-	}
-
-	g_assert_not_reached ();
-	return -1;
-}
-
-static int
-map_ldarg_type (MonoType *type, MonoValueType *svt)
-{
-	if (type->byref) {
-		*svt = VAL_POINTER;
-		return MB_TERM_LDIND_REF;
-	}
-
-	switch (type->type) {
-	case MONO_TYPE_I1:
-	case MONO_TYPE_U1:
-	case MONO_TYPE_BOOLEAN:
-	case MONO_TYPE_I2:
-	case MONO_TYPE_U2:
-	case MONO_TYPE_CHAR:
-	case MONO_TYPE_I:
-	case MONO_TYPE_I4:
-	case MONO_TYPE_U4:
-		*svt = VAL_I32;
-		return MB_TERM_LDIND_U4;
-	case MONO_TYPE_CLASS:
-	case MONO_TYPE_OBJECT:
-	case MONO_TYPE_STRING:
-	case MONO_TYPE_PTR:
-	case MONO_TYPE_SZARRAY:
-	case MONO_TYPE_ARRAY:    
-		*svt = VAL_POINTER;
-		return MB_TERM_LDIND_U4;
-	case MONO_TYPE_I8:
-	case MONO_TYPE_U8:
-		*svt = VAL_I64;
-		return MB_TERM_LDIND_I8;
-	case MONO_TYPE_R4:
-		*svt = VAL_DOUBLE;
-		return MB_TERM_LDIND_R4;
-	case MONO_TYPE_R8:
-		*svt = VAL_DOUBLE;
-		return MB_TERM_LDIND_R8;
-	case MONO_TYPE_VALUETYPE:
-		if (type->data.klass->enumtype) {
-			return map_ldarg_type (type->data.klass->enum_basetype, svt);
-		} else {
-			*svt = VAL_UNKNOWN;
-			return MB_TERM_LDIND_OBJ;
-		}
-	default:
-		g_warning ("unknown type %02x", type->type);
-		g_assert_not_reached ();
-	}
-
-	g_assert_not_reached ();
-	return -1;
-}
-
-/**
- * map_call_type:
- * @type: the type to map
- *
- * Translates the MonoType @type into the corresponding call opcode 
- * for the code generator.
- */
-static int
-map_call_type (MonoType *type, MonoValueType *svt)
-{
-	if (type->byref) 
-		return MB_TERM_CALL_I4;
-
-	switch (type->type) {
-	case MONO_TYPE_VOID:
-		*svt = VAL_UNKNOWN;
-		return MB_TERM_CALL_VOID;
-	case MONO_TYPE_I1:
-	case MONO_TYPE_U1:
-	case MONO_TYPE_BOOLEAN:
-	case MONO_TYPE_I2:
-	case MONO_TYPE_U2:
-	case MONO_TYPE_CHAR:
-	case MONO_TYPE_I:
-	case MONO_TYPE_I4:
-	case MONO_TYPE_U4:
-		*svt = VAL_I32;
-		return MB_TERM_CALL_I4;
-	case MONO_TYPE_VALUETYPE:
-		if (type->data.klass->enumtype) {
-			return map_call_type (type->data.klass->enum_basetype, svt);
-		} else {
-			*svt = VAL_I32;
-			return MB_TERM_CALL_VOID;
-		}
-	case MONO_TYPE_CLASS:
-	case MONO_TYPE_OBJECT:
-	case MONO_TYPE_STRING:
-	case MONO_TYPE_PTR:
-	case MONO_TYPE_SZARRAY: 
-		*svt = VAL_POINTER;
-		return MB_TERM_CALL_I4;
-	case MONO_TYPE_I8:
-	case MONO_TYPE_U8:
-		*svt = VAL_I64;
-		return MB_TERM_CALL_I8;
-	case MONO_TYPE_R4:
-	case MONO_TYPE_R8:
-		*svt = VAL_DOUBLE;
-		return MB_TERM_CALL_R8;
-	default:
-		g_warning ("unknown type %02x", type->type);
-		g_assert_not_reached ();
-	}
-
-	g_assert_not_reached ();
-	return -1;
-}
-
-/*
- * prints the tree to stdout
- */
-void
-mono_print_ctree (MBTree *tree)
-{
-	int arity;
-
-	if (!tree)
-		return;
-
-	arity = (tree->left != NULL) + (tree->right != NULL);
-
-	if (arity)
-		printf (" (%s", mono_burg_term_string [tree->op]);
-	else 
-		printf (" %s", mono_burg_term_string [tree->op]);
-
-	switch (tree->op) {
-	case MB_TERM_ADDR_L:
-		printf ("[%d]", tree->data.i);
-		break;
-	}
-
-	g_assert (!(tree->right && !tree->left));
-
-	mono_print_ctree (tree->left);
-	mono_print_ctree (tree->right);
-
-	if (arity)
-		printf (")");
-}
-
-/*
- * prints the whole forest to stdout
- */
-void
-mono_print_forest (GPtrArray *forest)
-{
-	const int top = forest->len;
-	int i;
-
-	for (i = 0; i < top; i++) {
-		MBTree *t = (MBTree *) g_ptr_array_index (forest, i);
-		printf ("       ");
-		mono_print_ctree (t);
-		printf ("\n");
-	}
-
-}
-
-/**
- * mono_disassemble_code:
- * @code: a pointer to the code
- * @size: the code size in bytes
- *
- * Disassemble to code to stdout.
- */
-void
-mono_disassemble_code (guint8 *code, int size, char *id)
-{
-	int i;
-	FILE *ofd;
-
-	if (!(ofd = fopen ("/tmp/test.s", "w")))
-		g_assert_not_reached ();
-
-	fprintf (ofd, "%s:\n", id);
-
-	for (i = 0; i < size; ++i) 
-		fprintf (ofd, ".byte %d\n", (unsigned int) code [i]);
-
-	fclose (ofd);
-
-	system ("as /tmp/test.s -o /tmp/test.o;objdump -d /tmp/test.o"); 
-}
-
-static int
-arch_allocate_var (MonoFlowGraph *cfg, int size, int align, MonoValueKind kind, MonoValueType type)
-{
-	MonoVarInfo vi;
-
-	mono_jit_stats.allocate_var++;
-
-	switch (kind) {
-	case MONO_TEMPVAR:
-	case MONO_LOCALVAR: {
-		cfg->locals_size += size;
-		cfg->locals_size += align - 1;
-		cfg->locals_size &= ~(align - 1);
-
-		SET_VARINFO (vi, type, kind, - cfg->locals_size, size);
-		g_array_append_val (cfg->varinfo, vi);
-		break;
-	}
-	case MONO_ARGVAR: {
-		int arg_start = 8 + cfg->has_vtarg*4;
-
-		g_assert ((align & 3) == 0);
-
-		SET_VARINFO (vi, type, kind, cfg->args_size + arg_start, size);
-		g_array_append_val (cfg->varinfo, vi);
-		
-		cfg->args_size += size;
-		cfg->args_size += 3;
-		cfg->args_size &= ~3;
-		break;
-	}
-	default:
-		g_assert_not_reached ();
-	}
-
-	return cfg->varinfo->len - 1;
-}
-
-inline static void
-mono_get_val_sizes (MonoValueType type, int *size, int *align) 
-{ 
-	switch (type) {
-	case VAL_I32:
-		*size = *align = sizeof (gint32);
-		break;
-	case VAL_I64:
-		*size = *align = sizeof (gint64);
-		break;
-	case VAL_POINTER:
-		*size = *align = sizeof (gpointer);
-		break;
-	case VAL_DOUBLE:
-		*size = *align = sizeof (double);
-		break;
-	default:
-		g_assert_not_reached ();
-	}
-}
-
 static int
 mono_allocate_intvar (MonoFlowGraph *cfg, int slot, MonoValueType type)
 {
@@ -811,7 +269,7 @@ mono_allocate_intvar (MonoFlowGraph *cfg, int slot, MonoValueType type)
 	/* take care if you modify MonoValueType */
 	g_assert (VAL_DOUBLE == 4);
 
-	/* fixme: machine dependant */ 
+	/* fixme: machine dependant */
 	if (type == VAL_POINTER)
 		type = VAL_I32; /* VAL_I32 and VAL_POINTER share the same slot */
 
@@ -834,9 +292,27 @@ mono_allocate_excvar (MonoFlowGraph *cfg)
 
 	cfg->excvar = arch_allocate_var (cfg, 4, 4, MONO_TEMPVAR, VAL_POINTER);
 
+	VARINFO (cfg, cfg->excvar).isvolatile = 1;
+	
 	return cfg->excvar;
 }
 
+/**
+ * mono_jit_runtime_invoke:
+ * @method: the method to invoke
+ * @obj: this pointer
+ * @params: array of parameter values.
+ * @exc: used to catch exceptions objects
+ */
+static MonoObject*
+mono_jit_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject **exc)
+{
+	MonoMethod *invoke;
+	MonoObject *(*runtime_invoke) (MonoObject *this, void **params, MonoObject **exc);
+	invoke = mono_marshal_get_runtime_invoke (method);
+	runtime_invoke = mono_compile_method (invoke);       
+	return runtime_invoke (obj, params, exc);
+}
 
 /**
  * ctree_create_load:
@@ -854,9 +330,9 @@ ctree_create_load (MonoFlowGraph *cfg, MonoType *type, MBTree *addr, MonoValueTy
 	MBTree *t;
 
 	if (arg)
-		ldind = map_ldarg_type (type, svt);
+		ldind = mono_map_ldarg_type (type, svt);
 	else
-		ldind = map_ldind_type (type, svt);
+		ldind = mono_map_ldind_type (type, svt);
 
 	t = mono_ctree_new (mp, ldind, addr, NULL);
 
@@ -882,13 +358,13 @@ ctree_create_store (MonoFlowGraph *cfg, MonoType *type, MBTree *addr,
 	MBTree *t;
 	
 	if (arg)
-		stind = map_starg_type (type);
+		stind = mono_map_starg_type (type);
 	else
-		stind = map_stind_type (type);
+		stind = mono_map_stind_type (type);
 
 	t = mono_ctree_new (mp, stind, addr, s);
 
-	if (ISSTRUCT (type))
+	if (MONO_TYPE_ISSTRUCT (type))
 		t->data.i = mono_class_value_size (type->data.klass, NULL);
 	
 	return t;
@@ -942,23 +418,12 @@ ctree_create_dup (MonoMemPool *mp, MBTree *s)
 		t = mono_ctree_new (mp, MB_TERM_LDIND_I2, t, NULL);
 		t->svt = VAL_I32;
 		break;
-	case MB_TERM_STIND_REF:
-	case MB_TERM_LDIND_REF:
-		t = ctree_dup_address (mp, s->left);
-		t = mono_ctree_new (mp, MB_TERM_LDIND_REF, t, NULL);
-		t->svt = VAL_POINTER;
-		break;
 	case MB_TERM_STIND_I4:
 	case MB_TERM_LDIND_I4:
 		t = ctree_dup_address (mp, s->left);
 		t = mono_ctree_new (mp, MB_TERM_LDIND_I4, t, NULL);
 		t->svt = VAL_I32;
 		break;
-	case MB_TERM_LDIND_U4:
-		t = ctree_dup_address (mp, s->left);
-		t = mono_ctree_new (mp, MB_TERM_LDIND_U4, t, NULL);
-		t->svt = VAL_I32;
-		break;
 	case MB_TERM_STIND_I8:
 	case MB_TERM_LDIND_I8:
 		t = ctree_dup_address (mp, s->left);
@@ -986,7 +451,7 @@ ctree_create_dup (MonoMemPool *mp, MBTree *s)
 }
 
 static MBTree *
-mono_store_tree (MonoFlowGraph *cfg, int slot, MBTree *s, MBTree **dup)
+mono_store_tree (MonoFlowGraph *cfg, int slot, MBTree *s, MBTree **tdup)
 {
 	MonoMemPool *mp = cfg->mp;
 	MBTree *t;
@@ -999,8 +464,6 @@ mono_store_tree (MonoFlowGraph *cfg, int slot, MBTree *s, MBTree **dup)
 	case MB_TERM_LDIND_I2:
 	case MB_TERM_STIND_I4:
 	case MB_TERM_LDIND_I4:
-	case MB_TERM_STIND_REF:
-	case MB_TERM_LDIND_REF:
 	case MB_TERM_STIND_I8:
 	case MB_TERM_LDIND_I8:
 	case MB_TERM_STIND_R4:
@@ -1011,17 +474,17 @@ mono_store_tree (MonoFlowGraph *cfg, int slot, MBTree *s, MBTree **dup)
 			vnum = mono_allocate_intvar (cfg, slot, s->svt);
 
 			if (s->left->op == MB_TERM_ADDR_L && s->left->data.i == vnum) {
-				if (dup)
-					*dup = ctree_create_dup (mp, s);
+				if (tdup)
+					*tdup = ctree_create_dup (mp, s);
 				return NULL;
 			}
 			// fall through
 		} else {
-			if (dup)
-				*dup = ctree_create_dup (mp, s);
+			if (tdup)
+				*tdup = ctree_create_dup (mp, s);
 			return NULL;
 		}
-	}			
+	}	
 	default: {
 			g_assert (s->svt != VAL_UNKNOWN);
 
@@ -1036,89 +499,19 @@ mono_store_tree (MonoFlowGraph *cfg, int slot, MBTree *s, MBTree **dup)
 			t = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
 			t->data.i = vnum;
 		       
-			t = mono_ctree_new (mp, map_store_svt_type (s->svt), t, s);
+			t = mono_ctree_new (mp, mono_map_store_svt_type (s->svt), t, s);
 			t->svt = s->svt;
 		}
 	}
 
-	if (dup) 
-		mono_store_tree (cfg, -1, t, dup);
+	if (tdup) 
+		mono_store_tree (cfg, -1, t, tdup);
 
 	return t;
 }
 
-MonoFlowGraph *
-mono_cfg_new (MonoMethod *method, MonoMemPool *mp)
-{
-	MonoVarInfo vi;
-	MonoFlowGraph *cfg;
-
-	g_assert (((MonoMethodNormal *)method)->header);
-
-	cfg = mono_mempool_alloc0 (mp, sizeof (MonoFlowGraph));
-
-	cfg->domain = mono_domain_get ();
-	cfg->method = method;
-	cfg->mp = mp;
-
-	/* fixme: we should also consider loader optimisation attributes */
-	cfg->share_code = mono_jit_share_code;
-
-	cfg->varinfo = g_array_new (FALSE, TRUE, sizeof (MonoVarInfo));
-	
-	SET_VARINFO (vi, 0, 0, 0, 0);
-	g_array_append_val (cfg->varinfo, vi); /* add invalid value at position 0 */
-
-	cfg->intvars = mono_mempool_alloc0 (mp, sizeof (guint16) * VAL_DOUBLE * 
-					    ((MonoMethodNormal *)method)->header->max_stack);
-	return cfg;
-}
-
-void
-mono_cfg_free (MonoFlowGraph *cfg)
-{
-	int i;
-
-	for (i = 0; i < cfg->block_count; i++) {
-		if (!cfg->bblocks [i].reached)
-			continue;
-		g_ptr_array_free (cfg->bblocks [i].forest, TRUE);
-	}
-
-	if (cfg->bcinfo)
-		g_free (cfg->bcinfo);
-
-	if (cfg->bblocks)
-		g_free (cfg->bblocks);
-
-	g_array_free (cfg->varinfo, TRUE);
-}
-
-
-static void
-runtime_object_init (MonoObject *obj)
-{
-	MonoClass *klass = obj->vtable->klass;
-	MonoMethod *method = NULL;
-	void (*ctor) (gpointer this);
-	int i;
-
-	for (i = 0; i < klass->method.count; ++i) {
-		if (!strcmp (".ctor", klass->methods [i]->name) &&
-		    klass->methods [i]->signature->param_count == 0) {
-			method = klass->methods [i];
-			break;
-		}
-	}
-
-	g_assert (method);
-
-	ctor = arch_compile_method (method);
-	ctor (obj);
-}
-
 static MonoBBlock *
-mono_find_final_block (MonoFlowGraph *cfg, guint32 ip, int type)
+mono_find_final_block (MonoFlowGraph *cfg, guint32 ip, guint32 target, int type)
 {
 	MonoMethod *method = cfg->method;
 	MonoBytecodeInfo *bcinfo = cfg->bcinfo;
@@ -1128,27 +521,46 @@ mono_find_final_block (MonoFlowGraph *cfg, guint32 ip, int type)
 
 	for (i = 0; i < header->num_clauses; ++i) {
 		clause = &header->clauses [i];
-		if (MONO_OFFSET_IN_HANDLER (clause, ip))
-			return NULL;
 
-		if (MONO_OFFSET_IN_CLAUSE (clause, ip)) {
+		if (MONO_OFFSET_IN_CLAUSE (clause, ip) && 
+		    (!MONO_OFFSET_IN_CLAUSE (clause, target))) {
 			if (clause->flags & type) {
 				g_assert (bcinfo [clause->handler_offset].is_block_start);
 				return &cfg->bblocks [bcinfo [clause->handler_offset].block_id];
-			} else
-				return NULL;
+			}
 		}
 	}
 	return NULL;
 }
 
+static void
+mono_cfg_add_successor (MonoFlowGraph *cfg, MonoBBlock *bb, gint32 target)
+{
+	MonoBBlock *tbb;
+	GList *l;
+
+	g_assert (cfg->bcinfo [target].is_block_start);
+
+	tbb = &cfg->bblocks [cfg->bcinfo [target].block_id];
+	g_assert (tbb);
+
+	for (l = bb->succ; l; l = l->next) {
+		MonoBBlock *t = (MonoBBlock *)l->data;
+		if (t == tbb)
+			return;
+	}
+
+	bb->succ = g_list_prepend (bb->succ, tbb);
+}
+
+
 #define CREATE_BLOCK(t) {if (!bcinfo [t].is_block_start) {block_count++;bcinfo [t].is_block_start = 1; }}
 
-void
+static void
 mono_analyze_flow (MonoFlowGraph *cfg)
 {
 	MonoMethod *method = cfg->method;
-	register const unsigned char *ip, *end;
+	const unsigned char *ip, *end;
 	MonoMethodHeader *header;
 	MonoBytecodeInfo *bcinfo;
 	MonoExceptionClause *clause;
@@ -1169,29 +581,27 @@ mono_analyze_flow (MonoFlowGraph *cfg)
 
 	mono_jit_stats.cil_code_size += header->code_size;
 
-	/* fixme: add block boundaries for exceptions */
 	for (i = 0; i < header->num_clauses; ++i) {
 		clause = &header->clauses [i];
+
 		CREATE_BLOCK (clause->try_offset);
 		CREATE_BLOCK (clause->handler_offset);
+
+		if (clause->flags == MONO_EXCEPTION_CLAUSE_FILTER)
+			CREATE_BLOCK (clause->token_or_filter);
 	}
 
 	while (ip < end) {
 		guint32 cli_addr = ip - header->code;
 
-		//printf ("IL%04x OPCODE %s\n", cli_addr, opcode_names [*ip]);
+		//printf ("IL%04x OPCODE %s\n", cli_addr, mono_opcode_names [*ip]);
 		
 		if (block_end) {
 			CREATE_BLOCK (cli_addr);
 			block_end = FALSE;
 		}
 
-		if (*ip == 0xfe) {
-			++ip;
-			i = *ip + 256;
-		} else {
-			i = *ip;
-		}
+		i = mono_opcode_value (&ip);
 
 		opcode = &mono_opcodes [i];
 
@@ -1214,11 +624,13 @@ mono_analyze_flow (MonoFlowGraph *cfg)
 		case MonoInlineNone:
 			++ip;
 			break;
+		case MonoInlineString:
+			mono_ldstr (mono_domain_get (), method->klass->image, mono_metadata_token_index (read32 (ip + 1)));
+			/* fall through */
 		case MonoInlineType:
 		case MonoInlineField:
 		case MonoInlineMethod:
 		case MonoInlineTok:
-		case MonoInlineString:
 		case MonoInlineSig:
 		case MonoShortInlineR:
 		case MonoInlineI:
@@ -1237,6 +649,7 @@ mono_analyze_flow (MonoFlowGraph *cfg)
 			ip++;
 			CREATE_BLOCK (cli_addr + 2 + i);
 			block_end = 1;
+		       
 			break;
 		case MonoInlineBrTarget:
 			ip++;
@@ -1283,6 +696,8 @@ mono_analyze_flow (MonoFlowGraph *cfg)
 	for (i = 0; i < header->code_size; i++) {
 		if (bcinfo [i].is_block_start) {
 			bb->cli_addr = i;
+			bb->num = block_count;
+			bb->forest = g_ptr_array_new ();
 			if (block_count)
 				bb [-1].length = i - bb [-1].cli_addr; 
 			bcinfo [i].block_id = block_count;
@@ -1295,6 +710,98 @@ mono_analyze_flow (MonoFlowGraph *cfg)
 	cfg->bcinfo = bcinfo;
 	cfg->bblocks = bblocks;
 	cfg->block_count = block_count;
+
+	mono_jit_stats.basic_blocks += block_count;
+	mono_jit_stats.max_basic_blocks = MAX (block_count, mono_jit_stats.max_basic_blocks);
+       
+	for (i = 0; i < header->num_clauses; ++i) {
+		MonoBBlock *sbb, *tbb;
+		clause = &header->clauses [i];
+		sbb = &cfg->bblocks [bcinfo [clause->try_offset].block_id];
+		tbb = &cfg->bblocks [bcinfo [clause->handler_offset].block_id];
+		g_assert (sbb && tbb);
+		sbb->succ = g_list_prepend (sbb->succ, tbb);
+	}
+
+	ip = header->code;
+	end = ip + header->code_size;
+	bb = NULL;
+
+	while (ip < end) {
+		guint32 cli_addr = ip - header->code;
+
+		if (bcinfo [cli_addr].is_block_start) {
+			MonoBBlock *tbb = &cfg->bblocks [bcinfo [cli_addr].block_id];		
+			if (bb && !bb->succ)
+				bb->succ = g_list_prepend (bb->succ, tbb);
+			bb = tbb;
+		}
+		g_assert (bb);
+
+		i = mono_opcode_value (&ip);
+
+		opcode = &mono_opcodes [i];
+
+		switch (opcode->argument) {
+		case MonoInlineNone:
+			++ip;
+			break;
+		case MonoInlineString:
+		case MonoInlineType:
+		case MonoInlineField:
+		case MonoInlineMethod:
+		case MonoInlineTok:
+		case MonoInlineSig:
+		case MonoShortInlineR:
+		case MonoInlineI:
+			ip += 5;
+			break;
+		case MonoInlineVar:
+			ip += 3;
+			break;
+		case MonoShortInlineVar:
+		case MonoShortInlineI:
+			ip += 2;
+			break;
+		case MonoShortInlineBrTarget:
+			ip++;
+			i = (signed char)*ip;
+			ip++;
+			mono_cfg_add_successor (cfg, bb, cli_addr + 2 + i);
+			if (opcode->flow_type == MONO_FLOW_COND_BRANCH)
+				mono_cfg_add_successor (cfg, bb, cli_addr + 2);
+			break;
+		case MonoInlineBrTarget:
+			ip++;
+			i = read32 (ip);
+			ip += 4;
+			mono_cfg_add_successor (cfg, bb, cli_addr + 5 + i);
+			if (opcode->flow_type == MONO_FLOW_COND_BRANCH)
+				mono_cfg_add_successor (cfg, bb, cli_addr + 5);
+			break;
+		case MonoInlineSwitch: {
+			gint32 st, target, n;
+			++ip;
+			n = read32 (ip);
+			ip += 4;
+			st = cli_addr + 5 + 4 * n;
+			mono_cfg_add_successor (cfg, bb, st);
+
+			for (i = 0; i < n; i++) {
+				target = read32 (ip) + st;
+				ip += 4;
+				mono_cfg_add_successor (cfg, bb, target);
+			}
+			break;
+		}
+		case MonoInlineR:
+		case MonoInlineI8:
+			ip += 9;
+			break;
+		default:
+			g_assert_not_reached ();
+		}
+	}
 }
 
 /**
@@ -1317,10 +824,13 @@ ves_array_element_address (MonoArray *this, ...)
 
 	class = this->obj.vtable->klass;
 
-	ind = va_arg(ap, int) - this->bounds [0].lower_bound;
-	for (i = 1; i < class->rank; i++) {
-		ind = ind*this->bounds [i].length + va_arg(ap, int) -
-			this->bounds [i].lower_bound;;
+	ind = va_arg(ap, int);
+	if (this->bounds != NULL) {
+		ind -= this->bounds [0].lower_bound;
+		for (i = 1; i < class->rank; i++) {
+			ind = ind*this->bounds [i].length + va_arg(ap, int) -
+				this->bounds [i].lower_bound;;
+		}
 	}
 
 	esize = mono_array_element_size (class);
@@ -1367,12 +877,384 @@ mono_array_new_va (MonoMethod *cm, ...)
 #define PUSH_TREE(t,k)  do { int tt = k; *sp = t; t->svt = tt; sp++; } while (0)
 
 #define LOCAL_POS(n)    (1 + n)
+
+#ifdef OPT_BOOL
+#define LOCAL_TYPE(n)   ((header)->locals [(n)]->type == MONO_TYPE_BOOLEAN && !(header)->locals [(n)]->byref ? &mono_defaults.int32_class->byval_arg : (header)->locals [(n)])
+#else
 #define LOCAL_TYPE(n)   ((header)->locals [(n)])
+#endif
 
 #define ARG_POS(n)      (firstarg + n)
 #define ARG_TYPE(n)     ((n) ? (signature)->params [(n) - (signature)->hasthis] : \
 			(signature)->hasthis ? &method->klass->this_arg: (signature)->params [(0)])
 
+
+/*
+ * replaces all occurences of variable @varnum in @tree with @copy. 
+ */
+static void
+mono_copy_used_var (MonoFlowGraph *cfg, MBTree *tree, int varnum, MBTree **copy)
+{
+	MBTree *t1, *t2;
+	int v, size, align;
+
+	if (tree->left)
+		mono_copy_used_var (cfg, tree->left, varnum, copy);
+	if (tree->right)
+		mono_copy_used_var (cfg, tree->right, varnum, copy);
+
+	switch (tree->op) {
+	case MB_TERM_LDIND_I1:
+	case MB_TERM_LDIND_I2:
+	case MB_TERM_LDIND_I4:
+	case MB_TERM_LDIND_I8:
+	case MB_TERM_LDIND_R4:
+	case MB_TERM_LDIND_R8:
+		if (tree->left->op == MB_TERM_ADDR_L &&
+		    tree->left->data.i == varnum) {
+			if (*copy) {
+				tree->left->data.i = (*copy)->left->data.i;
+				return;
+			} 
+			
+			mono_get_val_sizes (tree->svt, &size, &align);
+			v = arch_allocate_var (cfg, size, align, MONO_TEMPVAR, tree->svt);
+ 
+			t1 = mono_ctree_new_leaf (cfg->mp, MB_TERM_ADDR_L);
+			t1->data.i = v;
+		       
+			t2 = mono_ctree_new_leaf (cfg->mp, MB_TERM_ADDR_L);
+			t2->data.i = varnum;
+			t2 = mono_ctree_new (cfg->mp, tree->op, t2, NULL);
+
+			t2 = mono_ctree_new (cfg->mp, mono_map_store_svt_type (tree->svt), t1, t2);
+			t2->svt = tree->svt;
+
+			tree->left->data.i = v;
+
+			*copy = t2;
+		}
+	}
+}
+
+/* 
+ * if a variable is modified and there are still referencence
+ * to it on the runtime stack we need to store the value into
+ * a temporary variable and use that value instead of the 
+ * modified one.
+ */
+static MBTree *
+mono_stack_duplicate_used_var (MonoFlowGraph *cfg, MBTree **stack, MBTree **sp, int varnum)
+{
+	MBTree *res = NULL;
+
+	while (stack < sp) {
+		mono_copy_used_var (cfg, *stack, varnum, &res);
+		stack++;
+	}
+
+	return res;
+}
+
+static int
+check_inlining (MonoMethod *method)
+{
+	MonoMethodHeader *header;
+	MonoMethodSignature *signature = method->signature;
+	register const unsigned char *ip, *end;
+	gboolean stop;
+	int i, arg_used [256];
+
+	g_assert (method);
+
+	if (method->inline_info)
+		return method->inline_count;
+
+	method->inline_info = 1;
+	
+	if (method->wrapper_type != MONO_WRAPPER_NONE)
+		goto fail;
+
+	if ((method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) ||
+	    (method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
+	    (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
+	    (method->klass->marshalbyref) ||
+	    MONO_TYPE_ISSTRUCT (signature->ret))
+		goto fail;;
+       
+	if (!(header = ((MonoMethodNormal *)method)->header) ||
+	    header->num_clauses)
+		goto fail;;
+
+	if (header->num_clauses)
+		goto fail;
+	
+	ip = header->code;
+	end = ip + header->code_size;
+
+	for (i = 0; i < 256; i++)
+		arg_used [i] = 0;
+
+	stop = FALSE;        
+	while (!stop && ip < end) {
+
+		switch (*ip) {
+		case CEE_NOP:
+		case CEE_BREAK:
+		case CEE_DUP:
+		case CEE_POP:
+		case CEE_LDIND_I1:
+		case CEE_LDIND_U1:
+		case CEE_LDIND_I2:
+		case CEE_LDIND_U2:
+		case CEE_LDIND_I4:
+		case CEE_LDIND_U4:
+		case CEE_LDIND_I8:
+		case CEE_LDIND_I:
+		case CEE_LDIND_R4:
+		case CEE_LDIND_R8:
+		case CEE_LDIND_REF:
+		case CEE_STIND_REF:
+		case CEE_STIND_I1:
+		case CEE_STIND_I2:
+		case CEE_STIND_I4:
+		case CEE_STIND_I8:
+		case CEE_STIND_R4:
+		case CEE_STIND_R8:
+		case CEE_ADD:
+		case CEE_SUB:
+		case CEE_MUL:
+		case CEE_DIV:
+		case CEE_DIV_UN:
+		case CEE_REM:
+		case CEE_REM_UN:
+		case CEE_AND:
+		case CEE_OR:
+		case CEE_XOR:
+		case CEE_SHL:
+		case CEE_SHR:
+		case CEE_SHR_UN:
+		case CEE_NEG:
+		case CEE_NOT:
+		case CEE_CONV_I1:
+		case CEE_CONV_I2:
+		case CEE_CONV_I4:
+		case CEE_CONV_I8:
+		case CEE_CONV_R4:
+		case CEE_CONV_R8:
+		case CEE_CONV_U4:
+		case CEE_CONV_U8:
+		case CEE_CONV_R_UN:
+		case CEE_CONV_OVF_I1_UN:
+		case CEE_CONV_OVF_I2_UN:
+		case CEE_CONV_OVF_I4_UN:
+		case CEE_CONV_OVF_I8_UN:
+		case CEE_CONV_OVF_U1_UN:
+		case CEE_CONV_OVF_U2_UN:
+		case CEE_CONV_OVF_U4_UN:
+		case CEE_CONV_OVF_U8_UN:
+		case CEE_CONV_OVF_I_UN:
+		case CEE_CONV_OVF_U_UN:
+		case CEE_LDLEN:
+		case CEE_LDELEM_I1:
+		case CEE_LDELEM_U1:
+		case CEE_LDELEM_I2:
+		case CEE_LDELEM_U2:
+		case CEE_LDELEM_I4:
+		case CEE_LDELEM_U4:
+		case CEE_LDELEM_I8:
+		case CEE_LDELEM_I:
+		case CEE_LDELEM_R4:
+		case CEE_LDELEM_R8:
+		case CEE_LDELEM_REF:
+		case CEE_STELEM_I:
+		case CEE_STELEM_I1:
+		case CEE_STELEM_I2:
+		case CEE_STELEM_I4:
+		case CEE_STELEM_I8:
+		case CEE_STELEM_R4:
+		case CEE_STELEM_R8:
+		case CEE_STELEM_REF:
+		case CEE_CONV_OVF_I1:
+		case CEE_CONV_OVF_U1:
+		case CEE_CONV_OVF_I2:
+		case CEE_CONV_OVF_U2:
+		case CEE_CONV_OVF_I4:
+		case CEE_CONV_OVF_U4:
+		case CEE_CONV_OVF_I8:
+		case CEE_CONV_OVF_U8:
+		case CEE_CKFINITE:
+		case CEE_CONV_U2:
+		case CEE_CONV_U1:
+		case CEE_CONV_I:
+		case CEE_CONV_OVF_I:
+		case CEE_CONV_OVF_U:
+		case CEE_ADD_OVF:
+		case CEE_ADD_OVF_UN:
+		case CEE_MUL_OVF:
+		case CEE_MUL_OVF_UN:
+		case CEE_SUB_OVF:
+		case CEE_SUB_OVF_UN:
+		case CEE_STIND_I:
+		case CEE_CONV_U:
+		case CEE_LDNULL:
+		case CEE_LDC_I4_M1:
+		case CEE_LDC_I4_0:
+		case CEE_LDC_I4_1:
+		case CEE_LDC_I4_2:
+		case CEE_LDC_I4_3:
+		case CEE_LDC_I4_4:
+		case CEE_LDC_I4_5:
+		case CEE_LDC_I4_6:
+		case CEE_LDC_I4_7:
+		case CEE_LDC_I4_8:
+			++ip;
+			break;
+		case CEE_LDC_I4_S:
+			ip += 2;
+			break;
+		case CEE_LDC_I4:
+		case CEE_LDC_R4:
+		case CEE_CPOBJ:
+		case CEE_LDOBJ:
+		case CEE_LDSTR:
+		case CEE_CASTCLASS:
+		case CEE_ISINST:
+		case CEE_UNBOX:
+		case CEE_LDFLD:
+		case CEE_LDFLDA:
+		case CEE_STFLD:
+		case CEE_LDSFLD:
+		case CEE_LDSFLDA:
+		case CEE_STSFLD:
+		case CEE_STOBJ:
+		case CEE_BOX:
+		case CEE_NEWARR:
+		case CEE_LDELEMA:
+		case CEE_LDTOKEN:
+			ip += 5;
+			break;
+		case CEE_LDC_I8:
+		case CEE_LDC_R8:
+			ip += 9;
+			break;
+		case CEE_NEWOBJ:
+		case CEE_CALL:
+		case CEE_CALLVIRT: {
+			MonoMethod *cm;
+			guint32 token;
+			++ip;
+			token = read32 (ip);
+			ip += 4;
+
+			cm = mono_get_method (method->klass->image, token, NULL);
+			g_assert (cm);
+
+			if (cm == method)
+				goto fail;
+
+			/* we do not inline functions containing calls to 
+			   stack query functions */ 
+			if (cm->klass == mono_defaults.stack_frame_class ||
+			    cm->klass == mono_defaults.stack_trace_class)
+				goto fail;
+				
+			break;
+		}
+		case CEE_LDARG_0:
+		case CEE_LDARG_1:
+		case CEE_LDARG_2:
+		case CEE_LDARG_3: {
+			int an = (*ip) - CEE_LDARG_0;
+			if (arg_used [an])
+				goto fail;
+			arg_used [an] = TRUE;
+			++ip;
+			break;
+		}	
+		case CEE_LDARG_S:
+			++ip;
+			if (arg_used [*ip])
+				goto fail;
+			arg_used [*ip] = TRUE;
+			++ip;
+			break;
+	
+		case CEE_PREFIX1: {
+			++ip;			
+			switch (*ip) {
+			case CEE_LDARG: {
+				guint16 an;
+				ip++;
+				an = read16 (ip);
+				ip += 2;
+				if (an > 255 || arg_used [an])
+					goto fail;
+				arg_used [an] = TRUE;
+				break;
+			}	
+
+			case CEE_CEQ:
+			case CEE_CGT:
+			case CEE_CGT_UN:
+			case CEE_CLT:
+			case CEE_CLT_UN:
+			case CEE_CPBLK:
+			case CEE_INITBLK:
+				ip++;
+				break;
+			case CEE_LDFTN:
+			case CEE_LDVIRTFTN: {
+				MonoMethod *cm;
+				guint32 token;
+				++ip;
+				token = read32 (ip);
+				ip += 4;
+
+				cm = mono_get_method (method->klass->image, token, NULL);
+				g_assert (cm);
+
+				if (cm == method)
+					goto fail;
+				
+				break;
+			}
+			case CEE_INITOBJ:
+			case CEE_SIZEOF:
+				ip += 5;
+				break;
+			default:
+				stop = TRUE;
+				break;
+			}
+		}
+		default:
+			stop = TRUE;
+			break;			
+		}
+	}
+
+	if (ip < end &&
+	    !(ip [0] == CEE_RET ||
+	      ((ip + 4) < end &&
+	       ip [0] == CEE_STLOC_0 &&
+	       ip [1] == CEE_BR_S &&
+	       ip [2] == 0 &&
+	       ip [3] == CEE_LDLOC_0 &&
+	       ip [4] == CEE_RET)))
+		goto fail;
+	
+	if (signature->hasthis && arg_used [0])
+		method->uses_this = 1;
+
+	mono_jit_stats.inlineable_methods++;
+
+	return method->inline_count = ip - header->code;
+
+ fail:
+	return method->inline_count = -1;
+}
+
 static void
 create_outstack (MonoFlowGraph *cfg, MonoBBlock *bb, MBTree **stack, int depth)
 {
@@ -1444,7 +1326,7 @@ mark_reached (MonoFlowGraph *cfg, MonoBBlock *target, MBTree **stack, int depth)
  *
  * The algorithm is from Andi Krall, the same is used in CACAO
  */
-void
+static gboolean
 mono_analyze_stack (MonoFlowGraph *cfg)
 {
 	MonoMethod *method = cfg->method;
@@ -1454,69 +1336,84 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 	MonoMethodSignature *signature;
 	MonoImage *image;
 	MonoValueType svt;
-	MBTree **sp, **stack, **arg_sp, *t1, *t2, *t3;
+	MBTree **sp, **stack, **arg_sp, **arg_map = NULL, *t1, *t2, *t3;
+	MonoJitArgumentInfo *arg_info, default_arg_info [10];
 	register const unsigned char *ip, *end;
 	GPtrArray *forest;
 	int i, j, depth, repeat_count;
-	int varnum = 0, firstarg = 0, retvtarg = 0;
+	int varnum = 0, firstarg = 0;
 	gboolean repeat, superblock_end;
 	MonoBBlock *bb, *tbb;
+	int maxstack;
+	GList *inline_list = NULL;
+	gboolean tail_recursion;
 
 	header = ((MonoMethodNormal *)method)->header;
 	signature = method->signature;
 	image = method->klass->image; 
 
-	sp = stack = alloca (sizeof (MBTree *) * (header->max_stack + 1));
-	
+	/* we add 10 extra slots for method inlining */
+	maxstack = header->max_stack + 10;
+	sp = stack = alloca (sizeof (MBTree *) * (maxstack + 1));
+
+	/* allocate local variables */
+
 	if (header->num_locals) {
 		int size, align;
-
+		
 		for (i = 0; i < header->num_locals; ++i) {
-			size = mono_type_size (header->locals [i], &align);
-			varnum = arch_allocate_var (cfg, size, align, MONO_LOCALVAR, VAL_UNKNOWN);
+			MonoValueType svt;
+			size = mono_type_size (LOCAL_TYPE (i), &align);
+			mono_map_ldind_type (header->locals [i], &svt);
+			varnum = arch_allocate_var (cfg, size, align, MONO_LOCALVAR, svt);
 			if (i == 0)
 				cfg->locals_start_index = varnum;
 		}
 	}
 
-	if (ISSTRUCT (signature->ret)) {
-		int size, align;
+	cfg->args_start_index = firstarg = varnum + 1;
+ 
+	/* allocate argument variables */
 
-		cfg->has_vtarg = 1;
+	if (signature->param_count + 1 < 10)
+		arg_info = default_arg_info;
+	else 
+		arg_info = g_new (MonoJitArgumentInfo, signature->param_count + 1);
 
-		size = mono_type_size (signature->ret, &align);
-		
-		retvtarg = varnum = arch_allocate_var (cfg, size, align, MONO_LOCALVAR, VAL_UNKNOWN);
-		
-		//printf ("VALUETYPE METHOD %s.%s::%s %d\n", method->klass->name_space, 
-		//method->klass->name, method->name, size);
-	}
+	arch_get_argument_info (signature, signature->param_count, arg_info);
+
+	if (signature->hasthis) 
+		arch_allocate_arg (cfg, &arg_info [0], VAL_POINTER);
 	
-	cfg->args_start_index = firstarg = varnum + 1;
- 
-	if (signature->hasthis) {
-		arch_allocate_var (cfg, sizeof (gpointer), sizeof (gpointer), MONO_ARGVAR, VAL_POINTER);
-	}
+	if (signature->param_count)
+		for (i = 0; i < signature->param_count; ++i)
+			arch_allocate_arg (cfg, &arg_info [i + 1], VAL_UNKNOWN);
 
-	if (signature->param_count) {
-		int align, size;
+	if (signature->param_count > 9)
+		g_free (arg_info);
 
-		for (i = 0; i < signature->param_count; ++i) {
-			size = mono_type_stack_size (signature->params [i], &align);
-			arch_allocate_var (cfg, size, align, MONO_ARGVAR, VAL_UNKNOWN);
-		}
-	}
 
 	for (i = 0; i < header->num_clauses; ++i) {
 		MonoExceptionClause *clause = &header->clauses [i];		
 		tbb = &cfg->bblocks [bcinfo [clause->handler_offset].block_id];
-		if (clause->flags == MONO_EXCEPTION_CLAUSE_NONE) {
+		if (clause->flags == MONO_EXCEPTION_CLAUSE_NONE ||
+		    clause->flags == MONO_EXCEPTION_CLAUSE_FILTER) {
 			tbb->instack = mono_mempool_alloc (mp, sizeof (MBTree *));
 			tbb->indepth = 1;
 			tbb->instack [0] = t1 = mono_ctree_new_leaf (mp, MB_TERM_EXCEPTION);
 			t1->data.i = mono_allocate_excvar (cfg);
 			t1->svt = VAL_POINTER;
 			tbb->reached = 1;
+			if (clause->flags == MONO_EXCEPTION_CLAUSE_FILTER) {
+				tbb = &cfg->bblocks [bcinfo [clause->token_or_filter].block_id];
+				g_assert (tbb);
+				tbb->instack = mono_mempool_alloc (mp, sizeof (MBTree *));
+				tbb->indepth = 1;
+				tbb->instack [0] = t1 = mono_ctree_new_leaf (mp, MB_TERM_EXCEPTION);
+				t1->data.i = mono_allocate_excvar (cfg);
+				t1->svt = VAL_POINTER;
+				tbb->reached = 1;
+			}
 		} else if (clause->flags == MONO_EXCEPTION_CLAUSE_FINALLY) {
 			mark_reached (cfg, tbb, NULL, 0);
 		} else {
@@ -1562,14 +1459,35 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 					ip = header->code + bb->cli_addr;
 					end = ip + bb->length;
 
-					bb->forest = forest = g_ptr_array_new ();
+					forest = bb->forest;
 				
 					superblock_end = FALSE;
 
-        while (ip < end) {
-		guint32 cli_addr = ip - header->code;
+					tail_recursion = FALSE;
 
-		//printf ("%d IL%04x OPCODE %s %d %d %d\n", i, cli_addr, opcode_names [*ip], 
+        while (inline_list || ip < end) {
+		guint32 cli_addr;
+
+		if (inline_list) {
+			MonoInlineInfo *ii = (MonoInlineInfo *)inline_list->data;
+			if (ip >= ii->end) {
+				inline_list = g_list_remove_link (inline_list, inline_list);
+				ip = ii->saved_ip;
+				tail_recursion = FALSE;
+				image = ii->saved_image;
+				if (inline_list)
+					arg_map = ((MonoInlineInfo *)inline_list->data)->arg_map;
+				else 
+					arg_map = NULL;
+				continue;
+			}
+		} else 
+			cli_addr = ip - header->code;
+
+		
+		//if (inline_list) printf ("INLINE IL%04x OPCODE %s\n", cli_addr, mono_opcode_names [*ip]);
+
+		//printf ("%d IL%04x OPCODE %s %d %d %d\n", i, cli_addr, mono_opcode_names [*ip], 
 		//forest->len, superblock_end, sp - stack);
 
 		switch (*ip) {
@@ -1591,7 +1509,10 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			token = read32 (ip);
 			ip += 4;
 			
-			c = mono_class_get (image, token);
+			if (method->wrapper_type != MONO_WRAPPER_NONE)
+				c = (MonoClass *)mono_method_get_wrapper_data (method, token);
+			else
+				c = mono_class_get (image, token);
 			
 			t1 = mono_ctree_new_leaf (mp, MB_TERM_NEWOBJ);
 			t1->data.p = c;
@@ -1622,7 +1543,11 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			ip += 4;
 			sp--;
 
-			class = mono_class_get (image, token);
+			if (method->wrapper_type != MONO_WRAPPER_NONE)
+				class = (MonoClass *)mono_method_get_wrapper_data (method, token);
+			else 
+				class = mono_class_get (image, token);
+
 			t1 = mono_ctree_new (mp, MB_TERM_UNBOX, *sp, NULL);
 			t1->data.klass = class;
 
@@ -1632,7 +1557,7 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 		case CEE_LDLEN: {
 			ip++;
 			sp--;
-			
+
 			t1 = mono_ctree_new (mp, MB_TERM_LDLEN, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
@@ -1647,7 +1572,10 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			ip += 4;
 			sp--;
 
-			c = mono_class_get (image, token);
+			if (method->wrapper_type != MONO_WRAPPER_NONE)
+				c = (MonoClass *)mono_method_get_wrapper_data (method, token);
+			else
+				c = mono_class_get (image, token);
 			g_assert (c->valuetype);
 
 			t1 = ctree_create_load (cfg, &c->byval_arg, *sp, &svt, FALSE);
@@ -1676,17 +1604,17 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 		}
 		case CEE_LDSTR: {
 			MonoObject *o;
-			guint32 index;
+			guint32 ind;
 
 			++ip;
-			index = mono_metadata_token_index (read32 (ip));
+			ind = mono_metadata_token_index (read32 (ip));
 			ip += 4;
 
 			if (cfg->share_code) {
 				t1 = mono_ctree_new_leaf (mp, MB_TERM_LDSTR);
-				t1->data.i = index;
+				t1->data.i = ind;
 			} else {
-				o = (MonoObject *) mono_ldstr (cfg->domain, image, index);
+				o = (MonoObject *) mono_ldstr (cfg->domain, image, ind);
 				t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
 				t1->data.p = o;
 			}
@@ -1761,17 +1689,23 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 				field = mono_class_get_field (klass, token);
 			}
 			g_assert (field);
-
-			t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
 			
-			if (klass->valuetype)
-				t1->data.i = field->offset - sizeof (MonoObject);
-			else 
-				t1->data.i = field->offset;
+			if (klass->marshalbyref) {
+				t1 = mono_ctree_new (mp, MB_TERM_REMOTE_LDFLDA, sp [0], NULL);
+				t1->data.fi.klass = klass;
+				t1->data.fi.field = field;
+			} else {
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
 
-			t1 = mono_ctree_new (mp, MB_TERM_ADD, sp [0], t1);
+				if (klass->valuetype)
+					t1->data.i = field->offset - sizeof (MonoObject);
+				else 
+					t1->data.i = field->offset;
 
-			if (!load_addr)
+				t1 = mono_ctree_new (mp, MB_TERM_ADD, sp [0], t1);
+			}
+
+			if (!load_addr) 
 				t1 = ctree_create_load (cfg, field->type, t1, &svt, FALSE);
 			else
 				svt = VAL_POINTER;
@@ -1839,16 +1773,16 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			}
 			g_assert (field);
 
-			t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
-			if (klass->valuetype)
-				t1->data.i = field->offset - sizeof (MonoObject);
-			else 
-				t1->data.i = field->offset;
-
-			//printf ("VALUETYPE %d %d %d\n", klass->valuetype, field->offset, t1->data.i);
-
-			t1 = mono_ctree_new (mp, MB_TERM_ADD, sp [0], t1);
-			t1 = ctree_create_store (cfg, field->type, t1, sp [1], FALSE);
+			if (klass->marshalbyref) {
+				t1 = mono_ctree_new (mp, mono_map_remote_stind_type (field->type), sp [0], sp [1]);
+				t1->data.fi.klass = klass;
+				t1->data.fi.field = field;
+			} else {
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
+				t1->data.i = klass->valuetype ? field->offset - sizeof (MonoObject) : field->offset;
+				t1 = mono_ctree_new (mp, MB_TERM_ADD, sp [0], t1);
+				t1 = ctree_create_store (cfg, field->type, t1, sp [1], FALSE);
+			}
 
 			ADD_TREE (t1, cli_addr);
 			break;
@@ -1886,7 +1820,7 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			break;
 		} 
 		case CEE_SWITCH: {
-			guint32 i, n;
+			guint32 k, n;
 			MonoBBlock **jt;
 			gint32 st, target;
 
@@ -1904,8 +1838,8 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 			create_outstack (cfg, bb, stack, sp - stack);
 
-			for (i = 1; i <= (n + 1); i++) {
-				if (i > n)
+			for (k = 1; k <= (n + 1); k++) {
+				if (k > n)
 					target = st;
 				else {
 					target = read32 (ip) + st;
@@ -1915,7 +1849,7 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 				g_assert (bcinfo [target].is_block_start);
 				tbb = &cfg->bblocks [bcinfo [target].block_id];
 				mark_reached (cfg, tbb, stack, sp - stack);
-				jt [i] = tbb; 
+				jt [k] = tbb; 
 			}
 
 			ADD_TREE (t1, cli_addr);
@@ -1942,13 +1876,26 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			ip++;
 			--sp;
 			token = read32 (ip);
-			class = mono_class_get (image, token);
 			ip += 4;
 
-			t1 = mono_ctree_new (mp, MB_TERM_NEWARR, *sp, NULL);
-			t1->data.p = class;
-			PUSH_TREE (t1, VAL_POINTER);
+			if (method->wrapper_type != MONO_WRAPPER_NONE)
+				class = (MonoClass *)mono_method_get_wrapper_data (method, token);
+			else
+				class = mono_class_get (image, token);
+				
+			if (cfg->share_code) {
+				t1 = mono_ctree_new (mp, MB_TERM_NEWARR, *sp, NULL);
+				t1->data.p = class;
+			}
+			else {
+				MonoClass  *ac = mono_array_class_get (&class->byval_arg, 1);
+				MonoVTable *vt = mono_class_vtable (cfg->domain, ac);
 
+				t1 = mono_ctree_new (mp, MB_TERM_NEWARR_SPEC, *sp, NULL);
+				t1->data.p = vt;
+			}
+
+			PUSH_TREE (t1, VAL_POINTER);
 			break;
 		}
 		case CEE_CPOBJ: {
@@ -1961,19 +1908,22 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			ip += 4;
 			sp -= 2;
 
-			t1 = mono_ctree_new (mp, MB_TERM_CPOBJ, sp [0], sp [1]);
+			t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
+			t1->data.i = mono_class_value_size (class, NULL);			
+			t1 = mono_ctree_new (mp, MB_TERM_CPSRC, sp [1], t1);
+			t1 = mono_ctree_new (mp, MB_TERM_CPBLK, sp [0], t1);
 			ADD_TREE (t1, cli_addr);
 			
 			break;
 		}
 		case CEE_NEWOBJ: {
 			MonoMethodSignature *csig;
-			MethodCallInfo *ci;
 			MonoMethod *cm;
 			MBTree *this = NULL;
 			guint32 token;
-			int i, align, size, args_size = 0;
+			int k, frame_size;
 			int newarr = FALSE;
+			int newstr = FALSE;
 
 			++ip;
 			token = read32 (ip);
@@ -1983,9 +1933,6 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			g_assert (cm);
 			g_assert (!strcmp (cm->name, ".ctor"));
 			
-			ci =  mono_mempool_alloc0 (mp, sizeof (MethodCallInfo));
-			ci->m = cm;
-
 			csig = cm->signature;
 			g_assert (csig->call_convention == MONO_CALL_DEFAULT);
 			g_assert (csig->hasthis);
@@ -1999,13 +1946,29 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 				newarr = TRUE;
 				this = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
 				this->data.m = cm;
+			} else if (cm->string_ctor) {
+				static MonoString *string_dummy = NULL; 
+
+				if (!string_dummy)
+					string_dummy = mono_string_new_wrapper ("dummy");
+
+				newstr = TRUE;
+				/* we just pass a dummy as this, it is not used */
+				this = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
+				this->data.p = string_dummy;
 			} else {				
 				if (cm->klass->valuetype) {
-					this = mono_ctree_new_leaf (mp, MB_TERM_NEWSTRUCT);
-					this->data.i =  mono_class_value_size (cm->klass, NULL);
-				} else {
+					t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
+					t1->data.i = mono_class_value_size (cm->klass, NULL);
+					this = mono_ctree_new (mp, MB_TERM_LOCALLOC, t1, NULL);
+					this->data.i = TRUE;
+				} else if (cfg->share_code) {
 					this = mono_ctree_new_leaf (mp, MB_TERM_NEWOBJ);
 					this->data.klass = cm->klass;
+				} else {
+					MonoVTable *vt = mono_class_vtable (cfg->domain, cm->klass);
+					this = mono_ctree_new_leaf (mp, MB_TERM_NEWOBJ_SPEC);
+					this->data.p = vt;
 				}
 
 				this->svt = VAL_POINTER;
@@ -2014,28 +1977,32 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 				g_assert (t1);
 				ADD_TREE (t1, cli_addr);
 			}
-			
-			args_size += sizeof (gpointer); /* this argument */		
-
-			for (i = csig->param_count - 1; i >= 0; i--) {
-				MonoType *type = cm->signature->params [i];
+				
+			if (csig->param_count + 1 < 10)
+				arg_info = default_arg_info;
+			else 
+				arg_info = g_new (MonoJitArgumentInfo, csig->param_count + 1);
 
-				size = mono_type_stack_size (type, &align);
-				t1 = mono_ctree_new (mp, map_arg_type (type, FALSE), arg_sp [i], NULL);	
-				t1->data.i = size;
+			frame_size = arch_get_argument_info (csig, csig->param_count, arg_info);
+					
+			for (k = csig->param_count - 1; k >= 0; k--) {
+				t1 = mono_ctree_new (mp, mono_map_arg_type (csig->params [k]), arg_sp [k], NULL);
+				t1->data.arg_info = arg_info [k + 1];
 				ADD_TREE (t1, cli_addr);
-				args_size += size;
 			}
 
-			ci->args_size = args_size;
+			if (newarr || newstr) {
 
-			if (newarr) {
-
-				t2 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
-				t2->data.p = mono_array_new_va;
+				t2 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_G);
+				if (newarr) {
+					t2->data.p = mono_array_new_va;
+				} else {
+					t2->data.p = arch_create_jit_trampoline (cm);
+				}
 
 				t1 = mono_ctree_new (mp, MB_TERM_CALL_I4, this, t2);
-				t1->data.p = ci;
+				t1->data.call_info.pad = arg_info [0].pad;
+				t1->data.call_info.frame_size = frame_size;
 				t1->svt = VAL_POINTER;
 
 				t1 = mono_store_tree (cfg, -1, t1, &t2);
@@ -2044,17 +2011,19 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 				PUSH_TREE (t2, t2->svt);
 
 			} else {
-				
+
 				t2 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_G);
 				t2->data.p = arch_create_jit_trampoline (cm);
 
-				t1 = mono_ctree_new (mp, map_call_type (csig->ret, &svt), this, t2);
-				t1->data.p = ci;
+				t1 = mono_ctree_new (mp, mono_map_call_type (csig->ret, &svt), this, t2);
+				t1->data.call_info.pad = arg_info [0].pad;
+				t1->data.call_info.frame_size = frame_size;
 				t1->svt = svt;
 
-				ADD_TREE (t1, cli_addr); 
-				t1 = ctree_create_dup (mp, this);	
+				ADD_TREE (t1, cli_addr);
 
+				t1 = ctree_create_dup (mp, this);	
+				
 				if (cm->klass->valuetype) {
 					t2 = ctree_create_load (cfg, &cm->klass->byval_arg, t1, &svt, FALSE);
 					PUSH_TREE (t2, svt);
@@ -2062,100 +2031,188 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 					PUSH_TREE (t1, t1->svt);
 				}
 			}
+
+			if (csig->param_count > 9)
+				g_free (arg_info);
+
 			break;
 		}
+		case CEE_CALLI: 
 		case CEE_CALL: 
 		case CEE_CALLVIRT: {
 			MonoMethodSignature *csig;
-			MethodCallInfo *ci;
 			MonoMethod *cm;
-			MBTree *this = NULL;
+			MBTree *ftn, *this = NULL;
 			guint32 token;
-			int i, align, size, args_size = 0;
+			int k, frame_size;
 			int virtual = *ip == CEE_CALLVIRT;
+			int calli = *ip == CEE_CALLI;
 			gboolean array_set = FALSE;
 			gboolean array_get = FALSE;
-			gboolean pinvoke = FALSE;
+			gboolean array_address = FALSE;
+			/* fixme: compute this value */
+			gboolean shared_to_unshared_call = FALSE;
 			int nargs, vtype_num = 0;
 
 			++ip;
 			token = read32 (ip);
 			ip += 4;
 
-			cm = mono_get_method (image, token, NULL);
-			g_assert (cm);
+			tail_recursion = FALSE;
+					
+			if (calli) {
+				ftn = *(--sp);
+				
+				if (method->wrapper_type != MONO_WRAPPER_NONE)
+					csig = (MonoMethodSignature *)mono_method_get_wrapper_data (method, token);
+				else
+					csig = mono_metadata_parse_signature (image, token);
+      
+				g_assert (csig);
+				arg_sp = sp -= csig->param_count;
+			} else {
+				cm = mono_get_method (image, token, NULL);
+				g_assert (cm);
 
-			ci =  mono_mempool_alloc0 (mp, sizeof (MethodCallInfo));
-			ci->m = cm;
+				if (cm->klass == mono_defaults.math_class &&
+				    cm->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) {
+
+					if (!strcmp (cm->name, "Sin")) {
+						--sp;
+						t1 = mono_ctree_new (mp, MB_TERM_SIN, *sp, NULL);
+						PUSH_TREE (t1, VAL_DOUBLE);
+						break;
+					} else if (!strcmp (cm->name, "Cos")) {
+						--sp;
+						t1 = mono_ctree_new (mp, MB_TERM_COS, *sp, NULL);
+						PUSH_TREE (t1, VAL_DOUBLE);
+						break;
+					} else if (!strcmp (cm->name, "Sqrt")) {
+						--sp;
+						t1 = mono_ctree_new (mp, MB_TERM_SQRT, *sp, NULL);
+						PUSH_TREE (t1, VAL_DOUBLE);
+						break;
+					}
+				}
 
-			if (cm->flags &  METHOD_ATTRIBUTE_PINVOKE_IMPL) {
-				if (!(cm->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL))
-					pinvoke = TRUE;
+				if (cm->string_ctor)
+					g_assert_not_reached ();
 
-				t1 = mono_ctree_new_leaf (mp, MB_TERM_SAVE_LMF);
-				t1->data.m = cm;
-				ADD_TREE (t1, cli_addr);
+				arg_sp = sp -= cm->signature->param_count;
+
+				if ((cm->flags & METHOD_ATTRIBUTE_FINAL && 
+				     cm->klass != mono_defaults.object_class) ||
+				    !(cm->flags & METHOD_ATTRIBUTE_VIRTUAL))
+					virtual = 0;
 			}
 
-			if ((cm->flags & METHOD_ATTRIBUTE_FINAL) ||
-			    !(cm->flags & METHOD_ATTRIBUTE_VIRTUAL))
-				virtual = 0;
+			if (!calli && mono_jit_inline_code && !virtual && cm->inline_count != -1 &&
+			    cm != method && (cm->inline_info || check_inlining (cm) >= 0)) {
+				MonoInlineInfo *ii = alloca (sizeof (MonoInlineInfo));
+				int args;
+				GList *l;
 
-			csig = cm->signature;
-			g_assert (csig->call_convention == MONO_CALL_DEFAULT);
-			g_assert (!virtual || csig->hasthis);
+				/* avoid recursive inlining */
+				for (l = inline_list; l; l = l->next) {
+					if (((MonoInlineInfo *)l->data)->method == cm)
+						break;
+				}
+				
+				if (!l) {
 
-			/* fixme: we need to unbox the this pointer for value types ?*/
-			g_assert (!virtual || !cm->klass->valuetype);
+					mono_jit_stats.inlined_methods++;
+				
+					if (cm->signature->hasthis)
+						sp--;
+
+					args = cm->signature->param_count + cm->signature->hasthis;
+
+					ii->method = cm;
+					ii->saved_ip = ip;
+					ii->saved_image = image;
+					ii->arg_map = alloca (args * sizeof (MBTree *));
+					memcpy (ii->arg_map, sp, args * sizeof (MBTree *));
+
+					if (cm->signature->hasthis && !cm->uses_this && 
+					    (ii->arg_map [0]->op != MB_TERM_CHECKTHIS)) {
+						ii->arg_map [0] = mono_ctree_new (mp, MB_TERM_CHECKTHIS, 
+										  ii->arg_map [0], NULL);
+						ADD_TREE (ii->arg_map [0], cli_addr);
+					}
+				
+					if (cm->inline_count) {
+						inline_list = g_list_prepend (inline_list, ii);
+						ip = ((MonoMethodNormal *)cm)->header->code;
+						ii->end = ip + cm->inline_count;
+						arg_map = ii->arg_map;
+						image = cm->klass->image;
+					}
+					continue;
+				}
+			}
+			
+			if (!calli)
+				csig = cm->signature;
 
 			nargs = csig->param_count;
-			arg_sp = sp -= nargs;
-			
-			if (cm->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) {
+
+			g_assert (csig->call_convention == MONO_CALL_DEFAULT);
+			g_assert (!virtual || csig->hasthis);
+
+			if (!calli && cm->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) {
 				if (cm->klass->parent == mono_defaults.array_class) {
 					if (!strcmp (cm->name, "Set")) { 
 						array_set = TRUE;
 						nargs--;
-					} else if (!strcmp (cm->name, "Get")) 
+					} else if (!strcmp (cm->name, "Get")) {
 						array_get = TRUE;
+					} else if (!strcmp (cm->name, "Address")) {
+						array_address = TRUE;
+					}
 				}
 			}
 
-			for (i = nargs - 1; i >= 0; i--) {
-				MonoType *type = cm->signature->params [i];
-				t1 = mono_ctree_new (mp, map_arg_type (type, pinvoke), arg_sp [i], NULL);
-				size = mono_type_stack_size (type, &align);
-				t1->data.i = size;
+			
+			if (csig->param_count + 1 < 10)
+				arg_info = default_arg_info;
+			else 
+				arg_info = g_new (MonoJitArgumentInfo, csig->param_count + 1);
+
+			frame_size = arch_get_argument_info (csig, nargs, arg_info);
+
+			for (k = nargs - 1; k >= 0; k--) {
+				t1 = mono_ctree_new (mp, mono_map_arg_type (csig->params [k]), arg_sp [k], NULL);
+				t1->data.arg_info = arg_info [k + 1];
 				ADD_TREE (t1, cli_addr);
-				args_size += size;
-				// fixme: align value type arguments  to 8 byte boundary on the stack
 			}
 
-			if (csig->hasthis) {
-				this = *(--sp);				
-				args_size += sizeof (gpointer);
-			} else
+			if (csig->hasthis) 
+				this = *(--sp);		
+			else
 				this = mono_ctree_new_leaf (mp, MB_TERM_NOP);
 
-			if (ISSTRUCT (csig->ret)) {
+			if (MONO_TYPE_ISSTRUCT (csig->ret)) {
 				int size, align;
-				size = mono_type_size (csig->ret, &align);
+				if (csig->pinvoke)
+					size = mono_class_native_size (csig->ret->data.klass, &align);
+				else
+					size = mono_class_value_size (csig->ret->data.klass, &align);
+
 				vtype_num = arch_allocate_var (cfg, size, align, MONO_TEMPVAR, VAL_UNKNOWN);
 			}
 
-			ci->args_size = args_size;
-			ci->vtype_num = vtype_num;
-
 			if (array_get) {
-				int size, align, vnum;
+				int vnum, size, align;
 				
 				t2 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
 				t2->data.p = ves_array_element_address;
 
 				t1 = mono_ctree_new (mp, MB_TERM_CALL_I4, this, t2);
-				t1->data.p = ci;
+				t1->data.call_info.vtype_num = vtype_num;
+				t1->data.call_info.frame_size = frame_size;
+				t1->data.call_info.pad = arg_info [0].pad;
 
-				t1 = mono_ctree_new (mp, map_ldind_type (csig->ret, &svt), t1, NULL);
+				t1 = mono_ctree_new (mp, mono_map_ldind_type (csig->ret, &svt), t1, NULL);
 				t1->svt = svt;		
 
 				mono_get_val_sizes (t1->svt, &size, &align);
@@ -2163,27 +2220,32 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 				t2 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
 				t2->data.i = vnum;
-				t1 = mono_ctree_new (mp, map_store_svt_type (svt), t2, t1);
+				t1 = mono_ctree_new (mp, mono_map_store_svt_type (svt), t2, t1);
 				t1->svt = svt;
 
 				ADD_TREE (t1, cli_addr);
 				t1 = ctree_create_dup (mp, t1);
 				PUSH_TREE (t1, t1->svt);
-
 			} else if (array_set) {
 
 				t2 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
 				t2->data.p = ves_array_element_address;
 
 				t1 = mono_ctree_new (mp, MB_TERM_CALL_I4, this, t2);
-				t1->data.p = ci;
+				t1->data.call_info.vtype_num = vtype_num;
+				t1->data.call_info.frame_size = frame_size;
+				t1->data.call_info.pad = arg_info [0].pad;
 
 				t1 = ctree_create_store (cfg, csig->params [nargs], t1, arg_sp [nargs], FALSE);
-				ADD_TREE (t1, cli_addr);
-			
+				ADD_TREE (t1, cli_addr);			
 			} else {
 
-				if (virtual) {
+				if (calli) {
+					t2 = ftn; 
+				} else if (virtual || (csig->hasthis && 
+						!(cm->flags & METHOD_ATTRIBUTE_VIRTUAL) &&
+						(cm->klass->marshalbyref || shared_to_unshared_call))) {
+
 					mono_class_init (cm->klass);
 					
 					if (cm->klass->flags & TYPE_ATTRIBUTE_INTERFACE)
@@ -2194,13 +2256,19 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 					t2->data.m = cm;
 
 				} else {
-			
-					t2 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_G);
-					t2->data.p = arch_create_jit_trampoline (cm);
+					if (array_address) {
+						t2 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
+						t2->data.p = ves_array_element_address;
+					} else {
+						t2 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_G);
+						t2->data.p = arch_create_jit_trampoline (cm);
+					}
 				}
 
-				t1 = mono_ctree_new (mp, map_call_type (csig->ret, &svt), this, t2);
-				t1->data.p = ci;
+				t1 = mono_ctree_new (mp, mono_map_call_type (csig->ret, &svt), this, t2);
+				t1->data.call_info.vtype_num = vtype_num;
+				t1->data.call_info.frame_size = frame_size;
+				t1->data.call_info.pad = arg_info [0].pad;
 				t1->svt = svt;
 
 				if (csig->ret->type != MONO_TYPE_VOID) {
@@ -2214,11 +2282,6 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 						t1 = mono_store_tree (cfg, -1, t1, &t2);
 						g_assert (t1);
 						ADD_TREE (t1, cli_addr);
-
-						if (pinvoke && csig->ret->type == MONO_TYPE_STRING) {
-							t2 = mono_ctree_new (mp, MB_TERM_TOSTRING, t2, NULL);
-							t2->svt = VAL_POINTER;
-						} 
 						PUSH_TREE (t2, t2->svt);
 					}
 				} else
@@ -2226,11 +2289,9 @@ mono_analyze_stack (MonoFlowGraph *cfg)
    
 			}
 
-			if (cm->flags &  METHOD_ATTRIBUTE_PINVOKE_IMPL) {
-				t1 = mono_ctree_new_leaf (mp, MB_TERM_RESTORE_LMF);
-				ADD_TREE (t1, cli_addr);
-			}
-
+			if (csig->param_count > 9)
+				g_free (arg_info);
+			
 			break;
 		}
 		case CEE_ISINST: {
@@ -2241,6 +2302,8 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			--sp;
 
 			c = mono_class_get (image, token);
+			if (!c->inited)
+				mono_class_init (c);
 
 			t1 = mono_ctree_new (mp, MB_TERM_ISINST, *sp, NULL);
 			t1->data.klass = c;
@@ -2258,6 +2321,8 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			--sp;
 
 			c = mono_class_get (image, token);
+			if (!c->inited)
+				mono_class_init (c);
 
 			t1 = mono_ctree_new (mp, MB_TERM_CASTCLASS, *sp, NULL);
 			t1->data.klass = c;
@@ -2270,7 +2335,7 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 		case CEE_LDC_I4_S: { 
 			++ip;
 			t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
-			t1->data.i = *(gint8 *)ip;
+			t1->data.i = *(const gint8 *)ip;
 			++ip;
 			PUSH_TREE (t1, VAL_I32);
 			break;
@@ -2344,8 +2409,8 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 			t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
 			t1->data.i = LOCAL_POS (n);
-			t1 = ctree_create_load (cfg, LOCAL_TYPE (n), t1, &svt, FALSE);
-
+			if (!MONO_TYPE_ISSTRUCT (LOCAL_TYPE (n))) 
+				t1 = ctree_create_load (cfg, LOCAL_TYPE (n), t1, &svt, FALSE);
 			PUSH_TREE (t1, svt);
 			break;
 		}
@@ -2354,7 +2419,8 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			
 			t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
 			t1->data.i = LOCAL_POS (*ip);
-			t1 = ctree_create_load (cfg, LOCAL_TYPE (*ip), t1, &svt, FALSE);
+			if (!MONO_TYPE_ISSTRUCT (LOCAL_TYPE (*ip))) 
+				t1 = ctree_create_load (cfg, LOCAL_TYPE (*ip), t1, &svt, FALSE);
 			++ip;
 
 			PUSH_TREE (t1, svt);
@@ -2365,6 +2431,7 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 			t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
 			t1->data.i = LOCAL_POS (*ip);
+			VARINFO (cfg, t1->data.i).isvolatile = 1;
 			++ip;
 			PUSH_TREE (t1, VAL_POINTER);			
 			break;
@@ -2379,8 +2446,11 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 			t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
 			t1->data.i = LOCAL_POS (n);
-			t1 = ctree_create_store (cfg, LOCAL_TYPE (n), t1, *sp, FALSE);
 
+			if ((t2 = mono_stack_duplicate_used_var (cfg, stack, sp, t1->data.i)))
+				ADD_TREE (t2, cli_addr); 
+
+			t1 = ctree_create_store (cfg, LOCAL_TYPE (n), t1, *sp, FALSE);
 			ADD_TREE (t1, cli_addr);			
 			break;
 		}
@@ -2390,50 +2460,140 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 			t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
 			t1->data.i = LOCAL_POS (*ip);
-			t1 = ctree_create_store (cfg, LOCAL_TYPE (*ip), t1, *sp, FALSE);
+			if ((t2 = mono_stack_duplicate_used_var (cfg, stack, sp, t1->data.i)))
+				ADD_TREE (t2, cli_addr); 
 
+			t1 = ctree_create_store (cfg, LOCAL_TYPE (*ip), t1, *sp, FALSE);
 			++ip;
 			ADD_TREE (t1, cli_addr);			
 			break;
 		}
 
-		case CEE_SHR: {
-			++ip;  
+		case CEE_ADD: {
+			++ip;
 			sp -= 2;
-			t1 = mono_ctree_new (mp, MB_TERM_SHR, sp [0], sp [1]); 
-			PUSH_TREE (t1, sp [0]->svt);     
-			break;
+			if (sp [0]->op == MB_TERM_CONST_I4 && sp [1]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, sp [0]->data.i + sp [1]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_ADD, sp [0], sp [1]);
+			PUSH_TREE (t1, sp [0]->svt);
+			break;                        
 		}
-		case CEE_SHR_UN: {
-			++ip;  
+
+		case CEE_SUB: {
+			++ip;
 			sp -= 2;
-			t1 = mono_ctree_new (mp, MB_TERM_SHR_UN, sp [0], sp [1]); 
-			PUSH_TREE (t1, sp [0]->svt);     
-			break;
+			if (sp [0]->op == MB_TERM_CONST_I4 && sp [1]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, sp [0]->data.i - sp [1]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_SUB, sp [0], sp [1]);
+			PUSH_TREE (t1, sp [0]->svt);
+			break;                        
+		}
+
+		case CEE_AND: {
+			++ip;
+			sp -= 2;
+			if (sp [0]->op == MB_TERM_CONST_I4 && sp [1]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, sp [0]->data.i & sp [1]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_AND, sp [0], sp [1]);
+			PUSH_TREE (t1, sp [0]->svt);
+			break;                        
+		}
+
+		case CEE_OR: {
+			++ip;
+			sp -= 2;
+			if (sp [0]->op == MB_TERM_CONST_I4 && sp [1]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, sp [0]->data.i | sp [1]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_OR, sp [0], sp [1]);
+			PUSH_TREE (t1, sp [0]->svt);
+			break;                        
+		}
+
+		case CEE_XOR: {
+			++ip;
+			sp -= 2;
+			if (sp [0]->op == MB_TERM_CONST_I4 && sp [1]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, sp [0]->data.i ^ sp [1]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_XOR, sp [0], sp [1]);
+			PUSH_TREE (t1, sp [0]->svt);
+			break;                        
+		}
+
+		case CEE_MUL: {
+			++ip;
+			sp -= 2;
+			if (sp [0]->op == MB_TERM_CONST_I4 && sp [1]->op == MB_TERM_CONST_I4) {
+				t1 = mono_ctree_new_icon4 (mp, sp [0]->data.i * sp [1]->data.i);
+				PUSH_TREE (t1, sp [0]->svt);
+			} else {
+				MAKE_SPILLED_BI_ALU1 (MUL, sp [0], sp [1])
+			}
+			break;                        
+		}
+
+		case CEE_DIV: {
+			++ip;
+			sp -= 2;
+			if (sp [0]->op == MB_TERM_CONST_I4 && sp [1]->op == MB_TERM_CONST_I4 
+			    && (sp[1]->data.i != 0) 
+			    && ((sp[0]->data.i != 0x080000000) || (sp[1]->data.i != -1))) {
+				t1 = mono_ctree_new_icon4 (mp, sp [0]->data.i / sp [1]->data.i);
+				PUSH_TREE (t1, sp [0]->svt);
+			} else {
+				MAKE_SPILLED_BI_ALU1 (DIV, sp [0], sp [1])
+			}
+			break;                        
+		}
+
+		case CEE_REM: {
+			++ip;
+			sp -= 2;
+			if (sp [0]->op == MB_TERM_CONST_I4 && sp [1]->op == MB_TERM_CONST_I4) {
+				t1 = mono_ctree_new_icon4 (mp, sp [0]->data.i % sp [1]->data.i);
+				PUSH_TREE (t1, sp [0]->svt);
+			} else {
+				MAKE_SPILLED_BI_ALU1 (REM, sp [0], sp [1])
+			}
+			break;                        
 		}
+
 		case CEE_SHL: {
-			++ip;  
+			++ip;
 			sp -= 2;
-			t1 = mono_ctree_new (mp, MB_TERM_SHL, sp [0], sp [1]); 
-			PUSH_TREE (t1, sp [0]->svt);     
-			break;
+			if (sp [0]->op == MB_TERM_CONST_I4 && sp [1]->op == MB_TERM_CONST_I4) {
+				t1 = mono_ctree_new_icon4 (mp, sp [0]->data.i << sp [1]->data.i);
+				PUSH_TREE (t1, sp [0]->svt);
+			} else {
+				MAKE_SPILLED_BI_ALU1 (SHL, sp [0], sp [1])
+			}
+			break;                        
+		}
+
+		case CEE_SHR: {
+			++ip;
+			sp -= 2;
+			if (sp [0]->op == MB_TERM_CONST_I4 && sp [1]->op == MB_TERM_CONST_I4) {
+				t1 = mono_ctree_new_icon4 (mp, sp [0]->data.i >> sp [1]->data.i);
+				PUSH_TREE (t1, sp [0]->svt);
+			} else {
+				MAKE_SPILLED_BI_ALU1 (SHR, sp [0], sp [1])
+			}
+			break;                        
 		}
 
-		MAKE_BI_ALU (ADD)
 		MAKE_BI_ALU (ADD_OVF)
 		MAKE_BI_ALU (ADD_OVF_UN)
-		MAKE_BI_ALU (SUB)
 		MAKE_BI_ALU (SUB_OVF)
 		MAKE_BI_ALU (SUB_OVF_UN)
-		MAKE_BI_ALU (AND)
-		MAKE_BI_ALU (OR)
-		MAKE_BI_ALU (XOR)
-		MAKE_SPILLED_BI_ALU (MUL)
+		MAKE_SPILLED_BI_ALU (SHR_UN)
 		MAKE_SPILLED_BI_ALU (MUL_OVF)
 		MAKE_SPILLED_BI_ALU (MUL_OVF_UN)
-		MAKE_SPILLED_BI_ALU (DIV)
 		MAKE_SPILLED_BI_ALU (DIV_UN)
-		MAKE_SPILLED_BI_ALU (REM)
 		MAKE_SPILLED_BI_ALU (REM_UN)
 
 		MAKE_LDIND (LDIND_I1,  MB_TERM_LDIND_I1, VAL_I32)
@@ -2481,14 +2641,20 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 		case CEE_NEG: {
 			ip++;
 			sp--;
-			t1 = mono_ctree_new (mp, MB_TERM_NEG, sp [0], NULL);
+			if (sp [0]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, -sp [0]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_NEG, sp [0], NULL);
 			PUSH_TREE (t1, sp [0]->svt);		
 			break;
 		}
 		case CEE_NOT: {
 			ip++;
 			sp--;
-			t1 = mono_ctree_new (mp, MB_TERM_NOT, sp [0], NULL);
+			if (sp [0]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, ~sp [0]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_NOT, sp [0], NULL);
 			PUSH_TREE (t1, sp [0]->svt);
 			break;
 		}
@@ -2521,12 +2687,30 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			superblock_end = TRUE;
 			break;
 		}
+		case CEE_JMP: {
+			MonoMethod *cm;
+			guint32 token;
+			++ip;
+			token = read32 (ip);
+			ip += 4;
+
+			cm = mono_get_method (method->klass->image, token, NULL);
+			g_assert (cm);
+
+			t1 = mono_ctree_new_leaf (mp, MB_TERM_JMP);
+			/* fixme: our magic trampoline code does not work in this case,
+			 * so I need to compile the method immediately */
+			t1->data.p = mono_compile_method (cm);;
+
+			ADD_TREE (t1, cli_addr);
+			break;
+		}
 	        case CEE_LEAVE:
 	        case CEE_LEAVE_S: {
 			gint32 target;
 			MonoBBlock *hb;
 			int leave_s = (*ip == CEE_LEAVE_S);
-
+			int k;
 			++ip;
 			if (leave_s)
 				target = cli_addr + 2 + (signed char) *ip;
@@ -2538,17 +2722,34 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			tbb = &cfg->bblocks [bcinfo [target].block_id];
 
 			/* empty the stack */
-			sp = stack;
+			while (sp != stack) {
+				sp--;
+				t1 = mono_ctree_new (mp, MB_TERM_POP, *sp, NULL);
+				ADD_TREE (t1, cli_addr);
+			}
 
 			mark_reached (cfg, tbb, NULL, 0);
 
 			/* fixme: fault handler */
 
-			if ((hb = mono_find_final_block (cfg, cli_addr, MONO_EXCEPTION_CLAUSE_FINALLY))) {
+			if ((hb = mono_find_final_block (cfg, cli_addr, target, MONO_EXCEPTION_CLAUSE_FINALLY))) {
 				mark_reached (cfg, hb, NULL, 0);
 				t1 = mono_ctree_new_leaf (mp, MB_TERM_HANDLER);
 				t1->data.p = hb;
 				ADD_TREE (t1, cli_addr);
+			} 
+
+			/* check if we leave a catch handler, if so we have to
+			 * rethrow ThreadAbort exceptions */
+			for (k = 0; k < header->num_clauses; ++k) {
+				MonoExceptionClause *clause = &header->clauses [k];
+				if (clause->flags == MONO_EXCEPTION_CLAUSE_NONE &&
+				    MONO_OFFSET_IN_HANDLER (clause, cli_addr)) {
+					t1 = mono_ctree_new_leaf (mp, MB_TERM_RETHROW_ABORT);
+					t1->data.i = mono_allocate_excvar (cfg);
+					ADD_TREE (t1, cli_addr);
+					break;
+				}
 			}
 
 			t1 = mono_ctree_new_leaf (mp, MB_TERM_BR);
@@ -2633,7 +2834,7 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 			if (ret->type != MONO_TYPE_VOID) {
 				--sp;
-				if (ISSTRUCT (ret)) {
+				if (MONO_TYPE_ISSTRUCT (ret)) {
 					int align;
 					t1 = mono_ctree_new (mp, MB_TERM_RET_OBJ, *sp, NULL);
 					t1->data.i = mono_class_value_size (ret->data.klass, &align);
@@ -2649,8 +2850,10 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			ADD_TREE (t1, cli_addr);
 
 			if (sp > stack) {
-				g_warning ("more values on stack at IL_%04x: %d",  ip - header->code, sp - stack);
-				mono_print_ctree (sp [-1]);
+				g_warning ("more values on stack at %s IL_%04x: %d",  
+					   mono_method_full_name (method, TRUE), 
+					   ip - header->code, sp - stack);
+				mono_print_ctree (cfg, sp [-1]);
 				printf ("\n");
 			}
 			superblock_end = TRUE;
@@ -2674,19 +2877,33 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			int n = (*ip) - CEE_LDARG_0;
 			++ip;
 
-			t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
-			t1->data.i = ARG_POS (n);
-			t1 = ctree_create_load (cfg, ARG_TYPE (n), t1, &svt, TRUE);
-			PUSH_TREE (t1, svt);
+			if (arg_map) {
+				*sp = arg_map [n];
+				sp++;
+			} else {
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
+				t1->data.i = ARG_POS (n);
+				if (!MONO_TYPE_ISSTRUCT (ARG_TYPE (n))) 
+					t1 = ctree_create_load (cfg, ARG_TYPE (n), t1, &svt, TRUE);
+			
+				PUSH_TREE (t1, svt);
+			}
+
 			break;
 		}
 		case CEE_LDARG_S: {
 			++ip;
 
-			t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
-			t1->data.i = ARG_POS (*ip);
-			t1 = ctree_create_load (cfg, ARG_TYPE (*ip), t1, &svt, TRUE);
-			PUSH_TREE (t1, svt);
+			if (arg_map) {
+				*sp = arg_map [*ip];
+				sp++;
+			} else {
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
+				t1->data.i = ARG_POS (*ip);
+				if (!MONO_TYPE_ISSTRUCT (ARG_TYPE (*ip))) 
+					t1 = ctree_create_load (cfg, ARG_TYPE (*ip), t1, &svt, TRUE);
+				PUSH_TREE (t1, svt);
+			}
 			++ip;
 			break;
 		}
@@ -2713,21 +2930,30 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 			int vnum;
 
 			++ip; 
-			sp--;
 
-			vnum = mono_allocate_intvar (cfg, sp - stack, sp [0]->svt);
-			t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
-			t1->data.i = vnum;
-		       
-			t2 = mono_ctree_new (mp, map_store_svt_type (sp [0]->svt), t1, sp [0]);
-			t2->svt = sp [0]->svt;
-			ADD_TREE (t2, cli_addr);
+			/* fixme: maybe we should add more of these optimisations */
+			if (sp [-1]->op == MB_TERM_CONST_I4) {
 
-			t1 = ctree_create_dup (mp, t2);		
-			PUSH_TREE (t1, t1->svt);
-			t1 = ctree_create_dup (mp, t1);		
-			PUSH_TREE (t1, t1->svt);
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
+				t1->data.i = sp [-1]->data.i;
+				PUSH_TREE (t1, VAL_I32);
+			      
+			} else {
+				sp--;
 
+				vnum = mono_allocate_intvar (cfg, sp - stack, sp [0]->svt);
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
+				t1->data.i = vnum;
+		       
+				t2 = mono_ctree_new (mp, mono_map_store_svt_type (sp [0]->svt), t1, sp [0]);
+				t2->svt = sp [0]->svt;
+				ADD_TREE (t2, cli_addr);
+
+				t1 = ctree_create_dup (mp, t2);		
+				PUSH_TREE (t1, t1->svt);
+				t1 = ctree_create_dup (mp, t1);		
+				PUSH_TREE (t1, t1->svt);
+			}
 			break;
 		}
 		case CEE_POP: {
@@ -2739,174 +2965,427 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 			break;
 		}
+		case CEE_CKFINITE: {
+			int vnum;
+			++ip;
+			sp--;
+
+			/* this instr. can throw exceptions as side effect,
+			 * so we cant eliminate dead code which contains CKFINITE opdodes.
+			 * Spilling to memory makes sure that we always perform
+			 * this check */
+			vnum = mono_allocate_intvar (cfg, sp - stack, sp [0]->svt);
+			t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
+			t1->data.i = vnum;
+		       
+			t2 = mono_ctree_new (mp, MB_TERM_CKFINITE, *sp, NULL);
+
+			t2 = mono_ctree_new (mp, mono_map_store_svt_type (sp [0]->svt), t1, t2);
+			t2->svt = sp [0]->svt;
+			ADD_TREE (t2, cli_addr);
+
+			t1 = ctree_create_dup (mp, t2);		
+			PUSH_TREE (t1, t1->svt);
+			break;
+		}
 		case CEE_CONV_U1: 
-		case CEE_CONV_I1: {
 			++ip;
 			sp--;
-			t1 = mono_ctree_new (mp, MB_TERM_CONV_I1, *sp, NULL);
+			if (sp [0]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, (guint8)sp [0]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_CONV_U1, *sp, NULL);
+			PUSH_TREE (t1, VAL_I32);		
+			break;
+		case CEE_CONV_I1:
+			++ip;
+			sp--;
+			if (sp [0]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, (gint8)sp [0]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_CONV_I1, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);		
 			break;
-		}
 		case CEE_CONV_U2: 
-		case CEE_CONV_I2: {
 			++ip;
 			sp--;
-			t1 = mono_ctree_new (mp, MB_TERM_CONV_I2, *sp, NULL);
+			if (sp [0]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, (guint16)sp [0]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_CONV_U2, *sp, NULL);
+			PUSH_TREE (t1, VAL_I32);		
+			break;
+		case CEE_CONV_I2:
+			++ip;
+			sp--;
+			if (sp [0]->op == MB_TERM_CONST_I4)
+				t1 = mono_ctree_new_icon4 (mp, (gint16)sp [0]->data.i);
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_CONV_I2, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);		
 			break;
-		}
 		case CEE_CONV_I: 
+		case CEE_CONV_I4:
+			++ip;
+			sp--;
+			if (sp [0]->op == MB_TERM_CONST_I4)
+				t1 = *sp;
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_CONV_I4, *sp, NULL);
+			PUSH_TREE (t1, VAL_I32);		
+			break;
 		case CEE_CONV_U: 
 		case CEE_CONV_U4: 
-		case CEE_CONV_I4: {
 			++ip;
 			sp--;
-			t1 = mono_ctree_new (mp, MB_TERM_CONV_I4, *sp, NULL);
+			if (sp [0]->op == MB_TERM_CONST_I4)
+				t1 = *sp;
+			else
+				t1 = mono_ctree_new (mp, MB_TERM_CONV_U4, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);		
 			break;
-		}
-		case CEE_CONV_I8: {
+		case CEE_CONV_I8:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_I8, *sp, NULL);
 			PUSH_TREE (t1, VAL_I64);		
 			break;
-		}
-		case CEE_CONV_U8: {
+		case CEE_CONV_U8:
 			++ip;
 			sp--;
-			t1 = mono_ctree_new (mp, MB_TERM_CONV_I8, *sp, NULL);
+			t1 = mono_ctree_new (mp, MB_TERM_CONV_U8, *sp, NULL);
 			PUSH_TREE (t1, VAL_I64);		
 			break;
-		}
-		case CEE_CONV_R8: {
+		case CEE_CONV_R8:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_R8, *sp, NULL);
 			PUSH_TREE (t1, VAL_DOUBLE);		
 			break;
-		}
-		case CEE_CONV_R4: {
+		case CEE_CONV_R4:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_R4, *sp, NULL);
 			PUSH_TREE (t1, VAL_DOUBLE);		
 			break;
-		}
+		case CEE_CONV_R_UN:
+			++ip;
+			sp--;
+			t1 = mono_ctree_new (mp, MB_TERM_CONV_R_UN, *sp, NULL);
+			PUSH_TREE (t1, VAL_DOUBLE);		
+			break;
 		case CEE_CONV_OVF_I:
-		case CEE_CONV_OVF_I4: {
+		case CEE_CONV_OVF_I4:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_I4, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
-		}
 		case CEE_CONV_OVF_I_UN:
-		case CEE_CONV_OVF_I4_UN: {
+		case CEE_CONV_OVF_I4_UN:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_I4_UN, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);		
 			break;
-		}
 		case CEE_CONV_OVF_U:
-		case CEE_CONV_OVF_U4: {
+		case CEE_CONV_OVF_U4:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_U4, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);		
 			break;
-		}
-		case CEE_CONV_OVF_I1: {
+		case CEE_CONV_OVF_I1:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_I1, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
-		}
-		case CEE_CONV_OVF_I1_UN: {
+		case CEE_CONV_OVF_I1_UN:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_I1_UN, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
-		}
-		case CEE_CONV_OVF_U1_UN: {
+		case CEE_CONV_OVF_U1_UN:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_U1_UN, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
-		}
-		
-		case CEE_CONV_OVF_U1: {
+		case CEE_CONV_OVF_U1:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_U1, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
-		}
-		case CEE_CONV_OVF_I2: {
+		case CEE_CONV_OVF_I2:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_I2, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
-		}
-		case CEE_CONV_OVF_U2_UN: {
+		case CEE_CONV_OVF_U2_UN:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_U2_UN, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
-		}
-		case CEE_CONV_OVF_U2: {
+		case CEE_CONV_OVF_U2:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_U2, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
-		}
-		case CEE_CONV_OVF_I2_UN: {
+		case CEE_CONV_OVF_I2_UN:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_I2_UN, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
-		}
-		case CEE_CONV_OVF_U8: {
+		case CEE_CONV_OVF_U8:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_U8, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);
 			break;
-		}
 		case CEE_CONV_OVF_U_UN:
-		case CEE_CONV_OVF_U4_UN: {
+		case CEE_CONV_OVF_U4_UN:
 			// fixme: raise exceptions ?
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_I4, *sp, NULL);
 			PUSH_TREE (t1, VAL_I32);		
 			break;
-		}
-		case CEE_CONV_OVF_I8_UN: {
+		case CEE_CONV_OVF_I8_UN:
 			++ip;
 			sp--;
 			t1 = mono_ctree_new (mp, MB_TERM_CONV_OVF_I8_UN, *sp, NULL);
 			PUSH_TREE (t1, VAL_I64);
 			break;
+		case MONO_CUSTOM_PREFIX: {
+			++ip;			
+			switch (*ip) {
+				
+			case CEE_MONO_FUNC1: {
+				MonoMarshalConv conv;
+				++ip;
+
+				conv = *ip;
+
+				++ip;
+
+				sp--;
+				t1 = mono_ctree_new (mp, MB_TERM_FUNC1, *sp, NULL);
+
+				switch (conv) {
+				case MONO_MARSHAL_CONV_STR_LPWSTR:
+					t1->data.p = mono_string_to_utf16;
+					break;
+				case MONO_MARSHAL_CONV_LPSTR_STR:
+					t1->data.p = mono_string_new_wrapper;
+					break;
+				case MONO_MARSHAL_CONV_STR_LPTSTR:
+				case MONO_MARSHAL_CONV_STR_LPSTR:
+					t1->data.p = mono_string_to_utf8;
+					break;
+				case MONO_MARSHAL_CONV_STR_BSTR:
+					t1->data.p = mono_string_to_bstr;
+					break;
+				case MONO_MARSHAL_CONV_STR_TBSTR:
+				case MONO_MARSHAL_CONV_STR_ANSIBSTR:
+					t1->data.p = mono_string_to_ansibstr;
+					break;
+				case MONO_MARSHAL_CONV_SB_LPSTR:
+					t1->data.p = mono_string_builder_to_utf8;
+					break;
+				case MONO_MARSHAL_CONV_ARRAY_SAVEARRAY:
+					t1->data.p = mono_array_to_savearray;
+					break;
+				case MONO_MARSHAL_CONV_ARRAY_LPARRAY:
+					t1->data.p = mono_array_to_lparray;
+					break;
+				case MONO_MARSHAL_CONV_DEL_FTN:
+					t1->data.p = mono_delegate_to_ftnptr;
+					break;
+				case MONO_MARSHAL_CONV_STRARRAY_STRLPARRAY:
+					t1->data.p = mono_marshal_string_array;
+					break;
+				default:
+					g_assert_not_reached ();
+				}
+				PUSH_TREE (t1, VAL_POINTER); 
+				break;
+			}
+			case CEE_MONO_PROC2: {
+				MonoMarshalConv conv;
+				++ip;
+				conv = *ip;
+				++ip;
+
+				sp -= 2;
+				t1 = mono_ctree_new (mp, MB_TERM_PROC2, sp [0], sp [1]);
+
+				switch (conv) {
+				case MONO_MARSHAL_CONV_LPSTR_SB:
+					t1->data.p = mono_string_utf8_to_builder;
+					break;
+				case MONO_MARSHAL_FREE_ARRAY:
+					t1->data.p = mono_marshal_free_array;
+					break;
+				default:
+					g_assert_not_reached ();
+				}
+				ADD_TREE (t1, cli_addr); 
+				break;
+			}
+			case CEE_MONO_PROC3: {
+				MonoMarshalConv conv;
+				++ip;
+				conv = *ip;
+				++ip;
+
+				sp -= 3;
+
+				t1 = mono_ctree_new (mp, MB_TERM_CPSRC, sp [1], sp [2]);
+				t1 = mono_ctree_new (mp, MB_TERM_PROC3, sp [0], t1);
+
+				switch (conv) {
+				case MONO_MARSHAL_CONV_STR_BYVALSTR:
+					t1->data.p = mono_string_to_byvalstr;
+					break;
+				case MONO_MARSHAL_CONV_STR_BYVALWSTR:
+					t1->data.p = mono_string_to_byvalwstr;
+					break;
+				default:
+					g_assert_not_reached ();
+				}
+
+				ADD_TREE (t1, cli_addr);
+				break;
+			}
+			case CEE_MONO_FREE: {
+				++ip;
+
+				sp -= 1;
+				t1 = mono_ctree_new (mp, MB_TERM_FREE, *sp, NULL);
+				ADD_TREE (t1, cli_addr);
+				break;
+			}
+			case CEE_MONO_OBJADDR: {
+				++ip;
+
+				sp -= 1;
+				t1 = mono_ctree_new (mp, MB_TERM_OBJADDR, *sp, NULL);
+				PUSH_TREE (t1, VAL_POINTER);
+				break;
+			}
+			case CEE_MONO_VTADDR: {
+				++ip;
+
+				sp -= 1;
+				t1 = mono_ctree_new (mp, MB_TERM_VTADDR, *sp, NULL);
+				PUSH_TREE (t1, VAL_POINTER);
+				break;
+			}
+			case CEE_MONO_LDPTR: {
+				guint32 token;
+				++ip;
+				
+				token = read32 (ip);
+				ip += 4;
+				
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_G);
+				t1->data.p = mono_method_get_wrapper_data (method, token);
+				
+				PUSH_TREE (t1, VAL_POINTER);
+				break;
+			}
+			case CEE_MONO_NEWOBJ: {
+				MonoClass *class;
+				guint32 token;
+
+				++ip;
+				token = read32 (ip);
+				ip += 4;
+
+				class = (MonoClass *)mono_method_get_wrapper_data (method, token);
+
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_NEWOBJ);
+				t1->data.p = class;
+				PUSH_TREE (t1, VAL_POINTER);
+
+				break;
+			}
+			case CEE_MONO_RETOBJ: {
+				MonoType *ret = signature->ret;
+				MonoClass *class;
+				guint32 token;
+
+				++ip;
+				token = read32 (ip);
+				ip += 4;
+
+				class = (MonoClass *)mono_method_get_wrapper_data (method, token);
+
+				sp--;
+
+				g_assert (MONO_TYPE_ISSTRUCT (ret));
+
+				t1 = ctree_create_load (cfg, &class->byval_arg, *sp, &svt, FALSE);
+				t1 = mono_ctree_new (mp, MB_TERM_RET_OBJ, t1, NULL);
+				
+				if (signature->pinvoke)
+					t1->data.i = mono_class_native_size (ret->data.klass, NULL);
+				else
+					t1->data.i = mono_class_value_size (ret->data.klass, NULL);
+
+				t1->last_instr = (ip == (header->code + header->code_size));
+
+				ADD_TREE (t1, cli_addr);
+
+				if (sp > stack) {
+					g_warning ("more values on stack at %s IL_%04x: %d",  
+						   mono_method_full_name (method, TRUE), 
+						   ip - header->code, sp - stack);
+					mono_print_ctree (cfg, sp [-1]);
+					printf ("\n");
+				}
+				superblock_end = TRUE;
+				break;
+			}
+			default:
+				g_error ("Unimplemented opcode at IL_%04x "
+					 "%02x %02x", ip - header->code, MONO_CUSTOM_PREFIX, *ip);
+			}
+			break;
 		}
-		case 0xFE: {
+		case CEE_PREFIX1: {
 			++ip;			
 			switch (*ip) {
 				
+			case CEE_ENDFILTER: {
+				ip++;
+				
+				sp--;
+				t1 = mono_ctree_new (mp, MB_TERM_ENDFILTER, *sp, NULL);
+				ADD_TREE (t1, cli_addr);
+				t1->last_instr = FALSE;
+				
+				g_assert (sp == stack);
+				superblock_end = TRUE;
+				break;
+			}
+
 			case CEE_LDLOC: {
+				int n;
 				++ip;
-			
+				n = read16 (ip);
+
 				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
-				t1->data.i = LOCAL_POS (read16 (ip));
-				t1 = ctree_create_load (cfg, LOCAL_TYPE (read16 (ip)), t1, &svt, FALSE);
+				t1->data.i = LOCAL_POS (n);
+				if (!MONO_TYPE_ISSTRUCT (LOCAL_TYPE (n))) 
+					t1 = ctree_create_load (cfg, LOCAL_TYPE (n), t1, &svt, FALSE);
 				ip += 2;
 
 				PUSH_TREE (t1, svt);
@@ -2917,6 +3396,7 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
 				t1->data.i = LOCAL_POS (read16 (ip));
+				VARINFO (cfg, t1->data.i).isvolatile = 1;
 				ip += 2;
 				PUSH_TREE (t1, VAL_POINTER);			
 				break;
@@ -2927,9 +3407,25 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
 				t1->data.i = LOCAL_POS (read16 (ip));
+				if ((t2 = mono_stack_duplicate_used_var (cfg, stack, sp, t1->data.i)))
+					ADD_TREE (t2, cli_addr); 
+
 				t1 = ctree_create_store (cfg, LOCAL_TYPE (read16 (ip)), t1, *sp, FALSE);
+				ip += 2;
+				ADD_TREE (t1, cli_addr);			
+				break;
+			}
+			case CEE_STARG: {
+				guint32 arg_pos;
+				++ip;
+				--sp;
 
+				arg_pos = read16 (ip);
 				ip += 2;
+
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
+				t1->data.i = ARG_POS (arg_pos);
+				t1 = ctree_create_store (cfg, ARG_TYPE (arg_pos), t1, *sp, TRUE);
 				ADD_TREE (t1, cli_addr);			
 				break;
 			}
@@ -2954,14 +3450,15 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 				token = read32 (ip);
 				ip += 4;
 
-				cm = mono_get_method (image, token, NULL);
+				if (method->wrapper_type != MONO_WRAPPER_NONE)
+					cm = (MonoMethod *)mono_method_get_wrapper_data (method, token);
+				else 
+					cm = mono_get_method (image, token, NULL);
+
 				g_assert (cm);
 				
-				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_G);
-				if (!cm->addr)
-					t1->data.p = arch_compile_method (cm);
-				else 
-					t1->data.p = (char *)cm->addr;
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_LDFTN);
+				t1->data.m = cm;
 				PUSH_TREE (t1, VAL_POINTER);
 				break;
 			}
@@ -2983,7 +3480,7 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 				t2->data.m = cm;
 
-				t1 = mono_ctree_new (mp, MB_TERM_LDFTN, *sp, t2);
+				t1 = mono_ctree_new (mp, MB_TERM_LDVIRTFTN, *sp, t2);
 
 				PUSH_TREE (t1, VAL_POINTER);
 
@@ -3006,39 +3503,90 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 				break;
 			}
 			case CEE_LDARG: {
-				guint32 n;
+				guint16 n;
 				++ip;
-				n = read32 (ip);
-				ip += 4;
+				n = read16 (ip);
+				ip += 2;
+
+				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
+				t1->data.i = ARG_POS (n);
+				if (!MONO_TYPE_ISSTRUCT (ARG_TYPE (n))) 
+					t1 = ctree_create_load (cfg, ARG_TYPE (n), t1, &svt, TRUE);
+				PUSH_TREE (t1, svt);
+				break;
+			}
+			case CEE_LDARGA: {
+				guint16 n;
+				++ip;
+				n = read16 (ip);
+				ip += 2;
 
 				t1 = mono_ctree_new_leaf (mp, MB_TERM_ADDR_L);
 				t1->data.i = ARG_POS (n);
-				t1 = ctree_create_load (cfg, ARG_TYPE (n), t1, &svt, TRUE);
 				PUSH_TREE (t1, svt);
 				break;
 			}
 			case CEE_SIZEOF: {
 				guint32 token;
-				MonoType *type;
 				int align;
 				++ip;
 				token = read32 (ip);
 				ip += 4;
-				type = mono_type_create_from_typespec (image, token);
+
 				t1 = mono_ctree_new_leaf (mp, MB_TERM_CONST_I4);
-				t1->data.i = mono_type_size (type, &align);
-				mono_metadata_free_type (type);
+				if (mono_metadata_token_table (token) == MONO_TABLE_TYPESPEC) {
+					MonoType *type = mono_type_create_from_typespec (image, token);
+					t1->data.i = mono_type_size (type, &align);
+					mono_metadata_free_type (type);
+				} else {
+					MonoClass *szclass = mono_class_get (image, token);
+					mono_class_init (szclass);
+					g_assert (szclass->valuetype);
+					t1->data.i = mono_class_value_size (szclass, &align);
+				}
+
 				PUSH_TREE (t1, VAL_I32);
 				break;
 			}
+			case CEE_CPBLK: {
+				++ip;
+				sp -= 3;
+
+				t1 = mono_ctree_new (mp, MB_TERM_CPSRC, sp [1], sp [2]);
+				t1 = mono_ctree_new (mp, MB_TERM_CPBLK, sp [0], t1);
+				ADD_TREE (t1, cli_addr);
+				break;
+			}
 			case CEE_UNALIGNED_: {
 				++ip;
-				// fixme: implement me
+				/* fixme: implement me */
 				break;
 			}
 			case CEE_VOLATILE_: {
 				++ip;
-				// fixme: implement me				
+				/* fixme: implement me */ 	
+				break;
+			}
+			case CEE_TAIL_:
+				++ip;
+				tail_recursion = TRUE;
+				break;
+			case CEE_LOCALLOC: {
+				++ip;
+				--sp;
+
+				t1 = mono_ctree_new (mp, MB_TERM_LOCALLOC, *sp, NULL);
+				t1->data.i = header->init_locals;
+				PUSH_TREE (t1, VAL_POINTER);
+				break;
+			}
+			case CEE_INITBLK: {
+				++ip;
+				sp -= 3;
+
+				t1 = mono_ctree_new (mp, MB_TERM_CPSRC, sp [1], sp [2]);
+				t1 = mono_ctree_new (mp, MB_TERM_INITBLK, sp [0], t1);
+				ADD_TREE (t1, cli_addr);
 				break;
 			}
 			default:
@@ -3049,19 +3597,18 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 		}	
 		default:
 			g_warning ("unknown instruction `%s' at IL_%04X", 
-				   opcode_names [*ip], ip - header->code);
-			if (mono_debug_handle) {
-				cfg->invalid = 1;
-				return;
+				   mono_opcode_names [*ip], ip - header->code);
+			if (mono_debug_format == MONO_DEBUG_FORMAT_NONE) {
+				return FALSE;
 			}
-			mono_print_forest (forest);
+			mono_print_forest (cfg, forest);
 			g_assert_not_reached ();
 		}
 	}		
 
         if ((depth = sp - stack)) {
 		//printf ("DEPTH %d %d\n",  depth, sp [0]->op);
-		//mono_print_forest (forest);
+		//mono_print_forest (cfg, forest);
 		create_outstack (cfg, bb, stack, sp - stack);
 	}
 
@@ -3073,7 +3620,7 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 				//printf ("unreached block %d\n", i);
 				repeat = TRUE;
 				if (repeat_count >= 10) {
-					/*mono_print_forest (forest);
+					/*mono_print_forest (cfg, forest);
 					g_warning ("repeat count exceeded at ip: 0x%04x in %s\n", bb->cli_addr, cfg->method->name);*/
 					repeat = FALSE;
 				}
@@ -3088,69 +3635,317 @@ mono_analyze_stack (MonoFlowGraph *cfg)
 
 	} while (repeat);
 
-	//printf ("FINISHED\n");
+	return TRUE;
 }
 
-/* this function is never called */
-static void 
-ves_array_set (MonoArray *this, ...)
+static void
+mono_cfg_free (MonoFlowGraph *cfg)
 {
-	g_assert_not_reached ();
+	int i;
+
+	for (i = 0; i < cfg->block_count; i++) {
+		if (!cfg->bblocks [i].reached)
+			continue;
+		g_ptr_array_free (cfg->bblocks [i].forest, TRUE);
+		g_list_free (cfg->bblocks [i].succ);
+	}
+
+	if (cfg->bcinfo)
+		g_free (cfg->bcinfo);
+
+	if (cfg->bblocks)
+		g_free (cfg->bblocks);
+		
+	g_array_free (cfg->varinfo, TRUE);
+
+	mono_mempool_destroy (cfg->mp);
 }
 
-/* this function is never called */
-static void 
-ves_array_get (MonoArray *this, ...)
+int mono_exc_esp_offset = 0;
+
+static MonoFlowGraph *
+mono_cfg_new (MonoMethod *method)
 {
-	g_assert_not_reached ();
-}
+	MonoVarInfo vi;
+	MonoFlowGraph *cfg;
+	MonoMemPool *mp = mono_mempool_new ();
+
+	g_assert (((MonoMethodNormal *)method)->header);
+
+	cfg = mono_mempool_alloc0 (mp, sizeof (MonoFlowGraph));
+
+	cfg->domain = mono_domain_get ();
+	cfg->method = method;
+	cfg->mp = mp;
+
+	/* reserve space to save LMF */
+	cfg->locals_size = sizeof (MonoLMF);
+	/* reserve space to save caller saved registers */
+	/* fixme: this is arch dependent */
+	/* we save EAX, EDX, ECX - and ESP if we call finally handlers */
+	cfg->locals_size += 16;
 	
+	mono_exc_esp_offset = - cfg->locals_size;
+
+	/* aligment check */
+	g_assert (!(cfg->locals_size & 0x7));
+
+	/* fixme: we should also consider loader optimisation attributes */
+	cfg->share_code = mono_jit_share_code;
+
+	cfg->varinfo = g_array_new (FALSE, TRUE, sizeof (MonoVarInfo));
+	
+	SET_VARINFO (vi, 0, 0, 0, 0);
+	g_array_append_val (cfg->varinfo, vi); /* add invalid value at position 0 */
+
+	cfg->intvars = mono_mempool_alloc0 (mp, sizeof (guint16) * VAL_DOUBLE * 
+					    ((MonoMethodNormal *)method)->header->max_stack);
+
+	mono_analyze_flow (cfg);
+
+	if (!mono_analyze_stack (cfg)) {
+		mono_cfg_free (cfg);
+		return NULL;
+	}
+	
+	return cfg;
+}
+
+static gpointer 
+mono_get_runtime_method (MonoMethod* method)
+{
+	MonoMethod *nm;
+	const char *name = method->name;
+
+	if (method->klass->parent == mono_defaults.multicastdelegate_class) {
+		if (*name == '.' && (strcmp (name, ".ctor") == 0)) {
+			return (gpointer)mono_delegate_ctor;
+		} else if (*name == 'I' && (strcmp (name, "Invoke") == 0)) {
+		        nm = mono_marshal_get_delegate_invoke (method);
+			return mono_compile_method (nm);
+		} else if (*name == 'B' && (strcmp (name, "BeginInvoke") == 0)) {
+			nm = mono_marshal_get_delegate_begin_invoke (method);
+			return mono_compile_method (nm);
+		} else if (*name == 'E' && (strcmp (name, "EndInvoke") == 0)) {
+			nm = mono_marshal_get_delegate_end_invoke (method);
+			return mono_compile_method (nm);
+		}
+	}
+	return NULL;
+}
+
+static int
+match_debug_method (MonoMethod* method)
+{
+	GList *tmp = mono_debug_methods;
+
+	for (; tmp; tmp = tmp->next) {
+		if (method->wrapper_type == MONO_WRAPPER_RUNTIME_INVOKE)
+			continue;
+		if (mono_method_desc_full_match (tmp->data, method))
+			return 1;
+	}
+	return 0;
+}
+
 /**
- * mono_jit_assembly:
- * @assembly: reference to an assembly
+ * mono_compile_method:
+ * @method: pointer to the method info
+ *
+ * JIT compilation of a single method. 
  *
- * JIT compilation of all methods in the assembly. Prints debugging
- * information on stdout.
+ * Returns: a pointer to the newly created code.
  */
-static void
-mono_jit_assembly (MonoAssembly *assembly)
+static gpointer
+mono_jit_compile_method (MonoMethod *method)
 {
-	MonoImage *image = assembly->image;
-	MonoMethod *method;
-	MonoTableInfo *t = &image->tables [MONO_TABLE_METHOD];
-	int i;
+	MonoDomain *target_domain, *domain = mono_domain_get ();
+	MonoJitInfo *ji;
+	guint8 *addr;
+	GHashTable *jit_code_hash;
+
+	if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
+	    (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)) {
+
+		if (!method->info) {
+			MonoMethod *nm;
+    
+			nm = mono_marshal_get_native_wrapper (method);
+			method->info = mono_compile_method (nm);
+		}
+		return method->info;
+	}
 
-	for (i = 0; i < t->rows; i++) {
+	if (mono_jit_share_code)
+		target_domain = mono_root_domain;
+	else 
+		target_domain = domain;
 
-		method = mono_get_method (image, 
-					  (MONO_TABLE_METHOD << 24) | (i + 1), 
-					  NULL);
+	jit_code_hash = target_domain->jit_code_hash;
+
+	if ((addr = g_hash_table_lookup (jit_code_hash, method))) {
+		mono_jit_stats.methods_lookups++;
+		return addr;
+	}
+
+	mono_jit_stats.methods_compiled++;
+	
+	if (mono_jit_trace_calls || mono_jit_dump_asm || mono_jit_dump_forest) {
+		printf ("Start JIT compilation of %s\n", mono_method_full_name (method, TRUE));
+	}
+
+	if (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) {
+		if (!(addr = mono_get_runtime_method (method))) {	
+			mono_profiler_method_end_jit (method, MONO_PROFILE_FAILED);
+			if (mono_debug_format != MONO_DEBUG_FORMAT_NONE) 
+				return NULL;
+
+			g_error ("Don't know how to exec runtime method %s", mono_method_full_name (method, TRUE));
+		}
+	} else {
+		MonoMethodHeader *header = ((MonoMethodNormal *)method)->header;
+		MonoFlowGraph *cfg;
+		gulong code_size_ratio;
+	
+		mono_profiler_method_jit (method);
+	
+		if (!(cfg = mono_cfg_new (method))) {
+			mono_profiler_method_end_jit (method, MONO_PROFILE_FAILED);
+			return NULL;
+		}
+			
+		cfg->code_size = MAX (header->code_size * 5, 256);
+		cfg->start = cfg->code = g_malloc (cfg->code_size);
+
+		/* fixme: make this arch independent */
+		mono_debug_last_breakpoint_address = cfg->code;
 
-		printf ("\nMethod: %s\n\n", method->name);
+		if (match_debug_method (method) || mono_debug_insert_breakpoint)
+			x86_breakpoint (cfg->code);
+		else if (mono_debug_format != MONO_DEBUG_FORMAT_NONE)
+			x86_nop (cfg->code);
 
-		if (method->flags & METHOD_ATTRIBUTE_ABSTRACT)
-			printf ("ABSTARCT\n");
-		else
-			arch_compile_method (method);
+		if (mono_debug_insert_breakpoint > 0)
+			mono_debug_insert_breakpoint--;
 
+		if (!(ji = arch_jit_compile_cfg (target_domain, cfg))) {
+			mono_profiler_method_end_jit (method, MONO_PROFILE_FAILED);
+			return NULL;
+		}
+		
+		addr = cfg->start;
+
+		mono_jit_stats.allocated_code_size += cfg->code_size;
+
+		code_size_ratio = cfg->code - cfg->start;
+		if (code_size_ratio > mono_jit_stats.biggest_method_size) {
+			mono_jit_stats.biggest_method_size = code_size_ratio;
+			mono_jit_stats.biggest_method = method;
+		}
+		code_size_ratio = (code_size_ratio * 100) / header->code_size;
+		if (code_size_ratio > mono_jit_stats.max_code_size_ratio) {
+			mono_jit_stats.max_code_size_ratio = code_size_ratio;
+			mono_jit_stats.max_ratio_method = method;
+		}
+
+		
+		if (mono_jit_dump_asm) {
+			char *id = g_strdup_printf ("%s.%s_%s", method->klass->name_space,
+						    method->klass->name, method->name);
+			mono_disassemble_code (cfg->start, cfg->code - cfg->start, id);
+			g_free (id);
+		}
+		if (mono_debug_format != MONO_DEBUG_FORMAT_NONE)
+			mono_debug_add_method (cfg);
+
+
+		mono_jit_stats.native_code_size += ji->code_size;
+
+		if (header->num_clauses) {
+			int i, start_block, end_block, filter_block;
+
+			ji->num_clauses = header->num_clauses;
+			ji->clauses = mono_mempool_alloc0 (target_domain->mp, 
+			        sizeof (MonoJitExceptionInfo) * header->num_clauses);
+
+			for (i = 0; i < header->num_clauses; i++) {
+				MonoExceptionClause *ec = &header->clauses [i];
+				MonoJitExceptionInfo *ei = &ji->clauses [i];
+			
+				ei->flags = ec->flags;
+
+				if (ei->flags == MONO_EXCEPTION_CLAUSE_FILTER) {
+					g_assert (cfg->bcinfo [ec->token_or_filter].is_block_start);
+					filter_block = cfg->bcinfo [ec->token_or_filter].block_id;
+					ei->data.filter = cfg->start + cfg->bblocks [filter_block].addr;
+				} else {
+					ei->data.token = ec->token_or_filter;
+				}
+
+				g_assert (cfg->bcinfo [ec->try_offset].is_block_start);
+				start_block = cfg->bcinfo [ec->try_offset].block_id;
+				end_block = cfg->bcinfo [ec->try_offset + ec->try_len].block_id;
+				g_assert (cfg->bcinfo [ec->try_offset + ec->try_len].is_block_start);
+				
+				ei->try_start = cfg->start + cfg->bblocks [start_block].addr;
+				ei->try_end = cfg->start + cfg->bblocks [end_block].addr;
+				
+				g_assert (cfg->bcinfo [ec->handler_offset].is_block_start);
+				start_block = cfg->bcinfo [ec->handler_offset].block_id;
+				ei->handler_start = cfg->start + cfg->bblocks [start_block].addr;	
+			}
+		}
+		
+		mono_jit_info_table_add (target_domain, ji);
+
+		mono_regset_free (cfg->rs);
+
+		mono_cfg_free (cfg);
+
+		mono_profiler_method_end_jit (method, MONO_PROFILE_OK);
+	}
+
+	if (mono_jit_trace_calls || mono_jit_dump_asm || mono_jit_dump_forest) {
+		printf ("END JIT compilation of %s %p %p\n", mono_method_full_name (method, FALSE), method, addr);
 	}
 
+	g_hash_table_insert (jit_code_hash, method, addr);
+
+	return addr;
 }
 
-static gint32
-jit_exec_main (MonoMethod *method, MonoArray *args)
+/* mono_jit_create_remoting_trampoline:
+ * @method: pointer to the method info
+ *
+ * Creates a trampoline which calls the remoting functions. This
+ * is used in the vtable of transparent proxies.
+ * 
+ * Returns: a pointer to the newly created code 
+ */
+gpointer
+mono_jit_create_remoting_trampoline (MonoMethod *method)
 {
-	gint32 (*mfunc) (MonoArray*);
-	gint32 res;
+	MonoMethod *nm;
+	guint8 *addr = NULL;
 
-	mfunc = arch_compile_method (method);
+	nm = mono_marshal_get_remoting_invoke (method);
+	addr = mono_compile_method (nm);
 
-	res = mfunc (args);
+	return addr;
+}
 
-	if (method->signature->ret->type == MONO_TYPE_VOID)
-		res = 0;
-	
-	return res;
+/* this function is never called */
+static void
+ves_array_set (MonoArray *this, ...)
+{
+	g_assert_not_reached ();
+}
+
+/* this function is never called */
+static void
+ves_array_get (MonoArray *this, ...)
+{
+	g_assert_not_reached ();
 }
 
 /**
@@ -3161,10 +3956,9 @@ jit_exec_main (MonoMethod *method, MonoArray *args)
  *
  * Start execution of a program.
  */
-static int 
+int 
 mono_jit_exec (MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[])
 {
-	MonoArray *args = NULL;
 	MonoImage *image = assembly->image;
 	MonoCLIImageInfo *iinfo;
 	MonoMethod *method;
@@ -3172,281 +3966,203 @@ mono_jit_exec (MonoDomain *domain, MonoAssembly *assembly, int argc, char *argv[
 	iinfo = image->image_info;
 	method = mono_get_method (image, iinfo->cli_cli_header.ch_entry_point, NULL);
 
-	if (method->signature->param_count) {
-		int i;
-		args = (MonoArray*)mono_array_new (domain, mono_defaults.string_class, argc);
-		for (i = 0; i < argc; ++i) {
-			MonoString *arg = mono_string_new (domain, argv [i]);
-			mono_array_set (args, gpointer, i, mono_string_intern (arg));
-		}
-	}
-	
-	return mono_runtime_exec_main (method, args);
+	return mono_runtime_run_main (method, argc, argv, NULL);
 }
 
-static void
-usage (char *name)
-{
-	fprintf (stderr,
-		 "%s %s, the Mono ECMA CLI JIT Compiler, (C) 2001 Ximian, Inc.\n\n"
-		 "Usage is: %s [options] executable args...\n", name,  VERSION, name);
-	fprintf (stderr,
-		 "Valid Options are:\n"
-		 "-d               debug the jit, show disassembler output.\n"
-		 "--dump-asm       dumps the assembly code generated\n"
-		 "--dump-forest    dumps the reconstructed forest\n"
-		 "--trace-calls    printf function call trace\n"
-		 "--share-code     force jit to produce shared code\n"
-		 "--print-vtable   print the VTable of all used classes\n"
-		 "--stabs          write stabs debug information\n"
-		 "--stats          print statistics about the jit operations\n"
-		 "--compile cname  compile methods in given class (namespace.name[:methodname])\n"
-		 "--ncompile num   compile methods num times (default: 1000)\n"
-		 "--debug name     insert a breakpoint at the start of method name\n"
-		 "--help           print this help message\n");
-	exit (1);
-}
+#ifdef PLATFORM_WIN32
+#define GET_CONTEXT \
+	struct sigcontext *ctx = (struct sigcontext*)_dummy;
+#else
+#define GET_CONTEXT \
+	void **_p = (void **)&_dummy; \
+	struct sigcontext *ctx = (struct sigcontext *)++_p;
+#endif
 
 static void
 sigfpe_signal_handler (int _dummy)
 {
 	MonoException *exc;
-	void **_p = (void **)&_dummy;
-	struct sigcontext *ctx = (struct sigcontext *)++_p;
+	GET_CONTEXT
 
 	exc = mono_get_exception_divide_by_zero ();
 	
-	arch_handle_exception (ctx, exc);
-
-	g_error ("we should never reach this code");
+	arch_handle_exception (ctx, exc, FALSE);
 }
 
 static void
 sigill_signal_handler (int _dummy)
 {
 	MonoException *exc;
-	void **_p = (void **)&_dummy;
-	struct sigcontext *ctx = (struct sigcontext *)++_p;
-
-	exc = mono_get_exception_execution_engine ();
+	GET_CONTEXT
+	exc = mono_get_exception_execution_engine ("SIGILL");
 	
-	arch_handle_exception (ctx, exc);
-
-	g_error ("we should never reach this code");
+	arch_handle_exception (ctx, exc, FALSE);
 }
 
 static void
 sigsegv_signal_handler (int _dummy)
 {
 	MonoException *exc;
-	void **_p = (void **)&_dummy;
-	struct sigcontext *ctx = (struct sigcontext *)++_p;
+	GET_CONTEXT
 
 	exc = mono_get_exception_null_reference ();
 	
-	arch_handle_exception (ctx, exc);
+	arch_handle_exception (ctx, exc, FALSE);
+}
+
+static void
+sigusr1_signal_handler (int _dummy)
+{
+	MonoThread *thread;
+	GET_CONTEXT
+	
+	thread = mono_thread_current ();
+        
+	g_assert (thread->abort_exc);
 
-	g_error ("we should never reach this code");
+	arch_handle_exception (ctx, thread->abort_exc, FALSE);
+}
+
+gpointer 
+mono_get_lmf_addr (void)
+{
+	MonoJitTlsData *jit_tls;	
+
+	if ((jit_tls = TlsGetValue (mono_jit_tls_id)))
+		return &jit_tls->lmf;
+
+	g_assert_not_reached ();
+	return NULL;
 }
 
 /**
- * mono_jit_abort:
+ * mono_thread_abort:
  * @obj: exception object
  *
- * abort the program, print exception information and stack trace
+ * abort the thread, print exception information and stack trace
  */
-void
-mono_jit_abort (MonoObject *obj)
+static void
+mono_thread_abort (MonoObject *obj)
 {
-	char *message = "";
-	char *trace = NULL;
-	MonoString *str; ;
-
-	g_assert (obj);
-
-	if (mono_object_isinst (obj, mono_defaults.exception_class)) {
-		if ((str = ((MonoException *)obj)->message))
-			message = mono_string_to_utf8 (str);
-		if ((str = ((MonoException *)obj)->stack_trace))
-			trace = mono_string_to_utf8 (str);
-	}				
+	MonoJitTlsData *jit_tls = TlsGetValue (mono_jit_tls_id);
 	
-	g_warning ("unhandled exception %s.%s: \"%s\"", obj->vtable->klass->name_space, 
-		   obj->vtable->klass->name, message);
-       
-	if (trace) {
-		g_printerr (trace);
-		g_printerr ("\n");
-	}
+	g_free (jit_tls);
 
-	exit (1);
+	ExitThread (-1);
 }
 
-int 
-main (int argc, char *argv [])
+static void
+mono_thread_start_cb (gpointer stack_start)
 {
-	MonoDomain *domain;
-	struct sigaction sa;
-	MonoAssembly *assembly;
-	int retval = 0, i;
-	int compile_times = 1000;
-	char *compile_class = NULL;
-	char *file;
-	gboolean testjit = FALSE;
-	int stack, verbose = FALSE;
-
-	mono_end_of_stack = &stack; /* a pointer to a local variable is always < BP */
-
-	if (argc < 2)
-		usage (argv [0]);
-
-	for (i = 1; i < argc && argv [i][0] == '-'; i++){
-		if (strcmp (argv [i], "--help") == 0) {
-			usage (argv [0]);
-		} else if (strcmp (argv [i], "-d") == 0) {
-			testjit = TRUE;
-			mono_jit_dump_asm = TRUE;
-			mono_jit_dump_forest = TRUE;
-		} else if (strcmp (argv [i], "--dump-asm") == 0)
-			mono_jit_dump_asm = TRUE;
-		else if (strcmp (argv [i], "--dump-forest") == 0)
-			mono_jit_dump_forest = TRUE;
-		else if (strcmp (argv [i], "--trace-calls") == 0)
-			mono_jit_trace_calls = TRUE;
-		else if (strcmp (argv [i], "--share-code") == 0)
-			mono_jit_share_code = TRUE;
-		else if (strcmp (argv [i], "--print-vtable") == 0)
-			mono_print_vtable = TRUE;
-		else if (strcmp (argv [i], "--debug") == 0) {
-			mono_debug_methods = g_list_append (mono_debug_methods, argv [++i]);
-		} else if (strcmp (argv [i], "--count") == 0) {
-			compile_times = atoi (argv [++i]);
-		} else if (strcmp (argv [i], "--compile") == 0) {
-			compile_class = argv [++i];
-		} else if (strcmp (argv [i], "--ncompile") == 0) {
-			compile_times = atoi (argv [++i]);
-		} else if (strcmp (argv [i], "--stats") == 0) {
-			memset (&mono_jit_stats, 0, sizeof (MonoJitStats));
-			mono_jit_stats.enabled = TRUE;
-		} else if (strcmp (argv [i], "--stabs") == 0) {
-			mono_debug_handle = mono_debug_open_file ("");
-		} else if (strcmp (argv [i], "--verbose") == 0) {
-			verbose = TRUE;;
-		} else
-			usage (argv [0]);
-	}
-	
-	file = argv [i];
+	MonoJitTlsData *jit_tls;
+
+	jit_tls = g_new0 (MonoJitTlsData, 1);
 
-	if (!file)
-		usage (argv [0]);
+	TlsSetValue (mono_jit_tls_id, jit_tls);
 
+	jit_tls->abort_func = mono_thread_abort;
+	jit_tls->end_of_stack = stack_start;
+}
 
+static CRITICAL_SECTION ms;
+
+static void
+mono_runtime_install_handlers (void)
+{
+#ifndef PLATFORM_WIN32
+	struct sigaction sa;
+#endif
+
+#ifdef PLATFORM_WIN32
+	win32_seh_init();
+	win32_seh_set_handler(SIGFPE, sigfpe_signal_handler);
+	win32_seh_set_handler(SIGILL, sigill_signal_handler);
+	win32_seh_set_handler(SIGSEGV, sigsegv_signal_handler);
+#else /* !PLATFORM_WIN32 */
+
+	/* libpthreads has its own implementation of sigaction(),
+	 * but it seems to work well with our current exception
+	 * handlers. If not we must call syscall directly instead 
+	 * of sigaction */
+	
 	/* catch SIGFPE */
 	sa.sa_handler = sigfpe_signal_handler;
 	sigemptyset (&sa.sa_mask);
 	sa.sa_flags = 0;
-	g_assert (syscall (SYS_sigaction, SIGFPE, &sa, NULL) != -1);
+	//g_assert (syscall (SYS_sigaction, SIGFPE, &sa, NULL) != -1);
+	g_assert (sigaction (SIGFPE, &sa, NULL) != -1);
 
 	/* catch SIGILL */
 	sa.sa_handler = sigill_signal_handler;
 	sigemptyset (&sa.sa_mask);
 	sa.sa_flags = 0;
-	g_assert (syscall (SYS_sigaction, SIGILL, &sa, NULL) != -1);
+	//g_assert (syscall (SYS_sigaction, SIGILL, &sa, NULL) != -1);
+	g_assert (sigaction (SIGILL, &sa, NULL) != -1);
 
+	/* catch SIGUSR1 */
+	sa.sa_handler = sigusr1_signal_handler;
+	sigemptyset (&sa.sa_mask);
+	sa.sa_flags = 0;
+	//g_assert (syscall (SYS_sigaction, SIGILL, &sa, NULL) != -1);
+	g_assert (sigaction (SIGUSR1, &sa, NULL) != -1);
+
+#if 1
 	/* catch SIGSEGV */
 	sa.sa_handler = sigsegv_signal_handler;
 	sigemptyset (&sa.sa_mask);
 	sa.sa_flags = 0;
 	//g_assert (syscall (SYS_sigaction, SIGSEGV, &sa, NULL) != -1);
+	g_assert (sigaction (SIGSEGV, &sa, NULL) != -1);
+#endif
+#endif /* PLATFORM_WIN32 */
+}
+
+MonoDomain*
+mono_jit_init (const char *file) {
+	MonoDomain *domain;
+
+	mono_cpu_detect ();
+
+	mono_runtime_install_handlers ();
 
 	mono_init_icall ();
-	mono_add_internal_call ("__array_Set", ves_array_set);
-	mono_add_internal_call ("__array_Get", ves_array_get);
-	mono_add_internal_call ("__array_Address", ves_array_element_address);
+	mono_add_internal_call ("System.Array::Set", ves_array_set);
+	mono_add_internal_call ("System.Array::Get", ves_array_get);
+	mono_add_internal_call ("System.Array::Address", ves_array_element_address);
+	mono_add_internal_call ("System.Diagnostics.StackFrame::get_frame_info", 
+				ves_icall_get_frame_info);
+	mono_add_internal_call ("System.Diagnostics.StackTrace::get_trace", 
+				ves_icall_get_trace);
 
-	mono_jit_info_table = mono_jit_info_table_new ();
+	metadata_section = &ms;
+	InitializeCriticalSection (metadata_section);
 
-	lmf_thread_id = TlsAlloc ();
-	TlsSetValue (lmf_thread_id, NULL);
+	mono_jit_tls_id = TlsAlloc ();
+	mono_thread_start_cb ((gpointer)-1);
 
+	mono_install_compile_method (mono_jit_compile_method);
 	mono_install_trampoline (arch_create_jit_trampoline);
-	mono_install_runtime_class_init (runtime_class_init);
-	mono_install_runtime_object_init (runtime_object_init);
-	mono_install_runtime_exec_main (jit_exec_main);
+	mono_install_remoting_trampoline (mono_jit_create_remoting_trampoline);
 	mono_install_handler (arch_get_throw_exception ());
+	mono_install_runtime_invoke (mono_jit_runtime_invoke);
+	mono_install_stack_walk (mono_jit_walk_stack);
 
 	domain = mono_init (file);
-	mono_thread_init (domain);
-	mono_network_init ();
+	mono_runtime_init (domain, mono_thread_start_cb);
 
-	assembly = mono_domain_assembly_open (domain, file);
-	if (!assembly){
-		fprintf (stderr, "Can not open image %s\n", file);
-		exit (1);
-	}
+	return domain;
+}
 
-	if (testjit) {
-		mono_jit_assembly (assembly);
-	} else if (compile_class) {
-		char *cmethod = strrchr (compile_class, ':');
-		char *cname;
-		char *code;
-		int i, j;
-		MonoClass *class;
-
-		if (cmethod)
-			*cmethod++ = 0;
-		cname = strrchr (compile_class, '.');
-		if (cname)
-			*cname++ = 0;
-		else {
-			cname = compile_class;
-			compile_class = "";
-		}
-		class = mono_class_from_name (assembly->image, compile_class, cname);
-		if (!class)
-			g_error ("Cannot find class %s.%s", compile_class, cname);
-		mono_class_init (class);
-		if (cmethod) {
-			MonoMethod *m = NULL;
-			for (i = 0; i < class->method.count; ++i) {
-				if (strcmp (class->methods [i]->name, cmethod) == 0) {
-					m = class->methods [i];
-					break;;
-				}
-			}
-			if (!m)
-				g_error ("Cannot find method %s.%s:%s", compile_class, cname, cmethod);
-			for (j = 0; j < compile_times; ++j) {
-				code = arch_compile_method (m);
-				g_free (code);
-			}
-		} else {
-			for (j = 0; j < compile_times; ++j) {
-				for (i = 0; i < class->method.count; ++i) {
-					if (class->methods [i]->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)
-						continue;
-					if (class->methods [i]->flags & METHOD_ATTRIBUTE_ABSTRACT)
-						continue;
-					if (verbose)
-						g_print ("Compiling: %s\n", class->methods [i]->name);
-					code = arch_compile_method (class->methods [i]);
-					g_free (code);
-				}
-			}
-		}
-	} else {
-		/*
-		 * skip the program name from the args.
-		 */
-		++i;
-		retval = mono_jit_exec (domain, assembly, argc - i, argv + i);
-		printf ("RESULT: %d\n", retval);
-	}
+void
+mono_jit_cleanup (MonoDomain *domain)
+{
+	mono_debug_cleanup ();
 
-	mono_network_cleanup();
-	mono_thread_cleanup();
+#ifdef PLATFORM_WIN32
+	win32_seh_cleanup();
+#endif
+
+	mono_runtime_cleanup (domain);
 
 	mono_domain_unload (domain, TRUE);
 
@@ -3455,6 +4171,8 @@ main (int argc, char *argv [])
 		g_print ("Compiled methods:       %ld\n", mono_jit_stats.methods_compiled);
 		g_print ("Methods cache lookup:   %ld\n", mono_jit_stats.methods_lookups);
 		g_print ("Method trampolines:     %ld\n", mono_jit_stats.method_trampolines);
+		g_print ("Basic blocks:           %ld\n", mono_jit_stats.basic_blocks);
+		g_print ("Max basic blocks:       %ld\n", mono_jit_stats.max_basic_blocks);
 		g_print ("Allocated vars:         %ld\n", mono_jit_stats.allocate_var);
 		g_print ("Analyze stack repeat:   %ld\n", mono_jit_stats.analyze_stack_repeat);
 		g_print ("Compiled CIL code size: %ld\n", mono_jit_stats.cil_code_size);
@@ -3465,10 +4183,50 @@ main (int argc, char *argv [])
 				mono_jit_stats.biggest_method->klass->name, mono_jit_stats.biggest_method->name);
 		g_print ("Code reallocs:          %ld\n", mono_jit_stats.code_reallocs);
 		g_print ("Allocated code size:    %ld\n", mono_jit_stats.allocated_code_size);
+		g_print ("Inlineable methods:     %ld\n", mono_jit_stats.inlineable_methods);
+		g_print ("Inlined methods:        %ld\n", mono_jit_stats.inlined_methods);
+		
+		g_print ("\nCreated object count:   %ld\n", mono_stats.new_object_count);
+		g_print ("Initialized classes:    %ld\n", mono_stats.initialized_class_count);
+		g_print ("Used classes:           %ld\n", mono_stats.used_class_count);
+		g_print ("Static data size:       %ld\n", mono_stats.class_static_data_size);
+		g_print ("VTable data size:       %ld\n", mono_stats.class_vtable_size);
 	}
 
-	return retval;
+	DeleteCriticalSection (metadata_section);
+
 }
 
+/**
+ * mono_jit_image:
+ * @image: reference to an image
+ * @verbose: If true, print debugging information on stdout.
+ *
+ * JIT compilation of all methods in the image.
+ */
+void
+mono_jit_compile_image (MonoImage *image, int verbose)
+{
+	MonoMethod *method;
+	MonoTableInfo *t = &image->tables [MONO_TABLE_METHOD];
+	int i;
+
+	for (i = 0; i < t->rows; i++) {
 
+		method = mono_get_method (image, 
+					  (MONO_TABLE_METHOD << 24) | (i + 1), 
+					  NULL);
+
+		if (verbose)
+			g_print ("Compiling: %s:%s\n\n", image->assembly_name, method->name);
+
+		if (method->flags & METHOD_ATTRIBUTE_ABSTRACT) {
+			if (verbose)
+				printf ("ABSTARCT\n");
+		} else
+			mono_compile_method (method);
+
+	}
+
+}
 
diff --git a/mono/jit/jit.h b/mono/jit/jit.h
index 93ac4bba0c8..463a63d1825 100644
--- a/mono/jit/jit.h
+++ b/mono/jit/jit.h
@@ -1,16 +1,52 @@
+/*
+ * Author:
+ *   Dietmar Maurer (dietmar@ximian.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
 #ifndef _MONO_JIT_JIT_H_
 #define _MONO_JIT_JIT_H_
 
+/*
+ * io-layer.h must be _BEFORE_ win32-exception.h to avoid problems when 
+ * compiling with version 1.2 of mingw and w32api.
+ */
+#include <mono/io-layer/io-layer.h>
+
+#ifdef __WIN32__
+#include "win32-exception.h"
+#else
 #include <signal.h>
+#endif
 
+#include <setjmp.h>
 #include <mono/metadata/loader.h>
 #include <mono/metadata/object.h>
 #include <mono/metadata/exception.h>
 #include <mono/metadata/mempool.h>
+#include <mono/metadata/reflection.h>
+#include <mono/metadata/appdomain.h>
+#include <mono/metadata/opcodes.h>
+#include <mono/utils/monobitset.h>
 
 #include "regset.h"
 
-#define ISSTRUCT(t) (!t->byref && t->type == MONO_TYPE_VALUETYPE && !t->data.klass->enumtype)
+/* fixme: configure should set that */
+#define ARCH_X86 
+
+#ifdef ARCH_X86
+#define MB_TERM_LDIND_REF MB_TERM_LDIND_I4
+#define MB_TERM_LDIND_U4 MB_TERM_LDIND_I4
+#define MB_TERM_STIND_REF MB_TERM_STIND_I4
+#define MB_TERM_REMOTE_STIND_REF MB_TERM_REMOTE_STIND_I4
+#endif
+
+#define VARINFO(cfg,num) (g_array_index (cfg->varinfo, MonoVarInfo, num))
+
+#define SET_VARINFO(vi,t,k,o,s) do { vi.type=t; vi.vartype=k; vi.offset=o; vi.size=s; } while (0)
+
+extern int mono_exc_esp_offset;
 
 typedef struct _MBTree MBTree;
 
@@ -19,32 +55,47 @@ typedef enum {
 	VAL_I32,
 	VAL_I64,
 	VAL_POINTER,
-	VAL_DOUBLE, // must be the last - do not reorder
+	VAL_DOUBLE, /* must be the last - do not reorder */
 } MonoValueType;
 
 typedef enum {
 	MONO_ARGVAR,
 	MONO_LOCALVAR,
 	MONO_TEMPVAR,
-} MonoValueKind;
+} MonoVarType;
 
 typedef struct {
 	gpointer    previous_lmf;
 	gpointer    lmf_addr;
 	MonoMethod *method;
-	guint32     eip;
 	guint32     ebp;
 	guint32     esi;
 	guint32     edi;
 	guint32     ebx;
-
+	guint32     eip;
 } MonoLMF;
 
+typedef union {
+	struct {
+		guint16 tid; /* tree number */
+		guint16 bid; /* block number */
+	} pos ;
+	guint32 abs_pos; 
+} MonoPosition;
+
 typedef struct {
-	MonoValueType type;
-	MonoValueKind kind;
+	MonoPosition first_use, last_use;
+} MonoLiveRange;
+
+typedef struct {
+	MonoValueType type:4;
+	MonoVarType vartype:4;
+	unsigned isvolatile:1;
 	int offset;
 	int size;
+	MonoLiveRange range;
+	int reg;
+	int varnum; /* only for debugging */
 } MonoVarInfo;
 
 typedef struct {
@@ -64,14 +115,32 @@ typedef struct {
 	MBTree      **outstack;
 	gint32        outdepth;
 	gint32        addr;
+	guint16       num;
+
+	MonoBitSet   *gen_set;
+	MonoBitSet   *kill_set;
+	MonoBitSet   *live_in_set;
+	MonoBitSet   *live_out_set;
+	
+	GList        *succ;
 } MonoBBlock;
 
+typedef enum {
+	MONO_JUMP_INFO_BB,
+	MONO_JUMP_INFO_ABS,
+	MONO_JUMP_INFO_EPILOG,
+	MONO_JUMP_INFO_IP,
+} MonoJumpInfoType;
+
 typedef struct _MonoJumpInfo MonoJumpInfo;
 struct _MonoJumpInfo {
 	MonoJumpInfo *next;
 	gpointer      ip;
-	gpointer      target;
-	MonoBBlock   *bb;
+	MonoJumpInfoType type;
+	union {
+		gpointer      target;
+		MonoBBlock   *bb;
+	} data;
 };
 
 typedef struct {
@@ -82,9 +151,9 @@ typedef struct {
 	MonoBytecodeInfo *bcinfo;
 	MonoBBlock       *bblocks;
 	int               block_count;
+
 	GArray           *varinfo;
 	gint32            locals_size;
-	gint32            args_size;
 	guint16          *intvars;
 	guint16           excvar;
 
@@ -92,37 +161,39 @@ typedef struct {
 	guint8           *start;
 	guint8           *code;
 	gint32            code_size;
+	gint32            prologue_end;
+	gint32            epilogue_end;
+	gint32            lmfip_offset;
 	MonoRegSet       *rs;
 	guint32           epilog;
 	guint32           args_start_index;
 	guint32           locals_start_index;
-	gint              invalid;
-
+	gint             *spillvars; 
+	gint              spillcount;
 	MonoJumpInfo     *jump_info;
 } MonoFlowGraph;
 
 typedef struct {
-	MonoMethod *m;
-	int args_size;
-	int vtype_num;
-} MethodCallInfo;
+	MonoClass *klass;
+	MonoClassField *field;
+} MonoJitFieldInfo;
 
 typedef struct {
-	guint32  flags;
-	gpointer try_start;
-	gpointer try_end;
-	gpointer handler_start;
-	guint32  token_or_filter;
-} MonoJitExceptionInfo;
+	MonoBBlock *target;
+	guint32 cond;
+} MonoJitBranchInfo;
 
 typedef struct {
-	MonoMethod *method;
-	gpointer code_start;
-	int      code_size;
-	guint32  used_regs;
-	unsigned num_clauses;
-	MonoJitExceptionInfo *clauses;
-} MonoJitInfo;
+	guint16 size;
+	guint16 offset;
+	guint8  pad;
+} MonoJitArgumentInfo;
+
+typedef struct {
+	guint16 vtype_num;
+	guint16 frame_size;
+	guint8  pad;
+} MonoJitCallInfo;
 
 typedef struct {
 	gulong methods_compiled;
@@ -136,84 +207,115 @@ typedef struct {
 	gulong max_code_size_ratio;
 	gulong biggest_method_size;
 	gulong allocated_code_size;
+	gulong inlineable_methods;
+	gulong inlined_methods;
+	gulong basic_blocks;
+	gulong max_basic_blocks;
 	MonoMethod *max_ratio_method;
 	MonoMethod *biggest_method;
 	gboolean enabled;
 } MonoJitStats;
 
-typedef GArray MonoJitInfoTable;
+typedef struct {
+	gpointer          end_of_stack;
+	MonoLMF          *lmf;
+	void            (*abort_func) (MonoObject *object);
+} MonoJitTlsData;
 
 extern MonoJitStats mono_jit_stats;
 extern gboolean mono_jit_dump_asm;
 extern gboolean mono_jit_dump_forest;
 extern gboolean mono_jit_trace_calls;
+extern gboolean mono_jit_profile;
 extern gboolean mono_jit_share_code;
-extern MonoJitInfoTable *mono_jit_info_table;
-extern gpointer mono_end_of_stack;
+extern gboolean mono_jit_inline_code;
+extern gboolean mono_use_linear_scan;
+extern gboolean mono_use_fast_iconv;
+extern gboolean mono_break_on_exc;
+extern gboolean mono_inline_memcpy;
+extern guint32  mono_jit_tls_id;
+
+extern CRITICAL_SECTION *metadata_section;
 
-extern guint32  lmf_thread_id;
+/* architecture independent functions */
 
-MonoJitInfoTable *
-mono_jit_info_table_new    (void);
+MonoDomain * 
+mono_jit_init              (const char *file);
 
 int
-mono_jit_info_table_index  (MonoJitInfoTable *table, gpointer addr);
+mono_jit_exec              (MonoDomain *domain, MonoAssembly *assembly, 
+			    int argc, char *argv[]);
+void        
+mono_jit_cleanup           (MonoDomain *domain);
 
 void
-mono_jit_info_table_add    (MonoJitInfoTable *table, MonoJitInfo *ji);
-
-MonoJitInfo *
-mono_jit_info_table_find   (MonoJitInfoTable *table, gpointer addr);
+mono_jit_compile_image     (MonoImage *image, int verbose);
 
 void
-arch_handle_exception      (struct sigcontext *ctx, gpointer obj);
+mono_jit_compile_class     (MonoAssembly *assembly, char *compile_class,
+			    int compile_times, int verbose);
 
-gpointer 
-arch_get_throw_exception   (void);
+gpointer
+mono_jit_create_remoting_trampoline (MonoMethod *method);
+
+void
+mono_add_jump_info         (MonoFlowGraph *cfg, gpointer ip, 
+			    MonoJumpInfoType type, gpointer target);
 
 gpointer 
-arch_get_throw_exception_by_name (void);
+mono_get_lmf_addr          (void);
 
 void
-mono_jit_abort             (MonoObject *obj);
+mono_cpu_detect            (void);
 
-MonoFlowGraph *
-mono_cfg_new               (MonoMethod *method, MonoMemPool *mp);
+/* architecture dependent functions */
 
 void
-mono_cfg_free              (MonoFlowGraph *cfg);
+mono_jit_walk_stack        (MonoStackWalk func, gpointer user_data);
 
-MBTree *
-mono_ctree_new             (MonoMemPool *mp, int op, MBTree *left, 
-			    MBTree *right);
-MBTree *
-mono_ctree_new_leaf        (MonoMemPool *mp, int op);
+int
+arch_get_argument_info     (MonoMethodSignature *csig, int param_count, 
+			    MonoJitArgumentInfo *arg_info);
 
-void
-mono_analyze_flow          (MonoFlowGraph *cfg);
+MonoBoolean
+ves_icall_get_frame_info   (gint32 skip, MonoBoolean need_file_info,
+			    MonoReflectionMethod **method, 
+			    gint32 *iloffset, gint32 *native_offset,
+			    MonoString **file, gint32 *line, gint32 *column);
 
-void
-mono_analyze_stack         (MonoFlowGraph *cfg);
+MonoArray *
+ves_icall_get_trace        (MonoException *exc, gint32 skip, 
+			    MonoBoolean need_file_info);
 
-void
-mono_add_jump_info         (MonoFlowGraph *cfg, gpointer ip, 
-			    gpointer target, MonoBBlock *bb);
+gboolean
+arch_handle_exception      (struct sigcontext *ctx, gpointer obj, gboolean test_only);
 
-void
-mono_disassemble_code      (guint8 *code, int size, char *id);
+gpointer 
+arch_get_throw_exception   (void);
 
 gpointer 
-arch_compile_method        (MonoMethod *method);
+arch_get_throw_exception_by_name (void);
+
+MonoJitInfo *
+arch_jit_compile_cfg       (MonoDomain *target_domain, MonoFlowGraph *cfg);
 
 gpointer
 arch_create_jit_trampoline (MonoMethod *method);
 
-/* some handy debugging functions */
+int
+arch_allocate_arg          (MonoFlowGraph *cfg, MonoJitArgumentInfo *info, MonoValueType type);
 
-void
-mono_print_ctree           (MBTree *tree);
+int
+arch_allocate_var          (MonoFlowGraph *cfg, int size, int align, 
+			    MonoVarType vartype, MonoValueType type);
 
 void
-mono_print_forest          (GPtrArray *forest);
+mono_linear_scan           (MonoFlowGraph *cfg, guint32 *used_mask);
+
+const char *
+arch_get_reg_name          (int regnum);
+
+int 
+arch_activation_frame_size (MonoMethodSignature *sig);
 
 #endif
diff --git a/mono/jit/linear-scan.c b/mono/jit/linear-scan.c
new file mode 100644
index 00000000000..b04f2eb8e27
--- /dev/null
+++ b/mono/jit/linear-scan.c
@@ -0,0 +1,407 @@
+/*
+ * linear-scan.c: linbear scan register allocation
+ *
+ * Authors:
+ *   Dietmar Maurer (dietmar@ximian.com)
+ *   Miguel de Icaza (miguel@ximian.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+
+#include "jit.h"
+#include "codegen.h"
+#include "debug.h"
+
+//#define MNAME "nest_test"
+
+#ifdef MNAME
+#define DEGUG_LIVENESS
+#define DEBUG_LSCAN
+#endif
+
+static MonoBitSet* 
+mono_bitset_mp_new (MonoMemPool *mp,  guint32 max_size)
+{
+	int size = mono_bitset_alloc_size (max_size, 0);
+	gpointer mem;
+
+	mem = mono_mempool_alloc0 (mp, size);
+	return mono_bitset_mem_new (mem, max_size, MONO_BITSET_DONT_FREE);
+}
+
+static void
+mono_bitset_print (MonoBitSet *set)
+{
+	int i;
+
+	printf ("{");
+	for (i = 0; i < mono_bitset_size (set); i++) {
+
+		if (mono_bitset_test (set, i))
+			printf ("%d, ", i);
+
+	}
+	printf ("}");
+}
+
+static void
+mono_update_live_range (MonoFlowGraph *cfg, int varnum, int block_num, int tree_pos)
+{
+	MonoVarInfo *vi = &g_array_index (cfg->varinfo, MonoVarInfo, varnum);
+	guint32 abs_pos = (block_num << 16) | tree_pos;
+
+	if (vi->range.first_use.abs_pos > abs_pos)
+		vi->range.first_use.abs_pos = abs_pos;
+
+	if (vi->range.last_use.abs_pos < abs_pos)
+		vi->range.last_use.abs_pos = abs_pos;
+}
+
+static void
+mono_update_live_info (MonoFlowGraph *cfg)
+{
+	int i, j;
+
+	for (i = 0; i < cfg->block_count; i++) {
+		MonoBBlock *bb = &cfg->bblocks [i];
+
+		for (j = cfg->varinfo->len - 1; j > 0; j--) {
+			
+			if (mono_bitset_test (bb->live_in_set, j))
+				mono_update_live_range (cfg, j, bb->num, 0);
+
+			if (mono_bitset_test (bb->live_out_set, j))
+				mono_update_live_range (cfg, j, bb->num, bb->forest->len);
+		} 
+	} 
+}
+
+static void
+mono_update_gen_set (MonoFlowGraph *cfg, MonoBBlock *bb, MBTree *tree, 
+		     int tnum, MonoBitSet *set)
+{
+	if (tree->left) {
+		switch (tree->op) {
+		case MB_TERM_REMOTE_STIND_I1:
+		case MB_TERM_REMOTE_STIND_I2:
+		case MB_TERM_REMOTE_STIND_I4:
+		case MB_TERM_REMOTE_STIND_I8:
+		case MB_TERM_REMOTE_STIND_R4:
+		case MB_TERM_REMOTE_STIND_R8:
+		case MB_TERM_REMOTE_STIND_OBJ:
+		case MB_TERM_STIND_I1:
+		case MB_TERM_STIND_I2:
+		case MB_TERM_STIND_I4:
+		case MB_TERM_STIND_I8:
+		case MB_TERM_STIND_R4:
+		case MB_TERM_STIND_R8:
+		case MB_TERM_STIND_OBJ:
+			if (tree->left->op != MB_TERM_ADDR_L)
+				mono_update_gen_set (cfg, bb, tree->left, tnum, set);
+			else
+				mono_update_live_range (cfg, tree->left->data.i, 
+							bb->num, tnum); 
+			break;
+		default:
+			mono_update_gen_set (cfg, bb, tree->left, tnum, set);
+			break;
+		}
+	}
+
+	if (tree->right)
+		mono_update_gen_set (cfg, bb, tree->right, tnum, set);
+
+	if (tree->op == MB_TERM_ADDR_L) {
+		mono_update_live_range (cfg, tree->data.i, bb->num, tnum); 
+		mono_bitset_set (set, tree->data.i);
+	}
+} 
+
+static void
+mono_analyze_liveness (MonoFlowGraph *cfg)
+{
+	MonoBitSet *old_live_in_set, *old_live_out_set;
+	gboolean changes;
+	GList *l;
+	int i, j , max_vars = cfg->varinfo->len;
+
+#ifdef DEGUG_LIVENESS
+	int debug = !strcmp (cfg->method->name, MNAME);
+	if (debug)
+		printf ("LIVENLESS %s.%s:%s\n", cfg->method->klass->name_space,
+			cfg->method->klass->name, cfg->method->name);
+#endif
+
+	old_live_in_set = mono_bitset_new (max_vars, 0);
+	old_live_out_set = mono_bitset_new (max_vars, 0);
+
+	for (i = 0; i < cfg->block_count; i++) {
+		MonoBBlock *bb = &cfg->bblocks [i];
+
+		bb->gen_set = mono_bitset_mp_new (cfg->mp, max_vars);
+		bb->kill_set = mono_bitset_mp_new (cfg->mp, max_vars);
+		bb->live_in_set = mono_bitset_mp_new (cfg->mp, max_vars);
+		bb->live_out_set = mono_bitset_mp_new (cfg->mp, max_vars);
+
+		for (j = 0; j < bb->forest->len; j++) {
+			MBTree *t1 = (MBTree *) g_ptr_array_index (bb->forest, j);
+
+			mono_bitset_clear_all (old_live_in_set);
+			mono_update_gen_set (cfg, bb, t1, j, old_live_in_set);
+			mono_bitset_sub (old_live_in_set, bb->kill_set);
+			mono_bitset_union (bb->gen_set, old_live_in_set);
+
+			switch (t1->op) {
+			case MB_TERM_REMOTE_STIND_I1:
+			case MB_TERM_REMOTE_STIND_I2:
+			case MB_TERM_REMOTE_STIND_I4:
+			case MB_TERM_REMOTE_STIND_I8:
+			case MB_TERM_REMOTE_STIND_R4:
+			case MB_TERM_REMOTE_STIND_R8:
+			case MB_TERM_REMOTE_STIND_OBJ:
+			case MB_TERM_STIND_I1:
+			case MB_TERM_STIND_I2:
+			case MB_TERM_STIND_I4:
+			case MB_TERM_STIND_I8:
+			case MB_TERM_STIND_R4:
+			case MB_TERM_STIND_R8:
+			case MB_TERM_STIND_OBJ:
+				if (t1->left->op == MB_TERM_ADDR_L)
+					mono_bitset_set (bb->kill_set, t1->left->data.i);
+				break;
+			}
+		}
+
+#ifdef DEGUG_LIVENESS
+		if (debug) {
+			printf ("BLOCK %d (", bb->num);
+			for (l = bb->succ; l; l = l->next) {
+				MonoBBlock *t = (MonoBBlock *)l->data;
+				printf ("%d, ", t->num);
+			}
+			printf (")\n");
+			printf ("GEN  %d: ", i); mono_bitset_print (bb->gen_set); printf ("\n");
+			printf ("KILL %d: ", i); mono_bitset_print (bb->kill_set); printf ("\n");
+		}
+#endif
+	}
+	
+	do {
+		changes = FALSE;
+		for (i = 0; i < cfg->block_count; i++) {
+			MonoBBlock *bb = &cfg->bblocks [i];
+
+			mono_bitset_copyto (bb->live_in_set, old_live_in_set);
+			mono_bitset_copyto (bb->live_out_set, old_live_out_set);
+
+			mono_bitset_copyto (bb->live_out_set, bb->live_in_set);
+			mono_bitset_sub (bb->live_in_set, bb->kill_set);
+			mono_bitset_union (bb->live_in_set, bb->gen_set);
+
+			mono_bitset_clear_all (bb->live_out_set);
+			
+			for (l = bb->succ; l; l = l->next) {
+				MonoBBlock *t = (MonoBBlock *)l->data;
+				mono_bitset_union (bb->live_out_set, t->live_in_set);
+			}
+
+			if (!(mono_bitset_equal (old_live_in_set, bb->live_in_set) &&
+			      mono_bitset_equal (old_live_out_set, bb->live_out_set)))
+				changes = TRUE;
+		}
+
+	} while (changes);
+
+	mono_bitset_free (old_live_in_set);
+	mono_bitset_free (old_live_out_set);
+
+
+#ifdef DEGUG_LIVENESS
+	if (debug) {
+		for (i = 0; i < cfg->block_count; i++) {
+			MonoBBlock *bb = &cfg->bblocks [i];
+		
+			printf ("LIVE IN  %d: ", i); 
+			mono_bitset_print (bb->live_in_set); 
+			printf ("\n");
+			printf ("LIVE OUT %d: ", i); 
+			mono_bitset_print (bb->live_out_set); 
+			printf ("\n");
+		}
+	}
+#endif
+}
+
+static GList *
+mono_varlist_insert_sorted (GList *list, MonoVarInfo *vi, gboolean sort_end)
+{
+	GList *l;
+
+	if (!list)
+		return g_list_prepend (NULL, vi);
+
+	for (l = list; l; l = l->next) {
+		MonoVarInfo *v = (MonoVarInfo *)l->data;
+		
+		if (sort_end) {
+			if (vi->range.last_use.abs_pos <= v->range.last_use.abs_pos) {
+				list = g_list_insert_before (list, l, vi);
+				break;
+			}
+		} else {
+			if (vi->range.first_use.abs_pos <= v->range.first_use.abs_pos) {
+				list = g_list_insert_before (list, l, vi);
+				break;
+			}
+		}
+	}
+	if (!l)
+		list = g_list_append (list, vi);
+
+	return list;
+}
+
+void
+mono_linear_scan (MonoFlowGraph *cfg, guint32 *used_mask)
+{
+	GList *l, *ranges = NULL;
+	GList *active = NULL;
+	GList *regs = NULL;
+	int i, max_regs;
+
+#ifdef DEBUG_LSCAN
+	MonoMethod *m = cfg->method;
+	int debug = !strcmp (cfg->method->name, MNAME);
+
+	if (debug)
+		printf ("VARINFO for %s.%s:%s\n", m->klass->name_space, m->klass->name, m->name);
+#endif
+
+	mono_analyze_liveness (cfg);
+	mono_update_live_info (cfg);
+
+	for (i = 1; i < cfg->varinfo->len; i++) {
+		MonoVarInfo *vi = &g_array_index (cfg->varinfo, MonoVarInfo, i);
+
+		/* unused vars */
+		if (vi->range.first_use.abs_pos > vi->range.last_use.abs_pos)
+			continue;
+
+		/* we can only allocate 32 bit values */
+		if (vi->isvolatile || (vi->type != VAL_I32 && vi->type != VAL_POINTER))
+			continue;
+
+		ranges = mono_varlist_insert_sorted (ranges, vi, FALSE);
+
+	}
+
+#ifdef DEBUG_LSCAN
+	if (debug) {
+		for (l = ranges; l; l = l->next) {
+			MonoVarInfo *vi = (MonoVarInfo *)l->data;
+
+			printf ("VAR %d %08x %08x\n", vi->varnum, vi->range.first_use.abs_pos,  
+				vi->range.last_use.abs_pos);
+		}
+	}
+#endif
+	
+	/* we can use 2 registers for global allocation */
+	regs = g_list_prepend (regs, (gpointer)X86_EBX);
+	regs = g_list_prepend (regs, (gpointer)X86_ESI);
+
+	max_regs = g_list_length (regs);
+
+	/* linear scan */
+
+	for (l = ranges; l; l = l->next) {
+		MonoVarInfo *vi = (MonoVarInfo *)l->data;
+
+#ifdef DEBUG_LSCAN
+		if (debug)
+			printf ("START  %2d %08x %08x\n",  vi->varnum, vi->range.first_use.abs_pos, 
+				vi->range.last_use.abs_pos);
+#endif
+		/* expire old intervals in active */
+		while (active) {
+			MonoVarInfo *v = (MonoVarInfo *)active->data;
+
+			if (v->range.last_use.abs_pos >= vi->range.first_use.abs_pos)
+				break;
+
+#ifdef DEBUG_LSCAN
+			if (debug)
+				printf ("EXPIR  %2d %08x %08x\n",  v->varnum, 
+					v->range.first_use.abs_pos, v->range.last_use.abs_pos);
+#endif
+			active = g_list_remove_link (active, active);
+			regs = g_list_prepend (regs, (gpointer)v->reg);
+		}
+		
+		if (active && g_list_length (active) == max_regs) {
+			/* Spill */
+			
+			GList *a = g_list_nth (active, max_regs - 1);
+			MonoVarInfo *v = (MonoVarInfo *)a->data;
+
+			if (v->range.last_use.abs_pos > vi->range.last_use.abs_pos) {
+				vi->reg = v->reg;
+				v->reg = -1;
+				active = g_list_remove_link (active, a);
+				active = mono_varlist_insert_sorted (active, vi, TRUE);		
+#ifdef DEBUG_LSCAN
+				if (debug)
+					printf ("SPILL0 %2d %08x %08x\n",  v->varnum, 
+						v->range.first_use.abs_pos, v->range.last_use.abs_pos);
+#endif
+			} else {
+#ifdef DEBUG_LSCAN
+				if (debug)
+					printf ("SPILL1 %2d %08x %08x\n",  vi->varnum, 
+						vi->range.first_use.abs_pos, vi->range.last_use.abs_pos);
+#endif
+				vi->reg = -1;
+			}
+		} else {
+			/* assign register */
+
+			g_assert (regs);
+
+			vi->reg = (int)regs->data;
+
+			*used_mask |= 1 << vi->reg;
+
+			regs = g_list_remove_link (regs, regs);
+
+#ifdef DEBUG_LSCAN
+			if (debug)
+				printf ("ADD    %2d %08x %08x\n",  vi->varnum, 
+					vi->range.first_use.abs_pos, vi->range.last_use.abs_pos);
+#endif
+			active = mono_varlist_insert_sorted (active, vi, TRUE);		
+		}
+
+
+#ifdef DEBUG_LSCAN
+		if (debug) {
+			GList *a;
+			for (a = active; a; a = a->next) {
+				MonoVarInfo *v = (MonoVarInfo *)a->data;
+			     
+				printf ("ACT    %2d %08x %08x %d\n", v->varnum, 
+					v->range.first_use.abs_pos,  v->range.last_use.abs_pos, v->reg);
+			}
+			printf ("NEXT\n");
+		}
+#endif
+	}	
+
+	g_list_free (regs);
+	g_list_free (active);
+	g_list_free (ranges);
+
+}
+
diff --git a/mono/jit/mono.c b/mono/jit/mono.c
new file mode 100644
index 00000000000..e4e5e981cc7
--- /dev/null
+++ b/mono/jit/mono.c
@@ -0,0 +1,354 @@
+/*
+ * mono.c: Main driver for the Mono JIT engine
+ *
+ * Author:
+ *   Dietmar Maurer (dietmar@ximian.com)
+ *
+ * (C) 2001, 2002 Ximian, Inc (http://www.ximian.com)
+ */
+#include "jit.h"
+#include "regset.h"
+#include "codegen.h"
+#include "debug.h"
+#include "mono/metadata/debug-helpers.h"
+#include "mono/metadata/verify.h"
+#include "mono/metadata/profiler.h"
+#include "mono/metadata/threadpool.h"
+#include "mono/metadata/mono-config.h"
+#include <mono/metadata/profiler-private.h>
+#include <mono/metadata/cil-coff.h>
+#include <mono/os/util.h>
+
+static MonoClass *
+find_class_in_assembly (MonoAssembly *assembly, const char *namespace, const char *name)
+{
+	MonoAssembly **ptr;
+	MonoClass *class;
+
+	class = mono_class_from_name (assembly->image, namespace, name);
+	if (class)
+		return class;
+
+	for (ptr = assembly->image->references; ptr && *ptr; ptr++) {
+		class = find_class_in_assembly (*ptr, namespace, name);
+		if (class)
+			return class;
+	}
+
+	return NULL;
+}
+
+static MonoMethod *
+find_method_in_assembly (MonoAssembly *assembly, MonoMethodDesc *mdesc)
+{
+	MonoAssembly **ptr;
+	MonoMethod *method;
+
+	method = mono_method_desc_search_in_image (mdesc, assembly->image);
+	if (method)
+		return method;
+
+	for (ptr = assembly->image->references; ptr && *ptr; ptr++) {
+		method = find_method_in_assembly (*ptr, mdesc);
+		if (method)
+			return method;
+	}
+
+	return NULL;
+}
+
+/**
+ * mono_jit_compile_class:
+ * @assembly: Lookup things in this assembly
+ * @compile_class: Name of the image/class/method to compile
+ * @compile_times: Compile it that many times
+ * @verbose: If true, print debugging information on stdout.
+ *
+ * JIT compilation of the image/class/method.
+ *
+ * @compile_class can be one of:
+ *
+ * - an image name (`@corlib')
+ * - a class name (`System.Int32')
+ * - a method name (`System.Int32:Parse')
+ */
+void
+mono_jit_compile_class (MonoAssembly *assembly, char *compile_class,
+			int compile_times, int verbose)
+{
+	const char *cmethod = strrchr (compile_class, ':');
+	char *cname;
+	char *code;
+	int i, j;
+	MonoClass *class;
+	MonoDomain *domain = mono_domain_get ();
+
+	if (compile_class [0] == '@') {
+		MonoImage *image = mono_image_loaded (compile_class + 1);
+		if (!image)
+			g_error ("Cannot find image %s", compile_class + 1);
+		if (verbose)
+			g_print ("Compiling image %s\n", image->name);
+		for (j = 0; j < compile_times; ++j)
+			mono_jit_compile_image (image, verbose);
+	} else if (cmethod) {
+		MonoMethodDesc *mdesc;
+		MonoMethod *m;
+		mdesc = mono_method_desc_new (compile_class, FALSE);
+		if (!mdesc)
+			g_error ("Invalid method name '%s'", compile_class);
+		m = find_method_in_assembly (assembly, mdesc);
+		if (!m)
+			g_error ("Cannot find method '%s'", compile_class);
+		for (j = 0; j < compile_times; ++j) {
+			code = mono_compile_method (m);
+			// g_free (code);
+			g_hash_table_remove (domain->jit_code_hash, m);
+		}
+	} else {
+		cname = strrchr (compile_class, '.');
+		if (cname)
+			*cname++ = 0;
+		else {
+			cname = compile_class;
+			compile_class = (char *)"";
+		}
+		class = find_class_in_assembly (assembly, compile_class, cname);
+		if (!class)
+			g_error ("Cannot find class %s.%s", compile_class, cname);
+		mono_class_init (class);
+		for (j = 0; j < compile_times; ++j) {
+			for (i = 0; i < class->method.count; ++i) {
+				if (class->methods [i]->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL)
+					continue;
+				if (class->methods [i]->flags & METHOD_ATTRIBUTE_ABSTRACT)
+					continue;
+				if (verbose)
+					g_print ("Compiling: %s.%s:%s\n",
+						 compile_class, cname, class->methods [i]->name);
+				code = mono_compile_method (class->methods [i]);
+				g_hash_table_remove (domain->jit_code_hash, class->methods [i]);
+				// g_free (code);
+			}
+		}
+	}
+}
+
+static void
+usage (char *name)
+{
+	fprintf (stderr,
+		 "mono %s, the Mono ECMA CLI JIT Compiler, (C) 2001, 2002 Ximian, Inc.\n\n"
+		 "Usage is: %s [options] executable args...\n\n",  VERSION, name);
+	fprintf (stderr,
+		 "Runtime Debugging:\n"
+		 "    -d                 debug the jit, show disassembler output.\n"
+		 "    --dump-asm         dumps the assembly code generated\n"
+		 "    --dump-forest      dumps the reconstructed forest\n"
+		 "    --print-vtable     print the VTable of all used classes\n"
+		 "    --stats            print statistics about the jit operations\n"
+		 "    --trace            printf function call trace\n"
+		 "    --compile NAME     compile NAME, then exit.\n"
+		 "                       NAME is in one of the following formats:\n"
+		 "                         namespace.name          compile the given class\n"
+		 "                         namespace.name:method   compile the given method\n"
+		 "                         @imagename              compile the given image\n"
+		 "    --ncompile NUM     compile methods NUM times (default: 1000)\n"
+		 "\n"
+		 "Development:\n"
+		 "    --debug[=FORMAT]   write a debugging file.  FORMAT is one of:\n"
+		 "                         stabs        to write stabs information\n"
+		 "                         dwarf        to write dwarf2 information\n"
+		 "                         dwarf-plus   to write extended dwarf2 information\n"
+		 "    --debug-args ARGS  comma-separated list of additional arguments for the\n"
+		 "                       symbol writer.  See the manpage for details.\n"
+		 "    --profile          record and dump profile info\n"
+		 "    --breakonex        set a breakpoint for unhandled exception\n"
+		 "    --break NAME       insert a breakpoint at the start of method NAME\n"
+		 "                       (NAME is in `namespace.name:methodname' format\n"
+		 "                       or `Main' to break on the application's main method)\n"
+		 "    --precompile name  precompile NAME before executing the main application:\n"
+		 "                       NAME is in one of the following formats:\n"
+		 "                         namespace.name          compile the given class\n"
+		 "                         namespace.name:method   compile the given method\n"
+		 "                         @imagename              compile the given image\n"
+		 "\n"
+		 "Runtime:\n"
+		 "    --config filename  Load specified config file instead of the default.\n"
+		 "    --fast-iconv       Use fast floating point integer conversion\n"
+		 "    --noinline         Disable code inliner\n"
+		 "    --nointrinsic      Disable memcopy inliner\n"
+		 "    --nols             disable linear scan register allocation\n"
+		 "    --share-code       force jit to produce shared code\n"
+		 "    --workers n        maximum number of worker threads\n"
+		);
+	exit (1);
+}
+
+int 
+main (int argc, char *argv [])
+{
+	MonoDomain *domain;
+	MonoAssembly *assembly;
+	int retval = 0, i;
+	int compile_times = 1000;
+	char *compile_class = NULL;
+	char *debug_args = NULL;
+	char *file, *error, *config_file = NULL;
+	gboolean testjit = FALSE;
+	int verbose = FALSE;
+	GList *precompile_classes = NULL;
+	int break_on_main = FALSE;
+
+	g_log_set_always_fatal (G_LOG_LEVEL_ERROR);
+	g_log_set_fatal_mask (G_LOG_DOMAIN, G_LOG_LEVEL_ERROR);
+	
+	if (argc < 2)
+		usage (argv [0]);
+
+	for (i = 1; i < argc && argv [i][0] == '-'; i++){
+		if (strcmp (argv [i], "--help") == 0) {
+			usage (argv [0]);
+		} else if (strcmp (argv [i], "-d") == 0) {
+			testjit = TRUE;
+			mono_jit_dump_asm = TRUE;
+			mono_jit_dump_forest = TRUE;
+		} else if (strcmp (argv [i], "--dump-asm") == 0)
+			mono_jit_dump_asm = TRUE;
+		else if (strcmp (argv [i], "--dump-forest") == 0)
+			mono_jit_dump_forest = TRUE;
+		else if (strcmp (argv [i], "--trace") == 0)
+			mono_jit_trace_calls = TRUE;
+		else if (strcmp (argv [i], "--share-code") == 0)
+			mono_jit_share_code = TRUE;
+		else if (strcmp (argv [i], "--noinline") == 0)
+			mono_jit_inline_code = FALSE;
+		else if (strcmp (argv [i], "--nointrinsic") == 0)
+			mono_inline_memcpy = FALSE;
+		else if (strcmp (argv [i], "--nols") == 0)
+			mono_use_linear_scan = FALSE;
+		else if (strcmp (argv [i], "--breakonex") == 0)
+			mono_break_on_exc = TRUE;
+		else if (strcmp (argv [i], "--print-vtable") == 0)
+			mono_print_vtable = TRUE;
+		else if (strcmp (argv [i], "--break") == 0) {
+			if (!strcmp (argv [i+1], "Main")) {
+				break_on_main = TRUE;
+				i++;
+			} else {
+				MonoMethodDesc *desc = mono_method_desc_new (argv [++i], FALSE);
+				if (!desc)
+					g_error ("Invalid method name '%s'", argv [i]);
+				mono_debug_methods = g_list_append (mono_debug_methods, desc);
+			}
+		} else if (strcmp (argv [i], "--count") == 0) {
+			compile_times = atoi (argv [++i]);
+		} else if (strcmp (argv [i], "--config") == 0) {
+			config_file = argv [++i];
+		} else if (strcmp (argv [i], "--workers") == 0) {
+			mono_worker_threads = atoi (argv [++i]);
+			if (mono_worker_threads < 1)
+				mono_worker_threads = 1;
+		} else if (strcmp (argv [i], "--profile") == 0) {
+			mono_jit_profile = TRUE;
+			mono_profiler_install_simple ();
+		} else if (strcmp (argv [i], "--compile") == 0) {
+			compile_class = argv [++i];
+		} else if (strcmp (argv [i], "--ncompile") == 0) {
+			compile_times = atoi (argv [++i]);
+		} else if (strcmp (argv [i], "--stats") == 0) {
+			memset (&mono_jit_stats, 0, sizeof (MonoJitStats));
+			mono_jit_stats.enabled = TRUE;
+		} else if (strncmp (argv [i], "--debug=", 8) == 0) {
+			const char *format = &argv [i][8];
+				
+			if (mono_debug_format != MONO_DEBUG_FORMAT_NONE)
+				g_error ("You can only use one debugging format.");
+			if (strcmp (format, "stabs") == 0)
+				mono_debug_format = MONO_DEBUG_FORMAT_STABS;
+			else if (strcmp (format, "dwarf") == 0)
+				mono_debug_format = MONO_DEBUG_FORMAT_DWARF2;
+			else if (strcmp (format, "dwarf-plus") == 0)
+				mono_debug_format = MONO_DEBUG_FORMAT_DWARF2_PLUS;
+			else
+				g_error ("Unknown debugging format: %s", argv [i] + 8);
+		} else if (strcmp (argv [i], "--debug") == 0) {
+			if (mono_debug_format != MONO_DEBUG_FORMAT_NONE)
+				g_error ("You can only use one debugging format.");
+			mono_debug_format = MONO_DEBUG_FORMAT_DWARF2_PLUS;
+		} else if (strcmp (argv [i], "--debug-args") == 0) {
+			if (debug_args)
+				g_error ("You can use --debug-args only once.");
+			debug_args = argv [++i];
+		} else if (strcmp (argv [i], "--precompile") == 0) {
+			precompile_classes = g_list_append (precompile_classes, argv [++i]);
+		} else if (strcmp (argv [i], "--verbose") == 0) {
+			verbose = TRUE;;
+		} else if (strcmp (argv [i], "--fast-iconv") == 0) {
+			mono_use_fast_iconv = TRUE;
+		} else
+			usage (argv [0]);
+	}
+	
+	file = argv [i];
+
+	if (!file)
+		usage (argv [0]);
+
+	mono_config_parse (config_file);
+	mono_set_rootdir (argv [0]);
+	domain = mono_jit_init (file);
+
+	error = mono_verify_corlib ();
+	if (error) {
+		fprintf (stderr, "Corlib not in sync with this runtime: %s\n", error);
+		exit (1);
+	}
+
+	assembly = mono_domain_assembly_open (domain, file);
+	if (!assembly){
+		fprintf (stderr, "Can not open image %s\n", file);
+		exit (1);
+	}
+
+	if (mono_debug_format != MONO_DEBUG_FORMAT_NONE) {
+		MonoDebugHandle *debug;
+		gchar **args;
+
+		args = g_strsplit (debug_args ? debug_args : "", ",", -1);
+		debug = mono_debug_open (assembly, mono_debug_format, (const char **) args);
+		mono_debug_add_image (debug, assembly->image);
+		g_strfreev (args);
+	}
+
+	if (testjit) {
+		mono_jit_compile_image (assembly->image, TRUE);
+	} else if (compile_class) {
+		mono_jit_compile_class (assembly, compile_class, compile_times, TRUE);
+	} else {
+		GList *tmp;
+
+		for (tmp = precompile_classes; tmp; tmp = tmp->next)
+			mono_jit_compile_class (assembly, tmp->data, 1, verbose);
+
+		if (break_on_main) {
+			MonoImage *image = assembly->image;
+			MonoCLIImageInfo *iinfo = image->image_info;
+			MonoMethodDesc *desc;
+			MonoMethod *method;
+
+			method = mono_get_method (image, iinfo->cli_cli_header.ch_entry_point, NULL);
+			desc = mono_method_desc_from_method (method);
+			mono_debug_methods = g_list_append (mono_debug_methods, desc);
+		}
+
+		retval = mono_jit_exec (domain, assembly, argc - i, argv + i);
+	}
+
+	mono_profiler_shutdown ();
+	mono_jit_cleanup (domain);
+
+	return retval;
+}
+
+
diff --git a/mono/jit/regset.h b/mono/jit/regset.h
index 27a87c72d20..2cb0060469d 100644
--- a/mono/jit/regset.h
+++ b/mono/jit/regset.h
@@ -1,3 +1,10 @@
+/*
+ * Author:
+ *   Dietmar Maurer (dietmar@ximian.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
 #ifndef _MONO_JIT_REGSET_H_
 #define _MONO_JIT_REGSET_H_
 
diff --git a/mono/jit/trampoline.c b/mono/jit/trampoline.c
new file mode 100644
index 00000000000..4d364992c3a
--- /dev/null
+++ b/mono/jit/trampoline.c
@@ -0,0 +1,270 @@
+/*
+ * trampoline.c: JIT trampoline code
+ *
+ * Authors:
+ *   Dietmar Maurer (dietmar@ximian.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+
+#include <mono/metadata/appdomain.h>
+#include <mono/metadata/tabledefs.h>
+#include <mono/arch/x86/x86-codegen.h>
+
+#include "jit.h"
+#include "codegen.h"
+
+/*
+ * get_unbox_trampoline:
+ * @m: method pointer
+ * @addr: pointer to native code for @m
+ *
+ * when value type methods are called through the vtable we need to unbox the
+ * this argument. This method returns a pointer to a trampoline which does
+ * unboxing before calling the method
+ */
+static gpointer
+get_unbox_trampoline (MonoMethod *m, gpointer addr)
+{
+	guint8 *code, *start;
+	int this_pos = 4;
+
+	if (!m->signature->ret->byref && m->signature->ret->type == MONO_TYPE_VALUETYPE)
+		this_pos = 8;
+	    
+	start = code = g_malloc (16);
+
+	x86_alu_membase_imm (code, X86_ADD, X86_ESP, this_pos, sizeof (MonoObject));
+	x86_jump_code (code, addr);
+	g_assert ((code - start) < 16);
+
+	return start;
+}
+
+/**
+ * x86_magic_trampoline:
+ * @eax: saved x86 register 
+ * @ecx: saved x86 register 
+ * @edx: saved x86 register 
+ * @esi: saved x86 register 
+ * @edi: saved x86 register 
+ * @ebx: saved x86 register
+ * @code: pointer into caller code
+ * @method: the method to translate
+ *
+ * This method is called by the trampoline functions for virtual
+ * methods. It inspects the caller code to find the address of the
+ * vtable slot, then calls the JIT compiler and writes the address
+ * of the compiled method back to the vtable. All virtual methods 
+ * are called with: x86_call_membase (inst, basereg, disp). We always
+ * use 32 bit displacement to ensure that the length of the call 
+ * instruction is 6 bytes. We need to get the value of the basereg 
+ * and the constant displacement.
+ */
+static gpointer
+x86_magic_trampoline (int eax, int ecx, int edx, int esi, int edi, 
+		      int ebx, guint8 *code, MonoMethod *m)
+{
+	guint8 reg;
+	gint32 disp;
+	char *o;
+	gpointer addr;
+
+	EnterCriticalSection (metadata_section);
+	addr = mono_compile_method (m);
+	LeaveCriticalSection (metadata_section);
+	g_assert (addr);
+
+	/* go to the start of the call instruction
+	 *
+	 * address_byte = (m << 6) | (o << 3) | reg
+	 * call opcode: 0xff address_byte displacement
+	 * 0xff m=1,o=2 imm8
+	 * 0xff m=2,o=2 imm32
+	 */
+	code -= 6;
+	if ((code [1] != 0xe8) && (code [3] == 0xff) && ((code [4] & 0x18) == 0x10) && ((code [4] >> 6) == 1)) {
+		reg = code [4] & 0x07;
+		disp = (signed char)code [5];
+	} else {
+		if ((code [0] == 0xff) && ((code [1] & 0x18) == 0x10) && ((code [1] >> 6) == 2)) {
+			reg = code [1] & 0x07;
+			disp = *((gint32*)(code + 2));
+		} else if ((code [1] == 0xe8)) {
+			*((guint32*)(code + 2)) = (guint)addr - ((guint)code + 1) - 5; 
+			return addr;
+		} else {
+			printf ("%x %x %x %x %x %x \n", code [0], code [1], code [2], code [3],
+				code [4], code [5]);
+			g_assert_not_reached ();
+		}
+	}
+
+	switch (reg) {
+	case X86_EAX:
+		o = (gpointer)eax;
+		break;
+	case X86_EDX:
+		o = (gpointer)edx;
+		break;
+	case X86_ECX:
+		o = (gpointer)ecx;
+		break;
+	case X86_ESI:
+		o = (gpointer)esi;
+		break;
+	case X86_EDI:
+		o = (gpointer)edi;
+		break;
+	case X86_EBX:
+		o = (gpointer)ebx;
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+
+	o += disp;
+
+	if (m->klass->valuetype) {
+		return *((gpointer *)o) = get_unbox_trampoline (m, addr);
+	} else {
+		return *((gpointer *)o) = addr;
+	}
+}
+
+/**
+ * arch_create_jit_trampoline:
+ * @method: pointer to the method info
+ *
+ * Creates a trampoline function for virtual methods. If the created
+ * code is called it first starts JIT compilation of method,
+ * and then calls the newly created method. I also replaces the
+ * corresponding vtable entry (see x86_magic_trampoline).
+ * 
+ * Returns: a pointer to the newly created code 
+ */
+gpointer
+arch_create_jit_trampoline (MonoMethod *method)
+{
+	MonoDomain *domain = mono_domain_get ();
+	guint8 *code, *buf;
+	static guint8 *vc = NULL;
+	GHashTable *jit_code_hash;
+
+	/* previously created trampoline code */
+	if (method->info)
+		return method->info;
+
+	/* we immediately compile runtime provided functions */
+	if (method->iflags & METHOD_IMPL_ATTRIBUTE_RUNTIME) {
+		method->info = mono_compile_method (method);
+		return method->info;
+	}
+
+	/* icalls use method->addr */
+	if ((method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
+	    (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL)) {
+		MonoMethod *nm;
+		
+		nm = mono_marshal_get_native_wrapper (method);
+		method->info = mono_compile_method (nm);
+		return method->info;
+	}
+
+	/* check if we already have JITed code */
+	if (mono_jit_share_code)
+		jit_code_hash = mono_root_domain->jit_code_hash;
+	else
+		jit_code_hash = domain->jit_code_hash;
+
+	if ((code = g_hash_table_lookup (jit_code_hash, method))) {
+		mono_jit_stats.methods_lookups++;
+		return code;
+	}
+
+	if (!vc) {
+		vc = buf = g_malloc (256);
+		/* save caller save regs because we need to do a call */ 
+		x86_push_reg (buf, X86_EDX);
+		x86_push_reg (buf, X86_EAX);
+		x86_push_reg (buf, X86_ECX);
+
+		/* save LMF begin */
+
+		/* save the IP (caller ip) */
+		x86_push_membase (buf, X86_ESP, 16);
+
+		x86_push_reg (buf, X86_EBX);
+		x86_push_reg (buf, X86_EDI);
+		x86_push_reg (buf, X86_ESI);
+		x86_push_reg (buf, X86_EBP);
+
+		/* save method info */
+		x86_push_membase (buf, X86_ESP, 32);
+		/* get the address of lmf for the current thread */
+		x86_call_code (buf, mono_get_lmf_addr);
+		/* push lmf */
+		x86_push_reg (buf, X86_EAX); 
+		/* push *lfm (previous_lmf) */
+		x86_push_membase (buf, X86_EAX, 0);
+		/* *(lmf) = ESP */
+		x86_mov_membase_reg (buf, X86_EAX, 0, X86_ESP, 4);
+		/* save LFM end */
+
+		/* push the method info */
+		x86_push_membase (buf, X86_ESP, 44);
+		/* push the return address onto the stack */
+		x86_push_membase (buf, X86_ESP, 52);
+
+		/* save all register values */
+		x86_push_reg (buf, X86_EBX);
+		x86_push_reg (buf, X86_EDI);
+		x86_push_reg (buf, X86_ESI);
+		x86_push_membase (buf, X86_ESP, 64); /* EDX */
+		x86_push_membase (buf, X86_ESP, 64); /* ECX */
+		x86_push_membase (buf, X86_ESP, 64); /* EAX */
+
+		x86_call_code (buf, x86_magic_trampoline);
+		x86_alu_reg_imm (buf, X86_ADD, X86_ESP, 8*4);
+
+		/* restore LMF start */
+		/* ebx = previous_lmf */
+		x86_pop_reg (buf, X86_EBX);
+		/* edi = lmf */
+		x86_pop_reg (buf, X86_EDI);
+		/* *(lmf) = previous_lmf */
+		x86_mov_membase_reg (buf, X86_EDI, 0, X86_EBX, 4);
+		/* discard method info */
+		x86_pop_reg (buf, X86_ESI);
+		/* restore caller saved regs */
+		x86_pop_reg (buf, X86_EBP);
+		x86_pop_reg (buf, X86_ESI);
+		x86_pop_reg (buf, X86_EDI);
+		x86_pop_reg (buf, X86_EBX);
+		/* discard save IP */
+		x86_alu_reg_imm (buf, X86_ADD, X86_ESP, 4);		
+		/* restore LMF end */
+
+		x86_alu_reg_imm (buf, X86_ADD, X86_ESP, 16);
+
+		/* call the compiled method */
+		x86_jump_reg (buf, X86_EAX);
+
+		g_assert ((buf - vc) <= 256);
+	}
+
+	code = buf = g_malloc (16);
+	x86_push_imm (buf, method);
+	x86_jump_code (buf, vc);
+	g_assert ((buf - code) <= 16);
+
+	/* store trampoline address */
+	method->info = code;
+
+	mono_jit_stats.method_trampolines++;
+
+	return code;
+}
diff --git a/mono/jit/win32-exception.c b/mono/jit/win32-exception.c
new file mode 100644
index 00000000000..7d71e63e6f7
--- /dev/null
+++ b/mono/jit/win32-exception.c
@@ -0,0 +1,104 @@
+/*
+ * win32-exception.c: Win32 SEH filter.
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#include "win32-exception.h"
+
+#ifdef PLATFORM_WIN32
+
+#include <glib.h>
+
+
+LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep);
+
+static MonoW32ExceptionHandler fpe_handler;
+static MonoW32ExceptionHandler ill_handler;
+static MonoW32ExceptionHandler segv_handler;
+
+static LPTOP_LEVEL_EXCEPTION_FILTER old_handler;
+
+#define W32_SEH_COPY_CONTEXT \
+	sctx->eax = ctx->Eax;\
+	sctx->ebx = ctx->Ebx;\
+	sctx->ecx = ctx->Ecx;\
+	sctx->edx = ctx->Edx;\
+	sctx->ebp = ctx->Ebp;\
+	sctx->esp = ctx->Esp;\
+	sctx->esi = ctx->Esi;\
+	sctx->edi = ctx->Edi;\
+	sctx->eip = ctx->Eip;
+
+#define W32_SEH_HANDLE_EX(_ex) \
+	if (_ex##_handler) _ex##_handler((int)sctx)
+
+/*
+ * Unhandled Exception Filter
+ * Top-level per-process exception handler.
+ */
+LONG CALLBACK seh_handler(EXCEPTION_POINTERS* ep)
+{
+	EXCEPTION_RECORD* er;
+	CONTEXT* ctx;
+	struct sigcontext* sctx;
+	LONG res;
+
+	res = EXCEPTION_CONTINUE_SEARCH;
+
+	er = ep->ExceptionRecord;
+	ctx = ep->ContextRecord;
+	sctx = g_malloc(sizeof(struct sigcontext));
+	W32_SEH_COPY_CONTEXT
+
+	switch (er->ExceptionCode) {
+	case EXCEPTION_ACCESS_VIOLATION:
+		W32_SEH_HANDLE_EX(segv);
+		break;
+	case EXCEPTION_ILLEGAL_INSTRUCTION:
+		W32_SEH_HANDLE_EX(ill);
+		break;
+	case EXCEPTION_INT_DIVIDE_BY_ZERO:
+	case EXCEPTION_INT_OVERFLOW:
+	case EXCEPTION_FLT_DIVIDE_BY_ZERO:
+	case EXCEPTION_FLT_OVERFLOW:
+	case EXCEPTION_FLT_UNDERFLOW:
+	case EXCEPTION_FLT_INEXACT_RESULT:
+		W32_SEH_HANDLE_EX(fpe);
+		break;
+	default:
+		break;
+	}
+
+	return res;
+}
+
+void win32_seh_init()
+{
+	old_handler = SetUnhandledExceptionFilter(seh_handler);
+}
+
+void win32_seh_cleanup()
+{
+	if (old_handler) SetUnhandledExceptionFilter(old_handler);
+}
+
+void win32_seh_set_handler(int type, MonoW32ExceptionHandler handler)
+{
+	switch (type) {
+	case SIGFPE:
+		fpe_handler = handler;
+		break;
+	case SIGILL:
+		ill_handler = handler;
+		break;
+	case SIGSEGV:
+		segv_handler = handler;
+		break;
+	default:
+		break;
+	}
+}
+
+#endif /* PLATFORM_WIN32 */
+
diff --git a/mono/jit/win32-exception.h b/mono/jit/win32-exception.h
new file mode 100644
index 00000000000..44b0f8bb951
--- /dev/null
+++ b/mono/jit/win32-exception.h
@@ -0,0 +1,58 @@
+#ifndef _MONO_WIN32_EXCEPTION_H_
+#define _MONO_WIN32_EXCEPTION_H_
+
+#include <config.h>
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+
+#ifdef PLATFORM_WIN32
+
+#include <windows.h>
+
+/* use SIG* defines if possible */
+#ifdef HAVE_SIGNAL_H
+#include <signal.h>
+#endif
+
+/* sigcontext surrogate */
+struct sigcontext {
+	unsigned int eax;
+	unsigned int ebx;
+	unsigned int ecx;
+	unsigned int edx;
+	unsigned int ebp;
+	unsigned int esp;
+	unsigned int esi;
+	unsigned int edi;
+	unsigned int eip;
+};
+
+
+typedef void (* MonoW32ExceptionHandler) (int);
+void win32_seh_init(void);
+void win32_seh_cleanup(void);
+void win32_seh_set_handler(int type, MonoW32ExceptionHandler handler);
+
+#ifndef SIGFPE
+#define SIGFPE 4
+#endif
+
+#ifndef SIGILL
+#define SIGILL 8
+#endif
+
+#ifndef	SIGSEGV
+#define	SIGSEGV 11
+#endif
+
+#endif /* PLATFORM_WIN32 */
+
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* _MONO_WIN32_EXCEPTION_H_ */
diff --git a/mono/jit/x86.brg b/mono/jit/x86.brg
index 993ffd93ae7..902a3270731 100644
--- a/mono/jit/x86.brg
+++ b/mono/jit/x86.brg
@@ -7,11 +7,16 @@
  * (C) 2001 Ximian, Inc.
  */
 
+#include <config.h>
+
 #include <glib.h>
 #include <stdio.h>
 #include <string.h>
+#include <math.h>
+#ifndef PLATFORM_WIN32
 #include <signal.h>
 #include <sys/syscall.h>
+#endif
 
 #include <mono/metadata/blob.h>
 #include <mono/metadata/metadata.h>
@@ -19,11 +24,30 @@
 #include <mono/metadata/object.h>
 #include <mono/metadata/tabledefs.h>
 #include <mono/metadata/appdomain.h>
+#include <mono/metadata/marshal.h>
+#include <mono/metadata/threads.h>
 #include <mono/arch/x86/x86-codegen.h>
 
 #include "regset.h"
 #include "jit.h"
 
+/*
+ * Pull the list of opcodes
+ */
+#define OPDEF(a,b,c,d,e,f,g,h,i,j) \
+	a = i,
+
+enum {
+#include "mono/cil/opcode.def"
+	LAST = 0xff
+};
+#undef OPDEF
+
+/* alignment of activation frames */
+#define MONO_FRAME_ALIGNMENT 4
+
+void print_lmf (void);
+
 #define MBTREE_TYPE  MBTree
 #define MBCGEN_TYPE  MonoFlowGraph
 #define MBCOST_DATA  MonoFlowGraph
@@ -46,7 +70,8 @@ typedef	struct {
 
 struct _MBTree {
 	guint16   op;
-	unsigned      last_instr:1;
+	unsigned  last_instr:1;
+	unsigned  spilled:1;
 	
 	MBTree   *left, *right;
 	gpointer  state;
@@ -55,8 +80,6 @@ struct _MBTree {
 	gint32    addr;
 	gint32    cli_addr;
 
-	guint8    exclude_mask;
-
 	gint8     reg1;
 	gint8     reg2;
 	gint8     reg3;
@@ -67,11 +90,15 @@ struct _MBTree {
 		gint32 i;
 		gint64 l;
 		gpointer p;
-		MonoBBlock *bb;
 		MonoMethod *m;
-		MethodCallInfo *ci;
+		MonoBBlock *bb;
 		MonoClass *klass;
+		MonoClassField *field;
 		X86AddressInfo ainfo;
+		MonoJitFieldInfo fi;
+		MonoJitBranchInfo bi;
+		MonoJitCallInfo call_info;	  
+		MonoJitArgumentInfo arg_info;	  
 	} data;
 };
 
@@ -84,16 +111,21 @@ guint64  mono_lldiv_un      (guint64 a, guint64 b);
 guint64  mono_llrem_un      (guint64 a, guint64 b);
 gpointer mono_ldsflda       (MonoClass *klass, int offset);
 
-gpointer arch_get_lmf_addr (void);
+gpointer mono_ldvirtftn     (MonoObject *this, int slot);
+gpointer mono_ldintftn      (MonoObject *this, int slot);
+gpointer mono_ldftn         (MonoMethod *method);
+
+void mono_emit_fast_iconv        (MBCGEN_TYPE* s, MBTREE_TYPE* tree);
+void mono_emit_fast_iconv_i8     (MBCGEN_TYPE* s, MBTREE_TYPE* tree);
+void mono_emit_stack_alloc       (MBCGEN_TYPE* s, MBTREE_TYPE* tree);
+void mono_emit_stack_alloc_const (MBCGEN_TYPE* s, MBTREE_TYPE* tree, int size);
 
 MonoArray*
 mono_array_new_wrapper  (MonoClass *eclass, guint32 n);
 MonoObject *
 mono_object_new_wrapper (MonoClass *klass);
 MonoString*
-mono_string_new_wrapper (const char *text);
-MonoString*
-mono_ldstr_wrapper      (MonoImage *image, guint32 index);
+mono_ldstr_wrapper      (MonoImage *image, guint32 ind);
 
 gpointer
 get_mono_object_isinst (void);
@@ -116,7 +148,7 @@ get_mono_object_isinst (void);
 //#define DEBUG
 
 #define REAL_PRINT_REG(text,reg) \
-g_assert (reg >= 0); \
+mono_assert (reg >= 0); \
 x86_push_reg (s->code, X86_EAX); \
 x86_push_reg (s->code, X86_EDX); \
 x86_push_reg (s->code, X86_ECX); \
@@ -128,12 +160,13 @@ x86_call_reg (s->code, X86_EAX); \
 x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 3*4); \
 x86_pop_reg (s->code, X86_ECX); \
 x86_pop_reg (s->code, X86_EDX); \
-x86_pop_reg (s->code, X86_EAX); 
+x86_pop_reg (s->code, X86_EAX);
 
-#ifdef DEBUG
-#define MEMCOPY debug_memcpy
-void *MEMCOPY (void *dest, const void *src, size_t n);
+void *
+debug_memcopy (void *dest, const void *src, size_t n);
 
+#ifdef DEBUG
+#define MEMCOPY debug_memcopy
 #define PRINT_REG(text,reg) REAL_PRINT_REG(text,reg)
 #else
 
@@ -160,35 +193,91 @@ void *MEMCOPY (void *dest, const void *src, size_t n);
 	        x86_branch8 (s->code, cond, 10, signed);       \
 	        x86_push_imm (s->code, exc_name);              \
 		t = arch_get_throw_exception_by_name ();       \
-		mono_add_jump_info (s, s->code + 1, t, NULL);  \
+		mono_add_jump_info (s, s->code,                \
+                                    MONO_JUMP_INFO_ABS, t);    \
 	        x86_call_code (s->code, 0);                    \
 	} while (0); 
 
+#define X86_ARG_PAD(pad) do {                                               \
+	if (pad) {                                                          \
+		if (pad == 4)                                               \
+			x86_push_reg (s->code, X86_EAX);                    \
+		else                                                        \
+			x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, pad);   \
+	}                                                                   \
+} while (0)
+
+#define X86_CALL_END    do {                                       \
+        int size = tree->data.call_info.frame_size;                \
+        if (size)                                                  \
+	        x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, size); \
+} while (0)
+
+#define X86_CALL_BEGIN  do {                                                     \
+        int pad = tree->data.call_info.pad;                                      \
+        X86_ARG_PAD (pad);                                                       \
+	if (tree->left->op != MB_TERM_NOP) {                                     \
+		mono_assert (lreg >= 0);                                         \
+		x86_push_reg (s->code, lreg);                                    \
+		x86_alu_membase_imm (s->code, X86_CMP, lreg, 0, 0);              \
+	}                                                                        \
+	if (tree->data.call_info.vtype_num) {                                    \
+		int offset = VARINFO (s, tree->data.call_info.vtype_num).offset; \
+		x86_lea_membase (s->code, treg, X86_EBP, offset);                \
+		x86_push_reg (s->code, treg);                                    \
+	}                                                                        \
+} while (0)
+
+/* we use this macro to move one lreg to another - source and
+   destination may overlap, but the register allocator has to
+   make sure that ((d1 < d2) && (s1 < s2))
+*/
+#define MOVE_LREG(d1,d2,s1,s2)                                        \
+        do {                                                          \
+	        g_assert ((d1 < d2) && (s1 < s2));                    \
+	        if ((d1) <= (s1)) {                                   \
+			if ((d1) != (s1))                             \
+				x86_mov_reg_reg (s->code, d1, s1, 4); \
+			if ((d2) != (s2))                             \
+				x86_mov_reg_reg (s->code, d2, s2, 4); \
+		} else {                                              \
+			if ((d2) != (s2))                             \
+				x86_mov_reg_reg (s->code, d2, s2, 4); \
+			if ((d1) != (s1))                             \
+				x86_mov_reg_reg (s->code, d1, s1, 4); \
+		}                                                     \
+	} while (0); 
+        
+
 %%
 
 #
 # terminal definitions
 #
 
-# constatnts
+# constants
 %term CONST_I4 CONST_I8 CONST_R4 CONST_R8
-%term LDIND_I1 LDIND_U1 LDIND_I2 LDIND_U2 LDIND_I4 LDIND_REF LDIND_I8 LDIND_R4 LDIND_R8
-%term LDIND_U4 LDIND_OBJ 
-%term STIND_I1 STIND_I2 STIND_I4 STIND_REF STIND_I8 STIND_R4 STIND_R8 STIND_OBJ
-%term ADDR_L ADDR_G ARG_I4 ARG_I8 ARG_R4 ARG_R8 ARG_OBJ ARG_STRING CALL_I4 CALL_I8 CALL_R8 CALL_VOID
-%term BREAK SWITCH BR RET_VOID RET RET_OBJ ENDFINALLY
+%term LDIND_I1 LDIND_U1 LDIND_I2 LDIND_U2 LDIND_I4 LDIND_I8 LDIND_R4 LDIND_R8 LDIND_OBJ 
+%term STIND_I1 STIND_I2 STIND_I4 STIND_I8 STIND_R4 STIND_R8 STIND_OBJ
+%term ADDR_L ADDR_G ARG_I4 ARG_I8 ARG_R4 ARG_R8 ARG_OBJ CALL_I4 CALL_I8 CALL_R8 CALL_VOID
+%term BREAK SWITCH BR RET_VOID RET RET_OBJ ENDFINALLY ENDFILTER JMP
 %term ADD ADD_OVF ADD_OVF_UN SUB SUB_OVF SUB_OVF_UN MUL MUL_OVF MUL_OVF_UN 
-%term DIV DIV_UN REM REM_UN AND OR XOR SHL SHR SHR_UN NEG NOT
-%term BLT BLT_UN BEQ BNE_UN BRTRUE BRFALSE BGE BGE_UN BLE BLE_UN BGT BGT_UN 
-%term CEQ CLT CLT_UN CGT CGT_UN
-%term CONV_I4 CONV_I1 CONV_I2 CONV_I8 CONV_U8 CONV_R4 CONV_R8
-%term INTF_ADDR VFUNC_ADDR NOP NEWARR NEWOBJ NEWSTRUCT CPOBJ POP INITOBJ
+%term DIV DIV_UN REM REM_UN AND OR XOR SHL SHR SHR_UN NEG NOT CKFINITE
+%term COMPARE CBRANCH BRTRUE BRFALSE CSET
+%term CONV_I4 CONV_I1 CONV_I2 CONV_I8 CONV_U1 CONV_U2 CONV_U4 CONV_U8 CONV_R4 CONV_R8 CONV_R_UN
+%term INTF_ADDR VFUNC_ADDR NOP NEWARR NEWARR_SPEC NEWOBJ NEWOBJ_SPEC
+%term INITBLK CPBLK CPSRC POP INITOBJ LOCALLOC
 %term ISINST CASTCLASS UNBOX
 %term CONV_OVF_I1 CONV_OVF_U1 CONV_OVF_I2 CONV_OVF_U2 CONV_OVF_U4 CONV_OVF_U8 CONV_OVF_I4
 %term CONV_OVF_I4_UN CONV_OVF_U1_UN CONV_OVF_U2_UN
 %term CONV_OVF_I2_UN CONV_OVF_I8_UN CONV_OVF_I1_UN 
-%term EXCEPTION THROW RETHROW HANDLER SAVE_LMF RESTORE_LMF
-%term LDLEN LDELEMA LDFTN TOSTRING LDSTR LDSFLDA
+%term EXCEPTION THROW RETHROW HANDLER CHECKTHIS RETHROW_ABORT
+%term LDLEN LDELEMA LDFTN LDVIRTFTN LDSTR LDSFLDA
+%term REMOTE_LDFLDA REMOTE_STIND_I1 REMOTE_STIND_I2 REMOTE_STIND_I4
+%term REMOTE_STIND_I8 REMOTE_STIND_R4 REMOTE_STIND_R8 REMOTE_STIND_OBJ
+%term SIN COS SQRT
+
+%term FUNC1 PROC2 PROC3 FREE OBJADDR VTADDR
 
 #
 # we start at stmt
@@ -226,16 +315,19 @@ base: reg {
 	tree->data.ainfo.amode = AMBase;
 }
 
-base: ADD (reg, acon) {
+base: ADD (reg, CONST_I4) {
 	tree->data.ainfo.offset = tree->right->data.i;
 	tree->data.ainfo.basereg = tree->left->reg1;
 	tree->data.ainfo.amode = AMBase;
 }
 
 base: ADDR_L {
-	tree->data.ainfo.offset = g_array_index (s->varinfo, MonoVarInfo, tree->data.i).offset;
+	tree->data.ainfo.offset = VARINFO (s, tree->data.i).offset;
 	tree->data.ainfo.basereg = X86_EBP;
 	tree->data.ainfo.amode = AMBase;
+} cost {
+	MBCOND (VARINFO (data, tree->data.i).reg < 0);
+	return 0;
 }
 
 index: reg {
@@ -290,7 +382,7 @@ addr: ADD (index, base) {
 
 # we pass exception in ECX to catch handler
 reg: EXCEPTION {
-	int offset = g_array_index (s->varinfo, MonoVarInfo, tree->data.i).offset;
+	int offset = VARINFO (s, tree->data.i).offset;
 
 	if (tree->reg1 != X86_ECX)
 		x86_mov_reg_reg (s->code, tree->reg1, X86_ECX, 4);
@@ -304,101 +396,182 @@ stmt: THROW (reg) {
 
 	x86_push_reg (s->code, tree->left->reg1);
 	target = arch_get_throw_exception ();
-	mono_add_jump_info (s, s->code + 1, target, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, target);
 	x86_call_code (s->code, target);
 }
 
 stmt: RETHROW {
-	int offset = g_array_index (s->varinfo, MonoVarInfo, tree->data.i).offset;
+	int offset = VARINFO (s, tree->data.i).offset;
 	gpointer target;
 
 	x86_push_membase (s->code, X86_EBP, offset);
+
 	target = arch_get_throw_exception ();
-	mono_add_jump_info (s, s->code + 1, target, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, target);
 	x86_call_code (s->code, target);
 }
 
+stmt: RETHROW_ABORT {
+	guint8 *br;
+	gpointer target;
+
+	target = mono_thread_current;
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, target);
+	x86_call_code (s->code, target);
+
+	x86_mov_reg_membase (s->code, X86_EAX, X86_EAX, G_STRUCT_OFFSET (MonoThread, abort_exc), 4);
+	x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0);
+	/* check for NULL */
+	br = s->code; x86_branch8 (s->code, X86_CC_EQ, 0, FALSE);
+
+	x86_push_reg (s->code, X86_EAX);
+
+	target = arch_get_throw_exception ();
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, target);
+	x86_call_code (s->code, target);
+	
+	x86_patch (br, s->code);
+}
+
 stmt: HANDLER {
-	mono_add_jump_info (s, s->code + 1, NULL, tree->data.bb);
+	/* save ESP (used by ENDFINALLY) */
+	x86_mov_membase_reg (s->code, X86_EBP, mono_exc_esp_offset, X86_ESP, 4);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bb);
 	x86_call_imm (s->code, 0); 
 }
 
 stmt: ENDFINALLY {
+	/* restore ESP - which can be modified when we allocate value types
+	 * in the finally handler */
+	x86_mov_reg_membase (s->code, X86_ESP, X86_EBP, mono_exc_esp_offset, 4);
+	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
 	x86_ret (s->code);
 }
 
-stmt: SAVE_LMF {
-	/* save all caller saved regs */
-	x86_push_reg (s->code, X86_EBX);
-	x86_push_reg (s->code, X86_EDI);
-	x86_push_reg (s->code, X86_ESI);
-	x86_push_reg (s->code, X86_EBP);
+stmt: ENDFILTER (reg) {
+	/* restore ESP - which can be modified when we allocate value types
+	 * in the filter */
+	x86_mov_reg_membase (s->code, X86_ESP, X86_EBP, mono_exc_esp_offset, 4);
+	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+	if (tree->left->reg1 != X86_EAX)
+		x86_mov_reg_reg (s->code, X86_EAX, tree->left->reg1, 4);	     
+	x86_ret (s->code);
+}
 
-	/* save the IP */
-	x86_push_imm (s->code, s->code);
+stmt: STIND_I4 (ADDR_L, ADD (LDIND_I4 (ADDR_L), CONST_I4)) {
+	int vn = tree->left->data.i;
+	int treg = VARINFO (s, vn).reg;
+	int offset = VARINFO (s, vn).offset;
+	int data = tree->right->right->data.i;
 
-	/* save method info */
-	x86_push_imm (s->code, tree->data.m);
-	/* get the address of lmf for the current thread */
-	mono_add_jump_info (s, s->code + 1, arch_get_lmf_addr, NULL);
-	x86_call_code (s->code, arch_get_lmf_addr);
-	/* push lmf */
-	x86_push_reg (s->code, X86_EAX); 
-	/* push *lfm (previous_lmf) */
-	x86_push_membase (s->code, X86_EAX, 0);
-	/* *(lmf) = ESP */
-	x86_mov_membase_reg (s->code, X86_EAX, 0, X86_ESP, 4);
-}
-
-stmt: RESTORE_LMF {
-	/* ebx = previous_lmf */
-	x86_pop_reg (s->code, X86_EBX);
-	/* edi = lmf */
-	x86_pop_reg (s->code, X86_EDI);
-	/* *(lmf) = previous_lmf */
-	x86_mov_membase_reg (s->code, X86_EDI, 0, X86_EBX, 4);
-
-	/* discard method info */
-	x86_pop_reg (s->code, X86_ESI);
-
-	/* discard save IP */
-	x86_pop_reg (s->code, X86_ESI);
-
-	/* restore caller saved regs */
-	x86_pop_reg (s->code, X86_EBP);
-	x86_pop_reg (s->code, X86_ESI);
-	x86_pop_reg (s->code, X86_EDI);
-	x86_pop_reg (s->code, X86_EBX);
+	if (data == 1) {
+		if (treg >= 0)
+			x86_inc_reg (s->code, treg);
+		else 
+			x86_inc_membase (s->code, X86_EBP, offset);
+	} else {
+		if (treg >= 0)
+			x86_alu_reg_imm (s->code, X86_ADD, treg, data);
+		else
+			x86_alu_membase_imm (s->code, X86_ADD, X86_EBP, offset, data);
+	}
+} cost {
+	MBCOND (tree->right->left->left->data.i == tree->left->data.i);
+	return 0;
 }
 
-stmt: STIND_I4 (addr, reg) {
-	PRINT_REG ("STIND_I4", tree->right->reg1);
+stmt: STIND_I4 (ADDR_L, SUB (LDIND_I4 (ADDR_L), CONST_I4)) {
+	int vn = tree->left->data.i;
+	int treg = VARINFO (s, vn).reg;
+	int offset = VARINFO (s, vn).offset;
+	int data = tree->right->right->data.i;
+
+	if (data == 1) {
+		if (treg >= 0)
+			x86_dec_reg (s->code, treg);
+		else 
+			x86_dec_membase (s->code, X86_EBP, offset);
+	} else {
+		if (treg >= 0)
+			x86_alu_reg_imm (s->code, X86_SUB, treg, data);
+		else
+			x86_alu_membase_imm (s->code, X86_SUB, X86_EBP, offset, data);
+	}
+} cost {
+	MBCOND (tree->right->left->left->data.i == tree->left->data.i);
+	return 0;
+}
+
+stmt: STIND_I4 (ADDR_L, ADD (LDIND_I4 (ADDR_L), reg)) {
+	int vn = tree->left->data.i;
+	int treg = VARINFO (s, vn).reg;
+	int sreg = tree->right->right->reg1;
+	int offset = VARINFO (s, vn).offset;
+
+	if (treg >= 0)
+		x86_alu_reg_reg (s->code, X86_ADD, treg, sreg);
+	else
+		x86_alu_membase_reg (s->code, X86_ADD, X86_EBP, offset, sreg);
+
+} cost {
+	MBCOND (tree->right->left->left->data.i == tree->left->data.i);
+	return 0;
+}
+
+stmt: STIND_I4 (ADDR_L, LDIND_I4 (ADDR_L)) {
+	int treg1 = VARINFO (s, tree->left->data.i).reg;
+	int treg2 = VARINFO (s, tree->right->left->data.i).reg;
+	int offset1 = VARINFO (s, tree->left->data.i).offset;
+	int offset2 = VARINFO (s, tree->right->left->data.i).offset;
+
+	//{static int cx= 0; printf ("CX %5d\n", cx++);}
+
+	if (treg1 >= 0 && treg2 >= 0) {
+		x86_mov_reg_reg (s->code, treg1, treg2, 4);
+		return;
+	}
+	if (treg1 >= 0 && treg2 < 0) {
+		x86_mov_reg_membase (s->code, treg1, X86_EBP, offset2, 4);
+		return;
+	}
+	if (treg1 < 0 && treg2 >= 0) {
+		x86_mov_membase_reg (s->code, X86_EBP, offset1, treg2, 4);
+		return;
+	}
+
+	g_assert_not_reached ();
+
+} cost {
+	MBCOND (VARINFO (data, tree->left->data.i).reg >= 0 ||
+		VARINFO (data, tree->right->left->data.i).reg >= 0);
+	return 0;
+}
 
+stmt: STIND_I4 (addr, CONST_I4) {
 	switch (tree->left->data.ainfo.amode) {
 
 	case AMImmediate:
-		x86_mov_mem_reg (s->code, tree->left->data.ainfo.offset, tree->right->reg1, 4);
+		x86_mov_mem_imm (s->code, tree->left->data.ainfo.offset, tree->right->data.i, 4);
 		break;
 		
 	case AMBase:
-		x86_mov_membase_reg (s->code, tree->left->data.ainfo.basereg, 
-				     tree->left->data.ainfo.offset, tree->right->reg1, 4);
+		x86_mov_membase_imm (s->code, tree->left->data.ainfo.basereg, 
+				     tree->left->data.ainfo.offset, tree->right->data.i, 4);
 		break;		
 	case AMIndex:
-		x86_mov_memindex_reg (s->code, X86_NOBASEREG, tree->left->data.ainfo.offset,
+		x86_mov_memindex_imm (s->code, X86_NOBASEREG, tree->left->data.ainfo.offset,
 				      tree->left->data.ainfo.indexreg, tree->left->data.ainfo.shift,
-				      tree->right->reg1, 4);
+				      tree->right->data.i, 4);
 		break;		
 	case AMBaseIndex:
-		x86_mov_memindex_reg (s->code, tree->left->data.ainfo.basereg, tree->left->data.ainfo.offset,
+		x86_mov_memindex_imm (s->code, tree->left->data.ainfo.basereg, tree->left->data.ainfo.offset,
 				      tree->left->data.ainfo.indexreg, tree->left->data.ainfo.shift,
-				      tree->right->reg1, 4);
+				      tree->right->data.i, 4);
 		break;		
 	}
 }
 
-stmt: STIND_REF (addr, reg) {
-	PRINT_REG ("STIND_REF", tree->right->reg1);
+stmt: STIND_I4 (addr, reg) {
 
 	switch (tree->left->data.ainfo.amode) {
 
@@ -423,6 +596,46 @@ stmt: STIND_REF (addr, reg) {
 	}
 }
 
+stmt: REMOTE_STIND_I4 (reg, reg) {
+	guint8 *br[2];
+	int treg = X86_EAX;
+	int lreg = tree->left->reg1;
+	int rreg = tree->right->reg1;
+	int offset;
+
+	if (lreg == treg)
+		treg = X86_EDX;
+
+	if (rreg == treg)
+		treg = X86_ECX;
+
+	x86_mov_reg_membase (s->code, treg, lreg, 0, 4);
+	x86_alu_membase_imm (s->code, X86_CMP, treg, 0, ((int)mono_defaults.transparent_proxy_class));
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+
+	/* this is a transparent proxy - remote the call */
+
+	/* save value to stack */
+	x86_push_reg (s->code, rreg);
+
+	x86_push_reg (s->code, X86_ESP);
+	x86_push_imm (s->code, tree->data.fi.field);
+	x86_push_imm (s->code, tree->data.fi.klass);
+	x86_push_reg (s->code, lreg);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_store_remote_field);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 20);
+
+	br [1] = s->code; x86_jump8 (s->code, 0);
+
+	x86_patch (br [0], s->code);
+	offset = tree->data.fi.klass->valuetype ? tree->data.fi.field->offset - sizeof (MonoObject) : 
+		tree->data.fi.field->offset;
+	x86_mov_membase_reg (s->code, lreg, offset, rreg, 4);
+
+	x86_patch (br [1], s->code);
+}
+
 stmt: STIND_I1 (addr, reg) {
 	PRINT_REG ("STIND_I1", tree->right->reg1);
 
@@ -449,6 +662,46 @@ stmt: STIND_I1 (addr, reg) {
 	}
 }
 
+stmt: REMOTE_STIND_I1 (reg, reg) {
+	guint8 *br[2];
+	int treg = X86_EAX;
+	int lreg = tree->left->reg1;
+	int rreg = tree->right->reg1;
+	int offset;
+
+	if (lreg == treg)
+		treg = X86_EDX;
+
+	if (rreg == treg)
+		treg = X86_ECX;
+
+	x86_mov_reg_membase (s->code, treg, lreg, 0, 4);
+	x86_alu_membase_imm (s->code, X86_CMP, treg, 0, ((int)mono_defaults.transparent_proxy_class));
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+
+	/* this is a transparent proxy - remote the call */
+
+	/* save value to stack */
+	x86_push_reg (s->code, rreg);
+
+	x86_push_reg (s->code, X86_ESP);
+	x86_push_imm (s->code, tree->data.fi.field);
+	x86_push_imm (s->code, tree->data.fi.klass);
+	x86_push_reg (s->code, lreg);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_store_remote_field);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 20);
+
+	br [1] = s->code; x86_jump8 (s->code, 0);
+
+	x86_patch (br [0], s->code);
+	offset = tree->data.fi.klass->valuetype ? tree->data.fi.field->offset - sizeof (MonoObject) : 
+		tree->data.fi.field->offset;
+	x86_mov_membase_reg (s->code, lreg, offset, rreg, 1);
+
+	x86_patch (br [1], s->code);
+}
+
 stmt: STIND_I2 (addr, reg) {
 	PRINT_REG ("STIND_I2", tree->right->reg1);
 
@@ -475,34 +728,91 @@ stmt: STIND_I2 (addr, reg) {
 	}
 }
 
-reg: LDIND_I4 (addr) {
+stmt: REMOTE_STIND_I2 (reg, reg) {
+	guint8 *br[2];
+	int treg = X86_EAX;
+	int lreg = tree->left->reg1;
+	int rreg = tree->right->reg1;
+	int offset;
 
-	switch (tree->left->data.ainfo.amode) {
+	if (lreg == treg)
+		treg = X86_EDX;
 
-	case AMImmediate:
-		x86_mov_reg_mem (s->code, tree->reg1, tree->left->data.ainfo.offset, 4);
-		break;
+	if (rreg == treg)
+		treg = X86_ECX;
 
-	case AMBase:
-		x86_mov_reg_membase (s->code, tree->reg1, tree->left->data.ainfo.basereg, 
-				     tree->left->data.ainfo.offset, 4);
-		break;		
-	case AMIndex:
-		x86_mov_reg_memindex (s->code, tree->reg1, X86_NOBASEREG, tree->left->data.ainfo.offset,
-				      tree->left->data.ainfo.indexreg, tree->left->data.ainfo.shift, 4);
-		break;		
-	case AMBaseIndex:
-		x86_mov_reg_memindex (s->code, tree->reg1, tree->left->data.ainfo.basereg, 
-				      tree->left->data.ainfo.offset, tree->left->data.ainfo.indexreg, 
-				      tree->left->data.ainfo.shift, 4);
-		break;		
-	}
+	x86_mov_reg_membase (s->code, treg, lreg, 0, 4);
+	x86_alu_membase_imm (s->code, X86_CMP, treg, 0, ((int)mono_defaults.transparent_proxy_class));
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
 
+	/* this is a transparent proxy - remote the call */
 
-	PRINT_REG ("LDIND_I4", tree->reg1);
+	/* save value to stack */
+	x86_push_reg (s->code, rreg);
+
+	x86_push_reg (s->code, X86_ESP);
+	x86_push_imm (s->code, tree->data.fi.field);
+	x86_push_imm (s->code, tree->data.fi.klass);
+	x86_push_reg (s->code, lreg);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_store_remote_field);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 20);
+
+	br [1] = s->code; x86_jump8 (s->code, 0);
+
+	x86_patch (br [0], s->code);
+	offset = tree->data.fi.klass->valuetype ? tree->data.fi.field->offset - sizeof (MonoObject) : 
+		tree->data.fi.field->offset;
+	x86_mov_membase_reg (s->code, lreg, offset, rreg, 2);
+
+	x86_patch (br [1], s->code);
+}
+
+reg: LDIND_I4 (ADDR_L) {
+	int treg = VARINFO (s, tree->left->data.i).reg;
+
+	if (treg != tree->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, treg, 4);
+
+} cost {
+	MBCOND ((VARINFO (data, tree->left->data.i).reg >= 0));
+	return 0;
+}
+
+stmt: STIND_I4 (ADDR_L, CONST_I4) {
+	int treg = VARINFO (s, tree->left->data.i).reg;
+
+	x86_mov_reg_imm (s->code, treg, tree->right->data.i);
+
+} cost {
+	MBCOND ((VARINFO (data, tree->left->data.i).reg >= 0));
+	return 0;
+}
+
+stmt: STIND_I4 (ADDR_L, LDIND_I4 (ADDR_L)) {
+	int treg = VARINFO (s, tree->left->data.i).reg;
+	int offset = VARINFO (s, tree->right->left->data.i).offset;
+	
+	x86_mov_reg_membase (s->code, treg, X86_EBP, offset, 4);
+} cost {
+	MBCOND ((VARINFO (data, tree->left->data.i).reg >= 0));
+	MBCOND ((VARINFO (data, tree->right->left->data.i).reg < 0));
+	return 0;
+}
+
+stmt: STIND_I4 (ADDR_L, reg) {
+	int treg = VARINFO (s, tree->left->data.i).reg;
+
+	if (treg != tree->right->reg1)
+		x86_mov_reg_reg (s->code, treg, tree->right->reg1, 4);
+
+} cost {
+	MBCOND ((VARINFO (data, tree->left->data.i).reg >= 0));
+	return 0;
 }
 
-reg: LDIND_REF (addr) {
+
+reg: LDIND_I4 (addr) {
 
 	switch (tree->left->data.ainfo.amode) {
 
@@ -526,7 +836,7 @@ reg: LDIND_REF (addr) {
 	}
 
 
-	PRINT_REG ("LDIND_REF", tree->reg1);
+	PRINT_REG ("LDIND_I4", tree->reg1);
 }
 
 reg: LDIND_I1 (addr) {
@@ -629,36 +939,71 @@ reg: LDIND_U2 (addr) {
 	PRINT_REG ("LDIND_U2", tree->reg1);
 }
 
-reg: LDIND_U4 (addr) {
-	switch (tree->left->data.ainfo.amode) {
+reg: REMOTE_LDFLDA (reg) {
+	guint8 *br[2];
+	int treg = X86_EAX;
+	int lreg = tree->left->reg1;
 
-	case AMImmediate:
-		x86_mov_reg_mem (s->code, tree->reg1, tree->left->data.ainfo.offset, 4);
-		break;
+	if (lreg == X86_EAX)
+		treg = X86_EDX;
 
-	case AMBase:
-		x86_mov_reg_membase (s->code, tree->reg1, tree->left->data.ainfo.basereg, 
-				     tree->left->data.ainfo.offset, 4);
-		break;		
-	case AMIndex:
-		x86_mov_reg_memindex (s->code, tree->reg1, X86_NOBASEREG, tree->left->data.ainfo.offset,
-				      tree->left->data.ainfo.indexreg, tree->left->data.ainfo.shift, 4);
-		break;		
-	case AMBaseIndex:
-		x86_mov_reg_memindex (s->code, tree->reg1, tree->left->data.ainfo.basereg, 
-				      tree->left->data.ainfo.offset, tree->left->data.ainfo.indexreg, 
-				      tree->left->data.ainfo.shift, 4);
-		break;		
-	}
+	if (tree->reg1 != treg)
+		x86_push_reg (s->code, treg);
+
+	x86_mov_reg_membase (s->code, treg, lreg, 0, 4);
+	x86_alu_membase_imm (s->code, X86_CMP, treg, 0, ((int)mono_defaults.transparent_proxy_class));
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+
+	/* this is a transparent proxy - remote the call */
+	if (treg != X86_EAX)
+		x86_push_reg (s->code, X86_EAX);
+	if (treg != X86_EDX)
+		x86_push_reg (s->code, X86_EDX);
+	x86_push_reg (s->code, X86_ECX);
 
-	PRINT_REG ("LDIND_U4", tree->reg1);
+	x86_push_imm (s->code, 0);
+	x86_push_imm (s->code, tree->data.fi.field);
+	x86_push_imm (s->code, tree->data.fi.klass);
+	x86_push_reg (s->code, lreg);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_load_remote_field);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 16);
+
+	if (treg != X86_EAX)
+		x86_mov_reg_reg (s->code, treg, X86_EAX, 4);
+
+	x86_pop_reg (s->code, X86_ECX);
+	if (treg != X86_EDX)
+		x86_pop_reg (s->code, X86_EDX);
+	if (treg != X86_EAX)
+		x86_pop_reg (s->code, X86_EAX);
+
+	x86_mov_reg_reg (s->code, tree->reg1, treg, 4);
+
+	br [1] = s->code; x86_jump8 (s->code, 0);
+	
+	x86_patch (br [0], s->code);
+	if (tree->data.fi.klass->valuetype)
+		x86_lea_membase (s->code, tree->reg1, lreg, 
+				 tree->data.fi.field->offset - sizeof (MonoObject));
+	else 
+		x86_lea_membase (s->code, tree->reg1, lreg, tree->data.fi.field->offset);
+
+	x86_patch (br [1], s->code);
+
+	if (tree->reg1 != treg)
+		x86_pop_reg (s->code, treg);
 }
 
-reg: ADDR_L 5 {
-	int offset = g_array_index (s->varinfo, MonoVarInfo, tree->data.i).offset;  
+reg: ADDR_L {
+	int offset = VARINFO (s, tree->data.i).offset;  
+
 	x86_lea_membase (s->code, tree->reg1, X86_EBP, offset);
 	
 	PRINT_REG ("ADDR_L",  tree->reg1);
+} cost {
+	MBCOND (VARINFO (data, tree->data.i).reg < 0);
+	return 5;
 }
 
 
@@ -667,17 +1012,19 @@ reg: ADDR_G 5 {
 }
 
 reg: CONV_I1 (reg) {
-	x86_alu_reg_imm (s->code, X86_AND, tree->left->reg1, 0xff);
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, TRUE, FALSE);
+}
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+reg: CONV_U1 (reg) {
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, FALSE, FALSE);
 }
 
 reg: CONV_I2 (reg) {
-	x86_alu_reg_imm (s->code, X86_AND, tree->left->reg1, 0xffff);
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, TRUE, TRUE);
+}
 
-	if (tree->reg1 != tree->left->reg1)		     
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+reg: CONV_U2 (reg) {
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, FALSE, TRUE);
 }
 
 reg: CONST_I4 1 {
@@ -690,6 +1037,18 @@ reg: CONV_I4 (reg) {
 	PRINT_REG ("CONV_I4", tree->left->reg1);
 } 
 
+reg: CONV_U4 (reg) {
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+	PRINT_REG ("CONV_U4", tree->left->reg1);
+} 
+
+reg: CONV_OVF_I4 (reg) {
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+	PRINT_REG ("CONV_OVF_I4", tree->left->reg1);
+}
+
 reg: CONV_OVF_U4 (reg) {
 	/* Keep in sync with CONV_OVF_I4_UN below, they are the same on 32-bit machines */
 	x86_test_reg_imm (s->code, tree->left->reg1, 0x8000000);
@@ -712,16 +1071,14 @@ reg: CONV_OVF_I1 (reg) {
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_LE, TRUE, "OverflowException");	
 	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, -128);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_GT, TRUE, "OverflowException");	
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, TRUE, FALSE);
 }
 
 reg: CONV_OVF_I1_UN (reg) {
 	/* probe values between 0 to 128 */
 	x86_test_reg_imm (s->code, tree->left->reg1, 0xffffff80);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_EQ, FALSE, "OverflowException");	
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);	
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, FALSE, FALSE);
 }
 
 reg: CONV_OVF_U1 (reg) {
@@ -729,8 +1086,7 @@ reg: CONV_OVF_U1 (reg) {
 	/* probe value to be within 0 to 255 */
 	x86_test_reg_imm (s->code, tree->left->reg1, 0xffffff00);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_EQ, FALSE, "OverflowException");	
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);	
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, FALSE, FALSE);
 }
 
 reg: CONV_OVF_U1_UN (reg) {
@@ -738,20 +1094,16 @@ reg: CONV_OVF_U1_UN (reg) {
 	/* probe value to be within 0 to 255 */
 	x86_test_reg_imm (s->code, tree->left->reg1, 0xffffff00);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_EQ, FALSE, "OverflowException");	
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);	
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, FALSE, FALSE);
 }
 
-reg: CONV_OVF_I2 (reg) {
+reg: CONV_OVF_I2 (reg) {	
 	/* Probe value to be within -32768 and 32767 */
 	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, 32767);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_LE, TRUE, "OverflowException");	
 	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, -32768);
-	// fixme: check branch
-	g_assert_not_reached ();
-	x86_branch8 (s->code, X86_CC_LT, -17, TRUE);
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_GE, TRUE, "OverflowException");	
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, TRUE, TRUE);
 }
 
 reg: CONV_OVF_U2 (reg) {
@@ -759,8 +1111,7 @@ reg: CONV_OVF_U2 (reg) {
 	/* Probe value to be within 0 and 65535 */
 	x86_test_reg_imm (s->code, tree->left->reg1, 0xffff0000);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_EQ, TRUE, "OverflowException");	
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);	
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, FALSE, TRUE);
 }
 
 reg: CONV_OVF_U2_UN (reg) {
@@ -768,16 +1119,80 @@ reg: CONV_OVF_U2_UN (reg) {
 	/* Probe value to be within 0 and 65535 */
 	x86_test_reg_imm (s->code, tree->left->reg1, 0xffff0000);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_EQ, FALSE, "OverflowException");	
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);	
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, FALSE, TRUE);
 }
 
 reg: CONV_OVF_I2_UN (reg) {
 	/* Convert uint value into short, value within 0 and 32767 */
 	x86_test_reg_imm (s->code, tree->left->reg1, 0xffff8000);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_EQ, FALSE, "OverflowException");	
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);	
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, FALSE, TRUE);
+}
+
+reg: MUL (reg, CONST_I4) "MB_USE_OPT1(0)" {
+	unsigned int i, j, k, v;
+
+	v = tree->right->data.i;
+	for (i = 0, j = 1, k = 0xfffffffe; i < 32; i++, j = j << 1, k = k << 1) {
+		if (v & j)
+			break;
+	}
+
+	if (v < 0 || i == 32 || v & k) {
+		switch (v) {
+		case 3:
+			/* LEA r1, [r2 + r2*2] */
+			x86_lea_memindex (s->code, tree->reg1, tree->left->reg1, 0, tree->left->reg1, 1);
+			break;
+		case 5:
+			/* LEA r1, [r2 + r2*4] */
+			x86_lea_memindex (s->code, tree->reg1, tree->left->reg1, 0, tree->left->reg1, 2);
+			break;
+		case 6:
+			/* LEA r1, [r2 + r2*2] */
+			/* ADD r1, r1          */
+			x86_lea_memindex (s->code, tree->reg1, tree->left->reg1, 0, tree->left->reg1, 1);
+			x86_alu_reg_reg (s->code, X86_ADD, tree->reg1, tree->reg1);
+			break;
+		case 9:
+			/* LEA r1, [r2 + r2*8] */
+			x86_lea_memindex (s->code, tree->reg1, tree->left->reg1, 0, tree->left->reg1, 3);
+			break;
+		case 10:
+			/* LEA r1, [r2 + r2*4] */
+			/* ADD r1, r1          */
+			x86_lea_memindex (s->code, tree->reg1, tree->left->reg1, 0, tree->left->reg1, 2);
+			x86_alu_reg_reg (s->code, X86_ADD, tree->reg1, tree->reg1);
+			break;
+		case 12:
+			/* LEA r1, [r2 + r2*2] */
+			/* SHL r1, 2           */
+			x86_lea_memindex (s->code, tree->reg1, tree->left->reg1, 0, tree->left->reg1, 1);
+			x86_shift_reg_imm (s->code, X86_SHL, tree->reg1, 2);
+			break;
+		case 25:
+			/* LEA r1, [r2 + r2*4] */
+			/* LEA r1, [r1 + r1*4] */
+			x86_lea_memindex (s->code, tree->reg1, tree->left->reg1, 0, tree->left->reg1, 2);
+			x86_lea_memindex (s->code, tree->reg1, tree->reg1, 0, tree->reg1, 2);
+			break;
+		case 100:
+			/* LEA r1, [r2 + r2*4] */
+			/* SHL r1, 2           */
+			/* LEA r1, [r1 + r1*4] */
+			x86_lea_memindex (s->code, tree->reg1, tree->left->reg1, 0, tree->left->reg1, 2);
+			x86_shift_reg_imm (s->code, X86_SHL, tree->reg1, 2);
+			x86_lea_memindex (s->code, tree->reg1, tree->reg1, 0, tree->reg1, 2);
+			break;
+		default:
+			x86_imul_reg_reg_imm (s->code, tree->reg1, tree->left->reg1, tree->right->data.i);
+			break;
+		}
+	} else {
+		x86_shift_reg_imm (s->code, X86_SHL, tree->left->reg1, i);
+		if (tree->reg1 != tree->left->reg1)
+			x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+	}
 }
 
 reg: MUL (reg, reg) {
@@ -796,12 +1211,52 @@ reg: MUL_OVF (reg, reg) {
 }
 
 reg: MUL_OVF_UN (reg, reg) {
-	//fixme: implement me
-	g_assert_not_reached ();
+	mono_assert (tree->right->reg1 != X86_EAX);
+	
+	if (tree->left->reg1 != X86_EAX)
+		x86_mov_reg_reg (s->code, X86_EAX, tree->left->reg1, 4);
+
+	x86_mul_reg (s->code, tree->right->reg1, FALSE);
+	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_NO, TRUE, "OverflowException");
+
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
+}
+
+reg: DIV (reg, CONST_I4) {
+	unsigned int i, j, k, v;
+
+	v = tree->right->data.i;
+	for (i = 0, j = 1, k = 0xfffffffe; i < 32; i++, j = j << 1, k = k << 1) {
+		if (v & j)
+			break;
+	}
+
+	x86_shift_reg_imm (s->code, X86_SAR, tree->left->reg1, i);
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+
+} cost {
+	unsigned int i, j, k, v;
+
+	if (v < 0) 
+		return MBMAXCOST;
+
+	v = tree->right->data.i;
+	for (i = 0, j = 1, k = 0xfffffffe; i < 32; i++, j = j << 1, k = k << 1) {
+		if (v & j)
+			break;
+	}
+	
+	if (i == 32 || v & k) 
+		return MBMAXCOST;
+
+	return 0;
+
 }
 
 reg: DIV (reg, reg) {
-	g_assert (tree->right->reg1 != X86_EAX);
+	mono_assert (tree->right->reg1 != X86_EAX);
 
 	if (tree->left->reg1 != X86_EAX)
 		x86_mov_reg_reg (s->code, X86_EAX, tree->left->reg1, 4);
@@ -809,49 +1264,110 @@ reg: DIV (reg, reg) {
 	x86_cdq (s->code);
 	x86_div_reg (s->code, tree->right->reg1, TRUE);
 
-	g_assert (tree->reg1 == X86_EAX &&
-		  tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
+}
+
+reg: DIV_UN (reg, CONST_I4) {
+	unsigned int i, j, k, v;
+	double f, r;
+
+	v = tree->right->data.i;
+	for (i = 0, j = 1, k = 0xfffffffe; i < 32; i++, j = j << 1, k = k << 1) {
+		if (v & j)
+			break;
+	}
+
+	if (i == 32 || v & k)  {
+		for (i = 32, j = 0x80000000; --i >= 0; j >>= 1) {
+			if (v & j) break;
+		}
+
+		/* k = 32 + number of significant bits in v - 1 */
+		k = 32 + i;
+
+		f = 1.0f / v;
+		for (i = 0; i < k; i++) f *= 2.0f;
+
+
+		r = f - floor(f);
+
+		if (r == 0) {
+			x86_shift_reg_imm (s->code, X86_SHR, tree->left->reg1, k - 32);
+			if (tree->reg1 != tree->left->reg1)
+				x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+		} else if (r < 0.5f) {
+			if (tree->left->reg1 != X86_EAX)
+				x86_mov_reg_reg (s->code, X86_EAX, tree->left->reg1, 4);
+			x86_mov_reg_imm (s->code, X86_EDX, (guint32) floor(f));
+			/* x86_inc_reg (s->code, X86_EAX); */
+			/* INC is faster but we have to check for overflow. */
+			x86_alu_reg_imm (s->code, X86_ADD, X86_EAX, 1);
+			x86_branch8(s->code, X86_CC_C, 2, FALSE);
+			x86_mul_reg (s->code, X86_EDX, FALSE);
+			x86_shift_reg_imm (s->code, X86_SHR, X86_EDX, k - 32);
+			if (tree->reg1 != X86_EDX)
+				x86_mov_reg_reg (s->code, tree->reg1, X86_EDX, 4);
+		} else {
+			if (tree->left->reg1 != X86_EAX)
+				x86_mov_reg_reg (s->code, X86_EAX, tree->left->reg1, 4);
+			x86_mov_reg_imm (s->code, X86_EDX, (guint32) ceil(f));
+			x86_mul_reg (s->code, X86_EDX, FALSE);
+			x86_shift_reg_imm (s->code, X86_SHR, X86_EDX, k - 32);
+			if (tree->reg1 != X86_EDX)
+				x86_mov_reg_reg (s->code, tree->reg1, X86_EDX, 4);
+		}
+	} else {
+		x86_shift_reg_imm (s->code, X86_SHR, tree->left->reg1, i);
+		if (tree->reg1 != tree->left->reg1)
+			x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+	}
+
 }
 
 reg: DIV_UN (reg, reg) {
-	g_assert (tree->right->reg1 != X86_EAX);
+	mono_assert (tree->right->reg1 != X86_EAX);
 
 	if (tree->left->reg1 != X86_EAX)
 		x86_mov_reg_reg (s->code, X86_EAX, tree->left->reg1, 4);
 
-	x86_cdq (s->code);
+	x86_mov_reg_imm (s->code, X86_EDX, 0);
 	x86_div_reg (s->code, tree->right->reg1, FALSE);
 
-	g_assert (tree->reg1 == X86_EAX &&
-		  tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
 }
 
 reg: REM (reg, reg) {
-	g_assert (tree->right->reg1 != X86_EAX);
+	mono_assert (tree->right->reg1 != X86_EAX);
+	mono_assert (tree->right->reg1 != X86_EDX);
 
 	if (tree->left->reg1 != X86_EAX)
 		x86_mov_reg_reg (s->code, X86_EAX, tree->left->reg1, 4);
 
+	/* sign extend to 64bit in EAX/EDX */
 	x86_cdq (s->code);
 	x86_div_reg (s->code, tree->right->reg1, TRUE);
 	x86_mov_reg_reg (s->code, X86_EAX, X86_EDX, 4);
 
-	g_assert (tree->reg1 == X86_EAX &&
-		  tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
 }
 
 reg: REM_UN (reg, reg) {
-	g_assert (tree->right->reg1 != X86_EAX);
+	mono_assert (tree->right->reg1 != X86_EAX);
+	mono_assert (tree->right->reg1 != X86_EDX);
 
 	if (tree->left->reg1 != X86_EAX)
 		x86_mov_reg_reg (s->code, X86_EAX, tree->left->reg1, 4);
 
-	x86_cdq (s->code);
+	/* zero extend to 64bit in EAX/EDX */
+	x86_mov_reg_imm (s->code, X86_EDX, 0); 
 	x86_div_reg (s->code, tree->right->reg1, FALSE);
 	x86_mov_reg_reg (s->code, X86_EAX, X86_EDX, 4);
 
-	g_assert (tree->reg1 == X86_EAX &&
-		  tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
 }
 
 reg: ADD (reg, CONST_I4) "MB_USE_OPT1(0)" {
@@ -865,6 +1381,18 @@ reg: ADD (reg, CONST_I4) "MB_USE_OPT1(0)" {
 
 }
 
+reg: ADD (reg, LDIND_I4 (ADDR_L)) {
+	int treg = VARINFO (s, tree->right->left->data.i).reg;
+
+	x86_alu_reg_reg (s->code, X86_ADD, tree->left->reg1, treg);
+
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+} cost {
+	MBCOND ((VARINFO (data, tree->right->left->data.i).reg >= 0));
+	return 0;
+}
+
 reg: ADD (reg, reg) {
 	x86_alu_reg_reg (s->code, X86_ADD, tree->left->reg1, tree->right->reg1);
 
@@ -898,6 +1426,18 @@ reg: SUB (reg, CONST_I4) "MB_USE_OPT1(0)" {
 		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 }
 
+reg: SUB (reg, LDIND_I4 (ADDR_L)) {
+	int treg = VARINFO (s, tree->right->left->data.i).reg;
+
+	x86_alu_reg_reg (s->code, X86_SUB, tree->left->reg1, treg);
+
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+} cost {
+	MBCOND ((VARINFO (data, tree->right->left->data.i).reg >= 0));
+	return 0;
+}
+
 reg: SUB (reg, reg) {
 	x86_alu_reg_reg (s->code, X86_SUB, tree->left->reg1, tree->right->reg1);
 
@@ -921,34 +1461,36 @@ reg: SUB_OVF_UN (reg, reg) {
 		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 }
 
-reg: CEQ (reg, reg) {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	x86_set_reg (s->code, X86_CC_EQ, tree->reg1, TRUE);
-	x86_widen_reg (s->code, tree->reg1, tree->reg1, FALSE, FALSE);
-}
+reg: CSET (cflags) {
 
-reg: CGT (reg, reg) {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	x86_set_reg (s->code, X86_CC_GT, tree->reg1, TRUE);
-	x86_widen_reg (s->code, tree->reg1, tree->reg1, FALSE, FALSE);
-}
+	switch (tree->data.i) {
+	case CEE_CEQ:
+		x86_set_reg (s->code, X86_CC_EQ, tree->reg1, TRUE);
+		break;
+	case CEE_CGT:
+		x86_set_reg (s->code, X86_CC_GT, tree->reg1, TRUE);
+		break;
+	case CEE_CGT_UN:
+		x86_set_reg (s->code, X86_CC_GT, tree->reg1, FALSE);
+		break;
+	case CEE_CLT:
+		x86_set_reg (s->code, X86_CC_LT, tree->reg1, TRUE);
+		break;
+	case CEE_CLT_UN:
+		x86_set_reg (s->code, X86_CC_LT, tree->reg1, FALSE);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
 
-reg: CGT_UN (reg, reg) {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	x86_set_reg (s->code, X86_CC_GT, tree->reg1, FALSE);
 	x86_widen_reg (s->code, tree->reg1, tree->reg1, FALSE, FALSE);
 }
 
-reg: CLT (reg, reg) {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	x86_set_reg (s->code, X86_CC_LT, tree->reg1, TRUE);
-	x86_widen_reg (s->code, tree->reg1, tree->reg1, FALSE, FALSE);
-}
+reg: AND (reg, CONST_I4) "MB_USE_OPT1(0)" {
+	x86_alu_reg_imm (s->code, X86_AND, tree->left->reg1, tree->right->data.i);
 
-reg: CLT_UN (reg, reg) {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	x86_set_reg (s->code, X86_CC_LT, tree->reg1, FALSE);
-	x86_widen_reg (s->code, tree->reg1, tree->reg1, FALSE, FALSE);
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 }
 
 reg: AND (reg, reg) {
@@ -958,6 +1500,13 @@ reg: AND (reg, reg) {
 		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 }
 
+reg: OR (reg, CONST_I4) "MB_USE_OPT1(0)" {
+	x86_alu_reg_imm (s->code, X86_OR, tree->left->reg1, tree->right->data.i);
+
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+}
+
 reg: OR (reg, reg) {
 	x86_alu_reg_reg (s->code, X86_OR, tree->left->reg1, tree->right->reg1);
 
@@ -965,6 +1514,13 @@ reg: OR (reg, reg) {
 		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 }
 
+reg: XOR (reg, CONST_I4) "MB_USE_OPT1(0)" {
+	x86_alu_reg_imm (s->code, X86_XOR, tree->left->reg1, tree->right->data.i);
+
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+}
+
 reg: XOR (reg, reg) {
 	x86_alu_reg_reg (s->code, X86_XOR, tree->left->reg1, tree->right->reg1);
 
@@ -994,15 +1550,20 @@ reg: SHL (reg, CONST_I4) {
 }
 
 reg: SHL (reg, reg) {
-	if (tree->right->reg1 != X86_ECX)
+	if (tree->right->reg1 != X86_ECX) {
+		x86_push_reg (s->code, X86_ECX);
 		x86_mov_reg_reg (s->code, X86_ECX, tree->right->reg1, 4);
+	}
 	x86_shift_reg (s->code, X86_SHL, tree->left->reg1);
 
 	if (tree->reg1 != tree->left->reg1)
 		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 
-	g_assert (tree->reg1 != X86_ECX &&
-		  tree->left->reg1 != X86_ECX);
+	if (tree->right->reg1 != X86_ECX)
+		x86_pop_reg (s->code, X86_ECX);
+
+	mono_assert (tree->reg1 != X86_ECX &&
+		     tree->left->reg1 != X86_ECX);
 }
 
 reg: SHR (reg, CONST_I4) {
@@ -1013,15 +1574,21 @@ reg: SHR (reg, CONST_I4) {
 }
 
 reg: SHR (reg, reg) {
-	if (tree->right->reg1 != X86_ECX)
+	if (tree->right->reg1 != X86_ECX) {
+		x86_push_reg (s->code, X86_ECX);
 		x86_mov_reg_reg (s->code, X86_ECX, tree->right->reg1, 4);
+	}
+
 	x86_shift_reg (s->code, X86_SAR, tree->left->reg1);
 
 	if (tree->reg1 != tree->left->reg1)
 		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 
-	g_assert (tree->reg1 != X86_ECX &&
-		  tree->left->reg1 != X86_ECX);
+	if (tree->right->reg1 != X86_ECX)
+		x86_pop_reg (s->code, X86_ECX);
+
+	mono_assert (tree->reg1 != X86_ECX &&
+		     tree->left->reg1 != X86_ECX);
 }
 
 reg: SHR_UN (reg, CONST_I4) {
@@ -1032,15 +1599,21 @@ reg: SHR_UN (reg, CONST_I4) {
 }
 
 reg: SHR_UN (reg, reg) {
-	if (tree->right->reg1 != X86_ECX)
+	if (tree->right->reg1 != X86_ECX) {
+		x86_push_reg (s->code, X86_ECX);
 		x86_mov_reg_reg (s->code, X86_ECX, tree->right->reg1, 4);
+	}
+
 	x86_shift_reg (s->code, X86_SHR, tree->left->reg1);
 
 	if (tree->reg1 != tree->left->reg1)
 		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 
-	g_assert (tree->reg1 != X86_ECX &&
-		  tree->left->reg1 != X86_ECX);
+	if (tree->right->reg1 != X86_ECX)
+		x86_pop_reg (s->code, X86_ECX);
+
+	mono_assert (tree->reg1 != X86_ECX &&
+		     tree->left->reg1 != X86_ECX);
 }
 
 reg: LDSFLDA (CONST_I4) {
@@ -1051,7 +1624,7 @@ reg: LDSFLDA (CONST_I4) {
 
 	x86_push_imm (s->code, tree->left->data.i);
 	x86_push_imm (s->code, tree->data.klass);
-	mono_add_jump_info (s, s->code + 1, mono_ldsflda, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_ldsflda);
 	x86_call_code (s->code, 0);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
 	
@@ -1065,16 +1638,27 @@ reg: LDSFLDA (CONST_I4) {
 
 # array support
 reg: LDLEN (reg) {	
-	x86_test_reg_reg (s->code, tree->left->reg1, tree->left->reg1);
-	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_NE, TRUE, "NullReferenceException");
-
 	x86_mov_reg_membase (s->code, tree->reg1, tree->left->reg1,  
-			     G_STRUCT_OFFSET (MonoArray, bounds), 4);
-	x86_mov_reg_membase (s->code, tree->reg1, tree->reg1,  
-			     G_STRUCT_OFFSET (MonoArrayBounds, length), 4);
+			     G_STRUCT_OFFSET (MonoArray, max_length), 4);
+}
+
+reg: LDELEMA (reg, CONST_I4) {
+	int ind;
+
+	x86_alu_membase_imm (s->code, X86_CMP, tree->left->reg1, G_STRUCT_OFFSET (MonoArray, max_length), tree->right->data.i);
+	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_GT, FALSE, "IndexOutOfRangeException");
+       
+	ind = tree->data.i * tree->right->data.i + G_STRUCT_OFFSET (MonoArray, vector);
+	
+	x86_alu_reg_imm (s->code, X86_ADD, tree->left->reg1, ind);
+
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+
 }
 
 reg: LDELEMA (reg, reg) {
+
 	x86_alu_reg_membase (s->code, X86_CMP, tree->right->reg1, tree->left->reg1, G_STRUCT_OFFSET (MonoArray, max_length));
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_LT, FALSE, "IndexOutOfRangeException");
 
@@ -1099,7 +1683,7 @@ reg: LDSTR {
 
 	x86_push_imm (s->code, tree->data.p);
 	x86_push_imm (s->code, s->method->klass->image);
-	mono_add_jump_info (s, s->code + 1, mono_ldstr_wrapper, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_ldstr_wrapper);
 	x86_call_code (s->code, 0);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
 
@@ -1113,51 +1697,80 @@ reg: LDSTR {
 	PRINT_REG ("LDSTR", tree->reg1);	
 }
 
-reg: TOSTRING (reg) {
-	guint8 *start = s->code, *l1, *le;
-	int i;
+reg: NEWARR (reg) {
+	if (tree->reg1 != X86_EAX)
+		x86_push_reg (s->code, X86_EAX);
+	x86_push_reg (s->code, X86_ECX);
+	x86_push_reg (s->code, X86_EDX);
 
-	l1 = le = NULL;
+	x86_push_reg (s->code, tree->left->reg1);
+	x86_push_imm (s->code, tree->data.p);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_array_new_wrapper);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
 
-	for (i = 0; i < 2; i++) {
-		s->code = start;
+	x86_pop_reg (s->code, X86_EDX);
+	x86_pop_reg (s->code, X86_ECX);
+	if (tree->reg1 != X86_EAX) {
+		x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
+		x86_pop_reg (s->code, X86_EAX);
+	}
 
-		x86_test_reg_reg (s->code, tree->left->reg1, tree->left->reg1);
-		x86_branch8 (s->code, X86_CC_EQ, le - l1, FALSE);
-		l1 = s->code;
+	PRINT_REG ("NEWARR", tree->reg1);
+}
 
-		if (tree->reg1 != X86_EAX)
-			x86_push_reg (s->code, X86_EAX);
-		x86_push_reg (s->code, X86_ECX);
-		x86_push_reg (s->code, X86_EDX);
+reg: NEWARR_SPEC (reg) {
+	if (tree->reg1 != X86_EAX)
+		x86_push_reg (s->code, X86_EAX);
+	x86_push_reg (s->code, X86_ECX);
+	x86_push_reg (s->code, X86_EDX);
 
-		x86_push_reg (s->code, tree->left->reg1);
-		mono_add_jump_info (s, s->code + 1, mono_string_new_wrapper, NULL);
-		x86_call_code (s->code, 0);
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, sizeof (gpointer));
+	x86_push_reg (s->code, tree->left->reg1);
+	x86_push_imm (s->code, tree->data.p);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_array_new_specific);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
 
-		x86_pop_reg (s->code, X86_EDX);
-		x86_pop_reg (s->code, X86_ECX);
-		if (tree->reg1 != X86_EAX) {
-			x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
-			x86_pop_reg (s->code, X86_EAX);
-		}
+	x86_pop_reg (s->code, X86_EDX);
+	x86_pop_reg (s->code, X86_ECX);
+	if (tree->reg1 != X86_EAX) {
+		x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
+		x86_pop_reg (s->code, X86_EAX);
+	}
+
+	PRINT_REG ("NEWARR_SPEC", tree->reg1);
+}
+
+reg: NEWOBJ {
+	if (tree->reg1 != X86_EAX)
+		x86_push_reg (s->code, X86_EAX);
+	x86_push_reg (s->code, X86_ECX);
+	x86_push_reg (s->code, X86_EDX);
+
+	x86_push_imm (s->code, tree->data.klass);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_object_new_wrapper);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
 
-		le = s->code;
+	x86_pop_reg (s->code, X86_EDX);
+	x86_pop_reg (s->code, X86_ECX);
+	if (tree->reg1 != X86_EAX) {
+		x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
+		x86_pop_reg (s->code, X86_EAX);
 	}
+	PRINT_REG ("NEWOBJ", tree->reg1);
 }
 
-reg: NEWARR (reg) {
+reg: NEWOBJ_SPEC {
 	if (tree->reg1 != X86_EAX)
 		x86_push_reg (s->code, X86_EAX);
 	x86_push_reg (s->code, X86_ECX);
 	x86_push_reg (s->code, X86_EDX);
 
-	x86_push_reg (s->code, tree->left->reg1);
 	x86_push_imm (s->code, tree->data.p);
-	mono_add_jump_info (s, s->code + 1, mono_array_new_wrapper, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_object_new_specific);
 	x86_call_code (s->code, 0);
-	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, sizeof (gpointer) + 4);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
 
 	x86_pop_reg (s->code, X86_EDX);
 	x86_pop_reg (s->code, X86_ECX);
@@ -1165,18 +1778,53 @@ reg: NEWARR (reg) {
 		x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
 		x86_pop_reg (s->code, X86_EAX);
 	}
+	PRINT_REG ("NEWOBJ_SPEC", tree->reg1);
+}
 
-	PRINT_REG ("NEWARR", tree->reg1);
+reg: OBJADDR (reg) {
+	if (tree->left->reg1 != tree->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 }
 
-reg: NEWOBJ {
+reg: VTADDR (ADDR_L) {
+	int offset = VARINFO (s, tree->left->data.i).offset;
+
+	x86_lea_membase (s->code, tree->reg1, X86_EBP, offset);
+}
+
+stmt: FREE (reg) {
+	x86_push_reg (s->code, tree->left->reg1);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, g_free);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
+}
+
+stmt: PROC2 (reg, reg) {
+	x86_push_reg (s->code, tree->right->reg1);
+	x86_push_reg (s->code, tree->left->reg1);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, tree->data.p);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
+}
+
+stmt: PROC3 (reg, CPSRC (reg, reg)) {
+	x86_push_reg (s->code, tree->right->right->reg1);
+	x86_push_reg (s->code, tree->right->left->reg1);
+	x86_push_reg (s->code, tree->left->reg1);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, tree->data.p);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 12);
+}
+
+reg: FUNC1 (reg) {
 	if (tree->reg1 != X86_EAX)
 		x86_push_reg (s->code, X86_EAX);
 	x86_push_reg (s->code, X86_ECX);
 	x86_push_reg (s->code, X86_EDX);
 
-	x86_push_imm (s->code, tree->data.klass);
-	mono_add_jump_info (s, s->code + 1, mono_object_new_wrapper, NULL);
+	x86_push_reg (s->code, tree->left->reg1);
+
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, tree->data.p);
 	x86_call_code (s->code, 0);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, sizeof (gpointer));
 
@@ -1186,19 +1834,94 @@ reg: NEWOBJ {
 		x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
 		x86_pop_reg (s->code, X86_EAX);
 	}
-	PRINT_REG ("NEWOBJ", tree->reg1);
 }
 
-reg: NEWSTRUCT {
-     	int size = tree->data.i;	
-	int sa;
-	
-	g_assert (size > 0);
+reg: LOCALLOC (CONST_I4) {
+	int size;
+	int offset;
 
-	sa = size + 3;
-	sa &= ~3;
+	size = (tree->left->data.i + (MONO_FRAME_ALIGNMENT - 1)) & ~(MONO_FRAME_ALIGNMENT - 1); // align to MONO_FRAME_ALIGNMENT boundary
+	offset = 0;
+
+	if (size) {
+		mono_emit_stack_alloc_const (s, tree, size);
+
+		if (tree->reg1 != X86_EAX && tree->left->reg1 != X86_EAX) {
+			x86_push_reg (s->code, X86_EAX);
+			offset += 4;
+		}
+		if (tree->reg1 != X86_ECX && tree->left->reg1 != X86_ECX) {
+			x86_push_reg (s->code, X86_ECX);
+			offset += 4;
+		}
+		if (tree->reg1 != X86_EDI && tree->left->reg1 != X86_EDI) {
+			x86_push_reg (s->code, X86_EDI);
+			offset += 4;
+		}
+		
+		x86_mov_reg_imm (s->code, X86_ECX, size >> 2);
+		x86_alu_reg_reg (s->code, X86_SUB, X86_EAX, X86_EAX);
+
+		x86_lea_membase (s->code, X86_EDI, X86_ESP, offset);
+		x86_cld (s->code);
+		x86_prefix (s->code, X86_REP_PREFIX);
+		x86_stosd (s->code);
+		
+		if (tree->reg1 != X86_ECX && tree->left->reg1 != X86_ECX)
+			x86_pop_reg (s->code, X86_ECX);
+		if (tree->reg1 != X86_EAX && tree->left->reg1 != X86_EAX)
+			x86_pop_reg (s->code, X86_EAX);
+		if (tree->reg1 != X86_EDI && tree->left->reg1 != X86_EDI)
+			x86_pop_reg (s->code, X86_EDI);
+	}
+
+	x86_mov_reg_reg (s->code, tree->reg1, X86_ESP, 4);
+}
+
+
+
+reg: LOCALLOC (reg) {
+	int offset = 0;
+	/* size must be aligned to MONO_FRAME_ALIGNMENT bytes */
+	x86_alu_reg_imm (s->code, X86_ADD, tree->left->reg1, MONO_FRAME_ALIGNMENT - 1);
+	x86_alu_reg_imm (s->code, X86_AND, tree->left->reg1, ~(MONO_FRAME_ALIGNMENT - 1));
+
+	/* allocate space on stack */
+	mono_emit_stack_alloc (s, tree);
+
+	if (tree->data.i) {
+		/* initialize with zero */
+		if (tree->reg1 != X86_EAX && tree->left->reg1 != X86_EAX) {
+			x86_push_reg (s->code, X86_EAX);
+			offset += 4;
+		}
+		if (tree->reg1 != X86_ECX && tree->left->reg1 != X86_ECX) {
+			x86_push_reg (s->code, X86_ECX);
+			offset += 4;
+		}
+		if (tree->reg1 != X86_EDI && tree->left->reg1 != X86_EDI) {
+			x86_push_reg (s->code, X86_EDI);
+			offset += 4;
+		}
+		
+		x86_shift_reg_imm (s->code, X86_SHR, tree->left->reg1, 2);
+		if (tree->left->reg1 != X86_ECX)
+			x86_mov_reg_imm (s->code, X86_ECX, tree->left->reg1);
+		x86_alu_reg_reg (s->code, X86_XOR, X86_EAX, X86_EAX);
+				
+		x86_lea_membase (s->code, X86_EDI, X86_ESP, offset);
+		x86_cld (s->code);
+		x86_prefix (s->code, X86_REP_PREFIX);
+		x86_stosl (s->code);
+		
+		if (tree->reg1 != X86_EDI && tree->left->reg1 != X86_EDI)
+			x86_pop_reg (s->code, X86_EDI);
+		if (tree->reg1 != X86_ECX && tree->left->reg1 != X86_ECX)
+			x86_pop_reg (s->code, X86_ECX);
+		if (tree->reg1 != X86_EAX && tree->left->reg1 != X86_EAX)
+			x86_pop_reg (s->code, X86_EAX);
+	}
 
-	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, sa);
 	x86_mov_reg_reg (s->code, tree->reg1, X86_ESP, 4);
 }
 
@@ -1206,9 +1929,6 @@ reg: UNBOX (reg) {
 	if (tree->reg1 != tree->left->reg1)
 		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 
-	x86_test_reg_reg (s->code, tree->reg1, tree->reg1);
-	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_NE, TRUE, "NullReferenceException");	
-
 	x86_push_reg (s->code, tree->reg1);
 	x86_mov_reg_membase (s->code, tree->reg1, tree->reg1, 0, 4); 
 	x86_mov_reg_membase (s->code, tree->reg1, tree->reg1, 0, 4); 
@@ -1220,263 +1940,748 @@ reg: UNBOX (reg) {
 }
 
 reg: CASTCLASS (reg) {
-	guint8 *start = s->code, *l1, *l2, *le;
-	int i;
-
-	l1 = l2 = le = NULL;
-
-	for (i = 0; i < 2; i++) {
-		s->code = start;
+	MonoClass *klass = tree->data.klass;
+	guint8 *br [2];
+	int lreg = tree->left->reg1;
+	
+	x86_push_reg (s->code, lreg);
+	x86_test_reg_reg (s->code, lreg, lreg);
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_EQ, 0, FALSE);
+
+	if (klass->flags & TYPE_ATTRIBUTE_INTERFACE) {
+		/* lreg = obj->vtable */
+		x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
+
+		x86_alu_membase_imm (s->code, X86_CMP, lreg, G_STRUCT_OFFSET (MonoVTable, max_interface_id), 
+				     klass->interface_id);
+		EMIT_COND_SYSTEM_EXCEPTION (X86_CC_GE, FALSE, "InvalidCastException");
+		/* lreg = obj->vtable->interface_offsets */
+		x86_mov_reg_membase (s->code, lreg, lreg, G_STRUCT_OFFSET (MonoVTable, interface_offsets), 4);
+		x86_alu_membase_imm (s->code, X86_CMP, lreg, klass->interface_id << 2, 0);
+		EMIT_COND_SYSTEM_EXCEPTION (X86_CC_NE, FALSE, "InvalidCastException");
+	} else {
 
-		if (tree->reg1 != X86_EAX)
-			x86_push_reg (s->code, X86_EAX);
+		/* lreg = obj->vtable */
+		x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
+		/* lreg = obj->vtable->klass */
+		x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
 
-		x86_test_reg_reg (s->code, tree->left->reg1, tree->left->reg1);
-		x86_branch8 (s->code, X86_CC_EQ, le - l2, FALSE);
-		l2 = s->code;
-		x86_push_reg (s->code, X86_ECX);
-		x86_push_reg (s->code, X86_EDX);
+		if (klass->rank) {
 
-		x86_push_imm (s->code, tree->data.klass);
-		x86_push_reg (s->code, tree->left->reg1);
-		mono_add_jump_info (s, s->code + 1, mono_object_isinst, NULL);
-		x86_call_code (s->code, 0);
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
+			x86_alu_membase_imm (s->code, X86_CMP, lreg, G_STRUCT_OFFSET (MonoClass, rank), klass->rank);
+			EMIT_COND_SYSTEM_EXCEPTION (X86_CC_EQ, FALSE, "InvalidCastException");
+			x86_mov_reg_membase (s->code, lreg, lreg, G_STRUCT_OFFSET (MonoClass, element_class), 4);
+			x86_mov_reg_membase (s->code, lreg, lreg, G_STRUCT_OFFSET (MonoClass, baseval), 4);
+			x86_alu_reg_mem (s->code, X86_SUB, lreg, &klass->element_class->baseval);
+			x86_alu_reg_mem (s->code, X86_CMP, lreg, &klass->element_class->diffval);
+			EMIT_COND_SYSTEM_EXCEPTION (X86_CC_LE, FALSE, "InvalidCastException");
 
-		x86_pop_reg (s->code, X86_EDX);
-		x86_pop_reg (s->code, X86_ECX);
+		} else {
 
-		x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0);
-		EMIT_COND_SYSTEM_EXCEPTION (X86_CC_NE, TRUE, "InvalidCastException");	
-		if (tree->reg1 != X86_EAX) {
-			x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
-			x86_pop_reg (s->code, X86_EAX);
+			if (klass->marshalbyref) {
+				/* check for transparent_proxy */		
+				x86_alu_reg_imm (s->code, X86_CMP, lreg, (int)mono_defaults.transparent_proxy_class);
+				br [1] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		
+				/* lreg = obj */
+				x86_mov_reg_membase (s->code, lreg, X86_ESP, 0, 4);
+				x86_mov_reg_membase (s->code, lreg, lreg, G_STRUCT_OFFSET (MonoTransparentProxy, 
+											   klass), 4);
+
+				x86_patch (br [1], s->code);
+			}
+
+			x86_mov_reg_membase (s->code, lreg, lreg, G_STRUCT_OFFSET (MonoClass, baseval), 4);
+			x86_alu_reg_mem (s->code, X86_SUB, lreg, &klass->baseval);
+			x86_alu_reg_mem (s->code, X86_CMP, lreg, &klass->diffval);
+			EMIT_COND_SYSTEM_EXCEPTION (X86_CC_LE, FALSE, "InvalidCastException");		
 		}
-
-		le = s->code;
-
 	}
+
+	x86_patch (br [0], s->code);
+	x86_pop_reg (s->code, tree->reg1);
 }
 
 reg: ISINST (reg) {
-	if (tree->reg1 != X86_EAX)
-		x86_push_reg (s->code, X86_EAX);
-	x86_push_reg (s->code, X86_ECX);
-	x86_push_reg (s->code, X86_EDX);
+	MonoClass *klass = tree->data.klass;
+	guint8 *br [3];
+	int lreg = tree->left->reg1;
+	
+	x86_push_reg (s->code, lreg);
+	x86_test_reg_reg (s->code, lreg, lreg);
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_EQ, 0, FALSE);
+
+	if (klass->flags & TYPE_ATTRIBUTE_INTERFACE) {
+		/* lreg = obj->vtable */
+		x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
+
+		x86_alu_membase_imm (s->code, X86_CMP, lreg, G_STRUCT_OFFSET (MonoVTable, max_interface_id), 
+				     klass->interface_id);
+		br [1] = s->code; x86_branch8 (s->code, X86_CC_LT, 0, FALSE);
+		/* lreg = obj->vtable->interface_offsets */
+		x86_mov_reg_membase (s->code, lreg, lreg, G_STRUCT_OFFSET (MonoVTable, interface_offsets), 4);
+		x86_alu_membase_imm (s->code, X86_CMP, lreg, klass->interface_id << 2, 0);
+		br [2] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		x86_patch (br [1], s->code);
+		x86_mov_membase_imm (s->code, X86_ESP, 0, 0, 4);
+		x86_patch (br [2], s->code);
 
-	x86_push_imm (s->code, tree->data.klass);
-	x86_push_reg (s->code, tree->left->reg1);
-	mono_add_jump_info (s, s->code + 1, mono_object_isinst, NULL);
-	x86_call_code (s->code, 0);
-	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
+	} else {
 
-	x86_pop_reg (s->code, X86_EDX);
-	x86_pop_reg (s->code, X86_ECX);
-	if (tree->reg1 != X86_EAX) {
-		x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
-		x86_pop_reg (s->code, X86_EAX);
+		/* lreg = obj->vtable */
+		x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
+		/* lreg = obj->vtable->klass */
+		x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
+
+		if (klass->rank) {
+
+			x86_alu_membase_imm (s->code, X86_CMP, lreg, G_STRUCT_OFFSET (MonoClass, rank), klass->rank);
+			br [1] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+			x86_mov_reg_membase (s->code, lreg, lreg, G_STRUCT_OFFSET (MonoClass, element_class), 4);
+			x86_mov_reg_membase (s->code, lreg, lreg, G_STRUCT_OFFSET (MonoClass, baseval), 4);
+			x86_alu_reg_mem (s->code, X86_SUB, lreg, &klass->element_class->baseval);
+			x86_alu_reg_mem (s->code, X86_CMP, lreg, &klass->element_class->diffval);
+			br [2] = s->code; x86_branch8 (s->code, X86_CC_LE, 0, FALSE);
+			x86_patch (br [1], s->code);
+			x86_mov_membase_imm (s->code, X86_ESP, 0, 0, 4);
+			x86_patch (br [2], s->code);
+
+		} else {
+
+			if (klass->marshalbyref) {
+				/* check for transparent_proxy */		
+				x86_alu_reg_imm (s->code, X86_CMP, lreg, (int)mono_defaults.transparent_proxy_class);
+				br [1] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		
+				/* lreg = obj */
+				x86_mov_reg_membase (s->code, lreg, X86_ESP, 0, 4);
+				x86_mov_reg_membase (s->code, lreg, lreg, G_STRUCT_OFFSET (MonoTransparentProxy, 
+											   klass), 4);
+				x86_patch (br [1], s->code);
+			}
+
+			x86_mov_reg_membase (s->code, lreg, lreg, G_STRUCT_OFFSET (MonoClass, baseval), 4);
+			x86_alu_reg_mem (s->code, X86_SUB, lreg, &klass->baseval);
+			x86_alu_reg_mem (s->code, X86_CMP, lreg, &klass->diffval);
+			br [2] = s->code; x86_branch8 (s->code, X86_CC_LE, 0, FALSE);
+			x86_mov_membase_imm (s->code, X86_ESP, 0, 0, 4);
+			x86_patch (br [2], s->code);
+		}
 	}
 
+	x86_patch (br [0], s->code);
+	x86_pop_reg (s->code, tree->reg1);
 }
 
 stmt: INITOBJ (reg) {
 	int i, j;
 
-	i = tree->data.i;
+	if (!(i = tree->data.i))
+		return;
 
 	if (i == 1 || i == 2 || i == 4) {
-		int t = X86_ECX;
-
-		if (tree->left->reg1 != X86_EAX) 
-			t = X86_EAX;
-
-		x86_push_reg (s->code, t);
-		x86_alu_reg_reg (s->code, X86_XOR, t, t);
-
-		switch (tree->data.i) {
-		case 4:
-			x86_mov_regp_reg (s->code, tree->left->reg1, t, 4);
-			break;
-		case 2:
-			x86_mov_regp_reg (s->code, tree->left->reg1, t, 4);
-			break;
-		case 1:
-			x86_mov_regp_reg (s->code, tree->left->reg1, t, 4);
-			break;
-		}
-		x86_pop_reg (s->code, t);
-
+		x86_mov_membase_imm (s->code, tree->left->reg1, 0, 0, i);
 		return;
 	}
 
 	i = tree->data.i / 4;
 	j = tree->data.i % 4;
 
-	x86_push_reg (s->code, X86_EAX);
-	
 	if (tree->left->reg1 != X86_EDI) {
 		x86_push_reg (s->code, X86_EDI);
 		x86_mov_reg_reg (s->code, X86_EDI, tree->left->reg1, 4);
 	}
 
 	if (i) {
-		x86_push_reg (s->code, X86_ECX);
 		x86_alu_reg_reg (s->code, X86_XOR, X86_EAX, X86_EAX);
 		x86_mov_reg_imm (s->code, X86_ECX, i);
 		x86_cld (s->code);
 		x86_prefix (s->code, X86_REP_PREFIX);
 		x86_stosl (s->code);
-		x86_pop_reg (s->code, X86_ECX);
+
+		for (i = 0; i < j; i++)
+			x86_stosb (s->code);
+
+	} else {
+		g_assert (j == 3);
+		x86_mov_membase_imm (s->code, X86_EDI, 0, 0, 2);
+		x86_mov_membase_imm (s->code, X86_EDI, 2, 0, 1);
 	}
 
 
-	for (i = 0; i < j; i++)
-		x86_stosb (s->code);
 
 	if (tree->left->reg1 != X86_EDI)
 		x86_pop_reg (s->code, X86_EDI);
-	
-	x86_pop_reg (s->code, X86_EAX);
 }
 
-stmt: NOP
+stmt: CPBLK (reg, CPSRC (reg, CONST_I4)) {
+	int dest_reg = tree->left->reg1;
+	int source_reg = tree->right->left->reg1;
+	int count = tree->right->right->data.i;
+	int sreg = dest_reg != X86_EAX ? X86_EAX : X86_EDX;
+	int spill_pos = 0, dest_offset = 0, source_offset = 0;
+	int save_esi = FALSE, save_edi = FALSE;
 
-stmt: POP (reg)
+	// TODO: handle unaligned. prefix
 
-stmt: BR {
-	mono_add_jump_info (s, s->code + 1, NULL, tree->data.bb);
-	x86_jump32 (s->code, 0); 
-}
+	switch (count) {
+	case 0:
+		break;
+	case 1:
+		x86_mov_reg_membase (s->code, sreg, source_reg, 0, 1);
+		x86_mov_membase_reg (s->code, dest_reg, 0, sreg, 1);
+		break;
+	case 2:
+		x86_mov_reg_membase (s->code, sreg, source_reg, 0, 2);
+		x86_mov_membase_reg (s->code, dest_reg, 0, sreg, 2);
+		break;
+	case 3:
+		x86_mov_reg_membase (s->code, sreg, source_reg, 0, 2);
+		x86_mov_membase_reg (s->code, dest_reg, 0, sreg, 2);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 2, 1);
+		x86_mov_membase_reg (s->code, dest_reg, 2, sreg, 1);
+		break;
+	case 4:
+		x86_mov_reg_membase (s->code, sreg, source_reg, 0, 4);
+		x86_mov_membase_reg (s->code, dest_reg, 0, sreg, 4);
+		break;
+	case 5:
+		x86_mov_reg_membase (s->code, sreg, source_reg, 0, 4);
+		x86_mov_membase_reg (s->code, dest_reg, 0, sreg, 4);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 4, 1);
+		x86_mov_membase_reg (s->code, dest_reg, 4, sreg, 1);
+		break;
+	case 6:
+		x86_mov_reg_membase (s->code, sreg, source_reg, 0, 4);
+		x86_mov_membase_reg (s->code, dest_reg, 0, sreg, 4);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 4, 2);
+		x86_mov_membase_reg (s->code, dest_reg, 4, sreg, 2);
+		break;
+	case 7:
+		x86_mov_reg_membase (s->code, sreg, source_reg, 0, 4);
+		x86_mov_membase_reg (s->code, dest_reg, 0, sreg, 4);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 4, 2);
+		x86_mov_membase_reg (s->code, dest_reg, 4, sreg, 2);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 6, 1);
+		x86_mov_membase_reg (s->code, dest_reg, 6, sreg, 1);
+		break;
+	case 8:
+		x86_fild_membase (s->code, source_reg, 0, TRUE);
+		x86_fist_pop_membase (s->code, dest_reg, 0, TRUE);
+		break;
+	case 9:
+		x86_fild_membase (s->code, source_reg, 0, TRUE);
+		x86_fist_pop_membase (s->code, dest_reg, 0, TRUE);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 8, 1);
+		x86_mov_membase_reg (s->code, dest_reg, 8, sreg, 1);
+		break;
+	case 10:
+		x86_fild_membase (s->code, source_reg, 0, TRUE);
+		x86_fist_pop_membase (s->code, dest_reg, 0, TRUE);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 8, 2);
+		x86_mov_membase_reg (s->code, dest_reg, 8, sreg, 2);
+		break;
+	case 11:
+		x86_fild_membase (s->code, source_reg, 0, TRUE);
+		x86_fist_pop_membase (s->code, dest_reg, 0, TRUE);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 8, 2);
+		x86_mov_membase_reg (s->code, dest_reg, 8, sreg, 2);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 10, 1);
+		x86_mov_membase_reg (s->code, dest_reg, 10, sreg, 1);
+		break;
+	case 12:
+		x86_fild_membase (s->code, source_reg, 0, TRUE);
+		x86_fist_pop_membase (s->code, dest_reg, 0, TRUE);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 8, 4);
+		x86_mov_membase_reg (s->code, dest_reg, 8, sreg, 4);
+		break;
+	case 13:
+		x86_fild_membase (s->code, source_reg, 0, TRUE);
+		x86_fist_pop_membase (s->code, dest_reg, 0, TRUE);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 8, 4);
+		x86_mov_membase_reg (s->code, dest_reg, 8, sreg, 4);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 12, 1);
+		x86_mov_membase_reg (s->code, dest_reg, 12, sreg, 1);
+		break;
+	case 14:
+		x86_fild_membase (s->code, source_reg, 0, TRUE);
+		x86_fist_pop_membase (s->code, dest_reg, 0, TRUE);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 8, 4);
+		x86_mov_membase_reg (s->code, dest_reg, 8, sreg, 4);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 12, 2);
+		x86_mov_membase_reg (s->code, dest_reg, 12, sreg, 2);
+		break;
+	case 15:
+		x86_fild_membase (s->code, source_reg, 0, TRUE);
+		x86_fist_pop_membase (s->code, dest_reg, 0, TRUE);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 8, 4);
+		x86_mov_membase_reg (s->code, dest_reg, 8, sreg, 4);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 12, 2);
+		x86_mov_membase_reg (s->code, dest_reg, 12, sreg, 2);
+		x86_mov_reg_membase (s->code, sreg, source_reg, 14, 1);
+		x86_mov_membase_reg (s->code, dest_reg, 14, sreg, 1);
+		break;
+	default: 
+		g_assert (count > 15);
+
+		if (dest_reg != X86_ESI && source_reg != X86_ESI &&
+		    mono_regset_reg_used (s->rs, X86_ESI))
+			save_esi = TRUE;
+		if (dest_reg != X86_EDI && source_reg != X86_EDI &&
+		    mono_regset_reg_used (s->rs, X86_EDI))
+			save_edi = TRUE;
+
+		if (save_esi)
+			x86_push_reg (s->code, X86_ESI);
+		if (save_edi)
+			x86_push_reg (s->code, X86_EDI);
+
+		if (dest_reg == X86_ESI) {
+			dest_offset = ++spill_pos; 
+		}	   
+		if (source_reg == X86_EDI) {
+			source_offset = ++spill_pos; 
+		}	   
+
+		if (source_offset)
+			x86_push_reg (s->code, source_reg);
+		if (dest_offset)
+			x86_push_reg (s->code, dest_reg);
+	
+		if (source_reg != X86_ESI) {
+			if (source_offset)
+				x86_mov_reg_membase (s->code, X86_ESI, X86_ESP, (source_offset-1)<<2, 4);
+			else
+				x86_mov_reg_reg (s->code, X86_ESI, source_reg, 4);
+		}
+		if (dest_reg != X86_EDI) {
+			if (dest_offset)
+				x86_mov_reg_membase (s->code, X86_EDI, X86_ESP, (dest_offset-1)<<2, 4);
+			else
+				x86_mov_reg_reg (s->code, X86_EDI, dest_reg, 4);
+		}
 
-stmt: BLT (reg, reg) 1 {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_LT, 0, TRUE); 
-}
+		x86_mov_reg_imm (s->code, X86_ECX, count >> 2);	
+		x86_cld (s->code);
+		x86_prefix (s->code, X86_REP_PREFIX);
+		x86_movsd (s->code);
 
-stmt: BLT (reg, CONST_I4) "MB_USE_OPT1(0)" {
-	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, tree->right->data.i);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_LT, 0, TRUE); 
-}
+		switch (count & 3) {
+		case 1:
+			x86_mov_reg_membase (s->code, sreg, X86_ESI, 0, 1);
+			x86_mov_membase_reg (s->code, X86_EDI, 0, sreg, 1);
+			break;
+		case 2:
+			x86_mov_reg_membase (s->code, sreg, X86_ESI, 0, 2);
+			x86_mov_membase_reg (s->code, X86_EDI, 0, sreg, 2);
+			break;
+		case 3:
+			x86_mov_reg_membase (s->code, sreg, X86_ESI, 0, 2);
+			x86_mov_membase_reg (s->code, X86_EDI, 0, sreg, 2);
+			x86_mov_reg_membase (s->code, sreg, X86_ESI, 2, 1);
+			x86_mov_membase_reg (s->code, X86_EDI, 2, sreg, 1);
+			break;
+		default:
+			break;
+		}
 
-stmt: BLT_UN (reg, reg) 1 {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_LT, 0, FALSE); 
-}
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, spill_pos<<2);
 
-stmt: BLT_UN (reg, CONST_I4) "MB_USE_OPT1(0)" {
-	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, tree->right->data.i);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_LT, 0, FALSE); 
-}
+		if (save_edi)
+			x86_pop_reg (s->code, X86_EDI);
+		if (save_esi)
+			x86_pop_reg (s->code, X86_ESI);
 
-stmt: BGT (reg, reg) 1 {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_GT, 0, TRUE); 
+		break;
+	}
+} cost {
+	MBCOND (mono_inline_memcpy);
+	return 0;
 }
 
-stmt: BGT (reg, CONST_I4) "MB_USE_OPT1(0)" {
-	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, tree->right->data.i);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_GT, 0, TRUE); 
-}
+stmt: CPBLK (reg, CPSRC (reg, reg)) {
+	int dest_reg = tree->left->reg1;
+	int source_reg = tree->right->left->reg1;
+	int size_reg = tree->right->right->reg1;
+	int spill_pos = 0, size_offset = 0, dest_offset = 0, source_offset = 0;
+	int save_esi = FALSE, save_edi = FALSE;
 
-stmt: BGT_UN (reg, reg) 1 {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_GT, 0, FALSE); 
-}
+	if (!mono_inline_memcpy) {
+		x86_push_reg (s->code, size_reg);
+		x86_push_reg (s->code, source_reg);
+		x86_push_reg (s->code, dest_reg);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, memmove);
+		x86_call_code (s->code, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 12);
+	} else {
+		if (dest_reg != X86_ESI && source_reg != X86_ESI && size_reg != X86_ESI &&
+		    mono_regset_reg_used (s->rs, X86_ESI))
+			save_esi = TRUE;
+		if (dest_reg != X86_EDI && source_reg != X86_EDI && size_reg != X86_EDI &&
+		    mono_regset_reg_used (s->rs, X86_EDI))
+			save_edi = TRUE;
+
+		if (save_esi)
+			x86_push_reg (s->code, X86_ESI);
+		if (save_edi)
+			x86_push_reg (s->code, X86_EDI);
+
+		if (size_reg == X86_EDI || size_reg == X86_ESI) {
+			size_offset = ++spill_pos; 
+		}	   
+		if (dest_reg == X86_ECX || dest_reg == X86_ESI) {
+			dest_offset = ++spill_pos; 
+		}	   
+		if (source_reg == X86_ECX || source_reg == X86_EDI) {
+			source_offset = ++spill_pos; 
+		}	   
+
+		if (source_offset)
+			x86_push_reg (s->code, source_reg);
+		if (dest_offset)
+			x86_push_reg (s->code, dest_reg);
+		if (size_offset)
+			x86_push_reg (s->code, size_reg);
+	
+		if (source_reg != X86_ESI) {
+			if (source_offset)
+				x86_mov_reg_membase (s->code, X86_ESI, X86_ESP, (source_offset-1)<<2, 4);
+			else
+				x86_mov_reg_reg (s->code, X86_ESI, source_reg, 4);
+		}
+		if (dest_reg != X86_EDI) {
+			if (dest_offset)
+				x86_mov_reg_membase (s->code, X86_EDI, X86_ESP, (dest_offset-1)<<2, 4);
+			else
+				x86_mov_reg_reg (s->code, X86_EDI, dest_reg, 4);
+		}
+		if (size_reg != X86_ECX) {
+			if (size_offset)
+				x86_mov_reg_membase (s->code, X86_ECX, X86_ESP, (size_offset-1)<<2, 4);
+			else
+				x86_mov_reg_reg (s->code, X86_ECX, size_reg, 4);
+		}
 
-stmt: BGT_UN (reg, CONST_I4) "MB_USE_OPT1(0)" {
-	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, tree->right->data.i);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_GT, 0, FALSE); 
+		x86_push_reg (s->code, X86_ECX);
+		x86_shift_reg_imm (s->code, X86_SHR, X86_ECX, 2);
+
+		x86_cld (s->code);
+	
+		// move whole dwords first
+		x86_prefix (s->code, X86_REP_PREFIX);
+		x86_movsd (s->code);
+
+		x86_pop_reg (s->code, X86_ECX);
+		x86_alu_reg_imm (s->code, X86_AND, X86_ECX, 3);
+
+		// move remaining bytes (if any)
+		x86_prefix (s->code, X86_REP_PREFIX);
+		x86_movsb (s->code);
+
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, spill_pos<<2);
+		
+		if (save_edi)
+			x86_pop_reg (s->code, X86_EDI);
+		if (save_esi)
+			x86_pop_reg (s->code, X86_ESI);
+	}
 }
 
-stmt: BEQ (reg, CONST_I4) "MB_USE_OPT1(0)" {
-	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, tree->right->data.i);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_EQ, 0, TRUE);
+stmt: INITBLK (reg, CPSRC (reg, CONST_I4)) {
+	int dest_reg = tree->left->reg1;
+	int value_reg = tree->right->left->reg1;
+	int size = tree->right->right->data.i;
+	int spill_pos = 0, dest_offset = 0, value_offset = 0;
+	int save_edi = FALSE;
+	int i, j;
+
+	i = size / 4;
+	j = size % 4;
+
+	if (mono_inline_memcpy) {
+
+		if (dest_reg != X86_EDI && value_reg != X86_EDI &&
+		    mono_regset_reg_used (s->rs, X86_EDI)) {
+			save_edi = TRUE;
+			x86_push_reg (s->code, X86_EDI);
+		}
+
+		if (dest_reg == X86_ECX || dest_reg == X86_EAX) {
+			dest_offset = ++spill_pos; 
+		}	   
+		if (value_reg == X86_ECX || value_reg == X86_EDI) {
+			value_offset = ++spill_pos; 
+		}	   
+
+		if (value_offset)
+			x86_push_reg (s->code, value_reg);
+		if (dest_offset)
+			x86_push_reg (s->code, dest_reg);
+
+		if (value_reg != X86_EAX) {
+			if (value_offset)
+				x86_mov_reg_membase (s->code, X86_EAX, X86_ESP, (value_offset-1)<<2, 4);
+			else
+				x86_mov_reg_reg (s->code, X86_EAX, value_reg, 4);
+		}
+		if (dest_reg != X86_EDI) {
+			if (dest_offset)
+				x86_mov_reg_membase (s->code, X86_EDI, X86_ESP, (dest_offset-1)<<2, 4);
+			else
+				x86_mov_reg_reg (s->code, X86_EDI, dest_reg, 4);
+		}
+
+		x86_widen_reg (s->code, X86_EAX, X86_EAX, FALSE, FALSE);
+		x86_mov_reg_reg (s->code, X86_EDX, X86_EAX, 4);
+		x86_shift_reg_imm (s->code, X86_SHL, X86_EAX, 8);
+		x86_alu_reg_reg (s->code, X86_OR, X86_EAX, X86_EDX);
+		x86_mov_reg_reg (s->code, X86_EDX, X86_EAX, 4);
+		x86_shift_reg_imm (s->code, X86_SHL, X86_EAX, 16);
+		x86_alu_reg_reg (s->code, X86_OR, X86_EAX, X86_EDX);
+
+		if (i) {
+			x86_mov_reg_imm (s->code, X86_ECX, i);
+			x86_cld (s->code);
+			x86_prefix (s->code, X86_REP_PREFIX);
+			x86_stosd (s->code);
+		}
+
+		for (i = 0; i < j; i++)
+			x86_stosb (s->code);
+	
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, spill_pos<<2);
+
+		if (save_edi)
+			x86_pop_reg (s->code, X86_EDI);
+
+	} else {
+		x86_push_imm (s->code, size);
+		x86_push_reg (s->code, value_reg);
+		x86_push_reg (s->code, dest_reg);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, memset);
+		x86_call_code (s->code, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 12);
+	}
+} cost {
+	MBCOND (mono_inline_memcpy);
+	return 0;
 }
 
-stmt: BEQ (reg, reg) 1 {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_EQ, 0, TRUE);
+stmt: INITBLK (reg, CPSRC (reg, reg)) {
+	int dest_reg = tree->left->reg1;
+	int value_reg = tree->right->left->reg1;
+	int size_reg = tree->right->right->reg1;
+	int spill_pos = 0, size_offset = 0, dest_offset = 0, value_offset = 0;
+	int save_edi = FALSE;
+
+	if (mono_inline_memcpy) {
+
+		if (dest_reg != X86_EDI && size_reg != X86_EDI && size_reg != X86_EDI &&
+		    mono_regset_reg_used (s->rs, X86_EDI)) {
+			save_edi = TRUE;
+			x86_push_reg (s->code, X86_EDI);
+		}
+
+		if (size_reg == X86_EDI || size_reg == X86_EAX) {
+			size_offset = ++spill_pos; 
+		}	   
+		if (dest_reg == X86_ECX || dest_reg == X86_EAX) {
+			dest_offset = ++spill_pos; 
+		}	   
+		if (value_reg == X86_ECX || value_reg == X86_EDI) {
+			value_offset = ++spill_pos; 
+		}	   
+
+		if (value_offset)
+			x86_push_reg (s->code, value_reg);
+		if (dest_offset)
+			x86_push_reg (s->code, dest_reg);
+		if (size_offset)
+			x86_push_reg (s->code, size_reg);
+
+		if (value_reg != X86_EAX) {
+			if (value_offset)
+				x86_mov_reg_membase (s->code, X86_EAX, X86_ESP, (value_offset-1)<<2, 4);
+			else
+				x86_mov_reg_reg (s->code, X86_EAX, value_reg, 4);
+		}
+		if (dest_reg != X86_EDI) {
+			if (dest_offset)
+				x86_mov_reg_membase (s->code, X86_EDI, X86_ESP, (dest_offset-1)<<2, 4);
+			else
+				x86_mov_reg_reg (s->code, X86_EDI, dest_reg, 4);
+		}
+		if (size_reg != X86_ECX) {
+			if (size_offset)
+				x86_mov_reg_membase (s->code, X86_ECX, X86_ESP, (size_offset-1)<<2, 4);
+			else
+				x86_mov_reg_reg (s->code, X86_ECX, size_reg, 4);
+		}
+
+		x86_widen_reg (s->code, X86_EAX, X86_EAX, FALSE, FALSE);
+		x86_mov_reg_reg (s->code, X86_EDX, X86_EAX, 4);
+		x86_shift_reg_imm (s->code, X86_SHL, X86_EAX, 8);
+		x86_alu_reg_reg (s->code, X86_OR, X86_EAX, X86_EDX);
+		x86_mov_reg_reg (s->code, X86_EDX, X86_EAX, 4);
+		x86_shift_reg_imm (s->code, X86_SHL, X86_EAX, 16);
+		x86_alu_reg_reg (s->code, X86_OR, X86_EAX, X86_EDX);
+
+		x86_push_reg (s->code, X86_ECX);
+		x86_shift_reg_imm (s->code, X86_SHR, X86_ECX, 2);
+		x86_cld (s->code);
+
+		// init whole dwords first
+		x86_prefix (s->code, X86_REP_PREFIX);
+		x86_stosd (s->code);
+
+		x86_pop_reg (s->code, X86_ECX);
+		x86_alu_reg_imm (s->code, X86_AND, X86_ECX, 3);
+
+		// init remaining bytes (if any)
+		x86_prefix (s->code, X86_REP_PREFIX);
+		x86_stosb (s->code);
+
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, spill_pos<<2);
+
+		if (save_edi)
+			x86_pop_reg (s->code, X86_EDI);
+
+	} else {
+		x86_push_reg (s->code, size_reg);
+		x86_push_reg (s->code, value_reg);
+		x86_push_reg (s->code, dest_reg);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, memset);
+		x86_call_code (s->code, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 12);
+	}
 }
 
-stmt: BNE_UN (reg, reg) 1 {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+stmt: NOP
+
+stmt: POP (reg)
+
+stmt: BR {
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bb);
+	x86_jump32 (s->code, 0); 
 }
 
-stmt: BNE_UN (reg, CONST_I4) "MB_USE_OPT1(0)" {
-	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, tree->right->data.i);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+cflags: COMPARE (reg, LDIND_I4 (ADDR_L)) {
+	int treg = VARINFO (s, tree->right->left->data.i).reg;
+	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, treg);
+} cost {
+	MBCOND ((VARINFO (data, tree->right->left->data.i).reg >= 0));
+	return 0;
 }
 
-stmt: BGE (reg, reg) 1 {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_GE, 0, TRUE);
+cflags: COMPARE (LDIND_I4 (ADDR_L), CONST_I4) {
+	int treg = VARINFO (s, tree->left->left->data.i).reg;
+	x86_alu_reg_imm (s->code, X86_CMP, treg, tree->right->data.i);
+} cost {
+	MBCOND ((VARINFO (data, tree->left->left->data.i).reg >= 0));
+	return 0;
 }
 
-stmt: BGE (reg, CONST_I4) "MB_USE_OPT1(0)" {
-	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, tree->right->data.i);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_GE, 0, TRUE);
+cflags: COMPARE (LDIND_I4 (ADDR_L), reg) {
+	int treg = VARINFO (s, tree->left->left->data.i).reg;
+	x86_alu_reg_reg (s->code, X86_CMP, treg, tree->right->reg1);
+} cost {
+	MBCOND ((VARINFO (data, tree->left->left->data.i).reg >= 0));
+	return 0;
 }
 
-stmt: BGE_UN (reg, reg) 1 {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_GE, 0, FALSE);
+cflags: COMPARE (LDIND_I4 (ADDR_L), CONST_I4) {
+	int offset = VARINFO (s, tree->left->left->data.i).offset;
+	x86_alu_membase_imm (s->code, X86_CMP, X86_EBP, offset,  tree->right->data.i);
+} cost {
+	MBCOND ((VARINFO (data, tree->left->left->data.i).reg < 0));
+	return 0;
 }
 
-stmt: BGE_UN (reg, CONST_I4) "MB_USE_OPT1(0)" {
+cflags: COMPARE (reg, CONST_I4) {
 	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, tree->right->data.i);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_GE, 0, FALSE);
 }
 
-stmt: BLE (reg, reg) 1 {
+cflags: COMPARE (reg, reg) {
 	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_LE, 0, TRUE);
 }
 
-stmt: BLE (reg, CONST_I4) "MB_USE_OPT1(0)" {
-	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, tree->right->data.i);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_LE, 0, TRUE);
-}
 
-stmt: BLE_UN (reg, reg) 1 {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_LE, 0, FALSE);
+stmt: CBRANCH (cflags) {
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+
+	switch (tree->data.bi.cond) {
+	case CEE_BLT:
+		x86_branch32 (s->code, X86_CC_LT, 0, TRUE); 
+		break;
+	case CEE_BLT_UN:
+		x86_branch32 (s->code, X86_CC_LT, 0, FALSE); 
+		break;
+	case CEE_BGT:
+		x86_branch32 (s->code, X86_CC_GT, 0, TRUE); 
+		break;
+	case CEE_BGT_UN:
+		x86_branch32 (s->code, X86_CC_GT, 0, FALSE); 
+		break;
+	case CEE_BEQ:
+		x86_branch32 (s->code, X86_CC_EQ, 0, TRUE);
+		break;
+	case CEE_BNE_UN:
+		x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+		break;
+	case CEE_BGE:
+		x86_branch32 (s->code, X86_CC_GE, 0, TRUE);
+		break;
+	case CEE_BGE_UN:
+		x86_branch32 (s->code, X86_CC_GE, 0, FALSE);
+		break;
+	case CEE_BLE:
+		x86_branch32 (s->code, X86_CC_LE, 0, TRUE);
+		break;
+	case CEE_BLE_UN:
+		x86_branch32 (s->code, X86_CC_LE, 0, FALSE);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
 }
 
-stmt: BLE_UN (reg, CONST_I4) "MB_USE_OPT1(0)" {
-	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, tree->right->data.i);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_LE, 0, FALSE);
+stmt: BRTRUE (LDIND_I4 (ADDR_L)) {
+	int treg = VARINFO (s, tree->left->left->data.i).reg;
+	int offset = VARINFO (s, tree->left->left->data.i).offset;
+
+	if (treg >= 0)
+		x86_test_reg_reg (s->code, treg, treg);
+	else
+		x86_alu_membase_imm (s->code, X86_CMP, X86_EBP, offset, 0);
+
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bb);
+	x86_branch32 (s->code, X86_CC_NE, 0, TRUE);
 }
 
 stmt: BRTRUE (reg) {
 	x86_test_reg_reg (s->code, tree->left->reg1, tree->left->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bb);
 	x86_branch32 (s->code, X86_CC_NE, 0, TRUE);
 }
 
+stmt: BRFALSE (LDIND_I4 (ADDR_L)) {
+	int treg = VARINFO (s, tree->left->left->data.i).reg;
+	int offset = VARINFO (s, tree->left->left->data.i).offset;
+
+	if (treg >= 0)
+		x86_test_reg_reg (s->code, treg, treg);
+	else
+		x86_alu_membase_imm (s->code, X86_CMP, X86_EBP, offset, 0);
+
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bb);
+	x86_branch32 (s->code, X86_CC_EQ, 0, TRUE);
+
+	//{static int cx= 0; printf ("CX1 %5d\n", cx++);}
+}
+
 stmt: BRFALSE (reg) {
 	x86_test_reg_reg (s->code, tree->left->reg1, tree->left->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bb);
 	x86_branch32 (s->code, X86_CC_EQ, 0, TRUE);
 }
 
@@ -1489,21 +2694,23 @@ stmt: RET (reg) {
 		x86_mov_reg_reg (s->code, X86_EAX, tree->left->reg1, 4);
 
 	if (!tree->last_instr) {
-		mono_add_jump_info (s, s->code + 1, NULL, NULL);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_EPILOG, NULL);
 		x86_jump32 (s->code, 0);      
 	}
 }
 
 stmt: RET_VOID {
 	if (!tree->last_instr) {
-		mono_add_jump_info (s, s->code + 1, NULL, NULL);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_EPILOG, NULL);
 		x86_jump32 (s->code, 0);      
 	} 
 }
 
-
 stmt: ARG_I4 (LDIND_I4 (addr)) {
 	MBTree *at = tree->left->left;
+	int pad = tree->data.arg_info.pad;
+
+	X86_ARG_PAD (pad);
 
 	switch (at->data.ainfo.amode) {
 
@@ -1526,59 +2733,35 @@ stmt: ARG_I4 (LDIND_I4 (addr)) {
 	}
 }
 
-stmt: ARG_I4 (LDIND_U4 (addr)) {
-	MBTree *at = tree->left->left;
-
-	switch (at->data.ainfo.amode) {
-
-	case AMImmediate:
-		x86_push_mem (s->code, at->data.ainfo.offset);
-		break;
+stmt: ARG_I4 (LDIND_I4 (ADDR_L)) {
+	int treg = VARINFO (s, tree->left->left->data.i).reg;
+	int pad = tree->data.arg_info.pad;
 
-	case AMBase:
-		x86_push_membase (s->code, at->data.ainfo.basereg, at->data.ainfo.offset);
-		break;		
-	case AMIndex:
-		x86_push_memindex (s->code, X86_NOBASEREG, at->data.ainfo.offset,
-				   at->data.ainfo.indexreg, at->data.ainfo.shift);
-		break;		
-	case AMBaseIndex:
-		x86_push_memindex (s->code, at->data.ainfo.basereg, 
-				   at->data.ainfo.offset, at->data.ainfo.indexreg, 
-				   at->data.ainfo.shift);
-		break;		
-	}
+	X86_ARG_PAD (pad);
+	x86_push_reg (s->code, treg);
+} cost {
+	MBCOND ((VARINFO (data, tree->left->left->data.i).reg >= 0));
+	return 0;
 }
 
 stmt: ARG_I4 (reg) {
-	x86_push_reg (s->code, tree->left->reg1);
-	PRINT_REG ("ARG_I4",  tree->left->reg1);
-}
-
-# fixme: we must free the allocated strings somewhere
-stmt: ARG_STRING (reg) {
-	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
-	x86_push_reg (s->code, X86_EAX);
-	x86_push_reg (s->code, X86_ECX);
-	x86_push_reg (s->code, X86_EDX);
+	int pad = tree->data.arg_info.pad;
 
+	X86_ARG_PAD (pad);
 	x86_push_reg (s->code, tree->left->reg1);
-	mono_add_jump_info (s, s->code + 1, mono_string_to_utf8, NULL);
-	x86_call_code (s->code, 0);
-	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
-	
-	x86_mov_membase_reg (s->code, X86_ESP, 12, X86_EAX, 4);
-
-	x86_pop_reg (s->code, X86_EDX);
-	x86_pop_reg (s->code, X86_ECX);
-	x86_pop_reg (s->code, X86_EAX);
 }
 
 stmt: ARG_I4 (ADDR_G) {
+	int pad = tree->data.arg_info.pad;
+
+	X86_ARG_PAD (pad);
 	x86_push_imm (s->code, tree->left->data.p);
 }
 
 stmt: ARG_I4 (CONST_I4) "MB_USE_OPT1(0)" {
+	int pad = tree->data.arg_info.pad;
+
+	X86_ARG_PAD (pad);
 	x86_push_imm (s->code, tree->left->data.i);
 }
 
@@ -1586,10 +2769,46 @@ this: reg {
 	PRINT_REG ("THIS", tree->reg1);
 }
 
+reg: CHECKTHIS (reg) {
+	/* try to access the vtable - this will raise an exception
+	 * if the object is NULL */
+	x86_alu_membase_imm (s->code, X86_CMP, tree->left->reg1, 0, 0);
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+}
+
+stmt: CHECKTHIS (reg) {
+	x86_alu_membase_imm (s->code, X86_CMP, tree->left->reg1, 0, 0);
+}
+
+stmt: JMP
+{
+	int pos = -4;
+
+	/* restore callee saved registers */
+	if (mono_regset_reg_used (s->rs, X86_EBX)) {
+		x86_mov_reg_membase (s->code, X86_EBX, X86_EBP, pos, 4);
+		pos -= 4;
+	}
+	if (mono_regset_reg_used (s->rs, X86_EDI)) {
+		x86_mov_reg_membase (s->code, X86_EDI, X86_EBP, pos, 4);
+		pos -= 4;
+	}
+	if (mono_regset_reg_used (s->rs, X86_ESI)) {
+		x86_mov_reg_membase (s->code, X86_ESI, X86_EBP, pos, 4);
+		pos -= 4;
+	}
+	/* restore ESP/EBP */
+	x86_leave (s->code);
+
+	/* jump to the method */
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, tree->data.p);
+	x86_jump32 (s->code, 0);
+}
+
 this: NOP
 
 reg: CALL_I4 (this, reg) {
-	MethodCallInfo *ci = tree->data.ci;
 	int treg = X86_EAX;
 	int lreg = tree->left->reg1;
 	int rreg = tree->right->reg1;
@@ -1599,87 +2818,65 @@ reg: CALL_I4 (this, reg) {
 	if (lreg == treg || rreg == treg) 
 		treg = X86_ECX;
 	if (lreg == treg || rreg == treg) 
-		g_assert_not_reached ();
+		mono_assert_not_reached ();
 
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
-
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
+	X86_CALL_BEGIN;
 
 	x86_call_reg (s->code, rreg);
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
-	
-	PRINT_REG ("CALL_I4", tree->reg1);
+	X86_CALL_END;
 
-	g_assert (tree->reg1 == X86_EAX);
+	mono_assert (tree->reg1 == X86_EAX);
 }
 
 reg: CALL_I4 (this, ADDR_G) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 	
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
+	X86_CALL_BEGIN;
 
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
-
-	mono_add_jump_info (s, s->code + 1, tree->right->data.p, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, tree->right->data.p);
 	x86_call_code (s->code, 0);
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
+	X86_CALL_END;
 
-	PRINT_REG ("CALL_I4", tree->reg1);
-
-	g_assert (tree->reg1 == X86_EAX);
+	mono_assert (tree->reg1 == X86_EAX);
 }
 
-reg: LDFTN (reg, INTF_ADDR) {
-	int lreg = tree->left->reg1;
+reg: LDVIRTFTN (reg, INTF_ADDR) {
+	/* we cant return the value in the vtable, because it can be
+	 * a magic trampoline, and we cant pass that to the outside world */
+	
+	if (tree->reg1 != X86_EAX)
+		x86_push_reg (s->code, X86_EAX);
+	x86_push_reg (s->code, X86_ECX);
+	x86_push_reg (s->code, X86_EDX);
 
-	x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
-	x86_mov_reg_membase (s->code, lreg, lreg, 
-	        G_STRUCT_OFFSET (MonoVTable, interface_offsets), 4);
-	x86_mov_reg_membase (s->code, lreg, lreg, tree->right->data.m->klass->interface_id << 2, 4);
-	x86_mov_reg_membase (s->code, tree->reg1, lreg, tree->right->data.m->slot << 2, 4);
+	x86_push_imm (s->code, tree->right->data.m->klass->interface_id);
+	x86_push_reg (s->code, tree->left->reg1);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_ldintftn);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
+
+	x86_pop_reg (s->code, X86_EDX);
+	x86_pop_reg (s->code, X86_ECX);
+	if (tree->reg1 != X86_EAX) {
+		x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
+		x86_pop_reg (s->code, X86_EAX);
+	}
 }
 
 reg: CALL_I4 (this, INTF_ADDR) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
-
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
+	X86_CALL_BEGIN;
 
 	x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
 	x86_mov_reg_membase (s->code, lreg, lreg, 
@@ -1687,97 +2884,114 @@ reg: CALL_I4 (this, INTF_ADDR) {
 	x86_mov_reg_membase (s->code, lreg, lreg, tree->right->data.m->klass->interface_id << 2, 4);
 	x86_call_virtual (s->code, lreg, tree->right->data.m->slot << 2);
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
+	X86_CALL_END;
 
-	PRINT_REG ("CALL_I4(INTERFACE)", tree->reg1);
-
-	g_assert (tree->reg1 == X86_EAX);
+	mono_assert (tree->reg1 == X86_EAX);
 }
 
-reg: LDFTN (reg, VFUNC_ADDR) {
-	int lreg = tree->left->reg1;
-	
-	x86_mov_reg_membase (s->code, tree->reg1, lreg, 0, 4);
+reg: LDVIRTFTN (reg, VFUNC_ADDR) {
+	/* we cant return the value in the vtable, because it can be
+	 * a magic trampoline, and we cant pass that to the outside world */
 	
-	x86_mov_reg_membase (s->code, tree->reg1, tree->reg1, G_STRUCT_OFFSET (MonoVTable, vtable) + (tree->right->data.m->slot << 2), 4);
+	if (tree->reg1 != X86_EAX)
+		x86_push_reg (s->code, X86_EAX);
+	x86_push_reg (s->code, X86_ECX);
+	x86_push_reg (s->code, X86_EDX);
+
+	x86_push_imm (s->code, tree->right->data.m->slot);
+	x86_push_reg (s->code, tree->left->reg1);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_ldvirtftn);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
+
+	x86_pop_reg (s->code, X86_EDX);
+	x86_pop_reg (s->code, X86_ECX);
+	if (tree->reg1 != X86_EAX) {
+		x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
+		x86_pop_reg (s->code, X86_EAX);
+	}
 }
 
+reg: LDFTN {
+	if (tree->reg1 != X86_EAX)
+		x86_push_reg (s->code, X86_EAX);
+	x86_push_reg (s->code, X86_ECX);
+	x86_push_reg (s->code, X86_EDX);
+
+	x86_push_imm (s->code, tree->data.m);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_ldftn);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, sizeof (gpointer));
+
+	x86_pop_reg (s->code, X86_EDX);
+	x86_pop_reg (s->code, X86_ECX);
+	if (tree->reg1 != X86_EAX) {
+		x86_mov_reg_reg (s->code, tree->reg1, X86_EAX, 4);
+		x86_pop_reg (s->code, X86_EAX);
+	}
+}
+
+
 reg: CALL_I4 (this, VFUNC_ADDR) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
-
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
+	X86_CALL_BEGIN;
 
 	x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);	
 	x86_call_virtual (s->code, lreg, 
 	        G_STRUCT_OFFSET (MonoVTable, vtable) + (tree->right->data.m->slot << 2));
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
-
-	PRINT_REG ("CALL_I4(VIRTUAL)", tree->reg1);
+	X86_CALL_END;
 
-	g_assert (tree->reg1 == X86_EAX);
+	mono_assert (tree->reg1 == X86_EAX);
 }
 
 stmt: CALL_VOID (this, ADDR_G) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 	
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
-
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
+	X86_CALL_BEGIN;
 
-	mono_add_jump_info (s, s->code + 1, tree->right->data.p, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, tree->right->data.p);
 	x86_call_code (s->code, 0);
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
+	X86_CALL_END;
+}
+
+stmt: CALL_VOID (this, reg) {
+	int treg = X86_EAX;
+	int lreg = tree->left->reg1;
+	int rreg = tree->right->reg1;
+
+	if (lreg == treg || rreg == treg) 
+		treg = X86_EDX;
+	if (lreg == treg || rreg == treg) 
+		treg = X86_ECX;
+	if (lreg == treg || rreg == treg) 
+		mono_assert_not_reached ();
+	
+	X86_CALL_BEGIN;
+
+	x86_call_reg (s->code, tree->right->reg1);
+
+	X86_CALL_END;
 }
 
 stmt: CALL_VOID (this, INTF_ADDR) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
-
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
+	X86_CALL_BEGIN;
 
 	x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
 	x86_mov_reg_membase (s->code, lreg, lreg, 
@@ -1785,35 +2999,23 @@ stmt: CALL_VOID (this, INTF_ADDR) {
 	x86_mov_reg_membase (s->code, lreg, lreg, tree->right->data.m->klass->interface_id << 2, 4);
 	x86_call_virtual (s->code, lreg, tree->right->data.m->slot << 2);
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
+	X86_CALL_END;
 }
 
 stmt: CALL_VOID (this, VFUNC_ADDR) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
-
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
+	X86_CALL_BEGIN;
 
 	x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
 	x86_call_virtual (s->code, lreg, 
 	        G_STRUCT_OFFSET (MonoVTable, vtable) + (tree->right->data.m->slot << 2));
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
+	X86_CALL_END;
 }
 
 stmt: SWITCH (reg) {
@@ -1833,14 +3035,36 @@ stmt: SWITCH (reg) {
 # 64 bit integers
 #
 
+reg: CONV_I1 (lreg) {
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, TRUE, FALSE);
+} 
+
+reg: CONV_U1 (lreg) {
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, FALSE, FALSE);
+} 
+
+reg: CONV_I2 (lreg) {
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, TRUE, TRUE);
+} 
+
+reg: CONV_U2 (lreg) {
+	x86_widen_reg (s->code, tree->reg1, tree->left->reg1, FALSE, TRUE);
+} 
+
 reg: CONV_I4 (lreg) {
 	if (tree->reg1 != tree->left->reg1)
 		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 } 
 
+reg: CONV_U4 (lreg) {
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+} 
+
+
 reg: CONV_OVF_I4 (lreg){
 	guint8 *start = s->code;
-	gpointer o1, o2, o3, o4, o5;
+	guchar* o1, *o2, *o3, *o4, *o5;
 	int i;
 
 	/* 
@@ -1862,7 +3086,8 @@ reg: CONV_OVF_I4 (lreg){
 
 		/* throw exception */
 		x86_push_imm (s->code, "OverflowException");
-		mono_add_jump_info (s, s->code + 1, arch_get_throw_exception_by_name (), NULL);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, 
+				    arch_get_throw_exception_by_name ());
 		x86_call_code (s->code, 0);
 	
 		o3 = s->code;
@@ -1878,6 +3103,40 @@ reg: CONV_OVF_I4 (lreg){
 			x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 	}
 }
+reg: CONV_OVF_I4 (lreg){
+	guint8 *br [3], *label [1];
+
+	/* 
+	 * Valid ints: 0xffffffff:8000000 to 00000000:0x7f000000
+	 */
+	x86_test_reg_reg (s->code, tree->left->reg1, tree->left->reg1);
+
+	/* If the low word top bit is set, see if we are negative */
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_LT, 0, TRUE);
+
+	/* We are not negative (no top bit set, check for our top word to be zero */
+	x86_test_reg_reg (s->code, tree->left->reg2, tree->left->reg2);
+	br [1] = s->code; x86_branch8 (s->code, X86_CC_EQ, 0, TRUE);
+	label [0] = s->code;
+
+	/* throw exception */
+	x86_push_imm (s->code, "OverflowException");
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, 
+			    arch_get_throw_exception_by_name ());
+	x86_call_code (s->code, 0);
+	
+	x86_patch (br [0], s->code);
+	/* our top bit is set, check that top word is 0xfffffff */
+	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg2, 0xffffffff);
+		
+	x86_patch (br [1], s->code);
+	/* nope, emit exception */
+	br [2] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, TRUE);
+	x86_patch (br [2], label [0]);
+
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+}
 
 reg: CONV_OVF_U4 (lreg) {
 	/* Keep in sync with CONV_OVF_I4_UN below, they are the same on 32-bit machines */
@@ -1904,13 +3163,6 @@ lreg: CONST_I8 1 {
 	x86_mov_reg_imm (s->code, tree->reg2, *((gint32 *)&tree->data.p + 1));
 }
 
-reg: CONV_I1 (lreg) {
-	x86_alu_reg_imm (s->code, X86_AND, tree->left->reg1, 0xff);
-
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-}
-
 lreg: CONV_I8 (CONST_I4) {
 	x86_mov_reg_imm (s->code, tree->reg1, tree->left->data.i);
 
@@ -1926,12 +3178,12 @@ lreg: CONV_I8 (reg) {
 	if (tree->reg1 != tree->left->reg1)
 		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
 
-	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, 0);
 	x86_alu_reg_reg (s->code, X86_XOR, tree->reg2, tree->reg2);
+	x86_alu_reg_imm (s->code, X86_CMP, tree->left->reg1, 0);
 	x86_branch8 (s->code, X86_CC_GE, 5, TRUE);
 	i1 = s->code;
 	x86_mov_reg_imm (s->code, tree->reg2, -1); 
-	g_assert ((s->code - i1) == 5);
+	mono_assert ((s->code - i1) == 5);
 }
 
 lreg: CONV_U8 (CONST_I4) 1 {
@@ -1939,10 +3191,17 @@ lreg: CONV_U8 (CONST_I4) 1 {
 	x86_alu_reg_reg (s->code, X86_XOR, tree->reg2, tree->reg2);
 }
 
+lreg: CONV_U8 (reg) {
+	if (tree->reg1 != tree->left->reg1)
+		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
+	x86_alu_reg_reg (s->code, X86_XOR, tree->reg2, tree->reg2);
+}
+
 lreg: CONV_OVF_U8 (CONST_I4) {
 	if (tree->left->data.i < 0){
 		x86_push_imm (s->code, "OverflowException");
-		mono_add_jump_info (s, s->code + 1, arch_get_throw_exception_by_name (), NULL);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, 
+				    arch_get_throw_exception_by_name ());
 		x86_call_code (s->code, 0);
 	} else {
 		x86_mov_reg_imm (s->code, tree->reg1, tree->left->data.i);
@@ -1972,7 +3231,7 @@ lreg: CONV_OVF_I8_UN (reg) {
 }
 
 stmt: STIND_I8 (addr, lreg) {
-       
+
 	switch (tree->left->data.ainfo.amode) {
 
 	case AMImmediate:
@@ -2003,9 +3262,45 @@ stmt: STIND_I8 (addr, lreg) {
 				      tree->right->reg2, 4);
 		break;		
 	}
+}
+
+stmt: REMOTE_STIND_I8 (reg, lreg) {
+	guint8 *br[2];
+	int offset;
+
+	x86_push_reg (s->code, tree->right->reg1);
+	x86_mov_reg_membase (s->code, tree->right->reg1, tree->left->reg1, 0, 4);
+	x86_alu_membase_imm (s->code, X86_CMP, tree->right->reg1, 0, ((int)mono_defaults.transparent_proxy_class));
+	x86_pop_reg (s->code, tree->right->reg1);
+	
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+
+	/* this is a transparent proxy - remote the call */
 
+	/* save value to stack */
+	x86_push_reg (s->code, tree->right->reg2);
+	x86_push_reg (s->code, tree->right->reg1);
+
+	x86_push_reg (s->code, X86_ESP);
+	x86_push_imm (s->code, tree->data.fi.field);
+	x86_push_imm (s->code, tree->data.fi.klass);
+	x86_push_reg (s->code, tree->left->reg1);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_store_remote_field);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 24);
+
+	br [1] = s->code; x86_jump8 (s->code, 0);
+
+	x86_patch (br [0], s->code);
+	offset = tree->data.fi.klass->valuetype ? tree->data.fi.field->offset - sizeof (MonoObject) : 
+		tree->data.fi.field->offset;
+	x86_mov_membase_reg (s->code, tree->left->reg1, offset, tree->right->reg1, 4);
+	x86_mov_membase_reg (s->code, tree->left->reg1, offset + 4, tree->right->reg2, 4);
+
+	x86_patch (br [1], s->code);
 }
 
+
 # an addr can use two address register (base and index register). The must take care 
 # that we do not override them (thus the use of x86_lea)
 lreg: LDIND_I8 (addr) {
@@ -2075,53 +3370,37 @@ lreg: SHR_UN (lreg, CONST_I4) {
 }
 
 lreg: SHR (lreg, reg) {
-	guint8 *start = s->code;
-	gint32 o1, o2, i;
+	guint8 *br [1];
 
 	if (tree->right->reg1 != X86_ECX)
 		x86_mov_reg_reg (s->code, X86_ECX, tree->right->reg1, 4);
 
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_shrd_reg (s->code, tree->left->reg1, tree->left->reg2);
-		x86_shift_reg (s->code, X86_SAR, tree->left->reg2);
-		x86_test_reg_imm (s->code, X86_ECX, 32);
-		o1 = 2 + s->code - s->start;
-		x86_branch8 (s->code, X86_CC_EQ, o2 - o1, FALSE);
-		x86_mov_reg_reg (s->code, tree->left->reg1, tree->left->reg2, 4);
-		x86_shift_reg_imm (s->code, X86_SAR, tree->reg2, 31);		
-		o2 = s->code - s->start;
-	}
+	x86_shrd_reg (s->code, tree->left->reg1, tree->left->reg2);
+	x86_shift_reg (s->code, X86_SAR, tree->left->reg2);
+	x86_test_reg_imm (s->code, X86_ECX, 32);
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_EQ, 0, FALSE);
+	x86_mov_reg_reg (s->code, tree->left->reg1, tree->left->reg2, 4);
+	x86_shift_reg_imm (s->code, X86_SAR, tree->reg2, 31);		
+	x86_patch (br [0], s->code);
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: SHR_UN (lreg, reg) {
-	guint8 *start = s->code;
-	gint32 o1, o2, i;
+	guint8 *br [1];
 
 	if (tree->right->reg1 != X86_ECX)
 		x86_mov_reg_reg (s->code, X86_ECX, tree->right->reg1, 4);
 
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_shrd_reg (s->code, tree->left->reg1, tree->left->reg2);
-		x86_shift_reg (s->code, X86_SHR, tree->left->reg2);
-		x86_test_reg_imm (s->code, X86_ECX, 32);
-		o1 = 2 + s->code - s->start;
-		x86_branch8 (s->code, X86_CC_EQ, o2 - o1, FALSE);
-		x86_mov_reg_reg (s->code, tree->left->reg1, tree->left->reg2, 4);
-		x86_shift_reg_imm (s->code, X86_SHR, tree->reg2, 31);		
-		o2 = s->code - s->start;
-	}
+	x86_shrd_reg (s->code, tree->left->reg1, tree->left->reg2);
+	x86_shift_reg (s->code, X86_SHR, tree->left->reg2);
+	x86_test_reg_imm (s->code, X86_ECX, 32);
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_EQ, 0, FALSE);
+	x86_mov_reg_reg (s->code, tree->left->reg1, tree->left->reg2, 4);
+	x86_shift_reg_imm (s->code, X86_SHR, tree->reg2, 31);		
+	x86_patch (br [0], s->code);
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: SHL (lreg, CONST_I4) {
@@ -2140,38 +3419,27 @@ lreg: SHL (lreg, CONST_I4) {
 }
 
 lreg: SHL (lreg, reg) {
-	guint8 *start = s->code;
-	gint32 o1, o2, i;
+	guint8 *br [1];
 
 	if (tree->right->reg1 != X86_ECX)
 		x86_mov_reg_reg (s->code, X86_ECX, tree->right->reg1, 4);
 
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_shld_reg (s->code, tree->left->reg2, tree->left->reg1);
-		x86_shift_reg (s->code, X86_SHL, tree->left->reg1);
-		x86_test_reg_imm (s->code, X86_ECX, 32);
-		o1 = 2 + s->code - s->start;
-		x86_branch8 (s->code, X86_CC_EQ, o2 - o1, FALSE);
-		x86_mov_reg_reg (s->code, tree->left->reg2, tree->left->reg1, 4);
-		x86_alu_reg_reg (s->code, X86_XOR, tree->left->reg1, tree->left->reg1);	
-		o2 = s->code - s->start;
-	}
+	x86_shld_reg (s->code, tree->left->reg2, tree->left->reg1);
+	x86_shift_reg (s->code, X86_SHL, tree->left->reg1);
+	x86_test_reg_imm (s->code, X86_ECX, 32);
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_EQ, 0, FALSE);
+	x86_mov_reg_reg (s->code, tree->left->reg2, tree->left->reg1, 4);
+	x86_alu_reg_reg (s->code, X86_XOR, tree->left->reg1, tree->left->reg1);	
+	x86_patch (br [0], s->code);
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: ADD (lreg, lreg) {
 	x86_alu_reg_reg (s->code, X86_ADD, tree->left->reg1, tree->right->reg1);
 	x86_alu_reg_reg (s->code, X86_ADC, tree->left->reg2, tree->right->reg2);
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: ADD_OVF (lreg, lreg) {
@@ -2179,10 +3447,7 @@ lreg: ADD_OVF (lreg, lreg) {
 	x86_alu_reg_reg (s->code, X86_ADC, tree->left->reg2, tree->right->reg2);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_NO, TRUE, "OverflowException");	
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: ADD_OVF_UN (lreg, lreg) {
@@ -2190,20 +3455,14 @@ lreg: ADD_OVF_UN (lreg, lreg) {
 	x86_alu_reg_reg (s->code, X86_ADC, tree->left->reg2, tree->right->reg2);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_NC, FALSE, "OverflowException");	
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: SUB (lreg, lreg) {
 	x86_alu_reg_reg (s->code, X86_SUB, tree->left->reg1, tree->right->reg1);
 	x86_alu_reg_reg (s->code, X86_SBB, tree->left->reg2, tree->right->reg2);
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: SUB_OVF (lreg, lreg) {
@@ -2211,10 +3470,7 @@ lreg: SUB_OVF (lreg, lreg) {
 	x86_alu_reg_reg (s->code, X86_SBB, tree->left->reg2, tree->right->reg2);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_NO, TRUE, "OverflowException");	
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: SUB_OVF_UN (lreg, lreg) {
@@ -2222,37 +3478,32 @@ lreg: SUB_OVF_UN (lreg, lreg) {
 	x86_alu_reg_reg (s->code, X86_SBB, tree->left->reg2, tree->right->reg2);
 	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_NC, FALSE, "OverflowException");	
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: AND (lreg, lreg) {
 	x86_alu_reg_reg (s->code, X86_AND, tree->left->reg1, tree->right->reg1);
 	x86_alu_reg_reg (s->code, X86_AND, tree->left->reg2, tree->right->reg2);
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: OR (lreg, lreg) {
 	x86_alu_reg_reg (s->code, X86_OR, tree->left->reg1, tree->right->reg1);
 	x86_alu_reg_reg (s->code, X86_OR, tree->left->reg2, tree->right->reg2);
 
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
+}
+
+lreg: XOR (lreg, lreg) {
+	x86_alu_reg_reg (s->code, X86_XOR, tree->left->reg1, tree->right->reg1);
+	x86_alu_reg_reg (s->code, X86_XOR, tree->left->reg2, tree->right->reg2);
+
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 }
 
 lreg: NEG (lreg) {
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 
 	x86_neg_reg (s->code, tree->reg1);
 	x86_alu_reg_imm (s->code, X86_ADC, tree->reg2, 0);
@@ -2260,13 +3511,10 @@ lreg: NEG (lreg) {
 }
 
 lreg: NOT (lreg) {
-	if (tree->reg1 != tree->left->reg1)
-		x86_mov_reg_reg (s->code, tree->reg1, tree->left->reg1, 4);
-	if (tree->reg2 != tree->left->reg2)
-		x86_mov_reg_reg (s->code, tree->reg2, tree->left->reg2, 4);
+	MOVE_LREG (tree->reg1, tree->reg2, tree->left->reg1, tree->left->reg2);
 
-	 x86_not_reg (s->code, tree->reg1);
-	 x86_not_reg (s->code, tree->reg2);
+	x86_not_reg (s->code, tree->reg1);
+	x86_not_reg (s->code, tree->reg2);
 }
 
 lreg: MUL (lreg, lreg) {
@@ -2277,14 +3525,14 @@ lreg: MUL (lreg, lreg) {
 	x86_push_reg (s->code, tree->right->reg1);
 	x86_push_reg (s->code, tree->left->reg2);
 	x86_push_reg (s->code, tree->left->reg1);
-	mono_add_jump_info (s, s->code + 1, mono_llmult, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_llmult);
 	x86_call_code (s->code, 0);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 16);
 
 	if (mono_regset_reg_used (s->rs, X86_ECX))
 		x86_pop_reg (s->code, X86_ECX);
 
-	g_assert (tree->reg1 == X86_EAX &&
+	mono_assert (tree->reg1 == X86_EAX &&
 		  tree->reg2 == X86_EDX);
 }
 
@@ -2299,7 +3547,7 @@ lreg: MUL_OVF (lreg, lreg) {
 	/* pass a pointer to store the resulting exception -
 	 * ugly, but it works */
 	x86_push_reg (s->code, X86_ESP); 
-	mono_add_jump_info (s, s->code + 1, mono_llmult_ovf, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_llmult_ovf);
 	x86_call_code (s->code, 0);
 	x86_mov_reg_membase (s->code, X86_ECX, X86_ESP, 4, 4);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 20);
@@ -2308,14 +3556,14 @@ lreg: MUL_OVF (lreg, lreg) {
 	/* cond. emit exception */
 	x86_branch8 (s->code, X86_CC_EQ, 7, FALSE);                     
 	x86_push_reg (s->code, X86_ECX);
-	mono_add_jump_info (s, s->code + 1, arch_get_throw_exception (), NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, arch_get_throw_exception ());
 	x86_call_code (s->code, 0);
 
 	if (mono_regset_reg_used (s->rs, X86_ECX))
 		x86_pop_reg (s->code, X86_ECX);
 
-	g_assert (tree->reg1 == X86_EAX &&
-		  tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
 }
 
 lreg: MUL_OVF_UN (lreg, lreg) {
@@ -2329,7 +3577,7 @@ lreg: MUL_OVF_UN (lreg, lreg) {
 	/* pass a pointer to store the resulting exception -
 	 * ugly, but it works */
 	x86_push_reg (s->code, X86_ESP); 
-	mono_add_jump_info (s, s->code + 1, mono_llmult_ovf_un, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_llmult_ovf_un);
 	x86_call_code (s->code, 0);
 	x86_mov_reg_membase (s->code, X86_ECX, X86_ESP, 4, 4);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 20);
@@ -2338,14 +3586,14 @@ lreg: MUL_OVF_UN (lreg, lreg) {
 	/* cond. emit exception */
 	x86_branch8 (s->code, X86_CC_EQ, 7, FALSE);                     
 	x86_push_reg (s->code, X86_ECX);                                 
-	mono_add_jump_info (s, s->code + 1, arch_get_throw_exception (), NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, arch_get_throw_exception ());
 	x86_call_code (s->code, 0);
 
 	if (mono_regset_reg_used (s->rs, X86_ECX))
 		x86_pop_reg (s->code, X86_ECX);
 
-	g_assert (tree->reg1 == X86_EAX &&
-		  tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
 }
 
 lreg: DIV (lreg, lreg) {
@@ -2356,15 +3604,15 @@ lreg: DIV (lreg, lreg) {
 	x86_push_reg (s->code, tree->right->reg1);
 	x86_push_reg (s->code, tree->left->reg2);
 	x86_push_reg (s->code, tree->left->reg1);
-	mono_add_jump_info (s, s->code + 1, mono_lldiv, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_lldiv);
 	x86_call_code (s->code, 0);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 16);
 
 	if (mono_regset_reg_used (s->rs, X86_ECX))
 		x86_pop_reg (s->code, X86_ECX);
 
-	g_assert (tree->reg1 == X86_EAX &&
-		  tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
 }
 
 lreg: REM (lreg, lreg) {
@@ -2375,15 +3623,15 @@ lreg: REM (lreg, lreg) {
 	x86_push_reg (s->code, tree->right->reg1);
 	x86_push_reg (s->code, tree->left->reg2);
 	x86_push_reg (s->code, tree->left->reg1);
-	mono_add_jump_info (s, s->code + 1, mono_llrem, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_llrem);
 	x86_call_code (s->code, 0);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 16);
 
 	if (mono_regset_reg_used (s->rs, X86_ECX))
 		x86_pop_reg (s->code, X86_ECX);
 
-	g_assert (tree->reg1 == X86_EAX &&
-		  tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
 }
 
 lreg: DIV_UN (lreg, lreg) {
@@ -2394,15 +3642,15 @@ lreg: DIV_UN (lreg, lreg) {
 	x86_push_reg (s->code, tree->right->reg1);
 	x86_push_reg (s->code, tree->left->reg2);
 	x86_push_reg (s->code, tree->left->reg1);
-	mono_add_jump_info (s, s->code + 1, mono_lldiv_un, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_lldiv_un);
 	x86_call_code (s->code, 0);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 16);
 
 	if (mono_regset_reg_used (s->rs, X86_ECX))
 		x86_pop_reg (s->code, X86_ECX);
 
-	g_assert (tree->reg1 == X86_EAX &&
-		  tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
 }
 
 lreg: REM_UN (lreg, lreg) {
@@ -2413,77 +3661,95 @@ lreg: REM_UN (lreg, lreg) {
 	x86_push_reg (s->code, tree->right->reg1);
 	x86_push_reg (s->code, tree->left->reg2);
 	x86_push_reg (s->code, tree->left->reg1);
-	mono_add_jump_info (s, s->code + 1, mono_llrem_un, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_llrem_un);
 	x86_call_code (s->code, 0);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 16);
 
 	if (mono_regset_reg_used (s->rs, X86_ECX))
 		x86_pop_reg (s->code, X86_ECX);
 
-	g_assert (tree->reg1 == X86_EAX &&
-		  tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX &&
+		     tree->reg2 == X86_EDX);
+}
+
+lreg: CALL_I8 (this, reg) {
+	int treg = X86_EAX;
+	int lreg = tree->left->reg1;
+	int rreg = tree->right->reg1;
+	
+	if (lreg == treg || rreg == treg) 
+		treg = X86_EDX;
+	if (lreg == treg || rreg == treg) 
+		treg = X86_ECX;
+	if (lreg == treg || rreg == treg) 
+		mono_assert_not_reached ();
+
+	X86_CALL_BEGIN;
+
+	x86_call_reg (s->code, rreg);
+
+	X86_CALL_END;
+
+	mono_assert (tree->reg1 == X86_EAX);
+	mono_assert (tree->reg2 == X86_EDX);
 }
 
 lreg: CALL_I8 (this, ADDR_G) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 	
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
-
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
+	X86_CALL_BEGIN;
 
-	mono_add_jump_info (s, s->code + 1, tree->right->data.p, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, tree->right->data.p);
 	x86_call_code (s->code, 0);
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
+	X86_CALL_END;
 
-	g_assert (tree->reg1 == X86_EAX);
-	g_assert (tree->reg2 == X86_EDX);
+	mono_assert (tree->reg1 == X86_EAX);
+	mono_assert (tree->reg2 == X86_EDX);
 }
 
 lreg: CALL_I8 (this, VFUNC_ADDR) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
-
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
+	X86_CALL_BEGIN;
 
 	x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
 	x86_call_virtual (s->code, lreg, 
 	        G_STRUCT_OFFSET (MonoVTable, vtable) + (tree->right->data.m->slot << 2));
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
+	X86_CALL_END;
 
-	PRINT_REG ("CALL0_I8(VIRTUAL)", tree->reg1);
-	PRINT_REG ("CALL1_I8(VIRTUAL)", tree->reg2);
+	mono_assert (tree->reg1 == X86_EAX);
+	mono_assert (tree->reg2 == X86_EDX);
+}
+
+lreg: CALL_I8 (this, INTF_ADDR) {
+	int lreg = tree->left->reg1;
+	int treg = X86_EAX;
+
+	if (lreg == treg) 
+		treg = X86_EDX;
 
-	g_assert (tree->reg1 == X86_EAX);
-	g_assert (tree->reg2 == X86_EDX);
+	X86_CALL_BEGIN;
+
+	x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
+	x86_mov_reg_membase (s->code, lreg, lreg, 
+	        G_STRUCT_OFFSET (MonoVTable, interface_offsets), 4);
+	x86_mov_reg_membase (s->code, lreg, lreg, tree->right->data.m->klass->interface_id << 2, 4);
+	x86_call_virtual (s->code, lreg, tree->right->data.m->slot << 2);
+
+	X86_CALL_END;
+
+	mono_assert (tree->reg1 == X86_EAX);
+	mono_assert (tree->reg2 == X86_EDX);
 }
 
 stmt: RET (lreg) {
@@ -2502,274 +3768,400 @@ stmt: RET (lreg) {
 	}
 
 	if (!tree->last_instr) {
-		mono_add_jump_info (s, s->code + 1, NULL, NULL);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_EPILOG, NULL);
 		x86_jump32 (s->code, 0);      
 	}
 }
 
 
 stmt: ARG_I8 (lreg) {
+	int pad = tree->data.arg_info.pad;
+
+	X86_ARG_PAD (pad);
 	x86_push_reg (s->code, tree->left->reg2);
 	x86_push_reg (s->code, tree->left->reg1);
 }
 
-reg: CEQ (lreg, lreg) {
-	guint8 *start = s->code;
-	gint32 o1, o2, i;
+reg: CSET (COMPARE (lreg, lreg)) {
+	guint8 *br [4];
+	int lreg1, lreg2, rreg1, rreg2;
 
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		o1 = 2 + s->code - s->start;
-		x86_branch8 (s->code, X86_CC_NE, o2 - o1, FALSE);
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		o2 = s->code - s->start;		
+	lreg1 = tree->left->left->reg1;
+	lreg2 = tree->left->left->reg2;
+	rreg1 = tree->left->right->reg1;
+	rreg2 = tree->left->right->reg2;
+
+
+	if (tree->data.i == CEE_CEQ) {
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		x86_patch (br [0], s->code);
 		x86_set_reg (s->code, X86_CC_EQ, tree->reg1, FALSE);
 		x86_widen_reg (s->code, tree->reg1, tree->reg1, FALSE, FALSE);
+		return;
 	}
-}
-
-reg: CLT (lreg, lreg) {
-	guint8 *start = s->code;
-	gpointer o1, o2, o3, o4, o5;
-	int i;
 
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		x86_branch8 (s->code, X86_CC_GT, o4 - o1, TRUE);
-		o1 = s->code;
-		x86_branch8 (s->code, X86_CC_NE, o4 - o2, TRUE);
-		o2 = s->code;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		x86_branch8 (s->code, X86_CC_GE, o4 - o3, FALSE);
-
-		/* set result to 1 */
-		o3 = s->code;
-		x86_mov_reg_imm (s->code, tree->reg1, 1);
-		x86_jump8 (s->code, (o4 - o3));
-		/* set result to 0 */
-		o4 = s->code;
-		x86_mov_reg_imm (s->code, tree->reg1, 0);	
-		o5 = s->code;
+	switch (tree->data.i) {
+	case CEE_CGT:
+		x86_alu_reg_reg (s->code, X86_CMP, rreg2, lreg2);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_GT, 0, TRUE);
+		br [1] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, TRUE);
+		x86_alu_reg_reg (s->code, X86_CMP, rreg1, lreg1);
+		br [2] = s->code; x86_branch8 (s->code, X86_CC_GE, 0, FALSE);
+		break;
+	case CEE_CGT_UN:
+		x86_alu_reg_reg (s->code, X86_CMP, rreg2, lreg2);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_GT, 0, FALSE);
+		br [1] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		x86_alu_reg_reg (s->code, X86_CMP, rreg1, lreg1);
+		br [2] = s->code; x86_branch8 (s->code, X86_CC_GE, 0, FALSE);
+		break;
+	case CEE_CLT:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_GT, 0, TRUE);
+		br [1] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, TRUE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		br [2] = s->code; x86_branch8 (s->code, X86_CC_GE, 0, FALSE);
+		break;
+	case CEE_CLT_UN:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_GT, 0, FALSE);
+		br [1] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		br [2] = s->code; x86_branch8 (s->code, X86_CC_GE, 0, FALSE);
+		break;
+	default:
+		g_assert_not_reached ();
 	}
-}
 
-stmt: BEQ (lreg, lreg) {
-	guint8 *start = s->code;
-	int i;
-	gpointer o1, o2;
+	/* set result to 1 */
+	x86_patch (br [1], s->code);
+	x86_mov_reg_imm (s->code, tree->reg1, 1);
+	br [3] = s->code; x86_jump8 (s->code, 0);
 
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		x86_branch8 (s->code, X86_CC_NE, o2 - o1, FALSE);
-		o1 = s->code;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_EQ, 0, TRUE);
-		o2 = s->code;
-	}
-}
+	/* set result to 0 */
+	x86_patch (br [0], s->code);
+	x86_patch (br [2], s->code);
+	x86_mov_reg_imm (s->code, tree->reg1, 0);	
 
-stmt: BNE_UN (lreg, lreg) {
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
-	x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+	x86_patch (br [3], s->code);
 }
 
-stmt: BGE (lreg, lreg) {
-	guint8 *start = s->code;
-	gpointer o2, oe;
-	int i;
+stmt: CBRANCH (COMPARE (lreg, lreg)) {
+	guint8 *br [1];
+	int lreg1, lreg2, rreg1, rreg2;
 
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
+	lreg1 = tree->left->left->reg1;
+	lreg2 = tree->left->left->reg2;
+	rreg1 = tree->left->right->reg1;
+	rreg2 = tree->left->right->reg2;
+
+	switch (tree->data.bi.cond) {
+	case CEE_BLT:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_LT, 0, TRUE);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, TRUE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_LT, 0, FALSE);
+		x86_patch (br [0], s->code);	
+		break;
+	case CEE_BLT_UN:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_LT, 0, FALSE);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_LT, 0, FALSE);
+		x86_patch (br [0], s->code);	
+		break;
+	case CEE_BGT:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
 		x86_branch32 (s->code, X86_CC_GT, 0, TRUE);
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		x86_branch8 (s->code, X86_CC_NE, oe - o2, TRUE);
-		o2 = s->code;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, TRUE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_GT, 0, FALSE);
+		x86_patch (br [0], s->code);	
+		break;
+	case CEE_BGT_UN:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_GT, 0, FALSE);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_GT, 0, FALSE);
+		x86_patch (br [0], s->code);	
+		break;
+	case CEE_BEQ:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_EQ, 0, TRUE);
+		x86_patch (br [0], s->code);
+		break;
+	case CEE_BNE_UN:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+		break;
+	case CEE_BGE:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_GT, 0, TRUE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, TRUE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
 		x86_branch32 (s->code, X86_CC_GE, 0, FALSE);
-		oe = s->code;
-	}
-}
-
-stmt: BGE_UN (lreg, lreg) {
-	guint8 *start = s->code;
-	gpointer o2, oe;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
+		x86_patch (br [0], s->code);
+		break;
+	case CEE_BGE_UN:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
 		x86_branch32 (s->code, X86_CC_GT, 0, FALSE);
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		x86_branch8 (s->code, X86_CC_NE, oe - o2, FALSE);
-		o2 = s->code;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
 		x86_branch32 (s->code, X86_CC_GE, 0, FALSE);
-		oe = s->code;
-	}
+		x86_patch (br [0], s->code);	
+		break;
+	case CEE_BLE:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_LT, 0, TRUE);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, TRUE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_LE, 0, FALSE);
+		x86_patch (br [0], s->code);	
+		break;
+	case CEE_BLE_UN:
+		x86_alu_reg_reg (s->code, X86_CMP, lreg2, rreg2);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_LT, 0, FALSE);
+		br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+		x86_alu_reg_reg (s->code, X86_CMP, lreg1, rreg1);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_LE, 0, FALSE);
+		x86_patch (br [0], s->code);	
+		break;
+	default:
+		g_assert_not_reached ();
+	}	
 }
 
-stmt: BGT (lreg, lreg) {
-	guint8 *start = s->code;
-	gpointer o2, oe;
-	int i;
+#
+# floating point 
 
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_GT, 0, TRUE);
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		x86_branch8 (s->code, X86_CC_NE, oe - o2, TRUE);
-		o2 = s->code;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_GT, 0, FALSE);
-		oe = s->code;
+#stmt: STLOC (CONV_I4 (freg)) {
+#	// fixme: set CW
+#	x86_fist_pop_membase (s->code, X86_EBP, tree->data.i, FALSE);
+#} 
+
+reg: CONV_I1 (freg) {
+	if (mono_use_fast_iconv) {
+		mono_emit_fast_iconv(s, tree);
+		x86_widen_reg (s->code, tree->reg1, tree->reg1, TRUE, FALSE);
+	} else {
+		x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+		x86_fnstcw_membase(s->code, X86_ESP, 0);
+		x86_mov_reg_membase (s->code, tree->reg1, X86_ESP, 0, 2);
+		x86_alu_reg_imm (s->code, X86_OR, tree->reg1, 0xc00);
+		x86_mov_membase_reg (s->code, X86_ESP, 2, tree->reg1, 2);
+		x86_fldcw_membase (s->code, X86_ESP, 2);
+		x86_push_reg (s->code, X86_EAX); // SP = SP - 4
+		x86_fist_pop_membase (s->code, X86_ESP, 0, FALSE);
+		x86_pop_reg (s->code, tree->reg1);
+		x86_widen_reg (s->code, tree->reg1, tree->reg1, TRUE, FALSE);
+		x86_fldcw_membase (s->code, X86_ESP, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
 	}
 }
 
-stmt: BGT_UN (lreg, lreg) {
-	guint8 *start = s->code;
-	gpointer o2, oe;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_GT, 0, FALSE);
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		x86_branch8 (s->code, X86_CC_NE, oe - o2, FALSE);
-		o2 = s->code;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_GT, 0, FALSE);
-		oe = s->code;
+reg: CONV_U1 (freg) {
+	if (mono_use_fast_iconv) {
+		mono_emit_fast_iconv(s, tree);
+		x86_widen_reg (s->code, tree->reg1, tree->reg1, FALSE, FALSE);
+	} else {
+		x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+		x86_fnstcw_membase(s->code, X86_ESP, 0);
+		x86_mov_reg_membase (s->code, tree->reg1, X86_ESP, 0, 2);
+		x86_alu_reg_imm (s->code, X86_OR, tree->reg1, 0xc00);
+		x86_mov_membase_reg (s->code, X86_ESP, 2, tree->reg1, 2);
+		x86_fldcw_membase (s->code, X86_ESP, 2);
+		x86_push_reg (s->code, X86_EAX); // SP = SP - 4
+		x86_fist_pop_membase (s->code, X86_ESP, 0, FALSE);
+		x86_pop_reg (s->code, tree->reg1);
+		x86_widen_reg (s->code, tree->reg1, tree->reg1, FALSE, FALSE);
+		x86_fldcw_membase (s->code, X86_ESP, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
 	}
 }
 
-stmt: BLT (lreg, lreg) {
-	guint8 *start = s->code;
-	gpointer o2, oe;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_LT, 0, TRUE);
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		x86_branch8 (s->code, X86_CC_NE, oe - o2, TRUE);
-		o2 = s->code;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_LT, 0, FALSE);
-		oe = s->code;
+reg: CONV_I2 (freg) {
+	if (mono_use_fast_iconv) {
+		mono_emit_fast_iconv(s, tree);
+		x86_widen_reg (s->code, tree->reg1, tree->reg1, TRUE, TRUE);
+	} else {
+		x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+		x86_fnstcw_membase(s->code, X86_ESP, 0);
+		x86_mov_reg_membase (s->code, tree->reg1, X86_ESP, 0, 2);
+		x86_alu_reg_imm (s->code, X86_OR, tree->reg1, 0xc00);
+		x86_mov_membase_reg (s->code, X86_ESP, 2, tree->reg1, 2);
+		x86_fldcw_membase (s->code, X86_ESP, 2);
+		x86_push_reg (s->code, X86_EAX); // SP = SP - 4
+		x86_fist_pop_membase (s->code, X86_ESP, 0, FALSE);
+		x86_pop_reg (s->code, tree->reg1);
+		x86_widen_reg (s->code, tree->reg1, tree->reg1, TRUE, TRUE);
+		x86_fldcw_membase (s->code, X86_ESP, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
 	}
 }
 
-stmt: BLT_UN (lreg, lreg) {
-	guint8 *start = s->code;
-	gpointer o2, oe;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_LT, 0, FALSE);
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		x86_branch8 (s->code, X86_CC_NE, oe - o2, FALSE);
-		o2 = s->code;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_LT, 0, FALSE);
-		oe = s->code;
+reg: CONV_U2 (freg) {
+	if (mono_use_fast_iconv) {
+		mono_emit_fast_iconv(s, tree);
+		x86_widen_reg (s->code, tree->reg1, tree->reg1, FALSE, TRUE);
+	} else {
+		x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+		x86_fnstcw_membase(s->code, X86_ESP, 0);
+		x86_mov_reg_membase (s->code, tree->reg1, X86_ESP, 0, 2);
+		x86_alu_reg_imm (s->code, X86_OR, tree->reg1, 0xc00);
+		x86_mov_membase_reg (s->code, X86_ESP, 2, tree->reg1, 2);
+		x86_fldcw_membase (s->code, X86_ESP, 2);
+		x86_push_reg (s->code, X86_EAX); // SP = SP - 4
+		x86_fist_pop_membase (s->code, X86_ESP, 0, FALSE);
+		x86_pop_reg (s->code, tree->reg1);
+		x86_widen_reg (s->code, tree->reg1, tree->reg1, FALSE, TRUE);
+		x86_fldcw_membase (s->code, X86_ESP, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
 	}
 }
 
-stmt: BLE (lreg, lreg) {
-	guint8 *start = s->code;
-	gpointer o2, oe;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_LT, 0, TRUE);
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		x86_branch8 (s->code, X86_CC_NE, oe - o2, TRUE);
-		o2 = s->code;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_LE, 0, FALSE);
-		oe = s->code;
+reg: CONV_I4 (freg) {
+	if (mono_use_fast_iconv) {
+		mono_emit_fast_iconv(s, tree);
+	} else {
+		x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+		x86_fnstcw_membase(s->code, X86_ESP, 0);
+		x86_mov_reg_membase (s->code, tree->reg1, X86_ESP, 0, 2);
+		x86_alu_reg_imm (s->code, X86_OR, tree->reg1, 0xc00);
+		x86_mov_membase_reg (s->code, X86_ESP, 2, tree->reg1, 2);
+		x86_fldcw_membase (s->code, X86_ESP, 2);
+		x86_push_reg (s->code, X86_EAX); // SP = SP - 4
+		x86_fist_pop_membase (s->code, X86_ESP, 0, FALSE);
+		x86_pop_reg (s->code, tree->reg1);
+		x86_fldcw_membase (s->code, X86_ESP, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
 	}
 }
 
-stmt: BLE_UN (lreg, lreg) {
-	guint8 *start = s->code;
-	gpointer o2, oe;
-	int i;
-
-	for (i = 0; i < 2; i ++) {
-		s->code = start;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_LT, 0, FALSE);
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg2, tree->right->reg2);
-		x86_branch8 (s->code, X86_CC_NE, oe - o2, FALSE);
-		o2 = s->code;
-		x86_alu_reg_reg (s->code, X86_CMP, tree->left->reg1, tree->right->reg1);
-		if (i) mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-		x86_branch32 (s->code, X86_CC_LE, 0, FALSE);
-		oe = s->code;
+reg: CONV_U4 (freg) {
+	if (mono_use_fast_iconv) {
+		mono_emit_fast_iconv(s, tree);
+	} else {
+		x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+		x86_fnstcw_membase(s->code, X86_ESP, 0);
+		x86_mov_reg_membase (s->code, tree->reg1, X86_ESP, 0, 2);
+		x86_alu_reg_imm (s->code, X86_OR, tree->reg1, 0xc00);
+		x86_mov_membase_reg (s->code, X86_ESP, 2, tree->reg1, 2);
+		x86_fldcw_membase (s->code, X86_ESP, 2);
+		x86_push_reg (s->code, X86_EAX); // SP = SP - 4
+		x86_fist_pop_membase (s->code, X86_ESP, 0, FALSE);
+		x86_pop_reg (s->code, tree->reg1);
+		x86_fldcw_membase (s->code, X86_ESP, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
 	}
 }
 
-#
-# floating point 
-
-#stmt: STLOC (CONV_I4 (freg)) {
-#	// fixme: set CW
-#	x86_fist_pop_membase (s->code, X86_EBP, tree->data.i, FALSE);
-#} 
+lreg: CONV_I8 (freg) {
+	if (mono_use_fast_iconv) {
+		mono_emit_fast_iconv_i8(s, tree);
+	} else {
+		x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+		x86_fnstcw_membase(s->code, X86_ESP, 0);
+		x86_mov_reg_membase (s->code, tree->reg1, X86_ESP, 0, 2);
+		x86_alu_reg_imm (s->code, X86_OR, tree->reg1, 0xc00);
+		x86_mov_membase_reg (s->code, X86_ESP, 2, tree->reg1, 2);
+		x86_fldcw_membase (s->code, X86_ESP, 2);
+		x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 8);
+		x86_fist_pop_membase (s->code, X86_ESP, 0, TRUE);
+		x86_pop_reg (s->code, tree->reg1);
+		x86_pop_reg (s->code, tree->reg2);
+		x86_fldcw_membase (s->code, X86_ESP, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
+	}
+}
 
-reg: CONV_I4 (freg) {
-	x86_push_reg (s->code, X86_EAX); // SP = SP - 4
-	x86_fist_pop_membase (s->code, X86_ESP, 0, FALSE);
-	x86_pop_reg (s->code, tree->reg1);
+lreg: CONV_U8 (freg) {
+	if (mono_use_fast_iconv) {
+		mono_emit_fast_iconv_i8(s, tree);
+	} else {
+		x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+		x86_fnstcw_membase(s->code, X86_ESP, 0);
+		x86_mov_reg_membase (s->code, tree->reg1, X86_ESP, 0, 2);
+		x86_alu_reg_imm (s->code, X86_OR, tree->reg1, 0xc00);
+		x86_mov_membase_reg (s->code, X86_ESP, 2, tree->reg1, 2);
+		x86_fldcw_membase (s->code, X86_ESP, 2);
+		x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 8);
+		x86_fist_pop_membase (s->code, X86_ESP, 0, TRUE);
+		x86_pop_reg (s->code, tree->reg1);
+		x86_pop_reg (s->code, tree->reg2);
+		x86_fldcw_membase (s->code, X86_ESP, 0);
+		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
+	}
 }
 
-reg: CEQ (freg, freg) {
+reg: CSET (COMPARE (freg, freg)) {
 	int treg = tree->reg1;
-	
+
 	if (treg != X86_EAX)
-		x86_push_reg (s->code, X86_EAX); // save EAX
-		
+		x86_push_reg (s->code, X86_EAX);
+
 	x86_fcompp (s->code);
 	x86_fnstsw (s->code);
 	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x4000);
-	x86_set_reg (s->code, X86_CC_EQ, tree->reg1, TRUE);
-	x86_widen_reg (s->code, treg, treg, FALSE, FALSE);
 
+	switch (tree->data.i) {
+	case CEE_CEQ:
+		x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x4000);
+		x86_set_reg (s->code, X86_CC_EQ, treg, TRUE);
+		x86_widen_reg (s->code, treg, treg, FALSE, FALSE);
+		break;
+	case CEE_CGT:
+		x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
+		x86_set_reg (s->code, X86_CC_EQ, treg, TRUE);
+		x86_widen_reg (s->code, treg, treg, FALSE, FALSE);
+		break;
+	case CEE_CGT_UN:
+		x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
+		x86_set_reg (s->code, X86_CC_EQ, treg, TRUE);
+		x86_widen_reg (s->code, treg, treg, FALSE, FALSE);
+		break;
+	case CEE_CLT:
+		x86_set_reg (s->code, X86_CC_EQ, treg, TRUE);
+		x86_widen_reg (s->code, treg, treg, FALSE, FALSE);
+		break;
+	case CEE_CLT_UN:
+		x86_set_reg (s->code, X86_CC_EQ, tree->reg1, TRUE);
+		x86_widen_reg (s->code, treg, treg, FALSE, FALSE);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+	
 	if (treg != X86_EAX)
-		x86_pop_reg (s->code, X86_EAX); // save EAX
+		x86_pop_reg (s->code, X86_EAX);
 }
 
 freg: CONV_R8 (freg) {
@@ -2784,35 +4176,65 @@ freg: CONV_R8 (LDIND_I4 (ADDR_G)) {
 	x86_fild (s->code, tree->left->left->data.p, FALSE);
 }
 
+freg: CONV_R4 (reg) {
+	x86_push_reg (s->code, tree->left->reg1);
+	x86_fild_membase (s->code, X86_ESP, 0, FALSE);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
+}
+
 freg: CONV_R8 (reg) {
-	/* I found no direct way to move an integer register to 
-	 * the floating point stack, so we need to store the register
-	 * to memory
-	 */
 	x86_push_reg (s->code, tree->left->reg1);
 	x86_fild_membase (s->code, X86_ESP, 0, FALSE);
-	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 4);
 }
 
-freg: CONV_R8 (lreg) {
-	/* I found no direct way to move an integer register to 
-	 * the floating point stack, so we need to store the register
-	 * to memory
-	 */
+freg: CONV_R_UN (reg) {
+	x86_push_imm (s->code, 0);
+	x86_push_reg (s->code, tree->left->reg1);
+	x86_fild_membase (s->code, X86_ESP, 0, TRUE);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
+}
+
+freg: CONV_R_UN (lreg) {
+	static guint8 mn[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x80, 0x3f, 0x40 };
+	guint8 *br [1];
+
+	/* load 64bit integer to FP stack */
+	x86_push_imm (s->code, 0);
 	x86_push_reg (s->code, tree->left->reg2);
 	x86_push_reg (s->code, tree->left->reg1);
 	x86_fild_membase (s->code, X86_ESP, 0, TRUE);
-	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 8);
+	/* store as 80bit FP value */
+	x86_fst80_membase (s->code, X86_ESP, 0);
+
+	/* test if lreg is negative */
+	x86_test_reg_reg (s->code, tree->left->reg2, tree->left->reg2);
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_GEZ, 0, TRUE);
+
+	/* add correction constant mn */
+	x86_fld80_mem (s->code, mn);
+	x86_fld80_membase (s->code, X86_ESP, 0);
+	x86_fp_op_reg (s->code, X86_FADD, 1, TRUE);
+	x86_fst80_membase (s->code, X86_ESP, 0);
+	//x86_breakpoint (s->code);
+	x86_patch (br [0], s->code);
+
+	x86_fld80_membase (s->code, X86_ESP, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 12);
 }
 
-freg: CONV_R4 (reg) {
-	/* I found no direct way to move an integer register to 
-	 * the floating point stack, so we need to store the register
-	 * to memory
-	 */
+freg: CONV_R4 (lreg) {
+	x86_push_reg (s->code, tree->left->reg2);
 	x86_push_reg (s->code, tree->left->reg1);
-	x86_fild_membase (s->code, X86_ESP, 0, FALSE);
-	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
+	x86_fild_membase (s->code, X86_ESP, 0, TRUE);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
+}
+
+freg: CONV_R8 (lreg) {
+	x86_push_reg (s->code, tree->left->reg2);
+	x86_push_reg (s->code, tree->left->reg1);
+	x86_fild_membase (s->code, X86_ESP, 0, TRUE);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 8);
 }
 
 freg: CONST_R4 {
@@ -2837,14 +4259,59 @@ freg: CONST_R8 {
 		x86_fld (s->code, tree->data.p, TRUE);
 }
 
-freg: LDIND_R4 (reg) {
-	x86_fld_membase (s->code, tree->left->reg1, 0, FALSE);
+freg: LDIND_R4 (addr) {
+
+	switch (tree->left->data.ainfo.amode) {
+
+	case AMImmediate:
+		x86_fld (s->code, tree->left->data.ainfo.offset, FALSE);
+		break;
+
+	case AMBase:
+		x86_fld_membase (s->code, tree->left->data.ainfo.basereg, tree->left->data.ainfo.offset, FALSE);
+		break;		
+	case AMIndex:
+		x86_lea_memindex (s->code, tree->left->data.ainfo.indexreg, X86_NOBASEREG, 
+				  tree->left->data.ainfo.offset, tree->left->data.ainfo.indexreg, 
+				  tree->left->data.ainfo.shift);
+		x86_fld_membase (s->code, tree->left->data.ainfo.indexreg, 0, FALSE);
+		break;		
+	case AMBaseIndex:
+		x86_lea_memindex (s->code, tree->left->data.ainfo.indexreg, tree->left->data.ainfo.basereg, 
+				  tree->left->data.ainfo.offset, tree->left->data.ainfo.indexreg, 
+				  tree->left->data.ainfo.shift);
+		x86_fld_membase (s->code, tree->left->data.ainfo.indexreg, 0, FALSE);
+		break;		
+	}
 }
 
-freg: LDIND_R8 (reg) {
-	x86_fld_membase (s->code, tree->left->reg1, 0, TRUE);
+freg: LDIND_R8 (addr) {
+
+	switch (tree->left->data.ainfo.amode) {
+
+	case AMImmediate:
+		x86_fld (s->code, tree->left->data.ainfo.offset, TRUE);
+		break;
+
+	case AMBase:
+		x86_fld_membase (s->code, tree->left->data.ainfo.basereg, tree->left->data.ainfo.offset, TRUE);
+		break;		
+	case AMIndex:
+		x86_lea_memindex (s->code, tree->left->data.ainfo.indexreg, X86_NOBASEREG, 
+				  tree->left->data.ainfo.offset, tree->left->data.ainfo.indexreg, 
+				  tree->left->data.ainfo.shift);
+		x86_fld_membase (s->code, tree->left->data.ainfo.indexreg, 0, TRUE);
+		break;		
+	case AMBaseIndex:
+		x86_lea_memindex (s->code, tree->left->data.ainfo.indexreg, tree->left->data.ainfo.basereg, 
+				  tree->left->data.ainfo.offset, tree->left->data.ainfo.indexreg, 
+				  tree->left->data.ainfo.shift);
+		x86_fld_membase (s->code, tree->left->data.ainfo.indexreg, 0, TRUE);
+		break;		
+	}
 }
 
+
 freg: ADD (freg, freg) {
 	x86_fp_op_reg (s->code, X86_FADD, 1, TRUE);
 }
@@ -2861,11 +4328,34 @@ freg: DIV (freg, freg) {
 	x86_fp_op_reg (s->code, X86_FDIV, 1, TRUE);
 }
 
-#freg: REM (freg, freg) {
-# this does not work, since it does not pop a value from the stack,
-# and we need to test if the instruction is ready
-#	x86_fprem1 (s->code);
-#}
+freg: CKFINITE (freg) {
+	x86_push_reg (s->code, X86_EAX);
+	x86_fxam (s->code);
+	x86_fnstsw (s->code);
+	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4100);
+	x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
+	x86_pop_reg (s->code, X86_EAX);
+	EMIT_COND_SYSTEM_EXCEPTION (X86_CC_NE, FALSE, "ArithmeticException");
+}
+
+freg: REM (freg, freg) {
+	guint8 *l1, *l2;
+
+	/* we need to exchange ST(0) with ST(1) */
+	x86_fxch (s->code, 1);
+
+	/* this requires a loop, because fprem1 somtimes 
+	 * returns a partial remainder */
+	l1 = s->code;
+	x86_fprem1 (s->code);
+	x86_fnstsw (s->code);
+	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x0400);
+	l2 = s->code + 2;
+	x86_branch8 (s->code, X86_CC_NE, l1 - l2, FALSE);
+
+	/* pop result */
+	x86_fstp (s->code, 1);
+}
 
 freg: NEG (freg) {
 	x86_fchs (s->code);
@@ -2873,166 +4363,250 @@ freg: NEG (freg) {
 
 stmt: POP (freg)
 
-stmt: STIND_R4 (ADDR_L, freg) {
-	int offset = g_array_index (s->varinfo, MonoVarInfo, tree->left->data.i).offset;  
-	x86_fst_membase (s->code, X86_EBP, offset, FALSE, TRUE);
-}
+stmt: STIND_R4 (addr, freg) {
 
-stmt: STIND_R4 (reg, freg) {
-	x86_fst_membase (s->code, tree->left->reg1, 0, FALSE, TRUE);
-}
+	switch (tree->left->data.ainfo.amode) {
 
-stmt: STIND_R8 (ADDR_L, freg) {
-	int offset = g_array_index (s->varinfo, MonoVarInfo, tree->left->data.i).offset;  
-	x86_fst_membase (s->code, X86_EBP, offset, TRUE, TRUE);
+	case AMImmediate:
+		x86_fst (s->code, tree->left->data.ainfo.offset, FALSE, TRUE);
+		break;
+
+	case AMBase:
+		x86_fst_membase (s->code, tree->left->data.ainfo.basereg, tree->left->data.ainfo.offset, 
+				 FALSE, TRUE);
+		break;		
+	case AMIndex:
+		x86_lea_memindex (s->code, tree->left->data.ainfo.indexreg, X86_NOBASEREG, 
+				  tree->left->data.ainfo.offset, tree->left->data.ainfo.indexreg, 
+				  tree->left->data.ainfo.shift);
+		x86_fst_membase (s->code, tree->left->data.ainfo.indexreg, 0, FALSE, TRUE);
+		break;		
+	case AMBaseIndex:
+		x86_lea_memindex (s->code, tree->left->data.ainfo.indexreg, tree->left->data.ainfo.basereg, 
+				  tree->left->data.ainfo.offset, tree->left->data.ainfo.indexreg, 
+				  tree->left->data.ainfo.shift);
+		x86_fst_membase (s->code, tree->left->data.ainfo.indexreg, 0, FALSE, TRUE);
+		break;		
+	}
 }
 
-stmt: STIND_R8 (reg, freg) {
-	x86_fst_membase (s->code, tree->left->reg1, 0, TRUE, TRUE);
+stmt: STIND_R8 (addr, freg) {
+
+	switch (tree->left->data.ainfo.amode) {
+
+	case AMImmediate:
+		x86_fst (s->code, tree->left->data.ainfo.offset, TRUE, TRUE);
+		break;
+
+	case AMBase:
+		x86_fst_membase (s->code, tree->left->data.ainfo.basereg, tree->left->data.ainfo.offset, 
+				 TRUE, TRUE);
+		break;		
+	case AMIndex:
+		x86_lea_memindex (s->code, tree->left->data.ainfo.indexreg, X86_NOBASEREG, 
+				  tree->left->data.ainfo.offset, tree->left->data.ainfo.indexreg, 
+				  tree->left->data.ainfo.shift);
+		x86_fst_membase (s->code, tree->left->data.ainfo.indexreg, 0, TRUE, TRUE);
+		break;		
+	case AMBaseIndex:
+		x86_lea_memindex (s->code, tree->left->data.ainfo.indexreg, tree->left->data.ainfo.basereg, 
+				  tree->left->data.ainfo.offset, tree->left->data.ainfo.indexreg, 
+				  tree->left->data.ainfo.shift);
+		x86_fst_membase (s->code, tree->left->data.ainfo.indexreg, 0, TRUE, TRUE);
+		break;		
+	}
 }
 
-stmt: ARG_R4 (freg) {
+stmt: REMOTE_STIND_R4 (reg, freg) {
+	guint8 *br[2];
+	int treg = X86_EAX;
+	int lreg = tree->left->reg1;
+	int offset;
+
+	if (lreg == treg)
+		treg = X86_EDX;
+
+	x86_mov_reg_membase (s->code, treg, lreg, 0, 4);
+	x86_alu_membase_imm (s->code, X86_CMP, treg, 0, ((int)mono_defaults.transparent_proxy_class));
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE); 
+
+	/* this is a transparent proxy - remote the call */
+
+	/* save value to stack */
 	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4);
 	x86_fst_membase (s->code, X86_ESP, 0, FALSE, TRUE);
+
+	x86_push_reg (s->code, X86_ESP);
+	x86_push_imm (s->code, tree->data.fi.field);
+	x86_push_imm (s->code, tree->data.fi.klass);
+	x86_push_reg (s->code, lreg);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_store_remote_field);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 20);
+
+	br [1] = s->code; x86_jump8 (s->code, 0); 
+
+	x86_patch (br [0], s->code);
+	offset = tree->data.fi.klass->valuetype ? tree->data.fi.field->offset - sizeof (MonoObject) : 
+		tree->data.fi.field->offset;
+	x86_fst_membase (s->code, lreg, offset, FALSE, TRUE);
+
+	x86_patch (br [1], s->code);
 }
 
-stmt: ARG_R8 (freg) {
+stmt: REMOTE_STIND_R8 (reg, freg) {
+	guint8 *br[2];
+	int treg = X86_EAX;
+	int lreg = tree->left->reg1;
+	int offset;
+
+	if (lreg == treg)
+		treg = X86_EDX;
+
+	x86_mov_reg_membase (s->code, treg, lreg, 0, 4);
+	x86_alu_membase_imm (s->code, X86_CMP, treg, 0, ((int)mono_defaults.transparent_proxy_class));
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE); 
+
+	/* this is a transparent proxy - remote the call */
+
+	/* save value to stack */
 	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 8);
 	x86_fst_membase (s->code, X86_ESP, 0, TRUE, TRUE);
-}
 
-# fixme: we need to implement unordered and ordered compares
+	x86_push_reg (s->code, X86_ESP);
+	x86_push_imm (s->code, tree->data.fi.field);
+	x86_push_imm (s->code, tree->data.fi.klass);
+	x86_push_reg (s->code, lreg);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_store_remote_field);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 24);
 
-stmt: BEQ (freg, freg) {
-	x86_fcompp (s->code);
-	x86_fnstsw (s->code);
-	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x4000);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_EQ, 0, TRUE);
-}
+	br [1] = s->code; x86_jump8 (s->code, 0);
 
-stmt: BNE_UN (freg, freg) {
-	x86_fcompp (s->code);
-	x86_fnstsw (s->code);
-	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x4000);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
-}
+	x86_patch (br [0], s->code);
+	offset = tree->data.fi.klass->valuetype ? tree->data.fi.field->offset - sizeof (MonoObject) : 
+		tree->data.fi.field->offset;
+	x86_fst_membase (s->code, lreg, offset, TRUE, TRUE);
 
-stmt: BLT (freg, freg) {
-	x86_fcompp (s->code);
-	x86_fnstsw (s->code);
-	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_EQ, 0, FALSE);
+	x86_patch (br [1], s->code);
 }
 
-stmt: BLT_UN (freg, freg) {
-	x86_fcompp (s->code);
-	x86_fnstsw (s->code);
-	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_EQ, 0, FALSE);
-}
+stmt: ARG_R4 (freg) {
+	int pad = tree->data.arg_info.pad;
 
-stmt: BGE (freg, freg) {
-	x86_fcompp (s->code);
-	x86_fnstsw (s->code);
-	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 4 + pad);
+	x86_fst_membase (s->code, X86_ESP, 0, FALSE, TRUE);
 }
 
-stmt: BGE_UN (freg, freg) {
-	x86_fcompp (s->code);
-	x86_fnstsw (s->code);
-	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
-}
+stmt: ARG_R8 (freg) {
+	int pad = tree->data.arg_info.pad;
 
-stmt: BGT (freg, freg) {
-	x86_fcompp (s->code);
-	x86_fnstsw (s->code);
-	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_EQ, 0, FALSE);
+	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 8 + pad);
+	x86_fst_membase (s->code, X86_ESP, 0, TRUE, TRUE);
 }
 
-stmt: BGT_UN (freg, freg) {
-	x86_fcompp (s->code);
-	x86_fnstsw (s->code);
-	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_EQ, 0, FALSE);
-}
+# fixme: we need to implement unordered and ordered compares
+
+stmt: CBRANCH (COMPARE (freg, freg)) {
 
-stmt: BLE (freg, freg) {
 	x86_fcompp (s->code);
 	x86_fnstsw (s->code);
 	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+
+	switch (tree->data.bi.cond) {
+	case CEE_BLT:
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_EQ, 0, FALSE);
+		break;
+	case CEE_BLT_UN:
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_EQ, 0, FALSE);
+		break;
+	case CEE_BGT:
+		x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_EQ, 0, FALSE);
+		break;
+	case CEE_BGT_UN:
+		x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_EQ, 0, FALSE);
+		break;
+	case CEE_BEQ:
+		x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x4000);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_EQ, 0, TRUE);
+		break;
+	case CEE_BNE_UN:
+		x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x4000);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+		break;
+	case CEE_BGE:
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+		break;
+	case CEE_BGE_UN:
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+		break;
+	case CEE_BLE:
+		x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+		break;
+	case CEE_BLE_UN:
+		x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_BB, tree->data.bi.target);
+		x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
 }
 
-stmt: BLE_UN (freg, freg) {
-	x86_fcompp (s->code);
-	x86_fnstsw (s->code);
-	x86_alu_reg_imm (s->code, X86_AND, X86_EAX, 0x4500);
-	x86_alu_reg_imm (s->code, X86_CMP, X86_EAX, 0x0100);
-	mono_add_jump_info (s, s->code + 2, NULL, tree->data.bb);
-	x86_branch32 (s->code, X86_CC_NE, 0, FALSE);
+freg: CALL_R8 (this, reg) {
+	int treg = X86_EAX;
+	int lreg = tree->left->reg1;
+	int rreg = tree->right->reg1;
+	
+	if (lreg == treg || rreg == treg) 
+		treg = X86_EDX;
+	if (lreg == treg || rreg == treg) 
+		treg = X86_ECX;
+	if (lreg == treg || rreg == treg) 
+		mono_assert_not_reached ();
+
+	X86_CALL_BEGIN;
+
+	x86_call_reg (s->code, rreg);
+
+	X86_CALL_END;
 }
 
 freg: CALL_R8 (this, ADDR_G) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 	
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
+	X86_CALL_BEGIN;
 
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
-
-	mono_add_jump_info (s, s->code + 1, tree->right->data.p, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, tree->right->data.p);
 	x86_call_code (s->code, 0);
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
+	X86_CALL_END;
 }
 
 freg: CALL_R8 (this, INTF_ADDR) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
-
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
+	X86_CALL_BEGIN;
 
 	x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
 	x86_mov_reg_membase (s->code, lreg, lreg, 
@@ -3040,44 +4614,44 @@ freg: CALL_R8 (this, INTF_ADDR) {
 	x86_mov_reg_membase (s->code, lreg, lreg, tree->right->data.m->klass->interface_id << 2, 4);
 	x86_call_virtual (s->code, lreg, tree->right->data.m->slot << 2);
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
+	X86_CALL_END;
 }
 
 freg: CALL_R8 (this, VFUNC_ADDR) {
-	MethodCallInfo *ci = tree->data.ci;
 	int lreg = tree->left->reg1;
 	int treg = X86_EAX;
 
 	if (lreg == treg) 
 		treg = X86_EDX;
 
-	if (tree->left->op != MB_TERM_NOP) {
-		g_assert (lreg >= 0);
-		x86_push_reg (s->code, lreg);
-	}
-
-	if (ci->vtype_num) {
-		int offset = g_array_index (s->varinfo, MonoVarInfo, ci->vtype_num).offset;
-		x86_lea_membase (s->code, treg, X86_EBP, offset);
-		x86_push_reg (s->code, treg);
-	}
+	X86_CALL_BEGIN;
 
 	x86_mov_reg_membase (s->code, lreg, lreg, 0, 4);
 	x86_call_virtual (s->code, lreg, 
 	        G_STRUCT_OFFSET (MonoVTable, vtable) + (tree->right->data.m->slot << 2));
 
-	if (ci->args_size)
-		x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, ci->args_size);
+	X86_CALL_END;
 }
 
 stmt: RET (freg) {
 	if (!tree->last_instr) {
-		mono_add_jump_info (s, s->code + 1, NULL, NULL);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_EPILOG, NULL);
 		x86_jump32 (s->code, 0);      
 	}
 }
 
+freg: SIN (freg) {
+	x86_fsin (s->code);
+}
+
+freg: COS (freg) {
+	x86_fcos (s->code);
+}
+
+freg: SQRT (freg) {
+	x86_fsqrt (s->code);
+}
+
 # support for value types
 
 reg: LDIND_OBJ (reg) {
@@ -3086,55 +4660,90 @@ reg: LDIND_OBJ (reg) {
 }
 
 stmt: STIND_OBJ (reg, reg) {
-	x86_push_reg (s->code, X86_EAX);
-	x86_push_reg (s->code, X86_EDX);
-	x86_push_reg (s->code, X86_ECX);
+	mono_assert (tree->data.i > 0);
 
-	g_assert (tree->data.i > 0);
 	x86_push_imm (s->code, tree->data.i);
 	x86_push_reg (s->code, tree->right->reg1);
 	x86_push_reg (s->code, tree->left->reg1);
-	mono_add_jump_info (s, s->code + 1, MEMCOPY, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, MEMCOPY);
 	x86_call_code (s->code, 0);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 12);
+}
 
-	x86_pop_reg (s->code, X86_ECX);
-	x86_pop_reg (s->code, X86_EDX);
-	x86_pop_reg (s->code, X86_EAX);
+stmt: REMOTE_STIND_OBJ (reg, reg) {
+	guint8 *br[2];
+	int treg = X86_EAX;
+	int lreg = tree->left->reg1;
+	int rreg = tree->right->reg1;
+	int size, offset;
+
+	if (lreg == treg)
+		treg = X86_EDX;
+
+	if (rreg == treg)
+		treg = X86_ECX;
+
+	x86_mov_reg_membase (s->code, treg, lreg, 0, 4);
+	x86_alu_membase_imm (s->code, X86_CMP, treg, 0, ((int)mono_defaults.transparent_proxy_class));
+	br [0] = s->code; x86_branch8 (s->code, X86_CC_NE, 0, FALSE);
+
+	/* this is a transparent proxy - remote the call */
+
+	x86_push_reg (s->code, rreg);
+	x86_push_imm (s->code, tree->data.fi.field);
+	x86_push_imm (s->code, tree->data.fi.klass);
+	x86_push_reg (s->code, lreg);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, mono_store_remote_field);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 16);
+
+	br [1] = s->code; x86_jump8 (s->code, 0);
+
+	x86_patch (br [0], s->code);
+
+	offset = tree->data.fi.klass->valuetype ? tree->data.fi.field->offset - sizeof (MonoObject) : 
+		tree->data.fi.field->offset;
+
+	size = mono_class_value_size (tree->data.fi.field->type->data.klass, NULL);
+	x86_push_imm (s->code, size);
+	x86_push_reg (s->code, tree->right->reg1);
+	x86_alu_reg_imm (s->code, X86_ADD, tree->left->reg1, offset);	
+	x86_push_reg (s->code, tree->left->reg1);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, MEMCOPY);
+	x86_call_code (s->code, 0);
+	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 12);
+
+	x86_patch (br [1], s->code);
 }
 
 stmt: ARG_OBJ (CONST_I4) {
+	int pad = tree->data.arg_info.pad;
+
+	X86_ARG_PAD (pad);
 	x86_push_imm (s->code, tree->left->data.i);	
 }
 
 stmt: ARG_OBJ (reg) {
-	int size = tree->data.i;
+	int size = tree->data.arg_info.size;
+	int pad = tree->data.arg_info.pad;
 	int sa;
 	
-	g_assert (size > 0);
+	if (!size) 
+		return;
 
-	sa = size + 3;
-	sa &= ~3;
+	sa = size + pad;
 
 	/* reserve space for the argument */
 	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, sa);
 
-	x86_push_reg (s->code, X86_EAX);
-	x86_push_reg (s->code, X86_EDX);
-	x86_push_reg (s->code, X86_ECX);
-
 	x86_push_imm (s->code, size);
 	x86_push_reg (s->code, tree->left->reg1);
-	x86_lea_membase (s->code, X86_EAX, X86_ESP, 5*4);
+	x86_lea_membase (s->code, X86_EAX, X86_ESP, 2*4);
 	x86_push_reg (s->code, X86_EAX);
 
-	mono_add_jump_info (s, s->code + 1, MEMCOPY, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, MEMCOPY);
 	x86_call_code (s->code, 0);
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 12);
-
-	x86_pop_reg (s->code, X86_ECX);
-	x86_pop_reg (s->code, X86_EDX);
-	x86_pop_reg (s->code, X86_EAX);
 }
 
 stmt: RET_OBJ (reg) {
@@ -3144,14 +4753,13 @@ stmt: RET_OBJ (reg) {
 	x86_push_reg (s->code, tree->left->reg1);
 	x86_push_membase (s->code, X86_EBP, 8);
 
-
-	mono_add_jump_info (s, s->code + 1, MEMCOPY, NULL);
+	mono_add_jump_info (s, s->code, MONO_JUMP_INFO_ABS, MEMCOPY);
 	x86_call_code (s->code, 0);
 
 	x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, 12);
 
 	if (!tree->last_instr) {
-		mono_add_jump_info (s, s->code + 1, NULL, NULL);
+		mono_add_jump_info (s, s->code, MONO_JUMP_INFO_EPILOG, NULL);
 		x86_jump32 (s->code, 0);      
 	}
 }
@@ -3193,21 +4801,81 @@ mono_llmult_ovf_un (gpointer *exc, guint32 al, guint32 ah, guint32 bl, guint32 b
 	return 0;
 }
 
+
 guint64  
-mono_llmult_ovf (gpointer *exc, guint32 al, gint32 ah, guint32 bl, gint32 bh)
-{
+mono_llmult_ovf (gpointer *exc, guint32 al, gint32 ah, guint32 bl, gint32 bh) {
+	/*
+	Use Karatsuba algorithm where:
+		a*b is: AhBh(R^2+R)+(Ah-Al)(Bl-Bh)R+AlBl(R+1)
+		where Ah is the "high half" (most significant 32 bits) of a and
+		where Al is the "low half" (least significant 32 bits) of a and
+		where  Bh is the "high half" of b and Bl is the "low half" and
+		where R is the Radix or "size of the half" (in our case 32 bits)
+
+	Note, for the product of two 64 bit numbers to fit into a 64
+	result, ah and/or bh must be 0.  This will save us from doing
+	the AhBh term at all.
+
+	Also note that we refactor so that we don't overflow 64 bits with 
+	intermediate results. So we use [(Ah-Al)(Bl-Bh)+AlBl]R+AlBl
+	*/
+
 	gint64 res, t1;
+	gint32 sign;
+
+	/* need to work with absoulte values, so find out what the
+	   resulting sign will be and convert any negative numbers
+	   from two's complement
+	*/
+	sign = ah ^ bh;
+	if (ah < 0) {
+		/* flip the bits and add 1 */
+		ah ^= ~0;
+		if (al ==  0)
+			ah += 1;
+		else {
+			al ^= ~0;
+			al +=1;
+		}
+	}
+
+	if (bh < 0) {
+		/* flip the bits and add 1 */
+		bh ^= ~0;
+		if (bl ==  0)
+			bh += 1;
+		else {
+			bl ^= ~0;
+			bl +=1;
+		}
+	}
+		
+	/* we overflow for sure if both upper halves are greater 
+	   than zero because we would need to shift their 
+	   product 64 bits to the left and that will not fit
+	   in a 64 bit result */
+	if (ah && bh)
+		goto raise_exception;
 
-	// fixme: check for overflow
+	/* do the AlBl term first */
+	t1 = (gint64)al * (gint64)bl;
 
-	res = (gint64)al * (gint64)bl;
+	res = t1;
 
-	t1 = (gint64)ah * bl + al * (gint64)bh;
+	/* now do the [(Ah-Al)(Bl-Bh)+AlBl]R term */
+	t1 += (gint64)(ah - al) * (gint64)(bl - bh);
+	t1 <<= 32;
+	/* check for overflow */
+	if (t1 > (0x7FFFFFFFFFFFFFFF - res))
+		goto raise_exception;
 
-	res += ((gint64)t1) << 32; 
+	res += t1;
 
 	*exc = NULL;
-	return res;
+	if (sign < 0)
+		return -res;
+	else
+		return res;
 
  raise_exception:
 	*exc = mono_get_exception_overflow ();
@@ -3238,44 +4906,6 @@ mono_llrem_un (guint64 a, guint64 b)
 	return a % b;
 }
 
-MBTree *
-mono_ctree_new (MonoMemPool *mp, int op, MBTree *left, MBTree *right)
-{
-	MBTree *t = mono_mempool_alloc0 (mp, sizeof (MBTree));
-
-	t->op = op;
-	t->left = left;
-	t->right = right;
-	t->reg1 = -1;
-	t->reg2 = -1;
-	t->reg3 = -1;
-	t->svt = VAL_UNKNOWN;
-	t->cli_addr = -1;
-	return t;
-}
-
-MBTree *
-mono_ctree_new_leaf (MonoMemPool *mp, int op)
-{
-	return mono_ctree_new (mp, op, NULL, NULL);
-}
-
-gpointer 
-arch_get_lmf_addr (void)
-{
-	gpointer *lmf;
-
-	if ((lmf = TlsGetValue (lmf_thread_id)))
-		return lmf;
-
-	lmf = g_malloc (sizeof (gpointer));
-	*lmf = NULL;
-
-	TlsSetValue (lmf_thread_id, lmf);
-
-	return lmf;
-}
-
 MonoArray*
 mono_array_new_wrapper  (MonoClass *eclass, guint32 n)
 {
@@ -3293,19 +4923,11 @@ mono_object_new_wrapper (MonoClass *klass)
 }
 
 MonoString*
-mono_string_new_wrapper (const char *text)
-{
-	MonoDomain *domain = mono_domain_get ();
-
-	return mono_string_new (domain, text);
-}
-
-MonoString*
-mono_ldstr_wrapper (MonoImage *image, guint32 index)
+mono_ldstr_wrapper (MonoImage *image, guint32 ind)
 {
 	MonoDomain *domain = mono_domain_get ();
 
-	return mono_ldstr (domain, image, index);
+	return mono_ldstr (domain, image, ind);
 }
 
 gpointer 
@@ -3321,9 +4943,8 @@ mono_ldsflda (MonoClass *klass, int offset)
 	return addr;
 }
 
-#ifdef DEBUG
 void *
-MEMCOPY (void *dest, const void *src, size_t n)
+debug_memcopy (void *dest, const void *src, size_t n)
 {
 	int i, l = n;
 
@@ -3335,5 +4956,229 @@ MEMCOPY (void *dest, const void *src, size_t n)
 	
 	return memcpy (dest, src, n);
 }
+
+void mono_emit_fast_iconv (MBCGEN_TYPE* s, MBTREE_TYPE* tree)
+{
+	guint8* br [3];
+	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 12);
+	x86_fist_membase (s->code, X86_ESP, 8, TRUE); // rounded value
+	x86_fst_membase (s->code, X86_ESP, 0, FALSE, FALSE); // float value
+	x86_fp_int_op_membase (s->code, X86_FSUB, X86_ESP, 8, TRUE);
+	x86_fst_membase (s->code, X86_ESP, 4, FALSE, TRUE); // diff
+
+	x86_pop_reg (s->code, tree->reg1); // float value
+	x86_test_reg_reg (s->code, tree->reg1, tree->reg1);
+	br[0] = s->code; x86_branch8 (s->code, X86_CC_S, 0, TRUE);
+
+	x86_pop_reg (s->code, tree->reg1); // diff
+	x86_alu_reg_reg (s->code, X86_ADD, tree->reg1, tree->reg1);
+	x86_pop_reg (s->code, tree->reg1); // rounded value
+	x86_alu_reg_imm (s->code, X86_SBB, tree->reg1, 0);
+	br[1] = s->code; x86_jump8 (s->code, 0);
+
+	// freg is negative
+	x86_patch (br[0], s->code);
+
+	x86_pop_reg (s->code, tree->reg1); // diff
+	x86_alu_reg_reg (s->code, X86_ADD, tree->reg1, tree->reg1);
+	x86_pop_reg (s->code, tree->reg1); // rounded value
+	br[2] = s->code; x86_branch8 (s->code, X86_CC_Z, 0, FALSE);
+	x86_alu_reg_imm (s->code, X86_SBB, tree->reg1, -1);
+	x86_patch (br[1], s->code);
+	x86_patch (br[2], s->code);
+}
+
+void mono_emit_fast_iconv_i8 (MBCGEN_TYPE* s, MBTREE_TYPE* tree)
+{
+	guint8* br [3];
+	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 16);
+	x86_fld_reg (s->code, 0);
+	x86_fist_pop_membase (s->code, X86_ESP, 8, TRUE); // rounded value (qword)
+	x86_fst_membase (s->code, X86_ESP, 0, FALSE, FALSE); // float value
+	x86_fild_membase (s->code, X86_ESP, 8, TRUE);
+	x86_fp_op_reg (s->code, X86_FSUB, 1, TRUE); // diff
+	x86_fst_membase (s->code, X86_ESP, 4, FALSE, TRUE); // diff
+
+	x86_pop_reg (s->code, tree->reg1); // float value
+	x86_test_reg_reg (s->code, tree->reg1, tree->reg1);
+	br[0] = s->code; x86_branch8 (s->code, X86_CC_S, 0, TRUE);
+
+	x86_pop_reg (s->code, tree->reg1); // diff
+	x86_alu_reg_reg (s->code, X86_ADD, tree->reg1, tree->reg1);
+	x86_pop_reg (s->code, tree->reg1); // rounded value
+	x86_pop_reg (s->code, tree->reg2);
+	x86_alu_reg_imm (s->code, X86_SBB, tree->reg1, 0);
+	x86_alu_reg_imm (s->code, X86_SBB, tree->reg2, 0);
+	br[1] = s->code; x86_jump8 (s->code, 0);
+
+	// freg is negative
+	x86_patch (br[0], s->code);
+
+	x86_pop_reg (s->code, tree->reg1); // diff
+	x86_alu_reg_reg (s->code, X86_ADD, tree->reg1, tree->reg1);
+	x86_pop_reg (s->code, tree->reg1); // rounded value
+	x86_pop_reg (s->code, tree->reg2);
+	br[2] = s->code; x86_branch8 (s->code, X86_CC_Z, 0, FALSE);
+	x86_alu_reg_imm (s->code, X86_SBB, tree->reg1, -1);
+	x86_alu_reg_imm (s->code, X86_SBB, tree->reg2, -1);
+	x86_patch (br[1], s->code);
+	x86_patch (br[2], s->code);
+}
+
+void mono_emit_stack_alloc (MBCGEN_TYPE* s, MBTREE_TYPE* tree)
+{
+#ifdef PLATFORM_WIN32
+	guint8* br[5];
+	int sreg;
+
+	/*
+	 * Under Windows:
+	 * If requested stack size is larger than one page,
+	 * perform stack-touch operation
+	 * (see comments in mono_emit_stack_alloc_const below).
+	 */
+	x86_test_reg_imm (s->code, tree->left->reg1, ~0xFFF);
+	br[0] = s->code; x86_branch8 (s->code, X86_CC_Z, 0, FALSE);
+
+	sreg = tree->left->reg1;
+
+	br[2] = s->code; /* loop */
+	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 0x1000);
+	x86_test_membase_reg (s->code, X86_ESP, 0, X86_ESP);
+	x86_alu_reg_imm (s->code, X86_SUB, sreg, 0x1000);
+	x86_alu_reg_imm (s->code, X86_CMP, sreg, 0x1000);
+	br[3] = s->code; x86_branch8 (s->code, X86_CC_AE, 0, FALSE);
+	x86_patch (br[3], br[2]);
+	x86_test_reg_reg (s->code, sreg, sreg);
+	br[4] = s->code; x86_branch8 (s->code, X86_CC_Z, 0, FALSE);
+	x86_alu_reg_reg (s->code, X86_SUB, X86_ESP, sreg);
+
+	br[1] = s->code; x86_jump8 (s->code, 0);
+
+	x86_patch (br[0], s->code);
+	x86_alu_reg_reg (s->code, X86_SUB, X86_ESP, tree->left->reg1);
+	x86_patch (br[1], s->code);
+	x86_patch (br[4], s->code);
+#else /* PLATFORM_WIN32 */
+	x86_alu_reg_reg (s->code, X86_SUB, X86_ESP, tree->left->reg1);
+#endif
+}
+
+void mono_emit_stack_alloc_const (MBCGEN_TYPE* s, MBTREE_TYPE* tree, int size)
+{
+#ifdef PLATFORM_WIN32
+	int i, npages;
+	guint8* br[2];
+
+	if (size > 0xFFE) {
+		/*
+		 * Generate stack probe code.
+		 * Under Windows, it is necessary to allocate one page at a time,
+		 * "touching" stack after each successful sub-allocation. This is
+		 * because of the way stack growth is implemented - there is a
+		 * guard page before the lowest stack page that is currently commited.
+		 * Stack normally grows sequentially so OS traps access to the
+		 * guard page and commits more pages when needed.
+		 */
+		npages = ((unsigned) size) >> 12;
+		if (npages > 4) {
+			if (tree->reg1 != X86_EAX && tree->left->reg1 != X86_EAX) {
+				x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 0x1000);
+				x86_test_membase_reg (s->code, X86_ESP, 0, X86_ESP);
+				x86_mov_membase_reg (s->code, X86_ESP, 0x1000 - 4, X86_EAX, 4); /* save EAX */
+				x86_mov_reg_imm (s->code, X86_EAX, npages - 1);
+			} else {
+				x86_mov_reg_imm (s->code, X86_EAX, npages);
+			}
+			br[0] = s->code; /* loop */
+			x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 0x1000);
+			x86_test_membase_reg (s->code, X86_ESP, 0, X86_ESP);
+			x86_dec_reg (s->code, X86_EAX);
+			br[1] = s->code; x86_branch8 (s->code, X86_CC_NZ, 0, TRUE);
+			x86_patch (br[1], br[0]);
+			if (tree->reg1 != X86_EAX && tree->left->reg1 != X86_EAX)
+				x86_mov_reg_membase (s->code, X86_EAX, X86_ESP, (npages * 0x1000) - 4, 4); /* restore EAX */
+		} else {
+			/* generate unrolled code for relatively small allocs */
+			for (i = npages; --i >= 0;) {
+				x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, 0x1000);
+				x86_test_membase_reg (s->code, X86_ESP, 0, X86_ESP);
+			}
+		}
+	}
+
+	if (size & 0xFFF) x86_alu_reg_imm (s->code, X86_ADD, X86_ESP, -(size & 0xFFF));
+#else /* PLATFORM_WIN32 */
+	x86_alu_reg_imm (s->code, X86_SUB, X86_ESP, size);
 #endif
+}
+
+gpointer 
+mono_ldvirtftn (MonoObject *this, int slot)
+{
+	MonoClass *class;
+	MonoMethod *m;
+	gpointer addr;
+	gboolean is_proxy = FALSE;
+	g_assert (this);
+
+	if ((class = this->vtable->klass) == mono_defaults.transparent_proxy_class) {
+		class = ((MonoTransparentProxy *)this)->klass;
+		is_proxy = TRUE;
+	}
+
+	
+	g_assert (slot <= class->vtable_size);
 
+	m = class->vtable [slot];
+
+	if (is_proxy) {
+		return mono_jit_create_remoting_trampoline (m);
+	} else {
+		EnterCriticalSection (metadata_section);
+		addr = mono_compile_method (m);
+		LeaveCriticalSection (metadata_section);
+		return addr;
+	}
+}
+
+gpointer 
+mono_ldintftn (MonoObject *this, int slot)
+{
+	MonoClass *class;
+	MonoMethod *m;
+	gpointer addr;
+	gboolean is_proxy = FALSE;
+	g_assert (this);
+
+	if ((class = this->vtable->klass) == mono_defaults.transparent_proxy_class) {
+		class = ((MonoTransparentProxy *)this)->klass;
+		is_proxy = TRUE;
+	}
+
+	g_assert (slot < class->interface_count);
+
+	slot = class->interface_offsets [slot];
+
+	m = class->vtable [slot];
+
+	if (is_proxy) {
+		return mono_jit_create_remoting_trampoline (m);
+	} else {
+		EnterCriticalSection (metadata_section);
+		addr = mono_compile_method (m);
+		LeaveCriticalSection (metadata_section);
+		return addr;
+	}
+}
+
+gpointer mono_ldftn (MonoMethod *method)
+{
+	gpointer addr;
+
+	EnterCriticalSection (metadata_section);
+	addr = mono_compile_method (method);
+	LeaveCriticalSection (metadata_section);
+
+	return addr;
+}
diff --git a/mono/metadata/.cvsignore b/mono/metadata/.cvsignore
index 896769d89cf..75d912a3efe 100644
--- a/mono/metadata/.cvsignore
+++ b/mono/metadata/.cvsignore
@@ -3,3 +3,5 @@ Makefile.in
 pedump
 .libs
 .deps
+*.lo
+*.la
diff --git a/mono/metadata/ChangeLog b/mono/metadata/ChangeLog
index 63ac7bc3260..a80ef1d3f01 100644
--- a/mono/metadata/ChangeLog
+++ b/mono/metadata/ChangeLog
@@ -1,3 +1,1931 @@
+2002-08-23  Martin Baulig  <martin@gnome.org>
+
+	* debug-helpers.c (mono_method_desc_from_method): New function to get
+	a MonoMethodDesc from a MonoMethod.
+
+Fri Aug 23 15:54:09 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.c: fixes assertion failure caused by multiple ExecuteAssembly
+	calls for same domain (patch by Tomi Pakarinen <Tomi.Pakarinen@iki.fi>).
+
+Fri Aug 23 12:14:45 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* string-icalls.[ch]: make helper methods static.
+
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* icall.c: re-applied patch to GetValueInternal. Also added R4 and R8
+	types to it and to SetValueInternal.
+
+	* object.c: Moved handle_enum label to its proper place. This was the
+	f... bug! ;-)
+
+	This time i compiled mcs and gtk-sharp and they both work.
+
+2002-08-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* icall.c: reverted partially my previous patch until 
+	object.c:set_value handles enums correcly.
+
+2002-08-22  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* icall.c:
+	(ves_icall_MonoField_GetValue): changed to use mono_field_get_value.
+	(ves_icall_System_Environment_get_MachineName): removed warning when
+	compiling under cygwin.
+
+Thu Aug 22 18:49:11 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.c: fixed field_get_value() for reference types.
+
+2002-08-22  Dick Porter  <dick@ximian.com>
+
+	* socket-io.c (ves_icall_System_Net_Sockets_Socket_RecvFrom_internal):
+	Don't free a buffer while it's still needed.  Patch from Jonathan
+	Liger <Jonathan.liger@wanadoo.fr>
+
+2002-08-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* icall.c (ves_icall_System_Environment_get_Platform): Add new
+	internal call.
+
+2002-08-21  Dietmar Maurer  <dietmar@ximian.com>
+
+	* icall.c (ves_icall_get_method_info): s/MonoMethod/MonoReflectionMethod/
+	(ves_icall_get_parameter_info): s/MonoMethod/MonoReflectionMethod/
+
+	* marshal.c (mono_marshal_get_remoting_invoke): save lmf, because
+	we call unmanaged code which throws exceptions.
+
+Wed Aug 21 12:56:49 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.h: added per-domain entry_assembly.
+	* appdomain.c: ensure mono_runtime_exec_main () gets non-null
+	arguments.
+	* icall.c: Assembly::GetEntryAssembly icall.
+	* object.c: set domain->entry_assembly in mono_runtime_exec_main().
+	Changes above from a patch by Tomi Pakarinen <tomi.pakarinen@welho.com>.
+
+Tue Aug 20 15:42:15 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.h, gc.c: added mono_domain_finalize ().
+
+2002-08-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* object.c:
+	(mono_print_unhandled_exception): changed g_warning by g_printerr
+	because g_log has a 1024 characters limit (yeah, i got a big stack
+	trace). Don't print exception name, that should be in ToString 
+	returned string.
+
+2002-08-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* icall.c: added ves_icall_FieldInfo_SetValueInternal.
+	* object.c: added missing MONO_TYPE_ARRAY in mono_runtime_invoke_array.
+
+2002-08-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* object.c:
+	(mono_print_unhandled_exception): after previous commit, i realized
+	that MS calls ToString on the exception. I changed this function to
+	do that. This way we get stack_trace for free.
+
+2002-08-19  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* object.c:
+	(mono_print_unhandled_exception): invoke Message property instead of
+	getting 'message' field from Exception. Don't allocate memory for
+	'trace' and 'message' if not needed.
+
+2002-08-18  Dick Porter  <dick@ximian.com>
+
+	* unicode.c: Fix asserts to match Encoder.cs checks
+
+Fri Aug 16 21:42:57 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* marshal.c: fix unaligned store issue and a few wrong
+	opcode argument types.
+
+2002-08-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* icall.c: added GetUninitializedObjectInternal internal call.
+
+2002-08-16  Dietmar Maurer  <dietmar@ximian.com>
+
+	* appdomain.c (mono_runtime_invoke_in_domain): transfer Exception
+	to the right domain.
+
+2002-08-14  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_marshal_get_runtime_invoke): unbox value types
+
+	* class.c (class_compute_field_layout): set blittable to false for Strings
+
+	* appdomain.c (mono_domain_transfer_object): added support for ISerializable
+
+Wed Aug 14 17:26:27 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.h, reflection.c, icall.c, object.c, reflection.h:
+	first chunk of code to create types at runtime. Code to
+	handle ReflectedType/DeclaringType. Make reflection handles
+	domain specific.
+
+Wed Aug 14 17:24:21 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: set correct name in arrays.
+
+2002-08-13  Dietmar Maurer  <dietmar@ximian.com>
+
+	* appdomain.c (mono_domain_transfer_object): make it work with
+	valuetypes. bug fixes.
+
+2002-08-12  Dick Porter  <dick@ximian.com>
+
+	* object.h: Rename some parameters to avoid c++ keywords (Patch
+	from Joseph Wenninger <kde@jowenn.at>)
+
+Thu Aug 8 13:04:18 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: added icall to implement Assembly.GetFile*.
+
+Thu Aug 8 10:18:17 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.h, reflection.c: code to embed managed resources.
+
+Tue Aug 6 17:59:44 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: move all the type size stuff into
+	class_compute_field_layout().
+
+Tue Aug 6 11:20:49 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: ensure enums have always the correct instance size.
+	* unicode.c: remove wrong assert.
+
+Mon Aug 5 19:30:04 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* assembly.c: fix mem corruption issue.
+	* image.h, image.c: added mono_image_get_resource () to access
+	managed resources.
+	* icall.c: implemented Assembly.EntryPoint property and some
+	Managed Resources related internalcalls.
+
+
+Mon Aug 5 18:18:03 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* image.c, image.h: impemented mono_image_get_entry_point ().
+	* appdomain.c: use mono_image_get_entry_point.
+
+Mon Aug 5 13:08:15 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: support the object type argument when loading
+	custom attributes.
+
+2002-08-05  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_marshal_get_managed_wrapper): add suppport for
+	String as return type.
+
+Fri Aug 2 21:15:42 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: fix encoding of named args for custom attrs to match
+	the ms implementation. Read them back when instantiating custom
+	attributes.
+
+2002-08-02  Radek Doulik  <rodo@ximian.com>
+
+	* marshal.c (mono_mb_add_data): convert ret value to LE, suggested
+	by Dietmar as quick fix
+	(mono_marshal_get_delegate_begin_invoke): use sig->param_count +
+	16 as stack size, used on more places as quick fix before Dietmar
+	will fix it properly
+
+Fri Aug 2 17:48:17 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.h, object.c: added accessors for fields and properties.
+
+Fri Aug 2 17:45:15 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c, class.h: made mono_class_get_field_from_name ()
+	loop on parent types.
+	Added mono_class_get_property_from_name ().
+
+Fri Aug 2 11:40:32 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c, class.h: move the code to setup the type vtable in its own
+	function so that it can be reused also for types created at runtime.
+	Eliminate the "class" identifier from the header file.
+	* reflection.c: setup the vtable for enums so that we can create
+	objects for use in SetConstant ().
+
+2002-08-02  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_delegate_to_ftnptr): pass delegate->target
+	instead of the delegate itself as this pointer (bug #28383)
+
+2002-08-01  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_marshal_get_managed_wrapper): added return type
+	conversions.
+
+Wed Jul 31 16:49:29 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* loader.c: don't set the pinvoke bit on icalls.
+
+2002-07-31  Dietmar Maurer  <dietmar@ximian.com>
+
+	* debug-helpers.c (mono_method_full_name): only print a number to
+	indicate wrapper type (so that the output is more readable in traces).
+
+2002-07-30  Dietmar Maurer  <dietmar@ximian.com>
+
+	* class.c (mono_class_init): include method override patch from Paolo
+
+Tue Jul 30 15:20:08 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: fixed GetTypeCode().
+
+2002-07-29  Dietmar Maurer  <dietmar@ximian.com>
+
+	* threads.c (ves_icall_System_Threading_Thread_Thread_internal):
+	use real delegate invoke function to make it work with multicast
+	delegates (fix bug# 28291).
+
+Fri Jul 26 11:58:22 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.c: load constant strings.
+
+Fri Jul 26 11:36:14 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: no magic numbers.
+	* tabledefs.h: security action enum.
+
+Fri Jul 26 11:22:52 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* assembly.c: fix possible memory corruption.
+
+Thu Jul 25 13:58:38 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.h, reflection.c: added support for linking resources.
+	* verify.c: check we have an updated corlib.
+
+2002-07-25  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_marshal_get_native_wrapper): correctly marshal
+	string arrays.
+	(mono_marshal_string_array): null terminate unmanaged string arrays.
+	(mono_marshal_get_managed_wrapper): print warning for arrays (not implemented)
+
+Wed Jul 24 13:32:36 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: Type.GetType () can now return also types from the
+	calling assembly.
+
+Wed Jul 24 13:04:05 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* loader.h, loader.c: stack walking support.
+	* icall.c: implemented GetCurrentMethod, GetExecutingAssembly,
+	GetCallingAssembly.
+
+2002-07-24  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c: added optimisations for blittable types 
+
+	* class.c (mono_array_class_get): do not set blittable attribute on arrays
+	(mono_class_setup_mono_type): set blittable attribute for single
+	and double.
+
+	* marshal.c (mono_string_utf8_to_builder): impl.
+	(mono_string_builder_to_utf8): impl.
+	(mono_marshal_get_native_wrapper): impl. StringBuilder marshaling
+
+2002-07-23  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_marshal_get_native_wrapper): impl. byref types
+	(mono_marshal_get_managed_wrapper): impl. byref types
+
+2002-07-23  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* icall.c:
+	(search_method): don't display debug message. 
+
+2002-07-22  Dietmar Maurer  <dietmar@ximian.com>
+
+	* metadata.c (mono_type_stack_size): removed temporary fix for new gcc
+
+Mon Jul 22 18:17:05 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.c: set the missing filename when throwing exception.
+
+2002-07-22  Dietmar Maurer  <dietmar@ximian.com>
+
+	* metadata.c (mono_type_size): code cleanup
+	(mono_type_stack_size): removed some test code
+
+2002-07-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* appdomain.c (ves_icall_System_Reflection_Assembly_LoadFrom): Use
+	mono_get_exception_file_not_found now.
+
+	* exception.c (mono_exception_from_name_two_strings): New version
+	that will call a constructor with two string arguments. 
+	(mono_get_exception_file_not_found): New helper routine, used to
+	report file-not-found errors.
+
+2002-07-20  Dick Porter  <dick@ximian.com>
+
+	* process.h:
+	* process.c: Pass file handles to CreateProcess
+	
+	* icall.c:
+	* file-io.h:
+	* file-io.c: Implemented CreatePipe
+
+2002-07-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* metadata.c (mono_get_param_info): set alignment for value types
+
+Fri Jul 19 18:58:27 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.h, domain.c, threads-types.h: don't include config.h in headers.
+	Constify mono_domain_assembly_open().
+	* loader.c: handle null namespace in icalls.
+
+2002-07-19  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (emit_ptr_to_str_conv): marshal object as structs
+	(emit_str_to_ptr_conv): marshal object as structs
+
+	* metadata.c (mono_type_to_unmanaged): marshal object as structs
+
+	* marshal.c (mono_marshal_get_runtime_invoke): support value types
+
+2002-07-18  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_marshal_get_runtime_invoke): use exception filters
+	(mono_marshal_get_native_wrapper): we an now return value types
+
+Wed Jul 17 18:21:29 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* verify.c: more checks implemented.
+
+2002-07-17  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_delegate_to_ftnptr): invoke the right method
+	(fix bug #27695)
+	(mono_marshal_get_native_wrapper): allow byref arguments
+	(ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringXXX):
+	impl. PtrToStringXXX methods
+	(ves_icall_System_Runtime_InteropServices_Marshal_PtrToStructure_type): impl.
+	(ves_icall_System_Runtime_InteropServices_Marshal_OffsetOf): impl.
+	(ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalAnsi): impl.
+	(ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalUni): impl.
+	(ves_icall_System_Runtime_InteropServices_Marshal_DestroyStructure): impl.
+
+Tue Jul 16 19:00:57 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: fix buglet in parsing an assembly name.
+
+2002-07-16  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (emit_ptr_to_str_conv): first impl.
+
+Tue Jul 16 12:39:33 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.c, class.h: cache the vtable in the class as suggested by
+	vargaz@freemail.hu (Zoltan Varga).
+
+Tue Jul 16 11:27:57 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.h, loader.c: added mono_field_from_token().
+	* verify.c: first cut of type checking code.
+
+2002-07-16  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_marshal_get_native_wrapper): support valuetypes
+
+2002-07-15  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_marshal_get_native_wrapper): handle enum types
+	(fix bug #27782)
+	(mono_marshal_get_remoting_invoke): impl.
+	(mono_delegate_begin_invoke): impl.
+	(mono_mb_emit_save_args): impl.
+	(mono_delegate_end_invoke): impl.
+	(mono_marshal_get_delegate_begin_invoke):
+	(mono_marshal_get_delegate_end_invoke):
+	(mono_marshal_get_delegate_invoke): generate a special name for
+	those methods (including the signature) and associate them whith
+	the delegate class. 
+
+2002-07-13  Gonzalo Paniagua Javier <gonzalo@gnome-db.org>
+
+	* reflection.[ch]: 
+	(mono_reflection_type_from_name): now it has a MonoImage parameter
+	which is used as the default image to search the type in. If the image
+	is NULL or getting the type from it fails, it defaults to corlib.
+
+	* icall.c: changed 1 call to mono_reflection_type_from_name to match
+	new parameter.
+
+Sat Jul 13 19:32:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: update the parameter table index.
+
+Sat Jul 13 17:34:23 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* domain.c: don't include the mark byte in the string hash.
+
+Sat Jul 13 15:06:23 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.cs: icall for Type.GetTypeCode ().
+	* verify: a couple of fixes and disabled local initialization checks.
+
+2002-07-12  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c: better debugging support (DEBUG_RUNTIME_CODE)
+
+	* debug-helpers.c (mono_method_full_name): print the type of the
+	runtime wrapper
+
+	* metadata.c (mono_signature_hash): a hash function for signatures
+	(mono_signature_hash): better hash algorithm
+
+	* marshal.c (mono_marshal_get_delegate_invoke): cache methods by signature
+
+	* debug-helpers.c (mono_method_full_name): this can now generate
+	method names with signatures
+
+	* marshal.c (mono_marshal_get_managed_wrapper): bug fix: unmanaged
+	method dont have this pointers.
+
+Fri Jul 12 11:35:48 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: fixup typebuilder tokens.
+	* image.c: fix buglet.
+	* marshal.h: remove whitespace.
+	* metadata.h, metadata.c: reinstate code that was removed.
+	* verify.c: handle catch directives and fix another couple of bugs.
+
+2002-07-11  Dietmar Maurer  <dietmar@ximian.com>
+
+	* marshal.c (mono_marshal_get_native_wrapper): support BOOLEAN
+	(mono_marshal_get_native_wrapper): make it comp. with the old code
+	(mono_marshal_get_native_wrapper): support boolean
+	(mono_marshal_get_managed_wrapper): support more types
+
+2002-06-25  Dietmar Maurer  <dietmar@ximian.com>
+
+	* class.c (class_compute_field_layout): compute class->blittable attribute.
+
+2002-07-09  Dick Porter  <dick@ximian.com>
+
+	* threads.c: Make the thread cleaning up cope with threads that
+	call ExitThread()
+
+2002-07-08  Radek Doulik  <rodo@ximian.com>
+
+	* reflection.c (method_encode_code): use non-translated values to
+	compute finally_start, this fixes exception handling on ppc, yay!
+
+	* decimal.h (struct signscale): fix endianess
+
+2002-07-07  Radek Doulik  <rodo@ximian.com>
+
+	* reflection.c: swap box_val and not val
+
+Mon Jul 8 15:18:59 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c, reflection.h: handle full assembly info in type name.
+	Handle Type arguments when loading custom attributes.
+	* icall.c: updated to use new mono_reflection_type_from_name () method.
+
+2002-07-07  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* loader.c:
+	(method_from_memberref): also print assembly name when method not found.
+
+2002-07-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* icall.c:
+	(ves_icall_TypeGetProperties): fixed bug #27473. 
+
+2002-07-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* reflection.c: display image name and token when cannot find the
+	.ctor for an attribute.
+
+2002-07-05  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c: Reflect latest MonoDwarfFileWriter changes.
+
+2002-07-04  Dick Porter  <dick@ximian.com>
+
+	* threads.c (mono_thread_cleanup): Nasty kludge to get this to
+	compile on mingw.  This will cause mingw builds to not wait for
+	subthreads to terminate after the main thread does.  I've lodged a
+	bug with the mingw developers for them to wrap OpenThread().
+
+2002-07-03  Dick Porter  <dick@ximian.com>
+
+	* threads.c: Store thread IDs instead of handles, because
+	GetCurrentThread() returns a pseudohandle and therefore stores
+	useless values.  mono_thread_cleanup() continues checking the
+	array of threads until it is empty, to cope with subthreads
+	spawning new threads after the main thread has finished.
+
+	* profiler.h:
+	* profiler.c:
+	* profiler-private.h: Pass the thread ID to thread profiler
+	functions, instead of a handle
+
+Wed Jul 3 17:43:52 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* verify.c: fixes to make it more usable.
+	* pedump.c: added --verify code to verify IL code in an assembly.
+
+Tue Jul 2 20:40:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: turn errors into warnings to allow compiling corlib.
+
+Tue Jul 2 19:33:20 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: add special cases to compile corlib.
+
+Mon Jul 1 18:00:40 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: handle properties with only a set method.
+
+Mon Jul 1 17:11:11 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* opcodes.h: add enum with opcodes in opval order.
+
+2002-07-01  Dick Porter  <dick@ximian.com>
+	
+	* object.h:
+	* object.c (mono_runtime_run_main): Removed unneeded argument
+
+2002-06-28  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c: Reflect latest MonoDwarfFileWriter changes.
+
+2002-06-27  Dick Porter  <dick@ximian.com>
+
+	* threads.c: Store the handle in both the parent thread and in the
+	subthread, to minimise the time between starting a new thread and
+	storing its ID.
+
+2002-06-26  Dick Porter  <dick@ximian.com>
+
+	* appdomain.c (mono_runtime_cleanup): Close the socket library
+	after all the threads have finished, not before
+
+2002-06-26  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c (mono_debug_find_source_location): Added
+	`guint32 *line_number' argument.  If it's not NULL, store the line number
+	there and return the file name without the line number.
+
+2002-06-25  Dick Porter  <dick@ximian.com>
+
+	* icall.c:
+	* process.h:
+	* process.c: Process forking and other support functions
+
+2002-06-25  Dick Porter  <dick@ximian.com>
+
+	* image.c (do_mono_image_open): Set ref_count to 1, so that bad
+	things dont happen when the image is closed.
+	(mono_image_lookup_resource): Walk the resource section looking
+	for a particular entry
+
+	* cil-coff.h: PE resource section decoding
+
+2002-06-25  Dick Porter  <dick@ximian.com>
+	
+	* assembly.h:
+	* assembly.c: 
+	(mono_assembly_foreach): Accessor functions to walk the list of
+	loaded assemblies
+	(mono_assembly_set_main):
+	(mono_assembly_get_main): Process methods need to know which
+	assembly is the "main" one
+
+	* object.c (mono_runtime_run_main): Record the main assembly
+
+	* debug-helpers.c: Fix typo
+
+2002-06-24  Dietmar Maurer  <dietmar@ximian.com>
+
+	* icall.c (ves_icall_System_Runtime_InteropServices_Marshal_copy_to_unmanaged): impl.
+	(ves_icall_System_Runtime_InteropServices_Marshal_copy_from_unmanaged): impl.
+
+Sat Jun 22 11:37:25 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: fix off-by-one in Assembly.GetTypes() reported by bob@karr.ath.cx.
+
+2002-06-21  Miguel de Icaza  <miguel@ximian.com>
+
+	* image.c (do_mono_image_open): Initialize reference count,
+	otherwise we leak the MonoImage.
+
+Fri Jun 21 19:16:47 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: small tweak to handle self-hosting.
+
+Thu Jun 20 23:28:13 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: fix type name parse code.
+
+Thu Jun 20 19:24:32 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: break out of the loop.
+	* image.c: special case corlib.
+
+Thu Jun 20 16:43:29 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: add all the custom attrs at the end to ensure the
+	ctors have been properly initialized when the attributes are defined
+	in the current assembly.
+
+Thu Jun 20 13:46:40 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: handle correctly multiple-nested types.
+
+Thu Jun 20 11:49:00 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* row-indexes.h: fix typos.
+	* reflection.c: adjust for typos and fix method_def_or_ref
+	encoding in MethodImpl table.
+
+Wed Jun 19 21:57:30 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: fix entry point patching (thanks Serge!).
+
+2002-06-18  Dietmar Maurer  <dietmar@ximian.com>
+
+	* verify.c: add check for System.Exception
+
+Mon Jun 17 20:23:23 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* image.c, class.c: minifix for code just c&p'ed.
+	* reflection.c: warning fix.
+	* object.h, loader.h, domain.c: load also StringBuilder.
+
+Mon Jun 17 17:29:40 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* marshal.h, marshal.c: some support code to handle complex marshaling.
+
+Mon Jun 17 16:32:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.h, class.c, reflection.c: handle ignorecase in GetType ().
+	Better signatures with vtable error dump.
+
+Mon Jun 17 16:13:35 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c, reflection.h, icall.c: fixes for multiple-nested types.
+
+2002-06-17  Dietmar Maurer  <dietmar@ximian.com>
+
+	* icall.c (ves_icall_Type_GetField): impl.
+
+Mon Jun 17 16:08:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* metadata.h, metadata.c: added mono_metadata_get_marshal_info()
+	to retrieve a marshal description blob for a field or param.
+
+Mon Jun 17 14:57:03 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.h, reflection.c: change order of nested type emission
+	to avoid table corruption. The NestedTypes table is sorted.
+	* icall.c: change order of GetConstructor results to workaround mcs bug.
+
+Fri Jun 14 16:24:30 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.h, reflection.c: handle field and param marshal
+	information.
+
+Wed Jun 12 16:30:57 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c, marshal.c marshal.h: more Marshal class implementation.
+
+Tue Jun 11 17:29:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: fix call convention.
+
+Tue Jun 11 16:52:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.h, reflection.c: mono_image_get_memberref_token()
+	takes a type instead of a class, now. Added
+	mono_image_get_array_token() to create tokens for the special
+	multi-dim array methods.
+
+Tue Jun 11 13:21:51 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* assembly.c: handle modules (no assembly table). Split
+	loading references in its own function.
+	* class.c: handle moduleref resolution scope.
+	* image.c, image.h: cache module name in image.
+
+2002-06-07  Martin Baulig  <martin@gnome.org>
+
+	* reflection.c (mono_image_get_type_info): Only add a class layout entry
+	if we actually have a `tb->class_size' (ie. it's not UnspecifiedTypeSize).
+
+Fri Jun 7 22:07:25 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: more signature fixes that used uint instead of int.
+
+Fri Jun 7 20:41:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: fixed signature of field refs.
+
+Fri Jun 7 19:41:14 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c, reflection.c: handle typerefs of nested types
+	(both on read and when writing files).
+
+Fri Jun 7 17:46:50 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: fix method signatures that tried to workaround the previous
+	typo, d'oh!
+
+Fri Jun 7 17:36:33 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* debug-helpers.c: fix typo.
+
+Fri Jun 7 17:00:04 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* cil-coff.h, icall.c, image.c, reflection.c, reflection.h:
+	rewrote the PE/COFF writing code (our programs are understood by the
+	ms runtime, now).
+
+Tue Jun 4 18:10:47 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* gc.c, gc.h, icall.c: weakreference support.
+
+Tue Jun 4 16:06:19 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Makefile.am, mono-config.c: use $(sysconfdir).
+
+Mon Jun 3 13:13:32 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: changed default precision of Double.ToString() to 15.
+	Fixed memory leak. Unified with Single.ToString.
+
+Sat Jun 1 14:26:45 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* sysmath.c: workaround systems missing NAN and/or HUGE_VAL.
+
+Sat Jun 1 13:46:54 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* pedump.c, appdomain.c, appdomain.h, assembly.c, domain.c,
+	gc.c, icall.c, image.c, mono-config.c, reflection.c: killed
+	warnings and compilation fixes from Dennis Haney (davh@davh.dk)
+	and myself.
+
+Fri May 31 16:58:36 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* debug-symfile.c, sysmath.c: yet more compilation fixes.
+
+Fri May 31 16:35:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c, socket-io.c: more compilation fixes.
+
+Fri May 31 15:58:22 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.c, class.c, class.h, debug-symfile.c, decimal.c,
+	domain.c, loader.c, object.c, object.h, reflection.c, string-icalls.h,
+	unicode.c: warning and compiler compatibility fixes.
+
+Fri May 31 15:36:53 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.h, metadata.c: fixed warnings/compilation errors.
+
+Fri May 31 13:08:25 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Makefile.am, mono-config.c, mono-config.h: configuration file
+	support routines.
+	* loader.c, loader.h: make Dll mapping configurable at runtime in the
+	config file. Export methods to insert and lookup mappings.
+
+Fri May 31 12:45:38 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: handle types and boxed objects in custom attr
+	constructors.
+
+2002-05-30  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c
+	(ves_icall_Debugger_MonoSymbolWriter_method_builder_from_token): Removed.
+
+Thu May 30 14:15:02 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* metadata.c, metadata.h: added mono_metadata_implmap_from_method()
+	to lookup the implmap row for a P/Invoke method.
+	* loader.c: added mono_lookup_pinvoke_call(): we only lookup a
+	P/Invoke method from the runtime on an as needed basis.
+
+2002-05-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* metadata.c (mono_metadata_parse_signature): impl.
+
+Tue May 28 16:02:29 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: handle .pack directive.
+
+Tue May 28 11:04:46 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.c: initialize static fields with RVA data.
+
+2002-05-25  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c
+	(ves_icall_Debugger_DwarfFileWriter_get_type_token): Removed.
+
+2002-05-24  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c
+	(ves_icall_Debugger_MonoSymbolWriter_get_local_type_from_sig): Removed.
+	(ves_icall_Debugger_MonoSymbolWriter_method_from_token): Renamed to
+	`ves_icall_Debugger_MonoSymbolWriter_method_builder_from_token'.
+
+Thu May 23 18:44:37 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.c: special case string ctros in invoke.
+	* gc.c: silly whitespace changes.
+
+2002-05-23  Dietmar Maurer  <dietmar@ximian.com>
+
+	* threadpool.[ch]: impl. a threadpool that can
+	be used by mint and mono.
+
+2002-05-22  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c (ves_icall_Debugger_MonoSymbolWriter_method_from_token):
+	The first argument is now a `MonoReflectionModuleBuilder *', the return
+	value is a `MonoReflectionModuleBuilder *'.  Use the AssemblyBuilder's
+	`methods' field to get the method builder.  The `token' argument is the
+	unfixed token.
+
+	* unicode.c (iconv_get_length, iconv_convert): Silently ignore all
+	invalid characters instead of g_assert_not_reached()ing.  This seems
+	to be the behaviour of mscorlib.
+
+2002-05-22  Dietmar Maurer  <dietmar@ximian.com>
+
+	* object.c (mono_runtime_invoke_array): applied patch from Rachel
+	Hestilow to fix bug #25104
+
+2002-05-21  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c (mono_debug_find_source_location): New function.
+	Looks up an IL offset in the line number table and returns the source
+	location as a string.
+
+2002-05-21  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* icall.c:
+	(mono_double_ToStringImpl): changed %f by %g until we have something
+	better.
+
+2002-05-21  Nick Drochak  <ndrochak@gol.com>
+
+	* icall.c : Use different name for Math.Pow's icall.  Needed to check
+	parameters first in C#.
+
+Mon May 20 17:36:36 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c, reflection.h: added icall to get info about an event.
+
+2002-05-20  Radek Doulik  <rodo@ximian.com>
+
+	* object.c (mono_value_box): don't use memcpy for boxing on BIG
+	endian
+	(mono_value_box): don't use memcpy for small sizes on
+	architectures with unaligned access
+
+2002-05-20  Martin Baulig  <martin@gnome.org>
+
+	* reflection.c (mono_reflection_setup_internal_class): Don't crash
+	if `tb->parent == NULL'.
+	(mono_reflection_create_internal_class): New function.  This is
+	called from TypeBuilder.CreateType() and sets `klass->enum_basetype'
+	for enum types.
+
+	* icall.c ("System.Reflection.Emit.TypeBuilder::create_internal_class"):
+	New interncall.
+
+2002-05-19  Martin Baulig  <martin@gnome.org>
+
+	* unicode.c (ves_icall_iconv_get_bytes): Actually use the `charCount'
+	argument to get the length, don't default to the array length.
+
+2002-05-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* assembly.c (mono_assembly_setrootdir): New function used to
+	override the MONO_ASSEMBLIES directory.
+
+Fri May 17 20:39:53 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: ValueType_GetHashCode() initialize local var.
+
+Thu May 16 17:20:22 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: sort custom attributes table.
+
+Thu May 16 16:08:01 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: support named args in custom attributes (write support).
+
+Thu May 16 13:04:59 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: fix finally position calculation.
+
+2002-05-15  Radek Doulik  <rodo@ximian.com>
+
+	* reflection.c: fixed endianess at many places
+
+	* icall.c (ves_icall_InitializeArray): comment out debug msg
+
+2002-05-15  Dietmar Maurer  <dietmar@ximian.com>
+
+	* object.c (mono_unhandled_exception): new function to handle
+	unhandled exceptions.
+	(mono_unhandled_exception): call the UnhandledException event.
+	(mono_runtime_delegate_invoke): impl.
+
+Wed May 15 15:59:55 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* metadata.h, metadata.c, class.c: mono_metadata_field_info ()
+	returns the RVA, not the direct pointer to the data. Handle the case
+	when the class size is fixed.
+
+Tue May 14 16:59:44 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: fix some endianess issues.
+
+2002-05-14  Dietmar Maurer  <dietmar@ximian.com>
+
+	* object.c (mono_runtime_invoke): is now able to catch exceptions.
+
+	* threads.c (mono_thread_init): added a callback which is invoked
+	at thread start.
+
+2002-05-14  Dan Lewis  <dihlewis@yahoo.co.uk>
+	
+	* icall.c: make GetHashCode return non-negative values.
+
+2002-05-14  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* object.c, icall.c, gc.c: revert to address-based hashcode.
+
+2002-05-13  Miguel de Icaza  <miguel@ximian.com>
+
+	* icall.c (mono_double_ParseImpl): Added ParseImpl method.
+
+Mon May 13 16:40:30 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c, class.c: special case <Module>.
+
+2002-05-13  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* icall.c: fix bug in GetNow().
+
+2002-05-11  Dietmar Maurer  <dietmar@ximian.com>
+
+	* object.c (mono_runtime_class_init): make sure that we call all
+	static class constructors.
+
+Fri May 10 18:14:51 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: sort methodsemantics table.
+
+Fri May 10 16:31:49 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.h, reflection.c: honour init locals setting.
+
+Thu May 9 18:50:00 EDT 2002 Daniel Morgan <danmorg@sc.rr.com>
+
+	* icall.c: copied Double ToStringImpl for Single ToStringImpl
+
+Wed May 8 12:28:28 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: support ContructorBuilders in attribute blob creation.
+
+Wed May 8 12:06:14 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: some changes to build a binary that can be run
+	directly in windows.
+
+Mon May 6 13:10:34 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* loader.c: print a big message when an icall can't be found.
+
+2002-05-06  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* string-icalls.c: fix bug 24248.
+
+Sat May 4 14:03:21 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.c, appdomain.h, assembly.c, assembly.h, image.h,
+	icall.c, reflection.h: separate assembly loading by pathname and by
+	assembly name. Use the MONO_PATH env var to search for assemblies.
+
+Thu May 2 17:56:52 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* assembly.c, image.h: add some support for assemblies
+	with multiple modules.
+	* class.c, class.h: export mono_class_from_typeref().
+	* loader.c: remove duplicated code and use mono_class_from_typeref(),
+	instead.
+
+Thu May 2 15:51:11 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* unicode.c: Char.IsNumber doesn't include hex digits as the ms
+	documentation says (the ECMA one is correct).
+
+2002-05-02  Dick Porter  <dick@ximian.com>
+
+	* threads.c: Use GC_debug_register_finalizer with GC_debug_malloc.
+	Don't name the synchronisation mutex.
+
+2002-04-30  Jeffrey Stedfast  <fejj@ximian.com>
+
+	* rand.c
+	(ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetBytes):
+	Make the prototypes match.
+	(ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroBytes):
+	Same.
+
+	* icall.c
+	(ves_icall_System_CurrentTimeZone_GetTimeZoneData): Fixed for
+	systems that use 'timezone' rather than tm.tm_gmtoff. Also, not
+	all systems have tm.tm_zone, so use strftime() with %Z to print
+	the timezone abreviation into a temp string.
+
+	* object.c (mono_ldstr): Fixed to use mono_string_chars() macro
+	rather than mono_array_addr() on a MonoString on Big Endian
+	machines.
+
+2002-04-30  Dietmar Maurer  <dietmar@ximian.com>
+
+	* string-icalls.c (ves_icall_System_String_InternalReplace_Str):
+	fix bug 24041
+
+2002-04-30  Dick Porter  <dick@ximian.com>
+
+	* socket-io.c: Cope with SOCKET being an integer rather than a
+	pointer now.
+
+	* threads.c: Added Thread_free_internal, to deal with thread
+	handle cleanup.  Moved calls to handle_store() and handle_remove()
+	to start_wrapper(), so each can only be called once.  Allocate
+	synchronisation blocks with GC_malloc(), and use GC finalisation
+	to close the handles.
+
+	* icall.c: added System.Threading.Thread::Thread_free_internal
+
+Mon Apr 29 15:33:27 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: support Environment.Exit, CommandLineArgs().
+
+Mon Apr 29 15:15:57 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.c, object.h: added mono_runtime_run_main () and
+	mono_runtime_get_main_args () for use in System.Environment.
+
+Mon Apr 29 13:45:11 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* gc.c: fix thinko, enable actual finalization since the jit is now
+	fixed.
+
+Mon Apr 29 12:47:36 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* gc.c, object.c: take into account that an object may be offset wrt the address
+	returned by GC_malloc().
+
+Mon Apr 29 12:14:39 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* image.c: handle files without entries in the assembly table (modules).
+
+2002-04-28 Patrik Torstensson <patrik.torstensson@intel.com>
+
+	* reflection.c (mono_reflection_setup_internal_class): remove g_assert_not_reached() to allow 
+	mcs selfhosting	again (build breaker) and did move the check to class instead. parent is
+	allowed to be null when it's System.Object class setup.
+
+2002-04-27  Martin Baulig  <martin@gnome.org>
+
+	* reflection.c (mono_reflection_setup_internal_class): g_assert_not_reached()
+	if `tb->parent == NULL' rather than crashing.
+
+2002-04-28  Nick Drochak  <ndrochak@gol.com>
+
+	* sysmath.c (ves_icall_System_Math_Asin): Fix copy-paste error.  Was
+	calling acos() where asin() should have been called.
+
+2002-04-26  Martin Baulig  <martin@gnome.org>
+
+	* assembly.c (default_assembly_name_resolver): Use G_FILE_TEST_IS_REGULAR
+	instead of G_FILE_TEST_EXISTS - if you're in mcs/class/corlib/System/Test,
+	there's a subdirectory called `System', but we don't want to read that
+	subdirectory as an assembly.
+
+2002-04-25  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c: Reflect latest MonoString changes.
+
+Thu Apr 25 16:38:01 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* rand.c, rand.h: instance method icalls need to have an explicit
+	this pointer as first argument in the C implementation.
+
+2002-04-25  Nick Drochak <ndrochak@gol.com>
+
+	* icall.c: Fix typo in map for GetNonZeroBytes
+
+2002-04-24	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* string-icalls.c : String does now passes unit tests without any 
+	errors, the following changes has been made:
+	
+	Implemented replace methods.
+	Renaming of methods to (try) follow the standard.
+	Fixed compare ordinal
+	Made all memory allocated directly to function instead of via icall function.
+	Small performance fix in is_in_array function
+			
+ (2002-04-23) Changes from Duncan Mak <duncan@ximian.com>
+
+	c (mono_string_Internal_ctor_charp_int_int):
+	(mono_string_Internal_ctor_sbytep_int_int):  Removed check for
+	sindex < 0, throw ArgumentOutOfRangeException instead of
+	ArgumentNullException.
+
+	Added new check for length == 0, however
+	I need to make it return String.Empty from the C code.
+	
+	(mono_string_Internal_ctor_sbytep): Use mono_string_new, and let
+	that calculate the length for us here.
+	
+	(mono_string_Internal_ctor_sbytep_int_int): Replaced
+	mono_string_new_utf16 with mono_string_new, since value is utf8.
+
+Wed Apr 24 18:43:29 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.c: register the object for finalization if needed.
+	Allocate one more char in the string for the terminating 0 char.
+
+Wed Apr 24 18:22:27 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c, class.h, image.c: check if a type implemenst a destructor.
+	Use the proper key for array class lookups.
+	* icall.c: register the icalls in the System.GC class.
+	* gc.c, gc.h: GC-related functions and icalls.
+
+2002-04-24  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* icall.c:
+	* socket-io.c:
+	* unicode.c: free some strings gotten from mono_string_to_utf8 and
+	changed a couple of free () by g_free ().
+
+	* decimal.c: one-liner in the comments for decimal2string ().
+
+2002-04-24	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* object.c (mono_runtime_invoke_array) : Bug because of my incompetence.
+
+2002-04-24	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* reflection.c (mono_reflection_get_custom_attrs) : fixed image bug (crash)
+	* object.c (mono_runtime_invoke_array) : handle null in params
+
+2002-04-23	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* string-icalls.c: fixed bug in split (one off bug)
+
+2002-04-23	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* string-icalls.c: fixed bug in remove and lastindexofany, add equals icall.
+	* icalls.c: added String::Equals as internal method
+
+2002-04-23	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* threads.c: fixed bug in the double interlocked functions
+
+2002-04-22	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* threads.c: implemented all of the new interlocked icalls.
+	* string-icalls.c: fix a bug in insert.
+	* icalls.c: added the icalls for interlocked, removed old string functions.
+	
+Mon Apr 22 19:44:16 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* loader.c: fix off-by-one error when reading argument names.
+
+Mon Apr 22 19:28:14 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* profiler.c: win32 counter implementation (untested).
+	* icall.cs: win32 GetNow() and GetTimeZoneData() implementations
+	(the latter needs testing and more complete impl. from win32 folks).
+
+2002-04-21  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* object.c: mono_array_new_full workaround mono_array_class_get
+	problem.
+
+2002-04-17	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* string-icalls.c (mono_string_InternalRemove): Fixed overwrite bug.
+	* object.h (mono_string_chars): Changed casting type.
+
+2002-04-17	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* string-icalls.c: Fixed trim method, added the constructors done by Duncan, fixed
+			   method signatures to use gunichar2 instead of gint16.
+
+2002-04-20  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* object.h, object.c: domain-specific versions of mono_object_new and
+	mono_array_new.
+
+2002-04-20  Dietmar Maurer  <dietmar@ximian.com>
+
+	* object.c: changed String layout
+
+	* string-icalls.c (mono_string_Internal_ctor_chara): added
+	internal string constructors.
+
+Sat Apr 20 13:33:07 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* threads.c: pass 'this' to the thread start routine.
+
+2002-04-20  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* string-icalls.c: fix IndexOf and LastIndexOf. Now
+	InternalCompareStr don't call twice mono_string_cmp_char for the last
+	character. Improved performance in mono_string_cmp_char.
+
+Fri Apr 19 19:26:28 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* Makefile.am, appdomain.c, class.c, object.c: split runtime-depended
+	code into its own library: libmonoruntime.
+
+2002-04-19  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* object.h, object.c: changed array format so that szarrays do not
+	require a bounds structure.
+	* icall.c, appdomain.c: support for new szarray format.
+
+Fri Apr 19 18:04:34 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* metadata.c: compare also the retuns type when comparing signatures:
+	we didn't do this as an optimization since really overloaded methods
+	must differ also in the arguments, but this doesn't work with
+	low-level IL code (or when using explicit conversion operators: see
+	bug#23498 for an example).
+
+Fri Apr 19 16:14:52 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* loader.c: SZARRAY types can be saved as TYPESPEC, too.
+
+Thu Apr 18 17:15:09 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: make MonoType::GetElementType its own icall.
+
+Thu Apr 18 16:41:30 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: remove MonoMethod_get_Name().
+	* reflection.c, reflection.h, verify: cache the method name in the MonoMethod
+	object.
+
+2002-04-17	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* string-icalls.c: optimized a few methods.
+
+2002-04-17	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* icall.c: added all new string internal calls
+	* string-icalls.c: added, new string internal call implementation.
+	* object.c: added mono_string_new_size for allocating a string a size
+
+2002-04-17  Dietmar Maurer  <dietmar@ximian.com>
+
+	* object.c (mono_object_isinst): use the same code as in the
+	optimized x86 version.
+
+Wed Apr 17 14:14:36 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* profiler.c: TSC-based timer code (faster and more accurate).
+	Not hooked up in configure, yet (set USE_X86TSC to 1).
+
+Wed Apr 17 12:33:10 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* profiler.c, profiler.h: track time spent compiling methods.
+	* threads.c: track thread creation/destruction.
+
+Tue Apr 16 20:08:43 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* profiler.c, profiler.h, profiler-private.h: profiling interface
+	and sample implementation. Moved here so that it can be used also by
+	the jit.
+
+Tue Apr 16 12:58:12 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c, reflection.h: keep types and other handles separate in
+	the hash tables for referred tokens. Add guid for modules.
+
+Mon Apr 15 11:37:33 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* assembly.c: fix bugs found with valgrind.
+	* metadata.h, metadata.c: added mono_metadata_guid_heap().
+
+2002-04-14	Patrik Torstensson <patrik.torstensson@labs2.com>
+
+	* threads: added icall support for getting current domain for
+	           the thread.
+ 
+2002-04-13  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.h (MonoDebugLocalInfo): Renamed to MonoDebugVarInfo.
+	(MonoDebugVarInfo): Added `index' field for register based addresses.
+	(MONO_DEBUG_SYMBOL_FILE_VERSION): Increased to 9.
+	(MonoDebugMethodInfo): Replaced `guint32 *param_offsets' with
+	`MonoDebugVarInfo *params' and `guint32 this_offset' with
+	`MonoDebugVarInfo *this_var'.
+
+	* debug-symfile.c (relocate_variable): New static function to write
+	a location description for a local variable or method parameter.
+
+2002-04-12  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.h (MonoDebugLocalInfo): New type. This contains the
+	stack offset and begin/end scope address of a local variable.
+	(MonoDebugMethodInfo): Replaced `guint32 *local_offsets' with
+	'MonoDebugLocalInfo *locals', added `prologue_end' and `epilogue_begin'.
+	(MONO_DEBUG_SYMBOL_FILE_VERSION): Increased to 8.
+
+	* debug-symfile.c (MRT_variable_start_scope, MRT_variable_end_scope):
+	Added new relocation types for start/end scope of a local variable.
+
+Fri Apr 12 18:30:29 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.h: add mono_object_domain() macro.
+	* reflection.c: handle typespecs.
+	* icall.c: MonoMethod::get_Name() implementation.
+
+Thu Apr 11 12:29Ni:14 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: String::GetHashCode() icall implementation.
+
+Wed Apr 10 21:16:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: String::IndexOfAny icall.
+	* object.c, object.h: make array->max_length more useful.
+	Intrduced mono_object_class() and mono_string_length() macros.
+
+2002-04-10  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* unicode.c (ves_icall_System_Char_IsNumber): use g_unichar_isxdigit
+	instead of g_unichar_isdigit.
+
+2002-04-11  Nick Drochak  <ndrochak@gol.com>
+
+	* icall.c: Implement a simple Double.ToString().
+
+Tue Apr 9 21:31:16 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.h: only io-layer.h is supposed to be included.
+	* icall.c: explicitly import environ. Fix warning.
+
+2002-04-10  Nick Drochak  <ndrochak@gol.com>
+
+	* icall.c (ves_icall_System_CurrentTimeZone_GetTimeZoneData) :
+		return true even if it's not Daylight Savings time.
+		Only return false for the case where the function isn't
+		implemented for a plaform (read Windows).
+
+Tue Apr 9 13:05:56 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.h, appdomain.c, class.c, object.c: protect MonoDomain
+	data with a mutex.
+
+2002-04-09  Dietmar Maurer  <dietmar@ximian.com>
+
+	* mempool.c (mono_mempool_alloc): only use g_malloc when
+	absolutely necessary.
+
+2002-04-08  Dietmar Maurer  <dietmar@ximian.com>
+
+	* mempool.c (MEM_ALIGN): hardcode MEM_ALIGN to 8
+
+	* class.c (mono_class_vtable): use domain mempool to allocate vtable
+	(mono_class_proxy_vtable): use domain mempool
+
+Mon Apr 8 17:17:04 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.h, appdomain.c: split initialization that requires the
+	execution engine support into mono_runtime_init().
+
+2002-04-08  Dietmar Maurer  <dietmar@ximian.com>
+
+	* class.c (mono_class_init): don't include vtable inside MonoClass
+	to save some memory, gather some statistics.
+	(mono_class_vtable): use g_malloc instead of GC_malloc when possible
+
+Sat Apr 6 20:07:48 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: internalcall implementation for ValueType.Equals().
+
+2002-04-06  Dietmar Maurer  <dietmar@ximian.com>
+
+	* object.c (mono_message_init): moved 
+	(mono_runtime_exec_main): new arch. independent impl.
+	(mono_runtime_invoke_array): new method - like
+	mono_runtime_invoke, but you can pass an array of objects.
+	(mono_remoting_invoke): new arch. independent impl.
+	(mono_message_invoke): new arch. independent impl.
+	(mono_runtime_class_init): new arch. independent impl.
+	(mono_runtime_object_init): new arch. independent impl.
+
+Fri Apr 5 18:29:14 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* metadata.c, object.c, reflection.c: documented the exported
+	functions.
+
+Fri Apr 5 15:42:31 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: simpler code to pass the assembly builder data to corlib.
+	Implement GetNestedTypes() internalcall.
+
+Thu Apr 4 21:46:48 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: warn if a type can't be loaded.
+
+2002-04-04  Dietmar Maurer  <dietmar@ximian.com>
+
+	* image.h: typedef MonoImageOpenStatus
+	* types.h: removed unused file
+	
+2002-04-04  Dan Lewis  <dihlewis@yahoo.co.uk>
+
+	* icall.c: Enum_ToObject accepts enum value arguments.
+
+Thu Apr 4 11:35:37 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: move initialization of properties, events and nested
+	classes, so that they happen for interfaces, too.
+
+Wed Apr 3 20:03:32 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: cleanup some ugly casts in Array_SetValue*.
+
+Wed Apr 3 19:49:53 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: the values array fro enums is of the correct type, now.
+	Implement (correctly) getFullName instead of assQualifiedName for
+	MonoType.
+	* reflection.h, reflection.c: added mono_type_get_name ().
+
+Wed Apr 3 17:56:22 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* assembly.c, image.h: for each MonoImage, record from wich assembly
+	it was loaded.
+	* reflection.h, icall.c: added System_Reflection_Assembly_GetTypes().
+	Make Type.Assembly work.
+
+2002-04-03  Dietmar Maurer  <dietmar@ximian.com>
+
+	* debug-symfile.h: use char* instead of gpointer to avoid
+	unnecessary casts.
+
+	* appdomain.c (mono_jit_info_table_find): use char* instead of gpointer
+
+	* icall.c (ves_icall_InternalExecute): impl. FielSetter
+	(ves_icall_System_Array_SetValueImpl): removed strange MonoArray cast
+
+2002-03-30  Dietmar Maurer  <dietmar@ximian.com>
+
+	* icall.c (mono_message_init): impl. (code cleanup)
+	(ves_icall_InternalExecute): impl. FieldGetter
+
+	* class.c (mono_class_init): added exerimental EXT_VTABLE_HACK, if
+	defined we call all (non-static)methods through the vtable. 
+
+Fri Mar 29 18:09:08 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: it seems GC_debug_malloc() makes the Boehm GC call the
+	finalizer even though the memory is still referenced (and the chunk of
+	memory is not freed).
+
+Fri Mar 29 17:43:04 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* assembly.c: fix brokeness.
+
+Fri Mar 29 16:09:54 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: kill some warnings. Check explicit interface method
+	implementation also without considering the namespace.
+	Load also literal strings in static class data.
+
+2002-03-29  Miguel de Icaza  <miguel@ximian.com>
+
+	* assembly.c (default_assembly_name_resolver): Kill memory leak. 
+	(default_assembly_name_resolver): Make the resolver take the
+	"base" directory where the assembly was originally defined, so we
+	can load DLLs that are in the same directory as the assembly that
+	is being referenced.
+
+2002-03-28  Dick Porter  <dick@ximian.com>
+
+	* file-io.h: 
+	* file-io.c:
+	* socket-io.c: 
+	* unicode.h: 
+	* unicode.c: Warning cleanups
+
+Thu Mar 28 18:06:14 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.h, reflection.h: use the correct type instead of MonoObject.
+
+2002-03-28  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c (mono_debug_class_get): Don't look in referenced assemblies.
+	(mono_debug_update_symbol_file): Initialize classes if necessary.
+
+Thu Mar 28 15:58:43 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* assembly.c, debug-helpers.c, image.c, image.h, metadata.c, pedump.c,
+	rawbuffer.c, reflection.c, verify.c: mare warning cleanups.
+
+Thu Mar 28 15:20:39 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* assembly.h: fix function prototype.
+	* metadata.h, metadata.c, object.h, private.h: get rid of warnings.
+	* mono-endian.h: use const cast.
+
+2002-03-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* icall.c (ves_icall_MonoMethodMessage_InitMessage): moved from message.c
+
+Thu Mar 28 12:32:00 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* loader.c: don't assert when a typeref can't be loaded, give
+	a chance to the runtime to trow an exception instead.
+	* loader.h: fix warning.
+
+2002-03-28  Dietmar Maurer  <dietmar@ximian.com>
+
+	* class.c (mono_class_proxy_vtable): added proxy support
+
+2002-03-27  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* icall.c: removed last of PAL calls, added System.Environment
+	* file-io.h, file-io.c: MonoIO implementation
+	* object.h, object.c: mono_string_to_utf16() now returns gunichar2*
+
+Tue Mar 26 19:56:10 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.c: do not use the byte marker in ldstr table lookup.
+	* debug-helpers.c: allow two ':' to separate class and method name.
+	* object.c: allocate arrays bounds with the GC, too.
+	* verify: add a few more checks.
+
+Tue Mar 26 18:45:46 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: output also literal strings. Allocate parameter data
+	with GC_malloc() (thanks, Martin, for catching this!).
+
+2002-03-26  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.h (MonoDebugMethodInfo): Added `this_offset', don't
+	include the `this' offset in the `param_offsets'.
+
+2002-03-25  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c (mono_debug_update_symbol_file): Use a new
+	mono_debug_get_class() function to get the classes. Added new
+	relocation types for arrays and strings.
+	(mono_debug_get_class): New static function to search in all
+	referenced assemblies for a metadata token.
+
+	* debug-symfile.h (MONO_DEBUG_SYMBOL_FILE_VERSION): Increased to 7.
+
+Mon Mar 25 13:08:18 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.h, reflection.c: use a gc-safe hash for hash tables that
+	hold gc-allocated objects. Make the string heap a stream like the
+	others. Removed duplicated code when writing stream info.
+	Added asserts to catch possible buffer overflows. Set the sorted map
+	for tables that need sorting. Added some documentation.
+
+Mon Mar 25 13:04:56 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.h, appdomain.c, class.c, object.c: use a GC-safe hash table 
+	for interned strings and vtables.
+
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* icall.c (ves_icall_Type_GetFields): Reverse the list before storing
+	it in the array since it was created with g_slist_prepend().
+
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c (mono_debug_local_type_from_signature): Renamed
+	to ves_icall_Debugger_MonoSymbolWriter_get_local_type_from_sig().
+	(mono_debug_method_from_token): Renamed to
+	ves_icall_Debugger_MonoSymbolWriter_method_from_token().
+	(ves_icall_Debugger_DwarfFileWriter_get_type_token): New interncall.
+
+	* debug-symfile.c (MRT_type_sizeof, MRT_type_field_offset): New
+	relocation types.
+
+	* debug-symfile.h (MONO_DEBUG_SYMBOL_FILE_VERSION): Increased to 6.
+
+2002-03-24  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.c (mono_debug_local_type_from_signature): New func.
+	(mono_debug_method_from_token): New func.
+
+	* icall.c (Mono.CSharp.Debugger.MonoSymbolWriter::get_local_type_from_sig):
+	New interncall, calls mono_debug_local_type_from_signature().
+	(Mono.CSharp.Debugger.MonoSymbolWriter::get_method): New interncall,
+	calls mono_debug_method_from_token().
+
+2002-03-23  Martin Baulig  <martin@gnome.org>
+
+	* unicode.c (ves_icall_iconv_get_char_count): The `count' argument
+	specifies the number of bytes to be converted, not the array size.
+	Return the number of chars, not the number of bytes.
+	(ves_icall_iconv_get_chars): The `byteCount' argument
+	specifies the number of bytes to be converted, not the array size.
+
+2002-03-23  Martin Baulig  <martin@gnome.org>
+
+	* reflection.h (MonoReflectionSigHelper): New type.
+
+	* reflection.c (mono_reflection_sighelper_get_signature_local),
+	(mono_reflection_sighelper_get_signature_local): New functions.
+
+	* icall.c (System.Reflection.Emit.SignatureHelper::get_signature_local),
+	(System.Reflection.Emit.SignatureHelper::get_signature_field): New
+	interncalls.
+
+2002-03-23  Martin Baulig  <martin@gnome.org>
+
+	* rawbuffer.c (mono_raw_buffer_load_mmap): Use MAP_SHARED when
+	is_writeable is set.
+	(mono_raw_buffer_update): New function to write the modified map
+	back to disk.
+
+	* debug-symfile.h (MonoDebugSymbolFile): Added `raw_contents_size'.
+
+	* debug-symfile.c (mono_debug_update_symbol_file): Call
+	mono_raw_buffer_update() when done writing.
+
+2002-03-23  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.h (MONO_DEBUG_SYMBOL_FILE_VERSION): Increased to 5.
+
+	* debug-symfile.c: Added support for arguments and local variables.
+
+2002-03-23  Dick Porter  <dick@ximian.com>
+
+	* debug-symfile.c: Remove extraneous 'include <elf.h>' that wasn't
+	protected by ifdefs, hence breaking the w32 build.
+
+Thu Mar 21 17:35:01 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* object.c: implement is_interned() the right way.
+
+2002-03-21  Martin Baulig  <martin@gnome.org>
+
+	* debug-symfile.[ch]: New files to handle debugging information
+	files. There's also support to dynamically update these symbol
+	files to include machine dependent information.
+
+2002-03-20  Dietmar Maurer  <dietmar@ximian.com>
+
+	* threads.c (mono_thread_create): new function to create thread
+	from C
+
+2002-03-20  Martin Baulig  <martin@gnome.org>
+
+	* icall.c (ves_icall_InternalInvoke): Create a new object if the
+	method is a constructor.
+	(icall_map): Added "System.Reflection.MonoCMethod::InternalInvoke",
+	points to ves_icall_InternalInvoke().
+
+2002-03-20  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* file-io.c: Flush shouldn't throw exceptions.
+
+2002-03-19  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* file-io.c: FileStream flush support; FileSetLength now
+	restores file pointer.
+
+Tue Mar 19 18:17:21 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: set image for pointer classes.
+
+2002/03/19  Nick Drochak <ndrochak@gol.com>
+
+	* sysmath.c: Forgot one.
+
+2002-03-18  Miguel de Icaza  <miguel@ximian.com>
+
+	* sysmath.c: Avoid redefining existing names.
+
+2002-03-18  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* sysmath.c, sysmath.h, icall.c, Makefile.am: math routines now
+	handled by runtime as icall rather than dllimport from libm.so
+	* file-io.c, file-io.h: fixed handle argument type.
+
+2002-03-18  Dick Porter  <dick@ximian.com>
+
+	* reflection.c (mono_image_get_type_info): rename interface to
+	iface, because of "#define interface struct" on windows.
+
+Sat Mar 16 19:18:38 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c, class.h: rename and export mono_ptr_class_get().
+	* metadata.c: support MONO_TYPE_ARRAY in MonoType compare.
+	* reflection.c, reflection.h, icall.c: better/saner type name
+	parsing and MonoType creation. Handle MONO_TYPE_ARRAY in
+	method signatures.
+
+2002-03-14  Dietmar Maurer  <dietmar@ximian.com>
+
+	* class.c (mono_class_init): removed hardcoded GHC_SLOT
+
+	* icall.c (ves_icall_InternalInvoke): impl.
+
+Wed Mar 13 00:27:30 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: output the interface map table, too.
+
+2002-03-12  Dietmar Maurer  <dietmar@ximian.com>
+
+	* class.c (class_compute_field_layout): separate computation of 
+	static field layout
+
+2002-03-12  Dan Lewis <dihlewis@yahoo.co.uk>
+
+	* icall.c: added System.Buffer support.
+	* file-io.c: moved file icalls from PAL to FileStream.
+
+2002-03-12  Dietmar Maurer  <dietmar@ximian.com>
+
+	* icall.c (ves_icall_System_Object_GetHashCode): impl.
+
+2002-03-11  Dietmar Maurer  <dietmar@ximian.com>
+
+	* icall.c (ves_icall_System_ValueType_GetHashCode): impl.
+
+Mon Mar 11 14:45:42 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* verify.c, verify.h: moved here the corlib/runtime consistency checks.
+
+Mon Mar 11 11:12:23 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* debug-helpers.{c,h}: moved here from monograph some useful functions
+	to locate a method by name/signature in a class or image. Included
+	also a small and flexible IL disassembler.
+
+Fri Mar 8 16:29:29 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.c: fixup tokens in methods with small header size, too.
+
+2002-03-08  Dietmar Maurer  <dietmar@ximian.com>
+
+	* object.c (mono_string_to_utf8): remove assert(!error), instead
+	print a warning. 
+
+Thu Mar 7 18:55:15 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: update to the new mono_Array_class_get interface.
+
+Thu Mar 7 17:23:26 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* appdomain.c, object.c: Boehm-GC enable.
+	* icall.c: make get_data_chunk() support split data requests.
+	Ensure a class is initialized in more cases. Return only the first
+	property found in GetProperties() or the compiler gets confused. 
+	Implemented GetEvents(). Temporary fix to GetType(), needs rewriting.
+	* reflection.h, reflection.c: add fixup mechanism for field and method
+	tokens. Initialize assembly->typeref in a single place. Output
+	properties after events. Support custom attributes for events, too.
+	Typo fix for paramter custom attrs.
+
+2002-03-07  Martin Baulig  <martin@gnome.org>
+
+	* icall.c (ves_icall_System_Array_FastCopy): Small fix.
+
+2002-03-07  Dietmar Maurer  <dietmar@ximian.com>
+
+	* class.c (mono_array_class_get): fix. for multi. dim. arrays
+
+2002-03-06  Martin Baulig  <martin@gnome.org>
+
+	* icall.c (ves_icall_System_Array_CreateInstanceImpl): Make this work with
+	non-zero lower bounds. See testcases #F10-#F13.
+
+2002-03-05  Martin Baulig  <martin@gnome.org>
+
+	* exception.c (mono_get_exception_argument_out_of_range): New exception.
+
+	* icall.c (ves_icall_System_Array_GetValue): Moved actual implementation to
+	ves_icall_System_Array_GetValue(), only calculate the absolute array position
+	here.
+	(ves_icall_System_Array_SetValue): Likewise.
+	(ves_icall_System_Array_GetValueImpl): New interncall. Takes an array position
+	as argument and does the actual work. This function is used when copying a
+	multi-dimensional array.
+	(ves_icall_System_Array_SetValueImpl): Almost completely rewrote this. It can
+	now do all the widening conversions of value types.
+	(ves_icall_System_Array_CreateInstanceImpl): Implemented.
+
+Tue Mar 5 18:14:01 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: remove some magic numbers and use the smbolic names,
+	instead. Added init_events() to load event info at class init time.
+	* metadata.h, metadata.c: added mono_metadata_events_from_typedef()
+	and mono_metadata_methods_from_event().
+	* reflection.h, reflection.c: added support for writing out the evnets
+	related information.
+
+Mon Mar 4 20:32:43 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* reflection.h, icall.c: use a different method (GetInterfaces)
+	to gather interface info and add isbyref, isprimitive and
+	ispointer to the ves_icall_get_type_info() return value.
+
+Mon Mar 4 11:22:26 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.h: stared adding support for events.
+	* icall.c: split find_members implementation. Added debug icall to get
+	the address of an object.
+	* reflection.c: handle TypeBuilders in mono_type_get_object().
+
+2002-03-01  Martin Baulig  <martin@gnome.org>
+
+	* icall.c (ves_icall_System_Array_GetLength): This must throw an
+	ArgumentOutOfRangeException(), not an ArgumentException().
+	(ves_icall_System_Array_GetLowerBound): Likewise.
+	(ves_icall_System_Array_GetValue): Improved argument checking.
+	(ves_icall_System_Array_SetValue): Improved argument checking.
+
+2002-03-01  Martin Baulig  <martin@gnome.org>
+
+	* icall.c (ves_icall_System_Array_GetValue): Raise an exception when
+	called with invalid arguments rather than just dying with g_assert().
+	(ves_icall_System_Array_SetValue): Likewise.
+	(ves_icall_System_Array_CreateInstanceImpl): Don't g_assert_not_reached(),
+	raise a NotImplementedException instead.
+	(ves_icall_System_Array_GetLength): Added argument checking.
+	(ves_icall_System_Array_GetLowerBound): Added argument checking.
+
+2002-03-01  Dietmar Maurer  <dietmar@ximian.com>
+
+	* object.h (mono_assert): new macros mono_assert and
+	mono_assert_not_reached
+
+2002-02-28  Martin Baulig  <martin@gnome.org>
+
+	* icall.c: Rename "System::String::Intern" to "System::String::_Intern"
+	and "System::String::IsInterned" to "System::String::_IsInterned".
+
+Thu Feb 28 19:19:35 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: remove hacks for typebuilder. Added icall to create a
+	modified type from a tybebuilder.
+	* reflection.c: removed hacks for TypeBuilder. Create also a MonoImage
+	in mono_image_basic_init (). Added mono_reflection_setup_internal_class ()
+	to create a backing MonoClass for a TypeBuilder.
+
+Thu Feb 28 15:35:51 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c, class.h: more refactoring of class init.
+	Export mono_class_setup_mono_type() and mono_class_setup_parent().
+
+Thu Feb 28 12:33:41 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* marshal.c, marshal.h: start of marshaling interface.
+
+Wed Feb 27 22:15:17 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* icall.c: fix order in assembly qualified name icall.
+
+Wed Feb 27 18:45:03 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* class.c: do not free str, since we store it in the hash table.
+	* reflection.h: add label field to MonoILExceptionInfo.
+	* reflection.c: handle references to more than one assembly. Handle
+	case when there isn't a module created in the assembly.
 
 Wed Feb 27 12:35:10 CET 2002 Paolo Molaro <lupus@ximian.com>
 
diff --git a/mono/metadata/Makefile.am b/mono/metadata/Makefile.am
index d321263b8cf..cafdc68dcbf 100644
--- a/mono/metadata/Makefile.am
+++ b/mono/metadata/Makefile.am
@@ -1,34 +1,27 @@
 noinst_PROGRAMS = pedump
 
-lib_LIBRARIES = libmetadata.a
+noinst_LTLIBRARIES = libmetadata.la libmonoruntime.la
 
 #
 # Keep in sync with mono/runtime/Makefile.am
 #
 assembliesdir = $(libdir)
 
-INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -I$(top_srcdir)	\
-	-DMONO_ASSEMBLIES=\""$(assembliesdir)"\"		
+INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -I$(top_srcdir)	-I$(top_srcdir)/mono \
+	-DMONO_ASSEMBLIES=\""$(assembliesdir)"\" -DMONO_CFG_DIR=\""$(sysconfdir)"\"
 
-libmetadata_a_SOURCES = \
-	assembly.c	\
-	opcodes.c	\
-	image.c		\
-	metadata.c	\
-	verify.c	\
-	mono-endian.c	\
-	private.h	\
-	rawbuffer.c	\
+libmonoruntime_la_SOURCES = \
 	reflection.c	\
-	loader.c	\
-	class.c		\
 	object.c	\
 	icall.c		\
 	decimal.c	\
 	decimal.h	\
+	gc.c		\
+	gc.h		\
+	marshal.c	\
+	marshal.h	\
 	threads.c	\
-	threads.h	\
-	threads-types.h	\
+	threadpool.c	\
 	file-io.c	\
 	file-io.h	\
 	socket-io.c	\
@@ -37,14 +30,45 @@ libmetadata_a_SOURCES = \
 	exception.h	\
 	unicode.c	\
 	unicode.h	\
-	mempool.h	\
-	mempool.c	\
-	appdomain.h	\
 	appdomain.c	\
+	debug-symfile.h	\
+	debug-symfile.c	\
+	profiler.c	\
+	profiler-private.h	\
 	rand.h		\
-	rand.c
+	rand.c		\
+	string-icalls.c \
+	string-icalls.h \
+	sysmath.h	\
+	sysmath.c	\
+	process.c	\
+	process.h
+
+libmetadata_la_SOURCES = \
+	assembly.c	\
+	domain.c	\
+	opcodes.c	\
+	image.c		\
+	metadata.c	\
+	verify.c	\
+	mono-endian.c	\
+	mono-config.c	\
+	mono-config.h	\
+	private.h	\
+	rawbuffer.c	\
+	loader.c	\
+	class.c		\
+	mempool.c	\
+	debug-helpers.c
 
 libmetadataincludedir = $(includedir)/mono/metadata
+libmonoruntimeincludedir = $(includedir)/mono/metadata
+
+libmonoruntimeinclude_HEADERS = \
+	appdomain.h	\
+	threadpool.h	\
+	threads-types.h	\
+	threads.h
 
 libmetadatainclude_HEADERS = \
 	assembly.h	\
@@ -64,12 +88,15 @@ libmetadatainclude_HEADERS = \
 	class.h		\
 	object.h	\
 	exception.h	\
+	profiler.h	\
 	appdomain.h	\
+	debug-helpers.h	\
+	mempool.h	\
 	rand.h
 
 pedump_SOURCES =		\
-	pedump.c $(libmetadata_a_SOURCES)
+	pedump.c
 
-pedump_LDADD = $(GLIB_LIBS) $(GMODULE_LIBS) ../io-layer/libwapi.a
+pedump_LDADD = libmetadata.la ../io-layer/libwapi.la ../utils/libmonoutils.la $(GLIB_LIBS) $(GMODULE_LIBS) -lm
 
 
diff --git a/mono/metadata/TODO b/mono/metadata/TODO
index 98c3ce7b7d3..f37fd656388 100644
--- a/mono/metadata/TODO
+++ b/mono/metadata/TODO
@@ -1,15 +1,4 @@
 
-* mono_class_from_name
-
-	In many places we call mono_class_from_name with static values,
-	we should cache that instead:
-
-	static MonoClass *klass;
-
-	if (!klass){
-		klass = mono_class_from_name (...);
-	}
-
 * Uniform names
 
 	We have a mess of names in the icall.c file, we need to sort that out.
diff --git a/mono/metadata/appdomain.c b/mono/metadata/appdomain.c
index 968ec4c7fd6..a5aaf618ebe 100644
--- a/mono/metadata/appdomain.c
+++ b/mono/metadata/appdomain.c
@@ -11,231 +11,165 @@
 #include <glib.h>
 #include <string.h>
 
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
+
 #include <mono/metadata/object.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/assembly.h>
 #include <mono/metadata/exception.h>
-#include <mono/metadata/cil-coff.h>
-
-static guint32 appdomain_thread_id = 0;
-
-static int
-ldstr_hash (const char* str)
-{
-	guint len, h;
-	const char *end;
-	len = mono_metadata_decode_blob_size (str, &str);
-	end = str + len;
-	h = *str;
-	/*
-	 * FIXME: The distribution may not be so nice with lots of
-	 * null chars in the string.
-	 */
-	for (str += 1; str < end; str++)
-		h = (h << 5) - h + *str;
-	return h;
-}
-
-static gboolean
-ldstr_equal (const char *str1, const char *str2) {
-	int len, len2;
-	len = mono_metadata_decode_blob_size (str1, NULL);
-	len2 = mono_metadata_decode_blob_size (str2, NULL);
-	if (len != len2)
-		return 0;
-	return memcmp (str1, str2, len) == 0;
-}
-
-static MonoDomain *
-mono_create_domain ()
-{
-	MonoDomain *domain;
+#include <mono/metadata/threads.h>
+#include <mono/metadata/socket-io.h>
+#include <mono/metadata/tabledefs.h>
 
-	domain = g_new0 (MonoDomain, 1);
-	domain->domain = NULL;
-	domain->setup = NULL;
-	domain->friendly_name = NULL;
-
-	domain->mp = mono_mempool_new ();
-	domain->env = g_hash_table_new (g_str_hash, g_str_equal);
-	domain->assemblies = g_hash_table_new (g_str_hash, g_str_equal);
-	domain->class_vtable_hash = g_hash_table_new (NULL, NULL);
-	domain->jit_code_hash = g_hash_table_new (NULL, NULL);
-	domain->ldstr_table = g_hash_table_new ((GHashFunc)ldstr_hash, (GCompareFunc)ldstr_equal);
-
-	return domain;
-}
+HANDLE mono_delegate_semaphore = NULL;
+CRITICAL_SECTION mono_delegate_section;
+int mono_runtime_shutdown = 0;
 
-MonoDomain *mono_root_domain = NULL;
+static MonoObject *
+mono_domain_transfer_object (MonoDomain *src, MonoDomain *dst, MonoObject *obj);
 
-/**
- * mono_init:
- * 
- * Creates the initial application domain and initializes the mono_defaults
- * structure.
+/*
+ * mono_runtime_init:
+ * @domain: domain returned by mono_init ()
  *
- * Returns: the initial domain.
+ * Initialize the core AppDomain: this function will run also some
+ * IL initialization code, so it needs the execution engine to be fully 
+ * operational.
  */
-MonoDomain *
-mono_init (const char *filename)
+void
+mono_runtime_init (MonoDomain *domain, MonoThreadStartCB start_cb)
 {
-	static MonoDomain *domain = NULL;
 	MonoAppDomainSetup *setup;
 	MonoAppDomain *ad;
-	MonoAssembly *ass;
 	MonoClass *class;
-	MonoString *name;
-	enum MonoImageOpenStatus status = MONO_IMAGE_OK;
-
-	if (domain)
-		g_assert_not_reached ();
-
-	appdomain_thread_id = TlsAlloc ();
-
-	domain = mono_create_domain ();
-	mono_root_domain = domain;
-
-	TlsSetValue (appdomain_thread_id, domain);
-
-	/* find the corlib */
-	ass = mono_assembly_open (CORLIB_NAME, NULL, &status);
-	if ((status != MONO_IMAGE_OK) || (ass == NULL)) {
-		switch (status){
-		case MONO_IMAGE_ERROR_ERRNO:
-			g_print ("The assembly corlib.dll was not found or could not be loaded.\n");
-			g_print ("It should have been installed in the `%s' directory.\n", MONO_ASSEMBLIES);
-			break;
-
-		case MONO_IMAGE_IMAGE_INVALID:
-			g_print ("The file %s/corlib.dll is an invalid CIL image", MONO_ASSEMBLIES);
-			break;
-		}
-		
-		exit (1);
-	}
-	mono_defaults.corlib = ass->image;
-
-	mono_defaults.object_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Object");
-	g_assert (mono_defaults.object_class != 0);
-
-	mono_defaults.void_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Void");
-	g_assert (mono_defaults.void_class != 0);
-
-	mono_defaults.boolean_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Boolean");
-	g_assert (mono_defaults.boolean_class != 0);
-
-	mono_defaults.byte_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Byte");
-	g_assert (mono_defaults.byte_class != 0);
-
-	mono_defaults.sbyte_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "SByte");
-	g_assert (mono_defaults.sbyte_class != 0);
-
-	mono_defaults.int16_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Int16");
-	g_assert (mono_defaults.int16_class != 0);
-
-	mono_defaults.uint16_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "UInt16");
-	g_assert (mono_defaults.uint16_class != 0);
-
-	mono_defaults.int32_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Int32");
-	g_assert (mono_defaults.int32_class != 0);
-
-	mono_defaults.uint32_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "UInt32");
-	g_assert (mono_defaults.uint32_class != 0);
-
-	mono_defaults.uint_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "UIntPtr");
-	g_assert (mono_defaults.uint_class != 0);
-
-	mono_defaults.int_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "IntPtr");
-	g_assert (mono_defaults.int_class != 0);
-
-	mono_defaults.int64_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Int64");
-	g_assert (mono_defaults.int64_class != 0);
-
-	mono_defaults.uint64_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "UInt64");
-	g_assert (mono_defaults.uint64_class != 0);
+	
+	class = mono_class_from_name (mono_defaults.corlib, "System", "AppDomainSetup");
+	setup = (MonoAppDomainSetup *) mono_object_new (domain, class);
+	ves_icall_System_AppDomainSetup_InitAppDomainSetup (setup);
 
-	mono_defaults.single_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Single");
-	g_assert (mono_defaults.single_class != 0);
+	class = mono_class_from_name (mono_defaults.corlib, "System", "AppDomain");
+	ad = (MonoAppDomain *) mono_object_new (domain, class);
+	ad->data = domain;
+	domain->domain = ad;
+	domain->setup = setup;
 
-	mono_defaults.double_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Double");
-	g_assert (mono_defaults.double_class != 0);
+	mono_delegate_semaphore = CreateSemaphore (NULL, 0, 0x7fffffff, NULL);
+	g_assert (mono_delegate_semaphore != INVALID_HANDLE_VALUE);
+	InitializeCriticalSection (&mono_delegate_section);
+	
+	mono_thread_init (domain, start_cb);
 
-	mono_defaults.char_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Char");
-	g_assert (mono_defaults.char_class != 0);
+	mono_network_init ();
 
-	mono_defaults.string_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "String");
-	g_assert (mono_defaults.string_class != 0);
+	return;
+}
 
-	mono_defaults.enum_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Enum");
-	g_assert (mono_defaults.enum_class != 0);
+void
+mono_runtime_cleanup (MonoDomain *domain)
+{
+	mono_runtime_shutdown = 1;
 
-	mono_defaults.array_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Array");
-	g_assert (mono_defaults.array_class != 0);
+	/* signal all waiters in order to stop all workers (max. 0xffff) */
+	ReleaseSemaphore (mono_delegate_semaphore, 0xffff, NULL);
 
-	mono_defaults.delegate_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Delegate");
-	g_assert (mono_defaults.delegate_class != 0);
+	mono_thread_cleanup ();
 
-	mono_defaults.typehandle_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "RuntimeTypeHandle");
-	g_assert (mono_defaults.typehandle_class != 0);
+	/* Do this after the thread cleanup, because subthreads might
+	 * still be doing socket calls.
+	 */
+	mono_network_cleanup ();
+}
 
-	mono_defaults.methodhandle_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "RuntimeMethodHandle");
-	g_assert (mono_defaults.methodhandle_class != 0);
+void
+ves_icall_System_AppDomainSetup_InitAppDomainSetup (MonoAppDomainSetup *setup)
+{
+	/* FIXME: implement me */
+}
 
-	mono_defaults.fieldhandle_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "RuntimeFieldHandle");
-	g_assert (mono_defaults.fieldhandle_class != 0);
+/*
+ * invokes a method in a specific domain.
+ */
+static MonoObject*
+mono_runtime_invoke_in_domain (MonoDomain *domain, MonoMethod *method, void *obj, 
+			       void **params, MonoObject **exc)
+{
+	MonoDomain *cur = mono_domain_get ();
+	MonoObject **real_exc, *default_exc;
+	MonoObject *res;
 
-	mono_defaults.monotype_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "MonoType");
-	g_assert (mono_defaults.monotype_class != 0);
+	if (domain == cur)
+		return mono_runtime_invoke (method, obj, params, exc);
 
-	mono_defaults.exception_class = mono_class_from_name (
-                mono_defaults.corlib, "System", "Exception");
-	g_assert (mono_defaults.exception_class != 0);
+	if (!exc)
+		real_exc = &default_exc;
+	else
+		real_exc = exc;
 
+	*real_exc = NULL;
+	mono_domain_set (domain);
+	res = mono_runtime_invoke (method, obj, params, real_exc);
+	mono_domain_set (cur);
 
-	class = mono_class_from_name (mono_defaults.corlib, "System", "AppDomainSetup");
-	setup = (MonoAppDomainSetup *) mono_object_new (domain, class);
-	ves_icall_System_AppDomainSetup_InitAppDomainSetup (setup);
+	if (*real_exc) {
+		/* transfer Exception to the right domain */
+		*real_exc = mono_domain_transfer_object (domain, cur, *real_exc);
 
-	name = mono_string_new (domain, g_path_get_basename (filename));
+		if (!exc)
+			mono_raise_exception ((MonoException *)*real_exc);
 
-	class = mono_class_from_name (mono_defaults.corlib, "System", "AppDomain");
-	ad = (MonoAppDomain *) mono_object_new (domain, class);
-	ad->data = domain;
-	domain->domain = ad;
-	domain->setup = setup;
-	domain->friendly_name = name;
+	}
 
-	return domain;
+	return res;
 }
 
-void
-ves_icall_System_AppDomainSetup_InitAppDomainSetup (MonoAppDomainSetup *setup)
+static MonoObject *
+mono_domain_transfer_array (MonoDomain *src, MonoDomain *dst, MonoArray *ao)
 {
-	// fixme: implement me
+	MonoObject *res = NULL;
+	MonoClass *klass;
+	int esize, ecount, i;
+	guint32 *sizes;
+		
+	klass = ao->obj.vtable->klass;
+
+	esize = mono_array_element_size (klass);
+	if (ao->bounds == NULL) {
+		ecount = mono_array_length (ao);
+		res = (MonoObject *)mono_array_new_full (dst, klass, &ecount, NULL);
+	} else {
+		sizes = alloca (klass->rank * sizeof(guint32) * 2);
+		ecount = 1;
+		for (i = 0; i < klass->rank; ++i) {
+			sizes [i] = ao->bounds [i].length;
+			ecount *= ao->bounds [i].length;
+			sizes [i + klass->rank] = ao->bounds [i].lower_bound;
+		}
+		res = (MonoObject *)mono_array_new_full (dst, klass, sizes, sizes + klass->rank);
+	}
+	if (klass->element_class->valuetype) {
+		if (klass->element_class->blittable) {
+			memcpy (((MonoArray *)res)->vector, ao->vector, esize * ecount);
+		} else {
+			for (i = 0; i < ecount; i++) {
+				MonoObject *s, *d;
+				gpointer *src_ea = (gpointer *)mono_array_addr_with_size (ao, esize, i);
+				gpointer *dst_ea = (gpointer *)mono_array_addr_with_size ((MonoArray *)res, esize, i);
+				s = mono_value_box (src, klass->element_class, src_ea);
+				d = mono_domain_transfer_object (src, dst, s);
+				memcpy (dst_ea, (char *)d + sizeof(MonoObject), esize);
+			}
+		}
+	} else {
+		g_assert (esize == sizeof (gpointer));
+		for (i = 0; i < ecount; i++) {
+			gpointer *src_ea = (gpointer *)mono_array_addr_with_size (ao, esize, i);
+			gpointer *dst_ea = (gpointer *)mono_array_addr_with_size ((MonoArray *)res, esize, i);
+			*dst_ea = mono_domain_transfer_object (src, dst, *src_ea);
+		}
+	}
+	return res;
 }
 
 /**
@@ -250,53 +184,214 @@ ves_icall_System_AppDomainSetup_InitAppDomainSetup (MonoAppDomainSetup *setup)
 static MonoObject *
 mono_domain_transfer_object (MonoDomain *src, MonoDomain *dst, MonoObject *obj)
 {
+	MonoClass *sic = mono_defaults.serializationinfo_class;
 	MonoClass *klass;
-	MonoObject *res;	
+	MonoObject *res = NULL;	
+	int i;
 
 	if (!obj)
 		return NULL;
 
 	g_assert (obj->vtable->domain == src);
 
-	/* fixme: transfer an object from one domain into another */
-
 	klass = obj->vtable->klass;
 
-	if (MONO_CLASS_IS_ARRAY (klass)) {
-		MonoArray *ao = (MonoArray *)obj;
-		int esize, ecount, i;
-		guint32 *sizes;
+	/* some special cases */
+	if (klass == mono_defaults.string_class) {
+		MonoString *str = (MonoString *)obj;
+		return (MonoObject *)mono_string_new_utf16 (dst, 
+		        (const guint16 *)mono_string_chars (str), str->length); 
+	} 
+
+	if (klass == mono_defaults.monotype_class)
+		return (MonoObject *) mono_type_get_object (dst, ((MonoReflectionType *)obj)->type);	
+
+	if (MONO_CLASS_IS_ARRAY (klass))
+		return mono_domain_transfer_array (src, dst, (MonoArray *)obj); 
+
+	if (mono_object_isinst (obj, mono_defaults.iserializeable_class)) {
+		static MonoMethod *serinfo_ctor1 = NULL, *serinfo_ctor2 = NULL, *get_entries = NULL;
+		MonoMethod *get_object_data, *ser_ctor;
+		MonoObject *src_serinfo, *dst_serinfo;
+		void *pa [2];
+		MonoStreamingContext ctx;
+		MonoArray *entries, *trans_entries;
+		int len;
+
+		/* get a pointer to the GetObjectData method */ 
+		get_object_data = klass->vtable [klass->interface_offsets [mono_defaults.iserializeable_class->interface_id]];
+		g_assert (get_object_data);
+
+		src_serinfo = mono_object_new (src, sic);
+
+		if (!serinfo_ctor1) {
+			for (i = 0; i < sic->method.count; ++i) {
+				if (!strcmp (".ctor", sic->methods [i]->name) &&
+				    sic->methods [i]->signature->param_count == 1) {
+					serinfo_ctor1 = sic->methods [i];
+					break;
+				}
+			}
+			g_assert (serinfo_ctor1);
+		}
 		
-		sizes = alloca (klass->rank * sizeof(guint32) * 2);
-		esize = mono_array_element_size (klass);
-		ecount = 1;
-		for (i = 0; i < klass->rank; ++i) {
-			sizes [i] = ao->bounds [i].length;
-			ecount *= ao->bounds [i].length;
-			sizes [i + klass->rank] = ao->bounds [i].lower_bound;
+		if (!serinfo_ctor2) {
+			for (i = 0; i < sic->method.count; ++i) {
+				if (!strcmp (".ctor", sic->methods [i]->name) &&
+				    sic->methods [i]->signature->param_count == 2 &&
+				    sic->methods [i]->signature->params [1]->type == MONO_TYPE_SZARRAY) {
+					serinfo_ctor2 = sic->methods [i];
+					break;
+				}
+			}
+			g_assert (serinfo_ctor2);
 		}
-		res = (MonoObject *)mono_array_new_full (dst, klass, sizes, sizes + klass->rank);
-		if (klass->element_class->valuetype) {
-			memcpy (res, (char *)ao + sizeof(MonoArray), esize * ecount);
-		} else {
-			g_assert (esize == sizeof (gpointer));
-			for (i = 0; i < ecount; i++) {
-				int offset = sizeof (MonoArray) + esize * i;
-				gpointer *src_ea = (gpointer *)((char *)ao + offset);
-				gpointer *dst_ea = (gpointer *)((char *)res + offset);
+		
+		if (!get_entries) {
+			for (i = 0; i < sic->method.count; ++i) {
+				if (!strcmp ("get_entries", sic->methods [i]->name) &&
+				    sic->methods [i]->signature->param_count == 0) {
+					get_entries = sic->methods [i];
+					break;
+				}
+			}
+			g_assert (get_entries);
+		}
+
+		pa [0] = mono_type_get_object (src, &klass->byval_arg);
+		mono_runtime_invoke_in_domain (src, serinfo_ctor1, src_serinfo, pa, NULL);
+
+		ctx.additional = NULL;
+		ctx.state = 128; /* CrossAppDomain */
+		pa [0] = src_serinfo;
+		pa [1] = &ctx;
+		mono_runtime_invoke_in_domain (src, get_object_data, obj, pa, NULL);
+
+		entries = (MonoArray *)mono_runtime_invoke_in_domain (src, get_entries, src_serinfo, NULL, NULL);
+
+		g_assert (src_serinfo->vtable->domain == src);
+		g_assert (entries->obj.vtable->domain == src);
+
+		/* transfer all SerializationEntry objects */
+		len = mono_array_length ((MonoArray*)entries);
+		trans_entries = mono_array_new (dst, entries->obj.vtable->klass->element_class, len);
+
+		for (i = 0; i < len; i++) {
+			MonoSerializationEntry *s, *d;
+			s = (MonoSerializationEntry *)mono_array_addr_with_size (entries, 
+			        sizeof (MonoSerializationEntry), i);
+			d = (MonoSerializationEntry *)mono_array_addr_with_size (trans_entries, 
+                                sizeof (MonoSerializationEntry), i);
+			d->name = (MonoString *)mono_domain_transfer_object (src, dst, (MonoObject *)s->name);
+			d->value = mono_domain_transfer_object (src, dst, s->value);
+			d->type = (MonoReflectionType *)mono_domain_transfer_object (src, dst, (MonoObject *)s->type);
+		}
+
+		dst_serinfo = mono_object_new (dst, sic);
+
+		pa [0] = mono_type_get_object (dst, &klass->byval_arg);
+		pa [1] = trans_entries;
+		mono_runtime_invoke_in_domain (dst, serinfo_ctor2, dst_serinfo, pa, NULL);
+
+		ser_ctor = NULL;
+		for (i = 0; i < klass->method.count; i++) {
+			MonoMethod *t = klass->methods [i];
+			if (!strcmp (t->name, ".ctor") && t->signature->param_count == 2 &&
+			    mono_metadata_type_equal (t->signature->params [0], 
+						      &mono_defaults.serializationinfo_class->byval_arg) &&
+			    mono_metadata_type_equal (t->signature->params [1], 
+						      &mono_defaults.streamingcontext_class->byval_arg))
+				ser_ctor = t;
+		}
+		g_assert (ser_ctor);
+
+		res = mono_object_new (dst, klass);
+
+		ctx.additional = NULL;
+		ctx.state = 128; /* CrossAppDomain */
+		pa [0] = dst_serinfo;
+		pa [1] = &ctx;
+		mono_runtime_invoke_in_domain (dst, ser_ctor, res, pa, NULL);
+
+		return res;
+	}
+
+	if (!(klass->flags & TYPE_ATTRIBUTE_SERIALIZABLE)) {
+		MonoException *exc = NULL;
+		char *msg;
+
+		msg = g_strdup_printf ("klass \"%s.%s\" is not serializable", 
+				       klass->name_space, klass->name);
+		exc = mono_get_exception_serialization (msg);
+		g_free (msg);
+
+		mono_raise_exception (exc);
+	}
+
+	res = mono_object_new (dst, klass);
+
+	for (i = 0; i < klass->field.count; i++) {
+		MonoClassField *field = &klass->fields [i];
+		MonoType *type = field->type;
+		int size, align;
+		char *src_ptr, *dst_ptr;
+		int simple_type;
+
+		if (type->attrs & FIELD_ATTRIBUTE_STATIC ||
+		    type->attrs & FIELD_ATTRIBUTE_NOT_SERIALIZED)
+			continue;
 
-				*dst_ea = mono_domain_transfer_object (src, dst, *src_ea);
+		size = mono_type_size (type, &align);
+
+		dst_ptr = (char*)res + field->offset;
+		src_ptr = (char *)obj + field->offset;
+
+		g_assert (!type->byref);
+		
+		simple_type = type->type;
+	handle_enum:
+		switch (simple_type) {
+		case MONO_TYPE_BOOLEAN:
+		case MONO_TYPE_CHAR: 
+		case MONO_TYPE_I1:
+		case MONO_TYPE_U1:
+		case MONO_TYPE_I2:
+		case MONO_TYPE_U2:
+		case MONO_TYPE_I4:
+		case MONO_TYPE_U4:
+		case MONO_TYPE_I:
+		case MONO_TYPE_U:
+		case MONO_TYPE_I8: 
+		case MONO_TYPE_U8:
+		case MONO_TYPE_R4:
+		case MONO_TYPE_R8:
+			memcpy (dst_ptr, src_ptr, size);
+			break;
+		case MONO_TYPE_OBJECT:
+		case MONO_TYPE_ARRAY:
+		case MONO_TYPE_SZARRAY:
+		case MONO_TYPE_CLASS:
+		case MONO_TYPE_STRING: {
+			*(MonoObject **)dst_ptr = mono_domain_transfer_object (src, dst, *(MonoObject **)src_ptr);
+			break;
+		}
+		case MONO_TYPE_VALUETYPE: {
+			MonoObject *boxed_src, *tmp;
+
+			if (type->data.klass->enumtype) {
+				simple_type = type->data.klass->enum_basetype->type;
+				goto handle_enum;
 			}
+			boxed_src = mono_value_box (src, type->data.klass, src_ptr);
+			tmp = mono_domain_transfer_object (src, dst, boxed_src);
+			memcpy (dst_ptr, (char *)tmp + sizeof (MonoObject), size);
+			break;
+		}
+		default:
+			g_assert_not_reached ();
 		}
-	} else if (klass == mono_defaults.string_class) {
-		MonoString *str = (MonoString *)obj;
-		res = (MonoObject *)mono_string_new_utf16 (dst, 
-		        (const guint16 *)str->c_str->vector, str->length); 
-	} else {
-		// fixme: we need generic marshalling code here */
-		g_assert_not_reached ();
 	}
-	
+
 	return res;
 }
 
@@ -313,6 +408,7 @@ ves_icall_System_AppDomain_GetData (MonoAppDomain *ad, MonoString *name)
 
 	str = mono_string_to_utf8 (name);
 
+	mono_domain_lock (add);
 	if (!strcmp (str, "APPBASE"))
 		o = (MonoObject *)add->setup->application_base;
 	else if (!strcmp (str, "APP_CONFIG_FILE"))
@@ -332,8 +428,9 @@ ves_icall_System_AppDomain_GetData (MonoAppDomain *ad, MonoString *name)
 	else if (!strcmp (str, "FORCE_CACHE_INSTALL"))
 		o = (MonoObject *)add->setup->shadow_copy_files;
 	else 
-		o = g_hash_table_lookup (add->env, str);
+		o = mono_g_hash_table_lookup (add->env, name);
 
+	mono_domain_unlock (add);
 	g_free (str);
 
 	if (!o)
@@ -348,17 +445,16 @@ ves_icall_System_AppDomain_SetData (MonoAppDomain *ad, MonoString *name, MonoObj
 	MonoDomain *add = ad->data;
 	MonoDomain *cur = mono_domain_get ();
 	MonoObject *o;
-	char *str;
 
 	g_assert (ad != NULL);
 	g_assert (name != NULL);
 
 	o = mono_domain_transfer_object (cur, add, data);
 
-	/* fixme: need a hash func for MonoString */
-	str = mono_string_to_utf8 (name);
-	g_hash_table_insert (add->env, str, o);
-	g_free (str);
+	mono_domain_lock (add);
+	mono_g_hash_table_insert (add->env, name, o);
+
+	mono_domain_unlock (add);
 }
 
 MonoAppDomainSetup *
@@ -376,30 +472,7 @@ ves_icall_System_AppDomain_getFriendlyName (MonoAppDomain *ad)
 	g_assert (ad != NULL);
 	g_assert (ad->data != NULL);
 
-	return ad->data->friendly_name;
-}
-
-/**
- * mono_domain_get:
- *
- * Returns the current domain.
- */
-inline MonoDomain *
-mono_domain_get ()
-{
-	return ((MonoDomain *)TlsGetValue (appdomain_thread_id));
-}
-
-/**
- * mono_domain_set:
- * @domain: the new domain
- *
- * Sets the current domain to @domain.
- */
-inline void
-mono_domain_set (MonoDomain *domain)
-{
-	TlsSetValue (appdomain_thread_id, domain);
+	return mono_string_new (ad->data, ad->data->friendly_name);
 }
 
 MonoAppDomain *
@@ -419,14 +492,14 @@ ves_icall_System_AppDomain_createDomain (MonoString *friendly_name, MonoAppDomai
 	
 	adclass = mono_class_from_name (mono_defaults.corlib, "System", "AppDomain");
 	
-	// fixme: pin all those objects
+	/* FIXME: pin all those objects */
 	ad = (MonoAppDomain *) mono_object_new (domain, adclass);
-	ad->data = data = mono_create_domain ();
+	ad->data = data = mono_domain_create ();
 	data->domain = ad;
 	data->setup = setup;
-	data->friendly_name = friendly_name;
+	data->friendly_name = mono_string_to_utf8 (friendly_name);
 
-	// fixme: what to do next ?
+	/* FIXME: what to do next ? */
 
 	return ad;
 }
@@ -462,107 +535,77 @@ ves_icall_System_AppDomain_GetAssemblies (MonoAppDomain *ad)
 	ah.domain = domain;
 	ah.res = res;
 	ah.idx = 0;
+	mono_domain_lock (domain);
 	g_hash_table_foreach (domain->assemblies, add_assembly, &ah);
+	mono_domain_unlock (domain);
 
 	return res;
 }
 
-
 MonoReflectionAssembly *
-ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad,  MonoReflectionAssemblyName *assRef, MonoObject *evidence)
+ves_icall_System_Reflection_Assembly_LoadFrom (MonoString *fname)
 {
-	MonoDomain *domain = ad->data; 
+	MonoDomain *domain = mono_domain_get ();
 	char *name, *filename;
-	enum MonoImageOpenStatus status = MONO_IMAGE_OK;
+	MonoImageOpenStatus status = MONO_IMAGE_OK;
 	MonoAssembly *ass;
 
-	/* FIXME : examine evidence? */
-
-	g_assert (assRef != NULL);
-	g_assert (assRef->name != NULL);
-
-	/* FIXME : examine version, culture info */
-
-	name = filename = mono_string_to_utf8 (assRef->name);
+	name = filename = mono_string_to_utf8 (fname);
 
+	/* FIXME: move uri handling to mono_assembly_open */
 	if (strncmp (filename, "file://", 7) == 0)
 		filename += 7;
 
-	ass = mono_assembly_open (filename, NULL, &status);
+	ass = mono_assembly_open (filename, &status);
 	
 	g_free (name);
 
-	if (!ass)
-		mono_raise_exception ((MonoException *)mono_exception_from_name (mono_defaults.corlib, "System.IO", "FileNotFoundException"));
+	if (!ass){
+		MonoException *exc = mono_get_exception_file_not_found (fname);
+		mono_raise_exception (exc);
+	}
 
 	return mono_assembly_get_object (domain, ass);
 }
 
-void
-ves_icall_System_AppDomain_Unload (MonoAppDomain *ad)
-{
-	mono_domain_unload (ad->data, FALSE);
-}
 
-/**
- * mono_domain_assembly_open:
- * @domain: the application domain
- * @name: file name of the assembly
- *
- * fixme: maybe we should integrate this with mono_assembly_open ??
- */
-MonoAssembly *
-mono_domain_assembly_open (MonoDomain *domain, char *name)
+MonoReflectionAssembly *
+ves_icall_System_AppDomain_LoadAssembly (MonoAppDomain *ad,  MonoReflectionAssemblyName *assRef, MonoObject *evidence)
 {
-	MonoAssembly *ass, *tmp;
-	int i;
+	MonoDomain *domain = ad->data; 
+	char *name;
+	MonoImageOpenStatus status = MONO_IMAGE_OK;
+	MonoAssembly *ass;
+	MonoAssemblyName aname;
 
-	if ((ass = g_hash_table_lookup (domain->assemblies, name)))
-		return ass;
+	memset (&aname, 0, sizeof (aname));
 
-	if (!(ass = mono_assembly_open (name, NULL, NULL)))
-		return NULL;
+	/* FIXME : examine evidence? */
 
-	g_hash_table_insert (domain->assemblies, ass->name, ass);
+	g_assert (assRef != NULL);
+	g_assert (assRef->name != NULL);
 
-	// fixme: maybe this must be recursive ?
-	for (i = 0; (tmp = ass->image->references [i]) != NULL; i++) {
-		if (!g_hash_table_lookup (domain->assemblies, tmp->name))
-			g_hash_table_insert (domain->assemblies, tmp->name, tmp);
-	}
+	/* FIXME : examine version, culture info */
 
-	return ass;
-}
+	aname.name = name = mono_string_to_utf8 (assRef->name);
 
-static void
-remove_assembly (gpointer key, gpointer value, gpointer user_data)
-{
-	mono_assembly_close ((MonoAssembly *)value);
-}
+	ass = mono_assembly_load (&aname, NULL, &status);
+	
+	g_free (name);
 
-void
-mono_domain_unload (MonoDomain *domain, gboolean force)
-{
-	if ((domain == mono_root_domain) && !force) {
-		g_warning ("cant unload root domain");
-		return;
+	if (!ass) {
+		/* FIXME: it doesn't make much sense since we really don't have a filename ... */
+		MonoException *exc = mono_get_exception_file_not_found (assRef->name);
+		mono_raise_exception (exc);
 	}
 
-	g_hash_table_foreach (domain->assemblies, remove_assembly, NULL);
-
-	g_hash_table_destroy (domain->env);
-	g_hash_table_destroy (domain->assemblies);
-	g_hash_table_destroy (domain->class_vtable_hash);
-	g_hash_table_destroy (domain->jit_code_hash);
-	g_hash_table_destroy (domain->ldstr_table);
-	mono_mempool_destroy (domain->mp);
-	
-	// fixme: anything else required ? */
-
-	g_free (domain);
+	return mono_assembly_get_object (domain, ass);
+}
 
-	if ((domain == mono_root_domain))
-		mono_root_domain = NULL;
+void
+ves_icall_System_AppDomain_Unload (MonoAppDomain *ad)
+{
+	mono_domain_unload (ad->data, FALSE);
 }
 
 gint32
@@ -572,7 +615,6 @@ ves_icall_System_AppDomain_ExecuteAssembly (MonoAppDomain *ad, MonoString *file,
 	MonoDomain *cdom = mono_domain_get ();
 	MonoAssembly *assembly;
 	MonoImage *image;
-	MonoCLIImageInfo *iinfo;
 	MonoMethod *method;
 	MonoObject *margs;
 	char *filename;
@@ -581,7 +623,7 @@ ves_icall_System_AppDomain_ExecuteAssembly (MonoAppDomain *ad, MonoString *file,
 	mono_domain_set (ad->data);
 
 	filename = mono_string_to_utf8 (file);
-	assembly = mono_assembly_open (filename, NULL, NULL);
+	assembly = mono_assembly_open (filename, NULL);
 	g_free (filename);
 
 	if (!assembly) {
@@ -590,16 +632,19 @@ ves_icall_System_AppDomain_ExecuteAssembly (MonoAppDomain *ad, MonoString *file,
 	}
 
 	image = assembly->image;
-	iinfo = image->image_info;
-	method = mono_get_method (image, iinfo->cli_cli_header.ch_entry_point, NULL);
+
+	method = mono_get_method (image, mono_image_get_entry_point (image), NULL);
 
 	if (!method)
 		g_error ("No entry point method found in %s", image->name);
 
 	margs = mono_domain_transfer_object (cdom, ad->data, (MonoObject *)args);
-	res = mono_runtime_exec_main (method, (MonoArray *)margs);
+	if (!margs)
+		margs = mono_array_new (ad->data, mono_defaults.string_class, 0);
+	res = mono_runtime_exec_main (method, (MonoArray *)margs, NULL);
 
 	mono_domain_set (cdom);
 
 	return res;
 }
+
diff --git a/mono/metadata/appdomain.h b/mono/metadata/appdomain.h
index c00607f51a0..e81ed21ef81 100644
--- a/mono/metadata/appdomain.h
+++ b/mono/metadata/appdomain.h
@@ -10,12 +10,15 @@
 #ifndef _MONO_METADATA_APPDOMAIN_H_
 #define _MONO_METADATA_APPDOMAIN_H_
 
-#include <config.h>
 #include <glib.h>
 
 #include <mono/metadata/object.h>
 #include <mono/metadata/reflection.h>
 #include <mono/metadata/mempool.h>
+#include <mono/utils/mono-hash.h>
+#include <mono/io-layer/io-layer.h>
+
+typedef void (*MonoThreadStartCB) (gpointer stack_start);
 
 /* This is a copy of System.AppDomainSetup */
 typedef struct {
@@ -33,18 +36,49 @@ typedef struct {
 	MonoBoolean publisher_policy;
 } MonoAppDomainSetup;
 
+typedef GArray MonoJitInfoTable;
+
+typedef struct {
+	guint32  flags;
+	gpointer try_start;
+	gpointer try_end;
+	gpointer handler_start;
+	union {
+		guint32 token;
+		gpointer filter;
+	} data;
+} MonoJitExceptionInfo;
+
+typedef struct {
+	MonoMethod *method;
+	gpointer    code_start;
+	int         code_size;
+	guint32     used_regs;
+	unsigned    num_clauses;
+	MonoJitExceptionInfo *clauses;
+} MonoJitInfo;
+
 typedef struct _MonoAppDomain MonoAppDomain;
 
 struct _MonoDomain {
-	MonoAppDomain *domain;
-	MonoMemPool   *mp;
-	GHashTable    *env;
-	GHashTable    *assemblies;
+	MonoAppDomain      *domain;
+	CRITICAL_SECTION    lock;
+	MonoMemPool        *mp;
+	MonoMemPool        *code_mp;
+	MonoGHashTable     *env;
+	GHashTable         *assemblies;
+	MonoAssembly       *entry_assembly;
 	MonoAppDomainSetup *setup;
-	MonoString    *friendly_name;
-	GHashTable    *ldstr_table;
-	GHashTable    *class_vtable_hash;
-	GHashTable    *jit_code_hash;
+	char               *friendly_name;
+	MonoGHashTable     *ldstr_table;
+	MonoGHashTable     *class_vtable_hash;
+	MonoGHashTable     *proxy_vtable_hash;
+	MonoGHashTable     *static_data_hash;
+	GHashTable         *jit_code_hash;
+	MonoJitInfoTable   *jit_info_table;
+	/* hashtables for Reflection handles */
+	MonoGHashTable     *type_hash;
+	MonoGHashTable     *refobject_hash;
 };
 
 /* This is a copy of System.AppDomain */
@@ -55,20 +89,45 @@ struct _MonoAppDomain {
 
 extern MonoDomain *mono_root_domain;
 
+extern HANDLE mono_delegate_semaphore;
+extern CRITICAL_SECTION mono_delegate_section;
+extern int mono_runtime_shutdown;
+
+#define mono_domain_lock(domain)   EnterCriticalSection(&(domain)->lock)
+#define mono_domain_unlock(domain) LeaveCriticalSection(&(domain)->lock)
+
+MonoDomain*
+mono_init                  (const char *filename);
+
+void
+mono_runtime_init          (MonoDomain *domain, MonoThreadStartCB start_cb);
+
+void
+mono_runtime_cleanup       (MonoDomain *domain);
+
 MonoDomain *
-mono_init (const char *filename);
+mono_domain_create         (void);
 
 inline MonoDomain *
-mono_domain_get (void);
+mono_domain_get            (void);
 
 inline void
-mono_domain_set (MonoDomain *domain);
+mono_domain_set            (MonoDomain *domain);
 
 MonoAssembly *
-mono_domain_assembly_open (MonoDomain *domain, char *name);
+mono_domain_assembly_open  (MonoDomain *domain, const char *name);
+
+void
+mono_domain_finalize       (MonoDomain *domain);
 
 void
-mono_domain_unload (MonoDomain *domain, gboolean force);
+mono_domain_unload         (MonoDomain *domain, gboolean force);
+
+void
+mono_jit_info_table_add    (MonoDomain *domain, MonoJitInfo *ji);
+
+MonoJitInfo *
+mono_jit_info_table_find   (MonoDomain *domain, char *addr);
 
 void
 ves_icall_System_AppDomainSetup_InitAppDomainSetup (MonoAppDomainSetup *setup);
@@ -99,6 +158,9 @@ MonoArray *
 ves_icall_System_AppDomain_GetAssemblies           (MonoAppDomain *ad);
 
 MonoReflectionAssembly *
+ves_icall_System_Reflection_Assembly_LoadFrom      (MonoString *fname);
+
+MonoReflectionAssembly *
 ves_icall_System_AppDomain_LoadAssembly            (MonoAppDomain *ad, 
 						    MonoReflectionAssemblyName *assRef,
 						    MonoObject    *evidence);
diff --git a/mono/metadata/assembly.c b/mono/metadata/assembly.c
index a2547616be8..4a36e9ede8d 100644
--- a/mono/metadata/assembly.c
+++ b/mono/metadata/assembly.c
@@ -14,17 +14,63 @@
 #include <glib.h>
 #include <errno.h>
 #include <string.h>
+#include <stdlib.h>
 #include "assembly.h"
 #include "image.h"
 #include "cil-coff.h"
 #include "rawbuffer.h"
 
-#define CSIZE(x) (sizeof (x) / 4)
+/* the default search path is just MONO_ASSEMBLIES */
+static const char*
+default_path [] = {
+	MONO_ASSEMBLIES,
+	NULL
+};
+
+static char **assemblies_path = NULL;
+static int env_checked = 0;
+
+static void
+check_env (void) {
+	const char *path;
+	char **splitted;
+	
+	if (env_checked)
+		return;
+	env_checked = 1;
+
+	path = getenv ("MONO_PATH");
+	if (!path)
+		return;
+	splitted = g_strsplit (path, G_SEARCHPATH_SEPARATOR_S, 1000);
+	if (assemblies_path)
+		g_strfreev (assemblies_path);
+	assemblies_path = splitted;
+}
 
 /*
  * keeps track of loaded assemblies
  */
-static GHashTable *assemblies;
+static GList *loaded_assemblies = NULL;
+static MonoAssembly *corlib;
+
+static MonoAssembly*
+search_loaded (MonoAssemblyName* aname)
+{
+	GList *tmp;
+	MonoAssembly *ass;
+	
+	for (tmp = loaded_assemblies; tmp; tmp = tmp->next) {
+		ass = tmp->data;
+		/* we just compare the name, but later we'll do all the checks */
+		/* g_print ("compare %s %s\n", aname->name, ass->aname.name); */
+		if (strcmp (aname->name, ass->aname.name))
+			continue;
+		/* g_print ("success\n"); */
+		return ass;
+	}
+	return NULL;
+}
 
 /**
  * g_concat_dir_and_file:
@@ -50,34 +96,96 @@ g_concat_dir_and_file (const char *dir, const char *file)
 		return g_strconcat (dir, file, NULL);
 }
 
-static char *
-default_assembly_name_resolver (const char *name)
+static MonoAssembly *
+load_in_path (const char *basename, const char** search_path, MonoImageOpenStatus *status)
 {
-	char *file, *path;
-	
-	if ((strcmp (name, "mscorlib") == 0) ||
-			(strcmp (name, "mscorlib.dll") == 0) ||
-			(strcmp (name, "corlib.dll") == 0) ||
-			(strcmp (name, "corlib") == 0))
-		return g_concat_dir_and_file (MONO_ASSEMBLIES, CORLIB_NAME);
-
-	if (g_file_test (name, G_FILE_TEST_EXISTS))
-		return g_strdup (name);
-	path = g_concat_dir_and_file (MONO_ASSEMBLIES, name);
-	if (g_file_test (path, G_FILE_TEST_EXISTS))
-		return g_strdup (path);
-	g_free (path);
-	file = g_strconcat (name, ".dll", NULL);
-	path = g_concat_dir_and_file (MONO_ASSEMBLIES, file);
-	g_free (file);
-
-	return path;
+	int i;
+	char *fullpath;
+	MonoAssembly *result;
+
+	for (i = 0; search_path [i]; ++i) {
+		fullpath = g_concat_dir_and_file (search_path [i], basename);
+		result = mono_assembly_open (fullpath, status);
+		g_free (fullpath);
+		if (result)
+			return result;
+	}
+	return NULL;
+}
+
+/**
+ * mono_assembly_setrootdir:
+ * @root_dir: The pathname of the root directory where we will locate assemblies
+ *
+ * This routine sets the internal default root directory for looking up
+ * assemblies.  This is used by Windows installations to compute dynamically
+ * the place where the Mono assemblies are located.
+ *
+ */
+void
+mono_assembly_setrootdir (const char *root_dir)
+{
+	/*
+	 * Override the MONO_ASSEMBLIES directory configured at compile time.
+	 */
+	default_path [0] = g_strdup (root_dir);
+}
+
+static void
+load_references (MonoImage *image, MonoImageOpenStatus *status) {
+	MonoTableInfo *t;
+	guint32 cols [MONO_ASSEMBLYREF_SIZE];
+	const char *hash;
+	int i;
+
+	if (image->references)
+		return;
+
+	t = &image->tables [MONO_TABLE_ASSEMBLYREF];
+
+	image->references = g_new0 (MonoAssembly *, t->rows + 1);
+
+	/*
+	 * Load any assemblies this image references
+	 */
+	for (i = 0; i < t->rows; i++) {
+		MonoAssemblyName aname;
+
+		mono_metadata_decode_row (t, i, cols, MONO_ASSEMBLYREF_SIZE);
+		
+		hash = mono_metadata_blob_heap (image, cols [MONO_ASSEMBLYREF_HASH_VALUE]);
+		aname.hash_len = mono_metadata_decode_blob_size (hash, &hash);
+		aname.hash_value = hash;
+		aname.name = mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_NAME]);
+		aname.culture = mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_CULTURE]);
+		aname.flags = cols [MONO_ASSEMBLYREF_FLAGS];
+		aname.major = cols [MONO_ASSEMBLYREF_MAJOR_VERSION];
+		aname.minor = cols [MONO_ASSEMBLYREF_MINOR_VERSION];
+		aname.build = cols [MONO_ASSEMBLYREF_BUILD_NUMBER];
+		aname.revision = cols [MONO_ASSEMBLYREF_REV_NUMBER];
+
+		image->references [i] = mono_assembly_load (&aname, image->assembly->basedir, status);
+
+		if (image->references [i] == NULL){
+			int j;
+			
+			for (j = 0; j < i; j++)
+				mono_assembly_close (image->references [j]);
+			g_free (image->references);
+			image->references = NULL;
+
+			g_warning ("Could not find assembly %s", aname.name);
+			*status = MONO_IMAGE_MISSING_ASSEMBLYREF;
+			return;
+		}
+	}
+	image->references [i] = NULL;
+
 }
 
 /**
  * mono_assembly_open:
  * @filename: Opens the assembly pointed out by this name
- * @resolver: A user provided function to resolve assembly references
  * @status: where a status code can be returned
  *
  * mono_assembly_open opens the PE-image pointed by @filename, and
@@ -87,109 +195,150 @@ default_assembly_name_resolver (const char *name)
  * it. 
  */
 MonoAssembly *
-mono_assembly_open (const char *filename, MonoAssemblyResolverFn resolver,
-		    enum MonoImageOpenStatus *status)
+mono_assembly_open (const char *filename, MonoImageOpenStatus *status)
 {
-	MonoAssembly *ass;
+	MonoAssembly *ass, *ass2;
 	MonoImage *image;
 	MonoTableInfo *t;
+	guint32 cols [MONO_ASSEMBLY_SIZE];
 	int i;
-	char *fullname;
-	const char *basename = strrchr (filename, G_DIR_SEPARATOR);
-	static MonoAssembly *corlib;
+	char *base_dir;
+	MonoImageOpenStatus def_status;
 	
 	g_return_val_if_fail (filename != NULL, NULL);
 
-	if (assemblies == NULL)
-		assemblies = g_hash_table_new (g_str_hash, g_str_equal);
+	if (!status)
+		status = &def_status;
+	*status = MONO_IMAGE_OK;
 
-	if ((ass = g_hash_table_lookup (assemblies, filename)) != NULL){
-		ass->ref_count++;
-		return ass;
-	}
-	
-	if (basename == NULL)
-		basename = filename;
-	else
-		basename++;
-
-	if (resolver == NULL)
-		resolver = default_assembly_name_resolver;
-
-
-	fullname = resolver (filename);
-	image = mono_image_open (fullname, status);
+	/* g_print ("file loading %s\n", filename); */
+	image = mono_image_open (filename, status);
 
 	if (!image){
-		if (status)
-			*status = MONO_IMAGE_ERROR_ERRNO;
-		g_free (fullname);
+		*status = MONO_IMAGE_ERROR_ERRNO;
 		return NULL;
 	}
 
-	t = &image->tables [MONO_TABLE_ASSEMBLYREF];
-
-	image->references = g_new0 (MonoAssembly *, t->rows + 1);
-
+	base_dir = g_path_get_dirname (filename);
+	
 	/*
 	 * Create assembly struct, and enter it into the assembly cache
 	 */
-	ass = g_new (MonoAssembly, 1);
-	ass->name = fullname;
+	ass = g_new0 (MonoAssembly, 1);
+	ass->basedir = base_dir;
 	ass->image = image;
 
-	g_hash_table_insert (assemblies, image->name, ass);
-	g_hash_table_insert (assemblies, ass->name, ass);
+	t = &image->tables [MONO_TABLE_ASSEMBLY];
+	if (t->rows) {
+		mono_metadata_decode_row (t, 0, cols, MONO_ASSEMBLY_SIZE);
+		
+		ass->aname.hash_len = 0;
+		ass->aname.hash_value = NULL;
+		ass->aname.name = mono_metadata_string_heap (image, cols [MONO_ASSEMBLY_NAME]);
+		ass->aname.culture = mono_metadata_string_heap (image, cols [MONO_ASSEMBLY_CULTURE]);
+		ass->aname.flags = cols [MONO_ASSEMBLY_FLAGS];
+		ass->aname.major = cols [MONO_ASSEMBLY_MAJOR_VERSION];
+		ass->aname.minor = cols [MONO_ASSEMBLY_MINOR_VERSION];
+		ass->aname.build = cols [MONO_ASSEMBLY_BUILD_NUMBER];
+		ass->aname.revision = cols [MONO_ASSEMBLY_REV_NUMBER];
+
+		/* avoid loading the same assembly twixe for now... */
+		if ((ass2 = search_loaded (&ass->aname))) {
+			g_free (ass);
+			g_free (base_dir);
+			*status = MONO_IMAGE_OK;
+			return ass2;
+		}
+	}
+
+	image->assembly = ass;
+
+	/* register right away to prevent loops */
+	loaded_assemblies = g_list_prepend (loaded_assemblies, ass);
+
+	load_references (image, status);
+	if (*status != MONO_IMAGE_OK) {
+		mono_assembly_close (ass);
+		return NULL;
+	}
 	
-	/*
-	 * Load any assemblies this image references
-	 */
+	t = &image->tables [MONO_TABLE_MODULEREF];
+	ass->modules = g_new0 (MonoImage *, t->rows);
 	for (i = 0; i < t->rows; i++){
-		char *assembly_ref;
+		char *module_ref;
 		const char *name;
-		guint32 cols [MONO_ASSEMBLYREF_SIZE];
+		guint32 cols [MONO_MODULEREF_SIZE];
 
-		mono_metadata_decode_row (t, i, cols, CSIZE (cols));
-		name = mono_metadata_string_heap (image, cols [MONO_ASSEMBLYREF_NAME]);
-
-		/*
-		 * Special case until we have a passable corlib:
-		 *
-		 * ie, references to mscorlib from corlib.dll are ignored 
-		 * and we do not load corlib twice.
-		 */
-		if (strcmp (basename, CORLIB_NAME) == 0){
-			if (corlib == NULL)
-				corlib = ass;
-			
-			if (strcmp (name, "mscorlib") == 0)
-				continue;
+		mono_metadata_decode_row (t, i, cols, MONO_MODULEREF_SIZE);
+		name = mono_metadata_string_heap (image, cols [MONO_MODULEREF_NAME]);
+		module_ref = g_concat_dir_and_file (base_dir, name);
+		ass->modules [i] = mono_image_open (module_ref, status);
+		if (ass->modules [i]) {
+			ass->modules [i]->assembly = ass;
+			load_references (ass->modules [i], status);
 		}
-		
-		assembly_ref = (*resolver) (name);
+		/* 
+		 * FIXME: what do we do here? it could be a native dll...
+		 * We should probably do lazy-loading of modules.
+		 */
+		*status = MONO_IMAGE_OK;
+		g_free (module_ref);
+	}
 
-		image->references [i] = mono_assembly_open (assembly_ref, resolver, status);
+	return ass;
+}
 
-		if (image->references [i] == NULL){
-			int j;
-			
-			for (j = 0; j < i; j++)
-				mono_assembly_close (image->references [j]);
-			g_free (image->references);
-			mono_image_close (image);
+MonoAssembly*
+mono_assembly_load (MonoAssemblyName *aname, const char *basedir, MonoImageOpenStatus *status)
+{
+	MonoAssembly *result;
+	char *fullpath, *filename;
 
-			g_warning ("Could not find assembly %s %s", name, assembly_ref);
-			g_free (assembly_ref);
-			if (status)
-				*status = MONO_IMAGE_MISSING_ASSEMBLYREF;
-			g_free (ass);
-			return NULL;
+	check_env ();
+
+	/* g_print ("loading %s\n", aname->name); */
+	/* special case corlib */
+	if ((strcmp (aname->name, "mscorlib") == 0) || (strcmp (aname->name, "corlib") == 0)) {
+		if (corlib) {
+			/* g_print ("corlib already loaded\n"); */
+			return corlib;
 		}
-		g_free (assembly_ref);
+		/* g_print ("corlib load\n"); */
+		if (assemblies_path) {
+			corlib = load_in_path (CORLIB_NAME, (const char**)assemblies_path, status);
+			if (corlib)
+				return corlib;
+		}
+		corlib = load_in_path (CORLIB_NAME, default_path, status);
+		return corlib;
 	}
-	image->references [i] = NULL;
-
-	return ass;
+	result = search_loaded (aname);
+	if (result)
+		return result;
+	/* g_print ("%s not found in cache\n", aname->name); */
+	if (strstr (aname->name, ".dll"))
+		filename = g_strdup (aname->name);
+	else
+		filename = g_strconcat (aname->name, ".dll", NULL);
+	if (basedir) {
+		fullpath = g_concat_dir_and_file (basedir, filename);
+		result = mono_assembly_open (fullpath, status);
+		g_free (fullpath);
+		if (result) {
+			g_free (filename);
+			return result;
+		}
+	}
+	if (assemblies_path) {
+		result = load_in_path (filename, (const char**)assemblies_path, status);
+		if (result) {
+			g_free (filename);
+			return result;
+		}
+	}
+	result = load_in_path (filename, default_path, status);
+	g_free (filename);
+	return result;
 }
 
 void
@@ -203,24 +352,41 @@ mono_assembly_close (MonoAssembly *assembly)
 	if (--assembly->ref_count != 0)
 		return;
 	
+	loaded_assemblies = g_list_remove (loaded_assemblies, assembly);
 	image = assembly->image;
-	for (i = 0; image->references [i] != NULL; i++)
-		mono_image_close (image->references [i]->image);
-	g_free (image->references);
+	if (image->references) {
+		for (i = 0; image->references [i] != NULL; i++)
+			mono_image_close (image->references [i]->image);
+		g_free (image->references);
+	}
 	     
 	mono_image_close (assembly->image);
 
-	g_hash_table_remove (assemblies, assembly->name);
-			     
-	g_free (assembly->name);
+	g_free (assembly->basedir);
 	g_free (assembly);
 }
 
-/*
- * Temporary hack until we get AppDomains
+void
+mono_assembly_foreach (GFunc func, gpointer user_data)
+{
+	/* In the future this can do locking of loaded_assemblies */
+
+	g_list_foreach (loaded_assemblies, func, user_data);
+}
+
+/* Holds the assembly of the application, for
+ * System.Diagnostics.Process::MainModule
  */
-GHashTable *
-mono_get_assemblies ()
+static MonoAssembly *main_assembly=NULL;
+
+void
+mono_assembly_set_main (MonoAssembly *assembly)
+{
+	main_assembly=assembly;
+}
+
+MonoAssembly *
+mono_assembly_get_main (void)
 {
-	return assemblies;
+	return(main_assembly);
 }
diff --git a/mono/metadata/assembly.h b/mono/metadata/assembly.h
index 33b1dc4ada4..6551e54a8b3 100644
--- a/mono/metadata/assembly.h
+++ b/mono/metadata/assembly.h
@@ -1,16 +1,21 @@
 #ifndef _MONONET_METADATA_ASSEMBLY_H_ 
 #define _MONONET_METADATA_ASSEMBLY_H_
 
+#include <glib.h>
+
 #include <mono/metadata/image.h>
 
 #define CORLIB_NAME "corlib.dll"
 
-typedef char * (*MonoAssemblyResolverFn)(const char *name);
-
-MonoAssembly *mono_assembly_open     (const char *fname,
-				      MonoAssemblyResolverFn resolver,
-				      enum MonoImageOpenStatus *status);
-void          mono_assembly_close    (MonoAssembly *assembly);
+MonoAssembly *mono_assembly_open       (const char *filename,
+				       	MonoImageOpenStatus *status);
+MonoAssembly* mono_assembly_load       (MonoAssemblyName *aname, 
+                                       	const char       *basedir, 
+				     	MonoImageOpenStatus *status);
+void          mono_assembly_close      (MonoAssembly *assembly);
+void          mono_assembly_setrootdir (const char *root_dir);
+void	      mono_assembly_foreach    (GFunc func, gpointer user_data);
+void          mono_assembly_set_main   (MonoAssembly *assembly);
+MonoAssembly *mono_assembly_get_main   (void);
 
-GHashTable   *mono_get_assemblies    ();
 #endif
diff --git a/mono/metadata/cil-coff.h b/mono/metadata/cil-coff.h
index 1393c801306..1a3500c9140 100644
--- a/mono/metadata/cil-coff.h
+++ b/mono/metadata/cil-coff.h
@@ -29,7 +29,10 @@
 
 /* 128 bytes */
 typedef struct {
-	char    msdos_header [60];
+	char    msdos_sig [2];
+	guint16 nlast_page;
+	guint16 npages;
+	char    msdos_header [54];
 	guint32 pe_offset;
 	char    msdos_header2 [64];
 } MonoMSDOSHeader;
@@ -87,6 +90,74 @@ typedef struct {
 } MonoPEHeaderNT;
 
 typedef struct {
+	guint32 rde_data_offset;
+	guint32 rde_size;
+	guint32 rde_codepage;
+	guint32 rde_reserved;
+} MonoPEResourceDataEntry;
+
+#define MONO_PE_RESOURCE_ID_CURSOR	0x01
+#define MONO_PE_RESOURCE_ID_BITMAP	0x02
+#define MONO_PE_RESOURCE_ID_ICON	0x03
+#define MONO_PE_RESOURCE_ID_MENU	0x04
+#define MONO_PE_RESOURCE_ID_DIALOG	0x05
+#define MONO_PE_RESOURCE_ID_STRING	0x06
+#define MONO_PE_RESOURCE_ID_FONTDIR	0x07
+#define MONO_PE_RESOURCE_ID_FONT	0x08
+#define MONO_PE_RESOURCE_ID_ACCEL	0x09
+#define MONO_PE_RESOURCE_ID_RCDATA	0x0a
+#define MONO_PE_RESOURCE_ID_MESSAGETABLE	0x0b
+#define MONO_PE_RESOURCE_ID_GROUP_CURSOR	0x0c
+#define MONO_PE_RESOURCE_ID_GROUP_ICON	0x0d
+#define MONO_PE_RESOURCE_ID_VERSION	0x10
+#define MONO_PE_RESOURCE_ID_DLGINCLUDE	0x11
+#define MONO_PE_RESOURCE_ID_PLUGPLAY	0x13
+#define MONO_PE_RESOURCE_ID_VXD		0x14
+#define MONO_PE_RESOURCE_ID_ANICURSOR	0x15
+#define MONO_PE_RESOURCE_ID_ANIICON	0x16
+#define MONO_PE_RESOURCE_ID_HTML	0x17
+
+typedef struct {
+	/* If the MSB is set, then the other 31 bits store the RVA of
+	 * the unicode string containing the name.  Otherwise, the
+	 * other 31 bits contain the ID of this entry.
+	 */
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+	guint32 name_offset:31;
+	guint32 name_is_string:1;
+#else
+	guint32 name_is_string:1;
+	guint32 name_offset:31;
+#endif
+	
+	/* If the MSB is set, then the other 31 bits store the RVA of
+	 * another subdirectory.  Otherwise, the other 31 bits store
+	 * the RVA of the resource data entry leaf node.
+	 */
+#if G_BYTE_ORDER == G_LITTLE_ENDIAN
+	guint32 dir_offset:31;
+	guint32 is_dir:1;
+#else
+	guint32 is_dir:1;
+	guint32 dir_offset:31;
+#endif
+} MonoPEResourceDirEntry;
+
+typedef struct 
+{
+	guint32 res_characteristics;
+	guint32 res_date_stamp;
+	guint16 res_major;
+	guint16 res_minor;
+	guint16 res_named_entries;
+	guint16 res_id_entries;
+	/* Directory entries follow on here.  The array is
+	 * res_named_entries + res_id_entries long, containing all
+	 * named entries first.
+	 */
+} MonoPEResourceDir;
+
+typedef struct {
 	guint32 rva;
 	guint32 size;
 } MonoPEDirEntry;
diff --git a/mono/metadata/class.c b/mono/metadata/class.c
index 83234361d0a..e39982c4d49 100644
--- a/mono/metadata/class.c
+++ b/mono/metadata/class.c
@@ -28,42 +28,21 @@
 #include <mono/metadata/object.h>
 #include <mono/metadata/appdomain.h>
 #include <mono/metadata/mono-endian.h>
+#include <mono/metadata/debug-helpers.h>
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
 
 #define CSIZE(x) (sizeof (x) / 4)
 
+MonoStats mono_stats;
+
 gboolean mono_print_vtable = FALSE;
 
 static MonoClass * mono_class_create_from_typedef (MonoImage *image, guint32 type_token);
 
-static gpointer
-default_trampoline (MonoMethod *method)
-{
-	return method;
-}
-
-static void
-default_runtime_class_init (MonoClass *klass)
-{
-	return;
-}
-
-static MonoTrampoline arch_create_jit_trampoline = default_trampoline;
-static MonoRuntimeClassInit mono_runtime_class_init = default_runtime_class_init;
-
-void
-mono_install_trampoline (MonoTrampoline func) 
-{
-	arch_create_jit_trampoline = func? func: default_trampoline;
-}
-
-void
-mono_install_runtime_class_init (MonoRuntimeClassInit func)
-{
-	mono_runtime_class_init = func? func: default_runtime_class_init;
-}
-
-static MonoClass *
-mono_class_create_from_typeref (MonoImage *image, guint32 type_token)
+MonoClass *
+mono_class_from_typeref (MonoImage *image, guint32 type_token)
 {
 	guint32 cols [MONO_TYPEREF_SIZE];
 	MonoTableInfo  *t = &image->tables [MONO_TABLE_TYPEREF];
@@ -72,8 +51,34 @@ mono_class_create_from_typeref (MonoImage *image, guint32 type_token)
 	MonoClass *res;
 
 	mono_metadata_decode_row (t, (type_token&0xffffff)-1, cols, MONO_TYPEREF_SIZE);
-	g_assert ((cols [MONO_TYPEREF_SCOPE] & 0x3) == 2);
-	idx = cols [MONO_TYPEREF_SCOPE] >> 2;
+
+	name = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAME]);
+	nspace = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAMESPACE]);
+	
+	idx = cols [MONO_TYPEREF_SCOPE] >> RESOLTION_SCOPE_BITS;
+	switch (cols [MONO_TYPEREF_SCOPE] & RESOLTION_SCOPE_MASK) {
+	case RESOLTION_SCOPE_MODULE:
+		if (!idx)
+			g_error ("null ResolutionScope not yet handled");
+		/* a typedef in disguise */
+		return mono_class_from_name (image, nspace, name);
+	case RESOLTION_SCOPE_MODULEREF:
+		return mono_class_from_name (image->assembly->modules [idx - 1], nspace, name);
+	case RESOLTION_SCOPE_TYPEREF: {
+		MonoClass *enclosing = mono_class_from_typeref (image, MONO_TOKEN_TYPE_REF | idx);
+		GList *tmp;
+		mono_class_init (enclosing);
+		for (tmp = enclosing->nested_classes; tmp; tmp = tmp->next) {
+			res = tmp->data;
+			if (strcmp (res->name, name) == 0)
+				return res;
+		}
+		g_warning ("TypeRef ResolutionScope not yet handled (%d)", idx);
+		return NULL;
+	}
+	case RESOLTION_SCOPE_ASSEMBLYREF:
+		break;
+	}
 
 	if (!image->references ||  !image->references [idx-1]) {
 		/* 
@@ -90,15 +95,81 @@ mono_class_create_from_typeref (MonoImage *image, guint32 type_token)
 		return res;
 	}	
 
-	name = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAME]);
-	nspace = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAMESPACE]);
-	
 	/* load referenced assembly */
 	image = image->references [idx-1]->image;
 
 	return mono_class_from_name (image, nspace, name);
 }
 
+MonoMarshalType *
+mono_marshal_load_type_info (MonoClass* klass)
+{
+	int i, j, count = 0;
+	MonoMarshalType *info;
+	guint32 layout;
+
+	g_assert (klass != NULL);
+
+	if (klass->marshal_info)
+		return klass->marshal_info;
+
+	if (!klass->inited)
+		mono_class_init (klass);
+	
+	for (i = 0; i < klass->field.count; ++i) {
+		if (klass->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)
+			continue;
+		count++;
+	}
+
+	layout = klass->flags & TYPE_ATTRIBUTE_LAYOUT_MASK;
+
+	klass->marshal_info = info = g_malloc0 (sizeof (MonoMarshalType) + sizeof (MonoMarshalField) * count);
+	info->num_fields = count;
+	
+	if (klass->parent)
+		info->native_size = mono_class_native_size (klass->parent, NULL);
+
+	for (j = i = 0; i < klass->field.count; ++i) {
+		int size, align;
+		
+		if (klass->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)
+			continue;
+
+		if (klass->fields [i].type->attrs & FIELD_ATTRIBUTE_HAS_FIELD_MARSHAL)
+			mono_metadata_field_info (klass->image, klass->field.first + i, 
+						  NULL, NULL, &info->fields [j].mspec);
+
+		info->fields [j].field = &klass->fields [i];
+
+		switch (layout) {
+		case TYPE_ATTRIBUTE_AUTO_LAYOUT:
+		case TYPE_ATTRIBUTE_SEQUENTIAL_LAYOUT:
+			size = mono_marshal_type_size (klass->fields [i].type, info->fields [j].mspec, 
+						       &align, TRUE, klass->unicode);
+			align = klass->packing_size ? MIN (klass->packing_size, align): align;	
+			info->fields [j].offset = info->native_size;
+			info->fields [j].offset += align - 1;
+			info->fields [j].offset &= ~(align - 1);
+			info->native_size = info->fields [j].offset + size;
+			break;
+		case TYPE_ATTRIBUTE_EXPLICIT_LAYOUT:
+			/* FIXME: */
+			info->fields [j].offset = klass->fields [i].offset - sizeof (MonoObject);
+			info->native_size = klass->instance_size - sizeof (MonoObject);
+			break;
+		}	
+		j++;
+	}
+
+	if (info->native_size & (klass->min_align - 1)) {
+		info->native_size += klass->min_align - 1;
+		info->native_size &= ~(klass->min_align - 1);
+	}
+
+	return klass->marshal_info;
+}
+
 /** 
  * class_compute_field_layout:
  * @m: pointer to the metadata.
@@ -116,7 +187,37 @@ class_compute_field_layout (MonoClass *class)
 	const int top = class->field.count;
 	guint32 layout = class->flags & TYPE_ATTRIBUTE_LAYOUT_MASK;
 	MonoTableInfo *t = &m->tables [MONO_TABLE_FIELD];
-	int i;
+	int i, blittable = TRUE;
+	guint32 rva;
+	guint32 packing_size = 0;
+
+	if (class->size_inited)
+		return;
+
+	if (class->parent) {
+		if (!class->parent->size_inited)
+			class_compute_field_layout (class->parent);
+		class->instance_size += class->parent->instance_size;
+		class->class_size += class->parent->class_size;
+		class->min_align = class->parent->min_align;
+	} else {
+		class->instance_size = sizeof (MonoObject);
+		class->min_align = 1;
+	}
+
+	if (mono_metadata_packing_from_typedef (class->image, class->type_token, &packing_size, &class->instance_size)) {
+		class->instance_size += sizeof (MonoObject);
+	}
+
+	g_assert ((packing_size & 0xfffffff0) == 0);
+	class->packing_size = packing_size;
+
+	if (!top) {
+		class->size_inited = 1;
+		return;
+	}
+
+	class->fields = g_new0 (MonoClassField, top);
 
 	/*
 	 * Fetch all the field information.
@@ -135,50 +236,71 @@ class_compute_field_layout (MonoClass *class)
 		g_assert (*sig == 0x06);
 		class->fields [i].type = mono_metadata_parse_field_type (
 			m, cols [MONO_FIELD_FLAGS], sig + 1, &sig);
+
+		if (!(class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)) {
+			if (class->fields [i].type->byref) {
+				blittable = FALSE;
+			} else {
+				MonoClass *field_class = mono_class_from_mono_type (class->fields [i].type);
+				if (!field_class->blittable)
+					blittable = FALSE;
+			}
+		}
+
 		if (cols [MONO_FIELD_FLAGS] & FIELD_ATTRIBUTE_HAS_FIELD_RVA) {
-			mono_metadata_field_info (m, idx, NULL, &class->fields [i].data, NULL);
-			if (!class->fields [i].data)
+			mono_metadata_field_info (m, idx, NULL, &rva, NULL);
+			if (!rva)
 				g_warning ("field %s in %s should have RVA data, but hasn't", class->fields [i].name, class->name);
+			class->fields [i].data = mono_cli_rva_map (class->image->image_info, rva);
 		}
+
 		if (class->enumtype && !(cols [MONO_FIELD_FLAGS] & FIELD_ATTRIBUTE_STATIC)) {
 			class->enum_basetype = class->fields [i].type;
 			class->element_class = mono_class_from_mono_type (class->enum_basetype);
+			blittable = class->element_class->blittable;
 		}
 	}
+
+	if (class == mono_defaults.string_class)
+		blittable = FALSE;
+
+	class->blittable = blittable;
+
 	if (class->enumtype && !class->enum_basetype) {
 		if (!((strcmp (class->name, "Enum") == 0) && (strcmp (class->name_space, "System") == 0)))
 			G_BREAKPOINT ();
 	}
 	/*
-	 * Compute field layout and total size.
+	 * Compute field layout and total size (not considering static fields)
 	 */
-	switch (layout){
+	switch (layout) {
 	case TYPE_ATTRIBUTE_AUTO_LAYOUT:
 	case TYPE_ATTRIBUTE_SEQUENTIAL_LAYOUT:
 		for (i = 0; i < top; i++){
 			int size, align;
 			
+			if (class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)
+				continue;
+
 			size = mono_type_size (class->fields [i].type, &align);
-			if (class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC) {
-				class->fields [i].offset = class->class_size;
-				class->fields [i].offset += align - 1;
-				class->fields [i].offset &= ~(align - 1);
-				class->class_size = class->fields [i].offset + size;
-			} else {
-				class->min_align = MAX (align, class->min_align);
-				class->fields [i].offset = class->instance_size;
-				class->fields [i].offset += align - 1;
-				class->fields [i].offset &= ~(align - 1);
-				class->instance_size = class->fields [i].offset + size;
-			}
+			
+			/* FIXME (LAMESPEC): should we also change the min alignment according to pack? */
+			align = class->packing_size ? MIN (class->packing_size, align): align;
+			class->min_align = MAX (align, class->min_align);
+			class->fields [i].offset = class->instance_size;
+			class->fields [i].offset += align - 1;
+			class->fields [i].offset &= ~(align - 1);
+			class->instance_size = class->fields [i].offset + size;
+
 		}
+       
 		if (class->instance_size & (class->min_align - 1)) {
 			class->instance_size += class->min_align - 1;
 			class->instance_size &= ~(class->min_align - 1);
 		}
 		break;
 	case TYPE_ATTRIBUTE_EXPLICIT_LAYOUT:
-		for (i = 0; i < top; i++){
+		for (i = 0; i < top; i++) {
 			int size, align;
 			int idx = class->field.first + i;
 
@@ -187,27 +309,66 @@ class_compute_field_layout (MonoClass *class)
 			 * uses explicit layout.
 			 */
 
+			if (class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC)
+				continue;
+
 			size = mono_type_size (class->fields [i].type, &align);
-			if (class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC) {
-				class->fields [i].offset = class->class_size;
-				class->fields [i].offset += align - 1;
-				class->fields [i].offset &= ~(align - 1);
-				class->class_size = class->fields [i].offset + size;
-			} else {
-				mono_metadata_field_info (m, idx, &class->fields [i].offset, NULL, NULL);
-				if (class->fields [i].offset == (guint32)-1)
-						g_warning ("%s not initialized correctly (missing field layout info for %s)", class->name, class->fields [i].name);
-				/*
-				 * The offset is from the start of the object: this works for both
-				 * classes and valuetypes.
-				 */
-				class->fields [i].offset += sizeof (MonoObject);
-				/*
-				 * Calc max size.
-				 */
-				size += class->fields [i].offset;
-				class->instance_size = MAX (class->instance_size, size);
-			}
+			
+			mono_metadata_field_info (m, idx, &class->fields [i].offset, NULL, NULL);
+			if (class->fields [i].offset == (guint32)-1)
+				g_warning ("%s not initialized correctly (missing field layout info for %s)", class->name, class->fields [i].name);
+			/*
+			 * The offset is from the start of the object: this works for both
+			 * classes and valuetypes.
+			 */
+			class->fields [i].offset += sizeof (MonoObject);
+			/*
+			 * Calc max size.
+			 */
+			class->instance_size = MAX (class->instance_size, size + class->fields [i].offset);
+		}
+		break;
+	}
+
+	class->size_inited = 1;
+
+	/*
+	 * Compute static field layout and size
+	 */
+	switch (layout) {
+	case TYPE_ATTRIBUTE_AUTO_LAYOUT:
+	case TYPE_ATTRIBUTE_SEQUENTIAL_LAYOUT:
+		for (i = 0; i < top; i++){
+			int size, align;
+			
+			if (!(class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC))
+				continue;
+			
+			size = mono_type_size (class->fields [i].type, &align);
+			class->fields [i].offset = class->class_size;
+			class->fields [i].offset += align - 1;
+			class->fields [i].offset &= ~(align - 1);
+			class->class_size = class->fields [i].offset + size;
+		}
+		break;
+	case TYPE_ATTRIBUTE_EXPLICIT_LAYOUT:
+		for (i = 0; i < top; i++){
+			int size, align;
+
+			/*
+			 * There must be info about all the fields in a type if it
+			 * uses explicit layout.
+			 */
+
+			
+			if (!(class->fields [i].type->attrs & FIELD_ATTRIBUTE_STATIC))
+				continue;
+
+			size = mono_type_size (class->fields [i].type, &align);
+			class->fields [i].offset = class->class_size;
+			class->fields [i].offset += align - 1;
+			class->fields [i].offset &= ~(align - 1);
+			class->class_size = class->fields [i].offset + size;
 		}
 		break;
 	}
@@ -234,10 +395,10 @@ init_properties (MonoClass *class)
 		for (j = startm; j < endm; ++j) {
 			mono_metadata_decode_row (msemt, j, cols, MONO_METHOD_SEMA_SIZE);
 			switch (cols [MONO_METHOD_SEMA_SEMANTICS]) {
-			case 1: /* set */
+			case METHOD_SEMANTIC_SETTER:
 				class->properties [i - class->property.first].set = class->methods [cols [MONO_METHOD_SEMA_METHOD] - 1 - class->method.first];
 				break;
-			case 2: /* get */
+			case METHOD_SEMANTIC_GETTER:
 				class->properties [i - class->property.first].get = class->methods [cols [MONO_METHOD_SEMA_METHOD] - 1 - class->method.first];
 				break;
 			default:
@@ -247,6 +408,44 @@ init_properties (MonoClass *class)
 	}
 }
 
+static void
+init_events (MonoClass *class)
+{
+	guint startm, endm, i, j;
+	guint32 cols [MONO_EVENT_SIZE];
+	MonoTableInfo *pt = &class->image->tables [MONO_TABLE_EVENT];
+	MonoTableInfo *msemt = &class->image->tables [MONO_TABLE_METHODSEMANTICS];
+
+	class->event.first = mono_metadata_events_from_typedef (class->image, mono_metadata_token_index (class->type_token) - 1, &class->event.last);
+	class->event.count = class->event.last - class->event.first;
+
+	class->events = g_new0 (MonoEvent, class->event.count);
+	for (i = class->event.first; i < class->event.last; ++i) {
+		mono_metadata_decode_row (pt, i, cols, MONO_EVENT_SIZE);
+		class->events [i - class->event.first].attrs = cols [MONO_EVENT_FLAGS];
+		class->events [i - class->event.first].name = mono_metadata_string_heap (class->image, cols [MONO_EVENT_NAME]);
+
+		startm = mono_metadata_methods_from_event (class->image, i, &endm);
+		for (j = startm; j < endm; ++j) {
+			mono_metadata_decode_row (msemt, j, cols, MONO_METHOD_SEMA_SIZE);
+			switch (cols [MONO_METHOD_SEMA_SEMANTICS]) {
+			case METHOD_SEMANTIC_ADD_ON:
+				class->events [i - class->event.first].add = class->methods [cols [MONO_METHOD_SEMA_METHOD] - 1 - class->method.first];
+				break;
+			case METHOD_SEMANTIC_REMOVE_ON:
+				class->events [i - class->event.first].remove = class->methods [cols [MONO_METHOD_SEMA_METHOD] - 1 - class->method.first];
+				break;
+			case METHOD_SEMANTIC_FIRE:
+				class->events [i - class->event.first].raise = class->methods [cols [MONO_METHOD_SEMA_METHOD] - 1 - class->method.first];
+				break;
+			case METHOD_SEMANTIC_OTHER: /* don't care for now */
+			default:
+				break;
+			}
+		}
+	}
+}
+
 static guint
 mono_get_unique_iid (MonoClass *class)
 {
@@ -271,63 +470,31 @@ mono_get_unique_iid (MonoClass *class)
 		++iid;
 	}
 
-	g_free (str);
 	return iid - 1;
 }
 
-/**
- * mono_class_init:
- * @class: the class to initialize
- *
- * compute the instance_size, class_size and other infos that cannot be 
- * computed at mono_class_get() time. Also compute a generic vtable and 
- * the method slot numbers. We use this infos later to create a domain
- * specific vtable.  
- */
 void
-mono_class_init (MonoClass *class)
+mono_class_setup_vtable (MonoClass *class)
 {
 	MonoClass *k, *ic;
-	MonoMethod **vtable = class->vtable;
-	int i, max_iid, cur_slot = 0;
-
-	g_assert (class);
-
-	if (class->inited)
-		return;
-	class->inited = 1;
+	MonoMethod **vtable;
+	int i, onum = 0, max_vtsize = 0, max_iid, cur_slot = 0;
+	MonoMethod **overrides;
 
+	for (i = 0; i < class->interface_count; i++) 
+		max_vtsize += class->interfaces [i]->method.count;
+	
 	if (class->parent) {
-		if (!class->parent->inited)
-			mono_class_init (class->parent);
-		class->instance_size += class->parent->instance_size;
-		class->class_size += class->parent->class_size;
-		class->min_align = class->parent->min_align;
+		max_vtsize += class->parent->vtable_size;
 		cur_slot = class->parent->vtable_size;
-	} else
-		class->min_align = 1;
-
-	/*
-	 * Computes the size used by the fields, and their locations
-	 */
-	if (class->field.count > 0){
-		class->fields = g_new0 (MonoClassField, class->field.count);
-		class_compute_field_layout (class);
 	}
 
-	/* initialize method pointers */
-	class->methods = g_new (MonoMethod*, class->method.count);
-	for (i = 0; i < class->method.count; ++i)
-		class->methods [i] = mono_get_method (class->image,
-		        MONO_TOKEN_METHOD_DEF | (i + class->method.first + 1), class);
+	max_vtsize += class->method.count;
 
-	if (class->flags & TYPE_ATTRIBUTE_INTERFACE) {
-		for (i = 0; i < class->method.count; ++i)
-			class->methods [i]->slot = i;
-		return;
-	}
+	vtable = alloca (sizeof (gpointer) * max_vtsize);
+	memset (vtable, 0, sizeof (gpointer) * max_vtsize);
 
-	//printf ("METAINIT %s.%s\n", class->name_space, class->name);
+	/* printf ("METAINIT %s.%s\n", class->name_space, class->name); */
 
 	/* compute maximum number of slots and maximum interface id */
 	max_iid = 0;
@@ -363,7 +530,7 @@ mono_class_init (MonoClass *class)
 				int io = k->interface_offsets [ic->interface_id];
 
 				g_assert (io >= 0);
-				g_assert (io <= class->vtable_size);
+				g_assert (io <= max_vtsize);
 
 				class->interface_offsets [ic->interface_id] = io;
 			}
@@ -371,8 +538,21 @@ mono_class_init (MonoClass *class)
 	}
 
 	if (class->parent && class->parent->vtable_size)
-		memcpy (class->vtable, class->parent->vtable,  sizeof (gpointer) * class->parent->vtable_size);
- 
+		memcpy (vtable, class->parent->vtable,  sizeof (gpointer) * class->parent->vtable_size);
+
+	overrides = mono_class_get_overrides (class->image, class->type_token, &onum);
+
+	/* override interface methods */
+	for (i = 0; i < onum; i++) {
+		MonoMethod *decl = overrides [i*2];
+		if (decl->klass->flags & TYPE_ATTRIBUTE_INTERFACE) {
+			int dslot;
+			g_assert (decl->slot != -1);
+			dslot = decl->slot + class->interface_offsets [decl->klass->interface_id];
+			vtable [dslot] = overrides [i*2 + 1];
+		}
+	}
+
 	for (k = class; k ; k = k->parent) {
 		for (i = 0; i < k->interface_count; i++) {
 			int j, l, io;
@@ -381,7 +561,7 @@ mono_class_init (MonoClass *class)
 			io = k->interface_offsets [ic->interface_id];
 			
 			g_assert (io >= 0);
-			g_assert (io <= class->vtable_size);
+			g_assert (io <= max_vtsize);
 
 			if (k == class) {
 				for (l = 0; l < ic->method.count; l++) {
@@ -394,7 +574,7 @@ mono_class_init (MonoClass *class)
 							continue;
 						if (!strcmp(cm->name, im->name) && 
 						    mono_metadata_signature_equal (cm->signature, im->signature)) {
-							g_assert (io + l <= class->vtable_size);
+							g_assert (io + l <= max_vtsize);
 							vtable [io + l] = cm;
 						}
 					}
@@ -409,7 +589,7 @@ mono_class_init (MonoClass *class)
 				MonoMethod *im = ic->methods [l];						
 				MonoClass *k1;
 
-				g_assert (io + l <= class->vtable_size);
+				g_assert (io + l <= max_vtsize);
 
 				if (vtable [io + l])
 					continue;
@@ -424,13 +604,13 @@ mono_class_init (MonoClass *class)
 						
 						if (!strcmp(cm->name, im->name) && 
 						    mono_metadata_signature_equal (cm->signature, im->signature)) {
-							g_assert (io + l <= class->vtable_size);
+							g_assert (io + l <= max_vtsize);
 							vtable [io + l] = cm;
 							break;
 						}
 						
 					}
-					g_assert (io + l <= class->vtable_size);
+					g_assert (io + l <= max_vtsize);
 					if (vtable [io + l])
 						break;
 				}
@@ -438,11 +618,13 @@ mono_class_init (MonoClass *class)
 
 			for (l = 0; l < ic->method.count; l++) {
 				MonoMethod *im = ic->methods [l];						
-				char *qname;
+				char *qname, *fqname;
+				
+				qname = g_strconcat (ic->name, ".", im->name, NULL); 
 				if (ic->name_space && ic->name_space [0])
-					qname = g_strconcat (ic->name_space, ".", ic->name, ".", im->name, NULL);
+					fqname = g_strconcat (ic->name_space, ".", ic->name, ".", im->name, NULL);
 				else
-					qname = g_strconcat (ic->name, ".", im->name, NULL); 
+					fqname = NULL;
 
 				for (j = 0; j < class->method.count; ++j) {
 					MonoMethod *cm = class->methods [j];
@@ -450,29 +632,38 @@ mono_class_init (MonoClass *class)
 					if (!(cm->flags & METHOD_ATTRIBUTE_VIRTUAL))
 						continue;
 					
-					if (!strcmp (cm->name, qname) &&
+					if (((fqname && !strcmp (cm->name, fqname)) || !strcmp (cm->name, qname)) &&
 					    mono_metadata_signature_equal (cm->signature, im->signature)) {
-						g_assert (io + l <= class->vtable_size);
+						g_assert (io + l <= max_vtsize);
 						vtable [io + l] = cm;
 						break;
 					}
 				}
 				g_free (qname);
+				g_free (fqname);
 			}
 
 			
 			if (!(class->flags & TYPE_ATTRIBUTE_ABSTRACT)) {
 				for (l = 0; l < ic->method.count; l++) {
+					char *msig;
 					MonoMethod *im = ic->methods [l];						
-					g_assert (io + l <= class->vtable_size);
+					g_assert (io + l <= max_vtsize);
 					if (!(vtable [io + l])) {
-						printf ("no implementation for interface method %s.%s::%s in class %s.%s\n",
-							ic->name_space, ic->name, im->name, class->name_space, class->name);
-						
+						for (j = 0; j < onum; ++j) {
+							g_print (" at slot %d: %s (%d) overrides %s (%d)\n", io+l, overrides [j*2+1]->name, 
+								 overrides [j*2+1]->slot, overrides [j*2]->name, overrides [j*2]->slot);
+						}
+						msig = mono_signature_get_desc (im->signature, FALSE);
+						printf ("no implementation for interface method %s.%s::%s(%s) in class %s.%s\n",
+							ic->name_space, ic->name, im->name, msig, class->name_space, class->name);
+						g_free (msig);
 						for (j = 0; j < class->method.count; ++j) {
 							MonoMethod *cm = class->methods [j];
+							msig = mono_signature_get_desc (cm->signature, FALSE);
 							
-							printf ("METHOD %s\n", cm->name);
+							printf ("METHOD %s(%s)\n", cm->name, msig);
+							g_free (msig);
 						}
 						g_assert_not_reached ();
 					}
@@ -483,11 +674,11 @@ mono_class_init (MonoClass *class)
 				MonoMethod *im = vtable [io + l];
 
 				if (im) {
-					g_assert (io + l <= class->vtable_size);
+					g_assert (io + l <= max_vtsize);
 					if (im->slot < 0) {
-						// fixme: why do we need this ?
+						/* FIXME: why do we need this ? */
 						im->slot = io + l;
-						// g_assert_not_reached ();
+						/* g_assert_not_reached (); */
 					}
 				}
 			}
@@ -499,11 +690,17 @@ mono_class_init (MonoClass *class)
 	       
 		cm = class->methods [i];
 
+		
+#if 0
 		if (!(cm->flags & METHOD_ATTRIBUTE_VIRTUAL) ||
 		    (cm->slot >= 0))
 			continue;
-		
-		if (!(cm->flags & METHOD_ATTRIBUTE_NEW_SLOT)) {
+#else  /* EXT_VTABLE_HACK */
+		if (cm->slot >= 0)
+			continue;
+#endif
+
+		if (!(cm->flags & METHOD_ATTRIBUTE_NEW_SLOT) && (cm->flags & METHOD_ATTRIBUTE_VIRTUAL)) {
 			for (k = class->parent; k ; k = k->parent) {
 				int j;
 				for (j = 0; j < k->method.count; ++j) {
@@ -513,7 +710,7 @@ mono_class_init (MonoClass *class)
 					if (!strcmp(cm->name, m1->name) && 
 					    mono_metadata_signature_equal (cm->signature, m1->signature)) {
 						cm->slot = k->methods [j]->slot;
-						g_assert (cm->slot < class->vtable_size);
+						g_assert (cm->slot < max_vtsize);
 						break;
 					}
 				}
@@ -529,19 +726,20 @@ mono_class_init (MonoClass *class)
 			vtable [cm->slot] = cm;
 	}
 
-	init_properties (class);
-
-	i = mono_metadata_nesting_typedef (class->image, class->type_token);
-	while (i) {
-		MonoClass* nclass;
-		guint32 cols [MONO_NESTED_CLASS_SIZE];
-		mono_metadata_decode_row (&class->image->tables [MONO_TABLE_NESTEDCLASS], i - 1, cols, MONO_NESTED_CLASS_SIZE);
-		if (cols [MONO_NESTED_CLASS_ENCLOSING] != mono_metadata_token_index (class->type_token))
-			break;
-		nclass = mono_class_create_from_typedef (class->image, MONO_TOKEN_TYPE_DEF | cols [MONO_NESTED_CLASS_NESTED]);
-		class->nested_classes = g_list_prepend (class->nested_classes, nclass);
-		++i;
+	/* override non interface methods */
+	for (i = 0; i < onum; i++) {
+		MonoMethod *decl = overrides [i*2];
+		if (!(decl->klass->flags & TYPE_ATTRIBUTE_INTERFACE)) {
+			g_assert (decl->slot != -1);
+			vtable [decl->slot] = overrides [i*2 + 1];
+		}
 	}
+       
+	g_free (overrides);
+
+	class->vtable_size = cur_slot;
+	class->vtable = g_malloc0 (sizeof (gpointer) * class->vtable_size);
+	memcpy (class->vtable, vtable,  sizeof (gpointer) * class->vtable_size);
 
 	if (mono_print_vtable) {
 		int icount = 0;
@@ -586,141 +784,137 @@ mono_class_init (MonoClass *class)
 			}
 		}
 	}
+
 }
 
 /**
- * mono_class_vtable:
- * @domain: the application domain
+ * mono_class_init:
  * @class: the class to initialize
  *
- * VTables are domain specific because we create domain specific code, and 
- * they contain the domain specific static class data.
+ * compute the instance_size, class_size and other infos that cannot be 
+ * computed at mono_class_get() time. Also compute a generic vtable and 
+ * the method slot numbers. We use this infos later to create a domain
+ * specific vtable.  
  */
-MonoVTable *
-mono_class_vtable (MonoDomain *domain, MonoClass *class)
+void
+mono_class_init (MonoClass *class)
 {
-	MonoClass *k;
-	MonoVTable *vt;
-	MonoClassField *field;
-	guint32 cindex;
-	guint32 cols [MONO_CONSTANT_SIZE];
-	const char *p;
-	char *t;
 	int i;
+	static MonoMethod *default_ghc = NULL;
+	static MonoMethod *default_finalize = NULL;
+	static int finalize_slot = -1;
+	static int ghc_slot = -1;
 
 	g_assert (class);
 
-	/* can interfaces have static fields? */
-	if (class->flags & TYPE_ATTRIBUTE_INTERFACE)
-		g_assert_not_reached ();
+	if (class->inited)
+		return;
 
-	if ((vt = g_hash_table_lookup (domain->class_vtable_hash, class)))
-		return vt;
-	
-	if (!class->inited)
-		mono_class_init (class);
-		
-	vt = g_malloc0 (sizeof (MonoVTable) + class->vtable_size * sizeof (gpointer));
-	vt->klass = class;
-	vt->domain = domain;
-
-	if (class->class_size) {
-		vt->data = g_malloc0 (class->class_size + 8);
-		/* align: fixme not 64 bit clean */
-		if (((guint32)vt->data) & 0x7)
-			vt->data += 8 - (((guint32)vt->data) & 0x7);
+	if (class->init_pending) {
+		/* this indicates a cyclic dependency */
+		g_error ("pending init %s.%s\n", class->name_space, class->name);
 	}
 
-	for (i = class->field.first; i < class->field.last; ++i) {
-		field = &class->fields [i - class->field.first];
-		if (!(field->type->attrs & FIELD_ATTRIBUTE_STATIC))
-			continue;
-		if (!(field->type->attrs & FIELD_ATTRIBUTE_HAS_DEFAULT))
-			continue;
-		cindex = mono_metadata_get_constant_index (class->image, MONO_TOKEN_FIELD_DEF | (i + 1));
-		if (!cindex) {
-			g_warning ("constant for field %s not found", field->name);
-			continue;
-		}
-		mono_metadata_decode_row (&class->image->tables [MONO_TABLE_CONSTANT], cindex - 1, cols, MONO_CONSTANT_SIZE);
-		p = mono_metadata_blob_heap (class->image, cols [MONO_CONSTANT_VALUE]);
-		mono_metadata_decode_blob_size (p, &p);
-		t = (char*)vt->data + field->offset;
-		/* should we check that the type matches? */
-		switch (cols [MONO_CONSTANT_TYPE]) {
-		case MONO_TYPE_BOOLEAN:
-		case MONO_TYPE_U1:
-		case MONO_TYPE_I1:
-			*t = *p;
-			break;
-		case MONO_TYPE_CHAR:
-		case MONO_TYPE_U2:
-		case MONO_TYPE_I2: {
-			guint16 *val = (guint16*)t;
-			*val = read16 (p);
-			break;
-		}
-		case MONO_TYPE_U4:
-		case MONO_TYPE_I4: {
-			guint32 *val = (guint32*)t;
-			*val = read32 (p);
-			break;
-		}
-		case MONO_TYPE_U8:
-		case MONO_TYPE_I8: {
-			guint64 *val = (guint64*)t;
-			*val = read64 (p);
-			break;
-		}
-		case MONO_TYPE_R4: {
-			float *val = (float*)t;
-			readr4 (p, val);
-			break;
-		}
-		case MONO_TYPE_R8: {
-			double *val = (double*)t;
-			readr8 (p, val);
-			break;
-		}
-		case MONO_TYPE_STRING: {
-			g_warning ("we don't handle strings in constant table");
-			break;
-		}
-		case MONO_TYPE_CLASS:
-			/* nothing to do, we malloc0 the data and the value can be 0 only */
+	class->init_pending = 1;
+
+	mono_stats.initialized_class_count++;
+
+	if (class->parent && !class->parent->inited)
+		mono_class_init (class->parent);
+
+	/*
+	 * Computes the size used by the fields, and their locations
+	 */
+	if (!class->size_inited)
+		class_compute_field_layout (class);
+
+	/* initialize method pointers */
+	class->methods = g_new (MonoMethod*, class->method.count);
+	for (i = 0; i < class->method.count; ++i)
+		class->methods [i] = mono_get_method (class->image,
+		        MONO_TOKEN_METHOD_DEF | (i + class->method.first + 1), class);
+
+	init_properties (class);
+	init_events (class);
+
+	i = mono_metadata_nesting_typedef (class->image, class->type_token);
+	while (i) {
+		MonoClass* nclass;
+		guint32 cols [MONO_NESTED_CLASS_SIZE];
+		mono_metadata_decode_row (&class->image->tables [MONO_TABLE_NESTEDCLASS], i - 1, cols, MONO_NESTED_CLASS_SIZE);
+		if (cols [MONO_NESTED_CLASS_ENCLOSING] != mono_metadata_token_index (class->type_token))
 			break;
-		default:
-			g_warning ("type 0x%02x should not be in constant table", cols [MONO_CONSTANT_TYPE]);
-		}
+		nclass = mono_class_create_from_typedef (class->image, MONO_TOKEN_TYPE_DEF | cols [MONO_NESTED_CLASS_NESTED]);
+		class->nested_classes = g_list_prepend (class->nested_classes, nclass);
+		++i;
 	}
 
-	vt->interface_offsets = g_malloc0 (sizeof (gpointer) * (class->max_interface_id + 1));
+	if (class->flags & TYPE_ATTRIBUTE_INTERFACE) {
+		for (i = 0; i < class->method.count; ++i)
+			class->methods [i]->slot = i;
+		class->init_pending = 0;
+		class->inited = 1;
+		return;
+	}
 
-	/* initialize interface offsets */
-	for (k = class; k ; k = k->parent) {
-		for (i = 0; i < k->interface_count; i++) {
-			int slot;
-			MonoClass *ic = k->interfaces [i];
-			slot = class->interface_offsets [ic->interface_id];
-			vt->interface_offsets [ic->interface_id] = &vt->vtable [slot];
+	mono_class_setup_vtable (class);
+
+	class->inited = 1;
+	class->init_pending = 0;
+
+	if (!default_ghc) {
+		if (class == mono_defaults.object_class) { 
+		       
+			for (i = 0; i < class->vtable_size; ++i) {
+				MonoMethod *cm = class->vtable [i];
+	       
+				if (!strcmp (cm->name, "GetHashCode")) {
+					ghc_slot = i;
+					break;
+				}
+			}
+
+			g_assert (ghc_slot > 0);
+
+			default_ghc = class->vtable [ghc_slot];
 		}
 	}
+	
+	class->ghcimpl = 1;
+	if (class != mono_defaults.object_class) { 
 
-	/* initialize vtable */
-	for (i = 0; i < class->vtable_size; ++i) {
-		MonoMethod *cm;
-	       
-		if ((cm = class->vtable [i]))
-			vt->vtable [i] = arch_create_jit_trampoline (cm);
+		if (class->vtable [ghc_slot] == default_ghc) {
+			class->ghcimpl = 0;
+		}
 	}
 
-	g_hash_table_insert (domain->class_vtable_hash, class, vt);
+	if (!default_finalize) {
+		if (class == mono_defaults.object_class) { 
+		       
+			for (i = 0; i < class->vtable_size; ++i) {
+				MonoMethod *cm = class->vtable [i];
+	       
+				if (!strcmp (cm->name, "Finalize")) {
+					finalize_slot = i;
+					break;
+				}
+			}
+
+			g_assert (finalize_slot > 0);
 
-	mono_runtime_class_init (class);
+			default_finalize = class->vtable [finalize_slot];
+		}
+	}
 
-	return vt;
+	/* Object::Finalize should have empty implemenatation */
+	class->has_finalize = 0;
+	if (class != mono_defaults.object_class) { 
+		if (class->vtable [finalize_slot] != default_finalize)
+			class->has_finalize = 1;
+	}
 }
 
+
 /*
  * Compute a relative numbering of the class hierarchy as described in
  * "Java for Large-Scale Scientific Computations?"
@@ -740,12 +934,18 @@ mono_compute_relative_numbering (MonoClass *class, int *c)
 	class->diffval = *c -  class->baseval;
 }
 
-static void
+void
 mono_class_setup_mono_type (MonoClass *class)
 {
 	const char *name = class->name;
 	const char *nspace = class->name_space;
 
+	class->this_arg.byref = 1;
+	class->this_arg.data.klass = class;
+	class->this_arg.type = MONO_TYPE_CLASS;
+	class->byval_arg.data.klass = class;
+	class->byval_arg.type = MONO_TYPE_CLASS;
+
 	if (!strcmp (nspace, "System")) {
 		if (!strcmp (name, "ValueType")) {
 			/*
@@ -775,6 +975,7 @@ mono_class_setup_mono_type (MonoClass *class)
 					t = MONO_TYPE_BOOLEAN;
 				} else if (!strcmp(name, "Byte")) {
 					t = MONO_TYPE_U1;
+					class->blittable = TRUE;						
 				}
 				break;
 			case 'C':
@@ -785,35 +986,46 @@ mono_class_setup_mono_type (MonoClass *class)
 			case 'D':
 				if (!strcmp (name, "Double")) {
 					t = MONO_TYPE_R8;
+					class->blittable = TRUE;						
 				}
 				break;
 			case 'I':
 				if (!strcmp (name, "Int32")) {
 					t = MONO_TYPE_I4;
+					class->blittable = TRUE;
 				} else if (!strcmp(name, "Int16")) {
 					t = MONO_TYPE_I2;
+					class->blittable = TRUE;
 				} else if (!strcmp(name, "Int64")) {
 					t = MONO_TYPE_I8;
+					class->blittable = TRUE;
 				} else if (!strcmp(name, "IntPtr")) {
 					t = MONO_TYPE_I;
+					class->blittable = TRUE;
 				}
 				break;
 			case 'S':
 				if (!strcmp (name, "Single")) {
 					t = MONO_TYPE_R4;
+					class->blittable = TRUE;						
 				} else if (!strcmp(name, "SByte")) {
 					t = MONO_TYPE_I1;
+					class->blittable = TRUE;
 				}
 				break;
 			case 'U':
 				if (!strcmp (name, "UInt32")) {
 					t = MONO_TYPE_U4;
+					class->blittable = TRUE;
 				} else if (!strcmp(name, "UInt16")) {
 					t = MONO_TYPE_U2;
+					class->blittable = TRUE;
 				} else if (!strcmp(name, "UInt64")) {
 					t = MONO_TYPE_U8;
+					class->blittable = TRUE;
 				} else if (!strcmp(name, "UIntPtr")) {
 					t = MONO_TYPE_U;
+					class->blittable = TRUE;
 				}
 				break;
 			case 'V':
@@ -829,6 +1041,62 @@ mono_class_setup_mono_type (MonoClass *class)
 	}
 }
 
+void
+mono_class_setup_parent (MonoClass *class, MonoClass *parent)
+{
+	gboolean system_namespace;
+
+	system_namespace = !strcmp (class->name_space, "System");
+
+	/* if root of the hierarchy */
+	if (system_namespace && !strcmp (class->name, "Object")) {
+		class->parent = NULL;
+		class->instance_size = sizeof (MonoObject);
+		return;
+	}
+	if (!strcmp (class->name, "<Module>")) {
+		class->parent = NULL;
+		class->instance_size = 0;
+		return;
+	}
+
+	if (!(class->flags & TYPE_ATTRIBUTE_INTERFACE)) {
+		int rnum = 0;
+		class->parent = parent;
+
+		if (!parent)
+			g_assert_not_reached (); /* FIXME */
+
+		class->marshalbyref = parent->marshalbyref;
+		class->contextbound  = parent->contextbound;
+		class->delegate  = parent->delegate;
+		
+		if (system_namespace) {
+			if (*class->name == 'M' && !strcmp (class->name, "MarshalByRefObject"))
+				class->marshalbyref = 1;
+
+			if (*class->name == 'C' && !strcmp (class->name, "ContextBoundObject")) 
+				class->contextbound  = 1;
+
+			if (*class->name == 'D' && !strcmp (class->name, "Delegate")) 
+				class->delegate  = 1;
+		}
+
+		if (class->parent->enumtype || ((strcmp (class->parent->name, "ValueType") == 0) && 
+						(strcmp (class->parent->name_space, "System") == 0)))
+			class->valuetype = 1;
+		if (((strcmp (class->parent->name, "Enum") == 0) && (strcmp (class->parent->name_space, "System") == 0))) {
+			class->valuetype = class->enumtype = 1;
+		}
+		/*class->enumtype = class->parent->enumtype; */
+		class->parent->subclasses = g_list_prepend (class->parent->subclasses, class);
+		mono_compute_relative_numbering (mono_defaults.object_class, &rnum);
+	} else {
+		class->parent = NULL;
+	}
+
+}
+
 /**
  * @image: context where the image is created
  * @type_token:  typedef token
@@ -842,84 +1110,49 @@ mono_class_create_from_typedef (MonoImage *image, guint32 type_token)
 	guint32 cols_next [MONO_TYPEDEF_SIZE];
 	guint tidx = mono_metadata_token_index (type_token);
 	const char *name, *nspace;
-	guint vtsize = 0, icount = 0; 
+	guint icount = 0; 
 	MonoClass **interfaces;
-	int i;
 
-	if ((class = g_hash_table_lookup (image->class_cache, GUINT_TO_POINTER (type_token))))
+	if ((class = g_hash_table_lookup (image->class_cache, GUINT_TO_POINTER (type_token)))) 
 		return class;
 
 	g_assert (mono_metadata_token_table (type_token) == MONO_TABLE_TYPEDEF);
 	
-	mono_metadata_decode_row (tt, tidx - 1, cols, CSIZE (cols));
+	mono_metadata_decode_row (tt, tidx - 1, cols, MONO_TYPEDEF_SIZE);
 	
-	if (tt->rows > tidx) {		
-		mono_metadata_decode_row (tt, tidx, cols_next, CSIZE (cols_next));
-		vtsize += cols_next [MONO_TYPEDEF_METHOD_LIST] - cols [MONO_TYPEDEF_METHOD_LIST];
-	} else {
-		vtsize += image->tables [MONO_TABLE_METHOD].rows - cols [MONO_TYPEDEF_METHOD_LIST] + 1;
-	}
-
-	name = mono_metadata_string_heap (image, cols[1]);
-	nspace = mono_metadata_string_heap (image, cols[2]);
+	name = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAME]);
+	nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
 
-	if (!(!strcmp (nspace, "System") && !strcmp (name, "Object")) &&
-	    !(cols [0] & TYPE_ATTRIBUTE_INTERFACE)) {
-		parent = mono_class_get (image, mono_metadata_token_from_dor (cols [3]));
-	}
+	if (cols [MONO_TYPEDEF_EXTENDS])
+		parent = mono_class_get (image, mono_metadata_token_from_dor (cols [MONO_TYPEDEF_EXTENDS]));
 	interfaces = mono_metadata_interfaces_from_typedef (image, type_token, &icount);
 
-	for (i = 0; i < icount; i++) 
-		vtsize += interfaces [i]->method.count;
-	
-	if (parent)
-		vtsize += parent->vtable_size;
-
-	if (cols [0] & TYPE_ATTRIBUTE_INTERFACE)
-		vtsize = 0;
-
-	class = g_malloc0 (sizeof (MonoClass) + vtsize * sizeof (gpointer));
-	
+	class = g_malloc0 (sizeof (MonoClass));
+			   
 	g_hash_table_insert (image->class_cache, GUINT_TO_POINTER (type_token), class);
 
-	class->parent = parent;
 	class->interfaces = interfaces;
 	class->interface_count = icount;
-	class->vtable_size = vtsize;
-
-	class->this_arg.byref = 1;
-	class->this_arg.data.klass = class;
-	class->this_arg.type = MONO_TYPE_CLASS;
-	class->byval_arg.data.klass = class;
-	class->byval_arg.type = MONO_TYPE_CLASS;
 
 	class->name = name;
 	class->name_space = nspace;
 
 	class->image = image;
 	class->type_token = type_token;
-	class->flags = cols [0];
+	class->flags = cols [MONO_TYPEDEF_FLAGS];
+
+	if ((class->flags & TYPE_ATTRIBUTE_STRING_FORMAT_MASK) == TYPE_ATTRIBUTE_UNICODE_CLASS)
+		class->unicode = 1;
+	/* fixme: maybe we must set this on windows 
+	if ((class->flags & TYPE_ATTRIBUTE_STRING_FORMAT_MASK) == TYPE_ATTRIBUTE_AUTO_CLASS)
+		class->unicode = 1;
+	*/
 
 	class->element_class = class;
 
 	/*g_print ("Init class %s\n", name);*/
 
-	/* if root of the hierarchy */
-	if (!strcmp (nspace, "System") && !strcmp (name, "Object")) {
-		class->parent = NULL;
-		class->instance_size = sizeof (MonoObject);
-	} else if (!(cols [0] & TYPE_ATTRIBUTE_INTERFACE)) {
-		int rnum = 0;
-		class->parent = mono_class_get (image,  mono_metadata_token_from_dor (cols [3]));
-		if (class->parent->enumtype || ((strcmp (class->parent->name, "ValueType") == 0) && (strcmp (class->parent->name_space, "System") == 0)))
-			class->valuetype = 1;
-		if (((strcmp (class->parent->name, "Enum") == 0) && (strcmp (class->parent->name_space, "System") == 0))) {
-			class->valuetype = class->enumtype = 1;
-		}
-		//class->enumtype = class->parent->enumtype;
-		class->parent->subclasses = g_list_prepend (class->parent->subclasses, class);
-		mono_compute_relative_numbering (mono_defaults.object_class, &rnum);
-	}
+	mono_class_setup_parent (class, parent);
 
 	mono_class_setup_mono_type (class);
 
@@ -958,18 +1191,19 @@ mono_class_create_from_typedef (MonoImage *image, guint32 type_token)
 	if (class->flags & TYPE_ATTRIBUTE_INTERFACE)
 		class->interface_id = mono_get_unique_iid (class);
 
-	//class->interfaces = mono_metadata_interfaces_from_typedef (image, type_token, &class->interface_count);
+	/*class->interfaces = mono_metadata_interfaces_from_typedef (image, type_token, &class->interface_count); */
 
 	if (class->enumtype)
-		mono_class_init (class);
+		class_compute_field_layout (class);
 
 	if ((type_token = mono_metadata_nested_in_typedef (image, type_token)))
 		class->nested_in = mono_class_create_from_typedef (image, type_token);
+
 	return class;
 }
 
-static MonoClass *
-mono_create_ptr_class (MonoType *type)
+MonoClass *
+mono_ptr_class_get (MonoType *type)
 {
 	MonoClass *result;
 	MonoClass *el_class;
@@ -985,7 +1219,7 @@ mono_create_ptr_class (MonoType *type)
 	result->parent = NULL; /* no parent for PTR types */
 	result->name = "System";
 	result->name_space = "MonoPtrFakeClass";
-	result->image = NULL;
+	result->image = el_class->image;
 	result->inited = TRUE;
 	/* Can pointers get boxed? */
 	result->instance_size = sizeof (gpointer);
@@ -1043,11 +1277,11 @@ mono_class_from_mono_type (MonoType *type)
 	case MONO_TYPE_STRING:
 		return mono_defaults.string_class;
 	case MONO_TYPE_ARRAY:
-		return mono_array_class_get (mono_class_from_mono_type (type->data.array->type), type->data.array->rank);
+		return mono_array_class_get (type->data.array->type, type->data.array->rank);
 	case MONO_TYPE_PTR:
-		return mono_create_ptr_class (type->data.type);
+		return mono_ptr_class_get (type->data.type);
 	case MONO_TYPE_SZARRAY:
-		return mono_array_class_get (mono_class_from_mono_type (type->data.type), 1);
+		return mono_array_class_get (type->data.type, 1);
 	case MONO_TYPE_CLASS:
 	case MONO_TYPE_VALUETYPE:
 		return type->data.klass;
@@ -1067,25 +1301,24 @@ static MonoClass *
 mono_class_create_from_typespec (MonoImage *image, guint32 type_spec)
 {
 	MonoType *type;
-	MonoClass *class, *eclass;
+	MonoClass *class;
 
 	type = mono_type_create_from_typespec (image, type_spec);
 
 	switch (type->type) {
 	case MONO_TYPE_ARRAY:
-		eclass = mono_class_from_mono_type (type->data.array->type);
-		class = mono_array_class_get (eclass, type->data.array->rank);
+		class = mono_array_class_get (type->data.array->type, type->data.array->rank);
 		break;
 	case MONO_TYPE_SZARRAY:
-		eclass = mono_class_from_mono_type (type->data.type);
-		class = mono_array_class_get (eclass, 1);
+		class = mono_array_class_get (type->data.type, 1);
 		break;
 	case MONO_TYPE_PTR:
 		class = mono_class_from_mono_type (type->data.type);
 		break;
 	default:
-		g_warning ("implement me: %08x", type->type);
-		g_assert_not_reached ();		
+		/* it seems any type can be stored in TypeSpec as well */
+		class = mono_class_from_mono_type (type);
+		break;
 	}
 
 	mono_metadata_free_type (type);
@@ -1095,43 +1328,52 @@ mono_class_create_from_typespec (MonoImage *image, guint32 type_spec)
 
 /**
  * mono_array_class_get:
- * @eclass: element type class
+ * @element_type: element type 
  * @rank: the dimension of the array class
  *
- * Returns: a class object describing the array with element type @etype and 
+ * Returns: a class object describing the array with element type @element_type and 
  * dimension @rank. 
  */
 MonoClass *
-mono_array_class_get (MonoClass *eclass, guint32 rank)
+mono_array_class_get (MonoType *element_type, guint32 rank)
 {
+	MonoClass *eclass;
 	MonoImage *image;
 	MonoClass *class;
-	static MonoClass *parent = NULL;
-	guint32 key;
-	int rnum = 0;
+	MonoClass *parent = NULL;
+	GSList *list;
+	int rnum = 0, nsize;
 
+	eclass = mono_class_from_mono_type (element_type);
 	g_assert (rank <= 255);
 
-	if (!parent)
-		parent = mono_defaults.array_class;
+	parent = mono_defaults.array_class;
 
 	if (!parent->inited)
 		mono_class_init (parent);
 
 	image = eclass->image;
 
-	g_assert (!eclass->type_token ||
-		  mono_metadata_token_table (eclass->type_token) == MONO_TABLE_TYPEDEF);
-
-	key = ((rank & 0xff) << 24) | (eclass->type_token & 0xffffff);
-	if ((class = g_hash_table_lookup (image->array_cache, GUINT_TO_POINTER (key))))
-		return class;
+	if ((list = g_hash_table_lookup (image->array_cache, element_type))) {
+		for (; list; list = list->next) {
+			class = list->data;
+			if (class->rank == rank)
+				return class;
+		}
+	}
 	
 	class = g_malloc0 (sizeof (MonoClass) + parent->vtable_size * sizeof (gpointer));
 
 	class->image = image;
-	class->name_space = "System";
-	class->name = "Array";
+	class->name_space = eclass->name_space;
+	nsize = strlen (eclass->name);
+	class->name = g_malloc (nsize + 2 + rank);
+	memcpy (class->name, eclass->name, nsize);
+	class->name [nsize] = '[';
+	if (rank > 1)
+		memset (class->name + nsize + 1, ',', rank - 1);
+	class->name [nsize + rank] = ']';
+	class->name [nsize + rank + 1] = 0;
 	class->type_token = 0;
 	class->flags = TYPE_ATTRIBUTE_CLASS;
 	class->parent = parent;
@@ -1144,16 +1386,22 @@ mono_array_class_get (MonoClass *eclass, guint32 rank)
 	class->rank = rank;
 	class->element_class = eclass;
 	if (rank > 1) {
+		MonoArrayType *at = g_new0 (MonoArrayType, 1);
 		class->byval_arg.type = MONO_TYPE_ARRAY;
+		class->byval_arg.data.array = at;
+		at->type = &eclass->byval_arg;
+		at->rank = rank;
 		/* FIXME: complete.... */
 	} else {
+		/* FIXME: this is not correct. the lbound could be >0 */
 		class->byval_arg.type = MONO_TYPE_SZARRAY;
 		class->byval_arg.data.type = &eclass->byval_arg;
 	}
 	class->this_arg = class->byval_arg;
 	class->this_arg.byref = 1;
-	
-	g_hash_table_insert (image->array_cache, GUINT_TO_POINTER (key), class);
+
+	list = g_slist_append (list, class);
+	g_hash_table_insert (image->array_cache, &class->element_class->byval_arg, list);
 	return class;
 }
 
@@ -1167,13 +1415,49 @@ gint32
 mono_class_instance_size (MonoClass *klass)
 {
 	
-	if (!klass->inited)
+	if (!klass->size_inited)
 		mono_class_init (klass);
 
 	return klass->instance_size;
 }
 
 /**
+ * mono_class_native_size:
+ * @klass: a class 
+ * 
+ * Returns: the native size of an object instance (when marshaled 
+ * to unmanaged code) 
+ */
+gint32
+mono_class_native_size (MonoClass *klass, guint32 *align)
+{
+	
+	if (!klass->marshal_info)
+		mono_marshal_load_type_info (klass);
+
+	if (align)
+		*align = klass->min_align;
+
+	return klass->marshal_info->native_size;
+}
+
+/**
+ * mono_class_min_align:
+ * @klass: a class 
+ * 
+ * Returns: minimm alignment requirements 
+ */
+gint32
+mono_class_min_align (MonoClass *klass)
+{
+	
+	if (!klass->size_inited)
+		mono_class_init (klass);
+
+	return klass->min_align;
+}
+
+/**
  * mono_class_value_size:
  * @klass: a class 
  *
@@ -1260,9 +1544,27 @@ mono_class_get_field_from_name (MonoClass *klass, const char *name)
 {
 	int i;
 
-	for (i = 0; i < klass->field.count; ++i) {
-		if (strcmp (name, klass->fields [i].name) == 0)
-			return &klass->fields [i];
+	while (klass) {
+		for (i = 0; i < klass->field.count; ++i) {
+			if (strcmp (name, klass->fields [i].name) == 0)
+				return &klass->fields [i];
+		}
+		klass = klass->parent;
+	}
+	return NULL;
+}
+
+MonoProperty*
+mono_class_get_property_from_name (MonoClass *klass, const char *name)
+{
+	int i;
+
+	while (klass) {
+		for (i = 0; i < klass->property.count; ++i) {
+			if (strcmp (name, klass->properties [i].name) == 0)
+				return &klass->properties [i];
+		}
+		klass = klass->parent;
 	}
 	return NULL;
 }
@@ -1285,7 +1587,8 @@ mono_class_get (MonoImage *image, guint32 type_token)
 		class = mono_class_create_from_typedef (image, type_token);
 		break;		
 	case MONO_TOKEN_TYPE_REF:
-		return mono_class_create_from_typeref (image, type_token);
+		class = mono_class_from_typeref (image, type_token);
+		break;
 	case MONO_TOKEN_TYPE_SPEC:
 		class = mono_class_create_from_typespec (image, type_token);
 		break;
@@ -1294,10 +1597,37 @@ mono_class_get (MonoImage *image, guint32 type_token)
 		g_assert_not_reached ();
 	}
 
+	if (!class)
+		g_warning ("Could not load class from token 0x%08x in %s", type_token, image->name);
+
 	return class;
 }
 
 MonoClass *
+mono_class_from_name_case (MonoImage *image, const char* name_space, const char *name)
+{
+	MonoTableInfo  *t = &image->tables [MONO_TABLE_TYPEDEF];
+	guint32 cols [MONO_TYPEDEF_SIZE];
+	const char *n;
+	const char *nspace;
+	guint32 i, visib;
+
+	/* add a cache if needed */
+	for (i = 1; i <= t->rows; ++i) {
+		mono_metadata_decode_row (t, i - 1, cols, MONO_TYPEDEF_SIZE);
+		/* nested types are accessed from the nesting name */
+		visib = cols [MONO_TYPEDEF_FLAGS] & TYPE_ATTRIBUTE_VISIBILITY_MASK;
+		if (visib > TYPE_ATTRIBUTE_PUBLIC && visib <= TYPE_ATTRIBUTE_NESTED_ASSEMBLY)
+			continue;
+		n = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAME]);
+		nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
+		if (g_strcasecmp (n, name) == 0 && g_strcasecmp (nspace, name_space) == 0)
+			return mono_class_get (image, MONO_TOKEN_TYPE_DEF | i);
+	}
+	return NULL;
+}
+
+MonoClass *
 mono_class_from_name (MonoImage *image, const char* name_space, const char *name)
 {
 	GHashTable *nspace_table;
diff --git a/mono/metadata/class.h b/mono/metadata/class.h
index 6ecdcb55600..30ce36f57f2 100644
--- a/mono/metadata/class.h
+++ b/mono/metadata/class.h
@@ -8,31 +8,72 @@
 #define MONO_CLASS_IS_ARRAY(c) ((c)->rank)
 
 extern gboolean mono_print_vtable;
+typedef struct MonoVTable MonoVTable;
 
 typedef struct {
-	MonoType *type;
-	int       offset;
-	const char     *name;
-	const char     *data;
-	/* add marshal data, too */
+	MonoType        *type;
+	int              offset;
+	const char      *name;
+	const char      *data;
 } MonoClassField;
 
 typedef struct {
+	MonoClassField *field;
+	guint32 offset;
+	MonoMarshalSpec *mspec;
+} MonoMarshalField;
+
+typedef struct {
+	guint32 native_size;
+	guint32 num_fields;
+	MonoMarshalField fields [MONO_ZERO_LEN_ARRAY];
+} MonoMarshalType;
+
+typedef struct {
 	const char *name;
 	MonoMethod *get;
 	MonoMethod *set;
 	guint32 attrs;
 } MonoProperty;
 
+typedef struct {
+	const char *name;
+	MonoMethod *add;
+	MonoMethod *remove;
+	MonoMethod *raise;
+	MonoMethod **other;
+	guint32 attrs;
+} MonoEvent;
+
 struct _MonoClass {
 	MonoImage *image;
 	guint32    type_token;
 
 	guint dummy           : 1; /* temorary hack */
 	guint inited          : 1;
+	/* We use init_pending to detect cyclic calls to mono_class_init */
+	guint init_pending    : 1;
+
+	/* A class contains static and non static data. Static data can be
+	 * of the same type as the class itselfs, but it does not influence
+	 * the instance size of the class. To avoid cyclic calls to 
+	 * mono_class_init (from mono_class_instance_size ()) we first 
+	 * initialise all non static fields. After that we set size_inited 
+	 * to 1, because we know the instance size now. After that we 
+	 * initialise all static fields.
+	 */
+	guint size_inited     : 1;
 	guint valuetype       : 1; /* derives from System.ValueType */
 	guint enumtype        : 1; /* derives from System.Enum */
+	guint ghcimpl         : 1; /* class has its own GetHashCode impl */ 
+	guint has_finalize    : 1; /* class has its own Finalize impl */ 
+	guint marshalbyref    : 1; /* class is a MarshalByRefObject */
+	guint contextbound    : 1; /* class is a ContextBoundObject */
+	guint delegate        : 1; /* class is a Delegate */
 	guint min_align       : 4;
+	guint packing_size    : 4;
+	guint blittable       : 1; /* class is blittable */
+	guint unicode         : 1; /* class uses unicode char when marshalled */
 
 	MonoClass  *parent;
 	MonoClass  *nested_in;
@@ -68,7 +109,10 @@ struct _MonoClass {
 	struct {
 		guint32 first, last;
 		int count;
-	} field, method, property;
+	} field, method, property, event;
+
+	/* loaded on demand */
+	MonoMarshalType *marshal_info;
 
 	/*
 	 * Field information: Type and location from object base
@@ -76,6 +120,8 @@ struct _MonoClass {
 	MonoClassField *fields;
 
 	MonoProperty *properties;
+	
+	MonoEvent *events;
 
 	MonoMethod **methods;
 
@@ -90,20 +136,35 @@ struct _MonoClass {
 	MonoType this_arg;
 	MonoType byval_arg;
 
-        MonoMethod *vtable [0];	
+	void *reflection_info;
+
+	MonoMethod *ptr_to_str;
+	MonoMethod *str_to_ptr;
+
+	MonoVTable *cached_vtable;
+        MonoMethod **vtable;	
 };
 
-typedef struct {
+struct MonoVTable {
 	MonoClass  *klass;
 	MonoDomain *domain;  /* each object/vtable belongs to exactly one domain */
+	guint       max_interface_id;
         gpointer   *interface_offsets;   
         gpointer    data;
-        gpointer    vtable [0];	
-} MonoVTable;
+        gpointer    vtable [MONO_ZERO_LEN_ARRAY];	
+};
 
+typedef struct {
+	gulong new_object_count;
+	gulong initialized_class_count;
+	gulong used_class_count;
+	gulong class_vtable_size;
+	gulong class_static_data_size;
+} MonoStats;
+
+extern MonoStats mono_stats;
 
 typedef gpointer (*MonoTrampoline)       (MonoMethod *method);
-typedef void     (*MonoRuntimeClassInit) (MonoClass *klass);
 
 MonoClass *
 mono_class_get             (MonoImage *image, guint32 type_token);
@@ -111,17 +172,44 @@ mono_class_get             (MonoImage *image, guint32 type_token);
 void
 mono_class_init            (MonoClass *klass);
 
+void
+mono_class_setup_vtable    (MonoClass *klass);
+
+MonoVTable *
+mono_class_vtable          (MonoDomain *domain, MonoClass *klass);
+
 MonoVTable *
-mono_class_vtable          (MonoDomain *domain, MonoClass *class);
+mono_class_proxy_vtable    (MonoDomain *domain, MonoClass *klass);
+
+void
+mono_class_setup_mono_type (MonoClass *klass);
+
+void
+mono_class_setup_parent    (MonoClass *klass, MonoClass *parent);
 
 MonoClass *
 mono_class_from_name       (MonoImage *image, const char* name_space, const char *name);
 
+MonoClass *
+mono_class_from_name_case  (MonoImage *image, const char* name_space, const char *name);
+
+MonoClass * 
+mono_class_from_typeref    (MonoImage *image, guint32 type_token);
+
 MonoClassField*
 mono_field_from_memberref  (MonoImage *image, guint32 token, MonoClass **retklass);
 
+MonoClassField*
+mono_field_from_token      (MonoImage *image, guint32 token, MonoClass **retklass);
+
+MonoMethod**
+mono_class_get_overrides   (MonoImage *image, guint32 type_token, gint32 *num_overrides);
+
 MonoClass *
-mono_array_class_get       (MonoClass *eclass, guint32 rank);
+mono_array_class_get       (MonoType *element_type, guint32 rank);
+
+MonoClass *
+mono_ptr_class_get         (MonoType *type);
 
 MonoClassField *
 mono_class_get_field       (MonoClass *klass, guint32 field_token);
@@ -129,6 +217,9 @@ mono_class_get_field       (MonoClass *klass, guint32 field_token);
 MonoClassField *
 mono_class_get_field_from_name (MonoClass *klass, const char *name);
 
+MonoProperty*
+mono_class_get_property_from_name (MonoClass *klass, const char *name);
+
 gint32
 mono_array_element_size    (MonoClass *ac);
 
@@ -136,10 +227,19 @@ gint32
 mono_class_instance_size   (MonoClass *klass);
 
 gint32
+mono_class_data_size       (MonoClass *klass);
+
+gint32
 mono_class_value_size      (MonoClass *klass, guint32 *align);
 
 gint32
-mono_class_data_size       (MonoClass *klass);
+mono_class_native_size     (MonoClass *klass, guint32 *align);
+
+MonoMarshalType *
+mono_marshal_load_type_info (MonoClass* klass);
+
+gint32
+mono_class_min_align       (MonoClass *klass);
 
 MonoClass *
 mono_class_from_mono_type  (MonoType *type);
@@ -151,6 +251,6 @@ void
 mono_install_trampoline (MonoTrampoline func);
 
 void
-mono_install_runtime_class_init (MonoRuntimeClassInit func);
+mono_install_remoting_trampoline (MonoTrampoline func);
 
 #endif /* _MONO_CLI_CLASS_H_ */
diff --git a/mono/metadata/debug-helpers.c b/mono/metadata/debug-helpers.c
new file mode 100644
index 00000000000..dda839f90b0
--- /dev/null
+++ b/mono/metadata/debug-helpers.c
@@ -0,0 +1,447 @@
+
+#include <string.h>
+#include "mono/metadata/tokentype.h"
+#include "mono/metadata/opcodes.h"
+#include "mono/metadata/mono-endian.h"
+#include "mono/metadata/debug-helpers.h"
+
+struct MonoMethodDesc {
+	char *namespace;
+	char *klass;
+	char *name;
+	char *args;
+	guint num_args;
+	gboolean include_namespace;
+};
+
+void
+mono_type_get_desc (GString *res, MonoType *type, gboolean include_namespace) {
+	switch (type->type) {
+	case MONO_TYPE_VOID:
+		g_string_append (res, "void"); break;
+	case MONO_TYPE_CHAR:
+		g_string_append (res, "char"); break;
+	case MONO_TYPE_BOOLEAN:
+		g_string_append (res, "bool"); break;
+	case MONO_TYPE_U1:
+		g_string_append (res, "byte"); break;
+	case MONO_TYPE_I1:
+		g_string_append (res, "sbyte"); break;
+	case MONO_TYPE_U2:
+		g_string_append (res, "uint16"); break;
+	case MONO_TYPE_I2:
+		g_string_append (res, "int16"); break;
+	case MONO_TYPE_U4:
+		g_string_append (res, "uint"); break;
+	case MONO_TYPE_I4:
+		g_string_append (res, "int"); break;
+	case MONO_TYPE_U8:
+		g_string_append (res, "ulong"); break;
+	case MONO_TYPE_I8:
+		g_string_append (res, "long"); break;
+	case MONO_TYPE_FNPTR: /* who cares for the exact signature? */
+		g_string_append (res, "*()"); break;
+	case MONO_TYPE_U:
+		g_string_append (res, "uintptr"); break;
+	case MONO_TYPE_I:
+		g_string_append (res, "intptr"); break;
+	case MONO_TYPE_R4:
+		g_string_append (res, "single"); break;
+	case MONO_TYPE_R8:
+		g_string_append (res, "double"); break;
+	case MONO_TYPE_STRING:
+		g_string_append (res, "string"); break;
+	case MONO_TYPE_OBJECT:
+		g_string_append (res, "object"); break;
+	case MONO_TYPE_PTR:
+		mono_type_get_desc (res, type->data.type, include_namespace);
+		g_string_append_c (res, '*');
+		break;
+	case MONO_TYPE_ARRAY:
+		mono_type_get_desc (res, type->data.array->type, include_namespace);
+		g_string_sprintfa (res, "[%d]", type->data.array->rank);
+		break;
+	case MONO_TYPE_SZARRAY:
+		mono_type_get_desc (res, type->data.type, include_namespace);
+		g_string_append (res, "[]");
+		break;
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_VALUETYPE: {
+		MonoClass *class = type->data.klass;
+		if (!class) {
+			g_string_append (res, "Unknown");
+			break;
+		}
+		if (include_namespace && *(class->name_space))
+			g_string_sprintfa (res, "%s.", class->name_space);
+		g_string_sprintfa (res, "%s", class->name);
+		break;
+	}
+	default:
+		break;
+	}
+	if (type->byref)
+		g_string_append_c (res, '&');
+}
+
+char*
+mono_signature_get_desc (MonoMethodSignature *sig, gboolean include_namespace)
+{
+	int i;
+	char *result;
+	GString *res = g_string_new ("");
+
+	for (i = 0; i < sig->param_count; ++i) {
+		if (i > 0)
+			g_string_append_c (res, ',');
+		mono_type_get_desc (res, sig->params [i], include_namespace);
+	}
+	result = res->str;
+	g_string_free (res, FALSE);
+	return result;
+}
+
+/*
+ * The allowed format of a method description string is:
+ * [namespace.]classname:methodname[(args...)]
+ * TODO: describe instance methods.
+ */
+MonoMethodDesc*
+mono_method_desc_new (const char *name, gboolean include_namespace)
+{
+	MonoMethodDesc *result;
+	char *class_name, *class_nspace, *method_name, *use_args, *end;
+	int use_namespace;
+	
+	class_nspace = g_strdup (name);
+	use_args = strchr (class_nspace, '(');
+	if (use_args) {
+		*use_args++ = 0;
+		end = strchr (use_args, ')');
+		if (!end) {
+			g_free (class_nspace);
+			return NULL;
+		}
+		*end = 0;
+	}
+	method_name = strrchr (class_nspace, ':');
+	if (!method_name) {
+		g_free (class_nspace);
+		return NULL;
+	}
+	*method_name++ = 0;
+	/* allow two :: to separate the method name */
+	if (*method_name == ':')
+		method_name++;
+	class_name = strrchr (class_nspace, '.');
+	if (class_name) {
+		*class_name++ = 0;
+		use_namespace = 1;
+	} else {
+		class_name = class_nspace;
+		use_namespace = 0;
+	}
+	result = g_new0 (MonoMethodDesc, 1);
+	result->include_namespace = include_namespace;
+	result->name = method_name;
+	result->klass = class_name;
+	result->namespace = use_namespace? class_nspace: NULL;
+	result->args = use_args? use_args: NULL;
+	if (use_args) {
+		end = use_args;
+		if (*end)
+			result->num_args = 1;
+		while (*end) {
+			if (*end == ',')
+				result->num_args++;
+		}
+	}
+
+	return result;
+}
+
+MonoMethodDesc*
+mono_method_desc_from_method (MonoMethod *method)
+{
+	MonoMethodDesc *result;
+	
+	result = g_new0 (MonoMethodDesc, 1);
+	result->include_namespace = TRUE;
+	result->name = g_strdup (method->name);
+	result->klass = g_strdup (method->klass->name);
+	result->namespace = g_strdup (method->klass->name_space);
+
+	return result;
+}
+
+void
+mono_method_desc_free (MonoMethodDesc *desc)
+{
+	if (desc->namespace)
+		g_free (desc->namespace);
+	else if (desc->klass)
+		g_free (desc->klass);
+	g_free (desc);
+}
+
+/*
+ * namespace and class are supposed to match already if this function is used.
+ */
+gboolean
+mono_method_desc_match (MonoMethodDesc *desc, MonoMethod *method)
+{
+	char *sig;
+	if (strcmp (desc->name, method->name))
+		return FALSE;
+	if (!desc->args)
+		return TRUE;
+	if (desc->num_args != method->signature->param_count)
+		return FALSE;
+	sig = mono_signature_get_desc (method->signature, desc->include_namespace);
+	if (strcmp (sig, desc->args)) {
+		g_free (sig);
+		return FALSE;
+	}
+	g_free (sig);
+	return TRUE;
+}
+
+gboolean
+mono_method_desc_full_match (MonoMethodDesc *desc, MonoMethod *method)
+{
+	if (strcmp (desc->klass, method->klass->name))
+		return FALSE;
+	if (desc->namespace && strcmp (desc->namespace, method->klass->name_space))
+		return FALSE;
+	return mono_method_desc_match (desc, method);
+}
+
+MonoMethod*
+mono_method_desc_search_in_class (MonoMethodDesc *desc, MonoClass *klass)
+{
+	int i;
+
+	mono_class_init (klass);
+	for (i = 0; i < klass->method.count; ++i) {
+		if (mono_method_desc_match (desc, klass->methods [i]))
+			return klass->methods [i];
+	}
+	return NULL;
+}
+
+MonoMethod*
+mono_method_desc_search_in_image (MonoMethodDesc *desc, MonoImage *image)
+{
+	MonoClass *klass;
+	MonoTableInfo *tdef;
+	MonoTableInfo *methods;
+	MonoMethod *method;
+	int i;
+
+	if (desc->namespace && desc->klass) {
+		klass = mono_class_from_name (image, desc->namespace, desc->klass);
+		if (!klass)
+			return NULL;
+		return mono_method_desc_search_in_class (desc, klass);
+	}
+
+	tdef = &image->tables [MONO_TABLE_TYPEDEF];
+	methods = &image->tables [MONO_TABLE_METHOD];
+	for (i = 0; i < methods->rows; ++i) {
+		guint32 token = mono_metadata_decode_row_col (methods, i, MONO_METHOD_NAME);
+		const char *n = mono_metadata_string_heap (image, token);
+
+		if (strcmp (n, desc->name))
+			continue;
+		method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | (i + 1), NULL);
+		if (mono_method_desc_full_match (desc, method))
+			return method;
+	}
+	return NULL;
+}
+
+static const unsigned char*
+dis_one (GString *str, MonoDisHelper *dh, MonoMethod *method, const unsigned char *ip)
+{
+	MonoMethodHeader *header = ((MonoMethodNormal*)method)->header;
+	const MonoOpcode *opcode;
+	guint32 i, label, token;
+	gint32 sval;
+	char *tmp;
+
+	label = ip - header->code;
+	if (dh->indenter) {
+		tmp = dh->indenter (dh, method, label);
+		g_string_append (str, tmp);
+		g_free (tmp);
+	}
+	if (dh->label_format)
+		g_string_sprintfa (str, dh->label_format, label);
+	
+	i = mono_opcode_value (&ip);
+	ip++;
+	opcode = &mono_opcodes [i];
+	g_string_sprintfa (str, "%-10s", mono_opcode_names [i]);
+
+	switch (opcode->argument) {
+	case MonoInlineNone:
+		break;
+	case MonoInlineType:
+	case MonoInlineField:
+	case MonoInlineMethod:
+	case MonoInlineTok:
+	case MonoInlineSig:
+		token = read32 (ip);
+		if (dh->tokener) {
+			tmp = dh->tokener (dh, method, token);
+			g_string_append (str, tmp);
+			g_free (tmp);
+		} else {
+			g_string_sprintfa (str, "0x%08x", token);
+		}
+		ip += 4;
+		break;
+	case MonoInlineString:
+		/* TODO */
+		ip += 4;
+		break;
+	case MonoInlineVar:
+		g_string_sprintfa (str, "%d", read16 (ip));
+		ip += 2;
+		break;
+	case MonoShortInlineVar:
+		g_string_sprintfa (str, "%d", (*ip));
+		ip ++;
+		break;
+	case MonoInlineBrTarget:
+		sval = read32 (ip);
+		ip += 4;
+		if (dh->label_target)
+			g_string_sprintfa (str, dh->label_target, ip + sval - header->code);
+		else
+			g_string_sprintfa (str, "%d", sval);
+		break;
+	case MonoShortInlineBrTarget:
+		sval = *(const signed char*)ip;
+		ip ++;
+		if (dh->label_target)
+			g_string_sprintfa (str, dh->label_target, ip + sval - header->code);
+		else
+			g_string_sprintfa (str, "%d", sval);
+		break;
+	case MonoInlineSwitch: {
+		const unsigned char *end;
+		sval = read32 (ip);
+		ip += 4;
+		end = ip + sval * 4;
+		g_string_append_c (str, '(');
+		for (i = 0; i < sval; ++i) {
+			if (i > 0)
+				g_string_append (str, ", ");
+			label = read32 (ip);
+			if (dh->label_target)
+				g_string_sprintfa (str, dh->label_target, end + label - header->code);
+			else
+				g_string_sprintfa (str, "%d", label);
+			ip += 4;
+		}
+		g_string_append_c (str, ')');
+		break;
+	}
+	case MonoInlineR: {
+		double r;
+		readr8 (ip, &r);
+		g_string_sprintfa (str, "%g", r);
+		ip += 8;
+		break;
+	}
+	case MonoShortInlineR: {
+		float r;
+		readr4 (ip, &r);
+		g_string_sprintfa (str, "%g", r);
+		ip += 4;
+		break;
+	}
+	case MonoInlineI:
+		g_string_sprintfa (str, "%d", (gint32)read32 (ip));
+		ip += 4;
+		break;
+	case MonoShortInlineI:
+		g_string_sprintfa (str, "%d", *(const signed char*)ip);
+		ip ++;
+		break;
+	case MonoInlineI8:
+		ip += 8;
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+	if (dh->newline)
+		g_string_append (str, dh->newline);
+
+	return ip;
+}
+
+static MonoDisHelper
+default_dh = {
+	"\n",
+	"IL_%04x: ", /* label_format */
+	"IL_%04x", /* label_target */
+	NULL, /* indenter */
+	NULL, /* tokener */
+	NULL  /* user data */
+};
+
+char*
+mono_disasm_code_one (MonoDisHelper *dh, MonoMethod *method, const guchar *ip)
+{
+	char *result;
+	GString *res = g_string_new ("");
+
+	if (!dh)
+		dh = &default_dh;
+	dis_one (res, dh, method, ip);
+	
+	result = res->str;
+	g_string_free (res, FALSE);
+	return result;
+}
+
+char*
+mono_disasm_code (MonoDisHelper *dh, MonoMethod *method, const guchar *ip, const guchar* end)
+{
+	char *result;
+	GString *res = g_string_new ("");
+
+	if (!dh)
+		dh = &default_dh;
+	while (ip < end) {
+		ip = dis_one (res, dh, method, ip);
+	}
+	
+	result = res->str;
+	g_string_free (res, FALSE);
+	return result;
+}
+
+char *
+mono_method_full_name (MonoMethod *method, gboolean signature)
+{
+	char *res;
+
+	if (signature) {
+		char *tmpsig = mono_signature_get_desc (method->signature, TRUE);
+
+		res = g_strdup_printf ("%02d %s.%s:%s (%s)", method->wrapper_type, method->klass->name_space, 
+				       method->klass->name, method->name, tmpsig);
+		g_free (tmpsig);
+	} else {
+
+		res = g_strdup_printf ("%02d %s.%s:%s", method->wrapper_type, method->klass->name_space, 
+				       method->klass->name, method->name);
+	}
+
+	return res;
+}
+
+
diff --git a/mono/metadata/debug-helpers.h b/mono/metadata/debug-helpers.h
new file mode 100644
index 00000000000..4157439bf98
--- /dev/null
+++ b/mono/metadata/debug-helpers.h
@@ -0,0 +1,40 @@
+#ifndef __MONO_DEBUG_HELPERS_H__
+#define __MONO_DEBUG_HELPERS_H__
+
+#include <glib.h>
+#include <mono/metadata/class.h>
+
+typedef struct MonoDisHelper MonoDisHelper;
+
+typedef char* (*MonoDisIndenter) (MonoDisHelper *dh, MonoMethod *method, guint32 ip_offset);
+typedef char* (*MonoDisTokener)  (MonoDisHelper *dh, MonoMethod *method, guint32 token);
+
+struct MonoDisHelper {
+	const char *newline;
+	const char *label_format;
+	const char *label_target;
+	MonoDisIndenter indenter;
+	MonoDisTokener  tokener;
+	gpointer user_data;
+};
+
+char* mono_disasm_code_one (MonoDisHelper *dh, MonoMethod *method, const guchar *ip);
+char* mono_disasm_code     (MonoDisHelper *dh, MonoMethod *method, const guchar *ip, const guchar* end);
+
+typedef struct MonoMethodDesc MonoMethodDesc;
+
+void            mono_type_get_desc (GString *res, MonoType *type, gboolean include_namespace);
+char*           mono_signature_get_desc (MonoMethodSignature *sig, gboolean include_namespace);
+
+MonoMethodDesc* mono_method_desc_new (const char *name, gboolean include_namespace);
+MonoMethodDesc*mono_method_desc_from_method (MonoMethod *method);
+void            mono_method_desc_free (MonoMethodDesc *desc);
+gboolean        mono_method_desc_match (MonoMethodDesc *desc, MonoMethod *method);
+gboolean        mono_method_desc_full_match (MonoMethodDesc *desc, MonoMethod *method);
+MonoMethod*     mono_method_desc_search_in_class (MonoMethodDesc *desc, MonoClass *klass);
+MonoMethod*     mono_method_desc_search_in_image (MonoMethodDesc *desc, MonoImage *image);
+
+char*           mono_method_full_name (MonoMethod *method, gboolean signature);
+
+#endif /* __MONO_DEBUG_HELPERS_H__ */
+
diff --git a/mono/metadata/debug-symfile.c b/mono/metadata/debug-symfile.c
new file mode 100644
index 00000000000..4cf9fa90029
--- /dev/null
+++ b/mono/metadata/debug-symfile.c
@@ -0,0 +1,1058 @@
+#include <config.h>
+#include <stdlib.h>
+#include <string.h>
+#include <signal.h>
+#include <mono/metadata/metadata.h>
+#include <mono/metadata/rawbuffer.h>
+#include <mono/metadata/tokentype.h>
+#include <mono/metadata/appdomain.h>
+#include <mono/metadata/exception.h>
+#include <mono/metadata/debug-symfile.h>
+
+#include <fcntl.h>
+#include <unistd.h>
+
+#ifdef HAVE_ELF_H
+#include <elf.h>
+#endif
+
+/* Keep in sync with Mono.CSharp.Debugger.MonoDwarfFileWriter */
+#define MRT_none			0x00
+#define MRT_target_address_size		0x01
+#define MRT_il_offset			0x02
+#define MRT_method_start_address	0x03
+#define MRT_method_end_address		0x04
+#define MRT_local_variable		0x05
+#define MRT_method_parameter		0x06
+#define MRT_type_sizeof			0x07
+#define MRT_type_field_offset		0x08
+#define MRT_mono_string_sizeof		0x09
+#define MRT_mono_string_offset		0x0a
+#define MRT_mono_array_sizeof		0x0b
+#define MRT_mono_array_offset		0x0c
+#define MRT_mono_array_bounds_sizeof	0x0d
+#define MRT_mono_array_bounds_offset	0x0e
+#define MRT_variable_start_scope	0x0f
+#define MRT_variable_end_scope		0x10
+#define MRT_mono_string_fieldsize	0x11
+#define MRT_mono_array_fieldsize	0x12
+#define MRT_type_field_fieldsize	0x13
+#define MRT_mono_string_string_length	0x14
+#define MRT_mono_string_byte_size	0x15
+#define MRT_mono_string_data_location	0x16
+#define MRT_static_type_field_offset	0x17
+#define MRT_mono_array_data_location	0x18
+#define MRT_mono_array_max_length	0x19
+#define MRT_mono_array_length_byte_size	0x1a
+
+#define MRI_string_offset_length	0x00
+#define MRI_string_offset_chars		0x01
+
+#define MRI_array_offset_bounds		0x00
+#define MRI_array_offset_max_length	0x01
+#define MRI_array_offset_vector		0x02
+
+#define MRI_array_bounds_offset_lower	0x00
+#define MRI_array_bounds_offset_length	0x01
+
+#define MRS_debug_info			0x01
+#define MRS_debug_abbrev		0x02
+#define MRS_debug_line			0x03
+#define MRS_mono_reloc_table		0x04
+
+#define DW_OP_const4u			0x0c
+#define DW_OP_const4s			0x0d
+#define DW_OP_plus			0x22
+#define DW_OP_reg0			0x50
+#define DW_OP_breg0			0x70
+#define DW_OP_fbreg			0x91
+#define DW_OP_piece			0x93
+#define DW_OP_nop			0x96
+
+#ifdef HAVE_ELF_H
+
+static gboolean
+get_sections_elf32 (MonoDebugSymbolFile *symfile, gboolean emit_warnings)
+{
+	Elf32_Ehdr *header;
+	Elf32_Shdr *section, *strtab_section;
+	const char *strtab;
+	int i;
+
+	header = (Elf32_Ehdr *)symfile->raw_contents;
+	if (header->e_version != EV_CURRENT) {
+		if (emit_warnings)
+			g_warning ("Symbol file %s has unknown ELF version %d",
+				   symfile->file_name, header->e_version);
+		return FALSE;
+	}
+
+	if (header->e_machine != EM_386) {
+		if (emit_warnings)
+			g_warning ("ELF file %s is for unknown architecture %d",
+				   symfile->file_name, header->e_machine);
+		return FALSE;
+	}
+
+	if (header->e_shentsize != sizeof (*section)) {
+		if (emit_warnings)
+			g_warning ("ELF file %s has unknown section header size "
+				   "(expected %d, got %d)", symfile->file_name,
+				   sizeof (*section), header->e_shentsize);
+		return FALSE;
+	}
+
+	symfile->section_offsets = g_new0 (MonoDebugSymbolFileSection, MONO_DEBUG_SYMBOL_SECTION_MAX);
+
+	section = (Elf32_Shdr *)(symfile->raw_contents + header->e_shoff);
+	strtab_section = section + header->e_shstrndx;
+	strtab = symfile->raw_contents + strtab_section->sh_offset;
+
+	for (i = 0; i < header->e_shnum; i++, section++) {
+		const gchar *name = strtab + section->sh_name;
+
+		if (!strcmp (name, ".debug_info")) {
+			MonoDebugSymbolFileSection *sfs;
+
+			sfs = &symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_DEBUG_INFO];
+			sfs->type = MONO_DEBUG_SYMBOL_SECTION_DEBUG_INFO;
+			sfs->file_offset = section->sh_offset;
+			sfs->size = section->sh_size;
+		} else if (!strcmp (name, ".debug_line")) {
+			MonoDebugSymbolFileSection *sfs;
+
+			sfs = &symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_DEBUG_LINE];
+			sfs->type = MONO_DEBUG_SYMBOL_SECTION_DEBUG_LINE;
+			sfs->file_offset = section->sh_offset;
+			sfs->size = section->sh_size;
+		} else if (!strcmp (name, ".debug_abbrev")) {
+			MonoDebugSymbolFileSection *sfs;
+
+			sfs = &symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_DEBUG_ABBREV];
+			sfs->type = MONO_DEBUG_SYMBOL_SECTION_DEBUG_ABBREV;
+			sfs->file_offset = section->sh_offset;
+			sfs->size = section->sh_size;
+		} else if (!strcmp (name, ".mono_reloc_table")) {
+			MonoDebugSymbolFileSection *sfs;
+
+			sfs = &symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_RELOC_TABLE];
+			sfs->type = MONO_DEBUG_SYMBOL_SECTION_MONO_RELOC_TABLE;
+			sfs->file_offset = section->sh_offset;
+			sfs->size = section->sh_size;
+		} else if (!strcmp (name, ".mono_line_numbers")) {
+			MonoDebugSymbolFileSection *sfs;
+
+			sfs = &symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_LINE_NUMBERS];
+			sfs->type = MONO_DEBUG_SYMBOL_SECTION_MONO_LINE_NUMBERS;
+			sfs->file_offset = section->sh_offset;
+			sfs->size = section->sh_size;
+		} else if (!strcmp (name, ".mono_symbol_table")) {
+			MonoDebugSymbolFileSection *sfs;
+
+			sfs = &symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_SYMBOL_TABLE];
+			sfs->type = MONO_DEBUG_SYMBOL_SECTION_MONO_SYMBOL_TABLE;
+			sfs->file_offset = section->sh_offset;
+			sfs->size = section->sh_size;
+		}
+	}
+
+	return TRUE;
+}
+
+#endif /* HAVE_ELF_H */
+
+static gboolean
+get_sections (MonoDebugSymbolFile *symfile, gboolean emit_warnings)
+{
+#ifdef HAVE_ELF_H
+#ifdef __FreeBSD__
+	static const char ELFMAG[] = { ELFMAG0, ELFMAG1, ELFMAG2, ELFMAG3, 0 };
+#endif
+	if (!strncmp (symfile->raw_contents, ELFMAG, strlen (ELFMAG)))
+		return get_sections_elf32 (symfile, emit_warnings);
+#endif
+
+	if (emit_warnings)
+		g_warning ("Symbol file %s has unknown file format", symfile->file_name);
+
+	return FALSE;
+}
+
+static void
+read_line_numbers (MonoDebugSymbolFile *symfile)
+{
+	const char *ptr, *start, *end;
+	int version;
+	long section_size;
+
+	if (!symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_LINE_NUMBERS].file_offset)
+		return;
+
+	ptr = start = symfile->raw_contents +
+		symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_LINE_NUMBERS].file_offset;
+
+	version = *((guint16 *) ptr)++;
+	if (version != MONO_DEBUG_SYMBOL_FILE_VERSION) {
+		g_warning ("Symbol file %s has incorrect line number table version "
+			   "(expected %d, got %d)", symfile->file_name,
+			   MONO_DEBUG_SYMBOL_FILE_VERSION, version);
+		return;
+	}
+
+	section_size = *((guint32 *) ptr)++;
+	end = ptr + section_size;
+
+	symfile->line_number_table = g_hash_table_new_full (g_direct_hash, g_direct_equal,
+							    NULL, (GDestroyNotify) g_free);
+
+	while (ptr < end) {
+		MonoDebugLineNumberBlock *lnb;
+		guint32 token, source_offset;
+		MonoMethod *method;
+
+		token = * ((guint32 *) ptr)++;
+		method = mono_get_method (symfile->image, token, NULL);
+		if (!method)
+			continue;
+
+		lnb = g_new0 (MonoDebugLineNumberBlock, 1);
+		lnb->token = token;
+		source_offset = * ((guint32 *) ptr)++;
+		lnb->source_file = (const char *) start + source_offset;
+		lnb->start_line = * ((guint32 *) ptr)++;
+		lnb->file_offset = * ((guint32 *) ptr)++;
+
+		g_hash_table_insert (symfile->line_number_table, method, lnb);
+	}
+}
+
+static MonoClass *
+find_class_by_name (MonoDebugSymbolFile *symfile, const char *nspace, const char *name)
+{
+	MonoAssembly **assembly;
+	MonoClass *klass;
+
+	klass = mono_class_from_name (symfile->image, nspace, name);
+
+	if (klass)
+		return klass;
+
+	for (assembly = symfile->image->references; assembly && *assembly; assembly++) {
+		klass = mono_class_from_name ((*assembly)->image, nspace, name);
+
+		if (klass)
+			return klass;
+	}
+
+	g_message (G_STRLOC ": Can't find class %s.%s", nspace, name);
+
+	return NULL;
+}
+
+static void
+read_symbol_table (MonoDebugSymbolFile *symfile)
+{
+	const char *ptr, *start, *end;
+	int version, i;
+	long section_size;
+
+	if (!symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_SYMBOL_TABLE].file_offset)
+		return;
+
+	ptr = start = symfile->raw_contents +
+		symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_SYMBOL_TABLE].file_offset;
+
+	version = *((guint16 *) ptr)++;
+	if (version != MONO_DEBUG_SYMBOL_FILE_VERSION) {
+		g_warning ("Symbol file %s has incorrect line number table version "
+			   "(expected %d, got %d)", symfile->file_name,
+			   MONO_DEBUG_SYMBOL_FILE_VERSION, version);
+		return;
+	}
+
+	section_size = *((guint32 *) ptr)++;
+	end = ptr + section_size;
+
+	g_free (symfile->type_table);
+
+	symfile->num_types = * ((guint32 *) ptr)++;
+	symfile->type_table = g_new0 (MonoClass *, symfile->num_types);
+
+	for (i = 0; i < symfile->num_types; i++) {
+		const char *name, *namespace;
+		MonoClass *klass;
+
+		namespace = ptr;
+		ptr += strlen (namespace) + 1;
+
+		name = ptr;
+		ptr += strlen (name) + 1;
+
+		klass = find_class_by_name (symfile, namespace, name);
+
+		if (klass)
+			symfile->type_table [i] = klass;
+	}
+}
+
+static MonoClass *
+mono_debug_class_get (MonoDebugSymbolFile *symfile, guint32 type_token)
+{
+	MonoClass *klass;
+
+	if (!type_token)
+		return mono_defaults.object_class;
+
+	if (type_token <= symfile->num_types)
+		return symfile->type_table [type_token - 1];
+
+	if ((klass = g_hash_table_lookup (symfile->image->class_cache, GUINT_TO_POINTER (type_token))))
+                return klass;
+
+        return NULL;
+}
+
+MonoDebugSymbolFile *
+mono_debug_open_symbol_file (MonoImage *image, const char *filename, gboolean emit_warnings)
+{
+	MonoDebugSymbolFile *symfile;
+	off_t file_size;
+	void *ptr;
+	int fd;
+
+	fd = open (filename, O_RDWR);
+	if (fd == -1) {
+		if (emit_warnings)
+			g_warning ("Can't open symbol file: %s", filename);
+		return NULL;
+	}
+
+	file_size = lseek (fd, 0, SEEK_END);
+	lseek (fd, 0, SEEK_SET);
+
+	if (file_size == (off_t) -1) {
+		if (emit_warnings)
+			g_warning ("Can't get size of symbol file: %s", filename);
+		return NULL;
+	}
+
+	ptr = mono_raw_buffer_load (fd, 1, 0, file_size);
+	if (!ptr) {
+		if (emit_warnings)
+			g_warning ("Can't read symbol file: %s", filename);
+		return NULL;
+	}
+
+	symfile = g_new0 (MonoDebugSymbolFile, 1);
+	symfile->fd = fd;
+	symfile->file_name = g_strdup (filename);
+	symfile->image = image;
+	symfile->raw_contents = ptr;
+	symfile->raw_contents_size = file_size;
+
+	if (!get_sections (symfile, emit_warnings)) {
+		mono_debug_close_symbol_file (symfile);
+		return NULL;
+	}
+
+	read_symbol_table (symfile);
+
+	read_line_numbers (symfile);
+
+	return symfile;
+}
+
+void
+mono_debug_close_symbol_file (MonoDebugSymbolFile *symfile)
+{
+	if (!symfile)
+		return;
+
+	if (symfile->raw_contents)
+		mono_raw_buffer_free (symfile->raw_contents);
+	if (symfile->fd)
+		close (symfile->fd);
+
+	if (symfile->line_number_table)
+		g_hash_table_destroy (symfile->line_number_table);
+	g_free (symfile->file_name);
+	g_free (symfile->section_offsets);
+	g_free (symfile);
+}
+
+static void
+relocate_variable (MonoDebugVarInfo *var, void *base_ptr)
+{
+	if (!var) {
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		return;
+	}
+		
+	/*
+	 * Update the location description for a local variable or method parameter.
+	 * MCS always reserves 8 bytes for us to do this, if we don't need them all
+	 * we just fill up the rest with DW_OP_nop's.
+	 */
+
+	switch (var->index & MONO_DEBUG_VAR_ADDRESS_MODE_FLAGS) {
+	case MONO_DEBUG_VAR_ADDRESS_MODE_STACK:
+		/*
+		 * Variable is on the stack.
+		 *
+		 * If `index' is zero, use the normal frame register.  Otherwise, bits
+		 * 0..4 of `index' contain the frame register.
+		 *
+		 * Both DW_OP_fbreg and DW_OP_breg0 ... DW_OP_breg31 take an ULeb128
+		 * argument - since this has an variable size, we set it to zero and
+		 * manually add a 4 byte constant using DW_OP_plus.
+		 */
+		if (!var->index)
+			/* Use the normal frame register (%ebp on the i386). */
+			* ((guint8 *) base_ptr)++ = DW_OP_fbreg;
+		else
+			/* Use a custom frame register. */
+			* ((guint8 *) base_ptr)++ = DW_OP_breg0 + (var->index & 0x001f);
+		* ((guint8 *) base_ptr)++ = 0;
+		* ((guint8 *) base_ptr)++ = DW_OP_const4s;
+		* ((gint32 *) base_ptr)++ = var->offset;
+		* ((guint8 *) base_ptr)++ = DW_OP_plus;
+		break;
+
+	case MONO_DEBUG_VAR_ADDRESS_MODE_REGISTER:
+		/*
+		 * Variable is in the register whose number is contained in bits 0..4
+		 * of `index'.
+		 *
+		 * We need to write exactly 8 bytes in this location description, so instead
+		 * of filling up the rest with DW_OP_nop's just add the `offset' even if
+		 * it's zero.
+		 */
+		* ((guint8 *) base_ptr)++ = DW_OP_reg0 + (var->index & 0x001f);
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		* ((guint8 *) base_ptr)++ = DW_OP_const4s;
+		* ((gint32 *) base_ptr)++ = var->offset;
+		* ((guint8 *) base_ptr)++ = DW_OP_plus;
+		break;
+
+	case MONO_DEBUG_VAR_ADDRESS_MODE_TWO_REGISTERS:
+		/*
+		 * Variable is in two registers whose numbers are in bits 0..4 and 5..9 of 
+		 * the `index' field.  Don't add `offset' since we have only two bytes left,
+		 * fill them up with DW_OP_nop's.
+		 */
+		* ((guint8 *) base_ptr)++ = DW_OP_reg0 + (var->index & 0x001f);
+		* ((guint8 *) base_ptr)++ = DW_OP_piece;
+		* ((guint8 *) base_ptr)++ = sizeof (int);
+		* ((guint8 *) base_ptr)++ = DW_OP_reg0 + ((var->index & 0x1f0) >> 5);
+		* ((guint8 *) base_ptr)++ = DW_OP_piece;
+		* ((guint8 *) base_ptr)++ = sizeof (int);
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		* ((guint8 *) base_ptr)++ = DW_OP_nop;
+		break;
+
+	default:
+		g_assert_not_reached ();
+	}
+}
+
+void
+mono_debug_update_symbol_file (MonoDebugSymbolFile *symfile,
+			       MonoDebugMethodInfoFunc method_info_func,
+			       gpointer  user_data)
+{
+	const char *reloc_ptr, *reloc_start, *reloc_end;
+	int version, already_relocated = 0;
+	long reloc_size;
+
+	read_symbol_table (symfile);
+
+	if (!symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_RELOC_TABLE].file_offset)
+		return;
+
+	reloc_ptr = reloc_start = symfile->raw_contents +
+		symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_RELOC_TABLE].file_offset;
+
+	version = *((guint16 *) reloc_ptr)++;
+	if (version != MONO_DEBUG_SYMBOL_FILE_VERSION) {
+		g_warning ("Symbol file %s has incorrect relocation table version "
+			   "(expected %d, got %d)", symfile->file_name,
+			   MONO_DEBUG_SYMBOL_FILE_VERSION, version);
+		return;
+	}
+
+	already_relocated = *reloc_ptr;
+	*((char *) reloc_ptr)++ = 1;
+
+	reloc_size = *((guint32 *) reloc_ptr)++;
+	reloc_end = reloc_ptr + reloc_size;
+
+	while (reloc_ptr < reloc_end) {
+		int type, size, section, offset;
+		const char *tmp_ptr;
+		char *base_ptr;
+
+		type = *reloc_ptr++;
+		size = * ((guint32 *) reloc_ptr)++;
+
+		tmp_ptr = reloc_ptr;
+		reloc_ptr += size;
+
+		section = *tmp_ptr++;
+		offset = *((guint32 *) tmp_ptr)++;
+
+		if (section >= MONO_DEBUG_SYMBOL_SECTION_MAX) {
+			g_warning ("Symbol file %s contains a relocation entry for unknown section %d",
+				   symfile->file_name, section);
+			continue;
+		}
+
+		if (!symfile->section_offsets [section].file_offset) {
+			g_warning ("Symbol file %s contains a relocation entry for non-existing "
+				   "section %d", symfile->file_name, section);
+			continue;
+		}
+
+		base_ptr = symfile->raw_contents + symfile->section_offsets [section].file_offset;
+		base_ptr = base_ptr + offset;
+
+		switch (type) {
+		case MRT_target_address_size:
+			* (guint8 *) base_ptr = sizeof (void *);
+			break;
+		case MRT_method_start_address: {
+			int token = *((guint32 *) tmp_ptr)++;
+			MonoDebugMethodInfo *minfo;
+
+			minfo = method_info_func (symfile, token, user_data);
+
+			if (!minfo) {
+				* (void **) base_ptr = 0;
+				continue;
+			}
+
+#if 0
+			g_message ("Start of `%s' (%ld) relocated to %p", minfo->method->name,
+				   token, minfo->code_start);
+#endif
+
+			* (void **) base_ptr = minfo->code_start;
+
+			break;
+		}
+		case MRT_method_end_address: {
+			int token = *((guint32 *) tmp_ptr)++;
+			MonoDebugMethodInfo *minfo;
+
+			minfo = method_info_func (symfile, token, user_data);
+
+			if (!minfo) {
+				* (void **) base_ptr = 0;
+				continue;
+			}
+
+			* (void **) base_ptr = (char *)minfo->code_start + minfo->code_size;
+
+			break;
+		}
+		case MRT_il_offset: {
+			guint32 token = *((guint32 *) tmp_ptr)++;
+			guint32 original = *((guint32 *) tmp_ptr)++;
+			MonoDebugMethodInfo *minfo;
+			guint32 address;
+			int i;
+
+			minfo = method_info_func (symfile, token, user_data);
+
+			if (!minfo) {
+				* (void **) base_ptr = 0;
+				continue;
+			}
+
+			address = minfo->code_size;
+
+			for (i = 0; i < minfo->num_il_offsets; i++) {
+				MonoDebugILOffsetInfo *il = &minfo->il_offsets [i];
+
+				if (il->offset >= original) {
+					address = il->address;
+					break;
+				}
+			}
+
+#if 0
+			g_message ("Relocating IL offset %04x in `%s' to %d (%p)",
+				   original, minfo->method->name, address,
+				   minfo->code_start + address);
+#endif
+
+			* (void **) base_ptr = minfo->code_start + address;
+
+			break;
+		}
+		case MRT_local_variable: {
+			guint32 token = *((guint32 *) tmp_ptr)++;
+			guint32 original = *((guint32 *) tmp_ptr)++;
+			MonoDebugMethodInfo *minfo;
+
+			minfo = method_info_func (symfile, token, user_data);
+
+			if (!minfo) {
+				relocate_variable (NULL, base_ptr);
+				continue;
+			}
+
+			if (original > minfo->num_locals) {
+				g_warning ("Symbol file %s contains relocation entry for non-existing "
+					   "local variable %d, but method %s only has %d local variables.",
+					   symfile->file_name, original, minfo->method->name,
+					   minfo->num_locals);
+				g_message (G_STRLOC ": %d", token);
+				G_BREAKPOINT ();
+				continue;
+			}
+
+			relocate_variable (&minfo->locals [original], base_ptr);
+
+			break;
+		}
+		case MRT_method_parameter: {
+			guint32 token = *((guint32 *) tmp_ptr)++;
+			guint32 original = *((guint32 *) tmp_ptr)++;
+			MonoDebugMethodInfo *minfo;
+
+			minfo = method_info_func (symfile, token, user_data);
+
+			if (!minfo) {
+				relocate_variable (NULL, base_ptr);
+				continue;
+			}
+
+			if (minfo->method->signature->hasthis) {
+				if (original == 0) {
+					relocate_variable (minfo->this_var, base_ptr);
+					continue;
+				}
+
+				original--;
+			}
+
+			if (original > minfo->num_params) {
+				g_warning ("Symbol file %s contains relocation entry for non-existing "
+					   "parameter %d, but method %s only has %d parameters.",
+					   symfile->file_name, original, minfo->method->name,
+					   minfo->num_params);
+				continue;
+			}
+
+			relocate_variable (&minfo->params [original], base_ptr);
+
+			break;
+		}
+		case MRT_type_sizeof: {
+			guint32 token = *((guint32 *) tmp_ptr)++;
+			MonoClass *klass = mono_debug_class_get (symfile, token);
+
+			if (!klass)
+				continue;
+
+			mono_class_init (klass);
+
+			if (klass->enumtype || klass->valuetype)
+				* (gint8 *) base_ptr = klass->instance_size - sizeof (MonoObject);
+			else
+				* (gint8 *) base_ptr = klass->instance_size;
+
+			break;
+		}
+		case MRT_type_field_offset: {
+			guint32 token = *((guint32 *) tmp_ptr)++;
+			guint32 original = *((guint32 *) tmp_ptr)++;
+			MonoClass *klass = mono_debug_class_get (symfile, token);
+			guint32 off;
+
+			if (!klass)
+				continue;
+
+			mono_class_init (klass);
+
+			if (original > klass->field.count) {
+				g_warning ("Symbol file %s contains invalid field offset entry.",
+					   symfile->file_name);
+				g_message (G_STRLOC ": %d", token);
+				/* G_BREAKPOINT (); */
+				continue;
+			}
+
+			if (!klass->fields)
+				continue;
+
+			off = klass->fields [original].offset;
+			if (klass->byval_arg.type == MONO_TYPE_VALUETYPE)
+				off -= sizeof (MonoObject);
+
+#if 0
+			g_message ("Setting field %d of type %u to offset %d", original,
+				   token, off);
+#endif
+
+			* (guint32 *) base_ptr = off;
+
+			break;
+		}
+		case MRT_mono_string_sizeof:
+			* (gint8 *) base_ptr = sizeof (MonoString);
+			break;
+
+		case MRT_mono_string_offset: {
+			guint32 idx = *((guint32 *) tmp_ptr)++;
+			MonoString string;
+			guint32 off;
+
+			switch (idx) {
+			case MRI_string_offset_length:
+				off = (guchar *) &string.length - (guchar *) &string;
+				break;
+
+			case MRI_string_offset_chars:
+				off = (guchar *) &string.chars - (guchar *) &string;
+				break;
+
+			default:
+				g_warning ("Symbol file %s contains invalid string offset entry",
+					   symfile->file_name);
+				continue;
+			}
+
+			* (guint32 *) base_ptr = off;
+
+			break;
+		}
+		case MRT_mono_array_sizeof:
+			* (gint8 *) base_ptr = sizeof (MonoArray);
+			break;
+
+		case MRT_mono_array_offset: {
+			guint32 idx = *((guint32 *) tmp_ptr)++;
+			MonoArray array;
+			guint32 off;
+
+			switch (idx) {
+			case MRI_array_offset_bounds:
+				off = (guchar *) &array.bounds - (guchar *) &array;
+				break;
+
+			case MRI_array_offset_max_length:
+				off = (guchar *) &array.max_length - (guchar *) &array;
+				break;
+
+			case MRI_array_offset_vector:
+				off = (guchar *) &array.vector - (guchar *) &array;
+				break;
+
+			default:
+				g_warning ("Symbol file %s contains invalid array offset entry",
+					   symfile->file_name);
+				continue;
+			}
+
+			* (guint32 *) base_ptr = off;
+
+			break;
+		}
+
+		case MRT_mono_array_bounds_sizeof:
+			* (gint8 *) base_ptr = sizeof (MonoArrayBounds);
+			break;
+
+		case MRT_mono_array_bounds_offset: {
+			guint32 idx = *((guint32 *) tmp_ptr)++;
+			MonoArrayBounds bounds;
+			guint32 off;
+
+			switch (idx) {
+			case MRI_array_bounds_offset_lower:
+				off = (guchar *) &bounds.lower_bound - (guchar *) &bounds;
+				break;
+
+			case MRI_array_bounds_offset_length:
+				off = (guchar *) &bounds.length - (guchar *) &bounds;
+				break;
+
+			default:
+				g_warning ("Symbol file %s contains invalid array bounds offset entry",
+					   symfile->file_name);
+				continue;
+			}
+
+			* (guint32 *) base_ptr = off;
+
+			break;
+		}
+
+		case MRT_variable_start_scope:  {
+			guint32 token = *((guint32 *) tmp_ptr)++;
+			guint32 original = *((guint32 *) tmp_ptr)++;
+			MonoDebugMethodInfo *minfo;
+			gint32 address;
+
+			minfo = method_info_func (symfile, token, user_data);
+
+			if (!minfo || !minfo->locals) {
+				* (void **) base_ptr = 0;
+				continue;
+			}
+
+			if (original > minfo->num_locals) {
+				g_warning ("Symbol file %s contains relocation entry for non-existing "
+					   "local variable %d, but method %s only has %d local variables.",
+					   symfile->file_name, original, minfo->method->name,
+					   minfo->num_locals);
+				continue;
+			}
+
+			address = minfo->locals [original].begin_scope;
+
+			* (void **) base_ptr = minfo->code_start + address;
+
+			break;
+		}
+
+		case MRT_variable_end_scope:  {
+			guint32 token = *((guint32 *) tmp_ptr)++;
+			guint32 original = *((guint32 *) tmp_ptr)++;
+			MonoDebugMethodInfo *minfo;
+			gint32 address;
+
+			minfo = method_info_func (symfile, token, user_data);
+
+			if (!minfo || !minfo->locals) {
+				* (void **) base_ptr = 0;
+				continue;
+			}
+
+			if (original > minfo->num_locals) {
+				g_warning ("Symbol file %s contains relocation entry for non-existing "
+					   "local variable %d, but method %s only has %d local variables.",
+					   symfile->file_name, original, minfo->method->name,
+					   minfo->num_locals);
+				continue;
+			}
+
+			address = minfo->locals [original].end_scope;
+
+			* (void **) base_ptr = minfo->code_start + address;
+
+			break;
+		}
+
+		case MRT_mono_string_fieldsize: {
+			guint32 idx = *((guint32 *) tmp_ptr)++;
+			MonoString string;
+			guint32 fieldsize;
+
+			switch (idx) {
+			case MRI_string_offset_length:
+				fieldsize = sizeof (string.length);
+				break;
+
+			default:
+				g_warning ("Symbol file %s contains invalid string fieldsize entry",
+					   symfile->file_name);
+				continue;
+			}
+
+			* (guint32 *) base_ptr = fieldsize;
+
+			break;
+		}
+
+		case MRT_mono_array_fieldsize: {
+			guint32 idx = *((guint32 *) tmp_ptr)++;
+			MonoArray array;
+			guint32 fieldsize;
+
+			switch (idx) {
+			case MRI_array_offset_bounds:
+				fieldsize = sizeof (array.bounds);
+				break;
+
+			case MRI_array_offset_max_length:
+				fieldsize = sizeof (array.max_length);
+				break;
+
+			case MRI_array_offset_vector:
+				fieldsize = sizeof (array.vector);
+				break;
+
+			default:
+				g_warning ("Symbol file %s contains invalid array fieldsize entry",
+					   symfile->file_name);
+				continue;
+			}
+
+			* (guint32 *) base_ptr = fieldsize;
+
+			break;
+		}
+
+		case MRT_mono_string_string_length: {
+			MonoString string;
+			guint32 offset = (guchar *) &string.length - (guchar *) &string;
+
+			* ((guint8 *) base_ptr)++ = DW_OP_const4u;
+			* ((gint32 *) base_ptr)++ = offset;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+
+			break;
+		}
+
+		case MRT_mono_string_byte_size: {
+			MonoString string;
+
+			* (guint32 *) base_ptr = sizeof (string.length);
+
+			break;
+		}
+
+		case MRT_mono_string_data_location: {
+			MonoString string;
+			guint32 offset = (guchar *) &string.chars - (guchar *) &string;
+
+			* ((guint8 *) base_ptr)++ = DW_OP_const4u;
+			* ((gint32 *) base_ptr)++ = offset;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+
+			break;
+		}
+
+		case MRT_static_type_field_offset: {
+			guint32 token = *((guint32 *) tmp_ptr)++;
+			guint32 original = *((guint32 *) tmp_ptr)++;
+			MonoClass *klass = mono_debug_class_get (symfile, token);
+			MonoVTable *vtable;
+			guint32 off;
+
+			if (!klass)
+				continue;
+
+			mono_class_init (klass);
+
+			if (original > klass->field.count) {
+				g_warning ("Symbol file %s contains invalid field offset entry.",
+					   symfile->file_name);
+				continue;
+			}
+
+			if (!klass->fields)
+				continue;
+
+			vtable = mono_class_vtable (mono_domain_get (), klass);
+
+			off = klass->fields [original].offset;
+
+#if 0
+			g_message ("Setting field %d of type %u (%p) to offset %d", original,
+				   token, klass, off);
+#endif
+
+			* (void **) base_ptr = (char *) vtable->data + off;
+
+			break;
+		}
+
+		case MRT_mono_array_data_location: {
+			MonoArray array;
+			guint32 offset = (guchar *) &array.vector - (guchar *) &array;
+
+			* ((guint8 *) base_ptr)++ = DW_OP_const4u;
+			* ((gint32 *) base_ptr)++ = offset;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+
+			break;
+		}
+
+		case MRT_mono_array_max_length: {
+			MonoArray array;
+			guint32 offset = (guchar *) &array.max_length - (guchar *) &array;
+
+			* ((guint8 *) base_ptr)++ = DW_OP_const4u;
+			* ((gint32 *) base_ptr)++ = offset;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+			* ((guint8 *) base_ptr)++ = DW_OP_nop;
+
+			break;
+		}
+
+		case MRT_mono_array_length_byte_size: {
+			MonoArray array;
+
+			* (guint32 *) base_ptr = sizeof (array.max_length);
+
+			break;
+		}
+
+		default:
+			g_warning ("Symbol file %s contains unknown relocation entry %d",
+				   symfile->file_name, type);
+			break;
+		}
+	}
+
+	mono_raw_buffer_update (symfile->raw_contents, symfile->raw_contents_size);
+}
+
+gchar *
+mono_debug_find_source_location (MonoDebugSymbolFile *symfile, MonoMethod *method, guint32 offset,
+				 guint32 *line_number)
+{
+	MonoDebugLineNumberBlock *lnb;
+	const char *ptr;
+
+	if (!symfile->line_number_table)
+		return NULL;
+
+	lnb = g_hash_table_lookup (symfile->line_number_table, method);
+	if (!lnb)
+		return NULL;
+
+	ptr = symfile->raw_contents +
+		symfile->section_offsets [MONO_DEBUG_SYMBOL_SECTION_MONO_LINE_NUMBERS].file_offset;
+
+	ptr += lnb->file_offset;
+
+	do {
+		guint32 row, iloffset;
+
+		row = * ((guint32 *) ptr)++;
+		iloffset = * ((guint32 *) ptr)++;
+
+		if (!row && !offset)
+			return NULL;
+		if (!row)
+			continue;
+
+		if (iloffset >= offset) {
+			if (line_number) {
+				*line_number = row;
+				return g_strdup (lnb->source_file);
+			} else
+				return g_strdup_printf ("%s:%d", lnb->source_file, row);
+		}
+	} while (1);
+
+	return NULL;
+}
diff --git a/mono/metadata/debug-symfile.h b/mono/metadata/debug-symfile.h
new file mode 100644
index 00000000000..5504f091615
--- /dev/null
+++ b/mono/metadata/debug-symfile.h
@@ -0,0 +1,134 @@
+#ifndef __MONO_DEBUG_SYMFILE_H__
+#define __MONO_DEBUG_SYMFILE_H__
+
+#include <glib.h>
+#include <mono/metadata/class.h>
+#include <mono/metadata/reflection.h>
+
+typedef struct MonoDebugSymbolFile		MonoDebugSymbolFile;
+typedef struct MonoDebugSymbolFileSection	MonoDebugSymbolFileSection;
+typedef struct MonoDebugMethodInfo		MonoDebugMethodInfo;
+typedef struct MonoDebugVarInfo			MonoDebugVarInfo;
+typedef struct MonoDebugILOffsetInfo		MonoDebugILOffsetInfo;
+typedef struct MonoDebugLineNumberBlock		MonoDebugLineNumberBlock;
+
+/* Machine dependent information about a method.
+ *
+ * This structure is created by the MonoDebugMethodInfoFunc callback of
+ * mono_debug_update_symbol_file (). */
+struct MonoDebugMethodInfo {
+	MonoMethod *method;
+	char *code_start;
+	guint32 code_size;
+	guint32 num_params;
+	MonoDebugVarInfo *this_var;
+	MonoDebugVarInfo *params;
+	guint32 num_locals;
+	MonoDebugVarInfo *locals;
+	guint32 num_il_offsets;
+	MonoDebugILOffsetInfo *il_offsets;
+	guint32 prologue_end;
+	guint32 epilogue_begin;
+	gpointer _priv;
+};
+
+/*
+ * These bits of the MonoDebugLocalInfo's "index" field are flags specifying
+ * where the variable is actually stored.
+ *
+ * See relocate_variable() in debug-symfile.c for more info.
+ */
+#define MONO_DEBUG_VAR_ADDRESS_MODE_FLAGS		0xf0000000
+
+/* If "index" is zero, the variable is at stack offset "offset". */
+#define MONO_DEBUG_VAR_ADDRESS_MODE_STACK		0
+
+/* The variable is in the register whose number is contained in bits 0..4 of the
+ * "index" field plus an offset of "offset" (which can be zero).
+ */
+#define MONO_DEBUG_VAR_ADDRESS_MODE_REGISTER		0x10000000
+
+/* The variables in in the two registers whose numbers are contained in bits 0..4
+ * and 5..9 of the "index" field plus an offset of "offset" (which can be zero).
+ */
+#define MONO_DEBUG_VAR_ADDRESS_MODE_TWO_REGISTERS	0x20000000
+
+struct MonoDebugVarInfo {
+	guint32 index;
+	guint32 offset;
+	guint32 begin_scope;
+	guint32 end_scope;
+};
+
+struct MonoDebugILOffsetInfo {
+	guint32 offset;
+	guint32 address;
+};
+
+struct MonoDebugLineNumberBlock {
+	guint32 token;
+	const char *source_file;
+	guint32 start_line;
+	guint32 file_offset;
+};
+
+struct MonoDebugSymbolFile {
+	int fd;
+	char *file_name;
+	MonoImage *image;
+	/* Pointer to the mmap()ed contents of the file. */
+	char *raw_contents;
+	size_t raw_contents_size;
+	/* Array of MONO_DEBUG_SYMBOL_SECTION_MAX elements. */
+	MonoDebugSymbolFileSection *section_offsets;
+	GHashTable *line_number_table;
+	guint32 num_types;
+	MonoClass **type_table;
+	gpointer user_data;
+};
+
+struct MonoDebugSymbolFileSection {
+	int type;
+	gulong file_offset;
+	gulong size;
+};
+
+#define MONO_DEBUG_SYMBOL_FILE_VERSION			15
+
+/* Keep in sync with Mono.CSharp.Debugger.MonoDwarfFileWriter.Section */
+#define MONO_DEBUG_SYMBOL_SECTION_DEBUG_INFO		0x01
+#define MONO_DEBUG_SYMBOL_SECTION_DEBUG_ABBREV		0x02
+#define MONO_DEBUG_SYMBOL_SECTION_DEBUG_LINE		0x03
+#define MONO_DEBUG_SYMBOL_SECTION_MONO_RELOC_TABLE	0x04
+#define MONO_DEBUG_SYMBOL_SECTION_MONO_LINE_NUMBERS	0x05
+#define MONO_DEBUG_SYMBOL_SECTION_MONO_SYMBOL_TABLE	0x06
+
+#define MONO_DEBUG_SYMBOL_SECTION_MAX			0x07
+
+/* Tries to load `filename' as a debugging information file, if `emit_warnings" is set,
+ * use g_warning() to signal error messages on failure, otherwise silently return NULL. */
+MonoDebugSymbolFile *mono_debug_open_symbol_file   (MonoImage                 *image,
+						    const char                *filename,
+						    gboolean                   emit_warnings);
+
+/* This callback function needs to return a MonoDebugMethodInfo structure containing the
+ * machine-dependent information about method associated with the metadata_token.
+ * It's highly recommended to cache the generated data since this function can be called
+ * several times per method. */
+typedef MonoDebugMethodInfo * (*MonoDebugMethodInfoFunc) (MonoDebugSymbolFile *symbol_file,
+							  guint32              metadata_token,
+							  gpointer             user_data);
+
+void    mono_debug_update_symbol_file (MonoDebugSymbolFile      *symbol_file,
+				       MonoDebugMethodInfoFunc   method_info_func,
+				       gpointer                  user_data);
+
+void    mono_debug_close_symbol_file  (MonoDebugSymbolFile      *symbol_file);
+
+gchar *
+mono_debug_find_source_location (MonoDebugSymbolFile *symfile, MonoMethod *method, guint32 offset,
+				 guint32 *line_number);
+
+
+#endif /* __MONO_DEBUG_SYMFILE_H__ */
+
diff --git a/mono/metadata/decimal.c b/mono/metadata/decimal.c
index bca5d1cb2bc..a2bd4b28fd5 100644
--- a/mono/metadata/decimal.c
+++ b/mono/metadata/decimal.c
@@ -50,7 +50,7 @@
 #define POSTCONDITION(flag)  
 #define TEST(flag)
 #define INVARIANT_TEST(p)
-#endif //#ifdef _DEBUG
+#endif /*#ifdef _DEBUG*/
 
 #define DECIMAL_MAX_SCALE 28
 #define DECIMAL_MAX_INTFACTORS 9
@@ -303,12 +303,12 @@ DECINLINE static int mult128by32(guint64* pclo, guint64* pchi, guint32 factor, i
 
 DECINLINE static int mult128DecadeFactor(guint64* pclo, guint64* pchi, int powerOfTen)
 {
-    int index, rc;
+    int idx, rc;
 
     while (powerOfTen > 0) {
-        index = (powerOfTen >= DECIMAL_MAX_INTFACTORS) ? DECIMAL_MAX_INTFACTORS : powerOfTen;
-        powerOfTen -= index;
-        rc = mult128by32(pclo, pchi, constantsDecadeInt32Factors[index], 0);
+        idx = (powerOfTen >= DECIMAL_MAX_INTFACTORS) ? DECIMAL_MAX_INTFACTORS : powerOfTen;
+        powerOfTen -= idx;
+        rc = mult128by32(pclo, pchi, constantsDecadeInt32Factors[idx], 0);
         if (rc != DECIMAL_SUCCESS) return rc;
     }
     return DECIMAL_SUCCESS;
@@ -542,69 +542,69 @@ DECINLINE static void rshift192(guint64* pclo, guint64* pcmi, guint64* pchi)
 /* returns log2(a) or DECIMAL_LOG_NEGINF for a = 0 */
 DECINLINE static int log2_32(guint32 a)
 {
-    int log2 = 0;
+    int tlog2 = 0;
 
     if (a == 0) return DECIMAL_LOG_NEGINF;
 
     if ((a >> 16) != 0) {
         a >>= 16;
-        log2 += 16;
+        tlog2 += 16;
     }
     if ((a >> 8) != 0) {
         a >>= 8;
-        log2 += 8;
+        tlog2 += 8;
     }
     if ((a >> 4) != 0) {
         a >>= 4;
-        log2 += 4;
+        tlog2 += 4;
     }
     if ((a >> 2) != 0) {
         a >>= 2;
-        log2 += 2;
+        tlog2 += 2;
     }
     if ((a >> 1) != 0) {
         a >>= 1;
-        log2 += 1;
+        tlog2 += 1;
     }
-    log2 += (int) a;
+    tlog2 += (int) a;
 
-    return log2;
+    return tlog2;
 }
 
 /* returns log2(a) or DECIMAL_LOG_NEGINF for a = 0 */
 DECINLINE static int log2_64(guint64 a)
 {
-    int log2 = 0;
+    int tlog2 = 0;
 
     if (a == 0) return DECIMAL_LOG_NEGINF;
 
     if ((a >> 32) != 0) {
         a >>= 32;
-        log2 += 32;
+        tlog2 += 32;
     }
     if ((a >> 16) != 0) {
         a >>= 16;
-        log2 += 16;
+        tlog2 += 16;
     }
     if ((a >> 8) != 0) {
         a >>= 8;
-        log2 += 8;
+        tlog2 += 8;
     }
     if ((a >> 4) != 0) {
         a >>= 4;
-        log2 += 4;
+        tlog2 += 4;
     }
     if ((a >> 2) != 0) {
         a >>= 2;
-        log2 += 2;
+        tlog2 += 2;
     }
     if ((a >> 1) != 0) {
         a >>= 1;
-        log2 += 1;
+        tlog2 += 1;
     }
-    log2 += (int) a;
+    tlog2 += (int) a;
 
-    return log2;
+    return tlog2;
 }
 
 /* returns log2(a) or DECIMAL_LOG_NEGINF for a = 0 */
@@ -617,9 +617,9 @@ DECINLINE static int log2_128(guint64 alo, guint64 ahi)
 /* returns a upper limit for log2(a) considering scale */
 DECINLINE static int log2withScale_128(guint64 alo, guint64 ahi, int scale)
 {
-    int log2 = log2_128(alo, ahi);
-    if (log2 < 0) log2 = 0;
-    return log2 - (scale * 33219) / 10000;
+    int tlog2 = log2_128(alo, ahi);
+    if (tlog2 < 0) tlog2 = 0;
+    return tlog2 - (scale * 33219) / 10000;
 }
 
 DECINLINE static int pack128toDecimal(/*[Out]*/decimal_repr* pA, guint64 alo, guint64 ahi,
@@ -644,22 +644,22 @@ DECINLINE static int pack128toDecimal(/*[Out]*/decimal_repr* pA, guint64 alo, gu
 
 DECINLINE static int adjustScale128(guint64* palo, guint64* pahi, int deltaScale)
 {
-    int index, rc;
+    int idx, rc;
 
     if (deltaScale < 0) {
         deltaScale *= -1;
         if (deltaScale > DECIMAL_MAX_SCALE) return DECIMAL_INTERNAL_ERROR;
         while (deltaScale > 0) {
-            index = (deltaScale > DECIMAL_MAX_INTFACTORS) ? DECIMAL_MAX_INTFACTORS : deltaScale;
-            deltaScale -= index;
-            div128by32(palo, pahi, constantsDecadeInt32Factors[index], 0);
+            idx = (deltaScale > DECIMAL_MAX_INTFACTORS) ? DECIMAL_MAX_INTFACTORS : deltaScale;
+            deltaScale -= idx;
+            div128by32(palo, pahi, constantsDecadeInt32Factors[idx], 0);
         }
     } else if (deltaScale > 0) {
         if (deltaScale > DECIMAL_MAX_SCALE) return DECIMAL_INTERNAL_ERROR;
         while (deltaScale > 0) {
-            index = (deltaScale > DECIMAL_MAX_INTFACTORS) ? DECIMAL_MAX_INTFACTORS : deltaScale;
-            deltaScale -= index;
-            rc = mult128by32(palo, pahi, constantsDecadeInt32Factors[index], 0);
+            idx = (deltaScale > DECIMAL_MAX_INTFACTORS) ? DECIMAL_MAX_INTFACTORS : deltaScale;
+            deltaScale -= idx;
+            rc = mult128by32(palo, pahi, constantsDecadeInt32Factors[idx], 0);
             if (rc != DECIMAL_SUCCESS) return rc;
         }
     }
@@ -670,44 +670,44 @@ DECINLINE static int adjustScale128(guint64* palo, guint64* pahi, int deltaScale
 /* input: c * 10^-(*pScale) * 2^-exp
    output: c * 10^-(*pScale) with 
    minScale <= *pScale <= maxScale and (chi >> 32) == 0 */
-DECINLINE static int rescale128(guint64* pclo, guint64* pchi, int* pScale, int exp,
+DECINLINE static int rescale128(guint64* pclo, guint64* pchi, int* pScale, int texp,
                                 int minScale, int maxScale, int roundFlag)
 {
     guint32 factor, overhang;
     int scale, i, rc, roundBit = 0;
 
-    PRECONDITION(exp >= 0);
+    PRECONDITION(texp >= 0);
 
     scale = *pScale;
 
-    if (exp > 0) {
+    if (texp > 0) {
         /* reduce exp */
-        while (exp > 0 && scale <= maxScale) {
+        while (texp > 0 && scale <= maxScale) {
             overhang = (guint32)(*pchi >> 32);
-            while (exp > 0 && ((*pclo & 1) == 0 || overhang > (2<<DECIMAL_MAX_INTFACTORS))) {
-                if (--exp == 0) roundBit = (int)(*pclo & 1);
+            while (texp > 0 && ((*pclo & 1) == 0 || overhang > (2<<DECIMAL_MAX_INTFACTORS))) {
+                if (--texp == 0) roundBit = (int)(*pclo & 1);
                 rshift128(pclo, pchi);
                 overhang = (guint32)(*pchi >> 32);
             }
 
-            if (exp > DECIMAL_MAX_INTFACTORS) i = DECIMAL_MAX_INTFACTORS;
-            else i = exp;
+            if (texp > DECIMAL_MAX_INTFACTORS) i = DECIMAL_MAX_INTFACTORS;
+            else i = texp;
             if (scale + i > maxScale) i = maxScale - scale;
             if (i == 0) break;
-            exp -= i;
+            texp -= i;
             scale += i;
             factor = constantsDecadeInt32Factors[i] >> i; /* 10^i/2^i=5^i */
             mult128by32(pclo, pchi, factor, 0);
-    //printf("3: %.17e\n", (((double)chi) * pow(2,64) + clo) * pow(10, -scale) * pow(2, -exp));
+    /*printf("3: %.17e\n", (((double)chi) * pow(2,64) + clo) * pow(10, -scale) * pow(2, -texp));*/
         }
 
-        while (exp > 0) {
-            if (--exp == 0) roundBit = (int)(*pclo & 1);
+        while (texp > 0) {
+            if (--texp == 0) roundBit = (int)(*pclo & 1);
             rshift128(pclo, pchi);
         }
     }
 
-    TEST(exp == 0);
+    TEST(texp == 0);
 
     while (scale > maxScale) {
         i = scale - maxScale;
@@ -805,16 +805,16 @@ gint32 mono_decimalIncr(/*[In, Out]*/decimal_repr* pA, /*[In]*/decimal_repr* pB)
     return pack128toDecimal(pA, alo, ahi, scaleA, sign);
 }
 
-/* performs a += factor * constants[index] */
-static int incMultConstant128(guint64* palo, guint64* pahi, int index, int factor)
+/* performs a += factor * constants[idx] */
+static int incMultConstant128(guint64* palo, guint64* pahi, int idx, int factor)
 {
     guint64 blo, bhi, h;
 
-    PRECONDITION(index >= 0 && index <= DECIMAL_MAX_SCALE);
+    PRECONDITION(idx >= 0 && idx <= DECIMAL_MAX_SCALE);
     PRECONDITION(factor > 0 && factor <= 9);
 
-    blo = dec128decadeFactors[index].lo;
-    h = bhi = dec128decadeFactors[index].hi;
+    blo = dec128decadeFactors[idx].lo;
+    h = bhi = dec128decadeFactors[idx].hi;
     if (factor != 1) {
         mult128by32(&blo, &bhi, factor, 0);
         if (h > bhi) return DECIMAL_OVERFLOW;
@@ -827,12 +827,12 @@ static int incMultConstant128(guint64* palo, guint64* pahi, int index, int facto
 
 DECINLINE static void div128DecadeFactor(guint64* palo, guint64* pahi, int powerOfTen)
 {
-    int index, roundBit = 0;
+    int idx, roundBit = 0;
 
     while (powerOfTen > 0) {
-        index = (powerOfTen > DECIMAL_MAX_INTFACTORS) ? DECIMAL_MAX_INTFACTORS : powerOfTen;
-        powerOfTen -= index;
-        roundBit = div128by32(palo, pahi, constantsDecadeInt32Factors[index], 0);
+        idx = (powerOfTen > DECIMAL_MAX_INTFACTORS) ? DECIMAL_MAX_INTFACTORS : powerOfTen;
+        powerOfTen -= idx;
+        roundBit = div128by32(palo, pahi, constantsDecadeInt32Factors[idx], 0);
     }
 
     if (roundBit) roundUp128(palo, pahi);
@@ -841,34 +841,34 @@ DECINLINE static void div128DecadeFactor(guint64* palo, guint64* pahi, int power
 /* calc significant digits of mantisse */
 DECINLINE static int calcDigits(guint64 alo, guint64 ahi)
 {
-    int log2 = 0;
-    int log10;
+    int tlog2 = 0;
+    int tlog10;
 
     if (ahi == 0) {
         if (alo == 0) {
             return 0; /* zero has no signficant digits */
         } else {
-            log2 = log2_64(alo);
+            tlog2 = log2_64(alo);
         }
     } else {
-        log2 = 64 + log2_64(ahi);
+        tlog2 = 64 + log2_64(ahi);
     }
 
-    log10 = (log2 * 1000) / 3322;
+    tlog10 = (tlog2 * 1000) / 3322;
     /* we need an exact floor value of log10(a) */
-    if (dec128decadeFactors[log10].hi > ahi
-            || (dec128decadeFactors[log10].hi == ahi
-                    && dec128decadeFactors[log10].lo > alo)) {
-        --log10;
+    if (dec128decadeFactors[tlog10].hi > ahi
+            || (dec128decadeFactors[tlog10].hi == ahi
+                    && dec128decadeFactors[tlog10].lo > alo)) {
+        --tlog10;
     }
-    return log10+1;
+    return tlog10+1;
 }
 
 gint32 mono_double2decimal(/*[Out]*/decimal_repr* pA, double val, gint32 digits)
 {
     guint64 alo, ahi;
     guint64* p = (guint64*)(&val);
-    int sigDigits, sign, exp, rc, scale;
+    int sigDigits, sign, texp, rc, scale;
     guint16 k;
 
     PRECONDITION(digits <= 15);
@@ -878,22 +878,22 @@ gint32 mono_double2decimal(/*[Out]*/decimal_repr* pA, double val, gint32 digits)
     alo = (*p & LIT_GUINT64(0xFFFFFFFFFFFFF)) | LIT_GUINT64(0x10000000000000);
     ahi = 0;
 
-    exp = (k & 0x7FF) - 0x3FF;
-    if (k == 0x7FF || exp >= 96) return DECIMAL_OVERFLOW; /* NaNs, SNaNs, Infinities or >= 2^96 */
-    if (k == 0 || exp <= -94) { /* Subnormals, Zeros or < 2^-94 */
+    texp = (k & 0x7FF) - 0x3FF;
+    if (k == 0x7FF || texp >= 96) return DECIMAL_OVERFLOW; /* NaNs, SNaNs, Infinities or >= 2^96 */
+    if (k == 0 || texp <= -94) { /* Subnormals, Zeros or < 2^-94 */
         DECINIT(pA); /* return zero */
         return DECIMAL_SUCCESS;
     }
 
-    exp -= 52;
-    if (exp > 0) {
-        for (; exp > 0; exp--) {
+    texp -= 52;
+    if (texp > 0) {
+        for (; texp > 0; texp--) {
             lshift128(&alo, &ahi);
         }
     }
 
     scale = 0;
-    rc = rescale128(&alo, &ahi, &scale, -exp, 0, DECIMAL_MAX_SCALE, 0);
+    rc = rescale128(&alo, &ahi, &scale, -texp, 0, DECIMAL_MAX_SCALE, 0);
     if (rc != DECIMAL_SUCCESS) return rc;
 
     sigDigits = calcDigits(alo, ahi);
@@ -1027,7 +1027,7 @@ gint32 mono_string2decimal(/*[Out]*/decimal_repr* pA, MonoString* str, gint32 de
  * returns minimal number of digit string to represent decimal
  * No leading or trailing zeros !
  * Examples:
- * *pA == 0            =>   buf = "", *pDecPos = 0, *pSign = 0
+ * *pA == 0            =>   buf = "", *pDecPos = 1, *pSign = 0
  * *pA == 12.34        =>   buf = "1234", *pDecPos = 2, *pSign = 0
  * *pA == -1000.0000   =>   buf = "1", *pDecPos = 4, *pSign = 1
  * *pA == -0.00000076  =>   buf = "76", *pDecPos = -6, *pSign = 0
@@ -1190,7 +1190,7 @@ void mono_decimalFloorAndTrunc(/*[In, Out]*/decimal_repr* pA, gint32 floorFlag)
 {
     guint64 alo, ahi;
     guint32 factor, rest;
-    int scale, sign, index;
+    int scale, sign, idx;
     int hasRest = 0;
 
     scale = pA->signscale.scale;
@@ -1200,9 +1200,9 @@ void mono_decimalFloorAndTrunc(/*[In, Out]*/decimal_repr* pA, gint32 floorFlag)
     sign = pA->signscale.sign;
 
     while (scale > 0) {
-        index = (scale > DECIMAL_MAX_INTFACTORS) ? DECIMAL_MAX_INTFACTORS : scale;
-        factor = constantsDecadeInt32Factors[index];
-        scale -= index;
+        idx = (scale > DECIMAL_MAX_INTFACTORS) ? DECIMAL_MAX_INTFACTORS : scale;
+        factor = constantsDecadeInt32Factors[idx];
+        scale -= idx;
         div128by32(&alo, &ahi, factor, &rest);
         hasRest = hasRest || (rest != 0);
     }
@@ -1269,7 +1269,7 @@ static int decimalDivSub(/*[In]*/decimal_repr* pA, /*[In]*/decimal_repr* pB,
     guint64 alo, ami, ahi;
     guint64 tlo, tmi, thi;
     guint32 blo, bmi, bhi;
-    int ashift, bshift, extraBit, exp;
+    int ashift, bshift, extraBit, texp;
 
     ahi = (((guint64)(pA->hi32)) << 32) | pA->mid32;
     ami = ((guint64)(pA->lo32)) << 32;
@@ -1308,22 +1308,22 @@ static int decimalDivSub(/*[In]*/decimal_repr* pA, /*[In]*/decimal_repr* pB,
     }
 
     div192by96to128(alo, ami, ahi, blo, bmi, bhi, pclo, pchi);
-    exp = 128 + ashift - bshift;
+    texp = 128 + ashift - bshift;
 
     if (extraBit) {
         rshift128(pclo, pchi);
         *pchi += LIT_GUINT64_HIGHBIT;
-        exp--;
+        texp--;
     }
 
     /* try loss free right shift */
-    while (exp > 0 && (*pclo & 1) == 0) {
+    while (texp > 0 && (*pclo & 1) == 0) {
         /* right shift */
         rshift128(pclo, pchi);
-        exp--;
+        texp--;
     }
 
-    *pExp = exp;
+    *pExp = texp;
 
     return DECIMAL_SUCCESS;
 }
@@ -1331,9 +1331,9 @@ static int decimalDivSub(/*[In]*/decimal_repr* pA, /*[In]*/decimal_repr* pB,
 gint32 mono_decimalDiv(/*[Out]*/decimal_repr* pC, /*[In]*/decimal_repr* pA, /*[In]*/decimal_repr* pB)
 {
     guint64 clo, chi; /* result */
-    int scale, exp, rc;
+    int scale, texp, rc;
 
-    rc = decimalDivSub(pA, pB, &clo, &chi, &exp);
+    rc = decimalDivSub(pA, pB, &clo, &chi, &texp);
     if (rc != DECIMAL_SUCCESS) {
         if (rc == DECIMAL_FINISHED) rc = DECIMAL_SUCCESS;
         return rc;
@@ -1342,8 +1342,8 @@ gint32 mono_decimalDiv(/*[Out]*/decimal_repr* pC, /*[In]*/decimal_repr* pA, /*[I
     /* adjust scale and sign */
     scale = (int)pA->signscale.scale - (int)pB->signscale.scale;
 
-    //test: printf("0: %.17e\n", (((double)chi) * pow(2,64) + clo) * pow(10, -scale) * pow(2, -exp));
-    rc = rescale128(&clo, &chi, &scale, exp, 0, DECIMAL_MAX_SCALE, 1);
+    /*test: printf("0: %.17e\n", (((double)chi) * pow(2,64) + clo) * pow(10, -scale) * pow(2, -exp));*/
+    rc = rescale128(&clo, &chi, &scale, texp, 0, DECIMAL_MAX_SCALE, 1);
     if (rc != DECIMAL_SUCCESS) return rc;
 
     return pack128toDecimal(pC, clo, chi, scale, pA->signscale.sign ^ pB->signscale.sign);
@@ -1352,9 +1352,9 @@ gint32 mono_decimalDiv(/*[Out]*/decimal_repr* pC, /*[In]*/decimal_repr* pA, /*[I
 gint32 mono_decimalIntDiv(/*[Out]*/decimal_repr* pC, /*[In]*/decimal_repr* pA, /*[In]*/decimal_repr* pB)
 {
     guint64 clo, chi; /* result */
-    int scale, exp, rc;
+    int scale, texp, rc;
 
-    rc = decimalDivSub(pA, pB, &clo, &chi, &exp);
+    rc = decimalDivSub(pA, pB, &clo, &chi, &texp);
     if (rc != DECIMAL_SUCCESS) {
         if (rc == DECIMAL_FINISHED) rc = DECIMAL_SUCCESS;
         return rc;
@@ -1364,7 +1364,7 @@ gint32 mono_decimalIntDiv(/*[Out]*/decimal_repr* pC, /*[In]*/decimal_repr* pA, /
     scale = (int)pA->signscale.scale - (int)pB->signscale.scale;
 
     /* truncate result to integer */
-    rc = rescale128(&clo, &chi, &scale, exp, 0, 0, 0);
+    rc = rescale128(&clo, &chi, &scale, texp, 0, 0, 0);
     if (rc != DECIMAL_SUCCESS) return rc;
 
     return pack128toDecimal(pC, clo, chi, scale, pA->signscale.sign);
@@ -1374,18 +1374,18 @@ gint32 mono_decimalIntDiv(/*[Out]*/decimal_repr* pC, /*[In]*/decimal_repr* pA, /
    If q is the exact value for log2(a), then q <= decimalLog2(a) <= q+1 */
 DECINLINE static int decimalLog2(/*[In]*/decimal_repr* pA)
 {
-    int log2;
+    int tlog2;
     int scale = pA->signscale.scale;
 
-    if (pA->hi32 != 0) log2 = 64 + log2_32(pA->hi32);
-    else if (pA->mid32 != 0) log2 = 32 + log2_32(pA->mid32);
-    else log2 = log2_32(pA->lo32);
+    if (pA->hi32 != 0) tlog2 = 64 + log2_32(pA->hi32);
+    else if (pA->mid32 != 0) tlog2 = 32 + log2_32(pA->mid32);
+    else tlog2 = log2_32(pA->lo32);
 
-    if (log2 != DECIMAL_LOG_NEGINF) {
-        log2 -= (scale * 33219) / 10000;
+    if (tlog2 != DECIMAL_LOG_NEGINF) {
+        tlog2 -= (scale * 33219) / 10000;
     }
 
-    return log2;
+    return tlog2;
 }
 
 DECINLINE static int decimalIsZero(/*[In]*/decimal_repr* pA)
@@ -1423,12 +1423,12 @@ gint32 mono_decimalCompare(/*[In]*/decimal_repr* pA, /*[In]*/decimal_repr* pB)
 }
 
 /* d=(-1)^sign * n * 2^(k-52) with sign (1bit), k(11bit), n-2^52(52bit) */  
-DECINLINE static void buildIEEE754Double(double* pd, int sign, int exp, guint64 mantisse)
+DECINLINE static void buildIEEE754Double(double* pd, int sign, int texp, guint64 mantisse)
 {
     guint64* p = (guint64*) pd;
 
     PRECONDITION(sign == 0 || sign == 1);
-    *p = (((guint64)sign) << 63) | (((guint64)((1023+exp)&0x7ff)) << 52) | mantisse;
+    *p = (((guint64)sign) << 63) | (((guint64)((1023+texp)&0x7ff)) << 52) | mantisse;
 }
 
 double mono_decimal2double(/*[In]*/decimal_repr* pA)
@@ -1436,7 +1436,7 @@ double mono_decimal2double(/*[In]*/decimal_repr* pA)
     double d;
     guint64 alo, ahi, mantisse;
     guint32 overhang, factor, roundBits;
-    int scale, exp, log5, i;
+    int scale, texp, log5, i;
 
     ahi = (((guint64)(pA->hi32)) << 32) | pA->mid32;
     alo = ((guint64)(pA->lo32)) << 32;
@@ -1444,14 +1444,14 @@ double mono_decimal2double(/*[In]*/decimal_repr* pA)
     /* special case zero */
     if (ahi == 0 && alo == 0) return 0.0;
 
-    exp = 0;
+    texp = 0;
     scale = pA->signscale.scale;
 
     /* transform n * 10^-scale and exp = 0 => m * 2^-exp and scale = 0 */
     while (scale > 0) {
         while ((ahi & LIT_GUINT64_HIGHBIT) == 0) {
             lshift128(&alo, &ahi);
-            exp++;
+            texp++;
         }
 
         overhang = (guint32) (ahi >> 32);
@@ -1470,14 +1470,14 @@ double mono_decimal2double(/*[In]*/decimal_repr* pA)
             /* n * 10^-scale * 2^-exp => m * 10^-(scale-i) * 2^-(exp+i) with m = n * 5^-i */
             div128by32(&alo, &ahi, factor, 0);
             scale -= i;
-            exp += i;
+            texp += i;
         }
     }
 
     /* normalize significand (highest bit should be 1) */
     while ((ahi & LIT_GUINT64_HIGHBIT) == 0) {
         lshift128(&alo, &ahi);
-        exp++;
+        texp++;
     }
 
     /* round to nearest even */
@@ -1485,25 +1485,25 @@ double mono_decimal2double(/*[In]*/decimal_repr* pA)
     ahi += 0x400;
     if ((ahi & LIT_GUINT64_HIGHBIT) == 0) { /* overflow ? */
         ahi >>= 1;
-        exp++;
+        texp++;
     } else if ((roundBits & 0x400) == 0) ahi &= ~1;
 
     /* 96 bit => 1 implizit bit and 52 explicit bits */
     mantisse = (ahi & ~LIT_GUINT64_HIGHBIT) >> 11;
 
-    buildIEEE754Double(&d, pA->signscale.sign, -exp+95, mantisse);
+    buildIEEE754Double(&d, pA->signscale.sign, -texp+95, mantisse);
 
     return d;
 }
 
 /* a *= 10^exp */
-gint32 mono_decimalSetExponent(/*[In, Out]*/decimal_repr* pA, gint32 exp)
+gint32 mono_decimalSetExponent(/*[In, Out]*/decimal_repr* pA, gint32 texp)
 {
     guint64 alo, ahi;
     int rc;
     int scale = pA->signscale.scale;
 
-    scale -= exp;
+    scale -= texp;
 
     if (scale < 0 || scale > DECIMAL_MAX_SCALE) {
         DECTO128(pA, alo, ahi);
diff --git a/mono/metadata/decimal.h b/mono/metadata/decimal.h
index 383449fdc7e..f587f3f6029 100644
--- a/mono/metadata/decimal.h
+++ b/mono/metadata/decimal.h
@@ -6,12 +6,21 @@ typedef struct
 {
 	union {
 		guint32 ss32;
+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
+	    struct {
+		    unsigned int sign      : 1;
+		    unsigned int reserved2 : 7;
+		    unsigned int scale     : 8;
+		    unsigned int reserved1 : 16;
+	    } signscale;
+#else
 	    struct {
 		    unsigned int reserved1 : 16;
-	        unsigned int scale : 8; 
+		    unsigned int scale     : 8;
 		    unsigned int reserved2 : 7;
-	    	unsigned int sign : 1; 
-		} signscale;
+		    unsigned int sign      : 1;
+	    } signscale;
+#endif
 	} u;
     guint32 hi32;
     guint32 lo32;
@@ -31,7 +40,7 @@ gint32 mono_decimalDiv(/*[Out]*/decimal_repr* pC, /*[In]*/decimal_repr* pA, /*[I
 gint32 mono_decimalIntDiv(/*[Out]*/decimal_repr* pC, /*[In]*/decimal_repr* pA, /*[In]*/decimal_repr* pB);
 gint32 mono_decimalCompare(/*[In]*/decimal_repr* pA, /*[In]*/decimal_repr* pB);
 double mono_decimal2double(/*[In]*/decimal_repr* pA);
-gint32 mono_decimalSetExponent(/*[In, Out]*/decimal_repr* pA, gint32 exp);
+gint32 mono_decimalSetExponent(/*[In, Out]*/decimal_repr* pA, gint32 texp);
 
 gint32 mono_string2decimal(/*[Out]*/decimal_repr* pA, /*[In]*/MonoString* s, gint32 decrDecimal, gint32 sign);
 gint32 mono_decimal2string(/*[In]*/decimal_repr* pA, int digits, int decimals,
diff --git a/mono/metadata/domain.c b/mono/metadata/domain.c
new file mode 100644
index 00000000000..fcdcae7feb4
--- /dev/null
+++ b/mono/metadata/domain.c
@@ -0,0 +1,511 @@
+
+/*
+ * domain.c: MonoDomain functions
+ *
+ * Author:
+ *	Dietmar Maurer (dietmar@ximian.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+#include <string.h>
+
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
+
+#include <mono/metadata/object.h>
+#include <mono/metadata/appdomain.h>
+#include <mono/metadata/assembly.h>
+#include <mono/metadata/exception.h>
+#include <mono/metadata/cil-coff.h>
+
+static guint32 appdomain_thread_id = 0;
+
+MonoDomain *mono_root_domain = NULL;
+
+static MonoJitInfoTable *
+mono_jit_info_table_new (void)
+{
+	return g_array_new (FALSE, FALSE, sizeof (gpointer));
+}
+
+static void
+mono_jit_info_table_free (MonoJitInfoTable *table)
+{
+	g_array_free (table, TRUE);
+}
+
+static int
+mono_jit_info_table_index (MonoJitInfoTable *table, char *addr)
+{
+	int left = 0, right = table->len;
+
+	while (left < right) {
+		int pos = (left + right) / 2;
+		MonoJitInfo *ji = g_array_index (table, gpointer, pos);
+		char *start = ji->code_start;
+		char *end = start + ji->code_size;
+
+		if (addr < start)
+			right = pos;
+		else if (addr >= end) 
+			left = pos + 1;
+		else
+			return pos;
+	}
+
+	return left;
+}
+
+MonoJitInfo *
+mono_jit_info_table_find (MonoDomain *domain, char *addr)
+{
+	MonoJitInfoTable *table = domain->jit_info_table;
+	int left = 0, right = table->len;
+
+	while (left < right) {
+		int pos = (left + right) / 2;
+		MonoJitInfo *ji = g_array_index (table, gpointer, pos);
+		char *start = ji->code_start;
+		char *end = start + ji->code_size;
+
+		if (addr < start)
+			right = pos;
+		else if (addr >= end) 
+			left = pos + 1;
+		else
+			return ji;
+	}
+
+	/* maybe irt is shared code, so we also search in the root domain */
+	if (domain != mono_root_domain)
+		return mono_jit_info_table_find (mono_root_domain, addr);
+
+	return NULL;
+}
+
+void
+mono_jit_info_table_add (MonoDomain *domain, MonoJitInfo *ji)
+{
+	MonoJitInfoTable *table = domain->jit_info_table;
+	gpointer start = ji->code_start;
+	int pos = mono_jit_info_table_index (table, start);
+
+	g_array_insert_val (table, pos, ji);
+}
+
+static int
+ldstr_hash (const char* str)
+{
+	guint len, h;
+	const char *end;
+	len = mono_metadata_decode_blob_size (str, &str) - 1;
+	end = str + len;
+	/* if len == 0 *str will point to the mark byte */
+	h = len? *str: 0;
+	/*
+	 * FIXME: The distribution may not be so nice with lots of
+	 * null chars in the string.
+	 */
+	for (str += 1; str < end; str++)
+		h = (h << 5) - h + *str;
+	return h;
+}
+
+static gboolean
+ldstr_equal (const char *str1, const char *str2) {
+	int len, len2;
+	len = mono_metadata_decode_blob_size (str1, NULL) - 1;
+	len2 = mono_metadata_decode_blob_size (str2, NULL) - 1;
+	if (len != len2)
+		return 0;
+	return memcmp (str1, str2, len) == 0;
+}
+
+static gboolean
+mono_string_equal (MonoString *s1, MonoString *s2)
+{
+	int l1 = mono_string_length (s1);
+	int l2 = mono_string_length (s2);
+
+	if (l1 != l2)
+		return FALSE;
+
+	return memcmp (mono_string_chars (s1), mono_string_chars (s2), l1) == 0; 
+}
+
+static guint
+mono_string_hash (MonoString *s)
+{
+	const guint16 *p = mono_string_chars (s);
+	int i, len = mono_string_length (s);
+	guint h = 0;
+
+	for (i = 0; i < len; i++) {
+		h = (h << 5) - h + *p;
+		p++;
+	}
+
+	return h;	
+}
+
+#if HAVE_BOEHM_GC
+static void
+domain_finalizer (void *obj, void *data) {
+	g_print ("domain finalized\n");
+}
+#endif
+
+MonoDomain *
+mono_domain_create (void)
+{
+	MonoDomain *domain;
+
+#if HAVE_BOEHM_GC
+	domain = GC_malloc (sizeof (MonoDomain));
+	GC_register_finalizer (domain, domain_finalizer, NULL, NULL, NULL);
+#else
+	domain = g_new0 (MonoDomain, 1);
+#endif
+	domain->domain = NULL;
+	domain->setup = NULL;
+	domain->friendly_name = NULL;
+
+	domain->mp = mono_mempool_new ();
+	domain->code_mp = mono_mempool_new ();
+	domain->env = mono_g_hash_table_new ((GHashFunc)mono_string_hash, (GCompareFunc)mono_string_equal);
+	domain->assemblies = g_hash_table_new (g_str_hash, g_str_equal);
+	domain->class_vtable_hash = mono_g_hash_table_new (NULL, NULL);
+	domain->proxy_vtable_hash = mono_g_hash_table_new (NULL, NULL);
+	domain->static_data_hash = mono_g_hash_table_new (NULL, NULL);
+	domain->jit_code_hash = g_hash_table_new (NULL, NULL);
+	domain->ldstr_table = mono_g_hash_table_new ((GHashFunc)ldstr_hash, (GCompareFunc)ldstr_equal);
+	domain->jit_info_table = mono_jit_info_table_new ();
+
+	InitializeCriticalSection (&domain->lock);
+	return domain;
+}
+
+/**
+ * mono_init:
+ * 
+ * Creates the initial application domain and initializes the mono_defaults
+ * structure.
+ * This function is guaranteed to not run any IL code.
+ *
+ * Returns: the initial domain.
+ */
+MonoDomain *
+mono_init (const char *filename)
+{
+	static MonoDomain *domain = NULL;
+	MonoAssembly *ass;
+	MonoImageOpenStatus status = MONO_IMAGE_OK;
+	MonoAssemblyName corlib_aname;
+
+	if (domain)
+		g_assert_not_reached ();
+
+	appdomain_thread_id = TlsAlloc ();
+
+	domain = mono_domain_create ();
+	mono_root_domain = domain;
+
+	TlsSetValue (appdomain_thread_id, domain);
+
+	/* find the corlib */
+	corlib_aname.name = "corlib";
+	ass = mono_assembly_load (&corlib_aname, NULL, &status);
+	if ((status != MONO_IMAGE_OK) || (ass == NULL)) {
+		switch (status){
+		case MONO_IMAGE_ERROR_ERRNO:
+			g_print ("The assembly corlib.dll was not found or could not be loaded.\n");
+			g_print ("It should have been installed in the `%s' directory.\n", MONO_ASSEMBLIES);
+			break;
+		case MONO_IMAGE_IMAGE_INVALID:
+			g_print ("The file %s/corlib.dll is an invalid CIL image\n", MONO_ASSEMBLIES);
+			break;
+		case MONO_IMAGE_MISSING_ASSEMBLYREF:
+			g_print ("Minning assembly reference in %s/corlib.dll\n", MONO_ASSEMBLIES);
+			break;
+		case MONO_IMAGE_OK:
+			/* to suppress compiler warning */
+			break;
+		}
+		
+		exit (1);
+	}
+	mono_defaults.corlib = ass->image;
+
+	mono_defaults.object_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Object");
+	g_assert (mono_defaults.object_class != 0);
+
+	mono_defaults.void_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Void");
+	g_assert (mono_defaults.void_class != 0);
+
+	mono_defaults.boolean_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Boolean");
+	g_assert (mono_defaults.boolean_class != 0);
+
+	mono_defaults.byte_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Byte");
+	g_assert (mono_defaults.byte_class != 0);
+
+	mono_defaults.sbyte_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "SByte");
+	g_assert (mono_defaults.sbyte_class != 0);
+
+	mono_defaults.int16_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Int16");
+	g_assert (mono_defaults.int16_class != 0);
+
+	mono_defaults.uint16_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "UInt16");
+	g_assert (mono_defaults.uint16_class != 0);
+
+	mono_defaults.int32_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Int32");
+	g_assert (mono_defaults.int32_class != 0);
+
+	mono_defaults.uint32_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "UInt32");
+	g_assert (mono_defaults.uint32_class != 0);
+
+	mono_defaults.uint_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "UIntPtr");
+	g_assert (mono_defaults.uint_class != 0);
+
+	mono_defaults.int_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "IntPtr");
+	g_assert (mono_defaults.int_class != 0);
+
+	mono_defaults.int64_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Int64");
+	g_assert (mono_defaults.int64_class != 0);
+
+	mono_defaults.uint64_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "UInt64");
+	g_assert (mono_defaults.uint64_class != 0);
+
+	mono_defaults.single_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Single");
+	g_assert (mono_defaults.single_class != 0);
+
+	mono_defaults.double_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Double");
+	g_assert (mono_defaults.double_class != 0);
+
+	mono_defaults.char_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Char");
+	g_assert (mono_defaults.char_class != 0);
+
+	mono_defaults.string_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "String");
+	g_assert (mono_defaults.string_class != 0);
+
+	mono_defaults.enum_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Enum");
+	g_assert (mono_defaults.enum_class != 0);
+
+	mono_defaults.array_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Array");
+	g_assert (mono_defaults.array_class != 0);
+
+	mono_defaults.multicastdelegate_class = mono_class_from_name (
+		mono_defaults.corlib, "System", "MulticastDelegate");
+	g_assert (mono_defaults.multicastdelegate_class != 0 );
+
+	mono_defaults.asyncresult_class = mono_class_from_name (
+		mono_defaults.corlib, "System.Runtime.Remoting.Messaging", 
+		"AsyncResult");
+	g_assert (mono_defaults.asyncresult_class != 0 );
+
+	mono_defaults.waithandle_class = mono_class_from_name (
+		mono_defaults.corlib, "System.Threading", "WaitHandle");
+	g_assert (mono_defaults.waithandle_class != 0 );
+
+	mono_defaults.typehandle_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "RuntimeTypeHandle");
+	g_assert (mono_defaults.typehandle_class != 0);
+
+	mono_defaults.methodhandle_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "RuntimeMethodHandle");
+	g_assert (mono_defaults.methodhandle_class != 0);
+
+	mono_defaults.fieldhandle_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "RuntimeFieldHandle");
+	g_assert (mono_defaults.fieldhandle_class != 0);
+
+	mono_defaults.monotype_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "MonoType");
+	g_assert (mono_defaults.monotype_class != 0);
+
+	mono_defaults.exception_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "Exception");
+	g_assert (mono_defaults.exception_class != 0);
+
+	mono_defaults.threadabortexception_class = mono_class_from_name (
+                mono_defaults.corlib, "System.Threading", "ThreadAbortException");
+	g_assert (mono_defaults.threadabortexception_class != 0);
+
+	mono_defaults.thread_class = mono_class_from_name (
+                mono_defaults.corlib, "System.Threading", "Thread");
+	g_assert (mono_defaults.thread_class != 0);
+
+	mono_defaults.appdomain_class = mono_class_from_name (
+                mono_defaults.corlib, "System", "AppDomain");
+	g_assert (mono_defaults.appdomain_class != 0);
+
+	mono_defaults.transparent_proxy_class = mono_class_from_name (
+                mono_defaults.corlib, "System.Runtime.Remoting.Proxies", "TransparentProxy");
+	g_assert (mono_defaults.transparent_proxy_class != 0);
+
+	mono_defaults.real_proxy_class = mono_class_from_name (
+                mono_defaults.corlib, "System.Runtime.Remoting.Proxies", "RealProxy");
+	g_assert (mono_defaults.real_proxy_class != 0);
+
+	mono_defaults.mono_method_message_class = mono_class_from_name (
+                mono_defaults.corlib, "System.Runtime.Remoting.Messaging", "MonoMethodMessage");
+	g_assert (mono_defaults.mono_method_message_class != 0);
+
+	mono_defaults.field_info_class = mono_class_from_name (
+		mono_defaults.corlib, "System.Reflection", "FieldInfo");
+	g_assert (mono_defaults.field_info_class != 0);
+
+	mono_defaults.stringbuilder_class = mono_class_from_name (
+		mono_defaults.corlib, "System.Text", "StringBuilder");
+	g_assert (mono_defaults.stringbuilder_class != 0);
+
+	mono_defaults.math_class = mono_class_from_name (
+	        mono_defaults.corlib, "System", "Math");
+	g_assert (mono_defaults.math_class != 0);
+
+	mono_defaults.stack_frame_class = mono_class_from_name (
+	        mono_defaults.corlib, "System.Diagnostics", "StackFrame");
+	g_assert (mono_defaults.stack_frame_class != 0);
+
+	mono_defaults.stack_trace_class = mono_class_from_name (
+	        mono_defaults.corlib, "System.Diagnostics", "StackTrace");
+	g_assert (mono_defaults.stack_trace_class != 0);
+
+	mono_defaults.marshal_class = mono_class_from_name (
+	        mono_defaults.corlib, "System.Runtime.InteropServices", "Marshal");
+	g_assert (mono_defaults.marshal_class != 0);
+
+	mono_defaults.iserializeable_class = mono_class_from_name (
+	        mono_defaults.corlib, "System.Runtime.Serialization", "ISerializable");
+	g_assert (mono_defaults.iserializeable_class != 0);
+
+	mono_defaults.serializationinfo_class = mono_class_from_name (
+	        mono_defaults.corlib, "System.Runtime.Serialization", "SerializationInfo");
+	g_assert (mono_defaults.serializationinfo_class != 0);
+
+	mono_defaults.streamingcontext_class = mono_class_from_name (
+	        mono_defaults.corlib, "System.Runtime.Serialization", "StreamingContext");
+	g_assert (mono_defaults.streamingcontext_class != 0);
+
+	domain->friendly_name = g_path_get_basename (filename);
+
+	return domain;
+}
+
+/**
+ * mono_domain_get:
+ *
+ * Returns the current domain.
+ */
+inline MonoDomain *
+mono_domain_get ()
+{
+	return ((MonoDomain *)TlsGetValue (appdomain_thread_id));
+}
+
+/**
+ * mono_domain_set:
+ * @domain: the new domain
+ *
+ * Sets the current domain to @domain.
+ */
+inline void
+mono_domain_set (MonoDomain *domain)
+{
+	TlsSetValue (appdomain_thread_id, domain);
+}
+
+/**
+ * mono_domain_assembly_open:
+ * @domain: the application domain
+ * @name: file name of the assembly
+ *
+ * fixme: maybe we should integrate this with mono_assembly_open ??
+ */
+MonoAssembly *
+mono_domain_assembly_open (MonoDomain *domain, const char *name)
+{
+	MonoAssembly *ass, *tmp;
+	int i;
+
+	if ((ass = g_hash_table_lookup (domain->assemblies, name)))
+		return ass;
+
+	if (!(ass = mono_assembly_open (name, NULL)))
+		return NULL;
+
+	mono_domain_lock (domain);
+	g_hash_table_insert (domain->assemblies, ass->aname.name, ass);
+	mono_domain_unlock (domain);
+
+	/* FIXME: maybe this must be recursive ? */
+	for (i = 0; (tmp = ass->image->references [i]) != NULL; i++) {
+		if (!g_hash_table_lookup (domain->assemblies, tmp->aname.name))
+			g_hash_table_insert (domain->assemblies, tmp->aname.name, tmp);
+	}
+
+	return ass;
+}
+
+static void
+remove_assembly (gpointer key, gpointer value, gpointer user_data)
+{
+	mono_assembly_close ((MonoAssembly *)value);
+}
+
+void
+mono_domain_unload (MonoDomain *domain, gboolean force)
+{
+	if ((domain == mono_root_domain) && !force) {
+		g_warning ("cant unload root domain");
+		return;
+	}
+
+	g_free (domain->friendly_name);
+	g_hash_table_foreach (domain->assemblies, remove_assembly, NULL);
+
+	mono_g_hash_table_destroy (domain->env);
+	g_hash_table_destroy (domain->assemblies);
+	mono_g_hash_table_destroy (domain->class_vtable_hash);
+	mono_g_hash_table_destroy (domain->proxy_vtable_hash);
+	mono_g_hash_table_destroy (domain->static_data_hash);
+	g_hash_table_destroy (domain->jit_code_hash);
+	mono_g_hash_table_destroy (domain->ldstr_table);
+	mono_jit_info_table_free (domain->jit_info_table);
+	mono_mempool_destroy (domain->mp);
+	mono_mempool_destroy (domain->code_mp);
+	DeleteCriticalSection (&domain->lock);
+	
+	/* FIXME: anything else required ? */
+
+#if HAVE_BOEHM_GC
+#else
+	g_free (domain);
+#endif
+
+	if ((domain == mono_root_domain))
+		mono_root_domain = NULL;
+}
+
diff --git a/mono/metadata/exception.c b/mono/metadata/exception.c
index 058d8787301..3996437c0a9 100644
--- a/mono/metadata/exception.c
+++ b/mono/metadata/exception.c
@@ -2,17 +2,29 @@
  * exception.c: Exception handling
  *
  * Authors:
- *	Paolo Molaro (lupus@ximian.com)
- *	Dietmar Maurer (dietmar@ximian.com)
- *	Dick Porter (dick@ximian.com)
+ *	Paolo Molaro    (lupus@ximian.com)
+ *	Dietmar Maurer  (dietmar@ximian.com)
+ *	Dick Porter     (dick@ximian.com)
+ *      Miguel de Icaza (miguel@ximian.com)
  *
- * (C) 2001 Ximian, Inc.
+ * (C) 2001, 2002 Ximian, Inc.
  */
 
 #include <mono/metadata/exception.h>
 #include <mono/metadata/class.h>
 #include <mono/metadata/appdomain.h>
+#include <string.h>
 
+/**
+ * mono_exception_from_name:
+ * @image: the Mono image where to look for the class
+ * @name_space: the namespace for the class
+ * @name: class name
+ *
+ * Creates an exception of the given namespace/name class.
+ *
+ * Returns: the initialized exception instance.
+ */
 MonoException *
 mono_exception_from_name (MonoImage *image, const char *name_space,
 			  const char *name)
@@ -31,6 +43,54 @@ mono_exception_from_name (MonoImage *image, const char *name_space,
 	return (MonoException *)o;
 }
 
+/**
+ * mono_exception_from_name_two_strings:
+ * @image: the Mono image where to look for the class
+ * @name_space: the namespace for the class
+ * @name: class name
+ * @a1: first string argument to pass
+ * @a2: second string argument to pass
+ *
+ * Creates an exception from a constructor that takes two string
+ * arguments.
+ *
+ * Returns: the initialized exception instance.
+ */
+static MonoException *
+mono_exception_from_name_two_strings (MonoImage *image, const char *name_space,
+				      const char *name, MonoString *a1, MonoString *a2)
+{
+	MonoDomain *domain = mono_domain_get ();
+	MonoClass *klass;
+	MonoMethod *method = NULL;
+	MonoObject *o;
+	int i;
+	gpointer args [2];
+	
+	klass = mono_class_from_name (image, name_space, name);
+	o = mono_object_new (domain, klass);
+
+	for (i = 0; i < klass->method.count; ++i) {
+		MonoMethodSignature *sig;
+		
+		if (strcmp (".ctor", klass->methods [i]->name))
+			continue;
+		sig = klass->methods [i]->signature;
+		if (sig->param_count != 2)
+			continue;
+
+		if (sig->params [0]->type != MONO_TYPE_STRING ||
+		    sig->params [1]->type != MONO_TYPE_STRING)
+			continue;
+		method = klass->methods [i];
+	}
+
+	args [0] = a1;
+	args [1] = a2;
+	mono_runtime_invoke (method, o, args, NULL);
+	return (MonoException *) o;
+}
+
 MonoException *
 mono_get_exception_divide_by_zero ()
 {
@@ -46,6 +106,13 @@ mono_get_exception_security ()
 }
 
 MonoException *
+mono_get_exception_thread_abort ()
+{
+	return mono_exception_from_name (mono_defaults.corlib, "System.Threading",
+					 "ThreadAbortException");
+}
+
+MonoException *
 mono_get_exception_arithmetic ()
 {
 	return mono_exception_from_name (mono_defaults.corlib, "System",
@@ -67,10 +134,37 @@ mono_get_exception_null_reference ()
 }
 
 MonoException *
-mono_get_exception_execution_engine ()
+mono_get_exception_execution_engine (const guchar *msg)
 {
-	return mono_exception_from_name (mono_defaults.corlib, "System",
+	MonoException *ex;
+	MonoDomain *domain;
+
+	ex = mono_exception_from_name (mono_defaults.corlib, "System",
 					 "ExecutionEngineException");
+
+	domain = ((MonoObject *)ex)->vtable->domain;
+
+	if (msg)
+		ex->message = mono_string_new (domain, msg);
+
+	return ex;
+}
+
+MonoException *
+mono_get_exception_serialization (const guchar *msg)
+{
+	MonoException *ex;
+	MonoDomain *domain;
+
+	ex = mono_exception_from_name (mono_defaults.corlib, "System.Runtime.Serialization",
+				       "SerializationException");
+
+	domain = ((MonoObject *)ex)->vtable->domain;
+
+	if (msg)
+		ex->message = mono_string_new (domain, msg);
+
+	return ex;
 }
 
 MonoException *
@@ -116,13 +210,16 @@ mono_get_exception_missing_method ()
 }
 
 MonoException*
-mono_get_exception_argument_null (MonoDomain *domain, const guchar *arg)
+mono_get_exception_argument_null (const guchar *arg)
 {
 	MonoException *ex;
+	MonoDomain *domain;
 
 	ex = (MonoException *)mono_exception_from_name ( 
 	        mono_defaults.corlib, "System", "ArgumentNullException");
 
+	domain = ((MonoObject *)ex)->vtable->domain;
+
 	if (arg)
 		((MonoArgumentException *)ex)->param_name =
 			mono_string_new (domain, arg);
@@ -131,13 +228,16 @@ mono_get_exception_argument_null (MonoDomain *domain, const guchar *arg)
 }
 
 MonoException *
-mono_get_exception_argument (MonoDomain *domain, const guchar *arg, const guchar *msg)
+mono_get_exception_argument (const guchar *arg, const guchar *msg)
 {
 	MonoException *ex;
+	MonoDomain *domain;
 
 	ex = (MonoException *)mono_exception_from_name (
 	        mono_defaults.corlib, "System", "ArgumentException");
 
+	domain = ((MonoObject *)ex)->vtable->domain;
+
 	if (msg)
 		ex->message = mono_string_new (domain, msg);
 	
@@ -149,16 +249,60 @@ mono_get_exception_argument (MonoDomain *domain, const guchar *arg, const guchar
 }
 
 MonoException *
-mono_get_exception_io (MonoDomain *domain, const guchar *msg)
+mono_get_exception_argument_out_of_range (const guchar *arg)
 {
 	MonoException *ex;
+	MonoDomain *domain;
+
+	ex = (MonoException *)mono_exception_from_name (
+	        mono_defaults.corlib, "System", "ArgumentOutOfRangeException");
+
+	domain = ((MonoObject *)ex)->vtable->domain;
+
+	if (arg)
+		((MonoArgumentException *)ex)->param_name =
+			mono_string_new (domain, arg);
+	
+	return ex;
+}
+
+MonoException *
+mono_get_exception_thread_state (const guchar *msg)
+{
+	MonoException *ex;
+	MonoDomain *domain;
+
+	ex = (MonoException *)mono_exception_from_name (
+	        mono_defaults.corlib, "System.Threading", "ThreadStateException");
+
+	domain = ((MonoObject *)ex)->vtable->domain;
+
+	if (msg)
+		ex->message = mono_string_new (domain, msg);
+		
+	return ex;
+}
+
+MonoException *
+mono_get_exception_io (const guchar *msg)
+{
+	MonoException *ex;
+	MonoDomain *domain;
 
 	ex=(MonoException *)mono_exception_from_name ( 
 	        mono_defaults.corlib, "System.IO", "IOException");
 
+	domain = ((MonoObject *)ex)->vtable->domain;
+
 	ex->message=mono_string_new (domain, msg);
 	
 	return(ex);
 }
 
+MonoException *
+mono_get_exception_file_not_found (MonoString *fname)
+{
+	return mono_exception_from_name_two_strings (
+		mono_defaults.corlib, "System.IO", "FileNotFoundException", fname, fname);
+}
 
diff --git a/mono/metadata/exception.h b/mono/metadata/exception.h
index 134c2043b87..76c3d48dfb8 100644
--- a/mono/metadata/exception.h
+++ b/mono/metadata/exception.h
@@ -32,7 +32,16 @@ MonoException *
 mono_get_exception_null_reference      (void);
 
 MonoException *
-mono_get_exception_execution_engine    (void);
+mono_get_exception_execution_engine    (const guchar *msg);
+
+MonoException *
+mono_get_exception_thread_abort        (void);
+
+MonoException *
+mono_get_exception_thread_state        (const guchar *msg);
+
+MonoException *
+mono_get_exception_serialization       (const guchar *msg);
 
 MonoException *
 mono_get_exception_invalid_cast        (void);
@@ -53,12 +62,18 @@ MonoException *
 mono_get_exception_not_implemented     (void);
 
 MonoException*
-mono_get_exception_argument_null       (MonoDomain *domain, const guchar *arg);
+mono_get_exception_argument_null       (const guchar *arg);
+
+MonoException *
+mono_get_exception_argument            (const guchar *arg, const guchar *msg);
+
+MonoException *
+mono_get_exception_argument_out_of_range (const guchar *arg);
 
 MonoException *
-mono_get_exception_argument            (MonoDomain *domain, const guchar *arg, const guchar *msg);
+mono_get_exception_io                    (const guchar *msg);
 
 MonoException *
-mono_get_exception_io                  (MonoDomain *domain, const guchar *msg);
+mono_get_exception_file_not_found        (MonoString *fname);
 
 #endif /* _MONO_METADATA_EXCEPTION_H_ */
diff --git a/mono/metadata/file-io.c b/mono/metadata/file-io.c
index 4778b1256c3..b36f192da10 100644
--- a/mono/metadata/file-io.c
+++ b/mono/metadata/file-io.c
@@ -16,7 +16,9 @@
 #include <mono/metadata/exception.h>
 #include <mono/metadata/appdomain.h>
 
-#define DEBUG
+#undef DEBUG
+
+/* conversion functions */
 
 static guint32 convert_mode(MonoFileMode mono_mode)
 {
@@ -102,6 +104,7 @@ static guint32 convert_share(MonoFileShare mono_share)
 	return(share);
 }
 
+#if 0
 static guint32 convert_stdhandle(guint32 fd)
 {
 	guint32 stdhandle;
@@ -123,6 +126,7 @@ static guint32 convert_stdhandle(guint32 fd)
 	
 	return(stdhandle);
 }
+#endif
 
 static guint32 convert_seekorigin(MonoSeekOrigin origin)
 {
@@ -148,211 +152,466 @@ static guint32 convert_seekorigin(MonoSeekOrigin origin)
 	return(w32origin);
 }
 
-/* fd must be one of stdin (value 0), stdout (1) or stderr (2).  These
- * values must be hardcoded in corlib.
- */
-HANDLE ves_icall_System_PAL_OpSys_GetStdHandle(MonoObject *this,
-					       gint32 fd)
+static gint64 convert_filetime (const FILETIME *filetime)
 {
-	HANDLE handle;
+	gint64 *ticks;
 
-	if(fd!=0 && fd!=1 && fd!=2) {
-		mono_raise_exception(mono_get_exception_io(this->vtable->domain, "Invalid file descriptor"));
-	}
-	
-	handle=GetStdHandle(convert_stdhandle(fd));
+	ticks = (gint64 *)filetime;
+	return *ticks;
+}
+
+static void convert_win32_file_attribute_data (const WIN32_FILE_ATTRIBUTE_DATA *data, const gunichar2 *name, MonoIOStat *stat)
+{
+	int len;
 	
-	return(handle);
+	stat->attributes = data->dwFileAttributes;
+	stat->creation_time = convert_filetime (&data->ftCreationTime);
+	stat->last_access_time = convert_filetime (&data->ftLastAccessTime);
+	stat->last_write_time = convert_filetime (&data->ftLastWriteTime);
+	stat->length = ((gint64)data->nFileSizeHigh << 32) | data->nFileSizeLow;
+
+	len = 0;
+	while (name [len])
+		++ len;
+
+	stat->name = mono_string_new_utf16 (mono_domain_get (), name, len);
 }
 
-gint32 ves_icall_System_PAL_OpSys_ReadFile(MonoObject *this, HANDLE handle, MonoArray *buffer, gint32 offset, gint32 count)
+/* System.IO.MonoIO internal calls */
+
+gint32 
+ves_icall_System_IO_MonoIO_GetLastError ()
 {
-	gboolean ret;
-	guint32 bytesread;
-	guchar *buf;
-	gint32 alen;
+	return GetLastError ();
+}
 
-	if(handle == INVALID_HANDLE_VALUE) {
-		mono_raise_exception(mono_get_exception_io(this->vtable->domain, "Invalid handle"));
-	}
+gboolean 
+ves_icall_System_IO_MonoIO_CreateDirectory (MonoString *path)
+{
+	gunichar2 *utf16_path;
+	gboolean result;
 
-	alen=mono_array_length(buffer);
-	if(offset+count>alen) {
-		return(0);
-	}
-	
-	buf=mono_array_addr(buffer, guchar, offset);
-	
-	ret=ReadFile(handle, buf, count, &bytesread, NULL);
-	
-	return(bytesread);
+	utf16_path = mono_string_to_utf16 (path);
+	result = CreateDirectory (utf16_path, NULL);
+	g_free (utf16_path);
+
+	return result;
 }
 
-gint32 ves_icall_System_PAL_OpSys_WriteFile(MonoObject *this, HANDLE handle,  MonoArray *buffer, gint32 offset, gint32 count)
+gboolean 
+ves_icall_System_IO_MonoIO_RemoveDirectory (MonoString *path)
 {
-	gboolean ret;
-	guint32 byteswritten;
-	guchar *buf;
-	gint32 alen;
-	
-	if(handle == INVALID_HANDLE_VALUE) {
-		mono_raise_exception(mono_get_exception_io(this->vtable->domain, "Invalid handle"));
-	}
+	gunichar2 *utf16_path;
+	gboolean result;
 
-	alen=mono_array_length(buffer);
-	if(offset+count>alen) {
-		return(0);
-	}
-	
-	buf=mono_array_addr(buffer, guchar, offset);
-	
-	ret=WriteFile(handle, buf, count, &byteswritten, NULL);
-	
-	return(byteswritten);
+	utf16_path = mono_string_to_utf16 (path);
+	result = RemoveDirectory (utf16_path);
+	g_free (utf16_path);
+
+	return result;
 }
 
-gint32 ves_icall_System_PAL_OpSys_SetLengthFile(MonoObject *this, HANDLE handle, gint64 length)
+HANDLE 
+ves_icall_System_IO_MonoIO_FindFirstFile (MonoString *path, MonoIOStat *stat)
 {
-	/* FIXME: Should this put the file pointer back to where it
-	 * was before we started setting the length? The spec doesnt
-	 * say, as usual
-	 */
+	gunichar2 *utf16_path;
+	WIN32_FIND_DATA data;
+	HANDLE result;
 
-	gboolean ret;
-	gint32 lenlo, lenhi, retlo;
-	
-	if(handle == INVALID_HANDLE_VALUE) {
-		mono_raise_exception(mono_get_exception_io(this->vtable->domain, "Invalid handle"));
-	}
+	utf16_path = mono_string_to_utf16 (path);
+	result = FindFirstFile (utf16_path, &data);
+	g_free (utf16_path);
+
+	/* note: WIN32_FIND_DATA is an extension of WIN32_FILE_ATTRIBUTE_DATA */
 
-	lenlo=length & 0xFFFFFFFF;
-	lenhi=length >> 32;
+	if (result != INVALID_HANDLE_VALUE)
+		convert_win32_file_attribute_data ((const WIN32_FILE_ATTRIBUTE_DATA *)&data,
+						   &data.cFileName [0], stat);
+
+	return result;
+}
 
-	retlo=SetFilePointer(handle, lenlo, &lenhi, FILE_BEGIN);
-	ret=SetEndOfFile(handle);
+gboolean 
+ves_icall_System_IO_MonoIO_FindNextFile (HANDLE find, MonoIOStat *stat)
+{
+	WIN32_FIND_DATA data;
+	gboolean result;
+
+	result = FindNextFile (find, &data);
+	if (result)
+		convert_win32_file_attribute_data ((const WIN32_FILE_ATTRIBUTE_DATA *)&data,
+						   &data.cFileName [0], stat);
+
+	return result;
+}
+
+gboolean 
+ves_icall_System_IO_MonoIO_FindClose (HANDLE find)
+{
+	return FindClose (find);
+}
+
+MonoString *
+ves_icall_System_IO_MonoIO_GetCurrentDirectory ()
+{
+	MonoString *result;
+	gunichar2 *buf;
+	int len;
+
+	len = MAX_PATH + 1;
+	buf = g_new (gunichar2, len);
 	
-	if(ret==FALSE) {
-		mono_raise_exception(mono_get_exception_io(this->vtable->domain, "IO Exception"));
+	result = NULL;
+	if (GetCurrentDirectory (len, buf) > 0) {
+		len = 0;
+		while (buf [len])
+			++ len;
+
+		result = mono_string_new_utf16 (mono_domain_get (), buf, len);
 	}
-	
-	return(0);
+
+	g_free (buf);
+	return result;
 }
 
-HANDLE ves_icall_System_PAL_OpSys_OpenFile(MonoObject *this, MonoString *path, gint32 mode, gint32 access, gint32 share)
+gboolean 
+ves_icall_System_IO_MonoIO_SetCurrentDirectory (MonoString *path)
 {
-	HANDLE handle;
-	char *filename;
-	
-	filename=mono_string_to_utf16(path);
+	gunichar2 *utf16_path;
+	gboolean result;
 	
-	handle=CreateFile(filename, convert_access(access),
-			  convert_share(share), NULL, convert_mode(mode),
-			  FILE_ATTRIBUTE_NORMAL, NULL);
+	utf16_path = mono_string_to_utf16 (path);
+	result = SetCurrentDirectory (utf16_path);
+	g_free (utf16_path);
 
-	g_free(filename);
-	
-	/* fixme: raise mor appropriate exceptions (errno) */
-	if(handle == INVALID_HANDLE_VALUE) {
-		mono_raise_exception(mono_get_exception_io(this->vtable->domain, "Invalid handle"));
-	}
+	return result;
+}
 
-	return(handle);
+gboolean 
+ves_icall_System_IO_MonoIO_MoveFile (MonoString *path, MonoString *dest)
+{
+	gunichar2 *utf16_path, *utf16_dest;
+	gboolean result;
+
+	utf16_path = mono_string_to_utf16 (path);
+	utf16_dest = mono_string_to_utf16 (dest);
+	result = MoveFile (utf16_path, utf16_dest);
+	g_free (utf16_path);
+	g_free (utf16_dest);
+
+	return result;
 }
 
-void ves_icall_System_PAL_OpSys_CloseFile(MonoObject *this, HANDLE handle)
+gboolean 
+ves_icall_System_IO_MonoIO_CopyFile (MonoString *path, MonoString *dest, gboolean overwrite)
 {
-	if(handle == INVALID_HANDLE_VALUE) {
-		mono_raise_exception(mono_get_exception_io(this->vtable->domain, "Invalid handle"));
-	}
+	gunichar2 *utf16_path, *utf16_dest;
+	gboolean result;
 
-	CloseHandle(handle);
+	utf16_path = mono_string_to_utf16 (path);
+	utf16_dest = mono_string_to_utf16 (dest);
+	result = CopyFile (utf16_path, utf16_dest, !overwrite);
+	g_free (utf16_path);
+	g_free (utf16_dest);
+
+	return result;
 }
 
-gint64 ves_icall_System_PAL_OpSys_SeekFile(MonoObject *this, HANDLE handle,
-					   gint64 offset, gint32 origin)
+gboolean 
+ves_icall_System_IO_MonoIO_DeleteFile (MonoString *path)
 {
-	gint64 ret;
-	gint32 offsetlo, offsethi, retlo;
-	
-	if(handle == INVALID_HANDLE_VALUE) {
-		mono_raise_exception(mono_get_exception_io(this->vtable->domain, "Invalid handle"));
-	}
+	gunichar2 *utf16_path;
+	gboolean result;
 
-	offsetlo=offset & 0xFFFFFFFF;
-	offsethi=offset >> 32;
+	utf16_path = mono_string_to_utf16 (path);
+	result = DeleteFile (utf16_path);
+	g_free (utf16_path);
 
-	retlo=SetFilePointer(handle, offset, &offsethi,
-			     convert_seekorigin(origin));
-	
-	ret=((gint64)offsethi << 32) + offsetlo;
+	return result;
+}
 
-	return(ret);
+gint32 
+ves_icall_System_IO_MonoIO_GetFileAttributes (MonoString *path)
+{
+	gunichar2 *utf16_path;
+	gint32 result;
+
+	utf16_path = mono_string_to_utf16 (path);
+	result = GetFileAttributes (utf16_path);
+	g_free (utf16_path);
+
+	return result;
 }
 
-void ves_icall_System_PAL_OpSys_DeleteFile(MonoObject *this, MonoString *path)
+gboolean
+ves_icall_System_IO_MonoIO_SetFileAttributes (MonoString *path, gint32 attrs)
 {
-	char *filename;
-	
-	filename=mono_string_to_utf16(path);
-	
-	DeleteFile(filename);
+	gunichar2 *utf16_path;
+	gboolean result;
+
+	utf16_path = mono_string_to_utf16 (path);
+	result = SetFileAttributes (utf16_path, attrs);
+	g_free (utf16_path);
 
-	g_free(filename);
+	return result;
 }
 
-gboolean ves_icall_System_PAL_OpSys_ExistsFile(MonoObject *this, MonoString *path)
+gboolean 
+ves_icall_System_IO_MonoIO_GetFileStat (MonoString *path, MonoIOStat *stat)
 {
-	return(FALSE);
+	gunichar2 *utf16_path;
+	gboolean result;
+	WIN32_FILE_ATTRIBUTE_DATA data;
+
+	utf16_path = mono_string_to_utf16 (path);
+	result = GetFileAttributesEx (utf16_path, GetFileExInfoStandard, &data);
+	g_free (utf16_path);
+
+	if (result)
+		convert_win32_file_attribute_data (&data, utf16_path, stat);
+
+	return result;
 }
 
-gboolean ves_icall_System_PAL_OpSys_GetFileTime(HANDLE handle, gint64 *createtime, gint64 *lastaccess, gint64 *lastwrite)
+HANDLE 
+ves_icall_System_IO_MonoIO_Open (MonoString *filename, gint32 mode, gint32 access_mode, gint32 share)
 {
-	gboolean ret;
-	FILETIME cr, ac, wr;
-	
-	if(handle == INVALID_HANDLE_VALUE) {
-		MonoDomain *domain = mono_domain_get (); 
-		mono_raise_exception(mono_get_exception_io(domain, "Invalid handle"));
-	}
+	gunichar2 *utf16_filename;
+	HANDLE result;
 
-	ret=GetFileTime(handle, &cr, &ac, &wr);
-	if(ret==TRUE) {
-		/* The FILETIME struct holds two unsigned 32 bit
-		 * values for the low and high bytes, but the .net
-		 * file time insists on being signed :(
-		 */
-		*createtime=((gint64)cr.dwHighDateTime << 32) +
-			cr.dwLowDateTime;
-		*lastaccess=((gint64)ac.dwHighDateTime << 32) +
-			ac.dwLowDateTime;
-		*lastwrite=((gint64)wr.dwHighDateTime << 32) +
-			wr.dwLowDateTime;
-	}
+	utf16_filename = mono_string_to_utf16 (filename);
+	result = CreateFile (utf16_filename, convert_access (access_mode), convert_share (share),
+			     NULL, convert_mode (mode), FILE_ATTRIBUTE_NORMAL, NULL);
+	g_free (utf16_filename);
+
+	return result;
+}
+
+gboolean 
+ves_icall_System_IO_MonoIO_Close (HANDLE handle)
+{
+	return CloseHandle (handle);
+}
+
+gint32 
+ves_icall_System_IO_MonoIO_Read (HANDLE handle, MonoArray *dest, gint32 dest_offset, gint32 count)
+{
+	guchar *buffer;
+	gboolean result;
+	guint32 n;
+
+	if (dest_offset + count > mono_array_length (dest))
+		return 0;
+
+	buffer = mono_array_addr (dest, guchar, dest_offset);
+	result = ReadFile (handle, buffer, count, &n, NULL);
+
+	if (!result)
+		return -1;
+
+	return (gint32)n;
+}
+
+gint32 
+ves_icall_System_IO_MonoIO_Write (HANDLE handle, MonoArray *src, gint32 src_offset, gint32 count)
+{
+	guchar *buffer;
+	gboolean result;
+	guint32 n;
+
+	if (src_offset + count > mono_array_length (src))
+		return 0;
 	
-	return(ret);
+	buffer = mono_array_addr (src, guchar, src_offset);
+	result = WriteFile (handle, buffer, count, &n, NULL);
+
+	if (!result)
+		return -1;
+
+	return (gint32)n;
 }
 
-gboolean ves_icall_System_PAL_OpSys_SetFileTime(HANDLE handle, gint64 createtime, gint64 lastaccess, gint64 lastwrite)
+gint64 
+ves_icall_System_IO_MonoIO_Seek (HANDLE handle, gint64 offset, gint32 origin)
 {
+	guint32 offset_hi;
+
+	offset_hi = offset >> 32;
+	offset = SetFilePointer (handle, offset & 0xFFFFFFFF, &offset_hi,
+				 convert_seekorigin (origin));
+
+	return offset | ((gint64)offset_hi << 32);
+}
+
+gboolean 
+ves_icall_System_IO_MonoIO_Flush (HANDLE handle)
+{
+	return FlushFileBuffers (handle);
+}
+
+gint64 
+ves_icall_System_IO_MonoIO_GetLength (HANDLE handle)
+{
+	gint64 length;
+	guint32 length_hi;
+
+	length = GetFileSize (handle, &length_hi);
+	return length | ((gint64)length_hi << 32);
+}
+
+gboolean 
+ves_icall_System_IO_MonoIO_SetLength (HANDLE handle, gint64 length)
+{
+	gint64 offset;
+	gint32 offset_hi;
+	gint32 length_hi;
+	gboolean result;
+
+	/* save file pointer */
+
+	offset_hi = 0;
+	offset = SetFilePointer (handle, 0, &offset_hi, FILE_CURRENT);
+
+	/* extend or truncate */
+
+	length_hi = length >> 32;
+	SetFilePointer (handle, length & 0xFFFFFFFF, &length_hi, FILE_BEGIN);
+	result = SetEndOfFile (handle);
+
+	/* restore file pointer */
+
+	SetFilePointer (handle, offset & 0xFFFFFFFF, &offset_hi, FILE_BEGIN);
+
+	return result;
+}
+
+gboolean
+ves_icall_System_IO_MonoIO_SetFileTime (HANDLE handle, gint64 creation_time, gint64 last_access_time, gint64 last_write_time)
+{
+	const FILETIME *creation_filetime;
+	const FILETIME *last_access_filetime;
+	const FILETIME *last_write_filetime;
+
+	if (creation_time < 0)
+		creation_filetime = NULL;
+	else
+		creation_filetime = (FILETIME *)&creation_time;
+
+	if (last_access_time < 0)
+		last_access_filetime = NULL;
+	else
+		last_access_filetime = (FILETIME *)&last_access_time;
+
+	if (last_write_time < 0)
+		last_write_filetime = NULL;
+	else
+		last_write_filetime = (FILETIME *)&last_write_time;
+
+	return SetFileTime (handle, creation_filetime, last_access_filetime, last_write_filetime);
+}
+
+HANDLE 
+ves_icall_System_IO_MonoIO_get_ConsoleOutput ()
+{
+	return GetStdHandle (STD_OUTPUT_HANDLE);
+}
+
+HANDLE 
+ves_icall_System_IO_MonoIO_get_ConsoleInput ()
+{
+	return GetStdHandle (STD_INPUT_HANDLE);
+}
+
+HANDLE 
+ves_icall_System_IO_MonoIO_get_ConsoleError ()
+{
+	return GetStdHandle (STD_ERROR_HANDLE);
+}
+
+MonoBoolean
+ves_icall_System_IO_MonoIO_CreatePipe (HANDLE *read_handle,
+				       HANDLE *write_handle)
+{
+	SECURITY_ATTRIBUTES attr;
 	gboolean ret;
-	FILETIME cr, ac, wr;
 	
-	if(handle == INVALID_HANDLE_VALUE) {
-		MonoDomain *domain = mono_domain_get (); 
-		mono_raise_exception(mono_get_exception_io(domain, "Invalid handle"));
-	}
-
-	cr.dwLowDateTime= createtime & 0xFFFFFFFF;
-	cr.dwHighDateTime= createtime >> 32;
+	attr.nLength=sizeof(SECURITY_ATTRIBUTES);
+	attr.bInheritHandle=TRUE;
+	attr.lpSecurityDescriptor=NULL;
 	
-	ac.dwLowDateTime= lastaccess & 0xFFFFFFFF;
-	ac.dwHighDateTime= lastaccess >> 32;
+	ret=CreatePipe (read_handle, write_handle, &attr, 0);
+	if(ret==FALSE) {
+		/* FIXME: throw an exception? */
+		return(FALSE);
+	}
 	
-	wr.dwLowDateTime= lastwrite & 0xFFFFFFFF;
-	wr.dwHighDateTime= lastwrite >> 32;
+	return(TRUE);
+}
 
-	ret=SetFileTime(handle, &cr, &ac, &wr);
-	
-	return(ret);
+gunichar2 
+ves_icall_System_IO_MonoIO_get_VolumeSeparatorChar ()
+{
+#if defined (PLATFORM_WIN32)
+	return (gunichar2) 0x003a;	/* colon */
+#else
+	return (gunichar2) 0x002f;	/* forward slash */
+#endif
+}
+
+gunichar2 
+ves_icall_System_IO_MonoIO_get_DirectorySeparatorChar ()
+{
+#if defined (PLATFORM_WIN32)
+	return (gunichar2) 0x005c;	/* backslash */
+#else
+	return (gunichar2) 0x002f;	/* forward slash */
+#endif
+}
+
+gunichar2 
+ves_icall_System_IO_MonoIO_get_AltDirectorySeparatorChar ()
+{
+#if defined (PLATFORM_WIN32)
+	return (gunichar2) 0x002f;	/* forward slash */
+#else
+	return (gunichar2) 0x005c;	/* backslash */
+#endif
 }
 
+gunichar2 
+ves_icall_System_IO_MonoIO_get_PathSeparator ()
+{
+#if defined (PLATFORM_WIN32)
+	return (gunichar2) 0x003b;	/* semicolon */
+#else
+	return (gunichar2) 0x003a;	/* colon */
+#endif
+}
+
+static gunichar2 invalid_path_chars [] = {
+#if defined (PLATFORM_WIN32)
+	0x0022,				/* double quote */
+	0x003c,				/* less than */
+	0x003e,				/* greater than */
+	0x007c,				/* pipe */
+#endif
+	0x0000				/* null */
+};
+
+MonoArray *
+ves_icall_System_IO_MonoIO_get_InvalidPathChars ()
+{
+	MonoArray *chars;
+	MonoDomain *domain;
+	int i, n;
+
+	domain = mono_domain_get ();
+	chars = mono_array_new (domain, mono_defaults.char_class, 5);
+
+	n = sizeof (invalid_path_chars) / sizeof (gunichar2);
+
+	for (i = 0; i < n; ++ i)
+		mono_array_set (chars, gunichar2, i, invalid_path_chars [i]);
+	
+	return chars;
+}
diff --git a/mono/metadata/file-io.h b/mono/metadata/file-io.h
index 851272ae01f..0efc3e2c55a 100644
--- a/mono/metadata/file-io.h
+++ b/mono/metadata/file-io.h
@@ -1,8 +1,9 @@
 /*
  * file-io.h: File IO internal calls
  *
- * Author:
+ * Authors:
  *	Dick Porter (dick@ximian.com)
+ *	Dan Lewis (dihlewis@yahoo.co.uk)
  *
  * (C) 2001 Ximian, Inc.
  */
@@ -48,17 +49,113 @@ typedef enum {
 	SeekOrigin_End=2,
 } MonoSeekOrigin;
 
+/* This is a copy of System.IO.MonoIOStat */
+typedef struct _MonoIOStat {
+	MonoString *name;
+	gint32 attributes;
+	gint64 length;
+	gint64 creation_time;
+	gint64 last_access_time;
+	gint64 last_write_time;
+} MonoIOStat;
 
-extern HANDLE ves_icall_System_PAL_OpSys_GetStdHandle(MonoObject *this, gint32 fs);
-extern gint32 ves_icall_System_PAL_OpSys_ReadFile(MonoObject *this, HANDLE handle, MonoArray *buffer, gint32 offset, gint32 count);
-extern gint32 ves_icall_System_PAL_OpSys_WriteFile(MonoObject *this, HANDLE handle,  MonoArray *buffer, gint32 offset, gint32 count);
-extern gint32 ves_icall_System_PAL_OpSys_SetLengthFile(MonoObject *this, HANDLE handle, gint64 length);
-extern HANDLE ves_icall_System_PAL_OpSys_OpenFile(MonoObject *this, MonoString *path, gint32 mode, gint32 access, gint32 share);
-extern void ves_icall_System_PAL_OpSys_CloseFile(MonoObject *this, HANDLE handle);
-extern gint64 ves_icall_System_PAL_OpSys_SeekFile(MonoObject *this, HANDLE handle, gint64 offset, gint32 origin);
-extern void ves_icall_System_PAL_OpSys_DeleteFile(MonoObject *this, MonoString *path);
-extern gboolean ves_icall_System_PAL_OpSys_ExistsFile(MonoObject *this, MonoString *path);
-extern gboolean ves_icall_System_PAL_OpSys_GetFileTime(HANDLE handle, gint64 *createtime, gint64 *lastaccess, gint64 *lastwrite);
-extern gboolean ves_icall_System_PAL_OpSys_SetFileTime(HANDLE handle, gint64 createtime, gint64 lastaccess, gint64 lastwrite);
+/* System.IO.MonoIO */
+
+extern gint32 
+ves_icall_System_IO_MonoIO_GetLastError (void);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_CreateDirectory (MonoString *path);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_RemoveDirectory (MonoString *path);
+
+extern HANDLE 
+ves_icall_System_IO_MonoIO_FindFirstFile (MonoString *path, MonoIOStat *stat);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_FindNextFile (HANDLE find, MonoIOStat *stat);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_FindClose (HANDLE find);
+
+extern MonoString *
+ves_icall_System_IO_MonoIO_GetCurrentDirectory (void);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_SetCurrentDirectory (MonoString *path);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_MoveFile (MonoString *path, MonoString *dest);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_CopyFile (MonoString *path, MonoString *dest, gboolean overwrite);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_DeleteFile (MonoString *path);
+
+extern gint32 
+ves_icall_System_IO_MonoIO_GetFileAttributes (MonoString *path);
+
+extern gboolean
+ves_icall_System_IO_MonoIO_SetFileAttributes (MonoString *path, gint32 attrs);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_GetFileStat (MonoString *path, MonoIOStat *stat);
+
+extern HANDLE 
+ves_icall_System_IO_MonoIO_Open (MonoString *filename, gint32 mode, gint32 access_mode, gint32 share);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_Close (HANDLE handle);
+
+extern gint32 
+ves_icall_System_IO_MonoIO_Read (HANDLE handle, MonoArray *dest, gint32 dest_offset, gint32 count);
+
+extern gint32 
+ves_icall_System_IO_MonoIO_Write (HANDLE handle, MonoArray *src, gint32 src_offset, gint32 count);
+
+extern gint64 
+ves_icall_System_IO_MonoIO_Seek (HANDLE handle, gint64 offset, gint32 origin);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_Flush (HANDLE handle);
+
+extern gint64 
+ves_icall_System_IO_MonoIO_GetLength (HANDLE handle);
+
+extern gboolean 
+ves_icall_System_IO_MonoIO_SetLength (HANDLE handle, gint64 length);
+
+extern gboolean
+ves_icall_System_IO_MonoIO_SetFileTime (HANDLE handle, gint64 creation_time, gint64 last_access_time, gint64 last_write_time);
+
+extern HANDLE 
+ves_icall_System_IO_MonoIO_get_ConsoleOutput (void);
+
+extern HANDLE 
+ves_icall_System_IO_MonoIO_get_ConsoleInput (void);
+
+extern HANDLE 
+ves_icall_System_IO_MonoIO_get_ConsoleError (void);
+
+extern MonoBoolean
+ves_icall_System_IO_MonoIO_CreatePipe (HANDLE *read_handle,
+				       HANDLE *write_handle);
+
+extern gunichar2 
+ves_icall_System_IO_MonoIO_get_VolumeSeparatorChar (void);
+
+extern gunichar2 
+ves_icall_System_IO_MonoIO_get_DirectorySeparatorChar (void);
+
+extern gunichar2 
+ves_icall_System_IO_MonoIO_get_AltDirectorySeparatorChar (void);
+
+extern gunichar2 
+ves_icall_System_IO_MonoIO_get_PathSeparator (void);
+
+extern MonoArray *
+ves_icall_System_IO_MonoIO_get_InvalidPathChars (void);
 
 #endif /* _MONO_METADATA_FILEIO_H_ */
diff --git a/mono/metadata/gc.c b/mono/metadata/gc.c
new file mode 100644
index 00000000000..d77ed1af7ca
--- /dev/null
+++ b/mono/metadata/gc.c
@@ -0,0 +1,311 @@
+/*
+ * metadata/gc.c: GC icalls.
+ *
+ * Author: Paolo Molaro <lupus@ximian.com>
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+#include <string.h>
+
+#include <mono/metadata/gc.h>
+#include <mono/metadata/threads.h>
+#include <mono/metadata/tabledefs.h>
+#if HAVE_BOEHM_GC
+#define GC_I_HIDE_POINTERS
+#include <gc/gc.h>
+#else
+#define HIDE_POINTER(v) (v)
+#define REVEAL_POINTER(v) (v)
+#endif
+
+static int finalize_slot = -1;
+
+/* 
+ * actually, we might want to queue the finalize requests in a separate thread,
+ * but we need to be careful about the execution domain of the thread...
+ */
+static void
+run_finalize (void *obj, void *data)
+{
+	MonoObject *exc = NULL;
+	MonoObject *o;
+	o = (MonoObject*)((char*)obj + GPOINTER_TO_UINT (data));
+
+	if (finalize_slot < 0) {
+		int i;
+		for (i = 0; i < mono_defaults.object_class->vtable_size; ++i) {
+			MonoMethod *cm = mono_defaults.object_class->vtable [i];
+	       
+			if (!strcmp (cm->name, "Finalize")) {
+				finalize_slot = i;
+				break;
+			}
+		}
+	}
+	/* speedup later... and use a timeout */
+	/*g_print ("Finalize run on %s\n", mono_object_class (o)->name);*/
+	mono_runtime_invoke (o->vtable->klass->vtable [finalize_slot], o, NULL, &exc);
+
+	if (exc) {
+		/* fixme: do something useful */
+	}
+}
+
+/*
+ * Some of our objects may point to a different address than the address returned by GC_malloc()
+ * (because of the GetHashCode hack), but we need to pass the real address to register_finalizer.
+ * This also means that in the callback we need to adjust the pointer to get back the real
+ * MonoObject*.
+ * We also need to be consistent in the use of the GC_debug* variants of malloc and register_finalizer, 
+ * since that, too, can cause the underlying pointer to be offset.
+ */
+static void
+object_register_finalizer (MonoObject *obj, void (*callback)(void *, void*))
+{
+#if HAVE_BOEHM_GC
+	guint offset = 0;
+
+	g_assert (GC_base (obj) == (char*)obj - offset);
+	GC_register_finalizer ((char*)obj - offset, callback, GUINT_TO_POINTER (offset), NULL, NULL);
+#endif
+}
+
+void
+mono_object_register_finalizer (MonoObject *obj)
+{
+	object_register_finalizer (obj, run_finalize);
+}
+
+/* 
+ * to speedup, at class init time, check if a class or struct
+ * have fields that need to be finalized and set a flag.
+ */
+static void
+finalize_fields (MonoClass *class, char *data, gboolean instance, GHashTable *todo) {
+	int i;
+	MonoClassField *field;
+	MonoObject *obj;
+
+	/*if (!instance)
+		g_print ("Finalize statics on on %s\n", class->name);*/
+	if (instance && class->valuetype)
+		data -= sizeof (MonoObject);
+	do {
+		for (i = 0; i < class->field.count; ++i) {
+			field = &class->fields [i];
+			if (instance) {
+				if (field->type->attrs & FIELD_ATTRIBUTE_STATIC)
+					continue;
+			} else {
+				if (!(field->type->attrs & FIELD_ATTRIBUTE_STATIC))
+					continue;
+			}
+			switch (field->type->type) {
+			case MONO_TYPE_OBJECT:
+			case MONO_TYPE_CLASS:
+				obj = *((MonoObject**)(data + field->offset));
+				if (obj) {
+					if (mono_object_class (obj)->has_finalize) {
+						/* disable the registered finalizer */
+						object_register_finalizer (obj, NULL);
+						run_finalize (obj, NULL);
+					} else {
+						/* 
+						 * if the type doesn't have a finalizer, we finalize 
+						 * the fields ourselves just like we do for structs.
+						 * Disabled for now: how do we handle loops?
+						 */
+						/*finalize_fields (mono_object_class (obj), obj, TRUE, todo);*/
+					}
+				}
+				break;
+			case MONO_TYPE_VALUETYPE: {
+				MonoClass *fclass = mono_class_from_mono_type (field->type);
+				if (fclass->enumtype)
+					continue;
+				/*finalize_fields (fclass, data + field->offset, TRUE, todo);*/
+				break;
+			}
+			case MONO_TYPE_ARRAY:
+			case MONO_TYPE_SZARRAY:
+				/* FIXME: foreach item... */
+				break;
+			}
+		}
+		if (!instance)
+			return;
+		class = class->parent;
+	} while (class);
+}
+
+static void
+finalize_static_data (MonoClass *class, MonoVTable *vtable, GHashTable *todo) {
+
+	if (class->enumtype || !vtable->data)
+		return;
+	finalize_fields (class, vtable->data, FALSE, todo);
+}
+
+void
+mono_domain_finalize (MonoDomain *domain) {
+
+	GHashTable *todo = g_hash_table_new (NULL, NULL);
+#if HAVE_BOEHM_GC
+	GC_gcollect ();
+#endif
+	mono_g_hash_table_foreach (domain->class_vtable_hash, (GHFunc)finalize_static_data, todo);
+	/* FIXME: finalize objects in todo... */
+	g_hash_table_destroy (todo);
+}
+
+void
+ves_icall_System_GC_InternalCollect (int generation)
+{
+#if HAVE_BOEHM_GC
+	GC_gcollect ();
+#endif
+}
+
+gint64
+ves_icall_System_GC_GetTotalMemory (MonoBoolean forceCollection)
+{
+#if HAVE_BOEHM_GC
+	if (forceCollection)
+		GC_gcollect ();
+	return GC_get_heap_size ();
+#else
+	return 0;
+#endif
+}
+
+void
+ves_icall_System_GC_KeepAlive (MonoObject *obj)
+{
+	/*
+	 * Does nothing.
+	 */
+}
+
+void
+ves_icall_System_GC_ReRegisterForFinalize (MonoObject *obj)
+{
+	object_register_finalizer (obj, run_finalize);
+}
+
+void
+ves_icall_System_GC_SuppressFinalize (MonoObject *obj)
+{
+	object_register_finalizer (obj, NULL);
+}
+
+void
+ves_icall_System_GC_WaitForPendingFinalizers (void)
+{
+}
+
+/*static CRITICAL_SECTION handle_section;*/
+static guint32 next_handle = 0;
+static gpointer *gc_handles = NULL;
+static guint32 array_size = 0;
+
+/*
+ * The handle type is encoded in the lower two bits of the handle value:
+ * 0 -> normal
+ * 1 -> pinned
+ * 2 -> weak
+ */
+
+/*
+ * FIXME: make thread safe and reuse the array entries.
+ */
+MonoObject *
+ves_icall_System_GCHandle_GetTarget (guint32 handle)
+{
+	MonoObject *obj;
+
+	if (gc_handles) {
+		obj = gc_handles [handle >> 2];
+		if ((handle & 0x3) > 1)
+			return REVEAL_POINTER (obj);
+		return obj;
+	}
+	return NULL;
+}
+
+guint32
+ves_icall_System_GCHandle_GetTargetHandle (MonoObject *obj, guint32 handle, gint32 type)
+{
+	gpointer val = obj;
+	guint32 h, idx = next_handle++;
+
+	if (idx >= array_size) {
+#if HAVE_BOEHM_GC
+		gpointer *new_array;
+		if (!array_size)
+			array_size = 16;
+		new_array = GC_malloc (sizeof (gpointer) * (array_size * 2));
+		if (gc_handles) {
+			int i;
+			memcpy (new_array, gc_handles, sizeof (gpointer) * array_size);
+			/* need to re-register links for weak refs. test if GC_realloc needs the same */
+			for (i = 0; i < array_size; ++i) {
+				if (((gulong)new_array [i]) & 0x1) { /* all and only disguised pointers have it set */
+					GC_general_register_disappearing_link (&(new_array [i]), REVEAL_POINTER (new_array [i]));
+				}
+			}
+		}
+		array_size *= 2;
+		gc_handles = new_array;
+#else
+		g_error ("No GCHandle support built-in");
+#endif
+	}
+	h = idx << 2;
+
+	/* resuse the type from the old target */
+	if (type == -1)
+		type =  handle & 0x3;
+	switch (type) {
+	case 0:
+	case 1:
+		h |= type;
+		gc_handles [idx] = val;
+		break;
+	default:
+		h |= 2;
+		val = (gpointer)HIDE_POINTER (val);
+		gc_handles [idx] = val;
+#if HAVE_BOEHM_GC
+		GC_general_register_disappearing_link (&(gc_handles [idx]), obj);
+#else
+		g_error ("No weakref support");
+#endif
+		break;
+	}
+	return h;
+}
+
+void
+ves_icall_System_GCHandle_FreeHandle (guint32 handle)
+{
+	gc_handles [handle >> 2] = (gpointer)-1;
+}
+
+gpointer
+ves_icall_System_GCHandle_GetAddrOfPinnedObject (guint32 handle)
+{
+	MonoObject *obj;
+
+	if (gc_handles) {
+		obj = gc_handles [handle >> 2];
+		if ((handle & 0x3) > 1)
+			return REVEAL_POINTER (obj);
+		return obj;
+	}
+	return NULL;
+}
+
+
diff --git a/mono/metadata/gc.h b/mono/metadata/gc.h
new file mode 100644
index 00000000000..5225241447b
--- /dev/null
+++ b/mono/metadata/gc.h
@@ -0,0 +1,30 @@
+/*
+ * metadata/gc.h: GC icalls.
+ *
+ * Author: Paolo Molaro <lupus@ximian.com>
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef __MONO_METADATA_GC_H__
+#define __MONO_METADATA_GC_H__
+
+#include <glib.h>
+#include <mono/metadata/object.h>
+
+void   mono_object_register_finalizer               (MonoObject  *obj);
+void   ves_icall_System_GC_InternalCollect          (int          generation);
+gint64 ves_icall_System_GC_GetTotalMemory           (MonoBoolean  forceCollection);
+void   ves_icall_System_GC_KeepAlive                (MonoObject  *obj);
+void   ves_icall_System_GC_ReRegisterForFinalize    (MonoObject  *obj);
+void   ves_icall_System_GC_SuppressFinalize         (MonoObject  *obj);
+void   ves_icall_System_GC_WaitForPendingFinalizers (void);
+
+MonoObject *ves_icall_System_GCHandle_GetTarget (guint32 handle);
+guint32     ves_icall_System_GCHandle_GetTargetHandle (MonoObject *obj, guint32 handle, gint32 type);
+void        ves_icall_System_GCHandle_FreeHandle (guint32 handle);
+gpointer    ves_icall_System_GCHandle_GetAddrOfPinnedObject (guint32 handle);
+
+
+#endif /* __MONO_METADATA_GC_H__ */
+
diff --git a/mono/metadata/icall.c b/mono/metadata/icall.c
index 2af9b820b85..b7da2509412 100644
--- a/mono/metadata/icall.c
+++ b/mono/metadata/icall.c
@@ -4,6 +4,7 @@
  * Authors:
  *   Dietmar Maurer (dietmar@ximian.com)
  *   Paolo Molaro (lupus@ximian.com)
+ *	 Patrik Torstensson (patrik.torstensson@labs2.com)
  *
  * (C) 2001 Ximian, Inc.
  */
@@ -14,6 +15,9 @@
 #include <string.h>
 #include <sys/time.h>
 #include <unistd.h>
+#if defined (PLATFORM_WIN32)
+#include <stdlib.h>
+#endif
 
 #include <mono/metadata/object.h>
 #include <mono/metadata/threads.h>
@@ -27,58 +31,76 @@
 #include <mono/metadata/tokentype.h>
 #include <mono/metadata/unicode.h>
 #include <mono/metadata/appdomain.h>
+#include <mono/metadata/marshal.h>
+#include <mono/metadata/gc.h>
 #include <mono/metadata/rand.h>
+#include <mono/metadata/sysmath.h>
+#include <mono/metadata/debug-symfile.h>
+#include <mono/metadata/string-icalls.h>
+#include <mono/metadata/process.h>
 #include <mono/io-layer/io-layer.h>
+#include <mono/utils/strtod.h>
+
+#if defined (PLATFORM_WIN32)
+#include <windows.h>
+#endif
 #include "decimal.h"
 
+static MonoString *
+mono_double_ToStringImpl (double value)
+{
+	/* FIXME: Handle formats, etc. */
+	MonoString *s;
+	gchar *retVal;
+	retVal = g_strdup_printf ("%.15g", value);
+	s = mono_string_new (mono_domain_get (), retVal);
+	g_free (retVal);
+	return s;
+}
+
+/*
+ * We expect a pointer to a char, not a string
+ */
+static double
+mono_double_ParseImpl (char *ptr)
+{
+	return bsd_strtod (ptr, NULL);
+}
+
+static MonoString *
+mono_float_ToStringImpl (float value)
+{
+	return mono_double_ToStringImpl (value);
+}
+
 static MonoObject *
-ves_icall_System_Array_GetValue (MonoObject *this, MonoObject *idxs)
+ves_icall_System_Array_GetValueImpl (MonoObject *this, guint32 pos)
 {
-	MonoClass *ac, *ic;
-	MonoArray *ao, *io;
-	gint32 i, pos, *ind, esize;
+	MonoClass *ac;
+	MonoArray *ao;
+	gint32 esize;
 	gpointer *ea;
 
-	io = (MonoArray *)idxs;
-	ic = (MonoClass *)io->obj.vtable->klass;
-	
 	ao = (MonoArray *)this;
 	ac = (MonoClass *)ao->obj.vtable->klass;
 
-	g_assert (ic->rank == 1);
-	g_assert (io->bounds [0].length == ac->rank);
-
-	ind = (guint32 *)io->vector;
-
-	pos = ind [0] - ao->bounds [0].lower_bound;
-	for (i = 1; i < ac->rank; i++)
-		pos = pos*ao->bounds [i].length + ind [i] - 
-			ao->bounds [i].lower_bound;
-
 	esize = mono_array_element_size (ac);
 	ea = (gpointer*)((char*)ao->vector + (pos * esize));
 
 	if (ac->element_class->valuetype)
 		return mono_value_box (this->vtable->domain, ac->element_class, ea);
-	else {
+	else
 		return *ea;
-	}
 }
 
-static void 
-ves_icall_System_Array_SetValue (MonoObject *this, MonoObject *value,
-				 MonoObject *idxs)
+static MonoObject *
+ves_icall_System_Array_GetValue (MonoObject *this, MonoObject *idxs)
 {
-	MonoArray *ao, *io, *vo;
-	MonoClass *ac, *ic, *vc;
-	gint32 i, pos, *ind, esize;
-	gpointer *ea;
+	MonoClass *ac, *ic;
+	MonoArray *ao, *io;
+	gint32 i, pos, *ind;
 
-	vo = (MonoArray *)value;
-	if (vo)
-		vc = (MonoClass *)vo->obj.vtable->klass;
-	else
-		vc = NULL;
+	MONO_CHECK_ARG_NULL (idxs);
 
 	io = (MonoArray *)idxs;
 	ic = (MonoClass *)io->obj.vtable->klass;
@@ -87,39 +109,365 @@ ves_icall_System_Array_SetValue (MonoObject *this, MonoObject *value,
 	ac = (MonoClass *)ao->obj.vtable->klass;
 
 	g_assert (ic->rank == 1);
-	g_assert (io->bounds [0].length == ac->rank);
-	if (vo && !mono_object_isinst (value, ac->element_class)) {
-		g_error ("Array not compatible: %s <= %s", ac->element_class->name, vc->name);
-	}
+	if (io->bounds != NULL || io->max_length !=  ac->rank)
+		mono_raise_exception (mono_get_exception_argument (NULL, NULL));
 
 	ind = (guint32 *)io->vector;
 
+	if (ao->bounds == NULL) {
+		if (*ind < 0 || *ind >= ao->max_length)
+			mono_raise_exception (mono_get_exception_index_out_of_range ());
+
+		return ves_icall_System_Array_GetValueImpl (this, *ind);
+	}
+	
+	for (i = 0; i < ac->rank; i++)
+		if ((ind [i] < ao->bounds [i].lower_bound) ||
+		    (ind [i] >= ao->bounds [i].length + ao->bounds [i].lower_bound))
+			mono_raise_exception (mono_get_exception_index_out_of_range ());
+
 	pos = ind [0] - ao->bounds [0].lower_bound;
 	for (i = 1; i < ac->rank; i++)
 		pos = pos*ao->bounds [i].length + ind [i] - 
 			ao->bounds [i].lower_bound;
 
+	return ves_icall_System_Array_GetValueImpl (this, pos);
+}
+
+static void
+ves_icall_System_Array_SetValueImpl (MonoArray *this, MonoObject *value, guint32 pos)
+{
+	MonoClass *ac, *vc, *ec;
+	gint32 esize, vsize;
+	gpointer *ea, *va;
+
+	guint64 u64;
+	gint64 i64;
+	gdouble r64;
+
+	if (value)
+		vc = value->vtable->klass;
+	else
+		vc = NULL;
+
+	ac = this->obj.vtable->klass;
+	ec = ac->element_class;
+
 	esize = mono_array_element_size (ac);
-	ea = (gpointer*)((char*)ao->vector + (pos * esize));
+	ea = (gpointer*)((char*)this->vector + (pos * esize));
+	va = (gpointer*)((char*)value + sizeof (MonoObject));
+
+	if (!value) {
+		memset (ea, 0,  esize);
+		return;
+	}
+
+#define NO_WIDENING_CONVERSION G_STMT_START{\
+	mono_raise_exception (mono_get_exception_argument ( \
+		"value", "not a widening conversion")); \
+}G_STMT_END
+
+#define CHECK_WIDENING_CONVERSION(extra) G_STMT_START{\
+	if (esize < vsize + (extra)) \
+		mono_raise_exception (mono_get_exception_argument ( \
+			"value", "not a widening conversion")); \
+}G_STMT_END
+
+#define INVALID_CAST G_STMT_START{\
+	mono_raise_exception (mono_get_exception_invalid_cast ()); \
+}G_STMT_END
+
+	/* Check element (destination) type. */
+	switch (ec->byval_arg.type) {
+	case MONO_TYPE_STRING:
+		switch (vc->byval_arg.type) {
+		case MONO_TYPE_STRING:
+			break;
+		default:
+			INVALID_CAST;
+		}
+		break;
+	case MONO_TYPE_BOOLEAN:
+		switch (vc->byval_arg.type) {
+		case MONO_TYPE_BOOLEAN:
+			break;
+		case MONO_TYPE_CHAR:
+		case MONO_TYPE_U1:
+		case MONO_TYPE_U2:
+		case MONO_TYPE_U4:
+		case MONO_TYPE_U8:
+		case MONO_TYPE_I1:
+		case MONO_TYPE_I2:
+		case MONO_TYPE_I4:
+		case MONO_TYPE_I8:
+		case MONO_TYPE_R4:
+		case MONO_TYPE_R8:
+			NO_WIDENING_CONVERSION;
+		default:
+			INVALID_CAST;
+		}
+		break;
+	}
+
+	if (!ec->valuetype) {
+		*ea = (gpointer)value;
+		return;
+	}
+
+	if (mono_object_isinst (value, ec)) {
+		memcpy (ea, (char *)value + sizeof (MonoObject), esize);
+		return;
+	}
+
+	if (!vc->valuetype)
+		INVALID_CAST;
+
+	vsize = mono_class_instance_size (vc) - sizeof (MonoObject);
+
+#if 0
+	g_message (G_STRLOC ": %d (%d) <= %d (%d)",
+		   ec->byval_arg.type, esize,
+		   vc->byval_arg.type, vsize);
+#endif
+
+#define ASSIGN_UNSIGNED(etype) G_STMT_START{\
+	switch (vc->byval_arg.type) { \
+	case MONO_TYPE_U1: \
+	case MONO_TYPE_U2: \
+	case MONO_TYPE_U4: \
+	case MONO_TYPE_U8: \
+	case MONO_TYPE_CHAR: \
+		CHECK_WIDENING_CONVERSION(0); \
+		*(etype *) ea = (etype) u64; \
+		return; \
+	/* You can't assign a signed value to an unsigned array. */ \
+	case MONO_TYPE_I1: \
+	case MONO_TYPE_I2: \
+	case MONO_TYPE_I4: \
+	case MONO_TYPE_I8: \
+	/* You can't assign a floating point number to an integer array. */ \
+	case MONO_TYPE_R4: \
+	case MONO_TYPE_R8: \
+		NO_WIDENING_CONVERSION; \
+	} \
+}G_STMT_END
+
+#define ASSIGN_SIGNED(etype) G_STMT_START{\
+	switch (vc->byval_arg.type) { \
+	case MONO_TYPE_I1: \
+	case MONO_TYPE_I2: \
+	case MONO_TYPE_I4: \
+	case MONO_TYPE_I8: \
+		CHECK_WIDENING_CONVERSION(0); \
+		*(etype *) ea = (etype) i64; \
+		return; \
+	/* You can assign an unsigned value to a signed array if the array's */ \
+	/* element size is larger than the value size. */ \
+	case MONO_TYPE_U1: \
+	case MONO_TYPE_U2: \
+	case MONO_TYPE_U4: \
+	case MONO_TYPE_U8: \
+	case MONO_TYPE_CHAR: \
+		CHECK_WIDENING_CONVERSION(1); \
+		*(etype *) ea = (etype) u64; \
+		return; \
+	/* You can't assign a floating point number to an integer array. */ \
+	case MONO_TYPE_R4: \
+	case MONO_TYPE_R8: \
+		NO_WIDENING_CONVERSION; \
+	} \
+}G_STMT_END
+
+#define ASSIGN_REAL(etype) G_STMT_START{\
+	switch (vc->byval_arg.type) { \
+	case MONO_TYPE_R4: \
+	case MONO_TYPE_R8: \
+		CHECK_WIDENING_CONVERSION(0); \
+		*(etype *) ea = (etype) r64; \
+		return; \
+	/* All integer values fit into a floating point array, so we don't */ \
+	/* need to CHECK_WIDENING_CONVERSION here. */ \
+	case MONO_TYPE_I1: \
+	case MONO_TYPE_I2: \
+	case MONO_TYPE_I4: \
+	case MONO_TYPE_I8: \
+		*(etype *) ea = (etype) i64; \
+		return; \
+	case MONO_TYPE_U1: \
+	case MONO_TYPE_U2: \
+	case MONO_TYPE_U4: \
+	case MONO_TYPE_U8: \
+	case MONO_TYPE_CHAR: \
+		*(etype *) ea = (etype) u64; \
+		return; \
+	} \
+}G_STMT_END
+
+	switch (vc->byval_arg.type) {
+	case MONO_TYPE_U1:
+		u64 = *(guint8 *) va;
+		break;
+	case MONO_TYPE_U2:
+		u64 = *(guint16 *) va;
+		break;
+	case MONO_TYPE_U4:
+		u64 = *(guint32 *) va;
+		break;
+	case MONO_TYPE_U8:
+		u64 = *(guint64 *) va;
+		break;
+	case MONO_TYPE_I1:
+		i64 = *(gint8 *) va;
+		break;
+	case MONO_TYPE_I2:
+		i64 = *(gint16 *) va;
+		break;
+	case MONO_TYPE_I4:
+		i64 = *(gint32 *) va;
+		break;
+	case MONO_TYPE_I8:
+		i64 = *(gint64 *) va;
+		break;
+	case MONO_TYPE_R4:
+		r64 = *(gfloat *) va;
+		break;
+	case MONO_TYPE_R8:
+		r64 = *(gdouble *) va;
+		break;
+	case MONO_TYPE_CHAR:
+		u64 = *(guint16 *) va;
+		break;
+	case MONO_TYPE_BOOLEAN:
+		/* Boolean is only compatible with itself. */
+		switch (ec->byval_arg.type) {
+		case MONO_TYPE_CHAR:
+		case MONO_TYPE_U1:
+		case MONO_TYPE_U2:
+		case MONO_TYPE_U4:
+		case MONO_TYPE_U8:
+		case MONO_TYPE_I1:
+		case MONO_TYPE_I2:
+		case MONO_TYPE_I4:
+		case MONO_TYPE_I8:
+		case MONO_TYPE_R4:
+		case MONO_TYPE_R8:
+			NO_WIDENING_CONVERSION;
+		default:
+			INVALID_CAST;
+		}
+		break;
+	}
 
-	if (ac->element_class->valuetype) {
-		if (vo) {
-			g_assert (vc->valuetype);
-			memcpy (ea, (char *)vo + sizeof (MonoObject), esize);
-		} else
-			memset (ea, '0',  esize);
-	} else
-		*ea = (gpointer)vo;
+	/* If we can't do a direct copy, let's try a widening conversion. */
+	switch (ec->byval_arg.type) {
+	case MONO_TYPE_CHAR:
+		ASSIGN_UNSIGNED (guint16);
+	case MONO_TYPE_U1:
+		ASSIGN_UNSIGNED (guint8);
+	case MONO_TYPE_U2:
+		ASSIGN_UNSIGNED (guint16);
+	case MONO_TYPE_U4:
+		ASSIGN_UNSIGNED (guint32);
+	case MONO_TYPE_U8:
+		ASSIGN_UNSIGNED (guint64);
+	case MONO_TYPE_I1:
+		ASSIGN_SIGNED (gint8);
+	case MONO_TYPE_I2:
+		ASSIGN_SIGNED (gint16);
+	case MONO_TYPE_I4:
+		ASSIGN_SIGNED (gint32);
+	case MONO_TYPE_I8:
+		ASSIGN_SIGNED (gint64);
+	case MONO_TYPE_R4:
+		ASSIGN_REAL (gfloat);
+	case MONO_TYPE_R8:
+		ASSIGN_REAL (gdouble);
+	}
 
+	INVALID_CAST;
+	/* Not reached, INVALID_CAST does not return. Just to avoid a compiler warning ... */
+	return;
+
+#undef INVALID_CAST
+#undef NO_WIDENING_CONVERSION
+#undef CHECK_WIDENING_CONVERSION
+#undef ASSIGN_UNSIGNED
+#undef ASSIGN_SIGNED
+#undef ASSIGN_REAL
 }
 
-static void
-ves_icall_System_Array_CreateInstanceImpl ()
+static void 
+ves_icall_System_Array_SetValue (MonoArray *this, MonoObject *value,
+				 MonoArray *idxs)
 {
-	g_warning ("not implemented");
-	g_assert_not_reached ();
+	MonoClass *ac, *ic;
+	gint32 i, pos, *ind;
+
+	MONO_CHECK_ARG_NULL (idxs);
+
+	ic = idxs->obj.vtable->klass;
+	ac = this->obj.vtable->klass;
+
+	g_assert (ic->rank == 1);
+	if (idxs->bounds != NULL || idxs->max_length != ac->rank)
+		mono_raise_exception (mono_get_exception_argument (NULL, NULL));
+
+	ind = (guint32 *)idxs->vector;
+
+	if (this->bounds == NULL) {
+		if (*ind < 0 || *ind >= this->max_length)
+			mono_raise_exception (mono_get_exception_index_out_of_range ());
+
+		ves_icall_System_Array_SetValueImpl (this, value, *ind);
+		return;
+	}
+	
+	for (i = 0; i < ac->rank; i++)
+		if ((ind [i] < this->bounds [i].lower_bound) ||
+		    (ind [i] >= this->bounds [i].length + this->bounds [i].lower_bound))
+			mono_raise_exception (mono_get_exception_index_out_of_range ());
+
+	pos = ind [0] - this->bounds [0].lower_bound;
+	for (i = 1; i < ac->rank; i++)
+		pos = pos * this->bounds [i].length + ind [i] - 
+			this->bounds [i].lower_bound;
+
+	ves_icall_System_Array_SetValueImpl (this, value, pos);
 }
 
+static MonoArray *
+ves_icall_System_Array_CreateInstanceImpl (MonoReflectionType *type, MonoArray *lengths, MonoArray *bounds)
+{
+	MonoClass *aklass;
+	MonoArray *array;
+	gint32 *sizes, i;
+
+	MONO_CHECK_ARG_NULL (type);
+	MONO_CHECK_ARG_NULL (lengths);
+
+	MONO_CHECK_ARG (lengths, mono_array_length (lengths) > 0);
+	if (bounds)
+		MONO_CHECK_ARG (bounds, mono_array_length (lengths) == mono_array_length (bounds));
+
+	for (i = 0; i < mono_array_length (lengths); i++)
+		if (mono_array_get (lengths, gint32, i) < 0)
+			mono_raise_exception (mono_get_exception_argument_out_of_range (NULL));
+
+	aklass = mono_array_class_get (type->type, mono_array_length (lengths));
+
+	sizes = alloca (aklass->rank * sizeof(guint32) * 2);
+	for (i = 0; i < aklass->rank; ++i) {
+		sizes [i] = mono_array_get (lengths, gint32, i);
+		if (bounds)
+			sizes [i + aklass->rank] = mono_array_get (bounds, gint32, i);
+		else
+			sizes [i + aklass->rank] = 0;
+	}
+
+	array = mono_array_new_full (mono_domain_get (), aklass, sizes, sizes + aklass->rank);
+
+	return array;
+}
 
 static gint32 
 ves_icall_System_Array_GetRank (MonoObject *this)
@@ -130,12 +478,26 @@ ves_icall_System_Array_GetRank (MonoObject *this)
 static gint32
 ves_icall_System_Array_GetLength (MonoArray *this, gint32 dimension)
 {
+	gint32 rank = ((MonoObject *)this)->vtable->klass->rank;
+	if ((dimension < 0) || (dimension >= rank))
+		mono_raise_exception (mono_get_exception_index_out_of_range ());
+	
+	if (this->bounds == NULL)
+		return this->max_length;
+	
 	return this->bounds [dimension].length;
 }
 
 static gint32
 ves_icall_System_Array_GetLowerBound (MonoArray *this, gint32 dimension)
 {
+	gint32 rank = ((MonoObject *)this)->vtable->klass->rank;
+	if ((dimension < 0) || (dimension >= rank))
+		mono_raise_exception (mono_get_exception_index_out_of_range ());
+	
+	if (this->bounds == NULL)
+		return 0;
+	
 	return this->bounds [dimension].lower_bound;
 }
 
@@ -144,9 +506,11 @@ ves_icall_System_Array_FastCopy (MonoArray *source, int source_idx, MonoArray* d
 {
 	int element_size = mono_array_element_size (source->obj.vtable->klass);
 	void * dest_addr = mono_array_addr_with_size (dest, element_size, dest_idx);
-	void * source_addr = mono_array_addr_with_size (source, element_size, dest_idx);
+	void * source_addr = mono_array_addr_with_size (source, element_size, source_idx);
 
-	memcpy (dest_addr, source_addr, element_size * length);
+	g_assert (dest_idx + length <= mono_array_length (dest));
+	g_assert (source_idx + length <= mono_array_length (source));
+	memmove (dest_addr, source_addr, element_size * length);
 }
 
 static void
@@ -156,8 +520,11 @@ ves_icall_InitializeArray (MonoArray *array, MonoClassField *field_handle)
 	guint32 size = mono_array_element_size (klass);
 	int i;
 
-	for (i = 0; i < klass->rank; ++i) 
-		size *= array->bounds [i].length;
+	if (array->bounds == NULL)
+		size *= array->max_length;
+	else
+		for (i = 0; i < klass->rank; ++i) 
+			size *= array->bounds [i].length;
 
 	memcpy (mono_array_addr (array, char, 0), field_handle->data, size);
 
@@ -173,7 +540,7 @@ ves_icall_InitializeArray (MonoArray *array, MonoClassField *field_handle)
 	} \
 }
 
-	printf ("Initialize array with elements of %s type\n", klass->element_class->name);
+	/* printf ("Initialize array with elements of %s type\n", klass->element_class->name); */
 
 	switch (klass->element_class->byval_arg.type) {
 	case MONO_TYPE_CHAR:
@@ -200,6 +567,73 @@ ves_icall_System_Object_MemberwiseClone (MonoObject *this)
 	return mono_object_clone (this);
 }
 
+#if HAVE_BOEHM_GC
+#define MONO_OBJECT_ALIGNMENT_SHIFT	3
+#else
+#define MONO_OBJECT_ALIGNMENT_SHIFT	2
+#endif
+
+/*
+ * Return hashcode based on object address. This function will need to be
+ * smarter in the presence of a moving garbage collector, which will cache
+ * the address hash before relocating the object.
+ *
+ * Wang's address-based hash function:
+ *   http://www.concentric.net/~Ttwang/tech/addrhash.htm
+ */
+static gint32
+ves_icall_System_Object_GetHashCode (MonoObject *this)
+{
+	register guint32 key;
+	key = (GPOINTER_TO_UINT (this) >> MONO_OBJECT_ALIGNMENT_SHIFT) * 2654435761u;
+
+	return key & 0x7fffffff;
+}
+
+/*
+ * A hash function for value types. I have no idea if this is a good hash 
+ * function (its similar to g_str_hash).
+ */
+static gint32
+ves_icall_System_ValueType_GetHashCode (MonoObject *this)
+{
+	gint32 i, size;
+	const char *p;
+	guint h = 0;
+
+	MONO_CHECK_ARG_NULL (this);
+
+	size = this->vtable->klass->instance_size - sizeof (MonoObject);
+
+	p = (const char *)this + sizeof (MonoObject);
+
+	for (i = 0; i < size; i++) {
+		h = (h << 5) - h + *p;
+		p++;
+	}
+
+	return h;
+}
+
+static MonoBoolean
+ves_icall_System_ValueType_Equals (MonoObject *this, MonoObject *that)
+{
+	gint32 size;
+	const char *p, *s;
+
+	MONO_CHECK_ARG_NULL (that);
+
+	if (this->vtable != that->vtable)
+		return FALSE;
+
+	size = this->vtable->klass->instance_size - sizeof (MonoObject);
+
+	p = (const char *)this + sizeof (MonoObject);
+	s = (const char *)that + sizeof (MonoObject);
+
+	return memcmp (p, s, size)? FALSE: TRUE;
+}
+
 static MonoReflectionType *
 ves_icall_System_Object_GetType (MonoObject *obj)
 {
@@ -216,96 +650,65 @@ mono_type_type_from_obj (MonoReflectionType *mtype, MonoObject *obj)
 static gint32
 ves_icall_AssemblyBuilder_getToken (MonoReflectionAssemblyBuilder *assb, MonoObject *obj)
 {
-	mono_image_basic_init (assb);
 	return mono_image_create_token (assb->dynamic_assembly, obj);
 }
 
 static gint32
-ves_icall_get_data_chunk (MonoReflectionAssemblyBuilder *assb, gint32 type, MonoArray *buf)
+ves_icall_AssemblyBuilder_getDataChunk (MonoReflectionAssemblyBuilder *assb, MonoArray *buf, gint32 offset)
 {
 	int count;
+	MonoDynamicAssembly *ass = assb->dynamic_assembly;
+	char *p = mono_array_addr (buf, char, 0);
 
-	if (type == 0) { /* get the header */
-		count = mono_image_get_header (assb, (char*)buf->vector, buf->bounds->length);
-		if (count != -1)
-			return count;
-	} else {
-		MonoDynamicAssembly *ass = assb->dynamic_assembly;
-		char *p = mono_array_addr (buf, char, 0);
-		count = ass->code.index + ass->meta_size;
-		if (count > buf->bounds->length) {
-			g_print ("assembly data exceed supplied buffer\n");
-			return 0;
-		}
-		memcpy (p, ass->code.data, ass->code.index);
-		memcpy (p + ass->code.index, ass->assembly.image->raw_metadata, ass->meta_size);
-		return count;
-	}
+	mono_image_create_pefile (assb);
+
+	if (offset >= ass->pefile.index)
+		return 0;
+	count = mono_array_length (buf);
+	count = MIN (count, ass->pefile.index - offset);
 	
-	return 0;
+	memcpy (p, ass->pefile.data + offset, count);
+
+	return count;
+}
+
+static gboolean
+get_get_type_caller (MonoMethod *m, gint32 no, gint32 ilo, gpointer data) {
+	MonoImage **dest = data;
+
+	/* skip icalls and Type::GetType () */
+	if (!m || m->wrapper_type || (m->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) ||
+			(strcmp (m->name, "GetType") == 0 && m->klass == mono_defaults.monotype_class->parent))
+		return FALSE;
+	*dest = m->klass->image;
+	return TRUE;
 }
 
 static MonoReflectionType*
 ves_icall_type_from_name (MonoString *name)
 {
-	MonoDomain *domain = mono_domain_get (); 
-	MonoClass *klass;
-	MonoImage *image;
-	MonoTypeNameParse info;
+	MonoImage *image = NULL;
+	MonoType *type;
 	gchar *str;
-	
+
+	mono_stack_walk (get_get_type_caller, &image);
 	str = mono_string_to_utf8 (name);
 	/*g_print ("requested type %s\n", str);*/
-	if (!mono_reflection_parse_type (str, &info)) {
-		g_free (str);
-		return NULL;
-	}
-
-	if (info.assembly) {
-		image = mono_image_loaded (info.assembly);
-		/* do we need to load if it's not already loaded? */
-		if (!image) {
-			g_free (str);
-			return NULL;
-		}
-	} else
-		image = mono_defaults.corlib;
-	if (info.nest_name) {
-		klass = mono_class_from_name (image, info.nest_name_space, info.nest_name);
-		if (klass) {
-			GList *nested;
-			mono_class_init (klass);
-			nested = klass->nested_classes;
-			while (nested) {
-				klass = nested->data;
-				if (strcmp (klass->name, info.nest_name) == 0 &&
-						strcmp (klass->name_space, info.nest_name_space) == 0)
-					break;
-				klass = NULL;
-			}
-		}
-	} else {
-		klass = mono_class_from_name (image, info.name_space, info.name);
-	}
+	type = mono_reflection_type_from_name (str, image);
 	g_free (str);
-	if (!klass)
+	if (!type)
 		return NULL;
-	mono_class_init (klass);
-	if (info.rank)
-		klass = mono_array_class_get (klass, info.rank);
-	
-	if (info.isbyref || info.ispointer) /* hack */
-		return mono_type_get_object (domain, &klass->this_arg);
-	else
-		return mono_type_get_object (domain, &klass->byval_arg);
+	/*g_print ("got it\n");*/
+	return mono_type_get_object (mono_object_domain (name), type);
 }
 
 static MonoReflectionType*
 ves_icall_type_from_handle (MonoType *handle)
 {
 	MonoDomain *domain = mono_domain_get (); 
+	MonoClass *klass = mono_class_from_mono_type (handle);
 
-	mono_class_init (handle->data.klass);
+	mono_class_init (klass);
 	return mono_type_get_object (domain, handle);
 }
 
@@ -318,6 +721,95 @@ ves_icall_type_Equals (MonoReflectionType *type, MonoReflectionType *c)
 	return 0;
 }
 
+/* System.TypeCode */
+typedef enum {
+	TYPECODE_EMPTY,
+	TYPECODE_OBJECT,
+	TYPECODE_DBNULL,
+	TYPECODE_BOOLEAN,
+	TYPECODE_CHAR,
+	TYPECODE_SBYTE,
+	TYPECODE_BYTE,
+	TYPECODE_INT16,
+	TYPECODE_UINT16,
+	TYPECODE_INT32,
+	TYPECODE_UINT32,
+	TYPECODE_INT64,
+	TYPECODE_UINT64,
+	TYPECODE_SINGLE,
+	TYPECODE_DOUBLE,
+	TYPECODE_DECIMAL,
+	TYPECODE_DATETIME,
+	TYPECODE_STRING = 18
+} TypeCode;
+
+static guint32
+ves_icall_type_GetTypeCode (MonoReflectionType *type)
+{
+	int t = type->type->type;
+handle_enum:
+	switch (t) {
+	case MONO_TYPE_VOID:
+		return TYPECODE_OBJECT;
+	case MONO_TYPE_BOOLEAN:
+		return TYPECODE_BOOLEAN;
+	case MONO_TYPE_U1:
+		return TYPECODE_BYTE;
+	case MONO_TYPE_I1:
+		return TYPECODE_SBYTE;
+	case MONO_TYPE_U2:
+		return TYPECODE_UINT16;
+	case MONO_TYPE_I2:
+		return TYPECODE_INT16;
+	case MONO_TYPE_CHAR:
+		return TYPECODE_CHAR;
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_U:
+	case MONO_TYPE_I:
+		return TYPECODE_OBJECT;
+	case MONO_TYPE_U4:
+		return TYPECODE_UINT32;
+	case MONO_TYPE_I4:
+		return TYPECODE_INT32;
+	case MONO_TYPE_U8:
+		return TYPECODE_UINT64;
+	case MONO_TYPE_I8:
+		return TYPECODE_INT64;
+	case MONO_TYPE_R4:
+		return TYPECODE_SINGLE;
+	case MONO_TYPE_R8:
+		return TYPECODE_DOUBLE;
+	case MONO_TYPE_VALUETYPE:
+		if (type->type->data.klass->enumtype) {
+			t = type->type->data.klass->enum_basetype->type;
+			goto handle_enum;
+		} else {
+			MonoClass *k =  type->type->data.klass;
+			if (strcmp (k->name_space, "System") == 0) {
+				if (strcmp (k->name, "Decimal") == 0)
+					return TYPECODE_DECIMAL;
+				else if (strcmp (k->name, "DateTime") == 0)
+					return TYPECODE_DATETIME;
+				else if (strcmp (k->name, "DBNull") == 0)
+					return TYPECODE_DBNULL;
+			}
+		}
+		/* handle datetime, dbnull.. */
+		return TYPECODE_OBJECT;
+	case MONO_TYPE_STRING:
+		return TYPECODE_STRING;
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:
+	case MONO_TYPE_OBJECT:
+		return TYPECODE_OBJECT;
+	case MONO_TYPE_CLASS:
+		return TYPECODE_OBJECT;
+	default:
+		g_error ("type 0x%02x not handled in GetTypeCode()", t);
+	}
+	return 0;
+}
+
 static guint32
 ves_icall_type_is_subtype_of (MonoReflectionType *type, MonoReflectionType *c, MonoBoolean check_interfaces)
 {
@@ -331,16 +823,6 @@ ves_icall_type_is_subtype_of (MonoReflectionType *type, MonoReflectionType *c, M
 
 	if (!c) /* FIXME: dont know what do do here */
 		return 0;
-	
-	while (!type->type) { /* FIXME: hack for TypeBuilder */
-		MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)type;
-		type = tb->parent;
-	}
-
-	while (!c->type) { /* FIXME: hack for TypeBuilder */
-		MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)c;
-		c = tb->parent;
-	}
 
 	klass = mono_class_from_mono_type (type->type);
 	klassc = mono_class_from_mono_type (c->type);
@@ -380,11 +862,10 @@ ves_icall_get_attributes (MonoReflectionType *type)
 static void
 ves_icall_get_method_info (MonoMethod *method, MonoMethodInfo *info)
 {
-	MonoDomain *domain = mono_domain_get (); 
+	MonoDomain *domain = mono_domain_get ();
 
 	info->parent = mono_type_get_object (domain, &method->klass->byval_arg);
 	info->ret = mono_type_get_object (domain, method->signature->ret);
-	info->name = mono_string_new (domain, method->name);
 	info->attrs = method->flags;
 	info->implattrs = method->iflags;
 }
@@ -421,36 +902,123 @@ ves_icall_get_field_info (MonoReflectionField *field, MonoFieldInfo *info)
 }
 
 static MonoObject *
-ves_icall_MonoField_GetValue (MonoReflectionField *field, MonoObject *obj) {
-	MonoObject *res;
+ves_icall_MonoField_GetValueInternal (MonoReflectionField *field, MonoObject *obj)
+{	
+	MonoObject *o;
+	MonoClassField *cf = field->field;
 	MonoClass *klass;
-	MonoType *ftype = field->field->type;
-	int type = ftype->type;
-	char *p, *r;
-	guint32 align;
+	MonoVTable *vtable;
+	MonoDomain *domain = mono_domain_get ();
+	gchar *v;
+	gboolean is_static = FALSE;
+	gboolean is_ref = FALSE;
 
 	mono_class_init (field->klass);
-	if (ftype->attrs & FIELD_ATTRIBUTE_STATIC) {
-		MonoVTable *vtable;
-		vtable = mono_class_vtable (mono_domain_get (), field->klass);
-		p = (char*)(vtable->data) + field->field->offset;
-	} else {
-		p = (char*)obj + field->field->offset;
-	}
 
-	switch (type) {
-	case MONO_TYPE_OBJECT:
+	switch (cf->type->type) {
 	case MONO_TYPE_STRING:
-	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_CLASS:
 	case MONO_TYPE_ARRAY:
-		return *(MonoObject**)p;
+	case MONO_TYPE_SZARRAY:
+		is_ref = TRUE;
+		break;
+	case MONO_TYPE_U1:
+	case MONO_TYPE_I1:
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_I2:
+	case MONO_TYPE_CHAR:
+	case MONO_TYPE_U:
+	case MONO_TYPE_I:
+	case MONO_TYPE_U4:
+	case MONO_TYPE_I4:
+	case MONO_TYPE_R4:
+	case MONO_TYPE_U8:
+	case MONO_TYPE_I8:
+	case MONO_TYPE_R8:
+	case MONO_TYPE_VALUETYPE:
+		is_ref = cf->type->byref;
+		break;
+	default:
+		g_error ("type 0x%x not handled in "
+			 "ves_icall_Monofield_GetValue", cf->type->type);
+		return NULL;
 	}
-	klass = mono_class_from_mono_type (ftype);
-	res = mono_object_new (mono_domain_get (), klass);
-	r = (char*)res + sizeof (MonoObject);
-	memcpy (r, p, mono_class_value_size (klass, &align));
 
-	return res;
+	if (cf->type->attrs & FIELD_ATTRIBUTE_STATIC) {
+		is_static = TRUE;
+		vtable = mono_class_vtable (domain, field->klass);
+	}
+	
+	if (is_ref) {
+		if (is_static) {
+			mono_field_static_get_value (vtable, cf, &o);
+		} else {
+			mono_field_get_value (obj, cf, &o);
+		}
+		return o;
+	}
+
+	/* boxed value type */
+	klass = mono_class_from_mono_type (cf->type);
+	o = mono_object_new (domain, klass);
+	v = ((gchar *) o) + sizeof (MonoObject);
+	if (is_static) {
+		mono_field_static_get_value (vtable, cf, v);
+	} else {
+		mono_field_get_value (obj, cf, v);
+	}
+
+	return o;
+}
+
+static void
+ves_icall_FieldInfo_SetValueInternal (MonoReflectionField *field, MonoObject *obj, MonoObject *value)
+{
+	MonoClassField *cf = field->field;
+	gchar *v;
+
+	v = (gchar *) value;
+	if (!cf->type->byref) {
+		switch (cf->type->type) {
+		case MONO_TYPE_U1:
+		case MONO_TYPE_I1:
+		case MONO_TYPE_BOOLEAN:
+		case MONO_TYPE_U2:
+		case MONO_TYPE_I2:
+		case MONO_TYPE_CHAR:
+		case MONO_TYPE_U:
+		case MONO_TYPE_I:
+		case MONO_TYPE_U4:
+		case MONO_TYPE_I4:
+		case MONO_TYPE_R4:
+		case MONO_TYPE_U8:
+		case MONO_TYPE_I8:
+		case MONO_TYPE_R8:
+		case MONO_TYPE_VALUETYPE:
+			v += sizeof (MonoObject);
+			break;
+		case MONO_TYPE_STRING:
+		case MONO_TYPE_OBJECT:
+		case MONO_TYPE_CLASS:
+		case MONO_TYPE_ARRAY:
+		case MONO_TYPE_SZARRAY:
+			/* Do nothing */
+			break;
+		default:
+			g_error ("type 0x%x not handled in "
+				 "ves_icall_FieldInfo_SetValueInternal", cf->type->type);
+			return;
+		}
+	}
+
+	if (cf->type->attrs & FIELD_ATTRIBUTE_STATIC) {
+		MonoVTable *vtable = mono_class_vtable (mono_domain_get (), field->klass);
+		mono_field_static_set_value (vtable, cf, v);
+	} else {
+		mono_field_set_value (obj, cf, v);
+	}
 }
 
 static void
@@ -461,8 +1029,8 @@ ves_icall_get_property_info (MonoReflectionProperty *property, MonoPropertyInfo
 	info->parent = mono_type_get_object (domain, &property->klass->byval_arg);
 	info->name = mono_string_new (domain, property->property->name);
 	info->attrs = property->property->attrs;
-	info->get = property->property->get ? mono_method_get_object (domain, property->property->get): NULL;
-	info->set = property->property->set ? mono_method_get_object (domain, property->property->set): NULL;
+	info->get = property->property->get ? mono_method_get_object (domain, property->property->get, NULL): NULL;
+	info->set = property->property->set ? mono_method_get_object (domain, property->property->set, NULL): NULL;
 	/* 
 	 * There may be other methods defined for properties, though, it seems they are not exposed 
 	 * in the reflection API 
@@ -470,26 +1038,26 @@ ves_icall_get_property_info (MonoReflectionProperty *property, MonoPropertyInfo
 }
 
 static void
-ves_icall_get_type_info (MonoType *type, MonoTypeInfo *info)
+ves_icall_get_event_info (MonoReflectionEvent *event, MonoEventInfo *info)
+{
+	MonoDomain *domain = mono_domain_get (); 
+
+	info->parent = mono_type_get_object (domain, &event->klass->byval_arg);
+	info->name = mono_string_new (domain, event->event->name);
+	info->attrs = event->event->attrs;
+	info->add_method = event->event->add ? mono_method_get_object (domain, event->event->add, NULL): NULL;
+	info->remove_method = event->event->remove ? mono_method_get_object (domain, event->event->remove, NULL): NULL;
+	info->raise_method = event->event->raise ? mono_method_get_object (domain, event->event->raise, NULL): NULL;
+}
+
+static MonoArray*
+ves_icall_Type_GetInterfaces (MonoReflectionType* type)
 {
 	MonoDomain *domain = mono_domain_get (); 
-	MonoClass *class = mono_class_from_mono_type (type);
-	MonoClass *parent;
 	MonoArray *intf;
 	int ninterf, i;
-	
-	info->parent = class->parent ? mono_type_get_object (domain, &class->parent->byval_arg): NULL;
-	info->name = mono_string_new (domain, class->name);
-	info->name_space = mono_string_new (domain, class->name_space);
-	info->attrs = class->flags;
-	info->rank = class->rank;
-	info->assembly = NULL; /* FIXME */
-	if (class->enumtype)
-		info->etype = mono_type_get_object (domain, class->enum_basetype);
-	else if (class->element_class)
-		info->etype = mono_type_get_object (domain, &class->element_class->byval_arg);
-	else
-		info->etype = NULL;
+	MonoClass *class = mono_class_from_mono_type (type->type);
+	MonoClass *parent;
 
 	ninterf = 0;
 	for (parent = class; parent; parent = parent->parent) {
@@ -503,48 +1071,179 @@ ves_icall_get_type_info (MonoType *type, MonoTypeInfo *info)
 			++ninterf;
 		}
 	}
-	info->interfaces = intf;
+	return intf;
 }
 
-static MonoObject*
-ves_icall_InternalInvoke (MonoReflectionMethod *method, MonoObject *this, MonoArray *params) {
-	//MonoMethodSignature *sig = method->method->signature;
+static MonoReflectionType*
+ves_icall_MonoType_GetElementType (MonoReflectionType *type)
+{
+	MonoClass *class = mono_class_from_mono_type (type->type);
+	if (class->enumtype && class->enum_basetype) /* types that are modifierd typebuilkders may not have enum_basetype set */
+		return mono_type_get_object (mono_object_domain (type), class->enum_basetype);
+	else if (class->element_class)
+		return mono_type_get_object (mono_object_domain (type), &class->element_class->byval_arg);
+	else
+		return NULL;
+}
 
-	/*
-	 * Do we need to copy the values so that the called method can't change them?
-	 */
+static void
+ves_icall_get_type_info (MonoType *type, MonoTypeInfo *info)
+{
+	MonoDomain *domain = mono_domain_get (); 
+	MonoClass *class = mono_class_from_mono_type (type);
 
-	return NULL;
+	info->parent = class->parent ? mono_type_get_object (domain, &class->parent->byval_arg): NULL;
+	info->nested_in = class->nested_in ? mono_type_get_object (domain, &class->nested_in->byval_arg): NULL;
+	info->name = mono_string_new (domain, class->name);
+	info->name_space = mono_string_new (domain, class->name_space);
+	info->attrs = class->flags;
+	info->rank = class->rank;
+	info->assembly = mono_assembly_get_object (domain, class->image->assembly);
+	if (class->enumtype && class->enum_basetype) /* types that are modifierd typebuilkders may not have enum_basetype set */
+		info->etype = mono_type_get_object (domain, class->enum_basetype);
+	else if (class->element_class)
+		info->etype = mono_type_get_object (domain, &class->element_class->byval_arg);
+	else
+		info->etype = NULL;
+
+	info->isbyref = type->byref;
+	info->ispointer = type->type == MONO_TYPE_PTR;
+	info->isprimitive = (type->type >= MONO_TYPE_BOOLEAN) && (type->type <= MONO_TYPE_R8);
+}
+
+static MonoObject *
+ves_icall_InternalInvoke (MonoReflectionMethod *method, MonoObject *this, MonoArray *params) 
+{
+	return mono_runtime_invoke_array (method->method, this, params, NULL);
+}
+
+static MonoObject *
+ves_icall_InternalExecute (MonoReflectionMethod *method, MonoObject *this, MonoArray *params, MonoArray **outArgs) 
+{
+	MonoDomain *domain = mono_domain_get (); 
+	MonoMethod *m = method->method;
+	MonoMethodSignature *sig = m->signature;
+	MonoArray *out_args;
+	MonoObject *result;
+	int i, j, outarg_count = 0;
+
+	if (m->klass == mono_defaults.object_class) {
+
+		if (!strcmp (m->name, "FieldGetter")) {
+			MonoClass *k = this->vtable->klass;
+			MonoString *name = mono_array_get (params, MonoString *, 1);
+			char *str;
+
+			str = mono_string_to_utf8 (name);
+		
+			for (i = 0; i < k->field.count; i++) {
+				if (!strcmp (k->fields [i].name, str)) {
+					MonoClass *field_klass =  mono_class_from_mono_type (k->fields [i].type);
+					if (field_klass->valuetype)
+						result = mono_value_box (domain, field_klass,
+									 (char *)this + k->fields [i].offset);
+					else 
+						result = *((gpointer *)((char *)this + k->fields [i].offset));
+				
+					g_assert (result);
+					out_args = mono_array_new (domain, mono_defaults.object_class, 1);
+					*outArgs = out_args;
+					mono_array_set (out_args, gpointer, 0, result);
+					g_free (str);
+					return NULL;
+				}
+			}
+
+			g_free (str);
+			g_assert_not_reached ();
+
+		} else if (!strcmp (m->name, "FieldSetter")) {
+			MonoClass *k = this->vtable->klass;
+			MonoString *name = mono_array_get (params, MonoString *, 1);
+			int size, align;
+			char *str;
+
+			str = mono_string_to_utf8 (name);
+		
+			for (i = 0; i < k->field.count; i++) {
+				if (!strcmp (k->fields [i].name, str)) {
+					MonoClass *field_klass =  mono_class_from_mono_type (k->fields [i].type);
+					MonoObject *val = mono_array_get (params, gpointer, 2);
+
+					if (field_klass->valuetype) {
+						size = mono_type_size (k->fields [i].type, &align);
+						memcpy ((char *)this + k->fields [i].offset, 
+							((char *)val) + sizeof (MonoObject), size);
+					} else 
+						*((gpointer *)this + k->fields [i].offset) = val;
+				
+					g_assert (result);
+					g_free (str);
+					return NULL;
+				}
+			}
+
+			g_free (str);
+			g_assert_not_reached ();
+
+		}
+	}
+
+	for (i = 0; i < mono_array_length (params); i++) {
+		if (sig->params [i]->byref) 
+			outarg_count++;
+	}
+
+	out_args = mono_array_new (domain, mono_defaults.object_class, outarg_count);
+	
+	for (i = 0, j = 0; i < mono_array_length (params); i++) {
+		if (sig->params [i]->byref) {
+			gpointer arg;
+			arg = mono_array_get (params, gpointer, i);
+			mono_array_set (out_args, gpointer, j, arg);
+			j++;
+		}
+	}
+
+	/* fixme: handle constructors? */
+	if (!strcmp (method->method->name, ".ctor"))
+		g_assert_not_reached ();
+
+	result = mono_runtime_invoke_array (method->method, this, params, NULL);
+
+	*outArgs = out_args;
+
+	return result;
 }
 
 static MonoObject *
 ves_icall_System_Enum_ToObject (MonoReflectionType *type, MonoObject *obj)
 {
 	MonoDomain *domain = mono_domain_get (); 
-	MonoClass *enumc;
+	MonoClass *enumc, *objc;
 	gint32 s1, s2;
 	MonoObject *res;
 	
-	MONO_CHECK_ARG_NULL (domain, type);
-	MONO_CHECK_ARG_NULL (domain, obj);
+	MONO_CHECK_ARG_NULL (type);
+	MONO_CHECK_ARG_NULL (obj);
 
 	enumc = mono_class_from_mono_type (type->type);
+	objc = obj->vtable->klass;
 
-	MONO_CHECK_ARG (domain, obj, enumc->enumtype == TRUE);
-	MONO_CHECK_ARG (domain, obj, obj->vtable->klass->byval_arg.type >= MONO_TYPE_I1 &&  
-			obj->vtable->klass->byval_arg.type <= MONO_TYPE_U8);
-
+	MONO_CHECK_ARG (obj, enumc->enumtype == TRUE);
+	MONO_CHECK_ARG (obj, (objc->enumtype) || (objc->byval_arg.type >= MONO_TYPE_I1 &&
+						  objc->byval_arg.type <= MONO_TYPE_U8));
 	
 	s1 = mono_class_value_size (enumc, NULL);
-	s2 = mono_class_value_size (obj->vtable->klass, NULL);
+	s2 = mono_class_value_size (objc, NULL);
 
 	res = mono_object_new (domain, enumc);
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-	memcpy ((gpointer)res + sizeof (MonoObject), (gpointer)obj + sizeof (MonoObject), MIN (s1, s2));
+	memcpy ((char *)res + sizeof (MonoObject), (char *)obj + sizeof (MonoObject), MIN (s1, s2));
 #else
-	memcpy ((gpointer)res + sizeof (MonoObject) + (s1 > s2 ? s1 - s2 : 0),
-		(gpointer)obj + sizeof (MonoObject) + (s2 > s1 ? s2 - s1 : 0),
+	memcpy ((char *)res + sizeof (MonoObject) + (s1 > s2 ? s1 - s2 : 0),
+		(char *)obj + sizeof (MonoObject) + (s2 > s1 ? s2 - s1 : 0),
 		MIN (s1, s2));
 #endif
 	return res;
@@ -567,8 +1266,8 @@ ves_icall_System_Enum_get_value (MonoObject *this)
 	
 	enumc = mono_class_from_mono_type (this->vtable->klass->enum_basetype);
 	res = mono_object_new (domain, enumc);
-	dst = (gpointer)res + sizeof (MonoObject);
-	src = (gpointer)this + sizeof (MonoObject);
+	dst = (char *)res + sizeof (MonoObject);
+	src = (char *)this + sizeof (MonoObject);
 	size = mono_class_value_size (enumc, NULL);
 
 	memcpy (dst, src, size);
@@ -587,7 +1286,7 @@ ves_icall_get_enum_info (MonoReflectionType *type, MonoEnumInfo *info)
 	info->utype = mono_type_get_object (domain, enumc->enum_basetype);
 	nvalues = enumc->field.count - 1;
 	info->names = mono_array_new (domain, mono_defaults.string_class, nvalues);
-	info->values = mono_array_new (domain, mono_class_from_mono_type (enumc->enum_basetype), nvalues);
+	info->values = mono_array_new (domain, enumc, nvalues);
 	
 	for (i = 0, j = 0; i < enumc->field.count; ++i) {
 		field = &enumc->fields [i];
@@ -626,7 +1325,7 @@ ves_icall_get_enum_info (MonoReflectionType *type, MonoEnumInfo *info)
 }
 
 static MonoMethod*
-search_method (MonoReflectionType *type, char *name, guint32 flags, MonoArray *args)
+search_method (MonoReflectionType *type, const char *name, guint32 flags, MonoArray *args)
 {
 	MonoClass *klass, *start_class;
 	MonoMethod *m;
@@ -641,6 +1340,8 @@ search_method (MonoReflectionType *type, char *name, guint32 flags, MonoArray *a
 				continue;
 			if (strcmp(m->name, name))
 				continue;
+			if (!args)
+				return m;
 			if (m->signature->param_count != mono_array_length (args))
 				continue;
 			for (j = 0; j < m->signature->param_count; ++j) {
@@ -653,7 +1354,7 @@ search_method (MonoReflectionType *type, char *name, guint32 flags, MonoArray *a
 		}
 		klass = klass->parent;
 	}
-	g_print ("Method %s.%s::%s (%d) not found\n", start_class->name_space, start_class->name, name, mono_array_length (args));
+	//g_print ("Method %s.%s::%s (%d) not found\n", start_class->name_space, start_class->name, name, mono_array_length (args));
 	return NULL;
 }
 
@@ -662,10 +1363,11 @@ ves_icall_get_constructor (MonoReflectionType *type, MonoArray *args)
 {
 	MonoDomain *domain = mono_domain_get (); 
 	MonoMethod *m;
+	MonoClass *refc = mono_class_from_mono_type (type->type);
 
 	m = search_method (type, ".ctor", METHOD_ATTRIBUTE_RT_SPECIAL_NAME, args);
 	if (m)
-		return mono_method_get_object (domain, m);
+		return mono_method_get_object (domain, m, refc);
 	return NULL;
 }
 
@@ -674,12 +1376,13 @@ ves_icall_get_method (MonoReflectionType *type, MonoString *name, MonoArray *arg
 {
 	MonoDomain *domain = mono_domain_get (); 
 	MonoMethod *m;
+	MonoClass *refc = mono_class_from_mono_type (type->type);
 	char *n = mono_string_to_utf8 (name);
 
 	m = search_method (type, n, 0, args);
 	g_free (n);
 	if (m)
-		return mono_method_get_object (domain, m);
+		return mono_method_get_object (domain, m, refc);
 	return NULL;
 }
 
@@ -730,221 +1433,429 @@ enum {
 	BFLAGS_OptionalParamBinding = 0x40000
 };
 
+static MonoFieldInfo *
+ves_icall_Type_GetField (MonoReflectionType *type, MonoString *name, guint32 bflags)
+{
+	MonoDomain *domain; 
+	MonoClass *startklass, *klass;
+	int i, match;
+	MonoClassField *field;
+	char *utf8_name;
+	domain = ((MonoObject *)type)->vtable->domain;
+	klass = startklass = mono_class_from_mono_type (type->type);
+
+	if (!name)
+		return NULL;
+
+handle_parent:	
+	for (i = 0; i < klass->field.count; ++i) {
+		match = 0;
+		field = &klass->fields [i];
+		if ((field->type->attrs & FIELD_ATTRIBUTE_FIELD_ACCESS_MASK) == FIELD_ATTRIBUTE_PUBLIC) {
+			if (bflags & BFLAGS_Public)
+				match++;
+		} else {
+			if (bflags & BFLAGS_NonPublic)
+				match++;
+		}
+		if (!match)
+			continue;
+		match = 0;
+		if (field->type->attrs & FIELD_ATTRIBUTE_STATIC) {
+			if (bflags & BFLAGS_Static)
+				match++;
+		} else {
+			if (bflags & BFLAGS_Instance)
+				match++;
+		}
+
+		if (!match)
+			continue;
+		
+		utf8_name = mono_string_to_utf8 (name);
+
+		if (strcmp (field->name, utf8_name)) {
+			g_free (utf8_name);
+			continue;
+		}
+		g_free (utf8_name);
+		
+		return (MonoFieldInfo *)mono_field_get_object (domain, klass, field);
+	}
+	if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
+		goto handle_parent;
+
+	return NULL;
+}
 
-/*
- * Note: the filter is applied from within corlib.
- */
 static MonoArray*
-ves_icall_type_find_members (MonoReflectionType *type, guint32 membertypes, guint32 bflags)
+ves_icall_Type_GetFields (MonoReflectionType *type, guint32 bflags)
 {
 	MonoDomain *domain; 
 	GSList *l = NULL, *tmp;
-	static MonoClass *System_Reflection_MemberInfo;
 	MonoClass *startklass, *klass;
 	MonoArray *res;
-	MonoMethod *method;
 	MonoObject *member;
-	int i, is_ctor, len, match;
+	int i, len, match;
+	MonoClassField *field;
 
 	domain = ((MonoObject *)type)->vtable->domain;
 	klass = startklass = mono_class_from_mono_type (type->type);
 
-	/* FIXME: check the bindingflags */
 handle_parent:	
-	if (membertypes & (1|8)) { /* constructors and methods */
-		for (i = 0; i < klass->method.count; ++i) {
-			match = 0;
-			method = klass->methods [i];
-			if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
-				if (bflags & BFLAGS_Public)
-					match++;
-			} else {
-				if (bflags & BFLAGS_NonPublic)
-					match++;
-			}
-			if (!match)
-				continue;
-			match = 0;
-			if (method->flags & METHOD_ATTRIBUTE_STATIC) {
-				if (bflags & BFLAGS_Static)
-					match++;
-			} else {
-				if (bflags & BFLAGS_Instance)
-					match++;
-			}
-
-			if (!match)
-				continue;
-			match = 0;
-			member = (MonoObject*)mono_method_get_object (domain, method);
-			
-			is_ctor = strcmp (method->name, ".ctor") == 0 ||
-					strcmp (method->name, ".cctor") == 0;
-			if (is_ctor && (membertypes & 1)) {
-				l = g_slist_prepend (l, member);
-				continue;
-			}
-			if (!is_ctor && (membertypes & 8)) {
-				l = g_slist_prepend (l, member);
-			}
+	for (i = 0; i < klass->field.count; ++i) {
+		match = 0;
+		field = &klass->fields [i];
+		if ((field->type->attrs & FIELD_ATTRIBUTE_FIELD_ACCESS_MASK) == FIELD_ATTRIBUTE_PUBLIC) {
+			if (bflags & BFLAGS_Public)
+				match++;
+		} else {
+			if (bflags & BFLAGS_NonPublic)
+				match++;
 		}
-	}
-	if (membertypes & 4) { /* fields */
-		MonoClassField *field;
-		for (i = 0; i < klass->field.count; ++i) {
-			match = 0;
-			field = &klass->fields [i];
-			if ((field->type->attrs & FIELD_ATTRIBUTE_FIELD_ACCESS_MASK) == FIELD_ATTRIBUTE_PUBLIC) {
-				if (bflags & BFLAGS_Public)
-					match++;
-			} else {
-				if (bflags & BFLAGS_NonPublic)
-					match++;
-			}
-			if (!match)
-				continue;
-			match = 0;
-			if (field->type->attrs & FIELD_ATTRIBUTE_STATIC) {
-				if (bflags & BFLAGS_Static)
-					match++;
-			} else {
-				if (bflags & BFLAGS_Instance)
-					match++;
-			}
-
-			if (!match)
-				continue;
-			member = (MonoObject*)mono_field_get_object (domain, klass, field);
-			l = g_slist_prepend (l, member);
+		if (!match)
+			continue;
+		match = 0;
+		if (field->type->attrs & FIELD_ATTRIBUTE_STATIC) {
+			if (bflags & BFLAGS_Static)
+				match++;
+		} else {
+			if (bflags & BFLAGS_Instance)
+				match++;
 		}
+
+		if (!match)
+			continue;
+		member = (MonoObject*)mono_field_get_object (domain, klass, field);
+		l = g_slist_prepend (l, member);
 	}
-	if (membertypes & 16) { /* properties */
-		MonoProperty *prop;
-		for (i = 0; i < klass->property.count; ++i) {
-			prop = &klass->properties [i];
-			match = 0;
-			method = prop->get;
-			if (!method)
-				method = prop->set;
-			if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
-				if (bflags & BFLAGS_Public)
-					match++;
-			} else {
-				if (bflags & BFLAGS_NonPublic)
-					match++;
-			}
-			if (!match)
-				continue;
-			match = 0;
-			if (method->flags & METHOD_ATTRIBUTE_STATIC) {
-				if (bflags & BFLAGS_Static)
-					match++;
-			} else {
-				if (bflags & BFLAGS_Instance)
-					match++;
-			}
+	if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
+		goto handle_parent;
+	len = g_slist_length (l);
+	res = mono_array_new (domain, mono_defaults.field_info_class, len);
+	i = 0;
+	tmp = g_slist_reverse (l);
+	for (; tmp; tmp = tmp->next, ++i)
+		mono_array_set (res, gpointer, i, tmp->data);
+	g_slist_free (l);
+	return res;
+}
 
-			if (!match)
-				continue;
-			match = 0;
-			l = g_slist_prepend (l, mono_property_get_object (domain, klass, prop));
+static MonoArray*
+ves_icall_Type_GetMethods (MonoReflectionType *type, guint32 bflags)
+{
+	MonoDomain *domain; 
+	GSList *l = NULL, *tmp;
+	static MonoClass *System_Reflection_MethodInfo;
+	MonoClass *startklass, *klass;
+	MonoArray *res;
+	MonoMethod *method;
+	MonoObject *member;
+	int i, len, match;
+		
+	domain = ((MonoObject *)type)->vtable->domain;
+	klass = startklass = mono_class_from_mono_type (type->type);
+
+handle_parent:
+	for (i = 0; i < klass->method.count; ++i) {
+		match = 0;
+		method = klass->methods [i];
+		if (strcmp (method->name, ".ctor") == 0 || strcmp (method->name, ".cctor") == 0)
+			continue;
+		if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
+			if (bflags & BFLAGS_Public)
+				match++;
+		} else {
+			if (bflags & BFLAGS_NonPublic)
+				match++;
 		}
+		if (!match)
+			continue;
+		match = 0;
+		if (method->flags & METHOD_ATTRIBUTE_STATIC) {
+			if (bflags & BFLAGS_Static)
+				match++;
+		} else {
+			if (bflags & BFLAGS_Instance)
+				match++;
+		}
+
+		if (!match)
+			continue;
+		match = 0;
+		member = (MonoObject*)mono_method_get_object (domain, method, startklass);
+			
+		l = g_slist_prepend (l, member);
 	}
 	if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
 		goto handle_parent;
 	len = g_slist_length (l);
-	if (!System_Reflection_MemberInfo)
-		System_Reflection_MemberInfo = mono_class_from_name (
-			mono_defaults.corlib, "System.Reflection", "MemberInfo");
-	res = mono_array_new (domain, System_Reflection_MemberInfo, len);
+	if (!System_Reflection_MethodInfo)
+		System_Reflection_MethodInfo = mono_class_from_name (
+			mono_defaults.corlib, "System.Reflection", "MethodInfo");
+	res = mono_array_new (domain, System_Reflection_MethodInfo, len);
 	i = 0;
 	tmp = l;
 	for (; tmp; tmp = tmp->next, ++i)
 		mono_array_set (res, gpointer, i, tmp->data);
 	g_slist_free (l);
+
 	return res;
 }
 
-static gpointer
-ves_icall_System_Runtime_InteropServices_Marshal_ReadIntPtr (gpointer ptr)
+static MonoArray*
+ves_icall_Type_GetConstructors (MonoReflectionType *type, guint32 bflags)
 {
-	return (gpointer)(*(int *)ptr);
+	MonoDomain *domain; 
+	GSList *l = NULL, *tmp;
+	static MonoClass *System_Reflection_ConstructorInfo;
+	MonoClass *startklass, *klass;
+	MonoArray *res;
+	MonoMethod *method;
+	MonoObject *member;
+	int i, len, match;
+
+	domain = ((MonoObject *)type)->vtable->domain;
+	klass = startklass = mono_class_from_mono_type (type->type);
+
+handle_parent:	
+	for (i = 0; i < klass->method.count; ++i) {
+		match = 0;
+		method = klass->methods [i];
+		if (strcmp (method->name, ".ctor") && strcmp (method->name, ".cctor"))
+			continue;
+		if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
+			if (bflags & BFLAGS_Public)
+				match++;
+		} else {
+			if (bflags & BFLAGS_NonPublic)
+				match++;
+		}
+		if (!match)
+			continue;
+		match = 0;
+		if (method->flags & METHOD_ATTRIBUTE_STATIC) {
+			if (bflags & BFLAGS_Static)
+				match++;
+		} else {
+			if (bflags & BFLAGS_Instance)
+				match++;
+		}
+
+		if (!match)
+			continue;
+		member = (MonoObject*)mono_method_get_object (domain, method, startklass);
+			
+		l = g_slist_prepend (l, member);
+	}
+	if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
+		goto handle_parent;
+	len = g_slist_length (l);
+	if (!System_Reflection_ConstructorInfo)
+		System_Reflection_ConstructorInfo = mono_class_from_name (
+			mono_defaults.corlib, "System.Reflection", "ConstructorInfo");
+	res = mono_array_new (domain, System_Reflection_ConstructorInfo, len);
+	i = 0;
+	tmp = g_slist_reverse (l);
+	for (; tmp; tmp = tmp->next, ++i)
+		mono_array_set (res, gpointer, i, tmp->data);
+	g_slist_free (l);
+	return res;
 }
 
-static MonoString*
-ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAuto (gpointer ptr)
+static MonoArray*
+ves_icall_Type_GetProperties (MonoReflectionType *type, guint32 bflags)
 {
-	MonoDomain *domain = mono_domain_get (); 
+	MonoDomain *domain; 
+	GSList *l = NULL, *tmp;
+	static MonoClass *System_Reflection_PropertyInfo;
+	MonoClass *startklass, *klass;
+	MonoArray *res;
+	MonoMethod *method;
+	MonoProperty *prop;
+	int i, len, match;
 
-	return mono_string_new (domain, (char *)ptr);
+	domain = ((MonoObject *)type)->vtable->domain;
+	klass = startklass = mono_class_from_mono_type (type->type);
+
+handle_parent:
+	for (i = 0; i < klass->property.count; ++i) {
+		prop = &klass->properties [i];
+		match = 0;
+		method = prop->get;
+		if (!method)
+			method = prop->set;
+		if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
+			if (bflags & BFLAGS_Public)
+				match++;
+		} else {
+			if (bflags & BFLAGS_NonPublic)
+				match++;
+		}
+		if (!match)
+			continue;
+		match = 0;
+		if (method->flags & METHOD_ATTRIBUTE_STATIC) {
+			if (bflags & BFLAGS_Static)
+				match++;
+		} else {
+			if (bflags & BFLAGS_Instance)
+				match++;
+		}
+
+		if (!match)
+			continue;
+		match = 0;
+		l = g_slist_prepend (l, mono_property_get_object (domain, klass, prop));
+	}
+	if ((!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent)))
+		goto handle_parent;
+	len = g_slist_length (l);
+	if (!System_Reflection_PropertyInfo)
+		System_Reflection_PropertyInfo = mono_class_from_name (
+			mono_defaults.corlib, "System.Reflection", "PropertyInfo");
+	res = mono_array_new (domain, System_Reflection_PropertyInfo, len);
+	i = 0;
+	tmp = l;
+	for (; tmp; tmp = tmp->next, ++i)
+		mono_array_set (res, gpointer, i, tmp->data);
+	g_slist_free (l);
+	return res;
 }
 
-static guint32 ves_icall_System_Runtime_InteropServices_Marshal_GetLastWin32Error(void)
+static MonoArray*
+ves_icall_Type_GetEvents (MonoReflectionType *type, guint32 bflags)
 {
-	return(GetLastError());
+	MonoDomain *domain; 
+	GSList *l = NULL, *tmp;
+	static MonoClass *System_Reflection_EventInfo;
+	MonoClass *startklass, *klass;
+	MonoArray *res;
+	MonoMethod *method;
+	MonoEvent *event;
+	int i, len, match;
+
+	domain = ((MonoObject *)type)->vtable->domain;
+	klass = startklass = mono_class_from_mono_type (type->type);
+
+handle_parent:	
+	for (i = 0; i < klass->event.count; ++i) {
+		event = &klass->events [i];
+		match = 0;
+		method = event->add;
+		if (!method)
+			method = event->remove;
+		if ((method->flags & METHOD_ATTRIBUTE_MEMBER_ACCESS_MASK) == METHOD_ATTRIBUTE_PUBLIC) {
+			if (bflags & BFLAGS_Public)
+				match++;
+		} else {
+			if (bflags & BFLAGS_NonPublic)
+				match++;
+		}
+		if (!match)
+			continue;
+		match = 0;
+		if (method->flags & METHOD_ATTRIBUTE_STATIC) {
+			if (bflags & BFLAGS_Static)
+				match++;
+		} else {
+			if (bflags & BFLAGS_Instance)
+				match++;
+		}
+
+		if (!match)
+			continue;
+		match = 0;
+		l = g_slist_prepend (l, mono_event_get_object (domain, klass, event));
+	}
+	if (!(bflags & BFLAGS_DeclaredOnly) && (klass = klass->parent))
+		goto handle_parent;
+	len = g_slist_length (l);
+	if (!System_Reflection_EventInfo)
+		System_Reflection_EventInfo = mono_class_from_name (
+			mono_defaults.corlib, "System.Reflection", "EventInfo");
+	res = mono_array_new (domain, System_Reflection_EventInfo, len);
+	i = 0;
+	tmp = l;
+	for (; tmp; tmp = tmp->next, ++i)
+		mono_array_set (res, gpointer, i, tmp->data);
+	g_slist_free (l);
+	return res;
 }
 
-static MonoReflectionType*
-ves_icall_System_Reflection_Assembly_GetType (MonoReflectionAssembly *assembly, MonoString *type, MonoBoolean throwOnError, MonoBoolean ignoreCase)
+static MonoArray*
+ves_icall_Type_GetNestedTypes (MonoReflectionType *type, guint32 bflags)
 {
-	MonoDomain *domain = mono_domain_get (); 
-	/* FIXME : use ignoreCase */
-	gchar *name, *namespace, *str;
-	char *byref, *isarray, *ispointer;
-	guint rank;
-	MonoClass *klass;
+	MonoDomain *domain; 
+	GSList *l = NULL, *tmp;
+	GList *tmpn;
+	MonoClass *startklass, *klass;
+	MonoArray *res;
+	MonoObject *member;
+	int i, len, match;
+	MonoClass *nested;
 
-	str = namespace = mono_string_to_utf8 (type);
-	/*g_print ("requested type %s in %s\n", str, assembly->assembly->name);*/
-
-	name = strrchr (str, '.');
-	byref = strrchr (str, '&');
-	ispointer = strrchr (str, '*');
-	if (byref)
-		*byref = 0;
-	if (ispointer)
-		*ispointer = 0;
-	isarray = strrchr (str, '[');
-	if (isarray) {
-		rank = 1;
-		*isarray = 0;
-		while (*isarray) {
-			if (*isarray == ',')
-				rank++;
-			if (*isarray == ']')
-				break;
-			++isarray;
+	domain = ((MonoObject *)type)->vtable->domain;
+	klass = startklass = mono_class_from_mono_type (type->type);
+
+	for (tmpn = klass->nested_classes; tmpn; tmpn = tmpn->next) {
+		match = 0;
+		nested = tmpn->data;
+		if ((nested->flags & TYPE_ATTRIBUTE_VISIBILITY_MASK) == TYPE_ATTRIBUTE_NESTED_PUBLIC) {
+			if (bflags & BFLAGS_Public)
+				match++;
+		} else {
+			if (bflags & BFLAGS_NonPublic)
+				match++;
 		}
+		if (!match)
+			continue;
+		member = (MonoObject*)mono_type_get_object (domain, &nested->byval_arg);
+		l = g_slist_prepend (l, member);
 	}
+	len = g_slist_length (l);
+	res = mono_array_new (domain, mono_defaults.monotype_class, len);
+	i = 0;
+	tmp = g_slist_reverse (l);
+	for (; tmp; tmp = tmp->next, ++i)
+		mono_array_set (res, gpointer, i, tmp->data);
+	g_slist_free (l);
+	return res;
+}
 
-	if (name) {
-		*name = 0;
-		++name;
-	} else {
-		namespace = "";
-		name = str;
+static MonoReflectionType*
+ves_icall_System_Reflection_Assembly_GetType (MonoReflectionAssembly *assembly, MonoString *name, MonoBoolean throwOnError, MonoBoolean ignoreCase)
+{
+	MonoDomain *domain = mono_domain_get (); 
+	gchar *str;
+	MonoType *type;
+	MonoTypeNameParse info;
+
+	str = mono_string_to_utf8 (name);
+	/*g_print ("requested type %s in %s\n", str, assembly->assembly->aname.name);*/
+	if (!mono_reflection_parse_type (str, &info)) {
+		g_free (str);
+		g_list_free (info.modifiers);
+		g_list_free (info.nested);
+		if (throwOnError) /* uhm: this is a parse error, though... */
+			mono_raise_exception (mono_get_exception_type_load ());
+		/*g_print ("failed parse\n");*/
+		return NULL;
 	}
 
-	klass = mono_class_from_name (assembly->assembly->image, namespace, name);
+	type = mono_reflection_get_type (assembly->assembly->image, &info, ignoreCase);
 	g_free (str);
-	if (!klass) {
+	g_list_free (info.modifiers);
+	g_list_free (info.nested);
+	if (!type) {
 		if (throwOnError)
 			mono_raise_exception (mono_get_exception_type_load ());
+		/* g_print ("failed find\n"); */
 		return NULL;
 	}
-	if (!klass->inited)
-		mono_class_init (klass);
-
-	if (isarray) {
-		klass = mono_array_class_get (klass, rank);
-		mono_class_init (klass);
-		/*g_print ("got array class %s [%d] (0x%x)\n", klass->element_class->name, klass->rank, klass->this_arg.type);*/
-	}
+	/* g_print ("got it\n"); */
+	return mono_type_get_object (domain, type);
 
-	if (byref || ispointer)
-		return mono_type_get_object (domain, &klass->this_arg);
-	else
-		return mono_type_get_object (domain, &klass->byval_arg);
 }
 
 static MonoString *
@@ -960,51 +1871,318 @@ ves_icall_System_Reflection_Assembly_get_code_base (MonoReflectionAssembly *asse
 	return res;
 }
 
-static MonoString *
-ves_icall_System_MonoType_assQualifiedName (MonoReflectionType *object)
+static MonoReflectionMethod*
+ves_icall_System_Reflection_Assembly_get_EntryPoint (MonoReflectionAssembly *assembly) {
+	guint32 token = mono_image_get_entry_point (assembly->assembly->image);
+	if (!token)
+		return NULL;
+	return mono_method_get_object (mono_object_domain (assembly), mono_get_method (assembly->assembly->image, token, NULL), NULL);
+}
+
+static MonoArray*
+ves_icall_System_Reflection_Assembly_GetManifestResourceNames (MonoReflectionAssembly *assembly) {
+	MonoTableInfo *table = &assembly->assembly->image->tables [MONO_TABLE_MANIFESTRESOURCE];
+	MonoArray *result = mono_array_new (mono_object_domain (assembly), mono_defaults.string_class, table->rows);
+	int i;
+	const char *val;
+
+	for (i = 0; i < table->rows; ++i) {
+		val = mono_metadata_string_heap (assembly->assembly->image, mono_metadata_decode_row_col (table, i, MONO_MANIFEST_NAME));
+		mono_array_set (result, gpointer, i, mono_string_new (mono_object_domain (assembly), val));
+	}
+	return result;
+}
+
+/* move this in some file in mono/util/ */
+static char *
+g_concat_dir_and_file (const char *dir, const char *file)
 {
-	MonoDomain *domain = mono_domain_get (); 
-	/* FIXME : real rules are more complicated (internal classes,
-	  reference types, array types, etc. */
-	MonoString *res;
-	gchar *fullname;
-	MonoClass *klass;
-	char *append = NULL;
+	g_return_val_if_fail (dir != NULL, NULL);
+	g_return_val_if_fail (file != NULL, NULL);
 
-	switch (object->type->type) {
-	case MONO_TYPE_SZARRAY:
-		klass = object->type->data.type->data.klass;
-		append = "[]";
-		break;
-	case MONO_TYPE_PTR:
-		klass = object->type->data.type->data.klass;
-		append = "*";
-		break;
-	default:
-		klass = object->type->data.klass;
+        /*
+	 * If the directory name doesn't have a / on the end, we need
+	 * to add one so we get a proper path to the file
+	 */
+	if (dir [strlen(dir) - 1] != G_DIR_SEPARATOR)
+		return g_strconcat (dir, G_DIR_SEPARATOR_S, file, NULL);
+	else
+		return g_strconcat (dir, file, NULL);
+}
+
+static MonoObject*
+ves_icall_System_Reflection_Assembly_GetManifestResourceInternal (MonoReflectionAssembly *assembly, MonoString *name) {
+	char *n = mono_string_to_utf8 (name);
+	MonoTableInfo *table = &assembly->assembly->image->tables [MONO_TABLE_MANIFESTRESOURCE];
+	guint32 i;
+	guint32 cols [MONO_MANIFEST_SIZE];
+	const char *val;
+	MonoObject *result;
+
+	for (i = 0; i < table->rows; ++i) {
+		mono_metadata_decode_row (table, i, cols, MONO_MANIFEST_SIZE);
+		val = mono_metadata_string_heap (assembly->assembly->image, cols [MONO_MANIFEST_NAME]);
+		if (strcmp (val, n) == 0)
+			break;
+	}
+	g_free (n);
+	if (i == table->rows)
+		return NULL;
+	/* FIXME */
+	if (!cols [MONO_MANIFEST_IMPLEMENTATION]) {
+		guint32 size;
+		MonoArray *data;
+		val = mono_image_get_resource (assembly->assembly->image, cols [MONO_MANIFEST_OFFSET], &size);
+		if (!val)
+			return NULL;
+		data = mono_array_new (mono_object_domain (assembly), mono_defaults.byte_class, size);
+		memcpy (mono_array_addr (data, char, 0), val, size);
+		return (MonoObject*)data;
+	}
+	switch (cols [MONO_MANIFEST_IMPLEMENTATION] & IMPLEMENTATION_MASK) {
+	case IMPLEMENTATION_FILE:
+		i = cols [MONO_MANIFEST_IMPLEMENTATION] >> IMPLEMENTATION_BITS;
+		table = &assembly->assembly->image->tables [MONO_TABLE_FILE];
+		i = mono_metadata_decode_row_col (table, i - 1, MONO_FILE_NAME);
+		val = mono_metadata_string_heap (assembly->assembly->image, i);
+		n = g_concat_dir_and_file (assembly->assembly->basedir, val);
+		result = (MonoObject*)mono_string_new (mono_object_domain (assembly), n);
+		/* check hash if needed */
+		g_free (n);
+		return result;
+	case IMPLEMENTATION_ASSEMBLYREF:
+	case IMPLEMENTATION_EXP_TYPE:
+		/* FIXME */
 		break;
 	}
+	return NULL;
+}
 
-	fullname = g_strconcat (klass->name_space, ".",
-	                           klass->name, ",",
-	                           klass->image->assembly_name, append, NULL);
-	res = mono_string_new (domain, fullname);
-	g_free (fullname);
+static MonoObject*
+ves_icall_System_Reflection_Assembly_GetFilesInternal (MonoReflectionAssembly *assembly, MonoString *name) {
+	MonoTableInfo *table = &assembly->assembly->image->tables [MONO_TABLE_FILE];
+	MonoArray *result;
+	int i;
+	const char *val;
+	char *n;
 
-	return res;
+	/* check hash if needed */
+	if (name) {
+		n = mono_string_to_utf8 (name);
+		for (i = 0; i < table->rows; ++i) {
+			val = mono_metadata_string_heap (assembly->assembly->image, mono_metadata_decode_row_col (table, i, MONO_FILE_NAME));
+			if (strcmp (val, n) == 0) {
+				MonoString *fn;
+				g_free (n);
+				n = g_concat_dir_and_file (assembly->assembly->basedir, val);
+				fn = mono_string_new (mono_object_domain (assembly), n);
+				g_free (n);
+				return (MonoObject*)fn;
+			}
+		}
+		g_free (n);
+		return NULL;
+	}
+
+	for (i = 0; i < table->rows; ++i) {
+		result = mono_array_new (mono_object_domain (assembly), mono_defaults.string_class, table->rows);
+		val = mono_metadata_string_heap (assembly->assembly->image, mono_metadata_decode_row_col (table, i, MONO_FILE_NAME));
+		n = g_concat_dir_and_file (assembly->assembly->basedir, val);
+		mono_array_set (result, gpointer, i, mono_string_new (mono_object_domain (assembly), n));
+		g_free (n);
+	}
+	return (MonoObject*)result;
+}
+
+static MonoReflectionMethod*
+ves_icall_GetCurrentMethod (void) {
+	MonoMethod *m = mono_method_get_last_managed ();
+	return mono_method_get_object (mono_domain_get (), m, NULL);
+}
+
+static MonoReflectionAssembly*
+ves_icall_System_Reflection_Assembly_GetExecutingAssembly (void)
+{
+	MonoMethod *m = mono_method_get_last_managed ();
+	return mono_assembly_get_object (mono_domain_get (), m->klass->image->assembly);
+}
+
+
+static gboolean
+get_caller (MonoMethod *m, gint32 no, gint32 ilo, gpointer data)
+{
+	MonoMethod **dest = data;
+	if (m == *dest) {
+		*dest = NULL;
+		return FALSE;
+	}
+	if (!(*dest)) {
+		*dest = m;
+		return TRUE;
+	}
+	return FALSE;
+}
+
+static MonoReflectionAssembly*
+ves_icall_System_Reflection_Assembly_GetEntryAssembly (void)
+{
+	MonoDomain* domain = mono_domain_get ();
+	g_assert (domain->entry_assembly);
+	return mono_assembly_get_object (domain, domain->entry_assembly);
+}
+
+
+static MonoReflectionAssembly*
+ves_icall_System_Reflection_Assembly_GetCallingAssembly (void)
+{
+	MonoMethod *m = mono_method_get_last_managed ();
+	MonoMethod *dest = m;
+	mono_stack_walk (get_caller, &dest);
+	if (!dest)
+		dest = m;
+	return mono_assembly_get_object (mono_domain_get (), dest->klass->image->assembly);
 }
 
 static MonoString *
-ves_icall_System_PAL_GetCurrentDirectory (MonoObject *object)
+ves_icall_System_MonoType_getFullName (MonoReflectionType *object)
 {
 	MonoDomain *domain = mono_domain_get (); 
 	MonoString *res;
-	gchar *path = g_get_current_dir ();
-	res = mono_string_new (domain, path);
-	g_free (path);
+	gchar *name;
+
+	name = mono_type_get_name (object->type);
+	res = mono_string_new (domain, name);
+	g_free (name);
+
+	return res;
+}
+
+static void
+ves_icall_System_Reflection_Assembly_FillName (MonoReflectionAssembly *assembly, MonoReflectionAssemblyName *aname)
+{
+	MonoAssemblyName *name = &assembly->assembly->aname;
+
+	if (strcmp (name->name, "corlib") == 0)
+		aname->name = mono_string_new (mono_object_domain (assembly), "mscorlib");
+	else
+		aname->name = mono_string_new (mono_object_domain (assembly), name->name);
+	aname->major = name->major;
+}
+
+static MonoArray*
+ves_icall_System_Reflection_Assembly_GetTypes (MonoReflectionAssembly *assembly, MonoBoolean exportedOnly)
+{
+	MonoDomain *domain = mono_domain_get (); 
+	MonoArray *res;
+	MonoClass *klass;
+	MonoTableInfo *tdef = &assembly->assembly->image->tables [MONO_TABLE_TYPEDEF];
+	int i, count;
+	guint32 attrs, visibility;
+
+	/* we start the count from 1 because we skip the special type <Module> */
+	if (exportedOnly) {
+		count = 0;
+		for (i = 1; i < tdef->rows; ++i) {
+			attrs = mono_metadata_decode_row_col (tdef, i, MONO_TYPEDEF_FLAGS);
+			visibility = attrs & TYPE_ATTRIBUTE_VISIBILITY_MASK;
+			if (visibility == TYPE_ATTRIBUTE_PUBLIC || visibility == TYPE_ATTRIBUTE_NESTED_PUBLIC)
+				count++;
+		}
+	} else {
+		count = tdef->rows - 1;
+	}
+	res = mono_array_new (domain, mono_defaults.monotype_class, count);
+	count = 0;
+	for (i = 1; i < tdef->rows; ++i) {
+		attrs = mono_metadata_decode_row_col (tdef, i, MONO_TYPEDEF_FLAGS);
+		visibility = attrs & TYPE_ATTRIBUTE_VISIBILITY_MASK;
+		if (!exportedOnly || (visibility == TYPE_ATTRIBUTE_PUBLIC || visibility == TYPE_ATTRIBUTE_NESTED_PUBLIC)) {
+			klass = mono_class_get (assembly->assembly->image, (i + 1) | MONO_TOKEN_TYPE_DEF);
+			mono_array_set (res, gpointer, count, mono_type_get_object (domain, &klass->byval_arg));
+			count++;
+		}
+	}
+	
 	return res;
 }
 
+static MonoReflectionType*
+ves_icall_ModuleBuilder_create_modified_type (MonoReflectionTypeBuilder *tb, MonoString *smodifiers)
+{
+	MonoClass *klass;
+	int isbyref = 0, rank;
+	char *str = mono_string_to_utf8 (smodifiers);
+	char *p;
+
+	klass = mono_class_from_mono_type (tb->type.type);
+	p = str;
+	/* logic taken from mono_reflection_parse_type(): keep in sync */
+	while (*p) {
+		switch (*p) {
+		case '&':
+			if (isbyref) { /* only one level allowed by the spec */
+				g_free (str);
+				return NULL;
+			}
+			isbyref = 1;
+			p++;
+			g_free (str);
+			return mono_type_get_object (mono_domain_get (), &klass->this_arg);
+			break;
+		case '*':
+			klass = mono_ptr_class_get (&klass->byval_arg);
+			mono_class_init (klass);
+			p++;
+			break;
+		case '[':
+			rank = 1;
+			p++;
+			while (*p) {
+				if (*p == ']')
+					break;
+				if (*p == ',')
+					rank++;
+				else if (*p != '*') { /* '*' means unknown lower bound */
+					g_free (str);
+					return NULL;
+				}
+				++p;
+			}
+			if (*p != ']') {
+				g_free (str);
+				return NULL;
+			}
+			p++;
+			klass = mono_array_class_get (&klass->byval_arg, rank);
+			mono_class_init (klass);
+			break;
+		default:
+			break;
+		}
+	}
+	g_free (str);
+	return mono_type_get_object (mono_domain_get (), &klass->byval_arg);
+}
+
+static MonoObject *
+ves_icall_System_Delegate_CreateDelegate_internal (MonoReflectionType *type, MonoObject *target,
+						   MonoReflectionMethod *info)
+{
+	MonoClass *delegate_class = mono_class_from_mono_type (type->type);
+	MonoObject *delegate;
+	gpointer func;
+
+	mono_assert (delegate_class->parent == mono_defaults.multicastdelegate_class);
+
+	delegate = mono_object_new (target->vtable->domain, delegate_class);
+
+	func = mono_compile_method (info->method);
+
+	mono_delegate_ctor (delegate, target, func);
+
+	return delegate;
+}
+
 /*
  * Magic number to convert a time which is relative to
  * Jan 1, 1970 into a value which is relative to Jan 1, 0001.
@@ -1012,9 +2190,16 @@ ves_icall_System_PAL_GetCurrentDirectory (MonoObject *object)
 #define	EPOCH_ADJUST	((gint64)62135596800L)
 
 static gint64
-ves_icall_System_DateTime_GetNow ()
+ves_icall_System_DateTime_GetNow (void)
 {
-#ifndef PLATFORM_WIN32
+#ifdef PLATFORM_WIN32
+	SYSTEMTIME st;
+	FILETIME ft;
+	
+	GetLocalTime (&st);
+	SystemTimeToFileTime (&st, &ft);
+	return (gint64)504911232000000000L + ((((gint64)ft.dwHighDateTime)<<32) | ft.dwLowDateTime);
+#else
 	/* FIXME: put this in io-layer and call it GetLocalTime */
 	struct timeval tv;
 	gint64 res;
@@ -1023,10 +2208,9 @@ ves_icall_System_DateTime_GetNow ()
 		res = (((gint64)tv.tv_sec + EPOCH_ADJUST)* 1000000 + tv.tv_usec)*10;
 		return res;
 	}
-
 	/* fixme: raise exception */
-#endif
 	return 0;
+#endif
 }
 
 /*
@@ -1061,10 +2245,18 @@ ves_icall_System_CurrentTimeZone_GetTimeZoneData (guint32 year, MonoArray **data
 	start.tm_year = year-1900;
 
 	t = mktime (&start);
-	gmtoff = start.tm_gmtoff;
-
-	MONO_CHECK_ARG_NULL (domain, data);
-	MONO_CHECK_ARG_NULL (domain, names);
+#if defined (HAVE_TIMEZONE)
+#define gmt_offset(x) (-1 * (((timezone / 60 / 60) - daylight) * 100))
+#elif defined (HAVE_TM_GMTOFF)
+#define gmt_offset(x) x.tm_gmtoff
+#else
+#error Neither HAVE_TIMEZONE nor HAVE_TM_GMTOFF defined. Rerun autoheader, autoconf, etc.
+#endif
+	
+	gmtoff = gmt_offset (start);
+	
+	MONO_CHECK_ARG_NULL (data);
+	MONO_CHECK_ARG_NULL (names);
 
 	(*data) = mono_array_new (domain, mono_defaults.int64_class, 4);
 	(*names) = mono_array_new (domain, mono_defaults.string_class, 2);
@@ -1076,7 +2268,8 @@ ves_icall_System_CurrentTimeZone_GetTimeZoneData (guint32 year, MonoArray **data
 		tt = *localtime (&t);
 
 		/* Daylight saving starts or ends here. */
-		if (tt.tm_gmtoff != gmtoff) {
+		if (gmt_offset (tt) != gmtoff) {
+			char tzone[10];
 			struct tm tt1;
 			time_t t1;
 
@@ -1085,46 +2278,339 @@ ves_icall_System_CurrentTimeZone_GetTimeZoneData (guint32 year, MonoArray **data
 			do {
 				t1 -= 3600;
 				tt1 = *localtime (&t1);
-			} while (tt1.tm_gmtoff != gmtoff);
+			} while (gmt_offset (tt1) != gmtoff);
 
 			/* Try to find the exact minute when daylight saving starts/ends. */
 			do {
 				t1 += 60;
 				tt1 = *localtime (&t1);
-			} while (tt1.tm_gmtoff == gmtoff);
-
+			} while (gmt_offset (tt1) == gmtoff);
+			
+			strftime (tzone, 10, "%Z", &tt);
+			
 			/* Write data, if we're already in daylight saving, we're done. */
 			if (is_daylight) {
-				mono_array_set ((*names), gpointer, 0, mono_string_new (domain, tt.tm_zone));
+				mono_array_set ((*names), gpointer, 0, mono_string_new (domain, tzone));
 				mono_array_set ((*data), gint64, 1, ((gint64)t1 + EPOCH_ADJUST) * 10000000L);
 				return 1;
 			} else {
-				mono_array_set ((*names), gpointer, 1, mono_string_new (domain, tt.tm_zone));
+				mono_array_set ((*names), gpointer, 1, mono_string_new (domain, tzone));
 				mono_array_set ((*data), gint64, 0, ((gint64)t1 + EPOCH_ADJUST) * 10000000L);
 				is_daylight = 1;
 			}
 
 			/* This is only set once when we enter daylight saving. */
 			mono_array_set ((*data), gint64, 2, (gint64)gmtoff * 10000000L);
-			mono_array_set ((*data), gint64, 3, (gint64)(tt.tm_gmtoff - gmtoff) * 10000000L);
+			mono_array_set ((*data), gint64, 3, (gint64)(gmt_offset (tt) - gmtoff) * 10000000L);
 
-			gmtoff = tt.tm_gmtoff;
+			gmtoff = gmt_offset (tt);
 		}
 
-		gmtoff = tt.tm_gmtoff;
+		gmtoff = gmt_offset (tt);
 	}
+	return 1;
+#else
+	MonoDomain *domain = mono_domain_get ();
+	TIME_ZONE_INFORMATION tz_info;
+	FILETIME ft;
+	int i;
 
-	return 0;
+	GetTimeZoneInformation (&tz_info);
+
+	MONO_CHECK_ARG_NULL (data);
+	MONO_CHECK_ARG_NULL (names);
+
+	(*data) = mono_array_new (domain, mono_defaults.int64_class, 4);
+	(*names) = mono_array_new (domain, mono_defaults.string_class, 2);
+
+	for (i = 0; i < 32; ++i)
+		if (!tz_info.DaylightName [i])
+			break;
+	mono_array_set ((*names), gpointer, 1, mono_string_new_utf16 (domain, tz_info.DaylightName, i));
+	for (i = 0; i < 32; ++i)
+		if (!tz_info.StandardName [i])
+			break;
+	mono_array_set ((*names), gpointer, 0, mono_string_new_utf16 (domain, tz_info.StandardName, i));
+
+	SystemTimeToFileTime (&tz_info.StandardDate, &ft);
+	mono_array_set ((*data), gint64, 1, ((guint64)ft.dwHighDateTime<<32) | ft.dwLowDateTime);
+	SystemTimeToFileTime (&tz_info.DaylightDate, &ft);
+	mono_array_set ((*data), gint64, 0, ((guint64)ft.dwHighDateTime<<32) | ft.dwLowDateTime);
+	mono_array_set ((*data), gint64, 3, tz_info.Bias + tz_info.StandardBias);
+	mono_array_set ((*data), gint64, 2, tz_info.Bias + tz_info.DaylightBias);
+
+	return 1;
 #endif
 }
 
+static gpointer
+ves_icall_System_Object_obj_address (MonoObject *this) {
+	return this;
+}
+
+/* System.Buffer */
+
+static gint32 
+ves_icall_System_Buffer_ByteLengthInternal (MonoArray *array) {
+	MonoClass *klass;
+	MonoTypeEnum etype;
+	int length, esize;
+	int i;
+
+	klass = array->obj.vtable->klass;
+	etype = klass->element_class->byval_arg.type;
+	if (etype < MONO_TYPE_BOOLEAN || etype > MONO_TYPE_R8)
+		return -1;
+
+	if (array->bounds == NULL)
+		length = array->max_length;
+	else {
+		length = 0;
+		for (i = 0; i < klass->rank; ++ i)
+			length += array->bounds [i].length;
+	}
+
+	esize = mono_array_element_size (klass);
+	return length * esize;
+}
+
+static gint8 
+ves_icall_System_Buffer_GetByteInternal (MonoArray *array, gint32 idx) {
+	return mono_array_get (array, gint8, idx);
+}
+
+static void 
+ves_icall_System_Buffer_SetByteInternal (MonoArray *array, gint32 idx, gint8 value) {
+	mono_array_set (array, gint8, idx, value);
+}
+
+static void 
+ves_icall_System_Buffer_BlockCopyInternal (MonoArray *src, gint32 src_offset, MonoArray *dest, gint32 dest_offset, gint32 count) {
+	char *src_buf, *dest_buf;
+
+	src_buf = (gint8 *)src->vector + src_offset;
+	dest_buf = (gint8 *)dest->vector + dest_offset;
+
+	memcpy (dest_buf, src_buf, count);
+}
+
+static MonoObject *
+ves_icall_Remoting_RealProxy_GetTransparentProxy (MonoObject *this)
+{
+	MonoDomain *domain = mono_domain_get (); 
+	MonoObject *res;
+	MonoRealProxy *rp = ((MonoRealProxy *)this);
+	MonoType *type;
+	MonoClass *klass;
+
+	res = mono_object_new (domain, mono_defaults.transparent_proxy_class);
+	
+	((MonoTransparentProxy *)res)->rp = rp;
+	type = ((MonoReflectionType *)rp->class_to_proxy)->type;
+	klass = mono_class_from_mono_type (type);
+
+	((MonoTransparentProxy *)res)->klass = klass;
+
+	res->vtable = mono_class_proxy_vtable (domain, klass);
+
+	return res;
+}
+
+/* System.Environment */
+
+static MonoString *
+ves_icall_System_Environment_get_MachineName (void)
+{
+#if defined (PLATFORM_WIN32)
+	gunichar2 *buf;
+	guint32 len;
+	MonoString *result;
+
+	len = MAX_COMPUTERNAME_LENGTH + 1;
+	buf = g_new (gunichar2, len);
+
+	result = NULL;
+	if (GetComputerName (buf, (PDWORD) &len))
+		result = mono_string_new_utf16 (mono_domain_get (), buf, len);
+
+	g_free (buf);
+	return result;
+#else
+	gchar *buf;
+	int len;
+	MonoString *result;
+
+	len = 256;
+	buf = g_new (gchar, len);
+
+	result = NULL;
+	if (gethostname (buf, len) != 0)
+		result = mono_string_new (mono_domain_get (), buf);
+	
+	g_free (buf);
+	return result;
+#endif
+}
+
+static int
+ves_icall_System_Environment_get_Platform (void)
+{
+#if defined (PLATFORM_WIN32)
+	/* Win32NT */
+	return 2;
+#else
+	/* Unix */
+	return 128;
+#endif
+}
+
+static MonoString *
+ves_icall_System_Environment_get_NewLine (void)
+{
+#if defined (PLATFORM_WIN32)
+	return mono_string_new (mono_domain_get (), "\r\n");
+#else
+	return mono_string_new (mono_domain_get (), "\n");
+#endif
+}
+
+static MonoString *
+ves_icall_System_Environment_GetEnvironmentVariable (MonoString *name)
+{
+	const gchar *value;
+	gchar *utf8_name;
 
-static gpointer icall_map [] = {
+	if (name == NULL)
+		return NULL;
+
+	utf8_name = mono_string_to_utf8 (name);	/* FIXME: this should be ascii */
+	value = g_getenv (utf8_name);
+	g_free (utf8_name);
+
+	if (value == 0)
+		return NULL;
+	
+	return mono_string_new (mono_domain_get (), value);
+}
+
+/*
+ * There is no standard way to get at environ.
+ */
+extern char **environ;
+
+static MonoArray *
+ves_icall_System_Environment_GetEnvironmentVariableNames (void)
+{
+	MonoArray *names;
+	MonoDomain *domain;
+	MonoString *str;
+	gchar **e, **parts;
+	int n;
+
+	n = 0;
+	for (e = environ; *e != 0; ++ e)
+		++ n;
+
+	domain = mono_domain_get ();
+	names = mono_array_new (domain, mono_defaults.string_class, n);
+
+	n = 0;
+	for (e = environ; *e != 0; ++ e) {
+		parts = g_strsplit (*e, "=", 2);
+		if (*parts != 0) {
+			str = mono_string_new (domain, *parts);
+			mono_array_set (names, MonoString *, n, str);
+		}
+
+		g_strfreev (parts);
+
+		++ n;
+	}
+
+	return names;
+}
+
+/*
+ * Returns the number of milliseconds elapsed since the system started.
+ */
+static gint32
+ves_icall_System_Environment_get_TickCount (void)
+{
+#if defined (PLATFORM_WIN32)
+	return GetTickCount();
+#else
+	struct timeval tv;
+	struct timezone tz;
+	gint32 res;
+
+	res = (gint32) gettimeofday (&tv, &tz);
+
+	if (res != -1)
+		res = (gint32) ((tv.tv_sec & 0xFFFFF) * 1000 + (tv.tv_usec / 1000));
+	return res;
+#endif
+}
+
+
+static void
+ves_icall_System_Environment_Exit (int result)
+{
+	/* we may need to do some cleanup here... */
+	exit (result);
+}
+
+static void
+ves_icall_MonoMethodMessage_InitMessage (MonoMethodMessage *this, 
+					 MonoReflectionMethod *method,
+					 MonoArray *out_args)
+{
+	MonoDomain *domain = mono_domain_get ();
+	
+	mono_message_init (domain, this, method, out_args);
+}
+
+static MonoBoolean
+ves_icall_IsTransparentProxy (MonoObject *proxy)
+{
+	if (!proxy)
+		return 0;
+
+	if (proxy->vtable->klass == mono_defaults.transparent_proxy_class)
+		return 1;
+
+	return 0;
+}
+
+static MonoObject *
+ves_icall_System_Runtime_Serialization_FormatterServices_GetUninitializedObject_Internal (MonoReflectionType *type)
+{
+	MonoClass *klass;
+	MonoObject *obj;
+	MonoDomain *domain;
+	
+	domain = mono_object_domain (type);
+	klass = mono_class_from_mono_type (type->type);
+
+	if (klass->rank >= 1) {
+		g_assert (klass->rank == 1);
+		obj = (MonoObject *) mono_array_new (domain, klass->element_class, 0);
+	} else {
+		obj = mono_object_new (domain, klass);
+	}
+
+	return obj;
+}
+
+/* icall map */
+
+static gconstpointer icall_map [] = {
 	/*
 	 * System.Array
 	 */
 	"System.Array::GetValue",         ves_icall_System_Array_GetValue,
 	"System.Array::SetValue",         ves_icall_System_Array_SetValue,
+	"System.Array::GetValueImpl",     ves_icall_System_Array_GetValueImpl,
+	"System.Array::SetValueImpl",     ves_icall_System_Array_SetValueImpl,
 	"System.Array::GetRank",          ves_icall_System_Array_GetRank,
 	"System.Array::GetLength",        ves_icall_System_Array_GetLength,
 	"System.Array::GetLowerBound",    ves_icall_System_Array_GetLowerBound,
@@ -1137,12 +2623,53 @@ static gpointer icall_map [] = {
 	 */
 	"System.Object::MemberwiseClone", ves_icall_System_Object_MemberwiseClone,
 	"System.Object::GetType", ves_icall_System_Object_GetType,
+	"System.Object::GetHashCode", ves_icall_System_Object_GetHashCode,
+	"System.Object::obj_address", ves_icall_System_Object_obj_address,
+
+	/*
+	 * System.ValueType
+	 */
+	"System.ValueType::GetHashCode", ves_icall_System_ValueType_GetHashCode,
+	"System.ValueType::Equals", ves_icall_System_ValueType_Equals,
 
 	/*
 	 * System.String
 	 */
-	"System.String::IsInterned", mono_string_is_interned,
-	"System.String::Intern", mono_string_intern,
+	
+	"System.String::.ctor(char*)", ves_icall_System_String_ctor_charp,
+	"System.String::.ctor(char*,int,int)", ves_icall_System_String_ctor_charp_int_int,
+	"System.String::.ctor(sbyte*)", ves_icall_System_String_ctor_sbytep,
+	"System.String::.ctor(sbyte*,int,int)", ves_icall_System_String_ctor_sbytep_int_int,
+	"System.String::.ctor(sbyte*,int,int,System.Text.Encoding)", ves_icall_System_String_ctor_encoding,
+	"System.String::.ctor(char[])", ves_icall_System_String_ctor_chara,
+	"System.String::.ctor(char[],int,int)", ves_icall_System_String_ctor_chara_int_int,
+	"System.String::.ctor(char,int)", ves_icall_System_String_ctor_char_int,
+	"System.String::InternalEquals", ves_icall_System_String_InternalEquals,
+	"System.String::InternalJoin", ves_icall_System_String_InternalJoin,
+	"System.String::InternalInsert", ves_icall_System_String_InternalInsert,
+	"System.String::InternalReplace(char,char)", ves_icall_System_String_InternalReplace_Char,
+	"System.String::InternalReplace(string,string)", ves_icall_System_String_InternalReplace_Str,
+	"System.String::InternalRemove", ves_icall_System_String_InternalRemove,
+	"System.String::InternalCopyTo", ves_icall_System_String_InternalCopyTo,
+	"System.String::InternalSplit", ves_icall_System_String_InternalSplit,
+	"System.String::InternalTrim", ves_icall_System_String_InternalTrim,
+	"System.String::InternalIndexOf(char,int,int)", ves_icall_System_String_InternalIndexOf_Char,
+	"System.String::InternalIndexOf(string,int,int)", ves_icall_System_String_InternalIndexOf_Str,
+	"System.String::InternalIndexOfAny", ves_icall_System_String_InternalIndexOfAny,
+	"System.String::InternalLastIndexOf(char,int,int)", ves_icall_System_String_InternalLastIndexOf_Char,
+	"System.String::InternalLastIndexOf(string,int,int)", ves_icall_System_String_InternalLastIndexOf_Str,
+	"System.String::InternalLastIndexOfAny", ves_icall_System_String_InternalLastIndexOfAny,
+	"System.String::InternalPad", ves_icall_System_String_InternalPad,
+	"System.String::InternalToLower", ves_icall_System_String_InternalToLower,
+	"System.String::InternalToUpper", ves_icall_System_String_InternalToUpper,
+	"System.String::InternalAllocateStr", ves_icall_System_String_InternalAllocateStr,
+	"System.String::InternalStrcpy(string,int,string)", ves_icall_System_String_InternalStrcpy_Str,
+	"System.String::InternalStrcpy(string,int,string,int,int)", ves_icall_System_String_InternalStrcpy_StrN,
+	"System.String::InternalIntern", ves_icall_System_String_InternalIntern,
+	"System.String::InternalIsInterned", ves_icall_System_String_InternalIsInterned,
+	"System.String::InternalCompare(string,int,string,int,int,bool)", ves_icall_System_String_InternalCompareStr_N,
+	"System.String::GetHashCode", ves_icall_System_String_GetHashCode,
+	"System.String::get_Chars", ves_icall_System_String_get_Chars,
 
 	/*
 	 * System.AppDomain
@@ -1164,6 +2691,17 @@ static gpointer icall_map [] = {
 	"System.AppDomainSetup::InitAppDomainSetup", ves_icall_System_AppDomainSetup_InitAppDomainSetup,
 
 	/*
+	 * System.Double
+	 */
+	"System.Double::ToStringImpl", mono_double_ToStringImpl,
+	"System.Double::ParseImpl",    mono_double_ParseImpl,
+
+	/*
+	 * System.Single
+	 */
+	"System.Single::ToStringImpl", mono_float_ToStringImpl,
+
+	/*
 	 * System.Decimal
 	 */
 	"System.Decimal::decimal2UInt64", mono_decimal2UInt64,
@@ -1184,13 +2722,15 @@ static gpointer icall_map [] = {
 	/*
 	 * ModuleBuilder
 	 */
+	"System.Reflection.Emit.ModuleBuilder::create_modified_type", ves_icall_ModuleBuilder_create_modified_type,
 	
 	/*
 	 * AssemblyBuilder
 	 */
-	"System.Reflection.Emit.AssemblyBuilder::getDataChunk", ves_icall_get_data_chunk,
+	"System.Reflection.Emit.AssemblyBuilder::getDataChunk", ves_icall_AssemblyBuilder_getDataChunk,
 	"System.Reflection.Emit.AssemblyBuilder::getUSIndex", mono_image_insert_string,
 	"System.Reflection.Emit.AssemblyBuilder::getToken", ves_icall_AssemblyBuilder_getToken,
+	"System.Reflection.Emit.AssemblyBuilder::basic_init", mono_image_basic_init,
 
 	/*
 	 * Reflection stuff.
@@ -1199,10 +2739,17 @@ static gpointer icall_map [] = {
 	"System.Reflection.MonoMethodInfo::get_parameter_info", ves_icall_get_parameter_info,
 	"System.Reflection.MonoFieldInfo::get_field_info", ves_icall_get_field_info,
 	"System.Reflection.MonoPropertyInfo::get_property_info", ves_icall_get_property_info,
+	"System.Reflection.MonoEventInfo::get_event_info", ves_icall_get_event_info,
 	"System.Reflection.MonoMethod::InternalInvoke", ves_icall_InternalInvoke,
+	"System.Reflection.MonoCMethod::InternalInvoke", ves_icall_InternalInvoke,
+	"System.Reflection.MethodBase::GetCurrentMethod", ves_icall_GetCurrentMethod,
 	"System.MonoCustomAttrs::GetCustomAttributes", mono_reflection_get_custom_attrs,
 	"System.Reflection.Emit.CustomAttributeBuilder::GetBlob", mono_reflection_get_custom_attrs_blob,
-	"System.Reflection.MonoField::GetValue", ves_icall_MonoField_GetValue,
+	"System.Reflection.MonoField::GetValueInternal", ves_icall_MonoField_GetValueInternal,
+	"System.Reflection.FieldInfo::SetValueInternal", ves_icall_FieldInfo_SetValueInternal,
+	"System.Reflection.Emit.SignatureHelper::get_signature_local", mono_reflection_sighelper_get_signature_local,
+	"System.Reflection.Emit.SignatureHelper::get_signature_field", mono_reflection_sighelper_get_signature_field,
+
 	
 	/* System.Enum */
 
@@ -1213,6 +2760,9 @@ static gpointer icall_map [] = {
 	/*
 	 * TypeBuilder
 	 */
+	"System.Reflection.Emit.TypeBuilder::setup_internal_class", mono_reflection_setup_internal_class,
+	"System.Reflection.Emit.TypeBuilder::create_internal_class", mono_reflection_create_internal_class,
+	"System.Reflection.Emit.TypeBuilder::create_runtime_class", mono_reflection_create_runtime_class,
 	
 	/*
 	 * MethodBuilder
@@ -1225,11 +2775,11 @@ static gpointer icall_map [] = {
 	"System.Type::internal_from_handle", ves_icall_type_from_handle,
 	"System.Type::get_constructor", ves_icall_get_constructor,
 	"System.Type::get_property", ves_icall_get_property,
-	"System.Type::get_method", ves_icall_get_method,
+	"System.MonoType::get_method", ves_icall_get_method,
 	"System.MonoType::get_attributes", ves_icall_get_attributes,
 	"System.Type::type_is_subtype_of", ves_icall_type_is_subtype_of,
 	"System.Type::Equals", ves_icall_type_Equals,
-	"System.Type::FindMembers", ves_icall_type_find_members,
+	"System.Type::GetTypeCode", ves_icall_type_GetTypeCode,
 
 	/*
 	 * System.Runtime.CompilerServices.RuntimeHelpers
@@ -1239,10 +2789,14 @@ static gpointer icall_map [] = {
 	/*
 	 * System.Threading
 	 */
+	"System.Threading.Thread::Abort(object)", ves_icall_System_Threading_Thread_Abort,
+	"System.Threading.Thread::ResetAbort", ves_icall_System_Threading_Thread_ResetAbort,
 	"System.Threading.Thread::Thread_internal", ves_icall_System_Threading_Thread_Thread_internal,
+	"System.Threading.Thread::Thread_free_internal", ves_icall_System_Threading_Thread_Thread_free_internal,
 	"System.Threading.Thread::Start_internal", ves_icall_System_Threading_Thread_Start_internal,
 	"System.Threading.Thread::Sleep_internal", ves_icall_System_Threading_Thread_Sleep_internal,
-	"System.Threading.Thread::CurrentThread_internal", ves_icall_System_Threading_Thread_CurrentThread_internal,
+	"System.Threading.Thread::CurrentThread_internal", mono_thread_current,
+	"System.Threading.Thread::CurrentThreadDomain_internal", ves_icall_System_Threading_Thread_CurrentThreadDomain_internal,
 	"System.Threading.Thread::Join_internal", ves_icall_System_Threading_Thread_Join_internal,
 	"System.Threading.Thread::SlotHash_lookup", ves_icall_System_Threading_Thread_SlotHash_lookup,
 	"System.Threading.Thread::SlotHash_store", ves_icall_System_Threading_Thread_SlotHash_store,
@@ -1266,36 +2820,73 @@ static gpointer icall_map [] = {
 	"System.Threading.WaitHandle::WaitAny_internal", ves_icall_System_Threading_WaitHandle_WaitAny_internal,
 	"System.Threading.WaitHandle::WaitOne_internal", ves_icall_System_Threading_WaitHandle_WaitOne_internal,
 
+	/*
+	 * System.Runtime.InteropServices.Marshal
+	 */
 	"System.Runtime.InteropServices.Marshal::ReadIntPtr", ves_icall_System_Runtime_InteropServices_Marshal_ReadIntPtr,
-	"System.Runtime.InteropServices.Marshal::PtrToStringAuto", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAuto,
-	"System.Runtime.InteropServices.Marshal::GetLastWin32Error", ves_icall_System_Runtime_InteropServices_Marshal_GetLastWin32Error,
+	"System.Runtime.InteropServices.Marshal::ReadByte", ves_icall_System_Runtime_InteropServices_Marshal_ReadByte,
+	"System.Runtime.InteropServices.Marshal::ReadInt16", ves_icall_System_Runtime_InteropServices_Marshal_ReadInt16,
+	"System.Runtime.InteropServices.Marshal::ReadInt32", ves_icall_System_Runtime_InteropServices_Marshal_ReadInt32,
+	"System.Runtime.InteropServices.Marshal::ReadInt64", ves_icall_System_Runtime_InteropServices_Marshal_ReadInt64,
+	"System.Runtime.InteropServices.Marshal::WriteIntPtr", ves_icall_System_Runtime_InteropServices_Marshal_WriteIntPtr,
+	"System.Runtime.InteropServices.Marshal::WriteByte", ves_icall_System_Runtime_InteropServices_Marshal_WriteByte,
+	"System.Runtime.InteropServices.Marshal::WriteInt16", ves_icall_System_Runtime_InteropServices_Marshal_WriteInt16,
+	"System.Runtime.InteropServices.Marshal::WriteInt32", ves_icall_System_Runtime_InteropServices_Marshal_WriteInt32,
+	"System.Runtime.InteropServices.Marshal::WriteInt64", ves_icall_System_Runtime_InteropServices_Marshal_WriteInt64,
+
+	"System.Runtime.InteropServices.Marshal::PtrToStringAnsi(intptr)", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAnsi,
+	"System.Runtime.InteropServices.Marshal::PtrToStringAnsi(intptr,int)", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAnsi_len,
+	"System.Runtime.InteropServices.Marshal::PtrToStringAuto(intptr)", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAnsi,
+	"System.Runtime.InteropServices.Marshal::PtrToStringAuto(intptr,int)", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAnsi_len,
+	"System.Runtime.InteropServices.Marshal::PtrToStringUni(intptr)", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringUni,
+	"System.Runtime.InteropServices.Marshal::PtrToStringUni(intptr,int)", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringUni_len,
+	"System.Runtime.InteropServices.Marshal::PtrToStringBSTR", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringBSTR,
 
+	"System.Runtime.InteropServices.Marshal::GetLastWin32Error", ves_icall_System_Runtime_InteropServices_Marshal_GetLastWin32Error,
+	"System.Runtime.InteropServices.Marshal::AllocHGlobal", mono_marshal_alloc,
+	"System.Runtime.InteropServices.Marshal::FreeHGlobal", mono_marshal_free,
+	"System.Runtime.InteropServices.Marshal::ReAllocHGlobal", mono_marshal_realloc,
+	"System.Runtime.InteropServices.Marshal::copy_to_unmanaged", ves_icall_System_Runtime_InteropServices_Marshal_copy_to_unmanaged,
+	"System.Runtime.InteropServices.Marshal::copy_from_unmanaged", ves_icall_System_Runtime_InteropServices_Marshal_copy_from_unmanaged,
+	"System.Runtime.InteropServices.Marshal::SizeOf", ves_icall_System_Runtime_InteropServices_Marshal_SizeOf,
+	"System.Runtime.InteropServices.Marshal::StructureToPtr", ves_icall_System_Runtime_InteropServices_Marshal_StructureToPtr,
+	"System.Runtime.InteropServices.Marshal::PtrToStructure(intptr,object)", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStructure,
+	"System.Runtime.InteropServices.Marshal::PtrToStructure(intptr,System.Type)", ves_icall_System_Runtime_InteropServices_Marshal_PtrToStructure_type,
+	"System.Runtime.InteropServices.Marshal::OffsetOf", ves_icall_System_Runtime_InteropServices_Marshal_OffsetOf,
+	"System.Runtime.InteropServices.Marshal::StringToHGlobalAnsi", ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalAnsi,
+	"System.Runtime.InteropServices.Marshal::StringToHGlobalAuto", ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalAnsi,
+	"System.Runtime.InteropServices.Marshal::StringToHGlobalUni", ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalUni,
+	"System.Runtime.InteropServices.Marshal::DestroyStructure", ves_icall_System_Runtime_InteropServices_Marshal_DestroyStructure,
+
+
+	"System.Reflection.Assembly::LoadFrom", ves_icall_System_Reflection_Assembly_LoadFrom,
 	"System.Reflection.Assembly::GetType", ves_icall_System_Reflection_Assembly_GetType,
+	"System.Reflection.Assembly::GetTypes", ves_icall_System_Reflection_Assembly_GetTypes,
+	"System.Reflection.Assembly::FillName", ves_icall_System_Reflection_Assembly_FillName,
 	"System.Reflection.Assembly::get_code_base", ves_icall_System_Reflection_Assembly_get_code_base,
+	"System.Reflection.Assembly::GetExecutingAssembly", ves_icall_System_Reflection_Assembly_GetExecutingAssembly,
+	"System.Reflection.Assembly::GetEntryAssembly", ves_icall_System_Reflection_Assembly_GetEntryAssembly,
+	"System.Reflection.Assembly::GetCallingAssembly", ves_icall_System_Reflection_Assembly_GetCallingAssembly,
+	"System.Reflection.Assembly::get_EntryPoint", ves_icall_System_Reflection_Assembly_get_EntryPoint,
+	"System.Reflection.Assembly::GetManifestResourceNames", ves_icall_System_Reflection_Assembly_GetManifestResourceNames,
+	"System.Reflection.Assembly::GetManifestResourceInternal", ves_icall_System_Reflection_Assembly_GetManifestResourceInternal,
+	"System.Reflection.Assembly::GetFilesInternal", ves_icall_System_Reflection_Assembly_GetFilesInternal,
 
 	/*
 	 * System.MonoType.
 	 */
-	"System.MonoType::assQualifiedName", ves_icall_System_MonoType_assQualifiedName,
+	"System.MonoType::getFullName", ves_icall_System_MonoType_getFullName,
 	"System.MonoType::type_from_obj", mono_type_type_from_obj,
+	"System.MonoType::GetElementType", ves_icall_MonoType_GetElementType,
 	"System.MonoType::get_type_info", ves_icall_get_type_info,
-
-	"System.PAL.OpSys::GetCurrentDirectory", ves_icall_System_PAL_GetCurrentDirectory,
-
-	/*
-	 * System.PAL.OpSys I/O Services
-	 */
-	"System.PAL.OpSys::GetStdHandle", ves_icall_System_PAL_OpSys_GetStdHandle,
-	"System.PAL.OpSys::ReadFile", ves_icall_System_PAL_OpSys_ReadFile,
-	"System.PAL.OpSys::WriteFile", ves_icall_System_PAL_OpSys_WriteFile,
-	"System.PAL.OpSys::SetLengthFile", ves_icall_System_PAL_OpSys_SetLengthFile,
-	"System.PAL.OpSys::OpenFile", ves_icall_System_PAL_OpSys_OpenFile,
-	"System.PAL.OpSys::CloseFile", ves_icall_System_PAL_OpSys_CloseFile,
-	"System.PAL.OpSys::SeekFile", ves_icall_System_PAL_OpSys_SeekFile,
-	"System.PAL.OpSys::DeleteFile", ves_icall_System_PAL_OpSys_DeleteFile,
-	"System.PAL.OpSys::ExistsFile", ves_icall_System_PAL_OpSys_ExistsFile,
-	"System.PAL.OpSys::GetFileTime", ves_icall_System_PAL_OpSys_GetFileTime,
-	"System.PAL.OpSys::SetFileTime", ves_icall_System_PAL_OpSys_SetFileTime,
+	"System.MonoType::GetField", ves_icall_Type_GetField,
+	"System.MonoType::GetFields", ves_icall_Type_GetFields,
+	"System.MonoType::GetMethods", ves_icall_Type_GetMethods,
+	"System.MonoType::GetConstructors", ves_icall_Type_GetConstructors,
+	"System.MonoType::GetProperties", ves_icall_Type_GetProperties,
+	"System.MonoType::GetEvents", ves_icall_Type_GetEvents,
+	"System.MonoType::GetInterfaces", ves_icall_Type_GetInterfaces,
+	"System.MonoType::GetNestedTypes", ves_icall_Type_GetNestedTypes,
 
 	/*
 	 * System.Net.Sockets I/O Services
@@ -1354,12 +2945,159 @@ static gpointer icall_map [] = {
 	"System.CurrentTimeZone::GetTimeZoneData", ves_icall_System_CurrentTimeZone_GetTimeZoneData,
 
 	/*
+	 * System.GC
+	 */
+	"System.GC::InternalCollect", ves_icall_System_GC_InternalCollect,
+	"System.GC::GetTotalMemory", ves_icall_System_GC_GetTotalMemory,
+	"System.GC::KeepAlive", ves_icall_System_GC_KeepAlive,
+	"System.GC::ReRegisterForFinalize", ves_icall_System_GC_ReRegisterForFinalize,
+	"System.GC::SuppressFinalize", ves_icall_System_GC_SuppressFinalize,
+	"System.GC::WaitForPendingFinalizers", ves_icall_System_GC_WaitForPendingFinalizers,
+	"System.Runtime.InteropServices.GCHandle::GetTarget", ves_icall_System_GCHandle_GetTarget,
+	"System.Runtime.InteropServices.GCHandle::GetTargetHandle", ves_icall_System_GCHandle_GetTargetHandle,
+	"System.Runtime.InteropServices.GCHandle::FreeHandle", ves_icall_System_GCHandle_FreeHandle,
+	"System.Runtime.InteropServices.GCHandle::GetAddrOfPinnedObject", ves_icall_System_GCHandle_GetAddrOfPinnedObject,
+
+	/*
 	 * System.Security.Cryptography calls
 	 */
 
 	 "System.Security.Cryptography.RNGCryptoServiceProvider::GetBytes", ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetBytes,
-	 "System.Security.Cryptography.RNG_CryptoServiceProvider::GetNonZeroBytes", ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroBytes,
+	 "System.Security.Cryptography.RNGCryptoServiceProvider::GetNonZeroBytes", ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroBytes,
+	
+	/*
+	 * System.Buffer
+	 */
+	"System.Buffer::ByteLengthInternal", ves_icall_System_Buffer_ByteLengthInternal,
+	"System.Buffer::GetByteInternal", ves_icall_System_Buffer_GetByteInternal,
+	"System.Buffer::SetByteInternal", ves_icall_System_Buffer_SetByteInternal,
+	"System.Buffer::BlockCopyInternal", ves_icall_System_Buffer_BlockCopyInternal,
+
+	/*
+	 * System.IO.MonoIO
+	 */
+	"System.IO.MonoIO::GetLastError", ves_icall_System_IO_MonoIO_GetLastError,
+	"System.IO.MonoIO::CreateDirectory", ves_icall_System_IO_MonoIO_CreateDirectory,
+	"System.IO.MonoIO::RemoveDirectory", ves_icall_System_IO_MonoIO_RemoveDirectory,
+	"System.IO.MonoIO::FindFirstFile", ves_icall_System_IO_MonoIO_FindFirstFile,
+	"System.IO.MonoIO::FindNextFile", ves_icall_System_IO_MonoIO_FindNextFile,
+	"System.IO.MonoIO::FindClose", ves_icall_System_IO_MonoIO_FindClose,
+	"System.IO.MonoIO::GetCurrentDirectory", ves_icall_System_IO_MonoIO_GetCurrentDirectory,
+	"System.IO.MonoIO::SetCurrentDirectory", ves_icall_System_IO_MonoIO_SetCurrentDirectory,
+	"System.IO.MonoIO::MoveFile", ves_icall_System_IO_MonoIO_MoveFile,
+	"System.IO.MonoIO::CopyFile", ves_icall_System_IO_MonoIO_CopyFile,
+	"System.IO.MonoIO::DeleteFile", ves_icall_System_IO_MonoIO_DeleteFile,
+	"System.IO.MonoIO::GetFileAttributes", ves_icall_System_IO_MonoIO_GetFileAttributes,
+	"System.IO.MonoIO::SetFileAttributes", ves_icall_System_IO_MonoIO_SetFileAttributes,
+	"System.IO.MonoIO::GetFileStat", ves_icall_System_IO_MonoIO_GetFileStat,
+	"System.IO.MonoIO::Open", ves_icall_System_IO_MonoIO_Open,
+	"System.IO.MonoIO::Close", ves_icall_System_IO_MonoIO_Close,
+	"System.IO.MonoIO::Read", ves_icall_System_IO_MonoIO_Read,
+	"System.IO.MonoIO::Write", ves_icall_System_IO_MonoIO_Write,
+	"System.IO.MonoIO::Seek", ves_icall_System_IO_MonoIO_Seek,
+	"System.IO.MonoIO::GetLength", ves_icall_System_IO_MonoIO_GetLength,
+	"System.IO.MonoIO::SetLength", ves_icall_System_IO_MonoIO_SetLength,
+	"System.IO.MonoIO::SetFileTime", ves_icall_System_IO_MonoIO_SetFileTime,
+	"System.IO.MonoIO::Flush", ves_icall_System_IO_MonoIO_Flush,
+	"System.IO.MonoIO::get_ConsoleOutput", ves_icall_System_IO_MonoIO_get_ConsoleOutput,
+	"System.IO.MonoIO::get_ConsoleInput", ves_icall_System_IO_MonoIO_get_ConsoleInput,
+	"System.IO.MonoIO::get_ConsoleError", ves_icall_System_IO_MonoIO_get_ConsoleError,
+	"System.IO.MonoIO::CreatePipe(intptr&,intptr&)", ves_icall_System_IO_MonoIO_CreatePipe,
+	"System.IO.MonoIO::get_VolumeSeparatorChar", ves_icall_System_IO_MonoIO_get_VolumeSeparatorChar,
+	"System.IO.MonoIO::get_DirectorySeparatorChar", ves_icall_System_IO_MonoIO_get_DirectorySeparatorChar,
+	"System.IO.MonoIO::get_AltDirectorySeparatorChar", ves_icall_System_IO_MonoIO_get_AltDirectorySeparatorChar,
+	"System.IO.MonoIO::get_PathSeparator", ves_icall_System_IO_MonoIO_get_PathSeparator,
+	"System.IO.MonoIO::get_InvalidPathChars", ves_icall_System_IO_MonoIO_get_InvalidPathChars,
+
+	/*
+	 * System.Math
+	 */
+	"System.Math::Sin", ves_icall_System_Math_Sin,
+    "System.Math::Cos", ves_icall_System_Math_Cos,
+    "System.Math::Tan", ves_icall_System_Math_Tan,
+    "System.Math::Sinh", ves_icall_System_Math_Sinh,
+    "System.Math::Cosh", ves_icall_System_Math_Cosh,
+    "System.Math::Tanh", ves_icall_System_Math_Tanh,
+    "System.Math::Acos", ves_icall_System_Math_Acos,
+    "System.Math::Asin", ves_icall_System_Math_Asin,
+    "System.Math::Atan", ves_icall_System_Math_Atan,
+    "System.Math::Atan2", ves_icall_System_Math_Atan2,
+    "System.Math::Exp", ves_icall_System_Math_Exp,
+    "System.Math::Log", ves_icall_System_Math_Log,
+    "System.Math::Log10", ves_icall_System_Math_Log10,
+    "System.Math::PowImpl", ves_icall_System_Math_Pow,
+    "System.Math::Sqrt", ves_icall_System_Math_Sqrt,
+
+	/*
+	 * System.Environment
+	 */
+	"System.Environment::get_MachineName", ves_icall_System_Environment_get_MachineName,
+	"System.Environment::get_NewLine", ves_icall_System_Environment_get_NewLine,
+	"System.Environment::GetEnvironmentVariable", ves_icall_System_Environment_GetEnvironmentVariable,
+	"System.Environment::GetEnvironmentVariableNames", ves_icall_System_Environment_GetEnvironmentVariableNames,
+	"System.Environment::GetCommandLineArgs", mono_runtime_get_main_args,
+	"System.Environment::get_TickCount", ves_icall_System_Environment_get_TickCount,
+	"System.Environment::Exit", ves_icall_System_Environment_Exit,
+	"System.Environment::get_Platform", ves_icall_System_Environment_get_Platform,
+
+	/*
+	 * System.Runtime.Remoting
+	 */	
+	"System.Runtime.Remoting.RemotingServices::InternalExecute",
+	ves_icall_InternalExecute,
+	"System.Runtime.Remoting.RemotingServices::IsTransparentProxy",
+	ves_icall_IsTransparentProxy,
+
+	/*
+	 * System.Runtime.Remoting.Messaging
+	 */	
+	"System.Runtime.Remoting.Messaging.MonoMethodMessage::InitMessage",
+	ves_icall_MonoMethodMessage_InitMessage,
+	
+	/*
+	 * System.Runtime.Remoting.Proxies
+	 */	
+	"System.Runtime.Remoting.Proxies.RealProxy::GetTransparentProxy", 
+	ves_icall_Remoting_RealProxy_GetTransparentProxy,
+
+	/*
+	 * System.Threading.Interlocked
+	 */
+	"System.Threading.Interlocked::Increment(int&)", ves_icall_System_Threading_Interlocked_Increment_Int,
+	"System.Threading.Interlocked::Increment(long&)", ves_icall_System_Threading_Interlocked_Increment_Long,
+	"System.Threading.Interlocked::Decrement(int&)", ves_icall_System_Threading_Interlocked_Decrement_Int,
+	"System.Threading.Interlocked::Decrement(long&)", ves_icall_System_Threading_Interlocked_Decrement_Long,
+	"System.Threading.Interlocked::CompareExchange(int&,int,int)", ves_icall_System_Threading_Interlocked_CompareExchange_Int,
+	"System.Threading.Interlocked::CompareExchange(object&,object,object)", ves_icall_System_Threading_Interlocked_CompareExchange_Object,
+	"System.Threading.Interlocked::CompareExchange(single&,single,single)", ves_icall_System_Threading_Interlocked_CompareExchange_Single,
+	"System.Threading.Interlocked::Exchange(int&,int)", ves_icall_System_Threading_Interlocked_Exchange_Int,
+	"System.Threading.Interlocked::Exchange(object&,object)", ves_icall_System_Threading_Interlocked_Exchange_Object,
+	"System.Threading.Interlocked::Exchange(single&,single)", ves_icall_System_Threading_Interlocked_Exchange_Single,
+
+	/*
+	 * System.Diagnostics.Process
+	 */
+	"System.Diagnostics.Process::GetCurrentProcess_internal()", ves_icall_System_Diagnostics_Process_GetCurrentProcess_internal,
+	"System.Diagnostics.Process::GetPid_internal()", ves_icall_System_Diagnostics_Process_GetPid_internal,
+	"System.Diagnostics.Process::Process_free_internal(intptr)", ves_icall_System_Diagnostics_Process_Process_free_internal,
+	"System.Diagnostics.Process::GetModules_internal()", ves_icall_System_Diagnostics_Process_GetModules_internal,
+	"System.Diagnostics.Process::Start_internal(string,string,intptr,intptr,intptr,ProcInfo&)", ves_icall_System_Diagnostics_Process_Start_internal,
+	"System.Diagnostics.Process::WaitForExit_internal(intptr,int)", ves_icall_System_Diagnostics_Process_WaitForExit_internal,
+	"System.Diagnostics.Process::ExitTime_internal(intptr)", ves_icall_System_Diagnostics_Process_ExitTime_internal,
+	"System.Diagnostics.Process::StartTime_internal(intptr)", ves_icall_System_Diagnostics_Process_StartTime_internal,
+	"System.Diagnostics.Process::ExitCode_internal(intptr)", ves_icall_System_Diagnostics_Process_ExitCode_internal,
+	"System.Diagnostics.FileVersionInfo::GetVersionInfo_internal(string)", ves_icall_System_Diagnostics_FileVersionInfo_GetVersionInfo_internal,
+
+	/* 
+	 * System.Delegate
+	 */
+	"System.Delegate::CreateDelegate_internal", ves_icall_System_Delegate_CreateDelegate_internal,
 
+	/* 
+	 * System.Runtime.Serialization
+	 */
+	"System.Runtime.Serialization.FormatterServices::GetUninitializedObjectInternal",
+	ves_icall_System_Runtime_Serialization_FormatterServices_GetUninitializedObject_Internal,
 	/*
 	 * add other internal calls here
 	 */
@@ -1367,13 +3105,13 @@ static gpointer icall_map [] = {
 };
 
 void
-mono_init_icall ()
+mono_init_icall (void)
 {
-	char *n;
+	const char *name;
 	int i = 0;
 
-	while ((n = icall_map [i])) {
-		mono_add_internal_call (n, icall_map [i+1]);
+	while ((name = icall_map [i])) {
+		mono_add_internal_call (name, icall_map [i+1]);
 		i += 2;
 	}
        
diff --git a/mono/metadata/image.c b/mono/metadata/image.c
index cc00cb8993b..117ebae06d9 100644
--- a/mono/metadata/image.c
+++ b/mono/metadata/image.c
@@ -303,9 +303,9 @@ load_metadata_ptrs (MonoImage *image, MonoCLIImageInfo *iinfo)
 static gboolean
 load_tables (MonoImage *image)
 {
-	char *heap_tables = image->heap_tables.data;
-	guint32 *rows;
-	guint64 valid_mask;
+	const char *heap_tables = image->heap_tables.data;
+	const guint32 *rows;
+	guint64 valid_mask, sorted_mask;
 	int valid = 0, table;
 	int heap_sizes;
 	
@@ -315,7 +315,8 @@ load_tables (MonoImage *image)
 	image->idx_blob_wide   = ((heap_sizes & 0x04) == 4);
 	
 	valid_mask = read64 (heap_tables + 8);
-	rows = (guint32 *) (heap_tables + 24);
+	sorted_mask = read64 (heap_tables + 16);
+	rows = (const guint32 *) (heap_tables + 24);
 	
 	for (table = 0; table < 64; table++){
 		if ((valid_mask & ((guint64) 1 << table)) == 0){
@@ -325,6 +326,9 @@ load_tables (MonoImage *image)
 		if (table > 0x2b) {
 			g_warning("bits in valid must be zero above 0x2b (II - 23.1.6)");
 		}
+		/*if ((sorted_mask & ((guint64) 1 << table)) == 0){
+			g_print ("table %s (0x%02x) is sorted\n", mono_meta_table_name (table), table);
+		}*/
 		image->tables [table].rows = read32 (rows);
 		rows++;
 		valid++;
@@ -333,7 +337,7 @@ load_tables (MonoImage *image)
 	image->tables_base = (heap_tables + 24) + (4 * valid);
 
 	/* They must be the same */
-	g_assert ((void *) image->tables_base == (void *) rows);
+	g_assert ((const void *) image->tables_base == (const void *) rows);
 
 	mono_metadata_compute_table_bases (image);
 	return TRUE;
@@ -363,20 +367,20 @@ load_class_names (MonoImage *image)
 		mono_metadata_decode_row (t, i - 1, cols, MONO_TYPEDEF_SIZE);
 		/* nested types are accessed from the nesting name */
 		visib = cols [MONO_TYPEDEF_FLAGS] & TYPE_ATTRIBUTE_VISIBILITY_MASK;
-		if (visib > TYPE_ATTRIBUTE_PUBLIC && visib < TYPE_ATTRIBUTE_NESTED_ASSEMBLY)
+		if (visib > TYPE_ATTRIBUTE_PUBLIC && visib <= TYPE_ATTRIBUTE_NESTED_ASSEMBLY)
 			continue;
 		name = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAME]);
 		nspace = mono_metadata_string_heap (image, cols [MONO_TYPEDEF_NAMESPACE]);
 		if (!(nspace_table = g_hash_table_lookup (name_cache, nspace))) {
 			nspace_table = g_hash_table_new (g_str_hash, g_str_equal);
-			g_hash_table_insert (name_cache, (char *) nspace, nspace_table);
+			g_hash_table_insert (name_cache, (char *)nspace, (char *)nspace_table);
 		}
 		g_hash_table_insert (nspace_table, (char *) name, GUINT_TO_POINTER (i));
 	}
 }
 
 static MonoImage *
-do_mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
+do_mono_image_open (const char *fname, MonoImageOpenStatus *status)
 {
 	MonoCLIImageInfo *iinfo;
 	MonoDotNetHeader *header;
@@ -385,6 +389,7 @@ do_mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
 	int n;
 
 	image = g_new0 (MonoImage, 1);
+	image->ref_count = 1;
 	image->f = fopen (fname, "rb");
 	image->name = g_strdup (fname);
 	iinfo = g_new0 (MonoCLIImageInfo, 1);
@@ -393,7 +398,23 @@ do_mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
 	image->method_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
 	image->class_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
 	image->name_cache = g_hash_table_new (g_str_hash, g_str_equal);
-	image->array_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
+	image->array_cache = g_hash_table_new ((GHashFunc)mono_metadata_type_hash, 
+					       (GCompareFunc)mono_metadata_type_equal);
+
+	image->delegate_begin_invoke_cache = 
+		g_hash_table_new ((GHashFunc)mono_signature_hash, 
+				  (GCompareFunc)mono_metadata_signature_equal);
+	image->delegate_end_invoke_cache = 
+		g_hash_table_new ((GHashFunc)mono_signature_hash, 
+				  (GCompareFunc)mono_metadata_signature_equal);
+	image->delegate_invoke_cache = 
+		g_hash_table_new ((GHashFunc)mono_signature_hash, 
+				  (GCompareFunc)mono_metadata_signature_equal);
+
+	image->runtime_invoke_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
+	image->managed_wrapper_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
+	image->native_wrapper_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
+	image->remoting_invoke_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
 
 	header = &iinfo->cli_header;
 		
@@ -410,7 +431,7 @@ do_mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
 	if (fread (&msdos, sizeof (msdos), 1, image->f) != 1)
 		goto invalid_image;
 	
-	if (!(msdos.msdos_header [0] == 'M' && msdos.msdos_header [1] == 'Z'))
+	if (!(msdos.msdos_sig [0] == 'M' && msdos.msdos_sig [1] == 'Z'))
 		goto invalid_image;
 	
 	msdos.pe_offset = GUINT32_FROM_LE (msdos.pe_offset);
@@ -515,13 +536,21 @@ do_mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
 
 	load_class_names (image);
 
-	image->assembly_name = mono_metadata_string_heap (image, 
+	/* modules don't have an assembly table row */
+	if (image->tables [MONO_TABLE_ASSEMBLY].rows)
+		image->assembly_name = mono_metadata_string_heap (image, 
 			mono_metadata_decode_row_col (&image->tables [MONO_TABLE_ASSEMBLY],
 					0, MONO_ASSEMBLY_NAME));
 
+	image->module_name = mono_metadata_string_heap (image, 
+			mono_metadata_decode_row_col (&image->tables [MONO_TABLE_MODULE],
+					0, MONO_MODULE_NAME));
+
 	if (status)
 		*status = MONO_IMAGE_OK;
 
+	image->ref_count=1;
+
 	return image;
 
 invalid_image:
@@ -531,6 +560,8 @@ invalid_image:
 
 MonoImage *
 mono_image_loaded (const char *name) {
+	if (strcmp (name, "mscorlib") == 0)
+		name = "corlib";
 	if (loaded_images_hash)
 		return g_hash_table_lookup (loaded_images_hash, name);
 	return NULL;
@@ -545,7 +576,7 @@ mono_image_loaded (const char *name) {
  * if NULL, then check the value of @status for details on the error
  */
 MonoImage *
-mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
+mono_image_open (const char *fname, MonoImageOpenStatus *status)
 {
 	MonoImage *image;
 	
@@ -566,7 +597,8 @@ mono_image_open (const char *fname, enum MonoImageOpenStatus *status)
 	if (!loaded_images_hash)
 		loaded_images_hash = g_hash_table_new (g_str_hash, g_str_equal);
 	g_hash_table_insert (loaded_images_hash, image->name, image);
-	g_hash_table_insert (loaded_images_hash, (char *) image->assembly_name, image);
+	if (image->assembly_name)
+		g_hash_table_insert (loaded_images_hash, (char *) image->assembly_name, image);
 	
 	return image;
 }
@@ -592,6 +624,8 @@ mono_image_close (MonoImage *image)
 	if (--image->ref_count)
 		return;
 
+	if (!loaded_images_hash)
+		loaded_images_hash = g_hash_table_new (g_str_hash, g_str_equal);
 	g_hash_table_remove (loaded_images_hash, image->name);
 	
 	if (image->f)
@@ -634,7 +668,7 @@ mono_image_close (MonoImage *image)
  * Returns: a string describing the error
  */
 const char *
-mono_image_strerror (enum MonoImageOpenStatus status)
+mono_image_strerror (MonoImageOpenStatus status)
 {
 	switch (status){
 	case MONO_IMAGE_OK:
@@ -649,3 +683,155 @@ mono_image_strerror (enum MonoImageOpenStatus status)
 	return "Internal error";
 }
 
+static gpointer
+mono_image_walk_resource_tree (MonoCLIImageInfo *info, guint32 res_id,
+			       guint32 lang_id, gunichar2 *name,
+			       MonoPEResourceDirEntry *entry,
+			       MonoPEResourceDir *root, guint32 level)
+{
+	gboolean is_string=entry->name_is_string;
+
+	/* Level 0 holds a directory entry for each type of resource
+	 * (identified by ID or name).
+	 *
+	 * Level 1 holds a directory entry for each named resource
+	 * item, and each "anonymous" item of a particular type of
+	 * resource.
+	 *
+	 * Level 2 holds a directory entry for each language pointing to
+	 * the actual data.
+	 */
+
+	if(level==0) {
+		if((is_string==FALSE && entry->name_offset!=res_id) ||
+		   (is_string==TRUE)) {
+			return(NULL);
+		}
+	} else if (level==1) {
+#if 0
+		if(name!=NULL &&
+		   is_string==TRUE && name!=lookup (entry->name_offset)) {
+			return(NULL);
+		}
+#endif
+	} else if (level==2) {
+		if((is_string==FALSE && entry->name_offset!=lang_id) ||
+		   (is_string==TRUE)) {
+			return(NULL);
+		}
+	} else {
+		g_assert_not_reached ();
+	}
+
+	if(entry->is_dir==TRUE) {
+		MonoPEResourceDir *res_dir=(MonoPEResourceDir *)(((char *)root)+entry->dir_offset);
+		MonoPEResourceDirEntry *sub_entries=(MonoPEResourceDirEntry *)(res_dir+1);
+		guint32 entries, i;
+		
+		entries=res_dir->res_named_entries + res_dir->res_id_entries;
+
+		for(i=0; i<entries; i++) {
+			MonoPEResourceDirEntry *sub_entry=&sub_entries[i];
+			gpointer ret;
+			
+			ret=mono_image_walk_resource_tree (info, res_id,
+							   lang_id, name,
+							   sub_entry, root,
+							   level+1);
+			if(ret!=NULL) {
+				return(ret);
+			}
+		}
+
+		return(NULL);
+	} else {
+		MonoPEResourceDataEntry *data_entry=(MonoPEResourceDataEntry *)((char *)(root)+entry->dir_offset);
+		
+		return(data_entry);
+	}
+}
+
+gpointer
+mono_image_lookup_resource (MonoImage *image, guint32 res_id, guint32 lang_id, gunichar2 *name)
+{
+	MonoCLIImageInfo *info;
+	MonoDotNetHeader *header;
+	MonoPEDatadir *datadir;
+	MonoPEDirEntry *rsrc;
+	MonoPEResourceDir *resource_dir;
+	MonoPEResourceDirEntry *res_entries;
+	guint32 entries, i;
+
+	if(image==NULL) {
+		return(NULL);
+	}
+
+	info=image->image_info;
+	if(info==NULL) {
+		return(NULL);
+	}
+
+	header=&info->cli_header;
+	if(header==NULL) {
+		return(NULL);
+	}
+
+	datadir=&header->datadir;
+	if(datadir==NULL) {
+		return(NULL);
+	}
+
+	rsrc=&datadir->pe_resource_table;
+	if(rsrc==NULL) {
+		return(NULL);
+	}
+
+	resource_dir=(MonoPEResourceDir *)mono_cli_rva_map (info, rsrc->rva);
+	if(resource_dir==NULL) {
+		return(NULL);
+	}
+	
+	entries=resource_dir->res_named_entries + resource_dir->res_id_entries;
+	res_entries=(MonoPEResourceDirEntry *)(resource_dir+1);
+	
+	for(i=0; i<entries; i++) {
+		MonoPEResourceDirEntry *entry=&res_entries[i];
+		gpointer ret;
+		
+		ret=mono_image_walk_resource_tree (info, res_id, lang_id,
+						   name, entry, resource_dir,
+						   0);
+		if(ret!=NULL) {
+			return(ret);
+		}
+	}
+
+	return(NULL);
+}
+
+guint32
+mono_image_get_entry_point (MonoImage *image)
+{
+	return ((MonoCLIImageInfo*)image->image_info)->cli_cli_header.ch_entry_point;
+}
+
+const char*
+mono_image_get_resource (MonoImage *image, guint32 offset, guint32 *size)
+{
+	MonoCLIImageInfo *iinfo = image->image_info;
+	MonoCLIHeader *ch = &iinfo->cli_cli_header;
+	const char* data;
+
+	if (!ch->ch_resources.rva || offset + 4 > ch->ch_resources.size)
+		return NULL;
+	
+	data = mono_cli_rva_map (iinfo, ch->ch_resources.rva);
+	if (!data)
+		return NULL;
+	data += offset;
+	if (size)
+		*size = read32 (data);
+	data += 4;
+	return data;
+}
+
diff --git a/mono/metadata/image.h b/mono/metadata/image.h
index 95c443349e2..f47cd3a94c3 100644
--- a/mono/metadata/image.h
+++ b/mono/metadata/image.h
@@ -7,10 +7,21 @@
 typedef struct _MonoImage MonoImage;
 
 typedef struct {
+	const char *name;
+	const char *culture;
+	const char *hash_value;
+	guint32 hash_len;
+	guint32 flags;
+	gint16 major, minor, build, revision;
+} MonoAssemblyName;
+
+typedef struct {
 	int   ref_count;
-	char *name;
-	
+	char *basedir;
+	MonoAssemblyName aname;
+
 	MonoImage *image;
+	MonoImage **modules;
 	/* Load files here */
 } MonoAssembly;
 
@@ -21,7 +32,7 @@ typedef struct {
 
 typedef struct {
 	guint32   rows, row_size;
-	char     *base;
+	const char *base;
 
 	/*
 	 * Tables contain up to 9 columns and the possible sizes of the
@@ -41,6 +52,7 @@ struct _MonoImage {
 	FILE *f;
 	char *name;
 	const char *assembly_name;
+	const char *module_name;
 	void *image_info;
 
 	char                *raw_metadata;
@@ -53,7 +65,7 @@ struct _MonoImage {
 	MonoStreamHeader     heap_guid;
 	MonoStreamHeader     heap_tables;
 			    
-	char                *tables_base;
+	const char          *tables_base;
 
 	MonoTableInfo        tables [64];
 
@@ -66,6 +78,11 @@ struct _MonoImage {
 	MonoAssembly **references;
 
 	/*
+	 * The Assembly this image was loaded from.
+	 */
+	MonoAssembly *assembly;
+
+	/*
 	 * Indexed by method tokens and typedef tokens.
 	 */
 	GHashTable *method_cache;
@@ -82,28 +99,54 @@ struct _MonoImage {
 	GHashTable *array_cache;
 
 	/*
+	 * indexed by MonoMethodSignature 
+	 */
+	GHashTable *delegate_begin_invoke_cache;
+	GHashTable *delegate_end_invoke_cache;
+	GHashTable *delegate_invoke_cache;
+
+	/*
+	 * indexed by MonoMethod pointers 
+	 */
+	GHashTable *runtime_invoke_cache;
+	GHashTable *managed_wrapper_cache;
+	GHashTable *native_wrapper_cache;
+	GHashTable *remoting_invoke_cache;
+
+	void *reflection_info;
+
+	/*
 	 * user_info is a public field and is not touched by the
 	 * metadata engine
 	 */
 	void *user_info;
 };
 
-enum MonoImageOpenStatus {
+typedef enum {
 	MONO_IMAGE_OK,
 	MONO_IMAGE_ERROR_ERRNO,
 	MONO_IMAGE_MISSING_ASSEMBLYREF,
 	MONO_IMAGE_IMAGE_INVALID
-};
+} MonoImageOpenStatus;
 
 MonoImage    *mono_image_open     (const char *fname,
-				   enum MonoImageOpenStatus *status);
+				   MonoImageOpenStatus *status);
 MonoImage    *mono_image_loaded   (const char *name);
 void          mono_image_close    (MonoImage *image);
-const char   *mono_image_strerror (enum MonoImageOpenStatus status);
+const char   *mono_image_strerror (MonoImageOpenStatus status);
 
 int           mono_image_ensure_section     (MonoImage *image,
 					     const char *section);
 int           mono_image_ensure_section_idx (MonoImage *image,
 					     int section);
+
+guint32       mono_image_get_entry_point    (MonoImage *image);
+const char   *mono_image_get_resource       (MonoImage *image, guint32 offset, guint32 *size);
+
+/* This actually returns a MonoPEResourceDataEntry *, but declaring it
+ * causes an include file loop.
+ */
+gpointer      mono_image_lookup_resource (MonoImage *image, guint32 res_id,
+					  guint32 lang_id, gunichar2 *name);
 	
 #endif
diff --git a/mono/metadata/loader.c b/mono/metadata/loader.c
index 1be9da0c349..d75305e5b41 100644
--- a/mono/metadata/loader.c
+++ b/mono/metadata/loader.c
@@ -4,6 +4,7 @@
  * Authors:
  *   Paolo Molaro (lupus@ximian.com)
  *   Miguel de Icaza (miguel@ximian.com)
+ *   Patrik Torstensson (patrik.torstensson@labs2.com)
  *
  * (C) 2001 Ximian, Inc.
  *
@@ -18,6 +19,7 @@
 #include <config.h>
 #include <glib.h>
 #include <gmodule.h>
+#include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
 #include <mono/metadata/metadata.h>
@@ -28,40 +30,16 @@
 #include <mono/metadata/tabledefs.h>
 #include <mono/metadata/loader.h>
 #include <mono/metadata/class.h>
+#include <mono/metadata/debug-helpers.h>
 
 static gboolean dummy_icall = TRUE;
 
 MonoDefaults mono_defaults;
 
-#ifdef __CYGWIN__
-#define mono_map_dll(name) (name)
-#else
-static char *dll_map[] = {
-	"libc", "libc.so.6",
-	"libm", "libm.so.6",
-	"cygwin1.dll", "libc.so.6", 
-	NULL, NULL
-};
-
-static const char *
-mono_map_dll (const char *name)
-{
-	int i = 0;
-
-	while (dll_map [i]) {
-		if (!strcmp (dll_map [i], name))
-			return  dll_map [i + 1];
-		i += 2;
-	}
-
-	return name;
-}
-#endif
-
 static GHashTable *icall_hash = NULL;
 
 void
-mono_add_internal_call (const char *name, gpointer method)
+mono_add_internal_call (const char *name, gconstpointer method)
 {
 	if (!icall_hash) {
 		dummy_icall = FALSE;
@@ -72,46 +50,78 @@ mono_add_internal_call (const char *name, gpointer method)
 }
 
 static void
-ves_icall_dummy ()
+ves_icall_dummy (void)
 {
 	g_warning ("the mono runtime is not initialized");
 	g_assert_not_reached ();
 }
 
 gpointer
-mono_lookup_internal_call (const char *name)
+mono_lookup_internal_call (MonoMethod *method)
 {
+	char *name;
+	char *tmpsig;
 	gpointer res;
 
 	if (dummy_icall)
 		return ves_icall_dummy;
 
+	if (!method) {
+		g_warning ("can't resolve internal call, method is null");
+	}
+
 	if (!icall_hash) {
 		g_warning ("icall_hash not initialized");
 		g_assert_not_reached ();
 	}
 
+	if (*method->klass->name_space)
+		name = g_strconcat (method->klass->name_space, ".", method->klass->name, "::", method->name, NULL);
+	else
+		name = g_strconcat (method->klass->name, "::", method->name, NULL);
 	if (!(res = g_hash_table_lookup (icall_hash, name))) {
-		g_warning ("cant resolve internal call to \"%s\"", name);
-		return NULL;
+		/* trying to resolve with full signature */
+		g_free (name);
+	
+		tmpsig = mono_signature_get_desc(method->signature, TRUE);
+		if (*method->klass->name_space)
+			name = g_strconcat (method->klass->name_space, ".", method->klass->name, "::", method->name, "(", tmpsig, ")", NULL);
+		else
+			name = g_strconcat (method->klass->name, "::", method->name, "(", tmpsig, ")", NULL);
+		if (!(res = g_hash_table_lookup (icall_hash, name))) {
+			g_warning ("cant resolve internal call to \"%s\" (tested without signature also)", name);
+			g_print ("\nYour mono runtime and corlib are out of sync.\n");
+			g_print ("When you update one from cvs you need to update, compile and install\nthe other too.\n");
+			g_print ("Do not report this as a bug unless you're sure you have updated correctly:\nyou probably have a broken mono install.\n");
+			g_print ("If you see other errors or faults after this message they are probably related\n");
+			g_print ("and you need to fix your mono install first.\n");
+
+			g_free (name);
+			g_free (tmpsig);
+
+			return NULL;
+		}
+
+		g_free(tmpsig);
 	}
 
+	g_free (name);
+
 	return res;
 }
 
 MonoClassField*
 mono_field_from_memberref (MonoImage *image, guint32 token, MonoClass **retklass)
 {
-	MonoImage *mimage;
 	MonoClass *klass;
 	MonoTableInfo *tables = image->tables;
 	guint32 cols[6];
-	guint32 nindex, class, i;
-	const char *fname, *name, *nspace;
+	guint32 nindex, class;
+	const char *fname;
 	const char *ptr;
-	guint32 index = mono_metadata_token_index (token);
+	guint32 idx = mono_metadata_token_index (token);
 
-	mono_metadata_decode_row (&tables [MONO_TABLE_MEMBERREF], index-1, cols, MONO_MEMBERREF_SIZE);
+	mono_metadata_decode_row (&tables [MONO_TABLE_MEMBERREF], idx-1, cols, MONO_MEMBERREF_SIZE);
 	nindex = cols [MONO_MEMBERREF_CLASS] >> MEMBERREF_PARENT_BITS;
 	class = cols [MONO_MEMBERREF_CLASS] & MEMBERREF_PARENT_MASK;
 
@@ -122,68 +132,74 @@ mono_field_from_memberref (MonoImage *image, guint32 token, MonoClass **retklass
 	/* we may want to check the signature here... */
 
 	switch (class) {
-	case MEMBERREF_PARENT_TYPEREF: {
-		guint32 scopeindex, scopetable;
-
-		mono_metadata_decode_row (&tables [MONO_TABLE_TYPEREF], nindex-1, cols, MONO_TYPEREF_SIZE);
-		scopeindex = cols [MONO_TYPEREF_SCOPE] >> RESOLTION_SCOPE_BITS;
-		scopetable = cols [MONO_TYPEREF_SCOPE] & RESOLTION_SCOPE_MASK;
-		/*g_print ("typeref: 0x%x 0x%x %s.%s\n", scopetable, scopeindex,
-			mono_metadata_string_heap (m, cols [MONO_TYPEREF_NAMESPACE]),
-			mono_metadata_string_heap (m, cols [MONO_TYPEREF_NAME]));*/
-		switch (scopetable) {
-		case RESOLTION_SCOPE_ASSEMBLYREF:
-			/*
-			 * To find the field we have the following info:
-			 * *) name and namespace of the class from the TYPEREF table
-			 * *) name and signature of the field from the MEMBERREF table
-			 */
-			nspace = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAMESPACE]);
-			name = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAME]);
-
-			/* this will triggered by references to mscorlib */
-			if (image->references [scopeindex-1] == NULL)
-				g_error ("Reference to mscorlib? Probably need to implement %s.%s::%s in corlib", nspace, name, fname);
-
-			mimage = image->references [scopeindex-1]->image;
-
-			klass = mono_class_from_name (mimage, nspace, name);
-			mono_class_init (klass);
-
-			/* mostly dumb search for now */
-			for (i = 0; i < klass->field.count; ++i) {
-				MonoClassField *f = &klass->fields [i];
-				if (!strcmp (fname, f->name)) {
-					if (retklass)
-						*retklass = klass;
-					return f;
-				}
-			}
-			g_warning ("Missing field %s.%s::%s", nspace, name, fname);
-			return NULL;
-		default:
+	case MEMBERREF_PARENT_TYPEREF:
+		klass = mono_class_from_typeref (image, MONO_TOKEN_TYPE_REF | nindex);
+		if (!klass) {
+			g_warning ("Missing field %s in typeref index %d", fname, nindex);
 			return NULL;
 		}
-		break;
-	}
+		mono_class_init (klass);
+		if (retklass)
+			*retklass = klass;
+		return mono_class_get_field_from_name (klass, fname);
 	default:
 		return NULL;
 	}
 }
 
+MonoClassField*
+mono_field_from_token (MonoImage *image, guint32 token, MonoClass **retklass)
+{
+	MonoClass *k;
+	guint32 type;
+	
+	if (mono_metadata_token_table (token) == MONO_TABLE_MEMBERREF)
+		return mono_field_from_memberref (image, token, retklass);
+
+	type = mono_metadata_typedef_from_field (image, mono_metadata_token_index (token));
+	if (!type)
+		return NULL;
+	k = mono_class_get (image, MONO_TOKEN_TYPE_DEF | type);
+	mono_class_init (k);
+	if (!k)
+		return NULL;
+	if (retklass)
+		*retklass = k;
+	return mono_class_get_field (k, token);
+}
+
+static MonoMethod *
+find_method (MonoClass *klass, const char* name, MonoMethodSignature *sig)
+{
+	int i;
+	while (klass) {
+		/* mostly dumb search for now */
+		for (i = 0; i < klass->method.count; ++i) {
+			MonoMethod *m = klass->methods [i];
+			if (!strcmp (name, m->name)) {
+				if (mono_metadata_signature_equal (sig, m->signature))
+					return m;
+			}
+		}
+		klass = klass->parent;
+	}
+	return NULL;
+
+}
+
 static MonoMethod *
-method_from_memberref (MonoImage *image, guint32 index)
+method_from_memberref (MonoImage *image, guint32 idx)
 {
-	MonoImage *mimage;
 	MonoClass *klass;
+	MonoMethod *method;
 	MonoTableInfo *tables = image->tables;
 	guint32 cols[6];
-	guint32 nindex, class, i;
-	const char *mname, *name, *nspace;
+	guint32 nindex, class;
+	const char *mname;
 	MonoMethodSignature *sig;
 	const char *ptr;
 
-	mono_metadata_decode_row (&tables [MONO_TABLE_MEMBERREF], index-1, cols, 3);
+	mono_metadata_decode_row (&tables [MONO_TABLE_MEMBERREF], idx-1, cols, 3);
 	nindex = cols [MONO_MEMBERREF_CLASS] >> MEMBERREF_PARENT_BITS;
 	class = cols [MONO_MEMBERREF_CLASS] & MEMBERREF_PARENT_MASK;
 	/*g_print ("methodref: 0x%x 0x%x %s\n", class, nindex,
@@ -196,75 +212,19 @@ method_from_memberref (MonoImage *image, guint32 index)
 	sig = mono_metadata_parse_method_signature (image, 0, ptr, NULL);
 
 	switch (class) {
-	case MEMBERREF_PARENT_TYPEREF: {
-		guint32 scopeindex, scopetable;
-
-		mono_metadata_decode_row (&tables [MONO_TABLE_TYPEREF], nindex-1, cols, MONO_TYPEREF_SIZE);
-		scopeindex = cols [MONO_TYPEREF_SCOPE] >> RESOLTION_SCOPE_BITS;
-		scopetable = cols [MONO_TYPEREF_SCOPE] & RESOLTION_SCOPE_MASK;
-		/*g_print ("typeref: 0x%x 0x%x %s.%s\n", scopetable, scopeindex,
-			mono_metadata_string_heap (m, cols [MONO_TYPEREF_NAMESPACE]),
-			mono_metadata_string_heap (m, cols [MONO_TYPEREF_NAME]));*/
-		switch (scopetable) {
-		case RESOLTION_SCOPE_ASSEMBLYREF:
-			/*
-			 * To find the method we have the following info:
-			 * *) name and namespace of the class from the TYPEREF table
-			 * *) name and signature of the method from the MEMBERREF table
-			 */
-			nspace = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAMESPACE]);
-			name = mono_metadata_string_heap (image, cols [MONO_TYPEREF_NAME]);
-
-			/* this will triggered by references to mscorlib */
-			if (image->references [scopeindex-1] == NULL)
-				g_error ("Reference to mscorlib? Probably need to implement %s.%s::%s in corlib", nspace, name, mname);
-
-			mimage = image->references [scopeindex-1]->image;
-
-			klass = mono_class_from_name (mimage, nspace, name);
-			g_assert (klass != NULL);
-			mono_class_init (klass);
-
-			/* 
-			 * FIXME: this is a workaround for the different signatures
-			 * in delegates constructors you get in user code (native int)
-			 * and in mscorlib (native unsigned int)
-			 */
-			if (klass->parent && klass->parent->parent == mono_defaults.delegate_class) {
-				for (i = 0; i < klass->method.count; ++i) {
-					MonoMethod *m = klass->methods [i];
-					if (!strcmp (mname, m->name)) {
-						if (!strcmp (mname, ".ctor")) {
-							/* we assume signature is correct */
-							mono_metadata_free_method_signature (sig);
-							return m;
-						}
-						if (mono_metadata_signature_equal (sig, m->signature)) {
-							mono_metadata_free_method_signature (sig);
-							return m;
-						}
-					}
-				}
-			}
-			/* mostly dumb search for now */
-			for (i = 0; i < klass->method.count; ++i) {
-				MonoMethod *m = klass->methods [i];
-				if (!strcmp (mname, m->name)) {
-					if (mono_metadata_signature_equal (sig, m->signature)) {
-						mono_metadata_free_method_signature (sig);
-						return m;
-					}
-				}
-			}
-			g_warning ("Missing method %s.%s::%s", nspace, name, mname);
-			mono_metadata_free_method_signature (sig);
-			return NULL;
-		default:
+	case MEMBERREF_PARENT_TYPEREF:
+		klass = mono_class_from_typeref (image, MONO_TOKEN_TYPE_REF | nindex);
+		if (!klass) {
+			g_warning ("Missing method %s in assembly %s typeref index %d", mname, image->name, nindex);
 			mono_metadata_free_method_signature (sig);
 			return NULL;
 		}
-		break;
-	}
+		mono_class_init (klass);
+		method = find_method (klass, mname, sig);
+		if (!method)
+			g_warning ("Missing method %s in assembly %s typeref index %d", mname, image->name, nindex);
+		mono_metadata_free_method_signature (sig);
+		return method;
 	case MEMBERREF_PARENT_TYPESPEC: {
 		guint32 bcols [MONO_TYPESPEC_SIZE];
 		guint32 len;
@@ -277,7 +237,7 @@ method_from_memberref (MonoImage *image, guint32 index)
 		len = mono_metadata_decode_value (ptr, &ptr);	
 		type = mono_metadata_parse_type (image, MONO_PARSE_TYPE, 0, ptr, &ptr);
 
-		if (type->type != MONO_TYPE_ARRAY)
+		if (type->type != MONO_TYPE_ARRAY && type->type != MONO_TYPE_SZARRAY)
 			g_assert_not_reached ();		
 
 		result = (MonoMethod *)g_new0 (MonoMethodPInvoke, 1);
@@ -295,24 +255,24 @@ method_from_memberref (MonoImage *image, guint32 index)
 		if (!strcmp (mname, "Set")) {
 			g_assert (sig->hasthis);
 			g_assert (type->data.array->rank + 1 == sig->param_count);
-
-			result->addr = mono_lookup_internal_call ("__array_Set");
+			result->iflags |= METHOD_IMPL_ATTRIBUTE_RUNTIME;
+			result->addr = NULL;
 			return result;
 		}
 
 		if (!strcmp (mname, "Get")) {
 			g_assert (sig->hasthis);
 			g_assert (type->data.array->rank == sig->param_count);
-
-			result->addr = mono_lookup_internal_call ("__array_Get");
+			result->iflags |= METHOD_IMPL_ATTRIBUTE_RUNTIME;
+			result->addr = NULL;
 			return result;
 		}
 
 		if (!strcmp (mname, "Address")) {
 			g_assert (sig->hasthis);
 			g_assert (type->data.array->rank == sig->param_count);
-
-			result->addr = mono_lookup_internal_call ("__array_Address");
+			result->iflags |= METHOD_IMPL_ATTRIBUTE_RUNTIME;
+			result->addr = NULL;
 			return result;
 		}
 
@@ -326,62 +286,117 @@ method_from_memberref (MonoImage *image, guint32 index)
 	return NULL;
 }
 
-static void
-fill_pinvoke_info (MonoImage *image, MonoMethodPInvoke *piinfo, int index)
+typedef struct MonoDllMap MonoDllMap;
+
+struct MonoDllMap {
+	char *name;
+	char *target;
+	char *dll;
+	MonoDllMap *next;
+};
+
+static GHashTable *dll_map;
+
+int 
+mono_dllmap_lookup (const char *dll, const char* func, const char **rdll, const char **rfunc) {
+	MonoDllMap *map, *tmp;
+
+	if (!dll_map)
+		return 0;
+	map = g_hash_table_lookup (dll_map, dll);
+	if (!map)
+		return 0;
+	*rdll = map->target? map->target: dll;
+		
+	for (tmp = map->next; tmp; tmp = tmp->next) {
+		if (strcmp (func, tmp->name) == 0) {
+			*rfunc = tmp->name;
+			if (tmp->dll)
+				*rdll = tmp->dll;
+			return 1;
+		}
+	}
+	*rfunc = func;
+	return 1;
+}
+
+void
+mono_dllmap_insert (const char *dll, const char *func, const char *tdll, const char *tfunc) {
+	MonoDllMap *map, *entry;
+
+	if (!dll_map)
+		dll_map = g_hash_table_new (g_str_hash, g_str_equal);
+
+	map = g_hash_table_lookup (dll_map, dll);
+	if (!map) {
+		map = g_new0 (MonoDllMap, 1);
+		map->dll = g_strdup (dll);
+		if (tdll)
+			map->target = g_strdup (tdll);
+		g_hash_table_insert (dll_map, map->dll, map);
+	}
+	if (func) {
+		entry = g_new0 (MonoDllMap, 1);
+		entry->name = g_strdup (func);
+		if (tfunc)
+			entry->target = g_strdup (tfunc);
+		if (tdll && map->target && strcmp (map->target, tdll))
+			entry->dll = g_strdup (tdll);
+		entry->next = map->next;
+		map->next = entry;
+	}
+}
+
+gpointer
+mono_lookup_pinvoke_call (MonoMethod *method)
 {
-	MonoMethod *mh = &piinfo->method;
+	MonoImage *image = method->klass->image;
+	MonoMethodPInvoke *piinfo = (MonoMethodPInvoke *)method;
 	MonoTableInfo *tables = image->tables;
 	MonoTableInfo *im = &tables [MONO_TABLE_IMPLMAP];
 	MonoTableInfo *mr = &tables [MONO_TABLE_MODULEREF];
-	guint32 im_cols [4];
-	guint32 mr_cols [1];
+	guint32 im_cols [MONO_IMPLMAP_SIZE];
+	guint32 scope_token;
 	const char *import = NULL;
 	const char *scope = NULL;
 	char *full_name;
 	GModule *gmodule;
-	int i;
-
-	for (i = 0; i < im->rows; i++) {
-			
-		mono_metadata_decode_row (im, i, im_cols, 4);
 
-		if ((im_cols[1] >> 1) == index + 1) {
+	g_assert (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL);
 
-			import = mono_metadata_string_heap (image, im_cols [2]);
-
-			mono_metadata_decode_row (mr, im_cols [3] - 1, mr_cols,
-						  1);
-			
-			scope = mono_metadata_string_heap (image, mr_cols [0]);
-		}
-	}
+	if (method->addr)
+		return method->addr;
+	if (!piinfo->implmap_idx)
+		return NULL;
+	
+	mono_metadata_decode_row (im, piinfo->implmap_idx - 1, im_cols, MONO_IMPLMAP_SIZE);
 
-	piinfo->piflags = im_cols [0];
+	piinfo->piflags = im_cols [MONO_IMPLMAP_FLAGS];
+	import = mono_metadata_string_heap (image, im_cols [MONO_IMPLMAP_NAME]);
+	scope_token = mono_metadata_decode_row_col (mr, im_cols [MONO_IMPLMAP_SCOPE] - 1, MONO_MODULEREF_NAME);
+	scope = mono_metadata_string_heap (image, scope_token);
 
-	g_assert (import && scope);
+	mono_dllmap_lookup (scope, import, &scope, &import);
 
-	scope = mono_map_dll (scope);
 	full_name = g_module_build_path (NULL, scope);
 	gmodule = g_module_open (full_name, G_MODULE_BIND_LAZY);
 
-	mh->addr = NULL;
 	if (!gmodule) {
 		if (!(gmodule=g_module_open (scope, G_MODULE_BIND_LAZY))) {
 			g_warning ("Failed to load library %s (%s)", full_name, scope);
 			g_free (full_name);
-			return;
+			return NULL;
 		}
 	}
 	g_free (full_name);
 
-	g_module_symbol (gmodule, import, &mh->addr); 
+	g_module_symbol (gmodule, import, &method->addr); 
 
-	if (!mh->addr) {
+	if (!method->addr) {
 		g_warning ("Failed to load function %s from %s", import, scope);
-		return;
+		return NULL;
 	}
-
-	mh->flags |= METHOD_ATTRIBUTE_PINVOKE_IMPL;
+	return method->addr;
 }
 
 MonoMethod *
@@ -389,10 +404,9 @@ mono_get_method (MonoImage *image, guint32 token, MonoClass *klass)
 {
 	MonoMethod *result;
 	int table = mono_metadata_token_table (token);
-	int index = mono_metadata_token_index (token);
+	int idx = mono_metadata_token_index (token);
 	MonoTableInfo *tables = image->tables;
 	const char *loc, *sig = NULL;
-	char *name;
 	int size;
 	guint32 cols [MONO_TYPEDEF_SIZE];
 
@@ -403,12 +417,12 @@ mono_get_method (MonoImage *image, guint32 token, MonoClass *klass)
 		if (table != MONO_TABLE_MEMBERREF)
 			g_print("got wrong token: 0x%08x\n", token);
 		g_assert (table == MONO_TABLE_MEMBERREF);
-		result = method_from_memberref (image, index);
+		result = method_from_memberref (image, idx);
 		g_hash_table_insert (image->method_cache, GINT_TO_POINTER (token), result);
 		return result;
 	}
 
-	mono_metadata_decode_row (&tables [table], index - 1, cols, 6);
+	mono_metadata_decode_row (&tables [table], idx - 1, cols, 6);
 
 	if ((cols [2] & METHOD_ATTRIBUTE_PINVOKE_IMPL) ||
 	    (cols [1] & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL))
@@ -433,13 +447,12 @@ mono_get_method (MonoImage *image, guint32 token, MonoClass *klass)
 	}
 
 	if (cols [1] & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) {
-		name = g_strconcat (result->klass->name_space, ".", result->klass->name, "::", 
-				    mono_metadata_string_heap (image, cols [MONO_METHOD_NAME]), NULL);
-		result->addr = mono_lookup_internal_call (name);
-		g_free (name);
-		result->flags |= METHOD_ATTRIBUTE_PINVOKE_IMPL;
+		if (result->klass == mono_defaults.string_class && !strcmp (result->name, ".ctor"))
+			result->string_ctor = 1;
+
+		result->addr = mono_lookup_internal_call (result);
 	} else if (cols [2] & METHOD_ATTRIBUTE_PINVOKE_IMPL) {
-		fill_pinvoke_info (image, (MonoMethodPInvoke *)result, index - 1);
+		((MonoMethodPInvoke *)result)->implmap_idx = mono_metadata_implmap_from_method (image, idx - 1);
 	} else {
 		/* if this is a methodref from another module/assembly, this fails */
 		loc = mono_cli_rva_map ((MonoCLIImageInfo *)image->image_info, cols [0]);
@@ -489,12 +502,12 @@ mono_method_get_param_names (MonoMethod *method, const char **names)
 
 	for (i = 0; i < klass->method.count; ++i) {
 		if (method == klass->methods [i]) {
-			guint32 index = klass->method.first + i;
+			guint32 idx = klass->method.first + i;
 			guint32 cols [MONO_PARAM_SIZE];
-			guint param_index = mono_metadata_decode_row_col (methodt, index, MONO_METHOD_PARAMLIST);
+			guint param_index = mono_metadata_decode_row_col (methodt, idx, MONO_METHOD_PARAMLIST);
 
-			if (index < methodt->rows)
-				lastp = mono_metadata_decode_row_col (methodt, index + 1, MONO_METHOD_PARAMLIST);
+			if (idx + 1 < methodt->rows)
+				lastp = mono_metadata_decode_row_col (methodt, idx + 1, MONO_METHOD_PARAMLIST);
 			else
 				lastp = paramt->rows;
 			for (i = param_index; i < lastp; ++i) {
@@ -507,3 +520,56 @@ mono_method_get_param_names (MonoMethod *method, const char **names)
 	}
 }
 
+gpointer
+mono_method_get_wrapper_data (MonoMethod *method, guint32 id)
+{
+	GList *l;
+	g_assert (method != NULL);
+	g_assert (method->wrapper_type != MONO_WRAPPER_NONE);
+
+	if (!(l = g_list_nth (((MonoMethodWrapper *)method)->data, id - 1)))
+		g_assert_not_reached ();
+
+	return l->data;
+}
+
+static void
+default_stack_walk (MonoStackWalk func, gpointer user_data) {
+	g_error ("stack walk not installed");
+}
+
+static MonoStackWalkImpl stack_walk = default_stack_walk;
+
+void
+mono_stack_walk (MonoStackWalk func, gpointer user_data)
+{
+	stack_walk (func, user_data);
+}
+
+void
+mono_install_stack_walk (MonoStackWalkImpl func)
+{
+	stack_walk = func;
+}
+
+static gboolean
+last_managed (MonoMethod *m, gint no, gint ilo, gpointer data)
+{
+	MonoMethod **dest = data;
+	*dest = m;
+	/*g_print ("In %s::%s [%d] [%d]\n", m->klass->name, m->name, no, ilo);*/
+	if ((m->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) || m->wrapper_type)
+		return FALSE;
+	return TRUE;
+}
+
+MonoMethod*
+mono_method_get_last_managed (void)
+{
+	MonoMethod *m = NULL;
+	stack_walk (last_managed, &m);
+	return m;
+}
+
+
+
diff --git a/mono/metadata/loader.h b/mono/metadata/loader.h
index cffc385ba4b..6135661f300 100644
--- a/mono/metadata/loader.h
+++ b/mono/metadata/loader.h
@@ -4,6 +4,18 @@
 #include <mono/metadata/metadata.h>
 #include <mono/metadata/image.h>
 
+typedef enum {
+	MONO_WRAPPER_NONE,
+	MONO_WRAPPER_DELEGATE_INVOKE,
+	MONO_WRAPPER_DELEGATE_BEGIN_INVOKE,
+	MONO_WRAPPER_DELEGATE_END_INVOKE,
+	MONO_WRAPPER_RUNTIME_INVOKE,
+	MONO_WRAPPER_NATIVE_TO_MANAGED,
+	MONO_WRAPPER_MANAGED_TO_NATIVE,
+	MONO_WRAPPER_REMOTING_INVOKE,
+	MONO_WRAPPER_UNKNOWN
+} MonoWrapperType;
+
 typedef struct {
 	guint16 flags;  /* method flags */
 	guint16 iflags; /* method implementation flags */
@@ -11,9 +23,17 @@ typedef struct {
 	MonoMethodSignature *signature;
 	gpointer addr;
 	gpointer info; /* runtime info */
+	gpointer remoting_tramp; 
 	gint slot;
 	/* name is useful mostly for debugging */
-	const char *name; 
+	const char *name;
+	/* this is used by the inlining algorithm */
+	unsigned int inline_info:1;
+	unsigned int uses_this:1;
+	MonoWrapperType wrapper_type:4;
+	unsigned int string_ctor:1;
+	unsigned int save_lmf:1;
+	gint16 inline_count;
 } MonoMethod;
 
 typedef struct {
@@ -22,9 +42,16 @@ typedef struct {
 } MonoMethodNormal;
 
 typedef struct {
+	MonoMethodNormal method;
+	GList *data;
+} MonoMethodWrapper;
+
+typedef struct {
 	MonoMethod method;
+	void  (*code) (void);
+	/* add marshal info */
 	guint16 piflags;  /* pinvoke flags */
-	void  (*code) ();
+	guint16 implmap_idx;  /* index into IMPLMAP */
 } MonoMethodPInvoke;
 
 typedef struct {
@@ -48,16 +75,36 @@ typedef struct {
 	MonoClass *string_class;
 	MonoClass *enum_class;
 	MonoClass *array_class;
-	MonoClass *delegate_class;
+	MonoClass *multicastdelegate_class;
+	MonoClass *asyncresult_class;
+	MonoClass *waithandle_class;
 	MonoClass *typehandle_class;
 	MonoClass *fieldhandle_class;
 	MonoClass *methodhandle_class;
 	MonoClass *monotype_class;
 	MonoClass *exception_class;
+	MonoClass *threadabortexception_class;
+	MonoClass *thread_class;
+	MonoClass *transparent_proxy_class;
+	MonoClass *real_proxy_class;
+	MonoClass *mono_method_message_class;
+	MonoClass *appdomain_class;
+	MonoClass *field_info_class;
+	MonoClass *stringbuilder_class;
+	MonoClass *math_class;
+	MonoClass *stack_frame_class;
+	MonoClass *stack_trace_class;
+	MonoClass *marshal_class;
+	MonoClass *iserializeable_class;
+	MonoClass *serializationinfo_class;
+	MonoClass *streamingcontext_class;
 } MonoDefaults;
 
 extern MonoDefaults mono_defaults;
 
+typedef gboolean (*MonoStackWalk)     (MonoMethod *method, gint32 native_offset, gint32 il_offset, gpointer data);
+typedef void     (*MonoStackWalkImpl) (MonoStackWalk func, gpointer user_data);
+
 void 
 mono_init_icall            (void);
 
@@ -68,15 +115,36 @@ void
 mono_free_method           (MonoMethod *method);
 
 MonoImage *
-mono_load_image            (const char *fname, enum MonoImageOpenStatus *status);
+mono_load_image            (const char *fname, MonoImageOpenStatus *status);
+
+void
+mono_add_internal_call     (const char *name, gconstpointer method);
+
+gpointer
+mono_lookup_internal_call (MonoMethod *method);
+
+int 
+mono_dllmap_lookup (const char *dll, const char* func, const char **rdll, const char **rfunc);
 
 void
-mono_add_internal_call     (const char *name, gpointer method);
+mono_dllmap_insert (const char *dll, const char *func, const char *tdll, const char *tfunc);
 
 gpointer
-mono_lookup_internal_call  (const char *name);
+mono_lookup_pinvoke_call (MonoMethod *method);
 
 void
 mono_method_get_param_names (MonoMethod *method, const char **names);
 
+gpointer
+mono_method_get_wrapper_data (MonoMethod *method, guint32 id);
+
+MonoMethod*
+mono_method_get_last_managed  (void);
+
+void
+mono_stack_walk         (MonoStackWalk func, gpointer user_data);
+
+void
+mono_install_stack_walk (MonoStackWalkImpl func);
+
 #endif
diff --git a/mono/metadata/marshal.c b/mono/metadata/marshal.c
new file mode 100644
index 00000000000..eefba54b3ed
--- /dev/null
+++ b/mono/metadata/marshal.c
@@ -0,0 +1,2862 @@
+/*
+ * marshal.c: Routines for marshaling complex types in P/Invoke methods.
+ * 
+ * Author:
+ *   Paolo Molaro (lupus@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.  http://www.ximian.com
+ *
+ */
+
+#include "config.h"
+#include "object.h"
+#include "loader.h"
+#include "metadata/marshal.h"
+#include "metadata/tabledefs.h"
+#include "metadata/exception.h"
+#include "metadata/appdomain.h"
+#include "mono/metadata/debug-helpers.h"
+#include "mono/metadata/threadpool.h"
+#include <string.h>
+
+//#define DEBUG_RUNTIME_CODE
+
+#define OPDEF(a,b,c,d,e,f,g,h,i,j) \
+	a = i,
+
+enum {
+#include "mono/cil/opcode.def"
+	LAST = 0xff
+};
+#undef OPDEF
+
+struct _MonoMethodBuilder {
+	MonoMethod *method;
+	GList *locals_list;
+	int locals;
+	guint32 code_size, pos;
+	unsigned char *code;
+};
+
+static void
+emit_struct_conv (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object);
+
+#ifdef DEBUG_RUNTIME_CODE
+static char*
+indenter (MonoDisHelper *dh, MonoMethod *method, guint32 ip_offset)
+{
+	return g_strdup (" ");
+}
+
+static MonoDisHelper marshal_dh = {
+	"\n",
+	"IL_%04x: ",
+	"IL_%04x",
+	indenter, 
+	NULL,
+	NULL
+};
+#endif 
+
+gpointer
+mono_delegate_to_ftnptr (MonoDelegate *delegate)
+{
+	MonoMethod *method, *wrapper;
+	MonoClass *klass;
+
+	if (!delegate)
+		return NULL;
+
+	if (delegate->delegate_trampoline)
+		return delegate->delegate_trampoline;
+
+	klass = ((MonoObject *)delegate)->vtable->klass;
+	g_assert (klass->delegate);
+	
+	method = delegate->method_info->method;
+	wrapper = mono_marshal_get_managed_wrapper (method, delegate->target);
+
+	delegate->delegate_trampoline =  mono_compile_method (wrapper);
+
+	return delegate->delegate_trampoline;
+}
+
+gpointer
+mono_array_to_savearray (MonoArray *array)
+{
+	if (!array)
+		return NULL;
+
+	g_assert_not_reached ();
+	return NULL;
+}
+
+gpointer
+mono_array_to_lparray (MonoArray *array)
+{
+	if (!array)
+		return NULL;
+
+	/* fixme: maybe we need to make a copy */
+	return array->vector;
+}
+
+void
+mono_string_utf8_to_builder (MonoStringBuilder *sb, char *text)
+{
+	GError *error = NULL;
+	guint16 *ut;
+	glong items_written;
+	int l;
+
+	if (!sb || !text)
+		return;
+
+	l = strlen (text);
+
+	ut = g_utf8_to_utf16 (text, l, NULL, &items_written, &error);
+
+	if (items_written > sb->capacity)
+		items_written = sb->capacity;
+	
+	if (!error) {
+		memcpy (sb->chars->vector, ut, items_written * 2);
+		sb->length = items_written;
+	} else 
+		g_error_free (error);
+
+	g_free (ut);
+}
+
+gpointer
+mono_string_builder_to_utf8 (MonoStringBuilder *sb)
+{
+	char *res;
+
+	if (!sb)
+		return NULL;
+
+	res = g_malloc (sb->capacity + 1);
+
+	/* fixme: copy the content of the string builder? */
+	res [0] = 0;
+
+	return res;
+}
+
+gpointer
+mono_string_to_ansibstr (MonoString *string_obj)
+{
+	g_error ("implement me");
+	return NULL;
+}
+
+gpointer
+mono_string_to_bstr (MonoString *string_obj)
+{
+	g_error ("implement me");
+	return NULL;
+}
+
+void
+mono_string_to_byvalstr (gpointer dst, MonoString *src, int size)
+{
+	char *s;
+	int len;
+
+	g_assert (dst != NULL);
+	g_assert (size > 0);
+
+	if (!src) {
+		memset (dst, 0, size);
+		return;
+	}
+
+	s = mono_string_to_utf8 (src);
+	len = MIN (size, strlen (s));
+	memcpy (dst, s, len);
+	g_free (s);
+
+	*((char *)dst + size - 1) = 0;
+}
+
+void
+mono_string_to_byvalwstr (gpointer dst, MonoString *src, int size)
+{
+	int len;
+
+	g_assert (dst != NULL);
+	g_assert (size > 1);
+
+	if (!src) {
+		memset (dst, 0, size);
+		return;
+	}
+
+	len = MIN (size, (mono_string_length (src) * 2));
+	memcpy (dst, mono_string_chars (src), len);
+
+	*((char *)dst + size - 1) = 0;
+	*((char *)dst + size - 2) = 0;
+}
+
+
+static MonoMethod *
+mono_find_method_by_name (MonoClass *klass, const char *name, int param_count)
+{
+	MonoMethod *res = NULL;
+	int i;
+
+	for (i = 0; i < klass->method.count; ++i) {
+		if ((klass->methods [i]->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
+		    klass->methods [i]->name[0] == name [0] && 
+		    !strcmp (name, klass->methods [i]->name) &&
+		    klass->methods [i]->signature->param_count == param_count) {
+			res = klass->methods [i];
+			break;
+		}
+	}
+	return res;
+}
+
+void
+mono_mb_free (MonoMethodBuilder *mb)
+{
+	g_list_free (mb->locals_list);
+	g_free (mb);
+}
+
+MonoMethodBuilder *
+mono_mb_new (MonoClass *klass, const char *name)
+{
+	MonoMethodBuilder *mb;
+	MonoMethod *m;
+
+	g_assert (klass != NULL);
+	g_assert (name != NULL);
+
+	mb = g_new0 (MonoMethodBuilder, 1);
+
+	mb->method = m = (MonoMethod *)g_new0 (MonoMethodWrapper, 1);
+
+	m->klass = klass;
+	m->name = g_strdup (name);
+	m->inline_info = 1;
+	m->inline_count = -1;
+	m->wrapper_type = MONO_WRAPPER_UNKNOWN;
+
+	mb->code_size = 256;
+	mb->code = g_malloc (mb->code_size);
+	
+	return mb;
+}
+
+int
+mono_mb_add_local (MonoMethodBuilder *mb, MonoType *type)
+{
+	int res = mb->locals;
+
+	g_assert (mb != NULL);
+	g_assert (type != NULL);
+
+	mb->locals_list = g_list_append (mb->locals_list, type);
+	mb->locals++;
+
+	return res;
+}
+
+MonoMethod *
+mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, int max_stack)
+{
+	MonoMethodHeader *header;
+	GList *l;
+	int i;
+
+	g_assert (mb != NULL);
+
+	((MonoMethodNormal *)mb->method)->header = header = (MonoMethodHeader *) 
+		g_malloc0 (sizeof (MonoMethodHeader) + mb->locals * sizeof (MonoType *));
+
+	if (max_stack < 8)
+		max_stack = 8;
+
+	header->max_stack = max_stack;
+
+	for (i = 0, l = mb->locals_list; l; l = l->next, i++) {
+		header->locals [i] = (MonoType *)l->data;
+	}
+
+	mb->method->signature = signature;
+	header->code = mb->code;
+	header->code_size = mb->pos;
+	header->num_locals = mb->locals;
+
+#ifdef DEBUG_RUNTIME_CODE
+	printf ("RUNTIME CODE FOR %s\n", mono_method_full_name (mb->method, TRUE));
+	printf ("%s\n", mono_disasm_code (&marshal_dh, mb->method, mb->code, mb->code + mb->pos));
+#endif
+
+	return mb->method;
+}
+
+guint32
+mono_mb_add_data (MonoMethodBuilder *mb, gpointer data)
+{
+	MonoMethodWrapper *mw;
+
+	g_assert (mb != NULL);
+
+	mw = (MonoMethodWrapper *)mb->method;
+
+	mw->data = g_list_append (mw->data, data);
+
+	return g_list_length (mw->data);
+}
+
+void
+mono_mb_patch_addr (MonoMethodBuilder *mb, int pos, int value)
+{
+	mb->code [pos] = value & 0xff;
+	mb->code [pos + 1] = (value >> 8) & 0xff;
+	mb->code [pos + 2] = (value >> 16) & 0xff;
+	mb->code [pos + 3] = (value >> 24) & 0xff;
+}
+
+void
+mono_mb_patch_addr_s (MonoMethodBuilder *mb, int pos, gint8 value)
+{
+	*((gint8 *)(&mb->code [pos])) = value;
+}
+
+void
+mono_mb_emit_byte (MonoMethodBuilder *mb, guint8 op)
+{
+	if (mb->pos >= mb->code_size) {
+		mb->code_size += 64;
+		mb->code = g_realloc (mb->code, mb->code_size);
+	}
+
+	mb->code [mb->pos++] = op;
+}
+
+void
+mono_mb_emit_ldflda (MonoMethodBuilder *mb, gint32 offset)
+{
+        mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+        mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
+        mono_mb_emit_icon (mb, offset);
+        mono_mb_emit_byte (mb, CEE_ADD);
+}
+
+void
+mono_mb_emit_i4 (MonoMethodBuilder *mb, gint32 data)
+{
+	if ((mb->pos + 4) >= mb->code_size) {
+		mb->code_size += 64;
+		mb->code = g_realloc (mb->code, mb->code_size);
+	}
+
+	mono_mb_patch_addr (mb, mb->pos, data);
+	mb->pos += 4;
+}
+
+void
+mono_mb_emit_i2 (MonoMethodBuilder *mb, gint16 data)
+{
+	if ((mb->pos + 2) >= mb->code_size) {
+		mb->code_size += 64;
+		mb->code = g_realloc (mb->code, mb->code_size);
+	}
+
+	mb->code [mb->pos] = data & 0xff;
+	mb->code [mb->pos + 1] = (data >> 8) & 0xff;
+	mb->pos += 2;
+}
+
+void
+mono_mb_emit_ldarg (MonoMethodBuilder *mb, guint argnum)
+{
+	if (argnum < 4) {
+ 		mono_mb_emit_byte (mb, CEE_LDARG_0 + argnum);
+	} else if (argnum < 256) {
+		mono_mb_emit_byte (mb, CEE_LDARG_S);
+		mono_mb_emit_byte (mb, argnum);
+	} else {
+		mono_mb_emit_byte (mb, CEE_PREFIX1);
+		mono_mb_emit_byte (mb, CEE_LDARG);
+		mono_mb_emit_i2 (mb, argnum);
+	}
+}
+
+void
+mono_mb_emit_ldarg_addr (MonoMethodBuilder *mb, guint argnum)
+{
+	if (argnum < 256) {
+		mono_mb_emit_byte (mb, CEE_LDARGA_S);
+		mono_mb_emit_byte (mb, argnum);
+	} else {
+		mono_mb_emit_byte (mb, CEE_PREFIX1);
+		mono_mb_emit_byte (mb, CEE_LDARGA);
+		mono_mb_emit_i2 (mb, argnum);
+	}
+}
+
+void
+mono_mb_emit_ldloc_addr (MonoMethodBuilder *mb, guint locnum)
+{
+	if (locnum < 256) {
+		mono_mb_emit_byte (mb, CEE_LDLOCA_S);
+		mono_mb_emit_byte (mb, locnum);
+	} else {
+		mono_mb_emit_byte (mb, CEE_PREFIX1);
+		mono_mb_emit_byte (mb, CEE_LDLOCA);
+		mono_mb_emit_i2 (mb, locnum);
+	}
+}
+
+void
+mono_mb_emit_ldloc (MonoMethodBuilder *mb, guint num)
+{
+	if (num < 4) {
+ 		mono_mb_emit_byte (mb, CEE_LDLOC_0 + num);
+	} else if (num < 256) {
+		mono_mb_emit_byte (mb, CEE_LDLOC_S);
+		mono_mb_emit_byte (mb, num);
+	} else {
+		mono_mb_emit_byte (mb, CEE_PREFIX1);
+		mono_mb_emit_byte (mb, CEE_LDLOC);
+		mono_mb_emit_i2 (mb, num);
+	}
+}
+
+void
+mono_mb_emit_stloc (MonoMethodBuilder *mb, guint num)
+{
+	if (num < 4) {
+ 		mono_mb_emit_byte (mb, CEE_STLOC_0 + num);
+	} else if (num < 256) {
+		mono_mb_emit_byte (mb, CEE_STLOC_S);
+		mono_mb_emit_byte (mb, num);
+	} else {
+		mono_mb_emit_byte (mb, CEE_PREFIX1);
+		mono_mb_emit_byte (mb, CEE_STLOC);
+		mono_mb_emit_i2 (mb, num);
+	}
+}
+
+void
+mono_mb_emit_icon (MonoMethodBuilder *mb, gint32 value)
+{
+	if (value >= -1 && value < 8) {
+		mono_mb_emit_byte (mb, CEE_LDC_I4_0 + value);
+	} else if (value >= -128 && value <= 127) {
+		mono_mb_emit_byte (mb, CEE_LDC_I4_S);
+		mono_mb_emit_byte (mb, value);
+	} else {
+		mono_mb_emit_byte (mb, CEE_LDC_I4);
+		mono_mb_emit_i4 (mb, value);
+	}
+}
+
+void
+mono_mb_emit_managed_call (MonoMethodBuilder *mb, MonoMethod *method, MonoMethodSignature *opt_sig)
+{
+	if (!opt_sig)
+		opt_sig = method->signature;
+	mono_mb_emit_byte (mb, CEE_PREFIX1);
+	mono_mb_emit_byte (mb, CEE_LDFTN);
+	mono_mb_emit_i4 (mb, mono_mb_add_data (mb, method));
+	mono_mb_emit_byte (mb, CEE_CALLI);
+	mono_mb_emit_i4 (mb, mono_mb_add_data (mb, opt_sig));
+}
+
+void
+mono_mb_emit_native_call (MonoMethodBuilder *mb, MonoMethodSignature *sig, gpointer func)
+{
+	mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+	mono_mb_emit_byte (mb, CEE_MONO_LDPTR);
+	mono_mb_emit_i4 (mb, mono_mb_add_data (mb, func));
+	mono_mb_emit_byte (mb, CEE_CALLI);
+	mono_mb_emit_i4 (mb, mono_mb_add_data (mb, sig));
+}
+
+void
+mono_mb_emit_exception (MonoMethodBuilder *mb)
+{
+	/* fixme: we need a better way to throw exception,
+	 * supporting several exception types and messages */
+	mono_mb_emit_byte (mb, CEE_LDNULL);
+	mono_mb_emit_byte (mb, CEE_THROW);
+	
+}
+
+void
+mono_mb_emit_add_to_local (MonoMethodBuilder *mb, guint8 local, gint8 incr)
+{
+	mono_mb_emit_ldloc (mb, local); 
+	mono_mb_emit_icon (mb, incr);
+	mono_mb_emit_byte (mb, CEE_ADD);
+	mono_mb_emit_stloc (mb, local); 
+}
+
+static void
+emit_ptr_to_str_conv (MonoMethodBuilder *mb, MonoType *type, MonoMarshalConv conv, 
+		      int usize, int msize)
+{
+	switch (conv) {
+	case MONO_MARSHAL_CONV_BOOL_I4:
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_byte (mb, CEE_LDIND_I);
+		mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+		mono_mb_emit_byte (mb, 5);
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDC_I4_1);
+		mono_mb_emit_byte (mb, CEE_STIND_I1);
+		mono_mb_emit_byte (mb, CEE_BR_S);
+		mono_mb_emit_byte (mb, 3);
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDC_I4_0);
+		mono_mb_emit_byte (mb, CEE_STIND_I1);
+		break;
+	case MONO_MARSHAL_CONV_ARRAY_BYVALARRAY: {
+		MonoClass *eclass;
+		int esize;
+
+		if (type->type == MONO_TYPE_ARRAY)
+			eclass = mono_class_from_mono_type (type->data.array->type);
+		else if (type->type == MONO_TYPE_SZARRAY) {
+			eclass = mono_class_from_mono_type (type->data.type);
+		} else {
+			g_assert_not_reached ();
+		}
+
+	     	if (eclass->valuetype)
+			esize = mono_class_instance_size (eclass) - sizeof (MonoObject);
+		else
+			esize = sizeof (gpointer);
+
+		/* create a new array */
+		/* fixme: this only works for SZARRAYS */
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_icon (mb, msize / esize);
+		mono_mb_emit_byte (mb, CEE_NEWARR);	
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, eclass));
+		mono_mb_emit_byte (mb, CEE_STIND_I);
+
+		/* copy the elements */
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDIND_I);
+		mono_mb_emit_icon (mb, G_STRUCT_OFFSET (MonoArray, vector));
+		mono_mb_emit_byte (mb, CEE_ADD);
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_icon (mb, usize);
+		mono_mb_emit_byte (mb, CEE_PREFIX1);
+		mono_mb_emit_byte (mb, CEE_CPBLK);			
+
+		break;
+	}
+	case MONO_MARSHAL_CONV_STR_BYVALSTR: 
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+		mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+		mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPSTR_STR);
+		mono_mb_emit_byte (mb, CEE_STIND_I);		
+		break;
+	case MONO_MARSHAL_CONV_STR_LPTSTR:
+	case MONO_MARSHAL_CONV_STR_LPSTR:
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_byte (mb, CEE_LDIND_I);
+		mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+		mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+		mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPSTR_STR);
+		mono_mb_emit_byte (mb, CEE_STIND_I);		
+		break;
+	case MONO_MARSHAL_CONV_OBJECT_STRUCT: {
+		MonoClass *klass = mono_class_from_mono_type (type);
+		int src_var, dst_var;
+
+		src_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+		dst_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+		
+		/* *dst = new object */
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+		mono_mb_emit_byte (mb, CEE_MONO_NEWOBJ);	
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, klass));
+		mono_mb_emit_byte (mb, CEE_STIND_I);
+	
+		/* save the old src pointer */
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_stloc (mb, src_var);
+		/* save the old dst pointer */
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_stloc (mb, dst_var);
+
+		/* dst = pointer to newly created object data */
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDIND_I);
+		mono_mb_emit_icon (mb, sizeof (MonoObject));
+		mono_mb_emit_byte (mb, CEE_ADD);
+		mono_mb_emit_byte (mb, CEE_STLOC_1); 
+
+		emit_struct_conv (mb, klass, TRUE);
+		
+		/* restore the old src pointer */
+		mono_mb_emit_ldloc (mb, src_var);
+		mono_mb_emit_byte (mb, CEE_STLOC_0);
+		/* restore the old dst pointer */
+		mono_mb_emit_ldloc (mb, dst_var);
+		mono_mb_emit_byte (mb, CEE_STLOC_1);
+		break;
+	}
+	case MONO_MARSHAL_CONV_STR_LPWSTR:
+	case MONO_MARSHAL_CONV_STR_BSTR:
+	case MONO_MARSHAL_CONV_STR_ANSIBSTR:
+	case MONO_MARSHAL_CONV_STR_TBSTR:
+	case MONO_MARSHAL_CONV_ARRAY_SAVEARRAY:
+	case MONO_MARSHAL_CONV_ARRAY_LPARRAY:
+	case MONO_MARSHAL_CONV_STR_BYVALWSTR: 
+	case MONO_MARSHAL_CONV_BOOL_VARIANTBOOL:
+	default:
+		g_warning ("marshaling conversion %d not implemented", conv);
+		g_assert_not_reached ();
+	}
+}
+
+static void
+emit_str_to_ptr_conv (MonoMethodBuilder *mb, MonoType *type, MonoMarshalConv conv, int usize, int msize)
+{
+	int pos;
+
+	switch (conv) {
+	case MONO_MARSHAL_CONV_BOOL_I4:
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_byte (mb, CEE_LDIND_U1);
+		mono_mb_emit_byte (mb, CEE_STIND_I4);
+		break;
+	case MONO_MARSHAL_CONV_STR_LPWSTR:
+	case MONO_MARSHAL_CONV_STR_LPSTR:
+	case MONO_MARSHAL_CONV_STR_LPTSTR:
+	case MONO_MARSHAL_CONV_STR_BSTR:
+	case MONO_MARSHAL_CONV_STR_ANSIBSTR:
+	case MONO_MARSHAL_CONV_STR_TBSTR:
+		/* free space if free == true */
+		mono_mb_emit_byte (mb, CEE_LDLOC_2);
+		mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+		mono_mb_emit_byte (mb, 4);
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDIND_I);
+		mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+		mono_mb_emit_byte (mb, CEE_MONO_FREE);
+
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_byte (mb, CEE_LDIND_I);
+		mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+		mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+		mono_mb_emit_byte (mb, conv);
+		mono_mb_emit_byte (mb, CEE_STIND_I);	
+		break;
+	case MONO_MARSHAL_CONV_ARRAY_SAVEARRAY:
+	case MONO_MARSHAL_CONV_ARRAY_LPARRAY:
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_byte (mb, CEE_LDIND_I);
+		mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+		mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+		mono_mb_emit_byte (mb, conv);
+		mono_mb_emit_byte (mb, CEE_STIND_I);	
+		break;
+	case MONO_MARSHAL_CONV_STR_BYVALSTR: 
+	case MONO_MARSHAL_CONV_STR_BYVALWSTR: {
+		if (!usize)
+			break;
+
+		mono_mb_emit_byte (mb, CEE_LDLOC_1); /* dst */
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);	
+		mono_mb_emit_byte (mb, CEE_LDIND_I); /* src String */
+		mono_mb_emit_icon (mb, usize);
+		mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+		mono_mb_emit_byte (mb, CEE_MONO_PROC3);
+		mono_mb_emit_byte (mb, conv);
+		break;
+	}
+	case MONO_MARSHAL_CONV_ARRAY_BYVALARRAY: {
+		if (!usize) 
+			break;
+
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_byte (mb, CEE_LDIND_I);		
+		mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+		pos = mb->pos;
+		mono_mb_emit_byte (mb, 0);
+
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);	
+		mono_mb_emit_byte (mb, CEE_LDIND_I);	
+		mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+		mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
+		mono_mb_emit_icon (mb, G_STRUCT_OFFSET (MonoArray, vector));
+		mono_mb_emit_byte (mb, CEE_ADD);
+		mono_mb_emit_icon (mb, usize);
+		mono_mb_emit_byte (mb, CEE_PREFIX1);
+		mono_mb_emit_byte (mb, CEE_CPBLK);			
+		mono_mb_patch_addr_s (mb, pos, mb->pos - pos - 1);
+		break;
+	}
+	case MONO_MARSHAL_CONV_OBJECT_STRUCT: {
+		int src_var, dst_var;
+
+		src_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+		dst_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+		
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_byte (mb, CEE_LDIND_I);		
+		mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+		pos = mb->pos;
+		mono_mb_emit_byte (mb, 0);
+		
+		/* save the old src pointer */
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_stloc (mb, src_var);
+		/* save the old dst pointer */
+		mono_mb_emit_byte (mb, CEE_LDLOC_1);
+		mono_mb_emit_stloc (mb, dst_var);
+
+		/* src = pointer to object data */
+		mono_mb_emit_byte (mb, CEE_LDLOC_0);
+		mono_mb_emit_byte (mb, CEE_LDIND_I);		
+		mono_mb_emit_icon (mb, sizeof (MonoObject));
+		mono_mb_emit_byte (mb, CEE_ADD);
+		mono_mb_emit_byte (mb, CEE_STLOC_0); 
+
+		emit_struct_conv (mb, mono_class_from_mono_type (type), FALSE);
+		
+		/* restore the old src pointer */
+		mono_mb_emit_ldloc (mb, src_var);
+		mono_mb_emit_byte (mb, CEE_STLOC_0);
+		/* restore the old dst pointer */
+		mono_mb_emit_ldloc (mb, dst_var);
+		mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+		mono_mb_patch_addr_s (mb, pos, mb->pos - pos - 1);
+		break;
+	}
+	case MONO_MARSHAL_CONV_BOOL_VARIANTBOOL:
+	default:
+		g_warning ("marshalling conversion %d not implemented", conv);
+		g_assert_not_reached ();
+	}
+}
+
+static void
+emit_struct_conv (MonoMethodBuilder *mb, MonoClass *klass, gboolean to_object)
+{
+	MonoMarshalType *info;
+	int i;
+
+	info = mono_marshal_load_type_info (klass);
+
+	for (i = 0; i < info->num_fields; i++) {
+		MonoMarshalNative ntype;
+		MonoMarshalConv conv;
+		MonoType *ftype = info->fields [i].field->type;
+		int msize = 0;
+		int usize = 0;
+		gboolean last_field = i < (info->num_fields -1) ? 0 : 1;
+
+		if (ftype->attrs & FIELD_ATTRIBUTE_STATIC)
+			continue;
+
+		ntype = mono_type_to_unmanaged (ftype, info->fields [i].mspec, TRUE, klass->unicode, &conv);
+			
+		if (last_field) {
+			msize = klass->instance_size - info->fields [i].field->offset;
+			usize = info->native_size - info->fields [i].offset;
+		} else {
+			msize = klass->fields [i + 1].offset - info->fields [i].field->offset;
+			usize = info->fields [i + 1].offset - info->fields [i].offset;
+		}
+		g_assert (msize > 0 && usize > 0);
+
+		switch (conv) {
+		case MONO_MARSHAL_CONV_NONE: {
+			int t;
+
+			if (ftype->byref || ftype->type == MONO_TYPE_I ||
+			    ftype->type == MONO_TYPE_U) {
+				mono_mb_emit_byte (mb, CEE_LDLOC_1);
+				mono_mb_emit_byte (mb, CEE_LDLOC_0);
+				mono_mb_emit_byte (mb, CEE_LDIND_I);
+				mono_mb_emit_byte (mb, CEE_STIND_I);
+				break;
+			}
+
+			t = ftype->type;
+		handle_enum:
+			switch (t) {
+			case MONO_TYPE_I4:
+			case MONO_TYPE_U4:
+				mono_mb_emit_byte (mb, CEE_LDLOC_1);
+				mono_mb_emit_byte (mb, CEE_LDLOC_0);
+				mono_mb_emit_byte (mb, CEE_LDIND_I4);
+				mono_mb_emit_byte (mb, CEE_STIND_I4);
+				break;
+			case MONO_TYPE_I1:
+			case MONO_TYPE_U1:
+			case MONO_TYPE_BOOLEAN:
+				mono_mb_emit_byte (mb, CEE_LDLOC_1);
+				mono_mb_emit_byte (mb, CEE_LDLOC_0);
+				mono_mb_emit_byte (mb, CEE_LDIND_I1);
+				mono_mb_emit_byte (mb, CEE_STIND_I1);
+				break;
+			case MONO_TYPE_I2:
+			case MONO_TYPE_U2:
+				mono_mb_emit_byte (mb, CEE_LDLOC_1);
+				mono_mb_emit_byte (mb, CEE_LDLOC_0);
+				mono_mb_emit_byte (mb, CEE_LDIND_I2);
+				mono_mb_emit_byte (mb, CEE_STIND_I2);
+				break;
+			case MONO_TYPE_I8:
+			case MONO_TYPE_U8:
+				mono_mb_emit_byte (mb, CEE_LDLOC_1);
+				mono_mb_emit_byte (mb, CEE_LDLOC_0);
+				mono_mb_emit_byte (mb, CEE_LDIND_I8);
+				mono_mb_emit_byte (mb, CEE_STIND_I8);
+				break;
+			case MONO_TYPE_R4:
+				mono_mb_emit_byte (mb, CEE_LDLOC_1);
+				mono_mb_emit_byte (mb, CEE_LDLOC_0);
+				mono_mb_emit_byte (mb, CEE_LDIND_R4);
+				mono_mb_emit_byte (mb, CEE_STIND_R4);
+				break;
+			case MONO_TYPE_R8:
+				mono_mb_emit_byte (mb, CEE_LDLOC_1);
+				mono_mb_emit_byte (mb, CEE_LDLOC_0);
+				mono_mb_emit_byte (mb, CEE_LDIND_R8);
+				mono_mb_emit_byte (mb, CEE_STIND_R8);
+				break;
+			case MONO_TYPE_VALUETYPE:
+				if (ftype->data.klass->enumtype) {
+					t = ftype->data.klass->enum_basetype->type;
+					goto handle_enum;
+				}
+				emit_struct_conv (mb, ftype->data.klass, to_object);
+				continue;
+			default:
+				g_warning ("marshaling type %02x not implemented", ftype->type);
+				g_assert_not_reached ();
+			}
+			break;
+		}
+		default:
+			if (to_object) 
+				emit_ptr_to_str_conv (mb, ftype, conv, usize, msize);
+			else
+				emit_str_to_ptr_conv (mb, ftype, conv, usize, msize);	
+		}
+		
+		if (to_object) {
+			mono_mb_emit_add_to_local (mb, 0, usize);
+			mono_mb_emit_add_to_local (mb, 1, msize);
+		} else {
+			mono_mb_emit_add_to_local (mb, 0, msize);
+			mono_mb_emit_add_to_local (mb, 1, usize);
+		}				
+	}
+}
+
+static MonoAsyncResult *
+mono_delegate_begin_invoke (MonoDelegate *delegate, gpointer *params)
+{
+	MonoMethodMessage *msg;
+	MonoDelegate *async_callback;
+	MonoObject *state;
+	MonoMethod *im;
+	MonoClass *klass;
+	MonoMethod *method = NULL;
+	int i;
+
+	g_assert (delegate);
+
+	klass = delegate->object.vtable->klass;
+
+	method = mono_get_delegate_invoke (klass);
+	for (i = 0; i < klass->method.count; ++i) {
+		if (klass->methods [i]->name[0] == 'B' && 
+		    !strcmp ("BeginInvoke", klass->methods [i]->name)) {
+			method = klass->methods [i];
+			break;
+		}
+	}
+
+	g_assert (method != NULL);
+
+	im = mono_get_delegate_invoke (method->klass);
+	
+	msg = mono_method_call_message_new (method, params, im, &async_callback, &state);
+
+	return mono_thread_pool_add ((MonoObject *)delegate, msg, async_callback, state);
+}
+
+static int
+mono_mb_emit_save_args (MonoMethodBuilder *mb, MonoMethodSignature *sig, gboolean save_this)
+{
+	int i, params_var, tmp_var;
+
+	/* allocate local (pointer) *params[] */
+	params_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+	/* allocate local (pointer) tmp */
+	tmp_var = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+
+	/* alloate space on stack to store an array of pointers to the arguments */
+	mono_mb_emit_icon (mb, sizeof (gpointer) * (sig->param_count + 1));
+	mono_mb_emit_byte (mb, CEE_PREFIX1);
+	mono_mb_emit_byte (mb, CEE_LOCALLOC);
+	mono_mb_emit_stloc (mb, params_var);
+
+	/* tmp = params */
+	mono_mb_emit_ldloc (mb, params_var);
+	mono_mb_emit_stloc (mb, tmp_var);
+
+	if (save_this && sig->hasthis) {
+		mono_mb_emit_ldloc (mb, tmp_var);
+		mono_mb_emit_ldarg_addr (mb, 0);
+		mono_mb_emit_byte (mb, CEE_STIND_I);
+		/* tmp = tmp + sizeof (gpointer) */
+		if (sig->param_count)
+			mono_mb_emit_add_to_local (mb, tmp_var, sizeof (gpointer));
+
+	}
+
+	for (i = 0; i < sig->param_count; i++) {
+		mono_mb_emit_ldloc (mb, tmp_var);
+		mono_mb_emit_ldarg_addr (mb, i + sig->hasthis);
+		mono_mb_emit_byte (mb, CEE_STIND_I);
+		/* tmp = tmp + sizeof (gpointer) */
+		if (i < (sig->param_count - 1))
+			mono_mb_emit_add_to_local (mb, tmp_var, sizeof (gpointer));
+	}
+
+	return params_var;
+}
+
+static char*
+mono_signature_to_name (MonoMethodSignature *sig, const char *prefix)
+{
+	int i;
+	char *result;
+	GString *res = g_string_new ("");
+
+	if (prefix) {
+		g_string_append (res, prefix);
+		g_string_append_c (res, '_');
+	}
+
+	mono_type_get_desc (res, sig->ret, FALSE);
+
+	for (i = 0; i < sig->param_count; ++i) {
+		g_string_append_c (res, '_');
+		mono_type_get_desc (res, sig->params [i], FALSE);
+	}
+	result = res->str;
+	g_string_free (res, FALSE);
+	return result;
+}
+
+MonoMethod *
+mono_marshal_get_delegate_begin_invoke (MonoMethod *method)
+{
+	MonoMethodSignature *sig;
+	static MonoMethodSignature *csig = NULL;
+	MonoMethodBuilder *mb;
+	MonoMethod *res;
+	GHashTable *cache;
+	int params_var;
+	char *name;
+
+	g_assert (method && method->klass->parent == mono_defaults.multicastdelegate_class &&
+		  !strcmp (method->name, "BeginInvoke"));
+
+	sig = method->signature;
+
+	cache = method->klass->image->delegate_begin_invoke_cache;
+	if ((res = (MonoMethod *)g_hash_table_lookup (cache, sig)))
+		return res;
+
+	g_assert (sig->hasthis);
+
+	if (!csig) {
+		int sigsize = sizeof (MonoMethodSignature) + 2 * sizeof (MonoType *);
+		csig = g_malloc0 (sigsize);
+
+		/* MonoAsyncResult * begin_invoke (MonoDelegate *delegate, gpointer params[]) */
+		csig->param_count = 2;
+		csig->ret = &mono_defaults.object_class->byval_arg;
+		csig->params [0] = &mono_defaults.object_class->byval_arg;
+		csig->params [1] = &mono_defaults.int_class->byval_arg;
+	}
+
+	name = mono_signature_to_name (sig, "begin_invoke");
+	mb = mono_mb_new (mono_defaults.multicastdelegate_class, name);
+	g_free (name);
+
+	mb->method->wrapper_type = MONO_WRAPPER_DELEGATE_BEGIN_INVOKE;
+	mb->method->save_lmf = 1;
+
+	params_var = mono_mb_emit_save_args (mb, sig, FALSE);
+
+	mono_mb_emit_ldarg (mb, 0);
+	mono_mb_emit_ldloc (mb, params_var);
+	mono_mb_emit_native_call (mb, csig, mono_delegate_begin_invoke);
+	mono_mb_emit_byte (mb, CEE_RET);
+
+	res = mono_mb_create_method (mb, sig, sig->param_count + 16);
+	mono_mb_free (mb);
+	g_hash_table_insert (cache, sig, res);
+	return res;
+}
+
+static MonoObject *
+mono_delegate_end_invoke (MonoDelegate *delegate, gpointer *params)
+{
+	MonoDomain *domain = mono_domain_get ();
+	MonoAsyncResult *ares;
+	MonoMethod *method = NULL;
+	MonoMethodSignature *sig;
+	MonoMethodMessage *msg;
+	MonoObject *res, *exc;
+	MonoArray *out_args;
+	MonoClass *klass;
+	int i;
+
+	g_assert (delegate);
+
+	if (!delegate->method_info || !delegate->method_info->method)
+		g_assert_not_reached ();
+
+	klass = delegate->object.vtable->klass;
+
+	for (i = 0; i < klass->method.count; ++i) {
+		if (klass->methods [i]->name[0] == 'E' && 
+		    !strcmp ("EndInvoke", klass->methods [i]->name)) {
+			method = klass->methods [i];
+			break;
+		}
+	}
+
+	g_assert (method != NULL);
+
+	sig = method->signature;
+
+	msg = mono_method_call_message_new (method, params, NULL, NULL, NULL);
+
+	ares = mono_array_get (msg->args, gpointer, sig->param_count - 1);
+	g_assert (ares);
+
+	res = mono_thread_pool_finish (ares, &out_args, &exc);
+
+	if (exc) {
+		char *strace = mono_string_to_utf8 (((MonoException*)exc)->stack_trace);
+		char  *tmp;
+		tmp = g_strdup_printf ("%s\nException Rethrown at:\n", strace);
+		g_free (strace);	
+		((MonoException*)exc)->stack_trace = mono_string_new (domain, tmp);
+		g_free (tmp);
+		mono_raise_exception ((MonoException*)exc);
+	}
+
+	mono_method_return_message_restore (method, params, out_args);
+	return res;
+}
+
+static void
+mono_mb_emit_restore_result (MonoMethodBuilder *mb, MonoType *return_type)
+{
+	if (return_type->byref)
+		return_type = &mono_defaults.int_class->byval_arg;
+	else if (return_type->type == MONO_TYPE_VALUETYPE && return_type->data.klass->enumtype)
+		return_type = return_type->data.klass->enum_basetype;
+
+	switch (return_type->type) {
+	case MONO_TYPE_VOID:
+		g_assert_not_reached ();
+		break;
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_CLASS: 
+	case MONO_TYPE_OBJECT: 
+	case MONO_TYPE_ARRAY: 
+	case MONO_TYPE_SZARRAY: 
+		/* nothing to do */
+		break;
+	case MONO_TYPE_U1:
+	case MONO_TYPE_BOOLEAN:
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (return_type)));
+		mono_mb_emit_byte (mb, CEE_LDIND_U1);
+		break;
+	case MONO_TYPE_I1:
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (return_type)));
+		mono_mb_emit_byte (mb, CEE_LDIND_I1);
+		break;
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR:
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (return_type)));
+		mono_mb_emit_byte (mb, CEE_LDIND_U2);
+		break;
+	case MONO_TYPE_I2:
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (return_type)));
+		mono_mb_emit_byte (mb, CEE_LDIND_I2);
+		break;
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (return_type)));
+		mono_mb_emit_byte (mb, CEE_LDIND_I);
+		break;
+	case MONO_TYPE_I4:
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (return_type)));
+		mono_mb_emit_byte (mb, CEE_LDIND_I4);
+		break;
+	case MONO_TYPE_U4:
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (return_type)));
+		mono_mb_emit_byte (mb, CEE_LDIND_U4);
+		break;
+	case MONO_TYPE_U8:
+	case MONO_TYPE_I8:
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (return_type)));
+		mono_mb_emit_byte (mb, CEE_LDIND_I8);
+		break;
+	case MONO_TYPE_R4:
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (return_type)));
+		mono_mb_emit_byte (mb, CEE_LDIND_R4);
+		break;
+	case MONO_TYPE_R8:
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (return_type)));
+		mono_mb_emit_byte (mb, CEE_LDIND_R8);
+		break;
+	case MONO_TYPE_VALUETYPE: {
+		int class;
+		mono_mb_emit_byte (mb, CEE_UNBOX);
+		class = mono_mb_add_data (mb, mono_class_from_mono_type (return_type));
+		mono_mb_emit_i4 (mb, class);
+		mono_mb_emit_byte (mb, CEE_LDOBJ);
+		mono_mb_emit_i4 (mb, class);
+		break;
+	}
+	default:
+		g_warning ("type 0x%x not handled", return_type->type);
+		g_assert_not_reached ();
+	}
+
+	mono_mb_emit_byte (mb, CEE_RET);
+}
+
+MonoMethod *
+mono_marshal_get_delegate_end_invoke (MonoMethod *method)
+{
+	MonoMethodSignature *sig;
+	static MonoMethodSignature *csig = NULL;
+	MonoMethodBuilder *mb;
+	MonoMethod *res;
+	GHashTable *cache;
+	int params_var;
+	char *name;
+
+	g_assert (method && method->klass->parent == mono_defaults.multicastdelegate_class &&
+		  !strcmp (method->name, "EndInvoke"));
+
+	sig = method->signature;
+
+	cache = method->klass->image->delegate_end_invoke_cache;
+	if ((res = (MonoMethod *)g_hash_table_lookup (cache, sig)))
+		return res;
+
+	g_assert (sig->hasthis);
+
+	if (!csig) {
+		int sigsize = sizeof (MonoMethodSignature) + 2 * sizeof (MonoType *);
+		csig = g_malloc0 (sigsize);
+
+		/* MonoObject *end_invoke (MonoDelegate *delegate, gpointer params[]) */
+		csig->param_count = 2;
+		csig->ret = &mono_defaults.object_class->byval_arg;
+		csig->params [0] = &mono_defaults.object_class->byval_arg;
+		csig->params [1] = &mono_defaults.int_class->byval_arg;
+	}
+
+	name = mono_signature_to_name (sig, "end_invoke");
+	mb = mono_mb_new (mono_defaults.multicastdelegate_class, name);
+	g_free (name);
+
+	mb->method->wrapper_type = MONO_WRAPPER_DELEGATE_END_INVOKE;
+	mb->method->save_lmf = 1;
+
+	params_var = mono_mb_emit_save_args (mb, sig, FALSE);
+
+	mono_mb_emit_ldarg (mb, 0);
+	mono_mb_emit_ldloc (mb, params_var);
+	mono_mb_emit_native_call (mb, csig, mono_delegate_end_invoke);
+
+	if (sig->ret->type == MONO_TYPE_VOID) {
+		mono_mb_emit_byte (mb, CEE_POP);
+		mono_mb_emit_byte (mb, CEE_RET);
+	} else
+		mono_mb_emit_restore_result (mb, sig->ret);
+
+	res = mono_mb_create_method (mb, sig, sig->param_count + 16);
+	mono_mb_free (mb);
+	g_hash_table_insert (cache, sig, res);
+
+	return res;
+}
+
+static MonoObject *
+mono_remoting_wrapper (MonoMethod *method, gpointer *params)
+{
+	MonoMethodMessage *msg;
+	MonoTransparentProxy *this;
+	MonoObject *res, *exc;
+	MonoArray *out_args;
+
+	this = *((MonoTransparentProxy **)params [0]);
+
+	g_assert (this);
+	g_assert (((MonoObject *)this)->vtable->klass == mono_defaults.transparent_proxy_class);
+	
+	/* skip the this pointer */
+	params++;
+
+	msg = mono_method_call_message_new (method, params, NULL, NULL, NULL);
+
+	res = mono_remoting_invoke ((MonoObject *)this->rp, msg, &exc, &out_args);
+
+	if (exc)
+		mono_raise_exception ((MonoException *)exc);
+
+	mono_method_return_message_restore (method, params, out_args);
+
+	return res;
+} 
+
+MonoMethod *
+mono_marshal_get_remoting_invoke (MonoMethod *method)
+{
+	MonoMethodSignature *sig;
+	static MonoMethodSignature *csig = NULL;
+	MonoMethodBuilder *mb;
+	MonoMethod *res;
+	GHashTable *cache;
+	int params_var;
+
+	g_assert (method);
+
+	if (method->wrapper_type == MONO_WRAPPER_REMOTING_INVOKE)
+		return method;
+
+	sig = method->signature;
+
+	/* we cant remote methods without this pointer */
+	if (!sig->hasthis)
+		return method;
+
+	cache = method->klass->image->remoting_invoke_cache;
+	if ((res = (MonoMethod *)g_hash_table_lookup (cache, method)))
+		return res;
+
+	if (!csig) {
+		int sigsize = sizeof (MonoMethodSignature) + 2 * sizeof (MonoType *);
+		csig = g_malloc0 (sigsize);
+
+		/* MonoObject *remoting_wrapper (MonoMethod *method, gpointer params[]) */
+		csig->param_count = 2;
+		csig->ret = &mono_defaults.object_class->byval_arg;
+		csig->params [0] = &mono_defaults.int_class->byval_arg;
+		csig->params [1] = &mono_defaults.int_class->byval_arg;
+	}
+
+	mb = mono_mb_new (method->klass, method->name);
+	mb->method->wrapper_type = MONO_WRAPPER_REMOTING_INVOKE;
+	mb->method->save_lmf = 1;
+
+	params_var = mono_mb_emit_save_args (mb, sig, TRUE);
+
+	mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+	mono_mb_emit_byte (mb, CEE_MONO_LDPTR);
+	mono_mb_emit_i4 (mb, mono_mb_add_data (mb, method));
+	mono_mb_emit_ldloc (mb, params_var);
+	mono_mb_emit_native_call (mb, csig, mono_remoting_wrapper);
+
+	if (sig->ret->type == MONO_TYPE_VOID)
+		mono_mb_emit_byte (mb, CEE_POP);
+	else
+		mono_mb_emit_restore_result (mb, sig->ret);
+
+	res = mono_mb_create_method (mb, sig, sig->param_count + 16);
+	mono_mb_free (mb);
+	g_hash_table_insert (cache, method, res);
+	return res;
+}
+
+/*
+ * the returned method invokes all methods in a multicast delegate 
+ */
+MonoMethod *
+mono_marshal_get_delegate_invoke (MonoMethod *method)
+{
+	MonoMethodSignature *sig, *static_sig;
+	int i, sigsize;
+	MonoMethodBuilder *mb;
+	MonoMethod *res;
+	GHashTable *cache;
+	int pos0, pos1;
+	char *name;
+
+	g_assert (method && method->klass->parent == mono_defaults.multicastdelegate_class &&
+		  !strcmp (method->name, "Invoke"));
+		
+	sig = method->signature;
+
+	cache = method->klass->image->delegate_invoke_cache;
+	if ((res = (MonoMethod *)g_hash_table_lookup (cache, sig)))
+		return res;
+
+	sigsize = sizeof (MonoMethodSignature) + sig->param_count * sizeof (MonoType *);
+	static_sig = g_memdup (sig, sigsize);
+	static_sig->hasthis = 0;
+
+	name = mono_signature_to_name (sig, "invoke");
+	mb = mono_mb_new (mono_defaults.multicastdelegate_class, name);
+	g_free (name);
+
+	mb->method->wrapper_type = MONO_WRAPPER_DELEGATE_INVOKE;
+
+	/* allocate local 0 (object) */
+	mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+
+	g_assert (sig->hasthis);
+	
+	/*
+	 * if (prev != null)
+         *	prev.Invoke( args .. );
+	 * return this.<target>( args .. );
+         */
+
+	/* get this->prev */
+	mono_mb_emit_ldarg (mb, 0);
+	mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoMulticastDelegate, prev));
+	mono_mb_emit_byte (mb, CEE_LDIND_I );
+	mono_mb_emit_stloc (mb, 0);
+
+	/* if prev != null */
+	mono_mb_emit_ldloc (mb, 0);
+	mono_mb_emit_byte (mb, CEE_BRFALSE);
+
+	pos0 = mb->pos;
+	mono_mb_emit_i4 (mb, 0);
+
+	/* then recurse */
+	mono_mb_emit_ldloc (mb, 0);
+	for (i = 0; i < sig->param_count; i++)
+		mono_mb_emit_ldarg (mb, i + 1);
+	mono_mb_emit_managed_call (mb, method, method->signature);
+	if (sig->ret->type != MONO_TYPE_VOID)
+		mono_mb_emit_byte (mb, CEE_POP);
+
+	/* continued or prev == null */
+	mono_mb_patch_addr (mb, pos0, mb->pos - (pos0 + 4));
+
+	/* get this->target */
+	mono_mb_emit_ldarg (mb, 0);
+	mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoDelegate, target));
+	mono_mb_emit_byte (mb, CEE_LDIND_I );
+	mono_mb_emit_stloc (mb, 0);
+
+	/* if target != null */
+	mono_mb_emit_ldloc (mb, 0);
+	mono_mb_emit_byte (mb, CEE_BRFALSE);
+	pos0 = mb->pos;
+	mono_mb_emit_i4 (mb, 0);
+	
+	/* then call this->method_ptr nonstatic */
+	mono_mb_emit_ldloc (mb, 0); 
+	for (i = 0; i < sig->param_count; ++i)
+		mono_mb_emit_ldarg (mb, i + 1);
+	mono_mb_emit_ldarg (mb, 0);
+	mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoDelegate, method_ptr));
+	mono_mb_emit_byte (mb, CEE_LDIND_I );
+	mono_mb_emit_byte (mb, CEE_CALLI);
+	mono_mb_emit_i4 (mb, mono_mb_add_data (mb, sig));
+
+	mono_mb_emit_byte (mb, CEE_BR);
+	pos1 = mb->pos;
+	mono_mb_emit_i4 (mb, 0);
+
+	/* else [target == null] call this->method_ptr static */
+	mono_mb_patch_addr (mb, pos0, mb->pos - (pos0 + 4));
+
+	for (i = 0; i < sig->param_count; ++i)
+		mono_mb_emit_ldarg (mb, i + 1);
+	mono_mb_emit_ldarg (mb, 0);
+	mono_mb_emit_ldflda (mb, G_STRUCT_OFFSET (MonoDelegate, method_ptr));
+	mono_mb_emit_byte (mb, CEE_LDIND_I );
+	mono_mb_emit_byte (mb, CEE_CALLI);
+	mono_mb_emit_i4 (mb, mono_mb_add_data (mb, static_sig));
+
+	/* return */
+	mono_mb_patch_addr (mb, pos1, mb->pos - (pos1 + 4));
+	mono_mb_emit_byte (mb, CEE_RET);
+
+	res = mono_mb_create_method (mb, sig, sig->param_count + 16);
+	mono_mb_free (mb);
+
+	g_hash_table_insert (cache, sig, res);
+
+	return res;	
+}
+
+/*
+ * generates IL code for the runtime invoke function 
+ * MonoObject *runtime_invoke (MonoObject *this, void **params, MonoObject **exc)
+ *
+ * we also catch exceptions if exc != null
+ */
+MonoMethod *
+mono_marshal_get_runtime_invoke (MonoMethod *method)
+{
+	MonoMethodSignature *sig, *csig;
+	MonoExceptionClause *clause;
+	MonoMethodHeader *header;
+	MonoMethodBuilder *mb;
+	MonoMethod *res;
+	GHashTable *cache;
+	static MonoString *string_dummy = NULL;
+	int i, pos, sigsize;
+
+	g_assert (method);
+
+	cache = method->klass->image->runtime_invoke_cache;
+	if ((res = (MonoMethod *)g_hash_table_lookup (cache, method)))
+		return res;
+	
+	/* to make it work with our special string constructors */
+	if (!string_dummy)
+		string_dummy = mono_string_new_wrapper ("dummy");
+
+	sig = method->signature;
+
+	sigsize = sizeof (MonoMethodSignature) + 3 * sizeof (MonoType *);
+	csig = g_malloc0 (sigsize);
+
+	csig->param_count = 3;
+	csig->ret = &mono_defaults.object_class->byval_arg;
+	csig->params [0] = &mono_defaults.object_class->byval_arg;
+	csig->params [1] = &mono_defaults.int_class->byval_arg;
+	csig->params [2] = &mono_defaults.int_class->byval_arg;
+
+	mb = mono_mb_new (method->klass, method->name);
+	mb->method->wrapper_type = MONO_WRAPPER_RUNTIME_INVOKE;
+
+	/* allocate local 0 (object) tmp */
+	mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+	/* allocate local 1 (object) exc */
+	mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+
+	/* cond set *exc to null */
+	mono_mb_emit_byte (mb, CEE_LDARG_2);
+	mono_mb_emit_byte (mb, CEE_BRFALSE_S);
+	mono_mb_emit_byte (mb, 3);	
+	mono_mb_emit_byte (mb, CEE_LDARG_2);
+	mono_mb_emit_byte (mb, CEE_LDNULL);
+	mono_mb_emit_byte (mb, CEE_STIND_I);
+
+	if (sig->hasthis) {
+		if (method->string_ctor) {
+			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+			mono_mb_emit_byte (mb, CEE_MONO_LDPTR);
+			mono_mb_emit_i4 (mb, mono_mb_add_data (mb, string_dummy));
+		} else {
+			mono_mb_emit_ldarg (mb, 0);
+			if (method->klass->valuetype) {
+				mono_mb_emit_byte (mb, CEE_UNBOX);
+				mono_mb_emit_i4 (mb, mono_mb_add_data (mb, method->klass));
+			} 
+		}
+	}
+
+	for (i = 0; i < sig->param_count; i++) {
+		MonoType *t = sig->params [i];
+		int type;
+
+		mono_mb_emit_ldarg (mb, 1);
+		if (i) {
+			mono_mb_emit_icon (mb, sizeof (gpointer) * i);
+			mono_mb_emit_byte (mb, CEE_ADD);
+		}
+		mono_mb_emit_byte (mb, CEE_LDIND_I);
+
+		if (t->byref)
+			continue;
+
+		type = sig->params [i]->type;
+handle_enum:
+		switch (type) {
+		case MONO_TYPE_I1:
+			mono_mb_emit_byte (mb, CEE_LDIND_I1);
+			break;
+		case MONO_TYPE_BOOLEAN:
+		case MONO_TYPE_U1:
+			mono_mb_emit_byte (mb, CEE_LDIND_U1);
+			break;
+		case MONO_TYPE_I2:
+			mono_mb_emit_byte (mb, CEE_LDIND_I2);
+			break;
+		case MONO_TYPE_U2:
+		case MONO_TYPE_CHAR:
+			mono_mb_emit_byte (mb, CEE_LDIND_U2);
+			break;
+		case MONO_TYPE_I:
+		case MONO_TYPE_U:
+			mono_mb_emit_byte (mb, CEE_LDIND_I);
+			break;
+		case MONO_TYPE_I4:
+			mono_mb_emit_byte (mb, CEE_LDIND_I4);
+			break;
+		case MONO_TYPE_U4:
+			mono_mb_emit_byte (mb, CEE_LDIND_U4);
+			break;
+		case MONO_TYPE_R4:
+			mono_mb_emit_byte (mb, CEE_LDIND_R4);
+			break;
+		case MONO_TYPE_R8:
+			mono_mb_emit_byte (mb, CEE_LDIND_R8);
+			break;
+		case MONO_TYPE_I8:
+		case MONO_TYPE_U8:
+			mono_mb_emit_byte (mb, CEE_LDIND_I8);
+			break;
+		case MONO_TYPE_STRING:
+		case MONO_TYPE_CLASS:  
+		case MONO_TYPE_ARRAY:
+		case MONO_TYPE_PTR:
+		case MONO_TYPE_SZARRAY:
+		case MONO_TYPE_OBJECT:
+			/* do nothing */
+			break;
+		case MONO_TYPE_VALUETYPE:
+			if (t->data.klass->enumtype) {
+				type = t->data.klass->enum_basetype->type;
+				goto handle_enum;
+			}
+			mono_mb_emit_byte (mb, CEE_LDOBJ);
+			mono_mb_emit_i4 (mb, mono_mb_add_data (mb, t->data.klass));
+			break;
+		default:
+			g_assert_not_reached ();
+		}		
+	}
+
+	if (method->string_ctor) {
+		MonoMethodSignature *strsig;
+
+		sigsize = sizeof (MonoMethodSignature) + sig->param_count * sizeof (MonoType *);
+		strsig = g_memdup (sig, sigsize);
+		strsig->ret = &mono_defaults.string_class->byval_arg;
+
+		mono_mb_emit_managed_call (mb, method, strsig);		
+	} else 
+		mono_mb_emit_managed_call (mb, method, NULL);
+
+	if (sig->ret->byref) {
+		/* fixme: */
+		g_assert_not_reached ();
+	}
+
+
+	switch (sig->ret->type) {
+	case MONO_TYPE_VOID:
+		if (!method->string_ctor)
+			mono_mb_emit_byte (mb, CEE_LDNULL);
+		break;
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4:
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+	case MONO_TYPE_R4:
+	case MONO_TYPE_R8:
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+	case MONO_TYPE_VALUETYPE:
+		/* box value types */
+		mono_mb_emit_byte (mb, CEE_BOX);
+		mono_mb_emit_i4 (mb, mono_mb_add_data (mb, mono_class_from_mono_type (sig->ret)));
+		break;
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_CLASS:  
+	case MONO_TYPE_ARRAY:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_OBJECT:
+		/* nothing to do */
+		break;
+	case MONO_TYPE_PTR:
+	default:
+		g_assert_not_reached ();
+	}
+
+	mono_mb_emit_stloc (mb, 0);
+       		
+	mono_mb_emit_byte (mb, CEE_LEAVE);
+	pos = mb->pos;
+	mono_mb_emit_i4 (mb, 0);
+
+	clause = g_new0 (MonoExceptionClause, 1);
+	clause->flags = MONO_EXCEPTION_CLAUSE_FILTER;
+	clause->try_len = mb->pos;
+
+	/* filter code */
+	clause->token_or_filter = mb->pos;
+	
+	mono_mb_emit_byte (mb, CEE_POP);
+	mono_mb_emit_byte (mb, CEE_LDARG_2);
+	mono_mb_emit_byte (mb, CEE_PREFIX1);
+	mono_mb_emit_byte (mb, CEE_ENDFILTER);
+
+	clause->handler_offset = mb->pos;
+
+	/* handler code */
+	/* store exception */
+	mono_mb_emit_stloc (mb, 1);
+	
+	mono_mb_emit_byte (mb, CEE_LDARG_2);
+	mono_mb_emit_ldloc (mb, 1);
+	mono_mb_emit_byte (mb, CEE_STIND_I);
+
+	mono_mb_emit_byte (mb, CEE_LEAVE);
+	mono_mb_emit_i4 (mb, 0);
+
+	clause->handler_len = mb->pos - clause->handler_offset;
+
+	/* return result */
+	mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
+	mono_mb_emit_ldloc (mb, 0);
+	mono_mb_emit_byte (mb, CEE_RET);
+	
+	res = mono_mb_create_method (mb, csig, sig->param_count + 16);
+	mono_mb_free (mb);
+
+	header = ((MonoMethodNormal *)res)->header;
+	header->num_clauses = 1;
+	header->clauses = clause;
+
+	g_hash_table_insert (cache, method, res);
+
+	return res;	
+}
+
+/*
+ * generates IL code to call managed methods from unmanaged code 
+ */
+MonoMethod *
+mono_marshal_get_managed_wrapper (MonoMethod *method, MonoObject *this)
+{
+	MonoMethodSignature *sig, *csig;
+	MonoMethodBuilder *mb;
+	MonoClass *klass;
+	MonoMethod *res;
+	GHashTable *cache;
+	int i, pos, sigsize, *tmp_locals;
+
+	g_assert (method != NULL);
+
+	cache = method->klass->image->managed_wrapper_cache;
+	if ((res = (MonoMethod *)g_hash_table_lookup (cache, method)))
+		return res;
+
+	sig = method->signature;
+
+	mb = mono_mb_new (method->klass, method->name);
+	mb->method->wrapper_type = MONO_WRAPPER_NATIVE_TO_MANAGED;
+
+	/* allocate local 0 (pointer) src_ptr */
+	mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+	/* allocate local 1 (pointer) dst_ptr */
+	mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+	/* allocate local 2 (boolean) delete_old */
+	mono_mb_add_local (mb, &mono_defaults.boolean_class->byval_arg);
+
+	mono_mb_emit_byte (mb, CEE_LDNULL);
+	mono_mb_emit_byte (mb, CEE_STLOC_2);
+
+	/* we copy the signature, so that we can modify it */
+	sigsize = sizeof (MonoMethodSignature) + sig->param_count * sizeof (MonoType *);
+	csig = g_memdup (sig, sigsize);
+	csig->hasthis = 0;
+	csig->pinvoke = 1;
+
+	/* fixme: howto handle this ? */
+	if (sig->hasthis) {
+
+		if (this) {
+			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+			mono_mb_emit_byte (mb, CEE_MONO_LDPTR);
+			mono_mb_emit_i4 (mb, mono_mb_add_data (mb, this));
+
+
+		} else {
+			/* fixme: */
+			g_assert_not_reached ();
+		}
+	} 
+
+
+	/* we first do all conversions */
+	tmp_locals = alloca (sizeof (int) * sig->param_count);
+	for (i = 0; i < sig->param_count; i ++) {
+		MonoType *t = sig->params [i];
+
+		tmp_locals [i] = 0;
+		
+		switch (t->type) {
+		case MONO_TYPE_VALUETYPE:
+			
+			klass = sig->params [i]->data.klass;
+			if (klass->blittable || klass->enumtype)
+				break;
+
+			tmp_locals [i] = mono_mb_add_local (mb, &klass->byval_arg);
+
+			if (t->byref) 
+				mono_mb_emit_ldarg (mb, i);
+			else
+				mono_mb_emit_ldarg_addr (mb, i);
+			mono_mb_emit_byte (mb, CEE_STLOC_0);
+
+			if (t->byref) {
+				mono_mb_emit_byte (mb, CEE_LDLOC_0);
+				mono_mb_emit_byte (mb, CEE_BRFALSE);
+				pos = mb->pos;
+				mono_mb_emit_i4 (mb, 0);
+			}			
+
+			mono_mb_emit_ldloc_addr (mb, tmp_locals [i]);
+			mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+			/* emit valuetype convnversion code code */
+			emit_struct_conv (mb, klass, TRUE);
+
+			if (t->byref)
+				mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
+			break;
+		case MONO_TYPE_STRING:
+			if (t->byref)
+				continue;
+
+			tmp_locals [i] = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+			csig->params [i] = &mono_defaults.int_class->byval_arg;
+
+			mono_mb_emit_ldarg (mb, i);
+			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+			mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+			mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPSTR_STR);
+			mono_mb_emit_stloc (mb, tmp_locals [i]);
+			break;	
+		case MONO_TYPE_ARRAY:
+		case MONO_TYPE_SZARRAY:
+			if (t->byref)
+				continue;
+
+			klass = mono_class_from_mono_type (t);
+
+			tmp_locals [i] = mono_mb_add_local (mb, &mono_defaults.object_class->byval_arg);
+			csig->params [i] = &mono_defaults.int_class->byval_arg;
+
+			g_warning ("array marshaling not implemented");
+			g_assert_not_reached ();
+			break;
+		}
+	}
+
+	for (i = 0; i < sig->param_count; i++) {
+		MonoType *t = sig->params [i];
+
+		switch (t->type) {
+		case MONO_TYPE_I1:
+		case MONO_TYPE_U1:
+		case MONO_TYPE_I2:
+		case MONO_TYPE_U2:
+		case MONO_TYPE_I4:
+		case MONO_TYPE_U4:
+		case MONO_TYPE_I:
+		case MONO_TYPE_U:
+		case MONO_TYPE_PTR:
+		case MONO_TYPE_R4:
+		case MONO_TYPE_R8:
+		case MONO_TYPE_I8:
+		case MONO_TYPE_U8:
+			mono_mb_emit_ldarg (mb, i);
+			break;
+		case MONO_TYPE_STRING:
+			if (t->byref) {
+				mono_mb_emit_ldarg (mb, i);
+			} else {
+				g_assert (tmp_locals [i]);
+				mono_mb_emit_ldloc (mb, tmp_locals [i]);
+			}
+			break;	
+		case MONO_TYPE_CLASS:  
+		case MONO_TYPE_ARRAY:
+		case MONO_TYPE_SZARRAY:
+		case MONO_TYPE_OBJECT:
+			/* fixme: conversions ? */
+			mono_mb_emit_ldarg (mb, i);
+			break;
+		case MONO_TYPE_VALUETYPE:
+			klass = sig->params [i]->data.klass;
+			if (klass->blittable || klass->enumtype) {
+				mono_mb_emit_ldarg (mb, i);
+				break;
+			}
+
+			g_assert (tmp_locals [i]);
+			if (t->byref)
+				mono_mb_emit_ldloc_addr (mb, tmp_locals [i]);
+			else
+				mono_mb_emit_ldloc (mb, tmp_locals [i]);
+			break;
+		default:
+			g_warning ("type 0x%02x unknown", t->type);	
+			g_assert_not_reached ();
+		}
+	}
+
+	mono_mb_emit_managed_call (mb, method, NULL);
+
+	if (!sig->ret->byref) { 
+		switch (sig->ret->type) {
+		case MONO_TYPE_VOID:
+		case MONO_TYPE_BOOLEAN:
+		case MONO_TYPE_I1:
+		case MONO_TYPE_U1:
+		case MONO_TYPE_I2:
+		case MONO_TYPE_U2:
+		case MONO_TYPE_I4:
+		case MONO_TYPE_U4:
+		case MONO_TYPE_I:
+		case MONO_TYPE_U:
+		case MONO_TYPE_PTR:
+		case MONO_TYPE_R4:
+		case MONO_TYPE_R8:
+		case MONO_TYPE_I8:
+		case MONO_TYPE_U8:
+			/* do nothing */
+			break;
+		case MONO_TYPE_STRING:		
+			csig->ret = &mono_defaults.int_class->byval_arg;
+
+			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+			mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+			mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_STR_LPSTR);
+			break;
+		case MONO_TYPE_VALUETYPE: {
+			int tmp;
+			klass = sig->ret->data.klass;
+			if (klass->blittable || klass->enumtype)
+				break;
+			
+			/* load pointer to returned value type */
+			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+			mono_mb_emit_byte (mb, CEE_MONO_VTADDR);
+			
+			/* store the address of the source into local variable 0 */
+			mono_mb_emit_byte (mb, CEE_STLOC_0);
+			/* allocate space for the native struct and
+			 * store the address into dst_ptr */
+			tmp = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+			g_assert (tmp);
+			mono_mb_emit_icon (mb, mono_class_native_size (klass, NULL));
+			mono_mb_emit_byte (mb, CEE_PREFIX1);
+			mono_mb_emit_byte (mb, CEE_LOCALLOC);
+			mono_mb_emit_byte (mb, CEE_STLOC_1);
+			mono_mb_emit_byte (mb, CEE_LDLOC_1);
+			mono_mb_emit_stloc (mb, tmp);
+
+			/* emit valuetype conversion code */
+			emit_struct_conv (mb, klass, FALSE);
+			mono_mb_emit_ldloc (mb, tmp);
+			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+			mono_mb_emit_byte (mb, CEE_MONO_RETOBJ);
+			mono_mb_emit_i4 (mb, mono_mb_add_data (mb, klass));
+			break;
+		}
+		default:
+			g_warning ("return type 0x%02x unknown", sig->ret->type);	
+			g_assert_not_reached ();
+		}
+	}
+
+	mono_mb_emit_byte (mb, CEE_RET);
+
+	res = mono_mb_create_method (mb, csig, sig->param_count + 16);
+	mono_mb_free (mb);
+
+	g_hash_table_insert (cache, method, res);
+
+	return res;
+}
+
+/*
+ * generates IL code for the pinvoke wrapper (the generated method
+ * calls the unamnage code in method->addr)
+ */
+MonoMethod *
+mono_marshal_get_native_wrapper (MonoMethod *method)
+{
+	MonoMethodSignature *sig, *csig;
+	MonoMethodBuilder *mb;
+	MonoMethod *res;
+	GHashTable *cache;
+	MonoClass *klass;
+	gboolean pinvoke = FALSE;
+	int i, pos, argnum, *tmp_locals;
+	int type, sigsize;
+
+	g_assert (method != NULL);
+
+	cache = method->klass->image->native_wrapper_cache;
+	if ((res = (MonoMethod *)g_hash_table_lookup (cache, method)))
+		return res;
+
+	sig = method->signature;
+
+	if (!(method->iflags & METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL) &&
+	    (method->flags & METHOD_ATTRIBUTE_PINVOKE_IMPL))
+		pinvoke = TRUE;
+
+	mb = mono_mb_new (method->klass, method->name);
+	mb->method->wrapper_type = MONO_WRAPPER_MANAGED_TO_NATIVE;
+
+	mb->method->save_lmf = 1;
+
+	if (pinvoke && !method->addr)
+		mono_lookup_pinvoke_call (method);
+
+	if (!method->addr) {
+		mono_mb_emit_exception (mb);
+		res = mono_mb_create_method (mb, sig, sig->param_count + 16);
+		mono_mb_free (mb);
+		g_hash_table_insert (cache, method, res);
+		return res;
+	}
+
+	/* we copy the signature, so that we can modify it */
+	sigsize = sizeof (MonoMethodSignature) + sig->param_count * sizeof (MonoType *);
+	csig = g_memdup (sig, sigsize);
+
+	/* internal calls: we simply push all arguments and call the method (no conversions) */
+	if (method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME)) {
+
+		/* hack - string constructors returns a value */
+		if (method->string_ctor)
+			csig->ret = &mono_defaults.string_class->byval_arg;
+
+		if (sig->hasthis)
+			mono_mb_emit_byte (mb, CEE_LDARG_0);
+
+		for (i = 0; i < sig->param_count; i++)
+			mono_mb_emit_ldarg (mb, i + sig->hasthis);
+
+		g_assert (method->addr);
+		mono_mb_emit_native_call (mb, csig, method->addr);
+
+		mono_mb_emit_byte (mb, CEE_RET);
+
+		res = mono_mb_create_method (mb, csig, sig->param_count + 16);
+		mono_mb_free (mb);
+		g_hash_table_insert (cache, method, res);
+		return res;
+	}
+
+	g_assert (pinvoke);
+
+	/* pinvoke: we need to convert the arguments if necessary */
+
+	csig->pinvoke = 1;
+
+	/* we allocate local for use with emit_struct_conv() */
+	/* allocate local 0 (pointer) src_ptr */
+	mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+	/* allocate local 1 (pointer) dst_ptr */
+	mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+	/* allocate local 2 (boolean) delete_old */
+	mono_mb_add_local (mb, &mono_defaults.boolean_class->byval_arg);
+
+	/* delete_old = FALSE */
+	mono_mb_emit_icon (mb, 0);
+	mono_mb_emit_byte (mb, CEE_STLOC_2);
+
+	if (sig->ret->type != MONO_TYPE_VOID) {
+		/* allocate local 3 to store the return value */
+		mono_mb_add_local (mb, sig->ret);
+	}
+
+	/* we first do all conversions */
+	tmp_locals = alloca (sizeof (int) * sig->param_count);
+	for (i = 0; i < sig->param_count; i ++) {
+		MonoType *t = sig->params [i];
+
+		argnum = i + sig->hasthis;
+		tmp_locals [i] = 0;
+
+		switch (t->type) {
+		case MONO_TYPE_VALUETYPE:			
+			klass = t->data.klass;
+			if (klass->blittable || klass->enumtype)
+				break;
+
+			tmp_locals [i] = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+			
+			/* store the address of the source into local variable 0 */
+			if (t->byref)
+				mono_mb_emit_ldarg (mb, argnum);
+			else
+				mono_mb_emit_ldarg_addr (mb, argnum);
+
+			mono_mb_emit_byte (mb, CEE_STLOC_0);
+			
+			if (t->byref) {
+				mono_mb_emit_byte (mb, CEE_LDLOC_0);
+				mono_mb_emit_byte (mb, CEE_BRFALSE);
+				pos = mb->pos;
+				mono_mb_emit_i4 (mb, 0);
+			}
+
+			/* allocate space for the native struct and
+			 * store the address into local variable 1 (dest) */
+			mono_mb_emit_icon (mb, mono_class_native_size (klass, NULL));
+			mono_mb_emit_byte (mb, CEE_PREFIX1);
+			mono_mb_emit_byte (mb, CEE_LOCALLOC);
+			mono_mb_emit_stloc (mb, tmp_locals [i]);
+			/* set dst_ptr */
+			mono_mb_emit_ldloc (mb, tmp_locals [i]);
+			mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+			/* emit valuetype conversion code */
+			emit_struct_conv (mb, klass, FALSE);
+			
+			if (t->byref)
+				mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
+			break;
+		case MONO_TYPE_STRING:
+			if (t->byref)
+				continue;
+
+			csig->params [argnum] = &mono_defaults.int_class->byval_arg;
+			tmp_locals [i] = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+
+			mono_mb_emit_ldarg (mb, argnum);
+			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+			mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+			mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_STR_LPSTR);
+			mono_mb_emit_stloc (mb, tmp_locals [i]);
+			break;
+		case MONO_TYPE_CLASS:
+		case MONO_TYPE_OBJECT:
+			if (t->byref)
+				continue;
+
+			csig->params [argnum] = &mono_defaults.int_class->byval_arg;
+			tmp_locals [i] = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+
+			mono_mb_emit_ldarg (mb, argnum);
+			mono_mb_emit_byte (mb, CEE_BRFALSE);
+			pos = mb->pos;
+			mono_mb_emit_i4 (mb, 0);
+
+			if (t->data.klass->delegate) {
+				mono_mb_emit_ldarg (mb, argnum);
+				mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+				mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+				mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_DEL_FTN);
+				mono_mb_emit_stloc (mb, tmp_locals [i]);
+			} else if (t->data.klass == mono_defaults.stringbuilder_class) {
+				mono_mb_emit_ldarg (mb, argnum);
+				mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+				mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+				mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_SB_LPSTR);
+				mono_mb_emit_stloc (mb, tmp_locals [i]);
+			} else {
+				mono_mb_emit_ldarg (mb, argnum);
+				mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+				mono_mb_emit_byte (mb, CEE_MONO_OBJADDR);
+				/* fixme: convert to what ? */
+				mono_mb_emit_stloc (mb, tmp_locals [i]);
+			}
+
+			mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
+			
+			break;
+		case MONO_TYPE_ARRAY:
+		case MONO_TYPE_SZARRAY:
+			if (t->byref)
+				continue;
+
+			klass = mono_class_from_mono_type (t);
+
+			csig->params [argnum] = &mono_defaults.int_class->byval_arg;
+			tmp_locals [i] = mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+
+			mono_mb_emit_ldarg (mb, argnum);
+			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+			mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+			if (klass->element_class == mono_defaults.string_class) 
+				mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_STRARRAY_STRLPARRAY);
+			else
+				mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_ARRAY_LPARRAY);
+			mono_mb_emit_stloc (mb, tmp_locals [i]);
+			break;
+		}
+	}
+
+	/* push all arguments */
+
+	if (sig->hasthis)
+		mono_mb_emit_byte (mb, CEE_LDARG_0);
+
+	for (i = 0; i < sig->param_count; i++) {
+		MonoType *t = sig->params [i];
+		
+		argnum = i + sig->hasthis;
+
+		switch (t->type) {
+		case MONO_TYPE_BOOLEAN:
+			if (t->byref)
+				g_warning ("byref boolean marshalling not inplemented");
+			mono_mb_emit_ldarg (mb, argnum);
+			break;
+		case MONO_TYPE_I1:
+		case MONO_TYPE_U1:
+		case MONO_TYPE_I2:
+		case MONO_TYPE_U2:
+		case MONO_TYPE_I4:
+		case MONO_TYPE_U4:
+		case MONO_TYPE_I:
+		case MONO_TYPE_U:
+		case MONO_TYPE_PTR:
+		case MONO_TYPE_R4:
+		case MONO_TYPE_R8:
+		case MONO_TYPE_I8:
+		case MONO_TYPE_U8:
+			mono_mb_emit_ldarg (mb, argnum);
+			break;
+		case MONO_TYPE_VALUETYPE:
+			klass = sig->params [i]->data.klass;
+			if (klass->blittable || klass->enumtype) {
+				mono_mb_emit_ldarg (mb, argnum);
+				break;
+			}			
+			g_assert (tmp_locals [i]);
+			mono_mb_emit_ldloc (mb, tmp_locals [i]);
+			if (!t->byref) {
+				mono_mb_emit_byte (mb, CEE_LDOBJ);
+				mono_mb_emit_i4 (mb, mono_mb_add_data (mb, klass));
+			}
+			break;
+		case MONO_TYPE_STRING:
+			if (t->byref) {
+				mono_mb_emit_ldarg (mb, argnum);
+			} else {
+				g_assert (tmp_locals [i]);
+				mono_mb_emit_ldloc (mb, tmp_locals [i]);
+			}
+			break;
+		case MONO_TYPE_CLASS:
+		case MONO_TYPE_OBJECT:
+			if (t->byref) {
+				mono_mb_emit_ldarg (mb, argnum);
+			} else {
+				g_assert (tmp_locals [i]);
+				mono_mb_emit_ldloc (mb, tmp_locals [i]);
+			}
+			break;
+		case MONO_TYPE_CHAR:
+			/* fixme: dont know how to marshal that. We cant simply
+			 * convert it to a one byte UTF8 character, because an
+			 * unicode character may need more that one byte in UTF8 */
+			mono_mb_emit_ldarg (mb, argnum);
+			break;
+		case MONO_TYPE_ARRAY:
+		case MONO_TYPE_SZARRAY:
+			if (t->byref) {
+				mono_mb_emit_ldarg (mb, argnum);
+			} else {
+				g_assert (tmp_locals [i]);
+				mono_mb_emit_ldloc (mb, tmp_locals [i]);
+			}
+			break;
+		case MONO_TYPE_TYPEDBYREF:
+		case MONO_TYPE_FNPTR:
+		default:
+			g_warning ("type 0x%02x unknown", t->type);	
+			g_assert_not_reached ();
+		}
+	}			
+
+	/* call the native method */
+	mono_mb_emit_native_call (mb, csig, method->addr);
+
+	/* return the result */
+
+	/* we need to convert byref arguments back and free string arrays */
+	for (i = 0; i < sig->param_count; i++) {
+		MonoType *t = sig->params [i];
+		
+		argnum = i + sig->hasthis;
+
+		switch (t->type) {
+		case MONO_TYPE_CLASS:
+		case MONO_TYPE_OBJECT:			
+			if (t->byref)
+				continue;
+     
+			if (t->data.klass == mono_defaults.stringbuilder_class) {
+				mono_mb_emit_ldarg (mb, argnum);
+				mono_mb_emit_ldloc (mb, tmp_locals [i]);
+				mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+				mono_mb_emit_byte (mb, CEE_MONO_PROC2);
+				mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPSTR_SB);
+				mono_mb_emit_ldloc (mb, tmp_locals [i]);
+				mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+				mono_mb_emit_byte (mb, CEE_MONO_FREE);
+			}
+			break;
+		case MONO_TYPE_VALUETYPE:
+			if (!t->byref)
+				continue;
+	
+			klass = t->data.klass;
+			if (klass->blittable || klass->enumtype)
+				break;
+
+			/* dst = argument */
+			mono_mb_emit_ldarg (mb, argnum);
+			mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+			mono_mb_emit_byte (mb, CEE_LDLOC_1);
+			mono_mb_emit_byte (mb, CEE_BRFALSE);
+			pos = mb->pos;
+			mono_mb_emit_i4 (mb, 0);
+
+			/* src = tmp_locals [i] */
+			mono_mb_emit_ldloc (mb, tmp_locals [i]);
+			mono_mb_emit_byte (mb, CEE_STLOC_0);
+
+			/* emit valuetype conversion code */
+			emit_struct_conv (mb, klass, TRUE);
+			
+			mono_mb_patch_addr (mb, pos, mb->pos - (pos + 4));
+			break;
+		case MONO_TYPE_SZARRAY:
+			if (t->byref)
+				continue;
+ 
+			klass = mono_class_from_mono_type (t);
+			
+			if (klass->element_class == mono_defaults.string_class) {
+				g_assert (tmp_locals [i]);
+				mono_mb_emit_ldloc (mb, tmp_locals [i]);
+				mono_mb_emit_ldarg (mb, argnum);
+				mono_mb_emit_byte (mb, CEE_LDLEN);				
+				mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+				mono_mb_emit_byte (mb, CEE_MONO_PROC2);
+				mono_mb_emit_byte (mb, MONO_MARSHAL_FREE_ARRAY);
+			}
+
+			break;
+		}
+	}
+
+	if (!sig->ret->byref) {
+		type = sig->ret->type;
+	handle_enum:
+		switch (type) {
+		case MONO_TYPE_VOID:
+		case MONO_TYPE_I1:
+		case MONO_TYPE_U1:
+		case MONO_TYPE_I2:
+		case MONO_TYPE_U2:
+		case MONO_TYPE_I4:
+		case MONO_TYPE_U4:
+		case MONO_TYPE_I:
+		case MONO_TYPE_U:
+		case MONO_TYPE_PTR:
+		case MONO_TYPE_R4:
+		case MONO_TYPE_R8:
+		case MONO_TYPE_I8:
+		case MONO_TYPE_U8:
+		/* no conversions necessary */
+			break;
+		case MONO_TYPE_BOOLEAN:
+			/* maybe we need to make sure that it fits within 8 bits */
+			break;
+		case MONO_TYPE_VALUETYPE: {
+			int tmp;
+
+			klass = sig->ret->data.klass;
+			if (klass->enumtype) {
+				type = sig->ret->data.klass->enum_basetype->type;
+				goto handle_enum;
+			}
+
+			if (klass->blittable)
+				break;
+
+			tmp = mono_mb_add_local (mb, sig->ret);
+			g_assert (tmp);
+			/* load pointer to returned value type */
+			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+			mono_mb_emit_byte (mb, CEE_MONO_VTADDR);
+			/* store the address of the source into local variable 0 */
+			mono_mb_emit_byte (mb, CEE_STLOC_0);
+			/* set dst_ptr */
+			mono_mb_emit_ldloc_addr (mb, tmp);
+			mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+			/* emit valuetype conversion code */
+			emit_struct_conv (mb, sig->ret->data.klass, TRUE);
+
+			mono_mb_emit_ldloc (mb, tmp);
+			break;
+		}
+		case MONO_TYPE_STRING:
+			mono_mb_emit_byte (mb, MONO_CUSTOM_PREFIX);
+			mono_mb_emit_byte (mb, CEE_MONO_FUNC1);
+			mono_mb_emit_byte (mb, MONO_MARSHAL_CONV_LPSTR_STR);
+			break;
+		case MONO_TYPE_ARRAY:
+		case MONO_TYPE_SZARRAY:
+		case MONO_TYPE_CLASS:
+		case MONO_TYPE_OBJECT:
+			/* fixme: we need conversions here */
+			break;
+		case MONO_TYPE_CHAR:
+			/* fixme: we need conversions here */
+			break;
+		case MONO_TYPE_TYPEDBYREF:
+		case MONO_TYPE_FNPTR:
+		default:
+			g_warning ("return type 0x%02x unknown", sig->ret->type);	
+			g_assert_not_reached ();
+		}
+	}
+
+	mono_mb_emit_byte (mb, CEE_RET);
+
+	res = mono_mb_create_method (mb, sig, sig->param_count + 16);
+	mono_mb_free (mb);
+
+	g_hash_table_insert (cache, method, res);
+
+	return res;
+}
+
+/*
+ * generates IL code for StructureToPtr (object structure, IntPtr ptr, bool fDeleteOld)
+ */
+MonoMethod *
+mono_marshal_get_struct_to_ptr (MonoClass *klass)
+{
+	MonoMethodBuilder *mb;
+	static MonoMethod *stoptr = NULL;
+	MonoMethod *res;
+
+	g_assert (klass != NULL);
+
+	if (klass->str_to_ptr)
+		return klass->str_to_ptr;
+
+	if (!stoptr) 
+		stoptr = mono_find_method_by_name (mono_defaults.marshal_class, "StructureToPtr", 3);
+	g_assert (stoptr);
+
+	mb = mono_mb_new (klass, stoptr->name);
+
+	if (klass->blittable) {
+		mono_mb_emit_byte (mb, CEE_LDARG_1);
+		mono_mb_emit_byte (mb, CEE_LDARG_0);
+		mono_mb_emit_icon (mb, sizeof (MonoObject));
+		mono_mb_emit_byte (mb, CEE_ADD);
+		mono_mb_emit_icon (mb, mono_class_value_size (klass, NULL));
+		mono_mb_emit_byte (mb, CEE_PREFIX1);
+		mono_mb_emit_byte (mb, CEE_CPBLK);
+	} else {
+
+		/* allocate local 0 (pointer) src_ptr */
+		mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+		/* allocate local 1 (pointer) dst_ptr */
+		mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+		/* allocate local 2 (boolean) delete_old */
+		mono_mb_add_local (mb, &mono_defaults.boolean_class->byval_arg);
+		mono_mb_emit_byte (mb, CEE_LDARG_2);
+		mono_mb_emit_byte (mb, CEE_STLOC_2);
+
+		/* initialize src_ptr to point to the start of object data */
+		mono_mb_emit_byte (mb, CEE_LDARG_0);
+		mono_mb_emit_icon (mb, sizeof (MonoObject));
+		mono_mb_emit_byte (mb, CEE_ADD);
+		mono_mb_emit_byte (mb, CEE_STLOC_0);
+
+		/* initialize dst_ptr */
+		mono_mb_emit_byte (mb, CEE_LDARG_1);
+		mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+		emit_struct_conv (mb, klass, FALSE);
+	}
+
+	mono_mb_emit_byte (mb, CEE_RET);
+
+	res = mono_mb_create_method (mb, stoptr->signature, 0);
+	mono_mb_free (mb);
+
+	klass->str_to_ptr = res;
+	return res;
+}
+
+/*
+ * generates IL code for PtrToStructure (IntPtr src, object structure)
+ */
+MonoMethod *
+mono_marshal_get_ptr_to_struct (MonoClass *klass)
+{
+	MonoMethodBuilder *mb;
+	static MonoMethod *ptostr = NULL;
+	MonoMethod *res;
+
+	g_assert (klass != NULL);
+
+	if (klass->ptr_to_str)
+		return klass->ptr_to_str;
+
+	if (!ptostr) 
+		ptostr = mono_find_method_by_name (mono_defaults.marshal_class, "PtrToStructure", 2);
+	g_assert (ptostr);
+
+	mb = mono_mb_new (klass, ptostr->name);
+
+	if (klass->blittable) {
+		mono_mb_emit_byte (mb, CEE_LDARG_1);
+		mono_mb_emit_icon (mb, sizeof (MonoObject));
+		mono_mb_emit_byte (mb, CEE_ADD);
+		mono_mb_emit_byte (mb, CEE_LDARG_0);
+		mono_mb_emit_icon (mb, mono_class_value_size (klass, NULL));
+		mono_mb_emit_byte (mb, CEE_PREFIX1);
+		mono_mb_emit_byte (mb, CEE_CPBLK);
+	} else {
+
+		/* allocate local 0 (pointer) src_ptr */
+		mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+		/* allocate local 1 (pointer) dst_ptr */
+		mono_mb_add_local (mb, &mono_defaults.int_class->byval_arg);
+		
+		/* initialize src_ptr to point to the start of object data */
+		mono_mb_emit_byte (mb, CEE_LDARG_0);
+		mono_mb_emit_byte (mb, CEE_STLOC_0);
+
+		/* initialize dst_ptr */
+		mono_mb_emit_byte (mb, CEE_LDARG_1);
+		mono_mb_emit_icon (mb, sizeof (MonoObject));
+		mono_mb_emit_byte (mb, CEE_ADD);
+		mono_mb_emit_byte (mb, CEE_STLOC_1);
+
+		emit_struct_conv (mb, klass, TRUE);
+	}
+
+	mono_mb_emit_byte (mb, CEE_RET);
+
+	res = mono_mb_create_method (mb, ptostr->signature, 0);
+	mono_mb_free (mb);
+
+	klass->ptr_to_str = res;
+	return res;
+}
+
+/* FIXME: on win32 we should probably use GlobalAlloc(). */
+void*
+mono_marshal_alloc (gpointer size) {
+	return g_try_malloc ((gulong)size);
+}
+
+void
+mono_marshal_free (gpointer ptr) {
+	g_free (ptr);
+}
+
+void
+mono_marshal_free_array (gpointer *ptr, int size) {
+	int i;
+
+	for (i = 0; i < size; i++)
+		if (ptr [i])
+			g_free (ptr [i]);
+}
+
+void *
+mono_marshal_realloc (gpointer ptr, gpointer size) {
+	return g_try_realloc (ptr, (gulong)size);
+}
+
+void *
+mono_marshal_string_array (MonoArray *array)
+{
+	char **result;
+	int i, len;
+
+	if (!array)
+		return NULL;
+
+	len = mono_array_length (array);
+
+	result = g_malloc (sizeof (char *) * (len + 1));
+	for (i = 0; i < len; ++i) {
+		MonoString *s = (MonoString *)mono_array_get (array, gpointer, i);
+		result [i] = s ? mono_string_to_utf8 (s): NULL;
+	}
+	/* null terminate the array */
+	result [i] = NULL;
+
+	return result;
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_copy_to_unmanaged (MonoArray *src, gint32 start_index,
+								    gpointer dest, gint32 length)
+{
+	int element_size;
+	void *source_addr;
+
+	MONO_CHECK_ARG_NULL (src);
+	MONO_CHECK_ARG_NULL (dest);
+
+	g_assert (src->obj.vtable->klass->rank == 1);
+	g_assert (start_index >= 0 && start_index < mono_array_length (src));
+	g_assert (start_index + length <= mono_array_length (src));
+
+	element_size = mono_array_element_size (src->obj.vtable->klass);
+	  
+	source_addr = mono_array_addr_with_size (src, element_size, start_index);
+
+	memcpy (dest, source_addr, length * element_size);
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_copy_from_unmanaged (gpointer src, gint32 start_index,
+								      MonoArray *dest, gint32 length)
+{
+	int element_size;
+	void *dest_addr;
+
+	MONO_CHECK_ARG_NULL (src);
+	MONO_CHECK_ARG_NULL (dest);
+
+	g_assert (dest->obj.vtable->klass->rank == 1);
+	g_assert (start_index >= 0 && start_index < mono_array_length (dest));
+	g_assert (start_index + length <= mono_array_length (dest));
+
+	element_size = mono_array_element_size (dest->obj.vtable->klass);
+	  
+	dest_addr = mono_array_addr_with_size (dest, element_size, start_index);
+
+	memcpy (dest_addr, src, length * element_size);
+}
+
+gpointer
+ves_icall_System_Runtime_InteropServices_Marshal_ReadIntPtr (gpointer ptr, gint32 offset)
+{
+	char *p = ptr;
+	return *(gpointer*)(p + offset);
+}
+
+unsigned char
+ves_icall_System_Runtime_InteropServices_Marshal_ReadByte (gpointer ptr, gint32 offset)
+{
+	char *p = ptr;
+	return *(unsigned char*)(p + offset);
+}
+
+gint16
+ves_icall_System_Runtime_InteropServices_Marshal_ReadInt16 (gpointer ptr, gint32 offset)
+{
+	char *p = ptr;
+	return *(gint16*)(p + offset);
+}
+
+gint32
+ves_icall_System_Runtime_InteropServices_Marshal_ReadInt32 (gpointer ptr, gint32 offset)
+{
+	char *p = ptr;
+	return *(gint32*)(p + offset);
+}
+
+gint64
+ves_icall_System_Runtime_InteropServices_Marshal_ReadInt64 (gpointer ptr, gint32 offset)
+{
+	char *p = ptr;
+	return *(gint64*)(p + offset);
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_WriteByte (gpointer ptr, gint32 offset, unsigned char val)
+{
+	char *p = ptr;
+	*(unsigned char*)(p + offset) = val;
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_WriteIntPtr (gpointer ptr, gint32 offset, gpointer val)
+{
+	char *p = ptr;
+	*(gpointer*)(p + offset) = val;
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_WriteInt16 (gpointer ptr, gint32 offset, gint16 val)
+{
+	char *p = ptr;
+	*(gint16*)(p + offset) = val;
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_WriteInt32 (gpointer ptr, gint32 offset, gint32 val)
+{
+	char *p = ptr;
+	*(gint32*)(p + offset) = val;
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_WriteInt64 (gpointer ptr, gint32 offset, gint64 val)
+{
+	char *p = ptr;
+	*(gint64*)(p + offset) = val;
+}
+
+MonoString *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAnsi (char *ptr)
+{
+	return mono_string_new (mono_domain_get (), ptr);
+}
+
+MonoString *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAnsi_len (char *ptr, gint32 len)
+{
+	return mono_string_new_len (mono_domain_get (), ptr, len);
+}
+
+MonoString *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringUni (guint16 *ptr)
+{
+	MonoDomain *domain = mono_domain_get (); 
+	int len = 0;
+	guint16 *t = ptr;
+
+	while (t++)
+		len++;
+
+	return mono_string_new_utf16 (domain, ptr, len);
+}
+
+MonoString *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringUni_len (guint16 *ptr, gint32 len)
+{
+	MonoDomain *domain = mono_domain_get (); 
+
+	return mono_string_new_utf16 (domain, ptr, len);
+}
+
+MonoString *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringBSTR (gpointer ptr)
+{
+	g_warning ("PtrToStringBSTR not implemented");
+	g_assert_not_reached ();
+
+	return NULL;
+}
+
+guint32 
+ves_icall_System_Runtime_InteropServices_Marshal_GetLastWin32Error (void)
+{
+	return (GetLastError ());
+}
+
+guint32 
+ves_icall_System_Runtime_InteropServices_Marshal_SizeOf (MonoReflectionType *rtype)
+{
+	MonoClass *klass;
+
+	MONO_CHECK_ARG_NULL (rtype);
+
+	klass = mono_class_from_mono_type (rtype->type);
+
+	return mono_class_native_size (klass, NULL);
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_StructureToPtr (MonoObject *obj, gpointer dst, MonoBoolean delete_old)
+{
+	MonoMethod *method;
+	gpointer pa [3];
+
+	MONO_CHECK_ARG_NULL (obj);
+	MONO_CHECK_ARG_NULL (dst);
+
+	method = mono_marshal_get_struct_to_ptr (obj->vtable->klass);
+
+	pa [0] = obj;
+	pa [1] = &dst;
+	pa [2] = &delete_old;
+
+	mono_runtime_invoke (method, NULL, pa, NULL);
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStructure (gpointer src, MonoObject *dst)
+{
+	MonoMethod *method;
+	gpointer pa [2];
+
+	MONO_CHECK_ARG_NULL (src);
+	MONO_CHECK_ARG_NULL (dst);
+
+	method = mono_marshal_get_ptr_to_struct (dst->vtable->klass);
+
+	pa [0] = &src;
+	pa [1] = dst;
+
+	mono_runtime_invoke (method, NULL, pa, NULL);
+}
+
+MonoObject *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStructure_type (gpointer src, MonoReflectionType *type)
+{
+	MonoDomain *domain = mono_domain_get (); 
+	MonoObject *res;
+
+	MONO_CHECK_ARG_NULL (src);
+	MONO_CHECK_ARG_NULL (type);
+
+	res = mono_object_new (domain, mono_class_from_mono_type (type->type));
+
+	ves_icall_System_Runtime_InteropServices_Marshal_PtrToStructure (src, res);
+
+	return res;
+}
+
+int
+ves_icall_System_Runtime_InteropServices_Marshal_OffsetOf (MonoReflectionType *type, MonoString *field_name)
+{
+	MonoMarshalType *info;
+	MonoClass *klass;
+	char *fname;
+	int i;
+
+	MONO_CHECK_ARG_NULL (type);
+	MONO_CHECK_ARG_NULL (field_name);
+
+	fname = mono_string_to_utf8 (field_name);
+	klass = mono_class_from_mono_type (type->type);
+
+	info = mono_marshal_load_type_info (klass);	
+	
+	for (i = 0; i < klass->field.count; ++i) {
+		if (*fname == *klass->fields [i].name && 
+		    strcmp (fname, klass->fields [i].name) == 0)
+			break;
+	}
+	g_free (fname);
+
+	mono_assert (i < klass->field.count);
+
+	return info->fields [i].offset;
+}
+
+gpointer
+ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalAnsi (MonoString *string)
+{
+	return mono_string_to_utf8 (string);
+}
+
+gpointer
+ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalUni (MonoString *string)
+{
+	return g_memdup (mono_string_chars (string), mono_string_length (string)*2);
+}
+
+static void
+mono_struct_delete_old (MonoClass *klass, char *ptr)
+{
+	MonoMarshalType *info;
+	int i;
+
+	info = mono_marshal_load_type_info (klass);
+
+	for (i = 0; i < info->num_fields; i++) {
+		MonoMarshalNative ntype;
+		MonoMarshalConv conv;
+		MonoType *ftype = info->fields [i].field->type;
+		char *cpos;
+
+		if (ftype->attrs & FIELD_ATTRIBUTE_STATIC)
+			continue;
+
+		ntype = mono_type_to_unmanaged (ftype, info->fields [i].mspec, TRUE, 
+						klass->unicode, &conv);
+			
+		cpos = ptr + info->fields [i].offset;
+
+		switch (conv) {
+		case MONO_MARSHAL_CONV_NONE:
+			if (MONO_TYPE_ISSTRUCT (ftype)) {
+				mono_struct_delete_old (ftype->data.klass, cpos);
+				continue;
+			}
+			break;
+		case MONO_MARSHAL_CONV_STR_LPWSTR:
+		case MONO_MARSHAL_CONV_STR_LPSTR:
+		case MONO_MARSHAL_CONV_STR_LPTSTR:
+		case MONO_MARSHAL_CONV_STR_BSTR:
+		case MONO_MARSHAL_CONV_STR_ANSIBSTR:
+		case MONO_MARSHAL_CONV_STR_TBSTR:
+			g_free (*(gpointer *)cpos);
+			break;
+		default:
+			continue;
+		}
+	}
+}
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_DestroyStructure (gpointer src, MonoReflectionType *type)
+{
+	MonoClass *klass;
+
+	MONO_CHECK_ARG_NULL (src);
+	MONO_CHECK_ARG_NULL (type);
+
+	klass = mono_class_from_mono_type (type->type);
+
+	mono_struct_delete_old (klass, (char *)src);
+}
+
diff --git a/mono/metadata/marshal.h b/mono/metadata/marshal.h
new file mode 100644
index 00000000000..476f45d7f10
--- /dev/null
+++ b/mono/metadata/marshal.h
@@ -0,0 +1,243 @@
+
+/*
+ * marshal.h: Routines for marshaling complex types in P/Invoke methods.
+ * 
+ * Author:
+ *   Paolo Molaro (lupus@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.  http://www.ximian.com
+ *
+ */
+
+#ifndef __MONO_MARSHAL_H__
+#define __MONO_MARSHAL_H__
+
+#include <mono/metadata/class.h>
+#include <mono/metadata/object.h>
+#include <mono/metadata/opcodes.h>
+#include <mono/metadata/reflection.h>
+
+typedef struct _MonoMethodBuilder MonoMethodBuilder;
+
+/* marshaling helper functions */
+
+gpointer
+mono_array_to_savearray (MonoArray *array);
+
+gpointer
+mono_array_to_lparray (MonoArray *array);
+
+void
+mono_string_utf8_to_builder (MonoStringBuilder *sb, char *text);
+
+gpointer
+mono_string_builder_to_utf8 (MonoStringBuilder *sb);
+
+gpointer
+mono_string_to_ansibstr (MonoString *string_obj);
+
+gpointer
+mono_string_to_bstr (MonoString *string_obj);
+
+void
+mono_string_to_byvalstr (gpointer dst, MonoString *src, int size);
+
+void
+mono_string_to_byvalwstr (gpointer dst, MonoString *src, int size);
+
+gpointer
+mono_delegate_to_ftnptr (MonoDelegate *delegate);
+
+void * 
+mono_marshal_string_array (MonoArray *array);
+
+/* method builder functions */
+
+void
+mono_mb_free (MonoMethodBuilder *mb);
+
+MonoMethodBuilder *
+mono_mb_new (MonoClass *klass, const char *name);
+
+void
+mono_mb_patch_addr (MonoMethodBuilder *mb, int pos, int value);
+
+void
+mono_mb_patch_addr_s (MonoMethodBuilder *mb, int pos, gint8 value);
+
+guint32
+mono_mb_add_data (MonoMethodBuilder *mb, gpointer data);
+
+void
+mono_mb_emit_native_call (MonoMethodBuilder *mb, MonoMethodSignature *sig, gpointer func);
+
+void
+mono_mb_emit_managed_call (MonoMethodBuilder *mb, MonoMethod *method, MonoMethodSignature *opt_sig);
+
+int
+mono_mb_add_local (MonoMethodBuilder *mb, MonoType *type);
+
+MonoMethod *
+mono_mb_create_method (MonoMethodBuilder *mb, MonoMethodSignature *signature, int max_stack);
+
+void
+mono_mb_emit_ldarg (MonoMethodBuilder *mb, guint argnum);
+
+void
+mono_mb_emit_ldarg_addr (MonoMethodBuilder *mb, guint argnum);
+
+void
+mono_mb_emit_ldloc (MonoMethodBuilder *mb, guint num);
+
+void
+mono_mb_emit_ldloc_addr (MonoMethodBuilder *mb, guint locnum);
+
+void
+mono_mb_emit_stloc (MonoMethodBuilder *mb, guint num);
+
+void
+mono_mb_emit_exception (MonoMethodBuilder *mb);
+
+void
+mono_mb_emit_icon (MonoMethodBuilder *mb, gint32 value);
+
+void
+mono_mb_emit_add_to_local (MonoMethodBuilder *mb, guint8 local, gint8 incr);
+
+void
+mono_mb_emit_ldflda (MonoMethodBuilder *mb, gint32 offset);
+
+void
+mono_mb_emit_byte (MonoMethodBuilder *mb, guint8 op);
+
+void
+mono_mb_emit_i2 (MonoMethodBuilder *mb, gint16 data);
+
+void
+mono_mb_emit_i4 (MonoMethodBuilder *mb, gint32 data);
+
+/* functions to create various architecture independent helper functions */
+
+MonoMethod *
+mono_marshal_get_remoting_invoke (MonoMethod *method);
+
+MonoMethod *
+mono_marshal_get_delegate_begin_invoke (MonoMethod *method);
+
+MonoMethod *
+mono_marshal_get_delegate_end_invoke (MonoMethod *method);
+
+MonoMethod *
+mono_marshal_get_delegate_invoke (MonoMethod *method);
+
+MonoMethod *
+mono_marshal_get_runtime_invoke (MonoMethod *method);
+
+MonoMethod *
+mono_marshal_get_managed_wrapper (MonoMethod *method, MonoObject *this);
+
+MonoMethod *
+mono_marshal_get_native_wrapper (MonoMethod *method);
+
+MonoMethod *
+mono_marshal_get_struct_to_ptr (MonoClass *klass);
+
+MonoMethod *
+mono_marshal_get_ptr_to_struct (MonoClass *klass);
+
+/* marshaling internal calls */
+
+void * 
+mono_marshal_alloc (gpointer size);
+
+void 
+mono_marshal_free (gpointer ptr);
+
+void
+mono_marshal_free_array (gpointer *ptr, int size);
+
+void * 
+mono_marshal_realloc (gpointer ptr, gpointer size);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_copy_to_unmanaged (MonoArray *src, gint32 start_index,
+								    gpointer dest, gint32 length);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_copy_from_unmanaged (gpointer src, gint32 start_index,
+								      MonoArray *dest, gint32 length);
+
+gpointer
+ves_icall_System_Runtime_InteropServices_Marshal_ReadIntPtr (gpointer ptr, gint32 offset);
+
+unsigned char
+ves_icall_System_Runtime_InteropServices_Marshal_ReadByte (gpointer ptr, gint32 offset);
+
+gint16
+ves_icall_System_Runtime_InteropServices_Marshal_ReadInt16 (gpointer ptr, gint32 offset);
+
+gint32
+ves_icall_System_Runtime_InteropServices_Marshal_ReadInt32 (gpointer ptr, gint32 offset);
+
+gint64
+ves_icall_System_Runtime_InteropServices_Marshal_ReadInt64 (gpointer ptr, gint32 offset);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_WriteByte (gpointer ptr, gint32 offset, unsigned char val);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_WriteIntPtr (gpointer ptr, gint32 offset, gpointer val);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_WriteInt16 (gpointer ptr, gint32 offset, gint16 val);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_WriteInt32 (gpointer ptr, gint32 offset, gint32 val);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_WriteInt64 (gpointer ptr, gint32 offset, gint64 val);
+
+MonoString *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAnsi (char *ptr);
+
+MonoString *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringAnsi_len (char *ptr, gint32 len);
+
+MonoString *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringUni (guint16 *ptr);
+
+MonoString *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringUni_len (guint16 *ptr, gint32 len);
+
+MonoString *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStringBSTR (gpointer ptr);
+
+guint32 
+ves_icall_System_Runtime_InteropServices_Marshal_GetLastWin32Error (void);
+
+guint32 
+ves_icall_System_Runtime_InteropServices_Marshal_SizeOf (MonoReflectionType *rtype);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_StructureToPtr (MonoObject *obj, gpointer dst, MonoBoolean delete_old);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStructure (gpointer src, MonoObject *dst);
+
+MonoObject *
+ves_icall_System_Runtime_InteropServices_Marshal_PtrToStructure_type (gpointer src, MonoReflectionType *type);
+
+int
+ves_icall_System_Runtime_InteropServices_Marshal_OffsetOf (MonoReflectionType *type, MonoString *field_name);
+
+gpointer
+ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalAnsi (MonoString *string);
+
+gpointer
+ves_icall_System_Runtime_InteropServices_Marshal_StringToHGlobalUni (MonoString *string);
+
+void
+ves_icall_System_Runtime_InteropServices_Marshal_DestroyStructure (gpointer src, MonoReflectionType *type);
+
+#endif /* __MONO_MARSHAL_H__ */
+
diff --git a/mono/metadata/mempool.c b/mono/metadata/mempool.c
index 78e81dd4ac0..2347b45b661 100644
--- a/mono/metadata/mempool.c
+++ b/mono/metadata/mempool.c
@@ -21,11 +21,7 @@
  * all memory when the pool is destroyed.
  */
 
-#if SIZEOF_VOID_P > SIZEOF_LONG
-#define MEM_ALIGN     SIZEOF_VOID_P
-#else
-#define MEM_ALIGN     SIZEOF_LONG
-#endif
+#define MEM_ALIGN 8
 
 #define MONO_MEMPOOL_PAGESIZE 8192
 
@@ -33,6 +29,7 @@ struct _MonoMemPool {
 	MonoMemPool *next;
 	gint rest;
 	gpointer pos;
+	double pad; /* to assure proper alignment */
 };
 
 /**
@@ -43,10 +40,10 @@ struct _MonoMemPool {
 MonoMemPool *
 mono_mempool_new ()
 {
-
 	MonoMemPool *pool = g_malloc (MONO_MEMPOOL_PAGESIZE);
+
 	pool->next = NULL;
-	pool->pos = (gpointer)pool + sizeof (MonoMemPool);
+	pool->pos = (char *)pool + sizeof (MonoMemPool);
 	pool->rest = MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
 	return pool;
 }
@@ -87,26 +84,26 @@ mono_mempool_alloc (MonoMemPool *pool, guint size)
 	
 	g_assert (pool != NULL);
 
-	if (size >= 4096) {
-		MonoMemPool *np = g_malloc (sizeof (MonoMemPool) + size);
-		np->next = pool->next;
-		pool->next = np;
-		return (gpointer)np + sizeof (MonoMemPool);
-	}
-
 	size = (size + MEM_ALIGN - 1) & ~(MEM_ALIGN - 1);
 
 	if (pool->rest < size) {
-		MonoMemPool *np = g_malloc (MONO_MEMPOOL_PAGESIZE);
-		np->next = pool->next;
-		pool->next = np;
-		pool->pos = (gpointer)np + sizeof (MonoMemPool);
-		pool->rest = MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
+		if (size >= 4096) {
+			MonoMemPool *np = g_malloc (sizeof (MonoMemPool) + size);
+			np->next = pool->next;
+			pool->next = np;
+			return (char *)np + sizeof (MonoMemPool);
+		} else {
+			MonoMemPool *np = g_malloc (MONO_MEMPOOL_PAGESIZE);
+			np->next = pool->next;
+			pool->next = np;
+			pool->pos = (char *)np + sizeof (MonoMemPool);
+			pool->rest = MONO_MEMPOOL_PAGESIZE - sizeof (MonoMemPool);
+		}
 	}
 
 	rval = pool->pos;
 	pool->rest -= size;
-	pool->pos += size;
+	pool->pos = (char *)pool->pos + size;
 
 	return rval;
 }
diff --git a/mono/metadata/mempool.h b/mono/metadata/mempool.h
index 36df6299cbb..5ee9a6fc57d 100644
--- a/mono/metadata/mempool.h
+++ b/mono/metadata/mempool.h
@@ -10,9 +10,11 @@ void
 mono_mempool_destroy       (MonoMemPool *pool);
 
 gpointer
-mono_mempool_alloc         (MonoMemPool *pool, guint size);
+mono_mempool_alloc         (MonoMemPool *pool, 
+			    guint        size);
 
 gpointer
-mono_mempool_alloc0        (MonoMemPool *pool, guint size);
+mono_mempool_alloc0        (MonoMemPool *pool, 
+			    guint        size);
 
 #endif
diff --git a/mono/metadata/metadata.c b/mono/metadata/metadata.c
index 5161720c9dc..a0e1947d882 100644
--- a/mono/metadata/metadata.c
+++ b/mono/metadata/metadata.c
@@ -1,10 +1,11 @@
 /*
  * metadata.c: Routines for accessing the metadata
  *
- * Author:
+ * Authors:
  *   Miguel de Icaza (miguel@ximian.com)
+ *   Paolo Molaro (lupus@ximian.com)
  *
- * (C) 2001 Ximian, Inc.
+ * (C) 2001-2002 Ximian, Inc.
  */
 
 #include <config.h>
@@ -366,6 +367,18 @@ inverse of this mapping.
 #define idx_size(tableidx) (meta->tables [(tableidx)].rows < 65536 ? 2 : 4)
 
 /* Reference: Partition II - 23.2.6 */
+/*
+ * mono_metadata_compute_size:
+ * @meta: metadata context
+ * @tableindex: metadata table number
+ * @result_bitfield: pointer to guint32 where to store additional info
+ * 
+ * mono_metadata_compute_size() computes the lenght in bytes of a single
+ * row in a metadata table. The size of each column is encoded in the
+ * @result_bitfield return value along with the number of columns in the table.
+ * the resulting bitfield should be handed to the mono_metadata_table_size()
+ * and mono_metadata_table_count() macros.
+ */
 int
 mono_metadata_compute_size (MonoImage *meta, int tableindex, guint32 *result_bitfield)
 {
@@ -669,7 +682,7 @@ void
 mono_metadata_compute_table_bases (MonoImage *meta)
 {
 	int i;
-	char *base = meta->tables_base;
+	const char *base = meta->tables_base;
 	
 	for (i = 0; i < 64; i++){
 		if (meta->tables [i].rows == 0)
@@ -691,7 +704,7 @@ mono_metadata_compute_table_bases (MonoImage *meta)
  * Returns a pointer to the @idx element in the metadata table
  * whose code is @table.
  */
-char *
+const char *
 mono_metadata_locate (MonoImage *meta, int table, int idx)
 {
 	/* idx == 0 refers always to NULL */
@@ -700,7 +713,15 @@ mono_metadata_locate (MonoImage *meta, int table, int idx)
 	return meta->tables [table].base + (meta->tables [table].row_size * (idx - 1));
 }
 
-char *
+/**
+ * mono_metadata_locate_token:
+ * @meta: metadata context
+ * @token: metadata token
+ *
+ * Returns a pointer to the data in the metadata represented by the
+ * token #token.
+ */
+const char *
 mono_metadata_locate_token (MonoImage *meta, guint32 token)
 {
 	return mono_metadata_locate (meta, token >> 24, token & 0xffffff);
@@ -736,6 +757,13 @@ mono_metadata_string_heap (MonoImage *meta, guint32 index)
 	return meta->heap_strings.data + index;
 }
 
+/**
+ * mono_metadata_user_string:
+ * @meta: metadata context
+ * @index: index into the user string heap.
+ *
+ * Returns: an in-memory pointer to the @index in the user string heap ("#US").
+ */
 const char *
 mono_metadata_user_string (MonoImage *meta, guint32 index)
 {
@@ -757,6 +785,22 @@ mono_metadata_blob_heap (MonoImage *meta, guint32 index)
 	return meta->heap_blob.data + index;
 }
 
+/**
+ * mono_metadata_guid_heap:
+ * @meta: metadata context
+ * @index: index into the guid heap.
+ *
+ * Returns: an in-memory pointer to the @index in the guid heap.
+ */
+const char *
+mono_metadata_guid_heap (MonoImage *meta, guint32 index)
+{
+	--index;
+	index *= 16; /* adjust for guid size and 1-based index */
+	g_return_val_if_fail (index < meta->heap_guid.size, "");
+	return meta->heap_guid.data + index;
+}
+
 static const char *
 dword_align (const char *ptr)
 {
@@ -777,7 +821,7 @@ mono_metadata_decode_row (MonoTableInfo *t, int idx, guint32 *res, int res_size)
 {
 	guint32 bitfield = t->size_bitfield;
 	int i, count = mono_metadata_table_count (bitfield);
-	char *data = t->base + idx * t->row_size;
+	const char *data = t->base + idx * t->row_size;
 	
 	g_assert (res_size == count);
 	
@@ -814,7 +858,7 @@ mono_metadata_decode_row_col (MonoTableInfo *t, int idx, guint col)
 {
 	guint32 bitfield = t->size_bitfield;
 	int i;
-	register char *data = t->base + idx * t->row_size;
+	register const char *data = t->base + idx * t->row_size;
 	register int n;
 	
 	g_assert (col < mono_metadata_table_count (bitfield));
@@ -883,7 +927,7 @@ mono_metadata_decode_blob_size (const char *xptr, const char **rptr)
 guint32
 mono_metadata_decode_value (const char *_ptr, const char **rptr)
 {
-	const unsigned char *ptr = (unsigned char *) _ptr;
+	const unsigned char *ptr = (const unsigned char *) _ptr;
 	unsigned char b = *ptr;
 	guint32 len;
 	
@@ -906,6 +950,15 @@ mono_metadata_decode_value (const char *_ptr, const char **rptr)
 	return len;
 }
 
+/*
+ * mono_metadata_parse_typedef_or_ref:
+ * @m: a metadata context.
+ * @ptr: a pointer to an encoded TypedefOrRef in @m
+ * @rptr: pointer updated to match the end of the decoded stream
+ *
+ * Returns: a token valid in the @m metadata decoded from
+ * the compressed representation.
+ */
 guint32
 mono_metadata_parse_typedef_or_ref (MonoImage *m, const char *ptr, const char **rptr)
 {
@@ -916,6 +969,17 @@ mono_metadata_parse_typedef_or_ref (MonoImage *m, const char *ptr, const char **
 	return mono_metadata_token_from_dor (token);
 }
 
+/*
+ * mono_metadata_parse_custom_mod:
+ * @m: a metadata context.
+ * @dest: storage where the info about the custom modifier is stored (may be NULL)
+ * @ptr: a pointer to (possibly) the start of a custom modifier list
+ * @rptr: pointer updated to match the end of the decoded stream
+ *
+ * Checks if @ptr points to a type custom modifier compressed representation.
+ *
+ * Returns: #TRUE if a custom modifier was found, #FALSE if not.
+ */
 int
 mono_metadata_parse_custom_mod (MonoImage *m, MonoCustomMod *dest, const char *ptr, const char **rptr)
 {
@@ -931,6 +995,17 @@ mono_metadata_parse_custom_mod (MonoImage *m, MonoCustomMod *dest, const char *p
 	return FALSE;
 }
 
+/*
+ * mono_metadata_parse_array:
+ * @m: a metadata context.
+ * @ptr: a pointer to an encoded array description.
+ * @rptr: pointer updated to match the end of the decoded stream
+ *
+ * Decodes the compressed array description found in the metadata @m at @ptr.
+ *
+ * Returns: a #MonoArrayType structure describing the array type
+ * and dimensions.
+ */
 MonoArrayType *
 mono_metadata_parse_array (MonoImage *m, const char *ptr, const char **rptr)
 {
@@ -957,6 +1032,12 @@ mono_metadata_parse_array (MonoImage *m, const char *ptr, const char **rptr)
 	return array;
 }
 
+/*
+ * mono_metadata_free_array:
+ * @array: array description
+ *
+ * Frees the array description returned from mono_metadata_parse_array().
+ */
 void
 mono_metadata_free_array (MonoArrayType *array)
 {
@@ -1024,15 +1105,15 @@ static GHashTable *type_cache = NULL;
 static guint
 mono_type_hash (gconstpointer data)
 {
-	MonoType *type = (MonoType *) data;
+	const MonoType *type = (const MonoType *) data;
 	return type->type | (type->byref << 8) | (type->attrs << 9);
 }
 
 static gint
 mono_type_equal (gconstpointer ka, gconstpointer kb)
 {
-	MonoType *a = (MonoType *) ka;
-	MonoType *b = (MonoType *) kb;
+	const MonoType *a = (const MonoType *) ka;
+	const MonoType *b = (const MonoType *) kb;
 	
 	if (a->type != b->type || a->byref != b->byref || a->attrs != b->attrs || a->pinned != b->pinned)
 		return 0;
@@ -1040,6 +1121,22 @@ mono_type_equal (gconstpointer ka, gconstpointer kb)
 	return 1;
 }
 
+/*
+ * mono_metadata_parse_type:
+ * @m: metadata context
+ * @mode: king of type that may be found at @ptr
+ * @opt_attrs: optional attributes to store in the returned type
+ * @ptr: pointer to the type representation
+ * @rptr: pointer updated to match the end of the decoded stream
+ * 
+ * Decode a compressed type description found at @ptr in @m.
+ * @mode can be one of MONO_PARSE_MOD_TYPE, MONO_PARSE_PARAM, MONO_PARSE_RET,
+ * MONO_PARSE_FIELD, MONO_PARSE_LOCAL, MONO_PARSE_TYPE.
+ * This function can be used to decode type descriptions in method signatures,
+ * field signatures, locals signatures etc.
+ *
+ * Returns: a #MonoType structure representing the decoded type.
+ */
 MonoType*
 mono_metadata_parse_type (MonoImage *m, MonoParseTypeMode mode, short opt_attrs, const char *ptr, const char **rptr)
 {
@@ -1120,6 +1217,44 @@ mono_metadata_parse_type (MonoImage *m, MonoParseTypeMode mode, short opt_attrs,
 	}
 }
 
+/*
+ * mono_metadata_parse_signature:
+ * @image: metadata context
+ * @toke: metadata token
+ *
+ * Decode a method signature stored in the STANDALONESIG table
+ *
+ * Returns: a MonoMethodSignature describing the signature.
+ */
+MonoMethodSignature *
+mono_metadata_parse_signature (MonoImage *image, guint32 token)
+{
+	MonoTableInfo *tables = image->tables;
+	guint32 idx = mono_metadata_token_index (token);
+	guint32 sig;
+	const char *ptr;
+
+	g_assert (mono_metadata_token_table(token) == MONO_TABLE_STANDALONESIG);
+		
+	sig = mono_metadata_decode_row_col (&tables [MONO_TABLE_STANDALONESIG], idx - 1, 0);
+
+	ptr = mono_metadata_blob_heap (image, sig);
+	mono_metadata_decode_blob_size (ptr, &ptr);
+
+	return mono_metadata_parse_method_signature (image, FALSE, ptr, NULL); 
+}
+
+/*
+ * mono_metadata_parse_method_signature:
+ * @m: metadata context
+ * @def: use #TRUE when parsing MethodDef, #FALSE with MethodRef signatures.
+ * @ptr: pointer to the signature metadata representation
+ * @rptr: pointer updated to match the end of the decoded stream
+ *
+ * Decode a method signature stored at @ptr.
+ *
+ * Returns: a MonoMethodSignature describing the signature.
+ */
 MonoMethodSignature *
 mono_metadata_parse_method_signature (MonoImage *m, int def, const char *ptr, const char **rptr)
 {
@@ -1164,15 +1299,21 @@ mono_metadata_parse_method_signature (MonoImage *m, int def, const char *ptr, co
 	return method;
 }
 
+/*
+ * mono_metadata_free_method_signature:
+ * @sig: signature to destroy
+ *
+ * Free the memory allocated in the signature @sig.
+ */
 void
-mono_metadata_free_method_signature (MonoMethodSignature *method)
+mono_metadata_free_method_signature (MonoMethodSignature *sig)
 {
 	int i;
-	mono_metadata_free_type (method->ret);
-	for (i = 0; i < method->param_count; ++i)
-		mono_metadata_free_type (method->params [i]);
+	mono_metadata_free_type (sig->ret);
+	for (i = 0; i < sig->param_count; ++i)
+		mono_metadata_free_type (sig->params [i]);
 
-	g_free (method);
+	g_free (sig);
 }
 
 /* 
@@ -1239,28 +1380,12 @@ do_mono_metadata_parse_type (MonoType *type, MonoImage *m, const char *ptr, cons
 		*rptr = ptr;
 }
 
-#if 0
-/**
- * mono_metadata_parse_type:
- * @m: metadata context to scan
- * @ptr: pointer to encoded Type stream.
- * @rptr: the new position in the stream after parsing the type
+/*
+ * mono_metadata_free_type:
+ * @type: type to free
  *
- * Returns: A MonoType structure that has the parsed information
- * from the type stored at @ptr in the metadata table @m.
+ * Free the memory allocated for type @type.
  */
-MonoType *
-mono_metadata_parse_type (MonoImage *m, const char *ptr, const char **rptr)
-{
-	/* should probably be allocated in a memchunk */
-	MonoType *type = g_new0(MonoType, 1);
-
-	do_mono_metadata_parse_type (type, m, ptr, rptr);
-
-	return type;
-}
-#endif
-
 void
 mono_metadata_free_type (MonoType *type)
 {
@@ -1281,6 +1406,7 @@ mono_metadata_free_type (MonoType *type)
 	g_free (type);
 }
 
+#if 0
 static void
 hex_dump (const char *buffer, int base, int count)
 {
@@ -1301,6 +1427,7 @@ hex_dump (const char *buffer, int base, int count)
 	}
 	fflush (stdout);
 }
+#endif
 
 /** 
  * @mh: The Method header
@@ -1385,11 +1512,21 @@ parse_section_data (MonoMethodHeader *mh, const unsigned char *ptr)
 	}
 }
 
+/*
+ * mono_metadata_parse_mh:
+ * @m: metadata context
+ * @ptr: pointer to the method header.
+ *
+ * Decode the method header at @ptr, including pointer to the IL code,
+ * info about local variables and optional exception tables.
+ *
+ * Returns: a MonoMethodHeader.
+ */
 MonoMethodHeader *
 mono_metadata_parse_mh (MonoImage *m, const char *ptr)
 {
 	MonoMethodHeader *mh;
-	unsigned char flags = *(unsigned char *) ptr;
+	unsigned char flags = *(const unsigned char *) ptr;
 	unsigned char format = flags & METHOD_HEADER_FORMAT_MASK;
 	guint16 fat_flags;
 	guint32 local_var_sig_tok, max_stack, code_size, init_locals;
@@ -1454,21 +1591,21 @@ mono_metadata_parse_mh (MonoImage *m, const char *ptr)
 		       
 	if (local_var_sig_tok) {
 		MonoTableInfo *t = &m->tables [MONO_TABLE_STANDALONESIG];
-		const char *ptr;
+		const char *locals_ptr;
 		guint32 cols [MONO_STAND_ALONE_SIGNATURE_SIZE];
 		int len=0, i, bsize;
 
 		mono_metadata_decode_row (t, (local_var_sig_tok & 0xffffff)-1, cols, 1);
-		ptr = mono_metadata_blob_heap (m, cols [MONO_STAND_ALONE_SIGNATURE]);
-		bsize = mono_metadata_decode_blob_size (ptr, &ptr);
-		if (*ptr != 0x07)
+		locals_ptr = mono_metadata_blob_heap (m, cols [MONO_STAND_ALONE_SIGNATURE]);
+		bsize = mono_metadata_decode_blob_size (locals_ptr, &locals_ptr);
+		if (*locals_ptr != 0x07)
 			g_warning ("wrong signature for locals blob");
-		ptr++;
-		len = mono_metadata_decode_value (ptr, &ptr);
+		locals_ptr++;
+		len = mono_metadata_decode_value (locals_ptr, &locals_ptr);
 		mh = g_malloc0 (sizeof (MonoMethodHeader) + (len - MONO_ZERO_LEN_ARRAY) * sizeof (MonoType*));
 		mh->num_locals = len;
 		for (i = 0; i < len; ++i)
-			mh->locals [i] = mono_metadata_parse_type (m, MONO_PARSE_LOCAL, 0, ptr, &ptr);
+			mh->locals [i] = mono_metadata_parse_type (m, MONO_PARSE_LOCAL, 0, locals_ptr, &locals_ptr);
 	} else {
 		mh = g_new0 (MonoMethodHeader, 1);
 	}
@@ -1481,6 +1618,12 @@ mono_metadata_parse_mh (MonoImage *m, const char *ptr)
 	return mh;
 }
 
+/*
+ * mono_metadata_free_mh:
+ * @mh: a method header
+ *
+ * Free the memory allocated for the method header.
+ */
 void
 mono_metadata_free_mh (MonoMethodHeader *mh)
 {
@@ -1495,6 +1638,7 @@ mono_metadata_free_mh (MonoMethodHeader *mh)
  * mono_metadata_parse_field_type:
  * @m: metadata context to extract information from
  * @ptr: pointer to the field signature
+ * @rptr: pointer updated to match the end of the decoded stream
  *
  * Parses the field signature, and returns the type information for it. 
  *
@@ -1506,6 +1650,16 @@ mono_metadata_parse_field_type (MonoImage *m, short field_flags, const char *ptr
 	return mono_metadata_parse_type (m, MONO_PARSE_FIELD, field_flags, ptr, rptr);
 }
 
+/**
+ * mono_metadata_parse_param:
+ * @m: metadata context to extract information from
+ * @ptr: pointer to the param signature
+ * @rptr: pointer updated to match the end of the decoded stream
+ *
+ * Parses the param signature, and returns the type information for it. 
+ *
+ * Returns: The MonoType that was extracted from @ptr.
+ */
 MonoType *
 mono_metadata_parse_param (MonoImage *m, const char *ptr, const char **rptr)
 {
@@ -1595,7 +1749,7 @@ static int
 typedef_locator (const void *a, const void *b)
 {
 	locator_t *loc = (locator_t *) a;
-	char *bb = (char *) b;
+	const char *bb = (const char *) b;
 	int typedef_index = (bb - loc->t->base) / loc->t->row_size;
 	guint32 col, col_next;
 
@@ -1625,7 +1779,7 @@ static int
 table_locator (const void *a, const void *b)
 {
 	locator_t *loc = (locator_t *) a;
-	char *bb = (char *) b;
+	const char *bb = (const char *) b;
 	guint32 table_index = (bb - loc->t->base) / loc->t->row_size;
 	guint32 col;
 	
@@ -1641,6 +1795,15 @@ table_locator (const void *a, const void *b)
 		return 1;
 }
 
+/*
+ * mono_metadata_typedef_from_field:
+ * @meta: metadata context
+ * @index: FieldDef token
+ *
+ * Returns the 1-based index into the TypeDef table of the type that
+ * declared the field described by @index.
+ * Returns 0 if not found.
+ */
 guint32
 mono_metadata_typedef_from_field (MonoImage *meta, guint32 index)
 {
@@ -1661,6 +1824,15 @@ mono_metadata_typedef_from_field (MonoImage *meta, guint32 index)
 	return loc.result + 1;
 }
 
+/*
+ * mono_metadata_typedef_from_method:
+ * @meta: metadata context
+ * @index: MethodDef token
+ *
+ * Returns the 1-based index into the TypeDef table of the type that
+ * declared the method described by @index.
+ * Returns 0 if not found.
+ */
 guint32
 mono_metadata_typedef_from_method (MonoImage *meta, guint32 index)
 {
@@ -1681,6 +1853,14 @@ mono_metadata_typedef_from_method (MonoImage *meta, guint32 index)
 	return loc.result + 1;
 }
 
+/*
+ * mono_metadata_interfaces_from_typedef:
+ * @meta: metadata context
+ * @index: typedef token
+ * 
+ * Returns and array of interfaces that the @index typedef token implements.
+ * The number of elemnts in the array is returned in @count.
+ */
 MonoClass**
 mono_metadata_interfaces_from_typedef (MonoImage *meta, guint32 index, guint *count)
 {
@@ -1727,8 +1907,13 @@ mono_metadata_interfaces_from_typedef (MonoImage *meta, guint32 index, guint *co
 }
 
 /*
- * Return the typedef token of the type index is defined into.
- * Return 0 if the index represents a toplevel type.
+ * mono_metadata_nested_in_typedef:
+ * @meta: metadata context
+ * @index: typedef token
+ * 
+ * Returns: the 1-based index into the TypeDef table of the type
+ * where the type described by @index is nested.
+ * Retruns 0 if @index describes a non-nested type.
  */
 guint32
 mono_metadata_nested_in_typedef (MonoImage *meta, guint32 index)
@@ -1750,6 +1935,15 @@ mono_metadata_nested_in_typedef (MonoImage *meta, guint32 index)
 	return mono_metadata_decode_row_col (tdef, loc.result, MONO_NESTED_CLASS_ENCLOSING) | MONO_TOKEN_TYPE_DEF;
 }
 
+/*
+ * mono_metadata_nesting_typedef:
+ * @meta: metadata context
+ * @index: typedef token
+ * 
+ * Returns: the 1-based index into the TypeDef table of the first type
+ * that is nested inside the type described by @index.
+ * Retruns 0 if @index doesn't have nested types.
+ */
 guint32
 mono_metadata_nesting_typedef (MonoImage *meta, guint32 index)
 {
@@ -1781,7 +1975,12 @@ mono_metadata_nesting_typedef (MonoImage *meta, guint32 index)
 }
 
 /*
- * Return the info stored in the ClassLAyout table for the given typedef token.
+ * mono_metadata_packing_from_typedef:
+ * @meta: metadata context
+ * @index: token representing a type
+ * 
+ * Returns the info stored in the ClassLAyout table for the given typedef token
+ * into the @packing and @size pointers.
  * Returns 0 if the info is not found.
  */
 guint32
@@ -1839,23 +2038,17 @@ mono_type_size (MonoType *t, gint *align)
 		*align = 1;
 		return 0;
 	case MONO_TYPE_BOOLEAN:
-		*align = __alignof__(char);
-		return sizeof (char);
-		
-	case MONO_TYPE_CHAR:
-		*align = __alignof__(short);
-		return sizeof (short);
-		
+		*align = __alignof__(gint8);
+		return 1;
 	case MONO_TYPE_I1:
 	case MONO_TYPE_U1:
-		*align = __alignof__(char);
+		*align = __alignof__(gint8);
 		return 1;
-		
+	case MONO_TYPE_CHAR:
 	case MONO_TYPE_I2:
 	case MONO_TYPE_U2:
 		*align = __alignof__(gint16);
-		return 2;
-		
+		return 2;		
 	case MONO_TYPE_I4:
 	case MONO_TYPE_U4:
 		*align = __alignof__(gint32);
@@ -1863,36 +2056,28 @@ mono_type_size (MonoType *t, gint *align)
 	case MONO_TYPE_R4:
 		*align = __alignof__(float);
 		return 4;
-		
 	case MONO_TYPE_I8:
 	case MONO_TYPE_U8:
 		*align = __alignof__(gint64);
+		return 8;		
 	case MONO_TYPE_R8:
 		*align = __alignof__(double);
-		return 8;
-		
+		return 8;		
 	case MONO_TYPE_I:
 	case MONO_TYPE_U:
 		*align = __alignof__(gpointer);
 		return sizeof (gpointer);
-		
 	case MONO_TYPE_STRING:
 		*align = __alignof__(gpointer);
 		return sizeof (gpointer);
-		
 	case MONO_TYPE_OBJECT:
 		*align = __alignof__(gpointer);
 		return sizeof (gpointer);
-		
 	case MONO_TYPE_VALUETYPE: {
-		guint32 size;
-
-		if (t->data.klass->enumtype) {
+		if (t->data.klass->enumtype)
 			return mono_type_size (t->data.klass->enum_basetype, align);
-		} else {
-			size = mono_class_value_size (t->data.klass, align);
-			return size;
-		}
+		else
+			return mono_class_value_size (t->data.klass, align);
 	}
 	case MONO_TYPE_CLASS:
 	case MONO_TYPE_SZARRAY:
@@ -1918,8 +2103,13 @@ mono_type_size (MonoType *t, gint *align)
 int
 mono_type_stack_size (MonoType *t, gint *align)
 {
+	int tmp;
+
 	g_assert (t != NULL);
 
+	if (!align)
+		align = &tmp;
+
 	if (t->byref) {
 		*align = __alignof__(gpointer);
 		return sizeof (gpointer);
@@ -1948,15 +2138,14 @@ mono_type_stack_size (MonoType *t, gint *align)
 		return sizeof (gpointer);
 	case MONO_TYPE_R4:
 		*align = __alignof__(float);
-		return 4;
-		
+		return sizeof (float);		
 	case MONO_TYPE_I8:
 	case MONO_TYPE_U8:
 		*align = __alignof__(gint64);
+		return sizeof (gint64);		
 	case MONO_TYPE_R8:
 		*align = __alignof__(double);
-		return 8;
-		
+		return sizeof (double);
 	case MONO_TYPE_VALUETYPE: {
 		guint32 size;
 
@@ -1964,7 +2153,80 @@ mono_type_stack_size (MonoType *t, gint *align)
 			return mono_type_stack_size (t->data.klass->enum_basetype, align);
 		else {
 			size = mono_class_value_size (t->data.klass, align);
-			*align = __alignof__(gpointer);
+
+			*align = *align + __alignof__(gpointer) - 1;
+			*align &= ~(__alignof__(gpointer) - 1);
+
+			return size;
+		}
+	}
+	default:
+		g_error ("type 0x%02x unknown", t->type);
+	}
+	return 0;
+}
+
+/*
+ * mono_type_native_stack_size:
+ * @t: the type to return the size it uses on the stack
+ *
+ * Returns: the number of bytes required to hold an instance of this
+ * type on the native stack
+ */
+int
+mono_type_native_stack_size (MonoType *t, gint *align)
+{
+	int tmp;
+
+	g_assert (t != NULL);
+
+	if (!align)
+		align = &tmp;
+
+	if (t->byref) {
+		*align = 4;
+		return 4;
+	}
+
+	switch (t->type){
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_CHAR:
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4:
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_FNPTR:
+	case MONO_TYPE_ARRAY:
+	case MONO_TYPE_TYPEDBYREF:
+		*align = 4;
+		return 4;
+	case MONO_TYPE_R4:
+		*align = 4;
+		return 4;
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+	case MONO_TYPE_R8:
+		*align = 4;
+		return 8;
+	case MONO_TYPE_VALUETYPE: {
+		guint32 size;
+
+		if (t->data.klass->enumtype)
+			return mono_type_native_stack_size (t->data.klass->enum_basetype, align);
+		else {
+			size = mono_class_native_size (t->data.klass, align);
+			*align = *align + 3;
+			*align &= ~3;
+			
 			return size;
 		}
 	}
@@ -1974,6 +2236,12 @@ mono_type_stack_size (MonoType *t, gint *align)
 	return 0;
 }
 
+/*
+ * mono_metadata_type_hash:
+ * @t1: a type
+ *
+ * Computes an hash value for @t1 to be used in GHashTable.
+ */
 guint
 mono_metadata_type_hash (MonoType *t1)
 {
@@ -1992,6 +2260,14 @@ mono_metadata_type_hash (MonoType *t1)
 	return hash;
 }
 
+/*
+ * mono_metadata_type_equal:
+ * @t1: a type
+ * @t2: another type
+ *
+ * Determine if @t1 and @t2 represent the same type.
+ * Returns: #TRUE if @t1 and @t2 are equal.
+ */
 gboolean
 mono_metadata_type_equal (MonoType *t1, MonoType *t2)
 {
@@ -2024,6 +2300,10 @@ mono_metadata_type_equal (MonoType *t1, MonoType *t2)
 	case MONO_TYPE_PTR:
 	case MONO_TYPE_SZARRAY:
 		return mono_metadata_type_equal (t1->data.type, t2->data.type);
+	case MONO_TYPE_ARRAY:
+		if (t1->data.array->rank != t2->data.array->rank)
+			return FALSE;
+		return mono_metadata_type_equal (t1->data.array->type, t2->data.array->type);
 	default:
 		g_error ("implement type compare for %0x!", t1->type);
 		return FALSE;
@@ -2032,6 +2312,15 @@ mono_metadata_type_equal (MonoType *t1, MonoType *t2)
 	return FALSE;
 }
 
+/*
+ * mono_metadata_signature_equal:
+ * @sig1: a signature
+ * @sig2: another signature
+ *
+ * Determine if @sig1 and @sig2 represent the same signature, with the
+ * same number of arguments and the same types.
+ * Returns: #TRUE if @sig1 and @sig2 are equal.
+ */
 gboolean
 mono_metadata_signature_equal (MonoMethodSignature *sig1, MonoMethodSignature *sig2)
 {
@@ -2052,9 +2341,32 @@ mono_metadata_signature_equal (MonoMethodSignature *sig1, MonoMethodSignature *s
 			return FALSE;
 	}
 
+	if (!mono_metadata_type_equal (sig1->ret, sig2->ret))
+		return FALSE;
 	return TRUE;
 }
 
+guint
+mono_signature_hash (MonoMethodSignature *sig)
+{
+	guint i, res = sig->ret->type;
+
+	for (i = 0; i < sig->param_count; i++)
+		res = (res << 5) - res + sig->params[i]->type;
+
+	return res;
+}
+
+/*
+ * mono_metadata_encode_value:
+ * @value: value to encode
+ * @buf: buffer where to write the compressed representation
+ * @endbuf: pointer updated to point at the end of the encoded output
+ *
+ * Encodes the value @value in the compressed representation used
+ * in metadata and stores the result in @buf. @buf needs to be big
+ * enough to hold the data (4 bytes).
+ */
 void
 mono_metadata_encode_value (guint32 value, char *buf, char **endbuf)
 {
@@ -2083,18 +2395,19 @@ mono_metadata_encode_value (guint32 value, char *buf, char **endbuf)
  * @index: the index in the field table representing the field
  * @offset: a pointer to an integer where to store the offset that 
  * may have been specified for the field in a FieldLayout table
- * @rva: a pointer to the address of the field data in the image that
+ * @rva: a pointer to the RVA of the field data in the image that
  * may have been defined in a FieldRVA table
- * @marshal_info: a pointer to the marshal signature that may have been 
+ * @marshal_spec: a pointer to the marshal spec that may have been 
  * defined for the field in a FieldMarshal table.
  *
  * Gather info for field @index that may have been defined in the FieldLayout, 
  * FieldRVA and FieldMarshal tables.
- * Either of offset, rva and marshal_info can be NULL if you're not interested 
+ * Either of offset, rva and marshal_spec can be NULL if you're not interested 
  * in the data.
  */
 void
-mono_metadata_field_info (MonoImage *meta, guint32 index, guint32 *offset, const char **rva, const char **marshal_info)
+mono_metadata_field_info (MonoImage *meta, guint32 index, guint32 *offset, guint32 *rva, 
+			  MonoMarshalSpec **marshal_spec)
 {
 	MonoTableInfo *tdef;
 	locator_t loc;
@@ -2117,14 +2430,30 @@ mono_metadata_field_info (MonoImage *meta, guint32 index, guint32 *offset, const
 
 		loc.col_idx = MONO_FIELD_RVA_FIELD;
 		loc.t = tdef;
-
+		
 		if (tdef->base && bsearch (&loc, tdef->base, tdef->rows, tdef->row_size, table_locator)) {
 			/*
 			 * LAMESPEC: There is no signature, no nothing, just the raw data.
 			 */
-			*rva = mono_cli_rva_map (meta->image_info, mono_metadata_decode_row_col (tdef, loc.result, MONO_FIELD_RVA_RVA));
+			*rva = mono_metadata_decode_row_col (tdef, loc.result, MONO_FIELD_RVA_RVA);
 		} else {
-			*rva = NULL;
+			*rva = 0;
+		}
+	}
+	if (marshal_spec) {
+		const char *p;
+		
+		tdef = &meta->tables [MONO_TABLE_FIELDMARSHAL];
+
+		loc.col_idx = MONO_FIELD_MARSHAL_PARENT;
+		loc.t = tdef;
+		loc.idx = (loc.idx << HAS_FIELD_MARSHAL_BITS) | HAS_FIELD_MARSHAL_FIELDSREF;
+
+		if (tdef->base && bsearch (&loc, tdef->base, tdef->rows, tdef->row_size, table_locator)) {
+			p = mono_metadata_blob_heap (meta, mono_metadata_decode_row_col (tdef, loc.result, MONO_FIELD_MARSHAL_NATIVE_TYPE));
+			*marshal_spec = mono_metadata_parse_marshal_spec (meta, p);
+		} else {
+			*marshal_spec = NULL;
 		}
 	}
 
@@ -2172,6 +2501,103 @@ mono_metadata_get_constant_index (MonoImage *meta, guint32 token)
 	return 0;
 }
 
+/*
+ * mono_metadata_events_from_typedef:
+ * @meta: metadata context
+ * @index: 0-based index (in the TypeDef table) describing a type
+ *
+ * Returns: the 0-based index in the Event table for the events in the
+ * type. The last event that belongs to the type (plus 1) is stored
+ * in the @end_idx pointer.
+ */
+guint32
+mono_metadata_events_from_typedef (MonoImage *meta, guint32 index, guint *end_idx)
+{
+	locator_t loc;
+	guint32 start, end;
+	MonoTableInfo *tdef  = &meta->tables [MONO_TABLE_EVENTMAP];
+
+	*end_idx = 0;
+	
+	if (!tdef->base)
+		return 0;
+
+	loc.t = tdef;
+	loc.col_idx = MONO_EVENT_MAP_PARENT;
+	loc.idx = index + 1;
+
+	if (!bsearch (&loc, tdef->base, tdef->rows, tdef->row_size, table_locator))
+		return 0;
+	
+	start = mono_metadata_decode_row_col (tdef, loc.result, MONO_EVENT_MAP_EVENTLIST);
+	if (loc.result + 1 < tdef->rows) {
+		end = mono_metadata_decode_row_col (tdef, loc.result + 1, MONO_EVENT_MAP_EVENTLIST) - 1;
+	} else {
+		end = meta->tables [MONO_TABLE_EVENT].rows;
+	}
+
+	*end_idx = end;
+	return start - 1;
+}
+
+/*
+ * mono_metadata_methods_from_event:
+ * @meta: metadata context
+ * @index: 0-based index (in the Event table) describing a event
+ *
+ * Returns: the 0-based index in the MethodDef table for the methods in the
+ * event. The last method that belongs to the event (plus 1) is stored
+ * in the @end_idx pointer.
+ */
+guint32
+mono_metadata_methods_from_event   (MonoImage *meta, guint32 index, guint *end_idx)
+{
+	locator_t loc;
+	guint start, end;
+	guint32 cols [MONO_METHOD_SEMA_SIZE];
+	MonoTableInfo *msemt = &meta->tables [MONO_TABLE_METHODSEMANTICS];
+
+	*end_idx = 0;
+	if (!msemt->base)
+		return 0;
+
+	loc.t = msemt;
+	loc.col_idx = MONO_METHOD_SEMA_ASSOCIATION;
+	loc.idx = ((index + 1) << HAS_SEMANTICS_BITS) | HAS_SEMANTICS_EVENT; /* Method association coded index */
+
+	if (!bsearch (&loc, msemt->base, msemt->rows, msemt->row_size, table_locator))
+		return 0;
+
+	start = loc.result;
+	/*
+	 * We may end up in the middle of the rows... 
+	 */
+	while (start > 0) {
+		if (loc.idx == mono_metadata_decode_row_col (msemt, start - 1, MONO_METHOD_SEMA_ASSOCIATION))
+			start--;
+		else
+			break;
+	}
+	end = start + 1;
+	while (end < msemt->rows) {
+		mono_metadata_decode_row (msemt, end, cols, MONO_METHOD_SEMA_SIZE);
+		if (cols [MONO_METHOD_SEMA_ASSOCIATION] != loc.idx)
+			break;
+		++end;
+	}
+	*end_idx = end;
+	return start;
+}
+
+/*
+ * mono_metadata_properties_from_typedef:
+ * @meta: metadata context
+ * @index: 0-based index (in the TypeDef table) describing a type
+ *
+ * Returns: the 0-based index in the Property table for the properties in the
+ * type. The last property that belongs to the type (plus 1) is stored
+ * in the @end_idx pointer.
+ */
 guint32
 mono_metadata_properties_from_typedef (MonoImage *meta, guint32 index, guint *end_idx)
 {
@@ -2202,6 +2628,15 @@ mono_metadata_properties_from_typedef (MonoImage *meta, guint32 index, guint *en
 	return start - 1;
 }
 
+/*
+ * mono_metadata_methods_from_property:
+ * @meta: metadata context
+ * @index: 0-based index (in the PropertyDef table) describing a property
+ *
+ * Returns: the 0-based index in the MethodDef table for the methods in the
+ * property. The last method that belongs to the property (plus 1) is stored
+ * in the @end_idx pointer.
+ */
 guint32
 mono_metadata_methods_from_property   (MonoImage *meta, guint32 index, guint *end_idx)
 {
@@ -2216,7 +2651,7 @@ mono_metadata_methods_from_property   (MonoImage *meta, guint32 index, guint *en
 
 	loc.t = msemt;
 	loc.col_idx = MONO_METHOD_SEMA_ASSOCIATION;
-	loc.idx = ((index + 1) << 1) | 1; /* Method association coded index */
+	loc.idx = ((index + 1) << HAS_SEMANTICS_BITS) | HAS_SEMANTICS_PROPERTY; /* Method association coded index */
 
 	if (!bsearch (&loc, msemt->base, msemt->rows, msemt->row_size, table_locator))
 		return 0;
@@ -2242,9 +2677,31 @@ mono_metadata_methods_from_property   (MonoImage *meta, guint32 index, guint *en
 	return start;
 }
 
+guint32
+mono_metadata_implmap_from_method (MonoImage *meta, guint32 method_idx)
+{
+	locator_t loc;
+	MonoTableInfo *tdef  = &meta->tables [MONO_TABLE_IMPLMAP];
+
+	if (!tdef->base)
+		return 0;
+
+	loc.t = tdef;
+	loc.col_idx = MONO_IMPLMAP_MEMBER;
+	loc.idx = ((method_idx + 1) << MEMBERFORWD_BITS) | MEMBERFORWD_METHODDEF;
+
+	if (!bsearch (&loc, tdef->base, tdef->rows, tdef->row_size, table_locator))
+		return 0;
+
+	return loc.result + 1;
+}
+
 /**
  * @image: context where the image is created
  * @type_spec:  typespec token
+ *
+ * Creates a MonoType representing the TypeSpec indexed by the @type_spec
+ * token.
  */
 MonoType *
 mono_type_create_from_typespec (MonoImage *image, guint32 type_spec)
@@ -2266,3 +2723,343 @@ mono_type_create_from_typespec (MonoImage *image, guint32 type_spec)
 	return type;
 }
 
+MonoMarshalSpec *
+mono_metadata_parse_marshal_spec (MonoImage *image, const char *ptr)
+{
+	MonoMarshalSpec *res;
+	int len;
+	const char *start = ptr;
+
+	/* fixme: this is incomplete, but I cant find more infos in the specs */
+
+	res = g_new0 (MonoMarshalSpec, 1);
+	
+	len = mono_metadata_decode_value (ptr, &ptr);
+	res->native = *ptr++;
+
+	if (res->native == MONO_NATIVE_LPARRAY) {
+		if (ptr - start <= len)
+			res->elem_type = *ptr++;
+		if (ptr - start <= len)
+			res->param_num = mono_metadata_decode_value (ptr, &ptr);
+		if (ptr - start <= len)
+			res->num_elem = mono_metadata_decode_value (ptr, &ptr);
+	} 
+
+	if (res->native == MONO_NATIVE_BYVALTSTR) {
+		if (ptr - start <= len)
+			res->num_elem = mono_metadata_decode_value (ptr, &ptr);
+	}
+
+	if (res->native == MONO_NATIVE_BYVALARRAY) {
+		if (ptr - start <= len)
+			res->num_elem = mono_metadata_decode_value (ptr, &ptr);
+	}
+
+	return res;
+}
+
+guint32
+mono_type_to_unmanaged (MonoType *type, MonoMarshalSpec *mspec, gboolean as_field,
+			gboolean unicode, MonoMarshalConv *conv) 
+{
+	MonoMarshalConv dummy_conv;
+	int t = type->type;
+
+	if (!conv)
+		conv = &dummy_conv;
+
+	*conv = MONO_MARSHAL_CONV_NONE;
+
+	if (type->byref)
+		return MONO_NATIVE_UINT;
+
+handle_enum:
+	switch (t) {
+	case MONO_TYPE_BOOLEAN: 
+		if (mspec) {
+			switch (mspec->native) {
+			case MONO_NATIVE_VARIANTBOOL:
+				*conv = MONO_MARSHAL_CONV_BOOL_VARIANTBOOL;
+				return MONO_NATIVE_VARIANTBOOL;
+			case MONO_NATIVE_BOOLEAN:
+				*conv = MONO_MARSHAL_CONV_BOOL_I4;
+				return MONO_NATIVE_BOOLEAN;
+			case MONO_NATIVE_U1:
+				return MONO_NATIVE_U1;
+			default:
+				g_error ("cant marshal bool to native type %02x", mspec->native);
+			}
+		}
+		*conv = MONO_MARSHAL_CONV_BOOL_I4;
+		return MONO_NATIVE_BOOLEAN;
+	case MONO_TYPE_CHAR: return MONO_NATIVE_U2;
+	case MONO_TYPE_I1: return MONO_NATIVE_I1;
+	case MONO_TYPE_U1: return MONO_NATIVE_U1;
+	case MONO_TYPE_I2: return MONO_NATIVE_I2;
+	case MONO_TYPE_U2: return MONO_NATIVE_U2;
+	case MONO_TYPE_I4: return MONO_NATIVE_I4;
+	case MONO_TYPE_U4: return MONO_NATIVE_U4;
+	case MONO_TYPE_I8: return MONO_NATIVE_I8;
+	case MONO_TYPE_U8: return MONO_NATIVE_U8;
+	case MONO_TYPE_R4: return MONO_NATIVE_R4;
+	case MONO_TYPE_R8: return MONO_NATIVE_R8;
+	case MONO_TYPE_STRING:
+		if (mspec) {
+			switch (mspec->native) {
+			case MONO_NATIVE_BSTR:
+				*conv = MONO_MARSHAL_CONV_STR_BSTR;
+				return MONO_NATIVE_BSTR;
+			case MONO_NATIVE_LPSTR:
+				*conv = MONO_MARSHAL_CONV_STR_LPSTR;
+				return MONO_NATIVE_LPSTR;
+			case MONO_NATIVE_LPWSTR:
+				*conv = MONO_MARSHAL_CONV_STR_LPWSTR;
+				return MONO_NATIVE_LPWSTR;
+			case MONO_NATIVE_LPTSTR:
+				*conv = MONO_MARSHAL_CONV_STR_LPTSTR;
+				return MONO_NATIVE_LPTSTR;
+			case MONO_NATIVE_ANSIBSTR:
+				*conv = MONO_MARSHAL_CONV_STR_ANSIBSTR;
+				return MONO_NATIVE_ANSIBSTR;
+			case MONO_NATIVE_TBSTR:
+				*conv = MONO_MARSHAL_CONV_STR_TBSTR;
+				return MONO_NATIVE_TBSTR;
+			case MONO_NATIVE_BYVALTSTR:
+				if (unicode)
+					*conv = MONO_MARSHAL_CONV_STR_BYVALWSTR;
+				else
+					*conv = MONO_MARSHAL_CONV_STR_BYVALSTR;
+				return MONO_NATIVE_BYVALTSTR;
+			default:
+				g_error ("cant marshal string to native type %02x", mspec->native);
+			}
+		} 	
+		*conv = MONO_MARSHAL_CONV_STR_LPTSTR;
+		return MONO_NATIVE_LPTSTR; 
+	case MONO_TYPE_PTR: return MONO_NATIVE_UINT;
+	case MONO_TYPE_VALUETYPE: /*FIXME*/
+		if (type->data.klass->enumtype) {
+			t = type->data.klass->enum_basetype->type;
+			goto handle_enum;
+		}
+		return MONO_NATIVE_STRUCT;
+	case MONO_TYPE_SZARRAY: 
+	case MONO_TYPE_ARRAY: 
+		if (mspec) {
+			switch (mspec->native) {
+			case MONO_NATIVE_BYVALARRAY:
+				*conv = MONO_MARSHAL_CONV_ARRAY_BYVALARRAY;
+				return MONO_NATIVE_BYVALARRAY;
+			case MONO_NATIVE_SAFEARRAY:
+				*conv = MONO_MARSHAL_CONV_ARRAY_SAVEARRAY;
+				return MONO_NATIVE_SAFEARRAY;
+			case MONO_NATIVE_LPARRAY:				
+				*conv = MONO_MARSHAL_CONV_ARRAY_LPARRAY;
+				return MONO_NATIVE_LPARRAY;
+			default:
+				g_error ("cant marshal array as native type %02x", mspec->native);
+			}
+		} 	
+
+		*conv = MONO_MARSHAL_CONV_ARRAY_LPARRAY;
+		return MONO_NATIVE_LPARRAY;
+	case MONO_TYPE_I: return MONO_NATIVE_INT;
+	case MONO_TYPE_U: return MONO_NATIVE_UINT;
+	case MONO_TYPE_CLASS: 
+	case MONO_TYPE_OBJECT: {
+		/* FIXME : we need to handle ArrayList and StringBuilder here, probably */
+		if (mspec) {
+			switch (mspec->native) {
+			case MONO_NATIVE_STRUCT:
+				return MONO_NATIVE_STRUCT;
+			case MONO_NATIVE_INTERFACE:
+				*conv = MONO_MARSHAL_CONV_OBJECT_INTERFACE;
+				return MONO_NATIVE_INTERFACE;
+			case MONO_NATIVE_IDISPATCH:
+				*conv = MONO_MARSHAL_CONV_OBJECT_IDISPATCH;
+				return MONO_NATIVE_IDISPATCH;
+			case MONO_NATIVE_IUNKNOWN:
+				*conv = MONO_MARSHAL_CONV_OBJECT_IUNKNOWN;
+				return MONO_NATIVE_IUNKNOWN;
+			default:
+				g_error ("cant marshal object as native type %02x", mspec->native);
+			}
+		}
+		*conv = MONO_MARSHAL_CONV_OBJECT_STRUCT;
+		return MONO_NATIVE_STRUCT;
+	}
+	case MONO_TYPE_FNPTR: return MONO_NATIVE_FUNC;
+	case MONO_TYPE_TYPEDBYREF:
+	default:
+		g_error ("type 0x%02x not handled in marshal", t);
+	}
+	return MONO_NATIVE_MAX;
+}
+
+gint32
+mono_marshal_type_size (MonoType *type, MonoMarshalSpec *mspec, gint32 *align, 
+			gboolean as_field, gboolean unicode)
+{
+	MonoMarshalNative native_type = mono_type_to_unmanaged (type, mspec, as_field, unicode, NULL);
+	MonoClass *klass;
+
+	switch (native_type) {
+	case MONO_NATIVE_BOOLEAN:
+		*align = 4;
+		return 4;
+	case MONO_NATIVE_I1:
+	case MONO_NATIVE_U1:
+		*align = 1;
+		return 1;
+	case MONO_NATIVE_I2:
+	case MONO_NATIVE_U2:
+		*align = 2;
+		return 2;
+	case MONO_NATIVE_I4:
+	case MONO_NATIVE_U4:
+	case MONO_NATIVE_ERROR:
+		*align = 4;
+		return 4;
+	case MONO_NATIVE_I8:
+	case MONO_NATIVE_U8:
+		*align = 4;
+		return 8;
+	case MONO_NATIVE_R4:
+		*align = 4;
+		return 4;
+	case MONO_NATIVE_R8:
+		*align = 4;
+		return 8;
+	case MONO_NATIVE_INT:
+	case MONO_NATIVE_UINT:
+	case MONO_NATIVE_LPSTR:
+	case MONO_NATIVE_LPWSTR:
+	case MONO_NATIVE_LPTSTR:
+	case MONO_NATIVE_BSTR:
+	case MONO_NATIVE_ANSIBSTR:
+	case MONO_NATIVE_TBSTR:
+	case MONO_NATIVE_LPARRAY:
+	case MONO_NATIVE_SAFEARRAY:
+	case MONO_NATIVE_IUNKNOWN:
+	case MONO_NATIVE_IDISPATCH:
+	case MONO_NATIVE_INTERFACE:
+	case MONO_NATIVE_ASANY:
+	case MONO_NATIVE_VARIANTBOOL:
+	case MONO_NATIVE_FUNC:
+	case MONO_NATIVE_LPSTRUCT:
+		*align =  4;
+		return sizeof (gpointer);
+	case MONO_NATIVE_STRUCT: 
+		klass = mono_class_from_mono_type (type);
+		return mono_class_native_size (klass, align);
+	case MONO_NATIVE_BYVALTSTR: {
+		int esize = unicode ? 2: 1;
+		g_assert (mspec);
+		*align = esize;
+		return mspec->num_elem * esize;
+	}
+	case MONO_NATIVE_BYVALARRAY: {
+		int esize;
+		klass = mono_class_from_mono_type (type);
+		esize = mono_class_native_size (klass->element_class, align);
+		g_assert (mspec);
+		return mspec->num_elem * esize;
+	}
+	case MONO_NATIVE_CURRENCY:
+	case MONO_NATIVE_VBBYREFSTR:
+	case MONO_NATIVE_CUSTOM:
+	default:
+		g_error ("native type %02x not implemented", native_type); 
+		break;
+	}
+	g_assert_not_reached ();
+	return 0;
+}
+
+const char*
+mono_metadata_get_marshal_info (MonoImage *meta, guint32 idx, gboolean is_field)
+{
+	locator_t loc;
+	MonoTableInfo *tdef  = &meta->tables [MONO_TABLE_FIELDMARSHAL];
+
+	if (!tdef->base)
+		return NULL;
+
+	loc.t = tdef;
+	loc.col_idx = MONO_FIELD_MARSHAL_PARENT;
+	loc.idx = ((idx + 1) << HAS_FIELD_MARSHAL_BITS) | (is_field? HAS_FIELD_MARSHAL_FIELDSREF: HAS_FIELD_MARSHAL_PARAMDEF);
+
+	if (!bsearch (&loc, tdef->base, tdef->rows, tdef->row_size, table_locator))
+		return NULL;
+
+	return mono_metadata_blob_heap (meta, mono_metadata_decode_row_col (tdef, loc.result, MONO_FIELD_MARSHAL_NATIVE_TYPE));
+}
+
+static MonoMethod*
+method_from_method_def_or_ref (MonoImage *m, guint32 tok)
+{
+	guint32 idx = tok >> METHODDEFORREF_BITS;
+	switch (tok & METHODDEFORREF_MASK) {
+	case METHODDEFORREF_METHODDEF:
+		return mono_get_method (m, MONO_TOKEN_METHOD_DEF | idx, NULL);
+	case METHODDEFORREF_METHODREF:
+		return mono_get_method (m, MONO_TOKEN_MEMBER_REF | idx, NULL);
+	}
+	g_assert_not_reached ();
+	return NULL;
+}
+
+MonoMethod**
+mono_class_get_overrides (MonoImage *image, guint32 type_token, gint32 *num_overrides)
+{
+	locator_t loc;
+	MonoTableInfo *tdef  = &image->tables [MONO_TABLE_METHODIMPL];
+	guint32 start, end;
+	gint32 i, num;
+	guint32 cols [MONO_METHODIMPL_SIZE];
+	MonoMethod **result;
+
+	if (num_overrides)
+		*num_overrides = 0;
+
+	if (!tdef->base)
+		return NULL;
+
+	loc.t = tdef;
+	loc.col_idx = MONO_METHODIMPL_CLASS;
+	loc.idx = mono_metadata_token_index (type_token);
+
+	if (!bsearch (&loc, tdef->base, tdef->rows, tdef->row_size, table_locator))
+		return NULL;
+
+	start = loc.result;
+	end = start + 1;
+	/*
+	 * We may end up in the middle of the rows... 
+	 */
+	while (start > 0) {
+		if (loc.idx == mono_metadata_decode_row_col (tdef, start - 1, MONO_METHODIMPL_CLASS))
+			start--;
+		else
+			break;
+	}
+	while (end < tdef->rows) {
+		if (loc.idx == mono_metadata_decode_row_col (tdef, end, MONO_METHODIMPL_CLASS))
+			end++;
+		else
+			break;
+	}
+	num = end - start;
+	result = g_new (MonoMethod*, num * 2);
+	for (i = 0; i < num; ++i) {
+		mono_metadata_decode_row (tdef, start + i, cols, MONO_METHODIMPL_SIZE);
+		result [i * 2] = method_from_method_def_or_ref (image, cols [MONO_METHODIMPL_DECLARATION]);
+		result [i * 2 + 1] = method_from_method_def_or_ref (image, cols [MONO_METHODIMPL_BODY]);
+	}
+
+	if (num_overrides)
+		*num_overrides = num;
+	return result;
+}
+
diff --git a/mono/metadata/metadata.h b/mono/metadata/metadata.h
index b7954a8261f..80b48f25e63 100644
--- a/mono/metadata/metadata.h
+++ b/mono/metadata/metadata.h
@@ -14,6 +14,8 @@
 #define MONO_ZERO_LEN_ARRAY 1
 #endif
 
+#define MONO_TYPE_ISSTRUCT(t) (!t->byref && t->type == MONO_TYPE_VALUETYPE && !t->data.klass->enumtype)
+
 typedef struct _MonoClass MonoClass;
 typedef struct _MonoDomain MonoDomain;
 
@@ -80,6 +82,81 @@ typedef enum {
 	MONO_CALL_VARARG
 } MonoCallConvention;
 
+/* ECMA lamespec: the old spec had more info... */
+typedef enum {
+	MONO_NATIVE_BOOLEAN = 0x02, /* 4 bytes, 0 is false, != 0 is true */
+	MONO_NATIVE_I1 = 0x03,
+	MONO_NATIVE_U1 = 0x04,
+	MONO_NATIVE_I2 = 0x05,
+	MONO_NATIVE_U2 = 0x06,
+	MONO_NATIVE_I4 = 0x07,
+	MONO_NATIVE_U4 = 0x08,
+	MONO_NATIVE_I8 = 0x09,
+	MONO_NATIVE_U8 = 0x0a,
+	MONO_NATIVE_R4 = 0x0b,
+	MONO_NATIVE_R8 = 0x0c,
+	MONO_NATIVE_CURRENCY = 0x0f,
+	MONO_NATIVE_BSTR = 0x13, /* prefixed length, Unicode */
+	MONO_NATIVE_LPSTR = 0x14, /* ANSI, null terminated */
+	MONO_NATIVE_LPWSTR = 0x15, /* UNICODE, null terminated */
+	MONO_NATIVE_LPTSTR = 0x16, /* plattform dep., null terminated */
+	MONO_NATIVE_BYVALTSTR = 0x17,
+	MONO_NATIVE_IUNKNOWN = 0x19,
+	MONO_NATIVE_IDISPATCH = 0x1a,
+	MONO_NATIVE_STRUCT = 0x1b,
+	MONO_NATIVE_INTERFACE = 0x1c,
+	MONO_NATIVE_SAFEARRAY = 0x1d,
+	MONO_NATIVE_BYVALARRAY = 0x1e,
+	MONO_NATIVE_INT   = 0x1f,
+	MONO_NATIVE_UINT  = 0x20,
+	MONO_NATIVE_VBBYREFSTR  = 0x22,
+	MONO_NATIVE_ANSIBSTR  = 0x23,  /* prefixed length, ANSI */
+	MONO_NATIVE_TBSTR  = 0x24, /* prefixed length, plattform dep. */
+	MONO_NATIVE_VARIANTBOOL  = 0x25,
+	MONO_NATIVE_FUNC  = 0x26,
+	MONO_NATIVE_ASANY = 0x28,
+	MONO_NATIVE_LPARRAY = 0x2a,
+	MONO_NATIVE_LPSTRUCT = 0x2b,
+	MONO_NATIVE_CUSTOM = 0x2c,
+	MONO_NATIVE_ERROR = 0x2d,
+	MONO_NATIVE_MAX = 0x50 /* no info */
+} MonoMarshalNative;
+
+typedef enum {
+	MONO_MARSHAL_CONV_NONE,
+	MONO_MARSHAL_CONV_BOOL_VARIANTBOOL,
+	MONO_MARSHAL_CONV_BOOL_I4,
+	MONO_MARSHAL_CONV_STR_BSTR,
+	MONO_MARSHAL_CONV_STR_LPSTR,
+	MONO_MARSHAL_CONV_LPSTR_STR,
+	MONO_MARSHAL_CONV_STR_LPWSTR,
+	MONO_MARSHAL_CONV_STR_LPTSTR,
+	MONO_MARSHAL_CONV_STR_ANSIBSTR,
+	MONO_MARSHAL_CONV_STR_TBSTR,
+	MONO_MARSHAL_CONV_STR_BYVALSTR,
+	MONO_MARSHAL_CONV_STR_BYVALWSTR,
+	MONO_MARSHAL_CONV_SB_LPSTR,
+	MONO_MARSHAL_CONV_LPSTR_SB,
+	MONO_MARSHAL_CONV_ARRAY_BYVALARRAY,
+	MONO_MARSHAL_CONV_ARRAY_SAVEARRAY,
+	MONO_MARSHAL_CONV_ARRAY_LPARRAY,
+	MONO_MARSHAL_CONV_OBJECT_INTERFACE,
+	MONO_MARSHAL_CONV_OBJECT_IDISPATCH,
+	MONO_MARSHAL_CONV_OBJECT_IUNKNOWN,
+	MONO_MARSHAL_CONV_OBJECT_STRUCT,
+	MONO_MARSHAL_CONV_DEL_FTN,
+	MONO_MARSHAL_CONV_STRARRAY_STRLPARRAY,
+	MONO_MARSHAL_FREE_ARRAY
+} MonoMarshalConv;
+
+typedef struct {
+	MonoMarshalNative native;
+	MonoMarshalNative elem_type;
+	gint32 param_num;
+	gint32 num_elem;
+} MonoMarshalSpec;
+
+
 void         mono_metadata_decode_row (MonoTableInfo         *t,
 				       int                    idx,
 				       guint32               *res,
@@ -103,29 +180,37 @@ int mono_metadata_compute_size (MonoImage   *meta,
 /*
  *
  */
-char          *mono_metadata_locate        (MonoImage *meta, int table, int idx);
-char          *mono_metadata_locate_token  (MonoImage *meta, guint32 token);
+const char    *mono_metadata_locate        (MonoImage *meta, int table, int idx);
+const char    *mono_metadata_locate_token  (MonoImage *meta, guint32 token);
 					   
-const char    *mono_metadata_string_heap   (MonoImage *meta, guint32 index);
-const char    *mono_metadata_blob_heap     (MonoImage *meta, guint32 index);
-const char    *mono_metadata_user_string   (MonoImage *meta, guint32 index);
+const char    *mono_metadata_string_heap   (MonoImage *meta, guint32 table_index);
+const char    *mono_metadata_blob_heap     (MonoImage *meta, guint32 table_index);
+const char    *mono_metadata_user_string   (MonoImage *meta, guint32 table_index);
+const char    *mono_metadata_guid_heap     (MonoImage *meta, guint32 table_index);
 
-guint32 mono_metadata_typedef_from_field  (MonoImage *meta, guint32 index);
-guint32 mono_metadata_typedef_from_method (MonoImage *meta, guint32 index);
-guint32 mono_metadata_nested_in_typedef   (MonoImage *meta, guint32 index);
-guint32 mono_metadata_nesting_typedef     (MonoImage *meta, guint32 index);
+guint32 mono_metadata_typedef_from_field  (MonoImage *meta, guint32 table_index);
+guint32 mono_metadata_typedef_from_method (MonoImage *meta, guint32 table_index);
+guint32 mono_metadata_nested_in_typedef   (MonoImage *meta, guint32 table_index);
+guint32 mono_metadata_nesting_typedef     (MonoImage *meta, guint32 table_index);
 
-MonoClass** mono_metadata_interfaces_from_typedef (MonoImage *meta, guint32 index, guint *count);
+MonoClass** mono_metadata_interfaces_from_typedef (MonoImage *meta, guint32 table_index, guint *count);
 
-guint32     mono_metadata_properties_from_typedef (MonoImage *meta, guint32 index, guint *end);
-guint32     mono_metadata_methods_from_property   (MonoImage *meta, guint32 index, guint *end);
-guint32     mono_metadata_packing_from_typedef    (MonoImage *meta, guint32 index, guint32 *packing, guint32 *size);
+guint32     mono_metadata_events_from_typedef     (MonoImage *meta, guint32 table_index, guint *end_idx);
+guint32     mono_metadata_methods_from_event      (MonoImage *meta, guint32 table_index, guint *end);
+guint32     mono_metadata_properties_from_typedef (MonoImage *meta, guint32 table_index, guint *end);
+guint32     mono_metadata_methods_from_property   (MonoImage *meta, guint32 table_index, guint *end);
+guint32     mono_metadata_packing_from_typedef    (MonoImage *meta, guint32 table_index, guint32 *packing, guint32 *size);
+const char* mono_metadata_get_marshal_info        (MonoImage *meta, guint32 idx, gboolean is_field);
+
+MonoMarshalSpec *mono_metadata_parse_marshal_spec (MonoImage *image, const char *ptr);
+
+guint32     mono_metadata_implmap_from_method     (MonoImage *meta, guint32 method_idx);
 
 void        mono_metadata_field_info (MonoImage *meta, 
-				      guint32       index,
+				      guint32       table_index,
 				      guint32      *offset,
-				      const char  **rva,
-				      const char  **marshal_info);
+				      guint32      *rva,
+				      MonoMarshalSpec **marshal_spec);
 
 guint32     mono_metadata_get_constant_index (MonoImage *meta, guint32 token);
 
@@ -190,7 +275,8 @@ struct _MonoMethodSignature {
 	unsigned int  hasthis : 1;
 	unsigned int  explicit_this   : 1;
 	unsigned int  call_convention : 6;
-	unsigned int  ref_count : 24;
+	unsigned int  pinvoke   : 1;
+	unsigned int  ref_count : 23;
 	guint16       param_count;
 	guint16       sentinelpos;
 	MonoType     *ret;
@@ -244,17 +330,22 @@ MonoType      *mono_metadata_parse_field_type  (MonoImage      *m,
 		                                short            field_flags,
 						const char      *ptr,
 						const char      **rptr);
-MonoType      *mono_type_create_from_typespec (MonoImage        *image, 
-					       guint32           type_spec);
+MonoType      *mono_type_create_from_typespec  (MonoImage        *image, 
+					        guint32           type_spec);
 void           mono_metadata_free_type         (MonoType        *type);
 int            mono_type_size                  (MonoType        *type, 
 						int             *alignment);
 int            mono_type_stack_size            (MonoType        *type, 
 						int             *alignment);
+int            mono_type_native_stack_size     (MonoType        *type, 
+						int             *alignment);
 
 guint          mono_metadata_type_hash         (MonoType *t1);
 gboolean       mono_metadata_type_equal        (MonoType *t1, MonoType *t2);
 
+MonoMethodSignature  *mono_metadata_parse_signature (MonoImage *image, 
+						     guint32    token);
+
 MonoMethodSignature  *mono_metadata_parse_method_signature (MonoImage            *m,
                                                             int                    def,
                                                             const char            *ptr,
@@ -264,9 +355,19 @@ void                  mono_metadata_free_method_signature  (MonoMethodSignature
 gboolean          mono_metadata_signature_equal (MonoMethodSignature *sig1, 
 						 MonoMethodSignature *sig2);
 
+guint             mono_signature_hash (MonoMethodSignature *sig);
+
 MonoMethodHeader *mono_metadata_parse_mh (MonoImage *m, const char *ptr);
 void              mono_metadata_free_mh  (MonoMethodHeader *mh);
 
+guint32 
+mono_type_to_unmanaged (MonoType *type, MonoMarshalSpec *mspec, 
+			gboolean as_field, gboolean unicode, MonoMarshalConv *conv);
+
+gint32
+mono_marshal_type_size (MonoType *type, MonoMarshalSpec *mspec, gint32 *align, 
+			gboolean as_field, gboolean unicode);
+
 /*
  * Makes a token based on a table and an index
  */
diff --git a/mono/metadata/mono-config.c b/mono/metadata/mono-config.c
new file mode 100644
index 00000000000..f0553980f28
--- /dev/null
+++ b/mono/metadata/mono-config.c
@@ -0,0 +1,267 @@
+/*
+ * mono-config.c
+ *
+ * Runtime and assembly configuration file support routines.
+ *
+ * Author: Paolo Molaro (lupus@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+#include "config.h"
+#include <glib.h>
+#include <string.h>
+#include "mono/metadata/loader.h"
+#include "mono/metadata/mono-config.h"
+
+static void start_element (GMarkupParseContext *context, 
+                           const gchar         *element_name,
+			   const gchar        **attribute_names,
+			   const gchar        **attribute_values,
+			   gpointer             user_data,
+			   GError             **error);
+
+static void end_element   (GMarkupParseContext *context,
+                           const gchar         *element_name,
+			   gpointer             user_data,
+			   GError             **error);
+
+static void parse_text    (GMarkupParseContext *context,
+                           const gchar         *text,
+			   gsize                text_len,
+			   gpointer             user_data,
+			   GError             **error);
+
+static void passthrough   (GMarkupParseContext *context,
+                           const gchar         *text,
+			   gsize                text_len,
+			   gpointer             user_data,
+			   GError             **error);
+
+static void parse_error   (GMarkupParseContext *context,
+                           GError              *error,
+			   gpointer             user_data);
+
+static const GMarkupParser 
+mono_parser = {
+	start_element,
+	end_element,
+	parse_text,
+	passthrough,
+	parse_error
+};
+
+static GHashTable *config_handlers;
+
+/* when this interface is stable, export it. */
+typedef struct MonoParseHandler MonoParseHandler;
+
+struct MonoParseHandler {
+	const char *element_name;
+	void*(*init)   (void);
+	void (*start)  (gpointer user_data, const gchar *name,
+	                const gchar **attributes,
+		        const gchar **values);
+	void (*text)   (gpointer user_data, const char *text, gsize test_len);
+	void (*end)    (gpointer user_data, const char *name);
+	void (*finish) (gpointer user_data);
+};
+
+typedef struct {
+	MonoParseHandler *current;
+	void *user_data;
+	int inited;
+} ParseState;
+
+static void start_element (GMarkupParseContext *context, 
+                           const gchar         *element_name,
+			   const gchar        **attribute_names,
+			   const gchar        **attribute_values,
+			   gpointer             user_data,
+			   GError             **error)
+{
+	ParseState *state = user_data;
+	if (!state->current) {
+		state->current = g_hash_table_lookup (config_handlers, element_name);
+		if (state->current && state->current->init)
+			state->user_data = state->current->init ();
+	}
+	if (state->current && state->current->start)
+		state->current->start (state->user_data, element_name, attribute_names, attribute_values);
+}
+
+static void end_element   (GMarkupParseContext *context,
+                           const gchar         *element_name,
+			   gpointer             user_data,
+			   GError             **error)
+{
+	ParseState *state = user_data;
+	if (state->current) {
+		if (state->current->end)
+			state->current->end (state->user_data, element_name);
+		if (strcmp (state->current->element_name, element_name) == 0) {
+			if (state->current->finish)
+				state->current->finish (state->user_data);
+			state->current = NULL;
+			state->user_data = NULL;
+		}
+	}
+}
+
+static void parse_text    (GMarkupParseContext *context,
+                           const gchar         *text,
+			   gsize                text_len,
+			   gpointer             user_data,
+			   GError             **error)
+{
+	ParseState *state = user_data;
+	if (state->current && state->current->text)
+		state->current->text (state->user_data, text, text_len);
+}
+
+static void passthrough   (GMarkupParseContext *context,
+                           const gchar         *text,
+			   gsize                text_len,
+			   gpointer             user_data,
+			   GError             **error)
+{
+	/* do nothing */
+}
+
+static void parse_error   (GMarkupParseContext *context,
+                           GError              *error,
+			   gpointer             user_data)
+{
+}
+
+typedef struct {
+	char *dll;
+	char *target;
+} DllInfo;
+
+static void*
+dllmap_init (void) {
+	DllInfo *info = g_new0 (DllInfo, 1);
+	return info;
+}
+
+static void
+dllmap_start (gpointer user_data, 
+              const gchar         *element_name,
+              const gchar        **attribute_names,
+              const gchar        **attribute_values)
+{
+	int i;
+	DllInfo *info = user_data;
+	
+	if (strcmp (element_name, "dllmap") == 0) {
+		g_free (info->dll);
+		g_free (info->target);
+		info->dll = info->target = NULL;
+		for (i = 0; attribute_names [i]; ++i) {
+			if (strcmp (attribute_names [i], "dll") == 0)
+				info->dll = g_strdup (attribute_values [i]);
+			else if (strcmp (attribute_names [i], "target") == 0)
+				info->target = g_strdup (attribute_values [i]);
+		}
+		mono_dllmap_insert (info->dll, NULL, info->target, NULL);
+	} else if (strcmp (element_name, "dllentry") == 0) {
+		const char *name = NULL, *target = NULL, *dll = NULL;
+		for (i = 0; attribute_names [i]; ++i) {
+			if (strcmp (attribute_names [i], "dll") == 0)
+				dll = attribute_values [i];
+			else if (strcmp (attribute_names [i], "target") == 0)
+				target = attribute_values [i];
+			else if (strcmp (attribute_names [i], "name") == 0)
+				name = attribute_values [i];
+		}
+		if (!dll)
+			dll = info->dll;
+		mono_dllmap_insert (info->dll, name, dll, target);
+	}
+}
+
+static void
+dllmap_finish (gpointer user_data)
+{
+	DllInfo *info = user_data;
+
+	g_free (info->dll);
+	g_free (info->target);
+	g_free (info);
+}
+
+static const MonoParseHandler
+dllmap_handler = {
+	"dllmap",
+	dllmap_init,
+	dllmap_start,
+	NULL, /* text */
+	NULL, /* end */
+	dllmap_finish
+};
+
+
+static int inited = 0;
+
+static void
+mono_config_init (void)
+{
+	inited = 1;
+	config_handlers = g_hash_table_new (g_str_hash, g_str_equal);
+	g_hash_table_insert (config_handlers, dllmap_handler.element_name, &dllmap_handler);
+}
+
+/* FIXME: error handling */
+
+static void
+mono_config_parse_file (const char *filename)
+{
+	GMarkupParseContext *context;
+	ParseState state = {NULL};
+	char *text;
+	gsize len;
+
+	if (!inited)
+		mono_config_init ();
+
+	if (!g_file_get_contents (filename, &text, &len, NULL))
+		return;
+	context = g_markup_parse_context_new (&mono_parser, 0, &state, NULL);
+	if (g_markup_parse_context_parse (context, text, len, NULL)) {
+		g_markup_parse_context_end_parse (context, NULL);
+	}
+	g_markup_parse_context_free (context);
+}
+
+/*
+ * Pass a NULL filename to parse the default config files
+ * (or the file in the MONO_CONFIG env var).
+ */
+void
+mono_config_parse (const char *filename) {
+	const char *home;
+	char *user_cfg;
+	
+	if (filename) {
+		mono_config_parse_file (filename);
+		return;
+	}
+
+	home = g_getenv ("MONO_CONFIG");
+	if (home) {
+		mono_config_parse_file (home);
+		return;
+	}
+#if defined (PLATFORM_WIN32)
+	/* maybe it's better to use a registry key or the install root from the binary */
+	mono_config_parse_file (MONO_CFG_DIR "\\mono\\config");
+#else
+	mono_config_parse_file (MONO_CFG_DIR "/mono/config");
+	home = g_get_home_dir ();
+	user_cfg = g_strconcat (home, G_DIR_SEPARATOR_S, ".mono/config", NULL);
+	mono_config_parse_file (user_cfg);
+	g_free (user_cfg);
+#endif
+	
+}
+
diff --git a/mono/metadata/mono-config.h b/mono/metadata/mono-config.h
new file mode 100644
index 00000000000..e32f2e706b5
--- /dev/null
+++ b/mono/metadata/mono-config.h
@@ -0,0 +1,14 @@
+/*
+ * mono-config.h
+ *
+ * Author: Paolo Molaro (lupus@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+#ifndef __MONO_METADATA_CONFIG_H__
+#define __MONO_METADATA_CONFIG_H__
+
+void mono_config_parse (const char *filename);
+
+#endif /* __MONO_METADATA_CONFIG_H__ */
+
diff --git a/mono/metadata/mono-endian.h b/mono/metadata/mono-endian.h
index a51cdc0f77a..c371250f91b 100644
--- a/mono/metadata/mono-endian.h
+++ b/mono/metadata/mono-endian.h
@@ -25,9 +25,9 @@ guint64 mono_read64 (const unsigned char *x);
 
 #else
 
-#define read16(x) GUINT16_FROM_LE (*((guint16 *) (x)))
-#define read32(x) GUINT32_FROM_LE (*((guint32 *) (x)))
-#define read64(x) GUINT64_FROM_LE (*((guint64 *) (x)))
+#define read16(x) GUINT16_FROM_LE (*((const guint16 *) (x)))
+#define read32(x) GUINT32_FROM_LE (*((const guint32 *) (x)))
+#define read64(x) GUINT64_FROM_LE (*((const guint64 *) (x)))
 
 #endif
 
diff --git a/mono/metadata/object.c b/mono/metadata/object.c
index 27669fb13df..61094bdcce6 100644
--- a/mono/metadata/object.c
+++ b/mono/metadata/object.c
@@ -11,30 +11,699 @@
 #include <stdio.h>
 #include <signal.h>
 #include <string.h>
+#include <mono/metadata/mono-endian.h>
 #include <mono/metadata/tabledefs.h>
+#include <mono/metadata/tokentype.h>
 #include <mono/metadata/loader.h>
 #include <mono/metadata/object.h>
+#include <mono/metadata/gc.h>
 #include <mono/metadata/appdomain.h>
+#include <mono/metadata/assembly.h>
+#include <mono/metadata/threadpool.h>
+#include <mono/metadata/marshal.h>
+#include "mono/metadata/debug-helpers.h"
+#include "mono/metadata/marshal.h"
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
+
+void
+mono_runtime_object_init (MonoObject *this)
+{
+	int i;
+	MonoMethod *method = NULL;
+	MonoClass *klass = this->vtable->klass;
+
+	for (i = 0; i < klass->method.count; ++i) {
+		if (!strcmp (".ctor", klass->methods [i]->name) &&
+		    klass->methods [i]->signature->param_count == 0) {
+			method = klass->methods [i];
+			break;
+		}
+	}
+
+	g_assert (method);
+
+	mono_runtime_invoke (method, this, NULL, NULL);
+}
+
+/*
+ * runtime_class_init:
+ * @klass: klass that needs to be initialized
+ *
+ * This routine calls the class constructor for @class.
+ */
+void
+mono_runtime_class_init (MonoClass *klass)
+{
+	int i;
+
+	for (i = 0; i < klass->method.count; ++i) {
+		MonoMethod *method = klass->methods [i];
+		if ((method->flags & METHOD_ATTRIBUTE_SPECIAL_NAME) && 
+		    (strcmp (".cctor", method->name) == 0)) {
+			mono_runtime_invoke (method, NULL, NULL, NULL);
+			return;
+		}
+	}
+
+	/* No class constructor found */
+}
+
+static gpointer
+default_trampoline (MonoMethod *method)
+{
+	return method;
+}
+
+static gpointer
+default_remoting_trampoline (MonoMethod *method)
+{
+	g_error ("remoting not installed");
+	return NULL;
+}
+
+static MonoTrampoline arch_create_jit_trampoline = default_trampoline;
+static MonoTrampoline arch_create_remoting_trampoline = default_remoting_trampoline;
 
+void
+mono_install_trampoline (MonoTrampoline func) 
+{
+	arch_create_jit_trampoline = func? func: default_trampoline;
+}
+
+void
+mono_install_remoting_trampoline (MonoTrampoline func) 
+{
+	arch_create_remoting_trampoline = func? func: default_remoting_trampoline;
+}
+
+static MonoCompileFunc default_mono_compile_method = NULL;
+
+void        
+mono_install_compile_method (MonoCompileFunc func)
+{
+	default_mono_compile_method = func;
+}
+
+gpointer 
+mono_compile_method (MonoMethod *method)
+{
+	if (!default_mono_compile_method) {
+		g_error ("compile method called on uninitialized runtime");
+		return NULL;
+	}
+	return default_mono_compile_method (method);
+}
+
+
+#if 0 && HAVE_BOEHM_GC
 static void
-default_runtime_object_init (MonoObject *o)
+vtable_finalizer (void *obj, void *data) {
+	g_print ("%s finalized (%p)\n", (char*)data, obj);
+}
+#endif
+
+/**
+ * mono_class_vtable:
+ * @domain: the application domain
+ * @class: the class to initialize
+ *
+ * VTables are domain specific because we create domain specific code, and 
+ * they contain the domain specific static class data.
+ */
+MonoVTable *
+mono_class_vtable (MonoDomain *domain, MonoClass *class)
+{
+	MonoClass *k;
+	MonoVTable *vt;
+	MonoClassField *field;
+	guint32 cindex;
+	guint32 cols [MONO_CONSTANT_SIZE];
+	const char *p;
+	char *t;
+	int i, len;
+
+	g_assert (class);
+
+	vt = class->cached_vtable;
+	if (vt && vt->domain == domain)
+		return vt;
+
+	/* can interfaces have static fields? */
+	if (class->flags & TYPE_ATTRIBUTE_INTERFACE)
+		g_assert_not_reached ();
+
+	mono_domain_lock (domain);
+	if ((vt = mono_g_hash_table_lookup (domain->class_vtable_hash, class))) {
+		mono_domain_unlock (domain);
+		return vt;
+	}
+	
+	if (!class->inited)
+		mono_class_init (class);
+
+	mono_stats.used_class_count++;
+	mono_stats.class_vtable_size += sizeof (MonoVTable) + class->vtable_size * sizeof (gpointer);
+
+	vt = mono_mempool_alloc0 (domain->mp,  sizeof (MonoVTable) + 
+				  class->vtable_size * sizeof (gpointer));
+	vt->klass = class;
+	vt->domain = domain;
+
+	if (class->class_size) {
+#if HAVE_BOEHM_GC
+		vt->data = GC_malloc (class->class_size + 8);
+		/*vt->data = GC_debug_malloc (class->class_size + 8, class->name, 2);*/
+		/*GC_register_finalizer (vt->data, vtable_finalizer, class->name, NULL, NULL);*/
+		mono_g_hash_table_insert (domain->static_data_hash, class, vt->data);
+#else
+		vt->data = mono_mempool_alloc0 (domain->mp, class->class_size + 8);
+		
+#endif
+		mono_stats.class_static_data_size += class->class_size + 8;
+	}
+
+	for (i = class->field.first; i < class->field.last; ++i) {
+		field = &class->fields [i - class->field.first];
+		if (!(field->type->attrs & FIELD_ATTRIBUTE_STATIC))
+			continue;
+		if ((field->type->attrs & FIELD_ATTRIBUTE_HAS_FIELD_RVA)) {
+			MonoClass *fklass = mono_class_from_mono_type (field->type);
+			t = (char*)vt->data + field->offset;
+			g_assert (fklass->valuetype);
+			memcpy (t, field->data, mono_class_value_size (fklass, NULL));
+			continue;
+		}
+		if (!(field->type->attrs & FIELD_ATTRIBUTE_HAS_DEFAULT))
+			continue;
+		cindex = mono_metadata_get_constant_index (class->image, MONO_TOKEN_FIELD_DEF | (i + 1));
+		if (!cindex) {
+			g_warning ("constant for field %s not found", field->name);
+			continue;
+		}
+		mono_metadata_decode_row (&class->image->tables [MONO_TABLE_CONSTANT], cindex - 1, cols, MONO_CONSTANT_SIZE);
+		p = mono_metadata_blob_heap (class->image, cols [MONO_CONSTANT_VALUE]);
+		len = mono_metadata_decode_blob_size (p, &p);
+		t = (char*)vt->data + field->offset;
+		/* should we check that the type matches? */
+		switch (cols [MONO_CONSTANT_TYPE]) {
+		case MONO_TYPE_BOOLEAN:
+		case MONO_TYPE_U1:
+		case MONO_TYPE_I1:
+			*t = *p;
+			break;
+		case MONO_TYPE_CHAR:
+		case MONO_TYPE_U2:
+		case MONO_TYPE_I2: {
+			guint16 *val = (guint16*)t;
+			*val = read16 (p);
+			break;
+		}
+		case MONO_TYPE_U4:
+		case MONO_TYPE_I4: {
+			guint32 *val = (guint32*)t;
+			*val = read32 (p);
+			break;
+		}
+		case MONO_TYPE_U8:
+		case MONO_TYPE_I8: {
+			guint64 *val = (guint64*)t;
+			*val = read64 (p);
+			break;
+		}
+		case MONO_TYPE_R4: {
+			float *val = (float*)t;
+			readr4 (p, val);
+			break;
+		}
+		case MONO_TYPE_R8: {
+			double *val = (double*)t;
+			readr8 (p, val);
+			break;
+		}
+		case MONO_TYPE_STRING: {
+			gpointer *val = (gpointer*)t;
+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
+			gunichar2 *copy = g_malloc (len);
+			int j;
+			for (j = 0; j < len/2; j++) {
+				copy [j] = read16 (p);
+				p += 2;
+			}
+			*val = mono_string_new_utf16 (domain, copy, len/2);
+			g_free (copy);
+#else
+			*val = mono_string_new_utf16 (domain, (const guint16*)p, len/2);
+#endif
+			break;
+		}
+		case MONO_TYPE_CLASS:
+			/* nothing to do, we malloc0 the data and the value can be 0 only */
+			break;
+		default:
+			g_warning ("type 0x%02x should not be in constant table", cols [MONO_CONSTANT_TYPE]);
+		}
+	}
+
+	vt->max_interface_id = class->max_interface_id;
+	
+	vt->interface_offsets = mono_mempool_alloc0 (domain->mp, 
+	        sizeof (gpointer) * (class->max_interface_id + 1));
+
+	/* initialize interface offsets */
+	for (k = class; k ; k = k->parent) {
+		for (i = 0; i < k->interface_count; i++) {
+			int slot;
+			MonoClass *ic = k->interfaces [i];
+			slot = class->interface_offsets [ic->interface_id];
+			vt->interface_offsets [ic->interface_id] = &vt->vtable [slot];
+		}
+	}
+
+	/* initialize vtable */
+	for (i = 0; i < class->vtable_size; ++i) {
+		MonoMethod *cm;
+	       
+		if ((cm = class->vtable [i]))
+			vt->vtable [i] = arch_create_jit_trampoline (cm);
+	}
+
+	mono_g_hash_table_insert (domain->class_vtable_hash, class, vt);
+	if (!class->cached_vtable)
+		class->cached_vtable = vt;
+
+	mono_domain_unlock (domain);
+
+	/* make sure the the parent is initialized */
+	if (class->parent)
+		mono_class_vtable (domain, class->parent);
+
+	mono_runtime_class_init (class);
+	
+	return vt;
+}
+
+/**
+ * mono_class_proxy_vtable:
+ * @domain: the application domain
+ * @class: the class to proxy
+ *
+ * Creates a vtable for transparent proxies. It is basically
+ * a copy of the real vtable of @class, but all function pointers invoke
+ * the remoting functions, and vtable->klass points to the 
+ * transparent proxy class, and not to @class.
+ */
+MonoVTable *
+mono_class_proxy_vtable (MonoDomain *domain, MonoClass *class)
 {
-	return;
+	MonoVTable *vt, *pvt;
+	int i, vtsize;
+
+	if ((pvt = mono_g_hash_table_lookup (domain->proxy_vtable_hash, class)))
+		return pvt;
+
+	vt = mono_class_vtable (domain, class);
+	vtsize = sizeof (MonoVTable) + class->vtable_size * sizeof (gpointer);
+
+	mono_stats.class_vtable_size += vtsize;
+
+	pvt = mono_mempool_alloc (domain->mp, vtsize);
+	memcpy (pvt, vt, vtsize);
+
+	pvt->klass = mono_defaults.transparent_proxy_class;
+
+	/* initialize vtable */
+	for (i = 0; i < class->vtable_size; ++i) {
+		MonoMethod *cm;
+	       
+		if ((cm = class->vtable [i]))
+			pvt->vtable [i] = arch_create_remoting_trampoline (cm);
+	}
+
+	mono_g_hash_table_insert (domain->proxy_vtable_hash, class, pvt);
+
+	return pvt;
 }
 
-MonoRuntimeObjectInit mono_runtime_object_init = default_runtime_object_init;
-MonoRuntimeExecMain   mono_runtime_exec_main = NULL;
+static MonoInvokeFunc default_mono_runtime_invoke = NULL;
+
+MonoObject*
+mono_runtime_invoke (MonoMethod *method, void *obj, void **params, MonoObject **exc)
+{
+	if (!default_mono_runtime_invoke) {
+		g_error ("runtime invoke called on uninitialized runtime");
+		return NULL;
+	}
+
+	return default_mono_runtime_invoke (method, obj, params, exc);
+}
+
+static void
+set_value (MonoType *type, void *dest, void *value, int deref_pointer) {
+	int t;
+	if (type->byref) {
+		gpointer *p = (gpointer*)dest;
+		*p = value;
+		return;
+	}
+	t = type->type;
+handle_enum:
+	switch (t) {
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1: {
+		guint8 *p = (guint8*)dest;
+		*p = *(guint8*)value;
+		return;
+	}
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR: {
+		guint16 *p = (guint16*)dest;
+		*p = *(guint16*)value;
+		return;
+	}
+#if SIZEOF_VOID_P == 4
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4: {
+		gint32 *p = (gint32*)dest;
+		*p = *(gint32*)value;
+		return;
+	}
+#if SIZEOF_VOID_P == 8
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+#endif
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8: {
+		gint64 *p = (gint64*)dest;
+		*p = *(gint64*)value;
+		return;
+	}
+	case MONO_TYPE_R4: {
+		float *p = (float*)dest;
+		*p = *(float*)value;
+		return;
+	}
+	case MONO_TYPE_R8: {
+		double *p = (double*)dest;
+		*p = *(double*)value;
+		return;
+	}
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_ARRAY:
+	case MONO_TYPE_PTR: {
+		gpointer *p = (gpointer*)dest;
+		*p = deref_pointer? *(gpointer*)value: value;
+		return;
+	}
+	case MONO_TYPE_VALUETYPE:
+		if (type->data.klass->enumtype) {
+			t = type->data.klass->enum_basetype->type;
+			goto handle_enum;
+		} else {
+			int size;
+			size = mono_class_value_size (type->data.klass, NULL);
+			memcpy (dest, value, size);
+		}
+		return;
+	default:
+		g_warning ("got type %x", type->type);
+		g_assert_not_reached ();
+	}
+}
 
 void
-mono_install_runtime_object_init (MonoRuntimeObjectInit func)
+mono_field_set_value (MonoObject *obj, MonoClassField *field, void *value)
 {
-	mono_runtime_object_init = func? func: default_runtime_object_init;
+	void *dest;
+
+	g_return_if_fail (!(field->type->attrs & FIELD_ATTRIBUTE_STATIC));
+
+	dest = (char*)obj + field->offset;
+	set_value (field->type, dest, value, FALSE);
 }
 
 void
-mono_install_runtime_exec_main (MonoRuntimeExecMain func)
+mono_field_static_set_value (MonoVTable *vt, MonoClassField *field, void *value)
 {
-	mono_runtime_exec_main = func;
+	void *dest;
+
+	g_return_if_fail (field->type->attrs & FIELD_ATTRIBUTE_STATIC);
+
+	dest = (char*)vt->data + field->offset;
+	set_value (field->type, dest, value, FALSE);
+}
+
+void
+mono_field_get_value (MonoObject *obj, MonoClassField *field, void *value)
+{
+	void *src;
+
+	g_return_if_fail (!(field->type->attrs & FIELD_ATTRIBUTE_STATIC));
+
+	src = (char*)obj + field->offset;
+	set_value (field->type, value, src, TRUE);
+}
+
+void
+mono_field_static_get_value (MonoVTable *vt, MonoClassField *field, void *value)
+{
+	void *src;
+
+	g_return_if_fail (field->type->attrs & FIELD_ATTRIBUTE_STATIC);
+
+	src = (char*)vt->data + field->offset;
+	set_value (field->type, value, src, TRUE);
+}
+
+void
+mono_property_set_value (MonoProperty *prop, void *obj, void **params, MonoObject **exc)
+{
+	default_mono_runtime_invoke (prop->set, obj, params, exc);
+}
+
+MonoObject*
+mono_property_get_value (MonoProperty *prop, void *obj, void **params, MonoObject **exc)
+{
+	return default_mono_runtime_invoke (prop->get, obj, params, exc);
+}
+
+
+MonoMethod *
+mono_get_delegate_invoke (MonoClass *klass)
+{
+	MonoMethod *im;
+	int i;
+
+	im = NULL;
+
+	for (i = 0; i < klass->method.count; ++i) {
+		if (klass->methods [i]->name[0] == 'I' && 
+		    !strcmp ("Invoke", klass->methods [i]->name)) {
+			im = klass->methods [i];
+		}
+	}
+
+	g_assert (im);
+
+	return im;
+}
+
+MonoObject*
+mono_runtime_delegate_invoke (MonoObject *delegate, void **params, MonoObject **exc)
+{
+	MonoMethod *im;
+
+	im = mono_get_delegate_invoke (delegate->vtable->klass);
+	g_assert (im);
+
+	return mono_runtime_invoke (im, delegate, params, exc);
+}
+
+static MonoArray* main_args;
+
+MonoArray*
+mono_runtime_get_main_args (void)
+{
+	return main_args;
+}
+
+MonoMethod *mono_start_method = NULL;
+
+/*
+ * Execute a standard Main() method (argc/argv contains the
+ * executable name). This method also sets the command line argument value
+ * needed by System.Environment.
+ */
+int
+mono_runtime_run_main (MonoMethod *method, int argc, char* argv[],
+		       MonoObject **exc)
+{
+	int i;
+	MonoArray *args = NULL;
+	MonoDomain *domain = mono_domain_get ();
+
+	main_args = (MonoArray*)mono_array_new (domain, mono_defaults.string_class, argc);
+	for (i = 0; i < argc; ++i) {
+		MonoString *arg = mono_string_new (domain, argv [i]);
+		mono_array_set (main_args, gpointer, i, arg);
+	}
+	argc--;
+	argv++;
+	if (method->signature->param_count) {
+		args = (MonoArray*)mono_array_new (domain, mono_defaults.string_class, argc);
+		for (i = 0; i < argc; ++i) {
+			MonoString *arg = mono_string_new (domain, argv [i]);
+			mono_array_set (args, gpointer, i, arg);
+		}
+	} else {
+		args = (MonoArray*)mono_array_new (domain, mono_defaults.string_class, 0);
+	}
+	
+	mono_assembly_set_main (method->klass->image->assembly);
+
+	mono_start_method = mono_marshal_get_runtime_invoke (method);
+	
+	return mono_runtime_exec_main (method, args, exc);
+}
+
+/*
+ * We call this function when we dectect an unhandled exception. It invokes the
+ * UnhandledException event in AppDomain or print a warning to the console 
+ */
+void
+mono_unhandled_exception (MonoObject *exc)
+{
+	MonoDomain *domain = mono_domain_get ();
+	MonoClassField *field;
+	MonoObject *delegate;
+	
+	field=mono_class_get_field_from_name(mono_defaults.appdomain_class, 
+					     "UnhandledException");
+	g_assert (field);
+
+	if (exc->vtable->klass != mono_defaults.threadabortexception_class) {
+		delegate = *(MonoObject **)(((char *)domain->domain) + field->offset); 
+
+		if (!delegate) {
+			mono_print_unhandled_exception (exc);
+		} else {
+			MonoObject *e = NULL;
+			gpointer pa [2];
+
+			/* fixme: pass useful arguments */
+			pa [0] = NULL;
+			pa [1] = NULL;
+			mono_runtime_delegate_invoke (delegate, pa, &e);
+			
+			if (e)
+				g_warning ("exception inside UnhandledException handler!");
+		}
+	}
+}
+
+/*
+ * Execute a standard Main() method (args doesn't contain the
+ * executable name).
+ */
+int
+mono_runtime_exec_main (MonoMethod *method, MonoArray *args, MonoObject **exc)
+{
+	MonoDomain *domain;
+	gpointer pa [1];
+	int rval;
+
+	g_assert (args);
+
+	pa [0] = args;
+
+	domain = mono_object_domain (args);
+	if (!domain->entry_assembly)
+		domain->entry_assembly = method->klass->image->assembly;
+
+	/* FIXME: check signature of method */
+	if (method->signature->ret->type == MONO_TYPE_I4) {
+		MonoObject *res;
+		res = mono_runtime_invoke (method, NULL, pa, exc);
+		if (!exc || !*exc)
+			rval = *(guint32 *)((char *)res + sizeof (MonoObject));
+		else
+			rval = -1;
+	} else {
+		mono_runtime_invoke (method, NULL, pa, exc);
+		if (!exc || !*exc)
+			rval = 0;
+		else
+			rval = -1;
+	}
+
+	return rval;
+}
+
+void
+mono_install_runtime_invoke (MonoInvokeFunc func)
+{
+	default_mono_runtime_invoke = func;
+}
+
+MonoObject*
+mono_runtime_invoke_array (MonoMethod *method, void *obj, MonoArray *params,
+			   MonoObject **exc)
+{
+	MonoMethodSignature *sig = method->signature;
+	gpointer *pa = NULL;
+	int i;
+		
+	if (NULL != params) {
+		pa = alloca (sizeof (gpointer) * mono_array_length (params));
+		for (i = 0; i < mono_array_length (params); i++) {
+			if (sig->params [i]->byref) {
+				/* nothing to do */
+			}
+
+			switch (sig->params [i]->type) {
+			case MONO_TYPE_U1:
+			case MONO_TYPE_I1:
+			case MONO_TYPE_BOOLEAN:
+			case MONO_TYPE_U2:
+			case MONO_TYPE_I2:
+			case MONO_TYPE_CHAR:
+			case MONO_TYPE_U:
+			case MONO_TYPE_I:
+			case MONO_TYPE_U4:
+			case MONO_TYPE_I4:
+			case MONO_TYPE_U8:
+			case MONO_TYPE_I8:
+			case MONO_TYPE_VALUETYPE:
+				pa [i] = (char *)(((gpointer *)params->vector)[i]) + sizeof (MonoObject);
+				break;
+			case MONO_TYPE_STRING:
+			case MONO_TYPE_OBJECT:
+			case MONO_TYPE_CLASS:
+			case MONO_TYPE_ARRAY:
+			case MONO_TYPE_SZARRAY:
+				pa [i] = (char *)(((gpointer *)params->vector)[i]);
+				break;
+			default:
+				g_error ("type 0x%x not handled in ves_icall_InternalInvoke", sig->params [i]->type);
+			}
+		}
+	}
+
+	if (!strcmp (method->name, ".ctor") && method->klass != mono_defaults.string_class) {
+		obj = mono_object_new (mono_domain_get (), method->klass);
+		mono_runtime_invoke (method, obj, pa, exc);
+		return obj;
+	} else
+		return mono_runtime_invoke (method, obj, pa, exc);
 }
 
 /**
@@ -49,7 +718,12 @@ mono_install_runtime_exec_main (MonoRuntimeExecMain func)
 void *
 mono_object_allocate (size_t size)
 {
+#if HAVE_BOEHM_GC
+	/* if this is changed to GC_debug_malloc(), we need to change also metadata/gc.c */
+	void *o = GC_malloc (size);
+#else
 	void *o = calloc (1, size);
+#endif
 
 	return o;
 }
@@ -63,10 +737,14 @@ mono_object_allocate (size_t size)
 void
 mono_object_free (MonoObject *o)
 {
+#if HAVE_BOEHM_GC
+	g_error ("mono_object_free called with boehm gc.");
+#else
 	MonoClass *c = o->vtable->klass;
 	
 	memset (o, 0, c->instance_size);
 	free (o);
+#endif
 }
 
 /**
@@ -79,14 +757,28 @@ mono_object_free (MonoObject *o)
 MonoObject *
 mono_object_new (MonoDomain *domain, MonoClass *klass)
 {
-	MonoObject *o;
+	return mono_object_new_specific (mono_class_vtable (domain, klass));
+}
 
-	if (!klass->inited)
-		mono_class_init (klass);
+/**
+ * mono_object_new_specific:
+ * @vtable: the vtable of the object that we want to create
+ *
+ * Returns: A newly created object with class and domain specified
+ * by @vtable
+ */
+MonoObject *
+mono_object_new_specific (MonoVTable *vtable)
+{
+	MonoObject *o;
 
-	o = mono_object_allocate (klass->instance_size);
-	o->vtable = mono_class_vtable (domain, klass);
+	mono_stats.new_object_count++;
 
+	o = mono_object_allocate (vtable->klass->instance_size);
+	o->vtable = vtable;
+	if (vtable->klass->has_finalize)
+		mono_object_register_finalizer (o);
+	
 	return o;
 }
 
@@ -126,6 +818,8 @@ mono_object_clone (MonoObject *obj)
 
 	memcpy (o, obj, size);
 
+	if (obj->vtable->klass->has_finalize)
+		mono_object_register_finalizer (o);
 	return o;
 }
 
@@ -142,6 +836,17 @@ mono_array_clone (MonoArray *array)
 	int size, i;
 	guint32 *sizes;
 	MonoClass *klass = array->obj.vtable->klass;
+
+	if (array->bounds == NULL) {
+		size = mono_array_length (array);
+		o = mono_array_new_full (((MonoObject *)array)->vtable->domain,
+					 klass, &size, NULL);
+
+		size *= mono_array_element_size (klass);
+		memcpy (o, array, sizeof (MonoArray) + size);
+
+		return o;
+	}
 	
 	sizes = alloca (klass->rank * sizeof(guint32) * 2);
 	size = mono_array_element_size (klass);
@@ -157,11 +862,21 @@ mono_array_clone (MonoArray *array)
 	return o;
 }
 
+/*
+ * mono_array_new_full:
+ * @domain: domain where the object is created
+ * @array_class: array class
+ * @lengths: lengths for each dimension in the array
+ * @lower_bounds: lower bounds for each dimension in the array (may be NULL)
+ *
+ * This routine creates a new array objects with the given dimensions,
+ * lower bounds and type.
+ */
 MonoArray*
 mono_array_new_full (MonoDomain *domain, MonoClass *array_class, 
 		     guint32 *lengths, guint32 *lower_bounds)
 {
-	guint32 byte_len;
+	guint32 byte_len, len;
 	MonoObject *o;
 	MonoArray *array;
 	MonoArrayBounds *bounds;
@@ -171,16 +886,29 @@ mono_array_new_full (MonoDomain *domain, MonoClass *array_class,
 		mono_class_init (array_class);
 
 	byte_len = mono_array_element_size (array_class);
+	len = 1;
+
+	if (array_class->rank == 1 &&
+	    (lower_bounds == NULL || lower_bounds [0] == 0)) {
+		bounds = NULL;
+		len = lengths [0];
+	} else {
+	#if HAVE_BOEHM_GC
+		bounds = GC_malloc (sizeof (MonoArrayBounds) * array_class->rank);
+	#else
+		bounds = g_malloc0 (sizeof (MonoArrayBounds) * array_class->rank);
+	#endif
+		for (i = 0; i < array_class->rank; ++i) {
+			bounds [i].length = lengths [i];
+			len *= lengths [i];
+		}
 
-	bounds = g_malloc0 (sizeof (MonoArrayBounds) * array_class->rank);
-	for (i = 0; i < array_class->rank; ++i) {
-		bounds [i].length = lengths [i];
-		byte_len *= lengths [i];
+		if (lower_bounds)
+			for (i = 0; i < array_class->rank; ++i)
+				bounds [i].lower_bound = lower_bounds [i];
 	}
 
-	if (lower_bounds)
-		for (i = 0; i < array_class->rank; ++i)
-			bounds [i].lower_bound = lower_bounds [i];
+	byte_len *= len;
 	/* 
 	 * Following three lines almost taken from mono_object_new ():
 	 * they need to be kept in sync.
@@ -193,28 +921,56 @@ mono_array_new_full (MonoDomain *domain, MonoClass *array_class,
 	array = (MonoArray*)o;
 
 	array->bounds = bounds;
-	array->max_length = bounds [0].length;
+	array->max_length = len;
 
 	return array;
 }
 
 /*
  * mono_array_new:
- * @image: image where the object is being referenced
+ * @domain: domain where the object is created
  * @eclass: element class
  * @n: number of array elements
  *
- * This routine creates a new szarray with @n elements of type @token
+ * This routine creates a new szarray with @n elements of type @eclass.
  */
 MonoArray *
 mono_array_new (MonoDomain *domain, MonoClass *eclass, guint32 n)
 {
 	MonoClass *ac;
 
-	ac = mono_array_class_get (eclass, 1);
+	ac = mono_array_class_get (&eclass->byval_arg, 1);
 	g_assert (ac != NULL);
 
-	return mono_array_new_full (domain, ac, &n, NULL);
+	return mono_array_new_specific (mono_class_vtable (domain, ac), n);
+}
+
+/*
+ * mono_array_new_specific:
+ * @vtable: a vtable in the appropriate domain for an initialized class
+ * @n: number of array elements
+ *
+ * This routine is a fast alternative to mono_array_new() for code which
+ * can be sure about the domain it operates in.
+ */
+MonoArray *
+mono_array_new_specific (MonoVTable *vtable, guint32 n)
+{
+	MonoObject *o;
+	MonoArray *ao;
+	gsize byte_len;
+
+	byte_len = n * mono_array_element_size (vtable->klass);
+	o = mono_object_allocate (sizeof (MonoArray) + byte_len);
+	if (!o)
+		G_BREAKPOINT ();
+	o->vtable = vtable;
+
+	ao = (MonoArray *)o;
+	ao->bounds = NULL;
+	ao->max_length = n;
+
+	return ao;
 }
 
 /**
@@ -228,25 +984,56 @@ MonoString *
 mono_string_new_utf16 (MonoDomain *domain, const guint16 *text, gint32 len)
 {
 	MonoString *s;
-	MonoArray *ca;
-
-	s = (MonoString*)mono_object_new (domain, mono_defaults.string_class);
+	
+	s = mono_string_new_size (domain, len);
 	g_assert (s != NULL);
 
-	ca = (MonoArray *)mono_array_new (domain, mono_defaults.char_class, len);
-	g_assert (ca != NULL);
-	
-	s->c_str = ca;
-	s->length = len;
+	memcpy (mono_string_chars (s), text, len * 2);
+
+	return s;
+}
+
+/**
+ * mono_string_new_size:
+ * @text: a pointer to an utf16 string
+ * @len: the length of the string
+ *
+ * Returns: A newly created string object of @len
+ */
+MonoString *
+mono_string_new_size (MonoDomain *domain, gint32 len)
+{
+	MonoString *s;
 
-	memcpy (ca->vector, text, len * 2);
+	/* 
+	 * enable to get a good speedup: we still need to figure out
+	 * how the sync structure is freed.
+	 */
+#if 0
+	s = GC_malloc_atomic (sizeof (MonoString) + ((len + 1) * 2));
+	s->object.synchronisation = 0;
+	mono_string_chars (s) [len] = 0;
+#else
+	s = (MonoString*)mono_object_allocate (sizeof (MonoString) + ((len + 1) * 2));
+#endif
+	if (!s)
+		G_BREAKPOINT ();
+
+	s->object.vtable = mono_class_vtable (domain, mono_defaults.string_class);
+	s->length = len;
 
 	return s;
 }
 
+/*
+ * mono_string_new_len:
+ * @text: a pointer to an utf8 string
+ * @length: number of bytes in @text to consider
+ *
+ * Returns: A newly created string object which contains @text.
+ */
 MonoString*
-mono_string_new_len
-(MonoDomain *domain, const char *text, guint length)
+mono_string_new_len (MonoDomain *domain, const char *text, guint length)
 {
 	GError *error = NULL;
 	MonoString *o = NULL;
@@ -295,6 +1082,23 @@ mono_string_new (MonoDomain *domain, const char *text)
 	return o;
 }
 
+/*
+ * mono_string_new_wrapper:
+ * @text: pointer to utf8 characters.
+ *
+ * Helper function to create a string object from @text in the current domain.
+ */
+MonoString*
+mono_string_new_wrapper (const char *text)
+{
+	MonoDomain *domain = mono_domain_get ();
+
+	if (text)
+		return mono_string_new (domain, text);
+
+	return NULL;
+}
+
 /**
  * mono_value_box:
  * @class: the class of the value
@@ -316,8 +1120,28 @@ mono_value_box (MonoDomain *domain, MonoClass *class, gpointer value)
 
 	size = size - sizeof (MonoObject);
 
+#if NO_UNALIGNED_ACCESS
 	memcpy ((char *)res + sizeof (MonoObject), value, size);
-
+#else
+	switch (size) {
+	case 1:
+		*((guint8 *) res + sizeof (MonoObject)) = *(guint8 *) value;
+		break;
+	case 2:
+		*(guint16 *)((guint8 *) res + sizeof (MonoObject)) = *(guint16 *) value;
+		break;
+	case 4:
+		*(guint32 *)((guint8 *) res + sizeof (MonoObject)) = *(guint32 *) value;
+		break;
+	case 8:
+		*(guint64 *)((guint8 *) res + sizeof (MonoObject)) = *(guint64 *) value;
+		break;
+	default:
+		memcpy ((char *)res + sizeof (MonoObject), value, size);
+	}
+#endif
+	if (class->has_finalize)
+		mono_object_register_finalizer (res);
 	return res;
 }
 
@@ -348,10 +1172,16 @@ mono_object_isinst (MonoObject *obj, MonoClass *klass)
 		    vt->interface_offsets [klass->interface_id])
 			return obj;
 	} else {
-		if (oklass->rank && oklass->rank == klass->rank) {
-			if ((oklass->element_class->baseval - klass->element_class->baseval) <= 
+		if (oklass == mono_defaults.transparent_proxy_class) {
+			/* fixme: add check for IRemotingTypeInfo */
+			oklass = ((MonoTransparentProxy *)obj)->klass;
+		}
+		if (klass->rank) {
+			if (oklass->rank == klass->rank && 
+			    (oklass->element_class->baseval - klass->element_class->baseval) <= 
 			    klass->element_class->diffval)
 				return obj;
+			
 		} else if ((oklass->baseval - klass->baseval) <= klass->diffval)
 			return obj;
 	}
@@ -359,39 +1189,12 @@ mono_object_isinst (MonoObject *obj, MonoClass *klass)
 	return NULL;
 }
 
-
-typedef struct {
-	MonoString *obj;
-	MonoString *found;
-} InternCheck;
-
-static void
-check_interned (gpointer key, MonoString *value, InternCheck *check)
+static MonoString*
+mono_string_is_interned_lookup (MonoString *str, int insert)
 {
-	if (value == check->obj)
-		check->found = value;
-}
-
-MonoString*
-mono_string_is_interned (MonoString *o)
-{
-	InternCheck check;
-	check.obj = o;
-	check.found = NULL;
-
-	/*
-	 * Yes, this is slow. Our System.String implementation needs to be redone.
-	 * And GLib needs foreach() methods that can be stopped halfway.
-	 */
-	g_hash_table_foreach (((MonoObject *)o)->vtable->domain->ldstr_table, (GHFunc)check_interned, &check);
-	return check.found;
-}
-
-MonoString*
-mono_string_intern (MonoString *str)
-{
-	GHashTable *ldstr_table;
+	MonoGHashTable *ldstr_table;
 	MonoString *res;
+	MonoDomain *domain;
 	char *ins = g_malloc (4 + str->length * 2);
 	char *p;
 	int bloblen;
@@ -411,7 +1214,7 @@ mono_string_intern (MonoString *str)
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
 	{
 		int i;
-		char *p2 = mono_array_addr (str->c_str, char, 0);
+		char *p2 = mono_string_chars (str);
 		for (i = 0; i < str->length; ++i) {
 			*p++ = p2 [1];
 			*p++ = p2 [0];
@@ -419,88 +1222,134 @@ mono_string_intern (MonoString *str)
 		}
 	}
 #else
-	memcpy (p, str->c_str->vector, str->length * 2);
+	memcpy (p, mono_string_chars (str), str->length * 2);
 #endif
-	ldstr_table = ((MonoObject *)str)->vtable->domain->ldstr_table;
-	if ((res = g_hash_table_lookup (ldstr_table, ins))) {
+	domain = ((MonoObject *)str)->vtable->domain;
+	ldstr_table = domain->ldstr_table;
+	mono_domain_lock (domain);
+	if ((res = mono_g_hash_table_lookup (ldstr_table, ins))) {
+		mono_domain_unlock (domain);
 		g_free (ins);
 		return res;
 	}
-	g_hash_table_insert (ldstr_table, ins, str);
-	return str;
+	if (insert) {
+		mono_g_hash_table_insert (ldstr_table, ins, str);
+		mono_domain_unlock (domain);
+		return str;
+	}
+	mono_domain_unlock (domain);
+	g_free (ins);
+	return NULL;
+}
+
+MonoString*
+mono_string_is_interned (MonoString *o)
+{
+	return mono_string_is_interned_lookup (o, FALSE);
+}
+
+MonoString*
+mono_string_intern (MonoString *str)
+{
+	return mono_string_is_interned_lookup (str, TRUE);
 }
 
+/*
+ * mono_ldstr:
+ * @domain: the domain where the string will be used.
+ * @image: a metadata context
+ * @idx: index into the user string table.
+ * 
+ * Implementation for the ldstr opcode.
+ */
 MonoString*
-mono_ldstr (MonoDomain *domain, MonoImage *image, guint32 index)
+mono_ldstr (MonoDomain *domain, MonoImage *image, guint32 idx)
 {
 	const char *str, *sig;
 	MonoString *o;
 	size_t len2;
 		
-	sig = str = mono_metadata_user_string (image, index);
-	len2 = mono_metadata_decode_blob_size (str, &str);
-	
-	if ((o = g_hash_table_lookup (domain->ldstr_table, sig)))
+	sig = str = mono_metadata_user_string (image, idx);
+
+	mono_domain_lock (domain);
+	if ((o = mono_g_hash_table_lookup (domain->ldstr_table, sig))) {
+		mono_domain_unlock (domain);
 		return o;
+	}
 	
+	len2 = mono_metadata_decode_blob_size (str, &str);
 	len2 >>= 1;
 
 	o = mono_string_new_utf16 (domain, (guint16*)str, len2);
 #if G_BYTE_ORDER != G_LITTLE_ENDIAN
 	{
 		int i;
-		guint16 *p2 = (guint16*)mono_array_addr (o->c_str, guint16, 0);
+		guint16 *p2 = (guint16*)mono_string_chars (o);
 		for (i = 0; i < len2; ++i) {
 			*p2 = GUINT16_FROM_LE (*p2);
 			++p2;
 		}
 	}
 #endif
-	g_hash_table_insert (domain->ldstr_table, (gpointer)sig, o);
+	mono_g_hash_table_insert (domain->ldstr_table, (gpointer)sig, o);
+	mono_domain_unlock (domain);
 
 	return o;
 }
 
+/*
+ * mono_string_to_utf8:
+ * @s: a System.String
+ *
+ * Return the UTF8 representation for @s.
+ * the resulting buffer nedds to be freed with g_free().
+ */
 char *
 mono_string_to_utf8 (MonoString *s)
 {
-	char *as, *vector;
+	char *as;
 	GError *error = NULL;
 
-	g_assert (s != NULL);
+	if (s == NULL)
+		return NULL;
 
-	if (!s->length || !s->c_str)
+	if (!s->length)
 		return g_strdup ("");
 
-	vector = (char*)s->c_str->vector;
-
-	g_assert (vector != NULL);
-
-	as = g_utf16_to_utf8 ((gunichar2 *)vector, s->length, NULL, NULL, &error);
-
-	g_assert (!error);
+	as = g_utf16_to_utf8 (mono_string_chars (s), s->length, NULL, NULL, &error);
+	if (error)
+		g_warning (error->message);
 
 	return as;
 }
 
-char *
+/*
+ * mono_string_to_utf16:
+ * @s: a MonoString
+ *
+ * Return an null-terminated array of the utf-16 chars
+ * contained in @s. The result must be freed with g_free().
+ * This is a temporary helper until our string implementation
+ * is reworked to always include the null terminating char.
+ */
+gunichar2 *
 mono_string_to_utf16 (MonoString *s)
 {
 	char *as;
 
-	g_assert (s != NULL);
+	if (s == NULL)
+		return NULL;
 
 	as = g_malloc ((s->length * 2) + 2);
 	as [(s->length * 2)] = '\0';
 	as [(s->length * 2) + 1] = '\0';
 
-	if (!s->length || !s->c_str) {
-		return (as);
+	if (!s->length) {
+		return (gunichar2 *)(as);
 	}
 	
 	memcpy (as, mono_string_chars(s), s->length * 2);
-	
-	return (as);
+	return (gunichar2 *)(as);
 }
 
 static void
@@ -518,9 +1367,493 @@ mono_install_handler        (MonoExceptionFunc func)
 	ex_handler = func? func: default_ex_handler;
 }
 
+/*
+ * mono_raise_exception:
+ * @ex: exception object
+ *
+ * Signal the runtime that the exception @ex has been raised in unmanaged code.
+ */
 void
 mono_raise_exception (MonoException *ex) 
 {
 	ex_handler (ex);
 }
 
+MonoWaitHandle *
+mono_wait_handle_new (MonoDomain *domain, HANDLE handle)
+{
+	MonoWaitHandle *res;
+
+	res = (MonoWaitHandle *)mono_object_new (domain, mono_defaults.waithandle_class);
+
+	res->handle = handle;
+
+	return res;
+}
+
+MonoAsyncResult *
+mono_async_result_new (MonoDomain *domain, HANDLE handle, MonoObject *state, gpointer data)
+{
+	MonoAsyncResult *res;
+
+	res = (MonoAsyncResult *)mono_object_new (domain, mono_defaults.asyncresult_class);
+
+	res->data = data;
+	res->async_state = state;
+	res->handle = (MonoObject *)mono_wait_handle_new (domain, handle);
+	res->sync_completed = FALSE;
+	res->completed = FALSE;
+
+	return res;
+}
+
+void
+mono_message_init (MonoDomain *domain,
+		   MonoMethodMessage *this, 
+		   MonoReflectionMethod *method,
+		   MonoArray *out_args)
+{
+	MonoMethodSignature *sig = method->method->signature;
+	MonoString *name;
+	int i, j;
+	char **names;
+	guint8 arg_type;
+
+	this->method = method;
+
+	this->args = mono_array_new (domain, mono_defaults.object_class, sig->param_count);
+	this->arg_types = mono_array_new (domain, mono_defaults.byte_class, sig->param_count);
+
+	names = g_new (char *, sig->param_count);
+	mono_method_get_param_names (method->method, (const char **) names);
+	this->names = mono_array_new (domain, mono_defaults.string_class, sig->param_count);
+	
+	for (i = 0; i < sig->param_count; i++) {
+		 name = mono_string_new (domain, names [i]);
+		 mono_array_set (this->names, gpointer, i, name);	
+	}
+
+	g_free (names);
+	
+	for (i = 0, j = 0; i < sig->param_count; i++) {
+
+		if (sig->params [i]->byref) {
+			if (out_args) {
+				gpointer arg = mono_array_get (out_args, gpointer, j);
+				mono_array_set (this->args, gpointer, i, arg);
+				j++;
+			}
+			arg_type = 2;
+			if (sig->params [i]->attrs & PARAM_ATTRIBUTE_IN)
+				arg_type |= 1;
+		} else {
+			arg_type = 1;
+		}
+
+		mono_array_set (this->arg_types, guint8, i, arg_type);
+	}
+}
+
+/**
+ * mono_remoting_invoke:
+ * @real_proxy: pointer to a RealProxy object
+ * @msg: The MonoMethodMessage to execute
+ * @exc: used to store exceptions
+ * @out_args: used to store output arguments
+ *
+ * This is used to call RealProxy::Invoke(). RealProxy::Invoke() returns an
+ * IMessage interface and it is not trivial to extract results from there. So
+ * we call an helper method PrivateInvoke instead of calling
+ * RealProxy::Invoke() directly.
+ *
+ * Returns: the result object.
+ */
+MonoObject *
+mono_remoting_invoke (MonoObject *real_proxy, MonoMethodMessage *msg, 
+		      MonoObject **exc, MonoArray **out_args)
+{
+	static MonoMethod *im = NULL;
+	gpointer pa [4];
+
+	/*static MonoObject *(*invoke) (gpointer, gpointer, MonoObject **, MonoArray **) = NULL;*/
+
+	/* FIXME: make this domain dependent */
+	if (!im) {
+		MonoClass *klass;
+		int i;
+
+		klass = mono_defaults.real_proxy_class; 
+		       
+		for (i = 0; i < klass->method.count; ++i) {
+			if (!strcmp ("PrivateInvoke", klass->methods [i]->name) &&
+			    klass->methods [i]->signature->param_count == 4) {
+				im = klass->methods [i];
+				break;
+			}
+		}
+	
+		g_assert (im);
+	}
+
+	pa [0] = real_proxy;
+	pa [1] = msg;
+	pa [2] = exc;
+	pa [3] = out_args;
+
+	return mono_runtime_invoke (im, NULL, pa, exc);
+}
+
+MonoObject *
+mono_message_invoke (MonoObject *target, MonoMethodMessage *msg, 
+		     MonoObject **exc, MonoArray **out_args) 
+{
+	if (target && target->vtable->klass == mono_defaults.transparent_proxy_class) {
+
+		return mono_remoting_invoke ((MonoObject *)((MonoTransparentProxy *)target)->rp, 
+					     msg, exc, out_args);
+
+	} else {
+		MonoDomain *domain = mono_domain_get (); 
+		MonoMethod *method = msg->method->method;
+		MonoMethodSignature *sig = method->signature;
+		int i, j, outarg_count = 0;
+
+		for (i = 0; i < sig->param_count; i++) {
+			if (sig->params [i]->byref) 
+				outarg_count++;
+		}
+
+		*out_args = mono_array_new (domain, mono_defaults.object_class, outarg_count);
+		*exc = NULL;
+
+		for (i = 0, j = 0; i < sig->param_count; i++) {
+			if (sig->params [i]->byref) {
+				gpointer arg;
+				arg = mono_array_get (msg->args, gpointer, i);
+				mono_array_set (*out_args, gpointer, j, arg);
+				j++;
+			}
+		}
+
+		return mono_runtime_invoke_array (method, target, msg->args, exc);
+	}
+}
+
+void
+mono_print_unhandled_exception (MonoObject *exc)
+{
+	char *message = (char *) "";
+	MonoString *str; 
+	MonoMethod *method;
+	MonoClass *klass;
+	gboolean free_message = FALSE;
+	gint i;
+
+	if (mono_object_isinst (exc, mono_defaults.exception_class)) {
+		klass = exc->vtable->klass;
+		method = NULL;
+		while (klass && method == NULL) {
+			for (i = 0; i < klass->method.count; ++i) {
+				method = klass->methods [i];
+				if (!strcmp ("ToString", method->name) &&
+				    method->signature->param_count == 0 &&
+				    method->flags & METHOD_ATTRIBUTE_VIRTUAL &&
+				    method->flags & METHOD_ATTRIBUTE_PUBLIC) {
+					break;
+				}
+				method = NULL;
+			}
+			
+			if (method == NULL)
+				klass = klass->parent;
+		}
+
+		g_assert (method);
+
+		str = (MonoString *) mono_runtime_invoke (method, exc, NULL, NULL);
+		if (str) {
+			message = mono_string_to_utf8 (str);
+			free_message = TRUE;
+		}
+	}				
+
+	/*
+	 * g_printerr ("\nUnhandled Exception: %s.%s: %s\n", exc->vtable->klass->name_space, 
+	 *	   exc->vtable->klass->name, message);
+	 */
+	g_printerr ("\nUnhandled Exception: %s\n", message);
+	
+	if (free_message)
+		g_free (message);
+}
+
+/**
+ * mono_delegate_ctor:
+ * @this: pointer to an uninitialized delegate object
+ * @target: target object
+ * @addr: pointer to native code
+ *
+ * This is used to initialize a delegate. We also insert the method_info if
+ * we find the info with mono_jit_info_table_find().
+ */
+void
+mono_delegate_ctor (MonoObject *this, MonoObject *target, gpointer addr)
+{
+	MonoDomain *domain = mono_domain_get ();
+	MonoDelegate *delegate = (MonoDelegate *)this;
+	MonoMethod *method = NULL;
+	MonoClass *class;
+	MonoJitInfo *ji;
+
+	g_assert (this);
+	g_assert (addr);
+
+	class = this->vtable->klass;
+
+	if ((ji = mono_jit_info_table_find (domain, addr))) {
+		method = ji->method;
+		delegate->method_info = mono_method_get_object (domain, method, NULL);
+	}
+
+	if (target && target->vtable->klass == mono_defaults.transparent_proxy_class) {
+		g_assert (method);
+		method = mono_marshal_get_remoting_invoke (method);
+		delegate->method_ptr = mono_compile_method (method);
+		delegate->target = target;
+	} else {
+		delegate->method_ptr = addr;
+		delegate->target = target;
+	}
+}
+
+/**
+ * mono_method_call_message_new:
+ *
+ * Translates arguments pointers into a Message.
+ */
+MonoMethodMessage *
+mono_method_call_message_new (MonoMethod *method, gpointer *params, MonoMethod *invoke, 
+			      MonoDelegate **cb, MonoObject **state)
+{
+	MonoDomain *domain = mono_domain_get ();
+	MonoMethodSignature *sig = method->signature;
+	MonoMethodMessage *msg;
+	int i, count, type;
+
+	msg = (MonoMethodMessage *)mono_object_new (domain, mono_defaults.mono_method_message_class); 
+	
+	if (invoke) {
+		mono_message_init (domain, msg, mono_method_get_object (domain, invoke, NULL), NULL);
+		count =  sig->param_count - 2;
+	} else {
+		mono_message_init (domain, msg, mono_method_get_object (domain, method, NULL), NULL);
+		count =  sig->param_count;
+	}
+
+	for (i = 0; i < count; i++) {
+		gpointer vpos;
+		MonoClass *class;
+		MonoObject *arg;
+
+		if (sig->params [i]->byref)
+			vpos = *((gpointer *)params [i]);
+		else 
+			vpos = params [i];
+
+		type = sig->params [i]->type;
+		class = mono_class_from_mono_type (sig->params [i]);
+
+		if (class->valuetype)
+			arg = mono_value_box (domain, class, vpos);
+		else 
+			arg = *((MonoObject **)vpos);
+		      
+		mono_array_set (msg->args, gpointer, i, arg);
+	}
+
+	if (invoke) {
+		*cb = *((MonoDelegate **)params [i]);
+		i++;
+		*state = *((MonoObject **)params [i]);
+	}
+
+	return msg;
+}
+
+/**
+ * mono_method_return_message_restore:
+ *
+ * Restore results from message based processing back to arguments pointers
+ */
+void
+mono_method_return_message_restore (MonoMethod *method, gpointer *params, MonoArray *out_args)
+{
+	MonoMethodSignature *sig = method->signature;
+	int i, j, type, size;
+	
+	for (i = 0, j = 0; i < sig->param_count; i++) {
+		MonoType *pt = sig->params [i];
+
+		size = mono_type_stack_size (pt, NULL);
+
+		if (pt->byref) {
+			char *arg = mono_array_get (out_args, gpointer, j);
+			type = pt->type;
+			
+			switch (type) {
+			case MONO_TYPE_VOID:
+				g_assert_not_reached ();
+				break;
+			case MONO_TYPE_U1:
+			case MONO_TYPE_I1:
+			case MONO_TYPE_BOOLEAN:
+			case MONO_TYPE_U2:
+			case MONO_TYPE_I2:
+			case MONO_TYPE_CHAR:
+			case MONO_TYPE_U4:
+			case MONO_TYPE_I4:
+			case MONO_TYPE_I8:
+			case MONO_TYPE_U8:
+			case MONO_TYPE_R4:
+			case MONO_TYPE_R8:
+			case MONO_TYPE_VALUETYPE: {
+				memcpy (*((gpointer *)params [i]), arg + sizeof (MonoObject), size); 
+				break;
+			}
+			case MONO_TYPE_STRING:
+			case MONO_TYPE_CLASS: 
+			case MONO_TYPE_ARRAY:
+			case MONO_TYPE_SZARRAY:
+				*((MonoObject **)params [i]) = (MonoObject *)arg;
+				break;
+			default:
+				g_assert_not_reached ();
+			}
+
+			j++;
+		}
+	}
+}
+
+/**
+ * mono_load_remote_field:
+ * @this: pointer to an object
+ * @klass: klass of the object containing @field
+ * @field: the field to load
+ * @res: a storage to store the result
+ *
+ * This method is called by the runtime on attempts to load fields of
+ * transparent proxy objects. @this points to such TP, @klass is the class of
+ * the object containing @field. @res is a storage location which can be
+ * used to store the result.
+ *
+ * Returns: an address pointing to the value of field.
+ */
+gpointer
+mono_load_remote_field (MonoObject *this, MonoClass *klass, MonoClassField *field, gpointer *res)
+{
+	static MonoMethod *getter = NULL;
+	MonoDomain *domain = mono_domain_get ();
+	MonoClass *field_class;
+	MonoMethodMessage *msg;
+	MonoArray *out_args;
+	MonoObject *exc;
+	gpointer tmp;
+
+	g_assert (this->vtable->klass == mono_defaults.transparent_proxy_class);
+
+	if (!res)
+		res = &tmp;
+
+	if (!getter) {
+		int i;
+
+		for (i = 0; i < mono_defaults.object_class->method.count; ++i) {
+			MonoMethod *cm = mono_defaults.object_class->methods [i];
+	       
+			if (!strcmp (cm->name, "FieldGetter")) {
+				getter = cm;
+				break;
+			}
+		}
+		g_assert (getter);
+	}
+	
+	field_class = mono_class_from_mono_type (field->type);
+
+	msg = (MonoMethodMessage *)mono_object_new (domain, mono_defaults.mono_method_message_class);
+	out_args = mono_array_new (domain, mono_defaults.object_class, 1);
+	mono_message_init (domain, msg, mono_method_get_object (domain, getter, NULL), out_args);
+
+	mono_array_set (msg->args, gpointer, 0, mono_string_new (domain, klass->name));
+	mono_array_set (msg->args, gpointer, 1, mono_string_new (domain, field->name));
+
+	mono_remoting_invoke ((MonoObject *)((MonoTransparentProxy *)this)->rp, msg, &exc, &out_args);
+
+	*res = mono_array_get (out_args, MonoObject *, 0);
+
+	if (field_class->valuetype) {
+		return ((char *)*res) + sizeof (MonoObject);
+	} else
+		return res;
+}
+
+/**
+ * mono_store_remote_field:
+ * @this: pointer to an object
+ * @klass: klass of the object containing @field
+ * @field: the field to load
+ * @val: the value/object to store
+ *
+ * This method is called by the runtime on attempts to store fields of
+ * transparent proxy objects. @this points to such TP, @klass is the class of
+ * the object containing @field. @val is the new value to store in @field.
+ */
+void
+mono_store_remote_field (MonoObject *this, MonoClass *klass, MonoClassField *field, gpointer val)
+{
+	static MonoMethod *setter = NULL;
+	MonoDomain *domain = mono_domain_get ();
+	MonoClass *field_class;
+	MonoMethodMessage *msg;
+	MonoArray *out_args;
+	MonoObject *exc;
+	MonoObject *arg;
+
+	g_assert (this->vtable->klass == mono_defaults.transparent_proxy_class);
+
+	if (!setter) {
+		int i;
+
+		for (i = 0; i < mono_defaults.object_class->method.count; ++i) {
+			MonoMethod *cm = mono_defaults.object_class->methods [i];
+	       
+			if (!strcmp (cm->name, "FieldSetter")) {
+				setter = cm;
+				break;
+			}
+		}
+		g_assert (setter);
+	}
+
+	field_class = mono_class_from_mono_type (field->type);
+
+	if (field_class->valuetype)
+		arg = mono_value_box (domain, field_class, val);
+	else 
+		arg = *((MonoObject **)val);
+		
+
+	msg = (MonoMethodMessage *)mono_object_new (domain, mono_defaults.mono_method_message_class);
+	mono_message_init (domain, msg, mono_method_get_object (domain, setter, NULL), NULL);
+
+	mono_array_set (msg->args, gpointer, 0, mono_string_new (domain, klass->name));
+	mono_array_set (msg->args, gpointer, 1, mono_string_new (domain, field->name));
+	mono_array_set (msg->args, gpointer, 2, arg);
+
+	mono_remoting_invoke ((MonoObject *)((MonoTransparentProxy *)this)->rp, msg, &exc, &out_args);
+}
+
+
+
+
diff --git a/mono/metadata/object.h b/mono/metadata/object.h
index a33e672dfa9..0bcc8300b39 100644
--- a/mono/metadata/object.h
+++ b/mono/metadata/object.h
@@ -4,28 +4,58 @@
 #include <mono/metadata/class.h>
 #include <mono/metadata/threads-types.h>
 
-#define MONO_CHECK_ARG(domain, arg, expr) 	G_STMT_START{		  \
+#if 1
+#define mono_assert(expr) 	           G_STMT_START{		  \
+     if (!(expr))							  \
+       {								  \
+              	MonoException *ex;                                        \
+                char *msg = g_strdup_printf ("file %s: line %d (%s): "    \
+                "assertion failed: (%s)", __FILE__, __LINE__,             \
+                __PRETTY_FUNCTION__, #expr);				  \
+		ex = mono_get_exception_execution_engine (msg);           \
+		g_free (msg);                                             \
+                mono_raise_exception (ex);                                \
+       };				}G_STMT_END
+
+#define mono_assert_not_reached() 	          G_STMT_START{		  \
+     MonoException *ex;                                                   \
+     char *msg = g_strdup_printf ("file %s: line %d (%s): "               \
+     "should not be reached", __FILE__, __LINE__, __PRETTY_FUNCTION__);	  \
+     ex = mono_get_exception_execution_engine (msg);                      \
+     g_free (msg);                                                        \
+     mono_raise_exception (ex);                                           \
+}G_STMT_END
+#else
+#define mono_assert(expr) g_assert(expr)
+#define mono_assert_not_reached() g_assert_not_reached() 
+#endif
+
+#define MONO_CHECK_ARG(arg, expr)       	G_STMT_START{		  \
      if (!(expr))							  \
        {								  \
               	MonoException *ex;                                        \
                 char *msg = g_strdup_printf ("assertion `%s' failed",     \
 		#expr);							  \
                 if (arg) {} /* check if the name exists */                \
-		ex = mono_get_exception_argument (domain, #arg, msg);     \
+		ex = mono_get_exception_argument (#arg, msg);             \
 		g_free (msg);                                             \
                 mono_raise_exception (ex);                                \
        };				}G_STMT_END
 
-#define MONO_CHECK_ARG_NULL(domain, arg) 	 G_STMT_START{		  \
+#define MONO_CHECK_ARG_NULL(arg) 	    G_STMT_START{		  \
      if (arg == NULL)							  \
        {								  \
               	MonoException *ex;                                        \
-		ex = mono_get_exception_argument_null (domain, #arg);     \
+                if (arg) {} /* check if the name exists */                \
+		ex = mono_get_exception_argument_null (#arg);             \
                 mono_raise_exception (ex);                                \
        };				}G_STMT_END
 
 typedef guchar MonoBoolean;
 
+typedef struct _MonoReflectionMethod MonoReflectionMethod;
+typedef struct _MonoDelegate MonoDelegate;
+
 typedef struct {
 	MonoVTable *vtable;
 	MonoThreadsSync *synchronisation;
@@ -38,26 +68,42 @@ typedef struct {
 
 typedef struct {
 	MonoObject obj;
+	/* bounds is NULL for szarrays */
 	MonoArrayBounds *bounds;
-	/* used by single dimensional arrays to speed up bound checking */
+	/* total number of elements of the array */
 	guint32 max_length; 
 	/* we use double to ensure proper alignment on platforms that need it */
 	double vector [MONO_ZERO_LEN_ARRAY];
 } MonoArray;
 
 typedef struct {
-	MonoObject obj;
-	MonoArray *c_str;
+	MonoObject object;
 	gint32 length;
+	gunichar2 chars [MONO_ZERO_LEN_ARRAY];
 } MonoString;
 
 typedef struct {
 	MonoObject object;
+	gint32 capacity;
+	gint32 length;
+	MonoArray *chars;
+} MonoStringBuilder;
+
+typedef struct {
+	MonoObject object;
+	MonoType  *type;
+} MonoReflectionType;
+
+typedef struct {
+	MonoObject object;
+	MonoArray  *trace_ips;
 	MonoObject *inner_ex;
 	MonoString *message;
 	MonoString *help_link;
 	MonoString *class_name;
 	MonoString *stack_trace;
+	MonoString *remote_stack_trace;
+	gint32     *remote_stack_index;
 	gint32      hresult;
 	MonoString *source;
 } MonoException;
@@ -72,20 +118,82 @@ typedef struct {
 } MonoArgumentException;
 
 typedef struct {
-	MonoObject object;
-	MonoObject *target_type;
-	MonoObject *target;
-	MonoString *method;
-	gpointer    method_ptr;
-} MonoDelegate;
+	MonoObject   object;
+	MonoObject  *async_state;
+	MonoObject  *handle;
+	MonoObject  *async_delegate;
+	gpointer     data;
+	MonoBoolean  sync_completed;
+	MonoBoolean  completed;
+	MonoBoolean  endinvoke_called;
+} MonoAsyncResult;
 
-typedef void   (*MonoRuntimeObjectInit) (MonoObject *o);
-typedef gint32 (*MonoRuntimeExecMain)   (MonoMethod *method, MonoArray *args);
+typedef struct {
+	MonoObject   object;
+	gpointer     handle;
+	MonoBoolean  disposed;
+} MonoWaitHandle;
 
-extern MonoRuntimeObjectInit mono_runtime_object_init;
-extern MonoRuntimeExecMain mono_runtime_exec_main;
+typedef struct {
+	MonoObject  object;
+	MonoReflectionType *class_to_proxy;	
+} MonoRealProxy;
 
-#define mono_array_length(array) ((array)->bounds->length)
+typedef struct {
+	MonoObject     object;
+	MonoRealProxy *rp;	
+	MonoClass     *klass; 
+} MonoTransparentProxy;
+
+typedef struct {
+	MonoObject obj;
+	MonoReflectionMethod *method;
+	MonoArray  *args;		
+	MonoArray  *names;		
+	MonoArray  *arg_types;	
+	MonoObject *ctx;
+	MonoObject *rval;
+	MonoObject *exc;
+} MonoMethodMessage;
+
+typedef struct {
+	MonoObject obj;
+	gint32 il_offset;
+	gint32 native_offset;
+	MonoReflectionMethod *method;
+	MonoString *filename;
+	gint32 line;
+	gint32 column;
+} MonoStackFrame;
+
+typedef struct {
+	MonoObject  obj;
+	HANDLE      handle;
+	MonoObject *culture_info;
+	MonoBoolean threadpool_thread;
+	guint32     state;
+	MonoObject *abort_exc;
+	MonoObject *abort_state;
+} MonoThread;
+
+typedef struct {
+	MonoString *name;
+	MonoReflectionType *type;
+	MonoObject *value;
+} MonoSerializationEntry;
+
+typedef struct {
+	guint32 state;
+	MonoObject *additional;
+} MonoStreamingContext;
+
+typedef MonoObject* (*MonoInvokeFunc)        (MonoMethod *method, void *obj, void **params, MonoObject **exc);
+typedef gpointer    (*MonoCompileFunc)       (MonoMethod *method);
+
+#define mono_object_class(obj) (((MonoObject*)(obj))->vtable->klass)
+#define mono_object_domain(obj) (((MonoObject*)(obj))->vtable->domain)
+
+#define mono_array_length(array) ((array)->max_length)
 #define mono_array_addr(array,type,index) ( ((char*)(array)->vector) + sizeof (type) * (index) )
 #define mono_array_addr_with_size(array,size,index) ( ((char*)(array)->vector) + (size) * (index) )
 #define mono_array_get(array,type,index) ( *(type*)mono_array_addr ((array), type, (index)) ) 
@@ -95,7 +203,10 @@ extern MonoRuntimeExecMain mono_runtime_exec_main;
 		*__p = (value);	\
 	} while (0)
 
-#define mono_string_chars(s) ((gushort*)(s)->c_str->vector)
+#define mono_string_chars(s) ((gunichar2*)(s)->chars)
+#define mono_string_length(s) ((s)->length)
+
+extern MonoMethod *mono_start_method;
 
 void *
 mono_object_allocate        (size_t size);
@@ -104,6 +215,9 @@ MonoObject *
 mono_object_new             (MonoDomain *domain, MonoClass *klass);
 
 MonoObject *
+mono_object_new_specific    (MonoVTable *vtable);
+
+MonoObject *
 mono_object_new_from_token  (MonoDomain *domain, MonoImage *image, guint32 token);
 
 MonoArray*
@@ -113,6 +227,9 @@ MonoArray*
 mono_array_new_full         (MonoDomain *domain, MonoClass *array_class,
 			     guint32 *lengths, guint32 *lower_bounds);
 
+MonoArray *
+mono_array_new_specific     (MonoVTable *vtable, guint32 n);
+
 MonoArray*
 mono_array_clone            (MonoArray *array);
 
@@ -120,7 +237,10 @@ MonoString*
 mono_string_new_utf16       (MonoDomain *domain, const guint16 *text, gint32 len);
 
 MonoString*
-mono_ldstr                  (MonoDomain *domain, MonoImage *image, guint32 index);
+mono_string_new_size		(MonoDomain *domain, gint32 len);
+
+MonoString*
+mono_ldstr                  (MonoDomain *domain, MonoImage *image, guint32 str_index);
 
 MonoString*
 mono_string_is_interned     (MonoString *str);
@@ -132,12 +252,15 @@ MonoString*
 mono_string_new             (MonoDomain *domain, const char *text);
 
 MonoString*
+mono_string_new_wrapper     (const char *text);
+
+MonoString*
 mono_string_new_len         (MonoDomain *domain, const char *text, guint length);
 
 char *
 mono_string_to_utf8         (MonoString *string_obj);
 
-char *
+gunichar2 *
 mono_string_to_utf16        (MonoString *string_obj);
 
 void       
@@ -161,10 +284,105 @@ void
 mono_raise_exception        (MonoException *ex);
 
 void
-mono_install_runtime_object_init (MonoRuntimeObjectInit func);
+mono_runtime_object_init    (MonoObject *this_obj);
 
 void
-mono_install_runtime_exec_main   (MonoRuntimeExecMain func);
+mono_runtime_class_init     (MonoClass *klass);
+
+void        
+mono_install_runtime_invoke (MonoInvokeFunc func);
+
+void        
+mono_install_compile_method (MonoCompileFunc func);
+
+MonoObject*
+mono_runtime_invoke         (MonoMethod *method, void *obj, void **params,
+			     MonoObject **exc);
+
+MonoMethod *
+mono_get_delegate_invoke    (MonoClass *klass);
+
+MonoObject*
+mono_runtime_delegate_invoke (MonoObject *delegate, void **params, 
+			      MonoObject **exc);
+
+MonoObject*
+mono_runtime_invoke_array   (MonoMethod *method, void *obj, MonoArray *params,
+			     MonoObject **exc);
+
+MonoArray*
+mono_runtime_get_main_args  (void);
+
+int
+mono_runtime_run_main       (MonoMethod *method, int argc, char* argv[], 
+			     MonoObject **exc);
+
+int
+mono_runtime_exec_main      (MonoMethod *method, MonoArray *args,
+			     MonoObject **exc);
+
+MonoAsyncResult *
+mono_async_result_new       (MonoDomain *domain, HANDLE handle, 
+			     MonoObject *state, gpointer data);
+
+MonoWaitHandle *
+mono_wait_handle_new        (MonoDomain *domain, HANDLE handle);
+
+void
+mono_message_init           (MonoDomain *domain, MonoMethodMessage *this_obj, 
+			     MonoReflectionMethod *method, MonoArray *out_args);
+
+MonoObject *
+mono_remoting_invoke        (MonoObject *real_proxy, MonoMethodMessage *msg, 
+			     MonoObject **exc, MonoArray **out_args);
+
+MonoObject *
+mono_message_invoke         (MonoObject *target, MonoMethodMessage *msg, 
+			     MonoObject **exc, MonoArray **out_args);
+
+MonoMethodMessage *
+mono_method_call_message_new (MonoMethod *method, gpointer *params, MonoMethod *invoke, 
+			      MonoDelegate **cb, MonoObject **state);
+
+gpointer
+mono_load_remote_field (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, gpointer *res);
+
+void
+mono_store_remote_field (MonoObject *this_obj, MonoClass *klass, MonoClassField *field, gpointer val);
+
+void
+mono_method_return_message_restore (MonoMethod *method, gpointer *params, MonoArray *out_args);
+
+void
+mono_unhandled_exception    (MonoObject *exc);
+
+void
+mono_print_unhandled_exception (MonoObject *exc);
+
+void
+mono_delegate_ctor          (MonoObject *this_obj, MonoObject *target, gpointer addr);
+
+gpointer 
+mono_compile_method        (MonoMethod *method);
+
+/* accessors for fields and properties */
+void
+mono_field_set_value (MonoObject *obj, MonoClassField *field, void *value);
+
+void
+mono_field_static_set_value (MonoVTable *vt, MonoClassField *field, void *value);
+
+void
+mono_field_get_value (MonoObject *obj, MonoClassField *field, void *value);
+
+void
+mono_field_static_get_value (MonoVTable *vt, MonoClassField *field, void *value);
+
+void
+mono_property_set_value (MonoProperty *prop, void *obj, void **params, MonoObject **exc);
+
+MonoObject*
+mono_property_get_value (MonoProperty *prop, void *obj, void **params, MonoObject **exc);
 
 #endif
 
diff --git a/mono/metadata/opcodes.c b/mono/metadata/opcodes.c
index 9718ff5ac44..cbf00514f8d 100644
--- a/mono/metadata/opcodes.c
+++ b/mono/metadata/opcodes.c
@@ -9,11 +9,14 @@
 #include <mono/metadata/opcodes.h>
 #include <stddef.h> /* for NULL */
 
+#define MONO_PREFIX1_OFFSET MONO_CEE_ARGLIST
+#define MONO_CUSTOM_PREFIX_OFFSET MONO_CEE_MONO_FUNC1
+
 #define OPDEF(a,b,c,d,e,f,g,h,i,j) \
-	{ Mono ## e, MONO_FLOW_ ## j, ((g-1)<<8) | i },
+	{ Mono ## e, MONO_FLOW_ ## j, MONO_ ## a },
 
 const MonoOpcode
-mono_opcodes [MONO_N_OPCODES] = {
+mono_opcodes [MONO_CEE_LAST + 1] = {
 #include "mono/cil/opcode.def"
 	{0}
 };
@@ -23,8 +26,26 @@ mono_opcodes [MONO_N_OPCODES] = {
 #define OPDEF(a,b,c,d,e,f,g,h,i,j) b,
 
 const char* const
-mono_opcode_names [MONO_N_OPCODES] = {
+mono_opcode_names [MONO_CEE_LAST + 1] = {
 #include "mono/cil/opcode.def"
 	NULL
 };
 
+MonoOpcodeEnum
+mono_opcode_value (const guint8 **ip)
+{
+	MonoOpcodeEnum res;
+
+	if (**ip == 0xfe) {
+		++*ip;
+		res = **ip + MONO_PREFIX1_OFFSET;
+	} else if (**ip == MONO_CUSTOM_PREFIX) {
+		++*ip;
+		res = **ip + MONO_CUSTOM_PREFIX_OFFSET;
+	} else {
+		res = **ip;
+	}
+	
+	return res;
+}
+
diff --git a/mono/metadata/opcodes.h b/mono/metadata/opcodes.h
index c5a3e6926c7..dec47adc702 100644
--- a/mono/metadata/opcodes.h
+++ b/mono/metadata/opcodes.h
@@ -10,6 +10,20 @@
  * (C) 2002 Ximian, Inc.
  */
 
+#include <glib.h>
+
+#define MONO_CUSTOM_PREFIX 0xf0
+
+#define OPDEF(a,b,c,d,e,f,g,h,i,j) \
+	MONO_ ## a,
+
+typedef enum {
+#include "mono/cil/opcode.def"
+	MONO_CEE_LAST
+} MonoOpcodeEnum;
+
+#undef OPDEF
+
 enum {
 	MONO_FLOW_NEXT,
 	MONO_FLOW_BRANCH,
@@ -46,9 +60,10 @@ typedef struct {
 	unsigned short opval;
 } MonoOpcode;
 
-#define MONO_N_OPCODES 300
+extern const MonoOpcode mono_opcodes [];
+extern const char* const mono_opcode_names [];
 
-extern const MonoOpcode mono_opcodes [MONO_N_OPCODES];
-extern const char* const mono_opcode_names [MONO_N_OPCODES];
+MonoOpcodeEnum
+mono_opcode_value (const guint8 **ip);
 
 #endif /* __MONO_METADATA_OPCODES_H__ */
diff --git a/mono/metadata/pedump.c b/mono/metadata/pedump.c
index 630c5e715a3..f96dcace60d 100644
--- a/mono/metadata/pedump.c
+++ b/mono/metadata/pedump.c
@@ -17,12 +17,17 @@
 #include "mono-endian.h"
 #include "verify.h"
 #include <mono/metadata/class.h>
+#include <mono/metadata/debug-helpers.h>
+#include <mono/metadata/tokentype.h>
+#include <mono/metadata/appdomain.h>
+#include <mono/metadata/assembly.h>
 
 gboolean dump_data = TRUE;
 gboolean verify_pe = FALSE;
 
+/* unused
 static void
-hex_dump (char *buffer, int base, int count)
+hex_dump (const char *buffer, int base, int count)
 {
 	int i;
 	
@@ -33,21 +38,22 @@ hex_dump (char *buffer, int base, int count)
 		printf ("%02x ", (unsigned char) (buffer [i]));
 	}
 }
+*/
 
 static void
-hex8 (char *label, unsigned char x)
+hex8 (const char *label, unsigned char x)
 {
 	printf ("\t%s: 0x%02x\n", label, (unsigned char) x);
 }
 
 static void
-hex16 (char *label, guint16 x)
+hex16 (const char *label, guint16 x)
 {
 	printf ("\t%s: 0x%04x\n", label, x);
 }
 
 static void
-hex32 (char *label, guint32 x)
+hex32 (const char *label, guint32 x)
 {
 	printf ("\t%s: 0x%08x\n", label, x);
 }
@@ -204,7 +210,7 @@ dump_cli_header (MonoCLIHeader *ch)
 }	
 
 static void
-dsh (char *label, MonoImage *meta, MonoStreamHeader *sh)
+dsh (const char *label, MonoImage *meta, MonoStreamHeader *sh)
 {
 	printf ("%s: 0x%08x - 0x%08x [%d == 0x%08x]\n",
 		label,
@@ -246,7 +252,7 @@ dump_metadata (MonoImage *meta)
 static void
 dump_methoddef (MonoImage *metadata, guint32 token)
 {
-	char *loc;
+	const char *loc;
 
 	if (!token)
 		return;
@@ -272,6 +278,7 @@ static void
 dump_verify_info (MonoImage *image, int flags)
 {
 	GSList *errors, *tmp;
+	int count = 0;
 	const char* desc [] = {
 		"Ok", "Error", "Warning", NULL, "CLS"
 	};
@@ -281,14 +288,45 @@ dump_verify_info (MonoImage *image, int flags)
 	for (tmp = errors; tmp; tmp = tmp->next) {
 		MonoVerifyInfo *info = tmp->data;
 		g_print ("%s: %s\n", desc [info->status], info->message);
+		if (info->status == MONO_VERIFY_ERROR)
+			count++;
 	}
 	mono_free_verify_list (errors);
+
+	if (flags & (MONO_VERIFY_ALL + 1)) { /* verify code */
+		int i;
+		MonoTableInfo *m = &image->tables [MONO_TABLE_METHOD];
+
+		for (i = 0; i < m->rows; ++i) {
+			MonoMethod *method;
+
+			method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | (i+1), NULL);
+			errors = mono_method_verify (method, flags);
+			if (errors) {
+				char *sig;
+				sig = mono_signature_get_desc (method->signature, FALSE);
+				g_print ("In method: %s.%s::%s(%s)\n", method->klass->name_space, method->klass->name, method->name, sig);
+				g_free (sig);
+			}
+
+			for (tmp = errors; tmp; tmp = tmp->next) {
+				MonoVerifyInfo *info = tmp->data;
+				g_print ("%s: %s\n", desc [info->status], info->message);
+				if (info->status == MONO_VERIFY_ERROR)
+					count++;
+			}
+			mono_free_verify_list (errors);
+		}
+	}
+
+	if (count)
+		g_print ("Error count: %d\n", count);
 }
 
 static void
 usage (void)
 {
-	printf ("Usage is: pedump [--verify error,warn,cls,all] file.exe\n");
+	printf ("Usage is: pedump [--verify error,warn,cls,all,code] file.exe\n");
 	exit (1);
 }
 
@@ -298,8 +336,8 @@ main (int argc, char *argv [])
 	MonoImage *image;
 	char *file = NULL;
 	char *flags = NULL;
-	char *flag_desc [] = {"error", "warn", "cls", "all", NULL};
-	guint flag_vals [] = {MONO_VERIFY_ERROR, MONO_VERIFY_WARNING, MONO_VERIFY_CLS, MONO_VERIFY_ALL};
+	const char *flag_desc [] = {"error", "warn", "cls", "all", "code", NULL};
+	guint flag_vals [] = {MONO_VERIFY_ERROR, MONO_VERIFY_WARNING, MONO_VERIFY_CLS, MONO_VERIFY_ALL, MONO_VERIFY_ALL + 1};
 	int i;
 	
 	for (i = 1; i < argc; i++){
@@ -334,6 +372,7 @@ main (int argc, char *argv [])
 	if (verify_pe) {
 		int f = 0;
 		char *tok = strtok (flags, ",");
+		MonoAssembly *assembly;
 		while (tok) {
 			for (i = 0; flag_desc [i]; ++i) {
 				if (strcmp (tok, flag_desc [i]) == 0) {
@@ -345,7 +384,9 @@ main (int argc, char *argv [])
 				g_print ("Unknown verify flag %s\n", tok);
 			tok = strtok (NULL, ",");
 		}
-		dump_verify_info (image, f);
+		mono_init (file);
+		assembly = mono_assembly_open (file, NULL);
+		dump_verify_info (assembly->image, f);
 	}
 	
 	mono_image_close (image);
diff --git a/mono/metadata/private.h b/mono/metadata/private.h
index db1c79b8ca2..ce301839829 100644
--- a/mono/metadata/private.h
+++ b/mono/metadata/private.h
@@ -64,7 +64,7 @@ enum {
 
 typedef struct {
 	int   code;
-	char *def;
+	const char *def;
 } MonoMetaTable;
 
 const char *mono_meta_table_name (int table);
diff --git a/mono/metadata/process.c b/mono/metadata/process.c
new file mode 100644
index 00000000000..fc5e17d44fb
--- /dev/null
+++ b/mono/metadata/process.c
@@ -0,0 +1,755 @@
+/*
+ * process.c: System.Diagnostics.Process support
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#include <config.h>
+
+#include <glib.h>
+
+#include <mono/metadata/object.h>
+#include <mono/metadata/process.h>
+#include <mono/metadata/assembly.h>
+#include <mono/metadata/appdomain.h>
+#include <mono/metadata/image.h>
+#include <mono/metadata/cil-coff.h>
+#include <mono/io-layer/io-layer.h>
+
+#undef DEBUG
+
+HANDLE ves_icall_System_Diagnostics_Process_GetCurrentProcess_internal (void)
+{
+	HANDLE handle;
+	
+	/* GetCurrentProcess returns a pseudo-handle, so use
+	 * OpenProcess instead
+	 */
+	handle=OpenProcess (PROCESS_ALL_ACCESS, TRUE, GetCurrentProcessId ());
+	
+	if(handle==NULL) {
+		/* FIXME: Throw an exception */
+		return(NULL);
+	}
+	
+	return(handle);
+}
+
+guint32 ves_icall_System_Diagnostics_Process_GetPid_internal (void)
+{
+	return(GetCurrentProcessId ());
+}
+
+void ves_icall_System_Diagnostics_Process_Process_free_internal (MonoObject *this,
+								 HANDLE process)
+{
+#ifdef THREAD_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Closing process %p, handle %p",
+		   this, process);
+#endif
+
+	CloseHandle (process);
+}
+
+#define STASH_SYS_ASS(this) \
+	if(system_assembly == NULL) { \
+		system_assembly=this->vtable->klass->image; \
+	}
+
+static MonoImage *system_assembly=NULL;
+
+static guint32 unicode_chars (const gunichar2 *str)
+{
+	guint32 len=0;
+	
+	do {
+		if(str[len]=='\0') {
+			return(len);
+		}
+		len++;
+	} while(1);
+}
+
+static guint32 unicode_bytes (const gunichar2 *str)
+{
+	guint32 len=0;
+	
+	do {
+		if(str[len]=='\0') {
+			/* Include the terminators */
+			return((len*2)+2);
+		}
+		len++;
+	} while(1);
+}
+
+static void process_set_field_object (MonoObject *obj, const guchar *fieldname,
+				      MonoObject *data)
+{
+	MonoClassField *field;
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Setting field %s to object at %p",
+		   fieldname, data);
+#endif
+
+	field=mono_class_get_field_from_name (mono_object_class (obj),
+					      fieldname);
+	*(MonoObject **)(((char *)obj) + field->offset)=data;
+}
+
+static void process_set_field_string (MonoObject *obj, const guchar *fieldname,
+				      const gunichar2 *val, guint32 len)
+{
+	MonoClassField *field;
+	MonoString *string;
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Setting field %s to [%s]",
+		   fieldname, g_utf16_to_utf8 (val, len, NULL, NULL, NULL));
+#endif
+
+	string=mono_string_new_utf16 (mono_object_domain (obj), val, len);
+	
+	field=mono_class_get_field_from_name (mono_object_class (obj),
+					      fieldname);
+	*(MonoString **)(((char *)obj) + field->offset)=string;
+}
+
+static void process_set_field_string_utf8 (MonoObject *obj,
+					   const guchar *fieldname,
+					   const guchar *val)
+{
+	MonoClassField *field;
+	MonoString *string;
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Setting field %s to [%s]",
+		   fieldname, val);
+#endif
+
+	string=mono_string_new (mono_object_domain (obj), val);
+	
+	field=mono_class_get_field_from_name (mono_object_class (obj),
+					      fieldname);
+	*(MonoString **)(((char *)obj) + field->offset)=string;
+}
+
+static void process_set_field_int (MonoObject *obj, const guchar *fieldname,
+				   guint32 val)
+{
+	MonoClassField *field;
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Setting field %s to %d",
+		   fieldname, val);
+#endif
+	
+	field=mono_class_get_field_from_name (mono_object_class (obj),
+					      fieldname);
+	*(guint32 *)(((char *)obj) + field->offset)=val;
+}
+
+static void process_set_field_bool (MonoObject *obj, const guchar *fieldname,
+				    gboolean val)
+{
+	MonoClassField *field;
+
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Setting field %s to %s",
+		   fieldname, val?"TRUE":"FALSE");
+#endif
+	
+	field=mono_class_get_field_from_name (mono_object_class (obj),
+					      fieldname);
+	*(guint8 *)(((char *)obj) + field->offset)=val;
+}
+
+typedef struct {
+	guint16 data_len;
+	guint16 value_len;
+	guint16 type;
+	gunichar2 *key;
+} version_data;
+
+/* Returns a pointer to the value data, because theres no way to know
+ * how big that data is (value_len is set to zero for most blocks :-()
+ */
+static gpointer process_get_versioninfo_block (gpointer data,
+					       version_data *block)
+{
+	block->data_len=*(((guint16 *)data)++);
+	block->value_len=*(((guint16 *)data)++);
+
+	/* No idea what the type is supposed to indicate */
+	block->type=*(((guint16 *)data)++);
+	block->key=((gunichar2 *)data);
+
+	/* skip over the key (including the terminator) */
+	data=((gunichar2 *)data)+(unicode_chars (block->key)+1);
+
+	/* align on a 32-bit boundary */
+	data=(gpointer)(((unsigned)data+3) & (~3));
+	
+	return(data);
+}
+
+/* Returns a pointer to the byte following the Var block */
+static gpointer process_read_var_block (MonoObject *filever, gpointer data_ptr,
+					guint16 data_len)
+{
+	/* Not currently interested in the VarFileInfo block.  This
+	 * might change if language support is needed for file version
+	 * strings (VarFileInfo contains lists of supported
+	 * languages.)
+	 */
+	version_data block;
+
+	/* data_ptr is pointing at a Var block of length data_len */
+	data_ptr=process_get_versioninfo_block (data_ptr, &block);
+	data_ptr=((guchar *)data_ptr)+block.value_len;
+
+	return(data_ptr);
+}
+
+/* Returns a pointer to the byte following the String block */
+static gpointer process_read_string_block (MonoObject *filever,
+					   gpointer data_ptr,
+					   guint16 data_len,
+					   gboolean store)
+{
+	version_data block;
+	guint16 string_len=0;
+	guchar comments_key[]= {'C', '\0', 'o', '\0', 'm', '\0',
+				'm', '\0', 'e', '\0', 'n', '\0',
+				't', '\0', 's', '\0', '\0', '\0'};
+	guchar compname_key[]= {'C', '\0', 'o', '\0', 'm', '\0',
+				'p', '\0', 'a', '\0', 'n', '\0',
+				'y', '\0', 'N', '\0', 'a', '\0',
+				'm', '\0', 'e', '\0', '\0', '\0'};
+	guchar filedesc_key[]= {'F', '\0', 'i', '\0', 'l', '\0',
+				'e', '\0', 'D', '\0', 'e', '\0',
+				's', '\0', 'c', '\0', 'r', '\0',
+				'i', '\0', 'p', '\0', 't', '\0',
+				'i', '\0', 'o', '\0', 'n', '\0',
+				'\0', '\0'};
+	guchar filever_key[]= {'F', '\0', 'i', '\0', 'l', '\0',
+			       'e', '\0', 'V', '\0', 'e', '\0',
+			       'r', '\0', 's', '\0', 'i', '\0',
+			       'o', '\0', 'n', '\0', '\0', '\0'};
+	guchar internal_key[]= {'I', '\0', 'n', '\0', 't', '\0',
+				'e', '\0', 'r', '\0', 'n', '\0',
+				'a', '\0', 'l', '\0', 'N', '\0',
+				'a', '\0', 'm', '\0', 'e', '\0',
+				'\0', '\0'};
+	guchar legalcpy_key[]= {'L', '\0', 'e', '\0', 'g', '\0',
+				'a', '\0', 'l', '\0', 'C', '\0',
+				'o', '\0', 'p', '\0', 'y', '\0',
+				'r', '\0', 'i', '\0', 'g', '\0',
+				'h', '\0', 't', '\0', '\0', '\0'};
+	guchar legaltrade_key[]= {'L', '\0', 'e', '\0', 'g', '\0',
+				  'a', '\0', 'l', '\0', 'T', '\0',
+				  'r', '\0', 'a', '\0', 'd', '\0',
+				  'e', '\0', 'm', '\0', 'a', '\0',
+				  'r', '\0', 'k', '\0', 's', '\0',
+				  '\0', '\0'};
+	guchar origfile_key[]= {'O', '\0', 'r', '\0', 'i', '\0',
+				'g', '\0', 'i', '\0', 'n', '\0',
+				'a', '\0', 'l', '\0', 'F', '\0',
+				'i', '\0', 'l', '\0', 'e', '\0',
+				'n', '\0', 'a', '\0', 'm', '\0',
+				'e', '\0', '\0', '\0'};
+	guchar privbuild_key[]= {'P', '\0', 'r', '\0', 'i', '\0',
+				 'v', '\0', 'a', '\0', 't', '\0',
+				 'e', '\0', 'B', '\0', 'u', '\0',
+				 'i', '\0', 'l', '\0', 'd', '\0',
+				 '\0', '\0'};
+	guchar prodname_key[]= {'P', '\0', 'r', '\0', 'o', '\0',
+				'd', '\0', 'u', '\0', 'c', '\0',
+				't', '\0', 'N', '\0', 'a', '\0',
+				'm', '\0', 'e', '\0', '\0', '\0'};
+	guchar prodver_key[]= {'P', '\0', 'r', '\0', 'o', '\0',
+			       'd', '\0', 'u', '\0', 'c', '\0',
+			       't', '\0', 'V', '\0', 'e', '\0',
+			       'r', '\0', 's', '\0', 'i', '\0',
+			       'o', '\0', 'n', '\0', '\0', '\0'};
+	guchar specbuild_key[]= {'S', '\0', 'p', '\0', 'e', '\0',
+				 'c', '\0', 'i', '\0', 'a', '\0',
+				 'l', '\0', 'B', '\0', 'u', '\0',
+				 'i', '\0', 'l', '\0', 'd', '\0',
+				 '\0', '\0'};
+	
+	/* data_ptr is pointing at an array of one or more String
+	 * blocks with total length (not including alignment padding)
+	 * of data_len.
+	 */
+	while(string_len<data_len) {
+		gunichar2 *value;
+		
+		/* align on a 32-bit boundary */
+		data_ptr=(gpointer)(((unsigned)data_ptr+3) & (~3));
+
+		data_ptr=process_get_versioninfo_block (data_ptr, &block);
+		string_len=string_len+block.data_len;
+		value=(gunichar2 *)data_ptr;
+		/* Skip over the value */
+		data_ptr=((gunichar2 *)data_ptr)+block.value_len;
+		
+		if(store==TRUE) {
+			if(!memcmp (block.key, &comments_key,
+				    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "comments", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &compname_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "companyname", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &filedesc_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "filedescription", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &filever_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "fileversion", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &internal_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "internalname", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &legalcpy_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "legalcopyright", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &legaltrade_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "legaltrademarks", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &origfile_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "originalfilename", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &privbuild_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "privatebuild", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &prodname_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "productname", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &prodver_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "productversion", value, unicode_chars (value));
+			} else if (!memcmp (block.key, &specbuild_key,
+					    unicode_bytes (block.key))) {
+				process_set_field_string (filever, "specialbuild", value, unicode_chars (value));
+			} else {
+				/* Not an error, just not interesting
+				 * in this case
+				 */
+			}
+		}
+	}
+	
+	return(data_ptr);
+}
+
+/* returns a pointer to the byte following the Stringtable block */
+static gpointer process_read_stringtable_block (MonoObject *filever,
+						gpointer data_ptr,
+						guint16 data_len)
+{
+	version_data block;
+	guint16 string_len=36;	/* length of the StringFileInfo block */
+
+	/* Specifies language-neutral unicode string block */
+	guchar uni_key[]= {'0', '\0', '0', '\0', '0', '\0', '0', '\0',
+			   '0', '\0', '4', '\0', 'b', '\0', '0', '\0',
+			   '\0', '\0'
+	};
+	guchar uni_key_uc[]= {'0', '\0', '0', '\0', '0', '\0', '0', '\0',
+			      '0', '\0', '4', '\0', 'B', '\0', '0', '\0',
+			      '\0', '\0'
+	};
+	
+	/* data_ptr is pointing at an array of StringTable blocks,
+	 * with total length (not including alignment padding) of
+	 * data_len.
+	 */
+
+	while(string_len<data_len) {
+		/* align on a 32-bit boundary */
+		data_ptr=(gpointer)(((unsigned)data_ptr+3) & (~3));
+
+		data_ptr=process_get_versioninfo_block (data_ptr, &block);
+		string_len=string_len+block.data_len;
+	
+		if(!memcmp (block.key, &uni_key, unicode_bytes (block.key)) ||
+		   !memcmp (block.key, &uni_key_uc, unicode_bytes (block.key))) {
+			/* Got the one we're interested in */
+			process_set_field_string_utf8 (filever, "language",
+						       "Language Neutral");
+			
+			data_ptr=process_read_string_block (filever, data_ptr,
+							    block.data_len,
+							    TRUE);
+		} else {
+			/* Some other language.  We might want to do
+			 * something with this in the future.
+			 */
+			data_ptr=process_read_string_block (filever, data_ptr,
+							    block.data_len,
+							    FALSE);
+		}
+	}
+		
+	return(data_ptr);
+}
+
+static void process_read_fixedfileinfo_block (MonoObject *filever,
+					      VS_FIXEDFILEINFO *ffi)
+{
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": ffi: sig 0x%x, strucver 0x%x, fileverm 0x%x, fileverl 0x%x, prodverm 0x%x, prodverl 0x%x, ffmask 0x%x, ff 0x%x, os 0x%x, type 0x%x, subtype 0x%x, datem 0x%x, datel 0x%x", ffi->dwSignature, ffi->dwStrucVersion, ffi->dwFileVersionMS, ffi->dwFileVersionLS, ffi->dwProductVersionMS, ffi->dwProductVersionLS, ffi->dwFileFlagsMask, ffi->dwFileFlags, ffi->dwFileOS, ffi->dwFileType, ffi->dwFileSubtype, ffi->dwFileDateMS, ffi->dwFileDateLS);
+#endif
+		
+	process_set_field_int (filever, "filemajorpart",
+			       HIWORD (ffi->dwFileVersionMS));
+	process_set_field_int (filever, "fileminorpart",
+			       LOWORD (ffi->dwFileVersionMS));
+	process_set_field_int (filever, "filebuildpart",
+			       HIWORD (ffi->dwFileVersionLS));
+	process_set_field_int (filever, "fileprivatepart",
+			       LOWORD (ffi->dwFileVersionLS));
+		
+	process_set_field_int (filever, "productmajorpart",
+			       HIWORD (ffi->dwProductVersionMS));
+	process_set_field_int (filever, "productminorpart",
+			       LOWORD (ffi->dwProductVersionMS));
+	process_set_field_int (filever, "productbuildpart",
+			       HIWORD (ffi->dwProductVersionLS));
+	process_set_field_int (filever, "productprivatepart",
+			       LOWORD (ffi->dwProductVersionLS));
+	
+	process_set_field_bool (filever, "isdebug",
+				ffi->dwFileFlags&VS_FF_DEBUG);
+	process_set_field_bool (filever, "isprerelease",
+				ffi->dwFileFlags&VS_FF_PRERELEASE);
+	process_set_field_bool (filever, "ispatched",
+				ffi->dwFileFlags&VS_FF_PATCHED);
+	process_set_field_bool (filever, "isprivatebuild",
+				ffi->dwFileFlags&VS_FF_PRIVATEBUILD);
+	process_set_field_bool (filever, "isspecialbuild",
+				ffi->dwFileFlags&VS_FF_SPECIALBUILD);
+}
+
+static void process_get_fileversion (MonoObject *filever, MonoImage *image)
+{
+	MonoPEResourceDataEntry *version_info;
+	gpointer data;
+	VS_FIXEDFILEINFO *ffi;
+	gpointer data_ptr;
+	version_data block;
+	gint32 data_len; /* signed to guard against underflow */
+	guchar vs_key[]= {'V', '\0', 'S', '\0', '_', '\0', 'V', '\0',
+			  'E', '\0', 'R', '\0', 'S', '\0', 'I', '\0',
+			  'O', '\0', 'N', '\0', '_', '\0', 'I', '\0',
+			  'N', '\0', 'F', '\0', 'O', '\0', '\0', '\0'
+	};
+	guchar var_key[]= {'V', '\0', 'a', '\0', 'r', '\0', 'F', '\0',
+			   'i', '\0', 'l', '\0', 'e', '\0', 'I', '\0',
+			   'n', '\0', 'f', '\0', 'o', '\0', '\0', '\0', 
+	};
+	guchar str_key[]= {'S', '\0', 't', '\0', 'r', '\0', 'i', '\0',
+			   'n', '\0', 'g', '\0', 'F', '\0', 'i', '\0',
+			   'l', '\0', 'e', '\0', 'I', '\0', 'n', '\0',
+			   'f', '\0', 'o', '\0', '\0', '\0', 
+	};
+	
+	version_info=mono_image_lookup_resource (image,
+						 MONO_PE_RESOURCE_ID_VERSION,
+						 0, NULL);
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": image_lookup returned %p",
+		   version_info);
+#endif
+
+	if(version_info==NULL) {
+		return;
+	}
+	
+	data=mono_cli_rva_map (image->image_info,
+			       version_info->rde_data_offset);
+	if(data==NULL) {
+		return;
+	}
+
+	/* See io-layer/versioninfo.h for the gory details on how this
+	 * data is laid out. (data should be pointing to
+	 * VS_VERSIONINFO data).
+	 */
+
+	data_ptr=process_get_versioninfo_block (data, &block);
+		
+	data_len=block.data_len;
+		
+	if(block.value_len!=sizeof(VS_FIXEDFILEINFO)) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": FIXEDFILEINFO size mismatch");
+#endif
+		return;
+	}
+
+	if(memcmp (block.key, &vs_key, unicode_bytes (block.key))) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": VS_VERSION_INFO mismatch");
+#endif
+		return;
+	}
+
+	ffi=(((VS_FIXEDFILEINFO *)data_ptr)++);
+	if((ffi->dwSignature!=VS_FFI_SIGNATURE) ||
+	   (ffi->dwStrucVersion!=VS_FFI_STRUCVERSION)) {
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": FIXEDFILEINFO bad signature");
+#endif
+		return;
+	}
+	process_read_fixedfileinfo_block (filever, ffi);
+	
+	/* Subtract the 92 bytes we've already seen */
+	data_len -= 92;
+	
+	/* There now follow zero or one StringFileInfo blocks and zero
+	 * or one VarFileInfo blocks
+	 */
+	while(data_len > 0) {
+		/* align on a 32-bit boundary */
+		data_ptr=(gpointer)(((unsigned)data_ptr+3) & (~3));
+
+		data_ptr=process_get_versioninfo_block (data_ptr, &block);
+		data_len=data_len-block.data_len;
+
+		if(!memcmp (block.key, &var_key, unicode_bytes (block.key))) {
+			data_ptr=process_read_var_block (filever, data_ptr,
+							 block.data_len);
+		} else if (!memcmp (block.key, &str_key,
+				    unicode_bytes (block.key))) {
+			data_ptr=process_read_stringtable_block (filever, data_ptr, block.data_len);
+		} else {
+			/* Bogus data */
+#ifdef DEBUG
+			g_message (G_GNUC_PRETTY_FUNCTION
+				   ": Not a valid VERSIONINFO child block");
+			return;
+#endif
+		}
+	}
+}
+
+static void process_add_module (GPtrArray *modules, MonoAssembly *ass)
+{
+	MonoClass *proc_class, *filever_class;
+	MonoObject *item, *filever;
+	MonoDomain *domain=mono_domain_get ();
+	gchar *modulename;
+	
+	/* Build a System.Diagnostics.ProcessModule with the data.
+	 * Leave BaseAddress and EntryPointAddress set to NULL,
+	 * FileName is ass->image->name, FileVersionInfo is an object
+	 * constructed from the PE image data referenced by
+	 * ass->image, ModuleMemorySize set to 0, ModuleName the last
+	 * component of FileName.
+	 */
+	proc_class=mono_class_from_name (system_assembly, "System.Diagnostics",
+					 "ProcessModule");
+	item=mono_object_new (domain, proc_class);
+
+	filever_class=mono_class_from_name (system_assembly,
+					    "System.Diagnostics",
+					    "FileVersionInfo");
+	filever=mono_object_new (domain, filever_class);
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": recording assembly: FileName [%s] FileVersionInfo [%d.%d.%d.%d], ModuleName [%s]", ass->image->name, ass->aname.major, ass->aname.minor, ass->aname.build, ass->aname.revision, ass->image->name);
+#endif
+
+	process_get_fileversion (filever, ass->image);
+
+	process_set_field_string_utf8 (filever, "filename", ass->image->name);
+	process_set_field_string_utf8 (item, "filename", ass->image->name);
+	process_set_field_object (item, "version_info", filever);
+
+	modulename=g_path_get_basename (ass->image->name);
+	process_set_field_string_utf8 (item, "modulename", modulename);
+	g_free (modulename);
+
+	g_ptr_array_add (modules, item);
+}
+
+static void process_scan_modules (gpointer data, gpointer user_data)
+{
+	MonoAssembly *ass=data;
+	GPtrArray *modules=user_data;
+
+	/* The main assembly is already in the list */
+	if(mono_assembly_get_main () != ass) {
+		process_add_module (modules, ass);
+	}
+}
+
+
+/* Returns an array of System.Diagnostics.ProcessModule */
+MonoArray *ves_icall_System_Diagnostics_Process_GetModules_internal (MonoObject *this)
+{
+	/* I was going to use toolhelp for this, but then realised I
+	 * was being an idiot :)
+	 *
+	 * (Toolhelp would give shared libraries open by the runtime,
+	 * as well as open assemblies.  On windows my tests didnt find
+	 * the assemblies loaded by mono either.)
+	 */
+	GPtrArray *modules_list=g_ptr_array_new ();
+	MonoArray *arr;
+	guint32 i;
+	
+	STASH_SYS_ASS (this);
+	
+	/* Make sure the first entry is the main module */
+	process_add_module (modules_list, mono_assembly_get_main ());
+	
+	mono_assembly_foreach (process_scan_modules, modules_list);
+
+	/* Build a MonoArray out of modules_list */
+	arr=mono_array_new (mono_domain_get (), mono_defaults.object_class,
+			    modules_list->len);
+	
+	for(i=0; i<modules_list->len; i++) {
+		mono_array_set (arr, MonoObject *, i,
+				g_ptr_array_index (modules_list, i));
+	}
+	
+	g_ptr_array_free (modules_list, FALSE);
+	
+	return(arr);
+}
+
+void ves_icall_System_Diagnostics_FileVersionInfo_GetVersionInfo_internal (MonoObject *this, MonoString *filename)
+{
+	MonoImage *image;
+	guchar *filename_utf8;
+	
+	STASH_SYS_ASS (this);
+	
+	filename_utf8=mono_string_to_utf8 (filename);
+	image=mono_image_open (filename_utf8, NULL);
+	g_free (filename_utf8);
+	
+	if(image==NULL) {
+		/* FIXME: an exception might be appropriate here */
+#ifdef DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": Failed to load image");
+#endif
+
+		return;
+	}
+	
+	process_get_fileversion (this, image);
+	process_set_field_string_utf8 (this, "filename", image->name);
+	
+	mono_image_close (image);
+}
+
+MonoBoolean ves_icall_System_Diagnostics_Process_Start_internal (MonoString *filename, MonoString *args, HANDLE stdin_handle, HANDLE stdout_handle, HANDLE stderr_handle, MonoProcInfo *process_info)
+{
+	gboolean ret;
+	gunichar2 *utf16_filename;
+	gunichar2 *utf16_args;
+	STARTUPINFO startinfo={0};
+	PROCESS_INFORMATION procinfo;
+	
+	utf16_filename=mono_string_to_utf16 (filename);
+	utf16_args=mono_string_to_utf16 (args);
+	
+	startinfo.cb=sizeof(STARTUPINFO);
+	startinfo.dwFlags=STARTF_USESTDHANDLES;
+	startinfo.hStdInput=stdin_handle;
+	startinfo.hStdOutput=stdout_handle;
+	startinfo.hStdError=stderr_handle;
+	
+	ret=CreateProcess (utf16_filename, utf16_args, NULL, NULL, TRUE, CREATE_UNICODE_ENVIRONMENT, NULL, NULL, &startinfo, &procinfo);
+
+	g_free (utf16_filename);
+	g_free (utf16_args);
+
+	if(ret==TRUE) {
+		process_info->process_handle=procinfo.hProcess;
+		process_info->thread_handle=procinfo.hThread;
+		process_info->pid=procinfo.dwProcessId;
+		process_info->tid=procinfo.dwThreadId;
+	}
+	
+	return(ret);
+}
+
+MonoBoolean ves_icall_System_Diagnostics_Process_WaitForExit_internal (MonoObject *this, HANDLE process, gint32 ms)
+{
+	guint32 ret;
+	
+	if(ms<0) {
+		/* Wait forever */
+		ret=WaitForSingleObject (process, INFINITE);
+	} else {
+		ret=WaitForSingleObject (process, ms);
+	}
+	
+	if(ret==WAIT_OBJECT_0) {
+		return(TRUE);
+	} else {
+		return(FALSE);
+	}
+}
+
+gint64 ves_icall_System_Diagnostics_Process_ExitTime_internal (HANDLE process)
+{
+	gboolean ret;
+	gint64 ticks;
+	FILETIME create_time, exit_time, kernel_time, user_time;
+	
+	ret=GetProcessTimes (process, &create_time, &exit_time, &kernel_time,
+			     &user_time);
+	if(ret==TRUE) {
+		ticks=((guint64)exit_time.dwHighDateTime << 32) +
+			exit_time.dwLowDateTime;
+		
+		return(ticks);
+	} else {
+		return(0);
+	}
+}
+
+gint64 ves_icall_System_Diagnostics_Process_StartTime_internal (HANDLE process)
+{
+	gboolean ret;
+	gint64 ticks;
+	FILETIME create_time, exit_time, kernel_time, user_time;
+	
+	ret=GetProcessTimes (process, &create_time, &exit_time, &kernel_time,
+			     &user_time);
+	if(ret==TRUE) {
+		ticks=((guint64)create_time.dwHighDateTime << 32) +
+			create_time.dwLowDateTime;
+		
+		return(ticks);
+	} else {
+		return(0);
+	}
+}
+
+gint32 ves_icall_System_Diagnostics_Process_ExitCode_internal (HANDLE process)
+{
+	guint32 code;
+	
+	GetExitCodeProcess (process, &code);
+	
+#ifdef DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": process exit code is %d", code);
+#endif
+	
+	return(code);
+}
diff --git a/mono/metadata/process.h b/mono/metadata/process.h
new file mode 100644
index 00000000000..0bf88ee6f3e
--- /dev/null
+++ b/mono/metadata/process.h
@@ -0,0 +1,38 @@
+/*
+ * process.h: System.Diagnostics.Process support
+ *
+ * Author:
+ *	Dick Porter (dick@ximian.com)
+ *
+ * (C) 2002 Ximian, Inc.
+ */
+
+#ifndef _MONO_METADATA_PROCESS_H_
+#define _MONO_METADATA_PROCESS_H_
+
+#include <config.h>
+#include <glib.h>
+
+#include <mono/metadata/object.h>
+#include <mono/io-layer/io-layer.h>
+
+typedef struct 
+{
+	HANDLE process_handle;
+	HANDLE thread_handle;
+	guint32 pid;
+	guint32 tid;
+} MonoProcInfo;
+
+extern HANDLE ves_icall_System_Diagnostics_Process_GetCurrentProcess_internal (void);
+extern guint32 ves_icall_System_Diagnostics_Process_GetPid_internal (void);
+extern void ves_icall_System_Diagnostics_Process_Process_free_internal (MonoObject *this, HANDLE process);
+extern MonoArray *ves_icall_System_Diagnostics_Process_GetModules_internal (MonoObject *this);
+extern void ves_icall_System_Diagnostics_FileVersionInfo_GetVersionInfo_internal (MonoObject *this, MonoString *filename);
+extern MonoBoolean ves_icall_System_Diagnostics_Process_Start_internal (MonoString *filename, MonoString *args, HANDLE stdin_handle, HANDLE stdout_handle, HANDLE stderr_handle, MonoProcInfo *process_handle);
+extern MonoBoolean ves_icall_System_Diagnostics_Process_WaitForExit_internal (MonoObject *this, HANDLE process, gint32 ms);
+extern gint64 ves_icall_System_Diagnostics_Process_ExitTime_internal (HANDLE process);
+extern gint64 ves_icall_System_Diagnostics_Process_StartTime_internal (HANDLE process);
+extern gint32 ves_icall_System_Diagnostics_Process_ExitCode_internal (HANDLE process);
+
+#endif /* _MONO_METADATA_PROCESS_H_ */
diff --git a/mono/metadata/profiler-private.h b/mono/metadata/profiler-private.h
new file mode 100644
index 00000000000..a31d6d52b0b
--- /dev/null
+++ b/mono/metadata/profiler-private.h
@@ -0,0 +1,40 @@
+
+#ifndef __MONO_PROFILER_PRIVATE_H__
+#define __MONO_PROFILER_PRIVATE_H__
+
+#include <mono/metadata/profiler.h>
+
+extern MonoProfileFlags mono_profiler_events;
+
+enum {
+	MONO_PROFILE_START_LOAD,
+	MONO_PROFILE_END_LOAD,
+	MONO_PROFILE_START_UNLOAD,
+	MONO_PROFILE_END_UNLOAD
+};
+
+void mono_profiler_shutdown        (void);
+
+void mono_profiler_method_enter    (MonoMethod *method);
+void mono_profiler_method_leave    (MonoMethod *method);
+void mono_profiler_method_jit      (MonoMethod *method);
+void mono_profiler_method_end_jit  (MonoMethod *method, int result);
+
+void mono_profiler_code_transition (MonoMethod *method, int result);
+void mono_profiler_thread_start    (guint32 tid);
+void mono_profiler_thread_end      (guint32 tid);
+
+void mono_profiler_assembly_event  (MonoAssembly *assembly, int code);
+void mono_profiler_assembly_loaded (MonoAssembly *assembly, int result);
+
+void mono_profiler_module_event  (MonoImage *image, int code);
+void mono_profiler_module_loaded (MonoImage *image, int result);
+
+void mono_profiler_class_event  (MonoClass *klass, int code);
+void mono_profiler_class_loaded (MonoClass *klass, int result);
+
+void mono_profiler_appdomain_event  (MonoDomain *domain, int code);
+void mono_profiler_appdomain_loaded (MonoDomain *domain, int result);
+
+#endif /* __MONO_PROFILER_PRIVATE_H__ */
+
diff --git a/mono/metadata/profiler.c b/mono/metadata/profiler.c
new file mode 100644
index 00000000000..a86977e0b4b
--- /dev/null
+++ b/mono/metadata/profiler.c
@@ -0,0 +1,618 @@
+
+#include "mono/metadata/profiler-private.h"
+#include "mono/metadata/debug-helpers.h"
+#include <string.h>
+
+static MonoProfiler * current_profiler = NULL;
+
+static MonoProfileAppDomainFunc   domain_start_load;
+static MonoProfileAppDomainResult domain_end_load;
+static MonoProfileAppDomainFunc   domain_start_unload;
+static MonoProfileAppDomainFunc   domain_end_unload;
+
+static MonoProfileAssemblyFunc   assembly_start_load;
+static MonoProfileAssemblyResult assembly_end_load;
+static MonoProfileAssemblyFunc   assembly_start_unload;
+static MonoProfileAssemblyFunc   assembly_end_unload;
+
+static MonoProfileModuleFunc   module_start_load;
+static MonoProfileModuleResult module_end_load;
+static MonoProfileModuleFunc   module_start_unload;
+static MonoProfileModuleFunc   module_end_unload;
+
+static MonoProfileClassFunc   class_start_load;
+static MonoProfileClassResult class_end_load;
+static MonoProfileClassFunc   class_start_unload;
+static MonoProfileClassFunc   class_end_unload;
+
+static MonoProfileMethodFunc   jit_start;
+static MonoProfileMethodResult jit_end;
+static MonoProfileMethodResult man_unman_transition;
+static MonoProfileMethodFunc   method_enter;
+static MonoProfileMethodFunc   method_leave;
+
+static MonoProfileThreadFunc   thread_start;
+static MonoProfileThreadFunc   thread_end;
+
+static MonoProfileFunc shutdown_callback;
+
+/* this is directly accessible to other mono libs. */
+MonoProfileFlags mono_profiler_events;
+
+void
+mono_profiler_install (MonoProfiler *prof, MonoProfileFunc callback)
+{
+	if (current_profiler)
+		g_error ("profiler already setup");
+	current_profiler = prof;
+	shutdown_callback = callback;
+}
+
+void
+mono_profiler_set_events (MonoProfileFlags events)
+{
+	mono_profiler_events = events;
+}
+
+MonoProfileFlags
+mono_profiler_get_events (void)
+{
+	return mono_profiler_events;
+}
+
+void
+mono_profiler_install_enter_leave (MonoProfileMethodFunc enter, MonoProfileMethodFunc leave)
+{
+	method_enter = enter;
+	method_leave = leave;
+}
+
+void 
+mono_profiler_install_jit_compile (MonoProfileMethodFunc start, MonoProfileMethodResult end)
+{
+	jit_start = start;
+	jit_end = end;
+}
+
+void 
+mono_profiler_install_thread (MonoProfileThreadFunc start, MonoProfileThreadFunc end)
+{
+	thread_start = start;
+	thread_end = end;
+}
+
+void 
+mono_profiler_install_transition (MonoProfileMethodResult callback)
+{
+	man_unman_transition = callback;
+}
+
+void 
+mono_profiler_install_appdomain   (MonoProfileAppDomainFunc start_load, MonoProfileAppDomainResult end_load,
+                                   MonoProfileAppDomainFunc start_unload, MonoProfileAppDomainFunc end_unload)
+
+{
+	domain_start_load = start_load;
+	domain_end_load = end_load;
+	domain_start_unload = start_unload;
+	domain_end_unload = end_unload;
+}
+
+void 
+mono_profiler_install_assembly    (MonoProfileAssemblyFunc start_load, MonoProfileAssemblyResult end_load,
+                                   MonoProfileAssemblyFunc start_unload, MonoProfileAssemblyFunc end_unload)
+{
+	assembly_start_load = start_load;
+	assembly_end_load = end_load;
+	assembly_start_unload = start_unload;
+	assembly_end_unload = end_unload;
+}
+
+void 
+mono_profiler_install_module      (MonoProfileModuleFunc start_load, MonoProfileModuleResult end_load,
+                                   MonoProfileModuleFunc start_unload, MonoProfileModuleFunc end_unload)
+{
+	module_start_load = start_load;
+	module_end_load = end_load;
+	module_start_unload = start_unload;
+	module_end_unload = end_unload;
+}
+
+void
+mono_profiler_install_class       (MonoProfileClassFunc start_load, MonoProfileClassResult end_load,
+                                   MonoProfileClassFunc start_unload, MonoProfileClassFunc end_unload)
+{
+	class_start_load = start_load;
+	class_end_load = end_load;
+	class_start_unload = start_unload;
+	class_end_unload = end_unload;
+}
+
+void
+mono_profiler_method_enter (MonoMethod *method)
+{
+	if ((mono_profiler_events & MONO_PROFILE_ENTER_LEAVE) && method_enter)
+		method_enter (current_profiler, method);
+}
+
+void
+mono_profiler_method_leave (MonoMethod *method)
+{
+	if ((mono_profiler_events & MONO_PROFILE_ENTER_LEAVE) && method_leave)
+		method_leave (current_profiler, method);
+}
+
+void 
+mono_profiler_method_jit (MonoMethod *method)
+{
+	if ((mono_profiler_events & MONO_PROFILE_JIT_COMPILATION) && jit_start)
+		jit_start (current_profiler, method);
+}
+
+void 
+mono_profiler_method_end_jit (MonoMethod *method, int result)
+{
+	if ((mono_profiler_events & MONO_PROFILE_JIT_COMPILATION) && jit_end)
+		jit_end (current_profiler, method, result);
+}
+
+void 
+mono_profiler_code_transition (MonoMethod *method, int result)
+{
+	if ((mono_profiler_events & MONO_PROFILE_TRANSITIONS) && man_unman_transition)
+		man_unman_transition (current_profiler, method, result);
+}
+
+void
+mono_profiler_thread_start (guint32 tid)
+{
+	if ((mono_profiler_events & MONO_PROFILE_THREADS) && thread_start)
+		thread_start (current_profiler, tid);
+}
+
+void 
+mono_profiler_thread_end (guint32 tid)
+{
+	if ((mono_profiler_events & MONO_PROFILE_THREADS) && thread_end)
+		thread_end (current_profiler, tid);
+}
+
+void 
+mono_profiler_assembly_event  (MonoAssembly *assembly, int code)
+{
+	if (!(mono_profiler_events & MONO_PROFILE_ASSEMBLY_EVENTS))
+		return;
+	
+	switch (code) {
+	case MONO_PROFILE_START_LOAD:
+		if (assembly_start_load)
+			assembly_start_load (current_profiler, assembly);
+		break;
+	case MONO_PROFILE_START_UNLOAD:
+		if (assembly_start_unload)
+			assembly_start_unload (current_profiler, assembly);
+		break;
+	case MONO_PROFILE_END_UNLOAD:
+		if (assembly_end_unload)
+			assembly_end_unload (current_profiler, assembly);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+}
+
+void 
+mono_profiler_assembly_loaded (MonoAssembly *assembly, int result)
+{
+	if ((mono_profiler_events & MONO_PROFILE_ASSEMBLY_EVENTS) && assembly_end_load)
+		assembly_end_load (current_profiler, assembly, result);
+}
+
+void 
+mono_profiler_module_event  (MonoImage *module, int code)
+{
+	if (!(mono_profiler_events & MONO_PROFILE_MODULE_EVENTS))
+		return;
+	
+	switch (code) {
+	case MONO_PROFILE_START_LOAD:
+		if (module_start_load)
+			module_start_load (current_profiler, module);
+		break;
+	case MONO_PROFILE_START_UNLOAD:
+		if (module_start_unload)
+			module_start_unload (current_profiler, module);
+		break;
+	case MONO_PROFILE_END_UNLOAD:
+		if (module_end_unload)
+			module_end_unload (current_profiler, module);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+}
+
+void 
+mono_profiler_module_loaded (MonoImage *module, int result)
+{
+	if ((mono_profiler_events & MONO_PROFILE_MODULE_EVENTS) && module_end_load)
+		module_end_load (current_profiler, module, result);
+}
+
+void 
+mono_profiler_class_event  (MonoClass *klass, int code)
+{
+	if (!(mono_profiler_events & MONO_PROFILE_CLASS_EVENTS))
+		return;
+	
+	switch (code) {
+	case MONO_PROFILE_START_LOAD:
+		if (class_start_load)
+			class_start_load (current_profiler, klass);
+		break;
+	case MONO_PROFILE_START_UNLOAD:
+		if (class_start_unload)
+			class_start_unload (current_profiler, klass);
+		break;
+	case MONO_PROFILE_END_UNLOAD:
+		if (class_end_unload)
+			class_end_unload (current_profiler, klass);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+}
+
+void 
+mono_profiler_class_loaded (MonoClass *klass, int result)
+{
+	if ((mono_profiler_events & MONO_PROFILE_CLASS_EVENTS) && class_end_load)
+		class_end_load (current_profiler, klass, result);
+}
+
+void 
+mono_profiler_appdomain_event  (MonoDomain *domain, int code)
+{
+	if (!(mono_profiler_events & MONO_PROFILE_APPDOMAIN_EVENTS))
+		return;
+	
+	switch (code) {
+	case MONO_PROFILE_START_LOAD:
+		if (domain_start_load)
+			domain_start_load (current_profiler, domain);
+		break;
+	case MONO_PROFILE_START_UNLOAD:
+		if (domain_start_unload)
+			domain_start_unload (current_profiler, domain);
+		break;
+	case MONO_PROFILE_END_UNLOAD:
+		if (domain_end_unload)
+			domain_end_unload (current_profiler, domain);
+		break;
+	default:
+		g_assert_not_reached ();
+	}
+}
+
+void 
+mono_profiler_appdomain_loaded (MonoDomain *domain, int result)
+{
+	if ((mono_profiler_events & MONO_PROFILE_APPDOMAIN_EVENTS) && domain_end_load)
+		domain_end_load (current_profiler, domain, result);
+}
+
+void 
+mono_profiler_shutdown (void)
+{
+	if (current_profiler && shutdown_callback)
+		shutdown_callback (current_profiler);
+}
+
+/*
+ * Small profiler extracted from mint: we should move it in a loadable module
+ * and improve it to do graphs and more accurate timestamping with rdtsc.
+ */
+
+#define USE_X86TSC 0
+#define USE_WIN32COUNTER 0
+#if USE_X86TSC
+
+typedef struct {
+	unsigned int lows, highs, lowe, highe;
+} MonoRdtscTimer;
+
+#define rdtsc(low,high) \
+        __asm__ __volatile__("rdtsc" : "=a" (low), "=d" (high))
+
+static int freq;
+
+static double
+rdtsc_elapsed (MonoRdtscTimer *t)
+{
+	unsigned long long diff;
+	unsigned int highe = t->highe;
+	if (t->lowe < t->lows)
+		highe--;
+	diff = (((unsigned long long) highe - t->highs) << 32) + (t->lowe - t->lows);
+	return ((double)diff / freq) / 1000000; /* have to return the result in seconds */
+}
+
+static int 
+have_rdtsc (void) {
+	char buf[256];
+	int have_freq = 0;
+	int have_flag = 0;
+	float val;
+	FILE *cpuinfo;
+
+	if (!(cpuinfo = fopen ("/proc/cpuinfo", "r")))
+		return 0;
+	while (fgets (buf, sizeof(buf), cpuinfo)) {
+		if (sscanf (buf, "cpu MHz : %f", &val) == 1) {
+			/*printf ("got mh: %f\n", val);*/
+			have_freq = val;
+		}
+		if (strncmp (buf, "flags", 5) == 0) {
+			if (strstr (buf, "tsc")) {
+				have_flag = 1;
+				/*printf ("have tsc\n");*/
+			}
+		}
+	}
+	fclose (cpuinfo);
+	return have_flag? have_freq: 0;
+}
+
+#define MONO_TIMER_STARTUP 	\
+	if (!(freq = have_rdtsc ())) g_error ("Compiled with TSC support, but none found");
+#define MONO_TIMER_TYPE  MonoRdtscTimer
+#define MONO_TIMER_INIT(t)
+#define MONO_TIMER_DESTROY(t)
+#define MONO_TIMER_START(t) rdtsc ((t).lows, (t).highs);
+#define MONO_TIMER_STOP(t) rdtsc ((t).lowe, (t).highe);
+#define MONO_TIMER_ELAPSED(t) rdtsc_elapsed (&(t))
+
+#elif USE_WIN32COUNTER
+#include <windows.h>
+
+typedef struct {
+	LARGE_INTEGER start, stop;
+} MonoWin32Timer;
+
+static int freq;
+
+static double
+win32_elapsed (MonoWin32Timer *t)
+{
+	LONGLONG diff = t->stop.QuadPart - t->start.QuadPart;
+	return ((double)diff / freq) / 1000000; /* have to return the result in seconds */
+}
+
+static int 
+have_win32counter (void) {
+	LARGE_INTEGER f;
+
+	if (!QueryPerformanceFrequency (&f))
+		return 0;
+	return f.LowPart;
+}
+
+#define MONO_TIMER_STARTUP 	\
+	if (!(freq = have_win32counter ())) g_error ("Compiled with Win32 counter support, but none found");
+#define MONO_TIMER_TYPE  MonoWin32Timer
+#define MONO_TIMER_INIT(t)
+#define MONO_TIMER_DESTROY(t)
+#define MONO_TIMER_START(t) QueryPerformanceCounter (&(t).start)
+#define MONO_TIMER_STOP(t) QueryPerformanceCounter (&(t).stop)
+#define MONO_TIMER_ELAPSED(t) win32_elapsed (&(t))
+
+#else
+
+typedef struct {
+	GTimeVal start, stop;
+} MonoGLibTimer;
+
+static double
+timeval_elapsed (MonoGLibTimer *t)
+{
+	if (t->start.tv_usec > t->stop.tv_usec) {
+		t->stop.tv_usec += G_USEC_PER_SEC;
+		t->stop.tv_sec--;
+	}
+	return (t->stop.tv_sec - t->start.tv_sec) 
+		+ ((double)(t->stop.tv_usec - t->start.tv_usec))/ G_USEC_PER_SEC;
+}
+
+#define MONO_TIMER_STARTUP
+#define MONO_TIMER_TYPE MonoGLibTimer
+#define MONO_TIMER_INIT(t)
+#define MONO_TIMER_DESTROY(t)
+#define MONO_TIMER_START(t) g_get_current_time (&(t).start)
+#define MONO_TIMER_STOP(t) g_get_current_time (&(t).stop)
+#define MONO_TIMER_ELAPSED(t) timeval_elapsed (&(t))
+#endif
+
+struct _MonoProfiler {
+	GHashTable *methods;
+	GHashTable *newobjs;
+	MONO_TIMER_TYPE jit_timer;
+	double      jit_time;
+	int         methods_jitted;
+};
+
+typedef struct {
+	union {
+		MONO_TIMER_TYPE timer;
+		MonoMethod *method;
+	} u;
+	guint64 count;
+	double total;
+} MethodProfile;
+
+typedef struct _MethodCallProfile MethodCallProfile;
+
+struct _MethodCallProfile {
+	MethodCallProfile *next;
+	MONO_TIMER_TYPE timer;
+	MonoMethod *method;
+};
+
+static gint
+compare_profile (MethodProfile *profa, MethodProfile *profb)
+{
+	return (gint)((profb->total - profa->total)*1000);
+}
+
+static void
+build_profile (MonoMethod *m, MethodProfile *prof, GList **funcs)
+{
+	MONO_TIMER_DESTROY (prof->u.timer);
+	prof->u.method = m;
+	*funcs = g_list_insert_sorted (*funcs, prof, (GCompareFunc)compare_profile);
+}
+
+static void
+output_profile (GList *funcs)
+{
+	GList *tmp;
+	MethodProfile *p;
+	char buf [256];
+	char *sig;
+	guint64 total_calls = 0;
+
+	if (funcs)
+		g_print ("Method name\t\t\t\t\tTotal (ms) Calls Per call (ms)\n");
+	for (tmp = funcs; tmp; tmp = tmp->next) {
+		p = tmp->data;
+		total_calls += p->count;
+		if (!(gint)(p->total*1000))
+			continue;
+		sig = mono_signature_get_desc (p->u.method->signature, FALSE);
+		g_snprintf (buf, sizeof (buf), "%s.%s::%s(%s)",
+			p->u.method->klass->name_space, p->u.method->klass->name,
+			p->u.method->name, sig);
+		g_free (sig);
+		printf ("%-52s %7d %7llu %7d\n", buf,
+			(gint)(p->total*1000), p->count, (gint)((p->total*1000)/p->count));
+	}
+	printf ("Total number of calls: %lld\n", total_calls);
+}
+
+typedef struct {
+	MonoClass *klass;
+	guint count;
+} NewobjProfile;
+
+static gint
+compare_newobj_profile (NewobjProfile *profa, NewobjProfile *profb)
+{
+	return (gint)profb->count - (gint)profa->count;
+}
+
+static void
+build_newobj_profile (MonoClass *class, gpointer count, GList **funcs)
+{
+	NewobjProfile *prof = g_new (NewobjProfile, 1);
+	prof->klass = class;
+	prof->count = GPOINTER_TO_UINT (count);
+	*funcs = g_list_insert_sorted (*funcs, prof, (GCompareFunc)compare_newobj_profile);
+}
+
+static void
+output_newobj_profile (GList *proflist)
+{
+	GList *tmp;
+	NewobjProfile *p;
+	MonoClass *klass;
+	const char* isarray;
+	char buf [256];
+
+	if (proflist)
+		g_print ("\n%-52s %9s\n", "Objects created:", "count");
+	for (tmp = proflist; tmp; tmp = tmp->next) {
+		p = tmp->data;
+		klass = p->klass;
+		if (klass->rank) {
+			isarray = "[]";
+			klass = klass->element_class;
+		} else {
+			isarray = "";
+		}
+		g_snprintf (buf, sizeof (buf), "%s.%s%s",
+			klass->name_space, klass->name, isarray);
+		g_print ("%-52s %9d\n", buf, p->count);
+	}
+}
+
+static void
+simple_method_enter (MonoProfiler *prof, MonoMethod *method)
+{
+	MethodProfile *profile_info;
+	if (!(profile_info = g_hash_table_lookup (prof->methods, method))) {
+		profile_info = g_new0 (MethodProfile, 1);
+		MONO_TIMER_INIT (profile_info->u.timer);
+		g_hash_table_insert (prof->methods, method, profile_info);
+	}
+	profile_info->count++;
+	MONO_TIMER_START (profile_info->u.timer);
+}
+
+static void
+simple_method_leave (MonoProfiler *prof, MonoMethod *method)
+{
+	MethodProfile *profile_info;
+	if (!(profile_info = g_hash_table_lookup (prof->methods, method)))
+		g_assert_not_reached ();
+
+	MONO_TIMER_STOP (profile_info->u.timer);
+	profile_info->total += MONO_TIMER_ELAPSED (profile_info->u.timer);
+}
+
+static void
+simple_method_jit (MonoProfiler *prof, MonoMethod *method)
+{
+	prof->methods_jitted++;
+	MONO_TIMER_START (prof->jit_timer);
+}
+
+static void
+simple_method_end_jit (MonoProfiler *prof, MonoMethod *method, int result)
+{
+	MONO_TIMER_STOP (prof->jit_timer);
+	prof->jit_time += MONO_TIMER_ELAPSED (prof->jit_timer);
+}
+
+static void
+simple_shutdown (MonoProfiler *prof)
+{
+	GList *profile = NULL;
+
+	printf("Total time spent compiling %d methods (sec): %.4g\n", prof->methods_jitted, prof->jit_time);
+	g_hash_table_foreach (prof->methods, (GHFunc)build_profile, &profile);
+	output_profile (profile);
+	g_list_free (profile);
+	profile = NULL;
+		
+	g_hash_table_foreach (prof->newobjs, (GHFunc)build_newobj_profile, &profile);
+	output_newobj_profile (profile);
+	g_list_free (profile);
+}
+
+void
+mono_profiler_install_simple (void)
+{
+	MonoProfiler *prof = g_new0 (MonoProfiler, 1);
+
+	MONO_TIMER_STARTUP;
+
+	prof->methods = g_hash_table_new (g_direct_hash, g_direct_equal);
+	prof->newobjs = g_hash_table_new (g_direct_hash, g_direct_equal);
+	MONO_TIMER_INIT (prof->jit_timer);
+
+	mono_profiler_install (prof, simple_shutdown);
+	/* later do also object creation */
+	mono_profiler_install_enter_leave (simple_method_enter, simple_method_leave);
+	mono_profiler_install_jit_compile (simple_method_jit, simple_method_end_jit);
+	mono_profiler_set_events (MONO_PROFILE_ENTER_LEAVE|MONO_PROFILE_JIT_COMPILATION);
+}
+
diff --git a/mono/metadata/profiler.h b/mono/metadata/profiler.h
new file mode 100644
index 00000000000..451f987e0d4
--- /dev/null
+++ b/mono/metadata/profiler.h
@@ -0,0 +1,80 @@
+#ifndef __MONO_PROFILER_H__
+#define __MONO_PROFILER_H__
+
+#include <mono/metadata/object.h>
+#include <mono/metadata/appdomain.h>
+#include <mono/io-layer/io-layer.h>
+
+typedef enum {
+	MONO_PROFILE_NONE = 0,
+	MONO_PROFILE_APPDOMAIN_EVENTS = 1 << 0,
+	MONO_PROFILE_ASSEMBLY_EVENTS  = 1 << 1,
+	MONO_PROFILE_MODULE_EVENTS    = 1 << 2,
+	MONO_PROFILE_CLASS_EVENTS     = 1 << 3,
+	MONO_PROFILE_JIT_COMPILATION  = 1 << 4,
+	MONO_PROFILE_INLINING         = 1 << 5,
+	MONO_PROFILE_EXCEPTIONS       = 1 << 6,
+	MONO_PROFILE_ALLOCATIONS      = 1 << 7,
+	MONO_PROFILE_GC               = 1 << 8,
+	MONO_PROFILE_THREADS          = 1 << 9,
+	MONO_PROFILE_REMOTING         = 1 << 10,
+	MONO_PROFILE_TRANSITIONS      = 1 << 11,
+	MONO_PROFILE_ENTER_LEAVE      = 1 << 12
+} MonoProfileFlags;
+
+typedef enum {
+	MONO_PROFILE_OK,
+	MONO_PROFILE_FAILED
+} MonoProfileResult;
+
+typedef struct _MonoProfiler MonoProfiler;
+
+/*
+ * Functions that the runtime will call on the profiler.
+ */
+
+typedef void (*MonoProfileFunc) (MonoProfiler *prof);
+
+typedef void (*MonoProfileAppDomainFunc) (MonoProfiler *prof, MonoDomain   *domain);
+typedef void (*MonoProfileMethodFunc)   (MonoProfiler *prof, MonoMethod   *method);
+typedef void (*MonoProfileClassFunc)    (MonoProfiler *prof, MonoClass    *klass);
+typedef void (*MonoProfileModuleFunc)   (MonoProfiler *prof, MonoImage    *module);
+typedef void (*MonoProfileAssemblyFunc) (MonoProfiler *prof, MonoAssembly *assembly);
+
+typedef void (*MonoProfileAppDomainResult)(MonoProfiler *prof, MonoDomain   *domain,   int result);
+typedef void (*MonoProfileMethodResult)   (MonoProfiler *prof, MonoMethod   *method,   int result);
+typedef void (*MonoProfileClassResult)    (MonoProfiler *prof, MonoClass    *klass,    int result);
+typedef void (*MonoProfileModuleResult)   (MonoProfiler *prof, MonoImage    *module,   int result);
+typedef void (*MonoProfileAssemblyResult) (MonoProfiler *prof, MonoAssembly *assembly, int result);
+
+typedef void (*MonoProfileMethodInline)   (MonoProfiler *prof, MonoMethod   *parent, MonoMethod *child, int *ok);
+
+typedef void (*MonoProfileThreadFunc)     (MonoProfiler *prof, guint32 tid);
+typedef void (*MonoProfileAllocFunc)      (MonoProfiler *prof, MonoObject *obj, MonoClass *klass);
+
+/*
+ * Function the profiler may call.
+ */
+void mono_profiler_install       (MonoProfiler *prof, MonoProfileFunc shutdown_callback);
+void mono_profiler_set_events    (MonoProfileFlags events);
+
+MonoProfileFlags mono_profiler_get_events (void);
+
+void mono_profiler_install_appdomain   (MonoProfileAppDomainFunc start_load, MonoProfileAppDomainResult end_load,
+                                        MonoProfileAppDomainFunc start_unload, MonoProfileAppDomainFunc end_unload);
+void mono_profiler_install_assembly    (MonoProfileAssemblyFunc start_load, MonoProfileAssemblyResult end_load,
+                                        MonoProfileAssemblyFunc start_unload, MonoProfileAssemblyFunc end_unload);
+void mono_profiler_install_module      (MonoProfileModuleFunc start_load, MonoProfileModuleResult end_load,
+                                        MonoProfileModuleFunc start_unload, MonoProfileModuleFunc end_unload);
+void mono_profiler_install_class       (MonoProfileClassFunc start_load, MonoProfileClassResult end_load,
+                                        MonoProfileClassFunc start_unload, MonoProfileClassFunc end_unload);
+
+void mono_profiler_install_jit_compile (MonoProfileMethodFunc start, MonoProfileMethodResult end);
+void mono_profiler_install_enter_leave (MonoProfileMethodFunc enter, MonoProfileMethodFunc leave);
+void mono_profiler_install_thread      (MonoProfileThreadFunc start, MonoProfileThreadFunc end);
+void mono_profiler_install_transition  (MonoProfileMethodResult callback);
+
+void mono_profiler_install_simple (void);
+
+#endif /* __MONO_PROFILER_H__ */
+
diff --git a/mono/metadata/rand.c b/mono/metadata/rand.c
index 98611d4332a..0ccb98dd4c8 100644
--- a/mono/metadata/rand.c
+++ b/mono/metadata/rand.c
@@ -24,7 +24,8 @@
 
 #if defined (NAME_DEV_RANDOM) && defined (HAVE_CRYPT_RNG)
 
-void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetBytes(MonoArray *arry)
+void 
+ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetBytes (MonoObject *self, MonoArray *arry)
 {
     guint32 len;
     gint file;
@@ -59,7 +60,8 @@ void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetBytes(Mo
     close(file);
 }
 
-void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroBytes(MonoArray *arry)
+void 
+ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroBytes (MonoObject *self, MonoArray *arry)
 {
     guint32 len;
     gint file, i;
@@ -97,13 +99,13 @@ void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroB
 /* This needs to change when I do the Win32 support... */
 #else
 #warning "No Entropy Source Found"
-void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetBytes(MonoArray *arry)
+void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetBytes(MonoObject *self, MonoArray *arry)
 {
     g_warning("0K problem. We have no entropy. Badness will occur.");
     mono_raise_exception(mono_get_exception_not_implemented());
 }
 
-void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroBytes(MonoArray *arry)
+void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroBytes(MonoObject *self, MonoArray *arry)
 {
     g_warning("0K problem. We have no entropy. Badness will occur.");
     mono_raise_exception(mono_get_exception_not_implemented());
diff --git a/mono/metadata/rand.h b/mono/metadata/rand.h
index 3005d96d9d5..248942b13a1 100644
--- a/mono/metadata/rand.h
+++ b/mono/metadata/rand.h
@@ -13,7 +13,7 @@
 
 #include <mono/metadata/object.h>
 
-void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetBytes(MonoArray *arry);
-void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroBytes(MonoArray *arry);
+void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetBytes(MonoObject *self, MonoArray *arry);
+void ves_icall_System_Security_Cryptography_RNGCryptoServiceProvider_GetNonZeroBytes(MonoObject *self, MonoArray *arry);
 
 #endif
diff --git a/mono/metadata/rawbuffer.c b/mono/metadata/rawbuffer.c
index 833721accbe..ba016796f94 100644
--- a/mono/metadata/rawbuffer.c
+++ b/mono/metadata/rawbuffer.c
@@ -29,7 +29,7 @@ static GHashTable *mmap_map = NULL;
 static size_t alignment = 0;
 
 static void
-get_alignment ()
+get_alignment (void)
 {
 #ifdef USE_WIN32_API
 	SYSTEM_INFO info;
@@ -124,8 +124,10 @@ mono_raw_buffer_load_mmap (int fd, int is_writable, guint32 base, size_t size)
 
 	if (is_writable){
 		prot |= PROT_WRITE;
+		flags = MAP_SHARED;
+	} else {
+		flags = MAP_PRIVATE;
 	}
-	flags = MAP_PRIVATE;
 
 	ptr = mmap (0, end - start, prot, flags, fd, start);
 
@@ -156,6 +158,16 @@ mono_raw_buffer_free_mmap (void *base)
 #endif
 }
 
+static void
+mono_raw_buffer_update_mmap (void *base, size_t size)
+{
+#ifdef USE_WIN32_API
+	FlushViewOfFile (base, size);
+#else
+	msync (base, size, MS_SYNC);
+#endif
+}
+
 void *
 mono_raw_buffer_load (int fd, int is_writable, guint32 base, size_t size)
 {
@@ -169,6 +181,17 @@ mono_raw_buffer_load (int fd, int is_writable, guint32 base, size_t size)
 }
 
 void
+mono_raw_buffer_update (void *buffer, size_t size)
+{
+	char *mmap_base;
+
+	mmap_base = GINT_TO_POINTER (ROUND_DOWN (GPOINTER_TO_INT (buffer), alignment));
+	
+	if (mmap_map && g_hash_table_lookup (mmap_map, mmap_base))
+		mono_raw_buffer_update_mmap (mmap_base, size);
+}
+
+void
 mono_raw_buffer_free (void *buffer)
 {
 	char *mmap_base;
diff --git a/mono/metadata/rawbuffer.h b/mono/metadata/rawbuffer.h
index 12f1a05a336..47232a2639f 100644
--- a/mono/metadata/rawbuffer.h
+++ b/mono/metadata/rawbuffer.h
@@ -1,3 +1,4 @@
 
 void *mono_raw_buffer_load (int fd, int writable, guint32 base, size_t size);
+void mono_raw_buffer_update (void *buffer, size_t size);
 void  mono_raw_buffer_free (void *buffer);
diff --git a/mono/metadata/reflection.c b/mono/metadata/reflection.c
index 3ec8ff2d4fd..b1fb21c3219 100644
--- a/mono/metadata/reflection.c
+++ b/mono/metadata/reflection.c
@@ -9,24 +9,31 @@
  *
  */
 #include <config.h>
+#include "mono/utils/mono-digest.h"
 #include "mono/metadata/reflection.h"
 #include "mono/metadata/tabledefs.h"
 #include "mono/metadata/tokentype.h"
 #include "mono/metadata/appdomain.h"
+#include "mono/metadata/opcodes.h"
 #include <stdio.h>
 #include <glib.h>
 #include <errno.h>
 #include <time.h>
 #include <string.h>
+#include <ctype.h>
 #include "image.h"
 #include "cil-coff.h"
 #include "rawbuffer.h"
 #include "mono-endian.h"
 #include "private.h"
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
 
 #define TEXT_OFFSET 512
 #define CLI_H_SIZE 136
 #define FILE_ALIGN 512
+#define VIRT_ALIGN 8192
 #define START_TEXT_RVA  0x00002000
 
 typedef struct {
@@ -41,6 +48,7 @@ typedef struct {
 	MonoArray *code;
 	MonoObject *type;
 	MonoString *name;
+	MonoBoolean init_locals;
 } ReflectionMethodBuilder;
 
 const unsigned char table_sizes [64] = {
@@ -69,7 +77,7 @@ const unsigned char table_sizes [64] = {
 	0,
 	MONO_PROPERTY_SIZE,
 	MONO_METHOD_SEMA_SIZE,
-	MONO_MTHODIMPL_SIZE,
+	MONO_METHODIMPL_SIZE,
 	MONO_MODULEREF_SIZE,	/* 0x1A */
 	MONO_TYPESPEC_SIZE,
 	MONO_IMPLMAP_SIZE,	
@@ -91,6 +99,7 @@ const unsigned char table_sizes [64] = {
 
 static guint32 mono_image_typedef_or_ref (MonoDynamicAssembly *assembly, MonoType *type);
 static guint32 mono_image_get_methodref_token (MonoDynamicAssembly *assembly, MonoMethod *method);
+static guint32 encode_marshal_blob (MonoDynamicAssembly *assembly, MonoReflectionMarshal *minfo);
 
 static void
 alloc_table (MonoDynamicTable *table, guint nrows)
@@ -101,7 +110,7 @@ alloc_table (MonoDynamicTable *table, guint nrows)
 }
 
 static guint32
-string_heap_insert (MonoStringHeap *sh, const char *str)
+string_heap_insert (MonoDynamicStream *sh, const char *str)
 {
 	guint32 idx;
 	guint32 len;
@@ -128,7 +137,7 @@ string_heap_insert (MonoStringHeap *sh, const char *str)
 }
 
 static void
-string_heap_init (MonoStringHeap *sh)
+string_heap_init (MonoDynamicStream *sh)
 {
 	sh->index = 0;
 	sh->alloc_size = 4096;
@@ -137,16 +146,18 @@ string_heap_init (MonoStringHeap *sh)
 	string_heap_insert (sh, "");
 }
 
+#if 0 /* never used */
 static void
-string_heap_free (MonoStringHeap *sh)
+string_heap_free (MonoDynamicStream *sh)
 {
 	g_free (sh->data);
 	g_hash_table_foreach (sh->hash, (GHFunc)g_free, NULL);
 	g_hash_table_destroy (sh->hash);
 }
+#endif
 
 static guint32
-mono_image_add_stream_data (MonoDynamicStream *stream, char *data, guint32 len)
+mono_image_add_stream_data (MonoDynamicStream *stream, const char *data, guint32 len)
 {
 	guint32 idx;
 	if (stream->alloc_size < stream->index + len) {
@@ -163,6 +174,20 @@ mono_image_add_stream_data (MonoDynamicStream *stream, char *data, guint32 len)
 	return idx;
 }
 
+static guint32
+mono_image_add_stream_zero (MonoDynamicStream *stream, guint32 len)
+{
+	guint32 idx;
+	if (stream->alloc_size < stream->index + len) {
+		stream->alloc_size += len + 4096;
+		stream->data = g_realloc (stream->data, stream->alloc_size);
+	}
+	memset (stream->data + stream->index, 0, len);
+	idx = stream->index;
+	stream->index += len;
+	return idx;
+}
+
 static void
 stream_data_align (MonoDynamicStream *stream)
 {
@@ -174,6 +199,20 @@ stream_data_align (MonoDynamicStream *stream)
 		mono_image_add_stream_data (stream, buf, 4 - count);
 }
 
+/* modified version needed to handle building corlib */
+static MonoClass*
+my_mono_class_from_mono_type (MonoType *type) {
+	switch (type->type) {
+	case MONO_TYPE_ARRAY:
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_SZARRAY:
+		return mono_class_from_mono_type (type);
+	default:
+		/* should be always valid when we reach this case... */
+		return type->data.klass;
+	}
+}
+
 static void
 encode_type (MonoDynamicAssembly *assembly, MonoType *type, char *p, char **endbuf)
 {
@@ -216,6 +255,23 @@ encode_type (MonoDynamicAssembly *assembly, MonoType *type, char *p, char **endb
 		mono_metadata_encode_value (type->type, p, &p);
 		mono_metadata_encode_value (mono_image_typedef_or_ref (assembly, type), p, &p);
 		break;
+#if 0
+	case MONO_TYPE_VALUETYPE:
+	case MONO_TYPE_CLASS: {
+		MonoClass *k = mono_class_from_mono_type (type);
+		mono_metadata_encode_value (type->type, p, &p);
+		/* ensure only non-byref gets passed to mono_image_typedef_or_ref() */
+		mono_metadata_encode_value (mono_image_typedef_or_ref (assembly, &k->byval_arg), p, &p);
+		break;
+	}
+#endif
+	case MONO_TYPE_ARRAY:
+		mono_metadata_encode_value (type->type, p, &p);
+		encode_type (assembly, type->data.array->type, p, &p);
+		mono_metadata_encode_value (type->data.array->rank, p, &p);
+		mono_metadata_encode_value (0, p, &p); /* FIXME: set to 0 for now */
+		mono_metadata_encode_value (0, p, &p);
+		break;
 	default:
 		g_error ("need to encode type %x", type->type);
 	}
@@ -225,9 +281,6 @@ encode_type (MonoDynamicAssembly *assembly, MonoType *type, char *p, char **endb
 static void
 encode_reflection_type (MonoDynamicAssembly *assembly, MonoReflectionType *type, char *p, char **endbuf)
 {
-	MonoReflectionTypeBuilder *tb;
-	guint32 token;
-
 	if (!type) {
 		mono_metadata_encode_value (MONO_TYPE_VOID, p, endbuf);
 		return;
@@ -237,14 +290,8 @@ encode_reflection_type (MonoDynamicAssembly *assembly, MonoReflectionType *type,
 		return;
 	}
 
-	tb = (MonoReflectionTypeBuilder*) type;
-	token = TYPEDEFORREF_TYPEDEF | (tb->table_idx << TYPEDEFORREF_BITS); /* typedef */
+	g_assert_not_reached ();
 
-	/* FIXME: handle other base types (need to have also some hacks to compile corlib) ... */
-	/* FIXME: handle byref ... */
-	mono_metadata_encode_value (MONO_TYPE_CLASS, p, &p);
-	mono_metadata_encode_value (token, p, endbuf);
-	/*g_print ("encoding type %s to 0x%08x\n", mono_string_to_utf8 (tb->name), token);*/
 }
 
 static guint32
@@ -272,6 +319,7 @@ method_encode_signature (MonoDynamicAssembly *assembly, MonoMethodSignature *sig
 	for (i = 0; i < nparams; ++i)
 		encode_type (assembly, sig->params [i], p, &p);
 	/* store length */
+	g_assert (p - buf < size);
 	mono_metadata_encode_value (p-buf, b, &b);
 	idx = mono_image_add_stream_data (&assembly->blob, blob_size, b-blob_size);
 	mono_image_add_stream_data (&assembly->blob, buf, p-buf);
@@ -309,6 +357,7 @@ method_builder_encode_signature (MonoDynamicAssembly *assembly, ReflectionMethod
 		encode_reflection_type (assembly, pt, p, &p);
 	}
 	/* store length */
+	g_assert (p - buf < size);
 	mono_metadata_encode_value (p-buf, b, &b);
 	idx = mono_image_add_stream_data (&assembly->blob, blob_size, b-blob_size);
 	mono_image_add_stream_data (&assembly->blob, buf, p-buf);
@@ -322,14 +371,15 @@ encode_locals (MonoDynamicAssembly *assembly, MonoReflectionILGen *ilgen)
 	MonoDynamicTable *table;
 	guint32 *values;
 	char *p;
-	guint32 idx, sig_idx;
+	guint32 idx, sig_idx, size;
 	guint nl = mono_array_length (ilgen->locals);
 	char *buf;
 	char blob_size [6];
 	char *b = blob_size;
 	int i;
 
-	p = buf = g_malloc (10 + nl * 10);
+	size = 10 + nl * 10;
+	p = buf = g_malloc (size);
 	table = &assembly->tables [MONO_TABLE_STANDALONESIG];
 	idx = table->next_idx ++;
 	table->rows ++;
@@ -342,6 +392,7 @@ encode_locals (MonoDynamicAssembly *assembly, MonoReflectionILGen *ilgen)
 		MonoReflectionLocalBuilder *lb = mono_array_get (ilgen->locals, MonoReflectionLocalBuilder*, i);
 		encode_reflection_type (assembly, lb->type, p, &p);
 	}
+	g_assert (p - buf < size);
 	mono_metadata_encode_value (p-buf, b, &b);
 	sig_idx = mono_image_add_stream_data (&assembly->blob, blob_size, b-blob_size);
 	mono_image_add_stream_data (&assembly->blob, buf, p-buf);
@@ -355,7 +406,6 @@ encode_locals (MonoDynamicAssembly *assembly, MonoReflectionILGen *ilgen)
 static guint32
 method_encode_code (MonoDynamicAssembly *assembly, ReflectionMethodBuilder *mb)
 {
-	/* we use only tiny formats now: need  to implement ILGenerator */
 	char flags = 0;
 	guint32 idx;
 	guint32 code_size;
@@ -411,8 +461,11 @@ method_encode_code (MonoDynamicAssembly *assembly, ReflectionMethodBuilder *mb)
 			goto fat_header;
 		}
 		idx = mono_image_add_stream_data (&assembly->code, &flags, 1);
+		/* add to the fixup todo list */
+		if (mb->ilgen && mb->ilgen->num_token_fixups)
+			mono_g_hash_table_insert (assembly->token_fixups, mb->ilgen, GUINT_TO_POINTER (idx + 1));
 		mono_image_add_stream_data (&assembly->code, mono_array_addr (code, char, 0), code_size);
-		return assembly->text_rva + idx + CLI_H_SIZE;
+		return assembly->text_rva + idx;
 	} 
 fat_header:
 	if (num_locals)
@@ -424,15 +477,21 @@ fat_header:
 	fat_flags =  0x03;
 	if (num_exception)
 		fat_flags |= METHOD_HEADER_MORE_SECTS;
+	if (mb->init_locals)
+		fat_flags |= METHOD_HEADER_INIT_LOCALS;
 	fat_header [0] = fat_flags;
 	fat_header [1] = (header_size / 4 ) << 4;
 	shortp = (guint16*)(fat_header + 2);
-	*shortp = max_stack;
+	*shortp = GUINT16_TO_LE (max_stack);
 	intp = (guint32*)(fat_header + 4);
-	*intp = code_size;
+	*intp = GUINT32_TO_LE (code_size);
 	intp = (guint32*)(fat_header + 8);
-	*intp = local_sig;
+	*intp = GUINT32_TO_LE (local_sig);
 	idx = mono_image_add_stream_data (&assembly->code, fat_header, 12);
+	/* add to the fixup todo list */
+	if (mb->ilgen && mb->ilgen->num_token_fixups)
+		mono_g_hash_table_insert (assembly->token_fixups, mb->ilgen, GUINT_TO_POINTER (idx + 12));
+	
 	mono_image_add_stream_data (&assembly->code, mono_array_addr (code, char, 0), code_size);
 	if (num_exception) {
 		unsigned char sheader [4];
@@ -454,36 +513,36 @@ fat_header:
 		for (i = mono_array_length (mb->ilgen->ex_handlers) - 1; i >= 0; --i) {
 			ex_info = (MonoILExceptionInfo *)mono_array_addr (mb->ilgen->ex_handlers, MonoILExceptionInfo, i);
 			if (ex_info->handlers) {
-				int finally_start = 0;
+				int finally_start = ex_info->start + ex_info->len;
 				for (j = 0; j < mono_array_length (ex_info->handlers); ++j) {
 					ex_block = (MonoILExceptionBlock*)mono_array_addr (ex_info->handlers, MonoILExceptionBlock, j);
-					clause.flags = ex_block->type;
-					clause.try_offset = ex_info->start;
+					clause.flags = GUINT32_TO_LE (ex_block->type);
+					clause.try_offset = GUINT32_TO_LE (ex_info->start);
 					/* need fault, too, probably */
-					if (clause.flags == MONO_EXCEPTION_CLAUSE_FINALLY)
-						clause.try_len = finally_start - ex_info->start;
+					if (ex_block->type == MONO_EXCEPTION_CLAUSE_FINALLY)
+						clause.try_len = GUINT32_TO_LE (finally_start - ex_info->start);
 					else
-						clause.try_len = ex_info->len;
-					clause.handler_offset = ex_block->start;
-					clause.handler_len = ex_block->len;
-					finally_start = clause.handler_offset + clause.handler_len;
+						clause.try_len = GUINT32_TO_LE (ex_info->len);
+					clause.handler_offset = GUINT32_TO_LE (ex_block->start);
+					clause.handler_len = GUINT32_TO_LE (ex_block->len);
+					finally_start = ex_block->start + ex_block->len;
 					clause.token_or_filter = ex_block->extype ? mono_metadata_token_from_dor (
 							mono_image_typedef_or_ref (assembly, ex_block->extype->type)): 0;
-					/*g_print ("out clause %d: from %d len=%d, handler at %d, %d\n", 
-							clause.flags, clause.try_offset, clause.try_len, clause.handler_offset, clause.handler_len);*/
-					/* FIXME: ENOENDIAN */
+					clause.token_or_filter = GUINT32_TO_LE (clause.token_or_filter);
+					/*g_print ("out clause %d: from %d len=%d, handler at %d, %d, finally_start=%d, ex_info->start=%d, ex_info->len=%d, ex_block->type=%d, j=%d, i=%d\n", 
+							clause.flags, clause.try_offset, clause.try_len, clause.handler_offset, clause.handler_len, finally_start, ex_info->start, ex_info->len, ex_block->type, j, i);*/
 					mono_image_add_stream_data (&assembly->code, (char*)&clause, sizeof (clause));
 				}
 			} else {
-				g_error ("No clauses");
+				g_error ("No clauses for ex info block %d", i);
 			}
 		}
 	}
-	return assembly->text_rva + idx + CLI_H_SIZE;
+	return assembly->text_rva + idx;
 }
 
 static guint32
-find_index_in_table (MonoDynamicAssembly *assembly, int table_idx, int col, guint32 index)
+find_index_in_table (MonoDynamicAssembly *assembly, int table_idx, int col, guint32 token)
 {
 	int i;
 	MonoDynamicTable *table;
@@ -495,18 +554,18 @@ find_index_in_table (MonoDynamicAssembly *assembly, int table_idx, int col, guin
 
 	values = table->values + table->columns;
 	for (i = 1; i <= table->rows; ++i) {
-		if (values [col] == index)
+		if (values [col] == token)
 			return i;
 	}
 	return 0;
 }
 
 /*
- * index is the table index of the object
+ * idx is the table index of the object
  * type is one of CUSTOM_ATTR_*
  */
 static void
-mono_image_add_cattrs (MonoDynamicAssembly *assembly, guint32 index, guint32 type, MonoArray *cattrs)
+mono_image_add_cattrs (MonoDynamicAssembly *assembly, guint32 idx, guint32 type, MonoArray *cattrs)
 {
 	MonoDynamicTable *table;
 	MonoReflectionCustomAttr *cattr;
@@ -523,11 +582,11 @@ mono_image_add_cattrs (MonoDynamicAssembly *assembly, guint32 index, guint32 typ
 	table->rows += count;
 	alloc_table (table, table->rows);
 	values = table->values + table->next_idx * MONO_CUSTOM_ATTR_SIZE;
-	index <<= CUSTOM_ATTR_BITS;
-	index |= type;
+	idx <<= CUSTOM_ATTR_BITS;
+	idx |= type;
 	for (i = 0; i < count; ++i) {
 		cattr = (MonoReflectionCustomAttr*)mono_array_get (cattrs, gpointer, i);
-		values [MONO_CUSTOM_ATTR_PARENT] = index;
+		values [MONO_CUSTOM_ATTR_PARENT] = idx;
 		token = mono_image_create_token (assembly, (MonoObject*)cattr->ctor);
 		type = mono_metadata_token_index (token);
 		type <<= CUSTOM_ATTR_TYPE_BITS;
@@ -539,7 +598,8 @@ mono_image_add_cattrs (MonoDynamicAssembly *assembly, guint32 index, guint32 typ
 			type |= CUSTOM_ATTR_TYPE_MEMBERREF;
 			break;
 		default:
-			g_error ("got wrong token in custom attr");
+			g_warning ("got wrong token in custom attr");
+			goto next;
 		}
 		values [MONO_CUSTOM_ATTR_TYPE] = type;
 		p = blob_size;
@@ -549,9 +609,14 @@ mono_image_add_cattrs (MonoDynamicAssembly *assembly, guint32 index, guint32 typ
 			mono_array_addr (cattr->data, char, 0), mono_array_length (cattr->data));
 		values += MONO_CUSTOM_ATTR_SIZE;
 		++table->next_idx;
+next:
 	}
 }
 
+/*
+ * Fill in the MethodDef and ParamDef tables for a method.
+ * This is used for both normal methods and constructors.
+ */
 static void
 mono_image_basic_method (ReflectionMethodBuilder *mb, MonoDynamicAssembly *assembly)
 {
@@ -580,6 +645,12 @@ mono_image_basic_method (ReflectionMethodBuilder *mb, MonoDynamicAssembly *assem
 	values [MONO_METHOD_PARAMLIST] = table->next_idx;
 
 	if (mb->pinfo) {
+		MonoDynamicTable *mtable;
+		guint32 *mvalues;
+		
+		mtable = &assembly->tables [MONO_TABLE_FIELDMARSHAL];
+		mvalues = mtable->values + mtable->next_idx * MONO_FIELD_MARSHAL_SIZE;
+		
 		count = 0;
 		for (i = 0; i < mono_array_length (mb->pinfo); ++i) {
 			if (mono_array_get (mb->pinfo, gpointer, i))
@@ -597,8 +668,14 @@ mono_image_basic_method (ReflectionMethodBuilder *mb, MonoDynamicAssembly *assem
 				values [MONO_PARAM_NAME] = string_heap_insert (&assembly->sheap, name);
 				g_free (name);
 				values += MONO_PARAM_SIZE;
-				table->next_idx++;
-				mono_image_add_cattrs (assembly, pb->table_idx, CUSTOM_ATTR_PARAMDEF, pb->cattrs);
+				if (pb->marshal_info) {
+					mtable->rows++;
+					alloc_table (mtable, mtable->rows);
+					mvalues = mtable->values + mtable->rows * MONO_FIELD_MARSHAL_SIZE;
+					mvalues [MONO_FIELD_MARSHAL_PARENT] = (table->next_idx << HAS_FIELD_MARSHAL_BITS) | HAS_FIELD_MARSHAL_PARAMDEF;
+					mvalues [MONO_FIELD_MARSHAL_NATIVE_TYPE] = encode_marshal_blob (assembly, pb->marshal_info);
+				}
+				pb->table_idx = table->next_idx++;
 			}
 		}
 	}
@@ -623,6 +700,7 @@ mono_image_get_method_info (MonoReflectionMethodBuilder *mb, MonoDynamicAssembly
 	rmb.type = mb->type;
 	rmb.name = mb->name;
 	rmb.table_idx = &mb->table_idx;
+	rmb.init_locals = mb->init_locals;
 
 	mono_image_basic_method (&rmb, assembly);
 
@@ -650,20 +728,26 @@ mono_image_get_method_info (MonoReflectionMethodBuilder *mb, MonoDynamicAssembly
 	}
 	if (mb->override_method) {
 		MonoReflectionTypeBuilder *tb = (MonoReflectionTypeBuilder *)mb->type;
+		guint32 tok;
 		table = &assembly->tables [MONO_TABLE_METHODIMPL];
 		table->rows ++;
 		alloc_table (table, table->rows);
-		values = table->values + table->rows * MONO_MTHODIMPL_SIZE;
-		values [MONO_MTHODIMPL_CLASS] = tb->table_idx;
-		values [MONO_MTHODIMPL_BODY] = METHODDEFORREF_METHODDEF | (mb->table_idx << METHODDEFORREF_BITS);
-		if (mb->override_method->method)
-			values [MONO_MTHODIMPL_DECLARATION] = mono_image_get_methodref_token (assembly, mb->override_method->method);
-		else {
-			MonoReflectionMethodBuilder *omb = (MonoReflectionMethodBuilder*)mb->override_method;
-			values [MONO_MTHODIMPL_DECLARATION] = METHODDEFORREF_METHODDEF | (omb->table_idx << METHODDEFORREF_BITS);
+		values = table->values + table->rows * MONO_METHODIMPL_SIZE;
+		values [MONO_METHODIMPL_CLASS] = tb->table_idx;
+		values [MONO_METHODIMPL_BODY] = METHODDEFORREF_METHODDEF | (mb->table_idx << METHODDEFORREF_BITS);
+		tok = mono_image_create_token (assembly, (MonoObject*)mb->override_method);
+		switch (mono_metadata_token_table (tok)) {
+		case MONO_TABLE_MEMBERREF:
+			tok = (mono_metadata_token_index (tok) << METHODDEFORREF_BITS ) | METHODDEFORREF_METHODREF;
+			break;
+		case MONO_TABLE_METHOD:
+			tok = (mono_metadata_token_index (tok) << METHODDEFORREF_BITS ) | METHODDEFORREF_METHODDEF;
+			break;
+		default:
+			g_assert_not_reached ();
 		}
+		values [MONO_METHODIMPL_DECLARATION] = tok;
 	}
-	mono_image_add_cattrs (assembly, mb->table_idx, CUSTOM_ATTR_METHODDEF, mb->cattrs);
 }
 
 static void
@@ -682,9 +766,9 @@ mono_image_get_ctor_info (MonoDomain *domain, MonoReflectionCtorBuilder *mb, Mon
 	rmb.type = mb->type;
 	rmb.name = NULL;
 	rmb.table_idx = &mb->table_idx;
+	rmb.init_locals = mb->init_locals;
 
 	mono_image_basic_method (&rmb, assembly);
-	mono_image_add_cattrs (assembly, mb->table_idx, CUSTOM_ATTR_METHODDEF, mb->cattrs);
 
 }
 
@@ -699,9 +783,7 @@ fieldref_encode_signature (MonoDynamicAssembly *assembly, MonoClassField *field)
 	
 	p = buf = g_malloc (64);
 	
-	/* No start code with field refs...
-	 * mono_metadata_encode_value (0x06, p, &p);
-	 */
+	mono_metadata_encode_value (0x06, p, &p);
 	/* encode custom attributes before the type */
 	encode_type (assembly, field->type, p, &p);
 	g_assert (p-buf < 64);
@@ -734,6 +816,51 @@ field_encode_signature (MonoDynamicAssembly *assembly, MonoReflectionFieldBuilde
 	return idx;
 }
 
+/*
+ * Copy len * nelem bytes from val to dest, swapping bytes to LE if necessary.
+ * dest may be misaligned.
+ */
+static void
+swap_with_size (char *dest, const char* val, int len, int nelem) {
+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
+	int elem;
+
+	for (elem = 0; elem < nelem; ++elem) {
+		switch (len) {
+		case 1:
+			*dest = *val;
+			break;
+		case 2:
+			dest [0] = val [1];
+			dest [1] = val [0];
+			break;
+		case 4:
+			dest [0] = val [3];
+			dest [1] = val [2];
+			dest [2] = val [1];
+			dest [3] = val [0];
+			break;
+		case 8:
+			dest [0] = val [7];
+			dest [1] = val [6];
+			dest [2] = val [5];
+			dest [3] = val [4];
+			dest [4] = val [3];
+			dest [5] = val [2];
+			dest [6] = val [1];
+			dest [7] = val [0];
+			break;
+		default:
+			g_assert_not_reached ();
+		}
+		dest += len;
+		val += len;
+	}
+#else
+	memcpy (dest, val, len * nelem);
+#endif
+}
+
 static guint32
 encode_constant (MonoDynamicAssembly *assembly, MonoObject *val, guint32 *ret_type) {
 	char blob_size [64];
@@ -774,7 +901,28 @@ handle_enum:
 			goto handle_enum;
 		} else
 			g_error ("we can't encode valuetypes");
-	case MONO_TYPE_STRING:
+	case MONO_TYPE_STRING: {
+		MonoString *str = (MonoString*)val;
+		/* there is no signature */
+		len = str->length * 2;
+		mono_metadata_encode_value (len, b, &b);
+		idx = mono_image_add_stream_data (&assembly->blob, blob_size, b-blob_size);
+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
+		{
+			char *swapped = g_malloc (2 * mono_string_length (str));
+			const char *p = (const char*)mono_string_chars (str);
+
+			swap_with_size (swapped, p, 2, mono_string_length (str));
+			mono_image_add_stream_data (&assembly->blob, swapped, len);
+			g_free (swapped);
+		}
+#else
+		mono_image_add_stream_data (&assembly->blob, (const char*)mono_string_chars (str), len);
+#endif
+
+		g_free (buf);
+		return idx;
+	}
 	default:
 		g_error ("we don't encode constant type 0x%02x yet", *ret_type);
 	}
@@ -782,13 +930,40 @@ handle_enum:
 	/* there is no signature */
 	mono_metadata_encode_value (len, b, &b);
 	idx = mono_image_add_stream_data (&assembly->blob, blob_size, b-blob_size);
-	/* FIXME: ENOENDIAN */
+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
+	swap_with_size (blob_size, box_val, len, 1);
+	mono_image_add_stream_data (&assembly->blob, blob_size, len);
+#else
 	mono_image_add_stream_data (&assembly->blob, box_val, len);
+#endif
 
 	g_free (buf);
 	return idx;
 }
 
+static guint32
+encode_marshal_blob (MonoDynamicAssembly *assembly, MonoReflectionMarshal *minfo) {
+	char blob_size [64];
+	char *b = blob_size;
+	char *p, *buf;
+	guint32 idx, len;
+	
+	p = buf = g_malloc (256);
+
+	switch (minfo->type) {
+	/* FIXME: handle ARRAY and other unmanaged types that need extra info */
+	default:
+		mono_metadata_encode_value (minfo->type, p, &p);
+		break;
+	}
+	len = p-buf;
+	mono_metadata_encode_value (len, b, &b);
+	idx = mono_image_add_stream_data (&assembly->blob, blob_size, b-blob_size);
+	mono_image_add_stream_data (&assembly->blob, buf, len);
+	g_free (buf);
+	return idx;
+}
+
 static void
 mono_image_get_field_info (MonoReflectionFieldBuilder *fb, MonoDynamicAssembly *assembly)
 {
@@ -796,6 +971,9 @@ mono_image_get_field_info (MonoReflectionFieldBuilder *fb, MonoDynamicAssembly *
 	guint32 *values;
 	char *name;
 
+	/* maybe this fixup should be done in the C# code */
+	if (fb->attrs & FIELD_ATTRIBUTE_LITERAL)
+		fb->attrs |= FIELD_ATTRIBUTE_HAS_DEFAULT;
 	table = &assembly->tables [MONO_TABLE_FIELD];
 	fb->table_idx = table->next_idx ++;
 	values = table->values + fb->table_idx * MONO_FIELD_SIZE;
@@ -835,9 +1013,16 @@ mono_image_get_field_info (MonoReflectionFieldBuilder *fb, MonoDynamicAssembly *
 		 * We store it in the code section because it's simpler for now.
 		 */
 		rva_idx = mono_image_add_stream_data (&assembly->code, mono_array_addr (fb->rva_data, char, 0), mono_array_length (fb->rva_data));
-		values [MONO_FIELD_RVA_RVA] = rva_idx + assembly->text_rva + CLI_H_SIZE;
+		values [MONO_FIELD_RVA_RVA] = rva_idx + assembly->text_rva;
+	}
+	if (fb->marshal_info) {
+		table = &assembly->tables [MONO_TABLE_FIELDMARSHAL];
+		table->rows ++;
+		alloc_table (table, table->rows);
+		values = table->values + table->rows * MONO_FIELD_MARSHAL_SIZE;
+		values [MONO_FIELD_MARSHAL_PARENT] = (fb->table_idx << HAS_FIELD_MARSHAL_BITS) | HAS_FIELD_MARSHAL_FIELDSREF;
+		values [MONO_FIELD_MARSHAL_NATIVE_TYPE] = encode_marshal_blob (assembly, fb->marshal_info);
 	}
-	mono_image_add_cattrs (assembly, fb->table_idx, CUSTOM_ATTR_FIELDDEF, fb->cattrs);
 }
 
 static guint32
@@ -848,11 +1033,15 @@ property_encode_signature (MonoDynamicAssembly *assembly, MonoReflectionProperty
 	char *b = blob_size;
 	guint32 nparams = 0;
 	MonoReflectionMethodBuilder *mb = fb->get_method;
-	guint32 idx, i;
+	MonoReflectionMethodBuilder *smb = fb->set_method;
+	guint32 idx, i, size;
 
 	if (mb && mb->parameters)
 		nparams = mono_array_length (mb->parameters);
-	buf = p = g_malloc (24 + nparams * 10);
+	if (!mb && smb && smb->parameters)
+		nparams = mono_array_length (smb->parameters) - 1;
+	size = 24 + nparams * 10;
+	buf = p = g_malloc (size);
 	*p = 0x08;
 	p++;
 	mono_metadata_encode_value (nparams, p, &p);
@@ -863,9 +1052,15 @@ property_encode_signature (MonoDynamicAssembly *assembly, MonoReflectionProperty
 			encode_reflection_type (assembly, pt, p, &p);
 		}
 	} else {
-		*p++ = 1; /* void: a property should probably not be allowed without a getter */
+		/* the property type is the last param */
+		encode_reflection_type (assembly, mono_array_get (smb->parameters, MonoReflectionType*, nparams), p, &p);
+		for (i = 0; i < nparams; ++i) {
+			MonoReflectionType *pt = mono_array_get (smb->parameters, MonoReflectionType*, i);
+			encode_reflection_type (assembly, pt, p, &p);
+		}
 	}
 	/* store length */
+	g_assert (p - buf < size);
 	mono_metadata_encode_value (p-buf, b, &b);
 	idx = mono_image_add_stream_data (&assembly->blob, blob_size, b-blob_size);
 	mono_image_add_stream_data (&assembly->blob, buf, p-buf);
@@ -891,7 +1086,7 @@ mono_image_get_property_info (MonoReflectionPropertyBuilder *pb, MonoDynamicAsse
 	 */
 	table = &assembly->tables [MONO_TABLE_PROPERTY];
 	pb->table_idx = table->next_idx ++;
-	values = table->values + pb->table_idx * MONO_FIELD_SIZE;
+	values = table->values + pb->table_idx * MONO_PROPERTY_SIZE;
 	name = mono_string_to_utf8 (pb->name);
 	values [MONO_PROPERTY_NAME] = string_heap_insert (&assembly->sheap, name);
 	g_free (name);
@@ -920,42 +1115,186 @@ mono_image_get_property_info (MonoReflectionPropertyBuilder *pb, MonoDynamicAsse
 		values [MONO_METHOD_SEMA_METHOD] = pb->set_method->table_idx;
 		values [MONO_METHOD_SEMA_ASSOCIATION] = (pb->table_idx << HAS_SEMANTICS_BITS) | HAS_SEMANTICS_PROPERTY;
 	}
-	mono_image_add_cattrs (assembly, pb->table_idx, CUSTOM_ATTR_PROPERTY, pb->cattrs);
+}
+
+static void
+mono_image_get_event_info (MonoReflectionEventBuilder *eb, MonoDynamicAssembly *assembly)
+{
+	MonoDynamicTable *table;
+	guint32 *values;
+	char *name;
+	guint num_methods = 0;
+	guint32 semaidx;
+
+	/* 
+	 * we need to set things in the following tables:
+	 * EVENTMAP (info already filled in _get_type_info ())
+	 * EVENT    (rows already preallocated in _get_type_info ())
+	 * METHOD      (method info already done with the generic method code)
+	 * METHODSEMANTICS
+	 */
+	table = &assembly->tables [MONO_TABLE_EVENT];
+	eb->table_idx = table->next_idx ++;
+	values = table->values + eb->table_idx * MONO_EVENT_SIZE;
+	name = mono_string_to_utf8 (eb->name);
+	values [MONO_EVENT_NAME] = string_heap_insert (&assembly->sheap, name);
+	g_free (name);
+	values [MONO_EVENT_FLAGS] = eb->attrs;
+	values [MONO_EVENT_TYPE] = mono_image_typedef_or_ref (assembly, eb->type->type);
+
+	/*
+	 * FIXME: we still don't handle 'other' methods 
+	 */
+	if (eb->add_method) num_methods ++;
+	if (eb->remove_method) num_methods ++;
+	if (eb->raise_method) num_methods ++;
+
+	table = &assembly->tables [MONO_TABLE_METHODSEMANTICS];
+	table->rows += num_methods;
+	alloc_table (table, table->rows);
+
+	if (eb->add_method) {
+		semaidx = table->next_idx ++;
+		values = table->values + semaidx * MONO_METHOD_SEMA_SIZE;
+		values [MONO_METHOD_SEMA_SEMANTICS] = METHOD_SEMANTIC_ADD_ON;
+		values [MONO_METHOD_SEMA_METHOD] = eb->add_method->table_idx;
+		values [MONO_METHOD_SEMA_ASSOCIATION] = (eb->table_idx << HAS_SEMANTICS_BITS) | HAS_SEMANTICS_EVENT;
+	}
+	if (eb->remove_method) {
+		semaidx = table->next_idx ++;
+		values = table->values + semaidx * MONO_METHOD_SEMA_SIZE;
+		values [MONO_METHOD_SEMA_SEMANTICS] = METHOD_SEMANTIC_REMOVE_ON;
+		values [MONO_METHOD_SEMA_METHOD] = eb->remove_method->table_idx;
+		values [MONO_METHOD_SEMA_ASSOCIATION] = (eb->table_idx << HAS_SEMANTICS_BITS) | HAS_SEMANTICS_EVENT;
+	}
+	if (eb->raise_method) {
+		semaidx = table->next_idx ++;
+		values = table->values + semaidx * MONO_METHOD_SEMA_SIZE;
+		values [MONO_METHOD_SEMA_SEMANTICS] = METHOD_SEMANTIC_FIRE;
+		values [MONO_METHOD_SEMA_METHOD] = eb->raise_method->table_idx;
+		values [MONO_METHOD_SEMA_ASSOCIATION] = (eb->table_idx << HAS_SEMANTICS_BITS) | HAS_SEMANTICS_EVENT;
+	}
 }
 
 static guint32
 resolution_scope_from_image (MonoDynamicAssembly *assembly, MonoImage *image)
 {
-	if (image != mono_defaults.corlib)
-		g_error ("multiple assemblyref not yet supported");
-	/* first row in assemblyref */
-	return (1 << RESOLTION_SCOPE_BITS) | RESOLTION_SCOPE_ASSEMBLYREF;
+	MonoDynamicTable *table;
+	guint32 token;
+	guint32 *values;
+	guint32 cols [MONO_ASSEMBLY_SIZE];
+
+	if ((token = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->handleref, image))))
+		return token;
+
+	mono_metadata_decode_row (&image->tables [MONO_TABLE_ASSEMBLY], 0, cols, MONO_ASSEMBLY_SIZE);
+
+	table = &assembly->tables [MONO_TABLE_ASSEMBLYREF];
+	token = table->next_idx ++;
+	table->rows ++;
+	alloc_table (table, table->rows);
+	values = table->values + token * MONO_ASSEMBLYREF_SIZE;
+	if (strcmp ("corlib", image->assembly_name) == 0)
+		values [MONO_ASSEMBLYREF_NAME] = string_heap_insert (&assembly->sheap, "mscorlib");
+	else
+		values [MONO_ASSEMBLYREF_NAME] = string_heap_insert (&assembly->sheap, image->assembly_name);
+	values [MONO_ASSEMBLYREF_MAJOR_VERSION] = cols [MONO_ASSEMBLY_MAJOR_VERSION];
+	values [MONO_ASSEMBLYREF_MINOR_VERSION] = cols [MONO_ASSEMBLY_MINOR_VERSION];
+	values [MONO_ASSEMBLYREF_BUILD_NUMBER] = cols [MONO_ASSEMBLY_BUILD_NUMBER];
+	values [MONO_ASSEMBLYREF_REV_NUMBER] = cols [MONO_ASSEMBLY_REV_NUMBER];
+	values [MONO_ASSEMBLYREF_FLAGS] = 0;
+	values [MONO_ASSEMBLYREF_PUBLIC_KEY] = 0;
+	values [MONO_ASSEMBLYREF_CULTURE] = 0;
+	values [MONO_ASSEMBLYREF_HASH_VALUE] = 0;
+
+	token <<= RESOLTION_SCOPE_BITS;
+	token |= RESOLTION_SCOPE_ASSEMBLYREF;
+	g_hash_table_insert (assembly->handleref, image, GUINT_TO_POINTER (token));
+	return token;
 }
 
 static guint32
-mono_image_typedef_or_ref (MonoDynamicAssembly *assembly, MonoType *type)
+create_typespec (MonoDynamicAssembly *assembly, MonoType *type)
 {
 	MonoDynamicTable *table;
 	guint32 *values;
 	guint32 token;
-	MonoClass *klass;
+	char sig [128];
+	char *p = sig;
+	char blob_size [6];
+	char *b = blob_size;
 
-	if (!assembly->typeref)
-		assembly->typeref = g_hash_table_new (g_direct_hash, g_direct_equal);
+	switch (type->type) {
+	case MONO_TYPE_FNPTR:
+	case MONO_TYPE_PTR:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:
+		encode_type (assembly, type, p, &p);
+		break;
+	default:
+		return 0;
+	}
 	
+	g_assert (p-sig < 128);
+	mono_metadata_encode_value (p-sig, b, &b);
+	token = mono_image_add_stream_data (&assembly->blob, blob_size, b-blob_size);
+	mono_image_add_stream_data (&assembly->blob, sig, p-sig);
+
+	table = &assembly->tables [MONO_TABLE_TYPESPEC];
+	alloc_table (table, table->rows + 1);
+	values = table->values + table->next_idx * MONO_TYPESPEC_SIZE;
+	values [MONO_TYPESPEC_SIGNATURE] = token;
+
+	token = TYPEDEFORREF_TYPESPEC | (table->next_idx << TYPEDEFORREF_BITS);
+	g_hash_table_insert (assembly->typeref, type, GUINT_TO_POINTER(token));
+	table->next_idx ++;
+	return token;
+}
+
+/*
+ * Despite the name, we handle also TypeSpec (with the above helper).
+ */
+static guint32
+mono_image_typedef_or_ref (MonoDynamicAssembly *assembly, MonoType *type)
+{
+	MonoDynamicTable *table;
+	guint32 *values;
+	guint32 token, scope, enclosing;
+	MonoClass *klass;
+
+#define COMPILE_CORLIB 0
+#if COMPILE_CORLIB
+	/* nasty hack, need to find the proper solution */
+	if (type->type == MONO_TYPE_OBJECT)
+		return TYPEDEFORREF_TYPEDEF | (2 << TYPEDEFORREF_BITS);
+#endif
 	token = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->typeref, type));
 	if (token)
 		return token;
-	klass = type->data.klass;
+	token = create_typespec (assembly, type);
+	if (token)
+		return token;
+	klass = my_mono_class_from_mono_type (type);
 	/*
 	 * If it's in the same module:
-	 * return TYPEDEFORREF_TYPEDEF | ((klass->token & 0xffffff) << TYPEDEFORREF_BITS)
 	 */
+	if (klass->image == assembly->assembly.image) {
+		MonoReflectionTypeBuilder *tb = klass->reflection_info;
+		return TYPEDEFORREF_TYPEDEF | (tb->table_idx << TYPEDEFORREF_BITS);
+	}
 
+	if (klass->nested_in) {
+		enclosing = mono_image_typedef_or_ref (assembly, &klass->nested_in->byval_arg);
+		/* get the typeref idx of the enclosing type */
+		enclosing >>= TYPEDEFORREF_BITS;
+		scope = (enclosing << RESOLTION_SCOPE_BITS) | RESOLTION_SCOPE_TYPEREF;
+	} else {
+		scope = resolution_scope_from_image (assembly, klass->image);
+	}
 	table = &assembly->tables [MONO_TABLE_TYPEREF];
 	alloc_table (table, table->rows + 1);
 	values = table->values + table->next_idx * MONO_TYPEREF_SIZE;
-	values [MONO_TYPEREF_SCOPE] = resolution_scope_from_image (assembly, klass->image);
+	values [MONO_TYPEREF_SCOPE] = scope;
 	values [MONO_TYPEREF_NAME] = string_heap_insert (&assembly->sheap, klass->name);
 	values [MONO_TYPEREF_NAMESPACE] = string_heap_insert (&assembly->sheap, klass->name_space);
 	token = TYPEDEFORREF_TYPEREF | (table->next_idx << TYPEDEFORREF_BITS); /* typeref */
@@ -964,15 +1303,21 @@ mono_image_typedef_or_ref (MonoDynamicAssembly *assembly, MonoType *type)
 	return token;
 }
 
+/*
+ * Insert a memberef row into the metadata: the token that point to the memberref
+ * is returned. Caching is done in the caller (mono_image_get_methodref_token() or
+ * mono_image_get_fieldref_token()).
+ * The sig param is an index to an already built signature.
+ */
 static guint32
-mono_image_get_memberref_token (MonoDynamicAssembly *assembly, MonoClass *klass, const char *name, guint32 sig)
+mono_image_get_memberref_token (MonoDynamicAssembly *assembly, MonoType *type, const char *name, guint32 sig)
 {
 	MonoDynamicTable *table;
 	guint32 *values;
 	guint32 token, pclass;
 	guint32 parent;
 
-	parent = mono_image_typedef_or_ref (assembly, &klass->byval_arg);
+	parent = mono_image_typedef_or_ref (assembly, type);
 	switch (parent & TYPEDEFORREF_MASK) {
 	case TYPEDEFORREF_TYPEREF:
 		pclass = MEMBERREF_PARENT_TYPEREF;
@@ -983,7 +1328,8 @@ mono_image_get_memberref_token (MonoDynamicAssembly *assembly, MonoClass *klass,
 	case TYPEDEFORREF_TYPEDEF:
 		/* should never get here */
 	default:
-		g_error ("unknow typeref or def token");
+		g_warning ("unknown typeref or def token 0x%08x for %s", parent, name);
+		return 0;
 	}
 	/* extract the index */
 	parent >>= TYPEDEFORREF_BITS;
@@ -1004,15 +1350,13 @@ static guint32
 mono_image_get_methodref_token (MonoDynamicAssembly *assembly, MonoMethod *method)
 {
 	guint32 token;
-	if (!assembly->typeref)
-		assembly->typeref = g_hash_table_new (g_direct_hash, g_direct_equal);
 	
-	token = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->typeref, method));
+	token = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->handleref, method));
 	if (token)
 		return token;
-	token = mono_image_get_memberref_token (assembly, method->klass, 
+	token = mono_image_get_memberref_token (assembly, &method->klass->byval_arg,
 		method->name,  method_encode_signature (assembly, method->signature));
-	g_hash_table_insert (assembly->typeref, method, GUINT_TO_POINTER(token));
+	g_hash_table_insert (assembly->handleref, method, GUINT_TO_POINTER(token));
 	return token;
 }
 
@@ -1020,44 +1364,106 @@ static guint32
 mono_image_get_fieldref_token (MonoDynamicAssembly *assembly, MonoClassField *field, MonoClass *klass)
 {
 	guint32 token;
-	if (!assembly->typeref)
-		assembly->typeref = g_hash_table_new (g_direct_hash, g_direct_equal);
 	
-	token = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->typeref, field));
+	token = GPOINTER_TO_UINT (g_hash_table_lookup (assembly->handleref, field));
 	if (token)
 		return token;
-	token = mono_image_get_memberref_token (assembly, klass, 
+	token = mono_image_get_memberref_token (assembly, &klass->byval_arg, 
 		field->name,  fieldref_encode_signature (assembly, field));
-	g_hash_table_insert (assembly->typeref, field, GUINT_TO_POINTER(token));
+	g_hash_table_insert (assembly->handleref, field, GUINT_TO_POINTER(token));
 	return token;
 }
 
+static int
+reflection_cc_to_file (int call_conv) {
+	switch (call_conv & 0x3) {
+	case 0:
+	case 1: return MONO_CALL_DEFAULT;
+	case 2: return MONO_CALL_VARARG;
+	default:
+		g_assert_not_reached ();
+	}
+	return 0;
+}
+
+typedef struct {
+	MonoType *parent;
+	MonoMethodSignature *sig;
+	char *name;
+	guint32 token;
+} ArrayMethod;
+
+static guint32
+mono_image_get_array_token (MonoDynamicAssembly *assembly, MonoReflectionArrayMethod *m)
+{
+	guint32 nparams, i;
+	GList *tmp;
+	char *name;
+	MonoMethodSignature *sig;
+	ArrayMethod *am;
+	
+	name = mono_string_to_utf8 (m->name);
+	nparams = mono_array_length (m->parameters);
+	sig = g_malloc0 (sizeof (MonoMethodSignature) + sizeof (MonoType*) * nparams);
+	sig->hasthis = 1;
+	sig->call_convention = reflection_cc_to_file (m->call_conv);
+	sig->param_count = nparams;
+	sig->ret = m->ret? m->ret->type: &mono_defaults.void_class->byval_arg;
+	for (i = 0; i < nparams; ++i) {
+		MonoReflectionType *t = mono_array_get (m->parameters, gpointer, i);
+		sig->params [i] = t->type;
+	}
+
+	for (tmp = assembly->array_methods; tmp; tmp = tmp->next) {
+		am = tmp->data;
+		if (strcmp (name, am->name) == 0 && 
+				mono_metadata_type_equal (am->parent, m->parent->type) &&
+				mono_metadata_signature_equal (am->sig, sig)) {
+			g_free (name);
+			g_free (sig);
+			return am->token;
+		}
+	}
+	am = g_new0 (ArrayMethod, 1);
+	am->name = name;
+	am->sig = sig;
+	am->parent = m->parent->type;
+	am->token = mono_image_get_memberref_token (assembly, am->parent,
+		name,  method_encode_signature (assembly, sig));
+	assembly->array_methods = g_list_prepend (assembly->array_methods, am);
+	m->table_idx = am->token & 0xffffff;
+	return am->token;
+}
+
+/*
+ * Insert into the metadata tables all the info about the TypeBuilder tb.
+ * Data in the tables is inserted in a predefined order, since some tables need to be sorted.
+ */
 static void
 mono_image_get_type_info (MonoDomain *domain, MonoReflectionTypeBuilder *tb, MonoDynamicAssembly *assembly)
 {
 	MonoDynamicTable *table;
 	guint *values;
-	int i;
+	int i, is_object = 0, is_system = 0;
 	char *n;
 
 	table = &assembly->tables [MONO_TABLE_TYPEDEF];
 	values = table->values + tb->table_idx * MONO_TYPEDEF_SIZE;
 	values [MONO_TYPEDEF_FLAGS] = tb->attrs;
-	if (tb->parent) { /* interfaces don't have a parent */
-		if (tb->parent->type)
-			values [MONO_TYPEDEF_EXTENDS] = mono_image_typedef_or_ref (assembly, tb->parent->type);
-		else {
-			MonoReflectionTypeBuilder *ptb = (MonoReflectionTypeBuilder *)tb->parent;
-			values [MONO_TYPEDEF_EXTENDS] = TYPEDEFORREF_TYPEDEF | (ptb->table_idx << TYPEDEFORREF_BITS);
-		}
-	} else
-		values [MONO_TYPEDEF_EXTENDS] = 0;
 	n = mono_string_to_utf8 (tb->name);
+	if (strcmp (n, "Object") == 0)
+		is_object++;
 	values [MONO_TYPEDEF_NAME] = string_heap_insert (&assembly->sheap, n);
 	g_free (n);
 	n = mono_string_to_utf8 (tb->nspace);
+	if (strcmp (n, "System") == 0)
+		is_system++;
 	values [MONO_TYPEDEF_NAMESPACE] = string_heap_insert (&assembly->sheap, n);
 	g_free (n);
+	if (tb->parent && !(is_system && is_object)) { /* interfaces don't have a parent */
+		values [MONO_TYPEDEF_EXTENDS] = mono_image_typedef_or_ref (assembly, tb->parent->type);
+	} else
+		values [MONO_TYPEDEF_EXTENDS] = 0;
 	values [MONO_TYPEDEF_FIELD_LIST] = assembly->tables [MONO_TABLE_FIELD].next_idx;
 	values [MONO_TYPEDEF_METHOD_LIST] = assembly->tables [MONO_TABLE_METHOD].next_idx;
 
@@ -1065,7 +1471,7 @@ mono_image_get_type_info (MonoDomain *domain, MonoReflectionTypeBuilder *tb, Mon
 	 * if we have explicitlayout or sequentiallayouts, output data in the
 	 * ClassLayout table.
 	 */
-	if ((tb->attrs & TYPE_ATTRIBUTE_LAYOUT_MASK) != TYPE_ATTRIBUTE_AUTO_LAYOUT) {
+	if (((tb->attrs & TYPE_ATTRIBUTE_LAYOUT_MASK) != TYPE_ATTRIBUTE_AUTO_LAYOUT) && (tb->class_size != -1)) {
 		table = &assembly->tables [MONO_TABLE_CLASSLAYOUT];
 		table->rows++;
 		alloc_table (table, table->rows);
@@ -1075,10 +1481,30 @@ mono_image_get_type_info (MonoDomain *domain, MonoReflectionTypeBuilder *tb, Mon
 		values [MONO_CLASS_LAYOUT_PACKING_SIZE] = tb->packing_size;
 	}
 
-	/*
-	 * FIXME: constructors and methods need to be output in the same order
-	 * as they are defined (according to table_idx).
-	 */
+	/* handle interfaces */
+	if (tb->interfaces) {
+		table = &assembly->tables [MONO_TABLE_INTERFACEIMPL];
+		i = table->rows;
+		table->rows += mono_array_length (tb->interfaces);
+		alloc_table (table, table->rows);
+		values = table->values + (i + 1) * MONO_INTERFACEIMPL_SIZE;
+		for (i = 0; i < mono_array_length (tb->interfaces); ++i) {
+			MonoReflectionType* iface = (MonoReflectionType*) mono_array_get (tb->interfaces, gpointer, i);
+			values [MONO_INTERFACEIMPL_CLASS] = tb->table_idx;
+			values [MONO_INTERFACEIMPL_INTERFACE] = mono_image_typedef_or_ref (assembly, iface->type);
+			values += MONO_INTERFACEIMPL_SIZE;
+		}
+	}
+
+	/* handle fields */
+	if (tb->fields) {
+		table = &assembly->tables [MONO_TABLE_FIELD];
+		table->rows += mono_array_length (tb->fields);
+		alloc_table (table, table->rows);
+		for (i = 0; i < mono_array_length (tb->fields); ++i)
+			mono_image_get_field_info (
+				mono_array_get (tb->fields, MonoReflectionFieldBuilder*, i), assembly);
+	}
 
 	/* handle constructors */
 	if (tb->ctors) {
@@ -1100,17 +1526,21 @@ mono_image_get_type_info (MonoDomain *domain, MonoReflectionTypeBuilder *tb, Mon
 				mono_array_get (tb->methods, MonoReflectionMethodBuilder*, i), assembly);
 	}
 
-	/* handle fields */
-	if (tb->fields) {
-		table = &assembly->tables [MONO_TABLE_FIELD];
-		table->rows += mono_array_length (tb->fields);
+	/* Do the same with properties etc.. */
+	if (tb->events && mono_array_length (tb->events)) {
+		table = &assembly->tables [MONO_TABLE_EVENT];
+		table->rows += mono_array_length (tb->events);
 		alloc_table (table, table->rows);
-		for (i = 0; i < mono_array_length (tb->fields); ++i)
-			mono_image_get_field_info (
-				mono_array_get (tb->fields, MonoReflectionFieldBuilder*, i), assembly);
+		table = &assembly->tables [MONO_TABLE_EVENTMAP];
+		table->rows ++;
+		alloc_table (table, table->rows);
+		values = table->values + table->rows * MONO_EVENT_MAP_SIZE;
+		values [MONO_EVENT_MAP_PARENT] = tb->table_idx;
+		values [MONO_EVENT_MAP_EVENTLIST] = assembly->tables [MONO_TABLE_EVENT].next_idx;
+		for (i = 0; i < mono_array_length (tb->events); ++i)
+			mono_image_get_event_info (
+				mono_array_get (tb->events, MonoReflectionEventBuilder*, i), assembly);
 	}
-
-	/* Do the same with properties etc.. */
 	if (tb->properties && mono_array_length (tb->properties)) {
 		table = &assembly->tables [MONO_TABLE_PROPERTY];
 		table->rows += mono_array_length (tb->properties);
@@ -1140,7 +1570,6 @@ mono_image_get_type_info (MonoDomain *domain, MonoReflectionTypeBuilder *tb, Mon
 		for (i = 0; i < mono_array_length (tb->subtypes); ++i) {
 			MonoReflectionTypeBuilder *subtype = mono_array_get (tb->subtypes, MonoReflectionTypeBuilder*, i);
 
-			mono_image_get_type_info (domain, subtype, assembly);
 			values [MONO_NESTED_CLASS_NESTED] = subtype->table_idx;
 			values [MONO_NESTED_CLASS_ENCLOSING] = tb->table_idx;
 			/*g_print ("nesting %s (%d) in %s (%d) (rows %d/%d)\n",
@@ -1150,8 +1579,101 @@ mono_image_get_type_info (MonoDomain *domain, MonoReflectionTypeBuilder *tb, Mon
 			values += MONO_NESTED_CLASS_SIZE;
 			ntable->next_idx++;
 		}
+		for (i = 0; i < mono_array_length (tb->subtypes); ++i) {
+			MonoReflectionTypeBuilder *subtype = mono_array_get (tb->subtypes, MonoReflectionTypeBuilder*, i);
+
+			mono_image_get_type_info (domain, subtype, assembly);
+		}
 	}
+}
+
+static void
+assign_type_idx (MonoReflectionTypeBuilder *type, MonoDynamicTable *table)
+{
+	int j;
+
+	type->table_idx = table->next_idx ++;
+	if (!type->subtypes)
+		return;
+	for (j = 0; j < mono_array_length (type->subtypes); ++j) {
+		MonoReflectionTypeBuilder *subtype = mono_array_get (type->subtypes, MonoReflectionTypeBuilder*, j);
+		assign_type_idx (subtype, table);
+	}
+}
+
+static void
+params_add_cattrs (MonoDynamicAssembly *assembly, MonoArray *pinfo) {
+	int i;
+
+	if (!pinfo)
+		return;
+	for (i = 0; i < mono_array_length (pinfo); ++i) {
+		MonoReflectionParamBuilder *pb;
+		pb = mono_array_get (pinfo, MonoReflectionParamBuilder *, i);
+		if (!pb)
+			continue;
+		mono_image_add_cattrs (assembly, pb->table_idx, CUSTOM_ATTR_PARAMDEF, pb->cattrs);
+	}
+}
+
+static void
+type_add_cattrs (MonoDynamicAssembly *assembly, MonoReflectionTypeBuilder *tb) {
+	int i;
+	
 	mono_image_add_cattrs (assembly, tb->table_idx, CUSTOM_ATTR_TYPEDEF, tb->cattrs);
+	if (tb->fields) {
+		for (i = 0; i < mono_array_length (tb->fields); ++i) {
+			MonoReflectionFieldBuilder* fb;
+			fb = mono_array_get (tb->fields, MonoReflectionFieldBuilder*, i);
+			mono_image_add_cattrs (assembly, fb->table_idx, CUSTOM_ATTR_FIELDDEF, fb->cattrs);
+		}
+	}
+	if (tb->events) {
+		for (i = 0; i < mono_array_length (tb->events); ++i) {
+			MonoReflectionEventBuilder* eb;
+			eb = mono_array_get (tb->events, MonoReflectionEventBuilder*, i);
+			mono_image_add_cattrs (assembly, eb->table_idx, CUSTOM_ATTR_EVENT, eb->cattrs);
+		}
+	}
+	if (tb->properties) {
+		for (i = 0; i < mono_array_length (tb->properties); ++i) {
+			MonoReflectionPropertyBuilder* pb;
+			pb = mono_array_get (tb->properties, MonoReflectionPropertyBuilder*, i);
+			mono_image_add_cattrs (assembly, pb->table_idx, CUSTOM_ATTR_PROPERTY, pb->cattrs);
+		}
+	}
+	if (tb->ctors) {
+		for (i = 0; i < mono_array_length (tb->ctors); ++i) {
+			MonoReflectionCtorBuilder* cb;
+			cb = mono_array_get (tb->ctors, MonoReflectionCtorBuilder*, i);
+			mono_image_add_cattrs (assembly, cb->table_idx, CUSTOM_ATTR_METHODDEF, cb->cattrs);
+			params_add_cattrs (assembly, cb->pinfo);
+		}
+	}
+
+	if (tb->methods) {
+		for (i = 0; i < mono_array_length (tb->methods); ++i) {
+			MonoReflectionMethodBuilder* mb;
+			mb = mono_array_get (tb->methods, MonoReflectionMethodBuilder*, i);
+			mono_image_add_cattrs (assembly, mb->table_idx, CUSTOM_ATTR_METHODDEF, mb->cattrs);
+			params_add_cattrs (assembly, mb->pinfo);
+		}
+	}
+
+	if (tb->subtypes) {
+		for (i = 0; i < mono_array_length (tb->subtypes); ++i)
+			type_add_cattrs (assembly, mono_array_get (tb->subtypes, MonoReflectionTypeBuilder*, i));
+	}
+}
+
+static void
+module_add_cattrs (MonoDynamicAssembly *assembly, MonoReflectionModuleBuilder *mb) {
+	int i;
+	
+	mono_image_add_cattrs (assembly, mb->table_idx, CUSTOM_ATTR_MODULE, mb->cattrs);
+	
+	for (i = 0; i < mono_array_length (mb->types); ++i)
+		type_add_cattrs (assembly, mono_array_get (mb->types, MonoReflectionTypeBuilder*, i));
 }
 
 static void
@@ -1166,9 +1688,13 @@ mono_image_fill_module_table (MonoDomain *domain, MonoReflectionModuleBuilder *m
 	name = mono_string_to_utf8 (mb->module.name);
 	table->values [mb->table_idx * MONO_MODULE_SIZE + MONO_MODULE_NAME] = string_heap_insert (&assembly->sheap, name);
 	g_free (name);
-	/* need to set mvid? */
+	i = mono_image_add_stream_data (&assembly->guid, mono_array_addr (mb->guid, char, 0), 16);
+	i /= 16;
+	++i;
+	table->values [mb->table_idx * MONO_MODULE_SIZE + MONO_MODULE_MVID] = i;
+	table->values [mb->table_idx * MONO_MODULE_SIZE + MONO_MODULE_ENC] = 0;
+	table->values [mb->table_idx * MONO_MODULE_SIZE + MONO_MODULE_ENCBASE] = 0;
 
-	mono_image_add_cattrs (assembly, mb->table_idx, CUSTOM_ATTR_MODULE, mb->cattrs);
 	/*
 	 * fill-in info in other tables as well.
 	 */
@@ -1180,15 +1706,8 @@ mono_image_fill_module_table (MonoDomain *domain, MonoReflectionModuleBuilder *m
 	 * has not yet been stored in the tables is referenced by another type.
 	 */
 	for (i = 0; i < mono_array_length (mb->types); ++i) {
-		int j;
 		MonoReflectionTypeBuilder *type = mono_array_get (mb->types, MonoReflectionTypeBuilder*, i);
-		type->table_idx = table->next_idx ++;
-		if (!type->subtypes)
-			continue;
-		for (j = 0; j < mono_array_length (type->subtypes); ++j) {
-			MonoReflectionTypeBuilder *subtype = mono_array_get (type->subtypes, MonoReflectionTypeBuilder*, j);
-			subtype->table_idx = table->next_idx ++;
-		}
+		assign_type_idx (type, table);
 	}
 	for (i = 0; i < mono_array_length (mb->types); ++i)
 		mono_image_get_type_info (domain, mono_array_get (mb->types, MonoReflectionTypeBuilder*, i), assembly);
@@ -1201,11 +1720,57 @@ mono_image_fill_module_table (MonoDomain *domain, MonoReflectionModuleBuilder *m
 			(p) += 4 - (__diff & 3);\
 	} while (0)
 
+static int
+compare_semantics (const void *a, const void *b)
+{
+	const guint32 *a_values = a;
+	const guint32 *b_values = b;
+	int assoc = a_values [MONO_METHOD_SEMA_ASSOCIATION] - b_values [MONO_METHOD_SEMA_ASSOCIATION];
+	if (assoc)
+		return assoc;
+	return a_values [MONO_METHOD_SEMA_SEMANTICS] - b_values [MONO_METHOD_SEMA_SEMANTICS];
+}
+
+static int
+compare_custom_attrs (const void *a, const void *b)
+{
+	const guint32 *a_values = a;
+	const guint32 *b_values = b;
+
+	return a_values [MONO_CUSTOM_ATTR_PARENT] - b_values [MONO_CUSTOM_ATTR_PARENT];
+}
+
+static int
+compare_field_marshal (const void *a, const void *b)
+{
+	const guint32 *a_values = a;
+	const guint32 *b_values = b;
+
+	return a_values [MONO_FIELD_MARSHAL_PARENT] - b_values [MONO_FIELD_MARSHAL_PARENT];
+}
+
+static int
+compare_nested (const void *a, const void *b)
+{
+	const guint32 *a_values = a;
+	const guint32 *b_values = b;
+
+	return a_values [MONO_NESTED_CLASS_NESTED] - b_values [MONO_NESTED_CLASS_NESTED];
+}
+
+/*
+ * build_compressed_metadata() fills in the blob of data that represents the 
+ * raw metadata as it will be saved in the PE file. The five streams are output 
+ * and the metadata tables are comnpressed from the guint32 array representation, 
+ * to the compressed on-disk format.
+ */
 static void
 build_compressed_metadata (MonoDynamicAssembly *assembly)
 {
+	MonoDynamicTable *table;
 	int i;
 	guint64 valid_mask = 0;
+	guint64 sorted_mask;
 	guint32 heapt_size = 0;
 	guint32 meta_size = 256; /* allow for header and other stuff */
 	guint32 table_offset;
@@ -1215,10 +1780,34 @@ build_compressed_metadata (MonoDynamicAssembly *assembly)
 	guint16 *int16val;
 	MonoImage *meta;
 	unsigned char *p;
-	char *version = "mono" VERSION;
+	/*
+	 * We need to use the current ms version or the ms runtime it won't find
+	 * the support dlls. D'oh!
+	 * const char *version = "mono-" VERSION;
+	 */
+	const char *version = "v1.0.3705";
+	struct StreamDesc {
+		const char *name;
+		MonoDynamicStream *stream;
+	} stream_desc [] = {
+		{"#~", &assembly->tstream},
+		{"#Strings", &assembly->sheap},
+		{"#US", &assembly->us},
+		{"#Blob", &assembly->blob},
+		{"#GUID", &assembly->guid}
+	};
+	
+	/* tables that are sorted */
+	sorted_mask = ((guint64)1 << MONO_TABLE_CONSTANT) | ((guint64)1 << MONO_TABLE_FIELDMARSHAL)
+		| ((guint64)1 << MONO_TABLE_METHODSEMANTICS) | ((guint64)1 << MONO_TABLE_CLASSLAYOUT)
+		| ((guint64)1 << MONO_TABLE_FIELDLAYOUT) | ((guint64)1 << MONO_TABLE_FIELDRVA)
+		| ((guint64)1 << MONO_TABLE_IMPLMAP) | ((guint64)1 << MONO_TABLE_NESTEDCLASS)
+		| ((guint64)1 << MONO_TABLE_METHODIMPL) | ((guint64)1 << MONO_TABLE_CUSTOMATTRIBUTE)
+		| ((guint64)1 << MONO_TABLE_DECLSECURITY);
 	
 	/* Compute table sizes */
-	meta = assembly->assembly.image = g_new0 (MonoImage, 1);
+	/* the MonoImage has already been created in mono_image_basic_init() */
+	meta = assembly->assembly.image;
 	
 	/* Setup the info used by compute_sizes () */
 	meta->idx_blob_wide = assembly->blob.index >= 65536 ? 1 : 0;
@@ -1251,19 +1840,19 @@ build_compressed_metadata (MonoDynamicAssembly *assembly)
 	*p++ = 'B'; *p++ = 'S'; *p++ = 'J'; *p++ = 'B';
 	/* version numbers and 4 bytes reserved */
 	int16val = (guint16*)p;
-	*int16val++ = 1;
-	*int16val = 1;
+	*int16val++ = GUINT16_TO_LE (1);
+	*int16val = GUINT16_TO_LE (1);
 	p += 8;
 	/* version string */
 	int32val = (guint32*)p;
-	*int32val = strlen (version);
+	*int32val = GUINT32_TO_LE ((strlen (version) + 3) & (~3)); /* needs to be multiple of 4 */
 	p += 4;
-	memcpy (p, version, *int32val);
-	p += *int32val;
+	memcpy (p, version, GUINT32_FROM_LE (*int32val));
+	p += GUINT32_FROM_LE (*int32val);
 	align_pointer (meta->raw_metadata, p);
 	int16val = (guint16*)p;
-	*int16val++ = 0; /* flags must be 0 */
-	*int16val = 5; /* number of streams */
+	*int16val++ = GUINT16_TO_LE (0); /* flags must be 0 */
+	*int16val = GUINT16_TO_LE (5); /* number of streams */
 	p += 4;
 
 	/*
@@ -1271,64 +1860,27 @@ build_compressed_metadata (MonoDynamicAssembly *assembly)
 	 */
 	table_offset = (p - (unsigned char*)meta->raw_metadata) + 5 * 8 + 40; /* room needed for stream headers */
 	table_offset += 3; table_offset &= ~3;
-	
-	int32val = (guint32*)p;
-	*int32val++ = assembly->tstream.offset = table_offset;
-	*int32val = heapt_size;
-	table_offset += *int32val;
-	table_offset += 3; table_offset &= ~3;
-	p += 8;
-	strcpy (p, "#~");
-	p += 3;
-	align_pointer (meta->raw_metadata, p);
-
-	int32val = (guint32*)p;
-	*int32val++ = assembly->sheap.offset = table_offset;
-	*int32val = assembly->sheap.index;
-	table_offset += *int32val;
-	table_offset += 3; table_offset &= ~3;
-	p += 8;
-	strcpy (p, "#Strings");
-	p += 9;
-	align_pointer (meta->raw_metadata, p);
-
-	int32val = (guint32*)p;
-	*int32val++ = assembly->us.offset = table_offset;
-	*int32val = assembly->us.index;
-	table_offset += *int32val;
-	table_offset += 3; table_offset &= ~3;
-	p += 8;
-	strcpy (p, "#US");
-	p += 4;
-	align_pointer (meta->raw_metadata, p);
-
-	int32val = (guint32*)p;
-	*int32val++ = assembly->blob.offset = table_offset;
-	*int32val = assembly->blob.index;
-	table_offset += *int32val;
-	table_offset += 3; table_offset &= ~3;
-	p += 8;
-	strcpy (p, "#Blob");
-	p += 6;
-	align_pointer (meta->raw_metadata, p);
-
-	int32val = (guint32*)p;
-	*int32val++ = assembly->guid.offset = table_offset;
-	*int32val = assembly->guid.index;
-	table_offset += *int32val;
-	table_offset += 3; table_offset &= ~3;
-	p += 8;
-	strcpy (p, "#GUID");
-	p += 6;
-	align_pointer (meta->raw_metadata, p);
 
+	assembly->tstream.index = heapt_size;
+	for (i = 0; i < 5; ++i) {
+		int32val = (guint32*)p;
+		stream_desc [i].stream->offset = table_offset;
+		*int32val++ = GUINT32_TO_LE (table_offset);
+		*int32val = GUINT32_TO_LE (stream_desc [i].stream->index);
+		table_offset += GUINT32_FROM_LE (*int32val);
+		table_offset += 3; table_offset &= ~3;
+		p += 8;
+		strcpy (p, stream_desc [i].name);
+		p += strlen (stream_desc [i].name) + 1;
+		align_pointer (meta->raw_metadata, p);
+	}
 	/* 
 	 * now copy the data, the table stream header and contents goes first.
 	 */
 	g_assert ((p - (unsigned char*)meta->raw_metadata) < assembly->tstream.offset);
 	p = meta->raw_metadata + assembly->tstream.offset;
 	int32val = (guint32*)p;
-	*int32val = 0; /* reserved */
+	*int32val = GUINT32_TO_LE (0); /* reserved */
 	p += 4;
 	*p++ = 1; /* version */
 	*p++ = 0;
@@ -1341,16 +1893,31 @@ build_compressed_metadata (MonoDynamicAssembly *assembly)
 	++p;
 	*p++ = 0; /* reserved */
 	int64val = (guint64*)p;
-	*int64val++ = valid_mask;
-	*int64val++ = 0; /* bitvector of sorted tables, set to 0 for now  */
+	*int64val++ = GUINT64_TO_LE (valid_mask);
+	*int64val++ = GUINT64_TO_LE (valid_mask & sorted_mask); /* bitvector of sorted tables  */
 	p += 16;
 	int32val = (guint32*)p;
 	for (i = 0; i < 64; i++){
 		if (meta->tables [i].rows == 0)
 			continue;
-		*int32val++ = meta->tables [i].rows;
+		*int32val++ = GUINT32_TO_LE (meta->tables [i].rows);
 	}
 	p = (unsigned char*)int32val;
+
+	/* sort the tables that still need sorting */
+	table = &assembly->tables [MONO_TABLE_METHODSEMANTICS];
+	if (table->rows)
+		qsort (table->values + MONO_METHOD_SEMA_SIZE, table->rows, sizeof (guint32) * MONO_METHOD_SEMA_SIZE, compare_semantics);
+	table = &assembly->tables [MONO_TABLE_CUSTOMATTRIBUTE];
+	if (table->rows)
+		qsort (table->values + MONO_CUSTOM_ATTR_SIZE, table->rows, sizeof (guint32) * MONO_CUSTOM_ATTR_SIZE, compare_custom_attrs);
+	table = &assembly->tables [MONO_TABLE_FIELDMARSHAL];
+	if (table->rows)
+		qsort (table->values + MONO_FIELD_MARSHAL_SIZE, table->rows, sizeof (guint32) * MONO_FIELD_MARSHAL_SIZE, compare_field_marshal);
+	table = &assembly->tables [MONO_TABLE_NESTEDCLASS];
+	if (table->rows)
+		qsort (table->values + MONO_NESTED_CLASS_SIZE, table->rows, sizeof (guint32) * MONO_NESTED_CLASS_SIZE, compare_nested);
+
 	/* compress the tables */
 	for (i = 0; i < 64; i++){
 		int row, col;
@@ -1370,12 +1937,12 @@ build_compressed_metadata (MonoDynamicAssembly *assembly)
 					break;
 				case 2:
 					int16val = (guint16*)p;
-					*int16val = values [col];
+					*int16val = GUINT16_TO_LE (values [col]);
 					p += 2;
 					break;
 				case 4:
 					int32val = (guint32*)p;
-					*int32val = values [col];
+					*int32val = GUINT32_TO_LE (values [col]);
 					p += 4;
 					break;
 				default:
@@ -1383,7 +1950,7 @@ build_compressed_metadata (MonoDynamicAssembly *assembly)
 				}
 			}
 		}
-		g_assert ((p - (unsigned char*)meta->tables [i].base) == (meta->tables [i].rows * meta->tables [i].row_size));
+		g_assert ((p - (const unsigned char*)meta->tables [i].base) == (meta->tables [i].rows * meta->tables [i].row_size));
 	}
 	
 	g_assert (assembly->guid.offset + assembly->guid.index < meta_size);
@@ -1395,6 +1962,124 @@ build_compressed_metadata (MonoDynamicAssembly *assembly)
 	assembly->meta_size = assembly->guid.offset + assembly->guid.index;
 }
 
+/*
+ * Some tables in metadata need to be sorted according to some criteria, but
+ * when methods and fields are first created with reflection, they may be assigned a token
+ * that doesn't correspond to the final token they will get assigned after the sorting.
+ * ILGenerator.cs keeps a fixup table that maps the position of tokens in the IL code stream
+ * with the reflection objects that represent them. Once all the tables are set up, the 
+ * reflection objects will contains the correct table index. fixup_method() will fixup the
+ * tokens for the method with ILGenerator @ilgen.
+ */
+static void
+fixup_method (MonoReflectionILGen *ilgen, gpointer value, MonoDynamicAssembly *assembly) {
+	guint32 code_idx = GPOINTER_TO_UINT (value);
+	MonoReflectionILTokenInfo *iltoken;
+	MonoReflectionFieldBuilder *field;
+	MonoReflectionCtorBuilder *ctor;
+	MonoReflectionMethodBuilder *method;
+	MonoReflectionTypeBuilder *tb;
+	guint32 i, idx;
+	unsigned char *target;
+
+	for (i = 0; i < ilgen->num_token_fixups; ++i) {
+		iltoken = (MonoReflectionILTokenInfo *)mono_array_addr_with_size (ilgen->token_fixups, sizeof (MonoReflectionILTokenInfo), i);
+		target = assembly->code.data + code_idx + iltoken->code_pos;
+		switch (target [3]) {
+		case MONO_TABLE_FIELD:
+			if (strcmp (iltoken->member->vtable->klass->name, "FieldBuilder"))
+				g_assert_not_reached ();
+			field = (MonoReflectionFieldBuilder *)iltoken->member;
+			idx = field->table_idx;
+			break;
+		case MONO_TABLE_METHOD:
+			if (!strcmp (iltoken->member->vtable->klass->name, "MethodBuilder")) {
+				method = (MonoReflectionMethodBuilder *)iltoken->member;
+				idx = method->table_idx;
+			} else if (!strcmp (iltoken->member->vtable->klass->name, "ConstructorBuilder")) {
+				ctor = (MonoReflectionCtorBuilder *)iltoken->member;
+				idx = ctor->table_idx;
+			} else {
+				g_assert_not_reached ();
+			}
+			break;
+		case MONO_TABLE_TYPEDEF:
+			if (strcmp (iltoken->member->vtable->klass->name, "TypeBuilder"))
+				g_assert_not_reached ();
+			tb = (MonoReflectionTypeBuilder *)iltoken->member;
+			idx = tb->table_idx;
+			break;
+		default:
+			g_error ("got unexpected table 0x%02x in fixup", target [3]);
+		}
+		target [0] = idx & 0xff;
+		target [1] = (idx >> 8) & 0xff;
+		target [2] = (idx >> 16) & 0xff;
+	}
+}
+
+static void
+assembly_add_resource (MonoDynamicAssembly *assembly, MonoReflectionResource *rsrc)
+{
+	MonoDynamicTable *table;
+	guint32 *values;
+	char blob_size [6];
+	guchar hash [20];
+	char *b = blob_size;
+	char *name, *sname;
+	guint32 idx, offset;
+
+	if (rsrc->filename) {
+		name = mono_string_to_utf8 (rsrc->filename);
+		sname = g_path_get_basename (name);
+	
+		table = &assembly->tables [MONO_TABLE_FILE];
+		table->rows++;
+		alloc_table (table, table->rows);
+		values = table->values + table->next_idx * MONO_FILE_SIZE;
+		values [MONO_FILE_FLAGS] = FILE_CONTAINS_NO_METADATA;
+		values [MONO_FILE_NAME] = string_heap_insert (&assembly->sheap, sname);
+		g_free (sname);
+
+		mono_sha1_get_digest_from_file (name, hash);
+		mono_metadata_encode_value (20, b, &b);
+		values [MONO_FILE_HASH_VALUE] = mono_image_add_stream_data (&assembly->blob, blob_size, b-blob_size);
+		mono_image_add_stream_data (&assembly->blob, hash, 20);
+		g_free (name);
+		idx = table->next_idx++;
+		idx = IMPLEMENTATION_FILE | (idx << IMPLEMENTATION_BITS);
+		offset = 0;
+	} else {
+		char sizebuf [4];
+		offset = mono_array_length (rsrc->data);
+		sizebuf [0] = offset; sizebuf [1] = offset >> 8;
+		sizebuf [2] = offset >> 16; sizebuf [3] = offset >> 24;
+		offset = mono_image_add_stream_data (&assembly->resources, sizebuf, 4);
+		mono_image_add_stream_data (&assembly->resources, mono_array_addr (rsrc->data, char, 0), mono_array_length (rsrc->data));
+		idx = 0;
+	}
+
+	table = &assembly->tables [MONO_TABLE_MANIFESTRESOURCE];
+	table->rows++;
+	alloc_table (table, table->rows);
+	values = table->values + table->next_idx * MONO_MANIFEST_SIZE;
+	values [MONO_MANIFEST_OFFSET] = offset;
+	values [MONO_MANIFEST_FLAGS] = rsrc->attrs;
+	name = mono_string_to_utf8 (rsrc->name);
+	values [MONO_MANIFEST_NAME] = string_heap_insert (&assembly->sheap, name);
+	g_free (name);
+	values [MONO_MANIFEST_IMPLEMENTATION] = idx;
+	table->next_idx++;
+}
+
+/*
+ * mono_image_build_metadata() will fill the info in all the needed metadata tables
+ * for the AssemblyBuilder @assemblyb: it iterates over the assembly modules
+ * and recursively outputs the info for a module. Each module will output all the info
+ * about it's types etc.
+ * At the end of the process, method and field tokens are fixed up and the on-disk
+ * compressed metadata representation is created.
+ */
 static void
 mono_image_build_metadata (MonoReflectionAssemblyBuilder *assemblyb)
 {
@@ -1411,7 +2096,7 @@ mono_image_build_metadata (MonoReflectionAssemblyBuilder *assemblyb)
 	table = &assembly->tables [MONO_TABLE_ASSEMBLY];
 	alloc_table (table, 1);
 	values = table->values + MONO_ASSEMBLY_SIZE;
-	values [MONO_ASSEMBLY_HASH_ALG] = 0x8004;
+	values [MONO_ASSEMBLY_HASH_ALG] = ASSEMBLY_HASH_SHA1;
 	name = mono_string_to_utf8 (assemblyb->name);
 	values [MONO_ASSEMBLY_NAME] = string_heap_insert (&assembly->sheap, name);
 	g_free (name);
@@ -1421,17 +2106,24 @@ mono_image_build_metadata (MonoReflectionAssemblyBuilder *assemblyb)
 	values [MONO_ASSEMBLY_MINOR_VERSION] = 0;
 	values [MONO_ASSEMBLY_REV_NUMBER] = 0;
 	values [MONO_ASSEMBLY_BUILD_NUMBER] = 0;
-
-	mono_image_add_cattrs (assembly, 1, CUSTOM_ATTR_ASSEMBLY, assemblyb->cattrs);
+	values [MONO_ASSEMBLY_FLAGS] = 0;
 
 	assembly->tables [MONO_TABLE_TYPEDEF].rows = 1; /* .<Module> */
 	assembly->tables [MONO_TABLE_TYPEDEF].next_idx++;
 
-	len = mono_array_length (assemblyb->modules);
-	table = &assembly->tables [MONO_TABLE_MODULE];
-	alloc_table (table, len);
-	for (i = 0; i < len; ++i)
-		mono_image_fill_module_table (domain, mono_array_get (assemblyb->modules, MonoReflectionModuleBuilder*, i), assembly);
+	if (assemblyb->modules) {
+		len = mono_array_length (assemblyb->modules);
+		table = &assembly->tables [MONO_TABLE_MODULE];
+		alloc_table (table, len);
+		for (i = 0; i < len; ++i)
+			mono_image_fill_module_table (domain, mono_array_get (assemblyb->modules, MonoReflectionModuleBuilder*, i), assembly);
+	} else {
+		table = &assembly->tables [MONO_TABLE_MODULE];
+		table->rows++;
+		alloc_table (table, table->rows);
+		table->values [table->next_idx * MONO_MODULE_SIZE + MONO_MODULE_NAME] = string_heap_insert (&assembly->sheap, "RefEmit_YouForgotToDefineAModule");
+		table->next_idx ++;
+	}
 
 	table = &assembly->tables [MONO_TABLE_TYPEDEF];
 	/* 
@@ -1449,43 +2141,68 @@ mono_image_build_metadata (MonoReflectionAssemblyBuilder *assemblyb)
 	values [MONO_TYPEDEF_FIELD_LIST] = 1;
 	values [MONO_TYPEDEF_METHOD_LIST] = 1;
 
-	/* later include all the assemblies referenced */
-	table = &assembly->tables [MONO_TABLE_ASSEMBLYREF];
-	alloc_table (table, 1);
-	values = table->values + table->columns;
-	values [MONO_ASSEMBLYREF_NAME] = string_heap_insert (&assembly->sheap, "corlib");
-	values [MONO_ASSEMBLYREF_MAJOR_VERSION] = 0;
-	values [MONO_ASSEMBLYREF_MINOR_VERSION] = 0;
-	values [MONO_ASSEMBLYREF_BUILD_NUMBER] = 0;
-	values [MONO_ASSEMBLYREF_REV_NUMBER] = 0;
-	values [MONO_ASSEMBLYREF_FLAGS] = 0;
-	values [MONO_ASSEMBLYREF_PUBLIC_KEY] = 0;
-	values [MONO_ASSEMBLYREF_CULTURE] = 0;
-	values [MONO_ASSEMBLYREF_HASH_VALUE] = 0;
+	/* add all the custom attributes at the end, once all the indexes are stable */
+	mono_image_add_cattrs (assembly, 1, CUSTOM_ATTR_ASSEMBLY, assemblyb->cattrs);
+
+	if (assemblyb->modules) {
+		len = mono_array_length (assemblyb->modules);
+		for (i = 0; i < len; ++i)
+			module_add_cattrs (assembly, mono_array_get (assemblyb->modules, MonoReflectionModuleBuilder*, i));
+	}
 
+	if (assemblyb->resources) {
+		len = mono_array_length (assemblyb->resources);
+		for (i = 0; i < len; ++i)
+			assembly_add_resource (assembly, (MonoReflectionResource*)mono_array_addr (assemblyb->resources, MonoReflectionResource, i));
+	}
+	
+	/* fixup tokens */
+	mono_g_hash_table_foreach (assembly->token_fixups, (GHFunc)fixup_method, assembly);
+	
 	build_compressed_metadata (assembly);
 }
 
+/*
+ * mono_image_insert_string:
+ * @assembly: assembly builder object
+ * @str: a string
+ *
+ * Insert @str into the user string stream of @assembly.
+ */
 guint32
 mono_image_insert_string (MonoReflectionAssemblyBuilder *assembly, MonoString *str)
 {
-	guint32 index;
+	guint32 idx;
 	char buf [16];
 	char *b = buf;
 	
 	if (!assembly->dynamic_assembly)
 		mono_image_basic_init (assembly);
 	mono_metadata_encode_value (1 | (str->length * 2), b, &b);
-	index = mono_image_add_stream_data (&assembly->dynamic_assembly->us, buf, b-buf);
-	/* FIXME: ENOENDIAN */
-	mono_image_add_stream_data (&assembly->dynamic_assembly->us, (char*)mono_string_chars (str), str->length * 2);
+	idx = mono_image_add_stream_data (&assembly->dynamic_assembly->us, buf, b-buf);
+#if G_BYTE_ORDER != G_LITTLE_ENDIAN
+	{
+		char *swapped = g_malloc (2 * mono_string_length (str));
+		const char *p = (const char*)mono_string_chars (str);
+
+		swap_with_size (swapped, p, 2, mono_string_length (str));
+		mono_image_add_stream_data (&assembly->dynamic_assembly->us, swapped, str->length * 2);
+		g_free (swapped);
+	}
+#else
+	mono_image_add_stream_data (&assembly->dynamic_assembly->us, (const char*)mono_string_chars (str), str->length * 2);
+#endif
 	mono_image_add_stream_data (&assembly->dynamic_assembly->us, "", 1);
-	return MONO_TOKEN_STRING | index;
+	return MONO_TOKEN_STRING | idx;
 }
 
 /*
+ * mono_image_create_token:
+ * @assembly: a dynamic assembly
+ * @obj:
+ *
  * Get a token to insert in the IL code stream for the given MemberInfo.
- * obj can be:
+ * @obj can be one of:
  * 	ConstructorBuilder
  * 	MethodBuilder
  * 	FieldBuilder
@@ -1498,9 +2215,13 @@ mono_image_insert_string (MonoReflectionAssemblyBuilder *assembly, MonoString *s
 guint32
 mono_image_create_token (MonoDynamicAssembly *assembly, MonoObject *obj)
 {
-	MonoClass *klass = obj->vtable->klass;
+	MonoClass *klass;
 	guint32 token;
 
+	if (!obj)
+		g_error ("System.Array methods not yet supported");
+	
+	klass = obj->vtable->klass;
 	if (strcmp (klass->name, "MethodBuilder") == 0) {
 		MonoReflectionMethodBuilder *mb = (MonoReflectionMethodBuilder *)obj;
 		token = mb->table_idx | MONO_TOKEN_METHOD_DEF;
@@ -1539,42 +2260,138 @@ mono_image_create_token (MonoDynamicAssembly *assembly, MonoObject *obj)
 		/*g_print ("got token 0x%08x for %s\n", token, f->field->name);*/
 		return token;
 	}
+	if (strcmp (klass->name, "MonoArrayMethod") == 0) {
+		MonoReflectionArrayMethod *m = (MonoReflectionArrayMethod *)obj;
+		token = mono_image_get_array_token (assembly, m);
+		return token;
+	}
 	g_print ("requested token for %s\n", klass->name);
 	return 0;
 }
 
+typedef struct {
+	guint32 import_lookup_table;
+	guint32 timestamp;
+	guint32 forwarder;
+	guint32 name_rva;
+	guint32 import_address_table_rva;
+} MonoIDT;
+
+typedef struct {
+	guint32 name_rva;
+	guint32 flags;
+} MonoILT;
+
+/*
+ * mono_image_basic_ini:
+ * @assembly: an assembly builder object
+ *
+ * Create the MonoImage that represents the assembly builder and setup some
+ * of the helper hash table and the basic metadata streams.
+ */
 void
 mono_image_basic_init (MonoReflectionAssemblyBuilder *assemblyb)
 {
+	static const guchar entrycode [16] = {0xff, 0x25, 0};
 	MonoDynamicAssembly *assembly;
+	MonoImage *image;
 	int i;
 	
 	if (assemblyb->dynamic_assembly)
 		return;
 
+#if HAVE_BOEHM_GC
+	assembly = assemblyb->dynamic_assembly = GC_malloc (sizeof (MonoDynamicAssembly));
+#else
 	assembly = assemblyb->dynamic_assembly = g_new0 (MonoDynamicAssembly, 1);
+#endif
+
+	assemblyb->assembly.assembly = (MonoAssembly*)assembly;
+	assembly->token_fixups = mono_g_hash_table_new (g_direct_hash, g_direct_equal);
+	assembly->handleref = g_hash_table_new (g_direct_hash, g_direct_equal);
+	assembly->typeref = g_hash_table_new ((GHashFunc)mono_metadata_type_hash, (GCompareFunc)mono_metadata_type_equal);
 
 	string_heap_init (&assembly->sheap);
 	mono_image_add_stream_data (&assembly->us, "", 1);
 	mono_image_add_stream_data (&assembly->blob, "", 1);
+	/* import tables... */
+	mono_image_add_stream_data (&assembly->code, entrycode, sizeof (entrycode));
+	assembly->iat_offset = mono_image_add_stream_zero (&assembly->code, 8); /* two IAT entries */
+	assembly->idt_offset = mono_image_add_stream_zero (&assembly->code, 2 * sizeof (MonoIDT)); /* two IDT entries */
+	mono_image_add_stream_zero (&assembly->code, 2); /* flags for name entry */
+	assembly->imp_names_offset = mono_image_add_stream_data (&assembly->code, "_CorExeMain", 12);
+	mono_image_add_stream_data (&assembly->code, "mscoree.dll", 12);
+	assembly->ilt_offset = mono_image_add_stream_zero (&assembly->code, 8); /* two ILT entries */
+	stream_data_align (&assembly->code);
+
+	assembly->cli_header_offset = mono_image_add_stream_zero (&assembly->code, sizeof (MonoCLIHeader));
 
 	for (i=0; i < 64; ++i) {
 		assembly->tables [i].next_idx = 1;
 		assembly->tables [i].columns = table_sizes [i];
 	}
+
+	image = g_new0 (MonoImage, 1);
+	
+	/* keep in sync with image.c */
+	assembly->assembly.aname.name = image->name = mono_string_to_utf8 (assemblyb->name);
+	image->assembly_name = image->name; /* they may be different */
+
+	image->method_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
+	image->class_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
+	image->name_cache = g_hash_table_new (g_str_hash, g_str_equal);
+	image->array_cache = g_hash_table_new (g_direct_hash, g_direct_equal);
+
+	assembly->assembly.image = image;
 	
 }
 
-int
-mono_image_get_header (MonoReflectionAssemblyBuilder *assemblyb, char *buffer, int maxsize)
+static int
+calc_section_size (MonoDynamicAssembly *assembly)
 {
+	int nsections = 0;
+
+	/* alignment constraints */
+	assembly->code.index += 3;
+	assembly->code.index &= ~3;
+	assembly->meta_size += 3;
+	assembly->meta_size &= ~3;
+	assembly->resources.index += 3;
+	assembly->resources.index &= ~3;
+
+	assembly->sections [MONO_SECTION_TEXT].size = assembly->meta_size + assembly->code.index + assembly->resources.index;
+	assembly->sections [MONO_SECTION_TEXT].attrs = SECT_FLAGS_HAS_CODE | SECT_FLAGS_MEM_EXECUTE | SECT_FLAGS_MEM_READ;
+	nsections++;
+
+	assembly->sections [MONO_SECTION_RELOC].size = 12;
+	assembly->sections [MONO_SECTION_RELOC].attrs = SECT_FLAGS_MEM_READ | SECT_FLAGS_MEM_DISCARDABLE | SECT_FLAGS_HAS_INITIALIZED_DATA;
+	nsections++;
+
+	return nsections;
+}
+
+/*
+ * mono_image_create_pefile:
+ * @assemblyb: an assembly builder object
+ * 
+ * When we need to save an assembly, we first call this function that ensures the metadata 
+ * tables are built for all the modules in the assembly. This function creates the PE-COFF
+ * header, the image sections, the CLI header etc. all the data is written in
+ * assembly->pefile where it can be easily retrieved later in chunks.
+ */
+void
+mono_image_create_pefile (MonoReflectionAssemblyBuilder *assemblyb) {
 	MonoMSDOSHeader *msdos;
 	MonoDotNetHeader *header;
 	MonoSectionTable *section;
 	MonoCLIHeader *cli_header;
-	guint32 header_size =  TEXT_OFFSET + CLI_H_SIZE;
+	guint32 size, image_size, virtual_base, text_offset;
+	guint32 header_start, section_start, file_offset, virtual_offset;
 	MonoDynamicAssembly *assembly;
-
+	MonoDynamicStream *pefile;
+	int i, nsections;
+	guint32 *rva;
+	guint16 *data16;
 	static const unsigned char msheader[] = {
 		0x4d, 0x5a, 0x90, 0x00, 0x03, 0x00, 0x00, 0x00,  0x04, 0x00, 0x00, 0x00, 0xff, 0xff, 0x00, 0x00,
 		0xb8, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,  0x40, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
@@ -1586,134 +2403,292 @@ mono_image_get_header (MonoReflectionAssemblyBuilder *assemblyb, char *buffer, i
 		0x6d, 0x6f, 0x64, 0x65, 0x2e, 0x0d, 0x0d, 0x0a,  0x24, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00
 	};
 
-	if (maxsize < header_size)
-		return -1;
-
 	mono_image_basic_init (assemblyb);
 	assembly = assemblyb->dynamic_assembly;
 
+	/* already created */
+	if (assembly->pefile.index)
+		return;
+	
 	mono_image_build_metadata (assemblyb);
+	nsections = calc_section_size (assembly);
+
+	pefile = &assembly->pefile;
+
+	/* The DOS header and stub */
+	g_assert (sizeof (MonoMSDOSHeader) == sizeof (msheader));
+	mono_image_add_stream_data (pefile, msheader, sizeof (msheader));
+
+	/* the dotnet header */
+	header_start = mono_image_add_stream_zero (pefile, sizeof (MonoDotNetHeader));
+
+	/* the section tables */
+	section_start = mono_image_add_stream_zero (pefile, sizeof (MonoSectionTable) * nsections);
+
+	file_offset = section_start + sizeof (MonoSectionTable) * nsections;
+	virtual_offset = VIRT_ALIGN;
+	image_size = 0;
+
+	for (i = 0; i < MONO_SECTION_MAX; ++i) {
+		if (!assembly->sections [i].size)
+			continue;
+		/* align offsets */
+		file_offset += FILE_ALIGN - 1;
+		file_offset &= ~(FILE_ALIGN - 1);
+		virtual_offset += VIRT_ALIGN - 1;
+		virtual_offset &= ~(VIRT_ALIGN - 1);
+
+		assembly->sections [i].offset = file_offset;
+		assembly->sections [i].rva = virtual_offset;
+
+		file_offset += assembly->sections [i].size;
+		virtual_offset += assembly->sections [i].size;
+		image_size += (assembly->sections [i].size + VIRT_ALIGN - 1) & ~(VIRT_ALIGN - 1);
+	}
 
-	memset (buffer, 0, header_size);
-	memcpy (buffer, msheader, sizeof (MonoMSDOSHeader));
+	file_offset += FILE_ALIGN - 1;
+	file_offset &= ~(FILE_ALIGN - 1);
+	mono_image_add_stream_zero (pefile, file_offset - pefile->index);
 
-	msdos = (MonoMSDOSHeader *)buffer;
-	header = (MonoDotNetHeader *)(buffer + sizeof (MonoMSDOSHeader));
-	section = (MonoSectionTable*) (buffer + sizeof (MonoMSDOSHeader) + sizeof (MonoDotNetHeader));
+	image_size += section_start + sizeof (MonoSectionTable) * nsections;
 
-	/* FIXME: ENDIAN problem: byteswap as needed */
-	msdos->pe_offset = sizeof (MonoMSDOSHeader);
+	/* back-patch info */
+	msdos = (MonoMSDOSHeader*)pefile->data;
+	msdos->nlast_page = GUINT16_FROM_LE (file_offset & (512 - 1));
+	msdos->npages = GUINT16_FROM_LE ((file_offset + (512 - 1)) / 512);
+	msdos->pe_offset = GUINT32_FROM_LE (sizeof (MonoMSDOSHeader));
 
+	header = (MonoDotNetHeader*)(pefile->data + header_start);
 	header->pesig [0] = 'P';
 	header->pesig [1] = 'E';
-	header->pesig [2] = header->pesig [3] = 0;
-
-	header->coff.coff_machine = 0x14c;
-	header->coff.coff_sections = 1; /* only .text supported now */
-	header->coff.coff_time = time (NULL);
-	header->coff.coff_opt_header_size = sizeof (MonoDotNetHeader) - sizeof (MonoCOFFHeader) - 4;
+	
+	header->coff.coff_machine = GUINT16_FROM_LE (0x14c);
+	header->coff.coff_sections = GUINT16_FROM_LE (nsections);
+	header->coff.coff_time = GUINT32_FROM_LE (time (NULL));
+	header->coff.coff_opt_header_size = GUINT16_FROM_LE (sizeof (MonoDotNetHeader) - sizeof (MonoCOFFHeader) - 4);
 	/* it's an exe */
-	header->coff.coff_attributes = 0x010e;
-	/* it's a dll */
-	//header->coff.coff_attributes = 0x210e;
-	header->pe.pe_magic = 0x10B;
-	header->pe.pe_major = 6;
-	header->pe.pe_minor = 0;
-	/* need to set: pe_code_size pe_data_size pe_rva_entry_point pe_rva_code_base pe_rva_data_base */
-
-	header->nt.pe_image_base = 0x400000;
-	header->nt.pe_section_align = 8192;
-	header->nt.pe_file_alignment = FILE_ALIGN;
-	header->nt.pe_os_major = 4;
-	header->nt.pe_os_minor = 0;
-	header->nt.pe_subsys_major = 4;
-	/* need to set pe_image_size, pe_header_size */
-	header->nt.pe_subsys_required = 3; /* 3 -> cmdline app, 2 -> GUI app */
-	header->nt.pe_stack_reserve = 0x00100000;
-	header->nt.pe_stack_commit = 0x00001000;
-	header->nt.pe_heap_reserve = 0x00100000;
-	header->nt.pe_heap_commit = 0x00001000;
-	header->nt.pe_loader_flags = 1;
-	header->nt.pe_data_dir_count = 16;
-
-#if 0
-	/* set: */
-	header->datadir.pe_import_table
-	pe_resource_table
-	pe_reloc_table
-	pe_iat	
-#endif
-	header->datadir.pe_cli_header.size = CLI_H_SIZE;
-	header->datadir.pe_cli_header.rva = assembly->text_rva; /* we put it always at the beginning */
-
-	/* Write section tables */
-	strcpy (section->st_name, ".text");
-	section->st_virtual_address = START_TEXT_RVA;
-	section->st_virtual_size = assembly->meta_size +  assembly->code.index;
-	section->st_raw_data_size = section->st_virtual_size + (FILE_ALIGN - 1);
-	section->st_raw_data_size &= ~(FILE_ALIGN - 1);
-	section->st_raw_data_ptr = TEXT_OFFSET;
-	section->st_flags = SECT_FLAGS_HAS_CODE | SECT_FLAGS_MEM_EXECUTE | SECT_FLAGS_MEM_READ;
+	header->coff.coff_attributes = GUINT16_FROM_LE (0x010e);
+	/* FIXME: it's a dll */
+	/*header->coff.coff_attributes = GUINT16_FROM_LE (0x210e); */
 
-	/* 
-	 * align: build_compressed_metadata () assumes metadata is aligned 
-	 * see below:
-	 * cli_header->ch_metadata.rva = assembly->text_rva + assembly->code.index + CLI_H_SIZE;
-	 */
-	assembly->code.index += 3;
-	assembly->code.index &= ~3;
+	virtual_base = 0x400000; /* FIXME: 0x10000000 if a DLL */
 
-	/*
-	 * Write the MonoCLIHeader header 
-	 */
-	cli_header = (MonoCLIHeader*)(buffer + TEXT_OFFSET);
-	cli_header->ch_size = CLI_H_SIZE;
-	cli_header->ch_runtime_major = 2;
-	cli_header->ch_flags = CLI_FLAGS_ILONLY;
+	header->pe.pe_magic = GUINT16_FROM_LE (0x10B);
+	header->pe.pe_major = 6;
+	header->pe.pe_minor = 0;
+	size = assembly->sections [MONO_SECTION_TEXT].size;
+	size += FILE_ALIGN - 1;
+	size &= ~(FILE_ALIGN - 1);
+	header->pe.pe_code_size = size;
+	size = assembly->sections [MONO_SECTION_RSRC].size;
+	size += FILE_ALIGN - 1;
+	size &= ~(FILE_ALIGN - 1);
+	header->pe.pe_data_size = size;
+	g_assert (START_TEXT_RVA == assembly->sections [MONO_SECTION_TEXT].rva);
+	header->pe.pe_rva_code_base = assembly->sections [MONO_SECTION_TEXT].rva;
+	header->pe.pe_rva_data_base = assembly->sections [MONO_SECTION_RSRC].rva;
+	/* pe_rva_entry_point always at the beginning of the text section */
+	header->pe.pe_rva_entry_point = assembly->sections [MONO_SECTION_TEXT].rva;
+
+	header->nt.pe_image_base = GUINT32_FROM_LE (virtual_base);
+	header->nt.pe_section_align = GUINT32_FROM_LE (VIRT_ALIGN);
+	header->nt.pe_file_alignment = GUINT32_FROM_LE (FILE_ALIGN);
+	header->nt.pe_os_major = GUINT16_FROM_LE (4);
+	header->nt.pe_os_minor = GUINT16_FROM_LE (0);
+	header->nt.pe_subsys_major = GUINT16_FROM_LE (4);
+	size = section_start;
+	size += FILE_ALIGN - 1;
+	size &= ~(FILE_ALIGN - 1);
+	header->nt.pe_header_size = GUINT32_FROM_LE (size);
+	size = image_size;
+	size += VIRT_ALIGN - 1;
+	size &= ~(VIRT_ALIGN - 1);
+	header->nt.pe_image_size = GUINT32_FROM_LE (size);
+	header->nt.pe_subsys_required = GUINT16_FROM_LE (3); /* 3 -> cmdline app, 2 -> GUI app */
+	header->nt.pe_stack_reserve = GUINT32_FROM_LE (0x00100000);
+	header->nt.pe_stack_commit = GUINT32_FROM_LE (0x00001000);
+	header->nt.pe_heap_reserve = GUINT32_FROM_LE (0x00100000);
+	header->nt.pe_heap_commit = GUINT32_FROM_LE (0x00001000);
+	header->nt.pe_loader_flags = GUINT32_FROM_LE (0);
+	header->nt.pe_data_dir_count = GUINT32_FROM_LE (16);
+
+	/* fill data directory entries */
+
+	header->datadir.pe_resource_table.size = GUINT32_FROM_LE (assembly->sections [MONO_SECTION_RSRC].size);
+	header->datadir.pe_resource_table.rva = GUINT32_FROM_LE (assembly->sections [MONO_SECTION_RSRC].rva);
+
+	header->datadir.pe_reloc_table.size = GUINT32_FROM_LE (assembly->sections [MONO_SECTION_RELOC].size);
+	header->datadir.pe_reloc_table.rva = GUINT32_FROM_LE (assembly->sections [MONO_SECTION_RELOC].rva);
+
+	header->datadir.pe_cli_header.size = GUINT32_FROM_LE (72);
+	header->datadir.pe_cli_header.rva = GUINT32_FROM_LE (assembly->text_rva + assembly->cli_header_offset);
+	header->datadir.pe_iat.size = GUINT32_FROM_LE (8);
+	header->datadir.pe_iat.rva = GUINT32_FROM_LE (assembly->text_rva + assembly->iat_offset);
+	/* patch imported function RVA name */
+	rva = (guint32*)(assembly->code.data + assembly->iat_offset);
+	*rva = GUINT32_FROM_LE (assembly->text_rva + assembly->imp_names_offset);
+
+	/* the import table */
+	header->datadir.pe_import_table.size = GUINT32_FROM_LE (79); /* FIXME: magic number? */
+	header->datadir.pe_import_table.rva = GUINT32_FROM_LE (assembly->text_rva + assembly->idt_offset);
+	/* patch imported dll RVA name and other entries in the dir */
+	rva = (guint32*)(assembly->code.data + assembly->idt_offset + G_STRUCT_OFFSET (MonoIDT, name_rva));
+	*rva = GUINT32_FROM_LE (assembly->text_rva + assembly->imp_names_offset + 12); /* 12 is strlen+1 of func name */
+	rva = (guint32*)(assembly->code.data + assembly->idt_offset + G_STRUCT_OFFSET (MonoIDT, import_address_table_rva));
+	*rva = GUINT32_FROM_LE (assembly->text_rva + assembly->iat_offset);
+	rva = (guint32*)(assembly->code.data + assembly->idt_offset + G_STRUCT_OFFSET (MonoIDT, import_lookup_table));
+	*rva = GUINT32_FROM_LE (assembly->text_rva + assembly->ilt_offset);
+
+	rva = (guint32*)(assembly->code.data + assembly->ilt_offset);
+	*rva = GUINT32_FROM_LE (assembly->text_rva + assembly->imp_names_offset - 2);
+
+	/* the CLI header info */
+	cli_header = (MonoCLIHeader*)(assembly->code.data + assembly->cli_header_offset);
+	cli_header->ch_size = GUINT32_FROM_LE (72);
+	cli_header->ch_runtime_major = GUINT16_FROM_LE (2);
+	cli_header->ch_flags = GUINT32_FROM_LE (CLI_FLAGS_ILONLY);
 	if (assemblyb->entry_point) 
-		cli_header->ch_entry_point = assemblyb->entry_point->table_idx | MONO_TOKEN_METHOD_DEF;
+		cli_header->ch_entry_point = GUINT32_FROM_LE (assemblyb->entry_point->table_idx | MONO_TOKEN_METHOD_DEF);
 	else
-		cli_header->ch_entry_point = 0;
-	cli_header->ch_metadata.rva = assembly->text_rva + assembly->code.index + CLI_H_SIZE;
-	cli_header->ch_metadata.size = assembly->meta_size;
+		cli_header->ch_entry_point = GUINT32_FROM_LE (0);
+	/* The embedded managed resources */
+	text_offset = assembly->text_rva + assembly->code.index;
+	cli_header->ch_resources.rva = GUINT32_FROM_LE (text_offset);
+	cli_header->ch_resources.size = GUINT32_FROM_LE (assembly->resources.index);
+	text_offset += assembly->resources.index;
+	cli_header->ch_metadata.rva = GUINT32_FROM_LE (text_offset);
+	cli_header->ch_metadata.size = GUINT32_FROM_LE (assembly->meta_size);
+
+	/* write the section tables and section content */
+	section = (MonoSectionTable*)(pefile->data + section_start);
+	for (i = 0; i < MONO_SECTION_MAX; ++i) {
+		static const char *section_names [] = {
+			".text", ".rsrc", ".reloc"
+		};
+		if (!assembly->sections [i].size)
+			continue;
+		strcpy (section->st_name, section_names [i]);
+		/*g_print ("output section %s (%d), size: %d\n", section->st_name, i, assembly->sections [i].size);*/
+		section->st_virtual_address = GUINT32_FROM_LE (assembly->sections [i].rva);
+		section->st_virtual_size = GUINT32_FROM_LE (assembly->sections [i].size);
+		section->st_raw_data_size = GUINT32_FROM_LE (GUINT32_TO_LE (section->st_virtual_size) + (FILE_ALIGN - 1));
+		section->st_raw_data_size &= GUINT32_FROM_LE (~(FILE_ALIGN - 1));
+		section->st_raw_data_ptr = GUINT32_FROM_LE (assembly->sections [i].offset);
+		section->st_flags = GUINT32_FROM_LE (assembly->sections [i].attrs);
+		switch (i) {
+		case MONO_SECTION_TEXT:
+			/* patch entry point */
+			rva = (guint32*)(assembly->code.data + 2);
+			*rva = GUINT32_FROM_LE (virtual_base + assembly->text_rva + assembly->iat_offset);
+			text_offset = assembly->sections [i].offset;
+			memcpy (pefile->data + text_offset, assembly->code.data, assembly->code.index);
+			text_offset += assembly->code.index;
+			memcpy (pefile->data + text_offset, assembly->resources.data, assembly->resources.index);
+			text_offset += assembly->resources.index;
+			memcpy (pefile->data + text_offset, assembly->assembly.image->raw_metadata, assembly->meta_size);
+			break;
+		case MONO_SECTION_RELOC:
+			rva = (guint32*)(pefile->data + assembly->sections [i].offset);
+			*rva = GUINT32_FROM_LE (assembly->text_rva);
+			++rva;
+			*rva = GUINT32_FROM_LE (12);
+			++rva;
+			data16 = (guint16*)rva;
+			/* 
+			 * the entrypoint is always at the start of the text section 
+			 * 3 is IMAGE_REL_BASED_HIGHLOW
+			 * 2 is patch_size_rva - text_rva
+			 */
+			*data16 = GUINT16_FROM_LE ((3 << 12) + (2));
+			data16++;
+			*data16 = 0; /* terminate */
+			break;
+		case MONO_SECTION_RSRC:
+		default:
+			g_assert_not_reached ();
+		}
+		section++;
+	}
 	
-	return header_size;
+	/* check that the file is properly padded */
+#if 0
+	{
+		FILE *f = fopen ("mypetest.exe", "w");
+		fwrite (pefile->data, pefile->index, 1, f);
+		fclose (f);
+	}
+#endif
 }
 
 /*
  * We need to return always the same object for MethodInfo, FieldInfo etc..
+ * but we need to consider the reflected type.
  * type uses a different hash, since it uses custom hash/equal functions.
  */
-static GHashTable *object_cache = NULL;
-static GHashTable *type_cache = NULL;
 
-#define CHECK_OBJECT(t,p)	\
+typedef struct {
+	gpointer item;
+	MonoClass *refclass;
+} ReflectedEntry;
+
+static gboolean
+reflected_equal (gconstpointer a, gconstpointer b) {
+	const ReflectedEntry *ea = a;
+	const ReflectedEntry *eb = b;
+
+	return (ea->item == eb->item) && (ea->refclass == eb->refclass);
+}
+
+static guint
+reflected_hash (gconstpointer a) {
+	const ReflectedEntry *ea = a;
+	return GPOINTER_TO_UINT (ea->item);
+}
+
+#define CHECK_OBJECT(t,p,k)	\
 	do {	\
 		t _obj;	\
-		if (!object_cache)	\
-			object_cache = g_hash_table_new (g_direct_hash, g_direct_equal);	\
-		if ((_obj = g_hash_table_lookup (object_cache, (p))))	\
+		ReflectedEntry e; 	\
+		e.item = (p);	\
+		e.refclass = (k);	\
+		mono_domain_lock (domain);	\
+		if (!domain->refobject_hash)	\
+			domain->refobject_hash = mono_g_hash_table_new (reflected_hash, reflected_equal);	\
+		if ((_obj = mono_g_hash_table_lookup (domain->refobject_hash, &e))) {	\
+			mono_domain_unlock (domain);	\
 			return _obj;	\
+		}	\
 	} while (0)
 
-#define CACHE_OBJECT(p,o)	\
+#define CACHE_OBJECT(p,o,k)	\
 	do {	\
-		g_hash_table_insert (object_cache, p,o);	\
+		ReflectedEntry *e = mono_mempool_alloc (domain->mp, sizeof (ReflectedEntry)); 	\
+		e->item = (p);	\
+		e->refclass = (k);	\
+		mono_g_hash_table_insert (domain->refobject_hash, e,o);	\
+		mono_domain_unlock (domain);	\
 	} while (0)
-	
+
+/*
+ * mono_assembly_get_object:
+ * @domain: an app domain
+ * @assembly: an assembly
+ *
+ * Return an System.Reflection.Assembly object representing the MonoAssembly @assembly.
+ */
 MonoReflectionAssembly*
 mono_assembly_get_object (MonoDomain *domain, MonoAssembly *assembly)
 {
 	static MonoClass *System_Reflection_Assembly;
 	MonoReflectionAssembly *res;
 	
-	CHECK_OBJECT (MonoReflectionAssembly *, assembly);
+	CHECK_OBJECT (MonoReflectionAssembly *, assembly, NULL);
 	if (!System_Reflection_Assembly)
 		System_Reflection_Assembly = mono_class_from_name (
 			mono_defaults.corlib, "System.Reflection", "Assembly");
 	res = (MonoReflectionAssembly *)mono_object_new (domain, System_Reflection_Assembly);
 	res->assembly = assembly;
-	CACHE_OBJECT (assembly, res);
+	CACHE_OBJECT (assembly, res, NULL);
 	return res;
 }
 
@@ -1749,6 +2724,10 @@ mymono_metadata_type_equal (MonoType *t1, MonoType *t2)
 	case MONO_TYPE_PTR:
 	case MONO_TYPE_SZARRAY:
 		return mymono_metadata_type_equal (t1->data.type, t2->data.type);
+	case MONO_TYPE_ARRAY:
+		if (t1->data.array->rank != t2->data.array->rank)
+			return FALSE;
+		return mymono_metadata_type_equal (t1->data.array->type, t2->data.array->type);
 	default:
 		g_error ("implement type compare for %0x!", t1->type);
 		return FALSE;
@@ -1777,34 +2756,65 @@ mymono_metadata_type_hash (MonoType *t1)
 	return hash;
 }
 
+/*
+ * mono_type_get_object:
+ * @domain: an app domain
+ * @type: a type
+ *
+ * Return an System.MonoType object representing the type @type.
+ */
 MonoReflectionType*
 mono_type_get_object (MonoDomain *domain, MonoType *type)
 {
 	MonoReflectionType *res;
+	MonoClass *klass = mono_class_from_mono_type (type);
 
-	if (!type_cache)
-		type_cache = g_hash_table_new ((GHashFunc)mymono_metadata_type_hash, 
+	mono_domain_lock (domain);
+	if (!domain->type_hash)
+		domain->type_hash = mono_g_hash_table_new ((GHashFunc)mymono_metadata_type_hash, 
 				(GCompareFunc)mymono_metadata_type_equal);
-	if ((res = g_hash_table_lookup (type_cache, type)))
+	if ((res = mono_g_hash_table_lookup (domain->type_hash, type))) {
+		mono_domain_unlock (domain);
 		return res;
+	}
+	if (klass->reflection_info) {
+		/* should this be considered an error condition? */
+		if (!type->byref) {
+			mono_domain_unlock (domain);
+			return klass->reflection_info;
+		}
+	}
+	mono_class_init (klass);
 	res = (MonoReflectionType *)mono_object_new (domain, mono_defaults.monotype_class);
 	res->type = type;
-	g_hash_table_insert (type_cache, type, res);
+	mono_g_hash_table_insert (domain->type_hash, type, res);
+	mono_domain_unlock (domain);
 	return res;
 }
 
+/*
+ * mono_method_get_object:
+ * @domain: an app domain
+ * @method: a method
+ * @refclass: the reflected type (can be NULL)
+ *
+ * Return an System.Reflection.MonoMethod object representing the method @method.
+ */
 MonoReflectionMethod*
-mono_method_get_object (MonoDomain *domain, MonoMethod *method)
+mono_method_get_object (MonoDomain *domain, MonoMethod *method, MonoClass *refclass)
 {
 	/*
 	 * We use the same C representation for methods and constructors, but the type 
 	 * name in C# is different.
 	 */
-	char *cname;
+	const char *cname;
 	MonoClass *klass;
 	MonoReflectionMethod *ret;
 
-	CHECK_OBJECT (MonoReflectionMethod *, method);
+	if (!refclass)
+		refclass = method->klass;
+
+	CHECK_OBJECT (MonoReflectionMethod *, method, refclass);
 	if (*method->name == '.' && (strcmp (method->name, ".ctor") == 0 || strcmp (method->name, ".cctor") == 0))
 		cname = "MonoCMethod";
 	else
@@ -1813,40 +2823,92 @@ mono_method_get_object (MonoDomain *domain, MonoMethod *method)
 
 	ret = (MonoReflectionMethod*)mono_object_new (domain, klass);
 	ret->method = method;
-	CACHE_OBJECT (method, ret);
+	ret->name = mono_string_new (domain, method->name);
+	ret->reftype = mono_type_get_object (domain, &refclass->byval_arg);
+	CACHE_OBJECT (method, ret, refclass);
 	return ret;
 }
 
+/*
+ * mono_field_get_object:
+ * @domain: an app domain
+ * @klass: a type
+ * @field: a field
+ *
+ * Return an System.Reflection.MonoField object representing the field @field
+ * in class @klass.
+ */
 MonoReflectionField*
 mono_field_get_object (MonoDomain *domain, MonoClass *klass, MonoClassField *field)
 {
 	MonoReflectionField *res;
 	MonoClass *oklass;
 
-	CHECK_OBJECT (MonoReflectionField *, field);
+	CHECK_OBJECT (MonoReflectionField *, field, klass);
 	oklass = mono_class_from_name (mono_defaults.corlib, "System.Reflection", "MonoField");
 	res = (MonoReflectionField *)mono_object_new (domain, oklass);
 	res->klass = klass;
 	res->field = field;
-	CACHE_OBJECT (field, res);
+	CACHE_OBJECT (field, res, klass);
 	return res;
 }
 
+/*
+ * mono_property_get_object:
+ * @domain: an app domain
+ * @klass: a type
+ * @property: a property
+ *
+ * Return an System.Reflection.MonoProperty object representing the property @property
+ * in class @klass.
+ */
 MonoReflectionProperty*
 mono_property_get_object (MonoDomain *domain, MonoClass *klass, MonoProperty *property)
 {
 	MonoReflectionProperty *res;
 	MonoClass *oklass;
 
-	CHECK_OBJECT (MonoReflectionProperty *, property);
+	CHECK_OBJECT (MonoReflectionProperty *, property, klass);
 	oklass = mono_class_from_name (mono_defaults.corlib, "System.Reflection", "MonoProperty");
 	res = (MonoReflectionProperty *)mono_object_new (domain, oklass);
 	res->klass = klass;
 	res->property = property;
-	CACHE_OBJECT (property, res);
+	CACHE_OBJECT (property, res, klass);
+	return res;
+}
+
+/*
+ * mono_event_get_object:
+ * @domain: an app domain
+ * @klass: a type
+ * @event: a event
+ *
+ * Return an System.Reflection.MonoEvent object representing the event @event
+ * in class @klass.
+ */
+MonoReflectionEvent*
+mono_event_get_object (MonoDomain *domain, MonoClass *klass, MonoEvent *event)
+{
+	MonoReflectionEvent *res;
+	MonoClass *oklass;
+
+	CHECK_OBJECT (MonoReflectionEvent *, event, klass);
+	oklass = mono_class_from_name (mono_defaults.corlib, "System.Reflection", "MonoEvent");
+	res = (MonoReflectionEvent *)mono_object_new (domain, oklass);
+	res->klass = klass;
+	res->event = event;
+	CACHE_OBJECT (event, res, klass);
 	return res;
 }
 
+/*
+ * mono_param_get_objects:
+ * @domain: an app domain
+ * @method: a method
+ *
+ * Return an System.Reflection.ParameterInfo array object representing the parameters
+ * in the method @method.
+ */
 MonoReflectionParameter**
 mono_param_get_objects (MonoDomain *domain, MonoMethod *method)
 {
@@ -1859,16 +2921,20 @@ mono_param_get_objects (MonoDomain *domain, MonoMethod *method)
 	if (!method->signature->param_count)
 		return NULL;
 
-	member = mono_method_get_object (domain, method);
+	member = mono_method_get_object (domain, method, NULL);
 	names = g_new (char *, method->signature->param_count);
 	mono_method_get_param_names (method, (const char **) names);
 	
 	/* Note: the cache is based on the address of the signature into the method
 	 * since we already cache MethodInfos with the method as keys.
 	 */
-	CHECK_OBJECT (MonoReflectionParameter**, &(method->signature));
+	CHECK_OBJECT (MonoReflectionParameter**, &(method->signature), NULL);
 	oklass = mono_class_from_name (mono_defaults.corlib, "System.Reflection", "ParameterInfo");
+#if HAVE_BOEHM_GC
+	res = GC_malloc (sizeof (MonoReflectionParameter*) * method->signature->param_count);
+#else
 	res = g_new0 (MonoReflectionParameter*, method->signature->param_count);
+#endif
 	for (i = 0; i < method->signature->param_count; ++i) {
 		res [i] = (MonoReflectionParameter *)mono_object_new (domain, oklass);
 		res [i]->ClassImpl = mono_type_get_object (domain, method->signature->params [i]);
@@ -1879,46 +2945,142 @@ mono_param_get_objects (MonoDomain *domain, MonoMethod *method)
 		res [i]->AttrsImpl = method->signature->params [i]->attrs;
 	}
 	g_free (names);
-	CACHE_OBJECT (&(method->signature), res);
+	CACHE_OBJECT (&(method->signature), res, NULL);
 	return res;
 }
 
+static int
+assembly_name_to_aname (MonoAssemblyName *assembly, char *p) {
+	int found_sep;
+	char *s;
+
+	memset (assembly, 0, sizeof (MonoAssemblyName));
+	assembly->name = p;
+	assembly->culture = "";
+	
+	while (*p && (isalnum (*p) || *p == '.'))
+		p++;
+	found_sep = 0;
+	while (*p == ' ' || *p == ',') {
+		*p++ = 0;
+		found_sep = 1;
+		continue;
+	}
+	/* failed */
+	if (!found_sep)
+		return 1;
+	while (*p) {
+		if (*p == 'V' && strncmp (p, "Version=", 8) == 0) {
+			p += 8;
+			assembly->major = strtoul (p, &s, 10);
+			if (s == p || *s != '.')
+				return 1;
+			p = ++s;
+			assembly->minor = strtoul (p, &s, 10);
+			if (s == p || *s != '.')
+				return 1;
+			p = ++s;
+			assembly->build = strtoul (p, &s, 10);
+			if (s == p || *s != '.')
+				return 1;
+			p = ++s;
+			assembly->revision = strtoul (p, &s, 10);
+			if (s == p)
+				return 1;
+		} else if (*p == 'C' && strncmp (p, "Culture=", 8) == 0) {
+			p += 8;
+			if (strncmp (p, "neutral", 7) == 0) {
+				assembly->culture = "";
+				p += 7;
+			} else {
+				assembly->culture = p;
+				while (*p && *p != ',') {
+					p++;
+				}
+			}
+		} else if (*p == 'P' && strncmp (p, "PublicKeyToken=", 15) == 0) {
+			p += 15;
+			s = p;
+			while (*s && isxdigit (*s)) {
+				*s = tolower (*s);
+				s++;
+			}
+			assembly->hash_len = s - p;
+			if (!(s-p) || ((s-p) & 1))
+				return 1;
+			assembly->hash_value = s = p;
+			while (*s && isxdigit (*s)) {
+				int val;
+				val = *s >= '0' && *s <= '9'? *s - '0': *s - 'a' + 10;
+				s++;
+				*p = val << 4;
+				*p |= *s >= '0' && *s <= '9'? *s - '0': *s - 'a' + 10;
+				p++;
+			}
+			p = s;
+		} else {
+			return 1;
+		}
+		found_sep = 0;
+		while (*p == ' ' || *p == ',') {
+			*p++ = 0;
+			found_sep = 1;
+			continue;
+		}
+		/* failed */
+		if (!found_sep)
+			return 1;
+	}
+
+	return 0;
+}
+
 /*
+ * mono_reflection_parse_type:
+ * @name: type name
+ *
  * Parse a type name as accepted by the GetType () method and output the info
  * extracted in the info structure.
  * the name param will be mangled, so, make a copy before passing it to this function.
  * The fields in info will be valid until the memory pointed to by name is valid.
  * Returns 0 on parse error.
+ * See also mono_type_get_name () below.
  */
 int
 mono_reflection_parse_type (char *name, MonoTypeNameParse *info) {
 
-	char *start, *p, *w, *last_point;
+	char *start, *p, *w, *last_point, *startn;
 	int in_modifiers = 0;
+	int isbyref = 0, rank;
 
 	start = p = w = name;
 
-	info->name = info->name_space = info->assembly = NULL;
-	info->nest_name = info->nest_name_space = NULL;
-	info->rank = info->isbyref = info->ispointer = 0;
+	memset (&info->assembly, 0, sizeof (MonoAssemblyName));
+	info->name = info->name_space = NULL;
+	info->nested = NULL;
+	info->modifiers = NULL;
 
+	/* last_point separates the namespace from the name */
 	last_point = NULL;
 
 	while (*p) {
 		switch (*p) {
 		case '+':
+			*p = 0; /* NULL terminate the name */
+			startn = p + 1;
 			/* we have parsed the nesting namespace + name */
+			if (info->name) {
+				info->nested = g_list_append (info->nested, startn);
+				break;
+			}
 			if (last_point) {
-				info->nest_name_space = start;
+				info->name_space = start;
 				*last_point = 0;
-				info->nest_name = last_point + 1;
+				info->name = last_point + 1;
 			} else {
-				info->nest_name_space = "";
-				info->nest_name = start;
+				info->name_space = (char *)"";
+				info->name = start;
 			}
-			*p = 0; /* NULL terminate */
-			last_point = NULL;
-			start = p + 1;
 			break;
 		case '.':
 			last_point = w;
@@ -1940,37 +3102,46 @@ mono_reflection_parse_type (char *name, MonoTypeNameParse *info) {
 		*w++ = *p++;
 	}
 	
-	if (last_point) {
-		info->name_space = start;
-		*last_point = 0;
-		info->name = last_point + 1;
+	if (info->name) {
+		info->nested = g_list_append (info->nested, startn);
 	} else {
-		info->name_space = "";
-		info->name = start;
+		if (last_point) {
+			info->name_space = start;
+			*last_point = 0;
+			info->name = last_point + 1;
+		} else {
+			info->name_space = (char *)"";
+			info->name = start;
+		}
 	}
-	/* FIXME: we don't mainatin an order for byref, pointer and array... */
 	while (*p) {
 		switch (*p) {
 		case '&':
-			info->isbyref = 1;
+			if (isbyref) /* only one level allowed by the spec */
+				return 0;
+			isbyref = 1;
+			info->modifiers = g_list_append (info->modifiers, GUINT_TO_POINTER (0));
 			*p++ = 0;
 			break;
 		case '*':
-			info->ispointer = 1;
+			info->modifiers = g_list_append (info->modifiers, GUINT_TO_POINTER (-1));
 			*p++ = 0;
 			break;
 		case '[':
-			info->rank = 1;
+			rank = 1;
 			*p++ = 0;
 			while (*p) {
-				if (*p == ',')
-					info->rank++;
 				if (*p == ']')
 					break;
+				if (*p == ',')
+					rank++;
+				else if (*p != '*') /* '*' means unknown lower bound */
+					return 0;
 				++p;
 			}
 			if (*p++ != ']')
 				return 0;
+			info->modifiers = g_list_append (info->modifiers, GUINT_TO_POINTER (rank));
 			break;
 		case ',':
 			*p++ = 0;
@@ -1983,121 +3154,344 @@ mono_reflection_parse_type (char *name, MonoTypeNameParse *info) {
 			}
 			if (!*p)
 				return 0; /* missing assembly name */
-			info->assembly = p;
+			if (!assembly_name_to_aname (&info->assembly, p))
+				return 0;
 			break;
 		default:
 			break;
 		}
+		if (info->assembly.name)
+			break;
 	}
 	*w = 0; /* terminate class name */
 	if (!info->name || !*info->name)
 		return 0;
-	if (info->nest_name && !*info->nest_name)
-		return 0;
 	/* add other consistency checks */
 	return 1;
 }
 
-static MonoObject*
-dummy_runtime_invoke (MonoMethod *method, void *obj, void **params)
+static void
+mono_type_get_name_recurse (MonoType *type, GString *str)
 {
-	g_error ("runtime invoke called on uninitialized runtime");
-	return NULL;
+	MonoClass *klass;
+	
+	switch (type->type) {
+	case MONO_TYPE_ARRAY: {
+		int i, rank = type->data.array->rank;
+
+		mono_type_get_name_recurse (type->data.array->type, str);
+		g_string_append_c (str, '[');
+		for (i = 1; i < rank; i++)
+			g_string_append_c (str, ',');
+		g_string_append_c (str, ']');
+		break;
+	}
+	case MONO_TYPE_SZARRAY:
+		mono_type_get_name_recurse (type->data.type, str);
+		g_string_append (str, "[]");
+		break;
+	case MONO_TYPE_PTR:
+		mono_type_get_name_recurse (type->data.type, str);
+		g_string_append_c (str, '*');
+		break;
+	default:
+		klass = mono_class_from_mono_type (type);
+		if (klass->nested_in) {
+			mono_type_get_name_recurse (&klass->nested_in->byval_arg, str);
+			g_string_append_c (str, '+');
+		}
+		if (*klass->name_space) {
+			g_string_append (str, klass->name_space);
+			g_string_append_c (str, '.');
+		}
+		g_string_append (str, klass->name);
+		break;
+	}
 }
 
-MonoInvokeFunc mono_default_runtime_invoke = dummy_runtime_invoke;
+/*
+ * mono_type_get_name:
+ * @type: a type
+ *
+ * Returns the string representation for type as required by System.Reflection.
+ * The inverse of mono_reflection_parse_type ().
+ */
+char*
+mono_type_get_name (MonoType *type)
+{
+	GString* result = g_string_new ("");
+	mono_type_get_name_recurse (type, result);
+
+	if (type->byref)
+		g_string_append_c (result, '&');
 
-void
-mono_install_runtime_invoke (MonoInvokeFunc func) {
-	if (func)
-		mono_default_runtime_invoke = func;
+	return g_string_free (result, FALSE);
+}
+
+/*
+ * mono_reflection_get_type:
+ * @image: a metadata context
+ * @info: type description structure
+ * @ignorecase: flag for case-insensitive string compares
+ *
+ * Build a MonoType from the type description in @info.
+ * 
+ */
+MonoType*
+mono_reflection_get_type (MonoImage* image, MonoTypeNameParse *info, gboolean ignorecase)
+{
+	MonoClass *klass;
+	GList *mod;
+	int modval;
+	
+	if (!image)
+		image = mono_defaults.corlib;
+
+	if (ignorecase)
+		klass = mono_class_from_name_case (image, info->name_space, info->name);
 	else
-		mono_default_runtime_invoke = dummy_runtime_invoke;
+		klass = mono_class_from_name (image, info->name_space, info->name);
+	if (!klass)
+		return NULL;
+	for (mod = info->nested; mod; mod = mod->next) {
+		GList *nested;
+
+		mono_class_init (klass);
+		nested = klass->nested_classes;
+		klass = NULL;
+		while (nested) {
+			klass = nested->data;
+			if (ignorecase) {
+				if (g_strcasecmp (klass->name, mod->data) == 0)
+					break;
+			} else {
+				if (strcmp (klass->name, mod->data) == 0)
+					break;
+			}
+			klass = NULL;
+			nested = nested->next;
+		}
+		if (!klass)
+			break;
+	}
+	if (!klass)
+		return NULL;
+	mono_class_init (klass);
+	for (mod = info->modifiers; mod; mod = mod->next) {
+		modval = GPOINTER_TO_UINT (mod->data);
+		if (!modval) { /* byref: must be last modifier */
+			return &klass->this_arg;
+		} else if (modval == -1) {
+			klass = mono_ptr_class_get (&klass->byval_arg);
+		} else { /* array rank */
+			klass = mono_array_class_get (&klass->byval_arg, modval);
+		}
+		mono_class_init (klass);
+	}
+	return &klass->byval_arg;
 }
 
-MonoObject*
-mono_runtime_invoke (MonoMethod *method, void *obj, void **params)
+/*
+ * mono_reflection_type_from_name:
+ * @name: type name.
+ * @image: a metadata context (can be NULL).
+ *
+ * Retrieves a MonoType from its @name. If the name is not fully qualified,
+ * it defaults to get the type from @image or, if @image is NULL or loading
+ * from it fails, uses corlib.
+ * 
+ */
+MonoType*
+mono_reflection_type_from_name (char *name, MonoImage *image)
 {
-	return mono_default_runtime_invoke (method, obj, params);;
+	MonoType *type;
+	MonoTypeNameParse info;
+	
+	/*g_print ("requested type %s\n", str);*/
+	if (!mono_reflection_parse_type (name, &info)) {
+		g_list_free (info.modifiers);
+		g_list_free (info.nested);
+		return NULL;
+	}
+
+	if (info.assembly.name) {
+		image = mono_image_loaded (info.assembly.name);
+		/* do we need to load if it's not already loaded? */
+		if (!image) {
+			g_list_free (info.modifiers);
+			g_list_free (info.nested);
+			return NULL;
+		}
+	} else if (image == NULL) {
+		image = mono_defaults.corlib;
+	}
+
+	type = mono_reflection_get_type (image, &info, FALSE);
+	if (type == NULL && !info.assembly.name && image != mono_defaults.corlib) {
+		image = mono_defaults.corlib;
+		type = mono_reflection_get_type (image, &info, FALSE);
+	}
+	
+	g_list_free (info.modifiers);
+	g_list_free (info.nested);
+	return type;
+}
+
+static void*
+load_cattr_value (MonoImage *image, MonoType *t, const char *p, const char **end)
+{
+	int slen, type = t->type;
+handle_enum:
+	switch (type) {
+	case MONO_TYPE_U1:
+	case MONO_TYPE_I1:
+	case MONO_TYPE_BOOLEAN: {
+		MonoBoolean *bval = g_malloc (sizeof (MonoBoolean));
+		*bval = *p;
+		*end = p + 1;
+		return bval;
+	}
+	case MONO_TYPE_CHAR:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_I2: {
+		guint16 *val = g_malloc (sizeof (guint16));
+		*val = read16 (p);
+		*end = p + 2;
+		return val;
+	}
+#if SIZEOF_VOID_P == 4
+	case MONO_TYPE_U:
+	case MONO_TYPE_I:
+#endif
+	case MONO_TYPE_R4:
+	case MONO_TYPE_U4:
+	case MONO_TYPE_I4: {
+		guint32 *val = g_malloc (sizeof (guint32));
+		*val = read32 (p);
+		*end = p + 4;
+		return val;
+	}
+#if SIZEOF_VOID_P == 8
+	case MONO_TYPE_U: /* error out instead? this should probably not happen */
+	case MONO_TYPE_I:
+#endif
+	case MONO_TYPE_R8:
+	case MONO_TYPE_U8:
+	case MONO_TYPE_I8: {
+		guint64 *val = g_malloc (sizeof (guint64));
+		*val = read64 (p);
+		*end = p + 8;
+		return val;
+	}
+	case MONO_TYPE_VALUETYPE:
+		if (t->data.klass->enumtype) {
+			type = t->data.klass->enum_basetype->type;
+			goto handle_enum;
+		} else {
+			g_error ("generic valutype %s not handled in custom attr value decoding", t->data.klass->name);
+		}
+		break;
+	case MONO_TYPE_STRING: {
+		slen = mono_metadata_decode_value (p, &p);
+		*end = p + slen;
+		return mono_string_new_len (mono_domain_get (), p, slen);
+	}
+	case MONO_TYPE_CLASS: {
+		char *n;
+		MonoType *t;
+handle_type:
+		slen = mono_metadata_decode_value (p, &p);
+		n = g_memdup (p, slen + 1);
+		n [slen] = 0;
+		t = mono_reflection_type_from_name (n, image);
+		if (!t)
+			g_warning ("Cannot load type '%s'", n);
+		g_free (n);
+		*end = p + slen;
+		return mono_type_get_object (mono_domain_get (), t);
+	}
+	case MONO_TYPE_OBJECT: {
+		char subt = *p++;
+		MonoObject *obj;
+		MonoClass *subc;
+		void *val;
+
+		if (subt == 0x50) {
+			goto handle_type;
+		} else if (subt == 0x55) {
+			char *n;
+			MonoType *t;
+			slen = mono_metadata_decode_value (p, &p);
+			n = g_memdup (p, slen + 1);
+			n [slen] = 0;
+			t = mono_reflection_type_from_name (n, image);
+			if (!t)
+				g_warning ("Cannot load type '%s'", n);
+			g_free (n);
+			p += slen;
+			subc = mono_class_from_mono_type (t);
+		} else if (subt >= MONO_TYPE_BOOLEAN && subt <= MONO_TYPE_R8) {
+			MonoType simple_type = {{0}};
+			simple_type.type = subt;
+			subc = mono_class_from_mono_type (&simple_type);
+		} else {
+			g_error ("Unknown type 0x%02x for object type encoding in custom attr", subt);
+		}
+		val = load_cattr_value (image, &subc->byval_arg, p, end);
+		obj = mono_object_new (mono_domain_get (), subc);
+		memcpy ((char*)obj + sizeof (MonoObject), val, mono_class_value_size (subc, NULL));
+		g_free (val);
+		return obj;
+	}
+	default:
+		g_error ("Type 0x%02x not handled in custom attr value decoding", type);
+	}
+	return NULL;
 }
 
 /*
  * Optimization we could avoid mallocing() an little-endian archs that
  * don't crash with unaligned accesses.
  */
-static void
+static const char*
 fill_param_data (MonoImage *image, MonoMethodSignature *sig, guint32 blobidx, void **params) {
-	int len, i, slen, type;
+	int len, i;
 	const char *p = mono_metadata_blob_heap (image, blobidx);
 
 	len = mono_metadata_decode_value (p, &p);
 	if (len < 2 || read16 (p) != 0x0001) /* Prolog */
-		return;
+		return NULL;
 
 	/* skip prolog */
 	p += 2;
 	for (i = 0; i < sig->param_count; ++i) {
-		type = sig->params [i]->type;
-handle_enum:
-		switch (type) {
-		case MONO_TYPE_U1:
-		case MONO_TYPE_I1:
-		case MONO_TYPE_BOOLEAN: {
-			MonoBoolean *bval = params [i] = g_malloc (sizeof (MonoBoolean));
-			*bval = *p;
-			++p;
-			break;
-		}
-		case MONO_TYPE_CHAR:
-		case MONO_TYPE_U2:
-		case MONO_TYPE_I2: {
-			guint16 *val = params [i] = g_malloc (sizeof (guint16));
-			*val = read16 (p);
-			p += 2;
-			break;
-		}
-#if SIZEOF_VOID_P == 4
-		case MONO_TYPE_U:
-		case MONO_TYPE_I:
-#endif
-		case MONO_TYPE_R4:
-		case MONO_TYPE_U4:
-		case MONO_TYPE_I4: {
-			guint32 *val = params [i] = g_malloc (sizeof (guint32));
-			*val = read32 (p);
-			p += 4;
-			break;
-		}
-#if SIZEOF_VOID_P == 8
-		case MONO_TYPE_U: /* error out instead? this should probably not happen */
-		case MONO_TYPE_I:
-#endif
-		case MONO_TYPE_R8:
-		case MONO_TYPE_U8:
-		case MONO_TYPE_I8: {
-			guint64 *val = params [i] = g_malloc (sizeof (guint64));
-			*val = read64 (p);
-			p += 8;
-			break;
-		}
-		case MONO_TYPE_VALUETYPE:
-			if (sig->params [i]->data.klass->enumtype) {
-				type = sig->params [i]->data.klass->enum_basetype->type;
-				goto handle_enum;
-			} else {
-				g_warning ("generic valutype %s not handled in custom attr value decoding", sig->params [i]->data.klass->name);
-			}
-			break;
-		case MONO_TYPE_STRING: {
-			slen = mono_metadata_decode_value (p, &p);
-			params [i] = mono_string_new_len (mono_domain_get (), p, slen);
-			p += slen;
-			break;
-		}
-		default:
-			g_warning ("Type %02x not handled in custom attr value decoding", sig->params [i]->type);
-			break;
-		}
+		params [i] = load_cattr_value (image, sig->params [i], p, &p);
+	}
+	return p;
+}
+
+static gboolean
+type_is_reference (MonoType *type)
+{
+	switch (type->type) {
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_CHAR:
+	case MONO_TYPE_U:
+	case MONO_TYPE_I:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U4:
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U8:
+	case MONO_TYPE_I8:
+	case MONO_TYPE_R8:
+	case MONO_TYPE_R4:
+	case MONO_TYPE_VALUETYPE:
+		return FALSE;
+	default:
+		return TRUE;
 	}
 }
 
@@ -2105,27 +3499,8 @@ static void
 free_param_data (MonoMethodSignature *sig, void **params) {
 	int i;
 	for (i = 0; i < sig->param_count; ++i) {
-		switch (sig->params [i]->type) {
-		case MONO_TYPE_BOOLEAN:
-		case MONO_TYPE_CHAR:
-		case MONO_TYPE_U:
-		case MONO_TYPE_I:
-		case MONO_TYPE_U1:
-		case MONO_TYPE_I1:
-		case MONO_TYPE_U2:
-		case MONO_TYPE_I2:
-		case MONO_TYPE_U4:
-		case MONO_TYPE_I4:
-		case MONO_TYPE_U8:
-		case MONO_TYPE_I8:
-		case MONO_TYPE_R8:
-		case MONO_TYPE_R4:
-		case MONO_TYPE_VALUETYPE:
+		if (!type_is_reference (sig->params [i]))
 			g_free (params [i]);
-			break;
-		default:
-			break;
-		}
 	}
 }
 
@@ -2160,7 +3535,7 @@ find_field_index (MonoClass *klass, MonoClassField *field) {
 }
 
 /*
- * Find the property index in the metadata FieldDef table.
+ * Find the property index in the metadata Property table.
  */
 static guint32
 find_property_index (MonoClass *klass, MonoProperty *property) {
@@ -2173,10 +3548,31 @@ find_property_index (MonoClass *klass, MonoProperty *property) {
 	return 0;
 }
 
+/*
+ * Find the event index in the metadata Event table.
+ */
+static guint32
+find_event_index (MonoClass *klass, MonoEvent *event) {
+	int i;
+
+	for (i = 0; i < klass->event.count; ++i) {
+		if (event == &klass->events [i])
+			return klass->event.first + 1 + i;
+	}
+	return 0;
+}
+
+/*
+ * mono_reflection_get_custom_attrs:
+ * @obj: a reflection object handle
+ *
+ * Return an array with all the custom attributes defined of the
+ * reflection handle @obj. The objects are fully build.
+ */
 MonoArray*
 mono_reflection_get_custom_attrs (MonoObject *obj)
 {
-	guint32 index, mtoken, i;
+	guint32 idx, mtoken, i, len;
 	guint32 cols [MONO_CUSTOM_ATTR_SIZE];
 	MonoClass *klass;
 	MonoImage *image;
@@ -2188,38 +3584,44 @@ mono_reflection_get_custom_attrs (MonoObject *obj)
 	void **params;
 	
 	klass = obj->vtable->klass;
-	/* FIXME: need to handle: Module, MonoProperty */
+	/* FIXME: need to handle: Module */
 	if (klass == mono_defaults.monotype_class) {
 		MonoReflectionType *rtype = (MonoReflectionType*)obj;
 		klass = mono_class_from_mono_type (rtype->type);
-		index = mono_metadata_token_index (klass->type_token);
-		index <<= CUSTOM_ATTR_BITS;
-		index |= CUSTOM_ATTR_TYPEDEF;
+		idx = mono_metadata_token_index (klass->type_token);
+		idx <<= CUSTOM_ATTR_BITS;
+		idx |= CUSTOM_ATTR_TYPEDEF;
 		image = klass->image;
 	} else if (strcmp ("Assembly", klass->name) == 0) {
 		MonoReflectionAssembly *rassembly = (MonoReflectionAssembly*)obj;
-		index = 1; /* there is only one assembly */
-		index <<= CUSTOM_ATTR_BITS;
-		index |= CUSTOM_ATTR_ASSEMBLY;
+		idx = 1; /* there is only one assembly */
+		idx <<= CUSTOM_ATTR_BITS;
+		idx |= CUSTOM_ATTR_ASSEMBLY;
 		image = rassembly->assembly->image;
 	} else if (strcmp ("MonoProperty", klass->name) == 0) {
 		MonoReflectionProperty *rprop = (MonoReflectionProperty*)obj;
-		index = find_property_index (rprop->klass, rprop->property);
-		index <<= CUSTOM_ATTR_BITS;
-		index |= CUSTOM_ATTR_PROPERTY;
+		idx = find_property_index (rprop->klass, rprop->property);
+		idx <<= CUSTOM_ATTR_BITS;
+		idx |= CUSTOM_ATTR_PROPERTY;
 		image = rprop->klass->image;
+	} else if (strcmp ("MonoEvent", klass->name) == 0) {
+		MonoReflectionEvent *revent = (MonoReflectionEvent*)obj;
+		idx = find_event_index (revent->klass, revent->event);
+		idx <<= CUSTOM_ATTR_BITS;
+		idx |= CUSTOM_ATTR_EVENT;
+		image = revent->klass->image;
 	} else if (strcmp ("MonoField", klass->name) == 0) {
 		MonoReflectionField *rfield = (MonoReflectionField*)obj;
-		index = find_field_index (rfield->klass, rfield->field);
-		index <<= CUSTOM_ATTR_BITS;
-		index |= CUSTOM_ATTR_FIELDDEF;
+		idx = find_field_index (rfield->klass, rfield->field);
+		idx <<= CUSTOM_ATTR_BITS;
+		idx |= CUSTOM_ATTR_FIELDDEF;
 		image = rfield->klass->image;
 	} else if ((strcmp ("MonoMethod", klass->name) == 0) || (strcmp ("MonoCMethod", klass->name) == 0)) {
 		MonoReflectionMethod *rmethod = (MonoReflectionMethod*)obj;
-		index = find_method_index (rmethod->method);
-		index <<= CUSTOM_ATTR_BITS;
-		index |= CUSTOM_ATTR_METHODDEF;
-		image = method->klass->image;
+		idx = find_method_index (rmethod->method);
+		idx <<= CUSTOM_ATTR_BITS;
+		idx |= CUSTOM_ATTR_METHODDEF;
+		image = rmethod->method->klass->image;
 	} else if (strcmp ("ParameterInfo", klass->name) == 0) {
 		MonoReflectionParameter *param = (MonoReflectionParameter*)obj;
 		MonoReflectionMethod *rmethod = (MonoReflectionMethod*)param->MemberImpl;
@@ -2238,7 +3640,7 @@ mono_reflection_get_custom_attrs (MonoObject *obj)
 			ca = &image->tables [MONO_TABLE_PARAM];
 		}
 		found = 0;
-		for (i = param_list; i < param_list; ++i) {
+		for (i = param_list; i < param_last; ++i) {
 			param_pos = mono_metadata_decode_row_col (ca, i - 1, MONO_PARAM_SEQUENCE);
 			if (param_pos == param->PositionImpl) {
 				found = 1;
@@ -2247,9 +3649,9 @@ mono_reflection_get_custom_attrs (MonoObject *obj)
 		}
 		if (!found)
 			return mono_array_new (mono_domain_get (), mono_defaults.object_class, 0);
-		index = i;
-		index <<= CUSTOM_ATTR_BITS;
-		index |= CUSTOM_ATTR_PARAMDEF;
+		idx = i;
+		idx <<= CUSTOM_ATTR_BITS;
+		idx |= CUSTOM_ATTR_PARAMDEF;
 	} else { /* handle other types here... */
 		g_error ("get custom attrs not yet supported for %s", klass->name);
 	}
@@ -2258,8 +3660,10 @@ mono_reflection_get_custom_attrs (MonoObject *obj)
 	ca = &image->tables [MONO_TABLE_CUSTOMATTRIBUTE];
 	/* the table is not sorted */
 	for (i = 0; i < ca->rows; ++i) {
+		const char *named;
+		gint j, num_named;
 		mono_metadata_decode_row (ca, i, cols, MONO_CUSTOM_ATTR_SIZE);
-		if (cols [MONO_CUSTOM_ATTR_PARENT] != index)
+		if (cols [MONO_CUSTOM_ATTR_PARENT] != idx)
 			continue;
 		mtoken = cols [MONO_CUSTOM_ATTR_TYPE] >> CUSTOM_ATTR_TYPE_BITS;
 		switch (cols [MONO_CUSTOM_ATTR_TYPE] & CUSTOM_ATTR_TYPE_MASK) {
@@ -2275,27 +3679,58 @@ mono_reflection_get_custom_attrs (MonoObject *obj)
 		}
 		method = mono_get_method (image, mtoken, NULL);
 		if (!method)
-			g_error ("Can't find custom attr constructor");
+			g_error ("Can't find custom attr constructor image: %s mtoken: 0x%08x", image->name, mtoken);
 		mono_class_init (method->klass);
 		/*g_print ("got attr %s\n", method->klass->name);*/
 		params = g_new (void*, method->signature->param_count);
-		fill_param_data (image, method->signature, cols [MONO_CUSTOM_ATTR_VALUE], params);
+		named = fill_param_data (image, method->signature, cols [MONO_CUSTOM_ATTR_VALUE], params);
 		attr = mono_object_new (mono_domain_get (), method->klass);
-		mono_runtime_invoke (method, attr, params);
-		list = g_list_prepend (list, attr);
+		mono_runtime_invoke (method, attr, params, NULL);
 		free_param_data (method->signature, params);
 		g_free (params);
+		num_named = read16 (named);
+		named += 2;
+		for (j = 0; j < num_named; j++) {
+			gint name_len;
+			char *name, named_type;
+			named_type = *named++;
+			named++; /* type of data */
+			name_len = mono_metadata_decode_blob_size (named, &named);
+			name = g_malloc (name_len + 1);
+			memcpy (name, named, name_len);
+			name [name_len] = 0;
+			named += name_len;
+			if (named_type == 0x53) {
+				MonoClassField *field = mono_class_get_field_from_name (mono_object_class (attr), name);
+				void *val = load_cattr_value (image, field->type, named, &named);
+				mono_field_set_value (attr, field, val);
+				if (!type_is_reference (field->type))
+					g_free (val);
+			} else if (named_type == 0x54) {
+				MonoProperty *prop = mono_class_get_property_from_name (mono_object_class (attr), name);
+				void *pparams [1];
+				MonoType *prop_type;
+				/* can we have more that 1 arg in a custom attr named property? */
+				prop_type = prop->get? prop->get->signature->ret: prop->set->signature->params [prop->set->signature->param_count - 1];
+				pparams [0] = load_cattr_value (image, prop_type, named, &named);
+				mono_property_set_value (prop, attr, pparams, NULL);
+				if (!type_is_reference (prop_type))
+					g_free (pparams [0]);
+			}
+			g_free (name);
+		}
+		list = g_list_prepend (list, attr);
 	}
 
-	index = g_list_length (list);
+	len = g_list_length (list);
 	/*
 	 * The return type is really object[], but System/Attribute.cs does a cast
 	 * to (Attribute []) and that is not allowed: I'm lazy for now, but we should
 	 * probably fix that.
 	 */
 	klass = mono_class_from_name (mono_defaults.corlib, "System", "Attribute");
-	result = mono_array_new (mono_domain_get (), klass, index);
-	for (i = 0; i < index; ++i) {
+	result = mono_array_new (mono_domain_get (), klass, len);
+	for (i = 0; i < len; ++i) {
 		mono_array_set (result, gpointer, i, list->data);
 		list = list->next;
 	}
@@ -2304,112 +3739,533 @@ mono_reflection_get_custom_attrs (MonoObject *obj)
 	return result;
 }
 
+static MonoMethodSignature*
+parameters_to_signature (MonoArray *parameters) {
+	MonoMethodSignature *sig;
+	int count, i;
+
+	count = parameters? mono_array_length (parameters): 0;
+
+	sig = g_malloc0 (sizeof (MonoMethodSignature) + sizeof (MonoType*) * count);
+	sig->param_count = count;
+	sig->sentinelpos = -1; /* FIXME */
+	for (i = 0; i < count; ++i) {
+		MonoReflectionType *pt = mono_array_get (parameters, MonoReflectionType*, i);
+		sig->params [i] = pt->type;
+	}
+	return sig;
+}
+
+static MonoMethodSignature*
+ctor_builder_to_signature (MonoReflectionCtorBuilder *ctor) {
+	MonoMethodSignature *sig;
+
+	sig = parameters_to_signature (ctor->parameters);
+	sig->hasthis = ctor->attrs & METHOD_ATTRIBUTE_STATIC? 0: 1;
+	return sig;
+}
+
+static MonoMethodSignature*
+method_builder_to_signature (MonoReflectionMethodBuilder *method) {
+	MonoMethodSignature *sig;
+
+	sig = parameters_to_signature (method->parameters);
+	sig->hasthis = method->attrs & METHOD_ATTRIBUTE_STATIC? 0: 1;
+	return sig;
+}
+
+static void
+get_prop_name_and_type (MonoObject *prop, char **name, MonoType **type)
+{
+	MonoClass *klass = mono_object_class (prop);
+	if (strcmp (klass->name, "PropertyBuilder") == 0) {
+		MonoReflectionPropertyBuilder *pb = (MonoReflectionPropertyBuilder *)prop;
+		*name = mono_string_to_utf8 (pb->name);
+		*type = pb->type->type;
+	} else {
+		MonoReflectionProperty *p = (MonoReflectionProperty *)prop;
+		*name = g_strdup (p->property->name);
+		if (p->property->get)
+			*type = p->property->get->signature->ret;
+		else
+			*type = p->property->set->signature->params [p->property->set->signature->param_count - 1];
+	}
+}
+
+static void
+get_field_name_and_type (MonoObject *field, char **name, MonoType **type)
+{
+	MonoClass *klass = mono_object_class (field);
+	if (strcmp (klass->name, "FieldBuilder") == 0) {
+		MonoReflectionFieldBuilder *fb = (MonoReflectionFieldBuilder *)field;
+		*name = mono_string_to_utf8 (fb->name);
+		*type = fb->type->type;
+	} else {
+		MonoReflectionField *f = (MonoReflectionField *)field;
+		*name = g_strdup (f->field->name);
+		*type = f->field->type;
+	}
+}
+
+static char*
+type_get_qualified_name (MonoType *type, MonoAssembly *ass) {
+	char *name, *result;
+	MonoClass *klass;
+	MonoAssembly *ta;
+
+	name = mono_type_get_name (type);
+	klass = my_mono_class_from_mono_type (type);
+	ta = klass->image->assembly;
+	if (ta == ass || klass->image == mono_defaults.corlib)
+		return name;
+
+	/* missing public key */
+	result = g_strdup_printf ("%s, %s, Version=%d.%d.%d.%d, Culture=%s",
+		name, ta->aname.name,
+		ta->aname.major, ta->aname.minor, ta->aname.build, ta->aname.revision,
+		ta->aname.culture && *ta->aname.culture? ta->aname.culture: "neutral");
+	g_free (name);
+	return result;
+}
+
+static void
+encode_cattr_value (char *buffer, char *p, char **retbuffer, char **retp, guint32 *buflen, MonoType *type, MonoObject *arg)
+{
+	char *argval;
+	MonoTypeEnum simple_type;
+	
+	if ((p-buffer) + 10 >= *buflen) {
+		char *newbuf;
+		*buflen *= 2;
+		newbuf = g_realloc (buffer, *buflen);
+		p = newbuf + (p-buffer);
+		buffer = newbuf;
+	}
+	argval = ((char*)arg + sizeof (MonoObject));
+	simple_type = type->type;
+handle_enum:
+	switch (simple_type) {
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_I1:
+		*p++ = *argval;
+		break;
+	case MONO_TYPE_CHAR:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_I2:
+		swap_with_size (p, argval, 2, 1);
+		p += 2;
+		break;
+	case MONO_TYPE_U4:
+	case MONO_TYPE_I4:
+	case MONO_TYPE_R4:
+		swap_with_size (p, argval, 4, 1);
+		p += 4;
+		break;
+	case MONO_TYPE_U8:
+	case MONO_TYPE_I8:
+	case MONO_TYPE_R8:
+		swap_with_size (p, argval, 8, 1);
+		p += 8;
+		break;
+	case MONO_TYPE_VALUETYPE:
+		if (type->data.klass->enumtype) {
+			simple_type = type->data.klass->enum_basetype->type;
+			goto handle_enum;
+		} else {
+			g_warning ("generic valutype %s not handled in custom attr value decoding", type->data.klass->name);
+		}
+		break;
+	case MONO_TYPE_STRING: {
+		char *str = mono_string_to_utf8 ((MonoString*)arg);
+		guint32 slen = strlen (str);
+		if ((p-buffer) + 10 + slen >= *buflen) {
+			char *newbuf;
+			*buflen *= 2;
+			*buflen += slen;
+			newbuf = g_realloc (buffer, *buflen);
+			p = newbuf + (p-buffer);
+			buffer = newbuf;
+		}
+		mono_metadata_encode_value (slen, p, &p);
+		memcpy (p, str, slen);
+		p += slen;
+		g_free (str);
+		break;
+	}
+	case MONO_TYPE_CLASS: {
+		char *str;
+		guint32 slen;
+		MonoClass *k = mono_object_class (arg);
+		if (!mono_object_isinst (arg, mono_defaults.monotype_class) &&
+				(strcmp (k->name, "TypeBuilder") || strcmp (k->name_space, "System.Reflection.Emit")))
+			g_error ("only types allowed, not %s.%s", k->name_space, k->name);
+handle_type:
+		str = type_get_qualified_name (((MonoReflectionType*)arg)->type, NULL);
+		slen = strlen (str);
+		if ((p-buffer) + 10 + slen >= *buflen) {
+			char *newbuf;
+			*buflen *= 2;
+			*buflen += slen;
+			newbuf = g_realloc (buffer, *buflen);
+			p = newbuf + (p-buffer);
+			buffer = newbuf;
+		}
+		mono_metadata_encode_value (slen, p, &p);
+		memcpy (p, str, slen);
+		p += slen;
+		g_free (str);
+		break;
+	}
+	/* it may be a boxed value or a Type */
+	case MONO_TYPE_OBJECT: {
+		MonoClass *klass = mono_object_class (arg);
+		char *str;
+		guint32 slen;
+		
+		if (mono_object_isinst (arg, mono_defaults.monotype_class)) {
+			*p++ = 0x50;
+			goto handle_type;
+		} else if (klass->enumtype) {
+			*p++ = 0x55;
+		} else if (klass->byval_arg.type >= MONO_TYPE_BOOLEAN && klass->byval_arg.type <= MONO_TYPE_R8) {
+			*p++ = simple_type = klass->byval_arg.type;
+			goto handle_enum;
+		} else {
+			g_error ("unhandled type in custom attr");
+		}
+		str = type_get_qualified_name (klass->enum_basetype, NULL);
+		slen = strlen (str);
+		if ((p-buffer) + 10 + slen >= *buflen) {
+			char *newbuf;
+			*buflen *= 2;
+			*buflen += slen;
+			newbuf = g_realloc (buffer, *buflen);
+			p = newbuf + (p-buffer);
+			buffer = newbuf;
+		}
+		mono_metadata_encode_value (slen, p, &p);
+		memcpy (p, str, slen);
+		p += slen;
+		g_free (str);
+		simple_type = klass->enum_basetype->type;
+		goto handle_enum;
+	}
+	default:
+		g_error ("type 0x%02x not yet supported in custom attr encoder", simple_type);
+	}
+	*retp = p;
+	*retbuffer = buffer;
+}
+
+/*
+ * mono_reflection_get_custom_attrs_blob:
+ * @ctor: custom attribute constructor
+ * @ctorArgs: arguments o the constructor
+ * @properties:
+ * @propValues:
+ * @fields:
+ * @fieldValues:
+ * 
+ * Creates the blob of data that needs to be saved in the metadata and that represents
+ * the custom attributed described by @ctor, @ctorArgs etc.
+ * Returns: a Byte array representing the blob of data.
+ */
 MonoArray*
-mono_reflection_get_custom_attrs_blob (MonoObject *ctor, MonoArray *ctorArgs, MonoArray *properties, MonoArray *porpValues, MonoArray *fields, MonoArray* fieldValues) {
+mono_reflection_get_custom_attrs_blob (MonoObject *ctor, MonoArray *ctorArgs, MonoArray *properties, MonoArray *propValues, MonoArray *fields, MonoArray* fieldValues) {
 	MonoArray *result;
 	MonoMethodSignature *sig;
 	MonoObject *arg;
-	char *buffer, *p, *argval;
-	guint32 buflen, i, type;
+	char *buffer, *p;
+	guint32 buflen, i;
 
 	if (strcmp (ctor->vtable->klass->name, "MonoCMethod")) {
-		g_warning ("ConstructorBuilder Custom attribute not yet supported");
-		/* 
-		 * maybe we should have a param array to method signature function and
-		 * continue with the normal codepath.
-		 */
-		result = mono_array_new (mono_domain_get (), mono_defaults.byte_class, 4);
-		mono_array_set (result, char, 0, 1);
-		return result;
+		sig = ctor_builder_to_signature ((MonoReflectionCtorBuilder*)ctor);
+	} else {
+		sig = ((MonoReflectionMethod*)ctor)->method->signature;
 	}
 	buflen = 256;
 	p = buffer = g_malloc (buflen);
 	/* write the prolog */
 	*p++ = 1;
 	*p++ = 0;
-	sig = ((MonoReflectionMethod*)ctor)->method->signature;
-	/* FIXME: ENOENDIAN */
 	for (i = 0; i < sig->param_count; ++i) {
-		if ((p-buffer) + 10 >= buflen) {
-			char *newbuf;
-			buflen *= 2;
-			newbuf = g_realloc (buffer, buflen);
-			p = newbuf + (p-buffer);
-			buffer = newbuf;
-		}
 		arg = (MonoObject*)mono_array_get (ctorArgs, gpointer, i);
-		argval = ((char*)arg + sizeof (MonoObject));
-		type = sig->params [i]->type;
-handle_enum:
-		switch (type) {
-		case MONO_TYPE_BOOLEAN:
-		case MONO_TYPE_U1:
-		case MONO_TYPE_I1:
-			*p++ = *argval;
-			break;
-		case MONO_TYPE_CHAR:
-		case MONO_TYPE_U2:
-		case MONO_TYPE_I2: {
-			guint16 *val = (guint16*)p;
-			*val = *(guint16*)argval;
-			p += 2;
-			break;
-		}
-		case MONO_TYPE_U4:
-		case MONO_TYPE_I4:
-		case MONO_TYPE_R4: {
-			guint32 *val = (guint32*)p;
-			*val = *(guint32*)argval;
-			p += 4;
-			break;
-		}
-		case MONO_TYPE_U8:
-		case MONO_TYPE_I8:
-		case MONO_TYPE_R8: {
-			guint64 *val = (guint64*)p;
-			*val = *(guint64*)argval;
-			p += 8;
-			break;
-		}
-		case MONO_TYPE_VALUETYPE:
-			if (sig->params [i]->data.klass->enumtype) {
-				type = sig->params [i]->data.klass->enum_basetype->type;
-				goto handle_enum;
-			} else {
-				g_warning ("generic valutype %s not handled in custom attr value decoding", sig->params [i]->data.klass->name);
-			}
-			break;
-		case MONO_TYPE_STRING: {
-			char *str = mono_string_to_utf8 ((MonoString*)arg);
-			guint32 slen = strlen (str);
-			if ((p-buffer) + 10 + slen >= buflen) {
-				char *newbuf;
-				buflen *= 2;
-				buflen += slen;
-				newbuf = g_realloc (buffer, buflen);
-				p = newbuf + (p-buffer);
-				buffer = newbuf;
-			}
-			mono_metadata_encode_value (slen, p, &p);
-			memcpy (p, str, slen);
-			p += slen;
-			g_free (str);
-			break;
+		encode_cattr_value (buffer, p, &buffer, &p, &buflen, sig->params [i], arg);
+	}
+	i = 0;
+	if (properties)
+		i += mono_array_length (properties);
+	if (fields)
+		i += mono_array_length (fields);
+	*p++ = i & 0xff;
+	*p++ = (i >> 8) & 0xff;
+	if (properties) {
+		MonoObject *prop;
+		for (i = 0; i < mono_array_length (properties); ++i) {
+			MonoType *ptype;
+			char *pname;
+			int len;
+			
+			prop = mono_array_get (properties, gpointer, i);
+			get_prop_name_and_type (prop, &pname, &ptype);
+			*p++ = 0x54; /* PROPERTY signature */
+			mono_metadata_encode_value (ptype->type, p, &p);
+			len = strlen (pname);
+			mono_metadata_encode_value (len, p, &p);
+			memcpy (p, pname, len);
+			p += len;
+			encode_cattr_value (buffer, p, &buffer, &p, &buflen, ptype, (MonoObject*)mono_array_get (propValues, gpointer, i));
+			g_free (pname);
 		}
-		default:
-			g_error ("type 0x%02x not yet supported in custom attr encoder", type);
+	}
+
+	if (fields) {
+		MonoObject *field;
+		for (i = 0; i < mono_array_length (fields); ++i) {
+			MonoType *ftype;
+			char *fname;
+			int len;
+			
+			field = mono_array_get (fields, gpointer, i);
+			get_field_name_and_type (field, &fname, &ftype);
+			*p++ = 0x53; /* FIELD signature */
+			mono_metadata_encode_value (ftype->type, p, &p);
+			len = strlen (fname);
+			mono_metadata_encode_value (len, p, &p);
+			memcpy (p, fname, len);
+			p += len;
+			encode_cattr_value (buffer, p, &buffer, &p, &buflen, ftype, (MonoObject*)mono_array_get (fieldValues, gpointer, i));
+			g_free (fname);
 		}
 	}
-	/* 
-	 * we don't support properties and fields, yet, set to 0.
-	 */
-	*p++ = 0;
-	*p++ = 0;
+
+	g_assert (p - buffer <= buflen);
 	buflen = p - buffer;
 	result = mono_array_new (mono_domain_get (), mono_defaults.byte_class, buflen);
 	p = mono_array_addr (result, char, 0);
 	memcpy (p, buffer, buflen);
 	g_free (buffer);
+	if (strcmp (ctor->vtable->klass->name, "MonoCMethod"))
+		g_free (sig);
+	return result;
+}
+
+/*
+ * mono_reflection_setup_internal_class:
+ * @tb: a TypeBuilder object
+ *
+ * Creates a MonoClass that represents the TypeBuilder.
+ * This is a trick that lets us simplify a lot of reflection code
+ * (and will allow us to support Build and Run assemblies easier).
+ */
+void
+mono_reflection_setup_internal_class (MonoReflectionTypeBuilder *tb)
+{
+	MonoClass *klass, *parent;
+
+	klass = g_new0 (MonoClass, 1);
+
+	klass->image = tb->module->assemblyb->dynamic_assembly->assembly.image;
+
+	if (tb->parent) {
+		/* check so we can compile corlib correctly */
+		if (strcmp (mono_object_class (tb->parent)->name, "TypeBuilder") == 0) {
+			/* mono_class_setup_mono_type () guaranteess type->data.klass is valid */
+			parent = tb->parent->type->data.klass;
+		} else 
+			parent = my_mono_class_from_mono_type (tb->parent->type);
+	} else
+		parent = NULL;
+	
+	klass->inited = 1; /* we lie to the runtime */
+	klass->name = mono_string_to_utf8 (tb->name);
+	klass->name_space = mono_string_to_utf8 (tb->nspace);
+	klass->type_token = MONO_TOKEN_TYPE_DEF | tb->table_idx;
+	klass->flags = tb->attrs;
+
+	klass->element_class = klass;
+	klass->reflection_info = tb; /* need to pin. */
+
+	if (parent != NULL)
+		mono_class_setup_parent (klass, parent);
+	else if (strcmp (klass->name, "Object") == 0 && strcmp (klass->name_space, "System") == 0) {
+		const char *old_n = klass->name;
+		/* trick to get relative numbering right when compiling corlib */
+		klass->name = "BuildingObject";
+		mono_class_setup_parent (klass, mono_defaults.object_class);
+		klass->name = old_n;
+	}
+	mono_class_setup_mono_type (klass);
+
+	/*
+	 * FIXME: handle interfaces.
+	 */
+
+	tb->type.type = &klass->byval_arg;
+
+	/*g_print ("setup %s as %s (%p)\n", klass->name, ((MonoObject*)tb)->vtable->klass->name, tb);*/
+}
+
+/*
+ * mono_reflection_create_internal_class:
+ * @tb: a TypeBuilder object
+ *
+ * Actually create the MonoClass that is associated with the TypeBuilder.
+ */
+void
+mono_reflection_create_internal_class (MonoReflectionTypeBuilder *tb)
+{
+	MonoClass *klass;
+
+	klass = my_mono_class_from_mono_type (tb->type.type);
+
+	if (klass->enumtype && klass->enum_basetype == NULL) {
+		MonoReflectionFieldBuilder *fb;
+
+		g_assert (tb->fields != NULL);
+		g_assert (mono_array_length (tb->fields) >= 1);
+
+		fb = mono_array_get (tb->fields, MonoReflectionFieldBuilder*, 0);
+
+		klass->enum_basetype = fb->type->type;
+		klass->element_class = my_mono_class_from_mono_type (klass->enum_basetype);
+		klass->instance_size = klass->element_class->instance_size;
+		klass->size_inited = 1;
+		/* 
+		 * this is almost safe to do with enums and it's needed to be able
+		 * to create objects of the enum type (for use in SetConstant).
+		 */
+		mono_class_setup_vtable (klass);
+	}
+}
+
+static MonoMethod*
+ctorbuilder_to_mono_method (MonoClass *klass, MonoReflectionCtorBuilder* mb) {
+	MonoMethod *m;
+	MonoMethodNormal *pm;
+	pm = g_new0 (MonoMethodNormal, 1);
+	m = (MonoMethod*)pm;
+
+	m->flags = mb->attrs;
+	m->iflags = mb->iattrs;
+	m->name = mb->attrs & METHOD_ATTRIBUTE_STATIC? ".cctor": ".ctor";
+	m->klass = klass;
+	m->signature = ctor_builder_to_signature (mb);
+	
+	return m;
+}
+
+static MonoMethod*
+methodbuilder_to_mono_method (MonoClass *klass, MonoReflectionMethodBuilder* mb) {
+	MonoMethod *m;
+
+	if (mb->dll) {
+		MonoMethodPInvoke *pm;
+		pm = g_new0 (MonoMethodPInvoke, 1);
+		m = (MonoMethod*)pm;
+	} else {
+		MonoMethodNormal *pm;
+		pm = g_new0 (MonoMethodNormal, 1);
+		m = (MonoMethod*)pm;
+	}
+	m->flags = mb->attrs;
+	m->iflags = mb->iattrs;
+	m->name = mono_string_to_utf8 (mb->name);
+	m->klass = klass;
+	m->signature = method_builder_to_signature (mb);
+	return m;
+}
+
+MonoReflectionType*
+mono_reflection_create_runtime_class (MonoReflectionTypeBuilder *tb)
+{
+	MonoClass *klass;
+	int i, num, j;
+
+	klass = my_mono_class_from_mono_type (tb->type.type);
+
+	return NULL;
+
+	return mono_type_get_object (mono_object_domain (tb), &klass->byval_arg);
+	/*
+	 * Fields to set in klass:
+	 * the various flags: delegate/unicode/contextbound etc.
+	 * nested_in
+	 * nested_classes
+	 * interface*
+	 * fields
+	 * methods
+	 * properties
+	 * events
+	 * vtable
+	 */
+	klass->flags = tb->attrs;
+	num = tb->ctors? mono_array_length (tb->ctors): 0;
+	num += tb->methods? mono_array_length (tb->methods): 0;
+	klass->method.count = num;
+	klass->methods = g_new (MonoMethod*, num);
+	num = tb->ctors? mono_array_length (tb->ctors): 0;
+	for (i = 0; i < num; ++i)
+		klass->methods [i] = ctorbuilder_to_mono_method (klass, mono_array_get (tb->ctors, MonoReflectionCtorBuilder*, i));
+	num = tb->methods? mono_array_length (tb->methods): 0;
+	j = i;
+	for (i = 0; i < num; ++i)
+		klass->methods [j++] = methodbuilder_to_mono_method (klass, mono_array_get (tb->methods, MonoReflectionMethodBuilder*, i));
+				
+	return mono_type_get_object (mono_object_domain (tb), &klass->byval_arg);
+}
+
+MonoArray *
+mono_reflection_sighelper_get_signature_local (MonoReflectionSigHelper *sig)
+{
+	MonoDynamicAssembly *assembly = sig->module->assemblyb->dynamic_assembly;
+	guint32 na = mono_array_length (sig->arguments);
+	guint32 buflen, i;
+	MonoArray *result;
+	char *buf, *p;
+
+	p = buf = g_malloc (10 + na * 10);
+
+	mono_metadata_encode_value (0x07, p, &p);
+	mono_metadata_encode_value (na, p, &p);
+	for (i = 0; i < na; ++i) {
+		MonoReflectionType *type = mono_array_get (sig->arguments, MonoReflectionType *, i);
+		encode_reflection_type (assembly, type, p, &p);
+	}
+
+	buflen = p - buf;
+	result = mono_array_new (mono_domain_get (), mono_defaults.byte_class, buflen);
+	p = mono_array_addr (result, char, 0);
+	memcpy (p, buf, buflen);
+	g_free (buf);
+
+	return result;
+}
+
+MonoArray *
+mono_reflection_sighelper_get_signature_field (MonoReflectionSigHelper *sig)
+{
+	MonoDynamicAssembly *assembly = sig->module->assemblyb->dynamic_assembly;
+	guint32 na = mono_array_length (sig->arguments);
+	guint32 buflen, i;
+	MonoArray *result;
+	char *buf, *p;
+
+	p = buf = g_malloc (10 + na * 10);
+
+	mono_metadata_encode_value (0x06, p, &p);
+	for (i = 0; i < na; ++i) {
+		MonoReflectionType *type = mono_array_get (sig->arguments, MonoReflectionType *, i);
+		encode_reflection_type (assembly, type, p, &p);
+	}
+
+	buflen = p - buf;
+	result = mono_array_new (mono_domain_get (), mono_defaults.byte_class, buflen);
+	p = mono_array_addr (result, char, 0);
+	memcpy (p, buf, buflen);
+	g_free (buf);
+
 	return result;
 }
 
diff --git a/mono/metadata/reflection.h b/mono/metadata/reflection.h
index 08cf95065e9..d58ee3fbdf7 100644
--- a/mono/metadata/reflection.h
+++ b/mono/metadata/reflection.h
@@ -5,9 +5,10 @@
 #include <mono/metadata/metadata.h>
 #include <mono/metadata/class.h>
 #include <mono/metadata/object.h>
+#include <mono/utils/mono-hash.h>
 
 typedef struct {
-	char *name;
+	GHashTable *hash;
 	char *data;
 	guint32 alloc_size; /* malloced bytes */
 	guint32 index;
@@ -23,27 +24,32 @@ typedef struct {
 	guint32 next_idx;
 } MonoDynamicTable;
 
-typedef struct {
-	GHashTable *hash;
-	char *data;
-	guint32 index;
-	guint32 alloc_size;
-	guint32 offset; /* from start of metadata */
-} MonoStringHeap;
-
 /*
  * The followinbg structure must match the C# implementation in our corlib.
  */
 
-typedef struct {
+struct _MonoReflectionMethod {
 	MonoObject object;
-	MonoType  *type;
-} MonoReflectionType;
+	MonoMethod *method;
+	MonoString *name;
+	MonoReflectionType *reftype;
+};
 
-typedef struct {
+struct _MonoDelegate {
 	MonoObject object;
-	MonoMethod *method;
-} MonoReflectionMethod;
+	MonoObject *target_type;
+	MonoObject *target;
+	MonoString *method_name;
+	gpointer method_ptr;
+	gpointer delegate_trampoline;
+	MonoReflectionMethod *method_info;
+};
+
+typedef struct _MonoMulticastDelegate MonoMulticastDelegate;
+struct _MonoMulticastDelegate {
+	MonoDelegate delegate;
+	MonoMulticastDelegate *prev;
+};
 
 typedef struct {
 	MonoObject object;
@@ -59,6 +65,12 @@ typedef struct {
 
 typedef struct {
 	MonoObject object;
+	MonoClass *klass;
+	MonoEvent *event;
+} MonoReflectionEvent;
+
+typedef struct {
+	MonoObject object;
 	MonoReflectionType *ClassImpl;
 	MonoObject *DefaultValueImpl;
 	MonoObject *MemberImpl;
@@ -68,6 +80,11 @@ typedef struct {
 } MonoReflectionParameter;
 
 typedef struct {
+	MonoObject object;
+	MonoAssembly *assembly;
+} MonoReflectionAssembly;
+
+typedef struct {
 	MonoReflectionType *utype;
 	MonoArray *values;
 	MonoArray *names;
@@ -76,7 +93,6 @@ typedef struct {
 typedef struct {
 	MonoReflectionType *parent;
 	MonoReflectionType *ret;
-	MonoString *name;
 	guint32 attrs;
 	guint32 implattrs;
 } MonoMethodInfo;
@@ -91,6 +107,15 @@ typedef struct {
 
 typedef struct {
 	MonoReflectionType *parent;
+	MonoString *name;
+	MonoReflectionMethod *add_method;
+	MonoReflectionMethod *remove_method;
+	MonoReflectionMethod *raise_method;
+	guint32 attrs;
+} MonoEventInfo;
+
+typedef struct {
+	MonoReflectionType *parent;
 	MonoReflectionType *type;
 	MonoString *name;
 	guint32 attrs;
@@ -101,13 +126,19 @@ typedef struct {
 	MonoString *name_space;
 	MonoReflectionType *parent;
 	MonoReflectionType *etype;
-	MonoArray *interfaces;
-	MonoAssembly *assembly;
+	MonoReflectionType *nested_in;
+	MonoReflectionAssembly *assembly;
 	guint32 attrs;
 	guint32 rank;
+	MonoBoolean isbyref, ispointer, isprimitive;
 } MonoTypeInfo;
 
 typedef struct {
+	MonoObject *member;
+	gint32 code_pos;
+} MonoReflectionILTokenInfo;
+
+typedef struct {
 	MonoObject object;
 	MonoArray *code;
 	MonoObject *mbuilder;
@@ -116,12 +147,15 @@ typedef struct {
 	gint32 cur_stack;
 	MonoArray *locals;
 	MonoArray *ex_handlers;
+	gint32 num_token_fixups;
+	MonoArray *token_fixups;
 } MonoReflectionILGen;
 
 typedef struct {
 	MonoArray *handlers;
 	gint32 start;
 	gint32 len;
+	gint32 label;
 } MonoILExceptionInfo;
 
 typedef struct {
@@ -140,9 +174,17 @@ typedef struct {
 
 typedef struct {
 	MonoObject object;
+	gint32 count;
+	gint32 type;
+	gint32 eltype;
+} MonoReflectionMarshal;
+
+typedef struct {
+	MonoObject object;
 	MonoObject* methodb;
 	MonoString *name;
 	MonoArray *cattrs;
+	MonoReflectionMarshal *marshal_info;
 	guint32 attrs;
 	int position;
 	guint32 table_idx;
@@ -159,6 +201,7 @@ typedef struct {
 	MonoObject *type;
 	MonoArray *pinfo;
 	MonoArray *cattrs;
+	MonoBoolean init_locals;
 } MonoReflectionCtorBuilder;
 
 typedef struct {
@@ -181,16 +224,52 @@ typedef struct {
 	guint32 charset;
 	guint32 native_cc;
 	guint32 call_conv;
+	MonoBoolean init_locals;
 } MonoReflectionMethodBuilder;
 
 typedef struct {
+	MonoObject object;
+	MonoMethod *mhandle;
+	MonoReflectionType *parent;
+	MonoReflectionType *ret;
+	MonoArray *parameters;
+	MonoString *name;
+	guint32 table_idx;
+	guint32 call_conv;
+} MonoReflectionArrayMethod;
+
+enum {
+	MONO_SECTION_TEXT,
+	MONO_SECTION_RSRC,
+	MONO_SECTION_RELOC,
+	MONO_SECTION_MAX
+};
+
+typedef struct {
 	MonoAssembly assembly;
 	guint32 meta_size;
 	guint32 text_rva;
 	guint32 metadata_rva;
+	guint32 image_base;
+	guint32 cli_header_offset;
+	guint32 iat_offset;
+	guint32 idt_offset;
+	guint32 ilt_offset;
+	guint32 imp_names_offset;
+	struct {
+		guint32 rva;
+		guint32 size;
+		guint32 offset;
+		guint32 attrs;
+	} sections [MONO_SECTION_MAX];
 	GHashTable *typeref;
-	MonoStringHeap sheap;
+	GHashTable *handleref;
+	GList *array_methods;
+	MonoGHashTable *token_fixups;
+	MonoDynamicStream pefile;
+	MonoDynamicStream sheap;
 	MonoDynamicStream code; /* used to store method headers and bytecode */
+	MonoDynamicStream resources; /* managed embedded resources */
 	MonoDynamicStream us;
 	MonoDynamicStream blob;
 	MonoDynamicStream tstream;
@@ -199,9 +278,11 @@ typedef struct {
 } MonoDynamicAssembly;
 
 typedef struct {
-	MonoObject object;
-	MonoAssembly *assembly;
-} MonoReflectionAssembly;
+	MonoArray *data;
+	MonoString *name;
+	MonoString *filename;
+	guint32 attrs;
+} MonoReflectionResource;
 
 typedef struct {
 	MonoReflectionAssembly assembly;
@@ -209,7 +290,9 @@ typedef struct {
 	MonoReflectionMethodBuilder *entry_point;
 	MonoArray *modules;
 	MonoString *name;
+	MonoString *dir;
 	MonoArray *cattrs;
+	MonoArray *resources;
 } MonoReflectionAssemblyBuilder;
 
 typedef struct {
@@ -223,6 +306,7 @@ typedef struct {
 	MonoReflectionType *typeb;
 	MonoArray *rva_data;
 	MonoArray *cattrs;
+	MonoReflectionMarshal *marshal_info;
 } MonoReflectionFieldBuilder;
 
 typedef struct {
@@ -251,7 +335,9 @@ typedef struct {
 	MonoReflectionModule module;
 	MonoArray *types;
 	MonoArray *cattrs;
+	MonoArray *guid;
 	guint32    table_idx;
+	MonoReflectionAssemblyBuilder *assemblyb;
 } MonoReflectionModuleBuilder;
 
 typedef struct {
@@ -259,11 +345,13 @@ typedef struct {
 	MonoString *name;
 	MonoString *nspace;
 	MonoReflectionType *parent;
+	MonoReflectionType *nesting_type;
 	MonoArray *interfaces;
 	MonoArray *methods;
 	MonoArray *ctors;
 	MonoArray *properties;
 	MonoArray *fields;
+	MonoArray *events;
 	MonoArray *cattrs;
 	MonoArray *subtypes;
 	guint32 attrs;
@@ -277,50 +365,80 @@ typedef struct {
 	MonoObject  obj;
 	MonoString *name;
 	MonoString *codebase;
-	MonoObject *version;
+	gint32 major, minor, build, revision;
+	/* FIXME: add missing stuff */
 } MonoReflectionAssemblyName;
 
 typedef struct {
 	MonoObject  obj;
+	MonoString *name;
+	MonoReflectionType *type;
+	MonoReflectionTypeBuilder *typeb;
+	MonoArray *cattrs;
+	MonoReflectionMethodBuilder *add_method;
+	MonoReflectionMethodBuilder *remove_method;
+	MonoReflectionMethodBuilder *raise_method;
+	MonoArray *other_methods;
+	guint32 attrs;
+	guint32 table_idx;
+} MonoReflectionEventBuilder;
+
+typedef struct {
+	MonoObject  obj;
 	MonoReflectionMethod *ctor;
 	MonoArray *data;
 } MonoReflectionCustomAttr;
 
-typedef struct {
-	char *nest_name_space;
-	char *nest_name;
+typedef struct MonoTypeNameParse MonoTypeNameParse;
+
+struct MonoTypeNameParse {
 	char *name_space;
 	char *name;
-	char *assembly;
-	int rank; /* we may need more info than this */
-	int isbyref;
-	int ispointer;
-} MonoTypeNameParse;
+	MonoAssemblyName assembly;
+	GList *modifiers; /* 0 -> byref, -1 -> pointer, > 0 -> array rank */
+	GList *nested;
+};
+
+typedef struct {
+	MonoObject object;
+	MonoReflectionModuleBuilder *module;
+	MonoArray *arguments;
+	guint32 type;
+} MonoReflectionSigHelper;
+
+
 
+char*         mono_type_get_name         (MonoType *type);
 int           mono_reflection_parse_type (char *name, MonoTypeNameParse *info);
+MonoType*     mono_reflection_get_type   (MonoImage* image, MonoTypeNameParse *info, gboolean ignorecase);
+MonoType*     mono_reflection_type_from_name (char *name, MonoImage *image);
 
-int           mono_image_get_header (MonoReflectionAssemblyBuilder *assembly, char *buffer, int maxsize);
+void          mono_image_create_pefile (MonoReflectionAssemblyBuilder *assembly);
 void          mono_image_basic_init (MonoReflectionAssemblyBuilder *assembly);
 guint32       mono_image_insert_string (MonoReflectionAssemblyBuilder *assembly, MonoString *str);
 guint32       mono_image_create_token  (MonoDynamicAssembly *assembly, MonoObject *obj);
 
 MonoReflectionAssembly* mono_assembly_get_object (MonoDomain *domain, MonoAssembly *assembly);
 MonoReflectionType*     mono_type_get_object     (MonoDomain *domain, MonoType *type);
-MonoReflectionMethod*   mono_method_get_object   (MonoDomain *domain, MonoMethod *method);
+MonoReflectionMethod*   mono_method_get_object   (MonoDomain *domain, MonoMethod *method, MonoClass *refclass);
 MonoReflectionField*    mono_field_get_object    (MonoDomain *domain, MonoClass *klass, MonoClassField *field);
 MonoReflectionProperty* mono_property_get_object (MonoDomain *domain, MonoClass *klass, MonoProperty *property);
+MonoReflectionEvent*    mono_event_get_object    (MonoDomain *domain, MonoClass *klass, MonoEvent *event);
 /* note: this one is slightly different: we keep the whole array of params in the cache */
 MonoReflectionParameter** mono_param_get_objects  (MonoDomain *domain, MonoMethod *method);
 
+MonoArray*  mono_reflection_get_custom_attrs (MonoObject *obj);
+MonoArray*  mono_reflection_get_custom_attrs_blob (MonoObject *ctor, MonoArray *ctorArgs, MonoArray *properties, MonoArray *porpValues, MonoArray *fields, MonoArray* fieldValues);
 
-typedef MonoObject* (*MonoInvokeFunc) (MonoMethod *method, void *obj, void **params);
+void        mono_reflection_setup_internal_class  (MonoReflectionTypeBuilder *tb);
 
-extern MonoInvokeFunc mono_default_runtime_invoke;
+void        mono_reflection_create_internal_class (MonoReflectionTypeBuilder *tb);
 
-void        mono_install_runtime_invoke (MonoInvokeFunc func);
-MonoObject* mono_runtime_invoke         (MonoMethod *method, void *obj, void **params);
-MonoArray*  mono_reflection_get_custom_attrs (MonoObject *obj);
-MonoArray*  mono_reflection_get_custom_attrs_blob (MonoObject *ctor, MonoArray *ctorArgs, MonoArray *properties, MonoArray *porpValues, MonoArray *fields, MonoArray* fieldValues);
+MonoReflectionType* mono_reflection_create_runtime_class  (MonoReflectionTypeBuilder *tb);
+
+MonoArray  *mono_reflection_sighelper_get_signature_local (MonoReflectionSigHelper *sig);
+
+MonoArray  *mono_reflection_sighelper_get_signature_field (MonoReflectionSigHelper *sig);
 
 #endif /* __METADATA_REFLECTION_H__ */
 
diff --git a/mono/metadata/row-indexes.h b/mono/metadata/row-indexes.h
index 9595ee63415..d611ffaa807 100644
--- a/mono/metadata/row-indexes.h
+++ b/mono/metadata/row-indexes.h
@@ -182,10 +182,10 @@ enum {
 };
 
 enum {
-	MONO_MTHODIMPL_CLASS,
-	MONO_MTHODIMPL_BODY,
-	MONO_MTHODIMPL_DECLARATION,
-	MONO_MTHODIMPL_SIZE
+	MONO_METHODIMPL_CLASS,
+	MONO_METHODIMPL_BODY,
+	MONO_METHODIMPL_DECLARATION,
+	MONO_METHODIMPL_SIZE
 };
 
 enum {
diff --git a/mono/metadata/socket-io.c b/mono/metadata/socket-io.c
index d622b42bf63..c3cd2264088 100644
--- a/mono/metadata/socket-io.c
+++ b/mono/metadata/socket-io.c
@@ -210,6 +210,7 @@ static gint32 convert_proto(MonoProtocolType mono_proto)
 		break;
 		
 	default:
+		break;
 	}
 
 	return(proto);
@@ -455,7 +456,7 @@ static MonoException *get_socket_exception(guint32 error_code)
 	return(ex);
 }
 
-SOCKET ves_icall_System_Net_Sockets_Socket_Socket_internal(MonoObject *this, gint32 family, gint32 type, gint32 proto)
+gpointer ves_icall_System_Net_Sockets_Socket_Socket_internal(MonoObject *this, gint32 family, gint32 type, gint32 proto)
 {
 	SOCKET sock;
 	gint32 sock_family;
@@ -498,9 +499,12 @@ SOCKET ves_icall_System_Net_Sockets_Socket_Socket_internal(MonoObject *this, gin
 		return(NULL);
 	}
 	
-	return(sock);
+	return(GUINT_TO_POINTER (sock));
 }
 
+/* FIXME: the SOCKET parameter (here and in other functions in this
+ * file) is really an IntPtr which needs to be converted to a guint32.
+ */
 void ves_icall_System_Net_Sockets_Socket_Close_internal(SOCKET sock)
 {
 	closesocket(sock);
@@ -536,7 +540,7 @@ void ves_icall_System_Net_Sockets_Socket_Blocking_internal(SOCKET sock,
 	}
 }
 
-SOCKET ves_icall_System_Net_Sockets_Socket_Accept_internal(SOCKET sock)
+gpointer ves_icall_System_Net_Sockets_Socket_Accept_internal(SOCKET sock)
 {
 	SOCKET newsock;
 	
@@ -546,7 +550,7 @@ SOCKET ves_icall_System_Net_Sockets_Socket_Accept_internal(SOCKET sock)
 		return(NULL);
 	}
 	
-	return(newsock);
+	return(GUINT_TO_POINTER (newsock));
 }
 
 void ves_icall_System_Net_Sockets_Socket_Listen_internal(SOCKET sock,
@@ -787,13 +791,14 @@ gint32 ves_icall_System_Net_Sockets_Socket_RecvFrom_internal(SOCKET sock, MonoAr
 	buf=mono_array_addr(buffer, guchar, offset);
 	
 	ret=recvfrom(sock, buf, count, recvflags, sa, &sa_size);
-	g_free(sa);
 	
 	if(ret==SOCKET_ERROR) {
+		g_free(sa);
 		mono_raise_exception(get_socket_exception(WSAGetLastError()));
 	}
 
 	*sockaddr=create_object_from_sockaddr(sa, sa_size);
+	g_free(sa);
 	
 	return(ret);
 }
@@ -864,13 +869,13 @@ gint32 ves_icall_System_Net_Sockets_Socket_SendTo_internal(SOCKET sock, MonoArra
 	return(ret);
 }
 
-static SOCKET Socket_to_SOCKET(MonoObject *socket)
+static SOCKET Socket_to_SOCKET(MonoObject *sockobj)
 {
 	SOCKET sock;
 	MonoClassField *field;
 	
-	field=mono_class_get_field_from_name(socket->vtable->klass, "socket");
-	sock=*(SOCKET *)(((char *)socket)+field->offset);
+	field=mono_class_get_field_from_name(sockobj->vtable->klass, "socket");
+	sock=*(SOCKET *)(((char *)sockobj)+field->offset);
 
 	return(sock);
 }
@@ -1281,7 +1286,7 @@ extern gboolean ves_icall_System_Net_Dns_GetHostByName_internal(MonoString *host
 	
 	hostname=mono_string_to_utf8(host);
 	he=gethostbyname(hostname);
-	free(hostname);
+	g_free(hostname);
 	
 	if(he==NULL) {
 		return(FALSE);
@@ -1337,10 +1342,11 @@ extern gboolean ves_icall_System_Net_Dns_GetHostByAddr_internal(MonoString *addr
 	
 	address = mono_string_to_utf8 (addr);
 	if (inet_pton (AF_INET, address, &inaddr) <= 0) {
-		free (address);
+		g_free (address);
 		return FALSE;
 	}
 	
+	g_free (address);
 	if ((he = gethostbyaddr ((char *) &inaddr, sizeof (inaddr), AF_INET)) == NULL)
 		return FALSE;
 	
diff --git a/mono/metadata/socket-io.h b/mono/metadata/socket-io.h
index e256127db80..43499b19fed 100644
--- a/mono/metadata/socket-io.h
+++ b/mono/metadata/socket-io.h
@@ -131,12 +131,12 @@ typedef enum {
 	SocketOptionName_ChecksumCoverage=20,
 } MonoSocketOptionName;
 
-extern SOCKET ves_icall_System_Net_Sockets_Socket_Socket_internal(MonoObject *this, gint32 family, gint32 type, gint32 proto);
+extern gpointer ves_icall_System_Net_Sockets_Socket_Socket_internal(MonoObject *this, gint32 family, gint32 type, gint32 proto);
 extern void ves_icall_System_Net_Sockets_Socket_Close_internal(SOCKET sock);
 extern gint32 ves_icall_System_Net_Sockets_SocketException_WSAGetLastError_internal(void);
 extern gint32 ves_icall_System_Net_Sockets_Socket_Available_internal(SOCKET sock);
 extern void ves_icall_System_Net_Sockets_Socket_Blocking_internal(SOCKET sock, gboolean block);
-extern SOCKET ves_icall_System_Net_Sockets_Socket_Accept_internal(SOCKET sock);
+extern gpointer ves_icall_System_Net_Sockets_Socket_Accept_internal(SOCKET sock);
 extern void ves_icall_System_Net_Sockets_Socket_Listen_internal(SOCKET sock, guint32 backlog);
 extern MonoObject *ves_icall_System_Net_Sockets_Socket_LocalEndPoint_internal(SOCKET sock);
 extern MonoObject *ves_icall_System_Net_Sockets_Socket_RemoteEndPoint_internal(SOCKET sock);
diff --git a/mono/metadata/string-icalls.c b/mono/metadata/string-icalls.c
new file mode 100644
index 00000000000..51716a5ac37
--- /dev/null
+++ b/mono/metadata/string-icalls.c
@@ -0,0 +1,821 @@
+/*
+ * string-icalls.c: String internal calls for the corlib
+ *
+ * Author:
+ *   Patrik Torstensson (patrik.torstensson@labs2.com)
+ *   Duncan Mak  (duncan@ximian.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+#include <config.h>
+#include <stdlib.h>
+#include <stdio.h>
+#include <signal.h>
+#include <string.h>
+#include <mono/metadata/string-icalls.h>
+#include <mono/metadata/appdomain.h>
+#include <mono/metadata/tabledefs.h>
+#include <mono/metadata/loader.h>
+#include <mono/metadata/object.h>
+#include <mono/metadata/unicode.h>
+#include <mono/metadata/exception.h>
+
+/* Internal helper methods */
+
+static gboolean
+string_icall_is_in_array (MonoArray *chars, gint32 arraylength, gunichar2 chr);
+
+static gint32
+string_icall_cmp_char (gunichar2 c1, gunichar2 c2, gint16 mode);
+
+MonoString *
+ves_icall_System_String_ctor_charp (gpointer dummy, gunichar2 *value)
+{
+	gint32 i, length;
+	MonoDomain *domain;
+
+	domain = mono_domain_get ();
+
+	if (value == NULL)
+		length = 0;
+	else {
+		for (i = 0; *(value + i) != '\0'; i++);
+		length = i;
+	}
+
+	return mono_string_new_utf16 (domain, value, length);
+}
+
+MonoString *
+ves_icall_System_String_ctor_char_int (gpointer dummy, gunichar2 value, gint32 count)
+{
+	MonoDomain *domain;
+	MonoString *res;
+	gunichar2 *chars;
+	gint32 i;
+
+	domain = mono_domain_get ();
+	res = mono_string_new_size (domain, count);
+
+	chars = mono_string_chars (res);
+	for (i = 0; i < count; i++)
+		chars [i] = value;
+	
+	return res;
+}
+
+MonoString *
+ves_icall_System_String_ctor_charp_int_int (gpointer dummy, gunichar2 *value, gint32 sindex, gint32 length)
+{
+	gunichar2 *begin;
+	MonoDomain * domain;
+	
+	domain = mono_domain_get ();
+
+	if ((value == NULL) && (length != 0))
+		mono_raise_exception (mono_get_exception_argument_out_of_range ("Out of range"));
+
+	if ((sindex < 0) || (length < 0))
+		mono_raise_exception (mono_get_exception_argument_out_of_range ("Out of range"));
+	
+	if (length == 0) {	/* fixme: return String.Empty here */
+		g_warning ("string doesn't yet support empy strings in char* constructor");
+		g_assert_not_reached ();
+	}
+	
+	begin = (gunichar2 *) (value + sindex);
+
+	return mono_string_new_utf16 (domain, begin, length);
+}
+
+MonoString *
+ves_icall_System_String_ctor_sbytep (gpointer dummy, gint8 *value)
+{
+	MonoDomain *domain;
+	
+	domain = mono_domain_get ();
+
+	if (NULL == value) {	/* fixme: return String.Empty here */
+		g_warning ("string doesn't yet support empy strings in char* constructor");
+		g_assert_not_reached ();
+	}
+
+	return mono_string_new (domain, (const char *) value);
+}
+
+MonoString *
+ves_icall_System_String_ctor_sbytep_int_int (gpointer dummy, gint8 *value, gint32 sindex, gint32 length)
+{
+	char *begin;
+	MonoDomain *domain;
+	
+	domain = mono_domain_get ();
+
+	if ((value == NULL) && (length != 0))
+		mono_raise_exception (mono_get_exception_argument_out_of_range ("Out of range"));
+
+	if ((sindex < 0) || (length < 0))
+		mono_raise_exception (mono_get_exception_argument_out_of_range ("Out of range"));
+
+	begin = (char *) (value + sindex);
+
+	return mono_string_new_len (domain, begin, length);
+}
+
+MonoString *
+ves_icall_System_String_ctor_chara (gpointer dummy, MonoArray *value)
+{
+	MonoDomain *domain;
+
+	MONO_CHECK_ARG_NULL (value);
+	
+	domain = mono_domain_get ();
+	
+	return mono_string_new_utf16 (domain, (gunichar2 *) mono_array_addr(value, gunichar2, 0),  value->max_length);
+}
+
+MonoString *
+ves_icall_System_String_ctor_chara_int_int (gpointer dummy, MonoArray *value, 
+					 gint32 sindex, gint32 length)
+{
+	MonoDomain *domain;
+
+	MONO_CHECK_ARG_NULL (value);
+
+	domain = mono_domain_get ();
+	
+	return mono_string_new_utf16 (domain, (gunichar2 *) mono_array_addr(value, gunichar2, sindex), length);
+}
+
+MonoString *
+ves_icall_System_String_ctor_encoding (gpointer dummy, gint8 *value, gint32 sindex, 
+				    gint32 length, MonoObject *enc)
+{
+	g_warning("string.ctor with encoding obj unimplemented");
+	g_assert_not_reached ();
+	return NULL;
+}
+
+MonoBoolean 
+ves_icall_System_String_InternalEquals (MonoString *str1, MonoString *str2)
+{
+	gunichar2 *str1ptr;
+	gunichar2 *str2ptr;
+	gint32 str1len;
+
+	/* Length checking is done in C# */
+	str1len = mono_string_length(str1);
+
+	str1ptr = mono_string_chars(str1);
+	str2ptr = mono_string_chars(str2);
+
+	return (0 == memcmp(str1ptr, str2ptr, str1len * sizeof(gunichar2)));
+}
+
+MonoString * 
+ves_icall_System_String_InternalJoin (MonoString *separator, MonoArray * value, gint32 sindex, gint32 count)
+{
+	MonoString * ret;
+	gint32 length;
+	gint32 pos;
+	gint32 insertlen;
+	gint32 destpos;
+	gint32 srclen;
+	gunichar2 *insert;
+	gunichar2 *dest;
+	gunichar2 *src;
+
+	insert = mono_string_chars(separator);
+	insertlen = mono_string_length(separator);
+
+	length = 0;
+	for (pos = sindex; pos != sindex + count; pos++) {
+		length += mono_string_length(mono_array_get(value, MonoString *, pos));
+		if (pos < sindex + count - 1)
+			length += insertlen;
+	}
+
+	ret = mono_string_new_size( mono_domain_get (), length);
+	dest = mono_string_chars(ret);
+	destpos = 0;
+
+	for (pos = sindex; pos != sindex + count; pos++) {
+		src = mono_string_chars(mono_array_get(value, MonoString *, pos));
+		srclen = mono_string_length(mono_array_get(value, MonoString *, pos));
+
+		memcpy(dest + destpos, src, srclen * sizeof(gunichar2));
+		destpos += srclen;
+
+		if (pos < sindex + count - 1) {
+			memcpy(dest + destpos, insert, insertlen * sizeof(gunichar2));
+			destpos += insertlen;
+		}
+	}
+
+	return ret;
+}
+
+MonoString * 
+ves_icall_System_String_InternalInsert (MonoString *me, gint32 sindex, MonoString *value)
+{
+	MonoString * ret;
+	gunichar2 *src;
+	gunichar2 *insertsrc;
+	gunichar2 *dest;
+	gint32 srclen;
+	gint32 insertlen;
+
+	src = mono_string_chars(me);
+	srclen = mono_string_length(me);
+
+	insertsrc = mono_string_chars(value);
+	insertlen = mono_string_length(value);
+
+	ret = mono_string_new_size( mono_domain_get (), srclen + insertlen);
+	dest = mono_string_chars(ret);
+
+	memcpy(dest, src, sindex * sizeof(gunichar2));
+	memcpy(dest + sindex, insertsrc, insertlen * sizeof(gunichar2));
+	memcpy(dest + sindex + insertlen, src + sindex, (srclen - sindex) * sizeof(gunichar2));
+
+	return ret;
+}
+
+MonoString * 
+ves_icall_System_String_InternalReplace_Char (MonoString *me, gunichar2 oldChar, gunichar2 newChar)
+{
+	MonoString *ret;
+	gunichar2 *src;
+	gunichar2 *dest;
+	gint32 i, srclen;
+
+	src = mono_string_chars(me);
+	srclen = mono_string_length(me);
+
+	ret = mono_string_new_size( mono_domain_get (), srclen);
+	dest = mono_string_chars(ret);
+
+	for (i = 0; i != srclen; i++) {
+		if (src[i] == oldChar)
+			dest[i] = newChar;
+		else
+			dest[i] = src[i];
+	}
+
+	return ret;
+}
+
+MonoString * 
+ves_icall_System_String_InternalReplace_Str (MonoString *me, MonoString *oldValue, MonoString *newValue)
+{
+	MonoString *ret;
+	gunichar2 *src;
+	gunichar2 *dest;
+	gunichar2 *oldstr;
+	gunichar2 *newstr;
+	gint32 i, destpos;
+	gint32 occurr;
+	gint32 newsize;
+	gint32 oldstrlen;
+	gint32 newstrlen;
+	gint32 srclen;
+
+	occurr = 0;
+	destpos = 0;
+
+	oldstr = mono_string_chars(oldValue);
+	oldstrlen = mono_string_length(oldValue);
+
+	if (NULL != newValue) {
+		newstr = mono_string_chars(newValue);
+		newstrlen = mono_string_length(newValue);
+	} else
+		newstrlen = 0;
+
+	src = mono_string_chars(me);
+	srclen = mono_string_length(me);
+
+	if (oldstrlen != newstrlen) {
+		for (i = 0; i <= srclen - oldstrlen; i++)
+			if (0 == memcmp(src + i, oldstr, oldstrlen * sizeof(gunichar2)))
+				occurr++;
+
+		newsize = srclen + ((newstrlen - oldstrlen) * occurr);
+ 	} else
+		newsize = srclen;
+
+	ret = mono_string_new_size( mono_domain_get (), newsize);
+	dest = mono_string_chars(ret);
+
+	i = 0;
+	while (i < srclen) {
+		if (0 == memcmp(src + i, oldstr, oldstrlen * sizeof(gunichar2))) {
+			if (newstrlen > 0) {
+				memcpy(dest + destpos, newstr, newstrlen * sizeof(gunichar2));
+				destpos += newstrlen;
+			}
+			i += oldstrlen;
+		} else {
+			dest[destpos] = src[i];
+			destpos++;
+			i++;
+		}
+	}
+
+	return ret;
+}
+
+MonoString * 
+ves_icall_System_String_InternalRemove (MonoString *me, gint32 sindex, gint32 count)
+{
+	MonoString * ret;
+	gint32 srclen;
+	gunichar2 *dest;
+	gunichar2 *src;
+
+	srclen = mono_string_length(me);
+	ret = mono_string_new_size( mono_domain_get (), srclen - count);
+
+	src = mono_string_chars(me);
+	dest = mono_string_chars(ret);
+
+	memcpy(dest, src, sindex * sizeof(gunichar2));
+	memcpy(dest + sindex, src + sindex + count, (srclen - count - sindex) * sizeof(gunichar2));
+
+	return ret;
+}
+
+void
+ves_icall_System_String_InternalCopyTo (MonoString *me, gint32 sindex, MonoArray *dest, gint32 dindex, gint32 count)
+{
+	gunichar2 *destptr = (gunichar2 *) mono_array_addr(dest, gunichar2, dindex);
+	gunichar2 *src =  mono_string_chars(me);
+
+	memcpy(destptr, src + sindex, sizeof(gunichar2) * count);
+}
+
+MonoArray * 
+ves_icall_System_String_InternalSplit (MonoString *me, MonoArray *separator, gint32 count)
+{
+	MonoString * tmpstr;
+	MonoArray * retarr;
+	gunichar2 *src;
+	gint32 arrsize, srcsize, splitsize;
+	gint32 i, lastpos, arrpos;
+	gint32 tmpstrsize;
+	gunichar2 *tmpstrptr;
+
+	gunichar2 cmpchar;
+
+	src = mono_string_chars(me);
+	srcsize = mono_string_length(me);
+	arrsize = mono_array_length(separator);
+
+	cmpchar = mono_array_get(separator, gunichar2, 0);
+
+	splitsize = 0;
+	for (i = 0; i != srcsize && splitsize < count; i++) {
+		if (string_icall_is_in_array(separator, arrsize, src[i]))
+			splitsize++;
+	}
+
+	lastpos = 0;
+	arrpos = 0;
+
+	/* if no split chars found return the string */
+	if (splitsize == 0) {
+		retarr = mono_array_new(mono_domain_get(), mono_defaults.string_class, 1);
+		tmpstr = mono_string_new_size( mono_domain_get (), srcsize);
+		tmpstrptr = mono_string_chars(tmpstr);
+
+		memcpy(tmpstrptr, src, srcsize * sizeof(gunichar2));
+		mono_array_set(retarr, MonoString *, 0, tmpstr);
+
+		return retarr;
+	}
+
+	if (splitsize != count)
+		splitsize++;
+
+	retarr = mono_array_new(mono_domain_get(), mono_defaults.string_class, splitsize);
+	for (i = 0; i != srcsize && arrpos != count; i++) {
+		if (string_icall_is_in_array(separator, arrsize, src[i])) {
+			if (arrpos == count - 1)
+				tmpstrsize = srcsize - lastpos;
+			else
+				tmpstrsize = i - lastpos;
+
+			tmpstr = mono_string_new_size( mono_domain_get (), tmpstrsize);
+			tmpstrptr = mono_string_chars(tmpstr);
+
+			memcpy(tmpstrptr, src + lastpos, tmpstrsize * sizeof(gunichar2));
+			mono_array_set(retarr, MonoString *, arrpos, tmpstr);
+			arrpos++;
+			lastpos = i + 1;
+		}
+	}
+
+	if (arrpos < count) {
+		tmpstrsize = srcsize - lastpos;
+		tmpstr = mono_string_new_size( mono_domain_get (), tmpstrsize);
+		tmpstrptr = mono_string_chars(tmpstr);
+
+		memcpy(tmpstrptr, src + lastpos, tmpstrsize * sizeof(gunichar2));
+		mono_array_set(retarr, MonoString *, arrpos, tmpstr);
+	}
+
+	return retarr;
+}
+
+static gboolean
+string_icall_is_in_array (MonoArray *chars, gint32 arraylength, gunichar2 chr)
+{
+	gunichar2 cmpchar;
+	gint32 arrpos;
+
+	for (arrpos = 0; arrpos != arraylength; arrpos++) {
+		cmpchar = mono_array_get(chars, gunichar2, arrpos);
+		if (cmpchar == chr)
+			return TRUE;
+	}
+	
+	return FALSE;
+}
+
+MonoString * 
+ves_icall_System_String_InternalTrim (MonoString *me, MonoArray *chars, gint32 typ)
+{
+	MonoString * ret;
+	gunichar2 *src, *dest;
+	gint32 srclen, newlen, arrlen;
+	gint32 i, lenfirst, lenlast;
+
+	srclen = mono_string_length(me);
+	src = mono_string_chars(me);
+	arrlen = mono_array_length(chars);
+
+	lenfirst = 0;
+	lenlast = 0;
+
+	if (0 == typ || 1 == typ) {
+		for (i = 0; i != srclen; i++) {
+			if (string_icall_is_in_array(chars, arrlen, src[i]))
+				lenfirst++;
+			else 
+				break;
+		}
+	}
+
+	if (0 == typ || 2 == typ) {
+		for (i = srclen - 1; i > lenfirst - 1; i--) {
+			if (string_icall_is_in_array(chars, arrlen, src[i]))
+				lenlast++;
+			else 
+				break;
+		}
+	}
+
+	newlen = srclen - lenfirst - lenlast;
+
+	ret = mono_string_new_size( mono_domain_get (), newlen);
+	dest = mono_string_chars(ret);
+
+	memcpy(dest, src + lenfirst, newlen *sizeof(gunichar2));
+
+	return ret;
+}
+
+gint32 
+ves_icall_System_String_InternalIndexOf_Char (MonoString *me, gunichar2 value, gint32 sindex, gint32 count)
+{
+	gint32 pos;
+	gunichar2 *src;
+
+	src = mono_string_chars(me);
+	for (pos = sindex; pos != count + sindex; pos++) {
+		if ( src [pos] == value)
+			return pos;
+	}
+
+	return -1;
+}
+
+gint32 
+ves_icall_System_String_InternalIndexOf_Str (MonoString *me, MonoString *value, gint32 sindex, gint32 count)
+{
+	gint32 lencmpstr;
+	gint32 pos;
+	gunichar2 *src;
+	gunichar2 *cmpstr;
+
+	lencmpstr = mono_string_length(value);
+
+	src = mono_string_chars(me);
+	cmpstr = mono_string_chars(value);
+
+	for (pos = sindex; pos != count + sindex; pos++) {
+		if (pos + lencmpstr > count + sindex)
+			return -1;
+
+		if (0 == memcmp(src + pos, cmpstr, lencmpstr * sizeof(gunichar2)))
+			return pos;
+	}
+
+	return -1;
+}
+
+gint32 
+ves_icall_System_String_InternalIndexOfAny (MonoString *me, MonoArray *arr, gint32 sindex, gint32 count)
+{
+	gint32 pos;
+	gint32 loop;
+	gint32 arraysize;
+	gunichar2 *src;
+
+	arraysize = mono_array_length(arr);
+	src = mono_string_chars(me);
+
+	for (pos = sindex; pos != count + sindex; pos++) {
+		for (loop = 0; loop != arraysize; loop++)
+			if ( src [pos] == mono_array_get(arr, gunichar2, loop) )
+				return pos;
+	}
+
+	return -1;
+}
+
+gint32 
+ves_icall_System_String_InternalLastIndexOf_Char (MonoString *me, gunichar2 value, gint32 sindex, gint32 count)
+{
+	gint32 pos;
+	gunichar2 *src;
+
+	src = mono_string_chars(me);
+	for (pos = sindex; pos > sindex - count; pos--) {
+		if (src [pos] == value)
+			return pos;
+	}
+
+	return -1;
+}
+
+gint32 
+ves_icall_System_String_InternalLastIndexOf_Str (MonoString *me, MonoString *value, gint32 sindex, gint32 count)
+{
+	gint32 lencmpstr;
+	gint32 pos;
+	gunichar2 *src;
+	gunichar2 *cmpstr;
+
+	lencmpstr = mono_string_length(value);
+
+	src = mono_string_chars(me);
+	cmpstr = mono_string_chars(value);
+
+	for (pos = sindex - lencmpstr + 1; pos > sindex - count; pos--) {
+		if (0 == memcmp(src + pos, cmpstr, lencmpstr * sizeof(gunichar2)))
+			return pos;
+	}
+
+	return -1;
+}
+
+gint32 
+ves_icall_System_String_InternalLastIndexOfAny (MonoString *me, MonoArray *anyOf, gint32 sindex, gint32 count)
+{
+	gint32 pos;
+	gint32 loop;
+	gint32 arraysize;
+	gunichar2 *src;
+
+	arraysize = mono_array_length(anyOf);
+	src = mono_string_chars(me);
+
+	for (pos = sindex; pos > sindex - count; pos--) {
+		for (loop = 0; loop != arraysize; loop++)
+			if ( src [pos] == mono_array_get(anyOf, gunichar2, loop) )
+				return pos;
+	}
+
+	return -1;
+}
+
+MonoString *
+ves_icall_System_String_InternalPad (MonoString *me, gint32 width, gunichar2 chr, MonoBoolean right)
+{
+	MonoString * ret;
+	gunichar2 *src;
+	gunichar2 *dest;
+	gint32 fillcount;
+	gint32 srclen;
+	gint32 i;
+
+	srclen = mono_string_length(me);
+	src = mono_string_chars(me);
+
+	ret = mono_string_new_size( mono_domain_get (), width);
+	dest = mono_string_chars(ret);
+	fillcount = width - srclen;
+
+	if (right) {
+		memcpy(dest, src, srclen * sizeof(gunichar2));
+		for (i = srclen; i != width; i++)
+			dest[i] = chr;
+
+		return ret;
+	}
+
+	/* left fill */
+	for (i = 0; i != fillcount; i++)
+		dest[i] = chr;
+
+	memcpy(dest + fillcount, src, srclen * sizeof(gunichar2));
+
+	return ret;
+}
+
+MonoString *
+ves_icall_System_String_InternalToLower (MonoString *me)
+{
+	MonoString * ret;
+	gunichar2 *src; 
+	gunichar2 *dest;
+	gint32 i;
+
+	ret = mono_string_new_size(mono_domain_get (), mono_string_length(me));
+
+	src = mono_string_chars (me);
+	dest = mono_string_chars (ret);
+
+	for (i = 0; i < mono_string_length (me); ++i)
+		dest[i] = g_unichar_tolower(src[i]);
+
+	return ret;
+}
+
+MonoString *
+ves_icall_System_String_InternalToUpper (MonoString *me)
+{
+	int i;
+	MonoString * ret;
+	gunichar2 *src; 
+	gunichar2 *dest;
+
+	ret = mono_string_new_size(mono_domain_get (), mono_string_length(me));
+
+	src = mono_string_chars (me);
+	dest = mono_string_chars (ret);
+
+	for (i = 0; i < mono_string_length (me); ++i)
+		dest[i] = g_unichar_toupper(src[i]);
+
+	return ret;
+}
+
+MonoString *
+ves_icall_System_String_InternalAllocateStr (gint32 length)
+{
+	return mono_string_new_size(mono_domain_get (), length);
+}
+
+void 
+ves_icall_System_String_InternalStrcpy_Str (MonoString *dest, gint32 destPos, MonoString *src)
+{
+	gunichar2 *srcptr;
+	gunichar2 *destptr;
+
+	srcptr = mono_string_chars (src);
+	destptr = mono_string_chars (dest);
+
+	memcpy(destptr + destPos, srcptr, mono_string_length(src) * sizeof(gunichar2));
+}
+
+void 
+ves_icall_System_String_InternalStrcpy_StrN (MonoString *dest, gint32 destPos, MonoString *src, gint32 startPos, gint32 count)
+{
+	gunichar2 *srcptr;
+	gunichar2 *destptr;
+
+	srcptr = mono_string_chars (src);
+	destptr = mono_string_chars (dest);
+	memcpy(destptr + destPos, srcptr + startPos, count * sizeof(gunichar2));
+}
+
+MonoString  *
+ves_icall_System_String_InternalIntern (MonoString *str)
+{
+	return mono_string_intern(str);
+}
+
+MonoString * 
+ves_icall_System_String_InternalIsInterned (MonoString *str)
+{
+	return mono_string_is_interned(str);
+}
+
+gint32
+ves_icall_System_String_InternalCompareStr_N (MonoString *s1, gint32 i1, MonoString *s2, gint32 i2, gint32 length, MonoBoolean inCase)
+{
+	/* c translation of C# code from old string.cs.. :) */
+	gint32 lenstr1;
+	gint32 lenstr2;
+	gint32 charcmp;
+	gunichar2 *str1;
+	gunichar2 *str2;
+
+	gint32 pos;
+	gint16 mode;
+	
+	if (inCase)
+		mode = 1;
+	else
+		mode = 0;
+
+	lenstr1 = mono_string_length(s1);
+	lenstr2 = mono_string_length(s2);
+
+	str1 = mono_string_chars(s1);
+	str2 = mono_string_chars(s2);
+
+	pos = 0;
+
+	for (pos = 0; pos != length; pos++) {
+		if (i1 + pos >= lenstr1 || i2 + pos >= lenstr2)
+			break;
+
+		charcmp = string_icall_cmp_char(str1[i1 + pos], str2[i2 + pos], mode);
+		if (charcmp != 0)
+			return charcmp;
+	}
+
+	/* the lesser wins, so if we have looped until length we just need to check the last char */
+	if (pos == length) {
+		return string_icall_cmp_char(str1[i1 + pos - 1], str2[i2 + pos - 1], mode);
+	}
+
+	/* Test if one the strings has been compared to the end */
+	if (i1 + pos >= lenstr1) {
+		if (i2 + pos >= lenstr2)
+			return 0;
+		else
+			return -1;
+	} else if (i2 + pos >= lenstr2)
+		return 1;
+
+	/* if not, check our last char only.. (can this happen?) */
+	return string_icall_cmp_char(str1[i1 + pos], str2[i2 + pos], mode);
+}
+
+gint32
+ves_icall_System_String_GetHashCode (MonoString *me)
+{
+	int i, h = 0;
+	gunichar2 *data = mono_string_chars (me);
+
+	for (i = 0; i < mono_string_length (me); ++i)
+		h = (h << 5) - h + data [i];
+
+	return h;
+}
+
+gunichar2 
+ves_icall_System_String_get_Chars (MonoString *me, gint32 idx)
+{
+	return mono_string_chars(me)[idx];
+}
+
+/* @mode :	0 = StringCompareModeDirect
+			1 = StringCompareModeCaseInsensitive
+			2 = StringCompareModeOrdinal
+*/
+static gint32 
+string_icall_cmp_char (gunichar2 c1, gunichar2 c2, gint16 mode)
+{
+	gint32 result;
+	GUnicodeType c1type, c2type;
+
+	c1type = g_unichar_type (c1);
+	c2type = g_unichar_type (c2);
+
+	switch (mode) {
+	case 0:	
+		/* TODO: compare with culture info */
+		if (c1type == G_UNICODE_UPPERCASE_LETTER && c2type == G_UNICODE_LOWERCASE_LETTER)
+			return 1;
+					
+		if (c1type == G_UNICODE_LOWERCASE_LETTER && c2type == G_UNICODE_UPPERCASE_LETTER)
+			return -1;
+	
+		result = (gint32) c1 - c2;
+		break;
+	case 1:	
+		result = (gint32) (c1type != G_UNICODE_LOWERCASE_LETTER ? g_unichar_tolower(c1) : c1) - 
+				  (c2type != G_UNICODE_LOWERCASE_LETTER ? g_unichar_tolower(c2) : c2);
+		break;
+	case 2:
+		result = (gint32) c1 - c2;
+		break;
+	}
+
+	return ((result < 0) ? -1 : (result > 0) ? 1 : 0);
+}
diff --git a/mono/metadata/string-icalls.h b/mono/metadata/string-icalls.h
new file mode 100644
index 00000000000..95948390b11
--- /dev/null
+++ b/mono/metadata/string-icalls.h
@@ -0,0 +1,121 @@
+#ifndef _MONO_CLI_STRING_ICALLS_H_
+#define _MONO_CLI_STRING_ICALLS_H_
+
+/*
+ * string-icalls.h: String internal calls for the corlib
+ *
+ * Author:
+ *   Patrik Torstensson (patrik.torstensson@labs2.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
+#include <mono/metadata/class.h>
+#include <mono/metadata/object.h>
+
+MonoString *
+ves_icall_System_String_ctor_charp (gpointer dummy, gunichar2 *value);
+
+MonoString *
+ves_icall_System_String_ctor_char_int (gpointer dummy, gunichar2 value, gint32 count);
+
+MonoString *
+ves_icall_System_String_ctor_charp_int_int (gpointer dummy, gunichar2 *value, gint32 sindex, gint32 length);
+
+MonoString *
+ves_icall_System_String_ctor_sbytep (gpointer dummy, gint8 *value);
+
+MonoString *
+ves_icall_System_String_ctor_sbytep_int_int (gpointer dummy, gint8 *value, gint32 sindex, gint32 length);
+
+MonoString *
+ves_icall_System_String_ctor_chara (gpointer dummy, MonoArray *value);
+
+MonoString *
+ves_icall_System_String_ctor_chara_int_int (gpointer dummy, MonoArray *value,  gint32 sindex, gint32 length);
+
+MonoString *
+ves_icall_System_String_ctor_encoding (gpointer dummy, gint8 *value, gint32 sindex, gint32 length, MonoObject *enc);
+
+MonoBoolean 
+ves_icall_System_String_InternalEquals (MonoString *str1, MonoString *str2);
+
+MonoString * 
+ves_icall_System_String_InternalJoin (MonoString *separator, MonoArray * value, gint32 sindex, gint32 count);
+
+MonoString * 
+ves_icall_System_String_InternalInsert (MonoString *me, gint32 sindex, MonoString *value);
+
+MonoString * 
+ves_icall_System_String_InternalReplace_Char (MonoString *me, gunichar2 oldChar, gunichar2 newChar);
+
+MonoString * 
+ves_icall_System_String_InternalReplace_Str (MonoString *me, MonoString *oldValue, MonoString *newValue);
+
+MonoString * 
+ves_icall_System_String_InternalRemove (MonoString *me, gint32 sindex, gint32 count);
+
+void
+ves_icall_System_String_InternalCopyTo (MonoString *me, gint32 sindex, MonoArray *dest, gint32 dindex, gint32 count);
+
+MonoArray * 
+ves_icall_System_String_InternalSplit (MonoString *me, MonoArray *separator, gint32 count);
+
+MonoString * 
+ves_icall_System_String_InternalTrim (MonoString *me, MonoArray *chars, gint32 typ);
+
+gint32 
+ves_icall_System_String_InternalIndexOf_Char (MonoString *me, gunichar2 value, gint32 sindex, gint32 count);
+
+gint32 
+ves_icall_System_String_InternalIndexOf_Str (MonoString *me, MonoString *value, gint32 sindex, gint32 count);
+
+gint32 
+ves_icall_System_String_InternalIndexOfAny (MonoString *me, MonoArray *arr, gint32 sindex, gint32 count);
+
+gint32 
+ves_icall_System_String_InternalLastIndexOf_Char (MonoString *me, gunichar2 value, gint32 sindex, gint32 count);
+
+gint32 
+ves_icall_System_String_InternalLastIndexOf_Str (MonoString *me, MonoString *value, gint32 sindex, gint32 count);
+
+gint32 
+ves_icall_System_String_InternalLastIndexOfAny (MonoString *me, MonoArray *anyOf, gint32 sindex, gint32 count);
+
+MonoString *
+ves_icall_System_String_InternalPad (MonoString *me, gint32 width, gunichar2 chr, MonoBoolean right);
+
+MonoString *
+ves_icall_System_String_InternalToLower (MonoString *me);
+
+MonoString *
+ves_icall_System_String_InternalToUpper (MonoString *me);
+
+MonoString *
+ves_icall_System_String_InternalAllocateStr (gint32 length);
+
+void 
+ves_icall_System_String_InternalStrcpy_Str (MonoString *dest, gint32 destPos, MonoString *src);
+
+void 
+ves_icall_System_String_InternalStrcpy_StrN (MonoString *dest, gint32 destPos, MonoString *src, gint32 startPos, gint32 count);
+
+MonoString  *
+ves_icall_System_String_InternalIntern (MonoString *str);
+
+MonoString * 
+ves_icall_System_String_InternalIsInterned (MonoString *str);
+
+gint32 
+ves_icall_System_String_InternalCompareStr (MonoString *s1, MonoString *s2, MonoBoolean inCase);
+
+gint32 
+ves_icall_System_String_InternalCompareStr_N (MonoString *s1, gint32 i1, MonoString *s2, gint32 i2, gint32 length, MonoBoolean inCase);
+
+gint32
+ves_icall_System_String_GetHashCode (MonoString *me);
+
+gunichar2 
+ves_icall_System_String_get_Chars (MonoString *me, gint32 idx);
+
+#endif /* _MONO_CLI_STRING_ICALLS_H_ */
diff --git a/mono/metadata/sysmath.c b/mono/metadata/sysmath.c
new file mode 100644
index 00000000000..8837c16a095
--- /dev/null
+++ b/mono/metadata/sysmath.c
@@ -0,0 +1,138 @@
+/* math.c - these are based on bob smith's csharp routines */

+

+#define __USE_ISOC99

+#include <math.h>

+#include <mono/metadata/sysmath.h>

+

+#ifndef NAN

+# if G_BYTE_ORDER == G_BIG_ENDIAN

+#  define __nan_bytes           { 0x7f, 0xc0, 0, 0 }

+# endif

+# if G_BYTE_ORDER == G_LITTLE_ENDIAN

+#  define __nan_bytes           { 0, 0, 0xc0, 0x7f }

+# endif

+

+static union { unsigned char __c[4]; float __d; } __nan_union = { __nan_bytes };

+# define NAN    (__nan_union.__d)

+#endif

+

+#ifndef HUGE_VAL

+#define __huge_val_t   union { unsigned char __c[8]; double __d; }

+# if G_BYTE_ORDER == G_BIG_ENDIAN

+#  define __HUGE_VAL_bytes       { 0x7f, 0xf0, 0, 0, 0, 0, 0, 0 }

+# endif

+# if G_BYTE_ORDER == G_LITTLE_ENDIAN

+#  define __HUGE_VAL_bytes       { 0, 0, 0, 0, 0, 0, 0xf0, 0x7f }

+# endif

+static __huge_val_t __huge_val = { __HUGE_VAL_bytes };

+#  define HUGE_VAL      (__huge_val.__d)

+#endif

+

+gdouble 

+ves_icall_System_Math_Sin (gdouble x)

+{

+	return sin (x);

+}

+

+gdouble 

+ves_icall_System_Math_Cos (gdouble x)

+{

+	return cos (x);

+}

+

+gdouble 

+ves_icall_System_Math_Tan (gdouble x)

+{

+	return tan (x);

+}

+

+gdouble 

+ves_icall_System_Math_Sinh (gdouble x)

+{

+	return sinh (x);

+}

+

+gdouble 

+ves_icall_System_Math_Cosh (gdouble x)

+{

+	return cosh (x);

+}

+

+gdouble 

+ves_icall_System_Math_Tanh (gdouble x)

+{

+	return tanh (x);

+}

+

+gdouble 

+ves_icall_System_Math_Acos (gdouble x)

+{

+	if (x < -1 || x > 1)

+		return NAN;

+

+	return acos (x);

+}

+

+gdouble 

+ves_icall_System_Math_Asin (gdouble x)

+{

+	if (x < -1 || x > 1)

+		return NAN;

+

+	return asin (x);

+}

+

+gdouble 

+ves_icall_System_Math_Atan (gdouble x)

+{

+	return atan (x);

+}

+

+gdouble 

+ves_icall_System_Math_Atan2 (gdouble y, gdouble x)

+{

+	return atan2 (y, x);

+}

+

+gdouble 

+ves_icall_System_Math_Exp (gdouble x)

+{

+	return exp (x);

+}

+

+gdouble 

+ves_icall_System_Math_Log (gdouble x)

+{

+	if (x == 0)

+		return -HUGE_VAL;

+	else if (x < 0)

+		return NAN;

+

+	return log (x);

+}

+

+gdouble 

+ves_icall_System_Math_Log10 (gdouble x)

+{

+	if (x == 0)

+		return -HUGE_VAL;

+	else if (x < 0)

+		return NAN;

+

+	return log10 (x);

+}

+

+gdouble 

+ves_icall_System_Math_Pow (gdouble x, gdouble y)

+{

+	return pow (x, y);

+}

+

+gdouble 

+ves_icall_System_Math_Sqrt (gdouble x)

+{

+	if (x < 0)

+		return NAN;

+

+	return sqrt (x);

+}

diff --git a/mono/metadata/sysmath.h b/mono/metadata/sysmath.h
new file mode 100644
index 00000000000..c906a5a82f3
--- /dev/null
+++ b/mono/metadata/sysmath.h
@@ -0,0 +1,61 @@
+/*

+ * math.h

+ *

+ * Author:

+ *   Dan Lewis (dihlewis@yahoo.co.uk)

+ *

+ * (C) Ximian, Inc. 2002

+ */

+

+#ifndef __METADATA_SYSMATH_H__

+#define __METADATA_SYSMATH_H__

+

+#include <config.h>

+#include <glib.h>

+

+extern gdouble 

+ves_icall_System_Math_Sin (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Cos (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Tan (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Sinh (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Cosh (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Tanh (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Acos (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Asin (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Atan (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Atan2 (gdouble y, gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Exp (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Log (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Log10 (gdouble x);

+

+extern gdouble 

+ves_icall_System_Math_Pow (gdouble x, gdouble y);

+

+extern gdouble 

+ves_icall_System_Math_Sqrt (gdouble x);

+

+#endif

diff --git a/mono/metadata/tabledefs.h b/mono/metadata/tabledefs.h
index 5d5671b4a96..4a616c57c9b 100644
--- a/mono/metadata/tabledefs.h
+++ b/mono/metadata/tabledefs.h
@@ -41,6 +41,18 @@ enum {
 	FILE_CONTAINS_NO_METADATA   = 1
 };
 
+enum {
+	SECURITY_ACTION_DEMAND        = 2,
+	SECURITY_ACTION_ASSERT        = 3,
+	SECURITY_ACTION_DENY          = 4,
+	SECURITY_ACTION_PERMITONLY    = 5,
+	SECURITY_ACTION_LINKDEMAND    = 6,
+	SECURITY_ACTION_INHERITDEMAND = 7,
+	SECURITY_ACTION_REQMIN        = 8,
+	SECURITY_ACTION_REQOPT        = 9,
+	SECURITY_ACTION_REQREFUSE     = 10
+};
+
 /*
  * Field Attributes (21.1.5).
  */
diff --git a/mono/metadata/threadpool.c b/mono/metadata/threadpool.c
new file mode 100644
index 00000000000..91d52a8afb8
--- /dev/null
+++ b/mono/metadata/threadpool.c
@@ -0,0 +1,201 @@
+/*
+ * threadpool.c: global thread pool
+ *
+ * Authors:
+ *   Dietmar Maurer (dietmar@ximian.com)
+ *
+ * (C) 2001 Ximian, Inc.
+ */
+
+#include <config.h>
+#include <glib.h>
+
+#include <mono/metadata/appdomain.h>
+#include <mono/metadata/tabledefs.h>
+#include <mono/metadata/threads.h>
+#include <mono/metadata/exception.h>
+#ifndef PLATFORM_WIN32
+#include "mono/io-layer/wapi.h"
+#include "mono/io-layer/uglify.h"
+#endif
+
+#include "threadpool.h"
+
+/* FIXME:
+ * - worker threads need to be initialized correctly.
+ * - worker threads should be domain specific
+ */
+
+/* maximum number of worker threads */
+int mono_worker_threads = 1;
+
+static int workers = 0;
+
+typedef struct {
+	MonoMethodMessage *msg;
+	HANDLE             wait_semaphore;
+	MonoMethod        *cb_method;
+	MonoDelegate      *cb_target;
+	MonoObject        *state;
+	MonoObject        *res;
+	MonoArray         *out_args;
+} ASyncCall;
+
+static void async_invoke_thread (void);
+
+static GList *async_call_queue = NULL;
+
+static void
+mono_async_invoke (MonoAsyncResult *ares)
+{
+	ASyncCall *ac = (ASyncCall *)ares->data;
+
+	ac->msg->exc = NULL;
+	ac->res = mono_message_invoke (ares->async_delegate, ac->msg, 
+				       &ac->msg->exc, &ac->out_args);
+
+	ares->completed = 1;
+		
+	/* notify listeners */
+	ReleaseSemaphore (ac->wait_semaphore, 0x7fffffff, NULL);
+
+	/* call async callback if cb_method != null*/
+	if (ac->cb_method) {
+		MonoObject *exc = NULL;
+		void *pa = &ares;
+		mono_runtime_invoke (ac->cb_method, ac->cb_target, pa, &exc);
+		if (!ac->msg->exc)
+			ac->msg->exc = exc;
+	}
+}
+
+MonoAsyncResult *
+mono_thread_pool_add (MonoObject *target, MonoMethodMessage *msg, MonoDelegate *async_callback,
+		      MonoObject *state)
+{
+	MonoDomain *domain = mono_domain_get ();
+	MonoAsyncResult *ares;
+	ASyncCall *ac;
+
+	ac = g_new0 (ASyncCall, 1);
+	ac->wait_semaphore = CreateSemaphore (NULL, 0, 0x7fffffff, NULL);	
+	ac->msg = msg;
+	ac->state = state;
+
+	if (async_callback) {
+		ac->cb_method = mono_get_delegate_invoke (((MonoObject *)async_callback)->vtable->klass);
+		ac->cb_target = async_callback;
+	}
+
+	ares = mono_async_result_new (domain, ac->wait_semaphore, ac->state, ac);
+	ares->async_delegate = target;
+
+	EnterCriticalSection (&mono_delegate_section);	
+	async_call_queue = g_list_append (async_call_queue, ares); 
+	ReleaseSemaphore (mono_delegate_semaphore, 1, NULL);
+
+	if (workers == 0) {
+		MonoObject *thread;
+		workers++;
+		thread = mono_thread_create (domain, async_invoke_thread);
+		g_assert (thread != NULL);
+	}
+	LeaveCriticalSection (&mono_delegate_section);
+
+	return ares;
+}
+
+MonoObject *
+mono_thread_pool_finish (MonoAsyncResult *ares, MonoArray **out_args, MonoObject **exc)
+{
+	ASyncCall *ac;
+	GList *l;
+
+	*exc = NULL;
+	*out_args = NULL;
+
+	EnterCriticalSection (&mono_delegate_section);	
+	/* check if already finished */
+	if (ares->endinvoke_called) {
+		*exc = (MonoObject *)mono_exception_from_name (mono_defaults.corlib, "System", 
+					      "InvalidOperationException");
+		LeaveCriticalSection (&mono_delegate_section);
+		return NULL;
+	}
+
+	ares->endinvoke_called = 1;
+	ac = (ASyncCall *)ares->data;
+
+	g_assert (ac != NULL);
+
+	if ((l = g_list_find (async_call_queue, ares))) {
+		async_call_queue = g_list_remove_link (async_call_queue, l);
+		mono_async_invoke (ares);
+	}		
+	LeaveCriticalSection (&mono_delegate_section);
+	
+	/* wait until we are really finished */
+	WaitForSingleObject (ac->wait_semaphore, INFINITE);
+
+	*exc = ac->msg->exc;
+	*out_args = ac->out_args;
+
+	return ac->res;
+}
+
+static void
+async_invoke_thread ()
+{
+	MonoDomain *domain;
+ 
+	for (;;) {
+		MonoAsyncResult *ar;
+		gboolean new_worker = FALSE;
+
+		if (WaitForSingleObject (mono_delegate_semaphore, 3000) == WAIT_TIMEOUT) {
+			EnterCriticalSection (&mono_delegate_section);
+			workers--;
+			LeaveCriticalSection (&mono_delegate_section);
+			ExitThread (0);
+		}
+		
+		ar = NULL;
+		EnterCriticalSection (&mono_delegate_section);
+		
+		if (async_call_queue) {
+			if ((g_list_length (async_call_queue) > 1) && 
+			    (workers < mono_worker_threads)) {
+				new_worker = TRUE;
+				workers++;
+			}
+
+			ar = (MonoAsyncResult *)async_call_queue->data;
+			async_call_queue = g_list_remove_link (async_call_queue, async_call_queue); 
+
+		}
+
+		LeaveCriticalSection (&mono_delegate_section);
+
+		if (mono_runtime_shutdown) {
+			EnterCriticalSection (&mono_delegate_section);
+			workers--;
+			LeaveCriticalSection (&mono_delegate_section);
+			ExitThread (0);
+		}
+
+		if (!ar)
+			continue;
+		
+		/* worker threads invokes methods in different domains,
+		 * so we need to set the right domain here */
+		domain = ((MonoObject *)ar)->vtable->domain;
+		mono_domain_set (domain);
+
+		if (new_worker)
+			mono_thread_create (domain, async_invoke_thread);
+
+		mono_async_invoke (ar);
+	}
+
+	g_assert_not_reached ();
+}
diff --git a/mono/metadata/threadpool.h b/mono/metadata/threadpool.h
new file mode 100644
index 00000000000..b225e6b3889
--- /dev/null
+++ b/mono/metadata/threadpool.h
@@ -0,0 +1,17 @@
+#ifndef _MONO_THREADPOOL_H_
+#define _MONO_THREADPOOL_H_
+
+#include <mono/metadata/object.h>
+#include <mono/metadata/reflection.h>
+
+extern int mono_worker_threads;
+
+MonoAsyncResult *
+mono_thread_pool_add     (MonoObject *target, MonoMethodMessage *msg, 
+			  MonoDelegate *async_callback, MonoObject *state);
+
+MonoObject *
+mono_thread_pool_finish (MonoAsyncResult *ares, MonoArray **out_args, 
+			 MonoObject **exc);
+
+#endif
diff --git a/mono/metadata/threads-types.h b/mono/metadata/threads-types.h
index aac7d5f26c4..6e93857ae14 100644
--- a/mono/metadata/threads-types.h
+++ b/mono/metadata/threads-types.h
@@ -12,8 +12,6 @@
 #define _MONO_METADATA_THREADS_TYPES_H_
 
 
-#include <config.h>
-
 #include <mono/io-layer/io-layer.h>
 
 /*
diff --git a/mono/metadata/threads.c b/mono/metadata/threads.c
index fbf86f58921..5705d450d74 100644
--- a/mono/metadata/threads.c
+++ b/mono/metadata/threads.c
@@ -3,19 +3,27 @@
  *
  * Author:
  *	Dick Porter (dick@ximian.com)
+ *	Patrik Torstensson (patrik.torstensson@labs2.com)
  *
  * (C) 2001 Ximian, Inc.
  */
 
 #include <config.h>
 #include <glib.h>
+#include <signal.h>
 
 #include <mono/metadata/object.h>
 #include <mono/metadata/appdomain.h>
+#include <mono/metadata/profiler-private.h>
 #include <mono/metadata/threads.h>
 #include <mono/metadata/threads-types.h>
+#include <mono/metadata/exception.h>
 #include <mono/io-layer/io-layer.h>
 
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
+
 #undef THREAD_DEBUG
 #undef THREAD_LOCK_DEBUG
 #undef THREAD_WAIT_DEBUG
@@ -24,9 +32,15 @@ struct StartInfo
 {
 	guint32 (*func)(void *);
 	MonoObject *obj;
+	void *this;
 	MonoDomain *domain;
 };
 
+typedef union {
+	gint32 ival;
+	gfloat fval;
+} IntFloatUnion;
+ 
 /* Controls access to the 'threads' array */
 static CRITICAL_SECTION threads_mutex;
 
@@ -36,21 +50,100 @@ static CRITICAL_SECTION threads_mutex;
 static CRITICAL_SECTION monitor_mutex;
 
 /* The array of existing threads that need joining before exit */
-static GPtrArray *threads=NULL;
+static GArray *threads=NULL;
 
 /* The MonoObject associated with the main thread */
-static MonoObject *main_thread;
+static MonoThread *main_thread;
 
 /* The TLS key that holds the MonoObject assigned to each thread */
 static guint32 current_object_key;
 
+/* function called at thread start */
+static MonoThreadStartCB mono_thread_start_cb = NULL;
+
 /* The TLS key that holds the LocalDataStoreSlot hash in each thread */
 static guint32 slothash_key;
 
+/* Spin lock for InterlockedXXX 64 bit functions */
+static CRITICAL_SECTION interlocked_mutex;
+
+/* handle_store() and handle_remove() manage the array of threads that
+ * still need to be waited for when the main thread exits.
+ */
+static void handle_store(guint32 tid)
+{
+	guint32 idx;
+	
+#ifdef THREAD_DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION ": thread ID %d", tid);
+#endif
+
+	EnterCriticalSection(&threads_mutex);
+	if(threads==NULL) {
+		threads=g_array_new(FALSE, FALSE, sizeof(guint32));
+	}
+
+	/* Make sure there is only one instance in the array.  We
+	 * store the thread both in the start_wrapper (in the
+	 * subthread), and as soon as possible in the parent thread.
+	 * This is to minimise the window in which the thread exists
+	 * but we haven't recorded it.
+	 */
+	for(idx=0; idx<threads->len; idx++) {
+		if(g_array_index (threads, guint32, idx)==tid) {
+			g_array_remove_index_fast (threads, idx);
+		}
+	}
+	
+	g_array_append_val(threads, tid);
+	LeaveCriticalSection(&threads_mutex);
+}
+
+static void handle_remove(guint32 tid)
+{
+	guint32 idx;
+	
+#ifdef THREAD_DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION ": thread ID %d", tid);
+#endif
+
+	EnterCriticalSection(&threads_mutex);
+
+	for(idx=0; idx<threads->len; idx++) {
+		if(g_array_index (threads, guint32, idx)==tid) {
+			g_array_remove_index_fast(threads, idx);
+		}
+	}
+	
+	LeaveCriticalSection(&threads_mutex);
+
+	/* Don't close the handle here, wait for the object finalizer
+	 * to do it. Otherwise, the following race condition applies:
+	 *
+	 * 1) Thread exits (and handle_remove() closes the handle)
+	 *
+	 * 2) Some other handle is reassigned the same slot
+	 *
+	 * 3) Another thread tries to join the first thread, and
+	 * blocks waiting for the reassigned handle to be signalled
+	 * (which might never happen).  This is possible, because the
+	 * thread calling Join() still has a reference to the first
+	 * thread's object.
+	 */
+}
+
+static void thread_cleanup (guint32 tid)
+{
+	mono_profiler_thread_end (tid);
+	handle_remove (tid);
+}
+
 static guint32 start_wrapper(void *data)
 {
 	struct StartInfo *start_info=(struct StartInfo *)data;
 	guint32 (*start_func)(void *);
+	void *this;
+	guint32 tid;
 	
 #ifdef THREAD_DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION ": Start wrapper");
@@ -62,54 +155,76 @@ static guint32 start_wrapper(void *data)
 	 * This is recorded so CurrentThread can return the
 	 * Thread object.
 	 */
-	TlsSetValue(current_object_key, start_info->obj);
-	start_func=start_info->func;
+	TlsSetValue (current_object_key, start_info->obj);
+	start_func = start_info->func;
 	mono_domain_set (start_info->domain);
+	this = start_info->this;
+	g_free (start_info);
+
+	tid=GetCurrentThreadId ();
 	
-	g_free(start_info);
-	
-	start_func(NULL);
+	handle_store(tid);
+	mono_profiler_thread_start (tid);
+
+	if (mono_thread_start_cb)
+		mono_thread_start_cb (&tid);
+	start_func (this);
+
+	/* If the thread calls ExitThread at all, this remaining code
+	 * will not be executed, but the main thread will eventually
+	 * call thread_cleanup() on this thread's behalf.
+	 */
 
 #ifdef THREAD_DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION ": Start wrapper terminating");
 #endif
-
+	
+	thread_cleanup (tid);
+	
 	return(0);
 }
-		
-static void handle_store(HANDLE thread)
+
+MonoObject *
+mono_thread_create (MonoDomain *domain, gpointer func)
 {
-#ifdef THREAD_DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": thread %p", thread);
-#endif
+	MonoClassField *field;
+	MonoObject *thread;
+	HANDLE thread_handle;
+	struct StartInfo *start_info;
+	guint32 tid;
+	
+	thread = mono_object_new (domain, mono_defaults.thread_class);
 
-	EnterCriticalSection(&threads_mutex);
-	if(threads==NULL) {
-		threads=g_ptr_array_new();
-	}
-	g_ptr_array_add(threads, thread);
-	LeaveCriticalSection(&threads_mutex);
-}
+	field=mono_class_get_field_from_name(mono_defaults.thread_class, "system_thread_handle");
+	g_assert (field);
 
-static void handle_remove(HANDLE thread)
-{
+	start_info=g_new0 (struct StartInfo, 1);
+	start_info->func = func;
+	start_info->obj = thread;
+	start_info->domain = domain;
+	/* start_info->this needs to be set? */
+		
+	thread_handle = CreateThread(NULL, 0, start_wrapper, start_info, 0, &tid);
 #ifdef THREAD_DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": thread %p", thread);
+	g_message(G_GNUC_PRETTY_FUNCTION ": Started thread ID %d (handle %p)",
+		  tid, thread_handle);
 #endif
+	g_assert (thread_handle);
 
-	EnterCriticalSection(&threads_mutex);
-	g_ptr_array_remove_fast(threads, thread);
-	LeaveCriticalSection(&threads_mutex);
-	CloseHandle(thread);
-}
+	handle_store(tid);
 
+	*(gpointer *)(((char *)thread) + field->offset) = thread_handle; 
+
+	return thread;
+}
 
 HANDLE ves_icall_System_Threading_Thread_Thread_internal(MonoObject *this,
 							 MonoObject *start)
 {
-	MonoClassField *field;
+	MonoMulticastDelegate *delegate = (MonoMulticastDelegate*)start;
 	guint32 (*start_func)(void *);
 	struct StartInfo *start_info;
+	MonoMethod *im;
 	HANDLE thread;
 	guint32 tid;
 	
@@ -119,20 +234,20 @@ HANDLE ves_icall_System_Threading_Thread_Thread_internal(MonoObject *this,
 		  this, start);
 #endif
 	
-	field=mono_class_get_field_from_name(mono_defaults.delegate_class, "method_ptr");
-	start_func= *(gpointer *)(((char *)start) + field->offset);
-	
+	im = mono_get_delegate_invoke (start->vtable->klass);
+	start_func = mono_compile_method (im);
+
 	if(start_func==NULL) {
 		g_warning(G_GNUC_PRETTY_FUNCTION
 			  ": Can't locate start method!");
 		return(NULL);
 	} else {
 		/* This is freed in start_wrapper */
-		start_info=g_new0(struct StartInfo, 1);
-		start_info->func=start_func;
-		start_info->obj=this;
+		start_info = g_new0 (struct StartInfo, 1);
+		start_info->func = start_func;
+		start_info->this = delegate;
+		start_info->obj = this;
 		start_info->domain = mono_domain_get ();
-		
 		thread=CreateThread(NULL, 0, start_wrapper, start_info,
 				    CREATE_SUSPENDED, &tid);
 		if(thread==NULL) {
@@ -140,19 +255,29 @@ HANDLE ves_icall_System_Threading_Thread_Thread_internal(MonoObject *this,
 				  ": CreateThread error 0x%x", GetLastError());
 			return(NULL);
 		}
-		
+
+		handle_store(tid);
+
 #ifdef THREAD_DEBUG
-		g_message(G_GNUC_PRETTY_FUNCTION ": Started thread ID %d",
-			  tid);
+		g_message(G_GNUC_PRETTY_FUNCTION
+			  ": Started thread ID %d (handle %p)", tid, thread);
 #endif
-
-		/* Store handle for cleanup later */
-		handle_store(thread);
 		
 		return(thread);
 	}
 }
 
+void ves_icall_System_Threading_Thread_Thread_free_internal (MonoObject *this,
+							     HANDLE thread)
+{
+#ifdef THREAD_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Closing thread %p, handle %p",
+		   this, thread);
+#endif
+
+	CloseHandle (thread);
+}
+
 void ves_icall_System_Threading_Thread_Start_internal(MonoObject *this,
 						      HANDLE thread)
 {
@@ -172,13 +297,25 @@ void ves_icall_System_Threading_Thread_Sleep_internal(gint32 ms)
 	Sleep(ms);
 }
 
-MonoObject *ves_icall_System_Threading_Thread_CurrentThread_internal(void)
+MonoAppDomain *ves_icall_System_Threading_Thread_CurrentThreadDomain_internal(void) 
 {
-	MonoObject *thread;
+	/* return the current app */
+	return mono_domain_get()->domain;
+}
+
+MonoThread *
+mono_thread_current (void)
+{
+	MonoThread *thread;
 	
 	/* Find the current thread object */
-	thread=TlsGetValue(current_object_key);
-	return(thread);
+	thread=TlsGetValue (current_object_key);
+	
+#ifdef THREAD_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": returning %p", thread);
+#endif
+
+	return (thread);
 }
 
 gboolean ves_icall_System_Threading_Thread_Join_internal(MonoObject *this,
@@ -189,14 +326,24 @@ gboolean ves_icall_System_Threading_Thread_Join_internal(MonoObject *this,
 	if(ms== -1) {
 		ms=INFINITE;
 	}
+#ifdef THREAD_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": joining thread handle %p, %d ms",
+		   thread, ms);
+#endif
 	
 	ret=WaitForSingleObject(thread, ms);
 	if(ret==WAIT_OBJECT_0) {
-		/* Clean up the handle */
-		handle_remove(thread);
+#ifdef THREAD_DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": join successful");
+#endif
+
 		return(TRUE);
 	}
 	
+#ifdef THREAD_DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION ": join failed");
+#endif
+
 	return(FALSE);
 }
 
@@ -223,20 +370,39 @@ MonoObject *ves_icall_System_Threading_Thread_SlotHash_lookup(void)
 	return(data);
 }
 
+static void mon_finalize (void *o, void *unused)
+{
+	MonoThreadsSync *mon=(MonoThreadsSync *)o;
+	
+#ifdef THREAD_LOCK_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Finalizing sync");
+#endif
+	
+	CloseHandle (mon->monitor);
+	CloseHandle (mon->sema);
+	CloseHandle (mon->waiters_done);
+}
+
 static MonoThreadsSync *mon_new(void)
 {
 	MonoThreadsSync *new;
 	
+#if HAVE_BOEHM_GC
+	new=(MonoThreadsSync *)GC_debug_malloc (sizeof(MonoThreadsSync), "sync", 1);
+	GC_debug_register_finalizer (new, mon_finalize, NULL, NULL, NULL);
+#else
 	/* This should be freed when the object that owns it is
 	 * deleted
 	 */
-
-	new=(MonoThreadsSync *)g_new0(MonoThreadsSync, 1);
-	new->monitor=CreateMutex(NULL, FALSE, NULL);
-#ifdef THREAD_LOCK_DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": ThreadsSync mutex created: %p",
-		  new->monitor);
+	new=(MonoThreadsSync *)g_new0 (MonoThreadsSync, 1);
 #endif
+	
+	new->monitor=CreateMutex(NULL, FALSE, NULL);
+	if(new->monitor==NULL) {
+		/* Throw some sort of system exception? (ditto for the
+		 * sem and event handles below)
+		 */
+	}
 
 	new->waiters_count=0;
 	new->was_broadcast=FALSE;
@@ -244,6 +410,12 @@ static MonoThreadsSync *mon_new(void)
 	new->sema=CreateSemaphore(NULL, 0, 0x7fffffff, NULL);
 	new->waiters_done=CreateEvent(NULL, FALSE, FALSE, NULL);
 	
+#ifdef THREAD_LOCK_DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION
+		  ": ThreadsSync %p mutex created: %p, sem: %p, event: %p",
+		  new, new->monitor, new->sema, new->waiters_done);
+#endif
+	
 	return(new);
 }
 
@@ -255,7 +427,7 @@ gboolean ves_icall_System_Threading_Monitor_Monitor_try_enter(MonoObject *obj,
 	
 #ifdef THREAD_LOCK_DEBUG
 	g_message(G_GNUC_PRETTY_FUNCTION
-		  ": Trying to lock %p in thread %d", obj,
+		  ": Trying to lock object %p in thread %d", obj,
 		  GetCurrentThreadId());
 #endif
 
@@ -283,8 +455,8 @@ gboolean ves_icall_System_Threading_Monitor_Monitor_try_enter(MonoObject *obj,
 		mon->tid=GetCurrentThreadId();
 	
 #ifdef THREAD_LOCK_DEBUG
-	g_message(G_GNUC_PRETTY_FUNCTION ": %p now locked %d times", obj,
-		  mon->count);
+		g_message(G_GNUC_PRETTY_FUNCTION
+			  ": object %p now locked %d times", obj, mon->count);
 #endif
 
 		return(TRUE);
@@ -352,6 +524,11 @@ gboolean ves_icall_System_Threading_Monitor_Monitor_test_owner(MonoObject *obj)
 	}
 
 	if(mon->tid!=GetCurrentThreadId()) {
+#ifdef THREAD_LOCK_DEBUG
+		g_message (G_GNUC_PRETTY_FUNCTION
+			   ": object %p is owned by thread %d", obj, mon->tid);
+#endif
+
 		goto finished;
 	}
 	
@@ -669,22 +846,138 @@ HANDLE ves_icall_System_Threading_Mutex_CreateMutex_internal (MonoBoolean owned,
 void ves_icall_System_Threading_Mutex_ReleaseMutex_internal (HANDLE handle ) { 
 	ReleaseMutex(handle);
 }
-

-HANDLE ves_icall_System_Threading_Events_CreateEvent_internal (MonoBoolean manual,

-															  MonoBoolean initial,

-															  char *name) {

-	return (CreateEvent(NULL,manual,initial,name));

-}

-

-gboolean ves_icall_System_Threading_Events_SetEvent_internal (HANDLE handle) {

-	return (SetEvent(handle));

-}

 
-gboolean ves_icall_System_Threading_Events_ResetEvent_internal (HANDLE handle) {

-	return (ResetEvent(handle));

-}

+HANDLE ves_icall_System_Threading_Events_CreateEvent_internal (MonoBoolean manual,
+															  MonoBoolean initial,
+															  char *name) {
+	return (CreateEvent(NULL,manual,initial,name));
+}
+
+gboolean ves_icall_System_Threading_Events_SetEvent_internal (HANDLE handle) {
+	return (SetEvent(handle));
+}
+
+gboolean ves_icall_System_Threading_Events_ResetEvent_internal (HANDLE handle) {
+	return (ResetEvent(handle));
+}
+
+gint32 ves_icall_System_Threading_Interlocked_Increment_Int (gint32 *location)
+{
+	return InterlockedIncrement (location);
+}
+
+gint64 ves_icall_System_Threading_Interlocked_Increment_Long (gint64 *location)
+{
+	gint32 lowret;
+	gint32 highret;
+
+	EnterCriticalSection(&interlocked_mutex);
+
+	lowret = InterlockedIncrement((gint32 *) location);
+	if (0 == lowret)
+		highret = InterlockedIncrement((gint32 *) location + 1);
+	else
+		highret = *((gint32 *) location + 1);
+
+	LeaveCriticalSection(&interlocked_mutex);
+
+	return (gint64) highret << 32 | (gint64) lowret;
+}
+
+gint32 ves_icall_System_Threading_Interlocked_Decrement_Int (gint32 *location)
+{
+	return InterlockedDecrement(location);
+}
+
+gint64 ves_icall_System_Threading_Interlocked_Decrement_Long (gint64 * location)
+{
+	gint32 lowret;
+	gint32 highret;
+
+	EnterCriticalSection(&interlocked_mutex);
+
+	lowret = InterlockedDecrement((gint32 *) location);
+	if (-1 == lowret)
+		highret = InterlockedDecrement((gint32 *) location + 1);
+	else
+		highret = *((gint32 *) location + 1);
+
+	LeaveCriticalSection(&interlocked_mutex);
+
+	return (gint64) highret << 32 | (gint64) lowret;
+}
+
+gint32 ves_icall_System_Threading_Interlocked_Exchange_Int (gint32 *location1, gint32 value)
+{
+	return InterlockedExchange(location1, value);
+}
+
+MonoObject * ves_icall_System_Threading_Interlocked_Exchange_Object (MonoObject **location1, MonoObject *value)
+{
+	return (MonoObject *) InterlockedExchangePointer((gpointer *) location1, value);
+}
+
+gfloat ves_icall_System_Threading_Interlocked_Exchange_Single (gfloat *location1, gfloat value)
+{
+	IntFloatUnion val, ret;
+
+	val.fval = value;
+	ret.ival = InterlockedExchange((gint32 *) location1, val.ival);
+
+	return ret.fval;
+}
+
+gint32 ves_icall_System_Threading_Interlocked_CompareExchange_Int(gint32 *location1, gint32 value, gint32 comparand)
+{
+	return InterlockedCompareExchange(location1, value, comparand);
+}
+
+MonoObject * ves_icall_System_Threading_Interlocked_CompareExchange_Object (MonoObject **location1, MonoObject *value, MonoObject *comparand)
+{
+	return (MonoObject *) InterlockedCompareExchangePointer((gpointer *) location1, value, comparand);
+}
+
+gfloat ves_icall_System_Threading_Interlocked_CompareExchange_Single (gfloat *location1, gfloat value, gfloat comparand)
+{
+	IntFloatUnion val, ret, cmp;
+
+	val.fval = value;
+	cmp.fval = comparand;
+	ret.ival = InterlockedCompareExchange((gint32 *) location1, val.ival, cmp.ival);
+
+	return ret.fval;
+}
+
+void
+ves_icall_System_Threading_Thread_Abort (MonoThread *thread, MonoObject *state)
+{
+	thread->abort_state = state;
+	thread->abort_exc = mono_get_exception_thread_abort ();
+
+
+	/* fixme: store the state somewhere */
+#ifndef __MINGW32__
+	PosixKillThread (thread->handle, SIGUSR1);
+#else
+	g_assert_not_reached ();
+#endif
+}
+
+void
+ves_icall_System_Threading_Thread_ResetAbort (void)
+{
+	MonoThread *thread = mono_thread_current ();
+	
+	if (!thread->abort_exc) {
+		const char *msg = "Unable to reset abort because no abort was requested";
+		mono_raise_exception (mono_get_exception_thread_state (msg));
+	} else {
+		thread->abort_exc = NULL;
+		thread->abort_state = NULL;
+	}
+}
 
-void mono_thread_init(MonoDomain *domain)
+void mono_thread_init(MonoDomain *domain, MonoThreadStartCB start_cb)
 {
 	MonoClass *thread_class;
 	
@@ -697,14 +990,35 @@ void mono_thread_init(MonoDomain *domain)
 	 * object? In theory, I guess the whole program should act as
 	 * though exit() were called :-)
 	 */
-	main_thread = mono_object_new (domain, thread_class);
+#ifdef THREAD_DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION
+		  ": Starting to build main Thread object");
+#endif
+	main_thread = (MonoThread *)mono_object_new (domain, thread_class);
+
+#if 0
+	main_thread->handle = OpenThread(THREAD_ALL_ACCESS, FALSE, GetCurrentThreadId());
+#endif
+
+#ifdef THREAD_DEBUG
+	g_message(G_GNUC_PRETTY_FUNCTION
+		  ": Finished building main Thread object: %p", main_thread);
+#endif
 
 	InitializeCriticalSection(&threads_mutex);
 	InitializeCriticalSection(&monitor_mutex);
+	InitializeCriticalSection(&interlocked_mutex);
 	
 	current_object_key=TlsAlloc();
+#ifdef THREAD_DEBUG
+	g_message (G_GNUC_PRETTY_FUNCTION ": Allocated current_object_key %d",
+		   current_object_key);
+#endif
+
 	TlsSetValue(current_object_key, main_thread);
 
+	mono_thread_start_cb = start_cb;
+
 	slothash_key=TlsAlloc();
 }
 
@@ -713,6 +1027,7 @@ void mono_thread_cleanup(void)
 	HANDLE wait[MAXIMUM_WAIT_OBJECTS];
 	guint32 i, j;
 	
+#ifndef __MINGW32__
 	/* join each thread that's still running */
 #ifdef THREAD_DEBUG
 	g_message("Joining each running thread...");
@@ -725,30 +1040,56 @@ void mono_thread_cleanup(void)
 		return;
 	}
 	
-	/* This isnt the right way to do it.
-	 *
-	 * The first method call should be started in its own thread,
-	 * and then the main thread should poll an event and wait for
-	 * any terminated threads, until there are none left.
-	 */
+	do{
+	rescan:
+		EnterCriticalSection (&threads_mutex);
 #ifdef THREAD_DEBUG
-	g_message("There are %d threads to join", threads->len);
+		g_message("There are %d threads to join", threads->len);
+		for(i=0; i<threads->len; i++) {
+			g_message("Waiting for: %d",
+				  g_array_index(threads, guint32, i));
+		}
 #endif
 
-	for(i=0; i<threads->len; i+=MAXIMUM_WAIT_OBJECTS) {
-		for(j=0; j<MAXIMUM_WAIT_OBJECTS && i+j<threads->len; j++) {
+		for(i=0; i<MAXIMUM_WAIT_OBJECTS && i<threads->len; i++) {
+			wait[i]=OpenThread (THREAD_ALL_ACCESS, FALSE,
+					    g_array_index(threads, guint32, i));
+			if(wait[i]==NULL) {
+				/* The thread must have been killed */
 #ifdef THREAD_DEBUG
-			g_message("Waiting for threads %d in slot %d", i+j, j);
+				g_message (G_GNUC_PRETTY_FUNCTION
+					   ": Thread %d already dead",
+					   g_array_index (threads, guint32,
+							  i));
 #endif
-			wait[j]=g_ptr_array_index(threads, i+j);
+
+				LeaveCriticalSection (&threads_mutex);
+
+				for(j=0; j<i; j++) {
+					CloseHandle (wait[j]);
+				}
+
+				thread_cleanup (g_array_index (threads,
+							       guint32, i));
+				/* Start over */
+				goto rescan;
+			}
 		}
+		
 #ifdef THREAD_DEBUG
-		g_message("%d threads to wait for in this batch", j);
+		g_message("%d threads to wait for in this batch", i);
 #endif
 
-		WaitForMultipleObjects(j, wait, TRUE, INFINITE);
-	}
+		LeaveCriticalSection (&threads_mutex);
+
+		WaitForMultipleObjects(i, wait, TRUE, INFINITE);
+
+		for(j=0; j<i; j++) {
+			CloseHandle (wait[j]);
+		}
+	} while(i>0);
 	
-	g_ptr_array_free(threads, FALSE);
+	g_array_free(threads, FALSE);
 	threads=NULL;
+#endif /* __MINGW32__ */
 }
diff --git a/mono/metadata/threads.h b/mono/metadata/threads.h
index 758897e36ce..40b0299bfee 100644
--- a/mono/metadata/threads.h
+++ b/mono/metadata/threads.h
@@ -3,6 +3,7 @@
  *
  * Author:
  *	Dick Porter (dick@ximian.com)
+ *	Patrik Torstensson (patrik.torstensson@labs2.com)
  *
  * (C) 2001 Ximian, Inc
  */
@@ -13,14 +14,19 @@
 #include <config.h>
 
 #include <mono/metadata/object.h>
+#include <mono/metadata/appdomain.h>
 
-extern void mono_thread_init (MonoDomain *domain);
+extern void mono_thread_init (MonoDomain *domain, MonoThreadStartCB start_cb);
 extern void mono_thread_cleanup(void);
+MonoThread *mono_thread_current (void);
+
+MonoObject *mono_thread_create (MonoDomain *domain, gpointer func);
 
 extern HANDLE ves_icall_System_Threading_Thread_Thread_internal(MonoObject *this, MonoObject *start);
+extern void ves_icall_System_Threading_Thread_Thread_free_internal(MonoObject *this, HANDLE thread);
 extern void ves_icall_System_Threading_Thread_Start_internal(MonoObject *this, HANDLE thread);
 extern void ves_icall_System_Threading_Thread_Sleep_internal(int ms);
-extern MonoObject *ves_icall_System_Threading_Thread_CurrentThread_internal(void);
+extern MonoAppDomain * ves_icall_System_Threading_Thread_CurrentThreadDomain_internal(void);
 extern gboolean ves_icall_System_Threading_Thread_Join_internal(MonoObject *this, int ms, HANDLE thread);
 extern void ves_icall_System_Threading_Thread_SlotHash_store(MonoObject *data);
 extern MonoObject *ves_icall_System_Threading_Thread_SlotHash_lookup(void);
@@ -42,5 +48,20 @@ extern gboolean ves_icall_System_Threading_WaitHandle_WaitAll_internal(MonoArray
 extern gint32 ves_icall_System_Threading_WaitHandle_WaitAny_internal(MonoArray *mono_handles, gint32 ms, gboolean exitContext);
 extern gboolean ves_icall_System_Threading_WaitHandle_WaitOne_internal(MonoObject *this, HANDLE handle, gint32 ms, gboolean exitContext);
 
+extern gint32 ves_icall_System_Threading_Interlocked_Increment_Int(gint32 *location);
+extern gint64 ves_icall_System_Threading_Interlocked_Increment_Long(gint64 *location);
+extern gint32 ves_icall_System_Threading_Interlocked_Decrement_Int(gint32 *location);
+extern gint64 ves_icall_System_Threading_Interlocked_Decrement_Long(gint64 * location);
+
+extern gint32 ves_icall_System_Threading_Interlocked_Exchange_Int(gint32 *location1, gint32 value);
+extern MonoObject *ves_icall_System_Threading_Interlocked_Exchange_Object(MonoObject **location1, MonoObject *value);
+extern gfloat ves_icall_System_Threading_Interlocked_Exchange_Single(gfloat *location1, gfloat value);
+
+extern gint32 ves_icall_System_Threading_Interlocked_CompareExchange_Int(gint32 *location1, gint32 value, gint32 comparand);
+extern MonoObject *ves_icall_System_Threading_Interlocked_CompareExchange_Object(MonoObject **location1, MonoObject *value, MonoObject *comparand);
+extern gfloat ves_icall_System_Threading_Interlocked_CompareExchange_Single(gfloat *location1, gfloat value, gfloat comparand);
+extern void ves_icall_System_Threading_Thread_Abort (MonoThread *thread, MonoObject *state);
+extern void ves_icall_System_Threading_Thread_ResetAbort (void);
+
 
 #endif /* _MONO_METADATA_THREADS_H_ */
diff --git a/mono/metadata/types.h b/mono/metadata/types.h
deleted file mode 100644
index e5ddd7c4f66..00000000000
--- a/mono/metadata/types.h
+++ /dev/null
@@ -1,17 +0,0 @@
-#ifndef _MONO_METADATA_TYPES_H_
-#define _MONO_METADATA_TYPES_H_
-
-typedef struct _MonoImage MonoImage;
-
-enum MonoImageOpenStatus {
-	MONO_IMAGE_OK,
-	MONO_IMAGE_ERROR_ERRNO,
-	MONO_IMAGE_MISSING_ASSEMBLYREF,
-	MONO_IMAGE_IMAGE_INVALID
-};
-
-typedef struct _MonoAssembly MonoAssembly;
-
-typedef char * (*MonoAssemblyResolverFn)(const char *name);
-
-#endif
diff --git a/mono/metadata/unicode.c b/mono/metadata/unicode.c
index e162e65d403..9cc6805ac0c 100644
--- a/mono/metadata/unicode.c
+++ b/mono/metadata/unicode.c
@@ -14,7 +14,11 @@
 #include <mono/metadata/object.h>
 #include <mono/metadata/unicode.h>
 
-#include <iconv.h>
+#if HAVE_ICONV_H
+#include <iconv.h> 
+#elif HAVE_GICONV_H
+#include <giconv.h> 
+#endif
 
 static MonoUnicodeCategory catmap[] = {
 	/* G_UNICODE_CONTROL = */              Control,
@@ -94,7 +98,10 @@ ves_icall_System_Char_IsUpper (gunichar2 c)
 gboolean 
 ves_icall_System_Char_IsNumber (gunichar2 c)
 {
-	return g_unichar_isdigit (c);
+	GUnicodeType t = g_unichar_type (c);
+	return t == G_UNICODE_DECIMAL_NUMBER ||
+		t == G_UNICODE_LETTER_NUMBER ||
+		t == G_UNICODE_OTHER_NUMBER;
 }
 
 gboolean 
@@ -154,7 +161,7 @@ ves_icall_iconv_new_encoder (MonoString *name, MonoBoolean big_endian)
 	iconv_t cd;
 	char *n;
 
-	// fixme: don't enforce big endian, support old iconv
+	/* FIXME: don't enforce big endian, support old iconv */
 
 	g_assert (name);
 
@@ -171,6 +178,7 @@ ves_icall_iconv_new_encoder (MonoString *name, MonoBoolean big_endian)
 	cd = iconv_open (n, "UTF-16");
 #endif
 	g_assert (cd != (iconv_t)-1);
+	g_free (n);
 
 	return (gpointer)cd;
 }
@@ -181,7 +189,7 @@ ves_icall_iconv_new_decoder (MonoString *name, MonoBoolean big_endian)
 	iconv_t cd;
 	char *n;
 
-	// fixme: don't enforce big endian, support old iconv
+	/* FIXME: don't enforce big endian, support old iconv */
 
 	g_assert (name);
 
@@ -198,6 +206,7 @@ ves_icall_iconv_new_decoder (MonoString *name, MonoBoolean big_endian)
 	cd = iconv_open ("UTF-16", n);
 #endif
 	g_assert (cd != (iconv_t)-1);
+	g_free (n);
 
 	return (gpointer)cd;
 }
@@ -250,7 +259,7 @@ again:
 	outbytes_remaining = outbuf_size;
 	outp = buf;
 
-	err = iconv (cd, (const char **)&p, &inbytes_remaining, 
+	err = iconv (cd, (char **)&p, &inbytes_remaining, 
 		     (char **)&outp, &outbytes_remaining);
 
 	if(err == (size_t)-1) {
@@ -263,8 +272,9 @@ again:
 			goto again;
 		}
 		case EILSEQ:
-			have_error = TRUE;
-			break;
+			p++;
+			inbytes_remaining--;
+			goto again;
 		default:
 			have_error = TRUE;
 			break;
@@ -293,7 +303,7 @@ again:
 }
 
 int
-ves_icall_iconv_get_byte_count (gpointer converter, MonoArray *chars, gint32 index, gint32 count)
+ves_icall_iconv_get_byte_count (gpointer converter, MonoArray *chars, gint32 idx, gint32 count)
 {
 	iconv_t cd = (iconv_t)converter;
 	guchar *src;
@@ -301,13 +311,12 @@ ves_icall_iconv_get_byte_count (gpointer converter, MonoArray *chars, gint32 ind
 
 	g_assert (cd);
 	g_assert (chars);
-	g_assert (mono_array_length (chars) > index);
-	g_assert (mono_array_length (chars) >= (index + count));
+	g_assert (mono_array_length (chars) >= (idx + count));
 
-	if (!(len = (mono_array_length (chars) - index) * 2))
+	if (!(len = (mono_array_length (chars) - idx) * 2))
 		return 0;
 
-	src =  mono_array_addr (chars, guint16, index);
+	src =  mono_array_addr (chars, guint16, idx);
 
 	return iconv_get_length (cd, src, len, TRUE);
 }
@@ -346,11 +355,16 @@ iconv_convert (iconv_t cd, guchar *src, int len, guchar *dest, int max_len, gboo
 	outbytes_remaining = outbuf_size;
 	outp = dest;
 
-	err = iconv (cd, (const char **)&p, &inbytes_remaining, (char **)&outp, &outbytes_remaining);
+ again:
+	err = iconv (cd, (char **)&p, &inbytes_remaining, (char **)&outp, &outbytes_remaining);
 
 	if(err == (size_t)-1) {
 		if (errno == EINVAL) {
 			/* Incomplete text, do not report an error */
+		} else if (errno == EILSEQ) {
+			p++;
+			inbytes_remaining--;
+			goto again;
 		} else {
 			have_error = TRUE;
 		}
@@ -403,9 +417,9 @@ ves_icall_iconv_get_bytes (gpointer converter, MonoArray *chars, gint32 charInde
 	g_assert (mono_array_length (chars) > charIndex);
 	g_assert (mono_array_length (chars) >= (charIndex + charCount));
 	g_assert (mono_array_length (bytes) > byteIndex);
-	g_assert (mono_array_length (chars) >= (byteIndex + charCount));
+	g_assert (mono_array_length (bytes) >= (byteIndex + charCount));
 
-	if (!(len = (mono_array_length (chars) - charIndex) * 2))
+	if (!(len = (charCount - charIndex) * 2))
 		return 0;
 
 	src =  mono_array_addr (chars, guint16, charIndex);
@@ -417,23 +431,20 @@ ves_icall_iconv_get_bytes (gpointer converter, MonoArray *chars, gint32 charInde
 }
 
 int
-ves_icall_iconv_get_char_count (gpointer converter, MonoArray *bytes, gint32 index, gint32 count)
+ves_icall_iconv_get_char_count (gpointer converter, MonoArray *bytes, gint32 idx, gint32 count)
 {
 	iconv_t cd = (iconv_t)converter;
 	guchar *src;
-	int len;
 
 	g_assert (cd);
 	g_assert (bytes);
-	g_assert (mono_array_length (bytes) > index);
-	g_assert (mono_array_length (bytes) >= (index + count));
-
-	if (!(len = (mono_array_length (bytes) - index)))
-		return 0;
+	g_assert (mono_array_length (bytes) > idx);
+	g_assert (mono_array_length (bytes) >= (idx + count));
 
-	src =  mono_array_addr (bytes, char, index);
+	src =  mono_array_addr (bytes, char, idx);
 
-	return iconv_get_length (cd, src, len, FALSE);
+	/* iconv_get_length () returns the number of bytes */
+	return iconv_get_length (cd, src, (int) count, FALSE) / 2;
 }
 
 int
@@ -442,23 +453,20 @@ ves_icall_iconv_get_chars (gpointer converter, MonoArray *bytes, gint32 byteInde
 {
 	iconv_t cd = (iconv_t)converter;
 	guchar *src, *dest;
-	int len, max_len;
+	int max_len;
 
 	g_assert (cd);
 	g_assert (chars);
 	g_assert (bytes);
 	g_assert (mono_array_length (bytes) > byteIndex);
-	g_assert (mono_array_length (chars) >= (byteIndex + byteCount));
+	g_assert (mono_array_length (bytes) >= (byteIndex + byteCount));
 	g_assert (mono_array_length (chars) > charIndex);
 
-	if (!(len = (mono_array_length (bytes) - byteIndex)))
-		return 0;
-
 	src =  mono_array_addr (bytes, char, byteIndex);
 	dest = mono_array_addr (chars, guint16, charIndex);
 
 	max_len = (mono_array_length (chars) - charIndex) * 2;
 
 	/* iconv_convert () returns the number of bytes */
-	return iconv_convert (cd, src, len, dest, max_len, FALSE) / 2;
+	return iconv_convert (cd, src, (int) byteCount, dest, max_len, FALSE) / 2;
 }
diff --git a/mono/metadata/unicode.h b/mono/metadata/unicode.h
index 79a0874c142..f954e02da7c 100644
--- a/mono/metadata/unicode.h
+++ b/mono/metadata/unicode.h
@@ -104,7 +104,7 @@ ves_icall_iconv_reset                    (gpointer converter);
 
 int
 ves_icall_iconv_get_byte_count           (gpointer converter, MonoArray *chars,
-					  gint32 index, gint32 count);
+					  gint32 idx, gint32 count);
 
 int
 ves_icall_iconv_get_bytes                (gpointer converter, MonoArray *chars,
@@ -113,7 +113,7 @@ ves_icall_iconv_get_bytes                (gpointer converter, MonoArray *chars,
 
 int
 ves_icall_iconv_get_char_count           (gpointer converter, MonoArray *bytes,
-					  gint32 index, gint32 count);
+					  gint32 idx, gint32 count);
 
 int
 ves_icall_iconv_get_chars                (gpointer converter, MonoArray *bytes,
diff --git a/mono/metadata/verify.c b/mono/metadata/verify.c
index 2dad13ec69b..dfcfc5fc559 100644
--- a/mono/metadata/verify.c
+++ b/mono/metadata/verify.c
@@ -3,6 +3,8 @@
 #include <mono/metadata/verify.h>
 #include <mono/metadata/opcodes.h>
 #include <mono/metadata/tabledefs.h>
+#include <mono/metadata/reflection.h>
+#include <mono/metadata/debug-helpers.h>
 #include <mono/metadata/mono-endian.h>
 #include <string.h>
 #include <signal.h>
@@ -112,16 +114,16 @@ is_valid_assembly_flags (guint32 flags) {
 }
 
 static int
-is_valid_blob (MonoImage *image, guint32 index, int notnull)
+is_valid_blob (MonoImage *image, guint32 blob_index, int notnull)
 {
 	guint32 size;
-	const char *p, *send;
+	const char *p, *blob_end;
 	
-	if (index >= image->heap_blob.size)
+	if (blob_index >= image->heap_blob.size)
 		return 0;
-	p = mono_metadata_blob_heap (image, index);
-	size = mono_metadata_decode_blob_size (p, &send);
-	if (index + size + (send-p) > image->heap_blob.size)
+	p = mono_metadata_blob_heap (image, blob_index);
+	size = mono_metadata_decode_blob_size (p, &blob_end);
+	if (blob_index + size + (blob_end-p) > image->heap_blob.size)
 		return 0;
 	if (notnull && !size)
 		return 0;
@@ -129,20 +131,20 @@ is_valid_blob (MonoImage *image, guint32 index, int notnull)
 }
 
 static const char*
-is_valid_string (MonoImage *image, guint32 index, int notnull)
+is_valid_string (MonoImage *image, guint32 str_index, int notnull)
 {
-	const char *p, *send, *res;
+	const char *p, *blob_end, *res;
 	
-	if (index >= image->heap_strings.size)
+	if (str_index >= image->heap_strings.size)
 		return NULL;
-	res = p = mono_metadata_string_heap (image, index);
-	send = mono_metadata_string_heap (image, image->heap_strings.size - 1);
+	res = p = mono_metadata_string_heap (image, str_index);
+	blob_end = mono_metadata_string_heap (image, image->heap_strings.size - 1);
 	if (notnull && !*p)
 		return 0;
 	/* 
 	 * FIXME: should check it's a valid utf8 string, too.
 	 */
-	while (p <= send) {
+	while (p <= blob_end) {
 		if (!*p)
 			return res;
 		++p;
@@ -669,63 +671,92 @@ mono_image_verify_tables (MonoImage *image, int level)
 }
 
 enum {
-	TYPE_INVALID = 0, /* leave at 0. */
-	TYPE_INT32 = 1,
-	TYPE_INT64 = 2,
-	TYPE_NINT  = 3,
-	TYPE_FLOAT = 4,
-	TYPE_MANP = 5,
-	TYPE_OBJREF = 6,
-	TYPE_MAX = 7
+	TYPE_INV = 0, /* leave at 0. */
+	TYPE_I4  = 1,
+	TYPE_I8  = 2,
+	TYPE_PTR = 3,
+	TYPE_R8  = 4,
+	TYPE_MP  = 5,
+	TYPE_OBJ = 6,
+	TYPE_VT  = 7,
+	TYPE_MAX = 8
 };
 
-const static unsigned char 
-valid_binops [TYPE_MAX] [TYPE_MAX] = {
-	{TYPE_INVALID},
-	{TYPE_INVALID, TYPE_INT32,   TYPE_INVALID, TYPE_NINT,    TYPE_INVALID, TYPE_MANP},
-	{TYPE_INVALID, TYPE_INVALID, TYPE_INT64,   TYPE_INVALID},
-	{TYPE_INVALID, TYPE_NINT,    TYPE_INVALID, TYPE_NINT,    TYPE_INVALID, TYPE_MANP},
-	{TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_FLOAT},
-	{TYPE_INVALID, TYPE_MANP,    TYPE_INVALID, TYPE_MANP,    TYPE_INVALID, TYPE_NINT},
-	{TYPE_INVALID}
-	               /* int32 */   /* int64 */   /* native */  /* float */   /* managed p */ /* objref */
+static const char* 
+arg_name [TYPE_MAX] = {
+	"Invalid",
+	"Int32",
+	"Int64",
+	"IntPtr",
+	"Double",
+	"Managed Pointer",
+	"ObjRef",
+	"ValueType"
 };
 
-const static unsigned char 
-valid_unnops [TYPE_MAX] = {
-	TYPE_INVALID, TYPE_INT32,    TYPE_INT64,   TYPE_NINT,    TYPE_FLOAT,   TYPE_INVALID
-	               /* int32 */   /* int64 */   /* native */  /* float */   /* managed p */ /* objref */
+static const char
+bin_num_table [TYPE_MAX] [TYPE_MAX] = {
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_I4,  TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_MP,  TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_I8,  TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_MP,  TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_R8,  TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_MP,  TYPE_INV, TYPE_MP,  TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV}
 };
 
-/* note: the resulting type is always a boolean */
-const static unsigned char 
-valid_bincomp [TYPE_MAX] [TYPE_MAX] = {
-	{TYPE_INVALID},
-	{TYPE_INVALID, TYPE_INT32,   TYPE_INVALID, TYPE_INT32,   TYPE_INVALID},
-	{TYPE_INVALID, TYPE_INVALID, TYPE_INT32,   TYPE_INVALID},
-	{TYPE_INVALID, TYPE_INT32,   TYPE_INVALID, TYPE_INT32,   TYPE_INVALID, TYPE_INT32},
-	{TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INT32},
-	{TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INT32,   TYPE_INVALID, TYPE_INT32},
-	{TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INVALID, TYPE_INT32}
-	               /* int32 */   /* int64 */   /* native */  /* float */   /* managed p */ /* objref */
+static const char 
+neg_table [] = {
+	TYPE_INV, TYPE_I4, TYPE_I8, TYPE_PTR, TYPE_R8, TYPE_INV, TYPE_INV, TYPE_INV
 };
 
-const static unsigned char 
-valid_intops [TYPE_MAX] [TYPE_MAX] = {
-	{TYPE_INVALID},
-	{TYPE_INVALID, TYPE_INT32,   TYPE_INVALID, TYPE_NINT},
-	{TYPE_INVALID, TYPE_INVALID, TYPE_INT64},
-	{TYPE_INVALID, TYPE_NINT,    TYPE_INVALID, TYPE_NINT},
-	{TYPE_INVALID}
+/* reduce the size of this table */
+static const char
+bin_int_table [TYPE_MAX] [TYPE_MAX] = {
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_I4,  TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_I8,  TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV}
 };
 
-const static unsigned char 
-valid_shiftops [TYPE_MAX] [TYPE_MAX] = {
-	{TYPE_INVALID},
-	{TYPE_INVALID, TYPE_INT32,   TYPE_INVALID, TYPE_INT32},
-	{TYPE_INVALID, TYPE_INT64,   TYPE_INVALID, TYPE_INT64},
-	{TYPE_INVALID, TYPE_NINT,    TYPE_INVALID, TYPE_NINT},
-	{TYPE_INVALID}
+static const char
+bin_comp_table [TYPE_MAX] [TYPE_MAX] = {
+	{0},
+	{0, 1, 0, 1, 0, 0, 0, 0},
+	{0, 0, 1, 0, 0, 0, 0, 0},
+	{0, 1, 0, 1, 0, 2, 0, 0},
+	{0, 0, 0, 0, 1, 0, 0, 0},
+	{0, 0, 0, 2, 0, 1, 0, 0},
+	{0, 0, 0, 0, 0, 0, 3, 0},
+	{0, 0, 0, 0, 0, 0, 0, 0},
+};
+
+/* reduce the size of this table */
+static const char
+shift_table [TYPE_MAX] [TYPE_MAX] = {
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_I4,  TYPE_INV, TYPE_I4,  TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_I8,  TYPE_INV, TYPE_I8,  TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_PTR, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV},
+	{TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV, TYPE_INV}
+};
+
+static const char 
+ldind_type [] = {
+	TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I8, TYPE_PTR, TYPE_R8, TYPE_R8, TYPE_OBJ
+};
+
+static const char
+ldelem_type [] = {
+	TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I4, TYPE_I8, TYPE_PTR, TYPE_R8, TYPE_R8, TYPE_OBJ
 };
 
 #define ADD_INVALID(list,msg)	\
@@ -734,14 +765,14 @@ valid_shiftops [TYPE_MAX] [TYPE_MAX] = {
 		vinfo->status = MONO_VERIFY_ERROR;	\
 		vinfo->message = (msg);	\
 		(list) = g_slist_prepend ((list), vinfo);	\
-		G_BREAKPOINT ();	\
+		/*G_BREAKPOINT ();*/	\
 		goto invalid_cil;	\
 	} while (0)
 
 #define CHECK_STACK_UNDERFLOW(num)	\
 	do {	\
 		if (cur_stack < (num))	\
-			ADD_INVALID (list, g_strdup_printf ("Stack underflow at 0x%04x", ip_offset));	\
+			ADD_INVALID (list, g_strdup_printf ("Stack underflow at 0x%04x (%d items instead of %d)", ip_offset, cur_stack, (num)));	\
 	} while (0)
 
 #define CHECK_STACK_OVERFLOW()	\
@@ -763,8 +794,8 @@ enum {
 };
 
 typedef struct {
-	MonoClass *klass;
-	int type;
+	MonoType *type;
+	int stype;
 } ILStackDesc;
 
 typedef struct {
@@ -773,6 +804,166 @@ typedef struct {
 	guint16 flags;
 } ILCodeDesc;
 
+static void
+type_to_eval_stack_type (MonoType *type, ILStackDesc *stack, int take_addr) {
+	int t = type->type;
+
+	stack->type = type;
+	if (type->byref || take_addr) { /* fix double addr issue */
+		stack->stype = TYPE_MP;
+		return;
+	}
+
+handle_enum:
+	switch (t) {
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR:
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4:
+		stack->stype = TYPE_I4;
+		return;
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+	case MONO_TYPE_PTR:
+		stack->stype = TYPE_PTR;
+		return;
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:    
+		stack->stype = TYPE_OBJ;
+		return;
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+		stack->stype = TYPE_I8;
+		return;
+	case MONO_TYPE_R4:
+	case MONO_TYPE_R8:
+		stack->stype = TYPE_R8;
+		return;
+	case MONO_TYPE_VALUETYPE:
+		if (type->data.klass->enumtype) {
+			t = type->data.klass->enum_basetype->type;
+			goto handle_enum;
+		} else {
+			stack->stype = TYPE_VT;
+			return;
+		}
+	default:
+		g_error ("unknown type %02x in eval stack type", type->type);
+	}
+	return;
+}
+
+static int
+type_from_op (int ins, ILStackDesc *arg) {
+	switch (ins) {
+	/* binops */
+	case CEE_ADD:
+	case CEE_SUB:
+	case CEE_MUL:
+	case CEE_DIV:
+	case CEE_REM:
+		/* FIXME: check unverifiable args for TYPE_MP */
+		return arg->stype = bin_num_table [arg->stype] [arg [1].stype];
+	case CEE_DIV_UN:
+	case CEE_REM_UN:
+	case CEE_AND:
+	case CEE_OR:
+	case CEE_XOR:
+		return arg->stype = bin_int_table [arg->stype] [arg [1].stype];
+	case CEE_SHL:
+	case CEE_SHR:
+	case CEE_SHR_UN:
+		return arg->stype = shift_table [arg->stype] [arg [1].stype];
+	case CEE_BEQ_S:
+	case CEE_BGE_S:
+	case CEE_BGT_S:
+	case CEE_BLE_S:
+	case CEE_BLT_S:
+	case CEE_BNE_UN_S:
+	case CEE_BGE_UN_S:
+	case CEE_BGT_UN_S:
+	case CEE_BLE_UN_S:
+	case CEE_BLT_UN_S:
+	case CEE_BEQ:
+	case CEE_BGE:
+	case CEE_BGT:
+	case CEE_BLE:
+	case CEE_BLT:
+	case CEE_BNE_UN:
+	case CEE_BGE_UN:
+	case CEE_BGT_UN:
+	case CEE_BLE_UN:
+	case CEE_BLT_UN:
+		/* FIXME: handle some specifics with ins->next->type */
+		return bin_comp_table [arg->stype] [arg [1].stype] ? TYPE_I4: TYPE_INV;
+	case 256+CEE_CEQ:
+	case 256+CEE_CGT:
+	case 256+CEE_CGT_UN:
+	case 256+CEE_CLT:
+	case 256+CEE_CLT_UN:
+		return arg->stype = bin_comp_table [arg->stype] [arg [1].stype] ? TYPE_I4: TYPE_INV;
+	/* unops */
+	case CEE_NEG:
+		return arg->stype = neg_table [arg->stype];
+	case CEE_NOT:
+		if (arg->stype >= TYPE_I4 && arg->stype <= TYPE_PTR)
+			return arg->stype;
+		else
+			return arg->stype = TYPE_INV;
+	case CEE_CONV_I1:
+	case CEE_CONV_U1:
+	case CEE_CONV_I2:
+	case CEE_CONV_U2:
+	case CEE_CONV_I4:
+	case CEE_CONV_U4:
+	case CEE_CONV_OVF_I1:
+	case CEE_CONV_OVF_U1:
+	case CEE_CONV_OVF_I2:
+	case CEE_CONV_OVF_U2:
+	case CEE_CONV_OVF_I4:
+	case CEE_CONV_OVF_U4:
+	case CEE_CONV_OVF_I1_UN:
+	case CEE_CONV_OVF_U1_UN:
+	case CEE_CONV_OVF_I2_UN:
+	case CEE_CONV_OVF_U2_UN:
+	case CEE_CONV_OVF_I4_UN:
+	case CEE_CONV_OVF_U4_UN:
+		if (arg->stype == TYPE_INV || arg->stype >= TYPE_MP)
+			return arg->stype = TYPE_INV;
+		return arg->stype = TYPE_I4;
+	case CEE_CONV_I:
+	case CEE_CONV_U:
+	case CEE_CONV_OVF_I:
+	case CEE_CONV_OVF_U:
+	case CEE_CONV_OVF_I_UN:
+	case CEE_CONV_OVF_U_UN:
+		if (arg->stype == TYPE_INV || arg->stype == TYPE_VT)
+			return arg->stype = TYPE_INV;
+		return arg->stype = TYPE_PTR;
+	case CEE_CONV_I8:
+	case CEE_CONV_U8:
+	case CEE_CONV_OVF_I8:
+	case CEE_CONV_OVF_U8:
+	case CEE_CONV_OVF_I8_UN:
+	case CEE_CONV_OVF_U8_UN:
+		return arg->stype = TYPE_I8;
+	case CEE_CONV_R4:
+	case CEE_CONV_R8:
+		return arg->stype = TYPE_R8;
+	default:
+		g_error ("opcode 0x%04x not handled in type from op", ins);
+		break;
+	}
+	return FALSE;
+}
+
 static int
 in_any_block (MonoMethodHeader *header, guint offset)
 {
@@ -840,6 +1031,97 @@ can_merge_stack (ILCodeDesc *a, ILCodeDesc *b)
 	return 1;
 }
 
+static int
+is_valid_bool_arg (ILStackDesc *arg)
+{
+	switch (arg->stype) {
+	case TYPE_I4:
+	case TYPE_I8:
+	case TYPE_PTR:
+	case TYPE_MP:
+	case TYPE_OBJ:
+		return TRUE;
+	default:
+		return FALSE;
+	}
+}
+
+static int
+can_store_type (ILStackDesc *arg, MonoType *type)
+{
+	int t = type->type;
+	if (type->byref && arg->stype != TYPE_MP)
+		return FALSE;
+handle_enum:
+	switch (t) {
+	case MONO_TYPE_VOID:
+		return FALSE;
+	case MONO_TYPE_I1:
+	case MONO_TYPE_U1:
+	case MONO_TYPE_BOOLEAN:
+	case MONO_TYPE_I2:
+	case MONO_TYPE_U2:
+	case MONO_TYPE_CHAR:
+	case MONO_TYPE_I4:
+	case MONO_TYPE_U4:
+		if (arg->stype == TYPE_I4 || arg->stype == TYPE_PTR)
+			return TRUE;
+		return FALSE;
+	case MONO_TYPE_I:
+	case MONO_TYPE_U:
+	case MONO_TYPE_PTR:
+		return TRUE;
+	case MONO_TYPE_CLASS:
+	case MONO_TYPE_STRING:
+	case MONO_TYPE_OBJECT:
+	case MONO_TYPE_SZARRAY:
+	case MONO_TYPE_ARRAY:    
+		return TRUE; /* FIXME */
+	case MONO_TYPE_I8:
+	case MONO_TYPE_U8:
+		if (arg->stype == TYPE_I8)
+			return TRUE;
+		return FALSE;
+	case MONO_TYPE_R4:
+	case MONO_TYPE_R8:
+		if (arg->stype == TYPE_R8)
+			return TRUE;
+		return FALSE;
+	case MONO_TYPE_VALUETYPE:
+		if (type->data.klass->enumtype) {
+			t = type->data.klass->enum_basetype->type;
+			goto handle_enum;
+		} else {
+			if (arg->type->data.klass != type->data.klass)
+				return FALSE;
+			return TRUE;
+		}
+	default:
+		g_error ("unknown type %02x in store type", type->type);
+	}
+	return FALSE;
+}
+
+static int
+stind_type (int op, int type) {
+	switch (op) {
+	case CEE_STIND_REF:
+		return type == TYPE_OBJ;
+	case CEE_STIND_I1:
+	case CEE_STIND_I2:
+	case CEE_STIND_I4:
+		return type == TYPE_I4;
+	case CEE_STIND_I8:
+		return type == TYPE_I8;
+	case CEE_STIND_R4:
+	case CEE_STIND_R8:
+		return type == TYPE_R8;
+	default:
+		g_assert_not_reached ();
+	}
+	return FALSE;
+}
+
 /*
  * FIXME: need to distinguish between valid and verifiable.
  * Need to keep track of types on the stack.
@@ -851,7 +1133,11 @@ mono_method_verify (MonoMethod *method, int level)
 	MonoMethodHeader *header;
 	MonoMethodSignature *signature, *csig;
 	MonoMethod *cmethod;
+	MonoClassField *field;
+	MonoClass *klass;
 	MonoImage *image;
+	MonoType **params;
+	ILStackDesc *stack;
 	register const unsigned char *ip;
 	register const unsigned char *end;
 	const unsigned char *target; /* branch target */
@@ -862,30 +1148,50 @@ mono_method_verify (MonoMethod *method, int level)
 	guint prefix = 0;
 	ILCodeDesc *code;
 
+	if (method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME) ||
+			(method->flags & (METHOD_ATTRIBUTE_PINVOKE_IMPL | METHOD_ATTRIBUTE_ABSTRACT))) {
+		return NULL;
+	}
 	signature = method->signature;
 	header = ((MonoMethodNormal *)method)->header;
 	ip = header->code;
 	end = ip + header->code_size;
-	max_args = method->signature->param_count + method->signature->hasthis;
+	max_args = signature->param_count + signature->hasthis;
 	max_stack = header->max_stack;
 	need_merge = cur_stack = 0;
 	start = 1;
 	image = method->klass->image;
 	code = g_new0 (ILCodeDesc, header->code_size);
+	stack = g_new0 (ILStackDesc, max_stack);
+	if (signature->hasthis) {
+		params = g_new0 (MonoType*, max_args);
+		params [0] = &method->klass->this_arg;
+		memcpy (params + 1, signature->params, sizeof (MonoType*) * signature->param_count);
+	} else {
+		params = signature->params;
+	}
 
 	if (header->num_locals) {
 		local_state = g_new (char, header->num_locals);
 		memset (local_state, header->init_locals, header->num_locals);
 	}
-	g_print ("Method %s.%s::%s\n", method->klass->name_space, method->klass->name, method->name);
+	/*g_print ("Method %s.%s::%s\n", method->klass->name_space, method->klass->name, method->name);*/
+
+	for (i = 0; i < header->num_clauses; ++i) {
+		MonoExceptionClause *clause = &header->clauses [i];
+		/* catch blocks have the exception on the stack. */
+		if (clause->flags == MONO_EXCEPTION_CLAUSE_NONE) {
+			code [clause->handler_offset].stack_count = 1;
+			code [clause->handler_offset].flags |= CODE_SEEN;
+		}
+	}
 
 	while (ip < end) {
 		ip_offset = ip - header->code;
-		g_print ("IL_%04x: %02x %s\n", ip_offset, *ip, mono_opcode_names [*ip]);
 		if (start || !(code [ip_offset].flags & CODE_SEEN)) {
 			if (start) {
-				code [ip_offset].stack_count = 0;
-				start = 0;
+				/* g_print ("setting stack of IL_%04x to %d\n", ip_offset, 0); */
+				cur_stack = code [ip_offset].stack_count;
 			} else {
 				code [ip_offset].stack_count = cur_stack;
 			}
@@ -895,11 +1201,21 @@ mono_method_verify (MonoMethod *method, int level)
 			if (code [ip_offset].stack_count != cur_stack)
 				ADD_INVALID (list, g_strdup_printf ("Cannot merge stack states at 0x%04x", ip_offset));
 		}
+		start = 0;
 		if (need_merge) {
 			if (!can_merge_stack (&code [ip_offset], &code [target - header->code]))
 				ADD_INVALID (list, g_strdup_printf ("Cannot merge stack states at 0x%04x", ip_offset));
 			need_merge = 0;
 		}
+#if 0
+		{
+			char *discode;
+			discode = mono_disasm_code_one (NULL, method, ip);
+			discode [strlen (discode) - 1] = 0; /* no \n */
+			g_print ("%-29s (%d)\n", discode, cur_stack);
+			g_free (discode);
+		}
+#endif
 
 		switch (*ip) {
 		case CEE_NOP:
@@ -913,6 +1229,7 @@ mono_method_verify (MonoMethod *method, int level)
 			if (*ip - CEE_LDARG_0 >= max_args)
 				ADD_INVALID (list, g_strdup_printf ("Method doesn't have argument %d at 0x%04x", *ip - CEE_LDARG_0, ip_offset));
 			CHECK_STACK_OVERFLOW ();
+			type_to_eval_stack_type (params [*ip - CEE_LDARG_0], stack + cur_stack, FALSE);
 			++cur_stack;
 			++ip;
 			break;
@@ -922,9 +1239,10 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_LDLOC_3:
 			if (*ip - CEE_LDLOC_0 >= header->num_locals)
 				ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", *ip - CEE_LDLOC_0, ip_offset));
-			if (!local_state [*ip - CEE_LDLOC_0])
+			if (0 && !local_state [*ip - CEE_LDLOC_0])
 				ADD_INVALID (list, g_strdup_printf ("Local var %d is initialized at 0x%04x", *ip - CEE_LDLOC_0, ip_offset));
 			CHECK_STACK_OVERFLOW ();
+			type_to_eval_stack_type (header->locals [*ip - CEE_LDLOC_0], stack + cur_stack, FALSE);
 			++cur_stack;
 			++ip;
 			break;
@@ -937,6 +1255,8 @@ mono_method_verify (MonoMethod *method, int level)
 			local_state [*ip - CEE_STLOC_0] = 1;
 			CHECK_STACK_UNDERFLOW (1);
 			--cur_stack;
+			if (!can_store_type (stack + cur_stack, header->locals [*ip - CEE_STLOC_0]))
+				ADD_INVALID (list, g_strdup_printf ("Incompatible type %s in store at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
 			++ip;
 			break;
 		case CEE_LDARG_S:
@@ -944,6 +1264,7 @@ mono_method_verify (MonoMethod *method, int level)
 			if (ip [1] >= max_args)
 				ADD_INVALID (list, g_strdup_printf ("Method doesn't have argument %d at 0x%04x", ip [1], ip_offset));
 			CHECK_STACK_OVERFLOW ();
+			type_to_eval_stack_type (params [ip [1]], stack + cur_stack, *ip == CEE_LDARGA_S);
 			++cur_stack;
 			ip += 2;
 			break;
@@ -959,9 +1280,10 @@ mono_method_verify (MonoMethod *method, int level)
 			if (ip [1] >= header->num_locals)
 				ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", ip [1], ip_offset));
 			/* no need to check if the var is initialized if the address is taken */
-			if (*ip == CEE_LDLOC_S && !local_state [ip [1]])
+			if (0 && *ip == CEE_LDLOC_S && !local_state [ip [1]])
 				ADD_INVALID (list, g_strdup_printf ("Local var %d is initialized at 0x%04x", ip [1], ip_offset));
 			CHECK_STACK_OVERFLOW ();
+			type_to_eval_stack_type (header->locals [ip [1]], stack + cur_stack, *ip == CEE_LDLOCA_S);
 			++cur_stack;
 			ip += 2;
 			break;
@@ -971,10 +1293,14 @@ mono_method_verify (MonoMethod *method, int level)
 			local_state [ip [1]] = 1;
 			CHECK_STACK_UNDERFLOW (1);
 			--cur_stack;
+			if (!can_store_type (stack + cur_stack, header->locals [ip [1]]))
+				ADD_INVALID (list, g_strdup_printf ("Incompatible type %s in store at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
 			ip += 2;
 			break;
 		case CEE_LDNULL:
 			CHECK_STACK_OVERFLOW ();
+			stack [cur_stack].type = &mono_defaults.object_class->byval_arg;
+			stack [cur_stack].stype = TYPE_OBJ;
 			++cur_stack;
 			++ip;
 			break;
@@ -989,31 +1315,43 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_LDC_I4_7:
 		case CEE_LDC_I4_8:
 			CHECK_STACK_OVERFLOW ();
+			stack [cur_stack].type = &mono_defaults.int_class->byval_arg;
+			stack [cur_stack].stype = TYPE_I4;
 			++cur_stack;
 			++ip;
 			break;
 		case CEE_LDC_I4_S:
 			CHECK_STACK_OVERFLOW ();
+			stack [cur_stack].type = &mono_defaults.int_class->byval_arg;
+			stack [cur_stack].stype = TYPE_I4;
 			++cur_stack;
 			ip += 2;
 			break;
 		case CEE_LDC_I4:
 			CHECK_STACK_OVERFLOW ();
+			stack [cur_stack].type = &mono_defaults.int_class->byval_arg;
+			stack [cur_stack].stype = TYPE_I4;
 			++cur_stack;
 			ip += 5;
 			break;
 		case CEE_LDC_I8:
 			CHECK_STACK_OVERFLOW ();
+			stack [cur_stack].type = &mono_defaults.int64_class->byval_arg;
+			stack [cur_stack].stype = TYPE_I8;
 			++cur_stack;
 			ip += 9;
 			break;
 		case CEE_LDC_R4:
 			CHECK_STACK_OVERFLOW ();
+			stack [cur_stack].type = &mono_defaults.double_class->byval_arg;
+			stack [cur_stack].stype = TYPE_R8;
 			++cur_stack;
 			ip += 5;
 			break;
 		case CEE_LDC_R8:
 			CHECK_STACK_OVERFLOW ();
+			stack [cur_stack].type = &mono_defaults.double_class->byval_arg;
+			stack [cur_stack].stype = TYPE_R8;
 			++cur_stack;
 			ip += 9;
 			break;
@@ -1021,6 +1359,7 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_DUP:
 			CHECK_STACK_UNDERFLOW (1);
 			CHECK_STACK_OVERFLOW ();
+			stack [cur_stack] = stack [cur_stack - 1];
 			++cur_stack;
 			++ip;
 			break;
@@ -1054,6 +1393,7 @@ mono_method_verify (MonoMethod *method, int level)
 			cur_stack -= csig->param_count + csig->hasthis;
 			if (csig->ret->type != MONO_TYPE_VOID) {
 				CHECK_STACK_OVERFLOW ();
+				type_to_eval_stack_type (csig->ret, stack + cur_stack, FALSE);
 				++cur_stack;
 			}
 			ip += 5;
@@ -1067,14 +1407,14 @@ mono_method_verify (MonoMethod *method, int level)
 			break;
 		case CEE_RET:
 			if (signature->ret->type != MONO_TYPE_VOID) {
-				if (cur_stack != 1)
-					ADD_INVALID (list, g_strdup_printf ("Stack not empty after ret at 0x%04x", ip_offset));
+				CHECK_STACK_UNDERFLOW (1);
 				--cur_stack;
-			} else {
-				if (cur_stack)
-					ADD_INVALID (list, g_strdup_printf ("Stack not empty after ret at 0x%04x", ip_offset));
-				cur_stack = 0;
+				if (!can_store_type (stack + cur_stack, signature->ret))
+					ADD_INVALID (list, g_strdup_printf ("Incompatible type %s in ret at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
 			}
+			if (cur_stack)
+				ADD_INVALID (list, g_strdup_printf ("Stack not empty (%d) after ret at 0x%04x", cur_stack, ip_offset));
+			cur_stack = 0;
 			if (in_any_block (header, ip_offset))
 				ADD_INVALID (list, g_strdup_printf ("ret cannot escape exception blocks at 0x%04x", ip_offset));
 			++ip;
@@ -1097,6 +1437,8 @@ mono_method_verify (MonoMethod *method, int level)
 				ADD_INVALID (list, g_strdup_printf ("Branch target escapes out of exception block at 0x%04x", ip_offset));
 			CHECK_STACK_UNDERFLOW (1);
 			--cur_stack;
+			if (!is_valid_bool_arg (stack + cur_stack))
+				ADD_INVALID (list, g_strdup_printf ("Argument type %s not valid for brtrue/brfalse at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
 			ip += 2;
 			need_merge = 1;
 			break;
@@ -1117,6 +1459,8 @@ mono_method_verify (MonoMethod *method, int level)
 				ADD_INVALID (list, g_strdup_printf ("Branch target escapes out of exception block at 0x%04x", ip_offset));
 			CHECK_STACK_UNDERFLOW (2);
 			cur_stack -= 2;
+			if (type_from_op (*ip, stack + cur_stack) == TYPE_INV)
+				ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
 			ip += 2;
 			need_merge = 1;
 			break;
@@ -1138,6 +1482,8 @@ mono_method_verify (MonoMethod *method, int level)
 				ADD_INVALID (list, g_strdup_printf ("Branch target escapes out of exception block at 0x%04x", ip_offset));
 			CHECK_STACK_UNDERFLOW (1);
 			--cur_stack;
+			if (!is_valid_bool_arg (stack + cur_stack))
+				ADD_INVALID (list, g_strdup_printf ("Argument type %s not valid for brtrue/brfalse at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
 			ip += 5;
 			need_merge = 1;
 			break;
@@ -1158,6 +1504,8 @@ mono_method_verify (MonoMethod *method, int level)
 				ADD_INVALID (list, g_strdup_printf ("Branch target escapes out of exception block at 0x%04x", ip_offset));
 			CHECK_STACK_UNDERFLOW (2);
 			cur_stack -= 2;
+			if (type_from_op (*ip, stack + cur_stack) == TYPE_INV)
+				ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
 			ip += 5;
 			need_merge = 1;
 			break;
@@ -1170,6 +1518,8 @@ mono_method_verify (MonoMethod *method, int level)
 					ADD_INVALID (list, g_strdup_printf ("Branch target out of code at 0x%04x", ip_offset));
 			CHECK_STACK_UNDERFLOW (1);
 			--cur_stack;
+			if (stack [cur_stack].stype != TYPE_I4)
+				ADD_INVALID (list, g_strdup_printf ("Invalid argument to switch at 0x%04x", ip_offset));
 			ip += 5 + sizeof (guint32) * n;
 			break;
 		case CEE_LDIND_I1:
@@ -1184,6 +1534,9 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_LDIND_R8:
 		case CEE_LDIND_REF:
 			CHECK_STACK_UNDERFLOW (1);
+			if (stack [cur_stack - 1].stype != TYPE_PTR && stack [cur_stack - 1].stype != TYPE_MP)
+				ADD_INVALID (list, g_strdup_printf ("Invalid argument to ldind at 0x%04x", ip_offset));
+			stack [cur_stack - 1].stype = ldind_type [*ip - CEE_LDIND_I1];
 			++ip;
 			break;
 		case CEE_STIND_REF:
@@ -1195,6 +1548,10 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_STIND_R8:
 			CHECK_STACK_UNDERFLOW (2);
 			cur_stack -= 2;
+			if (stack [cur_stack].stype != TYPE_PTR && stack [cur_stack].stype != TYPE_MP)
+				ADD_INVALID (list, g_strdup_printf ("Invalid pointer argument to stind at 0x%04x", ip_offset));
+			if (!stind_type (*ip, stack [cur_stack + 1].stype))
+				ADD_INVALID (list, g_strdup_printf ("Incompatible value argument to stind at 0x%04x", ip_offset));
 			++ip;
 			break;
 		case CEE_ADD:
@@ -1212,6 +1569,8 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_SHR_UN:
 			CHECK_STACK_UNDERFLOW (2);
 			--cur_stack;
+			if (type_from_op (*ip, stack + cur_stack - 1) == TYPE_INV)
+				ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
 			++ip;
 			break;
 		case CEE_NEG:
@@ -1225,6 +1584,8 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_CONV_U4:
 		case CEE_CONV_U8:
 			CHECK_STACK_UNDERFLOW (1);
+			if (type_from_op (*ip, stack + cur_stack - 1) == TYPE_INV)
+				ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
 			++ip;
 			break;
 		case CEE_CPOBJ:
@@ -1236,11 +1597,22 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_LDOBJ:
 			token = read32 (ip + 1);
 			CHECK_STACK_UNDERFLOW (1);
+			if (stack [cur_stack - 1].stype != TYPE_MP)
+				ADD_INVALID (list, g_strdup_printf ("Invalid argument to ldobj at 0x%04x", ip_offset));
+			klass = mono_class_get (image, token);
+			if (!klass)
+				ADD_INVALID (list, g_strdup_printf ("Cannot load class from token 0x%08x at 0x%04x", token, ip_offset));
+			if (!klass->valuetype)
+				ADD_INVALID (list, g_strdup_printf ("Class is not a valuetype at 0x%04x", ip_offset));
+			stack [cur_stack - 1].stype = TYPE_VT;
+			stack [cur_stack - 1].type = &klass->byval_arg;
 			ip += 5;
 			break;
 		case CEE_LDSTR:
 			token = read32 (ip + 1);
 			CHECK_STACK_OVERFLOW ();
+			stack [cur_stack].type = &mono_defaults.string_class->byval_arg;
+			stack [cur_stack].stype = TYPE_OBJ;
 			++cur_stack;
 			ip += 5;
 			break;
@@ -1256,6 +1628,8 @@ mono_method_verify (MonoMethod *method, int level)
 			CHECK_STACK_UNDERFLOW (csig->param_count);
 			cur_stack -= csig->param_count;
 			CHECK_STACK_OVERFLOW ();
+			stack [cur_stack].type = &cmethod->klass->byval_arg;
+			stack [cur_stack].stype = cmethod->klass->valuetype? TYPE_VT: TYPE_OBJ;
 			++cur_stack;
 			ip += 5;
 			break;
@@ -1276,38 +1650,69 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_UNBOX:
 			token = read32 (ip + 1);
 			CHECK_STACK_UNDERFLOW (1);
+			if (stack [cur_stack - 1].stype != TYPE_OBJ)
+				ADD_INVALID (list, g_strdup_printf ("Invalid argument %s to unbox at 0x%04x", arg_name [stack [cur_stack - 1].stype], ip_offset));
+			stack [cur_stack - 1].stype = TYPE_MP;
+			stack [cur_stack - 1].type = NULL;
 			ip += 5;
 			break;
 		case CEE_THROW:
 			CHECK_STACK_UNDERFLOW (1);
 			--cur_stack;
 			++ip;
+			start = 1;
 			break;
 		case CEE_LDFLD:
 			CHECK_STACK_UNDERFLOW (1);
+			if (stack [cur_stack - 1].stype != TYPE_OBJ && stack [cur_stack - 1].stype != TYPE_MP)
+				ADD_INVALID (list, g_strdup_printf ("Invalid argument %s to ldfld at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
 			token = read32 (ip + 1);
+			field = mono_field_from_token (image, token, &klass);
+			if (!field)
+				ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
+			type_to_eval_stack_type (field->type, stack + cur_stack - 1, FALSE);
 			ip += 5;
 			break;
 		case CEE_LDFLDA:
 			CHECK_STACK_UNDERFLOW (1);
+			if (stack [cur_stack - 1].stype != TYPE_OBJ && stack [cur_stack - 1].stype != TYPE_MP)
+				ADD_INVALID (list, g_strdup_printf ("Invalid argument to ldflda at 0x%04x", ip_offset));
 			token = read32 (ip + 1);
+			field = mono_field_from_token (image, token, &klass);
+			if (!field)
+				ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
+			type_to_eval_stack_type (field->type, stack + cur_stack - 1, TRUE);
 			ip += 5;
 			break;
 		case CEE_STFLD:
 			CHECK_STACK_UNDERFLOW (2);
 			cur_stack -= 2;
+			if (stack [cur_stack].stype != TYPE_OBJ && stack [cur_stack].stype != TYPE_MP)
+				ADD_INVALID (list, g_strdup_printf ("Invalid argument to stfld at 0x%04x", ip_offset));
 			token = read32 (ip + 1);
+			field = mono_field_from_token (image, token, &klass);
+			if (!field)
+				ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
+			/* can_store */
 			ip += 5;
 			break;
 		case CEE_LDSFLD:
 			CHECK_STACK_OVERFLOW ();
 			token = read32 (ip + 1);
+			field = mono_field_from_token (image, token, &klass);
+			if (!field)
+				ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
+			type_to_eval_stack_type (field->type, stack + cur_stack, FALSE);
 			++cur_stack;
 			ip += 5;
 			break;
 		case CEE_LDSFLDA:
 			CHECK_STACK_OVERFLOW ();
 			token = read32 (ip + 1);
+			field = mono_field_from_token (image, token, &klass);
+			if (!field)
+				ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
+			type_to_eval_stack_type (field->type, stack + cur_stack, TRUE);
 			++cur_stack;
 			ip += 5;
 			break;
@@ -1315,6 +1720,10 @@ mono_method_verify (MonoMethod *method, int level)
 			CHECK_STACK_UNDERFLOW (1);
 			--cur_stack;
 			token = read32 (ip + 1);
+			field = mono_field_from_token (image, token, &klass);
+			if (!field)
+				ADD_INVALID (list, g_strdup_printf ("Cannot load field from token 0x%08x at 0x%04x", token, ip_offset));
+			/* can store */
 			ip += 5;
 			break;
 		case CEE_STOBJ:
@@ -1334,25 +1743,40 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_CONV_OVF_I_UN:
 		case CEE_CONV_OVF_U_UN:
 			CHECK_STACK_UNDERFLOW (1);
+			if (type_from_op (*ip, stack + cur_stack - 1) == TYPE_INV)
+				ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
 			++ip;
 			break;
 		case CEE_BOX:
 			CHECK_STACK_UNDERFLOW (1);
 			token = read32 (ip + 1);
+			if (stack [cur_stack - 1].stype == TYPE_OBJ)
+				ADD_INVALID (list, g_strdup_printf ("Invalid argument %s to box at 0x%04x", arg_name [stack [cur_stack - 1].stype], ip_offset));
+			stack [cur_stack - 1].stype = TYPE_OBJ;
 			ip += 5;
 			break;
 		case CEE_NEWARR:
 			CHECK_STACK_UNDERFLOW (1);
 			token = read32 (ip + 1);
+			stack [cur_stack - 1].stype = TYPE_OBJ;
 			ip += 5;
 			break;
 		case CEE_LDLEN:
 			CHECK_STACK_UNDERFLOW (1);
+			if (stack [cur_stack - 1].stype != TYPE_OBJ)
+				ADD_INVALID (list, g_strdup_printf ("Invalid argument to ldlen at 0x%04x", ip_offset));
+			stack [cur_stack - 1].type = &mono_defaults.int_class->byval_arg; /* FIXME: use a native int type */
+			stack [cur_stack - 1].stype = TYPE_PTR;
 			++ip;
 			break;
 		case CEE_LDELEMA:
 			CHECK_STACK_UNDERFLOW (2);
 			--cur_stack;
+			if (stack [cur_stack - 1].stype != TYPE_OBJ)
+				ADD_INVALID (list, g_strdup_printf ("Invalid array argument to ldelema at 0x%04x", ip_offset));
+			if (stack [cur_stack].stype != TYPE_I4 && stack [cur_stack].stype != TYPE_PTR)
+				ADD_INVALID (list, g_strdup_printf ("Array index needs to be Int32 or IntPtr at 0x%04x", ip_offset));
+			stack [cur_stack - 1].stype = TYPE_MP;
 			token = read32 (ip + 1);
 			ip += 5;
 			break;
@@ -1369,6 +1793,11 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_LDELEM_REF:
 			CHECK_STACK_UNDERFLOW (2);
 			--cur_stack;
+			if (stack [cur_stack - 1].stype != TYPE_OBJ)
+				ADD_INVALID (list, g_strdup_printf ("Invalid array argument to ldelem at 0x%04x", ip_offset));
+			if (stack [cur_stack].stype != TYPE_I4 && stack [cur_stack].stype != TYPE_PTR)
+				ADD_INVALID (list, g_strdup_printf ("Array index needs to be Int32 or IntPtr at 0x%04x", ip_offset));
+			stack [cur_stack - 1].stype = ldelem_type [*ip - CEE_LDELEM_I1];
 			++ip;
 			break;
 		case CEE_STELEM_I:
@@ -1410,6 +1839,8 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_CONV_OVF_I8:
 		case CEE_CONV_OVF_U8:
 			CHECK_STACK_UNDERFLOW (1);
+			if (type_from_op (*ip, stack + cur_stack - 1) == TYPE_INV)
+				ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
 			++ip;
 			break;
 		case CEE_UNUSED50:
@@ -1461,6 +1892,8 @@ mono_method_verify (MonoMethod *method, int level)
 		case CEE_CONV_OVF_I:
 		case CEE_CONV_OVF_U:
 			CHECK_STACK_UNDERFLOW (1);
+			if (type_from_op (*ip, stack + cur_stack - 1) == TYPE_INV)
+				ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0x%02x at 0x%04x", *ip, ip_offset));
 			++ip;
 			break;
 		case CEE_ADD_OVF:
@@ -1552,17 +1985,24 @@ mono_method_verify (MonoMethod *method, int level)
 			case CEE_CLT_UN:
 				CHECK_STACK_UNDERFLOW (2);
 				--cur_stack;
+				if (type_from_op (256 + *ip, stack + cur_stack - 1) == TYPE_INV)
+					ADD_INVALID (list, g_strdup_printf ("Invalid arguments to opcode 0xFE 0x%02x at 0x%04x", *ip, ip_offset));
 				++ip;
 				break;
 			case CEE_LDFTN:
 				CHECK_STACK_OVERFLOW ();
 				token = read32 (ip + 1);
 				ip += 5;
+				stack [cur_stack].stype = TYPE_PTR;
+				cur_stack++;
 				break;
 			case CEE_LDVIRTFTN:
 				CHECK_STACK_UNDERFLOW (1);
 				token = read32 (ip + 1);
 				ip += 5;
+				if (stack [cur_stack - 1].stype != TYPE_OBJ)
+					ADD_INVALID (list, g_strdup_printf ("Invalid argument to ldvirtftn at 0x%04x", ip_offset));
+				stack [cur_stack - 1].stype = TYPE_PTR;
 				break;
 			case CEE_UNUSED56:
 				++ip;
@@ -1584,26 +2024,34 @@ mono_method_verify (MonoMethod *method, int level)
 				break;
 			case CEE_LDLOC:
 			case CEE_LDLOCA:
-				if (read16 (ip + 1) >= header->num_locals)
-					ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", read16 (ip + 1), ip_offset));
+				n = read16 (ip + 1);
+				if (n >= header->num_locals)
+					ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", n, ip_offset));
 				/* no need to check if the var is initialized if the address is taken */
-				if (*ip == CEE_LDLOC && !local_state [read16 (ip + 1)])
-					ADD_INVALID (list, g_strdup_printf ("Local var %d is initialized at 0x%04x", read16 (ip + 1), ip_offset));
+				if (0 && *ip == CEE_LDLOC && !local_state [n])
+					ADD_INVALID (list, g_strdup_printf ("Local var %d is initialized at 0x%04x", n, ip_offset));
 				CHECK_STACK_OVERFLOW ();
+				type_to_eval_stack_type (header->locals [n], stack + cur_stack, *ip == CEE_LDLOCA);
 				++cur_stack;
 				ip += 3;
 				break;
 			case CEE_STLOC:
-				if (read16 (ip + 1) >= header->num_locals)
-					ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", read16 (ip + 1), ip_offset));
-				local_state [read16 (ip + 1)] = 1;
+				n = read16 (ip + 1);
+				if (n >= header->num_locals)
+					ADD_INVALID (list, g_strdup_printf ("Method doesn't have local var %d at 0x%04x", n, ip_offset));
+				local_state [n] = 1;
 				CHECK_STACK_UNDERFLOW (1);
 				--cur_stack;
+				if (!can_store_type (stack + cur_stack, header->locals [n]))
+					ADD_INVALID (list, g_strdup_printf ("Incompatible type %s in store at 0x%04x", arg_name [stack [cur_stack].stype], ip_offset));
 				ip += 3;
 				break;
 			case CEE_LOCALLOC:
 				if (cur_stack != 1)
 					ADD_INVALID (list, g_strdup_printf ("Stack must have only size item in localloc at 0x%04x", ip_offset));
+				if (stack [cur_stack -1].stype != TYPE_I4 && stack [cur_stack -1].stype != TYPE_PTR)
+					ADD_INVALID (list, g_strdup_printf ("Invalid argument to localloc at 0x%04x", ip_offset));
+				stack [cur_stack -1].stype = TYPE_MP;
 				++ip;
 				break;
 			case CEE_UNUSED57:
@@ -1632,6 +2080,7 @@ mono_method_verify (MonoMethod *method, int level)
 				CHECK_STACK_UNDERFLOW (1);
 				token = read32 (ip + 1);
 				ip += 5;
+				--cur_stack;
 				break;
 			case CEE_UNUSED68:
 				++ip;
@@ -1657,6 +2106,9 @@ mono_method_verify (MonoMethod *method, int level)
 				CHECK_STACK_OVERFLOW ();
 				token = read32 (ip + 1);
 				ip += 5;
+				stack [cur_stack].type = &mono_defaults.uint_class->byval_arg;
+				stack [cur_stack].stype = TYPE_I4;
+				cur_stack++;
 				break;
 			case CEE_REFANYTYPE:
 				CHECK_STACK_UNDERFLOW (1);
@@ -1679,5 +2131,438 @@ invalid_cil:
 
 	g_free (local_state);
 	g_free (code);
+	g_free (stack);
+	if (signature->hasthis)
+		g_free (params);
 	return list;
 }
+
+typedef struct {
+	const char *name;
+	guint64 offset;
+} FieldDesc;
+
+typedef struct {
+	const char *name;
+	const FieldDesc *fields;
+} ClassDesc;
+
+static const FieldDesc 
+typebuilder_fields[] = {
+	{"tname", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, name)},
+	{"nspace", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, nspace)},
+	{"parent", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, parent)},
+	{"interfaces", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, interfaces)},
+	{"methods", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, methods)},
+	{"properties", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, properties)},
+	{"fields", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, fields)},
+	{"attrs", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, attrs)},
+	{"table_idx", G_STRUCT_OFFSET (MonoReflectionTypeBuilder, table_idx)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+modulebuilder_fields[] = {
+	{"types", G_STRUCT_OFFSET (MonoReflectionModuleBuilder, types)},
+	{"cattrs", G_STRUCT_OFFSET (MonoReflectionModuleBuilder, cattrs)},
+	{"guid", G_STRUCT_OFFSET (MonoReflectionModuleBuilder, guid)},
+	{"table_idx", G_STRUCT_OFFSET (MonoReflectionModuleBuilder, table_idx)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+assemblybuilder_fields[] = {
+	{"entry_point", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, entry_point)},
+	{"modules", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, modules)},
+	{"name", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, name)},
+	{"resources", G_STRUCT_OFFSET (MonoReflectionAssemblyBuilder, resources)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+ctorbuilder_fields[] = {
+	{"ilgen", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, ilgen)},
+	{"parameters", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, parameters)},
+	{"attrs", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, attrs)},
+	{"iattrs", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, iattrs)},
+	{"table_idx", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, table_idx)},
+	{"call_conv", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, call_conv)},
+	{"type", G_STRUCT_OFFSET (MonoReflectionCtorBuilder, type)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+methodbuilder_fields[] = {
+	{"mhandle", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, mhandle)},
+	{"rtype", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, rtype)},
+	{"parameters", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, parameters)},
+	{"attrs", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, attrs)},
+	{"iattrs", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, iattrs)},
+	{"name", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, name)},
+	{"table_idx", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, table_idx)},
+	{"code", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, code)},
+	{"ilgen", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, ilgen)},
+	{"type", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, type)},
+	{"pinfo", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, pinfo)},
+	{"pi_dll", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, dll)},
+	{"pi_entry", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, dllentry)},
+	{"ncharset", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, charset)},
+	{"native_cc", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, native_cc)},
+	{"call_conv", G_STRUCT_OFFSET (MonoReflectionMethodBuilder, call_conv)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+fieldbuilder_fields[] = {
+	{"attrs", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, attrs)},
+	{"type", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, type)},
+	{"name", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, name)},
+	{"def_value", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, def_value)},
+	{"offset", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, offset)},
+	{"table_idx", G_STRUCT_OFFSET (MonoReflectionFieldBuilder, table_idx)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+propertybuilder_fields[] = {
+	{"attrs", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, attrs)},
+	{"name", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, name)},
+	{"type", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, type)},
+	{"parameters", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, parameters)},
+	{"def_value", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, def_value)},
+	{"set_method", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, set_method)},
+	{"get_method", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, get_method)},
+	{"table_idx", G_STRUCT_OFFSET (MonoReflectionPropertyBuilder, table_idx)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+ilgenerator_fields[] = {
+	{"code", G_STRUCT_OFFSET (MonoReflectionILGen, code)},
+	{"mbuilder", G_STRUCT_OFFSET (MonoReflectionILGen, mbuilder)},
+	{"code_len", G_STRUCT_OFFSET (MonoReflectionILGen, code_len)},
+	{"max_stack", G_STRUCT_OFFSET (MonoReflectionILGen, max_stack)},
+	{"cur_stack", G_STRUCT_OFFSET (MonoReflectionILGen, cur_stack)},
+	{"locals", G_STRUCT_OFFSET (MonoReflectionILGen, locals)},
+	{"ex_handlers", G_STRUCT_OFFSET (MonoReflectionILGen, ex_handlers)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+ilexinfo_fields[] = {
+	{"handlers", G_STRUCT_OFFSET (MonoILExceptionInfo, handlers)},
+	{"start", G_STRUCT_OFFSET (MonoILExceptionInfo, start)},
+	{"len", G_STRUCT_OFFSET (MonoILExceptionInfo, len)},
+	{"end", G_STRUCT_OFFSET (MonoILExceptionInfo, label)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+ilexblock_fields[] = {
+	{"extype", G_STRUCT_OFFSET (MonoILExceptionBlock, extype)},
+	{"type", G_STRUCT_OFFSET (MonoILExceptionBlock, type)},
+	{"start", G_STRUCT_OFFSET (MonoILExceptionBlock, start)},
+	{"len", G_STRUCT_OFFSET (MonoILExceptionBlock, len)},
+	{"filter_offset", G_STRUCT_OFFSET (MonoILExceptionBlock, filter_offset)},
+	{NULL, 0}
+};
+
+static const ClassDesc
+emit_classes_to_check [] = {
+	{"TypeBuilder", typebuilder_fields},
+	{"ModuleBuilder", modulebuilder_fields},
+	{"AssemblyBuilder", assemblybuilder_fields},
+	{"ConstructorBuilder", ctorbuilder_fields},
+	{"MethodBuilder", methodbuilder_fields},
+	{"FieldBuilder", fieldbuilder_fields},
+	{"PropertyBuilder", propertybuilder_fields},
+	{"ILGenerator", ilgenerator_fields},
+	{"ILExceptionBlock", ilexblock_fields},
+	{"ILExceptionInfo", ilexinfo_fields},
+	{NULL, NULL}
+};
+
+static const FieldDesc 
+monoevent_fields[] = {
+	{"klass", G_STRUCT_OFFSET (MonoReflectionEvent, klass)},
+	{"handle", G_STRUCT_OFFSET (MonoReflectionEvent, event)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+monoproperty_fields[] = {
+	{"klass", G_STRUCT_OFFSET (MonoReflectionProperty, klass)},
+	{"prop", G_STRUCT_OFFSET (MonoReflectionProperty, property)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+monofield_fields[] = {
+	{"klass", G_STRUCT_OFFSET (MonoReflectionField, klass)},
+	{"fhandle", G_STRUCT_OFFSET (MonoReflectionField, field)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+monomethodinfo_fields[] = {
+	{"parent", G_STRUCT_OFFSET (MonoMethodInfo, parent)},
+	{"ret", G_STRUCT_OFFSET (MonoMethodInfo, ret)},
+	{"attrs", G_STRUCT_OFFSET (MonoMethodInfo, attrs)},
+	{"iattrs", G_STRUCT_OFFSET (MonoMethodInfo, implattrs)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+monopropertyinfo_fields[] = {
+	{"parent", G_STRUCT_OFFSET (MonoPropertyInfo, parent)},
+	{"name", G_STRUCT_OFFSET (MonoPropertyInfo, name)},
+	{"get_method", G_STRUCT_OFFSET (MonoPropertyInfo, get)},
+	{"set_method", G_STRUCT_OFFSET (MonoPropertyInfo, set)},
+	{"attrs", G_STRUCT_OFFSET (MonoPropertyInfo, attrs)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+monofieldinfo_fields[] = {
+	{"parent", G_STRUCT_OFFSET (MonoFieldInfo, parent)},
+	{"type", G_STRUCT_OFFSET (MonoFieldInfo, type)},
+	{"name", G_STRUCT_OFFSET (MonoFieldInfo, name)},
+	{"attrs", G_STRUCT_OFFSET (MonoFieldInfo, attrs)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+monomethod_fields[] = {
+	{"mhandle", G_STRUCT_OFFSET (MonoReflectionMethod, method)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+monocmethod_fields[] = {
+	{"mhandle", G_STRUCT_OFFSET (MonoReflectionMethod, method)},
+	{NULL, 0}
+};
+
+static const FieldDesc 
+pinfo_fields[] = {
+	{"ClassImpl", G_STRUCT_OFFSET (MonoReflectionParameter, ClassImpl)},
+	{"DefaultValueImpl", G_STRUCT_OFFSET (MonoReflectionParameter, DefaultValueImpl)},
+	{"MemberImpl", G_STRUCT_OFFSET (MonoReflectionParameter, MemberImpl)},
+	{"NameImpl", G_STRUCT_OFFSET (MonoReflectionParameter, NameImpl)},
+	{"PositionImpl", G_STRUCT_OFFSET (MonoReflectionParameter, PositionImpl)},
+	{"AttrsImpl", G_STRUCT_OFFSET (MonoReflectionParameter, AttrsImpl)},
+	{NULL, 0}
+};
+
+static const ClassDesc
+reflection_classes_to_check [] = {
+	{"MonoEvent", monoevent_fields},
+	{"MonoProperty", monoproperty_fields},
+	{"MonoField", monofield_fields},
+	{"MonoMethodInfo", monomethodinfo_fields},
+	{"MonoPropertyInfo", monopropertyinfo_fields},
+	{"MonoFieldInfo", monofieldinfo_fields},
+	{"MonoMethod", monomethod_fields},
+	{"MonoCMethod", monocmethod_fields},
+	{"ParameterInfo", pinfo_fields},
+	{NULL, NULL}
+};
+
+static FieldDesc 
+enuminfo_fields[] = {
+	{"utype", G_STRUCT_OFFSET (MonoEnumInfo, utype)},
+	{"values", G_STRUCT_OFFSET (MonoEnumInfo, values)},
+	{"names", G_STRUCT_OFFSET (MonoEnumInfo, names)},
+	{NULL, 0}
+};
+
+static FieldDesc 
+delegate_fields[] = {
+	{"target_type", G_STRUCT_OFFSET (MonoDelegate, target_type)},
+	{"m_target", G_STRUCT_OFFSET (MonoDelegate, target)},
+	{"method_name", G_STRUCT_OFFSET (MonoDelegate, method_name)},
+	{"method_ptr", G_STRUCT_OFFSET (MonoDelegate, method_ptr)},
+	{"delegate_trampoline", G_STRUCT_OFFSET (MonoDelegate, delegate_trampoline)},
+	{"method_info", G_STRUCT_OFFSET (MonoDelegate, method_info)},
+	{NULL, 0}
+};
+
+static FieldDesc 
+multicast_delegate_fields[] = {
+	{"prev", G_STRUCT_OFFSET (MonoMulticastDelegate, prev)},
+	{NULL, 0}
+};
+
+static FieldDesc 
+async_result_fields[] = {
+	{"async_state", G_STRUCT_OFFSET (MonoAsyncResult, async_state)},
+	{"handle", G_STRUCT_OFFSET (MonoAsyncResult, handle)},
+	{"async_delegate", G_STRUCT_OFFSET (MonoAsyncResult, async_delegate)},
+	{"data", G_STRUCT_OFFSET (MonoAsyncResult, data)},
+	{"sync_completed", G_STRUCT_OFFSET (MonoAsyncResult, sync_completed)},
+	{"completed", G_STRUCT_OFFSET (MonoAsyncResult, completed)},
+	{"endinvoke_called", G_STRUCT_OFFSET (MonoAsyncResult, endinvoke_called)},
+	{NULL, 0}
+};
+
+static FieldDesc 
+exception_fields[] = {
+	{"trace_ips", G_STRUCT_OFFSET (MonoException, trace_ips)},
+	{"inner_exception", G_STRUCT_OFFSET (MonoException, inner_ex)},
+	{"message", G_STRUCT_OFFSET (MonoException, message)},
+	{"help_link", G_STRUCT_OFFSET (MonoException, help_link)},
+	{"class_name", G_STRUCT_OFFSET (MonoException, class_name)},
+	{"stack_trace", G_STRUCT_OFFSET (MonoException, stack_trace)},
+	{"remote_stack_trace", G_STRUCT_OFFSET (MonoException, remote_stack_trace)},
+	{"remote_stack_index", G_STRUCT_OFFSET (MonoException, remote_stack_index)},
+	{"hresult", G_STRUCT_OFFSET (MonoException, hresult)},
+	{"source", G_STRUCT_OFFSET (MonoException, source)},
+	{NULL, 0}
+};
+
+static const ClassDesc
+system_classes_to_check [] = {
+	{"Exception", exception_fields},
+	{"MonoEnumInfo", enuminfo_fields},
+	{"Delegate", delegate_fields},
+	{"MulticastDelegate", multicast_delegate_fields},
+	{NULL, NULL}
+};
+
+static FieldDesc 
+stack_frame_fields [] = {
+	{"ilOffset", G_STRUCT_OFFSET (MonoStackFrame, il_offset)},
+	{"nativeOffset", G_STRUCT_OFFSET (MonoStackFrame, native_offset)},
+	{"methodBase", G_STRUCT_OFFSET (MonoStackFrame, method)},
+	{"fileName", G_STRUCT_OFFSET (MonoStackFrame, filename)},
+	{"lineNumber", G_STRUCT_OFFSET (MonoStackFrame, line)},
+	{"columnNumber", G_STRUCT_OFFSET (MonoStackFrame, column)},
+	{NULL, 0}
+};
+
+static const ClassDesc
+system_diagnostics_classes_to_check [] = {
+	{"StackFrame", stack_frame_fields},
+	{NULL, NULL}
+};
+
+static FieldDesc 
+mono_method_message_fields[] = {
+	{"method", G_STRUCT_OFFSET (MonoMethodMessage, method)},
+	{"args", G_STRUCT_OFFSET (MonoMethodMessage, args)},
+	{"names", G_STRUCT_OFFSET (MonoMethodMessage, names)},
+	{"arg_types", G_STRUCT_OFFSET (MonoMethodMessage, arg_types)},
+	{"ctx", G_STRUCT_OFFSET (MonoMethodMessage, ctx)},
+	{"rval", G_STRUCT_OFFSET (MonoMethodMessage, rval)},
+	{"exc", G_STRUCT_OFFSET (MonoMethodMessage, exc)},
+	{NULL, 0}
+};
+
+static const ClassDesc
+messaging_classes_to_check [] = {
+	{"AsyncResult", async_result_fields},
+	{"MonoMethodMessage", mono_method_message_fields},
+	{NULL, NULL}
+};
+
+static FieldDesc 
+transparent_proxy_fields[] = {
+	{"_rp", G_STRUCT_OFFSET (MonoTransparentProxy, rp)},
+	{"_class", G_STRUCT_OFFSET (MonoTransparentProxy, klass)},
+	{NULL, 0}
+};
+
+static FieldDesc 
+real_proxy_fields[] = {
+	{"class_to_proxy", G_STRUCT_OFFSET (MonoRealProxy, class_to_proxy)},
+	{NULL, 0}
+};
+
+static const ClassDesc
+proxy_classes_to_check [] = {
+	{"TransparentProxy", transparent_proxy_fields},
+	{"RealProxy", real_proxy_fields},
+	{NULL, NULL}
+};
+
+static FieldDesc 
+wait_handle_fields[] = {
+	{"os_handle", G_STRUCT_OFFSET (MonoWaitHandle, handle)},
+	{"disposed", G_STRUCT_OFFSET (MonoWaitHandle, disposed)},
+	{NULL, 0}
+};
+
+static FieldDesc 
+thread_fields[] = {
+	{"system_thread_handle", G_STRUCT_OFFSET (MonoThread, handle)},
+	{"current_culture", G_STRUCT_OFFSET (MonoThread, culture_info)},
+	{"threadpool_thread", G_STRUCT_OFFSET (MonoThread, threadpool_thread)},
+	{"state", G_STRUCT_OFFSET (MonoThread, state)},
+	{"abort_exc", G_STRUCT_OFFSET (MonoThread, abort_exc)},
+	{"abort_state", G_STRUCT_OFFSET (MonoThread, abort_state)},
+	{NULL, 0}
+};
+
+static const ClassDesc
+threading_classes_to_check [] = {
+	{"Thread", thread_fields},
+	{"WaitHandle", wait_handle_fields},
+	{NULL, NULL}
+};
+
+typedef struct {
+	const char *name;
+	const ClassDesc *types;
+} NameSpaceDesc;
+
+static const NameSpaceDesc
+namespaces_to_check[] = {
+	{"System.Runtime.Remoting.Proxies", proxy_classes_to_check},
+	{"System.Runtime.Remoting.Messaging", messaging_classes_to_check},
+	{"System.Reflection.Emit", emit_classes_to_check},
+	{"System.Reflection", reflection_classes_to_check},
+	{"System.Threading", threading_classes_to_check},
+	{"System.Diagnostics", system_diagnostics_classes_to_check},
+	{"System", system_classes_to_check},
+	{NULL, NULL}
+};
+
+static char*
+check_corlib (MonoImage *corlib)
+{
+	MonoClass *klass;
+	MonoClassField *field;
+	const FieldDesc *fdesc;
+	const ClassDesc *cdesc;
+	const NameSpaceDesc *ndesc;
+	gint struct_offset;
+
+	for (ndesc = namespaces_to_check; ndesc->name; ++ndesc) {
+		for (cdesc = ndesc->types; cdesc->name; ++cdesc) {
+			klass = mono_class_from_name (corlib, ndesc->name, cdesc->name);
+			if (!klass)
+				return g_strdup_printf ("Cannot find class %s", cdesc->name);
+			mono_class_init (klass);
+			/*
+			 * FIXME: we should also check the size of valuetypes, or
+			 * we're going to have trouble when we access them in arrays.
+			 */
+			if (klass->valuetype)
+				struct_offset = 8;
+			else
+				struct_offset = 0;
+			for (fdesc = cdesc->fields; fdesc->name; ++fdesc) {
+				field = mono_class_get_field_from_name (klass, fdesc->name);
+				if (!field || (field->offset != (fdesc->offset + struct_offset)))
+					return g_strdup_printf ("field `%s' mismatch in class %s (%ld != %ld)", fdesc->name, cdesc->name, (long) fdesc->offset, (long) (field?field->offset:-1));
+			}
+		}
+	}
+	return NULL;
+}
+
+char*
+mono_verify_corlib () {
+	return check_corlib (mono_defaults.corlib);
+}
+
diff --git a/mono/metadata/verify.h b/mono/metadata/verify.h
index eba7670f7c1..b15c501f49a 100644
--- a/mono/metadata/verify.h
+++ b/mono/metadata/verify.h
@@ -21,6 +21,7 @@ typedef struct {
 GSList* mono_image_verify_tables (MonoImage *image, int level);
 GSList* mono_method_verify       (MonoMethod *method, int level);
 void    mono_free_verify_list    (GSList *list);
+char*   mono_verify_corlib       (void);
 
 #endif  /* __MONO_METADATA_VERIFY_H__ */
 
diff --git a/mono/monoburg/ChangeLog b/mono/monoburg/ChangeLog
index 0341fd41b55..1a80085a17b 100644
--- a/mono/monoburg/ChangeLog
+++ b/mono/monoburg/ChangeLog
@@ -1,3 +1,15 @@
+2002-04-20  Dietmar Maurer  <dietmar@ximian.com>
+
+	* monoburg.y (yylex): bug fix in number parsing
+
+2002-04-12  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* monoburg.c: added option -s to specify the c source file for output.
+
+2002-04-11  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* monoburg.c: added a default handler for warning messages that just
+	output the messages to stderr instead of stdout.
 
 Mon Feb 18 14:28:10 CET 2002 Paolo Molaro <lupus@ximian.com>
 
diff --git a/mono/monoburg/Makefile.am b/mono/monoburg/Makefile.am
index 9542054e254..5f1f2f47707 100644
--- a/mono/monoburg/Makefile.am
+++ b/mono/monoburg/Makefile.am
@@ -1,10 +1,12 @@
-INCLUDES = $(BUILD_GLIB_CFLAGS) 
+INCLUDES = $(BUILD_GLIB_CFLAGS) -I$(srcdir)
 CC=$(CC_FOR_BUILD)
 
 #noinst_PROGRAMS = sample
 
 #sample_SOURCES = sample.c
 
+all: monoburg$(BUILD_EXEEXT)
+
 parser.c:  $(srcdir)/monoburg.y
 	bison $(srcdir)/monoburg.y -o parser.c
 
diff --git a/mono/monoburg/monoburg.c b/mono/monoburg/monoburg.c
index 3574cabc1be..795b959fff3 100644
--- a/mono/monoburg/monoburg.c
+++ b/mono/monoburg/monoburg.c
@@ -23,6 +23,7 @@ static GList *rule_list;
 FILE *inputfd;
 FILE *outputfd;
 static FILE *deffd;
+static FILE *cfd;
 
 static void output (char *fmt, ...) 
 {
@@ -811,23 +812,37 @@ static void
 usage ()
 {
 	fprintf (stderr,
-		 "Usage is: monoburg [-d file] [file] \n");
+		 "Usage is: monoburg -d file.h -s file.c [inputfile] \n");
 	exit (1);
 }
 
+static void
+warning_handler (const gchar *log_domain,
+		 GLogLevelFlags log_level,
+		 const gchar *message,
+		 gpointer user_data)
+{
+	(void) fprintf ((FILE *) user_data, "** WARNING **: %s\n", message);
+}
+
 int
 main (int argc, char *argv [])
 {
+	char *cfile = NULL;
 	char *deffile = NULL;
 	char *infile = NULL;
 	int i;
 
+	g_log_set_handler (NULL, G_LOG_LEVEL_WARNING, warning_handler, stderr);
+
 	for (i = 1; i < argc; i++){
 		if (argv [i][0] == '-'){
 			if (argv [i][1] == 'h') {
 				usage ();
 			} else if (argv [i][1] == 'd') {
 				deffile = argv [++i];
+			} else if (argv [i][1] == 's') {
+				cfile = argv [++i];
 			} else {
 				usage ();
 			}
@@ -875,7 +890,18 @@ main (int argc, char *argv [])
 	if (deffd) {
 		output ("#endif /* _MONO_BURG_DEFS_ */\n");
 		fclose (deffd);
-		outputfd = stdout;
+
+		if (cfile == NULL)
+			outputfd = stdout;
+		else {
+			if (!(cfd = fopen (cfile, "w"))) {
+				perror ("cant open c output file");
+				(void) remove (deffile);
+				exit (-1);
+			}
+
+			outputfd = cfd;
+		}
 
 		output ("#include \"%s\"\n\n", deffile);
 	}
@@ -892,9 +918,11 @@ main (int argc, char *argv [])
 
 	yyparsetail ();
 
+	if (cfile)
+		fclose (cfd);
+
 	if (infile)
 		fclose (inputfd);
 
-
 	return 0;
 }
diff --git a/mono/monoburg/monoburg.y b/mono/monoburg/monoburg.y
index 8a551b1d8de..9c56a290a0d 100644
--- a/mono/monoburg/monoburg.y
+++ b/mono/monoburg/monoburg.y
@@ -176,7 +176,7 @@ yylex (void)
 
 	    do {
 		    num = 10*num + (c - '0');
-	    } while ((c = isdigit (*next++)));
+	    } while (isdigit (c = (*next++)));
 
 	    yylval.ivalue = num;
 	    return INTEGER;
diff --git a/mono/monograph/ChangeLog b/mono/monograph/ChangeLog
index cc412230357..8be79bf1a40 100644
--- a/mono/monograph/ChangeLog
+++ b/mono/monograph/ChangeLog
@@ -1,4 +1,23 @@
 
+Fri Jul 19 14:23:46 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: simple stats on opcode size.
+
+Thu Mar 28 15:18:50 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: some warning cleanups.
+
+Mon Mar 11 11:58:27 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: update --help output, Make error messages less
+	intimidating and more informative.
+
+Mon Mar 11 11:16:53 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monograph.c: removed method signature and searching helpers
+	that are now provided in libmetadata. Added --control-flow option to
+	create a control flow graph of a method, with basic blocks etc.
+
 Wed Feb 20 17:53:59 CET 2002 Paolo Molaro <lupus@ximian.com>
 
 	* monograph.c: added -i option to create a graph of the types
diff --git a/mono/monograph/Makefile.am b/mono/monograph/Makefile.am
index 7ab0c74e36d..22b27025262 100644
--- a/mono/monograph/Makefile.am
+++ b/mono/monograph/Makefile.am
@@ -7,8 +7,9 @@ INCLUDES = 				\
 	$(GLIB_CFLAGS)
 
 monograph_LDADD = \
-	../metadata/libmetadata.a	\
-	../io-layer/libwapi.a		\
+	../metadata/libmetadata.la	\
+	../io-layer/libwapi.la		\
+	../utils/libmonoutils.la	\
 	$(GLIB_LIBS)			\
 	$(GMODULE_LIBS) 		\
 	-lm
diff --git a/mono/monograph/monograph.c b/mono/monograph/monograph.c
index 37d2aa32d75..282967a3b37 100644
--- a/mono/monograph/monograph.c
+++ b/mono/monograph/monograph.c
@@ -8,12 +8,13 @@
 #include "mono/metadata/cil-coff.h" /* MonoCLIImageInfo */
 #include "mono/metadata/mono-endian.h"
 #include "mono/metadata/appdomain.h" /* mono_init */
+#include "mono/metadata/debug-helpers.h"
 
 static FILE *output;
 static int include_namespace = 0;
 static int max_depth = 6;
 static int verbose = 0;
-static char *graph_properties = "\tnode [fontsize=8.0]\n\tedge [len=2,color=red]\n";
+static const char *graph_properties = "\tnode [fontsize=8.0]\n\tedge [len=2,color=red]\n";
 
 static void
 output_type_edge (MonoClass *first, MonoClass *second) {
@@ -25,7 +26,7 @@ output_type_edge (MonoClass *first, MonoClass *second) {
 
 static void
 print_subtypes (MonoImage *image, MonoClass *class, int depth) {
-	int i, index;
+	int i, token;
 	MonoTableInfo *t;
 	MonoClass *child;
 
@@ -34,13 +35,13 @@ print_subtypes (MonoImage *image, MonoClass *class, int depth) {
 
 	t = &image->tables [MONO_TABLE_TYPEDEF];
 	
-	index = mono_metadata_token_index (class->type_token);
-	index <<= TYPEDEFORREF_BITS;
-	index |= TYPEDEFORREF_TYPEDEF;
+	token = mono_metadata_token_index (class->type_token);
+	token <<= TYPEDEFORREF_BITS;
+	token |= TYPEDEFORREF_TYPEDEF;
 
 	/* use a subgraph? */
 	for (i = 0; i < t->rows; ++i) {
-		if (index == mono_metadata_decode_row_col (t, i, MONO_TYPEDEF_EXTENDS)) {
+		if (token == mono_metadata_decode_row_col (t, i, MONO_TYPEDEF_EXTENDS)) {
 			child = mono_class_get (image, MONO_TOKEN_TYPE_DEF | (i + 1));
 			output_type_edge (class, child);
 			print_subtypes (image, child, depth);
@@ -49,11 +50,11 @@ print_subtypes (MonoImage *image, MonoClass *class, int depth) {
 }
 
 static void
-type_graph (MonoImage *image, char* cname) {
+type_graph (MonoImage *image, const char* cname) {
 	MonoClass *class;
 	MonoClass *parent;
 	MonoClass *child;
-	char *name_space;
+	const char *name_space;
 	char *p;
 	int depth = 0;
 
@@ -67,8 +68,10 @@ type_graph (MonoImage *image, char* cname) {
 		name_space = "";
 	}
 	class = mono_class_from_name (image, name_space, cname);
-	if (!class)
-		g_error ("class %s.%s not found", name_space, cname);
+	if (!class) {
+		g_print ("class %s.%s not found\n", name_space, cname);
+		exit (1);
+	}
 	fprintf (output, "digraph blah {\n");
 	fprintf (output, "%s", graph_properties);
 	child = class;
@@ -82,13 +85,13 @@ type_graph (MonoImage *image, char* cname) {
 }
 
 static void
-interface_graph (MonoImage *image, char* cname) {
+interface_graph (MonoImage *image, const char* cname) {
 	MonoClass *class;
 	MonoClass *child;
-	char *name_space;
+	const char *name_space;
 	char *p;
 	guint32 cols [MONO_INTERFACEIMPL_SIZE];
-	guint32 index, i, count = 0;
+	guint32 token, i, count = 0;
 	MonoTableInfo *intf = &image->tables [MONO_TABLE_INTERFACEIMPL];
 
 	cname = g_strdup (cname);
@@ -101,19 +104,21 @@ interface_graph (MonoImage *image, char* cname) {
 		name_space = "";
 	}
 	class = mono_class_from_name (image, name_space, cname);
-	if (!class)
-		g_error ("interface %s.%s not found", name_space, cname);
+	if (!class) {
+		g_print ("interface %s.%s not found\n", name_space, cname);
+		exit (1);
+	}
 	/* chek if it's really an interface... */
 	fprintf (output, "digraph interface {\n");
 	fprintf (output, "%s", graph_properties);
 	/* TODO: handle inetrface defined in one image and class defined in another. */
-	index = mono_metadata_token_index (class->type_token);
-	index <<= TYPEDEFORREF_BITS;
-	index |= TYPEDEFORREF_TYPEDEF;
+	token = mono_metadata_token_index (class->type_token);
+	token <<= TYPEDEFORREF_BITS;
+	token |= TYPEDEFORREF_TYPEDEF;
 	for (i = 0; i < intf->rows; ++i) {
 		mono_metadata_decode_row (intf, i, cols, MONO_INTERFACEIMPL_SIZE);
 		/*g_print ("index: %d [%d implements %d]\n", index, cols [MONO_INTERFACEIMPL_CLASS], cols [MONO_INTERFACEIMPL_INTERFACE]);*/
-		if (index == cols [MONO_INTERFACEIMPL_INTERFACE]) {
+		if (token == cols [MONO_INTERFACEIMPL_INTERFACE]) {
 			child = mono_class_get (image, MONO_TOKEN_TYPE_DEF | cols [MONO_INTERFACEIMPL_CLASS]);
 			output_type_edge (class, child);
 			count++;
@@ -125,74 +130,165 @@ interface_graph (MonoImage *image, char* cname) {
 
 }
 
+static int back_branch_waste = 0;
+static int branch_waste = 0;
+static int var_waste = 0;
+static int int_waste = 0;
+static int nop_waste = 0;
+
 static void
-get_type (GString *res, MonoType *type) {
-	switch (type->type) {
-	case MONO_TYPE_VOID:
-		g_string_append (res, "void"); break;
-	case MONO_TYPE_CHAR:
-		g_string_append (res, "char"); break;
-	case MONO_TYPE_BOOLEAN:
-		g_string_append (res, "bool"); break;
-	case MONO_TYPE_U1:
-		g_string_append (res, "byte"); break;
-	case MONO_TYPE_I1:
-		g_string_append (res, "sbyte"); break;
-	case MONO_TYPE_U2:
-		g_string_append (res, "uint16"); break;
-	case MONO_TYPE_I2:
-		g_string_append (res, "int16"); break;
-	case MONO_TYPE_U4:
-		g_string_append (res, "int"); break;
-	case MONO_TYPE_I4:
-		g_string_append (res, "uint"); break;
-	case MONO_TYPE_U8:
-		g_string_append (res, "ulong"); break;
-	case MONO_TYPE_I8:
-		g_string_append (res, "long"); break;
-	case MONO_TYPE_FNPTR: /* who cares for the exact signature? */
-		g_string_append (res, "*()"); break;
-	case MONO_TYPE_U:
-		g_string_append (res, "intptr"); break;
-	case MONO_TYPE_I:
-		g_string_append (res, "uintptr"); break;
-	case MONO_TYPE_R4:
-		g_string_append (res, "single"); break;
-	case MONO_TYPE_R8:
-		g_string_append (res, "double"); break;
-	case MONO_TYPE_STRING:
-		g_string_append (res, "string"); break;
-	case MONO_TYPE_OBJECT:
-		g_string_append (res, "object"); break;
-	case MONO_TYPE_PTR:
-		get_type (res, type->data.type);
-		g_string_append_c (res, '*');
-		break;
-	case MONO_TYPE_ARRAY:
-		get_type (res, type->data.array->type);
-		g_string_append (res, "[,]"); /* not the full array info.. */
-		break;
-	case MONO_TYPE_SZARRAY:
-		get_type (res, type->data.type);
-		g_string_append (res, "[]");
-		break;
-	case MONO_TYPE_CLASS:
-	case MONO_TYPE_VALUETYPE: {
-		MonoClass *class = type->data.klass;
-		if (!class) {
-			g_string_append (res, "Unknown");
+method_waste (MonoMethod *method) {
+	const MonoOpcode *opcode;
+	MonoMethodHeader *header;
+	const unsigned char *ip;
+	int i, n;
+	gint64 l;
+
+	if (method->iflags & (METHOD_IMPL_ATTRIBUTE_INTERNAL_CALL | METHOD_IMPL_ATTRIBUTE_RUNTIME))
+		return;
+	if (method->flags & (METHOD_ATTRIBUTE_PINVOKE_IMPL | METHOD_ATTRIBUTE_ABSTRACT))
+		return;
+
+	header = ((MonoMethodNormal *)method)->header;
+	ip = header->code;
+
+	while (ip < (header->code + header->code_size)) {
+		if (*ip == 0xfe) {
+			++ip;
+			i = *ip + 256;
+		} else {
+			i = *ip;
+		}
+
+		opcode = &mono_opcodes [i];
+
+		switch (opcode->argument) {
+		case MonoInlineNone:
+			if (i == MONO_CEE_NOP)
+				nop_waste++;
+			++ip;
+			break;
+		case MonoInlineI:
+			n = read32 (ip + 1);
+			if (n >= -1 && n <= 8) {
+				int_waste += 4;
+				g_print ("%s %d\n", mono_opcode_names [i], n);
+			} else if (n < 128 && n >= -128) {
+				int_waste += 3;
+				g_print ("%s %d\n", mono_opcode_names [i], n);
+			}
+			ip += 5;
+			break;
+		case MonoInlineType:
+		case MonoInlineField:
+		case MonoInlineTok:
+		case MonoInlineString:
+		case MonoInlineSig:
+		case MonoShortInlineR:
+		case MonoInlineBrTarget:
+			n = read32 (ip + 1);
+			if (n < 128 && n >= -128) {
+				branch_waste += 3;
+				if (n < 0)
+					back_branch_waste += 3;
+			}
+			ip += 5;
+			break;
+		case MonoInlineVar:
+			n = read16 (ip + 1);
+			if (n < 256) {
+				if (n < 4) {
+					switch (i) {
+					case MONO_CEE_LDARG:
+					case MONO_CEE_LDLOC:
+					case MONO_CEE_STLOC:
+						var_waste += 3;
+						g_print ("%s %d\n", mono_opcode_names [i], n);
+						break;
+					default:
+						var_waste += 2;
+						g_print ("%s %d\n", mono_opcode_names [i], n);
+						break;
+					}
+				} else {
+					var_waste += 2;
+					g_print ("%s %d\n", mono_opcode_names [i], n);
+				}
+			}
+			ip += 3;
+			break;
+		case MonoShortInlineVar:
+			if ((signed char)ip [1] < 4 && (signed char)ip [1] >= 0) {
+				switch (i) {
+				case MONO_CEE_LDARG_S:
+				case MONO_CEE_LDLOC_S:
+				case MONO_CEE_STLOC_S:
+					var_waste++;
+					g_print ("%s %d\n", mono_opcode_names [i], (signed char)ip [1]);
+					break;
+				default:
+					break;
+				}
+			}
+			ip += 2;
+			break;
+		case MonoShortInlineI:
+			if ((signed char)ip [1] <= 8 && (signed char)ip [1] >= -1) {
+				g_print ("%s %d\n", mono_opcode_names [i], (signed char)ip [1]);
+				int_waste ++;
+			}
+			ip += 2;
+			break;
+		case MonoShortInlineBrTarget:
+			ip += 2;
+			break;
+		case MonoInlineSwitch: {
+			gint32 n;
+			++ip;
+			n = read32 (ip);
+			ip += 4;
+			ip += 4 * n;
 			break;
 		}
-		if (include_namespace && *(class->name_space))
-			g_string_sprintfa (res, "%s.", class->name_space);
-		g_string_sprintfa (res, "%s", class->name);
-		break;
+		case MonoInlineR:
+			ip += 9;
+			break;
+		case MonoInlineI8:
+			l = read64 (ip + 1);
+			/* should load and convert */
+			if (l >= -1 && l <= 8) {
+				int_waste += 7;
+			} else if (l < 128 && l >= -128) {
+				int_waste += 6;
+			} else if (l <= 2147483647 && l >= (-2147483647 -1)) {
+				int_waste += 3;
+			}
+			ip += 9;
+			break;
+		case MonoInlineMethod:
+			ip += 5;
+			break;
+		default:
+			g_assert_not_reached ();
+		}
 	}
-	default:
-		break;
+	return;
+}
+
+static void
+waste (MonoImage *image, const char *name) {
+	int i, waste = 0;
+	MonoMethod *method;
+	
+	for (i = 0; i < image->tables [MONO_TABLE_METHOD].rows; ++i) {
+		method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | (i + 1), NULL);
+		method_waste (method);
 	}
-	if (type->byref)
-		g_string_append_c (res, '&');
+	g_print ("back branch waste: %d\n", back_branch_waste);
+	g_print ("branch waste: %d\n", branch_waste);
+	g_print ("var waste: %d\n", var_waste);
+	g_print ("int waste: %d\n", int_waste);
+	g_print ("nop waste: %d\n", nop_waste);
 }
 
 static char *
@@ -200,7 +296,6 @@ get_signature (MonoMethod *method) {
 	GString *res;
 	static GHashTable *hash = NULL;
 	char *result;
-	int i;
 
 	if (!hash)
 		hash = g_hash_table_new (g_direct_hash, g_direct_equal);
@@ -210,13 +305,9 @@ get_signature (MonoMethod *method) {
 	res = g_string_new ("");
 	if (include_namespace && *(method->klass->name_space))
 		g_string_sprintfa (res, "%s.", method->klass->name_space);
-	g_string_sprintfa (res, "%s:%s(", method->klass->name, method->name);
-	for (i = 0; i < method->signature->param_count; ++i) {
-		if (i > 0)
-			g_string_append_c (res, ',');
-		get_type (res, method->signature->params [i]);
-	}
-	g_string_sprintfa (res, ")");
+	result = mono_signature_get_desc (method->signature, include_namespace);
+	g_string_sprintfa (res, "%s:%s(%s)", method->klass->name, method->name, result);
+	g_free (result);
 	g_hash_table_insert (hash, method, res->str);
 
 	result = res->str;
@@ -334,97 +425,372 @@ print_method (MonoMethod *method, int depth) {
 }
 
 static void
-method_graph (MonoImage *image, char *name) {
+method_graph (MonoImage *image, const char *name) {
 	int depth = 0;
 	MonoMethod *method = NULL;
 	
 	if (!name) {
-		method = mono_get_method (image, ((MonoCLIImageInfo*)image->image_info)->cli_cli_header.ch_entry_point, NULL);
-		if (!method)
-			g_error ("Cannot find entry point");
+		guint32 token = ((MonoCLIImageInfo*)image->image_info)->cli_cli_header.ch_entry_point;
+		if (!token || !(method = mono_get_method (image, token, NULL))) {
+			g_print ("Cannot find entry point in %s: specify an explict method name.\n", image->name);
+			exit (1);
+		}
 	} else {
 		/* search the method */
-		MonoTableInfo *tdef = &image->tables [MONO_TABLE_TYPEDEF];
-		MonoTableInfo *methods = &image->tables [MONO_TABLE_METHOD];
-		char *class_name, *class_nspace, *method_name, *use_args;
-		int use_namespace, i;
-		
-		class_nspace = g_strdup (name);
-		use_args = strchr (class_nspace, '(');
-		if (use_args)
-			*use_args++ = 0;
-		method_name = strrchr (class_nspace, ':');
-		if (!method_name)
-			g_error ("Invalid method name %s", name);
-		*method_name++ = 0;
-		class_name = strrchr (class_nspace, '.');
-		if (class_name) {
-			*class_name++ = 0;
-			use_namespace = 1;
+		MonoMethodDesc *desc;
+
+		desc = mono_method_desc_new (name, include_namespace);
+		if (!desc) {
+			g_print ("Invalid method name %s\n", name);
+			exit (1);
+		}
+		method = mono_method_desc_search_in_image (desc, image);
+		if (!method) {
+			g_print ("Cannot find method %s\n", name);
+			exit (1);
+		}
+	}
+	fprintf (output, "digraph blah {\n");
+	fprintf (output, "%s", graph_properties);
+
+	print_method (method, depth);
+	
+	fprintf (output, "}\n");
+}
+
+typedef struct MonoBasicBlock MonoBasicBlock;
+
+struct MonoBasicBlock {
+	const unsigned char* cil_code;
+	gint32 cil_length;
+	gint dfn;
+	GList *in_bb;
+	GList *out_bb;
+};
+
+static const unsigned char *debug_start;
+
+static void
+link_bblock (MonoBasicBlock *from, MonoBasicBlock* to)
+{
+	from->out_bb = g_list_prepend (from->out_bb, to);
+	to->in_bb = g_list_prepend (to->in_bb, from);
+	/*fprintf (stderr, "linking IL_%04x to IL_%04x\n", from->cil_code-debug_start, to->cil_code-debug_start);*/
+}
+
+static int
+compare_bblock (void *a, void *b)
+{
+	MonoBasicBlock **ab = a;
+	MonoBasicBlock **bb = b;
+
+	return (*ab)->cil_code - (*bb)->cil_code;
+}
+
+static GPtrArray*
+mono_method_find_bblocks (MonoMethodHeader *header)
+{
+	const unsigned char *ip, *end, *start;
+	const MonoOpcode *opcode;
+	int i, block_end = 0;
+	GPtrArray *result = g_ptr_array_new ();
+	GHashTable *table = g_hash_table_new (g_direct_hash, g_direct_equal);
+	MonoBasicBlock *entry_bb, *end_bb, *bb, *target;
+
+	ip = header->code;
+	end = ip + header->code_size;
+	debug_start = ip;
+
+	entry_bb = g_new0 (MonoBasicBlock, 1);
+	end_bb = g_new0 (MonoBasicBlock, 1);
+	g_ptr_array_add (result, entry_bb);
+	g_ptr_array_add (result, end_bb);
+
+	bb = g_new0 (MonoBasicBlock, 1);
+	bb->cil_code = ip;
+	g_ptr_array_add (result, bb);
+	link_bblock (entry_bb, bb);
+	g_hash_table_insert (table, (char*)ip, bb);
+	block_end = TRUE;
+
+	/* handle exception code blocks... */
+	while (ip < end) {
+		start = ip;
+		if ((target = g_hash_table_lookup (table, ip)) && target != bb) {
+			if (!block_end)
+				link_bblock (bb, target);
+			bb = target;
+			block_end = FALSE;
+		}
+		if (block_end) {
+			/*fprintf (stderr, "processing bbclok at IL_%04x\n", ip - header->code);*/
+			if (!(bb = g_hash_table_lookup (table, ip))) {
+				bb = g_new0 (MonoBasicBlock, 1);
+				bb->cil_code = ip;
+				g_ptr_array_add (result, bb);
+				g_hash_table_insert (table, (char*)ip, bb);
+			}
+			block_end = FALSE;
+		}
+		if (*ip == 0xfe) {
+			++ip;
+			i = *ip + 256;
 		} else {
-			class_name = class_nspace;
-			use_namespace = 0;
+			i = *ip;
 		}
-		for (i = 0; i < methods->rows; ++i) {
-			guint32 index = mono_metadata_decode_row_col (methods, i, MONO_METHOD_NAME);
-			guint32 idx;
-			const char *n = mono_metadata_string_heap (image, index);
-
-			if (strcmp (n, method_name))
-				continue;
-			index = mono_metadata_typedef_from_method (image, i + 1);
-			idx = mono_metadata_decode_row_col (tdef, index - 1, MONO_TYPEDEF_NAME);
-			n = mono_metadata_string_heap (image, idx);
-			if (strcmp (n, class_name))
-				continue;
-			if (use_namespace) {
-				idx = mono_metadata_decode_row_col (tdef, index - 1, MONO_TYPEDEF_NAMESPACE);
-				n = mono_metadata_string_heap (image, idx);
-				if (strcmp (n, class_nspace))
-					continue;
+
+		opcode = &mono_opcodes [i];
+		switch (opcode->flow_type) {
+		case MONO_FLOW_RETURN:
+			link_bblock (bb, end_bb);
+		case MONO_FLOW_ERROR:
+			block_end = 1;
+			break;
+		case MONO_FLOW_BRANCH: /* we handle branch when checking the argument type */
+		case MONO_FLOW_COND_BRANCH:
+		case MONO_FLOW_CALL:
+		case MONO_FLOW_NEXT:
+		case MONO_FLOW_META:
+			break;
+		default:
+			g_assert_not_reached ();
+		}
+		switch (opcode->argument) {
+		case MonoInlineNone:
+			++ip;
+			break;
+		case MonoInlineType:
+		case MonoInlineField:
+		case MonoInlineMethod:
+		case MonoInlineTok:
+		case MonoInlineString:
+		case MonoInlineSig:
+		case MonoShortInlineR:
+		case MonoInlineI:
+			ip += 5;
+			break;
+		case MonoInlineVar:
+			ip += 3;
+			break;
+		case MonoShortInlineVar:
+		case MonoShortInlineI:
+			ip += 2;
+			break;
+		case MonoShortInlineBrTarget:
+		case MonoInlineBrTarget:
+			ip++;
+			if (opcode->argument == MonoShortInlineBrTarget) {
+				i = (signed char)*ip;
+				ip++;
+			} else {
+				i = (gint32) read32 (ip);
+				ip += 4;
 			}
-			method = mono_get_method (image, MONO_TOKEN_METHOD_DEF | (i + 1), NULL);
-			if (use_args) {
-				/* check the signature */
-				n = get_signature (method);
-				if (strcmp (n, name) == 0)
-					break;
-				if (verbose)
-					g_print ("signature check failed: '%s' != '%s'.\n", n, name);
-				method = NULL;
+			if (opcode->flow_type == MONO_FLOW_COND_BRANCH) {
+				if (!(target = g_hash_table_lookup (table, ip))) {
+					target = g_new0 (MonoBasicBlock, 1);
+					target->cil_code = ip;
+					g_ptr_array_add (result, target);
+					g_hash_table_insert (table, (char*)ip, target);
+				}
+				link_bblock (bb, target);
+			}
+			if (!(target = g_hash_table_lookup (table, ip + i))) {
+				target = g_new0 (MonoBasicBlock, 1);
+				target->cil_code = ip + i;
+				g_ptr_array_add (result, target);
+				g_hash_table_insert (table, (char*)ip + i, target);
+			}
+			link_bblock (bb, target);
+			block_end = 1;
+			break;
+		case MonoInlineSwitch: {
+			gint32 n;
+			const char *itarget, *st;
+			++ip;
+			n = read32 (ip);
+			ip += 4;
+			st = (const char*)ip + 4 * n;
+
+			for (i = 0; i < n; i++) {
+				itarget = st + read32 (ip);
+				ip += 4;
+				if (!(target = g_hash_table_lookup (table, itarget))) {
+					target = g_new0 (MonoBasicBlock, 1);
+					target->cil_code = itarget;
+					g_ptr_array_add (result, target);
+					g_hash_table_insert (table, itarget, target);
+				}
+				link_bblock (bb, target);
 			}
+			/*
+			 * Note: the code didn't set block_end in switch.
+			 */
+			break;
+		}
+		case MonoInlineR:
+		case MonoInlineI8:
+			ip += 9;
+			break;
+		default:
+			g_assert_not_reached ();
+		}
+
+	}
+	g_hash_table_destroy (table);
+	qsort (result->pdata, result->len, sizeof (gpointer), compare_bblock);
+	/* skip entry and end */
+	bb = target = NULL;
+	for (i = 2; i < result->len; ++i) {
+		bb = (MonoBasicBlock*)g_ptr_array_index (result, i);
+		if (target)
+			target->cil_length = bb->cil_code - target->cil_code;
+		target = bb;
+		/*fprintf (stderr, "bblock %d at IL_%04x:\n", i, bb->cil_code - header->code);*/
+	}
+	bb->cil_length = header->code + header->code_size - bb->cil_code;
+	return result;
+}
+
+static char*
+indenter (MonoDisHelper *dh, MonoMethod *method, guint32 ip_offset)
+{
+	return g_strdup (" ");
+}
+
+static MonoDisHelper graph_dh = {
+	"\\l",
+	NULL,
+	"IL_%04x",
+	indenter, 
+	NULL,
+	NULL
+};
+
+static void
+df_visit (MonoBasicBlock *bb, int *dfn, const unsigned char* code)
+{
+	GList *tmp;
+	MonoBasicBlock *next;
+	
+	if (bb->dfn)
+		return;
+	++(*dfn);
+	bb->dfn = *dfn;
+	for (tmp = bb->out_bb; tmp; tmp = tmp->next) {
+		next = tmp->data;
+		if (!next->dfn) {
+			if (!bb->cil_code)
+				fprintf (output, "\t\"DF entry\" -> \"IL_%04x (%d)\"\n", next->cil_code - code, *dfn + 1);
+			else
+				fprintf (output, "\t\"IL_%04x (%d)\" -> \"IL_%04x (%d)\"\n", bb->cil_code - code, bb->dfn, next->cil_code - code, *dfn + 1);
+			df_visit (next, dfn, code);
+		}
+	}
+}
+
+static void
+print_method_cfg (MonoMethod *method) {
+	GPtrArray *bblocks;
+	GList *tmp;
+	MonoBasicBlock *bb, *target;
+	MonoMethodHeader *header;
+	int i, dfn;
+	char *code;
+
+	header = ((MonoMethodNormal*)method)->header;
+	bblocks = mono_method_find_bblocks (header);
+	for (i = 0; i < bblocks->len; ++i) {
+		bb = (MonoBasicBlock*)g_ptr_array_index (bblocks, i);
+		if (i == 0)
+			fprintf (output, "\tB%p [shape=record,label=\"entry\"]\n", bb);
+		else if (i == 1)
+			fprintf (output, "\tB%p [shape=record,label=\"end\"]\n", bb);
+		else {
+			code = mono_disasm_code (&graph_dh, method, bb->cil_code, bb->cil_code + bb->cil_length);
+			fprintf (output, "\tB%p [shape=record,label=\"IL_%04x\\n%s\"]\n", bb, bb->cil_code - header->code, code);
+			g_free (code);
+		}
+	}
+	for (i = 0; i < bblocks->len; ++i) {
+		bb = (MonoBasicBlock*)g_ptr_array_index (bblocks, i);
+		for (tmp = bb->out_bb; tmp; tmp = tmp->next) {
+			target = tmp->data;
+			fprintf (output, "\tB%p -> B%p\n", bb, target);
+		}
+	}
+#if 0
+	for (i = 0; i < bblocks->len; ++i) {
+		bb = (MonoBasicBlock*)g_ptr_array_index (bblocks, i);
+		bb->dfn = 0;
+	}
+	dfn = 0;
+	for (i = 0; i < bblocks->len; ++i) {
+		bb = (MonoBasicBlock*)g_ptr_array_index (bblocks, i);
+		df_visit (bb, &dfn, header->code);
+	}
+#endif
+}
+
+/*
+ * TODO: change to create the DF tree, dominance relation etc.
+ */
+static void
+method_cfg (MonoImage *image, const char *name) {
+	MonoMethod *method = NULL;
+	const static char *cfg_graph_properties = "\tnode [fontsize=8.0]\n\tedge [len=1.5,color=red]\n";
+	
+	if (!name) {
+		guint32 token = ((MonoCLIImageInfo*)image->image_info)->cli_cli_header.ch_entry_point;
+		if (!token || !(method = mono_get_method (image, token, NULL))) {
+			g_print ("Cannot find entry point in %s: specify an explict method name.\n", image->name);
+			exit (1);
+		}
+	} else {
+		/* search the method */
+		MonoMethodDesc *desc;
+
+		desc = mono_method_desc_new (name, include_namespace);
+		if (!desc) {
+			g_print ("Invalid method name %s\n", name);
+			exit (1);
+		}
+		method = mono_method_desc_search_in_image (desc, image);
+		if (!method) {
+			g_print ("Cannot find method %s\n", name);
+			exit (1);
 		}
-		if (!method)
-			g_error ("Cannot find method %s", name);
-		g_free (class_nspace);
 	}
 	fprintf (output, "digraph blah {\n");
-	fprintf (output, "%s", graph_properties);
+	fprintf (output, "%s", cfg_graph_properties);
 
-	print_method (method, depth);
+	print_method_cfg (method);
 	
 	fprintf (output, "}\n");
 }
 
 static void
-usage () {
-	printf ("monograph 0.1 Copyright (c) 2002 Ximian, Inc\n");
+usage (void) {
+	printf ("monograph 0.2 Copyright (c) 2002 Ximian, Inc\n");
 	printf ("Create call graph or type hierarchy information from CIL assemblies.\n");
 	printf ("Usage: monograph [options] [assembly [typename|methodname]]\n");
 	printf ("Valid options are:\n");
 	printf ("\t-c|--call             output call graph instead of type hierarchy\n");
+	printf ("\t-C|--control-flow     output control flow of methodname\n");
 	printf ("\t-d|--depth num        max depth recursion (default: 6)\n");
 	printf ("\t-o|--output filename  write graph to file filename (default: stdout)\n");
 	printf ("\t-f|--fullname         include namespace in type and method names\n");
 	printf ("\t-n|--neato            invoke neato directly\n");
 	printf ("\t-v|--verbose          verbose operation\n");
 	printf ("The default assembly is corlib.dll. The default method for\n");
-	printf ("the --call option is the entrypoint.\n");
+	printf ("the --call and --control-flow options is the entrypoint.\n");
 	printf ("When the --neato option is used the output type info is taken\n");
-	printf ("from the output filename extension.\n");
+	printf ("from the output filename extension. You need the graphviz package installed\n");
+	printf ("to be able to use this option.\n");
 	printf ("Sample runs:\n");
 	printf ("\tmonograph -n -o vt.png corlib.dll System.ValueType\n");
 	printf ("\tmonograph -n -o expr.png mcs.exe Mono.CSharp.Expression\n");
+	printf ("\tmonograph -n -o cfg.png -C mcs.exe Driver:Main\n");
 	printf ("\tmonograph -d 3 -n -o callgraph.png -c mis.exe\n");
 	exit (1);
 }
@@ -432,7 +798,9 @@ usage () {
 enum {
 	GRAPH_TYPES,
 	GRAPH_CALL,
-	GRAPH_INTERFACE
+	GRAPH_INTERFACE,
+	GRAPH_CONTROL_FLOW,
+	GRAPH_WASTE
 };
 
 /*
@@ -452,8 +820,8 @@ enum {
 int
 main (int argc, char *argv[]) {
 	MonoAssembly *assembly;
-	char *cname = NULL;
-	char *aname = NULL;
+	const char *cname = NULL;
+	const char *aname = NULL;
 	char *outputfile = NULL;
 	int graphtype = GRAPH_TYPES;
 	int callneato = 0;
@@ -467,8 +835,12 @@ main (int argc, char *argv[]) {
 			break;
 		if (strcmp (argv [i], "--call") == 0 || strcmp (argv [i], "-c") == 0) {
 			graphtype = GRAPH_CALL;
+		} else if (strcmp (argv [i], "--control-flow") == 0 || strcmp (argv [i], "-C") == 0) {
+			graphtype = GRAPH_CONTROL_FLOW;
 		} else if (strcmp (argv [i], "--interface") == 0 || strcmp (argv [i], "-i") == 0) {
 			graphtype = GRAPH_INTERFACE;
+		} else if (strcmp (argv [i], "--waste") == 0) {
+			graphtype = GRAPH_WASTE;
 		} else if (strcmp (argv [i], "--fullname") == 0 || strcmp (argv [i], "-f") == 0) {
 			include_namespace = 1;
 		} else if (strcmp (argv [i], "--neato") == 0 || strcmp (argv [i], "-n") == 0) {
@@ -494,12 +866,14 @@ main (int argc, char *argv[]) {
 		cname = argv [i + 1];
 	if (!aname)
 		aname = "corlib.dll";
-	if (!cname && (graphtype != GRAPH_CALL))
+	if (!cname && (graphtype == GRAPH_TYPES))
 		cname = "System.Object";
 
-	assembly = mono_assembly_open (aname, NULL, NULL);
-	if (!assembly)
-		g_error ("cannot open assembly %s", aname);
+	assembly = mono_assembly_open (aname, NULL);
+	if (!assembly) {
+		g_print ("cannot open assembly %s\n", aname);
+		exit (1);
+	}
 
 	if (callneato) {
 		GString *command = g_string_new ("neato");
@@ -512,15 +886,19 @@ main (int argc, char *argv[]) {
 		if (type)
 			g_string_sprintfa (command, " -T%s", type + 1);
 		output = popen (command->str, "w");
-		if (!output)
-			g_error ("Cannot run neato");
+		if (!output) {
+			g_print ("Cannot run neato: you may need to install the graphviz package.\n");
+			exit (1);
+		}
 	} else if (outputfile) {
 		output = fopen (outputfile, "w");
-		if (!output)
-			g_error ("Cannot open file: %s", outputfile);
+		if (!output) {
+			g_print ("Cannot open file: %s\n", outputfile);
+			exit (1);
+		}
 	}
 	/* if it looks like a method name, we want a callgraph. */
-	if (cname && strchr (cname, ':'))
+	if (cname && strchr (cname, ':') && graphtype == GRAPH_TYPES)
 		graphtype = GRAPH_CALL;
 
 	switch (graphtype) {
@@ -533,6 +911,12 @@ main (int argc, char *argv[]) {
 	case GRAPH_INTERFACE:
 		interface_graph (assembly->image, cname);
 		break;
+	case GRAPH_CONTROL_FLOW:
+		method_cfg (assembly->image, cname);
+		break;
+	case GRAPH_WASTE:
+		waste (assembly->image, cname);
+		break;
 	default:
 		g_error ("wrong graph type");
 	}
diff --git a/mono/os/.cvsignore b/mono/os/.cvsignore
new file mode 100644
index 00000000000..2e3104dd1a3
--- /dev/null
+++ b/mono/os/.cvsignore
@@ -0,0 +1,5 @@
+Makefile
+Makefile.in
+util.o
+.libs
+*.la
diff --git a/mono/os/Makefile.am b/mono/os/Makefile.am
new file mode 100644
index 00000000000..01f785127b8
--- /dev/null
+++ b/mono/os/Makefile.am
@@ -0,0 +1,19 @@
+DIST_SUBDIRS = unix win32
+
+INCLUDES = -I$(top_srcdir)
+
+noinst_LTLIBRARIES = libmonoos.la
+
+if PLATFORM_WIN32
+DIR=win32
+else
+DIR=unix
+endif
+
+SUBDIRS = $(DIR)
+
+libmonoos_la_SOURCES = \
+	util.h
+
+libmonoos_la_LIBADD = $(DIR)/libmonoos.la
+
diff --git a/mono/os/unix/.cvsignore b/mono/os/unix/.cvsignore
new file mode 100644
index 00000000000..7328b0dc2ac
--- /dev/null
+++ b/mono/os/unix/.cvsignore
@@ -0,0 +1,7 @@
+Makefile
+Makefile.in
+util.o
+.deps
+.libs
+*.la
+*.lo
diff --git a/mono/os/unix/Makefile.am b/mono/os/unix/Makefile.am
new file mode 100644
index 00000000000..abdcab61738
--- /dev/null
+++ b/mono/os/unix/Makefile.am
@@ -0,0 +1,6 @@
+
+INCLUDES = -I$(top_srcdir)
+
+noinst_LTLIBRARIES = libmonoos.la
+
+libmonoos_la_SOURCES = util.c
diff --git a/mono/os/unix/util.c b/mono/os/unix/util.c
new file mode 100644
index 00000000000..442570c41d1
--- /dev/null
+++ b/mono/os/unix/util.c
@@ -0,0 +1,26 @@
+/*
+ * util.c: Simple runtime tools for the Unix platform
+ *
+ * Author:
+ *   Miguel de Icaza
+ *
+ * (C) 2002 Ximian, Inc. (http://www.ximian.com)
+ */
+#include <config.h>
+#include <mono/os/util.h>
+
+/*
+ * mono_set_rootdir:
+ * @vm_filename: The pathname of the code invoking us (argv [0])
+ *
+ * Informs the runtime of the root directory for the Mono installation,
+ * the vm_file
+ */
+void
+mono_set_rootdir (const char *vm_filename)
+{
+	/* nothing on Unix */
+}
+
+ 
+
diff --git a/mono/os/util.h b/mono/os/util.h
new file mode 100644
index 00000000000..e6b0ff3e7ec
--- /dev/null
+++ b/mono/os/util.h
@@ -0,0 +1,6 @@
+#ifndef _MONO_OS_UTIL_H_
+#define _MONO_OS_UTIL_H_ 1
+
+void  mono_set_rootdir (const char *vm_filename);
+
+#endif
diff --git a/mono/os/win32/.cvsignore b/mono/os/win32/.cvsignore
new file mode 100644
index 00000000000..d0d610155fd
--- /dev/null
+++ b/mono/os/win32/.cvsignore
@@ -0,0 +1,3 @@
+Makefile
+Makefile.in
+util.o
diff --git a/mono/os/win32/Makefile.am b/mono/os/win32/Makefile.am
new file mode 100644
index 00000000000..aff89782fc7
--- /dev/null
+++ b/mono/os/win32/Makefile.am
@@ -0,0 +1,8 @@
+INCLUDES = 				\
+	-I$(top_srcdir)			\
+	$(GMODULE_CFLAGS)		\
+	$(GLIB_CFLAGS)
+
+noinst_LTLIBRARIES = libmonoos.la
+
+libmonoos_la_SOURCES = util.c
diff --git a/mono/os/win32/util.c b/mono/os/win32/util.c
new file mode 100644
index 00000000000..94f4dc6d7b9
--- /dev/null
+++ b/mono/os/win32/util.c
@@ -0,0 +1,31 @@
+/*
+ * util.c: Simple runtime tools for the Win32 platform
+ *
+ * Author:
+ *   Miguel de Icaza
+ *
+ * (C) 2002 Ximian, Inc. (http://www.ximian.com)
+ */
+#include <config.h>
+#include <mono/metadata/metadata.h>
+#include <mono/os/util.h>
+
+/*
+ * mono_set_rootdir:
+ * @vm_filename: The pathname of the code invoking us (argv [0])
+ *
+ * Informs the runtime of the root directory for the Mono installation,
+ * the vm_file
+ */
+void
+mono_set_rootdir (const char *vm_filename)
+{
+	char *dir = g_dirname (vm_filename);
+	char *root = g_strconcat (dir, "/../lib", NULL);
+
+	mono_assembly_setrootdir (root);
+	g_free (root);
+	g_free (dir);
+}
+
+ 
diff --git a/mono/tests/Makefile.am b/mono/tests/Makefile.am
index dc908602ad4..0afd1578be0 100644
--- a/mono/tests/Makefile.am
+++ b/mono/tests/Makefile.am
@@ -1,15 +1,19 @@
 
 TEST_PROG=../interpreter/mint
 JITTEST_PROG=../jit/mono
+RUNTIME_ARGS=--config tests-config
 
 CSC=csc /unsafe
 
 BENCHSRC=fib.cs random.cs nested-loops.cs ackermann.cs tight-loop.cs sieve.cs
 
-TESTSRC=			\
+TEST_CS_SRC=			\
 	array-init.cs		\
 	arraylist.cs		\
+	char-isnumber.cs	\
+	create-instance.cs	\
 	field-layout.cs		\
+	pack-layout.cs		\
 	hash-table.cs		\
 	test-ops.cs		\
 	obj.cs			\
@@ -26,10 +30,26 @@ TESTSRC=			\
 	exception5.cs		\
 	exception6.cs		\
 	exception7.cs		\
+	exception8.cs		\
+	exception10.cs		\
+	exception11.cs		\
+	exception12.cs		\
+	exception13.cs		\
+	exception14.cs		\
 	struct.cs		\
 	valuetype-gettype.cs	\
 	static-constructor.cs	\
 	pinvoke.cs		\
+	pinvoke1.cs		\
+	pinvoke2.cs		\
+	pinvoke3.cs		\
+	pinvoke4.cs		\
+	pinvoke5.cs		\
+	pinvoke6.cs		\
+	pinvoke7.cs		\
+	pinvoke8.cs		\
+	pinvoke9.cs		\
+	invoke.cs		\
 	box.cs			\
 	array.cs		\
 	enum.cs			\
@@ -39,6 +59,8 @@ TESTSRC=			\
 	assignable-tests.cs	\
 	array-cast.cs		\
 	cattr-compile.cs	\
+	cattr-field.cs		\
+	cattr-object.cs		\
 	custom-attr.cs		\
 	double-cast.cs		\
 	newobj-valuetype.cs	\
@@ -69,6 +91,7 @@ TESTSRC=			\
 	indexer.cs		\
 	stream.cs		\
 	console.cs		\
+	shift.cs		\
 	jit-int.cs		\
 	jit-uint.cs		\
 	jit-long.cs		\
@@ -78,44 +101,100 @@ TESTSRC=			\
 	pop.cs			\
 	time.cs			\
 	appdomain.cs		\
+	appdomain1.cs		\
+	appdomain2.cs		\
 	appdomain-client.cs	\
 	pointer.cs		\
-	vararg.cs
+	vararg.cs		\
+	rounding.cs		\
+	hashcode.cs		\
+	delegate1.cs		\
+	delegate2.cs		\
+	delegate3.cs		\
+	delegate4.cs		\
+	delegate5.cs		\
+	delegate6.cs		\
+	delegate7.cs		\
+	remoting1.cs		\
+	remoting2.cs		\
+	remoting3.cs		\
+	nonvirt.cs		\
+	largeexp.cs		\
+	largeexp2.cs		\
+	marshalbyref1.cs	\
+	static-ctor.cs		\
+	inctest.cs		\
+	bound.cs		\
+	array-invoke.cs		\
+	decimal.cs		\
+	marshal1.cs		\
+	marshal2.cs		\
+	thread.cs		\
+	thread5.cs		\
+	thread6.cs
 
+TEST_IL_SRC=			\
+	cpblkTest.il		\
+	jmpTest.il		\
+	calliTest.il		\
+	ckfiniteTest.il		\
+	locallocTest.il		\
+	initblkTest.il
 
-TESTSI=$(TESTSRC:.cs=.exe)
+
+TESTSI_CS=$(TEST_CS_SRC:.cs=.exe)
+TESTSI_IL=$(TEST_IL_SRC:.il=.exe)
 TESTBS=$(BENCHSRC:.cs=.exe)
 
-EXTRA_DIST=test-driver $(TESTSRC)
+EXTRA_DIST=test-driver $(TEST_CS_SRC) $(TEST_IL_SRC)
+
+%.exe: %.il
+	ilasm $< /OUTPUT=$@
 
 %.exe: %.cs
 	$(CSC) $<
 
-test: $(TEST_PROG) $(TESTSI) libtest.la
+test:	test_cs test_il
+
+test_cs: $(TEST_PROG) $(TESTSI_CS) libtest.la
 	@failed=0; \
 	passed=0; \
 	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
-	for i in $(TESTSI); do	\
-		if ./test-driver $(TEST_PROG) $$i; \
+	for i in $(TESTSI_CS); do	\
+		if ./test-driver $(TEST_PROG) $$i $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \
 			failed=`expr $${failed} + 1`; \
 		fi \
 	done; \
-	echo "$${passed} test(s) passed. $${failed} test(s) failed."
+	echo; echo ".cs: $${passed} test(s) passed. $${failed} test(s) failed."; echo
+
+test_il: $(TEST_PROG) $(TESTSI_IL) libtest.la
+	@failed=0; \
+	passed=0; \
+	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
+	for i in $(TESTSI_IL); do	\
+		if ./test-driver $(TEST_PROG) $$i $(RUNTIME_ARGS); \
+		then \
+			passed=`expr $${passed} + 1`; \
+		else \
+			failed=`expr $${failed} + 1`; \
+		fi \
+	done; \
+	echo; echo ".il: $${passed} test(s) passed. $${failed} test(s) failed."; echo
 
 testb: $(TEST_PROG) $(TESTBS)
 	for i in $(TESTBS); do	\
-		./test-driver $(TEST_PROG) $$i;	\
+		./test-driver $(TEST_PROG) $$ii $(RUNTIME_ARGS);	\
 	done
 
-testjit: $(JITTEST_PROG) $(TESTSI) $(TESTBS)
+testjit: $(JITTEST_PROG) $(TESTSI_CS) $(TESTSI_IL) $(TESTBS)
 	@failed=0; \
 	passed=0; \
 	export LD_LIBRARY_PATH="`pwd`/.libs:$${LD_LIBRARY_PATH}"; \
-	for i in $(TESTSI) $(TESTBS); do	\
-		if ./test-driver $(JITTEST_PROG) $$i; \
+	for i in $(TESTSI_CS) $(TESTSI_IL) $(TESTBS); do	\
+		if ./test-driver $(JITTEST_PROG) $$i $(RUNTIME_ARGS); \
 		then \
 			passed=`expr $${passed} + 1`; \
 		else \
diff --git a/mono/tests/ackermann.cs b/mono/tests/ackermann.cs
index 95d331c48d1..22d69825151 100644
--- a/mono/tests/ackermann.cs
+++ b/mono/tests/ackermann.cs
@@ -1,12 +1,15 @@
-// $Id: ackermann.cs,v 1.2 2001/11/19 07:11:32 lupus Exp $
+// $Id: ackermann.cs,v 1.3 2002/05/23 13:03:04 lupus Exp $
 // http://www.bagley.org/~doug/shootout/
 
 public class ackermann {
 
-    public static int Main() {
+    public static int Main(string[] args) {
 	int NUM = 8;
-	return Ack(3, NUM) != 2045? 1: 0;
-	//System.out.print("Ack(3," + NUM + "): " + Ack(3, NUM) + "\n");
+	if (args.Length > 0)
+		NUM = System.Int32.Parse (args [0]);
+	//return Ack(3, NUM) != 2045? 1: 0;
+	System.Console.WriteLine("Ack(3," + NUM + "): " + Ack(3, NUM));
+	return 0;
     }
 
     public static int Ack(int M, int N) {
diff --git a/mono/tests/appdomain1.cs b/mono/tests/appdomain1.cs
new file mode 100644
index 00000000000..2b9b7bb61a6
--- /dev/null
+++ b/mono/tests/appdomain1.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Security.Policy;
+using System.Threading;
+
+class Container {
+
+	static int Main ()
+	{
+		AppDomainSetup setup = new AppDomainSetup ();
+		setup.ApplicationBase = ".";
+
+		Console.WriteLine (AppDomain.CurrentDomain.FriendlyName);
+			
+		AppDomain newDomain = AppDomain.CreateDomain ("NewDomain", new Evidence (), setup);
+
+		newDomain.SetData ("TEST", "a");
+		if ((string)newDomain.GetData ("TEST") != "a")
+			return 1;
+
+		newDomain.SetData ("TEST", 1);
+		if ((int)newDomain.GetData ("TEST") != 1)
+			return 1;
+
+		newDomain.SetData ("TEST", true);
+		if ((bool)newDomain.GetData ("TEST") != true)
+			return 1;
+
+		newDomain.SetData ("TEST", false);
+		if ((bool)newDomain.GetData ("TEST") != false)
+			return 1;
+
+		int [] ta = { 1, 2, 3 };
+		newDomain.SetData ("TEST", ta);
+
+		int [] ca = (int [])newDomain.GetData ("TEST");
+		
+		if (ca [0] != 1 || ca [1] != 2 || ca [2] != 3)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/appdomain2.cs b/mono/tests/appdomain2.cs
new file mode 100644
index 00000000000..0438d9ed5de
--- /dev/null
+++ b/mono/tests/appdomain2.cs
@@ -0,0 +1,84 @@
+using System;
+using System.IO;
+using System.Security.Policy;
+using System.Threading;
+using System.Runtime.Serialization;
+
+class Container {
+
+	[Serializable]
+	public struct c2 : ISerializable {
+		public int a;
+		public string s1;
+
+		private c2 (SerializationInfo info, StreamingContext context) {
+			a = info.GetInt32("a");
+			s1 = info.GetString("s1");
+			Console.WriteLine ("SetObjectData called: " + info.AssemblyName + "," +
+					   info.FullTypeName + " " + s1 + ", " + a);
+		}
+
+		public void GetObjectData (SerializationInfo info, StreamingContext context) {
+			Console.WriteLine ("GetObjectData called: " + info.AssemblyName + "," +
+					   info.FullTypeName + " " + s1 + ", " + a);
+			info.AddValue ("a", a);
+			if (s1 != null)
+				info.AddValue ("s1", s1);
+			else
+				info.AddValue ("s1", "(null)");
+		}
+	}
+	
+	[Serializable]
+	public class c1 {
+		public c1 () {
+			e1.a = 3;
+			e1.s1 = "SS";
+			sa [0].a = 5;
+		}
+		public int a = 1;
+		public int b = 2;
+		public string s1 = "TEST1";
+		[NonSerialized] public string s2 = "TEST2";
+		public c2 [] sa = new c2 [2];
+		public c2 e1;
+	}
+	
+	static int Main ()
+	{
+		AppDomainSetup setup = new AppDomainSetup ();
+		setup.ApplicationBase = Directory.GetCurrentDirectory ();
+		Console.WriteLine (AppDomain.CurrentDomain.FriendlyName);
+			
+		AppDomain newDomain = AppDomain.CreateDomain ("NewDomain", new Evidence (), setup);
+
+		c1 a1 = new c1 ();
+
+		
+		newDomain.SetData ("TEST", a1);
+		c1 r1 = (c1)newDomain.GetData ("TEST");
+		if (r1.a != 1 || r1.b !=2)
+			return 1;
+		
+		if (r1.s1 != "TEST1")
+			return 2;
+		
+		if (r1.s2 != null)
+			return 3;
+
+		if (r1.e1.a != 3)
+			return 4;
+
+		if (r1.e1.s1 != "SS")
+			return 4;
+		
+		if (r1.sa [0].a != 5)
+			return 5;
+
+		if (r1.sa [0].s1 != "(null)")
+			return 6;
+		
+
+		return 0;
+	}
+}
diff --git a/mono/tests/array-invoke.cs b/mono/tests/array-invoke.cs
new file mode 100644
index 00000000000..fc58ad648b0
--- /dev/null
+++ b/mono/tests/array-invoke.cs
@@ -0,0 +1,34 @@
+namespace Test
+{
+        using System;
+        using System.Reflection;
+        
+        class Foo
+        {
+                public static int Sum (params int[] args)
+                {
+                        int ret = 0;
+                        foreach (int a in args)
+                                ret += a;
+                        return ret;
+                }
+        }
+        
+        class TestInvokeArray
+        {
+                public static int Main (string[] args)
+                {
+                        Foo f = new Foo ();
+                        MethodInfo m = (MethodInfo) (f.GetType ().FindMembers (MemberTypes.All, BindingFlags.Public | BindingFlags.Static, Type.FilterName, "Sum"))[0];
+                        int[] numbers = new int[3]{4, 5, 6};
+                        object[] parms = new object[1]{numbers};
+			int sum = (int)m.Invoke (f, parms);
+                        Console.WriteLine ("sum is " + sum);
+
+			if (sum != 15)
+				return 1;
+
+			return 0;
+                }
+        }
+}
diff --git a/mono/tests/array2.cs b/mono/tests/array2.cs
new file mode 100644
index 00000000000..016953ca939
--- /dev/null
+++ b/mono/tests/array2.cs
@@ -0,0 +1,13 @@
+using System;
+
+namespace Test {
+        public class Test {
+                public static int Main () {
+
+                        Char[,] c2 = new Char[1,1];
+                        Console.WriteLine (c2);
+
+                        return 0;
+                }
+        }
+}
diff --git a/mono/tests/bound.cs b/mono/tests/bound.cs
new file mode 100644
index 00000000000..da11ae961e1
--- /dev/null
+++ b/mono/tests/bound.cs
@@ -0,0 +1,17 @@
+using System;
+
+public class Bound {
+	public static int Main () {
+
+		try {
+			
+			byte [] b = new byte [0];
+			b [0] = 128;
+			return 1;
+		} catch {
+			return 0;
+		}
+		return 0;
+	}
+}
+
diff --git a/mono/tests/calliTest.il b/mono/tests/calliTest.il
new file mode 100644
index 00000000000..7d5e8b9608a
--- /dev/null
+++ b/mono/tests/calliTest.il
@@ -0,0 +1,21 @@
+//Tests ldftn and calli
+//Prints PASS if passed, nothing if failed
+
+.assembly extern mscorlib{}
+.assembly someTest{}
+.module someTest
+
+.class private auto ansi someTest
+       extends [mscorlib]System.Object {
+
+  .method public static void  go() cil managed {
+    .entrypoint
+
+	ldstr "PASS"
+	ldftn void [mscorlib]System.Console::WriteLine(string)
+	calli void (string)
+	ret
+  }
+
+
+} 
\ No newline at end of file
diff --git a/mono/tests/cattr-field.cs b/mono/tests/cattr-field.cs
new file mode 100644
index 00000000000..b1517129bbd
--- /dev/null
+++ b/mono/tests/cattr-field.cs
@@ -0,0 +1,32 @@
+using System;
+
+[My(val=2,sval="str",bb=0,S="Buh",P=4)]
+class T {
+	static int Main() {
+		object[] a = Attribute.GetCustomAttributes (typeof (T), true);
+		My attr = (My)a [0];
+		if (attr.val != 2)
+			return 1;
+		if (attr.P != 4)
+			return 2;
+		if (attr.S != "Buh")
+			return 3;
+		return 0;
+	}
+}
+
+class My : Attribute {
+	public int val;
+	public uint prop;
+	public string s;
+	public string sval;
+	public byte bb;
+	public uint P {
+		set {prop = value;}
+		get {return prop;}
+	}
+	public string S {
+		set {s = value;}
+		get {return s;}
+	}
+}
diff --git a/mono/tests/cattr-object.cs b/mono/tests/cattr-object.cs
new file mode 100644
index 00000000000..961a0f13aea
--- /dev/null
+++ b/mono/tests/cattr-object.cs
@@ -0,0 +1,41 @@
+using System;
+
+[My(1)]
+[My(TypeCode.Empty)]
+[My(typeof(System.Enum))]
+class T {
+	static int Main() {
+		object[] a = Attribute.GetCustomAttributes (typeof (T), true);
+		if (a.Length != 3)
+			return 1;
+		foreach (object o in a) {
+			My attr = (My)o;
+			if (attr.obj.GetType () == typeof(int)) {
+				int val = (int)attr.obj;
+				Console.WriteLine ("got value: {0}", val);
+				if (val != 1)
+					return 2;
+			} else if (attr.obj.GetType () == typeof(System.TypeCode)) {
+				TypeCode val = (TypeCode)attr.obj;
+				if (val != TypeCode.Empty)
+					return 3;
+			} else {
+				Type t = attr.obj as Type;
+				if (t == null)
+					return 4;
+				if (t != typeof (System.Enum))
+					return 5;
+			}
+			
+		}
+		return 0;
+	}
+}
+
+[AttributeUsage(AttributeTargets.All,AllowMultiple=true)]
+class My : Attribute {
+	public object obj;
+	public My (object o) {
+		obj = o;
+	}
+}
diff --git a/mono/tests/char-isnumber.cs b/mono/tests/char-isnumber.cs
new file mode 100644
index 00000000000..de69f4fe22d
--- /dev/null
+++ b/mono/tests/char-isnumber.cs
@@ -0,0 +1,18 @@
+using System;
+
+class T {
+	static int Main() {
+		char[] chars = new char[] 
+			{'0',  'F',  'f',  'x',   '1',  'n',   'a'};
+		bool[] results = new bool[] 
+			{true, false, false, false, true, false, false};
+
+		for (int i = 0; i < chars.Length; ++i) {
+			if (Char.IsNumber (chars [i]) != results [i]) {
+				Console.WriteLine ("Char '{0}' failed", chars [i]);
+				return 1;
+			}
+		}
+		return 0;
+	}
+}
diff --git a/mono/tests/ckfiniteTest.il b/mono/tests/ckfiniteTest.il
new file mode 100644
index 00000000000..96092dfa283
--- /dev/null
+++ b/mono/tests/ckfiniteTest.il
@@ -0,0 +1,91 @@
+//Tests the ckfinite instruction
+//First test on an infinite (finite / 0)
+//Second test on NaN (0 / 0)
+//Third test sees if value is left on stack if finite
+//Both print either PASS or FAIL
+//Assumes div works as per specifications
+
+.assembly extern mscorlib{}
+.assembly someTest{}
+.module someTest
+
+.class private auto ansi someTest
+       extends [mscorlib]System.Object {
+
+  .method public static void  go() cil managed {
+    .entrypoint
+
+//TEST 1 - infinite
+
+.try {
+	ldc.r8 1
+	ldc.r8 0
+	div
+	ckfinite
+	ldstr "FAIL"
+	call void [mscorlib]System.Console::WriteLine(string)
+	leave test2
+}
+catch [mscorlib]System.ArithmeticException {
+	pop
+	ldstr "PASS"
+	call void [mscorlib]System.Console::WriteLine(string)
+	leave test2
+}
+catch [mscorlib]System.Exception {
+	pop
+	ldstr "EFAIL"
+	call void [mscorlib]System.Console::WriteLine(string)
+	leave test2
+}
+
+//TEST 2 - NaN
+test2: nop
+
+.try {
+	ldc.r8 0
+	ldc.r8 0
+	div
+	ckfinite
+	ldstr "FAIL"
+	call void [mscorlib]System.Console::WriteLine(string)
+	leave test3
+}
+catch [mscorlib]System.ArithmeticException {
+	ldstr "PASS"
+	call void [mscorlib]System.Console::WriteLine(string)
+	leave test3
+}
+catch [mscorlib]System.Exception {
+	ldstr "FAIL"
+	call void [mscorlib]System.Console::WriteLine(string)
+	leave test3
+}
+
+//TEST 3
+test3: nop
+
+.try {
+	ldc.r8 3.777
+	ckfinite
+	ldc.r8 3.777
+	bne.un FAIL
+	ldstr "PASS"
+	call void [mscorlib]System.Console::WriteLine(string)
+	leave end
+				
+FAIL:	ldstr "FAIL"
+	call void [mscorlib]System.Console::WriteLine(string)
+	leave end
+}
+catch [mscorlib]System.Exception {
+	ldstr "FAIL"
+	call void [mscorlib]System.Console::WriteLine(string)
+	leave end
+}
+
+end:	ret
+  }
+
+
+} 
\ No newline at end of file
diff --git a/mono/tests/codegen-interfaces.cs b/mono/tests/codegen-interfaces.cs
new file mode 100644
index 00000000000..73e9d2d386b
--- /dev/null
+++ b/mono/tests/codegen-interfaces.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Reflection;
+using System.Reflection.Emit;
+
+class CGen {
+
+	public static int Main() {
+		AssemblyBuilder abuilder;
+		ModuleBuilder mbuilder;
+		TypeBuilder tbuilder;
+		FieldBuilder fbuilder;
+		PropertyBuilder pbuilder;
+		AssemblyName an;
+		String name = "tcgen.exe";
+		MethodBuilder method, get_method;
+		TypeAttributes attrs = TypeAttributes.Public | TypeAttributes.Class;
+		MethodAttributes mattrs = MethodAttributes.Public | MethodAttributes.Static;
+		byte[] body = {0x16, 0x2a}; // ldc.i4.0 ret
+
+		an = new AssemblyName ();
+		an.Name = name;
+		abuilder = AppDomain.CurrentDomain.DefineDynamicAssembly (an, AssemblyBuilderAccess.Save);
+
+		mbuilder = abuilder.DefineDynamicModule (name, name);
+
+		tbuilder = mbuilder.DefineType ("Test.CodeGen", attrs, null, new Type [0]);
+		Type result = typeof(int);
+		Type[] param = new Type[] {typeof (String[])};
+		method = tbuilder.DefineMethod("Main", mattrs, result, param);
+		method.CreateMethodBody (body, body.Length);
+
+		fbuilder = tbuilder.DefineField ("int_field", typeof(int), FieldAttributes.Private);
+		fbuilder = tbuilder.DefineField ("string_field", typeof(string), FieldAttributes.Public);
+		/*pbuilder = tbuilder.DefineProperty ("FieldI", PropertyAttributes.None, typeof(int), null);
+		get_method = tbuilder.DefineMethod("get_FieldI", MethodAttributes.Public, result, null);
+		get_method.CreateMethodBody (body, body.Length);
+		pbuilder.SetGetMethod (get_method);*/
+
+		Type t = tbuilder.CreateType ();
+		abuilder.SetEntryPoint (method);
+		abuilder.Save (name);
+		return 0;
+	}
+}
diff --git a/mono/tests/cpblkTest.il b/mono/tests/cpblkTest.il
new file mode 100644
index 00000000000..4a7378a7722
--- /dev/null
+++ b/mono/tests/cpblkTest.il
@@ -0,0 +1,48 @@
+.assembly extern mscorlib{}
+.assembly cpblkTest{}
+.module cpblkTest
+
+.class private auto ansi test
+       extends [mscorlib]System.Object {
+
+  .field private static valuetype DataType dataField at theData
+
+  .method public static int32  start() cil managed {
+	.entrypoint
+	.locals init(int32, unsigned int8)
+
+	//store data address
+	ldsflda valuetype DataType test::dataField
+	stloc.0
+
+	//copy 7 to first position
+	ldloc.0		//dest
+	ldloc.0
+	ldc.i4.6 
+	add		//src
+	ldc.i4.1	//size
+    	cpblk
+
+	//ldind value
+	ldloc.0
+	ldind.u1
+	
+	//compare
+	ldc.i4.7
+	beq PASS
+
+  FAIL:
+        ldc.i4.1	
+	ret
+  PASS:
+        ldc.i4.0	
+	ret
+  } 
+
+}
+
+.class public explicit ansi sealed DataType 
+       extends [mscorlib]System.ValueType
+	{.pack 1 .size 10}
+
+.data theData = bytearray (1 2 3 4 5 6 7 8 9 10)
\ No newline at end of file
diff --git a/mono/tests/create-instance.cs b/mono/tests/create-instance.cs
new file mode 100644
index 00000000000..91658ad5588
--- /dev/null
+++ b/mono/tests/create-instance.cs
@@ -0,0 +1,27 @@
+using System;
+using System.Reflection;
+
+class T {
+
+	static int Main() {
+		Assembly a = AppDomain.CurrentDomain.Load ("mscorlib");
+		object o = a.CreateInstance ("System.Exception");
+		if (o == null)
+			return 1;
+		if (!(o is System.Exception))
+			return 2;
+		object[] args = new object [2];
+		args [0] = 'X';
+		args [1] = 10;
+		o = Activator.CreateInstance (typeof (System.String), args);
+		if (o == null)
+			return 3;
+		if (!(o is System.String))
+			return 4;
+		if (!"XXXXXXXXXX".Equals (o)) {
+			Console.WriteLine ("got: {0}", o);
+			return 5;
+		}
+		return 0;
+	}
+}
diff --git a/mono/tests/dataslot.cs b/mono/tests/dataslot.cs
new file mode 100755
index 00000000000..437a137727f
--- /dev/null
+++ b/mono/tests/dataslot.cs
@@ -0,0 +1,54 @@
+
+using System;
+using System.Threading;
+
+public class Test {
+	static LocalDataStoreSlot[] slot = new LocalDataStoreSlot[102400];
+	
+	private void Thread_func() {
+		Console.WriteLine("In a thread!");
+
+		for(int i=51200; i<102400; i++) {
+			slot[i]=Thread.AllocateDataSlot();
+			Thread.SetData(slot[i], i);
+		}
+
+		Thread.Sleep(5000);
+
+		Thread.SetData(slot[11111], 42);
+		Thread.SetData(slot[76801], 42);
+
+		Thread.Sleep(20000);
+		
+		Console.WriteLine("Subthread done");
+		Console.WriteLine("slot 11111 contains " + Thread.GetData(slot[11111]));
+		Console.WriteLine("slot 26801 contains " + Thread.GetData(slot[26801]));
+		Console.WriteLine("slot 76801 contains " + Thread.GetData(slot[76801]));
+		Console.WriteLine("slot 96801 contains " + Thread.GetData(slot[96801]));
+	}
+
+	public static int Main () {
+		Console.WriteLine ("Hello, World!");
+		Test test=new Test();
+		Thread thr=new Thread(new ThreadStart(test.Thread_func));
+		thr.Start();
+
+		for(int i=0; i<51200; i++) {
+			slot[i]=Thread.AllocateDataSlot();
+			Thread.SetData(slot[i], i);
+		}
+		Thread.SetData(slot[11111], 69);
+		Thread.SetData(slot[26801], 69);
+
+		Thread.Sleep(10000);
+		
+		Console.WriteLine("Main thread done");
+		Console.WriteLine("slot 11111 contains " + Thread.GetData(slot[11111]));
+		Console.WriteLine("slot 16801 contains " + Thread.GetData(slot[16801]));
+		Console.WriteLine("slot 26801 contains " + Thread.GetData(slot[26801]));
+		Console.WriteLine("slot 76801 contains " + Thread.GetData(slot[76801]));
+
+		return 0;
+	}
+}
+
diff --git a/mono/tests/decimal.cs b/mono/tests/decimal.cs
new file mode 100644
index 00000000000..be1fa30e5f3
--- /dev/null
+++ b/mono/tests/decimal.cs
@@ -0,0 +1,17 @@
+using System;
+
+class Class1
+{
+	static void Main(string[] args)
+	{
+		Class1 o = new Class1();
+		try {
+		}
+		finally {
+			// this allocates space on the stack and
+			// thus modifies the stack pointer
+			decimal x = 7.7m;
+		}
+	}
+}
+
diff --git a/mono/tests/delegate.cs b/mono/tests/delegate.cs
index 8dcfcea0589..7c86a174f13 100644
--- a/mono/tests/delegate.cs
+++ b/mono/tests/delegate.cs
@@ -1,8 +1,14 @@
 using System;
+using System.Runtime.InteropServices;
+
 namespace Bah {
 class Test {
+	[DllImport("cygwin1.dll", EntryPoint="puts", CharSet=CharSet.Ansi)]
+	public static extern int puts (string name);
+
 	delegate void SimpleDelegate ();
 	delegate string NotSimpleDelegate (int a);
+	delegate int AnotherDelegate (string s);
 	
 	public int data;
 	
@@ -19,15 +25,22 @@ class Test {
 			throw new Exception ("Something went wrong in H");
 		return "H got: " + a.ToString () + " and " + data.ToString ();
 	}
+
+	public virtual void VF () {
+		Console.WriteLine ("Test.VF from delegate");
+	}
+	
 	public Test () {
 		data = 5;
 	}
 	static int Main () {
 		Test test = new Test ();
 		SimpleDelegate d = new SimpleDelegate (F);
+		SimpleDelegate d1 = new SimpleDelegate (test.VF);
 		NotSimpleDelegate d2 = new NotSimpleDelegate (G);
 		NotSimpleDelegate d3 = new NotSimpleDelegate (test.H);
 		d ();
+		d1 ();
 		// we run G() and H() before and after using them as delegates
 		// to be sure we don't corrupt them.
 		G (2);
@@ -36,7 +49,27 @@ class Test {
 		Console.WriteLine (d3 (3));
 		G (2);
 		test.H (3);
+
+		if (d.Method.Name != "F")
+			return 1;
+
+		if (d3.Method == null)
+			return 1;
+		
+		object [] args = {3};
+		Console.WriteLine (d3.DynamicInvoke (args));
+
+		AnotherDelegate d4 = new AnotherDelegate (puts);
+		if (d4.Method == null)
+			return 1;
+
+		Console.WriteLine (d4.Method);
+		Console.WriteLine (d4.Method.Name);
+		Console.WriteLine (d4.Method.DeclaringType);
+		
 		return 0;
+
+
 	}
 }
 }
diff --git a/mono/tests/delegate1.cs b/mono/tests/delegate1.cs
new file mode 100644
index 00000000000..ddfc2dbc05b
--- /dev/null
+++ b/mono/tests/delegate1.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+
+class Test {
+	delegate int SimpleDelegate (int a);
+
+	static int F (int a) {
+		Console.WriteLine ("Test.F from delegate: " + a);
+		Thread.Sleep (200);
+		return a;
+	}
+
+	static void async_callback (IAsyncResult ar)
+	{
+		Console.WriteLine ("Async Callback " + ar.AsyncState);
+	}
+	
+	static int Main () {
+		SimpleDelegate d = new SimpleDelegate (F);
+		AsyncCallback ac = new AsyncCallback (async_callback);
+		string state1 = "STATE1";
+		string state2 = "STATE2";
+		string state3 = "STATE3";
+		string state4 = "STATE4";
+		int fin = 0;
+		
+		IAsyncResult ar1 = d.BeginInvoke (1, ac, state1);
+		IAsyncResult ar2 = d.BeginInvoke (2, ac, state2);
+		IAsyncResult ar3 = d.BeginInvoke (3, ac, state3);
+		IAsyncResult ar4 = d.BeginInvoke (4, ac, state4);
+		
+		int res = d.EndInvoke (ar1);
+
+		Console.WriteLine ("Result = " + res);
+
+		try {
+			d.EndInvoke (ar1);
+		} catch (InvalidOperationException) {
+			Console.WriteLine ("cant execute EndInvoke twice ... OK");
+		}
+
+		ar1.AsyncWaitHandle.WaitOne ();
+		if (ar1.IsCompleted) fin++;
+		Console.WriteLine ("completed1: " + ar1.IsCompleted);
+		ar2.AsyncWaitHandle.WaitOne ();
+		if (ar2.IsCompleted) fin++;
+		Console.WriteLine ("completed2: " + ar2.IsCompleted);
+		ar3.AsyncWaitHandle.WaitOne ();
+		if (ar3.IsCompleted) fin++;
+		Console.WriteLine ("completed3: " + ar3.IsCompleted);
+		ar4.AsyncWaitHandle.WaitOne ();		
+		if (ar4.IsCompleted) fin++;
+		Console.WriteLine ("completed4: " + ar4.IsCompleted);
+
+		if (fin != 4)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/delegate2.cs b/mono/tests/delegate2.cs
new file mode 100644
index 00000000000..52b5f61d9f1
--- /dev/null
+++ b/mono/tests/delegate2.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+
+class Test {
+	delegate int SimpleDelegate (int a);
+
+	static int cb_state = 0;
+	
+	static int F (int a) {
+		Console.WriteLine ("Test.F from delegate: " + a);
+		throw new NotImplementedException ();
+	}
+
+	static void async_callback (IAsyncResult ar)
+	{
+		Console.WriteLine ("Async Callback " + ar.AsyncState);
+		cb_state = 1;
+		throw new NotImplementedException ();
+	}
+	
+	static int Main () {
+		SimpleDelegate d = new SimpleDelegate (F);
+		AsyncCallback ac = new AsyncCallback (async_callback);
+		string state1 = "STATE1";
+		int res = 0;
+		
+		IAsyncResult ar1 = d.BeginInvoke (1, ac, state1);
+
+		ar1.AsyncWaitHandle.WaitOne ();
+
+		try {
+			res = d.EndInvoke (ar1);
+		} catch (NotImplementedException) {
+			res = 1;
+			Console.WriteLine ("received exception ... OK");
+		}
+
+		while (cb_state == 0)
+			Thread.Sleep (0);
+		
+		if (cb_state != 1)
+			return 1;
+		
+		if (res != 1)
+			return 2;
+
+		return 0;
+	}
+}
diff --git a/mono/tests/delegate3.cs b/mono/tests/delegate3.cs
new file mode 100644
index 00000000000..a5639efa8f0
--- /dev/null
+++ b/mono/tests/delegate3.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+using System.Runtime.Remoting.Messaging;
+
+class Test {
+	delegate int SimpleDelegate (int a);
+
+	static int cb_state = 0;
+	
+	static int F (int a) {
+		Console.WriteLine ("Test.F from delegate: " + a);
+		throw new NotImplementedException ();
+	}
+
+	static void async_callback (IAsyncResult ar)
+	{
+		AsyncResult ares = (AsyncResult)ar;
+		AsyncCallback ac = new AsyncCallback (async_callback);
+		
+		Console.WriteLine ("Async Callback " + ar.AsyncState);
+		cb_state++;
+		SimpleDelegate d = (SimpleDelegate)ares.AsyncDelegate;
+
+		if (cb_state < 5)
+			d.BeginInvoke (cb_state, ac, cb_state);
+		
+		//throw new NotImplementedException ();
+	}
+	
+	static int Main () {
+		SimpleDelegate d = new SimpleDelegate (F);
+		AsyncCallback ac = new AsyncCallback (async_callback);
+		
+		IAsyncResult ar1 = d.BeginInvoke (cb_state, ac, cb_state);
+
+		ar1.AsyncWaitHandle.WaitOne ();
+
+
+		while (cb_state < 5)
+			Thread.Sleep (200);
+
+		return 0;
+	}
+}
diff --git a/mono/tests/delegate4.cs b/mono/tests/delegate4.cs
new file mode 100644
index 00000000000..ac227cd50da
--- /dev/null
+++ b/mono/tests/delegate4.cs
@@ -0,0 +1,34 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+using System.Runtime.Remoting.Messaging;
+
+class Test {
+	public delegate int SimpleDelegate (int a, int b);
+
+	[DllImport ("libtest.so", EntryPoint="mono_invoke_delegate")]
+	static extern int mono_invoke_delegate (SimpleDelegate d);
+
+	public static int Add (int a, int b) {
+		Console.WriteLine ("Test.Add from delegate: " + a +  " + " + b);
+		return a + b;
+	}
+
+	public static int Add2 (int a, int b) {
+		Console.WriteLine ("Test.Add2 from delegate: " + a +  " + " + b);
+		return a + b;
+	}
+
+	static int Main () {
+		SimpleDelegate d = new SimpleDelegate (Add);
+		SimpleDelegate d2 = new SimpleDelegate (Add2);
+		
+		if (mono_invoke_delegate (d) != 5)
+			return 1;
+
+		if (mono_invoke_delegate (d2) != 5)
+			return 1;
+
+		return 0;
+	}
+}
diff --git a/mono/tests/delegate5.cs b/mono/tests/delegate5.cs
new file mode 100644
index 00000000000..8ad8b86056a
--- /dev/null
+++ b/mono/tests/delegate5.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Threading;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Messaging;
+
+public class T21
+{
+	public delegate void TestCallback (int i);
+	
+	public static void Test (int i)
+	{
+		Console.WriteLine (i);
+	}
+	
+	public static void Main ()
+	{
+		TestCallback cb = new TestCallback (Test);
+		IAsyncResult ar = cb.BeginInvoke (100, null, null);
+		ar.AsyncWaitHandle.WaitOne ();
+		cb.EndInvoke (ar);
+	}
+}
+
+
diff --git a/mono/tests/delegate6.cs b/mono/tests/delegate6.cs
new file mode 100644
index 00000000000..0cfff223275
--- /dev/null
+++ b/mono/tests/delegate6.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Reflection;
+
+public class T
+{
+	public void Test ()
+	{
+		Console.WriteLine ("CreateDelegate success!");
+	}
+
+	public delegate void blah ();
+
+	public static void Main ()
+	{
+		T t = new T();
+		Delegate o = Delegate.CreateDelegate (typeof (T.blah), t, "Test");
+		o.DynamicInvoke (new Object[] {});
+	}
+}
+
+
diff --git a/mono/tests/delegate7.cs b/mono/tests/delegate7.cs
new file mode 100644
index 00000000000..e98ea40df77
--- /dev/null
+++ b/mono/tests/delegate7.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Runtime.InteropServices;
+
+class Test {
+	delegate void SimpleDelegate ();
+
+	public static int v = 0;
+	
+	static void F1 () {
+		v += 1;
+		Console.WriteLine ("Test.F1");
+	}
+	static void F2 () {
+		v += 2;
+		Console.WriteLine ("Test.F2");
+	}
+	static void F3 () {
+		v += 4;
+		Console.WriteLine ("Test.F3");
+	}
+
+	static int Main () {
+		SimpleDelegate t;
+		SimpleDelegate d1 = new SimpleDelegate (F1);
+		SimpleDelegate d2 = new SimpleDelegate (F2);
+		SimpleDelegate d3 = new SimpleDelegate (F3);
+
+		SimpleDelegate d12 = d1 + d2;
+		SimpleDelegate d13 = d1 + d3;
+		SimpleDelegate d23 = d2 + d3;
+		SimpleDelegate d123 = d1 + d2 + d3;
+
+		v = 0;
+		t = d123 - d13;
+		t ();
+		if (v != 7)
+			return 1;
+		
+		v = 0;
+		t = d123 - d12;
+		t ();
+		if (v != 4)
+			return 1;
+		
+		v = 0;
+		t = d123 - d23;
+		t ();
+		if (v != 1)
+			return 1;
+		
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/enum3.cs b/mono/tests/enum3.cs
new file mode 100755
index 00000000000..6a4474d60cf
--- /dev/null
+++ b/mono/tests/enum3.cs
@@ -0,0 +1,32 @@
+using System;
+
+namespace Test {
+
+enum TestingEnum {This, Is, A, Test};
+enum TestingEnum2 {This, Is, A, Test};
+
+public class test {
+	public static int Main () {
+		int num = 0;
+		
+		Enum e1 = new TestingEnum();
+		Enum e2 = new TestingEnum();
+		Enum e3 = new TestingEnum2();
+
+		++num;
+		if (!e1.Equals(e2))
+			return num;
+		
+		++num;
+		if (e1.Equals(e3))
+			return num;
+		
+		++num;
+		if (TestingEnum.Test.Equals(TestingEnum2.Test))
+			return num;
+		
+		return 0;
+	}
+}
+
+}
diff --git a/mono/tests/exception.cs b/mono/tests/exception.cs
index 5a5210fc56c..c60e9a3b500 100755
--- a/mono/tests/exception.cs
+++ b/mono/tests/exception.cs
@@ -2,6 +2,19 @@ using System;
 
 public class Ex {
 
+	int p;
+	
+	public static int test1 () {
+                Ex x = null;
+		
+		try {
+			x.p = 1;
+		} catch (NullReferenceException) {
+			return 0;
+		}
+		return 1;
+	}
+	
 	public static int test (int a) {
 		int res;
 		int fin = 0;
@@ -27,6 +40,9 @@ public class Ex {
 			return 1;
 		if (test(0) != 34)
 			return 2;
+		if (test1() != 0)
+			return 3;
+		
 		return 0;
 	}
 }
diff --git a/mono/tests/exception10.cs b/mono/tests/exception10.cs
new file mode 100644
index 00000000000..fca30cac3fe
--- /dev/null
+++ b/mono/tests/exception10.cs
@@ -0,0 +1,26 @@
+using System;
+
+public class Test {
+
+	public static int Main (string[] args) {
+
+		int c = 0;
+		try
+                        {
+				throw new Exception("Test exception");
+                        }
+		catch (Exception e)
+                        {
+				Console.WriteLine("Exception: {0}", e.Message);
+                        }
+		finally
+                        { 
+				Console.WriteLine("Finally... {0}", c++);
+                        }
+
+		if (c != 1)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/exception11.cs b/mono/tests/exception11.cs
new file mode 100644
index 00000000000..e0bd8487b26
--- /dev/null
+++ b/mono/tests/exception11.cs
@@ -0,0 +1,26 @@
+using System;
+
+public class Test {
+
+	public static int Main (string[] args) {
+
+		int c = 0;
+		try
+                        {
+				c = 0;
+                        }
+		catch (Exception e)
+                        {
+				Console.WriteLine("Exception: {0}", e.Message);
+                        }
+		finally
+                        { 
+				Console.WriteLine("Finally... {0}", c++);
+                        }
+
+		if (c != 1)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/exception12.cs b/mono/tests/exception12.cs
new file mode 100644
index 00000000000..a32ca99993e
--- /dev/null
+++ b/mono/tests/exception12.cs
@@ -0,0 +1,28 @@
+using System;
+
+public class Test {
+
+	public static int Main (string[] args) {
+
+		int c = 0;
+		try {
+			try {
+				c = 0;
+                        }
+			catch (Exception e) {
+				Console.WriteLine("Exception: {0}", e.Message);
+                        }
+			finally { 
+				Console.WriteLine("Finally... {0}", c++);
+                        }
+		}
+		finally {
+			c++;
+		}
+		
+		if (c != 2)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/exception13.cs b/mono/tests/exception13.cs
new file mode 100755
index 00000000000..e0b8369eb66
--- /dev/null
+++ b/mono/tests/exception13.cs
@@ -0,0 +1,16 @@
+using System;
+
+public class Ex {
+
+	public static int Main () {
+
+		try {
+			throw null;
+		} catch {
+			return 0;
+		}
+		return 1;
+	}
+}
+
+
diff --git a/mono/tests/exception14.cs b/mono/tests/exception14.cs
new file mode 100644
index 00000000000..02626fa269f
--- /dev/null
+++ b/mono/tests/exception14.cs
@@ -0,0 +1,21 @@
+using System;
+
+class Class1 {
+	static int Main(string[] args)
+	{
+		string s1 = "original";
+
+		try {
+			bool huh = s1.StartsWith(null);
+		} catch (ArgumentNullException) {
+		}
+
+		if (s1.StartsWith("o")){
+			return 0;
+		} else {
+			return 1;
+		}
+	}
+}
+
+
diff --git a/mono/tests/exception8.cs b/mono/tests/exception8.cs
new file mode 100644
index 00000000000..cbd81380598
--- /dev/null
+++ b/mono/tests/exception8.cs
@@ -0,0 +1,31 @@
+using System;
+
+public class TryTest {
+        public static void ThrowException() {
+                throw new Exception();
+        }
+
+        public static int Main() {
+		int state = 0;
+
+		try {
+			ThrowException();
+			try {
+				Console.WriteLine("In try block");
+			} catch (Exception e) {
+				state = 1;
+				Console.WriteLine("------------------------");
+				Console.WriteLine(e);
+				Console.WriteLine("------------------------");
+			}
+		} catch {
+			state = 2;
+		}
+
+		if (state != 2)
+			return 1;
+
+		Console.WriteLine("OK");
+		return 0;
+        }
+}
diff --git a/mono/tests/exception9.cs b/mono/tests/exception9.cs
new file mode 100644
index 00000000000..79f29fe9d09
--- /dev/null
+++ b/mono/tests/exception9.cs
@@ -0,0 +1,32 @@
+using System;
+
+public class FinallyTest {
+	public static void MyHandler(object sender,
+				     UnhandledExceptionEventArgs args) {
+
+		Console.WriteLine("UnhandledExceptionEventHandler called");
+	}
+
+	public static void Main() {
+		Console.WriteLine("Top level block");
+		
+		AppDomain domain = AppDomain.CurrentDomain;
+		domain.UnhandledException +=
+			new UnhandledExceptionEventHandler(MyHandler);
+		
+		try {
+			Console.WriteLine("First try block");
+			try {
+				Console.WriteLine("Second try block");
+				throw new Exception();
+			} finally {
+				Console.WriteLine("Second finally block");
+			}
+		} finally {
+			Console.WriteLine("First finally block");
+		}
+
+		Console.WriteLine("Back to top level block");
+	}
+}
+
diff --git a/mono/tests/fib.cs b/mono/tests/fib.cs
index 3a3dff99744..212889482a0 100755
--- a/mono/tests/fib.cs
+++ b/mono/tests/fib.cs
@@ -1,3 +1,5 @@
+using System;
+
 public class Fib {
 
 	public static int fib (int n) {
@@ -5,9 +7,18 @@ public class Fib {
 			return 1;
 		return fib(n-2)+fib(n-1);
 	}
-	public static int Main () {
-		if (fib (32) != 3524578)
-			return 1;
+	public static int Main (string[] args) {
+		int repeat = 1;
+		
+		if (args.Length == 1)
+			repeat = Convert.ToInt32 (args [0]);
+		
+		Console.WriteLine ("Repeat = " + repeat);
+
+		for (int i = 0; i < repeat; i++)
+			if (fib (32) != 3524578)
+				return 1;
+		
 		return 0;
 	}
 }
diff --git a/mono/tests/hashcode.cs b/mono/tests/hashcode.cs
new file mode 100644
index 00000000000..15f2eecbdb7
--- /dev/null
+++ b/mono/tests/hashcode.cs
@@ -0,0 +1,28 @@
+using System;
+
+public class X {
+	int a;
+}
+
+public class Test {
+
+	struct test {
+		public int v1;
+	}
+	public static int Main () {
+
+		test a = new test();
+
+		a.v1 = 5;
+		
+		Console.WriteLine (a.GetHashCode ());
+
+		X b = new X();
+		X c = new X();
+		
+		Console.WriteLine (b.GetHashCode ());
+		Console.WriteLine (c.GetHashCode ());
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/inctest.cs b/mono/tests/inctest.cs
new file mode 100644
index 00000000000..276f3c5bff6
--- /dev/null
+++ b/mono/tests/inctest.cs
@@ -0,0 +1,21 @@
+using System;
+
+class Test {
+	int i;
+
+	int Foo ()
+	{
+		i = 3;
+		return (i++) + (i++);
+	}
+
+
+	public static int Main ()
+	{
+		Test t = new Test ();
+		if (t.Foo () != 7)
+			return 1;
+
+		return 0;
+	}
+}
diff --git a/mono/tests/initblkTest.il b/mono/tests/initblkTest.il
new file mode 100644
index 00000000000..0f4f02b49c1
--- /dev/null
+++ b/mono/tests/initblkTest.il
@@ -0,0 +1,54 @@
+//tests initblk by allocating and initializing and checking an initialized area
+//Prints PASS or FAIL
+.assembly extern mscorlib{}
+.assembly someTest{}
+.module someTest
+
+.class private auto ansi someTest
+       extends [mscorlib]System.Object {
+
+  .method public static void  go() cil managed {
+    .entrypoint
+
+	.locals init (native int)
+
+//allocate memory
+ldc.i4.s 10
+localloc
+stloc.0
+
+//init memory offset 3 indirectly 
+ldloc.0
+ldc.i4.0
+add		//addr
+ldc.i4.0	//value
+stind.i1
+
+//initblk
+ldloc.0		//addr
+ldc.i4.7	//value
+ldc.i4.s 10	//size
+initblk
+
+//load number from offset 3
+ldloc.0
+ldc.i4.3
+add	
+ldind.u1
+
+//compare
+ldc.i4.7
+beq PASS
+
+FAIL:	ldstr "FAIL"
+	call void [mscorlib]System.Console::WriteLine(string)
+	br END
+
+PASS:	ldstr "PASS"
+	call void [mscorlib]System.Console::WriteLine(string)
+
+END:	ret
+  }
+
+
+} 
\ No newline at end of file
diff --git a/mono/tests/invoke.cs b/mono/tests/invoke.cs
new file mode 100644
index 00000000000..4cfc64bb84c
--- /dev/null
+++ b/mono/tests/invoke.cs
@@ -0,0 +1,49 @@
+using System;
+using System.Reflection;
+
+class Test {
+	
+	public struct SimpleStruct {
+		public bool a;
+		public bool b;
+	}
+	
+	static void Test2 () {
+		Console.WriteLine ("Test2 called");
+	}
+	
+	public static SimpleStruct Test1 (SimpleStruct ss) {
+		Console.WriteLine ("Test1 called " + ss.a + " " + ss.b);
+		SimpleStruct res = new SimpleStruct ();
+		res.a = !ss.a;
+		res.b = !ss.b;
+		return res;
+	}
+	
+	static int Main () {
+		Type t = typeof (Test);
+
+		MethodInfo m2 = t.GetMethod ("Test2");
+		if (m2 != null)
+			return 1;
+
+		MethodInfo m1 = t.GetMethod ("Test1");
+		if (m1 == null)
+			return 1;
+
+		object [] args = new object [1];
+		SimpleStruct ss = new SimpleStruct ();
+		ss.a = true;
+		ss.b = false;
+		args [0] = ss;
+		
+		SimpleStruct res = (SimpleStruct)m1.Invoke (null, args);
+
+		if (res.a == true)
+			return 1;
+		if (res.b == false)
+			return 1;
+	
+		return 0;
+	}
+}
diff --git a/mono/tests/ipaddress.cs b/mono/tests/ipaddress.cs
index c6cf4e0f94a..fbb7acb8654 100644
--- a/mono/tests/ipaddress.cs
+++ b/mono/tests/ipaddress.cs
@@ -7,6 +7,17 @@ namespace T {
 	public class T {
 
 		public static int Main () {
+
+			/*
+			Console.WriteLine ("address is " + IPAddress.NetworkToHostOrder (0x0100007f).ToString("X"));
+			*/
+			
+			IPAddress testadd = IPAddress.Parse ("127.0.0.1");
+			Console.WriteLine("address is " + testadd.Address.ToString ("X"));
+			if (testadd.Address != 0x0100007f)
+				return 1;
+
+			
 			IPAddress hostadd = new IPAddress(0x0100007f);
 			Console.WriteLine("address is " + hostadd.ToString());
 			if (hostadd.ToString() != "127.0.0.1")
diff --git a/mono/tests/jit-float.cs b/mono/tests/jit-float.cs
index e96d279182c..c908dff627d 100644
--- a/mono/tests/jit-float.cs
+++ b/mono/tests/jit-float.cs
@@ -1,5 +1,55 @@
+using System;
+
 public class TestJit {
 
+	public static int test_nan ()
+	{
+		double nan1 = Double.NaN;
+		double nan2 = Double.NaN;
+		double neg_inf1 = Double.NegativeInfinity;
+		double neg_inf2 = Double.NegativeInfinity;
+		double pos_inf1 = Double.PositiveInfinity;
+		double pos_inf2 = Double.PositiveInfinity;
+		int err = 1;
+		
+		if (nan1 == nan2)
+			return err;
+		err++;
+
+		if (!nan1.Equals(nan2))
+			return err;
+			
+		err++;
+		if (neg_inf1 != neg_inf2)
+			return err;
+
+		err++;
+		if (!neg_inf1.Equals(neg_inf2))
+			return err;
+
+		err++;
+		if (pos_inf1 != pos_inf2)
+			return err;
+
+		err++;
+		if (!pos_inf1.Equals(pos_inf2))
+			return err;
+
+		err++;
+		if (pos_inf1 == neg_inf1)
+			return err;
+
+		err++;
+		if (pos_inf1.Equals (neg_inf1))
+			return err;
+
+		err++;
+		if (pos_inf1 == nan1)
+			return err;
+		
+		return 0;
+	}
+
 	public static double test_call (double a, double b) {
 		return a+b;
 	}
@@ -7,24 +57,30 @@ public class TestJit {
 	public static int test_alu ()
 	{
 		double a = 9, b = 6;
+		int err = 1;
 		
 		if ((a + b) != 15)
-			return 1;
+			return err;
 		
+		err++;
 		if ((a - b) != 3)
-			return 1;
+			return err;
 
+		err++;
 		if ((a * b) != 54)
-			return 1;
+			return err;
 		
+		err++;
 		if ((a / 4) != 2.25)
-			return 1;
-		
-		//if ((a % 4) != 1)
-		//	return 1;
+			return err;
+
+		err++;
+		if ((a % 4) != 1)
+			return err;
 
+		err++;
 		if (-a != -9)
-			return 1;
+			return err;
 
 		return 0;
 	}
@@ -32,28 +88,36 @@ public class TestJit {
 	public static int test_branch ()
 	{
 		double a = 0.5, b = 0.5, t;
+		int err = 1;
 
 		if (a == b) t = 1; else t = 0;
-		if (t != 1) return 1;
+		if (t != 1) return err;
 
+		err++;
 		if (a != b) t = 0; else t = 1;
-		if (t != 1) return 1;
+		if (t != 1) return err;
 
+		err++;
 		if (a >= b) t = 1; else t = 0;
-		if (t != 1) return 1;
+		if (t != 1) return err;
 
+		err++;
 		if (a > b) t = 0; else t = 1;
-		if (t != 1) return 1;
+		if (t != 1) return err;
 
+		err++;
 		if (a <= b) t = 1; else t = 0;
-		if (t != 1) return 1;
+		if (t != 1) return err;
 
+		err++;
 		if (a < b) t = 0; else t = 1;
-		if (t != 1) return 1;
+		if (t != 1) return err;
 
-		if (a > 1.0) return 1;
+		err++;
+		if (a > 1.0) return err;
 		
-		if (a < 0.1) return 1;
+		err++;
+		if (a < 0.1) return err;
 		
 		return 0;
 	}
@@ -73,6 +137,11 @@ public class TestJit {
 			return num;
 		num++;
 
+		if (test_nan () != 0)
+			return num;
+		num++;
+
+			
 		return 0;
 	}
 }
diff --git a/mono/tests/jit-int.cs b/mono/tests/jit-int.cs
index 0542839b866..6cb0f2127b3 100644
--- a/mono/tests/jit-int.cs
+++ b/mono/tests/jit-int.cs
@@ -1,5 +1,30 @@
+using System;
+
 public class TestJit {
 
+	public static int test_short ()
+	{
+		int max = 32767;
+		int min = -32768;
+
+		int t1 = 0xffeedd;
+		short s1 = (short)t1;
+		int t2 = s1;
+
+		if ((uint)t2 != 0xffffeedd) 
+			return 1;
+		
+		Console.WriteLine (t2.ToString ("X"));
+		
+		if (Int16.Parse((min).ToString()) != -32768)
+			return 1;
+
+		if (Int16.Parse((max).ToString()) != 32767)
+			return 1;
+
+		return 0;
+	}
+
 	public static int test_call (int a, int b) {
 		return a+b;
 	}
@@ -88,8 +113,13 @@ public class TestJit {
 	}
 
 	public static int Main() {
-		int num = 1;
+		int num = 0;
 
+		num++;
+		if (test_short () != 0)
+			return num;
+
+		num++;
 		if (test_call (3, 5) != 8)
 			return num;
 		num++;
diff --git a/mono/tests/jmpTest.il b/mono/tests/jmpTest.il
new file mode 100644
index 00000000000..8d473f2ad98
--- /dev/null
+++ b/mono/tests/jmpTest.il
@@ -0,0 +1,19 @@
+.assembly extern mscorlib{}
+.assembly jmpTest{}
+.module jmpTest
+
+.class private auto ansi jmpTest
+       extends [mscorlib]System.Object {
+
+  .method public static int32 go() cil managed {
+    .entrypoint
+	jmp int32 [jmpTest]jmpTest::pass()
+        ldc.i4.1	
+	ret
+  }
+
+  .method public static int32 pass() cil managed {
+        ldc.i4.0	
+	ret
+  }
+} 
\ No newline at end of file
diff --git a/mono/tests/largeexp.cs b/mono/tests/largeexp.cs
new file mode 100644
index 00000000000..050eaff4488
--- /dev/null
+++ b/mono/tests/largeexp.cs
@@ -0,0 +1,26 @@
+using System;
+
+class Test {
+
+	private static int[] crc_lookup=new int[256];
+
+	public byte[] header_base = new byte [10];
+	public int header = 0;
+
+	internal int checksum() {
+		uint crc_reg=0;
+		int i = 5;
+		
+		crc_reg = (crc_reg<<8)^(uint)(crc_lookup[((crc_reg >> 24)&0xff)^(header_base[header+i]&0xff)]);
+
+		return 0;
+
+	}
+	
+	
+	public static int Main () {
+		Test t1 = new Test ();
+		
+		return t1.checksum();
+	}
+}
diff --git a/mono/tests/largeexp2.cs b/mono/tests/largeexp2.cs
new file mode 100644
index 00000000000..4df201deb1a
--- /dev/null
+++ b/mono/tests/largeexp2.cs
@@ -0,0 +1,27 @@
+using System;
+
+class Test {
+	
+	private long res = 0;
+
+	void test ()
+	{
+		long a = 1, b = 2;
+
+		res = 2 * a + 3 * b;
+	}
+	
+	static int Main ()
+	{
+		Test x = new Test ();
+
+		x.test ();
+
+		Console.WriteLine (x.res);
+
+		if (x.res != 8)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/libtest.c b/mono/tests/libtest.c
index 7c5523d4edf..b5531fe620e 100644
--- a/mono/tests/libtest.c
+++ b/mono/tests/libtest.c
@@ -1,3 +1,6 @@
+#include <stdio.h>
+#include <string.h>
+
 int mono_test_many_int_arguments (int a, int b, int c, int d, int e,
 				  int f, int g, int h, int i, int j);
 short mono_test_many_short_arguments (short a, short b, short c, short d, short e,
@@ -22,3 +25,184 @@ mono_test_many_byte_arguments (char a, char b, char c, char d, char e, char f, c
 {
 	return a + b + c + d + e + f + g + h + i + j;
 }
+
+int
+mono_test_puts_static (char *s)
+{
+	printf ("TEST %s\n", s);
+	return 1;
+}
+
+typedef int (*SimpleDelegate3) (int a, int b);
+
+int
+mono_invoke_delegate (SimpleDelegate3 delegate)
+{
+	int res;
+
+	printf ("start invoke %p\n", delegate);
+
+	res = delegate (2, 3);
+
+	printf ("end invoke\n");
+
+	return res;
+}
+
+int 
+mono_test_marshal_char (short a1)
+{
+	if (a1 = 'a')
+		return 0;
+	
+	return 1;
+}
+
+int 
+mono_test_marshal_array (int *a1)
+{
+	int i, sum = 0;
+
+	for (i = 0; i < 50; i++)
+		sum += a1 [i];
+	
+	return sum;
+}
+
+typedef struct {
+	int a;
+	int b;
+	int c;
+	char *d;
+} simplestruct;
+
+simplestruct
+mono_test_return_vtype ()
+{
+	simplestruct res;
+
+	res.a = 0;
+	res.b = 1;
+	res.c = 0;
+	res.d = "TEST";
+	printf ("mono_test_return_vtype\n");
+	return res;
+}
+
+typedef simplestruct (*ReturnVTypeDelegate) (simplestruct ss);
+
+simplestruct
+mono_test_return_vtype2 (ReturnVTypeDelegate func)
+{
+	simplestruct res;
+	simplestruct res1;
+
+	res.a = 1;
+	res.b = 0;
+	res.c = 1;
+	res.d = "TEST";
+	printf ("mono_test_return_vtype2\n");
+
+	res1 = func (res);
+
+	printf ("UA: %d\n", res1.a);
+	printf ("UB: %d\n", res1.b);
+	printf ("UC: %d\n", res1.c);
+	printf ("UD: %s\n", res1.d);
+
+	return res1;
+}
+
+typedef char* (*ReturnStringDelegate) (char *s);
+
+char *
+mono_test_return_string (ReturnStringDelegate func)
+{
+	char *res;
+
+	printf ("mono_test_return_string\n");
+
+	res = func ("TEST");
+
+	printf ("got string: %s\n", res);
+	return res;
+}
+
+typedef int (*RefVTypeDelegate) (int a, simplestruct *ss, int b);
+
+int
+mono_test_ref_vtype (int a, simplestruct *ss, int b, RefVTypeDelegate func)
+{
+	if (a == 1 && b == 2 && ss->a == 0 && ss->b == 1 && ss->c == 0 &&
+	    !strcmp (ss->d, "TEST1")) {
+		ss->a = 1;
+		ss->b = 0;
+		ss->c = 1;
+		ss->d = "TEST2";
+	
+		return func (a, ss, b);
+	}
+
+	return 1;
+}
+
+int 
+mono_test_marshal_struct (simplestruct ss)
+{
+	if (ss.a == 0 && ss.b == 1 && ss.c == 0 &&
+	    !strcmp (ss.d, "TEST"))
+		return 0;
+
+	return 1;
+}
+
+
+typedef int (*SimpleDelegate) (int a);
+
+int
+mono_test_marshal_delegate (SimpleDelegate delegate)
+{
+	return delegate (2);
+}
+
+typedef int (*SimpleDelegate2) (simplestruct ss);
+
+int
+mono_test_marshal_delegate2 (SimpleDelegate2 delegate)
+{
+	simplestruct ss;
+	int res;
+
+	ss.a = 0;
+	ss.b = 1;
+	ss.c = 0;
+	ss.d = "TEST";
+
+	printf ("Calling delegate from unmanaged code\n");
+	res = delegate (ss);
+	printf ("GOT %d\n", res);
+
+	return res;
+}
+
+int 
+mono_test_marshal_stringbuilder (char *s, int n)
+{
+	const char m[] = "This is my message.  Isn't it nice?";
+	strncpy(s, m, n);
+	return 0;
+}
+
+typedef struct {
+} EmptyStruct;
+
+/* this does not work on Redhat gcc 2.96 */
+#if 0
+int 
+mono_test_empty_struct (int a, EmptyStruct es, int b)
+{
+	if (a == 1 && b == 2)
+		return 0;
+	return 1;
+}
+#endif
diff --git a/mono/tests/locallocTest.il b/mono/tests/locallocTest.il
new file mode 100644
index 00000000000..0fb313f94d5
--- /dev/null
+++ b/mono/tests/locallocTest.il
@@ -0,0 +1,43 @@
+//tests localloc by allocating 4 bytes, storing a value, and loading it
+.assembly extern mscorlib{}
+.assembly someTest{}
+.module someTest
+
+.class private auto ansi someTest
+       extends [mscorlib]System.Object {
+
+  .method public static void  go() cil managed {
+    .entrypoint
+
+	.locals init (native int)
+
+//allocate
+ldc.i4.4
+localloc
+stloc.0
+
+//store number
+ldloc.0
+ldc.i4 7777777
+stind.i4
+
+//load number
+ldloc.0
+ldind.i4
+
+//compare
+ldc.i4 7777777
+beq PASS
+
+FAIL:	ldstr "FAIL"
+	call void [mscorlib]System.Console::WriteLine(string)
+	br END
+
+PASS:	ldstr "PASS"
+	call void [mscorlib]System.Console::WriteLine(string)
+
+END:	ret
+  }
+
+
+} 
\ No newline at end of file
diff --git a/mono/tests/lock.cs b/mono/tests/lock.cs
new file mode 100755
index 00000000000..c639983b378
--- /dev/null
+++ b/mono/tests/lock.cs
@@ -0,0 +1,27 @@
+using System;
+
+public class LockTest 
+{
+	public class Test 
+	{
+		public int val {
+			get {
+				return(v);
+			}
+			set {
+				v=value;
+			}
+		}
+		
+		int v;
+	}
+	
+	public static void Main() {
+		Test a=new Test();
+		
+		lock(a) {
+			a.val=2;
+		}
+		Console.WriteLine("a is " + a.val);
+	}
+}
diff --git a/mono/tests/marshal1.cs b/mono/tests/marshal1.cs
new file mode 100755
index 00000000000..fff98171cf8
--- /dev/null
+++ b/mono/tests/marshal1.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+	public static int Main () {
+		byte [] bytesrc = new byte [20];
+		byte [] bytedest = new byte [20];
+
+		IntPtr dest = Marshal.AllocHGlobal (1024);
+		
+		bytesrc [2] = 2;
+		bytesrc [11] = 11;		
+		Marshal.Copy (bytesrc, 2, dest, 10);
+
+		if (Marshal.ReadByte (dest, 0) != 2)
+			return 1;
+		if (Marshal.ReadByte (dest, 9) != 11)
+			return 1;
+
+		Marshal.Copy (dest, bytedest, 2, 10);
+
+		if (bytedest [2] != 2)
+			return 1;
+		if (bytedest [11] != 11)
+			return 1;		
+
+		return 0;
+	}
+}
+
diff --git a/mono/tests/marshal2.cs b/mono/tests/marshal2.cs
new file mode 100755
index 00000000000..2089b2cf7bb
--- /dev/null
+++ b/mono/tests/marshal2.cs
@@ -0,0 +1,135 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+
+	[StructLayout (LayoutKind.Sequential)]
+	public class SimpleObj {
+		public int a;
+		public int b;
+
+		public void test () {}
+	}
+
+	[StructLayout (LayoutKind.Sequential)]
+	public struct SimpleStruct2 {
+		public int a;
+		public int b;
+	}
+	
+	[StructLayout (LayoutKind.Sequential, CharSet=CharSet.Ansi)]
+	public struct SimpleStruct {
+		public int a;
+		public bool bool1;
+		public bool bool2;
+		public int b;
+		[MarshalAs (UnmanagedType.ByValArray, SizeConst=2)] public short[] a1;
+		[MarshalAs (UnmanagedType.ByValTStr, SizeConst=4)] public string s1;
+		public SimpleStruct2 emb1;
+		public SimpleObj emb2;
+		public string s2;
+		public double x;
+	}
+	
+	public unsafe static int Main () {
+		SimpleStruct ss = new SimpleStruct ();
+		int size = Marshal.SizeOf (typeof (SimpleStruct));
+		
+		Console.WriteLine ("SimpleStruct:" + size);
+		//if (size != 52)
+		//return 1;
+		
+		IntPtr p = Marshal.AllocHGlobal (size);
+		ss.a = 1;
+		ss.bool1 = true;
+		ss.bool2 = false;
+		ss.b = 2;
+		ss.a1 = new short [2];
+		ss.a1 [0] = 6;
+		ss.a1 [1] = 5;
+		ss.s1 = "abcd";
+		ss.emb1 = new SimpleStruct2 ();
+		ss.emb1.a = 3;
+		ss.emb1.b = 4;
+		ss.emb2 = new SimpleObj ();
+		ss.emb2.a = 10;
+		ss.emb2.b = 11;
+		ss.s2 = "just a test";
+		ss.x = 1.5;
+		
+		Marshal.StructureToPtr (ss, p, false);
+		Type t = ss.GetType ();
+		
+		if (Marshal.ReadInt32 (p, (int)Marshal.OffsetOf (t, "a")) != 1)
+			return 1;
+		if (Marshal.ReadInt32 (p, (int)Marshal.OffsetOf (t, "bool1")) != 1)
+			return 1;
+		if (Marshal.ReadInt32 (p, (int)Marshal.OffsetOf (t, "bool2")) != 0)
+			return 1;
+		if (Marshal.ReadInt32 (p, (int)Marshal.OffsetOf (t, "b")) != 2)
+			return 1;
+		if (Marshal.ReadInt16 (p, 16) != 6)
+			return 1;
+		if (Marshal.ReadInt16 (p, 18) != 5)
+			return 1;
+		if (Marshal.ReadByte (p, 20) != 97)
+			return 1;
+		if (Marshal.ReadByte (p, 21) != 98)
+			return 1;
+		if (Marshal.ReadByte (p, 22) != 99)
+			return 1;
+		if (Marshal.ReadByte (p, 23) != 0)
+			return 1;
+		if (Marshal.ReadInt32 (p, 24) != 3)
+			return 1;
+		if (Marshal.ReadInt32 (p, 28) != 4)
+			return 1;
+		if (Marshal.ReadInt32 (p, (int)Marshal.OffsetOf (t, "s2")) == 0)
+			return 1;
+
+		SimpleStruct cp = (SimpleStruct)Marshal.PtrToStructure (p, ss.GetType ());
+
+		if (cp.a != 1)
+			return 2;
+
+		if (cp.bool1 != true)
+			return 2;
+
+		if (cp.bool2 != false)
+			return 2;
+
+		if (cp.b != 2)
+			return 2;
+
+		if (cp.a1 [0] != 6)
+			return 2;
+		
+		if (cp.a1 [1] != 5)
+			return 2;
+
+		if (cp.s1 != "abc")
+			return 3;
+		
+		if (cp.emb1.a != 3)
+			return 2;
+
+		if (cp.emb1.b != 4)
+			return 2;
+
+		if (cp.emb2.a != 10)
+			return 2;
+
+		if (cp.emb2.b != 11)
+			return 2;
+
+		if (cp.s2 != "just a test")
+			return 2;
+
+		if (cp.x != 1.5)
+			return 2;
+		
+		return 0;
+	}
+}
+
diff --git a/mono/tests/marshal3.cs b/mono/tests/marshal3.cs
new file mode 100755
index 00000000000..7f984b60b39
--- /dev/null
+++ b/mono/tests/marshal3.cs
@@ -0,0 +1,44 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+
+	[StructLayout (LayoutKind.Sequential)]
+	public struct BlittableStruct {
+		public int a;
+		public int b;
+	}
+	
+	public unsafe static int Main () {
+		BlittableStruct ss = new BlittableStruct ();
+		int size = Marshal.SizeOf (typeof (BlittableStruct));
+		
+		Console.WriteLine ("BlittableStruct:" + size);
+		if (size != 8)
+			return 1;
+		
+		IntPtr p = Marshal.AllocHGlobal (size);
+		ss.a = 123;
+		ss.b = 124;
+
+		Marshal.StructureToPtr (ss, p, false);
+		Type t = ss.GetType ();
+		
+		if (Marshal.ReadInt32 (p, 0) != 123)
+			return 1;
+		if (Marshal.ReadInt32 (p, 4) != 124)
+			return 1;
+
+		BlittableStruct cp = (BlittableStruct)Marshal.PtrToStructure (p, ss.GetType ());
+
+		if (cp.a != 123)
+			return 2;
+
+		if (cp.b != 124)
+			return 2;
+		
+		return 0;
+	}
+}
+
diff --git a/mono/tests/marshalbyref1.cs b/mono/tests/marshalbyref1.cs
new file mode 100644
index 00000000000..445c3ca4804
--- /dev/null
+++ b/mono/tests/marshalbyref1.cs
@@ -0,0 +1,14 @@
+class Base : System.MarshalByRefObject {
+        public virtual void method () {
+        }
+}
+
+class Derived : Base {
+        public override void method () {
+                base.method ();
+        }
+        static void Main() {
+                Derived d = new Derived ();
+                d.method ();
+        }
+}
diff --git a/mono/tests/mis.cs b/mono/tests/mis.cs
index 0aa3091f3a3..d6bb5b22a8c 100755
--- a/mono/tests/mis.cs
+++ b/mono/tests/mis.cs
@@ -129,13 +129,14 @@ namespace T {
 				filetype = "";
 			
 
-			Console.WriteLine("File is " + req);
-			Console.WriteLine("Mime type is " + mime_types[filetype]);
 
 			string mime_type = (string) mime_types [filetype];
 			if (mime_type == null)
 				mime_type = "text/plain";
 			
+			Console.WriteLine("File is " + req);
+			Console.WriteLine("Mime type is " + mime_type);
+			
 			try {
 				FileStream f=new FileStream(req, FileMode.Open, FileAccess.Read);
 				byte[] fbuf=new byte[256];
@@ -189,11 +190,11 @@ namespace T {
 			else
 				filetype = "";
 
-			Console.WriteLine("File is " + req);
-			Console.WriteLine("Mime type is " + mime_types[filetype]);
 			string mime_type = (string) mime_types [filetype];
 			if (mime_type == null)
 				mime_type = "text/plain";
+			Console.WriteLine("File is " + req);
+			Console.WriteLine("Mime type is " + mime_type);
 
 			try {
 				FileStream f=new FileStream(req, FileMode.Open, FileAccess.Read);
diff --git a/mono/tests/nonvirt.cs b/mono/tests/nonvirt.cs
new file mode 100755
index 00000000000..e45bf5af76a
--- /dev/null
+++ b/mono/tests/nonvirt.cs
@@ -0,0 +1,22 @@
+using System;
+
+public class TestObj {
+
+	public int amethod () {
+		return 1;
+	}
+	
+	public static int Main () {
+		TestObj obj = null;
+
+		try {
+			obj.amethod ();
+		} catch (NullReferenceException) {
+			return 0;
+		}
+		
+		return 1;
+	}
+}
+
+
diff --git a/mono/tests/pack-layout.cs b/mono/tests/pack-layout.cs
new file mode 100644
index 00000000000..f149cc36040
--- /dev/null
+++ b/mono/tests/pack-layout.cs
@@ -0,0 +1,40 @@
+using System;
+using System.Runtime.InteropServices;
+
+[StructLayout ( LayoutKind.Sequential, Pack=2 )]
+struct MYStruct  {
+	short a;
+	int b;
+}
+
+[StructLayout ( LayoutKind.Sequential, Pack=2 )]
+struct MYStruct2  {
+	int b;
+	short a;
+}
+
+struct MYStruct3  {
+	int b;
+	short a;
+}
+
+class Test {
+	static int Main() {
+		int ms, ms2, ms3;
+		unsafe {
+			ms = sizeof (MYStruct);
+			ms2 = sizeof (MYStruct2);
+			ms3 = sizeof (MYStruct3);
+		}
+		Console.WriteLine ("MYStruct size: {0}", ms);
+		Console.WriteLine ("MYStruct2 size: {0}", ms2);
+		Console.WriteLine ("MYStruct3 size: {0}", ms3);
+		if (ms != 6)
+			return 1;
+		if (ms2 != 6)
+			return 2;
+		if (ms3 != 8)
+			return 3;
+		return 0;
+	}
+}
diff --git a/mono/tests/params.cs b/mono/tests/params.cs
index dd5ffec1e94..b405df075ca 100644
--- a/mono/tests/params.cs
+++ b/mono/tests/params.cs
@@ -2,6 +2,10 @@ using System;
 
 public class T {
 
+	static public void method (int nargs, string arg) {
+		int i;
+		Console.WriteLine ("Got single arg "+arg);
+	}
 	static public void method (int nargs, params string[] args) {
 		int i;
 		Console.Write ("Got "+nargs.ToString()+" args ");
@@ -12,6 +16,7 @@ public class T {
 	public static int Main() {
 		method (1, "hello");
 		method (2, "hello", "World");
+		method (3, "hello", "World", "blah");
 		return 0;
 	}
 }
diff --git a/mono/tests/pinvoke1.cs b/mono/tests/pinvoke1.cs
new file mode 100755
index 00000000000..8e95d35461b
--- /dev/null
+++ b/mono/tests/pinvoke1.cs
@@ -0,0 +1,46 @@
+using System;
+using System.Runtime.InteropServices;
+using System.Runtime.CompilerServices;
+
+public class T {
+
+	public virtual object MyClone ()
+	{
+		return null;
+	}
+
+}
+
+public class Test : T {
+
+	[MethodImplAttribute(MethodImplOptions.InternalCall)]
+	public override extern object MyClone ();
+
+	delegate int MyDelegate (string name);
+
+	[DllImport ("libtest.so", EntryPoint="mono_test_puts_static")]
+	public static extern int puts_static (string name);
+
+	public static int Main () {
+		puts_static ("A simple Test for PInvoke 1");
+
+		MyDelegate d = new MyDelegate (puts_static);
+		d ("A simple Test for PInvoke 2");
+
+		object [] args = {"A simple Test for PInvoke 3"};
+		d.DynamicInvoke (args);
+		
+		int noimpl = 0;
+		try {
+			Test X = new Test ();
+			X.MyClone ();
+		} catch {
+			noimpl = 1;
+		}
+
+		if (noimpl == 0)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/pinvoke2.cs b/mono/tests/pinvoke2.cs
new file mode 100755
index 00000000000..a65d2349e1f
--- /dev/null
+++ b/mono/tests/pinvoke2.cs
@@ -0,0 +1,61 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+	public static int delegate_test (int a)
+	{
+		Console.WriteLine ("Delegate: " + a);
+		
+		if (a == 2)
+			return 0;
+
+		return 1;
+	}
+	
+	[StructLayout (LayoutKind.Sequential)]
+	public struct SimpleStruct {
+		public bool a;
+		public bool b;
+		public bool c;
+		public string d;
+	}
+
+	[DllImport ("libtest.so", EntryPoint="mono_test_marshal_char")]
+	public static extern int mono_test_marshal_char (char a1);
+
+	[DllImport ("libtest.so", EntryPoint="mono_test_marshal_array")]
+	public static extern int mono_test_marshal_array (int [] a1);
+	
+	[DllImport ("libtest.so", EntryPoint="mono_test_marshal_struct")]
+	public static extern int mono_test_marshal_struct (SimpleStruct ss);
+
+	[DllImport ("libtest.so", EntryPoint="mono_test_marshal_delegate")]
+	public static extern int mono_test_marshal_delegate (SimpleDelegate d);
+
+	public delegate int SimpleDelegate (int a);
+
+	public static int Main () {
+		if (mono_test_marshal_char ('a') != 0)
+			return 1;
+
+		int [] a1 = new int [50];
+		for (int i = 0; i < 50; i++)
+			a1 [i] = i;
+
+		if (mono_test_marshal_array (a1) != 1225)
+			return 2;
+
+		SimpleStruct ss = new  SimpleStruct ();
+		ss.b = true;
+		ss.d = "TEST";
+		mono_test_marshal_struct (ss);
+		
+		SimpleDelegate d = new SimpleDelegate (delegate_test);
+
+		if (mono_test_marshal_delegate (d) != 0)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/pinvoke3.cs b/mono/tests/pinvoke3.cs
new file mode 100755
index 00000000000..8c3294a3179
--- /dev/null
+++ b/mono/tests/pinvoke3.cs
@@ -0,0 +1,42 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+	[StructLayout (LayoutKind.Sequential)]
+	public struct SimpleStruct {
+		public bool a;
+		public bool b;
+		public bool c;
+		public string d;
+	}
+
+	public static int delegate_test (SimpleStruct ss)
+	{
+		Console.WriteLine ("delegate called");
+		Console.WriteLine ("A: " + ss.a);
+		Console.WriteLine ("B: " + ss.b);
+		Console.WriteLine ("C: " + ss.c);
+		Console.WriteLine ("D: " + ss.d);
+		
+		if (!ss.a && ss.b && !ss.c && ss.d == "TEST")
+			return 0;
+		
+		return 1;
+	}
+	
+	[DllImport ("libtest.so", EntryPoint="mono_test_marshal_delegate2")]
+	public static extern int mono_test_marshal_delegate2 (SimpleDelegate2 d);
+
+	public delegate int SimpleDelegate2 (SimpleStruct ss);
+
+	public static int Main () {
+		
+		SimpleDelegate2 d = new SimpleDelegate2 (delegate_test);
+
+		if (mono_test_marshal_delegate2 (d) != 0)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/pinvoke4.cs b/mono/tests/pinvoke4.cs
new file mode 100755
index 00000000000..b5a6fe0f3e8
--- /dev/null
+++ b/mono/tests/pinvoke4.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+	[StructLayout (LayoutKind.Sequential)]
+	public struct SimpleStruct {
+		public bool a;
+		public bool b;
+		public bool c;
+		public string d;
+	}
+
+	[DllImport ("libtest.so", EntryPoint="mono_test_return_vtype")]
+	public static extern SimpleStruct mono_test_return_vtype ();
+
+
+	public static int Main () {
+		SimpleStruct ss = mono_test_return_vtype ();
+
+		Console.WriteLine ("A: " + ss.a);
+		Console.WriteLine ("B: " + ss.b);
+		Console.WriteLine ("C: " + ss.c);
+		Console.WriteLine ("D: " + ss.d);
+
+		if (!ss.a && ss.b && !ss.c && ss.d == "TEST")
+			return 0;
+		
+		return 1;
+	}
+}
diff --git a/mono/tests/pinvoke5.cs b/mono/tests/pinvoke5.cs
new file mode 100755
index 00000000000..df81be81799
--- /dev/null
+++ b/mono/tests/pinvoke5.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Text;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+
+	[DllImport ("libtest.so", EntryPoint="mono_test_marshal_stringbuilder")]
+	public static extern void mono_test_marshal_stringbuilder (StringBuilder sb, int len);
+
+	public static int Main () {
+		StringBuilder sb = new StringBuilder(255);
+		mono_test_marshal_stringbuilder (sb, sb.Capacity);
+		Console.Write ("name: ");
+		String res = sb.ToString();
+		Console.WriteLine (res);
+
+		if (res != "This is my message.  Isn't it nice?")
+			return 1;  
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/pinvoke6.cs b/mono/tests/pinvoke6.cs
new file mode 100755
index 00000000000..8c12d4b823a
--- /dev/null
+++ b/mono/tests/pinvoke6.cs
@@ -0,0 +1,45 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+	[StructLayout (LayoutKind.Sequential)]
+	public struct SimpleStruct {
+		public bool a;
+		public bool b;
+		public bool c;
+		public string d;
+	}
+
+	[DllImport ("libtest.so", EntryPoint="mono_test_ref_vtype")]
+	public static extern int mono_test_ref_vtype (int a, ref SimpleStruct ss, int b, TestDelegate d);
+
+	public static int managed_test_ref_vtype (int a, ref SimpleStruct ss, int b)
+	{
+		Console.WriteLine ("Delegate called");
+		
+		if (a == 1 && b == 2 && ss.a && !ss.b && ss.c && ss.d == "TEST2")
+			return 0;
+
+		return 1;
+	}
+
+	public delegate int TestDelegate (int a, ref SimpleStruct ss, int b);
+
+
+	public static int Main () {
+		SimpleStruct ss = new SimpleStruct ();
+		TestDelegate d = new TestDelegate (managed_test_ref_vtype);
+		
+		ss.b = true;
+		ss.d = "TEST1";
+
+		if (mono_test_ref_vtype (1, ref ss, 2, d) != 0)
+			return 1;
+		
+		if (ss.a && !ss.b && ss.c && ss.d == "TEST2")
+			return 0;
+		
+		return 1;
+	}
+}
diff --git a/mono/tests/pinvoke7.cs b/mono/tests/pinvoke7.cs
new file mode 100755
index 00000000000..2fa1e773f55
--- /dev/null
+++ b/mono/tests/pinvoke7.cs
@@ -0,0 +1,21 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+	[StructLayout (LayoutKind.Sequential)]
+	public struct EmptyStruct {
+	}
+
+	[DllImport ("libtest.so", EntryPoint="mono_test_empty_struct")]
+	public static extern int mono_test_empty_struct (int a, EmptyStruct es, int b);
+
+	public static int Main () {
+		EmptyStruct es = new EmptyStruct ();
+
+		if (mono_test_empty_struct (1, es, 2) != 0)
+			return 1;
+		
+		return 0;
+	}
+}
diff --git a/mono/tests/pinvoke8.cs b/mono/tests/pinvoke8.cs
new file mode 100755
index 00000000000..a5d5435fa1d
--- /dev/null
+++ b/mono/tests/pinvoke8.cs
@@ -0,0 +1,50 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+	[StructLayout (LayoutKind.Sequential)]
+	public struct SimpleStruct {
+		public bool a;
+		public bool b;
+		public bool c;
+		public string d;
+	}
+
+	[DllImport ("libtest.so", EntryPoint="mono_test_return_vtype2")]
+	public static extern SimpleStruct mono_test_return_vtype2 (ReturnVTypeDelegate d);
+
+	public static SimpleStruct managed_return_vtype (SimpleStruct ss) {
+		SimpleStruct res;
+
+		Console.WriteLine ("delegate called");
+		Console.WriteLine ("A: " + ss.a);
+		Console.WriteLine ("B: " + ss.b);
+		Console.WriteLine ("C: " + ss.c);
+		Console.WriteLine ("D: " + ss.d);
+
+		res.a = !ss.a;
+		res.b = !ss.b;
+		res.c = !ss.c;
+		res.d = "TEST5";
+
+		return res;
+	}
+
+	public delegate SimpleStruct ReturnVTypeDelegate (SimpleStruct ss);
+
+	public static int Main () {
+		ReturnVTypeDelegate d = new ReturnVTypeDelegate (managed_return_vtype);
+		SimpleStruct ss = mono_test_return_vtype2 (d);
+
+		Console.WriteLine ("A: " + ss.a);
+		Console.WriteLine ("B: " + ss.b);
+		Console.WriteLine ("C: " + ss.c);
+		Console.WriteLine ("D: " + ss.d);
+
+		if (!ss.a && ss.b && !ss.c && ss.d == "TEST5")
+			return 0;
+		
+		return 1;
+	}
+}
diff --git a/mono/tests/pinvoke9.cs b/mono/tests/pinvoke9.cs
new file mode 100755
index 00000000000..b723d7fe1ca
--- /dev/null
+++ b/mono/tests/pinvoke9.cs
@@ -0,0 +1,31 @@
+using System;
+using System.Runtime.InteropServices;
+
+public class Test {
+
+	[DllImport ("libtest.so", EntryPoint="mono_test_return_string")]
+	public static extern String mono_test_return_string (ReturnStringDelegate d);
+
+	public static String managed_return_string (String s) {
+
+		Console.WriteLine ("delegate called: " + s);
+		if (s != "TEST")
+			return "";
+		else
+			return "12345";
+	}
+
+	public delegate String ReturnStringDelegate (String s);
+
+	public static int Main () {
+		ReturnStringDelegate d = new ReturnStringDelegate (managed_return_string);
+		String s = mono_test_return_string (d);
+
+		Console.WriteLine ("Received: " + s);
+
+		if (s == "12345")
+			return 0;
+		
+		return 1;
+	}
+}
diff --git a/mono/tests/process1.cs b/mono/tests/process1.cs
new file mode 100755
index 00000000000..af6f364f249
--- /dev/null
+++ b/mono/tests/process1.cs
@@ -0,0 +1,35 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+
+class Modules {
+	static void Run() {
+		Process proc = new Process();
+		bool ret;
+
+		proc.StartInfo.FileName="wibble";
+		proc.StartInfo.Arguments="arg1    arg2\targ3 \"arg4a arg4b\"";
+		proc.StartInfo.UseShellExecute=false;
+		ret=proc.Start();
+
+		Console.WriteLine("Start returns " + ret);
+		Console.WriteLine("Process is " + proc.ToString());
+		Console.WriteLine("Pid is " + proc.Id);
+		Console.WriteLine("Handle is " + proc.Handle);
+		Console.WriteLine("HandleCount is " + proc.HandleCount);
+
+		Console.WriteLine("Waiting for exit...");
+		proc.WaitForExit();
+		Console.WriteLine("Wait returned");
+		Console.WriteLine("Exit code is " + proc.ExitCode);
+		Console.WriteLine("Process started at " + proc.StartTime);
+		Console.WriteLine("Process ended at " + proc.ExitTime);
+	}
+
+	static void Main() {
+		Run();
+		System.Threading.Thread.Sleep(10000);
+		Run();
+	}
+}
+
diff --git a/mono/tests/process2.cs b/mono/tests/process2.cs
new file mode 100755
index 00000000000..25137e2762c
--- /dev/null
+++ b/mono/tests/process2.cs
@@ -0,0 +1,47 @@
+using System;
+using System.Diagnostics;
+using System.Threading;
+
+class Modules {
+	static void Run() {
+		Process proc = new Process();
+		bool ret;
+
+		proc.StartInfo.FileName="wibble-redir";
+		proc.StartInfo.Arguments="arg1    arg2\targ3 \"arg4a arg4b\"";
+		proc.StartInfo.UseShellExecute=false;
+		proc.StartInfo.RedirectStandardInput=true;
+		ret=proc.Start();
+
+		Console.WriteLine("Start returns " + ret);
+		Console.WriteLine("Process is " + proc.ToString());
+		Console.WriteLine("Pid is " + proc.Id);
+		Console.WriteLine("Handle is " + proc.Handle);
+		Console.WriteLine("HandleCount is " + proc.HandleCount);
+
+		Console.WriteLine("Writing [foo bar]");
+		proc.StandardInput.WriteLine("foo bar");
+
+		System.Threading.Thread.Sleep(1000);
+
+		Console.WriteLine("Writing [wibble wobble]");
+		proc.StandardInput.WriteLine("wibble wobble");
+
+		System.Threading.Thread.Sleep(1000);
+
+		Console.WriteLine("Closing stdin");
+		proc.StandardInput.Close();
+
+		Console.WriteLine("Waiting for exit...");
+		proc.WaitForExit();
+		Console.WriteLine("Wait returned");
+		Console.WriteLine("Exit code is " + proc.ExitCode);
+		Console.WriteLine("Process started at " + proc.StartTime);
+		Console.WriteLine("Process ended at " + proc.ExitTime);
+	}
+
+	static void Main() {
+		Run();
+	}
+}
+
diff --git a/mono/tests/reflection-enum.cs b/mono/tests/reflection-enum.cs
index e4496eaa11f..10f9050dc8c 100644
--- a/mono/tests/reflection-enum.cs
+++ b/mono/tests/reflection-enum.cs
@@ -21,7 +21,7 @@ namespace Test {
 			if (verbose != 0) {
 				Console.WriteLine ("Enum "+t.Name);
 				for (i = 0; i < names.Length; ++i) {
-					Console.WriteLine (names [i] + " = " + ((int)values.GetValue(i)).ToString());
+					Console.WriteLine ("{0} = {1} (ToString: {2})", names [i], ((int)values.GetValue(i)).ToString(), values.GetValue(i));
 				}
 			}
 			if (name == defaultn) {
diff --git a/mono/tests/remoting1.cs b/mono/tests/remoting1.cs
new file mode 100644
index 00000000000..de3ec58b9b1
--- /dev/null
+++ b/mono/tests/remoting1.cs
@@ -0,0 +1,176 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Messaging;
+using System.Runtime.Remoting.Proxies;
+
+class MyProxy : RealProxy {
+	readonly MarshalByRefObject target;
+
+	public MyProxy (MarshalByRefObject target) : base (target.GetType())
+	{
+		this.target = target;
+	}
+
+	public override IMessage Invoke (IMessage request) {
+		IMethodCallMessage call = (IMethodCallMessage)request;
+		Console.WriteLine ("Invoke " + call.MethodName);
+
+		Console.Write ("ARGS(");
+		for (int i = 0; i < call.ArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (call.GetArgName (i) +  " " +
+				       call.GetArg (i));
+		}
+		Console.WriteLine (")");
+		Console.Write ("INARGS(");
+		for (int i = 0; i < call.InArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (call.GetInArgName (i) +  " " +
+				       call.GetInArg (i));
+		}
+		Console.WriteLine (")");
+
+		IMethodReturnMessage res = RemotingServices.ExecuteMessage (target, call);
+
+		Console.Write ("RESARGS(");
+		for (int i = 0; i < res.ArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (res.GetArgName (i) +  " " +
+				       res.GetArg (i));
+		}
+		Console.WriteLine (")");		
+		
+		Console.Write ("RESOUTARGS(");
+		for (int i = 0; i < res.OutArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (res.GetOutArgName (i) +  " " +
+				       res.GetOutArg (i));
+		}
+		Console.WriteLine (")");		
+		
+		return res;
+	}
+}
+
+public struct MyStruct {
+	public int a;
+	public int b;
+	public int c;
+}
+	
+class R1 : MarshalByRefObject {
+
+	public int test_field = 5;
+	
+	public virtual MyStruct Add (int a, out int c, int b) {
+		Console.WriteLine ("ADD");
+		c = a + b;
+
+		MyStruct res = new MyStruct ();
+
+		res.a = a;
+		res.b = b;
+		res.c = c;
+		
+		return res;
+	}
+
+	public long nonvirtual_Add (int a, int b) {
+		Console.WriteLine ("nonvirtual_Add " + a + " + " + b);
+		return a + b;
+	}
+}
+
+class Test {
+
+	delegate MyStruct RemoteDelegate1 (int a, out int c, int b);
+	delegate long RemoteDelegate2 (int a, int b);
+
+	static long test_call (R1 o)
+	{
+		return o.nonvirtual_Add (2, 3);
+	}
+	
+	static int Main () {
+		R1 myobj = new R1 ();
+		int res = 0;
+		long lres;
+		
+		MyProxy real_proxy = new MyProxy (myobj);
+
+		R1 o = (R1)real_proxy.GetTransparentProxy ();
+
+		if (RemotingServices.IsTransparentProxy (null))
+			return 1;
+		
+		if (!RemotingServices.IsTransparentProxy (o))
+			return 2;
+
+		if (o.GetType () != myobj.GetType ())
+			return 3;
+
+		MyStruct myres = o.Add (2, out res, 3);
+
+		Console.WriteLine ("Result: " + myres.a + " " +
+				   myres.b + " " + myres.c +  " " + res);
+
+		if (myres.a != 2)
+			return 4;
+		
+		if (myres.b != 3)
+			return 5;
+		
+		if (myres.c != 5)
+			return 6;
+
+		if (res != 5)
+			return 7;
+
+		R1 o2 = new R1 ();
+		
+		lres = test_call (o2);
+		
+		lres = test_call (o);
+
+		Console.WriteLine ("Result: " + lres);
+		if (lres != 5)
+			return 8;
+		
+		lres = test_call (o);
+
+		o.test_field = 2;
+		
+		Console.WriteLine ("test_field: " + o.test_field);
+		if (o.test_field != 2)
+			return 9;
+
+		RemoteDelegate1 d1 = new RemoteDelegate1 (o.Add);
+		MyStruct myres2 = d1 (2, out res, 3);
+
+		Console.WriteLine ("Result: " + myres2.a + " " +
+				   myres2.b + " " + myres2.c +  " " + res);
+
+		if (myres2.a != 2)
+			return 10;
+		
+		if (myres2.b != 3)
+			return 11;
+		
+		if (myres2.c != 5)
+			return 12;
+
+		if (res != 5)
+			return 13;
+
+		RemoteDelegate2 d2 = new RemoteDelegate2 (o.nonvirtual_Add);
+		d2 (6, 7);
+
+		return 0;
+	}
+}
diff --git a/mono/tests/remoting2.cs b/mono/tests/remoting2.cs
new file mode 100644
index 00000000000..eda80c67395
--- /dev/null
+++ b/mono/tests/remoting2.cs
@@ -0,0 +1,113 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Messaging;
+using System.Runtime.Remoting.Proxies;
+
+class MyProxy : RealProxy {
+	readonly MarshalByRefObject target;
+
+	public MyProxy (MarshalByRefObject target) : base (target.GetType())
+	{
+		this.target = target;
+	}
+
+	public override IMessage Invoke (IMessage request) {
+		IMethodCallMessage call = (IMethodCallMessage)request;
+		Console.WriteLine ("Invoke " + call.MethodName);
+
+		Console.Write ("ARGS(");
+		for (int i = 0; i < call.ArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (call.GetArgName (i) +  " " +
+				       call.GetArg (i));
+		}
+		Console.WriteLine (")");
+		Console.Write ("INARGS(");
+		for (int i = 0; i < call.InArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (call.GetInArgName (i) +  " " +
+				       call.GetInArg (i));
+		}
+		Console.WriteLine (")");
+
+		IMethodReturnMessage res = RemotingServices.ExecuteMessage (target, call);
+
+		Console.Write ("RESARGS(");
+		for (int i = 0; i < res.ArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (res.GetArgName (i) +  " " +
+				       res.GetArg (i));
+		}
+		Console.WriteLine (")");		
+		
+		Console.Write ("RESOUTARGS(");
+		for (int i = 0; i < res.OutArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (res.GetOutArgName (i) +  " " +
+				       res.GetOutArg (i));
+		}
+		Console.WriteLine (")");		
+		
+		return res;
+	}
+}
+
+public struct MyStruct {
+	public int a;
+	public int b;
+	public int c;
+}
+	
+class R1 : MarshalByRefObject {
+
+	public int test_field = 5;
+	
+	public virtual MyStruct Add (int a, out int c, int b) {
+		Console.WriteLine ("ADD");
+		c = a + b;
+
+		MyStruct res = new MyStruct ();
+
+		res.a = a;
+		res.b = b;
+		res.c = c;
+		
+		return res;
+	}
+
+	public long nonvirtual_Add (int a, int b) {
+		Console.WriteLine ("nonvirtual_Add");
+		return a + b;
+	}
+}
+
+class Test {
+
+	delegate long RemoteDelegate2 (int a, int b);
+
+	
+	static int Main () {
+		R1 myobj = new R1 ();
+		long lres;
+		
+		MyProxy real_proxy = new MyProxy (myobj);
+
+		R1 o = (R1)real_proxy.GetTransparentProxy ();
+
+		RemoteDelegate2 d2 = new RemoteDelegate2 (o.nonvirtual_Add);
+		d2 (6, 7);
+		
+		IAsyncResult ar1 = d2.BeginInvoke (2, 4, null, null);
+		lres = d2.EndInvoke (ar1);
+		if (lres != 6)
+			return 1;
+
+		return 0;
+	}
+}
diff --git a/mono/tests/remoting3.cs b/mono/tests/remoting3.cs
new file mode 100644
index 00000000000..77fb860e655
--- /dev/null
+++ b/mono/tests/remoting3.cs
@@ -0,0 +1,123 @@
+using System;
+using System.Threading;
+using System.Runtime.InteropServices;
+using System.Runtime.Remoting;
+using System.Runtime.Remoting.Messaging;
+using System.Runtime.Remoting.Proxies;
+
+class MyProxy : RealProxy {
+	readonly MarshalByRefObject target;
+
+	public MyProxy (MarshalByRefObject target) : base (target.GetType())
+	{
+		this.target = target;
+	}
+
+	public override IMessage Invoke (IMessage request) {
+		IMethodCallMessage call = (IMethodCallMessage)request;
+		Console.WriteLine ("Invoke " + call.MethodName);
+
+		Console.Write ("ARGS(");
+		for (int i = 0; i < call.ArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (call.GetArgName (i) +  " " +
+				       call.GetArg (i));
+		}
+		Console.WriteLine (")");
+		Console.Write ("INARGS(");
+		for (int i = 0; i < call.InArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (call.GetInArgName (i) +  " " +
+				       call.GetInArg (i));
+		}
+		Console.WriteLine (")");
+
+		IMethodReturnMessage res = RemotingServices.ExecuteMessage (target, call);
+
+		Console.Write ("RESARGS(");
+		for (int i = 0; i < res.ArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (res.GetArgName (i) +  " " +
+				       res.GetArg (i));
+		}
+		Console.WriteLine (")");		
+		
+		Console.Write ("RESOUTARGS(");
+		for (int i = 0; i < res.OutArgCount; i++) {
+			if (i != 0)
+				Console.Write (", ");
+			Console.Write (res.GetOutArgName (i) +  " " +
+				       res.GetOutArg (i));
+		}
+		Console.WriteLine (")");		
+		
+		return res;
+	}
+}
+
+public struct MyStruct {
+	public int a;
+	public int b;
+	public int c;
+}
+	
+class R1 : MarshalByRefObject {
+
+	public int test_field = 5;
+	
+	public virtual MyStruct Add (int a, out int c, int b) {
+		Console.WriteLine ("ADD");
+		c = a + b;
+
+		MyStruct res = new MyStruct ();
+
+		res.a = a;
+		res.b = b;
+		res.c = c;
+		
+		return res;
+	}
+
+	public long nonvirtual_Add (int a, int b) {
+		Console.WriteLine ("nonvirtual_Add");
+		return a + b;
+	}
+}
+
+class Test {
+
+	delegate MyStruct RemoteDelegate1 (int a, out int c, int b);
+	
+	static int Main () {
+		R1 myobj = new R1 ();
+		int res = 0;
+		
+		MyProxy real_proxy = new MyProxy (myobj);
+
+		R1 o = (R1)real_proxy.GetTransparentProxy ();
+		
+		RemoteDelegate1 d1 = new RemoteDelegate1 (o.Add);
+
+		IAsyncResult ar = d1.BeginInvoke (2, out res, 3, null, null);
+		MyStruct myres = d1.EndInvoke (out res, ar);
+
+		Console.WriteLine ("Result: " + myres.a + " " +
+				   myres.b + " " + myres.c +  " " + res);
+		if (myres.a != 2)
+			return 1;
+		
+		if (myres.b != 3)
+			return 2;
+		
+		if (myres.c != 5)
+			return 3;
+
+		if (res != 5)
+			return 4;
+
+		return 0;
+	}
+}
diff --git a/mono/tests/rounding.cs b/mono/tests/rounding.cs
new file mode 100644
index 00000000000..4dc273affae
--- /dev/null
+++ b/mono/tests/rounding.cs
@@ -0,0 +1,15 @@
+public class TestJit {
+
+	public static int Main() {
+		long ticks = 631502475130080000L;
+                long ticksperday = 864000000000L;
+
+                double days = (double) ticks / ticksperday;
+
+		if ((int)days != 730905)
+			return 1;
+
+		return 0;
+	}
+}
+
diff --git a/mono/tests/shift.cs b/mono/tests/shift.cs
new file mode 100644
index 00000000000..a0a145f660e
--- /dev/null
+++ b/mono/tests/shift.cs
@@ -0,0 +1,17 @@
+using System;
+                   
+class Test {
+	public static int Main () {
+		int [] n = new int [1];
+		int b = 16;
+                   
+		n [0] = 100 + (1 << (16 - b));
+		Console.WriteLine (n [0]);
+
+		if (n [0] != 101)
+			return 1;
+
+		return 0;
+	}
+}
+
diff --git a/mono/tests/static-ctor.cs b/mono/tests/static-ctor.cs
new file mode 100644
index 00000000000..cfae3d153ce
--- /dev/null
+++ b/mono/tests/static-ctor.cs
@@ -0,0 +1,33 @@
+using System;
+
+class X {
+	static X ()
+	{
+		test.global = 1;
+	}
+}
+
+class Y : X {
+}
+
+class Z : Y {
+	public Z ()
+	{
+	}
+}
+
+class test {
+	static public int global;
+	
+	static int Main ()
+	{
+		Z z = new Z ();
+		
+		if (global != 1){
+			Console.WriteLine ("Error");
+			return 1;
+		}
+		Console.WriteLine ("Ok");
+		return 0;
+	}
+}
diff --git a/mono/tests/switch-string.cs b/mono/tests/switch-string.cs
index c264d1feb66..4cc45f884df 100644
--- a/mono/tests/switch-string.cs
+++ b/mono/tests/switch-string.cs
@@ -2,21 +2,31 @@ using System;
 
 public class fall_through {
 
-	public static void Main(string[] args)
-	{
-		foreach(string str in args)
-		{
-			Console.WriteLine(str);
+	static void test (string str) {
+			Console.WriteLine("testing: '{0}', interned: {1}", str, String.IsInterned(str) != null);
 
 			switch(str)
 			{
 				case "test":
 					Console.WriteLine("passed");
-   					continue;
+   					break;
 
 				default:
 					return;
 	    		}
+	}
+	public static void Main(string[] args)
+	{
+		char[] c = {'t', 'e', 's', 't'};
+		string s = new String (c);
+		string s2 = new String (c);
+		Console.WriteLine("testing built string (interned = {0}) (equal strings: {1})", String.IsInterned(s) != null, (object)s == (object)s2);
+		test (s);
+		Console.WriteLine("after test 1 (interned = {0}) (equal strings: {1})", String.IsInterned(s) != null, (object)s == (object)s2);
+		Console.WriteLine("after test (interned = {0}) (interned2 = {1})", String.IsInterned(s) != null, String.IsInterned(s2) != null);
+		foreach(string str in args)
+		{
+			test (str);
 		}
 	}
 }
diff --git a/mono/tests/test-driver b/mono/tests/test-driver
index f64835e2905..04d5dc85586 100755
--- a/mono/tests/test-driver
+++ b/mono/tests/test-driver
@@ -11,7 +11,7 @@ $output =~ s/\.exe$/.output/;
 $| = 0;
 print "Testing $test... ";
 
-my $res = system("$interpreter $test 2>/dev/null 1>$stdout");
+my $res = system("$interpreter @ARGV $test 2>/dev/null 1>$stdout");
 
 if ($res) {
 	printf ("failed $? (%d) signal (%d).\n", $? >> 8, $? & 127);
diff --git a/mono/tests/tests-config b/mono/tests/tests-config
new file mode 100644
index 00000000000..cd893dc94db
--- /dev/null
+++ b/mono/tests/tests-config
@@ -0,0 +1,5 @@
+<configuration>
+	<dllmap dll="cygwin1.dll" target="libc.so.6" />
+	<dllmap dll="libc" target="libc.so.6" />
+</configuration>
+
diff --git a/mono/tests/thread-signal-wait.cs b/mono/tests/thread-signal-wait.cs
new file mode 100755
index 00000000000..bc182e29cab
--- /dev/null
+++ b/mono/tests/thread-signal-wait.cs
@@ -0,0 +1,83 @@
+
+using System;
+using System.Threading;
+
+public class Test {
+	static Object mon = new Object();
+	static Object reply = new Object();
+	static Object bogus = new Object();
+	
+	private void Thread_func() {
+		Console.WriteLine("thread: In a thread!");
+
+		Thread.Sleep(10000);
+
+		Console.WriteLine("thread: Waiting for mon");
+
+		Monitor.Enter(mon);
+		Monitor.Pulse(mon);
+		Console.WriteLine("thread: Pulsed mon");
+		Monitor.Exit(mon);
+
+		Thread.Sleep(10000);
+
+		Monitor.Enter(reply);
+		Console.WriteLine("thread: Got reply mutex");
+		Monitor.Pulse(reply);
+		Console.WriteLine("thread: Pulsed reply");
+		Monitor.Exit(reply);
+	}
+	
+	public static int Main () {
+		Console.WriteLine ("main: Hello, World!");
+
+		Test test = new Test();
+		Thread thr=new Thread(new ThreadStart(test.Thread_func));
+		thr.Start();
+
+		Monitor.Enter(mon);
+		Console.WriteLine("main: mon lock 1");
+
+		Monitor.Enter(mon);
+		Console.WriteLine("main: mon lock 2");
+
+		Console.WriteLine("main: Waiting for mon");
+		Monitor.Wait(mon);
+		Console.WriteLine("main: mon waited");
+		Monitor.Exit(mon);
+
+		Monitor.Enter(reply);
+		Console.WriteLine("main: reply locked");
+		Monitor.Enter(reply);
+		Console.WriteLine("main: reply locked");
+		Monitor.Enter(reply);
+		Console.WriteLine("main: reply locked");
+		Monitor.Enter(reply);
+		Console.WriteLine("main: reply locked");
+		Monitor.Wait(reply);
+		Console.WriteLine("main: reply waited");
+		Monitor.Exit(reply);
+
+		Console.WriteLine("Seeing how many locks we have...");
+		Monitor.Exit(reply);
+		Console.WriteLine("main: Exit reply");
+		Monitor.Exit(reply);
+		Console.WriteLine("main: Exit reply");
+		Monitor.Exit(reply);
+		Console.WriteLine("main: Exit reply");
+		Monitor.Exit(reply);
+		Console.WriteLine("main: Exit reply");
+		Monitor.Exit(reply);
+		Console.WriteLine("main: Exit reply");
+		Monitor.Exit(reply);
+		Console.WriteLine("main: Exit reply");
+		Monitor.Exit(reply);
+		Console.WriteLine("main: Exit reply");
+
+		Monitor.Exit(bogus);
+		Console.WriteLine("main: Exit bogus");
+		
+		return 0;
+	}
+}
+
diff --git a/mono/tests/thread4.cs b/mono/tests/thread4.cs
new file mode 100644
index 00000000000..a31d14eb8e5
--- /dev/null
+++ b/mono/tests/thread4.cs
@@ -0,0 +1,16 @@
+

+using System;

+using System.Threading;

+

+public class Test {

+	

+	public static int Main () {

+		Console.WriteLine ("Starting test\n");

+

+		Console.WriteLine("Domain name: {0}\n", Thread.GetDomain().FriendlyName);

+		Console.WriteLine("Domain id: {0}\n", Thread.GetDomainID().ToString());

+		

+		return 0;

+	}

+}

+

diff --git a/mono/tests/thread5.cs b/mono/tests/thread5.cs
new file mode 100644
index 00000000000..bc974fca47e
--- /dev/null
+++ b/mono/tests/thread5.cs
@@ -0,0 +1,24 @@
+using System;
+using System.Threading;
+
+public class MultiThreadExceptionTest {
+	public static void MyThreadStart() {
+		Console.WriteLine("{0} started", 
+				  Thread.CurrentThread.Name);
+		throw new Exception();
+	}
+	
+	public static void Main() {
+		Thread t1 = new Thread(new ThreadStart
+			(MultiThreadExceptionTest.MyThreadStart));
+		t1.Name = "Thread 1";
+		
+		Thread t2 = new Thread(new ThreadStart
+			(MultiThreadExceptionTest.MyThreadStart));
+		t2.Name = "Thread 2";
+		
+		t1.Start();
+		t2.Start();
+	}
+}
+
diff --git a/mono/tests/thread6.cs b/mono/tests/thread6.cs
new file mode 100644
index 00000000000..eb7079637e1
--- /dev/null
+++ b/mono/tests/thread6.cs
@@ -0,0 +1,74 @@
+using System;
+using System.Threading;
+
+public class MultiThreadExceptionTest {
+
+	public static int result = 0;
+	
+	public static void ThreadStart1 () {
+		Console.WriteLine("{0} started", 
+				  Thread.CurrentThread.Name);
+
+		try {
+			try {
+				int i = 0;
+				try {
+					while (true) {
+						Console.WriteLine ("Count: " + i++);
+						Thread.Sleep (100);
+					}
+				} catch (ThreadAbortException e) {
+					Console.WriteLine ("cought exception level 2 " + e.ExceptionState);
+					Console.WriteLine (e);
+					if ((string)e.ExceptionState == "STATETEST")
+						result |= 1;
+					Thread.ResetAbort ();
+					throw e;
+				}
+			} catch (ThreadAbortException e) {
+				Console.WriteLine ("cought exception level 1 " + e.ExceptionState);
+				Console.WriteLine (e);
+				if (e.ExceptionState == null)
+					result |= 2;
+			}
+		} catch (Exception e) {
+			Console.WriteLine ("cought exception level 0");
+			Console.WriteLine (e);
+			result |= 4;
+		}
+
+		try {
+			Thread.ResetAbort ();
+		} catch (System.Threading.ThreadStateException e) {
+			result |= 8;			
+		}
+		
+		Console.WriteLine ("end");
+		result |= 16;
+	}
+	
+	public static int Main() {
+		Thread t1 = new Thread(new ThreadStart
+			(MultiThreadExceptionTest.ThreadStart1));
+		t1.Name = "Thread 1";
+
+		Thread.Sleep (100);
+		
+		t1.Start();
+
+		//Thread t0 = Thread.CurrentThread;
+		//t0.Abort ();
+		
+		Thread.Sleep (200);
+		t1.Abort ("STATETEST");
+
+		t1.Join ();
+		Console.WriteLine ("Result: " + result);
+
+		if (result != 27)
+			return 1;
+
+		return 0;
+	}
+}
+
diff --git a/mono/utils/.cvsignore b/mono/utils/.cvsignore
new file mode 100644
index 00000000000..8550dbfc503
--- /dev/null
+++ b/mono/utils/.cvsignore
@@ -0,0 +1,6 @@
+Makefile
+Makefile.in
+.deps
+.libs
+*.la
+*.lo
diff --git a/mono/utils/ChangeLog b/mono/utils/ChangeLog
new file mode 100644
index 00000000000..292d5d89057
--- /dev/null
+++ b/mono/utils/ChangeLog
@@ -0,0 +1,48 @@
+
+Thu Jul 25 13:59:34 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* mono-digest.h, mono-md5.c, mono-sha1.c: MD5 and SHA1
+	implementations.
+
+Mon Jun 3 15:59:31 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* strtod.c: make __bsd_dtoa() always return malloc()ed memory.
+
+Mon Jun 3 15:42:50 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monobitset.c, monobitset.h: documentation and fixes from
+	Dennis Haney.
+
+Sat Jun 1 14:10:23 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monobitset.c: fix my screwup pointed out by Lawrence Pit
+	(loz@cable.a2000.nl).
+
+Fri May 31 15:34:18 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monobitset.c, monobitset.h: fixes. added mono_bitset_foreach().
+
+Wed May 22 12:42:06 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monobitset.c: use our own bit_nth_lsf since the glib one is buggy.
+	Add more tests. mono_bitset_find_first (set, -1) will work correctly
+	now.
+
+2002-05-09  Dietmar Maurer  <dietmar@ximian.com>
+
+	* monobitset.c: use memcmp instead of memcpy
+
+Thu May 9 17:23:17 CEST 2002 Paolo Molaro <lupus@ximian.com>
+
+	* monobitset.c, monibitset.h: bit set data structure.
+	Not included in the build yet because the jit has some symbol clashes
+	with it.
+
+Mon Mar 25 12:50:53 CET 2002 Paolo Molaro <lupus@ximian.com>
+
+	* First checkin: libmonoutils is meant to hold some utility
+	data structures and bits that are usefult to the rest of the project
+	and don't require metadata/runtime support.
+	mono-hash is a GC-safe hash table: i.e. you can store GC-allocated
+	data in it.
+
diff --git a/mono/utils/Makefile.am b/mono/utils/Makefile.am
new file mode 100644
index 00000000000..525906d7717
--- /dev/null
+++ b/mono/utils/Makefile.am
@@ -0,0 +1,21 @@
+noinst_LTLIBRARIES = libmonoutils.la
+
+INCLUDES = $(GLIB_CFLAGS) $(GMODULE_CFLAGS) -I$(top_srcdir)	-I$(top_srcdir)/mono 
+
+libmonoutils_la_SOURCES = \
+	mono-hash.c	\
+	mono-md5.c	\
+	mono-sha1.c	\
+	monobitset.c	\
+	strtod.h	\
+	strtod.c
+
+libmonoutilsincludedir = $(includedir)/mono/utils
+
+libmonoutilsinclude_HEADERS = \
+	monobitset.h	\
+	mono-digest.h	\
+	mono-hash.h
+
+EXTRA_DIST = ChangeLog
+
diff --git a/mono/utils/mono-digest.h b/mono/utils/mono-digest.h
new file mode 100644
index 00000000000..7a0cc27c877
--- /dev/null
+++ b/mono/utils/mono-digest.h
@@ -0,0 +1,62 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.  This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MD5Context structure, pass it to rpmMD5Init, call rpmMD5Update as
+ * needed on buffers full of bytes, and then call rpmMD5Final, which
+ * will fill a supplied 16-byte array with the digest.
+ */
+
+/* parts of this file are :
+ * Written March 1993 by Branko Lankester
+ * Modified June 1993 by Colin Plumb for altered md5.c.
+ * Modified October 1995 by Erik Troan for RPM
+ */
+
+
+#ifndef __MONO_DIGEST_H__
+#define __MONO_DIGEST_H__
+
+#include <glib.h>
+
+typedef struct {
+	guint32 buf[4];
+	guint32 bits[2];
+	guchar in[64];
+	gint doByteReverse;
+} MonoMD5Context;
+
+void mono_md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16]);
+
+/* use this one when speed is needed */
+/* for use in provider code only */
+void mono_md5_get_digest_from_file (const gchar *filename, guchar digest[16]);
+
+/* raw routines */
+void mono_md5_init   (MonoMD5Context *ctx);
+void mono_md5_update (MonoMD5Context *ctx, const guchar *buf, guint32 len);
+void mono_md5_final  (MonoMD5Context *ctx, guchar digest[16]);
+
+typedef struct {
+    guint32 state[5];
+    guint32 count[2];
+    unsigned char buffer[64];
+} MonoSHA1Context;
+
+void mono_sha1_get_digest (const gchar *buffer, gint buffer_size, guchar digest [20]);
+void mono_sha1_get_digest_from_file (const gchar *filename, guchar digest [20]);
+
+void mono_sha1_init   (MonoSHA1Context* context);
+void mono_sha1_update (MonoSHA1Context* context, const guchar* data, guint32 len);
+void mono_sha1_final  (MonoSHA1Context* context, unsigned char digest[20]);
+
+#endif	/* __MONO_DIGEST_H__ */
diff --git a/mono/utils/mono-hash.c b/mono/utils/mono-hash.c
new file mode 100644
index 00000000000..4dbba68f3e8
--- /dev/null
+++ b/mono/utils/mono-hash.c
@@ -0,0 +1,720 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+/* 
+ * MT safe
+ */
+
+/*
+ * Imported in mono cvs from version 1.32 of gnome cvs.
+ */
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
+#include <glib.h>
+#if HAVE_BOEHM_GC
+#include <gc/gc.h>
+#endif
+#include "mono-hash.h"
+
+#define HASH_TABLE_MIN_SIZE 11
+#define HASH_TABLE_MAX_SIZE 13845163
+
+
+typedef struct _MonoGHashNode      MonoGHashNode;
+
+struct _MonoGHashNode
+{
+  gpointer   key;
+  gpointer   value;
+  MonoGHashNode *next;
+};
+
+struct _MonoGHashTable
+{
+  gint             size;
+  gint             nnodes;
+  MonoGHashNode      **nodes;
+  GHashFunc        hash_func;
+  GEqualFunc       key_equal_func;
+  GDestroyNotify   key_destroy_func;
+  GDestroyNotify   value_destroy_func;
+};
+
+#define G_HASH_TABLE_RESIZE(hash_table)				\
+   G_STMT_START {						\
+     if ((hash_table->size >= 3 * hash_table->nnodes &&	        \
+	  hash_table->size > HASH_TABLE_MIN_SIZE) ||		\
+	 (3 * hash_table->size <= hash_table->nnodes &&	        \
+	  hash_table->size < HASH_TABLE_MAX_SIZE))		\
+	   g_hash_table_resize (hash_table);			\
+   } G_STMT_END
+
+static void		g_hash_table_resize	  (MonoGHashTable	  *hash_table);
+static MonoGHashNode**	g_hash_table_lookup_node  (MonoGHashTable     *hash_table,
+                                                   gconstpointer   key);
+static MonoGHashNode*	g_hash_node_new		  (gpointer	   key,
+                                                   gpointer        value);
+static void		g_hash_node_destroy	  (MonoGHashNode	  *hash_node,
+                                                   GDestroyNotify  key_destroy_func,
+                                                   GDestroyNotify  value_destroy_func);
+static void		g_hash_nodes_destroy	  (MonoGHashNode	  *hash_node,
+						  GDestroyNotify   key_destroy_func,
+						  GDestroyNotify   value_destroy_func);
+static guint g_hash_table_foreach_remove_or_steal (MonoGHashTable     *hash_table,
+                                                   GHRFunc	   func,
+                                                   gpointer	   user_data,
+                                                   gboolean        notify);
+
+
+G_LOCK_DEFINE_STATIC (g_hash_global);
+
+#if !HAVE_BOEHM_GC
+static GMemChunk *node_mem_chunk = NULL;
+#endif
+static MonoGHashNode *node_free_list = NULL;
+
+/**
+ * g_hash_table_new:
+ * @hash_func: a function to create a hash value from a key.
+ *   Hash values are used to determine where keys are stored within the
+ *   #GHashTable data structure. The g_direct_hash(), g_int_hash() and 
+ *   g_str_hash() functions are provided for some common types of keys. 
+ *   If hash_func is %NULL, g_direct_hash() is used.
+ * @key_equal_func: a function to check two keys for equality.  This is
+ *   used when looking up keys in the #GHashTable.  The g_direct_equal(),
+ *   g_int_equal() and g_str_equal() functions are provided for the most
+ *   common types of keys. If @key_equal_func is %NULL, keys are compared
+ *   directly in a similar fashion to g_direct_equal(), but without the
+ *   overhead of a function call.
+ *
+ * Creates a new #GHashTable.
+ * 
+ * Return value: a new #GHashTable.
+ **/
+MonoGHashTable*
+mono_g_hash_table_new (GHashFunc    hash_func,
+		  GEqualFunc   key_equal_func)
+{
+  return mono_g_hash_table_new_full (hash_func, key_equal_func, NULL, NULL);
+}
+
+
+/**
+ * g_hash_table_new_full:
+ * @hash_func: a function to create a hash value from a key.
+ * @key_equal_func: a function to check two keys for equality.
+ * @key_destroy_func: a function to free the memory allocated for the key 
+ *   used when removing the entry from the #GHashTable or %NULL if you 
+ *   don't want to supply such a function.
+ * @value_destroy_func: a function to free the memory allocated for the 
+ *   value used when removing the entry from the #GHashTable or %NULL if 
+ *   you don't want to supply such a function.
+ * 
+ * Creates a new #GHashTable like g_hash_table_new() and allows to specify
+ * functions to free the memory allocated for the key and value that get 
+ * called when removing the entry from the #GHashTable.
+ * 
+ * Return value: a new #GHashTable.
+ **/
+MonoGHashTable*
+mono_g_hash_table_new_full (GHashFunc       hash_func,
+		       GEqualFunc      key_equal_func,
+		       GDestroyNotify  key_destroy_func,
+		       GDestroyNotify  value_destroy_func)
+{
+  MonoGHashTable *hash_table;
+  
+#if HAVE_BOEHM_GC
+  hash_table = GC_malloc (sizeof (MonoGHashTable));
+#else
+  hash_table = g_new (MonoGHashTable, 1);
+#endif
+  hash_table->size               = HASH_TABLE_MIN_SIZE;
+  hash_table->nnodes             = 0;
+  hash_table->hash_func          = hash_func ? hash_func : g_direct_hash;
+  hash_table->key_equal_func     = key_equal_func;
+  hash_table->key_destroy_func   = key_destroy_func;
+  hash_table->value_destroy_func = value_destroy_func;
+#if HAVE_BOEHM_GC
+  hash_table->nodes              = GC_malloc (sizeof (MonoGHashNode*) * hash_table->size);
+#else
+  hash_table->nodes              = g_new0 (MonoGHashNode*, hash_table->size);
+#endif
+  
+  return hash_table;
+}
+
+/**
+ * g_hash_table_destroy:
+ * @hash_table: a #GHashTable.
+ * 
+ * Destroys the #GHashTable. If keys and/or values are dynamically 
+ * allocated, you should either free them first or create the #GHashTable
+ * using g_hash_table_new_full(). In the latter case the destroy functions 
+ * you supplied will be called on all keys and values before destroying 
+ * the #GHashTable.
+ **/
+void
+mono_g_hash_table_destroy (MonoGHashTable *hash_table)
+{
+  guint i;
+  
+  g_return_if_fail (hash_table != NULL);
+  
+  for (i = 0; i < hash_table->size; i++)
+    g_hash_nodes_destroy (hash_table->nodes[i], 
+			  hash_table->key_destroy_func,
+			  hash_table->value_destroy_func);
+
+#if HAVE_BOEHM_GC
+#else
+  g_free (hash_table->nodes);
+  g_free (hash_table);
+#endif
+}
+
+static inline MonoGHashNode**
+g_hash_table_lookup_node (MonoGHashTable	*hash_table,
+			  gconstpointer	 key)
+{
+  MonoGHashNode **node;
+  
+  node = &hash_table->nodes
+    [(* hash_table->hash_func) (key) % hash_table->size];
+  
+  /* Hash table lookup needs to be fast.
+   *  We therefore remove the extra conditional of testing
+   *  whether to call the key_equal_func or not from
+   *  the inner loop.
+   */
+  if (hash_table->key_equal_func)
+    while (*node && !(*hash_table->key_equal_func) ((*node)->key, key))
+      node = &(*node)->next;
+  else
+    while (*node && (*node)->key != key)
+      node = &(*node)->next;
+  
+  return node;
+}
+
+/**
+ * g_hash_table_lookup:
+ * @hash_table: a #GHashTable.
+ * @key: the key to look up.
+ * 
+ * Looks up a key in a #GHashTable.
+ * 
+ * Return value: the associated value, or %NULL if the key is not found.
+ **/
+gpointer
+mono_g_hash_table_lookup (MonoGHashTable	  *hash_table,
+		     gconstpointer key)
+{
+  MonoGHashNode *node;
+  
+  g_return_val_if_fail (hash_table != NULL, NULL);
+  
+  node = *g_hash_table_lookup_node (hash_table, key);
+  
+  return node ? node->value : NULL;
+}
+
+/**
+ * g_hash_table_lookup_extended:
+ * @hash_table: a #GHashTable.
+ * @lookup_key: the key to look up.
+ * @orig_key: returns the original key.
+ * @value: returns the value associated with the key.
+ * 
+ * Looks up a key in the #GHashTable, returning the original key and the
+ * associated value and a #gboolean which is %TRUE if the key was found. This 
+ * is useful if you need to free the memory allocated for the original key, 
+ * for example before calling g_hash_table_remove().
+ * 
+ * Return value: %TRUE if the key was found in the #GHashTable.
+ **/
+gboolean
+mono_g_hash_table_lookup_extended (MonoGHashTable    *hash_table,
+			      gconstpointer  lookup_key,
+			      gpointer	    *orig_key,
+			      gpointer	    *value)
+{
+  MonoGHashNode *node;
+  
+  g_return_val_if_fail (hash_table != NULL, FALSE);
+  
+  node = *g_hash_table_lookup_node (hash_table, lookup_key);
+  
+  if (node)
+    {
+      if (orig_key)
+	*orig_key = node->key;
+      if (value)
+	*value = node->value;
+      return TRUE;
+    }
+  else
+    return FALSE;
+}
+
+/**
+ * g_hash_table_insert:
+ * @hash_table: a #GHashTable.
+ * @key: a key to insert.
+ * @value: the value to associate with the key.
+ * 
+ * Inserts a new key and value into a #GHashTable.
+ * 
+ * If the key already exists in the #GHashTable its current value is replaced
+ * with the new value. If you supplied a @value_destroy_func when creating the 
+ * #GHashTable, the old value is freed using that function. If you supplied
+ * a @key_destroy_func when creating the #GHashTable, the passed key is freed 
+ * using that function.
+ **/
+void
+mono_g_hash_table_insert (MonoGHashTable *hash_table,
+		     gpointer	 key,
+		     gpointer	 value)
+{
+  MonoGHashNode **node;
+  
+  g_return_if_fail (hash_table != NULL);
+  
+  node = g_hash_table_lookup_node (hash_table, key);
+  
+  if (*node)
+    {
+      /* do not reset node->key in this place, keeping
+       * the old key is the intended behaviour. 
+       * g_hash_table_replace() can be used instead.
+       */
+
+      /* free the passed key */
+      if (hash_table->key_destroy_func)
+	hash_table->key_destroy_func (key);
+      
+      if (hash_table->value_destroy_func)
+	hash_table->value_destroy_func ((*node)->value);
+
+      (*node)->value = value;
+    }
+  else
+    {
+      *node = g_hash_node_new (key, value);
+      hash_table->nnodes++;
+      G_HASH_TABLE_RESIZE (hash_table);
+    }
+}
+
+/**
+ * g_hash_table_replace:
+ * @hash_table: a #GHashTable.
+ * @key: a key to insert.
+ * @value: the value to associate with the key.
+ * 
+ * Inserts a new key and value into a #GHashTable similar to 
+ * g_hash_table_insert(). The difference is that if the key already exists 
+ * in the #GHashTable, it gets replaced by the new key. If you supplied a 
+ * @value_destroy_func when creating the #GHashTable, the old value is freed 
+ * using that function. If you supplied a @key_destroy_func when creating the 
+ * #GHashTable, the old key is freed using that function. 
+ **/
+void
+mono_g_hash_table_replace (MonoGHashTable *hash_table,
+		      gpointer	  key,
+		      gpointer	  value)
+{
+  MonoGHashNode **node;
+  
+  g_return_if_fail (hash_table != NULL);
+  
+  node = g_hash_table_lookup_node (hash_table, key);
+  
+  if (*node)
+    {
+      if (hash_table->key_destroy_func)
+	hash_table->key_destroy_func ((*node)->key);
+      
+      if (hash_table->value_destroy_func)
+	hash_table->value_destroy_func ((*node)->value);
+
+      (*node)->key   = key;
+      (*node)->value = value;
+    }
+  else
+    {
+      *node = g_hash_node_new (key, value);
+      hash_table->nnodes++;
+      G_HASH_TABLE_RESIZE (hash_table);
+    }
+}
+
+/**
+ * g_hash_table_remove:
+ * @hash_table: a #GHashTable.
+ * @key: the key to remove.
+ * 
+ * Removes a key and its associated value from a #GHashTable.
+ *
+ * If the #GHashTable was created using g_hash_table_new_full(), the
+ * key and value are freed using the supplied destroy functions, otherwise
+ * you have to make sure that any dynamically allocated values are freed 
+ * yourself.
+ * 
+ * Return value: %TRUE if the key was found and removed from the #GHashTable.
+ **/
+gboolean
+mono_g_hash_table_remove (MonoGHashTable	   *hash_table,
+		     gconstpointer  key)
+{
+  MonoGHashNode **node, *dest;
+  
+  g_return_val_if_fail (hash_table != NULL, FALSE);
+  
+  node = g_hash_table_lookup_node (hash_table, key);
+  if (*node)
+    {
+      dest = *node;
+      (*node) = dest->next;
+      g_hash_node_destroy (dest, 
+			   hash_table->key_destroy_func,
+			   hash_table->value_destroy_func);
+      hash_table->nnodes--;
+  
+      G_HASH_TABLE_RESIZE (hash_table);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/**
+ * g_hash_table_steal:
+ * @hash_table: a #GHashTable.
+ * @key: the key to remove.
+ * 
+ * Removes a key and its associated value from a #GHashTable without
+ * calling the key and value destroy functions.
+ *
+ * Return value: %TRUE if the key was found and removed from the #GHashTable.
+ **/
+gboolean
+mono_g_hash_table_steal (MonoGHashTable    *hash_table,
+                    gconstpointer  key)
+{
+  MonoGHashNode **node, *dest;
+  
+  g_return_val_if_fail (hash_table != NULL, FALSE);
+  
+  node = g_hash_table_lookup_node (hash_table, key);
+  if (*node)
+    {
+      dest = *node;
+      (*node) = dest->next;
+      g_hash_node_destroy (dest, NULL, NULL);
+      hash_table->nnodes--;
+  
+      G_HASH_TABLE_RESIZE (hash_table);
+
+      return TRUE;
+    }
+
+  return FALSE;
+}
+
+/**
+ * g_hash_table_foreach_remove:
+ * @hash_table: a #GHashTable.
+ * @func: the function to call for each key/value pair.
+ * @user_data: user data to pass to the function.
+ * 
+ * Calls the given function for each key/value pair in the #GHashTable.
+ * If the function returns %TRUE, then the key/value pair is removed from the
+ * #GHashTable. If you supplied key or value destroy functions when creating
+ * the #GHashTable, they are used to free the memory allocated for the removed
+ * keys and values.
+ * 
+ * Return value: the number of key/value pairs removed.
+ **/
+guint
+mono_g_hash_table_foreach_remove (MonoGHashTable	*hash_table,
+			     GHRFunc	 func,
+			     gpointer	 user_data)
+{
+  g_return_val_if_fail (hash_table != NULL, 0);
+  g_return_val_if_fail (func != NULL, 0);
+  
+  return g_hash_table_foreach_remove_or_steal (hash_table, func, user_data, TRUE);
+}
+
+/**
+ * g_hash_table_foreach_steal:
+ * @hash_table: a #GHashTable.
+ * @func: the function to call for each key/value pair.
+ * @user_data: user data to pass to the function.
+ * 
+ * Calls the given function for each key/value pair in the #GHashTable.
+ * If the function returns %TRUE, then the key/value pair is removed from the
+ * #GHashTable, but no key or value destroy functions are called.
+ * 
+ * Return value: the number of key/value pairs removed.
+ **/
+guint
+mono_g_hash_table_foreach_steal (MonoGHashTable *hash_table,
+                            GHRFunc	func,
+                            gpointer	user_data)
+{
+  g_return_val_if_fail (hash_table != NULL, 0);
+  g_return_val_if_fail (func != NULL, 0);
+  
+  return g_hash_table_foreach_remove_or_steal (hash_table, func, user_data, FALSE);
+}
+
+static guint
+g_hash_table_foreach_remove_or_steal (MonoGHashTable *hash_table,
+                                      GHRFunc	  func,
+                                      gpointer	  user_data,
+                                      gboolean    notify)
+{
+  MonoGHashNode *node, *prev;
+  guint i;
+  guint deleted = 0;
+  
+  for (i = 0; i < hash_table->size; i++)
+    {
+    restart:
+      
+      prev = NULL;
+      
+      for (node = hash_table->nodes[i]; node; prev = node, node = node->next)
+	{
+	  if ((* func) (node->key, node->value, user_data))
+	    {
+	      deleted += 1;
+	      
+	      hash_table->nnodes -= 1;
+	      
+	      if (prev)
+		{
+		  prev->next = node->next;
+		  g_hash_node_destroy (node,
+				       notify ? hash_table->key_destroy_func : NULL,
+				       notify ? hash_table->value_destroy_func : NULL);
+		  node = prev;
+		}
+	      else
+		{
+		  hash_table->nodes[i] = node->next;
+		  g_hash_node_destroy (node,
+				       notify ? hash_table->key_destroy_func : NULL,
+				       notify ? hash_table->value_destroy_func : NULL);
+		  goto restart;
+		}
+	    }
+	}
+    }
+  
+  G_HASH_TABLE_RESIZE (hash_table);
+  
+  return deleted;
+}
+
+/**
+ * g_hash_table_foreach:
+ * @hash_table: a #GHashTable.
+ * @func: the function to call for each key/value pair.
+ * @user_data: user data to pass to the function.
+ * 
+ * Calls the given function for each of the key/value pairs in the
+ * #GHashTable.  The function is passed the key and value of each
+ * pair, and the given @user_data parameter.  The hash table may not
+ * be modified while iterating over it (you can't add/remove
+ * items). To remove all items matching a predicate, use
+ * g_hash_table_remove().
+ **/
+void
+mono_g_hash_table_foreach (MonoGHashTable *hash_table,
+		      GHFunc	  func,
+		      gpointer	  user_data)
+{
+  MonoGHashNode *node;
+  gint i;
+  
+  g_return_if_fail (hash_table != NULL);
+  g_return_if_fail (func != NULL);
+  
+  for (i = 0; i < hash_table->size; i++)
+    for (node = hash_table->nodes[i]; node; node = node->next)
+      (* func) (node->key, node->value, user_data);
+}
+
+/**
+ * g_hash_table_size:
+ * @hash_table: a #GHashTable.
+ * 
+ * Returns the number of elements contained in the #GHashTable.
+ * 
+ * Return value: the number of key/value pairs in the #GHashTable.
+ **/
+guint
+mono_g_hash_table_size (MonoGHashTable *hash_table)
+{
+  g_return_val_if_fail (hash_table != NULL, 0);
+  
+  return hash_table->nnodes;
+}
+
+static void
+g_hash_table_resize (MonoGHashTable *hash_table)
+{
+  MonoGHashNode **new_nodes;
+  MonoGHashNode *node;
+  MonoGHashNode *next;
+  guint hash_val;
+  gint new_size;
+  gint i;
+
+  new_size = g_spaced_primes_closest (hash_table->nnodes);
+  new_size = CLAMP (new_size, HASH_TABLE_MIN_SIZE, HASH_TABLE_MAX_SIZE);
+ 
+#if HAVE_BOEHM_GC
+  new_nodes              = GC_malloc (sizeof (MonoGHashNode*) * new_size);
+#else
+  new_nodes              = g_new0 (MonoGHashNode*, new_size);
+#endif
+  
+  for (i = 0; i < hash_table->size; i++)
+    for (node = hash_table->nodes[i]; node; node = next)
+      {
+	next = node->next;
+
+	hash_val = (* hash_table->hash_func) (node->key) % new_size;
+
+	node->next = new_nodes[hash_val];
+	new_nodes[hash_val] = node;
+      }
+  
+#if HAVE_BOEHM_GC
+#else
+  g_free (hash_table->nodes);
+#endif
+  hash_table->nodes = new_nodes;
+  hash_table->size = new_size;
+}
+
+static MonoGHashNode*
+g_hash_node_new (gpointer key,
+		 gpointer value)
+{
+  MonoGHashNode *hash_node;
+  
+  G_LOCK (g_hash_global);
+  if (node_free_list)
+    {
+      hash_node = node_free_list;
+      node_free_list = node_free_list->next;
+    }
+  else
+    {
+#if HAVE_BOEHM_GC
+      hash_node = GC_malloc (sizeof (MonoGHashNode));
+#else
+      if (!node_mem_chunk)
+	node_mem_chunk = g_mem_chunk_new ("hash node mem chunk",
+					  sizeof (MonoGHashNode),
+					  1024, G_ALLOC_ONLY);
+      
+      hash_node = g_chunk_new (MonoGHashNode, node_mem_chunk);
+#endif
+    }
+  G_UNLOCK (g_hash_global);
+  
+  hash_node->key = key;
+  hash_node->value = value;
+  hash_node->next = NULL;
+  
+  return hash_node;
+}
+
+static void
+g_hash_node_destroy (MonoGHashNode      *hash_node,
+		     GDestroyNotify  key_destroy_func,
+		     GDestroyNotify  value_destroy_func)
+{
+  if (key_destroy_func)
+    key_destroy_func (hash_node->key);
+  if (value_destroy_func)
+    value_destroy_func (hash_node->value);
+  
+  hash_node->key = NULL;
+  hash_node->value = NULL;
+
+  G_LOCK (g_hash_global);
+  hash_node->next = node_free_list;
+  node_free_list = hash_node;
+  G_UNLOCK (g_hash_global);
+}
+
+static void
+g_hash_nodes_destroy (MonoGHashNode *hash_node,
+		      GFreeFunc  key_destroy_func,
+		      GFreeFunc  value_destroy_func)
+{
+  if (hash_node)
+    {
+      MonoGHashNode *node = hash_node;
+  
+      while (node->next)
+	{
+	  if (key_destroy_func)
+	    key_destroy_func (node->key);
+	  if (value_destroy_func)
+	    value_destroy_func (node->value);
+
+	  node->key = NULL;
+	  node->value = NULL;
+
+	  node = node->next;
+	}
+
+  if (key_destroy_func)
+    key_destroy_func (node->key);
+  if (value_destroy_func)
+    value_destroy_func (node->value);
+
+      node->key = NULL;
+      node->value = NULL;
+ 
+      G_LOCK (g_hash_global);
+      node->next = node_free_list;
+      node_free_list = hash_node;
+      G_UNLOCK (g_hash_global);
+    }
+}
diff --git a/mono/utils/mono-hash.h b/mono/utils/mono-hash.h
new file mode 100644
index 00000000000..c76f7ca2620
--- /dev/null
+++ b/mono/utils/mono-hash.h
@@ -0,0 +1,81 @@
+/* GLIB - Library of useful routines for C programming
+ * Copyright (C) 1995-1997  Peter Mattis, Spencer Kimball and Josh MacDonald
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ */
+
+/*
+ * Modified by the GLib Team and others 1997-2000.  See the AUTHORS
+ * file for a list of people on the GLib Team.  See the ChangeLog
+ * files for a list of changes.  These files are distributed with
+ * GLib at ftp://ftp.gtk.org/pub/gtk/. 
+ */
+
+#ifndef __MONO_G_HASH_H__
+#define __MONO_G_HASH_H__
+
+/*
+ * Imported in mono cvs from version 1.7 of gnome cvs.
+ * This hash table is GC friendly and the pointers stored in it
+ * are tracked by the garbage collector.
+ */
+
+#include <glib.h>
+
+G_BEGIN_DECLS
+
+typedef struct _MonoGHashTable  MonoGHashTable;
+
+/* Hash tables
+ */
+MonoGHashTable* mono_g_hash_table_new		   (GHashFunc	    hash_func,
+					    GEqualFunc	    key_equal_func);
+MonoGHashTable* mono_g_hash_table_new_full      	   (GHashFunc	    hash_func,
+					    GEqualFunc	    key_equal_func,
+					    GDestroyNotify  key_destroy_func,
+					    GDestroyNotify  value_destroy_func);
+void	    mono_g_hash_table_destroy	   (MonoGHashTable	   *hash_table);
+void	    mono_g_hash_table_insert		   (MonoGHashTable	   *hash_table,
+					    gpointer	    key,
+					    gpointer	    value);
+void        mono_g_hash_table_replace           (MonoGHashTable     *hash_table,
+					    gpointer	    key,
+					    gpointer	    value);
+gboolean    mono_g_hash_table_remove		   (MonoGHashTable	   *hash_table,
+					    gconstpointer   key);
+gboolean    mono_g_hash_table_steal             (MonoGHashTable     *hash_table,
+					    gconstpointer   key);
+gpointer    mono_g_hash_table_lookup		   (MonoGHashTable	   *hash_table,
+					    gconstpointer   key);
+gboolean    mono_g_hash_table_lookup_extended   (MonoGHashTable	   *hash_table,
+					    gconstpointer   lookup_key,
+					    gpointer	   *orig_key,
+					    gpointer	   *value);
+void	    mono_g_hash_table_foreach	   (MonoGHashTable	   *hash_table,
+					    GHFunc	    func,
+					    gpointer	    user_data);
+guint	    mono_g_hash_table_foreach_remove	   (MonoGHashTable	   *hash_table,
+					    GHRFunc	    func,
+					    gpointer	    user_data);
+guint	    mono_g_hash_table_foreach_steal	   (MonoGHashTable	   *hash_table,
+					    GHRFunc	    func,
+					    gpointer	    user_data);
+guint	    mono_g_hash_table_size		   (MonoGHashTable	   *hash_table);
+
+G_END_DECLS
+
+#endif /* __MONO_G_HASH_H__ */
+
diff --git a/mono/utils/mono-md5.c b/mono/utils/mono-md5.c
new file mode 100644
index 00000000000..28adc408fd8
--- /dev/null
+++ b/mono/utils/mono-md5.c
@@ -0,0 +1,357 @@
+/* -*- Mode: C; tab-width: 8; indent-tabs-mode: t; c-basic-offset: 8 -*- */
+/*
+ * This code implements the MD5 message-digest algorithm.
+ * The algorithm is due to Ron Rivest.  This code was
+ * written by Colin Plumb in 1993, no copyright is claimed.
+ * This code is in the public domain; do with it what you wish.
+ *
+ * Equivalent code is available from RSA Data Security, Inc.
+ * This code has been tested against that, and is equivalent,
+ * except that you don't need to include two pages of legalese
+ * with every copy.
+ *
+ * To compute the message digest of a chunk of bytes, declare an
+ * MonoMD5Context structure, pass it to mono_md5_init, call mono_md5_update as
+ * needed on buffers full of bytes, and then call md5_Final, which
+ * will fill a supplied 16-byte array with the digest.
+ */
+
+/* parts of this file are :
+ * Written March 1993 by Branko Lankester
+ * Modified June 1993 by Colin Plumb for altered md5.c.
+ * Modified October 1995 by Erik Troan for RPM
+ */
+
+
+#include <stdio.h>
+#include <string.h>
+#include "mono-digest.h"
+
+static void md5_transform (guint32 buf[4], const guint32 in[16]);
+
+static gint _ie = 0x44332211;
+static union _endian { gint i; gchar b[4]; } *_endian = (union _endian *)&_ie;
+#define	IS_BIG_ENDIAN()		(_endian->b[0] == '\x44')
+#define	IS_LITTLE_ENDIAN()	(_endian->b[0] == '\x11')
+
+
+/*
+ * Note: this code is harmless on little-endian machines.
+ */
+static void 
+_byte_reverse (guchar *buf, guint32 longs)
+{
+	guint32 t;
+	do {
+		t = (guint32) ((guint32) buf[3] << 8 | buf[2]) << 16 |
+			((guint32) buf[1] << 8 | buf[0]);
+		*(guint32 *) buf = t;
+		buf += 4;
+	} while (--longs);
+}
+
+/**
+ * mono_md5_init: Initialise an md5 context object
+ * @ctx: md5 context 
+ * 
+ * Initialise an md5 buffer. 
+ *
+ **/
+void 
+mono_md5_init (MonoMD5Context *ctx)
+{
+	ctx->buf[0] = 0x67452301;
+	ctx->buf[1] = 0xefcdab89;
+	ctx->buf[2] = 0x98badcfe;
+	ctx->buf[3] = 0x10325476;
+	
+	ctx->bits[0] = 0;
+	ctx->bits[1] = 0;
+	
+	if (IS_BIG_ENDIAN())	
+		ctx->doByteReverse = 1;		
+	else 
+		ctx->doByteReverse = 0;	
+}
+
+
+
+/**
+ * mono_md5_update: add a buffer to md5 hash computation
+ * @ctx: conetxt object used for md5 computaion
+ * @buf: buffer to add
+ * @len: buffer length
+ * 
+ * Update context to reflect the concatenation of another buffer full
+ * of bytes. Use this to progressively construct an md5 hash.
+ **/
+void 
+mono_md5_update (MonoMD5Context *ctx, const guchar *buf, guint32 len)
+{
+	guint32 t;
+	
+	/* Update bitcount */
+	
+	t = ctx->bits[0];
+	if ((ctx->bits[0] = t + ((guint32) len << 3)) < t)
+		ctx->bits[1]++;		/* Carry from low to high */
+	ctx->bits[1] += len >> 29;
+	
+	t = (t >> 3) & 0x3f;	/* Bytes already in shsInfo->data */
+	
+	/* Handle any leading odd-sized chunks */
+	
+	if (t) {
+		guchar *p = (guchar *) ctx->in + t;
+		
+		t = 64 - t;
+		if (len < t) {
+			memcpy (p, buf, len);
+			return;
+		}
+		memcpy (p, buf, t);
+		if (ctx->doByteReverse)
+			_byte_reverse (ctx->in, 16);
+		md5_transform (ctx->buf, (guint32 *) ctx->in);
+		buf += t;
+		len -= t;
+	}
+	/* Process data in 64-byte chunks */
+	
+	while (len >= 64) {
+		memcpy (ctx->in, buf, 64);
+		if (ctx->doByteReverse)
+			_byte_reverse (ctx->in, 16);
+		md5_transform (ctx->buf, (guint32 *) ctx->in);
+		buf += 64;
+		len -= 64;
+	}
+	
+	/* Handle any remaining bytes of data. */
+	
+	memcpy (ctx->in, buf, len);
+}
+
+
+
+
+
+/*
+ * Final wrapup - pad to 64-byte boundary with the bit pattern 
+ * 1 0* (64-bit count of bits processed, MSB-first)
+ */
+/**
+ * mono_md5_final: copy the final md5 hash to a bufer
+ * @digest: 16 bytes buffer
+ * @ctx: context containing the calculated md5
+ * 
+ * copy the final md5 hash to a bufer
+ **/
+void 
+mono_md5_final (MonoMD5Context *ctx, guchar digest[16])
+{
+	guint32 count;
+	guchar *p;
+	
+	/* Compute number of bytes mod 64 */
+	count = (ctx->bits[0] >> 3) & 0x3F;
+	
+	/* Set the first char of padding to 0x80.  This is safe since there is
+	   always at least one byte free */
+	p = ctx->in + count;
+	*p++ = 0x80;
+	
+	/* Bytes of padding needed to make 64 bytes */
+	count = 64 - 1 - count;
+	
+	/* Pad out to 56 mod 64 */
+	if (count < 8) {
+		/* Two lots of padding:  Pad the first block to 64 bytes */
+		memset (p, 0, count);
+		if (ctx->doByteReverse)
+			_byte_reverse (ctx->in, 16);
+		md5_transform (ctx->buf, (guint32 *) ctx->in);
+		
+		/* Now fill the next block with 56 bytes */
+		memset (ctx->in, 0, 56);
+	} else {
+		/* Pad block to 56 bytes */
+		memset (p, 0, count - 8);
+	}
+	if (ctx->doByteReverse)
+		_byte_reverse (ctx->in, 14);
+	
+	/* Append length in bits and transform */
+	((guint32 *) ctx->in)[14] = ctx->bits[0];
+	((guint32 *) ctx->in)[15] = ctx->bits[1];
+	
+	md5_transform (ctx->buf, (guint32 *) ctx->in);
+	if (ctx->doByteReverse)
+		_byte_reverse ((guchar *) ctx->buf, 4);
+	memcpy (digest, ctx->buf, 16);
+}
+
+
+
+
+/* The four core functions - F1 is optimized somewhat */
+
+/* #define F1(x, y, z) (x & y | ~x & z) */
+#define F1(x, y, z) (z ^ (x & (y ^ z)))
+#define F2(x, y, z) F1(z, x, y)
+#define F3(x, y, z) (x ^ y ^ z)
+#define F4(x, y, z) (y ^ (x | ~z))
+
+/* This is the central step in the MD5 algorithm. */
+#define MD5STEP(f, w, x, y, z, data, s) \
+	( w += f(x, y, z) + data,  w = w<<s | w>>(32-s),  w += x )
+
+/*
+ * The core of the MD5 algorithm, this alters an existing MD5 hash to
+ * reflect the addition of 16 longwords of new data.  md5_Update blocks
+ * the data and converts bytes into longwords for this routine.
+ */
+static void 
+md5_transform (guint32 buf[4], const guint32 in[16])
+{
+	register guint32 a, b, c, d;
+	
+	a = buf[0];
+	b = buf[1];
+	c = buf[2];
+	d = buf[3];
+	
+	MD5STEP (F1, a, b, c, d, in[0] + 0xd76aa478, 7);
+	MD5STEP (F1, d, a, b, c, in[1] + 0xe8c7b756, 12);
+	MD5STEP (F1, c, d, a, b, in[2] + 0x242070db, 17);
+	MD5STEP (F1, b, c, d, a, in[3] + 0xc1bdceee, 22);
+	MD5STEP (F1, a, b, c, d, in[4] + 0xf57c0faf, 7);
+	MD5STEP (F1, d, a, b, c, in[5] + 0x4787c62a, 12);
+	MD5STEP (F1, c, d, a, b, in[6] + 0xa8304613, 17);
+	MD5STEP (F1, b, c, d, a, in[7] + 0xfd469501, 22);
+	MD5STEP (F1, a, b, c, d, in[8] + 0x698098d8, 7);
+	MD5STEP (F1, d, a, b, c, in[9] + 0x8b44f7af, 12);
+	MD5STEP (F1, c, d, a, b, in[10] + 0xffff5bb1, 17);
+	MD5STEP (F1, b, c, d, a, in[11] + 0x895cd7be, 22);
+	MD5STEP (F1, a, b, c, d, in[12] + 0x6b901122, 7);
+	MD5STEP (F1, d, a, b, c, in[13] + 0xfd987193, 12);
+	MD5STEP (F1, c, d, a, b, in[14] + 0xa679438e, 17);
+	MD5STEP (F1, b, c, d, a, in[15] + 0x49b40821, 22);
+	
+	MD5STEP (F2, a, b, c, d, in[1] + 0xf61e2562, 5);
+	MD5STEP (F2, d, a, b, c, in[6] + 0xc040b340, 9);
+	MD5STEP (F2, c, d, a, b, in[11] + 0x265e5a51, 14);
+	MD5STEP (F2, b, c, d, a, in[0] + 0xe9b6c7aa, 20);
+	MD5STEP (F2, a, b, c, d, in[5] + 0xd62f105d, 5);
+	MD5STEP (F2, d, a, b, c, in[10] + 0x02441453, 9);
+	MD5STEP (F2, c, d, a, b, in[15] + 0xd8a1e681, 14);
+	MD5STEP (F2, b, c, d, a, in[4] + 0xe7d3fbc8, 20);
+	MD5STEP (F2, a, b, c, d, in[9] + 0x21e1cde6, 5);
+	MD5STEP (F2, d, a, b, c, in[14] + 0xc33707d6, 9);
+	MD5STEP (F2, c, d, a, b, in[3] + 0xf4d50d87, 14);
+	MD5STEP (F2, b, c, d, a, in[8] + 0x455a14ed, 20);
+	MD5STEP (F2, a, b, c, d, in[13] + 0xa9e3e905, 5);
+	MD5STEP (F2, d, a, b, c, in[2] + 0xfcefa3f8, 9);
+	MD5STEP (F2, c, d, a, b, in[7] + 0x676f02d9, 14);
+	MD5STEP (F2, b, c, d, a, in[12] + 0x8d2a4c8a, 20);
+	
+	MD5STEP (F3, a, b, c, d, in[5] + 0xfffa3942, 4);
+	MD5STEP (F3, d, a, b, c, in[8] + 0x8771f681, 11);
+	MD5STEP (F3, c, d, a, b, in[11] + 0x6d9d6122, 16);
+	MD5STEP (F3, b, c, d, a, in[14] + 0xfde5380c, 23);
+	MD5STEP (F3, a, b, c, d, in[1] + 0xa4beea44, 4);
+	MD5STEP (F3, d, a, b, c, in[4] + 0x4bdecfa9, 11);
+	MD5STEP (F3, c, d, a, b, in[7] + 0xf6bb4b60, 16);
+	MD5STEP (F3, b, c, d, a, in[10] + 0xbebfbc70, 23);
+	MD5STEP (F3, a, b, c, d, in[13] + 0x289b7ec6, 4);
+	MD5STEP (F3, d, a, b, c, in[0] + 0xeaa127fa, 11);
+	MD5STEP (F3, c, d, a, b, in[3] + 0xd4ef3085, 16);
+	MD5STEP (F3, b, c, d, a, in[6] + 0x04881d05, 23);
+	MD5STEP (F3, a, b, c, d, in[9] + 0xd9d4d039, 4);
+	MD5STEP (F3, d, a, b, c, in[12] + 0xe6db99e5, 11);
+	MD5STEP (F3, c, d, a, b, in[15] + 0x1fa27cf8, 16);
+	MD5STEP (F3, b, c, d, a, in[2] + 0xc4ac5665, 23);
+	
+	MD5STEP (F4, a, b, c, d, in[0] + 0xf4292244, 6);
+	MD5STEP (F4, d, a, b, c, in[7] + 0x432aff97, 10);
+	MD5STEP (F4, c, d, a, b, in[14] + 0xab9423a7, 15);
+	MD5STEP (F4, b, c, d, a, in[5] + 0xfc93a039, 21);
+	MD5STEP (F4, a, b, c, d, in[12] + 0x655b59c3, 6);
+	MD5STEP (F4, d, a, b, c, in[3] + 0x8f0ccc92, 10);
+	MD5STEP (F4, c, d, a, b, in[10] + 0xffeff47d, 15);
+	MD5STEP (F4, b, c, d, a, in[1] + 0x85845dd1, 21);
+	MD5STEP (F4, a, b, c, d, in[8] + 0x6fa87e4f, 6);
+	MD5STEP (F4, d, a, b, c, in[15] + 0xfe2ce6e0, 10);
+	MD5STEP (F4, c, d, a, b, in[6] + 0xa3014314, 15);
+	MD5STEP (F4, b, c, d, a, in[13] + 0x4e0811a1, 21);
+	MD5STEP (F4, a, b, c, d, in[4] + 0xf7537e82, 6);
+	MD5STEP (F4, d, a, b, c, in[11] + 0xbd3af235, 10);
+	MD5STEP (F4, c, d, a, b, in[2] + 0x2ad7d2bb, 15);
+	MD5STEP (F4, b, c, d, a, in[9] + 0xeb86d391, 21);
+	
+	buf[0] += a;
+	buf[1] += b;
+	buf[2] += c;
+	buf[3] += d;
+}
+
+
+
+
+/**
+ * mono_md5_get_digest: get the md5 hash of a buffer
+ * @buffer: byte buffer
+ * @buffer_size: buffer size (in bytes)
+ * @digest: 16 bytes buffer receiving the hash code.
+ * 
+ * Get the md5 hash of a buffer. The result is put in 
+ * the 16 bytes buffer @digest .
+ **/
+void
+mono_md5_get_digest (const gchar *buffer, gint buffer_size, guchar digest[16])
+{	
+	MonoMD5Context ctx;
+
+	mono_md5_init (&ctx);
+	mono_md5_update (&ctx, buffer, buffer_size);
+	mono_md5_final (&ctx, digest);
+	
+}
+
+
+/**
+ * mono_md5_get_digest_from_file: get the md5 hash of a file
+ * @filename: file name
+ * @digest: 16 bytes buffer receiving the hash code.
+ * 
+ * Get the md5 hash of a file. The result is put in 
+ * the 16 bytes buffer @digest .
+ **/
+void
+mono_md5_get_digest_from_file (const gchar *filename, guchar digest[16])
+{	
+	MonoMD5Context ctx;
+	guchar tmp_buf[1024];
+	gint nb_bytes_read;
+	FILE *fp;
+
+	mono_md5_init (&ctx);
+	fp = fopen(filename, "r");
+	if (!fp) {
+		return;
+	}
+	
+	while ((nb_bytes_read = fread (tmp_buf, sizeof (guchar), 1024, fp)) > 0)
+		mono_md5_update (&ctx, tmp_buf, nb_bytes_read);
+	
+	if (ferror(fp)) {
+		fclose(fp);
+		return;
+	}
+
+	mono_md5_final (&ctx, digest);
+}
+
+
+
+
diff --git a/mono/utils/mono-sha1.c b/mono/utils/mono-sha1.c
new file mode 100644
index 00000000000..642c0c87078
--- /dev/null
+++ b/mono/utils/mono-sha1.c
@@ -0,0 +1,296 @@
+/*
+SHA-1 in C
+By Steve Reid <sreid@sea-to-sky.net>
+100% Public Domain
+
+-----------------
+Modified 7/98 
+By James H. Brown <jbrown@burgoyne.com>
+Still 100% Public Domain
+
+Corrected a problem which generated improper hash values on 16 bit machines
+Routine mono_sha1_update changed from
+	void mono_sha1_update(MonoSHA1Context* context, unsigned char* data, unsigned int
+len)
+to
+	void mono_sha1_update(MonoSHA1Context* context, unsigned char* data, unsigned
+long len)
+
+The 'len' parameter was declared an int which works fine on 32 bit machines.
+However, on 16 bit machines an int is too small for the shifts being done
+against
+it.  This caused the hash function to generate incorrect values if len was
+greater than 8191 (8K - 1) due to the 'len << 3' on line 3 of mono_sha1_update().
+
+Since the file IO in main() reads 16K at a time, any file 8K or larger would
+be guaranteed to generate the wrong hash (e.g. Test Vector #3, a million
+"a"s).
+
+I also changed the declaration of variables i & j in mono_sha1_update to 
+unsigned long from unsigned int for the same reason.
+
+These changes should make no difference to any 32 bit implementations since
+an
+int and a long are the same size in those environments.
+
+--
+I also corrected a few compiler warnings generated by Borland C.
+1. Added #include <process.h> for exit() prototype
+2. Removed unused variable 'j' in mono_sha1_final
+3. Changed exit(0) to return(0) at end of main.
+
+ALL changes I made can be located by searching for comments containing 'JHB'
+-----------------
+Modified 8/98
+By Steve Reid <sreid@sea-to-sky.net>
+Still 100% public domain
+
+1- Removed #include <process.h> and used return() instead of exit()
+2- Fixed overwriting of finalcount in mono_sha1_final() (discovered by Chris Hall)
+3- Changed email address from steve@edmweb.com to sreid@sea-to-sky.net
+
+-----------------
+Modified 4/01
+By Saul Kravitz <Saul.Kravitz@celera.com>
+Still 100% PD
+Modified to run on Compaq Alpha hardware.  
+
+
+*/
+
+/*
+Test Vectors (from FIPS PUB 180-1)
+"abc"
+  A9993E36 4706816A BA3E2571 7850C26C 9CD0D89D
+"abcdbcdecdefdefgefghfghighijhijkijkljklmklmnlmnomnopnopq"
+  84983E44 1C3BD26E BAAE4AA1 F95129E5 E54670F1
+A million repetitions of "a"
+  34AA973C D4C4DAA4 F61EEB2B DBAD2731 6534016F
+*/
+
+/* #define SHA1HANDSOFF  */
+
+#include <stdio.h>
+#include <string.h>
+#include "mono-digest.h"
+
+#ifndef  i386   /* For ALPHA  (SAK) */
+#define LITTLE_ENDIAN 
+typedef          long int int64;
+typedef unsigned long int uint64;
+typedef          int int32;
+typedef unsigned int uint32;
+#else  /*i386*/
+#define LITTLE_ENDIAN 
+typedef          long long int int64;
+typedef unsigned long long int uint64;
+typedef          long int int32;
+typedef unsigned long int uint32;
+#endif /*i386*/
+
+
+/* #include <process.h> */	/* prototype for exit() - JHB */
+/* Using return() instead of exit() - SWR */
+
+static void SHA1Transform(guint32 state[5], const guchar buffer[64]);
+
+#define rol(value, bits) (((value) << (bits)) | ((value) >> (32 - (bits))))
+
+/* blk0() and blk() perform the initial expand. */
+/* I got the idea of expanding during the round function from SSLeay */
+#ifdef LITTLE_ENDIAN
+#define blk0(i) (block->l[i] = (rol(block->l[i],24)&0xFF00FF00) \
+    |(rol(block->l[i],8)&0x00FF00FF))
+#else
+#define blk0(i) block->l[i]
+#endif
+#define blk(i) (block->l[i&15] = rol(block->l[(i+13)&15]^block->l[(i+8)&15] \
+    ^block->l[(i+2)&15]^block->l[i&15],1))
+
+/* (R0+R1), R2, R3, R4 are the different operations used in SHA1 */
+#define R0(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk0(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R1(v,w,x,y,z,i) z+=((w&(x^y))^y)+blk(i)+0x5A827999+rol(v,5);w=rol(w,30);
+#define R2(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0x6ED9EBA1+rol(v,5);w=rol(w,30);
+#define R3(v,w,x,y,z,i) z+=(((w|x)&y)|(w&x))+blk(i)+0x8F1BBCDC+rol(v,5);w=rol(w,30);
+#define R4(v,w,x,y,z,i) z+=(w^x^y)+blk(i)+0xCA62C1D6+rol(v,5);w=rol(w,30);
+
+
+#ifdef VERBOSE  /* SAK */
+static void SHAPrintContext(MonoSHA1Context *context, char *msg){
+  printf("%s (%d,%d) %x %x %x %x %x\n",
+	 msg,
+	 context->count[0], context->count[1], 
+	 context->state[0],
+	 context->state[1],
+	 context->state[2],
+	 context->state[3],
+	 context->state[4]);
+}
+#endif
+
+/* Hash a single 512-bit block. This is the core of the algorithm. */
+
+static void SHA1Transform(guint32 state[5], const guchar buffer[64])
+{
+uint32 a, b, c, d, e;
+typedef union {
+    unsigned char c[64];
+    uint32 l[16];
+} CHAR64LONG16;
+CHAR64LONG16* block;
+#ifdef SHA1HANDSOFF
+static unsigned char workspace[64];
+    block = (CHAR64LONG16*)workspace;
+    memcpy(block, buffer, 64);
+#else
+    block = (CHAR64LONG16*)buffer;
+#endif
+    /* Copy context->state[] to working vars */
+    a = state[0];
+    b = state[1];
+    c = state[2];
+    d = state[3];
+    e = state[4];
+    /* 4 rounds of 20 operations each. Loop unrolled. */
+    R0(a,b,c,d,e, 0); R0(e,a,b,c,d, 1); R0(d,e,a,b,c, 2); R0(c,d,e,a,b, 3);
+    R0(b,c,d,e,a, 4); R0(a,b,c,d,e, 5); R0(e,a,b,c,d, 6); R0(d,e,a,b,c, 7);
+    R0(c,d,e,a,b, 8); R0(b,c,d,e,a, 9); R0(a,b,c,d,e,10); R0(e,a,b,c,d,11);
+    R0(d,e,a,b,c,12); R0(c,d,e,a,b,13); R0(b,c,d,e,a,14); R0(a,b,c,d,e,15);
+    R1(e,a,b,c,d,16); R1(d,e,a,b,c,17); R1(c,d,e,a,b,18); R1(b,c,d,e,a,19);
+    R2(a,b,c,d,e,20); R2(e,a,b,c,d,21); R2(d,e,a,b,c,22); R2(c,d,e,a,b,23);
+    R2(b,c,d,e,a,24); R2(a,b,c,d,e,25); R2(e,a,b,c,d,26); R2(d,e,a,b,c,27);
+    R2(c,d,e,a,b,28); R2(b,c,d,e,a,29); R2(a,b,c,d,e,30); R2(e,a,b,c,d,31);
+    R2(d,e,a,b,c,32); R2(c,d,e,a,b,33); R2(b,c,d,e,a,34); R2(a,b,c,d,e,35);
+    R2(e,a,b,c,d,36); R2(d,e,a,b,c,37); R2(c,d,e,a,b,38); R2(b,c,d,e,a,39);
+    R3(a,b,c,d,e,40); R3(e,a,b,c,d,41); R3(d,e,a,b,c,42); R3(c,d,e,a,b,43);
+    R3(b,c,d,e,a,44); R3(a,b,c,d,e,45); R3(e,a,b,c,d,46); R3(d,e,a,b,c,47);
+    R3(c,d,e,a,b,48); R3(b,c,d,e,a,49); R3(a,b,c,d,e,50); R3(e,a,b,c,d,51);
+    R3(d,e,a,b,c,52); R3(c,d,e,a,b,53); R3(b,c,d,e,a,54); R3(a,b,c,d,e,55);
+    R3(e,a,b,c,d,56); R3(d,e,a,b,c,57); R3(c,d,e,a,b,58); R3(b,c,d,e,a,59);
+    R4(a,b,c,d,e,60); R4(e,a,b,c,d,61); R4(d,e,a,b,c,62); R4(c,d,e,a,b,63);
+    R4(b,c,d,e,a,64); R4(a,b,c,d,e,65); R4(e,a,b,c,d,66); R4(d,e,a,b,c,67);
+    R4(c,d,e,a,b,68); R4(b,c,d,e,a,69); R4(a,b,c,d,e,70); R4(e,a,b,c,d,71);
+    R4(d,e,a,b,c,72); R4(c,d,e,a,b,73); R4(b,c,d,e,a,74); R4(a,b,c,d,e,75);
+    R4(e,a,b,c,d,76); R4(d,e,a,b,c,77); R4(c,d,e,a,b,78); R4(b,c,d,e,a,79);
+    /* Add the working vars back into context.state[] */
+    state[0] += a;
+    state[1] += b;
+    state[2] += c;
+    state[3] += d;
+    state[4] += e;
+    /* Wipe variables */
+    a = b = c = d = e = 0;
+}
+
+
+/* mono_sha1_init - Initialize new context */
+
+void mono_sha1_init(MonoSHA1Context* context)
+{
+    /* SHA1 initialization constants */
+    context->state[0] = 0x67452301;
+    context->state[1] = 0xEFCDAB89;
+    context->state[2] = 0x98BADCFE;
+    context->state[3] = 0x10325476;
+    context->state[4] = 0xC3D2E1F0;
+    context->count[0] = context->count[1] = 0;
+}
+
+
+/* Run your data through this. */
+
+void mono_sha1_update(MonoSHA1Context* context, const guchar* data, guint32 len)	/*
+JHB */
+{
+uint32 i, j;	/* JHB */
+
+#ifdef VERBOSE
+    SHAPrintContext(context, "before");
+#endif
+    j = (context->count[0] >> 3) & 63;
+    if ((context->count[0] += len << 3) < (len << 3)) context->count[1]++;
+    context->count[1] += (len >> 29);
+    if ((j + len) > 63) {
+        memcpy(&context->buffer[j], data, (i = 64-j));
+        SHA1Transform(context->state, context->buffer);
+        for ( ; i + 63 < len; i += 64) {
+            SHA1Transform(context->state, &data[i]);
+        }
+        j = 0;
+    }
+    else i = 0;
+    memcpy(&context->buffer[j], &data[i], len - i);
+#ifdef VERBOSE
+    SHAPrintContext(context, "after ");
+#endif
+}
+
+
+/* Add padding and return the message digest. */
+
+void mono_sha1_final( MonoSHA1Context* context, unsigned char digest[20])
+{
+uint32 i;	/* JHB */
+unsigned char finalcount[8];
+
+    for (i = 0; i < 8; i++) {
+        finalcount[i] = (unsigned char)((context->count[(i >= 4 ? 0 : 1)]
+         >> ((3-(i & 3)) * 8) ) & 255);  /* Endian independent */
+    }
+    mono_sha1_update(context, (unsigned char *)"\200", 1);
+    while ((context->count[0] & 504) != 448) {
+        mono_sha1_update(context, (unsigned char *)"\0", 1);
+    }
+    mono_sha1_update(context, finalcount, 8);  /* Should cause a SHA1Transform()
+*/
+    for (i = 0; i < 20; i++) {
+        digest[i] = (unsigned char)
+         ((context->state[i>>2] >> ((3-(i & 3)) * 8) ) & 255);
+    }
+    /* Wipe variables */
+    i = 0;	/* JHB */
+    memset(context->buffer, 0, 64);
+    memset(context->state, 0, 20);
+    memset(context->count, 0, 8);
+    memset(finalcount, 0, 8);	/* SWR */
+#ifdef SHA1HANDSOFF  /* make SHA1Transform overwrite it's own static vars */
+    SHA1Transform(context->state, context->buffer);
+#endif
+}
+ 
+void
+mono_sha1_get_digest (const gchar *buffer, gint buffer_size, guchar digest [20])
+{	
+	MonoSHA1Context ctx;
+
+	mono_sha1_init (&ctx);
+	mono_sha1_update (&ctx, buffer, buffer_size);
+	mono_sha1_final (&ctx, digest);
+	
+}
+
+void
+mono_sha1_get_digest_from_file (const gchar *filename, guchar digest [20])
+{	
+	MonoSHA1Context ctx;
+	guchar tmp_buf[1024];
+	gint nb_bytes_read;
+	FILE *fp;
+
+	mono_sha1_init (&ctx);
+	fp = fopen(filename, "r");
+	if (!fp) {
+		return;
+	}
+	
+	while ((nb_bytes_read = fread (tmp_buf, sizeof (guchar), 1024, fp)) > 0)
+		mono_sha1_update (&ctx, tmp_buf, nb_bytes_read);
+	
+	if (ferror(fp)) {
+		fclose(fp);
+		return;
+	}
+
+	mono_sha1_final (&ctx, digest);
+}
+
diff --git a/mono/utils/monobitset.c b/mono/utils/monobitset.c
new file mode 100644
index 00000000000..e3d195683da
--- /dev/null
+++ b/mono/utils/monobitset.c
@@ -0,0 +1,643 @@
+#include <glib.h>
+#include <string.h>
+
+#include "monobitset.h"
+
+#ifdef __GNUC__
+#define MONO_ZERO_LEN_ARRAY 0
+#else
+#define MONO_ZERO_LEN_ARRAY 1
+#endif
+
+#define BITS_PER_CHUNK (8 * sizeof (guint32))
+
+struct MonoBitSet {
+	guint32 size;
+	guint32 flags;
+	guint32 data [MONO_ZERO_LEN_ARRAY];
+};
+
+/*
+ * mono_bitset_alloc_size:
+ * @max_size: The numer of bits you want to hold
+ * @flags: unused
+ *
+ * Return the number of bytes required to hold the bitset.
+ * Useful to allocate it on the stack or with mempool.
+ * Use with mono_bitset_mem_new ().
+ */
+guint32
+mono_bitset_alloc_size (guint32 max_size, guint32 flags) {
+	guint32 real_size = (max_size + BITS_PER_CHUNK - 1) / BITS_PER_CHUNK;
+
+	return sizeof (MonoBitSet) + sizeof (guint32) * (real_size - MONO_ZERO_LEN_ARRAY);
+}
+
+/*
+ * mono_bitset_new:
+ * @max_size: The numer of bits you want to hold
+ * @flags: bitfield of flags
+ *
+ * Return a bitset of size max_size. It must be freed using
+ * mono_bitset_free.
+ */
+MonoBitSet *
+mono_bitset_new (guint32 max_size, guint32 flags) {
+	guint32 real_size = (max_size + BITS_PER_CHUNK - 1) / BITS_PER_CHUNK;
+	MonoBitSet *result;
+
+	result = g_malloc0 (sizeof (MonoBitSet) + sizeof (guint32) * (real_size - MONO_ZERO_LEN_ARRAY));
+	result->size = real_size * BITS_PER_CHUNK;
+	result->flags = flags;
+	return result;
+}
+
+/*
+ * mono_bitset_mem_new:
+ * @mem: The location the bitset is stored
+ * @max_size: The number of bits you want to hold
+ * @flags: bitfield of flags
+ *
+ * Return mem, which is now a initialized bitset of size max_size. It is
+ * not freed even if called with mono_bitset_free. mem must be at least
+ * as big as mono_bitset_alloc_size returns for the same max_size.
+ */
+MonoBitSet *
+mono_bitset_mem_new (gpointer mem, guint32 max_size, guint32 flags) {
+	guint32 real_size = (max_size + BITS_PER_CHUNK - 1) / BITS_PER_CHUNK;
+	MonoBitSet *result = mem;
+
+	result->size = real_size * BITS_PER_CHUNK;
+	result->flags = flags | MONO_BITSET_DONT_FREE;
+	return result;
+}
+
+/*
+ * mono_bitset_free:
+ * @set: bitset ptr to free
+ *
+ * Free bitset unless flags have MONO_BITSET_DONT_FREE set. Does not
+ * free anything if flag MONO_BITSET_DONT_FREE is set or bitset was
+ * made with mono_bitset_mem_new.
+ */
+void
+mono_bitset_free (MonoBitSet *set) {
+	if (!(set->flags & MONO_BITSET_DONT_FREE))
+		g_free (set);
+}
+
+/*
+ * mono_bitset_set:
+ * @set: bitset ptr
+ * @pos: set bit at this pos
+ *
+ * Set bit at pos @pos, counting from 0.
+ */
+void
+mono_bitset_set (MonoBitSet *set, guint32 pos) {
+	int j = pos / BITS_PER_CHUNK;
+	int bit = pos % BITS_PER_CHUNK;
+
+	g_return_if_fail (pos < set->size);
+
+	set->data [j] |= 1 << bit;
+}
+
+/*
+ * mono_bitset_test:
+ * @set: bitset ptr
+ * @pos: test bit at this pos
+ *
+ * Test bit at pos @pos, counting from 0.
+ * Returns a value != 0 if set, 0 otherwise.
+ */
+int
+mono_bitset_test (const MonoBitSet *set, guint32 pos) {
+	int j = pos / BITS_PER_CHUNK;
+	int bit = pos % BITS_PER_CHUNK;
+
+	g_return_val_if_fail (pos < set->size, 0);
+
+	return set->data [j] & (1 << bit);
+}
+
+/*
+ * mono_bitset_clear:
+ * @set: bitset ptr
+ * @pos: unset bit at this pos
+ *
+ * Unset bit at pos 'pos', counting from 0.
+ */
+void
+mono_bitset_clear (MonoBitSet *set, guint32 pos) {
+	int j = pos / BITS_PER_CHUNK;
+	int bit = pos % BITS_PER_CHUNK;
+
+	g_return_if_fail (pos < set->size);
+
+	set->data [j] &= ~(1 << bit);
+}
+
+/*
+ * mono_bitset_clear_all:
+ * @set: bitset ptr
+ *
+ * Unset all bits.
+ */
+void
+mono_bitset_clear_all (MonoBitSet *set) {
+	int i;
+	for (i = 0; i < set->size / BITS_PER_CHUNK; ++i)
+		set->data [i] = 0;
+}
+
+/*
+ * mono_bitset_invert:
+ * @set: bitset ptr
+ *
+ * Flip all bits.
+ */
+void
+mono_bitset_invert (MonoBitSet *set) {
+	int i;
+	for (i = 0; i < set->size / BITS_PER_CHUNK; ++i)
+		set->data [i] = ~set->data [i];
+}
+
+/*
+ * mono_bitset_size:
+ * @set: bitset ptr
+ *
+ * Returns the number of bits this bitset can hold.
+ */
+guint32
+mono_bitset_size (const MonoBitSet *set) {
+	return set->size;
+}
+
+/* 
+ * should test wich version is faster.
+ */
+#if 1
+
+/*
+ * mono_bitset_count:
+ * @set: bitset ptr
+ *
+ * return number of bits that is set.
+ */
+guint32
+mono_bitset_count (const MonoBitSet *set) {
+	static const unsigned char table [16] = {
+		0, 1, 1, 2, 1, 2, 2, 3, 1, 2, 2, 3, 2, 3, 3, 4
+	};
+	guint32 i, count;
+	const unsigned char *b;
+
+	count = 0;
+	for (i = 0; i < set->size / BITS_PER_CHUNK; ++i) {
+		/* there is probably some asm code that can do this much faster */
+		if (set->data [i]) {
+			b = (unsigned char*) (set->data + i);
+			count += table [b [0] & 0xf];
+			count += table [b [0] >> 4];
+			count += table [b [1] & 0xf];
+			count += table [b [1] >> 4];
+			count += table [b [2] & 0xf];
+			count += table [b [2] >> 4];
+			count += table [b [3] & 0xf];
+			count += table [b [3] >> 4];
+		}
+	}
+	return count;
+}
+#else
+guint32
+mono_bitset_count (const MonoBitSet *set) {
+	static const guint32 table [] = {
+		0x55555555, 0x33333333, 0x0F0F0F0F, 0x00FF00FF, 0x0000FFFF
+	};
+	guint32 i, count, val;
+
+	count = 0;
+	for (i = 0; i < set->size / BITS_PER_CHUNK;+i) {
+		if (set->data [i]) {
+			val = set->data [i];
+			val = (val & table [0]) ((val >> 1) & table [0]);
+			val = (val & table [1]) ((val >> 2) & table [1]);
+			val = (val & table [2]) ((val >> 4) & table [2]);
+			val = (val & table [3]) ((val >> 8) & table [3]);
+			val = (val & table [4]) ((val >> 16) & table [4]);
+			count += val;
+		}
+	}
+	return count;
+}
+
+#endif
+
+#if 0
+const static int 
+bitstart_mask [] = {
+	0xffffffff, 0xfffffffe, 0xfffffffc, 0xfffffff8,
+	0xfffffff0, 0xffffffe0, 0xffffffc0, 0xffffff80,
+	0xffffff00, 0xfffffe00, 0xfffffc00, 0xfffff800,
+	0xfffff000, 0xffffe000, 0xffffc000, 0xffff8000,
+	0xffff0000, 0xfffe0000, 0xfffc0000, 0xfff80000,
+	0xfff00000, 0xffe00000, 0xffc00000, 0xff800000,
+	0xff000000, 0xfe000000, 0xfc000000, 0xf8000000,
+	0xf0000000, 0xe0000000, 0xc0000000, 0x80000000,
+	0x00000000
+};
+
+#define my_g_bit_nth_lsf(m,n) (ffs((m) & bitstart_mask [(n)+1])-1)
+#define my_g_bit_nth_lsf_nomask(m) (ffs((m))-1)
+
+#else
+static inline gint
+my_g_bit_nth_lsf (guint32 mask, gint nth_bit)
+{
+	do {
+		nth_bit++;
+		if (mask & (1 << (gulong) nth_bit))
+			return nth_bit;
+	} while (nth_bit < 31);
+	return -1;
+}
+#define my_g_bit_nth_lsf_nomask(m) (my_g_bit_nth_lsf((m),-1))
+#endif
+
+/*
+ * mono_bitset_find_start:
+ * @set: bitset ptr
+ *
+ * Equivalent to mono_bitset_find_first (set, -1) but faster.
+ */
+int
+mono_bitset_find_start   (const MonoBitSet *set)
+{
+	int i;
+
+	for (i = 0; i < set->size / BITS_PER_CHUNK; ++i) {
+		if (set->data [i])
+			return my_g_bit_nth_lsf_nomask (set->data [i]) + i * BITS_PER_CHUNK;
+	}
+	return -1;
+}
+
+/*
+ * mono_bitset_find_first:
+ * @set: bitset ptr
+ * @pos: pos to search _after_ (not including)
+ *
+ * Returns position of first set bit after @pos. If pos < 0 begin search from
+ * start. Return -1 if no bit set is found.
+ */
+int
+mono_bitset_find_first (const MonoBitSet *set, gint pos) {
+	int j;
+	int bit;
+	int result, i;
+
+	if (pos < 0) {
+		j = 0;
+		bit = -1;
+	} else {
+		j = pos / BITS_PER_CHUNK;
+		bit = pos % BITS_PER_CHUNK;
+		g_return_val_if_fail (pos < set->size, -1);
+	}
+	/*g_print ("find first from %d (j: %d, bit: %d)\n", pos, j, bit);*/
+
+	if (set->data [j]) {
+		result = my_g_bit_nth_lsf (set->data [j], bit);
+		if (result != -1)
+			return result + j * BITS_PER_CHUNK;
+	}
+	for (i = ++j; i < set->size / BITS_PER_CHUNK; ++i) {
+		if (set->data [i])
+			return my_g_bit_nth_lsf (set->data [i], -1) + i * BITS_PER_CHUNK;
+	}
+	return -1;
+}
+
+/*
+ * mono_bitset_find_last:
+ * @set: bitset ptr
+ * @pos: pos to search _before_ (not including)
+ *
+ * Returns position of last set bit before pos. If pos < 0 search is
+ * started from the end. Returns -1 if no set bit is found.
+ */
+int
+mono_bitset_find_last (const MonoBitSet *set, gint pos) {
+	int j, bit, result, i;
+
+	if (pos < 0)
+		pos = set->size - 1;
+		
+	j = pos / BITS_PER_CHUNK;
+	bit = pos % BITS_PER_CHUNK;
+
+	g_return_val_if_fail (pos < set->size, -1);
+
+	if (set->data [j]) {
+		result = g_bit_nth_msf (set->data [j], bit);
+		if (result != -1)
+			return result + j * BITS_PER_CHUNK;
+	}
+	for (i = --j; i >= 0; --i) {
+		if (set->data [i])
+			return g_bit_nth_msf (set->data [i], -1) + i * BITS_PER_CHUNK;
+	}
+	return -1;
+}
+
+/*
+ * mono_bitset_clone:
+ * @set: bitset ptr to clone
+ * @new_size: number of bits the cloned bitset can hold
+ *
+ * Return a cloned bitset of size new_size. MONO_BITSET_DONT_FREE
+ * unset in cloned bitset. If new_size is 0, the cloned object is just
+ * as big.
+ */
+MonoBitSet*
+mono_bitset_clone (const MonoBitSet *set, guint32 new_size) {
+	MonoBitSet *result;
+
+	if (!new_size)
+		new_size = set->size;
+	result = mono_bitset_new (new_size, set->flags);
+	result->flags &= ~MONO_BITSET_DONT_FREE;
+	memcpy (result->data, set->data, set->size / 8);
+	return result;
+}
+
+/*
+ * mono_bitset_copyto:
+ * @src: bitset ptr to copy from
+ * @dest: bitset ptr to copy to
+ *
+ * Copy one bitset to another.
+ */
+void
+mono_bitset_copyto (const MonoBitSet *src, MonoBitSet *dest) {
+	int i;
+
+	g_return_if_fail (dest->size <= src->size);
+
+	for (i = 0; i < dest->size / BITS_PER_CHUNK; ++i)
+		dest->data [i] = src->data [i];
+}
+
+/*
+ * mono_bitset_union:
+ * @dest: bitset ptr to hold union
+ * @src: bitset ptr to copy
+ *
+ * Make union of one bitset and another.
+ */
+void
+mono_bitset_union (MonoBitSet *dest, const MonoBitSet *src) {
+	int i;
+
+	g_return_if_fail (src->size <= dest->size);
+
+	for (i = 0; i < dest->size / BITS_PER_CHUNK; ++i)
+		dest->data [i] |= src->data [i];
+}
+
+/*
+ * mono_bitset_intersection:
+ * @dest: bitset ptr to hold intersection
+ * @src: bitset ptr to copy
+ *
+ * Make intersection of one bitset and another.
+ */
+void
+mono_bitset_intersection (MonoBitSet *dest, const MonoBitSet *src) {
+	int i;
+
+	g_return_if_fail (src->size <= dest->size);
+
+	for (i = 0; i < dest->size / BITS_PER_CHUNK; ++i)
+		dest->data [i] = dest->data [i] & src->data [i];
+}
+
+/*
+ * mono_bitset_sub:
+ * @dest: bitset ptr to hold bitset - src
+ * @src: bitset ptr to copy
+ *
+ * Unset all bits in dest, which are set in src.
+ */
+void
+mono_bitset_sub (MonoBitSet *dest, const MonoBitSet *src) {
+	int i;
+
+	g_return_if_fail (src->size <= dest->size);
+
+	for (i = 0; i < dest->size / BITS_PER_CHUNK; ++i)
+		dest->data [i] &= ~src->data [i];
+}
+
+/*
+ * mono_bitset_equal:
+ * @src: bitset ptr
+ * @src1: bitset ptr
+ *
+ * return TRUE if their size are the same and the same bits are set in
+ * both bitsets.
+ */
+gboolean
+mono_bitset_equal (const MonoBitSet *src, const MonoBitSet *src1) {
+	int i;
+	if (src->size != src1->size)
+		return FALSE;
+ 
+	for (i = 0; i < src->size / BITS_PER_CHUNK; ++i)
+		if (src->data [i] != src1->data [i])
+			return FALSE;
+	return TRUE;
+}
+
+/*
+ * mono_bitset_foreach:
+ * @set: bitset ptr
+ * @func: Function to call for every set bit
+ * @data: pass this as second arg to func
+ *
+ * Calls func for every bit set in bitset. Argument 1 is the number of
+ * the bit set, argument 2 is data
+ */
+void
+mono_bitset_foreach (MonoBitSet *set, MonoBitSetFunc func, gpointer data)
+{
+	int i, j;
+	for (i = 0; i < set->size / BITS_PER_CHUNK; ++i) {
+		if (set->data [i]) {
+			for (j = 0; j < BITS_PER_CHUNK; ++j)
+				if (set->data [i] & (1 << j))
+					func (j + i * BITS_PER_CHUNK, data);
+		}
+	}
+}
+
+#ifdef TEST_BITSET
+
+/*
+ * Compile with: 
+ * gcc -g -Wall -DTEST_BITSET -o monobitset monobitset.c `pkg-config --cflags --libs glib-2.0`
+ */
+int 
+main() {
+	MonoBitSet *set1, *set2, *set3, *set4;
+	int error = 1;
+	int count, i;
+
+	set1 = mono_bitset_new (60, 0);
+	set4 = mono_bitset_new (60, 0);
+
+	if (mono_bitset_count (set1) != 0)
+		return error;
+	error++;
+	
+	mono_bitset_set (set1, 33);
+	if (mono_bitset_count (set1) != 1)
+		return error;
+	error++;
+
+	//g_print("should be 33: %d\n", mono_bitset_find_first (set1, 0));
+	
+	if (mono_bitset_find_first (set1, 0) != 33)
+		return error;
+	error++;
+
+	if (mono_bitset_find_first (set1, 33) != -1)
+		return error;
+	error++;
+
+	/* test 5 */
+	if (mono_bitset_find_first (set1, -100) != 33)
+		return error;
+	error++;
+
+	if (mono_bitset_find_last (set1, -1) != 33)
+		return error;
+	error++;
+
+	if (mono_bitset_find_last (set1, 33) != -1)
+		return error;
+	error++;
+
+	if (mono_bitset_find_last (set1, -100) != 33)
+		return error;
+	error++;
+
+	if (mono_bitset_find_last (set1, 34) != 33)
+		return error;
+	error++;
+
+	/* test 10 */
+	if (!mono_bitset_test (set1, 33))
+		return error;
+	error++;
+
+	if (mono_bitset_test (set1, 32) || mono_bitset_test (set1, 34))
+		return error;
+	error++;
+
+	set2 = mono_bitset_clone (set1, 0);
+	if (mono_bitset_count (set2) != 1)
+		return error;
+	error++;
+
+	mono_bitset_invert (set2);
+	if (mono_bitset_count (set2) != (mono_bitset_size (set2) - 1))
+		return error;
+	error++;
+
+	mono_bitset_clear (set2, 10);
+	if (mono_bitset_count (set2) != (mono_bitset_size (set2) - 2))
+		return error;
+	error++;
+
+	/* test 15 */
+	set3 = mono_bitset_clone (set2, 0);
+	mono_bitset_union (set3, set1);
+	if (mono_bitset_count (set3) != (mono_bitset_size (set3) - 1))
+		return error;
+	error++;
+
+	mono_bitset_clear_all (set2);
+	if (mono_bitset_count (set2) != 0)
+		return error;
+	error++;
+
+	mono_bitset_invert (set2);
+	if (mono_bitset_count (set2) != mono_bitset_size (set2))
+		return error;
+	error++;
+
+	mono_bitset_set (set4, 0);
+	mono_bitset_set (set4, 1);
+	mono_bitset_set (set4, 10);
+	if (mono_bitset_count (set4) != 3)
+		return error;
+	error++;
+
+	count = 0;
+	for (i = mono_bitset_find_first (set4, -1); i != -1; i = mono_bitset_find_first (set4, i)) {
+		count ++;
+		switch (count) {
+		case 1:
+		  if (i != 0)
+		    return error;
+		  break;
+		case 2:
+		  if (i != 1)
+		    return error;
+		  break;
+		case 3:
+		  if (i != 10)
+		    return error;
+		  break;
+		}
+		//g_print ("count got: %d at %d\n", count, i);
+	}
+	if (count != 3)
+		return error;
+	error++;
+
+	if (mono_bitset_find_first (set4, -1) != 0)
+		return error;
+	error++;
+
+	/* 20 */
+	mono_bitset_set (set4, 31);
+	if (mono_bitset_find_first (set4, 10) != 31)
+		return error;
+	error++;
+
+	mono_bitset_free (set1);
+
+	set1 = mono_bitset_new (200, 0);
+	mono_bitset_set (set1, 0);
+	mono_bitset_set (set1, 1);
+	mono_bitset_set (set1, 10);
+	mono_bitset_set (set1, 31);
+	mono_bitset_set (set1, 150);
+
+	mono_bitset_free (set1);
+	mono_bitset_free (set2);
+	mono_bitset_free (set3);
+	mono_bitset_free (set4);
+
+	g_print ("total tests passed: %d\n", error - 1);
+	
+	return 0;
+}
+
+#endif
+
diff --git a/mono/utils/monobitset.h b/mono/utils/monobitset.h
new file mode 100644
index 00000000000..0b62d441d4b
--- /dev/null
+++ b/mono/utils/monobitset.h
@@ -0,0 +1,60 @@
+#ifndef __MONO_BITSET_H__
+#define __MONO_BITSET_H__
+
+#include <glib.h>
+
+typedef struct MonoBitSet MonoBitSet;
+typedef void (*MonoBitSetFunc) (guint idx, gpointer data);
+
+enum {
+	MONO_BITSET_DONT_FREE = 1
+};
+
+/*
+ * Interface documentation can be found in the c-file.
+ * Interface documentation by Dennis Haney.
+ */
+
+guint32     mono_bitset_alloc_size   (guint32 max_size, guint32 flags);
+
+MonoBitSet* mono_bitset_new          (guint32 max_size, guint32 flags);
+
+MonoBitSet* mono_bitset_mem_new      (gpointer mem, guint32 max_size, guint32 flags);
+
+void        mono_bitset_free         (MonoBitSet *set); 
+
+void        mono_bitset_set          (MonoBitSet *set, guint32 pos);
+
+int         mono_bitset_test         (const MonoBitSet *set, guint32 pos);
+
+void        mono_bitset_clear        (MonoBitSet *set, guint32 pos);
+
+void        mono_bitset_clear_all    (MonoBitSet *set);
+
+void        mono_bitset_invert       (MonoBitSet *set);
+
+guint32     mono_bitset_size         (const MonoBitSet *set);
+
+guint32     mono_bitset_count        (const MonoBitSet *set);
+
+int         mono_bitset_find_start   (const MonoBitSet *set);
+
+int         mono_bitset_find_first   (const MonoBitSet *set, gint pos);
+
+int         mono_bitset_find_last    (const MonoBitSet *set, gint pos);
+
+MonoBitSet* mono_bitset_clone        (const MonoBitSet *set, guint32 new_size);
+
+void        mono_bitset_copyto       (const MonoBitSet *src, MonoBitSet *dest);
+
+void        mono_bitset_union        (MonoBitSet *dest, const MonoBitSet *src);
+
+void        mono_bitset_intersection (MonoBitSet *dest, const MonoBitSet *src);
+
+void        mono_bitset_sub          (MonoBitSet *dest, const MonoBitSet *src);
+
+gboolean    mono_bitset_equal        (const MonoBitSet *src, const MonoBitSet *src1);
+
+void        mono_bitset_foreach      (MonoBitSet *set, MonoBitSetFunc func, gpointer data);
+
+#endif /* __MONO_BITSET_H__ */
diff --git a/mono/utils/strtod.c b/mono/utils/strtod.c
new file mode 100644
index 00000000000..c36b148b1c4
--- /dev/null
+++ b/mono/utils/strtod.c
@@ -0,0 +1,2448 @@
+/*
+ * This strtod has been modified to not use values from the locale,
+ * but to hardcode the `.' as the separator.  Our class libraries will
+ * make sure that only the dot is passed.
+ *
+ * This is so we do not call `setlocale' from our runtime before doing
+ * a strtod, because this could have unwanted effects in code that is
+ * co-hosted with the Mono runtime
+ *
+ * The entry point has been renamed `bsd_strtod'.
+ *
+ * Taken from the FreeBSD distribution.
+ */
+#include "strtod.h"
+
+/*-
+ * Copyright (c) 1993
+ *	The Regents of the University of California.  All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. All advertising materials mentioning features or use of this software
+ *    must display the following acknowledgement:
+ *	This product includes software developed by the University of
+ *	California, Berkeley and its contributors.
+ * 4. Neither the name of the University nor the names of its contributors
+ *    may be used to endorse or promote products derived from this software
+ *    without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND
+ * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
+ * ARE DISCLAIMED.  IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE
+ * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+ * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
+ * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
+ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
+ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
+ * SUCH DAMAGE.
+ *
+ * $FreeBSD: src/lib/libc/stdlib/strtod.c,v 1.3.8.3 2002/04/17 12:01:21 ache Exp $
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "@(#)strtod.c	8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+
+/****************************************************************
+ *
+ * The author of this software is David M. Gay.
+ *
+ * Copyright (c) 1991 by AT&T.
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose without fee is hereby granted, provided that this entire notice
+ * is included in all copies of any software which is or includes a copy
+ * or modification of this software and in all copies of the supporting
+ * documentation for such software.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTY.  IN PARTICULAR, NEITHER THE AUTHOR NOR AT&T MAKES ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
+ *
+ ***************************************************************/
+
+/* Please send bug reports to
+	David M. Gay
+	AT&T Bell Laboratories, Room 2C-463
+	600 Mountain Avenue
+	Murray Hill, NJ 07974-2070
+	U.S.A.
+	dmg@research.att.com or research!dmg
+ */
+
+/* strtod for IEEE-, VAX-, and IBM-arithmetic machines.
+ *
+ * This strtod returns a nearest machine number to the input decimal
+ * string (or sets errno to ERANGE).  With IEEE arithmetic, ties are
+ * broken by the IEEE round-even rule.  Otherwise ties are broken by
+ * biased rounding (add half and chop).
+ *
+ * Inspired loosely by William D. Clinger's paper "How to Read Floating
+ * Point Numbers Accurately" [Proc. ACM SIGPLAN '90, pp. 92-101].
+ *
+ * Modifications:
+ *
+ *	1. We only require IEEE, IBM, or VAX double-precision
+ *		arithmetic (not IEEE double-extended).
+ *	2. We get by with floating-point arithmetic in a case that
+ *		Clinger missed -- when we're computing d * 10^n
+ *		for a small integer d and the integer n is not too
+ *		much larger than 22 (the maximum integer k for which
+ *		we can represent 10^k exactly), we may be able to
+ *		compute (d*10^k) * 10^(e-k) with just one roundoff.
+ *	3. Rather than a bit-at-a-time adjustment of the binary
+ *		result in the hard case, we use floating-point
+ *		arithmetic to determine the adjustment to within
+ *		one bit; only in really hard cases do we need to
+ *		compute a second residual.
+ *	4. Because of 3., we don't need a large table of powers of 10
+ *		for ten-to-e (just some small tables, e.g. of 10^k
+ *		for 0 <= k <= 22).
+ */
+
+/*
+ * #define IEEE_8087 for IEEE-arithmetic machines where the least
+ *	significant byte has the lowest address.
+ * #define IEEE_MC68k for IEEE-arithmetic machines where the most
+ *	significant byte has the lowest address.
+ * #define Sudden_Underflow for IEEE-format machines without gradual
+ *	underflow (i.e., that flush to zero on underflow).
+ * #define IBM for IBM mainframe-style floating-point arithmetic.
+ * #define VAX for VAX-style floating-point arithmetic.
+ * #define Unsigned_Shifts if >> does treats its left operand as unsigned.
+ * #define No_leftright to omit left-right logic in fast floating-point
+ *	computation of dtoa.
+ * #define Check_FLT_ROUNDS if FLT_ROUNDS can assume the values 2 or 3.
+ * #define RND_PRODQUOT to use rnd_prod and rnd_quot (assembly routines
+ *	that use extended-precision instructions to compute rounded
+ *	products and quotients) with IBM.
+ * #define ROUND_BIASED for IEEE-format with biased rounding.
+ * #define Inaccurate_Divide for IEEE-format with correctly rounded
+ *	products but inaccurate quotients, e.g., for Intel i860.
+ * #define Just_16 to store 16 bits per 32-bit long when doing high-precision
+ *	integer arithmetic.  Whether this speeds things up or slows things
+ *	down depends on the machine and the number being converted.
+ * #define KR_headers for old-style C function headers.
+ * #define Bad_float_h if your system lacks a float.h or if it does not
+ *	define some or all of DBL_DIG, DBL_MAX_10_EXP, DBL_MAX_EXP,
+ *	FLT_RADIX, FLT_ROUNDS, and DBL_MAX.
+ */
+
+#if defined(i386) || defined(mips) && defined(MIPSEL)
+#define IEEE_8087
+#else
+#define IEEE_MC68k
+#endif
+
+#ifdef DEBUG
+#include "stdio.h"
+#define Bug(x) {fprintf(stderr, "%s\n", x); exit(1);}
+#endif
+
+#include <locale.h>
+#ifdef __cplusplus
+#include "malloc.h"
+#include "memory.h"
+#else
+#ifndef KR_headers
+#include "stdlib.h"
+#include "string.h"
+#else
+#include "malloc.h"
+#include "memory.h"
+#endif
+#endif
+
+#include "errno.h"
+#include <ctype.h>
+#ifdef Bad_float_h
+#undef __STDC__
+#ifdef IEEE_MC68k
+#define IEEE_ARITHMETIC
+#endif
+#ifdef IEEE_8087
+#define IEEE_ARITHMETIC
+#endif
+#ifdef IEEE_ARITHMETIC
+#define DBL_DIG 15
+#define DBL_MAX_10_EXP 308
+#define DBL_MAX_EXP 1024
+#define FLT_RADIX 2
+#define FLT_ROUNDS 1
+#define DBL_MAX 1.7976931348623157e+308
+#endif
+
+#ifdef IBM
+#define DBL_DIG 16
+#define DBL_MAX_10_EXP 75
+#define DBL_MAX_EXP 63
+#define FLT_RADIX 16
+#define FLT_ROUNDS 0
+#define DBL_MAX 7.2370055773322621e+75
+#endif
+
+#ifdef VAX
+#define DBL_DIG 16
+#define DBL_MAX_10_EXP 38
+#define DBL_MAX_EXP 127
+#define FLT_RADIX 2
+#define FLT_ROUNDS 1
+#define DBL_MAX 1.7014118346046923e+38
+#endif
+
+#ifndef LONG_MAX
+#define LONG_MAX 2147483647
+#endif
+#else
+#include "float.h"
+#endif
+#ifndef __MATH_H__
+#include "math.h"
+#endif
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+#ifndef CONST
+#ifdef KR_headers
+#define CONST /* blank */
+#else
+#define CONST const
+#endif
+#endif
+
+#ifdef Unsigned_Shifts
+#define Sign_Extend(a,b) if (b < 0) a |= 0xffff0000;
+#else
+#define Sign_Extend(a,b) /*no-op*/
+#endif
+
+#if defined(IEEE_8087) + defined(IEEE_MC68k) + defined(VAX) + defined(IBM) != 1
+Exactly one of IEEE_8087, IEEE_MC68k, VAX, or IBM should be defined.
+#endif
+
+#ifdef IEEE_8087
+#define word0(x) ((unsigned long *)&x)[1]
+#define word1(x) ((unsigned long *)&x)[0]
+#else
+#define word0(x) ((unsigned long *)&x)[0]
+#define word1(x) ((unsigned long *)&x)[1]
+#endif
+
+/* The following definition of Storeinc is appropriate for MIPS processors.
+ * An alternative that might be better on some machines is
+ * #define Storeinc(a,b,c) (*a++ = b << 16 | c & 0xffff)
+ */
+#if defined(IEEE_8087) + defined(VAX)
+#define Storeinc(a,b,c) (((unsigned short *)a)[1] = (unsigned short)b, \
+((unsigned short *)a)[0] = (unsigned short)c, a++)
+#else
+#define Storeinc(a,b,c) (((unsigned short *)a)[0] = (unsigned short)b, \
+((unsigned short *)a)[1] = (unsigned short)c, a++)
+#endif
+
+/* #define P DBL_MANT_DIG */
+/* Ten_pmax = floor(P*log(2)/log(5)) */
+/* Bletch = (highest power of 2 < DBL_MAX_10_EXP) / 16 */
+/* Quick_max = floor((P-1)*log(FLT_RADIX)/log(10) - 1) */
+/* Int_max = floor(P*log(FLT_RADIX)/log(10) - 1) */
+
+#if defined(IEEE_8087) + defined(IEEE_MC68k)
+#define Exp_shift  20
+#define Exp_shift1 20
+#define Exp_msk1    0x100000
+#define Exp_msk11   0x100000
+#define Exp_mask  0x7ff00000
+#define P 53
+#define Bias 1023
+#define IEEE_Arith
+#define Emin (-1022)
+#define Exp_1  0x3ff00000
+#define Exp_11 0x3ff00000
+#define Ebits 11
+#define Frac_mask  0xfffff
+#define Frac_mask1 0xfffff
+#define Ten_pmax 22
+#define Bletch 0x10
+#define Bndry_mask  0xfffff
+#define Bndry_mask1 0xfffff
+#define LSB 1
+#define Sign_bit 0x80000000
+#define Log2P 1
+#define Tiny0 0
+#define Tiny1 1
+#define Quick_max 14
+#define Int_max 14
+#define Infinite(x) (word0(x) == 0x7ff00000) /* sufficient test for here */
+#else
+#undef  Sudden_Underflow
+#define Sudden_Underflow
+#ifdef IBM
+#define Exp_shift  24
+#define Exp_shift1 24
+#define Exp_msk1   0x1000000
+#define Exp_msk11  0x1000000
+#define Exp_mask  0x7f000000
+#define P 14
+#define Bias 65
+#define Exp_1  0x41000000
+#define Exp_11 0x41000000
+#define Ebits 8	/* exponent has 7 bits, but 8 is the right value in b2d */
+#define Frac_mask  0xffffff
+#define Frac_mask1 0xffffff
+#define Bletch 4
+#define Ten_pmax 22
+#define Bndry_mask  0xefffff
+#define Bndry_mask1 0xffffff
+#define LSB 1
+#define Sign_bit 0x80000000
+#define Log2P 4
+#define Tiny0 0x100000
+#define Tiny1 0
+#define Quick_max 14
+#define Int_max 15
+#else /* VAX */
+#define Exp_shift  23
+#define Exp_shift1 7
+#define Exp_msk1    0x80
+#define Exp_msk11   0x800000
+#define Exp_mask  0x7f80
+#define P 56
+#define Bias 129
+#define Exp_1  0x40800000
+#define Exp_11 0x4080
+#define Ebits 8
+#define Frac_mask  0x7fffff
+#define Frac_mask1 0xffff007f
+#define Ten_pmax 24
+#define Bletch 2
+#define Bndry_mask  0xffff007f
+#define Bndry_mask1 0xffff007f
+#define LSB 0x10000
+#define Sign_bit 0x8000
+#define Log2P 1
+#define Tiny0 0x80
+#define Tiny1 0
+#define Quick_max 15
+#define Int_max 15
+#endif
+#endif
+
+#ifndef IEEE_Arith
+#define ROUND_BIASED
+#endif
+
+#ifdef RND_PRODQUOT
+#define rounded_product(a,b) a = rnd_prod(a, b)
+#define rounded_quotient(a,b) a = rnd_quot(a, b)
+#ifdef KR_headers
+extern double rnd_prod(), rnd_quot();
+#else
+extern double rnd_prod(double, double), rnd_quot(double, double);
+#endif
+#else
+#define rounded_product(a,b) a *= b
+#define rounded_quotient(a,b) a /= b
+#endif
+
+#define Big0 (Frac_mask1 | Exp_msk1*(DBL_MAX_EXP+Bias-1))
+#define Big1 0xffffffff
+
+#ifndef Just_16
+/* When Pack_32 is not defined, we store 16 bits per 32-bit long.
+ * This makes some inner loops simpler and sometimes saves work
+ * during multiplications, but it often seems to make things slightly
+ * slower.  Hence the default is now to store 32 bits per long.
+ */
+#ifndef Pack_32
+#define Pack_32
+#endif
+#endif
+
+#define Kmax 15
+
+#ifdef __cplusplus
+extern "C" double bsd_strtod(const char *s00, char **se);
+extern "C" char *__dtoa(double d, int mode, int ndigits,
+			int *decpt, int *sign, char **rve, char **resultp);
+#endif
+
+ struct
+Bigint {
+	struct Bigint *next;
+	int k, maxwds, sign, wds;
+	unsigned long x[1];
+};
+
+ typedef struct Bigint Bigint;
+
+ static Bigint *
+Balloc
+#ifdef KR_headers
+	(k) int k;
+#else
+	(int k)
+#endif
+{
+	int x;
+	Bigint *rv;
+
+	x = 1 << k;
+	rv = (Bigint *)malloc(sizeof(Bigint) + (x-1)*sizeof(long));
+	rv->k = k;
+	rv->maxwds = x;
+	rv->sign = rv->wds = 0;
+	return rv;
+}
+
+ static void
+Bfree
+#ifdef KR_headers
+	(v) Bigint *v;
+#else
+	(Bigint *v)
+#endif
+{
+	free(v);
+}
+
+#define Bcopy(x,y) memcpy((char *)&x->sign, (char *)&y->sign, \
+y->wds*sizeof(long) + 2*sizeof(int))
+
+ static Bigint *
+multadd
+#ifdef KR_headers
+	(b, m, a) Bigint *b; int m, a;
+#else
+	(Bigint *b, int m, int a)	/* multiply by m and add a */
+#endif
+{
+	int i, wds;
+	unsigned long *x, y;
+#ifdef Pack_32
+	unsigned long xi, z;
+#endif
+	Bigint *b1;
+
+	wds = b->wds;
+	x = b->x;
+	i = 0;
+	do {
+#ifdef Pack_32
+		xi = *x;
+		y = (xi & 0xffff) * m + a;
+		z = (xi >> 16) * m + (y >> 16);
+		a = (int)(z >> 16);
+		*x++ = (z << 16) + (y & 0xffff);
+#else
+		y = *x * m + a;
+		a = (int)(y >> 16);
+		*x++ = y & 0xffff;
+#endif
+	} while (++i < wds);
+	if (a) {
+		if (wds >= b->maxwds) {
+			b1 = Balloc(b->k+1);
+			Bcopy(b1, b);
+			Bfree(b);
+			b = b1;
+			}
+		b->x[wds++] = a;
+		b->wds = wds;
+	}
+	return b;
+}
+
+ static Bigint *
+s2b
+#ifdef KR_headers
+	(s, nd0, nd, y9) CONST char *s; int nd0, nd; unsigned long y9;
+#else
+	(CONST char *s, int nd0, int nd, unsigned long y9)
+#endif
+{
+	Bigint *b;
+	int i, k;
+	long x, y;
+
+	x = (nd + 8) / 9;
+	for (k = 0, y = 1; x > y; y <<= 1, k++) ;
+#ifdef Pack_32
+	b = Balloc(k);
+	b->x[0] = y9;
+	b->wds = 1;
+#else
+	b = Balloc(k+1);
+	b->x[0] = y9 & 0xffff;
+	b->wds = (b->x[1] = y9 >> 16) ? 2 : 1;
+#endif
+
+	i = 9;
+	if (9 < nd0) {
+		s += 9;
+		do
+			b = multadd(b, 10, *s++ - '0');
+		while (++i < nd0);
+		s++;
+	} else
+		s += 10;
+	for (; i < nd; i++)
+		b = multadd(b, 10, *s++ - '0');
+	return b;
+}
+
+ static int
+hi0bits
+#ifdef KR_headers
+	(x) register unsigned long x;
+#else
+	(register unsigned long x)
+#endif
+{
+	register int k = 0;
+
+	if (!(x & 0xffff0000)) {
+		k = 16;
+		x <<= 16;
+	}
+	if (!(x & 0xff000000)) {
+		k += 8;
+		x <<= 8;
+	}
+	if (!(x & 0xf0000000)) {
+		k += 4;
+		x <<= 4;
+	}
+	if (!(x & 0xc0000000)) {
+		k += 2;
+		x <<= 2;
+	}
+	if (!(x & 0x80000000)) {
+		k++;
+		if (!(x & 0x40000000))
+			return 32;
+	}
+	return k;
+}
+
+ static int
+lo0bits
+#ifdef KR_headers
+	(y) unsigned long *y;
+#else
+	(unsigned long *y)
+#endif
+{
+	register int k;
+	register unsigned long x = *y;
+
+	if (x & 7) {
+		if (x & 1)
+			return 0;
+		if (x & 2) {
+			*y = x >> 1;
+			return 1;
+		}
+		*y = x >> 2;
+		return 2;
+	}
+	k = 0;
+	if (!(x & 0xffff)) {
+		k = 16;
+		x >>= 16;
+	}
+	if (!(x & 0xff)) {
+		k += 8;
+		x >>= 8;
+	}
+	if (!(x & 0xf)) {
+		k += 4;
+		x >>= 4;
+	}
+	if (!(x & 0x3)) {
+		k += 2;
+		x >>= 2;
+	}
+	if (!(x & 1)) {
+		k++;
+		x >>= 1;
+		if (!x & 1)
+			return 32;
+	}
+	*y = x;
+	return k;
+}
+
+ static Bigint *
+i2b
+#ifdef KR_headers
+	(i) int i;
+#else
+	(int i)
+#endif
+{
+	Bigint *b;
+
+	b = Balloc(1);
+	b->x[0] = i;
+	b->wds = 1;
+	return b;
+	}
+
+ static Bigint *
+mult
+#ifdef KR_headers
+	(a, b) Bigint *a, *b;
+#else
+	(Bigint *a, Bigint *b)
+#endif
+{
+	Bigint *c;
+	int k, wa, wb, wc;
+	unsigned long carry, y, z;
+	unsigned long *x, *xa, *xae, *xb, *xbe, *xc, *xc0;
+#ifdef Pack_32
+	unsigned long z2;
+#endif
+
+	if (a->wds < b->wds) {
+		c = a;
+		a = b;
+		b = c;
+	}
+	k = a->k;
+	wa = a->wds;
+	wb = b->wds;
+	wc = wa + wb;
+	if (wc > a->maxwds)
+		k++;
+	c = Balloc(k);
+	for (x = c->x, xa = x + wc; x < xa; x++)
+		*x = 0;
+	xa = a->x;
+	xae = xa + wa;
+	xb = b->x;
+	xbe = xb + wb;
+	xc0 = c->x;
+#ifdef Pack_32
+	for (; xb < xbe; xb++, xc0++) {
+		if ( (y = *xb & 0xffff) ) {
+			x = xa;
+			xc = xc0;
+			carry = 0;
+			do {
+				z = (*x & 0xffff) * y + (*xc & 0xffff) + carry;
+				carry = z >> 16;
+				z2 = (*x++ >> 16) * y + (*xc >> 16) + carry;
+				carry = z2 >> 16;
+				Storeinc(xc, z2, z);
+			} while (x < xae);
+			*xc = carry;
+		}
+		if ( (y = *xb >> 16) ) {
+			x = xa;
+			xc = xc0;
+			carry = 0;
+			z2 = *xc;
+			do {
+				z = (*x & 0xffff) * y + (*xc >> 16) + carry;
+				carry = z >> 16;
+				Storeinc(xc, z, z2);
+				z2 = (*x++ >> 16) * y + (*xc & 0xffff) + carry;
+				carry = z2 >> 16;
+			} while (x < xae);
+			*xc = z2;
+		}
+	}
+#else
+	for (; xb < xbe; xc0++) {
+		if (y = *xb++) {
+			x = xa;
+			xc = xc0;
+			carry = 0;
+			do {
+				z = *x++ * y + *xc + carry;
+				carry = z >> 16;
+				*xc++ = z & 0xffff;
+			} while (x < xae);
+			*xc = carry;
+		}
+	}
+#endif
+	for (xc0 = c->x, xc = xc0 + wc; wc > 0 && !*--xc; --wc) ;
+	c->wds = wc;
+	return c;
+}
+
+ static Bigint *p5s;
+
+ static Bigint *
+pow5mult
+#ifdef KR_headers
+	(b, k) Bigint *b; int k;
+#else
+	(Bigint *b, int k)
+#endif
+{
+	Bigint *b1, *p5, *p51;
+	int i;
+	static int p05[3] = { 5, 25, 125 };
+
+	if ( (i = k & 3) )
+		b = multadd(b, p05[i-1], 0);
+
+	if (!(k >>= 2))
+		return b;
+	if (!(p5 = p5s)) {
+		/* first time */
+		p5 = p5s = i2b(625);
+		p5->next = 0;
+	}
+	for (;;) {
+		if (k & 1) {
+			b1 = mult(b, p5);
+			Bfree(b);
+			b = b1;
+		}
+		if (!(k >>= 1))
+			break;
+		if (!(p51 = p5->next)) {
+			p51 = p5->next = mult(p5,p5);
+			p51->next = 0;
+		}
+		p5 = p51;
+	}
+	return b;
+}
+
+ static Bigint *
+lshift
+#ifdef KR_headers
+	(b, k) Bigint *b; int k;
+#else
+	(Bigint *b, int k)
+#endif
+{
+	int i, k1, n, n1;
+	Bigint *b1;
+	unsigned long *x, *x1, *xe, z;
+
+#ifdef Pack_32
+	n = k >> 5;
+#else
+	n = k >> 4;
+#endif
+	k1 = b->k;
+	n1 = n + b->wds + 1;
+	for (i = b->maxwds; n1 > i; i <<= 1)
+		k1++;
+	b1 = Balloc(k1);
+	x1 = b1->x;
+	for (i = 0; i < n; i++)
+		*x1++ = 0;
+	x = b->x;
+	xe = x + b->wds;
+#ifdef Pack_32
+	if (k &= 0x1f) {
+		k1 = 32 - k;
+		z = 0;
+		do {
+			*x1++ = *x << k | z;
+			z = *x++ >> k1;
+		} while (x < xe);
+		if ( (*x1 = z) )
+			++n1;
+	}
+#else
+	if (k &= 0xf) {
+		k1 = 16 - k;
+		z = 0;
+		do {
+			*x1++ = *x << k  & 0xffff | z;
+			z = *x++ >> k1;
+		} while (x < xe);
+		if (*x1 = z)
+			++n1;
+	}
+#endif
+	else
+		do
+			*x1++ = *x++;
+		while (x < xe);
+	b1->wds = n1 - 1;
+	Bfree(b);
+	return b1;
+}
+
+ static int
+cmp
+#ifdef KR_headers
+	(a, b) Bigint *a, *b;
+#else
+	(Bigint *a, Bigint *b)
+#endif
+{
+	unsigned long *xa, *xa0, *xb, *xb0;
+	int i, j;
+
+	i = a->wds;
+	j = b->wds;
+#ifdef DEBUG
+	if (i > 1 && !a->x[i-1])
+		Bug("cmp called with a->x[a->wds-1] == 0");
+	if (j > 1 && !b->x[j-1])
+		Bug("cmp called with b->x[b->wds-1] == 0");
+#endif
+	if (i -= j)
+		return i;
+	xa0 = a->x;
+	xa = xa0 + j;
+	xb0 = b->x;
+	xb = xb0 + j;
+	for (;;) {
+		if (*--xa != *--xb)
+			return *xa < *xb ? -1 : 1;
+		if (xa <= xa0)
+			break;
+	}
+	return 0;
+}
+
+ static Bigint *
+diff
+#ifdef KR_headers
+	(a, b) Bigint *a, *b;
+#else
+	(Bigint *a, Bigint *b)
+#endif
+{
+	Bigint *c;
+	int i, wa, wb;
+	long borrow, y;	/* We need signed shifts here. */
+	unsigned long *xa, *xae, *xb, *xbe, *xc;
+#ifdef Pack_32
+	long z;
+#endif
+
+	i = cmp(a,b);
+	if (!i) {
+		c = Balloc(0);
+		c->wds = 1;
+		c->x[0] = 0;
+		return c;
+	}
+	if (i < 0) {
+		c = a;
+		a = b;
+		b = c;
+		i = 1;
+	} else
+		i = 0;
+	c = Balloc(a->k);
+	c->sign = i;
+	wa = a->wds;
+	xa = a->x;
+	xae = xa + wa;
+	wb = b->wds;
+	xb = b->x;
+	xbe = xb + wb;
+	xc = c->x;
+	borrow = 0;
+#ifdef Pack_32
+	do {
+		y = (*xa & 0xffff) - (*xb & 0xffff) + borrow;
+		borrow = y >> 16;
+		Sign_Extend(borrow, y);
+		z = (*xa++ >> 16) - (*xb++ >> 16) + borrow;
+		borrow = z >> 16;
+		Sign_Extend(borrow, z);
+		Storeinc(xc, z, y);
+	} while (xb < xbe);
+	while (xa < xae) {
+		y = (*xa & 0xffff) + borrow;
+		borrow = y >> 16;
+		Sign_Extend(borrow, y);
+		z = (*xa++ >> 16) + borrow;
+		borrow = z >> 16;
+		Sign_Extend(borrow, z);
+		Storeinc(xc, z, y);
+	}
+#else
+	do {
+		y = *xa++ - *xb++ + borrow;
+		borrow = y >> 16;
+		Sign_Extend(borrow, y);
+		*xc++ = y & 0xffff;
+	} while (xb < xbe);
+	while (xa < xae) {
+		y = *xa++ + borrow;
+		borrow = y >> 16;
+		Sign_Extend(borrow, y);
+		*xc++ = y & 0xffff;
+	}
+#endif
+	while (!*--xc)
+		wa--;
+	c->wds = wa;
+	return c;
+}
+
+ static double
+ulp
+#ifdef KR_headers
+	(x) double x;
+#else
+	(double x)
+#endif
+{
+	register long L;
+	double a;
+
+	L = (word0(x) & Exp_mask) - (P-1)*Exp_msk1;
+#ifndef Sudden_Underflow
+	if (L > 0) {
+#endif
+#ifdef IBM
+		L |= Exp_msk1 >> 4;
+#endif
+		word0(a) = L;
+		word1(a) = 0;
+#ifndef Sudden_Underflow
+	} else {
+		L = -L >> Exp_shift;
+		if (L < Exp_shift) {
+			word0(a) = 0x80000 >> L;
+			word1(a) = 0;
+		} else {
+			word0(a) = 0;
+			L -= Exp_shift;
+			word1(a) = L >= 31 ? 1 : 1 << (31 - L);
+		}
+	}
+#endif
+	return a;
+}
+
+ static double
+b2d
+#ifdef KR_headers
+	(a, e) Bigint *a; int *e;
+#else
+	(Bigint *a, int *e)
+#endif
+{
+	unsigned long *xa, *xa0, w, y, z;
+	int k;
+	double d;
+#ifdef VAX
+	unsigned long d0, d1;
+#else
+#define d0 word0(d)
+#define d1 word1(d)
+#endif
+
+	xa0 = a->x;
+	xa = xa0 + a->wds;
+	y = *--xa;
+#ifdef DEBUG
+	if (!y) Bug("zero y in b2d");
+#endif
+	k = hi0bits(y);
+	*e = 32 - k;
+#ifdef Pack_32
+	if (k < Ebits) {
+		d0 = Exp_1 | (y >> (Ebits - k));
+		w = xa > xa0 ? *--xa : 0;
+		d1 = (y << ((32-Ebits) + k)) | (w >> (Ebits - k));
+		goto ret_d;
+		}
+	z = xa > xa0 ? *--xa : 0;
+	if (k -= Ebits) {
+		d0 = Exp_1 | (y << k) | (z >> (32 - k));
+		y = xa > xa0 ? *--xa : 0;
+		d1 = (z << k) | (y >> (32 - k));
+	} else {
+		d0 = Exp_1 | y;
+		d1 = z;
+	}
+#else
+	if (k < Ebits + 16) {
+		z = xa > xa0 ? *--xa : 0;
+		d0 = Exp_1 | y << k - Ebits | z >> Ebits + 16 - k;
+		w = xa > xa0 ? *--xa : 0;
+		y = xa > xa0 ? *--xa : 0;
+		d1 = z << k + 16 - Ebits | w << k - Ebits | y >> 16 + Ebits - k;
+		goto ret_d;
+	}
+	z = xa > xa0 ? *--xa : 0;
+	w = xa > xa0 ? *--xa : 0;
+	k -= Ebits + 16;
+	d0 = Exp_1 | y << k + 16 | z << k | w >> 16 - k;
+	y = xa > xa0 ? *--xa : 0;
+	d1 = w << k + 16 | y << k;
+#endif
+ ret_d:
+#ifdef VAX
+	word0(d) = d0 >> 16 | d0 << 16;
+	word1(d) = d1 >> 16 | d1 << 16;
+#else
+#undef d0
+#undef d1
+#endif
+	return d;
+}
+
+ static Bigint *
+d2b
+#ifdef KR_headers
+	(d, e, bits) double d; int *e, *bits;
+#else
+	(double d, int *e, int *bits)
+#endif
+{
+	Bigint *b;
+	int de, i, k;
+	unsigned long *x, y, z;
+#ifdef VAX
+	unsigned long d0, d1;
+	d0 = word0(d) >> 16 | word0(d) << 16;
+	d1 = word1(d) >> 16 | word1(d) << 16;
+#else
+#define d0 word0(d)
+#define d1 word1(d)
+#endif
+
+#ifdef Pack_32
+	b = Balloc(1);
+#else
+	b = Balloc(2);
+#endif
+	x = b->x;
+
+	z = d0 & Frac_mask;
+	d0 &= 0x7fffffff;	/* clear sign bit, which we ignore */
+#ifdef Sudden_Underflow
+	de = (int)(d0 >> Exp_shift);
+#ifndef IBM
+	z |= Exp_msk11;
+#endif
+#else
+	if ( (de = (int)(d0 >> Exp_shift)) )
+		z |= Exp_msk1;
+#endif
+#ifdef Pack_32
+	if ( (y = d1) ) {
+		if ( (k = lo0bits(&y)) ) {
+			x[0] = y | (z << (32 - k));
+			z >>= k;
+			}
+		else
+			x[0] = y;
+		i = b->wds = (x[1] = z) ? 2 : 1;
+	} else {
+#ifdef DEBUG
+		if (!z)
+			Bug("Zero passed to d2b");
+#endif
+		k = lo0bits(&z);
+		x[0] = z;
+		i = b->wds = 1;
+		k += 32;
+	}
+#else
+	if (y = d1) {
+		if (k = lo0bits(&y))
+			if (k >= 16) {
+				x[0] = y | z << 32 - k & 0xffff;
+				x[1] = z >> k - 16 & 0xffff;
+				x[2] = z >> k;
+				i = 2;
+			} else {
+				x[0] = y & 0xffff;
+				x[1] = y >> 16 | z << 16 - k & 0xffff;
+				x[2] = z >> k & 0xffff;
+				x[3] = z >> k+16;
+				i = 3;
+			}
+		else {
+			x[0] = y & 0xffff;
+			x[1] = y >> 16;
+			x[2] = z & 0xffff;
+			x[3] = z >> 16;
+			i = 3;
+		}
+	} else {
+#ifdef DEBUG
+		if (!z)
+			Bug("Zero passed to d2b");
+#endif
+		k = lo0bits(&z);
+		if (k >= 16) {
+			x[0] = z;
+			i = 0;
+		} else {
+			x[0] = z & 0xffff;
+			x[1] = z >> 16;
+			i = 1;
+		}
+		k += 32;
+	}
+	while (!x[i])
+		--i;
+	b->wds = i + 1;
+#endif
+#ifndef Sudden_Underflow
+	if (de) {
+#endif
+#ifdef IBM
+		*e = (de - Bias - (P-1) << 2) + k;
+		*bits = 4*P + 8 - k - hi0bits(word0(d) & Frac_mask);
+#else
+		*e = de - Bias - (P-1) + k;
+		*bits = P - k;
+#endif
+#ifndef Sudden_Underflow
+	} else {
+		*e = de - Bias - (P-1) + 1 + k;
+#ifdef Pack_32
+		*bits = 32*i - hi0bits(x[i-1]);
+#else
+		*bits = (i+2)*16 - hi0bits(x[i]);
+#endif
+	}
+#endif
+	return b;
+}
+#undef d0
+#undef d1
+
+ static double
+ratio
+#ifdef KR_headers
+	(a, b) Bigint *a, *b;
+#else
+	(Bigint *a, Bigint *b)
+#endif
+{
+	double da, db;
+	int k, ka, kb;
+
+	da = b2d(a, &ka);
+	db = b2d(b, &kb);
+#ifdef Pack_32
+	k = ka - kb + 32*(a->wds - b->wds);
+#else
+	k = ka - kb + 16*(a->wds - b->wds);
+#endif
+#ifdef IBM
+	if (k > 0) {
+		word0(da) += (k >> 2)*Exp_msk1;
+		if (k &= 3)
+			da *= 1 << k;
+	} else {
+		k = -k;
+		word0(db) += (k >> 2)*Exp_msk1;
+		if (k &= 3)
+			db *= 1 << k;
+	}
+#else
+	if (k > 0)
+		word0(da) += k*Exp_msk1;
+	else {
+		k = -k;
+		word0(db) += k*Exp_msk1;
+	}
+#endif
+	return da / db;
+}
+
+ static double
+tens[] = {
+		1e0, 1e1, 1e2, 1e3, 1e4, 1e5, 1e6, 1e7, 1e8, 1e9,
+		1e10, 1e11, 1e12, 1e13, 1e14, 1e15, 1e16, 1e17, 1e18, 1e19,
+		1e20, 1e21, 1e22
+#ifdef VAX
+		, 1e23, 1e24
+#endif
+		};
+
+ static double
+#ifdef IEEE_Arith
+bigtens[] = { 1e16, 1e32, 1e64, 1e128, 1e256 };
+static double tinytens[] = { 1e-16, 1e-32, 1e-64, 1e-128, 1e-256 };
+#define n_bigtens 5
+#else
+#ifdef IBM
+bigtens[] = { 1e16, 1e32, 1e64 };
+static double tinytens[] = { 1e-16, 1e-32, 1e-64 };
+#define n_bigtens 3
+#else
+bigtens[] = { 1e16, 1e32 };
+static double tinytens[] = { 1e-16, 1e-32 };
+#define n_bigtens 2
+#endif
+#endif
+
+ double
+bsd_strtod
+#ifdef KR_headers
+	(s00, se) CONST char *s00; char **se;
+#else
+	(CONST char *s00, char **se)
+#endif
+{
+	int bb2, bb5, bbe, bd2, bd5, bbbits, bs2, c, dsign,
+		 e, e1, esign, i, j, k, nd, nd0, nf, nz, nz0, sign;
+	CONST char *s, *s0, *s1;
+	double aadj, aadj1, adj, rv, rv0;
+	long L;
+	unsigned long y, z;
+	Bigint *bb, *bb1, *bd, *bd0, *bs, *delta;
+	char decimal_point = '.';
+
+	sign = nz0 = nz = 0;
+	rv = 0.;
+	for (s = s00;;s++) switch(*s) {
+		case '-':
+			sign = 1;
+			/* no break */
+		case '+':
+			if (*++s)
+				goto break2;
+			/* no break */
+		case 0:
+			s = s00;
+			goto ret;
+		default:
+			if (isspace((unsigned char)*s))
+				continue;
+			goto break2;
+	}
+ break2:
+	if (*s == '0') {
+		nz0 = 1;
+		while (*++s == '0') ;
+		if (!*s)
+			goto ret;
+	}
+	s0 = s;
+	y = z = 0;
+	for (nd = nf = 0; (c = *s) >= '0' && c <= '9'; nd++, s++)
+		if (nd < 9)
+			y = 10*y + c - '0';
+		else if (nd < 16)
+			z = 10*z + c - '0';
+	nd0 = nd;
+	if ((char)c == decimal_point) {
+		c = *++s;
+		if (!nd) {
+			for (; c == '0'; c = *++s)
+				nz++;
+			if (c > '0' && c <= '9') {
+				s0 = s;
+				nf += nz;
+				nz = 0;
+				goto have_dig;
+			}
+			goto dig_done;
+		}
+		for (; c >= '0' && c <= '9'; c = *++s) {
+ have_dig:
+			nz++;
+			if (c -= '0') {
+				nf += nz;
+				for (i = 1; i < nz; i++)
+					if (nd++ < 9)
+						y *= 10;
+					else if (nd <= DBL_DIG + 1)
+						z *= 10;
+				if (nd++ < 9)
+					y = 10*y + c;
+				else if (nd <= DBL_DIG + 1)
+					z = 10*z + c;
+				nz = 0;
+			}
+		}
+	}
+ dig_done:
+	e = 0;
+	if (c == 'e' || c == 'E') {
+		if (!nd && !nz && !nz0) {
+			s = s00;
+			goto ret;
+		}
+		s00 = s;
+		esign = 0;
+		switch(c = *++s) {
+			case '-':
+				esign = 1;
+			case '+':
+				c = *++s;
+		}
+		if (c >= '0' && c <= '9') {
+			while (c == '0')
+				c = *++s;
+			if (c > '0' && c <= '9') {
+				L = c - '0';
+				s1 = s;
+				while ((c = *++s) >= '0' && c <= '9')
+					L = 10*L + c - '0';
+				if (s - s1 > 8 || L > 19999)
+					/* Avoid confusion from exponents
+					 * so large that e might overflow.
+					 */
+					e = 19999; /* safe for 16 bit ints */
+				else
+					e = (int)L;
+				if (esign)
+					e = -e;
+			} else
+				e = 0;
+		} else
+			s = s00;
+	}
+	if (!nd) {
+		if (!nz && !nz0)
+			s = s00;
+		goto ret;
+	}
+	e1 = e -= nf;
+
+	/* Now we have nd0 digits, starting at s0, followed by a
+	 * decimal point, followed by nd-nd0 digits.  The number we're
+	 * after is the integer represented by those digits times
+	 * 10**e */
+
+	if (!nd0)
+		nd0 = nd;
+	k = nd < DBL_DIG + 1 ? nd : DBL_DIG + 1;
+	rv = y;
+	if (k > 9)
+		rv = tens[k - 9] * rv + z;
+	if (nd <= DBL_DIG
+#ifndef RND_PRODQUOT
+		&& FLT_ROUNDS == 1
+#endif
+			) {
+		if (!e)
+			goto ret;
+		if (e > 0) {
+			if (e <= Ten_pmax) {
+#ifdef VAX
+				goto vax_ovfl_check;
+#else
+				/* rv = */ rounded_product(rv, tens[e]);
+				goto ret;
+#endif
+				}
+			i = DBL_DIG - nd;
+			if (e <= Ten_pmax + i) {
+				/* A fancier test would sometimes let us do
+				 * this for larger i values.
+				 */
+				e -= i;
+				rv *= tens[i];
+#ifdef VAX
+				/* VAX exponent range is so narrow we must
+				 * worry about overflow here...
+				 */
+ vax_ovfl_check:
+				word0(rv) -= P*Exp_msk1;
+				/* rv = */ rounded_product(rv, tens[e]);
+				if ((word0(rv) & Exp_mask)
+				 > Exp_msk1*(DBL_MAX_EXP+Bias-1-P))
+					goto ovfl;
+				word0(rv) += P*Exp_msk1;
+#else
+				/* rv = */ rounded_product(rv, tens[e]);
+#endif
+				goto ret;
+			}
+		}
+#ifndef Inaccurate_Divide
+		else if (e >= -Ten_pmax) {
+			/* rv = */ rounded_quotient(rv, tens[-e]);
+			goto ret;
+		}
+#endif
+	}
+	e1 += nd - k;
+
+	/* Get starting approximation = rv * 10**e1 */
+
+	if (e1 > 0) {
+		if ( (i = e1 & 15) )
+			rv *= tens[i];
+		if ( (e1 &= ~15) ) {
+			if (e1 > DBL_MAX_10_EXP) {
+ ovfl:
+				errno = ERANGE;
+#ifdef __STDC__
+				rv = HUGE_VAL;
+#else
+				/* Can't trust HUGE_VAL */
+#ifdef IEEE_Arith
+				word0(rv) = Exp_mask;
+				word1(rv) = 0;
+#else
+				word0(rv) = Big0;
+				word1(rv) = Big1;
+#endif
+#endif
+				goto ret;
+			}
+			if (e1 >>= 4) {
+				for (j = 0; e1 > 1; j++, e1 >>= 1)
+					if (e1 & 1)
+						rv *= bigtens[j];
+			/* The last multiplication could overflow. */
+				word0(rv) -= P*Exp_msk1;
+				rv *= bigtens[j];
+				if ((z = word0(rv) & Exp_mask)
+				 > Exp_msk1*(DBL_MAX_EXP+Bias-P))
+					goto ovfl;
+				if (z > Exp_msk1*(DBL_MAX_EXP+Bias-1-P)) {
+					/* set to largest number */
+					/* (Can't trust DBL_MAX) */
+					word0(rv) = Big0;
+					word1(rv) = Big1;
+					}
+				else
+					word0(rv) += P*Exp_msk1;
+			}
+		}
+	} else if (e1 < 0) {
+		e1 = -e1;
+		if ( (i = e1 & 15) )
+			rv /= tens[i];
+		if ( (e1 &= ~15) ) {
+			e1 >>= 4;
+			for (j = 0; e1 > 1; j++, e1 >>= 1)
+				if (e1 & 1)
+					rv *= tinytens[j];
+			/* The last multiplication could underflow. */
+			rv0 = rv;
+			rv *= tinytens[j];
+			if (!rv) {
+				rv = 2.*rv0;
+				rv *= tinytens[j];
+				if (!rv) {
+ undfl:
+					rv = 0.;
+					errno = ERANGE;
+					goto ret;
+					}
+				word0(rv) = Tiny0;
+				word1(rv) = Tiny1;
+				/* The refinement below will clean
+				 * this approximation up.
+				 */
+			}
+		}
+	}
+
+	/* Now the hard part -- adjusting rv to the correct value.*/
+
+	/* Put digits into bd: true value = bd * 10^e */
+
+	bd0 = s2b(s0, nd0, nd, y);
+
+	for (;;) {
+		bd = Balloc(bd0->k);
+		Bcopy(bd, bd0);
+		bb = d2b(rv, &bbe, &bbbits);	/* rv = bb * 2^bbe */
+		bs = i2b(1);
+
+		if (e >= 0) {
+			bb2 = bb5 = 0;
+			bd2 = bd5 = e;
+		} else {
+			bb2 = bb5 = -e;
+			bd2 = bd5 = 0;
+		}
+		if (bbe >= 0)
+			bb2 += bbe;
+		else
+			bd2 -= bbe;
+		bs2 = bb2;
+#ifdef Sudden_Underflow
+#ifdef IBM
+		j = 1 + 4*P - 3 - bbbits + ((bbe + bbbits - 1) & 3);
+#else
+		j = P + 1 - bbbits;
+#endif
+#else
+		i = bbe + bbbits - 1;	/* logb(rv) */
+		if (i < Emin)	/* denormal */
+			j = bbe + (P-Emin);
+		else
+			j = P + 1 - bbbits;
+#endif
+		bb2 += j;
+		bd2 += j;
+		i = bb2 < bd2 ? bb2 : bd2;
+		if (i > bs2)
+			i = bs2;
+		if (i > 0) {
+			bb2 -= i;
+			bd2 -= i;
+			bs2 -= i;
+			}
+		if (bb5 > 0) {
+			bs = pow5mult(bs, bb5);
+			bb1 = mult(bs, bb);
+			Bfree(bb);
+			bb = bb1;
+			}
+		if (bb2 > 0)
+			bb = lshift(bb, bb2);
+		if (bd5 > 0)
+			bd = pow5mult(bd, bd5);
+		if (bd2 > 0)
+			bd = lshift(bd, bd2);
+		if (bs2 > 0)
+			bs = lshift(bs, bs2);
+		delta = diff(bb, bd);
+		dsign = delta->sign;
+		delta->sign = 0;
+		i = cmp(delta, bs);
+		if (i < 0) {
+			/* Error is less than half an ulp -- check for
+			 * special case of mantissa a power of two.
+			 */
+			if (dsign || word1(rv) || word0(rv) & Bndry_mask)
+				break;
+			delta = lshift(delta,Log2P);
+			if (cmp(delta, bs) > 0)
+				goto drop_down;
+			break;
+		}
+		if (i == 0) {
+			/* exactly half-way between */
+			if (dsign) {
+				if ((word0(rv) & Bndry_mask1) == Bndry_mask1
+				 &&  word1(rv) == 0xffffffff) {
+					/*boundary case -- increment exponent*/
+					word0(rv) = (word0(rv) & Exp_mask)
+						+ Exp_msk1
+#ifdef IBM
+						| Exp_msk1 >> 4
+#endif
+						;
+					word1(rv) = 0;
+					break;
+				}
+			} else if (!(word0(rv) & Bndry_mask) && !word1(rv)) {
+ drop_down:
+				/* boundary case -- decrement exponent */
+#ifdef Sudden_Underflow
+				L = word0(rv) & Exp_mask;
+#ifdef IBM
+				if (L <  Exp_msk1)
+#else
+				if (L <= Exp_msk1)
+#endif
+					goto undfl;
+				L -= Exp_msk1;
+#else
+				L = (word0(rv) & Exp_mask) - Exp_msk1;
+#endif
+				word0(rv) = L | Bndry_mask1;
+				word1(rv) = 0xffffffff;
+#ifdef IBM
+				goto cont;
+#else
+				break;
+#endif
+			}
+#ifndef ROUND_BIASED
+			if (!(word1(rv) & LSB))
+				break;
+#endif
+			if (dsign)
+				rv += ulp(rv);
+#ifndef ROUND_BIASED
+			else {
+				rv -= ulp(rv);
+#ifndef Sudden_Underflow
+				if (!rv)
+					goto undfl;
+#endif
+			}
+#endif
+			break;
+		}
+		if ((aadj = ratio(delta, bs)) <= 2.) {
+			if (dsign)
+				aadj = aadj1 = 1.;
+			else if (word1(rv) || word0(rv) & Bndry_mask) {
+#ifndef Sudden_Underflow
+				if (word1(rv) == Tiny1 && !word0(rv))
+					goto undfl;
+#endif
+				aadj = 1.;
+				aadj1 = -1.;
+			} else {
+				/* special case -- power of FLT_RADIX to be */
+				/* rounded down... */
+
+				if (aadj < 2./FLT_RADIX)
+					aadj = 1./FLT_RADIX;
+				else
+					aadj *= 0.5;
+				aadj1 = -aadj;
+			}
+		} else {
+			aadj *= 0.5;
+			aadj1 = dsign ? aadj : -aadj;
+#ifdef Check_FLT_ROUNDS
+			switch(FLT_ROUNDS) {
+				case 2: /* towards +infinity */
+					aadj1 -= 0.5;
+					break;
+				case 0: /* towards 0 */
+				case 3: /* towards -infinity */
+					aadj1 += 0.5;
+			}
+#else
+			if (FLT_ROUNDS == 0)
+				aadj1 += 0.5;
+#endif
+		}
+		y = word0(rv) & Exp_mask;
+
+		/* Check for overflow */
+
+		if (y == Exp_msk1*(DBL_MAX_EXP+Bias-1)) {
+			rv0 = rv;
+			word0(rv) -= P*Exp_msk1;
+			adj = aadj1 * ulp(rv);
+			rv += adj;
+			if ((word0(rv) & Exp_mask) >=
+					Exp_msk1*(DBL_MAX_EXP+Bias-P)) {
+				if (word0(rv0) == Big0 && word1(rv0) == Big1)
+					goto ovfl;
+				word0(rv) = Big0;
+				word1(rv) = Big1;
+				goto cont;
+			} else
+				word0(rv) += P*Exp_msk1;
+		} else {
+#ifdef Sudden_Underflow
+			if ((word0(rv) & Exp_mask) <= P*Exp_msk1) {
+				rv0 = rv;
+				word0(rv) += P*Exp_msk1;
+				adj = aadj1 * ulp(rv);
+				rv += adj;
+#ifdef IBM
+				if ((word0(rv) & Exp_mask) <  P*Exp_msk1)
+#else
+				if ((word0(rv) & Exp_mask) <= P*Exp_msk1)
+#endif
+				{
+					if (word0(rv0) == Tiny0
+					 && word1(rv0) == Tiny1)
+						goto undfl;
+					word0(rv) = Tiny0;
+					word1(rv) = Tiny1;
+					goto cont;
+				} else
+					word0(rv) -= P*Exp_msk1;
+			} else {
+				adj = aadj1 * ulp(rv);
+				rv += adj;
+			}
+#else
+			/* Compute adj so that the IEEE rounding rules will
+			 * correctly round rv + adj in some half-way cases.
+			 * If rv * ulp(rv) is denormalized (i.e.,
+			 * y <= (P-1)*Exp_msk1), we must adjust aadj to avoid
+			 * trouble from bits lost to denormalization;
+			 * example: 1.2e-307 .
+			 */
+			if (y <= (P-1)*Exp_msk1 && aadj >= 1.) {
+				aadj1 = (double)(int)(aadj + 0.5);
+				if (!dsign)
+					aadj1 = -aadj1;
+			}
+			adj = aadj1 * ulp(rv);
+			rv += adj;
+#endif
+		}
+		z = word0(rv) & Exp_mask;
+		if (y == z) {
+			/* Can we stop now? */
+			L = aadj;
+			aadj -= L;
+			/* The tolerances below are conservative. */
+			if (dsign || word1(rv) || word0(rv) & Bndry_mask) {
+				if (aadj < .4999999 || aadj > .5000001)
+					break;
+			} else if (aadj < .4999999/FLT_RADIX)
+				break;
+		}
+ cont:
+		Bfree(bb);
+		Bfree(bd);
+		Bfree(bs);
+		Bfree(delta);
+	}
+	Bfree(bb);
+	Bfree(bd);
+	Bfree(bs);
+	Bfree(bd0);
+	Bfree(delta);
+ ret:
+	if (se)
+		*se = (char *)s;
+	return sign ? -rv : rv;
+}
+
+ static int
+quorem
+#ifdef KR_headers
+	(b, S) Bigint *b, *S;
+#else
+	(Bigint *b, Bigint *S)
+#endif
+{
+	int n;
+	long borrow, y;
+	unsigned long carry, q, ys;
+	unsigned long *bx, *bxe, *sx, *sxe;
+#ifdef Pack_32
+	long z;
+	unsigned long si, zs;
+#endif
+
+	n = S->wds;
+#ifdef DEBUG
+	/*debug*/ if (b->wds > n)
+	/*debug*/	Bug("oversize b in quorem");
+#endif
+	if (b->wds < n)
+		return 0;
+	sx = S->x;
+	sxe = sx + --n;
+	bx = b->x;
+	bxe = bx + n;
+	q = *bxe / (*sxe + 1);	/* ensure q <= true quotient */
+#ifdef DEBUG
+	/*debug*/ if (q > 9)
+	/*debug*/	Bug("oversized quotient in quorem");
+#endif
+	if (q) {
+		borrow = 0;
+		carry = 0;
+		do {
+#ifdef Pack_32
+			si = *sx++;
+			ys = (si & 0xffff) * q + carry;
+			zs = (si >> 16) * q + (ys >> 16);
+			carry = zs >> 16;
+			y = (*bx & 0xffff) - (ys & 0xffff) + borrow;
+			borrow = y >> 16;
+			Sign_Extend(borrow, y);
+			z = (*bx >> 16) - (zs & 0xffff) + borrow;
+			borrow = z >> 16;
+			Sign_Extend(borrow, z);
+			Storeinc(bx, z, y);
+#else
+			ys = *sx++ * q + carry;
+			carry = ys >> 16;
+			y = *bx - (ys & 0xffff) + borrow;
+			borrow = y >> 16;
+			Sign_Extend(borrow, y);
+			*bx++ = y & 0xffff;
+#endif
+		} while (sx <= sxe);
+		if (!*bxe) {
+			bx = b->x;
+			while (--bxe > bx && !*bxe)
+				--n;
+			b->wds = n;
+		}
+	}
+	if (cmp(b, S) >= 0) {
+		q++;
+		borrow = 0;
+		carry = 0;
+		bx = b->x;
+		sx = S->x;
+		do {
+#ifdef Pack_32
+			si = *sx++;
+			ys = (si & 0xffff) + carry;
+			zs = (si >> 16) + (ys >> 16);
+			carry = zs >> 16;
+			y = (*bx & 0xffff) - (ys & 0xffff) + borrow;
+			borrow = y >> 16;
+			Sign_Extend(borrow, y);
+			z = (*bx >> 16) - (zs & 0xffff) + borrow;
+			borrow = z >> 16;
+			Sign_Extend(borrow, z);
+			Storeinc(bx, z, y);
+#else
+			ys = *sx++ + carry;
+			carry = ys >> 16;
+			y = *bx - (ys & 0xffff) + borrow;
+			borrow = y >> 16;
+			Sign_Extend(borrow, y);
+			*bx++ = y & 0xffff;
+#endif
+		} while (sx <= sxe);
+		bx = b->x;
+		bxe = bx + n;
+		if (!*bxe) {
+			while (--bxe > bx && !*bxe)
+				--n;
+			b->wds = n;
+		}
+	}
+	return q;
+}
+
+/* dtoa for IEEE arithmetic (dmg): convert double to ASCII string.
+ *
+ * Inspired by "How to Print Floating-Point Numbers Accurately" by
+ * Guy L. Steele, Jr. and Jon L. White [Proc. ACM SIGPLAN '90, pp. 92-101].
+ *
+ * Modifications:
+ *	1. Rather than iterating, we use a simple numeric overestimate
+ *	   to determine k = floor(log10(d)).  We scale relevant
+ *	   quantities using O(log2(k)) rather than O(k) multiplications.
+ *	2. For some modes > 2 (corresponding to ecvt and fcvt), we don't
+ *	   try to generate digits strictly left to right.  Instead, we
+ *	   compute with fewer bits and propagate the carry if necessary
+ *	   when rounding the final digit up.  This is often faster.
+ *	3. Under the assumption that input will be rounded nearest,
+ *	   mode 0 renders 1e23 as 1e23 rather than 9.999999999999999e22.
+ *	   That is, we allow equality in stopping tests when the
+ *	   round-nearest rule will give the same floating-point value
+ *	   as would satisfaction of the stopping test with strict
+ *	   inequality.
+ *	4. We remove common factors of powers of 2 from relevant
+ *	   quantities.
+ *	5. When converting floating-point integers less than 1e16,
+ *	   we use floating-point arithmetic rather than resorting
+ *	   to multiple-precision integers.
+ *	6. When asked to produce fewer than 15 digits, we first try
+ *	   to get by with floating-point arithmetic; we resort to
+ *	   multiple-precision integer arithmetic only if we cannot
+ *	   guarantee that the floating-point calculation has given
+ *	   the correctly rounded result.  For k requested digits and
+ *	   "uniformly" distributed input, the probability is
+ *	   something like 10^(k-15) that we must resort to the long
+ *	   calculation.
+ */
+
+char *
+__bsd_dtoa
+#ifdef KR_headers
+	(d, mode, ndigits, decpt, sign, rve, resultp)
+	double d; int mode, ndigits, *decpt, *sign; char **rve, **resultp;
+#else
+	(double d, int mode, int ndigits, int *decpt, int *sign, char **rve,
+	 char **resultp)
+#endif
+{
+ /*	Arguments ndigits, decpt, sign are similar to those
+	of ecvt and fcvt; trailing zeros are suppressed from
+	the returned string.  If not null, *rve is set to point
+	to the end of the return value.  If d is +-Infinity or NaN,
+	then *decpt is set to 9999.
+
+	mode:
+		0 ==> shortest string that yields d when read in
+			and rounded to nearest.
+		1 ==> like 0, but with Steele & White stopping rule;
+			e.g. with IEEE P754 arithmetic , mode 0 gives
+			1e23 whereas mode 1 gives 9.999999999999999e22.
+		2 ==> max(1,ndigits) significant digits.  This gives a
+			return value similar to that of ecvt, except
+			that trailing zeros are suppressed.
+		3 ==> through ndigits past the decimal point.  This
+			gives a return value similar to that from fcvt,
+			except that trailing zeros are suppressed, and
+			ndigits can be negative.
+		4-9 should give the same return values as 2-3, i.e.,
+			4 <= mode <= 9 ==> same return as mode
+			2 + (mode & 1).  These modes are mainly for
+			debugging; often they run slower but sometimes
+			faster than modes 2-3.
+		4,5,8,9 ==> left-to-right digit generation.
+		6-9 ==> don't try fast floating-point estimate
+			(if applicable).
+
+		Values of mode other than 0-9 are treated as mode 0.
+
+		Sufficient space is allocated to the return value
+		to hold the suppressed trailing zeros.
+	*/
+
+	int bbits, b2, b5, be, dig, i, ieps, ilim, ilim0, ilim1,
+		j, j1, k, k0, k_check, leftright, m2, m5, s2, s5,
+		spec_case, try_quick;
+	long L;
+#ifndef Sudden_Underflow
+	int denorm;
+	unsigned long x;
+#endif
+	Bigint *b, *b1, *delta, *mlo, *mhi, *S;
+	double d2, ds, eps;
+	char *s, *s0;
+
+	if (word0(d) & Sign_bit) {
+		/* set sign for everything, including 0's and NaNs */
+		*sign = 1;
+		word0(d) &= ~Sign_bit;	/* clear sign bit */
+	}
+	else
+		*sign = 0;
+
+#if defined(IEEE_Arith) + defined(VAX)
+#ifdef IEEE_Arith
+	if ((word0(d) & Exp_mask) == Exp_mask)
+#else
+	if (word0(d)  == 0x8000)
+#endif
+	{
+		/* Infinity or NaN */
+		const char *ss;
+		*decpt = 9999;
+		ss =
+#ifdef IEEE_Arith
+			!word1(d) && !(word0(d) & 0xfffff) ? "Infinity" :
+#endif
+				"NaN";
+		*resultp = s = malloc (strlen (ss) + 1);
+		strcpy (s, ss);
+		if (rve)
+			*rve =
+#ifdef IEEE_Arith
+				s[3] ? s + 8 :
+#endif
+						s + 3;
+		return s;
+	}
+#endif
+#ifdef IBM
+	d += 0; /* normalize */
+#endif
+	if (!d) {
+		*decpt = 1;
+		*resultp = s = malloc (2);
+		s [0] = '0';
+		s [1] = 0;
+		if (rve)
+			*rve = s + 1;
+		return s;
+	}
+
+	b = d2b(d, &be, &bbits);
+#ifdef Sudden_Underflow
+	i = (int)(word0(d) >> Exp_shift1 & (Exp_mask>>Exp_shift1));
+#else
+	if ( (i = (int)((word0(d) >> Exp_shift1) & (Exp_mask>>Exp_shift1))) ) {
+#endif
+		d2 = d;
+		word0(d2) &= Frac_mask1;
+		word0(d2) |= Exp_11;
+#ifdef IBM
+		if ( (j = 11 - hi0bits(word0(d2) & Frac_mask)) )
+			d2 /= 1 << j;
+#endif
+
+		/* log(x)	~=~ log(1.5) + (x-1.5)/1.5
+		 * log10(x)	 =  log(x) / log(10)
+		 *		~=~ log(1.5)/log(10) + (x-1.5)/(1.5*log(10))
+		 * log10(d) = (i-Bias)*log(2)/log(10) + log10(d2)
+		 *
+		 * This suggests computing an approximation k to log10(d) by
+		 *
+		 * k = (i - Bias)*0.301029995663981
+		 *	+ ( (d2-1.5)*0.289529654602168 + 0.176091259055681 );
+		 *
+		 * We want k to be too large rather than too small.
+		 * The error in the first-order Taylor series approximation
+		 * is in our favor, so we just round up the constant enough
+		 * to compensate for any error in the multiplication of
+		 * (i - Bias) by 0.301029995663981; since |i - Bias| <= 1077,
+		 * and 1077 * 0.30103 * 2^-52 ~=~ 7.2e-14,
+		 * adding 1e-13 to the constant term more than suffices.
+		 * Hence we adjust the constant term to 0.1760912590558.
+		 * (We could get a more accurate k by invoking log10,
+		 *  but this is probably not worthwhile.)
+		 */
+
+		i -= Bias;
+#ifdef IBM
+		i <<= 2;
+		i += j;
+#endif
+#ifndef Sudden_Underflow
+		denorm = 0;
+	} else {
+		/* d is denormalized */
+
+		i = bbits + be + (Bias + (P-1) - 1);
+		x = i > 32  ? ((word0(d) << (64 - i)) | (word1(d) >> (i - 32)))
+			    : (word1(d) << (32 - i));
+		d2 = x;
+		word0(d2) -= 31*Exp_msk1; /* adjust exponent */
+		i -= (Bias + (P-1) - 1) + 1;
+		denorm = 1;
+	}
+#endif
+	ds = (d2-1.5)*0.289529654602168 + 0.1760912590558 + i*0.301029995663981;
+	k = (int)ds;
+	if (ds < 0. && ds != k)
+		k--;	/* want k = floor(ds) */
+	k_check = 1;
+	if (k >= 0 && k <= Ten_pmax) {
+		if (d < tens[k])
+			k--;
+		k_check = 0;
+	}
+	j = bbits - i - 1;
+	if (j >= 0) {
+		b2 = 0;
+		s2 = j;
+	} else {
+		b2 = -j;
+		s2 = 0;
+	}
+	if (k >= 0) {
+		b5 = 0;
+		s5 = k;
+		s2 += k;
+	} else {
+		b2 -= k;
+		b5 = -k;
+		s5 = 0;
+	}
+	if (mode < 0 || mode > 9)
+		mode = 0;
+	try_quick = 1;
+	if (mode > 5) {
+		mode -= 4;
+		try_quick = 0;
+	}
+	leftright = 1;
+	switch(mode) {
+		case 0:
+		case 1:
+			ilim = ilim1 = -1;
+			i = 18;
+			ndigits = 0;
+			break;
+		case 2:
+			leftright = 0;
+			/* no break */
+		case 4:
+			if (ndigits <= 0)
+				ndigits = 1;
+			ilim = ilim1 = i = ndigits;
+			break;
+		case 3:
+			leftright = 0;
+			/* no break */
+		case 5:
+			i = ndigits + k + 1;
+			ilim = i;
+			ilim1 = i - 1;
+			if (i <= 0)
+				i = 1;
+	}
+	*resultp = (char *) malloc(i + 1);
+	s = s0 = *resultp;
+
+	if (ilim >= 0 && ilim <= Quick_max && try_quick) {
+
+		/* Try to get by with floating-point arithmetic. */
+
+		i = 0;
+		d2 = d;
+		k0 = k;
+		ilim0 = ilim;
+		ieps = 2; /* conservative */
+		if (k > 0) {
+			ds = tens[k&0xf];
+			j = k >> 4;
+			if (j & Bletch) {
+				/* prevent overflows */
+				j &= Bletch - 1;
+				d /= bigtens[n_bigtens-1];
+				ieps++;
+			}
+			for (; j; j >>= 1, i++)
+				if (j & 1) {
+					ieps++;
+					ds *= bigtens[i];
+				}
+			d /= ds;
+		} else if ( (j1 = -k) ) {
+			d *= tens[j1 & 0xf];
+			for (j = j1 >> 4; j; j >>= 1, i++)
+				if (j & 1) {
+					ieps++;
+					d *= bigtens[i];
+				}
+		}
+		if (k_check && d < 1. && ilim > 0) {
+			if (ilim1 <= 0)
+				goto fast_failed;
+			ilim = ilim1;
+			k--;
+			d *= 10.;
+			ieps++;
+		}
+		eps = ieps*d + 7.;
+		word0(eps) -= (P-1)*Exp_msk1;
+		if (ilim == 0) {
+			S = mhi = 0;
+			d -= 5.;
+			if (d > eps)
+				goto one_digit;
+			if (d < -eps)
+				goto no_digits;
+			goto fast_failed;
+		}
+#ifndef No_leftright
+		if (leftright) {
+			/* Use Steele & White method of only
+			 * generating digits needed.
+			 */
+			eps = 0.5/tens[ilim-1] - eps;
+			for (i = 0;;) {
+				L = d;
+				d -= L;
+				*s++ = '0' + (int)L;
+				if (d < eps)
+					goto ret1;
+				if (1. - d < eps)
+					goto bump_up;
+				if (++i >= ilim)
+					break;
+				eps *= 10.;
+				d *= 10.;
+			}
+		} else {
+#endif
+			/* Generate ilim digits, then fix them up. */
+			eps *= tens[ilim-1];
+			for (i = 1;; i++, d *= 10.) {
+				L = d;
+				d -= L;
+				*s++ = '0' + (int)L;
+				if (i == ilim) {
+					if (d > 0.5 + eps)
+						goto bump_up;
+					else if (d < 0.5 - eps) {
+						while (*--s == '0');
+						s++;
+						goto ret1;
+					}
+					break;
+				}
+			}
+#ifndef No_leftright
+		}
+#endif
+ fast_failed:
+		s = s0;
+		d = d2;
+		k = k0;
+		ilim = ilim0;
+	}
+
+	/* Do we have a "small" integer? */
+
+	if (be >= 0 && k <= Int_max) {
+		/* Yes. */
+		ds = tens[k];
+		if (ndigits < 0 && ilim <= 0) {
+			S = mhi = 0;
+			if (ilim < 0 || d <= 5*ds)
+				goto no_digits;
+			goto one_digit;
+		}
+		for (i = 1;; i++) {
+			L = d / ds;
+			d -= L*ds;
+#ifdef Check_FLT_ROUNDS
+			/* If FLT_ROUNDS == 2, L will usually be high by 1 */
+			if (d < 0) {
+				L--;
+				d += ds;
+			}
+#endif
+			*s++ = '0' + (int)L;
+			if (i == ilim) {
+				d += d;
+				if (d > ds || (d == ds && L & 1)) {
+ bump_up:
+					while (*--s == '9')
+						if (s == s0) {
+							k++;
+							*s = '0';
+							break;
+						}
+					++*s++;
+				}
+				break;
+			}
+			if (!(d *= 10.))
+				break;
+		}
+		goto ret1;
+	}
+
+	m2 = b2;
+	m5 = b5;
+	mhi = mlo = 0;
+	if (leftright) {
+		if (mode < 2) {
+			i =
+#ifndef Sudden_Underflow
+				denorm ? be + (Bias + (P-1) - 1 + 1) :
+#endif
+#ifdef IBM
+				1 + 4*P - 3 - bbits + ((bbits + be - 1) & 3);
+#else
+				1 + P - bbits;
+#endif
+		} else {
+			j = ilim - 1;
+			if (m5 >= j)
+				m5 -= j;
+			else {
+				s5 += j -= m5;
+				b5 += j;
+				m5 = 0;
+			}
+			if ((i = ilim) < 0) {
+				m2 -= i;
+				i = 0;
+			}
+		}
+		b2 += i;
+		s2 += i;
+		mhi = i2b(1);
+	}
+	if (m2 > 0 && s2 > 0) {
+		i = m2 < s2 ? m2 : s2;
+		b2 -= i;
+		m2 -= i;
+		s2 -= i;
+	}
+	if (b5 > 0) {
+		if (leftright) {
+			if (m5 > 0) {
+				mhi = pow5mult(mhi, m5);
+				b1 = mult(mhi, b);
+				Bfree(b);
+				b = b1;
+				}
+			if ( (j = b5 - m5) )
+				b = pow5mult(b, j);
+		} else
+			b = pow5mult(b, b5);
+	}
+	S = i2b(1);
+	if (s5 > 0)
+		S = pow5mult(S, s5);
+
+	/* Check for special case that d is a normalized power of 2. */
+
+	if (mode < 2) {
+		if (!word1(d) && !(word0(d) & Bndry_mask)
+#ifndef Sudden_Underflow
+		 && word0(d) & Exp_mask
+#endif
+				) {
+			/* The special case */
+			b2 += Log2P;
+			s2 += Log2P;
+			spec_case = 1;
+		} else
+			spec_case = 0;
+	}
+
+	/* Arrange for convenient computation of quotients:
+	 * shift left if necessary so divisor has 4 leading 0 bits.
+	 *
+	 * Perhaps we should just compute leading 28 bits of S once
+	 * and for all and pass them and a shift to quorem, so it
+	 * can do shifts and ors to compute the numerator for q.
+	 */
+#ifdef Pack_32
+	if ( (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0x1f) )
+		i = 32 - i;
+#else
+	if ( (i = ((s5 ? 32 - hi0bits(S->x[S->wds-1]) : 1) + s2) & 0xf) )
+		i = 16 - i;
+#endif
+	if (i > 4) {
+		i -= 4;
+		b2 += i;
+		m2 += i;
+		s2 += i;
+	} else if (i < 4) {
+		i += 28;
+		b2 += i;
+		m2 += i;
+		s2 += i;
+	}
+	if (b2 > 0)
+		b = lshift(b, b2);
+	if (s2 > 0)
+		S = lshift(S, s2);
+	if (k_check) {
+		if (cmp(b,S) < 0) {
+			k--;
+			b = multadd(b, 10, 0);	/* we botched the k estimate */
+			if (leftright)
+				mhi = multadd(mhi, 10, 0);
+			ilim = ilim1;
+		}
+	}
+	if (ilim <= 0 && mode > 2) {
+		if (ilim < 0 || cmp(b,S = multadd(S,5,0)) <= 0) {
+			/* no digits, fcvt style */
+ no_digits:
+			k = -1 - ndigits;
+			goto ret;
+		}
+ one_digit:
+		*s++ = '1';
+		k++;
+		goto ret;
+	}
+	if (leftright) {
+		if (m2 > 0)
+			mhi = lshift(mhi, m2);
+
+		/* Compute mlo -- check for special case
+		 * that d is a normalized power of 2.
+		 */
+
+		mlo = mhi;
+		if (spec_case) {
+			mhi = Balloc(mhi->k);
+			Bcopy(mhi, mlo);
+			mhi = lshift(mhi, Log2P);
+		}
+
+		for (i = 1;;i++) {
+			dig = quorem(b,S) + '0';
+			/* Do we yet have the shortest decimal string
+			 * that will round to d?
+			 */
+			j = cmp(b, mlo);
+			delta = diff(S, mhi);
+			j1 = delta->sign ? 1 : cmp(b, delta);
+			Bfree(delta);
+#ifndef ROUND_BIASED
+			if (j1 == 0 && !mode && !(word1(d) & 1)) {
+				if (dig == '9')
+					goto round_9_up;
+				if (j > 0)
+					dig++;
+				*s++ = dig;
+				goto ret;
+			}
+#endif
+			if (j < 0 || (j == 0 && !mode
+#ifndef ROUND_BIASED
+							&& !(word1(d) & 1)
+#endif
+					)) {
+				if (j1 > 0) {
+					b = lshift(b, 1);
+					j1 = cmp(b, S);
+					if ((j1 > 0 || (j1 == 0 && dig & 1))
+					&& dig++ == '9')
+						goto round_9_up;
+				}
+				*s++ = dig;
+				goto ret;
+			}
+			if (j1 > 0) {
+				if (dig == '9') { /* possible if i == 1 */
+ round_9_up:
+					*s++ = '9';
+					goto roundoff;
+				}
+				*s++ = dig + 1;
+				goto ret;
+			}
+			*s++ = dig;
+			if (i == ilim)
+				break;
+			b = multadd(b, 10, 0);
+			if (mlo == mhi)
+				mlo = mhi = multadd(mhi, 10, 0);
+			else {
+				mlo = multadd(mlo, 10, 0);
+				mhi = multadd(mhi, 10, 0);
+			}
+		}
+	} else
+		for (i = 1;; i++) {
+			*s++ = dig = quorem(b,S) + '0';
+			if (i >= ilim)
+				break;
+			b = multadd(b, 10, 0);
+		}
+
+	/* Round off last digit */
+
+	b = lshift(b, 1);
+	j = cmp(b, S);
+	if (j > 0 || (j == 0 && dig & 1)) {
+ roundoff:
+		while (*--s == '9')
+			if (s == s0) {
+				k++;
+				*s++ = '1';
+				goto ret;
+			}
+		++*s++;
+	} else {
+		while (*--s == '0');
+		s++;
+	}
+ ret:
+	Bfree(S);
+	if (mhi) {
+		if (mlo && mlo != mhi)
+			Bfree(mlo);
+		Bfree(mhi);
+	}
+ ret1:
+	Bfree(b);
+	if (s == s0) {	/* don't return empty string */
+		*s++ = '0';
+		k = 0;
+	}
+	*s = 0;
+	*decpt = k + 1;
+	if (rve)
+		*rve = s;
+	return s0;
+	}
+#ifdef __cplusplus
+}
+#endif
diff --git a/mono/utils/strtod.h b/mono/utils/strtod.h
new file mode 100644
index 00000000000..54f40f7d972
--- /dev/null
+++ b/mono/utils/strtod.h
@@ -0,0 +1,7 @@
+#ifndef MONO_STRTOD_H
+#define MONO_STRTOD_H 1
+
+double bsd_strtod (const char *s00, char **se);
+char *__bsd_dtoa  (double d, int mode, int ndigits, int *decpt, int *sign, char **rve, char **resultp);
+
+#endif
diff --git a/runtime/Makefile.am b/runtime/Makefile.am
index e57088b283e..a52cbd7636f 100644
--- a/runtime/Makefile.am
+++ b/runtime/Makefile.am
@@ -9,9 +9,21 @@ assemblies_DATA =	\
 	System.Data.dll	\
 	System.Xml.dll	\
 	System.Web.dll	\
-	System.Drawing.dll
-
-monobins_DATA = mcs.exe
+	System.Web.Services.dll	\
+	System.Drawing.dll	\
+	System.EnterpriseServices.dll	\
+	System.Configuration.Install.dll	\
+	System.Runtime.Remoting.dll	\
+	System.Runtime.Serialization.Formatters.Soap.dll	\
+	Mono.CSharp.Debugger.dll	\
+	I18N.dll	\
+	I18N.West.dll	\
+	I18N.Rare.dll	\
+	I18N.Other.dll	\
+	I18N.MidEast.dll	\
+	I18N.CJK.dll
+
+monobins_DATA = mcs.exe monoresgen.exe
 
 EXTRA_DIST = $(monobins_DATA) $(assemblies_DATA)
 
@@ -29,11 +41,11 @@ $(monobins_DATA):
 
 dist-hook:
 	for i in $(monobins_DATA) $(assemblies_DATA); do	\
-		if test ! -s $$i; then echo $$i is empty && exit 1; fi	\
+		if test ! -s $(srcdir)/$$i; then echo $$i is empty && exit 1; fi	\
 	done
 
 copy_dlls:
 	cp /nt/mono/mcs/class/*/*.dll .
 
 push_dlls:
-	scp -o "Protocol 1" *.dll snapshot@mono-cvs.ximian.com:dlls
+	scp -o "Protocol 1" *.dll *.exe snapshot@mono-cvs.ximian.com:dlls
diff --git a/samples/embed/test.cs b/samples/embed/test.cs
new file mode 100644
index 00000000000..9e6f9228497
--- /dev/null
+++ b/samples/embed/test.cs
@@ -0,0 +1,11 @@
+using System;
+using System.Runtime.CompilerServices;
+
+class Mono {
+	[MethodImplAttribute(MethodImplOptions.InternalCall)]
+	extern static string gimme();
+
+	static void Main() {
+		Console.WriteLine (gimme ());
+	}
+}
diff --git a/samples/embed/teste.c b/samples/embed/teste.c
new file mode 100644
index 00000000000..85fc07ffa65
--- /dev/null
+++ b/samples/embed/teste.c
@@ -0,0 +1,48 @@
+#include <mono/jit/jit.h>
+
+/*
+ * Very simple mono embedding example.
+ * Compile with: 
+ * 	gcc -o teste teste.c `pkg-config --cflags --libs mono`
+ * 	mcs test.cs
+ * Run with:
+ * 	./teste test.exe
+ */
+
+static MonoString*
+gimme () {
+	return mono_string_new (mono_domain_get (), "All your monos are belong to us!");
+}
+
+int 
+main(int argc, char* argv[]) {
+	MonoDomain *domain;
+	MonoAssembly *assembly;
+	const char *file;
+	int retval;
+
+	if (argc < 2)
+		return 1;
+	file = argv [1];
+	/*
+	 * mono_jit_init() creates a domain: each assembly is
+	 * loaded and run in a MonoDomain.
+	 */
+	domain = mono_jit_init (file);
+	/*
+	 * We add our special internal call, so that C# code
+	 * can call us back.
+	 */
+	mono_add_internal_call ("Mono::gimme", gimme);
+	assembly = mono_domain_assembly_open (domain, file);
+	if (!assembly)
+		return 2;
+	/*
+	 * mono_jit_exec() will run the Main() method in the assembly
+	 * and return the value.
+	 */
+	retval = mono_jit_exec (domain, assembly, argc - 1, argv + 1);
+	mono_jit_cleanup (domain);
+	return retval;
+}
+
diff --git a/scripts/mcs.in b/scripts/mcs.in
index 12e43ca0bb3..2528d81d52d 100644
--- a/scripts/mcs.in
+++ b/scripts/mcs.in
@@ -1,2 +1,2 @@
 #!/bin/sh
-@bindir@/mint @bindir@/mcs.exe $*
\ No newline at end of file
+@bindir@/mono @bindir@/mcs.exe "$@"
diff --git a/status/ByMaintainer.cs b/status/ByMaintainer.cs
index c6643834af1..d76a0c8755b 100755
--- a/status/ByMaintainer.cs
+++ b/status/ByMaintainer.cs
@@ -33,7 +33,7 @@ namespace Mono.StatusReporter {
 
 				//sw.WriteLine ("<li><a href=\"" + email + ".html\">" + email + "</a>");
 
-				XmlWriter writer = new XmlTextWriter ("bm/" + email, null);
+				XmlWriter writer = new XmlTextWriter ("src/" + email, null);
 
 				XsltArgumentList xslArg = new XsltArgumentList ();
 				xslArg.AddParam ("email", "", email);
diff --git a/status/ByNamespace.cs b/status/ByNamespace.cs
index 7d16ef434ef..9ca3a7bf44c 100755
--- a/status/ByNamespace.cs
+++ b/status/ByNamespace.cs
@@ -37,7 +37,7 @@ namespace Mono.StatusReporter {
 			foreach (string str in nsList) {
 				//sw.WriteLine ("<li><a href=\"" + str + ".html\">" + str + "</a>");
 
-				XmlWriter writer = new XmlTextWriter ("bn/" + str, null);
+				XmlWriter writer = new XmlTextWriter ("src/" + str, null);
 
 				XsltArgumentList xslArg = new XsltArgumentList ();
 				xslArg.AddParam ("ns", "", str);
diff --git a/status/ChangeLog b/status/ChangeLog
index d011cba26da..fc3bda6155d 100755
--- a/status/ChangeLog
+++ b/status/ChangeLog
@@ -1,3 +1,51 @@
+2002-07-13  Jonathan Pryor <jonpryor@vt.edu>
+	* class.xml: Added entries for the following classes from System.Diagnostics:
+		- CounterCreationData.cs: Implemented
+		- CounterCreationDataCollection.cs: Implemented
+		- CounterSample.cs: Stubbed Out
+		- CounterSampleCalculator.cs: Stubbed Out
+		- InstanceData.cs: Implemented
+		- InstanceDataCollection.cs: Implemented
+		- InstanceDataCollectionCollection.cs: Implemented
+		- MonitoringDescriptionAttribute.cs: Implemented
+		- PerformanceCounter.cs: Stubbed Out
+		- PerformanceCounterCategory.cs: Stubbed Out
+		- PerformanceCounterInstaller.cs: Stubbed Out
+		- PerformanceCounterManager.cs: Stubbed Out
+		- PerformanceCounterPermission.cs: Stubbed Out
+		- PerformanceCounterPermissionAccess.cs: Implemented
+		- PerformanceCounterPermissionAttribute.cs: Stubbed Out
+		- PerformanceCounterPermissionEntry.cs: Stubbed Out
+		- PerformanceCounterPermissionEntryCollection.cs: Implemented
+		- PerformanceCounterType.cs: Implemented
+
+2002-06-09  Jonathan Pryor <jonpryor@vt.edu>
+	* class.xml: Added entries for the following classes from System.Diagnostics:
+		-	EntryWrittenEventArgs
+		-	EntryWrittenEventHandler
+		-	EventLog
+		-	EventLogEntryCollection
+		-	EventLogEntry
+		-	EventLogEntryType
+		-	EventLogInstaller
+		-	EventLogPermissionAccess
+		-	EventLogPermissionAttribute
+		-	EventLogPermission
+		-	EventLogPermissionEntryCollection
+		-	EventLogPermissionEntry
+		-	EventLogTraceListener
+
+2002-04-16  Gonzalo Paniagua Javier <gonzalo@ximian.com>
+
+	* maintainers.xml: added myself.
+	* class.xml: added System.Net.Sockets.UdpClient and updated
+	System.Net.IPAddress and IPEndPoint.
+
+2002-03-17  Nick Drochak  <ndrochak@gol.com>
+
+	* class.xml: Added class I stubbed out:
+	ApplicationDirectoryMembershipCondition
+
 2002-01-14  Nick Drochak  <ndrochak@gol.com>
 
 	* class.xml: Added classes I implemented.
diff --git a/status/class.xml b/status/class.xml
index e9ad1ab69aa..4d49af3a4c0 100755
--- a/status/class.xml
+++ b/status/class.xml
@@ -505,33 +505,6 @@
 			<maintainer>miguel@ximian.com</maintainer>
 		</maintainers>
 	</class>
-	<class name="System.Configuration.Assemblies.AssemblyHash">
-		<last-activity>Jul-17-2001</last-activity>
-		<implementation>yes</implementation>
-		<test-suite>no</test-suite>
-		<completion>?</completion>
-		<maintainers>
-			<maintainer>tomasr@mvps.org</maintainer>
-		</maintainers>
-	</class>
-	<class name="System.Configuration.Assemblies.AssemblyHashAlgorithm">
-		<last-activity>Jul-17-2001</last-activity>
-		<implementation>yes</implementation>
-		<test-suite>no</test-suite>
-		<completion>?</completion>
-		<maintainers>
-			<maintainer>tomasr@mvps.org</maintainer>
-		</maintainers>
-	</class>
-	<class name="System.Configuration.Assemblies.AssemblyVersionCompatibility">
-		<last-activity>Jul-17-2001</last-activity>
-		<implementation>yes</implementation>
-		<test-suite>no</test-suite>
-		<completion>?</completion>
-		<maintainers>
-			<maintainer>tomasr@mvps.org</maintainer>
-		</maintainers>
-	</class>
 	<class name="System.Configuration.ConfigurationException">
 		<last-activity>Aug-28-2001</last-activity>
 		<implementation>yes</implementation>
@@ -640,6 +613,206 @@
 			<maintainer>swildermuth@adoguy.com</maintainer>
 		</maintainers>
 	</class>
+        <class name="System.Data.Common.DataAdapter">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.DataColumnMapping">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.DataColumnMappingCollection">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.DataTableMapping">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.DataTableMappingCollection">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.DbDataAdapter">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.DbDataPermission">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.DbDataPermissionAttribute">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.DbDataRecord">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.DbEnumerator">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.RowUpdatedEventArgs">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.Common.RowUpdatingEventArgs">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.SqlClient.SqlCommand">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+                        <maintainer>rodrigo@ximian.com</maintainer>
+			<maintainer>danmorg@sc.rr.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.SqlClient.SqlConnection">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+                        <maintainer>rodrigo@ximian.com</maintainer>
+			<maintainer>danmorg@sc.rr.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.SqlClient.SqlDataAdapter">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.SqlClient.SqlDataReader">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.SqlClient.SqlError">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.SqlClient.SqlErrorCollection">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.SqlClient.SqlException">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.SqlClient.SqlParameter">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.SqlClient.SqlParameterCollection">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
+        <class name="System.Data.SqlClient.SqlTransaction">
+		<last-activity>Apr-12-2002</last-activity>
+		<implementation>no</implementation>
+		<test-suite>no</test-suite>
+		<completion>?</completion>
+		<maintainers>
+			<maintainer>rodrigo@ximian.com</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.DateTime">
 		<last-activity>Jul-23-2001</last-activity>
 		<implementation>yes</implementation>
@@ -676,13 +849,49 @@
 			<maintainer>ndrochak@gol.com</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Diagnostics.CounterCreationData">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>99</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.CounterCreationDataCollection">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>99</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.CounterSample">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>80</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.CounterSampleCalculator">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>5</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Diagnostics.Debug">
-		<last-activity>Jul-15-2001</last-activity>
-		<implementation>no</implementation>
+		<last-activity>March-08-2002</last-activity>
+		<implementation>yes</implementation>
 		<test-suite>no</test-suite>
-		<completion>?</completion>
+		<completion>99</completion>
 		<maintainers>
-			<maintainer>angryjohn69@nc.rr.com</maintainer>
+			<maintainer>jonpryor@vt.edu</maintainer>
 		</maintainers>
 	</class>
 	<class name="System.Diagnostics.DebuggableAttribute">
@@ -694,6 +903,15 @@
 			<maintainer>ndrochak@gol.com</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Diagnostics.DefaultTraceListener">
+		<last-activity>May-29-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>99</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Diagnostics.DiagnosticsConfigurationHandler">
 		<last-activity>Jul-15-2001</last-activity>
 		<implementation>no</implementation>
@@ -703,6 +921,339 @@
 			<maintainer>angryjohn69@nc.rr.com</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Diagnostics.EntryWrittenEventArgs">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EntryWrittenEventHandler">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLog">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>1</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLogEntry">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>1</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLogEntryCollection">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>90</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLogEntryType">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLogInstaller">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>01</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLogPermission">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>01</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLogPermissionAccess">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLogPermissionAttribute">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>01</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLogPermissionEntry">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>01</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLogPermissionEntryCollection">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>01</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.EventLogTraceListener">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>01</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.FileVersionInfo">
+		<last-activity>Apr-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ICollectData">
+		<last-activity>Jun-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.InstanceData">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>99</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.InstanceDataCollection">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>99</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.InstanceDataCollectionCollection">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>99</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.MonitoringDescriptionAttribute">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>99</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.PerformanceCounter">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>25</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.PerformanceCounterCategory">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>5</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.PerformanceCounterInstaller">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>5</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.PerformanceCounterManager">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>5</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.PerformanceCounterPermission">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>5</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.PerformanceCounterPermissionAccess">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.PerformanceCounterPermissionAttribute">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>5</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.PerformanceCounterPermissionEntry">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>5</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.PerformanceCounterPermissionEntryCollection">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>99</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.PerformanceCounterType">
+		<last-activity>Jul-13-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.Process">
+		<last-activity>Apr-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ProcessModule">
+		<last-activity>Mar-31-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ProcessModuleCollection">
+		<last-activity>Apr-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ProcessPriorityClass">
+		<last-activity>Mar-31-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ProcessStartInfo">
+		<last-activity>May-08-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ProcessThread">
+		<last-activity>Apr-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ProcessThreadCollection">
+		<last-activity>Apr-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ProcessWindowStyle">
+		<last-activity>Apr-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Diagnostics.StackFrame">
 		<last-activity>Aug-29-2001</last-activity>
 		<implementation>yes</implementation>
@@ -730,31 +1281,76 @@
 			<maintainer>angryjohn69@nc.rr.com</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Diagnostics.TextWriterTraceListener">
+		<last-activity>May-27-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>No</test-suite>
+		<completion>100</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ThreadPriorityLevel">
+		<last-activity>Apr-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>No</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ThreadState">
+		<last-activity>Apr-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>No</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.ThreadWaitReason">
+		<last-activity>Apr-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>No</test-suite>
+		<completion>??</completion>
+		<maintainers>
+			<maintainer>??</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Diagnostics.Trace">
-		<last-activity>Jul-15-2001</last-activity>
-		<implementation>no</implementation>
-		<test-suite>no</test-suite>
-		<completion>?</completion>
+		<last-activity>April-06-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>yes</test-suite>
+		<completion>100</completion>
 		<maintainers>
-			<maintainer>angryjohn69@nc.rr.com</maintainer>
+			<maintainer>jonpryor@vt.edu</maintainer>
 		</maintainers>
 	</class>
 	<class name="System.Diagnostics.TraceLevel">
 		<last-activity>Jul-15-2001</last-activity>
 		<implementation>yes</implementation>
 		<test-suite>no</test-suite>
-		<completion>?</completion>
+		<completion>100</completion>
 		<maintainers>
 			<maintainer>angryjohn69@nc.rr.com</maintainer>
 		</maintainers>
 	</class>
 	<class name="System.Diagnostics.TraceListener">
-		<last-activity>Jul-15-2001</last-activity>
-		<implementation>no</implementation>
+		<last-activity>May-27-2002</last-activity>
+		<implementation>yes</implementation>
 		<test-suite>no</test-suite>
-		<completion>?</completion>
+		<completion>100</completion>
 		<maintainers>
-			<maintainer>angryjohn69@nc.rr.com</maintainer>
+			<maintainer>jonpryor@vt.edu</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Diagnostics.TraceListenerCollection">
+		<last-activity>Apr-27-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100</completion>
+		<maintainers>
+			<maintainer>jonpryor@vt.edu</maintainer>
 		</maintainers>
 	</class>
 	<class name="System.Diagnostics.TraceSwitch">
@@ -1714,19 +2310,19 @@
 		</maintainers>
 	</class>
 	<class name="System.Net.IPAdress">
-		<last-activity>Jul-15-2001</last-activity>
+		<last-activity>Apr-15-2002</last-activity>
 		<implementation>yes</implementation>
-		<test-suite>no</test-suite>
-		<completion>75</completion>
+		<test-suite>yes</test-suite>
+		<completion>100</completion>
 		<maintainers>
 			<maintainer>miguel@ximian.com</maintainer>
 		</maintainers>
 	</class>
 	<class name="System.Net.IPEndPoint">
-		<last-activity>Jul-15-2001</last-activity>
+		<last-activity>Apr-15-2002</last-activity>
 		<implementation>yes</implementation>
 		<test-suite>no</test-suite>
-		<completion>75</completion>
+		<completion>100</completion>
 		<maintainers>
 			<maintainer>miguel@ximian.com</maintainer>
 		</maintainers>
@@ -1741,10 +2337,10 @@
 		</maintainers>
 	</class>
 	<class name="System.Net.SocketAddress">
-		<last-activity>Jul-15-2001</last-activity>
+		<last-activity>Apr-15-2002</last-activity>
 		<implementation>yes</implementation>
 		<test-suite>no</test-suite>
-		<completion>75</completion>
+		<completion>100</completion>
 		<maintainers>
 			<maintainer>miguel@ximian.com</maintainer>
 		</maintainers>
@@ -1767,6 +2363,15 @@
 			<maintainer>pp@myelin.co.nz</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Net.Sockets.UdpClient">
+		<last-activity>Apr-15-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100</completion>
+		<maintainers>
+			<maintainer>gonzalo@ximian.com</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.NotFiniteNumberException">
 		<last-activity>Jul-15-2001</last-activity>
 		<implementation>yes</implementation>
@@ -2298,15 +2903,6 @@
 			<maintainer>dholden@draper.com</maintainer>
 		</maintainers>
 	</class>
-	<class name="System.Security">
-		<last-activity>Jul-17-2001</last-activity>
-		<implementation>no</implementation>
-		<test-suite>no</test-suite>
-		<completion>?</completion>
-		<maintainers>
-			<maintainer>tomasr@mvps.org</maintainer>
-		</maintainers>
-	</class>
 	<class name="System.Security.CodeAccessPermission">
 		<last-activity>Dec-21-2001</last-activity>
 		<implementation>yes</implementation>
@@ -2757,13 +3353,13 @@
 			<maintainer>ndrochak@gol.com</maintainer>
 		</maintainers>
 	</class>
-	<class name="System.Security.Policy">
-		<last-activity>Jul-17-2001</last-activity>
+	<class name="System.Security.Policy.ApplicationDirectoryMembershipCondition">
+		<last-activity>Mar-17-2002</last-activity>
 		<implementation>no</implementation>
 		<test-suite>no</test-suite>
-		<completion>?</completion>
+		<completion>5</completion>
 		<maintainers>
-			<maintainer>tomasr@mvps.org</maintainer>
+			<maintainer>ndrochak@gol.com</maintainer>
 		</maintainers>
 	</class>
 	<class name="System.Security.Policy.IIdentityPermissionFactory">
@@ -3839,10 +4435,10 @@
 		</maintainers>
 	</class>
 	<class name="System.Web.UI.WebControls.BaseValidator">
-		<last-activity>Feb-07-2002</last-activity>
+		<last-activity>Mar-04-2002</last-activity>
 		<implementation>yes</implementation>
 		<test-suite>no</test-suite>
-		<completion>20%</completion>
+		<completion>80%</completion>
 		<maintainers>
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
@@ -3964,6 +4560,15 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.CustomValidator">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.DataGrid">
 		<last-activity>Feb-21-2002</last-activity>
 		<implementation>yes</implementation>
@@ -3973,6 +4578,24 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.DataGridColumn">
+		<last-activity>Mar-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Web.UI.WebControls.DataGridColumnCollection">
+		<last-activity>Mar-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>??%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.DataGridCommandEventArgs">
 		<last-activity>Dec-20-2001</last-activity>
 		<implementation>yes</implementation>
@@ -3995,7 +4618,25 @@
 		<last-activity>Feb-21-2002</last-activity>
 		<implementation>yes</implementation>
 		<test-suite>no</test-suite>
-		<completion>??%</completion>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Web.UI.WebControls.DataGridItemCollection">
+		<last-activity>Mar-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Web.UI.WebControls.DataGridItemEventArgs">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
 		<maintainers>
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
@@ -4009,6 +4650,15 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.DataGridPageChangedEventArgs">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.DataGridPageChangedEventHandler">
 		<last-activity>Dec-28-2001</last-activity>
 		<implementation>yes</implementation>
@@ -4018,6 +4668,24 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.DataGridPagerStyle">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Web.UI.WebControls.DataGridSortCommandEventArgs">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.DataGridSortCommandEventHandler">
 		<last-activity>Dec-28-2001</last-activity>
 		<implementation>yes</implementation>
@@ -4027,6 +4695,15 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.DataKeyCollection">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.DataList">
 		<last-activity>Feb-01-2002</last-activity>
 		<implementation>yes</implementation>
@@ -4054,6 +4731,33 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.DataListItem">
+		<last-activity>Mar-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>95%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Web.UI.WebControls.DataListItemCollection">
+		<last-activity>Mar-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Web.UI.WebControls.DataListItemEventArgs">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.DataListItemEventHandler">
 		<last-activity>Dec-28-2001</last-activity>
 		<implementation>yes</implementation>
@@ -4099,6 +4803,15 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.EditCommandColumn">
+		<last-activity>Mar-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>95%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.FirstDayOfWeek">
 		<last-activity>Dec-02-2001</last-activity>
 		<implementation>yes</implementation>
@@ -4351,6 +5064,15 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.MonthChangedEventArgs">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.MonthChangedEventHandler">
 		<last-activity>Dec-28-2001</last-activity>
 		<implementation>yes</implementation>
@@ -4369,6 +5091,15 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.PagedDataSource">
+		<last-activity>Mar-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.PagerMode">
 		<last-activity>Dec-02-2001</last-activity>
 		<implementation>yes</implementation>
@@ -4432,6 +5163,24 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.RangeValidator">
+		<last-activity>Mar-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Web.UI.WebControls.RegularExpressionValidator">
+		<last-activity>Mar-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.RepeatDirection">
 		<last-activity>Dec-02-2001</last-activity>
 		<implementation>yes</implementation>
@@ -4441,6 +5190,15 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.Repeater">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>90%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.RepeaterCommandEventArgs">
 		<last-activity>Dec-17-2001</last-activity>
 		<implementation>yes</implementation>
@@ -4460,7 +5218,7 @@
 		</maintainers>
 	</class>
 	<class name="System.Web.UI.WebControls.RepeaterItem">
-		<last-activity>Dec-17-2001</last-activity>
+		<last-activity>Mar-04-2002</last-activity>
 		<implementation>yes</implementation>
 		<test-suite>no</test-suite>
 		<completion>40%</completion>
@@ -4468,6 +5226,24 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.RepeaterItemCollection">
+		<last-activity>Mar-02-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Web.UI.WebControls.RepeaterItemEventArgs">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.RepeaterItemEventHandler">
 		<last-activity>Dec-28-2001</last-activity>
 		<implementation>yes</implementation>
@@ -4504,6 +5280,24 @@
 			<maintainer>gvaish@iitk.ac.in</maintainer>
 		</maintainers>
 	</class>
+	<class name="System.Web.UI.WebControls.SelectedDatesCollection">
+		<last-activity>Mar-03-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
+	<class name="System.Web.UI.WebControls.ServerValidateEventArgs">
+		<last-activity>Mar-04-2002</last-activity>
+		<implementation>yes</implementation>
+		<test-suite>no</test-suite>
+		<completion>100%</completion>
+		<maintainers>
+			<maintainer>gvaish@iitk.ac.in</maintainer>
+		</maintainers>
+	</class>
 	<class name="System.Web.UI.WebControls.ServerValidateEventHandler">
 		<last-activity>Dec-28-2001</last-activity>
 		<implementation>yes</implementation>
diff --git a/status/commands b/status/commands
index 3590e47893e..6c169d7baf5 100755
--- a/status/commands
+++ b/status/commands
@@ -23,6 +23,7 @@
 1,System.Runtime.Remoting.Contexts,System.Runtime.Remoting.Contexts.html,bn/System.Runtime.Remoting.Contexts
 1,System.Runtime.Remoting.Messaging,System.Runtime.Remoting.Messaging.html,bn/System.Runtime.Remoting.Messaging
 1,System.Runtime.Serialization,System.Runtime.Serialization.html,bn/System.Runtime.Serialization
+1,System.Runtime.Serialization.Formatters,System.Runtime.Serialization.Formatters.html,bn/System.Runtime.Serialization.Formatters
 1,System.Security,System.Security.html,bn/System.Security
 1,System.Security.Cryptography,System.Security.Cryptography.html,bn/System.Security.Cryptography
 1,System.Security.Permissions,System.Security.Permissions.html,bn/System.Security.Permissions
@@ -35,23 +36,24 @@
 1,System.Web.UI,System.Web.UI.html,bn/System.Web.UI
 1,System.Web.UI.HtmlControlls,System.Web.UI.HtmlControlls.html,bn/System.Web.UI.HtmlControlls
 1,System.Web.UI.WebControls,System.Web.UI.WebControls.html,bn/System.Web.UI.WebControls
-1,System.Web.Utils,System.Web.Utils.html,bn/System.Web.Utils
 1,System.Xml,System.Xml.html,bn/System.Xml
 0,Maintainer,maintainer.html,maintainer.src
 1,Matthew.S.Ford@rose-hulman.edu,Matthew.S.Ford@rose-hulman.edu.html,bm/Matthew.S.Ford@rose-hulman.edu
-1,Patrik.Torstensson@framfablabs.com,Patrik.Torstensson@framfablabs.com.html,bm/Patrik.Torstensson@framfablabs.com
 1,Patrik.Torstensson@labs2.com,Patrik.Torstensson@labs2.com.html,bm/Patrik.Torstensson@labs2.com
 1,angryjohn69@nc.rr.com,angryjohn69@nc.rr.com.html,bm/angryjohn69@nc.rr.com
 1,bob@thestuff.net,bob@thestuff.net.html,bm/bob@thestuff.net
 1,cpodurgiel@msn.com,cpodurgiel@msn.com.html,bm/cpodurgiel@msn.com
+1,crichton@gimp.org,crichton@gimp.org.html,bm/crichton@gimp.org
 1,czw@home.se,czw@home.se.html,bm/czw@home.se
 1,daniel-weber@austin.rr.com,daniel-weber@austin.rr.com.html,bm/daniel-weber@austin.rr.com
 1,develop@wtfo-guru.com,develop@wtfo-guru.com.html,bm/develop@wtfo-guru.com
 1,dholden@draper.com,dholden@draper.com.html,bm/dholden@draper.com
 1,dick@ximian.com,dick@ximian.com.html,bm/dick@ximian.com
+1,dietmar@ximian.com,dietmar@ximian.com.html,bm/dietmar@ximian.com
 1,dmenest@yahoo.com,dmenest@yahoo.com.html,bm/dmenest@yahoo.com
 1,dsh2120@draper.com,dsh2120@draper.com.html,bm/dsh2120@draper.com
 1,duco@lorentz.xs4all.nl,duco@lorentz.xs4all.nl.html,bm/duco@lorentz.xs4all.nl
+1,duncan@ximian.com,duncan@ximian.com.html,bm/duncan@ximian.com
 1,fejj@ximian.com,fejj@ximian.com.html,bm/fejj@ximian.com
 1,gleb@eurosoft.od.ua,gleb@eurosoft.od.ua.html,bm/gleb@eurosoft.od.ua
 1,gvaish@iitk.ac.in,gvaish@iitk.ac.in.html,bm/gvaish@iitk.ac.in
@@ -60,6 +62,8 @@
 1,jason@injektilo.org,jason@injektilo.org.html,bm/jason@injektilo.org
 1,jbarn@httcb.net,jbarn@httcb.net.html,bm/jbarn@httcb.net
 1,joe@ximian.com,joe@ximian.com.html,bm/joe@ximian.com
+1,john.giffin@xor.com,john.giffin@xor.com.html,bm/john.giffin@xor.com
+1,kbottner@istation.com,kbottner@istation.com.html,bm/kbottner@istation.com
 1,lupus@ximian.com,lupus@ximian.com.html,bm/lupus@ximian.com
 1,macisaac@ximian.com,macisaac@ximian.com.html,bm/macisaac@ximian.com
 1,marcel@narings.nl,marcel@narings.nl.html,bm/marcel@narings.nl
diff --git a/status/maintainers.xml b/status/maintainers.xml
index 6bc06564172..fa7984074c0 100755
--- a/status/maintainers.xml
+++ b/status/maintainers.xml
@@ -35,7 +35,7 @@
     <person email="dick@ximian.com" name="Dick Porter"/>
     <person email="lupus@ximian.com" name="Paolo Molaro"/>
     <person email="dietmar@ximian.com" name="Dietmar Maurer"/>
-    <person name="Gaurav Vaish" email="gvaish@iitk.ac.in"/>
+    <person name="Gaurav Vaish" email="Gaurav.Vaish@iitk.ac.in"/>
     <person name="Mads Pultz" email="mpultz@get2net.dk"/>
     <person name="Wictor Wilen" email="wictor@iBizkit.se"/>
     <person name="Thomas Neidhart" email="tome@sbox.tugraz.at"/>
@@ -46,5 +46,9 @@
     <person name="Duncan Mak" email="duncan@ximian.com"/>
     <person name="Keith Bottner" email="kbottner@istation.com"/>
     <person name="Mark Crichton" email="crichton@gimp.org"/>
+    <person name="Daniel Morgan" email="danmorg@sc.rr.com"/>
+    <person name="Rodrigo Moya" email="rodrigo@ximian.com"/>
+    <person name="Jonathan Pryor" email="jonpryor@vt.edu"/>
+    <person name="Gonzalo Paniagua" email="gonzalo@ximian.com"/>
 </maintainers>
 
diff --git a/status/makefile b/status/makefile
index 510b1396627..8bb3931012a 100644
--- a/status/makefile
+++ b/status/makefile
@@ -11,25 +11,26 @@ xml:
 	./compare.exe $(NETDIR)\\mscorlib.dll $(MCSCLASSDIR)\\corlib\\corlib.dll > corlib.xml
 
 push:
-	scp *.xml web/*html www@www.ximian.com:/web/cvsmodules/mono/class-status
+	scp -P 2200 *.xml web/*html www@www.ximian.com:/web/cvsmodules/mono/class-status
 
 clean:
 	-rm -f compare.exe compare.pdb corlib.xml ByMaintainer.exe ByNamespace.exe commands *~ .*~
-	-rm -rf bn
+	-rm -rf src
 	-rm -rf bm
 	-rm -rf web
 
 ByNamespace: ByNamespace.xsl class.xml
 	$(CSC) ByNamespace.cs
-	-mkdir bn
+	-mkdir src
 	./ByNamespace
 
 ByMaintainer: ByMaintainer.xsl class.xml
 	$(CSC) ByMaintainer.cs
-	-mkdir bm
+	-mkdir src
 	./ByMaintainer
 
 webfiles:
 	-mkdir web
 	./make_web.pl
+	cp *.src src
 	../doc/web/process.pl commands ../doc/web/template.html.in web
diff --git a/web/Makefile.am b/web/Makefile.am
index c1d6961f719..8ef4e422c5d 100644
--- a/web/Makefile.am
+++ b/web/Makefile.am
@@ -1,7 +1,7 @@
 WEB_FILES=  \
-	c-sharp class-library contact contributing documentation download \
+	ado-net c-sharp class-library contact contributing documentation download \
 	faq gcc-frontend ideas index  passport rationale resources \
-	roadmap runtime status team testing thanks tools porting anoncvs
+	roadmap runtime status team testing thanks tools porting anoncvs monodoc-xml winforms
 
 OTHERS= pending resources-pending todo mono-build.sh mono-build-w32.sh
 
@@ -15,13 +15,18 @@ all-docs: $(WEB_FILES)
 class-status: class-status.in pending-classes Makefile.am
 	cat class-status.in pending-classes > class-status
 
-pending-classes: pending-classes.in Makefile.am
-	echo "This is a list of pending classes, and links to their documentation on MSDN.Microsoft.com<p><p>" > pending-classes
-	for i in `cat pending-classes.in`; do x=`echo $$i | sed s/\\\.//g`; link=`echo http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrf@@@ClassTopic.asp | sed "s/@@@/$$x/"`; echo "	<a href=\"$$link\">$$i</a><br>" >> pending-classes; done
+pending-classes:
 
+#pending-classes: pending-classes.in Makefile.am
+#	echo "This is a list of pending classes, and links to their documentation on MSDN.Microsoft.com<p><p>" > pending-classes
+#	for i in `cat pending-classes.in`; do x=`echo $$i | sed s/\\\.//g`; link=`echo http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrf@@@ClassTopic.asp | sed "s/@@@/$$x/"`; echo "	<a href=\"$$link\">$$i</a><br>" >> pending-classes; done
 
-webit: class-status
+
+webit: dummy
 	(cd web; make && make push)
 
 push-notes:
 	scp release-notes/mono* www@www:/web/cvsmodules/mono/archive
+
+dummy:
+
diff --git a/web/ado-net b/web/ado-net
new file mode 100644
index 00000000000..876ca9c7164
--- /dev/null
+++ b/web/ado-net
@@ -0,0 +1,801 @@
+* ADO.NET
+
+	The coordinator for the ADO.NET implementation is <a
+	href="mailto:rodrigo@ximian.com">Rodrigo Moya</a>, with
+	the collaboration of <a href="mailto:danmorg@sc.rr.com">Daniel
+	Morgan</a> and <a href="mailto:tim@timcoleman.com">Tim Coleman</a>.
+	
+
+* Action plan
+
+	The current plan to implement ADO.NET is as follows:
+
+	<b>Step 1:</b> Initial <a href="http://msdn.microsoft.com/library/en-us/cpref/html/frlrfsystemdatasqlclient.asp?frame=true">System.Data.SqlClient</a> Provider:
+
+	<ul>
+		* Initial implementation of System.Data.SqlClient is based on
+		  the <a href="http://www.postgresql.org/idocs/">PostgreSQL C API</a> which is a
+		  client API to the PostgreSQL DBMS.  PostgreSQL was chosen so we could quickly
+		  create and test the System.Data classes.
+		  
+		* Once the <a href="http://msdn.microsoft.com/library/en-us/cpref/html/frlrfsystemdatasqlclient.asp?frame=true">System.Data.SqlClient</a>
+		  code is functional and is usable by other people, we willl move it to
+		  Mono.Data.PostgreSQL, and will convert the existing
+		  System.Data.SqlClient to be just a wrapper around
+		  Mono.Data.PostgreSQL.  
+
+	</ul>
+
+	<b>Step 2:</b> <a href="http://msdn.microsoft.com/library/en-us/cpref/html/frlrfSystemDataOleDb.asp?frame=true">System.Data.OleDb</a> Provider:
+		
+	<ul>
+		* <p>On Unix systems: System.Data.OleDb uses the
+		<a href="http://www.gnome-db.org/">LibGDA</a>
+		 engine. 
+
+		  <p>LibGDA is a data access engine like ADO/OLE-DB, but for Unix.  The 
+		  GDA in libGDA stands for GNU/GNOME Data Access, but it does not require GNOME.
+		  It only requires glib2 and libxml2.  LibGDA is used by 
+		  libgnomedb, GNOME-DB, and gaSQL.
+		  
+		  <p>There is work under way to get libgda working under 
+		  Windows using Cygwin by the GNOME-DB developers.
+		  
+		  <p>LibGDA has providers for MySQL, PostgreSQL, XML, ODBC,
+		  Oracle, Interbase, Sybase/SQL server (via FreeTDS), IBM DB2,
+		  SQLite and MDB Tools
+		  (MS Access support).
+
+		* On Windows systems: System.Data.OleDb will use libgda as well,
+		  if we can get it working, or OLE-DB as
+		  its engine.
+	</ul>
+
+	<b>Step 3:</b> <a href="http://msdn.microsoft.com/library/en-us/cpref/html/frlrfsystemdatasqlclient.asp?frame=true">System.Data.SqlClient</a> Provider:
+
+	<ul>
+		* <p>System.Data.SqlClient will then become a managed
+		  provider for Microsoft SQL Server, both on Windows and
+		  Linux, to be compatible with applications written
+		  for the Microsoft .NET Development Framework.
+		  
+		  <p>Once Step 1 has been completed and the PostgreSQL
+		  provider support has been moved to its own place at 
+		  Mono.Data.PostgreSQL, we will use 
+		  <a href="http://www.freetds.org/">FreeTDS</a> as the basis
+		  for providing access to Microsoft SQL Server databases.
+		  
+		  <P>FreeTDS is a C API for Unix and Windows that implements 
+		  the TDS (Tabular Data Stream) protocol used in accessing 
+		  Microsoft SQL Server and Sybase databases.  A .NET Data Provider could be
+		  created for Sybase databases as well, but this would be put in Mono.Data.Sybase.
+	</ul>
+
+	<b>Step 4:</b> <a href="http://msdn.microsoft.com/downloads/sample.asp?url=/MSDN-FILES/027/001/668/msdncompositedoc.xml&frame=true">System.Data.Odbc</a> Provider:
+	
+	<ul>
+		* We will create a .NET Managaed Provider for ODBC
+		  in System.Data.Odbc for those using ODBC.
+		  On Unix and Windows, <a href="http://www.unixodbc.org/">unixODBC</a> mabye used.
+		  iODBC is an alternative to using unixODBC.
+		  
+		  <p>unixODBC works on Unix and Windows.  Well, I have not actually 
+		  used it on Cygwin, but it does build and install without problems.  
+		  
+		  <p>unixODBC has providers for:
+		  Oracle, Microsoft SQL Server and Sybase via FreeTDS, 
+		  MySQL, PostgreSQL, Informix, IBM DB2 (Universal Database), 
+		  Interbase, miniSQL (mSQL), AdabasD, Empress, YARD SQL, and others.
+		  
+	</ul>
+
+	<b>Step 5:</b> Other System.Data providers:
+
+	<ul>
+		* <p>The idea in Microsoft .NET System.Data is to have
+		  a managed provider for each supported DBMS.  System.Data.SqlClient
+		  for Microsoft SQL Server.  
+		  System.Data.OracleClient for Oracle 8i and 9i.
+
+		  <p>We will need to have Mono.Data.MySQL, Mono.Data.PostgreSQL,
+		  Mono.Data.DB2, and Mono.Data.miniSQL. Others,
+		  of course, are welcomed.
+		  		  
+		  <p>System.Data has been designed so 
+		  non-database providers can be created too.		  
+	</ul>
+	
+* Current Status
+
+	<p>We are working on Steps 1, 2, and 5.  We have only just begun on
+	steps 2 and 5 though.  We still have tons and tons of stuff to do.
+	If you have any ideas, let us know.
+	
+	<p>For Step 1, the PostgreSQL is starting to come together - it 
+	still needs a lot of work.
+	
+	<p>For Step 2, Rodrigo Moya has been working on System.Data.OleDb which uses libgda
+	which is an OLE-DB/ADO data access for Unix.  The C-Sharp bindings to libgda
+	currently work - meaning they can compile, run, and you can connect to a
+	PostgreSQL database via libgda via the C-Sharp bindings to libgda.  Basic
+	functionality (execution of commands, data retrieval, transactions, etc) are
+	now working. Current focus is on filling up the missing pieces (Data adapters
+	mainly).
+	
+	<p>For Step 3, we need someone to start the FreeTDS .NET Data Provider so
+	we can have data access to Microsoft SQL Server and Sybase databases, or either
+	add the support in libgda.
+	
+	<p>For Step 4, we need someone to start the unixODBC .NET Data Provider, or add
+	the support in libgda.
+	
+	<p>For Step 5, we have just begun creating a Mono.Data .NET Provider - a MySQL
+	.NET Provider that uses the MySQL C Client Library.  This provider is 
+	found in Mono.Data.MySql.  We can currently connect and do a SQL INSERT and insert
+	a row into a MySQL database.  However, it currently only works on Cygwin because
+	the MySQL client library libmySQL.dll is different 
+	from the library on Linux libmysqlclient.dll.  Another problem, mysql thread functions
+	do not load for some reason.  Also, the provider only runs if you use "mint" (the Mono
+	runtime interpreter).  It does not work on "mono" (the Mono Just-In-Time compiler).
+	The C# Bindings to MySQL are thanks to Brad Meril.
+		
+	<p>We are able to do simple CREATE TABLE, DROP TABLE, UPDATE, INSERT, and
+	DELETE SQL commands using the ExecuteNonQuery method in SqlCommand.  
+	
+	<p>We can execute multiple queries and do a NextResult() in SqlDataReader()
+	to get the next result set.  
+	
+	<p>We are also able to do simple aggregate functions, 
+	ie, count(), sum(), min(), and max() 
+	in a simple SELECT SQL query using the ExecuteScalar() now.  
+	
+	<p>We are also able to retrieve data with a simple SELECT SQL query 
+	using ExecuteReader() which returns a SqlDataReader.  We are able to
+	use GetSchemaTable() to get the meta data about the table columns.  
+	We are able	to Read() to get each row from the result set.  
+	
+	<p>Here is a sample of code that is based on PostgresTest.cs and
+	TestSqlDataReader.cs tests:
+<pre>
+ 
+ static void SelectData (IDbConnection cnc) {
+	
+	IDbCommand selectCommand = cnc.CreateCommand();
+	IDataReader reader;
+
+	selectCommand.CommandType = CommandType.Text;
+	selectCommand.CommandText = 
+		"select * from pg_user;" + 

+		"select * from pg_tables;" + 

+		"select * from pg_database";

+
+	reader = selectCommand.ExecuteReader ();
+
+	do {

+		// get the DataTable that holds

+		// the schema

+		DataTable dt = rdr.GetSchemaTable();

+

+		if(rdr.RecordsAffected != -1) {

+			// Results for 

+			// SQL INSERT, UPDATE, DELETE Commands 

+			// have RecordsAffected >= 0

+			Console.WriteLine("Result is from a SQL Command (INSERT,UPDATE,DELETE).  Records Affected: " + rdr.RecordsAffected);

+		}

+		else if (dt == null)

+				Console.WriteLine("Result is from a SQL Command not (INSERT,UPDATE,DELETE).   Records Affected: " + rdr.RecordsAffected);

+		else {

+			// Results for

+			// SQL not INSERT, UPDATE, nor DELETE

+			// have RecordsAffected = -1

+			Console.WriteLine("Result is from a SQL SELECT Query.  Records Affected: " + rdr.RecordsAffected);

+		

+			// Results for a SQL Command (CREATE TABLE, SET, etc)

+			// will have a null reference returned from GetSchemaTable()

+			// 

+			// Results for a SQL SELECT Query

+			// will have a DataTable returned from GetSchemaTable()

+

+			results++;

+			Console.WriteLine("Result Set " + results + "...");

+                        			

+			// number of columns in the table

+			Console.WriteLine("   Total Columns: " +

+				dt.Columns.Count);

+

+			// display the schema

+			foreach (DataRow schemaRow in dt.Rows) {

+				foreach (DataColumn schemaCol in dt.Columns)

+					Console.WriteLine(schemaCol.ColumnName + 

+						" = " + 

+						schemaRow[schemaCol]);

+				Console.WriteLine();

+			}

+

+			int nRows = 0;

+			string output, metadataValue, dataValue;

+			// Read and display the rows

+			Console.WriteLine("Gonna do a Read() now...");

+			while(rdr.Read()) {

+				Console.WriteLine("   Row " + nRows + ": ");

+					

+				for(c = 0; c < rdr.FieldCount; c++) {

+					// column meta data 

+					DataRow dr = dt.Rows[c];

+					metadataValue = 

+						"    Col " + 

+						c + ": " + 

+						dr["ColumnName"];

+						

+					// column data

+					if(rdr.IsDBNull(c) == true)

+						dataValue = " is NULL";

+					else

+						dataValue = 

+							": " + 

+							rdr.GetValue(c);

+				

+					// display column meta data and data

+					output = metadataValue + dataValue;					

+					Console.WriteLine(output);

+				}

+				nRows++;

+			}

+			Console.WriteLine("   Total Rows: " + 

+				nRows);

+		}	

+	} while(rdr.NextResult());

+	Console.WriteLine("Total Result sets: " + results);

+			

+	rdr.Close();

+ }
+
+</pre>
+	
+	<p>We are able to get 
+	String data (char, character, text, varchar), Int16 (smallint),
+	Int32 (integer), Int64 (bigint), DateTime (time, date, timestamp),
+	Boolean (boolean), Single (float), and Double (double).
+	More data types will come later.  Note, the types that do work still 
+	need thorough testing.
+	
+	<p>Rows that are returned which contain columns that are NULL are handled now. 
+	The SqlDataReader method IsDBNull() needs to be called to determine 
+	if a field IS NULL before trying to read data from that field.
+	
+	<p>Calling PostgreSQL stored procedures works.  It does not work perfectly.  It may not
+	even work to specification - yet.  If you want to test it yourself, look at
+	TestSqlDataReader.cs or PostgresTest.cs in
+	mcs/class/System.Data/Test.  
+	
+	<p>Below, I have some sample code you can
+	use to call a PostgreSQL stored procedure named "version".  This stored
+	procedure returns a string containing the PostgreSQL server version.  Notice
+	the CommandType is StoredProcedure and the method ExecuteScalar() is called.
+	
+	<p>ExecuteScalar() is a lightweight method in class SqlCommand that only returns
+	one row and one column as one object - even if there is more than row or column.
+	
+<pre>
+ static string GetDatabaseServerVersion (SqlConnection cnc) 
+ {			 
+	SqlCommand cmd = cnc.CreateCommand ();
+	string data;
+
+	cmd.CommandType = CommandType.StoredProcedure;
+	cmd.CommandText = "version";
+							
+	data = (string) cmd.ExecuteScalar ();
+
+	return data;
+ }
+</pre>
+			
+	<p>We have the beginnings of Parameters support PostgreSQL.  Only
+	Input Parameters are currently supported.  Output, Input/Output,
+	and Return parameters still need to be done.
+	
+	<p>A lot of functionality in System.Data is missing, but the 
+	infrastructure is starting to come together.
+	
+	<p>A lot of Exceptions need to be thrown for various exceptions.  However,
+	SqlException, SqlErrorCollection, and SqlError have been partially
+	implemented.
+	
+	<p>Tim Coleman and Rodrigo Moya got the beginnings of the
+	SqlDataAdapter/DataSet/DataTable/DataRow to work.  Currently, 
+	the SqlDataAdapter can Fill() relational data into a DataTable in a DataSet.
+	See the test mcs/class/System.Data/Test/TestSqlDataAdapter.cs to see it in action.
+	Below, I show a snippets from the test:
+	
+<pre>
+ string connectionString;
+ string sqlQuery;
+ SqlDataAdapter adapter;
+ DataSet dataSet = null;
+
+ connectionString =
+	"host=localhost;" +
+	"dbname=test;" +
+	"user=postgres";
+						
+ sqlQuery = "select * from pg_tables";
+
+ adapter = new SqlDataAdapter (sqlQuery, 
+			connectionString);
+ 				
+ dataSet = new DataSet ();
+
+ adapter.Fill (dataSet);
+			
+ if (dataSet != null) {
+	foreach (DataRow row in dataSet.Tables["Table"].Rows)
+		Console.WriteLine("tablename: " + row["tablename"]);
+ }
+</pre>	
+	
+	<p>We do need help on the DataSet/DataAdaptor/DataTable/DataRelation/XML 
+	functionality so we	can integrate with 
+	the ASP.NET controls and Windows.Forms controls by allowing the controls to bind 
+	to a data source.  Gonzalo, Gaurav, Leen, Patrik, Duncan, and others are 
+	working very hard on the ASP.NET support. If you want to help, 
+	contact <a href="mailto:gonzalo@ximian.com">Gonzalo Paniagua Javier</a>
+	
+	<P>Need to add XML support in System.Data.  This involves working on
+	the classes: DataSet and XmlDataDocument and the ExecuteXmlReader() in SqlCommand.
+	
+	<p>The System.Data.dll gets built with the rest of the class library.
+	To compile the System.Data.dll assembly separately, you need:
+
+	<b>On Unix</b>
+
+	<ul>
+		* update your mono sources. Be sure you have latest mcs.exe
+		  and .dll's, since there have been many fixes needed for
+		  compilation on Linux.
+
+		* compile System.Data.dll:
+<pre>
+ cd mcs/class/System.Data<br>
+ mcs --target library -o System.Data.dll @list
+</pre>
+	</ul>
+
+	<b>On Windows</b>
+
+	<ul>
+		* update your mono sources. Be sure you have latest mcs.exe
+		  and .dll's.  You can use the same method as Linux, 
+		  or you can use NAnt.
+
+		* To use NAnt:
+
+<pre>
+ cd mcs/class/System.Data
+ ../../nant/NAnt.exe
+</pre>
+			
+			This will automatically copy the System.Data.dll to Test.
+			If you need to do a clean for the System.Data.dll assembly,<br><br>
+
+<pre>			
+ cd mcs/class/System.Data
+ ../../nant/NAnt.exe clean
+</pre>
+	</ul>
+
+* Testing
+
+	<p>In order to test System.Data.SqlClient, you will need to have
+	access to a remote PostgreSQL DBMS, or you will have to install 
+	one locally.  PostgreSQL is the DBMS used for the initial 
+	implementation of System.Data.SqlClient.
+		
+	<p>Why?  Because it is free software, has a client 
+	library that is easy to use, PostgreSQL is easy to install on
+	Unix and Windows (using the Cygwin install program), not difficult to setup after
+	installation, and it runs under: Linux, 
+	Windows (via cygwin and ipc-daemon), Unix, and
+	others.  This allowed us to create the
+	System.Data functionality in Mono much quicker.
+		
+	<p>If you plan on using a remote PostgreSQL DBMS Server,
+	than you will need to have the PostgreSQL client software on your
+	local computer that includes libpq.so (pq.dll on Windows).
+	
+	<p>The System.Data tests use this connection string to connect
+	to the PostgreSQL database named "test" at host "localhost" as
+	user "postgres".
+
+<pre>
+"host=localhost;dbname=test;user=postgres"
+</pre>
+		
+	<p>Installation instructions for PostgreSQL DBMS:
+
+	<b>On Unix</b>
+
+	<ul>
+		* Read the PostgreSQL Installation Instructions 
+		at \usr\doc\postgresql-x.x.x\html\installation.html
+		
+		* Depending on your Unix system, 
+		PostgreSQL maybe already installed, a database user 'postgres' created, 
+		a linux user 'postgres' created and initdb ran.  Or maybe not.
+
+<pre>
+ su

+ adduser postgres

+ mkdir /usr/local/pgsql/data

+ chown postgres /usr/local/pgsql/data

+ su - postgres

+ initdb -D /usr/local/pgsql/data

+ postmaster -i -D /usr/local/pgsql/data

+ createdb test

+ psql test
+</pre>
+	
+		* Make sure you have a database user named postgres.  It is best to install
+		the PostgreSQL DBMS under linux user postgres.  When you run the postmaster,
+		run it under the user postgres as well.  If this was not done, then you
+		will need to create a user named postgres for the System.Data tests.
+
+		* If you already installed PostgeSQL and you do not have a database
+		user named postgres, then you can create user postgres using psql:
+		
+<pre>		
+psql test
+create user postgres with password 'fun2db';
+</pre>
+				
+		* The postmaster must be run with -i option.
+		
+		* In the /usr/local/pgsql/data/pg_hba.conf file, you need
+		to have the AUTH_TYPE set to md5.  You can read more on this at
+		/usr/doc/postgresql-7.2.1/html/client-authentication.html 
+		or wherever your
+		PostgreSQL html docs are located.  See the 2nd line below,
+		host 127.0.0.1 has an AUTH_TYPE md5 in pg_hba.conf.
+		
+<pre>
+ # TYPE     DATABASE    IP_ADDRESS    MASK               AUTH_TYPE
+
+ local      all                                          trust
+ host       all         127.0.0.1     255.255.255.255    md5
+</pre>
+
+	* If you can not find your PostgreSQL documentation locally or you 
+	did not install it, then you 
+	can get it <a href="http://www.postgresql.org/idocs/">here</a>.
+
+	</ul>
+
+	<b>On Windows</b>
+
+	<ul>
+		* Use the <a href="http://www.cygwin.com/">Cygwin</a> installer to 
+		  install the PostgreSQL DBMS.  It is
+		  found in the database category.
+		  
+		* <p>Read the file postgres-x.x.README at /usr/doc/Cygwin and read 
+		  the requirements to install PostgreSQL.  Those requirements
+		  are included with cygwin except cygipc.  A default installtion
+		  of cygwin does not install everything you will need, so on the 
+		  safe side, just include everything when installing cygwin.
+		
+		* <p>The -x.x in postgres-x.x is the version of your PostgreSQL DBMS.
+		
+		* <p>Once Cygwin has installed the PostgreSQL DBMS on your computer,
+		  read the file FAQ_MSWIN which is available 
+		  in /usr/doc/postgres-x.x 
+				  
+		* <p>Important notes from this file are:
+		  
+		  <ul>
+				<p><b>2.</b> - Install the latest <a href="http://www.neuro.gatech.edu/users/cwilson/cygutils/OBSOLETE/V1.1/cygipc/index.html">CygIPC</a> package.
+			  			  
+				<p>The cygipc package contains the ipc-daemon you will need 
+				to run before you can
+				run the PostgreSQL DBMS Server daemon (postmaster) or run
+				initdb which initializes the PostgreSQL database.
+			  
+				<p><b>3.</b>  The Cygwin bin directory has to be placed in 
+				the path before the Windows program directories, 
+				for example, C:\cygwin\bin 
+			  
+				<p><b>My own note.</b>  In the Windows control panel, I set
+				the environment variables PATH to my cygwin /usr/local/bin,
+				/usr/bin, and /bin.  I also set my LD_LIBRARY_PATH to 
+				/usr/local/lib and /usr/lib.  For example:
+			  
+				<p>
+<pre>
+PATH=c:\cygwin\usr\local\bin;c:\cygwin\usr\bin;c:\cygwin\bin;
+LD_LIBRARY_PATH=c:\cygwin\usr\local\lib;c:\cygwin\usr\lib;
+</pre>
+							  
+				<p><b>4.</b> Start the ipc-daemon that came with the cygipc 
+				package.  There
+				are two ways to do this: run it from the command line as:
+			  
+				<p>
+<pre>
+ipc-daemon &
+</pre> 			  
+				<p>or you can set it up as a Windows service.  See the 
+				file cygrunsrv.README at /usr/doc/Cygwin on how to do this
+				for ipc-daemon and postmaster.  Note the
+				troubleshooting section at the end of 
+				the cygrunsrv.README file.
+			  
+				<p>To install ipc-daemon as a service, 
+				you just have to run
+			  
+				<p>
+<pre>
+ipc-daemon --install-as-service' (--remove-as-service) 
+</pre>
+			  
+				<p>and then run
+			  
+<pre>
+net start ipc-daemon
+</pre>
+			</ul>
+			  
+			<p>Read the installation.html file 
+			at /usr/doc/postgresql-x.x/html/installation.html
+		
+			<p>You will see in this file that you will need to 
+			run the following commands:
+		  
+			<p>
+<pre>
+mkdir /usr/local/pgsql/data

+initdb -D /usr/local/pgsql/data

+postmaster -D /usr/local/pgsql/data

+createdb test

+psql test  		
+</pre>
+		  
+			<p>When you need to connect to the database, 
+			you will need ipc-daemon and postmaster running.  Start ipc-daemon
+			before any of the command above.  If you restart your computer, you
+			need to start ipc-daemon and postmaster either manually or as a 
+			service.
+		  
+			<p>psql is a command-line PostgreSQL client tool to 
+			enter and run SQL commands and queries.
+		  
+			<p>If there is no database user named postgres, create a user named
+			postgres with the following SQL command in the client tool psql:
+		  
+			<p>
+<pre>
+psql test
+create user postgres with password 'fun2db';
+</pre>
+			<p>The only reason I say this is so you can easily use the System.Data tests
+			without having to change the database, userid, etc.
+	</ul>
+	
+	<p>In the path mcs/class/System.Data/Test
+	there is a PostgreSQL test program named
+	PostgreTest.cs.  Thanks goes to Gonzalo for creating the original
+	PostgreSQL test.
+	
+	<p>To use it to test System.Data, you
+	modify the file to your PostgreSQL database
+	connection requirements:
+
+	<p>
+	<ul>
+		<li><b>dbname</b> database, ie., test</li>
+		<li><b>host</b> hostname of the PostgreSQL DBMS Server to connect to, ie., localhost</li>
+		<li><b>user</b> username, ie., someuser</li>
+		<li><b>password</b> password, ie., mypass1234</li>
+	</ul>
+	
+	<p>The connection string is in OLE-DB connection string format.  Internally,
+	SqlConnection converts this to the PostgreSQL connection string format.
+	
+	<p>
+<pre>
+    OLE-DB: "host=localhost;dbname=test;user=joe;password=smoe"
+PostgreSQL: "host=localhost dbname=test user=joe password=smoe"
+</pre>
+
+	<p>
+	Note that OLE-DB includes the semicolons while PostgreSQL's connection
+	string does not.
+
+	<p>
+    To compile the PostgresTest.cs program, do:
+    
+    <p>
+<pre>
+mcs PostgresTest.cs -r System.Data.dll
+</pre>
+    
+    <p>
+    To run using mint, do:
+    
+    <p>
+<pre>
+mint PostgresTest.exe
+</pre>
+    
+    <p>
+    To run using mono, do:
+<pre>
+mono PostgresTest.exe
+</pre>
+    
+    <p>Below, I show how the output from PostgresTest.  I have omitted a lot
+    of the meta data for the columns except two columns.  The classes
+    used were from System.Data.SqlClient and were used to connect to a
+    PostgreSQL database and retrieve data.
+
+<p>
+<pre>   
+

+danmorg@DANPC ~/mono/mcs/class/System.Data/Test

+$ mcs PostgresTest.cs -r System.Data.dll

+

+danmorg@DANPC ~/mono/mcs/class/System.Data/Test

+$ mono PostgresTest.exe

+        Postgres provider specific tests...

+

+                Drop table:

+Error (don't worry about this one)SqlError:PGRES_FATAL_ERROR ERROR:  table "mono

+_postgres_test" does not exist

+ <Stack Trace>

+

+                Create table with all supported types:

+OK

+                Insert values for all known types:

+OK

+                Update values:

+OK

+                Insert values for all known types:

+OK

+Aggregate: count(*)

+Agg Result: 2

+Aggregate: min(text_value)

+Agg Result: This is a text

+Aggregate: max(int4_value)

+Agg Result: 1048000

+Aggregate: sum(int4_value)

+Agg Result: 1048003

+                Select values from the database:

+Result is from a SELECT SQL Query.  Records Affected: -1

+Result Set 1...

+   Total Columns: 28

+ColumnName = boolean_value

+ColumnOrdinal = 1

+ColumnSize = 1

+NumericPrecision = 0

+NumericScale = 0

+IsUnique = False

+IsKey =

+BaseCatalogName =

+BaseColumnName = boolean_value

+BaseSchemaName =

+BaseTableName =

+DataType = System.Boolean

+AllowDBNull = False

+ProviderType = 16

+IsAliased = False

+IsExpression = False

+IsIdentity = False

+IsAutoIncrement = False

+IsRowVersion = False

+IsHidden = False

+IsLong = False

+IsReadOnly = False

+

+ ...

+

+ ColumnName = null_timestamp_value

+ ColumnOrdinal = 28

+ ColumnSize = 8

+ NumericPrecision = 0

+ NumericScale = 0

+ IsUnique = False

+ IsKey =

+ BaseCatalogName =

+ BaseColumnName = null_timestamp_value

+ BaseSchemaName =

+ BaseTableName =

+ DataType = System.DateTime

+ AllowDBNull = False

+ ProviderType = 1184

+ IsAliased = False

+ IsExpression = False

+ IsIdentity = False

+ IsAutoIncrement = False

+ IsRowVersion = False

+ IsHidden = False

+ IsLong = False

+ IsReadOnly = False

+

+ Gonna do a Read() now...

+   Row 0:

+    Col 0: boolean_value: False

+    Col 1: int2_value: 5

+    Col 2: int4_value: 3

+    Col 3: bigint_value: 9

+    Col 4: float_value: 3.141590

+    Col 5: double_value: 3.14159

+    Col 6: numeric_value: 123456789012.345

+    Col 7: char_value: Mono.Data!

+    Col 8: varchar_value: It was not me!

+    Col 9: text_value: We got data!

+    Col 10: point_value: (1,0)

+    Col 11: time_value: 01/01/1 21:13:14

+    Col 12: date_value: 02/29/2000 00:00:00

+    Col 13: timestamp_value: 02/29/2004 14:00:11

+    Col 14: null_boolean_value is NULL

+    Col 15: null_int2_value is NULL

+    Col 16: null_int4_value is NULL

+    Col 17: null_bigint_value is NULL

+    Col 18: null_float_value is NULL

+    Col 19: null_double_value is NULL

+    Col 20: null_numeric_value is NULL

+    Col 21: null_char_value is NULL

+    Col 22: null_varchar_value is NULL

+    Col 23: null_text_value is NULL

+    Col 24: null_point_value is NULL

+    Col 25: null_time_value is NULL

+    Col 26: null_date_value is NULL

+    Col 27: null_timestamp_value is NULL

+   Row 1:

+    Col 0: boolean_value: True

+    Col 1: int2_value: -22

+    Col 2: int4_value: 1048000

+    Col 3: bigint_value: 123456789012345

+    Col 4: float_value: 3.141590

+    Col 5: double_value: 3.14159

+    Col 6: numeric_value: 123456789012.345

+    Col 7: char_value: This is a char

+    Col 8: varchar_value: This is a varchar

+    Col 9: text_value: This is a text

+    Col 10: point_value: (1,0)

+    Col 11: time_value: 01/01/1 21:13:14

+    Col 12: date_value: 02/29/2000 00:00:00

+    Col 13: timestamp_value: 02/29/2004 14:00:11

+    Col 14: null_boolean_value is NULL

+    Col 15: null_int2_value is NULL

+    Col 16: null_int4_value is NULL

+    Col 17: null_bigint_value is NULL

+    Col 18: null_float_value is NULL

+    Col 19: null_double_value is NULL

+    Col 20: null_numeric_value is NULL

+    Col 21: null_char_value is NULL

+    Col 22: null_varchar_value is NULL

+    Col 23: null_text_value is NULL

+    Col 24: null_point_value is NULL

+    Col 25: null_time_value is NULL

+    Col 26: null_date_value is NULL

+    Col 27: null_timestamp_value is NULL

+   Total Rows Retrieved: 2

+ Total Result sets: 1

+                Call ExecuteReader with a SQL Command. (Not INSERT,UPDATE,DELETE

+ ).

+ Result is from a SQL Command not (INSERT,UPDATE,DELETE).   Records Affected: -1

+ Total Result sets: 0

+                Call ExecuteReader with a SQL Command. (Is INSERT,UPDATE,DELETE)

+ .

+ Result is from a SQL Command (INSERT,UPDATE,DELETE).  Records Affected: 1

+ Total Result sets: 0

+                Calling stored procedure version()

+ Result: PostgreSQL 7.2.1 on i686-pc-cygwin, compiled by GCC 2.95.3-5

+ Database Server Version: PostgreSQL 7.2.1 on i686-pc-cygwin, compiled by GCC 2.9

+ 5.3-5

+ Clean up...

+                Drop table...

+ OK

+ RESULT: 0

+

+</pre>

+

diff --git a/web/asp-net b/web/asp-net
new file mode 100755
index 00000000000..5255e69f77d
--- /dev/null
+++ b/web/asp-net
@@ -0,0 +1,130 @@
+* ASP.NET
+
+	ASP.NET support is divided in two pieces:
+	<ul>
+		* Web Forms (Web Applications infrastructure).
+
+		* Web Services (the SOAP-based rpc system).
+	</ul>
+
+	There is work underway for both systems.  The Web Forms
+	support is more advanced at this point, and various ".aspx"
+	programs can be run using the Mono runtime and the XSP page
+	parser.
+
+	Tim started work on the Web Services.  Although we have a
+	SoapFormatter as part of the remoting infrastructure already
+	(contributed by Jesus), most people will be using the ASP.NET
+	Web Services support.  Work for the supporting class libraries
+	just started recently.
+
+* Web Forms: The pieces
+
+	There are a couple of components to the puzzle:
+
+	<ul>
+		* .aspx page parser (converts .aspx to C# code).
+	
+		* System.Web.HttpRuntime support.
+	
+		* Web controls (System.Web.UI.HtmlControls and
+		  System.Web.UI.WebControls).
+	
+		* Underlying infrastructure for the controls (System.Web.UI).
+	
+		* HttpRuntime.ProcessRequest is the core of the ASP.NET
+		  implementation.
+	</ul>
+
+
+	Gonzalo has been working on an ASP.NET parser that takes .aspx
+	files and generated the code required to run them (the code lives in
+	module `xsp' along with a little web server for testing).
+
+	Most of the runtime support was written by Patrik Torstensson
+	(now at Intel).  This was interesting, because in order to implement
+	some of its features, Patrik had to go into the runtime/JIT engine and
+	he spent a few weeks doing work there.
+
+	The classes for running ASP.NET are being actively written.
+	Gaurav, Leen and Patrik worked in the core of the classes
+	required to run ASP.NET web application as well as a small
+	embeddable web server.
+
+	Duncan got our System.Web assembly to compile.
+
+** HttpRuntime
+
+	Patrik has authored most of the HttpRuntime support (both on
+	the System.Web and on the foundation).
+
+	He is now working on finishing HttpRuntime and a few needed
+	classes.
+
+** XSP
+
+	Currently XSP provides the .aspx compiler to C#.
+	There is also a small web server for testing in module xsp
+	along with a bunch of .aspx pages to test the server.
+
+	The C# code generator is being moved to System.Web.Compilation.
+
+	Gonzalo is in charge of the compiler.
+
+** Controls
+
+	A lot of work has been put in the various classes that
+	implement the controls (UI.HtmlControls and UI.WebControls),
+	but they have been coded mostly in the dark, and without being
+	able to test them in real life: Gaurav and Leen worked very
+	hard on this namespace.
+
+	We can now render all HtmlControls and almost all WebControls.
+	DataGrid and DataList controls are being finisehd by Gaurav.
+	Xml control needs some work on System.Xml related to XSL.
+
+** Extending ASP.NET
+
+	Currently you have to reference in your ASP.NET the control
+	and all of its properties, which works fine if you have a GUI
+	designer, but is harder for people used to develop using text
+	editors.
+
+	Since we have a parser, we could extend this parser to allow
+	people to still use ASP.NET controls, using a simpler syntax.
+	For example people doing blogs and editing their templates
+	over the web probably do not want to use direct ASP.NET but a
+	wrapper around it.
+
+** Roadmap
+
+        1. The Parser.
+
+        2. Get the parser to generate output compatible with ASP.NET.
+
+        3. Run the sample output with the real Microsoft runtime
+           but using our generated page.   
+
+        4. Run the sample with our classes with the .NET runtime.
+
+        5. Run the samples with our classes with the our runtime (without
+	using HttpRuntime).
+
+        6. Finish HttpRuntime.
+	<b>We are here</b>.
+	
+        7. Running our sample code with our classes with our runtime.
+
+** How to Help
+
+        Testing and fixing HtmlControls, WebControls and validators is an
+	easy way to help.
+
+        In the CVS module XSP you can find the aspx to C# page parser,
+        a little web server used for testing and a directory containing
+        sample aspx pages.
+
+        You have some documentation under doc directory and in the README
+        file of each directory. They explain how to test our System.Web.
+        Testing is really easy!
+
diff --git a/web/books b/web/books
new file mode 100644
index 00000000000..d5933e79836
--- /dev/null
+++ b/web/books
@@ -0,0 +1,37 @@
+* C# Books
+
+   A Programmer's Introduction to C# - Second Edition: Eric Gunnerson
+
+* Remoting
+
+   <a href="http://www.dotnetremoting.cc/book/AdvancedDotNetRemoting.asp">
+   Advanced .NET Remoting: Ingo Rammer</a>
+
+* Compiler Implementation
+
+   Compilers - Principles, Techniques, and Tools: Alfred V. Aho, Ravi Sethi,
+   Jeffrey D. Ullman 
+
+   Advanced Compiler Design Implementation: Steven S. Muchnick
+
+   Modern Compiler Implementation in C: Andrew W. Appel
+
+   A Retargetable C Compiler - Design and Implementation: C. Fraser, David
+   Hanson
+
+* Reference Manuals
+
+   <a
+   href="http://developer.intel.com/design/pentium/manuals/24319101.pdf">Intel
+   Architecture Software Developer's Manual, Volume 2 - Instruction Set Reference Manual</a>
+
+   <a
+   href="http://www.caldera.com/developers/devspecs/abi386-4.pdf">System V ABI
+   - i386 Architecture Processor Supplement</a> 
+
+   <a
+   href="http://www.caldera.com/developers/devspecs/mipsabi.pdf">System V ABI -
+   MIPS Processor supplement</a>
+
+   <a href="http://www.sparc.org/standards/V8.pdf">The SPARC Architecture
+   Manual Version 8</a> 
\ No newline at end of file
diff --git a/web/c-sharp b/web/c-sharp
index 07c13831039..e81d99b73ba 100644
--- a/web/c-sharp
+++ b/web/c-sharp
@@ -2,14 +2,13 @@
 
 	MCS is currently able to compile itself and many more C#
 	programs (there is a test suite included that you can use).
+	It is routinely used to compile Mono, roughly half a million
+	lines of C# code.
 
 	We are in feature completion mode right now.  There are still
 	a couple of areas that are not covered by the Mono compiler, but
-	they are very very few at this point.
-
-	MCS was able to parse itself on April 2001, MCS compiled itself
-	for the first time on December 28 2001.  MCS became self hosting
-	on January 3rd, 2002. 
+	they are very very few at this point (security attributes),
+	you can also browse the MCS <a href="http://bugzilla.ximian.com/buglist.cgi?product=Mono%2FMCS&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&changedin=&chfieldfrom=&chfieldto=Now&chfieldvalue=&short_desc=&short_desc_type=substring&long_desc=&long_desc_type=substring&bug_file_loc=&bug_file_loc_type=substring&keywords=&keywords_type=anywords&op_sys_details=&op_sys_details_type=substring&version_details=&version_details_type=substring&cmdtype=doit&newqueryname=&order=Reuse+same+sort+as+last+time&form_name=query">bugs</a> from Bugzilla.
 
 	A test suite is maintained to track the progress of
 	the compiler and various programs are routinely compiled and
@@ -23,10 +22,9 @@
 
 ** Running MCS
 
-	MCS is written in C# and uses heavily the .NET APIs.  At this point
-	MCS only runs on Windows with the .NET Framework SDK installed.  Work
-	is progressing rapidly in our JIT engine and our class libraries to
-	allow MCS to be ran in non-Windows systems. 
+	MCS is written in C# and uses heavily the .NET APIs.  MCS runs
+	on Linux with the Mono runtime and on Windows with both the
+	.NET runtime and the Mono runtime.
 
 ** Reporting Bugs in MCS
 
@@ -101,33 +99,14 @@
 	able to use this generic CIL optimizer in their projects
 	reducing their time to develop a production compiler. 
 
-<a name="tasks">
-** Current pending tasks
-
-	Simple tasks:
-
-	<ul>
-		* Redo the way we deal with built-in operators.
-	</ul>
+** History
 
-	Larger tasks:
-	<ul>
-
-		* Jay does not work correctly with `error'
-		  productions, making parser errors hard to point.  It
-		  would be best to port the Bison-To-Java compiler to
-		  become Bison-to-C# compiler. 
-		  
-		  Nick Drochak has started a project on SourceForge for this.
-		  You can find the project at: <a href="http://sourceforge.net/projects/jb2csharp/">
-		  http://sourceforge.net/projects/jb2csharp/</a>
-
-		* Semantic Analysis: Return path coverage and
-		  initialization before use coverage are two great
-		  features of C# that help reduce the number of bugs
-		  in applications.  It is one interesting hack.
+	MCS was able to parse itself on April 2001, MCS compiled itself
+	for the first time on December 28 2001.  MCS became self hosting
+	on January 3rd, 2002. 
 
-	</ul>
+	The Mono Runtime and the Mono execution engine were able to make
+	our compiler self hosting on March 12, 2002.
 
 ** Questions and Answers
 
diff --git a/web/class-status b/web/class-status
deleted file mode 100644
index df633814269..00000000000
--- a/web/class-status
+++ /dev/null
@@ -1,394 +0,0 @@
-* Status of the various pieces of the class library
-
-	You can browse the status of the class library and see who has
-	registered to work on what parts of the system.  These list
-	work-in-progress components currently.
-
-	Browse the current <a href="class-status/index.html">status</a>.
-
-	You can also download the XML <a
-	href="class-status/maintainers.xml">maintainers</a> file that
-	contains the actual maintainers list.  
-
-	You can also download the master <a
-	href="class-status/class.xml">Class Status XML</a> file.
-
-* List of not-implemented classes
-
-	These classes are only classes pending from the CORLIB assembly
-	other assemblies are not yet listed.  We are going to be working
-	on an improved status display for pending classes.
-
-	Please bear with us in the meantime.
-This is a list of pending classes, and links to their documentation on MSDN.Microsoft.com<p><p>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfMicrosoftWin32Registry
ClassTopic.asp">Microsoft.Win32.Registry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfMicrosoftWin32RegistryHive
ClassTopic.asp">Microsoft.Win32.RegistryHive
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfMicrosoftWin32RegistryKey
ClassTopic.asp">Microsoft.Win32.RegistryKey
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystem__ComObject
ClassTopic.asp">System.__ComObject
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemActivator
ClassTopic.asp">System.Activator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemArgIterator
ClassTopic.asp">System.ArgIterator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemAssemblyLoadEventHandler
ClassTopic.asp">System.AssemblyLoadEventHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemAsyncCallback
ClassTopic.asp">System.AsyncCallback
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemCrossAppDomainDelegate
ClassTopic.asp">System.CrossAppDomainDelegate
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemEventHandler
ClassTopic.asp">System.EventHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationCompareInfo
ClassTopic.asp">System.Globalization.CompareInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationHebrewCalendar
ClassTopic.asp">System.Globalization.HebrewCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationHijriCalendar
ClassTopic.asp">System.Globalization.HijriCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationJapaneseCalendar
ClassTopic.asp">System.Globalization.JapaneseCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationKoreanCalendar
ClassTopic.asp">System.Globalization.KoreanCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationSortKey
ClassTopic.asp">System.Globalization.SortKey
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationStringInfo
ClassTopic.asp">System.Globalization.StringInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationTaiwanCalendar
ClassTopic.asp">System.Globalization.TaiwanCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationTextElementEnumerator
ClassTopic.asp">System.Globalization.TextElementEnumerator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationTextInfo
ClassTopic.asp">System.Globalization.TextInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemGlobalizationThaiBuddhistCalendar
ClassTopic.asp">System.Globalization.ThaiBuddhistCalendar
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemIOEndOfStreamException
ClassTopic.asp">System.IO.EndOfStreamException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemIOIsolatedStorageIsolatedStorageFile
ClassTopic.asp">System.IO.IsolatedStorage.IsolatedStorageFile
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemIOPathTooLongException
ClassTopic.asp">System.IO.PathTooLongException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionEmitMethodRental
ClassTopic.asp">System.Reflection.Emit.MethodRental
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionMemberFilter
ClassTopic.asp">System.Reflection.MemberFilter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionModuleResolveEventHandler
ClassTopic.asp">System.Reflection.ModuleResolveEventHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionPointer
ClassTopic.asp">System.Reflection.Pointer
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionStrongNameKeyPair
ClassTopic.asp">System.Reflection.StrongNameKeyPair
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemReflectionTypeFilter
ClassTopic.asp">System.Reflection.TypeFilter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemResolveEventHandler
ClassTopic.asp">System.ResolveEventHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesAccessedThroughPropertyAttribute
ClassTopic.asp">System.Runtime.CompilerServices.AccessedThroughPropertyAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCallConvCdecl
ClassTopic.asp">System.Runtime.CompilerServices.CallConvCdecl
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCallConvFastcall
ClassTopic.asp">System.Runtime.CompilerServices.CallConvFastcall
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCallConvStdcall
ClassTopic.asp">System.Runtime.CompilerServices.CallConvStdcall
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCallConvThiscall
ClassTopic.asp">System.Runtime.CompilerServices.CallConvThiscall
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCompilationRelaxationsAttribute
ClassTopic.asp">System.Runtime.CompilerServices.CompilationRelaxationsAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCompilerGlobalScopeAttribute
ClassTopic.asp">System.Runtime.CompilerServices.CompilerGlobalScopeAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesCustomConstantAttribute
ClassTopic.asp">System.Runtime.CompilerServices.CustomConstantAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesDateTimeConstantAttribute
ClassTopic.asp">System.Runtime.CompilerServices.DateTimeConstantAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesDecimalConstantAttribute
ClassTopic.asp">System.Runtime.CompilerServices.DecimalConstantAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesDiscardableAttribute
ClassTopic.asp">System.Runtime.CompilerServices.DiscardableAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesIDispatchConstantAttribute
ClassTopic.asp">System.Runtime.CompilerServices.IDispatchConstantAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesIsVolatile
ClassTopic.asp">System.Runtime.CompilerServices.IsVolatile
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesIUnknownConstantAttribute
ClassTopic.asp">System.Runtime.CompilerServices.IUnknownConstantAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeCompilerServicesRequiredAttributeAttribute
ClassTopic.asp">System.Runtime.CompilerServices.RequiredAttributeAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesArrayWithOffset
ClassTopic.asp">System.Runtime.InteropServices.ArrayWithOffset
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesAssemblyRegistrationFlags
ClassTopic.asp">System.Runtime.InteropServices.AssemblyRegistrationFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesAutomationProxyAttribute
ClassTopic.asp">System.Runtime.InteropServices.AutomationProxyAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesBIND_OPTS
ClassTopic.asp">System.Runtime.InteropServices.BIND_OPTS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesBINDPTR
ClassTopic.asp">System.Runtime.InteropServices.BINDPTR
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesCALLCONV
ClassTopic.asp">System.Runtime.InteropServices.CALLCONV
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesClassInterfaceAttribute
ClassTopic.asp">System.Runtime.InteropServices.ClassInterfaceAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesClassInterfaceType
ClassTopic.asp">System.Runtime.InteropServices.ClassInterfaceType
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesCoClassAttribute
ClassTopic.asp">System.Runtime.InteropServices.CoClassAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComAliasNameAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComAliasNameAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComConversionLossAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComConversionLossAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComEventInterfaceAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComEventInterfaceAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesCOMException
ClassTopic.asp">System.Runtime.InteropServices.COMException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComImportAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComImportAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComInterfaceType
ClassTopic.asp">System.Runtime.InteropServices.ComInterfaceType
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComMemberType
ClassTopic.asp">System.Runtime.InteropServices.ComMemberType
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComRegisterFunctionAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComRegisterFunctionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComSourceInterfacesAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComSourceInterfacesAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComUnregisterFunctionAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComUnregisterFunctionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesComVisibleAttribute
ClassTopic.asp">System.Runtime.InteropServices.ComVisibleAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesCONNECTDATA
ClassTopic.asp">System.Runtime.InteropServices.CONNECTDATA
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesCurrencyWrapper
ClassTopic.asp">System.Runtime.InteropServices.CurrencyWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesDESCKIND
ClassTopic.asp">System.Runtime.InteropServices.DESCKIND
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesDispatchWrapper
ClassTopic.asp">System.Runtime.InteropServices.DispatchWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesDispIdAttribute
ClassTopic.asp">System.Runtime.InteropServices.DispIdAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesDISPPARAMS
ClassTopic.asp">System.Runtime.InteropServices.DISPPARAMS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesELEMDESC
ClassTopic.asp">System.Runtime.InteropServices.ELEMDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesErrorWrapper
ClassTopic.asp">System.Runtime.InteropServices.ErrorWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesEXCEPINFO
ClassTopic.asp">System.Runtime.InteropServices.EXCEPINFO
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesExpandoIExpando
ClassTopic.asp">System.Runtime.InteropServices.Expando.IExpando
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesExporterEventKind
ClassTopic.asp">System.Runtime.InteropServices.ExporterEventKind
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesExtensibleClassFactory
ClassTopic.asp">System.Runtime.InteropServices.ExtensibleClassFactory
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesFILETIME
ClassTopic.asp">System.Runtime.InteropServices.FILETIME
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesFUNCDESC
ClassTopic.asp">System.Runtime.InteropServices.FUNCDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesFUNCFLAGS
ClassTopic.asp">System.Runtime.InteropServices.FUNCFLAGS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesFUNCKIND
ClassTopic.asp">System.Runtime.InteropServices.FUNCKIND
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesGCHandle
ClassTopic.asp">System.Runtime.InteropServices.GCHandle
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesGuidAttribute
ClassTopic.asp">System.Runtime.InteropServices.GuidAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesHandleRef
ClassTopic.asp">System.Runtime.InteropServices.HandleRef
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesICustomAdapter
ClassTopic.asp">System.Runtime.InteropServices.ICustomAdapter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesICustomFactory
ClassTopic.asp">System.Runtime.InteropServices.ICustomFactory
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesICustomMarshaler
ClassTopic.asp">System.Runtime.InteropServices.ICustomMarshaler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIDispatchImplAttribute
ClassTopic.asp">System.Runtime.InteropServices.IDispatchImplAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIDispatchImplType
ClassTopic.asp">System.Runtime.InteropServices.IDispatchImplType
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIDLDESC
ClassTopic.asp">System.Runtime.InteropServices.IDLDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIDLFLAG
ClassTopic.asp">System.Runtime.InteropServices.IDLFLAG
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIMPLTYPEFLAGS
ClassTopic.asp">System.Runtime.InteropServices.IMPLTYPEFLAGS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesImportedFromTypeLibAttribute
ClassTopic.asp">System.Runtime.InteropServices.ImportedFromTypeLibAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesImporterEventKind
ClassTopic.asp">System.Runtime.InteropServices.ImporterEventKind
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesInterfaceTypeAttribute
ClassTopic.asp">System.Runtime.InteropServices.InterfaceTypeAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesInvalidComObjectException
ClassTopic.asp">System.Runtime.InteropServices.InvalidComObjectException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesInvalidOleVariantTypeException
ClassTopic.asp">System.Runtime.InteropServices.InvalidOleVariantTypeException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesINVOKEKIND
ClassTopic.asp">System.Runtime.InteropServices.INVOKEKIND
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesIRegistrationServices
ClassTopic.asp">System.Runtime.InteropServices.IRegistrationServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesITypeLibConverter
ClassTopic.asp">System.Runtime.InteropServices.ITypeLibConverter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesITypeLibExporterNameProvider
ClassTopic.asp">System.Runtime.InteropServices.ITypeLibExporterNameProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesITypeLibExporterNotifySink
ClassTopic.asp">System.Runtime.InteropServices.ITypeLibExporterNotifySink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesITypeLibImporterNotifySink
ClassTopic.asp">System.Runtime.InteropServices.ITypeLibImporterNotifySink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesLCIDConversionAttribute
ClassTopic.asp">System.Runtime.InteropServices.LCIDConversionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesLIBFLAGS
ClassTopic.asp">System.Runtime.InteropServices.LIBFLAGS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesMarshalDirectiveException
ClassTopic.asp">System.Runtime.InteropServices.MarshalDirectiveException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesObjectCreationDelegate
ClassTopic.asp">System.Runtime.InteropServices.ObjectCreationDelegate
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesPARAMDESC
ClassTopic.asp">System.Runtime.InteropServices.PARAMDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesPARAMFLAG
ClassTopic.asp">System.Runtime.InteropServices.PARAMFLAG
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesPreserveSigAttribute
ClassTopic.asp">System.Runtime.InteropServices.PreserveSigAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesPrimaryInteropAssemblyAttribute
ClassTopic.asp">System.Runtime.InteropServices.PrimaryInteropAssemblyAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesProgIdAttribute
ClassTopic.asp">System.Runtime.InteropServices.ProgIdAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesRegistrationServices
ClassTopic.asp">System.Runtime.InteropServices.RegistrationServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesRuntimeEnvironment
ClassTopic.asp">System.Runtime.InteropServices.RuntimeEnvironment
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesSafeArrayRankMismatchException
ClassTopic.asp">System.Runtime.InteropServices.SafeArrayRankMismatchException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesSafeArrayTypeMismatchException
ClassTopic.asp">System.Runtime.InteropServices.SafeArrayTypeMismatchException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesSEHException
ClassTopic.asp">System.Runtime.InteropServices.SEHException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesSTATSTG
ClassTopic.asp">System.Runtime.InteropServices.STATSTG
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesSYSKIND
ClassTopic.asp">System.Runtime.InteropServices.SYSKIND
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTYPEATTR
ClassTopic.asp">System.Runtime.InteropServices.TYPEATTR
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTYPEDESC
ClassTopic.asp">System.Runtime.InteropServices.TYPEDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTYPEFLAGS
ClassTopic.asp">System.Runtime.InteropServices.TYPEFLAGS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTYPEKIND
ClassTopic.asp">System.Runtime.InteropServices.TYPEKIND
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTYPELIBATTR
ClassTopic.asp">System.Runtime.InteropServices.TYPELIBATTR
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibConverter
ClassTopic.asp">System.Runtime.InteropServices.TypeLibConverter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibExporterFlags
ClassTopic.asp">System.Runtime.InteropServices.TypeLibExporterFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibFuncAttribute
ClassTopic.asp">System.Runtime.InteropServices.TypeLibFuncAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibFuncFlags
ClassTopic.asp">System.Runtime.InteropServices.TypeLibFuncFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibImporterFlags
ClassTopic.asp">System.Runtime.InteropServices.TypeLibImporterFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibTypeAttribute
ClassTopic.asp">System.Runtime.InteropServices.TypeLibTypeAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibTypeFlags
ClassTopic.asp">System.Runtime.InteropServices.TypeLibTypeFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibVarAttribute
ClassTopic.asp">System.Runtime.InteropServices.TypeLibVarAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesTypeLibVarFlags
ClassTopic.asp">System.Runtime.InteropServices.TypeLibVarFlags
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIBindCtx
ClassTopic.asp">System.Runtime.InteropServices.UCOMIBindCtx
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIConnectionPoint
ClassTopic.asp">System.Runtime.InteropServices.UCOMIConnectionPoint
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIConnectionPointContainer
ClassTopic.asp">System.Runtime.InteropServices.UCOMIConnectionPointContainer
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIEnumConnectionPoints
ClassTopic.asp">System.Runtime.InteropServices.UCOMIEnumConnectionPoints
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIEnumConnections
ClassTopic.asp">System.Runtime.InteropServices.UCOMIEnumConnections
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIEnumMoniker
ClassTopic.asp">System.Runtime.InteropServices.UCOMIEnumMoniker
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIEnumString
ClassTopic.asp">System.Runtime.InteropServices.UCOMIEnumString
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIEnumVARIANT
ClassTopic.asp">System.Runtime.InteropServices.UCOMIEnumVARIANT
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIMoniker
ClassTopic.asp">System.Runtime.InteropServices.UCOMIMoniker
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIPersistFile
ClassTopic.asp">System.Runtime.InteropServices.UCOMIPersistFile
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIRunningObjectTable
ClassTopic.asp">System.Runtime.InteropServices.UCOMIRunningObjectTable
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMIStream
ClassTopic.asp">System.Runtime.InteropServices.UCOMIStream
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMITypeComp
ClassTopic.asp">System.Runtime.InteropServices.UCOMITypeComp
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMITypeInfo
ClassTopic.asp">System.Runtime.InteropServices.UCOMITypeInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUCOMITypeLib
ClassTopic.asp">System.Runtime.InteropServices.UCOMITypeLib
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesUnknownWrapper
ClassTopic.asp">System.Runtime.InteropServices.UnknownWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesVARDESC
ClassTopic.asp">System.Runtime.InteropServices.VARDESC
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeInteropServicesVARFLAGS
ClassTopic.asp">System.Runtime.InteropServices.VARFLAGS
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingActivatedClientTypeEntry
ClassTopic.asp">System.Runtime.Remoting.ActivatedClientTypeEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingActivatedServiceTypeEntry
ClassTopic.asp">System.Runtime.Remoting.ActivatedServiceTypeEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingActivationUrlAttribute
ClassTopic.asp">System.Runtime.Remoting.Activation.UrlAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsBaseChannelObjectWithProperties
ClassTopic.asp">System.Runtime.Remoting.Channels.BaseChannelObjectWithProperties
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsBaseChannelSinkWithProperties
ClassTopic.asp">System.Runtime.Remoting.Channels.BaseChannelSinkWithProperties
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsBaseChannelWithProperties
ClassTopic.asp">System.Runtime.Remoting.Channels.BaseChannelWithProperties
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsChannelDataStore
ClassTopic.asp">System.Runtime.Remoting.Channels.ChannelDataStore
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsChannelServices
ClassTopic.asp">System.Runtime.Remoting.Channels.ChannelServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsClientChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.ClientChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannel
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannel
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannelDataStore
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannelDataStore
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannelReceiver
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannelReceiver
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannelReceiverHook
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannelReceiverHook
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannelSender
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannelSender
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIChannelSinkBase
ClassTopic.asp">System.Runtime.Remoting.Channels.IChannelSinkBase
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientChannelSink
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientChannelSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientChannelSinkProvider
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientChannelSinkProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientFormatterSink
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientFormatterSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientFormatterSinkProvider
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientFormatterSinkProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIClientResponseChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.IClientResponseChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIServerChannelSink
ClassTopic.asp">System.Runtime.Remoting.Channels.IServerChannelSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIServerChannelSinkProvider
ClassTopic.asp">System.Runtime.Remoting.Channels.IServerChannelSinkProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIServerChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.IServerChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIServerFormatterSinkProvider
ClassTopic.asp">System.Runtime.Remoting.Channels.IServerFormatterSinkProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsIServerResponseChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.IServerResponseChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsITransportHeaders
ClassTopic.asp">System.Runtime.Remoting.Channels.ITransportHeaders
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsServerChannelSinkStack
ClassTopic.asp">System.Runtime.Remoting.Channels.ServerChannelSinkStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsServerProcessing
ClassTopic.asp">System.Runtime.Remoting.Channels.ServerProcessing
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsSinkProviderData
ClassTopic.asp">System.Runtime.Remoting.Channels.SinkProviderData
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingChannelsTransportHeaders
ClassTopic.asp">System.Runtime.Remoting.Channels.TransportHeaders
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsContextProperty
ClassTopic.asp">System.Runtime.Remoting.Contexts.ContextProperty
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsCrossContextDelegate
ClassTopic.asp">System.Runtime.Remoting.Contexts.CrossContextDelegate
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContextPropertyActivator
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContextPropertyActivator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContributeClientContextSink
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContributeClientContextSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContributeDynamicSink
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContributeDynamicSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContributeEnvoySink
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContributeEnvoySink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContributeObjectSink
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContributeObjectSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingContextsIContributeServerContextSink
ClassTopic.asp">System.Runtime.Remoting.Contexts.IContributeServerContextSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingIChannelInfo
ClassTopic.asp">System.Runtime.Remoting.IChannelInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingIEnvoyInfo
ClassTopic.asp">System.Runtime.Remoting.IEnvoyInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingInternalRemotingServices
ClassTopic.asp">System.Runtime.Remoting.InternalRemotingServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingIObjectHandle
ClassTopic.asp">System.Runtime.Remoting.IObjectHandle
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingIRemotingTypeInfo
ClassTopic.asp">System.Runtime.Remoting.IRemotingTypeInfo
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingLifetimeClientSponsor
ClassTopic.asp">System.Runtime.Remoting.Lifetime.ClientSponsor
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingLifetimeILease
ClassTopic.asp">System.Runtime.Remoting.Lifetime.ILease
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingLifetimeISponsor
ClassTopic.asp">System.Runtime.Remoting.Lifetime.ISponsor
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingLifetimeLeaseState
ClassTopic.asp">System.Runtime.Remoting.Lifetime.LeaseState
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingLifetimeLifetimeServices
ClassTopic.asp">System.Runtime.Remoting.Lifetime.LifetimeServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingAsyncResult
ClassTopic.asp">System.Runtime.Remoting.Messaging.AsyncResult
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingCallContext
ClassTopic.asp">System.Runtime.Remoting.Messaging.CallContext
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingConstructionCall
ClassTopic.asp">System.Runtime.Remoting.Messaging.ConstructionCall
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingConstructionResponse
ClassTopic.asp">System.Runtime.Remoting.Messaging.ConstructionResponse
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingHeader
ClassTopic.asp">System.Runtime.Remoting.Messaging.Header
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingHeaderHandler
ClassTopic.asp">System.Runtime.Remoting.Messaging.HeaderHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingILogicalThreadAffinative
ClassTopic.asp">System.Runtime.Remoting.Messaging.ILogicalThreadAffinative
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingIMessageCtrl
ClassTopic.asp">System.Runtime.Remoting.Messaging.IMessageCtrl
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingIMessageSink
ClassTopic.asp">System.Runtime.Remoting.Messaging.IMessageSink
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingIMethodCallMessage
ClassTopic.asp">System.Runtime.Remoting.Messaging.IMethodCallMessage
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingInternalMessageWrapper
ClassTopic.asp">System.Runtime.Remoting.Messaging.InternalMessageWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingIRemotingFormatter
ClassTopic.asp">System.Runtime.Remoting.Messaging.IRemotingFormatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingLogicalCallContext
ClassTopic.asp">System.Runtime.Remoting.Messaging.LogicalCallContext
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingMessageSurrogateFilter
ClassTopic.asp">System.Runtime.Remoting.Messaging.MessageSurrogateFilter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingMethodCall
ClassTopic.asp">System.Runtime.Remoting.Messaging.MethodCall
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingMethodCallMessageWrapper
ClassTopic.asp">System.Runtime.Remoting.Messaging.MethodCallMessageWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingMethodResponse
ClassTopic.asp">System.Runtime.Remoting.Messaging.MethodResponse
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingMethodReturnMessageWrapper
ClassTopic.asp">System.Runtime.Remoting.Messaging.MethodReturnMessageWrapper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingOneWayAttribute
ClassTopic.asp">System.Runtime.Remoting.Messaging.OneWayAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingRemotingSurrogateSelector
ClassTopic.asp">System.Runtime.Remoting.Messaging.RemotingSurrogateSelector
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMessagingReturnMessage
ClassTopic.asp">System.Runtime.Remoting.Messaging.ReturnMessage
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapAttribute
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapFieldAttribute
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapFieldAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapMethodAttribute
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapMethodAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapOption
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapOption
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapParameterAttribute
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapParameterAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataSoapTypeAttribute
ClassTopic.asp">System.Runtime.Remoting.Metadata.SoapTypeAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001ISoapXsd
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.ISoapXsd
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapAnyUri
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapAnyUri
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapBase64Binary
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapBase64Binary
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapDate
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapDate
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapDateTime
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapDateTime
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapDay
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapDay
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapDuration
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapDuration
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapEntities
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapEntities
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapEntity
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapEntity
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapHexBinary
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapHexBinary
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapId
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapId
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapIdref
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapIdref
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapIdrefs
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapIdrefs
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapInteger
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapInteger
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapLanguage
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapLanguage
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapMonth
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapMonth
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapMonthDay
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapMonthDay
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapName
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapName
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNcName
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNcName
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNegativeInteger
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNegativeInteger
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNmtoken
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNmtoken
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNmtokens
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNmtokens
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNonNegativeInteger
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNonNegativeInteger
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNonPositiveInteger
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNonPositiveInteger
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNormalizedString
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNormalizedString
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapNotation
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapNotation
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapPositiveInteger
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapPositiveInteger
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapQName
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapQName
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapTime
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapTime
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapToken
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapToken
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapYear
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapYear
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataW3cXsd2001SoapYearMonth
ClassTopic.asp">System.Runtime.Remoting.Metadata.W3cXsd2001.SoapYearMonth
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingMetadataXmlFieldOrderOption
ClassTopic.asp">System.Runtime.Remoting.Metadata.XmlFieldOrderOption
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingProxiesProxyAttribute
ClassTopic.asp">System.Runtime.Remoting.Proxies.ProxyAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingProxiesRealProxy
ClassTopic.asp">System.Runtime.Remoting.Proxies.RealProxy
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingRemotingConfiguration
ClassTopic.asp">System.Runtime.Remoting.RemotingConfiguration
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingRemotingException
ClassTopic.asp">System.Runtime.Remoting.RemotingException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingRemotingServices
ClassTopic.asp">System.Runtime.Remoting.RemotingServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingRemotingTimeoutException
ClassTopic.asp">System.Runtime.Remoting.RemotingTimeoutException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingServerException
ClassTopic.asp">System.Runtime.Remoting.ServerException
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingServicesEnterpriseServicesHelper
ClassTopic.asp">System.Runtime.Remoting.Services.EnterpriseServicesHelper
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingServicesITrackingHandler
ClassTopic.asp">System.Runtime.Remoting.Services.ITrackingHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingServicesTrackingServices
ClassTopic.asp">System.Runtime.Remoting.Services.TrackingServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingSoapServices
ClassTopic.asp">System.Runtime.Remoting.SoapServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingTypeEntry
ClassTopic.asp">System.Runtime.Remoting.TypeEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingWellKnownClientTypeEntry
ClassTopic.asp">System.Runtime.Remoting.WellKnownClientTypeEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeRemotingWellKnownServiceTypeEntry
ClassTopic.asp">System.Runtime.Remoting.WellKnownServiceTypeEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormatter
ClassTopic.asp">System.Runtime.Serialization.Formatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormatterConverter
ClassTopic.asp">System.Runtime.Serialization.FormatterConverter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersBinaryBinaryFormatter
ClassTopic.asp">System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersInternalRM
ClassTopic.asp">System.Runtime.Serialization.Formatters.InternalRM
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersInternalST
ClassTopic.asp">System.Runtime.Serialization.Formatters.InternalST
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersServerFault
ClassTopic.asp">System.Runtime.Serialization.Formatters.ServerFault
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersSoapFault
ClassTopic.asp">System.Runtime.Serialization.Formatters.SoapFault
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormattersSoapMessage
ClassTopic.asp">System.Runtime.Serialization.Formatters.SoapMessage
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationFormatterServices
ClassTopic.asp">System.Runtime.Serialization.FormatterServices
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationObjectIDGenerator
ClassTopic.asp">System.Runtime.Serialization.ObjectIDGenerator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationObjectManager
ClassTopic.asp">System.Runtime.Serialization.ObjectManager
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationSerializationBinder
ClassTopic.asp">System.Runtime.Serialization.SerializationBinder
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationSerializationEntry
ClassTopic.asp">System.Runtime.Serialization.SerializationEntry
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationSerializationInfoEnumerator
ClassTopic.asp">System.Runtime.Serialization.SerializationInfoEnumerator
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemRuntimeSerializationSurrogateSelector
ClassTopic.asp">System.Runtime.Serialization.SurrogateSelector
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityAllowPartiallyTrustedCallersAttribute
ClassTopic.asp">System.Security.AllowPartiallyTrustedCallersAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyCryptoConfig
ClassTopic.asp">System.Security.Cryptography.CryptoConfig
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyDSACryptoServiceProvider
ClassTopic.asp">System.Security.Cryptography.DSACryptoServiceProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyHMACSHA1
ClassTopic.asp">System.Security.Cryptography.HMACSHA1
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyKeyedHashAlgorithm
ClassTopic.asp">System.Security.Cryptography.KeyedHashAlgorithm
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyMACTripleDES
ClassTopic.asp">System.Security.Cryptography.MACTripleDES
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyMaskGenerationMethod
ClassTopic.asp">System.Security.Cryptography.MaskGenerationMethod
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyPasswordDeriveBytes
ClassTopic.asp">System.Security.Cryptography.PasswordDeriveBytes
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyPKCS1MaskGenerationMethod
ClassTopic.asp">System.Security.Cryptography.PKCS1MaskGenerationMethod
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRC2
ClassTopic.asp">System.Security.Cryptography.RC2
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRC2CryptoServiceProvider
ClassTopic.asp">System.Security.Cryptography.RC2CryptoServiceProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRijndael
ClassTopic.asp">System.Security.Cryptography.Rijndael
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRijndaelManaged
ClassTopic.asp">System.Security.Cryptography.RijndaelManaged
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRNGCryptoServiceProvider
ClassTopic.asp">System.Security.Cryptography.RNGCryptoServiceProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSA
ClassTopic.asp">System.Security.Cryptography.RSA
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSACryptoServiceProvider
ClassTopic.asp">System.Security.Cryptography.RSACryptoServiceProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAOAEPKeyExchangeDeformatter
ClassTopic.asp">System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAOAEPKeyExchangeFormatter
ClassTopic.asp">System.Security.Cryptography.RSAOAEPKeyExchangeFormatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAParameters
ClassTopic.asp">System.Security.Cryptography.RSAParameters
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAPKCS1KeyExchangeDeformatter
ClassTopic.asp">System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAPKCS1KeyExchangeFormatter
ClassTopic.asp">System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAPKCS1SignatureDeformatter
ClassTopic.asp">System.Security.Cryptography.RSAPKCS1SignatureDeformatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyRSAPKCS1SignatureFormatter
ClassTopic.asp">System.Security.Cryptography.RSAPKCS1SignatureFormatter
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographySHA1Managed
ClassTopic.asp">System.Security.Cryptography.SHA1Managed
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographySHA384Managed
ClassTopic.asp">System.Security.Cryptography.SHA384Managed
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographySHA512Managed
ClassTopic.asp">System.Security.Cryptography.SHA512Managed
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyTripleDES
ClassTopic.asp">System.Security.Cryptography.TripleDES
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityCryptographyTripleDESCryptoServiceProvider
ClassTopic.asp">System.Security.Cryptography.TripleDESCryptoServiceProvider
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityNamedPermissionSet
ClassTopic.asp">System.Security.NamedPermissionSet
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsEnvironmentPermission
ClassTopic.asp">System.Security.Permissions.EnvironmentPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsFileDialogPermission
ClassTopic.asp">System.Security.Permissions.FileDialogPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsFileDialogPermissionAccess
ClassTopic.asp">System.Security.Permissions.FileDialogPermissionAccess
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsIsolatedStorageFilePermission
ClassTopic.asp">System.Security.Permissions.IsolatedStorageFilePermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsIsolatedStoragePermissionAttribute
ClassTopic.asp">System.Security.Permissions.IsolatedStoragePermissionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsPrincipalPermission
ClassTopic.asp">System.Security.Permissions.PrincipalPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsPrincipalPermissionAttribute
ClassTopic.asp">System.Security.Permissions.PrincipalPermissionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsPublisherIdentityPermission
ClassTopic.asp">System.Security.Permissions.PublisherIdentityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsPublisherIdentityPermissionAttribute
ClassTopic.asp">System.Security.Permissions.PublisherIdentityPermissionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsReflectionPermission
ClassTopic.asp">System.Security.Permissions.ReflectionPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsRegistryPermission
ClassTopic.asp">System.Security.Permissions.RegistryPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsSecurityPermission
ClassTopic.asp">System.Security.Permissions.SecurityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsSecurityPermissionAttribute
ClassTopic.asp">System.Security.Permissions.SecurityPermissionAttribute
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsSiteIdentityPermission
ClassTopic.asp">System.Security.Permissions.SiteIdentityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsStrongNameIdentityPermission
ClassTopic.asp">System.Security.Permissions.StrongNameIdentityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsStrongNamePublicKeyBlob
ClassTopic.asp">System.Security.Permissions.StrongNamePublicKeyBlob
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsUIPermission
ClassTopic.asp">System.Security.Permissions.UIPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsUrlIdentityPermission
ClassTopic.asp">System.Security.Permissions.UrlIdentityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPermissionsZoneIdentityPermission
ClassTopic.asp">System.Security.Permissions.ZoneIdentityPermission
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyAllMembershipCondition
ClassTopic.asp">System.Security.Policy.AllMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyApplicationDirectory
ClassTopic.asp">System.Security.Policy.ApplicationDirectory
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyApplicationDirectoryMembershipCondition
ClassTopic.asp">System.Security.Policy.ApplicationDirectoryMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyFirstMatchCodeGroup
ClassTopic.asp">System.Security.Policy.FirstMatchCodeGroup
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyHash
ClassTopic.asp">System.Security.Policy.Hash
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyHashMembershipCondition
ClassTopic.asp">System.Security.Policy.HashMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyNetCodeGroup
ClassTopic.asp">System.Security.Policy.NetCodeGroup
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyPermissionRequestEvidence
ClassTopic.asp">System.Security.Policy.PermissionRequestEvidence
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyPolicyStatement
ClassTopic.asp">System.Security.Policy.PolicyStatement
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyPublisher
ClassTopic.asp">System.Security.Policy.Publisher
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyPublisherMembershipCondition
ClassTopic.asp">System.Security.Policy.PublisherMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicySite
ClassTopic.asp">System.Security.Policy.Site
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicySiteMembershipCondition
ClassTopic.asp">System.Security.Policy.SiteMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyStrongName
ClassTopic.asp">System.Security.Policy.StrongName
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyStrongNameMembershipCondition
ClassTopic.asp">System.Security.Policy.StrongNameMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyUnionCodeGroup
ClassTopic.asp">System.Security.Policy.UnionCodeGroup
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyUrl
ClassTopic.asp">System.Security.Policy.Url
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyUrlMembershipCondition
ClassTopic.asp">System.Security.Policy.UrlMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyZone
ClassTopic.asp">System.Security.Policy.Zone
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPolicyZoneMembershipCondition
ClassTopic.asp">System.Security.Policy.ZoneMembershipCondition
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPrincipalWindowsIdentity
ClassTopic.asp">System.Security.Principal.WindowsIdentity
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPrincipalWindowsImpersonationContext
ClassTopic.asp">System.Security.Principal.WindowsImpersonationContext
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemSecurityPrincipalWindowsPrincipal
ClassTopic.asp">System.Security.Principal.WindowsPrincipal
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingCompressedStack
ClassTopic.asp">System.Threading.CompressedStack
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingIOCompletionCallback
ClassTopic.asp">System.Threading.IOCompletionCallback
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingThreadStart
ClassTopic.asp">System.Threading.ThreadStart
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingTimerCallback
ClassTopic.asp">System.Threading.TimerCallback
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingWaitCallback
ClassTopic.asp">System.Threading.WaitCallback
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemThreadingWaitOrTimerCallback
ClassTopic.asp">System.Threading.WaitOrTimerCallback
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemTimeZone
ClassTopic.asp">System.TimeZone
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemTypedReference
ClassTopic.asp">System.TypedReference
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemUnhandledExceptionEventHandler
ClassTopic.asp">System.UnhandledExceptionEventHandler
</a><br>
-	<a href="http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrfSystemWeakReference
ClassTopic.asp">System.WeakReference
</a><br>
diff --git a/web/class-status.in b/web/class-status.in
index 0ecc7f5e637..a66aa18092e 100644
--- a/web/class-status.in
+++ b/web/class-status.in
@@ -15,8 +15,12 @@
 
 * List of not-implemented classes
 
-	These classes are only classes pending from the CORLIB assembly
-	other assemblies are not yet listed.  We are going to be working
-	on an improved status display for pending classes.
+	Pick from the list of assemblies in the menu on the left to
+	view the current status of that assembly.
 
-	Please bear with us in the meantime.
+	The tree shows items that are either missing or that have TODO
+	attributes associated with them.
+	You can use the checkboxes to show only missing or only TODO items.
+
+	Clicking on a name will take you to the <a href="http://msdn.microsoft.com/">MSDN documentation</a> for that item.
+	CTRL-Clicking will take you to the <a href="http://cvs.hispalinux.es/cgi-bin/cvsweb/?cvsroot=Mono">mono CVS tree</a>.
diff --git a/web/classlib-doc b/web/classlib-doc
index 14fdc9e7191..89849cb6172 100644
--- a/web/classlib-doc
+++ b/web/classlib-doc
@@ -2,11 +2,6 @@
 
 ** Summary
 
-	<em>
-	[This documentation is in progress.  Comments to
-	<a href="mailto:jbarn@httcb.net">jbarn@httcb.net</a>.]
-	</em>
-	
 	While using inline XML tags to document classes is certainly
 	convenient, properly verbose documentation quickly overwhelms
 	the code, making the source quite difficult to read.  Furthermore,
diff --git a/web/contributing b/web/contributing
index e006f072b79..bf6086f0474 100644
--- a/web/contributing
+++ b/web/contributing
@@ -18,8 +18,32 @@
 	something that would help tremendously would be to help with
 	small duties in the project that need to be addressed. 
 
+	You can see what needs to be done in the class libraries <a href="class-status.html">here</a>
+
+* IRC Channel
+
+	Many developers get together on the <b>#mono</b> irc channel
+	on the <b>irc.gnome.org</b> server.  
+
 ** To start contributing
 
+	As a programmer, you can contribute in three different scenarios to Mono:
+
+	<ul>
+		* If you only have Linux/Unix.
+		* If you only have Windows.
+
+		* If you have both Linux and Windows.
+	</ul>
+
+	You might also want to check our <a href="#setup">common
+	setups</a> section that describes some common setups that people
+	use while working on Mono.
+
+*** Contributing to the class library, regression tests or the compiler
+
+	This only requires Windows currently.
+
 	To start developing classes or to contribute to the compiler,
 	you only need Windows and the .NET Framework 1.0 SDK.  Please notice
 	that you do not need Visual Studio (although you can use it if
@@ -42,7 +66,23 @@
 	world that only has a test suite.  
 	
 	To get started writing tests see the <a href="testing.html">Test Suite</a>
-	section.
+	section. <a href="mono-contribution-howto.html">Here</a> there is a good All-In-One introduction to the art of writing tests.
+
+
+*** Contributing to the runtime engine
+
+	This only requires Linux, currently some tasks are easier if you
+	have access to Windows as well.
+
+	Here are a few things you can do:
+	<ul>
+		* Port the runtime to other architectures.
+		* Port the runtime to other operating systems.
+		* Finish the IL code verifier in the runtime.
+		* Hack the JIT, improve the code generator, add new
+		  pattern rules, improve the register allocator.
+		* Implement the debugging interfaaces
+	</ul>
 
 ** Bug reporting
 
@@ -90,7 +130,52 @@
 	  http://www.oreally.com/catalog/dotnetfrmess</a>)
 	</ul>
 
-* Special note
+<a name="setup">
+* Common Setups
+
+	People running both Linux and Windows while contributing to
+	Mono use a number of tricks to increase their productivity.
+
+	Scenarios:
+
+	<ul>
+		* <b>Linux host and Windows host</b>
+
+		  The Windows file system is shared (right click on
+		  your hard drive icon, and select sharing, allow this
+		  to be shared).  
+
+		  The Windows machine has the required build tools
+		  (cygwin, and the .NET framework).  On the Windows
+		  machine, you want to setup the ssh server (run the
+		  ssh-host-config program to configure your ssh) and
+		  run it (from a cygwin terminal, type: /usr/sbin/sshd).
+
+		  From the Linux side, you want to mount the Windows
+		  file system, using something like this:
+
+<tt><pre>
+	mount -t smbfs -o uid=miguel,username="Miguel de Icaza" "//quack/c$" /mnt
+</pre></tt>
+
+		  In the above example, my Linux user name is
+		  `miguel', and this will allow this user to have
+		  read/write access to the share.  
+
+		  The host name is `quack', and the name of the share
+		  is `c$' (that is the C: partition).  
+
+		  The file system is accessible on /mnt.
+
+		  You can perform your cvs update and cvs commits from
+		  the /mnt directory, and run Emacs or your favorite
+		  Linux text editor on the Unix side in this way.
+
+		  Then from another terminal, you can ssh into your
+		  Windows box using ssh, like this: ssh "Miguel de Icaza@quack"
+	</ul>
+
+* Special Note
 
 	If you have looked at Microsoft's implementation of .NET or
 	their shared source code, you may not be able to contribute
diff --git a/web/documentation b/web/documentation
index fe3d61a8d25..4ed2e6a6639 100644
--- a/web/documentation
+++ b/web/documentation
@@ -32,4 +32,31 @@
 ** Class Library documentation
 
 	We are moving to a new setup for documenting the class libraries, 
-	you can read about it <a href="classlib-doc.html">here</a>
\ No newline at end of file
+	and you can read about it <a href="classlib-doc.html">here</a>.
+
+        A few words of warning and advice for class documentors:
+
+        A well-documented API can ease hours of frustration; as Mono
+        matures, robust and complete class library documentation will
+        become increasingly important.  As you write API documentation,
+        whether it is embedded in source files or in external Monodoc XML,
+        please keep the following in mind:
+
+        Plagarism, even if it's unintentional, is a Bad Thing(TM).
+        Microsoft's .NET Framework Class Library documentation is an
+        excellent resource for understanding the behavior and properties of
+        a type, and a lot of hard work went in to creating this (copyrighted)
+        resource.  Please don't copy from Microsoft's reference when
+        documenting a type.
+
+        To avoid this, I (<a href="mailto:jbarn@httcb.net">jbarn@httcb.net</a>)
+        suggest that you read the complete Microsoft documentation for a type,
+        ponder it for a while, and write the Mono documentation in your own
+        words.  While it's certainly okay to refer to the Microsoft
+        documentation to clarify your understanding of behavior or properties,
+        please don't open the Microsoft docs and refer to them for each member
+        you document.
+
+        There's a lot of domain expertise among the class library contributors;
+        let's put the same personal stamp on the class library documentation
+        that we have on the class libraries themselves.
\ No newline at end of file
diff --git a/web/download b/web/download
index 0ee5658636e..08c3c67ec40 100644
--- a/web/download
+++ b/web/download
@@ -10,52 +10,67 @@
 	test suite and the class library are in the `mcs' package, we
 	will move this later into `mono' itself. 
 
-	In order to make mcs and the class libraries you will need a computer
-	running Windows with the <strong>GNU make tools</strong> from the 
-	<strong>Cygwin</strong> environment, <strong>Microsoft's .NET Framework
-	SDK</strong>, <strong>GLIB 1.3</strong> and 
-	<strong>pkg-config</strong>.  
+	<b>Note: (Beginners read!)</b> There are a couple of documents you
+	should read before going ahead. You can reach them in the 
+	<a href="http://www.go-mono.org/mono-beginning.html">Resources/Beginning 	section</a>. And the <a href="http://www.go-mono.org/faq.html">FAQ</a> 
+	and the <a href="http://geneura.ugr.es/~jaime/deploy/mono-common-problems.html">
+	Mono Common Problems</a>. Might be useful too. Take the Mono Beginners
+	HOWTO for your system and proceed as it's described there.
+
 
 <a name="sources">
 *** Sources
 
 	Stay up to date on the Mono team's development using the 
 	<a href="http://lists.ximian.com/mailman/listinfo/mono-cvs-list">
-	mono-cvs-list</a> mailing list.
+	mono-cvs-list</a> mailing list.  The CVS source code can also
+	be browsed <a href="http://cvs.hispalinux.es/cgi-bin/cvsweb/?cvsroot=Mono#dirlist">here</a>
 
-<a name="feb-22">
-	<b>Mono 0.9</b>
+<a name="jun-7">
+	<b>Mono 0.13</b>
 
 	New packaged versions of the Mono C# compiler and Mono runtime
-	are now available.  The latest version is 0.9.
+	are now available.  The latest version is 0.13.
 
 	<ul>
-		* <a href="archive/mono-0.9">Mono 0.9 release notes</a>
+		* <a href="archive/mono-0.13">Mono 0.13 release notes</a>
 
-		* <a href="archive/mcs-0.9.tar.gz">mcs-0.9.tar.gz</a>
-		Mono C# compiler
-		* <a href="archive/mono-0.9.tar.gz">mono-0.9.tar.gz</a>
-		Mono runtime
+		* <a href="archive/mcs-0.13.tar.gz">mcs-0.13.tar.gz</a>
+		Mono C# compiler with class library source code.
+
+		* <a href="archive/mono-0.13.tar.gz">mono-0.13.tar.gz</a>
+		Mono runtime.
 	</ul>
-	
+
+* Snapshots	
+
+	Already daily volunteer's made binaries:
+
+	<ul>
+		* <a href="http://www.atoker.com/mono">Debian Linux</a>
+      	 	
+		* <a href="http://noa.tm/mono/">Red Hat (and RPM based systems)</a>
+		* <a href="http://www.superin.formativ.net/mono/mono.htm">Windows</a> (works without cygwin!)
+	</ul>
+
+	<b>Note1:</b> Don't look for the Mono BaseLabs RPMs; they are not providing it
+	anymore.<br> 
+	<b>Note2:</b> You will find that you can get binaries for the gtk-sharp 
+	package too. 
+
 <a name="snapshots">
 	For up to date sources, it is recommended that you use the Mono 
 	source code from either the 
 	<a href="http://www.go-mono.com/snapshots">nightly snapshots</a> or 
 	the <a href="anoncvs.html">Anonymous CVS</a>.  The nightly
 	snapshots are done every night at 10pm EST (Boston Time).
+	The anoncvs mirrors provided by Hispalinux are updated every six
+	hours.
 
 	The nightly snapshots are not guaranteed to build, but most of the 
 	time they should.  They should give you a window to see what we are 
 	up to.
 
-	You can download the GNU make tools and the Cygwin environment from
-	<a href="http://www.cygwin.com">www.cygwin.com</a>.
-
-	You can download Microsoft's .NET Framework SDK from
-	<a href="http://msdn.microsoft.com/downloads">
-	msdn.microsoft.com/downloads</a>.
-
 	There are scripts to help build mono for both Unix and Windows.  Get
 	<a href="mono-build.sh">mono-build.sh</a> for Unix, or <a
 	href="mono-build-w32.sh">mono-build-w32.sh</a> for Windows.
@@ -75,52 +90,65 @@
 	The script requires wget on either platform, and building the
 	software requires make, gcc, automake, autoconf, and libtool.
 	You should install these packages from your distribution or
-	with the cygwin installer.
+	with the cygwin installer. You should also take care of setting
+	the right environment variables as the PKG_CONFIG_FLAGS, etc.
 
 	The script will download required packages from
 	www.go-mono.com and do a cvs checkout of mono in the current
-	directory.  The cvs server chosen defaults to anonymous cvs;
+	directory.  <b>IMPORTANT!:</b> The cvs server chosen defaults to 
+	anonymous cvs;
 	set your CVSROOT environment variable before running the script to
 	select a particular cvs server.
 
+** Mono Regression Test Suite
+
+	You can get binaries for the Mono Regression Test Suite <a
+	href="archive/mono-tests.tar.gz">here</a>
+	
 <a name="install">
 ** Building the software manually
 
-*** Download the required software.
+*** Building on Linux
 
 	<ul>
 
-		* Microsoft's .NET Framework SDK from 
-		  <a href="http://msdn.microsoft.com/downloads">
-		  msdn.microsoft.com/downloads</a>.
+		You can build mono and mcs in Linux but to do that be
+		sure to obtain the corlib.dll and install it before
+		trying to compile. 
 
-		* Cygwin and the GNU Make tools from  
-		  <a href="http://www.cygwin.com">www.cygwin.com</a>.
-		  Some people observed problems with autoconf 2.52. Installing 
-		  autoconf 2.13 helped in those cases.
+		In linux be sure you get <a href="http://www.gtk.org">glib2.0</a> 
+		(>= 2.0.4, 2.0.6 
+		recomended) and <a href="http://www.freedesktop.org/software/pkgconfig">pkg-config</a> 0.80. 
+		Also the corresponding development packages for those as
+		well as the GNU Build Tools (make, autoconf...).
+		Then download the mono packages and compile them.
+		You must start compiling mcs and then mono.
+		Be sure you set all the environment variables before
+		compiling. You can use pkg-config --list-all to see
+		if you forgot to set some of them.
 
-		* Precompiled GLIB 1.3 and pkg-config packages (and
-		  their dependencies) by the <a href="http://www.gimp.org/~tml/gimp/win32//index.html">GIMP for Windows</a> project from
-		  <a href="http://www.go-mono.com/archive/pkgconfig-0.80-tml-20020101.zip">http://www.go-mono.com/archive/pkgconfig-0.80-tml-20020101.zip</a>
-		  <a href="http://www.go-mono.com/archive/glib-1.3.12-20020101.zip">http://www.go-mono.com/archive/glib-1.3.12-20020101.zip</a>
-		  <a href="http://www.go-mono.com/archive/glib-dev-1.3.12-20020101.zip">http://www.go-mono.com/archive/glib-dev-1.3.12-20020101.zip</a>
-		  <a href="http://www.go-mono.com/archive/libiconv-1.7.zip">http://www.go-mono.com/archive/libiconv-1.7.zip</a>
-		  <a href="http://www.go-mono.com/archive/libiconv-dev-1.7.zip">http://www.go-mono.com/archive/libiconv-dev-1.7-20020101.zip</a>
-		  <a href="http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip">http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip</a>
+		Normally you should enter:
+		export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"
+		if your install prefix is /usr/local.
 
-		* Download the Mono source code from the
-		  <a href="#feb-11">packaged versions</a> or
-		  the <a href="http://www.go-mono.com/snapshots">
-		  nightly snapshots</a> or the <a href="anoncvs.html">
-		  Anonymous CVS</a>.  The nightly snapshots are done every 
-		  night at 10pm EST (Boston Time). The nightly snapshots are 
-		  not guaranteed to build, but most of the time they should.
+		If you downloaded the Mono nightly snapshots, untar the 
+		snapshot. 
 
+		Change directories to "<strong>mcs</strong>". 
 
-	</ul>
+		Configure, compile and install: 
+
+		<pre>
+		<strong>./configure
+		make
+		make install</strong></pre>
+
+		Do the same in the "<strong>mono</strong>" directory.	
 
+	
+*** On Windows, to install and work on the compiler and the class libraries:
 
-*** Install Cygwin and the GNU build tools, Microsoft's .NET Framework SDK and the precompiled GLIB 1.3 and pkg-config libraries.
+**** Install Cygwin and the GNU build tools, Microsoft's .NET Framework SDK and the precompiled GLIB 2.0 and pkg-config libraries.
 
 	<ul>
 
@@ -134,29 +162,24 @@
 		  Unzip the precompiled packages listed above.
 
 	</ul>
-
-*** On Windows, to install and work on the compiler and the class libraries:
-
 	<ul>
-
+		
 		* If you downloaded the Mono 
-		  <a href="http://www.go-mono.com/snapshots">nightly snapshot
-		  </a>, untar the snapshot.
+		<a href="http://www.go-mono.com/snapshots">nightly snapshot
+		</a>, untar the snapshot.
 
 		* Change directories to <strong>"mcs"</strong>.
 
 		* Compile:
-
-<pre>
-<strong>make windows</strong>
-</pre>
-
-	</ul>
+		
+		<pre>
+		<strong>make windows</strong>
+		</pre>
 
 *** On Windows, to compile the mono runtime:
 
-	<ul>	
-
+	<ul>
+		
 		* If you downloaded the Mono 
 		  <a href="http://www.go-mono.com/snapshots">nightly snapshot
 		  </a>, untar the snapshot.
@@ -164,44 +187,49 @@
 		* Change directories to <strong>"mono"</strong>.
 
 		* Configure, compile and install:
+		<pre><strong>
+		./configure --prefix=c:/mono
+		make
+		make install
+		</strong></pre>
 
-<pre><strong>
-./configure --prefix=c:/mono
-make
-make install
-</strong></pre>
-		
 	</ul>
 
-*** On Unix, to compile the mono runtime:
+* Software resources, notes and old releases:
 
-	<ul>
-		
-		* Install <a href="http://www.freedesktop.org/software/pkg-config">pkg-config</a>.
-
-		* Install glib 1.3. You can download it
-                  from <a href="ftp://ftp.gtk.org/pub/gtk/v1.3/glib-1.3.12.tar.gz">ftp.gtk.org</a>. Maybe you need
-                  to modify your ACLOCAL_FLAGS for pkg-config, for example if
-                  your install prefix is /usr/local:
-<pre>
-<strong>export ACLOCAL_FLAGS="-I /usr/local/share/aclocal"</strong>
-</pre>
+		The required and additional software can be downloaded here:
 
-		* If you downloaded the Mono 
-		  <a href="http://www.go-mono.com/snapshots">nightly snapshots
-		  </a>, untar the snapshot.
+		* Microsoft's .NET Framework SDK from 
+		  <a href="http://msdn.microsoft.com/downloads">
+		  msdn.microsoft.com/downloads</a>.
+
+		* Cygwin and the GNU Make tools from  
+		  <a href="http://www.cygwin.com">www.cygwin.com</a>.
+		  Some people observed problems with autoconf 2.52. Installing 
+		  autoconf 2.13 helped in those cases.
+
+		* Precompiled GLIB 2.0 and pkg-config packages (and
+		  their dependencies) by the <a href="http://www.gimp.org/~tml/gimp/win32//index.html">GIMP for Windows</a> project from
+		  <a href="http://www.go-mono.com/archive/pkgconfig-0.80-tml-20020101.zip">http://www.go-mono.com/archive/pkgconfig-0.80-tml-20020101.zip</a>
+		  <a href="http://www.go-mono.com/archive/glib-1.3.12-20020101.zip">http://www.go-mono.com/archive/glib-1.3.12-20020101.zip</a>
+		  <a href="http://www.go-mono.com/archive/glib-dev-1.3.12-20020101.zip">http://www.go-mono.com/archive/glib-dev-1.3.12-20020101.zip</a>
+		  <a href="http://www.go-mono.com/archive/libiconv-1.7.zip">http://www.go-mono.com/archive/libiconv-1.7.zip</a>
+		  <a href="http://www.go-mono.com/archive/libiconv-dev-1.7.zip">http://www.go-mono.com/archive/libiconv-dev-1.7-20020101.zip</a>
+		  <a href="http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip">http://www.go-mono.com/archive/libintl-0.10.40-20020101.zip</a>
+
+		* Download the Mono source code from the
+		  <a href="#feb-11">packaged versions</a> or
+		  the <a href="http://www.go-mono.com/snapshots">
+		  nightly snapshots</a> or the <a href="anoncvs.html">
+		  Anonymous CVS</a>.  The nightly snapshots are done every 
+		  night at 10pm EST (Boston Time). The nightly snapshots are 
+		  not guaranteed to build, but most of the time they should.
 
-		* Change directories to <strong>"mono"</strong>.
 
-		* Configure, compile and install:
-<pre><strong>
-./configure
-make
-make install</strong>
-</pre>
 	</ul>
 
-*** Notes on compiling GLIB 1.3 and pkg-config from source:
+
+*** Notes on compiling GLIB 2.0 and pkg-config from source:
 
 
 	<ul>
@@ -232,17 +260,50 @@ make install</strong>
 
  
 		* Download, compile and install the 
-		  <a href="ftp://ftp.gtk.org/pub/gtk/v1.3/glib-1.3.12.tar.gz">
-		  glib 1.3</a> from source.
+		  <a href="ftp://ftp.gtk.org/pub/gtk/v2.0/glib-2.0.6.tar.gz">
+		  glib 2.0</a> from source.
 
 	</ul>
 
 
 <a name="oldreleases">
 
-*** Very old releases.
+*** Old releases.
 
-		<ul>
+	<ul>
+
+	<ul>
+	<a name="apr-24">
+	<b>Mono 0.11; April 24, 2002</b>
+		* <a href="archive/mono-0.11">Mono 0.11 release notes</a>
+
+		* <a href="archive/mcs-0.11.tar.gz">mcs-0.11.tar.gz</a>
+		Mono C# compiler
+		* <a href="archive/mono-0.11.tar.gz">mono-0.11.tar.gz</a>
+		Mono runtime
+	</ul>
+
+	<ul>	
+	<a name="mar-27">
+	<b>Mono 0.10; March 27, 2002</b>
+		* <a href="archive/mono-0.10">Mono 0.10 release notes</a>
+		* <a href="archive/mcs-0.10.tar.gz">mcs-0.10.tar.gz</a>
+		Mono C# compiler
+		* <a href="archive/mono-0.10.tar.gz">mono-0.10.tar.gz</a>
+		Mono runtime
+	</ul>
+	
+	<ul>
+	<a name="feb-22">
+	<b>Mono 0.9; February 22, 2002</b>
+		* <a href="archive/mono-0.9">Mono 0.9 release notes</a>
+
+		* <a href="archive/mcs-0.9.tar.gz">mcs-0.9.tar.gz</a>
+		Mono C# compiler
+		* <a href="archive/mono-0.9.tar.gz">mono-0.9.tar.gz</a>
+		Mono runtime
+	</ul>
+	
 		<a name="feb-11">
 		<b>February 11, 2002</b>
 		* <a href="archive/mcs-0.8.tar.gz">mcs-0.8.tar.gz</a>
diff --git a/web/faq b/web/faq
index 02a643fbe99..5613b628fcc 100644
--- a/web/faq
+++ b/web/faq
@@ -2,9 +2,12 @@
 <a href="#ximian">The Ximian Role in the Mono project</a><br>
 <a href="#gnome">Mono and GNOME</a><br>
 <a href="#gui">Building GUI applications with Mono</a><br>
+<a href="#winforms">Mono and WinForms</a><br>
 <a href="#msft">Mono and Microsoft</a><br>
 <a href="#pnpproject">Mono and the Portable.NET Project</a><br>
 <a href="#webservices">Web Services</a><br>
+<a href="#asp">Mono and ASP.NET</a><br>
+<a href="#ado">Mono and ADO.NET</a><br>
 <a href="#devel">Development Tools and Issues</a><br>
 <a href="#java">Mono and Java</a><br>
 <a href="#extending">Extending Mono</a><br>
@@ -13,8 +16,13 @@
 <a href="#gcc">Mono and GCC</a><br>
 <a href="#performance">Performance</a><br>
 <a href="#licensing">Licensing</a><br>
+<a href="#patents">Patents</a><br>
 <a href="#etc">Miscellaneous Questions</a><br>
+<a href="#problems">Mono Common Problems</a><br>
 
+A <a
+href="http://www.es.gnome.org/documentacion/articulos/MONO-PUF/MONO-PUF/">spanish
+translation</a> is also available
 
 <a name="basics"></a>
 ** Basics
@@ -22,9 +30,9 @@
 Q: What is Mono exactly?
 
 A: The Mono Project is an open development initiative sponsored by
-   Ximian that is working to develop an open source, Linux-based
+   Ximian that is working to develop an open source, Unix
    version of the Microsoft .NET development platform.  Its objective
-   is to enable Linux developers to build and
+   is to enable Unix developers to build and
    deploy cross-platform .NET Applications.  The project will
    implement various technologies developed by Microsoft that have now
    been submitted to the ECMA for standardization.
@@ -60,7 +68,7 @@ A: Mono contains a number of components useful for building new
    Windows has compilers that target the virtual machine from <a
    href="http://msdn.microsoft.com/net/thirdparty/default.asp#lang">a
    number of languages:</a> Managed C++, Java Script, Eiffel,
-   Component Pascal, APL, Cobol, Oberon, Perl, Python, Scheme,
+   Component Pascal, APL, Cobol, Perl, Python, Scheme,
    Smalltalk, Standard ML, Haskell, Mercury and Oberon.
 
    The CLR and the Common Type System (CTS) enables applications and
@@ -102,19 +110,26 @@ Q: Is Mono usable?
 A: The JIT engine is usable on Intel x86 machines.  An interpreter
    can be used on other non-Intel x86 machines.  
 
-   The class libraries are not yet mature enough to run real applications,
-   but if you are interested in trying out Mono, you can definetly start
-   testing things out as many programs run.
-
-   The C# compiler has made significant progress, it can even compile
-   itself now, but it can not yet be ran with our class libraries as
-   they are missing some features. 
+   The class libraries are mature enough to run some real applications
+   (the compiler for instance, and every day more and more applications
+   are natively developed with Mono).
 
 Q: When will you ship it?
 
-A: It is premature to target a shipdate for the code, but we
-   anticipate that it will be available some time in the middle of
-   2002.
+A: Different parts of Mono will achieve usability at different stages,
+   once we are comfortable with the compiler, we will release "Mono Core",
+   which contains everything needed to develop applications with the base
+   class libraries.  This should be available at some point during 2002.
+
+   Other higher level class libraries (ASP.NET, ADO.NET) will
+   be released when they become stable. 
+
+Q: What major components will you include in Mono?
+
+A: Hopefully everything that Microsoft ships on their Framework
+   (ADO.NET, ASP.NET), and
+   we encourage third party developers to create reusable components that
+   work on both Mono and Windows.
 
 Q: How can I contribute?
 
@@ -131,6 +146,10 @@ A: We are interested in providing the best tools for programmers to
    Project white paper</a>.
    the project.
 
+Q: Miguel said once that Mono was being implemented in COBOL. Is that true?.
+
+A: No. It was a joke.
+
 
 <a name="ximian"></a> 
 
@@ -164,6 +183,13 @@ Q: Will Ximian offer Mono commercially?
 A: When Mono is ready to be shipped Ximian will offer a commercial
    support and services for Mono. 
 
+Q: Does Ximian provide consulting services around Mono?
+
+A: Yes, Ximian does provide consulting services around Mono to
+   make it suitable to your needs.  Porting the runtime engine,
+   customizing it, working on specific classes or tuning the code
+   for your particular needs. 
+
 Q: Will you wait until Mono is finished?
 
 A: Mono will ship on various stages as they mature.  Some people
@@ -218,13 +244,22 @@ Q: But will I be able to build GNOME applications?
 
 A: Yes, we will enable people to write GNOME applications using Mono.
 
+Q: Do you have C# bindings for GNOME?.
+
+A: Yes, we currently bind libgnome, libgnomecanvas, and libgnomeui --
+   although I dare say I have no idea how functional the bindings are
+   outside of what I tested in the sample app. I imagine other libraries 
+   under the GNOME framework will be added on an as-needed (and as-requested) 
+   basis...although a truly good bonobo binding will have to wait on the CORBA 
+   remoting support which has been started recently.
+
 <a name="gui"></a>
 ** GUI applications
 
 Q: Will Mono enable GUI applications to be authored?
 
 A: Yes, you will be able to build GUI applications.  Indeed, that is our
-   main focus.  We will provide both the Windows.Forms API and the Gtk# AP(I.
+   main focus.  We will provide both the Windows.Forms API and the Gtk# API.
 
 Q: What is the difference between Gtk# and System.Windows.Forms?
 
@@ -238,6 +273,75 @@ A: As long as your applications are 100% .NET and do not make use
    of P/Invoke to call Win32 functions, your smart client applications
    will run on Mono platforms.
 
+Q: Where can I learn mora about Gtk#?
+
+A: The following <a href="http://gtk-sharp.sourceforge.net>link</a> sends you to the page of the project.
+
+Q: What can I do with Gtk#?. 
+
+A: Gtk# is becoming very usable and you can create applications and
+   applets like those you see in a GNOME desktop environment. It's 
+   easy to install so it's worth a try. 
+
+Q: How can I compile my HelloWorld.cs which uses Gtk#?.
+
+A: Try: mcs --unsafe -o HelloWorld.exe -r glib-sharp -r pango-sharp -r
+        atk-sharp -r gdk-sharp -r gtk-sharp -r gdk-imaging-sharp
+        HelloWorld.cs
+
+Q: Is there any way how to connect DataAdapter to some GTK# controls?
+
+A: There is a sample file called `DbClient' in gtk-sharp/samples that you
+   might to look at.  It is a sample program in Gtk# that adds/updates/deletes 
+   information on a Postgress database. When we have the new table/tree widgets, 
+   I am sure someone would write an adapter for System.Data (in Gtk2 the 
+   tree/list widgets are written using a view/model, so you only need to write 
+   a model that maps to the database). You can have a look at 
+   gtk-sharp/sample/DbClient, where there is a GTK# application that uses 
+   System.Data. It does not use DataAdapter, but DataReader though.
+
+<a name="winforms"></a>
+** Mono and WinForms
+
+Q: Can you tell me why aren't you implementing WinForms?. 
+
+A: (This is based in an original mail to mono-list written by Miguel de
+   Icaza. You should read it for completion, but the core part is here).
+   
+   First, Windows.Forms is packed with quirks and is not that great of a 
+   toolkit in the first place. Up to the point of the unconfirmed rumor 
+   that Microsoft is working on a replacement for it. 
+
+   Once the runtime is done, we will very likely start contributing to
+   the Gtk# project ourselves, and we will likely start doing feasibility
+   work on getting Mono used by Gnome developers: full gnome apps and
+   extending existing applications.
+
+   Those interested in hacking on Windows.Forms are welcome to do so,
+   but Ximian will not likely look at it in the near future; if there is
+   enough demand, or I can be convinced that Windows.Forms is useful for
+   something Ximian might re-evaluate our resource allocation for this
+   task.
+
+   By doing native ports, we could use the same API on all those systems. 
+   Also, Gtk is mature enough, we know this because we have built an entire
+   desktop (and all sorts of very window system-specific hacks), and we
+   have built a bunch of productivity applications with it. 
+
+Q: What about VCL?.
+
+   Someone mentioned VCL. The only problem with the VCL is that it can
+   only be used for GPL applications (or I guess you could license it from
+   Borland for your app), and would have to be ported from Delphi to C# 
+   (or someone would have to write a CIL compiler for it).
+
+Q: What about doing something like the eclipse project (www.eclipse.org)? 
+
+A: The Eclipse toolkit is not a general purpose toolkit.  It will require a
+   lot of work before it is such a thing.  It is a toolkit used to
+   implement a development environment.
+
+
 <a name="msft"></a>
 ** Mono and Microsoft
 
@@ -335,6 +439,25 @@ A: No, it will not.  Microsoft Office is a Windows application.  To
    learn more about running Windows applications on Intel Unix systems
    refer to <a href="http://www.winehq.com">the Wine Project</a>.
 
+Q: Will I be able to compile a Microsoft VB.NET application and execute 
+   the resultant MSIL file under MONO on Linux without converting to C# 
+   and recompiling?
+
+A: Once we have a complete VisualBasic runtime, yes.
+
+Q: Can mono run the WebMatrix ?
+
+A: No. That requires winforms (we don't have).
+
+Q: Does mono have something like Passport ? (ie PassportIdentity class,somewhere
+   in System.Web ?) . Will mono have a server side Passport/Similar framework
+   for XSP as well as client classes ?
+
+A: Not yet, but the client side API for authentication is not the problem. 
+   We will likely have a lot of other authentication APIs, like the Liberty
+   Aliance APIs. The problem is people on the web provider end that might use 
+   this for authentication.
+
 <a name="pnpproject"></a>
 ** Mono and Portable.NET
 
@@ -342,8 +465,48 @@ Q: What are the differences between Mono and Portable.NET?
 
 A: Most of Mono is being written using C#, with only
    a few parts written in C (The JIT engine, the runtime, the
-   interfaces to the garbage collection system).  The Portable.NET
-   Project is using C for development.
+   interfaces to the garbage collection system).  
+
+   It is easier to describe what is unique about Mono:
+   <ul>
+     <li> A self-hosting C# compiler written in C#, which is clean, easy
+          to maintain.
+
+     <li> A multi-platform runtime engine: both a JIT engine and an
+          interpreter exist.  The JIT engine runs currently on x86
+          systems, while the interpreter works on Sparc, StrongARM and
+          PowerPC systems.  
+
+     <li> Supports Linux, Windows and Solaris at this point.
+
+     <li> The JIT engine is written using a portable instruction
+          selector which not only generates good code (we are told
+          that we are faster than Rotor, but it is hard to tell) but
+          is also the foundation to retarget the JIT engine to other
+          systems.  
+
+          The system employed is described in various compiler
+          books and it is very similar to what is described in the 
+          book that covers LCC, the Ansi C retargetable C compiler.
+
+     <li> The JIT engine supports inlining, constant folding and propagation,
+
+     <li> Full support for remoting in the runtime, but the class 
+          libraries are still behind.
+
+     <li> The C# compiler, the JIT engine and the class libraries are
+          mature enough that the whole system is self-hosting, ie, that
+          it can be fully developed with itself at this point.
+
+     <li> We are not yet done, and there is a lot of work left to be
+          done
+
+     <li> We have a great community of developers, without which Mono
+          would not be possible.
+
+     <li> We will provide an ahead of time compilation mode in the 
+          future.
+   </ul>
 
 <a name="webservices"></a>
 ** Web Services
@@ -392,6 +555,10 @@ Q: Can I serialize my objects to other things other than XML?
 A: Yes, although the serializing tools have not yet been planned, and
 you would probably have to implement them yourself.
 
+Q: Will Mono use ORBit?
+
+A: No. Mono will be using a new implementation of CORBA that isn't still started. 
+
 <a name="devel"></a>
 ** Development Tools and Issues
 
@@ -430,6 +597,172 @@ A: The CIL is better suited to be JITed than JVM byte codes, but you
    can interpret them as trivially as you can interpret JVM byte
    codes. 
 
+Q: Isn't it a little bit confusing to have the name of "XSP" (the same 
+   as in the Apache Project) for the ASP.NET support in Mono?.
+
+A: In Mono, xsp is just the name of the C# code generator for ASP.NET 
+   pages. In the Apache Project, it is a term for the "eXtensible Server 
+   Pages" technology so as they are very different things, they don't 
+   conflict.
+
+Q: What about using something like Jabber instead of the System.Messaging 
+   namespace?.
+
+A: In short, MSMQ is not something like Jabber, but asynchronous messaging 
+   through queues. Usefull queues do more than serialize messages, they are 
+   also platform bridges.
+
+Q: Are you supporting XMLDocument and relatives?.
+
+A: Currently, we aren't implementing them yet. It would require updates to 
+   most of the XmlNode derivatives so it's not a trivial task. We are 
+   currently focusing on getting XPath support working. 
+
+Q: Is there any plan to develop an aspx server for Mono?.
+
+A: The webserver turned out to be very simple compared to the rest of the 
+   work. Gonzalo has got the page generator mostly done (a module called 
+   xsp, who has nothing to do with the XSP term used in the Apache Project).
+   Patrik has done a lot of the work to get the ProcessRequest to work.
+   You can try to help in the final touches to the System.Web classes and
+   writing regression tests for the widgets we have.
+
+Q: Is there any way I can develop the class libraries using linux yet?
+
+A: Yes. Some class libraries can be developed on Linux. Search for
+   Paolo's post (he lists which classes can be compiled fine now).
+
+Q: Is there any way I can install a known working copy of mono in /usr, 
+   and an experimental copy somewhere else, and have both copies use 
+   their own libraries? (I'm still not very good at library paths in 
+   linux)
+
+A: Yes. Just use two installation prefixes.
+
+Q: How should I write tests or a tests suite?
+
+A: If you do a test suite for C#, you might want to keep it 
+   independent of the Mono C# compiler, so that other compiler 
+   implementations can later use it.  
+
+Q: Is the current stage the implementation of mono_create_trampoline
+   function?  Hence the sparc-codegen.h is reasonably complete? Is 
+   mono/arch/x86/* the best reference material for this stuff?
+
+A: sparc-codegen.h is basically complete. We may want to add some
+   convenience macros along the way, but it has all the stuff you need.
+   And yes, or, the ppc/ dir, since the ppc call convention is more similar 
+   to the sparc one than the x86 one. The current issues with the sparc 
+   code are. roughly:
+     1) it needs to handle overflowing the out registers (the additional
+     arguments need to be put on the stack)
+     2) it needs to flush the icache where the generated code is stored
+     3) it needs to implement mono_create_method_pointer to get delegates
+        working
+     4) it needs a couple of updates (mono_method_pointer_get is no longer
+     needed, for example)
+
+Q: Would it be too terrible to have another corlib signed as mscorlib? 
+
+A: We rename corlib to mscorlib also when saving the PE files, in fact, 
+   the runtime can execute program created by mono just fine.  
+
+Q: How do I build corlib under Linux?
+
+A: You can build your own (see the web site on how to get the mcs 
+   project from cvs), but in order to build them using mcs you need a 
+   set of working class libraries. After building the runtime (using
+   mono-build.sh) get them from the nightly build and put them (and
+   mcs.exe) in your mono/install/lib directory. Then you should be able 
+   to do: cd mcs, then: make -f makefile.gnu, then: cp mcs/mcs.exe 
+   class/lib/*.dll ../install/lib Also, you should know that you can 
+   either get your dose of DLLs from MonoCharge, or from 
+   http://primates.ximian.com/~miguel/runtime. MonoCharge is updated 
+   automatically, while the later is only updated when Miguel is around 
+   Once you have the DLLs, you can use `make -f makefile.gnu' as described
+   before to self-host.
+
+Q: Is there a relatively straightforward way to repeat the steps taken 
+   by Paolo to get Mono completely self-hosted on linux?
+
+A: To build the compiler and class libraries in Linux, run:
+   <ul><li>make -f makefile.gnu. To install them, run: </li>
+       <li>make -f makefile.gnu install</li>
+       <li>You can also specify a prefix:</li>
+       <li>make -f makefile.gnu install prefix=/opt</li>
+   </ul>
+   If you want to produce and distribute a monocharge tarball, run:
+   make -f makefile.gnu dist
+   Of course you have to run these in the top level mcs directory.
+
+Q: Is it possible to build a C# file to some sort of intermediate format which 
+   can linked into a final module, like the traditional .c -> .o -> .so path? 
+   
+A: You could do: mcs /target:module file1.cs, mcs /target:module file2.cs, 
+   mcs /target:exe file1.dll file2.dll /out:mybin.exe
+
+Q: Is there any plans for implementing remoting in the near future?, When will 
+   work in System.Runtime.Remoting.dll start?
+
+A: The remoting infrastructure is in place. Some of the channels and 
+   formatters are not.
+
+Q: I'm wondering if there are any plans to start using nant to build the
+   class lib + test lib. i think that every project neeed/should use an
+   automated build process and nant + a couple of tools enables this. is
+   the problem that the compiler can't run nant yet?
+
+A: Maybe well be doing some sort of automated build process + testing when
+   the summer finish.
+
+<a name="asp">
+** Mono and ASP.NET
+
+Q: Is Mono supporting ASP.NET?
+
+A: Yes. The development of the support for ASP.NET comes in various stages, 
+   here is what Gonzalo has been working on: 1. The Parser. 2. Getting the 
+   parser to generate output compatible with ASP.NET. 3. Running the sample 
+   output with the real Microsoft runtime but using our generated page. 4. 
+   Running the sample with our classes with the .NET runtime. 5. Running 
+   our sample code with our classes with our runtime. This is the process 
+   we are following. Currently Gonzalo has reached point 5.
+
+Q: Do I need install cygwin to work on ASP.NET in mono or Linux is enough since 
+   it is self host right now.
+
+A: Linux is enough.
+
+Q: Any plan to make ASP.NET in mono works with Apache in linux?.
+
+A: Yes, we have plans to do so, but we need to wait for Patrik's patches to
+   HttpRuntime. Once that is there, writing a mod_mono should be trivial 
+   (look at mono/samples/embed for a sample embedded application).
+
+<a name="ado">
+** Mono and ADO.NET
+
+Q: What is the status of ADO.NET support?. Could I start migrating 
+   applications from MS.NET to Mono?.
+
+A: You could start right now using the ADO.NET support in mono, of course,
+   if you want to help filling the missing gaps while you develop your app
+   :-) Well, what I mean is that we're not that far to having full ADO.NET
+   support in Mono, and we've got a lot of working things, so if we could
+   get more help, we'd finish it really soon :-)
+
+Q: In developing the data architecture for the application are there and
+   objects I should stay away from in order to insure the smoothest possible
+   transition (minimum code rewrite) to Mono's ADO.NET implementation?  (For
+   example, strongly typed datasets versus untyped datasets, etc...)
+
+A: we are implementing all the classes in Microsoft .NET's System.Data, so
+   you can be sure that things will work the same in Mono as with the MS's
+   implementation. We'll maybe provide extra classes to fix some things
+   we've found missing while developing ADO.NET in Mono, but if you keep
+   using the MS's System.Data classes, things will work out of the box with
+   no changes (or at least that's the plan :-)
+
 <a name="java">
 ** Mono and Java
    
@@ -481,6 +814,24 @@ A: Yes, it is possible.  Here are a few starting point:
           	  be translated into the equivalent "meaning" in CLR-land.
 	</ul>
 
+Q: Could mono become a hybrid cil/java platform?
+
+A: No. It is quite far from the philosophy of the project. The idea of Mono 
+   is, to have only _one_ VM, on which all can run. And if there existing a 
+   binary-converter from Java-.class to IL and if there existing something 
+   like J-Sharp on Mono, you can write programs in Java, which than can run 
+   on Mono. You do not need two bindings (like your example: GTK-Sharp _and_ 
+   Java-Gnome). You need only _one_ of it (GTK-Sharp). Thats the idea of Mono.
+   An other point is, that there are no people, who use OpenSource-JVMs. They 
+   all prefer Suns original. But for Unix there don't exist a .NET-Framework. 
+   So it is possible, that in the future Mono is the standard .NET for unixes.
+
+Q: Do you plan to implement a Javascript compiler?
+
+A: Yes. Eto Demerzal has started a Rhino port to C#.
+   After this is completed, we will begin developing
+   the Javascript compiler.
+
 <a name="extending"></a>
 ** Extending Mono
 
@@ -508,7 +859,20 @@ A: Embracing a good technology is good.  Extending technologies in
 
    If you have innovative ideas, and want to create new classes, we 
    encourage you to make those classes operate correctly well in both
-   Mono and .NET
+   Mono and .NET.
+
+Q: Is there any way I can develop the class libraries using linux yet?
+
+A: Yes. Some class libraries can be developed on Linux. Search for
+   Paolo's post (he lists which classes can be compiled fine now).
+
+Q: Is there any way I can install a known working copy of mono in /usr, 
+   and an experimental copy somewhere else, and have both copies use 
+   their own libraries? (I'm still not very good at library paths in 
+   linux)
+
+A: Yes. Just use two installation prefixes.
+
 
 <a name="portability"></a>
 ** Portability
@@ -519,7 +883,7 @@ A: Currently, we are doing our work on Linux-based systems and
    Windows.  We do not expect many Linux-isms in the code, so it
    should be easy to port Mono to other UNIX variants.   
 
-Q: What about Mono on non X-based systems?
+Q: What about Mono on non Linux-based systems?
 
 A: Our main intention at Ximian is to be able to develop GNOME
    applications with Mono, but if you are interested in providing a
@@ -527,11 +891,27 @@ A: Our main intention at Ximian is to be able to develop GNOME
    MacOS X for example), we would gladly integrate them, as long
    they are under an open source license.  
 
-Q: Will Mono run on Windows?
+Q: What operating systems/CPUs do you support
+
+A: Mono currently runs on Linux, Windows, Solaris and FreeBSD.
+   There is a JIT engine available for x86 processors that can
+   generate code and optimizations tailored for a particular CPU.
+
+   Interpreters exist for the SPARC, PowerPC and StrongARM cpus.
+
+Q: Does Mono run on Windows?
+
+A: Yes.   The Compiler and the runtime both run on Windows.
+
+Q: When will mono and mcs compile on Linux?.
+
+A: That happend a long time ago. Know you can download and compile 
+   them or even install them from already made binary packages for 
+   Windows and for Linux (RPM/DEB).
+
+Q: Will I require Cygwin to run mono?
 
-A: We hope so.  Currently some parts of Mono only run on Windows
-   (the C# compiler is a .NET executable) and other parts have only
-   been compiled on Linux, but work on Windows with Cygwin.
+A: No.  While you'll need it to compile it, it runs without cygwin and does not even require cygwin1.dll
 
 Q: Will Mono depend on GNOME?
 
@@ -540,6 +920,28 @@ A: It will depend only if you are using a particular assembly (for
    in Mono for implementing a `Hello World Enterprise P2P Web
    Service', you will not need any GNOME components.
 
+Q: Is anyone working on porting Mono to IA-64?
+
+A: Nobody is working on such port.
+
+Q: If I were about to start a Mono port to IA-64,would the same lburg code 
+   generator work for IA-64 also? or anything else need to be used for code 
+   generation(as the processor architecture is totally different from IA32)
+
+A: The lburg approach can be use for any processor architecture. But you might
+   think in another better approach.
+
+Q: Do you plan to port Rhino to C#?.
+
+A: Eto Demerzal has started a Rhino port to C#.
+
+Q: Has anyone succeeded in building a Mac version of the C# environment. 
+   If so can you explain how?  
+
+A: You could try to check with the Darwin people, or the Fink people.
+   Mono/C# is self hosting on Linux/PPC which is the hard part, so it
+   should be relatively simple to get it to work on macos
+
 <a name="reuse"></a>
 ** Reusing Existing Code
 
@@ -555,11 +957,53 @@ A: At this time, we are investigating whether we can use elements of
    defined API that splits the JIT from the GC system and the actual
    byte code implementation.
 
+   We are using some pieces of ORP (Their code generation interface)
+   and we use it as a source of inspiration for optimizations.  Paolo
+   and Dietmar consider ORP as being one of the best JIT engines out
+   there (and their research work and papers are very useful if you are
+   interested in JIT technology).
+
 Q: What about using GNU Lightning?
 
-A: We are also researching <a
-   href="http://www.gnu.org/software/lightning/lightning.html">GNU
-   Lightning</a>.
+A: We are not using GNU Lightning.  Our JIT is using an instruction
+   selector based on tree-pattern matching, and a code generation
+   interface that is very tied to the current architecture.
+
+Q: Will I be able to use Microsoft SQL Server 2000 or will I need to switch
+   to a specific Open Source Database. Will I need to recode?
+
+A: There should not be any need to recode.
+
+Q: What do I need to watch out for when programming in VB.NET so that I'm
+   sure to be able to run those apps on Linux?
+
+A: Not making any PInvoke or DLL calls should and not using anything in
+   the Microsoft.* namespaces should suffice. Also do not use any 
+   Methods/Classes marked as "This type/method supports the .NET Framework 
+   infrastructure and is not intended to be used directly from your code." 
+   even if you know what these classes/methods do.
+
+Q: Will built-in reporting be supported for crystal reports? This is a
+   heavily used part of our system.
+
+A: Probably not. Crystal Reports are propriety. Someone may try to emulate
+   the behaviour, but no-one has yet volunteered.
+
+Q: Who about writing to the registry? As I understand it, Linux does not have
+   a counterpart to the registry. Should I avoid relying on that feature?
+
+A: Try to avoid it. Although there would be a emulation for registry in
+   Mono too. GNOME does have a registry like mechanism for configuration. But
+   Even if gnome has a configuration system similar to the registry, the keys 
+   will not be equal, so you will probably end up having to do some runtime 
+   detection, and depending on this load an assembly that has your 
+   platform-specific hacks.
+
+Q: System.Data.SqlClient with FreeTDS, will you port parts of these to C# and 
+   use them?
+
+A: if their license is compatible with mono's, yes, we'd think about porting 
+   them. If not, we'll continue with the plan of using FreeTDS.
 
 <a name="gcc"></a>
 ** Mono and GCC
@@ -637,7 +1081,33 @@ A: We will have to evaluate the licenses for compatibility first,
    but as a general rule, we will accept the code under the same
    terms of the "container" module. 
 
-<a name="etc"></a>
+<a name="patents"></a>
+** Patents
+
+Q: Could patents be used to completely disable Mono (either submarine
+   patents filed now, or changes made by Microsoft specifically to
+   create patent problems)?
+
+A: No.  First, its basic functional capabilities have pre-existed too
+   long to be held up by patents.  The basic components of Mono are
+   technologically equivalent to Sun's Java technology, which has been
+   around for years.  Mono will also implement multi-language and
+   multi-architecture support, but there are previous technologies
+   such as UCSD p-code and ANDF that also support multiple languages
+   using a common intermediate language.  The libraries are similar
+   to other language's libraries, so again, they're too similar to
+   be patentable in large measure.
+
+   However, if Microsoft does patent some technology, then our plan is
+   to either (1) work around it, (2) chop out patented pieces, (3) 
+   find prior art that would render the patent useless.
+ 
+   Not providing a patented capability would weaken the
+   interoperability, but it would still provide the free software /
+   open source software community with good development tools, which
+   is the primary reason for developing Mono.  
+
+<a name="etc"></a> 
 ** Miscellaneous Questions
 
 Q: You say that the CLI allows multiple languages to execute on the
@@ -661,3 +1131,54 @@ Q: Will you support COM?
 A: The runtime will support XPCOM on Unix systems and COM on Windows.
    Most of the code for dynamic trampolines exists already.
 
+Q: Will Ximian offer certifications on Mono or related technologies?. 
+
+A: It's possible. But there is no plan about this. So the short answer is no.
+
+Q: Are there any Boehm's gc binaries?
+
+A: Yes. You can find RPMs <a href="http://java.thn.htu.se/~toor/">here</a>, though
+   if your distribution provides the correct packages, you should use those.
+   The suggested version of the Boehm GC is 6.1.
+
+Q: How can I report a bug?
+
+A: The best thing is to track down the bug and provide a simple test to
+   reproduce the bug. You can then add the bug to 
+   <a href="http://bugzilla.ximian.com/enter_bug.cgi">bugzilla</a> or 
+   simply send it to mono-list@ximian.com. Please provide info about
+   what version of mono you're using and any relevant details to be 
+   able to repoduce the bug. Note that bugs reported on the mailing-list 
+   may be easily forgotten, so it's better to file them in bugzilla.
+
+Q: Does mcs support the same command line options as the MS C# 
+   compiler?
+
+A: The Mono C# compiler now supports the same command line
+   arguments as the Microsoft C# compiler does.
+
+Q: How about getting searchable archives on lists.ximian.com? 
+
+A: You can perform a search on the mono-related mailing lists 
+   <a href="http://www.go-mono.com/mailing-lists.html">here</a>.
+
+Q: When using mono from cvs or from a snapshot, I get an error messaage
+   saying that Mono and the runtime are out of sync. How do I fix that?
+
+A: If you use mono from cvs, you need to be prepared for changes in the
+   runtime internals. This means that you should keep a working setup 
+   before blindling updating (a working setup may just be the last released
+   tarball or a recent binary snapshot).
+   Usually, compiling corlib with mcs before recompiling the C runtime does
+   the right thing (but occasionally you may need to do it the other 
+   way around).
+
+
+
+<a name="problems"></a>
+** Mono Common Problems
+
+   If you are having problems compiling or running Mono software
+   or if you think that you found a bug, etc. Please visit the
+   <a href="http://geneura.ugr.es/~jaime/deploy/mono-common-problems.html">Mono Common Problems</a> document and try there. 
+
diff --git a/web/hackers b/web/hackers
new file mode 100644
index 00000000000..cde738b9f86
--- /dev/null
+++ b/web/hackers
@@ -0,0 +1,23 @@
+* Mono Hackers Hall Of Fame
+
+Without the help, the skills and the time of many passionate developers outside of 
+the Ximian Mono team, Mono would not be where it is today.
+
+Many of them do it for fun, some do it because they really want a nice CLR they 
+can hack on, some do it because they need a working solution to some development 
+issues and mono is the ideal tool for the job. 
+
+Some of them may start contributing because they want a mention in the
+<b>Mono Hackers Hall Of Fame</b>! Whatever the cause, join us in a big<br>
+<h1 align="center">Thank you!</h1>
+
+* Mono Hackers
+
+** Nick Drochak
+
+The first, deserved, entry in the <b>Mono Hackers Hall Of Fame</b> is for
+Nick Drochak, who joined us in the first days of Mono and built the testing 
+infrastructure for the C# assemblies, fixed tons of bugs and even adventured 
+himself in the lands of the C runtime. His work is invaluable for keeping
+Mono on the right track through the daily changes in the codebase.
+
diff --git a/web/index b/web/index
index e4e6866b4a0..8d20cee12f2 100644
--- a/web/index
+++ b/web/index
@@ -1,14 +1,16 @@
+<link rel="alternate" type="application/rss+xml" title="RSS" href="index.rss"/>
+
 <table>
   <tr>
     <td>
 	<a href="http://www.ximian.com">Ximian</a> announced the
-	launch of the Mono project, an effort to create an Open Source
-	implementation of the .NET Development Framework.  
+	launch of the Mono project, an effort to create an open source
+	implementation of the .NET Development Framework.
 
 	Mono includes: <a href="c-sharp.html">a compiler</a> for the
 	C# language, a <a href="runtime.html">runtime</a> for the
-	Common Language Infrastructure and a set of <a
-	href="class-library.html">class libraries</a>.  
+	Common Language Infrastructure (also refered as the CLR) and a
+	set of <a href="class-library.html">class libraries</a>.  
 
 	You can read our <a href="rationale.html">rationale</a> for
 	this project.  If you have questions about the project, please
@@ -16,8 +18,10 @@
 	Questions</a> or <a href="mailto:mono-list@ximian.com">contact us.</a>
 
 	You might also want to <a href="download.html">Download the
-	source</a> for our work so far.  Or you can grab a <a
-	href="snapshots">snapshot</a> of our current work. 
+	source</a> for our work so far.  Grab a <a
+	href="snapshots">snapshot</a> of our current work, or <a
+	href="http://cvs.hispalinux.es/cgi-bin/cvsweb/?hidenonreadable=1&f=u&logsort=date&sortby=file&hideattic=1&cvsroot=Mono">browse
+	the sources</a>
 
 	You might want to <a
 	href="mailing-lists.html">subscribe</a> to our mono-list
@@ -27,17 +31,18 @@
 	href="mailto:mono-list@ximian.com">mono-list@ximian.com</a>
     </td>
     <td>
-	<table border=1 bgcolor>
-	  <tr>
-	  </tr>
+	<table border=1>
 	  <tr>
 	    <td>
-	      <b><a href="c-sharp.html">Compiler</a></b>
+	      <b><center>Mono Status</center></b>
 	    </td>
 	    <td>
-	      Self hosting on .NET.<br>
-	      Classes need work to run on Mono.
+	      <b><a href="c-sharp.html">C# Compiler</a></b>
 	    </td>
+	    <td>
+	      <b>Self hosting on Linux</b><br>
+	      Self hosting on .NET.
+            </td>
 	  </tr>
 	  <tr>
 	    <td>
@@ -52,8 +57,10 @@
 	      <b>Interpreter</b>
 	    </td>
 	    <td>
-	      Linux/PPC working<br>
-	      In progress: StrongARM, SPARC.
+	      Working:<br>
+	      Linux/x86, Linux/PPC<br>
+	      In progress:<br>
+	      StrongARM, SPARC.
 	    </td>
 	  </tr>
 	  <tr>
@@ -61,7 +68,15 @@
 	      <b><a href="class-status.html">Classes</a></b>
 	    </td>
 	    <td>
-	      Corlib for self hosting mostly done
+	      Corlib is self hosting.
+	    </td>
+	  </tr>
+	  <tr>
+	    <td>
+	      RSS feed:
+	    </td>
+	    <td>
+	      <a href="index.rss"><img src="images/xml.gif"></a>
 	    </td>
 	  </tr>
 	</table>
@@ -69,7 +84,852 @@
   </tr>
 </table>
 
-** Feb 26, 2002
+@item Aug 21th, 2002: Portable.NET encodings integrated into Mono.
+
+	Rhys Weatherley has contributed the Portable.NET encoders to
+	the Mono class libraries.  This is a great step towards
+	cooperation between these projects.  Thanks to Paolo for doing the
+	merger on our side.
+
+	His encoders are more complete than the iconv-based approach
+	that mono used, which was unreliable under certain
+	circumstances.  
+
+@item Aug 20th, 2002: Remoting work, Resources, SPARC checkins, ADO.NET
+
+	Mark Crichton has checked in his patches to get the SPARC port
+	on par with the PPC port.
+
+	Dick has checked-in the resource reader and resource writers
+	to the class libraries, and Dietmar checked in the C# support
+	code for the remoting infrastructure.  
+
+	More work on System.Data: the LibGDA (our OleDB backend) based
+	providers are quickly maturing, and recently they executed
+	their first query.
+
+@item Aug 13th, 2002: MCS news, Gtk# progress, Windows.Forms, ADO.NET
+
+	Martin Baulig has been fixing all the known bugs in the C#
+	compiler and now has moved into improving the compilation
+	speed and the generated code quality of MCS.  Today we got a
+	50% speedup in the bootstrap of MCS going from 24 seconds to 12 seconds. 
+
+	Gtk# has been making a lot of progress, some interesting
+	corner cases are now supported:, you can now create canvas items as
+	well as using the tree widget.  Here is a shot of <a
+	href="images/mocil.png">MonoCIL</a>.
+
+	On the runtime front, focus has been on improving remoting
+	support, exception handling, as well as completing the support
+	for structure marshaling.  
+
+	Patrik is also back in action: the HttpRuntime infrastructure
+	is rapidly improving, and Gonzalo is working into moving XSP
+	into our main class library and providing the missing pieces
+	to integrate with Patrik's code.
+
+	Dennis and his team are working on a WineLib-based
+	implementation of Windows Forms to guarantee that the corner
+	cases of Windows.Forms can be handled, and we are back on track again.
+
+	A lot more work on the ADO.NET and WebServices has also been
+	checked into CVS.
+
+@item Aug 1st, 2002: Mono Hackers Hall of Fame
+
+	The <a href="hackers.html">Mono Hackers Hall Of Fame</a> has been started
+	to show our appreciation to the excellent contributors that made <b>mono::</b>
+	a successful free software project.
+
+	The first, deserved, entry goes to
+	Nick Drochak, who joined us in the first days of Mono and built the testing 
+	infrastructure for the C# assemblies, fixed tons of bugs and even adventured 
+	himself in the lands of the C runtime. His work is invaluable for keeping
+	Mono on the right track through the daily changes in the codebase.
+
+@item Looking for volunteers
+
+	We are looking for volunteers to help complete various pieces
+	of Mono and help move the project forward, we need
+	contributions to:
+
+	<ul>
+		* More tests to the existing class libraries.
+	
+		* Finish existing class libraries, check our <a
+		href="class-status.html">class status</a> pages to see
+		all the missing things.  There are open tasks all over
+		the place: XML, Database access, enterprise services,
+		configuration, ASP.NET, Drawing APIs, and more.
+
+		* Since we have now ASP.NET running, we would like to 
+		create an ASP.NET application to maintain our class
+		library documentation.
+
+		We have some special needs (read them <a
+	 	href="classlib-doc.html">here</a>).     There is a
+		prototype written using Windows.Forms, but we believe
+		it will be faster to have this done using ASP.NET (and
+		it is also a nice way of stress testing it).
+
+		* Support for the VB runtime: we need contributions
+		to make our VB runtime mature enough to host
+		applications compiled with the VB.NET to run with
+		Mono.
+
+		* We need people to help write the documentation: you
+		can start editing our XML files by hand, and once we
+		have the ASP.NET tool, upgrade to that. 
+	</ul> 
+
+@item July 31st, 2002: Flow Analysis
+
+	Martin has checked into CVS the data flow analysis patch for
+	MCS, this means that we now correctly implement definite
+	assignment in the C# language.
+
+@item Jul 31st, 2002: Most ASP.NET controls render, Gtk# structs.
+
+	Gonzalo <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-August/001234.html">posted
+	an update</a> on the ASP.NET widgets that are still pending.  Patrik is back, and he is 
+	working with Gonzalo to streamline the pipeline
+
+	Rachel quietly commited to Gtk-Sharp support for marshaling
+	structures (very important for Gtk#).  This uses extensively
+	the new marshaling code that Dietmar added to the runtime.
+
+	Dietmar is also now sharing more code for P/Invoke using his
+	intermediate representation.  Another step to share more code, and 
+	simplify the porting and maintenance process. 
+
+@item Jul 27th, 2002: NGEN tool for Mono.
+
+	Zoltan <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-July/001117.html">announced</a>
+	the availability of his CIL to C compiler.  This allows your Mono assemblies to be pre-compiled
+	and optimized by GCC in your platform, increasing the speed significantly of your code. 
+
+@item Jul 26th, 2002: Mono 0.13 has been released.
+
+	<b>Mono 0.13 has been released!</b> (details <a
+	href="archive/mono-0.13">here</a>).  Get
+	your sources for the <a
+	href="archive/mono-0.13.tar.gz">runtime</a> and
+	<a href="archive/mcs-0.13.tar.gz">compiler and class libraries</a>.
+	<p>
+	Alp made Debian packages and they are <a
+	href="http://www.atoker.com/mono/">here</a>.  Cristophe made
+	packages for Red Hat and they are <a
+	href="http://mono.baselabs.org/software">here</a>.
+	And Windows packages have been <a href="http://www.superin.formativ.net/mono/mono.htm">contributed</a>
+
+@item Jul 23rd, 2002: Mono Verifier, System.Web.Services, ASP.NET samples.
+
+	Mono now has a verifier.  It is used by the runtime, or you can invoke it manually to 
+	verify an image by using the `pedump' tool.
+
+	Tim Coleman has started work on the System.Web.Services
+	assembly (you can also track the status here on the web page).
+	Contact him if you want to help in this assembly or with the
+	associated web service tools.  
+
+	Various samples for ASP.NET have landed in CVS. 
+
+@item Jul 20th, 2002: Spanish Mono Tutorial.
+
+	A spanish tutorial on using Mono is <a
+	href="http://mono.es.gnome.org/tutoriales/mono-linux/">here</a>.
+	Also the <a
+	href="http://mono.es.gnome.org/tutoriales/mono-puf/">FAQ</a>
+	has been translated as well.
+
+@item Jul 19th, 2002: File handle redirection, Embeddable Mono and Mono Linux compilation.
+
+	Dick's code for file handle redirection is complete and has
+	now landed on the CVS repository.
+
+	The Mono runtime can now be embedded into your application
+	(also known as "CLR hosting").  See the sample in
+	mono/samples/embed.  This allows your application to link with
+	the Mono runtime, then your C code can call into the C#/CIL
+	universe and back.
+
+	Peter Williams and Martin contributed some Makefiles to
+	compile all of Mono on Linux.  Details are <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-July/000916.html">here</a>.
+
+@item Jul 17th, 2002
+
+	The first documentary on Ximian's development team is now
+	available online, from young director <a
+	href="mailto:erik.pukinskis@uconn.edu">Erik Pukinskis</a>: <a
+	href="http://www.ximian.com/devzone/projects/codemonkey.html">"Code
+	Monkey At Work"</a>.
+
+	A Tutorial on getting Mono installed from sources is now <a
+	href="http://www.go-mono.com/mono-beginning/x70.html">online</a>.
+
+	More progress on the ASP.NET front: user defined controls are
+	now being rendered, as well as many of the sample programs
+	from www.asp.net.  Gonzalo's work can be found on module XSP
+	(this implements the .aspx compiler).
+
+	Sergey Chaban has got Gtk# working on Windows, you can see
+	some screenshots: <a href="sshots/Gtksharp-1.jpg">sample apps</a> and
+	<a href="sshots/Gtksharp-2.jpg">running with a russian charset</a>.
+
+@item Jul 16th, 2002
+
+	Paolo today got mono to complete host itself on Linux.  This
+	means that we can now compile the `corlib' using the Mono C#
+	compiler and the Mono runtime.
+
+	Compiling the corlib was rather tricky, because the types that
+	the compiler uses during the compilation process will come
+	from the source code it is compiling.  
+
+	After a few months of work, we have finally fleshed out all
+	the remaining bugs.  Now the next step is to update the makefiles
+	to compile with the Mono tool-chain.
+
+	A recapitulation:
+	<ul>
+		* The Mono C# compiler was able to compile itself on December 28th, 2001.
+		  The resulting image contained errors though.
+
+		* The Mono C# compiler was able to self-compile in on
+		  January 3rd, 2002.  Becoming a self-hosting compiler on Windows.
+
+		* The Mono runtime matured enough by March 12, 2002 that it
+		  was able to bootstrap the Mono C# compiler on Linux using our interpreter.
+		  This means that our development tool was self sufficient.
+
+		* On March 26th, the JIT engine was fixed, so we could use this to
+		  run the compiler on Linux.
+
+		* Martin fixed the remaining bugs in the compiler that stopped it from
+	 	  compiling the `corlib'.  The resuling image still contained errors though.
+
+		* On July 8th, Radek got the PowerPC port to bootstrap
+		  the C# compiler.  This is important, because it exposed
+	  	  various tricky issues in a big-endian system.
+
+		* Today: we can bootstrap the compiler using libraries
+		  and the compiler compiled with itself on Linux.  The process is complete.
+	</ul>
+
+	In the meantime, Dietmar has quietly implemented the remaining
+	pieces of Marshalling in the Mono runtime.   This is very
+	important for the Gtk# guys to move on with their bindings.
+
+	To make things more interesting, he replaced most of the
+	architecture specific code generation for trampolines
+	(delegates, invocations, function and p/invoke trampolines) to
+	use CIL.  This CIL is then compiled on the flight by the JIT
+	Compiler engine.  By doing this, we have reduced the burden to
+	port the JITer to new architectures, and that our trampoline
+	code is cross platform.
+
+@item Jul 9th, 2002
+
+	Ajay was the first to notice <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-July/000641.html">
+	Mono's first birthday</a>.
+
+	In a year, we have achieved plenty:
+	<ul>
+		* 94 contributors with CVS access (84 non-Ximian developers).
+		* A complete CLI implementation:
+		<ul>
+			<li> A fast and performing x86 JIT engine (inlining, constant propagation).
+			<li> An interpreter for other systems (PPC, Sparc, StrongArm).
+		</ul>
+		* A self-hosting C# compiler, which can compile its class libraries.
+		* 37,140 file changes in CVS.
+		* 92,000 lines of C code.
+		* 437,000 lines of C# code (compiler, classes, tests)
+		* A working core for ASP.NET and ADO.NET.
+		* Major subsystems are functional: RegularExpressions,
+		  System.XML, XML.Schema, System.Data, System.Web.
+		* The Gtk# project, which is maturing rapidly.
+	</ul>
+
+	Thanks to everyone who has made Mono possible with their
+	feedback, regression tests, their comments, their help on the mailing
+	list, code contributions, complete classes, bug reporting, the
+	countless hours of bug hunting.  This project would not have
+	been possible without every contribution.  
+
+	It has been a great year for everyone involved in the
+	project.  I think we have built a new and exciting community.
+
+	Now we have a solid foundation to build on, so this next year
+	looks even more exciting: not only because we will see more
+	Mono applications, but we will begin using Mono as an
+	`library' to be linked with applications that want to get
+	scripting-like features; Gtk# is our ticket to create nice
+	GNOME applications; And we will be developing CORBA bindings
+	to integrate with other object systems.
+
+	Also, for those interested in optimizations and tuning, this
+	year we will get to play with more advanced optimizations and
+	all kinds of interesting research ideas for improving Mono
+	code generation.
+
+	A special thanks to the Mono developers at Ximian for managing
+	to survive their manager and a special thanks to our
+	regression test marshal Nick Drochak, who has been hunting
+	down, and fixing code in our class libraries and keeping us on
+	track for so long.
+
+@item Jul 8th, 2002
+
+	Radek today fixed the last bugs to get Mono to self host on
+	Linux/PowerPC.
+
+	Alp Toker has released version 0.5 of <a
+	href="http://www.atoker.com/phonic/">Phonic</a>, a media
+	player for .NET. Phonic makes extensive use of Mono-developed
+	technologies such as Gtk# and csvorbis (Ogg player ported by
+	Mark). Hopefully we will be seeing many more exciting
+	applications like these in the near future.
+
+	Dietmar has been moving a lot of the architecture specific
+	code in the JIT engine to our internal representation.  This
+	means that porting the JIT is simpler now, as there is less
+	architecture-specific code to maintain.  The inliner, constant
+	folder and constant propagation are also done at the
+	architecture independent layer.
+
+	Gonzalo is now running the sample ASP.NET applications on
+	Linux with the Mono runtime.  It still needs polishing though,
+	and help with the various ASP.NET controls would be
+	appreciated.  The ASP.NET community seems more poor than the
+	PHP community, we need to have a few open source controls to
+	do things dynamic rendering (libart+gdk-pixbuf again can do
+	most of the work), charts and components like the kind of
+	thing you see in the PHP universe: to bring nice GPL code to
+	the masses of Windows developers, lure them into the world of
+	Linux.
+
+	Dick has also got us the new Process implementation that
+	implements the Win32 semantics.  Now only redirection is
+	missing.
+
+@item Jul 3rd, 2002
+
+	Listen to Paolo Molaro do a talk on Mono at the WebIT
+	conference in Padova, Italy this coming friday.  Details are
+	<a href="http://www.webbit2001.org/event/eventview/534/">here</a>
+
+	You can also see a trip report from the Gnome in the South trip:
+	<a href="http://primates.ximian.com/~miguel/sur.html">here</a>
+
+	Miguel will be doing a couple of talks at the O'Reilly
+	conference about Mono: status update, progress and developing
+	applications with it.  Details are <a
+	href="http://conferences.oreillynet.com/cs/os2002/view/e_sess/2994">here</a>
+	and <a
+	href="http://conferences.oreillynet.com/cs/os2002/view/e_sess/2996">here</a>
+
+@item Jun 30, 2002
+
+	Martin Baulig fixed the remaining bugs that prevented MCS to
+	compile our corlib.  The compilation was tricky because of the way
+	MCS bootstraps the compile (internally mcs uses the types that are
+	being defined at that point to perform compares).
+
+	Martin and Paolo have been working hard on fixing the
+	remaining issues.  Currently 102 test pass and 15 fail with
+	our resulting corlib.
+
+	Jesus' SoapFormatter classes are now in CVS.
+
+	I have been redoing the type lookup system for MCS.  The
+	interesting bit is that I did most of this work on an airplane
+	using MCS itself.  Which is a good test that the compiler is 
+	now a good development tool.
+
+	Duncan, Mike and Rachel have been hard at work with Gtk#, now
+	there are bindings for the GtkHTML widget (the one used by
+	Evolution's composer).  And Rachel also got the beginning of GNOME
+	bindings, that should simplify application development.
+
+	A big thanks goes to Dennis Hayes for getting the
+	Windows.Forms work together, and commiting so many stubs for Windows.Forms. 
+
+@item Jun 25, 2002
+
+	I am updating the Mono site from the Unesco offices in
+	Uruguay, the <a href="http://www.gnome.org/resources/calendar/roadshow/GNOMEenelSur.html">South-America trip</a>
+	to promote free software is going very well.
+
+	Many news in Mono-land this week so far:
+
+	Mike Kestner got bindings for GtkHTML last night for Gtk#,
+	this is using GtkHTML 2.0.  
+
+	On Monday Piers Haken <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-June/000380.html">contributed</a>
+	the core to support XPath in Mono: most of the w3c spec is
+	implemented (modulo a few pending bits).
+
+	Dick checked in his implementation of the Process classes:
+	process forking and waiting support committed, with some functions to
+	query status.  This was complex as we had to emulate the Win32
+	environment, but this is another step to be fully compatible.
+	This means for example that any process can check on the
+	status of any other process (without the parent/child relationship)
+
+	Of course, those interested
+	in only the Unix semantics can always P/Invoke the Unix calls.
+
+@item Jun 24, 2002
+
+
+        Duncan has written a few sample <a
+	href="http://primates.ximian.com/~duncan/Mono">Gtk# demo
+	applications</a> (<a
+	href="http://primates.ximian.com/~duncan/Mono/img/ImageViewer.png">screen
+	shot</a>, <a
+	href="http://primates.ximian.com/~duncan/Mono/img/ImageBrowser.png">another</a>)
+
+	Rachel also got the beginning of Gnome bindings (<a
+	href="http://primates.ximian.com/~tvgm/gnome-hello.png">screenshot</a>).
+	She also got some <a
+	href="http://primates.ximian.com/~tvgm/gtk-sharp-docs/">documentation</a>
+	up now.
+
+@item Jun 22, 2002
+
+	Mono's ASP.NET has rendered its first page on Linxu for the
+	first time (Gonzalo and Paolo).  
+
+	Also, we are getting close to
+	self hosting.  Paolo posted a <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-June/000345.html">list
+	of pending issues</a> which are now very small.
+
+	Steam is picking up in <a
+	href="http://gtk-sharp.sf.net">Gtk#</a> as the bindings become more
+	complete and small applications are starting to emerge.  Gtk#
+	now compiles completely on Linux.  This uses a lot of the XML
+	libraries, which is nice to see.
+
+@item Jun 20, 2002
+
+	Gonzalo has got the Mono ASP.NET implementation can now render all Html
+	Controls, and 21 out of the 26 Web Controls.  Session tracking is
+	next.  Look in xsp/test for a collection of tests that render with Mono.
+
+	Ajay has been very busy improving and extending the
+	XmlSerialization code.  All fields had to be re-ordered to
+	match the Microsoft implementation.
+
+@item Jun 19, 2002
+
+	You can now download a fresh tarball of the libraries and the MCS 
+	compiler daily from <a href="http://www.atoker.com/mono/">Alp Toker's
+	website</a>.
+      
+	New libgc RPMS for Redhat 7.3 are available on <a href="
+	http://java.thn.htu.se/~toor/">Richard Torkar's site</a>.
+
+@item Jun 10, 2002
+
+	Ajay <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-June/000128.html">announced</a>
+	today that the reading code for XmlSchemas is almost complete.
+
+@item Jun 7, 2002
+
+	<b>Mono 0.12 is out!</b> More classes!  More working code!
+	Better compiler!  Faster runtime!  Less bugs! 
+
+	You can get it <a
+	href="download.html#jun-7">Here</a> (quick links: <a
+	href="archive/mono-0.12.tar.gz">runtime</a> and <a
+	href="archive/mcs-0.12.tar.gz">compiler/classes</a>).
+
+@item Jun 3rd, 2002
+
+	CodeDOM implementation from Daniel Stodden has got C# output support.
+
+@item May 31, 2002
+
+	Gonzalo got the Mono XSP page parser to render its first ASP.NET
+	.aspx file today without using MS System.Web.Hosting classes.
+	It is currently on its infancy.  But very good news, now we need to 
+	upgrade our System.Web runtime to run natively on Linux.
+
+	Sergey's code for architecture and size-specific CPBLK has
+	been checked into CVS.
+
+	Paolo has checked the configuration code for Mono (to map
+	PInvoke dlls to other libraries).
+
+	<a href="ado-net.html">ADO support</a>: Daniel has checked in
+	a modified version of the MySQL data provider from Brad.  And Rodrigo
+	started the OleDB using LibGDA.
+
+@item May 27, 2002
+
+	An <a href="index.rss">RSS feed</a> is now available for the
+	Mono news.  I find it surprising that there are so many tools
+	that process this data.  
+
+	Binaries for <a href="http://www.superin.formativ.net/mono/mono.htm">Windows</a> are
+	now location independent, do not require Cygwin and come with a Wizard.
+
+@item May 26, 2002
+
+	Daniel Morgan checked in his Sql# Cli tool into the
+	System.Data class library.
+
+@item May 24, 2002
+
+	Ajay <a
+	href="http://lists.ximian.com/archives/public/mono-patches/2002-May/003953.html">has
+	checked in</a> a major update to the System.Xml.Schema namespace.
+
+	Gonzalo moved XSP along this week: Added support for
+	templates, columns inside DataGrid, HTML comments, code render
+	and data binding tags, style properties in style tags,
+	ListItem inside list controls, float and double properties.
+
+@item May 22, 2002
+
+	<a href="http://monologo.sourceforge.net/">MonoLogo</a> runs
+	on the Mono runtime.  This <a
+	href="http://monologo.sourceforge.net/gtk.png">screenshot</a> shows
+	MonoLogo running Gtk#.
+
+@item May 21, 2002
+
+	Martin has improved the debugging infrastructure in Mono, now
+	it is possible to get <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-May/005717.html">line
+	number</a> information on stack traces.
+
+@item May 20, 2002
+
+	XSP <a href="asp-net">our ASP.NET</a> .aspx page parser is now
+	available on the AnonCVS servers.  This is part of the ASP.NET
+	support in Mono.  Gonzalo is the developer on charge of it.
+
+	Many updates to the <a href="ado-net.html">ADO.NET
+	implementation</a> from Dan, Tim and Rodrigo.  
+
+	Radek got the Mono C# compiler running on Linux/PPC and
+	compiling most of our regression test suite.
+
+	Lawrence has been working really hard in fixing, improving and
+	polishing the underlying network infrastructure.
+
+	The Rafael and Chris have commited the beginning of the
+	VisualBasic.NET runtime support to CVS.
+
+	Jesus has contributed the beginning of the SoapFormatter
+
+@item May 9, 2002
+
+	Linear register allocator has been deployed in the Mono JIT
+	engine.  Read <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-May/005489.html">about
+	it</a>
+
+@item May 5, 2002
+
+	We are able to retrieve simple data from the database 
+	using our ADO.NET like functionality.  Only string and integer data
+	types are supported right now but more are in the works.
+	
+	You can find more information 
+	at <a href="http://www.go-mono.com/ado-net.html">The Mono ADO-NET Page</a>
+	
+	Thanks goes to Chris, Daniel, Duncan, Gonzalo, Miguel, Rodrigo, Tim, 
+	and others for these bits.
+
+@item May 4th, 2002
+
+	Rodrigo Moya announced <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-May/005366.html">new
+	LibGDA</a>: LibGDA is an ADO-like library for Unix systems.
+	This one removes all the CORBA and GConf dependencies, which
+	should make it easier to use and compile. 
+
+	This is another milestone for our <a
+	href="ado-net.html">ADO.NET implementation plans</a>
+
+	We have a little surprise for everyone tracking the news on tuesday ;-)
+
+@item May 2nd, 2002
+
+	Mark Crichton csvorbis port (C# port of Vorbis player) and
+	Richard Hestilow's <a href="http://monologo.sf.net">MonoLogo compiler</a> are now
+	on the CVS, and you can get them from AnonCVS.
+
+	Dick implemented inter-process sharing of handles as well as
+	simplifying the implementation of WaitForMultipleObjects, now
+	we have a `handles' subsystem in Mono.  This is needed to fully
+	emulate the handle behavior that Win32 exposes, and that the .NET API
+	expose to applications.
+
+	News from the <a
+	href="http://gtk-sharp.sourceforge.net">Gtk#</a> front: <a
+	href="http://gtk-sharp.sourceforge.net/menu.png">Menu
+	support</a>, Mike <a
+	href="http://lists.ximian.com/archives/public/gtk-sharp-list/2002-May/000064.html">tells
+	the story</a>	
+
+@item May 1st, 2002
+
+	Daily packages for <a href="http://www.debian.org">Debian</a> are available
+	<a href="http://www.atoker.com/mono/">here</a>
+
+@item Apr 26, 2002
+
+	Binary packages of Mono 0.11 are available for <a
+	href="http://www.superin.formativ.net/mono/mono.htm">Windows</a>
+	(Thanks to Johannes Roith) and for
+	<a
+	href="http://mono.baselabs.org/index.php/software/">Linux</a> (thanks
+	to BaseLabs).
+
+@item Apr 24, 2002
+
+	<b>Mono 0.11 is out!</b> Mostly performance improvements, bug
+	fixes and more classes are included.
+
+	A new version of the runtime, compiler and class libraries has
+	been packaged for your download pleasure.  Binaries are
+	included.  The <a href="archive/mono-0.11">Release Notes</a>
+	are available.
+
+	You can get it <a
+	href="download.html#apr-24">Here</a> (quick links: <a
+	href="archive/mono-0.11.tar.gz">runtime</a> and <a
+	href="archive/mcs-0.11.tar.gz">compiler/classes</a>).
+
+@item Apr 23, 2002
+
+	SharpDevelop 0.88a <a href="http://www.icsharpcode.net/OpenSource/SD">is out!</a>
+
+	Congratulations to the developers behind SharpDevelop for
+	their new release.
+
+@item Apr 20, 2002
+
+	Some updates from the hacking lines:
+
+	<b>The web:</b> Patrik Torstensson last week contributed the
+	http runtime support and started work on thread pools.  This
+	is part of the ASP.NET support.
+
+	<b>Docs:</b> John Barnette, John Sohn and Adam Treat have been
+	hacking on MonoDoc.
+
+	<b>ADO.NET:</b> Daniel Morgan and Rodrigo Moya have been
+	working on the <a href="ado-net">ADO.NET</a> support, and got
+	the first signs of life this week (we can connect, insert
+	rows; do transactions: commit/rollback; SQL errors and
+	exceptions work).  Check <a
+	href="mailing-lists.html">mono-patches</a> for all the
+	goodies.
+
+	<b>Optimizations:</b> A number of optimizations in the runtime
+	made the compiler twice as fast this week:
+
+	Early this week Patrik started the string
+	rewrite in the runtime.  Today Dietmar finished the
+	constructors and deployed the new layout. 
+
+	Paolo got the JIT engine to generate profiles, which were in
+	turn used to find hot spots in Reflection, which he improved.
+
+	Daniel Lewis (of Regex fame) noticed the performance issues
+	with our current array layout, and contributed a new array
+	representation.
+
+	At the same time Dietmar started the the JIT inline code and
+	implemented constant propagation.  These two optimizations
+	together are very powerful.
+
+	<b>Bug fixing:</b> And of course everyone has been helping out
+	with the bug fixing (Duncan, Gonzalo, Jonathan, Miguel, Nick,
+	Ravi, Sergey)
+
+
+@item Apr 18, 2002
+
+	Dietmar's inlining for the JIT engine just landed into
+	CVS. This is only a first cut and more improvements will come later.
+
+	Patrik, Paolo, Dietmar and Gonzalo have been busy optimizing
+	our class libraries and runtime engine to become faster. Many changes
+	on CVS as well.
+
+@item Apr 11, 2002
+
+	Gtk# 0.1 "ButtonHook" has been <a
+	href="http://lists.ximian.com/archives/public/gtk-sharp-list/2002-April/000048.html">released</a>
+
+	Binaries for the Mono Regression Test Suite are <a
+	href="archive/mono-tests.tar.gz">available</a> for
+	people porting the Mono Runtime to new platforms.
+
+@item Apr 6, 2002
+
+	<a href="http://www.dotnetremoting.cc/book/AdvancedDotNetRemoting.asp">
+	Advanced .NET Remoting</a> from Ingo Rammer is now available. Ingo
+	helped us to implement the proxy support and the book is a valuable
+	resource for anyone interested in remoting.
+
+@item Apr 5, 2002
+
+	Transparent proxy support has been finished, congrats to
+	Dietmar.  Our JIT engine on CVS contains the implementation.
+	This should enable people to test the remoting framework on
+	Mono.
+
+@item Mar 28, 2002
+
+        Debugging information is now generated by the compiler thanks
+        to Martin's work.  The resulting dwarf file can be used to
+        single step C# code in GDB.  A document will be shortly published with
+        the details.
+
+@item Mar 27, 2002
+
+	<b>Mono 0.10 is out!</b> The self hosting release of Mono has
+	been released.
+
+	A new version of the runtime, compiler and class libraries has
+	been packaged for your download pleasure.  Binaries are
+	included.  The <a href="archive/mono-0.10">Release Notes</a>
+	are available.
+
+	You can get it <a
+	href="download.html#mar-27">Here</a> (quick links: <a
+	href="archive/mono-0.10.tar.gz">runtime</a> and <a
+	href="archive/mcs-0.10.tar.gz">compiler/classes</a>).
+
+@item Mar 26, 2002
+
+	Paolo finally fixed the last bug in the JITer that stopped
+	us from using it to run the Mono C# compiler.  Goodies are on
+	CVS.
+
+	<a href="http://gtk-sharp.sourceforge.net">Gtk#</a> runs <a
+	href="http://gtk-sharp.sourceforge.net/gtk-hello-world.png">Hello
+	World</a>.  Mike posted some <a
+	href="http://lists.ximian.com/archives/public/gtk-sharp-list/2002-March/000034.html">details.</a>
+
+
+@item Mar 19, 2002
+
+	Martin has been working on our debugging infrastructure, both
+	on the JIT side of things (adding dward support) as well as on
+	the class libraries (so that MCS can start generating
+	debugging information).
+	
+	Jason and Kral keep working on the System.Xml namespace,
+	allowing Mike to move more to self-hosting his Gtk# code.  
+
+	The System.Web classes are now part of the build (and they are
+	also part of the class status now).  Ajay contributed a large
+	chunk of code to the System.Xml.Schema namespace
+
+	Dan (of regex fame) has been working on internal calls
+	support: moving more code from the old monowrapper to become
+	internal calls.
+
+	Paolo and Dietmar are working steadily on our runtime
+	environment, fixing bugs, adding missing features and allowing
+	us to run the compiler on Linux.
+
+	Remember to post your bug reports.
+
+	The nice class status on the right is brought to you by
+	endless hacking hours from Piers and Nick.  These status
+	report pages have been helping us track down various mistakes
+	in our classes (very useful, check it out for yourself)
+
+@item Mar 12, 2002
+
+        At midnight, in Italy, Paolo got the Mono C# compiler to self
+        host on Linux, the last bug has been squashed to self
+        hostingness.  We have now a fully self hosting compiler in Linux.
+
+        A release will follow up shortly.
+
+@item Mar 9, 2002
+
+	Updated the <a href="class-status.html">class status</a>, now
+	it is possible to use the right-side menu to browse a specific
+	assembly.
+
+@item Mar 7, 2002
+
+	MCS compiles on Linux!   
+
+	Today Paolo got the <a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-March/003726.html">MCS
+	compiler compiling itself on Linux</a>
+	completely for the first time!  The resulting image still contains
+	some errors, but the whole compiler process goes now.  Later in the day
+	and a couple of small optimizations and bug fixes, the compile
+	speed was improved in 400%
+
+	We are very close to have a complete self hosting environment now.
+
+	Mono is temporarly using the Bohem GC garbage collector while
+	we deploy the more advanced ORP one. 
+
+@item Mar 5, 2002
+
+	The CVS repository <a href="http://cvs.hispalinux.es/cgi-bin/cvsweb/?hidenonreadable=1&f=u&logsort=date&sortby=file&hideattic=1&cvsroot=Mono">can be browsed</a>
+
+	Jason has got an incredible amount of work on the Xml
+	classes during the weekend, and Gaurav is very close to have
+	the complete System.Web.UI.WebControls namespace implemented.   
+
+	Martin and Duco have been killing bugs by using the recently
+	revamped regression test suite.
+
+	Piers has updated our <a href="class-status.html">class
+	status</a> page again, with even more information available.
+
+	The C# compiler has full constant folding implemented now and Ravi
+	killed bugs of bugs in the <a href="http://bugzilla.ximian.com/buglist.cgi?product=Mono%2FClass+Libraries&product=Mono%2FMCS&product=Mono%2FRuntime&bug_status=NEW&bug_status=ASSIGNED&bug_status=REOPENED&email1=&emailtype1=substring&emailassigned_to1=1&email2=&emailtype2=substring&emailreporter2=1&changedin=&chfieldfrom=&chfieldto=Now&chfieldvalue=&short_desc=&short_desc_type=substring&long_desc=&long_desc_type=substring&bug_file_loc=&bug_file_loc_type=substring&keywords=&keywords_type=anywords&op_sys_details=&op_sys_details_type=substring&version_details=&version_details_type=substring&cmdtype=doit&order=%27Importance%27&form_name=query">Mono Bug List</a>
+
+@item Mar 1, 2002
+
+	RPMs of Mono 0.9 are available at <a href="http://mono.baselabs.org/#download">mono.baselabs.com</a>
+
+@item Feb 28, 2002
+
+	<a
+	href="http://lists.ximian.com/archives/public/mono-list/2002-February/003464.html">Christophe</a>
+	has setup his <a href="http://mono.baselabs.org">First Steps in Mono</a> web site, which 
+	shows you a step-by-step process on getting Mono running on your system.
+
+	RPMs of Mono 0.9 are available at <a href="http://mono.baselabs.org/index.php/software/">mono.baselabs.org</a>
+
+@item Feb 27, 2002
+
+	New <a href="class-status.html">class status</a> engine that
+	provides detailed information about missing functionality in
+	our class libraries.  Nick built the cormissing tool and Piers
+	did the XSLT and DHTML magic.
+
+	More compiler progress on Linux: our support runtime now
+	enables the compiler to compile `MIS' on Linux (MIS being
+	Dick's Mono sample HTTP server ;-)
+
+@item Feb 26, 2002
 
 	Paolo posted a list of <a
 	href="http://lists.ximian.com/archives/public/mono-list/2002-February/003266.html">ways
@@ -77,17 +937,17 @@
 	<a href="http://lists.ximian.com/archives/public/mono-list/2002-February/003268.html">his</a>
 	suggestions.
 
-** Feb 25, 2002
+@item Feb 25, 2002
 
 	StrongARM port from Sergey Chaban has been checked into CVS.  
 
-** Feb 24, 2002
+@item Feb 24, 2002
 
 	SPARC: 44 out of 74 tests pass now (Jeff)
 
 	Power PC: delegates are working now (Radek)
 
-** Feb 22, 2002
+@item Feb 22, 2002
 
 	<b>Mono 0.9 has been released!</b>
 
@@ -100,14 +960,14 @@
 	href="archive/mono-0.9.tar.gz">runtime</a> and <a
 	href="archive/mcs-0.9.tar.gz">compiler/classes</a>).
 
-** Feb 21, 2002
+@item Feb 21, 2002
 
 	Paolo got our compiler natively to compile 117 of our tests.
 	Self hosting is closer every day.
 
 	Unsafe support is finished in the C# compiler.
 
-** Feb 20, 2002
+@item Feb 20, 2002
 
 	Gaurav got DataGrid and DataGridItemCollection done.
 
@@ -122,11 +982,11 @@
 	use anoncvs.go-mono.com as the hostname for your CVSROOT and
 	you will get one of the machines.
 
-** Feb 19, 2002
+@item Feb 19, 2002
 
 	Do you want to see what <a href="http://people.debian.org/~lupus/mono/">Mono Looks Like?</a>
 
-** Feb 18, 2002
+@item Feb 18, 2002
 
 	Application Domains now support the two LoaderOptimization
 	modes: share code or do not share code, and you can control
@@ -137,7 +997,7 @@
 
 	PowerPC and SPARC ports are moving along (Radek and Jeff)
 
-** Feb 13, 2002
+@item Feb 13, 2002
 
 	Excellent news since the 11th, here is a quick rundown:
 
@@ -150,7 +1010,7 @@
 	Miguel is off to the <a
 	href="http://www.fosdem.org">FOSDEM</a> conference in Brussels.
 
-** Feb 11, 2002
+@item Feb 11, 2002
 
 	<b>Mono 0.8 has been released!</b>
 
@@ -162,7 +1022,7 @@
 	href="archive/mono-0.8.tar.gz">runtime</a> and <a
 	href="archive/mcs-0.8.tar.gz">compiler/classes</a>)
 
-** Feb 11, 2002
+@item Feb 11, 2002
 
 	We would like to welcome all the new developers that have
 	joined the project in the last couple of days.  The classes
@@ -191,19 +1051,19 @@
 	href="http://lists.ximian.com/archives/public/mono-list/2002-February/002944.html">
 	posted a list of pending tasks</a> to enable the compiler to run on Linux
 
-** Feb 10, 2002
+@item Feb 10, 2002
 
 	Mike Kestner has posted an <a
 	href="http://lists.ximian.com/archives/public/gtk-sharp-list/2002-February/000024.html">Update
 	on his Gtk#</a> activities.
 
-** Feb 4, 2002
+@item Feb 4, 2002
 
 	Adam has done <a
 	href="http://lists.ximian.com/archives/public/mono-list/2002-February/002808.html">Qt
 	bindings</a> for .NET.  Adam is cool.
 
-** Jan 29, 2002
+@item Jan 29, 2002
 
 	Dan Lewis has contributed a major missing set of classes to
 	Mono: <a
@@ -215,7 +1075,7 @@
 	was not entirely trivial (supporting Unicode, plus a regex engine which is a super
 	set of the Perl regex engine). 
 
-** Jan 28, 2002
+@item Jan 28, 2002
 
 	The Mono contributors have relicensed the Class Libraries under
 	the terms of the
@@ -237,7 +1097,7 @@
 	<a href="http://www.infoworld.com/articles/hn/xml/02/01/28/020128hnopennet.xml">InfoWorld</a>, 
 	<a href="http://www.newsforge.com/article.pl?sid=02/01/27/2232231">NewsForge</a>.
 
-** Jan 23, 2002
+@item Jan 23, 2002
 
 	New mailing list: <a href="mailto:mono-patches-request@ximian.com">mono-patches@ximian.com</a>.
 	This mailing list will receive automatically the patches that are submitted
@@ -247,7 +1107,7 @@
 	code submitted to CVS to receive patches on e-mail.  It should also
 	expose to everyone the changes that are being done by the team every day.
 
-** Jan 21, 2002
+@item Jan 21, 2002
 
 	Dick has got a simple web server running with Mono (`MIS: Mono
 	Internet Server') that is mostly used to test our IO layer, a
@@ -262,7 +1122,7 @@
 	reports, fixing all known bugs, and finally profiling of the compiler
 	has begun.
 
-** Jan 8, 2002
+@item Jan 8, 2002
 
 	Our compiler has been self-supporting since January 3rd.  In
 	the meantime, we have been busy working on making it run on
@@ -270,7 +1130,7 @@
 	the compiler compiled `console.cs' (a sample Mono program) on
 	Linux.
 
-** Jan 4, 2002
+@item Jan 4, 2002
 
 	Dietmar landed the Unicode support patch.  Class libraries and
 	runtimes are now fully Unicode aware.  The details are <a href=
@@ -281,7 +1141,7 @@
 	compile fib.cs, patches are comming tomorrow once we have
 	ChangeLog entries.   
 
-** Jan 4, 2002
+@item Jan 4, 2002
 
 	Mike Kestner posted an update on Gtk# <a
 	href="http://lists.ximian.com/archives/public/gtk-sharp-list/2002-January/000021.html"><i>New
@@ -290,7 +1150,7 @@
 	Gtk# will be our foundation on which we will be implementing
 	System.Windows.Forms.  
 
-** Jan 3, 2002
+@item Jan 3, 2002
 
 	Mono C# compiler becomes self-sufficient.  We can now continue
 	development of the compiler with itself.  
@@ -303,7 +1163,7 @@
 	href="snapshots">snapshot</a> or getting your sources from our
 	<a href="anoncvs.html">Anonymous CVS server</a>.
 
-** Dec 28, 2001
+@item Dec 28, 2001
 
 	After a lot of work, the C# compiler can compile itself.
 	There are still errors in the generated image, but they are
@@ -311,7 +1171,7 @@
 
 	We will soon have the first non-Microsoft C# implementation!
 
-** Dec 18, 2001
+@item Dec 18, 2001
 
 	JIT: More work on our IO abstraction layer (Dick). 
 
@@ -324,7 +1184,7 @@
 	the outstanding issues.  More bug fixing allows it to compile
 	more programs.
 
-** Dec 14, 2001
+@item Dec 14, 2001
 
 	Dietmar has improved the register allocation and now Mono performs
 	two to three times as fast as it did yesterday.  Amazing.
@@ -332,7 +1192,7 @@
 	The compiler keeps moving along, explicit interface
 	implementation is there.
 
-** Dec 11, 2001
+@item Dec 11, 2001
 
 	The JIT engine can now run all the compiler regression tests as 
 	well as assorted other programs, many more opcodes added
@@ -352,13 +1212,13 @@
 	libraries, it is easy to find spots now since Nick got the
 	`make test' going.
 
-** Dec 1, 2001
+@item Dec 1, 2001
 
 	AnonCVS access to Mono is here (updated every hour).  Thanks
 	to <a href="http://www.hispalinux.es">HispaLinux</a> and Jesus
 	Climent for helping to set this up.
 
-** Nov 30, 2001
+@item Nov 30, 2001
 
 	All tests from the mono runtime work with the JIT engine now
 	(Dietmar).
@@ -368,7 +1228,7 @@
 
 	More work on the Web classes (Gaurav).
 
-** Nov 28, 2001
+@item Nov 28, 2001
 
 	JIT land: Paolo got GDB support into the JIT engine while
 	Dietmar added exceptions support to it.
@@ -381,7 +1241,7 @@
 
 	Dick has almost completed the Mono IO layer.
 
-** Nov 16, 2001
+@item Nov 16, 2001
 
 <blockquote>
 	Mike Kestner has posted an <a
@@ -389,7 +1249,7 @@
 	on Gtk# development.
 </blockquote>
 
-** Nov 14, 2001
+@item Nov 14, 2001
 
 <blockquote>
 	Paolo today got the Mono C# compiler running <a
@@ -424,7 +1284,7 @@
 	replace our interpreter in production.
 </blockquote>
 
-** Nov 12, 2001
+@item Nov 12, 2001
 
 <blockquote>
 	Dietmar got value types working on the JIT engine.  Sean has
@@ -435,7 +1295,7 @@
 	Nick keeps working on improving our class libraries. 
 </blockquote>
 
-** Nov 8, 2001
+@item Nov 8, 2001
 
 <blockquote>
 	Enumerations, array access and attributes for the C# compiler are into the CVS now.
@@ -443,14 +1303,14 @@
 	Full array support is not complete, but moving along.
 </blockquote>
 
-** Nov 5, 2001
+@item Nov 5, 2001
 
 <blockquote>
 	Dietmar's new set of patches to the JIT have 20 out of 33
 	tests running now.
 </blockquote>
 
-** Nov 4, 2001
+@item Nov 4, 2001
 
 <blockquote>
 	Mike Kestner, main Gtk# contributor has posted a very interesting <a
@@ -469,7 +1329,7 @@
 	important piece of the puzzle.
 </blockquote>
 
-** Nov 3, 2001
+@item Nov 3, 2001
 
 <blockquote>
 	Many clean ups have been going into the class library by Nick Drochak. 
@@ -481,7 +1341,7 @@
 	new controls plus improved and bug fixed base classes).
 </blockquote>
 
-** Nov 1, 2001
+@item Nov 1, 2001
 
 <blockquote>
 	Ravi commited the caller-side method selection of methods with
@@ -489,7 +1349,7 @@
 	the array handling support. 
 </blockquote>
 
-** Oct 27, 2001
+@item Oct 27, 2001
 
 <blockquote>
 	Lots of classes for System.Web from Gaurav were commited this
@@ -522,7 +1382,7 @@
 	.defs files to quickly wrap the API.
 </blockquote>
 
-** Oct 18, 2001
+@item Oct 18, 2001
 
 <blockquote>
 	Reworking expressions to support cleanly indexers and
@@ -534,14 +1394,14 @@
 	recent C# compiler progress.
 </blockquote>
 
-** Oct 17, 2001
+@item Oct 17, 2001
 
 <blockquote>
 	Delegate support has been checked into the compiler
 	(definition and invocation); break/continue implemented.
 </blockquote>
 
-** Oct 15, 2001
+@item Oct 15, 2001
 
 <blockquote>
 	JIT engine supports many of the object constructs now (object
@@ -556,7 +1416,7 @@
 	classes.
 </blockquote>
 
-** Oct 5, 2001
+@item Oct 5, 2001
 
 <blockquote>
 	Sergey has released his first version of the <b>ilasm</b>
@@ -569,7 +1429,7 @@
 	eventually.
 </blockquote>
 
-** Oct 4, 2001
+@item Oct 4, 2001
 
 <blockquote>
 	Our System.Reflection.Emit implementation created its first
@@ -582,7 +1442,7 @@
 	basically focusing on completeness now.  
 </blockquote>
 
-** Sep 28, 2001
+@item Sep 28, 2001
 
 <blockquote>
 	<a
@@ -590,7 +1450,7 @@
 	Develop 0.80</a> was released today.
 </blockquote>
 
-** Sep 26, 2001
+@item Sep 26, 2001
 
 <blockquote>
 	More progress: more opcodes are working (Paolo); The compiler
@@ -602,7 +1462,7 @@
 	handled correctly (Miguel).
 </blockquote>
 
-** Sep 21, 2001
+@item Sep 21, 2001
 
 <blockquote>
 	A couple of news-worthy items: Dick got the initial thread
@@ -612,14 +1472,14 @@
 	got i++ working.   All in tonight's snapshot
 </blockquote>
 
-** Sep 19, 2001
+@item Sep 19, 2001
 
 <blockquote>
 	Paolo has written a section on <a href="porting.html">Porting
 	Mono</a> to othre architectures.
 </blockquote>
 
-** Sep 18, 2001
+@item Sep 18, 2001
 
 <blockquote>
 	<A a href="download.html#sep-18">Mono 0.7</a> has been
@@ -628,7 +1488,7 @@
 	0.7 announcement</a> for details
 </blockquote>
 
-** Sep 17, 2001
+@item Sep 17, 2001
 
 <blockquote>
 	Mike Kestner's Gtk# (Gtk-sharp) was checked into the CVS
@@ -639,7 +1499,7 @@
 	Gtk-sharp should be available on the next snapshot set.
 </blockquote>
 
-** Sep 10, 2001
+@item Sep 10, 2001
 
 <blockquote>
 	Dietmar checked in his CIL tree/forest regeneration and most
@@ -647,7 +1507,7 @@
 </blockquote>
 
 
-** Sep 5, 2001
+@item Sep 5, 2001
 
 <blockquote>
 	The MCS compiler <b>can compile the sample Hello World</b>
@@ -657,14 +1517,14 @@
 	August 28)
 </blockquote>
 
-** Sep 4, 2001
+@item Sep 4, 2001
 
 <blockquote>
 	Dietmar checked into CVS the `monoburg' architecture
 	independent instruction selector for the JIT engine.
 </blockquote>
 
-** Aug 28, 2001
+@item Aug 28, 2001
 
 <blockquote>
 	<b>.NET Hello World is working under Mono!</b>  The latest snapshots
@@ -676,7 +1536,7 @@
 	Good work Mono team!
 </blockquote>
 
-** Aug 23, 2001
+@item Aug 23, 2001
 
 <blockquote>
 	Lloyd Dupont has announced his OpenGL bindings for C#, they
@@ -684,7 +1544,7 @@
 	href="http://csgl.sourceforge.net">http://csgl.sourceforge.net</a>
 </blockquote>
 
-** Aug 22, 2001
+@item Aug 22, 2001
 
 <blockquote>
 	New version of the Mono Runtime, Compiler and Classes has been
@@ -693,7 +1553,7 @@
 	href="archive/mono-0.6">0.6 announcement</a>.
 </blockquote>
 	
-** Aug 20, 2001
+@item Aug 20, 2001
 
 <blockquote>
 	A new <a href="contributing.html#compile-service">Compilation
@@ -702,14 +1562,14 @@
 	href="http://msdn.microsoft.com/downloads/default.asp?url=/downloads/sample.asp?url=/msdn-files/027/000/976/msdncompositedoc.xml&frame=true">.NET SDK</a>
 </blockquote>
 
-** Aug 3, 2001
+@item Aug 3, 2001
 
 <blockquote>
 	Daily snapshots of mcs and mono are now available, they will
 	run every night at 10pm Boston time.  
 </blockquote>
 
-** Jul 29, 2001
+@item Jul 29, 2001
 
 <blockquote>
 	Mono Runtime 0.5 has been <a
@@ -717,7 +1577,7 @@
 	href="archive/mono-0.5">release notes</a>
 </blockquote>
 
-** Jul 25, 2001
+@item Jul 25, 2001
 
 <blockquote>
 	The slides for <A href="Presentations/O-Reilly">my
@@ -725,7 +1585,7 @@
 	Open Source Software Convention</a>
 </blockquote>
 
-** Jul 22, 2001
+@item Jul 22, 2001
 
 <blockquote>
 	Another release of the class libraries is out, check the <a
@@ -734,7 +1594,7 @@
 	href="download.html#july-22">here</a>
 </blockquote>
 
-** Jul 19, 2001
+@item Jul 19, 2001
 
 <blockquote>
 	Another release of the class libraries is out, check the <a
@@ -743,7 +1603,7 @@
 	href="download.html#july-19">here</a>
 </blockquote>
 	
-** Jul 17, 2001
+@item Jul 17, 2001
 
 <blockquote>
 	Another release of the class libraries is out, check the <a
@@ -753,12 +1613,12 @@
 
 	Do not forget to check out the updated <a href="faq.html">FAQ</a>.
 
-	Got Sean's new <a href="class-status/index.html">Class
-	Status</a> web pages up.  These are a lot better than mine, and
+	Got Sean's new Class
+	Status web pages up.  These are a lot better than mine, and
 	we are now keeping better track of contributors.
 </blockquote>
 
-** Jul 15, 2001
+@item Jul 15, 2001
 
 <blockquote>
 	Another release of Mono is out, check the <a
@@ -766,7 +1626,7 @@
 	href="download.html#july-15">here</a>.
 </blockquote>
 
-** Jul 14, 2001
+@item Jul 14, 2001
 
 <blockquote>
 	A <a
@@ -775,7 +1635,7 @@
 	runtime, compiler and classes has been made.  Get it <a href="download.html#july-14">here</a>
 </blockquote>
 
-** Jul 12, 2001
+@item Jul 12, 2001
 
 <blockquote>
 	I keep getting questions about my opinion on Passport, even when
@@ -783,13 +1643,13 @@
 	href="passport.html">wrote something.</a>
 </blockquote>
 
-** Jul 9, 2001
+@item Jul 9, 2001
 
 <blockquote>
 	Project launched.
 </blockquote>
 
-** O'Reilly
+@item O'Reilly
 
 <blockquote>
 	Brian posted a story on <a
diff --git a/web/java b/web/java
new file mode 100755
index 00000000000..cf1afa1a39e
--- /dev/null
+++ b/web/java
@@ -0,0 +1,62 @@
+* Java
+
+	It would be interesting to support the Java language as part
+	of the Mono project.  
+
+	You have to think of Java as various pieces: Java the
+	language and Java the virtual machine.  
+
+	It is possible to compile Java to .NET, as shown by the
+	Microsoft J# compiler.   We could then allow the migration of
+	Java applications to the Mono runtime. 
+
+** Native compiler
+
+	Although a native compiler can be built, and probably should be
+	built using an existing compiler, a short term solution is to 
+	build a translator from Java class files to the ECMA CIL images.
+
+	This has the advantage that we can use an existing and tested
+	Java compiler to generate the code, and then we can use an automated
+	code compiler that compiles Java VM bytecodes to CIL bytecodes.
+
+** The translator.
+
+	It would be interesting to write a semantic translator that
+	converts java byte codes into CIL opcodes.  This is possible
+	because the Java byte codes are a subset of the CIL ones.
+
+	A semantic tree needs to be constructed (very much in the
+	spirit of what is done in mono_analize_stack in
+	<tt>mono/mono/jit/jit.c</tt>.  Once such a semantic tree is
+	constructed, we could generate the equivalent Java code.
+
+	This has a number of interesting side effects: people can
+	continue to use their existing Java compilers to compile their
+	code, and a simple tool that converts their .class files into
+	a .NET assembly can be used.
+
+** Libraries
+
+	We could translate the GNU Classpath libraries with the above
+	tools to provide the Java runtime required to host into the
+	Mono runtime.  Some special treatment would be required for
+	core data types like integers, arrays and strings, and of
+	course reuse where possible existing classes from .NET to make
+	them compatible.
+
+** JILC - Java to IL Compiler
+
+	This is an attempt to make the java bytecode available for the
+	.NET environment.
+
+	The project attempts to generate the IL code / bytecode from the
+	compiled java class files. It has reached the stage of code-generation.
+	The issues that needs to be addressed is the mapping of java objects
+	to the IL objects, eg: java.lang.String to System.String.
+
+	Gaurav Vaish and Abhaya Agarwal are currently leading this project.
+	The project is currently hosted at <a href="http://sourceforge.net/projects/jilc">SourceForge.Net</a>.
+	The official home page of the project is 
+	<a href="http://jilc.sourceforge.net">http://jilc.sourceforge.net</a>.
+
diff --git a/web/jit-debug b/web/jit-debug
new file mode 100644
index 00000000000..71c4db74420
--- /dev/null
+++ b/web/jit-debug
@@ -0,0 +1,184 @@
+* How to debug your C# application with the JIT engine 
+
+	To debug a C# application you need to run the JIT in your debugger.
+
+	Before you can do anything useful in a debugger, you need a symbol
+	file which tells your debugger about functions, types, line numbers
+	and such. Unfortunately, this symbol file needs to be recreated each
+	time the JIT compiles a new method since it doesn't know anything
+	about this method (especially not its memory address) before actually
+	compiling it.
+
+	You have two ways of creating a symbol file:
+
+** Letting the JIT dynamically create the symbol file
+
+	This'll give you a symbol file which is suitable for debugging IL byte
+	code - you won't see your C# source code.
+
+	However, this method has the advantage that it works with every assembly,
+	no matter whether it has been compiled with Mono's C# compiler (MCS) or
+	with any other compiler. It's currently the only way to debug
+	<tt>corlib.dll</tt> or any other library which cannot be compiled with
+	our compiler yet.
+
+	All that you need is a dump of the IL bytecode for each assembly (including
+	all assemblies this assembly is referencing). This is done by using the
+	<tt>monodis</tt> utility:
+
+	<pre>
+	monodis /home/export/martin/MONO-LINUX/lib/corlib.dll > corlib.il<br>
+	monodis /home/export/martin/MONO-LINUX/lib/System.dll > System.il<br>
+	monodis /home/export/martin/MONO-LINUX/bin/mcs.exe > mcs.il
+	</pre>
+
+	This is normally done automatically, but you can also disable
+	it and create them by hand.  See the <tt>mono</tt> manual page
+	for details.
+
+	Make sure that all the .il files have the same name as their corresponding
+	assembly and that they're all created in the current directory.
+
+	The JIT supports two different debugging file formats:
+
+	<ul>
+	* STABS: This is a very simple debugging format, but it may be the only one
+	which is supported on your system. It is limited to source files of no more
+	than 65.535 lines and it's type support is also very limited. You should only
+	use this if your debugger doesn't support DWARF 2.
+
+	To generate STABS output, use the <tt>--debug=stabs</tt> command line argument.
+
+
+	* DWARF 2: The DWARF 2 debugging format is a very powerful debugging format
+	which can handle source files of arbitrary size and has a highly sophisticated
+	type support. It's the recommended format unless you need to use STABS because
+	your debugger doesn't support DWARF 2.
+
+	To generate DWARF 2 output, use the <tt>--debug=dwarf</tt> command line argument.
+	</ul>
+
+	You need to regenerate the symbol file each time the JIT compiled a new
+	method and each time you restart the JIT. You cannot reuse your symbol file
+	if you start the JIT a second file, not even if you're running the same
+	application with the same input data a second time.
+
+	Regenerating the symbol file is done by calling the JIT's
+	<tt>mono_debug_make_symbols ()</tt> function from within your debugger and
+	then reloading the symbol files. This function creates a <tt>filename-dwarf.s</tt>
+	(or <tt>filename-stabs.s</tt>) assembler input file in the current directory and
+	an object file in <tt>/tmp/filename.o</tt> - you need to tell your debugger to
+	add this object file as symbol file.
+
+	If you're using the GNU debugger, this is done like this:
+
+	<pre>
+	call mono_debug_make_symbols ()
+	add-symbol-file /tmp/corlib.o
+	add-symbol-file /tmp/mcs.o
+	add-symbol-file /tmp/Mono.CSharp.Debugger.o
+	</pre>
+
+	You can also write a GDB macro like this:
+
+	<pre>
+	define reload
+	  call mono_debug_make_symbols ()
+	  add-symbol-file /tmp/corlib.o
+	  add-symbol-file /tmp/mcs.o
+	  add-symbol-file /tmp/Mono.CSharp.Debugger.o
+	end
+	</pre>
+
+	Then you can just say <tt>reload</tt> to have GDB recreate the symbol file.
+
+	There's also an <a href="jit-debug-sample.html">example debugging session</a> using
+	the GNU debugger.
+
+** Using a symbol file which have been created by the Mono C# compiler
+
+	If you compiled your application with Mono's C# compiler (MCS), you can tell it to
+	create a symbol file which is then processed and rewritten by the JIT engine.
+
+	To do this, you must give MCS the <tt>-g</tt> option:
+
+	<pre>
+	$ mcs -g Foo.cs
+	</pre>
+
+	This creates a <tt>Foo-debug.s</tt> assembler input file.
+
+	To use this in the JIT, you must first copy it to the target machine (the machine
+	where you want to run the JIT to debug your application) and run it through the
+	assembler to produce an object file <tt>Foo-debug.o</tt>. This object file must be
+	in the current directory.
+
+	Then start the JIT in your debugger and give it the <tt>--debug=dwarf-plus</tt> command
+	line argument.
+
+	Each time you call <tt>mono_debug_make_symbols ()</tt> from withing your debugger,
+	the JIT will read this <tt>Foo-debug.o</tt>, fix some machine dependent things like
+	memory addresses etc. in it and write it back to disk.
+
+	If you're using the GNU debugger, you'll want to use a macro like this:
+
+	<pre>
+	define relocate
+	  call mono_debug_make_symbols ()
+	  add-symbol-file /tmp/corlib.o
+	  add-symbol-file mcs-debug.o
+	  add-symbol-file Mono.CSharp.Debugger-debug.o
+	end
+	</pre>
+
+	If there is no <tt>assembly-debug.o</tt> file, but an <tt>assembly.il</tt> one, the
+	JIT will fall back to normal DWARF 2 (in the example above, <tt>corlib.dll</tt> was
+	compiled with Microsoft's compiler and the JIT is thus using DWARF to debug it).
+
+	This debugging method only works if you compiled your assembly with MCS, but it'll
+	allow you to actually debug your C# source code :-)
+
+	Here's an <a href="jit-debug-sample2.html">example debugging session</a> using
+	the GNU debugger.
+
+** Breakpoints and single stepping
+
+	The JIT has a <tt>--break</tt> command line argument to insert a breakpoint at the
+	beginning of this method. It takes a <tt>Namespace.Class:Method</tt> argument which
+	is the method. This argument can be given multiple times.
+
+	However, once your application is stopped in GDB you may want to insert a breakpoint
+	the next time the JIT compiles a method. There's a global variable
+	<tt>mono_debug_insert_breakpoint</tt> which you can modify in your debugger.
+
+	If this variable is set to a non-zero value, the JIT's <tt>arch_compile_method</tt>
+	will insert a breakpoint the next time it is called, ie. at the top of the next
+	method it compiles. If this value has a positive value, it acts as a counter and is
+	decremented after inserting the breakpoint - setting it to a negative value will let
+	the JIT insert the breakpoint each time it compiles a new method.
+
+	There's also global variable <tt>mono_debug_last_breakpoint_address</tt> which always
+	contains the address of the last inserted breakpoint. You may manually override this
+	address with a <tt>nop</tt> instruction to delete the breakpoint.
+
+	For instance, I have a GDB macro called <tt>enter</tt> which I use to enter a method
+	rather than stepping over it:
+
+	<pre>
+	define enter
+	set mono_debug_insert_breakpoint = 1
+	continue
+	set *mono_debug_last_breakpoint_address = 0x90
+	relocate
+	frame
+	</pre>
+
+	Btw. speaking of single stepping - you should use your debuggers <tt>next</tt> command,
+	not its <tt>step</tt> command for single stepping unless you compiled the JIT without
+	debugging support. The reason for this is that the JIT creates machine code which contains
+	calls to JIT methods such as <tt>mono_object_new_wrapper</tt> at places where you don't
+	expect them - so unless the JIT is compiled at least without line numbers, your debugger
+	will enter such methods if you use <tt>step</tt> rather than <tt>next</tt>.
+
+
+
diff --git a/web/jit-debug-sample b/web/jit-debug-sample
new file mode 100644
index 00000000000..650d67f8ca9
--- /dev/null
+++ b/web/jit-debug-sample
@@ -0,0 +1,86 @@
+* A debugging session using a dynamically generated symbol file.
+
+	Let's assume we have the following C# application which we want to debug:
+
+	<pre>
+	using System;
+
+	public class Foo
+	{
+		public struct MyStruct {
+			int a;
+			long b;
+			double c;
+		}
+
+		public static void Main ()
+		{
+			Int32 value = 5;
+			long test = 512;
+
+			MyStruct my_struct;
+			my_struct.a = 5;
+			my_struct.b = test;
+			my_struct.c = 23323.5235;
+		}
+	}
+	</pre>
+
+	First of all, we need to compile it and create the .il files:
+
+	<pre>
+	$ mcs ./Foo.cs
+	$ monodis /home/export/martin/MONO-LINUX/lib/corlib.dll > corlib.il
+	$ monodis Foo.exe > Foo.il
+	</pre>
+
+	Now we can start the JIT in the debugger:
+
+	<pre>
+	$ gdb ~/monocvs/mono/mono/jit/mono
+	(gdb) r --debug=dwarf --break Foo:Main ./Foo.exe
+	Starting program: /home/martin/monocvs/mono/mono/jit/mono --debug=dwarf --break Foo:Main ./Foo.exe
+	0x081e8911 in ?? ()
+	(gdb) call mono_debug_make_symbols ()
+	(gdb) add-symbol-file /tmp/Foo.o
+	Reading symbols from /tmp/Foo.o...done.
+	Current language:  auto; currently c++
+	(gdb) frame
+	#0  Foo.Main () at Foo.il:26
+	26          // method line 2
+	(gdb) n
+	Foo.Main () at Foo.il:38
+	38              IL_0000: ldc.i4.5
+	(gdb) list
+	33              .maxstack 2
+	34              .locals (
+	35                      int32   V_0,
+	36                      int64   V_1,
+	37                      valuetype MyStruct      V_2)
+	38              IL_0000: ldc.i4.5
+	39              IL_0001: stloc.0
+	40              IL_0002: ldc.i4 512
+	41              IL_0007: conv.i8
+	42              IL_0008: stloc.1
+	43              IL_0009: ldloca.s 2
+	44              IL_000b: ldc.i4.5
+	45              IL_000c: stfld  int32 .MyStruct::a
+	46              IL_0011: ldloca.s 2
+	47              IL_0013: ldloc.1
+	48              IL_0014: stfld  int64 .MyStruct::b
+	49              IL_0019: ldloca.s 2
+	50              IL_001b: ldc.r8 23323.5
+	51              IL_0024: stfld  float64 .MyStruct::c
+	52              IL_0029: ret
+	(gdb) until 52
+	Foo.Main () at Foo.il:53
+	53          }
+	(gdb) info locals
+	V_0 = 5
+	V_1 = 512
+	V_2 = {a = 5, b = 512, c = 23323.523499999999}
+	</pre>
+
+	As you see in this example, you need to know IL code to use this debugging method - but
+	it may be the only way to debug a library.
+
diff --git a/web/jit-debug-sample2 b/web/jit-debug-sample2
new file mode 100644
index 00000000000..4e4cc31bc4f
--- /dev/null
+++ b/web/jit-debug-sample2
@@ -0,0 +1,70 @@
+* A debugging session using a symbol file which has been created by MCS.
+
+	Let's assume we have the following C# application which we want to debug:
+
+	<pre>
+	using System;
+
+	public class Foo
+	{
+		public struct MyStruct {
+			int a;
+			long b;
+			double c;
+		}
+
+		public static void Main ()
+		{
+			Int32 value = 5;
+			long test = 512;
+
+			MyStruct my_struct;
+			my_struct.a = 5;
+			my_struct.b = test;
+			my_struct.c = 23323.5235;
+		}
+	}
+	</pre>
+
+	First of all, we need to compile it with MCS, assemble the generated .s file and
+	create the .il files for all referenced assemblies which were not compiled with MCS:
+
+	<pre>
+	$ mcs -g ./Foo.cs
+	$ as -o Foo-debug.o Foo-debug.s
+	$ monodis /home/export/martin/MONO-LINUX/lib/corlib.dll > corlib.il
+	</pre>
+
+	Now we can start the JIT in the debugger:
+
+	<pre>
+	$ gdb ~/monocvs/mono/mono/jit/mono
+	(gdb) r --debug=dwarf-plus --break Foo:Main ./Foo.exe
+	Starting program: /home/martin/monocvs/mono/mono/jit/mono --debug=dwarf-plus --break Foo:Main ./Foo.exe
+	Program received signal SIGTRAP, Trace/breakpoint trap.
+	0x081e8681 in ?? ()
+	(gdb) call mono_debug_make_symbols ()
+	(gdb) add-symbol-file Foo-debug.o
+	(gdb) add-symbol-file /tmp/corlib.o
+`	(gdb) frame
+	#0  Main () at ./Foo.cs:11
+	11              public static void Main ()
+	(gdb) n
+	Main () at ./Foo.cs:13
+	13                      Int32 value = 5;
+	(gdb)
+	14                      long test = 512;
+	(gdb)
+	17                      my_struct.a = 5;
+	(gdb)
+	18                      my_struct.b = test;
+	(gdb)
+	19                      my_struct.c = 23323.5235;
+	(gdb)
+	20              }
+	(gdb) info locals
+	value = 5
+	test = 512
+	my_struct = { a = 5, b = 512, c = 23323.5235 }
+	</pre>
+
diff --git a/web/languages b/web/languages
new file mode 100755
index 00000000000..cc135e1ae80
--- /dev/null
+++ b/web/languages
@@ -0,0 +1,117 @@
+* Compilers for other languages
+
+	Here are some other free compilers for other languages that
+	target .NET and should work with Mono with no problem:
+
+	<ul>
+		* <a href="#ComponentPascal">Component Pascal</a>
+		* <a href="#MonoLogo">MonoLogo</a>
+		* <a href="#Oberon">Oberon</a>
+		* <a href="#Forth">Forth</a>
+	</ul>
+
+	Languages we would like to have supported, with links to resources:
+
+	<ul>
+		* <a href="#JavaScript">Java Script</a>
+		* <a href="java.html">Java</a>
+		* <a href="#c">C</a>
+	</ul>
+
+	Some experimental languages:
+
+	<ul>
+		* <a href="#Tachy">Tachy</a> (scheme-like)
+	</ul>
+
+<a name="MonoLogo">
+** MonoLogo
+
+	An implementation of Logo for Mono (and .NET)
+
+	The <A href="http://monologo.sf.net">Mono Logo</a> compiler is
+	hosted in the <a href="ccvs.html">Mono CVS</a> repository
+	and also available on the <a href="anoncvs.html">AnonCVS</a> mirrors.
+
+<a name="Oberon">
+** Oberon
+
+	This Oberon compiler is written in Oberon.NET (another self
+	hosting compiler).
+
+	The main site <a href="http://www.oberon.ethz.ch/oberon.net/">http://www.oberon.ethz.ch/oberon.net/</a>
+
+	Download:
+	<a href="http://www.oberon.ethz.ch/oberon.net/download/">http://www.oberon.ethz.ch/oberon.net/download/</a>
+
+	Examples:
+	<a href="http://www.oberon.ethz.ch/oberon.net/examples/">http://www.oberon.ethz.ch/oberon.net/examples/</a>
+
+
+	<a href="http://www.superin.formativ.net/mono/oberon/oberon.zip">http://www.superin.formativ.net/mono/oberon/oberon.zip</a>
+
+<a name="ComponentPascal">
+** Component Pascal
+
+	The Component Pascal compiler: <a
+	href="http://www2.fit.qut.edu.au/CompSci/PLAS/ComponentPascal">Home
+	Page</a>, you can <a
+	href="http://www2.fit.qut.edu.au/CompSci/PLAS/ComponentPascal/gpcp1.1.4-netRTM.zip">
+	download it</a>
+	
+<a name="Forth">
+** Delta Forth
+
+   	 The Delta Forth.NET project: <a 
+	 href="www.dataman.ro/dforth">Home
+	 Page</a> and <a href="http://www.dataman.ro/dforth/index.html">more
+	 details here</a>.
+	 
+
+<a name="Tachy">
+** Tachy
+
+	A subset of Scheme language called <a
+	href="http://radio.weblogs.com/0101156/stories/2002/03/19/tachy.html">Tachy</a>
+
+* Missing languages
+
+	Here is a list of a few languages that we would like to see
+	supported.  We will try to maintain a set of links here with 
+	technical information for those interested in porting,
+	implementing or adapting a compiler for any of these
+	languages:
+
+<a name="JavaScript">
+* Java Script
+
+	The Mozilla project has an implementation of JavaScript
+	written in Java called <a
+	href="http://www.mozilla.org/rhino/">Rhino</a>.
+
+	You could port this code from Java to C#.
+
+	Note that since JavaScript allows for evaluation at runtime,
+	the compiler has to be built as a class that can be invoked at
+	runtime.
+
+<a name="c">
+* C
+
+	Ideally GCC could be modified to generate CIL, but it is a 
+	big task.  That would give us various compilers in one pass.
+
+	Rumor is that the next version of the LCC compiler will
+	include an IL backend.  We do not know how extensive the support
+	for integration with .NET will be, but it would be an interesting
+	excercise to add an extension to C to call into .NET code.
+
+	LCC is not an open source compiler, but it is free as long as you
+	do not profit from selling it. 
+
+<a name="Java">
+* Java
+
+	We have a <a href="java.html">separate page</a> for Java.
+
+	
diff --git a/web/mailing-lists b/web/mailing-lists
index 22a71135ac1..450aa903281 100644
--- a/web/mailing-lists
+++ b/web/mailing-lists
@@ -1,6 +1,10 @@
 * Mailing Lists
 
-	There are a number of mailing lists for Mono
+	Most of the mailing lists are in english, but there is also
+	Mono Hispano that has lists in Spanish.   <a
+	href="http://mono.es.gnome.org/mailman/listinfo/mono-hispano">Mono Hispano list</a>
+
+	There are a number of mailing lists for Mono in English:
 
 	<table>
 	  <tr>
@@ -60,16 +64,6 @@
 	  </tr>
 	  <tr>
 	    <td>
-		<b><a
-	href="http://lists.ximian.com/mailman/listinfo/mono-patches">mono-patches</a></b>
-	    </td>
-	    <td>
-	Track the development of Mono in realtime: receive patches to the Mono repository
-	by email.
-	    </td>
-	  </tr>
-	  <tr>
-	    <td>
 		<b><a href="http://lists.ximian.com/mailman/listinfo/mono-bugs">mono-bugs</a></b>
 	    </td>
 	    <td>
@@ -87,4 +81,122 @@
 	list at Develop.com:</a></b> The guys at Develop Mentor run
 	this general purpose mailing list.
 	</ul>
-	</ul>
\ No newline at end of file
+	</ul>
+
+* Google search of the archives
+
+<!-- Google Search with mods -->
+<center>
+
+<table>
+<tr>
+<td><a href="http://www.google.com/search"><img src="mailing-lists_files/Logo_40wht.gif" border="0" alt="Google" align="middle"></a></td>
+
+<td>
+<table>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face="arial,sans-serif" size="-1"><input type="hidden" name="domains" value="www.go-mono.com;lists.ximian.com"><br><input type="radio" name="sitesearch" value="www.go-mono.com"> Search www.go-mono.com <input type="radio" name="sitesearch" value="lists.ximian.com"> Search lists.ximian.com </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-list">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>list</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-announce-list">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>announce-list</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-bugs">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>bugs</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-gc-list">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>gc-list</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-cvs-list">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>cvs-list</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+<tr><td>
+<FORM method=GET action=http://www.google.com/custom>
+<TABLE bgcolor=#FFFFFF cellspacing=0 border=0>
+<tr valign=top>
+<td>
+<INPUT TYPE=text name=q size=31 maxlength=255 value="">
+<INPUT TYPE=hidden name=q size=31 maxlength=255 value="mono-patches">
+<INPUT type=submit name=sa VALUE="Search">
+<input type="hidden" name="cof" value="GIMP:#00ff00;T:#ffffff;LW:401;BIMG:http://www.go-mono.com/images/bgsquares.gif;ALC:#ffffff;L:http://www.go-mono.com/images/mono.gif;GFNT:#cc7700;LC:#ee9900;LH:80;BGC:#444444;AH:center;VLC:#cccccc;S:http://www.go-mono.com;GALT:#eeee00;AWFID:45753ce73241ef7a;">
+<font face=arial,sans-serif size=-1><input type=hidden name=domains value="lists.ximian.com"><br> <input type=hidden name=sitesearch value="lists.ximian.com"> Search mono-<b>patches</b> </font><br>
+</td></tr></TABLE>
+</FORM>
+</tr></td>
+
+
+</table>
+</tr>
+</table>
+
+</center>
+<!-- /Google Search with mods -->
diff --git a/web/mono-beginning b/web/mono-beginning
new file mode 100644
index 00000000000..a0b44ac92d9
--- /dev/null
+++ b/web/mono-beginning
@@ -0,0 +1,37 @@
+* Mono for beginners
+
+	Hinne Hettema and Jaime Anguiano Olarra are providing us with 
+	nice and complete set of documents (HOWTOs) about how to install,
+	configure, run and test the software developed by the Mono Project.
+
+	You can read them online, get PDF versions or get the XML sources.
+
+
+	HTML Format (read it online)
+
+	For <a href="mono-beginning/t1.html">RPM Linux based systems</a>
+
+	For <a href="http://geneura.ugr.es/~jaime/mono-beginning-windows/t1.html">Microsoft Windows</a>
+
+
+	PDF Format
+
+	For <a href="mono-beginning.pdf">RPM Linux based systems</a>
+
+	For <a href="http://geneura.ugr.es/~jaime/mono-beginning-windows/mono-beginning-windows.pdf">Microsoft Windows</a>
+
+
+
+	XML Source
+
+	For <a href="mono-beginning.xml">RPM Linux based systems</a>
+
+	For <a href="http://geneura.ugr.es/~jaime/mono-beginning-windows/mono-beginning-windows.xml">Microsoft Windows</a>
+
+
+	Currently Hinne is working on a Mono Tools HOWTO. Which will be
+	very useful for the hackers that would like to get in touch with
+	Mono and Jaime is working out a Mono Beginning HOWTO for Debian 
+	users.
+
+
diff --git a/web/mono-beginning-windows.xml b/web/mono-beginning-windows.xml
new file mode 100644
index 00000000000..a6f34da77f0
--- /dev/null
+++ b/web/mono-beginning-windows.xml
@@ -0,0 +1,1065 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>

+

+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" []>

+<article>

+

+  <articleinfo>

+

+    <!-- Use "HOWTO", "mini HOWTO", "FAQ" in title, if appropriate -->

+    <title>Mono Beginners HOWTO for Windows users</title>

+

+   <author>

+       <firstname>Jaime</firstname>

+       <surname>Anguiano Olarra</surname>

+       <affiliation>

+          <address><email>jaime@geneura.ugr.es</email></address>

+       </affiliation>

+     </author>

+

+   <author>

+       <firstname>Hinne</firstname>

+       <surname>Hettema</surname>

+       <affiliation>

+          <address><email>h.hettema@auckland.ac.nz</email></address>

+       </affiliation>

+     </author>

+

+     <pubdate>2002-08</pubdate>

+

+     <!-- Most recent revision goes at the top; list in descending order -->

+     <!-- All dates specified in ISO "YYYY-MM-DD" format -->

+     <revhistory>

+       <revision>

+          <revnumber>0.1</revnumber>

+          <date>2002-08-05</date>

+          <authorinitials>JA</authorinitials>

+          <revremark>First release</revremark>

+       </revision>

+     </revhistory>

+

+     <!-- Provide a good abstract; a couple of sentences is sufficient -->

+     <abstract>

+        <para>

+	 The goal of this document is to guide people through the setup of a Mono

+         framework in a Windows box. Because some people might want to just test

+         Mono a bit and use the compiler, etc, I have made two distinctions, one

+         for the Mono user that only wants to get precompiled binaries and another

+         for the one how wants to build Mono from the CVS and probably contribute

+         to the project actively. Each kind of user has to read the corresponding

+         part of this document. I hope a lot of Windows users will get a nice 

+         approach to the free software world by starting using Mono.

+	</para>

+     </abstract>

+

+  </articleinfo>

+

+<sect1 id="intro">

+<title>Introduction</title>

+

+<para>

+Mono is an open source implementation of the Common Language Infrastructure

+(CLI) specified in ECMA standard 335. It comes with a C# compiler and

+provides an extensible platform to develop and run applications that

+are interoperable with Microsoft .NET.

+</para>

+

+<para>

+Mono is not finished--it is a project still under development. As a

+result, installation and configuration may not be as smooth as you

+will be used to from other Linux or Windows applications. Nevertheless, 

+mono is in a state that will allow you to get it up and running and gain

+experience with it--which is, I would suggest, a very smart thing to do.

+</para>

+

+<para>

+This document is aimed at the mono beginner, and aims to present a complete

+view of a minimal installation, which will allow you to experiment with

+mono to some degree. It also describes some of those experiments. We

+expect that after reading this document you'll go on to do either of

+two things:

+</para>

+<orderedlist>

+<listitem>

+<para>

+Continue to contribute to the mono project in some shape or form. The

+website has some ideas and suggestions under the heading 'Contributing'.

+</para>

+</listitem>

+<listitem>

+<para>

+Continue to write applications that run in mono. 

+</para>

+</listitem>

+</orderedlist>

+

+<para>

+We hope this document will be useful to you in your first steps with mono.

+Happy hacking!

+</para>

+

+<sect2 id="disclaimer"> <title>Disclaimer</title>

+

+<para> 

+No liability for the contents of this document can be accepted.

+Use the concepts, examples and information at your own risk.  There may

+be errors and inaccuracies, that could be damaging to your system.

+Proceed with caution, and although this is highly unlikely, the author(s)

+do not take any responsibility.  

+</para>

+

+<para> 

+All copyrights are held by their by their respective owners,

+unless specifically noted otherwise.  Use of a term in this document

+should not be regarded as affecting the validity of any trademark or

+service mark.  Naming of particular products or brands should not be

+seen as endorsements.  

+</para> 

+</sect2>

+

+<!-- Give credit where credit is due...very important --> 

+<sect2 id="credits"> <title>Credits / Contributors</title>

+

+<para> Credits are due to </para>

+<itemizedlist> 

+<listitem> 

+<para>Hinne Hettema <email>h.hettema@auckland.ac.nz</email> 

+for creating the xml template I used for this document, for 

+reviewing and make an excellent job with the other HOWTO and

+for his feedback. As you can see a lot of his work has been

+included in this document too. 

+</para> 

+</listitem> 

+<listitem>

+<para>

+The Mono Hackers.

+</para>

+</listitem>

+</itemizedlist> 

+</sect2>

+

+<!-- Feedback --> 

+<sect2 id="feedback"> <title>Feedback</title>

+

+<para> 

+Feedback is most certainly welcome for this document. Send your

+additions, comments and criticisms to the following email address:

+<email>mono-docs-list@ximian.com</email>. I am lurking on this list 

+and will maintain this document as required.  

+</para> 

+</sect2>

+</sect1>

+

+<!-- This is the preamble stuff over with the rest of document follows... --> 

+<sect1 id="installation"> 

+<title> Installing Mono</title>

+

+<sect2 id="obtaining"> 

+<title>Obtaining Mono</title> 

+<para> 

+In order to obtain the required software you just need to visit the

+Mono download page at http://www.go-mono.org/download or any of the

+related sites. 

+</para>

+

+<para>

+You'll be able to complete everything in this document if you just install

+the runtime, but taking a look at the compiler package is well worth the

+effort. The compiler is written in C# and is 'self hosting' which means it

+is able to compile itself. 

+</para>

+

+<para>

+This page also lists the current versions of the software 

+mono depends on. Make sure that your system has all the 

+required versions, otherwise mono won't compile.

+</para>

+

+</sect2>

+

+<sect2 id="easyinstall">

+<title>Installing Mono on Windows, the easy way</title>

+<para>

+       Oh. This is a very easy task now. If you just want to take a look at

+       the possibilities of Mono get the Mono installer from the site of

+       Johannes Roith &lt;johannes\@jroith.de&gt;: 

+</para>

+

+<para>

+       http://www.superin.informativ.net/mono/mono.htm. You can get a link in 

+</para>

+<para>

+       the download section of the Mono site too: http://www.go-mono.org/download

+</para>

+<para>

+       Then you just need a Windows machine. Better use 

+       Windows 2000 Professional. </para>

+<para>

+       Once you've got it, run the installer. 

+</para>

+<para>

+       Remember, building your own Mono runtime and compiler from the sources 

+       is strongly recommended. You won't discover the power of Mono until

+       you get it made this way. If you feel hungry about real programming with

+       Mono, proceed like in the next section.

+</para>

+</sect2>

+

+<sect2 id="hardinstall">

+<title>Building Mono under Windows</title>

+<itemizedlist>

+ <listitem>

+   <para>

+    1.- Get Windows 2000 Professional or any Windows System supporting .NET SDK.

+        Avoid using XP and the redistributable version of the SDK (necessary for 

+        WinME, etc).

+   </para>

+ </listitem>

+

+ <listitem>

+    <para>

+    2.- Get the latest Cygwin distribution, be sure you install the GNU Build Tools 

+        packages. Take the openssh package if you plan to contribute to the project.

+        If you feel insecure about the packages you need to install, install all of

+        them, of course, Text, Admin, Games and Web are not necessary at all and you

+        can pass of those. The fitness of your choice will depend of your knowledge 

+        on Linux and/or Cygwin. If in doubt install all. 

+    </para>

+ </listitem>

+

+ <listitem>

+   <para>

+    3.- Install the .NET SDK.

+   </para>

+ </listitem>

+ <listitem>

+   <para>

+    4.- Install Cygwin.

+   </para>

+  </listitem>

+  <listitem>

+   <para>

+    5.- Get http://www.go-mono.org/mono-build-w32.sh and put it into your home 

+        directory in the cygwin setup.

+   </para>

+  </listitem>

+

+  <listitem>

+    <para>

+    6.- Enter your cygwin environment. If you have an account in the mono cvs, then 

+        export the variables as shown in http://www.go-mono.org/ccvs.html

+    </para>

+

+    <programlisting>

+             This means. Enter: export CVSROOT=user@mono-cvs.ximian.com:/cvs/public

+

+             and export CVS_RSH=ssh

+    </programlisting>

+   <para>

+             If you have no account DO NOTHING.

+   </para>

+  </listitem>

+  <listitem>

+   <para>

+    7.- Enter: 

+    <programlisting>

+	export ACLOCAL_FLAGS="-I /usr/local/share/aclocal" 

+        and this: export PKG_CONFIG_PATH="/usr/local/bin"

+    </programlisting>

+	</para>

+   </listitem>

+   <listitem>

+     <para>

+    8.- Run the script (mono-build-w32.sh) 

+     </para>

+   </listitem>

+   <listitem>

+    <para>

+    9.- All should work fine know and you should see it download what necessary and 

+        build mono.

+    </para>

+</listitem>

+</itemizedlist>

+</sect2>

+

+<sect2 id="errors">

+<title>Troubleshooting</title>

+<para>    

+    If you have noticed problems during step 8 and the execution stops because of 

+    errors as I cannot find that or such library or alike, try to: 

+</para>

+

+<itemizedlist>

+<listitem>

+ <para>

+    1.- Create a directory mono-temp for example. 

+ </para>

+ </listitem>

+

+  <listitem>

+  <para>

+    2.- Move and unzip all the zips the mono-build script downloads to /usr/local 

+        to that new directory. Do it one by one, copying the content of the created 

+        subdirectories (include, bin, etc) to their respectives in /usr/local. Take 

+        care, some libraries like libglib... must go into /usr/local/bin and not 

+        into /usr/local/lib.

+   </para>

+  </listitem>

+

+ <listitem>

+   <para>

+    3.- Jump into the /usr/local/mono directory and run ./autogen.sh

+    </para>

+  </listitem>

+

+   <listitem>

+   <para>

+    4.- Then run ./configure and after it: make and finally: make install.

+   </para>

+  </listitem>

+</itemizedlist>

+</sect2>

+</sect1>

+

+<sect1 id="running">

+<title>Running mono</title>

+<sect2 id="basic">

+<title>Basic steps</title>

+<para>

+To work with mono, you first have to create a C# program. Open up 

+your favourite editor, and type in the following code:

+</para>

+<programlisting>

+using System;

+

+class Hello

+{

+public static void Main(String[] args)

+	{

+	Console.WriteLine("mono:: is alive and well...");

+

+	for (int i = 0; i < args.Length; i++)

+		Console.WriteLine("Argument {0} = {1}", i, args[i]);

+	}

+}

+</programlisting>

+

+<para>

+Save the file as hello.cs. To compile this into a working program, 

+type mcs hello.cs. If you get the following:

+</para>

+<programlisting>

+ mcs hello.cs

+RESULT: 0

+</programlisting>

+<para>

+you know the compile worked fine. If you see some strange error

+messages including the word 'parser' somewhere, you made a mistake in

+your program. Fix this up first.

+</para>

+

+<para>

+You are now ready to execute your first mono program.  To execute 

+the code, type

+</para>

+

+<programlisting>

+ mono hello.exe arg1 arg2 arg 3

+</programlisting>

+<para>

+(where we have given some arguments just for fun) and you'll 

+see the following:

+</para>

+

+<programlisting>

+mono:: is alive and well...

+Argument 0 = arg1

+Argument 1 = arg2

+Argument 2 = arg

+Argument 3 = 3

+RESULT: 0

+</programlisting>

+<para>

+As you can see, mono printed the line "mono:: is alive and well" 

+and printed the list of arguments. This completes the creation 

+and execution of your first mono program.

+</para>

+</sect2>

+

+<sect2 id="interpreter">

+<title>Interpreter</title>

+<para>

+But mono will allow you to do more. First of all, mono is the 

+compiled mono execution environment which uses the Just in 

+Time (JIT) compiler. Mono also comes with an interpreted 

+environment, which can be accessed using the command 'mint' 

+as follows

+</para>

+<programlisting>

+ mint hello.exe arg1 arg 2

+mono:: is alive and well...

+Argument 0 = arg1

+Argument 1 = arg

+Argument 2 = 2

+</programlisting>

+<para>

+As you can see, it makes no difference to mono output which 

+environment you use, but what happens under the hood is very 

+different. If you use 'mono' as the command line tool, you 

+call the 'production' execution environment which will read 

+your portable executable (PE) file, and call the just in 

+time (JIT) compiler to compile the PE code down to machine 

+level code (in my case, an x86 architecture) after which 

+it is executed.

+</para>

+<para>

+If you use mint, the JIT is not used, and the PE code is 

+interpreted into x86 instructions for execution. In fact, 

+for our simple 'hello' mint is slightly faster. The point 

+is that the JIT compiler will take some time to compile the 

+code of our program and store it in some location in memory, 

+but the subsequent execution of the code is faster with mono.

+</para>

+

+<para>

+After this simple run of mono, it is time to play with some options. 

+I won't cover these in detail since there are quite a few, and also because

+I assume you downloaded mono to hack it around in the first place. So

+I'll leave some pointers.

+</para>

+

+

+<sect3 id="debugging">

+<title>Debugging</title>

+<para>

+Mono supports a debugging option when you specify the "-d" flag while running

+the runtime. Utilising this flag will get you a significant amount of output,

+and it may be an idea to specify an output file as well. The interesting aspect

+of this file is that it allows you to see to some extent (quite precisely,

+actually) what the JIT compiler is up to.

+</para>

+</sect3>

+

+<sect3 id="statistics">

+<title>Statistics</title>

+<para>

+It is also possible to collect some runtime statistics on your program. These

+will give you some idea of the resource utilisation of your program.

+</para>

+<programlisting>

+ mono --stats hello.exe

+mono:: is alive and well...

+RESULT: 0

+Mono Jit statistics

+Compiled methods:       58

+Methods cache lookup:   15

+Method trampolines:     698

+Basic blocks:           188

+Max basic blocks:       15

+Allocated vars:         238

+Analyze stack repeat:   61

+Compiled CIL code size: 2450

+Native code size:       10167

+Max code size ratio:    7.13 (FileStream::FlushBuffer)

+Biggest method:         1016 (StreamWriter::Write)

+Code reallocs:          27

+Allocated code size:    22073

+Inlineable methods:     17

+Inlined methods:        22

+

+Created object count:   18

+Initialized classes:    127

+Used classes:           37

+Static data size:       288

+VTable data size:       8292

+</programlisting>

+</sect3>

+

+</sect2>

+

+<sect2 id="ILAsm_code" >

+<title>Inspecting IL Assembly code</title>

+<para>

+Mono also provides a small tool that will let you disassemble 

+the executable (.exe) file so you can have a peek 

+under the hood. This tool is monodis, and is run as 

+follows:

+

+</para>

+<programlisting>

+ monodis hello.exe

+.assembly extern mscorlib

+{

+  .ver 0:0:0:0

+}

+.assembly 'hello'

+{

+  .hash algorithm 0x00008004

+  .ver  0:0:0:0

+}

+  .class private auto ansi beforefieldinit Hello

+        extends [mscorlib]System.Object

+  {

+

+    // method line 1

+    .method public hidebysig  specialname  rtspecialname

+           instance default void .ctor()  cil managed

+    {

+        // Method begins at RVA 0x20ec

+        // Code size 7 (0x7)

+        .maxstack 8

+        IL_0000: ldarg.0

+        IL_0001: call instance void System.Object::.ctor()

+        IL_0006: ret

+    } // end of method instance default void .ctor()

+

+    // method line 2

+    .method public static

+           default void Main(string[] args)  cil managed

+    {

+        // Method begins at RVA 0x20f4

+        .entrypoint

+        // Code size 56 (0x38)

+        .maxstack 5

+        .locals init (

+                int32   V_0,

+                int32   V_1)

+        IL_0000: ldstr "mono:: is alive and well..."

+        IL_0005: call void System.Console::WriteLine(string)

+        IL_000a: ldc.i4.0

+        IL_000b: stloc.0

+        IL_000c: ldloc.0

+        IL_000d: ldarg.s 0

+        IL_000f: ldlen

+        IL_0010: clt

+        IL_0012: brfalse IL_0037

+

+        IL_0017: ldstr "Argument {0} = {1}"

+        IL_001c: ldloc.0

+        IL_001d: box [mscorlib]System.Int32

+        IL_0022: ldarg.s 0

+        IL_0024: ldloc.0

+        IL_0025: ldelem.ref

+        IL_0026: call void System.Console::WriteLine(string, object, object)

+        IL_002b: nop

+        IL_002c: ldloc.0

+        IL_002d: ldc.i4.1

+        IL_002e: add

+        IL_002f: stloc.1

+        IL_0030: ldloc.1

+        IL_0031: stloc.0

+        IL_0032: br IL_000c

+

+        IL_0037: ret

+    } // end of method default void Main(string[] args)

+

+  } // end of type Hello

+

+

+</programlisting>

+<para>

+This is the listing of the code of your program in a language 

+called IL assembly, or Common Intermediate Language (CIL). The 

+CIL provides the portability of the mono platform, and ensures 

+that code compiled with Microsoft's .NET framework will work 

+on mono and vice versa. 

+</para>

+</sect2>

+

+<sect2 id="man_pages">

+<title>Man pages</title>

+

+<para>

+Mono has man pages already installed, and generally, typing <command>

+man</command> before the command you wish to execute should help in 

+getting a list of the options. In many cases, it's still up to you

+to figure out what they do.

+</para>

+

+</sect2>

+

+

+</sect1>

+

+

+<sect1 id="problems">

+<title>Problems</title>

+<para> 

+With mono being as new as it is, it is likely that you will have some

+problems with installation. The following are some ideas to help you

+out in a bind:

+</para>

+

+<orderedlist>

+<listitem>

+<para> 

+See the Ximian Bugzilla page to find out if there is a bug

+report about your specific issue.

+</para>

+</listitem>

+

+<listitem>

+<para>Read this document.  If it does not solve your problem, we want to

+know about it. Please send a message to the email address listed for

+feedback at the beginning of the document.</para>

+</listitem>

+

+<listitem>

+

+<para> 

+Visit the mono mailing lists' archives and do a little

+research in there for threads talking about the problem you have.

+</para>

+</listitem>

+

+<listitem>

+<para> 

+If you still cannot correct the problem, send a message to the

+mono list. When you do this, please be as precise as possible--i.e.

+mention the system you are running, the version of mono that you have the 

+problem with, and give any error codes and other output that might appear.

+</para>

+</listitem>

+</orderedlist>

+

+</sect1>

+

+

+<!-- Legal Sections --> <sect1 id="copyright">

+ <title>Copyright and License</title>

+

+ <!-- The LDP recommends, but doesn't require, the GFDL --> <para>

+     This document, <emphasis>Running mono</emphasis>, is copyrighted

+     (c) 2002 by <emphasis>Hinne Hettema</emphasis> and

+     <emphasis>Jaime Anguiano Olarra</emphasis>.  Permission is

+     granted to copy, distribute and/or modify this document under the

+     terms of the GNU Free Documentation License, Version 1.1 or any later

+     version published by the Free Software Foundation; with no Invariant

+     Sections, with no Front-Cover Texts, and with no Back-Cover Texts.

+     A copy of the license is included in the section entitled "GNU Free

+     Documentation License".

+ </para>

+

+<sect2 id="gfdl"> <title>GNU Free Documentation License</title> 

+<!-- GNU Project - Free Software Foundation (FSF) -->

+

+<para>Version 1.1, March 2000</para>

+

+<blockquote> <para>Copyright (C) 2000  Free Software Foundation, Inc.

+59 Temple Place, Suite 330, Boston, MA	02111-1307  USA Everyone is

+permitted to copy and distribute verbatim copies of this license document,

+but changing it is not allowed.</para> </blockquote>

+

+<sect3 id="gfdl-0"> <title>PREAMBLE</title>

+

+<para>The purpose of this License is to make a manual, textbook,

+    or other written document "free" in the sense of freedom: to assure

+    everyone the effective freedom to copy and redistribute it, with

+    or without modifying it, either commercially or noncommercially.

+    Secondarily, this License preserves for the author and publisher

+    a way to get credit for their work, while not being considered

+    responsible for modifications made by others.</para>

+

+<para>This License is a kind of "copyleft", which means that

+    derivative works of the document must themselves be free in the

+    same sense.  It complements the GNU General Public License, which

+    is a copyleft license designed for free software.</para>

+

+<para>We have designed this License in order to use it for manuals

+    for free software, because free software needs free documentation:

+    a free program should come with manuals providing the same freedoms

+    that the software does.  But this License is not limited to software

+    manuals; it can be used for any textual work, regardless of subject

+    matter or whether it is published as a printed book.  We recommend

+    this License principally for works whose purpose is instruction

+    or reference.</para>

+</sect3>

+

+<sect3 id="gfdl-1"> <title>APPLICABILITY AND DEFINITIONS</title>

+

+<para>This License applies to any manual or other work that

+    contains a notice placed by the copyright holder saying it can be

+    distributed under the terms of this License.  The "Document", below,

+    refers to any such manual or work.	Any member of the public is a

+    licensee, and is addressed as "you".</para>

+

+<para>A "Modified Version" of the Document means any work

+    containing the Document or a portion of it, either copied verbatim,

+    or with modifications and/or translated into another language.</para>

+

+<para>A "Secondary Section" is a named appendix or a front-matter

+    section of the Document that deals exclusively with the relationship

+    of the publishers or authors of the Document to the Document's overall

+    subject (or to related matters) and contains nothing that could fall

+    directly within that overall subject.  (For example, if the Document

+    is in part a textbook of mathematics, a Secondary Section may not

+    explain any mathematics.)  The relationship could be a matter of

+    historical connection with the subject or with related matters, or

+    of legal, commercial, philosophical, ethical or political position

+    regarding them.</para>

+

+<para>The "Invariant Sections" are certain Secondary Sections

+    whose titles are designated, as being those of Invariant Sections,

+    in the notice that says that the Document is released under this

+    License.</para>

+

+<para>The "Cover Texts" are certain short passages of text that

+    are listed, as Front-Cover Texts or Back-Cover Texts, in the notice

+    that says that the Document is released under this License.</para>

+

+<para>A "Transparent" copy of the Document means a

+    machine-readable copy, represented in a format whose specification

+    is available to the general public, whose contents can be viewed and

+    edited directly and straightforwardly with generic text editors

+    or (for images composed of pixels) generic paint programs or

+    (for drawings) some widely available drawing editor, and that is

+    suitable for input to text formatters or for automatic translation

+    to a variety of formats suitable for input to text formatters.

+    A copy made in an otherwise Transparent file format whose markup

+    has been designed to thwart or discourage subsequent modification

+    by readers is not Transparent.  A copy that is not "Transparent"

+    is called "Opaque".</para>

+

+<para>Examples of suitable formats for Transparent copies include

+    plain ASCII without markup, Texinfo input format, LaTeX input format,

+    SGML or XML using a publicly available DTD, and standard-conforming

+    simple HTML designed for human modification.  Opaque formats include

+    PostScript, PDF, proprietary formats that can be read and edited

+    only by proprietary word processors, SGML or XML for which the

+    DTD and/or processing tools are not generally available, and the

+    machine-generated HTML produced by some word processors for output

+    purposes only.</para>

+

+<para>The "Title Page" means, for a printed book, the title page

+    itself, plus such following pages as are needed to hold, legibly,

+    the material this License requires to appear in the title page.

+    For works in formats which do not have any title page as such,

+    "Title Page" means the text near the most prominent appearance of the

+    work's title, preceding the beginning of the body of the text.</para>

+</sect3>

+

+<sect3 id="gfdl-2"> <title>VERBATIM COPYING</title>

+

+<para>You may copy and distribute the Document in any medium,

+    either commercially or noncommercially, provided that this License,

+    the copyright notices, and the license notice saying this License

+    applies to the Document are reproduced in all copies, and that

+    you add no other conditions whatsoever to those of this License.

+    You may not use technical measures to obstruct or control the

+    reading or further copying of the copies you make or distribute.

+    However, you may accept compensation in exchange for copies.  If you

+    distribute a large enough number of copies you must also follow the

+    conditions in section 3.</para>

+

+<para>You may also lend copies, under the same conditions stated

+    above, and you may publicly display copies.</para>

+</sect3>

+

+<sect3 id="gfdl-3"> <title>COPYING IN QUANTITY</title>

+

+<para>If you publish printed copies of the Document numbering more

+    than 100, and the Document's license notice requires Cover Texts, you

+    must enclose the copies in covers that carry, clearly and legibly,

+    all these Cover Texts: Front-Cover Texts on the front cover, and

+    Back-Cover Texts on the back cover.  Both covers must also clearly

+    and legibly identify you as the publisher of these copies.	The front

+    cover must present the full title with all words of the title equally

+    prominent and visible.  You may add other material on the covers

+    in addition.  Copying with changes limited to the covers, as long as

+    they preserve the title of the Document and satisfy these conditions,

+    can be treated as verbatim copying in other respects.</para>

+

+<para>If the required texts for either cover are too voluminous to

+    fit legibly, you should put the first ones listed (as many as fit

+    reasonably) on the actual cover, and continue the rest onto adjacent

+    pages.</para>

+

+<para>If you publish or distribute Opaque copies of the Document

+    numbering more than 100, you must either include a machine-readable

+    Transparent copy along with each Opaque copy, or state in or with each

+    Opaque copy a publicly-accessible computer-network location containing

+    a complete Transparent copy of the Document, free of added material,

+    which the general network-using public has access to download

+    anonymously at no charge using public-standard network protocols.

+    If you use the latter option, you must take reasonably prudent steps,

+    when you begin distribution of Opaque copies in quantity, to ensure

+    that this Transparent copy will remain thus accessible at the stated

+    location until at least one year after the last time you distribute

+    an Opaque copy (directly or through your agents or retailers) of

+    that edition to the public.</para>

+

+<para>It is requested, but not required, that you contact the

+    authors of the Document well before redistributing any large number

+    of copies, to give them a chance to provide you with an updated

+    version of the Document.</para>

+</sect3>

+

+<sect3 id="gfdl-4"> <title>MODIFICATIONS</title>

+

+<para>You may copy and distribute a Modified Version of the

+    Document under the conditions of sections 2 and 3 above, provided

+    that you release the Modified Version under precisely this License,

+    with the Modified Version filling the role of the Document, thus

+    licensing distribution and modification of the Modified Version

+    to whoever possesses a copy of it.	In addition, you must do these

+    things in the Modified Version:</para>

+

+<orderedlist numeration="upperalpha"> <listitem><para>Use in the

+Title Page

+      (and on the covers, if any) a title distinct from that of the

+      Document, and from those of previous versions (which should, if

+      there were any, be listed in the History section of the Document).

+      You may use the same title as a previous version if the original

+      publisher of that version gives permission.</para>

+</listitem>

+

+<listitem><para>List on the Title Page,

+      as authors, one or more persons or entities responsible for

+      authorship of the modifications in the Modified Version, together

+      with at least five of the principal authors of the Document (all

+      of its principal authors, if it has less than five).</para>

+</listitem>

+

+<listitem><para>State on the Title page

+      the name of the publisher of the Modified Version, as the

+      publisher.</para>

+</listitem>

+

+<listitem><para>Preserve all the

+      copyright notices of the Document.</para>

+</listitem>

+

+<listitem><para>Add an appropriate

+      copyright notice for your modifications adjacent to the other

+      copyright notices.</para>

+</listitem>

+

+<listitem><para>Include, immediately

+      after the copyright notices, a license notice giving the public

+      permission to use the Modified Version under the terms of this

+      License, in the form shown in the Addendum below.</para>

+</listitem>

+

+<listitem><para>Preserve in that license

+      notice the full lists of Invariant Sections and required Cover

+      Texts given in the Document's license notice.</para>

+</listitem>

+

+<listitem><para>Include an unaltered

+      copy of this License.</para>

+</listitem>

+

+<listitem><para>Preserve the section

+      entitled "History", and its title, and add to it an item stating at

+      least the title, year, new authors, and publisher of the Modified

+      Version as given on the Title Page.  If there is no section entitled

+      "History" in the Document, create one stating the title, year,

+      authors, and publisher of the Document as given on its Title Page,

+      then add an item describing the Modified Version as stated in the

+      previous sentence.</para>

+</listitem>

+

+<listitem><para>Preserve the network

+      location, if any, given in the Document for public access to

+      a Transparent copy of the Document, and likewise the network

+      locations given in the Document for previous versions it was

+      based on.  These may be placed in the "History" section.	You may

+      omit a network location for a work that was published at least four

+      years before the Document itself, or if the original publisher of

+      the version it refers to gives permission.</para>

+</listitem>

+

+<listitem><para>In any section entitled

+      "Acknowledgements" or "Dedications", preserve the section's title,

+      and preserve in the section all the substance and tone of each

+      of the contributor acknowledgements and/or dedications given

+      therein.</para>

+</listitem>

+

+<listitem><para>Preserve all the

+      Invariant Sections of the Document, unaltered in their text and in

+      their titles.  Section numbers or the equivalent are not considered

+      part of the section titles.</para>

+</listitem>

+

+<listitem><para>Delete any section

+      entitled "Endorsements".	Such a section may not be included in

+      the Modified Version.</para>

+</listitem>

+

+<listitem><para>Do not retitle any

+      existing section as "Endorsements" or to conflict in title with

+      any Invariant Section.</para>

+</listitem> </orderedlist> <para>If the Modified Version includes new

+front-matter sections

+    or appendices that qualify as Secondary Sections and contain no

+    material copied from the Document, you may at your option designate

+    some or all of these sections as invariant.  To do this, add their

+    titles to the list of Invariant Sections in the Modified Version's

+    license notice.  These titles must be distinct from any other section

+    titles.</para>

+

+<para>You may add a section entitled "Endorsements", provided it

+    contains nothing but endorsements of your Modified Version by various

+    parties--for example, statements of peer review or that the text has

+    been approved by an organization as the authoritative definition of

+    a standard.</para>

+

+<para>You may add a passage of up to five words as a Front-Cover

+    Text, and a passage of up to 25 words as a Back-Cover Text, to the end

+    of the list of Cover Texts in the Modified Version.  Only one passage

+    of Front-Cover Text and one of Back-Cover Text may be added by (or

+    through arrangements made by) any one entity.  If the Document already

+    includes a cover text for the same cover, previously added by you or

+    by arrangement made by the same entity you are acting on behalf of,

+    you may not add another; but you may replace the old one, on explicit

+    permission from the previous publisher that added the old one.</para>

+

+<para>The author(s) and publisher(s) of the Document do not by

+    this License give permission to use their names for publicity for

+    or to assert or imply endorsement of any Modified Version.</para>

+</sect3>

+

+<sect3 id="gfdl-5"> <title>COMBINING DOCUMENTS</title>

+

+<para>You may combine the Document with other documents released

+    under this License, under the terms defined in section 4 above for

+    modified versions, provided that you include in the combination all of

+    the Invariant Sections of all of the original documents, unmodified,

+    and list them all as Invariant Sections of your combined work in

+    its license notice.</para>

+

+<para>The combined work need only contain one copy of this

+    License, and multiple identical Invariant Sections may be replaced

+    with a single copy.  If there are multiple Invariant Sections with

+    the same name but different contents, make the title of each such

+    section unique by adding at the end of it, in parentheses, the

+    name of the original author or publisher of that section if known,

+    or else a unique number.  Make the same adjustment to the section

+    titles in the list of Invariant Sections in the license notice of

+    the combined work.</para>

+

+<para>In the combination, you must combine any sections entitled

+    "History" in the various original documents, forming one section

+    entitled "History"; likewise combine any sections entitled

+    "Acknowledgements", and any sections entitled "Dedications".

+    You must delete all sections entitled "Endorsements."</para>

+</sect3>

+

+<sect3 id="gfdl-6"> <title>COLLECTIONS OF DOCUMENTS</title>

+

+<para>You may make a collection consisting of the Document and

+    other documents released under this License, and replace the

+    individual copies of this License in the various documents with a

+    single copy that is included in the collection, provided that you

+    follow the rules of this License for verbatim copying of each of

+    the documents in all other respects.</para>

+

+<para>You may extract a single document from such a collection,

+    and distribute it individually under this License, provided you

+    insert a copy of this License into the extracted document, and follow

+    this License in all other respects regarding verbatim copying of

+    that document.</para>

+</sect3>

+

+<sect3 id="gfdl-7"> <title>AGGREGATION WITH INDEPENDENT WORKS</title>

+<para>A compilation of the Document or its derivatives with other

+    separate and independent documents or works, in or on a volume

+    of a storage or distribution medium, does not as a whole count

+    as a Modified Version of the Document, provided no compilation

+    copyright is claimed for the compilation.  Such a compilation is

+    called an "aggregate", and this License does not apply to the other

+    self-contained works thus compiled with the Document, on account

+    of their being thus compiled, if they are not themselves derivative

+    works of the Document.</para>

+

+<para>If the Cover Text requirement of section 3 is applicable to

+    these copies of the Document, then if the Document is less than

+    one quarter of the entire aggregate, the Document's Cover Texts

+    may be placed on covers that surround only the Document within

+    the aggregate.  Otherwise they must appear on covers around the

+    whole aggregate.</para>

+</sect3>

+

+<sect3 id="gfdl-8"> <title>TRANSLATION</title>

+

+<para>Translation is considered a kind of modification, so you may

+    distribute translations of the Document under the terms of section 4.

+    Replacing Invariant Sections with translations requires special

+    permission from their copyright holders, but you may include

+    translations of some or all Invariant Sections in addition to the

+    original versions of these Invariant Sections.  You may include

+    a translation of this License provided that you also include the

+    original English version of this License.  In case of a disagreement

+    between the translation and the original English version of this

+    License, the original English version will prevail.</para>

+</sect3>

+

+<sect3 id="gfdl-9"> <title>TERMINATION</title> <para>You may not copy,

+modify, sublicense, or distribute the

+    Document except as expressly provided for under this License.

+    Any other attempt to copy, modify, sublicense or distribute the

+    Document is void, and will automatically terminate your rights under

+    this License.  However, parties who have received copies, or rights,

+    from you under this License will not have their licenses terminated

+    so long as such parties remain in full compliance.</para>

+</sect3>

+

+<sect3 id="gfdl-10"> <title>FUTURE REVISIONS OF THIS LICENSE</title>

+

+<para>The Free Software Foundation may publish new, revised

+    versions of the GNU Free Documentation License from

+    time to time.  Such new versions will be similar

+    in spirit to the present version, but may differ in

+    detail to address new problems or concerns.  See <ulink

+    url="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</ulink>.</para>

+

+<para>Each version of the License is given a distinguishing

+    version number.  If the Document specifies that a particular

+    numbered version of this License "or any later version" applies

+    to it, you have the option of following the terms and conditions

+    either of that specified version or of any later version that has

+    been published (not as a draft) by the Free Software Foundation.

+    If the Document does not specify a version number of this License,

+    you may choose any version ever published (not as a draft) by the

+    Free Software Foundation.</para>

+</sect3>

+

+<sect3 id="gfdl-11"> <title>How to use this License for your

+documents</title>

+

+<para>To use this License in a document you have written, include

+    a copy of the License in the document and put the following copyright

+    and license notices just after the title page:</para>

+

+<blockquote><para> Copyright (c)  YEAR	YOUR NAME.

+      Permission is granted to copy, distribute and/or modify this

+      document under the terms of the GNU Free Documentation License,

+      Version 1.1 or any later version published by the Free Software

+      Foundation; with the Invariant Sections being LIST THEIR TITLES,

+      with the Front-Cover Texts being LIST, and with the Back-Cover

+      Texts being LIST.  A copy of the license is included in the section

+      entitled "GNU Free Documentation License".

+</para></blockquote>

+

+<para>If you have no Invariant Sections, write "with no Invariant

+    Sections" instead of saying which ones are invariant.  If you

+    have no Front-Cover Texts, write "no Front-Cover Texts" instead of

+    "Front-Cover Texts being LIST"; likewise for Back-Cover Texts.</para>

+

+<para>If your document contains nontrivial examples of program

+    code, we recommend releasing these examples in parallel under your

+    choice of free software license, such as the GNU General Public

+    License, to permit their use in free software.</para>

+</sect3> </sect2> </sect1>

+

+</article>

+

+

+

+

+<!-- This document is dedicated to all my friends and to the Mono hackers.

+ 

+        License

+

+Here goes the GFDL, GNU Free Documentation License. -->

+

diff --git a/web/mono-beginning.xml b/web/mono-beginning.xml
new file mode 100644
index 00000000000..6ab1019c225
--- /dev/null
+++ b/web/mono-beginning.xml
@@ -0,0 +1,1294 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" []>
+<article>
+
+  <articleinfo>
+
+    <!-- Use "HOWTO", "mini HOWTO", "FAQ" in title, if appropriate -->
+    <title>Running Mono</title>
+
+
+    <author>
+       <firstname>Hinne</firstname>
+       <surname>Hettema</surname>
+       <affiliation>
+          <address><email>h.hettema@auckland.ac.nz</email></address>
+       </affiliation>
+     </author>
+    <author>
+       <firstname>Jaime</firstname>
+       <surname>Anguiano Olarra</surname>
+       <affiliation>
+          <address><email>jaime@genuara.ugr.es</email></address>
+       </affiliation>
+     </author>
+
+     <pubdate>2002-06</pubdate>
+
+     <!-- Most recent revision goes at the top; list in descending order -->
+     <!-- All dates specified in ISO "YYYY-MM-DD" format -->
+     <revhistory>
+       <revision>
+          <revnumber>0.1</revnumber>
+          <date>2002-06-20</date>
+          <authorinitials>HH</authorinitials>
+          <revremark>First release</revremark>
+       </revision>
+     </revhistory>
+
+     <!-- Provide a good abstract; a couple of sentences is sufficient -->
+     <abstract>
+        <para>
+	This document describes how to install mono on your Linux system 
+	from the source and describes some simple experiments you can
+	perform with this installation.
+	</para>
+     </abstract>
+
+  </articleinfo>
+
+
+<sect1 id="intro">
+<title>Introduction</title>
+
+<para>
+Mono is an open source implementation of the Common Language Infrastructure
+(CLI) specified in ECMA standard 335. It comes with a C# compiler and
+provides an extensible platform to develop and run applications that
+are interoperable with Microsoft .NET.
+</para>
+
+<para>
+Mono is not finished--it is a project still under development. As a
+result, installation and configuration may not be as smooth as you
+will be used to from other Linux applications. Nevertheless, mono is
+in a state that will allow you to get it up and running and gain
+experience with it--which is, I would suggest, a very smart thing to do.
+</para>
+
+<para>
+This document is limited in the following sense: it describes how to
+download a 'stable' version of mono as a 'tarball' and get it to run on
+your computer. I'm also assuming you run mono on Linux rather than
+on Windows. All the examples have been tested on a 'vanilla' Red Hat 7.3 
+installation.
+</para>
+
+<para>
+There are two items this document will <emphasis>not 
+</emphasis> cover: the first is how to self host the mcs compiler 
+under linux and the second is the graphical user environment 
+which is implemented as GTK#. These two interesting topics 
+are the subject of two more howto's that I'm planning.
+</para>
+
+<para>
+This document is also less useful for two types of people.
+</para> 
+<itemizedlist> 
+<listitem> 
+<para> 
+If you are a very inexperienced linux user and want to know what mono is
+all about, there is an easier way to install mono. Go to mono.baselabs.org
+and download the rpm's ready for installation on your system. This site also
+runs a tutorial that is worth reading.
+</para> 
+</listitem> 
+<listitem> 
+<para> 
+If you are a very experienced user wanting to contribute to the mono code,
+you should probably regularly do a CVS download. At the moment, the mono
+code grows very fast, and the 'stable' releases still appear too slowly.
+</para>
+</listitem>
+
+</itemizedlist>
+
+<para>
+This document is aimed at the mono beginner, and aims to present a complete
+view of a minimal installation, which will allow you to experiment with
+mono to some degree. It also describes some of those experiments. We
+expect that after reading this document you'll go on to do either of
+two things:
+</para>
+<orderedlist>
+<listitem>
+<para>
+Continue to contribute to the mono project in some shape or form. The
+website has some ideas and suggestions under the heading 'Contributing'.
+</para>
+</listitem>
+<listitem>
+<para>
+Continue to write applications that run in mono. 
+</para>
+</listitem>
+</orderedlist>
+
+<para>
+We hope this document will be useful to you in your first steps with mono.
+Happy hacking!
+</para>
+
+<sect2 id="note">
+<title>A note on the development of this document</title>
+<para>
+This document is expected to grow into a full 'running mono howto' over time.
+As of yet, it does not really discuss some of the excellent efforts of others
+to package mono into an rpm or deb and prepare it for easy installation.
+It is our aim to include this in future versions of this document.
+</para>
+</sect2>
+
+<sect2 id="prerequisites">
+<title>Prerequisites</title>
+<para>
+This document assumes you are somewhat familiar with the architecture
+of the Common Language Infrastructure and the C# programming language.
+</para>
+
+<para>
+To compile mono on your system, you will also have to satisfy 
+some dependencies on other software. A list of these are given 
+on the mono download page. Read through this list to see if 
+you've got all components. 
+</para>
+
+<para>
+On a practical note, I had no dependency issues with the 
+installation of mono 0.12 on a 'standard issue' Red Hat 7.3 build.
+</para>
+
+</sect2>
+
+<sect2 id="disclaimer"> <title>Disclaimer</title>
+
+<para> 
+No liability for the contents of this document can be accepted.
+Use the concepts, examples and information at your own risk.  There may
+be errors and inaccuracies, that could be damaging to your system.
+Proceed with caution, and although this is highly unlikely, the author(s)
+do not take any responsibility.  
+</para>
+
+<para> 
+All copyrights are held by their by their respective owners,
+unless specifically noted otherwise.  Use of a term in this document
+should not be regarded as affecting the validity of any trademark or
+service mark.  Naming of particular products or brands should not be
+seen as endorsements.  
+</para> 
+</sect2>
+
+<!-- Give credit where credit is due...very important --> <sect2
+id="credits"> <title>Credits / Contributors</title>
+
+<para> This document was originally created by Jaime Anguiano Olarra,
+but has been extensively rewritten. Credits are due to </para>
+<itemizedlist> 
+<listitem> 
+<para>Jaime Anguiano Olarra <email>jaime@geneura.ugr.es</email> 
+for creating the original version of this document, and in fact 
+the document that got me through installing mono for the first time.
+</para> 
+</listitem> 
+<listitem>
+<para>
+My partner Margaret for support on my more exotic ventures.
+</para>
+</listitem>
+</itemizedlist> 
+</sect2>
+
+<!-- Feedback --> 
+<sect2 id="feedback"> <title>Feedback</title>
+
+<para> 
+Feedback is most certainly welcome for this document. Send your
+additions, comments and criticisms to the following email address:
+<email>mono-docs-list@ximian.com</email>. I am lurking on this list 
+and will maintain this document as required.  
+</para> 
+</sect2>
+</sect1>
+
+<!-- This is the preamble stuff over with the rest of document
+follows... --> 
+<sect1 id="installation"> 
+<title> Installing Mono</title>
+
+<sect2 id="obtaining"> 
+<title>Obtaining Mono</title> 
+<para> 
+There are several ways to get Mono running on your computer. This
+document will discuss only one of those: downloading the source tarball
+and utilising the make utilities to get mono up and running.  There is
+only one mono package to worry about if you are just after a 'base' install
+of mono: the mono runtime. This package, found under the name "mono-x.xx"
+has got a compiled version of the compiler built in.
+</para>
+
+<para>
+You'll be able to complete everything in this document if you just install
+the runtime, but taking a look at the compiler package is well worth the
+effort. The compiler is written in C# and is 'self hosting' which means it
+is able to compile itself. 
+</para>
+
+<para>
+As of this moment, it is my understanding that there are still some issues
+with the 'self hosting' bit of the compiler on linux, although this is 
+expected to work in later versions of mono. If you are just interested in
+finding out how mono will work under linux, I would not worry about the
+self-hosting bit for now. The self-hosting of the compiler will be the
+topic of a future howto.
+</para>
+
+<para> 
+See <ulink url="http://www.go-mono.com/download">the mono download
+site</ulink> for the source of the tarballs.  
+</para>
+
+<para>
+This page also lists the current versions of the software 
+mono depends on. Make sure that your system has all the 
+required versions, otherwise mono won't compile.
+</para>
+
+<para>
+At a minimum for mono 0.12, you'll need to:
+</para>
+
+<itemizedlist>
+<listitem>
+<para>
+download and install
+<ulink url="http//www.freedesktop.org/software/pkgconfig">
+pkg-config</ulink>.
+</para>
+</listitem>
+<listitem>
+<para>
+download and install
+<ulink url="ftp://ftp.gtk.org/pub/gtk/v1.3/glib-1.3.12.tar.gz">
+glib 1.3</ulink>.
+</para>
+</listitem>
+</itemizedlist>
+
+<para> 
+Installing the tarballs is done via GNU autoconf and
+automake. The general upshot of running autoconf and automake is that you
+can type <command>./configure</command> and then <command> make</command>
+to do the build.  
+Typing <command>make install</command> completes the installation of mono
+on your system.
+</para>
+
+<para>
+To build the mono runtime package, unzip the tarball to some useful
+location.  I tend to use <command>/usr/src</command> as the location,
+but you could really do it anywhere. For the install process, it is
+also a good idea to be 'root'.  The installation process will shuttle
+some executables into <command>/usr/local/bin</command> (more about
+that later).
+</para>
+
+<para>
+Unzipping the tarballs will have created two directories in <command>
+/usr/src/</command>, one called something like mono-x.xx and the other 
+mcs-x.xx. The one called 'mono' is the runtime environment, and this contains
+all that is initially needed to run mono and investigate its inner workings.
+</para>
+
+<para>
+To start building the mono runtime, first type <command>./configure</command>.
+You will see an output like this:
+</para>
+<programlisting>
+[root@taurus mono-0.12]# ./configure
+loading cache ./config.cache
+checking host system type... i686-pc-linux-gnu
+checking target system type... i686-pc-linux-gnu
+checking build system type... i686-pc-linux-gnu
+checking for a BSD compatible install... (cached) /usr/bin/install -c
+checking whether build environment is sane... yes
+checking whether make sets ${MAKE}... (cached) yes
+checking for working aclocal... found
+
+
+snip ....
+
+
+checking BASE_DEPENDENCIES_CFLAGS...  -I/usr/include/glib-2.0 -I/usr/lib/glib-2.0/include
+checking BASE_DEPENDENCIES_LIBS...  -lglib-2.0
+checking for GC_malloc in -lgc... (cached) no
+configure: warning: Compiling mono without GC.
+checking if off_t is 64 bits wide... no
+checking if _FILE_OFFSET_BITS=64 gives 64 bit off_t... ok
+
+snip ...
+
+creating Makefile
+creating mono/Makefile
+creating mono/utils/Makefile
+creating mono/metadata/Makefile
+creating mono/dis/Makefile
+creating mono/cil/Makefile
+creating mono/arch/Makefile
+creating mono/os/Makefile
+creating mono/os/win32/Makefile
+creating mono/os/unix/Makefile
+creating mono/arch/x86/Makefile
+creating mono/arch/ppc/Makefile
+creating mono/arch/sparc/Makefile
+creating mono/arch/arm/Makefile
+creating mono/interpreter/Makefile
+creating mono/tests/Makefile
+creating mono/benchmark/Makefile
+creating mono/monoburg/Makefile
+creating mono/monograph/Makefile
+creating mono/jit/Makefile
+creating mono/io-layer/Makefile
+creating mono/handles/Makefile
+creating runtime/Makefile
+creating scripts/Makefile
+creating man/Makefile
+creating doc/Makefile
+creating docs/Makefile
+creating config.h
+config.h is unchanged
+
+
+        GC:     auto
+
+
+[root@taurus mono-0.12]#
+</programlisting>
+
+
+<para>
+This means that the configure script has now created all the 
+makefiles necessary to complete the build on your system. 
+Note the "GC: auto" at the end of the list of commands. 
+GC stands for "garbage collection" and it
+will be addressed in a later section of this document.
+</para>
+<para>
+You are now ready to start the mono "build" process. To kick 
+this off, you can type <command>make</command> at the 
+command prompt. You'll see something like this:
+</para>
+
+<programlisting>
+[root@taurus mono-0.12]# make
+make  all-recursive
+make[1]: Entering directory `/usr/src/mono-0.12'
+Making all in mono
+make[2]: Entering directory `/usr/src/mono-0.12/mono'
+Making all in utils
+make[3]: Entering directory `/usr/src/mono-0.12/mono/utils'
+gcc -DHAVE_CONFIG_H -I. -I. -I../.. -I/usr/include/glib-2.0 
+-I/usr/lib/glib-2.0/include   -I/usr/include/glib-2.0 
+-I/usr/lib/glib-2.0/include   -I../.. -I../../mono   
+-D_FILE_OFFSET_BITS=64 -D_GNU_SOURCE   -g -Wall 
+-Wunused -Wmissing-prototypes -Wmissing-declarations 
+-Wstrict-prototypes  -Wmissing-prototypes -Wnested-externs 
+-Wpointer-arith -Wno-cast-qual -Wcast-align -Wwrite-strings 
+-c mono-hash.c
+
+</programlisting>
+<para>
+and this will continue for a while. On my 1 GHz Duron with 256 MB of RAM the 
+total build process takes about three minutes. All the terrible flags after gcc
+have essentially been set by the configure script and there is no need to worry
+about these.
+</para>
+<para>
+To finally install mono, you can type <command>make install</command> 
+to get a working version of mono. This command will copy the 
+scripts that run the executables to a place where the operating system
+will be ale to find them. This location is <command>/usr/local/bin</command>
+on my system. 
+</para>
+
+</sect2>
+
+<sect2 id="garbage_collection">
+<title> Garbage Collection</title>
+<para>
+To make the mint interpreter work with garbage collection, you first need to
+install a garbage collection package on your system. Mono works with
+Boehm Garbage collection, which is found at 
+<ulink url="http://www.hpl.hp.com/personal/Hans_Boehm/gc/">
+http://www.hpl.hp.com/personal/Hans_Boehm/gc/
+</ulink>.
+</para>
+
+<para>
+To get garbage collection to work, I downloaded the source tarball 
+into <command>/usr/src/</command> and typed <command>./configure</command>
+followed by <command>make</command> and <command>make install</command>.
+</para>
+
+<para>
+There is one glitch to work around. The header file for the garbage collection
+<command>gc.h</command> is found in the <command>/usr/src/gc6.0/include
+</command> directory (at least on my system). The mono build process will break
+on this location: it is looking for the header file in some other place called
+<command>/usr/include/gc/</command> and won't be able to find the correct
+header file.
+</para>
+
+<para>
+The solution is to build a symbolic link between these two locations as 
+follows
+</para>
+
+<programlisting>
+[root@taurus include]# ln -s /usr/src/gc6.0/include/ /usr/include/gc
+</programlisting>
+
+<para>
+after which you'll be able to list the directory contents as if they were
+in <command>/usr/include</command>
+</para>
+
+<programlisting>
+[root@taurus include]# pwd
+/usr/include
+[root@taurus include]# ls /usr/include/gc
+cord.h                gc_backptr.h  gc_inline.h             javaxfc.h
+ec.h                  gc_cpp.h      gc_local_alloc.h        leak_detector.h
+gc                    gc_gcj.h      gc_mark.h               new_gc_alloc.h
+gc_alloc.h            gc.h          gc_pthread_redirects.h  private
+gc_amiga_redirects.h  gc_inl.h      gc_typed.h              weakpointer.h
+[root@taurus include]#
+</programlisting>
+
+<para>
+To get mono to work with garbage collection, you'll have to rebuild the
+environment. This is done easily by typing <command>make distclean</command>
+to clean up any existing executables.
+</para>
+
+<para>
+Continue the build by typing <command>./configure</command>, and look at
+the last line. It should read:
+</para>
+
+<programlisting>
+
+snip...
+
+creating config.h
+
+
+        GC:     boehm
+
+
+[root@taurus mono-0.12]#
+
+</programlisting>
+
+<para>
+The GC: boehm tells you that garbage collection has been turned on. Now to
+compile the runtime, you type <command>make</command> and <command> make
+install</command> as previously.
+</para>
+
+<para>
+You now have mono working with Garbage Collection.
+</para>
+
+<para>
+Although my experimentation is incomplete as of this time, I have found some
+issues with running Garbage Collection continuously, and my recommendation
+would be to turn it off for now.
+</para>
+
+<para>
+To turn garbage collection off again, you have to go to the <command>/usr/src
+</command> directory where you extracted the tarball. Enter the <command>gc6.0
+</command> directory and type <command>make uninstall</command> to uninstall 
+Garbage Collection. Then in your <command>mono</command> directory, type
+<command>make distclean</command> followed by <command>./configure</command>,
+<command>make</command> and <command>make install</command>.
+</para>
+
+</sect2>
+
+</sect1>
+
+<sect1 id="running">
+<title>Running mono</title>
+<sect2 id="basic">
+<title>Basic steps</title>
+<para>
+To work with mono, you first have to create a C# program. Open up 
+your favourite editor, and type in the following code:
+</para>
+<programlisting>
+using System;
+
+class Hello
+{
+public static void Main(String[] args)
+	{
+	Console.WriteLine("mono:: is alive and well...");
+
+	for (int i = 0; i < args.Length; i++)
+		Console.WriteLine("Argument {0} = {1}", i, args[i]);
+	}
+}
+</programlisting>
+
+<para>
+Save the file as hello.cs. To compile this into a working program, 
+type mcs hello.cs. If you get the following:
+</para>
+<programlisting>
+[hinne@taurus hello]$ mcs hello.cs
+RESULT: 0
+[hinne@taurus hello]$
+</programlisting>
+<para>
+you know the compile worked fine. If you see some strange error
+messages including the word 'parser' somewhere, you made a mistake in
+your program. Fix this up first.
+</para>
+
+<para>
+You are now ready to execute your first mono program.  To execute 
+the code, type
+</para>
+
+<programlisting>
+[hinne@taurus hello]$ mono hello.exe arg1 arg2 arg 3
+</programlisting>
+<para>
+(where we have given some arguments just for fun) and you'll 
+see the following:
+</para>
+
+<programlisting>
+mono:: is alive and well...
+Argument 0 = arg1
+Argument 1 = arg2
+Argument 2 = arg
+Argument 3 = 3
+RESULT: 0
+</programlisting>
+<para>
+As you can see, mono printed the line "mono:: is alive and well" 
+and printed the list of arguments. This completes the creation 
+and execution of your first mono program.
+</para>
+</sect2>
+
+<sect2 id="interpreter">
+<title>Interpreter</title>
+<para>
+But mono will allow you to do more. First of all, mono is the 
+compiled mono execution environment which uses the Just in 
+Time (JIT) compiler. Mono also comes with an interpreted 
+environment, which can be accessed using the command 'mint' 
+as follows
+</para>
+<programlisting>
+[hinne@taurus hello]$ mint hello.exe arg1 arg 2
+mono:: is alive and well...
+Argument 0 = arg1
+Argument 1 = arg
+Argument 2 = 2
+[hinne@taurus hello]$
+</programlisting>
+<para>
+As you can see, it makes no difference to mono output which 
+environment you use, but what happens under the hood is very 
+different. If you use 'mono' as the command line tool, you 
+call the 'production' execution environment which will read 
+your portable executable (PE) file, and call the just in 
+time (JIT) compiler to compile the PE code down to machine 
+level code (in my case, an x86 architecture) after which 
+it is executed.
+</para>
+<para>
+If you use mint, the JIT is not used, and the PE code is 
+interpreted into x86 instructions for execution. In fact, 
+for our simple 'hello' mint is slightly faster. The point 
+is that the JIT compiler will take some time to compile the 
+code of our program and store it in some location in memory, 
+but the subsequent execution of the code is faster with mono.
+</para>
+<para>
+
+You can see what happens below (the thing to look for is the 
+'user' time: 0.1 seconds with mono and 0.06 seconds with mint):
+
+</para>
+<programlisting>
+[hinne@taurus hello]$ time mono hello.exe arg1 arg 2
+mono:: is alive and well...
+Argument 0 = arg1
+Argument 1 = arg
+Argument 2 = 2
+RESULT: 0
+
+real    0m0.575s
+user    0m0.100s
+sys     0m0.010s
+[hinne@taurus hello]$ time mint hello.exe arg1 arg 2
+mono:: is alive and well...
+Argument 0 = arg1
+Argument 1 = arg
+Argument 2 = 2
+
+real    0m0.545s
+user    0m0.060s
+sys     0m0.000s
+[hinne@taurus hello]$
+</programlisting>
+<para>
+After this simple run of mono, it is time to play with some options. 
+I won't cover these in detail since there are quite a few, and also because
+I assume you downloaded mono to hack it around in the first place. So
+I'll leave some pointers.
+</para>
+
+
+<sect3 id="debugging">
+<title>Debugging</title>
+<para>
+Mono supports a debugging option when you specify the "-d" flag while running
+the runtime. Utilising this flag will get you a significant amount of output,
+and it may be an idea to specify an output file as well. The interesting aspect
+of this file is that it allows you to see to some extent (quite precisely,
+actually) what the JIT compiler is up to.
+</para>
+</sect3>
+
+<sect3 id="statistics">
+<title>Statistics</title>
+<para>
+It is also possible to collect some runtime statistics on your program. These
+will give you some idea of the resource utilisation of your program.
+</para>
+<programlisting>
+[hinne@taurus hello]$ mono --stats hello.exe
+mono:: is alive and well...
+RESULT: 0
+Mono Jit statistics
+Compiled methods:       58
+Methods cache lookup:   15
+Method trampolines:     698
+Basic blocks:           188
+Max basic blocks:       15
+Allocated vars:         238
+Analyze stack repeat:   61
+Compiled CIL code size: 2450
+Native code size:       10167
+Max code size ratio:    7.13 (FileStream::FlushBuffer)
+Biggest method:         1016 (StreamWriter::Write)
+Code reallocs:          27
+Allocated code size:    22073
+Inlineable methods:     17
+Inlined methods:        22
+
+Created object count:   18
+Initialized classes:    127
+Used classes:           37
+Static data size:       288
+VTable data size:       8292
+</programlisting>
+</sect3>
+
+</sect2>
+
+<sect2 id="ILAsm_code" >
+<title>Inspecting IL Assembly code</title>
+<para>
+Mono also provides a small tool that will let you disassemble 
+the executable (.exe) file so you can have a peek 
+under the hood. This tool is monodis, and is run as 
+follows:
+
+</para>
+<programlisting>
+[hinne@taurus hello]$ monodis hello.exe
+.assembly extern mscorlib
+{
+  .ver 0:0:0:0
+}
+.assembly 'hello'
+{
+  .hash algorithm 0x00008004
+  .ver  0:0:0:0
+}
+  .class private auto ansi beforefieldinit Hello
+        extends [mscorlib]System.Object
+  {
+
+    // method line 1
+    .method public hidebysig  specialname  rtspecialname
+           instance default void .ctor()  cil managed
+    {
+        // Method begins at RVA 0x20ec
+        // Code size 7 (0x7)
+        .maxstack 8
+        IL_0000: ldarg.0
+        IL_0001: call instance void System.Object::.ctor()
+        IL_0006: ret
+    } // end of method instance default void .ctor()
+
+    // method line 2
+    .method public static
+           default void Main(string[] args)  cil managed
+    {
+        // Method begins at RVA 0x20f4
+        .entrypoint
+        // Code size 56 (0x38)
+        .maxstack 5
+        .locals init (
+                int32   V_0,
+                int32   V_1)
+        IL_0000: ldstr "mono:: is alive and well..."
+        IL_0005: call void System.Console::WriteLine(string)
+        IL_000a: ldc.i4.0
+        IL_000b: stloc.0
+        IL_000c: ldloc.0
+        IL_000d: ldarg.s 0
+        IL_000f: ldlen
+        IL_0010: clt
+        IL_0012: brfalse IL_0037
+
+        IL_0017: ldstr "Argument {0} = {1}"
+        IL_001c: ldloc.0
+        IL_001d: box [mscorlib]System.Int32
+        IL_0022: ldarg.s 0
+        IL_0024: ldloc.0
+        IL_0025: ldelem.ref
+        IL_0026: call void System.Console::WriteLine(string, object, object)
+        IL_002b: nop
+        IL_002c: ldloc.0
+        IL_002d: ldc.i4.1
+        IL_002e: add
+        IL_002f: stloc.1
+        IL_0030: ldloc.1
+        IL_0031: stloc.0
+        IL_0032: br IL_000c
+
+        IL_0037: ret
+    } // end of method default void Main(string[] args)
+
+  } // end of type Hello
+
+[hinne@taurus hello]$
+</programlisting>
+<para>
+This is the listing of the code of your program in a language 
+called IL assembly, or Common Intermediate Language (CIL). The 
+CIL provides the portability of the mono platform, and ensures 
+that code compiled with Microsoft's .NET framework will work 
+on mono and vice versa. 
+</para>
+</sect2>
+
+<sect2 id="man_pages">
+<title>Man pages</title>
+
+<para>
+Mono has man pages already installed, and generally, typing <command>
+man</command> before the command you wish to execute should help in 
+getting a list of the options. In many cases, it's still up to you
+to figure out what they do.
+</para>
+
+</sect2>
+
+
+</sect1>
+
+
+<sect1 id="problems">
+<title>Problems</title>
+<para> 
+With mono being as new as it is, it is likely that you will have some
+problems with installation. The following are some ideas to help you
+out in a bind:
+</para>
+
+<orderedlist>
+<listitem>
+<para> 
+See the Ximian Bugzilla page to find out if there is a bug
+report about your specific issue.
+</para>
+</listitem>
+
+<listitem>
+<para>Read this document.  If it does not solve your problem, we want to
+know about it. Please send a message to the email address listed for
+feedback at the beginning of the document.</para>
+</listitem>
+
+<listitem>
+
+<para> 
+Visit the mono mailing lists' archives and do a little
+research in there for threads talking about the problem you have.
+</para>
+</listitem>
+
+<listitem>
+<para> 
+If you still cannot correct the problem, send a message to the
+mono list. When you do this, please be as precise as possible--i.e.
+mention the system you are running, the version of mono that you have the 
+problem with, and give any error codes and other output that might appear.
+</para>
+</listitem>
+</orderedlist>
+
+</sect1>
+
+<sect1 id="knownproblems">
+<title>Known Problems</title>
+
+<para> mcs fails to compile in Linux.
+To the best of my knowledge, as of yet mcs cannot compile in Linux. 
+Try to install the already made packages from 
+http://mono.baselabs.org/index.php/software. </para>
+</sect1>
+
+<!-- Legal Sections --> <sect1 id="copyright">
+ <title>Copyright and License</title>
+
+ <!-- The LDP recommends, but doesn't require, the GFDL --> <para>
+     This document, <emphasis>Running mono</emphasis>, is copyrighted
+     (c) 2002 by <emphasis>Hinne Hettema</emphasis> and
+     <emphasis>Jaime Anguiano Olarra</emphasis>.  Permission is
+     granted to copy, distribute and/or modify this document under the
+     terms of the GNU Free Documentation License, Version 1.1 or any later
+     version published by the Free Software Foundation; with no Invariant
+     Sections, with no Front-Cover Texts, and with no Back-Cover Texts.
+     A copy of the license is included in the section entitled "GNU Free
+     Documentation License".
+ </para>
+
+<sect2 id="gfdl"> <title>GNU Free Documentation License</title> 
+<!-- GNU Project - Free Software Foundation (FSF) -->
+
+<para>Version 1.1, March 2000</para>
+
+<blockquote> <para>Copyright (C) 2000  Free Software Foundation, Inc.
+59 Temple Place, Suite 330, Boston, MA	02111-1307  USA Everyone is
+permitted to copy and distribute verbatim copies of this license document,
+but changing it is not allowed.</para> </blockquote>
+
+<sect3 id="gfdl-0"> <title>PREAMBLE</title>
+
+<para>The purpose of this License is to make a manual, textbook,
+    or other written document "free" in the sense of freedom: to assure
+    everyone the effective freedom to copy and redistribute it, with
+    or without modifying it, either commercially or noncommercially.
+    Secondarily, this License preserves for the author and publisher
+    a way to get credit for their work, while not being considered
+    responsible for modifications made by others.</para>
+
+<para>This License is a kind of "copyleft", which means that
+    derivative works of the document must themselves be free in the
+    same sense.  It complements the GNU General Public License, which
+    is a copyleft license designed for free software.</para>
+
+<para>We have designed this License in order to use it for manuals
+    for free software, because free software needs free documentation:
+    a free program should come with manuals providing the same freedoms
+    that the software does.  But this License is not limited to software
+    manuals; it can be used for any textual work, regardless of subject
+    matter or whether it is published as a printed book.  We recommend
+    this License principally for works whose purpose is instruction
+    or reference.</para>
+</sect3>
+
+<sect3 id="gfdl-1"> <title>APPLICABILITY AND DEFINITIONS</title>
+
+<para>This License applies to any manual or other work that
+    contains a notice placed by the copyright holder saying it can be
+    distributed under the terms of this License.  The "Document", below,
+    refers to any such manual or work.	Any member of the public is a
+    licensee, and is addressed as "you".</para>
+
+<para>A "Modified Version" of the Document means any work
+    containing the Document or a portion of it, either copied verbatim,
+    or with modifications and/or translated into another language.</para>
+
+<para>A "Secondary Section" is a named appendix or a front-matter
+    section of the Document that deals exclusively with the relationship
+    of the publishers or authors of the Document to the Document's overall
+    subject (or to related matters) and contains nothing that could fall
+    directly within that overall subject.  (For example, if the Document
+    is in part a textbook of mathematics, a Secondary Section may not
+    explain any mathematics.)  The relationship could be a matter of
+    historical connection with the subject or with related matters, or
+    of legal, commercial, philosophical, ethical or political position
+    regarding them.</para>
+
+<para>The "Invariant Sections" are certain Secondary Sections
+    whose titles are designated, as being those of Invariant Sections,
+    in the notice that says that the Document is released under this
+    License.</para>
+
+<para>The "Cover Texts" are certain short passages of text that
+    are listed, as Front-Cover Texts or Back-Cover Texts, in the notice
+    that says that the Document is released under this License.</para>
+
+<para>A "Transparent" copy of the Document means a
+    machine-readable copy, represented in a format whose specification
+    is available to the general public, whose contents can be viewed and
+    edited directly and straightforwardly with generic text editors
+    or (for images composed of pixels) generic paint programs or
+    (for drawings) some widely available drawing editor, and that is
+    suitable for input to text formatters or for automatic translation
+    to a variety of formats suitable for input to text formatters.
+    A copy made in an otherwise Transparent file format whose markup
+    has been designed to thwart or discourage subsequent modification
+    by readers is not Transparent.  A copy that is not "Transparent"
+    is called "Opaque".</para>
+
+<para>Examples of suitable formats for Transparent copies include
+    plain ASCII without markup, Texinfo input format, LaTeX input format,
+    SGML or XML using a publicly available DTD, and standard-conforming
+    simple HTML designed for human modification.  Opaque formats include
+    PostScript, PDF, proprietary formats that can be read and edited
+    only by proprietary word processors, SGML or XML for which the
+    DTD and/or processing tools are not generally available, and the
+    machine-generated HTML produced by some word processors for output
+    purposes only.</para>
+
+<para>The "Title Page" means, for a printed book, the title page
+    itself, plus such following pages as are needed to hold, legibly,
+    the material this License requires to appear in the title page.
+    For works in formats which do not have any title page as such,
+    "Title Page" means the text near the most prominent appearance of the
+    work's title, preceding the beginning of the body of the text.</para>
+</sect3>
+
+<sect3 id="gfdl-2"> <title>VERBATIM COPYING</title>
+
+<para>You may copy and distribute the Document in any medium,
+    either commercially or noncommercially, provided that this License,
+    the copyright notices, and the license notice saying this License
+    applies to the Document are reproduced in all copies, and that
+    you add no other conditions whatsoever to those of this License.
+    You may not use technical measures to obstruct or control the
+    reading or further copying of the copies you make or distribute.
+    However, you may accept compensation in exchange for copies.  If you
+    distribute a large enough number of copies you must also follow the
+    conditions in section 3.</para>
+
+<para>You may also lend copies, under the same conditions stated
+    above, and you may publicly display copies.</para>
+</sect3>
+
+<sect3 id="gfdl-3"> <title>COPYING IN QUANTITY</title>
+
+<para>If you publish printed copies of the Document numbering more
+    than 100, and the Document's license notice requires Cover Texts, you
+    must enclose the copies in covers that carry, clearly and legibly,
+    all these Cover Texts: Front-Cover Texts on the front cover, and
+    Back-Cover Texts on the back cover.  Both covers must also clearly
+    and legibly identify you as the publisher of these copies.	The front
+    cover must present the full title with all words of the title equally
+    prominent and visible.  You may add other material on the covers
+    in addition.  Copying with changes limited to the covers, as long as
+    they preserve the title of the Document and satisfy these conditions,
+    can be treated as verbatim copying in other respects.</para>
+
+<para>If the required texts for either cover are too voluminous to
+    fit legibly, you should put the first ones listed (as many as fit
+    reasonably) on the actual cover, and continue the rest onto adjacent
+    pages.</para>
+
+<para>If you publish or distribute Opaque copies of the Document
+    numbering more than 100, you must either include a machine-readable
+    Transparent copy along with each Opaque copy, or state in or with each
+    Opaque copy a publicly-accessible computer-network location containing
+    a complete Transparent copy of the Document, free of added material,
+    which the general network-using public has access to download
+    anonymously at no charge using public-standard network protocols.
+    If you use the latter option, you must take reasonably prudent steps,
+    when you begin distribution of Opaque copies in quantity, to ensure
+    that this Transparent copy will remain thus accessible at the stated
+    location until at least one year after the last time you distribute
+    an Opaque copy (directly or through your agents or retailers) of
+    that edition to the public.</para>
+
+<para>It is requested, but not required, that you contact the
+    authors of the Document well before redistributing any large number
+    of copies, to give them a chance to provide you with an updated
+    version of the Document.</para>
+</sect3>
+
+<sect3 id="gfdl-4"> <title>MODIFICATIONS</title>
+
+<para>You may copy and distribute a Modified Version of the
+    Document under the conditions of sections 2 and 3 above, provided
+    that you release the Modified Version under precisely this License,
+    with the Modified Version filling the role of the Document, thus
+    licensing distribution and modification of the Modified Version
+    to whoever possesses a copy of it.	In addition, you must do these
+    things in the Modified Version:</para>
+
+<orderedlist numeration="upperalpha"> <listitem><para>Use in the
+Title Page
+      (and on the covers, if any) a title distinct from that of the
+      Document, and from those of previous versions (which should, if
+      there were any, be listed in the History section of the Document).
+      You may use the same title as a previous version if the original
+      publisher of that version gives permission.</para>
+</listitem>
+
+<listitem><para>List on the Title Page,
+      as authors, one or more persons or entities responsible for
+      authorship of the modifications in the Modified Version, together
+      with at least five of the principal authors of the Document (all
+      of its principal authors, if it has less than five).</para>
+</listitem>
+
+<listitem><para>State on the Title page
+      the name of the publisher of the Modified Version, as the
+      publisher.</para>
+</listitem>
+
+<listitem><para>Preserve all the
+      copyright notices of the Document.</para>
+</listitem>
+
+<listitem><para>Add an appropriate
+      copyright notice for your modifications adjacent to the other
+      copyright notices.</para>
+</listitem>
+
+<listitem><para>Include, immediately
+      after the copyright notices, a license notice giving the public
+      permission to use the Modified Version under the terms of this
+      License, in the form shown in the Addendum below.</para>
+</listitem>
+
+<listitem><para>Preserve in that license
+      notice the full lists of Invariant Sections and required Cover
+      Texts given in the Document's license notice.</para>
+</listitem>
+
+<listitem><para>Include an unaltered
+      copy of this License.</para>
+</listitem>
+
+<listitem><para>Preserve the section
+      entitled "History", and its title, and add to it an item stating at
+      least the title, year, new authors, and publisher of the Modified
+      Version as given on the Title Page.  If there is no section entitled
+      "History" in the Document, create one stating the title, year,
+      authors, and publisher of the Document as given on its Title Page,
+      then add an item describing the Modified Version as stated in the
+      previous sentence.</para>
+</listitem>
+
+<listitem><para>Preserve the network
+      location, if any, given in the Document for public access to
+      a Transparent copy of the Document, and likewise the network
+      locations given in the Document for previous versions it was
+      based on.  These may be placed in the "History" section.	You may
+      omit a network location for a work that was published at least four
+      years before the Document itself, or if the original publisher of
+      the version it refers to gives permission.</para>
+</listitem>
+
+<listitem><para>In any section entitled
+      "Acknowledgements" or "Dedications", preserve the section's title,
+      and preserve in the section all the substance and tone of each
+      of the contributor acknowledgements and/or dedications given
+      therein.</para>
+</listitem>
+
+<listitem><para>Preserve all the
+      Invariant Sections of the Document, unaltered in their text and in
+      their titles.  Section numbers or the equivalent are not considered
+      part of the section titles.</para>
+</listitem>
+
+<listitem><para>Delete any section
+      entitled "Endorsements".	Such a section may not be included in
+      the Modified Version.</para>
+</listitem>
+
+<listitem><para>Do not retitle any
+      existing section as "Endorsements" or to conflict in title with
+      any Invariant Section.</para>
+</listitem> </orderedlist> <para>If the Modified Version includes new
+front-matter sections
+    or appendices that qualify as Secondary Sections and contain no
+    material copied from the Document, you may at your option designate
+    some or all of these sections as invariant.  To do this, add their
+    titles to the list of Invariant Sections in the Modified Version's
+    license notice.  These titles must be distinct from any other section
+    titles.</para>
+
+<para>You may add a section entitled "Endorsements", provided it
+    contains nothing but endorsements of your Modified Version by various
+    parties--for example, statements of peer review or that the text has
+    been approved by an organization as the authoritative definition of
+    a standard.</para>
+
+<para>You may add a passage of up to five words as a Front-Cover
+    Text, and a passage of up to 25 words as a Back-Cover Text, to the end
+    of the list of Cover Texts in the Modified Version.  Only one passage
+    of Front-Cover Text and one of Back-Cover Text may be added by (or
+    through arrangements made by) any one entity.  If the Document already
+    includes a cover text for the same cover, previously added by you or
+    by arrangement made by the same entity you are acting on behalf of,
+    you may not add another; but you may replace the old one, on explicit
+    permission from the previous publisher that added the old one.</para>
+
+<para>The author(s) and publisher(s) of the Document do not by
+    this License give permission to use their names for publicity for
+    or to assert or imply endorsement of any Modified Version.</para>
+</sect3>
+
+<sect3 id="gfdl-5"> <title>COMBINING DOCUMENTS</title>
+
+<para>You may combine the Document with other documents released
+    under this License, under the terms defined in section 4 above for
+    modified versions, provided that you include in the combination all of
+    the Invariant Sections of all of the original documents, unmodified,
+    and list them all as Invariant Sections of your combined work in
+    its license notice.</para>
+
+<para>The combined work need only contain one copy of this
+    License, and multiple identical Invariant Sections may be replaced
+    with a single copy.  If there are multiple Invariant Sections with
+    the same name but different contents, make the title of each such
+    section unique by adding at the end of it, in parentheses, the
+    name of the original author or publisher of that section if known,
+    or else a unique number.  Make the same adjustment to the section
+    titles in the list of Invariant Sections in the license notice of
+    the combined work.</para>
+
+<para>In the combination, you must combine any sections entitled
+    "History" in the various original documents, forming one section
+    entitled "History"; likewise combine any sections entitled
+    "Acknowledgements", and any sections entitled "Dedications".
+    You must delete all sections entitled "Endorsements."</para>
+</sect3>
+
+<sect3 id="gfdl-6"> <title>COLLECTIONS OF DOCUMENTS</title>
+
+<para>You may make a collection consisting of the Document and
+    other documents released under this License, and replace the
+    individual copies of this License in the various documents with a
+    single copy that is included in the collection, provided that you
+    follow the rules of this License for verbatim copying of each of
+    the documents in all other respects.</para>
+
+<para>You may extract a single document from such a collection,
+    and distribute it individually under this License, provided you
+    insert a copy of this License into the extracted document, and follow
+    this License in all other respects regarding verbatim copying of
+    that document.</para>
+</sect3>
+
+<sect3 id="gfdl-7"> <title>AGGREGATION WITH INDEPENDENT WORKS</title>
+<para>A compilation of the Document or its derivatives with other
+    separate and independent documents or works, in or on a volume
+    of a storage or distribution medium, does not as a whole count
+    as a Modified Version of the Document, provided no compilation
+    copyright is claimed for the compilation.  Such a compilation is
+    called an "aggregate", and this License does not apply to the other
+    self-contained works thus compiled with the Document, on account
+    of their being thus compiled, if they are not themselves derivative
+    works of the Document.</para>
+
+<para>If the Cover Text requirement of section 3 is applicable to
+    these copies of the Document, then if the Document is less than
+    one quarter of the entire aggregate, the Document's Cover Texts
+    may be placed on covers that surround only the Document within
+    the aggregate.  Otherwise they must appear on covers around the
+    whole aggregate.</para>
+</sect3>
+
+<sect3 id="gfdl-8"> <title>TRANSLATION</title>
+
+<para>Translation is considered a kind of modification, so you may
+    distribute translations of the Document under the terms of section 4.
+    Replacing Invariant Sections with translations requires special
+    permission from their copyright holders, but you may include
+    translations of some or all Invariant Sections in addition to the
+    original versions of these Invariant Sections.  You may include
+    a translation of this License provided that you also include the
+    original English version of this License.  In case of a disagreement
+    between the translation and the original English version of this
+    License, the original English version will prevail.</para>
+</sect3>
+
+<sect3 id="gfdl-9"> <title>TERMINATION</title> <para>You may not copy,
+modify, sublicense, or distribute the
+    Document except as expressly provided for under this License.
+    Any other attempt to copy, modify, sublicense or distribute the
+    Document is void, and will automatically terminate your rights under
+    this License.  However, parties who have received copies, or rights,
+    from you under this License will not have their licenses terminated
+    so long as such parties remain in full compliance.</para>
+</sect3>
+
+<sect3 id="gfdl-10"> <title>FUTURE REVISIONS OF THIS LICENSE</title>
+
+<para>The Free Software Foundation may publish new, revised
+    versions of the GNU Free Documentation License from
+    time to time.  Such new versions will be similar
+    in spirit to the present version, but may differ in
+    detail to address new problems or concerns.  See <ulink
+    url="http://www.gnu.org/copyleft/">http://www.gnu.org/copyleft/</ulink>.</para>
+
+<para>Each version of the License is given a distinguishing
+    version number.  If the Document specifies that a particular
+    numbered version of this License "or any later version" applies
+    to it, you have the option of following the terms and conditions
+    either of that specified version or of any later version that has
+    been published (not as a draft) by the Free Software Foundation.
+    If the Document does not specify a version number of this License,
+    you may choose any version ever published (not as a draft) by the
+    Free Software Foundation.</para>
+</sect3>
+
+<sect3 id="gfdl-11"> <title>How to use this License for your
+documents</title>
+
+<para>To use this License in a document you have written, include
+    a copy of the License in the document and put the following copyright
+    and license notices just after the title page:</para>
+
+<blockquote><para> Copyright (c)  YEAR	YOUR NAME.
+      Permission is granted to copy, distribute and/or modify this
+      document under the terms of the GNU Free Documentation License,
+      Version 1.1 or any later version published by the Free Software
+      Foundation; with the Invariant Sections being LIST THEIR TITLES,
+      with the Front-Cover Texts being LIST, and with the Back-Cover
+      Texts being LIST.  A copy of the license is included in the section
+      entitled "GNU Free Documentation License".
+</para></blockquote>
+
+<para>If you have no Invariant Sections, write "with no Invariant
+    Sections" instead of saying which ones are invariant.  If you
+    have no Front-Cover Texts, write "no Front-Cover Texts" instead of
+    "Front-Cover Texts being LIST"; likewise for Back-Cover Texts.</para>
+
+<para>If your document contains nontrivial examples of program
+    code, we recommend releasing these examples in parallel under your
+    choice of free software license, such as the GNU General Public
+    License, to permit their use in free software.</para>
+</sect3> </sect2> </sect1>
+
+</article>
+
diff --git a/web/mono-build-w32.sh b/web/mono-build-w32.sh
index 37e0e708036..28768d97df8 100755
--- a/web/mono-build-w32.sh
+++ b/web/mono-build-w32.sh
@@ -42,6 +42,11 @@ fi
 
 cvs checkout mono || exit -1
 
+if [ ! -z "${AUTO_STABLE}" -o -e /usr/autotool/stable ]; then
+    export AUTO_STABLE=${AUTO_STABLE:-/usr/autotool/stable}
+    export AUTO_DEVEL=${AUTO_STABLE}
+fi
+
 # Need to install pkgconfig and set ACLOCAL_FLAGS if there is not a
 # pkgconfig installed already.  Otherwise set PKG_CONFIG_PATH to the
 # glib we're about to install in $here/install.  This script could
@@ -58,7 +63,40 @@ cvs checkout mono || exit -1
 # dont need PKG_CONFIG_PATH (the internal pkgconfig config file
 # $prefix is handled similarly).
 
-if [ ! -f `(cd mono; aclocal --print-ac-dir)`/pkg.m4 ]; then
+function aclocal_scan () {
+    # Quietly ignore the rogue '-I' and other aclocal flags that
+    # aren't actually directories...
+    #
+    # cd into mono/ so that the aclocal wrapper can work out which version
+    # of aclocal to run
+    for i in `(cd mono && aclocal --print-ac-dir)` $ACLOCAL_FLAGS
+    do
+	if [ -f $i/$1 ]; then
+	    return 0
+	fi
+    done
+
+    return 1
+}
+
+function install_package() {
+    zipfile=$1
+    markerfile=$2
+    name=$3
+
+    echo "Installing $name..."
+    if [ ! -f $here/$zipfile ]; then
+	wget http://www.go-mono.com/archive/$zipfile
+    fi
+
+    # Assume that the package is installed correctly if the marker
+    # file is there
+    if [ ! -f $here/install/$markerfile ]; then
+	(cd $here/install || exit -1; unzip -o $here/$zipfile || exit -1) || exit -1
+    fi
+}
+
+if ! aclocal_scan pkg.m4 ; then
     ACLOCAL_FLAGS="-I $here/install/share/aclocal $ACLOCAL_FLAGS"
 fi
 
@@ -68,24 +106,27 @@ export ACLOCAL_FLAGS
 # Grab pkg-config, glib etc
 if [ ! -d $here/install ]; then
     mkdir $here/install || exit -1
-
-    # Fetch and install pkg-config, glib, iconv, intl
-    for i in pkgconfig-0.80-tml-20020101.zip glib-1.3.12-20020101.zip glib-dev-1.3.12-20020101.zip libiconv-1.7.zip libiconv-dev-1.7.zip libintl-0.10.40-20020101.zip
-    do
-	wget http://www.go-mono.org/archive/$i
-	(cd $here/install || exit -1; unzip -o ../$i || exit -1) || exit -1
-    done
 fi
 
+# Fetch and install pkg-config, glib, iconv, intl
+
+install_package pkgconfig-0.80-tml-20020101.zip bin/pkg-config.exe pkgconfig
+install_package glib-1.3.12-20020101.zip lib/libglib-1.3-12.dll glib
+install_package glib-dev-1.3.12-20020101.zip lib/glib-1.3.lib glib-dev
+install_package libiconv-1.7.zip lib/iconv.dll iconv
+install_package libiconv-dev-1.7.zip lib/iconv.lib iconv-dev
+install_package libintl-0.10.40-20020101.zip lib/libintl-1.dll intl
+install_package libgc-dev.zip lib/gc.dll gc-dev
+
 # Needed to find the libiconv bits
-CPPFLAGS="-I$here/install/include"
-LDFLAGS="-L$here/install/lib"
+CPPFLAGS="$CPPFLAGS -I$here/install/include"
+LDFLAGS="$LDFLAGS -L$here/install/lib"
 export CPPFLAGS
 export LDFLAGS
 
 # Make sure we build native w32, not cygwin
-CC="gcc -mno-cygwin"
-export CC
+#CC="gcc -mno-cygwin"
+#export CC
 
 # --prefix is used to set the class library dir in mono, and it needs
 # to be in windows-native form.  It also needs to have '\' turned into
diff --git a/web/mono-build.sh b/web/mono-build.sh
index c8c7813f0d5..10878bf2780 100755
--- a/web/mono-build.sh
+++ b/web/mono-build.sh
@@ -25,62 +25,120 @@ LD_LIBRARY_PATH=$here/install/lib:$LD_LIBRARY_PATH
 
 # --print-ac-dir was added in 1.2h according to the ChangeLog.  This
 # should mean that any automake new enough for us has it.
-if [ -f `aclocal --print-ac-dir`/pkg.m4 ]; then
+
+function aclocal_scan () {
+    # Quietly ignore the rogue '-I' and other aclocal flags that
+    # aren't actually directories...
+    for i in `aclocal --print-ac-dir` $ACLOCAL_FLAGS
+    do
+	if [ -f $i/$1 ]; then
+	    return 0
+	fi
+    done
+
+    return 1
+}
+
+function pkgconfig_scan () {
+    module=$1
+
+    echo "Finding pkgconfig files for $module..."
+
+    # Should we use locate? or just a list of well-known directories?
+    # locate has the problem of false positives in src dirs
+    for i in /usr/lib/pkgconfig /usr/local/lib/pkgconfig
+    do
+	echo "Looking in $i..."
+	if [ -f $i/${module}.pc ]; then
+	    echo $i
+	    return
+	fi
+    done
+}
+
+function install_package() {
+    tarfile=$1
+    dirname=$2
+    name=$3
+    configure_options=$4
+
+    echo "Installing $name..."
+    if [ ! -f $here/$tarfile ]; then
+	wget http://www.go-mono.org/archive/$tarfile
+    fi
+
+    # Assume that the package built correctly if the dir is there
+    if [ ! -d $here/$dirname ]; then
+	# Build and install package
+	tar xzf $here/$tarfile || exit -1
+	(cd $here/$dirname; ./configure --prefix=$here/install $configure_options || exit -1; make || exit -1; make install || exit -1)
+	success=$?
+	if [ $success -ne 0 ]; then
+	    echo "***** $name build failure. Run rm -rf $here/$dirname to have this script attempt to build $name again next time"
+	    exit -1
+	fi
+    fi
+}
+
+if aclocal_scan pkg.m4 ; then
     install_pkgconfig=no
-    PKG_CONFIG_PATH="$here/install/lib/pkgconfig"
 else
     install_pkgconfig=yes
-    ACLOCAL_FLAGS="-I $here/install/share/aclocal $ACLOCAL_FLAGS"
 fi
 
+if aclocal_scan glib-2.0.m4 ; then
+    install_glib=no
+    if [ $install_pkgconfig = "yes" ]; then
+	# We have to tell the newly-installed pkgconfig about the
+	# system-installed glib
+	PKG_CONFIG_PATH=`pkgconfig_scan glib-2.0`:$PKG_CONFIG_PATH
+    fi
+else
+    install_glib=yes
+    PKG_CONFIG_PATH="$here/install/lib/pkgconfig:$PKG_CONFIG_PATH"
+fi
+
+if [ -f /usr/include/gc/gc.h ]; then
+    install_libgc=no
+else
+    install_libgc=yes
+fi
+
+if [ $install_pkgconfig = "yes" -o $install_glib = "yes" ]; then
+    ACLOCAL_FLAGS="-I $here/install/share/aclocal $ACLOCAL_FLAGS"
+fi
 
 export PATH
 export LD_LIBRARY_PATH
 export ACLOCAL_FLAGS
 export PKG_CONFIG_PATH
 
-# Grab pkg-config-0.8, glib-1.3.12 if necessary
+CPPFLAGS="$CPPFLAGS -I$here/install/include"
+LDFLAGS="$LDFLAGS -L$here/install/lib"
+export CPPFLAGS
+export LDFLAGS
 
-# If any more dependencies are added, it would be worth encapsulating
-# the configure; make; make install part in a shell function
+# Grab pkg-config-0.8, glib-1.3.12 if necessary
 
 if [ $install_pkgconfig = "yes" ]; then
-    echo "Installing pkgconfig..."
-    if [ ! -f $here/pkgconfig-0.8.0.tar.gz ]; then
-	wget --timestamping http://www.go-mono.org/archive/pkgconfig-0.8.0.tar.gz
-    fi
-
-    # Assume that pkgconfig built correctly if the dir is there
-    if [ ! -d $here/pkgconfig-0.8.0 ]; then
-	# Build and install pkg-config
-	tar xzf $here/pkgconfig-0.8.0.tar.gz || exit -1
-	(cd $here/pkgconfig-0.8.0; ./configure --prefix=$here/install || exit -1; make || exit -1; make install || exit -1)
-	success=$?
-	if [ $success -ne 0 ]; then
-	    echo "***** pkgconfig build failure. Run rm -rf $here/pkgconfig-0.8.0 to have this script attempt to build pkgconfig again next time"
-	    exit -1
-	fi
-    fi
+    install_package pkgconfig-0.8.0.tar.gz pkgconfig-0.8.0 pkgconfig ""
 else
     echo "Not installing pkgconfig, you already seem to have it installed"
 fi
 
-
-echo "Installing glib..."
-if [ ! -f $here/glib-1.3.13.tar.gz ]; then
-    wget --timestamping http://www.go-mono.org/archive/glib-1.3.13.tar.gz
+if [ $install_glib = "yes" ]; then
+    install_package glib-1.3.13.tar.gz glib-1.3.13 glib ""
+else
+    echo "Not installing glib, you already seem to have it installed"
 fi
 
-# Assume that glib built correctly if the dir is there
-if [ ! -d $here/glib-1.3.13 ]; then
-    # Build and install glib
-    tar xzf $here/glib-1.3.13.tar.gz || exit -1
-    (cd $here/glib-1.3.13; ./configure --prefix=$here/install || exit -1; make || exit -1; make install || exit -1)
-    success=$?
-    if [ $success -ne 0 ]; then
-	echo "***** glib build failure. Run rm -rf $here/glib-1.3.13 to have this script attempt to build glib again next time"
-	exit -1
-    fi
+if [ $install_libgc = "yes" ]; then
+    LIBS="-ldl" install_package gc6.0.tar.gz gc6.0 libgc "--enable-threads=pthreads"
+    # make install didnt do the headers!
+    mkdir -p $here/install/include/gc
+    cp -r $here/gc6.0/include/* $here/install/include/gc
+else
+    echo "Not installing libgc, you already seem to have it installed"
 fi
 
 # End of build dependencies, now get the latest mono checkout and build that
@@ -100,7 +158,9 @@ if [ ${CVSROOT:0:5} = ":ext:" ]; then
     CVS_RSH=ssh
     export CVS_RSH
 elif [ ${CVSROOT:0:9} = ":pserver:" ]; then
-    if ! grep $CVSROOT ~/.cvspass > /dev/null 2>&1 ; then
+    # Chop off the trailing /mono because cvs 1.11 adds the port number
+    # into the .cvspass line
+    if ! grep ${CVSROOT%:/mono} ~/.cvspass > /dev/null 2>&1 ; then
 	echo "Logging into CVS server.  Anonymous CVS password is probably empty"
 	cvs login
     fi
diff --git a/web/mono-contribution-howto b/web/mono-contribution-howto
new file mode 100644
index 00000000000..ea3a4eaae53
--- /dev/null
+++ b/web/mono-contribution-howto
@@ -0,0 +1,551 @@
+
+			<Mono newbie coders start file>
+	<h1> A little help for mono newbie coders </h1>
+
+
+	For those who are new to Mono and are impatient to contribute
+	with code (uhh... you are brave!!) here is the document you 
+	should read.
+
+	
+	You will see all Mono hackers say the same (great minds have
+	similar way of thinking): First, DO WRITE TESTS!!!. In order
+	to do that:
+	
+	<ul>
+		* Start with the NUnit Tests Guidelines.  In the cvs
+	    	  they are located at: mcs/class/doc/NUnitGuideli...
+
+		* But wait, this is a document for impatient
+	    	  people. So EVERYTHING should be here. Well, it is. 
+	</ul>
+
+
+	<h2> The NUnit Tests Guidelines document </h2>
+
+	Mono NUnit Test Guidelines and Best Practices
+
+	Authors: Nick Drochak  <ndrochak@gol.com>
+	Martin Baulig  <martin@gnome.org>
+	Last Update: 2002-03-02
+	Rev: 0.3
+
+ <b> Purpose </b>
+
+	This document captures all the good ideas people have had 
+	about writing NUnit tests for the mono project. This document 
+	will be useful for anyone who writes or maintains unit tests.
+
+ <b> Other resources </b>
+
+	- mcs/class/README has an explanation of the build process and
+	  how it relates to the tests.
+	- http://nunit.sourceforge.net is the place to find out about 
+	  NUnit
+
+ <b> Getting Started </b>
+
+	If you are new to writing NUnit tests, there is a template 
+	you may use to help get started. The file is:
+
+	mcs/class/doc/TemplateTest.cs
+
+
+	(2.- This is the point two!. This file is just after the end 
+	of the guidelines. Copy/paste it in another buffer. And keep 
+	reading.)
+
+	Save a copy of this file in the appropriate test subdirecty 
+	(see below), and replace all the [text] markers with 
+	appropriate code. Comments in the template are there to guide 
+	you. You should also look at existing tests to see how other 
+	people have written them. 
+
+	mcs/class/corlib/Test/System.Collections/CollectionBaseTest.cs 
+
+	is a small one that might help.
+
+	(3.- You reached the third point. And as expected, it's just 
+	here to tell you that the content of CollectionBaseTest.cs is 
+	after the TemplateTest.cs code at the end of these 
+	guidelines.)
+
+	The directory that will contain your new file depends on the
+	assembly/namespace of the class for which you are creating the
+	tests. Under mcs/class there is a directory for each assembly. 
+	In each assembly there is a Test directory, e.g. 
+	mcs/class/corlib/Test. In the Test directory there are 
+	sub-directories for each namespace in the assembly, e.g. 
+	mcs/class/corlib/Test/Sytem. Put your new test file in the 
+	appropriate sub-directory under Test for the class you are
+	testing.
+
+	Once your test class is complete, you need to add it to the
+	AllTests.cs file in the same directory as your new test. Add a 
+	call to "suite.AddTest()" passing the name of your new test 
+	class's suite property as the parameter.  You will see examples 
+	in the AllTests.cs file, so just copy and paste inside there.
+
+	Once all of that is done, you can do a 'make test' from the top 
+	mcs directory.  Your test class will be automagically included 
+	in the build and the tests will be run along with all the 
+	others.
+
+ <b> Tips </b>
+
+ <b> Provide an unique error message for Assert() </b>
+
+	Include an unique message for each Assert() so that when the 
+	assert fails, it is trivial to locate the failing one. 
+	Otherwise, it may be difficult to determine which part of the 
+	test is failing. A good way to ensure unique messages is to use 
+	something like #A01, #A02 etc.
+
+    	Bad:
+<pre>
+	AssertEquals("array match", compare[0], i1[0]);
+	AssertEquals("array match", compare[1], i1[1]);
+	AssertEquals("array match", compare[2], i1[2]);
+	AssertEquals("array match", compare[3], i1[3]);
+</pre>
+    	Good:
+<pre>
+	AssertEquals("#A01", compare[0], i1[0]);
+	AssertEquals("#A02", compare[1], i1[1]);
+	AssertEquals("#A03", compare[2], i1[2]);
+	AssertEquals("#A04", compare[3], i1[3]);
+</pre>
+	Once you used such a number in an Assert(), don't change it 
+	later on - people might use it it identify the test in bug 
+	reports or in mailing lists.
+
+ <b> Use AssertEquals() to compare things, not Assert(). </b>
+
+	Never compare two values with Assert() - if the test fails, 
+	people have no idea what went wrong while AssertEquals() 
+	reports the failed value.
+
+    	Bad:
+<pre>
+        Assert ("A01", myTicks[0] == t1.Ticks);
+</pre>
+    	Good:
+<pre>
+        AssertEquals ("A01", myTicks[0], t1.Ticks);
+</pre>
+
+ <b> Constructors </b>
+
+	When writing your testcase, please make sure to provide a 
+	constructor which takes no arguments:
+
+<pre>
+        public class DateTimeTest : TestCase
+        {
+
+                public DateTimeTest() : base ("[MonoTests.System.DateTimeTest]") {}
+                public DateTimeTest (string name): base(name) {}
+
+        	public static ITest Suite
+                {
+                        get {
+                                TestSuite suite = new TestSuite ();
+        			return suite;
+        		}
+        	}
+        }
+</pre>
+
+ <b> Namespace </b>
+
+	Please keep the namespace within each test directory
+	consistent - all tests which are referenced in the same
+	AllTests.cs must be in the same namespace. Of course you can
+	use subnamespaces as you like - especially for subdirectories
+	of your testsuite.
+	
+	For instance, if your AllTests.cs is in namespace "MonoTests"
+	and you have a subdirectory called "System", you can put all
+	the tests in that dir into namespace "MonoTests.System".
+
+ <b> Test your test with the microsoft runtime </b>
+
+	If possible, try to run your testsuite with the Microsoft
+	runtime on Windows and make sure all tests in it pass. This is
+	especially important if you're writing a totally new testcase
+	- without this check you can never be sure that your testcase
+	contains no bugs ....
+	
+	Don't worry if you're writing your test on Linux, other people
+	can test it for you on Windows.
+	
+	Sometimes you may discover that a test doesn't show the
+	expected result when run with the Microsoft runtime - either
+	because there is a bug in their runtime or something is
+	misleading or wrong in their documentation. In this case,
+	please put a detailed description of the problem to
+	mcs/class/doc/API-notes and do also report it to the list -
+	we'll forward this to the Microsoft people from time to time
+	to help them fix their documentation and runtime.
+
+<pre>
+-------------------- TemplateTest.cs begins ----------
+
+	// this is a template for making NUnit tests.  Text enclosed 
+	// in square brackets (and the brackets themselves) should be 
+	// replaced by appropiate code.
+
+	// [File Name].cs - NUnit Test Cases for [explain here]
+	//
+	// [Author Name] ([Author email Address])
+	//
+	// (C) [Copyright holder]
+	// 
+
+	// these are the standard namespaces you will need.  You may 
+	// need to add more depending on your tests.
+	using NUnit.Framework;
+	using System;
+
+	// all test namespaces start with "MonoTests."  Append the 
+	// Namespace that contains the class you are testing, e.g. 
+	// MonoTests.System.Collections
+	namespace MonoTests.[Namespace]
+	{
+
+	// the class name should end with "Test" and start with the name 
+	// of the class you are testing, e.g. CollectionBaseTest
+	public class [Class to be tested]Test : TestCase {
+	
+	// there should be two constructors for your class.  The first 
+	// one (without parameters) should set the name to something 
+	// unique.
+	// Of course the name of the method is the same as the name of 
+	// the class
+	public [Constructor]() : base ("[Namespace.Class]") {}
+	public [Constructor](string name) : base(name) {}
+
+	// this method is run before each Test* method is called. You 
+	// can put variable initialization, etc. here that is common to 
+	// each test.
+	// Just leave the method empty if you don't need to use it.
+	protected override void SetUp() {}
+
+	// this method is run after each Test* method is called. You 
+	// can put clean-up code, etc. here.  Whatever needs to be done 
+	// after each test. Just leave the method empty if you don't need 
+	// to use it.
+	protected override void TearDown() {}
+
+	// this property is required.  You need change the parameter for
+	// typeof() below to be your class.
+	public static ITest Suite {
+		get { 
+			return new TestSuite(typeof([Classname here])); 
+		}
+	}
+
+	// this is just one of probably many test methods in your test 
+	// class. each test method must start with "Test".  All methods 
+	// in your class which start with "Test" will be automagically 
+	// called by the NUnit framework.
+	public void Test[Something] {
+		// inside here you will exercise your class and then 
+		// call Assert()
+	}
+}
+
+---------------------- TemplateTest.cs ends --------------
+
+---------------------- CollectionBaseTest.cs begins ------
+	//
+	// System.Collections.CollectionBase
+	// Test suite for System.Collections.CollectionBase
+	//
+	// Author:
+	//    Nick D. Drochak II
+	//
+	// (C) 2001 Nick D. Drochak II
+	//
+
+
+	using System;
+	using System.Collections;
+	using NUnit.Framework;
+
+	namespace MonoTests.System.Collections
+	{
+
+	public class CollectionBaseTest : TestCase 	
+	{
+		public CollectionBaseTest () : base 
+			("System.Collection.CollectionBase testsuite") 
+			{}
+		public CollectionBaseTest (String name) : base (name) 
+			{}
+
+		// We need a concrete class to test the abstract base 
+		// class
+		public class ConcreteCollection : CollectionBase 
+		{
+			// These fields are used as markers to test 
+			// the On* hooks.
+			public bool onClearFired;
+			public bool onClearCompleteFired;
+
+			public bool onInsertFired;
+			public int onInsertIndex;
+			public bool onInsertCompleteFired;
+			public int onInsertCompleteIndex;
+
+			public bool onRemoveFired;
+			public int onRemoveIndex;
+			public bool onRemoveCompleteFired;
+			public int onRemoveCompleteIndex;
+
+			public bool onSetFired;
+			public int onSetOldValue;
+			public int onSetNewValue;
+			public bool onSetCompleteFired;
+			public int onSetCompleteOldValue;
+			public int onSetCompleteNewValue;
+
+			// This constructor is used to test OnValid()
+			public ConcreteCollection()	
+			{
+				IList listObj;
+				listObj = this;
+				listObj.Add(null);
+			}
+
+			// This constructor puts consecutive integers into the list
+			public ConcreteCollection(int i) {
+				IList listObj;
+				listObj = this;
+
+				int j;
+				for (j = 0; j< i; j++) {
+					listObj.Add(j);
+				}
+			}
+
+			// A helper method to look at a value in the 
+			// list at a specific index
+			public int PeekAt(int index)
+			{
+				IList listObj;
+				listObj = this;
+				return (int) listObj[index];
+			}
+
+			// Mark the flag if this hook is fired
+			protected override void OnClear() {
+				this.onClearFired = true;
+			}
+
+			// Mark the flag if this hook is fired
+			protected override void OnClearComplete() 
+			{
+				this.onClearCompleteFired = true;
+			}
+
+			// Mark the flag, and save the paramter if 
+			// this hook is fired
+			protected override void OnInsert(int index, 
+							object value) 
+			{
+				this.onInsertFired = true;
+				this.onInsertIndex = index;
+			}
+
+			// Mark the flag, and save the paramter if 
+			// this hook is fired
+			protected override void OnInsertComplete(int index, 
+							object value) 
+			{
+				this.onInsertCompleteFired = true;
+				this.onInsertCompleteIndex = index;
+			}
+		
+			// Mark the flag, and save the paramter if this hook 
+			// is fired
+			protected override void OnRemove(int index, 
+							object value) 
+			{
+				this.onRemoveFired = true;
+				this.onRemoveIndex = index;
+			}
+		
+			// Mark the flag, and save the paramter if this hook 
+			// is fired
+			protected override void OnRemoveComplete(int index, 
+								object value) 
+			{
+				this.onRemoveCompleteFired = true;
+				this.onRemoveCompleteIndex = index;
+			}
+		
+			// Mark the flag, and save the paramters if this hook 
+			// is fired
+			protected override void OnSet(int index, object oldValue, 
+								object newValue) 
+			{
+				this.onSetFired = true;
+				this.onSetOldValue = (int) oldValue;
+				this.onSetNewValue = (int) newValue;
+			}
+		
+			// Mark the flag, and save the paramters if this hook 
+			// is fired
+			protected override void OnSetComplete(int index, 
+							object oldValue, 
+							object newValue) 
+			{
+				this.onSetCompleteFired = true;
+				this.onSetCompleteOldValue = (int) oldValue;
+				this.onSetCompleteNewValue = (int) newValue;
+			}
+		}  // public class ConcreteCollection
+
+		public static ITest Suite {
+			get {
+				return new TestSuite 
+					(typeof(CollectionBaseTest));
+			}
+		}
+
+		// Check the count property
+		public void TestCount() {
+			ConcreteCollection myCollection;
+			myCollection = new ConcreteCollection(4);
+			Assert(4 == myCollection.Count);
+		}
+
+	// Make sure GetEnumerator returns an object
+	public void TestGetEnumerator() {
+		ConcreteCollection myCollection;
+		myCollection = new ConcreteCollection(4);
+		Assert(null != myCollection.GetEnumerator());
+	}
+
+	// OnValid disallows nulls
+	public void TestOnValid() {
+		ConcreteCollection myCollection;
+		try {
+			myCollection = new ConcreteCollection();
+		}
+		catch (ArgumentNullException) {
+		}
+	}
+
+	// Test various Insert paths
+	public void TestInsert() {
+		ConcreteCollection myCollection;
+		int numberOfItems;
+		numberOfItems = 3;
+		// The constructor inserts
+		myCollection = new ConcreteCollection(numberOfItems);
+		Assert(myCollection.onInsertFired);
+		Assert(myCollection.onInsertCompleteFired);
+
+		// Using the IList interface, check inserts in the middle
+		IList listObj = myCollection;
+		listObj.Insert(1, 9);
+		Assert(myCollection.onInsertIndex == 1);
+		Assert(myCollection.onInsertCompleteIndex == 1);
+		Assert(myCollection.PeekAt(1) == 9);
+	}
+
+	// Test Clear and it's hooks
+	public void TestClear() 
+	{
+		ConcreteCollection myCollection;
+		int numberOfItems;
+		numberOfItems = 1;
+		myCollection = new ConcreteCollection(numberOfItems);
+		myCollection.Clear();
+		Assert(myCollection.Count == 0);
+		Assert(myCollection.onClearFired);
+		Assert(myCollection.onClearCompleteFired);
+	}
+
+	// Test RemoveAt, other removes and the hooks
+	public void TestRemove() 
+	{
+		ConcreteCollection myCollection;
+		int numberOfItems;
+		numberOfItems = 3;
+		// Set up a test collection
+		myCollection = new ConcreteCollection(numberOfItems);
+
+		// The list is 0-based.  So if we remove the second one
+		myCollection.RemoveAt(1);
+
+		// We should see the original third one in it's place
+		Assert(myCollection.PeekAt(1) == 2);
+		Assert(myCollection.onRemoveFired);
+		Assert(myCollection.onRemoveIndex == 1);
+		Assert(myCollection.onRemoveCompleteFired);
+		Assert(myCollection.onRemoveCompleteIndex == 1);
+		IList listObj = myCollection;
+		listObj.Remove(0);
+		// Confirm parameters are being passed to the hooks
+		Assert(myCollection.onRemoveIndex == 0);
+		Assert(myCollection.onRemoveCompleteIndex == 0);
+	}
+
+	// Test the random access feature
+	public void TestSet() 
+	{
+		ConcreteCollection myCollection;
+		int numberOfItems;
+		numberOfItems = 3;
+		myCollection = new ConcreteCollection(numberOfItems);
+		IList listObj = myCollection;
+		listObj[0] = 99;
+		Assert((int) listObj[0] == 99);
+		Assert(myCollection.onSetFired);
+		Assert(myCollection.onSetCompleteFired);
+		Assert(myCollection.onSetOldValue == 0);
+		Assert(myCollection.onSetCompleteOldValue == 0);
+		Assert(myCollection.onSetNewValue == 99);
+		Assert(myCollection.onSetCompleteNewValue == 99);
+	}
+}
+
+}
+----------------------- CollectionBaseTest.cs ends --------
+
+</pre>
+	<ul>
+		* If you use Emacs, you might want to use the .emacs 
+		  file and the package developed by Brad Merrill 
+		  mailto:zbrad@cybercom.net. It will allow you to 
+		  highlight and indent in C# style in your Emacs
+		  editor. (XEmacs will still work but it'll also 
+		  complain).
+
+		* CSharpDevelop is a GPLed IDE developed by IC#Code. 
+		  Search for it at sourceforge if you are interested 
+		  in it.
+
+		* For those who Java: "A comparison of Microsoft's 
+		  C# programming language to Sun Microsystem's Java 
+		  Programming language" by Dare Obasanjo is a really good 
+		  (very complete) text to read. 
+
+		* Suggest this point and more, now I can't think of 
+		  anything more.
+	</ul>
+
+	Enjoy!!.
+
+	(c) 2002, <a href="mailto:jaime@geneura.ugr.es">Jaime Anguiano Olarra</a>.
+
+	The parts included in this document are property of their 
+	respective authors.
+
+	Note: The identation of the source code has been changed a bit
+	so it could fit better in the website. Anyway, as nothing more
+	changed, the files should work as expected.
+
diff --git a/web/monodoc-xml b/web/monodoc-xml
new file mode 100644
index 00000000000..e8a5ffe2c71
--- /dev/null
+++ b/web/monodoc-xml
@@ -0,0 +1,755 @@
+* MonoDoc XML Tag Reference
+
+** Introduction
+
+<em>
+[This documentation is in progress.  Comments to
+<a href="mailto:jbarn@httcb.net">jbarn@httcb.net</a> and/or
+<a href="mailto:mono-docs-list@ximian.com">mono-docs-list@ximian.com</a>.]
+</em>
+
+MonoDoc XML, our format for multilingual API documentation stored outside of
+source files, is very similar to the output of Microsoft's csc /doc.  Minor
+alterations have been made to ease human parsing and hand-editing, but
+the majority of the tags are identical.  In fact, many of the descriptions
+and examples below are taken from the ECMA C# Language Specification with
+little or no alteration.
+
+This document provides a list of all available MonoDoc XML tags, with
+syntax and examples.  A complete example can be found in
+<a href="#appendix-a">Appendix A</a>, and both a <a href="#">DTD</a> and
+<a href="#">XSD schema</a> will be available very shortly.
+
+** MonoDoc XML Tags
+
+<dl>
+<dt><code><a href="#c">&lt;c&gt;</a></code></dt>
+<dd>Mark short sections of text as code.</dd>
+
+<dt><code><code><a href="#code">&lt;code&gt;</a></code></dt></code>
+<dd>Mark one or more lines as code or output.</dd>
+
+<dt><code><a href="#doc">&lt;doc&gt;</a></dt></code>
+<dd>Root element of documentation XML.</dd>
+
+<dt><code><a href="#event">&lt;event&gt;</a></dt></code>
+<dd>Describe an event.</dd>
+
+<dt><code><a href="#example">&lt;example&gt;</a></dt></code>
+<dd>An example.</dd>
+
+<dt><code><a href="#exception">&lt;exception&gt;</a></dt></code>
+<dd>Specify an exception a method can throw.</dd>
+
+<dt><code><a href="#field">&lt;field&gt;</a></dt></code>
+<dd>Describe a field.</dd>
+
+<dt><code><a href="#list">&lt;list&gt;</a></dt></code>
+<dd>Create a list or table.</dd>
+
+<dt><code><a href="#method">&lt;method&gt;</a></dt></code>
+<dd>Describe a method.</dd>
+
+<dt><code><a href="#para">&lt;para&gt;</a></dt></code>
+<dd>Allow text to be structured in paragraphs.</dd>
+
+<dt><code><a href="#param">&lt;param&gt;</a></dt></code>
+<dd>Specify a parameter for a method.</dd>
+
+<dt><code><a href="#paramref">&lt;paramref&gt;</a></dt></code>
+<dd>Mark a word as a parameter.</dd>
+
+<dt><code><a href="#permission">&lt;permission&gt;</a></dt></code>		
+<dd>Define the access level of a member.</dd>
+
+<dt><code><a href="#property">&lt;property&gt;</a></dt></code>
+<dd>Describe a property.</dd>
+
+<dt><code><a href="#remarks">&lt;remarks&gt;</a></dt></code>
+<dd>Provide verbose information for a type or member.</dd>
+
+<dt><code><a href="#returns">&lt;returns&gt;</a></dt></code>
+<dd>Specify the return value of a method.</dd>
+
+<dt><code><a href="#see">&lt;see&gt;</a></dt></code>
+<dd>Specify a link.</dd>
+
+<dt><code><a href="#seealso">&lt;seealso&gt;</a></dt></code>
+<dd>Specify a 'see also' entry.</dd>
+
+<dt><code><a href="#summary">&lt;summary&gt;</a></dt></code>
+<dd>Provide a brief (usually one sentence) description of a member or type.</dd>
+
+<dt><code><a href="#type">&lt;type&gt;</a></dt></code>
+<dd>Describe a type.</dd>
+</dl>
+
+** Definitions and Examples
+
+*** <a name="c">&lt;c&gt;</a>
+
+This tag can be used to mark short, inline fragments of text that should 
+be considered source code or program output.  User agents should render 
+this tag in a special -- likely monospace -- font.  For larger sections, 
+use <a href="#code"><code>&lt;code&gt;</code></a>.
+
+**** Syntax
+
+<pre>
+&lt;c&gt;code or output text&lt;/c&gt;
+</pre>
+
+**** Example
+
+<pre>   
+&lt;remarks&gt;
+    Class &lt;c&gt;Point&lt;/c&gt; models a point in two-dimensional space.
+&lt;/remarks&gt;
+</pre>
+
+*** <a name="code">&lt;code&gt;</a>
+
+This tag can be used to mark one or more lines of text as source code or 
+program output.  User agents should render this tag in a special (likely 
+monospace) font, and preserve both whitespace and newlines.
+
+**** Syntax
+
+	<code>&lt;code&gt;source or program output&lt;/code&gt;</code>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This method changes the point's location by the given
+    x- and y-offsets.
+    &lt;example lang="C#"&gt;
+        A C# example:
+        &lt;code&gt;
+            Point p = new Point(3, 5);
+            p.Translate(-1, 3);
+            // p == (2, 8);
+        &lt;/code&gt;
+    &lt;/example&gt;
+&lt;/summary&gt;
+</pre>
+
+*** <a name="doc">&lt;doc&gt;</a>
+
+This tag is the root element of the documentation file.  It can contain 
+any number of &lt;type&gt; elements.
+
+**** Syntax
+
+<code>&lt;doc lang="language" assembly="assembly"&gt;typedocs&lt;/doc&gt;</code>
+
+<blockquote>
+<em>lang="language"</em><br />
+The two-letter ISO code that specifies what language the contained
+documentation is written in.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;doc lang="en"&gt;
+    &lt;type name="Graphics.Point"&gt;
+        &lt;!-- ... --&gt;
+    &lt;/type&gt;
+&lt;/doc&gt; 
+</pre>
+
+*** <a name="event">&lt;event&gt;</a>
+
+This tag documents an event.
+
+**** Syntax
+
+<code>&lt;event name="eventname"&gt;documentation&lt;/event&gt;</code>
+
+<blockquote>
+<em>name="eventname"</em><br />
+The name of the event being documented.
+</blockquote>
+		
+**** Example
+
+<pre>
+&lt;event name="Click"&gt;
+    &lt;summary&gt;
+        Occurs when the control is clicked.
+    &lt;/summary&gt;
+    &lt;data&gt;
+        The event handler receives an argument of type EventArgs
+        containing data related to this event.
+    &lt;/data&gt;
+    &lt;remarks&gt;
+        &lt;para&gt;The ControlStyles.StandardClick style must be set 
+        for this event to be raised.&lt;/para&gt;
+        &lt;para&gt;For more information about handling events, see 
+        Consuming Events.&lt;/para&gt;
+    &lt;/remarks&gt;
+&lt;/event&gt;
+</pre>
+
+*** <a name="example">&lt;example&gt;</a>
+
+This tag marks a section of text as an example, and optionally specifies 
+what programming language <code><a href="#code">&lt;code&gt;</a></code> portions of the example are written in.
+
+**** Syntax
+
+<code><example lang="language">example text and code</example></code>
+
+<blockquote>
+<em>lang="language"</em><br />
+(optional) The name of the programming language <code><a href="#code">&lt;code&gt;</a></code> blocks in this example
+use.  This information can be used by user agents to provide
+intelligent access to examples in multiple languages.
+</blockquote>
+
+**** Example
+
+See <code><a href="#code">&lt;code&gt;<a/></code> for an example.
+
+*** <a name="exception">&lt;exception&gt;</a>
+
+This tag provides a way to specify the exceptions a method can throw.
+
+**** Syntax
+
+<code>&lt;exception cref="exception-type"&gt;description&lt;/exception&gt;</code>
+
+<blockquote>
+<em>cref="exception-type"</em><br />
+The name of an exception type.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;exception cref="System.IO.FileNotFoundException"&gt;
+    Thrown when the requested file is not found.
+&lt;/exception&gt;
+</pre>
+
+*** <a name="field">&lt;field&gt;</a>
+
+This tag is used to describe a field.
+
+**** Syntax
+
+<code>&lt;field name="fieldname"&gt;documentation&lt;/field&gt;</code>
+
+<blockquote>
+<em>name="fieldname"</em><br />
+The name of the field being documented.
+</blockquote>
+	
+**** Example
+
+<pre>
+&lt;field name="x"&gt;
+    &lt;summary&gt;
+        Instance variable &lt;c&gt;x&lt;/c&gt; represents the point's 
+	x-coordinate.
+    &lt;/summary&gt;
+&lt;/field&gt;
+</pre>
+
+*** <a name="list">&lt;list&gt;</a>
+
+This tag is used to create a list or table of items.  It may contain a 
+<code>&lt;listheader&gt;</code> block to define the heading row of either a table or 
+definition list.  (When defining a table, only an entry for 'term' in the 
+heading need be supplied.)
+
+Each item in the list is specified with an <code>&lt;item&gt;</code> block.  When creating a 
+definition list, both <code>&lt;term&gt;</code> and <code>&ltdescription&gt;</code> must be specified.  
+However, for a table, bulleted list, or numbered list, only <code>&lt;description&gt;</code>
+need be specified.
+
+**** Syntax
+
+<pre>
+&lt;list type="bullet" | "number" | "table"&gt;
+   &lt;listheader&gt;
+       &lt;term&gt;term&lt;/term&gt;
+       &lt;description&gt;description&lt;/description&gt;
+   &lt;/listheader&gt;
+   &lt;item&gt;
+       &lt;term&gt;term&lt;/term&gt;
+       &lt;description&gt;description&lt;/description&gt;
+   &lt;/item&gt;
+   
+   ...
+  
+&lt;/list&gt;
+</pre>
+	
+<blockquote>
+<em>term</em><br />
+The term to define, whose definition is in <code>&lt;description&gt;</code>.
+<br /><br />	
+<em>description</em><br />
+Either an item in a bullet or numbered list, or the definition of a <code>&lt;term&gt;</code>.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;list type="bullet"&gt;
+    &lt;item&gt;
+        &lt;description&gt;Item 1&lt;/description&gt;
+    &lt;/item&gt;
+    &lt;item&gt;
+        &lt;description&gt;Item 2&lt;/description&gt;
+    &lt;/item&gt;
+&lt;/list&gt;
+</pre>
+
+*** <a name="method">&lt;method&gt;</a>
+
+This tag is the overall containing tag for documenting a method.
+
+**** Syntax
+
+<code>&lt;method name="methodname"&gt;documentation&lt;/method&gt;</code>
+
+**** Example
+
+<pre>
+&lt;method name="op_Equality(Graphics.Point,Graphics.Point)"&gt;
+    &lt;summary&gt;
+        This operator determines whether two points have
+        the same location.
+    &lt;/summary&gt;
+    &lt;param name="p1"&gt;
+        &lt;c&gt;p1&lt;/c&gt; is the first Point to be compared.
+    &lt;/param&gt;
+    &lt;param name="p2"&gt;
+        &lt;c&gt;p2&lt;/c&gt; is the second Point to be compared.
+    &lt;/param&gt;
+    &lt;returns&gt;
+        True if the points have the same location and they
+        have the exact same type; otherwise, false.
+    &lt;/returns&gt;
+    &lt;seealso cref="Equals(System.Object)" /&gt;
+    &lt;seealso cref="op_Inequality(Graphics.Point,Graphics.Point)" /&gt;
+&lt;/method&gt;
+</pre>
+
+*** <a name="para">&lt;para&gt;</a>
+
+
+This tag is for use inside other tags such as <code>&lt;remarks&gt;</code> or <code>&lt;returns&gt;</code>, and 
+allows text to be structured into paragraphs.
+
+**** Syntax
+
+<code>&lt;para&gt;text&lt;/para&gt;</code>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    &lt;para&gt;
+    This is the entry point of the &lt;c&gt;Point&lt;/c&gt; class testing 
+    program.
+    &lt;/para&gt;
+    &lt;para&gt;
+    This program tests each method and operator, and
+    is intended to be run after any non-trivial maintenance has
+    been performed on the &lt;c&gt;Point&lt;/c&gt; class.
+    &lt;/para&gt;
+&lt;/summary&gt;
+</pre>
+
+*** <a name="param">&lt;param&gt;</a>
+
+This tag is used to describe a parameter for a method, constructor, or 
+indexer.
+
+**** Syntax
+
+<code>&lt;param name="name"&gt;description&lt;/param&gt;</code>
+	
+<blockquote>
+<em>name</em><br />
+The name of the parameter.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This is the entry point of the &lt;c&gt;Point&lt;/c&gt; 
+    class.
+&lt;/summary&gt;
+&lt;param name="xor"&gt;&lt;c&gt;xor&lt;/c&gt; is the new x-coordinate.&lt;/param&gt;
+&lt;param name "yor"&gt;&lt;c&gt;yor&lt;/c&gt; is the new y-coordinate.&lt;/param&gt;
+</pre>
+
+*** <a name="paramref">&lt;paramref&gt;</a>
+
+This tag is used to indicate that a word is a parameter.  User agents 
+could use this information for special formatting or hyperlink insertion.
+
+**** Syntax
+
+<code>&lt;paramref name="name" /&gt;</code>
+
+<blockquote>
+<em>name</em><br />
+The name of the parameter.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This constructor initializes the new Point to
+    (&lt;paramref name="xor" /&gt;,&lt;paramref name="yor" /&gt;).
+&lt;/summary&gt;
+&lt;param name="xor"&gt;&lt;c&gt;xor&lt;/c&gt; is the new x-coordinate.&lt;/param&gt;
+&lt;param name "yor"&gt;&lt;c&gt;yor&lt;/c&gt; is the new y-coordinate.&lt;/param&gt;
+</pre>
+
+*** <a name="permission">&lt;permission&gt;</a>
+
+This tag allows the security accessibility of a member to be documented.
+
+**** Syntax
+
+<code>&lt;permission cref="member"&gt;description&lt;/permission&gt;</code>
+
+<blockquote>
+<em>cref="member"</em><br />
+The name of a member.</br>
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;permission cref="System.Security.PermissionSet"&gt;
+    Everyone can access this method.
+&lt;/permission&gt;
+</pre>        
+
+*** <a name="property">&ltproperty&gt;</a>
+
+This tag is the overall containing tag for documenting a property.
+
+**** Syntax
+
+<code>&lt;property name="propertyname"&gt;documentation&lt;/property&gt;</code>
+
+<blockquote>
+<em>name="propertyname"</em><br />
+The name of the property.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;property name="X"&gt;
+    &lt;summary&gt;
+        Gets or sets the point's x-coordinate.
+    &lt;value&gt;
+        The point's x-coordinate.
+    &lt;/value&gt;
+&lt;/property&gt;
+</pre>
+
+
+*** <a name="remarks">&lt;remarks&gt;</a>
+
+This tag contains extended discussion and information about a member or
+a type. <em>[jbarn: This differs from both the ECMA docs and 
+portions of Microsoft's documentation, but seems consistent with both 
+common usage, and, more importantly, NDoc convention.]</em>
+
+**** Syntax
+
+<code>&lt;remarks&gt;description&lt;/remarks&gt;</code>
+	
+**** Example
+
+<pre>
+&lt;type name="Graphics.Point"&gt;
+    &lt;summary&gt;
+        Models a point in a two-dimensional plane.
+    &lt;/summary&gt;
+    &lt;remarks&gt;
+        Herein I might have an extended discussion of
+        the validity of Cartesian coordinate systems,
+        with examples pro and con, and perhaps
+        some code.
+    &lt;/remarks&gt;
+    
+    &lt;!-- ... --&gt;
+&lt;/type&gt;
+</pre>
+
+*** <a name="returns">&lt;returns&gt;</a>
+
+This tag is used to describe the return value of a method.
+
+**** Syntax
+
+<code>&lt;returns&gt;description&lt;/returns&gt;</code>
+
+**** Example
+
+<pre>
+&lt;method name="op_Inequality(Graphics.Point,Graphics.Point)"&gt;
+    &lt;summary&gt;
+        This operator determines whether two points have the
+        same location.
+    &lt;/summary&gt;
+    &lt;param name="p1"&gt;&lt;c&gt;p1&lt;/c&gt; is the first Point to be compared.&lt;/param&gt;
+    &lt;param name="p2"&gt;&lt;c&gt;p2&lt;/c&gt; is the second Point to be compared.&lt;/param&gt;
+    &lt;returns&gt;
+        True if the points do not have the same location and they
+        have the exact same type; otherwise, false.
+    &lt;/returns&gt;
+&lt;/method&gt;
+</pre>
+
+*** <a name="see">&lt;see&gt;</a>
+
+This tag allows a link to be specified within documentation text.  (Use 
+<code>&lt;seealso&gt;</code> to indicate links that should appear in a 'See Also' section.)
+
+**** Syntax
+
+<code>&lt;see cref="destination" /&gt;</code>
+
+<blockquote>
+<em>cref="destination"</em><br />
+A destination, such as a type or a member of a type.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This method changes the point's location to the given
+    coordinates.  This is an asinine way to insert a link,
+    but &lt;see cref="Equals(Object)" /&gt; to understand
+    how points are compared.
+&lt;/summary&gt;
+</pre>	
+
+*** <a name="seealso">&lt;seealso&gt;</a>
+
+This tag allows an entry to be generated for the 'See Also' section.  (Use 
+<code>&lt;see&gt;</code> to specify a link from within text.)
+
+**** Syntax
+
+<code>&lt;seealso cref="destination" /&gt;</code>
+	
+<blockquote>
+<em>cref="destination"</em><br />
+A destination, such as a type or a member of a type.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This method determines whether two Points have the
+    same location.
+&lt;/summary&gt;
+&lt;seealso cref="op_Equality(Graphics.Point,Graphics.Point)" /&gt;
+&lt;seealso cref="op_Inequality(Graphics.Point,Graphics.Point" /&gt;
+</pre>
+
+*** <a name="summary">&lt;summary&gt;</a>
+
+This tag contains a short summary of a member or type, 
+often one sentence. <em>[jbarn: This differs from both the ECMA docs and 
+portions of Microsoft's documentation, but seems consistent with both 
+common usage, and, more importantly, NDoc convention.]</em>
+
+**** Syntax
+
+<code>&lt;summary&gt;description&lt;/summary&gt;</code>
+
+**** Example
+
+<pre>
+&lt;summary&gt;
+    This is the entry point of the &lt;c&gt;Point&lt;/c&gt; class testing
+    program.
+&lt;/summary&gt;
+&lt;remarks&gt;
+    This program tests each method an operator, and is intended
+    to be run after any non-trivial maintenance is performed
+    on the &lt;c&gt;Point&lt;/c&gt; class.
+&lt;/remarks&gt;
+</pre>
+
+*** <a name="type">&lt;type&gt;</a>
+
+This tag is the overall containing tag for documenting a type.
+
+**** Syntax
+
+<code>&lttype name="typename" assembly="assemblyname"&gt;documentation&lt;/type&gt;</code>
+
+<blockquote>
+<em>name="typename"</em><br />
+The name of the type being documented.
+<br /><br />
+<em>assembly="assemblyname"</em><br />
+The assembly this type resides in.  This attribute is not required for nested types.
+</blockquote>
+
+**** Example
+
+<pre>
+&lt;type name="Graphics.Point" assembly="Point"&gt;
+    &lt;summary&gt;
+        Models a point in two-dimensional space.
+    &lt;/summary&gt;
+    
+    &lt;!-- members --&gt;
+    
+    &lt;field name="x"&gt;
+        &lt;summary&gt;
+            Represents the point's x-coordinate.
+        &lt;/summary&gt;
+    &lt;/field&gt;
+&lt;/type&gt;
+</pre>
+
+** <a name="appendix-a">Appendix A: Complete Example</a>
+
+<em>[jbarn: Please, please, don't take the human-readable portions of
+this example to be good guidelines for writing your own documentation.
+this XML is intended only to show structure.]</em>
+
+<pre>
+&lt;?xml version="1.0" encoding="UTF-8"?&gt;
+&lt;doc lang="en"&gt;
+    &lt;type name="Graphics.Point" assembly="Point"&gt;
+        &lt;summary&gt;
+            Models a point in a two-dimensional plane.
+        &lt;/summary&gt;
+        &lt;remarks&gt;
+            No useful remarks.
+        &lt;/remarks&gt;
+        
+        &lt;!-- fields --&gt;
+        &lt;field name="x"&gt;
+            &lt;summary&gt;
+                Instance variable &lt;c&gt;x&lt;/c&gt; represents the point's x-coordinate.
+            &lt;/summary&gt;
+        &lt;/field&gt;
+        
+        &lt;field name="y"&gt;
+            &lt;summary&gt;
+                Instance variable &lt;c&gt;y&lt;/c&gt; represents the point's y-coordinate.
+            &lt;/summary&gt;
+        &lt;/field&gt;
+        
+        &lt;!-- methods --&gt;
+        &lt;method name="#ctor"&gt;
+            &lt;summary&gt;
+                Initializes the new point to &lt;c&gt;(0,0)&lt;/c&gt;.
+            &lt;/summary&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="#ctor(System.Int32,System.Int32)"&gt;
+            &lt;summary&gt;
+                Initializes the new Point to (&lt;paramref name="xor" /&gt;,&lt;paramref name="yor" /&gt;).
+            &lt;/summary&gt;
+            &lt;param name="xor"&gt;&lt;c&gt;xor&lt;/c&gt; is the new x-coordinate.&lt;/param&gt;
+            &lt;param name="yor"&gt;&lt;c&gt;yor&lt;/c&gt; is the new y-coordinate.&lt;/param&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="Move(System.Int32,System.Int32)"&gt;
+            &lt;summary&gt;
+                This method changes the point's location to the given coordinates.
+            &lt;/summary&gt;
+            &lt;param name="xor"&gt;&lt;c&gt;xor&lt;/c&gt; is the new x-coordinate.&lt;/param&gt;
+            &lt;param name="yor"&gt;&lt;c&gt;yor&lt;/c&gt; is the new y-coordinate.&lt;/param&gt;
+            &lt;seealso cref="Translate(System.Int32,System.Int32)" /&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="Translate(System.Int32,System.Int32)"&gt;
+            &lt;summary&gt;This method changes the point's location by the given x- and y-offsets.&lt;/summary&gt;
+            &lt;remarks&gt;
+                &lt;example lang="C#"&gt;
+                    A C# example:
+                        &lt;code&gt;
+                            Point p = new Point(3, 5);
+                            p.Translate(-1, 3);
+                        &lt;/code&gt;
+                    This code results in &lt;c&gt;p&lt;/c&gt; having the value (2,8).
+                &lt;/example&gt;
+            &lt;/remarks&gt;
+            &lt;param name="xor"&gt;&lt;c&gt;xor&lt;/c&gt; is the relative x-offset.&lt;/param&gt;
+            &lt;param name="yor"&gt;&lt;c&gt;yor&lt;/c&gt; is the relative y-offset.&lt;/param&gt;
+            &lt;seealso cref="Move(System.Int32,System.Int32)" /&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="Equals(System.Object)"&gt;
+            &lt;summary&gt;This method determines whether two points have the same location.&lt;/summary&gt;
+            &lt;param name="o"&gt;&lt;c&gt;o&lt;/c&gt; is the object to be compared to the current object.&lt;/param&gt;
+            &lt;returns&gt;True if the Points have the same location and they have the exact same
+            type; otherwise, false.&lt;/returns&gt;
+            &lt;seealso cref="op_Equality(Graphics.Point,Graphics.Point)" /&gt;
+            &lt;seealso cref="op_Inequality(Graphics.Point,Graphics.Point" /&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="ToString"&gt;
+            &lt;summary&gt;Report a point's location as a string.&lt;/summary&gt;
+            &lt;returns&gt;A string representing a point's location, in the form (x,y), without any
+            leading, trailing, or embedded whitespace.&lt;/returns&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="op_Equality(Graphics.Point,Graphics.Point)"&gt;
+            &lt;summary&gt;This operator determines whether two points have the same location.&lt;/summary&gt;
+            &lt;param name="p1"&gt;&lt;c&gt;p1&lt;/c&gt; is the first Point to be compared.&lt;/param&gt;
+            &lt;param name="p2"&gt;&lt;c&gt;p2&lt;/c&gt; is the second Point to be compared.&lt;/param&gt;
+            &lt;returns&gt;True if the points have the same location and they have the exact same
+            type; otherwise, false.&lt;/returns&gt;
+            &lt;seealso cref="Equals(System.Object)" /&gt;
+            &lt;seealso cref="op_Inequality(Graphics.Point,Graphics.Point)" /&gt;
+        &lt;/method&gt;
+
+        &lt;method name="op_Inequality(Graphics.Point,Graphics.Point)"&gt;
+            &lt;summary&gt;This operator determines whether two points have the same location.&lt;/summary&gt;
+            &lt;param name="p1"&gt;&lt;c&gt;p1&lt;/c&gt; is the first Point to be compared.&lt;/param&gt;
+            &lt;param name="p2"&gt;&lt;c&gt;p2&lt;/c&gt; is the second Point to be compared.&lt;/param&gt;
+            &lt;returns&gt;True if the points do not have the same location and they have the exact same
+            type; otherwise, false.&lt;/returns&gt;
+            &lt;seealso cref="Equals(System.Object)" /&gt;
+            &lt;seealso cref="op_Equality(Graphics.Point,Graphics.Point)" /&gt;
+        &lt;/method&gt;
+        
+        &lt;method name="Main"&gt;
+            &lt;summary&gt;
+                This is the entry point of the Point class testing program.
+            &lt;/summary&gt;
+            &lt;remarks&gt;
+                &lt;para&gt;This program tests each method and operator, and is intended to be run after
+                any non-trivial maintenance has been performed on the Point class.&lt;/para&gt;
+            &lt;/remarks&gt;
+        &lt;/method&gt;
+        
+        &lt;!-- properties --&gt;
+        &lt;property name="X"&gt;
+            &lt;value&gt;Property &lt;c&gt;X&lt;/c&gt; represents the point's x-coordinate.&lt;/value&gt;
+        &lt;/property&gt;
+        
+        &lt;property name="Y"&gt;
+            &lt;value&gt;Property &lt;c&gt;y&lt;/c&gt; represents the point's y-coordinate.&lt;/value&gt;
+        &lt;/property&gt;
+    &lt;/type&gt;
+&lt;/doc&gt;
+</pre>
+
diff --git a/web/papers b/web/papers
new file mode 100644
index 00000000000..36a31988e83
--- /dev/null
+++ b/web/papers
@@ -0,0 +1,96 @@
+* JIT Compiler
+
+  <a
+  href="http://citeseer.nj.nec.com/vitek97efficient.html">
+  Efficient Type Inclusion Tests: Jahn Vitek, R. Nigel Horspool, Andres
+  Krall</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/cytron91efficiently.html">
+  Efficiently Computing Static Single Assignment Form and the Control
+  Dependence Graph: Ron Cytron, Jeanne Ferrante</a> 
+
+  <a
+  href="http://citeseer.nj.nec.com/193349.html">
+  Practical Improvements to the Construction and Destruction of Static Single Assignment Form: Preston Briggs,
+  Keith Cooper, Timothy Harvey, Taylor Simpson</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/krall98efficient.html">
+  Efficient JavaVM Just-in-Time Compilation: Andreas Krall</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/452617.html">Java for
+  Large-Scale Scientific Computations: Andreas Krall, Phillip Thomsich</a> 
+
+  <a
+  href="http://citeseer.nj.nec.com/117522.html">
+  Engineering Simple, Efficient Code Generator Generator: Christopher
+  W. Fraser, David R. Hanson, Todd A. Proebsting</a> 
+
+  <a
+  href="http://citeseer.nj.nec.com/proebsting92code.html">
+  Code Generation Techniques: Todd Alan Proebsting</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/74629.html">Fast,
+  Effective Code Generation in a Just-In-Time Java Compiler: Ali-Reza
+  Adl-Tabatabai Guei-Yuan Lueh, Vishesh M. Parikh, James M. Stichnoth...</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/bodik00abcd.html">
+  ABCD: Eliminating Array-Bounds Checks on Demand: Rastislav Bodik, Rajiv Gupta, Vivek Sarkar</a>
+
+* Register Allocation
+
+  <a
+  href="http://citeseer.nj.nec.com/poletto99linear.html">
+  Linear Scan Register Allocation: Massimiliano Poletto, Vivek Sarkar</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/traub98quality.html">
+  Quality and Speed in Linear-scan Register Allocation: Omri Traub, Glenn
+  Holloway, Michael D. Smith</a> 
+
+* Loop Transformations
+
+  <a
+  href="http://citeseer.nj.nec.com/bacon93compiler.html">
+  Compiler Transformations for High-Performance Computing: David Bacon</a>
+
+* Interpreter
+
+  <a
+  href="http://citeseer.nj.nec.com/470069.html">
+  vmgen-A Generator of Efficient Virtual Machine Interpreters: M. Anton
+  Ertl, David Gregg, Andreas Krall, Bernd Paysan</a>
+
+* Synchronization
+
+  <a
+  href="http://citeseer.nj.nec.com/krall98monitors.html">
+  Monitors and Exceptions - How to implement Java efficiently: Andreas Krall,
+  Mark Probst</a> 
+
+  <a
+  href="http://citeseer.nj.nec.com/bacon98thin.html">
+  Thin Locks: Featherweight Synchronization for Java: David Bacon</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/278639.html">
+  Featherweight Monitors with Bacon Bits: David Bacon</a>
+
+* Garbage Collection
+
+  <a
+  href="http://citeseer.nj.nec.com/wilson92uniprocessor.html">
+  Uniprocessor Garbage Collection Techniques: Paul Wilson</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/41666.html">
+  A Language-Independent Garbage Collector Toolkit: Richard Hudson, Eliot Moss, Amer Diwan, Christopher Weight</a>
+
+  <a
+  href="http://citeseer.nj.nec.com/seligmann95incremental.html">
+  Incremental Collection of Mature Objects: Richard Hudson, Eliot Moss</a>
+
diff --git a/web/pending-classes.in b/web/pending-classes.in
new file mode 100644
index 00000000000..1cdb5a4cb36
--- /dev/null
+++ b/web/pending-classes.in
@@ -0,0 +1,246 @@
+System.Object
+System.Exception
+System.ValueType
+System.Delegate
+System.MulticastDelegate
+System.Enum
+System.Activator
+System.ArgIterator
+System.__ComObject
+System.TypedReference
+System.Security.AllowPartiallyTrustedCallersAttribute
+System.Runtime.Serialization.Formatter
+System.Runtime.Serialization.FormatterConverter
+System.Runtime.Serialization.FormatterServices
+System.Runtime.Serialization.ObjectIDGenerator
+System.Runtime.Serialization.ObjectManager
+System.Reflection.ModuleResolveEventHandler
+System.Reflection.Pointer
+System.Globalization.CompareInfo
+System.Globalization.HebrewCalendar
+System.Globalization.HijriCalendar
+System.Globalization.JapaneseCalendar
+System.Globalization.KoreanCalendar
+System.Globalization.SortKey
+System.Globalization.StringInfo
+System.Globalization.TaiwanCalendar
+System.Globalization.TextElementEnumerator
+System.Globalization.TextInfo
+System.Globalization.ThaiBuddhistCalendar
+System.IO.IsolatedStorage.IsolatedStorageFile
+System.Reflection.Emit.MethodRental
+System.Runtime.CompilerServices.AccessedThroughPropertyAttribute
+System.Runtime.CompilerServices.CallConvCdecl
+System.Runtime.CompilerServices.CallConvStdcall
+System.Runtime.CompilerServices.CallConvThiscall
+System.Runtime.CompilerServices.CallConvFastcall
+System.Runtime.CompilerServices.CustomConstantAttribute
+System.Runtime.CompilerServices.DateTimeConstantAttribute
+System.Runtime.CompilerServices.DiscardableAttribute
+System.Runtime.CompilerServices.DecimalConstantAttribute
+System.Runtime.CompilerServices.CompilationRelaxationsAttribute
+System.Runtime.CompilerServices.CompilerGlobalScopeAttribute
+System.Runtime.CompilerServices.IDispatchConstantAttribute
+System.Runtime.CompilerServices.IsVolatile
+System.Runtime.CompilerServices.IUnknownConstantAttribute
+System.Runtime.CompilerServices.RequiredAttributeAttribute
+System.Runtime.InteropServices.ArrayWithOffset
+System.Runtime.InteropServices.DispIdAttribute
+System.Runtime.InteropServices.ClassInterfaceType
+System.Runtime.InteropServices.ClassInterfaceAttribute
+System.Runtime.InteropServices.ComVisibleAttribute
+System.Runtime.InteropServices.LCIDConversionAttribute
+System.Runtime.InteropServices.ComRegisterFunctionAttribute
+System.Runtime.InteropServices.ComUnregisterFunctionAttribute
+System.Runtime.InteropServices.ProgIdAttribute
+System.Runtime.InteropServices.ImportedFromTypeLibAttribute
+System.Runtime.InteropServices.IDispatchImplType
+System.Runtime.InteropServices.IDispatchImplAttribute
+System.Runtime.InteropServices.ComSourceInterfacesAttribute
+System.Runtime.InteropServices.ComConversionLossAttribute
+System.Runtime.InteropServices.TypeLibTypeFlags
+System.Runtime.InteropServices.TypeLibFuncFlags
+System.Runtime.InteropServices.TypeLibVarFlags
+System.Runtime.InteropServices.TypeLibTypeAttribute
+System.Runtime.InteropServices.TypeLibFuncAttribute
+System.Runtime.InteropServices.TypeLibVarAttribute
+System.Runtime.InteropServices.ComImportAttribute
+System.Runtime.InteropServices.PreserveSigAttribute
+System.Runtime.InteropServices.ComAliasNameAttribute
+System.Runtime.InteropServices.AutomationProxyAttribute
+System.Runtime.InteropServices.PrimaryInteropAssemblyAttribute
+System.Runtime.InteropServices.CoClassAttribute
+System.Runtime.InteropServices.ComEventInterfaceAttribute
+System.Runtime.InteropServices.COMException
+System.Runtime.InteropServices.ComMemberType
+System.Runtime.InteropServices.CurrencyWrapper
+System.Runtime.InteropServices.DispatchWrapper
+System.Runtime.InteropServices.ErrorWrapper
+System.Runtime.InteropServices.ExtensibleClassFactory
+System.Runtime.InteropServices.HandleRef
+System.Runtime.InteropServices.InvalidComObjectException
+System.Runtime.InteropServices.InvalidOleVariantTypeException
+System.Runtime.InteropServices.TypeLibImporterFlags
+System.Runtime.InteropServices.ExporterEventKind
+System.Runtime.InteropServices.ITypeLibExporterNotifySink
+System.Runtime.InteropServices.ITypeLibConverter
+System.Runtime.InteropServices.MarshalDirectiveException
+System.Runtime.InteropServices.ObjectCreationDelegate
+System.Runtime.InteropServices.RuntimeEnvironment
+System.Runtime.InteropServices.RegistrationServices
+System.Runtime.InteropServices.SafeArrayRankMismatchException
+System.Runtime.InteropServices.SafeArrayTypeMismatchException
+System.Runtime.InteropServices.SEHException
+System.Runtime.InteropServices.TypeLibConverter
+System.Runtime.InteropServices.BIND_OPTS
+System.Runtime.InteropServices.UCOMIBindCtx
+System.Runtime.InteropServices.UCOMIConnectionPointContainer
+System.Runtime.InteropServices.UCOMIConnectionPoint
+System.Runtime.InteropServices.UCOMIEnumMoniker
+System.Runtime.InteropServices.CONNECTDATA
+System.Runtime.InteropServices.UCOMIEnumConnections
+System.Runtime.InteropServices.UCOMIEnumConnectionPoints
+System.Runtime.InteropServices.UCOMIEnumString
+System.Runtime.InteropServices.UCOMIEnumVARIANT
+System.Runtime.InteropServices.FILETIME
+System.Runtime.InteropServices.UCOMIMoniker
+System.Runtime.InteropServices.UCOMIPersistFile
+System.Runtime.InteropServices.UCOMIRunningObjectTable
+System.Runtime.InteropServices.STATSTG
+System.Runtime.InteropServices.UCOMIStream
+System.Runtime.InteropServices.DESCKIND
+System.Runtime.InteropServices.BINDPTR
+System.Runtime.InteropServices.UCOMITypeComp
+System.Runtime.InteropServices.TYPEKIND
+System.Runtime.InteropServices.TYPEFLAGS
+System.Runtime.InteropServices.IMPLTYPEFLAGS
+System.Runtime.InteropServices.TYPEATTR
+System.Runtime.InteropServices.FUNCDESC
+System.Runtime.InteropServices.IDLFLAG
+System.Runtime.InteropServices.IDLDESC
+System.Runtime.InteropServices.PARAMFLAG
+System.Runtime.InteropServices.PARAMDESC
+System.Runtime.InteropServices.TYPEDESC
+System.Runtime.InteropServices.ELEMDESC
+System.Runtime.InteropServices.VARDESC
+System.Runtime.InteropServices.DISPPARAMS
+System.Runtime.InteropServices.EXCEPINFO
+System.Runtime.InteropServices.FUNCKIND
+System.Runtime.InteropServices.INVOKEKIND
+System.Runtime.InteropServices.CALLCONV
+System.Runtime.InteropServices.FUNCFLAGS
+System.Runtime.InteropServices.VARFLAGS
+System.Runtime.InteropServices.UCOMITypeInfo
+System.Runtime.InteropServices.SYSKIND
+System.Runtime.InteropServices.LIBFLAGS
+System.Runtime.InteropServices.TYPELIBATTR
+System.Runtime.InteropServices.UCOMITypeLib
+System.Runtime.InteropServices.UnknownWrapper
+System.Runtime.Remoting.IObjectHandle
+System.Runtime.Remoting.IRemotingTypeInfo
+System.Runtime.Remoting.IChannelInfo
+System.Runtime.Remoting.IEnvoyInfo
+System.Runtime.Remoting.RemotingConfiguration
+System.Runtime.Remoting.TypeEntry
+System.Runtime.Remoting.ActivatedClientTypeEntry
+System.Runtime.Remoting.ActivatedServiceTypeEntry
+System.Runtime.Remoting.WellKnownClientTypeEntry
+System.Runtime.Remoting.WellKnownServiceTypeEntry
+System.Runtime.Remoting.RemotingException
+System.Runtime.Remoting.ServerException
+System.Runtime.Remoting.RemotingTimeoutException
+System.Runtime.Remoting.RemotingServices
+System.Runtime.Remoting.InternalRemotingServices
+System.Runtime.Remoting.SoapServices
+System.Runtime.Remoting.Activation.UrlAttribute
+System.Runtime.Remoting.Messaging.IMessageSink
+System.Runtime.Remoting.Messaging.AsyncResult
+System.Runtime.Remoting.Messaging.CallContext
+System.Runtime.Remoting.Messaging.ILogicalThreadAffinative
+System.Runtime.Remoting.Messaging.InternalMessageWrapper
+System.Runtime.Remoting.Messaging.IMethodCallMessage
+System.Runtime.Remoting.Messaging.MethodCallMessageWrapper
+System.Runtime.Remoting.Messaging.HeaderHandler
+System.Runtime.Remoting.Messaging.IMessageCtrl
+System.Runtime.Remoting.Messaging.IRemotingFormatter
+System.Runtime.Remoting.Messaging.ReturnMessage
+System.Runtime.Remoting.Messaging.MethodCall
+System.Runtime.Remoting.Messaging.ConstructionCall
+System.Runtime.Remoting.Messaging.MethodResponse
+System.Runtime.Remoting.Messaging.ConstructionResponse
+System.Runtime.Remoting.Messaging.MethodReturnMessageWrapper
+System.Runtime.Remoting.Messaging.OneWayAttribute
+System.Runtime.Remoting.Messaging.MessageSurrogateFilter
+System.Runtime.Remoting.Messaging.RemotingSurrogateSelector
+System.Runtime.Remoting.Contexts.CrossContextDelegate
+System.Runtime.Remoting.Contexts.ContextProperty
+System.Runtime.Remoting.Contexts.IContextPropertyActivator
+System.Runtime.Remoting.Contexts.IContributeClientContextSink
+System.Runtime.Remoting.Contexts.IContributeDynamicSink
+System.Runtime.Remoting.Contexts.IContributeEnvoySink
+System.Runtime.Remoting.Contexts.IContributeObjectSink
+System.Runtime.Remoting.Contexts.IContributeServerContextSink
+System.Runtime.Serialization.Formatters.InternalRM
+System.Runtime.Serialization.Formatters.InternalST
+System.Runtime.Serialization.Formatters.SoapMessage
+System.Runtime.Serialization.Formatters.SoapFault
+System.Runtime.Serialization.Formatters.ServerFault
+System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+System.Security.Cryptography.CryptoConfig
+System.Security.Cryptography.KeyedHashAlgorithm
+System.Security.Cryptography.HMACSHA1
+System.Security.Cryptography.MACTripleDES
+System.Security.Cryptography.MaskGenerationMethod
+System.Security.Cryptography.PasswordDeriveBytes
+System.Security.Cryptography.PKCS1MaskGenerationMethod
+System.Security.Cryptography.RC2
+System.Security.Cryptography.RC2CryptoServiceProvider
+System.Security.Cryptography.RSACryptoServiceProvider
+System.Security.Cryptography.RSAOAEPKeyExchangeDeformatter
+System.Security.Cryptography.RSAOAEPKeyExchangeFormatter
+System.Security.Cryptography.RSAPKCS1KeyExchangeDeformatter
+System.Security.Cryptography.RSAPKCS1KeyExchangeFormatter
+System.Security.Cryptography.RSAPKCS1SignatureDeformatter
+System.Security.Cryptography.RSAPKCS1SignatureFormatter
+System.Security.Cryptography.SHA1Managed
+System.Security.Cryptography.TripleDES
+System.Security.Cryptography.TripleDESCryptoServiceProvider
+System.Security.Permissions.EnvironmentPermission
+System.Security.Permissions.FileDialogPermission
+System.Security.Permissions.IsolatedStorageFilePermission
+System.Security.Permissions.PrincipalPermissionAttribute
+System.Security.Permissions.SecurityPermissionAttribute
+System.Security.Permissions.PublisherIdentityPermissionAttribute
+System.Security.Permissions.PublisherIdentityPermission
+System.Security.Permissions.ReflectionPermission
+System.Security.Permissions.RegistryPermission
+System.Security.Permissions.PrincipalPermission
+System.Security.Permissions.SiteIdentityPermission
+System.Security.Permissions.StrongNameIdentityPermission
+System.Security.Permissions.StrongNamePublicKeyBlob
+System.Security.Permissions.UIPermission
+System.Security.Permissions.UrlIdentityPermission
+System.Security.Permissions.ZoneIdentityPermission
+System.Security.Policy.ApplicationDirectory
+System.Security.Policy.ApplicationDirectoryMembershipCondition
+System.Security.Policy.FirstMatchCodeGroup
+System.Security.Policy.Hash
+System.Security.Policy.HashMembershipCondition
+System.Security.Policy.NetCodeGroup
+System.Security.Policy.PermissionRequestEvidence
+System.Security.Policy.Publisher
+System.Security.Policy.PublisherMembershipCondition
+System.Security.Policy.Site
+System.Security.Policy.SiteMembershipCondition
+System.Security.Policy.StrongName
+System.Security.Policy.StrongNameMembershipCondition
+System.Security.Policy.UnionCodeGroup
+System.Security.Policy.Url
+System.Security.Policy.UrlMembershipCondition
+System.Security.Policy.Zone
+System.Security.Policy.ZoneMembershipCondition
+System.Security.Principal.WindowsIdentity
+System.Security.Principal.WindowsImpersonationContext
+System.Security.Principal.WindowsPrincipal
+System.Threading.CompressedStack
+

diff --git a/web/plans b/web/plans
new file mode 100755
index 00000000000..db6f6dde7c8
--- /dev/null
+++ b/web/plans
@@ -0,0 +1,15 @@
+* Plans
+
+	Here we are tracking some plans to particular pieces of
+	technology that are part of Mono.  
+
+	This is just a repository of information that is handy for
+	contributors.
+
+	Currently you can read our plans for <a
+	href="ado-net.html">ADO.NET</a>, <a
+	href="asp-net">ASP.NET</a>, <a href="java.html">Java</a> and
+	<a href="winforms.html">WinForms</a>.
+
+
+	
diff --git a/web/ppc b/web/ppc
new file mode 100644
index 00000000000..56026d4d6b1
--- /dev/null
+++ b/web/ppc
@@ -0,0 +1,33 @@
+
+* Mono PowerPC Port
+
+** Status
+
+	It passes and compiles the same amount of mono tests as on the x86 architecture.
+
+	mcs is self hosting on Linux/PPC.
+
+*** Interpreter
+
+	Up to date.
+
+*** Jitter
+
+	Start the port
+
+** Documentation
+
+*** PowerPC architecture:
+
+    <A HREF="http://e-www.motorola.com/brdata/PDFDB/docs/MPCFPE32B.pdf">PowerPC Programming environments manual</A><BR>
+    <A HREF="http://e-www.motorola.com/brdata/PDFDB/docs/MPC7410UM.pdf">G4 (7410) User's manual</A>
+
+	There's a very nice introduction to PowerPC assembly language
+	at <a
+	href="http://www-106.ibm.com/developerworks/library/l-ppc/">http://www-106.ibm.com/developerworks/library/l-ppc/</a>.
+
+*** Calling conventions:
+
+    <a href="http://www.esofta.com/softspecs.html">The PowerPC SystemV ABI specification</a>
+
+
diff --git a/web/projects b/web/projects
new file mode 100755
index 00000000000..47df1e71098
--- /dev/null
+++ b/web/projects
@@ -0,0 +1,24 @@
+* Open Projects
+
+	The .NET framework is a good first in terms of a new
+	development foundation, but it falls short of providing
+	higher-level components or building blocks for people to
+	reuse.  
+
+	A few ideas of projects and classes that would be useful to
+	develop applications follows:
+
+** EOG component
+
+** XmlStorageSystem component
+
+* Gtk# related projects
+
+	Gnome Canvas Bindings.  
+
+	Bezier Canvas Item Binding.
+
+* Graphical bindings
+
+	Binding for the Libart library
+
diff --git a/web/resources b/web/resources
index 880f682166e..32780ef458a 100644
--- a/web/resources
+++ b/web/resources
@@ -104,10 +104,19 @@
 	There are a number of related projects to Mono:
 
 	<ul>
+		
+		* <a
+		  href="http://qtcsharp.sourceforge.net">Qt#:</a> 
+		  C# bindings for the Qt toolkit.
+
 		* <a
 		  href="http://www.icsharpcode.net/OpenSource/SD/default.asp">Sharp
 		  Develop:</a> an IDE for the C# language written in C#.
 
+		* <a
+		  href="http://www.improve-technologies.com/alpha/esharp/">Eclipse
+	 	  Plugin for C#</a>
+
 		* <a 
 		  href="http://janet-js.sourceforge.net/">Janet:</a>
 		  an implemention of ECMAScript (the standarized
@@ -133,11 +142,13 @@
 	          href="http://www.southern-storm.com.au/portable_net.html">Portable.NET:</a>
 		  Another implementation of the CLI and C# compiler.
 
+		* A Free (GFDL) tutorial on C# in Spanish with examples, slides, and extras (under development). Get it <a href="http://geneura.ugr.es/~jaime/csharp/">here</a>. 
+
 	</ul>
 
 ** GNOME Documentation
 
-	Documnetation on GNOME, and the GNOME APIs is available from
+	Documentation on GNOME, and the GNOME APIs is available from
 	the <a href="http://developer.gnome.org">developer</a> site at
 	GNOME:
 
@@ -151,6 +162,34 @@
 		* <A
 	href="http://developer.gnome.org/arch/">Architecture Overview</a>
 	</ul>
-
 	
-	
\ No newline at end of file
+** Assembly Language Manuals online
+
+	<ul>
+		* <a href="http://www.agner.org/assem/#optimize">
+	Pentium optimization tutorial</a> by Agner Fog
+
+		* <a href="http://webster.cs.ucr.edu/">
+	Art of Assembly</a> (x86 only)
+
+		* Documentation for various CPUs
+	(<a href="http://www.mit.edu/afs/sipb/contrib/doc/specs/ic/cpu/">
+	x86, IA64, MIPS, ARM, Alpha</a>)
+
+		* <a href="http://www.heyrick.co.uk/assembler/">
+	ARM Assembler</a> tutorial
+
+		* PowerPC
+	<a href="http://www-3.ibm.com/chips/techlib/techlib.nsf/techdocs/852569B20050FF7785256996007558C6">
+	Compiler Writer's Guide</a>
+
+		* <a href="http://www.lightsoft.co.uk/Fantasm/Beginners/begin1.html">
+	Beginners Guide to PowerPC Assembler</a>
+	</ul>
+
+** Win32
+
+	<ul>
+		* Win32 <a href="http://www.jorgon.freeserve.co.uk/ExceptFrame.htm">
+	Structured Exception Handling (SEH)</a> internals (x86 specific)
+	</ul>
diff --git a/web/runtime b/web/runtime
index 0bd5ebc83a6..da16f189387 100644
--- a/web/runtime
+++ b/web/runtime
@@ -16,14 +16,8 @@
 		  easy-to-port runtime engine.
 	</ul>
 
-	Currently both runtimes are missing garbage collection.  We
-	are planning on using the ORP GC engine and deploy it by
-	middle January.  
-
-* COM and XPCOM
-
-	We plan on adding support for XPCOM on Unix and COM on Microsoft
-	Windows later in our development process.
+	Currently we are using the Bohem conservative garbage
+	collector, but we working on incorporating the ORP GC engine. 
 
 ** Executing MSIL/CIL images
 
@@ -60,18 +54,38 @@
 	layout the code to support non-IA32 architectures.  Our work
 	will be focused on getting a IA32 version running first.  
 
-	The JIT engine should work on Linux and Win32, although you
+	The JIT engine works on Linux and Win32, although you
 	will need to install the CygWin32 development tools to get a
 	Unix-like compilation environment (mostly we use GNU make in 
 	a few of the makefiles).
 
-** JIT Engine (<b>updated, Dec 18th, 2001</b>)
+** JIT Engine (<b>updated, July 8th, 2002</b>)
 
 	The JIT engine uses a code-generator generator approach for
 	compilation.  Given the properties of CIL byte codes, we can
 	take full advantage of a real instruction selector for our
 	code generator. 
 
+	The JIT engine implements a number of optimizations:
+
+	<ul>
+		* Opcode cost estimates (our architecture allows
+	 	  us to generate different code paths depending
+		  on the target CPU dynamically).
+		  
+		* Inlining.
+
+		* Constant folding.  
+
+		  Although compilers typically do
+		  constant folding, the combination of inlining with
+		  constant folding gives some very good results.
+
+		* Linear scan register allocation.  In the past,
+		  register allocation was our achilles heel, but now 
+		  we have left this problem behind.
+	</ul>
+
 	There are a couple of books that deal with this technique: "A
 	Retargetable C Compiler" and "Advanced Compiler Design and
 	Implementation" are good references.  You can also get a
@@ -88,8 +102,22 @@
 
 	</ul>
 
+** Future plans
+
+	We are evaluating the future directions for the JIT engine:
+	both from our needs (optimizations like inlining, better register allocation,
+	instruction scheduling, and porting to other CPUs).
+
+	We have not yet decided how we will evolve the JIT engine.  We
+	might just upgrade our current architecture, and provide optimizations as
+	an extra layer.
+
 ** Garbage Collection
 
+	Currently we are using the Boehm conservative GC.  Although our plans 
+	are to move to the Intel ORP GC engine, our plans on a next generation
+	dual-JIT engine have to be taken into account.
+
 	We will be using the Intel ORP GC engine as it provides a precise
 	garbage collector engine, similar to what is available on the
 	.NET environment. 
@@ -151,3 +179,21 @@
 
 	Initially we used libffi, but it was fairly slow, so we have
 	reused parts of the JIT work to create efficient PInvoke trampolines. 
+
+** Remoting
+
+	Mono has support for remoting and proxy objects, just like
+	.NET does.  The runtime provides these facilities.
+
+** Porting
+
+	If you are interested in porting the Mono runtime to other
+	platforms, you might find the pre-compiled <a
+	href="archive/mono-tests.tar.gz">Mono regression test
+	suite</a> useful to debug your implementation.
+
+* COM and XPCOM
+
+	We plan on adding support for XPCOM on Unix and COM on Microsoft
+	Windows later in our development process.
+
diff --git a/web/status b/web/status
index f175d7b0890..64948ba312f 100644
--- a/web/status
+++ b/web/status
@@ -11,7 +11,7 @@
 		* The Mono JIT engine (<b>mono</b>.  The JIT engine is
 	        the real
 		virtual machine that we support.  It is
-		functionaly currently, and we are improving its speed,
+		currently functional, and we are improving its speed,
 		and making it feature complete.
 
 		* A CIL bytecode interpreter (<b>mint</b>).  This
diff --git a/web/web/commands b/web/web/commands
index 59f89ec8784..30f03535518 100644
--- a/web/web/commands
+++ b/web/web/commands
@@ -4,20 +4,43 @@
 1,Runtime,runtime.html,runtime.src
 1,Classes,class-library.html,class-library.src
 1,Gtk#,http://gtk-sharp.sourceforge.net
-2,Class Status,class-status.html,class-status.src
+1,Class Status,class-status.html,class-status.src,cm/cormissing.css,cm/cormissing.js
+2,corlib,class-status-corlib.html,class-status-corlib.src,cm/cormissing.css,cm/cormissing.js
+2,System,class-status-System.html,class-status-System.src,cm/cormissing.css,cm/cormissing.js
+2,System.Xml,class-status-System.Xml.html,class-status-System.Xml.src,cm/cormissing.css,cm/cormissing.js
+2,System.Data,class-status-System.Data.html,class-status-System.Data.src,cm/cormissing.css,cm/cormissing.js
+2,System.Drawing,class-status-System.Drawing.html,class-status-System.Drawing.src,cm/cormissing.css,cm/cormissing.js
+2,System.Web,class-status-System.Web.html,class-status-System.Web.src,cm/cormissing.css,cm/cormissing.js
+2,System.Web.Services,class-status-System.Web.Services.html,class-status-System.Web.Services.src,cm/cormissing.css,cm/cormissing.js
 1,C# Compiler,c-sharp.html,c-sharp.src
 1,Status,status.html,status.src
 0,Download,download.html,download.src
 1,CVS access,ccvs.html,ccvs.src
 1,AnonCVS access,anoncvs.html,anoncvs.src
 0,Contributing,contributing.html,contributing.src
+1,Hackers,hackers.html,hackers.src
 1,Documentation,documentation.html,documentation.src
 1,Class Docs,classlib-doc.html,classlib-doc.src
+1,Doc format,monodoc-xml.html,monodoc-xml.src
 1,Test Suite,testing.html,testing.src
 1,Tools,tools.html,tools.src
 1,Porting,porting.html,porting.src
+2,PowerPC,ppc.html,ppc.src
+1,HOWTO,mono-contribution-howto.html,mono-contribution-howto.src
+0,Plans,plans.html,plans.src
+1,ADO.NET,ado-net.html,ado-net.src
+1,ASP.NET,asp-net.html,asp-net.src
+1,Java,java.html,java.src
+1,Windows.Forms,winforms.html,winforms.src
 0,Resources,resources.html,resources.src
+1,Beginning,mono-beginning.html,mono-beginning.src
 1,Mailing Lists,mailing-lists.html,mailing-lists.src
 1,Ideas,ideas.html,ideas.src
 1,Passport,passport.html,passport.src
+1,Books,books.html,books.src
+1,Papers,papers.html,papers.src
+1,Languages,languages.html,languages.src
+1,Debugging,jit-debug.html,jit-debug.src
+2,Example 1,jit-debug-sample.html,jit-debug-sample.src
+2,Example 2,jit-debug-sample2.html,jit-debug-sample2.src
 0,Contact,contact.html,contact.src
diff --git a/web/web/deploy/.cvsignore b/web/web/deploy/.cvsignore
new file mode 100755
index 00000000000..2d19fc766d9
--- /dev/null
+++ b/web/web/deploy/.cvsignore
@@ -0,0 +1 @@
+*.html
diff --git a/web/web/deploy/cm/c.gif b/web/web/deploy/cm/c.gif
new file mode 100644
index 00000000000..02c347efd0b
--- /dev/null
+++ b/web/web/deploy/cm/c.gif
diff --git a/web/web/deploy/cm/cormissing.css b/web/web/deploy/cm/cormissing.css
new file mode 100644
index 00000000000..1f22da54273
--- /dev/null
+++ b/web/web/deploy/cm/cormissing.css
@@ -0,0 +1,182 @@
+.y IMG
+{
+	border: 0px;
+	padding: 0px;
+	margin: 0px;
+	margin-right: 4px;
+	vertical-align: middle;
+}
+
+.y, .y_,
+.n, .n_,
+.c, .c_,
+.c, .c_,
+.d, .d_,
+.en, .en_,
+.i, .i_,
+.s, .s_,
+.e, .e_,
+.f, .f_,
+.m, .m_,
+.o, .o_,
+.p, .p_,
+.r, .r_,
+.x, .x_
+{
+	FONT: 10px 'Verdana';
+	margin-left: 20px;
+}
+
+.y_ .n,
+.y_ .n_,
+.n_ .c,
+.n_ .c_,
+.n_ .s,
+.n_ .s_,
+.n_ .d,
+.n_ .d_,
+.n_ .en,
+.n_ .en_,
+.n_ .i,
+.n_ .i_,
+.c_ .c,
+.c_ .c_,
+.c_ .e,
+.c_ .e_,
+.c_ .f,
+.c_ .f_,
+.c_ .m,
+.c_ .m_,
+.c_ .o,
+.c_ .o_,
+.c_ .p,
+.c_ .p_,
+.c_ .r,
+.c_ .r_,
+.c_ .x,
+.c_ .x_,
+.c_ .i,
+.c_ .i_,
+.d_ .c,
+.d_ .c_,
+.d_ .e,
+.d_ .e_,
+.d_ .f,
+.d_ .f_,
+.d_ .m,
+.d_ .m_,
+.d_ .o,
+.d_ .o_,
+.d_ .p,
+.d_ .p_,
+.d_ .r,
+.d_ .r_,
+.d_ .x,
+.d_ .x_,
+.en_ .c,
+.en_ .c_,
+.en_ .e,
+.en_ .e_,
+.en_ .f,
+.en_ .f_,
+.en_ .m,
+.en_ .m_,
+.en_ .o,
+.en_ .o_,
+.en_ .p,
+.en_ .p_,
+.en_ .r,
+.en_ .r_,
+.en_ .x,
+.en_ .x_,
+.i_ .c,
+.i_ .c_,
+.i_ .e,
+.i_ .e_,
+.i_ .f,
+.i_ .f_,
+.i_ .m,
+.i_ .m_,
+.i_ .o,
+.i_ .o_,
+.i_ .p,
+.i_ .p_,
+.i_ .r,
+.i_ .r_,
+.i_ .x,
+.i_ .x_,
+.i_ .i,
+.i_ .i_,
+.s_ .c,
+.s_ .c_,
+.s_ .e,
+.s_ .e_,
+.s_ .f,
+.s_ .f_,
+.s_ .m,
+.s_ .m_,
+.s_ .o,
+.s_ .o_,
+.s_ .p,
+.s_ .p_,
+.s_ .r,
+.s_ .r_,
+.s_ .x,
+.s_ .x_,
+.s_ .i,
+.s_ .i_,
+
+.e_ .r,
+.e_ .r_,
+.e_ .o,
+.e_ .o_,
+.f_ .r,
+.f_ .r_,
+.f_ .o,
+.f_ .o_,
+.m_ .r,
+.m_ .r_,
+.m_ .o,
+.m_ .o_,
+.o_ .r,
+.o_ .r_,
+.o_ .o,
+.o_ .o_,
+.p_ .r,
+.p_ .r_,
+.p_ .o,
+.p_ .o_,
+.r_ .r,
+.r_ .r_,
+.r_ .o,
+.r_ .o_,
+.x_ .r,
+.x_ .r_,
+.x_ .o,
+.x_ .o_
+{
+	display: none;
+}
+
+.t
+{
+	cursor: pointer;
+	margin-right: 8px;
+}
+
+.filter
+{
+	cursor: pointer;
+	vertical-align: middle;
+}
+
+
+.st
+{
+	margin-left: 20px;
+}
+
+.l
+{
+	cursor: pointer;
+}
diff --git a/web/web/deploy/cm/cormissing.js b/web/web/deploy/cm/cormissing.js
new file mode 100644
index 00000000000..e6b12ac4fd2
--- /dev/null
+++ b/web/web/deploy/cm/cormissing.js
@@ -0,0 +1,392 @@
+function toggle (elt)
+{
+	if (elt == null)
+		return;
+
+	var eltLink = elt.firstChild;
+	if (eltLink != null && eltLink.className == 't')	// toggle
+	{
+		var ich = elt.className.indexOf ('_');
+		if (ich < 0)
+		{
+			eltLink.src = 'cm/tp.gif';
+			elt.className += '_';
+		}
+		else
+		{
+			eltLink.src = 'cm/tm.gif';
+			elt.className = elt.className.slice (0, ich);
+		}
+	}
+}
+
+function setView (elt, fView)
+{
+	var eltLink = elt.firstChild;
+	if (eltLink != null && eltLink.className == 't')	// toggle
+	{
+		var ich = elt.className.indexOf ('_');
+		if (ich < 0 && !fView)
+		{
+			eltLink.src = 'cm/tp.gif';
+			elt.className += '_';
+		}
+		else if (ich >= 0 && fView)
+		{
+			eltLink.src = 'cm/tm.gif';
+			elt.className = elt.className.slice (0, ich);
+		}
+	}
+}
+
+function trimSrc (strSrc)
+{
+	return strSrc.slice (strSrc.lastIndexOf ('/') + 1, strSrc.lastIndexOf ('.'));
+}
+
+function getChildrenByTagName (elt, strTag)
+{
+	strTag = strTag.toLowerCase ();
+	var rgChildren = new Array ();
+	var eltChild = elt.firstChild;
+	while (eltChild)
+	{
+		if (eltChild.tagName && eltChild.tagName.toLowerCase () == strTag)
+			rgChildren.push (eltChild);
+		eltChild = eltChild.nextSibling;
+	}
+	return rgChildren;
+}
+
+function viewAll (elt, dictTypes)
+{
+	var fView = false;
+	var rgImages = getChildrenByTagName (elt, 'IMG');
+	var cImages = rgImages.length;
+	for (var iImage = 0; iImage < cImages; iImage++)
+	{
+		var strImage = trimSrc (rgImages [iImage].src);
+		if (dictTypes [strImage])
+		{
+			fView = true;
+			break;
+		}
+	}
+	var rgElts = getChildrenByTagName (elt, 'DIV');
+	var cElts = rgElts.length;
+	if (cElts != 0)
+	{
+		var iElt;
+		for (iElt = 0; iElt < cElts; iElt ++)
+			fView |= viewAll (rgElts [iElt], dictTypes);
+	}
+	elt.style.display = fView ? '' : 'none';
+	return fView;
+}
+
+function getView (elt)
+{
+	var eltLink = elt.firstChild;
+	if (eltLink != null && eltLink.className == 't')	// toggle
+	{
+		var ich = elt.className.indexOf ('_');
+		if (ich < 0)
+			return true;
+	}
+	return false;
+}
+
+function getParentDiv (elt)
+{
+	if (elt)
+	{
+		do
+		{
+			elt = elt.parentNode;
+		}
+		while (elt && elt.tagName != 'DIV');
+	}
+
+	return elt;
+}
+
+function getName (elt)
+{
+	var rgSpans = getChildrenByTagName (elt, 'SPAN');
+	for (var iSpan = 0; iSpan < rgSpans.length; iSpan ++)
+	{
+		var span = rgSpans [iSpan];
+		if (span.className == 'l')	// label
+		{
+			if (span.innerText)
+				return span.innerText;
+			else
+				return span.firstChild.nodeValue;
+		}
+	}
+	return null;
+}
+
+function clickHandler (evt)
+{
+	var elt;
+	if (document.layers)
+		elt = evt.taget;
+	else if (window.event && window.event.srcElement)
+	{
+		elt = window.event.srcElement;
+		evt = window.event;
+	}
+	else if (evt && evt.stopPropagation)
+		elt = evt.target;
+	
+	if (!elt.className && elt.parentNode)
+		elt = elt.parentNode;
+
+	if (elt.className == 'l')	// label
+	{
+		var strClass;
+		var strField;
+		var strNamespace;
+		var strAssembly;
+
+		elt = getParentDiv (elt);
+		var strEltClass = elt.className;
+		if (strEltClass.charAt (strEltClass.length - 1) == '_')
+			strEltClass = strEltClass.slice (0, strEltClass.length - 1);
+
+		if (strEltClass == 'x')	// constructor
+		{
+			strField = 'ctor';
+			elt = getParentDiv (elt);
+		}
+		else
+		if (strEltClass == 'm' ||	// method
+			strEltClass == 'p' ||	// property
+			strEltClass == 'e' ||	// event
+			strEltClass == 'f')	// field
+		{
+			strField = getName (elt).toLowerCase ();
+			var match = strField.match ( /[\.A-Z0-9_]*/i );
+			if (match)
+				strField = match [0];
+			elt = getParentDiv (elt);
+
+		}
+
+		var strEltClass = elt.className;
+		if (strEltClass.charAt (strEltClass.length - 1) == '_')
+			strEltClass = strEltClass.slice (0, strEltClass.length - 1);
+
+		if (strEltClass == 'c' ||	// class
+			strEltClass == 's' ||	// struct
+			strEltClass == 'i' ||	// struct
+			strEltClass == 'd' ||	// delegate
+			strEltClass == 'en')	// enum
+		{
+			strClass = getName (elt);
+			if (strEltClass == 'en')
+				strField = null;
+			elt = getParentDiv (elt);
+		}
+
+		var strEltClass = elt.className;
+		if (strEltClass.charAt (strEltClass.length - 1) == '_')
+			strEltClass = strEltClass.slice (0, strEltClass.length - 1);
+
+		if (strEltClass == 'n')
+		{
+			strNamespace = getName (elt);
+			elt = getParentDiv (elt);
+		}
+
+		var strEltClass = elt.className;
+		if (strEltClass.charAt (strEltClass.length - 1) == '_')
+			strEltClass = strEltClass.slice (0, strEltClass.length - 1);
+
+		if (strEltClass == 'y')
+		{
+			strAssembly = getName (elt);
+		}
+
+		if (evt.ctrlKey)
+		{
+			var strRoot = 'http://cvs.hispalinux.es/cgi-bin/cvsweb/mcs/class/';
+			var strExtra = '?cvsroot=Mono';
+
+			if (strAssembly)
+			{
+				strRoot = strRoot + strAssembly + '/';
+				if (strNamespace)
+				{
+					strRoot = strRoot + strNamespace + '/';
+					if (strClass)
+					{
+						strRoot += strClass + '.cs';
+						strExtra += '&rev=1';
+					}
+				}
+				window.open (strRoot + strExtra, 'CVS');
+			}
+		}
+		else if (strNamespace)
+		{
+			var re = /\./g ;
+			strNamespace = strNamespace.toLowerCase ().replace (re, '');
+			if (strClass)
+				strNamespace += strClass.toLowerCase () + 'class';
+			if (strField)
+				strNamespace += strField;
+			if (strClass || strField)
+				strNamespace += 'topic';
+
+			window.open ('http://msdn.microsoft.com/library/default.asp?url=/library/en-us/cpref/html/frlrf' + strNamespace + '.asp', 'MSDN');
+		}
+	}
+	else
+	{
+		if (elt.parentNode && elt.parentNode.className == 't')	// toggle
+			elt = elt.parentNode;
+		else if (elt.className != 't')	// toggle
+			return;
+
+		while (elt != null && elt.tagName != 'DIV')
+			elt = elt.parentNode;
+		
+		if (evt.shiftKey)
+		{
+			var rgElts = getChildrenByTagName (elt, 'DIV');
+			var cElts = rgElts.length;
+			if (cElts != 0)
+			{
+				var fView = false;
+				var iElt;
+				for (iElt = 0; iElt < cElts; iElt ++)
+				{
+					if (getView (rgElts [iElt]))
+					{
+						fView = true;
+						break;
+					}
+				}
+				for (iElt = 0; iElt < cElts; iElt ++)
+				{
+					setView (rgElts [iElt], !fView);
+				}
+			}
+		}
+		else if (evt.ctrlKey)
+		{
+			setView (elt, true);
+			var eltParent = getParentDiv (elt);
+			while (eltParent)
+			{
+				var rgSiblings = getChildrenByTagName (eltParent, 'DIV');
+				var cSiblings = rgSiblings.length;
+				for (var iSibling = 0; iSibling < cSiblings; iSibling++)
+				{
+					var eltSibling = rgSiblings [iSibling];
+					if (eltSibling != elt)
+					{
+						setView (eltSibling, false);
+					}
+				}
+				elt = eltParent;
+				eltParent = getParentDiv (elt);
+			}
+		}
+		else
+			toggle (elt);
+	}
+
+	return false;
+}
+
+function filterTree ()
+{
+	var eltMissing = document.getElementById ('missing');
+	var eltTodo = document.getElementById ('todo');
+	var eltExtra = document.getElementById ('extra');
+	var eltErrors = document.getElementById ('errors');
+
+	var dictTypes = new Object ();
+	if (eltMissing.checked)
+		dictTypes ['sm'] = true;
+	if (eltTodo.checked)
+		dictTypes ['st'] = true;
+	if (eltErrors.checked)
+		dictTypes ['se'] = true;
+	if (eltExtra.checked)
+		dictTypes ['sx'] = true;
+//	dictTypes ['sc'] = true;
+
+	viewAll (document.getElementById ('ROOT'), dictTypes);
+}
+
+function selectMissing ()
+{
+	toggleFilter ('missing');
+}
+
+function selectTodo ()
+{
+	toggleFilter ('todo');
+}
+
+function selectExtra ()
+{
+	toggleFilter ('extra');
+}
+
+function selectErrors ()
+{
+	toggleFilter ('errors');
+}
+
+function toggleFilter (strFilter)
+{
+	var eltTodo = document.getElementById ('todo');
+	var eltMissing = document.getElementById ('missing');
+	var eltExtra = document.getElementById ('extra');
+	var eltErrors = document.getElementById ('errors');
+
+	var eltToggle = document.getElementById (strFilter);
+	if (window && window.event && window.event.shiftKey)
+	{
+		eltMissing.checked = eltTodo.checked = eltExtra.checked = eltErrors.checked = false;
+		eltToggle.checked = true;
+	}
+	else
+	if (!eltTodo.checked && !eltMissing.checked && !eltExtra.checked && !eltErrors.checked)
+	{
+		eltMissing.checked = eltTodo.checked = eltExtra.checked = eltErrors.checked = true;
+		eltToggle.checked = false;
+	}
+	filterTree ();
+}
+
+function onLoad ()
+{
+	var eltMissing = document.getElementById ('missing');
+	var eltTodo = document.getElementById ('todo');
+	var eltExtra = document.getElementById ('extra');
+	var eltErrors = document.getElementById ('errors');
+	eltMissing.checked = eltTodo.checked = eltExtra.checked = eltErrors.checked = true;
+}
+
+if (document.layers)
+{
+	document.captureEvents (Event.MOUSEUP);
+	document.onmouseup = clickHandler;
+}
+else if (document.attachEvent)
+{
+	document.attachEvent('onclick', clickHandler);
+}
+else if (document.addEventListener)
+{
+	document.addEventListener('click', clickHandler, false);
+}
+else 
+	document.onclick = clickHandler;
+
diff --git a/web/web/deploy/cm/d.gif b/web/web/deploy/cm/d.gif
new file mode 100644
index 00000000000..c9735952f33
--- /dev/null
+++ b/web/web/deploy/cm/d.gif
diff --git a/web/web/deploy/cm/e.gif b/web/web/deploy/cm/e.gif
new file mode 100644
index 00000000000..1137246bfae
--- /dev/null
+++ b/web/web/deploy/cm/e.gif
diff --git a/web/web/deploy/cm/en.gif b/web/web/deploy/cm/en.gif
new file mode 100644
index 00000000000..00026b77300
--- /dev/null
+++ b/web/web/deploy/cm/en.gif
diff --git a/web/web/deploy/cm/f.gif b/web/web/deploy/cm/f.gif
new file mode 100644
index 00000000000..f78a2f53bbc
--- /dev/null
+++ b/web/web/deploy/cm/f.gif
diff --git a/web/web/deploy/cm/i.gif b/web/web/deploy/cm/i.gif
new file mode 100644
index 00000000000..56cd032a565
--- /dev/null
+++ b/web/web/deploy/cm/i.gif
diff --git a/web/web/deploy/cm/m.gif b/web/web/deploy/cm/m.gif
new file mode 100644
index 00000000000..75fe3586d48
--- /dev/null
+++ b/web/web/deploy/cm/m.gif
diff --git a/web/web/deploy/cm/n.gif b/web/web/deploy/cm/n.gif
new file mode 100644
index 00000000000..f6fa746304d
--- /dev/null
+++ b/web/web/deploy/cm/n.gif
diff --git a/web/web/deploy/cm/p.gif b/web/web/deploy/cm/p.gif
new file mode 100644
index 00000000000..b79d0dd7edb
--- /dev/null
+++ b/web/web/deploy/cm/p.gif
diff --git a/web/web/deploy/cm/r.gif b/web/web/deploy/cm/r.gif
new file mode 100644
index 00000000000..a3ef0f38ef0
--- /dev/null
+++ b/web/web/deploy/cm/r.gif
diff --git a/web/web/deploy/cm/s.gif b/web/web/deploy/cm/s.gif
new file mode 100644
index 00000000000..f2fd5c8aee2
--- /dev/null
+++ b/web/web/deploy/cm/s.gif
diff --git a/web/web/deploy/cm/sc.gif b/web/web/deploy/cm/sc.gif
new file mode 100644
index 00000000000..b02afd9b2e0
--- /dev/null
+++ b/web/web/deploy/cm/sc.gif
diff --git a/web/web/deploy/cm/se.gif b/web/web/deploy/cm/se.gif
new file mode 100644
index 00000000000..1c46eaa5887
--- /dev/null
+++ b/web/web/deploy/cm/se.gif
diff --git a/web/web/deploy/cm/sm.gif b/web/web/deploy/cm/sm.gif
new file mode 100644
index 00000000000..0c7194786d5
--- /dev/null
+++ b/web/web/deploy/cm/sm.gif
diff --git a/web/web/deploy/cm/st.gif b/web/web/deploy/cm/st.gif
new file mode 100644
index 00000000000..067582cb398
--- /dev/null
+++ b/web/web/deploy/cm/st.gif
diff --git a/web/web/deploy/cm/sx.gif b/web/web/deploy/cm/sx.gif
new file mode 100644
index 00000000000..2c8ca547929
--- /dev/null
+++ b/web/web/deploy/cm/sx.gif
diff --git a/web/web/deploy/cm/tb.gif b/web/web/deploy/cm/tb.gif
new file mode 100644
index 00000000000..ee68c5a356b
--- /dev/null
+++ b/web/web/deploy/cm/tb.gif
diff --git a/web/web/deploy/cm/tm.gif b/web/web/deploy/cm/tm.gif
new file mode 100644
index 00000000000..3c8f18aecea
--- /dev/null
+++ b/web/web/deploy/cm/tm.gif
diff --git a/web/web/deploy/cm/tp.gif b/web/web/deploy/cm/tp.gif
new file mode 100644
index 00000000000..8b7435361b7
--- /dev/null
+++ b/web/web/deploy/cm/tp.gif
diff --git a/web/web/deploy/cm/y.gif b/web/web/deploy/cm/y.gif
new file mode 100644
index 00000000000..08f00d4ea11
--- /dev/null
+++ b/web/web/deploy/cm/y.gif
diff --git a/web/web/deploy/images/bgsquares.gif b/web/web/deploy/images/bgsquares.gif
new file mode 100644
index 00000000000..864bcd44038
--- /dev/null
+++ b/web/web/deploy/images/bgsquares.gif
diff --git a/web/web/deploy/images/bgsquares.png b/web/web/deploy/images/bgsquares.png
new file mode 100644
index 00000000000..a9e2bb94dbb
--- /dev/null
+++ b/web/web/deploy/images/bgsquares.png
diff --git a/web/web/deploy/images/bgsquares.xcf.gz b/web/web/deploy/images/bgsquares.xcf.gz
new file mode 100644
index 00000000000..200b5805615
--- /dev/null
+++ b/web/web/deploy/images/bgsquares.xcf.gz
diff --git a/web/web/deploy/images/mono.gif b/web/web/deploy/images/mono.gif
new file mode 100644
index 00000000000..298976a07b7
--- /dev/null
+++ b/web/web/deploy/images/mono.gif
diff --git a/web/web/deploy/images/mono.png b/web/web/deploy/images/mono.png
new file mode 100644
index 00000000000..21709009d60
--- /dev/null
+++ b/web/web/deploy/images/mono.png
diff --git a/web/web/deploy/images/pixel.gif b/web/web/deploy/images/pixel.gif
new file mode 100644
index 00000000000..a4f37d7e02e
--- /dev/null
+++ b/web/web/deploy/images/pixel.gif
diff --git a/web/web/deploy/images/pixel.png b/web/web/deploy/images/pixel.png
new file mode 100644
index 00000000000..85cfd14929a
--- /dev/null
+++ b/web/web/deploy/images/pixel.png
diff --git a/web/web/htmlify b/web/web/htmlify
index a2b2706f16e..e4e61961f3b 100644
--- a/web/web/htmlify
+++ b/web/web/htmlify
@@ -9,10 +9,17 @@ while (<>){
 		print "<h2>$1</h2>\n";
 	} elsif (/^\*\*\* (.*)$/) {
 		print "<h3>$1</h3>\n";
+	} elsif (/^\*\*\*\* (.*)$/) {
+		print "<h4>$1</h4>\n";
 	} elsif (/^$/) {
 		print "<p>\n";
 	} elsif (/^\t\t\* (.*)$/) {
 		print "<li>$1\n";
+	} elsif (/^\@item (.*)$/){
+	        $name = $link = $1;
+		$link =~ s/ //g;
+	        print "<a name=\"$link\">\n";
+	        print "<h2>$name</h2>\n";
 	} elsif (/^Q: (.*)$/){
 		print "<p><a name=\"q$q\"></a><b>Question $q:</b> $1\n";
 		$q++;
diff --git a/web/web/images/xml.gif b/web/web/images/xml.gif
new file mode 100755
index 00000000000..ecb09575418
--- /dev/null
+++ b/web/web/images/xml.gif
diff --git a/web/web/makefile b/web/web/makefile
index 3f181ca5b08..7c30ed303b3 100644
--- a/web/web/makefile
+++ b/web/web/makefile
@@ -1,53 +1,130 @@
-# Until we are ready:
-#	../class-library	\
-
-SOURCES=	\
-	../anoncvs		\
-	../contributing  	\
-	../class-status		\
-	../class-library	\
-	../classlib-doc		\
-	../contact		\
-	../c-sharp		\
-	../ccvs			\
-	../documentation	\
-	../download		\
-	../faq			\
-	../gcc-frontend		\
-	../index		\
-	../ideas		\
-	../mailing-lists	\
-	../passport		\
-	../rationale		\
-	../resources		\
-	../roadmap		\
-	../runtime		\
-	../status		\
-	../testing		\
-	../porting		\
-	../tools
+CSCRIPT = $(SYSTEMROOT)/system32/cscript.exe
+CSC=csc
+
+CORCOMPARE=../../../mcs/tools/corcompare
+
+OBJECTS=	\
+	deploy/ado-net.html				\
+	deploy/anoncvs.html				\
+	deploy/asp-net.html				\
+	deploy/books.html				\
+	deploy/contributing.html			\
+	deploy/class-status.html			\
+        deploy/class-status-corlib.html         	\
+        deploy/class-status-System.html         	\
+        deploy/class-status-System.Xml.html     	\
+        deploy/class-status-System.Drawing.html 	\
+        deploy/class-status-System.Data.html    	\
+        deploy/class-status-System.Web.html     	\
+        deploy/class-status-System.Web.Services.html    \
+	deploy/class-library.html			\
+	deploy/classlib-doc.html			\
+	deploy/contact.html				\
+	deploy/c-sharp.html				\
+	deploy/ccvs.html				\
+	deploy/documentation.html			\
+	deploy/download.html				\
+	deploy/faq.html					\
+	deploy/gcc-frontend.html			\
+	deploy/hackers.html				\
+	deploy/index.html				\
+	deploy/ideas.html				\
+	deploy/java.html				\
+	deploy/jit-debug.html				\
+	deploy/jit-debug-sample.html			\
+	deploy/jit-debug-sample2.html			\
+	deploy/languages.html				\
+	deploy/mailing-lists.html			\
+	deploy/mono-beginning.html			\
+	deploy/mono-contribution-howto.html		\
+	deploy/monodoc-xml.html				\
+	deploy/papers.html				\
+	deploy/passport.html				\
+	deploy/plans.html				\
+	deploy/porting.html				\
+	deploy/ppc.html					\
+	deploy/rationale.html				\
+	deploy/resources.html				\
+	deploy/roadmap.html				\
+	deploy/runtime.html				\
+	deploy/status.html				\
+	deploy/testing.html				\
+	deploy/tools.html				\
+	deploy/winforms.html
+
+# deploy/class-status-System.html		\
 
 NON_HTML_SOURCES=	\
 	../mono-build.sh	\
 	../mono-build-w32.sh
 
 
-all:
-	-mkdir site
-	for i in $(SOURCES); do \
-		perl htmlify $$i > `basename $$i`.src; \
-	done;
+all: $(OBJECTS) deploy/index.rss 
+	perl process.pl commands template.html.in deploy
+
+tutorial: mono-beginning.html.stamp mono-beginning.pdf 
+	cp -a mono-beginning mono-beginning.xml mono-beginning.pdf deploy
+
+mono-beginning.html.stamp: mono-beginning.xml
+	db2html mono-beginning.xml
+	touch mono-beginning.html.stamp
+
+mono-beginning.pdf: mono-beginning.xml
+	db2pdf mono-beginning.xml
+
+mono-beginning.xml: ../mono-beginning.xml
+	cp ../mono-beginning.xml .
 
-	perl process.pl commands template.html.in .
+deploy/index.rss: mono-rss.exe ../index
+	./mono-rss.exe ../index deploy/index.rss
+
+mono-rss.exe: mono-rss.cs rss.cs 
+	$(CSC) mono-rss.cs rss.cs
 
 clean:
-	for i in $(SOURCES); do \
-		rm -f `basename $$i`.src `basename $$i`.html; \
-	done;
+	rm -f $(OBJECTS) $(patsubst deploy/%.html,src/%.src, $(OBJECTS)) src/*.xml src/*.html.in ../class-status-* ../class-status
 
 push:
-	scp -P 2200 *.html $(NON_HTML_SOURCES) www@www.ximian.com:/web/cvsmodules/mono
-	echo scp *.html migueldeicaza@mononet.sf.net:/home/groups/m/mo/mononet/htdocs
+	cp -f $(NON_HTML_SOURCES) deploy
+	echo scp -P 2200 -r deploy/* www@www.ximian.com:/web/cvsmodules/mono
+	(cd deploy; rsync --verbose --recursive --checksum --update --rsh='ssh -p 2200' . www@www.ximian.com:/web/cvsmodules/mono )
 
 push2: 
-	scp *.html primates:public_html/xxx
+	scp -r deploy/* primates:public_html/xxx
+
+$(OBJECTS): $(patsubst deploy/%.html,src/%.src, $(OBJECTS))
+
+#.PRECIOUS: $(patsubst deploy/%.html,src/%.src, $(OBJECTS))
+
+
+
+.PRECIOUS: src/%.src
+src/%.src: ../% commands makefile template.html.in
+	perl htmlify $< > $@
+
+
+
+.PRECIOUS: ../class-status-%
+../class-status-%: src/%.html.in ../class-status.in
+	cat ../class-status.in $< > $@
+
+
+.PRECIOUS: src/%.html.in
+src/%.html.in: src/%.xml $(CORCOMPARE)/transform.js $(CORCOMPARE)/cormissing.xsl
+	$(CSCRIPT) /nologo $(CORCOMPARE)/transform.js $< $(CORCOMPARE)/cormissing.xsl > $@
+
+
+
+.PRECIOUS: src/%.xml
+src/%.xml: ../../../mcs/class/lib/%.dll $(CORCOMPARE)/CorCompare.exe
+	$(CORCOMPARE)/CorCompare.exe -x $@ $<
+
+src/corlib.xml: ../../../mcs/class/lib/corlib_cmp.dll $(CORCOMPARE)/CorCompare.exe
+	$(CORCOMPARE)/CorCompare.exe -f corlib -ms mscorlib -x $@ $<
+
+
+../class-status: ../class-status.in
+	cp -f $< $@
+
+make-rss:
+	$(CSC) make-rss.cs -o
diff --git a/web/web/mono-rss.cs b/web/web/mono-rss.cs
new file mode 100755
index 00000000000..a4fdd49c365
--- /dev/null
+++ b/web/web/mono-rss.cs
@@ -0,0 +1,103 @@
+//
+// Generates the Mono RSS feed
+//
+// Miguel de Icaza
+//
+using System;
+using System.IO;
+using System.Xml;
+using RSS;
+
+class X {
+	static RSS.RSS rss;
+	static Channel c;
+	static int item_count;
+
+	static void PopulateRSS (StreamReader input)
+	{
+		string s;
+		
+		while ((s = input.ReadLine ()) != null){
+			if (s.StartsWith ("@item "))
+				break;
+		}
+
+		if (s == null || !s.StartsWith ("@item ")){
+			Console.WriteLine ("Could not find beginning of text to RSS");
+			return;
+		}
+
+		Item i = null;
+		string description = "";
+		do {
+			if (s.StartsWith ("@item ")){
+				if (item_count++ > 25)
+					break;
+
+				if (i != null){
+					i.Description = description;
+					description = "";
+				}
+				
+				string title = s.Substring (6);
+				string link = "http://www.go-mono.com/index.html#";
+				foreach (char ch in title){
+					if (ch != ' ')
+						link += ch;
+				}
+				
+				i = c.NewItem ();
+				i.Title = title;
+				i.Link = link;
+			} else {
+				description += "\n" + (s == "\n" ? "<p>" : s);
+			}
+		} while ((s = input.ReadLine ()) != null);
+
+		if (i != null){
+			i.Description = description;
+		}
+	}
+	
+	static void MakeRSS (string input, string output)
+	{
+		rss = new RSS.RSS ();
+		c = rss.NewChannel ("Mono Project News", "http://www.go-mono.com");
+		
+		c.Title = "Mono Project News";
+		c.Link = "http://www.go-mono.com";
+		c.Description =
+		"News from the Mono project: a portable implementation of the .NET Framework";
+		c.WebMaster = "webmaster@go-mono.com";
+		c.ManagingEditor = "miguel@ximian.com";
+		string t = File.GetLastWriteTime (input).ToString ("r");
+		c.PubDate = t;
+		c.LastBuildDate = t;
+
+		using (FileStream fs = new FileStream (input, FileMode.Open)){
+			using (StreamReader input_stream = new StreamReader (fs)){
+				PopulateRSS (input_stream);
+			}
+		}
+		
+		rss.XmlDocument.Save (output);
+	}
+	
+	static int Main (string [] args)
+	{
+		switch (args.Length){
+		case 0:
+			MakeRSS ("index", "index.rss");
+			break;
+		case 2:
+			MakeRSS (args [0], args [1]);
+			break;
+			
+		default:
+			Console.WriteLine ("Usage is: mono-rss [input output.rss]");
+			return 1;
+		}
+
+		return 0;
+	}
+}
diff --git a/web/web/process.pl b/web/web/process.pl
index cc2d9d50e44..9739f9b4384 100755
--- a/web/web/process.pl
+++ b/web/web/process.pl
@@ -23,12 +23,10 @@ while (<COMMANDS>) {
   my @command = split /,/;
   if ($command[0] != -1) {
       $menu .= "\t\t";
-      if ($command[0] == 0){
-	  $menu .= "<tr><td valign=\"top\" class=\"navi\"><a class=\"navi\"";
-      } else {
-	  $menu .= "<tr><td valign=\"top\" class=\"subnavi\">&nbsp;&nbsp;&nbsp<a class=\"subnavi\"";
-      }
-      $menu .= "HREF=\"$command[2]\">$command[1]</A></td></tr>\n\n";
+	  $menu .= "<tr><td valign=\"top\" class=\"navi" . $command[0];
+	  $menu .= "\"><a class=\"navi" . $command[0];
+	  $menu .= "\"";
+	  $menu .= "HREF=\"$command[2]\">$command[1]</A></td></tr>\n\n";
   } 
 }
 close COMMANDS;
@@ -50,7 +48,7 @@ while (<COMMANDS>) {
 	  open OUTPUT, ">" . $n || die "Can not create $n";
 	
 	  my $content = "";
-	  open INPUT, $command[3] || die "Can not open $command[3]";
+	  open INPUT, "src/$command[3]" || die "Can not open $command[3]";
 	  while (<INPUT>) {
 	    $content .= $_;
 	  }
@@ -60,14 +58,30 @@ while (<COMMANDS>) {
 	  my $temp;
 	  my $tit;
 	  my $title;
+	  my $css;
+	  my $script;
 	
 	  $tit = $command[1];
+	  $css = $command[4];
+	  $script = $command[5];
+
 	  foreach $line (@template) {
 	    $temp = $line;
 	    $title = "$tit / Mono";
 	    $temp =~ s/#TITLE#/$title/;
 	    $temp =~ s/#CONTENT#/$content/;
 	    $temp =~ s/#MENU#/$menu/;
+	    if ($css) {
+	      $temp =~ s/#CSS#/<LINK rel="stylesheet" type="text\/css" href="$css">/;
+	    } else {
+	      $temp =~ s/#CSS#//;
+	    }
+		
+	    if ($script) {
+	      $temp =~ s/#SCRIPT#/<SCRIPT src="$script"><\/SCRIPT>/;
+	    } else {
+	      $temp =~ s/#SCRIPT#//;
+	    }
 	    print OUTPUT $temp;
 	  }
  }	
diff --git a/web/web/rss.cs b/web/web/rss.cs
new file mode 100755
index 00000000000..c8966e51e52
--- /dev/null
+++ b/web/web/rss.cs
@@ -0,0 +1,262 @@
+//
+// RSS.cs: Some utility classes to generate RSS feeds
+//
+// (C) 2002 Miguel de Icaza (miguel@gnu.org)
+//
+//
+using System;
+using System.Xml;
+using System.IO;
+
+namespace RSS {
+
+	public class Item {
+		XmlDocument doc;
+		XmlNode item;
+		XmlText title, link, description;
+		
+		public Item (XmlDocument doc, XmlNode item)
+		{
+			this.doc = doc;
+			this.item = item;
+		}
+
+		XmlText MakeTextElement (string name)
+		{
+			XmlNode node = doc.CreateElement (name);
+			XmlText text = doc.CreateTextNode ("");
+			
+			item.AppendChild (node);
+			node.AppendChild (text);
+			
+			return text;
+		}
+
+		public string Title {
+			get {
+				if (title == null)
+					return null;
+
+				return title.Value;
+			}
+
+			set {
+				if (title == null)
+					title = MakeTextElement ("title");
+				title.Value = value;
+			}
+		}
+
+		public string Link {
+			get {
+				if (link == null)
+					return null;
+
+				return link.Value;
+			}
+
+			set {
+				if (link == null)
+					link = MakeTextElement ("link");
+				link.Value = value;
+			}
+		}
+
+		public string Description {
+			get {
+				if (description == null)
+					return null;
+
+				return description.Value;
+			}
+
+			set {
+				if (description == null)
+					description = MakeTextElement ("description");
+				description.Value = value;
+			}
+		}
+	}
+	
+	public class Channel {
+		XmlDocument doc;
+		XmlNode channel;
+		XmlText title, link, description, language, pubDate, lastBuildDate;
+		XmlText managingEditor, webMaster;
+		
+		XmlText MakeTextElement (string name)
+		{
+			XmlNode node = doc.CreateElement (name);
+			XmlText text = doc.CreateTextNode ("");
+			
+			channel.AppendChild (node);
+			node.AppendChild (text);
+			
+			return text;
+		}
+		
+		public Channel (XmlDocument doc, XmlNode node)
+		{
+			this.channel = node;
+			this.doc = doc;
+			
+			title = MakeTextElement ("title");
+			link = MakeTextElement ("link");
+			description = MakeTextElement ("description");
+		}
+
+		public Item NewItem ()
+		{
+			XmlNode node = doc.CreateElement ("item");
+			Item item;
+
+			channel.AppendChild (node);
+			item = new Item (doc, node);
+
+			return item;
+		}
+		
+		public string Title {
+			get {
+				return title.Value;
+			}
+			
+			set {
+				title.Value = value;
+			}
+		}
+		
+		public string Link {
+			get {
+				return link.Value;
+			}
+
+			set {
+				link.Value = value;
+			}
+		}
+
+		public string Description {
+			get {
+				return description.Value;
+			}
+
+			set {
+				description.Value = value;
+			}
+		}
+
+#region Optional Values
+		public string ManagingEditor {
+			get {
+				if (managingEditor == null)
+					return null;
+			
+				return managingEditor.Value;
+			}
+
+			set {
+				if (managingEditor == null)
+					managingEditor = MakeTextElement ("managingEditor");
+
+				managingEditor.Value = value;
+			}
+		}
+
+		public string WebMaster {
+			get {
+				if (webMaster == null)
+					return null;
+			
+				return webMaster.Value;
+			}
+
+			set {
+				if (webMaster == null)
+					webMaster = MakeTextElement ("webMaster");
+				webMaster.Value = value;
+			}
+		}
+
+		public string PubDate {
+			get {
+				if (pubDate == null)
+					return null;
+
+				return pubDate.Value;
+			}
+
+			set {
+				if (pubDate == null)
+					pubDate = MakeTextElement ("pubDate");
+				pubDate.Value = value;
+			}
+		}
+
+		public string LastBuildDate {
+			get {
+				if (lastBuildDate == null)
+					return null;
+
+				return lastBuildDate.Value;
+			}
+
+			set {
+				if (lastBuildDate == null)
+					lastBuildDate = MakeTextElement ("lastBuildDate");
+				lastBuildDate.Value = value;
+			}
+		}
+
+		public string Language {
+			get {
+				if (language == null)
+					return null;
+
+				return language.Value;
+			}
+
+			set {
+				if (language == null)
+					language = MakeTextElement ("language");
+				language.Value = value;
+			}
+		}
+#endregion
+	}
+ 
+	class RSS {
+		XmlDocument doc;
+		XmlNode rss;
+		
+		const string rss_base =
+		"<?xml version=\"1.0\"?> <rss version=\"0.92\"></rss>";
+		
+		public RSS ()
+		{
+			doc = new XmlDocument ();
+			
+			doc.LoadXml (rss_base);
+			rss = doc.DocumentElement;
+		}
+		
+		public Channel NewChannel (string title, string url)
+		{
+			XmlNode node = doc.CreateElement ("channel");
+			Channel c;
+			
+			rss.AppendChild (node);
+			c = new Channel (doc, node);
+			
+			return c;
+		}
+		
+		public XmlDocument XmlDocument {
+			get {
+				return doc;
+			}
+		}
+	}
+}
+
+
diff --git a/web/web/src/.cvsignore b/web/web/src/.cvsignore
new file mode 100755
index 00000000000..5053fb08904
--- /dev/null
+++ b/web/web/src/.cvsignore
@@ -0,0 +1 @@
+*.src
diff --git a/web/web/template.html.in b/web/web/template.html.in
index 0e1501514c2..16508b36201 100644
--- a/web/web/template.html.in
+++ b/web/web/template.html.in
@@ -1,3 +1,4 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
 <head>
 <title>#TITLE#</title>
@@ -9,44 +10,54 @@
    body, td, table { font-family: "trebuchet ms", lucida, verdana, helvetica; 
                      font-size: 14px; }
 
-	.navi { font-size: 14px; background: #444444; }
-	.subnavi { font-size: 14px; }
-        .footnote { font-size: 12px; color: #aaaaaa; }
+	.navi0 { font-size: 14px; font-weight: bold; background: #444444; }
+	.navi1 { font-size: 14px; font-weight: bold; left-margin: 10pt}
+	.navi2 { font-size: 10px; font-weight: bold; left-margin: 20pt}
+	.footnote { font-size: 12px; color: #aaaaaa; }
 
-	a.navi { color: #ffffff; text-decoration: none; font-weight: bold; }
-	a.navi:visited { color: #cccccc; }
-	a.navi:hover { color: #ee9900; text-decoration: underline; }
+	a.navi0 { color: #ffffff; text-decoration: none}
+	a.navi0:visited { color: #cccccc; }
+	a.navi0:hover { color: #ee9900; text-decoration: underline; }
 
-	a.subnavi { color: #ffffff; text-decoration: none; font-weight: bold; }
-	a.subnavi:visited { color: #cccccc; }
-	a.subnavi:hover { color: #ee9900; text-decoration: underline; }
+	a.navi1 { color: #ffffff; text-decoration: none; margin-left: 7px;}
+	a.navi1:visited { color: #cccccc; }
+	a.navi1:hover { color: #ee9900; text-decoration: underline; }
+
+	a.navi2 { color: #ffffff; text-decoration: none; margin-left: 20px;}
+	a.navi2:visited { color: #cccccc; }
+	a.navi2:hover { color: #ee9900; text-decoration: underline; }
 
 // -->
 </style>
+#CSS#
+#SCRIPT#
 </head>
 <body bgcolor="#555555" text="#000000">
 
 <table cellpadding="0" cellspacing="0" border="0" width="100%">
     <tr>
-        <td><img src="images/pixel.gif"></td><!-- left border -->
+        <td><img src="images/pixel.gif" alt=""></td><!-- left border -->
         <td colspan="4">
-           <a href="http://www.go-mono.com"><img src="images/mono.gif" border="0"></a></td>
-        <td><img src="images/pixel.gif"></td><!-- right border -->
+           <a href="http://www.go-mono.com"><img src="images/mono.gif"
+        alt="mono-logo" border="0"></a></td>
+        <td><img src="images/pixel.gif" alt=""></td><!-- right border -->
     </tr>
     <tr>
-        <td><img src="images/pixel.gif" width="1" height="1"></td>
-        <td colspan="3" bgcolor="black"><img src="images/pixel.gif" height="2"></td>
-        <td bgcolor="black"><img src="images/pixel.gif" width="1"></td>
-	     <td><img src="images/pixel.gif"></td>
+        <td><img src="images/pixel.gif" width="1" height="1" alt=""></td>
+        <td colspan="3" bgcolor="black"><img src="images/pixel.gif"
+        height="2" alt=""></td>
+        <td bgcolor="black"><img src="images/pixel.gif" width="1" alt=""></td>
+	     <td><img src="images/pixel.gif" alt=""></td>
     </tr>
     <tr>
-        <td width="100"><img src="images/pixel.gif"></td>
+        <td width="100"><img src="images/pixel.gif" alt=""></td>
         <td valign="top">
             <table cellpadding="2" valign="top" cellspacing="0" border="0">
                 #MENU#
             </table>
 	     </td>
-        <td bgcolor="black" width="1"><img src="images/pixel.gif" width="1"></td>
+        <td bgcolor="black" width="1"><img src="images/pixel.gif"
+        width="1" alt=""></td>
         <td bgcolor="white" align="left" width="80%" valign="top">
             <table cellpadding="16">
               <tr><td>
@@ -54,24 +65,26 @@
 	           </td></tr>
             </table>
 	</td>
-        <td bgcolor="black"><img src="images/pixel.gif" width="1"></td>
-        <td width="100"><img src="images/pixel.gif"></td>
+        <td bgcolor="black"><img src="images/pixel.gif" width="1" alt=""></td>
+        <td width="100"><img src="images/pixel.gif" alt=""></td>
     </tr>
     <tr>
         <td colspan="2">
-            <img src="images/pixel.gif"></td>
-        <td colspan="2" bgcolor="black"><img src="images/pixel.gif" height="1"></td>
-        <td bgcolor="black"><img src="images/pixel.gif" width="1"></td>
-        <td><img src="images/pixel.gif"></td>
+            <img src="images/pixel.gif" alt=""></td>
+        <td colspan="2" bgcolor="black"><img src="images/pixel.gif"
+        height="1" alt=""></td>
+        <td bgcolor="black"><img src="images/pixel.gif" width="1" alt=""></td>
+        <td><img src="images/pixel.gif" alt=""></td>
     </tr>
 
-    <td colspan="2"></td>
-    <td colspan="2" align="center">
-	<a class="footnote" href="mailto: webmaster@go-mono.com">webmaster@go-mono.com</a>
-    </td>
-    <td colspan="2"></td>
+    <tr>
+      <td colspan="2"></td>
+      <td colspan="2" align="center">
+	  <a class="footnote" href="mailto:webmaster@go-mono.com">webmaster@go-mono.com</a>
+      </td>
+      <td colspan="2"></td>
     </tr>
-</tr>
+  </tr>
 </table>
 
 </body>
diff --git a/web/winforms b/web/winforms
new file mode 100644
index 00000000000..2d8c1e3d79d
--- /dev/null
+++ b/web/winforms
@@ -0,0 +1,90 @@
+* System.Windows.Forms
+
+	System.Windows.Forms eventually will support multiple
+	toolkits.  Ximian will be delivering a product that will allow
+	for System.Windows.Forms applications to integrate with GNOME
+	through Gtk and MacOS X using Cocoa.
+
+	There are no current plans to support embedded devices, but
+	Gtk/FrameBuffer is an option.  If you have suggestions or
+	recommendations, please let us <a
+	href="mailto:mono-hackers-list@ximian.com">let us know</a>
+
+* Contributing
+
+	Currently Ximian developers are busy making our JIT engine
+	feature complete, and dealing with the low-level details of
+	the Mono runtime.
+
+	If you are interested in contributing, you can start stubbing
+	out classes and providing enumerations.  That will help us
+	significantly when we start working on the actual bindings.  
+
+	Christian Meyer is currently organizing this effort.
+
+* System.Drawing
+
+	Using existing libraries to implement some of the functionality required
+
+	<ul>
+		* gdk-pixbuf is a generic image loader that loads an image
+		  and leaves it into an RGB buffer.  It hides all the details
+		  about what image file format is being loaded.
+
+		* Libart is a general framework for rendering RGB/RGBA
+		  buffers into RGB buffers and rendering postscript-like paths into
+		  RGB/RGBA buffers.
+	</ul>
+
+	We want to use gdk-pixbuf as the image loader for the image
+	classes, and then we need operations to render that into the
+	windowing system (Gtk+, MacOS, etc).  But notice how there is
+	very little dependnecies in Gdk-pixbuf on gtk, and libart has
+	none.
+
+	They are pretty independent from a windowing system
+	(gdk-pixbuf comes with some "helper" routines for rendering
+	data into a pixmap and to load pixmaps into RGB buffers).
+
+	A few things to keep in mind:
+	
+	<ul>
+	
+		* gdk-pixbuf can be used to load images for Gtk+,
+		  MacOS X and Windows, it should be pretty portable,
+		  although we might need in the future to back-port
+		  some new features from Gtk head. 
+
+		* Libart is probably only going to be used with X11,
+		  as the MacOS X provides the same features in Quartz,
+		  and Win32 *probably* has that in GDI+.  If not, we
+		  should use libart in Win32 as well (or for older
+		  Windows systems).
+	</ul>
+
+* Directory Layout
+
+        System.Drawing  (assembly directory)
+                System.Drawing.Blah
+                        Common code for "Blah"
+                        Stubs for "Blah" to ease ports.
+
+                Gtk
+                        System.Drawing.Blah.
+                                Gtk ports of "System.Drawing.Blah"
+                MacOS
+                        System.Drawing.Blah
+                                MacOS ports of "System.Drawing.Blah"
+                Win32
+                        System.Drawing.Blah
+                                Win32 ports of "System.Drawing.Blah"
+
+	Then we use nant targets to include/exclude the right set of
+	files to create the assembly.
+
+* Open questions:
+
+	I believe that the graphics contexts that are used to render
+	can accept either libart-like rendering operations and
+	X11-like rendering operations.  This complicates matters, but
+	I am not sure.  Someone needs to investigate this.